From 1f16c437658db8348e87d8c5db48ef9f79c4371d Mon Sep 17 00:00:00 2001 From: "U-Maria-PC\\Maria" Date: Sun, 13 Aug 2017 18:04:58 -0400 Subject: fixed it up a little --- src/intro_credits_graphics.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 58e40da91..6d50581d2 100755 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -374,7 +374,8 @@ void sub_8149020(u8 mode) case 0: default: /* stuff */ - if(gMain.vblankCounter1 & 3 || gPaletteFade.active) break; + if (gMain.vblankCounter1 & 3 || gPaletteFade.active) + break; if(gMain.vblankCounter1 & 4) { var1 = gPlttBufferUnfaded[9]; @@ -528,4 +529,4 @@ u8 intro_create_latias_sprite(s16 a, s16 b) StartSpriteAnim(&gSprites[latios], 1); gSprites[latios].callback = &sub_81493C4; return sprite; -} \ No newline at end of file +} -- cgit v1.2.3 From bdf7c67943d5e0f082036e9951b182e42192c364 Mon Sep 17 00:00:00 2001 From: "U-Maria-PC\\Maria" Date: Sun, 13 Aug 2017 19:00:47 -0400 Subject: more fixes --- ld_script.txt | 4 ++-- src/intro_credits_graphics.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ld_script.txt b/ld_script.txt index ca99b5a80..8b3989c8d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -182,7 +182,7 @@ SECTIONS { asm/contest_link_80C857C.o(.text); src/contest_link_80C857C.o(.text); src/item_use.o(.text); - src/battle_anim_80CA710.o(.text); + src/battle_anim_80CA710.o(.text); asm/battle_anim_80CA710.o(.text); src/bike.o(.text); asm/easy_chat.o(.text); @@ -266,7 +266,7 @@ SECTIONS { src/braille_puzzles.o(.text); asm/pokeblock_feed.o(.text); src/clear_save_data_menu.o(.text); - src/intro_credits_graphics.o(.text); + src/intro_credits_graphics.o(.text); asm/evolution_graphics.o(.text); src/bard_music.o(.text); src/fldeff_teleport.o(.text); diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 6d50581d2..cd0589af8 100755 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -376,7 +376,7 @@ void sub_8149020(u8 mode) /* stuff */ if (gMain.vblankCounter1 & 3 || gPaletteFade.active) break; - if(gMain.vblankCounter1 & 4) + if (gMain.vblankCounter1 & 4) { var1 = gPlttBufferUnfaded[9]; var2 = gPlttBufferUnfaded[10]; @@ -390,9 +390,9 @@ void sub_8149020(u8 mode) LoadPalette(&var2, 10, 2); break; case 2: - /* stuff */ - if(gMain.vblankCounter1 & 3 || gPaletteFade.active) break; - if(gMain.vblankCounter1 & 4) + if (gMain.vblankCounter1 & 3 || gPaletteFade.active) + break; + if (gMain.vblankCounter1 & 4) { var1 = 0x3D27; var2 = 0x295; @@ -412,7 +412,7 @@ void sub_8149020(u8 mode) void sub_814910C(struct Sprite *sprite) { - if(gUnknown_0203935C) + if (gUnknown_0203935C) { DestroySprite(sprite); } -- cgit v1.2.3 From e7a0e1a8406925ac94289bbe42bfe95c67464939 Mon Sep 17 00:00:00 2001 From: golemgalvanize Date: Sun, 13 Aug 2017 19:02:49 -0400 Subject: Update ld_script.txt --- ld_script.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ld_script.txt b/ld_script.txt index 8b3989c8d..babcf5861 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -182,7 +182,6 @@ SECTIONS { asm/contest_link_80C857C.o(.text); src/contest_link_80C857C.o(.text); src/item_use.o(.text); - src/battle_anim_80CA710.o(.text); asm/battle_anim_80CA710.o(.text); src/bike.o(.text); asm/easy_chat.o(.text); -- cgit v1.2.3 From cd67e14e04c0fb58f876ddb96b0daabb4d0d1eac Mon Sep 17 00:00:00 2001 From: golemgalvanize Date: Sun, 13 Aug 2017 19:26:16 -0400 Subject: Delete battle_anim_80CA710.c --- src/battle_anim_80CA710.c | 2647 --------------------------------------------- 1 file changed, 2647 deletions(-) delete mode 100755 src/battle_anim_80CA710.c diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c deleted file mode 100755 index 53494608a..000000000 --- a/src/battle_anim_80CA710.c +++ /dev/null @@ -1,2647 +0,0 @@ -#include "global.h" -#include "battle.h" -#include "battle_anim.h" -#include "blend_palette.h" -#include "decompress.h" -#include "palette.h" -#include "rng.h" -#include "rom_8077ABC.h" -#include "sound.h" -#include "sprite.h" -#include "task.h" -#include "trig.h" - -struct __attribute__((packed)) Some3ByteStruct { - u8 unkArr[3]; -}; - -extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimPlayerMonIndex; -extern u8 gBattleAnimEnemyMonIndex; -extern struct SpriteTemplate gSpriteTemplate_83D631C; -extern struct SpriteTemplate gSpriteTemplate_83D6884; -extern s16 gUnknown_03000728[]; -extern s8 gUnknown_083D680C[11][3]; -extern u16 gUnknown_083D6984[]; - -void sub_80CA768(struct Sprite* sprite); -void sub_80CA8B4(struct Sprite* sprite); -void sub_80CA9F8(struct Sprite* sprite); -void sub_80CAACC(struct Sprite* sprite); -void sub_80CAB88(struct Sprite* sprite); -void sub_80CABC0(struct Sprite* sprite); -void sub_80CAC44(struct Sprite* sprite); -void sub_80CADA8(struct Sprite* sprite); -void sub_80CAE74(struct Sprite* sprite); -void sub_80CAF20(struct Sprite* sprite); -void sub_80CAF6C(struct Sprite* sprite); -void sub_80CB09C(struct Sprite* sprite); -void sub_80CB1A4(struct Sprite* sprite); -void sub_80CB298(struct Sprite* sprite); -void sub_80CB2D4(struct Sprite* sprite); -void sub_80CB710(struct Sprite* sprite); -void sub_80CBB60(struct Sprite* sprite); -void sub_80CBC8C(struct Sprite* sprite); -void sub_80CBCF8(struct Sprite* sprite); -void sub_80CBDB0(struct Sprite* sprite); -void sub_80CC408(struct Sprite* sprite); -void sub_80CC580(struct Sprite* sprite); -void sub_80CC7D4(struct Sprite* sprite); -void sub_80CCB00(struct Sprite* sprite); -void sub_80CCCB4(struct Sprite* sprite); -void sub_80CCE0C(struct Sprite* sprite); - -s16 sub_80CC338(struct Sprite* sprite); - -void sub_80787B0(struct Sprite *sprite, u8 a2); -void sub_8078764(struct Sprite *sprite, u8 a2); -void sub_8078B34(struct Sprite *sprite); -void sub_8078D60(struct Sprite *sprite); -void sub_80786EC(struct Sprite *sprite); -void sub_80782D8(struct Sprite *sprite); -void sub_8078CC0(struct Sprite *sprite); -void sub_8078600(struct Sprite *sprite); -void sub_8078504(struct Sprite *sprite); - -void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4); -u8 sub_8079ED4(u8 slot); -s8 sub_8076F98(s8 a); -int sub_807A100(u8 slot, u8 a2); -u16 sub_80790F0(s16 a, s16 b); -void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); -void sub_807867C(struct Sprite *sprite, s16 a2); -u8 sub_8077EE4(u8 slot, u8 a2); - -void move_anim_8074EE0(struct Sprite *sprite); -bool8 sub_8078718(struct Sprite *sprite); -bool8 sub_8078CE8(struct Sprite *sprite); - -void sub_80CB3A8(u8 taskId); -void sub_80CB438(u8 taskId); -void sub_80CBF5C(u8 taskId); -void sub_80CC358(struct Task* task, u8 taskId); - -void sub_80CA710(struct Sprite* sprite) -{ - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - if (GetBankSide(gBattleAnimPlayerMonIndex)) - { - sprite->data3 = -gBattleAnimArgs[4]; - } - else - { - sprite->data3 = gBattleAnimArgs[4]; - } - sprite->data4 = gBattleAnimArgs[5]; - sprite->callback = sub_80CA768; -} - -void sub_80CA768(struct Sprite* sprite) -{ - if (sprite->data0 > 0) - { - sprite->data0--; - sprite->pos2.y = sprite->data2 >> 8; - sprite->data2 += sprite->data1; - sprite->pos2.x = Sin(sprite->data5, sprite->data3); - sprite->data5 = (sprite->data5 + sprite->data4) & 0xFF; - } - else - { - move_anim_8072740(sprite); - } -} - -void sub_80CA7B0(struct Sprite* sprite) -{ - sub_80787B0(sprite, 1); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - sprite->callback = sub_8078B34; - oamt_set_x3A_32(sprite, move_anim_8074EE0); -} - -void sub_80CA800(struct Sprite* sprite) -{ - sub_80787B0(sprite, 1); - StartSpriteAnim(sprite, gBattleAnimArgs[3]); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); - sprite->callback = sub_8078B34; - oamt_set_x3A_32(sprite, move_anim_8072740); -} - -void sub_80CA858(struct Sprite* sprite) -{ - sub_80787B0(sprite, 1); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); - obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = gBattleAnimArgs[3]; - sprite->callback = sub_80CA8B4; - sub_80CA8B4(sprite); -} - -void sub_80CA8B4(struct Sprite* sprite) -{ - if(sub_8078B5C(sprite)) - { - DestroySprite(sprite); - } - else - { - if(sprite->data5 > 0x7F) - { - sprite->subpriority = sub_8079E90(gBattleAnimEnemyMonIndex) + 1; - } - else - { - sprite->subpriority = sub_8079E90(gBattleAnimEnemyMonIndex) + 6; - } - sprite->pos2.x += Sin(sprite->data5, 5); - sprite->pos2.y += Cos(sprite->data5, 14); - sprite->data5 = (sprite->data5 + 15) & 0xFF; - } -} - -void sub_80CA928(u8 taskId) -{ - gTasks[taskId].data[0]--; - if (gTasks[taskId].data[0] == -1) - { - gTasks[taskId].data[1]++; - gTasks[taskId].data[0] = 6; - gBattleAnimArgs[0] = 15; - gBattleAnimArgs[1] = 0; - gBattleAnimArgs[2] = 80; - gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gSpriteTemplate_83D631C, 0, 0, sub_8079E90(gBattleAnimEnemyMonIndex) + 1); - } - if (gTasks[taskId].data[1] == 15) DestroyAnimVisualTask(taskId); -} - -void sub_80CA9A8(struct Sprite* sprite) -{ - sub_8078764(sprite, 1); - sprite->data0 = gBattleAnimArgs[3]; - sprite->data2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - sprite->data5 = gBattleAnimArgs[2]; - sub_80786EC(sprite); - sprite->callback = sub_80CA9F8; -} - -void sub_80CA9F8(struct Sprite* sprite) -{ - if (sub_8078718(sprite)) move_anim_8072740(sprite); -} - -void sub_80CAA14(struct Sprite* sprite) -{ - u16 a = Random(); - u16 b; - - StartSpriteAnim(sprite, a & 7); - sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - if (GetBankSide(gBattleAnimPlayerMonIndex)) - { - sprite->pos1.x -= 20; - } - else - { - sprite->pos1.x += 20; - } - b = Random(); - sprite->data0 = (b & 31) + 64; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); - sub_8078D60(sprite); - sprite->data5 = Random() & 0xFF; - sprite->data6 = sprite->subpriority; - sprite->callback = sub_80CAACC; - sub_80CAACC(sprite); -} - -void sub_80CAACC(struct Sprite* sprite) -{ - if (sub_8078CE8(sprite)) - { - move_anim_8072740(sprite); - } - else - { - sprite->pos2.y += Cos(sprite->data5, 12); - if (sprite->data5 <= 0x7E) - { - sprite->subpriority = sprite->data6; - } - else - { - sprite->subpriority = sprite->data6 + 1; - } - sprite->data5 = (sprite->data5 + 24) & 0xFF; - } -} - -void sub_80CAB18(struct Sprite* sprite) -{ - sub_80787B0(sprite, 1); - if(GetBankSide(gBattleAnimPlayerMonIndex)) - { - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 0) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 1) + gBattleAnimArgs[3]; - sprite->data5 = gBattleAnimArgs[5]; - sub_80786EC(sprite); - sprite->callback = sub_80CAB88; -} - -void sub_80CAB88(struct Sprite* sprite) -{ - if(sub_8078718(sprite)) - { - sprite->invisible = 1; - sprite->data0 = 10; - sprite->callback = sub_80782D8; - oamt_set_x3A_32(sprite, sub_80CABC0); - } -} - -void sub_80CABC0(struct Sprite* sprite) -{ - sprite->invisible = 0; - StartSpriteAnim(sprite, 1); - sprite->data0 = 60; - sprite->callback = sub_80782D8; - oamt_set_x3A_32(sprite, move_anim_8072740); -} - -void sub_80CABF8(struct Sprite* sprite) -{ - sub_8078764(sprite, 1); - StartSpriteAnim(sprite, gBattleAnimArgs[4]); - if (gBattleAnimArgs[4] == 1) - { - sprite->oam.objMode = 1; - } - sprite->data0 = gBattleAnimArgs[3]; - sprite->data1 = gBattleAnimArgs[2]; - sprite->callback = sub_80CAC44; - sub_80CAC44(sprite); -} - -void sub_80CAC44(struct Sprite* sprite) -{ - - u8 b; - - sprite->pos2.x = Sin(sprite->data1, 32); - sprite->pos2.y = Cos(sprite->data1, -3) + ((sprite->data2 += 24) >> 8); - if ((u16)(sprite->data1 - 0x40) < 0x80) - { - sprite->oam.priority = (sub_8079ED4(gBattleAnimEnemyMonIndex) & 3); - } - else - { - b = sub_8079ED4(gBattleAnimEnemyMonIndex) + 1; - if ( b > 3) - { - b = 3; - } - sprite->oam.priority = b; - } - sprite->data1 = (sprite->data1 + 2) & 0xFF; - sprite->data0--; - if (sprite->data0 == -1) move_anim_8072740(sprite); -} - -void sub_80CACEC(u8 taskId) -{ - if(IsContest() || !IsDoubleBattle()) - { - DestroyAnimVisualTask(taskId); - } - else - { - if (GetBankIdentity_permutated(gBattleAnimEnemyMonIndex) == 1) - { - REG_BG2CNT_BITFIELD.priority = 3; - } - else - { - REG_BG1CNT_BITFIELD.priority = 1; - } - DestroyAnimVisualTask(taskId); - } -} - -void sub_80CAD54(struct Sprite* sprite) -{ - sub_80787B0(sprite, 0); - sprite->data0 = gBattleAnimArgs[3]; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3) + gBattleAnimArgs[2]; - obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = 0x40; - sprite->callback = sub_80CADA8; - sub_80CADA8(sprite); -} - -void sub_80CADA8(struct Sprite* sprite) -{ - if(!sub_8078B5C(sprite)) - { - sprite->pos2.x += Sin(sprite->data5, 32); - sprite->pos2.y += Cos(sprite->data5, -5); - if ((u16)(sprite->data5 - 0x40) < 0x80) - { - sprite->subpriority = sub_8079E90(gBattleAnimPlayerMonIndex) - 1; - } - else - { - sprite->subpriority = sub_8079E90(gBattleAnimPlayerMonIndex) + 1; - } - sprite->data5 = (sprite->data5 + 5) & 0xFF; - } - else - { - move_anim_8072740(sprite); - } -} - -void sub_80CAE20(struct Sprite* sprite) -{ - sub_80787B0(sprite, 1); - sprite->data0 = gBattleAnimArgs[3]; - sprite->data1 = sprite->pos1.x; - sprite->data2 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3) + gBattleAnimArgs[2]; - obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data5 = 0x40; - sprite->callback = sub_80CAE74; - sub_80CAE74(sprite); -} - -void sub_80CAE74(struct Sprite* sprite) -{ - if(!sub_8078B5C(sprite)) - { - sprite->pos2.x += Sin(sprite->data5, 8); - if ((u16)(sprite->data5 - 0x3B) < 5 || (u16)(sprite->data5 - 0xBB) < 5) - { - sprite->oam.matrixNum ^= 8; - } - sprite->data5 = (sprite->data5 + 5) & 0xFF; - } - else - { - move_anim_8072740(sprite); - } -} - -void sub_80CAED8(struct Sprite* sprite) -{ - sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - sprite->data0 = gBattleAnimArgs[0]; - sprite->data1 = gBattleAnimArgs[1]; - sprite->data2 = gBattleAnimArgs[2]; - sprite->callback = sub_80CAF20; -} - -void sub_80CAF20(struct Sprite* sprite) -{ - if(!sprite->data2) - { - if(sprite->data1 & 1) - { - sprite->data0 = 0x80; - sprite->data1 = 0; - sprite->data2 = 0; - } - else - { - sprite->data0 = sprite->data1 & 1; - sprite->data1 = sprite->data1 & 1; - sprite->data2 = sprite->data1 & 1; - } - sprite->callback = sub_80CAF6C; - } - else - { - sprite->data2--; - sprite->pos1.x += sprite->data0; - sprite->pos1.y += sprite->data1; - } -} - -void sub_80CAF6C(struct Sprite* sprite) -{ - if(GetBankSide(gBattleAnimPlayerMonIndex)) - { - sprite->pos2.x = -Sin(sprite->data0, 0x19); - } - else - { - sprite->pos2.x = Sin(sprite->data0, 0x19); - } - sprite->data0 = (sprite->data0 + 2) & 0xFF; - sprite->data1++; - if(!(sprite->data1 & 1)) - { - sprite->pos2.y++; - } - if(sprite->data1 > 0x50) - { - move_anim_8072740(sprite); - } -} - -void sub_80CAFD0(struct Sprite* sprite) -{ - sub_80787B0(sprite, 1); - if(GetBankSide(gBattleAnimPlayerMonIndex)) - { - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } - sprite->data0 = gBattleAnimArgs[4]; - if(!(gBattleAnimArgs[6])) - { - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3) + gBattleAnimArgs[3]; - } - else - { - sub_807A3FC(gBattleAnimEnemyMonIndex, 1, &sprite->data2, &sprite->data4); - sprite->data2 += gBattleAnimArgs[2]; - sprite->data4 += gBattleAnimArgs[3]; - } - sprite->data5 = gBattleAnimArgs[5]; - sub_80786EC(sprite); - if(GetBankSide(gBattleAnimPlayerMonIndex) == GetBankSide(gBattleAnimEnemyMonIndex)) - { - sprite->data0 = 1; - } - else - { - sprite->data0 = 0; - } - sprite->callback = sub_80CB09C; -} - -#ifdef NONMATCHING -void sub_80CB09C(struct Sprite* sprite) -{ - s16 c = 0; - s16 a = sprite->data0; - s16 b = sprite->data7; - sprite->data0 = 1; - sub_8078718(sprite); - sprite->data0 = a; - if (b > 0xC8 && sprite->data7 <= 0x37 && sprite->oam.affineParam == 0) - sprite->oam.affineParam++; - if (sprite->oam.affineParam != 0 && sprite->data0 != 0) - { - sprite->invisible ^= 1; - sprite->oam.affineParam++; - if(sprite->oam.affineParam == 0x1E) - { - c = 1; - } - } - if((sprite->pos1.x + sprite->pos2.x + 16) <= 0x110 && (sprite->pos1.y + sprite->pos2.y) <= 0xA0 && (sprite->pos1.y + sprite->pos2.y) < -16) - { - c = 1; - } - if (!c) move_anim_8072740(sprite); -} -#else -__attribute__((naked)) -void sub_80CB09C(struct Sprite* sprite) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - adds r6, r0, 0\n\ - movs r7, 0\n\ - ldrh r5, [r6, 0x2E]\n\ - ldrh r4, [r6, 0x3C]\n\ - movs r0, 0x1\n\ - strh r0, [r6, 0x2E]\n\ - adds r0, r6, 0\n\ - bl sub_8078718\n\ - ldrh r0, [r6, 0x3C]\n\ - strh r5, [r6, 0x2E]\n\ - lsls r4, 16\n\ - asrs r4, 16\n\ - cmp r4, 0xC8\n\ - ble _080CB0CE\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - cmp r0, 0x37\n\ - bgt _080CB0CE\n\ - ldrh r0, [r6, 0x6]\n\ - cmp r0, 0\n\ - bne _080CB0D4\n\ - adds r0, 0x1\n\ - strh r0, [r6, 0x6]\n\ -_080CB0CE:\n\ - ldrh r0, [r6, 0x6]\n\ - cmp r0, 0\n\ - beq _080CB106\n\ -_080CB0D4:\n\ - movs r1, 0x2E\n\ - ldrsh r0, [r6, r1]\n\ - cmp r0, 0\n\ - beq _080CB106\n\ - adds r3, r6, 0\n\ - adds r3, 0x3E\n\ - ldrb r2, [r3]\n\ - lsls r0, r2, 29\n\ - lsrs r0, 31\n\ - movs r1, 0x1\n\ - eors r1, r0\n\ - lsls r1, 2\n\ - movs r0, 0x5\n\ - negs r0, r0\n\ - ands r0, r2\n\ - orrs r0, r1\n\ - strb r0, [r3]\n\ - ldrh r0, [r6, 0x6]\n\ - adds r0, 0x1\n\ - strh r0, [r6, 0x6]\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - cmp r0, 0x1E\n\ - bne _080CB106\n\ - movs r7, 0x1\n\ -_080CB106:\n\ - movs r2, 0x20\n\ - ldrsh r0, [r6, r2]\n\ - movs r2, 0x24\n\ - ldrsh r1, [r6, r2]\n\ - adds r0, r1\n\ - adds r0, 0x10\n\ - movs r1, 0x88\n\ - lsls r1, 1\n\ - cmp r0, r1\n\ - bhi _080CB130\n\ - movs r0, 0x22\n\ - ldrsh r1, [r6, r0]\n\ - movs r2, 0x26\n\ - ldrsh r0, [r6, r2]\n\ - adds r1, r0\n\ - cmp r1, 0xA0\n\ - bgt _080CB130\n\ - movs r0, 0x10\n\ - negs r0, r0\n\ - cmp r1, r0\n\ - bge _080CB132\n\ -_080CB130:\n\ - movs r7, 0x1\n\ -_080CB132:\n\ - cmp r7, 0\n\ - beq _080CB13C\n\ - adds r0, r6, 0\n\ - bl move_anim_8072740\n\ -_080CB13C:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif - -void sub_80CB144(struct Sprite* sprite) -{ - if(!IsContest() && IsDoubleBattle() == TRUE) - { - sub_807A3FC(gBattleAnimEnemyMonIndex, 1, &sprite->pos1.x, &sprite->pos1.y); - } - sprite->pos1.y += 32; - sprite->data0 = gBattleAnimArgs[0]; - sprite->data1 = gBattleAnimArgs[1]; - sprite->data2 = gBattleAnimArgs[2]; - sprite->data3 = gBattleAnimArgs[3]; - sprite->data4 = gBattleAnimArgs[4]; - sprite->callback = sub_80CB1A4; -} - -void sub_80CB1A4(struct Sprite* sprite) -{ - if(sprite->data1 == 0xFF) - { - sprite->pos1.y -= 2; - } - else if(sprite->data1 > 0) - { - sprite->pos1.y -= 2; - sprite->data1 -= 2; - } - sprite->data5 += sprite->data2; - if(sprite->data0 < sprite->data4) sprite->data5 += sprite->data2; - sprite->data5 &= 0xFF; - sprite->pos2.x = Cos(sprite->data5, sprite->data3); - sprite->pos2.y = Sin(sprite->data5, 5); - if(sprite->data5 <= 0x7F) - { - sprite->oam.priority = sub_8079ED4(gBattleAnimEnemyMonIndex) - 1; - } - else - { - sprite->oam.priority = sub_8079ED4(gBattleAnimEnemyMonIndex) + 1; - } - sprite->data0--; - if(!sprite->data0) move_anim_8072740(sprite); -} - -void sub_80CB25C(struct Sprite* sprite) -{ - sub_8078764(sprite, 0); - sprite->affineAnimPaused = 1; - StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]); - sprite->data6 = gBattleAnimArgs[2]; - sprite->data7 = gBattleAnimArgs[3]; - sprite->callback = sub_80CB298; -} - -void sub_80CB298(struct Sprite* sprite) -{ - if((u16)gBattleAnimArgs[7] == 0xFFFF) - { - sprite->affineAnimPaused = 0; - obj_id_for_side_relative_to_move(1); - sprite->data0 = 0x100; - sprite->callback = sub_80CB2D4; - } -} - -void sub_80CB2D4(struct Sprite* sprite) -{ - obj_id_for_side_relative_to_move(1); - if(!sprite->data2) - { - sprite->data0 += 11; - } - else - { - sprite->data0 -= 11; - } - sprite->data1++; - if(sprite->data1 == 6) - { - sprite->data1 = 0; - sprite->data2 ^= 1; - } - if(sprite->affineAnimEnded) - { - sprite->data7--; - if(sprite->data7 > 0) - { - StartSpriteAffineAnim(sprite, sprite->data6); - } - else - { - move_anim_8072740(sprite); - } - } -} - -void sub_80CB340(u8 taskId) -{ - u8 spriteId = obj_id_for_side_relative_to_move(1); - if(gSprites[spriteId].invisible) - { - DestroyAnimVisualTask(taskId); - } - else - { - sub_8078E70(spriteId, 1); - gTasks[taskId].data[0] = gBattleAnimArgs[0]; - gTasks[taskId].data[1] = gBattleAnimArgs[1]; - gTasks[taskId].data[11] = 256; - gTasks[taskId].func = sub_80CB3A8; - } -} - -void sub_80CB3A8(u8 taskId) -{ - u8 spriteId = obj_id_for_side_relative_to_move(1); - gTasks[taskId].data[10] += gTasks[taskId].data[0]; - gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8; - if(GetBankSide(gBattleAnimEnemyMonIndex)) - { - gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x; - } - gTasks[taskId].data[11] += 16; - obj_id_set_rotscale(spriteId, gTasks[taskId].data[11], gTasks[taskId].data[11], 0); - sub_8079A64(spriteId); - gTasks[taskId].data[1]--; - if(!gTasks[taskId].data[1]) - { - gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_80CB438; - } -} - -#ifdef NONMATCHING -void sub_80CB438(u8 taskId) -{ - if((u16)gBattleAnimArgs[7] == 0xFFFF) - { - if(!gTasks[taskId].data[0]) - { - u8 spriteId = obj_id_for_side_relative_to_move(1); - sub_8078F40(spriteId); - gSprites[spriteId].pos2.x = 0; - gSprites[spriteId].pos2.y = 0; - gTasks[taskId].data[0]++; - } - else - { - gTasks[taskId].data[0]++; - - } - } - else if(gTasks[taskId].data[0]) - { - gTasks[taskId].data[0]++; - } - if(gTasks[taskId].data[0] == 3) DestroyAnimVisualTask(taskId); -} -#else -__attribute__((naked)) -void sub_80CB438(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - lsls r0, 24\n\ - lsrs r3, r0, 24\n\ - ldr r0, _080CB484 @ =gBattleAnimArgs\n\ - ldrh r1, [r0, 0xE]\n\ - ldr r0, _080CB488 @ =0x0000ffff\n\ - cmp r1, r0\n\ - bne _080CB494\n\ - ldr r0, _080CB48C @ =gTasks\n\ - lsls r2, r3, 2\n\ - adds r1, r2, r3\n\ - lsls r1, 3\n\ - adds r6, r1, r0\n\ - movs r1, 0x8\n\ - ldrsh r5, [r6, r1]\n\ - adds r4, r0, 0\n\ - cmp r5, 0\n\ - bne _080CB4A8\n\ - movs r0, 0x1\n\ - bl obj_id_for_side_relative_to_move\n\ - adds r4, r0, 0\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - adds r0, r4, 0\n\ - bl sub_8078F40\n\ - ldr r1, _080CB490 @ =gSprites\n\ - lsls r0, r4, 4\n\ - adds r0, r4\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - strh r5, [r0, 0x24]\n\ - strh r5, [r0, 0x26]\n\ - ldrh r0, [r6, 0x8]\n\ - adds r0, 0x1\n\ - strh r0, [r6, 0x8]\n\ - b _080CB4C2\n\ - .align 2, 0\n\ -_080CB484: .4byte gBattleAnimArgs\n\ -_080CB488: .4byte 0x0000ffff\n\ -_080CB48C: .4byte gTasks\n\ -_080CB490: .4byte gSprites\n\ -_080CB494:\n\ - ldr r1, _080CB4C8 @ =gTasks\n\ - lsls r2, r3, 2\n\ - adds r0, r2, r3\n\ - lsls r0, 3\n\ - adds r0, r1\n\ - movs r4, 0x8\n\ - ldrsh r0, [r0, r4]\n\ - adds r4, r1, 0\n\ - cmp r0, 0\n\ - beq _080CB4C2\n\ -_080CB4A8:\n\ - adds r1, r2, r3\n\ - lsls r1, 3\n\ - adds r1, r4\n\ - ldrh r0, [r1, 0x8]\n\ - adds r0, 0x1\n\ - strh r0, [r1, 0x8]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - cmp r0, 0x3\n\ - bne _080CB4C2\n\ - adds r0, r3, 0\n\ - bl DestroyAnimVisualTask\n\ -_080CB4C2:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080CB4C8: .4byte gTasks\n\ - .syntax divided\n"); -} -#endif - -void sub_80CB4CC(struct Sprite* sprite) -{ - switch(sprite->data0) - { - case 0: - { - if(GetBankSide(gBattleAnimEnemyMonIndex) == 0) - { - s16 a = gBattleAnimArgs[0]; - gBattleAnimArgs[0] = -a; - } - sprite->pos1.x = sub_8077ABC(gBattleAnimEnemyMonIndex, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimEnemyMonIndex, 1) + gBattleAnimArgs[1]; - sprite->invisible = 1; - sprite->data0++; - break; - } - case 1: - { - sprite->invisible = 0; - if(sprite->affineAnimEnded) - { - ChangeSpriteAffineAnim(sprite, 1); - sprite->data0 = 25; - sprite->data2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - sprite->callback = sub_8078CC0; - oamt_set_x3A_32(sprite, move_anim_8072740); - break; - } - } - } -} - -void sub_80CB59C(struct Sprite* sprite) -{ - if(!sprite->data0) - { - sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 1); - sprite->pos2.x = gBattleAnimArgs[0]; - sprite->pos2.y = gBattleAnimArgs[1]; - sprite->subpriority = gBattleAnimArgs[2] + 30; - StartSpriteAnim(sprite, gBattleAnimArgs[3]); - sprite->data2 = gBattleAnimArgs[4]; - sprite->data0++; - if((sprite->pos1.y + sprite->pos2.y) > 120) - { - sprite->pos1.y += -120 + (sprite->pos2.y + sprite->pos1.y); - } - } - sprite->callback = sub_80CB710; -} - -#ifdef NONMATCHING -void sub_80CB620(struct Sprite* sprite) -{ - u8 p1 = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - u8 p2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - u8 e1 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); - u8 e2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); - e1 -= p1; - e2 -= p2; - sprite->pos1.x = p1 + ((gBattleAnimArgs[0] * e1) / 100); - sprite->pos1.y = p2 + ((gBattleAnimArgs[0] * e2) / 100); - sprite->pos2.x = gBattleAnimArgs[1]; - sprite->pos2.y = gBattleAnimArgs[2]; - sprite->subpriority = gBattleAnimArgs[3] + 30; - StartSpriteAnim(sprite, gBattleAnimArgs[4]); - sprite->data2 = gBattleAnimArgs[5]; - sprite->callback = sub_80CB710; - gUnknown_03000728[0] = sprite->pos1.x; - gUnknown_03000728[1] = sprite->pos1.y; - gUnknown_03000728[2] = e1; - gUnknown_03000728[3] = e2; -} -#else -__attribute__((naked)) -void sub_80CB620(struct Sprite* sprite) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - mov r6, r10\n\ - mov r5, r9\n\ - mov r4, r8\n\ - push {r4-r6}\n\ - sub sp, 0x4\n\ - mov r9, r0\n\ - ldr r4, _080CB6FC @ =gBattleAnimPlayerMonIndex\n\ - ldrb r0, [r4]\n\ - movs r1, 0x2\n\ - bl sub_8077ABC\n\ - adds r5, r0, 0\n\ - lsls r5, 24\n\ - lsrs r5, 24\n\ - ldrb r0, [r4]\n\ - movs r1, 0x3\n\ - bl sub_8077ABC\n\ - mov r8, r0\n\ - mov r0, r8\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - ldr r6, _080CB700 @ =gBattleAnimEnemyMonIndex\n\ - ldrb r0, [r6]\n\ - movs r1, 0x2\n\ - bl sub_8077ABC\n\ - adds r4, r0, 0\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - ldrb r0, [r6]\n\ - movs r1, 0x3\n\ - bl sub_8077ABC\n\ - adds r2, r0, 0\n\ - lsls r2, 24\n\ - subs r4, r5\n\ - lsls r4, 16\n\ - lsrs r2, 24\n\ - mov r1, r8\n\ - subs r2, r1\n\ - lsls r2, 16\n\ - lsrs r2, 16\n\ - lsrs r3, r4, 16\n\ - mov r10, r3\n\ - asrs r4, 16\n\ - ldr r6, _080CB704 @ =gBattleAnimArgs\n\ - movs r1, 0\n\ - ldrsh r0, [r6, r1]\n\ - muls r0, r4\n\ - movs r1, 0x64\n\ - str r2, [sp]\n\ - bl __divsi3\n\ - adds r5, r0\n\ - mov r3, r9\n\ - strh r5, [r3, 0x20]\n\ - ldr r2, [sp]\n\ - lsls r0, r2, 16\n\ - asrs r0, 16\n\ - movs r3, 0\n\ - ldrsh r1, [r6, r3]\n\ - muls r0, r1\n\ - movs r1, 0x64\n\ - bl __divsi3\n\ - add r8, r0\n\ - mov r1, r8\n\ - mov r0, r9\n\ - strh r1, [r0, 0x22]\n\ - ldrh r0, [r6, 0x2]\n\ - mov r3, r9\n\ - strh r0, [r3, 0x24]\n\ - ldrh r0, [r6, 0x4]\n\ - strh r0, [r3, 0x26]\n\ - ldrb r0, [r6, 0x6]\n\ - adds r0, 0x1E\n\ - mov r1, r9\n\ - adds r1, 0x43\n\ - strb r0, [r1]\n\ - ldrb r1, [r6, 0x8]\n\ - mov r0, r9\n\ - bl StartSpriteAnim\n\ - ldrh r0, [r6, 0xA]\n\ - mov r1, r9\n\ - strh r0, [r1, 0x32]\n\ - ldr r0, _080CB708 @ =sub_80CB710\n\ - str r0, [r1, 0x1C]\n\ - ldr r1, _080CB70C @ =gUnknown_03000728\n\ - mov r3, r9\n\ - ldrh r0, [r3, 0x20]\n\ - strh r0, [r1]\n\ - ldrh r0, [r3, 0x22]\n\ - strh r0, [r1, 0x2]\n\ - mov r0, r10\n\ - strh r0, [r1, 0x4]\n\ - ldr r2, [sp]\n\ - strh r2, [r1, 0x6]\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080CB6FC: .4byte gBattleAnimPlayerMonIndex\n\ -_080CB700: .4byte gBattleAnimEnemyMonIndex\n\ -_080CB704: .4byte gBattleAnimArgs\n\ -_080CB708: .4byte sub_80CB710\n\ -_080CB70C: .4byte gUnknown_03000728\n\ - .syntax divided\n"); -} -#endif - -void sub_80CB710(struct Sprite* sprite) -{ - if(++sprite->data0 > (sprite->data2 - 10)) - { - sprite->invisible = sprite->data0 % 2; - } - if(sprite->data0 > sprite->data2) move_anim_8072740(sprite); -} - -void sub_80CB768(struct Sprite* sprite) -{ - if(!sprite->data0) - { - sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 1) + gBattleAnimArgs[1]; - sprite->data1 = gBattleAnimArgs[2]; - sprite->data2 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; - } - sprite->data0++; - sprite->pos2.x = sprite->data1 * sprite->data0; - sprite->pos2.y = Sin((sprite->data0 * 20) & 0xFF, sprite->data2); - if(sprite->data0 > sprite->data3) move_anim_8072740(sprite); -} - -void sub_80CB7EC(struct Sprite* sprite, s16 c) -{ - s32 a = (sprite->pos1.x * 256) | sprite->pos1.y; - s32 b = (sprite->data6 * 256) | sprite->data7; - c *= 256; - sprite->data5 = a; - sprite->data6 = b; - sprite->data7 = c; -} - -#ifdef NONMATCHING -bool8 sub_80CB814(struct Sprite* sprite) -{ - s32 a = sprite->data5 >> 8; - s16 d = sprite->data5; - s16 b = sprite->data6 >> 8; - s16 e = sprite->data6; - s16 c = sprite->data7 >> 8; - s16 f = c & 0xFF; - if(!b) - { - b = ~32; - } - else if(b == 255) - { - b = 0x110; - } - sprite->pos1.x = ((b - a) * f / a ) + (((e - d) * f) / a); - sprite->pos2.y = d; - f++; - if(f != a) - { - sprite->data7 = (f << 8) | c; - return FALSE; - } - return TRUE; -} -#else -__attribute__((naked)) -bool8 sub_80CB814(struct Sprite* sprite) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - mov r8, r0\n\ - ldrh r0, [r0, 0x38]\n\ - lsrs r1, r0, 8\n\ - mov r10, r1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r9, r0\n\ - mov r1, r8\n\ - ldrh r0, [r1, 0x3A]\n\ - lsrs r2, r0, 8\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - ldrh r1, [r1, 0x3C]\n\ - lsls r0, r1, 16\n\ - asrs r0, 24\n\ - lsls r0, 16\n\ - lsrs r6, r0, 16\n\ - movs r3, 0xFF\n\ - ands r3, r1\n\ - cmp r2, 0\n\ - bne _080CB84E\n\ - movs r2, 0x20\n\ - negs r2, r2\n\ - b _080CB856\n\ -_080CB84E:\n\ - cmp r2, 0xFF\n\ - bne _080CB856\n\ - movs r2, 0x88\n\ - lsls r2, 1\n\ -_080CB856:\n\ - mov r0, r9\n\ - subs r4, r0\n\ - lsls r4, 16\n\ - lsrs r4, 16\n\ - mov r1, r10\n\ - subs r0, r2, r1\n\ - lsls r5, r3, 16\n\ - asrs r5, 16\n\ - muls r0, r5\n\ - lsls r1, r6, 16\n\ - asrs r7, r1, 16\n\ - adds r1, r7, 0\n\ - bl __divsi3\n\ - adds r6, r0, 0\n\ - lsls r4, 16\n\ - asrs r4, 16\n\ - adds r0, r4, 0\n\ - muls r0, r5\n\ - adds r1, r7, 0\n\ - bl __divsi3\n\ - add r6, r10\n\ - mov r1, r8\n\ - strh r6, [r1, 0x20]\n\ - add r0, r9\n\ - strh r0, [r1, 0x22]\n\ - adds r5, 0x1\n\ - lsls r5, 16\n\ - lsrs r3, r5, 16\n\ - asrs r5, 16\n\ - cmp r5, r7\n\ - beq _080CB8A8\n\ - lsls r1, r7, 8\n\ - lsls r0, r3, 16\n\ - asrs r0, 16\n\ - orrs r0, r1\n\ - mov r1, r8\n\ - strh r0, [r1, 0x3C]\n\ - movs r0, 0\n\ - b _080CB8AA\n\ -_080CB8A8:\n\ - movs r0, 0x1\n\ -_080CB8AA:\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided\n"); -} -#endif - -void sub_80CB8B8(struct Sprite* sprite) -{ - if(sprite->data0 == 10) - { - StartSpriteAffineAnim(sprite, 1); - } - sprite->data0++; - if(sprite->data0 > 50) move_anim_8072740(sprite); -} - -#ifdef NONMATCHING -void sub_80CB8E8(struct Sprite* sprite) -{ - int temp = ((sprite->data3 * 128) / sprite->data4) + sprite->data0; - int zero = 0; - sprite->data0 = temp; - if(sprite->data0 > 0x7F) - { - sprite->data1++; - sprite->data0 = zero; - } - sprite->pos2.y = Sin(sprite->data0 + 0x80, (sprite->data1 * 8) - 30); - if(!sub_80CB814(sprite)) - { - sprite->pos2.y = zero; - sprite->data0 = zero; - sprite->callback = sub_80CB8B8; - } -} -#else -__attribute__((naked)) -void sub_80CB8E8(struct Sprite* sprite) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - adds r4, r0, 0\n\ - movs r1, 0x34\n\ - ldrsh r0, [r4, r1]\n\ - lsls r0, 7\n\ - movs r2, 0x36\n\ - ldrsh r1, [r4, r2]\n\ - bl __divsi3\n\ - ldrh r1, [r4, 0x2E]\n\ - adds r1, r0\n\ - movs r5, 0\n\ - strh r1, [r4, 0x2E]\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - cmp r1, 0x7F\n\ - ble _080CB912\n\ - ldrh r0, [r4, 0x30]\n\ - adds r0, 0x1\n\ - strh r0, [r4, 0x30]\n\ - strh r5, [r4, 0x2E]\n\ -_080CB912:\n\ - ldrh r0, [r4, 0x2E]\n\ - adds r0, 0x80\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - movs r1, 0x30\n\ - ldrsh r2, [r4, r1]\n\ - lsls r2, 3\n\ - movs r1, 0x1E\n\ - subs r1, r2\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - bl Sin\n\ - strh r0, [r4, 0x26]\n\ - adds r0, r4, 0\n\ - bl sub_80CB814\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080CB942\n\ - strh r5, [r4, 0x26]\n\ - strh r5, [r4, 0x2E]\n\ - ldr r0, _080CB948 @ =sub_80CB8B8\n\ - str r0, [r4, 0x1C]\n\ -_080CB942:\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080CB948: .4byte sub_80CB8B8\n\ - .syntax divided\n"); -} -#endif - -void sub_80CB94C(struct Sprite* sprite) -{ - s16 e1; - s16 e2; - sub_80787B0(sprite, 0); - e1 = sub_8077ABC(gBattleAnimEnemyMonIndex, 0); - e2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 1); - if((gBattleAnimPlayerMonIndex ^ 2) == gBattleAnimEnemyMonIndex) - { - sprite->data6 = e1; - sprite->data7 = e2 + 10; - sub_80CB7EC(sprite, 0x3C); - sprite->data3 = 1; - } - else - { - sprite->data6 = e1; - sprite->data7 = e2 + 10; - sub_80CB7EC(sprite, 0x3C); - sprite->data3 = 3; - } - sprite->data4 = 0x3C; - sprite->callback = sub_80CB8E8; -} - -void sub_80CB9C4(struct Sprite* sprite) -{ - int zero; - sprite->data0 += ((sprite->data3 * 128) / sprite->data4); - zero = 0; - if(sprite->data0 > 0x7F) - { - sprite->data1++; - sprite->data0 = zero; - } - sprite->pos2.y = Sin(sprite->data0 + 0x80, 30 - sprite->data1 * 8); - if(sub_80CB814(sprite)) - { - sprite->pos2.y = zero; - sprite->data0 = zero; - move_anim_8072740(sprite); - } -} - -void sub_80CBA28(struct Sprite* sprite) -{ - s16 e = sub_8077ABC(gBattleAnimEnemyMonIndex, 1); - if(GetBankSide(gBattleAnimEnemyMonIndex) == 0) - { - sprite->data6 = 0; - sprite->data7 = e + 10; - sub_80CB7EC(sprite, 0x28); - sprite->data3 = 3; - sprite->data4 = 0x3C; - sprite->callback = sub_80CB8E8; - } - else - { - sprite->data6 = 255; - sprite->data7 = e + 10; - if(IsContest()) sprite->data6 = 0; - sub_80CB7EC(sprite, 0x28); - sprite->data3 = 3; - sprite->data4 = 0x3C; - sprite->callback = sub_80CB9C4; - } -} - -void sub_80CBAA4(struct Sprite* sprite) -{ - if(sprite->data0 == 0) - { - sub_8078764(sprite, 0); - sprite->data1 = gBattleAnimArgs[2]; - } - sprite->data0++; - sprite->pos2.y = sprite->data1 * sprite->data0; - if(sprite->animEnded) move_anim_8072740(sprite); -} - -void sub_80CBAE8(struct Sprite* sprite) -{ - s16 p1; - s16 p2; - sub_8078764(sprite, 0); - p1 = sub_8077ABC(gBattleAnimPlayerMonIndex, 0); - p2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 1); - if((gBattleAnimEnemyMonIndex ^ 2) == gBattleAnimPlayerMonIndex) - { - sprite->data6 = p1; - sprite->data7 = p2 + 10; - sub_80CB7EC(sprite, 0x3c); - sprite->data3 = 1; - } - else - { - sprite->data6 = p1; - sprite->data7 = p2 + 10; - sub_80CB7EC(sprite, 0x3c); - sprite->data3 = 3; - } - sprite->data4 = 0x3C; - sprite->callback = sub_80CBB60; -} - -void sub_80CBB60(struct Sprite* sprite) -{ - int zero; - sprite->data0 += ((sprite->data3 * 128) / sprite->data4); - zero = 0; - if(sprite->data0 > 0x7F) - { - sprite->data1++; - sprite->data0 = zero; - } - sprite->pos2.y = Sin(sprite->data0 + 0x80, 30 - sprite->data1 * 8); - if(sprite->pos2.y == 0) - { - PlaySE12WithPanning(0x7D, sub_8076F98(0x3F)); - } - if(sub_80CB814(sprite)) - { - sprite->pos2.y = 0; - sprite->data0 = 0; - sprite->callback = sub_80CB8B8; - PlaySE12WithPanning(0x7D, sub_8076F98(-0x40)); - } -} - -#ifdef NONMATCHING -void sub_80CBBF0(struct Sprite* sprite) -{ - int a; - int b; - if(sprite->data0 == 0) - { - if(!IsContest()) - { - sprite->data1 = gBattleAnimArgs[1]; - sprite->pos1.x = 0x78; - } - else - { - a = gBattleAnimArgs[1] - 32; - b = a; - if(a < 0) - { - b += gBattleAnimArgs[1] + 0xDF; - } - sprite->data1 = b - a; - sprite->pos1.x = 0x46; - - } - sprite->pos1.y = gBattleAnimArgs[0]; - sprite->data2 = gBattleAnimArgs[0]; - sprite->data4 = 20; - sprite->pos2.x = Cos(sprite->data1, 0x3C); - sprite->pos2.y = Sin(sprite->data1, 20); - sprite->callback = sub_80CBC8C; - if((sprite->data1 - 1) <= 0xBE) - { - sprite->subpriority = 30; - } - else - { - sprite->subpriority = 28; - } - } -} -#else -__attribute__((naked)) -void sub_80CBBF0(struct Sprite* sprite) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - adds r4, r0, 0\n\ - movs r1, 0x2E\n\ - ldrsh r0, [r4, r1]\n\ - cmp r0, 0\n\ - bne _080CBC84\n\ - bl IsContest\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080CBC18\n\ - ldr r0, _080CBC14 @ =gBattleAnimArgs\n\ - ldrh r1, [r0, 0x2]\n\ - strh r1, [r4, 0x30]\n\ - movs r1, 0x78\n\ - strh r1, [r4, 0x20]\n\ - adds r5, r0, 0\n\ - b _080CBC3A\n\ - .align 2, 0\n\ -_080CBC14: .4byte gBattleAnimArgs\n\ -_080CBC18:\n\ - ldr r0, _080CBC74 @ =gBattleAnimArgs\n\ - movs r1, 0x2\n\ - ldrsh r3, [r0, r1]\n\ - adds r1, r3, 0\n\ - subs r1, 0x20\n\ - adds r2, r1, 0\n\ - adds r5, r0, 0\n\ - cmp r1, 0\n\ - bge _080CBC2E\n\ - adds r2, r3, 0\n\ - adds r2, 0xDF\n\ -_080CBC2E:\n\ - asrs r0, r2, 8\n\ - lsls r0, 8\n\ - subs r0, r1, r0\n\ - strh r0, [r4, 0x30]\n\ - movs r0, 0x46\n\ - strh r0, [r4, 0x20]\n\ -_080CBC3A:\n\ - ldrh r0, [r5]\n\ - strh r0, [r4, 0x22]\n\ - strh r0, [r4, 0x32]\n\ - movs r0, 0x14\n\ - strh r0, [r4, 0x36]\n\ - movs r1, 0x30\n\ - ldrsh r0, [r4, r1]\n\ - movs r1, 0x3C\n\ - bl Cos\n\ - strh r0, [r4, 0x24]\n\ - movs r1, 0x30\n\ - ldrsh r0, [r4, r1]\n\ - movs r1, 0x14\n\ - bl Sin\n\ - strh r0, [r4, 0x26]\n\ - ldr r0, _080CBC78 @ =sub_80CBC8C\n\ - str r0, [r4, 0x1C]\n\ - ldrh r0, [r4, 0x30]\n\ - subs r0, 0x1\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - cmp r0, 0xBE\n\ - bhi _080CBC7C\n\ - adds r1, r4, 0\n\ - adds r1, 0x43\n\ - movs r0, 0x1F\n\ - b _080CBC82\n\ - .align 2, 0\n\ -_080CBC74: .4byte gBattleAnimArgs\n\ -_080CBC78: .4byte sub_80CBC8C\n\ -_080CBC7C:\n\ - adds r1, r4, 0\n\ - adds r1, 0x43\n\ - movs r0, 0x1D\n\ -_080CBC82:\n\ - strb r0, [r1]\n\ -_080CBC84:\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif - -void sub_80CBC8C(struct Sprite* sprite) -{ - switch(sprite->data3) - { - case 0: - { - if(sprite->data2 > 0x4E) - { - sprite->data3 = 1; - StartSpriteAffineAnim(sprite, 1); - break; - } - else - { - sprite->data2 += sprite->data4 / 10; - sprite->data4 += 3; - sprite->pos1.y = sprite->data2; - break; - } - } - case 1: - { - if(sprite->data3 && sprite->affineAnimEnded) - { - sprite->data0 = 0; - sprite->data2 = 0; - sprite->callback = sub_80CBCF8; - } - break; - } - } -} - - - -void sub_80CBCF8(struct Sprite* sprite) -{ - if(sprite->data2 == gUnknown_083D680C[sprite->data0][1]) - { - if(gUnknown_083D680C[sprite->data0][2] == 0x7F) - { - sprite->data0 = 0; - sprite->callback = sub_80CBDB0; - } - sprite->data2 = 0; - sprite->data0++; - } - else - { - sprite->data2++; - sprite->data1 = (gUnknown_083D680C[sprite->data0][0] * gUnknown_083D680C[sprite->data0][2] + sprite->data1) & 0xFF; - if (!IsContest()) - { - if((u16)(sprite->data1 - 1) <= 0xBE) - { - sprite->subpriority = 31; - } - else - { - sprite->subpriority = 29; - } - } - sprite->pos2.x = Cos(sprite->data1, 0x3C); - sprite->pos2.y = Sin(sprite->data1, 20); - } -} - -void sub_80CBDB0(struct Sprite* sprite) -{ - if(sprite->data0 > 20) move_anim_8072740(sprite); - sprite->invisible = sprite->data0 % 2; - sprite->data0++; -} - -#ifdef NONMATCHING -void sub_80CBDF4(u8 taskId) -{ - struct Task* task = &gTasks[taskId]; - task->data[4] = sub_8079E90(gBattleAnimEnemyMonIndex) - 1; - task->data[6] = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); - task->data[7] = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); - task->data[10] = sub_807A100(gBattleAnimEnemyMonIndex, 1); - task->data[11] = sub_807A100(gBattleAnimEnemyMonIndex, 0); - if(GetBankSide(gBattleAnimEnemyMonIndex) == 1) - { - task->data[5] = 1; - } - else - { - task->data[5] = -1; - } - task->data[9] = 0x38 - (task->data[5] * 64); - task->data[8] = task->data[7] - task->data[9] + task->data[6]; - task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]); - if(task->data[2] == 0x40) DestroyAnimVisualTask(taskId); - gSprites[task->data[2]].data0 = 10; - gSprites[task->data[2]].data1 = task->data[8]; - gSprites[task->data[2]].data2 = task->data[6] - (((task->data[10] / 2) + 10) * task->data[5]); - gSprites[task->data[2]].data3 = task->data[9]; - gSprites[task->data[2]].data4 = ((task->data[11] / 2) + 10) * task->data[5] + task->data[7]; - gSprites[task->data[2]].data5 = sub_80CC338(&gSprites[task->data[2]]); - sub_80786EC(&gSprites[task->data[2]]); - task->func = sub_80CBF5C; -} -#else -__attribute__((naked)) -void sub_80CBDF4(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - adds r6, r0, 0\n\ - lsls r0, r6, 2\n\ - adds r0, r6\n\ - lsls r0, 3\n\ - ldr r1, _080CBF48 @ =gTasks\n\ - adds r5, r0, r1\n\ - ldr r4, _080CBF4C @ =gBattleAnimEnemyMonIndex\n\ - ldrb r0, [r4]\n\ - bl sub_8079E90\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - subs r0, 0x1\n\ - strh r0, [r5, 0x10]\n\ - ldrb r0, [r4]\n\ - movs r1, 0x2\n\ - bl sub_8077ABC\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - strh r0, [r5, 0x14]\n\ - ldrb r0, [r4]\n\ - movs r1, 0x3\n\ - bl sub_8077ABC\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - strh r0, [r5, 0x16]\n\ - ldrb r0, [r4]\n\ - movs r1, 0x1\n\ - bl sub_807A100\n\ - strh r0, [r5, 0x1C]\n\ - ldrb r0, [r4]\n\ - movs r1, 0\n\ - bl sub_807A100\n\ - strh r0, [r5, 0x1E]\n\ - ldrb r0, [r4]\n\ - bl GetBankSide\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - movs r2, 0x1\n\ - negs r2, r2\n\ - adds r1, r2, 0\n\ - cmp r0, 0x1\n\ - bne _080CBE5C\n\ - movs r1, 0x1\n\ -_080CBE5C:\n\ - strh r1, [r5, 0x12]\n\ - movs r3, 0x12\n\ - ldrsh r0, [r5, r3]\n\ - lsls r0, 6\n\ - movs r1, 0x38\n\ - subs r1, r0\n\ - strh r1, [r5, 0x1A]\n\ - ldrh r0, [r5, 0x16]\n\ - subs r0, r1\n\ - ldrh r1, [r5, 0x14]\n\ - adds r0, r1\n\ - strh r0, [r5, 0x18]\n\ - ldr r0, _080CBF50 @ =gSpriteTemplate_83D6884\n\ - movs r2, 0x18\n\ - ldrsh r1, [r5, r2]\n\ - movs r3, 0x1A\n\ - ldrsh r2, [r5, r3]\n\ - ldrb r3, [r5, 0x10]\n\ - bl CreateSprite\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - strh r0, [r5, 0xC]\n\ - cmp r0, 0x40\n\ - bne _080CBE94\n\ - adds r0, r6, 0\n\ - bl DestroyAnimVisualTask\n\ -_080CBE94:\n\ - ldr r4, _080CBF54 @ =gSprites\n\ - movs r0, 0xC\n\ - ldrsh r1, [r5, r0]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - movs r1, 0xA\n\ - strh r1, [r0, 0x2E]\n\ - movs r2, 0xC\n\ - ldrsh r1, [r5, r2]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - ldrh r1, [r5, 0x18]\n\ - strh r1, [r0, 0x30]\n\ - movs r3, 0xC\n\ - ldrsh r0, [r5, r3]\n\ - lsls r2, r0, 4\n\ - adds r2, r0\n\ - lsls r2, 2\n\ - adds r2, r4\n\ - movs r1, 0x1C\n\ - ldrsh r0, [r5, r1]\n\ - lsrs r1, r0, 31\n\ - adds r0, r1\n\ - asrs r0, 1\n\ - adds r0, 0xA\n\ - movs r3, 0x12\n\ - ldrsh r1, [r5, r3]\n\ - muls r1, r0\n\ - ldrh r0, [r5, 0x14]\n\ - subs r0, r1\n\ - strh r0, [r2, 0x32]\n\ - movs r0, 0xC\n\ - ldrsh r1, [r5, r0]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - ldrh r1, [r5, 0x1A]\n\ - strh r1, [r0, 0x34]\n\ - movs r1, 0xC\n\ - ldrsh r0, [r5, r1]\n\ - lsls r1, r0, 4\n\ - adds r1, r0\n\ - lsls r1, 2\n\ - adds r1, r4\n\ - movs r2, 0x1E\n\ - ldrsh r0, [r5, r2]\n\ - lsrs r2, r0, 31\n\ - adds r0, r2\n\ - asrs r0, 1\n\ - adds r0, 0xA\n\ - movs r3, 0x12\n\ - ldrsh r2, [r5, r3]\n\ - muls r0, r2\n\ - ldrh r2, [r5, 0x16]\n\ - adds r0, r2\n\ - strh r0, [r1, 0x36]\n\ - movs r3, 0xC\n\ - ldrsh r1, [r5, r3]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - bl sub_80CC338\n\ - movs r1, 0xC\n\ - ldrsh r2, [r5, r1]\n\ - lsls r1, r2, 4\n\ - adds r1, r2\n\ - lsls r1, 2\n\ - adds r1, r4\n\ - strh r0, [r1, 0x38]\n\ - movs r2, 0xC\n\ - ldrsh r1, [r5, r2]\n\ - lsls r0, r1, 4\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - bl sub_80786EC\n\ - ldr r0, _080CBF58 @ =sub_80CBF5C\n\ - str r0, [r5]\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080CBF48: .4byte gTasks\n\ -_080CBF4C: .4byte gBattleAnimEnemyMonIndex\n\ -_080CBF50: .4byte gSpriteTemplate_83D6884\n\ -_080CBF54: .4byte gSprites\n\ -_080CBF58: .4byte sub_80CBF5C\n\ - .syntax divided\n"); -} -#endif - -void sub_80CBF5C(u8 taskId) -{ - struct Task* task = &gTasks[taskId]; - struct Sprite* sprite = &gSprites[task->data[2]]; - int a = task->data[0]; - switch(a) - { - case 4: - { - sub_80CC358(task, taskId); - if(sub_8078718(sprite) == 0) - { - break; - } - else - { - task->data[15] = 5; - task->data[0] = 0xFF; - break; - } - } - case 8: - { - sub_80CC358(task, taskId); - if(sub_8078718(sprite) == 0) - { - break; - } - else - { - task->data[15] = 9; - task->data[0] = 0xFF; - break; - } - } - case 0: - { - sub_80CC358(task, taskId); - if(sub_8078718(sprite) == 0) - { - break; - } - task->data[15] = 1; - task->data[0] = 0xFF; - break; - } - case 1: - { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7]; - sprite->data5 = sub_80CC338(sprite); - task->data[4] += 2; - task->data[3] = a; - sprite->subpriority = task->data[4]; - StartSpriteAnim(sprite, task->data[3]); - sub_80786EC(sprite); - task->data[0]++; - break; - } - case 2: - { - sub_80CC358(task, taskId); - if(sub_8078718(sprite) == 0) - { - break; - } - task->data[15] = 3; - task->data[0] = 0xFF; - break; - } - case 3: - { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data5 = sub_80CC338(sprite); - task->data[3] = 2; - sprite->subpriority = task->data[4]; - StartSpriteAnim(sprite, task->data[3]); - sub_80786EC(sprite); - task->data[0]++; - break; - } - case 5: - { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data5 = sub_80CC338(sprite); - task->data[4] -= 2; - task->data[3] = 3; - sprite->subpriority = task->data[4]; - StartSpriteAnim(sprite, task->data[3]); - sub_80786EC(sprite); - task->data[0]++; - break; - } - case 6: - { - sub_80CC358(task, taskId); - if(sub_8078718(sprite) == 0) - { - break; - } - task->data[15] = 7; - task->data[0] = 0xFF; - break; - } - case 7: - { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7]; - sprite->data5 = sub_80CC338(sprite); - task->data[4] += 2; - task->data[3] = 4; - sprite->subpriority = task->data[4]; - StartSpriteAnim(sprite, task->data[3]); - sub_80786EC(sprite); - task->data[0]++; - break; - } - case 9: - { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data5 = sub_80CC338(sprite); - task->data[3] = 5; - sprite->subpriority = task->data[4]; - StartSpriteAnim(sprite, task->data[3]); - sub_80786EC(sprite); - task->data[0]++; - break; - } - case 10: - { - sub_80CC358(task, taskId); - if(sub_8078718(sprite) == 0) - { - break; - } - else - { - task->data[15] = 11; - task->data[0] = 0xFF; - break; - } - } - case 11: - { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; - sprite->data0 = 10; - sprite->data1 = sprite->pos1.x; - sprite->data2 = task->data[8]; - sprite->data3 = sprite->pos1.y; - sprite->data4 = task->data[9]; - sprite->data5 = sub_80CC338(sprite); - task->data[4] -= 2; - task->data[3] = 6; - sprite->subpriority = task->data[4]; - StartSpriteAnim(sprite, task->data[3]); - sub_80786EC(sprite); - task->data[0]++; - break; - } - case 12: - { - sub_80CC358(task, taskId); - if(sub_8078718(sprite) != 0) - { - DestroySprite(sprite); - task->data[0]++; - } - break; - } - case 13: - { - if(task->data[12] == 0) - { - DestroyAnimVisualTask(taskId); - break; - } - break; - } - case 255: - { - task->data[1]++; - if(task->data[1] > 5) - { - task->data[1] = 0; - task->data[0] = task->data[15]; - } - } - } -} - -s16 sub_80CC338(struct Sprite* sprite) -{ - s16 var = 8; - if(sprite->data4 < sprite->pos1.y) var = -var; - return var; -} - -void sub_80CC358(struct Task* task, u8 taskId) -{ - task->data[14]++; - if(task->data[14] > 0) - { - u8 spriteId; - s16 spriteX; - s16 spriteY; - task->data[14] = 0; - spriteX = gSprites[task->data[2]].pos1.x + gSprites[task->data[2]].pos2.x; - spriteY = gSprites[task->data[2]].pos1.y + gSprites[task->data[2]].pos2.y; - spriteId = CreateSprite(&gSpriteTemplate_83D6884, spriteX, spriteY, task->data[4]); - if (spriteId != 0x40) - { - gSprites[spriteId].data6 = taskId; - gSprites[spriteId].data7 = 12; - gTasks[taskId].data[12]++; - gSprites[spriteId].data0 = task->data[13] & 1; - gTasks[taskId].data[13]++; - StartSpriteAnim(&gSprites[spriteId], task->data[3]); - gSprites[spriteId].subpriority = task->data[4]; - gSprites[spriteId].callback = sub_80CC408; - } - } -} - -void sub_80CC408(struct Sprite* sprite) -{ - sprite->data0++; - if (sprite->data0 > 1) - { - sprite->data0 = 0; - sprite->invisible ^= 1; - sprite->data1++; - if(sprite->data1 > 8) - { - gTasks[sprite->data6].data[sprite->data7]--; - DestroySprite(sprite); - } - } -} - -void sub_80CC474(struct Sprite* sprite) -{ - u8 bank; - if (!gBattleAnimArgs[6]) - bank = gBattleAnimPlayerMonIndex; - else - bank = gBattleAnimEnemyMonIndex; - if (GetBankSide(bank) != 0) - { - sprite->data4 = 0; - sprite->data2 = gBattleAnimArgs[3]; - sprite->pos1.x = 0xFFF0; - } - else - { - sprite->data4 = 1; - sprite->data2 = -gBattleAnimArgs[3]; - sprite->pos1.x = 0x100; - } - sprite->data1 = gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data3 = gBattleAnimArgs[4]; - switch(gBattleAnimArgs[5]) - { - case 0: - { - sprite->pos1.y = gBattleAnimArgs[0]; - sprite->oam.priority = sub_8079ED4(bank); - break; - } - case 1: - { - sprite->pos1.y = gBattleAnimArgs[0]; - sprite->oam.priority = sub_8079ED4(bank) + 1; - break; - } - case 2: - { - sprite->pos1.y = sub_8077ABC(bank, 3) + gBattleAnimArgs[0]; - sprite->oam.priority = sub_8079ED4(bank); - break; - } - case 3: - { - sprite->pos1.y = sub_8077ABC(gBattleAnimEnemyMonIndex, 3) + gBattleAnimArgs[0]; - obj_id_for_side_relative_to_move(1); - sprite->oam.priority = sub_8079ED4(bank) + 1; - break; - } - } - sprite->callback = sub_80CC580; -} - -// why did you make me use gotos WHY -void sub_80CC580(struct Sprite* sprite) -{ - int a = sprite->data7; - sprite->data7++; - sprite->pos2.y = (sprite->data1 * gSineTable[sprite->data0]) >> 8; - sprite->pos2.x = sprite->data2 * a; - sprite->data0 = (sprite->data3 * a) & 0xFF; - if (sprite->data4 == 0) - { - if (sprite->pos2.x + sprite->pos1.x <= 0xF7) return; - else goto END; - } - else if (sprite->data4 != 0 && sprite->pos2.x + sprite->pos1.x <= -16) - { - goto END; - } - else - return; - - END: - move_anim_8074EE0(sprite); -} - -void sub_80CC5F8(u8 taskId) -{ - struct Task* task = &gTasks[taskId]; - switch(task->data[0]) - { - case 0: - { - task->data[8] = IndexOfSpritePaletteTag(0x274f) * 16 + 256; - task->data[12] = IndexOfSpritePaletteTag(0x27b0) * 16 + 256; - task->data[0]++; - break; - } - case 1: - { - task->data[9]++; - if(task->data[9] >= 0) - { - task->data[9] = 0; - BlendPalette(task->data[8], 0x10, task->data[10], gUnknown_083D6984[task->data[11]]); - BlendPalette(task->data[12], 0x10, task->data[10], gUnknown_083D6984[task->data[11]]); - task->data[10]++; - if(task->data[10] == 17) - { - task->data[10] = 0; - task->data[11]++; - if(task->data[11] == 7) task->data[11] = 0; - } - } - break; - } - } - if(gBattleAnimArgs[7] == -1) DestroyAnimVisualTask(taskId); -} - -#ifdef NONMATCHING -void sub_80CC6CC(struct Sprite* sprite) -{ - u8 a; - u8 b; - u8 bank; - int c; - u16 x; - u16 y; - if (gBattleAnimArgs[4] == 0) - { - move_anim_8072740(sprite); - } - else - { - - if (gBattleAnimArgs[0] == 0) bank = gBattleAnimPlayerMonIndex; - else - bank = gBattleAnimEnemyMonIndex; - a = sub_8077ABC(bank, 2); - b = sub_8077ABC(bank, 3); - sprite->data0 = gBattleAnimArgs[4]; - if (gBattleAnimArgs[1] == 0) - { - sprite->pos1.x = gBattleAnimArgs[2] + a; - sprite->pos1.y = gBattleAnimArgs[3] + b; - sprite->data5 = a; - sprite->data6 = b; - } - else - { - sprite->pos1.x = a; - sprite->pos1.y = b; - sprite->data5 = gBattleAnimArgs[2] + a; - sprite->data6 = gBattleAnimArgs[3] + b; - } - x = sprite->pos1.x; - sprite->data1 = x * 16; - y = sprite->pos1.y; - sprite->data2 = y * 16; - sprite->data3 = ((sprite->data5 - sprite->pos1.x) * 16) / gBattleAnimArgs[4]; - sprite->data4 = ((sprite->data6 - sprite->pos1.y) * 16) / gBattleAnimArgs[4]; - c = sub_80790F0(sprite->data5 - x, sprite->data6 - y); - if(IsContest() != 0) c = c + -0x8000; - sub_8078FDC(sprite, 0, 0x100, 0x100, c); - sprite->callback = sub_80CC7D4; - } -} -#else -__attribute__((naked)) -void sub_80CC6CC(struct Sprite* sprite) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - sub sp, 0x4\n\ - adds r6, r0, 0\n\ - ldr r1, _080CC6E4 @ =gBattleAnimArgs\n\ - movs r2, 0x8\n\ - ldrsh r0, [r1, r2]\n\ - cmp r0, 0\n\ - bne _080CC6E8\n\ - adds r0, r6, 0\n\ - bl move_anim_8072740\n\ - b _080CC7C2\n\ - .align 2, 0\n\ -_080CC6E4: .4byte gBattleAnimArgs\n\ -_080CC6E8:\n\ - movs r3, 0\n\ - ldrsh r0, [r1, r3]\n\ - cmp r0, 0\n\ - bne _080CC6F8\n\ - ldr r4, _080CC6F4 @ =gBattleAnimPlayerMonIndex\n\ - b _080CC6FA\n\ - .align 2, 0\n\ -_080CC6F4: .4byte gBattleAnimPlayerMonIndex\n\ -_080CC6F8:\n\ - ldr r4, _080CC734 @ =gBattleAnimEnemyMonIndex\n\ -_080CC6FA:\n\ - ldrb r0, [r4]\n\ - movs r1, 0x2\n\ - bl sub_8077ABC\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - ldrb r0, [r4]\n\ - movs r1, 0x3\n\ - bl sub_8077ABC\n\ - lsls r0, 24\n\ - lsrs r2, r0, 24\n\ - ldr r0, _080CC738 @ =gBattleAnimArgs\n\ - ldrh r1, [r0, 0x8]\n\ - strh r1, [r6, 0x2E]\n\ - movs r3, 0x2\n\ - ldrsh r1, [r0, r3]\n\ - adds r7, r0, 0\n\ - cmp r1, 0\n\ - bne _080CC73C\n\ - ldrh r0, [r7, 0x4]\n\ - adds r0, r5\n\ - strh r0, [r6, 0x20]\n\ - ldrh r0, [r7, 0x6]\n\ - adds r0, r2\n\ - strh r0, [r6, 0x22]\n\ - strh r5, [r6, 0x38]\n\ - strh r2, [r6, 0x3A]\n\ - b _080CC74C\n\ - .align 2, 0\n\ -_080CC734: .4byte gBattleAnimEnemyMonIndex\n\ -_080CC738: .4byte gBattleAnimArgs\n\ -_080CC73C:\n\ - strh r5, [r6, 0x20]\n\ - strh r2, [r6, 0x22]\n\ - ldrh r0, [r7, 0x4]\n\ - adds r0, r5\n\ - strh r0, [r6, 0x38]\n\ - ldrh r0, [r7, 0x6]\n\ - adds r0, r2\n\ - strh r0, [r6, 0x3A]\n\ -_080CC74C:\n\ - ldrh r4, [r6, 0x20]\n\ - lsls r0, r4, 4\n\ - strh r0, [r6, 0x30]\n\ - ldrh r5, [r6, 0x22]\n\ - lsls r0, r5, 4\n\ - strh r0, [r6, 0x32]\n\ - movs r1, 0x38\n\ - ldrsh r0, [r6, r1]\n\ - movs r2, 0x20\n\ - ldrsh r1, [r6, r2]\n\ - subs r0, r1\n\ - lsls r0, 4\n\ - movs r3, 0x8\n\ - ldrsh r1, [r7, r3]\n\ - bl __divsi3\n\ - strh r0, [r6, 0x34]\n\ - movs r1, 0x3A\n\ - ldrsh r0, [r6, r1]\n\ - movs r2, 0x22\n\ - ldrsh r1, [r6, r2]\n\ - subs r0, r1\n\ - lsls r0, 4\n\ - movs r3, 0x8\n\ - ldrsh r1, [r7, r3]\n\ - bl __divsi3\n\ - strh r0, [r6, 0x36]\n\ - ldrh r0, [r6, 0x38]\n\ - subs r0, r4\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - ldrh r1, [r6, 0x3A]\n\ - subs r1, r5\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - bl sub_80790F0\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - bl IsContest\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080CC7AE\n\ - ldr r1, _080CC7CC @ =0xffff8000\n\ - adds r0, r4, r1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ -_080CC7AE:\n\ - movs r3, 0x80\n\ - lsls r3, 1\n\ - str r4, [sp]\n\ - adds r0, r6, 0\n\ - movs r1, 0\n\ - adds r2, r3, 0\n\ - bl sub_8078FDC\n\ - ldr r0, _080CC7D0 @ =sub_80CC7D4\n\ - str r0, [r6, 0x1C]\n\ -_080CC7C2:\n\ - add sp, 0x4\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080CC7CC: .4byte 0xffff8000\n\ -_080CC7D0: .4byte sub_80CC7D4\n\ - .syntax divided\n"); -} -#endif - -void sub_80CC7D4(struct Sprite* sprite) -{ - if(sprite->data0) - { - sprite->data1 += sprite->data3; - sprite->data2 += sprite->data4; - sprite->pos1.x = sprite->data1 >> 4 ; - sprite->pos1.y = sprite->data2 >> 4 ; - sprite->data0--; - } - else - move_anim_8074EE0(sprite); -} - -void sub_80CC810(struct Sprite* sprite) -{ - if(sprite->animEnded) - move_anim_8072740(sprite); -} - -void sub_80CC82C(struct Sprite* sprite) -{ - if(GetBankSide(gBattleAnimPlayerMonIndex) != 0) - { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; - } - else - { - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; - } - sprite->callback = sub_8078600; - oamt_set_x3A_32(sprite, move_anim_8072740); -} - -void sub_80CC884(struct Sprite* sprite) -{ - if(GetBankSide(gBattleAnimPlayerMonIndex) == 0) - StartSpriteAnim(sprite, 1); - sprite->callback = sub_80CC810; - sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; -} - -void sub_80CC8C8(struct Sprite* sprite) -{ - sprite->pos1.x += gBattleAnimArgs[0]; - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; - sprite->data5 = gBattleAnimArgs[5]; - StartSpriteAffineAnim(sprite, gBattleAnimArgs[6]); - oamt_set_x3A_32(sprite, move_anim_8074EE0); - sprite->callback = sub_8078504; -} - -void sub_80CC914(struct Sprite* sprite) -{ - sprite->pos1.x = sub_8077ABC(gBattleAnimEnemyMonIndex, 0); - sprite->pos1.y = sub_8077ABC(gBattleAnimEnemyMonIndex, 1); - if(GetBankSide(gBattleAnimEnemyMonIndex) == 0) - sprite->pos1.y += 8; - sprite->callback = sub_80CCB00; - if(gBattleAnimArgs[2] == 0) - sprite->pos1.x += gBattleAnimArgs[0]; - else - { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->hFlip = 1; - } - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data1 -= 0x400; - sprite->data2 += 0x400; - sprite->data5 = gBattleAnimArgs[2]; - if(sprite->data5 == 1) - sprite->data1 = -sprite->data1; -} - -void sub_80CC9BC(struct Sprite* sprite) -{ - u8 a; - u8 b; - switch(gBattleAnimArgs[3]) - { - case 1: - { - a = sub_8077ABC(gBattleAnimEnemyMonIndex ^ 2, 0); - b = sub_8077ABC(gBattleAnimEnemyMonIndex ^ 2, 1); - break; - } - case 2: - { - a = sub_8077ABC(gBattleAnimEnemyMonIndex, 0); - b = sub_8077ABC(gBattleAnimEnemyMonIndex, 1); - if(b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) - { - a = (sub_8077ABC(gBattleAnimEnemyMonIndex ^ 2, 0) + a) / 2; - b = (sub_8077ABC(gBattleAnimEnemyMonIndex ^ 2, 1) + b) / 2; - } - break; - } - case 0: - default: - { - a = sub_8077ABC(gBattleAnimEnemyMonIndex, 0); - b = sub_8077ABC(gBattleAnimEnemyMonIndex, 1); - break; - } - } - sprite->pos1.x = a; - sprite->pos1.y = b; - if(GetBankSide(gBattleAnimEnemyMonIndex) == 0) - sprite->pos1.y += 8; - sprite->callback = sub_80CCB00; - if(gBattleAnimArgs[2] == 0) - sprite->pos1.x += gBattleAnimArgs[0]; - else - { - sprite->pos1.x -= gBattleAnimArgs[0]; - sprite->hFlip = 1; - } - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data1 -= 0x400; - sprite->data2 += 0x400; - sprite->data5 = gBattleAnimArgs[2]; - if(sprite->data5 == 1) - sprite->data1 = -sprite->data1; -} - -void sub_80CCB00(struct Sprite* sprite) -{ - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - if(sprite->data5 == 0) - sprite->data1 += 0x18; - else - sprite->data1 -= 0x18; - sprite->data2 -= 0x18; - sprite->pos2.x = sprite->data3 >> 8; - sprite->pos2.y = sprite->data4 >> 8; - sprite->data0++; - if(sprite->data0 == 20) - { - oamt_set_x3A_32(sprite, move_anim_8072740); - sprite->data0 = 3; - sprite->callback = sub_80782D8; - } -} - -void unref_sub_80CCB6C(struct Sprite* sprite) -{ - if(sprite->data2 > 1) - { - if(sprite->data3 & 1) - { - sprite->invisible = 0; - gSprites[sprite->data0].invisible = 0; - gSprites[sprite->data1].invisible = 0; - } - else - { - sprite->invisible = 1; - gSprites[sprite->data0].invisible = 1; - gSprites[sprite->data1].invisible = 1; - } - sprite->data2 = 0; - sprite->data3++; - } - else - { - sprite->data2++; - } - if(sprite->data3 == 10) - { - DestroySprite(&gSprites[sprite->data0]); - DestroySprite(&gSprites[sprite->data1]); - move_anim_8072740(sprite); - } -} - -void sub_80CCC50(struct Sprite* sprite) -{ - sprite->data0 = gBattleAnimArgs[2]; - if(GetBankSide(gBattleAnimPlayerMonIndex) != 0) - sprite->pos1.x -= gBattleAnimArgs[0]; - else - sprite->pos1.x += gBattleAnimArgs[0]; - StartSpriteAnim(sprite, gBattleAnimArgs[5]); - sprite->data1 = -gBattleAnimArgs[3]; - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data3 = gBattleAnimArgs[4]; - sprite->callback = sub_80CCCB4; - sub_80CCCB4(sprite); -} - -void sub_80CCCB4(struct Sprite* sprite) -{ - sprite->pos2.x = Cos(sprite->data0, 100); - sprite->pos2.y = Sin(sprite->data0, 20); - if(sprite->data0 <= 0x7F) - sprite->subpriority = 0; - else - sprite->subpriority = 14; - sprite->data0 = (sprite->data0 + sprite->data1) & 0xFF; - sprite->data5 += 0x82; - sprite->pos2.y += sprite->data5 >> 8; - sprite->data2++; - if(sprite->data2 == sprite->data3) - move_anim_8072740(sprite); -} - -void sub_80CCD24(struct Sprite* sprite) -{ - if(IsContest() != 0) - { - gBattleAnimArgs[1] += 8; - } - sprite->pos1.x = sub_8077EE4(gBattleAnimPlayerMonIndex, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gBattleAnimPlayerMonIndex, 1) + gBattleAnimArgs[1]; - if (GetBankSide(gBattleAnimPlayerMonIndex) == 0 || IsContest()) - sprite->oam.priority = sub_8079ED4(gBattleAnimPlayerMonIndex) + 1; - else - sprite->oam.priority = sub_8079ED4(gBattleAnimPlayerMonIndex); - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100; - sprite->data7 = 16; - REG_BLDCNT = 0x3F40; - REG_BLDALPHA = (sprite->data7 << 8) | (16 - sprite->data7); - sprite->callback = sub_80CCE0C; -} - -- cgit v1.2.3 From 8db934fcdcbb0dced900996e860c06b956bec2dc Mon Sep 17 00:00:00 2001 From: golemgalvanize Date: Sun, 13 Aug 2017 19:32:13 -0400 Subject: Update battle_anim_80CA710.s reverted --- asm/battle_anim_80CA710.s | 5068 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 5068 insertions(+) diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s index bc41f1d34..fd5b9fb88 100644 --- a/asm/battle_anim_80CA710.s +++ b/asm/battle_anim_80CA710.s @@ -6,6 +6,5074 @@ .text + thumb_func_start sub_80CA710 +sub_80CA710: @ 80CA710 + push {r4,r5,lr} + adds r4, r0, 0 + ldr r5, _080CA744 @ =gBattleAnimArgs + ldrh r0, [r5] + ldrh r1, [r4, 0x20] + adds r0, r1 + strh r0, [r4, 0x20] + ldrh r0, [r5, 0x2] + ldrh r1, [r4, 0x22] + adds r0, r1 + strh r0, [r4, 0x22] + ldrh r0, [r5, 0x4] + strh r0, [r4, 0x2E] + ldrh r0, [r5, 0x6] + strh r0, [r4, 0x30] + ldr r0, _080CA748 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CA74C + ldrh r0, [r5, 0x8] + negs r0, r0 + b _080CA74E + .align 2, 0 +_080CA744: .4byte gBattleAnimArgs +_080CA748: .4byte gBattleAnimPlayerMonIndex +_080CA74C: + ldrh r0, [r5, 0x8] +_080CA74E: + strh r0, [r4, 0x34] + ldr r0, _080CA760 @ =gBattleAnimArgs + ldrh r0, [r0, 0xA] + strh r0, [r4, 0x36] + ldr r0, _080CA764 @ =sub_80CA768 + str r0, [r4, 0x1C] + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CA760: .4byte gBattleAnimArgs +_080CA764: .4byte sub_80CA768 + thumb_func_end sub_80CA710 + + thumb_func_start sub_80CA768 +sub_80CA768: @ 80CA768 + push {r4,lr} + adds r4, r0, 0 + ldrh r1, [r4, 0x2E] + movs r2, 0x2E + ldrsh r0, [r4, r2] + cmp r0, 0 + ble _080CA7A4 + subs r0, r1, 0x1 + strh r0, [r4, 0x2E] + ldrh r1, [r4, 0x32] + lsls r0, r1, 16 + asrs r0, 24 + strh r0, [r4, 0x26] + ldrh r0, [r4, 0x30] + adds r1, r0 + strh r1, [r4, 0x32] + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r2, 0x34 + ldrsh r1, [r4, r2] + bl Sin + strh r0, [r4, 0x24] + ldrh r0, [r4, 0x36] + ldrh r1, [r4, 0x38] + adds r0, r1 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x38] + b _080CA7AA +_080CA7A4: + adds r0, r4, 0 + bl move_anim_8072740 +_080CA7AA: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CA768 + + thumb_func_start sub_80CA7B0 +sub_80CA7B0: @ 80CA7B0 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x1 + bl sub_80787B0 + ldr r0, _080CA7F0 @ =gBattleAnimArgs + ldrh r0, [r0, 0x4] + strh r0, [r4, 0x2E] + ldr r5, _080CA7F4 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r5] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x32] + ldrb r0, [r5] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x36] + ldr r0, _080CA7F8 @ =sub_8078B34 + str r0, [r4, 0x1C] + ldr r1, _080CA7FC @ =move_anim_8074EE0 + adds r0, r4, 0 + bl oamt_set_x3A_32 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CA7F0: .4byte gBattleAnimArgs +_080CA7F4: .4byte gBattleAnimPlayerMonIndex +_080CA7F8: .4byte sub_8078B34 +_080CA7FC: .4byte move_anim_8074EE0 + thumb_func_end sub_80CA7B0 + + thumb_func_start sub_80CA800 +sub_80CA800: @ 80CA800 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x1 + bl sub_80787B0 + ldr r5, _080CA848 @ =gBattleAnimArgs + ldrb r1, [r5, 0x6] + adds r0, r4, 0 + bl StartSpriteAnim + ldrh r0, [r5, 0x4] + strh r0, [r4, 0x2E] + ldr r5, _080CA84C @ =gBattleAnimEnemyMonIndex + ldrb r0, [r5] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x32] + ldrb r0, [r5] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x36] + ldr r0, _080CA850 @ =sub_8078B34 + str r0, [r4, 0x1C] + ldr r1, _080CA854 @ =move_anim_8072740 + adds r0, r4, 0 + bl oamt_set_x3A_32 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CA848: .4byte gBattleAnimArgs +_080CA84C: .4byte gBattleAnimEnemyMonIndex +_080CA850: .4byte sub_8078B34 +_080CA854: .4byte move_anim_8072740 + thumb_func_end sub_80CA800 + + thumb_func_start sub_80CA858 +sub_80CA858: @ 80CA858 + push {r4-r6,lr} + adds r4, r0, 0 + movs r1, 0x1 + bl sub_80787B0 + ldr r6, _080CA8A8 @ =gBattleAnimArgs + ldrh r0, [r6, 0x4] + strh r0, [r4, 0x2E] + ldrh r0, [r4, 0x20] + strh r0, [r4, 0x30] + ldr r5, _080CA8AC @ =gBattleAnimEnemyMonIndex + ldrb r0, [r5] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x32] + ldrh r0, [r4, 0x22] + strh r0, [r4, 0x34] + ldrb r0, [r5] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl obj_translate_based_on_private_1_2_3_4 + ldrh r0, [r6, 0x6] + strh r0, [r4, 0x38] + ldr r1, _080CA8B0 @ =sub_80CA8B4 + str r1, [r4, 0x1C] + adds r0, r4, 0 + bl _call_via_r1 + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CA8A8: .4byte gBattleAnimArgs +_080CA8AC: .4byte gBattleAnimEnemyMonIndex +_080CA8B0: .4byte sub_80CA8B4 + thumb_func_end sub_80CA858 + + thumb_func_start sub_80CA8B4 +sub_80CA8B4: @ 80CA8B4 + push {r4,lr} + adds r4, r0, 0 + bl sub_8078B5C + lsls r0, 24 + cmp r0, 0 + beq _080CA8CA + adds r0, r4, 0 + bl DestroySprite + b _080CA91E +_080CA8CA: + movs r1, 0x38 + ldrsh r0, [r4, r1] + cmp r0, 0x7F + ble _080CA8E4 + ldr r0, _080CA8E0 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl sub_8079E90 + adds r0, 0x1 + b _080CA8EE + .align 2, 0 +_080CA8E0: .4byte gBattleAnimEnemyMonIndex +_080CA8E4: + ldr r0, _080CA924 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl sub_8079E90 + adds r0, 0x6 +_080CA8EE: + adds r1, r4, 0 + adds r1, 0x43 + strb r0, [r1] + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r1, 0x5 + bl Sin + ldrh r1, [r4, 0x24] + adds r0, r1 + strh r0, [r4, 0x24] + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r1, 0xE + bl Cos + ldrh r1, [r4, 0x26] + adds r0, r1 + strh r0, [r4, 0x26] + ldrh r0, [r4, 0x38] + adds r0, 0xF + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x38] +_080CA91E: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CA924: .4byte gBattleAnimEnemyMonIndex + thumb_func_end sub_80CA8B4 + + thumb_func_start sub_80CA928 +sub_80CA928: @ 80CA928 + push {r4-r6,lr} + lsls r0, 24 + lsrs r0, 24 + adds r6, r0, 0 + ldr r1, _080CA998 @ =gTasks + lsls r0, r6, 2 + adds r0, r6 + lsls r0, 3 + adds r5, r0, r1 + ldrh r0, [r5, 0x8] + subs r0, 0x1 + movs r2, 0 + strh r0, [r5, 0x8] + lsls r0, 16 + asrs r0, 16 + movs r1, 0x1 + negs r1, r1 + cmp r0, r1 + bne _080CA982 + ldrh r0, [r5, 0xA] + adds r0, 0x1 + strh r0, [r5, 0xA] + movs r0, 0x6 + strh r0, [r5, 0x8] + ldr r1, _080CA99C @ =gBattleAnimArgs + movs r0, 0xF + strh r0, [r1] + strh r2, [r1, 0x2] + movs r0, 0x50 + strh r0, [r1, 0x4] + strh r2, [r1, 0x6] + ldr r4, _080CA9A0 @ =gSpriteTemplate_83D631C + ldr r0, _080CA9A4 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl sub_8079E90 + adds r3, r0, 0 + adds r3, 0x1 + lsls r3, 24 + lsrs r3, 24 + adds r0, r4, 0 + movs r1, 0 + movs r2, 0 + bl CreateSpriteAndAnimate +_080CA982: + movs r1, 0xA + ldrsh r0, [r5, r1] + cmp r0, 0xF + bne _080CA990 + adds r0, r6, 0 + bl DestroyAnimVisualTask +_080CA990: + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CA998: .4byte gTasks +_080CA99C: .4byte gBattleAnimArgs +_080CA9A0: .4byte gSpriteTemplate_83D631C +_080CA9A4: .4byte gBattleAnimEnemyMonIndex + thumb_func_end sub_80CA928 + + thumb_func_start sub_80CA9A8 +sub_80CA9A8: @ 80CA9A8 + push {r4-r6,lr} + adds r4, r0, 0 + movs r1, 0x1 + bl sub_8078764 + ldr r6, _080CA9EC @ =gBattleAnimArgs + ldrh r0, [r6, 0x6] + strh r0, [r4, 0x2E] + ldr r5, _080CA9F0 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r5] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x32] + ldrb r0, [r5] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x36] + ldrh r0, [r6, 0x4] + strh r0, [r4, 0x38] + adds r0, r4, 0 + bl sub_80786EC + ldr r0, _080CA9F4 @ =sub_80CA9F8 + str r0, [r4, 0x1C] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CA9EC: .4byte gBattleAnimArgs +_080CA9F0: .4byte gBattleAnimPlayerMonIndex +_080CA9F4: .4byte sub_80CA9F8 + thumb_func_end sub_80CA9A8 + + thumb_func_start sub_80CA9F8 +sub_80CA9F8: @ 80CA9F8 + push {r4,lr} + adds r4, r0, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + beq _080CAA0C + adds r0, r4, 0 + bl move_anim_8072740 +_080CAA0C: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CA9F8 + + thumb_func_start sub_80CAA14 +sub_80CAA14: @ 80CAA14 + push {r4,r5,lr} + adds r5, r0, 0 + bl Random + adds r1, r0, 0 + lsls r1, 16 + lsrs r1, 16 + movs r0, 0x7 + ands r1, r0 + adds r0, r5, 0 + bl StartSpriteAnim + ldr r4, _080CAA5C @ =gBattleAnimPlayerMonIndex + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x20] + ldrb r0, [r4] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x22] + ldrb r0, [r4] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CAA60 + ldrh r0, [r5, 0x20] + subs r0, 0x14 + b _080CAA64 + .align 2, 0 +_080CAA5C: .4byte gBattleAnimPlayerMonIndex +_080CAA60: + ldrh r0, [r5, 0x20] + adds r0, 0x14 +_080CAA64: + strh r0, [r5, 0x20] + bl Random + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1F + ands r0, r1 + adds r0, 0x40 + strh r0, [r5, 0x2E] + ldrh r0, [r5, 0x20] + strh r0, [r5, 0x30] + ldr r4, _080CAAC4 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x32] + ldrh r0, [r5, 0x22] + strh r0, [r5, 0x34] + ldrb r0, [r4] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x36] + adds r0, r5, 0 + bl sub_8078D60 + bl Random + movs r1, 0xFF + ands r1, r0 + strh r1, [r5, 0x38] + adds r0, r5, 0 + adds r0, 0x43 + ldrb r0, [r0] + strh r0, [r5, 0x3A] + ldr r1, _080CAAC8 @ =sub_80CAACC + str r1, [r5, 0x1C] + adds r0, r5, 0 + bl _call_via_r1 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CAAC4: .4byte gBattleAnimEnemyMonIndex +_080CAAC8: .4byte sub_80CAACC + thumb_func_end sub_80CAA14 + + thumb_func_start sub_80CAACC +sub_80CAACC: @ 80CAACC + push {r4,lr} + adds r4, r0, 0 + bl sub_8078CE8 + lsls r0, 24 + cmp r0, 0 + beq _080CAAE2 + adds r0, r4, 0 + bl move_anim_8072740 + b _080CAB12 +_080CAAE2: + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r1, 0xC + bl Cos + ldrh r1, [r4, 0x26] + adds r0, r1 + strh r0, [r4, 0x26] + movs r1, 0x38 + ldrsh r0, [r4, r1] + cmp r0, 0x7E + bgt _080CAAFE + ldrh r0, [r4, 0x3A] + b _080CAB02 +_080CAAFE: + ldrh r0, [r4, 0x3A] + adds r0, 0x1 +_080CAB02: + adds r1, r4, 0 + adds r1, 0x43 + strb r0, [r1] + ldrh r0, [r4, 0x38] + adds r0, 0x18 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x38] +_080CAB12: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CAACC + + thumb_func_start sub_80CAB18 +sub_80CAB18: @ 80CAB18 + push {r4-r6,lr} + adds r6, r0, 0 + movs r1, 0x1 + bl sub_80787B0 + ldr r0, _080CAB78 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CAB38 + ldr r1, _080CAB7C @ =gBattleAnimArgs + ldrh r0, [r1, 0x4] + negs r0, r0 + strh r0, [r1, 0x4] +_080CAB38: + ldr r4, _080CAB7C @ =gBattleAnimArgs + ldrh r0, [r4, 0x8] + strh r0, [r6, 0x2E] + ldr r5, _080CAB80 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r5] + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r1, [r4, 0x4] + adds r0, r1 + strh r0, [r6, 0x32] + ldrb r0, [r5] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r1, [r4, 0x6] + adds r0, r1 + strh r0, [r6, 0x36] + ldrh r0, [r4, 0xA] + strh r0, [r6, 0x38] + adds r0, r6, 0 + bl sub_80786EC + ldr r0, _080CAB84 @ =sub_80CAB88 + str r0, [r6, 0x1C] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CAB78: .4byte gBattleAnimPlayerMonIndex +_080CAB7C: .4byte gBattleAnimArgs +_080CAB80: .4byte gBattleAnimEnemyMonIndex +_080CAB84: .4byte sub_80CAB88 + thumb_func_end sub_80CAB18 + + thumb_func_start sub_80CAB88 +sub_80CAB88: @ 80CAB88 + push {r4,lr} + adds r4, r0, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + beq _080CABB2 + adds r2, r4, 0 + adds r2, 0x3E + ldrb r0, [r2] + movs r1, 0x4 + orrs r0, r1 + strb r0, [r2] + movs r0, 0xA + strh r0, [r4, 0x2E] + ldr r0, _080CABB8 @ =sub_80782D8 + str r0, [r4, 0x1C] + ldr r1, _080CABBC @ =sub_80CABC0 + adds r0, r4, 0 + bl oamt_set_x3A_32 +_080CABB2: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CABB8: .4byte sub_80782D8 +_080CABBC: .4byte sub_80CABC0 + thumb_func_end sub_80CAB88 + + thumb_func_start sub_80CABC0 +sub_80CABC0: @ 80CABC0 + push {r4,lr} + adds r4, r0, 0 + adds r2, r4, 0 + adds r2, 0x3E + ldrb r1, [r2] + movs r0, 0x5 + negs r0, r0 + ands r0, r1 + strb r0, [r2] + adds r0, r4, 0 + movs r1, 0x1 + bl StartSpriteAnim + movs r0, 0x3C + strh r0, [r4, 0x2E] + ldr r0, _080CABF0 @ =sub_80782D8 + str r0, [r4, 0x1C] + ldr r1, _080CABF4 @ =move_anim_8072740 + adds r0, r4, 0 + bl oamt_set_x3A_32 + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CABF0: .4byte sub_80782D8 +_080CABF4: .4byte move_anim_8072740 + thumb_func_end sub_80CABC0 + + thumb_func_start sub_80CABF8 +sub_80CABF8: @ 80CABF8 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x1 + bl sub_8078764 + ldr r5, _080CAC3C @ =gBattleAnimArgs + ldrb r1, [r5, 0x8] + adds r0, r4, 0 + bl StartSpriteAnim + movs r1, 0x8 + ldrsh r0, [r5, r1] + cmp r0, 0x1 + bne _080CAC22 + ldrb r0, [r4, 0x1] + movs r1, 0xD + negs r1, r1 + ands r1, r0 + movs r0, 0x4 + orrs r1, r0 + strb r1, [r4, 0x1] +_080CAC22: + ldrh r0, [r5, 0x6] + strh r0, [r4, 0x2E] + ldrh r0, [r5, 0x4] + strh r0, [r4, 0x30] + ldr r1, _080CAC40 @ =sub_80CAC44 + str r1, [r4, 0x1C] + adds r0, r4, 0 + bl _call_via_r1 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CAC3C: .4byte gBattleAnimArgs +_080CAC40: .4byte sub_80CAC44 + thumb_func_end sub_80CABF8 + + thumb_func_start sub_80CAC44 +sub_80CAC44: @ 80CAC44 + push {r4,lr} + adds r4, r0, 0 + movs r1, 0x30 + ldrsh r0, [r4, r1] + movs r1, 0x20 + bl Sin + strh r0, [r4, 0x24] + movs r1, 0x30 + ldrsh r0, [r4, r1] + movs r1, 0x3 + negs r1, r1 + bl Cos + ldrh r1, [r4, 0x32] + adds r1, 0x18 + strh r1, [r4, 0x32] + lsls r1, 16 + asrs r1, 24 + adds r0, r1 + strh r0, [r4, 0x26] + ldrh r0, [r4, 0x30] + subs r0, 0x40 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x7F + bhi _080CAC98 + ldr r0, _080CAC94 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl sub_8079ED4 + movs r1, 0x3 + ands r1, r0 + lsls r1, 2 + ldrb r2, [r4, 0x5] + movs r0, 0xD + negs r0, r0 + ands r0, r2 + orrs r0, r1 + b _080CACBC + .align 2, 0 +_080CAC94: .4byte gBattleAnimEnemyMonIndex +_080CAC98: + ldr r0, _080CACE8 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl sub_8079ED4 + adds r0, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x3 + bls _080CACAC + movs r2, 0x3 +_080CACAC: + movs r0, 0x3 + ands r2, r0 + lsls r2, 2 + ldrb r1, [r4, 0x5] + movs r0, 0xD + negs r0, r0 + ands r0, r1 + orrs r0, r2 +_080CACBC: + strb r0, [r4, 0x5] + ldrh r0, [r4, 0x30] + adds r0, 0x2 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x30] + ldrh r0, [r4, 0x2E] + subs r0, 0x1 + strh r0, [r4, 0x2E] + lsls r0, 16 + asrs r0, 16 + movs r1, 0x1 + negs r1, r1 + cmp r0, r1 + bne _080CACE0 + adds r0, r4, 0 + bl move_anim_8072740 +_080CACE0: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CACE8: .4byte gBattleAnimEnemyMonIndex + thumb_func_end sub_80CAC44 + + thumb_func_start sub_80CACEC +sub_80CACEC: @ 80CACEC + push {r4,lr} + lsls r0, 24 + lsrs r4, r0, 24 + bl IsContest + lsls r0, 24 + cmp r0, 0 + bne _080CAD06 + bl IsDoubleBattle + lsls r0, 24 + cmp r0, 0 + bne _080CAD0E +_080CAD06: + adds r0, r4, 0 + bl DestroyAnimVisualTask + b _080CAD4A +_080CAD0E: + ldr r0, _080CAD2C @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl GetBankIdentity_permutated + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _080CAD34 + ldr r0, _080CAD30 @ =REG_BG2CNT + ldrb r1, [r0] + movs r2, 0x3 + orrs r1, r2 + strb r1, [r0] + b _080CAD44 + .align 2, 0 +_080CAD2C: .4byte gBattleAnimEnemyMonIndex +_080CAD30: .4byte REG_BG2CNT +_080CAD34: + ldr r2, _080CAD50 @ =REG_BG1CNT + ldrb r1, [r2] + movs r0, 0x4 + negs r0, r0 + ands r0, r1 + movs r1, 0x1 + orrs r0, r1 + strb r0, [r2] +_080CAD44: + adds r0, r4, 0 + bl DestroyAnimVisualTask +_080CAD4A: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CAD50: .4byte REG_BG1CNT + thumb_func_end sub_80CACEC + + thumb_func_start sub_80CAD54 +sub_80CAD54: @ 80CAD54 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0 + bl sub_80787B0 + ldr r5, _080CAD9C @ =gBattleAnimArgs + ldrh r0, [r5, 0x6] + strh r0, [r4, 0x2E] + ldrh r0, [r4, 0x20] + strh r0, [r4, 0x30] + strh r0, [r4, 0x32] + ldrh r0, [r4, 0x22] + strh r0, [r4, 0x34] + ldr r0, _080CADA0 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r5, [r5, 0x4] + adds r0, r5 + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl obj_translate_based_on_private_1_2_3_4 + movs r0, 0x40 + strh r0, [r4, 0x38] + ldr r1, _080CADA4 @ =sub_80CADA8 + str r1, [r4, 0x1C] + adds r0, r4, 0 + bl _call_via_r1 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CAD9C: .4byte gBattleAnimArgs +_080CADA0: .4byte gBattleAnimPlayerMonIndex +_080CADA4: .4byte sub_80CADA8 + thumb_func_end sub_80CAD54 + + thumb_func_start sub_80CADA8 +sub_80CADA8: @ 80CADA8 + push {r4,lr} + adds r4, r0, 0 + bl sub_8078B5C + lsls r0, 24 + cmp r0, 0 + bne _080CAE14 + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r1, 0x20 + bl Sin + ldrh r1, [r4, 0x24] + adds r0, r1 + strh r0, [r4, 0x24] + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r1, 0x5 + negs r1, r1 + bl Cos + ldrh r1, [r4, 0x26] + adds r0, r1 + strh r0, [r4, 0x26] + ldrh r0, [r4, 0x38] + subs r0, 0x40 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x7F + bhi _080CADF4 + ldr r0, _080CADF0 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl sub_8079E90 + subs r0, 0x1 + b _080CADFE + .align 2, 0 +_080CADF0: .4byte gBattleAnimPlayerMonIndex +_080CADF4: + ldr r0, _080CAE10 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl sub_8079E90 + adds r0, 0x1 +_080CADFE: + adds r1, r4, 0 + adds r1, 0x43 + strb r0, [r1] + ldrh r0, [r4, 0x38] + adds r0, 0x5 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x38] + b _080CAE1A + .align 2, 0 +_080CAE10: .4byte gBattleAnimPlayerMonIndex +_080CAE14: + adds r0, r4, 0 + bl move_anim_8072740 +_080CAE1A: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CADA8 + + thumb_func_start sub_80CAE20 +sub_80CAE20: @ 80CAE20 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x1 + bl sub_80787B0 + ldr r5, _080CAE68 @ =gBattleAnimArgs + ldrh r0, [r5, 0x6] + strh r0, [r4, 0x2E] + ldrh r0, [r4, 0x20] + strh r0, [r4, 0x30] + strh r0, [r4, 0x32] + ldrh r0, [r4, 0x22] + strh r0, [r4, 0x34] + ldr r0, _080CAE6C @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r5, [r5, 0x4] + adds r0, r5 + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl obj_translate_based_on_private_1_2_3_4 + movs r0, 0x40 + strh r0, [r4, 0x38] + ldr r1, _080CAE70 @ =sub_80CAE74 + str r1, [r4, 0x1C] + adds r0, r4, 0 + bl _call_via_r1 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CAE68: .4byte gBattleAnimArgs +_080CAE6C: .4byte gBattleAnimPlayerMonIndex +_080CAE70: .4byte sub_80CAE74 + thumb_func_end sub_80CAE20 + + thumb_func_start sub_80CAE74 +sub_80CAE74: @ 80CAE74 + push {r4,lr} + adds r4, r0, 0 + bl sub_8078B5C + lsls r0, 24 + cmp r0, 0 + bne _080CAECC + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r1, 0x8 + bl Sin + ldrh r1, [r4, 0x24] + adds r0, r1 + strh r0, [r4, 0x24] + ldrh r1, [r4, 0x38] + adds r0, r1, 0 + subs r0, 0x3B + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x4 + bls _080CAEAC + adds r0, r1, 0 + subs r0, 0xBB + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x4 + bhi _080CAEC0 +_080CAEAC: + ldrb r2, [r4, 0x3] + lsls r1, r2, 26 + lsrs r1, 27 + movs r0, 0x8 + eors r1, r0 + lsls r1, 1 + subs r0, 0x47 + ands r0, r2 + orrs r0, r1 + strb r0, [r4, 0x3] +_080CAEC0: + ldrh r0, [r4, 0x38] + adds r0, 0x5 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x38] + b _080CAED2 +_080CAECC: + adds r0, r4, 0 + bl move_anim_8072740 +_080CAED2: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CAE74 + + thumb_func_start sub_80CAED8 +sub_80CAED8: @ 80CAED8 + push {r4,r5,lr} + adds r4, r0, 0 + ldr r5, _080CAF14 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r5] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x20] + ldrb r0, [r5] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x22] + ldr r1, _080CAF18 @ =gBattleAnimArgs + ldrh r0, [r1] + strh r0, [r4, 0x2E] + ldrh r0, [r1, 0x2] + strh r0, [r4, 0x30] + ldrh r0, [r1, 0x4] + strh r0, [r4, 0x32] + ldr r0, _080CAF1C @ =sub_80CAF20 + str r0, [r4, 0x1C] + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CAF14: .4byte gBattleAnimPlayerMonIndex +_080CAF18: .4byte gBattleAnimArgs +_080CAF1C: .4byte sub_80CAF20 + thumb_func_end sub_80CAED8 + + thumb_func_start sub_80CAF20 +sub_80CAF20: @ 80CAF20 + push {lr} + adds r1, r0, 0 + ldrh r0, [r1, 0x32] + movs r2, 0x32 + ldrsh r3, [r1, r2] + cmp r3, 0 + bne _080CAF54 + ldrh r0, [r1, 0x30] + movs r2, 0x1 + ands r2, r0 + cmp r2, 0 + beq _080CAF42 + movs r0, 0x80 + strh r0, [r1, 0x2E] + strh r3, [r1, 0x30] + strh r3, [r1, 0x32] + b _080CAF48 +_080CAF42: + strh r2, [r1, 0x2E] + strh r2, [r1, 0x30] + strh r2, [r1, 0x32] +_080CAF48: + ldr r0, _080CAF50 @ =sub_80CAF6C + str r0, [r1, 0x1C] + b _080CAF68 + .align 2, 0 +_080CAF50: .4byte sub_80CAF6C +_080CAF54: + subs r0, 0x1 + strh r0, [r1, 0x32] + ldrh r0, [r1, 0x2E] + ldrh r2, [r1, 0x20] + adds r0, r2 + strh r0, [r1, 0x20] + ldrh r0, [r1, 0x30] + ldrh r2, [r1, 0x22] + adds r0, r2 + strh r0, [r1, 0x22] +_080CAF68: + pop {r0} + bx r0 + thumb_func_end sub_80CAF20 + + thumb_func_start sub_80CAF6C +sub_80CAF6C: @ 80CAF6C + push {r4,lr} + adds r4, r0, 0 + ldr r0, _080CAF8C @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CAF90 + movs r1, 0x2E + ldrsh r0, [r4, r1] + movs r1, 0x19 + bl Sin + negs r0, r0 + b _080CAF9A + .align 2, 0 +_080CAF8C: .4byte gBattleAnimPlayerMonIndex +_080CAF90: + movs r1, 0x2E + ldrsh r0, [r4, r1] + movs r1, 0x19 + bl Sin +_080CAF9A: + strh r0, [r4, 0x24] + ldrh r0, [r4, 0x2E] + adds r0, 0x2 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x2E] + ldrh r0, [r4, 0x30] + adds r0, 0x1 + strh r0, [r4, 0x30] + movs r1, 0x1 + ands r0, r1 + cmp r0, 0 + bne _080CAFBA + ldrh r0, [r4, 0x26] + adds r0, 0x1 + strh r0, [r4, 0x26] +_080CAFBA: + movs r1, 0x30 + ldrsh r0, [r4, r1] + cmp r0, 0x50 + ble _080CAFC8 + adds r0, r4, 0 + bl move_anim_8072740 +_080CAFC8: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CAF6C + + thumb_func_start sub_80CAFD0 +sub_80CAFD0: @ 80CAFD0 + push {r4-r6,lr} + adds r5, r0, 0 + movs r1, 0x1 + bl sub_80787B0 + ldr r0, _080CB024 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CAFF0 + ldr r1, _080CB028 @ =gBattleAnimArgs + ldrh r0, [r1, 0x4] + negs r0, r0 + strh r0, [r1, 0x4] +_080CAFF0: + ldr r6, _080CB028 @ =gBattleAnimArgs + ldrh r0, [r6, 0x8] + strh r0, [r5, 0x2E] + movs r1, 0xC + ldrsh r0, [r6, r1] + cmp r0, 0 + bne _080CB030 + ldr r4, _080CB02C @ =gBattleAnimEnemyMonIndex + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r1, [r6, 0x4] + adds r0, r1 + strh r0, [r5, 0x32] + ldrb r0, [r4] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r6, [r6, 0x6] + adds r0, r6 + b _080CB050 + .align 2, 0 +_080CB024: .4byte gBattleAnimPlayerMonIndex +_080CB028: .4byte gBattleAnimArgs +_080CB02C: .4byte gBattleAnimEnemyMonIndex +_080CB030: + ldr r0, _080CB07C @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + adds r2, r5, 0 + adds r2, 0x32 + adds r3, r5, 0 + adds r3, 0x36 + movs r1, 0x1 + bl sub_807A3FC + ldrh r0, [r6, 0x4] + ldrh r1, [r5, 0x32] + adds r0, r1 + strh r0, [r5, 0x32] + ldrh r0, [r6, 0x6] + ldrh r1, [r5, 0x36] + adds r0, r1 +_080CB050: + strh r0, [r5, 0x36] + ldr r0, _080CB080 @ =gBattleAnimArgs + ldrh r0, [r0, 0xA] + strh r0, [r5, 0x38] + adds r0, r5, 0 + bl sub_80786EC + ldr r0, _080CB084 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + adds r4, r0, 0 + ldr r0, _080CB07C @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r4, 24 + lsls r0, 24 + cmp r4, r0 + bne _080CB088 + movs r0, 0x1 + b _080CB08A + .align 2, 0 +_080CB07C: .4byte gBattleAnimEnemyMonIndex +_080CB080: .4byte gBattleAnimArgs +_080CB084: .4byte gBattleAnimPlayerMonIndex +_080CB088: + movs r0, 0 +_080CB08A: + strh r0, [r5, 0x2E] + ldr r0, _080CB098 @ =sub_80CB09C + str r0, [r5, 0x1C] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CB098: .4byte sub_80CB09C + thumb_func_end sub_80CAFD0 + + thumb_func_start sub_80CB09C +sub_80CB09C: @ 80CB09C + push {r4-r7,lr} + adds r6, r0, 0 + movs r7, 0 + ldrh r5, [r6, 0x2E] + ldrh r4, [r6, 0x3C] + movs r0, 0x1 + strh r0, [r6, 0x2E] + adds r0, r6, 0 + bl sub_8078718 + ldrh r0, [r6, 0x3C] + strh r5, [r6, 0x2E] + lsls r4, 16 + asrs r4, 16 + cmp r4, 0xC8 + ble _080CB0CE + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x37 + bgt _080CB0CE + ldrh r0, [r6, 0x6] + cmp r0, 0 + bne _080CB0D4 + adds r0, 0x1 + strh r0, [r6, 0x6] +_080CB0CE: + ldrh r0, [r6, 0x6] + cmp r0, 0 + beq _080CB106 +_080CB0D4: + movs r1, 0x2E + ldrsh r0, [r6, r1] + cmp r0, 0 + beq _080CB106 + adds r3, r6, 0 + adds r3, 0x3E + ldrb r2, [r3] + lsls r0, r2, 29 + lsrs r0, 31 + movs r1, 0x1 + eors r1, r0 + lsls r1, 2 + movs r0, 0x5 + negs r0, r0 + ands r0, r2 + orrs r0, r1 + strb r0, [r3] + ldrh r0, [r6, 0x6] + adds r0, 0x1 + strh r0, [r6, 0x6] + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x1E + bne _080CB106 + movs r7, 0x1 +_080CB106: + movs r2, 0x20 + ldrsh r0, [r6, r2] + movs r2, 0x24 + ldrsh r1, [r6, r2] + adds r0, r1 + adds r0, 0x10 + movs r1, 0x88 + lsls r1, 1 + cmp r0, r1 + bhi _080CB130 + movs r0, 0x22 + ldrsh r1, [r6, r0] + movs r2, 0x26 + ldrsh r0, [r6, r2] + adds r1, r0 + cmp r1, 0xA0 + bgt _080CB130 + movs r0, 0x10 + negs r0, r0 + cmp r1, r0 + bge _080CB132 +_080CB130: + movs r7, 0x1 +_080CB132: + cmp r7, 0 + beq _080CB13C + adds r0, r6, 0 + bl move_anim_8072740 +_080CB13C: + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_80CB09C + + thumb_func_start sub_80CB144 +sub_80CB144: @ 80CB144 + push {r4,lr} + adds r4, r0, 0 + bl IsContest + lsls r0, 24 + cmp r0, 0 + bne _080CB170 + bl IsDoubleBattle + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _080CB170 + ldr r0, _080CB198 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + adds r2, r4, 0 + adds r2, 0x20 + adds r3, r4, 0 + adds r3, 0x22 + movs r1, 0x1 + bl sub_807A3FC +_080CB170: + ldrh r0, [r4, 0x22] + adds r0, 0x20 + strh r0, [r4, 0x22] + ldr r1, _080CB19C @ =gBattleAnimArgs + ldrh r0, [r1] + strh r0, [r4, 0x2E] + ldrh r0, [r1, 0x2] + strh r0, [r4, 0x30] + ldrh r0, [r1, 0x4] + strh r0, [r4, 0x32] + ldrh r0, [r1, 0x6] + strh r0, [r4, 0x34] + ldrh r0, [r1, 0x8] + strh r0, [r4, 0x36] + ldr r0, _080CB1A0 @ =sub_80CB1A4 + str r0, [r4, 0x1C] + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CB198: .4byte gBattleAnimEnemyMonIndex +_080CB19C: .4byte gBattleAnimArgs +_080CB1A0: .4byte sub_80CB1A4 + thumb_func_end sub_80CB144 + + thumb_func_start sub_80CB1A4 +sub_80CB1A4: @ 80CB1A4 + push {r4,r5,lr} + adds r4, r0, 0 + ldrh r1, [r4, 0x30] + movs r2, 0x30 + ldrsh r0, [r4, r2] + cmp r0, 0xFF + bne _080CB1BA + ldrh r0, [r4, 0x22] + subs r0, 0x2 + strh r0, [r4, 0x22] + b _080CB1C8 +_080CB1BA: + cmp r0, 0 + ble _080CB1C8 + ldrh r0, [r4, 0x22] + subs r0, 0x2 + strh r0, [r4, 0x22] + subs r0, r1, 0x2 + strh r0, [r4, 0x30] +_080CB1C8: + ldrh r3, [r4, 0x32] + ldrh r5, [r4, 0x38] + adds r2, r3, r5 + strh r2, [r4, 0x38] + movs r0, 0x2E + ldrsh r1, [r4, r0] + movs r5, 0x36 + ldrsh r0, [r4, r5] + cmp r1, r0 + bge _080CB1E0 + adds r0, r2, r3 + strh r0, [r4, 0x38] +_080CB1E0: + ldrh r1, [r4, 0x38] + movs r0, 0xFF + ands r0, r1 + strh r0, [r4, 0x38] + movs r1, 0x38 + ldrsh r0, [r4, r1] + movs r2, 0x34 + ldrsh r1, [r4, r2] + bl Cos + strh r0, [r4, 0x24] + movs r5, 0x38 + ldrsh r0, [r4, r5] + movs r1, 0x5 + bl Sin + strh r0, [r4, 0x26] + movs r1, 0x38 + ldrsh r0, [r4, r1] + cmp r0, 0x7F + bgt _080CB220 + ldr r0, _080CB21C @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl sub_8079ED4 + lsls r0, 24 + lsrs r0, 24 + subs r0, 0x1 + b _080CB22E + .align 2, 0 +_080CB21C: .4byte gBattleAnimEnemyMonIndex +_080CB220: + ldr r0, _080CB258 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl sub_8079ED4 + lsls r0, 24 + lsrs r0, 24 + adds r0, 0x1 +_080CB22E: + movs r1, 0x3 + ands r0, r1 + lsls r0, 2 + ldrb r2, [r4, 0x5] + movs r1, 0xD + negs r1, r1 + ands r1, r2 + orrs r1, r0 + strb r1, [r4, 0x5] + ldrh r0, [r4, 0x2E] + subs r0, 0x1 + strh r0, [r4, 0x2E] + lsls r0, 16 + cmp r0, 0 + bne _080CB252 + adds r0, r4, 0 + bl move_anim_8072740 +_080CB252: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CB258: .4byte gBattleAnimEnemyMonIndex + thumb_func_end sub_80CB1A4 + + thumb_func_start sub_80CB25C +sub_80CB25C: @ 80CB25C + push {r4,r5,lr} + adds r5, r0, 0 + movs r1, 0 + bl sub_8078764 + adds r2, r5, 0 + adds r2, 0x2C + ldrb r0, [r2] + movs r1, 0x80 + orrs r0, r1 + strb r0, [r2] + ldr r4, _080CB290 @ =gBattleAnimArgs + ldrb r1, [r4, 0x4] + adds r0, r5, 0 + bl StartSpriteAffineAnim + ldrh r0, [r4, 0x4] + strh r0, [r5, 0x3A] + ldrh r0, [r4, 0x6] + strh r0, [r5, 0x3C] + ldr r0, _080CB294 @ =sub_80CB298 + str r0, [r5, 0x1C] + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CB290: .4byte gBattleAnimArgs +_080CB294: .4byte sub_80CB298 + thumb_func_end sub_80CB25C + + thumb_func_start sub_80CB298 +sub_80CB298: @ 80CB298 + push {r4,lr} + adds r4, r0, 0 + ldr r0, _080CB2C8 @ =gBattleAnimArgs + ldrh r1, [r0, 0xE] + ldr r0, _080CB2CC @ =0x0000ffff + cmp r1, r0 + bne _080CB2C2 + adds r2, r4, 0 + adds r2, 0x2C + ldrb r1, [r2] + movs r0, 0x7F + ands r0, r1 + strb r0, [r2] + movs r0, 0x1 + bl obj_id_for_side_relative_to_move + movs r0, 0x80 + lsls r0, 1 + strh r0, [r4, 0x2E] + ldr r0, _080CB2D0 @ =sub_80CB2D4 + str r0, [r4, 0x1C] +_080CB2C2: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CB2C8: .4byte gBattleAnimArgs +_080CB2CC: .4byte 0x0000ffff +_080CB2D0: .4byte sub_80CB2D4 + thumb_func_end sub_80CB298 + + thumb_func_start sub_80CB2D4 +sub_80CB2D4: @ 80CB2D4 + push {r4,lr} + adds r4, r0, 0 + movs r0, 0x1 + bl obj_id_for_side_relative_to_move + movs r1, 0x32 + ldrsh r0, [r4, r1] + cmp r0, 0 + bne _080CB2EC + ldrh r0, [r4, 0x2E] + adds r0, 0xB + b _080CB2F0 +_080CB2EC: + ldrh r0, [r4, 0x2E] + subs r0, 0xB +_080CB2F0: + strh r0, [r4, 0x2E] + ldrh r0, [r4, 0x30] + adds r0, 0x1 + strh r0, [r4, 0x30] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x6 + bne _080CB30C + movs r0, 0 + strh r0, [r4, 0x30] + ldrh r0, [r4, 0x32] + movs r1, 0x1 + eors r0, r1 + strh r0, [r4, 0x32] +_080CB30C: + adds r0, r4, 0 + adds r0, 0x3F + ldrb r1, [r0] + movs r0, 0x20 + ands r0, r1 + cmp r0, 0 + beq _080CB33A + ldrh r0, [r4, 0x3C] + subs r0, 0x1 + strh r0, [r4, 0x3C] + lsls r0, 16 + cmp r0, 0 + ble _080CB334 + ldrh r1, [r4, 0x3A] + lsls r1, 24 + lsrs r1, 24 + adds r0, r4, 0 + bl StartSpriteAffineAnim + b _080CB33A +_080CB334: + adds r0, r4, 0 + bl move_anim_8072740 +_080CB33A: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CB2D4 + + thumb_func_start sub_80CB340 +sub_80CB340: @ 80CB340 + push {r4,lr} + lsls r0, 24 + lsrs r4, r0, 24 + movs r0, 0x1 + bl obj_id_for_side_relative_to_move + lsls r0, 24 + lsrs r2, r0, 24 + ldr r1, _080CB36C @ =gSprites + lsls r0, r2, 4 + adds r0, r2 + lsls r0, 2 + adds r0, r1 + adds r0, 0x3E + ldrb r0, [r0] + lsls r0, 29 + cmp r0, 0 + bge _080CB370 + adds r0, r4, 0 + bl DestroyAnimVisualTask + b _080CB396 + .align 2, 0 +_080CB36C: .4byte gSprites +_080CB370: + adds r0, r2, 0 + movs r1, 0x1 + bl sub_8078E70 + ldr r1, _080CB39C @ =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r2, _080CB3A0 @ =gBattleAnimArgs + ldrh r1, [r2] + strh r1, [r0, 0x8] + ldrh r1, [r2, 0x2] + strh r1, [r0, 0xA] + movs r1, 0x80 + lsls r1, 1 + strh r1, [r0, 0x1E] + ldr r1, _080CB3A4 @ =sub_80CB3A8 + str r1, [r0] +_080CB396: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CB39C: .4byte gTasks +_080CB3A0: .4byte gBattleAnimArgs +_080CB3A4: .4byte sub_80CB3A8 + thumb_func_end sub_80CB340 + + thumb_func_start sub_80CB3A8 +sub_80CB3A8: @ 80CB3A8 + push {r4-r6,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0x1 + bl obj_id_for_side_relative_to_move + lsls r0, 24 + lsrs r0, 24 + adds r6, r0, 0 + ldr r1, _080CB428 @ =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r4, r0, r1 + ldrh r1, [r4, 0x8] + ldrh r0, [r4, 0x1C] + adds r1, r0 + strh r1, [r4, 0x1C] + ldr r2, _080CB42C @ =gSprites + lsls r0, r6, 4 + adds r0, r6 + lsls r0, 2 + adds r5, r0, r2 + lsls r1, 16 + asrs r1, 24 + strh r1, [r5, 0x24] + ldr r0, _080CB430 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CB3F2 + ldrh r0, [r5, 0x24] + negs r0, r0 + strh r0, [r5, 0x24] +_080CB3F2: + ldrh r0, [r4, 0x1E] + adds r0, 0x10 + strh r0, [r4, 0x1E] + movs r0, 0x1E + ldrsh r2, [r4, r0] + adds r0, r6, 0 + adds r1, r2, 0 + movs r3, 0 + bl obj_id_set_rotscale + adds r0, r6, 0 + bl sub_8079A64 + ldrh r0, [r4, 0xA] + subs r0, 0x1 + strh r0, [r4, 0xA] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0 + bne _080CB420 + strh r0, [r4, 0x8] + ldr r0, _080CB434 @ =sub_80CB438 + str r0, [r4] +_080CB420: + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CB428: .4byte gTasks +_080CB42C: .4byte gSprites +_080CB430: .4byte gBattleAnimEnemyMonIndex +_080CB434: .4byte sub_80CB438 + thumb_func_end sub_80CB3A8 + + thumb_func_start sub_80CB438 +sub_80CB438: @ 80CB438 + push {r4-r6,lr} + lsls r0, 24 + lsrs r3, r0, 24 + ldr r0, _080CB484 @ =gBattleAnimArgs + ldrh r1, [r0, 0xE] + ldr r0, _080CB488 @ =0x0000ffff + cmp r1, r0 + bne _080CB494 + ldr r0, _080CB48C @ =gTasks + lsls r2, r3, 2 + adds r1, r2, r3 + lsls r1, 3 + adds r6, r1, r0 + movs r1, 0x8 + ldrsh r5, [r6, r1] + adds r4, r0, 0 + cmp r5, 0 + bne _080CB4A8 + movs r0, 0x1 + bl obj_id_for_side_relative_to_move + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + adds r0, r4, 0 + bl sub_8078F40 + ldr r1, _080CB490 @ =gSprites + lsls r0, r4, 4 + adds r0, r4 + lsls r0, 2 + adds r0, r1 + strh r5, [r0, 0x24] + strh r5, [r0, 0x26] + ldrh r0, [r6, 0x8] + adds r0, 0x1 + strh r0, [r6, 0x8] + b _080CB4C2 + .align 2, 0 +_080CB484: .4byte gBattleAnimArgs +_080CB488: .4byte 0x0000ffff +_080CB48C: .4byte gTasks +_080CB490: .4byte gSprites +_080CB494: + ldr r1, _080CB4C8 @ =gTasks + lsls r2, r3, 2 + adds r0, r2, r3 + lsls r0, 3 + adds r0, r1 + movs r4, 0x8 + ldrsh r0, [r0, r4] + adds r4, r1, 0 + cmp r0, 0 + beq _080CB4C2 +_080CB4A8: + adds r1, r2, r3 + lsls r1, 3 + adds r1, r4 + ldrh r0, [r1, 0x8] + adds r0, 0x1 + strh r0, [r1, 0x8] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x3 + bne _080CB4C2 + adds r0, r3, 0 + bl DestroyAnimVisualTask +_080CB4C2: + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CB4C8: .4byte gTasks + thumb_func_end sub_80CB438 + + thumb_func_start sub_80CB4CC +sub_80CB4CC: @ 80CB4CC + push {r4-r6,lr} + adds r5, r0, 0 + movs r1, 0x2E + ldrsh r0, [r5, r1] + cmp r0, 0 + beq _080CB4DE + cmp r0, 0x1 + beq _080CB538 + b _080CB58A +_080CB4DE: + ldr r6, _080CB530 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r6] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + bne _080CB4F6 + ldr r1, _080CB534 @ =gBattleAnimArgs + movs r2, 0 + ldrsh r0, [r1, r2] + negs r0, r0 + strh r0, [r1] +_080CB4F6: + ldrb r0, [r6] + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + ldr r4, _080CB534 @ =gBattleAnimArgs + lsrs r0, 24 + ldrh r1, [r4] + adds r0, r1 + strh r0, [r5, 0x20] + ldrb r0, [r6] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r4, [r4, 0x2] + adds r0, r4 + strh r0, [r5, 0x22] + adds r2, r5, 0 + adds r2, 0x3E + ldrb r0, [r2] + movs r1, 0x4 + orrs r0, r1 + strb r0, [r2] + ldrh r0, [r5, 0x2E] + adds r0, 0x1 + strh r0, [r5, 0x2E] + b _080CB58A + .align 2, 0 +_080CB530: .4byte gBattleAnimEnemyMonIndex +_080CB534: .4byte gBattleAnimArgs +_080CB538: + adds r2, r5, 0 + adds r2, 0x3E + ldrb r1, [r2] + movs r0, 0x5 + negs r0, r0 + ands r0, r1 + strb r0, [r2] + adds r0, r5, 0 + adds r0, 0x3F + ldrb r1, [r0] + movs r0, 0x20 + ands r0, r1 + cmp r0, 0 + beq _080CB58A + adds r0, r5, 0 + movs r1, 0x1 + bl ChangeSpriteAffineAnim + movs r0, 0x19 + strh r0, [r5, 0x2E] + ldr r4, _080CB590 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x32] + ldrb r0, [r4] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x36] + ldr r0, _080CB594 @ =sub_8078CC0 + str r0, [r5, 0x1C] + ldr r1, _080CB598 @ =move_anim_8072740 + adds r0, r5, 0 + bl oamt_set_x3A_32 +_080CB58A: + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CB590: .4byte gBattleAnimPlayerMonIndex +_080CB594: .4byte sub_8078CC0 +_080CB598: .4byte move_anim_8072740 + thumb_func_end sub_80CB4CC + + thumb_func_start sub_80CB59C +sub_80CB59C: @ 80CB59C + push {r4,r5,lr} + adds r5, r0, 0 + movs r1, 0x2E + ldrsh r0, [r5, r1] + cmp r0, 0 + bne _080CB608 + ldr r4, _080CB614 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x20] + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x22] + ldr r4, _080CB618 @ =gBattleAnimArgs + ldrh r0, [r4] + strh r0, [r5, 0x24] + ldrh r0, [r4, 0x2] + strh r0, [r5, 0x26] + ldrb r0, [r4, 0x4] + adds r0, 0x1E + adds r1, r5, 0 + adds r1, 0x43 + strb r0, [r1] + ldrb r1, [r4, 0x6] + adds r0, r5, 0 + bl StartSpriteAnim + ldrh r0, [r4, 0x8] + strh r0, [r5, 0x32] + ldrh r0, [r5, 0x2E] + adds r0, 0x1 + strh r0, [r5, 0x2E] + movs r2, 0x22 + ldrsh r0, [r5, r2] + movs r2, 0x26 + ldrsh r1, [r5, r2] + adds r0, r1 + cmp r0, 0x78 + ble _080CB608 + ldrh r0, [r5, 0x22] + adds r1, r0, 0 + subs r1, 0x78 + ldrh r2, [r5, 0x26] + adds r0, r2 + adds r1, r0 + strh r1, [r5, 0x22] +_080CB608: + ldr r0, _080CB61C @ =sub_80CB710 + str r0, [r5, 0x1C] + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CB614: .4byte gBattleAnimPlayerMonIndex +_080CB618: .4byte gBattleAnimArgs +_080CB61C: .4byte sub_80CB710 + thumb_func_end sub_80CB59C + + thumb_func_start sub_80CB620 +sub_80CB620: @ 80CB620 + push {r4-r6,lr} + mov r6, r10 + mov r5, r9 + mov r4, r8 + push {r4-r6} + sub sp, 0x4 + mov r9, r0 + ldr r4, _080CB6FC @ =gBattleAnimPlayerMonIndex + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + adds r5, r0, 0 + lsls r5, 24 + lsrs r5, 24 + ldrb r0, [r4] + movs r1, 0x3 + bl sub_8077ABC + mov r8, r0 + mov r0, r8 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + ldr r6, _080CB700 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r6] + movs r1, 0x2 + bl sub_8077ABC + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + ldrb r0, [r6] + movs r1, 0x3 + bl sub_8077ABC + adds r2, r0, 0 + lsls r2, 24 + subs r4, r5 + lsls r4, 16 + lsrs r2, 24 + mov r1, r8 + subs r2, r1 + lsls r2, 16 + lsrs r2, 16 + lsrs r3, r4, 16 + mov r10, r3 + asrs r4, 16 + ldr r6, _080CB704 @ =gBattleAnimArgs + movs r1, 0 + ldrsh r0, [r6, r1] + muls r0, r4 + movs r1, 0x64 + str r2, [sp] + bl __divsi3 + adds r5, r0 + mov r3, r9 + strh r5, [r3, 0x20] + ldr r2, [sp] + lsls r0, r2, 16 + asrs r0, 16 + movs r3, 0 + ldrsh r1, [r6, r3] + muls r0, r1 + movs r1, 0x64 + bl __divsi3 + add r8, r0 + mov r1, r8 + mov r0, r9 + strh r1, [r0, 0x22] + ldrh r0, [r6, 0x2] + mov r3, r9 + strh r0, [r3, 0x24] + ldrh r0, [r6, 0x4] + strh r0, [r3, 0x26] + ldrb r0, [r6, 0x6] + adds r0, 0x1E + mov r1, r9 + adds r1, 0x43 + strb r0, [r1] + ldrb r1, [r6, 0x8] + mov r0, r9 + bl StartSpriteAnim + ldrh r0, [r6, 0xA] + mov r1, r9 + strh r0, [r1, 0x32] + ldr r0, _080CB708 @ =sub_80CB710 + str r0, [r1, 0x1C] + ldr r1, _080CB70C @ =gUnknown_03000728 + mov r3, r9 + ldrh r0, [r3, 0x20] + strh r0, [r1] + ldrh r0, [r3, 0x22] + strh r0, [r1, 0x2] + mov r0, r10 + strh r0, [r1, 0x4] + ldr r2, [sp] + strh r2, [r1, 0x6] + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CB6FC: .4byte gBattleAnimPlayerMonIndex +_080CB700: .4byte gBattleAnimEnemyMonIndex +_080CB704: .4byte gBattleAnimArgs +_080CB708: .4byte sub_80CB710 +_080CB70C: .4byte gUnknown_03000728 + thumb_func_end sub_80CB620 + + thumb_func_start sub_80CB710 +sub_80CB710: @ 80CB710 + push {lr} + adds r3, r0, 0 + ldrh r1, [r3, 0x2E] + adds r1, 0x1 + strh r1, [r3, 0x2E] + lsls r1, 16 + asrs r1, 16 + movs r2, 0x32 + ldrsh r0, [r3, r2] + subs r0, 0xA + cmp r1, r0 + ble _080CB750 + movs r0, 0x2E + ldrsh r1, [r3, r0] + lsrs r0, r1, 31 + adds r0, r1, r0 + asrs r0, 1 + lsls r0, 1 + subs r1, r0 + movs r2, 0x3E + adds r2, r3 + mov r12, r2 + movs r0, 0x1 + ands r1, r0 + lsls r1, 2 + ldrb r2, [r2] + movs r0, 0x5 + negs r0, r0 + ands r0, r2 + orrs r0, r1 + mov r1, r12 + strb r0, [r1] +_080CB750: + movs r2, 0x2E + ldrsh r1, [r3, r2] + movs r2, 0x32 + ldrsh r0, [r3, r2] + cmp r1, r0 + ble _080CB762 + adds r0, r3, 0 + bl move_anim_8072740 +_080CB762: + pop {r0} + bx r0 + thumb_func_end sub_80CB710 + + thumb_func_start sub_80CB768 +sub_80CB768: @ 80CB768 + push {r4-r6,lr} + adds r6, r0, 0 + movs r1, 0x2E + ldrsh r0, [r6, r1] + cmp r0, 0 + bne _080CB7A8 + ldr r5, _080CB7E4 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r5] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + ldr r4, _080CB7E8 @ =gBattleAnimArgs + lsrs r0, 24 + ldrh r2, [r4] + adds r0, r2 + strh r0, [r6, 0x20] + ldrb r0, [r5] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r1, [r4, 0x2] + adds r0, r1 + strh r0, [r6, 0x22] + ldrh r0, [r4, 0x4] + strh r0, [r6, 0x30] + ldrh r0, [r4, 0x6] + strh r0, [r6, 0x32] + ldrh r0, [r4, 0x8] + strh r0, [r6, 0x34] +_080CB7A8: + ldrh r0, [r6, 0x2E] + adds r0, 0x1 + strh r0, [r6, 0x2E] + ldrh r1, [r6, 0x30] + muls r0, r1 + strh r0, [r6, 0x24] + movs r2, 0x2E + ldrsh r1, [r6, r2] + lsls r0, r1, 2 + adds r0, r1 + lsls r0, 2 + movs r1, 0xFF + ands r0, r1 + movs r2, 0x32 + ldrsh r1, [r6, r2] + bl Sin + strh r0, [r6, 0x26] + movs r0, 0x2E + ldrsh r1, [r6, r0] + movs r2, 0x34 + ldrsh r0, [r6, r2] + cmp r1, r0 + ble _080CB7DE + adds r0, r6, 0 + bl move_anim_8072740 +_080CB7DE: + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CB7E4: .4byte gBattleAnimPlayerMonIndex +_080CB7E8: .4byte gBattleAnimArgs + thumb_func_end sub_80CB768 + + thumb_func_start sub_80CB7EC +sub_80CB7EC: @ 80CB7EC + push {r4,r5,lr} + movs r2, 0x20 + ldrsh r4, [r0, r2] + lsls r4, 8 + movs r3, 0x22 + ldrsh r2, [r0, r3] + orrs r4, r2 + movs r5, 0x3A + ldrsh r2, [r0, r5] + lsls r2, 8 + movs r5, 0x3C + ldrsh r3, [r0, r5] + orrs r2, r3 + lsls r1, 8 + strh r4, [r0, 0x38] + strh r2, [r0, 0x3A] + strh r1, [r0, 0x3C] + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_80CB7EC + + thumb_func_start sub_80CB814 +sub_80CB814: @ 80CB814 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + mov r8, r0 + ldrh r0, [r0, 0x38] + lsrs r1, r0, 8 + mov r10, r1 + lsls r0, 24 + lsrs r0, 24 + mov r9, r0 + mov r1, r8 + ldrh r0, [r1, 0x3A] + lsrs r2, r0, 8 + lsls r0, 24 + lsrs r4, r0, 24 + ldrh r1, [r1, 0x3C] + lsls r0, r1, 16 + asrs r0, 24 + lsls r0, 16 + lsrs r6, r0, 16 + movs r3, 0xFF + ands r3, r1 + cmp r2, 0 + bne _080CB84E + movs r2, 0x20 + negs r2, r2 + b _080CB856 +_080CB84E: + cmp r2, 0xFF + bne _080CB856 + movs r2, 0x88 + lsls r2, 1 +_080CB856: + mov r0, r9 + subs r4, r0 + lsls r4, 16 + lsrs r4, 16 + mov r1, r10 + subs r0, r2, r1 + lsls r5, r3, 16 + asrs r5, 16 + muls r0, r5 + lsls r1, r6, 16 + asrs r7, r1, 16 + adds r1, r7, 0 + bl __divsi3 + adds r6, r0, 0 + lsls r4, 16 + asrs r4, 16 + adds r0, r4, 0 + muls r0, r5 + adds r1, r7, 0 + bl __divsi3 + add r6, r10 + mov r1, r8 + strh r6, [r1, 0x20] + add r0, r9 + strh r0, [r1, 0x22] + adds r5, 0x1 + lsls r5, 16 + lsrs r3, r5, 16 + asrs r5, 16 + cmp r5, r7 + beq _080CB8A8 + lsls r1, r7, 8 + lsls r0, r3, 16 + asrs r0, 16 + orrs r0, r1 + mov r1, r8 + strh r0, [r1, 0x3C] + movs r0, 0 + b _080CB8AA +_080CB8A8: + movs r0, 0x1 +_080CB8AA: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_80CB814 + + thumb_func_start sub_80CB8B8 +sub_80CB8B8: @ 80CB8B8 + push {r4,lr} + adds r4, r0, 0 + movs r1, 0x2E + ldrsh r0, [r4, r1] + cmp r0, 0xA + bne _080CB8CC + adds r0, r4, 0 + movs r1, 0x1 + bl StartSpriteAffineAnim +_080CB8CC: + ldrh r0, [r4, 0x2E] + adds r0, 0x1 + strh r0, [r4, 0x2E] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x32 + ble _080CB8E0 + adds r0, r4, 0 + bl move_anim_8072740 +_080CB8E0: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CB8B8 + + thumb_func_start sub_80CB8E8 +sub_80CB8E8: @ 80CB8E8 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x34 + ldrsh r0, [r4, r1] + lsls r0, 7 + movs r2, 0x36 + ldrsh r1, [r4, r2] + bl __divsi3 + ldrh r1, [r4, 0x2E] + adds r1, r0 + movs r5, 0 + strh r1, [r4, 0x2E] + lsls r1, 16 + asrs r1, 16 + cmp r1, 0x7F + ble _080CB912 + ldrh r0, [r4, 0x30] + adds r0, 0x1 + strh r0, [r4, 0x30] + strh r5, [r4, 0x2E] +_080CB912: + ldrh r0, [r4, 0x2E] + adds r0, 0x80 + lsls r0, 16 + asrs r0, 16 + movs r1, 0x30 + ldrsh r2, [r4, r1] + lsls r2, 3 + movs r1, 0x1E + subs r1, r2 + lsls r1, 16 + asrs r1, 16 + bl Sin + strh r0, [r4, 0x26] + adds r0, r4, 0 + bl sub_80CB814 + lsls r0, 24 + cmp r0, 0 + beq _080CB942 + strh r5, [r4, 0x26] + strh r5, [r4, 0x2E] + ldr r0, _080CB948 @ =sub_80CB8B8 + str r0, [r4, 0x1C] +_080CB942: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CB948: .4byte sub_80CB8B8 + thumb_func_end sub_80CB8E8 + + thumb_func_start sub_80CB94C +sub_80CB94C: @ 80CB94C + push {r4-r6,lr} + adds r5, r0, 0 + movs r1, 0 + bl sub_80787B0 + ldr r4, _080CB994 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r4] + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r6, r0, 24 + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r2, r0, 24 + ldr r0, _080CB998 @ =gBattleAnimPlayerMonIndex + ldrb r1, [r0] + movs r0, 0x2 + eors r0, r1 + ldrb r4, [r4] + cmp r0, r4 + bne _080CB99C + strh r6, [r5, 0x3A] + adds r0, r2, 0 + adds r0, 0xA + strh r0, [r5, 0x3C] + adds r0, r5, 0 + movs r1, 0x3C + bl sub_80CB7EC + movs r0, 0x1 + b _080CB9AE + .align 2, 0 +_080CB994: .4byte gBattleAnimEnemyMonIndex +_080CB998: .4byte gBattleAnimPlayerMonIndex +_080CB99C: + strh r6, [r5, 0x3A] + adds r0, r2, 0 + adds r0, 0xA + strh r0, [r5, 0x3C] + adds r0, r5, 0 + movs r1, 0x3C + bl sub_80CB7EC + movs r0, 0x3 +_080CB9AE: + strh r0, [r5, 0x34] + movs r0, 0x3C + strh r0, [r5, 0x36] + ldr r0, _080CB9C0 @ =sub_80CB8E8 + str r0, [r5, 0x1C] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CB9C0: .4byte sub_80CB8E8 + thumb_func_end sub_80CB94C + + thumb_func_start sub_80CB9C4 +sub_80CB9C4: @ 80CB9C4 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x34 + ldrsh r0, [r4, r1] + lsls r0, 7 + movs r2, 0x36 + ldrsh r1, [r4, r2] + bl __divsi3 + ldrh r1, [r4, 0x2E] + adds r1, r0 + movs r5, 0 + strh r1, [r4, 0x2E] + lsls r1, 16 + asrs r1, 16 + cmp r1, 0x7F + ble _080CB9EE + ldrh r0, [r4, 0x30] + adds r0, 0x1 + strh r0, [r4, 0x30] + strh r5, [r4, 0x2E] +_080CB9EE: + ldrh r0, [r4, 0x2E] + adds r0, 0x80 + lsls r0, 16 + asrs r0, 16 + movs r1, 0x30 + ldrsh r2, [r4, r1] + lsls r2, 3 + movs r1, 0x1E + subs r1, r2 + lsls r1, 16 + asrs r1, 16 + bl Sin + strh r0, [r4, 0x26] + adds r0, r4, 0 + bl sub_80CB814 + lsls r0, 24 + cmp r0, 0 + beq _080CBA20 + strh r5, [r4, 0x26] + strh r5, [r4, 0x2E] + adds r0, r4, 0 + bl move_anim_8072740 +_080CBA20: + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_80CB9C4 + + thumb_func_start sub_80CBA28 +sub_80CBA28: @ 80CBA28 + push {r4-r6,lr} + adds r5, r0, 0 + ldr r4, _080CBA64 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r6, r0, 24 + ldrb r0, [r4] + bl GetBankSide + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0 + bne _080CBA6C + strh r0, [r5, 0x3A] + adds r0, r6, 0 + adds r0, 0xA + strh r0, [r5, 0x3C] + adds r0, r5, 0 + movs r1, 0x28 + bl sub_80CB7EC + movs r0, 0x3 + strh r0, [r5, 0x34] + movs r0, 0x3C + strh r0, [r5, 0x36] + ldr r0, _080CBA68 @ =sub_80CB8E8 + b _080CBA96 + .align 2, 0 +_080CBA64: .4byte gBattleAnimEnemyMonIndex +_080CBA68: .4byte sub_80CB8E8 +_080CBA6C: + movs r0, 0xFF + strh r0, [r5, 0x3A] + adds r0, r6, 0 + adds r0, 0xA + strh r0, [r5, 0x3C] + bl IsContest + lsls r0, 24 + cmp r0, 0 + beq _080CBA84 + movs r0, 0 + strh r0, [r5, 0x3A] +_080CBA84: + adds r0, r5, 0 + movs r1, 0x28 + bl sub_80CB7EC + movs r0, 0x3 + strh r0, [r5, 0x34] + movs r0, 0x3C + strh r0, [r5, 0x36] + ldr r0, _080CBAA0 @ =sub_80CB9C4 +_080CBA96: + str r0, [r5, 0x1C] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CBAA0: .4byte sub_80CB9C4 + thumb_func_end sub_80CBA28 + + thumb_func_start sub_80CBAA4 +sub_80CBAA4: @ 80CBAA4 + push {r4,lr} + adds r4, r0, 0 + movs r1, 0x2E + ldrsh r0, [r4, r1] + cmp r0, 0 + bne _080CBABE + adds r0, r4, 0 + movs r1, 0 + bl sub_8078764 + ldr r0, _080CBAE4 @ =gBattleAnimArgs + ldrh r0, [r0, 0x4] + strh r0, [r4, 0x30] +_080CBABE: + ldrh r0, [r4, 0x2E] + adds r0, 0x1 + strh r0, [r4, 0x2E] + ldrh r1, [r4, 0x30] + muls r0, r1 + strh r0, [r4, 0x26] + adds r0, r4, 0 + adds r0, 0x3F + ldrb r1, [r0] + movs r0, 0x10 + ands r0, r1 + cmp r0, 0 + beq _080CBADE + adds r0, r4, 0 + bl move_anim_8072740 +_080CBADE: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CBAE4: .4byte gBattleAnimArgs + thumb_func_end sub_80CBAA4 + + thumb_func_start sub_80CBAE8 +sub_80CBAE8: @ 80CBAE8 + push {r4-r6,lr} + adds r5, r0, 0 + movs r1, 0 + bl sub_8078764 + ldr r4, _080CBB30 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r4] + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r6, r0, 24 + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r2, r0, 24 + ldr r0, _080CBB34 @ =gBattleAnimEnemyMonIndex + ldrb r1, [r0] + movs r0, 0x2 + eors r0, r1 + ldrb r4, [r4] + cmp r0, r4 + bne _080CBB38 + strh r6, [r5, 0x3A] + adds r0, r2, 0 + adds r0, 0xA + strh r0, [r5, 0x3C] + adds r0, r5, 0 + movs r1, 0x3C + bl sub_80CB7EC + movs r0, 0x1 + b _080CBB4A + .align 2, 0 +_080CBB30: .4byte gBattleAnimPlayerMonIndex +_080CBB34: .4byte gBattleAnimEnemyMonIndex +_080CBB38: + strh r6, [r5, 0x3A] + adds r0, r2, 0 + adds r0, 0xA + strh r0, [r5, 0x3C] + adds r0, r5, 0 + movs r1, 0x3C + bl sub_80CB7EC + movs r0, 0x3 +_080CBB4A: + strh r0, [r5, 0x34] + movs r0, 0x3C + strh r0, [r5, 0x36] + ldr r0, _080CBB5C @ =sub_80CBB60 + str r0, [r5, 0x1C] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CBB5C: .4byte sub_80CBB60 + thumb_func_end sub_80CBAE8 + + thumb_func_start sub_80CBB60 +sub_80CBB60: @ 80CBB60 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x34 + ldrsh r0, [r4, r1] + lsls r0, 7 + movs r2, 0x36 + ldrsh r1, [r4, r2] + bl __divsi3 + ldrh r1, [r4, 0x2E] + adds r1, r0 + movs r5, 0 + strh r1, [r4, 0x2E] + lsls r1, 16 + asrs r1, 16 + cmp r1, 0x7F + ble _080CBB8A + ldrh r0, [r4, 0x30] + adds r0, 0x1 + strh r0, [r4, 0x30] + strh r5, [r4, 0x2E] +_080CBB8A: + ldrh r0, [r4, 0x2E] + adds r0, 0x80 + lsls r0, 16 + asrs r0, 16 + movs r1, 0x30 + ldrsh r2, [r4, r1] + lsls r2, 3 + movs r1, 0x1E + subs r1, r2 + lsls r1, 16 + asrs r1, 16 + bl Sin + strh r0, [r4, 0x26] + lsls r0, 16 + cmp r0, 0 + bne _080CBBBE + movs r0, 0x3F + bl sub_8076F98 + adds r1, r0, 0 + lsls r1, 24 + asrs r1, 24 + movs r0, 0x7D + bl PlaySE12WithPanning +_080CBBBE: + adds r0, r4, 0 + bl sub_80CB814 + lsls r0, 24 + cmp r0, 0 + beq _080CBBE6 + strh r5, [r4, 0x26] + strh r5, [r4, 0x2E] + ldr r0, _080CBBEC @ =sub_80CB8B8 + str r0, [r4, 0x1C] + movs r0, 0x40 + negs r0, r0 + bl sub_8076F98 + adds r1, r0, 0 + lsls r1, 24 + asrs r1, 24 + movs r0, 0x7D + bl PlaySE12WithPanning +_080CBBE6: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CBBEC: .4byte sub_80CB8B8 + thumb_func_end sub_80CBB60 + + thumb_func_start sub_80CBBF0 +sub_80CBBF0: @ 80CBBF0 + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x2E + ldrsh r0, [r4, r1] + cmp r0, 0 + bne _080CBC84 + bl IsContest + lsls r0, 24 + cmp r0, 0 + bne _080CBC18 + ldr r0, _080CBC14 @ =gBattleAnimArgs + ldrh r1, [r0, 0x2] + strh r1, [r4, 0x30] + movs r1, 0x78 + strh r1, [r4, 0x20] + adds r5, r0, 0 + b _080CBC3A + .align 2, 0 +_080CBC14: .4byte gBattleAnimArgs +_080CBC18: + ldr r0, _080CBC74 @ =gBattleAnimArgs + movs r1, 0x2 + ldrsh r3, [r0, r1] + adds r1, r3, 0 + subs r1, 0x20 + adds r2, r1, 0 + adds r5, r0, 0 + cmp r1, 0 + bge _080CBC2E + adds r2, r3, 0 + adds r2, 0xDF +_080CBC2E: + asrs r0, r2, 8 + lsls r0, 8 + subs r0, r1, r0 + strh r0, [r4, 0x30] + movs r0, 0x46 + strh r0, [r4, 0x20] +_080CBC3A: + ldrh r0, [r5] + strh r0, [r4, 0x22] + strh r0, [r4, 0x32] + movs r0, 0x14 + strh r0, [r4, 0x36] + movs r1, 0x30 + ldrsh r0, [r4, r1] + movs r1, 0x3C + bl Cos + strh r0, [r4, 0x24] + movs r1, 0x30 + ldrsh r0, [r4, r1] + movs r1, 0x14 + bl Sin + strh r0, [r4, 0x26] + ldr r0, _080CBC78 @ =sub_80CBC8C + str r0, [r4, 0x1C] + ldrh r0, [r4, 0x30] + subs r0, 0x1 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0xBE + bhi _080CBC7C + adds r1, r4, 0 + adds r1, 0x43 + movs r0, 0x1F + b _080CBC82 + .align 2, 0 +_080CBC74: .4byte gBattleAnimArgs +_080CBC78: .4byte sub_80CBC8C +_080CBC7C: + adds r1, r4, 0 + adds r1, 0x43 + movs r0, 0x1D +_080CBC82: + strb r0, [r1] +_080CBC84: + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_80CBBF0 + + thumb_func_start sub_80CBC8C +sub_80CBC8C: @ 80CBC8C + push {r4,r5,lr} + adds r4, r0, 0 + movs r1, 0x34 + ldrsh r0, [r4, r1] + cmp r0, 0 + beq _080CBC9E + cmp r0, 0x1 + beq _080CBCCE + b _080CBCEE +_080CBC9E: + ldrh r5, [r4, 0x32] + movs r1, 0x32 + ldrsh r0, [r4, r1] + cmp r0, 0x4E + ble _080CBCB6 + movs r0, 0x1 + strh r0, [r4, 0x34] + adds r0, r4, 0 + movs r1, 0x1 + bl StartSpriteAffineAnim + b _080CBCEE +_080CBCB6: + movs r1, 0x36 + ldrsh r0, [r4, r1] + movs r1, 0xA + bl __divsi3 + adds r0, r5, r0 + strh r0, [r4, 0x32] + ldrh r1, [r4, 0x36] + adds r1, 0x3 + strh r1, [r4, 0x36] + strh r0, [r4, 0x22] + b _080CBCEE +_080CBCCE: + movs r1, 0x34 + ldrsh r0, [r4, r1] + cmp r0, 0 + beq _080CBCEE + adds r0, r4, 0 + adds r0, 0x3F + ldrb r1, [r0] + movs r0, 0x20 + ands r0, r1 + cmp r0, 0 + beq _080CBCEE + movs r0, 0 + strh r0, [r4, 0x2E] + strh r0, [r4, 0x32] + ldr r0, _080CBCF4 @ =sub_80CBCF8 + str r0, [r4, 0x1C] +_080CBCEE: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CBCF4: .4byte sub_80CBCF8 + thumb_func_end sub_80CBC8C + + thumb_func_start sub_80CBCF8 +sub_80CBCF8: @ 80CBCF8 + push {r4-r6,lr} + adds r4, r0, 0 + ldr r5, _080CBD3C @ =gUnknown_083D680C + movs r0, 0x2E + ldrsh r1, [r4, r0] + lsls r0, r1, 1 + adds r3, r0, r1 + adds r0, r5, 0x1 + adds r0, r3, r0 + ldrh r2, [r4, 0x32] + movs r6, 0x32 + ldrsh r1, [r4, r6] + ldrb r0, [r0] + lsls r0, 24 + asrs r0, 24 + cmp r1, r0 + bne _080CBD44 + adds r0, r5, 0x2 + adds r0, r3, r0 + ldrb r0, [r0] + lsls r0, 24 + asrs r0, 24 + cmp r0, 0x7F + bne _080CBD30 + movs r0, 0 + strh r0, [r4, 0x2E] + ldr r0, _080CBD40 @ =sub_80CBDB0 + str r0, [r4, 0x1C] +_080CBD30: + movs r0, 0 + strh r0, [r4, 0x32] + ldrh r0, [r4, 0x2E] + adds r0, 0x1 + strh r0, [r4, 0x2E] + b _080CBDAA + .align 2, 0 +_080CBD3C: .4byte gUnknown_083D680C +_080CBD40: .4byte sub_80CBDB0 +_080CBD44: + adds r0, r2, 0x1 + strh r0, [r4, 0x32] + movs r0, 0x2E + ldrsh r1, [r4, r0] + lsls r0, r1, 1 + adds r0, r1 + adds r1, r0, r5 + movs r2, 0 + ldrsb r2, [r1, r2] + adds r1, r5, 0x2 + adds r0, r1 + ldrb r0, [r0] + lsls r0, 24 + asrs r0, 24 + muls r0, r2 + ldrh r1, [r4, 0x30] + adds r0, r1 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x30] + bl IsContest + lsls r0, 24 + cmp r0, 0 + bne _080CBD92 + ldrh r0, [r4, 0x30] + subs r0, 0x1 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0xBE + bhi _080CBD8A + adds r1, r4, 0 + adds r1, 0x43 + movs r0, 0x1F + b _080CBD90 +_080CBD8A: + adds r1, r4, 0 + adds r1, 0x43 + movs r0, 0x1D +_080CBD90: + strb r0, [r1] +_080CBD92: + movs r6, 0x30 + ldrsh r0, [r4, r6] + movs r1, 0x3C + bl Cos + strh r0, [r4, 0x24] + movs r1, 0x30 + ldrsh r0, [r4, r1] + movs r1, 0x14 + bl Sin + strh r0, [r4, 0x26] +_080CBDAA: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_80CBCF8 + + thumb_func_start sub_80CBDB0 +sub_80CBDB0: @ 80CBDB0 + push {r4,lr} + adds r4, r0, 0 + movs r1, 0x2E + ldrsh r0, [r4, r1] + cmp r0, 0x14 + ble _080CBDC2 + adds r0, r4, 0 + bl move_anim_8072740 +_080CBDC2: + movs r0, 0x2E + ldrsh r1, [r4, r0] + lsrs r0, r1, 31 + adds r0, r1, r0 + asrs r0, 1 + lsls r0, 1 + subs r1, r0 + adds r3, r4, 0 + adds r3, 0x3E + movs r0, 0x1 + ands r1, r0 + lsls r1, 2 + ldrb r2, [r3] + movs r0, 0x5 + negs r0, r0 + ands r0, r2 + orrs r0, r1 + strb r0, [r3] + ldrh r0, [r4, 0x2E] + adds r0, 0x1 + strh r0, [r4, 0x2E] + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CBDB0 + + thumb_func_start sub_80CBDF4 +sub_80CBDF4: @ 80CBDF4 + push {r4-r6,lr} + lsls r0, 24 + lsrs r0, 24 + adds r6, r0, 0 + lsls r0, r6, 2 + adds r0, r6 + lsls r0, 3 + ldr r1, _080CBF48 @ =gTasks + adds r5, r0, r1 + ldr r4, _080CBF4C @ =gBattleAnimEnemyMonIndex + ldrb r0, [r4] + bl sub_8079E90 + lsls r0, 24 + lsrs r0, 24 + subs r0, 0x1 + strh r0, [r5, 0x10] + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x14] + ldrb r0, [r4] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x16] + ldrb r0, [r4] + movs r1, 0x1 + bl sub_807A100 + strh r0, [r5, 0x1C] + ldrb r0, [r4] + movs r1, 0 + bl sub_807A100 + strh r0, [r5, 0x1E] + ldrb r0, [r4] + bl GetBankSide + lsls r0, 24 + lsrs r0, 24 + movs r2, 0x1 + negs r2, r2 + adds r1, r2, 0 + cmp r0, 0x1 + bne _080CBE5C + movs r1, 0x1 +_080CBE5C: + strh r1, [r5, 0x12] + movs r3, 0x12 + ldrsh r0, [r5, r3] + lsls r0, 6 + movs r1, 0x38 + subs r1, r0 + strh r1, [r5, 0x1A] + ldrh r0, [r5, 0x16] + subs r0, r1 + ldrh r1, [r5, 0x14] + adds r0, r1 + strh r0, [r5, 0x18] + ldr r0, _080CBF50 @ =gSpriteTemplate_83D6884 + movs r2, 0x18 + ldrsh r1, [r5, r2] + movs r3, 0x1A + ldrsh r2, [r5, r3] + ldrb r3, [r5, 0x10] + bl CreateSprite + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0xC] + cmp r0, 0x40 + bne _080CBE94 + adds r0, r6, 0 + bl DestroyAnimVisualTask +_080CBE94: + ldr r4, _080CBF54 @ =gSprites + movs r0, 0xC + ldrsh r1, [r5, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + movs r1, 0xA + strh r1, [r0, 0x2E] + movs r2, 0xC + ldrsh r1, [r5, r2] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + ldrh r1, [r5, 0x18] + strh r1, [r0, 0x30] + movs r3, 0xC + ldrsh r0, [r5, r3] + lsls r2, r0, 4 + adds r2, r0 + lsls r2, 2 + adds r2, r4 + movs r1, 0x1C + ldrsh r0, [r5, r1] + lsrs r1, r0, 31 + adds r0, r1 + asrs r0, 1 + adds r0, 0xA + movs r3, 0x12 + ldrsh r1, [r5, r3] + muls r1, r0 + ldrh r0, [r5, 0x14] + subs r0, r1 + strh r0, [r2, 0x32] + movs r0, 0xC + ldrsh r1, [r5, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + ldrh r1, [r5, 0x1A] + strh r1, [r0, 0x34] + movs r1, 0xC + ldrsh r0, [r5, r1] + lsls r1, r0, 4 + adds r1, r0 + lsls r1, 2 + adds r1, r4 + movs r2, 0x1E + ldrsh r0, [r5, r2] + lsrs r2, r0, 31 + adds r0, r2 + asrs r0, 1 + adds r0, 0xA + movs r3, 0x12 + ldrsh r2, [r5, r3] + muls r0, r2 + ldrh r2, [r5, 0x16] + adds r0, r2 + strh r0, [r1, 0x36] + movs r3, 0xC + ldrsh r1, [r5, r3] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + bl sub_80CC338 + movs r1, 0xC + ldrsh r2, [r5, r1] + lsls r1, r2, 4 + adds r1, r2 + lsls r1, 2 + adds r1, r4 + strh r0, [r1, 0x38] + movs r2, 0xC + ldrsh r1, [r5, r2] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + bl sub_80786EC + ldr r0, _080CBF58 @ =sub_80CBF5C + str r0, [r5] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CBF48: .4byte gTasks +_080CBF4C: .4byte gBattleAnimEnemyMonIndex +_080CBF50: .4byte gSpriteTemplate_83D6884 +_080CBF54: .4byte gSprites +_080CBF58: .4byte sub_80CBF5C + thumb_func_end sub_80CBDF4 + + thumb_func_start sub_80CBF5C +sub_80CBF5C: @ 80CBF5C + push {r4-r6,lr} + lsls r0, 24 + lsrs r2, r0, 24 + lsls r0, r2, 2 + adds r0, r2 + lsls r0, 3 + ldr r1, _080CBFA0 @ =gTasks + adds r6, r0, r1 + movs r0, 0xC + ldrsh r1, [r6, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + ldr r1, _080CBFA4 @ =gSprites + adds r4, r0, r1 + movs r1, 0x8 + ldrsh r5, [r6, r1] + cmp r5, 0x7 + bne _080CBF84 + b _080CC1B4 +_080CBF84: + cmp r5, 0x7 + bgt _080CBFD2 + cmp r5, 0x3 + bne _080CBF8E + b _080CC0A6 +_080CBF8E: + cmp r5, 0x3 + bgt _080CBFA8 + cmp r5, 0x1 + beq _080CC038 + cmp r5, 0x1 + bgt _080CC088 + cmp r5, 0 + beq _080CC01A + b _080CC330 + .align 2, 0 +_080CBFA0: .4byte gTasks +_080CBFA4: .4byte gSprites +_080CBFA8: + cmp r5, 0x5 + bne _080CBFAE + b _080CC11C +_080CBFAE: + cmp r5, 0x5 + ble _080CBFB4 + b _080CC196 +_080CBFB4: + adds r0, r6, 0 + adds r1, r2, 0 + bl sub_80CC358 + adds r0, r4, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + bne _080CBFCA + b _080CC330 +_080CBFCA: + movs r0, 0x5 + strh r0, [r6, 0x26] + movs r0, 0xFF + b _080CC32E +_080CBFD2: + cmp r5, 0xB + bne _080CBFD8 + b _080CC298 +_080CBFD8: + cmp r5, 0xB + bgt _080CC006 + cmp r5, 0x9 + bne _080CBFE2 + b _080CC206 +_080CBFE2: + cmp r5, 0x9 + ble _080CBFE8 + b _080CC27C +_080CBFE8: + adds r0, r6, 0 + adds r1, r2, 0 + bl sub_80CC358 + adds r0, r4, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + bne _080CBFFE + b _080CC330 +_080CBFFE: + movs r0, 0x9 + strh r0, [r6, 0x26] + movs r0, 0xFF + b _080CC32E +_080CC006: + cmp r5, 0xD + bne _080CC00C + b _080CC30A +_080CC00C: + cmp r5, 0xD + bge _080CC012 + b _080CC2EA +_080CC012: + cmp r5, 0xFF + bne _080CC018 + b _080CC31A +_080CC018: + b _080CC330 +_080CC01A: + adds r0, r6, 0 + adds r1, r2, 0 + bl sub_80CC358 + adds r0, r4, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + bne _080CC030 + b _080CC330 +_080CC030: + movs r0, 0x1 + strh r0, [r6, 0x26] + movs r0, 0xFF + b _080CC32E +_080CC038: + ldrh r2, [r4, 0x24] + ldrh r3, [r4, 0x20] + adds r2, r3 + movs r0, 0 + strh r2, [r4, 0x20] + ldrh r1, [r4, 0x26] + ldrh r3, [r4, 0x22] + adds r1, r3 + strh r1, [r4, 0x22] + strh r0, [r4, 0x24] + strh r0, [r4, 0x26] + movs r0, 0xA + strh r0, [r4, 0x2E] + strh r2, [r4, 0x30] + ldrh r0, [r6, 0x14] + strh r0, [r4, 0x32] + strh r1, [r4, 0x34] + ldrh r0, [r6, 0x16] + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl sub_80CC338 + strh r0, [r4, 0x38] + ldrh r0, [r6, 0x10] + adds r0, 0x2 + strh r0, [r6, 0x10] + strh r5, [r6, 0xE] + adds r1, r4, 0 + adds r1, 0x43 + strb r0, [r1] + ldrb r1, [r6, 0xE] + adds r0, r4, 0 + bl StartSpriteAnim + adds r0, r4, 0 + bl sub_80786EC + ldrh r0, [r6, 0x8] + adds r0, 0x1 + b _080CC32E +_080CC088: + adds r0, r6, 0 + adds r1, r2, 0 + bl sub_80CC358 + adds r0, r4, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + bne _080CC09E + b _080CC330 +_080CC09E: + movs r0, 0x3 + strh r0, [r6, 0x26] + movs r0, 0xFF + b _080CC32E +_080CC0A6: + ldrh r1, [r4, 0x24] + ldrh r0, [r4, 0x20] + adds r1, r0 + movs r0, 0 + strh r1, [r4, 0x20] + ldrh r2, [r4, 0x26] + ldrh r3, [r4, 0x22] + adds r2, r3 + strh r2, [r4, 0x22] + strh r0, [r4, 0x24] + strh r0, [r4, 0x26] + movs r0, 0xA + strh r0, [r4, 0x2E] + strh r1, [r4, 0x30] + movs r1, 0x1C + ldrsh r0, [r6, r1] + lsrs r1, r0, 31 + adds r0, r1 + asrs r0, 1 + adds r0, 0xA + movs r3, 0x12 + ldrsh r1, [r6, r3] + muls r1, r0 + ldrh r0, [r6, 0x14] + subs r0, r1 + strh r0, [r4, 0x32] + strh r2, [r4, 0x34] + movs r1, 0x1E + ldrsh r0, [r6, r1] + lsrs r1, r0, 31 + adds r0, r1 + asrs r0, 1 + adds r0, 0xA + movs r2, 0x12 + ldrsh r1, [r6, r2] + muls r1, r0 + ldrh r0, [r6, 0x16] + subs r0, r1 + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl sub_80CC338 + strh r0, [r4, 0x38] + movs r0, 0x2 + strh r0, [r6, 0xE] + ldrh r0, [r6, 0x10] + adds r1, r4, 0 + adds r1, 0x43 + strb r0, [r1] + ldrb r1, [r6, 0xE] + adds r0, r4, 0 + bl StartSpriteAnim + adds r0, r4, 0 + bl sub_80786EC + ldrh r0, [r6, 0x8] + adds r0, 0x1 + b _080CC32E +_080CC11C: + ldrh r1, [r4, 0x24] + ldrh r3, [r4, 0x20] + adds r1, r3 + movs r0, 0 + strh r1, [r4, 0x20] + ldrh r2, [r4, 0x26] + ldrh r3, [r4, 0x22] + adds r2, r3 + strh r2, [r4, 0x22] + strh r0, [r4, 0x24] + strh r0, [r4, 0x26] + movs r0, 0xA + strh r0, [r4, 0x2E] + strh r1, [r4, 0x30] + movs r1, 0x1C + ldrsh r0, [r6, r1] + lsrs r1, r0, 31 + adds r0, r1 + asrs r0, 1 + adds r0, 0xA + movs r3, 0x12 + ldrsh r1, [r6, r3] + muls r0, r1 + ldrh r1, [r6, 0x14] + adds r0, r1 + strh r0, [r4, 0x32] + strh r2, [r4, 0x34] + movs r2, 0x1E + ldrsh r0, [r6, r2] + lsrs r1, r0, 31 + adds r0, r1 + asrs r0, 1 + adds r0, 0xA + movs r3, 0x12 + ldrsh r1, [r6, r3] + muls r0, r1 + ldrh r1, [r6, 0x16] + adds r0, r1 + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl sub_80CC338 + strh r0, [r4, 0x38] + ldrh r1, [r6, 0x10] + subs r1, 0x2 + strh r1, [r6, 0x10] + movs r0, 0x3 + strh r0, [r6, 0xE] + adds r0, r4, 0 + adds r0, 0x43 + strb r1, [r0] + ldrb r1, [r6, 0xE] + adds r0, r4, 0 + bl StartSpriteAnim + adds r0, r4, 0 + bl sub_80786EC + ldrh r0, [r6, 0x8] + adds r0, 0x1 + b _080CC32E +_080CC196: + adds r0, r6, 0 + adds r1, r2, 0 + bl sub_80CC358 + adds r0, r4, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + bne _080CC1AC + b _080CC330 +_080CC1AC: + movs r0, 0x7 + strh r0, [r6, 0x26] + movs r0, 0xFF + b _080CC32E +_080CC1B4: + ldrh r2, [r4, 0x24] + ldrh r3, [r4, 0x20] + adds r2, r3 + movs r0, 0 + strh r2, [r4, 0x20] + ldrh r1, [r4, 0x26] + ldrh r3, [r4, 0x22] + adds r1, r3 + strh r1, [r4, 0x22] + strh r0, [r4, 0x24] + strh r0, [r4, 0x26] + movs r0, 0xA + strh r0, [r4, 0x2E] + strh r2, [r4, 0x30] + ldrh r0, [r6, 0x14] + strh r0, [r4, 0x32] + strh r1, [r4, 0x34] + ldrh r0, [r6, 0x16] + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl sub_80CC338 + strh r0, [r4, 0x38] + ldrh r1, [r6, 0x10] + adds r1, 0x2 + strh r1, [r6, 0x10] + movs r0, 0x4 + strh r0, [r6, 0xE] + adds r0, r4, 0 + adds r0, 0x43 + strb r1, [r0] + ldrb r1, [r6, 0xE] + adds r0, r4, 0 + bl StartSpriteAnim + adds r0, r4, 0 + bl sub_80786EC + ldrh r0, [r6, 0x8] + adds r0, 0x1 + b _080CC32E +_080CC206: + ldrh r1, [r4, 0x24] + ldrh r0, [r4, 0x20] + adds r1, r0 + movs r0, 0 + strh r1, [r4, 0x20] + ldrh r2, [r4, 0x26] + ldrh r3, [r4, 0x22] + adds r2, r3 + strh r2, [r4, 0x22] + strh r0, [r4, 0x24] + strh r0, [r4, 0x26] + movs r0, 0xA + strh r0, [r4, 0x2E] + strh r1, [r4, 0x30] + movs r1, 0x1C + ldrsh r0, [r6, r1] + lsrs r1, r0, 31 + adds r0, r1 + asrs r0, 1 + adds r0, 0xA + movs r3, 0x12 + ldrsh r1, [r6, r3] + muls r1, r0 + ldrh r0, [r6, 0x14] + subs r0, r1 + strh r0, [r4, 0x32] + strh r2, [r4, 0x34] + movs r1, 0x1E + ldrsh r0, [r6, r1] + lsrs r1, r0, 31 + adds r0, r1 + asrs r0, 1 + adds r0, 0xA + movs r2, 0x12 + ldrsh r1, [r6, r2] + muls r0, r1 + ldrh r3, [r6, 0x16] + adds r0, r3 + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl sub_80CC338 + strh r0, [r4, 0x38] + movs r0, 0x5 + strh r0, [r6, 0xE] + ldrh r0, [r6, 0x10] + adds r1, r4, 0 + adds r1, 0x43 + strb r0, [r1] + ldrb r1, [r6, 0xE] + adds r0, r4, 0 + bl StartSpriteAnim + adds r0, r4, 0 + bl sub_80786EC + ldrh r0, [r6, 0x8] + adds r0, 0x1 + b _080CC32E +_080CC27C: + adds r0, r6, 0 + adds r1, r2, 0 + bl sub_80CC358 + adds r0, r4, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + beq _080CC330 + movs r0, 0xB + strh r0, [r6, 0x26] + movs r0, 0xFF + b _080CC32E +_080CC298: + ldrh r2, [r4, 0x24] + ldrh r0, [r4, 0x20] + adds r2, r0 + movs r0, 0 + strh r2, [r4, 0x20] + ldrh r1, [r4, 0x26] + ldrh r3, [r4, 0x22] + adds r1, r3 + strh r1, [r4, 0x22] + strh r0, [r4, 0x24] + strh r0, [r4, 0x26] + movs r0, 0xA + strh r0, [r4, 0x2E] + strh r2, [r4, 0x30] + ldrh r0, [r6, 0x18] + strh r0, [r4, 0x32] + strh r1, [r4, 0x34] + ldrh r0, [r6, 0x1A] + strh r0, [r4, 0x36] + adds r0, r4, 0 + bl sub_80CC338 + strh r0, [r4, 0x38] + ldrh r1, [r6, 0x10] + subs r1, 0x2 + strh r1, [r6, 0x10] + movs r0, 0x6 + strh r0, [r6, 0xE] + adds r0, r4, 0 + adds r0, 0x43 + strb r1, [r0] + ldrb r1, [r6, 0xE] + adds r0, r4, 0 + bl StartSpriteAnim + adds r0, r4, 0 + bl sub_80786EC + ldrh r0, [r6, 0x8] + adds r0, 0x1 + b _080CC32E +_080CC2EA: + adds r0, r6, 0 + adds r1, r2, 0 + bl sub_80CC358 + adds r0, r4, 0 + bl sub_8078718 + lsls r0, 24 + cmp r0, 0 + beq _080CC330 + adds r0, r4, 0 + bl DestroySprite + ldrh r0, [r6, 0x8] + adds r0, 0x1 + b _080CC32E +_080CC30A: + movs r1, 0x20 + ldrsh r0, [r6, r1] + cmp r0, 0 + bne _080CC330 + adds r0, r2, 0 + bl DestroyAnimVisualTask + b _080CC330 +_080CC31A: + ldrh r0, [r6, 0xA] + adds r0, 0x1 + strh r0, [r6, 0xA] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x5 + ble _080CC330 + movs r0, 0 + strh r0, [r6, 0xA] + ldrh r0, [r6, 0x26] +_080CC32E: + strh r0, [r6, 0x8] +_080CC330: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_80CBF5C + + thumb_func_start sub_80CC338 +sub_80CC338: @ 80CC338 + push {lr} + movs r2, 0x8 + movs r3, 0x36 + ldrsh r1, [r0, r3] + movs r3, 0x22 + ldrsh r0, [r0, r3] + cmp r1, r0 + bge _080CC34E + negs r0, r2 + lsls r0, 16 + lsrs r2, r0, 16 +_080CC34E: + lsls r0, r2, 16 + asrs r0, 16 + pop {r1} + bx r1 + thumb_func_end sub_80CC338 + + thumb_func_start sub_80CC358 +sub_80CC358: @ 80CC358 + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r6, r0, 0 + lsls r1, 24 + lsrs r7, r1, 24 + ldrh r0, [r6, 0x24] + adds r0, 0x1 + strh r0, [r6, 0x24] + lsls r0, 16 + cmp r0, 0 + ble _080CC3EE + movs r0, 0 + strh r0, [r6, 0x24] + ldr r0, _080CC3F8 @ =gSprites + mov r8, r0 + movs r2, 0xC + ldrsh r1, [r6, r2] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + add r0, r8 + ldrh r1, [r0, 0x24] + ldrh r2, [r0, 0x20] + adds r1, r2 + ldrh r2, [r0, 0x26] + ldrh r0, [r0, 0x22] + adds r2, r0 + ldr r0, _080CC3FC @ =gSpriteTemplate_83D6884 + lsls r1, 16 + asrs r1, 16 + lsls r2, 16 + asrs r2, 16 + ldrb r3, [r6, 0x10] + bl CreateSprite + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x40 + beq _080CC3EE + lsls r5, r0, 4 + adds r5, r0 + lsls r5, 2 + mov r0, r8 + adds r4, r5, r0 + strh r7, [r4, 0x3A] + movs r0, 0xC + strh r0, [r4, 0x3C] + ldr r0, _080CC400 @ =gTasks + lsls r1, r7, 2 + adds r1, r7 + lsls r1, 3 + adds r1, r0 + ldrh r0, [r1, 0x20] + adds r0, 0x1 + strh r0, [r1, 0x20] + ldrh r2, [r6, 0x22] + movs r0, 0x1 + ands r0, r2 + strh r0, [r4, 0x2E] + ldrh r0, [r1, 0x22] + adds r0, 0x1 + strh r0, [r1, 0x22] + ldrb r1, [r6, 0xE] + adds r0, r4, 0 + bl StartSpriteAnim + ldrh r0, [r6, 0x10] + adds r4, 0x43 + strb r0, [r4] + mov r0, r8 + adds r0, 0x1C + adds r5, r0 + ldr r0, _080CC404 @ =sub_80CC408 + str r0, [r5] +_080CC3EE: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_080CC3F8: .4byte gSprites +_080CC3FC: .4byte gSpriteTemplate_83D6884 +_080CC400: .4byte gTasks +_080CC404: .4byte sub_80CC408 + thumb_func_end sub_80CC358 + + thumb_func_start sub_80CC408 +sub_80CC408: @ 80CC408 + push {r4,lr} + adds r4, r0, 0 + ldrh r0, [r4, 0x2E] + adds r0, 0x1 + strh r0, [r4, 0x2E] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x1 + ble _080CC46A + movs r0, 0 + strh r0, [r4, 0x2E] + adds r3, r4, 0 + adds r3, 0x3E + ldrb r2, [r3] + lsls r0, r2, 29 + lsrs r0, 31 + movs r1, 0x1 + eors r1, r0 + lsls r1, 2 + movs r0, 0x5 + negs r0, r0 + ands r0, r2 + orrs r0, r1 + strb r0, [r3] + ldrh r0, [r4, 0x30] + adds r0, 0x1 + strh r0, [r4, 0x30] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x8 + ble _080CC46A + ldr r3, _080CC470 @ =gTasks + movs r0, 0x3C + ldrsh r1, [r4, r0] + lsls r1, 1 + movs r0, 0x3A + ldrsh r2, [r4, r0] + lsls r0, r2, 2 + adds r0, r2 + lsls r0, 3 + adds r1, r0 + adds r3, 0x8 + adds r1, r3 + ldrh r0, [r1] + subs r0, 0x1 + strh r0, [r1] + adds r0, r4, 0 + bl DestroySprite +_080CC46A: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CC470: .4byte gTasks + thumb_func_end sub_80CC408 + + thumb_func_start sub_80CC474 +sub_80CC474: @ 80CC474 + push {r4-r7,lr} + adds r4, r0, 0 + ldr r0, _080CC488 @ =gBattleAnimArgs + movs r1, 0xC + ldrsh r0, [r0, r1] + cmp r0, 0 + bne _080CC490 + ldr r0, _080CC48C @ =gBattleAnimPlayerMonIndex + b _080CC492 + .align 2, 0 +_080CC488: .4byte gBattleAnimArgs +_080CC48C: .4byte gBattleAnimPlayerMonIndex +_080CC490: + ldr r0, _080CC4B0 @ =gBattleAnimEnemyMonIndex +_080CC492: + ldrb r6, [r0] + adds r0, r6, 0 + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CC4BC + movs r0, 0 + strh r0, [r4, 0x36] + ldr r1, _080CC4B4 @ =gBattleAnimArgs + ldrh r0, [r1, 0x6] + strh r0, [r4, 0x32] + ldr r0, _080CC4B8 @ =0x0000fff0 + b _080CC4CC + .align 2, 0 +_080CC4B0: .4byte gBattleAnimEnemyMonIndex +_080CC4B4: .4byte gBattleAnimArgs +_080CC4B8: .4byte 0x0000fff0 +_080CC4BC: + movs r0, 0x1 + strh r0, [r4, 0x36] + ldr r1, _080CC4F0 @ =gBattleAnimArgs + ldrh r0, [r1, 0x6] + negs r0, r0 + strh r0, [r4, 0x32] + movs r0, 0x80 + lsls r0, 1 +_080CC4CC: + strh r0, [r4, 0x20] + adds r7, r1, 0 + adds r5, r7, 0 + ldrh r0, [r5, 0x2] + strh r0, [r4, 0x30] + ldrh r0, [r5, 0x4] + strh r0, [r4, 0x2E] + ldrh r0, [r5, 0x8] + strh r0, [r4, 0x34] + movs r1, 0xA + ldrsh r0, [r5, r1] + cmp r0, 0x1 + beq _080CC502 + cmp r0, 0x1 + bgt _080CC4F4 + cmp r0, 0 + beq _080CC4FE + b _080CC56C + .align 2, 0 +_080CC4F0: .4byte gBattleAnimArgs +_080CC4F4: + cmp r0, 0x2 + beq _080CC508 + cmp r0, 0x3 + beq _080CC534 + b _080CC56C +_080CC4FE: + ldrh r0, [r5] + b _080CC518 +_080CC502: + ldrh r0, [r5] + strh r0, [r4, 0x22] + b _080CC54E +_080CC508: + adds r0, r6, 0 + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r5, [r5] + adds r0, r5 +_080CC518: + strh r0, [r4, 0x22] + adds r0, r6, 0 + bl sub_8079ED4 + movs r1, 0x3 + ands r1, r0 + lsls r1, 2 + ldrb r2, [r4, 0x5] + movs r0, 0xD + negs r0, r0 + ands r0, r2 + orrs r0, r1 + strb r0, [r4, 0x5] + b _080CC56C +_080CC534: + ldr r0, _080CC578 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + ldrh r7, [r7] + adds r0, r7 + strh r0, [r4, 0x22] + movs r0, 0x1 + bl obj_id_for_side_relative_to_move +_080CC54E: + adds r0, r6, 0 + bl sub_8079ED4 + lsls r0, 24 + lsrs r0, 24 + adds r0, 0x1 + movs r1, 0x3 + ands r0, r1 + lsls r0, 2 + ldrb r2, [r4, 0x5] + movs r1, 0xD + negs r1, r1 + ands r1, r2 + orrs r1, r0 + strb r1, [r4, 0x5] +_080CC56C: + ldr r0, _080CC57C @ =sub_80CC580 + str r0, [r4, 0x1C] + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_080CC578: .4byte gBattleAnimEnemyMonIndex +_080CC57C: .4byte sub_80CC580 + thumb_func_end sub_80CC474 + + thumb_func_start sub_80CC580 +sub_80CC580: @ 80CC580 + push {r4,r5,lr} + adds r4, r0, 0 + movs r0, 0x3C + ldrsh r3, [r4, r0] + ldrh r0, [r4, 0x3C] + adds r0, 0x1 + strh r0, [r4, 0x3C] + movs r1, 0x30 + ldrsh r2, [r4, r1] + ldr r1, _080CC5D4 @ =gSineTable + movs r5, 0x2E + ldrsh r0, [r4, r5] + lsls r0, 1 + adds r0, r1 + movs r1, 0 + ldrsh r0, [r0, r1] + muls r0, r2 + asrs r0, 8 + strh r0, [r4, 0x26] + movs r2, 0x32 + ldrsh r0, [r4, r2] + muls r0, r3 + strh r0, [r4, 0x24] + movs r5, 0x34 + ldrsh r0, [r4, r5] + muls r0, r3 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x2E] + movs r1, 0x36 + ldrsh r0, [r4, r1] + cmp r0, 0 + bne _080CC5D8 + movs r2, 0x24 + ldrsh r0, [r4, r2] + movs r5, 0x20 + ldrsh r1, [r4, r5] + adds r0, r1 + cmp r0, 0xF7 + ble _080CC5F0 + b _080CC5EA + .align 2, 0 +_080CC5D4: .4byte gSineTable +_080CC5D8: + movs r1, 0x24 + ldrsh r0, [r4, r1] + movs r2, 0x20 + ldrsh r1, [r4, r2] + adds r0, r1 + movs r1, 0x10 + negs r1, r1 + cmp r0, r1 + bgt _080CC5F0 +_080CC5EA: + adds r0, r4, 0 + bl move_anim_8074EE0 +_080CC5F0: + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end sub_80CC580 + + thumb_func_start sub_80CC5F8 +sub_80CC5F8: @ 80CC5F8 + push {r4-r7,lr} + lsls r0, 24 + lsrs r6, r0, 24 + lsls r0, r6, 2 + adds r0, r6 + lsls r0, 3 + ldr r1, _080CC618 @ =gTasks + adds r5, r0, r1 + movs r1, 0x8 + ldrsh r0, [r5, r1] + cmp r0, 0 + beq _080CC61C + cmp r0, 0x1 + beq _080CC650 + b _080CC6AA + .align 2, 0 +_080CC618: .4byte gTasks +_080CC61C: + ldr r0, _080CC648 @ =0x0000274f + bl IndexOfSpritePaletteTag + lsls r0, 24 + lsrs r0, 20 + movs r2, 0x80 + lsls r2, 1 + adds r4, r2, 0 + adds r0, r4 + strh r0, [r5, 0x18] + ldr r0, _080CC64C @ =0x000027b0 + bl IndexOfSpritePaletteTag + lsls r0, 24 + lsrs r0, 20 + adds r0, r4 + strh r0, [r5, 0x20] + ldrh r0, [r5, 0x8] + adds r0, 0x1 + strh r0, [r5, 0x8] + b _080CC6AA + .align 2, 0 +_080CC648: .4byte 0x0000274f +_080CC64C: .4byte 0x000027b0 +_080CC650: + ldrh r0, [r5, 0x1A] + adds r0, 0x1 + movs r7, 0 + strh r0, [r5, 0x1A] + lsls r0, 16 + cmp r0, 0 + blt _080CC6AA + strh r7, [r5, 0x1A] + ldrh r0, [r5, 0x18] + ldrb r2, [r5, 0x1C] + ldr r4, _080CC6C4 @ =gUnknown_083D6984 + movs r3, 0x1E + ldrsh r1, [r5, r3] + lsls r1, 1 + adds r1, r4 + ldrh r3, [r1] + movs r1, 0x10 + bl BlendPalette + ldrh r0, [r5, 0x20] + ldrb r2, [r5, 0x1C] + movs r3, 0x1E + ldrsh r1, [r5, r3] + lsls r1, 1 + adds r1, r4 + ldrh r3, [r1] + movs r1, 0x10 + bl BlendPalette + ldrh r0, [r5, 0x1C] + adds r0, 0x1 + strh r0, [r5, 0x1C] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x11 + bne _080CC6AA + strh r7, [r5, 0x1C] + ldrh r0, [r5, 0x1E] + adds r0, 0x1 + strh r0, [r5, 0x1E] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x7 + bne _080CC6AA + strh r7, [r5, 0x1E] +_080CC6AA: + ldr r0, _080CC6C8 @ =gBattleAnimArgs + movs r2, 0xE + ldrsh r1, [r0, r2] + movs r0, 0x1 + negs r0, r0 + cmp r1, r0 + bne _080CC6BE + adds r0, r6, 0 + bl DestroyAnimVisualTask +_080CC6BE: + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_080CC6C4: .4byte gUnknown_083D6984 +_080CC6C8: .4byte gBattleAnimArgs + thumb_func_end sub_80CC5F8 + + thumb_func_start sub_80CC6CC +sub_80CC6CC: @ 80CC6CC + push {r4-r7,lr} + sub sp, 0x4 + adds r6, r0, 0 + ldr r1, _080CC6E4 @ =gBattleAnimArgs + movs r2, 0x8 + ldrsh r0, [r1, r2] + cmp r0, 0 + bne _080CC6E8 + adds r0, r6, 0 + bl move_anim_8072740 + b _080CC7C2 + .align 2, 0 +_080CC6E4: .4byte gBattleAnimArgs +_080CC6E8: + movs r3, 0 + ldrsh r0, [r1, r3] + cmp r0, 0 + bne _080CC6F8 + ldr r4, _080CC6F4 @ =gBattleAnimPlayerMonIndex + b _080CC6FA + .align 2, 0 +_080CC6F4: .4byte gBattleAnimPlayerMonIndex +_080CC6F8: + ldr r4, _080CC734 @ =gBattleAnimEnemyMonIndex +_080CC6FA: + ldrb r0, [r4] + movs r1, 0x2 + bl sub_8077ABC + lsls r0, 24 + lsrs r5, r0, 24 + ldrb r0, [r4] + movs r1, 0x3 + bl sub_8077ABC + lsls r0, 24 + lsrs r2, r0, 24 + ldr r0, _080CC738 @ =gBattleAnimArgs + ldrh r1, [r0, 0x8] + strh r1, [r6, 0x2E] + movs r3, 0x2 + ldrsh r1, [r0, r3] + adds r7, r0, 0 + cmp r1, 0 + bne _080CC73C + ldrh r0, [r7, 0x4] + adds r0, r5 + strh r0, [r6, 0x20] + ldrh r0, [r7, 0x6] + adds r0, r2 + strh r0, [r6, 0x22] + strh r5, [r6, 0x38] + strh r2, [r6, 0x3A] + b _080CC74C + .align 2, 0 +_080CC734: .4byte gBattleAnimEnemyMonIndex +_080CC738: .4byte gBattleAnimArgs +_080CC73C: + strh r5, [r6, 0x20] + strh r2, [r6, 0x22] + ldrh r0, [r7, 0x4] + adds r0, r5 + strh r0, [r6, 0x38] + ldrh r0, [r7, 0x6] + adds r0, r2 + strh r0, [r6, 0x3A] +_080CC74C: + ldrh r4, [r6, 0x20] + lsls r0, r4, 4 + strh r0, [r6, 0x30] + ldrh r5, [r6, 0x22] + lsls r0, r5, 4 + strh r0, [r6, 0x32] + movs r1, 0x38 + ldrsh r0, [r6, r1] + movs r2, 0x20 + ldrsh r1, [r6, r2] + subs r0, r1 + lsls r0, 4 + movs r3, 0x8 + ldrsh r1, [r7, r3] + bl __divsi3 + strh r0, [r6, 0x34] + movs r1, 0x3A + ldrsh r0, [r6, r1] + movs r2, 0x22 + ldrsh r1, [r6, r2] + subs r0, r1 + lsls r0, 4 + movs r3, 0x8 + ldrsh r1, [r7, r3] + bl __divsi3 + strh r0, [r6, 0x36] + ldrh r0, [r6, 0x38] + subs r0, r4 + lsls r0, 16 + asrs r0, 16 + ldrh r1, [r6, 0x3A] + subs r1, r5 + lsls r1, 16 + asrs r1, 16 + bl sub_80790F0 + lsls r0, 16 + lsrs r4, r0, 16 + bl IsContest + lsls r0, 24 + cmp r0, 0 + beq _080CC7AE + ldr r1, _080CC7CC @ =0xffff8000 + adds r0, r4, r1 + lsls r0, 16 + lsrs r4, r0, 16 +_080CC7AE: + movs r3, 0x80 + lsls r3, 1 + str r4, [sp] + adds r0, r6, 0 + movs r1, 0 + adds r2, r3, 0 + bl sub_8078FDC + ldr r0, _080CC7D0 @ =sub_80CC7D4 + str r0, [r6, 0x1C] +_080CC7C2: + add sp, 0x4 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_080CC7CC: .4byte 0xffff8000 +_080CC7D0: .4byte sub_80CC7D4 + thumb_func_end sub_80CC6CC + + thumb_func_start sub_80CC7D4 +sub_80CC7D4: @ 80CC7D4 + push {r4,lr} + adds r2, r0, 0 + ldrh r3, [r2, 0x2E] + movs r1, 0x2E + ldrsh r0, [r2, r1] + cmp r0, 0 + beq _080CC804 + ldrh r0, [r2, 0x34] + ldrh r4, [r2, 0x30] + adds r0, r4 + strh r0, [r2, 0x30] + ldrh r1, [r2, 0x36] + ldrh r4, [r2, 0x32] + adds r1, r4 + strh r1, [r2, 0x32] + lsls r0, 16 + asrs r0, 20 + strh r0, [r2, 0x20] + lsls r1, 16 + asrs r1, 20 + strh r1, [r2, 0x22] + subs r0, r3, 0x1 + strh r0, [r2, 0x2E] + b _080CC80A +_080CC804: + adds r0, r2, 0 + bl move_anim_8074EE0 +_080CC80A: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CC7D4 + + thumb_func_start sub_80CC810 +sub_80CC810: @ 80CC810 + push {lr} + adds r2, r0, 0 + adds r0, 0x3F + ldrb r1, [r0] + movs r0, 0x10 + ands r0, r1 + cmp r0, 0 + beq _080CC826 + adds r0, r2, 0 + bl move_anim_8072740 +_080CC826: + pop {r0} + bx r0 + thumb_func_end sub_80CC810 + + thumb_func_start sub_80CC82C +sub_80CC82C: @ 80CC82C + push {r4,lr} + adds r4, r0, 0 + ldr r0, _080CC84C @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CC854 + ldr r2, _080CC850 @ =gBattleAnimArgs + ldrh r0, [r4, 0x20] + ldrh r1, [r2] + subs r0, r1 + strh r0, [r4, 0x20] + ldrh r0, [r2, 0x2] + b _080CC860 + .align 2, 0 +_080CC84C: .4byte gBattleAnimPlayerMonIndex +_080CC850: .4byte gBattleAnimArgs +_080CC854: + ldr r0, _080CC878 @ =gBattleAnimArgs + ldrh r1, [r0] + ldrh r2, [r4, 0x20] + adds r1, r2 + strh r1, [r4, 0x20] + ldrh r0, [r0, 0x2] +_080CC860: + ldrh r1, [r4, 0x22] + adds r0, r1 + strh r0, [r4, 0x22] + ldr r0, _080CC87C @ =sub_8078600 + str r0, [r4, 0x1C] + ldr r1, _080CC880 @ =move_anim_8072740 + adds r0, r4, 0 + bl oamt_set_x3A_32 + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CC878: .4byte gBattleAnimArgs +_080CC87C: .4byte sub_8078600 +_080CC880: .4byte move_anim_8072740 + thumb_func_end sub_80CC82C + + thumb_func_start sub_80CC884 +sub_80CC884: @ 80CC884 + push {r4,r5,lr} + adds r5, r0, 0 + ldr r0, _080CC8BC @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + bne _080CC89E + adds r0, r5, 0 + movs r1, 0x1 + bl StartSpriteAnim +_080CC89E: + ldr r0, _080CC8C0 @ =sub_80CC810 + str r0, [r5, 0x1C] + ldr r4, _080CC8C4 @ =gBattleAnimArgs + movs r0, 0 + ldrsh r1, [r4, r0] + adds r0, r5, 0 + bl sub_807867C + ldrh r0, [r4, 0x2] + ldrh r1, [r5, 0x22] + adds r0, r1 + strh r0, [r5, 0x22] + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CC8BC: .4byte gBattleAnimPlayerMonIndex +_080CC8C0: .4byte sub_80CC810 +_080CC8C4: .4byte gBattleAnimArgs + thumb_func_end sub_80CC884 + + thumb_func_start sub_80CC8C8 +sub_80CC8C8: @ 80CC8C8 + push {r4,lr} + adds r4, r0, 0 + ldr r1, _080CC908 @ =gBattleAnimArgs + ldrh r0, [r1] + ldrh r2, [r4, 0x20] + adds r0, r2 + strh r0, [r4, 0x20] + ldrh r0, [r1, 0x2] + ldrh r2, [r4, 0x22] + adds r0, r2 + strh r0, [r4, 0x22] + ldrh r0, [r1, 0x4] + strh r0, [r4, 0x2E] + ldrh r0, [r1, 0x6] + strh r0, [r4, 0x30] + ldrh r0, [r1, 0x8] + strh r0, [r4, 0x34] + ldrh r0, [r1, 0xA] + strh r0, [r4, 0x38] + ldrb r1, [r1, 0xC] + adds r0, r4, 0 + bl StartSpriteAffineAnim + ldr r1, _080CC90C @ =move_anim_8074EE0 + adds r0, r4, 0 + bl oamt_set_x3A_32 + ldr r0, _080CC910 @ =sub_8078504 + str r0, [r4, 0x1C] + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CC908: .4byte gBattleAnimArgs +_080CC90C: .4byte move_anim_8074EE0 +_080CC910: .4byte sub_8078504 + thumb_func_end sub_80CC8C8 + + thumb_func_start sub_80CC914 +sub_80CC914: @ 80CC914 + push {r4,r5,lr} + adds r5, r0, 0 + ldr r4, _080CC964 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r4] + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x20] + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + strh r0, [r5, 0x22] + ldrb r0, [r4] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + bne _080CC948 + ldrh r0, [r5, 0x22] + adds r0, 0x8 + strh r0, [r5, 0x22] +_080CC948: + ldr r0, _080CC968 @ =sub_80CCB00 + str r0, [r5, 0x1C] + ldr r0, _080CC96C @ =gBattleAnimArgs + movs r2, 0x4 + ldrsh r1, [r0, r2] + adds r3, r0, 0 + cmp r1, 0 + bne _080CC970 + ldrh r0, [r3] + ldrh r1, [r5, 0x20] + adds r0, r1 + strh r0, [r5, 0x20] + b _080CC984 + .align 2, 0 +_080CC964: .4byte gBattleAnimEnemyMonIndex +_080CC968: .4byte sub_80CCB00 +_080CC96C: .4byte gBattleAnimArgs +_080CC970: + ldrh r0, [r5, 0x20] + ldrh r1, [r3] + subs r0, r1 + strh r0, [r5, 0x20] + adds r2, r5, 0 + adds r2, 0x3F + ldrb r0, [r2] + movs r1, 0x1 + orrs r0, r1 + strb r0, [r2] +_080CC984: + ldrh r0, [r3, 0x2] + ldrh r2, [r5, 0x22] + adds r0, r2 + strh r0, [r5, 0x22] + ldr r1, _080CC9B8 @ =0xfffffc00 + adds r0, r1, 0 + ldrh r2, [r5, 0x30] + adds r1, r0, r2 + strh r1, [r5, 0x30] + movs r2, 0x80 + lsls r2, 3 + adds r0, r2, 0 + ldrh r2, [r5, 0x32] + adds r0, r2 + strh r0, [r5, 0x32] + ldrh r0, [r3, 0x4] + strh r0, [r5, 0x38] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x1 + bne _080CC9B2 + negs r0, r1 + strh r0, [r5, 0x30] +_080CC9B2: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CC9B8: .4byte 0xfffffc00 + thumb_func_end sub_80CC914 + + thumb_func_start sub_80CC9BC +sub_80CC9BC: @ 80CC9BC + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r6, r0, 0 + ldr r0, _080CC9D8 @ =gBattleAnimArgs + movs r1, 0x6 + ldrsh r0, [r0, r1] + cmp r0, 0x1 + beq _080CC9DC + cmp r0, 0x1 + ble _080CCA58 + cmp r0, 0x2 + beq _080CC9FC + b _080CCA58 + .align 2, 0 +_080CC9D8: .4byte gBattleAnimArgs +_080CC9DC: + ldr r5, _080CC9F8 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r5] + movs r4, 0x2 + eors r0, r4 + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r7, r0, 24 + ldrb r0, [r5] + eors r4, r0 + adds r0, r4, 0 + b _080CCA68 + .align 2, 0 +_080CC9F8: .4byte gBattleAnimEnemyMonIndex +_080CC9FC: + ldr r5, _080CCA54 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r5] + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r7, r0, 24 + ldrb r0, [r5] + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r4, r0, 24 + ldrb r0, [r5] + movs r2, 0x2 + mov r8, r2 + mov r1, r8 + eors r0, r1 + bl b_side_obj__get_some_boolean + lsls r0, 24 + cmp r0, 0 + beq _080CCA72 + ldrb r0, [r5] + mov r2, r8 + eors r0, r2 + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + adds r0, r7 + lsrs r7, r0, 1 + ldrb r0, [r5] + mov r1, r8 + eors r0, r1 + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r0, 24 + adds r0, r4 + lsrs r4, r0, 1 + b _080CCA72 + .align 2, 0 +_080CCA54: .4byte gBattleAnimEnemyMonIndex +_080CCA58: + ldr r4, _080CCAA4 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r4] + movs r1, 0 + bl sub_8077ABC + lsls r0, 24 + lsrs r7, r0, 24 + ldrb r0, [r4] +_080CCA68: + movs r1, 0x1 + bl sub_8077ABC + lsls r0, 24 + lsrs r4, r0, 24 +_080CCA72: + strh r7, [r6, 0x20] + strh r4, [r6, 0x22] + ldr r0, _080CCAA4 @ =gBattleAnimEnemyMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + bne _080CCA8A + ldrh r0, [r6, 0x22] + adds r0, 0x8 + strh r0, [r6, 0x22] +_080CCA8A: + ldr r0, _080CCAA8 @ =sub_80CCB00 + str r0, [r6, 0x1C] + ldr r0, _080CCAAC @ =gBattleAnimArgs + movs r2, 0x4 + ldrsh r1, [r0, r2] + adds r3, r0, 0 + cmp r1, 0 + bne _080CCAB0 + ldrh r0, [r3] + ldrh r1, [r6, 0x20] + adds r0, r1 + strh r0, [r6, 0x20] + b _080CCAC4 + .align 2, 0 +_080CCAA4: .4byte gBattleAnimEnemyMonIndex +_080CCAA8: .4byte sub_80CCB00 +_080CCAAC: .4byte gBattleAnimArgs +_080CCAB0: + ldrh r0, [r6, 0x20] + ldrh r1, [r3] + subs r0, r1 + strh r0, [r6, 0x20] + adds r2, r6, 0 + adds r2, 0x3F + ldrb r0, [r2] + movs r1, 0x1 + orrs r0, r1 + strb r0, [r2] +_080CCAC4: + ldrh r0, [r3, 0x2] + ldrh r2, [r6, 0x22] + adds r0, r2 + strh r0, [r6, 0x22] + ldr r1, _080CCAFC @ =0xfffffc00 + adds r0, r1, 0 + ldrh r2, [r6, 0x30] + adds r1, r0, r2 + strh r1, [r6, 0x30] + movs r2, 0x80 + lsls r2, 3 + adds r0, r2, 0 + ldrh r2, [r6, 0x32] + adds r0, r2 + strh r0, [r6, 0x32] + ldrh r0, [r3, 0x4] + strh r0, [r6, 0x38] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x1 + bne _080CCAF2 + negs r0, r1 + strh r0, [r6, 0x30] +_080CCAF2: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_080CCAFC: .4byte 0xfffffc00 + thumb_func_end sub_80CC9BC + + thumb_func_start sub_80CCB00 +sub_80CCB00: @ 80CCB00 + push {r4,lr} + adds r4, r0, 0 + ldrh r1, [r4, 0x30] + ldrh r2, [r4, 0x34] + adds r0, r1, r2 + strh r0, [r4, 0x34] + ldrh r0, [r4, 0x32] + ldrh r2, [r4, 0x36] + adds r0, r2 + strh r0, [r4, 0x36] + movs r2, 0x38 + ldrsh r0, [r4, r2] + cmp r0, 0 + bne _080CCB22 + adds r0, r1, 0 + adds r0, 0x18 + b _080CCB26 +_080CCB22: + adds r0, r1, 0 + subs r0, 0x18 +_080CCB26: + strh r0, [r4, 0x30] + ldrh r0, [r4, 0x32] + subs r0, 0x18 + strh r0, [r4, 0x32] + ldrh r0, [r4, 0x34] + lsls r0, 16 + asrs r0, 24 + strh r0, [r4, 0x24] + ldrh r0, [r4, 0x36] + lsls r0, 16 + asrs r0, 24 + strh r0, [r4, 0x26] + ldrh r0, [r4, 0x2E] + adds r0, 0x1 + strh r0, [r4, 0x2E] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x14 + bne _080CCB5C + ldr r1, _080CCB64 @ =move_anim_8072740 + adds r0, r4, 0 + bl oamt_set_x3A_32 + movs r0, 0x3 + strh r0, [r4, 0x2E] + ldr r0, _080CCB68 @ =sub_80782D8 + str r0, [r4, 0x1C] +_080CCB5C: + pop {r4} + pop {r0} + bx r0 + .align 2, 0 +_080CCB64: .4byte move_anim_8072740 +_080CCB68: .4byte sub_80782D8 + thumb_func_end sub_80CCB00 + + thumb_func_start unref_sub_80CCB6C +unref_sub_80CCB6C: @ 80CCB6C + push {r4,r5,lr} + adds r5, r0, 0 + ldrh r1, [r5, 0x32] + movs r2, 0x32 + ldrsh r0, [r5, r2] + cmp r0, 0x1 + ble _080CCC10 + ldrh r1, [r5, 0x34] + movs r0, 0x1 + ands r0, r1 + cmp r0, 0 + beq _080CCBC8 + adds r3, r5, 0 + adds r3, 0x3E + ldrb r1, [r3] + movs r2, 0x5 + negs r2, r2 + adds r0, r2, 0 + ands r0, r1 + strb r0, [r3] + ldr r4, _080CCBC4 @ =gSprites + movs r0, 0x2E + ldrsh r1, [r5, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + adds r0, 0x3E + ldrb r3, [r0] + adds r1, r2, 0 + ands r1, r3 + strb r1, [r0] + movs r0, 0x30 + ldrsh r1, [r5, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + adds r0, 0x3E + ldrb r1, [r0] + ands r2, r1 + strb r2, [r0] + b _080CCBFE + .align 2, 0 +_080CCBC4: .4byte gSprites +_080CCBC8: + adds r1, r5, 0 + adds r1, 0x3E + ldrb r0, [r1] + movs r2, 0x4 + orrs r0, r2 + strb r0, [r1] + ldr r3, _080CCC0C @ =gSprites + movs r0, 0x2E + ldrsh r1, [r5, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r3 + adds r0, 0x3E + ldrb r1, [r0] + orrs r1, r2 + strb r1, [r0] + movs r0, 0x30 + ldrsh r1, [r5, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r3 + adds r0, 0x3E + ldrb r1, [r0] + orrs r1, r2 + strb r1, [r0] +_080CCBFE: + movs r0, 0 + strh r0, [r5, 0x32] + ldrh r0, [r5, 0x34] + adds r0, 0x1 + strh r0, [r5, 0x34] + b _080CCC14 + .align 2, 0 +_080CCC0C: .4byte gSprites +_080CCC10: + adds r0, r1, 0x1 + strh r0, [r5, 0x32] +_080CCC14: + movs r1, 0x34 + ldrsh r0, [r5, r1] + cmp r0, 0xA + bne _080CCC44 + movs r2, 0x2E + ldrsh r1, [r5, r2] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + ldr r4, _080CCC4C @ =gSprites + adds r0, r4 + bl DestroySprite + movs r0, 0x30 + ldrsh r1, [r5, r0] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r4 + bl DestroySprite + adds r0, r5, 0 + bl move_anim_8072740 +_080CCC44: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CCC4C: .4byte gSprites + thumb_func_end unref_sub_80CCB6C + + thumb_func_start sub_80CCC50 +sub_80CCC50: @ 80CCC50 + push {r4,r5,lr} + adds r5, r0, 0 + ldr r4, _080CCC70 @ =gBattleAnimArgs + ldrh r0, [r4, 0x4] + strh r0, [r5, 0x2E] + ldr r0, _080CCC74 @ =gBattleAnimPlayerMonIndex + ldrb r0, [r0] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CCC78 + ldrh r0, [r5, 0x20] + ldrh r1, [r4] + subs r0, r1 + b _080CCC7E + .align 2, 0 +_080CCC70: .4byte gBattleAnimArgs +_080CCC74: .4byte gBattleAnimPlayerMonIndex +_080CCC78: + ldrh r0, [r4] + ldrh r1, [r5, 0x20] + adds r0, r1 +_080CCC7E: + strh r0, [r5, 0x20] + ldr r4, _080CCCAC @ =gBattleAnimArgs + ldrb r1, [r4, 0xA] + adds r0, r5, 0 + bl StartSpriteAnim + ldrh r0, [r4, 0x6] + negs r0, r0 + strh r0, [r5, 0x30] + ldrh r0, [r4, 0x2] + ldrh r1, [r5, 0x22] + adds r0, r1 + strh r0, [r5, 0x22] + ldrh r0, [r4, 0x8] + strh r0, [r5, 0x34] + ldr r1, _080CCCB0 @ =sub_80CCCB4 + str r1, [r5, 0x1C] + adds r0, r5, 0 + bl _call_via_r1 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080CCCAC: .4byte gBattleAnimArgs +_080CCCB0: .4byte sub_80CCCB4 + thumb_func_end sub_80CCC50 + + thumb_func_start sub_80CCCB4 +sub_80CCCB4: @ 80CCCB4 + push {r4,lr} + adds r4, r0, 0 + movs r1, 0x2E + ldrsh r0, [r4, r1] + movs r1, 0x64 + bl Cos + strh r0, [r4, 0x24] + movs r2, 0x2E + ldrsh r0, [r4, r2] + movs r1, 0x14 + bl Sin + strh r0, [r4, 0x26] + movs r1, 0x2E + ldrsh r0, [r4, r1] + cmp r0, 0x7F + bgt _080CCCE0 + adds r1, r4, 0 + adds r1, 0x43 + movs r0, 0 + b _080CCCE6 +_080CCCE0: + adds r1, r4, 0 + adds r1, 0x43 + movs r0, 0xE +_080CCCE6: + strb r0, [r1] + ldrh r0, [r4, 0x30] + ldrh r2, [r4, 0x2E] + adds r0, r2 + movs r1, 0xFF + ands r0, r1 + strh r0, [r4, 0x2E] + ldrh r0, [r4, 0x38] + adds r0, 0x82 + strh r0, [r4, 0x38] + lsls r0, 16 + asrs r0, 24 + ldrh r1, [r4, 0x26] + adds r0, r1 + strh r0, [r4, 0x26] + ldrh r0, [r4, 0x32] + adds r0, 0x1 + strh r0, [r4, 0x32] + lsls r0, 16 + asrs r0, 16 + movs r2, 0x34 + ldrsh r1, [r4, r2] + cmp r0, r1 + bne _080CCD1C + adds r0, r4, 0 + bl move_anim_8072740 +_080CCD1C: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_80CCCB4 + + thumb_func_start sub_80CCD24 +sub_80CCD24: @ 80CCD24 + push {r4-r6,lr} + adds r5, r0, 0 + bl IsContest + lsls r0, 24 + cmp r0, 0 + beq _080CCD3A + ldr r1, _080CCD98 @ =gBattleAnimArgs + ldrh r0, [r1, 0x2] + adds r0, 0x8 + strh r0, [r1, 0x2] +_080CCD3A: + ldr r6, _080CCD9C @ =gBattleAnimPlayerMonIndex + ldrb r0, [r6] + movs r1, 0 + bl sub_8077EE4 + lsls r0, 24 + ldr r4, _080CCD98 @ =gBattleAnimArgs + lsrs r0, 24 + ldrh r1, [r4] + adds r0, r1 + strh r0, [r5, 0x20] + ldrb r0, [r6] + movs r1, 0x1 + bl sub_8077EE4 + lsls r0, 24 + lsrs r0, 24 + ldrh r4, [r4, 0x2] + adds r0, r4 + strh r0, [r5, 0x22] + ldrb r0, [r6] + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _080CCD78 + bl IsContest + lsls r0, 24 + cmp r0, 0 + beq _080CCDA0 +_080CCD78: + ldrb r0, [r6] + bl sub_8079ED4 + lsls r0, 24 + lsrs r0, 24 + adds r0, 0x1 + movs r1, 0x3 + ands r0, r1 + lsls r0, 2 + ldrb r2, [r5, 0x5] + movs r1, 0xD + negs r1, r1 + ands r1, r2 + orrs r1, r0 + strb r1, [r5, 0x5] + b _080CCDB8 + .align 2, 0 +_080CCD98: .4byte gBattleAnimArgs +_080CCD9C: .4byte gBattleAnimPlayerMonIndex +_080CCDA0: + ldrb r0, [r6] + bl sub_8079ED4 + movs r1, 0x3 + ands r1, r0 + lsls r1, 2 + ldrb r2, [r5, 0x5] + movs r0, 0xD + negs r0, r0 + ands r0, r2 + orrs r0, r1 + strb r0, [r5, 0x5] +_080CCDB8: + ldr r0, _080CCDF8 @ =gBattleAnimArgs + ldrh r0, [r0, 0x4] + strh r0, [r5, 0x2E] + ldr r0, _080CCDFC @ =0x00002828 + bl IndexOfSpritePaletteTag + lsls r0, 24 + lsrs r0, 20 + movs r3, 0x80 + lsls r3, 1 + adds r0, r3 + strh r0, [r5, 0x32] + movs r2, 0x10 + movs r0, 0x10 + strh r0, [r5, 0x3C] + ldr r1, _080CCE00 @ =REG_BLDCNT + movs r3, 0xFD + lsls r3, 6 + adds r0, r3, 0 + strh r0, [r1] + ldr r3, _080CCE04 @ =REG_BLDALPHA + ldrh r1, [r5, 0x3C] + lsls r0, r1, 8 + subs r2, r1 + orrs r0, r2 + strh r0, [r3] + ldr r0, _080CCE08 @ =sub_80CCE0C + str r0, [r5, 0x1C] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_080CCDF8: .4byte gBattleAnimArgs +_080CCDFC: .4byte 0x00002828 +_080CCE00: .4byte REG_BLDCNT +_080CCE04: .4byte REG_BLDALPHA +_080CCE08: .4byte sub_80CCE0C + thumb_func_end sub_80CCD24 + thumb_func_start sub_80CCE0C sub_80CCE0C: @ 80CCE0C push {r4-r6,lr} -- cgit v1.2.3 From c1d498a5a3480944ab70e8f1cbb84a8daa64e720 Mon Sep 17 00:00:00 2001 From: "U-User-PC\\User" Date: Wed, 30 Aug 2017 16:31:41 -0400 Subject: fixing conflicts --- ld_script.txt | 56 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/ld_script.txt b/ld_script.txt index c43906b68..070017666 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -55,12 +55,12 @@ SECTIONS { asm/battle_2.o(.text); src/battle_3.o(.text); src/battle_4.o(.text); - asm/battle_5.o(.text); - src/battle_6.o(.text); + src/battle_controller_player.o(.text); src/battle_7.o(.text); - src/battle_8.o(.text); + src/battle_controller_opponent.o(.text); asm/battle_9.o(.text); - src/battle_10.o(.text); + asm/battle_controller_linkopponent1.o(.text); + src/battle_controller_linkopponent2.o(.text); src/pokemon_1.o(.text); src/calculate_base_damage.o(.text); src/pokemon_2.o(.text); @@ -83,7 +83,7 @@ SECTIONS { asm/trade.o(.text.sub_804A9F4); src/trade.o(.text.sub_804DAD4); asm/trade.o(.text.sub_804DB2C); - asm/berry_blender.o(.text); + src/berry_blender.o(.text); src/play_time.o(.text); src/new_game.o(.text); src/rom4.o(.text); @@ -120,7 +120,7 @@ SECTIONS { src/battle_anim.o(.text); src/rom_8077ABC.o(.text); src/task.o(.text); - asm/reshow_battle_screen.o(.text); + src/reshow_battle_screen.o(.text); src/battle_anim_807B69C.o(.text); src/title_screen.o(.text); src/field_weather.o(.text); @@ -159,7 +159,6 @@ SECTIONS { src/matsuda_debug_menu.o(.text); asm/contest.o(.text); src/shop.o(.text); - asm/shop.o(.text); src/berry.o(.text); src/script_menu.o(.text); src/naming_screen.o(.text); @@ -181,6 +180,7 @@ SECTIONS { asm/contest_link_80C857C.o(.text); src/contest_link_80C857C.o(.text); src/item_use.o(.text); + src/battle_anim_80CA710.o(.text); asm/battle_anim_80CA710.o(.text); src/bike.o(.text); asm/easy_chat.o(.text); @@ -197,6 +197,7 @@ SECTIONS { src/dewford_trend.o(.text); src/heal_location.o(.text); src/region_map.o(.text); + src/cute_sketch.o(.text); asm/cute_sketch.o(.text); src/decoration.o(.text); asm/slot_machine.o(.text); @@ -226,9 +227,9 @@ SECTIONS { src/coins.o(.text); src/landmark.o(.text); src/fldeff_strength.o(.text); - asm/battle_transition.o(.text); - src/battle_811DA74.o(.text); - asm/battle_message.o(.text); + src/battle_transition.o(.text); + src/battle_controller_linkpartner.o(.text); + src/battle_message.o(.text); src/choose_party.o(.text); asm/cable_car.o(.text); asm/roulette_util.o(.text); @@ -239,17 +240,18 @@ SECTIONS { asm/field_effect_helpers.o(.text); asm/contest_ai.o(.text); asm/battle_anim_81258BC.o(.text); - src/battle_anim_81258BC.o(.text); - asm/battle_anim_81258BC.o(.text_812BBFC); + asm/battle_controller_safari.o(.text); + src/battle_controller_safari.o(.text); + asm/battle_controller_safari.o(.text_812BBFC); src/fldeff_sweetscent.o(.text); asm/battle_anim_812C144.o(.text); - asm/learn_move.o(.text); + src/learn_move.o(.text); src/fldeff_softboiled.o(.text); src/decoration_inventory.o(.text); src/roamer.o(.text); asm/battle_tower.o(.text); src/use_pokeblock.o(.text); - src/battle_anim_8137220.o(.text); + src/battle_controller_wally.o(.text); src/player_pc.o(.text); src/intro.o(.text); src/field_region_map.o(.text); @@ -262,10 +264,10 @@ SECTIONS { src/mystery_event_menu.o(.text); src/save_failed_screen.o(.text); src/braille_puzzles.o(.text); - asm/pokeblock_feed.o(.text); + src/pokeblock_feed.o(.text); src/clear_save_data_menu.o(.text); src/intro_credits_graphics.o(.text); - asm/evolution_graphics.o(.text); + src/evolution_graphics.o(.text); src/bard_music.o(.text); src/fldeff_teleport.o(.text); src/unknown_debug_menu.o(.text); @@ -330,7 +332,11 @@ SECTIONS { data/main_menu.o(.rodata); data/data2a.o(.rodata); src/battle_4.o(.rodata); + src/battle_controller_player.o(.rodata); data/data2b.o(.rodata); + src/battle_controller_opponent.o(.rodata); + src/battle_controller_linkopponent2.o(.rodata); + data/battle_moves.o(.rodata); src/battle_3.o(.rodata); src/pokemon_data.o(.rodata); . = ALIGN(4); @@ -341,7 +347,7 @@ SECTIONS { data/battle_interface.o(.rodata); src/pokeball.o(.rodata); data/trade.o(.rodata); - data/berry_blender.o(.rodata); + src/berry_blender.o(.rodata); src/new_game.o(.rodata); data/rom4.o(.rodata); data/tilesets.o(.rodata); @@ -397,7 +403,7 @@ SECTIONS { src/item.o(.rodata); data/matsuda_debug_menu.o(.rodata); data/contest.o(.rodata); - data/shop.o(.rodata); + src/shop.o(.rodata); src/berry.o(.rodata); src/script_menu.o(.rodata); src/naming_screen.o(.rodata); @@ -443,22 +449,22 @@ SECTIONS { data/roulette.o(.rodata); data/pokedex_cry_screen.o(.rodata); data/landmark.o(.rodata); - data/battle_transition.o(.rodata); - data/battle_811DA74.o(.rodata); + src/battle_transition.o(.rodata); + src/battle_controller_linkpartner.o(.rodata); data/battle_message.o(.rodata); src/choose_party.o(.rodata); data/cable_car.o(.rodata); src/save.o(.rodata); data/field_effect_helpers.o(.rodata); data/contest_ai.o(.rodata); - data/battle_anim_81258BC.o(.rodata); + src/battle_controller_safari.o(.rodata); data/battle_anim_812C144.o(.rodata); - data/learn_move.o(.rodata); + src/learn_move.o(.rodata); src/decoration_inventory.o(.rodata); src/roamer.o(.rodata); data/battle_tower.o(.rodata); src/use_pokeblock.o(.rodata); - data/battle_anim_8137220.o(.rodata); + src/battle_controller_wally.o(.rodata); src/player_pc.o(.rodata); src/intro.o(.rodata); data/battle_anim_813F0F4.o(.rodata); @@ -470,9 +476,9 @@ SECTIONS { src/strings.o(.rodata); src/berry_tag_screen.o(.rodata); src/save_failed_screen.o(.rodata); - data/pokeblock_feed.o(.rodata); + src/pokeblock_feed.o(.rodata); data/intro_credits_graphics.o(.rodata); - data/evolution_graphics.o(.rodata); + src/evolution_graphics.o(.rodata); data/bard_music.o(.rodata); data/unknown_debug_menu.o(.rodata); data/strings2.o(.rodata); -- cgit v1.2.3 From 8c54cccc993ab617ac8bbfb1fc6347484640c441 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Oct 2017 19:03:16 -0400 Subject: sub_81231EC --- asm/cable_car.s | 24 ------------------------ ld_script.txt | 1 + src/scene/cable_car.c | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 src/scene/cable_car.c diff --git a/asm/cable_car.s b/asm/cable_car.s index 385cd404d..71bc85ccb 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,30 +6,6 @@ .text - thumb_func_start sub_81231EC -sub_81231EC: @ 81231EC - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _08123210 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0812320A - ldr r0, _08123214 @ =sub_8123244 - bl SetMainCallback2 - adds r0, r4, 0 - bl DestroyTask -_0812320A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08123210: .4byte gPaletteFade -_08123214: .4byte sub_8123244 - thumb_func_end sub_81231EC - thumb_func_start sub_8123218 sub_8123218: @ 8123218 push {lr} diff --git a/ld_script.txt b/ld_script.txt index 7b53e8b35..4b103324e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -216,6 +216,7 @@ SECTIONS { src/battle/battle_controller_linkpartner.o(.text); src/battle/battle_message.o(.text); src/field/choose_party.o(.text); + src/scene/cable_car.o(.text); asm/cable_car.o(.text); asm/roulette_util.o(.text); asm/cable_car_util.o(.text); diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c new file mode 100644 index 000000000..1b5d22221 --- /dev/null +++ b/src/scene/cable_car.c @@ -0,0 +1,27 @@ + +// Includes +#include "global.h" +#include "palette.h" +#include "main.h" +#include "task.h" + +// Static type declarations + +// Static RAM declarations + +// Static ROM declarations + +void sub_8123244(void); + +// .rodata + +// .text + +void sub_81231EC(u8 taskId) +{ + if (!gPaletteFade.active) + { + SetMainCallback2(sub_8123244); + DestroyTask(taskId); + } +} -- cgit v1.2.3 From 80985df175f67ea1b90772d2d82c5f97bda44106 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Oct 2017 22:16:21 -0400 Subject: sub_8123244 --- asm/cable_car.s | 574 ---------------------------------------------- data/cable_car.s | 41 ---- include/cable_car_util.h | 12 + include/field_weather.h | 60 +++++ include/gba/macro.h | 30 +++ include/global.h | 1 + ld_script.txt | 1 + src/field/field_weather.c | 48 ---- src/scene/cable_car.c | 204 ++++++++++++++++ sym_ewram.txt | 26 +-- 10 files changed, 309 insertions(+), 688 deletions(-) create mode 100644 include/cable_car_util.h diff --git a/asm/cable_car.s b/asm/cable_car.s index 71bc85ccb..6f20f57e3 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,580 +6,6 @@ .text - thumb_func_start sub_8123218 -sub_8123218: @ 8123218 - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - ldr r0, _08123240 @ =sub_81231EC - movs r1, 0x1 - bl CreateTask - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_08123240: .4byte sub_81231EC - thumb_func_end sub_8123218 - - thumb_func_start sub_8123244 -sub_8123244: @ 8123244 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x10 - ldr r1, _08123268 @ =gMain - ldr r2, _0812326C @ =0x0000043c - adds r0, r1, r2 - ldrb r0, [r0] - mov r9, r1 - cmp r0, 0x8 - bhi _08123298 - lsls r0, 2 - ldr r1, _08123270 @ =_08123274 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08123268: .4byte gMain -_0812326C: .4byte 0x0000043c -_08123270: .4byte _08123274 - .align 2, 0 -_08123274: - .4byte _08123298 - .4byte _08123384 - .4byte _081233E8 - .4byte _08123484 - .4byte _081234A0 - .4byte _08123504 - .4byte _08123598 - .4byte _08123678 - .4byte _081236B0 -_08123298: - movs r0, 0 - bl SetVBlankCallback - bl remove_some_task - movs r3, 0xC0 - lsls r3, 19 - movs r4, 0xC0 - lsls r4, 9 - add r0, sp, 0xC - mov r9, r0 - add r2, sp, 0x8 - movs r6, 0 - ldr r1, _08123368 @ =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, _0812336C @ =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r8, r0 -_081232C0: - strh r6, [r2] - add r0, sp, 0x8 - str r0, [r1] - str r3, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r5 - subs r4, r5 - cmp r4, r5 - bhi _081232C0 - strh r6, [r2] - add r2, sp, 0x8 - str r2, [r1] - str r3, [r1, 0x4] - lsrs r0, r4, 1 - mov r2, r8 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp, 0xC] - ldr r2, _08123368 @ =0x040000d4 - mov r1, r9 - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r1, 0xA0 - lsls r1, 19 - add r0, sp, 0x8 - strh r4, [r0] - str r0, [r2] - str r1, [r2, 0x4] - lsrs r3, 1 - movs r4, 0x81 - lsls r4, 24 - orrs r3, r4 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - ldr r1, _08123370 @ =gUnknown_02039274 - ldr r0, _08123374 @ =0x02017000 - str r0, [r1] - adds r3, r0, 0 - ldr r5, _08123378 @ =0x000010fc - ldr r0, _0812337C @ =gMain - mov r9, r0 - add r1, sp, 0x8 - movs r7, 0 - movs r6, 0x80 - lsls r6, 5 - ldr r0, _0812336C @ =0x81000800 - mov r8, r0 -_08123338: - strh r7, [r1] - add r0, sp, 0x8 - str r0, [r2] - str r3, [r2, 0x4] - mov r0, r8 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - adds r3, r6 - subs r5, r6 - cmp r5, r6 - bhi _08123338 - strh r7, [r1] - add r1, sp, 0x8 - str r1, [r2] - str r3, [r2, 0x4] - lsrs r0, r5, 1 - orrs r0, r4 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - ldr r1, _08123380 @ =0x0000043c - add r1, r9 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_08123368: .4byte 0x040000d4 -_0812336C: .4byte 0x81000800 -_08123370: .4byte gUnknown_02039274 -_08123374: .4byte 0x02017000 -_08123378: .4byte 0x000010fc -_0812337C: .4byte gMain -_08123380: .4byte 0x0000043c -_08123384: - bl ResetSpriteData - bl ResetTasks - bl FreeAllSpritePalettes - bl ResetPaletteFade - bl sub_807C828 - movs r4, 0 - ldr r0, _081233D4 @ =gUnknown_08396FC4 - ldr r0, [r0] - adds r1, r0, 0 - adds r1, 0xF0 - movs r2, 0 -_081233A4: - lsls r0, r4, 2 - adds r0, r1, r0 - str r2, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _081233A4 - bl InitMapMusic - bl ResetMapMusic - ldr r2, _081233D8 @ =gSpriteCoordOffsetX - ldr r1, _081233DC @ =gSpriteCoordOffsetY - movs r0, 0 - strh r0, [r1] - strh r0, [r2] - ldr r1, _081233E0 @ =gMain - ldr r2, _081233E4 @ =0x0000043c - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_081233D4: .4byte gUnknown_08396FC4 -_081233D8: .4byte gSpriteCoordOffsetX -_081233DC: .4byte gSpriteCoordOffsetY -_081233E0: .4byte gMain -_081233E4: .4byte 0x0000043c -_081233E8: - movs r4, 0 - ldr r5, _08123454 @ =gUnknown_08401CF8 -_081233EC: - lsls r0, r4, 3 - adds r0, r5 - bl LoadCompressedObjectPic - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _081233EC - ldr r0, _08123458 @ =gUnknown_08401D18 - bl LoadSpritePalettes - ldr r0, _0812345C @ =gCableCarMtChimneyTilemap - ldr r4, _08123460 @ =0x02019000 - adds r1, r4, 0 - bl LZDecompressWram - ldr r0, _08123464 @ =gCableCarTreeTilemap - movs r2, 0xB4 - lsls r2, 1 - adds r1, r4, r2 - bl LZDecompressWram - ldr r0, _08123468 @ =gCableCarMountainTilemap - movs r2, 0xA5 - lsls r2, 3 - adds r1, r4, r2 - bl LZDecompressWram - ldr r0, _0812346C @ =gCableCarPylonStemTilemap - ldr r1, _08123470 @ =0x000009d8 - adds r4, r1 - adds r1, r4, 0 - bl LZDecompressWram - ldr r0, _08123474 @ =gCableCarBG_Pal - movs r1, 0 - movs r2, 0x80 - bl LoadPalette - ldr r0, _08123478 @ =gCableCarBG_Gfx - movs r1, 0xC0 - lsls r1, 19 - bl LZ77UnCompVram - ldr r1, _0812347C @ =gMain - ldr r2, _08123480 @ =0x0000043c - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_08123454: .4byte gUnknown_08401CF8 -_08123458: .4byte gUnknown_08401D18 -_0812345C: .4byte gCableCarMtChimneyTilemap -_08123460: .4byte 0x02019000 -_08123464: .4byte gCableCarTreeTilemap -_08123468: .4byte gCableCarMountainTilemap -_0812346C: .4byte gCableCarPylonStemTilemap -_08123470: .4byte 0x000009d8 -_08123474: .4byte gCableCarBG_Pal -_08123478: .4byte gCableCarBG_Gfx -_0812347C: .4byte gMain -_08123480: .4byte 0x0000043c -_08123484: - bl sub_8124118 - bl RunTasks - ldr r1, _08123498 @ =gMain - ldr r0, _0812349C @ =0x0000043c - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_08123498: .4byte gMain -_0812349C: .4byte 0x0000043c -_081234A0: - ldr r0, _081234B4 @ =gUnknown_02039274 - ldr r0, [r0] - ldrb r0, [r0, 0x2] - cmp r0, 0x7 - bne _081234BC - ldr r1, _081234B8 @ =0x0000043c - add r1, r9 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_081234B4: .4byte gUnknown_02039274 -_081234B8: .4byte 0x0000043c -_081234BC: - ldr r0, _081234FC @ =gUnknown_08396FC4 - ldr r0, [r0] - adds r1, r0, 0 - adds r1, 0xF0 - ldr r0, [r1] - cmp r0, 0 - bne _081234CC - b _0812370E -_081234CC: - movs r4, 0 - adds r3, r1, 0 - movs r5, 0xD - negs r5, r5 -_081234D4: - lsls r0, r4, 2 - adds r0, r3, r0 - ldr r2, [r0] - cmp r2, 0 - beq _081234E6 - ldrb r1, [r2, 0x5] - adds r0, r5, 0 - ands r0, r1 - strb r0, [r2, 0x5] -_081234E6: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _081234D4 - ldr r1, _08123500 @ =0x0000043c - add r1, r9 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_081234FC: .4byte gUnknown_08396FC4 -_08123500: .4byte 0x0000043c -_08123504: - ldr r0, _08123578 @ =0x0600e800 - ldr r5, _0812357C @ =0x02019168 - movs r1, 0x20 - str r1, [sp] - movs r1, 0xF - str r1, [sp, 0x4] - adds r1, r5, 0 - movs r2, 0 - movs r3, 0x11 - bl sub_8124F08 - ldr r0, _08123580 @ =0x0600f000 - movs r2, 0xF0 - lsls r2, 2 - adds r1, r5, r2 - movs r2, 0x1E - str r2, [sp] - movs r2, 0x14 - mov r9, r2 - str r2, [sp, 0x4] - movs r2, 0 - movs r3, 0 - bl sub_8124F08 - ldr r0, _08123584 @ =gUnknown_02039274 - mov r8, r0 - ldr r0, [r0] - ldr r6, _08123588 @ =0x000008fc - adds r0, r6 - ldr r1, _0812358C @ =gCableCarPylonHookTilemapEntries - movs r2, 0x5 - str r2, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r2, 0 - movs r3, 0 - bl sub_8124F08 - mov r1, r8 - ldr r0, [r1] - adds r0, r6 - movs r2, 0x87 - lsls r2, 4 - adds r5, r2 - str r4, [sp] - mov r1, r9 - str r1, [sp, 0x4] - adds r1, r5, 0 - movs r2, 0 - movs r3, 0x2 - bl sub_8124F08 - ldr r1, _08123590 @ =gMain - ldr r2, _08123594 @ =0x0000043c - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_08123578: .4byte 0x0600e800 -_0812357C: .4byte 0x02019168 -_08123580: .4byte 0x0600f000 -_08123584: .4byte gUnknown_02039274 -_08123588: .4byte 0x000008fc -_0812358C: .4byte gCableCarPylonHookTilemapEntries -_08123590: .4byte gMain -_08123594: .4byte 0x0000043c -_08123598: - ldr r0, _08123664 @ =gSpecialVar_0x8004 - ldrb r0, [r0] - bl sub_81248AC - ldr r0, _08123668 @ =gUnknown_02039274 - mov r8, r0 - ldr r0, [r0] - adds r0, 0xFC - ldr r4, _0812366C @ =0x02019090 - movs r6, 0xC - str r6, [sp] - movs r5, 0x3 - str r5, [sp, 0x4] - adds r1, r4, 0 - movs r2, 0 - movs r3, 0xE - bl sub_8124F08 - mov r1, r8 - ldr r0, [r1] - adds r0, 0xFC - adds r1, r4, 0 - adds r1, 0x48 - str r6, [sp] - str r5, [sp, 0x4] - movs r2, 0xC - movs r3, 0x11 - bl sub_8124F08 - mov r2, r8 - ldr r0, [r2] - adds r0, 0xFC - adds r1, r4, 0 - adds r1, 0x90 - str r6, [sp] - str r5, [sp, 0x4] - movs r2, 0x18 - movs r3, 0x14 - bl sub_8124F08 - mov r1, r8 - ldr r0, [r1] - adds r0, 0xFC - movs r2, 0x90 - negs r2, r2 - adds r2, r4 - mov r9, r2 - str r6, [sp] - str r5, [sp, 0x4] - mov r1, r9 - movs r2, 0 - movs r3, 0x11 - bl sub_8124F08 - mov r1, r8 - ldr r0, [r1] - adds r0, 0xFC - subs r4, 0x48 - str r6, [sp] - str r5, [sp, 0x4] - adds r1, r4, 0 - movs r2, 0 - movs r3, 0x14 - bl sub_8124F08 - mov r2, r8 - ldr r0, [r2] - adds r0, 0xFC - str r6, [sp] - str r5, [sp, 0x4] - mov r1, r9 - movs r2, 0xC - movs r3, 0x14 - bl sub_8124F08 - mov r1, r8 - ldr r0, [r1] - adds r0, 0xFC - str r6, [sp] - str r5, [sp, 0x4] - adds r1, r4, 0 - movs r2, 0xC - movs r3, 0x17 - bl sub_8124F08 - mov r2, r8 - ldr r0, [r2] - adds r0, 0xFC - str r6, [sp] - str r5, [sp, 0x4] - mov r1, r9 - movs r2, 0x18 - movs r3, 0x17 - bl sub_8124F08 - ldr r1, _08123670 @ =gMain - ldr r0, _08123674 @ =0x0000043c - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_08123664: .4byte gSpecialVar_0x8004 -_08123668: .4byte gUnknown_02039274 -_0812366C: .4byte 0x02019090 -_08123670: .4byte gMain -_08123674: .4byte 0x0000043c -_08123678: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r1, 0x3 - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r0, _081236A4 @ =0x000001a9 - movs r1, 0x1 - bl FadeInNewBGM - movs r0, 0x1 - bl sub_8123FBC - ldr r1, _081236A8 @ =gMain - ldr r2, _081236AC @ =0x0000043c - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - b _0812370C - .align 2, 0 -_081236A4: .4byte 0x000001a9 -_081236A8: .4byte gMain -_081236AC: .4byte 0x0000043c -_081236B0: - ldr r3, _081236E4 @ =0x04000208 - ldrh r2, [r3] - movs r0, 0 - strh r0, [r3] - ldr r4, _081236E8 @ =0x04000200 - ldrh r0, [r4] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r4] - strh r2, [r3] - ldr r0, _081236EC @ =sub_8123C40 - bl SetVBlankCallback - ldr r0, _081236F0 @ =sub_8123724 - bl SetMainCallback2 - ldr r0, _081236F4 @ =sub_8123878 - movs r1, 0 - bl CreateTask - ldr r0, _081236F8 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08123700 - ldr r0, _081236FC @ =sub_81239E4 - b _08123702 - .align 2, 0 -_081236E4: .4byte 0x04000208 -_081236E8: .4byte 0x04000200 -_081236EC: .4byte sub_8123C40 -_081236F0: .4byte sub_8123724 -_081236F4: .4byte sub_8123878 -_081236F8: .4byte gSpecialVar_0x8004 -_081236FC: .4byte sub_81239E4 -_08123700: - ldr r0, _0812371C @ =sub_8123AF8 -_08123702: - movs r1, 0x1 - bl CreateTask - ldr r1, _08123720 @ =gUnknown_02039274 - ldr r1, [r1] -_0812370C: - strb r0, [r1] -_0812370E: - add sp, 0x10 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812371C: .4byte sub_8123AF8 -_08123720: .4byte gUnknown_02039274 - thumb_func_end sub_8123244 - thumb_func_start sub_8123724 sub_8123724: @ 8123724 push {lr} diff --git a/data/cable_car.s b/data/cable_car.s index 3075f7651..6523e0314 100644 --- a/data/cable_car.s +++ b/data/cable_car.s @@ -3,47 +3,6 @@ .section .rodata - .align 2 -gCableCarMtChimneyTilemap:: @ 8401820 - .incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz" - - .align 2 -gCableCarTreeTilemap:: @ 8401978 - .incbin "graphics/misc/cable_car_tree_map.bin.lz" - - .align 2 -gCableCarMountainTilemap:: @ 8401AFC - .incbin "graphics/misc/cable_car_mountain_map.bin.lz" - - .align 2 -gCableCarPylonHookTilemapEntries:: @ 8401CC0 - .2byte 0x3000 - .2byte 0x3001 - .2byte 0x3002 - .2byte 0x3003 - .2byte 0x3004 - .2byte 0x3005 - .2byte 0x3006 - .2byte 0x3007 - .2byte 0x3008 - .2byte 0x3009 - - .align 2 -gCableCarPylonStemTilemap:: @ 8401CD4 - .incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz" - - .align 2 -gUnknown_08401CF8:: @ 8401CF8 - obj_tiles gCableCar_Gfx, 0x800, 1 - obj_tiles gCableCarDoor_Gfx, 0x40, 2 - obj_tiles gCableCarCord_Gfx, 0x80, 3 - .space 8 - - .align 2 -gUnknown_08401D18:: @ 8401D18 - obj_pal gCableCar_Pal, 1 - .space 8 - .align 2 gOamData_8401D28:: @ 8401D28 .2byte 0x0300 diff --git a/include/cable_car_util.h b/include/cable_car_util.h new file mode 100644 index 000000000..0f50914c8 --- /dev/null +++ b/include/cable_car_util.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CABLE_CAR_UTIL_H +#define GUARD_CABLE_CAR_UTIL_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations + +void sub_8124F08(u16 *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height); + +#endif //GUARD_CABLE_CAR_UTIL_H diff --git a/include/field_weather.h b/include/field_weather.h index 409f76028..790fadaea 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -47,4 +47,64 @@ bool8 sub_807DDFC(void); void SetWeather(u32); void UpdateWeatherPerDay(u16); +struct WeatherSubstruct { + u8 filler_0[5]; + u8 unk_5_0:2; + u8 unk_5_2:2; + u8 unk_5_4:4; +}; + +struct Weather +{ + u8 filler_000[0xf0]; + struct WeatherSubstruct *unk_0f0[20]; + u8 filler_140[0xc0]; + u8 unknown_200[2][32]; + u8 filler_240[0x480]; + s8 unknown_6C0; + s8 unknown_6C1; + u8 unknown_6C2; + u8 unknown_6C3; + u16 unknown_6C4; + u8 unknown_6C6; + u8 unknown_6C7; + u8 unknown_6C8; + u8 unknown_6C9; + u8 unknown_6CA; + u8 unknown_6CB; + u8 filler_6CC[2]; + u16 unknown_6CE; + u8 unknown_6D0; + u8 unknown_6D1; + u8 filler_6D2[1]; + u8 unknown_6D3; + u8 unknown_6D4; + u8 unknown_6D5; + u8 filler_6D6[2]; + u8 unknown_6D8; + u8 filler_6D9[1]; + u8 unknown_6DA; + u8 filler_6DB[3]; + u8 unknown_6DE; + u8 filler_6DF[5]; + u8 unknown_6E4; + u8 filler_6E5[0x15]; + u8 unknown_6FA; + u8 unknown_6FB; + u8 filler_6FC[4]; + u8 unknown_700; + u8 filler_701[0x15]; + u8 unknown_716; + u8 unknown_717; + u8 filler_718[0xc]; + u8 unknown_724; + u8 filler_725[9]; + u8 unknown_72E; +}; + +#define gWeather gUnknown_0202F7E8 +extern struct Weather gWeather; + +extern struct Weather *const gUnknown_08396FC4; + #endif // GUARD_WEATHER_H diff --git a/include/gba/macro.h b/include/gba/macro.h index 1e0254806..71ff15590 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -118,4 +118,34 @@ #define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16) #define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32) +#define DmaFillLarge(dmaNum, fillval, dest, size, block, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = (u32)(size); \ + while (1) \ + { \ + DmaFill##bit(dmaNum, fillval, _dest, (block)); \ + _dest += (block); \ + _size -= (block); \ + if (_size <= (block)) \ + { \ + DmaFill##bit(dmaNum, fillval, _dest, _size); \ + break; \ + } \ + } \ +} + +#define DmaFill16Large(dmaNum, fillval, dest, size, block) DmaFillLarge(dmaNum, fillval, dest, size, block, 16) +#define DmaFill32Large(dmaNum, fillval, dest, size, block) DmaFillLarge(dmaNum, fillval, dest, size, block, 32) + +#define DmaFillDefvars(dmaNum, fillval, dest, size, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = (u##bit)(size); \ + DmaFill##bit(dmaNum, fillval, _dest, _size); \ +} + +#define DmaFill16Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 16) +#define DmaFill32Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 32) + #endif // GUARD_GBA_MACRO_H diff --git a/include/global.h b/include/global.h index f0eb7401f..4604c8cbb 100644 --- a/include/global.h +++ b/include/global.h @@ -799,5 +799,6 @@ struct HallOfFame extern struct HallOfFame gHallOfFame; extern struct SaveBlock2 gSaveBlock2; +extern u8 ewram[]; #endif // GUARD_GLOBAL_H diff --git a/ld_script.txt b/ld_script.txt index 4b103324e..96dce388a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -437,6 +437,7 @@ SECTIONS { src/battle/battle_controller_linkpartner.o(.rodata); data/battle_message.o(.rodata); src/field/choose_party.o(.rodata); + src/scene/cable_car.o(.rodata); data/cable_car.o(.rodata); src/engine/save.o(.rodata); src/field/field_effect_helpers.o(.rodata); diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 443a38357..8dcfd62fa 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -4,54 +4,6 @@ #include "sprite.h" #include "task.h" -struct Weather -{ - u8 filler_000[0x200]; - u8 unknown_200[2][32]; - u8 filler_240[0x480]; - s8 unknown_6C0; - s8 unknown_6C1; - u8 unknown_6C2; - u8 unknown_6C3; - u16 unknown_6C4; - u8 unknown_6C6; - u8 unknown_6C7; - u8 unknown_6C8; - u8 unknown_6C9; - u8 unknown_6CA; - u8 unknown_6CB; - u8 filler_6CC[2]; - u16 unknown_6CE; - u8 unknown_6D0; - u8 unknown_6D1; - u8 filler_6D2[1]; - u8 unknown_6D3; - u8 unknown_6D4; - u8 unknown_6D5; - u8 filler_6D6[2]; - u8 unknown_6D8; - u8 filler_6D9[1]; - u8 unknown_6DA; - u8 filler_6DB[3]; - u8 unknown_6DE; - u8 filler_6DF[5]; - u8 unknown_6E4; - u8 filler_6E5[0x15]; - u8 unknown_6FA; - u8 unknown_6FB; - u8 filler_6FC[4]; - u8 unknown_700; - u8 filler_701[0x15]; - u8 unknown_716; - u8 unknown_717; - u8 filler_718[0xc]; - u8 unknown_724; - u8 filler_725[9]; - u8 unknown_72E; -}; - -#define gWeather gUnknown_0202F7E8 -extern struct Weather gWeather; extern u8 *gUnknown_083970E8; extern u8 (*gUnknown_08396FC8[][4])(void); extern u8 (*gUnknown_083970B8[])(void); diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 1b5d22221..0f3726e3a 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -3,18 +3,101 @@ #include "global.h" #include "palette.h" #include "main.h" +#include "script.h" #include "task.h" +#include "sound.h" +#include "songs.h" +#include "decompress.h" +#include "field_weather.h" +#include "unknown_task.h" +#include "event_data.h" +#include "cable_car_util.h" // Static type declarations +struct Unk_2017000 { + u8 unk_0000; + u8 unk_0001; + u8 unk_0002; + u8 filler_0003[0xf9]; + u16 unk_00fc[0x400]; + u16 unk_08fc[0x400]; +}; // size 0x10FC + +struct Unk_2019000 { + /* 0x000 */ u16 mtChimneyTilemap[0xb4]; + /* 0x168 */ u16 treeTilemap[0x1e0]; + /* 0x528 */ u16 mountainTilemap[0x258]; + /* 0x9d8 */ u16 pylonStemTilemap[0x628]; // size not actually known +}; + +#define ewram_17000 (*(struct Unk_2017000 *)(ewram + 0x17000)) +#define ewram_19000 (*(struct Unk_2019000 *)(ewram + 0x19000)) + // Static RAM declarations +EWRAM_DATA struct Unk_2017000 *gUnknown_02039274 = NULL; +EWRAM_DATA u8 gUnknown_02039278 = 0; +EWRAM_DATA u8 gUnknown_02039279 = 0; +EWRAM_DATA u8 gUnknown_0203927A = 0; +EWRAM_DATA u8 gUnknown_0203927B = 0; +EWRAM_DATA u8 gUnknown_0203927C = 0; +EWRAM_DATA u8 gUnknown_0203927D = 0; +EWRAM_DATA u32 filler_02039280 = 0; + // Static ROM declarations void sub_8123244(void); +void sub_8124118(void); +void sub_81248AC(u8); +void sub_8123FBC(u8); +void sub_8123C40(void); +void sub_8123724(void); +void sub_8123878(u8 taskId); +void sub_81239E4(u8 taskId); +void sub_8123AF8(u8 taskId); // .rodata +extern const u8 gCableCar_Gfx[]; +extern const u8 gCableCarDoor_Gfx[]; +extern const u8 gCableCarCord_Gfx[]; +extern const u16 gCableCar_Pal[]; +extern const u16 gCableCarBG_Pal[]; +extern const u8 gCableCarBG_Gfx[]; + +const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz"); + +const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz"); + +const u8 gCableCarMountainTilemap[] = INCBIN_U8("graphics/misc/cable_car_mountain_map.bin.lz"); + +const u16 gCableCarPylonHookTilemapEntries[] = { + 0x3000, + 0x3001, + 0x3002, + 0x3003, + 0x3004, + 0x3005, + 0x3006, + 0x3007, + 0x3008, + 0x3009 +}; + +const u8 gCableCarPylonStemTilemap[] = INCBIN_U8("graphics/misc/cable_car_pylon_stem_map.bin.lz"); + +const struct CompressedSpriteSheet gUnknown_08401CF8[] = { + { gCableCar_Gfx, 0x800, 1 }, + { gCableCarDoor_Gfx, 0x40, 2 }, + { gCableCarCord_Gfx, 0x80, 3 }, + { } +}; +const struct SpritePalette gUnknown_08401D18[] = { + { gCableCar_Pal, 1 }, + { } +}; + // .text void sub_81231EC(u8 taskId) @@ -25,3 +108,124 @@ void sub_81231EC(u8 taskId) DestroyTask(taskId); } } + +void sub_8123218(void) +{ + ScriptContext2_Enable(); + CreateTask(sub_81231EC, 1); + BeginNormalPaletteFade(-1, 0, 0, 16, 0); +} + +void sub_8123244(void) +{ + u8 i; + u16 imebak; + + switch (gMain.state) + { + case 0: + default: + SetVBlankCallback(NULL); + remove_some_task(); + DmaFill16Large(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); + DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, (void *)PLTT, PLTT_SIZE); + gUnknown_02039274 = &ewram_17000; + DmaFill16Large(3, 0, &ewram_17000, 0x10FC, 0x1000); + gMain.state ++; + break; + case 1: + ResetSpriteData(); + ResetTasks(); + FreeAllSpritePalettes(); + ResetPaletteFade(); + sub_807C828(); + for (i = 0; i < 20; i ++) + { + gUnknown_08396FC4->unk_0f0[i] = NULL; + } + InitMapMusic(); + ResetMapMusic(); + gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0; + gMain.state ++; + break; + case 2: + for (i = 0; i < 3; i ++) + { + LoadCompressedObjectPic(&gUnknown_08401CF8[i]); + } + LoadSpritePalettes(gUnknown_08401D18); + LZDecompressWram(gCableCarMtChimneyTilemap, ewram_19000.mtChimneyTilemap); + LZDecompressWram(gCableCarTreeTilemap, ewram_19000.treeTilemap); + LZDecompressWram(gCableCarMountainTilemap, ewram_19000.mountainTilemap); + LZDecompressWram(gCableCarPylonStemTilemap, ewram_19000.pylonStemTilemap); + LoadPalette(gCableCarBG_Pal, 0, 0x80); + LZ77UnCompVram(gCableCarBG_Gfx, (u16 *)BG_VRAM); + gMain.state ++; + break; + case 3: + sub_8124118(); + RunTasks(); + gMain.state ++; + break; + case 4: + if (gUnknown_02039274->unk_0002 == 7) + { + gMain.state ++; + } + else if (gUnknown_08396FC4->unk_0f0[0] != NULL) + { + for (i = 0; i < 20; i ++) + { + if (gUnknown_08396FC4->unk_0f0[i] != NULL) + { + gUnknown_08396FC4->unk_0f0[i]->unk_5_2 = 0; + } + } + gMain.state ++; + } + break; + case 5: + sub_8124F08((u16 *)BG_SCREEN_ADDR(29), ewram_19000.treeTilemap, 0, 17, 32, 15); + sub_8124F08((u16 *)BG_SCREEN_ADDR(30), ewram_19000.mountainTilemap, 0, 0, 30, 20); + sub_8124F08(gUnknown_02039274->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); + sub_8124F08(gUnknown_02039274->unk_08fc, ewram_19000.pylonStemTilemap, 0, 2, 2, 20); + gMain.state ++; + break; + case 6: + sub_81248AC(gSpecialVar_0x8004); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x48, 0, 14, 12, 3); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x6C, 12, 17, 12, 3); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x90, 24, 20, 12, 3); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x00, 0, 17, 12, 3); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x24, 0, 20, 12, 3); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x00, 12, 20, 12, 3); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x24, 12, 23, 12, 3); + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x00, 24, 23, 12, 3); + gMain.state ++; + break; + case 7: + BeginNormalPaletteFade(-1, 3, 16, 0, 0); + FadeInNewBGM(BGM_ROPEWAY, 1); + sub_8123FBC(1); + gMain.state ++; + break; + case 8: + imebak = REG_IME; + REG_IME = 0; + REG_IE |= INTR_FLAG_VBLANK; + REG_IME = imebak; + SetVBlankCallback(sub_8123C40); + SetMainCallback2(sub_8123724); + CreateTask(sub_8123878, 0); + if (gSpecialVar_0x8004 == 0) + { + gUnknown_02039274->unk_0000 = CreateTask(sub_81239E4, 1); + } + else + { + gUnknown_02039274->unk_0000 = CreateTask(sub_8123AF8, 1); + } + break; + } +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 09351240f..94388dfd6 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -580,31 +580,7 @@ gAbilitiesPerBank: @ 203926C .space 0x4 .include "src/field/choose_party.o" - -@ cable_car - - .align 2 -gUnknown_02039274: @ 2039274 - .space 0x4 - -gUnknown_02039278: @ 2039278 - .space 0x1 - -gUnknown_02039279: @ 2039279 - .space 0x1 - -gUnknown_0203927A: @ 203927A - .space 0x1 - -gUnknown_0203927B: @ 203927B - .space 0x1 - -gUnknown_0203927C: @ 203927C - .space 0x1 - -gUnknown_0203927D: @ 203927D - .space 0x7 - + .include "src/scene/cable_car.o" .include "src/engine/save.o" .include "src/engine/mystery_event_script.o" .include "src/field/roamer.o" -- cgit v1.2.3 From b833bf304963f92de2670529d1d9083180ade9ba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Oct 2017 22:34:01 -0400 Subject: sub_8123740 --- asm/cable_car.s | 160 -------------------------------------------------- include/gba/macro.h | 10 ++-- src/scene/cable_car.c | 37 +++++++++++- 3 files changed, 39 insertions(+), 168 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index 6f20f57e3..d1f2ba5a1 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,166 +6,6 @@ .text - thumb_func_start sub_8123724 -sub_8123724: @ 8123724 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - bl MapMusicMain - pop {r0} - bx r0 - thumb_func_end sub_8123724 - - thumb_func_start sub_8123740 -sub_8123740: @ 8123740 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r4, 0 - movs r0, 0 - bl sub_8123FBC - ldr r0, _08123854 @ =gSpriteCoordOffsetX - strh r4, [r0] - movs r0, 0 - bl sub_807C9B4 - add r7, sp, 0x4 - ldr r0, _08123858 @ =gUnknown_08396FC4 - ldr r0, [r0] - adds r1, r0, 0 - adds r1, 0xF0 - movs r2, 0 -_08123766: - lsls r0, r4, 2 - adds r0, r1, r0 - str r2, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _08123766 - bl ResetTasks - bl ResetSpriteData - bl ResetPaletteFade - ldr r2, _0812385C @ =0x02000000 - movs r3, 0x80 - lsls r3, 10 - movs r5, 0 - ldr r1, _08123860 @ =0x040000d4 - movs r4, 0x80 - lsls r4, 5 - ldr r6, _08123864 @ =0x85000400 - movs r0, 0x85 - lsls r0, 24 - mov r12, r0 -_08123798: - str r5, [sp] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - str r6, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r4 - subs r3, r4 - cmp r3, r4 - bhi _08123798 - str r5, [sp] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 2 - mov r2, r12 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - ldr r1, _08123868 @ =gUnknown_02039274 - movs r0, 0 - str r0, [r1] - movs r3, 0xC0 - lsls r3, 19 - movs r4, 0xC0 - lsls r4, 9 - adds r2, r7, 0 - movs r6, 0 - ldr r1, _08123860 @ =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r0, _0812386C @ =0x81000800 - mov r12, r0 - movs r0, 0x81 - lsls r0, 24 - mov r8, r0 -_081237E0: - strh r6, [r2] - str r2, [r1] - str r3, [r1, 0x4] - mov r0, r12 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r5 - subs r4, r5 - cmp r4, r5 - bhi _081237E0 - strh r6, [r7] - str r7, [r1] - str r3, [r1, 0x4] - lsrs r0, r4, 1 - mov r2, r8 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp] - ldr r2, _08123860 @ =0x040000d4 - mov r1, sp - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r0, 0xA0 - lsls r0, 19 - strh r4, [r7] - str r7, [r2] - str r0, [r2, 0x4] - lsrs r3, 1 - movs r0, 0x81 - lsls r0, 24 - orrs r3, r0 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - bl warp_in - ldr r0, _08123870 @ =gFieldCallback - str r4, [r0] - ldr r0, _08123874 @ =CB2_LoadMap - bl SetMainCallback2 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08123854: .4byte gSpriteCoordOffsetX -_08123858: .4byte gUnknown_08396FC4 -_0812385C: .4byte 0x02000000 -_08123860: .4byte 0x040000d4 -_08123864: .4byte 0x85000400 -_08123868: .4byte gUnknown_02039274 -_0812386C: .4byte 0x81000800 -_08123870: .4byte gFieldCallback -_08123874: .4byte CB2_LoadMap - thumb_func_end sub_8123740 - thumb_func_start sub_8123878 sub_8123878: @ 8123878 push {r4-r7,lr} diff --git a/include/gba/macro.h b/include/gba/macro.h index 71ff15590..a183a44fc 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -87,7 +87,7 @@ #define DmaCopyLarge(dmaNum, src, dest, size, block, bit) \ { \ const void *_src = src; \ - void *_dest = dest; \ + void *_dest = (void *)(dest); \ u32 _size = size; \ while (1) \ { \ @@ -110,7 +110,7 @@ #define DmaCopyDefvars(dmaNum, src, dest, size, bit) \ { \ const void *_src = src; \ - void *_dest = dest; \ + void *_dest = (void *)(dest); \ u32 _size = size; \ DmaCopy##bit(dmaNum, _src, _dest, _size); \ } @@ -120,8 +120,8 @@ #define DmaFillLarge(dmaNum, fillval, dest, size, block, bit) \ { \ - void *_dest = dest; \ - u32 _size = (u32)(size); \ + void *_dest = (void *)(dest); \ + u32 _size = (u32)(size); \ while (1) \ { \ DmaFill##bit(dmaNum, fillval, _dest, (block)); \ @@ -140,7 +140,7 @@ #define DmaFillDefvars(dmaNum, fillval, dest, size, bit) \ { \ - void *_dest = dest; \ + void *_dest = (void *)(dest); \ u32 _size = (u##bit)(size); \ DmaFill##bit(dmaNum, fillval, _dest, _size); \ } diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 0f3726e3a..899bb9dba 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -1,6 +1,7 @@ // Includes #include "global.h" +#include "overworld.h" #include "palette.h" #include "main.h" #include "script.h" @@ -127,9 +128,9 @@ void sub_8123244(void) default: SetVBlankCallback(NULL); remove_some_task(); - DmaFill16Large(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); - DmaFill32Defvars(3, 0, (void *)OAM, OAM_SIZE); - DmaFill16Defvars(3, 0, (void *)PLTT, PLTT_SIZE); + DmaFill16Large(3, 0, VRAM, VRAM_SIZE, 0x1000); + DmaFill32Defvars(3, 0, OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE); gUnknown_02039274 = &ewram_17000; DmaFill16Large(3, 0, &ewram_17000, 0x10FC, 0x1000); gMain.state ++; @@ -229,3 +230,33 @@ void sub_8123244(void) break; } } + +void sub_8123724(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); + MapMusicMain(); +} + +void sub_8123740(void) +{ + u8 i; + + for (i = 0, sub_8123FBC(0), gSpriteCoordOffsetX = 0, sub_807C9B4(0); i < 20; i ++) + { + gUnknown_08396FC4->unk_0f0[i] = NULL; + } + ResetTasks(); + ResetSpriteData(); + ResetPaletteFade(); + DmaFill32Large(3, 0, ewram, 0x20000, 0x1000); + gUnknown_02039274 = NULL; + DmaFill16Large(3, 0, VRAM, VRAM_SIZE, 0x1000); + DmaFill32Defvars(3, 0, OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE); + warp_in(); + gFieldCallback = NULL; + SetMainCallback2(CB2_LoadMap); +} -- cgit v1.2.3 From 89904a0f2492e9e579b7478c4a66cc547027cf48 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Oct 2017 23:07:27 -0400 Subject: sub_8123878 --- asm/cable_car.s | 192 ------------------------------------------------ include/field_weather.h | 9 +-- src/scene/cable_car.c | 85 ++++++++++++++++++++- 3 files changed, 83 insertions(+), 203 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index d1f2ba5a1..0b8a701f6 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,198 +6,6 @@ .text - thumb_func_start sub_8123878 -sub_8123878: @ 8123878 - push {r4-r7,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r6, r0, 24 - movs r4, 0 - ldr r5, _081238A4 @ =gUnknown_02039274 - ldr r3, [r5] - ldrh r0, [r3, 0x6] - adds r0, 0x1 - strh r0, [r3, 0x6] - ldrb r2, [r3, 0x1] - adds r7, r5, 0 - cmp r2, 0x2 - beq _0812397E - cmp r2, 0x2 - bgt _081238A8 - cmp r2, 0 - beq _081238B6 - cmp r2, 0x1 - beq _081238D0 - b _081239D6 - .align 2, 0 -_081238A4: .4byte gUnknown_02039274 -_081238A8: - cmp r2, 0x3 - bne _081238AE - b _081239A4 -_081238AE: - cmp r2, 0xFF - bne _081238B4 - b _081239BC -_081238B4: - b _081239D6 -_081238B6: - lsls r0, 16 - lsrs r0, 16 - ldrh r1, [r3, 0x4] - cmp r0, r1 - beq _081238C2 - b _081239D6 -_081238C2: - ldrb r0, [r3, 0x2] - bl DoWeatherEffect - ldr r1, [r5] - movs r0, 0x1 - strb r0, [r1, 0x1] - b _081239D6 -_081238D0: - ldrb r0, [r3, 0x2] - cmp r0, 0x2 - beq _08123924 - cmp r0, 0x7 - beq _081238DC - b _081239D6 -_081238DC: - ldr r0, _08123920 @ =gUnknown_08396FC4 - ldr r0, [r0] - adds r2, r0, 0 - adds r2, 0xF0 - ldr r0, [r2] - cmp r0, 0 - beq _081239D6 - ldrb r1, [r0, 0x5] - movs r0, 0xC - ands r0, r1 - cmp r0, 0 - beq _081239D6 - adds r3, r2, 0 - movs r5, 0xD - negs r5, r5 -_081238FA: - lsls r0, r4, 2 - adds r0, r3, r0 - ldr r2, [r0] - cmp r2, 0 - beq _0812390C - ldrb r1, [r2, 0x5] - adds r0, r5, 0 - ands r0, r1 - strb r0, [r2, 0x5] -_0812390C: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _081238FA - ldr r1, [r7] - movs r0, 0x2 - strb r0, [r1, 0x1] - b _081239D6 - .align 2, 0 -_08123920: .4byte gUnknown_08396FC4 -_08123924: - ldr r0, _08123938 @ =gUnknown_08396FC4 - ldr r2, [r0] - movs r1, 0xDA - lsls r1, 3 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0x2 - bne _0812393C - strb r0, [r3, 0x1] - b _081239D6 - .align 2, 0 -_08123938: .4byte gUnknown_08396FC4 -_0812393C: - ldrh r1, [r3, 0x6] - ldrh r0, [r3, 0x4] - adds r0, 0x8 - cmp r1, r0 - blt _081239D6 - adds r6, r2, 0 - adds r6, 0xF0 - movs r5, 0x1 - movs r7, 0x5 - negs r7, r7 -_08123950: - lsls r0, r4, 2 - adds r0, r6, r0 - ldr r0, [r0] - cmp r0, 0 - beq _08123972 - adds r3, r0, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r1, r2, 29 - lsrs r1, 31 - eors r1, r5 - ands r1, r5 - lsls r1, 2 - adds r0, r7, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_08123972: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x13 - bls _08123950 - b _081239D6 -_0812397E: - lsls r1, r0, 16 - ldr r0, _081239A0 @ =0x023a0000 - cmp r1, r0 - bne _081239D6 - movs r0, 0x3 - strb r0, [r3, 0x1] - subs r0, 0x4 - str r4, [sp] - movs r1, 0x3 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - movs r0, 0x4 - bl FadeOutBGM - b _081239D6 - .align 2, 0 -_081239A0: .4byte 0x023a0000 -_081239A4: - ldr r0, _081239B8 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081239D6 - movs r0, 0xFF - strb r0, [r3, 0x1] - b _081239D6 - .align 2, 0 -_081239B8: .4byte gPaletteFade -_081239BC: - movs r0, 0 - bl SetVBlankCallback - adds r0, r6, 0 - bl DestroyTask - ldr r0, [r5] - ldrb r0, [r0] - bl DestroyTask - ldr r0, _081239E0 @ =sub_8123740 - bl SetMainCallback2 -_081239D6: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081239E0: .4byte sub_8123740 - thumb_func_end sub_8123878 - thumb_func_start sub_81239E4 sub_81239E4: @ 81239E4 push {r4-r6,lr} diff --git a/include/field_weather.h b/include/field_weather.h index 790fadaea..b51c47de7 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -47,17 +47,10 @@ bool8 sub_807DDFC(void); void SetWeather(u32); void UpdateWeatherPerDay(u16); -struct WeatherSubstruct { - u8 filler_0[5]; - u8 unk_5_0:2; - u8 unk_5_2:2; - u8 unk_5_4:4; -}; - struct Weather { u8 filler_000[0xf0]; - struct WeatherSubstruct *unk_0f0[20]; + struct Sprite *unk_0f0[20]; u8 filler_140[0xc0]; u8 unknown_200[2][32]; u8 filler_240[0x480]; diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 899bb9dba..27ae54d51 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -20,7 +20,10 @@ struct Unk_2017000 { u8 unk_0000; u8 unk_0001; u8 unk_0002; - u8 filler_0003[0xf9]; + u8 unk_0003; + u16 unk_0004; + u16 unk_0006; + u8 filler_0008[0xf4]; u16 unk_00fc[0x400]; u16 unk_08fc[0x400]; }; // size 0x10FC @@ -180,7 +183,7 @@ void sub_8123244(void) { if (gUnknown_08396FC4->unk_0f0[i] != NULL) { - gUnknown_08396FC4->unk_0f0[i]->unk_5_2 = 0; + gUnknown_08396FC4->unk_0f0[i]->oam.priority = 0; } } gMain.state ++; @@ -244,7 +247,11 @@ void sub_8123740(void) { u8 i; - for (i = 0, sub_8123FBC(0), gSpriteCoordOffsetX = 0, sub_807C9B4(0); i < 20; i ++) + i = 0; + sub_8123FBC(0); + gSpriteCoordOffsetX = 0; + sub_807C9B4(0); + for (; i < 20; i ++) { gUnknown_08396FC4->unk_0f0[i] = NULL; } @@ -260,3 +267,75 @@ void sub_8123740(void) gFieldCallback = NULL; SetMainCallback2(CB2_LoadMap); } + +void sub_8123878(u8 taskId) +{ + u8 i; + + i = 0; + gUnknown_02039274->unk_0006 ++; + switch (gUnknown_02039274->unk_0001) + { + case 0: + if (gUnknown_02039274->unk_0006 == gUnknown_02039274->unk_0004) + { + DoWeatherEffect(gUnknown_02039274->unk_0002); + gUnknown_02039274->unk_0001 = 1; + } + break; + case 1: + switch (gUnknown_02039274->unk_0002) + { + case 7: + if (gUnknown_08396FC4->unk_0f0[0] != NULL && gUnknown_08396FC4->unk_0f0[0]->oam.priority != 0) + { + for (; i < 20; i ++) + { + if (gUnknown_08396FC4->unk_0f0[i] != NULL) + { + gUnknown_08396FC4->unk_0f0[i]->oam.priority = 0; + } + } + gUnknown_02039274->unk_0001 = 2; + } + break; + case 2: + if (gUnknown_08396FC4->unknown_6D0 == 2) + { + gUnknown_02039274->unk_0001 = 2; + } + else if (gUnknown_02039274->unk_0006 >= gUnknown_02039274->unk_0004 + 8) + { + for (; i < 20; i ++) + { + if (gUnknown_08396FC4->unk_0f0[i] != NULL) + { + gUnknown_08396FC4->unk_0f0[i]->invisible ^= TRUE; + } + } + } + break; + } + break; + case 2: + if (gUnknown_02039274->unk_0006 == 570) + { + gUnknown_02039274->unk_0001 = 3; + BeginNormalPaletteFade(-1, 3, 0, 16, 0); + FadeOutBGM(4); + } + break; + case 3: + if (!gPaletteFade.active) + { + gUnknown_02039274->unk_0001 = 255; + } + break; + case 255: + SetVBlankCallback(NULL); + DestroyTask(taskId); + DestroyTask(gUnknown_02039274->unk_0000); + SetMainCallback2(sub_8123740); + break; + } +} -- cgit v1.2.3 From 91a171ff93f10ba185a826257c5b1f2564e59a22 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Oct 2017 23:40:20 -0400 Subject: sub_81239E4 --- asm/cable_car.s | 140 ----------------------------------------------- include/cable_car_util.h | 1 + src/scene/cable_car.c | 45 ++++++++++++++- 3 files changed, 45 insertions(+), 141 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index 0b8a701f6..f2cb6e472 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,146 +6,6 @@ .text - thumb_func_start sub_81239E4 -sub_81239E4: @ 81239E4 - push {r4-r6,lr} - sub sp, 0x8 - ldr r6, _08123A38 @ =gUnknown_02039274 - ldr r1, [r6] - ldrb r0, [r1, 0x1] - cmp r0, 0xFF - beq _08123AC0 - ldrb r0, [r1, 0x14] - subs r0, 0x1 - strb r0, [r1, 0x14] - ldr r1, [r6] - ldrh r0, [r1, 0x6] - movs r3, 0x1 - ands r0, r3 - cmp r0, 0 - bne _08123A0A - ldrb r0, [r1, 0x15] - subs r0, 0x1 - strb r0, [r1, 0x15] -_08123A0A: - ldr r2, [r6] - ldrh r0, [r2, 0x6] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - bne _08123A24 - ldrb r0, [r2, 0xC] - subs r0, 0x1 - strb r0, [r2, 0xC] - ldr r1, [r6] - ldrb r0, [r1, 0xD] - subs r0, 0x1 - strb r0, [r1, 0xD] -_08123A24: - ldr r0, [r6] - ldrb r1, [r0, 0x14] - cmp r1, 0x20 - beq _08123A74 - cmp r1, 0x20 - bgt _08123A3C - cmp r1, 0x10 - beq _08123A90 - b _08123AC0 - .align 2, 0 -_08123A38: .4byte gUnknown_02039274 -_08123A3C: - cmp r1, 0x28 - beq _08123A60 - cmp r1, 0xAF - bne _08123AC0 - ldr r1, _08123A5C @ =0x000008fc - adds r0, r1 - movs r1, 0x2 - str r1, [sp] - movs r1, 0xA - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0x16 - bl sub_8124E7C - b _08123AC0 - .align 2, 0 -_08123A5C: .4byte 0x000008fc -_08123A60: - ldr r1, _08123A70 @ =0x000008fc - adds r0, r1 - movs r1, 0x2 - str r1, [sp] - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0x3 - b _08123A82 - .align 2, 0 -_08123A70: .4byte 0x000008fc -_08123A74: - ldr r1, _08123A8C @ =0x000008fc - adds r0, r1 - str r3, [sp] - movs r1, 0x2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0x2 -_08123A82: - movs r3, 0 - bl sub_8124E7C - b _08123AC0 - .align 2, 0 -_08123A8C: .4byte 0x000008fc -_08123A90: - ldr r5, _08123AE8 @ =0x000008fc - adds r0, r5 - ldr r1, _08123AEC @ =gCableCarPylonHookTilemapEntries - movs r2, 0x5 - str r2, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r2, 0 - movs r3, 0 - bl sub_8124F08 - ldr r0, [r6] - adds r0, r5 - ldr r1, _08123AF0 @ =0x020199d8 - str r4, [sp] - movs r2, 0x1E - str r2, [sp, 0x4] - movs r2, 0 - movs r3, 0x2 - bl sub_8124F08 - ldr r1, [r6] - movs r0, 0x40 - strb r0, [r1, 0x15] -_08123AC0: - bl sub_812453C - ldr r3, _08123AF4 @ =gSpriteCoordOffsetX - movs r0, 0 - ldrsh r2, [r3, r0] - adds r1, r2, 0x1 - adds r0, r1, 0 - cmp r1, 0 - bge _08123AD6 - adds r0, r2, 0 - adds r0, 0x80 -_08123AD6: - asrs r0, 7 - lsls r0, 7 - subs r0, r1, r0 - strh r0, [r3] - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08123AE8: .4byte 0x000008fc -_08123AEC: .4byte gCableCarPylonHookTilemapEntries -_08123AF0: .4byte 0x020199d8 -_08123AF4: .4byte gSpriteCoordOffsetX - thumb_func_end sub_81239E4 - thumb_func_start sub_8123AF8 sub_8123AF8: @ 8123AF8 push {r4-r6,lr} diff --git a/include/cable_car_util.h b/include/cable_car_util.h index 0f50914c8..76198af02 100644 --- a/include/cable_car_util.h +++ b/include/cable_car_util.h @@ -8,5 +8,6 @@ // Exported ROM declarations void sub_8124F08(u16 *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height); +void sub_8124E7C(u16 *dest, u16 a1, u8 a2, u8 a3, u8 a4, u8 a5); #endif //GUARD_CABLE_CAR_UTIL_H diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 27ae54d51..8f708903e 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -23,7 +23,13 @@ struct Unk_2017000 { u8 unk_0003; u16 unk_0004; u16 unk_0006; - u8 filler_0008[0xf4]; + u8 filler_0008[4]; + u8 unk_000c; + u8 unk_000d; + u8 filler_0000e[6]; + u8 unk_0014; + u8 unk_0015; + u8 filler_0016[0xe6]; u16 unk_00fc[0x400]; u16 unk_08fc[0x400]; }; // size 0x10FC @@ -60,6 +66,7 @@ void sub_8123724(void); void sub_8123878(u8 taskId); void sub_81239E4(u8 taskId); void sub_8123AF8(u8 taskId); +void sub_812453C(void); // .rodata @@ -339,3 +346,39 @@ void sub_8123878(u8 taskId) break; } } + +void sub_81239E4(u8 taskId) +{ + if (gUnknown_02039274->unk_0001 != 255) + { + gUnknown_02039274->unk_0014 --; + if ((gUnknown_02039274->unk_0006 % 2) == 0) + { + gUnknown_02039274->unk_0015 --; + } + if ((gUnknown_02039274->unk_0006 % 8) == 0) + { + gUnknown_02039274->unk_000c --; + gUnknown_02039274->unk_000d --; + } + switch (gUnknown_02039274->unk_0014) + { + case 175: + sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 0, 22, 2, 10); + break; + case 40: + sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 3, 0, 2, 2); + break; + case 32: + sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 2, 0, 1, 2); + break; + case 16: + sub_8124F08(gUnknown_02039274->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); + sub_8124F08(gUnknown_02039274->unk_08fc, ewram_19000.pylonStemTilemap, 0, 2, 2, 30); + gUnknown_02039274->unk_0015 = 64; + break; + } + } + sub_812453C(); + gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 1) % 128; +} -- cgit v1.2.3 From acf2820efce9893e71700c8892b00f9acceb9477 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 15 Oct 2017 10:18:11 -0400 Subject: sub_8123AF8 --- asm/cable_car.s | 162 ------------------------------------------------ include/field_weather.h | 3 +- include/global.h | 6 +- src/scene/cable_car.c | 47 ++++++++++++++ 4 files changed, 52 insertions(+), 166 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index f2cb6e472..72c1c9eda 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,168 +6,6 @@ .text - thumb_func_start sub_8123AF8 -sub_8123AF8: @ 8123AF8 - push {r4-r6,lr} - sub sp, 0x8 - ldr r6, _08123B4C @ =gUnknown_02039274 - ldr r1, [r6] - ldrb r0, [r1, 0x1] - cmp r0, 0xFF - beq _08123BEE - ldrb r0, [r1, 0x14] - adds r0, 0x1 - strb r0, [r1, 0x14] - ldr r2, [r6] - ldrh r0, [r2, 0x6] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08123B1E - ldrb r0, [r2, 0x15] - adds r0, 0x1 - strb r0, [r2, 0x15] -_08123B1E: - ldr r2, [r6] - ldrh r0, [r2, 0x6] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - bne _08123B38 - ldrb r0, [r2, 0xC] - adds r0, 0x1 - strb r0, [r2, 0xC] - ldr r1, [r6] - ldrb r0, [r1, 0xD] - adds r0, 0x1 - strb r0, [r1, 0xD] -_08123B38: - ldr r3, [r6] - ldrb r0, [r3, 0x14] - cmp r0, 0x20 - beq _08123BB0 - cmp r0, 0x20 - bgt _08123B50 - cmp r0, 0x10 - beq _08123B78 - b _08123BEE - .align 2, 0 -_08123B4C: .4byte gUnknown_02039274 -_08123B50: - cmp r0, 0x28 - beq _08123BDC - cmp r0, 0xB0 - bne _08123BEE - ldr r1, _08123B70 @ =0x000008fc - adds r0, r3, r1 - ldr r1, _08123B74 @ =0x020199d8 - movs r2, 0x2 - str r2, [sp] - movs r2, 0x1E - str r2, [sp, 0x4] - movs r2, 0 - movs r3, 0x2 - bl sub_8124F08 - b _08123BEE - .align 2, 0 -_08123B70: .4byte 0x000008fc -_08123B74: .4byte 0x020199d8 -_08123B78: - ldr r5, _08123BAC @ =0x000008fc - adds r0, r3, r5 - movs r1, 0x3 - str r1, [sp] - movs r4, 0x2 - str r4, [sp, 0x4] - movs r1, 0 - movs r2, 0x2 - movs r3, 0 - bl sub_8124E7C - ldr r0, [r6] - adds r0, r5 - str r4, [sp] - movs r1, 0xA - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0x16 - bl sub_8124E7C - ldr r1, [r6] - movs r0, 0xC0 - strb r0, [r1, 0x15] - b _08123BEE - .align 2, 0 -_08123BAC: .4byte 0x000008fc -_08123BB0: - ldr r1, _08123BD4 @ =gCableCarPylonHookTilemapEntries + 0x4 - ldrh r2, [r1] - movs r4, 0x90 - lsls r4, 4 - adds r0, r3, r4 - strh r2, [r0] - ldrh r2, [r1, 0x2] - adds r4, 0x2 - adds r0, r3, r4 - strh r2, [r0] - ldrh r2, [r1, 0xA] - adds r4, 0x3E - adds r0, r3, r4 - strh r2, [r0] - ldrh r1, [r1, 0xC] - ldr r2, _08123BD8 @ =0x00000942 - b _08123BEA - .align 2, 0 -_08123BD4: .4byte gCableCarPylonHookTilemapEntries + 0x4 -_08123BD8: .4byte 0x00000942 -_08123BDC: - ldr r2, _08123C08 @ =gCableCarPylonHookTilemapEntries + 0x8 - ldrh r1, [r2] - ldr r4, _08123C0C @ =0x00000904 - adds r0, r3, r4 - strh r1, [r0] - ldrh r1, [r2, 0xA] - ldr r2, _08123C10 @ =0x00000944 -_08123BEA: - adds r0, r3, r2 - strh r1, [r0] -_08123BEE: - bl sub_8124598 - ldr r0, _08123C14 @ =gUnknown_02039274 - ldr r1, [r0] - ldrh r0, [r1, 0x6] - ldrh r1, [r1, 0x4] - cmp r0, r1 - bcs _08123C1C - ldr r4, _08123C18 @ =gSpriteCoordOffsetX - movs r1, 0 - ldrsh r0, [r4, r1] - b _08123C26 - .align 2, 0 -_08123C08: .4byte gCableCarPylonHookTilemapEntries + 0x8 -_08123C0C: .4byte 0x00000904 -_08123C10: .4byte 0x00000944 -_08123C14: .4byte gUnknown_02039274 -_08123C18: .4byte gSpriteCoordOffsetX -_08123C1C: - ldr r0, _08123C38 @ =gUnknown_08396FC4 - ldr r4, [r0] - ldr r2, _08123C3C @ =0x000006fc - adds r4, r2 - ldrh r0, [r4] -_08123C26: - adds r0, 0xF7 - movs r1, 0xF8 - bl __modsi3 - strh r0, [r4] - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08123C38: .4byte gUnknown_08396FC4 -_08123C3C: .4byte 0x000006fc - thumb_func_end sub_8123AF8 - thumb_func_start sub_8123C40 sub_8123C40: @ 8123C40 push {r4,lr} diff --git a/include/field_weather.h b/include/field_weather.h index b51c47de7..d3b1f4ffd 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -84,7 +84,8 @@ struct Weather u8 filler_6E5[0x15]; u8 unknown_6FA; u8 unknown_6FB; - u8 filler_6FC[4]; + u16 unknown_6FC; + u8 filler_6FE[2]; u8 unknown_700; u8 filler_701[0x15]; u8 unknown_716; diff --git a/include/global.h b/include/global.h index 4604c8cbb..a22f0d817 100644 --- a/include/global.h +++ b/include/global.h @@ -14,9 +14,9 @@ #define INCBIN_S8 {0} #define INCBIN_S16 {0} #define INCBIN_S32 {0} -void * memcpy (void *, const void *, size_t); -void * memset (void *, int, size_t); -int strcmp (const char *, const char *); +void *memcpy (void *, const void *, size_t); +void *memset (void *, int, size_t); +int strcmp (const char *, const char *); #endif // Prevent cross-jump optimization. diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 8f708903e..4d762af1a 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -67,6 +67,7 @@ void sub_8123878(u8 taskId); void sub_81239E4(u8 taskId); void sub_8123AF8(u8 taskId); void sub_812453C(void); +void sub_8124598(void); // .rodata @@ -382,3 +383,49 @@ void sub_81239E4(u8 taskId) sub_812453C(); gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 1) % 128; } + +void sub_8123AF8(u8 taskId) +{ + if (gUnknown_02039274->unk_0001 != 255) + { + gUnknown_02039274->unk_0014 ++; + if ((gUnknown_02039274->unk_0006 % 2) == 0) + { + gUnknown_02039274->unk_0015 ++; + } + if ((gUnknown_02039274->unk_0006 % 8) == 0) + { + gUnknown_02039274->unk_000c ++; + gUnknown_02039274->unk_000d ++; + } + switch (gUnknown_02039274->unk_0014) + { + case 176: + sub_8124F08(gUnknown_02039274->unk_08fc, ewram_19000.pylonStemTilemap, 0, 2, 2, 30); + break; + case 16: + sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 2, 0, 3, 2); + sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 0, 22, 2, 10); + gUnknown_02039274->unk_0015 = 192; + break; + case 32: + gUnknown_02039274->unk_08fc[2] = (gCableCarPylonHookTilemapEntries + 2)[0]; + gUnknown_02039274->unk_08fc[3] = (gCableCarPylonHookTilemapEntries + 2)[1]; + gUnknown_02039274->unk_08fc[34] = (gCableCarPylonHookTilemapEntries + 2)[5]; + gUnknown_02039274->unk_08fc[35] = (gCableCarPylonHookTilemapEntries + 2)[6]; + break; + case 40: + gUnknown_02039274->unk_08fc[4] = (gCableCarPylonHookTilemapEntries + 4)[0]; + gUnknown_02039274->unk_08fc[36] = (gCableCarPylonHookTilemapEntries + 4)[5]; + break; + } + } + sub_8124598(); + if (gUnknown_02039274->unk_0006 < gUnknown_02039274->unk_0004) { + gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248; + } + else + { + gUnknown_08396FC4->unknown_6FC = (gUnknown_08396FC4->unknown_6FC + 247) % 248; + } +} -- cgit v1.2.3 From ba3934b56f4bba4ddb1a7df4d4362d34d35a12d2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 15 Oct 2017 10:27:48 -0400 Subject: sub_8123C40 --- asm/cable_car.s | 54 --------------------------------------------------- src/scene/cable_car.c | 19 +++++++++++++++++- 2 files changed, 18 insertions(+), 55 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index 72c1c9eda..c9d2b377a 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,60 +6,6 @@ .text - thumb_func_start sub_8123C40 -sub_8123C40: @ 8123C40 - push {r4,lr} - ldr r1, _08123C9C @ =0x040000d4 - ldr r0, _08123CA0 @ =gUnknown_02039274 - ldr r2, [r0] - adds r0, r2, 0 - adds r0, 0xFC - str r0, [r1] - ldr r0, _08123CA4 @ =0x0600e000 - str r0, [r1, 0x4] - ldr r3, _08123CA8 @ =0x80000400 - str r3, [r1, 0x8] - ldr r0, [r1, 0x8] - ldr r4, _08123CAC @ =0x000008fc - adds r0, r2, r4 - str r0, [r1] - ldr r0, _08123CB0 @ =0x0600f800 - str r0, [r1, 0x4] - str r3, [r1, 0x8] - ldr r0, [r1, 0x8] - subs r1, 0xB8 - ldrb r0, [r2, 0x14] - strh r0, [r1] - adds r1, 0x2 - ldrb r0, [r2, 0x15] - strh r0, [r1] - subs r1, 0xA - ldrb r0, [r2, 0xC] - strh r0, [r1] - adds r1, 0x2 - ldrb r0, [r2, 0xD] - strh r0, [r1] - subs r1, 0x6 - ldrb r0, [r2, 0x8] - strh r0, [r1] - adds r1, 0x2 - ldrb r0, [r2, 0x9] - strh r0, [r1] - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08123C9C: .4byte 0x040000d4 -_08123CA0: .4byte gUnknown_02039274 -_08123CA4: .4byte 0x0600e000 -_08123CA8: .4byte 0x80000400 -_08123CAC: .4byte 0x000008fc -_08123CB0: .4byte 0x0600f800 - thumb_func_end sub_8123C40 - thumb_func_start nullsub_76 nullsub_76: @ 8123CB4 bx lr diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 4d762af1a..6e4fe608e 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -23,7 +23,9 @@ struct Unk_2017000 { u8 unk_0003; u16 unk_0004; u16 unk_0006; - u8 filler_0008[4]; + u8 unk_0008; + u8 unk_0009; + u8 filler_000a[2]; u8 unk_000c; u8 unk_000d; u8 filler_0000e[6]; @@ -429,3 +431,18 @@ void sub_8123AF8(u8 taskId) gUnknown_08396FC4->unknown_6FC = (gUnknown_08396FC4->unknown_6FC + 247) % 248; } } + +void sub_8123C40(void) +{ + DmaCopy16(3, gUnknown_02039274->unk_00fc, BG_SCREEN_ADDR(28), 0x800); + DmaCopy16(3, gUnknown_02039274->unk_08fc, BG_SCREEN_ADDR(31), 0x800); + REG_BG3HOFS = gUnknown_02039274->unk_0014; + REG_BG3VOFS = gUnknown_02039274->unk_0015; + REG_BG1HOFS = gUnknown_02039274->unk_000c; + REG_BG1VOFS = gUnknown_02039274->unk_000d; + REG_BG0HOFS = gUnknown_02039274->unk_0008; + REG_BG0VOFS = gUnknown_02039274->unk_0009; + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} -- cgit v1.2.3 From 259d0cfc75f03da9b2e9f02d45810bb4eb7de12a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 15 Oct 2017 11:00:34 -0400 Subject: sub_8123CB8 --- asm/cable_car.s | 104 -------------------------------------------------- include/sprite.h | 4 -- src/scene/cable_car.c | 31 +++++++++++++++ 3 files changed, 31 insertions(+), 108 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index c9d2b377a..2e841ae04 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,110 +6,6 @@ .text - thumb_func_start nullsub_76 -nullsub_76: @ 8123CB4 - bx lr - thumb_func_end nullsub_76 - - thumb_func_start sub_8123CB8 -sub_8123CB8: @ 8123CB8 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, _08123D20 @ =gUnknown_02039274 - ldr r6, [r0] - ldrb r0, [r6, 0x1] - cmp r0, 0xFF - beq _08123D84 - ldr r0, _08123D24 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08123D34 - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123CE2 - ldr r1, _08123D28 @ =0x47800000 - bl __addsf3 -_08123CE2: - ldr r1, _08123D2C @ =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - subs r1, r0 - strh r1, [r5, 0x20] - movs r1, 0x6 - ldrsh r4, [r6, r1] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123D0A - ldr r1, _08123D28 @ =0x47800000 - bl __addsf3 -_08123D0A: - ldr r1, _08123D30 @ =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - subs r1, r0 - strh r1, [r5, 0x22] - b _08123D84 - .align 2, 0 -_08123D20: .4byte gUnknown_02039274 -_08123D24: .4byte gSpecialVar_0x8004 -_08123D28: .4byte 0x47800000 -_08123D2C: .4byte 0x3e0f5c29 -_08123D30: .4byte 0x3d89374c -_08123D34: - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123D48 - ldr r1, _08123D8C @ =0x47800000 - bl __addsf3 -_08123D48: - ldr r1, _08123D90 @ =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - adds r0, r1 - strh r0, [r5, 0x20] - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123D70 - ldr r1, _08123D8C @ =0x47800000 - bl __addsf3 -_08123D70: - ldr r1, _08123D94 @ =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - adds r0, r1 - strh r0, [r5, 0x22] -_08123D84: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08123D8C: .4byte 0x47800000 -_08123D90: .4byte 0x3e0f5c29 -_08123D94: .4byte 0x3d89374c - thumb_func_end sub_8123CB8 - thumb_func_start sub_8123D98 sub_8123D98: @ 8123D98 push {r4-r6,lr} diff --git a/include/sprite.h b/include/sprite.h index 769e1584d..68bb0b0e1 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -120,10 +120,6 @@ union AffineAnimCmd {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} #define AFFINEANIMCMD_END \ {.type = AFFINEANIMCMDTYPE_END} -#define AFFINEANIMCMD_LOOP(_count) \ - {.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}} -#define AFFINEANIMCMD_JUMP(_target) \ - {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} struct AffineAnimState { diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 6e4fe608e..5a2f39a6f 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -16,6 +16,15 @@ // Static type declarations +// Credits to Made (dolphin emoji) +#define S16TOPOSFLOAT(val) \ +({ \ + s16 v = (val); \ + float f = (float)v; \ + if(v < 0) f += 65536.0f; \ + f; \ +}) + struct Unk_2017000 { u8 unk_0000; u8 unk_0001; @@ -446,3 +455,25 @@ void sub_8123C40(void) ProcessSpriteCopyRequests(); TransferPlttBuffer(); } + +void nullsub_76(void) +{ + +} + +void sub_8123CB8(struct Sprite *sprite) +{ + if (gUnknown_02039274->unk_0001 != 255) + { + if (gSpecialVar_0x8004 == 0) + { + sprite->pos1.x = sprite->data0 - (u8)((f32)0.14 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.y = sprite->data1 - (u8)((f32)0.067 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + } + else + { + sprite->pos1.x = sprite->data0 + (u8)((f32)0.14 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.y = sprite->data1 + (u8)((f32)0.067 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + } + } +} -- cgit v1.2.3 From faea6fd64a4dc8332f6b6171f52c6055e21c3e27 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 15 Oct 2017 13:48:33 -0400 Subject: sub_8123D98 --- asm/cable_car.s | 133 -------------------------------------------------- asmdiff.sh | 0 src/scene/cable_car.c | 44 +++++++++++++++-- 3 files changed, 40 insertions(+), 137 deletions(-) mode change 100644 => 100755 asmdiff.sh diff --git a/asm/cable_car.s b/asm/cable_car.s index 2e841ae04..aed9082cf 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,139 +6,6 @@ .text - thumb_func_start sub_8123D98 -sub_8123D98: @ 8123D98 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, _08123E04 @ =gUnknown_02039274 - ldr r6, [r0] - ldrb r0, [r6, 0x1] - cmp r0, 0xFF - bne _08123DA8 - b _08123EB0 -_08123DA8: - ldr r0, _08123E08 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08123E18 - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123DC4 - ldr r1, _08123E0C @ =0x47800000 - bl __addsf3 -_08123DC4: - ldr r1, _08123E10 @ =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - subs r1, r0 - strh r1, [r5, 0x20] - movs r1, 0x6 - ldrsh r4, [r6, r1] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123DEC - ldr r1, _08123E0C @ =0x47800000 - bl __addsf3 -_08123DEC: - ldr r1, _08123E14 @ =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - subs r1, r0 - strh r1, [r5, 0x22] - b _08123E68 - .align 2, 0 -_08123E04: .4byte gUnknown_02039274 -_08123E08: .4byte gSpecialVar_0x8004 -_08123E0C: .4byte 0x47800000 -_08123E10: .4byte 0x3e0f5c29 -_08123E14: .4byte 0x3d89374c -_08123E18: - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123E2C - ldr r1, _08123E8C @ =0x47800000 - bl __addsf3 -_08123E2C: - ldr r1, _08123E90 @ =0x3e0f5c29 - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x2E] - adds r0, r1 - strh r0, [r5, 0x20] - movs r0, 0x6 - ldrsh r4, [r6, r0] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _08123E54 - ldr r1, _08123E8C @ =0x47800000 - bl __addsf3 -_08123E54: - ldr r1, _08123E94 @ =0x3d89374c - bl __mulsf3 - bl __fixunssfsi - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r5, 0x30] - adds r0, r1 - strh r0, [r5, 0x22] -_08123E68: - movs r0, 0x32 - ldrsh r2, [r5, r0] - cmp r2, 0 - bne _08123E98 - movs r0, 0x11 - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x34] - adds r1, r0, 0x1 - strh r1, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - ble _08123EB0 - strh r2, [r5, 0x34] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - b _08123EB0 - .align 2, 0 -_08123E8C: .4byte 0x47800000 -_08123E90: .4byte 0x3e0f5c29 -_08123E94: .4byte 0x3d89374c -_08123E98: - movs r2, 0 - movs r0, 0x10 - strh r0, [r5, 0x26] - ldrh r0, [r5, 0x34] - adds r1, r0, 0x1 - strh r1, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - ble _08123EB0 - strh r2, [r5, 0x34] - strh r2, [r5, 0x32] -_08123EB0: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8123D98 - thumb_func_start sub_8123EB8 sub_8123EB8: @ 8123EB8 push {lr} diff --git a/asmdiff.sh b/asmdiff.sh old mode 100644 new mode 100755 diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 5a2f39a6f..30002bb47 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -467,13 +467,49 @@ void sub_8123CB8(struct Sprite *sprite) { if (gSpecialVar_0x8004 == 0) { - sprite->pos1.x = sprite->data0 - (u8)((f32)0.14 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); - sprite->pos1.y = sprite->data1 - (u8)((f32)0.067 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.x = sprite->data0 - (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.y = sprite->data1 - (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); } else { - sprite->pos1.x = sprite->data0 + (u8)((f32)0.14 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); - sprite->pos1.y = sprite->data1 + (u8)((f32)0.067 * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.x = sprite->data0 + (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.y = sprite->data1 + (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + } + } +} + +void sub_8123D98(struct Sprite *sprite) +{ + if (gUnknown_02039274->unk_0001 != 255) + { + if (gSpecialVar_0x8004 == 0) + { + sprite->pos1.x = sprite->data0 - (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.y = sprite->data1 - (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + } + else + { + sprite->pos1.x = sprite->data0 + (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.y = sprite->data1 + (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + } + switch (sprite->data2) + { + case 0: + sprite->pos2.y = 17; + if (sprite->data3 ++ > 9) + { + sprite->data3 = 0; + sprite->data2 ++; + } + break; + default: + sprite->pos2.y = 16; + if (sprite->data3 ++ > 9) + { + sprite->data3 = 0; + sprite->data2 = 0; + } + break; } } } -- cgit v1.2.3 From 270ed12126feb679f5fc818d33da56f65ae9fa98 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 15 Oct 2017 14:01:09 -0400 Subject: sub_8123EB8 --- asm/cable_car.s | 78 --------------------------------------------------- src/scene/cable_car.c | 36 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 78 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index aed9082cf..7a6da9e00 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,84 +6,6 @@ .text - thumb_func_start sub_8123EB8 -sub_8123EB8: @ 8123EB8 - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _08123EE8 - adds r0, r2, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - ldrh r3, [r2, 0x20] - adds r0, r3 - strh r0, [r2, 0x20] - ldrh r1, [r2, 0x22] - adds r1, 0x10 - adds r0, r2, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - strh r0, [r2, 0x22] -_08123EE8: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x32 - ldrsh r1, [r2, r3] - cmp r0, r1 - blt _08123F3E - movs r0, 0x30 - ldrsh r1, [r2, r0] - cmp r1, 0 - beq _08123F08 - cmp r1, 0x1 - beq _08123F12 - b _08123F30 -_08123F08: - ldrh r0, [r2, 0x20] - adds r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x2E] - b _08123F22 -_08123F12: - ldrh r0, [r2, 0x2E] - ands r0, r1 - cmp r0, 0 - beq _08123F30 - ldrh r0, [r2, 0x20] - adds r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x20] -_08123F22: - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08123F30 - ldrh r0, [r2, 0x22] - adds r0, 0x1 - strh r0, [r2, 0x22] -_08123F30: - movs r1, 0x22 - ldrsh r0, [r2, r1] - cmp r0, 0xA0 - ble _08123F3E - adds r0, r2, 0 - bl DestroySprite -_08123F3E: - pop {r0} - bx r0 - thumb_func_end sub_8123EB8 - thumb_func_start sub_8123F44 sub_8123F44: @ 8123F44 push {lr} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 30002bb47..ee26d730b 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -513,3 +513,39 @@ void sub_8123D98(struct Sprite *sprite) } } } + +void sub_8123EB8(struct Sprite *sprite) +{ + if (sprite->data0 == 0) + { + sprite->pos1.x += 2 * sprite->centerToCornerVecX; + sprite->pos1.y += 16 + sprite->centerToCornerVecY; + } + if (++ sprite->data0 >= sprite->data2) + { + switch (sprite->data1) + { + case 0: + sprite->pos1.x ++; + if ((sprite->data0 % 4) == 0) + { + sprite->pos1.y ++; + } + break; + case 1: + if ((sprite->data0 % 2) != 0) + { + sprite->pos1.x ++; + if ((sprite->pos1.x % 4) == 0) + { + sprite->pos1.y ++; + } + } + break; + } + if (sprite->pos1.y > 0xa0) + { + DestroySprite(sprite); + } + } +} -- cgit v1.2.3 From 958a2b9a4028d974a8cbd906368340d2c2641adc Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 15 Oct 2017 14:03:33 -0400 Subject: sub_8123F44 --- asm/cable_car.s | 69 --------------------------------------------------- src/scene/cable_car.c | 35 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 69 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index 7a6da9e00..fc8a22052 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,75 +6,6 @@ .text - thumb_func_start sub_8123F44 -sub_8123F44: @ 8123F44 - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0 - bne _08123F62 - ldrh r1, [r2, 0x22] - adds r1, 0x10 - adds r0, r2, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - strh r0, [r2, 0x22] -_08123F62: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x32 - ldrsh r1, [r2, r3] - cmp r0, r1 - blt _08123FB8 - movs r0, 0x30 - ldrsh r1, [r2, r0] - cmp r1, 0 - beq _08123F82 - cmp r1, 0x1 - beq _08123F8C - b _08123FAA -_08123F82: - ldrh r0, [r2, 0x20] - subs r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x2E] - b _08123F9C -_08123F8C: - ldrh r0, [r2, 0x2E] - ands r0, r1 - cmp r0, 0 - beq _08123FAA - ldrh r0, [r2, 0x20] - subs r0, 0x1 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x20] -_08123F9C: - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08123FAA - ldrh r0, [r2, 0x22] - subs r0, 0x1 - strh r0, [r2, 0x22] -_08123FAA: - movs r1, 0x22 - ldrsh r0, [r2, r1] - cmp r0, 0x4F - bgt _08123FB8 - adds r0, r2, 0 - bl DestroySprite -_08123FB8: - pop {r0} - bx r0 - thumb_func_end sub_8123F44 - thumb_func_start sub_8123FBC sub_8123FBC: @ 8123FBC push {lr} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index ee26d730b..a59862278 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -549,3 +549,38 @@ void sub_8123EB8(struct Sprite *sprite) } } } + +void sub_8123F44(struct Sprite *sprite) +{ + if (sprite->data0 == 0) + { + sprite->pos1.y += 16 + sprite->centerToCornerVecY; + } + if (++ sprite->data0 >= sprite->data2) + { + switch (sprite->data1) + { + case 0: + sprite->pos1.x --; + if ((sprite->data0 % 4) == 0) + { + sprite->pos1.y --; + } + break; + case 1: + if ((sprite->data0 % 2) != 0) + { + sprite->pos1.x --; + if ((sprite->pos1.x % 4) == 0) + { + sprite->pos1.y --; + } + } + break; + } + if (sprite->pos1.y < 0x50) + { + DestroySprite(sprite); + } + } +} -- cgit v1.2.3 From 2022b1dfb43691e3123024fcddcd07dd45b20a75 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 15 Oct 2017 14:18:25 -0400 Subject: sub_8123FBC --- asm/cable_car.s | 170 -------------------------------------------------- src/scene/cable_car.c | 70 +++++++++++++++++++++ 2 files changed, 70 insertions(+), 170 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index fc8a22052..48695975f 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,176 +6,6 @@ .text - thumb_func_start sub_8123FBC -sub_8123FBC: @ 8123FBC - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _08123FCA - cmp r0, 0x1 - beq _08124024 -_08123FCA: - ldr r1, _08124020 @ =REG_WININ - movs r0, 0 - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - subs r1, 0xA - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - subs r1, 0x46 - strh r0, [r1] - adds r1, 0xE - strh r0, [r1] - subs r1, 0x2 - strh r0, [r1] - subs r1, 0x2 - strh r0, [r1] - subs r1, 0x2 - strh r0, [r1] - adds r1, 0x14 - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - subs r1, 0x6 - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - subs r1, 0x6 - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - subs r1, 0x6 - strh r0, [r1] - adds r1, 0x2 - strh r0, [r1] - adds r1, 0x3E - strh r0, [r1] - b _081240EE - .align 2, 0 -_08124020: .4byte REG_WININ -_08124024: - ldr r0, _08124060 @ =REG_WININ - movs r3, 0 - strh r3, [r0] - adds r0, 0x2 - strh r3, [r0] - subs r0, 0xA - strh r3, [r0] - adds r0, 0x2 - strh r3, [r0] - adds r0, 0x2 - strh r3, [r0] - adds r0, 0x2 - strh r3, [r0] - ldr r0, _08124064 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _0812406C - ldr r1, _08124068 @ =gUnknown_02039274 - ldr r2, [r1] - movs r0, 0xB0 - strb r0, [r2, 0x14] - ldr r2, [r1] - movs r0, 0x10 - strb r0, [r2, 0x15] - ldr r0, [r1] - strb r3, [r0, 0xC] - ldr r2, [r1] - movs r0, 0x50 - b _08124082 - .align 2, 0 -_08124060: .4byte REG_WININ -_08124064: .4byte gSpecialVar_0x8004 -_08124068: .4byte gUnknown_02039274 -_0812406C: - ldr r1, _081240F4 @ =gUnknown_02039274 - ldr r2, [r1] - movs r0, 0x60 - strb r0, [r2, 0x14] - ldr r2, [r1] - movs r0, 0xE8 - strb r0, [r2, 0x15] - ldr r0, [r1] - strb r3, [r0, 0xC] - ldr r2, [r1] - movs r0, 0x4 -_08124082: - strb r0, [r2, 0xD] - ldr r0, [r1] - strb r3, [r0, 0x9] - ldr r0, [r1] - strb r3, [r0, 0x9] - adds r2, r1, 0 - ldr r1, _081240F8 @ =REG_BG3HOFS - ldr r2, [r2] - ldrb r0, [r2, 0x14] - strh r0, [r1] - adds r1, 0x2 - ldrb r0, [r2, 0x15] - strh r0, [r1] - ldr r0, _081240FC @ =REG_BG2HOFS - movs r1, 0 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - ldr r1, _08124100 @ =REG_BG1HOFS - ldrb r0, [r2, 0xC] - strh r0, [r1] - adds r1, 0x2 - ldrb r0, [r2, 0xD] - strh r0, [r1] - subs r1, 0x6 - ldrb r0, [r2, 0x8] - strh r0, [r1] - adds r1, 0x2 - ldrb r0, [r2, 0x9] - strh r0, [r1] - subs r1, 0xA - ldr r2, _08124104 @ =0x00003c01 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r3, _08124108 @ =0x00003d02 - adds r0, r3, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r2, _0812410C @ =0x00003e03 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _08124110 @ =REG_BG3CNT - movs r3, 0xFC - lsls r3, 6 - adds r2, r3, 0 - strh r2, [r0] - subs r1, 0xC - movs r3, 0xFA - lsls r3, 5 - adds r0, r3, 0 - strh r0, [r1] - ldr r0, _08124114 @ =REG_BLDCNT - strh r2, [r0] -_081240EE: - pop {r0} - bx r0 - .align 2, 0 -_081240F4: .4byte gUnknown_02039274 -_081240F8: .4byte REG_BG3HOFS -_081240FC: .4byte REG_BG2HOFS -_08124100: .4byte REG_BG1HOFS -_08124104: .4byte 0x00003c01 -_08124108: .4byte 0x00003d02 -_0812410C: .4byte 0x00003e03 -_08124110: .4byte REG_BG3CNT -_08124114: .4byte REG_BLDCNT - thumb_func_end sub_8123FBC - thumb_func_start sub_8124118 sub_8124118: @ 8124118 push {r4-r7,lr} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index a59862278..76223925b 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -584,3 +584,73 @@ void sub_8123F44(struct Sprite *sprite) } } } + +void sub_8123FBC(bool8 which) +{ + switch (which) + { + case FALSE: + default: + REG_WININ = 0; + REG_WINOUT = 0; + REG_WIN0H = 0; + REG_WIN1H = 0; + REG_WIN0V = 0; + REG_WIN1V = 0; + REG_DISPCNT = 0; + REG_BG3CNT = 0; + REG_BG2CNT = 0; + REG_BG1CNT = 0; + REG_BG0CNT = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; + REG_BG2HOFS = 0; + REG_BG2VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BLDCNT = 0; + break; + case TRUE: + REG_WININ = 0; + REG_WINOUT = 0; + REG_WIN0H = 0; + REG_WIN1H = 0; + REG_WIN0V = 0; + REG_WIN1V = 0; + if (gSpecialVar_0x8004 == 0) + { + gUnknown_02039274->unk_0014 = 0xb0; + gUnknown_02039274->unk_0015 = 0x10; + gUnknown_02039274->unk_000c = 0x00; + gUnknown_02039274->unk_000d = 0x50; + gUnknown_02039274->unk_0009 = 0; + gUnknown_02039274->unk_0009 = 0; + } + else + { + gUnknown_02039274->unk_0014 = 0x60; + gUnknown_02039274->unk_0015 = 0xe8; + gUnknown_02039274->unk_000c = 0x00; + gUnknown_02039274->unk_000d = 0x04; + gUnknown_02039274->unk_0009 = 0; + gUnknown_02039274->unk_0009 = 0; + } + REG_BG3HOFS = gUnknown_02039274->unk_0014; + REG_BG3VOFS = gUnknown_02039274->unk_0015; + REG_BG2HOFS = 0; + REG_BG2VOFS = 0; + REG_BG1HOFS = gUnknown_02039274->unk_000c; + REG_BG1VOFS = gUnknown_02039274->unk_000d; + REG_BG0HOFS = gUnknown_02039274->unk_0008; + REG_BG0VOFS = gUnknown_02039274->unk_0009; + REG_BG0CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(28) | BGCNT_WRAP; + REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(29) | BGCNT_WRAP; + REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_SCREENBASE(30) | BGCNT_WRAP; + REG_BG3CNT = BGCNT_PRIORITY(0) | BGCNT_SCREENBASE(31) | BGCNT_WRAP; + REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; + REG_BLDCNT = 0x3f00; + break; + } +} -- cgit v1.2.3 From 2fff1ae7c56ae2511137d14ea2085bb03e1e2d43 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 15 Oct 2017 15:30:38 -0400 Subject: Decompile remaining data --- data/cable_car.s | 60 ------------------------------------ ld_script.txt | 1 - src/scene/cable_car.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 83 insertions(+), 62 deletions(-) delete mode 100644 data/cable_car.s diff --git a/data/cable_car.s b/data/cable_car.s deleted file mode 100644 index 6523e0314..000000000 --- a/data/cable_car.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_8401D28:: @ 8401D28 - .2byte 0x0300 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_8401D30:: @ 8401D30 - .2byte 0x4300 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_8401D38:: @ 8401D38 - .2byte 0x0300 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteTemplate_8401D40:: @ 8401D40 - spr_template 1, 1, gOamData_8401D28, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8 - - .align 2 -gSpriteTemplate_8401D58:: @ 8401D58 - spr_template 2, 1, gOamData_8401D30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8 - - .align 2 -gSpriteTemplate_8401D70:: @ 8401D70 - spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76 - -gCableCarPlayerGraphicsIDs:: @ 8401D88 - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL - .byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL - -gMtChimneyHikerGraphicsIDs:: @ 8401D8A - .byte MAP_OBJ_GFX_HIKER - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_POOCHYENA @ not used - - .align 1 -gMtChimneyHikerCoords:: @ 8401D8E - .2byte 0, 80 - .2byte 240, 146 - -gMtChimneyHikerMovementDelayTable:: @ 8401D96 - .byte 0 - .byte 60 - .byte 120 - .byte 170 - - .align 2 -gUnknown_08401D9C:: @ 8401D9C - .4byte sub_8123EB8 - .4byte sub_8123F44 diff --git a/ld_script.txt b/ld_script.txt index 96dce388a..84785c7b9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -438,7 +438,6 @@ SECTIONS { data/battle_message.o(.rodata); src/field/choose_party.o(.rodata); src/scene/cable_car.o(.rodata); - data/cable_car.o(.rodata); src/engine/save.o(.rodata); src/field/field_effect_helpers.o(.rodata); data/contest_ai.o(.rodata); diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 76223925b..d5398f262 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -13,6 +13,7 @@ #include "unknown_task.h" #include "event_data.h" #include "cable_car_util.h" +#include "map_object_constants.h" // Static type declarations @@ -79,6 +80,10 @@ void sub_81239E4(u8 taskId); void sub_8123AF8(u8 taskId); void sub_812453C(void); void sub_8124598(void); +void sub_8123CB8(struct Sprite *sprite); +void nullsub_76(struct Sprite *sprite); +void sub_8123EB8(struct Sprite *sprite); +void sub_8123F44(struct Sprite *sprite); // .rodata @@ -121,6 +126,83 @@ const struct SpritePalette gUnknown_08401D18[] = { { } }; +const struct OamData gOamData_8401D28 = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .size = 3, + .priority = 2 +}; + +const struct OamData gOamData_8401D30 = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .shape = ST_OAM_H_RECTANGLE, + .priority = 2 +}; + +const struct OamData gOamData_8401D38 = { + .affineMode = ST_OAM_AFFINE_DOUBLE, + .size = 1, + .priority = 2 +}; + +const struct SpriteTemplate gSpriteTemplate_8401D40 = { + 1, + 1, + &gOamData_8401D28, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + sub_8123CB8 +}; + +const struct SpriteTemplate gSpriteTemplate_8401D58 = { + 2, + 1, + &gOamData_8401D30, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + sub_8123CB8 +}; + +const struct SpriteTemplate gSpriteTemplate_8401D70 = { + 3, + 1, + &gOamData_8401D38, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + nullsub_76 +}; + +const u8 gCableCarPlayerGraphicsIDs[] = { + MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, + MAP_OBJ_GFX_RIVAL_MAY_NORMAL +}; + +const u8 gMtChimneyHikerGraphicsIDs[] = { + MAP_OBJ_GFX_HIKER, + MAP_OBJ_GFX_CAMPER, + MAP_OBJ_GFX_PICNICKER, + MAP_OBJ_GFX_POOCHYENA +}; + +const u16 gMtChimneyHikerCoords[][2] = { + { 0, 80 }, + { 240, 146 } +}; + +const u8 gMtChimneyHikerMovementDelayTable[] = { + 0, + 60, + 120, + 170 +}; + +void (*const gUnknown_08401D9C[])(struct Sprite *sprite) = { + sub_8123EB8, + sub_8123F44 +}; + // .text void sub_81231EC(u8 taskId) @@ -456,7 +538,7 @@ void sub_8123C40(void) TransferPlttBuffer(); } -void nullsub_76(void) +void nullsub_76(struct Sprite *sprite) { } -- cgit v1.2.3 From abab76bc84f1a7554f43c33a52c18297f462e058 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 15 Oct 2017 16:40:06 -0400 Subject: sub_8124118 --- asm/cable_car.s | 404 -------------------------------------------------- src/scene/cable_car.c | 214 +++++++++++++++++++------- 2 files changed, 157 insertions(+), 461 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index 48695975f..c38b3ccb4 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,410 +6,6 @@ .text - thumb_func_start sub_8124118 -sub_8124118: @ 8124118 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x24 - ldr r1, _0812422C @ =gCableCarPlayerGraphicsIDs - add r0, sp, 0x8 - movs r2, 0x2 - bl memcpy - bl Random - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - add r6, sp, 0xC - ldr r1, _08124230 @ =gMtChimneyHikerGraphicsIDs - adds r0, r6, 0 - movs r2, 0x4 - bl memcpy - add r5, sp, 0x10 - ldr r1, _08124234 @ =gMtChimneyHikerCoords - adds r0, r5, 0 - movs r2, 0x8 - bl memcpy - add r4, sp, 0x18 - ldr r1, _08124238 @ =gMtChimneyHikerMovementDelayTable - adds r0, r4, 0 - movs r2, 0x4 - bl memcpy - ldr r0, _0812423C @ =gUnknown_08401D9C - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x1C] - str r1, [sp, 0x20] - ldr r0, _08124240 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - mov r8, r6 - mov r10, r5 - cmp r0, 0 - beq _08124176 - cmp r0, 0x1 - beq _08124258 -_08124176: - ldr r0, _08124244 @ =gSaveBlock2 - ldrb r0, [r0, 0x8] - add r0, sp - adds r0, 0x8 - ldrb r0, [r0] - ldr r1, _08124248 @ =sub_8123D98 - movs r2, 0x66 - str r2, [sp] - movs r2, 0xC8 - movs r3, 0x49 - bl AddPseudoFieldObject - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _081241BE - ldr r0, _0812424C @ =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x8 - orrs r0, r2 - strb r0, [r1, 0x5] - movs r0, 0x8 - strh r0, [r1, 0x24] - movs r0, 0x10 - strh r0, [r1, 0x26] - movs r0, 0xC8 - strh r0, [r1, 0x2E] - movs r0, 0x49 - strh r0, [r1, 0x30] -_081241BE: - ldr r4, _08124250 @ =gSpriteTemplate_8401D40 - adds r0, r4, 0 - movs r1, 0xB0 - movs r2, 0x2B - movs r3, 0x67 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - ldr r5, _0812424C @ =gSprites - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x20 - strh r1, [r0, 0x26] - strh r1, [r0, 0x24] - movs r1, 0xB0 - strh r1, [r0, 0x2E] - movs r1, 0x2B - strh r1, [r0, 0x30] - adds r4, 0x18 - adds r0, r4, 0 - movs r1, 0xC8 - movs r2, 0x63 - movs r3, 0x65 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x8 - strh r1, [r0, 0x24] - movs r1, 0x4 - strh r1, [r0, 0x26] - movs r1, 0xC8 - strh r1, [r0, 0x2E] - movs r1, 0x63 - strh r1, [r0, 0x30] - ldr r2, _08124254 @ =gUnknown_02039274 - ldr r1, [r2] - movs r0, 0x7 - strb r0, [r1, 0x2] - ldr r1, [r2] - movs r0, 0xAF - lsls r0, 1 - strh r0, [r1, 0x4] - movs r0, 0x2 - bl sub_807C9B4 - b _0812431E - .align 2, 0 -_0812422C: .4byte gCableCarPlayerGraphicsIDs -_08124230: .4byte gMtChimneyHikerGraphicsIDs -_08124234: .4byte gMtChimneyHikerCoords -_08124238: .4byte gMtChimneyHikerMovementDelayTable -_0812423C: .4byte gUnknown_08401D9C -_08124240: .4byte gSpecialVar_0x8004 -_08124244: .4byte gSaveBlock2 -_08124248: .4byte sub_8123D98 -_0812424C: .4byte gSprites -_08124250: .4byte gSpriteTemplate_8401D40 -_08124254: .4byte gUnknown_02039274 -_08124258: - ldr r7, _081243EC @ =gUnknown_02039274 - ldr r0, [r7] - adds r0, 0xFC - ldr r1, _081243F0 @ =0x02019048 - movs r2, 0xC - str r2, [sp] - movs r2, 0x3 - str r2, [sp, 0x4] - movs r2, 0x18 - movs r3, 0x1A - bl sub_8124F08 - ldr r0, _081243F4 @ =gSaveBlock2 - ldrb r0, [r0, 0x8] - add r0, sp - adds r0, 0x8 - ldrb r0, [r0] - ldr r1, _081243F8 @ =sub_8123D98 - movs r2, 0x66 - str r2, [sp] - movs r2, 0x80 - movs r3, 0x27 - bl AddPseudoFieldObject - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _081242B8 - ldr r0, _081243FC @ =gSprites - lsls r1, r6, 4 - adds r1, r6 - lsls r1, 2 - adds r1, r0 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - movs r2, 0x8 - orrs r0, r2 - strb r0, [r1, 0x5] - movs r0, 0x8 - strh r0, [r1, 0x24] - movs r0, 0x10 - strh r0, [r1, 0x26] - movs r0, 0x80 - strh r0, [r1, 0x2E] - movs r0, 0x27 - strh r0, [r1, 0x30] -_081242B8: - ldr r4, _08124400 @ =gSpriteTemplate_8401D40 - adds r0, r4, 0 - movs r1, 0x68 - movs r2, 0x9 - movs r3, 0x67 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - ldr r5, _081243FC @ =gSprites - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x20 - strh r1, [r0, 0x26] - strh r1, [r0, 0x24] - movs r1, 0x68 - strh r1, [r0, 0x2E] - movs r1, 0x9 - strh r1, [r0, 0x30] - adds r4, 0x18 - adds r0, r4, 0 - movs r1, 0x80 - movs r2, 0x41 - movs r3, 0x65 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x8 - strh r1, [r0, 0x24] - movs r1, 0x4 - strh r1, [r0, 0x26] - movs r1, 0x80 - strh r1, [r0, 0x2E] - movs r1, 0x41 - strh r1, [r0, 0x30] - ldr r1, [r7] - movs r0, 0x2 - strb r0, [r1, 0x2] - ldr r1, [r7] - ldr r0, _08124404 @ =0x00000109 - strh r0, [r1, 0x4] - movs r0, 0x7 - bl sub_807C9B4 -_0812431E: - movs r4, 0 - ldr r5, _081243FC @ =gSprites -_08124322: - lsls r1, r4, 20 - movs r0, 0xC0 - lsls r0, 15 - adds r1, r0 - asrs r1, 16 - lsls r2, r4, 19 - ldr r3, _08124408 @ =0xfff80000 - adds r2, r3 - asrs r2, 16 - ldr r0, _0812440C @ =gSpriteTemplate_8401D70 - movs r3, 0x68 - bl CreateSprite - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - adds r0, r5 - movs r1, 0x8 - strh r1, [r0, 0x24] - strh r1, [r0, 0x26] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x8 - bls _08124322 - movs r0, 0x3F - mov r4, r9 - ands r0, r4 - cmp r0, 0 - bne _08124458 - mov r0, r9 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - add r0, r8 - ldrb r0, [r0] - ldr r5, _08124410 @ =gSpecialVar_0x8004 - ldrh r4, [r5] - lsls r4, 2 - add r1, sp, 0x1C - adds r1, r4, r1 - ldr r1, [r1] - mov r3, r10 - adds r2, r3, r4 - movs r3, 0 - ldrsh r2, [r2, r3] - mov r3, sp - adds r3, 0x12 - adds r3, r4 - movs r4, 0 - ldrsh r3, [r3, r4] - movs r4, 0x6A - str r4, [sp] - bl AddPseudoFieldObject - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x40 - beq _08124458 - ldr r1, _081243FC @ =gSprites - lsls r2, r6, 4 - adds r0, r2, r6 - lsls r0, 2 - adds r4, r0, r1 - ldrb r1, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r4, 0x5] - adds r0, r4, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - negs r0, r0 - strh r0, [r4, 0x24] - adds r0, r4, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - negs r0, r0 - strh r0, [r4, 0x26] - ldrh r0, [r5] - mov r8, r2 - cmp r0, 0 - bne _0812441A - movs r7, 0x1 - mov r5, r9 - ands r5, r7 - cmp r5, 0 - beq _08124414 - adds r0, r4, 0 - movs r1, 0x6 - b _08124428 - .align 2, 0 -_081243EC: .4byte gUnknown_02039274 -_081243F0: .4byte 0x02019048 -_081243F4: .4byte gSaveBlock2 -_081243F8: .4byte sub_8123D98 -_081243FC: .4byte gSprites -_08124400: .4byte gSpriteTemplate_8401D40 -_08124404: .4byte 0x00000109 -_08124408: .4byte 0xfff80000 -_0812440C: .4byte gSpriteTemplate_8401D70 -_08124410: .4byte gSpecialVar_0x8004 -_08124414: - adds r0, r4, 0 - movs r1, 0x7 - b _0812443A -_0812441A: - movs r7, 0x1 - mov r5, r9 - ands r5, r7 - cmp r5, 0 - beq _08124436 - adds r0, r4, 0 - movs r1, 0x7 -_08124428: - bl StartSpriteAnim - strh r7, [r4, 0x30] - ldrh r0, [r4, 0x22] - adds r0, 0x2 - strh r0, [r4, 0x22] - b _08124440 -_08124436: - adds r0, r4, 0 - movs r1, 0x6 -_0812443A: - bl StartSpriteAnim - strh r5, [r4, 0x30] -_08124440: - ldr r0, _08124468 @ =gSprites - mov r2, r8 - adds r1, r2, r6 - lsls r1, 2 - adds r1, r0 - movs r0, 0x3 - mov r3, r9 - ands r0, r3 - add r0, sp - adds r0, 0x18 - ldrb r0, [r0] - strh r0, [r1, 0x32] -_08124458: - add sp, 0x24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08124468: .4byte gSprites - thumb_func_end sub_8124118 - thumb_func_start sub_812446C sub_812446C: @ 812446C push {r4-r7,lr} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index d5398f262..12b2e62b3 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -3,6 +3,7 @@ #include "global.h" #include "overworld.h" #include "palette.h" +#include "rng.h" #include "main.h" #include "script.h" #include "task.h" @@ -10,6 +11,7 @@ #include "songs.h" #include "decompress.h" #include "field_weather.h" +#include "field_map_obj.h" #include "unknown_task.h" #include "event_data.h" #include "cable_car_util.h" @@ -144,63 +146,32 @@ const struct OamData gOamData_8401D38 = { .priority = 2 }; -const struct SpriteTemplate gSpriteTemplate_8401D40 = { - 1, - 1, - &gOamData_8401D28, - gDummySpriteAnimTable, - NULL, - gDummySpriteAffineAnimTable, - sub_8123CB8 -}; - -const struct SpriteTemplate gSpriteTemplate_8401D58 = { - 2, - 1, - &gOamData_8401D30, - gDummySpriteAnimTable, - NULL, - gDummySpriteAffineAnimTable, - sub_8123CB8 -}; - -const struct SpriteTemplate gSpriteTemplate_8401D70 = { - 3, - 1, - &gOamData_8401D38, - gDummySpriteAnimTable, - NULL, - gDummySpriteAffineAnimTable, - nullsub_76 -}; - -const u8 gCableCarPlayerGraphicsIDs[] = { - MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, - MAP_OBJ_GFX_RIVAL_MAY_NORMAL -}; - -const u8 gMtChimneyHikerGraphicsIDs[] = { - MAP_OBJ_GFX_HIKER, - MAP_OBJ_GFX_CAMPER, - MAP_OBJ_GFX_PICNICKER, - MAP_OBJ_GFX_POOCHYENA -}; - -const u16 gMtChimneyHikerCoords[][2] = { - { 0, 80 }, - { 240, 146 } -}; - -const u8 gMtChimneyHikerMovementDelayTable[] = { - 0, - 60, - 120, - 170 -}; - -void (*const gUnknown_08401D9C[])(struct Sprite *sprite) = { - sub_8123EB8, - sub_8123F44 +const struct SpriteTemplate gSpriteTemplate_8401D40[] = { + { + 1, + 1, + &gOamData_8401D28, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + sub_8123CB8 + }, { + 2, + 1, + &gOamData_8401D30, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + sub_8123CB8 + }, { + 3, + 1, + &gOamData_8401D38, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + nullsub_76 + } }; // .text @@ -736,3 +707,132 @@ void sub_8123FBC(bool8 which) break; } } + +void sub_8124118(void) +{ + u8 spriteId; + u8 i; + + u8 playerGraphicsIds[2] = { + MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, + MAP_OBJ_GFX_RIVAL_MAY_NORMAL + }; + u16 rval = Random(); + u8 hikerGraphicsIds[4] = { + MAP_OBJ_GFX_HIKER, + MAP_OBJ_GFX_CAMPER, + MAP_OBJ_GFX_PICNICKER, + MAP_OBJ_GFX_POOCHYENA + }; + s16 hikerCoords[2][2] = { + { 0, 80 }, + { 240, 146 } + }; + u8 hikerMovementDelayTable[4] = { + 0, + 60, + 120, + 170 + }; + void (*callbacks[2])(struct Sprite *) = { + sub_8123EB8, + sub_8123F44 + }; + + switch (gSpecialVar_0x8004) + { + case 0: + default: + spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = 0x08; + gSprites[spriteId].pos2.y = 0x10; + gSprites[spriteId].data0 = 0xc8; + gSprites[spriteId].data1 = 0x49; + } + spriteId = CreateSprite(&gSpriteTemplate_8401D40[0], 0xb0, 0x2b, 0x67); + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20; + gSprites[spriteId].data0 = 0xb0; + gSprites[spriteId].data1 = 0x2b; + spriteId = CreateSprite(&gSpriteTemplate_8401D40[1], 0xc8, 0x63, 0x65); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].data0 = 0xc8; + gSprites[spriteId].data1 = 0x63; + gUnknown_02039274->unk_0002 = 7; + gUnknown_02039274->unk_0004 = 0x15e; + sub_807C9B4(2); + break; + case 1: + sub_8124F08(gUnknown_02039274->unk_00fc, ewram_19000.mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); + spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = 0x08; + gSprites[spriteId].pos2.y = 0x10; + gSprites[spriteId].data0 = 0x80; + gSprites[spriteId].data1 = 0x27; + } + spriteId = CreateSprite(&gSpriteTemplate_8401D40[0], 0x68, 0x09, 0x67); + gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 0x20; + gSprites[spriteId].data0 = 0x68; + gSprites[spriteId].data1 = 0x09; + spriteId = CreateSprite(&gSpriteTemplate_8401D40[1], 0x80, 0x41, 0x65); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 4; + gSprites[spriteId].data0 = 0x80; + gSprites[spriteId].data1 = 0x41; + gUnknown_02039274->unk_0002 = 2; + gUnknown_02039274->unk_0004 = 0x109; + sub_807C9B4(7); + break; + } + for (i = 0; i < 9; i ++) + { + spriteId = CreateSprite(&gSpriteTemplate_8401D40[2], 16 * i + 0x60, 8 * i - 8, 0x68); + gSprites[spriteId].pos2.x = 8; + gSprites[spriteId].pos2.y = 8; + } + if ((rval % 64) == 0) + { + spriteId = AddPseudoFieldObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].pos2.x = -gSprites[spriteId].centerToCornerVecX; + gSprites[spriteId].pos2.y = -gSprites[spriteId].centerToCornerVecY; + if (gSpecialVar_0x8004 == 0) + { + if (rval % 2) + { + StartSpriteAnim(&gSprites[spriteId], 6); + gSprites[spriteId].data1 = 1; + gSprites[spriteId].pos1.y += 2; + } + else + { + StartSpriteAnim(&gSprites[spriteId], 7); + gSprites[spriteId].data1 = 0; + } + } + else + { + if (rval % 2) + { + StartSpriteAnim(&gSprites[spriteId], 7); + gSprites[spriteId].data1 = 1; + gSprites[spriteId].pos1.y += 2; + } + else + { + StartSpriteAnim(&gSprites[spriteId], 6); + gSprites[spriteId].data1 = 0; + } + } + gSprites[spriteId].data2 = hikerMovementDelayTable[rval % 4]; + } + } +} -- cgit v1.2.3 From bb8f652504f886af296ffcaac57bf76cdc893c97 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 16 Oct 2017 21:14:29 -0400 Subject: nonmatching sub_812446C --- asm/cable_car.s | 106 ----------------------------------------- src/scene/cable_car.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 106 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index c38b3ccb4..06730e3ad 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -6,112 +6,6 @@ .text - thumb_func_start sub_812446C -sub_812446C: @ 812446C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r3, 0 - mov r9, r3 - ldr r2, _08124530 @ =gUnknown_02039274 - ldr r0, [r2] - ldrb r1, [r0, 0x1B] - adds r1, 0x2 - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 26 - lsrs r0, 24 - mov r12, r0 -_0812448E: - movs r6, 0 - lsls r0, r3, 1 - adds r1, r3, 0x3 - adds r2, r3, 0x6 - adds r4, r3, 0x1 - str r4, [sp] - adds r0, r3 - lsls r0, 3 - mov r10, r0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - mov r8, r0 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 3 - str r0, [sp, 0x4] -_081244B0: - ldr r7, _08124530 @ =gUnknown_02039274 - ldr r5, [r7] - lsls r3, r6, 1 - mov r0, r10 - adds r2, r3, r0 - adds r4, r5, 0 - adds r4, 0x22 - adds r2, r4, r2 - mov r1, r12 - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - lsls r1, 1 - ldr r7, _08124534 @ =0x02019000 - adds r1, r7 - ldrh r0, [r1] - strh r0, [r2] - mov r0, r8 - adds r1, r3, r0 - adds r1, r4, r1 - mov r7, r9 - lsls r2, r7, 1 - ldr r7, _08124534 @ =0x02019000 - adds r0, r2, r7 - ldrh r0, [r0] - strh r0, [r1] - ldr r0, [sp, 0x4] - adds r3, r0 - adds r4, r3 - ldr r1, _08124538 @ =0x02019048 - adds r2, r1 - ldrh r0, [r2] - strh r0, [r4] - mov r0, r9 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0xB - bls _081244B0 - ldr r4, [sp] - lsls r0, r4, 24 - lsrs r3, r0, 24 - cmp r3, 0x2 - bls _0812448E - ldrb r0, [r5, 0x1B] - adds r0, 0x1 - movs r1, 0x3 - bl __modsi3 - strb r0, [r5, 0x1B] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08124530: .4byte gUnknown_02039274 -_08124534: .4byte 0x02019000 -_08124538: .4byte 0x02019048 - thumb_func_end sub_812446C - thumb_func_start sub_812453C sub_812453C: @ 812453C push {r4,r5,lr} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 12b2e62b3..9caa2234f 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -836,3 +836,132 @@ void sub_8124118(void) } } } + +#ifdef NONMATCHING +// this is nowhere near correct +void sub_812446C(void) +{ + u8 i; + u8 j; + u8 k; + u8 offset; + + for (i = 0, k = 0, offset = 36 * (gUnknown_02039274->unk_001b + 2); i < 3; i ++) + { + for (j = 0; j < 12; j ++) + { + gUnknown_02039274->unk_0022[i][k] = ewram_19000.mtChimneyTilemap[0][offset + k]; + gUnknown_02039274->unk_0022[i + 3][k] = ewram_19000.mtChimneyTilemap[0][k]; + gUnknown_02039274->unk_0022[i + 6][k] = ewram_19000.mtChimneyTilemap[2][k]; + k ++; + } + } + gUnknown_02039274->unk_001b = (gUnknown_02039274->unk_001b + 1) % 3; +} +#else +__attribute__((naked)) void sub_812446C(void) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tsub sp, 0x8\n" + "\tmovs r3, 0\n" + "\tmov r9, r3\n" + "\tldr r2, _08124530 @ =gUnknown_02039274\n" + "\tldr r0, [r2]\n" + "\tldrb r1, [r0, 0x1B]\n" + "\tadds r1, 0x2\n" + "\tlsls r0, r1, 3\n" + "\tadds r0, r1\n" + "\tlsls r0, 26\n" + "\tlsrs r0, 24\n" + "\tmov r12, r0\n" + "_0812448E:\n" + "\tmovs r6, 0\n" + "\tlsls r0, r3, 1\n" + "\tadds r1, r3, 0x3\n" + "\tadds r2, r3, 0x6\n" + "\tadds r4, r3, 0x1\n" + "\tstr r4, [sp]\n" + "\tadds r0, r3\n" + "\tlsls r0, 3\n" + "\tmov r10, r0\n" + "\tlsls r0, r1, 1\n" + "\tadds r0, r1\n" + "\tlsls r0, 3\n" + "\tmov r8, r0\n" + "\tlsls r0, r2, 1\n" + "\tadds r0, r2\n" + "\tlsls r0, 3\n" + "\tstr r0, [sp, 0x4]\n" + "_081244B0:\n" + "\tldr r7, _08124530 @ =gUnknown_02039274\n" + "\tldr r5, [r7]\n" + "\tlsls r3, r6, 1\n" + "\tmov r0, r10\n" + "\tadds r2, r3, r0\n" + "\tadds r4, r5, 0\n" + "\tadds r4, 0x22\n" + "\tadds r2, r4, r2\n" + "\tmov r1, r12\n" + "\tadds r0, r1, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tmov r12, r0\n" + "\tlsls r1, 1\n" + "\tldr r7, _08124534 @ =0x02019000\n" + "\tadds r1, r7\n" + "\tldrh r0, [r1]\n" + "\tstrh r0, [r2]\n" + "\tmov r0, r8\n" + "\tadds r1, r3, r0\n" + "\tadds r1, r4, r1\n" + "\tmov r7, r9\n" + "\tlsls r2, r7, 1\n" + "\tldr r7, _08124534 @ =0x02019000\n" + "\tadds r0, r2, r7\n" + "\tldrh r0, [r0]\n" + "\tstrh r0, [r1]\n" + "\tldr r0, [sp, 0x4]\n" + "\tadds r3, r0\n" + "\tadds r4, r3\n" + "\tldr r1, _08124538 @ =0x02019048\n" + "\tadds r2, r1\n" + "\tldrh r0, [r2]\n" + "\tstrh r0, [r4]\n" + "\tmov r0, r9\n" + "\tadds r0, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tmov r9, r0\n" + "\tadds r0, r6, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r6, r0, 24\n" + "\tcmp r6, 0xB\n" + "\tbls _081244B0\n" + "\tldr r4, [sp]\n" + "\tlsls r0, r4, 24\n" + "\tlsrs r3, r0, 24\n" + "\tcmp r3, 0x2\n" + "\tbls _0812448E\n" + "\tldrb r0, [r5, 0x1B]\n" + "\tadds r0, 0x1\n" + "\tmovs r1, 0x3\n" + "\tbl __modsi3\n" + "\tstrb r0, [r5, 0x1B]\n" + "\tadd sp, 0x8\n" + "\tpop {r3-r5}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tmov r10, r5\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" + "_08124530: .4byte gUnknown_02039274\n" + "_08124534: .4byte 0x02019000\n" + "_08124538: .4byte 0x02019048"); +} +#endif -- cgit v1.2.3 From 272cd213391b5ce87cb2aeac263b3eedb0f19a07 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 20 Dec 2017 15:33:08 -0500 Subject: Add NDEBUG (NOAGBPRN) support to pokeruby. --- Makefile | 7 ++- include/assert.h | 43 ++++++++++++++ include/config.h | 16 ++++++ include/global.h | 1 + ld_script.txt | 87 +++++++++++++++++++++++++++- src/engine/main.c | 7 +++ src/libs/libc.c | 143 ---------------------------------------------- src/libs/libisagbprn.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++ sym_bss.txt | 37 ++++++++++++ 9 files changed, 346 insertions(+), 146 deletions(-) create mode 100755 include/assert.h delete mode 100644 src/libs/libc.c create mode 100755 src/libs/libisagbprn.c diff --git a/Makefile b/Makefile index e7e2a7156..c3df6d65f 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,8 @@ OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy LIBGCC := tools/agbcc/lib/libgcc.a +LIBC := tools/agbcc/lib/libc.a + SHA1 := sha1sum -c GFX := tools/gbagfx/gbagfx @@ -103,6 +105,9 @@ sound/songs/%.s: sound/songs/%.mid %src/libs/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc %src/libs/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc +%src/libs/libisagbprn.o: CC1 := tools/agbcc/bin/old_agbcc +%src/libs/libisagbprn.o: CFLAGS := -mthumb-interwork + $(SONG_OBJS): %.o: %.s $(AS) $(ASFLAGS) -I sound -o $@ $< @@ -161,7 +166,7 @@ build/$1/ld_script.ld: ld_script.txt build/$1/sym_bss.ld build/$1/sym_common.ld cd build/$1 && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" >ld_script.ld poke$1.elf: build/$1/ld_script.ld $$($1_OBJS) - cd build/$1 && $$(LD) -T ld_script.ld -Map ../../poke$1.map -o ../../$$@ $$($1_OBJS_REL) ../../$$(LIBGCC) + cd build/$1 && $$(LD) -T ld_script.ld -Map ../../poke$1.map -o ../../$$@ $$($1_OBJS_REL) ../../$$(LIBGCC) ../../$$(LIBC) poke$1.gba: %.gba: %.elf $$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $$< $$@ diff --git a/include/assert.h b/include/assert.h new file mode 100755 index 000000000..7a5e727e2 --- /dev/null +++ b/include/assert.h @@ -0,0 +1,43 @@ +#ifndef GUARD_GBASDKASSERT_H +#define GUARD_GBASDKASSERT_H + +// this header is based on the +// GBA SDK IsAgbAssert.h. + +#ifdef NOAGBPRN + #define AGBPrintInit() + #define AGBPutc(pBuf) + #define AGBPrint(pBuf) + #define AGBPrintf(...) + #define AGBPrintFlush1Block() + #define AGBPrintFlush() + #define AGBAssert(pFile, nLine, pExpression, nStopProgram) +#else + // without NOAGBPRN defined, this enables asserts for usage + // on a standard GBA debugger unit or in emulators that + // support it. + void AGBPrintInit(void); + void AGBPutc(const char pBuf); + void AGBPrint(const char *pBuf); + void AGBPrintf(const char *pBuf, ...); + void AGBPrintFlush1Block(void); + void AGBPrintFlush(void); + void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); +#endif + +// when using AGB_WARNING, be sure to flush after as AGBAssert does not flush the string to console +// immediately after usage. +#ifdef NOAGBPRN + #define AGB_ASSERT(expression) +#else + #define AGB_ASSERT(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 1); +#endif + +#ifdef NOAGBPRN + #define AGB_WARNING(expression) +#else + #define AGB_WARNING(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 0); +#endif + + +#endif diff --git a/include/config.h b/include/config.h index 6a77c4c74..d9ed70a7c 100644 --- a/include/config.h +++ b/include/config.h @@ -1,6 +1,22 @@ #ifndef GUARD_CONFIG_H #define GUARD_CONFIG_H +// In the Generation 3 games, Asserts were used in various debug builds. +// Ruby/Sapphire and Emerald do not have these asserts while Fire Red +// still has them in the ROM. This is because the developers forgot +// to define NOAGBPRN before release, which is actually supposed to be +// NDEBUG, however this has been changed as Ruby's actual debug build +// does not use the AGBPrint features. + +// To note, Ruby/Sapphire likely did not use AGBPrint. This is because +// the german debug ROM of Ruby did not have any uses of AGBPrint and +// the assert commands but instead a "crash" screen. This config exists +// for convenience for the user of pokeruby and NOT because it is +// authoritative. These additions are for user convenience based on +// officially recommended SDK practices for debugging and is therefore +// still in part authoritative. +#define NOAGBPRN + #ifndef REVISION #define REVISION 0 #endif diff --git a/include/global.h b/include/global.h index 6670f3837..7bd82f74e 100644 --- a/include/global.h +++ b/include/global.h @@ -3,6 +3,7 @@ #include "gba/gba.h" #include "config.h" +#include "assert.h" // IDE support #ifdef __APPLE__ diff --git a/ld_script.txt b/ld_script.txt index 6353fceec..67c259177 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -11,6 +11,44 @@ SECTIONS { { + tools/agbcc/lib/libc.a:memcpy.o(.data); + tools/agbcc/lib/libc.a:memset.o(.data); + tools/agbcc/lib/libc.a:strcmp.o(.data); + tools/agbcc/lib/libc.a:strcpy.o(.data); + tools/agbcc/lib/libc.a:impure.o(.data); + tools/agbcc/lib/libc.a:vsprintf.o(.data); + tools/agbcc/lib/libc.a:vfprintf.o(.data); + tools/agbcc/lib/libc.a:wsetup.o(.data); + tools/agbcc/lib/libc.a:dtoa.o(.data); + tools/agbcc/lib/libc.a:fflush.o(.data); + tools/agbcc/lib/libc.a:findfp.o(.data); + tools/agbcc/lib/libc.a:freer.o(.data); + tools/agbcc/lib/libc.a:mtrim.o(.data); + tools/agbcc/lib/libc.a:fvwrite.o(.data); + tools/agbcc/lib/libc.a:fwalk.o(.data); + tools/agbcc/lib/libc.a:locale.o(.data); + tools/agbcc/lib/libc.a:makebuf.o(.data); + tools/agbcc/lib/libc.a:mallocr.o(.data); + tools/agbcc/lib/libc.a:mbtowc_r.o(.data); + tools/agbcc/lib/libc.a:memchr.o(.data); + tools/agbcc/lib/libc.a:memmove.o(.data); + tools/agbcc/lib/libc.a:mlock.o(.data); + tools/agbcc/lib/libc.a:mprec.o(.data); + tools/agbcc/lib/libc.a:s_isinf.o(.data); + tools/agbcc/lib/libc.a:s_isnan.o(.data); + tools/agbcc/lib/libc.a:sbrkr.o(.data); + tools/agbcc/lib/libc.a:stdio.o(.data); + tools/agbcc/lib/libc.a:strlen.o(.data); + tools/agbcc/lib/libc.a:syscalls.o(.data); + tools/agbcc/lib/libc.a:writer.o(.data); + tools/agbcc/lib/libc.a:callocr.o(.data); + tools/agbcc/lib/libc.a:closer.o(.data); + tools/agbcc/lib/libc.a:errno.o(.data); + tools/agbcc/lib/libc.a:fstatr.o(.data); + tools/agbcc/lib/libc.a:libcfunc.o(.data); + tools/agbcc/lib/libc.a:lseekr.o(.data); + tools/agbcc/lib/libc.a:readr.o(.data); + . = 0x40000; } @@ -24,10 +62,12 @@ SECTIONS { /* .bss.code starts at 0x3000F60 */ src/libs/m4a_2.o(.bss.code); + tools/agbcc/lib/libc.a:syscalls.o(.bss); /* COMMON starts at 0x3001760 */ - + unk_code_ram = .; + tools/agbcc/lib/libc.a:sbrkr.o(COMMON); . = 0x8000; } @@ -36,6 +76,7 @@ SECTIONS { .text : ALIGN(4) { + unk_code = .; asm/crt0.o(.text); src/engine/main.o(.text); src/engine/sprite.o(.text); @@ -389,6 +430,7 @@ SECTIONS { src/debug/unknown_debug_menu.o(.text); src/engine/name_string_util.o(.text); src/engine/menu_cursor.o(.text); + unk_code_end = .; } =0 script_data : @@ -432,9 +474,46 @@ 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/libs/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:vfprintf.o(.text); + tools/agbcc/lib/libc.a:vsprintf.o(.text); + tools/agbcc/lib/libc.a:fvwrite.o(.text); + tools/agbcc/lib/libc.a:locale.o(.text); + tools/agbcc/lib/libc.a:findfp.o(.text); + tools/agbcc/lib/libc.a:fflush.o(.text); + tools/agbcc/lib/libc.a:wsetup.o(.text); + tools/agbcc/lib/libc.a:mbtowc_r.o(.text); + tools/agbcc/lib/libc.a:s_isinf.o(.text); + tools/agbcc/lib/libc.a:s_isnan.o(.text); + tools/agbcc/lib/libc.a:memchr.o(.text); + tools/agbcc/lib/libc.a:strlen.o(.text); + tools/agbcc/lib/libc.a:dtoa.o(.text); + tools/agbcc/lib/libc.a:memmove.o(.text); + tools/agbcc/lib/libc.a:stdio.o(.text); + tools/agbcc/lib/libc.a:mprec.o(.text); + tools/agbcc/lib/libc.a:mallocr.o(.text); + tools/agbcc/lib/libc.a:fwalk.o(.text); + tools/agbcc/lib/libc.a:freer.o(.text); + tools/agbcc/lib/libc.a:makebuf.o(.text); + tools/agbcc/lib/libc.a:readr.o(.text); + tools/agbcc/lib/libc.a:writer.o(.text); + tools/agbcc/lib/libc.a:lseekr.o(.text); + tools/agbcc/lib/libc.a:closer.o(.text); + tools/agbcc/lib/libc.a:callocr.o(.text); + tools/agbcc/lib/libc.a:sbrkr.o(.text); + tools/agbcc/lib/libc.a:mlock.o(.text); + tools/agbcc/lib/libc.a:fstatr.o(.text); + tools/agbcc/lib/libc.a:libcfunc.o(.text); + tools/agbcc/lib/libc.a:syscalls.o(.text); + tools/agbcc/lib/libc.a:errno.o(.text); + src/libs/libisagbprn.o(.text); } =0 + unk_code_ram_end = unk_code_ram + (unk_code_end - unk_code); + end = unk_code_ram_end; + .rodata : ALIGN(4) { @@ -1037,6 +1116,10 @@ SECTIONS { src/libs/agb_flash_le.o(.rodata); src/libs/siirtc.o(.rodata); tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata); + tools/agbcc/lib/libc.a(.rodata); + tools/agbcc/lib/libc.a(.data); + tools/agbcc/lib/libc.a:syscalls.o(.rodata); + src/libs/libisagbprn.o(.rodata); } =0 . = 0x8D00000; diff --git a/src/engine/main.c b/src/engine/main.c index 82a5fffb4..11c540d07 100644 --- a/src/engine/main.c +++ b/src/engine/main.c @@ -98,6 +98,13 @@ void AgbMain() gSoftResetDisabled = FALSE; +// In Fire Red, AGBPrintInit is called at this spot. For user convenience, I +// opt to initialize the print area here. It is up to the user where they choose +// to print stuff from, as anything else declared is NOT authoritative. +#ifndef NOAGBPRN + AGBPrintInit(); +#endif + if (gFlashMemoryPresent != TRUE) SetMainCallback2(NULL); diff --git a/src/libs/libc.c b/src/libs/libc.c deleted file mode 100644 index 920673e3e..000000000 --- a/src/libs/libc.c +++ /dev/null @@ -1,143 +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); -} diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c new file mode 100755 index 000000000..64ccb6351 --- /dev/null +++ b/src/libs/libisagbprn.c @@ -0,0 +1,151 @@ +#include +#include +#include "gba/gba.h" +#include "config.h" + +#define AGB_PRINT_FLUSH_ADDR 0x9FE209D +#define AGB_PRINT_STRUCT_ADDR 0x9FE20F8 +#define AGB_PRINT_PROTECT_ADDR 0x9FE2FFE +#define WSCNT_DATA (WAITCNT_PHI_OUT_16MHZ | WAITCNT_WS0_S_2 | WAITCNT_WS0_N_4) + +struct AGBPrintStruct +{ + u16 m_nRequest; + u16 m_nBank; + u16 m_nGet; + u16 m_nPut; +}; + +typedef void (*LPFN_PRINT_FLUSH)(void); + +#ifndef NOAGBPRN +void AGBPrintFlush1Block(void); + +void AGBPrintInit(void) +{ + volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; + u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT; + u16 *pProtect = (u16 *)AGB_PRINT_PROTECT_ADDR; + u16 nOldWSCNT = *pWSCNT; + *pWSCNT = WSCNT_DATA; + *pProtect = 0x20; + pPrint->m_nRequest = pPrint->m_nGet = pPrint->m_nPut = 0; + pPrint->m_nBank = 0xFD; + *pProtect = 0; + *pWSCNT = nOldWSCNT; +} + +static void AGBPutcInternal(const char cChr) +{ + volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; + u16 *pPrintBuf = (u16 *)(0x8000000 + (pPrint->m_nBank << 16)); + u16 *pProtect = (u16 *)AGB_PRINT_PROTECT_ADDR; + u16 nData = pPrintBuf[pPrint->m_nPut / 2]; + *pProtect = 0x20; + nData = (pPrint->m_nPut & 1) ? (nData & 0xFF) | (cChr << 8) : (nData & 0xFF00) | cChr; + pPrintBuf[pPrint->m_nPut / 2] = nData; + pPrint->m_nPut++; + *pProtect = 0; +} + +void AGBPutc(const char cChr) +{ + u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT; + u16 nOldWSCNT = *pWSCNT; + volatile struct AGBPrintStruct *pPrint; + *pWSCNT = WSCNT_DATA; + AGBPutcInternal(cChr); + *pWSCNT = nOldWSCNT; + pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; + if (pPrint->m_nPut == ((pPrint->m_nGet - 1) & 0xFFFF)) + AGBPrintFlush1Block(); +} + +void AGBPrint(const char *pBuf) +{ + volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; + u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT; + u16 nOldWSCNT = *pWSCNT; + *pWSCNT = WSCNT_DATA; + while (*pBuf) + { + AGBPutc(*pBuf); + pBuf++; + } + *pWSCNT = nOldWSCNT; +} + +void AGBPrintf(const char *pBuf, ...) +{ + char bufPrint[0x100]; + va_list vArgv; + va_start(vArgv, pBuf); + vsprintf(bufPrint, pBuf, vArgv); + va_end(vArgv); + AGBPrint(bufPrint); +} + +static void AGBPrintTransferDataInternal(u32 bAllData) +{ + LPFN_PRINT_FLUSH lpfnFuncFlush; + u16 *pIME; + u16 nIME; + u16 *pWSCNT; + u16 nOldWSCNT; + u16 *pProtect; + volatile struct AGBPrintStruct *pPrint; + + pProtect = (u16 *)AGB_PRINT_PROTECT_ADDR; + pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; + lpfnFuncFlush = (LPFN_PRINT_FLUSH)AGB_PRINT_FLUSH_ADDR; + pIME = (u16 *)REG_ADDR_IME; + nIME = *pIME; + pWSCNT = (u16 *)REG_ADDR_WAITCNT; + nOldWSCNT = *pWSCNT; + *pIME = nIME & ~1; + *pWSCNT = WSCNT_DATA; + + if (bAllData) + { + while (pPrint->m_nPut != pPrint->m_nGet) + { + *pProtect = 0x20; + lpfnFuncFlush(); + *pProtect = 0; + } + } + else if (pPrint->m_nPut != pPrint->m_nGet) + { + *pProtect = 0x20; + lpfnFuncFlush(); + *pProtect = 0; + } + + *pWSCNT = nOldWSCNT; + *pIME = nIME; +} + +void AGBPrintFlush1Block(void) +{ + AGBPrintTransferDataInternal(FALSE); +} + +void AGBPrintFlush(void) +{ + AGBPrintTransferDataInternal(TRUE); +} + +void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram) +{ + if (nStopProgram) + { + AGBPrintf("ASSERTION FAILED FILE=[%s] LINE=[%d] EXP=[%s] \n", pFile, nLine, pExpression); + AGBPrintFlush(); + asm(".hword 0xEFFF"); + } + else + { + AGBPrintf("WARING FILE=[%s] LINE=[%d] EXP=[%s] \n", pFile, nLine, pExpression); + } +} +#endif diff --git a/sym_bss.txt b/sym_bss.txt index 6587c2c39..ff3b3de01 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -39,3 +39,40 @@ .include "src/libs/siirtc.o" .include "tools/agbcc/lib/libgcc.a:dp-bit.o" .include "tools/agbcc/lib/libgcc.a:fp-bit.o" + .include "tools/agbcc/lib/libc.a:memcpy.o" + .include "tools/agbcc/lib/libc.a:memset.o" + .include "tools/agbcc/lib/libc.a:strcmp.o" + .include "tools/agbcc/lib/libc.a:strcpy.o" + .include "tools/agbcc/lib/libc.a:impure.o" + .include "tools/agbcc/lib/libc.a:vsprintf.o" + .include "tools/agbcc/lib/libc.a:vfprintf.o" + .include "tools/agbcc/lib/libc.a:wsetup.o" + .include "tools/agbcc/lib/libc.a:dtoa.o" + .include "tools/agbcc/lib/libc.a:fflush.o" + .include "tools/agbcc/lib/libc.a:findfp.o" + .include "tools/agbcc/lib/libc.a:freer.o" + .include "tools/agbcc/lib/libc.a:mtrim.o" + .include "tools/agbcc/lib/libc.a:fvwrite.o" + .include "tools/agbcc/lib/libc.a:fwalk.o" + .include "tools/agbcc/lib/libc.a:locale.o" + .include "tools/agbcc/lib/libc.a:makebuf.o" + .include "tools/agbcc/lib/libc.a:mallocr.o" + .include "tools/agbcc/lib/libc.a:mbtowc_r.o" + .include "tools/agbcc/lib/libc.a:memchr.o" + .include "tools/agbcc/lib/libc.a:memmove.o" + .include "tools/agbcc/lib/libc.a:mlock.o" + .include "tools/agbcc/lib/libc.a:mprec.o" + .include "tools/agbcc/lib/libc.a:s_isinf.o" + .include "tools/agbcc/lib/libc.a:s_isnan.o" + .include "tools/agbcc/lib/libc.a:sbrkr.o" + .include "tools/agbcc/lib/libc.a:stdio.o" + .include "tools/agbcc/lib/libc.a:strlen.o" + .include "tools/agbcc/lib/libc.a:syscalls.o" + .include "tools/agbcc/lib/libc.a:writer.o" + .include "tools/agbcc/lib/libc.a:callocr.o" + .include "tools/agbcc/lib/libc.a:closer.o" + .include "tools/agbcc/lib/libc.a:errno.o" + .include "tools/agbcc/lib/libc.a:fstatr.o" + .include "tools/agbcc/lib/libc.a:libcfunc.o" + .include "tools/agbcc/lib/libc.a:lseekr.o" + .include "tools/agbcc/lib/libc.a:readr.o" -- cgit v1.2.3 From 8fd3100fb491c22bb90d1a86f2f1b0fd3b090ac4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Dec 2017 17:31:27 -0500 Subject: Through sub_8101A28 --- asm/slot_machine.s | 206 ----------------------------------------------- include/ewram.h | 2 +- ld_script.txt | 3 +- src/field/slot_machine.c | 125 +++++++++++++++++++++++++++- 4 files changed, 125 insertions(+), 211 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 62792245d..4060e2541 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,212 +5,6 @@ .text - thumb_func_start PlaySlotMachine -PlaySlotMachine: @ 81018A0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl sub_81019B0 - ldr r0, _081018B4 @ =sub_81018B8 - bl SetMainCallback2 - pop {r0} - bx r0 - .align 2, 0 -_081018B4: .4byte sub_81018B8 - thumb_func_end PlaySlotMachine - - thumb_func_start sub_81018B8 -sub_81018B8: @ 81018B8 - push {lr} - ldr r0, _081018D0 @ =gMain - ldr r1, _081018D4 @ =0x0000043c - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x6 - bhi _0810194A - lsls r0, 2 - ldr r1, _081018D8 @ =_081018DC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081018D0: .4byte gMain -_081018D4: .4byte 0x0000043c -_081018D8: .4byte _081018DC - .align 2, 0 -_081018DC: - .4byte _081018F8 - .4byte _08101902 - .4byte _08101908 - .4byte _08101912 - .4byte _08101918 - .4byte _0810191E - .4byte _08101938 -_081018F8: - bl sub_8101A28 - bl sub_8101BA4 - b _08101922 -_08101902: - bl sub_8101A8C - b _08101922 -_08101908: - bl sub_8101AE0 - bl sub_8101B04 - b _08101922 -_08101912: - bl sub_8101C84 - b _08101922 -_08101918: - bl sub_8101CA0 - b _08101922 -_0810191E: - bl sub_8101CC0 -_08101922: - ldr r1, _08101930 @ =gMain - ldr r0, _08101934 @ =0x0000043c - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _0810194A - .align 2, 0 -_08101930: .4byte gMain -_08101934: .4byte 0x0000043c -_08101938: - bl sub_8101CD4 - bl sub_8101CEC - bl sub_8101A44 - ldr r0, _08101950 @ =sub_8101954 - bl SetMainCallback2 -_0810194A: - pop {r0} - bx r0 - .align 2, 0 -_08101950: .4byte sub_8101954 - thumb_func_end sub_81018B8 - - thumb_func_start sub_8101954 -sub_8101954: @ 8101954 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_8101954 - - thumb_func_start sub_810196C -sub_810196C: @ 810196C - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - ldr r1, _081019A8 @ =REG_WIN0H - ldr r2, _081019AC @ =gSharedMem - adds r0, r2, 0 - adds r0, 0x58 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x4 - adds r0, r2, 0 - adds r0, 0x5A - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x4 - adds r0, r2, 0 - adds r0, 0x5C - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - adds r0, r2, 0 - adds r0, 0x5E - ldrh r0, [r0] - strh r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_081019A8: .4byte REG_WIN0H -_081019AC: .4byte gSharedMem - thumb_func_end sub_810196C - - thumb_func_start sub_81019B0 -sub_81019B0: @ 81019B0 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _081019E4 @ =nullsub_67 - movs r1, 0xFF - bl CreateTask - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _081019E8 @ =gTasks - adds r0, r1 - strh r4, [r0, 0x8] - adds r0, 0xA - adds r1, r5, 0 - bl StoreWordInTwoHalfwords - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081019E4: .4byte nullsub_67 -_081019E8: .4byte gTasks - thumb_func_end sub_81019B0 - - thumb_func_start sub_81019EC -sub_81019EC: @ 81019EC - push {lr} - ldr r0, _08101A18 @ =nullsub_67 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - lsls r2, r0, 2 - adds r2, r0 - lsls r2, 3 - ldr r0, _08101A1C @ =gTasks - adds r2, r0 - ldr r1, _08101A20 @ =gSharedMem - ldrh r0, [r2, 0x8] - strb r0, [r1, 0x1] - adds r2, 0xA - adds r1, 0x64 - adds r0, r2, 0 - bl LoadWordFromTwoHalfwords - pop {r0} - bx r0 - .align 2, 0 -_08101A18: .4byte nullsub_67 -_08101A1C: .4byte gTasks -_08101A20: .4byte gSharedMem - thumb_func_end sub_81019EC - - thumb_func_start nullsub_67 -nullsub_67: @ 8101A24 - bx lr - thumb_func_end nullsub_67 - - thumb_func_start sub_8101A28 -sub_8101A28: @ 8101A28 - push {lr} - movs r0, 0 - bl SetVBlankCallback - movs r0, 0 - bl SetHBlankCallback - movs r1, 0x80 - lsls r1, 19 - movs r0, 0 - strh r0, [r1] - pop {r0} - bx r0 - thumb_func_end sub_8101A28 - thumb_func_start sub_8101A44 sub_8101A44: @ 8101A44 push {r4,lr} diff --git a/include/ewram.h b/include/ewram.h index eacc02cab..9d3002615 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -24,7 +24,7 @@ extern u8 gSharedMem[]; #define ewram0arr ((u8 (*)[32])gSharedMem) #define eVoidSharedArr (void *)(ewram_addr + 0x0) #define eVoidSharedArr2 (u32)(ewram_addr) // ew(ram) -#define ewram0_8 ((struct UnkStruct2000000 *)(gSharedMem + 0x0)) +#define eSlotMachine ((struct SlotMachineEwramStruct *)(gSharedMem + 0x0)) #define ewram0_9(i) (u8 *)(ewram_addr + (i * 0x20)) #define ewram0_10 (*(struct UnknownPokenav0*)(gSharedMem + 0)) #define ewram0_11 (*(struct UnknownPokenav0_1*)(gSharedMem + 0)) diff --git a/ld_script.txt b/ld_script.txt index 6353fceec..5014ebb4b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -318,8 +318,9 @@ SECTIONS { src/scene/cute_sketch.o(.text); asm/cute_sketch.o(.text); src/field/decoration.o(.text); - asm/slot_machine.o(.text); src/field/slot_machine.o(.text); + asm/slot_machine.o(.text); + src/field/slot_machine.o(.text_a); asm/slot_machine.o(.text_8104D30) src/field/slot_machine.o(.text_b); src/scene/contest_painting.o(.text); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 89ec68b0a..3bff71f4f 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1,13 +1,24 @@ #include "global.h" +#include "main.h" #include "slot_machine.h" #include "decompress.h" #include "palette.h" #include "task.h" +#include "util.h" #include "ewram.h" -struct UnkStruct2000000 { - /*0x00*/ u8 filler00[61]; +struct SlotMachineEwramStruct { + /*0x00*/ u8 unk00; + /*0x01*/ u8 unk01; + /*0x02*/ u8 filler02[59]; /*0x3D*/ u8 unk3D; + /*0x3E*/ u8 filler3E[26]; + /*0x58*/ u16 win0h; + /*0x5a*/ u16 win0v; + /*0x5c*/ u16 winIn; + /*0x5e*/ u16 winOut; + /*0x60*/ u8 filler_60[4]; + /*0x64*/ void *unk64; }; struct UnkStruct1 { @@ -31,6 +42,114 @@ extern const u16 gUnknown_08E95A18[]; extern u16 gUnknown_08E95AB8[]; extern u16 gUnknown_08E95FB8[]; +void sub_81018B8(void); +void sub_8101954(void); +void sub_81019B0(u8 arg0, void *ptr); +void nullsub_67(u8 taskId); +void sub_8101A28(void); +void sub_8101BA4(void); +void sub_8101A8C(void); +void sub_8101AE0(void); +void sub_8101B04(void); +void sub_8101C84(void); +void sub_8101CA0(void); +void sub_8101CC0(void); +void sub_8101CD4(void); +void sub_8101CEC(void); +void sub_8101A44(void); + + +void PlaySlotMachine(u8 arg0, void *ptr) +{ + sub_81019B0(arg0, ptr); + SetMainCallback2(sub_81018B8); +} + +void sub_81018B8(void) +{ + switch (gMain.state) + { + case 0: + sub_8101A28(); + sub_8101BA4(); + gMain.state++; + break; + case 1: + sub_8101A8C(); + gMain.state++; + break; + case 2: + sub_8101AE0(); + sub_8101B04(); + gMain.state++; + break; + case 3: + sub_8101C84(); + gMain.state++; + break; + case 4: + sub_8101CA0(); + gMain.state++; + break; + case 5: + sub_8101CC0(); + gMain.state++; + break; + case 6: + sub_8101CD4(); + sub_8101CEC(); + sub_8101A44(); + SetMainCallback2(sub_8101954); + break; + } +} + +void sub_8101954(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} + +void sub_810196C(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + REG_WIN0H = eSlotMachine->win0h; + REG_WIN0V = eSlotMachine->win0v; + REG_WININ = eSlotMachine->winIn; + REG_WINOUT = eSlotMachine->winOut; +} + +void sub_81019B0(u8 arg0, void *ptr) +{ + struct Task *task = &gTasks[CreateTask(nullsub_67, 0xFF)]; + task->data[0] = arg0; + StoreWordInTwoHalfwords(task->data + 1, (intptr_t)ptr); +} + +void sub_81019EC(void) +{ + struct Task *task = &gTasks[FindTaskIdByFunc(nullsub_67)]; + eSlotMachine->unk01 = task->data[0]; + LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&eSlotMachine->unk64); +} + +void nullsub_67(u8 taskId) +{ +} + +void sub_8101A28(void) +{ + SetVBlankCallback(NULL); + SetHBlankCallback(NULL); + REG_DISPCNT = 0; +} + +asm(".section .text_a"); + static void LoadSlotMachineWheelOverlay(void); void sub_8104CAC(u8 arg0) { @@ -39,7 +158,7 @@ void sub_8104CAC(u8 arg0) { sub_8104DA4(); - task = &gTasks[ewram0_8->unk3D]; + task = &gTasks[eSlotMachine->unk3D]; task->data[1] = arg0; i = 0; -- cgit v1.2.3 From f0957176bc96aef3bac673ac520ba55832957ba8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Dec 2017 17:51:17 -0500 Subject: through sub_8101AE0 --- asm/slot_machine.s | 103 ----------------------------------------------- include/gba/macro.h | 30 ++++++++------ src/field/slot_machine.c | 22 ++++++++++ 3 files changed, 39 insertions(+), 116 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 4060e2541..c5dd8bd26 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,109 +5,6 @@ .text - thumb_func_start sub_8101A44 -sub_8101A44: @ 8101A44 - push {r4,lr} - ldr r0, _08101A7C @ =sub_810196C - bl SetVBlankCallback - ldr r3, _08101A80 @ =0x04000208 - ldrh r2, [r3] - movs r0, 0 - strh r0, [r3] - ldr r4, _08101A84 @ =0x04000200 - ldrh r0, [r4] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r4] - strh r2, [r3] - ldr r2, _08101A88 @ =REG_DISPSTAT - ldrh r0, [r2] - movs r1, 0x8 - orrs r0, r1 - strh r0, [r2] - movs r1, 0x80 - lsls r1, 19 - movs r2, 0xFD - lsls r2, 6 - adds r0, r2, 0 - strh r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08101A7C: .4byte sub_810196C -_08101A80: .4byte 0x04000208 -_08101A84: .4byte 0x04000200 -_08101A88: .4byte REG_DISPSTAT - thumb_func_end sub_8101A44 - - thumb_func_start sub_8101A8C -sub_8101A8C: @ 8101A8C - push {r4-r7,lr} - sub sp, 0x4 - movs r2, 0xC0 - lsls r2, 19 - movs r3, 0x80 - lsls r3, 9 - mov r4, sp - movs r6, 0 - ldr r1, _08101AD8 @ =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, _08101ADC @ =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r12, r0 -_08101AAA: - strh r6, [r4] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r5 - subs r3, r5 - cmp r3, r5 - bhi _08101AAA - strh r6, [r4] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 1 - mov r2, r12 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08101AD8: .4byte 0x040000d4 -_08101ADC: .4byte 0x81000800 - thumb_func_end sub_8101A8C - - thumb_func_start sub_8101AE0 -sub_8101AE0: @ 8101AE0 - sub sp, 0x4 - movs r2, 0xE0 - lsls r2, 19 - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r0, _08101AFC @ =0x040000d4 - str r1, [r0] - str r2, [r0, 0x4] - ldr r1, _08101B00 @ =0x81000200 - str r1, [r0, 0x8] - ldr r0, [r0, 0x8] - add sp, 0x4 - bx lr - .align 2, 0 -_08101AFC: .4byte 0x040000d4 -_08101B00: .4byte 0x81000200 - thumb_func_end sub_8101AE0 - thumb_func_start sub_8101B04 sub_8101B04: @ 8101B04 push {r4,r5,lr} diff --git a/include/gba/macro.h b/include/gba/macro.h index a0edf2a49..945ba4885 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -104,25 +104,29 @@ } #define DmaClearLarge(dmaNum, dest, size, block, bit) \ -{ \ - u32 _size = size; \ - while (1) \ - { \ - DmaFill##bit(dmaNum, 0, dest, (block)); \ - dest += (block); \ - _size -= (block); \ - if (_size <= (block)) \ - { \ - DmaFill##bit(dmaNum, 0, dest, _size); \ - break; \ - } \ - } \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + DmaFill##bit(dmaNum, 0, _dest, (block)); \ + _dest += (block); \ + _size -= (block); \ + if (_size <= (block)) \ + { \ + DmaFill##bit(dmaNum, 0, _dest, _size); \ + break; \ + } \ + } \ } #define DmaCopyLarge16(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 16) #define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32) +# define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16) +# define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32) + #define DmaCopyDefvars(dmaNum, src, dest, size, bit) \ { \ const void *_src = src; \ diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 3bff71f4f..60f8a58ff 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -148,6 +148,28 @@ void sub_8101A28(void) REG_DISPCNT = 0; } +void sub_8101A44(void) +{ + u16 imeBak; + SetVBlankCallback(sub_810196C); + imeBak = REG_IME; + REG_IME = 0; + REG_IE |= INTR_FLAG_VBLANK; + REG_IME = imeBak; + REG_DISPSTAT |= DISPSTAT_VBLANK_INTR; + REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON; +} + +void sub_8101A8C(void) +{ + DmaClearLarge16(3, (u16 *)(BG_VRAM), BG_VRAM_SIZE, 0x1000); +} + +void sub_8101AE0(void) +{ + DmaClear16(3, (u16 *)OAM, OAM_SIZE); +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 9c9c31b1e15014d7cfeb3856717d9b29715d46a5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Dec 2017 20:09:48 -0500 Subject: through sub_8101D8C --- asm/slot_machine.s | 339 ----------------------------------------------- include/slot_machine.h | 31 +++++ include/sprite.h | 2 + src/field/slot_machine.c | 162 +++++++++++++++++++--- 4 files changed, 178 insertions(+), 356 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index c5dd8bd26..a289ec573 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,345 +5,6 @@ .text - thumb_func_start sub_8101B04 -sub_8101B04: @ 8101B04 - push {r4,r5,lr} - ldr r5, _08101B70 @ =REG_BG0CNT - movs r1, 0 - strh r1, [r5] - ldr r2, _08101B74 @ =REG_BG1CNT - strh r1, [r2] - ldr r3, _08101B78 @ =REG_BG2CNT - strh r1, [r3] - ldr r4, _08101B7C @ =REG_BG3CNT - strh r1, [r4] - ldr r0, _08101B80 @ =REG_BG0HOFS - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - ldr r1, _08101B84 @ =0x00001f08 - adds r0, r1, 0 - strh r0, [r5] - ldr r1, _08101B88 @ =0x00001c01 - adds r0, r1, 0 - strh r0, [r2] - ldr r2, _08101B8C @ =0x00001d02 - adds r0, r2, 0 - strh r0, [r3] - ldr r1, _08101B90 @ =0x00001e02 - adds r0, r1, 0 - strh r0, [r4] - ldr r0, _08101B94 @ =REG_WININ - movs r1, 0x3F - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - ldr r1, _08101B98 @ =REG_BLDCNT - ldr r2, _08101B9C @ =0x00001048 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r2, _08101BA0 @ =0x00000809 - adds r0, r2, 0 - strh r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08101B70: .4byte REG_BG0CNT -_08101B74: .4byte REG_BG1CNT -_08101B78: .4byte REG_BG2CNT -_08101B7C: .4byte REG_BG3CNT -_08101B80: .4byte REG_BG0HOFS -_08101B84: .4byte 0x00001f08 -_08101B88: .4byte 0x00001c01 -_08101B8C: .4byte 0x00001d02 -_08101B90: .4byte 0x00001e02 -_08101B94: .4byte REG_WININ -_08101B98: .4byte REG_BLDCNT -_08101B9C: .4byte 0x00001048 -_08101BA0: .4byte 0x00000809 - thumb_func_end sub_8101B04 - - thumb_func_start sub_8101BA4 -sub_8101BA4: @ 8101BA4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - bl sub_81019EC - ldr r5, _08101C74 @ =gSharedMem - movs r4, 0 - strb r4, [r5] - strb r4, [r5, 0x2] - bl Random - movs r1, 0x1 - ands r1, r0 - strb r1, [r5, 0x3] - strb r4, [r5, 0x4] - movs r0, 0 - strh r4, [r5, 0x8] - strb r0, [r5, 0xA] - strb r0, [r5, 0xB] - ldr r0, _08101C78 @ =gSaveBlock1 - ldr r1, _08101C7C @ =0x00000494 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r5, 0xC] - strh r4, [r5, 0xE] - strh r4, [r5, 0x10] - strh r4, [r5, 0x12] - strh r4, [r5, 0x18] - movs r0, 0x8 - strh r0, [r5, 0x1A] - adds r1, r5, 0 - adds r1, 0x58 - movs r0, 0xF0 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0xA0 - strh r0, [r1] - adds r0, r5, 0 - adds r0, 0x5C - movs r1, 0x3F - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - bl GetCurrentMapMusic - adds r1, r5, 0 - adds r1, 0x60 - strh r0, [r1] - movs r7, 0 - adds r6, r5, 0 - ldr r2, _08101C80 @ =gUnknown_083ECCF8 - mov r9, r2 - movs r0, 0x1C - adds r0, r6 - mov r8, r0 -_08101C14: - lsls r5, r7, 1 - adds r0, r6, 0 - adds r0, 0x22 - adds r0, r5, r0 - movs r1, 0 - strh r1, [r0] - adds r4, r6, 0 - adds r4, 0x28 - adds r4, r5, r4 - ldrb r0, [r6, 0x3] - lsls r0, 1 - lsls r1, r7, 2 - adds r0, r1 - add r0, r9 - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0x15 - bl __modsi3 - strh r0, [r4] - add r5, r8 - movs r2, 0 - ldrsh r0, [r4, r2] - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 3 - movs r2, 0xFC - lsls r2, 1 - adds r0, r2, 0 - subs r0, r1 - strh r0, [r5] - movs r1, 0 - ldrsh r0, [r5, r1] - adds r1, r2, 0 - bl __modsi3 - strh r0, [r5] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x2 - bls _08101C14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08101C74: .4byte gSharedMem -_08101C78: .4byte gSaveBlock1 -_08101C7C: .4byte 0x00000494 -_08101C80: .4byte gUnknown_083ECCF8 - thumb_func_end sub_8101BA4 - - thumb_func_start sub_8101C84 -sub_8101C84: @ 8101C84 - push {r4,lr} - ldr r4, _08101C9C @ =gWindowConfig_81E7128 - adds r0, r4, 0 - bl SetUpWindowConfig - adds r0, r4, 0 - bl InitMenuWindow - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08101C9C: .4byte gWindowConfig_81E7128 - thumb_func_end sub_8101C84 - - thumb_func_start sub_8101CA0 -sub_8101CA0: @ 8101CA0 - push {lr} - bl ResetPaletteFade - bl ResetSpriteData - ldr r1, _08101CBC @ =gOamLimit - movs r0, 0x80 - strb r0, [r1] - bl FreeAllSpritePalettes - bl ResetTasks - pop {r0} - bx r0 - .align 2, 0 -_08101CBC: .4byte gOamLimit - thumb_func_end sub_8101CA0 - - thumb_func_start sub_8101CC0 -sub_8101CC0: @ 8101CC0 - push {lr} - bl sub_8106448 - bl sub_81064B8 - bl sub_81063C0 - pop {r0} - bx r0 - thumb_func_end sub_8101CC0 - - thumb_func_start sub_8101CD4 -sub_8101CD4: @ 8101CD4 - push {lr} - bl sub_8104EA8 - bl sub_8104F8C - bl sub_8103DC8 - bl sub_81050C4 - pop {r0} - bx r0 - thumb_func_end sub_8101CD4 - - thumb_func_start sub_8101CEC -sub_8101CEC: @ 8101CEC - push {lr} - bl sub_8104048 - bl sub_8102DA8 - bl sub_8104C5C - bl sub_8101D04 - pop {r0} - bx r0 - thumb_func_end sub_8101CEC - - thumb_func_start sub_8101D04 -sub_8101D04: @ 8101D04 - push {r4,lr} - ldr r4, _08101D20 @ =sub_8101D24 - adds r0, r4, 0 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - bl _call_via_r4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08101D20: .4byte sub_8101D24 - thumb_func_end sub_8101D04 - - thumb_func_start sub_8101D24 -sub_8101D24: @ 8101D24 - push {r4-r7,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r7, _08101D50 @ =gUnknown_083ECAAC - lsls r1, r0, 2 - adds r1, r0 - lsls r4, r1, 3 - ldr r6, _08101D54 @ =gSharedMem - ldr r5, _08101D58 @ =gTasks -_08101D36: - ldrb r0, [r6] - lsls r0, 2 - adds r0, r7 - ldr r1, [r0] - adds r0, r4, r5 - bl _call_via_r1 - lsls r0, 24 - cmp r0, 0 - bne _08101D36 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08101D50: .4byte gUnknown_083ECAAC -_08101D54: .4byte gSharedMem -_08101D58: .4byte gTasks - thumb_func_end sub_8101D24 - - thumb_func_start sub_8101D5C -sub_8101D5C: @ 8101D5C - push {r4,lr} - sub sp, 0x4 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r4, _08101D88 @ =gSharedMem - ldrb r0, [r4, 0x2] - bl sub_810423C - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08101D88: .4byte gSharedMem - thumb_func_end sub_8101D5C - - thumb_func_start sub_8101D8C -sub_8101D8C: @ 8101D8C - push {lr} - ldr r0, _08101DA8 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08101DA2 - ldr r1, _08101DAC @ =gSharedMem - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08101DA2: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08101DA8: .4byte gPaletteFade -_08101DAC: .4byte gSharedMem - thumb_func_end sub_8101D8C - thumb_func_start sub_8101DB0 sub_8101DB0: @ 8101DB0 push {lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index c39aa7ca8..60b1f177a 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -1,6 +1,37 @@ #ifndef GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H +struct SlotMachineEwramStruct { + /*0x00*/ u8 unk00; + /*0x01*/ u8 unk01; + /*0x02*/ u8 unk02; + /*0x03*/ u8 unk03; + /*0x04*/ u8 unk04; + /*0x05*/ u8 filler05[3]; + /*0x08*/ u16 unk08; + /*0x0A*/ u8 unk0A; + /*0x0B*/ u8 unk0B; + /*0x0C*/ u16 coins; + /*0x0E*/ u16 unk0E; + /*0x10*/ u16 unk10; + /*0x12*/ u16 unk12; + /*0x14*/ u8 filler14[4]; + /*0x18*/ u16 unk18; + /*0x1A*/ u16 unk1A; + /*0x1C*/ s16 unk1C[3]; + /*0x22*/ u16 unk22[3]; + /*0x28*/ s16 unk28[3]; + /*0x2E*/ u8 filler2E[15]; + /*0x3D*/ u8 unk3D; + /*0x3E*/ u8 filler3E[26]; + /*0x58*/ u16 win0h; + /*0x5a*/ u16 win0v; + /*0x5c*/ u16 winIn; + /*0x5e*/ u16 winOut; + /*0x60*/ u16 backupMapMusic; + /*0x64*/ void *unk64; +}; + void PlaySlotMachine(u8, void *); void sub_8104DA4(void); u8 sub_8105BB4(u8, u8, s16); diff --git a/include/sprite.h b/include/sprite.h index a87260ec0..7b6dd2bef 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -229,6 +229,8 @@ extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; extern s16 gSpriteCoordOffsetX; extern s16 gSpriteCoordOffsetY; +extern u8 gOamLimit; + extern struct Sprite gSprites[]; void ResetSpriteData(void); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 60f8a58ff..cb1326151 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1,26 +1,16 @@ #include "global.h" +#include "random.h" +#include "sound.h" #include "main.h" #include "slot_machine.h" #include "decompress.h" #include "palette.h" #include "task.h" #include "util.h" +#include "text.h" +#include "menu.h" #include "ewram.h" -struct SlotMachineEwramStruct { - /*0x00*/ u8 unk00; - /*0x01*/ u8 unk01; - /*0x02*/ u8 filler02[59]; - /*0x3D*/ u8 unk3D; - /*0x3E*/ u8 filler3E[26]; - /*0x58*/ u16 win0h; - /*0x5a*/ u16 win0v; - /*0x5c*/ u16 winIn; - /*0x5e*/ u16 winOut; - /*0x60*/ u8 filler_60[4]; - /*0x64*/ void *unk64; -}; - struct UnkStruct1 { /*0x00*/ u8 unk00; /*0x01*/ u8 unk01; @@ -47,17 +37,30 @@ void sub_8101954(void); void sub_81019B0(u8 arg0, void *ptr); void nullsub_67(u8 taskId); void sub_8101A28(void); -void sub_8101BA4(void); +void sub_8101A44(void); void sub_8101A8C(void); void sub_8101AE0(void); void sub_8101B04(void); +void sub_8101BA4(void); void sub_8101C84(void); void sub_8101CA0(void); void sub_8101CC0(void); void sub_8101CD4(void); void sub_8101CEC(void); -void sub_8101A44(void); - +void sub_8101D04(void); +void sub_8101D24(u8 taskId); + +void sub_8102DA8(void); +void sub_8103DC8(void); +void sub_8104048(void); +void sub_810423C(u8 a0); +void sub_8104C5C(void); +void sub_8104EA8(void); +void sub_8104F8C(void); +void sub_81050C4(void); +void sub_8106448(void); +void sub_81064B8(void); +void sub_81063C0(void); void PlaySlotMachine(u8 arg0, void *ptr) { @@ -170,6 +173,131 @@ void sub_8101AE0(void) DmaClear16(3, (u16 *)OAM, OAM_SIZE); } +void sub_8101B04(void) +{ + REG_BG0CNT = 0; + REG_BG1CNT = 0; + REG_BG2CNT = 0; + REG_BG3CNT = 0; + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2HOFS = 0; + REG_BG2VOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; + REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(2); + REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(28); + REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(29); + REG_BG3CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(30); + REG_WININ = 0x3f; + REG_WINOUT = 0x3f; + REG_BLDCNT = BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_OBJ; + REG_BLDALPHA = 0x809; +} + +extern const s16 gUnknown_083ECCF8[3][2]; + +void sub_8101BA4(void) +{ + u8 i; + + sub_81019EC(); + eSlotMachine->unk00 = 0; + eSlotMachine->unk02 = 0; + eSlotMachine->unk03 = Random() & 1; + eSlotMachine->unk04 = 0; + eSlotMachine->unk08 = 0; + eSlotMachine->unk0A = 0; + eSlotMachine->unk0B = 0; + eSlotMachine->coins = gSaveBlock1.coins; + eSlotMachine->unk0E = 0; + eSlotMachine->unk10 = 0; + eSlotMachine->unk12 = 0; + eSlotMachine->unk18 = 0; + eSlotMachine->unk1A = 8; + eSlotMachine->win0h = 0xf0; + eSlotMachine->win0v = 0xa0; + eSlotMachine->winIn = 0x3f; + eSlotMachine->winOut = 0x3f; + eSlotMachine->backupMapMusic = GetCurrentMapMusic(); + for (i = 0; i < 3; i++) + { + eSlotMachine->unk22[i] = 0; + eSlotMachine->unk28[i] = gUnknown_083ECCF8[i][eSlotMachine->unk03] % 21; + eSlotMachine->unk1C[i] = 0x1f8 - eSlotMachine->unk28[i] * 24; + eSlotMachine->unk1C[i] %= 0x1f8; + } +} + +void sub_8101C84(void) +{ + SetUpWindowConfig(&gWindowConfig_81E7128); + InitMenuWindow(&gWindowConfig_81E7128); +} + +void sub_8101CA0(void) +{ + ResetPaletteFade(); + ResetSpriteData(); + gOamLimit = 128; + FreeAllSpritePalettes(); + ResetTasks(); +} + +void sub_8101CC0(void) +{ + sub_8106448(); + sub_81064B8(); + sub_81063C0(); +} + +void sub_8101CD4(void) +{ + sub_8104EA8(); + sub_8104F8C(); + sub_8103DC8(); + sub_81050C4(); +} + +void sub_8101CEC(void) +{ + sub_8104048(); + sub_8102DA8(); + sub_8104C5C(); + sub_8101D04(); +} + +extern bool8 (*const gUnknown_083ECAAC[])(struct Task *task); + +void sub_8101D04(void) +{ + sub_8101D24(CreateTask(sub_8101D24, 0)); +} + +void sub_8101D24(u8 taskId) +{ + while (gUnknown_083ECAAC[eSlotMachine->unk00](gTasks + taskId)); +} + +bool8 sub_8101D5C(struct Task *task) +{ + BeginNormalPaletteFade(-1, 0, 16, 0, 0); + sub_810423C(eSlotMachine->unk02); + eSlotMachine->unk00++; + return FALSE; +} + +bool8 sub_8101D8C(struct Task *task) +{ + if (!gPaletteFade.active) + { + eSlotMachine->unk00++; + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 3f6124709ae7843bcc82183c387ce03290c28c36 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 08:42:29 -0500 Subject: through sub_8101E3C --- asm/slot_machine.s | 204 ----------------------------------------------- include/slot_machine.h | 6 +- src/field/slot_machine.c | 104 ++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 213 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index a289ec573..9b3926f85 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,210 +5,6 @@ .text - thumb_func_start sub_8101DB0 -sub_8101DB0: @ 8101DB0 - push {lr} - ldr r2, _08101DD8 @ =gSharedMem - movs r0, 0 - strh r0, [r2, 0xE] - strh r0, [r2, 0x12] - strh r0, [r2, 0x18] - ldrb r1, [r2, 0x4] - movs r0, 0xC0 - ands r0, r1 - strb r0, [r2, 0x4] - movs r0, 0x4 - strb r0, [r2] - movs r1, 0xC - ldrsh r0, [r2, r1] - cmp r0, 0 - bgt _08101DDC - movs r0, 0x19 - strb r0, [r2] - b _08101DEC - .align 2, 0 -_08101DD8: .4byte gSharedMem -_08101DDC: - ldrb r0, [r2, 0xA] - cmp r0, 0 - beq _08101DEC - movs r0, 0x3 - strb r0, [r2] - movs r0, 0x4 - bl sub_8104CAC -_08101DEC: - movs r0, 0x1 - pop {r1} - bx r1 - thumb_func_end sub_8101DB0 - - thumb_func_start sub_8101DF4 -sub_8101DF4: @ 8101DF4 - push {lr} - bl sub_8104E18 - lsls r0, 24 - cmp r0, 0 - beq _08101E06 - ldr r1, _08101E0C @ =gSharedMem - movs r0, 0x4 - strb r0, [r1] -_08101E06: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08101E0C: .4byte gSharedMem - thumb_func_end sub_8101DF4 - - thumb_func_start sub_8101E10 -sub_8101E10: @ 8101E10 - push {lr} - movs r0, 0 - bl sub_8104CAC - ldr r2, _08101E34 @ =gSharedMem - movs r0, 0x5 - strb r0, [r2] - movs r0, 0xC - ldrsh r1, [r2, r0] - ldr r0, _08101E38 @ =0x0000270e - cmp r1, r0 - ble _08101E2C - movs r0, 0x17 - strb r0, [r2] -_08101E2C: - movs r0, 0x1 - pop {r1} - bx r1 - .align 2, 0 -_08101E34: .4byte gSharedMem -_08101E38: .4byte 0x0000270e - thumb_func_end sub_8101E10 - - thumb_func_start sub_8101E3C -sub_8101E3C: @ 8101E3C - push {r4,lr} - ldr r0, _08101E58 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08101E60 - movs r0, 0 - bl sub_8104AB8 - ldr r1, _08101E5C @ =gSharedMem - movs r0, 0x8 - strb r0, [r1] - b _08101F1A - .align 2, 0 -_08101E58: .4byte gMain -_08101E5C: .4byte gSharedMem -_08101E60: - movs r0, 0x80 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _08101EC2 - ldr r2, _08101EB8 @ =gSharedMem - movs r1, 0xC - ldrsh r0, [r2, r1] - subs r0, 0x3 - movs r3, 0x12 - ldrsh r1, [r2, r3] - adds r0, r1 - cmp r0, 0 - blt _08101EBC - ldrh r4, [r2, 0x12] - adds r0, r1, 0 - cmp r0, 0x2 - bgt _08101E9C -_08101E84: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_8103D50 - lsls r0, r4, 16 - movs r2, 0x80 - lsls r2, 9 - adds r0, r2 - lsrs r4, r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _08101E84 -_08101E9C: - ldr r1, _08101EB8 @ =gSharedMem - ldrh r0, [r1, 0xC] - subs r0, 0x3 - ldrh r3, [r1, 0x12] - adds r0, r3 - strh r0, [r1, 0xC] - movs r0, 0x3 - strh r0, [r1, 0x12] - movs r0, 0x9 - strb r0, [r1] - movs r0, 0x5F - bl PlaySE - b _08101F1A - .align 2, 0 -_08101EB8: .4byte gSharedMem -_08101EBC: - movs r0, 0x6 - strb r0, [r2] - b _08101F1A -_08101EC2: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08101EEC - ldr r4, _08101F24 @ =gSharedMem - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08101EEC - movs r0, 0x5F - bl PlaySE - ldrb r0, [r4, 0x12] - bl sub_8103D50 - ldrh r0, [r4, 0xC] - subs r0, 0x1 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] -_08101EEC: - ldr r0, _08101F24 @ =gSharedMem - movs r2, 0x12 - ldrsh r1, [r0, r2] - ldr r2, _08101F28 @ =gMain - adds r3, r0, 0 - cmp r1, 0x2 - bgt _08101F08 - cmp r1, 0 - beq _08101F0C - ldrh r1, [r2, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08101F0C -_08101F08: - movs r0, 0x9 - strb r0, [r3] -_08101F0C: - ldrh r1, [r2, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08101F1A - movs r0, 0x15 - strb r0, [r3] -_08101F1A: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08101F24: .4byte gSharedMem -_08101F28: .4byte gMain - thumb_func_end sub_8101E3C - thumb_func_start sub_8101F2C sub_8101F2C: @ 8101F2C push {r4,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 60b1f177a..421946103 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -2,7 +2,7 @@ #define GUARD_SLOT_MACHINE_H struct SlotMachineEwramStruct { - /*0x00*/ u8 unk00; + /*0x00*/ u8 state; /*0x01*/ u8 unk01; /*0x02*/ u8 unk02; /*0x03*/ u8 unk03; @@ -11,10 +11,10 @@ struct SlotMachineEwramStruct { /*0x08*/ u16 unk08; /*0x0A*/ u8 unk0A; /*0x0B*/ u8 unk0B; - /*0x0C*/ u16 coins; + /*0x0C*/ s16 coins; /*0x0E*/ u16 unk0E; /*0x10*/ u16 unk10; - /*0x12*/ u16 unk12; + /*0x12*/ s16 bet; /*0x14*/ u8 filler14[4]; /*0x18*/ u16 unk18; /*0x1A*/ u16 unk1A; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index cb1326151..16cfea7b5 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/songs.h" #include "random.h" #include "sound.h" #include "main.h" @@ -51,16 +52,20 @@ void sub_8101D04(void); void sub_8101D24(u8 taskId); void sub_8102DA8(void); +void sub_8103D50(u8 a0); void sub_8103DC8(void); void sub_8104048(void); void sub_810423C(u8 a0); +void sub_8104AB8(u8 a0); void sub_8104C5C(void); +void sub_8104CAC(u8 arg0); +bool8 sub_8104E18(void); void sub_8104EA8(void); void sub_8104F8C(void); void sub_81050C4(void); +void sub_81063C0(void); void sub_8106448(void); void sub_81064B8(void); -void sub_81063C0(void); void PlaySlotMachine(u8 arg0, void *ptr) { @@ -204,7 +209,7 @@ void sub_8101BA4(void) u8 i; sub_81019EC(); - eSlotMachine->unk00 = 0; + eSlotMachine->state = 0; eSlotMachine->unk02 = 0; eSlotMachine->unk03 = Random() & 1; eSlotMachine->unk04 = 0; @@ -214,7 +219,7 @@ void sub_8101BA4(void) eSlotMachine->coins = gSaveBlock1.coins; eSlotMachine->unk0E = 0; eSlotMachine->unk10 = 0; - eSlotMachine->unk12 = 0; + eSlotMachine->bet = 0; eSlotMachine->unk18 = 0; eSlotMachine->unk1A = 8; eSlotMachine->win0h = 0xf0; @@ -278,14 +283,14 @@ void sub_8101D04(void) void sub_8101D24(u8 taskId) { - while (gUnknown_083ECAAC[eSlotMachine->unk00](gTasks + taskId)); + while (gUnknown_083ECAAC[eSlotMachine->state](gTasks + taskId)); } bool8 sub_8101D5C(struct Task *task) { BeginNormalPaletteFade(-1, 0, 16, 0, 0); sub_810423C(eSlotMachine->unk02); - eSlotMachine->unk00++; + eSlotMachine->state++; return FALSE; } @@ -293,7 +298,94 @@ bool8 sub_8101D8C(struct Task *task) { if (!gPaletteFade.active) { - eSlotMachine->unk00++; + eSlotMachine->state++; + } + return FALSE; +} + +bool8 sub_8101DB0(struct Task *task) +{ + eSlotMachine->unk0E = 0; + eSlotMachine->bet = 0; + eSlotMachine->unk18 = 0; + eSlotMachine->unk04 &= 0xc0; + eSlotMachine->state = 4; + if (eSlotMachine->coins <= 0) + { + eSlotMachine->state = 25; + } + else if (eSlotMachine->unk0A) + { + eSlotMachine->state = 3; + sub_8104CAC(4); + } + return TRUE; +} + +bool8 sub_8101DF4(struct Task *task) +{ + if (sub_8104E18()) + { + eSlotMachine->state = 4; + } + return FALSE; +} + +bool8 sub_8101E10(struct Task *task) +{ + sub_8104CAC(0); + eSlotMachine->state = 5; + if (eSlotMachine->coins >= 9999) + { + eSlotMachine->state = 23; + } + return TRUE; +} + +bool8 sub_8101E3C(struct Task *task) +{ + s16 i; + + if (gMain.newKeys & SELECT_BUTTON) + { + sub_8104AB8(0); + eSlotMachine->state = 8; + } + else if (gMain.newKeys & R_BUTTON) + { + if (eSlotMachine->coins - (3 - eSlotMachine->bet) >= 0) + { + for (i = eSlotMachine->bet; i < 3; i++) + { + sub_8103D50(i); + } + eSlotMachine->coins -= (3 - eSlotMachine->bet); + eSlotMachine->bet = 3; + eSlotMachine->state = 9; + PlaySE(SE_REGI); + } + else + { + eSlotMachine->state = 6; + } + } + else + { + if (gMain.newKeys & DPAD_DOWN && eSlotMachine->coins != 0) + { + PlaySE(SE_REGI); + sub_8103D50(eSlotMachine->bet); + eSlotMachine->coins--; + eSlotMachine->bet++; + } + if (eSlotMachine->bet >= 3 || (eSlotMachine->bet != 0 && gMain.newKeys & A_BUTTON)) + { + eSlotMachine->state = 9; + } + if (gMain.newKeys & B_BUTTON) + { + eSlotMachine->state = 21; + } } return FALSE; } -- cgit v1.2.3 From 994bf583aa4d50b95f7b43179206639a81aa68ea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 08:46:32 -0500 Subject: sub_8101F44 --- asm/slot_machine.s | 30 ------------------------------ src/field/slot_machine.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 9b3926f85..2eb52583a 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,36 +5,6 @@ .text - thumb_func_start sub_8101F2C -sub_8101F2C: @ 8101F2C - push {r4,lr} - adds r4, r0, 0 - bl MenuDisplayMessageBox - adds r0, r4, 0 - movs r1, 0x2 - movs r2, 0xF - bl MenuPrint - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8101F2C - - thumb_func_start sub_8101F44 -sub_8101F44: @ 8101F44 - push {lr} - ldr r0, _08101F58 @ =gOtherText_DontHaveThreeCoins - bl sub_8101F2C - ldr r1, _08101F5C @ =gSharedMem - movs r0, 0x7 - strb r0, [r1] - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08101F58: .4byte gOtherText_DontHaveThreeCoins -_08101F5C: .4byte gSharedMem - thumb_func_end sub_8101F44 - thumb_func_start sub_8101F60 sub_8101F60: @ 8101F60 push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 16cfea7b5..4cf93d5d6 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1,5 +1,6 @@ #include "global.h" #include "constants/songs.h" +#include "strings2.h" #include "random.h" #include "sound.h" #include "main.h" @@ -390,6 +391,19 @@ bool8 sub_8101E3C(struct Task *task) return FALSE; } +void sub_8101F2C(const u8 *str) +{ + MenuDisplayMessageBox(); + MenuPrint(str, 2, 15); +} + +bool8 sub_8101F44(struct Task *task) +{ + sub_8101F2C(gOtherText_DontHaveThreeCoins); + eSlotMachine->state = 7; + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 2fe7a0e1542fa24731d233ed3b9e97ce4efa9c31 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 16:32:23 -0500 Subject: through sub_8102090 --- asm/slot_machine.s | 195 ----------------------------------------------- include/slot_machine.h | 2 +- src/field/slot_machine.c | 173 ++++++++++++++++++++++++++++++++--------- 3 files changed, 139 insertions(+), 231 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 2eb52583a..75202fc81 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,201 +5,6 @@ .text - thumb_func_start sub_8101F60 -sub_8101F60: @ 8101F60 - push {lr} - ldr r0, _08101F80 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _08101F78 - bl MenuZeroFillScreen - ldr r1, _08101F84 @ =gSharedMem - movs r0, 0x5 - strb r0, [r1] -_08101F78: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08101F80: .4byte gMain -_08101F84: .4byte gSharedMem - thumb_func_end sub_8101F60 - - thumb_func_start sub_8101F88 -sub_8101F88: @ 8101F88 - push {lr} - bl sub_8104AEC - lsls r0, 24 - cmp r0, 0 - beq _08101F9A - ldr r1, _08101FA0 @ =gSharedMem - movs r0, 0x5 - strb r0, [r1] -_08101F9A: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08101FA0: .4byte gSharedMem - thumb_func_end sub_8101F88 - - thumb_func_start sub_8101FA4 -sub_8101FA4: @ 8101FA4 - push {r4,lr} - adds r4, r0, 0 - bl sub_8102484 - bl sub_8104DA4 - movs r0, 0 - bl sub_8102DEC - movs r0, 0x1 - bl sub_8102DEC - movs r0, 0x2 - bl sub_8102DEC - movs r0, 0 - strh r0, [r4, 0x8] - ldr r4, _08101FDC @ =gSharedMem - ldrb r1, [r4, 0x4] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08101FE0 - bl sub_810430C - movs r0, 0xA - b _08101FE8 - .align 2, 0 -_08101FDC: .4byte gSharedMem -_08101FE0: - movs r0, 0x1 - bl sub_8104CAC - movs r0, 0xB -_08101FE8: - strb r0, [r4] - ldr r4, _08102004 @ =gSharedMem - movs r0, 0x8 - strh r0, [r4, 0x1A] - ldrb r0, [r4, 0xA] - cmp r0, 0 - beq _08101FFC - bl dp15_jump_random_unknown - strh r0, [r4, 0x1A] -_08101FFC: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08102004: .4byte gSharedMem - thumb_func_end sub_8101FA4 - - thumb_func_start sub_8102008 -sub_8102008: @ 8102008 - push {lr} - bl sub_810432C - lsls r0, 24 - cmp r0, 0 - beq _08102028 - movs r0, 0x1 - bl sub_8104CAC - ldr r1, _08102030 @ =gSharedMem - ldrb r2, [r1, 0x4] - movs r0, 0xDF - ands r0, r2 - strb r0, [r1, 0x4] - movs r0, 0xB - strb r0, [r1] -_08102028: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08102030: .4byte gSharedMem - thumb_func_end sub_8102008 - - thumb_func_start sub_8102034 -sub_8102034: @ 8102034 - push {lr} - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x1D - ble _0810204E - bl sub_81024F0 - ldr r1, _08102054 @ =gSharedMem - movs r0, 0xC - strb r0, [r1] -_0810204E: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08102054: .4byte gSharedMem - thumb_func_end sub_8102034 - - thumb_func_start sub_8102058 -sub_8102058: @ 8102058 - push {r4,lr} - ldr r0, _08102088 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810207E - movs r0, 0x18 - bl PlaySE - ldr r4, _0810208C @ =gSharedMem - ldrb r0, [r4, 0x18] - bl sub_8102E1C - ldrb r0, [r4, 0x18] - bl sub_8103C14 - movs r0, 0xD - strb r0, [r4] -_0810207E: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08102088: .4byte gMain -_0810208C: .4byte gSharedMem - thumb_func_end sub_8102058 - - thumb_func_start sub_8102090 -sub_8102090: @ 8102090 - push {r4,lr} - ldr r4, _081020BC @ =gSharedMem - ldrb r0, [r4, 0x18] - bl sub_8102E40 - lsls r0, 24 - cmp r0, 0 - bne _081020C0 - ldrh r0, [r4, 0x18] - adds r0, 0x1 - strh r0, [r4, 0x18] - movs r1, 0xC - strb r1, [r4] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _081020B6 - movs r0, 0xE - strb r0, [r4] -_081020B6: - movs r0, 0x1 - b _081020C2 - .align 2, 0 -_081020BC: .4byte gSharedMem -_081020C0: - movs r0, 0 -_081020C2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8102090 - thumb_func_start sub_81020C8 sub_81020C8: @ 81020C8 push {r4,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 421946103..057713a1b 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -16,7 +16,7 @@ struct SlotMachineEwramStruct { /*0x10*/ u16 unk10; /*0x12*/ s16 bet; /*0x14*/ u8 filler14[4]; - /*0x18*/ u16 unk18; + /*0x18*/ s16 unk18; /*0x1A*/ u16 unk1A; /*0x1C*/ s16 unk1C[3]; /*0x22*/ u16 unk22[3]; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 4cf93d5d6..94dd5b08f 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -34,30 +34,39 @@ extern const u16 gUnknown_08E95A18[]; extern u16 gUnknown_08E95AB8[]; extern u16 gUnknown_08E95FB8[]; -void sub_81018B8(void); -void sub_8101954(void); -void sub_81019B0(u8 arg0, void *ptr); -void nullsub_67(u8 taskId); -void sub_8101A28(void); -void sub_8101A44(void); -void sub_8101A8C(void); -void sub_8101AE0(void); -void sub_8101B04(void); -void sub_8101BA4(void); -void sub_8101C84(void); -void sub_8101CA0(void); -void sub_8101CC0(void); -void sub_8101CD4(void); -void sub_8101CEC(void); -void sub_8101D04(void); -void sub_8101D24(u8 taskId); - +static void sub_81018B8(void); +static void sub_8101954(void); +static void sub_81019B0(u8 arg0, void *ptr); +static void nullsub_67(u8 taskId); +static void sub_8101A28(void); +static void sub_8101A44(void); +static void sub_8101A8C(void); +static void sub_8101AE0(void); +static void sub_8101B04(void); +static void sub_8101BA4(void); +static void sub_8101C84(void); +static void sub_8101CA0(void); +static void sub_8101CC0(void); +static void sub_8101CD4(void); +static void sub_8101CEC(void); +static void sub_8101D04(void); +static void sub_8101D24(u8 taskId); + +void sub_8102484(void); +void sub_81024F0(void); void sub_8102DA8(void); +void sub_8102DEC(u8 a0); +void sub_8102E1C(u8 a0); +bool8 sub_8102E40(u8 a0); +void sub_8103C14(u8 a0); void sub_8103D50(u8 a0); void sub_8103DC8(void); void sub_8104048(void); void sub_810423C(u8 a0); +void sub_810430C(void); +bool8 sub_810432C(void); void sub_8104AB8(u8 a0); +bool8 sub_8104AEC(void); void sub_8104C5C(void); void sub_8104CAC(u8 arg0); bool8 sub_8104E18(void); @@ -67,6 +76,7 @@ void sub_81050C4(void); void sub_81063C0(void); void sub_8106448(void); void sub_81064B8(void); +u16 dp15_jump_random_unknown(void); void PlaySlotMachine(u8 arg0, void *ptr) { @@ -74,7 +84,7 @@ void PlaySlotMachine(u8 arg0, void *ptr) SetMainCallback2(sub_81018B8); } -void sub_81018B8(void) +static void sub_81018B8(void) { switch (gMain.state) { @@ -113,7 +123,7 @@ void sub_81018B8(void) } } -void sub_8101954(void) +static void sub_8101954(void) { RunTasks(); AnimateSprites(); @@ -132,7 +142,7 @@ void sub_810196C(void) REG_WINOUT = eSlotMachine->winOut; } -void sub_81019B0(u8 arg0, void *ptr) +static void sub_81019B0(u8 arg0, void *ptr) { struct Task *task = &gTasks[CreateTask(nullsub_67, 0xFF)]; task->data[0] = arg0; @@ -146,18 +156,18 @@ void sub_81019EC(void) LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&eSlotMachine->unk64); } -void nullsub_67(u8 taskId) +static void nullsub_67(u8 taskId) { } -void sub_8101A28(void) +static void sub_8101A28(void) { SetVBlankCallback(NULL); SetHBlankCallback(NULL); REG_DISPCNT = 0; } -void sub_8101A44(void) +static void sub_8101A44(void) { u16 imeBak; SetVBlankCallback(sub_810196C); @@ -169,17 +179,17 @@ void sub_8101A44(void) REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON; } -void sub_8101A8C(void) +static void sub_8101A8C(void) { DmaClearLarge16(3, (u16 *)(BG_VRAM), BG_VRAM_SIZE, 0x1000); } -void sub_8101AE0(void) +static void sub_8101AE0(void) { DmaClear16(3, (u16 *)OAM, OAM_SIZE); } -void sub_8101B04(void) +static void sub_8101B04(void) { REG_BG0CNT = 0; REG_BG1CNT = 0; @@ -205,7 +215,7 @@ void sub_8101B04(void) extern const s16 gUnknown_083ECCF8[3][2]; -void sub_8101BA4(void) +static void sub_8101BA4(void) { u8 i; @@ -237,13 +247,13 @@ void sub_8101BA4(void) } } -void sub_8101C84(void) +static void sub_8101C84(void) { SetUpWindowConfig(&gWindowConfig_81E7128); InitMenuWindow(&gWindowConfig_81E7128); } -void sub_8101CA0(void) +static void sub_8101CA0(void) { ResetPaletteFade(); ResetSpriteData(); @@ -252,14 +262,14 @@ void sub_8101CA0(void) ResetTasks(); } -void sub_8101CC0(void) +static void sub_8101CC0(void) { sub_8106448(); sub_81064B8(); sub_81063C0(); } -void sub_8101CD4(void) +static void sub_8101CD4(void) { sub_8104EA8(); sub_8104F8C(); @@ -267,7 +277,7 @@ void sub_8101CD4(void) sub_81050C4(); } -void sub_8101CEC(void) +static void sub_8101CEC(void) { sub_8104048(); sub_8102DA8(); @@ -277,12 +287,12 @@ void sub_8101CEC(void) extern bool8 (*const gUnknown_083ECAAC[])(struct Task *task); -void sub_8101D04(void) +static void sub_8101D04(void) { sub_8101D24(CreateTask(sub_8101D24, 0)); } -void sub_8101D24(u8 taskId) +static void sub_8101D24(u8 taskId) { while (gUnknown_083ECAAC[eSlotMachine->state](gTasks + taskId)); } @@ -404,6 +414,99 @@ bool8 sub_8101F44(struct Task *task) return FALSE; } +bool8 sub_8101F60(struct Task *task) +{ + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + MenuZeroFillScreen(); + eSlotMachine->state = 5; + } + return FALSE; +} + +bool8 sub_8101F88(struct Task *task) +{ + if (sub_8104AEC()) + { + eSlotMachine->state = 5; + } + return FALSE; +} + +bool8 sub_8101FA4(struct Task *task) +{ + sub_8102484(); + sub_8104DA4(); + sub_8102DEC(0); + sub_8102DEC(1); + sub_8102DEC(2); + task->data[0] = 0; + if (eSlotMachine->unk04 & 0x20) + { + sub_810430C(); + eSlotMachine->state = 10; + } + else + { + sub_8104CAC(1); + eSlotMachine->state = 11; + } + eSlotMachine->unk1A = 8; + if (eSlotMachine->unk0A) + { + eSlotMachine->unk1A = dp15_jump_random_unknown(); + } + return FALSE; +} + +bool8 sub_8102008(struct Task *task) +{ + if (sub_810432C()) + { + sub_8104CAC(1); + eSlotMachine->unk04 &= 0xDF; + eSlotMachine->state = 11; + } + return FALSE; +} + +bool8 sub_8102034(struct Task *task) +{ + if (++task->data[0] >= 30) + { + sub_81024F0(); + eSlotMachine->state = 12; + } + return FALSE; +} + +bool8 sub_8102058(struct Task *task) +{ + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_JYUNI); + sub_8102E1C(eSlotMachine->unk18); + sub_8103C14(eSlotMachine->unk18); + eSlotMachine->state = 13; + } + return FALSE; +} + +bool8 sub_8102090(struct Task *task) +{ + if (!sub_8102E40(eSlotMachine->unk18)) + { + eSlotMachine->unk18++; + eSlotMachine->state = 12; + if (eSlotMachine->unk18 > 2) + { + eSlotMachine->state = 14; + } + return TRUE; + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 6369dca42b4a0cab379b5ecfdc5b8235e64f79cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 18:34:43 -0500 Subject: sub_81020C8 --- asm/slot_machine.s | 136 ----------------------------------------------- include/slot_machine.h | 2 +- src/field/slot_machine.c | 69 ++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 137 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 75202fc81..f4d0202a4 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,142 +5,6 @@ .text - thumb_func_start sub_81020C8 -sub_81020C8: @ 81020C8 - push {r4,lr} - ldr r4, _08102128 @ =gSharedMem - ldrb r1, [r4, 0x4] - movs r0, 0xC0 - ands r0, r1 - strb r0, [r4, 0x4] - bl sub_81027A0 - ldrb r0, [r4, 0xA] - cmp r0, 0 - beq _081020E8 - subs r0, 0x1 - strb r0, [r4, 0xA] - ldrb r0, [r4, 0xB] - adds r0, 0x1 - strb r0, [r4, 0xB] -_081020E8: - ldrh r0, [r4, 0x8] - cmp r0, 0 - beq _081021B4 - movs r0, 0xF - strb r0, [r4] - bl sub_8102A24 - bl sub_8103F70 - ldrh r0, [r4, 0x10] - ldrh r1, [r4, 0xE] - subs r0, r1 - strh r0, [r4, 0x10] - lsls r0, 16 - cmp r0, 0 - bge _0810210C - movs r0, 0 - strh r0, [r4, 0x10] -_0810210C: - ldrh r1, [r4, 0x8] - movs r0, 0xC0 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _08102130 - ldr r0, _0810212C @ =0x00000185 - bl PlayFanfare - movs r0, 0x6 - bl sub_8104CAC - b _0810215A - .align 2, 0 -_08102128: .4byte gSharedMem -_0810212C: .4byte 0x00000185 -_08102130: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0810214C - ldr r0, _08102148 @ =0x00000185 - bl PlayFanfare - movs r0, 0x5 - bl sub_8104CAC - b _0810215A - .align 2, 0 -_08102148: .4byte 0x00000185 -_0810214C: - movs r0, 0xC3 - lsls r0, 1 - bl PlayFanfare - movs r0, 0x2 - bl sub_8104CAC -_0810215A: - ldr r1, _081021B0 @ =gSharedMem - ldrh r3, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 1 - ands r0, r3 - adds r2, r1, 0 - cmp r0, 0 - beq _08102192 - ldrb r1, [r2, 0x4] - movs r0, 0x3F - ands r0, r1 - movs r1, 0 - strb r0, [r2, 0x4] - movs r0, 0xC0 - lsls r0, 1 - ands r0, r3 - cmp r0, 0 - beq _08102192 - strb r1, [r2, 0xA] - strb r1, [r2, 0xB] - strb r1, [r2, 0x3] - movs r0, 0x80 - lsls r0, 1 - ands r0, r3 - cmp r0, 0 - beq _08102192 - movs r0, 0x1 - strb r0, [r2, 0x3] -_08102192: - ldrh r1, [r2, 0x8] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _081021D2 - ldrb r0, [r2, 0x2] - cmp r0, 0xF - bhi _081021D2 - adds r0, 0x1 - strb r0, [r2, 0x2] - ldrb r0, [r2, 0x2] - bl sub_8104064 - b _081021D2 - .align 2, 0 -_081021B0: .4byte gSharedMem -_081021B4: - movs r0, 0x3 - bl sub_8104CAC - movs r0, 0x14 - strb r0, [r4] - ldrh r0, [r4, 0x12] - ldrh r1, [r4, 0x10] - adds r0, r1 - strh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 16 - ldr r1, _081021DC @ =0x0000270f - cmp r0, r1 - ble _081021D2 - strh r1, [r4, 0x10] -_081021D2: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081021DC: .4byte 0x0000270f - thumb_func_end sub_81020C8 - thumb_func_start sub_81021E0 sub_81021E0: @ 81021E0 push {lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 057713a1b..880fe6f1f 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -13,7 +13,7 @@ struct SlotMachineEwramStruct { /*0x0B*/ u8 unk0B; /*0x0C*/ s16 coins; /*0x0E*/ u16 unk0E; - /*0x10*/ u16 unk10; + /*0x10*/ s16 unk10; /*0x12*/ s16 bet; /*0x14*/ u8 filler14[4]; /*0x18*/ s16 unk18; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 94dd5b08f..65d7e21ba 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -54,6 +54,8 @@ static void sub_8101D24(u8 taskId); void sub_8102484(void); void sub_81024F0(void); +void sub_81027A0(void); +void sub_8102A24(void); void sub_8102DA8(void); void sub_8102DEC(u8 a0); void sub_8102E1C(u8 a0); @@ -61,7 +63,9 @@ bool8 sub_8102E40(u8 a0); void sub_8103C14(u8 a0); void sub_8103D50(u8 a0); void sub_8103DC8(void); +void sub_8103F70(void); void sub_8104048(void); +void sub_8104064(u8 a0); void sub_810423C(u8 a0); void sub_810430C(void); bool8 sub_810432C(void); @@ -507,6 +511,71 @@ bool8 sub_8102090(struct Task *task) return FALSE; } +bool8 sub_81020C8(struct Task *task) +{ + eSlotMachine->unk04 &= 0xc0; + sub_81027A0(); + if (eSlotMachine->unk0A) + { + eSlotMachine->unk0A--; + eSlotMachine->unk0B++; + } + if (eSlotMachine->unk08) + { + eSlotMachine->state = 15; + sub_8102A24(); + sub_8103F70(); + if ((eSlotMachine->unk10 -= eSlotMachine->unk0E) < 0) + { + eSlotMachine->unk10 = 0; + } + if (eSlotMachine->unk08 & 0x180) + { + PlayFanfare(BGM_ME_B_BIG); + sub_8104CAC(6); + } + else if (eSlotMachine->unk08 & 0x40) + { + PlayFanfare(BGM_ME_B_BIG); + sub_8104CAC(5); + } + else + { + PlayFanfare(BGM_ME_B_SMALL); + sub_8104CAC(2); + } + if (eSlotMachine->unk08 & 0x1c0) + { + eSlotMachine->unk04 &= 0x3f; + if (eSlotMachine->unk08 & 0x180) + { + eSlotMachine->unk0A = 0; + eSlotMachine->unk0B = 0; + eSlotMachine->unk03 = 0; + if (eSlotMachine->unk08 & 0x100) + { + eSlotMachine->unk03 = 1; + } + } + } + if (eSlotMachine->unk08 & 0x20 && eSlotMachine->unk02 < 16) + { + eSlotMachine->unk02++; + sub_8104064(eSlotMachine->unk02); + } + } + else + { + sub_8104CAC(3); + eSlotMachine->state = 20; + if ((eSlotMachine->unk10 += eSlotMachine->bet) > 9999) + { + eSlotMachine->unk10 = 9999; + } + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From e432ffd18d6a1cd5bf1147a42979df3541ea0807 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 19:08:24 -0500 Subject: through sub_8102460 --- asm/slot_machine.s | 369 ----------------------------------------------- include/slot_machine.h | 2 +- src/field/slot_machine.c | 174 +++++++++++++++++++++- 3 files changed, 174 insertions(+), 371 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index f4d0202a4..6552f3a7c 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,375 +5,6 @@ .text - thumb_func_start sub_81021E0 -sub_81021E0: @ 81021E0 - push {lr} - bl sub_8102A44 - lsls r0, 24 - cmp r0, 0 - beq _081021F2 - ldr r1, _081021F8 @ =gSharedMem - movs r0, 0x10 - strb r0, [r1] -_081021F2: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_081021F8: .4byte gSharedMem - thumb_func_end sub_81021E0 - - thumb_func_start sub_81021FC -sub_81021FC: @ 81021FC - push {r4,lr} - bl sub_8103FA0 - lsls r0, 24 - cmp r0, 0 - beq _08102256 - ldr r4, _08102260 @ =gSharedMem - movs r0, 0x13 - strb r0, [r4] - ldrh r1, [r4, 0x8] - movs r0, 0xC0 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _08102220 - movs r0, 0x1C - bl IncrementGameStat -_08102220: - ldrh r1, [r4, 0x8] - movs r0, 0x4 - ands r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0 - beq _08102236 - movs r0, 0 - strh r0, [r4, 0x18] - movs r0, 0x9 - strb r0, [r4] -_08102236: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08102242 - movs r0, 0x11 - strb r0, [r4] -_08102242: - ldrb r0, [r4, 0xA] - cmp r0, 0 - beq _08102256 - cmp r2, 0 - beq _08102256 - movs r0, 0x4 - bl sub_8104CAC - movs r0, 0x12 - strb r0, [r4] -_08102256: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08102260: .4byte gSharedMem - thumb_func_end sub_81021FC - - thumb_func_start sub_8102264 -sub_8102264: @ 8102264 - push {r4,lr} - bl sub_81040C8 - lsls r0, 24 - cmp r0, 0 - bne _08102294 - ldr r4, _0810229C @ =gSharedMem - movs r0, 0x13 - strb r0, [r4] - ldrh r1, [r4, 0x8] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08102294 - movs r0, 0x9 - strb r0, [r4] - ldrb r0, [r4, 0xA] - cmp r0, 0 - beq _08102294 - movs r0, 0x4 - bl sub_8104CAC - movs r0, 0x12 - strb r0, [r4] -_08102294: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0810229C: .4byte gSharedMem - thumb_func_end sub_8102264 - - thumb_func_start sub_81022A0 -sub_81022A0: @ 81022A0 - push {lr} - bl sub_8104E18 - lsls r0, 24 - cmp r0, 0 - beq _081022C0 - ldr r2, _081022C8 @ =gSharedMem - movs r0, 0x13 - strb r0, [r2] - ldrh r1, [r2, 0x8] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _081022C0 - movs r0, 0x9 - strb r0, [r2] -_081022C0: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_081022C8: .4byte gSharedMem - thumb_func_end sub_81022A0 - - thumb_func_start sub_81022CC -sub_81022CC: @ 81022CC - push {lr} - movs r0, 0 - bl sub_8103D8C - movs r0, 0x1 - bl sub_8103D8C - movs r0, 0x2 - bl sub_8103D8C - ldr r1, _081022EC @ =gSharedMem - movs r0, 0x2 - strb r0, [r1] - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_081022EC: .4byte gSharedMem - thumb_func_end sub_81022CC - - thumb_func_start sub_81022F0 -sub_81022F0: @ 81022F0 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0xA] - adds r0, 0x1 - strh r0, [r1, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x40 - ble _0810230C - movs r0, 0 - strh r0, [r1, 0xA] - ldr r1, _08102314 @ =gSharedMem - movs r0, 0x13 - strb r0, [r1] -_0810230C: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08102314: .4byte gSharedMem - thumb_func_end sub_81022F0 - - thumb_func_start sub_8102318 -sub_8102318: @ 8102318 - push {lr} - ldr r0, _0810233C @ =gOtherText_QuitGamePrompt - bl sub_8101F2C - movs r0, 0x15 - movs r1, 0x7 - movs r2, 0x1 - bl DisplayYesNoMenu - bl sub_814AB84 - ldr r1, _08102340 @ =gSharedMem - movs r0, 0x16 - strb r0, [r1] - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_0810233C: .4byte gOtherText_QuitGamePrompt -_08102340: .4byte gSharedMem - thumb_func_end sub_8102318 - - thumb_func_start sub_8102344 -sub_8102344: @ 8102344 - push {lr} - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - bne _0810237C - bl MenuZeroFillScreen - movs r0, 0 - bl sub_8103D8C - movs r0, 0x1 - bl sub_8103D8C - movs r0, 0x2 - bl sub_8103D8C - ldr r0, _08102378 @ =gSharedMem - ldrh r1, [r0, 0x12] - ldrh r2, [r0, 0xC] - adds r1, r2 - strh r1, [r0, 0xC] - movs r1, 0x1B - strb r1, [r0] - b _08102392 - .align 2, 0 -_08102378: .4byte gSharedMem -_0810237C: - cmp r1, 0x1 - beq _08102388 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _08102392 -_08102388: - bl MenuZeroFillScreen - ldr r1, _08102398 @ =gSharedMem - movs r0, 0x5 - strb r0, [r1] -_08102392: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08102398: .4byte gSharedMem - thumb_func_end sub_8102344 - - thumb_func_start sub_810239C -sub_810239C: @ 810239C - push {lr} - ldr r0, _081023B0 @ =gOtherText_MaxCoins - bl sub_8101F2C - ldr r1, _081023B4 @ =gSharedMem - movs r0, 0x18 - strb r0, [r1] - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_081023B0: .4byte gOtherText_MaxCoins -_081023B4: .4byte gSharedMem - thumb_func_end sub_810239C - - thumb_func_start sub_81023B8 -sub_81023B8: @ 81023B8 - push {lr} - ldr r0, _081023D8 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _081023D0 - bl MenuZeroFillScreen - ldr r1, _081023DC @ =gSharedMem - movs r0, 0x5 - strb r0, [r1] -_081023D0: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_081023D8: .4byte gMain -_081023DC: .4byte gSharedMem - thumb_func_end sub_81023B8 - - thumb_func_start sub_81023E0 -sub_81023E0: @ 81023E0 - push {lr} - ldr r0, _081023F4 @ =gOtherText_OutOfCoins - bl sub_8101F2C - ldr r1, _081023F8 @ =gSharedMem - movs r0, 0x1A - strb r0, [r1] - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_081023F4: .4byte gOtherText_OutOfCoins -_081023F8: .4byte gSharedMem - thumb_func_end sub_81023E0 - - thumb_func_start sub_81023FC -sub_81023FC: @ 81023FC - push {lr} - ldr r0, _0810241C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _08102414 - bl MenuZeroFillScreen - ldr r1, _08102420 @ =gSharedMem - movs r0, 0x1B - strb r0, [r1] -_08102414: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_0810241C: .4byte gMain -_08102420: .4byte gSharedMem - thumb_func_end sub_81023FC - - thumb_func_start sub_8102424 -sub_8102424: @ 8102424 - push {r4,lr} - sub sp, 0x4 - ldr r0, _08102454 @ =gSaveBlock1 - ldr r4, _08102458 @ =gSharedMem - ldrh r1, [r4, 0xC] - ldr r2, _0810245C @ =0x00000494 - adds r0, r2 - movs r2, 0 - strh r1, [r0] - movs r0, 0x1 - negs r0, r0 - str r2, [sp] - movs r1, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - movs r0, 0 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08102454: .4byte gSaveBlock1 -_08102458: .4byte gSharedMem -_0810245C: .4byte 0x00000494 - thumb_func_end sub_8102424 - - thumb_func_start sub_8102460 -sub_8102460: @ 8102460 - push {lr} - ldr r0, _0810247C @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08102476 - ldr r0, _08102480 @ =gSharedMem - ldr r0, [r0, 0x64] - bl SetMainCallback2 -_08102476: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_0810247C: .4byte gPaletteFade -_08102480: .4byte gSharedMem - thumb_func_end sub_8102460 - thumb_func_start sub_8102484 sub_8102484: @ 8102484 push {r4,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 880fe6f1f..4dde64aa7 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -29,7 +29,7 @@ struct SlotMachineEwramStruct { /*0x5c*/ u16 winIn; /*0x5e*/ u16 winOut; /*0x60*/ u16 backupMapMusic; - /*0x64*/ void *unk64; + /*0x64*/ MainCallback prevMainCb; }; void PlaySlotMachine(u8, void *); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 65d7e21ba..37fbbbb51 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1,6 +1,8 @@ #include "global.h" #include "constants/songs.h" #include "strings2.h" +#include "overworld.h" +#include "menu_cursor.h" #include "random.h" #include "sound.h" #include "main.h" @@ -56,16 +58,20 @@ void sub_8102484(void); void sub_81024F0(void); void sub_81027A0(void); void sub_8102A24(void); +bool8 sub_8102A44(void); void sub_8102DA8(void); void sub_8102DEC(u8 a0); void sub_8102E1C(u8 a0); bool8 sub_8102E40(u8 a0); void sub_8103C14(u8 a0); void sub_8103D50(u8 a0); +void sub_8103D8C(u8 a0); void sub_8103DC8(void); void sub_8103F70(void); +bool8 sub_8103FA0(void); void sub_8104048(void); void sub_8104064(u8 a0); +bool8 sub_81040C8(void); void sub_810423C(u8 a0); void sub_810430C(void); bool8 sub_810432C(void); @@ -157,7 +163,7 @@ void sub_81019EC(void) { struct Task *task = &gTasks[FindTaskIdByFunc(nullsub_67)]; eSlotMachine->unk01 = task->data[0]; - LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&eSlotMachine->unk64); + LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&eSlotMachine->prevMainCb); } static void nullsub_67(u8 taskId) @@ -576,6 +582,172 @@ bool8 sub_81020C8(struct Task *task) return FALSE; } +bool8 sub_81021E0(struct Task *task) +{ + if (sub_8102A44()) + { + eSlotMachine->state = 16; + } + return FALSE; +} + +bool8 sub_81021FC(struct Task *tas) +{ + if (sub_8103FA0()) + { + eSlotMachine->state = 19; + if (eSlotMachine->unk08 & 0x180) + { + IncrementGameStat(GAME_STAT_SLOT_JACKPOTS); + } + if (eSlotMachine->unk08 & 0x04) + { + eSlotMachine->unk18 = 0; + eSlotMachine->state = 9; + } + if (eSlotMachine->unk08 & 0x20) + { + eSlotMachine->state = 17; + } + if (eSlotMachine->unk0A && eSlotMachine->unk08 & 0x04) + { + sub_8104CAC(4); + eSlotMachine->state = 18; + } + } + return FALSE; +} + +bool8 sub_8102264(struct Task *task) +{ + if (!sub_81040C8()) + { + eSlotMachine->state = 19; + if (eSlotMachine->unk08 & 0x04) + { + eSlotMachine->state = 9; + if (eSlotMachine->unk0A) + { + sub_8104CAC(4); + eSlotMachine->state = 18; + } + } + } + return FALSE; +} + +bool8 sub_81022A0(struct Task *task) +{ + if (sub_8104E18()) + { + eSlotMachine->state = 19; + if (eSlotMachine->unk08 & 0x04) + { + eSlotMachine->state = 9; + } + } + return FALSE; +} + +bool8 sub_81022CC(struct Task *task) +{ + sub_8103D8C(0); + sub_8103D8C(1); + sub_8103D8C(2); + eSlotMachine->state = 2; + return FALSE; +} + +bool8 sub_81022F0(struct Task *task) +{ + if (++task->data[1] > 64) + { + task->data[1] = 0; + eSlotMachine->state = 19; + } + return FALSE; +} + +bool8 sub_8102318(struct Task *task) +{ + sub_8101F2C(gOtherText_QuitGamePrompt); + DisplayYesNoMenu(21, 7, 1); + sub_814AB84(); + eSlotMachine->state = 22; + return FALSE; +} + +bool8 sub_8102344(struct Task *task) +{ + s8 input = ProcessMenuInputNoWrap_(); + if (input == 0) + { + MenuZeroFillScreen(); + sub_8103D8C(0); + sub_8103D8C(1); + sub_8103D8C(2); + eSlotMachine->coins += eSlotMachine->bet; + eSlotMachine->state = 27; + } + else if (input == 1 || input == -1) + { + MenuZeroFillScreen(); + eSlotMachine->state = 5; + } + return FALSE; +} + +bool8 sub_810239C(struct Task *task) +{ + sub_8101F2C(gOtherText_MaxCoins); + eSlotMachine->state = 24; + return FALSE; +} + +bool8 sub_81023B8(struct Task *task) +{ + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + MenuZeroFillScreen(); + eSlotMachine->state = 5; + } + return FALSE; +} + +bool8 sub_81023E0(struct Task *task) +{ + sub_8101F2C(gOtherText_OutOfCoins); + eSlotMachine->state = 26; + return FALSE; +} + +bool8 sub_81023FC(struct Task *task) +{ + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + MenuZeroFillScreen(); + eSlotMachine->state = 27; + } + return FALSE; +} + +bool8 sub_8102424(struct Task *task) +{ + gSaveBlock1.coins = eSlotMachine->coins; + BeginNormalPaletteFade(-1, 0, 0, 16, 0); + eSlotMachine->state++; + return FALSE; +} + +bool8 sub_8102460(struct Task *task) +{ + if (!gPaletteFade.active) + { + SetMainCallback2(eSlotMachine->prevMainCb); + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 683862fbd5fdcd9b1c60f926553db0cbe2847422 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 19:12:42 -0500 Subject: through sub_8102460; decompile associated pointer table --- data/slot_machine.s | 32 ------------- ld_script.txt | 1 + src/field/slot_machine.c | 121 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 91 insertions(+), 63 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index 9bd6fe5c9..827d27747 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,38 +3,6 @@ .section .rodata - .align 2 -gUnknown_083ECAAC:: @ 83ECAAC - .4byte sub_8101D5C - .4byte sub_8101D8C - .4byte sub_8101DB0 - .4byte sub_8101DF4 - .4byte sub_8101E10 - .4byte sub_8101E3C - .4byte sub_8101F44 - .4byte sub_8101F60 - .4byte sub_8101F88 - .4byte sub_8101FA4 - .4byte sub_8102008 - .4byte sub_8102034 - .4byte sub_8102058 - .4byte sub_8102090 - .4byte sub_81020C8 - .4byte sub_81021E0 - .4byte sub_81021FC - .4byte sub_8102264 - .4byte sub_81022A0 - .4byte sub_81022CC - .4byte sub_81022F0 - .4byte sub_8102318 - .4byte sub_8102344 - .4byte sub_810239C - .4byte sub_81023B8 - .4byte sub_81023E0 - .4byte sub_81023FC - .4byte sub_8102424 - .4byte sub_8102460 - .align 2 gUnknown_083ECB20:: @ 83ECB20 .4byte sub_8102A9C diff --git a/ld_script.txt b/ld_script.txt index 5014ebb4b..7e588c032 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -554,6 +554,7 @@ SECTIONS { src/field/region_map.o(.rodata); data/cute_sketch.o(.rodata); src/field/decoration.o(.rodata); + src/field/slot_machine.o(.rodata); data/slot_machine.o(.rodata); src/scene/contest_painting.o(.rodata); src/battle/battle_ai.o(.rodata); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 37fbbbb51..2bf8e9c97 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -53,6 +53,35 @@ static void sub_8101CD4(void); static void sub_8101CEC(void); static void sub_8101D04(void); static void sub_8101D24(u8 taskId); +static bool8 sub_8101D5C(struct Task *task); +static bool8 sub_8101D8C(struct Task *task); +static bool8 sub_8101DB0(struct Task *task); +static bool8 sub_8101DF4(struct Task *task); +static bool8 sub_8101E10(struct Task *task); +static bool8 sub_8101E3C(struct Task *task); +static bool8 sub_8101F44(struct Task *task); +static bool8 sub_8101F60(struct Task *task); +static bool8 sub_8101F88(struct Task *task); +static bool8 sub_8101FA4(struct Task *task); +static bool8 sub_8102008(struct Task *task); +static bool8 sub_8102034(struct Task *task); +static bool8 sub_8102058(struct Task *task); +static bool8 sub_8102090(struct Task *task); +static bool8 sub_81020C8(struct Task *task); +static bool8 sub_81021E0(struct Task *task); +static bool8 sub_81021FC(struct Task *task); +static bool8 sub_8102264(struct Task *task); +static bool8 sub_81022A0(struct Task *task); +static bool8 sub_81022CC(struct Task *task); +static bool8 sub_81022F0(struct Task *task); +static bool8 sub_8102318(struct Task *task); +static bool8 sub_8102344(struct Task *task); +static bool8 sub_810239C(struct Task *task); +static bool8 sub_81023B8(struct Task *task); +static bool8 sub_81023E0(struct Task *task); +static bool8 sub_81023FC(struct Task *task); +static bool8 sub_8102424(struct Task *task); +static bool8 sub_8102460(struct Task *task); void sub_8102484(void); void sub_81024F0(void); @@ -88,6 +117,38 @@ void sub_8106448(void); void sub_81064B8(void); u16 dp15_jump_random_unknown(void); +static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { + sub_8101D5C, + sub_8101D8C, + sub_8101DB0, + sub_8101DF4, + sub_8101E10, + sub_8101E3C, + sub_8101F44, + sub_8101F60, + sub_8101F88, + sub_8101FA4, + sub_8102008, + sub_8102034, + sub_8102058, + sub_8102090, + sub_81020C8, + sub_81021E0, + sub_81021FC, + sub_8102264, + sub_81022A0, + sub_81022CC, + sub_81022F0, + sub_8102318, + sub_8102344, + sub_810239C, + sub_81023B8, + sub_81023E0, + sub_81023FC, + sub_8102424, + sub_8102460 +}; + void PlaySlotMachine(u8 arg0, void *ptr) { sub_81019B0(arg0, ptr); @@ -295,8 +356,6 @@ static void sub_8101CEC(void) sub_8101D04(); } -extern bool8 (*const gUnknown_083ECAAC[])(struct Task *task); - static void sub_8101D04(void) { sub_8101D24(CreateTask(sub_8101D24, 0)); @@ -307,7 +366,7 @@ static void sub_8101D24(u8 taskId) while (gUnknown_083ECAAC[eSlotMachine->state](gTasks + taskId)); } -bool8 sub_8101D5C(struct Task *task) +static bool8 sub_8101D5C(struct Task *task) { BeginNormalPaletteFade(-1, 0, 16, 0, 0); sub_810423C(eSlotMachine->unk02); @@ -315,7 +374,7 @@ bool8 sub_8101D5C(struct Task *task) return FALSE; } -bool8 sub_8101D8C(struct Task *task) +static bool8 sub_8101D8C(struct Task *task) { if (!gPaletteFade.active) { @@ -324,7 +383,7 @@ bool8 sub_8101D8C(struct Task *task) return FALSE; } -bool8 sub_8101DB0(struct Task *task) +static bool8 sub_8101DB0(struct Task *task) { eSlotMachine->unk0E = 0; eSlotMachine->bet = 0; @@ -343,7 +402,7 @@ bool8 sub_8101DB0(struct Task *task) return TRUE; } -bool8 sub_8101DF4(struct Task *task) +static bool8 sub_8101DF4(struct Task *task) { if (sub_8104E18()) { @@ -352,7 +411,7 @@ bool8 sub_8101DF4(struct Task *task) return FALSE; } -bool8 sub_8101E10(struct Task *task) +static bool8 sub_8101E10(struct Task *task) { sub_8104CAC(0); eSlotMachine->state = 5; @@ -363,7 +422,7 @@ bool8 sub_8101E10(struct Task *task) return TRUE; } -bool8 sub_8101E3C(struct Task *task) +static bool8 sub_8101E3C(struct Task *task) { s16 i; @@ -417,14 +476,14 @@ void sub_8101F2C(const u8 *str) MenuPrint(str, 2, 15); } -bool8 sub_8101F44(struct Task *task) +static bool8 sub_8101F44(struct Task *task) { sub_8101F2C(gOtherText_DontHaveThreeCoins); eSlotMachine->state = 7; return FALSE; } -bool8 sub_8101F60(struct Task *task) +static bool8 sub_8101F60(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -434,7 +493,7 @@ bool8 sub_8101F60(struct Task *task) return FALSE; } -bool8 sub_8101F88(struct Task *task) +static bool8 sub_8101F88(struct Task *task) { if (sub_8104AEC()) { @@ -443,7 +502,7 @@ bool8 sub_8101F88(struct Task *task) return FALSE; } -bool8 sub_8101FA4(struct Task *task) +static bool8 sub_8101FA4(struct Task *task) { sub_8102484(); sub_8104DA4(); @@ -469,7 +528,7 @@ bool8 sub_8101FA4(struct Task *task) return FALSE; } -bool8 sub_8102008(struct Task *task) +static bool8 sub_8102008(struct Task *task) { if (sub_810432C()) { @@ -480,7 +539,7 @@ bool8 sub_8102008(struct Task *task) return FALSE; } -bool8 sub_8102034(struct Task *task) +static bool8 sub_8102034(struct Task *task) { if (++task->data[0] >= 30) { @@ -490,7 +549,7 @@ bool8 sub_8102034(struct Task *task) return FALSE; } -bool8 sub_8102058(struct Task *task) +static bool8 sub_8102058(struct Task *task) { if (gMain.newKeys & A_BUTTON) { @@ -502,7 +561,7 @@ bool8 sub_8102058(struct Task *task) return FALSE; } -bool8 sub_8102090(struct Task *task) +static bool8 sub_8102090(struct Task *task) { if (!sub_8102E40(eSlotMachine->unk18)) { @@ -517,7 +576,7 @@ bool8 sub_8102090(struct Task *task) return FALSE; } -bool8 sub_81020C8(struct Task *task) +static bool8 sub_81020C8(struct Task *task) { eSlotMachine->unk04 &= 0xc0; sub_81027A0(); @@ -582,7 +641,7 @@ bool8 sub_81020C8(struct Task *task) return FALSE; } -bool8 sub_81021E0(struct Task *task) +static bool8 sub_81021E0(struct Task *task) { if (sub_8102A44()) { @@ -591,7 +650,7 @@ bool8 sub_81021E0(struct Task *task) return FALSE; } -bool8 sub_81021FC(struct Task *tas) +static bool8 sub_81021FC(struct Task *task) { if (sub_8103FA0()) { @@ -618,7 +677,7 @@ bool8 sub_81021FC(struct Task *tas) return FALSE; } -bool8 sub_8102264(struct Task *task) +static bool8 sub_8102264(struct Task *task) { if (!sub_81040C8()) { @@ -636,7 +695,7 @@ bool8 sub_8102264(struct Task *task) return FALSE; } -bool8 sub_81022A0(struct Task *task) +static bool8 sub_81022A0(struct Task *task) { if (sub_8104E18()) { @@ -649,7 +708,7 @@ bool8 sub_81022A0(struct Task *task) return FALSE; } -bool8 sub_81022CC(struct Task *task) +static bool8 sub_81022CC(struct Task *task) { sub_8103D8C(0); sub_8103D8C(1); @@ -658,7 +717,7 @@ bool8 sub_81022CC(struct Task *task) return FALSE; } -bool8 sub_81022F0(struct Task *task) +static bool8 sub_81022F0(struct Task *task) { if (++task->data[1] > 64) { @@ -668,7 +727,7 @@ bool8 sub_81022F0(struct Task *task) return FALSE; } -bool8 sub_8102318(struct Task *task) +static bool8 sub_8102318(struct Task *task) { sub_8101F2C(gOtherText_QuitGamePrompt); DisplayYesNoMenu(21, 7, 1); @@ -677,7 +736,7 @@ bool8 sub_8102318(struct Task *task) return FALSE; } -bool8 sub_8102344(struct Task *task) +static bool8 sub_8102344(struct Task *task) { s8 input = ProcessMenuInputNoWrap_(); if (input == 0) @@ -697,14 +756,14 @@ bool8 sub_8102344(struct Task *task) return FALSE; } -bool8 sub_810239C(struct Task *task) +static bool8 sub_810239C(struct Task *task) { sub_8101F2C(gOtherText_MaxCoins); eSlotMachine->state = 24; return FALSE; } -bool8 sub_81023B8(struct Task *task) +static bool8 sub_81023B8(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -714,14 +773,14 @@ bool8 sub_81023B8(struct Task *task) return FALSE; } -bool8 sub_81023E0(struct Task *task) +static bool8 sub_81023E0(struct Task *task) { sub_8101F2C(gOtherText_OutOfCoins); eSlotMachine->state = 26; return FALSE; } -bool8 sub_81023FC(struct Task *task) +static bool8 sub_81023FC(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -731,7 +790,7 @@ bool8 sub_81023FC(struct Task *task) return FALSE; } -bool8 sub_8102424(struct Task *task) +static bool8 sub_8102424(struct Task *task) { gSaveBlock1.coins = eSlotMachine->coins; BeginNormalPaletteFade(-1, 0, 0, 16, 0); @@ -739,7 +798,7 @@ bool8 sub_8102424(struct Task *task) return FALSE; } -bool8 sub_8102460(struct Task *task) +static bool8 sub_8102460(struct Task *task) { if (!gPaletteFade.active) { -- cgit v1.2.3 From 388a4cc729c84e334819db165eb5aab99233ee9c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 22:35:46 -0500 Subject: sub_8102540 --- asm/slot_machine.s | 136 ----------------------------------------------- include/slot_machine.h | 4 +- src/field/slot_machine.c | 98 ++++++++++++++++++++++++++++++---- 3 files changed, 92 insertions(+), 146 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 6552f3a7c..6a7775a2e 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,142 +5,6 @@ .text - thumb_func_start sub_8102484 -sub_8102484: @ 8102484 - push {r4,lr} - ldr r4, _081024E4 @ =gSharedMem - ldrb r0, [r4, 0xA] - cmp r0, 0 - bne _081024DC - ldrb r1, [r4, 0x4] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _081024DC - bl sub_8102540 - lsls r0, 24 - cmp r0, 0 - beq _081024C0 - bl sub_8102578 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - beq _081024C0 - ldr r1, _081024E8 @ =gUnknown_083ECE42 - lsls r0, r3, 1 - adds r0, r1 - ldrb r1, [r0] - ldrb r0, [r4, 0x4] - orrs r0, r1 - strb r0, [r4, 0x4] - cmp r3, 0x1 - bne _081024DC -_081024C0: - bl sub_81025BC - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x5 - beq _081024DC - ldr r2, _081024E4 @ =gSharedMem - ldr r1, _081024EC @ =gUnknown_083ECE48 - lsls r0, r3, 1 - adds r0, r1 - ldrb r1, [r0] - ldrb r0, [r2, 0x4] - orrs r0, r1 - strb r0, [r2, 0x4] -_081024DC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081024E4: .4byte gSharedMem -_081024E8: .4byte gUnknown_083ECE42 -_081024EC: .4byte gUnknown_083ECE48 - thumb_func_end sub_8102484 - - thumb_func_start sub_81024F0 -sub_81024F0: @ 81024F0 - push {lr} - ldr r1, _08102508 @ =gSharedMem - movs r0, 0 - strb r0, [r1, 0x6] - ldrb r0, [r1, 0x4] - cmp r0, 0 - beq _08102502 - movs r0, 0x1 - strb r0, [r1, 0x6] -_08102502: - pop {r0} - bx r0 - .align 2, 0 -_08102508: .4byte gSharedMem - thumb_func_end sub_81024F0 - - thumb_func_start sub_810250C -sub_810250C: @ 810250C - push {r4,lr} - lsls r0, 24 - lsrs r1, r0, 24 - movs r2, 0 - movs r3, 0x1 - ldr r4, _08102528 @ =gUnknown_083ECE3A -_08102518: - adds r0, r1, 0 - ands r0, r3 - cmp r0, 0 - beq _0810252C - adds r0, r2, r4 - ldrb r0, [r0] - b _0810253A - .align 2, 0 -_08102528: .4byte gUnknown_083ECE3A -_0810252C: - lsrs r1, 1 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x7 - bls _08102518 - movs r0, 0 -_0810253A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_810250C - - thumb_func_start sub_8102540 -sub_8102540: @ 8102540 - push {r4,lr} - bl Random - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08102568 @ =gUnknown_083ECD04 - ldr r1, _0810256C @ =gSharedMem - movs r3, 0x12 - ldrsh r2, [r1, r3] - ldrb r3, [r1, 0x1] - lsls r1, r3, 1 - adds r1, r3 - subs r1, 0x1 - adds r2, r1 - adds r2, r4 - ldrb r1, [r2] - cmp r1, r0 - bhi _08102570 - movs r0, 0 - b _08102572 - .align 2, 0 -_08102568: .4byte gUnknown_083ECD04 -_0810256C: .4byte gSharedMem -_08102570: - movs r0, 0x1 -_08102572: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8102540 - thumb_func_start sub_8102578 sub_8102578: @ 8102578 push {r4-r6,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 4dde64aa7..0e7efaf29 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -7,7 +7,9 @@ struct SlotMachineEwramStruct { /*0x02*/ u8 unk02; /*0x03*/ u8 unk03; /*0x04*/ u8 unk04; - /*0x05*/ u8 filler05[3]; + /*0x05*/ u8 unk05; + /*0x06*/ u8 unk06; + /*0x07*/ u8 unk07; /*0x08*/ u16 unk08; /*0x0A*/ u8 unk0A; /*0x0B*/ u8 unk0B; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 2bf8e9c97..b72c749d0 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -82,9 +82,11 @@ static bool8 sub_81023E0(struct Task *task); static bool8 sub_81023FC(struct Task *task); static bool8 sub_8102424(struct Task *task); static bool8 sub_8102460(struct Task *task); - -void sub_8102484(void); -void sub_81024F0(void); +static void sub_8102484(void); +static void sub_81024F0(void); +bool8 sub_8102540(void); +u8 sub_8102578(void); +u8 sub_81025BC(void); void sub_81027A0(void); void sub_8102A24(void); bool8 sub_8102A44(void); @@ -113,7 +115,7 @@ void sub_8104EA8(void); void sub_8104F8C(void); void sub_81050C4(void); void sub_81063C0(void); -void sub_8106448(void); +static void sub_8106448(void); void sub_81064B8(void); u16 dp15_jump_random_unknown(void); @@ -149,6 +151,11 @@ static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { sub_8102460 }; +extern const u8 gUnknown_083ECD04[][3]; +extern const u8 gUnknown_083ECE3A[]; +extern const u16 gUnknown_083ECE42[]; +extern const u16 gUnknown_083ECE48[]; + void PlaySlotMachine(u8 arg0, void *ptr) { sub_81019B0(arg0, ptr); @@ -807,6 +814,82 @@ static bool8 sub_8102460(struct Task *task) return FALSE; } +static void sub_8102484(void) +{ + u8 r3; + + if (eSlotMachine->unk0A == 0 && !(eSlotMachine->unk04 & 0xc0)) + { + if (sub_8102540()) + { + r3 = sub_8102578(); + if (r3 != 3) + { + eSlotMachine->unk04 |= gUnknown_083ECE42[r3]; + if (r3 != 1) + { + return; + } + } + } + r3 = sub_81025BC(); + if (r3 != 5) + { + eSlotMachine->unk04 |= gUnknown_083ECE48[r3]; + } + } +} + +static void sub_81024F0(void) +{ + eSlotMachine->unk06 = 0; + if (eSlotMachine->unk04) + { + eSlotMachine->unk06 = 1; + } +} + +u8 sub_810250C(u8 a0) +{ + u8 i; + + for (i = 0; i < 8; i++) + { + if (a0 & 1) + { + return gUnknown_083ECE3A[i]; + } + a0 >>= 1; + } + return 0; +} + +bool8 sub_8102540(void) +{ + u8 rval = Random(); + if (gUnknown_083ECD04[eSlotMachine->unk01][eSlotMachine->bet - 1] > rval) + { + return TRUE; + } + return FALSE; +} + +//extern const u8 gUnknown_083ECD16[][3]; +// +//u8 sub_8102578(void) +//{ +// s16 i; +// +// for (i = 0; i < 3; i++) +// { +// if ((Random() & 0xff) <= (int)gUnknown_083ECD16[i][eSlotMachine->unk01]) +// { +// break; +// } +// } +// return i; +//} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); @@ -820,8 +903,7 @@ void sub_8104CAC(u8 arg0) { task = &gTasks[eSlotMachine->unk3D]; task->data[1] = arg0; - i = 0; - while (gUnknown_083ED048[arg0][i].unk00 != 0xFF) + for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) { u8 spriteId; spriteId = sub_8105BB4( @@ -837,14 +919,12 @@ void sub_8104CAC(u8 arg0) { gSprites[spriteId].invisible = TRUE; } #endif - - i += 1; } } asm(".section .text_b"); -void sub_8106448(void) { +static void sub_8106448(void) { u32 offsetRead, offsetWrite; u32 size; -- cgit v1.2.3 From 56bf99fd9106b3cc8fac45cc051cbeeec40e34aa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 22 Dec 2017 08:37:19 -0500 Subject: Nonmatching sub_8102578 --- asm/slot_machine.s | 38 ------------------------ src/field/slot_machine.c | 75 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 56 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 6a7775a2e..a6201c22e 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,44 +5,6 @@ .text - thumb_func_start sub_8102578 -sub_8102578: @ 8102578 - push {r4-r6,lr} - movs r5, 0 - ldr r6, _081025B4 @ =gUnknown_083ECD16 -_0810257E: - bl Random - movs r2, 0xFF - ldr r3, _081025B8 @ =gSharedMem - lsls r1, r5, 16 - asrs r4, r1, 16 - lsls r1, r4, 1 - adds r1, r4 - lsls r1, 1 - ldrb r3, [r3, 0x1] - adds r1, r3 - adds r1, r6 - ldrb r1, [r1] - ands r2, r0 - cmp r1, r2 - bgt _081025AA - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _0810257E -_081025AA: - lsls r0, r5, 24 - lsrs r0, 24 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081025B4: .4byte gUnknown_083ECD16 -_081025B8: .4byte gSharedMem - thumb_func_end sub_8102578 - thumb_func_start sub_81025BC sub_81025BC: @ 81025BC push {r4-r7,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index b72c749d0..f6d58e592 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -84,8 +84,8 @@ static bool8 sub_8102424(struct Task *task); static bool8 sub_8102460(struct Task *task); static void sub_8102484(void); static void sub_81024F0(void); -bool8 sub_8102540(void); -u8 sub_8102578(void); +static bool8 sub_8102540(void); +static u8 sub_8102578(void); u8 sub_81025BC(void); void sub_81027A0(void); void sub_8102A24(void); @@ -864,7 +864,7 @@ u8 sub_810250C(u8 a0) return 0; } -bool8 sub_8102540(void) +static bool8 sub_8102540(void) { u8 rval = Random(); if (gUnknown_083ECD04[eSlotMachine->unk01][eSlotMachine->bet - 1] > rval) @@ -874,21 +874,60 @@ bool8 sub_8102540(void) return FALSE; } -//extern const u8 gUnknown_083ECD16[][3]; -// -//u8 sub_8102578(void) -//{ -// s16 i; -// -// for (i = 0; i < 3; i++) -// { -// if ((Random() & 0xff) <= (int)gUnknown_083ECD16[i][eSlotMachine->unk01]) -// { -// break; -// } -// } -// return i; -//} +extern const u8 gUnknown_083ECD16[][3]; + +#ifdef NONMATCHING +static u8 sub_8102578(void) +{ + s16 i; + + for (i = 0; i < 3; i++) + { + if ((Random() & 0xff) <= gUnknown_083ECD16[i][eSlotMachine->unk01]) + { + break; + } + } + return i; +} +#else +static __attribute__((naked)) u8 sub_8102578(void) +{ + asm_unified("\tpush {r4-r6,lr}\n" + "\tmovs r5, 0\n" + "\tldr r6, =gUnknown_083ECD16\n" + "_0810257E:\n" + "\tbl Random\n" + "\tmovs r2, 0xFF\n" + "\tldr r3, =gSharedMem\n" + "\tlsls r1, r5, 16\n" + "\tasrs r4, r1, 16\n" + "\tlsls r1, r4, 1\n" + "\tadds r1, r4\n" + "\tlsls r1, 1\n" + "\tldrb r3, [r3, 0x1]\n" + "\tadds r1, r3\n" + "\tadds r1, r6\n" + "\tldrb r1, [r1]\n" + "\tands r2, r0\n" + "\tcmp r1, r2\n" + "\tbgt _081025AA\n" + "\tadds r0, r4, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r5, r0, 16\n" + "\tasrs r0, 16\n" + "\tcmp r0, 0x2\n" + "\tble _0810257E\n" + "_081025AA:\n" + "\tlsls r0, r5, 24\n" + "\tlsrs r0, 24\n" + "\tpop {r4-r6}\n" + "\tpop {r1}\n" + "\tbx r1\n" + "\t.align 2, 0\n" + "\t.pool"); +} +#endif asm(".section .text_a"); -- cgit v1.2.3 From af86226a5b15ccf1d7d1fea2dc96ff6bba0dc5fc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 23 Dec 2017 19:51:07 -0500 Subject: sub_81025BC and matching sub_8102578 --- asm/slot_machine.s | 76 ------------------------------------------------ src/field/slot_machine.c | 75 +++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 115 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index a6201c22e..423735f9f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,82 +5,6 @@ .text - thumb_func_start sub_81025BC -sub_81025BC: @ 81025BC - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r6, 0 - ldr r0, _08102600 @ =gUnknown_083ECD28 - mov r8, r0 - ldr r5, _08102604 @ =gSharedMem - movs r7, 0x80 - lsls r7, 17 -_081025CE: - bl Random - movs r4, 0xFF - ands r4, r0 - lsls r2, r6, 16 - asrs r1, r2, 16 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - ldrb r3, [r5, 0x1] - adds r0, r3 - add r0, r8 - ldrb r3, [r0] - cmp r1, 0 - bne _08102608 - ldrb r0, [r5, 0x3] - cmp r0, 0x1 - bne _08102608 - adds r3, 0xA - asrs r0, r7, 16 - cmp r3, r0 - ble _08102622 - adds r3, r0, 0 - b _08102622 - .align 2, 0 -_08102600: .4byte gUnknown_083ECD28 -_08102604: .4byte gSharedMem -_08102608: - asrs r0, r2, 16 - cmp r0, 0x4 - bne _08102622 - ldrb r0, [r5, 0x3] - cmp r0, 0x1 - bne _08102622 - lsls r0, r3, 16 - ldr r1, _08102648 @ =0xfff60000 - adds r0, r1 - lsrs r3, r0, 16 - cmp r0, 0 - bge _08102622 - movs r3, 0 -_08102622: - lsls r0, r3, 16 - asrs r0, 16 - cmp r0, r4 - bgt _08102638 - movs r3, 0x80 - lsls r3, 9 - adds r0, r2, r3 - lsrs r6, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081025CE -_08102638: - lsls r0, r6, 24 - lsrs r0, 24 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08102648: .4byte 0xfff60000 - thumb_func_end sub_81025BC - thumb_func_start sub_810264C sub_810264C: @ 810264C push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index f6d58e592..08506a59f 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -874,60 +874,57 @@ static bool8 sub_8102540(void) return FALSE; } -extern const u8 gUnknown_083ECD16[][3]; +extern const u8 gUnknown_083ECD16[][6]; -#ifdef NONMATCHING static u8 sub_8102578(void) { s16 i; for (i = 0; i < 3; i++) { - if ((Random() & 0xff) <= gUnknown_083ECD16[i][eSlotMachine->unk01]) + s16 rval = Random() & 0xff; + s16 value = gUnknown_083ECD16[i][eSlotMachine->unk01]; + if (value > rval) { break; } } return i; } -#else -static __attribute__((naked)) u8 sub_8102578(void) + +extern const u8 gUnknown_083ECD28[][6]; + +u8 sub_81025BC(void) { - asm_unified("\tpush {r4-r6,lr}\n" - "\tmovs r5, 0\n" - "\tldr r6, =gUnknown_083ECD16\n" - "_0810257E:\n" - "\tbl Random\n" - "\tmovs r2, 0xFF\n" - "\tldr r3, =gSharedMem\n" - "\tlsls r1, r5, 16\n" - "\tasrs r4, r1, 16\n" - "\tlsls r1, r4, 1\n" - "\tadds r1, r4\n" - "\tlsls r1, 1\n" - "\tldrb r3, [r3, 0x1]\n" - "\tadds r1, r3\n" - "\tadds r1, r6\n" - "\tldrb r1, [r1]\n" - "\tands r2, r0\n" - "\tcmp r1, r2\n" - "\tbgt _081025AA\n" - "\tadds r0, r4, 0x1\n" - "\tlsls r0, 16\n" - "\tlsrs r5, r0, 16\n" - "\tasrs r0, 16\n" - "\tcmp r0, 0x2\n" - "\tble _0810257E\n" - "_081025AA:\n" - "\tlsls r0, r5, 24\n" - "\tlsrs r0, 24\n" - "\tpop {r4-r6}\n" - "\tpop {r1}\n" - "\tbx r1\n" - "\t.align 2, 0\n" - "\t.pool"); + s16 i; + + for (i = 0; i < 5; i++) + { + s16 rval = Random() & 0xff; + s16 r3 = gUnknown_083ECD28[i][eSlotMachine->unk01]; + if (i == 0 && eSlotMachine->unk03 == 1) + { + r3 += 10; + if (r3 > 0x100) + { + r3 = 0x100; + } + } + else if (i == 4 && eSlotMachine->unk03 == 1) + { + r3 -= 10; + if (r3 < 0) + { + r3 = 0; + } + } + if (r3 > rval) + { + break; + } + } + return i; } -#endif asm(".section .text_a"); -- cgit v1.2.3 From 9041e039a728f4d2cb7c4938eb5585441965952f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 23 Dec 2017 20:21:03 -0500 Subject: through sub_8102680 --- asm/slot_machine.s | 78 ------------------------------------------------ src/field/slot_machine.c | 35 +++++++++++++++++++++- 2 files changed, 34 insertions(+), 79 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 423735f9f..4d492fa2a 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,84 +5,6 @@ .text - thumb_func_start sub_810264C -sub_810264C: @ 810264C - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r3, _08102660 @ =gSharedMem - ldrb r0, [r3, 0x3] - cmp r0, 0 - beq _08102668 - ldr r0, _08102664 @ =gUnknown_083ECDAC - b _0810266A - .align 2, 0 -_08102660: .4byte gSharedMem -_08102664: .4byte gUnknown_083ECDAC -_08102668: - ldr r0, _0810267C @ =gUnknown_083ECD46 -_0810266A: - lsls r1, r2, 4 - adds r1, r2 - ldrb r3, [r3, 0x2] - adds r1, r3 - adds r1, r0 - ldrb r0, [r1] - pop {r1} - bx r1 - .align 2, 0 -_0810267C: .4byte gUnknown_083ECD46 - thumb_func_end sub_810264C - - thumb_func_start sub_8102680 -sub_8102680: @ 8102680 - push {r4-r6,lr} - ldr r1, _081026A4 @ =gSharedMem - movs r0, 0 - strb r0, [r1, 0x5] - bl Random - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0 - bl sub_810264C - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bcc _081026D2 - movs r6, 0x5 - b _081026AE - .align 2, 0 -_081026A4: .4byte gSharedMem -_081026A8: - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_081026AE: - lsls r0, r6, 16 - asrs r5, r0, 16 - cmp r5, 0 - ble _081026CE - bl Random - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r6, 24 - lsrs r0, 24 - bl sub_810264C - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bcs _081026A8 -_081026CE: - ldr r0, _081026D8 @ =gSharedMem - strb r6, [r0, 0x5] -_081026D2: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081026D8: .4byte gSharedMem - thumb_func_end sub_8102680 - thumb_func_start sub_81026DC sub_81026DC: @ 81026DC push {r4,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 08506a59f..cc8c28654 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -926,6 +926,40 @@ u8 sub_81025BC(void) return i; } +extern const u8 gUnknown_083ECDAC[][17]; +extern const u8 gUnknown_083ECD46[][17]; + +u8 sub_810264C(u8 a0) +{ + if (eSlotMachine->unk03 == 0) + { + return gUnknown_083ECD46[a0][eSlotMachine->unk02]; + } + return gUnknown_083ECDAC[a0][eSlotMachine->unk02]; +} + +void sub_8102680(void) +{ + u8 rval; + s16 i; + + eSlotMachine->unk05 = 0; + rval = Random(); + if (rval < sub_810264C(0)) + { + return; + } + for (i = 5; i > 0; i--) + { + rval = Random(); + if (rval < sub_810264C(i)) + { + break; + } + } + eSlotMachine->unk05 = i; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); @@ -957,7 +991,6 @@ void sub_8104CAC(u8 arg0) { #endif } } - asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From b66b2e49bea686c71b62f0f31470aef09b50a15d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 23 Dec 2017 21:12:07 -0500 Subject: through dp15_jump_random_unknown --- asm/slot_machine.s | 107 ----------------------------------------------- src/field/slot_machine.c | 51 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 107 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 4d492fa2a..dc97ee42f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,113 +5,6 @@ .text - thumb_func_start sub_81026DC -sub_81026DC: @ 81026DC - push {r4,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - bl Random - movs r1, 0xFF - ands r1, r0 - ldr r0, _081026FC @ =gUnknown_083ECE12 - lsls r4, 1 - adds r4, r0 - ldrh r4, [r4] - cmp r1, r4 - bcc _08102700 - movs r0, 0 - b _08102702 - .align 2, 0 -_081026FC: .4byte gUnknown_083ECE12 -_08102700: - movs r0, 0x1 -_08102702: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81026DC - - thumb_func_start dp15_jump_random_unknown -dp15_jump_random_unknown: @ 8102708 - push {r4,r5,lr} - movs r4, 0 - ldr r0, _0810271C @ =gSharedMem - movs r2, 0x10 - ldrsh r1, [r0, r2] - ldr r0, _08102720 @ =0x0000012b - cmp r1, r0 - ble _08102724 - movs r4, 0x4 - b _0810273A - .align 2, 0 -_0810271C: .4byte gSharedMem -_08102720: .4byte 0x0000012b -_08102724: - cmp r1, 0xF9 - ble _0810272C - movs r4, 0x3 - b _0810273A -_0810272C: - cmp r1, 0xC7 - ble _08102734 - movs r4, 0x2 - b _0810273A -_08102734: - cmp r1, 0x95 - ble _0810273A - movs r4, 0x1 -_0810273A: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x64 - bl __umodsi3 - lsls r0, 24 - lsrs r1, r0, 24 - ldr r5, _0810275C @ =gUnknown_083ECE1C - lsls r4, 2 - adds r0, r4, r5 - ldrb r0, [r0] - cmp r1, r0 - bcs _08102760 - movs r0, 0x4 - b _0810279A - .align 2, 0 -_0810275C: .4byte gUnknown_083ECE1C -_08102760: - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x64 - bl __umodsi3 - lsls r0, 24 - adds r2, r5, 0x2 - adds r2, r4, r2 - ldr r3, _08102790 @ =gUnknown_083ECE30 - ldr r1, _08102794 @ =gSharedMem - ldrb r1, [r1, 0xB] - lsls r1, 1 - adds r1, r3 - ldrb r1, [r1] - ldrb r2, [r2] - adds r1, r2 - lsls r1, 24 - cmp r0, r1 - bcc _08102798 - movs r0, 0x8 - b _0810279A - .align 2, 0 -_08102790: .4byte gUnknown_083ECE30 -_08102794: .4byte gSharedMem -_08102798: - movs r0, 0x2 -_0810279A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end dp15_jump_random_unknown - thumb_func_start sub_81027A0 sub_81027A0: @ 81027A0 push {r4,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index cc8c28654..be6c8746b 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -960,6 +960,57 @@ void sub_8102680(void) eSlotMachine->unk05 = i; } +extern const u16 gUnknown_083ECE12[]; + +bool8 sub_81026DC(u16 a0) +{ + u16 rval = Random() & 0xff; + if (rval < gUnknown_083ECE12[a0]) + { + return TRUE; + } + return FALSE; +} + +extern const u16 gUnknown_083ECE1C[][2]; +extern const u16 gUnknown_083ECE30[]; + +u16 dp15_jump_random_unknown(void) +{ + u8 r4 = 0; + u8 rval; + u8 value; + if (eSlotMachine->unk10 >= 300) + { + r4 = 4; + } + else if (eSlotMachine->unk10 >= 250) + { + r4 = 3; + } + else if (eSlotMachine->unk10 >= 200) + { + r4 = 2; + } + else if (eSlotMachine->unk10 >= 150) + { + r4 = 1; + } + rval = Random() % 100; + value = gUnknown_083ECE1C[r4][0]; + if (rval < value) + { + return 4; + } + rval = Random() % 100; + value = gUnknown_083ECE1C[r4][1] + gUnknown_083ECE30[eSlotMachine->unk0B]; + if (rval < value) + { + return 2; + } + return 8; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 482db3566086318c27d1accbe89a96e2f695de5b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 23 Dec 2017 21:33:46 -0500 Subject: sub_81027D0 --- asm/slot_machine.s | 80 ------------------------------------------------ src/field/slot_machine.c | 42 ++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 84 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index dc97ee42f..ea93063ea 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,86 +5,6 @@ .text - thumb_func_start sub_81027A0 -sub_81027A0: @ 81027A0 - push {r4,lr} - ldr r4, _081027CC @ =gSharedMem - movs r0, 0 - strh r0, [r4, 0x8] - bl sub_81027D0 - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - ble _081027B8 - bl sub_8102840 -_081027B8: - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0x2 - ble _081027C4 - bl sub_810290C -_081027C4: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081027CC: .4byte gSharedMem - thumb_func_end sub_81027A0 - - thumb_func_start sub_81027D0 -sub_81027D0: @ 81027D0 - push {r4,r5,lr} - movs r0, 0 - movs r1, 0x2 - bl sub_8102BA4 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - movs r0, 0x1 - movs r1, 0x2 - bl sub_8102BA4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x2 - movs r1, 0x2 - bl sub_8102BA4 - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_81029D4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9 - beq _0810282E - ldr r2, _08102834 @ =gSharedMem - ldr r0, _08102838 @ =gUnknown_083ECE6C - lsls r1, 1 - adds r0, r1, r0 - ldrh r0, [r0] - ldrh r3, [r2, 0xE] - adds r0, r3 - strh r0, [r2, 0xE] - ldr r0, _0810283C @ =gUnknown_083ECE5A - adds r1, r0 - ldrh r0, [r2, 0x8] - ldrh r1, [r1] - orrs r0, r1 - strh r0, [r2, 0x8] - movs r0, 0 - bl sub_8103E04 -_0810282E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08102834: .4byte gSharedMem -_08102838: .4byte gUnknown_083ECE6C -_0810283C: .4byte gUnknown_083ECE5A - thumb_func_end sub_81027D0 - thumb_func_start sub_8102840 sub_8102840: @ 8102840 push {r4,r5,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index be6c8746b..2e47317a5 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -86,10 +86,16 @@ static void sub_8102484(void); static void sub_81024F0(void); static bool8 sub_8102540(void); static u8 sub_8102578(void); -u8 sub_81025BC(void); -void sub_81027A0(void); +u16 dp15_jump_random_unknown(void); +static u8 sub_81025BC(void); +static void sub_81027A0(void); +void sub_81027D0(void); +void sub_8102840(void); +void sub_810290C(void); +u8 sub_81029D4(u8 a0, u8 a1, u8 a2); void sub_8102A24(void); bool8 sub_8102A44(void); +u8 sub_8102BA4(u8 a0, u8 a1); void sub_8102DA8(void); void sub_8102DEC(u8 a0); void sub_8102E1C(u8 a0); @@ -98,6 +104,7 @@ void sub_8103C14(u8 a0); void sub_8103D50(u8 a0); void sub_8103D8C(u8 a0); void sub_8103DC8(void); +void sub_8103E04(u8 a0); void sub_8103F70(void); bool8 sub_8103FA0(void); void sub_8104048(void); @@ -117,7 +124,6 @@ void sub_81050C4(void); void sub_81063C0(void); static void sub_8106448(void); void sub_81064B8(void); -u16 dp15_jump_random_unknown(void); static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { sub_8101D5C, @@ -894,7 +900,7 @@ static u8 sub_8102578(void) extern const u8 gUnknown_083ECD28[][6]; -u8 sub_81025BC(void) +static u8 sub_81025BC(void) { s16 i; @@ -1011,6 +1017,34 @@ u16 dp15_jump_random_unknown(void) return 8; } +static void sub_81027A0(void) +{ + eSlotMachine->unk08 = 0; + sub_81027D0(); + if (eSlotMachine->bet > 1) + { + sub_8102840(); + } + if (eSlotMachine->bet > 2) + { + sub_810290C(); + } +} + +extern const u16 gUnknown_083ECE6C[]; +extern const u16 gUnknown_083ECE5A[]; + +void sub_81027D0(void) +{ + u8 payout = sub_81029D4(sub_8102BA4(0, 2), sub_8102BA4(1, 2), sub_8102BA4(2, 2)); + if (payout != 9) + { + eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; + eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + sub_8103E04(0); + } +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 64c3afb438eb712cca11a374d0025bf3492ccb82 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 24 Dec 2017 20:48:44 -0500 Subject: through sub_810290C --- asm/slot_machine.s | 194 ----------------------------------------------- src/field/slot_machine.c | 73 +++++++++++++++++- 2 files changed, 72 insertions(+), 195 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index ea93063ea..e15bd0b0f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,200 +5,6 @@ .text - thumb_func_start sub_8102840 -sub_8102840: @ 8102840 - push {r4,r5,lr} - movs r0, 0 - movs r1, 0x1 - bl sub_8102BA4 - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x1 - movs r1, 0x1 - bl sub_8102BA4 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x2 - movs r1, 0x1 - bl sub_8102BA4 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_81029D4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9 - beq _0810289E - cmp r1, 0 - bne _0810287C - movs r1, 0x1 -_0810287C: - ldr r2, _08102900 @ =gSharedMem - ldr r0, _08102904 @ =gUnknown_083ECE6C - lsls r1, 1 - adds r0, r1, r0 - ldrh r0, [r0] - ldrh r3, [r2, 0xE] - adds r0, r3 - strh r0, [r2, 0xE] - ldr r0, _08102908 @ =gUnknown_083ECE5A - adds r1, r0 - ldrh r0, [r2, 0x8] - ldrh r1, [r1] - orrs r0, r1 - strh r0, [r2, 0x8] - movs r0, 0x1 - bl sub_8103E04 -_0810289E: - movs r0, 0 - movs r1, 0x3 - bl sub_8102BA4 - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x1 - movs r1, 0x3 - bl sub_8102BA4 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x2 - movs r1, 0x3 - bl sub_8102BA4 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_81029D4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9 - beq _081028FA - cmp r1, 0 - bne _081028D8 - movs r1, 0x1 -_081028D8: - ldr r2, _08102900 @ =gSharedMem - ldr r0, _08102904 @ =gUnknown_083ECE6C - lsls r1, 1 - adds r0, r1, r0 - ldrh r0, [r0] - ldrh r3, [r2, 0xE] - adds r0, r3 - strh r0, [r2, 0xE] - ldr r0, _08102908 @ =gUnknown_083ECE5A - adds r1, r0 - ldrh r0, [r2, 0x8] - ldrh r1, [r1] - orrs r0, r1 - strh r0, [r2, 0x8] - movs r0, 0x2 - bl sub_8103E04 -_081028FA: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08102900: .4byte gSharedMem -_08102904: .4byte gUnknown_083ECE6C -_08102908: .4byte gUnknown_083ECE5A - thumb_func_end sub_8102840 - - thumb_func_start sub_810290C -sub_810290C: @ 810290C - push {r4,r5,lr} - movs r0, 0 - movs r1, 0x1 - bl sub_8102BA4 - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x1 - movs r1, 0x2 - bl sub_8102BA4 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x2 - movs r1, 0x3 - bl sub_8102BA4 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_81029D4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9 - beq _08102968 - cmp r1, 0 - beq _08102962 - ldr r2, _081029C8 @ =gSharedMem - ldr r0, _081029CC @ =gUnknown_083ECE6C - lsls r1, 1 - adds r0, r1, r0 - ldrh r0, [r0] - ldrh r3, [r2, 0xE] - adds r0, r3 - strh r0, [r2, 0xE] - ldr r0, _081029D0 @ =gUnknown_083ECE5A - adds r1, r0 - ldrh r0, [r2, 0x8] - ldrh r1, [r1] - orrs r0, r1 - strh r0, [r2, 0x8] -_08102962: - movs r0, 0x3 - bl sub_8103E04 -_08102968: - movs r0, 0 - movs r1, 0x3 - bl sub_8102BA4 - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x1 - movs r1, 0x2 - bl sub_8102BA4 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x2 - movs r1, 0x1 - bl sub_8102BA4 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_81029D4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x9 - beq _081029C2 - cmp r1, 0 - beq _081029BC - ldr r2, _081029C8 @ =gSharedMem - ldr r0, _081029CC @ =gUnknown_083ECE6C - lsls r1, 1 - adds r0, r1, r0 - ldrh r0, [r0] - ldrh r3, [r2, 0xE] - adds r0, r3 - strh r0, [r2, 0xE] - ldr r0, _081029D0 @ =gUnknown_083ECE5A - adds r1, r0 - ldrh r0, [r2, 0x8] - ldrh r1, [r1] - orrs r0, r1 - strh r0, [r2, 0x8] -_081029BC: - movs r0, 0x4 - bl sub_8103E04 -_081029C2: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081029C8: .4byte gSharedMem -_081029CC: .4byte gUnknown_083ECE6C -_081029D0: .4byte gUnknown_083ECE5A - thumb_func_end sub_810290C - thumb_func_start sub_81029D4 sub_81029D4: @ 81029D4 push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 2e47317a5..0a1ab8bb1 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1036,7 +1036,12 @@ extern const u16 gUnknown_083ECE5A[]; void sub_81027D0(void) { - u8 payout = sub_81029D4(sub_8102BA4(0, 2), sub_8102BA4(1, 2), sub_8102BA4(2, 2)); + u8 c1, c2, c3, payout; + + c1 = sub_8102BA4(0, 2); + c2 = sub_8102BA4(1, 2); + c3 = sub_8102BA4(2, 2); + payout = sub_81029D4(c1, c2, c3); if (payout != 9) { eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; @@ -1045,6 +1050,72 @@ void sub_81027D0(void) } } +void sub_8102840(void) +{ + u8 c1, c2, c3, payout; + + c1 = sub_8102BA4(0, 1); + c2 = sub_8102BA4(1, 1); + c3 = sub_8102BA4(2, 1); + payout = sub_81029D4(c1, c2, c3); + if (payout != 9) + { + if (payout == 0) + { + payout = 1; + } + eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; + eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + sub_8103E04(1); + } + c1 = sub_8102BA4(0, 3); + c2 = sub_8102BA4(1, 3); + c3 = sub_8102BA4(2, 3); + payout = sub_81029D4(c1, c2, c3); + if (payout != 9) + { + if (payout == 0) + { + payout = 1; + } + eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; + eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + sub_8103E04(2); + } +} + +void sub_810290C(void) +{ + u8 c1, c2, c3, payout; + + c1 = sub_8102BA4(0, 1); + c2 = sub_8102BA4(1, 2); + c3 = sub_8102BA4(2, 3); + payout = sub_81029D4(c1, c2, c3); + if (payout != 9) + { + if (payout != 0) + { + eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; + eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + } + sub_8103E04(3); + } + c1 = sub_8102BA4(0, 3); + c2 = sub_8102BA4(1, 2); + c3 = sub_8102BA4(2, 1); + payout = sub_81029D4(c1, c2, c3); + if (payout != 9) + { + if (payout != 0) + { + eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; + eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + } + sub_8103E04(4); + } +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 7d311d0f747dc5c7c194f436d1b90181bee3cc66 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 24 Dec 2017 21:42:08 -0500 Subject: through sub_8102BA4 --- asm/slot_machine.s | 300 ----------------------------------------------- include/slot_machine.h | 2 +- src/field/slot_machine.c | 121 ++++++++++++++++++- 3 files changed, 121 insertions(+), 302 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index e15bd0b0f..1159eb897 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,306 +5,6 @@ .text - thumb_func_start sub_81029D4 -sub_81029D4: @ 81029D4 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - cmp r3, r1 - bne _081029F8 - cmp r3, r2 - bne _081029F8 - ldr r0, _081029F4 @ =gUnknown_083ECE52 - adds r0, r3, r0 - ldrb r0, [r0] - b _08102A1E - .align 2, 0 -_081029F4: .4byte gUnknown_083ECE52 -_081029F8: - cmp r3, 0 - bne _08102A04 - cmp r1, 0 - bne _08102A04 - cmp r2, 0x1 - beq _08102A10 -_08102A04: - cmp r3, 0x1 - bne _08102A14 - cmp r1, 0x1 - bne _08102A14 - cmp r2, 0 - bne _08102A14 -_08102A10: - movs r0, 0x6 - b _08102A1E -_08102A14: - cmp r3, 0x4 - beq _08102A1C - movs r0, 0x9 - b _08102A1E -_08102A1C: - movs r0, 0 -_08102A1E: - pop {r1} - bx r1 - thumb_func_end sub_81029D4 - - thumb_func_start sub_8102A24 -sub_8102A24: @ 8102A24 - push {r4,lr} - ldr r4, _08102A40 @ =sub_8102A64 - adds r0, r4, 0 - movs r1, 0x4 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - bl _call_via_r4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08102A40: .4byte sub_8102A64 - thumb_func_end sub_8102A24 - - thumb_func_start sub_8102A44 -sub_8102A44: @ 8102A44 - push {lr} - ldr r0, _08102A58 @ =sub_8102A64 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08102A5C - movs r0, 0 - b _08102A5E - .align 2, 0 -_08102A58: .4byte sub_8102A64 -_08102A5C: - movs r0, 0x1 -_08102A5E: - pop {r1} - bx r1 - thumb_func_end sub_8102A44 - - thumb_func_start sub_8102A64 -sub_8102A64: @ 8102A64 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, _08102A94 @ =gUnknown_083ECB20 - ldr r2, _08102A98 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08102A76: - 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 _08102A76 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08102A94: .4byte gUnknown_083ECB20 -_08102A98: .4byte gTasks - thumb_func_end sub_8102A64 - - thumb_func_start sub_8102A9C -sub_8102A9C: @ 8102A9C - push {r4,lr} - adds r4, r0, 0 - bl sub_8103E38 - lsls r0, 24 - cmp r0, 0 - beq _08102AC8 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - ldr r0, _08102AC4 @ =gSharedMem - movs r1, 0xE - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08102AC8 - movs r0, 0x2 - strh r0, [r4, 0x8] - movs r0, 0x1 - b _08102ACA - .align 2, 0 -_08102AC4: .4byte gSharedMem -_08102AC8: - movs r0, 0 -_08102ACA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8102A9C - - thumb_func_start sub_8102AD0 -sub_8102AD0: @ 8102AD0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _08102B22 - bl IsFanfareTaskInactive - lsls r0, 24 - cmp r0, 0 - beq _08102AF6 - movs r0, 0x15 - bl PlaySE -_08102AF6: - ldr r2, _08102B70 @ =gSharedMem - ldrh r0, [r2, 0xE] - subs r0, 0x1 - strh r0, [r2, 0xE] - ldrh r3, [r2, 0xC] - movs r0, 0xC - ldrsh r1, [r2, r0] - ldr r0, _08102B74 @ =0x0000270e - cmp r1, r0 - bgt _08102B0E - adds r0, r3, 0x1 - strh r0, [r2, 0xC] -_08102B0E: - movs r0, 0x8 - strh r0, [r4, 0xA] - ldr r0, _08102B78 @ =gMain - ldrh r1, [r0, 0x2C] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08102B22 - movs r0, 0x4 - strh r0, [r4, 0xA] -_08102B22: - bl IsFanfareTaskInactive - lsls r0, 24 - cmp r0, 0 - beq _08102B58 - ldr r0, _08102B78 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _08102B58 - movs r0, 0x15 - bl PlaySE - ldr r1, _08102B70 @ =gSharedMem - ldrh r0, [r1, 0xE] - ldrh r2, [r1, 0xC] - adds r0, r2 - strh r0, [r1, 0xC] - lsls r0, 16 - asrs r0, 16 - ldr r2, _08102B7C @ =0x0000270f - cmp r0, r2 - ble _08102B54 - strh r2, [r1, 0xC] -_08102B54: - movs r0, 0 - strh r0, [r1, 0xE] -_08102B58: - ldr r0, _08102B70 @ =gSharedMem - movs r1, 0xE - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08102B68 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08102B68: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08102B70: .4byte gSharedMem -_08102B74: .4byte 0x0000270e -_08102B78: .4byte gMain -_08102B7C: .4byte 0x0000270f - thumb_func_end sub_8102AD0 - - thumb_func_start sub_8102B80 -sub_8102B80: @ 8102B80 - push {lr} - bl sub_8103E7C - lsls r0, 24 - cmp r0, 0 - beq _08102B9A - ldr r0, _08102BA0 @ =sub_8102A64 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_08102B9A: - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08102BA0: .4byte sub_8102A64 - thumb_func_end sub_8102B80 - - thumb_func_start sub_8102BA4 -sub_8102BA4: @ 8102BA4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r0, _08102BF0 @ =gSharedMem - lsls r2, r4, 1 - adds r0, 0x28 - adds r2, r0 - movs r3, 0 - ldrsh r0, [r2, r3] - lsls r1, 16 - asrs r1, 16 - adds r0, r1 - movs r1, 0x15 - bl __modsi3 - lsls r0, 16 - lsrs r1, r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08102BD4 - adds r0, 0x15 - lsls r0, 16 - lsrs r1, r0, 16 -_08102BD4: - ldr r2, _08102BF4 @ =gUnknown_083ECCB2 - lsls r1, 16 - asrs r1, 16 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 2 - adds r0, r4 - adds r1, r0 - adds r1, r2 - ldrb r0, [r1] - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08102BF0: .4byte gSharedMem -_08102BF4: .4byte gUnknown_083ECCB2 - thumb_func_end sub_8102BA4 - thumb_func_start sub_8102BF8 sub_8102BF8: @ 8102BF8 push {r4-r6,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 0e7efaf29..738866318 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -14,7 +14,7 @@ struct SlotMachineEwramStruct { /*0x0A*/ u8 unk0A; /*0x0B*/ u8 unk0B; /*0x0C*/ s16 coins; - /*0x0E*/ u16 unk0E; + /*0x0E*/ s16 unk0E; /*0x10*/ s16 unk10; /*0x12*/ s16 bet; /*0x14*/ u8 filler14[4]; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 0a1ab8bb1..bd259129d 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -95,7 +95,7 @@ void sub_810290C(void); u8 sub_81029D4(u8 a0, u8 a1, u8 a2); void sub_8102A24(void); bool8 sub_8102A44(void); -u8 sub_8102BA4(u8 a0, u8 a1); +u8 sub_8102BA4(u8 a0, s16 a1); void sub_8102DA8(void); void sub_8102DEC(u8 a0); void sub_8102E1C(u8 a0); @@ -105,6 +105,8 @@ void sub_8103D50(u8 a0); void sub_8103D8C(u8 a0); void sub_8103DC8(void); void sub_8103E04(u8 a0); +bool8 sub_8103E38(void); +bool8 sub_8103E7C(void); void sub_8103F70(void); bool8 sub_8103FA0(void); void sub_8104048(void); @@ -1116,6 +1118,123 @@ void sub_810290C(void) } } +extern const u8 gUnknown_083ECE52[]; + +u8 sub_81029D4(u8 c1, u8 c2, u8 c3) +{ + if (c1 == c2 && c1 == c3) + { + return gUnknown_083ECE52[c1]; + } + if (c1 == 0 && c2 == 0 && c3 == 1) + { + return 6; + } + if (c1 == 1 && c2 == 1 && c3 == 0) + { + return 6; + } + if (c1 == 4) + { + return 0; + } + return 9; +} + +void sub_8102A64(u8 taskId); + +void sub_8102A24(void) +{ + sub_8102A64(CreateTask(sub_8102A64, 4)); +} + +bool8 sub_8102A44(void) +{ + if (FindTaskIdByFunc(sub_8102A64) == 0xff) + { + return TRUE; + } + return FALSE; +} + +extern bool8 (*const gUnknown_083ECB20[])(struct Task *task); + +void sub_8102A64(u8 taskId) +{ + while (gUnknown_083ECB20[gTasks[taskId].data[0]](gTasks + taskId)); +} + +bool8 sub_8102A9C(struct Task *task) +{ + if (sub_8103E38()) + { + task->data[0]++; + if (eSlotMachine->unk0E == 0) + { + task->data[0] = 2; + return TRUE; + } + } + return FALSE; +} + +bool8 sub_8102AD0(struct Task *task) +{ + if (!task->data[1]--) + { + if (IsFanfareTaskInactive()) + { + PlaySE(SE_PIN); + } + eSlotMachine->unk0E--; + if (eSlotMachine->coins < 9999) + { + eSlotMachine->coins++; + } + task->data[1] = 8; + if (gMain.heldKeys & A_BUTTON) + { + task->data[1] = 4; + } + } + if (IsFanfareTaskInactive() && gMain.newKeys & START_BUTTON) + { + PlaySE(SE_PIN); + eSlotMachine->coins += eSlotMachine->unk0E; + if (eSlotMachine->coins > 9999) + { + eSlotMachine->coins = 9999; + } + eSlotMachine->unk0E = 0; + } + if (eSlotMachine->unk0E == 0) + { + task->data[0]++; + } + return FALSE; +} + +bool8 sub_8102B80(struct Task *task) +{ + if (sub_8103E7C()) + { + DestroyTask(FindTaskIdByFunc(sub_8102A64)); + } + return FALSE; +} + +extern const u8 gUnknown_083ECCB2[][21]; + +u8 sub_8102BA4(u8 x, s16 y) +{ + s16 offset = (eSlotMachine->unk28[x] + y) % 21; + if (offset < 0) + { + offset += 21; + } + return gUnknown_083ECCB2[x][offset]; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From ef9b0680653a5291b168b22b8ed0d273b6b1febe Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 25 Dec 2017 20:57:12 -0600 Subject: move easy_chat.c out of field/ --- ld_script.txt | 2 +- src/easy_chat.c | 445 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/field/easy_chat.c | 445 -------------------------------------------------- 3 files changed, 446 insertions(+), 446 deletions(-) create mode 100644 src/easy_chat.c delete mode 100644 src/field/easy_chat.c diff --git a/ld_script.txt b/ld_script.txt index 07334bd2c..f0520d1e9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -303,7 +303,7 @@ SECTIONS { asm/battle_intro.o(.text); src/field/bike.o(.text); asm/easy_chat.o(.text); - src/field/easy_chat.o(.text); + src/easy_chat.o(.text); src/pokenav_before.o(.text); asm/pokenav.o(.text); src/pokenav_after.o(.text); diff --git a/src/easy_chat.c b/src/easy_chat.c new file mode 100644 index 000000000..1dce5863e --- /dev/null +++ b/src/easy_chat.c @@ -0,0 +1,445 @@ +#include "global.h" +#include "easy_chat.h" +#include "constants/easy_chat.h" +#include "data2.h" +#include "event_data.h" +#include "field_message_box.h" +#include "pokedex.h" +#include "random.h" +#include "string_util.h" +#include "strings.h" +#include "strings2.h" +#include "text.h" + +static bool8 sub_80EB680(u16 *, u16, u16, u16); +static u16 sub_80EB9D8(void); +static u16 sub_80EB960(void); + +extern void *gEasyChatGroupWords[]; +extern const u8 gEasyChatGroupSizes[]; + +extern u16 gSpecialVar_0x8004; + +IWRAM_DATA u8 gUnknown_03000740; + +// returns the end of the destination buffer text +u8 *EasyChat_GetWordText(u8 *dst, u16 word) +{ + u16 group; + u16 wordIndex; + u8 *src; + u16 i; + + if (sub_80EB37C(word)) + return StringCopy(dst, gOtherText_ThreeQuestions); + + if (word == 0xFFFF) + { + *dst = EOS; + return dst; + } + else + { + group = EC_GROUP(word); + wordIndex = EC_INDEX(word); + switch (group) + { + case EC_GROUP_POKEMON: // 0 + case EC_GROUP_POKEMON_2: // 21 + dst = StringCopy(dst, gSpeciesNames[wordIndex]); + break; + case EC_GROUP_MOVE_1: // 18 + case EC_GROUP_MOVE_2: // 19 + dst = StringCopy(dst, gMoveNames[wordIndex]); + break; + default: + src = gEasyChatGroupWords[group]; + for (i = wordIndex - 1; i != 0xFFFF; i--) + { + while (*src++ != EOS) + ; + } + dst = StringCopy(dst, src); + break; + } + *dst = EOS; + return dst; + } +} + +u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3) +{ + u16 i; + u16 n; + + const u16 i1 = arg2 - 1; + + for (i = 0; i < arg3; i++) + { + u16 word; + + for (n = 0; n < i1; n++) + { + dst = EasyChat_GetWordText(dst, words[0]); + + if (words[0] != 0xFFFF) + { + dst[0] = CHAR_SPACE; + dst++; + } + + words++; + } + + word = words[0]; + words++; + dst = EasyChat_GetWordText(dst, word); + + dst[0] = CHAR_NEWLINE; + dst++; + } + + dst--; + dst[0] = EOS; + + return dst; +} + +u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3) +{ + u16 i; + u16 n; + + const u16 i1 = arg2 - 1; + + for (i = 0; i < arg3; i++) + { + u16 word; + + for (n = 0; n < i1; n++) + { + dst = EasyChat_GetWordText(dst, words[0]); + + if (words[0] != 0xFFFF) + { + dst[0] = CHAR_SPACE; + dst++; + } + + words++; + } + + word = words[0]; + words++; + dst = EasyChat_GetWordText(dst, word); + + // Only difference with ConvertEasyChatWordsToString + dst[0] = (i == 0) ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL; + dst++; + } + + dst--; + dst[0] = EOS; + + return dst; +} + + +u16 unref_sub_80EB5E0(u16 arg0) +{ + const u8 *chars; + u16 i; + u16 length; + int group, word; + + + if (arg0 == 0xFFFF) + return 0; + + group = EC_GROUP(arg0); + word = EC_INDEX(arg0); + switch (group) + { + case EC_GROUP_POKEMON: // 0 + case EC_GROUP_POKEMON_2: // 21 + chars = gSpeciesNames[word]; + break; + case EC_GROUP_MOVE_1: // 18 + case EC_GROUP_MOVE_2: // 19 + chars = gMoveNames[word]; + break; + default: + chars = gEasyChatGroupWords[group]; + for (i = word - 1; i != 0xFFFF; i--) + { + while (*chars++ != EOS) + ; + } + break; + } + + length = 0; + while (*chars != EOS) + { + chars++; + length++; + } + + return length; +} + +static bool8 sub_80EB680(u16 *arg0, u16 arg1, u16 arg2, u16 arg3) +{ + return FALSE; +} + +void unref_sub_80EB684(u8 arg0, u16 arg1) +{ + u16 *ptr; + u16 c; + + // FIXME: find actual tv shows used + switch (arg0) + { + case 5: + c = 6; + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x04); + break; + case 7: + c = 2; + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x1C); + break; + case 8: + c = 1; + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x02); + break; + default: + return; + } + + c -= 1; + while (c != 0xFFFF) + { + *ptr = -1; + ptr++; + c -= 1; + } +} + +void sub_80EB6FC(u16 *arg0, u16 arg1) +{ + u16 i; + + for (i = arg1 - 1; i != 0xFFFF; i--) + { + *arg0 = 0xFFFF; + arg0++; + } + +} + +u16 sub_80EB72C(u16 group) +{ + u16 local1 = Random() % gEasyChatGroupSizes[group]; + + if (group == EC_GROUP_POKEMON + || group == EC_GROUP_POKEMON_2 + || group == EC_GROUP_MOVE_1 + || group == EC_GROUP_MOVE_2) + { + local1 = ((u16 *) gEasyChatGroupWords[group])[local1]; + } + + return ((group & 0x7F) << 9) | (local1 & 0x1FF); +} + +u16 sub_80EB784(u16 group) +{ + if (!sub_80EAD7C(group)) + return -1; + + if (group != EC_GROUP_POKEMON) + { + if (group == EC_GROUP_TRENDY_SAYING) + return sub_80EB960(); + } + else + { + return sub_80EB9D8(); + } + + return sub_80EB72C(group); +} + +void sub_80EB7C4(void) +{ + u16 *words; + u16 arg1, arg2; + + switch (gSpecialVar_0x8004) + { + case 0: + words = gSaveBlock1.easyChats.unk2B1C; + arg1 = 2; + arg2 = 2; + break; + case 1: + words = gSaveBlock1.easyChats.unk2B28; + if (sub_80EB680(gSaveBlock1.easyChats.unk2B28, 3, 2, 20)) + { + arg1 = 2; + arg2 = 3; + } + else + { + arg1 = 3; + arg2 = 2; + } + break; + case 2: + words = gSaveBlock1.easyChats.unk2B34; + arg1 = 3; + arg2 = 2; + break; + case 3: + words = gSaveBlock1.easyChats.unk2B40; + arg1 = 3; + arg2 = 2; + break; + default: + return; + } + + ConvertEasyChatWordsToString(gStringVar4, words, arg1, arg2); + ShowFieldAutoScrollMessage(gStringVar4); +} + +void sub_80EB83C(void) +{ + u16 group, local2; + + if (Random() & 1) + group = EC_GROUP_HOBBIES; + else + group = EC_GROUP_LIFESTYLE; + + local2 = sub_80EB784(group); + EasyChat_GetWordText(gStringVar2, local2); +} + +u8 sub_80EB868(u8 arg0) +{ + int offset; + int index; + + index = arg0 / 8; + offset = arg0 % 8; + return (gSaveBlock1.unk2D8C[index] >> offset) & 1; +} + +void sub_80EB890(u8 arg0) +{ + int offset; + int index; + + if (arg0 < 33) + { + index = arg0 / 8; + offset = arg0 % 8; + gSaveBlock1.unk2D8C[index] |= 1 << offset; + } +} + +u8 sub_80EB8C0(void) +{ + u8 i, count; + + for (i = 0, count = 0; i < 33; i++) + { + if (sub_80EB868(i)) + count++; + } + return count; +} + +u16 sub_80EB8EC(void) +{ + u16 i; + u16 local1, local2; + + local1 = sub_80EB8C0(); + if (local1 == 33) + return -1; + + local2 = Random() % (33 - local1); + for (i = 0; i < 33; i++) + { + if (sub_80EB868(i) == 0) + { + if (local2 == 0) + { + sub_80EB890(i); + return (i & 0x1FF) | 0x2800; + } + local2--; + } + } + return -1; +} + +static u16 sub_80EB960(void) +{ + u16 i; + u16 local1; + + local1 = sub_80EB8C0(); + if (local1 == 0) + return -1; + + local1 = Random() % local1; + for (i = 0; i < 33; i++) + { + if (sub_80EB868(i)) + { + if (local1 == 0) + return (i & 0x1FF) | 0x2800; + local1--; + } + } + + return -1; +} + +u8 sub_80EB9C8(void) +{ + return IsNationalPokedexEnabled(); +} + +static u16 sub_80EB9D8(void) +{ + u16 *speciesList; + u16 local1; + u16 i; + + local1 = sub_80EAE88(0); + + if (local1 == 0) + return -1; + + local1 = Random() % local1; + speciesList = (u16 *) gEasyChatGroupWords[EC_GROUP_POKEMON]; + for (i = 0; i < gEasyChatGroupSizes[EC_GROUP_POKEMON]; i++) + { + const u16 dexNum = SpeciesToNationalPokedexNum(*speciesList); + const u8 local2 = GetSetPokedexFlag(dexNum, 0); + + if (local2) + { + if (local1 == 0) + return *speciesList & 0x1FF; + local1--; + } + speciesList++; + } + return -1; +} diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c deleted file mode 100644 index 1dce5863e..000000000 --- a/src/field/easy_chat.c +++ /dev/null @@ -1,445 +0,0 @@ -#include "global.h" -#include "easy_chat.h" -#include "constants/easy_chat.h" -#include "data2.h" -#include "event_data.h" -#include "field_message_box.h" -#include "pokedex.h" -#include "random.h" -#include "string_util.h" -#include "strings.h" -#include "strings2.h" -#include "text.h" - -static bool8 sub_80EB680(u16 *, u16, u16, u16); -static u16 sub_80EB9D8(void); -static u16 sub_80EB960(void); - -extern void *gEasyChatGroupWords[]; -extern const u8 gEasyChatGroupSizes[]; - -extern u16 gSpecialVar_0x8004; - -IWRAM_DATA u8 gUnknown_03000740; - -// returns the end of the destination buffer text -u8 *EasyChat_GetWordText(u8 *dst, u16 word) -{ - u16 group; - u16 wordIndex; - u8 *src; - u16 i; - - if (sub_80EB37C(word)) - return StringCopy(dst, gOtherText_ThreeQuestions); - - if (word == 0xFFFF) - { - *dst = EOS; - return dst; - } - else - { - group = EC_GROUP(word); - wordIndex = EC_INDEX(word); - switch (group) - { - case EC_GROUP_POKEMON: // 0 - case EC_GROUP_POKEMON_2: // 21 - dst = StringCopy(dst, gSpeciesNames[wordIndex]); - break; - case EC_GROUP_MOVE_1: // 18 - case EC_GROUP_MOVE_2: // 19 - dst = StringCopy(dst, gMoveNames[wordIndex]); - break; - default: - src = gEasyChatGroupWords[group]; - for (i = wordIndex - 1; i != 0xFFFF; i--) - { - while (*src++ != EOS) - ; - } - dst = StringCopy(dst, src); - break; - } - *dst = EOS; - return dst; - } -} - -u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3) -{ - u16 i; - u16 n; - - const u16 i1 = arg2 - 1; - - for (i = 0; i < arg3; i++) - { - u16 word; - - for (n = 0; n < i1; n++) - { - dst = EasyChat_GetWordText(dst, words[0]); - - if (words[0] != 0xFFFF) - { - dst[0] = CHAR_SPACE; - dst++; - } - - words++; - } - - word = words[0]; - words++; - dst = EasyChat_GetWordText(dst, word); - - dst[0] = CHAR_NEWLINE; - dst++; - } - - dst--; - dst[0] = EOS; - - return dst; -} - -u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3) -{ - u16 i; - u16 n; - - const u16 i1 = arg2 - 1; - - for (i = 0; i < arg3; i++) - { - u16 word; - - for (n = 0; n < i1; n++) - { - dst = EasyChat_GetWordText(dst, words[0]); - - if (words[0] != 0xFFFF) - { - dst[0] = CHAR_SPACE; - dst++; - } - - words++; - } - - word = words[0]; - words++; - dst = EasyChat_GetWordText(dst, word); - - // Only difference with ConvertEasyChatWordsToString - dst[0] = (i == 0) ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL; - dst++; - } - - dst--; - dst[0] = EOS; - - return dst; -} - - -u16 unref_sub_80EB5E0(u16 arg0) -{ - const u8 *chars; - u16 i; - u16 length; - int group, word; - - - if (arg0 == 0xFFFF) - return 0; - - group = EC_GROUP(arg0); - word = EC_INDEX(arg0); - switch (group) - { - case EC_GROUP_POKEMON: // 0 - case EC_GROUP_POKEMON_2: // 21 - chars = gSpeciesNames[word]; - break; - case EC_GROUP_MOVE_1: // 18 - case EC_GROUP_MOVE_2: // 19 - chars = gMoveNames[word]; - break; - default: - chars = gEasyChatGroupWords[group]; - for (i = word - 1; i != 0xFFFF; i--) - { - while (*chars++ != EOS) - ; - } - break; - } - - length = 0; - while (*chars != EOS) - { - chars++; - length++; - } - - return length; -} - -static bool8 sub_80EB680(u16 *arg0, u16 arg1, u16 arg2, u16 arg3) -{ - return FALSE; -} - -void unref_sub_80EB684(u8 arg0, u16 arg1) -{ - u16 *ptr; - u16 c; - - // FIXME: find actual tv shows used - switch (arg0) - { - case 5: - c = 6; - ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x04); - break; - case 7: - c = 2; - ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x1C); - break; - case 8: - c = 1; - ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x02); - break; - default: - return; - } - - c -= 1; - while (c != 0xFFFF) - { - *ptr = -1; - ptr++; - c -= 1; - } -} - -void sub_80EB6FC(u16 *arg0, u16 arg1) -{ - u16 i; - - for (i = arg1 - 1; i != 0xFFFF; i--) - { - *arg0 = 0xFFFF; - arg0++; - } - -} - -u16 sub_80EB72C(u16 group) -{ - u16 local1 = Random() % gEasyChatGroupSizes[group]; - - if (group == EC_GROUP_POKEMON - || group == EC_GROUP_POKEMON_2 - || group == EC_GROUP_MOVE_1 - || group == EC_GROUP_MOVE_2) - { - local1 = ((u16 *) gEasyChatGroupWords[group])[local1]; - } - - return ((group & 0x7F) << 9) | (local1 & 0x1FF); -} - -u16 sub_80EB784(u16 group) -{ - if (!sub_80EAD7C(group)) - return -1; - - if (group != EC_GROUP_POKEMON) - { - if (group == EC_GROUP_TRENDY_SAYING) - return sub_80EB960(); - } - else - { - return sub_80EB9D8(); - } - - return sub_80EB72C(group); -} - -void sub_80EB7C4(void) -{ - u16 *words; - u16 arg1, arg2; - - switch (gSpecialVar_0x8004) - { - case 0: - words = gSaveBlock1.easyChats.unk2B1C; - arg1 = 2; - arg2 = 2; - break; - case 1: - words = gSaveBlock1.easyChats.unk2B28; - if (sub_80EB680(gSaveBlock1.easyChats.unk2B28, 3, 2, 20)) - { - arg1 = 2; - arg2 = 3; - } - else - { - arg1 = 3; - arg2 = 2; - } - break; - case 2: - words = gSaveBlock1.easyChats.unk2B34; - arg1 = 3; - arg2 = 2; - break; - case 3: - words = gSaveBlock1.easyChats.unk2B40; - arg1 = 3; - arg2 = 2; - break; - default: - return; - } - - ConvertEasyChatWordsToString(gStringVar4, words, arg1, arg2); - ShowFieldAutoScrollMessage(gStringVar4); -} - -void sub_80EB83C(void) -{ - u16 group, local2; - - if (Random() & 1) - group = EC_GROUP_HOBBIES; - else - group = EC_GROUP_LIFESTYLE; - - local2 = sub_80EB784(group); - EasyChat_GetWordText(gStringVar2, local2); -} - -u8 sub_80EB868(u8 arg0) -{ - int offset; - int index; - - index = arg0 / 8; - offset = arg0 % 8; - return (gSaveBlock1.unk2D8C[index] >> offset) & 1; -} - -void sub_80EB890(u8 arg0) -{ - int offset; - int index; - - if (arg0 < 33) - { - index = arg0 / 8; - offset = arg0 % 8; - gSaveBlock1.unk2D8C[index] |= 1 << offset; - } -} - -u8 sub_80EB8C0(void) -{ - u8 i, count; - - for (i = 0, count = 0; i < 33; i++) - { - if (sub_80EB868(i)) - count++; - } - return count; -} - -u16 sub_80EB8EC(void) -{ - u16 i; - u16 local1, local2; - - local1 = sub_80EB8C0(); - if (local1 == 33) - return -1; - - local2 = Random() % (33 - local1); - for (i = 0; i < 33; i++) - { - if (sub_80EB868(i) == 0) - { - if (local2 == 0) - { - sub_80EB890(i); - return (i & 0x1FF) | 0x2800; - } - local2--; - } - } - return -1; -} - -static u16 sub_80EB960(void) -{ - u16 i; - u16 local1; - - local1 = sub_80EB8C0(); - if (local1 == 0) - return -1; - - local1 = Random() % local1; - for (i = 0; i < 33; i++) - { - if (sub_80EB868(i)) - { - if (local1 == 0) - return (i & 0x1FF) | 0x2800; - local1--; - } - } - - return -1; -} - -u8 sub_80EB9C8(void) -{ - return IsNationalPokedexEnabled(); -} - -static u16 sub_80EB9D8(void) -{ - u16 *speciesList; - u16 local1; - u16 i; - - local1 = sub_80EAE88(0); - - if (local1 == 0) - return -1; - - local1 = Random() % local1; - speciesList = (u16 *) gEasyChatGroupWords[EC_GROUP_POKEMON]; - for (i = 0; i < gEasyChatGroupSizes[EC_GROUP_POKEMON]; i++) - { - const u16 dexNum = SpeciesToNationalPokedexNum(*speciesList); - const u8 local2 = GetSetPokedexFlag(dexNum, 0); - - if (local2) - { - if (local1 == 0) - return *speciesList & 0x1FF; - local1--; - } - speciesList++; - } - return -1; -} -- cgit v1.2.3 From 22d0b82ee547a46c4673cf8c9039c68b2a6d7f0b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Dec 2017 19:35:16 -0500 Subject: sub_8102BF8 --- asm/slot_machine.s | 41 ----------------------------------------- src/field/slot_machine.c | 8 ++++++++ 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 1159eb897..d12c6ef9c 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,47 +5,6 @@ .text - thumb_func_start sub_8102BF8 -sub_8102BF8: @ 8102BF8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - lsls r1, 16 - lsrs r4, r1, 16 - movs r6, 0 - ldr r0, _08102C40 @ =gSharedMem - lsls r1, r5, 1 - adds r0, 0x1C - adds r1, r0 - movs r2, 0 - ldrsh r0, [r1, r2] - movs r1, 0x18 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - beq _08102C20 - ldr r6, _08102C44 @ =0x0000ffff -_08102C20: - lsls r1, r4, 16 - asrs r1, 16 - lsls r0, r6, 16 - asrs r0, 16 - adds r1, r0 - lsls r1, 16 - asrs r1, 16 - adds r0, r5, 0 - bl sub_8102BA4 - lsls r0, 24 - lsrs r0, 24 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08102C40: .4byte gSharedMem -_08102C44: .4byte 0x0000ffff - thumb_func_end sub_8102BF8 - thumb_func_start sub_8102C48 sub_8102C48: @ 8102C48 push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index bd259129d..9e3d70727 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1235,6 +1235,14 @@ u8 sub_8102BA4(u8 x, s16 y) return gUnknown_083ECCB2[x][offset]; } +u8 sub_8102BF8(u8 x, s16 y) +{ + s16 r6 = 0; + if ((eSlotMachine->unk1C[x]) % 24) + r6 = -1; + return sub_8102BA4(x, y + r6); +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From a3b25543b3d85a5f88284752367abd6ed713f82b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Dec 2017 20:37:55 -0500 Subject: through sub_8102DEC --- asm/slot_machine.s | 249 ----------------------------------------------- include/slot_machine.h | 6 +- src/field/slot_machine.c | 100 ++++++++++++++++--- 3 files changed, 88 insertions(+), 267 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index d12c6ef9c..32299d7d0 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,255 +5,6 @@ .text - thumb_func_start sub_8102C48 -sub_8102C48: @ 8102C48 - push {lr} - ldr r1, _08102C7C @ =gSharedMem - movs r2, 0x16 - ldrsh r1, [r1, r2] - lsls r0, 16 - asrs r0, 16 - adds r1, r0 - adds r0, r1, 0 - movs r1, 0x6 - bl __modsi3 - lsls r0, 16 - lsrs r1, r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08102C6E - adds r0, 0x6 - lsls r0, 16 - lsrs r1, r0, 16 -_08102C6E: - ldr r0, _08102C80 @ =gUnknown_083ECCF1 - lsls r1, 16 - asrs r1, 16 - adds r1, r0 - ldrb r0, [r1] - pop {r1} - bx r1 - .align 2, 0 -_08102C7C: .4byte gSharedMem -_08102C80: .4byte gUnknown_083ECCF1 - thumb_func_end sub_8102C48 - - thumb_func_start sub_8102C84 -sub_8102C84: @ 8102C84 - push {r4-r6,lr} - adds r5, r0, 0 - lsls r5, 24 - ldr r6, _08102CC8 @ =gSharedMem - lsrs r5, 23 - adds r4, r6, 0 - adds r4, 0x1C - adds r4, r5, r4 - lsls r1, 16 - asrs r1, 16 - ldrh r0, [r4] - adds r1, r0 - strh r1, [r4] - movs r1, 0 - ldrsh r0, [r4, r1] - movs r1, 0xFC - lsls r1, 1 - bl __modsi3 - strh r0, [r4] - adds r6, 0x28 - adds r5, r6 - movs r1, 0 - ldrsh r0, [r4, r1] - movs r1, 0x18 - bl __divsi3 - movs r1, 0x15 - subs r1, r0 - strh r1, [r5] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08102CC8: .4byte gSharedMem - thumb_func_end sub_8102C84 - - thumb_func_start sub_8102CCC -sub_8102CCC: @ 8102CCC - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - lsls r1, 16 - lsrs r4, r1, 16 - ldr r0, _08102D24 @ =gSharedMem - lsls r1, r6, 1 - adds r0, 0x1C - adds r5, r1, r0 - movs r1, 0 - ldrsh r0, [r5, r1] - movs r1, 0x18 - bl __modsi3 - lsls r0, 16 - lsrs r0, 16 - lsls r2, r0, 16 - asrs r1, r2, 16 - cmp r1, 0 - beq _08102D18 - lsls r0, r4, 16 - asrs r0, 16 - cmp r1, r0 - bge _08102D00 - lsrs r4, r2, 16 -_08102D00: - lsls r1, r4, 16 - asrs r1, 16 - adds r0, r6, 0 - bl sub_8102C84 - movs r1, 0 - ldrsh r0, [r5, r1] - movs r1, 0x18 - bl __modsi3 - lsls r0, 16 - lsrs r0, 16 -_08102D18: - lsls r0, 16 - asrs r0, 16 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08102D24: .4byte gSharedMem - thumb_func_end sub_8102CCC - - thumb_func_start sub_8102D28 -sub_8102D28: @ 8102D28 - push {r4,lr} - ldr r4, _08102D58 @ =gSharedMem - lsls r0, 16 - asrs r0, 16 - ldrh r1, [r4, 0x14] - adds r0, r1 - strh r0, [r4, 0x14] - movs r1, 0x14 - ldrsh r0, [r4, r1] - movs r1, 0x78 - bl __modsi3 - strh r0, [r4, 0x14] - movs r1, 0x14 - ldrsh r0, [r4, r1] - movs r1, 0x14 - bl __divsi3 - movs r1, 0x6 - subs r1, r0 - strh r1, [r4, 0x16] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08102D58: .4byte gSharedMem - thumb_func_end sub_8102D28 - - thumb_func_start sub_8102D5C -sub_8102D5C: @ 8102D5C - push {r4,r5,lr} - lsls r0, 16 - lsrs r4, r0, 16 - ldr r5, _08102DA4 @ =gSharedMem - movs r1, 0x14 - ldrsh r0, [r5, r1] - movs r1, 0x14 - bl __modsi3 - lsls r0, 16 - lsrs r0, 16 - lsls r2, r0, 16 - asrs r1, r2, 16 - cmp r1, 0 - beq _08102D9A - lsls r0, r4, 16 - asrs r0, 16 - cmp r1, r0 - bge _08102D84 - lsrs r4, r2, 16 -_08102D84: - lsls r0, r4, 16 - asrs r0, 16 - bl sub_8102D28 - movs r1, 0x14 - ldrsh r0, [r5, r1] - movs r1, 0x14 - bl __modsi3 - lsls r0, 16 - lsrs r0, 16 -_08102D9A: - lsls r0, 16 - asrs r0, 16 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08102DA4: .4byte gSharedMem - thumb_func_end sub_8102D5C - - thumb_func_start sub_8102DA8 -sub_8102DA8: @ 8102DA8 - push {r4-r7,lr} - movs r4, 0 - ldr r5, _08102DE0 @ =sub_8102E68 - ldr r7, _08102DE4 @ =gTasks - ldr r6, _08102DE8 @ =gSharedMem + 0x3A -_08102DB2: - adds r0, r5, 0 - movs r1, 0x2 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r7 - strh r4, [r1, 0x26] - adds r1, r4, r6 - strb r0, [r1] - bl _call_via_r5 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _08102DB2 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08102DE0: .4byte sub_8102E68 -_08102DE4: .4byte gTasks -_08102DE8: .4byte gSharedMem + 0x3A - thumb_func_end sub_8102DA8 - - thumb_func_start sub_8102DEC -sub_8102DEC: @ 8102DEC - lsls r0, 24 - lsrs r0, 24 - ldr r3, _08102E14 @ =gTasks - ldr r1, _08102E18 @ =gSharedMem - adds r1, 0x3A - adds r0, r1 - ldrb r2, [r0] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r3 - movs r2, 0x1 - strh r2, [r1, 0x8] - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r3 - strh r2, [r0, 0x24] - bx lr - .align 2, 0 -_08102E14: .4byte gTasks -_08102E18: .4byte gSharedMem - thumb_func_end sub_8102DEC - thumb_func_start sub_8102E1C sub_8102E1C: @ 8102E1C lsls r0, 24 diff --git a/include/slot_machine.h b/include/slot_machine.h index 738866318..c5e14f719 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -17,13 +17,15 @@ struct SlotMachineEwramStruct { /*0x0E*/ s16 unk0E; /*0x10*/ s16 unk10; /*0x12*/ s16 bet; - /*0x14*/ u8 filler14[4]; + /*0x14*/ s16 unk14; + /*0x16*/ s16 unk16; /*0x18*/ s16 unk18; /*0x1A*/ u16 unk1A; /*0x1C*/ s16 unk1C[3]; /*0x22*/ u16 unk22[3]; /*0x28*/ s16 unk28[3]; - /*0x2E*/ u8 filler2E[15]; + /*0x2E*/ u8 filler2E[12]; + /*0x3A*/ u8 unk3A[3]; /*0x3D*/ u8 unk3D; /*0x3E*/ u8 filler3E[26]; /*0x58*/ u16 win0h; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 9e3d70727..6f1e7610a 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -89,17 +89,19 @@ static u8 sub_8102578(void); u16 dp15_jump_random_unknown(void); static u8 sub_81025BC(void); static void sub_81027A0(void); -void sub_81027D0(void); -void sub_8102840(void); -void sub_810290C(void); -u8 sub_81029D4(u8 a0, u8 a1, u8 a2); -void sub_8102A24(void); +static void sub_81027D0(void); +static void sub_8102840(void); +static void sub_810290C(void); +static u8 sub_81029D4(u8 c1, u8 c2, u8 c3); +static void sub_8102A24(void); +static void sub_8102A64(u8 taskId); bool8 sub_8102A44(void); -u8 sub_8102BA4(u8 a0, s16 a1); -void sub_8102DA8(void); -void sub_8102DEC(u8 a0); +u8 sub_8102BA4(u8 x, s16 y); +static void sub_8102DA8(void); +static void sub_8102DEC(u8 a0); void sub_8102E1C(u8 a0); bool8 sub_8102E40(u8 a0); +void sub_8102E68(u8 taskId); void sub_8103C14(u8 a0); void sub_8103D50(u8 a0); void sub_8103D8C(u8 a0); @@ -1036,7 +1038,7 @@ static void sub_81027A0(void) extern const u16 gUnknown_083ECE6C[]; extern const u16 gUnknown_083ECE5A[]; -void sub_81027D0(void) +static void sub_81027D0(void) { u8 c1, c2, c3, payout; @@ -1052,7 +1054,7 @@ void sub_81027D0(void) } } -void sub_8102840(void) +static void sub_8102840(void) { u8 c1, c2, c3, payout; @@ -1086,7 +1088,7 @@ void sub_8102840(void) } } -void sub_810290C(void) +static void sub_810290C(void) { u8 c1, c2, c3, payout; @@ -1120,7 +1122,7 @@ void sub_810290C(void) extern const u8 gUnknown_083ECE52[]; -u8 sub_81029D4(u8 c1, u8 c2, u8 c3) +static u8 sub_81029D4(u8 c1, u8 c2, u8 c3) { if (c1 == c2 && c1 == c3) { @@ -1141,9 +1143,7 @@ u8 sub_81029D4(u8 c1, u8 c2, u8 c3) return 9; } -void sub_8102A64(u8 taskId); - -void sub_8102A24(void) +static void sub_8102A24(void) { sub_8102A64(CreateTask(sub_8102A64, 4)); } @@ -1159,7 +1159,7 @@ bool8 sub_8102A44(void) extern bool8 (*const gUnknown_083ECB20[])(struct Task *task); -void sub_8102A64(u8 taskId) +static void sub_8102A64(u8 taskId) { while (gUnknown_083ECB20[gTasks[taskId].data[0]](gTasks + taskId)); } @@ -1243,6 +1243,74 @@ u8 sub_8102BF8(u8 x, s16 y) return sub_8102BA4(x, y + r6); } +extern const u8 gUnknown_083ECCF1[]; + +u8 sub_8102C48(s16 a0) +{ + s16 r1 = (eSlotMachine->unk16 + a0) % 6; + if (r1 < 0) + r1 += 6; + return gUnknown_083ECCF1[r1]; +} + +void sub_8102C84(u8 a0, s16 a1) +{ + eSlotMachine->unk1C[a0] += a1; + eSlotMachine->unk1C[a0] %= 504; + eSlotMachine->unk28[a0] = 21 - eSlotMachine->unk1C[a0] / 24; +} + +s16 sub_8102CCC(u8 a0, s16 a1) +{ + s16 r1 = eSlotMachine->unk1C[a0] % 24; + if (r1 != 0) + { + if (r1 < a1) + a1 = r1; + sub_8102C84(a0, a1); + r1 = eSlotMachine->unk1C[a0] % 24; + } + return r1; +} + +void sub_8102D28(s16 a0) +{ + eSlotMachine->unk14 += a0; + eSlotMachine->unk14 %= 120; + eSlotMachine->unk16 = 6 - eSlotMachine->unk14 / 20; +} + +s16 sub_8102D5C(s16 a0) +{ + s16 r1 = eSlotMachine->unk14 % 20; + if (r1 != 0) + { + if (r1 < a0) + a0 = r1; + sub_8102D28(a0); + r1 = eSlotMachine->unk14 % 20; + } + return r1; +} + +static void sub_8102DA8(void) +{ + u8 i; + for (i = 0; i < 3; i++) + { + u8 taskId = CreateTask(sub_8102E68, 2); + gTasks[taskId].data[15] = i; + eSlotMachine->unk3A[i] = taskId; + sub_8102E68(taskId); + } +} + +static void sub_8102DEC(u8 a0) +{ + gTasks[eSlotMachine->unk3A[a0]].data[0] = 1; + gTasks[eSlotMachine->unk3A[a0]].data[14] = 1; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 3a51ad2c81b0c479c2621e81ae13d28f3f90fc48 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Dec 2017 20:48:28 -0500 Subject: through sub_8102EA4 --- asm/slot_machine.s | 96 ------------------------------------------------ src/field/slot_machine.c | 30 ++++++++++++++- 2 files changed, 29 insertions(+), 97 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 32299d7d0..da1413838 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,102 +5,6 @@ .text - thumb_func_start sub_8102E1C -sub_8102E1C: @ 8102E1C - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08102E38 @ =gTasks - ldr r1, _08102E3C @ =gSharedMem - adds r1, 0x3A - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r1, 0x2 - strh r1, [r0, 0x8] - bx lr - .align 2, 0 -_08102E38: .4byte gTasks -_08102E3C: .4byte gSharedMem - thumb_func_end sub_8102E1C - - thumb_func_start sub_8102E40 -sub_8102E40: @ 8102E40 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08102E60 @ =gTasks - ldr r1, _08102E64 @ =gSharedMem - adds r1, 0x3A - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r0, [r0, 0x24] - lsls r0, 24 - lsrs r0, 24 - bx lr - .align 2, 0 -_08102E60: .4byte gTasks -_08102E64: .4byte gSharedMem - thumb_func_end sub_8102E40 - - thumb_func_start sub_8102E68 -sub_8102E68: @ 8102E68 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, _08102E98 @ =gUnknown_083ECB2C - ldr r2, _08102E9C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 -_08102E7A: - 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 _08102E7A - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08102E98: .4byte gUnknown_083ECB2C -_08102E9C: .4byte gTasks - thumb_func_end sub_8102E68 - - thumb_func_start sub_8102EA0 -sub_8102EA0: @ 8102EA0 - movs r0, 0 - bx lr - thumb_func_end sub_8102EA0 - - thumb_func_start sub_8102EA4 -sub_8102EA4: @ 8102EA4 - push {lr} - ldrh r0, [r0, 0x26] - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08102EBC @ =gSharedMem - movs r2, 0x1A - ldrsh r1, [r1, r2] - bl sub_8102C84 - movs r0, 0 - pop {r1} - bx r1 - .align 2, 0 -_08102EBC: .4byte gSharedMem - thumb_func_end sub_8102EA4 - thumb_func_start sub_8102EC0 sub_8102EC0: @ 8102EC0 push {r4,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 6f1e7610a..55bbaef3a 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -99,7 +99,7 @@ bool8 sub_8102A44(void); u8 sub_8102BA4(u8 x, s16 y); static void sub_8102DA8(void); static void sub_8102DEC(u8 a0); -void sub_8102E1C(u8 a0); +static void sub_8102E1C(u8 a0); bool8 sub_8102E40(u8 a0); void sub_8102E68(u8 taskId); void sub_8103C14(u8 a0); @@ -1311,6 +1311,34 @@ static void sub_8102DEC(u8 a0) gTasks[eSlotMachine->unk3A[a0]].data[14] = 1; } +static void sub_8102E1C(u8 a0) +{ + gTasks[eSlotMachine->unk3A[a0]].data[0] = 2; +} + +bool8 sub_8102E40(u8 a0) +{ + return gTasks[eSlotMachine->unk3A[a0]].data[14]; +} + +extern bool8 (*const gUnknown_083ECB2C[])(struct Task *task); + +void sub_8102E68(u8 taskId) +{ + while (gUnknown_083ECB2C[gTasks[taskId].data[0]](gTasks + taskId)); +} + +bool8 sub_8102EA0(struct Task *task) +{ + return FALSE; +} + +bool8 sub_8102EA4(struct Task *task) +{ + sub_8102C84(task->data[15], eSlotMachine->unk1A); + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From da62907ec54f400646416f38ef02bd7f03d5dbc4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Dec 2017 21:25:47 -0500 Subject: through sub_8103008 --- asm/slot_machine.s | 214 ----------------------------------------------- data/slot_machine.s | 2 +- include/slot_machine.h | 3 +- src/field/slot_machine.c | 63 ++++++++++++++ 4 files changed, 66 insertions(+), 216 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index da1413838..945f894f9 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,220 +5,6 @@ .text - thumb_func_start sub_8102EC0 -sub_8102EC0: @ 8102EC0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - movs r2, 0 - strh r0, [r4, 0x8] - ldr r3, _08102F40 @ =gSharedMem - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r0, 1 - adds r1, r3, 0 - adds r1, 0x34 - adds r0, r1 - strh r2, [r0] - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r0, 1 - adds r1, r3, 0 - adds r1, 0x2E - adds r0, r1 - strh r2, [r0] - ldrb r0, [r3, 0xA] - cmp r0, 0 - bne _08102F28 - ldrb r0, [r3, 0x4] - cmp r0, 0 - beq _08102F12 - ldrb r0, [r3, 0x6] - cmp r0, 0 - beq _08102F12 - ldr r1, _08102F44 @ =gUnknown_083ECB40 - movs r2, 0x26 - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - lsls r0, 24 - cmp r0, 0 - bne _08102F28 -_08102F12: - ldr r1, _08102F40 @ =gSharedMem - movs r0, 0 - strb r0, [r1, 0x6] - ldr r1, _08102F48 @ =gUnknown_083ECB4C - movs r2, 0x26 - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 -_08102F28: - ldr r0, _08102F40 @ =gSharedMem - movs r2, 0x26 - ldrsh r1, [r4, r2] - lsls r1, 1 - adds r0, 0x2E - adds r1, r0 - ldrh r0, [r1] - strh r0, [r4, 0xA] - movs r0, 0x1 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08102F40: .4byte gSharedMem -_08102F44: .4byte gUnknown_083ECB40 -_08102F48: .4byte gUnknown_083ECB4C - thumb_func_end sub_8102EC0 - - thumb_func_start sub_8102F4C -sub_8102F4C: @ 8102F4C - push {r4-r7,lr} - sub sp, 0xC - adds r4, r0, 0 - ldr r1, _08102F8C @ =gUnknown_083ECB58 - mov r0, sp - movs r2, 0xA - bl memcpy - ldr r5, _08102F90 @ =gSharedMem - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r6, r0, 1 - adds r7, r5, 0 - adds r7, 0x1C - adds r0, r6, r7 - movs r2, 0 - ldrsh r0, [r0, r2] - movs r1, 0x18 - bl __modsi3 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r0, 0 - beq _08102F94 - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - movs r6, 0x1A - ldrsh r1, [r5, r6] - bl sub_8102CCC - b _08102FC8 - .align 2, 0 -_08102F8C: .4byte gUnknown_083ECB58 -_08102F90: .4byte gSharedMem -_08102F94: - adds r0, r5, 0 - adds r0, 0x2E - adds r1, r6, r0 - ldrh r3, [r1] - movs r6, 0 - ldrsh r0, [r1, r6] - cmp r0, 0 - beq _08102FCC - subs r0, r3, 0x1 - strh r0, [r1] - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - movs r2, 0x1A - ldrsh r1, [r5, r2] - bl sub_8102C84 - movs r6, 0x26 - ldrsh r0, [r4, r6] - lsls r0, 1 - adds r0, r7 - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0x18 - bl __modsi3 -_08102FC8: - lsls r0, 16 - lsrs r2, r0, 16 -_08102FCC: - cmp r2, 0 - bne _08102FF8 - ldr r1, _08103004 @ =gSharedMem - movs r2, 0x26 - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r1, 0x2E - adds r0, r1 - movs r6, 0 - ldrsh r1, [r0, r6] - cmp r1, 0 - bne _08102FF8 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 1 - add r0, sp - ldrh r0, [r0] - strh r0, [r4, 0xA] - strh r1, [r4, 0xC] -_08102FF8: - movs r0, 0 - add sp, 0xC - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08103004: .4byte gSharedMem - thumb_func_end sub_8102F4C - - thumb_func_start sub_8103008 -sub_8103008: @ 8103008 - push {r4,lr} - adds r2, r0, 0 - ldr r1, _08103058 @ =gSharedMem - movs r3, 0x26 - ldrsh r0, [r2, r3] - lsls r0, 1 - adds r4, r1, 0 - adds r4, 0x22 - adds r0, r4 - ldrh r1, [r2, 0xA] - strh r1, [r0] - ldrh r0, [r2, 0xA] - negs r3, r0 - strh r3, [r2, 0xA] - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08103038 - lsls r0, r3, 16 - asrs r0, 17 - strh r0, [r2, 0xA] -_08103038: - movs r0, 0xA - ldrsh r3, [r2, r0] - cmp r3, 0 - bne _0810304E - strh r3, [r2, 0x8] - strh r3, [r2, 0x24] - movs r1, 0x26 - ldrsh r0, [r2, r1] - lsls r0, 1 - adds r0, r4 - strh r3, [r0] -_0810304E: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08103058: .4byte gSharedMem - thumb_func_end sub_8103008 - thumb_func_start sub_810305C sub_810305C: @ 810305C push {r4,r5,lr} diff --git a/data/slot_machine.s b/data/slot_machine.s index 827d27747..3d7c6253c 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -30,7 +30,7 @@ gUnknown_083ECB4C:: @ 83ECB4C .4byte sub_810380C .align 1 -gUnknown_083ECB58:: @ 83ECB58 +gUnknown_083ECB58:: @ 83ECB58 (sub_8102F4C) .2byte 2, 4, 4, 4, 8 .align 2 diff --git a/include/slot_machine.h b/include/slot_machine.h index c5e14f719..7fc47bb12 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -24,7 +24,8 @@ struct SlotMachineEwramStruct { /*0x1C*/ s16 unk1C[3]; /*0x22*/ u16 unk22[3]; /*0x28*/ s16 unk28[3]; - /*0x2E*/ u8 filler2E[12]; + /*0x2E*/ s16 unk2E[3]; + /*0x34*/ u16 unk34[3]; /*0x3A*/ u8 unk3A[3]; /*0x3D*/ u8 unk3D; /*0x3E*/ u8 filler3E[26]; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 55bbaef3a..96fa2e18b 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1339,6 +1339,69 @@ bool8 sub_8102EA4(struct Task *task) return FALSE; } +extern bool8 (*const gUnknown_083ECB40[])(void); +extern void (*const gUnknown_083ECB4C[])(void); + +bool8 sub_8102EC0(struct Task *task) +{ + task->data[0]++; + eSlotMachine->unk34[task->data[15]] = 0; + eSlotMachine->unk2E[task->data[15]] = 0; + if (eSlotMachine->unk0A == 0 && (eSlotMachine->unk04 == 0 || eSlotMachine->unk06 == 0 || !gUnknown_083ECB40[task->data[15]]())) + { + eSlotMachine->unk06 = 0; + gUnknown_083ECB4C[task->data[15]](); + } + task->data[1] = eSlotMachine->unk2E[task->data[15]]; + return TRUE; +} + +extern const u16 gUnknown_083ECB58[5]; // don't move this + +bool8 sub_8102F4C(struct Task *task) +{ + s16 r2; + u16 sp[5]; + memcpy(sp, gUnknown_083ECB58, sizeof gUnknown_083ECB58); + // u16 sp[] = {2, 4, 4, 4, 8}; + r2 = eSlotMachine->unk1C[task->data[15]] % 24; + if (r2 != 0) + { + r2 = sub_8102CCC(task->data[15], eSlotMachine->unk1A); + } + else if (eSlotMachine->unk2E[task->data[15]]) + { + eSlotMachine->unk2E[task->data[15]]--; + sub_8102C84(task->data[15], eSlotMachine->unk1A); + r2 = eSlotMachine->unk1C[task->data[15]] % 24; + } + if (r2 == 0 && eSlotMachine->unk2E[task->data[15]] == 0) + { + task->data[0]++; + task->data[1] = sp[task->data[1]]; + task->data[2] = 0; + } + return FALSE; +} + +bool8 sub_8103008(struct Task *task) +{ + eSlotMachine->unk22[task->data[15]] = task->data[1]; + task->data[1] = -task->data[1]; + task->data[2]++; + if ((task->data[2] & 0x3) == 0) + { + task->data[1] >>= 1; + } + if (task->data[1] == 0) + { + task->data[0] = 0; + task->data[14] = 0; + eSlotMachine->unk22[task->data[15]] = 0; + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From a161d7e816ecf99cae3bf8c690d665f04d2a9ecd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Dec 2017 21:50:35 -0500 Subject: through sub_8103134 --- asm/slot_machine.s | 139 ----------------------------------------------- src/field/slot_machine.c | 43 +++++++++++++++ 2 files changed, 43 insertions(+), 139 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 945f894f9..43993c46c 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,145 +5,6 @@ .text - thumb_func_start sub_810305C -sub_810305C: @ 810305C - push {r4,r5,lr} - ldr r4, _0810309C @ =gSharedMem - ldrb r0, [r4, 0x4] - bl sub_810250C - lsls r0, 24 - lsrs r3, r0, 24 - adds r5, r3, 0 - ldrb r1, [r4, 0x4] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _0810307A - movs r5, 0 - movs r3, 0x1 -_0810307A: - ldr r1, _081030A0 @ =gUnknown_083ECB64 - movs r2, 0x12 - ldrsh r0, [r4, r2] - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - ldr r2, [r0] - adds r0, r5, 0 - adds r1, r3, 0 - bl _call_via_r2 - lsls r0, 24 - lsrs r0, 24 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0810309C: .4byte gSharedMem -_081030A0: .4byte gUnknown_083ECB64 - thumb_func_end sub_810305C - - thumb_func_start sub_81030A4 -sub_81030A4: @ 81030A4 - push {r4,r5,lr} - adds r3, r0, 0 - adds r4, r1, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r2, 24 - lsrs r5, r2, 24 - lsls r3, 16 - asrs r3, 16 - movs r0, 0 - adds r1, r3, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, r4 - beq _081030CC - cmp r0, r5 - bne _081030D8 -_081030CC: - ldr r0, _081030D4 @ =gSharedMem - strb r1, [r0, 0x7] - movs r0, 0x1 - b _081030DA - .align 2, 0 -_081030D4: .4byte gSharedMem -_081030D8: - movs r0, 0 -_081030DA: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81030A4 - - thumb_func_start sub_81030E0 -sub_81030E0: @ 81030E0 - push {r4,lr} - movs r1, 0x1 - lsls r0, 16 - asrs r4, r0, 16 - subs r1, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - beq _08103128 - movs r1, 0x2 - subs r1, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - beq _08103128 - movs r1, 0x3 - subs r1, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bne _0810312C -_08103128: - movs r0, 0x1 - b _0810312E -_0810312C: - movs r0, 0 -_0810312E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81030E0 - - thumb_func_start sub_8103134 -sub_8103134: @ 8103134 - push {lr} - ldr r0, _08103148 @ =gSharedMem - ldrb r1, [r0, 0x4] - movs r0, 0xC2 - ands r0, r1 - cmp r0, 0 - bne _0810314C - movs r0, 0 - b _0810314E - .align 2, 0 -_08103148: .4byte gSharedMem -_0810314C: - movs r0, 0x1 -_0810314E: - pop {r1} - bx r1 - thumb_func_end sub_8103134 - thumb_func_start sub_8103154 sub_8103154: @ 8103154 push {r4-r7,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 96fa2e18b..7fab44c30 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1402,6 +1402,49 @@ bool8 sub_8103008(struct Task *task) return FALSE; } +extern bool8 (*const gUnknown_083ECB64[])(u8 a0, u8 a1); + +bool8 sub_810305C(void) +{ + u8 r3 = sub_810250C(eSlotMachine->unk04); + u8 r5 = r3; + if (eSlotMachine->unk04 & 0xc0) + { + r5 = 0; + r3 = 1; + } + return gUnknown_083ECB64[eSlotMachine->bet - 1](r5, r3); +} + +bool8 sub_81030A4(s16 a0, u8 a1, u8 a2) +{ + u8 r1 = sub_8102BF8(0, a0); + if (r1 == a1 || r1 == a2) + { + eSlotMachine->unk07 = r1; + return TRUE; + } + return FALSE; +} + +bool8 sub_81030E0(s16 a0) +{ + if (sub_8102BF8(0, 1 - a0) == 4 || sub_8102BF8(0, 2 - a0) == 4 || sub_8102BF8(0, 3 - a0) == 4) + { + return TRUE; + } + return FALSE; +} + +bool8 sub_8103134(void) +{ + if (eSlotMachine->unk04 & 0xc2) + { + return TRUE; + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From a3c7adb2ede2aead120f763bc49306caf69be9e4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 27 Dec 2017 20:58:19 -0500 Subject: simplify linker script additions for assert support --- ld_script.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ld_script.txt b/ld_script.txt index 3e8f45121..18158ecfe 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -66,8 +66,8 @@ SECTIONS { /* COMMON starts at 0x3001760 */ - unk_code_ram = .; tools/agbcc/lib/libc.a:sbrkr.o(COMMON); + end = .; . = 0x8000; } @@ -76,7 +76,6 @@ SECTIONS { .text : ALIGN(4) { - unk_code = .; asm/crt0.o(.text); src/engine/main.o(.text); src/engine/sprite.o(.text); @@ -431,7 +430,6 @@ SECTIONS { src/debug/unknown_debug_menu.o(.text); src/engine/name_string_util.o(.text); src/engine/menu_cursor.o(.text); - unk_code_end = .; } =0 script_data : @@ -512,9 +510,6 @@ SECTIONS { src/libs/libisagbprn.o(.text); } =0 - unk_code_ram_end = unk_code_ram + (unk_code_end - unk_code); - end = unk_code_ram_end; - .rodata : ALIGN(4) { -- cgit v1.2.3 From 4bd55a4f027410a7caf50933d9b7e1da14ce73da Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Dec 2017 22:01:52 -0500 Subject: through sub_81032E8 --- asm/slot_machine.s | 264 ----------------------------------------------- include/slot_machine.h | 2 +- src/field/slot_machine.c | 84 +++++++++++++++ 3 files changed, 85 insertions(+), 265 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 43993c46c..c3e802291 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,270 +5,6 @@ .text - thumb_func_start sub_8103154 -sub_8103154: @ 8103154 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r1, 24 - lsrs r7, r1, 24 - movs r5, 0 - movs r0, 0x2 - mov r9, r0 - ldr r6, _08103194 @ =gSharedMem -_0810316E: - lsls r0, r5, 16 - asrs r4, r0, 16 - mov r1, r9 - subs r0, r1, r4 - lsls r0, 16 - asrs r0, 16 - mov r1, r8 - adds r2, r7, 0 - bl sub_81030A4 - lsls r0, 24 - cmp r0, 0 - beq _08103198 - movs r0, 0x2 - strh r0, [r6, 0x34] - strh r5, [r6, 0x2E] - movs r0, 0x1 - b _081031A6 - .align 2, 0 -_08103194: .4byte gSharedMem -_08103198: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _0810316E - movs r0, 0 -_081031A6: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8103154 - - thumb_func_start sub_81031B4 -sub_81031B4: @ 81031B4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - bl sub_8103134 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0 - bne _081031E2 - movs r0, 0 - bl sub_81030E0 - lsls r0, 24 - cmp r0, 0 - bne _0810321E -_081031E2: - movs r0, 0x1 - mov r8, r0 - ldr r5, _0810320C @ =gSharedMem - movs r7, 0 -_081031EA: - mov r1, r8 - lsls r0, r1, 16 - asrs r4, r0, 16 - adds r0, r4, 0 - mov r1, r10 - mov r2, r9 - bl sub_81030A4 - lsls r0, 24 - cmp r0, 0 - beq _08103210 - mov r0, r8 - strh r0, [r5, 0x34] - strh r7, [r5, 0x2E] - movs r0, 0x1 - b _081032B2 - .align 2, 0 -_0810320C: .4byte gSharedMem -_08103210: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - mov r8, r1 - asrs r0, 16 - cmp r0, 0x3 - ble _081031EA -_0810321E: - movs r0, 0x1 - mov r8, r0 - adds r7, r6, 0 - ldr r6, _0810326C @ =gSharedMem -_08103226: - mov r1, r8 - lsls r5, r1, 16 - cmp r7, 0 - bne _0810323A - asrs r0, r5, 16 - bl sub_81030E0 - lsls r0, 24 - cmp r0, 0 - bne _081032A0 -_0810323A: - movs r0, 0x1 - asrs r4, r5, 16 - subs r0, r4 - lsls r0, 16 - asrs r0, 16 - mov r1, r10 - mov r2, r9 - bl sub_81030A4 - lsls r0, 24 - cmp r0, 0 - beq _081032A0 - cmp r4, 0x1 - bne _08103270 - cmp r7, 0 - bne _08103266 - movs r0, 0x3 - bl sub_81030E0 - lsls r0, 24 - cmp r0, 0 - bne _08103270 -_08103266: - movs r0, 0x3 - strh r0, [r6, 0x34] - b _0810329A - .align 2, 0 -_0810326C: .4byte gSharedMem -_08103270: - asrs r0, r5, 16 - cmp r0, 0x3 - bgt _08103294 - adds r4, r0, 0x1 - cmp r7, 0 - bne _0810328A - lsls r0, r4, 16 - asrs r0, 16 - bl sub_81030E0 - lsls r0, 24 - cmp r0, 0 - bne _08103294 -_0810328A: - movs r0, 0x2 - strh r0, [r6, 0x34] - strh r4, [r6, 0x2E] - movs r0, 0x1 - b _081032B2 -_08103294: - movs r0, 0x1 - strh r0, [r6, 0x34] - mov r0, r8 -_0810329A: - strh r0, [r6, 0x2E] - movs r0, 0x1 - b _081032B2 -_081032A0: - movs r1, 0x80 - lsls r1, 9 - adds r0, r5, r1 - lsrs r1, r0, 16 - mov r8, r1 - asrs r0, 16 - cmp r0, 0x4 - ble _08103226 - movs r0, 0 -_081032B2: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81031B4 - - thumb_func_start sub_81032C0 -sub_81032C0: @ 81032C0 - push {lr} - ldr r1, _081032E0 @ =gUnknown_083ECB70 - ldr r0, _081032E4 @ =gSharedMem - movs r2, 0x12 - ldrsh r0, [r0, r2] - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_081032E0: .4byte gUnknown_083ECB70 -_081032E4: .4byte gSharedMem - thumb_func_end sub_81032C0 - - thumb_func_start sub_81032E8 -sub_81032E8: @ 81032E8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, _08103320 @ =gSharedMem - movs r6, 0 - ldrh r1, [r0, 0x34] - mov r8, r1 - movs r1, 0x34 - ldrsh r7, [r0, r1] - adds r5, r0, 0 -_081032FC: - lsls r0, r6, 16 - asrs r4, r0, 16 - subs r1, r7, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r5, 0x7] - cmp r0, r1 - bne _08103324 - mov r0, r8 - strh r0, [r5, 0x36] - strh r6, [r5, 0x30] - movs r0, 0x1 - b _08103332 - .align 2, 0 -_08103320: .4byte gSharedMem -_08103324: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081032FC - movs r0, 0 -_08103332: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81032E8 - thumb_func_start sub_810333C sub_810333C: @ 810333C push {r4-r7,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 7fc47bb12..203f3bbfc 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -25,7 +25,7 @@ struct SlotMachineEwramStruct { /*0x22*/ u16 unk22[3]; /*0x28*/ s16 unk28[3]; /*0x2E*/ s16 unk2E[3]; - /*0x34*/ u16 unk34[3]; + /*0x34*/ s16 unk34[3]; /*0x3A*/ u8 unk3A[3]; /*0x3D*/ u8 unk3D; /*0x3E*/ u8 filler3E[26]; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 7fab44c30..469753726 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1445,6 +1445,90 @@ bool8 sub_8103134(void) return FALSE; } +bool8 sub_8103154(u8 a0, u8 a1) +{ + s16 i; + + for (i = 0; i < 5; i++) + { + if (sub_81030A4(2 - i, a0, a1)) + { + eSlotMachine->unk34[0] = 2; + eSlotMachine->unk2E[0] = i; + return TRUE; + } + } + return FALSE; +} + +bool8 sub_81031B4(u8 a0, u8 a1) +{ + s16 i; + bool8 r6 = sub_8103134(); + if (r6 || !sub_81030E0(0)) + { + for (i = 1; i < 4; i++) + { + if (sub_81030A4(i, a0, a1)) + { + eSlotMachine->unk34[0] = i; + eSlotMachine->unk2E[0] = 0; + return TRUE; + } + } + } + for (i = 1; i < 5; i++) + { + bool8 r7 = r6; + if (r7 || !sub_81030E0(i)) + { + if (sub_81030A4(1 - i, a0, a1)) + { + if (i == 1 && (r7 || !sub_81030E0(3))) + { + eSlotMachine->unk34[0] = 3; + eSlotMachine->unk2E[0] = 3; + return TRUE; + } + if (i < 4 && (r7 || !sub_81030E0(i + 1))) + { + eSlotMachine->unk34[0] = 2; + eSlotMachine->unk2E[0] = i + 1; + return TRUE; + } + eSlotMachine->unk34[0] = 1; + eSlotMachine->unk2E[0] = i; + return TRUE; + } + } + } + return FALSE; +} + +extern bool8 (*const gUnknown_083ECB70[])(void); + +bool8 sub_81032C0(void) +{ + return gUnknown_083ECB70[eSlotMachine->bet - 1](); +} + +bool8 sub_81032E8(void) +{ + s16 i; + s16 unk34_0 = eSlotMachine->unk34[0]; + + for (i = 0; i < 5; i++) + { + if (sub_8102BF8(1, unk34_0 - i) == eSlotMachine->unk07) + { + eSlotMachine->unk34[1] = unk34_0; + eSlotMachine->unk2E[1] = i; + return TRUE; + } + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 57af95611d0a3cb0fda3ccebae725221ca5eac3e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Dec 2017 22:14:54 -0500 Subject: through sub_810341C --- asm/slot_machine.s | 175 ----------------------------------------------- src/field/slot_machine.c | 67 ++++++++++++++++++ 2 files changed, 67 insertions(+), 175 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index c3e802291..ba64c3c70 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,181 +5,6 @@ .text - thumb_func_start sub_810333C -sub_810333C: @ 810333C - push {r4-r7,lr} - bl sub_81032E8 - lsls r0, 24 - cmp r0, 0 - beq _0810339A - ldr r1, _0810338C @ =gSharedMem - movs r2, 0x34 - ldrsh r0, [r1, r2] - cmp r0, 0x2 - beq _08103396 - movs r2, 0x30 - ldrsh r0, [r1, r2] - cmp r0, 0x1 - ble _08103396 - cmp r0, 0x4 - beq _08103396 - movs r5, 0 - movs r7, 0x2 - adds r6, r1, 0 -_08103364: - lsls r0, r5, 16 - asrs r4, r0, 16 - subs r1, r7, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6, 0x7] - cmp r0, r1 - beq _08103390 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _08103364 - b _08103396 - .align 2, 0 -_0810338C: .4byte gSharedMem -_08103390: - movs r0, 0x2 - strh r0, [r6, 0x36] - strh r5, [r6, 0x30] -_08103396: - movs r0, 0x1 - b _081033D2 -_0810339A: - ldr r1, _081033D8 @ =gSharedMem - movs r2, 0x34 - ldrsh r0, [r1, r2] - cmp r0, 0x2 - beq _081033D0 - movs r5, 0 - movs r7, 0x2 - adds r6, r1, 0 -_081033AA: - lsls r0, r5, 16 - asrs r4, r0, 16 - subs r1, r7, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6, 0x7] - cmp r0, r1 - beq _08103390 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081033AA -_081033D0: - movs r0, 0 -_081033D2: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_081033D8: .4byte gSharedMem - thumb_func_end sub_810333C - - thumb_func_start sub_81033DC -sub_81033DC: @ 81033DC - push {r4,lr} - ldr r0, _08103414 @ =gSharedMem - ldrb r3, [r0, 0x7] - adds r4, r3, 0 - ldrb r2, [r0, 0x4] - movs r1, 0x40 - ands r1, r2 - cmp r1, 0 - beq _081033F6 - movs r3, 0 - cmp r4, 0 - bne _081033F6 - movs r3, 0x1 -_081033F6: - ldr r1, _08103418 @ =gUnknown_083ECB7C - movs r2, 0x12 - ldrsh r0, [r0, r2] - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r3, 0 - bl _call_via_r1 - lsls r0, 24 - lsrs r0, 24 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08103414: .4byte gSharedMem -_08103418: .4byte gUnknown_083ECB7C - thumb_func_end sub_81033DC - - thumb_func_start sub_810341C -sub_810341C: @ 810341C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r0, _0810345C @ =gSharedMem - movs r5, 0 - ldrh r1, [r0, 0x36] - mov r8, r1 - movs r1, 0x36 - ldrsh r7, [r0, r1] - adds r6, r0, 0 -_08103438: - lsls r0, r5, 16 - asrs r4, r0, 16 - subs r1, r7, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, r9 - bne _08103460 - mov r0, r8 - strh r0, [r6, 0x38] - strh r5, [r6, 0x32] - movs r0, 0x1 - b _0810346E - .align 2, 0 -_0810345C: .4byte gSharedMem -_08103460: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _08103438 - movs r0, 0 -_0810346E: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_810341C - thumb_func_start sub_810347C sub_810347C: @ 810347C push {r4-r7,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 469753726..df6a6bd0b 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1529,6 +1529,73 @@ bool8 sub_81032E8(void) return FALSE; } +bool8 sub_810333C(void) +{ + s16 i; + if (sub_81032E8()) + { + if (eSlotMachine->unk34[0] != 2 && eSlotMachine->unk2E[1] > 1 && eSlotMachine->unk2E[1] != 4) + { + for (i = 0; i < 5; i++) + { + if (sub_8102BF8(1, 2 - i) == eSlotMachine->unk07) + { + eSlotMachine->unk34[1] = 2; + eSlotMachine->unk2E[1] = i; + break; + } + } + } + return TRUE; + } + if (eSlotMachine->unk34[0] != 2) + { + for (i = 0; i < 5; i++) + { + if (sub_8102BF8(1, 2 - i) == eSlotMachine->unk07) + { + eSlotMachine->unk34[1] = 2; + eSlotMachine->unk2E[1] = i; + return TRUE; + } + } + } + return FALSE; +} + +extern bool8 (*const gUnknown_083ECB7C[])(u8 a0); + +bool8 sub_81033DC(void) +{ + u8 r3 = eSlotMachine->unk07; + if (eSlotMachine->unk04 & 0x40) + { + r3 = 0; + if (eSlotMachine->unk07 == 0) + { + r3 = 1; + } + } + return gUnknown_083ECB7C[eSlotMachine->bet - 1](r3); +} + +bool8 sub_810341C(u8 a0) +{ + s16 i; + s16 unk34_1 = eSlotMachine->unk34[1]; + + for (i = 0; i < 5; i++) + { + if (sub_8102BF8(2, unk34_1 - i) == a0) + { + eSlotMachine->unk34[2] = unk34_1; + eSlotMachine->unk2E[2] = i; + return TRUE; + } + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From e3acf564701fe6bc77c92fc5268083e4adc10ed7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Dec 2017 23:14:42 -0500 Subject: through sub_8103520 --- asm/slot_machine.s | 117 ----------------------------------------------- src/field/slot_machine.c | 47 +++++++++++++++++++ 2 files changed, 47 insertions(+), 117 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index ba64c3c70..9e90a08bd 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,123 +5,6 @@ .text - thumb_func_start sub_810347C -sub_810347C: @ 810347C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, _081034A0 @ =gSharedMem - movs r2, 0x34 - ldrsh r1, [r0, r2] - movs r2, 0x36 - ldrsh r0, [r0, r2] - cmp r1, r0 - bne _081034B4 - adds r0, r6, 0 - bl sub_810341C - lsls r0, 24 - lsrs r0, 24 - b _081034EA - .align 2, 0 -_081034A0: .4byte gSharedMem -_081034A4: - ldr r0, _081034B0 @ =gSharedMem - strh r5, [r0, 0x32] - mov r1, r8 - strh r1, [r0, 0x38] - movs r0, 0x1 - b _081034EA - .align 2, 0 -_081034B0: .4byte gSharedMem -_081034B4: - movs r2, 0x1 - mov r8, r2 - cmp r1, 0x1 - bne _081034C0 - movs r0, 0x3 - mov r8, r0 -_081034C0: - movs r5, 0 - mov r7, r8 -_081034C4: - lsls r0, r5, 16 - asrs r4, r0, 16 - subs r1, r7, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r0, r6 - beq _081034A4 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081034C4 - movs r0, 0 -_081034EA: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_810347C - - thumb_func_start sub_81034F4 -sub_81034F4: @ 81034F4 - push {r4,r5,lr} - movs r5, 0 - b _08103500 -_081034FA: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08103500: - lsls r0, r5, 16 - asrs r4, r0, 16 - adds r0, r4, 0 - bl sub_81030E0 - lsls r0, 24 - cmp r0, 0 - bne _081034FA - ldr r0, _0810351C @ =gSharedMem - strh r5, [r0, 0x2E] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0810351C: .4byte gSharedMem - thumb_func_end sub_81034F4 - - thumb_func_start sub_8103520 -sub_8103520: @ 8103520 - push {lr} - adds r1, r0, 0 - ldrb r0, [r1] - cmp r0, 0 - bne _0810352E - movs r0, 0x1 - b _08103538 -_0810352E: - cmp r0, 0x1 - beq _08103536 - movs r0, 0 - b _0810353C -_08103536: - movs r0, 0 -_08103538: - strb r0, [r1] - movs r0, 0x1 -_0810353C: - pop {r1} - bx r1 - thumb_func_end sub_8103520 - thumb_func_start sub_8103540 sub_8103540: @ 8103540 push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index df6a6bd0b..612dcd49f 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1596,6 +1596,53 @@ bool8 sub_810341C(u8 a0) return FALSE; } +bool8 sub_810347C(u8 a0) +{ + s16 i; + s16 r8; + if (eSlotMachine->unk34[0] == eSlotMachine->unk34[1]) + { + return sub_810341C(a0); + } + r8 = 1; + if (eSlotMachine->unk34[0] == 1) + { + r8 = 3; + } + for (i = 0; i < 5; i++) + { + if (sub_8102BF8(2, r8 - i) == a0) + { + eSlotMachine->unk2E[2] = i; + eSlotMachine->unk34[2] = r8; + return TRUE; + } + } + return FALSE; +} + +void sub_81034F4(void) +{ + s16 i; + for (i = 0; sub_81030E0(i); i++); + eSlotMachine->unk2E[0] = i; +} + +bool8 sub_8103520(u8 *a0) +{ + if (*a0 == 0) + { + *a0 = 1; + return TRUE; + } + if (*a0 == 1) + { + *a0 = 0; + return TRUE; + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From d6f88aaae447dbc22ff5fa289343343e7034263b Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 28 Dec 2017 02:47:41 -0500 Subject: fix for printf --- src/engine/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/engine/main.c b/src/engine/main.c index 11c540d07..e52551f72 100644 --- a/src/engine/main.c +++ b/src/engine/main.c @@ -83,6 +83,10 @@ static void WaitForVBlank(void); #define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON) +#ifndef NOAGBPRN + #include // don't include if not needed. +#endif + void AgbMain() { RegisterRamReset(RESET_ALL); @@ -103,6 +107,7 @@ void AgbMain() // to print stuff from, as anything else declared is NOT authoritative. #ifndef NOAGBPRN AGBPrintInit(); + __mb_cur_max = 1; // fix for AGBPrintf #endif if (gFlashMemoryPresent != TRUE) -- cgit v1.2.3 From ae42fdd5f4de2a68ef8d3ec8dd8147a189089a1b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 28 Dec 2017 20:43:51 -0500 Subject: through sub_8103668 (nonmatching) --- asm/slot_machine.s | 289 ----------------------------------------------- src/field/slot_machine.c | 250 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 250 insertions(+), 289 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 9e90a08bd..e19326a50 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,295 +5,6 @@ .text - thumb_func_start sub_8103540 -sub_8103540: @ 8103540 - push {lr} - ldr r1, _0810355C @ =gUnknown_083ECB88 - ldr r0, _08103560 @ =gSharedMem - movs r2, 0x12 - ldrsh r0, [r0, r2] - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .align 2, 0 -_0810355C: .4byte gUnknown_083ECB88 -_08103560: .4byte gSharedMem - thumb_func_end sub_8103540 - - thumb_func_start sub_8103564 -sub_8103564: @ 8103564 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - ldr r4, _081035D0 @ =gSharedMem - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _081035E0 - ldrb r1, [r4, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _081035E0 - ldrh r0, [r4, 0x2E] - movs r1, 0x2 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - mov r1, sp - strb r0, [r1] - mov r0, sp - bl sub_8103520 - lsls r0, 24 - cmp r0, 0 - beq _081035E0 - movs r5, 0 - mov r7, sp - movs r0, 0x2 - mov r8, r0 - adds r6, r4, 0 -_081035AA: - lsls r0, r5, 16 - asrs r4, r0, 16 - mov r0, r8 - subs r1, r0, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - ldrb r1, [r7] - lsls r0, 24 - lsrs r0, 24 - cmp r1, r0 - bne _081035D4 - movs r0, 0x2 - strh r0, [r6, 0x36] - strh r5, [r6, 0x30] - b _081035E0 - .align 2, 0 -_081035D0: .4byte gSharedMem -_081035D4: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081035AA -_081035E0: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8103564 - - thumb_func_start j5_08111E84 -j5_08111E84: @ 81035EC - push {r4-r7,lr} - sub sp, 0x4 - ldr r4, _08103650 @ =gSharedMem - ldrh r2, [r4, 0x34] - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08103660 - ldrb r1, [r4, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08103660 - ldrh r1, [r4, 0x2E] - subs r1, r2, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - mov r1, sp - strb r0, [r1] - mov r0, sp - bl sub_8103520 - lsls r0, 24 - cmp r0, 0 - beq _08103660 - movs r6, 0 - mov r7, sp - adds r5, r4, 0 -_0810362A: - ldrh r1, [r5, 0x34] - lsls r0, r6, 16 - asrs r4, r0, 16 - subs r1, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - ldrb r1, [r7] - lsls r0, 24 - lsrs r0, 24 - cmp r1, r0 - bne _08103654 - ldrh r0, [r5, 0x34] - strh r0, [r5, 0x36] - strh r6, [r5, 0x30] - b _08103660 - .align 2, 0 -_08103650: .4byte gSharedMem -_08103654: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _0810362A -_08103660: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end j5_08111E84 - - thumb_func_start sub_8103668 -sub_8103668: @ 8103668 - push {r4-r7,lr} - sub sp, 0x4 - ldr r4, _0810368C @ =gSharedMem - ldrh r3, [r4, 0x34] - movs r0, 0x34 - ldrsh r2, [r4, r0] - cmp r2, 0 - beq _0810375A - ldrb r1, [r4, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0810375A - cmp r2, 0x2 - bne _081036AE - bl j5_08111E84 - b _0810375A - .align 2, 0 -_0810368C: .4byte gSharedMem -_08103690: - ldr r0, _0810369C @ =gSharedMem - movs r1, 0 - strh r6, [r0, 0x36] - strh r1, [r0, 0x30] - b _0810375A - .align 2, 0 -_0810369C: .4byte gSharedMem -_081036A0: - movs r0, 0x2 - strh r0, [r5, 0x36] - adds r0, r4, 0x1 - strh r0, [r5, 0x30] - b _0810375A -_081036AA: - movs r0, 0x3 - b _08103736 -_081036AE: - ldrh r1, [r4, 0x2E] - subs r1, r3, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - mov r1, sp - strb r0, [r1] - mov r0, sp - bl sub_8103520 - lsls r0, 24 - cmp r0, 0 - beq _0810375A - movs r6, 0x2 - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, 0x3 - bne _081036D8 - movs r6, 0x3 -_081036D8: - movs r5, 0 - mov r7, sp -_081036DC: - lsls r0, r6, 16 - asrs r4, r0, 16 - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8102BF8 - ldrb r1, [r7] - lsls r0, 24 - lsrs r0, 24 - cmp r1, r0 - beq _08103690 - lsls r1, r5, 16 - movs r0, 0x80 - lsls r0, 9 - adds r1, r0 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - lsrs r5, r1, 16 - asrs r1, 16 - cmp r1, 0x1 - ble _081036DC - movs r6, 0x1 - mov r7, sp - ldr r5, _0810373C @ =gSharedMem -_0810370E: - ldrh r1, [r5, 0x34] - lsls r0, r6, 16 - asrs r4, r0, 16 - subs r1, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - ldrb r1, [r7] - lsls r0, 24 - lsrs r0, 24 - cmp r1, r0 - bne _0810374E - movs r1, 0x34 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - bne _08103740 - cmp r4, 0x2 - ble _081036A0 -_08103736: - strh r0, [r5, 0x36] - strh r6, [r5, 0x30] - b _0810375A - .align 2, 0 -_0810373C: .4byte gSharedMem -_08103740: - cmp r4, 0x2 - ble _081036AA - movs r0, 0x2 - strh r0, [r5, 0x36] - subs r0, r4, 0x1 - strh r0, [r5, 0x30] - b _0810375A -_0810374E: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _0810370E -_0810375A: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8103668 - thumb_func_start sub_8103764 sub_8103764: @ 8103764 push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 612dcd49f..9e5980446 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1643,6 +1643,256 @@ bool8 sub_8103520(u8 *a0) return FALSE; } +extern void (*gUnknown_083ECB88[])(void); + +void sub_8103540(void) +{ + gUnknown_083ECB88[eSlotMachine->bet - 1](); +} + +void sub_8103564(void) +{ + if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) + { + u8 sp0 = sub_8102BF8(0, 2 - eSlotMachine->unk2E[0]); + if (sub_8103520(&sp0)) + { + s16 i; + for (i = 0; i < 5; i++) + { + if (sp0 == sub_8102BF8(1, 2 - i)) + { + eSlotMachine->unk34[1] = 2; + eSlotMachine->unk2E[1] = i; + break; + } + } + } + } +} + +void j5_08111E84(void) +{ + if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) + { + u8 sp0 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + if (sub_8103520(&sp0)) + { + s16 i; + for (i = 0; i < 5; i++) + { + if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - i)) + { + eSlotMachine->unk34[1] = eSlotMachine->unk34[0]; + eSlotMachine->unk2E[1] = i; + break; + } + } + } + } +} + +#ifdef NONMATCHING // variable r6 is mistakenly plopped into r5, + // and variable i is mistakenly plopped into r6 +void sub_8103668(void) +{ + if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) + { + if (eSlotMachine->unk34[0] == 2) + { + j5_08111E84(); + } + else + { + u8 sp0 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + if (sub_8103520(&sp0)) + { + s16 i; + s16 r6 = 2; + if (eSlotMachine->unk34[0] == 3) + r6 = 3; + for (i = 0; i < 2; i++, r6--) + { + if (sp0 == sub_8102BF8(1, r6)) + { + eSlotMachine->unk34[1] = r6; + eSlotMachine->unk2E[1] = 0; + return; + } + } + for (i = 1; i < 5; i++) + { + if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - i)) + { + if (eSlotMachine->unk34[0] == 1) + { + if (i < 3) + { + eSlotMachine->unk34[1] = 2; + eSlotMachine->unk2E[1] = i + 1; + } + else + { + eSlotMachine->unk34[1] = 1; + eSlotMachine->unk2E[1] = i; + } + } + else + { + if (i < 3) + { + eSlotMachine->unk34[1] = 3; + eSlotMachine->unk2E[1] = i; + } + else + { + eSlotMachine->unk34[1] = 2; + eSlotMachine->unk2E[1] = i - 1; + } + } + return; + } + } + } + } + } +} +#else +__attribute__((naked)) void sub_8103668(void) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tsub sp, 0x4\n" + "\tldr r4, _0810368C @ =gSharedMem\n" + "\tldrh r3, [r4, 0x34]\n" + "\tmovs r0, 0x34\n" + "\tldrsh r2, [r4, r0]\n" + "\tcmp r2, 0\n" + "\tbeq _0810375A\n" + "\tldrb r1, [r4, 0x4]\n" + "\tmovs r0, 0x80\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0810375A\n" + "\tcmp r2, 0x2\n" + "\tbne _081036AE\n" + "\tbl j5_08111E84\n" + "\tb _0810375A\n" + "\t.align 2, 0\n" + "_0810368C: .4byte gSharedMem\n" + "_08103690:\n" + "\tldr r0, _0810369C @ =gSharedMem\n" + "\tmovs r1, 0\n" + "\tstrh r6, [r0, 0x36]\n" + "\tstrh r1, [r0, 0x30]\n" + "\tb _0810375A\n" + "\t.align 2, 0\n" + "_0810369C: .4byte gSharedMem\n" + "_081036A0:\n" + "\tmovs r0, 0x2\n" + "\tstrh r0, [r5, 0x36]\n" + "\tadds r0, r4, 0x1\n" + "\tstrh r0, [r5, 0x30]\n" + "\tb _0810375A\n" + "_081036AA:\n" + "\tmovs r0, 0x3\n" + "\tb _08103736\n" + "_081036AE:\n" + "\tldrh r1, [r4, 0x2E]\n" + "\tsubs r1, r3, r1\n" + "\tlsls r1, 16\n" + "\tasrs r1, 16\n" + "\tmovs r0, 0\n" + "\tbl sub_8102BF8\n" + "\tmov r1, sp\n" + "\tstrb r0, [r1]\n" + "\tmov r0, sp\n" + "\tbl sub_8103520\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _0810375A\n" + "\tmovs r6, 0x2\n" + "\tmovs r1, 0x34\n" + "\tldrsh r0, [r4, r1]\n" + "\tcmp r0, 0x3\n" + "\tbne _081036D8\n" + "\tmovs r6, 0x3\n" + "_081036D8:\n" + "\tmovs r5, 0\n" + "\tmov r7, sp\n" + "_081036DC:\n" + "\tlsls r0, r6, 16\n" + "\tasrs r4, r0, 16\n" + "\tmovs r0, 0x1\n" + "\tadds r1, r4, 0\n" + "\tbl sub_8102BF8\n" + "\tldrb r1, [r7]\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r1, r0\n" + "\tbeq _08103690\n" + "\tlsls r1, r5, 16\n" + "\tmovs r0, 0x80\n" + "\tlsls r0, 9\n" + "\tadds r1, r0\n" + "\tsubs r0, r4, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r6, r0, 16\n" + "\tlsrs r5, r1, 16\n" + "\tasrs r1, 16\n" + "\tcmp r1, 0x1\n" + "\tble _081036DC\n" + "\tmovs r6, 0x1\n" + "\tmov r7, sp\n" + "\tldr r5, _0810373C @ =gSharedMem\n" + "_0810370E:\n" + "\tldrh r1, [r5, 0x34]\n" + "\tlsls r0, r6, 16\n" + "\tasrs r4, r0, 16\n" + "\tsubs r1, r4\n" + "\tlsls r1, 16\n" + "\tasrs r1, 16\n" + "\tmovs r0, 0x1\n" + "\tbl sub_8102BF8\n" + "\tldrb r1, [r7]\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r1, r0\n" + "\tbne _0810374E\n" + "\tmovs r1, 0x34\n" + "\tldrsh r0, [r5, r1]\n" + "\tcmp r0, 0x1\n" + "\tbne _08103740\n" + "\tcmp r4, 0x2\n" + "\tble _081036A0\n" + "_08103736:\n" + "\tstrh r0, [r5, 0x36]\n" + "\tstrh r6, [r5, 0x30]\n" + "\tb _0810375A\n" + "\t.align 2, 0\n" + "_0810373C: .4byte gSharedMem\n" + "_08103740:\n" + "\tcmp r4, 0x2\n" + "\tble _081036AA\n" + "\tmovs r0, 0x2\n" + "\tstrh r0, [r5, 0x36]\n" + "\tsubs r0, r4, 0x1\n" + "\tstrh r0, [r5, 0x30]\n" + "\tb _0810375A\n" + "_0810374E:\n" + "\tadds r0, r4, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r6, r0, 16\n" + "\tasrs r0, 16\n" + "\tcmp r0, 0x4\n" + "\tble _0810370E\n" + "_0810375A:\n" + "\tadd sp, 0x4\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0"); +} +#endif // NONMATCHING + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From c42efaf17328594dc30e4fc6f31b8eef0f629278 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 28 Dec 2017 21:17:15 -0500 Subject: through sub_810380C --- asm/slot_machine.s | 129 ----------------------------------------------- src/field/slot_machine.c | 38 ++++++++++++++ 2 files changed, 38 insertions(+), 129 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index e19326a50..38573f519 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,135 +5,6 @@ .text - thumb_func_start sub_8103764 -sub_8103764: @ 8103764 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - adds r2, r1, 0 - cmp r0, 0 - bne _08103778 - cmp r1, 0x1 - beq _08103780 -_08103778: - cmp r0, 0x1 - bne _08103784 - cmp r2, 0 - bne _08103784 -_08103780: - movs r0, 0x1 - b _08103786 -_08103784: - movs r0, 0 -_08103786: - pop {r1} - bx r1 - thumb_func_end sub_8103764 - - thumb_func_start sub_810378C -sub_810378C: @ 810378C - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - cmp r0, 0 - bne _081037A6 - cmp r1, 0x1 - bne _081037A6 - cmp r2, 0 - beq _081037B2 -_081037A6: - cmp r0, 0x1 - bne _081037B6 - cmp r1, 0 - bne _081037B6 - cmp r2, 0x1 - bne _081037B6 -_081037B2: - movs r0, 0x1 - b _081037B8 -_081037B6: - movs r0, 0 -_081037B8: - pop {r1} - bx r1 - thumb_func_end sub_810378C - - thumb_func_start sub_81037BC -sub_81037BC: @ 81037BC - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - cmp r0, 0 - bne _081037D6 - cmp r1, 0x1 - bne _081037D6 - cmp r2, 0 - beq _08103802 -_081037D6: - cmp r0, 0x1 - bne _081037E2 - cmp r1, 0 - bne _081037E2 - cmp r2, 0x1 - beq _08103802 -_081037E2: - cmp r0, 0 - bne _081037EE - cmp r1, 0 - bne _081037EE - cmp r2, 0x1 - beq _08103802 -_081037EE: - cmp r0, 0x1 - bne _081037FA - cmp r1, 0x1 - bne _081037FA - cmp r2, 0 - beq _08103802 -_081037FA: - cmp r0, r1 - bne _08103806 - cmp r0, r2 - bne _08103806 -_08103802: - movs r0, 0 - b _08103808 -_08103806: - movs r0, 0x1 -_08103808: - pop {r1} - bx r1 - thumb_func_end sub_81037BC - - thumb_func_start sub_810380C -sub_810380C: @ 810380C - push {lr} - ldr r1, _08103828 @ =gUnknown_083ECB94 - ldr r0, _0810382C @ =gSharedMem - movs r2, 0x12 - ldrsh r0, [r0, r2] - subs r0, 0x1 - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .align 2, 0 -_08103828: .4byte gUnknown_083ECB94 -_0810382C: .4byte gSharedMem - thumb_func_end sub_810380C - thumb_func_start sub_8103830 sub_8103830: @ 8103830 push {r4-r7,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 9e5980446..a4b3175d2 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1893,6 +1893,44 @@ __attribute__((naked)) void sub_8103668(void) } #endif // NONMATCHING +bool8 sub_8103764(u8 a0, u8 a1) +{ + if ((a0 == 0 && a1 == 1) || (a0 == 1 && a1 == 0)) + { + return TRUE; + } + return FALSE; +} + +bool8 sub_810378C(u8 a0, u8 a1, u8 a2) +{ + if ((a0 == 0 && a1 == 1 && a2 == 0) || (a0 == 1 && a1 == 0 && a2 == 1)) + { + return TRUE; + } + return FALSE; +} + +bool8 sub_81037BC(u8 a0, u8 a1, u8 a2) +{ + if ((a0 == 0 && a1 == 1 && a2 == 0) || + (a0 == 1 && a1 == 0 && a2 == 1) || + (a0 == 0 && a1 == 0 && a2 == 1) || + (a0 == 1 && a1 == 1 && a2 == 0) || + (a0 == a1 && a0 == a2)) + { + return FALSE; + } + return TRUE; +} + +extern void (*const gUnknown_083ECB94[])(void); + +void sub_810380C(void) +{ + gUnknown_083ECB94[eSlotMachine->bet - 1](); +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 857b166086756ccc92e58981493513a7f00920ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 28 Dec 2017 21:49:13 -0500 Subject: sub_8103830 --- asm/slot_machine.s | 117 ----------------------------------------------- src/field/slot_machine.c | 43 +++++++++++++++++ 2 files changed, 43 insertions(+), 117 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 38573f519..1df6bb486 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,123 +5,6 @@ .text - thumb_func_start sub_8103830 -sub_8103830: @ 8103830 - push {r4-r7,lr} - movs r6, 0 - ldr r7, _08103868 @ =gSharedMem - ldrh r1, [r7, 0x2E] - movs r4, 0x2 - subs r1, r4, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r5, r0, 24 - ldrh r0, [r7, 0x30] - subs r4, r0 - lsls r4, 16 - asrs r4, 16 - movs r0, 0x1 - adds r1, r4, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r5, r1 - bne _081038A0 - movs r4, 0x2 - b _08103876 - .align 2, 0 -_08103868: .4byte gSharedMem -_0810386C: - lsls r0, r6, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r6, r0, 16 -_08103876: - lsls r1, r6, 16 - asrs r1, 16 - subs r1, r4, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r5, r0 - beq _0810386C - cmp r5, 0 - bne _08103896 - cmp r0, 0x1 - beq _0810386C -_08103896: - cmp r5, 0x1 - bne _08103900 - cmp r0, 0 - beq _0810386C - b _08103900 -_081038A0: - adds r0, r5, 0 - bl sub_8103764 - lsls r0, 24 - cmp r0, 0 - beq _08103900 - ldrb r1, [r7, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _081038DC - movs r7, 0x2 -_081038B8: - lsls r0, r6, 16 - asrs r4, r0, 16 - subs r1, r7, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r5, r0 - beq _08103900 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081038B8 -_081038DC: - movs r6, 0 - movs r7, 0x2 - b _081038E8 -_081038E2: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_081038E8: - lsls r0, r6, 16 - asrs r4, r0, 16 - subs r1, r7, r4 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r0, 24 - cmp r5, r0 - beq _081038E2 -_08103900: - ldr r0, _0810390C @ =gSharedMem - strh r6, [r0, 0x32] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0810390C: .4byte gSharedMem - thumb_func_end sub_8103830 - thumb_func_start sub_8103910 sub_8103910: @ 8103910 push {r4-r7,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index a4b3175d2..fbc89133a 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1931,6 +1931,49 @@ void sub_810380C(void) gUnknown_083ECB94[eSlotMachine->bet - 1](); } +void sub_8103830(void) +{ + s16 i = 0; + u8 r5 = sub_8102BF8(0, 2 - eSlotMachine->unk2E[0]); + u8 r1 = sub_8102BF8(1, 2 - eSlotMachine->unk2E[1]); + if (r5 == r1) + { + while (1) + { + u8 r0; + if (!(r5 == (r0 = sub_8102BF8(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) + { + break; + } + i++; + } + } + else if (sub_8103764(r5, r1)) + { + if (eSlotMachine->unk04 & 0x80) + { + for (i = 0; i < 5; i++) + { + if (r5 == sub_8102BF8(2, 2 - i)) + { + eSlotMachine->unk2E[2] = i; + return; + } + } + } + i = 0; + while (1) + { + if (r5 != sub_8102BF8(2, 2 - i)) + { + break; + } + i++; + } + } + eSlotMachine->unk2E[2] = i; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 31660ed578795464ed46f663bfaacd1ecb2006a6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Dec 2017 17:01:25 -0500 Subject: sub_8103910 --- asm/slot_machine.s | 183 ----------------------------------------------- src/field/slot_machine.c | 53 +++++++++++++- 2 files changed, 51 insertions(+), 185 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 1df6bb486..3d3f9a813 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,189 +5,6 @@ .text - thumb_func_start sub_8103910 -sub_8103910: @ 8103910 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - movs r0, 0 - str r0, [sp] - ldr r4, _08103978 @ =gSharedMem - movs r2, 0x36 - ldrsh r1, [r4, r2] - cmp r1, 0 - beq _081039A6 - ldrh r2, [r4, 0x34] - movs r3, 0x34 - ldrsh r0, [r4, r3] - cmp r0, r1 - bne _081039A6 - ldrb r1, [r4, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _081039A6 - ldrh r1, [r4, 0x2E] - subs r1, r2, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r7, r0, 24 - ldrh r1, [r4, 0x36] - ldrh r0, [r4, 0x30] - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r7, 0 - adds r1, r6, 0 - bl sub_8103764 - lsls r0, 24 - cmp r0, 0 - beq _081039A6 - movs r5, 0 - b _08103982 - .align 2, 0 -_08103978: .4byte gSharedMem -_0810397C: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08103982: - lsls r6, r5, 16 - asrs r5, r6, 16 - cmp r5, 0x4 - bgt _081039A6 - ldr r0, _08103A34 @ =gSharedMem - ldrh r1, [r0, 0x36] - subs r1, r5 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r7, r4 - bne _0810397C - lsrs r6, 16 - str r6, [sp] -_081039A6: - ldr r0, _08103A34 @ =gSharedMem - mov r9, r0 -_081039AA: - movs r5, 0x1 - movs r1, 0 - mov r8, r1 - ldr r2, [sp] - lsls r2, 16 - mov r10, r2 -_081039B6: - mov r3, r9 - ldrh r1, [r3, 0x2E] - lsls r5, 16 - asrs r4, r5, 16 - subs r1, r4, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r7, r0, 24 - mov r0, r9 - ldrh r1, [r0, 0x30] - subs r1, r4, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r6, r0, 24 - mov r1, r10 - asrs r0, r1, 16 - subs r4, r0 - lsls r4, 16 - asrs r4, 16 - movs r0, 0x2 - adds r1, r4, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r7, 0 - adds r1, r6, 0 - adds r2, r4, 0 - bl sub_81037BC - lsls r0, 24 - cmp r0, 0 - bne _08103A38 - adds r0, r7, 0 - adds r1, r6, 0 - adds r2, r4, 0 - bl sub_810378C - lsls r0, 24 - cmp r0, 0 - beq _08103A24 - mov r2, r9 - ldrb r1, [r2, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08103A38 -_08103A24: - mov r3, r8 - lsls r0, r3, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r0, 16 - mov r8, r0 - b _08103A46 - .align 2, 0 -_08103A34: .4byte gSharedMem -_08103A38: - movs r2, 0x80 - lsls r2, 9 - adds r0, r5, r2 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _081039B6 -_08103A46: - mov r3, r8 - cmp r3, 0 - beq _08103A5C - ldr r1, [sp] - lsls r0, r1, 16 - movs r2, 0x80 - lsls r2, 9 - adds r0, r2 - lsrs r0, 16 - str r0, [sp] - b _081039AA -_08103A5C: - ldr r0, _08103A74 @ =gSharedMem - mov r3, sp - ldrh r3, [r3] - strh r3, [r0, 0x32] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08103A74: .4byte gSharedMem - thumb_func_end sub_8103910 - thumb_func_start sub_8103A78 sub_8103A78: @ 8103A78 push {r4-r7,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index fbc89133a..bea32d9fb 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1696,6 +1696,8 @@ void j5_08111E84(void) // and variable i is mistakenly plopped into r6 void sub_8103668(void) { + s16 i; + s16 r6; if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) { if (eSlotMachine->unk34[0] == 2) @@ -1707,8 +1709,7 @@ void sub_8103668(void) u8 sp0 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); if (sub_8103520(&sp0)) { - s16 i; - s16 r6 = 2; + r6 = 2; if (eSlotMachine->unk34[0] == 3) r6 = 3; for (i = 0; i < 2; i++, r6--) @@ -1974,6 +1975,54 @@ void sub_8103830(void) eSlotMachine->unk2E[2] = i; } +void sub_8103910(void) +{ + s16 sp0 = 0; + s16 i; + u8 r7; + u8 r6; + u8 r4; + + if (eSlotMachine->unk34[1] != 0 && eSlotMachine->unk34[0] == eSlotMachine->unk34[1] && eSlotMachine->unk04 & 0x80) + { + r7 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + r6 = sub_8102BF8(1, eSlotMachine->unk34[1] - eSlotMachine->unk2E[1]); + if (sub_8103764(r7, r6)) + { + for (i = 0; i < 5; i++) + { + r4 = sub_8102BF8(2, eSlotMachine->unk34[1] - i); + if (r7 == r4) + { + sp0 = i; + break; + } + } + } + } + while (1) + { + s16 r8; + for (i = 1, r8 = 0; i < 4; i++) + { + r7 = sub_8102BF8(0, i - eSlotMachine->unk2E[0]); + r6 = sub_8102BF8(1, i - eSlotMachine->unk2E[1]); + r4 = sub_8102BF8(2, i - sp0); + if (!sub_81037BC(r7, r6, r4) && (!sub_810378C(r7, r6, r4) || !(eSlotMachine->unk04 & 0x80))) + { + r8++; + break; + } + } + if (r8 == 0) + { + break; + } + sp0++; + } + eSlotMachine->unk2E[2] = sp0; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From b7f9313a2183203a92d1eac744c52b13119202b7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Dec 2017 18:04:53 -0500 Subject: sub_8103A78 --- asm/slot_machine.s | 204 ----------------------------------------------- src/field/slot_machine.c | 49 ++++++++++++ 2 files changed, 49 insertions(+), 204 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 3d3f9a813..3fdbadee9 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,210 +5,6 @@ .text - thumb_func_start sub_8103A78 -sub_8103A78: @ 8103A78 - push {r4-r7,lr} - mov r7, r8 - push {r7} - bl sub_8103910 - ldr r4, _08103B10 @ =gSharedMem - movs r0, 0x36 - ldrsh r1, [r4, r0] - cmp r1, 0 - beq _08103B20 - ldrh r2, [r4, 0x34] - movs r3, 0x34 - ldrsh r0, [r4, r3] - cmp r0, r1 - beq _08103B20 - ldrb r1, [r4, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08103B20 - ldrh r1, [r4, 0x2E] - subs r1, r2, r1 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r6, r0, 24 - ldrh r1, [r4, 0x36] - ldrh r0, [r4, 0x30] - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r6, 0 - adds r1, r5, 0 - bl sub_8103764 - lsls r0, 24 - cmp r0, 0 - beq _08103B20 - movs r1, 0x1 - movs r2, 0x34 - ldrsh r0, [r4, r2] - cmp r0, 0x1 - bne _08103AE0 - movs r1, 0x3 -_08103AE0: - movs r3, 0 - lsls r1, 16 - mov r8, r1 - adds r7, r4, 0 -_08103AE8: - ldrh r2, [r7, 0x32] - lsls r0, r3, 16 - asrs r5, r0, 16 - adds r2, r5, r2 - mov r3, r8 - asrs r1, r3, 16 - subs r1, r2 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r6, r4 - bne _08103B14 - ldrh r0, [r7, 0x32] - adds r0, r5, r0 - strh r0, [r7, 0x32] - b _08103B20 - .align 2, 0 -_08103B10: .4byte gSharedMem -_08103B14: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _08103AE8 -_08103B20: - ldr r7, _08103B90 @ =gSharedMem -_08103B22: - ldrh r0, [r7, 0x2E] - movs r1, 0x1 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r6, r0, 24 - ldrh r0, [r7, 0x30] - movs r1, 0x2 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r5, r0, 24 - ldrh r0, [r7, 0x32] - movs r1, 0x3 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r6, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_81037BC - lsls r0, 24 - cmp r0, 0 - bne _08103B94 - adds r0, r6, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_810378C - lsls r0, 24 - cmp r0, 0 - beq _08103B88 - ldrb r1, [r7, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08103B94 -_08103B88: - ldrh r0, [r7, 0x32] - adds r0, 0x1 - strh r0, [r7, 0x32] - b _08103B22 - .align 2, 0 -_08103B90: .4byte gSharedMem -_08103B94: - ldr r7, _08103C04 @ =gSharedMem -_08103B96: - ldrh r0, [r7, 0x2E] - movs r1, 0x3 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0 - bl sub_8102BF8 - lsls r0, 24 - lsrs r6, r0, 24 - ldrh r0, [r7, 0x30] - movs r1, 0x2 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x1 - bl sub_8102BF8 - lsls r0, 24 - lsrs r5, r0, 24 - ldrh r0, [r7, 0x32] - movs r1, 0x1 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - movs r0, 0x2 - bl sub_8102BF8 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r6, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_81037BC - lsls r0, 24 - cmp r0, 0 - bne _08103C08 - adds r0, r6, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_810378C - lsls r0, 24 - cmp r0, 0 - beq _08103BFC - ldrb r1, [r7, 0x4] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08103C08 -_08103BFC: - ldrh r0, [r7, 0x32] - adds r0, 0x1 - strh r0, [r7, 0x32] - b _08103B96 - .align 2, 0 -_08103C04: .4byte gSharedMem -_08103C08: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8103A78 - thumb_func_start sub_8103C14 sub_8103C14: @ 8103C14 push {r4,r5,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index bea32d9fb..04cd699d3 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -2023,6 +2023,55 @@ void sub_8103910(void) eSlotMachine->unk2E[2] = sp0; } +void sub_8103A78(void) +{ + u8 r6; + u8 r5; + u8 r4; + s16 r8; + s16 i; + + sub_8103910(); + if (eSlotMachine->unk34[1] != 0 && eSlotMachine->unk34[0] != eSlotMachine->unk34[1] && eSlotMachine->unk04 & 0x80) + { + r6 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + r5 = sub_8102BF8(1, eSlotMachine->unk34[1] - eSlotMachine->unk2E[1]); + if (sub_8103764(r6, r5)) + { + r8 = 1; + if (eSlotMachine->unk34[0] == 1) + r8 = 3; + for (i = 0; i < 5; i++) + { + r4 = sub_8102BF8(2, r8 - (eSlotMachine->unk2E[2] + i)); + if (r6 == r4) + { + eSlotMachine->unk2E[2] += i; + break; + } + } + } + } + while (1) + { + r6 = sub_8102BF8(0, 1 - eSlotMachine->unk2E[0]); + r5 = sub_8102BF8(1, 2 - eSlotMachine->unk2E[1]); + r4 = sub_8102BF8(2, 3 - eSlotMachine->unk2E[2]); + if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && eSlotMachine->unk04 & 0x80)) + break; + eSlotMachine->unk2E[2]++; + } + while (1) + { + r6 = sub_8102BF8(0, 3 - eSlotMachine->unk2E[0]); + r5 = sub_8102BF8(1, 2 - eSlotMachine->unk2E[1]); + r4 = sub_8102BF8(2, 1 - eSlotMachine->unk2E[2]); + if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && eSlotMachine->unk04 & 0x80)) + break; + eSlotMachine->unk2E[2]++; + } +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 8e79fd9e13e42961cfb1de4c44714960ae3ac668 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Dec 2017 18:18:15 -0500 Subject: through sub_8103CC8 --- asm/slot_machine.s | 130 ----------------------------------------------- src/field/slot_machine.c | 50 +++++++++++++++--- 2 files changed, 43 insertions(+), 137 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 3fdbadee9..53423e9e4 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,136 +5,6 @@ .text - thumb_func_start sub_8103C14 -sub_8103C14: @ 8103C14 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, _08103C40 @ =sub_8103C48 - adds r0, r5, 0 - movs r1, 0x5 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08103C44 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0x26] - bl _call_via_r5 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08103C40: .4byte sub_8103C48 -_08103C44: .4byte gTasks - thumb_func_end sub_8103C14 - - thumb_func_start sub_8103C48 -sub_8103C48: @ 8103C48 - push {r4,lr} - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r3, _08103C70 @ =gUnknown_083ECBA0 - ldr r2, _08103C74 @ =gTasks - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r4, 0x8 - ldrsh r2, [r0, r4] - lsls r2, 2 - adds r2, r3 - ldr r2, [r2] - bl _call_via_r2 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08103C70: .4byte gUnknown_083ECBA0 -_08103C74: .4byte gTasks - thumb_func_end sub_8103C48 - - thumb_func_start sub_8103C78 -sub_8103C78: @ 8103C78 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r1, _08103CA8 @ =gUnknown_083ECBAC - movs r2, 0x26 - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0x73 - str r1, [sp] - movs r1, 0x62 - movs r2, 0x63 - movs r3, 0x72 - bl sub_81065A8 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08103CA8: .4byte gUnknown_083ECBAC - thumb_func_end sub_8103C78 - - thumb_func_start sub_8103CAC -sub_8103CAC: @ 8103CAC - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0xA] - adds r0, 0x1 - strh r0, [r1, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xB - ble _08103CC4 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_08103CC4: - pop {r0} - bx r0 - thumb_func_end sub_8103CAC - - thumb_func_start sub_8103CC8 -sub_8103CC8: @ 8103CC8 - push {r4,lr} - sub sp, 0x4 - lsls r4, r1, 24 - lsrs r4, 24 - ldr r1, _08103CFC @ =gUnknown_083ECBAC - movs r2, 0x26 - ldrsh r0, [r0, r2] - lsls r0, 1 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0x53 - str r1, [sp] - movs r1, 0x42 - movs r2, 0x43 - movs r3, 0x52 - bl sub_81065A8 - adds r0, r4, 0 - bl DestroyTask - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08103CFC: .4byte gUnknown_083ECBAC - thumb_func_end sub_8103CC8 - thumb_func_start sub_8103D00 sub_8103D00: @ 8103D00 push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 04cd699d3..922ab0c4d 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -95,14 +95,15 @@ static void sub_810290C(void); static u8 sub_81029D4(u8 c1, u8 c2, u8 c3); static void sub_8102A24(void); static void sub_8102A64(u8 taskId); -bool8 sub_8102A44(void); +static bool8 sub_8102A44(void); u8 sub_8102BA4(u8 x, s16 y); static void sub_8102DA8(void); static void sub_8102DEC(u8 a0); static void sub_8102E1C(u8 a0); -bool8 sub_8102E40(u8 a0); -void sub_8102E68(u8 taskId); -void sub_8103C14(u8 a0); +static bool8 sub_8102E40(u8 a0); +static void sub_8102E68(u8 taskId); +static void sub_8103C14(u8 a0); +void sub_8103C48(u8 taskId); void sub_8103D50(u8 a0); void sub_8103D8C(u8 a0); void sub_8103DC8(void); @@ -128,6 +129,7 @@ void sub_81050C4(void); void sub_81063C0(void); static void sub_8106448(void); void sub_81064B8(void); +void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { sub_8101D5C, @@ -1148,7 +1150,7 @@ static void sub_8102A24(void) sub_8102A64(CreateTask(sub_8102A64, 4)); } -bool8 sub_8102A44(void) +static bool8 sub_8102A44(void) { if (FindTaskIdByFunc(sub_8102A64) == 0xff) { @@ -1316,14 +1318,14 @@ static void sub_8102E1C(u8 a0) gTasks[eSlotMachine->unk3A[a0]].data[0] = 2; } -bool8 sub_8102E40(u8 a0) +static bool8 sub_8102E40(u8 a0) { return gTasks[eSlotMachine->unk3A[a0]].data[14]; } extern bool8 (*const gUnknown_083ECB2C[])(struct Task *task); -void sub_8102E68(u8 taskId) +static void sub_8102E68(u8 taskId) { while (gUnknown_083ECB2C[gTasks[taskId].data[0]](gTasks + taskId)); } @@ -2072,6 +2074,40 @@ void sub_8103A78(void) } } +static void sub_8103C14(u8 a0) +{ + u8 taskId = CreateTask(sub_8103C48, 5); + gTasks[taskId].data[15] = a0; + sub_8103C48(taskId); +} + +extern void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId); + +void sub_8103C48(u8 taskId) +{ + gUnknown_083ECBA0[gTasks[taskId].data[0]](gTasks + taskId, taskId); +} + +extern const s16 gUnknown_083ECBAC[]; + +void sub_8103C78(struct Task *task, u8 taskId) +{ + sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x62, 0x63, 0x72, 0x73); + task->data[0]++; +} + +void sub_8103CAC(struct Task *task, u8 taskId) +{ + if (++task->data[1] > 11) + task->data[0]++; +} + +void sub_8103CC8(struct Task *task, u8 taskId) +{ + sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x42, 0x43, 0x52, 0x53); + DestroyTask(taskId); +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From d05e72b6b269defef8d9b1bbce42adaf48f4ed8f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Dec 2017 19:35:05 -0500 Subject: through sub_8103E7C --- asm/slot_machine.s | 239 ----------------------------------------------- include/slot_machine.h | 4 +- src/field/slot_machine.c | 98 +++++++++++++++++-- 3 files changed, 93 insertions(+), 248 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 53423e9e4..500441c75 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,245 +5,6 @@ .text - thumb_func_start sub_8103D00 -sub_8103D00: @ 8103D00 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08103D20 @ =gUnknown_083EDD08 - lsls r1, r0, 2 - adds r1, r2 - ldr r2, [r1] - ldr r1, _08103D24 @ =gUnknown_083EDD30 - adds r0, r1 - ldrb r1, [r0] - adds r0, r2, 0 - movs r2, 0x2 - bl LoadPalette - pop {r0} - bx r0 - .align 2, 0 -_08103D20: .4byte gUnknown_083EDD08 -_08103D24: .4byte gUnknown_083EDD30 - thumb_func_end sub_8103D00 - - thumb_func_start sub_8103D28 -sub_8103D28: @ 8103D28 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08103D48 @ =gUnknown_083EDD1C - lsls r1, r0, 2 - adds r1, r2 - ldr r2, [r1] - ldr r1, _08103D4C @ =gUnknown_083EDD30 - adds r0, r1 - ldrb r1, [r0] - adds r0, r2, 0 - movs r2, 0x2 - bl LoadPalette - pop {r0} - bx r0 - .align 2, 0 -_08103D48: .4byte gUnknown_083EDD1C -_08103D4C: .4byte gUnknown_083EDD30 - thumb_func_end sub_8103D28 - - thumb_func_start sub_8103D50 -sub_8103D50: @ 8103D50 - push {r4-r7,lr} - lsls r0, 24 - lsrs r1, r0, 24 - movs r4, 0 - ldr r0, _08103D84 @ =gUnknown_083EDD3B - adds r0, r1, r0 - ldrb r0, [r0] - cmp r4, r0 - bcs _08103D7C - ldr r7, _08103D88 @ =gUnknown_083EDD35 - adds r6, r0, 0 - lsls r5, r1, 1 -_08103D68: - adds r0, r4, r5 - adds r0, r7 - ldrb r0, [r0] - bl sub_8103D00 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r6 - bcc _08103D68 -_08103D7C: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08103D84: .4byte gUnknown_083EDD3B -_08103D88: .4byte gUnknown_083EDD35 - thumb_func_end sub_8103D50 - - thumb_func_start sub_8103D8C -sub_8103D8C: @ 8103D8C - push {r4-r7,lr} - lsls r0, 24 - lsrs r1, r0, 24 - movs r4, 0 - ldr r0, _08103DC0 @ =gUnknown_083EDD3B - adds r0, r1, r0 - ldrb r0, [r0] - cmp r4, r0 - bcs _08103DB8 - ldr r7, _08103DC4 @ =gUnknown_083EDD35 - adds r6, r0, 0 - lsls r5, r1, 1 -_08103DA4: - adds r0, r4, r5 - adds r0, r7 - ldrb r0, [r0] - bl sub_8103D28 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r6 - bcc _08103DA4 -_08103DB8: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08103DC0: .4byte gUnknown_083EDD3B -_08103DC4: .4byte gUnknown_083EDD35 - thumb_func_end sub_8103D8C - - thumb_func_start sub_8103DC8 -sub_8103DC8: @ 8103DC8 - push {r4-r6,lr} - movs r4, 0 - ldr r6, _08103DF8 @ =gSprites - ldr r5, _08103DFC @ =gSharedMem + 0x44 -_08103DD0: - ldr r0, _08103E00 @ =sub_8103EE4 - bl CreateInvisibleSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - strh r4, [r1, 0x2E] - adds r1, r4, r5 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x4 - bls _08103DD0 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08103DF8: .4byte gSprites -_08103DFC: .4byte gSharedMem + 0x44 -_08103E00: .4byte sub_8103EE4 - thumb_func_end sub_8103DC8 - - thumb_func_start sub_8103E04 -sub_8103E04: @ 8103E04 - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08103E30 @ =gSharedMem - adds r1, 0x44 - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08103E34 @ =gSprites - adds r0, r1 - movs r2, 0 - movs r1, 0x1 - strh r1, [r0, 0x30] - movs r1, 0x4 - strh r1, [r0, 0x32] - strh r2, [r0, 0x34] - strh r2, [r0, 0x36] - movs r1, 0x2 - strh r1, [r0, 0x38] - strh r2, [r0, 0x3C] - bx lr - .align 2, 0 -_08103E30: .4byte gSharedMem -_08103E34: .4byte gSprites - thumb_func_end sub_8103E04 - - thumb_func_start sub_8103E38 -sub_8103E38: @ 8103E38 - push {r4,r5,lr} - movs r2, 0 - ldr r4, _08103E60 @ =gSharedMem + 0x44 - ldr r3, _08103E64 @ =gSprites -_08103E40: - adds r0, r2, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r0, r3 - movs r5, 0x30 - ldrsh r0, [r1, r5] - cmp r0, 0 - beq _08103E68 - movs r5, 0x32 - ldrsh r0, [r1, r5] - cmp r0, 0 - beq _08103E68 - movs r0, 0 - b _08103E74 - .align 2, 0 -_08103E60: .4byte gSharedMem + 0x44 -_08103E64: .4byte gSprites -_08103E68: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x4 - bls _08103E40 - movs r0, 0x1 -_08103E74: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8103E38 - - thumb_func_start sub_8103E7C -sub_8103E7C: @ 8103E7C - push {r4,r5,lr} - movs r4, 0 - ldr r5, _08103E94 @ =gSharedMem + 0x44 -_08103E82: - adds r0, r4, r5 - ldrb r0, [r0] - bl sub_8103EAC - lsls r0, 24 - cmp r0, 0 - bne _08103E98 - movs r0, 0 - b _08103EA4 - .align 2, 0 -_08103E94: .4byte gSharedMem + 0x44 -_08103E98: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x4 - bls _08103E82 - movs r0, 0x1 -_08103EA4: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8103E7C - thumb_func_start sub_8103EAC sub_8103EAC: @ 8103EAC push {lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 203f3bbfc..b04ee6377 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -28,7 +28,9 @@ struct SlotMachineEwramStruct { /*0x34*/ s16 unk34[3]; /*0x3A*/ u8 unk3A[3]; /*0x3D*/ u8 unk3D; - /*0x3E*/ u8 filler3E[26]; + /*0x3E*/ u8 filler3E[6]; + /*0x44*/ u8 unk44[5]; + /*0x49*/ u8 filler49[15]; /*0x58*/ u16 win0h; /*0x5a*/ u16 win0v; /*0x5c*/ u16 winIn; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 922ab0c4d..82ac4e9e7 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -103,13 +103,15 @@ static void sub_8102E1C(u8 a0); static bool8 sub_8102E40(u8 a0); static void sub_8102E68(u8 taskId); static void sub_8103C14(u8 a0); -void sub_8103C48(u8 taskId); -void sub_8103D50(u8 a0); -void sub_8103D8C(u8 a0); -void sub_8103DC8(void); -void sub_8103E04(u8 a0); -bool8 sub_8103E38(void); -bool8 sub_8103E7C(void); +static void sub_8103C48(u8 taskId); +static void sub_8103D50(u8 a0); +static void sub_8103D8C(u8 a0); +static void sub_8103DC8(void); +static void sub_8103E04(u8 a0); +static bool8 sub_8103E38(void); +static bool8 sub_8103E7C(void); +bool8 sub_8103EAC(u8 a0); +void sub_8103EE4(struct Sprite *sprite); void sub_8103F70(void); bool8 sub_8103FA0(void); void sub_8104048(void); @@ -2083,7 +2085,7 @@ static void sub_8103C14(u8 a0) extern void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId); -void sub_8103C48(u8 taskId) +static void sub_8103C48(u8 taskId) { gUnknown_083ECBA0[gTasks[taskId].data[0]](gTasks + taskId, taskId); } @@ -2108,6 +2110,86 @@ void sub_8103CC8(struct Task *task, u8 taskId) DestroyTask(taskId); } +extern const u16 *const gUnknown_083EDD08[]; +extern const u16 *const gUnknown_083EDD1C[]; +extern const u8 gUnknown_083EDD30[]; + +static void sub_8103D00(u8 a0) +{ + LoadPalette(gUnknown_083EDD08[a0], gUnknown_083EDD30[a0], 2); +} + +static void sub_8103D28(u8 a0) +{ + LoadPalette(gUnknown_083EDD1C[a0], gUnknown_083EDD30[a0], 2); +} + +extern const u8 gUnknown_083EDD3B[]; +extern const u8 gUnknown_083EDD35[][2]; + +static void sub_8103D50(u8 a0) +{ + u8 i; + for (i = 0; i < gUnknown_083EDD3B[a0]; i++) + { + sub_8103D00(gUnknown_083EDD35[a0][i]); + } +} + +static void sub_8103D8C(u8 a0) +{ + u8 i; + for (i = 0; i < gUnknown_083EDD3B[a0]; i++) + { + sub_8103D28(gUnknown_083EDD35[a0][i]); + } +} + +static void sub_8103DC8(void) +{ + u8 i; + for (i = 0; i < 5; i++) + { + u8 spriteId = CreateInvisibleSprite(sub_8103EE4); + gSprites[spriteId].data[0] = i; + eSlotMachine->unk44[i] = spriteId; + } +} + +static void sub_8103E04(u8 a0) +{ + struct Sprite *sprite = gSprites + eSlotMachine->unk44[a0]; + sprite->data[1] = 1; + sprite->data[2] = 4; + sprite->data[3] = 0; + sprite->data[4] = 0; + sprite->data[5] = 2; + sprite->data[7] = 0; +} + +static bool8 sub_8103E38(void) +{ + u8 i; + for (i = 0; i < 5; i++) + { + struct Sprite *sprite = gSprites + eSlotMachine->unk44[i]; + if (sprite->data[1] && sprite->data[2]) + return FALSE; + } + return TRUE; +} + +static bool8 sub_8103E7C(void) +{ + u8 i; + for (i = 0; i < 5; i++) + { + if (!sub_8103EAC(eSlotMachine->unk44[i])) + return FALSE; + } + return TRUE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 17745475ccc35c99ac9b586a03bc39de0936bb2e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Dec 2017 20:03:05 -0500 Subject: through sub_8103FA0 --- asm/slot_machine.s | 174 ----------------------------------------------- include/field_effect.h | 1 + src/field/slot_machine.c | 70 +++++++++++++++++-- 3 files changed, 67 insertions(+), 178 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 500441c75..20e9cc3b0 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,180 +5,6 @@ .text - thumb_func_start sub_8103EAC -sub_8103EAC: @ 8103EAC - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, _08103EC8 @ =gSprites - adds r1, r0 - movs r2, 0x30 - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _08103ECC - movs r0, 0x1 - b _08103EDE - .align 2, 0 -_08103EC8: .4byte gSprites -_08103ECC: - ldrh r2, [r1, 0x3C] - movs r3, 0x3C - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _08103EDA - movs r0, 0 - strh r0, [r1, 0x30] -_08103EDA: - lsls r0, r2, 24 - lsrs r0, 24 -_08103EDE: - pop {r1} - bx r1 - thumb_func_end sub_8103EAC - - thumb_func_start sub_8103EE4 -sub_8103EE4: @ 8103EE4 - push {r4-r7,lr} - adds r2, r0, 0 - movs r1, 0x30 - ldrsh r0, [r2, r1] - cmp r0, 0 - beq _08103F66 - ldrh r0, [r2, 0x34] - subs r0, 0x1 - strh r0, [r2, 0x34] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _08103F4E - movs r0, 0 - strh r0, [r2, 0x3C] - movs r6, 0x1 - strh r6, [r2, 0x34] - ldrh r1, [r2, 0x38] - ldrh r3, [r2, 0x36] - adds r0, r1, r3 - strh r0, [r2, 0x36] - movs r4, 0x4 - ldrh r5, [r2, 0x32] - movs r7, 0x32 - ldrsh r3, [r2, r7] - cmp r3, 0 - beq _08103F20 - movs r4, 0x8 -_08103F20: - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bgt _08103F38 - strh r6, [r2, 0x3C] - negs r0, r1 - strh r0, [r2, 0x38] - cmp r3, 0 - beq _08103F4E - subs r0, r5, 0x1 - strh r0, [r2, 0x32] - b _08103F40 -_08103F38: - cmp r0, r4 - blt _08103F40 - negs r0, r1 - strh r0, [r2, 0x38] -_08103F40: - movs r1, 0x32 - ldrsh r0, [r2, r1] - cmp r0, 0 - beq _08103F4E - ldrh r0, [r2, 0x34] - lsls r0, 1 - strh r0, [r2, 0x34] -_08103F4E: - ldr r1, _08103F6C @ =gUnknown_083EDD30 - movs r3, 0x2E - ldrsh r0, [r2, r3] - adds r0, r1 - ldrb r0, [r0] - ldrh r3, [r2, 0x36] - lsls r3, 24 - lsrs r3, 24 - adds r1, r3, 0 - adds r2, r3, 0 - bl MultiplyPaletteRGBComponents -_08103F66: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08103F6C: .4byte gUnknown_083EDD30 - thumb_func_end sub_8103EE4 - - thumb_func_start sub_8103F70 -sub_8103F70: @ 8103F70 - push {r4,lr} - ldr r4, _08103F98 @ =sub_8103FE8 - adds r0, r4, 0 - movs r1, 0x6 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08103F9C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0x1 - strh r2, [r1, 0xE] - bl _call_via_r4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08103F98: .4byte sub_8103FE8 -_08103F9C: .4byte gTasks - thumb_func_end sub_8103F70 - - thumb_func_start sub_8103FA0 -sub_8103FA0: @ 8103FA0 - push {lr} - ldr r0, _08103FC4 @ =sub_8103FE8 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _08103FC8 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - movs r1, 0xC - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _08103FCC - movs r0, 0 - b _08103FE0 - .align 2, 0 -_08103FC4: .4byte sub_8103FE8 -_08103FC8: .4byte gTasks -_08103FCC: - adds r0, r2, 0 - bl DestroyTask - ldr r0, _08103FE4 @ =gUnknown_083EDDAC - ldr r0, [r0] - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x1 -_08103FE0: - pop {r1} - bx r1 - .align 2, 0 -_08103FE4: .4byte gUnknown_083EDDAC - thumb_func_end sub_8103FA0 - thumb_func_start sub_8103FE8 sub_8103FE8: @ 8103FE8 push {lr} diff --git a/include/field_effect.h b/include/field_effect.h index 9f71efba1..bb859074f 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -252,6 +252,7 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite); void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8); void sub_80878A8(void); void sub_8087BA8(void); +void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); extern s32 gFieldEffectArguments[8]; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 82ac4e9e7..659688d81 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -3,6 +3,7 @@ #include "strings2.h" #include "overworld.h" #include "menu_cursor.h" +#include "field_effect.h" #include "random.h" #include "sound.h" #include "main.h" @@ -110,10 +111,11 @@ static void sub_8103DC8(void); static void sub_8103E04(u8 a0); static bool8 sub_8103E38(void); static bool8 sub_8103E7C(void); -bool8 sub_8103EAC(u8 a0); -void sub_8103EE4(struct Sprite *sprite); -void sub_8103F70(void); -bool8 sub_8103FA0(void); +static bool8 sub_8103EAC(u8 spriteId); +static void sub_8103EE4(struct Sprite *sprite); +static void sub_8103F70(void); +void sub_8103FE8(u8 taskId); +static bool8 sub_8103FA0(void); void sub_8104048(void); void sub_8104064(u8 a0); bool8 sub_81040C8(void); @@ -2190,6 +2192,66 @@ static bool8 sub_8103E7C(void) return TRUE; } +static bool8 sub_8103EAC(u8 spriteId) +{ + struct Sprite *sprite = gSprites + spriteId; + if (!sprite->data[1]) + return TRUE; + if (sprite->data[7]) + sprite->data[1] = 0; + return sprite->data[7]; +} + +static void sub_8103EE4(struct Sprite *sprite) +{ + s16 r4; + if (sprite->data[1]) + { + if (!sprite->data[3]--) + { + sprite->data[7] = 0; + sprite->data[3] = 1; + sprite->data[4] += sprite->data[5]; + r4 = 4; + if (sprite->data[2]) + r4 = 8; + if (sprite->data[4] <= 0) + { + sprite->data[7] = 1; + sprite->data[5] = -sprite->data[5]; + if (sprite->data[2]) + sprite->data[2]--; + } + else if (sprite->data[4] >= r4) + sprite->data[5] = -sprite->data[5]; + if (sprite->data[2]) + sprite->data[3] <<= 1; + } + MultiplyPaletteRGBComponents(gUnknown_083EDD30[sprite->data[0]], sprite->data[4], sprite->data[4], sprite->data[4]); + } +} + +static void sub_8103F70(void) +{ + u8 taskId = CreateTask(sub_8103FE8, 6); + gTasks[taskId].data[3] = 1; + sub_8103FE8(taskId); +} + +extern const u16 *const gUnknown_083EDDAC; + +static bool8 sub_8103FA0(void) +{ + u8 taskId = FindTaskIdByFunc(sub_8103FE8); + if (!gTasks[taskId].data[2]) + { + DestroyTask(taskId); + LoadPalette(gUnknown_083EDDAC, 0x10, 0x20); + return TRUE; + } + return FALSE; +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 8eb7f3db6ee630fd801391ac3a3b574abfa7a08d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Dec 2017 21:14:09 -0500 Subject: through sub_8104144 --- asm/slot_machine.s | 248 ----------------------------------------------- include/slot_machine.h | 3 +- src/field/slot_machine.c | 91 ++++++++++++++++- 3 files changed, 90 insertions(+), 252 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 20e9cc3b0..64cdf3a3d 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,254 +5,6 @@ .text - thumb_func_start sub_8103FE8 -sub_8103FE8: @ 8103FE8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _08104040 @ =gTasks - adds r2, r1, r0 - ldrh r0, [r2, 0xA] - subs r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _08104026 - movs r0, 0x4 - strh r0, [r2, 0xA] - ldrh r1, [r2, 0xE] - ldrh r3, [r2, 0xC] - adds r0, r1, r3 - strh r0, [r2, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - beq _08104022 - cmp r0, 0x2 - bne _08104026 -_08104022: - negs r0, r1 - strh r0, [r2, 0xE] -_08104026: - ldr r0, _08104044 @ =gUnknown_083EDDA0 - movs r3, 0xC - ldrsh r1, [r2, r3] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - pop {r0} - bx r0 - .align 2, 0 -_08104040: .4byte gTasks -_08104044: .4byte gUnknown_083EDDA0 - thumb_func_end sub_8103FE8 - - thumb_func_start sub_8104048 -sub_8104048: @ 8104048 - push {lr} - ldr r0, _0810405C @ =sub_81040E8 - movs r1, 0x8 - bl CreateTask - ldr r1, _08104060 @ =gSharedMem - adds r1, 0x3E - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0810405C: .4byte sub_81040E8 -_08104060: .4byte gSharedMem - thumb_func_end sub_8104048 - - thumb_func_start sub_8104064 -sub_8104064: @ 8104064 - push {r4,lr} - ldr r0, _08104090 @ =gSharedMem - adds r0, 0x3E - ldrb r0, [r0] - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _08104094 @ =gTasks - adds r4, r0 - adds r0, r4, 0 - bl sub_810421C - movs r1, 0x1 - strh r1, [r4, 0x8] - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - strh r1, [r4, 0x26] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08104090: .4byte gSharedMem -_08104094: .4byte gTasks - thumb_func_end sub_8104064 - - thumb_func_start sub_8104098 -sub_8104098: @ 8104098 - push {r4,lr} - ldr r0, _081040C0 @ =gSharedMem - adds r0, 0x3E - ldrb r0, [r0] - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _081040C4 @ =gTasks - adds r4, r0 - adds r0, r4, 0 - bl sub_810421C - movs r0, 0x3 - strh r0, [r4, 0x8] - movs r0, 0x1 - strh r0, [r4, 0x26] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081040C0: .4byte gSharedMem -_081040C4: .4byte gTasks - thumb_func_end sub_8104098 - - thumb_func_start sub_81040C8 -sub_81040C8: @ 81040C8 - ldr r2, _081040E0 @ =gTasks - ldr r0, _081040E4 @ =gSharedMem - adds r0, 0x3E - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r0, [r0, 0x26] - lsls r0, 24 - lsrs r0, 24 - bx lr - .align 2, 0 -_081040E0: .4byte gTasks -_081040E4: .4byte gSharedMem - thumb_func_end sub_81040C8 - - thumb_func_start sub_81040E8 -sub_81040E8: @ 81040E8 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r3, _08104110 @ =gUnknown_083ECBB4 - ldr r2, _08104114 @ =gTasks - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r2, 0x8 - ldrsh r1, [r0, r2] - lsls r1, 2 - adds r1, r3 - ldr r1, [r1] - bl _call_via_r1 - pop {r0} - bx r0 - .align 2, 0 -_08104110: .4byte gUnknown_083ECBB4 -_08104114: .4byte gTasks - thumb_func_end sub_81040E8 - - thumb_func_start nullsub_68 -nullsub_68: @ 8104118 - bx lr - thumb_func_end nullsub_68 - - thumb_func_start sub_810411C -sub_810411C: @ 810411C - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0xA] - lsls r0, 19 - movs r1, 0xA0 - lsls r1, 13 - adds r0, r1 - asrs r0, 16 - movs r1, 0x14 - bl sub_8105B1C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810411C - - thumb_func_start sub_8104144 -sub_8104144: @ 8104144 - push {r4,lr} - adds r4, r0, 0 - ldr r2, _08104174 @ =gSprites - movs r0, 0xC - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r1, 0x3C - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0810419E - ldrh r1, [r4, 0xA] - adds r0, r1, 0x2 - lsls r0, 16 - lsrs r2, r0, 16 - movs r0, 0 - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x1 - bne _08104178 - movs r0, 0x1 - b _0810417E - .align 2, 0 -_08104174: .4byte gSprites -_08104178: - cmp r1, 0x10 - bne _0810417E - movs r0, 0x2 -_0810417E: - lsls r1, r2, 16 - asrs r1, 15 - ldr r2, _081041A4 @ =0x0600e800 - adds r1, r2 - adds r1, 0x80 - ldr r2, _081041A8 @ =gUnknown_083ECBC4 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - ldrb r0, [r4, 0xC] - bl sub_8105B88 - movs r0, 0 - strh r0, [r4, 0x8] - strh r0, [r4, 0x26] -_0810419E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081041A4: .4byte 0x0600e800 -_081041A8: .4byte gUnknown_083ECBC4 - thumb_func_end sub_8104144 - thumb_func_start sub_81041AC sub_81041AC: @ 81041AC push {r4,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index b04ee6377..81263e97e 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -28,7 +28,8 @@ struct SlotMachineEwramStruct { /*0x34*/ s16 unk34[3]; /*0x3A*/ u8 unk3A[3]; /*0x3D*/ u8 unk3D; - /*0x3E*/ u8 filler3E[6]; + /*0x3E*/ u8 unk3E; + /*0x3F*/ u8 filler3F[5]; /*0x44*/ u8 unk44[5]; /*0x49*/ u8 filler49[15]; /*0x58*/ u16 win0h; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 659688d81..9efaccd39 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -114,11 +114,13 @@ static bool8 sub_8103E7C(void); static bool8 sub_8103EAC(u8 spriteId); static void sub_8103EE4(struct Sprite *sprite); static void sub_8103F70(void); -void sub_8103FE8(u8 taskId); static bool8 sub_8103FA0(void); -void sub_8104048(void); -void sub_8104064(u8 a0); +static void sub_8103FE8(u8 taskId); +static void sub_8104048(void); +static void sub_8104064(u8 unused); bool8 sub_81040C8(void); +void sub_81040E8(u8 taskId); +void sub_810421C(struct Task *task); void sub_810423C(u8 a0); void sub_810430C(void); bool8 sub_810432C(void); @@ -130,6 +132,8 @@ bool8 sub_8104E18(void); void sub_8104EA8(void); void sub_8104F8C(void); void sub_81050C4(void); +u8 sub_8105B1C(s16 a0, s16 a1); +void sub_8105B88(u8 a0); void sub_81063C0(void); static void sub_8106448(void); void sub_81064B8(void); @@ -2238,6 +2242,7 @@ static void sub_8103F70(void) sub_8103FE8(taskId); } +extern const u16 *const gUnknown_083EDDA0[]; extern const u16 *const gUnknown_083EDDAC; static bool8 sub_8103FA0(void) @@ -2252,6 +2257,86 @@ static bool8 sub_8103FA0(void) return FALSE; } +static void sub_8103FE8(u8 taskId) +{ + struct Task *task = gTasks + taskId; + if (!task->data[1]--) + { + task->data[1] = 4; + task->data[2] += task->data[3]; + if (task->data[2] == 0 || task->data[2] == 2) + { + task->data[3] = -task->data[3]; + } + } + LoadPalette(gUnknown_083EDDA0[task->data[2]], 0x10, 0x20); +} + +static void sub_8104048(void) +{ + eSlotMachine->unk3E = CreateTask(sub_81040E8, 8); +} + +static void sub_8104064(u8 unused) +{ + struct Task *task = gTasks + eSlotMachine->unk3E; + sub_810421C(task); + task->data[0] = 1; + task->data[1]++; + task->data[15] = 1; +} + +void sub_8104098(void) +{ + struct Task *task = gTasks + eSlotMachine->unk3E; + sub_810421C(task); + task->data[0] = 3; + task->data[15] = 1; +} + +bool8 sub_81040C8(void) +{ + return gTasks[eSlotMachine->unk3E].data[15]; +} + +extern void (*const gUnknown_083ECBB4[])(struct Task *task); + +void sub_81040E8(u8 taskId) +{ + gUnknown_083ECBB4[gTasks[taskId].data[0]](gTasks + taskId); +} + +void nullsub_68(struct Task *task) +{ + +} + +void sub_810411C(struct Task *task) +{ + task->data[2] = sub_8105B1C((task->data[1] << 3) + 20, 20); + task->data[0]++; +} + +extern const u16 gUnknown_083ECBC4[][2]; + +void sub_8104144(struct Task *task) +{ + u16 *vaddr = (u16 *)BG_SCREEN_ADDR(29); + if (gSprites[task->data[2]].data[7]) + { + s16 r2 = task->data[1] + 2; + u8 r0 = 0; + if (task->data[1] == 1) + r0 = 1; + else if (task->data[1] == 16) + r0 = 2; + vaddr[r2 + 0x40] = gUnknown_083ECBC4[r0][0]; + sub_8105B88(task->data[2]); + task->data[0] = 0; + task->data[15] = 0; + } +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 1d1c88a850e0967051599b37873328e63ae63643 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 10:30:24 -0500 Subject: through sub_810437C --- asm/slot_machine.s | 305 ----------------------------------------------- src/field/slot_machine.c | 119 +++++++++++++++++- 2 files changed, 114 insertions(+), 310 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 64cdf3a3d..4cf21d22e 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,311 +5,6 @@ .text - thumb_func_start sub_81041AC -sub_81041AC: @ 81041AC - push {r4,lr} - adds r3, r0, 0 - ldrh r1, [r3, 0xA] - adds r0, r1, 0x2 - lsls r0, 16 - lsrs r4, r0, 16 - movs r2, 0 - lsls r1, 16 - asrs r1, 16 - cmp r1, 0x1 - bne _081041C6 - movs r2, 0x1 - b _081041CC -_081041C6: - cmp r1, 0x10 - bne _081041CC - movs r2, 0x2 -_081041CC: - movs r1, 0xC - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _081041F0 - lsls r0, r4, 16 - asrs r0, 15 - ldr r1, _08104214 @ =0x0600e800 - adds r0, r1 - adds r0, 0x80 - ldr r1, _08104218 @ =gUnknown_083ECBC4 - lsls r2, 2 - adds r1, 0x2 - adds r2, r1 - ldrh r1, [r2] - strh r1, [r0] - ldrh r0, [r3, 0xA] - subs r0, 0x1 - strh r0, [r3, 0xA] -_081041F0: - ldrh r0, [r3, 0xC] - adds r0, 0x1 - strh r0, [r3, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x13 - ble _08104202 - movs r0, 0 - strh r0, [r3, 0xC] -_08104202: - movs r1, 0xA - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _0810420E - strh r0, [r3, 0x8] - strh r0, [r3, 0x26] -_0810420E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08104214: .4byte 0x0600e800 -_08104218: .4byte gUnknown_083ECBC4 - thumb_func_end sub_81041AC - - thumb_func_start sub_810421C -sub_810421C: @ 810421C - push {lr} - movs r1, 0x2 - adds r2, r0, 0 - adds r2, 0x8 - movs r3, 0 -_08104226: - lsls r0, r1, 1 - adds r0, r2, r0 - strh r3, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xF - bls _08104226 - pop {r0} - bx r0 - thumb_func_end sub_810421C - - thumb_func_start sub_810423C -sub_810423C: @ 810423C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r5, r0, 24 - movs r2, 0x3 - ldr r6, _08104268 @ =0x0600e800 - movs r4, 0 - ldr r0, _0810426C @ =gTasks - mov r8, r0 - ldr r1, _08104270 @ =gSharedMem - mov r12, r1 - cmp r4, r5 - bge _081042A6 - ldr r7, _08104274 @ =gUnknown_083ECBC4 -_0810425A: - movs r3, 0 - lsls r0, r4, 16 - asrs r0, 16 - cmp r0, 0 - bne _08104278 - movs r3, 0x1 - b _0810427E - .align 2, 0 -_08104268: .4byte 0x0600e800 -_0810426C: .4byte gTasks -_08104270: .4byte gSharedMem -_08104274: .4byte gUnknown_083ECBC4 -_08104278: - cmp r0, 0xF - bne _0810427E - movs r3, 0x2 -_0810427E: - lsls r2, 16 - asrs r2, 16 - lsls r1, r2, 1 - adds r1, r6 - adds r1, 0x80 - lsls r0, r3, 2 - adds r0, r7 - ldrh r0, [r0] - strh r0, [r1] - lsls r0, r4, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - adds r2, 0x1 - lsls r2, 16 - lsrs r2, 16 - lsrs r4, r0, 16 - asrs r0, 16 - cmp r0, r5 - blt _0810425A -_081042A6: - lsls r1, r4, 16 - asrs r0, r1, 16 - cmp r0, 0xF - bgt _081042F0 - ldr r7, _081042BC @ =gUnknown_083ECBC4 + 0x2 -_081042B0: - movs r3, 0 - asrs r0, r1, 16 - cmp r0, 0 - bne _081042C0 - movs r3, 0x1 - b _081042C6 - .align 2, 0 -_081042BC: .4byte gUnknown_083ECBC4 + 0x2 -_081042C0: - cmp r0, 0xF - bne _081042C6 - movs r3, 0x2 -_081042C6: - lsls r2, 16 - asrs r2, 16 - lsls r1, r2, 1 - adds r1, r6 - adds r1, 0x80 - lsls r0, r3, 2 - adds r0, r7 - ldrh r0, [r0] - strh r0, [r1] - lsls r0, r4, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r4, r0, 16 - adds r2, 0x1 - lsls r2, 16 - lsrs r2, 16 - lsls r1, r4, 16 - asrs r0, r1, 16 - cmp r0, 0xF - ble _081042B0 -_081042F0: - mov r0, r12 - adds r0, 0x3E - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - add r0, r8 - strh r5, [r0, 0xA] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_810423C - - thumb_func_start sub_810430C -sub_810430C: @ 810430C - push {r4,lr} - ldr r4, _08104328 @ =sub_810434C - adds r0, r4, 0 - movs r1, 0x7 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - bl _call_via_r4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08104328: .4byte sub_810434C - thumb_func_end sub_810430C - - thumb_func_start sub_810432C -sub_810432C: @ 810432C - push {lr} - ldr r0, _08104340 @ =sub_810434C - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08104344 - movs r0, 0 - b _08104346 - .align 2, 0 -_08104340: .4byte sub_810434C -_08104344: - movs r0, 0x1 -_08104346: - pop {r1} - bx r1 - thumb_func_end sub_810432C - - thumb_func_start sub_810434C -sub_810434C: @ 810434C - push {lr} - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r3, _08104374 @ =gUnknown_083ECBD0 - ldr r2, _08104378 @ =gTasks - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r2, 0x8 - ldrsh r1, [r0, r2] - lsls r1, 2 - adds r1, r3 - ldr r1, [r1] - bl _call_via_r1 - pop {r0} - bx r0 - .align 2, 0 -_08104374: .4byte gUnknown_083ECBD0 -_08104378: .4byte gTasks - thumb_func_end sub_810434C - - thumb_func_start sub_810437C -sub_810437C: @ 810437C - push {lr} - ldr r1, _081043DC @ =gSharedMem - movs r2, 0 - strb r2, [r1, 0xA] - strh r2, [r1, 0x14] - strh r2, [r1, 0x16] - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - strh r2, [r0, 0xA] - movs r1, 0x1E - strh r1, [r0, 0xC] - movs r1, 0xA0 - lsls r1, 3 - strh r1, [r0, 0x10] - ldr r0, _081043E0 @ =gSpriteCoordOffsetX - strh r2, [r0] - ldr r0, _081043E4 @ =gSpriteCoordOffsetY - strh r2, [r0] - ldr r0, _081043E8 @ =REG_BG1HOFS - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - movs r0, 0x1E - movs r1, 0 - bl sub_8104A40 - bl sub_81051C0 - bl sub_8105100 - bl sub_81052EC - bl sub_81053A0 - bl sub_810545C - bl sub_8102680 - bl StopMapMusic - movs r0, 0xC4 - lsls r0, 1 - bl PlayNewMapMusic - pop {r0} - bx r0 - .align 2, 0 -_081043DC: .4byte gSharedMem -_081043E0: .4byte gSpriteCoordOffsetX -_081043E4: .4byte gSpriteCoordOffsetY -_081043E8: .4byte REG_BG1HOFS - thumb_func_end sub_810437C - thumb_func_start sub_81043EC sub_81043EC: @ 81043EC push {r4,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 9efaccd39..f7679588c 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -119,11 +119,13 @@ static void sub_8103FE8(u8 taskId); static void sub_8104048(void); static void sub_8104064(u8 unused); bool8 sub_81040C8(void); -void sub_81040E8(u8 taskId); -void sub_810421C(struct Task *task); +static void sub_81040E8(u8 taskId); +static void sub_810421C(struct Task *task); void sub_810423C(u8 a0); -void sub_810430C(void); -bool8 sub_810432C(void); +static void sub_810430C(void); +static bool8 sub_810432C(void); +void sub_810434C(u8 taskId); +void sub_8104A40(s16 a0, s16 a1); void sub_8104AB8(u8 a0); bool8 sub_8104AEC(void); void sub_8104C5C(void); @@ -132,6 +134,11 @@ bool8 sub_8104E18(void); void sub_8104EA8(void); void sub_8104F8C(void); void sub_81050C4(void); +void sub_8105100(void); +void sub_81051C0(void); +void sub_81052EC(void); +void sub_81053A0(void); +void sub_810545C(void); u8 sub_8105B1C(s16 a0, s16 a1); void sub_8105B88(u8 a0); void sub_81063C0(void); @@ -2301,7 +2308,7 @@ bool8 sub_81040C8(void) extern void (*const gUnknown_083ECBB4[])(struct Task *task); -void sub_81040E8(u8 taskId) +static void sub_81040E8(u8 taskId) { gUnknown_083ECBB4[gTasks[taskId].data[0]](gTasks + taskId); } @@ -2337,6 +2344,108 @@ void sub_8104144(struct Task *task) } } +void sub_81041AC(struct Task *task) +{ + u16 *vaddr = (u16 *)BG_SCREEN_ADDR(29); + s16 r4 = task->data[1] + 2; + u8 r2 = 0; + if (task->data[1] == 1) + r2 = 1; + else if (task->data[1] == 16) + r2 = 2; + if (task->data[2] == 0) + { + vaddr[r4 + 0x40] = gUnknown_083ECBC4[r2][1]; + task->data[1]--; + } + if (++task->data[2] >= 20) + task->data[2] = 0; + if (task->data[1] == 0) + { + task->data[0] = 0; + task->data[15] = 0; + } +} + +static void sub_810421C(struct Task *task) +{ + u8 i; + + for (i = 2; i < 16; i++) + task->data[i] = 0; +} + +void sub_810423C(u8 a0) +{ + s16 i; + u8 r3; + s16 r2 = 3; + u16 *vaddr = (u16 *)BG_SCREEN_ADDR(29); + for (i = 0; i < a0; i++, r2++) + { + r3 = 0; + if (i == 0) + r3 = 1; + else if (i == 15) + r3 = 2; + vaddr[r2 + 0x40] = gUnknown_083ECBC4[r3][0]; + } + for (; i < 16; i++, r2++) + { + r3 = 0; + if (i == 0) + r3 = 1; + else if (i == 15) + r3 = 2; + vaddr[r2 + 0x40] = gUnknown_083ECBC4[r3][1]; + } + gTasks[eSlotMachine->unk3E].data[1] = a0; +} + +static void sub_810430C(void) +{ + u8 taskId = CreateTask(sub_810434C, 7); + sub_810434C(taskId); +} + +static bool8 sub_810432C(void) +{ + if (FindTaskIdByFunc(sub_810434C) == 0xFF) + return TRUE; + return FALSE; +} + +extern void (*const gUnknown_083ECBD0[])(struct Task *task); + +void sub_810434C(u8 taskId) +{ + gUnknown_083ECBD0[gTasks[taskId].data[0]](gTasks + taskId); +} + +void sub_810437C(struct Task *task) +{ + eSlotMachine->unk0A = 0; + eSlotMachine->unk14 = 0; + eSlotMachine->unk16 = 0; + task->data[0]++; + task->data[1] = 0; + task->data[2] = 30; + task->data[4] = 1280; + gSpriteCoordOffsetX = 0; + gSpriteCoordOffsetY = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + sub_8104A40(30, 0); + sub_81051C0(); + sub_8105100(); + sub_81052EC(); + sub_81053A0(); + sub_810545C(); + sub_8102680(); + StopMapMusic(); + PlayNewMapMusic(BGM_BD_TIME); +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 13b2657c49b60dcf5d851a63346801232f9ee832 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 13:31:22 -0500 Subject: through sub_8104498; decompile some data --- asm/slot_machine.s | 170 --------------------------- data/slot_machine.s | 114 ------------------ include/global.h | 2 +- include/slot_machine.h | 3 +- src/field/slot_machine.c | 294 +++++++++++++++++++++++++++++++++++++---------- 5 files changed, 236 insertions(+), 347 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 4cf21d22e..e3adefac1 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,176 +5,6 @@ .text - thumb_func_start sub_81043EC -sub_81043EC: @ 81043EC - push {r4,lr} - adds r4, r0, 0 - ldr r1, _0810445C @ =gSpriteCoordOffsetX - ldrh r0, [r1] - subs r0, 0x8 - strh r0, [r1] - ldrh r2, [r4, 0xA] - adds r2, 0x8 - strh r2, [r4, 0xA] - movs r1, 0xA - ldrsh r0, [r4, r1] - adds r0, 0xF0 - movs r1, 0xFF - ands r0, r1 - lsrs r3, r0, 3 - ldr r1, _08104460 @ =REG_BG1HOFS - ldr r0, _08104464 @ =0x000001ff - ands r2, r0 - strh r2, [r1] - adds r2, r3, 0 - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r2, r0 - beq _08104438 - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0x12 - bgt _08104438 - strh r3, [r4, 0xC] - ldrh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 19 - strh r0, [r4, 0xE] - movs r0, 0xE - ldrsh r1, [r4, r0] - adds r0, r2, 0 - bl sub_8104A40 -_08104438: - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0xC7 - ble _0810444A - ldrh r0, [r4, 0x8] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0x8] - strh r1, [r4, 0xE] -_0810444A: - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D28 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0810445C: .4byte gSpriteCoordOffsetX -_08104460: .4byte REG_BG1HOFS -_08104464: .4byte 0x000001ff - thumb_func_end sub_81043EC - - thumb_func_start sub_8104468 -sub_8104468: @ 8104468 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D28 - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3B - ble _08104492 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - bl sub_8105578 - bl sub_81056F0 -_08104492: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8104468 - - thumb_func_start sub_8104498 -sub_8104498: @ 8104498 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - adds r7, r0, 0 - ldr r1, _08104534 @ =gUnknown_083ECC1C - mov r0, sp - movs r2, 0x4 - bl memcpy - add r0, sp, 0x4 - mov r8, r0 - ldr r1, _08104538 @ =gUnknown_083ECC20 - movs r2, 0x8 - bl memcpy - add r6, sp, 0xC - ldr r1, _0810453C @ =gUnknown_083ECC28 - adds r0, r6, 0 - movs r2, 0x8 - bl memcpy - ldrh r0, [r7, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D28 - ldrh r0, [r7, 0x10] - subs r0, 0x4 - strh r0, [r7, 0x10] - lsls r0, 16 - asrs r0, 24 - movs r5, 0x4 - subs r5, r0 - lsls r4, r5, 1 - add r8, r4 - mov r1, r8 - movs r2, 0 - ldrsh r0, [r1, r2] - bl sub_8105688 - adds r6, r4 - movs r1, 0 - ldrsh r0, [r6, r1] - bl sub_81057E8 - ldr r0, _08104540 @ =gSharedMem - adds r0, 0x3F - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08104544 @ =gSprites - adds r0, r1 - mov r2, sp - adds r1, r2, r5 - ldrb r1, [r1] - bl StartSpriteAnimIfDifferent - movs r1, 0x10 - ldrsh r0, [r7, r1] - movs r1, 0x80 - lsls r1, 1 - cmp r0, r1 - bgt _08104526 - ldrh r0, [r7, 0x8] - adds r0, 0x1 - strh r0, [r7, 0x8] - strh r1, [r7, 0x10] - movs r0, 0 - strh r0, [r7, 0x12] -_08104526: - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08104534: .4byte gUnknown_083ECC1C -_08104538: .4byte gUnknown_083ECC20 -_0810453C: .4byte gUnknown_083ECC28 -_08104540: .4byte gSharedMem -_08104544: .4byte gSprites - thumb_func_end sub_8104498 - thumb_func_start sub_8104548 sub_8104548: @ 8104548 push {r4,lr} diff --git a/data/slot_machine.s b/data/slot_machine.s index 3d7c6253c..91b3b0ebf 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,120 +3,6 @@ .section .rodata - .align 2 -gUnknown_083ECB20:: @ 83ECB20 - .4byte sub_8102A9C - .4byte sub_8102AD0 - .4byte sub_8102B80 - - .align 2 -gUnknown_083ECB2C:: @ 83ECB2C - .4byte sub_8102EA0 - .4byte sub_8102EA4 - .4byte sub_8102EC0 - .4byte sub_8102F4C - .4byte sub_8103008 - - .align 2 -gUnknown_083ECB40:: @ 83ECB40 - .4byte sub_810305C - .4byte sub_81032C0 - .4byte sub_81033DC - - .align 2 -gUnknown_083ECB4C:: @ 83ECB4C - .4byte sub_81034F4 - .4byte sub_8103540 - .4byte sub_810380C - - .align 1 -gUnknown_083ECB58:: @ 83ECB58 (sub_8102F4C) - .2byte 2, 4, 4, 4, 8 - - .align 2 -gUnknown_083ECB64:: @ 83ECB64 - .4byte sub_8103154 - .4byte sub_81031B4 - .4byte sub_81031B4 - - .align 2 -gUnknown_083ECB70:: @ 83ECB70 - .4byte sub_81032E8 - .4byte sub_81032E8 - .4byte sub_810333C - - .align 2 -gUnknown_083ECB7C:: @ 83ECB7C - .4byte sub_810341C - .4byte sub_810341C - .4byte sub_810347C - - .align 2 -gUnknown_083ECB88:: @ 83ECB88 - .4byte sub_8103564 - .4byte j5_08111E84 - .4byte sub_8103668 - - .align 2 -gUnknown_083ECB94:: @ 83ECB94 - .4byte sub_8103830 - .4byte sub_8103910 - .4byte sub_8103A78 - - .align 2 -gUnknown_083ECBA0:: @ 83ECBA0 - .4byte sub_8103C78 - .4byte sub_8103CAC - .4byte sub_8103CC8 - - .align 1 -gUnknown_083ECBAC:: @ 83ECBAC - .2byte 5, 10, 15 - - .align 2 -gUnknown_083ECBB4:: @ 83ECBB4 - .4byte nullsub_68 - .4byte sub_810411C - .4byte sub_8104144 - .4byte sub_81041AC - - .align 1 -gUnknown_083ECBC4:: @ 83ECBC4 - .2byte 0x9E, 0x6E, 0x9F, 0x6F, 0xAF, 0x7F - - .align 2 -gUnknown_083ECBD0:: @ 83ECBD0 - .4byte sub_810437C - .4byte sub_81043EC - .4byte sub_8104468 - .4byte sub_8104498 - .4byte sub_8104548 - .4byte sub_8104598 - .4byte sub_81045CC - .4byte sub_810463C - .4byte sub_81046C0 - .4byte sub_8104764 - .4byte sub_8104794 - .4byte sub_81047EC - .4byte sub_8104860 - .4byte sub_81048A8 - .4byte sub_81048CC - .4byte sub_8104940 - .4byte sub_81049C8 - .4byte sub_8104794 - .4byte sub_81049F8 - -gUnknown_083ECC1C:: @ 83ECC1C - .byte 1, 1, 2, 2 - - .align 1 -gUnknown_083ECC20:: @ 83ECC20 - .2byte 0x40, 0x30, 0x18, 0x8 - - .align 1 -gUnknown_083ECC28:: @ 83ECC28 - .2byte 10, 8, 6, 4 - .align 2 gUnknown_083ECC30:: @ 83ECC30 .4byte sub_8104B3C diff --git a/include/global.h b/include/global.h index a4e71852c..2ea69a1e1 100644 --- a/include/global.h +++ b/include/global.h @@ -5,7 +5,7 @@ #include "config.h" // IDE support -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__CYGWIN__) #define _(x) x #define __(x) x #define INCBIN_U8 {0} diff --git a/include/slot_machine.h b/include/slot_machine.h index 81263e97e..a7a1fed44 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -29,7 +29,8 @@ struct SlotMachineEwramStruct { /*0x3A*/ u8 unk3A[3]; /*0x3D*/ u8 unk3D; /*0x3E*/ u8 unk3E; - /*0x3F*/ u8 filler3F[5]; + /*0x3F*/ u8 unk3F; + /*0x40*/ u8 filler40[4]; /*0x44*/ u8 unk44[5]; /*0x49*/ u8 filler49[15]; /*0x58*/ u16 win0h; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index f7679588c..8bfb30bfa 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -22,20 +22,12 @@ struct UnkStruct1 { /*0x02*/ s16 unk02; }; -extern struct UnkStruct1 *gUnknown_083ED048[]; -extern const u16 gPalette_83EDE24[]; - -extern const u8 gSlotMachine_Gfx[]; #if ENGLISH #define SLOTMACHINE_GFX_TILES 233 #elif GERMAN #define SLOTMACHINE_GFX_TILES 236 #endif -extern const u16 gUnknown_08E95A18[]; - -extern u16 gUnknown_08E95AB8[]; -extern u16 gUnknown_08E95FB8[]; static void sub_81018B8(void); static void sub_8101954(void); @@ -97,15 +89,44 @@ static u8 sub_81029D4(u8 c1, u8 c2, u8 c3); static void sub_8102A24(void); static void sub_8102A64(u8 taskId); static bool8 sub_8102A44(void); +bool8 sub_8102A9C(struct Task *task); +bool8 sub_8102AD0(struct Task *task); +bool8 sub_8102B80(struct Task *task); u8 sub_8102BA4(u8 x, s16 y); static void sub_8102DA8(void); static void sub_8102DEC(u8 a0); static void sub_8102E1C(u8 a0); static bool8 sub_8102E40(u8 a0); static void sub_8102E68(u8 taskId); +bool8 sub_8102EA0(struct Task *task); +bool8 sub_8102EA4(struct Task *task); +bool8 sub_8102EC0(struct Task *task); +bool8 sub_8102F4C(struct Task *task); +bool8 sub_8103008(struct Task *task); +bool8 sub_810305C(void); +bool8 sub_8103154(u8 a0, u8 a1); +bool8 sub_81031B4(u8 a0, u8 a1); +bool8 sub_81032C0(void); +bool8 sub_81032E8(void); +bool8 sub_810333C(void); +bool8 sub_81033DC(void); +bool8 sub_810341C(u8 a0); +bool8 sub_810347C(u8 a0); +void sub_81034F4(void); +void sub_8103540(void); +void sub_8103564(void); +void j5_08111E84(void); +void sub_8103668(void); +void sub_810380C(void); +void sub_8103830(void); +void sub_8103910(void); +void sub_8103A78(void); static void sub_8103C14(u8 a0); static void sub_8103C48(u8 taskId); static void sub_8103D50(u8 a0); +void sub_8103C78(struct Task *task, u8 taskId); +void sub_8103CAC(struct Task *task, u8 taskId); +void sub_8103CC8(struct Task *task, u8 taskId); static void sub_8103D8C(u8 a0); static void sub_8103DC8(void); static void sub_8103E04(u8 a0); @@ -120,11 +141,33 @@ static void sub_8104048(void); static void sub_8104064(u8 unused); bool8 sub_81040C8(void); static void sub_81040E8(u8 taskId); +void nullsub_68(struct Task *task); +void sub_810411C(struct Task *task); +void sub_8104144(struct Task *task); +void sub_81041AC(struct Task *task); static void sub_810421C(struct Task *task); void sub_810423C(u8 a0); static void sub_810430C(void); static bool8 sub_810432C(void); void sub_810434C(u8 taskId); +void sub_810437C(struct Task *task); +void sub_81043EC(struct Task *task); +void sub_8104468(struct Task *task); +void sub_8104498(struct Task *task); +void sub_8104548(struct Task *task); +void sub_8104598(struct Task *task); +void sub_81045CC(struct Task *task); +void sub_810463C(struct Task *task); +void sub_81046C0(struct Task *task); +void sub_8104764(struct Task *task); +void sub_8104794(struct Task *task); +void sub_81047EC(struct Task *task); +void sub_8104860(struct Task *task); +void sub_81048A8(struct Task *task); +void sub_81048CC(struct Task *task); +void sub_8104940(struct Task *task); +void sub_81049C8(struct Task *task); +void sub_81049F8(struct Task *task); void sub_8104A40(s16 a0, s16 a1); void sub_8104AB8(u8 a0); bool8 sub_8104AEC(void); @@ -139,6 +182,10 @@ void sub_81051C0(void); void sub_81052EC(void); void sub_81053A0(void); void sub_810545C(void); +void sub_8105578(void); +void sub_8105688(s16 a0); +void sub_81056F0(void); +void sub_81057E8(s16 a0); u8 sub_8105B1C(s16 a0, s16 a1); void sub_8105B88(u8 a0); void sub_81063C0(void); @@ -146,38 +193,12 @@ static void sub_8106448(void); void sub_81064B8(void); void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); -static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { - sub_8101D5C, - sub_8101D8C, - sub_8101DB0, - sub_8101DF4, - sub_8101E10, - sub_8101E3C, - sub_8101F44, - sub_8101F60, - sub_8101F88, - sub_8101FA4, - sub_8102008, - sub_8102034, - sub_8102058, - sub_8102090, - sub_81020C8, - sub_81021E0, - sub_81021FC, - sub_8102264, - sub_81022A0, - sub_81022CC, - sub_81022F0, - sub_8102318, - sub_8102344, - sub_810239C, - sub_81023B8, - sub_81023E0, - sub_81023FC, - sub_8102424, - sub_8102460 -}; - +extern struct UnkStruct1 *gUnknown_083ED048[]; +extern const u16 gPalette_83EDE24[]; +extern const u8 gSlotMachine_Gfx[]; +extern const u16 gUnknown_08E95A18[]; +extern u16 gUnknown_08E95AB8[]; +extern u16 gUnknown_08E95FB8[]; extern const u8 gUnknown_083ECD04[][3]; extern const u8 gUnknown_083ECE3A[]; extern const u16 gUnknown_083ECE42[]; @@ -395,6 +416,38 @@ static void sub_8101D04(void) sub_8101D24(CreateTask(sub_8101D24, 0)); } +static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { + sub_8101D5C, + sub_8101D8C, + sub_8101DB0, + sub_8101DF4, + sub_8101E10, + sub_8101E3C, + sub_8101F44, + sub_8101F60, + sub_8101F88, + sub_8101FA4, + sub_8102008, + sub_8102034, + sub_8102058, + sub_8102090, + sub_81020C8, + sub_81021E0, + sub_81021FC, + sub_8102264, + sub_81022A0, + sub_81022CC, + sub_81022F0, + sub_8102318, + sub_8102344, + sub_810239C, + sub_81023B8, + sub_81023E0, + sub_81023FC, + sub_8102424, + sub_8102460 +}; + static void sub_8101D24(u8 taskId) { while (gUnknown_083ECAAC[eSlotMachine->state](gTasks + taskId)); @@ -1174,7 +1227,11 @@ static bool8 sub_8102A44(void) return FALSE; } -extern bool8 (*const gUnknown_083ECB20[])(struct Task *task); +bool8 (*const gUnknown_083ECB20[])(struct Task *task) = { + sub_8102A9C, + sub_8102AD0, + sub_8102B80 +}; static void sub_8102A64(u8 taskId) { @@ -1338,7 +1395,13 @@ static bool8 sub_8102E40(u8 a0) return gTasks[eSlotMachine->unk3A[a0]].data[14]; } -extern bool8 (*const gUnknown_083ECB2C[])(struct Task *task); +bool8 (*const gUnknown_083ECB2C[])(struct Task *task) = { + sub_8102EA0, + sub_8102EA4, + sub_8102EC0, + sub_8102F4C, + sub_8103008 +}; static void sub_8102E68(u8 taskId) { @@ -1356,8 +1419,16 @@ bool8 sub_8102EA4(struct Task *task) return FALSE; } -extern bool8 (*const gUnknown_083ECB40[])(void); -extern void (*const gUnknown_083ECB4C[])(void); +bool8 (*const gUnknown_083ECB40[])(void) = { + sub_810305C, + sub_81032C0, + sub_81033DC +}; +void (*const gUnknown_083ECB4C[])(void) = { + sub_81034F4, + sub_8103540, + sub_810380C +}; bool8 sub_8102EC0(struct Task *task) { @@ -1373,15 +1444,10 @@ bool8 sub_8102EC0(struct Task *task) return TRUE; } -extern const u16 gUnknown_083ECB58[5]; // don't move this - bool8 sub_8102F4C(struct Task *task) { - s16 r2; - u16 sp[5]; - memcpy(sp, gUnknown_083ECB58, sizeof gUnknown_083ECB58); - // u16 sp[] = {2, 4, 4, 4, 8}; - r2 = eSlotMachine->unk1C[task->data[15]] % 24; + u16 sp[] = {2, 4, 4, 4, 8}; + s16 r2 = eSlotMachine->unk1C[task->data[15]] % 24; if (r2 != 0) { r2 = sub_8102CCC(task->data[15], eSlotMachine->unk1A); @@ -1419,7 +1485,11 @@ bool8 sub_8103008(struct Task *task) return FALSE; } -extern bool8 (*const gUnknown_083ECB64[])(u8 a0, u8 a1); +bool8 (*const gUnknown_083ECB64[])(u8 a0, u8 a1) = { + sub_8103154, + sub_81031B4, + sub_81031B4 +}; bool8 sub_810305C(void) { @@ -1522,7 +1592,11 @@ bool8 sub_81031B4(u8 a0, u8 a1) return FALSE; } -extern bool8 (*const gUnknown_083ECB70[])(void); +bool8 (*const gUnknown_083ECB70[])(void) = { + sub_81032E8, + sub_81032E8, + sub_810333C +}; bool8 sub_81032C0(void) { @@ -1580,7 +1654,11 @@ bool8 sub_810333C(void) return FALSE; } -extern bool8 (*const gUnknown_083ECB7C[])(u8 a0); +bool8 (*const gUnknown_083ECB7C[])(u8 a0) = { + sub_810341C, + sub_810341C, + sub_810347C +}; bool8 sub_81033DC(void) { @@ -1660,7 +1738,11 @@ bool8 sub_8103520(u8 *a0) return FALSE; } -extern void (*gUnknown_083ECB88[])(void); +void (*const gUnknown_083ECB88[])(void) = { + sub_8103564, + j5_08111E84, + sub_8103668 +}; void sub_8103540(void) { @@ -1942,7 +2024,11 @@ bool8 sub_81037BC(u8 a0, u8 a1, u8 a2) return TRUE; } -extern void (*const gUnknown_083ECB94[])(void); +void (*const gUnknown_083ECB94[])(void) = { + sub_8103830, + sub_8103910, + sub_8103A78 +}; void sub_810380C(void) { @@ -2096,14 +2182,18 @@ static void sub_8103C14(u8 a0) sub_8103C48(taskId); } -extern void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId); +void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId) = { + sub_8103C78, + sub_8103CAC, + sub_8103CC8 +}; static void sub_8103C48(u8 taskId) { gUnknown_083ECBA0[gTasks[taskId].data[0]](gTasks + taskId, taskId); } -extern const s16 gUnknown_083ECBAC[]; +const s16 gUnknown_083ECBAC[] = {5, 10, 15}; void sub_8103C78(struct Task *task, u8 taskId) { @@ -2306,7 +2396,12 @@ bool8 sub_81040C8(void) return gTasks[eSlotMachine->unk3E].data[15]; } -extern void (*const gUnknown_083ECBB4[])(struct Task *task); +void (*const gUnknown_083ECBB4[])(struct Task *task) = { + nullsub_68, + sub_810411C, + sub_8104144, + sub_81041AC +}; static void sub_81040E8(u8 taskId) { @@ -2324,7 +2419,11 @@ void sub_810411C(struct Task *task) task->data[0]++; } -extern const u16 gUnknown_083ECBC4[][2]; +const u16 gUnknown_083ECBC4[][2] = { + {0x9e, 0x6e}, + {0x9f, 0x6f}, + {0xaf, 0x7f} +}; void sub_8104144(struct Task *task) { @@ -2415,7 +2514,27 @@ static bool8 sub_810432C(void) return FALSE; } -extern void (*const gUnknown_083ECBD0[])(struct Task *task); +void (*const gUnknown_083ECBD0[])(struct Task *task) = { + sub_810437C, + sub_81043EC, + sub_8104468, + sub_8104498, + sub_8104548, + sub_8104598, + sub_81045CC, + sub_810463C, + sub_81046C0, + sub_8104764, + sub_8104794, + sub_81047EC, + sub_8104860, + sub_81048A8, + sub_81048CC, + sub_8104940, + sub_81049C8, + sub_8104794, + sub_81049F8 +}; void sub_810434C(u8 taskId) { @@ -2446,6 +2565,59 @@ void sub_810437C(struct Task *task) PlayNewMapMusic(BGM_BD_TIME); } +void sub_81043EC(struct Task *task) +{ + s16 r3; + gSpriteCoordOffsetX -= 8; + task->data[1] += 8; + r3 = ((task->data[1] + 240) & 0xff) >> 3; + REG_BG1HOFS = task->data[1] & 0x1ff; + if (r3 != task->data[2] && task->data[3] <= 18) + { + task->data[2] = r3; + task->data[3] = task->data[1] >> 3; + sub_8104A40(r3, task->data[3]); + } + if (task->data[1] >= 200) + { + task->data[0]++; + task->data[3] = 0; + } + sub_8102D28(task->data[4] >> 8); +} + +void sub_8104468(struct Task *task) +{ + sub_8102D28(task->data[4] >> 8); + if (++task->data[5] >= 60) + { + task->data[0]++; + sub_8105578(); + sub_81056F0(); + } +} + +void sub_8104498(struct Task *task) +{ + int r5; + u8 sp0[] = {1, 1, 2, 2}; + s16 sp4[] = {0x40, 0x30, 0x18, 0x08}; + s16 spC[] = {10, 8, 6, 4}; + + sub_8102D28(task->data[4] >> 8); + task->data[4] -= 4; + r5 = 4 - (task->data[4] >> 8); + sub_8105688(sp4[r5]); + sub_81057E8(spC[r5]); + StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, sp0[r5]); + if (task->data[4] <= 0x100) + { + task->data[0]++; + task->data[4] = 0x100; + task->data[5] = 0; + } +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From ee7ecf3d11732236bc43ae15757056f03e356a05 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 13:58:29 -0500 Subject: through sub_81045CC --- asm/slot_machine.s | 131 ----------------------------------------------- src/field/slot_machine.c | 49 ++++++++++++++++++ 2 files changed, 49 insertions(+), 131 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index e3adefac1..6f5aa38a7 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,137 +5,6 @@ .text - thumb_func_start sub_8104548 -sub_8104548: @ 8104548 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D28 - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4F - ble _0810458A - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - strh r0, [r4, 0x12] - movs r0, 0x2 - bl sub_81057E8 - ldr r0, _08104590 @ =gSharedMem - adds r0, 0x3F - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08104594 @ =gSprites - adds r0, r1 - movs r1, 0x3 - bl StartSpriteAnimIfDifferent -_0810458A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08104590: .4byte gSharedMem -_08104594: .4byte gSprites - thumb_func_end sub_8104548 - - thumb_func_start sub_8104598 -sub_8104598: @ 8104598 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D28 - ldrb r0, [r4, 0x10] - adds r0, 0x80 - strh r0, [r4, 0x10] - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4F - ble _081045C4 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r0, 0 - strh r0, [r4, 0x12] -_081045C4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8104598 - - thumb_func_start sub_81045CC -sub_81045CC: @ 81045CC - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D28 - ldrb r0, [r4, 0x10] - adds r0, 0x40 - strh r0, [r4, 0x10] - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x27 - ble _08104634 - movs r0, 0 - strh r0, [r4, 0x12] - ldr r1, _0810460C @ =gSharedMem - ldrb r0, [r1, 0x5] - cmp r0, 0 - beq _08104610 - ldrb r1, [r1, 0xA] - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r1, r0 - bgt _0810462E - ldrh r0, [r4, 0x8] - adds r0, 0x1 - b _0810462C - .align 2, 0 -_0810460C: .4byte gSharedMem -_08104610: - movs r1, 0x14 - ldrsh r0, [r4, r1] - cmp r0, 0x3 - ble _0810461E - ldrh r0, [r4, 0x8] - adds r0, 0x1 - b _0810462C -_0810461E: - ldrh r0, [r4, 0x14] - bl sub_81026DC - lsls r0, 24 - cmp r0, 0 - beq _0810462E - movs r0, 0xE -_0810462C: - strh r0, [r4, 0x8] -_0810462E: - ldrh r0, [r4, 0x14] - adds r0, 0x1 - strh r0, [r4, 0x14] -_08104634: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81045CC - thumb_func_start sub_810463C sub_810463C: @ 810463C push {r4-r6,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 8bfb30bfa..50a6fbd6e 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -2618,6 +2618,55 @@ void sub_8104498(struct Task *task) } } +void sub_8104548(struct Task *task) +{ + sub_8102D28(task->data[4] >> 8); + if (++task->data[5] >= 80) + { + task->data[0]++; + task->data[5] = 0; + sub_81057E8(2); + StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 3); + } +} + +void sub_8104598(struct Task *task) +{ + sub_8102D28(task->data[4] >> 8); + task->data[4] = (u8)task->data[4] + 0x80; + if (++task->data[5] >= 80) + { + task->data[0]++; + task->data[5] = 0; + } +} + +void sub_81045CC(struct Task *task) +{ + sub_8102D28(task->data[4] >> 8); + task->data[4] = (u8)task->data[4] + 0x40; + if (++task->data[5] >= 40) + { + task->data[5] = 0; + if (eSlotMachine->unk05) + { + if (eSlotMachine->unk0A <= task->data[6]) + { + task->data[0]++; + } + } + else if (task->data[6] > 3) + { + task->data[0]++; + } + else if (sub_81026DC(task->data[6])) + { + task->data[0] = 14; + } + task->data[6]++; + } +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From b628d68bae049d3798142acbf4182b121e51a232 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 16:09:07 -0500 Subject: through sub_81049F8 --- asm/slot_machine.s | 505 ----------------------------------------------- include/slot_machine.h | 6 +- src/field/slot_machine.c | 195 ++++++++++++++++++ 3 files changed, 199 insertions(+), 507 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 6f5aa38a7..82494dc98 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,511 +5,6 @@ .text - thumb_func_start sub_810463C -sub_810463C: @ 810463C - push {r4-r6,lr} - adds r4, r0, 0 - ldr r6, _08104660 @ =gSharedMem - movs r1, 0x14 - ldrsh r0, [r6, r1] - movs r1, 0x14 - bl __modsi3 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r0, 0 - beq _08104664 - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D5C - b _08104688 - .align 2, 0 -_08104660: .4byte gSharedMem -_08104664: - movs r0, 0x1 - bl sub_8102C48 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6, 0x5] - cmp r0, r1 - beq _08104692 - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 24 - bl sub_8102D28 - movs r1, 0x14 - ldrsh r0, [r6, r1] - movs r1, 0x14 - bl __modsi3 -_08104688: - lsls r0, 16 - lsrs r5, r0, 16 - ldrb r0, [r4, 0x10] - adds r0, 0x40 - strh r0, [r4, 0x10] -_08104692: - lsls r0, r5, 16 - asrs r5, r0, 16 - cmp r5, 0 - bne _081046B4 - movs r0, 0x1 - bl sub_8102C48 - ldr r1, _081046BC @ =gSharedMem - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r1, 0x5] - cmp r0, r1 - bne _081046B4 - strh r5, [r4, 0x10] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_081046B4: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081046BC: .4byte gSharedMem - thumb_func_end sub_810463C - - thumb_func_start sub_81046C0 -sub_81046C0: @ 81046C0 - push {r4-r7,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x10] - adds r0, 0x1 - movs r7, 0 - strh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3B - ble _08104758 - bl StopMapMusic - bl sub_81056C0 - bl sub_8105804 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - ldr r5, _08104710 @ =gSharedMem - ldrb r0, [r5, 0x5] - cmp r0, 0 - bne _0810471C - movs r0, 0xA0 - strh r0, [r4, 0x10] - adds r0, r5, 0 - adds r0, 0x3F - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08104714 @ =gSprites - adds r0, r1 - movs r1, 0x5 - bl StartSpriteAnimIfDifferent - ldr r0, _08104718 @ =0x00000187 - bl PlayFanfare - b _08104758 - .align 2, 0 -_08104710: .4byte gSharedMem -_08104714: .4byte gSprites -_08104718: .4byte 0x00000187 -_0810471C: - movs r0, 0xC0 - strh r0, [r4, 0x10] - adds r6, r5, 0 - adds r6, 0x3F - ldrb r1, [r6] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r4, _08104760 @ =gSprites - adds r0, r4 - movs r1, 0x4 - bl StartSpriteAnimIfDifferent - ldrb r1, [r6] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x2B - strb r7, [r0] - ldrb r0, [r5, 0x2] - cmp r0, 0 - beq _08104750 - bl sub_8104098 - strb r7, [r5, 0x2] -_08104750: - movs r0, 0xC3 - lsls r0, 1 - bl PlayFanfare -_08104758: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08104760: .4byte gSprites - thumb_func_end sub_81046C0 - - thumb_func_start sub_8104764 -sub_8104764: @ 8104764 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x10] - movs r2, 0x10 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _0810477C - subs r0, r1, 0x1 - strh r0, [r4, 0x10] - lsls r0, 16 - cmp r0, 0 - bne _0810478C -_0810477C: - bl sub_81040C8 - lsls r0, 24 - cmp r0, 0 - bne _0810478C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_0810478C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8104764 - - thumb_func_start sub_8104794 -sub_8104794: @ 8104794 - push {r4,lr} - adds r3, r0, 0 - ldr r1, _081047D4 @ =gSpriteCoordOffsetX - ldrh r0, [r1] - subs r0, 0x8 - strh r0, [r1] - ldrh r2, [r3, 0xA] - adds r2, 0x8 - strh r2, [r3, 0xA] - ldrh r0, [r3, 0xE] - adds r0, 0x8 - strh r0, [r3, 0xE] - movs r1, 0xA - ldrsh r0, [r3, r1] - subs r0, 0x8 - movs r1, 0xFF - ands r0, r1 - lsrs r4, r0, 3 - ldr r1, _081047D8 @ =REG_BG1HOFS - ldr r0, _081047DC @ =0x000001ff - ands r2, r0 - strh r2, [r1] - ldrh r0, [r3, 0xE] - lsls r0, 16 - asrs r0, 19 - cmp r0, 0x19 - bgt _081047E0 - adds r0, r4, 0 - bl sub_8104A88 - b _081047E6 - .align 2, 0 -_081047D4: .4byte gSpriteCoordOffsetX -_081047D8: .4byte REG_BG1HOFS -_081047DC: .4byte 0x000001ff -_081047E0: - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] -_081047E6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8104794 - - thumb_func_start sub_81047EC -sub_81047EC: @ 81047EC - push {r4-r6,lr} - adds r5, r0, 0 - ldr r4, _08104834 @ =gSharedMem - movs r6, 0 - strb r6, [r4, 0xB] - ldrb r0, [r4, 0x5] - strb r0, [r4, 0xA] - ldr r0, _08104838 @ =gSpriteCoordOffsetX - strh r6, [r0] - ldr r0, _0810483C @ =REG_BG1HOFS - strh r6, [r0] - movs r0, 0x8 - strh r0, [r4, 0x1A] - bl sub_810514C - bl sub_81054B8 - bl sub_8105524 - adds r0, r4, 0 - adds r0, 0x60 - ldrh r0, [r0] - bl PlayNewMapMusic - ldrb r0, [r4, 0xA] - cmp r0, 0 - bne _08104844 - ldr r0, _08104840 @ =sub_810434C - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - b _0810485A - .align 2, 0 -_08104834: .4byte gSharedMem -_08104838: .4byte gSpriteCoordOffsetX -_0810483C: .4byte REG_BG1HOFS -_08104840: .4byte sub_810434C -_08104844: - movs r0, 0x4 - bl sub_8104CAC - bl dp15_jump_random_unknown - strh r0, [r5, 0xA] - strh r6, [r5, 0xC] - strh r6, [r5, 0xE] - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_0810485A: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81047EC - - thumb_func_start sub_8104860 -sub_8104860: @ 8104860 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r5, _0810487C @ =gSharedMem - ldrh r0, [r5, 0x1A] - lsls r6, r0, 16 - asrs r1, r6, 16 - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _08104880 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _081048A2 - .align 2, 0 -_0810487C: .4byte gSharedMem -_08104880: - movs r1, 0x1C - ldrsh r0, [r5, r1] - movs r1, 0x18 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - bne _081048A2 - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - bne _081048A2 - asrs r0, r6, 17 - strh r0, [r5, 0x1A] -_081048A2: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8104860 - - thumb_func_start sub_81048A8 -sub_81048A8: @ 81048A8 - push {lr} - bl sub_8104E18 - lsls r0, 24 - cmp r0, 0 - beq _081048C2 - ldr r0, _081048C8 @ =sub_810434C - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask -_081048C2: - pop {r0} - bx r0 - .align 2, 0 -_081048C8: .4byte sub_810434C - thumb_func_end sub_81048A8 - - thumb_func_start sub_81048CC -sub_81048CC: @ 81048CC - push {r4,r5,lr} - adds r4, r0, 0 - bl sub_81054B8 - bl sub_81056C0 - bl sub_8105804 - bl sub_8105854 - ldr r5, _08104934 @ =gSprites - ldr r3, _08104938 @ =gSharedMem - adds r0, r3, 0 - adds r0, 0x4E - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - adds r3, 0x3F - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - movs r1, 0x5 - bl StartSpriteAnimIfDifferent - ldrh r0, [r4, 0x8] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0x8] - movs r0, 0x4 - strh r0, [r4, 0x10] - strh r1, [r4, 0x12] - bl StopMapMusic - ldr r0, _0810493C @ =0x00000187 - bl PlayFanfare - movs r0, 0xB2 - bl PlaySE - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08104934: .4byte gSprites -_08104938: .4byte gSharedMem -_0810493C: .4byte 0x00000187 - thumb_func_end sub_81048CC - - thumb_func_start sub_8104940 -sub_8104940: @ 8104940 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r0, _081049B8 @ =gSpriteCoordOffsetY - ldrh r1, [r4, 0x10] - strh r1, [r0] - ldr r0, _081049BC @ =REG_BG1VOFS - strh r1, [r0] - ldrh r1, [r4, 0x12] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810495E - ldrh r0, [r4, 0x10] - negs r0, r0 - strh r0, [r4, 0x10] -_0810495E: - ldrh r0, [r4, 0x12] - adds r0, 0x1 - strh r0, [r4, 0x12] - movs r1, 0x1F - ands r0, r1 - cmp r0, 0 - bne _08104974 - ldrh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 17 - strh r0, [r4, 0x10] -_08104974: - movs r0, 0x10 - ldrsh r5, [r4, r0] - cmp r5, 0 - bne _081049B0 - bl sub_81058A0 - bl sub_81058C4 - bl sub_8105284 - bl sub_81059E8 - ldr r2, _081049C0 @ =gSprites - ldr r0, _081049C4 @ =gSharedMem - adds r0, 0x4E - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - strh r5, [r4, 0x12] -_081049B0: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081049B8: .4byte gSpriteCoordOffsetY -_081049BC: .4byte REG_BG1VOFS -_081049C0: .4byte gSprites -_081049C4: .4byte gSharedMem - thumb_func_end sub_8104940 - - thumb_func_start sub_81049C8 -sub_81049C8: @ 81049C8 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _081049F0 @ =gSpriteCoordOffsetY - movs r1, 0 - strh r1, [r0] - ldr r0, _081049F4 @ =REG_BG1VOFS - strh r1, [r0] - bl sub_8105ACC - lsls r0, 24 - cmp r0, 0 - beq _081049EA - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - bl sub_8105AEC -_081049EA: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081049F0: .4byte gSpriteCoordOffsetY -_081049F4: .4byte REG_BG1VOFS - thumb_func_end sub_81049C8 - - thumb_func_start sub_81049F8 -sub_81049F8: @ 81049F8 - push {lr} - ldr r0, _08104A30 @ =gSpriteCoordOffsetX - movs r1, 0 - strh r1, [r0] - ldr r0, _08104A34 @ =REG_BG1HOFS - strh r1, [r0] - ldr r0, _08104A38 @ =gSharedMem - adds r0, 0x60 - ldrh r0, [r0] - bl PlayNewMapMusic - bl sub_810514C - bl sub_8105554 - bl sub_8105524 - bl sub_81059B8 - ldr r0, _08104A3C @ =sub_810434C - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - pop {r0} - bx r0 - .align 2, 0 -_08104A30: .4byte gSpriteCoordOffsetX -_08104A34: .4byte REG_BG1HOFS -_08104A38: .4byte gSharedMem -_08104A3C: .4byte sub_810434C - thumb_func_end sub_81049F8 - thumb_func_start sub_8104A40 sub_8104A40: @ 8104A40 push {r4-r7,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index a7a1fed44..004538b14 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -20,7 +20,7 @@ struct SlotMachineEwramStruct { /*0x14*/ s16 unk14; /*0x16*/ s16 unk16; /*0x18*/ s16 unk18; - /*0x1A*/ u16 unk1A; + /*0x1A*/ s16 unk1A; /*0x1C*/ s16 unk1C[3]; /*0x22*/ u16 unk22[3]; /*0x28*/ s16 unk28[3]; @@ -32,7 +32,9 @@ struct SlotMachineEwramStruct { /*0x3F*/ u8 unk3F; /*0x40*/ u8 filler40[4]; /*0x44*/ u8 unk44[5]; - /*0x49*/ u8 filler49[15]; + /*0x49*/ u8 filler49[5]; + /*0x4E*/ u8 unk4E; + /*0x4F*/ u8 filler4F[9]; /*0x58*/ u16 win0h; /*0x5a*/ u16 win0v; /*0x5c*/ u16 winIn; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 50a6fbd6e..b57f0cfaf 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -169,6 +169,7 @@ void sub_8104940(struct Task *task); void sub_81049C8(struct Task *task); void sub_81049F8(struct Task *task); void sub_8104A40(s16 a0, s16 a1); +void sub_8104A88(s16 a0); void sub_8104AB8(u8 a0); bool8 sub_8104AEC(void); void sub_8104C5C(void); @@ -178,14 +179,28 @@ void sub_8104EA8(void); void sub_8104F8C(void); void sub_81050C4(void); void sub_8105100(void); +void sub_810514C(void); void sub_81051C0(void); +void sub_8105284(void); void sub_81052EC(void); void sub_81053A0(void); void sub_810545C(void); +void sub_81054B8(void); +void sub_8105524(void); +void sub_8105554(void); void sub_8105578(void); void sub_8105688(s16 a0); +void sub_81056C0(void); void sub_81056F0(void); void sub_81057E8(s16 a0); +void sub_8105804(void); +void sub_8105854(void); +void sub_81058A0(void); +void sub_81058C4(void); +void sub_81059B8(void); +void sub_81059E8(void); +bool8 sub_8105ACC(void); +void sub_8105AEC(void); u8 sub_8105B1C(s16 a0, s16 a1); void sub_8105B88(u8 a0); void sub_81063C0(void); @@ -2667,6 +2682,186 @@ void sub_81045CC(struct Task *task) } } +void sub_810463C(struct Task *task) +{ + s16 r5 = eSlotMachine->unk14 % 20; + if (r5) + { + r5 = sub_8102D5C(task->data[4] >> 8); + task->data[4] = (u8)task->data[4] + 0x40; + } + else if (sub_8102C48(1) != eSlotMachine->unk05) + { + sub_8102D28(task->data[4] >> 8); + r5 = eSlotMachine->unk14 % 20; + task->data[4] = (u8)task->data[4] + 0x40; + } + if (r5 == 0 && sub_8102C48(1) == eSlotMachine->unk05) + { + task->data[4] = 0; + task->data[0]++; + } +} + +void sub_81046C0(struct Task *task) +{ + if (++task->data[4] >= 60) + { + StopMapMusic(); + sub_81056C0(); + sub_8105804(); + task->data[0]++; + if(eSlotMachine->unk05 == 0) + { + task->data[4] = 0xa0; + StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5); + PlayFanfare(BGM_ME_ZANNEN); + } + else + { + task->data[4] = 0xc0; + StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 4); + gSprites[eSlotMachine->unk3F].animCmdIndex = 0; + if (eSlotMachine->unk02) + { + sub_8104098(); + eSlotMachine->unk02 = 0; + } + PlayFanfare(BGM_ME_B_SMALL); + } + } +} + +void sub_8104764(struct Task *task) +{ + if ((task->data[4] == 0 || --task->data[4] == 0) && !sub_81040C8()) + { + task->data[0]++; + } +} + +void sub_8104794(struct Task *task) +{ + s16 r4; + gSpriteCoordOffsetX -= 8; + task->data[1] += 8; + task->data[3] += 8; + r4 = ((task->data[1] - 8) & 0xff) >> 3; + REG_BG1HOFS = task->data[1] & 0x1ff; + if (task->data[3] >> 3 <= 25) + { + sub_8104A88(r4); + } + else + { + task->data[0]++; + } +} + +void sub_81047EC(struct Task *task) +{ + eSlotMachine->unk0B = 0; + eSlotMachine->unk0A = eSlotMachine->unk05; + gSpriteCoordOffsetX = 0; + REG_BG1HOFS = 0; + eSlotMachine->unk1A = 8; + sub_810514C(); + sub_81054B8(); + sub_8105524(); + PlayNewMapMusic(eSlotMachine->backupMapMusic); + if (eSlotMachine->unk0A == 0) + { + DestroyTask(FindTaskIdByFunc(sub_810434C)); + } + else + { + sub_8104CAC(4); + task->data[1] = dp15_jump_random_unknown(); + task->data[2] = 0; + task->data[3] = 0; + task->data[0]++; + } +} + +void sub_8104860(struct Task *task) +{ + if (eSlotMachine->unk1A == task->data[1]) + { + task->data[0]++; + } + else if (eSlotMachine->unk1C[0] % 24 == 0 && (++task->data[2]& 0x07) == 0) + { + eSlotMachine->unk1A >>= 1; + } +} + +void sub_81048A8(struct Task *task) +{ + if (sub_8104E18()) + { + DestroyTask(FindTaskIdByFunc(sub_810434C)); + } +} + +void sub_81048CC(struct Task *task) +{ + sub_81054B8(); + sub_81056C0(); + sub_8105804(); + sub_8105854(); + gSprites[eSlotMachine->unk4E].invisible = TRUE; + StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5); + task->data[0]++; + task->data[4] = 4; + task->data[5] = 0; + StopMapMusic(); + PlayFanfare(BGM_ME_ZANNEN); + PlaySE(SE_W153); +} + +void sub_8104940(struct Task *task) +{ + gSpriteCoordOffsetY = task->data[4]; + REG_BG1VOFS = task->data[4]; + if (task->data[5] & 0x01) + task->data[4] = -task->data[4]; + if ((++task->data[5] & 0x1f) == 0) + task->data[4] >>= 1; + if (task->data[4] == 0) + { + sub_81058A0(); + sub_81058C4(); + sub_8105284(); + sub_81059E8(); + gSprites[eSlotMachine->unk4E].invisible = FALSE; + task->data[0]++; + task->data[5] = 0; + } +} + +void sub_81049C8(struct Task *task) +{ + gSpriteCoordOffsetY = 0; + REG_BG1VOFS = 0; + if (sub_8105ACC()) + { + task->data[0]++; + sub_8105AEC(); + } +} + +void sub_81049F8(struct Task *task) +{ + gSpriteCoordOffsetX = 0; + REG_BG1HOFS = 0; + PlayNewMapMusic(eSlotMachine->backupMapMusic); + sub_810514C(); + sub_8105554(); + sub_8105524(); + sub_81059B8(); + DestroyTask(FindTaskIdByFunc(sub_810434C)); +} + asm(".section .text_a"); static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 1989ffb9a856ebebde994b5af53860436c6606a0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 17:11:00 -0500 Subject: through sub_8104C5C --- asm/slot_machine.s | 334 ----------------------------------------------- data/slot_machine.s | 12 -- ld_script.txt | 2 - src/field/slot_machine.c | 126 +++++++++++++++++- 4 files changed, 125 insertions(+), 349 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 82494dc98..0e18f4380 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,340 +5,6 @@ .text - thumb_func_start sub_8104A40 -sub_8104A40: @ 8104A40 - push {r4-r7,lr} - movs r3, 0x4 - ldr r7, _08104A80 @ =gReelTimeWindowTilemap - lsls r1, 16 - asrs r5, r1, 16 - lsls r0, 16 - asrs r4, r0, 16 - ldr r6, _08104A84 @ =0x0600e000 -_08104A50: - lsls r2, r3, 16 - asrs r2, 16 - subs r1, r2, 0x4 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r5, r0 - lsls r0, 1 - adds r0, r7 - ldrh r1, [r0] - lsls r0, r2, 5 - adds r0, r4 - lsls r0, 1 - adds r0, r6 - strh r1, [r0] - adds r2, 0x1 - lsls r2, 16 - lsrs r3, r2, 16 - asrs r2, 16 - cmp r2, 0xE - ble _08104A50 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08104A80: .4byte gReelTimeWindowTilemap -_08104A84: .4byte 0x0600e000 - thumb_func_end sub_8104A40 - - thumb_func_start sub_8104A88 -sub_8104A88: @ 8104A88 - push {r4,r5,lr} - movs r2, 0x4 - lsls r0, 16 - asrs r3, r0, 16 - ldr r5, _08104AB4 @ =0x0600e000 - movs r4, 0 -_08104A94: - lsls r1, r2, 16 - asrs r1, 16 - lsls r0, r1, 5 - adds r0, r3 - lsls r0, 1 - adds r0, r5 - strh r4, [r0] - adds r1, 0x1 - lsls r1, 16 - lsrs r2, r1, 16 - asrs r1, 16 - cmp r1, 0xE - ble _08104A94 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08104AB4: .4byte 0x0600e000 - thumb_func_end sub_8104A88 - - thumb_func_start sub_8104AB8 -sub_8104AB8: @ 8104AB8 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, _08104AE4 @ =sub_8104B0C - adds r0, r5, 0 - movs r1, 0x1 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08104AE8 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0xA] - bl _call_via_r5 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08104AE4: .4byte sub_8104B0C -_08104AE8: .4byte gTasks - thumb_func_end sub_8104AB8 - - thumb_func_start sub_8104AEC -sub_8104AEC: @ 8104AEC - push {lr} - ldr r0, _08104B00 @ =sub_8104B0C - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _08104B04 - movs r0, 0 - b _08104B06 - .align 2, 0 -_08104B00: .4byte sub_8104B0C -_08104B04: - movs r0, 0x1 -_08104B06: - pop {r1} - bx r1 - thumb_func_end sub_8104AEC - - thumb_func_start sub_8104B0C -sub_8104B0C: @ 8104B0C - push {lr} - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r3, _08104B34 @ =gUnknown_083ECC30 - ldr r2, _08104B38 @ =gTasks - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r2, 0x8 - ldrsh r1, [r0, r2] - lsls r1, 2 - adds r1, r3 - ldr r1, [r1] - bl _call_via_r1 - pop {r0} - bx r0 - .align 2, 0 -_08104B34: .4byte gUnknown_083ECC30 -_08104B38: .4byte gTasks - thumb_func_end sub_8104B0C - - thumb_func_start sub_8104B3C -sub_8104B3C: @ 8104B3C - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8104B3C - - thumb_func_start sub_8104B60 -sub_8104B60: @ 8104B60 - push {lr} - adds r2, r0, 0 - ldr r0, _08104B7C @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08104B76 - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] -_08104B76: - pop {r0} - bx r0 - .align 2, 0 -_08104B7C: .4byte gPaletteFade - thumb_func_end sub_8104B60 - - thumb_func_start sub_8104B80 -sub_8104B80: @ 8104B80 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - bl sub_8104DA4 - bl sub_81065DC - ldr r0, _08104BC0 @ =gWindowConfig_81E7144 - bl BasicInitMenuWindow - ldr r0, _08104BC4 @ =gOtherText_ReelTime - movs r1, 0xA - movs r2, 0x20 - movs r3, 0x1 - bl MenuPrint_PixelCoords - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08104BC0: .4byte gWindowConfig_81E7144 -_08104BC4: .4byte gOtherText_ReelTime - thumb_func_end sub_8104B80 - - thumb_func_start sub_8104BC8 -sub_8104BC8: @ 8104BC8 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r0, _08104BF8 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x6 - ands r0, r1 - cmp r0, 0 - beq _08104BF0 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_08104BF0: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08104BF8: .4byte gMain - thumb_func_end sub_8104BC8 - - thumb_func_start sub_8104BFC -sub_8104BFC: @ 8104BFC - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - bl MenuZeroFillScreen - ldr r0, _08104C3C @ =gWindowConfig_81E7128 - bl BasicInitMenuWindow - bl sub_81064B8 - ldrb r0, [r4, 0xA] - bl sub_8104CAC - ldr r0, _08104C40 @ =gSharedMem - ldrb r0, [r0, 0x2] - bl sub_810423C - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08104C3C: .4byte gWindowConfig_81E7128 -_08104C40: .4byte gSharedMem - thumb_func_end sub_8104BFC - - thumb_func_start sub_8104C44 -sub_8104C44: @ 8104C44 - push {lr} - ldr r0, _08104C58 @ =sub_8104B0C - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - pop {r0} - bx r0 - .align 2, 0 -_08104C58: .4byte sub_8104B0C - thumb_func_end sub_8104C44 - - thumb_func_start sub_8104C5C -sub_8104C5C: @ 8104C5C - push {lr} - ldr r0, _08104C9C @ =sub_8104E74 - movs r1, 0x3 - bl CreateTask - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _08104CA0 @ =gSharedMem - adds r0, 0x3D - strb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _08104CA4 @ =gTasks - adds r0, r1 - ldr r1, _08104CA8 @ =0x0000ffff - strh r1, [r0, 0xA] - movs r1, 0x4 - adds r2, r0, 0 - adds r2, 0x8 - movs r3, 0x40 -_08104C86: - lsls r0, r1, 1 - adds r0, r2, r0 - strh r3, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xF - bls _08104C86 - pop {r0} - bx r0 - .align 2, 0 -_08104C9C: .4byte sub_8104E74 -_08104CA0: .4byte gSharedMem -_08104CA4: .4byte gTasks -_08104CA8: .4byte 0x0000ffff - thumb_func_end sub_8104C5C - -.section .text_8104D30 - thumb_func_start sub_8104D30 sub_8104D30: @ 8104D30 push {r4-r7,lr} diff --git a/data/slot_machine.s b/data/slot_machine.s index 91b3b0ebf..9b9ba021e 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,18 +3,6 @@ .section .rodata - .align 2 -gUnknown_083ECC30:: @ 83ECC30 - .4byte sub_8104B3C - .4byte sub_8104B60 - .4byte sub_8104B80 - .4byte sub_8104B60 - .4byte sub_8104BC8 - .4byte sub_8104B60 - .4byte sub_8104BFC - .4byte sub_8104B60 - .4byte sub_8104C44 - gUnknown_083ECC54:: @ 83ECC54 .4byte nullsub_69 diff --git a/ld_script.txt b/ld_script.txt index 9b2100529..86728ae95 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -321,8 +321,6 @@ SECTIONS { src/field/decoration.o(.text); src/field/slot_machine.o(.text); asm/slot_machine.o(.text); - src/field/slot_machine.o(.text_a); - asm/slot_machine.o(.text_8104D30) src/field/slot_machine.o(.text_b); src/scene/contest_painting.o(.text); src/battle/battle_ai.o(.text); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index b57f0cfaf..4076d7770 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -172,9 +172,17 @@ void sub_8104A40(s16 a0, s16 a1); void sub_8104A88(s16 a0); void sub_8104AB8(u8 a0); bool8 sub_8104AEC(void); +void sub_8104B0C(u8 taskId); +void sub_8104B3C(struct Task *task); +void sub_8104B60(struct Task *task); +void sub_8104B80(struct Task *task); +void sub_8104BC8(struct Task *task); +void sub_8104BFC(struct Task *task); +void sub_8104C44(struct Task *task); void sub_8104C5C(void); void sub_8104CAC(u8 arg0); bool8 sub_8104E18(void); +void sub_8104E74(u8 taskId); void sub_8104EA8(void); void sub_8104F8C(void); void sub_81050C4(void); @@ -207,6 +215,7 @@ void sub_81063C0(void); static void sub_8106448(void); void sub_81064B8(void); void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); +void sub_81065DC(void); extern struct UnkStruct1 *gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; @@ -2862,7 +2871,122 @@ void sub_81049F8(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_810434C)); } -asm(".section .text_a"); +extern const u16 gReelTimeWindowTilemap[]; + +void sub_8104A40(s16 a0, s16 a1) +{ + s16 i; + + for (i = 4; i < 15; i++) + { + u16 tile = gReelTimeWindowTilemap[a1 + (i - 4) * 20]; + ((u16 *)BG_SCREEN_ADDR(28))[32 * i + a0] = tile; + } +} + +void sub_8104A88(s16 a0) +{ + s16 i; + + for (i = 4; i < 15; i++) + { + ((u16 *)BG_SCREEN_ADDR(28))[32 * i + a0] = 0; + } +} + +void sub_8104AB8(u8 a0) +{ + u8 taskId = CreateTask(sub_8104B0C, 1); + gTasks[taskId].data[1] = a0; + sub_8104B0C(taskId); +} + +bool8 sub_8104AEC(void) +{ + if (FindTaskIdByFunc(sub_8104B0C) == 0xFF) + return TRUE; + return FALSE; +} + +void (*const gUnknown_083ECC30[])(struct Task *task) = { + sub_8104B3C, + sub_8104B60, + sub_8104B80, + sub_8104B60, + sub_8104BC8, + sub_8104B60, + sub_8104BFC, + sub_8104B60, + sub_8104C44 +}; + +void sub_8104B0C(u8 taskId) +{ + gUnknown_083ECC30[gTasks[taskId].data[0]](gTasks + taskId); +} + +void sub_8104B3C(struct Task *task) +{ + BeginNormalPaletteFade(-1, 0, 0, 16, 0); + task->data[0]++; +} + +void sub_8104B60(struct Task *task) +{ + if (!gPaletteFade.active) + { + task->data[0]++; + } +} + +void sub_8104B80(struct Task *task) +{ + sub_8104DA4(); + sub_81065DC(); + BasicInitMenuWindow(&gWindowConfig_81E7144); + MenuPrint_PixelCoords(gOtherText_ReelTime, 10, 32, 1); + BeginNormalPaletteFade(-1, 0, 16, 0, 0); + task->data[0]++; +} + +void sub_8104BC8(struct Task *task) +{ + if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) + { + BeginNormalPaletteFade(-1, 0, 0, 16, 0); + task->data[0]++; + } +} + +void sub_8104BFC(struct Task *task) +{ + MenuZeroFillScreen(); + BasicInitMenuWindow(&gWindowConfig_81E7128); + sub_81064B8(); + sub_8104CAC(task->data[1]); + sub_810423C(eSlotMachine->unk02); + BeginNormalPaletteFade(-1, 0, 16, 0, 0); + task->data[0]++; +} + +void sub_8104C44(struct Task *task) +{ + DestroyTask(FindTaskIdByFunc(sub_8104B0C)); +} + +void sub_8104C5C(void) +{ + u8 i; + struct Task *task; + i = CreateTask(sub_8104E74, 3); + eSlotMachine->unk3D = i; + task = gTasks + i; + task->data[1] = -1; + for (i = 4; i < 16; i++) + { + task->data[i] = 0x40; + } +} static void LoadSlotMachineWheelOverlay(void); -- cgit v1.2.3 From 7f6d7c107b2986a4631218b482db216cfca91733 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 20:18:52 -0500 Subject: through sub_8104F8C --- asm/slot_machine.s | 369 ----------------------------------------------- data/slot_machine.s | 3 - src/field/slot_machine.c | 110 +++++++++++++- 3 files changed, 109 insertions(+), 373 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 0e18f4380..6a5d36d95 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,375 +5,6 @@ .text - thumb_func_start sub_8104D30 -sub_8104D30: @ 8104D30 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - mov r8, r1 - ldr r4, [sp, 0x1C] - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, _08104D84 @ =gSharedMem - adds r0, 0x3D - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _08104D88 @ =gTasks - adds r0, r1 - mov r12, r0 - movs r5, 0x4 - lsls r4, 16 - asrs r6, r4, 16 - lsls r2, 16 - lsls r3, 16 -_08104D5C: - lsls r0, r5, 1 - mov r1, r12 - adds r1, 0x8 - adds r4, r1, r0 - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0x40 - bne _08104D8C - str r6, [sp] - adds r0, r7, 0 - mov r1, r8 - asrs r2, 16 - asrs r3, 16 - bl sub_8105BF8 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - b _08104D96 - .align 2, 0 -_08104D84: .4byte gSharedMem -_08104D88: .4byte gTasks -_08104D8C: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _08104D5C -_08104D96: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8104D30 - - thumb_func_start sub_8104DA4 -sub_8104DA4: @ 8104DA4 - push {r4-r6,lr} - ldr r0, _08104E04 @ =gSharedMem - adds r0, 0x3D - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _08104E08 @ =gTasks - adds r4, r0, r1 - ldrh r1, [r4, 0xA] - ldr r0, _08104E0C @ =0x0000ffff - cmp r1, r0 - beq _08104DCE - ldr r0, _08104E10 @ =gUnknown_083ED064 - movs r2, 0xA - ldrsh r1, [r4, r2] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - bl _call_via_r0 -_08104DCE: - movs r5, 0x4 - adds r6, r4, 0 - adds r6, 0x8 -_08104DD4: - lsls r0, r5, 1 - adds r4, r6, r0 - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0x40 - beq _08104DF4 - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08104E14 @ =gSprites - adds r0, r1 - bl DestroySprite - movs r0, 0x40 - strh r0, [r4] -_08104DF4: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _08104DD4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08104E04: .4byte gSharedMem -_08104E08: .4byte gTasks -_08104E0C: .4byte 0x0000ffff -_08104E10: .4byte gUnknown_083ED064 -_08104E14: .4byte gSprites - thumb_func_end sub_8104DA4 - - thumb_func_start sub_8104E18 -sub_8104E18: @ 8104E18 - push {r4,r5,lr} - ldr r0, _08104E54 @ =gSharedMem - adds r0, 0x3D - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _08104E58 @ =gTasks - adds r0, r1 - movs r2, 0x4 - adds r3, r0, 0 - adds r3, 0x8 - ldr r4, _08104E5C @ =gSprites -_08104E32: - lsls r0, r2, 1 - adds r1, r3, r0 - movs r5, 0 - ldrsh r0, [r1, r5] - cmp r0, 0x40 - beq _08104E60 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - movs r5, 0x3C - ldrsh r0, [r1, r5] - cmp r0, 0 - beq _08104E60 - movs r0, 0 - b _08104E6C - .align 2, 0 -_08104E54: .4byte gSharedMem -_08104E58: .4byte gTasks -_08104E5C: .4byte gSprites -_08104E60: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xF - bls _08104E32 - movs r0, 0x1 -_08104E6C: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8104E18 - - thumb_func_start sub_8104E74 -sub_8104E74: @ 8104E74 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r3, _08104E9C @ =gUnknown_083ECC54 - ldr r2, _08104EA0 @ =gTasks - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r2, 0x8 - ldrsh r1, [r0, r2] - lsls r1, 2 - adds r1, r3 - ldr r1, [r1] - bl _call_via_r1 - pop {r0} - bx r0 - .align 2, 0 -_08104E9C: .4byte gUnknown_083ECC54 -_08104EA0: .4byte gTasks - thumb_func_end sub_8104E74 - - thumb_func_start nullsub_69 -nullsub_69: @ 8104EA4 - bx lr - thumb_func_end nullsub_69 - - thumb_func_start sub_8104EA8 -sub_8104EA8: @ 8104EA8 - push {r4-r7,lr} - movs r6, 0 - movs r0, 0x30 -_08104EAE: - movs r4, 0 - lsls r5, r0, 16 - lsls r7, r6, 16 -_08104EB4: - ldr r0, _08104F0C @ =gSpriteTemplate_83ED414 - asrs r1, r5, 16 - movs r2, 0 - movs r3, 0xE - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, _08104F10 @ =gSprites - adds r1, r0 - ldrb r0, [r1, 0x5] - movs r2, 0xC - orrs r0, r2 - strb r0, [r1, 0x5] - strh r6, [r1, 0x2E] - strh r4, [r1, 0x30] - ldr r0, _08104F14 @ =0x0000ffff - strh r0, [r1, 0x34] - lsls r0, r4, 16 - movs r1, 0xC0 - lsls r1, 13 - adds r0, r1 - lsrs r4, r0, 16 - asrs r0, 16 - cmp r0, 0x77 - ble _08104EB4 - movs r2, 0x80 - lsls r2, 9 - adds r1, r7, r2 - movs r2, 0xA0 - lsls r2, 14 - adds r0, r5, r2 - lsrs r0, 16 - lsrs r6, r1, 16 - asrs r1, 16 - cmp r1, 0x2 - ble _08104EAE - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08104F0C: .4byte gSpriteTemplate_83ED414 -_08104F10: .4byte gSprites -_08104F14: .4byte 0x0000ffff - thumb_func_end sub_8104EA8 - - thumb_func_start sub_8104F18 -sub_8104F18: @ 8104F18 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08104F88 @ =gSharedMem - movs r0, 0x2E - ldrsh r1, [r5, r0] - lsls r1, 1 - adds r0, r4, 0 - adds r0, 0x1C - adds r1, r0 - ldrh r0, [r5, 0x30] - ldrh r1, [r1] - adds r0, r1 - strh r0, [r5, 0x32] - movs r1, 0x32 - ldrsh r0, [r5, r1] - movs r1, 0x78 - bl __modsi3 - strh r0, [r5, 0x32] - movs r2, 0x2E - ldrsh r1, [r5, r2] - lsls r1, 1 - adds r4, 0x22 - adds r1, r4 - ldrh r1, [r1] - adds r1, 0x1C - adds r0, r1 - strh r0, [r5, 0x22] - ldrh r4, [r5, 0x2E] - lsls r4, 24 - lsrs r4, 24 - movs r1, 0x32 - ldrsh r0, [r5, r1] - movs r1, 0x18 - bl __divsi3 - adds r1, r0, 0 - lsls r1, 16 - asrs r1, 16 - adds r0, r4, 0 - bl sub_8102BA4 - lsls r0, 24 - lsrs r0, 24 - bl GetSpriteTileStartByTag - adds r1, r5, 0 - adds r1, 0x40 - strh r0, [r1] - adds r0, r5, 0 - bl SetSpriteSheetFrameTileNum - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08104F88: .4byte gSharedMem - thumb_func_end sub_8104F18 - - thumb_func_start sub_8104F8C -sub_8104F8C: @ 8104F8C - push {r4-r6,lr} - movs r4, 0xCB - movs r5, 0x1 - ldr r6, _08104FF0 @ =0x0000270f -_08104F94: - lsls r4, 16 - asrs r4, 16 - lsls r5, 16 - asrs r5, 16 - adds r0, r4, 0 - movs r1, 0x17 - movs r2, 0 - adds r3, r5, 0 - bl sub_8104FF4 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 17 - subs r4, 0x7 - lsls r4, 16 - lsrs r4, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, r6 - ble _08104F94 - movs r4, 0xEB - movs r5, 0x1 - ldr r6, _08104FF0 @ =0x0000270f -_08104FC2: - lsls r4, 16 - asrs r4, 16 - lsls r5, 16 - asrs r5, 16 - adds r0, r4, 0 - movs r1, 0x17 - movs r2, 0x1 - adds r3, r5, 0 - bl sub_8104FF4 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 17 - subs r4, 0x7 - lsls r4, 16 - lsrs r4, 16 - lsrs r5, r0, 16 - asrs r0, 16 - cmp r0, r6 - ble _08104FC2 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08104FF0: .4byte 0x0000270f - thumb_func_end sub_8104F8C - thumb_func_start sub_8104FF4 sub_8104FF4: @ 8104FF4 push {r4-r6,lr} diff --git a/data/slot_machine.s b/data/slot_machine.s index 9b9ba021e..d3af411ec 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,9 +3,6 @@ .section .rodata -gUnknown_083ECC54:: @ 83ECC54 - .4byte nullsub_69 - gUnknown_083ECC58:: @ 83ECC58 .byte 16, 0 diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 4076d7770..d6e078139 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -182,9 +182,11 @@ void sub_8104C44(struct Task *task); void sub_8104C5C(void); void sub_8104CAC(u8 arg0); bool8 sub_8104E18(void); +void nullsub_69(struct Task *task); void sub_8104E74(u8 taskId); void sub_8104EA8(void); void sub_8104F8C(void); +void sub_8104FF4(s16 a0, s16 a1, u8 a2, s16 a3); void sub_81050C4(void); void sub_8105100(void); void sub_810514C(void); @@ -211,6 +213,7 @@ bool8 sub_8105ACC(void); void sub_8105AEC(void); u8 sub_8105B1C(s16 a0, s16 a1); void sub_8105B88(u8 a0); +u8 sub_8105BF8(u8, u32, s16, s16, s16); void sub_81063C0(void); static void sub_8106448(void); void sub_81064B8(void); @@ -2984,7 +2987,7 @@ void sub_8104C5C(void) task->data[1] = -1; for (i = 4; i < 16; i++) { - task->data[i] = 0x40; + task->data[i] = MAX_SPRITES; } } @@ -3017,6 +3020,111 @@ void sub_8104CAC(u8 arg0) { #endif } } + +void sub_8104D30(u8 a0, u32 a1, s16 a2, s16 a3, s16 a4) +{ + u8 i; + struct Task *task = gTasks + eSlotMachine->unk3D; + for (i = 4; i < 16; i++) + { + if (task->data[i] == MAX_SPRITES) + { + task->data[i] = sub_8105BF8(a0, a1, a2, a3, a4); + break; + } + } +} + +extern void (*const gUnknown_083ED064[])(void); + +void sub_8104DA4(void) +{ + u8 i; + struct Task *task = gTasks + eSlotMachine->unk3D; + if ((u16)task->data[1] != 0xFFFF) + gUnknown_083ED064[task->data[1]](); + for (i = 4; i < 16; i++) + { + if (task->data[i] != MAX_SPRITES) + { + DestroySprite(gSprites + task->data[i]); + task->data[i] = MAX_SPRITES; + } + } +} + +bool8 sub_8104E18(void) +{ + u8 i; + struct Task *task = gTasks + eSlotMachine->unk3D; + for (i = 4; i < 16; i++) + { + if (task->data[i] != MAX_SPRITES) + { + if (gSprites[task->data[i]].data[7]) + return FALSE; + } + } + return TRUE; +} + +void (*const gUnknown_083ECC54[])(struct Task *task) = { + nullsub_69 +}; + +void sub_8104E74(u8 taskId) +{ + gUnknown_083ECC54[gTasks[taskId].data[0]](gTasks + taskId); +} + +void nullsub_69(struct Task *task) +{ + +} + +const struct SpriteTemplate gSpriteTemplate_83ED414; + +void sub_8104EA8(void) +{ + s16 i; + s16 j; + s16 x; + for (i = 0, x = 0x30; i < 3; i++, x += 0x28) + { + for (j = 0; j < 120; j += 24) + { + struct Sprite *sprite = gSprites + CreateSprite(&gSpriteTemplate_83ED414, x, 0, 14); + sprite->oam.priority = 3; + sprite->data[0] = i; + sprite->data[1] = j; + sprite->data[3] = -1; + } + } +} + +void sub_8104F18(struct Sprite *sprite) +{ + sprite->data[2] = eSlotMachine->unk1C[sprite->data[0]] + sprite->data[1]; + sprite->data[2] %= 120; + sprite->pos1.y = eSlotMachine->unk22[sprite->data[0]] + 28 + sprite->data[2]; + sprite->sheetTileStart = GetSpriteTileStartByTag(sub_8102BA4(sprite->data[0], sprite->data[2] / 24)); + SetSpriteSheetFrameTileNum(sprite); +} + +void sub_8104F8C(void) +{ + s16 i; + s16 r4; + for (r4 = 203, i = 1; i < 10000; i *= 10, r4 -= 7) + { + sub_8104FF4(r4, 23, 0, i); + } + for (r4 = 235, i = 1; i < 10000; i *= 10, r4 -= 7) + { + sub_8104FF4(r4, 23, 1, i); + } +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From 4137641bfecb300694d0045d3b694d4c6dca2aef Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 21:08:10 -0500 Subject: through sub_8105170 --- asm/slot_machine.s | 239 ----------------------------------------------- src/field/slot_machine.c | 78 ++++++++++++++-- 2 files changed, 72 insertions(+), 245 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 6a5d36d95..000acd198 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,245 +5,6 @@ .text - thumb_func_start sub_8104FF4 -sub_8104FF4: @ 8104FF4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r5, r0, 0 - adds r6, r1, 0 - mov r8, r2 - adds r4, r3, 0 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, _08105060 @ =gSpriteTemplate_83ED42C - lsls r5, 16 - asrs r5, 16 - lsls r6, 16 - asrs r6, 16 - adds r1, r5, 0 - adds r2, r6, 0 - movs r3, 0xD - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - ldr r0, _08105064 @ =gSprites - adds r2, r0 - ldrb r1, [r2, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r2, 0x5] - mov r0, r8 - strh r0, [r2, 0x2E] - strh r4, [r2, 0x30] - lsls r4, 16 - asrs r4, 16 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 1 - strh r0, [r2, 0x32] - ldr r0, _08105068 @ =0x0000ffff - strh r0, [r2, 0x34] - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08105060: .4byte gSpriteTemplate_83ED42C -_08105064: .4byte gSprites -_08105068: .4byte 0x0000ffff - thumb_func_end sub_8104FF4 - - thumb_func_start sub_810506C -sub_810506C: @ 810506C - push {r4,lr} - adds r4, r0, 0 - ldr r1, _081050C0 @ =gSharedMem - ldrh r2, [r1, 0xC] - movs r3, 0x2E - ldrsh r0, [r4, r3] - cmp r0, 0 - beq _0810507E - ldrh r2, [r1, 0xE] -_0810507E: - movs r1, 0x34 - ldrsh r0, [r4, r1] - cmp r0, r2 - beq _081050B8 - strh r2, [r4, 0x34] - ldrh r1, [r4, 0x32] - adds r0, r2, 0 - bl __umodsi3 - lsls r0, 16 - lsrs r2, r0, 16 - ldrh r1, [r4, 0x30] - adds r0, r2, 0 - bl __udivsi3 - lsls r0, 16 - movs r3, 0xE0 - lsls r3, 11 - adds r0, r3 - lsrs r2, r0, 16 - adds r0, r2, 0 - bl GetSpriteTileStartByTag - adds r1, r4, 0 - adds r1, 0x40 - strh r0, [r1] - adds r0, r4, 0 - bl SetSpriteSheetFrameTileNum -_081050B8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081050C0: .4byte gSharedMem - thumb_func_end sub_810506C - - thumb_func_start sub_81050C4 -sub_81050C4: @ 81050C4 - push {lr} - ldr r0, _081050F4 @ =gSpriteTemplate_83ED444 - movs r1, 0x58 - movs r2, 0x48 - movs r3, 0xF - bl CreateSprite - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r2, _081050F8 @ =gSprites - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r0, 0x5] - movs r2, 0xC - orrs r1, r2 - strb r1, [r0, 0x5] - ldr r1, _081050FC @ =gSubspriteTables_83ED704 - bl SetSubspriteTables - pop {r0} - bx r0 - .align 2, 0 -_081050F4: .4byte gSpriteTemplate_83ED444 -_081050F8: .4byte gSprites -_081050FC: .4byte gSubspriteTables_83ED704 - thumb_func_end sub_81050C4 - - thumb_func_start sub_8105100 -sub_8105100: @ 8105100 - push {lr} - ldr r0, _08105140 @ =gSpriteTemplate_83ED45C - movs r1, 0x8C - lsls r1, 1 - movs r2, 0x50 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08105144 @ =gSprites - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r1 - ldrb r3, [r2, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r3 - movs r3, 0x4 - orrs r1, r3 - strb r1, [r2, 0x5] - adds r2, 0x3E - ldrb r1, [r2] - movs r3, 0x2 - orrs r1, r3 - strb r1, [r2] - ldr r1, _08105148 @ =gSharedMem - adds r1, 0x3F - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08105140: .4byte gSpriteTemplate_83ED45C -_08105144: .4byte gSprites -_08105148: .4byte gSharedMem - thumb_func_end sub_8105100 - - thumb_func_start sub_810514C -sub_810514C: @ 810514C - push {lr} - ldr r0, _08105168 @ =gSharedMem - adds r0, 0x3F - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0810516C @ =gSprites - adds r0, r1 - bl DestroySprite - pop {r0} - bx r0 - .align 2, 0 -_08105168: .4byte gSharedMem -_0810516C: .4byte gSprites - thumb_func_end sub_810514C - - thumb_func_start sub_8105170 -sub_8105170: @ 8105170 - push {lr} - adds r2, r0, 0 - movs r0, 0 - strh r0, [r2, 0x24] - strh r0, [r2, 0x26] - adds r0, r2, 0 - adds r0, 0x2A - ldrb r0, [r0] - cmp r0, 0x4 - bne _081051B6 - movs r0, 0x8 - strh r0, [r2, 0x24] - strh r0, [r2, 0x26] - adds r0, r2, 0 - adds r0, 0x2B - ldrb r0, [r0] - cmp r0, 0 - beq _081051A4 - adds r0, r2, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r0, 0x3F - ands r0, r1 - cmp r0, 0 - bne _081051B2 - b _081051B6 -_081051A4: - adds r0, r2, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r0, 0x3F - ands r0, r1 - cmp r0, 0 - bne _081051B6 -_081051B2: - ldr r0, _081051BC @ =0x0000fff8 - strh r0, [r2, 0x26] -_081051B6: - pop {r0} - bx r0 - .align 2, 0 -_081051BC: .4byte 0x0000fff8 - thumb_func_end sub_8105170 - thumb_func_start sub_81051C0 sub_81051C0: @ 81051C0 push {r4-r7,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index d6e078139..9246e9428 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -186,7 +186,7 @@ void nullsub_69(struct Task *task); void sub_8104E74(u8 taskId); void sub_8104EA8(void); void sub_8104F8C(void); -void sub_8104FF4(s16 a0, s16 a1, u8 a2, s16 a3); +void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3); void sub_81050C4(void); void sub_8105100(void); void sub_810514C(void); @@ -3114,14 +3114,80 @@ void sub_8104F18(struct Sprite *sprite) void sub_8104F8C(void) { s16 i; - s16 r4; - for (r4 = 203, i = 1; i < 10000; i *= 10, r4 -= 7) + s16 x; + for (x = 203, i = 1; i < 10000; i *= 10, x -= 7) { - sub_8104FF4(r4, 23, 0, i); + sub_8104FF4(x, 23, 0, i); } - for (r4 = 235, i = 1; i < 10000; i *= 10, r4 -= 7) + for (x = 235, i = 1; i < 10000; i *= 10, x -= 7) { - sub_8104FF4(r4, 23, 1, i); + sub_8104FF4(x, 23, 1, i); + } +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED42C; + +void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3) +{ + struct Sprite *sprite = gSprites + CreateSprite(&gSpriteTemplate_83ED42C, x, y, 13); + sprite->oam.priority = 2; + sprite->data[0] = a2; + sprite->data[1] = a3; + sprite->data[2] = a3 * 10; + sprite->data[3] = -1; +} + +void sub_810506C(struct Sprite *sprite) +{ + u16 tag = eSlotMachine->coins; + if (sprite->data[0]) + tag = eSlotMachine->unk0E; + if (sprite->data[3] != tag) + { + sprite->data[3] = tag; + tag %= (u16)sprite->data[2]; + tag /= (u16)sprite->data[1]; + tag += 7; + sprite->sheetTileStart = GetSpriteTileStartByTag(tag); + SetSpriteSheetFrameTileNum(sprite); + } +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED444; +extern const struct SubspriteTable gSubspriteTables_83ED704[]; + +void sub_81050C4(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED444, 0x58, 0x48, 15); + gSprites[spriteId].oam.priority = 3; + SetSubspriteTables(gSprites + spriteId, gSubspriteTables_83ED704); +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED45C; + +void sub_8105100(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED45C, 0x118, 0x50, 1); + gSprites[spriteId].oam.priority = 1; + gSprites[spriteId].coordOffsetEnabled = TRUE; + eSlotMachine->unk3F = spriteId; +} + +void sub_810514C(void) +{ + DestroySprite(gSprites + eSlotMachine->unk3F); +} + +void sub_8105170(struct Sprite *sprite) +{ + sprite->pos2.y = sprite->pos2.x = 0; + if (sprite->animNum == 4) + { + sprite->pos2.y = sprite->pos2.x = 8; + if ((sprite->animCmdIndex != 0 && sprite->animDelayCounter != 0) || (sprite->animCmdIndex == 0 && sprite->animDelayCounter == 0)) + { + sprite->pos2.y = -8; + } } } -- cgit v1.2.3 From 26d22691dc88b3c9e61fa3612c46d3b24167d0eb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 23:20:35 -0500 Subject: through sub_810535C --- asm/slot_machine.s | 235 ----------------------------------------------- include/slot_machine.h | 8 +- src/field/slot_machine.c | 62 ++++++++++++- 3 files changed, 67 insertions(+), 238 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 000acd198..83e89cc22 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,241 +5,6 @@ .text - thumb_func_start sub_81051C0 -sub_81051C0: @ 81051C0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, _0810526C @ =gSpriteTemplate_83ED474 - movs r7, 0xB8 - lsls r7, 1 - adds r1, r7, 0 - movs r2, 0x34 - movs r3, 0x7 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r1, _08105270 @ =gSprites - mov r10, r1 - adds r2, r0, r1 - ldrb r1, [r2, 0x5] - movs r5, 0xD - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - movs r3, 0x4 - mov r9, r3 - mov r1, r9 - orrs r0, r1 - strb r0, [r2, 0x5] - adds r1, r2, 0 - adds r1, 0x3E - ldrb r0, [r1] - movs r3, 0x2 - mov r8, r3 - mov r3, r8 - orrs r0, r3 - strb r0, [r1] - ldr r1, _08105274 @ =gSubspriteTables_83ED73C - adds r0, r2, 0 - bl SetSubspriteTables - ldr r6, _08105278 @ =gSharedMem - adds r0, r6, 0 - adds r0, 0x49 - strb r4, [r0] - ldr r0, _0810527C @ =gSpriteTemplate_83ED48C - adds r1, r7, 0 - movs r2, 0x54 - movs r3, 0x7 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - mov r1, r10 - adds r2, r0, r1 - ldrb r0, [r2, 0x5] - ands r5, r0 - mov r3, r9 - orrs r5, r3 - strb r5, [r2, 0x5] - adds r1, r2, 0 - adds r1, 0x3E - ldrb r0, [r1] - mov r3, r8 - orrs r0, r3 - strb r0, [r1] - ldr r1, _08105280 @ =gSubspriteTables_83ED75C - adds r0, r2, 0 - bl SetSubspriteTables - adds r6, 0x4A - strb r4, [r6] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0810526C: .4byte gSpriteTemplate_83ED474 -_08105270: .4byte gSprites -_08105274: .4byte gSubspriteTables_83ED73C -_08105278: .4byte gSharedMem -_0810527C: .4byte gSpriteTemplate_83ED48C -_08105280: .4byte gSubspriteTables_83ED75C - thumb_func_end sub_81051C0 - - thumb_func_start sub_8105284 -sub_8105284: @ 8105284 - push {r4,lr} - ldr r0, _081052D8 @ =gSpriteTemplate_83ED4A4 - ldr r1, _081052DC @ =gSpriteCoordOffsetX - ldrh r2, [r1] - movs r1, 0xA8 - subs r1, r2 - lsls r1, 16 - asrs r1, 16 - movs r2, 0x50 - movs r3, 0x7 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r1, _081052E0 @ =gSprites - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0, 0x5] - adds r3, r0, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r3] - ldr r1, _081052E4 @ =gSubspriteTables_83ED78C - bl SetSubspriteTables - ldr r0, _081052E8 @ =gSharedMem - adds r0, 0x42 - strb r4, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081052D8: .4byte gSpriteTemplate_83ED4A4 -_081052DC: .4byte gSpriteCoordOffsetX -_081052E0: .4byte gSprites -_081052E4: .4byte gSubspriteTables_83ED78C -_081052E8: .4byte gSharedMem - thumb_func_end sub_8105284 - - thumb_func_start sub_81052EC -sub_81052EC: @ 81052EC - push {r4-r7,lr} - movs r4, 0 - movs r5, 0 - ldr r6, _08105350 @ =gSharedMem + 0x4B -_081052F4: - ldr r0, _08105354 @ =gSpriteTemplate_83ED4BC - movs r1, 0xB8 - lsls r1, 1 - movs r2, 0 - movs r3, 0xA - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r3, r0, 4 - adds r3, r0 - lsls r3, 2 - ldr r1, _08105358 @ =gSprites - adds r3, r1 - ldrb r2, [r3, 0x5] - movs r7, 0xD - negs r7, r7 - adds r1, r7, 0 - ands r2, r1 - movs r1, 0x4 - orrs r2, r1 - strb r2, [r3, 0x5] - movs r1, 0x3E - adds r1, r3 - mov r12, r1 - ldrb r1, [r1] - movs r2, 0x2 - orrs r1, r2 - mov r2, r12 - strb r1, [r2] - strh r5, [r3, 0x3C] - adds r1, r4, r6 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r5, 16 - movs r7, 0xA0 - lsls r7, 13 - adds r0, r7 - lsrs r5, r0, 16 - cmp r4, 0x2 - bls _081052F4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08105350: .4byte gSharedMem + 0x4B -_08105354: .4byte gSpriteTemplate_83ED4BC -_08105358: .4byte gSprites - thumb_func_end sub_81052EC - - thumb_func_start sub_810535C -sub_810535C: @ 810535C - push {r4,lr} - adds r4, r0, 0 - ldr r1, _0810539C @ =gSharedMem - ldrh r0, [r4, 0x3C] - ldrh r1, [r1, 0x14] - adds r0, r1 - lsls r0, 16 - asrs r0, 16 - movs r1, 0x28 - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - adds r1, r0, 0 - adds r1, 0x3B - strh r1, [r4, 0x22] - movs r1, 0x14 - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - bl sub_8102C48 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAnimIfDifferent - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0810539C: .4byte gSharedMem - thumb_func_end sub_810535C - thumb_func_start sub_81053A0 sub_81053A0: @ 81053A0 push {r4-r7,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 004538b14..78744d0e4 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -30,9 +30,13 @@ struct SlotMachineEwramStruct { /*0x3D*/ u8 unk3D; /*0x3E*/ u8 unk3E; /*0x3F*/ u8 unk3F; - /*0x40*/ u8 filler40[4]; + /*0x40*/ u8 filler40[2]; + /*0x42*/ u8 unk42; + /*0x43*/ u8 unk43; /*0x44*/ u8 unk44[5]; - /*0x49*/ u8 filler49[5]; + /*0x49*/ u8 unk49; + /*0x4A*/ u8 unk4A; + /*0x49*/ u8 unk4B[3]; /*0x4E*/ u8 unk4E; /*0x4F*/ u8 filler4F[9]; /*0x58*/ u16 win0h; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 9246e9428..3aaad9a8b 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -3082,7 +3082,7 @@ void nullsub_69(struct Task *task) } -const struct SpriteTemplate gSpriteTemplate_83ED414; +extern const struct SpriteTemplate gSpriteTemplate_83ED414; void sub_8104EA8(void) { @@ -3191,6 +3191,66 @@ void sub_8105170(struct Sprite *sprite) } } +extern const struct SpriteTemplate gSpriteTemplate_83ED474; +extern const struct SpriteTemplate gSpriteTemplate_83ED48C; +extern const struct SubspriteTable gSubspriteTables_83ED73C[]; +extern const struct SubspriteTable gSubspriteTables_83ED75C[]; + +void sub_81051C0(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED474, 0x170, 0x34, 7); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 1; + sprite->coordOffsetEnabled = TRUE; + SetSubspriteTables(sprite, gSubspriteTables_83ED73C); + eSlotMachine->unk49 = spriteId; + + spriteId = CreateSprite(&gSpriteTemplate_83ED48C, 0x170, 0x54, 7); + sprite = gSprites + spriteId; + sprite->oam.priority = 1; + sprite->coordOffsetEnabled = TRUE; + SetSubspriteTables(sprite, gSubspriteTables_83ED75C); + eSlotMachine->unk4A = spriteId; +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED4A4; +extern const struct SubspriteTable gSubspriteTables_83ED78C[]; + +void sub_8105284(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4A4, 0xa8 - gSpriteCoordOffsetX, 0x50, 7); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 1; + sprite->coordOffsetEnabled = TRUE; + SetSubspriteTables(sprite, gSubspriteTables_83ED78C); + eSlotMachine->unk42 = spriteId; +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED4BC; + +void sub_81052EC(void) +{ + u8 i; + s16 r5; + for (i = 0, r5 = 0; i < 3; i++, r5 += 20) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4BC, 0x170, 0x00, 10); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 1; + sprite->coordOffsetEnabled = TRUE; + sprite->data[7] = r5; + eSlotMachine->unk4B[i] = spriteId; + } +} + +void sub_810535C(struct Sprite *sprite) +{ + s16 r0 = (u16)(eSlotMachine->unk14 + sprite->data[7]); + r0 %= 40; + sprite->pos1.y = r0 + 59; + StartSpriteAnimIfDifferent(sprite, sub_8102C48(r0 / 20)); +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From a357c07d83a3b90adf0353501cbc0f84f6eeeddc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Dec 2017 19:58:37 -0500 Subject: through sub_8105554 --- asm/slot_machine.s | 236 ----------------------------------------------- include/slot_machine.h | 10 +- src/field/slot_machine.c | 70 +++++++++++++- 3 files changed, 71 insertions(+), 245 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 83e89cc22..f043fb536 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,242 +5,6 @@ .text - thumb_func_start sub_81053A0 -sub_81053A0: @ 81053A0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r1, 0xB8 - lsls r1, 1 - ldr r0, _0810544C @ =gSpriteTemplate_83ED4D4 - movs r2, 0x64 - movs r3, 0x9 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r7, _08105450 @ =gSprites - adds r2, r0, r7 - adds r1, r2, 0 - adds r1, 0x3E - ldrb r0, [r1] - movs r3, 0x2 - mov r10, r3 - mov r3, r10 - orrs r0, r3 - strb r0, [r1] - ldrb r1, [r2, 0x5] - movs r5, 0xD - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - movs r1, 0x4 - mov r8, r1 - mov r3, r8 - orrs r0, r3 - strb r0, [r2, 0x5] - ldr r0, _08105454 @ =gSubspriteTables_83ED7B4 - mov r9, r0 - adds r0, r2, 0 - mov r1, r9 - bl SetSubspriteTables - ldr r6, _08105458 @ =gSharedMem - adds r0, r6, 0 - adds r0, 0x4E - strb r4, [r0] - movs r1, 0x90 - lsls r1, 1 - ldr r0, _0810544C @ =gSpriteTemplate_83ED4D4 - movs r2, 0x68 - movs r3, 0x4 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r2, r0, r7 - adds r1, r2, 0 - adds r1, 0x3E - ldrb r0, [r1] - mov r3, r10 - orrs r0, r3 - strb r0, [r1] - ldrb r0, [r2, 0x5] - ands r5, r0 - mov r0, r8 - orrs r5, r0 - strb r5, [r2, 0x5] - adds r0, r2, 0 - mov r1, r9 - bl SetSubspriteTables - adds r6, 0x4F - strb r4, [r6] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0810544C: .4byte gSpriteTemplate_83ED4D4 -_08105450: .4byte gSprites -_08105454: .4byte gSubspriteTables_83ED7B4 -_08105458: .4byte gSharedMem - thumb_func_end sub_81053A0 - - thumb_func_start sub_810545C -sub_810545C: @ 810545C - push {r4,lr} - ldr r0, _081054A8 @ =gSpriteTemplate_83ED4EC - movs r1, 0xB8 - lsls r1, 1 - movs r2, 0x4C - movs r3, 0xB - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r1, _081054AC @ =gSprites - adds r0, r1 - adds r3, r0, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r3] - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0, 0x5] - ldr r1, _081054B0 @ =gSubspriteTables_83ED7D4 - bl SetSubspriteTables - ldr r0, _081054B4 @ =gSharedMem - adds r0, 0x40 - strb r4, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081054A8: .4byte gSpriteTemplate_83ED4EC -_081054AC: .4byte gSprites -_081054B0: .4byte gSubspriteTables_83ED7D4 -_081054B4: .4byte gSharedMem - thumb_func_end sub_810545C - - thumb_func_start sub_81054B8 -sub_81054B8: @ 81054B8 - push {r4,r5,lr} - ldr r4, _08105518 @ =gSharedMem - adds r0, r4, 0 - adds r0, 0x40 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0810551C @ =gSprites - adds r0, r1 - bl DestroySprite - movs r5, 0 - adds r4, 0x49 -_081054D4: - adds r0, r5, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0810551C @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bls _081054D4 - movs r5, 0 - ldr r4, _08105520 @ =gSharedMem + 0x4B -_081054F4: - adds r0, r5, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0810551C @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _081054F4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08105518: .4byte gSharedMem -_0810551C: .4byte gSprites -_08105520: .4byte gSharedMem + 0x4B - thumb_func_end sub_81054B8 - - thumb_func_start sub_8105524 -sub_8105524: @ 8105524 - push {r4,r5,lr} - movs r4, 0 - ldr r5, _0810554C @ =gSharedMem + 0x4E -_0810552A: - adds r0, r4, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08105550 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - bls _0810552A - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0810554C: .4byte gSharedMem + 0x4E -_08105550: .4byte gSprites - thumb_func_end sub_8105524 - - thumb_func_start sub_8105554 -sub_8105554: @ 8105554 - push {lr} - ldr r0, _08105570 @ =gSharedMem - adds r0, 0x42 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08105574 @ =gSprites - adds r0, r1 - bl DestroySprite - pop {r0} - bx r0 - .align 2, 0 -_08105570: .4byte gSharedMem -_08105574: .4byte gSprites - thumb_func_end sub_8105554 - thumb_func_start sub_8105578 sub_8105578: @ 8105578 push {r4-r6,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 78744d0e4..882ec6d52 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -30,15 +30,15 @@ struct SlotMachineEwramStruct { /*0x3D*/ u8 unk3D; /*0x3E*/ u8 unk3E; /*0x3F*/ u8 unk3F; - /*0x40*/ u8 filler40[2]; + /*0x40*/ u8 unk40; + /*0x41*/ u8 unk41; /*0x42*/ u8 unk42; /*0x43*/ u8 unk43; /*0x44*/ u8 unk44[5]; - /*0x49*/ u8 unk49; - /*0x4A*/ u8 unk4A; + /*0x49*/ u8 unk49[2]; /*0x49*/ u8 unk4B[3]; - /*0x4E*/ u8 unk4E; - /*0x4F*/ u8 filler4F[9]; + /*0x4E*/ u8 unk4E[2]; + /*0x50*/ u8 filler50[8]; /*0x58*/ u16 win0h; /*0x5a*/ u16 win0v; /*0x5c*/ u16 winIn; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 3aaad9a8b..4b580839c 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -2821,7 +2821,7 @@ void sub_81048CC(struct Task *task) sub_81056C0(); sub_8105804(); sub_8105854(); - gSprites[eSlotMachine->unk4E].invisible = TRUE; + gSprites[eSlotMachine->unk4E[0]].invisible = TRUE; StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5); task->data[0]++; task->data[4] = 4; @@ -2845,7 +2845,7 @@ void sub_8104940(struct Task *task) sub_81058C4(); sub_8105284(); sub_81059E8(); - gSprites[eSlotMachine->unk4E].invisible = FALSE; + gSprites[eSlotMachine->unk4E[0]].invisible = FALSE; task->data[0]++; task->data[5] = 0; } @@ -3203,14 +3203,14 @@ void sub_81051C0(void) sprite->oam.priority = 1; sprite->coordOffsetEnabled = TRUE; SetSubspriteTables(sprite, gSubspriteTables_83ED73C); - eSlotMachine->unk49 = spriteId; + eSlotMachine->unk49[0] = spriteId; spriteId = CreateSprite(&gSpriteTemplate_83ED48C, 0x170, 0x54, 7); sprite = gSprites + spriteId; sprite->oam.priority = 1; sprite->coordOffsetEnabled = TRUE; SetSubspriteTables(sprite, gSubspriteTables_83ED75C); - eSlotMachine->unk4A = spriteId; + eSlotMachine->unk49[1] = spriteId; } extern const struct SpriteTemplate gSpriteTemplate_83ED4A4; @@ -3251,6 +3251,68 @@ void sub_810535C(struct Sprite *sprite) StartSpriteAnimIfDifferent(sprite, sub_8102C48(r0 / 20)); } +extern const struct SpriteTemplate gSpriteTemplate_83ED4D4; +extern const struct SubspriteTable gSubspriteTables_83ED7B4[]; + +void sub_81053A0(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4D4, 0x170, 0x64, 9); + struct Sprite *sprite = gSprites + spriteId; + sprite->coordOffsetEnabled = TRUE; + sprite->oam.priority = 1; + SetSubspriteTables(sprite, gSubspriteTables_83ED7B4); + eSlotMachine->unk4E[0] = spriteId; + + spriteId = CreateSprite(&gSpriteTemplate_83ED4D4, 0x120, 0x68, 4); + sprite = gSprites + spriteId; + sprite->coordOffsetEnabled = TRUE; + sprite->oam.priority = 1; + SetSubspriteTables(sprite, gSubspriteTables_83ED7B4); + eSlotMachine->unk4E[1] = spriteId; +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED4EC; +extern const struct SubspriteTable gSubspriteTables_83ED7D4[]; + +void sub_810545C(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4EC, 0x170, 0x4c, 11); + struct Sprite *sprite = gSprites + spriteId; + sprite->coordOffsetEnabled = TRUE; + sprite->oam.priority = 1; + SetSubspriteTables(sprite, gSubspriteTables_83ED7D4); + eSlotMachine->unk40 = spriteId; +} + +void sub_81054B8(void) +{ + u8 i; + + DestroySprite(gSprites + eSlotMachine->unk40); + for (i = 0; i < 2; i++) + { + DestroySprite(gSprites + eSlotMachine->unk49[i]); + } + for (i = 0; i < 3; i++) + { + DestroySprite(gSprites + eSlotMachine->unk4B[i]); + } +} + +void sub_8105524(void) +{ + u8 i; + for (i = 0; i < 2; i++) + { + DestroySprite(gSprites + eSlotMachine->unk4E[i]); + } +} + +void sub_8105554(void) +{ + DestroySprite(gSprites + eSlotMachine->unk42); +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From 39d2d1f37c62ffc458c82943fbfceb86959ef1a3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Dec 2017 20:18:22 -0500 Subject: through sub_81056C0 --- asm/slot_machine.s | 197 ----------------------------------------------- include/slot_machine.h | 3 +- src/field/slot_machine.c | 61 +++++++++++++++ 3 files changed, 63 insertions(+), 198 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index f043fb536..5518d4395 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,203 +5,6 @@ .text - thumb_func_start sub_8105578 -sub_8105578: @ 8105578 - push {r4-r6,lr} - mov r6, r10 - mov r5, r9 - mov r4, r8 - push {r4-r6} - ldr r0, _0810561C @ =gSpriteTemplate_83ED504 - mov r10, r0 - movs r1, 0x98 - movs r2, 0x20 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r2, _08105620 @ =gSprites - mov r9, r2 - adds r3, r1, r2 - ldrb r2, [r3, 0x5] - movs r4, 0xD - negs r4, r4 - adds r1, r4, 0 - ands r1, r2 - movs r2, 0x4 - mov r8, r2 - mov r2, r8 - orrs r1, r2 - strb r1, [r3, 0x5] - adds r5, r3, 0 - adds r5, 0x3F - ldrb r1, [r5] - movs r2, 0x1 - orrs r1, r2 - strb r1, [r5] - ldr r5, _08105624 @ =gSharedMem - adds r1, r5, 0 - adds r1, 0x50 - strb r0, [r1] - movs r0, 0x8 - strh r0, [r3, 0x2E] - ldr r0, _08105628 @ =0x0000ffff - strh r0, [r3, 0x30] - movs r0, 0x1 - negs r0, r0 - strh r0, [r3, 0x32] - movs r6, 0x20 - strh r6, [r3, 0x3C] - mov r0, r10 - movs r1, 0xB8 - movs r2, 0x20 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - mov r2, r9 - adds r3, r1, r2 - ldrb r1, [r3, 0x5] - ands r4, r1 - mov r1, r8 - orrs r4, r1 - strb r4, [r3, 0x5] - adds r5, 0x51 - strb r0, [r5] - movs r0, 0x1 - strh r0, [r3, 0x30] - subs r0, 0x2 - strh r0, [r3, 0x32] - strh r6, [r3, 0x3C] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0810561C: .4byte gSpriteTemplate_83ED504 -_08105620: .4byte gSprites -_08105624: .4byte gSharedMem -_08105628: .4byte 0x0000ffff - thumb_func_end sub_8105578 - - thumb_func_start sub_810562C -sub_810562C: @ 810562C - push {r4,lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - movs r1, 0x2E - ldrsh r4, [r2, r1] - cmp r4, 0 - beq _08105650 - subs r0, 0x1 - movs r1, 0 - strh r0, [r2, 0x2E] - strh r1, [r2, 0x24] - strh r1, [r2, 0x26] - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - b _08105682 -_08105650: - adds r3, r2, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r3] - ldrh r0, [r2, 0x30] - ldrh r1, [r2, 0x24] - adds r0, r1 - strh r0, [r2, 0x24] - ldrh r0, [r2, 0x32] - ldrh r1, [r2, 0x26] - adds r0, r1 - strh r0, [r2, 0x26] - ldrh r0, [r2, 0x34] - adds r0, 0x1 - strh r0, [r2, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7 - ble _08105682 - ldrh r0, [r2, 0x3C] - strh r0, [r2, 0x2E] - strh r4, [r2, 0x34] -_08105682: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_810562C - - thumb_func_start sub_8105688 -sub_8105688: @ 8105688 - push {r4,lr} - lsls r0, 16 - lsrs r0, 16 - ldr r4, _081056B8 @ =gSprites - ldr r3, _081056BC @ =gSharedMem - adds r1, r3, 0 - adds r1, 0x50 - ldrb r2, [r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r4 - strh r0, [r1, 0x3C] - adds r3, 0x51 - ldrb r2, [r3] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r4 - strh r0, [r1, 0x3C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081056B8: .4byte gSprites -_081056BC: .4byte gSharedMem - thumb_func_end sub_8105688 - - thumb_func_start sub_81056C0 -sub_81056C0: @ 81056C0 - push {r4,r5,lr} - movs r4, 0 - ldr r5, _081056E8 @ =gSharedMem + 0x50 -_081056C6: - adds r0, r4, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _081056EC @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - bls _081056C6 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081056E8: .4byte gSharedMem + 0x50 -_081056EC: .4byte gSprites - thumb_func_end sub_81056C0 - thumb_func_start sub_81056F0 sub_81056F0: @ 81056F0 push {r4-r6,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 882ec6d52..7d7d8a24d 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -38,7 +38,8 @@ struct SlotMachineEwramStruct { /*0x49*/ u8 unk49[2]; /*0x49*/ u8 unk4B[3]; /*0x4E*/ u8 unk4E[2]; - /*0x50*/ u8 filler50[8]; + /*0x50*/ u8 unk50[2]; + /*0x52*/ u8 filler52[6]; /*0x58*/ u16 win0h; /*0x5a*/ u16 win0v; /*0x5c*/ u16 winIn; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 4b580839c..8ca873e84 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -3313,6 +3313,67 @@ void sub_8105554(void) DestroySprite(gSprites + eSlotMachine->unk42); } +extern const struct SpriteTemplate gSpriteTemplate_83ED504; + +void sub_8105578(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0x98, 0x20, 5); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 1; + sprite->hFlip = TRUE; + eSlotMachine->unk50[0] = spriteId; + sprite->data[0] = 8; + sprite->data[1] = -1; + sprite->data[2] = -1; + sprite->data[7] = 0x20; + + spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0xb8, 0x20, 5); + sprite = gSprites + spriteId; + sprite->oam.priority = 1; + eSlotMachine->unk50[1] = spriteId; + sprite->data[1] = 1; + sprite->data[2] = -1; + sprite->data[7] = 0x20; +} + +void sub_810562C(struct Sprite *sprite) +{ + if (sprite->data[0] != 0) + { + sprite->data[0]--; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->invisible = TRUE; + } + else + { + sprite->invisible = FALSE; + sprite->pos2.x += sprite->data[1]; + sprite->pos2.y += sprite->data[2]; + if (++sprite->data[3] >= 8) + { + sprite->data[0] = sprite->data[7]; + sprite->data[3] = 0; + } + } +} + +void sub_8105688(s16 a0) +{ + gSprites[eSlotMachine->unk50[0]].data[7] = a0; + gSprites[eSlotMachine->unk50[1]].data[7] = a0; +} + +void sub_81056C0(void) +{ + u8 i; + + for (i = 0; i < 2; i++) + { + DestroySprite(gSprites + eSlotMachine->unk50[i]); + } +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From 99c897b71582e942e47765837c936b5fd79bf569 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Dec 2017 21:11:48 -0500 Subject: through sub_81059B8 --- asm/slot_machine.s | 393 ----------------------------------------------- include/slot_machine.h | 3 +- src/field/slot_machine.c | 116 ++++++++++++++ 3 files changed, 118 insertions(+), 394 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 5518d4395..c10408d89 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,399 +5,6 @@ .text - thumb_func_start sub_81056F0 -sub_81056F0: @ 81056F0 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - ldr r0, _08105778 @ =gSpriteTemplate_83ED51C - mov r8, r0 - movs r1, 0x48 - movs r2, 0x50 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0810577C @ =gSprites - mov r9, r1 - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - add r2, r9 - ldrb r3, [r2, 0x5] - movs r4, 0xD - negs r4, r4 - adds r1, r4, 0 - ands r1, r3 - movs r6, 0x4 - orrs r1, r6 - strb r1, [r2, 0x5] - movs r3, 0 - movs r1, 0x1 - strh r1, [r2, 0x2E] - strh r3, [r2, 0x38] - movs r1, 0x10 - strh r1, [r2, 0x3A] - movs r1, 0x8 - strh r1, [r2, 0x3C] - ldr r5, _08105780 @ =gSharedMem - adds r1, r5, 0 - adds r1, 0x52 - strb r0, [r1] - mov r0, r8 - movs r1, 0x68 - movs r2, 0x50 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - add r1, r9 - ldrb r2, [r1, 0x5] - ands r4, r2 - orrs r4, r6 - strb r4, [r1, 0x5] - adds r1, 0x3F - ldrb r2, [r1] - movs r3, 0x1 - orrs r2, r3 - strb r2, [r1] - adds r5, 0x53 - strb r0, [r5] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08105778: .4byte gSpriteTemplate_83ED51C -_0810577C: .4byte gSprites -_08105780: .4byte gSharedMem - thumb_func_end sub_81056F0 - - thumb_func_start sub_8105784 -sub_8105784: @ 8105784 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r1, _081057E0 @ =gUnknown_083ECC58 - mov r0, sp - movs r2, 0x2 - bl memcpy - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _081057D6 - ldrh r0, [r4, 0x3A] - subs r0, 0x1 - strh r0, [r4, 0x3A] - lsls r0, 16 - cmp r0, 0 - bgt _081057D6 - movs r0, 0x7 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 4 - ldr r2, _081057E4 @ =0x01030000 - adds r0, r2 - lsrs r0, 16 - movs r2, 0x38 - ldrsh r1, [r4, r2] - add r1, sp - ldrb r3, [r1] - adds r1, r3, 0 - adds r2, r3, 0 - bl MultiplyInvertedPaletteRGBComponents - ldrh r0, [r4, 0x38] - adds r0, 0x1 - movs r1, 0x1 - ands r0, r1 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x3C] - strh r0, [r4, 0x3A] -_081057D6: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081057E0: .4byte gUnknown_083ECC58 -_081057E4: .4byte 0x01030000 - thumb_func_end sub_8105784 - - thumb_func_start sub_81057E8 -sub_81057E8: @ 81057E8 - ldr r3, _081057FC @ =gSprites - ldr r1, _08105800 @ =gSharedMem - adds r1, 0x52 - ldrb r2, [r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r3 - strh r0, [r1, 0x3C] - bx lr - .align 2, 0 -_081057FC: .4byte gSprites -_08105800: .4byte gSharedMem - thumb_func_end sub_81057E8 - - thumb_func_start sub_8105804 -sub_8105804: @ 8105804 - push {r4,r5,lr} - movs r0, 0x7 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 4 - ldr r1, _08105848 @ =0x01030000 - adds r0, r1 - lsrs r0, 16 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl MultiplyInvertedPaletteRGBComponents - movs r4, 0 - ldr r5, _0810584C @ =gSharedMem + 0x52 -_08105824: - adds r0, r4, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08105850 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - bls _08105824 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08105848: .4byte 0x01030000 -_0810584C: .4byte gSharedMem + 0x52 -_08105850: .4byte gSprites - thumb_func_end sub_8105804 - - thumb_func_start sub_8105854 -sub_8105854: @ 8105854 - push {lr} - ldr r0, _08105888 @ =gSpriteTemplate_83ED534 - movs r1, 0xA8 - movs r2, 0x50 - movs r3, 0x6 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0810588C @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r3, [r1, 0x5] - movs r2, 0xD - negs r2, r2 - ands r2, r3 - movs r3, 0x4 - orrs r2, r3 - strb r2, [r1, 0x5] - ldr r1, _08105890 @ =gSharedMem - adds r1, 0x41 - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08105888: .4byte gSpriteTemplate_83ED534 -_0810588C: .4byte gSprites -_08105890: .4byte gSharedMem - thumb_func_end sub_8105854 - - thumb_func_start sub_8105894 -sub_8105894: @ 8105894 - ldr r1, _0810589C @ =gSpriteCoordOffsetY - ldrh r1, [r1] - strh r1, [r0, 0x26] - bx lr - .align 2, 0 -_0810589C: .4byte gSpriteCoordOffsetY - thumb_func_end sub_8105894 - - thumb_func_start sub_81058A0 -sub_81058A0: @ 81058A0 - push {lr} - ldr r0, _081058BC @ =gSharedMem - adds r0, 0x41 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _081058C0 @ =gSprites - adds r0, r1 - bl DestroySprite - pop {r0} - bx r0 - .align 2, 0 -_081058BC: .4byte gSharedMem -_081058C0: .4byte gSprites - thumb_func_end sub_81058A0 - - thumb_func_start sub_81058C4 -sub_81058C4: @ 81058C4 - push {r4-r6,lr} - sub sp, 0x8 - ldr r1, _08105938 @ =gUnknown_083ECC5A - mov r0, sp - movs r2, 0x8 - bl memcpy - movs r4, 0 - ldr r5, _0810593C @ =gSharedMem + 0x54 -_081058D6: - ldr r0, _08105940 @ =gSpriteCoordOffsetX - ldrh r0, [r0] - movs r1, 0x50 - subs r1, r0 - lsls r1, 16 - asrs r1, 16 - ldr r0, _08105944 @ =gSpriteTemplate_83ED54C - movs r2, 0x44 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r3, r0, 4 - adds r3, r0 - lsls r3, 2 - ldr r1, _08105948 @ =gSprites - adds r3, r1 - ldrb r2, [r3, 0x5] - movs r6, 0xD - negs r6, r6 - adds r1, r6, 0 - ands r2, r1 - movs r1, 0x4 - orrs r2, r1 - strb r2, [r3, 0x5] - movs r1, 0x3E - adds r1, r3 - mov r12, r1 - ldrb r1, [r1] - movs r2, 0x2 - orrs r1, r2 - mov r2, r12 - strb r1, [r2] - lsls r1, r4, 1 - add r1, sp - ldrh r1, [r1] - strh r1, [r3, 0x2E] - adds r1, r4, r5 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bls _081058D6 - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08105938: .4byte gUnknown_083ECC5A -_0810593C: .4byte gSharedMem + 0x54 -_08105940: .4byte gSpriteCoordOffsetX -_08105944: .4byte gSpriteTemplate_83ED54C -_08105948: .4byte gSprites - thumb_func_end sub_81058C4 - - thumb_func_start sub_810594C -sub_810594C: @ 810594C - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x2E] - subs r0, 0x2 - movs r4, 0 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x2E] - movs r1, 0x2E - ldrsh r0, [r5, r1] - movs r1, 0x14 - bl Cos - strh r0, [r5, 0x24] - movs r2, 0x2E - ldrsh r0, [r5, r2] - movs r1, 0x6 - bl Sin - strh r0, [r5, 0x26] - adds r1, r5, 0 - adds r1, 0x43 - strb r4, [r1] - movs r2, 0x2E - ldrsh r0, [r5, r2] - cmp r0, 0x7F - ble _08105986 - movs r0, 0x2 - strb r0, [r1] -_08105986: - ldrh r0, [r5, 0x30] - adds r0, 0x1 - strh r0, [r5, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - ble _081059B0 - adds r3, r5, 0 - adds r3, 0x3F - ldrb r2, [r3] - lsls r0, r2, 31 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - movs r0, 0 - strh r0, [r5, 0x30] -_081059B0: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_810594C - - thumb_func_start sub_81059B8 -sub_81059B8: @ 81059B8 - push {r4,r5,lr} - movs r4, 0 - ldr r5, _081059E0 @ =gSharedMem + 0x54 -_081059BE: - adds r0, r4, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _081059E4 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bls _081059BE - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081059E0: .4byte gSharedMem + 0x54 -_081059E4: .4byte gSprites - thumb_func_end sub_81059B8 - thumb_func_start sub_81059E8 sub_81059E8: @ 81059E8 push {r4,lr} diff --git a/include/slot_machine.h b/include/slot_machine.h index 7d7d8a24d..34431a8ef 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -39,7 +39,8 @@ struct SlotMachineEwramStruct { /*0x49*/ u8 unk4B[3]; /*0x4E*/ u8 unk4E[2]; /*0x50*/ u8 unk50[2]; - /*0x52*/ u8 filler52[6]; + /*0x52*/ u8 unk52[2]; + /*0x54*/ u8 unk54[4]; /*0x58*/ u16 win0h; /*0x5a*/ u16 win0v; /*0x5c*/ u16 winIn; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 8ca873e84..9a098d4cf 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -9,6 +9,7 @@ #include "main.h" #include "slot_machine.h" #include "decompress.h" +#include "trig.h" #include "palette.h" #include "task.h" #include "util.h" @@ -3374,6 +3375,121 @@ void sub_81056C0(void) } } +extern const struct SpriteTemplate gSpriteTemplate_83ED51C; + +void sub_81056F0(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x48, 0x50, 3); + gSprites[spriteId].oam.priority = 1; + gSprites[spriteId].data[0] = 1; + gSprites[spriteId].data[5] = 0; + gSprites[spriteId].data[6] = 16; + gSprites[spriteId].data[7] = 8; + eSlotMachine->unk52[0] = spriteId; + + spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x68, 0x50, 3); + gSprites[spriteId].oam.priority = 1; + gSprites[spriteId].hFlip = TRUE; + eSlotMachine->unk52[1] = spriteId; +} + +extern const u8 gUnknown_083ECC58[2]; // don't remove this until decompiled through gUnknown_083ECCF8 + +void sub_8105784(struct Sprite *sprite) +{ + // u8 sp[] = {16, 0}; + u8 sp[ARRAY_COUNT(gUnknown_083ECC58)]; + memcpy(sp, gUnknown_083ECC58, sizeof gUnknown_083ECC58); + if (sprite->data[0] && --sprite->data[6] <= 0) + { + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, sp[sprite->data[5]], sp[sprite->data[5]], sp[sprite->data[5]]); + ++sprite->data[5]; + sprite->data[5] &= 1; + sprite->data[6] = sprite->data[7]; + } +} + +void sub_81057E8(s16 a0) +{ + gSprites[eSlotMachine->unk52[0]].data[7] = a0; +} + +void sub_8105804(void) +{ + u8 i; + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, 0, 0, 0); + for (i = 0; i < 2; i++) + { + DestroySprite(gSprites + eSlotMachine->unk52[i]); + } +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED534; + +void sub_8105854(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED534, 0xa8, 0x50, 6); + gSprites[spriteId].oam.priority = 1; + eSlotMachine->unk41 = spriteId; +} + +void sub_8105894(struct Sprite *sprite) +{ + sprite->pos2.y = gSpriteCoordOffsetY; +} + +void sub_81058A0(void) +{ + DestroySprite(gSprites + eSlotMachine->unk41); +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED54C; +extern const u16 gUnknown_083ECC5A[4]; // don't remove this until decompiled through gUnknown_083ECCF8 + +void sub_81058C4(void) +{ + u8 i; + // u16 sp[] = {0x0, 0x40, 0x80, 0xC0}; + u16 sp[ARRAY_COUNT(gUnknown_083ECC5A)]; + memcpy(sp, gUnknown_083ECC5A, sizeof gUnknown_083ECC5A); + for (i = 0; i < 4; i++) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED54C, 0x50 - gSpriteCoordOffsetX, 0x44, 0); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 1; + sprite->coordOffsetEnabled = TRUE; + sprite->data[0] = sp[i]; + eSlotMachine->unk54[i] = spriteId; + } +} + +void sub_810594C(struct Sprite *sprite) +{ + sprite->data[0] -= 2; + sprite->data[0] &= 0xff; + sprite->pos2.x = Cos(sprite->data[0], 20); + sprite->pos2.y = Sin(sprite->data[0], 6); + sprite->subpriority = 0; + if (sprite->data[0] >= 0x80) + { + sprite->subpriority = 2; + } + if (++sprite->data[1] >= 16) + { + sprite->hFlip ^= 1; + sprite->data[1] = 0; + } +} + +void sub_81059B8(void) +{ + u8 i; + for (i = 0; i < 4; i++) + { + DestroySprite(gSprites + eSlotMachine->unk54[i]); + } +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From f35549349e3c51003c124c74a8917b84a3f8e704 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Dec 2017 21:45:59 -0500 Subject: through sub_8105BF8 --- asm/slot_machine.s | 337 ----------------------------------------------- include/sprite.h | 4 +- src/field/slot_machine.c | 108 ++++++++++++++- 3 files changed, 107 insertions(+), 342 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index c10408d89..236ac5ee0 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,343 +5,6 @@ .text - thumb_func_start sub_81059E8 -sub_81059E8: @ 81059E8 - push {r4,lr} - ldr r0, _08105A2C @ =gSpriteTemplate_83ED564 - movs r1, 0xA8 - movs r2, 0x3C - movs r3, 0x8 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r1, _08105A30 @ =gSprites - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0, 0x5] - ldrb r1, [r0, 0x1] - movs r2, 0x3 - orrs r1, r2 - strb r1, [r0, 0x1] - bl InitSpriteAffineAnim - ldr r0, _08105A34 @ =gSharedMem - adds r0, 0x43 - strb r4, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08105A2C: .4byte gSpriteTemplate_83ED564 -_08105A30: .4byte gSprites -_08105A34: .4byte gSharedMem - thumb_func_end sub_81059E8 - - thumb_func_start sub_8105A38 -sub_8105A38: @ 8105A38 - push {lr} - adds r3, r0, 0 - ldrh r2, [r3, 0x2E] - movs r1, 0x2E - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _08105A5A - adds r0, r3, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08105AB4 - adds r0, r2, 0x1 - strh r0, [r3, 0x2E] - b _08105AB4 -_08105A5A: - cmp r0, 0x1 - bne _08105A96 - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - ldrb r2, [r0] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldrh r0, [r3, 0x32] - adds r0, 0x1 - strh r0, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x17 - ble _08105AB4 - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - movs r0, 0 - strh r0, [r3, 0x32] - b _08105AB4 -_08105A96: - adds r2, r3, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r3, 0x32] - adds r0, 0x1 - strh r0, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - ble _08105AB4 - movs r0, 0x1 - strh r0, [r3, 0x3C] -_08105AB4: - ldrh r0, [r3, 0x30] - movs r1, 0xFF - ands r1, r0 - adds r1, 0x10 - strh r1, [r3, 0x30] - lsrs r1, 8 - ldrh r0, [r3, 0x26] - subs r0, r1 - strh r0, [r3, 0x26] - pop {r0} - bx r0 - thumb_func_end sub_8105A38 - - thumb_func_start sub_8105ACC -sub_8105ACC: @ 8105ACC - ldr r2, _08105AE4 @ =gSprites - ldr r0, _08105AE8 @ =gSharedMem - adds r0, 0x43 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x3C] - lsls r0, 24 - lsrs r0, 24 - bx lr - .align 2, 0 -_08105AE4: .4byte gSprites -_08105AE8: .4byte gSharedMem - thumb_func_end sub_8105ACC - - thumb_func_start sub_8105AEC -sub_8105AEC: @ 8105AEC - push {r4,lr} - ldr r0, _08105B14 @ =gSharedMem - adds r0, 0x43 - ldrb r0, [r0] - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r0, _08105B18 @ =gSprites - adds r4, r0 - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - adds r0, r4, 0 - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08105B14: .4byte gSharedMem -_08105B18: .4byte gSprites - thumb_func_end sub_8105AEC - - thumb_func_start sub_8105B1C -sub_8105B1C: @ 8105B1C - push {r4,lr} - adds r3, r0, 0 - adds r2, r1, 0 - ldr r0, _08105B68 @ =gSpriteTemplate_83ED6CC - lsls r3, 16 - asrs r3, 16 - lsls r2, 16 - asrs r2, 16 - adds r1, r3, 0 - movs r3, 0xC - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r1, _08105B6C @ =gSprites - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x8 - orrs r1, r2 - strb r1, [r0, 0x5] - ldrb r1, [r0, 0x1] - movs r2, 0x3 - orrs r1, r2 - strb r1, [r0, 0x1] - bl InitSpriteAffineAnim - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08105B68: .4byte gSpriteTemplate_83ED6CC -_08105B6C: .4byte gSprites - thumb_func_end sub_8105B1C - - thumb_func_start sub_8105B70 -sub_8105B70: @ 8105B70 - push {lr} - adds r2, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08105B84 - movs r0, 0x1 - strh r0, [r2, 0x3C] -_08105B84: - pop {r0} - bx r0 - thumb_func_end sub_8105B70 - - thumb_func_start sub_8105B88 -sub_8105B88: @ 8105B88 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r0, _08105BB0 @ =gSprites - adds r4, r0 - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - adds r0, r4, 0 - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08105BB0: .4byte gSprites - thumb_func_end sub_8105B88 - - thumb_func_start sub_8105BB4 -sub_8105BB4: @ 8105BB4 - push {r4-r6,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - ldr r3, _08105BF0 @ =gUnknown_083ECF0C - lsrs r1, 22 - adds r3, r1, r3 - ldr r5, [r3] - ldr r3, _08105BF4 @ =gUnknown_083ECE7E - adds r4, r1, r3 - movs r6, 0 - ldrsh r4, [r4, r6] - adds r3, 0x2 - adds r1, r3 - movs r6, 0 - ldrsh r3, [r1, r6] - lsls r2, 16 - asrs r2, 16 - str r2, [sp] - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_8105BF8 - lsls r0, 24 - lsrs r0, 24 - add sp, 0x4 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08105BF0: .4byte gUnknown_083ECF0C -_08105BF4: .4byte gUnknown_083ECE7E - thumb_func_end sub_8105BB4 - - thumb_func_start sub_8105BF8 -sub_8105BF8: @ 8105BF8 - push {r4-r7,lr} - adds r4, r0, 0 - adds r6, r1, 0 - adds r1, r2, 0 - adds r2, r3, 0 - ldr r5, [sp, 0x14] - lsls r4, 24 - lsls r5, 16 - lsrs r5, 16 - ldr r0, _08105C58 @ =gUnknown_083EDB5C - lsrs r4, 22 - adds r0, r4, r0 - ldr r0, [r0] - lsls r1, 16 - asrs r1, 16 - lsls r2, 16 - asrs r2, 16 - movs r3, 0x10 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - adds r7, r0, 0 - lsls r0, r7, 4 - adds r0, r7 - lsls r0, 2 - ldr r1, _08105C5C @ =gSprites - adds r2, r0, r1 - ldrb r0, [r2, 0x5] - movs r1, 0xC - orrs r0, r1 - strb r0, [r2, 0x5] - str r6, [r2, 0x1C] - strh r5, [r2, 0x3A] - movs r0, 0x1 - strh r0, [r2, 0x3C] - ldr r0, _08105C60 @ =gUnknown_083EDBC4 - adds r4, r0 - ldr r1, [r4] - cmp r1, 0 - beq _08105C50 - adds r0, r2, 0 - bl SetSubspriteTables -_08105C50: - adds r0, r7, 0 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08105C58: .4byte gUnknown_083EDB5C -_08105C5C: .4byte gSprites -_08105C60: .4byte gUnknown_083EDBC4 - thumb_func_end sub_8105BF8 - thumb_func_start sub_8105C64 sub_8105C64: @ 8105C64 movs r1, 0 diff --git a/include/sprite.h b/include/sprite.h index 1e989b6d5..37a318206 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -172,6 +172,8 @@ struct SpriteTemplate void (*callback)(struct Sprite *); }; +typedef void (*SpriteCallback)(struct Sprite *); + struct Sprite { /*0x00*/ struct OamData oam; @@ -180,7 +182,7 @@ struct Sprite /*0x10*/ const union AffineAnimCmd *const *affineAnims; /*0x14*/ const struct SpriteTemplate *template; /*0x18*/ const struct SubspriteTable *subspriteTables; - /*0x1C*/ void (*callback)(struct Sprite *); + /*0x1C*/ SpriteCallback callback; /*0x20*/ struct Coords16 pos1; /*0x24*/ struct Coords16 pos2; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 9a098d4cf..f10ed4352 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -212,9 +212,9 @@ void sub_81059B8(void); void sub_81059E8(void); bool8 sub_8105ACC(void); void sub_8105AEC(void); -u8 sub_8105B1C(s16 a0, s16 a1); -void sub_8105B88(u8 a0); -u8 sub_8105BF8(u8, u32, s16, s16, s16); +u8 sub_8105B1C(s16 x, s16 y); +void sub_8105B88(u8 spriteId); +u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4); void sub_81063C0(void); static void sub_8106448(void); void sub_81064B8(void); @@ -3022,7 +3022,7 @@ void sub_8104CAC(u8 arg0) { } } -void sub_8104D30(u8 a0, u32 a1, s16 a2, s16 a3, s16 a4) +void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) { u8 i; struct Task *task = gTasks + eSlotMachine->unk3D; @@ -3490,6 +3490,106 @@ void sub_81059B8(void) } } +extern const struct SpriteTemplate gSpriteTemplate_83ED564; + +void sub_81059E8(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED564, 0xa8, 0x3c, 8); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 1; + sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; + InitSpriteAffineAnim(sprite); + eSlotMachine->unk43 = spriteId; +} + +void sub_8105A38(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + if (sprite->affineAnimEnded) + sprite->data[0]++; + } + else if (sprite->data[0] == 1) + { + sprite->invisible ^= 1; + if (++sprite->data[2] >= 24) + { + sprite->data[0]++; + sprite->data[2] = 0; + } + } + else + { + sprite->invisible = TRUE; + if (++sprite->data[2] >= 16) + sprite->data[7] = 1; + } + sprite->data[1] &= 0xff; + sprite->data[1] += 16; + sprite->pos2.y -= (sprite->data[1] >> 8); +} + +u8 sub_8105ACC(void) +{ + return gSprites[eSlotMachine->unk43].data[7]; +} + +void sub_8105AEC(void) +{ + struct Sprite *sprite = gSprites + eSlotMachine->unk43; + FreeOamMatrix(sprite->oam.matrixNum); + DestroySprite(sprite); +} + +extern const struct SpriteTemplate gSpriteTemplate_83ED6CC; + +u8 sub_8105B1C(s16 x, s16 y) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83ED6CC, x, y, 12); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 2; + sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; + InitSpriteAffineAnim(sprite); + return spriteId; +} + +void sub_8105B70(struct Sprite *sprite) +{ + if (sprite->affineAnimEnded) + sprite->data[7] = 1; +} + +void sub_8105B88(u8 spriteId) +{ + struct Sprite *sprite = gSprites + spriteId; + FreeOamMatrix(sprite->oam.matrixNum); + DestroySprite(sprite); +} + +extern const SpriteCallback gUnknown_083ECF0C[]; +extern const s16 gUnknown_083ECE7E[][2]; + +u8 sub_8105BB4(u8 a0, u8 a1, s16 a2) +{ + return sub_8105BF8(a0, gUnknown_083ECF0C[a1], gUnknown_083ECE7E[a1][0], gUnknown_083ECE7E[a1][1], a2); +} + +extern const struct SpriteTemplate *gUnknown_083EDB5C[]; +extern const struct SubspriteTable *gUnknown_083EDBC4[]; + +u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) +{ + u8 spriteId = CreateSprite(gUnknown_083EDB5C[templateIdx], x, y, 16); + struct Sprite *sprite = gSprites + spriteId; + sprite->oam.priority = 3; + sprite->callback = callback; + sprite->data[6] = a4; + sprite->data[7] = 1; + if (gUnknown_083EDBC4[templateIdx]) + SetSubspriteTables(sprite, gUnknown_083EDBC4[templateIdx]); + return spriteId; +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From de03aa5bcb74f63d53b9603acf4e512a14b31663 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 31 Dec 2017 22:42:40 -0500 Subject: through sub_8105D3C --- asm/slot_machine.s | 181 ----------------------------------------------- src/field/slot_machine.c | 82 +++++++++++++++++++++ 2 files changed, 82 insertions(+), 181 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 236ac5ee0..55f2c5bbd 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,187 +5,6 @@ .text - thumb_func_start sub_8105C64 -sub_8105C64: @ 8105C64 - movs r1, 0 - strh r1, [r0, 0x3C] - bx lr - thumb_func_end sub_8105C64 - - thumb_func_start sub_8105C6C -sub_8105C6C: @ 8105C6C - push {r4,r5,lr} - sub sp, 0x10 - adds r4, r0, 0 - ldr r1, _08105CE8 @ =gUnknown_083ECC62 - mov r0, sp - movs r2, 0x8 - bl memcpy - add r5, sp, 0x8 - ldr r1, _08105CEC @ =gUnknown_083ECC6A - adds r0, r5, 0 - movs r2, 0x8 - bl memcpy - ldrh r0, [r4, 0x30] - adds r1, r0, 0x1 - strh r1, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - ble _08105CB2 - adds r3, r4, 0 - adds r3, 0x42 - ldrb r2, [r3] - lsls r0, r2, 26 - lsrs r0, 26 - movs r1, 0x1 - eors r1, r0 - movs r0, 0x40 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - movs r0, 0 - strh r0, [r4, 0x30] -_08105CB2: - movs r0, 0 - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - adds r0, r4, 0 - adds r0, 0x42 - ldrb r1, [r0] - movs r0, 0x3F - ands r0, r1 - cmp r0, 0 - beq _08105CDE - movs r1, 0x3A - ldrsh r0, [r4, r1] - lsls r0, 1 - add r0, sp - ldrh r0, [r0] - strh r0, [r4, 0x24] - movs r1, 0x3A - ldrsh r0, [r4, r1] - lsls r0, 1 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r4, 0x26] -_08105CDE: - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08105CE8: .4byte gUnknown_083ECC62 -_08105CEC: .4byte gUnknown_083ECC6A - thumb_func_end sub_8105C6C - - thumb_func_start sub_8105CF0 -sub_8105CF0: @ 8105CF0 - push {lr} - adds r3, r0, 0 - adds r3, 0x3F - ldrb r1, [r3] - movs r2, 0x1 - orrs r1, r2 - strb r1, [r3] - bl sub_8105C6C - pop {r0} - bx r0 - thumb_func_end sub_8105CF0 - - thumb_func_start sub_8105D08 -sub_8105D08: @ 8105D08 - push {lr} - adds r3, r0, 0 - adds r3, 0x3F - ldrb r1, [r3] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r3] - bl sub_8105C6C - pop {r0} - bx r0 - thumb_func_end sub_8105D08 - - thumb_func_start sub_8105D20 -sub_8105D20: @ 8105D20 - push {lr} - adds r3, r0, 0 - adds r3, 0x3F - ldrb r1, [r3] - movs r2, 0x1 - orrs r1, r2 - movs r2, 0x2 - orrs r1, r2 - strb r1, [r3] - bl sub_8105C6C - pop {r0} - bx r0 - thumb_func_end sub_8105D20 - - thumb_func_start sub_8105D3C -sub_8105D3C: @ 8105D3C - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0x1 - beq _08105D70 - cmp r0, 0x1 - bgt _08105D52 - cmp r0, 0 - beq _08105D5C - b _08105DA0 -_08105D52: - cmp r0, 0x2 - beq _08105D80 - cmp r0, 0x3 - beq _08105D9C - b _08105DA0 -_08105D5C: - ldrh r0, [r2, 0x20] - adds r0, 0x4 - strh r0, [r2, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xCF - ble _08105DA0 - movs r0, 0xD0 - strh r0, [r2, 0x20] - b _08105D8E -_08105D70: - ldrh r0, [r2, 0x30] - adds r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5A - ble _08105DA0 - b _08105D8E -_08105D80: - ldrh r0, [r2, 0x20] - adds r0, 0x4 - strh r0, [r2, 0x20] - lsls r0, 16 - ldr r1, _08105D98 @ =0x010f0000 - cmp r0, r1 - ble _08105DA0 -_08105D8E: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - b _08105DA0 - .align 2, 0 -_08105D98: .4byte 0x010f0000 -_08105D9C: - movs r0, 0 - strh r0, [r2, 0x3C] -_08105DA0: - pop {r0} - bx r0 - thumb_func_end sub_8105D3C - thumb_func_start sub_8105DA4 sub_8105DA4: @ 8105DA4 push {lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index f10ed4352..91cd12db6 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -3590,6 +3590,88 @@ u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) return spriteId; } +void sub_8105C64(struct Sprite *sprite) +{ + sprite->data[7] = 0; +} + +extern const s16 gUnknown_083ECC62[4]; // do not delete yet +extern const s16 gUnknown_083ECC6A[4]; // do not delete yet + +void sub_8105C6C(struct Sprite *sprite) +{ + // s16 sp0[] = {4, -4, 4, -4}; + // s16 sp8[] = {4, 4, -4, -4}; + + s16 sp0[ARRAY_COUNT(gUnknown_083ECC62)]; + s16 sp8[ARRAY_COUNT(gUnknown_083ECC6A)]; + memcpy(sp0, gUnknown_083ECC62, sizeof gUnknown_083ECC62); + memcpy(sp8, gUnknown_083ECC6A, sizeof gUnknown_083ECC6A); + + if (sprite->data[1]++ >= 16) + { + sprite->subspriteTableNum ^= 1; + sprite->data[1] = 0; + } + sprite->pos2.x = 0; + sprite->pos2.y = 0; + if (sprite->subspriteTableNum != 0) + { + sprite->pos2.x = sp0[sprite->data[6]]; + sprite->pos2.y = sp8[sprite->data[6]]; + } +} + +void sub_8105CF0(struct Sprite *sprite) +{ + sprite->hFlip = TRUE; + sub_8105C6C(sprite); +} + +void sub_8105D08(struct Sprite *sprite) +{ + sprite->vFlip = TRUE; + sub_8105C6C(sprite); +} + +void sub_8105D20(struct Sprite *sprite) +{ + sprite->hFlip = TRUE; + sprite->vFlip = TRUE; + sub_8105C6C(sprite); +} + +void sub_8105D3C(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos1.x += 4; + if (sprite->pos1.x >= 0xd0) + { + sprite->pos1.x = 0xd0; + sprite->data[0]++; + } + break; + case 1: + if (++sprite->data[1] > 90) + { + sprite->data[0]++; + } + break; + case 2: + sprite->pos1.x += 4; + if (sprite->pos1.x >= 0x110) + { + sprite->data[0]++; + } + break; + case 3: + sprite->data[7] = 0; + break; + } +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From c96d7a085f00911275f95c51f4cea5be03dcbd3a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Jan 2018 19:45:25 -0500 Subject: through sub_8105F9C --- asm/slot_machine.s | 384 ----------------------------------------------- src/field/slot_machine.c | 171 +++++++++++++++++++++ 2 files changed, 171 insertions(+), 384 deletions(-) diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 55f2c5bbd..9ec9315e3 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -5,390 +5,6 @@ .text - thumb_func_start sub_8105DA4 -sub_8105DA4: @ 8105DA4 - push {lr} - adds r1, r0, 0 - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0x1 - beq _08105DD8 - cmp r0, 0x1 - bgt _08105DBA - cmp r0, 0 - beq _08105DC4 - b _08105E02 -_08105DBA: - cmp r0, 0x2 - beq _08105DE8 - cmp r0, 0x3 - beq _08105DFE - b _08105E02 -_08105DC4: - ldrh r0, [r1, 0x20] - subs r0, 0x4 - strh r0, [r1, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xD0 - bgt _08105E02 - movs r0, 0xD0 - strh r0, [r1, 0x20] - b _08105DF6 -_08105DD8: - ldrh r0, [r1, 0x30] - adds r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5A - ble _08105E02 - b _08105DF6 -_08105DE8: - ldrh r0, [r1, 0x20] - subs r0, 0x4 - strh r0, [r1, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x90 - bgt _08105E02 -_08105DF6: - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - b _08105E02 -_08105DFE: - movs r0, 0 - strh r0, [r1, 0x3C] -_08105E02: - pop {r0} - bx r0 - thumb_func_end sub_8105DA4 - - thumb_func_start sub_8105E08 -sub_8105E08: @ 8105E08 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x5 - bhi _08105EAE - lsls r0, 2 - ldr r1, _08105E20 @ =_08105E24 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08105E20: .4byte _08105E24 - .align 2, 0 -_08105E24: - .4byte _08105E3C - .4byte _08105E52 - .4byte _08105E70 - .4byte _08105E84 - .4byte _08105E94 - .4byte _08105EAA -_08105E3C: - ldr r0, _08105E6C @ =gSharedMem - ldrb r1, [r0, 0xA] - subs r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAnim - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] -_08105E52: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08105EAE - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - movs r0, 0 - strh r0, [r4, 0x30] - b _08105EAE - .align 2, 0 -_08105E6C: .4byte gSharedMem -_08105E70: - ldrh r0, [r4, 0x20] - adds r0, 0x4 - strh r0, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xCF - ble _08105EAE - movs r0, 0xD0 - strh r0, [r4, 0x20] - b _08105EA2 -_08105E84: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5A - ble _08105EAE - b _08105EA2 -_08105E94: - ldrh r0, [r4, 0x20] - adds r0, 0x4 - strh r0, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF7 - ble _08105EAE -_08105EA2: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _08105EAE -_08105EAA: - movs r0, 0 - strh r0, [r4, 0x3C] -_08105EAE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8105E08 - - thumb_func_start sub_8105EB4 -sub_8105EB4: @ 8105EB4 - push {lr} - adds r3, r0, 0 - movs r1, 0x2E - ldrsh r0, [r3, r1] - cmp r0, 0x1 - beq _08105EE2 - cmp r0, 0x1 - bgt _08105ECA - cmp r0, 0 - beq _08105ED0 - b _08105F50 -_08105ECA: - cmp r0, 0x2 - beq _08105F00 - b _08105F50 -_08105ED0: - adds r2, r3, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] -_08105EE2: - ldrh r0, [r3, 0x22] - adds r0, 0x8 - strh r0, [r3, 0x22] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6F - ble _08105F50 - movs r0, 0x70 - strh r0, [r3, 0x22] - movs r0, 0x10 - strh r0, [r3, 0x30] - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - b _08105F50 -_08105F00: - movs r0, 0x32 - ldrsh r2, [r3, r0] - cmp r2, 0 - bne _08105F46 - ldrh r0, [r3, 0x22] - ldrh r1, [r3, 0x30] - subs r0, r1 - strh r0, [r3, 0x22] - negs r1, r1 - strh r1, [r3, 0x30] - ldrh r0, [r3, 0x34] - adds r0, 0x1 - strh r0, [r3, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08105F46 - lsls r0, r1, 16 - asrs r0, 18 - strh r0, [r3, 0x30] - strh r2, [r3, 0x34] - adds r1, r0, 0 - cmp r1, 0 - bne _08105F46 - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - strh r1, [r3, 0x3C] - adds r2, r3, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - strb r0, [r2] -_08105F46: - ldrh r0, [r3, 0x32] - adds r0, 0x1 - movs r1, 0x7 - ands r0, r1 - strh r0, [r3, 0x32] -_08105F50: - pop {r0} - bx r0 - thumb_func_end sub_8105EB4 - - thumb_func_start sub_8105F54 -sub_8105F54: @ 8105F54 - push {lr} - adds r1, r0, 0 - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _08105F66 - cmp r0, 0x1 - beq _08105F7C - b _08105F98 -_08105F66: - ldrh r0, [r1, 0x30] - adds r0, 0x1 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _08105F98 - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - b _08105F98 -_08105F7C: - ldrh r0, [r1, 0x22] - adds r0, 0x2 - strh r0, [r1, 0x22] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2F - ble _08105F98 - movs r0, 0x30 - strh r0, [r1, 0x22] - ldrh r0, [r1, 0x2E] - adds r0, 0x1 - strh r0, [r1, 0x2E] - movs r0, 0 - strh r0, [r1, 0x3C] -_08105F98: - pop {r0} - bx r0 - thumb_func_end sub_8105F54 - - thumb_func_start sub_8105F9C -sub_8105F9C: @ 8105F9C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08105FAE - cmp r0, 0x1 - beq _08106000 - b _0810604E -_08105FAE: - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x20 - ble _0810604E - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - movs r0, 0x5 - strh r0, [r4, 0x30] - ldrb r0, [r4, 0x1] - movs r1, 0x10 - orrs r0, r1 - strb r0, [r4, 0x1] - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAnim - ldr r2, _08105FFC @ =REG_MOSAIC - ldrh r1, [r4, 0x30] - lsls r0, r1, 4 - orrs r0, r1 - lsls r0, 8 - strh r0, [r2] - b _0810604E - .align 2, 0 -_08105FFC: .4byte REG_MOSAIC -_08106000: - ldrh r1, [r4, 0x32] - lsls r1, 16 - asrs r1, 24 - ldrh r0, [r4, 0x30] - subs r0, r1 - strh r0, [r4, 0x30] - lsls r0, 16 - cmp r0, 0 - bge _08106016 - movs r0, 0 - strh r0, [r4, 0x30] -_08106016: - ldr r2, _08106054 @ =REG_MOSAIC - ldrh r1, [r4, 0x30] - lsls r0, r1, 4 - orrs r0, r1 - lsls r0, 8 - strh r0, [r2] - ldrh r1, [r4, 0x32] - movs r0, 0xFF - ands r0, r1 - adds r0, 0x80 - strh r0, [r4, 0x32] - movs r0, 0x30 - ldrsh r1, [r4, r0] - cmp r1, 0 - bne _0810604E - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - strh r1, [r4, 0x3C] - ldrb r1, [r4, 0x1] - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x1] - adds r0, r4, 0 - movs r1, 0 - bl StartSpriteAnim -_0810604E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08106054: .4byte REG_MOSAIC - thumb_func_end sub_8105F9C - thumb_func_start sub_8106058 sub_8106058: @ 8106058 push {r4,r5,lr} diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 91cd12db6..dbc3da45a 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -3672,6 +3672,177 @@ void sub_8105D3C(struct Sprite *sprite) } } +void sub_8105DA4(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos1.x -= 4; + if (sprite->pos1.x <= 0xd0) + { + sprite->pos1.x = 0xd0; + sprite->data[0]++; + } + break; + case 1: + if (++sprite->data[1] > 90) + { + sprite->data[0]++; + } + break; + case 2: + sprite->pos1.x -= 4; + if (sprite->pos1.x <= 0x90) + { + sprite->data[0]++; + } + break; + case 3: + sprite->data[7] = 0; + break; + } +} + +void sub_8105E08(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + StartSpriteAnim(sprite, eSlotMachine->unk0A - 1); + sprite->data[0]++; + // fallthrough + case 1: + if (++sprite->data[1] >= 4) + { + sprite->data[0]++; + sprite->data[1] = 0; + } + break; + case 2: + sprite->pos1.x += 4; + if (sprite->pos1.x >= 0xd0) + { + sprite->pos1.x = 0xd0; + sprite->data[0]++; + } + break; + case 3: + if (++sprite->data[1] > 90) + { + sprite->data[0]++; + } + break; + case 4: + sprite->pos1.x += 4; + if (sprite->pos1.x >= 0xf8) + { + sprite->data[0]++; + } + break; + case 5: + sprite->data[7] = 0; + break; + } +} + +void sub_8105EB4(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->animPaused = TRUE; + sprite->data[0]++; + // fallthrough + case 1: + sprite->pos1.y += 8; + if (sprite->pos1.y >= 0x70) + { + sprite->pos1.y = 0x70; + sprite->data[1] = 16; + sprite->data[0]++; + } + break; + case 2: + if (sprite->data[2] == 0) + { + sprite->pos1.y -= sprite->data[1]; + sprite->data[1] = -sprite->data[1]; + if (++sprite->data[3] >= 2) + { + sprite->data[1] >>= 2; + sprite->data[3] = 0; + if (sprite->data[1] == 0) + { + sprite->data[0]++; + sprite->data[7] = 0; + sprite->animPaused = FALSE; + } + } + } + sprite->data[2]++; + sprite->data[2] &= 0x07; + break; + } +} + +void sub_8105F54(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (++sprite->data[1] > 8) + { + sprite->data[0]++; + } + break; + case 1: + sprite->pos1.y += 2; + if (sprite->pos1.y >= 0x30) + { + sprite->pos1.y = 0x30; + sprite->data[0]++; + sprite->data[7] = 0; + } + break; + } +} + +void sub_8105F9C(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->invisible = TRUE; + if (++sprite->data[1] > 0x20) + { + sprite->data[0]++; + sprite->data[1] = 5; + sprite->oam.mosaic = TRUE; + sprite->invisible = FALSE; + StartSpriteAnim(sprite, 1); + REG_MOSAIC = ((sprite->data[1] << 4) | sprite->data[1]) << 8; + } + break; + case 1: + sprite->data[1] -= (sprite->data[2] >> 8); + if (sprite->data[1] < 0) + { + sprite->data[1] = 0; + } + REG_MOSAIC = ((sprite->data[1] << 4) | sprite->data[1]) << 8; + sprite->data[2] &= 0xff; + sprite->data[2] += 0x80; + if (sprite->data[1] == 0) + { + sprite->data[0]++; + sprite->data[7] = 0; + sprite->oam.mosaic = FALSE; + StartSpriteAnim(sprite, 0); + } + break; + } +} + asm(".section .text_b"); static void sub_8106448(void) { -- cgit v1.2.3 From 25a4ce0c32704beacba2addde906f56c7cb8c592 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Jan 2018 21:03:00 -0500 Subject: Remaining functions in slot_machine --- asm/slot_machine.s | 543 ----------------------------------------------- ld_script.txt | 2 - src/field/slot_machine.c | 228 +++++++++++++++++++- 3 files changed, 227 insertions(+), 546 deletions(-) delete mode 100644 asm/slot_machine.s diff --git a/asm/slot_machine.s b/asm/slot_machine.s deleted file mode 100644 index 9ec9315e3..000000000 --- a/asm/slot_machine.s +++ /dev/null @@ -1,543 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_8106058 -sub_8106058: @ 8106058 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x30 - ldrsh r0, [r5, r1] - cmp r0, 0x2 - bgt _081060A8 - ldr r1, _081060A4 @ =gUnknown_083EDE10 - lsls r0, 2 - adds r0, r1 - ldr r4, [r0] - movs r0, 0x6 - bl IndexOfSpritePaletteTag - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 17 - adds r1, r0 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _081060E4 - ldrh r0, [r5, 0x30] - adds r0, 0x1 - strh r0, [r5, 0x30] - movs r0, 0 - strh r0, [r5, 0x32] - b _081060E4 - .align 2, 0 -_081060A4: .4byte gUnknown_083EDE10 -_081060A8: - ldr r1, _081060F8 @ =gUnknown_083EDE10 - movs r2, 0x30 - ldrsh r0, [r5, r2] - lsls r0, 2 - adds r0, r1 - ldr r4, [r0] - movs r0, 0x6 - bl IndexOfSpritePaletteTag - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 17 - adds r1, r0 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - ldrh r0, [r5, 0x32] - adds r0, 0x1 - movs r1, 0 - strh r0, [r5, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x18 - ble _081060E4 - strh r1, [r5, 0x30] - strh r1, [r5, 0x32] -_081060E4: - adds r0, r5, 0 - movs r1, 0x1 - bl StartSpriteAnimIfDifferent - movs r0, 0 - strh r0, [r5, 0x3C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081060F8: .4byte gUnknown_083EDE10 - thumb_func_end sub_8106058 - - thumb_func_start sub_81060FC -sub_81060FC: @ 81060FC - push {r4-r6,lr} - sub sp, 0x30 - adds r4, r0, 0 - ldr r1, _08106138 @ =gUnknown_083ECC72 - mov r0, sp - movs r2, 0x10 - bl memcpy - add r6, sp, 0x10 - ldr r1, _0810613C @ =gUnknown_083ECC82 - adds r0, r6, 0 - movs r2, 0x10 - bl memcpy - add r5, sp, 0x20 - ldr r1, _08106140 @ =gUnknown_083ECC92 - adds r0, r5, 0 - movs r2, 0x10 - bl memcpy - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _08106174 - cmp r0, 0x1 - bgt _08106144 - cmp r0, 0 - beq _0810614A - b _081061C0 - .align 2, 0 -_08106138: .4byte gUnknown_083ECC72 -_0810613C: .4byte gUnknown_083ECC82 -_08106140: .4byte gUnknown_083ECC92 -_08106144: - cmp r0, 0x2 - beq _08106188 - b _081061C0 -_0810614A: - movs r2, 0x3A - ldrsh r0, [r4, r2] - lsls r0, 1 - add r0, sp - ldrh r0, [r0] - strh r0, [r4, 0x24] - movs r1, 0x3A - ldrsh r0, [r4, r1] - lsls r0, 1 - adds r0, r6, r0 - ldrh r0, [r0] - strh r0, [r4, 0x26] - movs r2, 0x3A - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] -_08106174: - ldrh r0, [r4, 0x30] - subs r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _081061C0 - b _081061BA -_08106188: - ldrh r0, [r4, 0x24] - movs r2, 0x24 - ldrsh r1, [r4, r2] - cmp r1, 0 - ble _08106196 - subs r0, 0x4 - b _0810619C -_08106196: - cmp r1, 0 - bge _0810619E - adds r0, 0x4 -_0810619C: - strh r0, [r4, 0x24] -_0810619E: - ldrh r0, [r4, 0x26] - movs r2, 0x26 - ldrsh r1, [r4, r2] - cmp r1, 0 - ble _081061AC - subs r0, 0x4 - b _081061B2 -_081061AC: - cmp r1, 0 - bge _081061B4 - adds r0, 0x4 -_081061B2: - strh r0, [r4, 0x26] -_081061B4: - ldr r0, [r4, 0x24] - cmp r0, 0 - bne _081061C0 -_081061BA: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] -_081061C0: - add sp, 0x30 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81060FC - - thumb_func_start sub_81061C8 -sub_81061C8: @ 81061C8 - push {r4,lr} - sub sp, 0x10 - adds r4, r0, 0 - ldr r1, _0810622C @ =gUnknown_083ECCA2 - mov r0, sp - movs r2, 0x10 - bl memcpy - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _081061EA - adds r0, r1, 0x1 - strh r0, [r4, 0x2E] - movs r0, 0xC - strh r0, [r4, 0x30] -_081061EA: - movs r1, 0x3A - ldrsh r0, [r4, r1] - lsls r0, 1 - add r0, sp - movs r2, 0 - ldrsh r0, [r0, r2] - movs r2, 0x30 - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x24] - movs r1, 0x3A - ldrsh r0, [r4, r1] - lsls r0, 1 - add r0, sp - movs r2, 0 - ldrsh r0, [r0, r2] - movs r2, 0x30 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x26] - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _08106224 - subs r0, r1, 0x1 - strh r0, [r4, 0x30] -_08106224: - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0810622C: .4byte gUnknown_083ECCA2 - thumb_func_end sub_81061C8 - - thumb_func_start sub_8106230 -sub_8106230: @ 8106230 - push {r4-r6,lr} - sub sp, 0x4 - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _0810627A - cmp r0, 0x1 - bgt _08106248 - cmp r0, 0 - beq _08106252 - b _0810634A -_08106248: - cmp r0, 0x2 - beq _081062C4 - cmp r0, 0x3 - beq _081062FC - b _0810634A -_08106252: - ldr r2, _081062BC @ =gSharedMem - adds r1, r2, 0 - adds r1, 0x5C - movs r0, 0x2F - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x3F - strh r0, [r1] - subs r1, 0x4 - ldr r0, _081062C0 @ =0x00002088 - strh r0, [r1] - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] -_0810627A: - ldrh r0, [r5, 0x30] - adds r2, r0, 0x2 - strh r2, [r5, 0x30] - adds r0, 0xB2 - strh r0, [r5, 0x32] - movs r1, 0xF0 - subs r1, r2 - strh r1, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xD0 - ble _08106296 - movs r0, 0xD0 - strh r0, [r5, 0x32] -_08106296: - movs r1, 0x34 - ldrsh r0, [r5, r1] - cmp r0, 0xCF - bgt _081062A2 - movs r0, 0xD0 - strh r0, [r5, 0x34] -_081062A2: - ldr r2, _081062BC @ =gSharedMem - ldrh r0, [r5, 0x32] - lsls r0, 8 - ldrh r1, [r5, 0x34] - orrs r0, r1 - adds r1, r2, 0 - adds r1, 0x58 - strh r0, [r1] - movs r1, 0x30 - ldrsh r0, [r5, r1] - cmp r0, 0x33 - ble _0810634A - b _0810633C - .align 2, 0 -_081062BC: .4byte gSharedMem -_081062C0: .4byte 0x00002088 -_081062C4: - ldr r6, _08106354 @ =gSharedMem - movs r1, 0x12 - ldrsh r0, [r6, r1] - cmp r0, 0 - beq _0810634A - ldr r1, _08106358 @ =SpriteCallbackDummy - movs r4, 0 - str r4, [sp] - movs r0, 0x5 - movs r2, 0xD0 - movs r3, 0x74 - bl sub_8104D30 - adds r1, r6, 0 - adds r1, 0x58 - ldr r0, _0810635C @ =0x0000c0e0 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0xD1 - lsls r0, 7 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x2F - strh r0, [r1] - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - strh r4, [r5, 0x30] -_081062FC: - ldrh r0, [r5, 0x30] - adds r2, r0, 0x2 - strh r2, [r5, 0x30] - adds r0, 0xC2 - strh r0, [r5, 0x32] - movs r1, 0xE0 - subs r1, r2 - strh r1, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xD0 - ble _08106318 - movs r0, 0xD0 - strh r0, [r5, 0x32] -_08106318: - movs r1, 0x34 - ldrsh r0, [r5, r1] - cmp r0, 0xCF - bgt _08106324 - movs r0, 0xD0 - strh r0, [r5, 0x34] -_08106324: - ldr r2, _08106354 @ =gSharedMem - ldrh r0, [r5, 0x32] - lsls r0, 8 - ldrh r1, [r5, 0x34] - orrs r0, r1 - adds r1, r2, 0 - adds r1, 0x58 - strh r0, [r1] - movs r1, 0x30 - ldrsh r0, [r5, r1] - cmp r0, 0xF - ble _0810634A -_0810633C: - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - adds r1, r2, 0 - adds r1, 0x5C - movs r0, 0x3F - strh r0, [r1] -_0810634A: - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08106354: .4byte gSharedMem -_08106358: .4byte SpriteCallbackDummy -_0810635C: .4byte 0x0000c0e0 - thumb_func_end sub_8106230 - - thumb_func_start nullsub_70 -nullsub_70: @ 8106360 - bx lr - thumb_func_end nullsub_70 - - thumb_func_start sub_8106364 -sub_8106364: @ 8106364 - ldr r1, _0810636C @ =REG_MOSAIC - movs r0, 0 - strh r0, [r1] - bx lr - .align 2, 0 -_0810636C: .4byte REG_MOSAIC - thumb_func_end sub_8106364 - - thumb_func_start sub_8106370 -sub_8106370: @ 8106370 - push {r4,lr} - ldr r0, _08106398 @ =gUnknown_083EDE20 - ldr r4, [r0] - movs r0, 0x6 - bl IndexOfSpritePaletteTag - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 4 - movs r0, 0x80 - lsls r0, 17 - adds r1, r0 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08106398: .4byte gUnknown_083EDE20 - thumb_func_end sub_8106370 - - thumb_func_start sub_810639C -sub_810639C: @ 810639C - ldr r2, _081063BC @ =gSharedMem - adds r1, r2, 0 - adds r1, 0x58 - movs r0, 0xF0 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0xA0 - strh r0, [r1] - adds r0, r2, 0 - adds r0, 0x5C - movs r1, 0x3F - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - bx lr - .align 2, 0 -_081063BC: .4byte gSharedMem - thumb_func_end sub_810639C - - thumb_func_start sub_81063C0 -sub_81063C0: @ 81063C0 - push {r4,lr} - bl sub_8106404 - ldr r0, _081063F0 @ =gSlotMachineReelTimeLights_Gfx - ldr r4, _081063F4 @ =gSharedMem + 0x10000 - adds r1, r4, 0 - bl LZDecompressWram - ldr r0, _081063F8 @ =gUnknown_083EDE8C - movs r1, 0xC8 - lsls r1, 6 - adds r4, r1 - adds r1, r4, 0 - bl LZDecompressWram - ldr r0, _081063FC @ =gUnknown_083EDC2C - bl LoadSpriteSheets - ldr r0, _08106400 @ =gSlotMachineSpritePalettes - bl LoadSpritePalettes - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081063F0: .4byte gSlotMachineReelTimeLights_Gfx -_081063F4: .4byte gSharedMem + 0x10000 -_081063F8: .4byte gUnknown_083EDE8C -_081063FC: .4byte gUnknown_083EDC2C -_08106400: .4byte gSlotMachineSpritePalettes - thumb_func_end sub_81063C0 - - thumb_func_start sub_8106404 -sub_8106404: @ 8106404 - push {r4,r5,lr} - ldr r3, _0810643C @ =gSharedMem + 0x10000 - movs r2, 0 - ldr r5, _08106440 @ =gUnknown_083EDCDC - ldr r0, _08106444 @ =gUnknown_083EDCE4 - ldr r4, [r0] -_08106410: - movs r1, 0 - adds r2, 0x1 -_08106414: - adds r0, r4, r1 - ldrb r0, [r0] - strb r0, [r3] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - adds r3, 0x1 - cmp r1, 0x1F - bls _08106414 - lsls r0, r2, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _08106410 - adds r0, r5, 0 - bl LoadSpriteSheet - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0810643C: .4byte gSharedMem + 0x10000 -_08106440: .4byte gUnknown_083EDCDC -_08106444: .4byte gUnknown_083EDCE4 - thumb_func_end sub_8106404 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 86728ae95..c02c6873e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -320,8 +320,6 @@ SECTIONS { asm/cute_sketch.o(.text); src/field/decoration.o(.text); src/field/slot_machine.o(.text); - asm/slot_machine.o(.text); - src/field/slot_machine.o(.text_b); src/scene/contest_painting.o(.text); src/battle/battle_ai.o(.text); src/field/trader.o(.text); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index dbc3da45a..d33e46099 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -216,6 +216,7 @@ u8 sub_8105B1C(s16 x, s16 y); void sub_8105B88(u8 spriteId); u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4); void sub_81063C0(void); +void sub_8106404(void); static void sub_8106448(void); void sub_81064B8(void); void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); @@ -3843,7 +3844,232 @@ void sub_8105F9C(struct Sprite *sprite) } } -asm(".section .text_b"); +extern const u16 *const gUnknown_083EDE10[]; + +void sub_8106058(struct Sprite *sprite) +{ + if (sprite->data[1] < 3) + { + LoadPalette(gUnknown_083EDE10[sprite->data[1]], (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20); + if (++sprite->data[2] >= 4) + { + sprite->data[1]++; + sprite->data[2] = 0; + } + } + else + { + LoadPalette(gUnknown_083EDE10[sprite->data[1]], (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20); + if (++sprite->data[2] >= 25) + { + sprite->data[1] = 0; + sprite->data[2] = 0; + } + } + StartSpriteAnimIfDifferent(sprite, 1); + sprite->data[7] = 0; +} + +extern const s16 gUnknown_083ECC72[8]; // do not remove these yet +extern const s16 gUnknown_083ECC82[8]; // do not remove these yet +extern const s16 gUnknown_083ECC92[8]; // do not remove these yet + +void sub_81060FC(struct Sprite *sprite) +{ + // s16 sp00[] = {0, -40, 0, 0, 48, 0, 24, 0}; + // s16 sp10[] = {-32, 0, -32, -48, 0, -48, 0, -48}; + // s16 sp20[] = {16, 12, 16, 0, 0, 4, 8, 8}; + + s16 sp00[ARRAY_COUNT(gUnknown_083ECC72)]; + s16 sp10[ARRAY_COUNT(gUnknown_083ECC82)]; + s16 sp20[ARRAY_COUNT(gUnknown_083ECC92)]; + + memcpy(sp00, gUnknown_083ECC72, sizeof gUnknown_083ECC72); + memcpy(sp10, gUnknown_083ECC82, sizeof gUnknown_083ECC82); + memcpy(sp20, gUnknown_083ECC92, sizeof gUnknown_083ECC92); + + switch (sprite->data[0]) + { + case 0: + sprite->pos2.x = sp00[sprite->data[6]]; + sprite->pos2.y = sp10[sprite->data[6]]; + sprite->data[1] = sp20[sprite->data[6]]; + sprite->data[0]++; + // fallthrough + case 1: + if (sprite->data[1]-- == 0) + { + sprite->data[0]++; + } + break; + case 2: + if (sprite->pos2.x > 0) + { + sprite->pos2.x -= 4; + } + else if (sprite->pos2.x < 0) + { + sprite->pos2.x += 4; + } + if (sprite->pos2.y > 0) + { + sprite->pos2.y -= 4; + } + else if (sprite->pos2.y < 0) + { + sprite->pos2.y += 4; + } + if (sprite->pos2.x == 0 && sprite->pos2.y == 0) + { + sprite->data[0]++; + } + break; + } +} + +extern const s16 gUnknown_083ECCA2[8]; // do not remove this yet + +void sub_81061C8(struct Sprite *sprite) +{ + s16 sp0[ARRAY_COUNT(gUnknown_083ECCA2)]; + + memcpy(sp0, gUnknown_083ECCA2, sizeof gUnknown_083ECCA2); + + if (sprite->data[0] == 0) + { + sprite->data[0]++; + sprite->data[1] = 12; + } + sprite->pos2.x = Cos(sp0[sprite->data[6]], sprite->data[1]); + sprite->pos2.y = Sin(sp0[sprite->data[6]], sprite->data[1]); + if (sprite->data[1]) + { + sprite->data[1]--; + } +} + +void sub_8106230(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + eSlotMachine->winIn = 0x2f; + eSlotMachine->winOut = 0x3f; + eSlotMachine->win0v = 0x2088; + sprite->invisible = TRUE; + sprite->data[0]++; + // fallthrough + case 1: + sprite->data[1] += 2; + sprite->data[2] = sprite->data[1] + 0xb0; + sprite->data[3] = 0xf0 - sprite->data[1]; + if (sprite->data[2] > 0xd0) + { + sprite->data[2] = 0xd0; + } + if (sprite->data[3] < 0xd0) + { + sprite->data[3] = 0xd0; + } + eSlotMachine->win0h = (sprite->data[2] << 8) | sprite->data[3]; + if (sprite->data[1] > 0x33) + { + sprite->data[0]++; + eSlotMachine->winIn = 0x3f; + } + break; + case 2: + if (eSlotMachine->bet == 0) + { + break; + } + sub_8104D30(5, SpriteCallbackDummy, 0xd0, 0x74, 0); + eSlotMachine->win0h = 0xc0e0; + eSlotMachine->win0v = 0x6880; + eSlotMachine->winIn = 0x2f; + sprite->data[0]++; + sprite->data[1] = 0; + // fallthrough + case 3: + sprite->data[1] += 2; + sprite->data[2] = sprite->data[1] + 0xc0; + sprite->data[3] = 0xe0 - sprite->data[1]; + if (sprite->data[2] > 0xd0) + { + sprite->data[2] = 0xd0; + } + if (sprite->data[3] < 0xd0) + { + sprite->data[3] = 0xd0; + } + eSlotMachine->win0h = (sprite->data[2] << 8) | sprite->data[3]; + if (sprite->data[1] > 0x0f) + { + sprite->data[0]++; + eSlotMachine->winIn = 0x3f; + } + break; + } +} + +void nullsub_70(void) +{ + +} + +void sub_8106364(void) +{ + REG_MOSAIC = 0; +} + +extern const u16 *const gUnknown_083EDE20; + +void sub_8106370(void) +{ + LoadPalette(gUnknown_083EDE20, (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20); +} + +void sub_810639C(void) +{ + eSlotMachine->win0h = 0xf0; + eSlotMachine->win0v = 0xa0; + eSlotMachine->winIn = 0x3f; + eSlotMachine->winOut = 0x3f; +} + +extern const u8 gSlotMachineReelTimeLights_Gfx[]; +extern const u8 gUnknown_083EDE8C[]; +extern const struct SpriteSheet gUnknown_083EDC2C[]; +extern const struct SpritePalette gSlotMachineSpritePalettes[]; + +void sub_81063C0(void) +{ + sub_8106404(); + LZDecompressWram(gSlotMachineReelTimeLights_Gfx, ewram10000); + LZDecompressWram(gUnknown_083EDE8C, ewram10000 + 0x3200); + LoadSpriteSheets(gUnknown_083EDC2C); + LoadSpritePalettes(gSlotMachineSpritePalettes); +} + +extern const u8 *gUnknown_083EDCE4; +extern const struct SpriteSheet gUnknown_083EDCDC; + +void sub_8106404(void) +{ + u8 *dest = ewram10000; + u8 i = 0; + const struct SpriteSheet *sheet = &gUnknown_083EDCDC; + const u8 *src = gUnknown_083EDCE4; + for (i = 0; i < 0x40; i++) + { + u8 j; + for (j = 0; j < 0x20; j++, dest++) + { + *dest = src[j]; + } + } + LoadSpriteSheet(sheet); +} static void sub_8106448(void) { u32 offsetRead, offsetWrite; -- cgit v1.2.3 From d84dfb66de48aca1146f86b2b790a2c73f964b51 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Jan 2018 21:11:54 -0500 Subject: Decompile enough data to nuke the explicit calls to memcpy --- data/slot_machine.s | 39 -------------------------------- src/field/slot_machine.c | 59 ++++++++++++++++-------------------------------- 2 files changed, 20 insertions(+), 78 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index d3af411ec..2811e5b5f 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,45 +3,6 @@ .section .rodata -gUnknown_083ECC58:: @ 83ECC58 - .byte 16, 0 - - .align 1 -gUnknown_083ECC5A:: @ 83ECC5A - .2byte 0x0, 0x40, 0x80, 0xC0 - - .align 1 -gUnknown_083ECC62:: @ 83ECC62 - .2byte 4, -4, 4, -4 - - .align 1 -gUnknown_083ECC6A:: @ 83ECC6A - .2byte 4, 4, -4, -4 - - .align 1 -gUnknown_083ECC72:: @ 83ECC72 - .2byte 0, -40, 0, 0, 48, 0, 24, 0 - - .align 1 -gUnknown_083ECC82:: @ 83ECC82 - .2byte -32, 0, -32, -48, 0, -48, 0, -48 - - .align 1 -gUnknown_083ECC92:: @ 83ECC92 - .2byte 16, 12, 16, 0, 0, 4, 8, 8 - - .align 1 -gUnknown_083ECCA2:: @ 83ECCA2 - .2byte 160, 192, 224, 104, 80, 64, 48, 24 - -gUnknown_083ECCB2:: @ 83ECCB2 - .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_083ECCF1:: @ 83ECCF1 - .byte 1, 0, 5, 4, 3, 2, 0 - .align 1 gUnknown_083ECCF8:: @ 83ECCF8 .2byte 0, 6, 0, 10, 0, 2 diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index d33e46099..594d743f1 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -1326,7 +1326,7 @@ bool8 sub_8102B80(struct Task *task) return FALSE; } -extern const u8 gUnknown_083ECCB2[][21]; +const u8 gUnknown_083ECCB2[][21]; u8 sub_8102BA4(u8 x, s16 y) { @@ -1346,7 +1346,7 @@ u8 sub_8102BF8(u8 x, s16 y) return sub_8102BA4(x, y + r6); } -extern const u8 gUnknown_083ECCF1[]; +const u8 gUnknown_083ECCF1[]; u8 sub_8102C48(s16 a0) { @@ -3398,9 +3398,7 @@ extern const u8 gUnknown_083ECC58[2]; // don't remove this until decompiled thro void sub_8105784(struct Sprite *sprite) { - // u8 sp[] = {16, 0}; - u8 sp[ARRAY_COUNT(gUnknown_083ECC58)]; - memcpy(sp, gUnknown_083ECC58, sizeof gUnknown_083ECC58); + u8 sp[] = {16, 0}; if (sprite->data[0] && --sprite->data[6] <= 0) { MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, sp[sprite->data[5]], sp[sprite->data[5]], sp[sprite->data[5]]); @@ -3445,14 +3443,11 @@ void sub_81058A0(void) } extern const struct SpriteTemplate gSpriteTemplate_83ED54C; -extern const u16 gUnknown_083ECC5A[4]; // don't remove this until decompiled through gUnknown_083ECCF8 void sub_81058C4(void) { u8 i; - // u16 sp[] = {0x0, 0x40, 0x80, 0xC0}; - u16 sp[ARRAY_COUNT(gUnknown_083ECC5A)]; - memcpy(sp, gUnknown_083ECC5A, sizeof gUnknown_083ECC5A); + u16 sp[] = {0x0, 0x40, 0x80, 0xC0}; for (i = 0; i < 4; i++) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED54C, 0x50 - gSpriteCoordOffsetX, 0x44, 0); @@ -3596,18 +3591,10 @@ void sub_8105C64(struct Sprite *sprite) sprite->data[7] = 0; } -extern const s16 gUnknown_083ECC62[4]; // do not delete yet -extern const s16 gUnknown_083ECC6A[4]; // do not delete yet - void sub_8105C6C(struct Sprite *sprite) { - // s16 sp0[] = {4, -4, 4, -4}; - // s16 sp8[] = {4, 4, -4, -4}; - - s16 sp0[ARRAY_COUNT(gUnknown_083ECC62)]; - s16 sp8[ARRAY_COUNT(gUnknown_083ECC6A)]; - memcpy(sp0, gUnknown_083ECC62, sizeof gUnknown_083ECC62); - memcpy(sp8, gUnknown_083ECC6A, sizeof gUnknown_083ECC6A); + s16 sp0[] = {4, -4, 4, -4}; + s16 sp8[] = {4, 4, -4, -4}; if (sprite->data[1]++ >= 16) { @@ -3870,23 +3857,11 @@ void sub_8106058(struct Sprite *sprite) sprite->data[7] = 0; } -extern const s16 gUnknown_083ECC72[8]; // do not remove these yet -extern const s16 gUnknown_083ECC82[8]; // do not remove these yet -extern const s16 gUnknown_083ECC92[8]; // do not remove these yet - void sub_81060FC(struct Sprite *sprite) { - // s16 sp00[] = {0, -40, 0, 0, 48, 0, 24, 0}; - // s16 sp10[] = {-32, 0, -32, -48, 0, -48, 0, -48}; - // s16 sp20[] = {16, 12, 16, 0, 0, 4, 8, 8}; - - s16 sp00[ARRAY_COUNT(gUnknown_083ECC72)]; - s16 sp10[ARRAY_COUNT(gUnknown_083ECC82)]; - s16 sp20[ARRAY_COUNT(gUnknown_083ECC92)]; - - memcpy(sp00, gUnknown_083ECC72, sizeof gUnknown_083ECC72); - memcpy(sp10, gUnknown_083ECC82, sizeof gUnknown_083ECC82); - memcpy(sp20, gUnknown_083ECC92, sizeof gUnknown_083ECC92); + s16 sp00[] = {0, -40, 0, 0, 48, 0, 24, 0}; + s16 sp10[] = {-32, 0, -32, -48, 0, -48, 0, -48}; + s16 sp20[] = {16, 12, 16, 0, 0, 4, 8, 8}; switch (sprite->data[0]) { @@ -3927,13 +3902,9 @@ void sub_81060FC(struct Sprite *sprite) } } -extern const s16 gUnknown_083ECCA2[8]; // do not remove this yet - void sub_81061C8(struct Sprite *sprite) { - s16 sp0[ARRAY_COUNT(gUnknown_083ECCA2)]; - - memcpy(sp0, gUnknown_083ECCA2, sizeof gUnknown_083ECCA2); + s16 sp0[] = {160, 192, 224, 104, 80, 64, 48, 24}; if (sprite->data[0] == 0) { @@ -4152,3 +4123,13 @@ void sub_81065DC(void) { } } } + +const u8 gUnknown_083ECCB2[][21] = { + {0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6}, + {0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4}, + {0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4} +}; + +const u8 gUnknown_083ECCF1[] = { + 1, 0, 5, 4, 3, 2 +}; -- cgit v1.2.3 From 28e98d9df7db41f9dcc813ad4e0b37c568833aee Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 1 Jan 2018 23:09:51 -0600 Subject: decompile sub_80E60D8 - sub_80E6AC4 --- asm/easy_chat.s | 1265 -------------------------------------------- data/easy_chat.s | 149 ------ include/easy_chat.h | 1 + include/global.h | 2 +- ld_script.txt | 2 + src/easy_chat.c | 107 +++- src/easy_chat_before.c | 684 ++++++++++++++++++++++++ src/pokemon/pokemon_menu.c | 8 +- sym_bss.txt | 2 +- 9 files changed, 798 insertions(+), 1422 deletions(-) create mode 100644 src/easy_chat_before.c diff --git a/asm/easy_chat.s b/asm/easy_chat.s index e08d71083..c78da4b00 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1271 +5,6 @@ .text - thumb_func_start sub_80E60D8 -sub_80E60D8: @ 80E60D8 - push {r4-r7,lr} - movs r4, 0x3 - ldr r0, _080E60F4 @ =gSpecialVar_0x8004 - ldrh r1, [r0] - adds r7, r0, 0 - cmp r1, 0xD - bls _080E60E8 - b _080E6284 -_080E60E8: - lsls r0, r1, 2 - ldr r1, _080E60F8 @ =_080E60FC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E60F4: .4byte gSpecialVar_0x8004 -_080E60F8: .4byte _080E60FC - .align 2, 0 -_080E60FC: - .4byte _080E6134 - .4byte _080E613C - .4byte _080E6144 - .4byte _080E614C - .4byte _080E6154 - .4byte _080E619C - .4byte _080E616C - .4byte _080E61BC - .4byte _080E61E0 - .4byte _080E61FC - .4byte _080E6200 - .4byte _080E6214 - .4byte _080E623C - .4byte _080E6260 -_080E6134: - ldr r1, _080E6138 @ =gSaveBlock1 + 0x2B1C - b _080E624C - .align 2, 0 -_080E6138: .4byte gSaveBlock1 + 0x2B1C -_080E613C: - ldr r1, _080E6140 @ =gSaveBlock1 + 0x2B28 - b _080E6276 - .align 2, 0 -_080E6140: .4byte gSaveBlock1 + 0x2B28 -_080E6144: - ldr r1, _080E6148 @ =gSaveBlock1 + 0x2B34 - b _080E624C - .align 2, 0 -_080E6148: .4byte gSaveBlock1 + 0x2B34 -_080E614C: - ldr r1, _080E6150 @ =gSaveBlock1 + 0x2B40 - b _080E6276 - .align 2, 0 -_080E6150: .4byte gSaveBlock1 + 0x2B40 -_080E6154: - ldr r0, _080E6164 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E6168 @ =gSaveBlock1 + 0x2B4C - adds r1, r0, r1 - b _080E624C - .align 2, 0 -_080E6164: .4byte gSpecialVar_0x8005 -_080E6168: .4byte gSaveBlock1 + 0x2B4C -_080E616C: - ldr r0, _080E6194 @ =gSaveBlock1 + 0x2D94 - movs r2, 0 - ldr r1, _080E6198 @ =sub_80546B8 - mov r12, r1 - adds r3, r0, 0 - adds r3, 0xE - adds r5, r0, 0x2 - adds r6, r3, 0 -_080E617C: - lsls r0, r2, 1 - adds r1, r3, r0 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _080E617C - adds r1, r6, 0 - b _080E627A - .align 2, 0 -_080E6194: .4byte gSaveBlock1 + 0x2D94 -_080E6198: .4byte sub_80546B8 -_080E619C: - ldr r0, _080E61B0 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E61B4 @ =gSaveBlock1 + 0x273C - adds r1, r0, r1 - ldr r0, _080E61B8 @ =gSpecialVar_0x8006 - ldrb r4, [r0] - b _080E6276 - .align 2, 0 -_080E61B0: .4byte gSpecialVar_0x8005 -_080E61B4: .4byte gSaveBlock1 + 0x273C -_080E61B8: .4byte gSpecialVar_0x8006 -_080E61BC: - ldr r0, _080E61D4 @ =gSpecialVar_0x8005 - ldrh r0, [r0] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r0, _080E61D8 @ =gSaveBlock1 + 0x2754 - adds r1, r0 - ldr r0, _080E61DC @ =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r1, r0 - b _080E624A - .align 2, 0 -_080E61D4: .4byte gSpecialVar_0x8005 -_080E61D8: .4byte gSaveBlock1 + 0x2754 -_080E61DC: .4byte gSpecialVar_0x8006 -_080E61E0: - ldr r0, _080E61F4 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E61F8 @ =gSaveBlock1 + 0x273A - adds r1, r0, r1 - movs r4, 0 - b _080E6276 - .align 2, 0 -_080E61F4: .4byte gSpecialVar_0x8005 -_080E61F8: .4byte gSaveBlock1 + 0x273A -_080E61FC: - movs r1, 0 - b _080E624C -_080E6200: - ldr r1, _080E620C @ =gSaveBlock1 + 0x2B16 - ldr r2, _080E6210 @ =0x0000ffff - adds r0, r2, 0 - strh r0, [r1] - b _080E624A - .align 2, 0 -_080E620C: .4byte gSaveBlock1 + 0x2B16 -_080E6210: .4byte 0x0000ffff -_080E6214: - ldr r0, _080E6230 @ =gSpecialVar_0x8005 - ldrh r0, [r0] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r0, _080E6234 @ =gSaveBlock1 + 0x273C - adds r1, r0 - ldr r0, _080E6238 @ =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r1, r0 - movs r4, 0 - b _080E6276 - .align 2, 0 -_080E6230: .4byte gSpecialVar_0x8005 -_080E6234: .4byte gSaveBlock1 + 0x273C -_080E6238: .4byte gSpecialVar_0x8006 -_080E623C: - ldr r0, _080E6254 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E6258 @ =gSaveBlock1 + 0x2750 - adds r1, r0, r1 -_080E624A: - movs r4, 0x1 -_080E624C: - ldr r0, _080E625C @ =sub_80546B8 - mov r12, r0 - b _080E627A - .align 2, 0 -_080E6254: .4byte gSpecialVar_0x8005 -_080E6258: .4byte gSaveBlock1 + 0x2750 -_080E625C: .4byte sub_80546B8 -_080E6260: - ldr r1, _080E628C @ =gSharedMem + 0x1000 - ldr r0, _080E6290 @ =0x00009c7c - adds r2, r1, r0 - ldr r0, _080E6294 @ =0x0000ffff - strh r0, [r2] - ldr r0, _080E6298 @ =0x00009c7e - adds r1, r0 - movs r0, 0x1 - negs r0, r0 - strh r0, [r1] - adds r1, r2, 0 -_080E6276: - ldr r2, _080E629C @ =sub_80546B8 - mov r12, r2 -_080E627A: - ldrb r0, [r7] - mov r2, r12 - adds r3, r4, 0 - bl sub_80E62A0 -_080E6284: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E628C: .4byte gSharedMem + 0x1000 -_080E6290: .4byte 0x00009c7c -_080E6294: .4byte 0x0000ffff -_080E6298: .4byte 0x00009c7e -_080E629C: .4byte sub_80546B8 - thumb_func_end sub_80E60D8 - - thumb_func_start sub_80E62A0 -sub_80E62A0: @ 80E62A0 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _080E62DC @ =gSharedMem + 0x1000 - str r2, [r4] - str r1, [r4, 0x4] - strb r0, [r4, 0x8] - strb r3, [r4, 0xB] - cmp r0, 0x9 - bne _080E62D0 - ldr r0, _080E62E0 @ =0x00009c7c - adds r2, r4, r0 - str r2, [r4, 0x4] - ldr r0, _080E62E4 @ =gSaveBlock1 - ldr r3, _080E62E8 @ =0x00002dd8 - adds r1, r0, r3 - ldrh r1, [r1] - strh r1, [r2] - ldr r1, _080E62EC @ =0x00002dda - adds r0, r1 - ldrh r1, [r0] - ldr r2, _080E62F0 @ =0x00009c7e - adds r0, r4, r2 - strh r1, [r0] -_080E62D0: - ldr r0, _080E62F4 @ =sub_80E62F8 - bl SetMainCallback2 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E62DC: .4byte gSharedMem + 0x1000 -_080E62E0: .4byte 0x00009c7c -_080E62E4: .4byte gSaveBlock1 -_080E62E8: .4byte 0x00002dd8 -_080E62EC: .4byte 0x00002dda -_080E62F0: .4byte 0x00009c7e -_080E62F4: .4byte sub_80E62F8 - thumb_func_end sub_80E62A0 - - thumb_func_start sub_80E62F8 -sub_80E62F8: @ 80E62F8 - push {lr} - sub sp, 0x4 - ldr r0, _080E6314 @ =gMain - ldr r1, _080E6318 @ =0x0000043c - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x8 - bhi _080E6344 - lsls r0, 2 - ldr r1, _080E631C @ =_080E6320 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E6314: .4byte gMain -_080E6318: .4byte 0x0000043c -_080E631C: .4byte _080E6320 - .align 2, 0 -_080E6320: - .4byte _080E6344 - .4byte _080E6380 - .4byte _080E638C - .4byte _080E63A8 - .4byte _080E63AE - .4byte _080E63B4 - .4byte _080E63BE - .4byte _080E63D8 - .4byte _080E63EA -_080E6344: - movs r1, 0x80 - lsls r1, 19 - movs r0, 0 - strh r0, [r1] - movs r0, 0 - bl SetVBlankCallback - bl ResetPaletteFade - bl ResetSpriteData - bl dp12_8087EA4 - bl remove_some_task - bl sub_80EAD08 - ldr r2, _080E637C @ =gUnknown_083DB698 - ldr r0, [r2] - ldr r1, [r2, 0x4] - ldr r2, [r2, 0x8] - bl sub_80895F8 - bl FreeSpriteTileRanges - bl FreeAllSpritePalettes - b _080E6402 - .align 2, 0 -_080E637C: .4byte gUnknown_083DB698 -_080E6380: - ldr r0, _080E6388 @ =gWindowConfig_81E6DA8 - bl SetUpWindowConfig - b _080E6402 - .align 2, 0 -_080E6388: .4byte gWindowConfig_81E6DA8 -_080E638C: - ldr r0, _080E63A0 @ =gWindowConfig_81E6D54 - bl InitMenuWindow - ldr r0, _080E63A4 @ =gWindowConfig_81E6DA8 - bl InitMenuWindow - bl MenuZeroFillScreen - b _080E6402 - .align 2, 0 -_080E63A0: .4byte gWindowConfig_81E6D54 -_080E63A4: .4byte gWindowConfig_81E6DA8 -_080E63A8: - bl sub_80E6424 - b _080E6402 -_080E63AE: - bl sub_80E8DD8 - b _080E6402 -_080E63B4: - bl sub_80E8218 - bl sub_80E8CEC - b _080E6402 -_080E63BE: - bl sub_80E69F8 - ldr r0, _080E63D0 @ =sub_80E6AA8 - bl sub_80E682C - ldr r0, _080E63D4 @ =sub_80E6A6C - bl SetVBlankCallback - b _080E6402 - .align 2, 0 -_080E63D0: .4byte sub_80E6AA8 -_080E63D4: .4byte sub_80E6A6C -_080E63D8: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _080E6402 -_080E63EA: - movs r1, 0x80 - lsls r1, 19 - movs r2, 0xFA - lsls r2, 5 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080E6414 @ =sub_80E6A88 - bl SetMainCallback2 - ldr r0, _080E6418 @ =0x00000805 - bl FlagSet -_080E6402: - ldr r1, _080E641C @ =gMain - ldr r0, _080E6420 @ =0x0000043c - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_080E6414: .4byte sub_80E6A88 -_080E6418: .4byte 0x00000805 -_080E641C: .4byte gMain -_080E6420: .4byte 0x0000043c - thumb_func_end sub_80E62F8 - - thumb_func_start sub_80E6424 -sub_80E6424: @ 80E6424 - push {lr} - ldr r2, _080E6444 @ =gSharedMem + 0x1000 - ldr r0, _080E6448 @ =gUnknown_083DB6A4 - ldrb r1, [r2, 0x8] - adds r1, r0 - ldrb r0, [r1] - strb r0, [r2, 0x9] - ldrb r0, [r2, 0x9] - adds r3, r2, 0 - cmp r0, 0x5 - bhi _080E6512 - lsls r0, 2 - ldr r1, _080E644C @ =_080E6450 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E6444: .4byte gSharedMem + 0x1000 -_080E6448: .4byte gUnknown_083DB6A4 -_080E644C: .4byte _080E6450 - .align 2, 0 -_080E6450: - .4byte _080E64A0 - .4byte _080E64B8 - .4byte _080E64DA - .4byte _080E64F6 - .4byte _080E6468 - .4byte _080E6480 -_080E6468: - movs r2, 0x4 - strb r2, [r3, 0xA] - adds r0, r3, 0 - adds r0, 0x83 - movs r1, 0x2 - strb r1, [r0] - adds r0, 0x1 - strb r1, [r0] - adds r1, r3, 0 - adds r1, 0x88 - movs r0, 0x5 - b _080E64D0 -_080E6480: - movs r1, 0x4 - strb r1, [r3, 0xA] - adds r2, r3, 0 - adds r2, 0x83 - movs r0, 0x1 - strb r0, [r2] - adds r0, r3, 0 - adds r0, 0x84 - strb r1, [r0] - adds r1, r3, 0 - adds r1, 0x88 - movs r0, 0x10 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x2 - b _080E6510 -_080E64A0: - movs r0, 0x6 - strb r0, [r3, 0xA] - adds r1, r3, 0 - adds r1, 0x83 - movs r0, 0x2 - strb r0, [r1] - adds r0, r3, 0 - adds r0, 0x84 - movs r2, 0x3 - strb r2, [r0] - adds r1, 0x5 - b _080E64CE -_080E64B8: - movs r2, 0 - movs r0, 0x9 - strb r0, [r3, 0xA] - adds r1, r3, 0 - adds r1, 0x83 - movs r0, 0x2 - strb r0, [r1] - adds r1, 0x1 - movs r0, 0x5 - strb r0, [r1] - adds r1, 0x4 -_080E64CE: - movs r0, 0x4 -_080E64D0: - strh r0, [r1] - adds r0, r3, 0 - adds r0, 0x8A - strh r2, [r0] - b _080E6512 -_080E64DA: - movs r1, 0x1 - strb r1, [r3, 0xA] - adds r0, r3, 0 - adds r0, 0x83 - strb r1, [r0] - adds r0, 0x1 - strb r1, [r0] - adds r1, r3, 0 - adds r1, 0x88 - movs r0, 0x10 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x4 - b _080E6510 -_080E64F6: - movs r0, 0x2 - strb r0, [r3, 0xA] - adds r1, r3, 0 - adds r1, 0x83 - strb r0, [r1] - adds r1, 0x1 - movs r0, 0x1 - strb r0, [r1] - adds r1, 0x4 - movs r0, 0x5 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x3 -_080E6510: - strh r0, [r1] -_080E6512: - adds r1, r3, 0 - adds r1, 0x86 - movs r0, 0 - strb r0, [r1] - subs r1, 0x1 - strb r0, [r1] - adds r1, 0x2 - strb r0, [r1] - subs r1, 0x61 - strb r0, [r1] - movs r2, 0xDD - lsls r2, 1 - adds r1, r3, r2 - strh r0, [r1] - movs r0, 0xDF - lsls r0, 1 - adds r1, r3, r0 - movs r0, 0x2 - strb r0, [r1] - bl sub_80E6554 - bl sub_80EAECC - bl sub_80EB040 - bl sub_80E7E50 - bl sub_80E6630 - bl sub_80E6690 - pop {r0} - bx r0 - thumb_func_end sub_80E6424 - - thumb_func_start sub_80E6554 -sub_80E6554: @ 80E6554 - push {r4-r7,lr} - sub sp, 0x4 - movs r4, 0 - movs r7, 0 - ldr r0, _080E6564 @ =gSharedMem + 0x1000 - mov r12, r0 - b _080E656E - .align 2, 0 -_080E6564: .4byte gSharedMem + 0x1000 -_080E6568: - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 -_080E656E: - movs r5, 0 - lsls r3, r7, 1 - mov r6, r12 - adds r6, 0x2A - adds r2, r3, r6 - adds r1, r4, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - strb r1, [r2] - cmp r4, 0x11 - beq _080E65A6 -_080E6586: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bhi _080E65A2 - adds r2, r5, r3 - adds r2, r6 - adds r1, r4, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - strb r1, [r2] - cmp r4, 0x11 - bne _080E6586 -_080E65A2: - cmp r4, 0x11 - bne _080E6568 -_080E65A6: - movs r0, 0x11 - mov r1, r12 - strh r0, [r1, 0x28] - cmp r4, 0x15 - bhi _080E6612 - mov r6, r12 - adds r2, r6, 0 - adds r2, 0x78 -_080E65B6: - lsls r0, r4, 24 - lsrs r0, 24 - str r2, [sp] - bl sub_80EAD7C - lsls r0, 24 - lsrs r1, r0, 24 - ldr r2, [sp] - cmp r1, 0 - beq _080E65FC - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E65DC - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - movs r5, 0 -_080E65DC: - lsls r0, r7, 1 - adds r0, r5, r0 - adds r1, r6, 0 - adds r1, 0x2A - adds r0, r1 - strb r4, [r0] - adds r0, r4, 0 - subs r0, 0x11 - adds r0, r2 - movs r1, 0x1 - strb r1, [r0] - ldrh r0, [r6, 0x28] - adds r0, 0x1 - strh r0, [r6, 0x28] - mov r12, r6 - b _080E6608 -_080E65FC: - adds r0, r4, 0 - subs r0, 0x11 - adds r0, r2 - strb r1, [r0] - ldr r0, _080E662C @ =gSharedMem + 0x1000 - mov r12, r0 -_080E6608: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x15 - bls _080E65B6 -_080E6612: - mov r1, r12 - ldrh r0, [r1, 0x28] - adds r0, 0x1 - asrs r0, 1 - movs r1, 0xDB - lsls r1, 1 - add r1, r12 - strb r0, [r1] - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E662C: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E6554 - - thumb_func_start sub_80E6630 -sub_80E6630: @ 80E6630 - push {r4-r7,lr} - movs r1, 0 - ldr r0, _080E6664 @ =gUnknown_083DB6B2 - mov r12, r0 -_080E6638: - lsls r0, r1, 4 - mov r2, r12 - adds r5, r0, r2 - movs r3, 0 - ldrb r0, [r5] - adds r7, r1, 0x1 - cmp r0, 0xFF - beq _080E6680 - lsls r0, r1, 3 - subs r0, r1 - lsls r4, r0, 1 - ldr r6, _080E6668 @ =gSharedMem + 0x1040 -_080E6650: - adds r0, r5, r3 - ldrb r1, [r0] - adds r2, r1, 0 - cmp r2, 0 - beq _080E666C - adds r0, r3, r4 - adds r0, r6 - adds r1, 0x46 - strb r1, [r0] - b _080E6672 - .align 2, 0 -_080E6664: .4byte gUnknown_083DB6B2 -_080E6668: .4byte gSharedMem + 0x1040 -_080E666C: - adds r0, r3, r4 - adds r0, r6 - strb r2, [r0] -_080E6672: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r5, r3 - ldrb r0, [r0] - cmp r0, 0xFF - bne _080E6650 -_080E6680: - lsls r0, r7, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _080E6638 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80E6630 - - thumb_func_start sub_80E6690 -sub_80E6690: @ 80E6690 - push {r4-r6,lr} - sub sp, 0x10 - mov r0, sp - ldr r1, _080E66E0 @ =gUnknown_083DB7DC - ldm r1!, {r2-r4} - stm r0!, {r2-r4} - ldr r1, [r1] - str r1, [r0] - movs r5, 0 - ldr r6, _080E66E4 @ =gUnknown_083DB7C0 -_080E66A4: - ldr r0, _080E66E8 @ =gSharedMem + 0x1000 - ldrb r0, [r0, 0x8] - lsls r0, 1 - adds r0, r5, r0 - adds r0, r6 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E66EC @ =gUnknown_083DB6F4 - adds r4, r0, r1 - lsls r0, r5, 3 - add r0, sp - ldr r0, [r0] - ldr r1, [r4] - bl StringCopy - adds r3, r0, 0 - ldrb r0, [r4, 0x8] - cmp r0, 0 - beq _080E66F0 - lsls r0, r5, 1 - adds r0, 0x1 - lsls r0, 2 - add r0, sp - ldr r0, [r0] - ldr r1, [r4, 0x4] - bl StringCopy - b _080E670A - .align 2, 0 -_080E66E0: .4byte gUnknown_083DB7DC -_080E66E4: .4byte gUnknown_083DB7C0 -_080E66E8: .4byte gSharedMem + 0x1000 -_080E66EC: .4byte gUnknown_083DB6F4 -_080E66F0: - strb r0, [r3] - adds r3, 0x1 - ldr r1, [r4, 0x4] - adds r0, r3, 0 - bl StringCopy - lsls r0, r5, 1 - adds r0, 0x1 - lsls r0, 2 - add r0, sp - ldr r1, [r0] - movs r0, 0xFF - strb r0, [r1] -_080E670A: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E66A4 - movs r5, 0 - ldr r3, _080E6758 @ =gSharedMem + 0x1000 - ldr r0, _080E675C @ =0x00009da4 - adds r2, r3, r0 - movs r1, 0 -_080E671E: - adds r0, r5, r2 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x23 - bls _080E671E - ldr r1, _080E675C @ =0x00009da4 - adds r0, r3, r1 - adds r0, r5, r0 - movs r4, 0x1 - negs r4, r4 - adds r2, r4, 0 - movs r1, 0xFF - strb r1, [r0] - ldr r0, _080E6760 @ =0x00009f6e - adds r3, r0 - movs r0, 0xFC - strb r0, [r3] - movs r0, 0x11 - strb r0, [r3, 0x1] - movs r0, 0xE0 - strb r0, [r3, 0x2] - strb r2, [r3, 0x3] - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E6758: .4byte gSharedMem + 0x1000 -_080E675C: .4byte 0x00009da4 -_080E6760: .4byte 0x00009f6e - thumb_func_end sub_80E6690 - - thumb_func_start InitEasyChatPhrases -InitEasyChatPhrases: @ 80E6764 - push {r4-r6,lr} - movs r3, 0 - ldr r4, _080E680C @ =gSaveBlock1 + 0x2B1C - ldr r2, _080E6810 @ =gUnknown_083DB7EC -_080E676C: - lsls r0, r3, 1 - adds r1, r0, r4 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3 - bls _080E676C - movs r3, 0 - ldr r4, _080E6814 @ =gSaveBlock1 + 0x2B28 - ldr r2, _080E6818 @ =gUnknown_083DB7F4 -_080E6786: - lsls r0, r3, 1 - adds r1, r0, r4 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x5 - bls _080E6786 - movs r3, 0 - ldr r5, _080E681C @ =gSaveBlock1 + 0x2B34 - ldr r0, _080E6820 @ =0x0000ffff - adds r4, r0, 0 - adds r6, r5, 0 - adds r6, 0xC -_080E67A6: - lsls r1, r3, 1 - adds r2, r1, r5 - ldrh r0, [r2] - orrs r0, r4 - strh r0, [r2] - adds r1, r6 - ldrh r0, [r1] - orrs r0, r4 - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x5 - bls _080E67A6 - movs r3, 0 - ldr r6, _080E6824 @ =gSaveBlock1 + 0x2B4C - ldr r0, _080E6820 @ =0x0000ffff - adds r5, r0, 0 -_080E67CA: - movs r2, 0 - lsls r0, r3, 3 - adds r0, r3 - lsls r4, r0, 2 -_080E67D2: - lsls r0, r2, 1 - adds r0, r4 - adds r0, r6 - ldrh r1, [r0] - orrs r1, r5 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x8 - bls _080E67D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xF - bls _080E67CA - movs r3, 0 - ldr r2, _080E6828 @ =gSaveBlock1 + 0x2D8C - movs r1, 0 -_080E67F8: - adds r0, r3, r2 - strb r1, [r0] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3F - bls _080E67F8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E680C: .4byte gSaveBlock1 + 0x2B1C -_080E6810: .4byte gUnknown_083DB7EC -_080E6814: .4byte gSaveBlock1 + 0x2B28 -_080E6818: .4byte gUnknown_083DB7F4 -_080E681C: .4byte gSaveBlock1 + 0x2B34 -_080E6820: .4byte 0x0000ffff -_080E6824: .4byte gSaveBlock1 + 0x2B4C -_080E6828: .4byte gSaveBlock1 + 0x2D8C - thumb_func_end InitEasyChatPhrases - - thumb_func_start sub_80E682C -sub_80E682C: @ 80E682C - ldr r1, _080E6838 @ =gSharedMem + 0x1000 - str r0, [r1, 0x20] - movs r0, 0 - strh r0, [r1, 0x24] - bx lr - .align 2, 0 -_080E6838: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E682C - - thumb_func_start sub_80E683C -sub_80E683C: @ 80E683C - push {r4,r5,lr} - ldr r1, _080E6890 @ =gSharedMem + 0x1000 - adds r0, r1, 0 - adds r0, 0x26 - ldrb r0, [r0] - adds r2, r1, 0 - cmp r0, 0 - bne _080E6898 - movs r1, 0 - movs r0, 0xDB - lsls r0, 1 - adds r3, r2, r0 - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r1, r0 - bge _080E6876 - movs r0, 0xD5 - lsls r0, 1 - adds r5, r2, r0 - movs r4, 0x2 -_080E6864: - adds r0, r1, r5 - strb r4, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r1, r0 - blt _080E6864 -_080E6876: - adds r0, r2, r1 - ldr r1, _080E6894 @ =0x000001a9 - adds r3, r0, r1 - ldrh r0, [r2, 0x28] - movs r1, 0x1 - ands r0, r1 - strb r0, [r3] - cmp r0, 0 - bne _080E68B8 - movs r0, 0x2 - strb r0, [r3] - b _080E68B8 - .align 2, 0 -_080E6890: .4byte gSharedMem + 0x1000 -_080E6894: .4byte 0x000001a9 -_080E6898: - movs r3, 0xD5 - lsls r3, 1 - adds r1, r2, r3 - movs r0, 0x7 - strb r0, [r1] - ldr r1, _080E68E0 @ =0x000001ab - adds r3, r2, r1 - movs r1, 0x6 - strb r1, [r3] - movs r3, 0xD6 - lsls r3, 1 - adds r1, r2, r3 - strb r0, [r1] - adds r3, 0x1 - adds r1, r2, r3 - strb r0, [r1] -_080E68B8: - movs r0, 0xD4 - lsls r0, 1 - adds r1, r2, r0 - movs r0, 0 - strb r0, [r1] - ldr r3, _080E68E4 @ =0x000001a9 - adds r1, r2, r3 - strb r0, [r1] - adds r3, 0xC - adds r1, r2, r3 - strb r0, [r1] - adds r3, 0x2 - adds r1, r2, r3 - strb r0, [r1] - bl sub_80E9A4C - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E68E0: .4byte 0x000001ab -_080E68E4: .4byte 0x000001a9 - thumb_func_end sub_80E683C - - thumb_func_start sub_80E68E8 -sub_80E68E8: @ 80E68E8 - push {r4-r6,lr} - bl sub_80EB0B0 - ldr r3, _080E694C @ =gSharedMem + 0x1000 - adds r0, r3, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E695C - movs r1, 0xDC - lsls r1, 1 - adds r0, r3, r1 - ldrb r6, [r0] - lsls r0, r6, 1 - ldr r2, _080E6950 @ =0x00004178 - adds r1, r3, r2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x1 - asrs r0, 1 - ldr r1, _080E6954 @ =0x00009a28 - adds r2, r3, r1 - strb r0, [r2] - movs r1, 0 - movs r0, 0 - ldrsb r0, [r2, r0] - adds r5, r3, 0 - cmp r1, r0 - bge _080E693A - ldr r3, _080E6958 @ =0x000099a6 - adds r4, r5, r3 - movs r3, 0x2 -_080E6928: - adds r0, r1, r4 - strb r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - blt _080E6928 -_080E693A: - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, _080E6958 @ =0x000099a6 - adds r0, r5, r2 - adds r2, r1, r0 - lsls r0, r6, 1 - ldr r3, _080E6950 @ =0x00004178 - b _080E69AC - .align 2, 0 -_080E694C: .4byte gSharedMem + 0x1000 -_080E6950: .4byte 0x00004178 -_080E6954: .4byte 0x00009a28 -_080E6958: .4byte 0x000099a6 -_080E695C: - movs r1, 0xDC - lsls r1, 1 - adds r0, r3, r1 - ldrb r6, [r0] - lsls r0, r6, 1 - ldr r2, _080E69E0 @ =0x00004142 - adds r1, r3, r2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x1 - asrs r0, 1 - ldr r1, _080E69E4 @ =0x00009a28 - adds r2, r3, r1 - strb r0, [r2] - movs r1, 0 - movs r0, 0 - ldrsb r0, [r2, r0] - adds r5, r3, 0 - cmp r1, r0 - bge _080E699C - ldr r3, _080E69E8 @ =0x000099a6 - adds r4, r5, r3 - movs r3, 0x2 -_080E698A: - adds r0, r1, r4 - strb r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - blt _080E698A -_080E699C: - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, _080E69E8 @ =0x000099a6 - adds r0, r5, r2 - adds r2, r1, r0 - lsls r0, r6, 1 - ldr r3, _080E69E0 @ =0x00004142 -_080E69AC: - adds r1, r5, r3 - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - ands r0, r1 - strb r0, [r2] - cmp r0, 0 - bne _080E69C0 - movs r0, 0x2 - strb r0, [r2] -_080E69C0: - ldr r1, _080E69EC @ =0x000099a4 - adds r0, r5, r1 - movs r1, 0 - strb r1, [r0] - ldr r2, _080E69F0 @ =0x000099a5 - adds r0, r5, r2 - strb r1, [r0] - ldr r3, _080E69F4 @ =0x00009a29 - adds r0, r5, r3 - strb r1, [r0] - bl sub_80E9A4C - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E69E0: .4byte 0x00004142 -_080E69E4: .4byte 0x00009a28 -_080E69E8: .4byte 0x000099a6 -_080E69EC: .4byte 0x000099a4 -_080E69F0: .4byte 0x000099a5 -_080E69F4: .4byte 0x00009a29 - thumb_func_end sub_80E68E8 - - thumb_func_start sub_80E69F8 -sub_80E69F8: @ 80E69F8 - push {r4,lr} - ldr r0, _080E6A10 @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0x8] - adds r4, r0, 0 - cmp r1, 0xD - bhi _080E6A50 - lsls r0, r1, 2 - ldr r1, _080E6A14 @ =_080E6A18 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E6A10: .4byte gSharedMem + 0x1000 -_080E6A14: .4byte _080E6A18 - .align 2, 0 -_080E6A18: - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A58 - .4byte _080E6A50 - .4byte _080E6A58 - .4byte _080E6A58 - .4byte _080E6A50 - .4byte _080E6A58 - .4byte _080E6A58 - .4byte _080E6A58 - .4byte _080E6A50 -_080E6A50: - ldrb r0, [r4, 0x8] - bl sub_80E9368 - b _080E6A66 -_080E6A58: - ldrb r0, [r4, 0x8] - bl sub_80E9368 - ldrb r0, [r4, 0xB] - ldrb r1, [r4, 0x9] - bl sub_80E8BF4 -_080E6A66: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80E69F8 - - thumb_func_start sub_80E6A6C -sub_80E6A6C: @ 80E6A6C - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl sub_80EAC5C - bl TransferPlttBuffer - bl sub_8089668 - pop {r0} - bx r0 - thumb_func_end sub_80E6A6C - - thumb_func_start sub_80E6A88 -sub_80E6A88: @ 80E6A88 - push {lr} - ldr r0, _080E6AA4 @ =gSharedMem + 0x1000 - ldr r0, [r0, 0x20] - bl _call_via_r0 - bl AnimateSprites - bl BuildOamBuffer - bl sub_80EAD08 - pop {r0} - bx r0 - .align 2, 0 -_080E6AA4: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E6A88 - - thumb_func_start sub_80E6AA8 -sub_80E6AA8: @ 80E6AA8 - push {lr} - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _080E6ABA - ldr r0, _080E6AC0 @ =sub_80E6AC4 - bl sub_80E682C -_080E6ABA: - pop {r0} - bx r0 - .align 2, 0 -_080E6AC0: .4byte sub_80E6AC4 - thumb_func_end sub_80E6AA8 - - thumb_func_start sub_80E6AC4 -sub_80E6AC4: @ 80E6AC4 - push {lr} - bl sub_80E88F0 - movs r0, 0 - bl sub_80E8398 - movs r0, 0 - bl sub_80E91D4 - ldr r0, _080E6AE0 @ =sub_80E6AE4 - bl sub_80E682C - pop {r0} - bx r0 - .align 2, 0 -_080E6AE0: .4byte sub_80E6AE4 - thumb_func_end sub_80E6AC4 - thumb_func_start sub_80E6AE4 sub_80E6AE4: @ 80E6AE4 push {r4,r5,lr} diff --git a/data/easy_chat.s b/data/easy_chat.s index 99a03f8f5..98f88b1fc 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,155 +8,6 @@ .section .rodata - .align 1 -gMysteryEventPhrase:: @ 83DB678 - .2byte EC_WORD_MYSTERY - .2byte EC_WORD_EVENT - .2byte EC_WORD_IS - .2byte EC_WORD_EXCITING - - .align 1 -gBerryMasterWifePhrases:: @ 83DB680 -.ifdef ENGLISH - .2byte EC_WORD_GREAT - .2byte EC_WORD_BATTLE - - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_CONTEST - - .2byte EC_WORD_OVERWHELMING - .2byte EC_POKEMON(LATIAS) - - .2byte EC_WORD_COOL - .2byte EC_POKEMON(LATIOS) - - .2byte EC_WORD_SUPER - .2byte EC_WORD_HUSTLE -.else - .2byte EC_WORD_GREAT - .2byte EC_WORD_FIGHT - - .2byte EC_WORD_CONTEST - .2byte EC_WORD_CHALLENGE - - .2byte EC_POKEMON(LATIAS) - .2byte EC_WORD_OVERWHELMING - - .2byte EC_POKEMON(LATIOS) - .2byte EC_WORD_COOL - - .2byte EC_WORD_SUPER - .2byte 0xFFFF -.endif - -gUnknown_083DB694:: @ 83DB694 - .4byte gSharedMem + 0x1000 - - .align 2 -gUnknown_083DB698:: @ 83DB698 - .4byte REG_BG3VOFS - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - -gUnknown_083DB6A4:: @ 83DB6A4 - .byte 4 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 5 - .byte 0 - .byte 2 - .byte 2 - .byte 3 - .byte 2 - .byte 2 - .byte 2 - .byte 3 - -gUnknown_083DB6B2:: @ 83DB6B2 - .string "ABCDEF $ " - .string "GHIJKL$ " - .string "MNOPQRS$ " - .string "TUVWXYZ$ " - - .align 2 -gUnknown_083DB6F4:: @ 83DB6F4 - .4byte OtherText_MakeProfilePage1, OtherText_MakeProfilePage2, 0x1 - .4byte OtherText_MakeMessagePage1, OtherText_MakeMessagePage2, 0x1 - .4byte OtherText_CombineNinePhrasesPage1, OtherText_CombineNinePhrasesPage2, 0x1 - .4byte OtherText_DescribeFeelingsPage1, OtherText_DescribeFeelingsPage2, 0x1 - .4byte OtherText_ImproveBardSongPage1, OtherText_ImproveBardSongPage2, 0x1 - .4byte OtherText_CombineTwoPhrasesPage1, OtherText_CombineTwoPhrasesPage2, 0x1 - .4byte OtherText_YourProfile, OtherText_ConfirmTrendyPage2, 0x0 - .4byte OtherText_YourFeelingBattle, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_SetWinMessage, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_SetLossMessage, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_MailMessage, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_MailSalutation, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_NewSong, OtherText_ConfirmTrendyPage2, 0x0 - .4byte OtherText_TheAnswer, OtherText_ConfirmTrendyPage2, 0x0 - .4byte OtherText_ConfirmTrendyPage1, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_HipsterPage1, OtherText_HipsterPage2, 0x1 - .4byte OtherText_WithFourPhrases, OtherText_CombineNinePhrasesPage2, 0x1 - -gUnknown_083DB7C0:: @ 83DB7C0 - .byte 0, 6 - .byte 1, 7 - .byte 1, 8 - .byte 1, 9 - .byte 2, 10 - .byte 16, 13 - .byte 4, 12 - .byte 3, 13 - .byte 3, 13 - .byte 5, 14 - .byte 3, 13 - .byte 3, 13 - .byte 3, 13 - .byte 15, 13 - - .align 2 -gUnknown_083DB7DC:: @ 83DB7DC -.ifdef ENGLISH - .4byte gSharedMem + 0xAC80 - .4byte gSharedMem + 0xACC9 - .4byte gSharedMem + 0xAD12 - .4byte gSharedMem + 0xAD5B -.else - .4byte gSharedMem + 0xAFAC - .4byte gSharedMem + 0xAFF5 - .4byte gSharedMem + 0xB03E - .4byte gSharedMem + 0xB087 -.endif - - .align 1 -gUnknown_083DB7EC:: @ 83DB7EC -.ifdef ENGLISH - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_GREAT -.else - .2byte EC_WORD_I_AM - .2byte EC_WORD_BIG - .2byte EC_WORD_IN - .2byte EC_WORD_POKEMON -.endif - - .align 1 -gUnknown_083DB7F4:: @ 83DB7F4 - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_READY - .2byte EC_WORD_QUES - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_EXCL - - .align 2 -InterviewPalette_0:: @ 83DB800 - .incbin "graphics/misc/interview_pal0.gbapal" - .align 2 InterviewPalette_1:: @ 83DB820 .incbin "graphics/misc/interview_pal1.gbapal" diff --git a/include/easy_chat.h b/include/easy_chat.h index a6277fba8..541a697be 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -3,6 +3,7 @@ extern u8 gUnknown_020388AC; +void sub_80E62A0(u8 arg0, u16 *arg1, void *arg2, u8 arg3); u16 sub_80EB72C(u16 group); void sub_80EB6FC(u16 *, u16); void InitEasyChatPhrases(void); diff --git a/include/global.h b/include/global.h index a4e71852c..3dc7ebc11 100644 --- a/include/global.h +++ b/include/global.h @@ -690,7 +690,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2B40*/ u16 unk2B40[6]; } easyChats; /*0x2B4C*/ struct MailStruct mail[16]; - /*0x2D8C*/ u8 unk2D8C[4]; + /*0x2D8C*/ u8 unk2D8C[4]; // What is this? Apparently it's supposed to be 64 bytes in size. /*0x2D90*/ u8 filler_2D90[0x4]; /*0x2D94*/ union MauvilleMan mauvilleMan; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff diff --git a/ld_script.txt b/ld_script.txt index f0520d1e9..d712a6052 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -302,6 +302,7 @@ SECTIONS { asm/normal.o(.text); asm/battle_intro.o(.text); src/field/bike.o(.text); + src/easy_chat_before.o(.text); asm/easy_chat.o(.text); src/easy_chat.o(.text); src/pokenav_before.o(.text); @@ -544,6 +545,7 @@ SECTIONS { src/field/item_use.o(.rodata); data/battle_anim_80CA710.o(.rodata); src/field/bike.o(.rodata); + src/easy_chat_before.o(.rodata); data/easy_chat.o(.rodata); data/pokenav.o(.rodata); src/pokemon/mon_markings.o(.rodata); diff --git a/src/easy_chat.c b/src/easy_chat.c index 1dce5863e..ee35341cc 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1,5 +1,6 @@ #include "global.h" #include "easy_chat.h" +#include "ewram.h" #include "constants/easy_chat.h" #include "data2.h" #include "event_data.h" @@ -11,7 +12,6 @@ #include "strings2.h" #include "text.h" -static bool8 sub_80EB680(u16 *, u16, u16, u16); static u16 sub_80EB9D8(void); static u16 sub_80EB960(void); @@ -22,6 +22,109 @@ extern u16 gSpecialVar_0x8004; IWRAM_DATA u8 gUnknown_03000740; +/* + +extern const u8 *const gUnknown_083DB694[]; + +u16 sub_80EB2D4(u16 a) +{ + u16 r2; + u16 r1; + const u8 *str; + + if (sub_80EB37C(a) != 0) + return StringLength(gOtherText_ThreeQuestions); + //_080EB2F8 + if (a == 0xFFFF) + return 0; + //_080EB308 + r2 = a >> 9; + r1 = a & 0x1FF; + switch (r2) + { + case 0: + case 0x13: + case 0x14: + case 0x15: + str = gSpeciesNames[r1]; + break; + case 0x12: + str = gMoveNames[r1]; + break; + case 0x15: + str = + } +} +*/ + +#ifdef NONMATCHING +bool8 sub_80EB37C(u16 a) +{ + u16 i; + u16 r2; + u16 r5; + u16 *r4; + + if (a == 0xFFFF) + return FALSE; + + r2 = a >> 9; + r5 = a & 0x1FF; + + if (r2 <= 0x15) + { + /* + switch (r2) + { + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + case EC_GROUP_TRENDY_SAYING: + r4 = gEasyChatGroupWords[r2]; + for (i = 0; i < gEasyChatGroupSizes[r2]; i++) + { + if (r5 == r4[i]) + return FALSE; + } + break; + default: + if (r5 < gEasyChatGroupSizes[a]) + return FALSE; + break; + } + */ + if ((r2 == EC_GROUP_MOVE_1 || r2 == EC_GROUP_MOVE_2) + || (r2 == EC_GROUP_POKEMON || r2 == EC_GROUP_POKEMON_2)) + { + r4 = gEasyChatGroupWords[r2]; + for (i = 0; i < gEasyChatGroupSizes[r2]; i++) + { + if (r5 == r4[i]) + return FALSE; + } + } + else if (r2 == EC_GROUP_TRENDY_SAYING) + { + r4 = gEasyChatGroupWords[r2]; + for (i = 0; i < gEasyChatGroupSizes[r2]; i++) + { + if (r5 == r4[i]) + return FALSE; + } + } + else + { + if (r5 < gEasyChatGroupSizes[a]) + return FALSE; + } + } + return TRUE; +} +#else + +#endif + // returns the end of the destination buffer text u8 *EasyChat_GetWordText(u8 *dst, u16 word) { @@ -188,7 +291,7 @@ u16 unref_sub_80EB5E0(u16 arg0) return length; } -static bool8 sub_80EB680(u16 *arg0, u16 arg1, u16 arg2, u16 arg3) +bool8 sub_80EB680(u16 *arg0, u16 arg1, u16 arg2, u16 arg3) { return FALSE; } diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c new file mode 100644 index 000000000..7af22df53 --- /dev/null +++ b/src/easy_chat_before.c @@ -0,0 +1,684 @@ +#include "global.h" +#include "constants/easy_chat.h" +#include "constants/species.h" +#include "easy_chat.h" +#include "event_data.h" +#include "ewram.h" +#include "main.h" +#include "menu.h" +#include "palette.h" +#include "string_util.h" +#include "strings.h" +#include "unknown_task.h" + +extern const struct WindowConfig gWindowConfig_81E6D54; +extern const struct WindowConfig gWindowConfig_81E6DA8; + +extern void sub_80546B8(void); + +struct Shared1000 +{ + void *unk0; // callback + u16 *unk4; + u8 unk8; + u8 unk9; + u8 unkA; + u8 unkB; + u8 fillerC[0x20-0xC]; + void (*unk20)(void); + u16 unk24; + u8 unk26; + u8 filler27[0x28-0x27]; + u16 unk28; + u8 unk2A[11][2]; // unknown length + u8 unk40[4][14]; + u8 unk78[0x83-0x78]; // unknown length + u8 unk83; + u8 unk84; + u8 unk85; + u8 unk86; + u8 unk87; + u16 unk88; + u16 unk8A; + u8 filler8C[0x1A8-0x8C]; + u8 unk1A8; + u8 unk1A9; + u8 unk1AA[0xB5-0xAA]; // unknown length + u8 unk1B5; + s8 unk1B6; + u8 unk1B7; + u8 unk1B8; + u8 filler1B9[0x1BA-0x1B9]; + u16 unk1BA; + u8 filler1BC[0xBE - 0xBC]; + u8 unk1BE; + u8 filler1BF[0x4142-0x1BF]; + u16 unk4142[(0x78-0x42)/2]; + u16 unk4178[(0x99A4-0x4178)/2]; // unknown length + + u8 unk99A4; + u8 unk99A5; + u8 unk99A6[0xA28-0x9A6]; + s8 unk9A28; + u8 unk9A29; + u8 filler9A2A[0xC7C-0xA2A]; + + u16 unk9C7C; + s16 unk9C7E; + u8 filler9C80[0xDA4-0xC80]; + u8 unk9DA4[0x24]; + u8 filler9DC8[0xF6E - 0xDC8]; + u8 unk9F6E[1]; // unknown length +}; + +#define static_assert(cond) \ + typedef char test_[(cond) ? 1 : -1] + +static_assert(offsetof(struct Shared1000, unk4142) == 0x4142); + +#define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) + +const u16 gMysteryEventPhrase[] = {EC_WORD_MYSTERY, EC_WORD_EVENT, EC_WORD_IS, EC_WORD_EXCITING}; +const u16 gBerryMasterWifePhrases[][2] = +{ +#if ENGLISH + {EC_WORD_GREAT, EC_WORD_BATTLE}, + {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, + {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, + {EC_WORD_COOL, EC_POKEMON(LATIOS)}, + {EC_WORD_SUPER, EC_WORD_HUSTLE}, +#else + {EC_WORD_GREAT, EC_WORD_FIGHT}, + {EC_WORD_CONTEST, EC_WORD_CHALLENGE}, + {EC_POKEMON(LATIAS), EC_WORD_OVERWHELMING}, + {EC_POKEMON(LATIOS), EC_WORD_COOL}, + {EC_WORD_SUPER, 0xFFFF}, +#endif +}; + +// const pointer to shared1000. easy_chat might be two separate files. +struct Shared1000 *const gUnknown_083DB694 = &shared1000; + +const struct UnknownTaskStruct gUnknown_083DB698 = +{ + ®_BG3VOFS, + ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, + 1 +}; + +const u8 gUnknown_083DB6A4[] = {4, 0, 0, 0, 1, 5, 0, 2, 2, 3, 2, 2, 2, 3}; + +// choose by alphabet keyboard +const u8 gUnknown_083DB6B2[][16] = +{ + _("ABCDEF "), + _("GHIJKL"), + _("MNOPQRS"), + _("TUVWXYZ"), +}; + +struct EasyChatPrompt +{ + const u8 *text1; + const u8 *text2; + bool8 unk8; +}; + +const struct EasyChatPrompt gUnknown_083DB6F4[] = +{ + {OtherText_MakeProfilePage1, OtherText_MakeProfilePage2, TRUE}, + {OtherText_MakeMessagePage1, OtherText_MakeMessagePage2, TRUE}, + {OtherText_CombineNinePhrasesPage1, OtherText_CombineNinePhrasesPage2, TRUE}, + {OtherText_DescribeFeelingsPage1, OtherText_DescribeFeelingsPage2, TRUE}, + {OtherText_ImproveBardSongPage1, OtherText_ImproveBardSongPage2, TRUE}, + {OtherText_CombineTwoPhrasesPage1, OtherText_CombineTwoPhrasesPage2, TRUE}, + {OtherText_YourProfile, OtherText_ConfirmTrendyPage2, FALSE}, + {OtherText_YourFeelingBattle, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_SetWinMessage, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_SetLossMessage, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_MailMessage, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_MailSalutation, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_NewSong, OtherText_ConfirmTrendyPage2, FALSE}, + {OtherText_TheAnswer, OtherText_ConfirmTrendyPage2, FALSE}, + {OtherText_ConfirmTrendyPage1, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_HipsterPage1, OtherText_HipsterPage2, TRUE}, + {OtherText_WithFourPhrases, OtherText_CombineNinePhrasesPage2, TRUE}, +}; + +const u8 gUnknown_083DB7C0[][2] = +{ + { 0, 6}, + { 1, 7}, + { 1, 8}, + { 1, 9}, + { 2, 10}, + {16, 13}, + { 4, 12}, + { 3, 13}, + { 3, 13}, + { 5, 14}, + { 3, 13}, + { 3, 13}, + { 3, 13}, + {15, 13}, +}; + +void sub_80E62F8(void); +void sub_80E6424(void); +void sub_80E6554(void); +void sub_80E6630(void); +void sub_80E6690(void); +void sub_80E682C(void (*)(void)); +void sub_80E69F8(void); +void sub_80E6A6C(void); +void sub_80E6A88(void); +void sub_80E6AA8(void); +void sub_80E6AC4(void); +void sub_80E6AE4(void); +void sub_80E7E50(void); +void sub_80E8218(void); +void sub_80E8398(); +void sub_80E88F0(void); +void sub_80E8BF4(); +void sub_80E8CEC(void); +void sub_80E8DD8(void); +void sub_80E91D4(); +void sub_80E9368(); +void sub_80E9A4C(void); +void sub_80EAC5C(void); +void sub_80EAD08(void); +u8 sub_80EAD7C(u8); +void sub_80EAECC(void); +void sub_80EB040(void); +void sub_80EB0B0(void); +bool8 sub_80EB680(u16 *, u16, u16, u16); + +void sub_80E60D8(void) +{ + u8 r4 = 3; + u16 *r1; + + switch (gSpecialVar_0x8004) + { + case 0: + r1 = gSaveBlock1.easyChats.unk2B1C; + break; + case 1: + r1 = gSaveBlock1.easyChats.unk2B28; + break; + case 2: + r1 = gSaveBlock1.easyChats.unk2B34; + break; + case 3: + r1 = gSaveBlock1.easyChats.unk2B40; + break; + case 4: + r1 = gSaveBlock1.mail[gSpecialVar_0x8005].words; + break; + case 6: + { + struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard; + u16 i; + for (i = 0; i < 6; i++) + bard->temporaryLyrics[i] = bard->songLyrics[i]; + r1 = bard->temporaryLyrics; + } + break; + case 5: + // TODO: Is this the right TV show? + r1 = gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubLetter.pad04; + r4 = gSpecialVar_0x8006; + break; + case 7: + // TODO: Is this the right TV show? + r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubOpinions.var1C[gSpecialVar_0x8006]; + r4 = 1; + break; + case 8: + // TODO: Is this the right TV show? + r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubOpinions.var02; + r4 = 0; + break; + case 9: + r1 = NULL; + break; + case 10: + r1 = &gSaveBlock1.gabbyAndTyData.quote; + *r1 = 0xFFFF; + r4 = 1; + break; + case 11: + // TODO: Is this the right TV show? + r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].bravoTrainer.var04[gSpecialVar_0x8006]; + r4 = 0; + break; + case 12: + // TODO: Is this the right TV show? + r1 = gSaveBlock1.tvShows[gSpecialVar_0x8005].bravoTrainerTower.var18; + r4 = 1; + break; + case 13: + shared1000.unk9C7C = 0xFFFF; + shared1000.unk9C7E = -1; + r1 = &shared1000.unk9C7C; + break; + default: + return; + } + sub_80E62A0(gSpecialVar_0x8004, r1, sub_80546B8, r4); +} + +void sub_80E62A0(u8 a, u16 *b, void *c, u8 d) +{ + shared1000.unk0 = c; + shared1000.unk4 = b; + shared1000.unk8 = a; + shared1000.unkB = d; + if (a == 9) + { + shared1000.unk4 = &shared1000.unk9C7C; + shared1000.unk9C7C = gSaveBlock1.easyChatPairs[0].words[0]; + shared1000.unk9C7E = gSaveBlock1.easyChatPairs[0].words[1]; + } + SetMainCallback2(sub_80E62F8); +} + +void sub_80E62F8(void) +{ + switch (gMain.state) + { + case 0: + default: + REG_DISPCNT = 0; + SetVBlankCallback(0); + ResetPaletteFade(); + ResetSpriteData(); + dp12_8087EA4(); + remove_some_task(); + sub_80EAD08(); + sub_80895F8(gUnknown_083DB698); + FreeSpriteTileRanges(); + FreeAllSpritePalettes(); + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E6DA8); + break; + case 2: + InitMenuWindow(&gWindowConfig_81E6D54); + InitMenuWindow(&gWindowConfig_81E6DA8); + MenuZeroFillScreen(); + break; + case 3: + sub_80E6424(); + break; + case 4: + sub_80E8DD8(); + break; + case 5: + sub_80E8218(); + sub_80E8CEC(); + break; + case 6: + sub_80E69F8(); + sub_80E682C(sub_80E6AA8); + SetVBlankCallback(sub_80E6A6C); + break; + case 7: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + break; + case 8: + REG_DISPCNT = 0x1F40; + SetMainCallback2(sub_80E6A88); + FlagSet(FLAG_SYS_CHAT_USED); + break; + } + gMain.state++; +} + +void sub_80E6424(void) +{ + shared1000.unk9 = gUnknown_083DB6A4[shared1000.unk8]; + switch (shared1000.unk9) + { + case 4: + shared1000.unkA = 4; + shared1000.unk83 = 2; + shared1000.unk84 = 2; + shared1000.unk88 = 5; + shared1000.unk8A = 4; + break; + case 5: + shared1000.unkA = 4; + shared1000.unk83 = 1; + shared1000.unk84 = 4; + shared1000.unk88 = 16; + shared1000.unk8A = 2; + break; + case 0: + shared1000.unkA = 6; + shared1000.unk83 = 2; + shared1000.unk84 = 3; + shared1000.unk88 = 4; + shared1000.unk8A = 3; + break; + case 1: + shared1000.unkA = 9; + shared1000.unk83 = 2; + shared1000.unk84 = 5; + shared1000.unk88 = 4; + shared1000.unk8A = 0; + break; + case 2: + shared1000.unkA = 1; + shared1000.unk83 = 1; + shared1000.unk84 = 1; + shared1000.unk88 = 16; + shared1000.unk8A = 4; + break; + case 3: + shared1000.unkA = 2; + shared1000.unk83 = 2; + shared1000.unk84 = 1; + shared1000.unk88 = 5; + shared1000.unk8A = 3; + break; + } + shared1000.unk86 = 0; + shared1000.unk85 = 0; + shared1000.unk87 = 0; + shared1000.unk26 = 0; + shared1000.unk1BA = 0; + shared1000.unk1BE = 2; + sub_80E6554(); + sub_80EAECC(); + sub_80EB040(); + sub_80E7E50(); + sub_80E6630(); + sub_80E6690(); +} + +void sub_80E6554(void) +{ + u16 r4 = 0; + u16 r7; + u16 r5; + + for (r7 = 0; ; r7++) + { + for (r5 = 0; r5 < 2; r5++) + { + shared1000.unk2A[r7][r5] = r4++; + if (r4 == 17) + break; + } + if (r4 == 17) + break; + } + shared1000.unk28 = 17; + while (r4 < 22) + { + if (sub_80EAD7C(r4) != 0) + { + r5++; + if (r5 > 1) + { + r7++; + r5 = 0; + } + shared1000.unk2A[r7][r5] = r4; + shared1000.unk78[r4 - 17] = 1; // hmm... + shared1000.unk28++; + } + else + { + shared1000.unk78[r4 - 17] = 0; + } + r4++; + } + shared1000.unk1B6 = (shared1000.unk28 + 1) / 2; +} + +void sub_80E6630(void) +{ + u8 i; + u8 r3; + + for (i = 0; i < 4; i++) + { + const u8 *row = gUnknown_083DB6B2[i]; + + for (r3 = 0; row[r3] != EOS; r3++) + { + if (row[r3] != CHAR_SPACE) + shared1000.unk40[i][r3] = row[r3] + 0x46; + else + shared1000.unk40[i][r3] = CHAR_SPACE; + } + } +} + +void sub_80E6690(void) +{ + u8 *pointers[] = + { +#if ENGLISH + gSharedMem + 0xAC80, gSharedMem + 0xACC9, + gSharedMem + 0xAD12, gSharedMem + 0xAD5B, +#else + gSharedMem + 0xAFAC, gSharedMem + 0xAFF5, + gSharedMem + 0xB03E, gSharedMem + 0xB087, +#endif + }; + u8 *r3; + u16 i; + + for (i = 0; i < 2; i++) + { + const struct EasyChatPrompt *prompt = &gUnknown_083DB6F4[gUnknown_083DB7C0[shared1000.unk8][i]]; + + r3 = StringCopy(pointers[i * 2 + 0], prompt->text1); + if (prompt->unk8) + { + StringCopy(pointers[i * 2 + 1], prompt->text2); + } + else + { + *r3++ = CHAR_SPACE; + StringCopy(r3, prompt->text2); + *pointers[i * 2 + 1] = EOS; + } + } + + for (i = 0; i < 0x24; i++) + shared1000.unk9DA4[i] = 0; + shared1000.unk9DA4[i] = 0xFF; + + r3 = shared1000.unk9F6E; + r3[0] = EXT_CTRL_CODE_BEGIN; + r3[1] = 0x11; + r3[2] = 0xE0; + r3[3] = 0xFF; +} + +// Default profile phrase +const u16 gUnknown_083DB7EC[] = +{ +#if ENGLISH + EC_WORD_I_AM, + EC_WORD_A, + EC_WORD_POKEMON, + EC_WORD_GREAT, +#else + EC_WORD_I_AM, + EC_WORD_BIG, + EC_WORD_IN, + EC_WORD_POKEMON, +#endif +}; + +const u16 gUnknown_083DB7F4[] = +{ + EC_WORD_ARE, + EC_WORD_YOU, + EC_WORD_READY, + EC_WORD_QUES, + EC_WORD_HERE_I_COME, + EC_WORD_EXCL, +}; + +const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); + +// ResetDefaultEasyChatPhrases +void InitEasyChatPhrases(void) +{ + u16 i; + u16 j; + + for (i = 0; i < 4; i++) + gSaveBlock1.easyChats.unk2B1C[i] = gUnknown_083DB7EC[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1.easyChats.unk2B28[i] = gUnknown_083DB7F4[i]; + + for (i = 0; i < 6; i++) + { + gSaveBlock1.easyChats.unk2B34[i] = 0xFFFF; + gSaveBlock1.easyChats.unk2B40[i] = 0xFFFF; + } + + for (i = 0; i < 16; i++) + { + for (j = 0; j < 9; j++) + gSaveBlock1.mail[i].words[j] = 0xFFFF; + } + + for (i = 0; i < 64; i++) + gSaveBlock1.unk2D8C[i] = 0; +} + +void sub_80E682C(void (*func)(void)) +{ + shared1000.unk20 = func; + shared1000.unk24 = 0; +} + +void sub_80E683C(void) +{ + u16 i; + + if (shared1000.unk26 == 0) + { + for (i = 0; i < shared1000.unk1B6; i++) + shared1000.unk1AA[i] = 2; + shared1000.unk1AA[i - 1] = shared1000.unk28 % 2; + if (shared1000.unk1AA[i - 1] == 0) + shared1000.unk1AA[i - 1] = 2; + } + else + { + shared1000.unk1AA[0] = 7; + shared1000.unk1AA[1] = 6; + shared1000.unk1AA[2] = 7; + shared1000.unk1AA[3] = 7; + } + shared1000.unk1A8 = 0; + shared1000.unk1A9 = 0; + shared1000.unk1B5 = 0; + shared1000.unk1B7 = 0; + sub_80E9A4C(); +} + +void sub_80E68E8(void) +{ + sub_80EB0B0(); + if (shared1000.unk26 == 0) + { + u16 i; + u8 r6; + + r6 = shared1000.unk1B8; + shared1000.unk9A28 = (shared1000.unk4178[r6] + 1) / 2; + for (i = 0; i < shared1000.unk9A28; i++) + shared1000.unk99A6[i] = 2; + i--; + shared1000.unk99A6[i] = shared1000.unk4178[r6] % 2; + if (shared1000.unk99A6[i] == 0) + shared1000.unk99A6[i] = 2; + } + else + { + u16 i; + u8 r6; + + r6 = shared1000.unk1B8; + shared1000.unk9A28 = (shared1000.unk4142[r6] + 1) / 2; + for (i = 0; i < shared1000.unk9A28; i++) + shared1000.unk99A6[i] = 2; + i--; + shared1000.unk99A6[i] = shared1000.unk4142[r6] % 2; + if (shared1000.unk99A6[i] == 0) + shared1000.unk99A6[i] = 2; + } + shared1000.unk99A4 = 0; + shared1000.unk99A5 = 0; + shared1000.unk9A29 = 0; + sub_80E9A4C(); +} + +void sub_80E69F8(void) +{ + switch (shared1000.unk8) + { + case 0: + case 1: + case 2: + case 3: + case 4: + case 6: + case 9: + case 13: + default: + sub_80E9368(shared1000.unk8); + break; + case 5: + case 7: + case 8: + case 10: + case 11: + case 12: + sub_80E9368(shared1000.unk8); + sub_80E8BF4(shared1000.unkB, shared1000.unk9); + break; + } +} + +void sub_80E6A6C(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + sub_80EAC5C(); + TransferPlttBuffer(); + sub_8089668(); +} + +void sub_80E6A88(void) +{ + shared1000.unk20(); + AnimateSprites(); + BuildOamBuffer(); + sub_80EAD08(); +} + +void sub_80E6AA8(void) +{ + if (!UpdatePaletteFade()) + sub_80E682C(sub_80E6AC4); +} + +void sub_80E6AC4(void) +{ + sub_80E88F0(); + sub_80E8398(0); + sub_80E91D4(0); + sub_80E682C(sub_80E6AE4); +} diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index d2a5197a0..6c3c6c2b8 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "easy_chat.h" #include "pokemon.h" #include "pokemon_menu.h" #include "party_menu.h" @@ -53,7 +54,6 @@ extern u16 gUnknown_0202E8F8; extern void (*gUnknown_03004AE4)(u8 taskID, u16 itemID, TaskFunc func); extern TaskFunc gUnknown_03005CF0; -void sub_80E62A0(u8 arg0, struct MailStruct* arg1, void* arg2, u8 arg3); void sub_808A520(void); void sub_80A61D0(void); void CB2_InitFlyRegionMap(void); @@ -419,7 +419,7 @@ static void sub_808A180(u8 taskID) { u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL); DestroyTask(taskID); - sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808A520, 3); + sub_80E62A0(4, gSaveBlock1.mail[mailID].words, sub_808A520, 3); } } @@ -458,7 +458,7 @@ static void sub_808A2DC(u8 taskID) { u8 mailID = GetMonData(&gPlayerParty[sub_806CA38(taskID)], MON_DATA_MAIL); DestroyTask(taskID); - sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808A520, 3); + sub_80E62A0(4, gSaveBlock1.mail[mailID].words, sub_808A520, 3); } static void sub_808A330(u8 taskID) @@ -1095,7 +1095,7 @@ static void sub_808B338(u8 taskID) gLastFieldPokeMenuOpened = sub_806CA38(taskID); mailID = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_MAIL); DestroyTask(taskID); - sub_80E62A0(4, &gSaveBlock1.mail[mailID], sub_808B3EC, 3); + sub_80E62A0(4, gSaveBlock1.mail[mailID].words, sub_808B3EC, 3); } } diff --git a/sym_bss.txt b/sym_bss.txt index 6587c2c39..f6ee61fb7 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -25,7 +25,7 @@ .include "src/engine/record_mixing.o" .include "src/field/tv.o" .include "src/battle/battle_anim_80CA710.o" - .include "src/field/easy_chat.o" + .include "src/easy_chat.o" .include "src/pokenav_before.o" .include "src/field/mauville_man.o" .include "src/field/menu_helpers.o" -- cgit v1.2.3 From d50dcfcdd37aedab6352e4953cb2be04f2691113 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 2 Jan 2018 00:53:26 -0500 Subject: add no print support. --- include/assert.h | 14 +++++++++++++- src/libs/libisagbprn.c | 44 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/include/assert.h b/include/assert.h index 7a5e727e2..d724290fa 100755 --- a/include/assert.h +++ b/include/assert.h @@ -16,6 +16,16 @@ // without NOAGBPRN defined, this enables asserts for usage // on a standard GBA debugger unit or in emulators that // support it. + +// no$gba support, due to the different method no$gba uses to print debug strings. +// currently cannot use IsNoGba due to no$gba doing a gloriously fuck up of a job and +// breaking the version identifier. +#define AGBPrint(pBuf) \ +{ \ + NOGBAPrint(pBuf); \ + AGBPrint(pBuf); \ +} + void AGBPrintInit(void); void AGBPutc(const char pBuf); void AGBPrint(const char *pBuf); @@ -23,6 +33,9 @@ void AGBPrintFlush1Block(void); void AGBPrintFlush(void); void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); + // NOGBA PROTOTYPES FOR LIBISAGBPRN.C + bool32 IsNoGba(void); + void NOGBAPrint(const char *pBuf); #endif // when using AGB_WARNING, be sure to flush after as AGBAssert does not flush the string to console @@ -39,5 +52,4 @@ #define AGB_WARNING(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 0); #endif - #endif diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index 64ccb6351..9691d1b90 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -2,12 +2,17 @@ #include #include "gba/gba.h" #include "config.h" +#include "assert.h" #define AGB_PRINT_FLUSH_ADDR 0x9FE209D #define AGB_PRINT_STRUCT_ADDR 0x9FE20F8 #define AGB_PRINT_PROTECT_ADDR 0x9FE2FFE #define WSCNT_DATA (WAITCNT_PHI_OUT_16MHZ | WAITCNT_WS0_S_2 | WAITCNT_WS0_N_4) +// for auto no$gba support, the string "no$gba" should be at this address. +#define NOGBAIDADDR 0x4FFFA00 +#define NOGBAPRINTADDR 0x4FFFA14 + struct AGBPrintStruct { u16 m_nRequest; @@ -61,18 +66,29 @@ void AGBPutc(const char cChr) AGBPrintFlush1Block(); } +#undef AGBPrint // dont break the function + void AGBPrint(const char *pBuf) { - volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; - u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT; - u16 nOldWSCNT = *pWSCNT; - *pWSCNT = WSCNT_DATA; - while (*pBuf) - { - AGBPutc(*pBuf); - pBuf++; - } - *pWSCNT = nOldWSCNT; + volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; + u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT; + u16 nOldWSCNT = *pWSCNT; + *pWSCNT = WSCNT_DATA; + while (*pBuf) + { + AGBPutc(*pBuf); + pBuf++; + } + *pWSCNT = nOldWSCNT; +} + +// I have to define this twice to avoid messing AGBPrint up. If there's a better way of doing this, please fix it. +// currently cannot use IsNoGba due to no$gba doing a gloriously fuck up of a job and +// breaking the version identifier. +#define AGBPrint(pBuf) \ +{ \ + NOGBAPrint(pBuf); \ + AGBPrint(pBuf); \ } void AGBPrintf(const char *pBuf, ...) @@ -148,4 +164,12 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP AGBPrintf("WARING FILE=[%s] LINE=[%d] EXP=[%s] \n", pFile, nLine, pExpression); } } + +// nogba print function + +void NOGBAPrint(const char *pBuf) +{ + *(volatile u32*)NOGBAPRINTADDR = (u32)pBuf; +} + #endif -- cgit v1.2.3 From 6c5e0ef4d873ae89708b7ebc547f2243893359f4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 2 Jan 2018 00:54:56 -0500 Subject: remove function that doesn't exist anymore. --- include/assert.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/assert.h b/include/assert.h index d724290fa..5a134d7c9 100755 --- a/include/assert.h +++ b/include/assert.h @@ -33,8 +33,7 @@ void AGBPrintFlush1Block(void); void AGBPrintFlush(void); void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); - // NOGBA PROTOTYPES FOR LIBISAGBPRN.C - bool32 IsNoGba(void); + // NOGBA PROTOTYPE FOR LIBISAGBPRN.C void NOGBAPrint(const char *pBuf); #endif -- cgit v1.2.3 From ab06b56532026db85a9cba1c21c8b2235fcdf222 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 2 Jan 2018 00:56:11 -0500 Subject: formatting --- src/libs/libisagbprn.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index 9691d1b90..ef0d51f26 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -70,16 +70,16 @@ void AGBPutc(const char cChr) void AGBPrint(const char *pBuf) { - volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; - u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT; - u16 nOldWSCNT = *pWSCNT; - *pWSCNT = WSCNT_DATA; - while (*pBuf) - { - AGBPutc(*pBuf); - pBuf++; - } - *pWSCNT = nOldWSCNT; + volatile struct AGBPrintStruct *pPrint = (struct AGBPrintStruct *)AGB_PRINT_STRUCT_ADDR; + u16 *pWSCNT = (u16 *)REG_ADDR_WAITCNT; + u16 nOldWSCNT = *pWSCNT; + *pWSCNT = WSCNT_DATA; + while (*pBuf) + { + AGBPutc(*pBuf); + pBuf++; + } + *pWSCNT = nOldWSCNT; } // I have to define this twice to avoid messing AGBPrint up. If there's a better way of doing this, please fix it. -- cgit v1.2.3 From 865dcd79aab063eb90aef470e6ed54ba40a8c812 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 10:54:50 -0500 Subject: data through gUnknown_083ECE12 --- data/slot_machine.s | 44 ------------------------------ src/field/slot_machine.c | 71 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 54 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index 2811e5b5f..6caf29e42 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,50 +3,6 @@ .section .rodata - .align 1 -gUnknown_083ECCF8:: @ 83ECCF8 - .2byte 0, 6, 0, 10, 0, 2 - -gUnknown_083ECD04:: @ 83ECD04 - .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_083ECD16:: @ 83ECD16 - .byte 25, 25, 30, 40, 40, 50 - .byte 25, 25, 30, 30, 35, 35 - .byte 25, 25, 30, 25, 25, 30 - -gUnknown_083ECD28:: @ 83ECD28 - .byte 20, 25, 25, 20, 25, 25 - .byte 12, 15, 15, 18, 19, 22 - .byte 25, 25, 25, 30, 30, 40 - .byte 25, 25, 20, 20, 15, 15 - .byte 40, 40, 35, 35, 40, 40 - -gUnknown_083ECD46:: @ 83ECD46 - .byte -13, -13, -13, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5 - .byte 5, 5, 5,-106,-106,-106,-106,-126,-126,-126,-126,-126,-126, 100, 100, 100, 5 - .byte 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40 - .byte 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 45, 45, 45, 100 - .byte 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 5, 5, 100 - .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6 - -gUnknown_083ECDAC:: @ 83ECDAC - .byte -13, -13, -13, -56, -56, -56, -56, -96, -96, -96, -96, -96, -96, 70, 70, 70, 5 - .byte 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6 - .byte 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35 - .byte 2, 2, 2, 3, 3, 3, 3, 30, 30, 30, 30, 30, 30, 100, 100, 100, 50 - .byte 1, 1, 1, 2, 2, 2, 2, 30, 30, 30, 30, 30, 30, 40, 40, 40, 100 - .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60 - - .align 1 -gUnknown_083ECE12:: @ 83ECE12 - .2byte 128, 175, 200, 225, 256 - gUnknown_083ECE1C:: @ 83ECE1C .byte 10, 0, 5, 0, 10, 0, 10, 0, 10, 0, 15, 0, 10, 0, 25, 0, 10, 0, 35, 0 diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 594d743f1..3d68b187e 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -222,13 +222,13 @@ void sub_81064B8(void); void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); void sub_81065DC(void); -extern struct UnkStruct1 *gUnknown_083ED048[]; +extern const struct UnkStruct1 *gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; extern const u8 gSlotMachine_Gfx[]; extern const u16 gUnknown_08E95A18[]; -extern u16 gUnknown_08E95AB8[]; -extern u16 gUnknown_08E95FB8[]; -extern const u8 gUnknown_083ECD04[][3]; +extern const u16 gUnknown_08E95AB8[]; +extern const u16 gUnknown_08E95FB8[]; +const u8 gUnknown_083ECD04[][3]; extern const u8 gUnknown_083ECE3A[]; extern const u16 gUnknown_083ECE42[]; extern const u16 gUnknown_083ECE48[]; @@ -368,7 +368,7 @@ static void sub_8101B04(void) REG_BLDALPHA = 0x809; } -extern const s16 gUnknown_083ECCF8[3][2]; +const s16 gUnknown_083ECCF8[][2]; static void sub_8101BA4(void) { @@ -983,7 +983,7 @@ static bool8 sub_8102540(void) return FALSE; } -extern const u8 gUnknown_083ECD16[][6]; +const u8 gUnknown_083ECD16[][6]; static u8 sub_8102578(void) { @@ -1001,7 +1001,7 @@ static u8 sub_8102578(void) return i; } -extern const u8 gUnknown_083ECD28[][6]; +const u8 gUnknown_083ECD28[][6]; static u8 sub_81025BC(void) { @@ -1035,8 +1035,8 @@ static u8 sub_81025BC(void) return i; } -extern const u8 gUnknown_083ECDAC[][17]; -extern const u8 gUnknown_083ECD46[][17]; +const u8 gUnknown_083ECD46[][17]; +const u8 gUnknown_083ECDAC[][17]; u8 sub_810264C(u8 a0) { @@ -1069,7 +1069,7 @@ void sub_8102680(void) eSlotMachine->unk05 = i; } -extern const u16 gUnknown_083ECE12[]; +const u16 gUnknown_083ECE12[]; bool8 sub_81026DC(u16 a0) { @@ -4133,3 +4133,54 @@ const u8 gUnknown_083ECCB2[][21] = { const u8 gUnknown_083ECCF1[] = { 1, 0, 5, 4, 3, 2 }; + +const s16 gUnknown_083ECCF8[][2] = { + {0, 6}, + {0, 10}, + {0, 2} +}; + +const u8 gUnknown_083ECD04[][3] = { + {1, 1, 12}, + {1, 1, 14}, + {2, 2, 14}, + {2, 2, 14}, + {2, 3, 16}, + {3, 3, 16} +}; + +const u8 gUnknown_083ECD16[][6] = { + {25, 25, 30, 40, 40, 50}, + {25, 25, 30, 30, 35, 35}, + {25, 25, 30, 25, 25, 30} +}; + +const u8 gUnknown_083ECD28[][6] = { + {20, 25, 25, 20, 25, 25}, + {12, 15, 15, 18, 19, 22}, + {25, 25, 25, 30, 30, 40}, + {25, 25, 20, 20, 15, 15}, + {40, 40, 35, 35, 40, 40} +}; + +const u8 gUnknown_083ECD46[][17] = { + {243, 243, 243, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5}, + { 5, 5, 5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100, 5}, + { 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40}, + { 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 45, 45, 45, 100}, + { 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 5, 5, 100}, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6} +}; + +const u8 gUnknown_083ECDAC[][17] = { + { 243, 243, 243, 200, 200, 200, 200, 160, 160, 160, 160, 160, 160, 70, 70, 70, 5}, + { 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6}, + { 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35}, + { 2, 2, 2, 3, 3, 3, 3, 30, 30, 30, 30, 30, 30, 100, 100, 100, 50}, + { 1, 1, 1, 2, 2, 2, 2, 30, 30, 30, 30, 30, 30, 40, 40, 40, 100}, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60} +}; + +const u16 gUnknown_083ECE12[] = { + 0x80, 0xaf, 0xc8, 0xe1, 0x100 +}; -- cgit v1.2.3 From 8f0ea5f965251a6fc8097302b2dae3c8635ae569 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 11:52:15 -0500 Subject: data through gOamData_83ED0B8 --- data/slot_machine.s | 285 -------------------------------------- src/field/slot_machine.c | 349 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 338 insertions(+), 296 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index 6caf29e42..4f9629c49 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,291 +3,6 @@ .section .rodata -gUnknown_083ECE1C:: @ 83ECE1C - .byte 10, 0, 5, 0, 10, 0, 10, 0, 10, 0, 15, 0, 10, 0, 25, 0, 10, 0, 35, 0 - -gUnknown_083ECE30:: @ 83ECE30 - .byte 0, 0, 5, 0, 10, 0, 15, 0, 20, 0 - -gUnknown_083ECE3A:: @ 83ECE3A - .byte 6, 4, 3, 2, 5, 0, 0, 0 - -gUnknown_083ECE42:: @ 83ECE42 - .byte 0x80, 0 - .byte 0x20, 0 - .byte 0x40, 0 - -gUnknown_083ECE48:: @ 83ECE48 - .byte 0x10, 0 - .byte 0x08, 0 - .byte 0x04, 0 - .byte 0x02, 0 - .byte 0x01, 0 - -gUnknown_083ECE52:: @ 83ECE52 - .byte 7, 8, 4, 3, 0, 5, 2, 0 - - .align 1 -gUnknown_083ECE5A:: @ 83ECE5A - .2byte 1, 2, 4, 8, 16, 32, 64, 128, 256 - - .align 1 -gUnknown_083ECE6C:: @ 83ECE6C - .2byte 2, 4, 0, 6, 12, 3, 90, 300, 300 - - .align 1 -gUnknown_083ECE7E:: @ 83ECE7E - .2byte 208, 56 - .2byte 184, 0 - .2byte 200, 8 - .2byte 216, 16 - .2byte 232, 24 - .2byte 208, 72 - .2byte 208, 8 - .2byte 208, 64 - .2byte 208, 56 - .2byte 192, 88 - .2byte 224, 88 - .2byte 192, 120 - .2byte 224, 120 - .2byte 144, 56 - .2byte 272, 88 - .2byte 168, 112 - .2byte 208, 84 - .2byte 208, 112 - .2byte 188, 52 - .2byte 208, 52 - .2byte 228, 52 - .2byte 184, 72 - .2byte 196, 72 - .2byte 208, 72 - .2byte 220, 72 - .2byte 232, 72 - .2byte 188, 52 - .2byte 208, 52 - .2byte 228, 52 - .2byte 184, 72 - .2byte 196, 72 - .2byte 208, 72 - .2byte 220, 72 - .2byte 232, 72 - .2byte 0, 0 - - .align 2 -gUnknown_083ECF0C:: @ 83ECF0C - .4byte sub_8105C64 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F9C - .4byte sub_8105EB4 - .4byte sub_8105C64 - .4byte sub_8105C64 - .4byte sub_8105C6C - .4byte sub_8105CF0 - .4byte sub_8105D08 - .4byte sub_8105D20 - .4byte sub_8105D3C - .4byte sub_8105DA4 - .4byte sub_8105E08 - .4byte sub_8105C64 - .4byte sub_8106058 - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_8106230 - - .align 2 -Unknown_83ECF98: - .byte 25, 34 - .2byte 0 - .byte 2, 0 - .2byte 0 - .byte 9, 16 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFA8: - .byte 10, 1 - .2byte 0 - .byte 11, 2 - .2byte 0 - .byte 12, 3 - .2byte 0 - .byte 13, 4 - .2byte 0 - .byte 5, 5 - .2byte 0 - .byte 8, 6 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFC4: - .byte 3, 7 - .2byte 0 - .byte 8, 17 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFD0: - .byte 4, 8 - .2byte 0 - .byte 6, 9 - .2byte 0 - .byte 6, 10 - .2byte 1 - .byte 6, 11 - .2byte 2 - .byte 6, 12 - .2byte 3 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFE8: - .byte 0, 13 - .2byte 0 - .byte 1, 14 - .2byte 0 - .byte 7, 15 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFF8: - .byte 19, 26 - .2byte 0 - .byte 20, 27 - .2byte 1 - .byte 21, 28 - .2byte 2 - .byte 14, 29 - .2byte 3 - .byte 15, 30 - .2byte 4 - .byte 16, 31 - .2byte 5 - .byte 17, 32 - .2byte 6 - .byte 18, 33 - .2byte 7 - .byte 8, 17 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ED020: - .byte 22, 18 - .2byte 0 - .byte 23, 19 - .2byte 1 - .byte 24, 20 - .2byte 2 - .byte 14, 21 - .2byte 3 - .byte 15, 22 - .2byte 4 - .byte 16, 23 - .2byte 5 - .byte 17, 24 - .2byte 6 - .byte 18, 25 - .2byte 7 - .byte 8, 17 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -gUnknown_083ED048:: @ 83ED048 - .4byte Unknown_83ECF98 - .4byte Unknown_83ECFA8 - .4byte Unknown_83ECFC4 - .4byte Unknown_83ECFD0 - .4byte Unknown_83ECFE8 - .4byte Unknown_83ED020 - .4byte Unknown_83ECFF8 - - .align 2 -gUnknown_083ED064:: @ 83ED064 - .4byte sub_810639C - .4byte sub_8106364 - .4byte sub_8106370 - .4byte nullsub_70 - .4byte nullsub_70 - .4byte sub_8106370 - .4byte sub_8106370 - - .align 2 -gOamData_83ED080:: @ 83ED080 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_83ED088:: @ 83ED088 - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_83ED090:: @ 83ED090 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gOamData_83ED098:: @ 83ED098 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0A0:: @ 83ED0A0 - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0A8:: @ 83ED0A8 - .2byte 0x8000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0B0:: @ 83ED0B0 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0B8:: @ 83ED0B8 - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0000 - .align 2 gSpriteImageTable_83ED0C0:: @ 83ED0C0 obj_frame_tiles gSharedMem + 0x13200, 0x800 diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 3d68b187e..1e440cba8 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -222,16 +222,16 @@ void sub_81064B8(void); void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); void sub_81065DC(void); -extern const struct UnkStruct1 *gUnknown_083ED048[]; +const struct UnkStruct1 *const gUnknown_083ED048[]; extern const u16 gPalette_83EDE24[]; extern const u8 gSlotMachine_Gfx[]; extern const u16 gUnknown_08E95A18[]; extern const u16 gUnknown_08E95AB8[]; extern const u16 gUnknown_08E95FB8[]; const u8 gUnknown_083ECD04[][3]; -extern const u8 gUnknown_083ECE3A[]; -extern const u16 gUnknown_083ECE42[]; -extern const u16 gUnknown_083ECE48[]; +const u8 gUnknown_083ECE3A[]; +const u16 gUnknown_083ECE42[]; +const u16 gUnknown_083ECE48[]; void PlaySlotMachine(u8 arg0, void *ptr) { @@ -1081,8 +1081,8 @@ bool8 sub_81026DC(u16 a0) return FALSE; } -extern const u16 gUnknown_083ECE1C[][2]; -extern const u16 gUnknown_083ECE30[]; +const u16 gUnknown_083ECE1C[][2]; +const u16 gUnknown_083ECE30[]; u16 dp15_jump_random_unknown(void) { @@ -1134,8 +1134,8 @@ static void sub_81027A0(void) } } -extern const u16 gUnknown_083ECE6C[]; extern const u16 gUnknown_083ECE5A[]; +extern const u16 gUnknown_083ECE6C[]; static void sub_81027D0(void) { @@ -1219,7 +1219,7 @@ static void sub_810290C(void) } } -extern const u8 gUnknown_083ECE52[]; +const u8 gUnknown_083ECE52[]; static u8 sub_81029D4(u8 c1, u8 c2, u8 c3) { @@ -3037,7 +3037,7 @@ void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) } } -extern void (*const gUnknown_083ED064[])(void); +void (*const gUnknown_083ED064[])(void); void sub_8104DA4(void) { @@ -3562,8 +3562,8 @@ void sub_8105B88(u8 spriteId) DestroySprite(sprite); } -extern const SpriteCallback gUnknown_083ECF0C[]; -extern const s16 gUnknown_083ECE7E[][2]; +const s16 gUnknown_083ECE7E[][2]; +const SpriteCallback gUnknown_083ECF0C[]; u8 sub_8105BB4(u8 a0, u8 a1, s16 a2) { @@ -4184,3 +4184,330 @@ const u8 gUnknown_083ECDAC[][17] = { const u16 gUnknown_083ECE12[] = { 0x80, 0xaf, 0xc8, 0xe1, 0x100 }; + +const u16 gUnknown_083ECE1C[][2] = { + {10, 5}, + {10, 10}, + {10, 15}, + {10, 25}, + {10, 35} +}; + +const u16 gUnknown_083ECE30[] = { + 0, 5, 10, 15, 20 +}; + + +const u8 gUnknown_083ECE3A[] = { + 6, 4, 3, 2, 5, 0, 0, 0 +}; + +const u16 gUnknown_083ECE42[] = { + 0x80, 0x20, 0x40 +}; + +const u16 gUnknown_083ECE48[] = { + 0x10, 0x08, 0x04, 0x02, 0x01 +}; + +const u8 gUnknown_083ECE52[] = { + 7, 8, 4, 3, 0, 5, 2 +}; + +const u16 gUnknown_083ECE5A[] = { + 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x100 +}; + +const u16 gUnknown_083ECE6C[] = { + 2, 4, 0, 6, 12, 3, 90, 300, 300 +}; + +const s16 gUnknown_083ECE7E[][2] = { + { 0xd0, 0x38}, + { 0xb8, 0x00}, + { 0xc8, 0x08}, + { 0xd8, 0x10}, + { 0xe8, 0x18}, + { 0xd0, 0x48}, + { 0xd0, 0x08}, + { 0xd0, 0x40}, + { 0xd0, 0x38}, + { 0xc0, 0x58}, + { 0xe0, 0x58}, + { 0xc0, 0x78}, + { 0xe0, 0x78}, + { 0x90, 0x38}, + {0x110, 0x58}, + { 0xa8, 0x70}, + { 0xd0, 0x54}, + { 0xd0, 0x70}, + { 0xbc, 0x34}, + { 0xd0, 0x34}, + { 0xe4, 0x34}, + { 0xb8, 0x48}, + { 0xc4, 0x48}, + { 0xd0, 0x48}, + { 0xdc, 0x48}, + { 0xe8, 0x48}, + { 0xbc, 0x34}, + { 0xd0, 0x34}, + { 0xe4, 0x34}, + { 0xb8, 0x48}, + { 0xc4, 0x48}, + { 0xd0, 0x48}, + { 0xdc, 0x48}, + { 0xe8, 0x48}, + { 0x00, 0x00} +}; + +const SpriteCallback gUnknown_083ECF0C[] = { + sub_8105C64, + sub_8105F54, + sub_8105F54, + sub_8105F54, + sub_8105F54, + sub_8105F9C, + sub_8105EB4, + sub_8105C64, + sub_8105C64, + sub_8105C6C, + sub_8105CF0, + sub_8105D08, + sub_8105D20, + sub_8105D3C, + sub_8105DA4, + sub_8105E08, + sub_8105C64, + sub_8106058, + sub_81060FC, + sub_81060FC, + sub_81060FC, + sub_81060FC, + sub_81060FC, + sub_81060FC, + sub_81060FC, + sub_81060FC, + sub_81061C8, + sub_81061C8, + sub_81061C8, + sub_81061C8, + sub_81061C8, + sub_81061C8, + sub_81061C8, + sub_81061C8, + sub_8106230 +}; + +static const struct UnkStruct1 Unknown_83ECF98[] = { + {25, 34, 0}, + {2, 0, 0}, + {9, 16, 0}, + {255, 0, 0} +}; + +static const struct UnkStruct1 Unknown_83ECFA8[] = { + {10, 1, 0}, + {11, 2, 0}, + {12, 3, 0}, + {13, 4, 0}, + {5, 5, 0}, + {8, 6, 0}, + {255, 0, 0} +}; + +static const struct UnkStruct1 Unknown_83ECFC4[] = { + {3, 7, 0}, + {8, 17, 0}, + {255, 0, 0} +}; + +static const struct UnkStruct1 Unknown_83ECFD0[] = { + {4, 8, 0}, + {6, 9, 0}, + {6, 10, 1}, + {6, 11, 2}, + {6, 12, 3}, + {255, 0, 0} +}; + +static const struct UnkStruct1 Unknown_83ECFE8[] = { + {0, 13, 0}, + {1, 14, 0}, + {7, 15, 0}, + {255, 0, 0} +}; + +static const struct UnkStruct1 Unknown_83ECFF8[] = { + {19, 26, 0}, + {20, 27, 1}, + {21, 28, 2}, + {14, 29, 3}, + {15, 30, 4}, + {16, 31, 5}, + {17, 32, 6}, + {18, 33, 7}, + {8, 17, 0}, + {255, 0, 0} +}; + +static const struct UnkStruct1 Unknown_83ED020[] = { + {22, 18, 0}, + {23, 19, 1}, + {24, 20, 2}, + {14, 21, 3}, + {15, 22, 4}, + {16, 23, 5}, + {17, 24, 6}, + {18, 25, 7}, + {8, 17, 0}, + {255, 0, 0} +}; + +const struct UnkStruct1 *const gUnknown_083ED048[] = { + Unknown_83ECF98, + Unknown_83ECFA8, + Unknown_83ECFC4, + Unknown_83ECFD0, + Unknown_83ECFE8, + Unknown_83ED020, + Unknown_83ECFF8 +}; + +void (*const gUnknown_083ED064[])(void) = { + sub_810639C, + sub_8106364, + sub_8106370, + nullsub_70, + nullsub_70, + sub_8106370, + sub_8106370 +}; + + +const struct OamData gOamData_83ED080 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0x0, + .matrixNum = 0, + .size = 0, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; + +const struct OamData gOamData_83ED088 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_V_RECTANGLE, + .x = 0x0, + .matrixNum = 0, + .size = 0, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; + +const struct OamData gOamData_83ED090 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0x0, + .matrixNum = 0, + .size = 1, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; + +const struct OamData gOamData_83ED098 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_V_RECTANGLE, + .x = 0x0, + .matrixNum = 0, + .size = 2, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; + +const struct OamData gOamData_83ED0A0 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0x0, + .matrixNum = 0, + .size = 2, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; + +const struct OamData gOamData_83ED0A8 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_V_RECTANGLE, + .x = 0x0, + .matrixNum = 0, + .size = 3, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; + +const struct OamData gOamData_83ED0B0 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_H_RECTANGLE, + .x = 0x0, + .matrixNum = 0, + .size = 3, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; + +const struct OamData gOamData_83ED0B8 = { + .y = 0x0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = ST_OAM_SQUARE, + .x = 0x0, + .matrixNum = 0, + .size = 3, + .tileNum = 0x0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0 +}; -- cgit v1.2.3 From fb99fe5aa6d8f7a257ba5613b32f285bba7afabd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 12:05:43 -0500 Subject: data through gSpriteImageTable_83ED228 --- data/slot_machine.s | 127 --------------------------------------------- include/ewram.h | 1 + include/graphics.h | 17 +++++++ src/field/slot_machine.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 147 insertions(+), 128 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index 4f9629c49..ffc54f75e 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,133 +3,6 @@ .section .rodata - .align 2 -gSpriteImageTable_83ED0C0:: @ 83ED0C0 - obj_frame_tiles gSharedMem + 0x13200, 0x800 - obj_frame_tiles gSharedMem + 0x13A00, 0x800 - obj_frame_tiles gSharedMem + 0x14200, 0x800 - obj_frame_tiles gSharedMem + 0x14A00, 0x800 - obj_frame_tiles gSharedMem + 0x15200, 0x800 - - .align 2 -gSpriteImageTable_83ED0E8:: @ 83ED0E8 - obj_frame_tiles gSharedMem + 0x15A00, 0x300 - - .align 2 -gSpriteImageTable_83ED0F0:: @ 83ED0F0 - obj_frame_tiles gSharedMem + 0x15D00, 0x500 - - .align 2 -gSpriteImageTable_83ED0F8:: @ 83ED0F8 - obj_frame_tiles gSharedMem + 0x16200, 0x600 - - .align 2 -gSpriteImageTable_83ED100:: @ 83ED100 - obj_frame_tiles gSpriteImage_8E988E8, 0x80 - obj_frame_tiles gSpriteImage_8E98968, 0x80 - obj_frame_tiles gSpriteImage_8E989E8, 0x80 - obj_frame_tiles gSpriteImage_8E98A68, 0x80 - obj_frame_tiles gSpriteImage_8E98AE8, 0x80 - obj_frame_tiles gSpriteImage_8E98B68, 0x80 - - .align 2 -gSpriteImageTable_83ED130:: @ 83ED130 - obj_frame_tiles gSpriteImage_8E991E8, 0x200 - - .align 2 -gSpriteImageTable_83ED138:: @ 83ED138 - obj_frame_tiles gSpriteImage_8E99808, 0x40 - - .align 2 -gSpriteImageTable_83ED140:: @ 83ED140 - obj_frame_tiles gSpriteImage_8E98BE8, 0x100 - obj_frame_tiles gSpriteImage_8E98CE8, 0x100 - - .align 2 -gSpriteImageTable_83ED150:: @ 83ED150 - obj_frame_tiles gSpriteImage_8E993E8, 0x400 - - .align 2 -gSpriteImageTable_83ED158:: @ 83ED158 - obj_frame_tiles gSpriteImage_8E98DE8, 0x200 - obj_frame_tiles gSpriteImage_8E98FE8, 0x200 - - .align 2 -gSpriteImageTable_83ED168:: @ 83ED168 - obj_frame_tiles gSpriteImage_8E98848, 0x20 - - .align 2 -gSpriteImageTable_83ED170:: @ 83ED170 - obj_frame_tiles gSpriteImage_8E98868, 0x80 - - .align 2 -gSpriteImageTable_83ED178:: @ 83ED178 - obj_frame_tiles gSharedMem + 0x10000, 0x600 - - .align 2 -gSpriteImageTable_83ED180:: @ 83ED180 - obj_frame_tiles gSharedMem + 0x10600, 0x200 - - .align 2 -gSpriteImageTable_83ED188:: @ 83ED188 - obj_frame_tiles gSharedMem + 0x10800, 0x200 - - .align 2 -gSpriteImageTable_83ED190:: @ 83ED190 - obj_frame_tiles gSharedMem + 0x10A00, 0x200 - - .align 2 -gSpriteImageTable_83ED198:: @ 83ED198 - obj_frame_tiles gSharedMem + 0x10C00, 0x300 - - .align 2 -gSpriteImageTable_83ED1A0:: @ 83ED1A0 - obj_frame_tiles gSharedMem + 0x11000, 0x400 - - .align 2 -gSpriteImageTable_83ED1A8:: @ 83ED1A8 - obj_frame_tiles gSharedMem + 0x11400, 0x200 - - .align 2 -gSpriteImageTable_83ED1B0:: @ 83ED1B0 - obj_frame_tiles gSharedMem + 0x11600, 0x300 - - .align 2 -gSpriteImageTable_83ED1B8:: @ 83ED1B8 - obj_frame_tiles gSharedMem + 0x11900, 0x300 - - .align 2 -gSpriteImageTable_83ED1C0:: @ 83ED1C0 - obj_frame_tiles gSharedMem + 0x11C00, 0x200 - obj_frame_tiles gSharedMem + 0x11E00, 0x200 - obj_frame_tiles gSharedMem + 0x11E00, 0x200 @ is this a typo? - - .align 2 -gSpriteImageTable_83ED1D8:: @ 83ED1D8 - obj_frame_tiles gSharedMem + 0x12000, 0x280 - - .align 2 -gSpriteImageTable_83ED1E0:: @ 83ED1E0 - obj_frame_tiles gSharedMem + 0x12280, 0x80 - obj_frame_tiles gSharedMem + 0x12300, 0x80 - obj_frame_tiles gSharedMem + 0x12380, 0x80 - obj_frame_tiles gSharedMem + 0x12400, 0x80 - obj_frame_tiles gSharedMem + 0x12480, 0x80 - - .align 2 -gSpriteImageTable_83ED208:: @ 83ED208 - obj_frame_tiles gSharedMem + 0x12600, 0x480 - obj_frame_tiles gSharedMem + 0x12A80, 0x480 - - .align 2 -gSpriteImageTable_83ED218:: @ 83ED218 - obj_frame_tiles gSharedMem + 0x12F00, 0x180 - obj_frame_tiles gSharedMem + 0x13080, 0x180 - - .align 2 -gSpriteImageTable_83ED228:: @ 83ED228 - obj_frame_tiles gSpriteImage_8E98828, 0x20 - .align 2 gSpriteAnim_83ED230:: @ 83ED230 obj_image_anim_frame 0, 1 diff --git a/include/ewram.h b/include/ewram.h index 9d3002615..7b480a0e8 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -78,6 +78,7 @@ extern u8 gSharedMem[]; #define ewram12000 (&gSharedMem[0x12000]) #define ewram12800 (&gSharedMem[0x12800]) #define ewram13000 (&gSharedMem[0x13000]) +#define ewram13200 (&gSharedMem[0x13200]) #define ewram13800 (&gSharedMem[0x13800]) #define EWRAM_14000 ((u8 *)(gSharedMem + 0x14000)) #define ewram14000 (&gSharedMem[0x14000]) diff --git a/include/graphics.h b/include/graphics.h index 488de07c0..9db35862c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2656,4 +2656,21 @@ extern const u8 gNamingScreenRightPointingTriangleTiles[]; extern const u8 gNamingScreenUnderscoreTiles[]; extern const u16 gNamingScreenPalettes[][16]; +extern const u8 gSpriteImage_8E988E8[]; +extern const u8 gSpriteImage_8E98968[]; +extern const u8 gSpriteImage_8E989E8[]; +extern const u8 gSpriteImage_8E98A68[]; +extern const u8 gSpriteImage_8E98AE8[]; +extern const u8 gSpriteImage_8E98B68[]; +extern const u8 gSpriteImage_8E991E8[]; +extern const u8 gSpriteImage_8E99808[]; +extern const u8 gSpriteImage_8E98BE8[]; +extern const u8 gSpriteImage_8E98CE8[]; +extern const u8 gSpriteImage_8E993E8[]; +extern const u8 gSpriteImage_8E98DE8[]; +extern const u8 gSpriteImage_8E98FE8[]; +extern const u8 gSpriteImage_8E98848[]; +extern const u8 gSpriteImage_8E98868[]; +extern const u8 gSpriteImage_8E98828[]; + #endif // GUARD_GRAPHICS_H diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 1e440cba8..43eb6e53a 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -10,6 +10,7 @@ #include "slot_machine.h" #include "decompress.h" #include "trig.h" +#include "graphics.h" #include "palette.h" #include "task.h" #include "util.h" @@ -4017,7 +4018,7 @@ void sub_81063C0(void) { sub_8106404(); LZDecompressWram(gSlotMachineReelTimeLights_Gfx, ewram10000); - LZDecompressWram(gUnknown_083EDE8C, ewram10000 + 0x3200); + LZDecompressWram(gUnknown_083EDE8C, ewram13200); LoadSpriteSheets(gUnknown_083EDC2C); LoadSpritePalettes(gSlotMachineSpritePalettes); } @@ -4511,3 +4512,130 @@ const struct OamData gOamData_83ED0B8 = { .paletteNum = 0, .affineParam = 0 }; + +const struct SpriteFrameImage gSpriteImageTable_83ED0C0[] = { + {ewram13200 + 0x0000, 0x800}, + {ewram13200 + 0x0800, 0x800}, + {ewram13200 + 0x1000, 0x800}, + {ewram13200 + 0x1800, 0x800}, + {ewram13200 + 0x2000, 0x800} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED0E8[] = { + {ewram13200 + 0x2800, 0x300} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED0F0[] = { + {ewram13200 + 0x2B00, 0x500} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED0F8[] = { + {ewram13200 + 0x3000, 0x600} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED100[] = { + {gSpriteImage_8E988E8, 0x80}, + {gSpriteImage_8E98968, 0x80}, + {gSpriteImage_8E989E8, 0x80}, + {gSpriteImage_8E98A68, 0x80}, + {gSpriteImage_8E98AE8, 0x80}, + {gSpriteImage_8E98B68, 0x80} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED130[] = { + {gSpriteImage_8E991E8, 0x200} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED138[] = { + {gSpriteImage_8E99808, 0x40} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED140[] = { + {gSpriteImage_8E98BE8, 0x100}, + {gSpriteImage_8E98CE8, 0x100} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED150[] = { + {gSpriteImage_8E993E8, 0x400} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED158[] = { + {gSpriteImage_8E98DE8, 0x200}, + {gSpriteImage_8E98FE8, 0x200} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED168[] = { + {gSpriteImage_8E98848, 0x20} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED170[] = { + {gSpriteImage_8E98868, 0x80} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED178[] = { + {ewram10000 + 0x0000, 0x600} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED180[] = { + {ewram10000 + 0x0600, 0x200} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED188[] = { + {ewram10000 + 0x0800, 0x200} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED190[] = { + {ewram10000 + 0x0A00, 0x200} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED198[] = { + {ewram10000 + 0x0C00, 0x300} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED1A0[] = { + {ewram10000 + 0x1000, 0x400} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED1A8[] = { + {ewram10000 + 0x1400, 0x200} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED1B0[] = { + {ewram10000 + 0x1600, 0x300} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED1B8[] = { + {ewram10000 + 0x1900, 0x300} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED1C0[] = { + {ewram10000 + 0x1C00, 0x200}, + {ewram10000 + 0x1E00, 0x200}, + {ewram10000 + 0x1E00, 0x200} // is this a typo? +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED1D8[] = { + {ewram10000 + 0x2000, 0x280} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED1E0[] = { + {ewram10000 + 0x2280, 0x80}, + {ewram10000 + 0x2300, 0x80}, + {ewram10000 + 0x2380, 0x80}, + {ewram10000 + 0x2400, 0x80}, + {ewram10000 + 0x2480, 0x80} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED208[] = { + {ewram10000 + 0x2600, 0x480}, + {ewram10000 + 0x2A80, 0x480} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED218[] = { + {ewram10000 + 0x2F00, 0x180}, + {ewram10000 + 0x3080, 0x180} +}; + +const struct SpriteFrameImage gSpriteImageTable_83ED228[] = { + {gSpriteImage_8E98828, 0x20} +}; -- cgit v1.2.3 From e6f56f2936bfe98da65514291bf9ee6412190b31 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 12:17:54 -0500 Subject: data through gSpriteTemplate_83ED6CC --- data/slot_machine.s | 346 ---------------------------------------------- src/field/slot_machine.c | 347 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 347 insertions(+), 346 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index ffc54f75e..ef1459851 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,352 +3,6 @@ .section .rodata - .align 2 -gSpriteAnim_83ED230:: @ 83ED230 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED238:: @ 83ED238 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED240:: @ 83ED240 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED248:: @ 83ED248 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED254:: @ 83ED254 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED260:: @ 83ED260 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED26C:: @ 83ED26C - obj_image_anim_frame 2, 32 - obj_image_anim_frame 3, 32 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED278:: @ 83ED278 - obj_image_anim_frame 4, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED280:: @ 83ED280 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED288:: @ 83ED288 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED290:: @ 83ED290 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED298:: @ 83ED298 - obj_image_anim_frame 3, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2A0:: @ 83ED2A0 - obj_image_anim_frame 4, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2A8:: @ 83ED2A8 - obj_image_anim_frame 5, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2B0:: @ 83ED2B0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2BC:: @ 83ED2BC - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2C8:: @ 83ED2C8 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2D4:: @ 83ED2D4 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2DC:: @ 83ED2DC - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2E8:: @ 83ED2E8 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2FC:: @ 83ED2FC - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED304:: @ 83ED304 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED30C:: @ 83ED30C - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED314:: @ 83ED314 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED31C:: @ 83ED31C - obj_image_anim_frame 3, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED324:: @ 83ED324 - obj_image_anim_frame 4, 1 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83ED32C:: @ 83ED32C - .4byte gSpriteAnim_83ED230 - - .align 2 -gSpriteAnimTable_83ED330:: @ 83ED330 - .4byte gSpriteAnim_83ED238 - - .align 2 -gSpriteAnimTable_83ED334:: @ 83ED334 - .4byte gSpriteAnim_83ED240 - .4byte gSpriteAnim_83ED248 - .4byte gSpriteAnim_83ED254 - .4byte gSpriteAnim_83ED260 - .4byte gSpriteAnim_83ED26C - .4byte gSpriteAnim_83ED278 - - .align 2 -gSpriteAnimTable_83ED34C:: @ 83ED34C - .4byte gSpriteAnim_83ED280 - .4byte gSpriteAnim_83ED288 - .4byte gSpriteAnim_83ED290 - .4byte gSpriteAnim_83ED298 - .4byte gSpriteAnim_83ED2A0 - .4byte gSpriteAnim_83ED2A8 - - .align 2 -gSpriteAnimTable_83ED364:: @ 83ED364 - .4byte gSpriteAnim_83ED2B0 - - .align 2 -gSpriteAnimTable_83ED368:: @ 83ED368 - .4byte gSpriteAnim_83ED2BC - - .align 2 -gSpriteAnimTable_83ED36C:: @ 83ED36C - .4byte gSpriteAnim_83ED2C8 - .4byte gSpriteAnim_83ED2D4 - - .align 2 -gSpriteAnimTable_83ED374:: @ 83ED374 - .4byte gSpriteAnim_83ED2DC - - .align 2 -gSpriteAnimTable_83ED378:: @ 83ED378 - .4byte gSpriteAnim_83ED2E8 - .4byte gSpriteAnim_83ED2FC - - .align 2 -gSpriteAnimTable_83ED380:: @ 83ED380 - .4byte gSpriteAnim_83ED304 - .4byte gSpriteAnim_83ED30C - .4byte gSpriteAnim_83ED314 - .4byte gSpriteAnim_83ED31C - .4byte gSpriteAnim_83ED324 - - .align 2 -gSpriteAffineAnim_83ED394:: @ 83ED394 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 0x1, 0x1, 0, 1 - obj_rot_scal_anim_loop 255 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83ED3BC:: @ 83ED3BC - .4byte gSpriteAffineAnim_83ED394 - - .align 2 -gSpriteAffineAnim_83ED3C0:: @ 83ED3C0 - obj_rot_scal_anim_frame 0x0, 0x0, 8, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 6, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 4, 16 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_frame 0x0, 0x0, -12, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_frame 0x0, 0x0, -12, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83ED410:: @ 83ED410 - .4byte gSpriteAffineAnim_83ED3C0 - - .align 2 -gSpriteTemplate_83ED414:: @ 83ED414 - spr_template 0, 0, gOamData_83ED0A0, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_8104F18 - - .align 2 -gSpriteTemplate_83ED42C:: @ 83ED42C - spr_template 7, 4, gOamData_83ED088, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_810506C - - .align 2 -gSpriteTemplate_83ED444:: @ 83ED444 - spr_template 17, 0, gOamData_83ED0B8, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED45C:: @ 83ED45C - spr_template 0xFFFF, 1, gOamData_83ED0B8, gSpriteAnimTable_83ED334, gSpriteImageTable_83ED0C0, gDummySpriteAffineAnimTable, sub_8105170 - - .align 2 -gSpriteTemplate_83ED474:: @ 83ED474 - spr_template 0xFFFF, 2, gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0E8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED48C:: @ 83ED48C - spr_template 0xFFFF, 3, gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED4A4:: @ 83ED4A4 - spr_template 0xFFFF, 3, gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED4BC:: @ 83ED4BC - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED34C, gSpriteImageTable_83ED100, gDummySpriteAffineAnimTable, sub_810535C - - .align 2 -gSpriteTemplate_83ED4D4:: @ 83ED4D4 - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED130, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED4EC:: @ 83ED4EC - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED138, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED504:: @ 83ED504 - spr_template 0xFFFF, 4, gOamData_83ED098, gSpriteAnimTable_83ED364, gSpriteImageTable_83ED140, gDummySpriteAffineAnimTable, sub_810562C - - .align 2 -gSpriteTemplate_83ED51C:: @ 83ED51C - spr_template 0xFFFF, 7, gOamData_83ED0A8, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED150, gDummySpriteAffineAnimTable, sub_8105784 - - .align 2 -gSpriteTemplate_83ED534:: @ 83ED534 - spr_template 0xFFFF, 5, gOamData_83ED0A0, gSpriteAnimTable_83ED368, gSpriteImageTable_83ED158, gDummySpriteAffineAnimTable, sub_8105894 - - .align 2 -gSpriteTemplate_83ED54C:: @ 83ED54C - spr_template 0xFFFF, 4, gOamData_83ED080, gSpriteAnimTable_83ED330, gSpriteImageTable_83ED168, gDummySpriteAffineAnimTable, sub_810594C - - .align 2 -gSpriteTemplate_83ED564:: @ 83ED564 - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED170, gSpriteAffineAnimTable_83ED3BC, sub_8105A38 - - .align 2 -gSpriteTemplate_83ED57C:: @ 83ED57C - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED178, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED594:: @ 83ED594 - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED180, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5AC:: @ 83ED5AC - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED188, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5C4:: @ 83ED5C4 - spr_template 18, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED190, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5DC:: @ 83ED5DC - spr_template 0xFFFF, 6, gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED198, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5F4:: @ 83ED5F4 - spr_template 0xFFFF, 6, gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED60C:: @ 83ED60C - spr_template 19, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED624:: @ 83ED624 - spr_template 20, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED63C:: @ 83ED63C - spr_template 21, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED654:: @ 83ED654 - spr_template 0xFFFF, 6, gOamData_83ED0A0, gSpriteAnimTable_83ED36C, gSpriteImageTable_83ED1C0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED66C:: @ 83ED66C - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1D8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED684:: @ 83ED684 - spr_template 0xFFFF, 6, gOamData_83ED090, gSpriteAnimTable_83ED380, gSpriteImageTable_83ED1E0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED69C:: @ 83ED69C - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED378, gSpriteImageTable_83ED208, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED6B4:: @ 83ED6B4 - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED374, gSpriteImageTable_83ED218, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED6CC:: @ 83ED6CC - spr_template 0xFFFF, 4, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70 - .align 2 gSubspriteTable_83ED6E4:: @ 83ED6E4 subsprite -64, -64, 3, 0, 64x64 diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 43eb6e53a..493db1fa1 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -4639,3 +4639,350 @@ const struct SpriteFrameImage gSpriteImageTable_83ED218[] = { const struct SpriteFrameImage gSpriteImageTable_83ED228[] = { {gSpriteImage_8E98828, 0x20} }; + +const union AnimCmd gSpriteAnim_83ED230[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED238[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED240[] = { + ANIMCMD_FRAME(0, 16), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED248[] = { + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED254[] = { + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED260[] = { + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED26C[] = { + ANIMCMD_FRAME(2, 32), + ANIMCMD_FRAME(3, 32), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED278[] = { + ANIMCMD_FRAME(4, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED280[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED288[] = { + ANIMCMD_FRAME(1, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED290[] = { + ANIMCMD_FRAME(2, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED298[] = { + ANIMCMD_FRAME(3, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED2A0[] = { + ANIMCMD_FRAME(4, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED2A8[] = { + ANIMCMD_FRAME(5, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED2B0[] = { + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED2BC[] = { + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED2C8[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED2D4[] = { + ANIMCMD_FRAME(1, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED2DC[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED2E8[] = { + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83ED2FC[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED304[] = { + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED30C[] = { + ANIMCMD_FRAME(1, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED314[] = { + ANIMCMD_FRAME(2, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED31C[] = { + ANIMCMD_FRAME(3, 1), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83ED324[] = { + ANIMCMD_FRAME(4, 1), + ANIMCMD_END +}; + +const union AnimCmd *const gSpriteAnimTable_83ED32C[] = { + gSpriteAnim_83ED230 +}; + +const union AnimCmd *const gSpriteAnimTable_83ED330[] = { + gSpriteAnim_83ED238 +}; + +const union AnimCmd *const gSpriteAnimTable_83ED334[] = { + gSpriteAnim_83ED240, + gSpriteAnim_83ED248, + gSpriteAnim_83ED254, + gSpriteAnim_83ED260, + gSpriteAnim_83ED26C, + gSpriteAnim_83ED278 +}; + +const union AnimCmd *const gSpriteAnimTable_83ED34C[] = { + gSpriteAnim_83ED280, + gSpriteAnim_83ED288, + gSpriteAnim_83ED290, + gSpriteAnim_83ED298, + gSpriteAnim_83ED2A0, + gSpriteAnim_83ED2A8 +}; + +const union AnimCmd *const gSpriteAnimTable_83ED364[] = { + gSpriteAnim_83ED2B0 +}; + +const union AnimCmd *const gSpriteAnimTable_83ED368[] = { + gSpriteAnim_83ED2BC +}; + +const union AnimCmd *const gSpriteAnimTable_83ED36C[] = { + gSpriteAnim_83ED2C8, + gSpriteAnim_83ED2D4 +}; + +const union AnimCmd *const gSpriteAnimTable_83ED374[] = { + gSpriteAnim_83ED2DC +}; + +const union AnimCmd *const gSpriteAnimTable_83ED378[] = { + gSpriteAnim_83ED2E8, + gSpriteAnim_83ED2FC +}; + +const union AnimCmd *const gSpriteAnimTable_83ED380[] = { + gSpriteAnim_83ED304, + gSpriteAnim_83ED30C, + gSpriteAnim_83ED314, + gSpriteAnim_83ED31C, + gSpriteAnim_83ED324 +}; + +const union AffineAnimCmd gSpriteAffineAnim_83ED394[] = { + AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), + AFFINEANIMCMD_LOOP(0), + AFFINEANIMCMD_FRAME(0x1, 0x1, 0, 1), + AFFINEANIMCMD_LOOP(255), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_83ED3BC[] = { + gSpriteAffineAnim_83ED394 +}; + +const union AffineAnimCmd gSpriteAffineAnim_83ED3C0[] = { + AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 32), + AFFINEANIMCMD_FRAME(0x0, 0x0, 6, 32), + AFFINEANIMCMD_FRAME(0x0, 0x0, 4, 16), + AFFINEANIMCMD_FRAME(0x0, 0x0, 12, 2), + AFFINEANIMCMD_FRAME(0x0, 0x0, -12, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 12, 2), + AFFINEANIMCMD_FRAME(0x0, 0x0, 12, 2), + AFFINEANIMCMD_FRAME(0x0, 0x0, -12, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 12, 2), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_83ED410[] = { + gSpriteAffineAnim_83ED3C0 +}; + +const struct SpriteTemplate gSpriteTemplate_83ED414 = { + 0, 0, &gOamData_83ED0A0, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_8104F18 +}; + +const struct SpriteTemplate gSpriteTemplate_83ED42C = { + 7, 4, &gOamData_83ED088, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_810506C +}; + +const struct SpriteTemplate gSpriteTemplate_83ED444 = { + 17, 0, &gOamData_83ED0B8, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED45C = { + 0xFFFF, 1, &gOamData_83ED0B8, gSpriteAnimTable_83ED334, gSpriteImageTable_83ED0C0, gDummySpriteAffineAnimTable, sub_8105170 +}; + +const struct SpriteTemplate gSpriteTemplate_83ED474 = { + 0xFFFF, 2, &gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0E8, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED48C = { + 0xFFFF, 3, &gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F0, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED4A4 = { + 0xFFFF, 3, &gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F8, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED4BC = { + 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED34C, gSpriteImageTable_83ED100, gDummySpriteAffineAnimTable, sub_810535C +}; + +const struct SpriteTemplate gSpriteTemplate_83ED4D4 = { + 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED130, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED4EC = { + 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED138, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED504 = { + 0xFFFF, 4, &gOamData_83ED098, gSpriteAnimTable_83ED364, gSpriteImageTable_83ED140, gDummySpriteAffineAnimTable, sub_810562C +}; + +const struct SpriteTemplate gSpriteTemplate_83ED51C = { + 0xFFFF, 7, &gOamData_83ED0A8, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED150, gDummySpriteAffineAnimTable, sub_8105784 +}; + +const struct SpriteTemplate gSpriteTemplate_83ED534 = { + 0xFFFF, 5, &gOamData_83ED0A0, gSpriteAnimTable_83ED368, gSpriteImageTable_83ED158, gDummySpriteAffineAnimTable, sub_8105894 +}; + +const struct SpriteTemplate gSpriteTemplate_83ED54C = { + 0xFFFF, 4, &gOamData_83ED080, gSpriteAnimTable_83ED330, gSpriteImageTable_83ED168, gDummySpriteAffineAnimTable, sub_810594C +}; + +const struct SpriteTemplate gSpriteTemplate_83ED564 = { + 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED170, gSpriteAffineAnimTable_83ED3BC, sub_8105A38 +}; + +const struct SpriteTemplate gSpriteTemplate_83ED57C = { + 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED178, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED594 = { + 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED180, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED5AC = { + 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED188, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED5C4 = { + 18, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED190, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED5DC = { + 0xFFFF, 6, &gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED198, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED5F4 = { + 0xFFFF, 6, &gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A0, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED60C = { + 19, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A8, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED624 = { + 20, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B0, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED63C = { + 21, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B8, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED654 = { + 0xFFFF, 6, &gOamData_83ED0A0, gSpriteAnimTable_83ED36C, gSpriteImageTable_83ED1C0, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED66C = { + 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1D8, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED684 = { + 0xFFFF, 6, &gOamData_83ED090, gSpriteAnimTable_83ED380, gSpriteImageTable_83ED1E0, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED69C = { + 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED378, gSpriteImageTable_83ED208, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED6B4 = { + 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED374, gSpriteImageTable_83ED218, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct SpriteTemplate gSpriteTemplate_83ED6CC = { + 0xFFFF, 4, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70 +}; + -- cgit v1.2.3 From d1b6882fb2ddad468a1dfd19493b0bada58d6103 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 12:36:14 -0500 Subject: data through gSubspriteTables_83EDB54 --- data/slot_machine.s | 320 ---------------------------------------------- src/field/slot_machine.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 321 insertions(+), 320 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index ef1459851..391bdf05d 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,326 +3,6 @@ .section .rodata - .align 2 -gSubspriteTable_83ED6E4:: @ 83ED6E4 - subsprite -64, -64, 3, 0, 64x64 - subsprite 0, -64, 3, 0, 64x64 - subsprite -64, 0, 3, 0, 64x64 - subsprite 0, 0, 3, 0, 64x64 - - .align 2 -gSubspriteTables_83ED704:: @ 83ED704 - .4byte 4, gSubspriteTable_83ED6E4 - - .align 2 -gSubspriteTable_83ED70C:: @ 83ED70C - 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 - - .align 2 -gSubspriteTables_83ED73C:: @ 83ED73C - .4byte 6, gSubspriteTable_83ED70C - - .align 2 -gSubspriteTable_83ED744:: @ 83ED744 - subsprite -32, -20, 1, 0, 64x32 - subsprite -32, 12, 1, 32, 32x8 - subsprite 0, 12, 1, 36, 32x8 - - .align 2 -gSubspriteTables_83ED75C:: @ 83ED75C - .4byte 3, gSubspriteTable_83ED744 - - .align 2 -gSubspriteTable_83ED764:: @ 83ED764 - 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 - - .align 2 -gSubspriteTables_83ED78C:: @ 83ED78C - .4byte 5, gSubspriteTable_83ED764 - - .align 2 -gSubspriteTable_83ED794:: @ 83ED794 - subsprite -32, -8, 1, 0, 32x8 - subsprite 0, -8, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 32x8 - subsprite 0, 0, 1, 12, 32x8 - - .align 2 -gSubspriteTables_83ED7B4:: @ 83ED7B4 - .4byte 4, gSubspriteTable_83ED794 - - .align 2 -gSubspriteTable_83ED7BC:: @ 83ED7BC - subsprite -8, -12, 1, 0, 16x8 - subsprite -8, -4, 1, 0, 16x8 - subsprite -8, 4, 1, 0, 16x8 - - .align 2 -gSubspriteTables_83ED7D4:: @ 83ED7D4 - .4byte 3, gSubspriteTable_83ED7BC - - .align 2 -gSubspriteTable_83ED7DC:: @ 83ED7DC - 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 - - .align 2 -gSubspriteTables_83ED804:: @ 83ED804 - .4byte 5, gSubspriteTable_83ED7DC - - .align 2 -gSubspriteTable_83ED80C:: @ 83ED80C - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 - - .align 2 -gSubspriteTables_83ED82C:: @ 83ED82C - .4byte 4, gSubspriteTable_83ED80C - - .align 2 -gSubspriteTable_83ED834:: @ 83ED834 - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 - - .align 2 -gSubspriteTables_83ED854:: @ 83ED854 - .4byte 4, gSubspriteTable_83ED834 - - .align 2 -gSubspriteTable_83ED85C:: @ 83ED85C - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 - - .align 2 -gSubspriteTables_83ED87C:: @ 83ED87C - .4byte 4, gSubspriteTable_83ED85C - - .align 2 -gSubspriteTable_83ED884:: @ 83ED884 - 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 - - .align 2 -gSubspriteTables_83ED8B4:: @ 83ED8B4 - .4byte 6, gSubspriteTable_83ED884 - - .align 2 -gSubspriteTable_83ED8BC:: @ 83ED8BC - subsprite -16, -16, 3, 0, 32x32 - - .align 2 -gSubspriteTable_83ED8C4:: @ 83ED8C4 - subsprite -8, -8, 3, 16, 16x16 - - .align 2 -gSubspriteTables_83ED8CC:: @ 83ED8CC - .4byte 1, gSubspriteTable_83ED8BC - .4byte 1, gSubspriteTable_83ED8C4 - - .align 2 -gSubspriteTable_83ED8DC:: @ 83ED8DC - 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 - - .align 2 -gSubspriteTables_83ED93C:: @ 83ED93C - .4byte 12, gSubspriteTable_83ED8DC - - .align 2 -gSubspriteTable_83ED944:: @ 83ED944 - subsprite -16, -12, 3, 0, 32x16 - subsprite -16, 4, 3, 8, 16x8 - subsprite 0, 4, 3, 10, 16x8 - - .align 2 -gSubspriteTables_83ED95C:: @ 83ED95C - .4byte 3, gSubspriteTable_83ED944 - - .align 2 -gSubspriteTable_83ED964:: @ 83ED964 - subsprite -8, -8, 3, 0, 16x8 - subsprite -8, 0, 3, 8, 16x8 - - .align 2 -gSubspriteTables_83ED974:: @ 83ED974 - .4byte 2, gSubspriteTable_83ED964 - - .align 2 -gSubspriteTable_83ED97C:: @ 83ED97C - subsprite -8, -8, 3, 2, 16x8 - subsprite -8, 0, 3, 10, 16x8 - - .align 2 -gSubspriteTables_83ED98C:: @ 83ED98C - .4byte 2, gSubspriteTable_83ED97C - - .align 2 -gSubspriteTable_83ED994:: @ 83ED994 - subsprite -8, -8, 3, 4, 16x8 - subsprite -8, 0, 3, 12, 16x8 - - .align 2 -gSubspriteTables_83ED9A4:: @ 83ED9A4 - .4byte 2, gSubspriteTable_83ED994 - - .align 2 -gSubspriteTable_83ED9AC:: @ 83ED9AC - subsprite -8, -8, 3, 6, 16x8 - subsprite -8, 0, 3, 14, 16x8 - - .align 2 -gSubspriteTables_83ED9BC:: @ 83ED9BC - .4byte 2, gSubspriteTable_83ED9AC - - .align 2 -gSubspriteTable_83ED9C4:: @ 83ED9C4 - subsprite -8, -8, 3, 0, 16x8 - subsprite -8, 0, 3, 8, 16x8 - - .align 2 -gSubspriteTables_83ED9D4:: @ 83ED9D4 - .4byte 2, gSubspriteTable_83ED9C4 - - .align 2 -gSubspriteTable_83ED9DC:: @ 83ED9DC - subsprite -4, -8, 3, 2, 8x8 - subsprite -4, 0, 3, 10, 8x8 - - .align 2 -gSubspriteTables_83ED9EC:: @ 83ED9EC - .4byte 2, gSubspriteTable_83ED9DC - - .align 2 -gSubspriteTable_83ED9F4:: @ 83ED9F4 - subsprite -8, -8, 3, 3, 16x8 - subsprite -8, 0, 3, 11, 16x8 - - .align 2 -gSubspriteTables_83EDA04:: @ 83EDA04 - .4byte 2, gSubspriteTable_83ED9F4 - - .align 2 -gSubspriteTable_83EDA0C:: @ 83EDA0C - subsprite -4, -8, 3, 5, 8x8 - subsprite -4, 0, 3, 13, 8x8 - - .align 2 -gSubspriteTables_83EDA1C:: @ 83EDA1C - .4byte 2, gSubspriteTable_83EDA0C - - .align 2 -gSubspriteTable_83EDA24:: @ 83EDA24 - subsprite -8, -8, 3, 6, 16x8 - subsprite -8, 0, 3, 14, 16x8 - - .align 2 -gSubspriteTables_83EDA34:: @ 83EDA34 - .4byte 2, gSubspriteTable_83EDA24 - - .align 2 -gSubspriteTable_83EDA3C:: @ 83EDA3C - 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 - - .align 2 -gSubspriteTables_83EDA6C:: @ 83EDA6C - .4byte 6, gSubspriteTable_83EDA3C - - .align 2 -gSubspriteTable_83EDA74:: @ 83EDA74 - subsprite -8, -12, 3, 3, 16x8 - subsprite -8, -4, 3, 11, 16x8 - subsprite -8, 4, 3, 19, 16x8 - - .align 2 -gSubspriteTables_83EDA8C:: @ 83EDA8C - .4byte 3, gSubspriteTable_83EDA74 - - .align 2 -gSubspriteTable_83EDA94:: @ 83EDA94 - 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 - - .align 2 -gSubspriteTables_83EDAC4:: @ 83EDAC4 - .4byte 6, gSubspriteTable_83EDA94 - - .align 2 -gSubspriteTable_83EDACC:: @ 83EDACC - 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 - - .align 2 -gSubspriteTables_83EDAFC:: @ 83EDAFC - .4byte 6, gSubspriteTable_83EDACC - - .align 2 -gSubspriteTable_83EDB04:: @ 83EDB04 - subsprite -8, -12, 3, 3, 16x8 - subsprite -8, -4, 3, 11, 16x8 - subsprite -8, 4, 3, 19, 16x8 - - .align 2 -gSubspriteTables_83EDB1C:: @ 83EDB1C - .4byte 3, gSubspriteTable_83EDB04 - - .align 2 -gSubspriteTable_83EDB24:: @ 83EDB24 - 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 - - .align 2 -gSubspriteTables_83EDB54:: @ 83EDB54 - .4byte 6, gSubspriteTable_83EDB24 - .align 2 gUnknown_083EDB5C:: @ 83EDB5C .4byte gSpriteTemplate_83ED57C diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 493db1fa1..bff4e6a96 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -4986,3 +4986,324 @@ const struct SpriteTemplate gSpriteTemplate_83ED6CC = { 0xFFFF, 4, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70 }; +const struct Subsprite gSubspriteTable_83ED6E4[] = { + {-64, -64, ST_OAM_SQUARE, 3, 0x0, 3}, + {0, -64, ST_OAM_SQUARE, 3, 0x0, 3}, + {-64, 0, ST_OAM_SQUARE, 3, 0x0, 3}, + {0, 0, ST_OAM_SQUARE, 3, 0x0, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED704[] = { + {4, gSubspriteTable_83ED6E4} +}; + +const struct Subsprite gSubspriteTable_83ED70C[] = { + {-32, -12, ST_OAM_H_RECTANGLE, 1, 0x0, 1}, + {0, -12, ST_OAM_H_RECTANGLE, 1, 0x4, 1}, + {-32, -4, ST_OAM_H_RECTANGLE, 1, 0x8, 1}, + {0, -4, ST_OAM_H_RECTANGLE, 1, 0xc, 1}, + {-32, 4, ST_OAM_H_RECTANGLE, 1, 0x10, 1}, + {0, 4, ST_OAM_H_RECTANGLE, 1, 0x14, 1} +}; + +const struct SubspriteTable gSubspriteTables_83ED73C[] = { + {6, gSubspriteTable_83ED70C} +}; + +const struct Subsprite gSubspriteTable_83ED744[] = { + {-32, -20, ST_OAM_H_RECTANGLE, 3, 0x0, 1}, + {-32, 12, ST_OAM_H_RECTANGLE, 1, 0x20, 1}, + {0, 12, ST_OAM_H_RECTANGLE, 1, 0x24, 1} +}; + +const struct SubspriteTable gSubspriteTables_83ED75C[] = { + {3, gSubspriteTable_83ED744} +}; + +const struct Subsprite gSubspriteTable_83ED764[] = { + {-32, -24, ST_OAM_H_RECTANGLE, 3, 0x0, 1}, + {-32, 8, ST_OAM_H_RECTANGLE, 1, 0x20, 1}, + {0, 8, ST_OAM_H_RECTANGLE, 1, 0x24, 1}, + {-32, 16, ST_OAM_H_RECTANGLE, 1, 0x28, 1}, + {0, 16, ST_OAM_H_RECTANGLE, 1, 0x2c, 1} +}; + +const struct SubspriteTable gSubspriteTables_83ED78C[] = { + {5, gSubspriteTable_83ED764} +}; + +const struct Subsprite gSubspriteTable_83ED794[] = { + {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 1}, + {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 1}, + {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 1}, + {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 1} +}; + +const struct SubspriteTable gSubspriteTables_83ED7B4[] = { + {4, gSubspriteTable_83ED794} +}; + +const struct Subsprite gSubspriteTable_83ED7BC[] = { + {-8, -12, ST_OAM_H_RECTANGLE, 0, 0x0, 1}, + {-8, -4, ST_OAM_H_RECTANGLE, 0, 0x0, 1}, + {-8, 4, ST_OAM_H_RECTANGLE, 0, 0x0, 1} +}; + +const struct SubspriteTable gSubspriteTables_83ED7D4[] = { + {3, gSubspriteTable_83ED7BC} +}; + +const struct Subsprite gSubspriteTable_83ED7DC[] = { + {-32, -24, ST_OAM_H_RECTANGLE, 3, 0x0, 3}, + {-32, 8, ST_OAM_H_RECTANGLE, 1, 0x20, 3}, + {0, 8, ST_OAM_H_RECTANGLE, 1, 0x24, 3}, + {-32, 16, ST_OAM_H_RECTANGLE, 1, 0x28, 3}, + {0, 16, ST_OAM_H_RECTANGLE, 1, 0x2c, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED804[] = { + {5, gSubspriteTable_83ED7DC} +}; + +const struct Subsprite gSubspriteTable_83ED80C[] = { + {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, + {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, + {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, + {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED82C[] = { + {4, gSubspriteTable_83ED80C} +}; + +const struct Subsprite gSubspriteTable_83ED834[] = { + {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, + {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, + {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, + {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED854[] = { + {4, gSubspriteTable_83ED834} +}; + +const struct Subsprite gSubspriteTable_83ED85C[] = { + {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, + {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, + {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, + {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED87C[] = { + {4, gSubspriteTable_83ED85C} +}; + +const struct Subsprite gSubspriteTable_83ED884[] = { + {-32, -12, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, + {0, -12, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, + {-32, -4, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, + {0, -4, ST_OAM_H_RECTANGLE, 1, 0xc, 3}, + {-32, 4, ST_OAM_H_RECTANGLE, 1, 0x10, 3}, + {0, 4, ST_OAM_H_RECTANGLE, 1, 0x14, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED8B4[] = { + {6, gSubspriteTable_83ED884} +}; + +const struct Subsprite gSubspriteTable_83ED8BC[] = { + {-16, -16, ST_OAM_SQUARE, 2, 0x0, 3} +}; + +const struct Subsprite gSubspriteTable_83ED8C4[] = { + {-8, -8, ST_OAM_SQUARE, 1, 0x10, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED8CC[] = { + {1, gSubspriteTable_83ED8BC}, + {1, gSubspriteTable_83ED8C4} +}; + +const struct Subsprite gSubspriteTable_83ED8DC[] = { + {-24, -24, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, + {8, -24, ST_OAM_H_RECTANGLE, 0, 0x4, 3}, + {-24, -16, ST_OAM_H_RECTANGLE, 1, 0x6, 3}, + {8, -16, ST_OAM_H_RECTANGLE, 0, 0xa, 3}, + {-24, -8, ST_OAM_H_RECTANGLE, 1, 0xc, 3}, + {8, -8, ST_OAM_H_RECTANGLE, 0, 0x10, 3}, + {-24, 0, ST_OAM_H_RECTANGLE, 1, 0x12, 3}, + {8, 0, ST_OAM_H_RECTANGLE, 0, 0x16, 3}, + {-24, 8, ST_OAM_H_RECTANGLE, 1, 0x18, 3}, + {8, 8, ST_OAM_H_RECTANGLE, 0, 0x1c, 3}, + {-24, 16, ST_OAM_H_RECTANGLE, 1, 0x1e, 3}, + {8, 16, ST_OAM_H_RECTANGLE, 0, 0x22, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED93C[] = { + 12, gSubspriteTable_83ED8DC +}; + +const struct Subsprite gSubspriteTable_83ED944[] = { + {-16, -12, ST_OAM_H_RECTANGLE, 2, 0x0, 3}, + {-16, 4, ST_OAM_H_RECTANGLE, 0, 0x8, 3}, + {0, 4, ST_OAM_H_RECTANGLE, 0, 0xa, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED95C[] = { + {3, gSubspriteTable_83ED944} +}; + +const struct Subsprite gSubspriteTable_83ED964[] = { + {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, + {-8, 0, ST_OAM_H_RECTANGLE, 0, 0x8, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED974[] = { + {2, gSubspriteTable_83ED964} +}; + +const struct Subsprite gSubspriteTable_83ED97C[] = { + {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x2, 3}, + {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xa, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED98C[] = { + {2, gSubspriteTable_83ED97C} +}; + +const struct Subsprite gSubspriteTable_83ED994[] = { + {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x4, 3}, + {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xc, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED9A4[] = { + {2, gSubspriteTable_83ED994} +}; + +const struct Subsprite gSubspriteTable_83ED9AC[] = { + {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x6, 3}, + {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xe, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED9BC[] = { + {2, gSubspriteTable_83ED9AC} +}; + +const struct Subsprite gSubspriteTable_83ED9C4[] = { + {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, + {-8, 0, ST_OAM_H_RECTANGLE, 0, 0x8, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED9D4[] = { + {2, gSubspriteTable_83ED9C4} +}; + +const struct Subsprite gSubspriteTable_83ED9DC[] = { + {-4, -8, ST_OAM_SQUARE, 0, 0x2, 3}, + {-4, 0, ST_OAM_SQUARE, 0, 0xa, 3} +}; + +const struct SubspriteTable gSubspriteTables_83ED9EC[] = { + {2, gSubspriteTable_83ED9DC} +}; + +const struct Subsprite gSubspriteTable_83ED9F4[] = { + {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x3, 3}, + {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xb, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDA04[] = { + {2, gSubspriteTable_83ED9F4} +}; + +const struct Subsprite gSubspriteTable_83EDA0C[] = { + {-4, -8, ST_OAM_SQUARE, 0, 0x5, 3}, + {-4, 0, ST_OAM_SQUARE, 0, 0xd, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDA1C[] = { + {2, gSubspriteTable_83EDA0C} +}; + +const struct Subsprite gSubspriteTable_83EDA24[] = { + {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x6, 3}, + {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xe, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDA34[] = { + {2, gSubspriteTable_83EDA24} +}; + +const struct Subsprite gSubspriteTable_83EDA3C[] = { + {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, + {4, -12, ST_OAM_SQUARE, 0, 0x2, 3}, + {-12, -4, ST_OAM_H_RECTANGLE, 0, 0x8, 3}, + {4, -4, ST_OAM_SQUARE, 0, 0xa, 3}, + {-12, 4, ST_OAM_H_RECTANGLE, 0, 0x10, 3}, + {4, 4, ST_OAM_SQUARE, 0, 0x12, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDA6C[] = { + {6, gSubspriteTable_83EDA3C} +}; + +const struct Subsprite gSubspriteTable_83EDA74[] = { + {-8, -12, ST_OAM_H_RECTANGLE, 0, 0x3, 3}, + {-8, -4, ST_OAM_H_RECTANGLE, 0, 0xb, 3}, + {-8, 4, ST_OAM_H_RECTANGLE, 0, 0x13, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDA8C[] = { + {3, gSubspriteTable_83EDA74} +}; + +const struct Subsprite gSubspriteTable_83EDA94[] = { + {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x5, 3}, + {4, -12, ST_OAM_SQUARE, 0, 0x7, 3}, + {-12, -4, ST_OAM_H_RECTANGLE, 0, 0xd, 3}, + {4, -4, ST_OAM_SQUARE, 0, 0xf, 3}, + {-12, 4, ST_OAM_H_RECTANGLE, 0, 0x15, 3}, + {4, 4, ST_OAM_SQUARE, 0, 0x17, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDAC4[] = { + {6, gSubspriteTable_83EDA94} +}; + +const struct Subsprite gSubspriteTable_83EDACC[] = { + {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, + {4, -12, ST_OAM_SQUARE, 0, 0x2, 3}, + {-12, -4, ST_OAM_H_RECTANGLE, 0, 0x8, 3}, + {4, -4, ST_OAM_SQUARE, 0, 0xa, 3}, + {-12, 4, ST_OAM_H_RECTANGLE, 0, 0x10, 3}, + {4, 4, ST_OAM_SQUARE, 0, 0x12, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDAFC[] = { + {6, gSubspriteTable_83EDACC} +}; + +const struct Subsprite gSubspriteTable_83EDB04[] = { + {-8, -12, ST_OAM_H_RECTANGLE, 0, 0x3, 3}, + {-8, -4, ST_OAM_H_RECTANGLE, 0, 0xb, 3}, + {-8, 4, ST_OAM_H_RECTANGLE, 0, 0x13, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDB1C[] = { + {3, gSubspriteTable_83EDB04} +}; + +const struct Subsprite gSubspriteTable_83EDB24[] = { + {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x5, 3}, + {4, -12, ST_OAM_SQUARE, 0, 0x7, 3}, + {-12, -4, ST_OAM_H_RECTANGLE, 0, 0xd, 3}, + {4, -4, ST_OAM_SQUARE, 0, 0xf, 3}, + {-12, 4, ST_OAM_H_RECTANGLE, 0, 0x15, 3}, + {4, 4, ST_OAM_SQUARE, 0, 0x17, 3} +}; + +const struct SubspriteTable gSubspriteTables_83EDB54[] = { + {6, gSubspriteTable_83EDB24} +}; + + -- cgit v1.2.3 From bda69f398560a99fbaef0cb885a25323ca3b51cd Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 2 Jan 2018 11:59:23 -0600 Subject: don't build easy_chat_before.c in German for now --- src/easy_chat_before.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index 7af22df53..469583779 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -1,3 +1,6 @@ +// TODO: Integrate German code into this +#if ENGLISH + #include "global.h" #include "constants/easy_chat.h" #include "constants/species.h" @@ -682,3 +685,5 @@ void sub_80E6AC4(void) sub_80E91D4(0); sub_80E682C(sub_80E6AE4); } + +#endif -- cgit v1.2.3 From aee62a5b2487845921a1e6c3c3f08475cc7ae2ea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 15:08:57 -0500 Subject: data through gUnknown_083EDD08 --- data/slot_machine.s | 106 -------------------------------------------- include/graphics.h | 18 ++++++++ src/field/slot_machine.c | 112 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 125 insertions(+), 111 deletions(-) diff --git a/data/slot_machine.s b/data/slot_machine.s index 391bdf05d..23d2b8a74 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,112 +3,6 @@ .section .rodata - .align 2 -gUnknown_083EDB5C:: @ 83EDB5C - .4byte gSpriteTemplate_83ED57C - .4byte gSpriteTemplate_83ED594 - .4byte gSpriteTemplate_83ED5AC - .4byte gSpriteTemplate_83ED5DC - .4byte gSpriteTemplate_83ED5F4 - .4byte gSpriteTemplate_83ED654 - .4byte gSpriteTemplate_83ED66C - .4byte gSpriteTemplate_83ED684 - .4byte gSpriteTemplate_83ED69C - .4byte gSpriteTemplate_83ED6B4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED624 - .4byte gSpriteTemplate_83ED624 - .4byte gSpriteTemplate_83ED624 - .4byte gSpriteTemplate_83ED63C - .4byte gSpriteTemplate_83ED63C - .4byte gSpriteTemplate_83ED63C - .4byte gDummySpriteTemplate - - .align 2 -gUnknown_083EDBC4:: @ 83EDBC4 - .4byte gSubspriteTables_83ED804 - .4byte gSubspriteTables_83ED82C - .4byte gSubspriteTables_83ED854 - .4byte gSubspriteTables_83ED8B4 - .4byte NULL - .4byte NULL - .4byte gSubspriteTables_83ED8CC - .4byte NULL - .4byte gSubspriteTables_83ED93C - .4byte gSubspriteTables_83ED95C - .4byte gSubspriteTables_83ED974 - .4byte gSubspriteTables_83ED98C - .4byte gSubspriteTables_83ED9A4 - .4byte gSubspriteTables_83ED9BC - .4byte gSubspriteTables_83ED9D4 - .4byte gSubspriteTables_83ED9EC - .4byte gSubspriteTables_83EDA04 - .4byte gSubspriteTables_83EDA1C - .4byte gSubspriteTables_83EDA34 - .4byte gSubspriteTables_83EDA6C - .4byte gSubspriteTables_83EDA8C - .4byte gSubspriteTables_83EDAC4 - .4byte gSubspriteTables_83EDAFC - .4byte gSubspriteTables_83EDB1C - .4byte gSubspriteTables_83EDB54 - .4byte NULL - - .align 2 -gUnknown_083EDC2C:: @ 83EDC2C - obj_tiles gSlotMachineReelSymbol1Tiles, 0x200, 0 - obj_tiles gSlotMachineReelSymbol2Tiles, 0x200, 1 - obj_tiles gSlotMachineReelSymbol3Tiles, 0x200, 2 - obj_tiles gSlotMachineReelSymbol4Tiles, 0x200, 3 - obj_tiles gSlotMachineReelSymbol5Tiles, 0x200, 4 - obj_tiles gSlotMachineReelSymbol6Tiles, 0x200, 5 - obj_tiles gSlotMachineReelSymbol7Tiles, 0x200, 6 - obj_tiles gSlotMachineNumber0Tiles, 0x40, 7 - obj_tiles gSlotMachineNumber1Tiles, 0x40, 8 - obj_tiles gSlotMachineNumber2Tiles, 0x40, 9 - obj_tiles gSlotMachineNumber3Tiles, 0x40, 10 - obj_tiles gSlotMachineNumber4Tiles, 0x40, 11 - obj_tiles gSlotMachineNumber5Tiles, 0x40, 12 - obj_tiles gSlotMachineNumber6Tiles, 0x40, 13 - obj_tiles gSlotMachineNumber7Tiles, 0x40, 14 - obj_tiles gSlotMachineNumber8Tiles, 0x40, 15 - obj_tiles gSlotMachineNumber9Tiles, 0x40, 16 - obj_tiles gSharedMem + 0x10A00, 0x200, 18 - obj_tiles gSharedMem + 0x11400, 0x200, 19 - obj_tiles gSharedMem + 0x11600, 0x300, 20 - obj_tiles gSharedMem + 0x11900, 0x300, 21 - null_obj_tiles - - .align 2 -gUnknown_083EDCDC:: @ 83EDCDC - obj_tiles gSharedMem + 0x10000, 2048, 0x0011 - - .align 2 -gUnknown_083EDCE4:: @ 83EDCE4 - .4byte gUnknownPalette_08E997E8 - -UnknownPalette_83EDCE8: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDD40.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDCE8.gbapal" - .endif - - .align 2 -gUnknown_083EDD08:: @ 83EDD08 - .4byte UnknownPalette_83EDCE8 + 10 * 2 - .4byte UnknownPalette_83EDCE8 + 11 * 2 - .4byte UnknownPalette_83EDCE8 + 12 * 2 - .4byte UnknownPalette_83EDCE8 + 13 * 2 - .4byte UnknownPalette_83EDCE8 + 14 * 2 - .align 2 gUnknown_083EDD1C:: @ 83EDD1C .4byte gUnknown_08E95A18 + 148 diff --git a/include/graphics.h b/include/graphics.h index 9db35862c..5f19b09cb 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2672,5 +2672,23 @@ extern const u8 gSpriteImage_8E98FE8[]; extern const u8 gSpriteImage_8E98848[]; extern const u8 gSpriteImage_8E98868[]; extern const u8 gSpriteImage_8E98828[]; +extern const u8 gSlotMachineReelSymbol1Tiles[]; +extern const u8 gSlotMachineReelSymbol2Tiles[]; +extern const u8 gSlotMachineReelSymbol3Tiles[]; +extern const u8 gSlotMachineReelSymbol4Tiles[]; +extern const u8 gSlotMachineReelSymbol5Tiles[]; +extern const u8 gSlotMachineReelSymbol6Tiles[]; +extern const u8 gSlotMachineReelSymbol7Tiles[]; +extern const u8 gSlotMachineNumber0Tiles[]; +extern const u8 gSlotMachineNumber1Tiles[]; +extern const u8 gSlotMachineNumber2Tiles[]; +extern const u8 gSlotMachineNumber3Tiles[]; +extern const u8 gSlotMachineNumber4Tiles[]; +extern const u8 gSlotMachineNumber5Tiles[]; +extern const u8 gSlotMachineNumber6Tiles[]; +extern const u8 gSlotMachineNumber7Tiles[]; +extern const u8 gSlotMachineNumber8Tiles[]; +extern const u8 gSlotMachineNumber9Tiles[]; +extern const u8 gUnknownPalette_08E997E8[]; #endif // GUARD_GRAPHICS_H diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index bff4e6a96..4aa6af742 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -3571,8 +3571,8 @@ u8 sub_8105BB4(u8 a0, u8 a1, s16 a2) return sub_8105BF8(a0, gUnknown_083ECF0C[a1], gUnknown_083ECE7E[a1][0], gUnknown_083ECE7E[a1][1], a2); } -extern const struct SpriteTemplate *gUnknown_083EDB5C[]; -extern const struct SubspriteTable *gUnknown_083EDBC4[]; +const struct SpriteTemplate *const gUnknown_083EDB5C[]; +const struct SubspriteTable *const gUnknown_083EDBC4[]; u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) { @@ -4011,7 +4011,7 @@ void sub_810639C(void) extern const u8 gSlotMachineReelTimeLights_Gfx[]; extern const u8 gUnknown_083EDE8C[]; -extern const struct SpriteSheet gUnknown_083EDC2C[]; +const struct SpriteSheet gUnknown_083EDC2C[]; extern const struct SpritePalette gSlotMachineSpritePalettes[]; void sub_81063C0(void) @@ -4023,8 +4023,8 @@ void sub_81063C0(void) LoadSpritePalettes(gSlotMachineSpritePalettes); } -extern const u8 *gUnknown_083EDCE4; -extern const struct SpriteSheet gUnknown_083EDCDC; +const u8 *const gUnknown_083EDCE4; +const struct SpriteSheet gUnknown_083EDCDC; void sub_8106404(void) { @@ -5306,4 +5306,106 @@ const struct SubspriteTable gSubspriteTables_83EDB54[] = { {6, gSubspriteTable_83EDB24} }; +const struct SpriteTemplate *const gUnknown_083EDB5C[] = { + &gSpriteTemplate_83ED57C, + &gSpriteTemplate_83ED594, + &gSpriteTemplate_83ED5AC, + &gSpriteTemplate_83ED5DC, + &gSpriteTemplate_83ED5F4, + &gSpriteTemplate_83ED654, + &gSpriteTemplate_83ED66C, + &gSpriteTemplate_83ED684, + &gSpriteTemplate_83ED69C, + &gSpriteTemplate_83ED6B4, + &gSpriteTemplate_83ED5C4, + &gSpriteTemplate_83ED5C4, + &gSpriteTemplate_83ED5C4, + &gSpriteTemplate_83ED5C4, + &gSpriteTemplate_83ED60C, + &gSpriteTemplate_83ED60C, + &gSpriteTemplate_83ED60C, + &gSpriteTemplate_83ED60C, + &gSpriteTemplate_83ED60C, + &gSpriteTemplate_83ED624, + &gSpriteTemplate_83ED624, + &gSpriteTemplate_83ED624, + &gSpriteTemplate_83ED63C, + &gSpriteTemplate_83ED63C, + &gSpriteTemplate_83ED63C, + &gDummySpriteTemplate +}; + +const struct SubspriteTable *const gUnknown_083EDBC4[] = { + gSubspriteTables_83ED804, + gSubspriteTables_83ED82C, + gSubspriteTables_83ED854, + gSubspriteTables_83ED8B4, + NULL, + NULL, + gSubspriteTables_83ED8CC, + NULL, + gSubspriteTables_83ED93C, + gSubspriteTables_83ED95C, + gSubspriteTables_83ED974, + gSubspriteTables_83ED98C, + gSubspriteTables_83ED9A4, + gSubspriteTables_83ED9BC, + gSubspriteTables_83ED9D4, + gSubspriteTables_83ED9EC, + gSubspriteTables_83EDA04, + gSubspriteTables_83EDA1C, + gSubspriteTables_83EDA34, + gSubspriteTables_83EDA6C, + gSubspriteTables_83EDA8C, + gSubspriteTables_83EDAC4, + gSubspriteTables_83EDAFC, + gSubspriteTables_83EDB1C, + gSubspriteTables_83EDB54, + NULL +}; + +const struct SpriteSheet gUnknown_083EDC2C[] = { + {gSlotMachineReelSymbol1Tiles, 0x200, 0}, + {gSlotMachineReelSymbol2Tiles, 0x200, 1}, + {gSlotMachineReelSymbol3Tiles, 0x200, 2}, + {gSlotMachineReelSymbol4Tiles, 0x200, 3}, + {gSlotMachineReelSymbol5Tiles, 0x200, 4}, + {gSlotMachineReelSymbol6Tiles, 0x200, 5}, + {gSlotMachineReelSymbol7Tiles, 0x200, 6}, + {gSlotMachineNumber0Tiles, 0x40, 7}, + {gSlotMachineNumber1Tiles, 0x40, 8}, + {gSlotMachineNumber2Tiles, 0x40, 9}, + {gSlotMachineNumber3Tiles, 0x40, 10}, + {gSlotMachineNumber4Tiles, 0x40, 11}, + {gSlotMachineNumber5Tiles, 0x40, 12}, + {gSlotMachineNumber6Tiles, 0x40, 13}, + {gSlotMachineNumber7Tiles, 0x40, 14}, + {gSlotMachineNumber8Tiles, 0x40, 15}, + {gSlotMachineNumber9Tiles, 0x40, 16}, + {ewram10000 + 0x0A00, 0x200, 18}, + {ewram10000 + 0x1400, 0x200, 19}, + {ewram10000 + 0x1600, 0x300, 20}, + {ewram10000 + 0x1900, 0x300, 21}, + {} +}; + +const struct SpriteSheet gUnknown_083EDCDC = { + ewram10000 + 0x0000, 0x800, 17 +}; + +const u8 *const gUnknown_083EDCE4 = gUnknownPalette_08E997E8; + +#ifdef SAPPHIRE +const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/sapphire_83EDD40.gbapal"); +#elif defined(RUBY) +const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/ruby_83EDCE8.gbapal"); +#endif // RS + +const u16 *const gUnknown_083EDD08[] = { + UnknownPalette_83EDCE8 + 10, + UnknownPalette_83EDCE8 + 11, + UnknownPalette_83EDCE8 + 12, + UnknownPalette_83EDCE8 + 13, + UnknownPalette_83EDCE8 + 14 +}; -- cgit v1.2.3 From 82b9b4fc7e9c45caa6229a1f88bf8034381862e6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 2 Jan 2018 15:38:48 -0600 Subject: decompile sub_80E6AE4 - sub_80E7294 --- Makefile | 2 +- asm/easy_chat.s | 1034 ----------------------------------------------- include/dewford_trend.h | 1 + src/easy_chat_before.c | 553 ++++++++++++++++++++++++- 4 files changed, 538 insertions(+), 1052 deletions(-) diff --git a/Makefile b/Makefile index e7e2a7156..b30f58992 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ AS := $(DEVKITARM)/bin/arm-none-eabi-as ASFLAGS := -mcpu=arm7tdmi CC1 := tools/agbcc/bin/agbcc -override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm $(DEFINES) CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs diff --git a/asm/easy_chat.s b/asm/easy_chat.s index c78da4b00..b019ab00a 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1040 +5,6 @@ .text - thumb_func_start sub_80E6AE4 -sub_80E6AE4: @ 80E6AE4 - push {r4,r5,lr} - bl sub_80E75D8 - ldr r4, _080E6B44 @ =gSharedMem + 0x1000 - adds r1, r4, 0 - adds r1, 0x87 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - beq _080E6AFE - movs r0, 0x5 - bl PlaySE -_080E6AFE: - ldr r2, _080E6B48 @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x1 - ands r0, r1 - adds r5, r2, 0 - cmp r0, 0 - beq _080E6BA4 - movs r0, 0x5 - bl PlaySE - adds r1, r4, 0 - adds r1, 0x86 - adds r0, r4, 0 - adds r0, 0x84 - ldrb r2, [r1] - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E6B78 - adds r0, r4, 0 - adds r0, 0x85 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - beq _080E6B60 - cmp r0, 0x1 - bgt _080E6B4C - cmp r0, 0 - beq _080E6B52 - b _080E6BA4 - .align 2, 0 -_080E6B44: .4byte gSharedMem + 0x1000 -_080E6B48: .4byte gMain -_080E6B4C: - cmp r0, 0x2 - beq _080E6B6C - b _080E6BA4 -_080E6B52: - ldr r0, _080E6B5C @ =sub_80E6BC0 - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6B5C: .4byte sub_80E6BC0 -_080E6B60: - ldr r0, _080E6B68 @ =sub_80E6C84 - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6B68: .4byte sub_80E6C84 -_080E6B6C: - ldr r0, _080E6B74 @ =sub_80E6D7C - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6B74: .4byte sub_80E6D7C -_080E6B78: - adds r0, r4, 0 - adds r0, 0x83 - ldrb r0, [r0] - adds r1, r4, 0 - adds r1, 0x85 - adds r3, r0, 0 - muls r3, r2 - adds r0, r3, 0 - ldrb r1, [r1] - adds r0, r1 - adds r1, r4, 0 - adds r1, 0x27 - strb r0, [r1] - bl sub_80E7574 - ldr r0, _080E6BA0 @ =sub_80E6F68 - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6BA0: .4byte sub_80E6F68 -_080E6BA4: - ldrh r1, [r5, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E6BB4 - ldr r0, _080E6BBC @ =sub_80E6C84 - bl sub_80E682C -_080E6BB4: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E6BBC: .4byte sub_80E6C84 - thumb_func_end sub_80E6AE4 - - thumb_func_start sub_80E6BC0 -sub_80E6BC0: @ 80E6BC0 - push {r4,lr} - ldr r4, _080E6BD4 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - cmp r0, 0x1 - beq _080E6C12 - cmp r0, 0x1 - bgt _080E6BD8 - cmp r0, 0 - beq _080E6BE2 - b _080E6C76 - .align 2, 0 -_080E6BD4: .4byte gSharedMem + 0x1000 -_080E6BD8: - cmp r0, 0x2 - beq _080E6C54 - cmp r0, 0x64 - beq _080E6C64 - b _080E6C76 -_080E6BE2: - movs r0, 0x2 - bl sub_80E8398 - ldrb r0, [r4, 0x8] - cmp r0, 0x6 - bne _080E6BFA - movs r0, 0x6 - bl sub_80E91D4 - movs r0, 0x64 - strh r0, [r4, 0x24] - b _080E6C76 -_080E6BFA: - movs r0, 0x2 - bl sub_80E91D4 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0x1 - bl DisplayYesNoMenu - movs r0, 0x1 - bl MoveMenuCursor - b _080E6C3E -_080E6C12: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080E6C32 - cmp r1, 0 - bgt _080E6C2C - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080E6C46 - b _080E6C76 -_080E6C2C: - cmp r1, 0x1 - beq _080E6C46 - b _080E6C76 -_080E6C32: - bl sub_80E7D6C - bl sub_80E98C4 - bl sub_80E95A4 -_080E6C3E: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E6C76 -_080E6C46: - ldr r1, _080E6C50 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E6C76 - .align 2, 0 -_080E6C50: .4byte gSharedMem + 0x1000 -_080E6C54: - bl sub_80E81FC - ldr r0, _080E6C60 @ =sub_80E6AC4 - bl sub_80E682C - b _080E6C76 - .align 2, 0 -_080E6C60: .4byte sub_80E6AC4 -_080E6C64: - ldr r0, _080E6C7C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _080E6C76 - ldr r0, _080E6C80 @ =sub_80E6AC4 - bl sub_80E682C -_080E6C76: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E6C7C: .4byte gMain -_080E6C80: .4byte sub_80E6AC4 - thumb_func_end sub_80E6BC0 - - thumb_func_start sub_80E6C84 -sub_80E6C84: @ 80E6C84 - push {r4,lr} - ldr r4, _080E6C98 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - cmp r0, 0x1 - beq _080E6CF4 - cmp r0, 0x1 - bgt _080E6C9C - cmp r0, 0 - beq _080E6CA6 - b _080E6D72 - .align 2, 0 -_080E6C98: .4byte gSharedMem + 0x1000 -_080E6C9C: - cmp r0, 0x2 - beq _080E6D24 - cmp r0, 0xFF - beq _080E6D64 - b _080E6D72 -_080E6CA6: - movs r0, 0x2 - bl sub_80E8398 - movs r0, 0x3 - bl sub_80E91D4 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0 - bl DisplayYesNoMenu - movs r0, 0x1 - bl MoveMenuCursor - ldrb r0, [r4, 0x8] - cmp r0, 0x9 - beq _080E6CE8 - cmp r0, 0x4 - beq _080E6CE8 - cmp r0, 0x7 - beq _080E6CE8 - cmp r0, 0x8 - beq _080E6CE8 - cmp r0, 0xA - beq _080E6CE8 - cmp r0, 0xB - beq _080E6CE8 - cmp r0, 0xC - beq _080E6CE8 - cmp r0, 0x5 - beq _080E6CE8 - cmp r0, 0xD - bne _080E6D1C -_080E6CE8: - ldr r1, _080E6CF0 @ =gSharedMem + 0x1000 - movs r0, 0x2 - strh r0, [r1, 0x24] - b _080E6D72 - .align 2, 0 -_080E6CF0: .4byte gSharedMem + 0x1000 -_080E6CF4: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080E6D06 - cmp r1, 0 - ble _080E6D34 - b _080E6D3E -_080E6D06: - movs r0, 0x4 - bl sub_80E91D4 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0 - bl DisplayYesNoMenu - movs r0, 0x1 - bl MoveMenuCursor -_080E6D1C: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E6D72 -_080E6D24: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080E6D44 - cmp r1, 0 - bgt _080E6D3E -_080E6D34: - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080E6D58 - b _080E6D72 -_080E6D3E: - cmp r1, 0x1 - beq _080E6D58 - b _080E6D72 -_080E6D44: - ldr r0, _080E6D50 @ =gSpecialVar_Result - strh r1, [r0] - ldr r0, _080E6D54 @ =sub_80E752C - bl sub_80E682C - b _080E6D72 - .align 2, 0 -_080E6D50: .4byte gSpecialVar_Result -_080E6D54: .4byte sub_80E752C -_080E6D58: - ldr r1, _080E6D60 @ =gSharedMem + 0x1000 - movs r0, 0xFF - strh r0, [r1, 0x24] - b _080E6D72 - .align 2, 0 -_080E6D60: .4byte gSharedMem + 0x1000 -_080E6D64: - bl HandleDestroyMenuCursors - bl sub_80E81FC - ldr r0, _080E6D78 @ =sub_80E6AC4 - bl sub_80E682C -_080E6D72: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E6D78: .4byte sub_80E6AC4 - thumb_func_end sub_80E6C84 - - thumb_func_start sub_80E6D7C -sub_80E6D7C: @ 80E6D7C - push {r4-r7,lr} - ldr r5, _080E6D98 @ =gSharedMem + 0x1000 - ldrh r0, [r5, 0x24] - cmp r0, 0xA - bne _080E6D88 - b _080E6F06 -_080E6D88: - cmp r0, 0xA - bgt _080E6D9C - cmp r0, 0 - beq _080E6DB6 - cmp r0, 0x1 - beq _080E6E3C - b _080E6F5E - .align 2, 0 -_080E6D98: .4byte gSharedMem + 0x1000 -_080E6D9C: - cmp r0, 0x65 - bne _080E6DA2 - b _080E6F30 -_080E6DA2: - cmp r0, 0x65 - bgt _080E6DAE - cmp r0, 0x64 - bne _080E6DAC - b _080E6F24 -_080E6DAC: - b _080E6F5E -_080E6DAE: - cmp r0, 0x66 - bne _080E6DB4 - b _080E6F50 -_080E6DB4: - b _080E6F5E -_080E6DB6: - movs r0, 0x2 - bl sub_80E8398 - bl sub_80E8054 - lsls r0, 24 - cmp r0, 0 - beq _080E6DCA - movs r0, 0x5 - b _080E6DEE -_080E6DCA: - ldrb r0, [r5, 0x8] - cmp r0, 0x9 - bne _080E6DFC - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - bne _080E6DDE - movs r0, 0x8 - b _080E6DEE -_080E6DDE: - ldrh r0, [r5, 0xC] - ldr r1, _080E6DF8 @ =0x0000ffff - cmp r0, r1 - beq _080E6DEC - ldrh r0, [r5, 0xE] - cmp r0, r1 - bne _080E6DFC -_080E6DEC: - movs r0, 0x9 -_080E6DEE: - bl sub_80E91D4 - movs r0, 0xA - strh r0, [r5, 0x24] - b _080E6F5E - .align 2, 0 -_080E6DF8: .4byte 0x0000ffff -_080E6DFC: - ldr r0, _080E6E18 @ =gSharedMem + 0x1000 - ldrb r0, [r0, 0x8] - cmp r0, 0x4 - bne _080E6E20 - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - bne _080E6E20 - ldr r0, _080E6E1C @ =sub_80E6C84 - bl sub_80E682C - b _080E6F5E - .align 2, 0 -_080E6E18: .4byte gSharedMem + 0x1000 -_080E6E1C: .4byte sub_80E6C84 -_080E6E20: - movs r0, 0x1 - bl sub_80E91D4 - bl sub_80E9744 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0 - bl DisplayYesNoMenu - movs r0, 0 - bl MoveMenuCursor - b _080E6F3C -_080E6E3C: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r6, r0, 24 - cmp r6, 0 - beq _080E6E5C - cmp r6, 0 - bgt _080E6E56 - movs r0, 0x1 - negs r0, r0 - cmp r6, r0 - beq _080E6EDC - b _080E6F5E -_080E6E56: - cmp r6, 0x1 - beq _080E6EDC - b _080E6F5E -_080E6E5C: - ldr r7, _080E6EC8 @ =gSpecialVar_Result - bl sub_80E7FA8 - lsls r0, 24 - lsrs r0, 24 - negs r0, r0 - lsrs r0, 31 - strh r0, [r7] - bl sub_80E7D9C - ldrb r0, [r5, 0x8] - cmp r0, 0 - bne _080E6E82 - ldr r4, _080E6ECC @ =gSpecialVar_0x8004 - bl sub_80E8094 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] -_080E6E82: - ldrb r0, [r5, 0x8] - cmp r0, 0x9 - bne _080E6E9C - bl sub_80E81C0 - ldr r4, _080E6ECC @ =gSpecialVar_0x8004 - ldr r1, _080E6ED0 @ =0x00009c7c - adds r0, r5, r1 - bl sub_80FA364 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] -_080E6E9C: - ldrb r0, [r5, 0x8] - cmp r0, 0xD - bne _080E6EBE - ldrh r0, [r5, 0xC] - ldr r1, _080E6ED4 @ =0x0000ffff - cmp r0, r1 - beq _080E6EB0 - ldrh r0, [r5, 0xE] - cmp r0, r1 - bne _080E6EB2 -_080E6EB0: - strh r6, [r7] -_080E6EB2: - ldr r4, _080E6ECC @ =gSpecialVar_0x8004 - bl sub_80E810C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] -_080E6EBE: - ldr r0, _080E6ED8 @ =sub_80E752C - bl sub_80E682C - b _080E6F5E - .align 2, 0 -_080E6EC8: .4byte gSpecialVar_Result -_080E6ECC: .4byte gSpecialVar_0x8004 -_080E6ED0: .4byte 0x00009c7c -_080E6ED4: .4byte 0x0000ffff -_080E6ED8: .4byte sub_80E752C -_080E6EDC: - bl HandleDestroyMenuCursors - bl sub_80E81FC - ldr r4, _080E6EFC @ =gSharedMem + 0x1000 - ldrb r0, [r4, 0x8] - cmp r0, 0x6 - bne _080E6F00 - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - beq _080E6F00 - movs r0, 0x64 - strh r0, [r4, 0x24] - b _080E6F5E - .align 2, 0 -_080E6EFC: .4byte gSharedMem + 0x1000 -_080E6F00: - bl sub_80E95A4 - b _080E6F12 -_080E6F06: - ldr r0, _080E6F1C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _080E6F5E -_080E6F12: - ldr r0, _080E6F20 @ =sub_80E6AC4 - bl sub_80E682C - b _080E6F5E - .align 2, 0 -_080E6F1C: .4byte gMain -_080E6F20: .4byte sub_80E6AC4 -_080E6F24: - movs r0, 0x7 - bl sub_80E91D4 - ldrh r0, [r5, 0x24] - adds r0, 0x1 - strh r0, [r5, 0x24] -_080E6F30: - ldr r0, _080E6F48 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E6F5E -_080E6F3C: - ldr r1, _080E6F4C @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E6F5E - .align 2, 0 -_080E6F48: .4byte gMain -_080E6F4C: .4byte gSharedMem + 0x1000 -_080E6F50: - bl sub_80E7E50 - bl sub_80E95A4 - ldr r0, _080E6F64 @ =sub_80E6AC4 - bl sub_80E682C -_080E6F5E: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E6F64: .4byte sub_80E6AC4 - thumb_func_end sub_80E6D7C - - thumb_func_start sub_80E6F68 -sub_80E6F68: @ 80E6F68 - push {r4,lr} - ldr r4, _080E6F78 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - cmp r0, 0 - beq _080E6F7C - cmp r0, 0x1 - beq _080E6F9C - b _080E6FBC - .align 2, 0 -_080E6F78: .4byte gSharedMem + 0x1000 -_080E6F7C: - movs r0, 0x1 - bl sub_80E8398 - movs r0, 0xA - bl sub_80E91D4 - bl sub_80E683C - bl sub_80E9974 - bl sub_80E9E98 - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E6FBC -_080E6F9C: - bl sub_80E9EA8 - lsls r0, 24 - cmp r0, 0 - beq _080E6FBC - movs r0, 0x1 - bl sub_80E8D8C - bl sub_80E8420 - movs r0, 0 - bl sub_80E8958 - ldr r0, _080E6FC4 @ =sub_80E6FC8 - bl sub_80E682C -_080E6FBC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E6FC4: .4byte sub_80E6FC8 - thumb_func_end sub_80E6F68 - - thumb_func_start sub_80E6FC8 -sub_80E6FC8: @ 80E6FC8 - push {r4,lr} - bl sub_80E77C8 - adds r1, r0, 0 - ldr r4, _080E7000 @ =gSharedMem + 0x1000 - adds r0, r4, 0 - adds r0, 0x96 - strb r1, [r0] - movs r2, 0xE0 - lsls r2, 1 - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E700C - movs r0, 0x5 - bl PlaySE - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, _080E7004 @ =sub_80E6FC8 - str r1, [r0] - ldr r0, _080E7008 @ =sub_80E7458 - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E7000: .4byte gSharedMem + 0x1000 -_080E7004: .4byte sub_80E6FC8 -_080E7008: .4byte sub_80E7458 -_080E700C: - lsls r0, r1, 24 - cmp r0, 0 - beq _080E7018 - movs r0, 0x5 - bl PlaySE -_080E7018: - ldr r0, _080E7054 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E70E8 - ldr r2, _080E7058 @ =0x000001b7 - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E7090 - movs r0, 0x5 - bl PlaySE - movs r1, 0xD4 - lsls r1, 1 - adds r0, r4, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x2 - beq _080E7070 - cmp r0, 0x2 - bgt _080E705C - cmp r0, 0x1 - beq _080E7062 - b _080E710A - .align 2, 0 -_080E7054: .4byte gMain -_080E7058: .4byte 0x000001b7 -_080E705C: - cmp r0, 0x3 - beq _080E70F0 - b _080E710A -_080E7062: - ldr r0, _080E706C @ =sub_80E718C - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E706C: .4byte sub_80E718C -_080E7070: - ldrb r0, [r4, 0x8] - cmp r0, 0x6 - beq _080E710A - adds r0, r4, 0 - adds r0, 0x27 - ldrb r0, [r0] - ldr r1, _080E708C @ =0x0000ffff - bl sub_80E7F00 - bl sub_80E7574 - bl sub_80E95A4 - b _080E710A - .align 2, 0 -_080E708C: .4byte 0x0000ffff -_080E7090: - adds r0, r4, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - beq _080E70CA - ldr r2, _080E70DC @ =0x000001a9 - adds r0, r4, r2 - movs r2, 0 - ldrsb r2, [r0, r2] - movs r1, 0xD4 - lsls r1, 1 - adds r0, r4, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r2, r0 - adds r0, r4, 0 - adds r0, 0x40 - adds r2, r0 - ldrb r0, [r2] - lsls r0, 1 - ldr r2, _080E70E0 @ =0x00004142 - adds r1, r4, r2 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _080E710A -_080E70CA: - movs r0, 0x5 - bl PlaySE - bl sub_80E7AD4 - ldr r0, _080E70E4 @ =sub_80E7218 - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E70DC: .4byte 0x000001a9 -_080E70E0: .4byte 0x00004142 -_080E70E4: .4byte sub_80E7218 -_080E70E8: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E70FC -_080E70F0: - ldr r0, _080E70F8 @ =sub_80E7114 - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E70F8: .4byte sub_80E7114 -_080E70FC: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080E710A - ldr r0, _080E7110 @ =sub_80E718C - bl sub_80E682C -_080E710A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7110: .4byte sub_80E718C - thumb_func_end sub_80E6FC8 - - thumb_func_start sub_80E7114 -sub_80E7114: @ 80E7114 - push {lr} - ldr r0, _080E712C @ =gSharedMem + 0x1000 - ldrh r1, [r0, 0x24] - adds r2, r0, 0 - cmp r1, 0x4 - bhi _080E7182 - lsls r0, r1, 2 - ldr r1, _080E7130 @ =_080E7134 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E712C: .4byte gSharedMem + 0x1000 -_080E7130: .4byte _080E7134 - .align 2, 0 -_080E7134: - .4byte _080E7148 - .4byte _080E715C - .4byte _080E715C - .4byte _080E7164 - .4byte _080E717C -_080E7148: - bl sub_80E8504 - bl sub_80E9E98 - bl sub_80E88F0 - movs r0, 0 - bl sub_80E8D8C - b _080E716E -_080E715C: - ldrh r0, [r2, 0x24] - adds r0, 0x1 - strh r0, [r2, 0x24] - b _080E7182 -_080E7164: - bl sub_80E9F50 - lsls r0, 24 - cmp r0, 0 - beq _080E7182 -_080E716E: - ldr r1, _080E7178 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E7182 - .align 2, 0 -_080E7178: .4byte gSharedMem + 0x1000 -_080E717C: - ldr r0, _080E7188 @ =sub_80E6AC4 - bl sub_80E682C -_080E7182: - pop {r0} - bx r0 - .align 2, 0 -_080E7188: .4byte sub_80E6AC4 - thumb_func_end sub_80E7114 - - thumb_func_start sub_80E718C -sub_80E718C: @ 80E718C - push {r4,lr} - ldr r0, _080E71A4 @ =gSharedMem + 0x1000 - ldrh r1, [r0, 0x24] - adds r4, r0, 0 - cmp r1, 0x1 - beq _080E71C6 - cmp r1, 0x1 - bgt _080E71A8 - cmp r1, 0 - beq _080E71AE - b _080E71EC - .align 2, 0 -_080E71A4: .4byte gSharedMem + 0x1000 -_080E71A8: - cmp r1, 0x8 - beq _080E71F4 - b _080E71EC -_080E71AE: - bl sub_80E8504 - bl sub_80E9E98 - bl sub_80E88F0 - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - bl sub_80E8D54 - b _080E720E -_080E71C6: - bl sub_80E9FD4 - lsls r0, 24 - cmp r0, 0 - beq _080E720E - movs r2, 0 - adds r1, r4, 0 - adds r1, 0x26 - ldrb r0, [r1] - cmp r0, 0 - bne _080E71DE - movs r2, 0x1 -_080E71DE: - strb r2, [r1] - bl sub_80E683C - bl sub_80E9974 - bl sub_80E9E98 -_080E71EC: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E720E -_080E71F4: - bl sub_80EA014 - lsls r0, 24 - cmp r0, 0 - beq _080E720E - bl sub_80E8420 - movs r0, 0 - bl sub_80E8958 - ldr r0, _080E7214 @ =sub_80E6FC8 - bl sub_80E682C -_080E720E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7214: .4byte sub_80E6FC8 - thumb_func_end sub_80E718C - - thumb_func_start sub_80E7218 -sub_80E7218: @ 80E7218 - push {r4,lr} - ldr r4, _080E7230 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - adds r1, r4, 0 - cmp r0, 0x9 - beq _080E7260 - cmp r0, 0x9 - bgt _080E7234 - cmp r0, 0x8 - beq _080E7244 - b _080E723C - .align 2, 0 -_080E7230: .4byte gSharedMem + 0x1000 -_080E7234: - cmp r0, 0xA - beq _080E7276 - cmp r0, 0xB - beq _080E7288 -_080E723C: - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E7288 -_080E7244: - movs r0, 0 - bl sub_80E8D8C - bl sub_80E8504 - bl sub_80E9AD4 - bl sub_80E68E8 - bl sub_80E88F0 - bl sub_80E9E98 - b _080E726E -_080E7260: - bl sub_80EA050 - lsls r0, 24 - cmp r0, 0 - beq _080E7288 - bl sub_80E9C94 -_080E726E: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E7288 -_080E7276: - movs r0, 0x1 - bl sub_80E87CC - movs r0, 0x1 - bl sub_80E8958 - ldr r0, _080E7290 @ =sub_80E7294 - bl sub_80E682C -_080E7288: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7290: .4byte sub_80E7294 - thumb_func_end sub_80E7218 - - thumb_func_start sub_80E7294 -sub_80E7294: @ 80E7294 - push {r4,lr} - bl sub_80E7B40 - adds r1, r0, 0 - ldr r4, _080E72CC @ =gSharedMem + 0x1000 - ldr r2, _080E72D0 @ =0x000001b9 - adds r0, r4, r2 - strb r1, [r0] - adds r2, 0x7 - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E72DC - movs r0, 0x5 - bl PlaySE - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, _080E72D4 @ =sub_80E7294 - str r1, [r0] - ldr r0, _080E72D8 @ =sub_80E7458 - bl sub_80E682C - b _080E731A - .align 2, 0 -_080E72CC: .4byte gSharedMem + 0x1000 -_080E72D0: .4byte 0x000001b9 -_080E72D4: .4byte sub_80E7294 -_080E72D8: .4byte sub_80E7458 -_080E72DC: - lsls r0, r1, 24 - cmp r0, 0 - beq _080E72E8 - movs r0, 0x5 - bl PlaySE -_080E72E8: - ldr r0, _080E7304 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E730C - movs r0, 0x5 - bl PlaySE - ldr r0, _080E7308 @ =sub_80E7324 - bl sub_80E682C - b _080E731A - .align 2, 0 -_080E7304: .4byte gMain -_080E7308: .4byte sub_80E7324 -_080E730C: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E731A - ldr r0, _080E7320 @ =sub_80E73D0 - bl sub_80E682C -_080E731A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7320: .4byte sub_80E73D0 - thumb_func_end sub_80E7294 - thumb_func_start sub_80E7324 sub_80E7324: @ 80E7324 push {lr} diff --git a/include/dewford_trend.h b/include/dewford_trend.h index c12d0d740..16b2bdd75 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -2,6 +2,7 @@ #define GUARD_DEWFORDTREND_H void InitDewfordTrend(void); +bool8 sub_80FA364(u16 *a); void sub_80FA4E4(void *, u32, u8); void UpdateDewfordTrendPerDay(u16); diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index 469583779..54084ef9e 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -1,15 +1,15 @@ -// TODO: Integrate German code into this -#if ENGLISH - #include "global.h" #include "constants/easy_chat.h" +#include "constants/songs.h" #include "constants/species.h" +#include "dewford_trend.h" #include "easy_chat.h" #include "event_data.h" #include "ewram.h" #include "main.h" #include "menu.h" #include "palette.h" +#include "sound.h" #include "string_util.h" #include "strings.h" #include "unknown_task.h" @@ -27,46 +27,58 @@ struct Shared1000 u8 unk9; u8 unkA; u8 unkB; - u8 fillerC[0x20-0xC]; + u16 unkC; + u16 unkE; + u8 filler10[0x20-0x10]; void (*unk20)(void); u16 unk24; u8 unk26; - u8 filler27[0x28-0x27]; + u8 unk27; u16 unk28; u8 unk2A[11][2]; // unknown length u8 unk40[4][14]; u8 unk78[0x83-0x78]; // unknown length u8 unk83; - u8 unk84; - u8 unk85; - u8 unk86; + s8 unk84; + s8 unk85; + s8 unk86; u8 unk87; u16 unk88; u16 unk8A; - u8 filler8C[0x1A8-0x8C]; - u8 unk1A8; - u8 unk1A9; + u8 filler8C[0x96-0x8C]; + u8 unk96; + u8 filler97[0x1A8-0x97]; + s8 unk1A8; + s8 unk1A9; u8 unk1AA[0xB5-0xAA]; // unknown length u8 unk1B5; s8 unk1B6; - u8 unk1B7; + s8 unk1B7; u8 unk1B8; - u8 filler1B9[0x1BA-0x1B9]; + u8 unk1B9; u16 unk1BA; u8 filler1BC[0xBE - 0xBC]; u8 unk1BE; - u8 filler1BF[0x4142-0x1BF]; + u8 filler1BF; + s8 unk1C0; + u8 filler1C1[3]; + void (*unk1C4)(void); + u8 filler1C8[0x4142-0x1C8]; +#if GERMAN + u8 filler4142_de[0x32A]; +#endif u16 unk4142[(0x78-0x42)/2]; u16 unk4178[(0x99A4-0x4178)/2]; // unknown length - +#if GERMAN + u8 filler99A4_de[2]; +#endif u8 unk99A4; u8 unk99A5; u8 unk99A6[0xA28-0x9A6]; s8 unk9A28; u8 unk9A29; u8 filler9A2A[0xC7C-0xA2A]; - - u16 unk9C7C; + u16 unk9C7C; // this is at 0x9FA8 in German s16 unk9C7E; u8 filler9C80[0xDA4-0xC80]; u8 unk9DA4[0x24]; @@ -178,16 +190,60 @@ void sub_80E6A88(void); void sub_80E6AA8(void); void sub_80E6AC4(void); void sub_80E6AE4(void); +void sub_80E6BC0(void); +void sub_80E6C84(void); +void sub_80E6D7C(void); +void sub_80E6F68(void); +void sub_80E6FC8(void); +void sub_80E7114(void); +void sub_80E718C(void); +void sub_80E7218(void); +void sub_80E7294(void); +void sub_80E7324(void); +void sub_80E73D0(void); +void sub_80E7458(void); +void sub_80E752C(void); +void sub_80E7574(void); +u8 sub_80E75D8(void); +u8 sub_80E77C8(void); +void sub_80E7AD4(void); +u8 sub_80E7B40(void); +void sub_80E7D6C(void); +void sub_80E7D9C(void); void sub_80E7E50(void); +void sub_80E7F00(); +u8 sub_80E7FA8(void); +u8 sub_80E8054(void); +u8 sub_80E8094(void); +u8 sub_80E810C(void); +void sub_80E81C0(void); +void sub_80E81FC(void); void sub_80E8218(void); void sub_80E8398(); +void sub_80E8420(void); +void sub_80E8504(void); +void sub_80E87CC(); void sub_80E88F0(void); +void sub_80E8958(); void sub_80E8BF4(); void sub_80E8CEC(void); +void sub_80E8D54(void); +void sub_80E8D8C(); void sub_80E8DD8(void); void sub_80E91D4(); void sub_80E9368(); +void sub_80E95A4(void); +void sub_80E9744(void); +void sub_80E98C4(void); +void sub_80E9974(void); void sub_80E9A4C(void); +void sub_80E9AD4(void); +void sub_80E9E98(void); +u8 sub_80E9EA8(void); +u8 sub_80E9F50(void); +u8 sub_80E9FD4(void); +u8 sub_80EA014(void); +u8 sub_80EA050(void); void sub_80EAC5C(void); void sub_80EAD08(void); u8 sub_80EAD7C(u8); @@ -195,6 +251,10 @@ void sub_80EAECC(void); void sub_80EB040(void); void sub_80EB0B0(void); bool8 sub_80EB680(u16 *, u16, u16, u16); +void sub_80E9C94(void); + +// TODO: Integrate German code into this +#if ENGLISH void sub_80E60D8(void) { @@ -503,6 +563,22 @@ void sub_80E6690(void) r3[3] = 0xFF; } +#endif + +// local variable +#if GERMAN +u8 *const gUnknown_083DB7DC[] = +{ +#if ENGLISH + gSharedMem + 0xAC80, gSharedMem + 0xACC9, + gSharedMem + 0xAD12, gSharedMem + 0xAD5B, +#else + gSharedMem + 0xAFAC, gSharedMem + 0xAFF5, + gSharedMem + 0xB03E, gSharedMem + 0xB087, +#endif +}; +#endif + // Default profile phrase const u16 gUnknown_083DB7EC[] = { @@ -531,6 +607,7 @@ const u16 gUnknown_083DB7F4[] = const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); +#if ENGLISH // ResetDefaultEasyChatPhrases void InitEasyChatPhrases(void) { @@ -686,4 +763,446 @@ void sub_80E6AC4(void) sub_80E682C(sub_80E6AE4); } +void sub_80E6AE4(void) +{ + shared1000.unk87 = sub_80E75D8(); + if (shared1000.unk87 != 0) + PlaySE(SE_SELECT); + if (gMain.newKeys & A_BUTTON) + { + u8 r2; + + PlaySE(SE_SELECT); + r2 = shared1000.unk86; + if (shared1000.unk86 == shared1000.unk84) + { + switch (shared1000.unk85) + { + case 0: + sub_80E682C(sub_80E6BC0); + return; + case 1: + sub_80E682C(sub_80E6C84); + return; + case 2: + sub_80E682C(sub_80E6D7C); + return; + } + } + else + { + shared1000.unk27 = shared1000.unk83 * r2 + shared1000.unk85; + sub_80E7574(); + sub_80E682C(sub_80E6F68); + return; + } + } + if (gMain.newKeys & B_BUTTON) + { + sub_80E682C(sub_80E6C84); + } +} + +void sub_80E6BC0(void) +{ + //s8 selection; + + switch (shared1000.unk24) + { + case 0: + sub_80E8398(2); + if (shared1000.unk8 == 6) + { + sub_80E91D4(6); + shared1000.unk24 = 100; + } + else + { + sub_80E91D4(2); + DisplayYesNoMenu(23, 8, 1); + MoveMenuCursor(1); + shared1000.unk24++; + } + break; + case 1: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + sub_80E7D6C(); + sub_80E98C4(); + sub_80E95A4(); + shared1000.unk24++; + break; + case -1: + case 1: + shared1000.unk24++; + break; + } + break; + case 2: + sub_80E81FC(); + sub_80E682C(sub_80E6AC4); + break; + case 100: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E6C84(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8398(2); + sub_80E91D4(3); + DisplayYesNoMenu(23, 8, 0); + MoveMenuCursor(1); + if (shared1000.unk8 == 9 + || shared1000.unk8 == 4 + || shared1000.unk8 == 7 + || shared1000.unk8 == 8 + || shared1000.unk8 == 10 + || shared1000.unk8 == 11 + || shared1000.unk8 == 12 + || shared1000.unk8 == 5 + || shared1000.unk8 == 13) + shared1000.unk24 = 2; + else + shared1000.unk24++; + break; + case 1: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + sub_80E91D4(4); + DisplayYesNoMenu(23, 8, 0); + MoveMenuCursor(1); + shared1000.unk24++; + break; + case -1: + case 1: + shared1000.unk24 = 0xFF; + break; + } + break; + case 2: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + gSpecialVar_Result = 0; + sub_80E682C(sub_80E752C); + break; + case -1: + case 1: + shared1000.unk24 = 0xFF; + break; + } + break; + case 0xFF: + HandleDestroyMenuCursors(); + sub_80E81FC(); + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E6D7C(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8398(2); + if (sub_80E8054() != 0) + { + sub_80E91D4(5); + shared1000.unk24 = 10; + break; + } + if (shared1000.unk8 == 9) + { + if (sub_80E7FA8() == 0) + { + sub_80E91D4(8); + shared1000.unk24 = 10; + break; + } + if (shared1000.unkC == 0xFFFF || shared1000.unkE == 0xFFFF) + { + sub_80E91D4(9); + shared1000.unk24 = 10; + break; + } + } + if (shared1000.unk8 == 4 && sub_80E7FA8() == 0) + { + sub_80E682C(sub_80E6C84); + } + else + { + sub_80E91D4(1); + sub_80E9744(); + DisplayYesNoMenu(23, 8, 0); + MoveMenuCursor(0); + shared1000.unk24++; + } + break; + case 1: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + gSpecialVar_Result = (sub_80E7FA8() != 0); + sub_80E7D9C(); + if (shared1000.unk8 == 0) + gSpecialVar_0x8004 = sub_80E8094(); + if (shared1000.unk8 == 9) // dewford trend? + { + sub_80E81C0(); + gSpecialVar_0x8004 = sub_80FA364(&shared1000.unk9C7C); + } + if (shared1000.unk8 == 13) + { + if (shared1000.unkC == 0xFFFF || shared1000.unkE == 0xFFFF) + gSpecialVar_Result = 0; + gSpecialVar_0x8004 = sub_80E810C(); + } + sub_80E682C(sub_80E752C); + break; + case -1: + case 1: + HandleDestroyMenuCursors(); + sub_80E81FC(); + if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) + { + shared1000.unk24 = 100; + } + else + { + sub_80E95A4(); + sub_80E682C(sub_80E6AC4); + } + break; + } + break; + case 10: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + sub_80E682C(sub_80E6AC4); + break; + case 100: + sub_80E91D4(7); + shared1000.unk24++; + // fall through + case 101: + if (gMain.newKeys & A_BUTTON) + shared1000.unk24++; + break; + case 102: + sub_80E7E50(); + sub_80E95A4(); + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E6F68(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8398(1); + sub_80E91D4(10); + sub_80E683C(); + sub_80E9974(); + sub_80E9E98(); + shared1000.unk24++; + break; + case 1: + if (sub_80E9EA8() != 0) + { + sub_80E8D8C(1); + sub_80E8420(); + sub_80E8958(0); + sub_80E682C(sub_80E6FC8); + } + break; + } +} + +void sub_80E6FC8(void) +{ + shared1000.unk96 = sub_80E77C8(); + if (shared1000.unk1C0 != 0) + { + PlaySE(SE_SELECT); + shared1000.unk1C4 = sub_80E6FC8; + sub_80E682C(sub_80E7458); + } + else + { + if (shared1000.unk96 != 0) + PlaySE(SE_SELECT); + if (gMain.newKeys & A_BUTTON) + { + if (shared1000.unk1B7 != 0) + { + PlaySE(SE_SELECT); + switch (shared1000.unk1A8) + { + case 1: + sub_80E682C(sub_80E718C); + break; + case 2: + if (shared1000.unk8 != 6) + { + sub_80E7F00(shared1000.unk27, 0xFFFF); + sub_80E7574(); + sub_80E95A4(); + } + break; + case 3: + sub_80E682C(sub_80E7114); + break; + } + } + else + { + if (shared1000.unk26 == 0 + || shared1000.unk4142[shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]] != 0) + { + PlaySE(SE_SELECT); + sub_80E7AD4(); + sub_80E682C(sub_80E7218); + } + } + } + else if (gMain.newKeys & B_BUTTON) + { + sub_80E682C(sub_80E7114); + } + else if (gMain.newKeys & SELECT_BUTTON) + { + sub_80E682C(sub_80E718C); + } + } +} + +void sub_80E7114(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8504(); + sub_80E9E98(); + sub_80E88F0(); + sub_80E8D8C(0); + shared1000.unk24++; + break; + case 1: + case 2: + shared1000.unk24++; + break; + case 3: + if (sub_80E9F50() != 0) + shared1000.unk24++; + break; + case 4: + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E718C(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8504(); + sub_80E9E98(); + sub_80E88F0(); + shared1000.unk24++; + sub_80E8D54(); + break; + case 1: + if (sub_80E9FD4() != 0) + { + shared1000.unk26 = !shared1000.unk26; + sub_80E683C(); + sub_80E9974(); + sub_80E9E98(); + shared1000.unk24++; + } + break; + default: + shared1000.unk24++; + break; + case 8: + if (sub_80EA014() != 0) + { + sub_80E8420(); + sub_80E8958(0); + sub_80E682C(sub_80E6FC8); + } + break; + } +} + +void sub_80E7218(void) +{ + switch (shared1000.unk24) + { + default: + shared1000.unk24++; + break; + case 8: + sub_80E8D8C(0); + sub_80E8504(); + sub_80E9AD4(); + sub_80E68E8(); + sub_80E88F0(); + sub_80E9E98(); + shared1000.unk24++; + break; + case 9: + if (sub_80EA050() != 0) + { + sub_80E9C94(); + shared1000.unk24++; + } + break; + case 10: + sub_80E87CC(1); + sub_80E8958(1); + sub_80E682C(sub_80E7294); + break; + case 11: + break; + } +} + +void sub_80E7294(void) +{ + shared1000.unk1B9 = sub_80E7B40(); + if (shared1000.unk1C0 != 0) + { + PlaySE(SE_SELECT); + shared1000.unk1C4 = sub_80E7294; + sub_80E682C(sub_80E7458); + } + else + { + if (shared1000.unk1B9 != 0) + PlaySE(SE_SELECT); + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + sub_80E682C(sub_80E7324); + } + else if (gMain.newKeys & B_BUTTON) + { + sub_80E682C(sub_80E73D0); + } + } +} + #endif -- cgit v1.2.3 From 2d7f68cb060735b01549103ae225bf9ca7efa45c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 2 Jan 2018 15:43:23 -0600 Subject: revert test change in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b30f58992..e7e2a7156 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ AS := $(DEVKITARM)/bin/arm-none-eabi-as ASFLAGS := -mcpu=arm7tdmi CC1 := tools/agbcc/bin/agbcc -override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm $(DEFINES) +override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -- cgit v1.2.3 From 8a14021bf25ffd7bf0d6a1ce808f29d3528bf111 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 2 Jan 2018 15:46:16 -0600 Subject: hopefully fix German build --- src/easy_chat_before.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index 54084ef9e..d71fad303 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -89,7 +89,7 @@ struct Shared1000 #define static_assert(cond) \ typedef char test_[(cond) ? 1 : -1] -static_assert(offsetof(struct Shared1000, unk4142) == 0x4142); +//static_assert(offsetof(struct Shared1000, unk4142) == 0x4142); #define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) -- cgit v1.2.3 From a2e854bb7cda3d4de0b4f2d1fc9e7bd88a471980 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 2 Jan 2018 19:22:51 -0600 Subject: decompile sub_80E7324 - sub_80E7AD4 --- asm/easy_chat.s | 1084 ------------------------------------------------ include/easy_chat.h | 2 +- src/easy_chat_before.c | 418 ++++++++++++++++++- 3 files changed, 396 insertions(+), 1108 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index b019ab00a..708881567 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1090 +5,6 @@ .text - thumb_func_start sub_80E7324 -sub_80E7324: @ 80E7324 - push {lr} - ldr r0, _080E733C @ =gSharedMem + 0x1000 - ldrh r1, [r0, 0x24] - adds r2, r0, 0 - cmp r1, 0x4 - bhi _080E73C6 - lsls r0, r1, 2 - ldr r1, _080E7340 @ =_080E7344 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E733C: .4byte gSharedMem + 0x1000 -_080E7340: .4byte _080E7344 - .align 2, 0 -_080E7344: - .4byte _080E7358 - .4byte _080E737C - .4byte _080E7384 - .4byte _080E738A - .4byte _080E73A4 -_080E7358: - bl sub_80E7DD0 - lsls r0, 24 - cmp r0, 0 - bne _080E7370 - ldr r0, _080E736C @ =sub_80E7294 - bl sub_80E682C - b _080E73C6 - .align 2, 0 -_080E736C: .4byte sub_80E7294 -_080E7370: - bl sub_80E88F0 - movs r0, 0 - bl sub_80E87CC - b _080E7394 -_080E737C: - ldrh r0, [r2, 0x24] - adds r0, 0x1 - strh r0, [r2, 0x24] - b _080E73C6 -_080E7384: - bl sub_80E9E98 - b _080E7394 -_080E738A: - bl sub_80EA184 - lsls r0, 24 - cmp r0, 0 - beq _080E73C6 -_080E7394: - ldr r1, _080E73A0 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E73C6 - .align 2, 0 -_080E73A0: .4byte gSharedMem + 0x1000 -_080E73A4: - ldrb r0, [r2, 0x8] - cmp r0, 0x6 - bne _080E73C0 - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - beq _080E73C0 - ldr r0, _080E73BC @ =sub_80E6D7C - bl sub_80E682C - b _080E73C6 - .align 2, 0 -_080E73BC: .4byte sub_80E6D7C -_080E73C0: - ldr r0, _080E73CC @ =sub_80E6AC4 - bl sub_80E682C -_080E73C6: - pop {r0} - bx r0 - .align 2, 0 -_080E73CC: .4byte sub_80E6AC4 - thumb_func_end sub_80E7324 - - thumb_func_start sub_80E73D0 -sub_80E73D0: @ 80E73D0 - push {lr} - ldr r0, _080E73E4 @ =gSharedMem + 0x1000 - ldrh r0, [r0, 0x24] - cmp r0, 0x4 - bhi _080E744E - lsls r0, 2 - ldr r1, _080E73E8 @ =_080E73EC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E73E4: .4byte gSharedMem + 0x1000 -_080E73E8: .4byte _080E73EC - .align 2, 0 -_080E73EC: - .4byte _080E7400 - .4byte _080E740C - .4byte _080E7416 - .4byte _080E742C - .4byte _080E7444 -_080E7400: - movs r0, 0 - bl sub_80E87CC - bl sub_80E88F0 - b _080E7436 -_080E740C: - bl sub_80E9AD4 - bl sub_80E9E98 - b _080E7436 -_080E7416: - bl sub_80EA0E4 - lsls r0, 24 - cmp r0, 0 - beq _080E744E - movs r0, 0x1 - bl sub_80E8D8C - bl sub_80E9A14 - b _080E7436 -_080E742C: - bl sub_80E8420 - movs r0, 0 - bl sub_80E8958 -_080E7436: - ldr r1, _080E7440 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E744E - .align 2, 0 -_080E7440: .4byte gSharedMem + 0x1000 -_080E7444: - bl sub_80E9974 - ldr r0, _080E7454 @ =sub_80E6FC8 - bl sub_80E682C -_080E744E: - pop {r0} - bx r0 - .align 2, 0 -_080E7454: .4byte sub_80E6FC8 - thumb_func_end sub_80E73D0 - - thumb_func_start sub_80E7458 -sub_80E7458: @ 80E7458 - push {r4,r5,lr} - ldr r4, _080E7468 @ =gSharedMem + 0x1000 - ldrh r5, [r4, 0x24] - cmp r5, 0 - beq _080E746C - cmp r5, 0x1 - beq _080E74A4 - b _080E7518 - .align 2, 0 -_080E7468: .4byte gSharedMem + 0x1000 -_080E746C: - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, [r0] - ldr r0, _080E7480 @ =sub_80E6FC8 - cmp r1, r0 - bne _080E7484 - bl sub_80E9D7C - b _080E7488 - .align 2, 0 -_080E7480: .4byte sub_80E6FC8 -_080E7484: - bl sub_80E9D00 -_080E7488: - ldr r4, _080E74A0 @ =gSharedMem + 0x1000 - movs r2, 0xDF - lsls r2, 1 - adds r0, r4, r2 - ldrb r0, [r0] - bl sub_80E9E08 - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E7518 - .align 2, 0 -_080E74A0: .4byte gSharedMem + 0x1000 -_080E74A4: - bl sub_80E9E54 - lsls r0, 24 - cmp r0, 0 - beq _080E7518 - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, [r0] - ldr r0, _080E74DC @ =sub_80E6FC8 - cmp r1, r0 - bne _080E74E4 - bl sub_80E9D7C - ldr r2, _080E74E0 @ =0x000001b5 - adds r1, r4, r2 - adds r2, 0xB - adds r0, r4, r2 - ldrb r0, [r0] - ldrb r2, [r1] - adds r0, r2 - strb r0, [r1] - bl sub_80E7A98 - adds r0, r4, 0 - adds r0, 0x96 - b _080E74FE - .align 2, 0 -_080E74DC: .4byte sub_80E6FC8 -_080E74E0: .4byte 0x000001b5 -_080E74E4: - ldr r0, _080E7520 @ =0x00009a29 - adds r1, r4, r0 - movs r2, 0xE0 - lsls r2, 1 - adds r0, r4, r2 - ldrb r0, [r0] - ldrb r2, [r1] - adds r0, r2 - strb r0, [r1] - bl sub_80E7D30 - ldr r1, _080E7524 @ =0x000001b9 - adds r0, r4, r1 -_080E74FE: - strb r5, [r0] - ldr r1, _080E7528 @ =gSharedMem + 0x1000 - movs r0, 0xDF - lsls r0, 1 - adds r2, r1, r0 - movs r0, 0x2 - strb r0, [r2] - movs r2, 0xE2 - lsls r2, 1 - adds r0, r1, r2 - ldr r0, [r0] - bl sub_80E682C -_080E7518: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E7520: .4byte 0x00009a29 -_080E7524: .4byte 0x000001b9 -_080E7528: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7458 - - thumb_func_start sub_80E752C -sub_80E752C: @ 80E752C - push {r4,lr} - sub sp, 0x4 - ldr r4, _080E7540 @ =gSharedMem + 0x1000 - ldrh r1, [r4, 0x24] - cmp r1, 0 - beq _080E7544 - cmp r1, 0x1 - beq _080E755C - b _080E756C - .align 2, 0 -_080E7540: .4byte gSharedMem + 0x1000 -_080E7544: - movs r0, 0x1 - negs r0, r0 - str r1, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E756C -_080E755C: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _080E756C - ldr r0, [r4] - bl SetMainCallback2 -_080E756C: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80E752C - - thumb_func_start sub_80E7574 -sub_80E7574: @ 80E7574 - push {r4,r5,lr} - ldr r4, _080E75B8 @ =gSharedMem + 0x1000 - ldrb r5, [r4, 0x8] - cmp r5, 0x1 - bne _080E75BC - adds r0, r4, 0 - adds r0, 0x86 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r4, 0 - adds r1, 0x7E - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x2 - bne _080E75BC - adds r0, r4, 0 - adds r0, 0x27 - ldrb r0, [r0] - lsls r0, 1 - subs r1, 0x72 - adds r0, r1 - ldrh r0, [r0] - bl sub_80EB2D4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - beq _080E75BC - adds r0, r4, 0 - adds r0, 0x7D - strb r5, [r0] - adds r1, r4, 0 - b _080E75C6 - .align 2, 0 -_080E75B8: .4byte gSharedMem + 0x1000 -_080E75BC: - ldr r1, _080E75D4 @ =gSharedMem + 0x1000 - adds r2, r1, 0 - adds r2, 0x7D - movs r0, 0 - strb r0, [r2] -_080E75C6: - adds r1, 0x7D - movs r0, 0 - strb r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E75D4: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7574 - - thumb_func_start sub_80E75D8 -sub_80E75D8: @ 80E75D8 - push {r4-r6,lr} - movs r4, 0 - ldr r2, _080E75FC @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080E7604 - ldr r1, _080E7600 @ =gSharedMem + 0x1000 - adds r0, r1, 0 - adds r0, 0x84 - ldrb r0, [r0] - adds r2, r1, 0 - adds r2, 0x86 - strb r0, [r2] - adds r1, 0x85 - movs r0, 0x2 - b _080E768E - .align 2, 0 -_080E75FC: .4byte gMain -_080E7600: .4byte gSharedMem + 0x1000 -_080E7604: - ldrh r1, [r2, 0x30] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _080E7630 - ldr r2, _080E762C @ =gSharedMem + 0x1000 - adds r1, r2, 0 - adds r1, 0x86 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - bge _080E765C - adds r0, r2, 0 - adds r0, 0x84 - ldrb r0, [r0] - strb r0, [r1] - b _080E765C - .align 2, 0 -_080E762C: .4byte gSharedMem + 0x1000 -_080E7630: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080E7658 - ldr r0, _080E7684 @ =gSharedMem + 0x1000 - adds r3, r0, 0 - adds r3, 0x86 - ldrb r1, [r3] - adds r1, 0x1 - strb r1, [r3] - adds r0, 0x84 - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - ble _080E7656 - strb r4, [r3] -_080E7656: - movs r4, 0x1 -_080E7658: - cmp r4, 0 - beq _080E76EA -_080E765C: - ldr r2, _080E7684 @ =gSharedMem + 0x1000 - ldrb r3, [r2, 0x9] - cmp r3, 0x2 - bne _080E7692 - adds r1, r2, 0 - adds r1, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E7688 - adds r0, r2, 0 - adds r0, 0x85 - strb r3, [r0] - b _080E77BC - .align 2, 0 -_080E7684: .4byte gSharedMem + 0x1000 -_080E7688: - adds r1, r2, 0 - adds r1, 0x85 - movs r0, 0 -_080E768E: - strb r0, [r1] - b _080E77BC -_080E7692: - movs r0, 0x85 - adds r0, r2 - mov r12, r0 - adds r4, r2, 0 - adds r4, 0x83 - movs r1, 0 - ldrsb r1, [r0, r1] - ldrb r3, [r4] - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r1, r0 - blt _080E76B0 - subs r0, r3, 0x1 - mov r1, r12 - strb r0, [r1] -_080E76B0: - adds r1, r2, 0 - adds r1, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - ldrb r3, [r1] - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - beq _080E77BC - ldrb r0, [r4] - adds r4, r0, 0 - muls r4, r3 - adds r0, r4, 0 - mov r5, r12 - ldrb r5, [r5] - adds r0, r5 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r2, 0xA] - cmp r0, r1 - bcc _080E77BC - subs r0, r1 - mov r6, r12 - strb r0, [r6] - b _080E77BC -_080E76EA: - ldrh r2, [r2, 0x30] - movs r0, 0x20 - ands r0, r2 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - beq _080E7744 - ldr r2, _080E7728 @ =gSharedMem + 0x1000 - adds r3, r2, 0 - adds r3, 0x85 - ldrb r0, [r3] - subs r0, 0x1 - strb r0, [r3] - lsls r0, 24 - cmp r0, 0 - bge _080E77BC - adds r1, r2, 0 - adds r1, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - ldrb r4, [r1] - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E772C - movs r0, 0x2 - b _080E77BA - .align 2, 0 -_080E7728: .4byte gSharedMem + 0x1000 -_080E772C: - adds r0, r2, 0 - adds r0, 0x83 - ldrb r0, [r0] - subs r1, r0, 0x1 - strb r1, [r3] - adds r5, r4, 0 - muls r5, r0 - adds r0, r5, 0 - adds r1, r0 - lsls r1, 24 - lsrs r0, r1, 24 - b _080E77B2 -_080E7744: - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - beq _080E77C0 - ldr r2, _080E777C @ =gSharedMem + 0x1000 - adds r5, r2, 0 - adds r5, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - movs r1, 0 - ldrsb r1, [r5, r1] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E7780 - adds r1, r2, 0 - adds r1, 0x85 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x2 - ble _080E77BC - strb r4, [r1] - b _080E77BC - .align 2, 0 -_080E777C: .4byte gSharedMem + 0x1000 -_080E7780: - adds r3, r2, 0 - adds r3, 0x85 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - movs r6, 0x83 - adds r6, r2 - mov r12, r6 - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r6, r1] - cmp r0, r1 - blt _080E779E - strb r4, [r3] -_080E779E: - ldrb r1, [r5] - mov r4, r12 - ldrb r0, [r4] - adds r5, r0, 0 - muls r5, r1 - adds r0, r5, 0 - ldrb r6, [r3] - adds r0, r6 - lsls r0, 24 - lsrs r0, 24 -_080E77B2: - ldrb r1, [r2, 0xA] - cmp r0, r1 - bcc _080E77BC - subs r0, r1 -_080E77BA: - strb r0, [r3] -_080E77BC: - movs r0, 0x1 - b _080E77C2 -_080E77C0: - movs r0, 0 -_080E77C2: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80E75D8 - - thumb_func_start sub_80E77C8 -sub_80E77C8: @ 80E77C8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r7, 0 - ldr r1, _080E780C @ =gSharedMem + 0x1000 - ldr r2, _080E7810 @ =0x000001b7 - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r3, r1, 0 - cmp r0, 0 - beq _080E783E - ldr r1, _080E7814 @ =gMain - ldrh r2, [r1, 0x30] - movs r0, 0x40 - ands r0, r2 - adds r6, r1, 0 - cmp r0, 0 - beq _080E7818 - movs r4, 0xD4 - lsls r4, 1 - adds r1, r3, r4 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - ble _080E7806 - b _080E7948 -_080E7806: - movs r0, 0x3 - strb r0, [r1] - b _080E7948 - .align 2, 0 -_080E780C: .4byte gSharedMem + 0x1000 -_080E7810: .4byte 0x000001b7 -_080E7814: .4byte gMain -_080E7818: - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - bne _080E7822 - b _080E7950 -_080E7822: - movs r5, 0xD4 - lsls r5, 1 - adds r1, r3, r5 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x3 - bgt _080E7838 - b _080E7948 -_080E7838: - movs r0, 0x1 - strb r0, [r1] - b _080E7948 -_080E783E: - adds r0, r3, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0x1 - bne _080E789A - movs r4, 0 - ldr r1, _080E7870 @ =gMain - ldrh r2, [r1, 0x30] - movs r0, 0x40 - ands r0, r2 - adds r6, r1, 0 - cmp r0, 0 - beq _080E7874 - movs r6, 0xD4 - lsls r6, 1 - adds r1, r3, r6 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - bge _080E7944 - movs r0, 0x3 - strb r0, [r1] - b _080E7944 - .align 2, 0 -_080E7870: .4byte gMain -_080E7874: - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - beq _080E7894 - movs r0, 0xD4 - lsls r0, 1 - adds r1, r3, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x3 - ble _080E7892 - strb r7, [r1] -_080E7892: - movs r4, 0x1 -_080E7894: - cmp r4, 0 - beq _080E7950 - b _080E7944 -_080E789A: - movs r4, 0 - movs r1, 0xE0 - lsls r1, 1 - adds r5, r3, r1 - strb r7, [r5] - ldr r1, _080E78E0 @ =gMain - ldrh r2, [r1, 0x30] - movs r0, 0x40 - ands r0, r2 - adds r6, r1, 0 - cmp r0, 0 - beq _080E78E8 - movs r2, 0xD4 - lsls r2, 1 - adds r1, r3, r2 - ldrb r2, [r1] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bne _080E78C4 - b _080E7A88 -_080E78C4: - subs r0, r2, 0x1 - strb r0, [r1] - ldr r4, _080E78E4 @ =0x000001b5 - adds r1, r3, r4 - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - cmp r0, r1 - bge _080E7932 - movs r0, 0xFF - strb r0, [r5] - b _080E7932 - .align 2, 0 -_080E78E0: .4byte gMain -_080E78E4: .4byte 0x000001b5 -_080E78E8: - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - beq _080E792E - movs r0, 0xD4 - lsls r0, 1 - adds r2, r3, r0 - movs r1, 0 - ldrsb r1, [r2, r1] - movs r4, 0xDB - lsls r4, 1 - adds r0, r3, r4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, 0x1 - cmp r1, r0 - blt _080E790E - b _080E7A88 -_080E790E: - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - movs r1, 0 - ldrsb r1, [r2, r1] - ldr r2, _080E794C @ =0x000001b5 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x3 - cmp r1, r0 - ble _080E792C - movs r0, 0x1 - strb r0, [r5] -_080E792C: - movs r4, 0x1 -_080E792E: - cmp r4, 0 - beq _080E7950 -_080E7932: - movs r4, 0xE0 - lsls r4, 1 - adds r0, r3, r4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E7944 - b _080E7A88 -_080E7944: - bl sub_80E7A98 -_080E7948: - movs r0, 0x1 - b _080E7A8A - .align 2, 0 -_080E794C: .4byte 0x000001b5 -_080E7950: - ldrh r1, [r6, 0x30] - movs r0, 0x20 - ands r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0 - beq _080E7992 - ldr r5, _080E7974 @ =0x000001a9 - adds r2, r3, r5 - ldrb r1, [r2] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0 - beq _080E7978 - subs r0, r1, 0x1 - strb r0, [r2] - b _080E79E6 - .align 2, 0 -_080E7974: .4byte 0x000001a9 -_080E7978: - movs r6, 0xD4 - lsls r6, 1 - adds r0, r3, r6 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - movs r4, 0xD5 - lsls r4, 1 - adds r1, r3, r4 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - b _080E79E6 -_080E7992: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080E79E2 - ldr r5, _080E79D4 @ =0x000001b7 - adds r0, r3, r5 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bne _080E79CC - ldr r0, _080E79D8 @ =0x000001a9 - adds r4, r3, r0 - movs r1, 0xD4 - lsls r1, 1 - adds r0, r3, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r2, 0xD5 - lsls r2, 1 - adds r0, r3, r2 - adds r1, r0 - ldrb r5, [r4] - movs r2, 0 - ldrsb r2, [r4, r2] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - bne _080E79DC -_080E79CC: - ldr r4, _080E79D8 @ =0x000001a9 - adds r0, r3, r4 - strb r6, [r0] - b _080E79E0 - .align 2, 0 -_080E79D4: .4byte 0x000001b7 -_080E79D8: .4byte 0x000001a9 -_080E79DC: - adds r0, r5, 0x1 - strb r0, [r4] -_080E79E0: - movs r7, 0x1 -_080E79E2: - cmp r7, 0 - beq _080E7A88 -_080E79E6: - adds r2, r3, 0 - ldr r5, _080E7A48 @ =0x000001b7 - adds r7, r2, r5 - ldrb r6, [r7] - mov r9, r6 - movs r1, 0 - ldr r0, _080E7A4C @ =0x000001a9 - adds r0, r2 - mov r12, r0 - subs r5, 0xF - adds r4, r2, r5 - movs r0, 0 - ldrsb r0, [r4, r0] - movs r6, 0xD5 - lsls r6, 1 - adds r6, r2 - mov r8, r6 - add r0, r8 - mov r6, r12 - movs r5, 0 - ldrsb r5, [r6, r5] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r5, r0 - bne _080E7A1C - movs r1, 0x1 -_080E7A1C: - strb r1, [r7] - cmp r1, 0 - beq _080E7A58 - ldr r0, _080E7A50 @ =0x000001b5 - adds r1, r2, r0 - ldrb r0, [r4] - ldrb r1, [r1] - subs r0, r1 - strb r0, [r4] - lsls r0, 24 - cmp r0, 0 - beq _080E7A36 - b _080E7948 -_080E7A36: - movs r0, 0x1 - strb r0, [r4] - ldr r1, _080E7A54 @ =0x000001ab - adds r0, r2, r1 - ldrb r0, [r0] - mov r2, r12 - strb r0, [r2] - b _080E7948 - .align 2, 0 -_080E7A48: .4byte 0x000001b7 -_080E7A4C: .4byte 0x000001a9 -_080E7A50: .4byte 0x000001b5 -_080E7A54: .4byte 0x000001ab -_080E7A58: - mov r6, r9 - cmp r6, 0 - bne _080E7A60 - b _080E7948 -_080E7A60: - ldr r1, _080E7A84 @ =0x000001b5 - adds r0, r3, r1 - ldrb r0, [r0] - ldrb r2, [r4] - adds r0, r2 - strb r0, [r4] - cmp r5, 0 - bne _080E7A72 - b _080E7948 -_080E7A72: - movs r0, 0 - ldrsb r0, [r4, r0] - add r0, r8 - ldrb r0, [r0] - subs r0, 0x1 - mov r4, r12 - strb r0, [r4] - b _080E7948 - .align 2, 0 -_080E7A84: .4byte 0x000001b5 -_080E7A88: - movs r0, 0 -_080E7A8A: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80E77C8 - - thumb_func_start sub_80E7A98 -sub_80E7A98: @ 80E7A98 - push {lr} - ldr r1, _080E7ACC @ =gSharedMem + 0x1000 - ldr r0, _080E7AD0 @ =0x000001a9 - adds r3, r1, r0 - movs r2, 0xD4 - lsls r2, 1 - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r2, 0x2 - adds r1, r2 - adds r0, r1 - movs r1, 0 - ldrsb r1, [r3, r1] - ldrb r2, [r0] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - blt _080E7AC6 - subs r0, r2, 0x1 - strb r0, [r3] -_080E7AC6: - pop {r0} - bx r0 - .align 2, 0 -_080E7ACC: .4byte gSharedMem + 0x1000 -_080E7AD0: .4byte 0x000001a9 - thumb_func_end sub_80E7A98 - - thumb_func_start sub_80E7AD4 -sub_80E7AD4: @ 80E7AD4 - push {lr} - ldr r3, _080E7B08 @ =gSharedMem + 0x1000 - adds r0, r3, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E7B10 - ldr r1, _080E7B0C @ =0x000001a9 - adds r0, r3, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r2, 0xD4 - lsls r2, 1 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x2A - adds r1, r0 - ldrb r1, [r1] - adds r2, 0x10 - b _080E7B34 - .align 2, 0 -_080E7B08: .4byte gSharedMem + 0x1000 -_080E7B0C: .4byte 0x000001a9 -_080E7B10: - ldr r1, _080E7B3C @ =0x000001a9 - adds r0, r3, r1 - movs r2, 0 - ldrsb r2, [r0, r2] - subs r1, 0x1 - adds r0, r3, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r2, r0 - adds r0, r3, 0 - adds r0, 0x40 - adds r2, r0 - ldrb r1, [r2] - movs r2, 0xDC - lsls r2, 1 -_080E7B34: - adds r0, r3, r2 - strb r1, [r0] - pop {r0} - bx r0 - .align 2, 0 -_080E7B3C: .4byte 0x000001a9 - thumb_func_end sub_80E7AD4 - thumb_func_start sub_80E7B40 sub_80E7B40: @ 80E7B40 push {r4-r7,lr} diff --git a/include/easy_chat.h b/include/easy_chat.h index 541a697be..a752720a6 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -3,7 +3,7 @@ extern u8 gUnknown_020388AC; -void sub_80E62A0(u8 arg0, u16 *arg1, void *arg2, u8 arg3); +void sub_80E62A0(u8 arg0, u16 *arg1, void (*arg2)(void), u8 arg3); u16 sub_80EB72C(u16 group); void sub_80EB6FC(u16 *, u16); void InitEasyChatPhrases(void); diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index d71fad303..9d6989612 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -21,15 +21,13 @@ extern void sub_80546B8(void); struct Shared1000 { - void *unk0; // callback + void (*unk0)(void); // main cb 2 u16 *unk4; u8 unk8; u8 unk9; u8 unkA; u8 unkB; - u16 unkC; - u16 unkE; - u8 filler10[0x20-0x10]; + u16 unkC[(0x20-0xC)/2]; // unknown length void (*unk20)(void); u16 unk24; u8 unk26; @@ -37,12 +35,15 @@ struct Shared1000 u16 unk28; u8 unk2A[11][2]; // unknown length u8 unk40[4][14]; - u8 unk78[0x83-0x78]; // unknown length - u8 unk83; + u8 unk78[0x7D - 0x78]; // unknown length + u8 unk7D; + u8 unk7E[0x83-0x7E]; + s8 unk83; // s8? + //u8 unk83; // s8? s8 unk84; s8 unk85; s8 unk86; - u8 unk87; + bool8 unk87; u16 unk88; u16 unk8A; u8 filler8C[0x96-0x8C]; @@ -50,8 +51,8 @@ struct Shared1000 u8 filler97[0x1A8-0x97]; s8 unk1A8; s8 unk1A9; - u8 unk1AA[0xB5-0xAA]; // unknown length - u8 unk1B5; + s8 unk1AA[0xB5-0xAA]; // unknown length + s8 unk1B5; s8 unk1B6; s8 unk1B7; u8 unk1B8; @@ -89,7 +90,7 @@ struct Shared1000 #define static_assert(cond) \ typedef char test_[(cond) ? 1 : -1] -//static_assert(offsetof(struct Shared1000, unk4142) == 0x4142); +static_assert(offsetof(struct Shared1000, unk20) == 0x20); #define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) @@ -204,12 +205,15 @@ void sub_80E73D0(void); void sub_80E7458(void); void sub_80E752C(void); void sub_80E7574(void); -u8 sub_80E75D8(void); -u8 sub_80E77C8(void); +bool8 sub_80E75D8(void); +bool8 sub_80E77C8(void); +void sub_80E7A98(void); void sub_80E7AD4(void); u8 sub_80E7B40(void); +void sub_80E7D30(void); void sub_80E7D6C(void); void sub_80E7D9C(void); +u8 sub_80E7DD0(void); void sub_80E7E50(void); void sub_80E7F00(); u8 sub_80E7FA8(void); @@ -236,20 +240,28 @@ void sub_80E95A4(void); void sub_80E9744(void); void sub_80E98C4(void); void sub_80E9974(void); +void sub_80E9A14(void); void sub_80E9A4C(void); void sub_80E9AD4(void); +void sub_80E9D00(void); +void sub_80E9D7C(void); +void sub_80E9E08(); +u8 sub_80E9E54(void); void sub_80E9E98(void); u8 sub_80E9EA8(void); u8 sub_80E9F50(void); u8 sub_80E9FD4(void); u8 sub_80EA014(void); u8 sub_80EA050(void); +u8 sub_80EA0E4(void); +u8 sub_80EA184(void); void sub_80EAC5C(void); void sub_80EAD08(void); u8 sub_80EAD7C(u8); void sub_80EAECC(void); void sub_80EB040(void); void sub_80EB0B0(void); +u16 sub_80EB2D4(); bool8 sub_80EB680(u16 *, u16, u16, u16); void sub_80E9C94(void); @@ -331,7 +343,7 @@ void sub_80E60D8(void) sub_80E62A0(gSpecialVar_0x8004, r1, sub_80546B8, r4); } -void sub_80E62A0(u8 a, u16 *b, void *c, u8 d) +void sub_80E62A0(u8 a, u16 *b, void (*c)(void), u8 d) { shared1000.unk0 = c; shared1000.unk4 = b; @@ -766,14 +778,11 @@ void sub_80E6AC4(void) void sub_80E6AE4(void) { shared1000.unk87 = sub_80E75D8(); - if (shared1000.unk87 != 0) + if (shared1000.unk87) PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) { - u8 r2; - PlaySE(SE_SELECT); - r2 = shared1000.unk86; if (shared1000.unk86 == shared1000.unk84) { switch (shared1000.unk85) @@ -791,7 +800,7 @@ void sub_80E6AE4(void) } else { - shared1000.unk27 = shared1000.unk83 * r2 + shared1000.unk85; + shared1000.unk27 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; sub_80E7574(); sub_80E682C(sub_80E6F68); return; @@ -805,8 +814,6 @@ void sub_80E6AE4(void) void sub_80E6BC0(void) { - //s8 selection; - switch (shared1000.unk24) { case 0: @@ -928,7 +935,7 @@ void sub_80E6D7C(void) shared1000.unk24 = 10; break; } - if (shared1000.unkC == 0xFFFF || shared1000.unkE == 0xFFFF) + if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) { sub_80E91D4(9); shared1000.unk24 = 10; @@ -963,7 +970,7 @@ void sub_80E6D7C(void) } if (shared1000.unk8 == 13) { - if (shared1000.unkC == 0xFFFF || shared1000.unkE == 0xFFFF) + if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) gSpecialVar_Result = 0; gSpecialVar_0x8004 = sub_80E810C(); } @@ -1040,7 +1047,7 @@ void sub_80E6FC8(void) } else { - if (shared1000.unk96 != 0) + if (shared1000.unk96) PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) { @@ -1205,4 +1212,369 @@ void sub_80E7294(void) } } +void sub_80E7324(void) +{ + switch (shared1000.unk24) + { + case 0: + if (sub_80E7DD0() == 0) + { + sub_80E682C(sub_80E7294); + } + else + { + sub_80E88F0(); + sub_80E87CC(0); + shared1000.unk24++; + } + break; + case 1: + shared1000.unk24++; + break; + case 2: + sub_80E9E98(); + shared1000.unk24++; + break; + case 3: + if (sub_80EA184() != 0) + shared1000.unk24++; + break; + case 4: + if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) + sub_80E682C(sub_80E6D7C); + else + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E73D0(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E87CC(0); + sub_80E88F0(); + shared1000.unk24++; + break; + case 1: + sub_80E9AD4(); + sub_80E9E98(); + shared1000.unk24++; + break; + case 2: + if (sub_80EA0E4() != 0) + { + sub_80E8D8C(1); + sub_80E9A14(); + shared1000.unk24++; + } + break; + case 3: + sub_80E8420(); + sub_80E8958(0); + shared1000.unk24++; + break; + case 4: + sub_80E9974(); + sub_80E682C(sub_80E6FC8); + break; + } +} + +void sub_80E7458(void) +{ + switch (shared1000.unk24) + { + case 0: + if (shared1000.unk1C4 == sub_80E6FC8) + sub_80E9D7C(); + else + sub_80E9D00(); + sub_80E9E08(shared1000.unk1BE); + shared1000.unk24++; + break; + case 1: + if (sub_80E9E54() != 0) + { + if (shared1000.unk1C4 == sub_80E6FC8) + { + sub_80E9D7C(); + shared1000.unk1B5 += shared1000.unk1C0; + sub_80E7A98(); + shared1000.unk96 = TRUE; + } + else + { + shared1000.unk9A29 += shared1000.unk1C0; + sub_80E7D30(); + shared1000.unk1B9 = 1; + } + shared1000.unk1BE = 2; + sub_80E682C(shared1000.unk1C4); + } + break; + } +} + +void sub_80E752C(void) +{ + switch (shared1000.unk24) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + shared1000.unk24++; + break; + case 1: + if (!UpdatePaletteFade()) + SetMainCallback2(shared1000.unk0); + break; + } +} + +void sub_80E7574(void) +{ + if (shared1000.unk8 == 1 + && shared1000.unk7E[shared1000.unk86] == 2 + && sub_80EB2D4(shared1000.unkC[shared1000.unk27]) != 7) + shared1000.unk7D = 1; + else + shared1000.unk7D = 0; + shared1000.unk7D = 0; // What the hell? +} + +bool8 sub_80E75D8(void) +{ + bool8 pressedUpDown = FALSE; + u8 r0; + + if (gMain.newKeys & START_BUTTON) + { + shared1000.unk86 = shared1000.unk84; + shared1000.unk85 = 2; + return TRUE; + } + + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + shared1000.unk86--; + if (shared1000.unk86 < 0) + shared1000.unk86 = shared1000.unk84; + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + shared1000.unk86++; + if (shared1000.unk86 > shared1000.unk84) + shared1000.unk86 = 0; + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + if (shared1000.unk9 == 2) + { + if (shared1000.unk86 == shared1000.unk84) + shared1000.unk85 = 2; + else + shared1000.unk85 = 0; + return TRUE; + } + else + { + if (shared1000.unk85 >= shared1000.unk83) + shared1000.unk85 = shared1000.unk83 - 1; + if (shared1000.unk86 != shared1000.unk84) + { + r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + if (r0 >= shared1000.unkA) + shared1000.unk85 = r0 - shared1000.unkA; + } + return TRUE; + } + } + else + { + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + if (--shared1000.unk85 < 0) + { + if (shared1000.unk86 == shared1000.unk84) + { + shared1000.unk85 = 2; + } + else + { + shared1000.unk85 = shared1000.unk83 - 1; + r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + if (r0 >= shared1000.unkA) + shared1000.unk85 = r0 - shared1000.unkA; + } + } + return TRUE; + } + if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + if (shared1000.unk86 == shared1000.unk84) + { + if (++shared1000.unk85 > 2) + shared1000.unk85 = 0; + } + else + { + if (++shared1000.unk85 >= shared1000.unk83) + shared1000.unk85 = 0; + r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + if (r0 >= shared1000.unkA) + shared1000.unk85 = r0 - shared1000.unkA; + } + return TRUE; + } + } + return FALSE; +} + +bool8 sub_80E77C8(void) +{ + bool8 pressedLeftRight = FALSE; + bool8 pressedUpDown; + + if (shared1000.unk1B7 != 0) + { + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + shared1000.unk1A8--; + if (shared1000.unk1A8 < 1) + shared1000.unk1A8 = 3; + return TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + shared1000.unk1A8++; + if (shared1000.unk1A8 > 3) + shared1000.unk1A8 = 1; + return TRUE; + } + } + else + { + if (shared1000.unk26 == 1) + { + pressedUpDown = FALSE; + + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + shared1000.unk1A8--; + if (shared1000.unk1A8 < 0) + shared1000.unk1A8 = 3; + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + shared1000.unk1A8++; + if (shared1000.unk1A8 > 3) + shared1000.unk1A8 = 0; + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + sub_80E7A98(); + return TRUE; + } + } + else + { + pressedUpDown = FALSE; + shared1000.unk1C0 = 0; + + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + if (shared1000.unk1A8 == 0) + return FALSE; + shared1000.unk1A8--; + if (shared1000.unk1A8 < shared1000.unk1B5) + shared1000.unk1C0 = -1; + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + if (shared1000.unk1A8 >= shared1000.unk1B6 - 1) + return FALSE; + shared1000.unk1A8++; + if (shared1000.unk1A8 > shared1000.unk1B5 + 3) + shared1000.unk1C0 = 1; + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + if (shared1000.unk1C0 == 0) + { + sub_80E7A98(); + return TRUE; + } + return FALSE; + } + } + } + + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + if (shared1000.unk1A9 != 0) + shared1000.unk1A9--; + else + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; + pressedLeftRight = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + if (shared1000.unk1B7 != 0 + || shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]) + shared1000.unk1A9 = 0; + else + shared1000.unk1A9++; + pressedLeftRight = TRUE; + } + + if (pressedLeftRight) + { + s8 r9 = shared1000.unk1B7; + + shared1000.unk1B7 = (shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]); + if (shared1000.unk1B7 != 0) + { + shared1000.unk1A8 -= shared1000.unk1B5; + if (shared1000.unk1A8 == 0) + { + shared1000.unk1A8 = 1; + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; + } + } + else if (r9 != 0) + { + shared1000.unk1A8 += shared1000.unk1B5; + if (shared1000.unk1A9 != 0) + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; + } + return TRUE; + } + + return FALSE; +} + +void sub_80E7A98(void) +{ + if (shared1000.unk1A9 >= shared1000.unk1AA[shared1000.unk1A8]) + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; +} + +void sub_80E7AD4(void) +{ + if (shared1000.unk26 == 0) + shared1000.unk1B8 = shared1000.unk2A[shared1000.unk1A8][shared1000.unk1A9]; + else + shared1000.unk1B8 = shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]; +} + #endif -- cgit v1.2.3 From 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 21:35:41 -0500 Subject: Remaining slot machine data --- data/slot_machine.s | 102 ----------------------------------------------- include/graphics.h | 7 ++++ ld_script.txt | 1 - src/field/slot_machine.c | 79 +++++++++++++++++++++++++++++++++--- 4 files changed, 80 insertions(+), 109 deletions(-) delete mode 100644 data/slot_machine.s diff --git a/data/slot_machine.s b/data/slot_machine.s deleted file mode 100644 index 23d2b8a74..000000000 --- a/data/slot_machine.s +++ /dev/null @@ -1,102 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083EDD1C:: @ 83EDD1C - .4byte gUnknown_08E95A18 + 148 - .4byte gUnknown_08E95A18 + 150 - .4byte gUnknown_08E95A18 + 152 - .4byte gUnknown_08E95A18 + 154 - .4byte gUnknown_08E95A18 + 156 - -gUnknown_083EDD30:: @ 83EDD30 - .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D - -gUnknown_083EDD35:: @ 83EDD35 - .byte 0, 0, 1, 2, 3, 4 - -gUnknown_083EDD3B:: @ 83EDD3B - .byte 1, 2, 2 - - .align 1 -Unknown_83EDD3E: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDD96.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDD3E.gbapal" - .endif - - .align 1 -Unknown_83EDD5E: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDDB6.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDD5E.gbapal" - .endif - - .align 1 -Unknown_83EDD7E: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDDD6.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDD7E.gbapal" - .endif - - .align 2 -gUnknown_083EDDA0:: @ 83EDDA0 - .4byte Unknown_83EDD3E - .4byte Unknown_83EDD5E - .4byte Unknown_83EDD7E - - .align 2 -gUnknown_083EDDAC:: @ 83EDDAC - .4byte gUnknown_08E95A18 + 32 - - .align 1 -Palette_83EDDB0: - .incbin "graphics/slot_machine/83EDDB0.gbapal" - - .align 1 -Palette_83EDDD0: - .incbin "graphics/slot_machine/83EDDD0.gbapal" - - .align 1 -Palette_83EDDF0: - .incbin "graphics/slot_machine/83EDDF0.gbapal" - - .align 2 -gUnknown_083EDE10:: @ 83EDE10 - .4byte Palette_83EDDB0 - .4byte Palette_83EDDD0 - .4byte Palette_83EDDF0 - .4byte gSlotMachineSpritePalette6 - - .align 2 -gUnknown_083EDE20:: @ 83EDE20 - .4byte gSlotMachineSpritePalette6 - - .align 1 -gPalette_83EDE24:: @ 83EDE24 - .incbin "graphics/slot_machine/83EDE24_pal.bin" - - .align 2 -gSlotMachineSpritePalettes:: @ 83EDE44 - obj_pal gSlotMachineSpritePalette0, 0 - obj_pal gSlotMachineSpritePalette1, 1 - obj_pal gSlotMachineSpritePalette2, 2 - obj_pal gSlotMachineSpritePalette3, 3 - obj_pal gSlotMachineSpritePalette4, 4 - obj_pal gSlotMachineSpritePalette5, 5 - obj_pal gSlotMachineSpritePalette6, 6 - obj_pal gSlotMachineSpritePalette4, 7 - null_obj_pal - - .align 2 -gUnknown_083EDE8C:: @ 83EDE8C - .incbin "graphics/slot_machine/reel_time.4bpp.lz" - - .align 2 -gReelTimeWindowTilemap:: @ 83EEFE0 - .incbin "graphics/slot_machine/reel_time_window_map.bin" diff --git a/include/graphics.h b/include/graphics.h index 5f19b09cb..1d66172ca 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2690,5 +2690,12 @@ extern const u8 gSlotMachineNumber7Tiles[]; extern const u8 gSlotMachineNumber8Tiles[]; extern const u8 gSlotMachineNumber9Tiles[]; extern const u8 gUnknownPalette_08E997E8[]; +extern const u16 gSlotMachineSpritePalette0[]; +extern const u16 gSlotMachineSpritePalette1[]; +extern const u16 gSlotMachineSpritePalette2[]; +extern const u16 gSlotMachineSpritePalette3[]; +extern const u16 gSlotMachineSpritePalette4[]; +extern const u16 gSlotMachineSpritePalette5[]; +extern const u16 gSlotMachineSpritePalette6[]; #endif // GUARD_GRAPHICS_H diff --git a/ld_script.txt b/ld_script.txt index c02c6873e..058f6aaca 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -550,7 +550,6 @@ SECTIONS { data/cute_sketch.o(.rodata); src/field/decoration.o(.rodata); src/field/slot_machine.o(.rodata); - data/slot_machine.o(.rodata); src/scene/contest_painting.o(.rodata); src/battle/battle_ai.o(.rodata); src/field/trader.o(.rodata); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 4aa6af742..e1687b3d1 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -2244,8 +2244,8 @@ void sub_8103CC8(struct Task *task, u8 taskId) } extern const u16 *const gUnknown_083EDD08[]; -extern const u16 *const gUnknown_083EDD1C[]; -extern const u8 gUnknown_083EDD30[]; +const u16 *const gUnknown_083EDD1C[]; +const u8 gUnknown_083EDD30[]; static void sub_8103D00(u8 a0) { @@ -2257,8 +2257,8 @@ static void sub_8103D28(u8 a0) LoadPalette(gUnknown_083EDD1C[a0], gUnknown_083EDD30[a0], 2); } -extern const u8 gUnknown_083EDD3B[]; -extern const u8 gUnknown_083EDD35[][2]; +const u8 gUnknown_083EDD35[][2]; +const u8 gUnknown_083EDD3B[]; static void sub_8103D50(u8 a0) { @@ -2369,8 +2369,8 @@ static void sub_8103F70(void) sub_8103FE8(taskId); } -extern const u16 *const gUnknown_083EDDA0[]; -extern const u16 *const gUnknown_083EDDAC; +const u16 *const gUnknown_083EDDA0[]; +const u16 *const gUnknown_083EDDAC; static bool8 sub_8103FA0(void) { @@ -5409,3 +5409,70 @@ const u16 *const gUnknown_083EDD08[] = { UnknownPalette_83EDCE8 + 14 }; +const u16 *const gUnknown_083EDD1C[] = { + gUnknown_08E95A18 + 74, + gUnknown_08E95A18 + 75, + gUnknown_08E95A18 + 76, + gUnknown_08E95A18 + 77, + gUnknown_08E95A18 + 78 +}; + +const u8 gUnknown_083EDD30[] = { + 0x4a, 0x4b, 0x4c, 0x4e, 0x4d +}; + +const u8 gUnknown_083EDD35[][2] = { + {0, 0}, + {1, 2}, + {3, 4} +}; +const u8 gUnknown_083EDD3B[] = {1, 2, 2}; + +#ifdef SAPPHIRE +const u16 Unknown_83EDD3E[] = INCBIN_U16("graphics/unknown/sapphire_83EDD96.gbapal"); +const u16 Unknown_83EDD5E[] = INCBIN_U16("graphics/unknown/sapphire_83EDDB6.gbapal"); +const u16 Unknown_83EDD7E[] = INCBIN_U16("graphics/unknown/sapphire_83EDDD6.gbapal"); +#elif defined (RUBY) +const u16 Unknown_83EDD3E[] = INCBIN_U16("graphics/unknown/ruby_83EDD3E.gbapal"); +const u16 Unknown_83EDD5E[] = INCBIN_U16("graphics/unknown/ruby_83EDD5E.gbapal"); +const u16 Unknown_83EDD7E[] = INCBIN_U16("graphics/unknown/ruby_83EDD7E.gbapal"); +#endif // RS + +const u16 *const gUnknown_083EDDA0[] = { + Unknown_83EDD3E, + Unknown_83EDD5E, + Unknown_83EDD7E +}; + +const u16 *const gUnknown_083EDDAC = gUnknown_08E95A18 + 16; + +const u16 Palette_83EDDB0[] = INCBIN_U16("graphics/slot_machine/83EDDB0.gbapal"); +const u16 Palette_83EDDD0[] = INCBIN_U16("graphics/slot_machine/83EDDD0.gbapal"); +const u16 Palette_83EDDF0[] = INCBIN_U16("graphics/slot_machine/83EDDF0.gbapal"); + +const u16 *const gUnknown_083EDE10[] = { + Palette_83EDDB0, + Palette_83EDDD0, + Palette_83EDDF0, + gSlotMachineSpritePalette6 +}; + +const u16 *const gUnknown_083EDE20 = gSlotMachineSpritePalette6; + +const u16 gPalette_83EDE24[] = INCBIN_U16("graphics/slot_machine/83EDE24_pal.bin"); + +const struct SpritePalette gSlotMachineSpritePalettes[] = { + {gSlotMachineSpritePalette0, 0}, + {gSlotMachineSpritePalette1, 1}, + {gSlotMachineSpritePalette2, 2}, + {gSlotMachineSpritePalette3, 3}, + {gSlotMachineSpritePalette4, 4}, + {gSlotMachineSpritePalette5, 5}, + {gSlotMachineSpritePalette6, 6}, + {gSlotMachineSpritePalette4, 7}, + {} +}; + +const u8 gUnknown_083EDE8C[] = INCBIN_U8("graphics/slot_machine/reel_time.4bpp.lz"); + +const u16 gReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window_map.bin"); -- cgit v1.2.3 From 2d95fb9b9774df71c19a442ed2ce0aead8ece63b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 2 Jan 2018 21:03:40 -0600 Subject: decompile sub_80E7B40 - sub_80E8094 --- asm/easy_chat.s | 782 ------------------------------------------------- src/easy_chat_before.c | 251 +++++++++++++++- 2 files changed, 235 insertions(+), 798 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 708881567..117fa693f 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,788 +5,6 @@ .text - thumb_func_start sub_80E7B40 -sub_80E7B40: @ 80E7B40 - push {r4-r7,lr} - movs r5, 0 - ldr r2, _080E7B8C @ =gSharedMem + 0x1000 - movs r0, 0xE0 - lsls r0, 1 - adds r6, r2, r0 - strb r5, [r6] - ldr r1, _080E7B90 @ =gMain - ldrh r4, [r1, 0x30] - movs r0, 0x40 - ands r0, r4 - adds r3, r2, 0 - adds r7, r1, 0 - cmp r0, 0 - beq _080E7B9C - ldr r2, _080E7B94 @ =0x000099a4 - adds r1, r3, r2 - ldrb r2, [r1] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bne _080E7B6E - b _080E7D1A -_080E7B6E: - subs r0, r2, 0x1 - strb r0, [r1] - ldr r4, _080E7B98 @ =0x00009a29 - adds r1, r3, r4 - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - cmp r0, r1 - bge _080E7BF2 - movs r0, 0xFF - strb r0, [r6] - b _080E7D1A - .align 2, 0 -_080E7B8C: .4byte gSharedMem + 0x1000 -_080E7B90: .4byte gMain -_080E7B94: .4byte 0x000099a4 -_080E7B98: .4byte 0x00009a29 -_080E7B9C: - movs r0, 0x80 - ands r0, r4 - cmp r0, 0 - beq _080E7BEE - ldr r0, _080E7BE0 @ =0x000099a4 - adds r2, r3, r0 - movs r1, 0 - ldrsb r1, [r2, r1] - ldr r4, _080E7BE4 @ =0x00009a28 - adds r0, r3, r4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, 0x1 - cmp r1, r0 - blt _080E7BBE - b _080E7D1A -_080E7BBE: - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - movs r1, 0 - ldrsb r1, [r2, r1] - ldr r2, _080E7BE8 @ =0x00009a29 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x4 - cmp r1, r0 - blt _080E7BEC - movs r0, 0x1 - strb r0, [r6] - b _080E7D1A - .align 2, 0 -_080E7BE0: .4byte 0x000099a4 -_080E7BE4: .4byte 0x00009a28 -_080E7BE8: .4byte 0x00009a29 -_080E7BEC: - movs r5, 0x1 -_080E7BEE: - cmp r5, 0 - beq _080E7BFA -_080E7BF2: - bl sub_80E7D30 -_080E7BF6: - movs r0, 0x1 - b _080E7D1C -_080E7BFA: - ldrh r1, [r7, 0x30] - movs r0, 0x20 - ands r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - beq _080E7C38 - ldr r4, _080E7C30 @ =0x000099a5 - adds r2, r3, r4 - ldrb r0, [r2] - subs r0, 0x1 - strb r0, [r2] - lsls r0, 24 - cmp r0, 0 - bge _080E7BF6 - ldr r6, _080E7C34 @ =0x000099a4 - adds r0, r3, r6 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r4, 0x1 - adds r1, r3, r4 - adds r0, r1 - ldrb r0, [r0] - subs r0, 0x1 - strb r0, [r2] - b _080E7BF6 - .align 2, 0 -_080E7C30: .4byte 0x000099a5 -_080E7C34: .4byte 0x000099a4 -_080E7C38: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080E7C70 - ldr r6, _080E7C68 @ =0x000099a5 - adds r4, r3, r6 - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - ldr r2, _080E7C6C @ =0x000099a4 - adds r1, r3, r2 - movs r2, 0 - ldrsb r2, [r1, r2] - adds r6, 0x1 - adds r1, r3, r6 - adds r2, r1 - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r2, r1] - cmp r0, r1 - blt _080E7BF6 - strb r5, [r4] - b _080E7BF6 - .align 2, 0 -_080E7C68: .4byte 0x000099a5 -_080E7C6C: .4byte 0x000099a4 -_080E7C70: - ldrh r1, [r7, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080E7CC4 - ldr r1, _080E7CBC @ =0x00009a29 - adds r0, r3, r1 - ldrb r1, [r0] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E7CA2 - negs r0, r1 - movs r4, 0xE0 - lsls r4, 1 - adds r2, r3, r4 - strb r0, [r2] - lsls r0, 24 - asrs r0, 24 - movs r1, 0x4 - negs r1, r1 - cmp r0, r1 - bge _080E7CA2 - strb r1, [r2] -_080E7CA2: - ldr r6, _080E7CC0 @ =0x000099a4 - adds r1, r3, r6 - movs r2, 0xE0 - lsls r2, 1 - adds r0, r3, r2 - ldrb r0, [r0] - ldrb r4, [r1] - adds r0, r4 - strb r0, [r1] - movs r6, 0xDF - lsls r6, 1 - adds r1, r3, r6 - b _080E7D16 - .align 2, 0 -_080E7CBC: .4byte 0x00009a29 -_080E7CC0: .4byte 0x000099a4 -_080E7CC4: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080E7D1A - ldr r0, _080E7D24 @ =0x00009a29 - adds r4, r3, r0 - movs r1, 0 - ldrsb r1, [r4, r1] - ldr r6, _080E7D28 @ =0x00009a28 - adds r2, r3, r6 - movs r0, 0 - ldrsb r0, [r2, r0] - subs r0, 0x4 - cmp r1, r0 - bge _080E7CFE - ldrb r1, [r4] - adds r1, 0x4 - ldrb r0, [r2] - subs r0, r1 - movs r2, 0xE0 - lsls r2, 1 - adds r1, r3, r2 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - ble _080E7CFE - movs r0, 0x4 - strb r0, [r1] -_080E7CFE: - ldr r4, _080E7D2C @ =0x000099a4 - adds r1, r3, r4 - movs r6, 0xE0 - lsls r6, 1 - adds r0, r3, r6 - ldrb r0, [r0] - ldrb r2, [r1] - adds r0, r2 - strb r0, [r1] - movs r4, 0xDF - lsls r4, 1 - adds r1, r3, r4 -_080E7D16: - movs r0, 0x4 - strb r0, [r1] -_080E7D1A: - movs r0, 0 -_080E7D1C: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080E7D24: .4byte 0x00009a29 -_080E7D28: .4byte 0x00009a28 -_080E7D2C: .4byte 0x000099a4 - thumb_func_end sub_80E7B40 - - thumb_func_start sub_80E7D30 -sub_80E7D30: @ 80E7D30 - push {r4,lr} - ldr r0, _080E7D60 @ =gSharedMem + 0x1000 - ldr r1, _080E7D64 @ =0x000099a5 - adds r4, r0, r1 - ldr r2, _080E7D68 @ =0x000099a4 - adds r1, r0, r2 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - adds r2, 0x2 - adds r0, r2 - adds r1, r0 - movs r2, 0 - ldrsb r2, [r4, r2] - ldrb r3, [r1] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - blt _080E7D5A - subs r0, r3, 0x1 - strb r0, [r4] -_080E7D5A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7D60: .4byte gSharedMem + 0x1000 -_080E7D64: .4byte 0x000099a5 -_080E7D68: .4byte 0x000099a4 - thumb_func_end sub_80E7D30 - - thumb_func_start sub_80E7D6C -sub_80E7D6C: @ 80E7D6C - push {r4,r5,lr} - movs r4, 0 - ldr r0, _080E7D94 @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0xA] - cmp r4, r1 - bcs _080E7D8E - adds r5, r0, 0 -_080E7D7A: - adds r0, r4, 0 - ldr r1, _080E7D98 @ =0x0000ffff - bl sub_80E7F00 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrb r0, [r5, 0xA] - cmp r4, r0 - bcc _080E7D7A -_080E7D8E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E7D94: .4byte gSharedMem + 0x1000 -_080E7D98: .4byte 0x0000ffff - thumb_func_end sub_80E7D6C - - thumb_func_start sub_80E7D9C -sub_80E7D9C: @ 80E7D9C - push {r4,r5,lr} - movs r2, 0 - ldr r0, _080E7DCC @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0xA] - cmp r2, r1 - bcs _080E7DC6 - adds r3, r0, 0 - ldr r4, [r3, 0x4] - adds r5, r3, 0 - adds r5, 0xC -_080E7DB0: - lsls r0, r2, 1 - adds r1, r0, r4 - adds r0, r5 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldrb r0, [r3, 0xA] - cmp r2, r0 - bcc _080E7DB0 -_080E7DC6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E7DCC: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7D9C - - thumb_func_start sub_80E7DD0 -sub_80E7DD0: @ 80E7DD0 - push {r4,lr} - ldr r2, _080E7E28 @ =gSharedMem + 0x1000 - ldr r1, _080E7E2C @ =0x000099a5 - adds r0, r2, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r1, 1 - ldr r3, _080E7E30 @ =0x000099a4 - adds r0, r2, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 2 - adds r1, r0 - adds r3, 0x86 - adds r0, r2, r3 - adds r1, r0 - ldrh r4, [r1] - adds r0, r2, 0 - adds r0, 0x7D - ldrb r0, [r0] - cmp r0, 0 - beq _080E7E34 - adds r0, r2, 0 - adds r0, 0x86 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r2, 0 - adds r1, 0x7E - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x1 - bls _080E7E34 - adds r0, r4, 0 - bl sub_80EB2D4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - bne _080E7E34 - movs r0, 0 - b _080E7E46 - .align 2, 0 -_080E7E28: .4byte gSharedMem + 0x1000 -_080E7E2C: .4byte 0x000099a5 -_080E7E30: .4byte 0x000099a4 -_080E7E34: - ldr r0, _080E7E4C @ =gSharedMem + 0x1000 - adds r0, 0x27 - ldrb r0, [r0] - adds r1, r4, 0 - bl sub_80E7F00 - bl sub_80E95A4 - movs r0, 0x1 -_080E7E46: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080E7E4C: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7DD0 - - thumb_func_start sub_80E7E50 -sub_80E7E50: @ 80E7E50 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r5, 0 - movs r2, 0 - ldr r1, _080E7EF0 @ =gSharedMem + 0x1000 - adds r3, r1, 0 - adds r3, 0x84 - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r2, r0 - bge _080E7EDE - mov r8, r1 - adds r0, r1, 0 - str r0, [sp] -_080E7E74: - mov r0, r8 - adds r0, 0x7E - adds r0, r2, r0 - movs r1, 0 - strb r1, [r0] - movs r3, 0 - ldr r6, _080E7EF4 @ =gSharedMem + 0x1083 - movs r0, 0 - ldrsb r0, [r6, r0] - adds r1, r2, 0x1 - str r1, [sp, 0x4] - cmp r3, r0 - bge _080E7ECE - ldr r6, [sp] - mov r12, r6 - movs r0, 0 - mov r10, r0 - ldr r1, _080E7EF4 @ =gSharedMem + 0x1083 - mov r9, r1 - ldr r7, _080E7EF8 @ =gSharedMem + 0x100C - lsls r4, r2, 1 -_080E7E9E: - lsls r1, r5, 1 - adds r2, r1, r7 - mov r6, r12 - ldr r0, [r6, 0x4] - adds r1, r0 - ldrh r0, [r1] - strh r0, [r2] - adds r0, r3, r4 - mov r1, r12 - adds r1, 0x8C - adds r0, r1 - mov r1, r10 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - mov r6, r9 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r3, r0 - blt _080E7E9E -_080E7ECE: - ldr r1, [sp, 0x4] - lsls r0, r1, 16 - lsrs r2, r0, 16 - ldr r6, _080E7EFC @ =gSharedMem + 0x1084 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r2, r0 - blt _080E7E74 -_080E7EDE: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E7EF0: .4byte gSharedMem + 0x1000 -_080E7EF4: .4byte gSharedMem + 0x1083 -_080E7EF8: .4byte gSharedMem + 0x100C -_080E7EFC: .4byte gSharedMem + 0x1084 - thumb_func_end sub_80E7E50 - - thumb_func_start sub_80E7F00 -sub_80E7F00: @ 80E7F00 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - ldr r7, _080E7F68 @ =gSharedMem + 0x1000 - adds r0, r7, 0 - adds r0, 0x83 - movs r4, 0 - ldrsb r4, [r0, r4] - adds r0, r6, 0 - adds r1, r4, 0 - bl __divsi3 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r6, 0 - adds r1, r4, 0 - bl __modsi3 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - lsls r0, r6, 1 - adds r1, r7, 0 - adds r1, 0xC - adds r0, r1 - ldrh r0, [r0] - bl sub_80EB2D4 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r9 - bl sub_80EB2D4 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r4, 0x7 - bne _080E7F6C - cmp r3, 0x7 - beq _080E7F7C - adds r1, r7, 0 - adds r1, 0x7E - adds r1, r5, r1 - ldrb r0, [r1] - subs r0, 0x1 - b _080E7F7A - .align 2, 0 -_080E7F68: .4byte gSharedMem + 0x1000 -_080E7F6C: - cmp r3, 0x7 - bne _080E7F7C - adds r1, r7, 0 - adds r1, 0x7E - adds r1, r5, r1 - ldrb r0, [r1] - adds r0, 0x1 -_080E7F7A: - strb r0, [r1] -_080E7F7C: - movs r3, 0 - ldr r2, _080E7FA4 @ =gSharedMem + 0x1000 - lsls r0, r5, 1 - add r0, r8 - adds r1, r2, 0 - adds r1, 0x8C - adds r0, r1 - strb r3, [r0] - lsls r0, r6, 1 - adds r2, 0xC - adds r0, r2 - mov r1, r9 - strh r1, [r0] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E7FA4: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7F00 - - thumb_func_start sub_80E7FA8 -sub_80E7FA8: @ 80E7FA8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r0, 0 - mov r8, r0 - movs r5, 0 - ldr r0, _080E8040 @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0xA] - cmp r8, r1 - bcs _080E802E - ldr r3, _080E8044 @ =0x00009e14 - adds r6, r0, r3 - ldr r1, _080E8048 @ =0x00009e41 - adds r1, r0 - mov r9, r1 -_080E7FC8: - ldr r3, _080E804C @ =0xffff61ec - adds r7, r6, r3 - ldr r0, [r7, 0x4] - lsls r4, r5, 1 - adds r0, r4, r0 - ldrh r1, [r0] - adds r0, r6, 0 - movs r2, 0 - bl sub_80EB218 - ldr r1, _080E8050 @ =0xffff61f8 - adds r0, r6, r1 - adds r0, r4 - ldrh r1, [r0] - mov r0, r9 - movs r2, 0 - bl sub_80EB218 - adds r1, r6, 0 - mov r2, r9 - ldrb r0, [r1] - adds r4, r5, 0x1 - ldrb r3, [r2] - cmp r0, r3 - bne _080E8018 - adds r3, r7, 0 - cmp r0, 0xFF - beq _080E8010 -_080E8000: - adds r1, 0x1 - adds r2, 0x1 - ldrb r0, [r1] - ldrb r5, [r2] - cmp r0, r5 - bne _080E8018 - cmp r0, 0xFF - bne _080E8000 -_080E8010: - ldrb r0, [r1] - ldrb r2, [r2] - cmp r0, r2 - beq _080E8024 -_080E8018: - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r3, _080E8040 @ =gSharedMem + 0x1000 -_080E8024: - lsls r0, r4, 16 - lsrs r5, r0, 16 - ldrb r3, [r3, 0xA] - cmp r5, r3 - bcc _080E7FC8 -_080E802E: - mov r1, r8 - lsls r0, r1, 24 - lsrs r0, 24 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080E8040: .4byte gSharedMem + 0x1000 -_080E8044: .4byte 0x00009e14 -_080E8048: .4byte 0x00009e41 -_080E804C: .4byte 0xffff61ec -_080E8050: .4byte 0xffff61f8 - thumb_func_end sub_80E7FA8 - - thumb_func_start sub_80E8054 -sub_80E8054: @ 80E8054 - push {r4,lr} - movs r1, 0 - ldr r2, _080E8078 @ =gSharedMem + 0x1000 - ldrb r0, [r2, 0xA] - cmp r1, r0 - bcs _080E808A - adds r4, r2, 0 - adds r4, 0xC - ldr r3, _080E807C @ =0x0000ffff - adds r2, r0, 0 -_080E8068: - lsls r0, r1, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r0, r3 - beq _080E8080 - movs r0, 0 - b _080E808C - .align 2, 0 -_080E8078: .4byte gSharedMem + 0x1000 -_080E807C: .4byte 0x0000ffff -_080E8080: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r2 - bcc _080E8068 -_080E808A: - movs r0, 0x1 -_080E808C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80E8054 - - thumb_func_start sub_80E8094 -sub_80E8094: @ 80E8094 - push {r4-r7,lr} - movs r5, 0 - ldr r6, _080E80C4 @ =gSharedMem + 0xAE14 - adds r7, r6, 0 - adds r7, 0x2D -_080E809E: - lsls r4, r5, 1 - ldr r1, _080E80C8 @ =0xffff61f8 - adds r0, r6, r1 - adds r0, r4 - ldrh r1, [r0] - adds r0, r6, 0 - movs r2, 0 - bl sub_80EB218 - ldr r0, _080E80CC @ =gMysteryEventPhrase - adds r4, r0 - ldrh r1, [r4] - adds r0, r7, 0 - movs r2, 0 - bl sub_80EB218 - adds r3, r6, 0 - adds r4, r7, 0 - b _080E80D8 - .align 2, 0 -_080E80C4: .4byte gSharedMem + 0xAE14 -_080E80C8: .4byte 0xffff61f8 -_080E80CC: .4byte gMysteryEventPhrase -_080E80D0: - adds r4, 0x1 - adds r3, 0x1 - cmp r2, r1 - bne _080E80F4 -_080E80D8: - ldrb r2, [r3] - adds r0, r2, 0 - cmp r0, 0xFF - beq _080E80EE - ldrb r1, [r4] - adds r0, r1, 0 - cmp r0, 0xFF - bne _080E80D0 - ldrb r0, [r3] - cmp r0, 0xFF - bne _080E80F4 -_080E80EE: - ldrb r0, [r4] - cmp r0, 0xFF - beq _080E80F8 -_080E80F4: - movs r0, 0 - b _080E8104 -_080E80F8: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _080E809E - movs r0, 0x1 -_080E8104: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80E8094 - thumb_func_start sub_80E810C sub_80E810C: @ 80E810C push {r4-r7,lr} diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index 9d6989612..c43804c23 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -46,7 +46,7 @@ struct Shared1000 bool8 unk87; u16 unk88; u16 unk8A; - u8 filler8C[0x96-0x8C]; + u8 unk8C[(0x96-0x8C)/2][2]; u8 unk96; u8 filler97[0x1A8-0x97]; s8 unk1A8; @@ -73,28 +73,33 @@ struct Shared1000 #if GERMAN u8 filler99A4_de[2]; #endif - u8 unk99A4; - u8 unk99A5; - u8 unk99A6[0xA28-0x9A6]; + s8 unk99A4; + s8 unk99A5; + s8 unk99A6[0xA28-0x9A6]; s8 unk9A28; - u8 unk9A29; - u8 filler9A2A[0xC7C-0xA2A]; + s8 unk9A29; + //u8 filler9A2A[0xC7C-0xA2A]; + u16 unk9A2A[0x94][2]; // unknown length + u8 filler9C7A[2]; u16 unk9C7C; // this is at 0x9FA8 in German s16 unk9C7E; u8 filler9C80[0xDA4-0xC80]; u8 unk9DA4[0x24]; - u8 filler9DC8[0xF6E - 0xDC8]; + u8 filler9DC8[0xE14 - 0xDC8]; + u8 unk9E14[0xE41 - 0xE14]; + u8 unk9E41[0xF6E - 0xE41]; u8 unk9F6E[1]; // unknown length }; #define static_assert(cond) \ typedef char test_[(cond) ? 1 : -1] -static_assert(offsetof(struct Shared1000, unk20) == 0x20); +//static_assert(offsetof(struct Shared1000, unk9DA4) == 0x9DA4); #define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) const u16 gMysteryEventPhrase[] = {EC_WORD_MYSTERY, EC_WORD_EVENT, EC_WORD_IS, EC_WORD_EXCITING}; + const u16 gBerryMasterWifePhrases[][2] = { #if ENGLISH @@ -209,15 +214,15 @@ bool8 sub_80E75D8(void); bool8 sub_80E77C8(void); void sub_80E7A98(void); void sub_80E7AD4(void); -u8 sub_80E7B40(void); +bool8 sub_80E7B40(void); void sub_80E7D30(void); void sub_80E7D6C(void); void sub_80E7D9C(void); -u8 sub_80E7DD0(void); +bool8 sub_80E7DD0(void); void sub_80E7E50(void); -void sub_80E7F00(); +void sub_80E7F00(u16, u16); u8 sub_80E7FA8(void); -u8 sub_80E8054(void); +bool8 sub_80E8054(void); u8 sub_80E8094(void); u8 sub_80E810C(void); void sub_80E81C0(void); @@ -243,6 +248,7 @@ void sub_80E9974(void); void sub_80E9A14(void); void sub_80E9A4C(void); void sub_80E9AD4(void); +void sub_80E9C94(void); void sub_80E9D00(void); void sub_80E9D7C(void); void sub_80E9E08(); @@ -261,9 +267,9 @@ u8 sub_80EAD7C(u8); void sub_80EAECC(void); void sub_80EB040(void); void sub_80EB0B0(void); +void sub_80EB218(); u16 sub_80EB2D4(); bool8 sub_80EB680(u16 *, u16, u16, u16); -void sub_80E9C94(void); // TODO: Integrate German code into this #if ENGLISH @@ -921,7 +927,7 @@ void sub_80E6D7C(void) { case 0: sub_80E8398(2); - if (sub_80E8054() != 0) + if (sub_80E8054()) { sub_80E91D4(5); shared1000.unk24 = 10; @@ -1198,7 +1204,7 @@ void sub_80E7294(void) } else { - if (shared1000.unk1B9 != 0) + if (shared1000.unk1B9) PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) { @@ -1217,7 +1223,7 @@ void sub_80E7324(void) switch (shared1000.unk24) { case 0: - if (sub_80E7DD0() == 0) + if (!sub_80E7DD0()) { sub_80E682C(sub_80E7294); } @@ -1577,4 +1583,217 @@ void sub_80E7AD4(void) shared1000.unk1B8 = shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]; } +bool8 sub_80E7B40(void) +{ + bool8 pressedUpDown = FALSE; + + shared1000.unk1C0 = 0; + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + if (shared1000.unk99A4 == 0) + return FALSE; + shared1000.unk99A4--; + if (shared1000.unk99A4 < shared1000.unk9A29) + { + shared1000.unk1C0 = -1; + return FALSE; + } + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + if (shared1000.unk99A4 >= shared1000.unk9A28 - 1) + return FALSE; + shared1000.unk99A4++; + if (shared1000.unk99A4 >= shared1000.unk9A29 + 4) + { + shared1000.unk1C0 = 1; + return FALSE; + } + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + sub_80E7D30(); + return TRUE; + } + + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + shared1000.unk99A5--; + if (shared1000.unk99A5 < 0) + shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; + return TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + shared1000.unk99A5++; + if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) + shared1000.unk99A5 = 0; + return TRUE; + } + + if (gMain.newKeys & START_BUTTON) + { + if (shared1000.unk9A29 != 0) + { + shared1000.unk1C0 = -shared1000.unk9A29; + if (shared1000.unk1C0 < -4) + shared1000.unk1C0 = -4; + } + shared1000.unk99A4 += shared1000.unk1C0; + shared1000.unk1BE = 4; + } + else if (gMain.newKeys & SELECT_BUTTON) + { + if (shared1000.unk9A29 < shared1000.unk9A28 - 4) + { + shared1000.unk1C0 = shared1000.unk9A28 - 4 - shared1000.unk9A29; + if (shared1000.unk1C0 > 4) + shared1000.unk1C0 = 4; + } + shared1000.unk99A4 += shared1000.unk1C0; + shared1000.unk1BE = 4; + } + + return FALSE; +} + +void sub_80E7D30(void) +{ + if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) + shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; +} + +void sub_80E7D6C(void) +{ + u16 i; + + for (i = 0; i < shared1000.unkA; i++) + sub_80E7F00(i, 0xFFFF); +} + +void sub_80E7D9C(void) +{ + u16 i; + + for (i = 0; i < shared1000.unkA; i++) + shared1000.unk4[i] = shared1000.unkC[i]; +} + +bool8 sub_80E7DD0(void) +{ + u16 r4 = shared1000.unk9A2A[shared1000.unk99A4][shared1000.unk99A5]; + + if (shared1000.unk7D != 0 + && shared1000.unk7E[shared1000.unk86] > 1 + && sub_80EB2D4(r4) == 7) + return FALSE; + + sub_80E7F00(shared1000.unk27, r4); + sub_80E95A4(); + return TRUE; +} + +void sub_80E7E50(void) +{ + u16 r5 = 0; + u16 i; + u16 j; + + for (i = 0; i < shared1000.unk84; i++) + { + shared1000.unk7E[i] = 0; + for (j = 0; j < shared1000.unk83; j++) + { + shared1000.unkC[r5] = shared1000.unk4[r5]; + shared1000.unk8C[i][j] = 0; + r5++; + } + } +} + +void sub_80E7F00(u16 a, u16 b) +{ + u16 r5 = a / shared1000.unk83; + u16 r8 = a % shared1000.unk83; + u16 r4 = sub_80EB2D4(shared1000.unkC[a]); + u16 r3 = sub_80EB2D4(b); + + if (r4 == 7) + { + if (r3 != 7) + shared1000.unk7E[r5]--; + } + else + { + if (r3 == 7) + shared1000.unk7E[r5]++; + } + r3 = 0; + shared1000.unk8C[r5][r8] = r3; + shared1000.unkC[a] = b; +} + +u8 sub_80E7FA8(void) +{ + u16 r8 = 0; + u16 i; + u8 *r1; + u8 *r2; + + for (i = 0; i < shared1000.unkA; i++) + { + sub_80EB218(shared1000.unk9E14, shared1000.unk4[i], 0); + sub_80EB218(shared1000.unk9E41, shared1000.unkC[i], 0); + r1 = shared1000.unk9E14; + r2 = shared1000.unk9E41; + while (*r1 == *r2 && *r1 != 0xFF) + { + r1++; + r2++; + } + if (*r1 != *r2) + r8++; + } + return r8; +} + +bool8 sub_80E8054(void) +{ + u16 i; + + for (i = 0; i < shared1000.unkA; i++) + { + if (shared1000.unkC[i] != 0xFFFF) + return FALSE; + } + return TRUE; +} + +// CheckMysteryEventPhrase +bool8 sub_80E8094(void) +{ + u16 i; + u8 *r3; + u8 *r4; + + for (i = 0; i < 4; i++) + { + sub_80EB218(shared1000.unk9E14, shared1000.unkC[i], 0); + sub_80EB218(shared1000.unk9E41, gMysteryEventPhrase[i], 0); + r3 = shared1000.unk9E14; + r4 = shared1000.unk9E41; + while (*r3 != 0xFF && *r4 != 0xFF) + { + if (*r3++ != *r4++) + return FALSE; + } + if (*r3 != 0xFF || *r4 != 0xFF) + return FALSE; + } + return TRUE; +} + #endif -- cgit v1.2.3 From 967d010f6dc9b7e07550154894307a24f165bbd8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 3 Jan 2018 00:09:13 -0600 Subject: integrate some German easy chat code --- asm-de/easy_chat.s | 4165 ------------------------------------------------ src/easy_chat_before.c | 38 +- 2 files changed, 7 insertions(+), 4196 deletions(-) diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 89ea03b69..906b8fe88 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -5,4171 +5,6 @@ .text - thumb_func_start sub_80E60D8 -sub_80E60D8: @ 80E60D8 - push {r4-r7,lr} - movs r4, 0x3 - ldr r0, _080E60F4 @ =gSpecialVar_0x8004 - ldrh r1, [r0] - adds r7, r0, 0 - cmp r1, 0xD - bls _080E60E8 - b _080E6284 -_080E60E8: - lsls r0, r1, 2 - ldr r1, _080E60F8 @ =_080E60FC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E60F4: .4byte gSpecialVar_0x8004 -_080E60F8: .4byte _080E60FC - .align 2, 0 -_080E60FC: - .4byte _080E6134 - .4byte _080E613C - .4byte _080E6144 - .4byte _080E614C - .4byte _080E6154 - .4byte _080E619C - .4byte _080E616C - .4byte _080E61BC - .4byte _080E61E0 - .4byte _080E61FC - .4byte _080E6200 - .4byte _080E6214 - .4byte _080E623C - .4byte _080E6260 -_080E6134: - ldr r1, _080E6138 @ =gSaveBlock1 + 0x2B1C - b _080E624C - .align 2, 0 -_080E6138: .4byte gSaveBlock1 + 0x2B1C -_080E613C: - ldr r1, _080E6140 @ =gSaveBlock1 + 0x2B28 - b _080E6276 - .align 2, 0 -_080E6140: .4byte gSaveBlock1 + 0x2B28 -_080E6144: - ldr r1, _080E6148 @ =gSaveBlock1 + 0x2B34 - b _080E624C - .align 2, 0 -_080E6148: .4byte gSaveBlock1 + 0x2B34 -_080E614C: - ldr r1, _080E6150 @ =gSaveBlock1 + 0x2B40 - b _080E6276 - .align 2, 0 -_080E6150: .4byte gSaveBlock1 + 0x2B40 -_080E6154: - ldr r0, _080E6164 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E6168 @ =gSaveBlock1 + 0x2B4C - adds r1, r0, r1 - b _080E624C - .align 2, 0 -_080E6164: .4byte gSpecialVar_0x8005 -_080E6168: .4byte gSaveBlock1 + 0x2B4C -_080E616C: - ldr r0, _080E6194 @ =gSaveBlock1 + 0x2D94 - movs r2, 0 - ldr r1, _080E6198 @ =sub_80546B8 - mov r12, r1 - adds r3, r0, 0 - adds r3, 0xE - adds r5, r0, 0x2 - adds r6, r3, 0 -_080E617C: - lsls r0, r2, 1 - adds r1, r3, r0 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _080E617C - adds r1, r6, 0 - b _080E627A - .align 2, 0 -_080E6194: .4byte gSaveBlock1 + 0x2D94 -_080E6198: .4byte sub_80546B8 -_080E619C: - ldr r0, _080E61B0 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E61B4 @ =gSaveBlock1 + 0x273C - adds r1, r0, r1 - ldr r0, _080E61B8 @ =gSpecialVar_0x8006 - ldrb r4, [r0] - b _080E6276 - .align 2, 0 -_080E61B0: .4byte gSpecialVar_0x8005 -_080E61B4: .4byte gSaveBlock1 + 0x273C -_080E61B8: .4byte gSpecialVar_0x8006 -_080E61BC: - ldr r0, _080E61D4 @ =gSpecialVar_0x8005 - ldrh r0, [r0] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r0, _080E61D8 @ =gSaveBlock1 + 0x2754 - adds r1, r0 - ldr r0, _080E61DC @ =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r1, r0 - b _080E624A - .align 2, 0 -_080E61D4: .4byte gSpecialVar_0x8005 -_080E61D8: .4byte gSaveBlock1 + 0x2754 -_080E61DC: .4byte gSpecialVar_0x8006 -_080E61E0: - ldr r0, _080E61F4 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E61F8 @ =gSaveBlock1 + 0x273A - adds r1, r0, r1 - movs r4, 0 - b _080E6276 - .align 2, 0 -_080E61F4: .4byte gSpecialVar_0x8005 -_080E61F8: .4byte gSaveBlock1 + 0x273A -_080E61FC: - movs r1, 0 - b _080E624C -_080E6200: - ldr r1, _080E620C @ =gSaveBlock1 + 0x2B16 - ldr r2, _080E6210 @ =0x0000ffff - adds r0, r2, 0 - strh r0, [r1] - b _080E624A - .align 2, 0 -_080E620C: .4byte gSaveBlock1 + 0x2B16 -_080E6210: .4byte 0x0000ffff -_080E6214: - ldr r0, _080E6230 @ =gSpecialVar_0x8005 - ldrh r0, [r0] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r0, _080E6234 @ =gSaveBlock1 + 0x273C - adds r1, r0 - ldr r0, _080E6238 @ =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r1, r0 - movs r4, 0 - b _080E6276 - .align 2, 0 -_080E6230: .4byte gSpecialVar_0x8005 -_080E6234: .4byte gSaveBlock1 + 0x273C -_080E6238: .4byte gSpecialVar_0x8006 -_080E623C: - ldr r0, _080E6254 @ =gSpecialVar_0x8005 - ldrh r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E6258 @ =gSaveBlock1 + 0x2750 - adds r1, r0, r1 -_080E624A: - movs r4, 0x1 -_080E624C: - ldr r0, _080E625C @ =sub_80546B8 - mov r12, r0 - b _080E627A - .align 2, 0 -_080E6254: .4byte gSpecialVar_0x8005 -_080E6258: .4byte gSaveBlock1 + 0x2750 -_080E625C: .4byte sub_80546B8 -_080E6260: - ldr r1, _080E628C @ =gSharedMem + 0x1000 - ldr r0, _080E6290 @ =0x00009fa8 - adds r2, r1, r0 - ldr r0, _080E6294 @ =0x0000ffff - strh r0, [r2] - ldr r0, _080E6298 @ =0x00009faa - adds r1, r0 - movs r0, 0x1 - negs r0, r0 - strh r0, [r1] - adds r1, r2, 0 -_080E6276: - ldr r2, _080E629C @ =sub_80546B8 - mov r12, r2 -_080E627A: - ldrb r0, [r7] - mov r2, r12 - adds r3, r4, 0 - bl sub_80E62A0 -_080E6284: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E628C: .4byte gSharedMem + 0x1000 -_080E6290: .4byte 0x00009fa8 -_080E6294: .4byte 0x0000ffff -_080E6298: .4byte 0x00009faa -_080E629C: .4byte sub_80546B8 - thumb_func_end sub_80E60D8 - - thumb_func_start sub_80E62A0 -sub_80E62A0: @ 80E62A0 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _080E62DC @ =gSharedMem + 0x1000 - str r2, [r4] - str r1, [r4, 0x4] - strb r0, [r4, 0x8] - strb r3, [r4, 0xB] - cmp r0, 0x9 - bne _080E62D0 - ldr r0, _080E62E0 @ =0x00009fa8 - adds r2, r4, r0 - str r2, [r4, 0x4] - ldr r0, _080E62E4 @ =gSaveBlock1 - ldr r3, _080E62E8 @ =0x00002dd8 - adds r1, r0, r3 - ldrh r1, [r1] - strh r1, [r2] - ldr r1, _080E62EC @ =0x00002dda - adds r0, r1 - ldrh r1, [r0] - ldr r2, _080E62F0 @ =0x00009faa - adds r0, r4, r2 - strh r1, [r0] -_080E62D0: - ldr r0, _080E62F4 @ =sub_80E62F8 - bl SetMainCallback2 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E62DC: .4byte gSharedMem + 0x1000 -_080E62E0: .4byte 0x00009fa8 -_080E62E4: .4byte gSaveBlock1 -_080E62E8: .4byte 0x00002dd8 -_080E62EC: .4byte 0x00002dda -_080E62F0: .4byte 0x00009faa -_080E62F4: .4byte sub_80E62F8 - thumb_func_end sub_80E62A0 - - thumb_func_start sub_80E62F8 -sub_80E62F8: @ 80E62F8 - push {lr} - sub sp, 0x4 - ldr r0, _080E6314 @ =gMain - ldr r1, _080E6318 @ =0x0000043c - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x8 - bhi _080E6344 - lsls r0, 2 - ldr r1, _080E631C @ =_080E6320 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E6314: .4byte gMain -_080E6318: .4byte 0x0000043c -_080E631C: .4byte _080E6320 - .align 2, 0 -_080E6320: - .4byte _080E6344 - .4byte _080E6380 - .4byte _080E638C - .4byte _080E63A8 - .4byte _080E63AE - .4byte _080E63B4 - .4byte _080E63BE - .4byte _080E63D8 - .4byte _080E63EA -_080E6344: - movs r1, 0x80 - lsls r1, 19 - movs r0, 0 - strh r0, [r1] - movs r0, 0 - bl SetVBlankCallback - bl ResetPaletteFade - bl ResetSpriteData - bl dp12_8087EA4 - bl remove_some_task - bl sub_80EAD08 - ldr r2, _080E637C @ =gUnknown_083DB698 - ldr r0, [r2] - ldr r1, [r2, 0x4] - ldr r2, [r2, 0x8] - bl sub_80895F8 - bl FreeSpriteTileRanges - bl FreeAllSpritePalettes - b _080E6402 - .align 2, 0 -_080E637C: .4byte gUnknown_083DB698 -_080E6380: - ldr r0, _080E6388 @ =gWindowConfig_81E6DA8 - bl SetUpWindowConfig - b _080E6402 - .align 2, 0 -_080E6388: .4byte gWindowConfig_81E6DA8 -_080E638C: - ldr r0, _080E63A0 @ =gWindowConfig_81E6D54 - bl InitMenuWindow - ldr r0, _080E63A4 @ =gWindowConfig_81E6DA8 - bl InitMenuWindow - bl MenuZeroFillScreen - b _080E6402 - .align 2, 0 -_080E63A0: .4byte gWindowConfig_81E6D54 -_080E63A4: .4byte gWindowConfig_81E6DA8 -_080E63A8: - bl sub_80E6424 - b _080E6402 -_080E63AE: - bl sub_80E8DD8 - b _080E6402 -_080E63B4: - bl sub_80E8218 - bl sub_80E8CEC - b _080E6402 -_080E63BE: - bl sub_80E69F8 - ldr r0, _080E63D0 @ =sub_80E6AA8 - bl sub_80E682C - ldr r0, _080E63D4 @ =sub_80E6A6C - bl SetVBlankCallback - b _080E6402 - .align 2, 0 -_080E63D0: .4byte sub_80E6AA8 -_080E63D4: .4byte sub_80E6A6C -_080E63D8: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _080E6402 -_080E63EA: - movs r1, 0x80 - lsls r1, 19 - movs r2, 0xFA - lsls r2, 5 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080E6414 @ =sub_80E6A88 - bl SetMainCallback2 - ldr r0, _080E6418 @ =0x00000805 - bl FlagSet -_080E6402: - ldr r1, _080E641C @ =gMain - ldr r0, _080E6420 @ =0x0000043c - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_080E6414: .4byte sub_80E6A88 -_080E6418: .4byte 0x00000805 -_080E641C: .4byte gMain -_080E6420: .4byte 0x0000043c - thumb_func_end sub_80E62F8 - - thumb_func_start sub_80E6424 -sub_80E6424: @ 80E6424 - push {lr} - ldr r2, _080E6444 @ =gSharedMem + 0x1000 - ldr r0, _080E6448 @ =gUnknown_083DB6A4 - ldrb r1, [r2, 0x8] - adds r1, r0 - ldrb r0, [r1] - strb r0, [r2, 0x9] - ldrb r0, [r2, 0x9] - adds r3, r2, 0 - cmp r0, 0x5 - bhi _080E6512 - lsls r0, 2 - ldr r1, _080E644C @ =_080E6450 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E6444: .4byte gSharedMem + 0x1000 -_080E6448: .4byte gUnknown_083DB6A4 -_080E644C: .4byte _080E6450 - .align 2, 0 -_080E6450: - .4byte _080E64A0 - .4byte _080E64B8 - .4byte _080E64DA - .4byte _080E64F6 - .4byte _080E6468 - .4byte _080E6480 -_080E6468: - movs r2, 0x4 - strb r2, [r3, 0xA] - adds r0, r3, 0 - adds r0, 0x83 - movs r1, 0x2 - strb r1, [r0] - adds r0, 0x1 - strb r1, [r0] - adds r1, r3, 0 - adds r1, 0x88 - movs r0, 0x5 - b _080E64D0 -_080E6480: - movs r1, 0x4 - strb r1, [r3, 0xA] - adds r2, r3, 0 - adds r2, 0x83 - movs r0, 0x1 - strb r0, [r2] - adds r0, r3, 0 - adds r0, 0x84 - strb r1, [r0] - adds r1, r3, 0 - adds r1, 0x88 - movs r0, 0x10 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x2 - b _080E6510 -_080E64A0: - movs r0, 0x6 - strb r0, [r3, 0xA] - adds r1, r3, 0 - adds r1, 0x83 - movs r0, 0x2 - strb r0, [r1] - adds r0, r3, 0 - adds r0, 0x84 - movs r2, 0x3 - strb r2, [r0] - adds r1, 0x5 - b _080E64CE -_080E64B8: - movs r2, 0 - movs r0, 0x9 - strb r0, [r3, 0xA] - adds r1, r3, 0 - adds r1, 0x83 - movs r0, 0x2 - strb r0, [r1] - adds r1, 0x1 - movs r0, 0x5 - strb r0, [r1] - adds r1, 0x4 -_080E64CE: - movs r0, 0x4 -_080E64D0: - strh r0, [r1] - adds r0, r3, 0 - adds r0, 0x8A - strh r2, [r0] - b _080E6512 -_080E64DA: - movs r1, 0x1 - strb r1, [r3, 0xA] - adds r0, r3, 0 - adds r0, 0x83 - strb r1, [r0] - adds r0, 0x1 - strb r1, [r0] - adds r1, r3, 0 - adds r1, 0x88 - movs r0, 0x10 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x4 - b _080E6510 -_080E64F6: - movs r0, 0x2 - strb r0, [r3, 0xA] - adds r1, r3, 0 - adds r1, 0x83 - strb r0, [r1] - adds r1, 0x1 - movs r0, 0x1 - strb r0, [r1] - adds r1, 0x4 - movs r0, 0x5 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x3 -_080E6510: - strh r0, [r1] -_080E6512: - adds r1, r3, 0 - adds r1, 0x86 - movs r0, 0 - strb r0, [r1] - subs r1, 0x1 - strb r0, [r1] - adds r1, 0x2 - strb r0, [r1] - subs r1, 0x61 - strb r0, [r1] - movs r2, 0xDD - lsls r2, 1 - adds r1, r3, r2 - strh r0, [r1] - movs r0, 0xDF - lsls r0, 1 - adds r1, r3, r0 - movs r0, 0x2 - strb r0, [r1] - bl sub_80E6554 - bl sub_80EAECC - bl sub_80EB040 - bl sub_80E7E50 - bl sub_80E6630 - bl sub_80E6690 - pop {r0} - bx r0 - thumb_func_end sub_80E6424 - - thumb_func_start sub_80E6554 -sub_80E6554: @ 80E6554 - push {r4-r7,lr} - sub sp, 0x4 - movs r4, 0 - movs r7, 0 - ldr r0, _080E6564 @ =gSharedMem + 0x1000 - mov r12, r0 - b _080E656E - .align 2, 0 -_080E6564: .4byte gSharedMem + 0x1000 -_080E6568: - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 -_080E656E: - movs r5, 0 - lsls r3, r7, 1 - mov r6, r12 - adds r6, 0x2A - adds r2, r3, r6 - adds r1, r4, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - strb r1, [r2] - cmp r4, 0x11 - beq _080E65A6 -_080E6586: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bhi _080E65A2 - adds r2, r5, r3 - adds r2, r6 - adds r1, r4, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - strb r1, [r2] - cmp r4, 0x11 - bne _080E6586 -_080E65A2: - cmp r4, 0x11 - bne _080E6568 -_080E65A6: - movs r0, 0x11 - mov r1, r12 - strh r0, [r1, 0x28] - cmp r4, 0x15 - bhi _080E6612 - mov r6, r12 - adds r2, r6, 0 - adds r2, 0x78 -_080E65B6: - lsls r0, r4, 24 - lsrs r0, 24 - str r2, [sp] - bl sub_80EAD7C - lsls r0, 24 - lsrs r1, r0, 24 - ldr r2, [sp] - cmp r1, 0 - beq _080E65FC - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E65DC - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - movs r5, 0 -_080E65DC: - lsls r0, r7, 1 - adds r0, r5, r0 - adds r1, r6, 0 - adds r1, 0x2A - adds r0, r1 - strb r4, [r0] - adds r0, r4, 0 - subs r0, 0x11 - adds r0, r2 - movs r1, 0x1 - strb r1, [r0] - ldrh r0, [r6, 0x28] - adds r0, 0x1 - strh r0, [r6, 0x28] - mov r12, r6 - b _080E6608 -_080E65FC: - adds r0, r4, 0 - subs r0, 0x11 - adds r0, r2 - strb r1, [r0] - ldr r0, _080E662C @ =gSharedMem + 0x1000 - mov r12, r0 -_080E6608: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x15 - bls _080E65B6 -_080E6612: - mov r1, r12 - ldrh r0, [r1, 0x28] - adds r0, 0x1 - asrs r0, 1 - movs r1, 0xDB - lsls r1, 1 - add r1, r12 - strb r0, [r1] - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E662C: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E6554 - - thumb_func_start sub_80E6630 -sub_80E6630: @ 80E6630 - push {r4-r7,lr} - movs r1, 0 - ldr r0, _080E6664 @ =gUnknown_083DB6B2 - mov r12, r0 -_080E6638: - lsls r0, r1, 4 - mov r2, r12 - adds r5, r0, r2 - movs r3, 0 - ldrb r0, [r5] - adds r7, r1, 0x1 - cmp r0, 0xFF - beq _080E6680 - lsls r0, r1, 3 - subs r0, r1 - lsls r4, r0, 1 - ldr r6, _080E6668 @ =gSharedMem + 0x1040 -_080E6650: - adds r0, r5, r3 - ldrb r1, [r0] - adds r2, r1, 0 - cmp r2, 0 - beq _080E666C - adds r0, r3, r4 - adds r0, r6 - adds r1, 0x46 - strb r1, [r0] - b _080E6672 - .align 2, 0 -_080E6664: .4byte gUnknown_083DB6B2 -_080E6668: .4byte gSharedMem + 0x1040 -_080E666C: - adds r0, r3, r4 - adds r0, r6 - strb r2, [r0] -_080E6672: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r5, r3 - ldrb r0, [r0] - cmp r0, 0xFF - bne _080E6650 -_080E6680: - lsls r0, r7, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _080E6638 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80E6630 - - thumb_func_start sub_80E6690 -sub_80E6690: @ 80E6690 - push {r4-r6,lr} - sub sp, 0x10 - mov r0, sp - ldr r1, _080E66E0 @ =gUnknown_083DB7DC - ldm r1!, {r2-r4} - stm r0!, {r2-r4} - ldr r1, [r1] - str r1, [r0] - movs r5, 0 - ldr r6, _080E66E4 @ =gUnknown_083DB7C0 -_080E66A4: - ldr r0, _080E66E8 @ =gSharedMem + 0x1000 - ldrb r0, [r0, 0x8] - lsls r0, 1 - adds r0, r5, r0 - adds r0, r6 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E66EC @ =gUnknown_083DB6F4 - adds r4, r0, r1 - lsls r0, r5, 3 - add r0, sp - ldr r0, [r0] - ldr r1, [r4] - bl StringCopy - adds r3, r0, 0 - ldrb r0, [r4, 0x8] - cmp r0, 0 - beq _080E66F0 - lsls r0, r5, 1 - adds r0, 0x1 - lsls r0, 2 - add r0, sp - ldr r0, [r0] - ldr r1, [r4, 0x4] - bl StringCopy - b _080E670A - .align 2, 0 -_080E66E0: .4byte gUnknown_083DB7DC -_080E66E4: .4byte gUnknown_083DB7C0 -_080E66E8: .4byte gSharedMem + 0x1000 -_080E66EC: .4byte gUnknown_083DB6F4 -_080E66F0: - strb r0, [r3] - adds r3, 0x1 - ldr r1, [r4, 0x4] - adds r0, r3, 0 - bl StringCopy - lsls r0, r5, 1 - adds r0, 0x1 - lsls r0, 2 - add r0, sp - ldr r1, [r0] - movs r0, 0xFF - strb r0, [r1] -_080E670A: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E66A4 - movs r5, 0 - ldr r3, _080E6758 @ =gSharedMem + 0x1000 - ldr r0, _080E675C @ =0x0000a0d0 - adds r2, r3, r0 - movs r1, 0 -_080E671E: - adds r0, r5, r2 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x23 - bls _080E671E - ldr r1, _080E675C @ =0x0000a0d0 - adds r0, r3, r1 - adds r0, r5, r0 - movs r4, 0x1 - negs r4, r4 - adds r2, r4, 0 - movs r1, 0xFF - strb r1, [r0] - ldr r0, _080E6760 @ =0x0000a29a - adds r3, r0 - movs r0, 0xFC - strb r0, [r3] - movs r0, 0x11 - strb r0, [r3, 0x1] - movs r0, 0xE0 - strb r0, [r3, 0x2] - strb r2, [r3, 0x3] - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E6758: .4byte gSharedMem + 0x1000 -_080E675C: .4byte 0x0000a0d0 -_080E6760: .4byte 0x0000a29a - thumb_func_end sub_80E6690 - - thumb_func_start InitEasyChatPhrases -InitEasyChatPhrases: @ 80E6764 - push {r4-r6,lr} - movs r3, 0 - ldr r4, _080E680C @ =gSaveBlock1 + 0x2B1C - ldr r2, _080E6810 @ =gUnknown_083DB7EC -_080E676C: - lsls r0, r3, 1 - adds r1, r0, r4 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3 - bls _080E676C - movs r3, 0 - ldr r4, _080E6814 @ =gSaveBlock1 + 0x2B28 - ldr r2, _080E6818 @ =gUnknown_083DB7F4 -_080E6786: - lsls r0, r3, 1 - adds r1, r0, r4 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x5 - bls _080E6786 - movs r3, 0 - ldr r5, _080E681C @ =gSaveBlock1 + 0x2B34 - ldr r0, _080E6820 @ =0x0000ffff - adds r4, r0, 0 - adds r6, r5, 0 - adds r6, 0xC -_080E67A6: - lsls r1, r3, 1 - adds r2, r1, r5 - ldrh r0, [r2] - orrs r0, r4 - strh r0, [r2] - adds r1, r6 - ldrh r0, [r1] - orrs r0, r4 - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x5 - bls _080E67A6 - movs r3, 0 - ldr r6, _080E6824 @ =gSaveBlock1 + 0x2B4C - ldr r0, _080E6820 @ =0x0000ffff - adds r5, r0, 0 -_080E67CA: - movs r2, 0 - lsls r0, r3, 3 - adds r0, r3 - lsls r4, r0, 2 -_080E67D2: - lsls r0, r2, 1 - adds r0, r4 - adds r0, r6 - ldrh r1, [r0] - orrs r1, r5 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x8 - bls _080E67D2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0xF - bls _080E67CA - movs r3, 0 - ldr r2, _080E6828 @ =gSaveBlock1 + 0x2D8C - movs r1, 0 -_080E67F8: - adds r0, r3, r2 - strb r1, [r0] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3F - bls _080E67F8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E680C: .4byte gSaveBlock1 + 0x2B1C -_080E6810: .4byte gUnknown_083DB7EC -_080E6814: .4byte gSaveBlock1 + 0x2B28 -_080E6818: .4byte gUnknown_083DB7F4 -_080E681C: .4byte gSaveBlock1 + 0x2B34 -_080E6820: .4byte 0x0000ffff -_080E6824: .4byte gSaveBlock1 + 0x2B4C -_080E6828: .4byte gSaveBlock1 + 0x2D8C - thumb_func_end InitEasyChatPhrases - - thumb_func_start sub_80E682C -sub_80E682C: @ 80E682C - ldr r1, _080E6838 @ =gSharedMem + 0x1000 - str r0, [r1, 0x20] - movs r0, 0 - strh r0, [r1, 0x24] - bx lr - .align 2, 0 -_080E6838: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E682C - - thumb_func_start sub_80E683C -sub_80E683C: @ 80E683C - push {r4,r5,lr} - ldr r1, _080E6890 @ =gSharedMem + 0x1000 - adds r0, r1, 0 - adds r0, 0x26 - ldrb r0, [r0] - adds r2, r1, 0 - cmp r0, 0 - bne _080E6898 - movs r1, 0 - movs r0, 0xDB - lsls r0, 1 - adds r3, r2, r0 - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r1, r0 - bge _080E6876 - movs r0, 0xD5 - lsls r0, 1 - adds r5, r2, r0 - movs r4, 0x2 -_080E6864: - adds r0, r1, r5 - strb r4, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r1, r0 - blt _080E6864 -_080E6876: - adds r0, r2, r1 - ldr r1, _080E6894 @ =0x000001a9 - adds r3, r0, r1 - ldrh r0, [r2, 0x28] - movs r1, 0x1 - ands r0, r1 - strb r0, [r3] - cmp r0, 0 - bne _080E68B8 - movs r0, 0x2 - strb r0, [r3] - b _080E68B8 - .align 2, 0 -_080E6890: .4byte gSharedMem + 0x1000 -_080E6894: .4byte 0x000001a9 -_080E6898: - movs r3, 0xD5 - lsls r3, 1 - adds r1, r2, r3 - movs r0, 0x7 - strb r0, [r1] - ldr r1, _080E68E0 @ =0x000001ab - adds r3, r2, r1 - movs r1, 0x6 - strb r1, [r3] - movs r3, 0xD6 - lsls r3, 1 - adds r1, r2, r3 - strb r0, [r1] - adds r3, 0x1 - adds r1, r2, r3 - strb r0, [r1] -_080E68B8: - movs r0, 0xD4 - lsls r0, 1 - adds r1, r2, r0 - movs r0, 0 - strb r0, [r1] - ldr r3, _080E68E4 @ =0x000001a9 - adds r1, r2, r3 - strb r0, [r1] - adds r3, 0xC - adds r1, r2, r3 - strb r0, [r1] - adds r3, 0x2 - adds r1, r2, r3 - strb r0, [r1] - bl sub_80E9A4C - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E68E0: .4byte 0x000001ab -_080E68E4: .4byte 0x000001a9 - thumb_func_end sub_80E683C - - thumb_func_start sub_80E68E8 -sub_80E68E8: @ 80E68E8 - push {r4-r6,lr} - bl sub_80EB0B0 - ldr r3, _080E694C @ =gSharedMem + 0x1000 - adds r0, r3, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E695C - movs r1, 0xDC - lsls r1, 1 - adds r0, r3, r1 - ldrb r6, [r0] - lsls r0, r6, 1 - ldr r2, _080E6950 @ =0x000044a2 - adds r1, r3, r2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x1 - asrs r0, 1 - ldr r1, _080E6954 @ =0x00009d54 - adds r2, r3, r1 - strb r0, [r2] - movs r1, 0 - movs r0, 0 - ldrsb r0, [r2, r0] - adds r5, r3, 0 - cmp r1, r0 - bge _080E693A - ldr r3, _080E6958 @ =0x00009cd2 - adds r4, r5, r3 - movs r3, 0x2 -_080E6928: - adds r0, r1, r4 - strb r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - blt _080E6928 -_080E693A: - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, _080E6958 @ =0x00009cd2 - adds r0, r5, r2 - adds r2, r1, r0 - lsls r0, r6, 1 - ldr r3, _080E6950 @ =0x000044a2 - b _080E69AC - .align 2, 0 -_080E694C: .4byte gSharedMem + 0x1000 -_080E6950: .4byte 0x000044a2 -_080E6954: .4byte 0x00009d54 -_080E6958: .4byte 0x00009cd2 -_080E695C: - movs r1, 0xDC - lsls r1, 1 - adds r0, r3, r1 - ldrb r6, [r0] - lsls r0, r6, 1 - ldr r2, _080E69E0 @ =0x0000446c - adds r1, r3, r2 - adds r0, r1 - ldrh r0, [r0] - adds r0, 0x1 - asrs r0, 1 - ldr r1, _080E69E4 @ =0x00009d54 - adds r2, r3, r1 - strb r0, [r2] - movs r1, 0 - movs r0, 0 - ldrsb r0, [r2, r0] - adds r5, r3, 0 - cmp r1, r0 - bge _080E699C - ldr r3, _080E69E8 @ =0x00009cd2 - adds r4, r5, r3 - movs r3, 0x2 -_080E698A: - adds r0, r1, r4 - strb r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - blt _080E698A -_080E699C: - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, _080E69E8 @ =0x00009cd2 - adds r0, r5, r2 - adds r2, r1, r0 - lsls r0, r6, 1 - ldr r3, _080E69E0 @ =0x0000446c -_080E69AC: - adds r1, r5, r3 - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - ands r0, r1 - strb r0, [r2] - cmp r0, 0 - bne _080E69C0 - movs r0, 0x2 - strb r0, [r2] -_080E69C0: - ldr r1, _080E69EC @ =0x00009cd0 - adds r0, r5, r1 - movs r1, 0 - strb r1, [r0] - ldr r2, _080E69F0 @ =0x00009cd1 - adds r0, r5, r2 - strb r1, [r0] - ldr r3, _080E69F4 @ =0x00009d55 - adds r0, r5, r3 - strb r1, [r0] - bl sub_80E9A4C - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E69E0: .4byte 0x0000446c -_080E69E4: .4byte 0x00009d54 -_080E69E8: .4byte 0x00009cd2 -_080E69EC: .4byte 0x00009cd0 -_080E69F0: .4byte 0x00009cd1 -_080E69F4: .4byte 0x00009d55 - thumb_func_end sub_80E68E8 - - thumb_func_start sub_80E69F8 -sub_80E69F8: @ 80E69F8 - push {r4,lr} - ldr r0, _080E6A10 @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0x8] - adds r4, r0, 0 - cmp r1, 0xD - bhi _080E6A50 - lsls r0, r1, 2 - ldr r1, _080E6A14 @ =_080E6A18 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E6A10: .4byte gSharedMem + 0x1000 -_080E6A14: .4byte _080E6A18 - .align 2, 0 -_080E6A18: - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A50 - .4byte _080E6A58 - .4byte _080E6A50 - .4byte _080E6A58 - .4byte _080E6A58 - .4byte _080E6A50 - .4byte _080E6A58 - .4byte _080E6A58 - .4byte _080E6A58 - .4byte _080E6A50 -_080E6A50: - ldrb r0, [r4, 0x8] - bl sub_80E9368 - b _080E6A66 -_080E6A58: - ldrb r0, [r4, 0x8] - bl sub_80E9368 - ldrb r0, [r4, 0xB] - ldrb r1, [r4, 0x9] - bl sub_80E8BF4 -_080E6A66: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80E69F8 - - thumb_func_start sub_80E6A6C -sub_80E6A6C: @ 80E6A6C - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl sub_80EAC5C - bl TransferPlttBuffer - bl sub_8089668 - pop {r0} - bx r0 - thumb_func_end sub_80E6A6C - - thumb_func_start sub_80E6A88 -sub_80E6A88: @ 80E6A88 - push {lr} - ldr r0, _080E6AA4 @ =gSharedMem + 0x1000 - ldr r0, [r0, 0x20] - bl _call_via_r0 - bl AnimateSprites - bl BuildOamBuffer - bl sub_80EAD08 - pop {r0} - bx r0 - .align 2, 0 -_080E6AA4: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E6A88 - - thumb_func_start sub_80E6AA8 -sub_80E6AA8: @ 80E6AA8 - push {lr} - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _080E6ABA - ldr r0, _080E6AC0 @ =sub_80E6AC4 - bl sub_80E682C -_080E6ABA: - pop {r0} - bx r0 - .align 2, 0 -_080E6AC0: .4byte sub_80E6AC4 - thumb_func_end sub_80E6AA8 - - thumb_func_start sub_80E6AC4 -sub_80E6AC4: @ 80E6AC4 - push {lr} - bl sub_80E88F0 - movs r0, 0 - bl sub_80E8398 - movs r0, 0 - bl sub_80E91D4 - ldr r0, _080E6AE0 @ =sub_80E6AE4 - bl sub_80E682C - pop {r0} - bx r0 - .align 2, 0 -_080E6AE0: .4byte sub_80E6AE4 - thumb_func_end sub_80E6AC4 - - thumb_func_start sub_80E6AE4 -sub_80E6AE4: @ 80E6AE4 - push {r4,r5,lr} - bl sub_80E75D8 - ldr r4, _080E6B44 @ =gSharedMem + 0x1000 - adds r1, r4, 0 - adds r1, 0x87 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - beq _080E6AFE - movs r0, 0x5 - bl PlaySE -_080E6AFE: - ldr r2, _080E6B48 @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x1 - ands r0, r1 - adds r5, r2, 0 - cmp r0, 0 - beq _080E6BA4 - movs r0, 0x5 - bl PlaySE - adds r1, r4, 0 - adds r1, 0x86 - adds r0, r4, 0 - adds r0, 0x84 - ldrb r2, [r1] - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E6B78 - adds r0, r4, 0 - adds r0, 0x85 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - beq _080E6B60 - cmp r0, 0x1 - bgt _080E6B4C - cmp r0, 0 - beq _080E6B52 - b _080E6BA4 - .align 2, 0 -_080E6B44: .4byte gSharedMem + 0x1000 -_080E6B48: .4byte gMain -_080E6B4C: - cmp r0, 0x2 - beq _080E6B6C - b _080E6BA4 -_080E6B52: - ldr r0, _080E6B5C @ =sub_80E6BC0 - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6B5C: .4byte sub_80E6BC0 -_080E6B60: - ldr r0, _080E6B68 @ =sub_80E6C84 - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6B68: .4byte sub_80E6C84 -_080E6B6C: - ldr r0, _080E6B74 @ =sub_80E6D7C - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6B74: .4byte sub_80E6D7C -_080E6B78: - adds r0, r4, 0 - adds r0, 0x83 - ldrb r0, [r0] - adds r1, r4, 0 - adds r1, 0x85 - adds r3, r0, 0 - muls r3, r2 - adds r0, r3, 0 - ldrb r1, [r1] - adds r0, r1 - adds r1, r4, 0 - adds r1, 0x27 - strb r0, [r1] - bl sub_80E7574 - ldr r0, _080E6BA0 @ =sub_80E6F68 - bl sub_80E682C - b _080E6BB4 - .align 2, 0 -_080E6BA0: .4byte sub_80E6F68 -_080E6BA4: - ldrh r1, [r5, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E6BB4 - ldr r0, _080E6BBC @ =sub_80E6C84 - bl sub_80E682C -_080E6BB4: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E6BBC: .4byte sub_80E6C84 - thumb_func_end sub_80E6AE4 - - thumb_func_start sub_80E6BC0 -sub_80E6BC0: @ 80E6BC0 - push {r4,lr} - ldr r4, _080E6BD4 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - cmp r0, 0x1 - beq _080E6C12 - cmp r0, 0x1 - bgt _080E6BD8 - cmp r0, 0 - beq _080E6BE2 - b _080E6C76 - .align 2, 0 -_080E6BD4: .4byte gSharedMem + 0x1000 -_080E6BD8: - cmp r0, 0x2 - beq _080E6C54 - cmp r0, 0x64 - beq _080E6C64 - b _080E6C76 -_080E6BE2: - movs r0, 0x2 - bl sub_80E8398 - ldrb r0, [r4, 0x8] - cmp r0, 0x6 - bne _080E6BFA - movs r0, 0x6 - bl sub_80E91D4 - movs r0, 0x64 - strh r0, [r4, 0x24] - b _080E6C76 -_080E6BFA: - movs r0, 0x2 - bl sub_80E91D4 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0x1 - bl DisplayYesNoMenu - movs r0, 0x1 - bl MoveMenuCursor - b _080E6C3E -_080E6C12: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080E6C32 - cmp r1, 0 - bgt _080E6C2C - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080E6C46 - b _080E6C76 -_080E6C2C: - cmp r1, 0x1 - beq _080E6C46 - b _080E6C76 -_080E6C32: - bl sub_80E7D6C - bl sub_80E98C4 - bl sub_80E95A4 -_080E6C3E: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E6C76 -_080E6C46: - ldr r1, _080E6C50 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E6C76 - .align 2, 0 -_080E6C50: .4byte gSharedMem + 0x1000 -_080E6C54: - bl sub_80E81FC - ldr r0, _080E6C60 @ =sub_80E6AC4 - bl sub_80E682C - b _080E6C76 - .align 2, 0 -_080E6C60: .4byte sub_80E6AC4 -_080E6C64: - ldr r0, _080E6C7C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _080E6C76 - ldr r0, _080E6C80 @ =sub_80E6AC4 - bl sub_80E682C -_080E6C76: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E6C7C: .4byte gMain -_080E6C80: .4byte sub_80E6AC4 - thumb_func_end sub_80E6BC0 - - thumb_func_start sub_80E6C84 -sub_80E6C84: @ 80E6C84 - push {r4,lr} - ldr r4, _080E6C98 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - cmp r0, 0x1 - beq _080E6CF4 - cmp r0, 0x1 - bgt _080E6C9C - cmp r0, 0 - beq _080E6CA6 - b _080E6D72 - .align 2, 0 -_080E6C98: .4byte gSharedMem + 0x1000 -_080E6C9C: - cmp r0, 0x2 - beq _080E6D24 - cmp r0, 0xFF - beq _080E6D64 - b _080E6D72 -_080E6CA6: - movs r0, 0x2 - bl sub_80E8398 - movs r0, 0x3 - bl sub_80E91D4 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0 - bl DisplayYesNoMenu - movs r0, 0x1 - bl MoveMenuCursor - ldrb r0, [r4, 0x8] - cmp r0, 0x9 - beq _080E6CE8 - cmp r0, 0x4 - beq _080E6CE8 - cmp r0, 0x7 - beq _080E6CE8 - cmp r0, 0x8 - beq _080E6CE8 - cmp r0, 0xA - beq _080E6CE8 - cmp r0, 0xB - beq _080E6CE8 - cmp r0, 0xC - beq _080E6CE8 - cmp r0, 0x5 - beq _080E6CE8 - cmp r0, 0xD - bne _080E6D1C -_080E6CE8: - ldr r1, _080E6CF0 @ =gSharedMem + 0x1000 - movs r0, 0x2 - strh r0, [r1, 0x24] - b _080E6D72 - .align 2, 0 -_080E6CF0: .4byte gSharedMem + 0x1000 -_080E6CF4: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080E6D06 - cmp r1, 0 - ble _080E6D34 - b _080E6D3E -_080E6D06: - movs r0, 0x4 - bl sub_80E91D4 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0 - bl DisplayYesNoMenu - movs r0, 0x1 - bl MoveMenuCursor -_080E6D1C: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E6D72 -_080E6D24: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _080E6D44 - cmp r1, 0 - bgt _080E6D3E -_080E6D34: - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080E6D58 - b _080E6D72 -_080E6D3E: - cmp r1, 0x1 - beq _080E6D58 - b _080E6D72 -_080E6D44: - ldr r0, _080E6D50 @ =gSpecialVar_Result - strh r1, [r0] - ldr r0, _080E6D54 @ =sub_80E752C - bl sub_80E682C - b _080E6D72 - .align 2, 0 -_080E6D50: .4byte gSpecialVar_Result -_080E6D54: .4byte sub_80E752C -_080E6D58: - ldr r1, _080E6D60 @ =gSharedMem + 0x1000 - movs r0, 0xFF - strh r0, [r1, 0x24] - b _080E6D72 - .align 2, 0 -_080E6D60: .4byte gSharedMem + 0x1000 -_080E6D64: - bl HandleDestroyMenuCursors - bl sub_80E81FC - ldr r0, _080E6D78 @ =sub_80E6AC4 - bl sub_80E682C -_080E6D72: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E6D78: .4byte sub_80E6AC4 - thumb_func_end sub_80E6C84 - - thumb_func_start sub_80E6D7C -sub_80E6D7C: @ 80E6D7C - push {r4-r7,lr} - ldr r5, _080E6D98 @ =gSharedMem + 0x1000 - ldrh r0, [r5, 0x24] - cmp r0, 0xA - bne _080E6D88 - b _080E6F06 -_080E6D88: - cmp r0, 0xA - bgt _080E6D9C - cmp r0, 0 - beq _080E6DB6 - cmp r0, 0x1 - beq _080E6E3C - b _080E6F5E - .align 2, 0 -_080E6D98: .4byte gSharedMem + 0x1000 -_080E6D9C: - cmp r0, 0x65 - bne _080E6DA2 - b _080E6F30 -_080E6DA2: - cmp r0, 0x65 - bgt _080E6DAE - cmp r0, 0x64 - bne _080E6DAC - b _080E6F24 -_080E6DAC: - b _080E6F5E -_080E6DAE: - cmp r0, 0x66 - bne _080E6DB4 - b _080E6F50 -_080E6DB4: - b _080E6F5E -_080E6DB6: - movs r0, 0x2 - bl sub_80E8398 - bl sub_80E8054 - lsls r0, 24 - cmp r0, 0 - beq _080E6DCA - movs r0, 0x5 - b _080E6DEE -_080E6DCA: - ldrb r0, [r5, 0x8] - cmp r0, 0x9 - bne _080E6DFC - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - bne _080E6DDE - movs r0, 0x8 - b _080E6DEE -_080E6DDE: - ldrh r0, [r5, 0xC] - ldr r1, _080E6DF8 @ =0x0000ffff - cmp r0, r1 - beq _080E6DEC - ldrh r0, [r5, 0xE] - cmp r0, r1 - bne _080E6DFC -_080E6DEC: - movs r0, 0x9 -_080E6DEE: - bl sub_80E91D4 - movs r0, 0xA - strh r0, [r5, 0x24] - b _080E6F5E - .align 2, 0 -_080E6DF8: .4byte 0x0000ffff -_080E6DFC: - ldr r0, _080E6E18 @ =gSharedMem + 0x1000 - ldrb r0, [r0, 0x8] - cmp r0, 0x4 - bne _080E6E20 - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - bne _080E6E20 - ldr r0, _080E6E1C @ =sub_80E6C84 - bl sub_80E682C - b _080E6F5E - .align 2, 0 -_080E6E18: .4byte gSharedMem + 0x1000 -_080E6E1C: .4byte sub_80E6C84 -_080E6E20: - movs r0, 0x1 - bl sub_80E91D4 - bl sub_80E9744 - movs r0, 0x17 - movs r1, 0x8 - movs r2, 0 - bl DisplayYesNoMenu - movs r0, 0 - bl MoveMenuCursor - b _080E6F3C -_080E6E3C: - bl ProcessMenuInputNoWrap_ - lsls r0, 24 - asrs r6, r0, 24 - cmp r6, 0 - beq _080E6E5C - cmp r6, 0 - bgt _080E6E56 - movs r0, 0x1 - negs r0, r0 - cmp r6, r0 - beq _080E6EDC - b _080E6F5E -_080E6E56: - cmp r6, 0x1 - beq _080E6EDC - b _080E6F5E -_080E6E5C: - ldr r7, _080E6EC8 @ =gSpecialVar_Result - bl sub_80E7FA8 - lsls r0, 24 - lsrs r0, 24 - negs r0, r0 - lsrs r0, 31 - strh r0, [r7] - bl sub_80E7D9C - ldrb r0, [r5, 0x8] - cmp r0, 0 - bne _080E6E82 - ldr r4, _080E6ECC @ =gSpecialVar_0x8004 - bl sub_80E8094 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] -_080E6E82: - ldrb r0, [r5, 0x8] - cmp r0, 0x9 - bne _080E6E9C - bl sub_80E81C0 - ldr r4, _080E6ECC @ =gSpecialVar_0x8004 - ldr r1, _080E6ED0 @ =0x00009fa8 - adds r0, r5, r1 - bl sub_80FA364 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] -_080E6E9C: - ldrb r0, [r5, 0x8] - cmp r0, 0xD - bne _080E6EBE - ldrh r0, [r5, 0xC] - ldr r1, _080E6ED4 @ =0x0000ffff - cmp r0, r1 - beq _080E6EB0 - ldrh r0, [r5, 0xE] - cmp r0, r1 - bne _080E6EB2 -_080E6EB0: - strh r6, [r7] -_080E6EB2: - ldr r4, _080E6ECC @ =gSpecialVar_0x8004 - bl sub_80E810C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] -_080E6EBE: - ldr r0, _080E6ED8 @ =sub_80E752C - bl sub_80E682C - b _080E6F5E - .align 2, 0 -_080E6EC8: .4byte gSpecialVar_Result -_080E6ECC: .4byte gSpecialVar_0x8004 -_080E6ED0: .4byte 0x00009fa8 -_080E6ED4: .4byte 0x0000ffff -_080E6ED8: .4byte sub_80E752C -_080E6EDC: - bl HandleDestroyMenuCursors - bl sub_80E81FC - ldr r4, _080E6EFC @ =gSharedMem + 0x1000 - ldrb r0, [r4, 0x8] - cmp r0, 0x6 - bne _080E6F00 - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - beq _080E6F00 - movs r0, 0x64 - strh r0, [r4, 0x24] - b _080E6F5E - .align 2, 0 -_080E6EFC: .4byte gSharedMem + 0x1000 -_080E6F00: - bl sub_80E95A4 - b _080E6F12 -_080E6F06: - ldr r0, _080E6F1C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _080E6F5E -_080E6F12: - ldr r0, _080E6F20 @ =sub_80E6AC4 - bl sub_80E682C - b _080E6F5E - .align 2, 0 -_080E6F1C: .4byte gMain -_080E6F20: .4byte sub_80E6AC4 -_080E6F24: - movs r0, 0x7 - bl sub_80E91D4 - ldrh r0, [r5, 0x24] - adds r0, 0x1 - strh r0, [r5, 0x24] -_080E6F30: - ldr r0, _080E6F48 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E6F5E -_080E6F3C: - ldr r1, _080E6F4C @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E6F5E - .align 2, 0 -_080E6F48: .4byte gMain -_080E6F4C: .4byte gSharedMem + 0x1000 -_080E6F50: - bl sub_80E7E50 - bl sub_80E95A4 - ldr r0, _080E6F64 @ =sub_80E6AC4 - bl sub_80E682C -_080E6F5E: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E6F64: .4byte sub_80E6AC4 - thumb_func_end sub_80E6D7C - - thumb_func_start sub_80E6F68 -sub_80E6F68: @ 80E6F68 - push {r4,lr} - ldr r4, _080E6F78 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - cmp r0, 0 - beq _080E6F7C - cmp r0, 0x1 - beq _080E6F9C - b _080E6FBC - .align 2, 0 -_080E6F78: .4byte gSharedMem + 0x1000 -_080E6F7C: - movs r0, 0x1 - bl sub_80E8398 - movs r0, 0xA - bl sub_80E91D4 - bl sub_80E683C - bl sub_80E9974 - bl sub_80E9E98 - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E6FBC -_080E6F9C: - bl sub_80E9EA8 - lsls r0, 24 - cmp r0, 0 - beq _080E6FBC - movs r0, 0x1 - bl sub_80E8D8C - bl sub_80E8420 - movs r0, 0 - bl sub_80E8958 - ldr r0, _080E6FC4 @ =sub_80E6FC8 - bl sub_80E682C -_080E6FBC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E6FC4: .4byte sub_80E6FC8 - thumb_func_end sub_80E6F68 - - thumb_func_start sub_80E6FC8 -sub_80E6FC8: @ 80E6FC8 - push {r4,lr} - bl sub_80E77C8 - adds r1, r0, 0 - ldr r4, _080E7000 @ =gSharedMem + 0x1000 - adds r0, r4, 0 - adds r0, 0x96 - strb r1, [r0] - movs r2, 0xE0 - lsls r2, 1 - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E700C - movs r0, 0x5 - bl PlaySE - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, _080E7004 @ =sub_80E6FC8 - str r1, [r0] - ldr r0, _080E7008 @ =sub_80E7458 - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E7000: .4byte gSharedMem + 0x1000 -_080E7004: .4byte sub_80E6FC8 -_080E7008: .4byte sub_80E7458 -_080E700C: - lsls r0, r1, 24 - cmp r0, 0 - beq _080E7018 - movs r0, 0x5 - bl PlaySE -_080E7018: - ldr r0, _080E7054 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E70E8 - ldr r2, _080E7058 @ =0x000001b7 - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E7090 - movs r0, 0x5 - bl PlaySE - movs r1, 0xD4 - lsls r1, 1 - adds r0, r4, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x2 - beq _080E7070 - cmp r0, 0x2 - bgt _080E705C - cmp r0, 0x1 - beq _080E7062 - b _080E710A - .align 2, 0 -_080E7054: .4byte gMain -_080E7058: .4byte 0x000001b7 -_080E705C: - cmp r0, 0x3 - beq _080E70F0 - b _080E710A -_080E7062: - ldr r0, _080E706C @ =sub_80E718C - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E706C: .4byte sub_80E718C -_080E7070: - ldrb r0, [r4, 0x8] - cmp r0, 0x6 - beq _080E710A - adds r0, r4, 0 - adds r0, 0x27 - ldrb r0, [r0] - ldr r1, _080E708C @ =0x0000ffff - bl sub_80E7F00 - bl sub_80E7574 - bl sub_80E95A4 - b _080E710A - .align 2, 0 -_080E708C: .4byte 0x0000ffff -_080E7090: - adds r0, r4, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - beq _080E70CA - ldr r2, _080E70DC @ =0x000001a9 - adds r0, r4, r2 - movs r2, 0 - ldrsb r2, [r0, r2] - movs r1, 0xD4 - lsls r1, 1 - adds r0, r4, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r2, r0 - adds r0, r4, 0 - adds r0, 0x40 - adds r2, r0 - ldrb r0, [r2] - lsls r0, 1 - ldr r2, _080E70E0 @ =0x0000446c - adds r1, r4, r2 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _080E710A -_080E70CA: - movs r0, 0x5 - bl PlaySE - bl sub_80E7AD4 - ldr r0, _080E70E4 @ =sub_80E7218 - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E70DC: .4byte 0x000001a9 -_080E70E0: .4byte 0x0000446c -_080E70E4: .4byte sub_80E7218 -_080E70E8: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E70FC -_080E70F0: - ldr r0, _080E70F8 @ =sub_80E7114 - bl sub_80E682C - b _080E710A - .align 2, 0 -_080E70F8: .4byte sub_80E7114 -_080E70FC: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080E710A - ldr r0, _080E7110 @ =sub_80E718C - bl sub_80E682C -_080E710A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7110: .4byte sub_80E718C - thumb_func_end sub_80E6FC8 - - thumb_func_start sub_80E7114 -sub_80E7114: @ 80E7114 - push {lr} - ldr r0, _080E712C @ =gSharedMem + 0x1000 - ldrh r1, [r0, 0x24] - adds r2, r0, 0 - cmp r1, 0x4 - bhi _080E7182 - lsls r0, r1, 2 - ldr r1, _080E7130 @ =_080E7134 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E712C: .4byte gSharedMem + 0x1000 -_080E7130: .4byte _080E7134 - .align 2, 0 -_080E7134: - .4byte _080E7148 - .4byte _080E715C - .4byte _080E715C - .4byte _080E7164 - .4byte _080E717C -_080E7148: - bl sub_80E8504 - bl sub_80E9E98 - bl sub_80E88F0 - movs r0, 0 - bl sub_80E8D8C - b _080E716E -_080E715C: - ldrh r0, [r2, 0x24] - adds r0, 0x1 - strh r0, [r2, 0x24] - b _080E7182 -_080E7164: - bl sub_80E9F50 - lsls r0, 24 - cmp r0, 0 - beq _080E7182 -_080E716E: - ldr r1, _080E7178 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E7182 - .align 2, 0 -_080E7178: .4byte gSharedMem + 0x1000 -_080E717C: - ldr r0, _080E7188 @ =sub_80E6AC4 - bl sub_80E682C -_080E7182: - pop {r0} - bx r0 - .align 2, 0 -_080E7188: .4byte sub_80E6AC4 - thumb_func_end sub_80E7114 - - thumb_func_start sub_80E718C -sub_80E718C: @ 80E718C - push {r4,lr} - ldr r0, _080E71A4 @ =gSharedMem + 0x1000 - ldrh r1, [r0, 0x24] - adds r4, r0, 0 - cmp r1, 0x1 - beq _080E71C6 - cmp r1, 0x1 - bgt _080E71A8 - cmp r1, 0 - beq _080E71AE - b _080E71EC - .align 2, 0 -_080E71A4: .4byte gSharedMem + 0x1000 -_080E71A8: - cmp r1, 0x8 - beq _080E71F4 - b _080E71EC -_080E71AE: - bl sub_80E8504 - bl sub_80E9E98 - bl sub_80E88F0 - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - bl sub_80E8D54 - b _080E720E -_080E71C6: - bl sub_80E9FD4 - lsls r0, 24 - cmp r0, 0 - beq _080E720E - movs r2, 0 - adds r1, r4, 0 - adds r1, 0x26 - ldrb r0, [r1] - cmp r0, 0 - bne _080E71DE - movs r2, 0x1 -_080E71DE: - strb r2, [r1] - bl sub_80E683C - bl sub_80E9974 - bl sub_80E9E98 -_080E71EC: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E720E -_080E71F4: - bl sub_80EA014 - lsls r0, 24 - cmp r0, 0 - beq _080E720E - bl sub_80E8420 - movs r0, 0 - bl sub_80E8958 - ldr r0, _080E7214 @ =sub_80E6FC8 - bl sub_80E682C -_080E720E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7214: .4byte sub_80E6FC8 - thumb_func_end sub_80E718C - - thumb_func_start sub_80E7218 -sub_80E7218: @ 80E7218 - push {r4,lr} - ldr r4, _080E7230 @ =gSharedMem + 0x1000 - ldrh r0, [r4, 0x24] - adds r1, r4, 0 - cmp r0, 0x9 - beq _080E7260 - cmp r0, 0x9 - bgt _080E7234 - cmp r0, 0x8 - beq _080E7244 - b _080E723C - .align 2, 0 -_080E7230: .4byte gSharedMem + 0x1000 -_080E7234: - cmp r0, 0xA - beq _080E7276 - cmp r0, 0xB - beq _080E7288 -_080E723C: - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E7288 -_080E7244: - movs r0, 0 - bl sub_80E8D8C - bl sub_80E8504 - bl sub_80E9AD4 - bl sub_80E68E8 - bl sub_80E88F0 - bl sub_80E9E98 - b _080E726E -_080E7260: - bl sub_80EA050 - lsls r0, 24 - cmp r0, 0 - beq _080E7288 - bl sub_80E9C94 -_080E726E: - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E7288 -_080E7276: - movs r0, 0x1 - bl sub_80E87CC - movs r0, 0x1 - bl sub_80E8958 - ldr r0, _080E7290 @ =sub_80E7294 - bl sub_80E682C -_080E7288: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7290: .4byte sub_80E7294 - thumb_func_end sub_80E7218 - - thumb_func_start sub_80E7294 -sub_80E7294: @ 80E7294 - push {r4,lr} - bl sub_80E7B40 - adds r1, r0, 0 - ldr r4, _080E72CC @ =gSharedMem + 0x1000 - ldr r2, _080E72D0 @ =0x000001b9 - adds r0, r4, r2 - strb r1, [r0] - adds r2, 0x7 - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E72DC - movs r0, 0x5 - bl PlaySE - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, _080E72D4 @ =sub_80E7294 - str r1, [r0] - ldr r0, _080E72D8 @ =sub_80E7458 - bl sub_80E682C - b _080E731A - .align 2, 0 -_080E72CC: .4byte gSharedMem + 0x1000 -_080E72D0: .4byte 0x000001b9 -_080E72D4: .4byte sub_80E7294 -_080E72D8: .4byte sub_80E7458 -_080E72DC: - lsls r0, r1, 24 - cmp r0, 0 - beq _080E72E8 - movs r0, 0x5 - bl PlaySE -_080E72E8: - ldr r0, _080E7304 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E730C - movs r0, 0x5 - bl PlaySE - ldr r0, _080E7308 @ =sub_80E7324 - bl sub_80E682C - b _080E731A - .align 2, 0 -_080E7304: .4byte gMain -_080E7308: .4byte sub_80E7324 -_080E730C: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E731A - ldr r0, _080E7320 @ =sub_80E73D0 - bl sub_80E682C -_080E731A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7320: .4byte sub_80E73D0 - thumb_func_end sub_80E7294 - - thumb_func_start sub_80E7324 -sub_80E7324: @ 80E7324 - push {lr} - ldr r0, _080E733C @ =gSharedMem + 0x1000 - ldrh r1, [r0, 0x24] - adds r2, r0, 0 - cmp r1, 0x4 - bhi _080E73C6 - lsls r0, r1, 2 - ldr r1, _080E7340 @ =_080E7344 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E733C: .4byte gSharedMem + 0x1000 -_080E7340: .4byte _080E7344 - .align 2, 0 -_080E7344: - .4byte _080E7358 - .4byte _080E737C - .4byte _080E7384 - .4byte _080E738A - .4byte _080E73A4 -_080E7358: - bl sub_80E7DD0 - lsls r0, 24 - cmp r0, 0 - bne _080E7370 - ldr r0, _080E736C @ =sub_80E7294 - bl sub_80E682C - b _080E73C6 - .align 2, 0 -_080E736C: .4byte sub_80E7294 -_080E7370: - bl sub_80E88F0 - movs r0, 0 - bl sub_80E87CC - b _080E7394 -_080E737C: - ldrh r0, [r2, 0x24] - adds r0, 0x1 - strh r0, [r2, 0x24] - b _080E73C6 -_080E7384: - bl sub_80E9E98 - b _080E7394 -_080E738A: - bl sub_80EA184 - lsls r0, 24 - cmp r0, 0 - beq _080E73C6 -_080E7394: - ldr r1, _080E73A0 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E73C6 - .align 2, 0 -_080E73A0: .4byte gSharedMem + 0x1000 -_080E73A4: - ldrb r0, [r2, 0x8] - cmp r0, 0x6 - bne _080E73C0 - bl sub_80E7FA8 - lsls r0, 24 - cmp r0, 0 - beq _080E73C0 - ldr r0, _080E73BC @ =sub_80E6D7C - bl sub_80E682C - b _080E73C6 - .align 2, 0 -_080E73BC: .4byte sub_80E6D7C -_080E73C0: - ldr r0, _080E73CC @ =sub_80E6AC4 - bl sub_80E682C -_080E73C6: - pop {r0} - bx r0 - .align 2, 0 -_080E73CC: .4byte sub_80E6AC4 - thumb_func_end sub_80E7324 - - thumb_func_start sub_80E73D0 -sub_80E73D0: @ 80E73D0 - push {lr} - ldr r0, _080E73E4 @ =gSharedMem + 0x1000 - ldrh r0, [r0, 0x24] - cmp r0, 0x4 - bhi _080E744E - lsls r0, 2 - ldr r1, _080E73E8 @ =_080E73EC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E73E4: .4byte gSharedMem + 0x1000 -_080E73E8: .4byte _080E73EC - .align 2, 0 -_080E73EC: - .4byte _080E7400 - .4byte _080E740C - .4byte _080E7416 - .4byte _080E742C - .4byte _080E7444 -_080E7400: - movs r0, 0 - bl sub_80E87CC - bl sub_80E88F0 - b _080E7436 -_080E740C: - bl sub_80E9AD4 - bl sub_80E9E98 - b _080E7436 -_080E7416: - bl sub_80EA0E4 - lsls r0, 24 - cmp r0, 0 - beq _080E744E - movs r0, 0x1 - bl sub_80E8D8C - bl sub_80E9A14 - b _080E7436 -_080E742C: - bl sub_80E8420 - movs r0, 0 - bl sub_80E8958 -_080E7436: - ldr r1, _080E7440 @ =gSharedMem + 0x1000 - ldrh r0, [r1, 0x24] - adds r0, 0x1 - strh r0, [r1, 0x24] - b _080E744E - .align 2, 0 -_080E7440: .4byte gSharedMem + 0x1000 -_080E7444: - bl sub_80E9974 - ldr r0, _080E7454 @ =sub_80E6FC8 - bl sub_80E682C -_080E744E: - pop {r0} - bx r0 - .align 2, 0 -_080E7454: .4byte sub_80E6FC8 - thumb_func_end sub_80E73D0 - - thumb_func_start sub_80E7458 -sub_80E7458: @ 80E7458 - push {r4,r5,lr} - ldr r4, _080E7468 @ =gSharedMem + 0x1000 - ldrh r5, [r4, 0x24] - cmp r5, 0 - beq _080E746C - cmp r5, 0x1 - beq _080E74A4 - b _080E7518 - .align 2, 0 -_080E7468: .4byte gSharedMem + 0x1000 -_080E746C: - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, [r0] - ldr r0, _080E7480 @ =sub_80E6FC8 - cmp r1, r0 - bne _080E7484 - bl sub_80E9D7C - b _080E7488 - .align 2, 0 -_080E7480: .4byte sub_80E6FC8 -_080E7484: - bl sub_80E9D00 -_080E7488: - ldr r4, _080E74A0 @ =gSharedMem + 0x1000 - movs r2, 0xDF - lsls r2, 1 - adds r0, r4, r2 - ldrb r0, [r0] - bl sub_80E9E08 - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E7518 - .align 2, 0 -_080E74A0: .4byte gSharedMem + 0x1000 -_080E74A4: - bl sub_80E9E54 - lsls r0, 24 - cmp r0, 0 - beq _080E7518 - movs r1, 0xE2 - lsls r1, 1 - adds r0, r4, r1 - ldr r1, [r0] - ldr r0, _080E74DC @ =sub_80E6FC8 - cmp r1, r0 - bne _080E74E4 - bl sub_80E9D7C - ldr r2, _080E74E0 @ =0x000001b5 - adds r1, r4, r2 - adds r2, 0xB - adds r0, r4, r2 - ldrb r0, [r0] - ldrb r2, [r1] - adds r0, r2 - strb r0, [r1] - bl sub_80E7A98 - adds r0, r4, 0 - adds r0, 0x96 - b _080E74FE - .align 2, 0 -_080E74DC: .4byte sub_80E6FC8 -_080E74E0: .4byte 0x000001b5 -_080E74E4: - ldr r0, _080E7520 @ =0x00009d55 - adds r1, r4, r0 - movs r2, 0xE0 - lsls r2, 1 - adds r0, r4, r2 - ldrb r0, [r0] - ldrb r2, [r1] - adds r0, r2 - strb r0, [r1] - bl sub_80E7D30 - ldr r1, _080E7524 @ =0x000001b9 - adds r0, r4, r1 -_080E74FE: - strb r5, [r0] - ldr r1, _080E7528 @ =gSharedMem + 0x1000 - movs r0, 0xDF - lsls r0, 1 - adds r2, r1, r0 - movs r0, 0x2 - strb r0, [r2] - movs r2, 0xE2 - lsls r2, 1 - adds r0, r1, r2 - ldr r0, [r0] - bl sub_80E682C -_080E7518: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E7520: .4byte 0x00009d55 -_080E7524: .4byte 0x000001b9 -_080E7528: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7458 - - thumb_func_start sub_80E752C -sub_80E752C: @ 80E752C - push {r4,lr} - sub sp, 0x4 - ldr r4, _080E7540 @ =gSharedMem + 0x1000 - ldrh r1, [r4, 0x24] - cmp r1, 0 - beq _080E7544 - cmp r1, 0x1 - beq _080E755C - b _080E756C - .align 2, 0 -_080E7540: .4byte gSharedMem + 0x1000 -_080E7544: - movs r0, 0x1 - negs r0, r0 - str r1, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrh r0, [r4, 0x24] - adds r0, 0x1 - strh r0, [r4, 0x24] - b _080E756C -_080E755C: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _080E756C - ldr r0, [r4] - bl SetMainCallback2 -_080E756C: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80E752C - - thumb_func_start sub_80E7574 -sub_80E7574: @ 80E7574 - push {r4,r5,lr} - ldr r4, _080E75B8 @ =gSharedMem + 0x1000 - ldrb r5, [r4, 0x8] - cmp r5, 0x1 - bne _080E75BC - adds r0, r4, 0 - adds r0, 0x86 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r4, 0 - adds r1, 0x7E - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x2 - bne _080E75BC - adds r0, r4, 0 - adds r0, 0x27 - ldrb r0, [r0] - lsls r0, 1 - subs r1, 0x72 - adds r0, r1 - ldrh r0, [r0] - bl sub_80EB2D4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - beq _080E75BC - adds r0, r4, 0 - adds r0, 0x7D - strb r5, [r0] - adds r1, r4, 0 - b _080E75C6 - .align 2, 0 -_080E75B8: .4byte gSharedMem + 0x1000 -_080E75BC: - ldr r1, _080E75D4 @ =gSharedMem + 0x1000 - adds r2, r1, 0 - adds r2, 0x7D - movs r0, 0 - strb r0, [r2] -_080E75C6: - adds r1, 0x7D - movs r0, 0 - strb r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E75D4: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7574 - - thumb_func_start sub_80E75D8 -sub_80E75D8: @ 80E75D8 - push {r4-r6,lr} - movs r4, 0 - ldr r2, _080E75FC @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080E7604 - ldr r1, _080E7600 @ =gSharedMem + 0x1000 - adds r0, r1, 0 - adds r0, 0x84 - ldrb r0, [r0] - adds r2, r1, 0 - adds r2, 0x86 - strb r0, [r2] - adds r1, 0x85 - movs r0, 0x2 - b _080E768E - .align 2, 0 -_080E75FC: .4byte gMain -_080E7600: .4byte gSharedMem + 0x1000 -_080E7604: - ldrh r1, [r2, 0x30] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _080E7630 - ldr r2, _080E762C @ =gSharedMem + 0x1000 - adds r1, r2, 0 - adds r1, 0x86 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - bge _080E765C - adds r0, r2, 0 - adds r0, 0x84 - ldrb r0, [r0] - strb r0, [r1] - b _080E765C - .align 2, 0 -_080E762C: .4byte gSharedMem + 0x1000 -_080E7630: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080E7658 - ldr r0, _080E7684 @ =gSharedMem + 0x1000 - adds r3, r0, 0 - adds r3, 0x86 - ldrb r1, [r3] - adds r1, 0x1 - strb r1, [r3] - adds r0, 0x84 - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - ble _080E7656 - strb r4, [r3] -_080E7656: - movs r4, 0x1 -_080E7658: - cmp r4, 0 - beq _080E76EA -_080E765C: - ldr r2, _080E7684 @ =gSharedMem + 0x1000 - ldrb r3, [r2, 0x9] - cmp r3, 0x2 - bne _080E7692 - adds r1, r2, 0 - adds r1, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E7688 - adds r0, r2, 0 - adds r0, 0x85 - strb r3, [r0] - b _080E77BC - .align 2, 0 -_080E7684: .4byte gSharedMem + 0x1000 -_080E7688: - adds r1, r2, 0 - adds r1, 0x85 - movs r0, 0 -_080E768E: - strb r0, [r1] - b _080E77BC -_080E7692: - movs r0, 0x85 - adds r0, r2 - mov r12, r0 - adds r4, r2, 0 - adds r4, 0x83 - movs r1, 0 - ldrsb r1, [r0, r1] - ldrb r3, [r4] - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r1, r0 - blt _080E76B0 - subs r0, r3, 0x1 - mov r1, r12 - strb r0, [r1] -_080E76B0: - adds r1, r2, 0 - adds r1, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - ldrb r3, [r1] - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - beq _080E77BC - ldrb r0, [r4] - adds r4, r0, 0 - muls r4, r3 - adds r0, r4, 0 - mov r5, r12 - ldrb r5, [r5] - adds r0, r5 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r2, 0xA] - cmp r0, r1 - bcc _080E77BC - subs r0, r1 - mov r6, r12 - strb r0, [r6] - b _080E77BC -_080E76EA: - ldrh r2, [r2, 0x30] - movs r0, 0x20 - ands r0, r2 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - beq _080E7744 - ldr r2, _080E7728 @ =gSharedMem + 0x1000 - adds r3, r2, 0 - adds r3, 0x85 - ldrb r0, [r3] - subs r0, 0x1 - strb r0, [r3] - lsls r0, 24 - cmp r0, 0 - bge _080E77BC - adds r1, r2, 0 - adds r1, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - ldrb r4, [r1] - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E772C - movs r0, 0x2 - b _080E77BA - .align 2, 0 -_080E7728: .4byte gSharedMem + 0x1000 -_080E772C: - adds r0, r2, 0 - adds r0, 0x83 - ldrb r0, [r0] - subs r1, r0, 0x1 - strb r1, [r3] - adds r5, r4, 0 - muls r5, r0 - adds r0, r5, 0 - adds r1, r0 - lsls r1, 24 - lsrs r0, r1, 24 - b _080E77B2 -_080E7744: - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - beq _080E77C0 - ldr r2, _080E777C @ =gSharedMem + 0x1000 - adds r5, r2, 0 - adds r5, 0x86 - adds r0, r2, 0 - adds r0, 0x84 - movs r1, 0 - ldrsb r1, [r5, r1] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080E7780 - adds r1, r2, 0 - adds r1, 0x85 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x2 - ble _080E77BC - strb r4, [r1] - b _080E77BC - .align 2, 0 -_080E777C: .4byte gSharedMem + 0x1000 -_080E7780: - adds r3, r2, 0 - adds r3, 0x85 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - movs r6, 0x83 - adds r6, r2 - mov r12, r6 - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r6, r1] - cmp r0, r1 - blt _080E779E - strb r4, [r3] -_080E779E: - ldrb r1, [r5] - mov r4, r12 - ldrb r0, [r4] - adds r5, r0, 0 - muls r5, r1 - adds r0, r5, 0 - ldrb r6, [r3] - adds r0, r6 - lsls r0, 24 - lsrs r0, 24 -_080E77B2: - ldrb r1, [r2, 0xA] - cmp r0, r1 - bcc _080E77BC - subs r0, r1 -_080E77BA: - strb r0, [r3] -_080E77BC: - movs r0, 0x1 - b _080E77C2 -_080E77C0: - movs r0, 0 -_080E77C2: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80E75D8 - - thumb_func_start sub_80E77C8 -sub_80E77C8: @ 80E77C8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r7, 0 - ldr r1, _080E780C @ =gSharedMem + 0x1000 - ldr r2, _080E7810 @ =0x000001b7 - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r3, r1, 0 - cmp r0, 0 - beq _080E783E - ldr r1, _080E7814 @ =gMain - ldrh r2, [r1, 0x30] - movs r0, 0x40 - ands r0, r2 - adds r6, r1, 0 - cmp r0, 0 - beq _080E7818 - movs r4, 0xD4 - lsls r4, 1 - adds r1, r3, r4 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - ble _080E7806 - b _080E7948 -_080E7806: - movs r0, 0x3 - strb r0, [r1] - b _080E7948 - .align 2, 0 -_080E780C: .4byte gSharedMem + 0x1000 -_080E7810: .4byte 0x000001b7 -_080E7814: .4byte gMain -_080E7818: - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - bne _080E7822 - b _080E7950 -_080E7822: - movs r5, 0xD4 - lsls r5, 1 - adds r1, r3, r5 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x3 - bgt _080E7838 - b _080E7948 -_080E7838: - movs r0, 0x1 - strb r0, [r1] - b _080E7948 -_080E783E: - adds r0, r3, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0x1 - bne _080E789A - movs r4, 0 - ldr r1, _080E7870 @ =gMain - ldrh r2, [r1, 0x30] - movs r0, 0x40 - ands r0, r2 - adds r6, r1, 0 - cmp r0, 0 - beq _080E7874 - movs r6, 0xD4 - lsls r6, 1 - adds r1, r3, r6 - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - bge _080E7944 - movs r0, 0x3 - strb r0, [r1] - b _080E7944 - .align 2, 0 -_080E7870: .4byte gMain -_080E7874: - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - beq _080E7894 - movs r0, 0xD4 - lsls r0, 1 - adds r1, r3, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x3 - ble _080E7892 - strb r7, [r1] -_080E7892: - movs r4, 0x1 -_080E7894: - cmp r4, 0 - beq _080E7950 - b _080E7944 -_080E789A: - movs r4, 0 - movs r1, 0xE0 - lsls r1, 1 - adds r5, r3, r1 - strb r7, [r5] - ldr r1, _080E78E0 @ =gMain - ldrh r2, [r1, 0x30] - movs r0, 0x40 - ands r0, r2 - adds r6, r1, 0 - cmp r0, 0 - beq _080E78E8 - movs r2, 0xD4 - lsls r2, 1 - adds r1, r3, r2 - ldrb r2, [r1] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bne _080E78C4 - b _080E7A88 -_080E78C4: - subs r0, r2, 0x1 - strb r0, [r1] - ldr r4, _080E78E4 @ =0x000001b5 - adds r1, r3, r4 - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - cmp r0, r1 - bge _080E7932 - movs r0, 0xFF - strb r0, [r5] - b _080E7932 - .align 2, 0 -_080E78E0: .4byte gMain -_080E78E4: .4byte 0x000001b5 -_080E78E8: - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - beq _080E792E - movs r0, 0xD4 - lsls r0, 1 - adds r2, r3, r0 - movs r1, 0 - ldrsb r1, [r2, r1] - movs r4, 0xDB - lsls r4, 1 - adds r0, r3, r4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, 0x1 - cmp r1, r0 - blt _080E790E - b _080E7A88 -_080E790E: - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - movs r1, 0 - ldrsb r1, [r2, r1] - ldr r2, _080E794C @ =0x000001b5 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x3 - cmp r1, r0 - ble _080E792C - movs r0, 0x1 - strb r0, [r5] -_080E792C: - movs r4, 0x1 -_080E792E: - cmp r4, 0 - beq _080E7950 -_080E7932: - movs r4, 0xE0 - lsls r4, 1 - adds r0, r3, r4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E7944 - b _080E7A88 -_080E7944: - bl sub_80E7A98 -_080E7948: - movs r0, 0x1 - b _080E7A8A - .align 2, 0 -_080E794C: .4byte 0x000001b5 -_080E7950: - ldrh r1, [r6, 0x30] - movs r0, 0x20 - ands r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0 - beq _080E7992 - ldr r5, _080E7974 @ =0x000001a9 - adds r2, r3, r5 - ldrb r1, [r2] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0 - beq _080E7978 - subs r0, r1, 0x1 - strb r0, [r2] - b _080E79E6 - .align 2, 0 -_080E7974: .4byte 0x000001a9 -_080E7978: - movs r6, 0xD4 - lsls r6, 1 - adds r0, r3, r6 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - movs r4, 0xD5 - lsls r4, 1 - adds r1, r3, r4 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - b _080E79E6 -_080E7992: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080E79E2 - ldr r5, _080E79D4 @ =0x000001b7 - adds r0, r3, r5 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bne _080E79CC - ldr r0, _080E79D8 @ =0x000001a9 - adds r4, r3, r0 - movs r1, 0xD4 - lsls r1, 1 - adds r0, r3, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r2, 0xD5 - lsls r2, 1 - adds r0, r3, r2 - adds r1, r0 - ldrb r5, [r4] - movs r2, 0 - ldrsb r2, [r4, r2] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - bne _080E79DC -_080E79CC: - ldr r4, _080E79D8 @ =0x000001a9 - adds r0, r3, r4 - strb r6, [r0] - b _080E79E0 - .align 2, 0 -_080E79D4: .4byte 0x000001b7 -_080E79D8: .4byte 0x000001a9 -_080E79DC: - adds r0, r5, 0x1 - strb r0, [r4] -_080E79E0: - movs r7, 0x1 -_080E79E2: - cmp r7, 0 - beq _080E7A88 -_080E79E6: - adds r2, r3, 0 - ldr r5, _080E7A48 @ =0x000001b7 - adds r7, r2, r5 - ldrb r6, [r7] - mov r9, r6 - movs r1, 0 - ldr r0, _080E7A4C @ =0x000001a9 - adds r0, r2 - mov r12, r0 - subs r5, 0xF - adds r4, r2, r5 - movs r0, 0 - ldrsb r0, [r4, r0] - movs r6, 0xD5 - lsls r6, 1 - adds r6, r2 - mov r8, r6 - add r0, r8 - mov r6, r12 - movs r5, 0 - ldrsb r5, [r6, r5] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r5, r0 - bne _080E7A1C - movs r1, 0x1 -_080E7A1C: - strb r1, [r7] - cmp r1, 0 - beq _080E7A58 - ldr r0, _080E7A50 @ =0x000001b5 - adds r1, r2, r0 - ldrb r0, [r4] - ldrb r1, [r1] - subs r0, r1 - strb r0, [r4] - lsls r0, 24 - cmp r0, 0 - beq _080E7A36 - b _080E7948 -_080E7A36: - movs r0, 0x1 - strb r0, [r4] - ldr r1, _080E7A54 @ =0x000001ab - adds r0, r2, r1 - ldrb r0, [r0] - mov r2, r12 - strb r0, [r2] - b _080E7948 - .align 2, 0 -_080E7A48: .4byte 0x000001b7 -_080E7A4C: .4byte 0x000001a9 -_080E7A50: .4byte 0x000001b5 -_080E7A54: .4byte 0x000001ab -_080E7A58: - mov r6, r9 - cmp r6, 0 - bne _080E7A60 - b _080E7948 -_080E7A60: - ldr r1, _080E7A84 @ =0x000001b5 - adds r0, r3, r1 - ldrb r0, [r0] - ldrb r2, [r4] - adds r0, r2 - strb r0, [r4] - cmp r5, 0 - bne _080E7A72 - b _080E7948 -_080E7A72: - movs r0, 0 - ldrsb r0, [r4, r0] - add r0, r8 - ldrb r0, [r0] - subs r0, 0x1 - mov r4, r12 - strb r0, [r4] - b _080E7948 - .align 2, 0 -_080E7A84: .4byte 0x000001b5 -_080E7A88: - movs r0, 0 -_080E7A8A: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80E77C8 - - thumb_func_start sub_80E7A98 -sub_80E7A98: @ 80E7A98 - push {lr} - ldr r1, _080E7ACC @ =gSharedMem + 0x1000 - ldr r0, _080E7AD0 @ =0x000001a9 - adds r3, r1, r0 - movs r2, 0xD4 - lsls r2, 1 - adds r0, r1, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r2, 0x2 - adds r1, r2 - adds r0, r1 - movs r1, 0 - ldrsb r1, [r3, r1] - ldrb r2, [r0] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - blt _080E7AC6 - subs r0, r2, 0x1 - strb r0, [r3] -_080E7AC6: - pop {r0} - bx r0 - .align 2, 0 -_080E7ACC: .4byte gSharedMem + 0x1000 -_080E7AD0: .4byte 0x000001a9 - thumb_func_end sub_80E7A98 - - thumb_func_start sub_80E7AD4 -sub_80E7AD4: @ 80E7AD4 - push {lr} - ldr r3, _080E7B08 @ =gSharedMem + 0x1000 - adds r0, r3, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E7B10 - ldr r1, _080E7B0C @ =0x000001a9 - adds r0, r3, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r2, 0xD4 - lsls r2, 1 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x2A - adds r1, r0 - ldrb r1, [r1] - adds r2, 0x10 - b _080E7B34 - .align 2, 0 -_080E7B08: .4byte gSharedMem + 0x1000 -_080E7B0C: .4byte 0x000001a9 -_080E7B10: - ldr r1, _080E7B3C @ =0x000001a9 - adds r0, r3, r1 - movs r2, 0 - ldrsb r2, [r0, r2] - subs r1, 0x1 - adds r0, r3, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 1 - adds r2, r0 - adds r0, r3, 0 - adds r0, 0x40 - adds r2, r0 - ldrb r1, [r2] - movs r2, 0xDC - lsls r2, 1 -_080E7B34: - adds r0, r3, r2 - strb r1, [r0] - pop {r0} - bx r0 - .align 2, 0 -_080E7B3C: .4byte 0x000001a9 - thumb_func_end sub_80E7AD4 - - thumb_func_start sub_80E7B40 -sub_80E7B40: @ 80E7B40 - push {r4-r7,lr} - movs r5, 0 - ldr r2, _080E7B8C @ =gSharedMem + 0x1000 - movs r0, 0xE0 - lsls r0, 1 - adds r6, r2, r0 - strb r5, [r6] - ldr r1, _080E7B90 @ =gMain - ldrh r4, [r1, 0x30] - movs r0, 0x40 - ands r0, r4 - adds r3, r2, 0 - adds r7, r1, 0 - cmp r0, 0 - beq _080E7B9C - ldr r2, _080E7B94 @ =0x00009cd0 - adds r1, r3, r2 - ldrb r2, [r1] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bne _080E7B6E - b _080E7D1A -_080E7B6E: - subs r0, r2, 0x1 - strb r0, [r1] - ldr r4, _080E7B98 @ =0x00009d55 - adds r1, r3, r4 - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - cmp r0, r1 - bge _080E7BF2 - movs r0, 0xFF - strb r0, [r6] - b _080E7D1A - .align 2, 0 -_080E7B8C: .4byte gSharedMem + 0x1000 -_080E7B90: .4byte gMain -_080E7B94: .4byte 0x00009cd0 -_080E7B98: .4byte 0x00009d55 -_080E7B9C: - movs r0, 0x80 - ands r0, r4 - cmp r0, 0 - beq _080E7BEE - ldr r0, _080E7BE0 @ =0x00009cd0 - adds r2, r3, r0 - movs r1, 0 - ldrsb r1, [r2, r1] - ldr r4, _080E7BE4 @ =0x00009d54 - adds r0, r3, r4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, 0x1 - cmp r1, r0 - blt _080E7BBE - b _080E7D1A -_080E7BBE: - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - movs r1, 0 - ldrsb r1, [r2, r1] - ldr r2, _080E7BE8 @ =0x00009d55 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x4 - cmp r1, r0 - blt _080E7BEC - movs r0, 0x1 - strb r0, [r6] - b _080E7D1A - .align 2, 0 -_080E7BE0: .4byte 0x00009cd0 -_080E7BE4: .4byte 0x00009d54 -_080E7BE8: .4byte 0x00009d55 -_080E7BEC: - movs r5, 0x1 -_080E7BEE: - cmp r5, 0 - beq _080E7BFA -_080E7BF2: - bl sub_80E7D30 -_080E7BF6: - movs r0, 0x1 - b _080E7D1C -_080E7BFA: - ldrh r1, [r7, 0x30] - movs r0, 0x20 - ands r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - beq _080E7C38 - ldr r4, _080E7C30 @ =0x00009cd1 - adds r2, r3, r4 - ldrb r0, [r2] - subs r0, 0x1 - strb r0, [r2] - lsls r0, 24 - cmp r0, 0 - bge _080E7BF6 - ldr r6, _080E7C34 @ =0x00009cd0 - adds r0, r3, r6 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r4, 0x1 - adds r1, r3, r4 - adds r0, r1 - ldrb r0, [r0] - subs r0, 0x1 - strb r0, [r2] - b _080E7BF6 - .align 2, 0 -_080E7C30: .4byte 0x00009cd1 -_080E7C34: .4byte 0x00009cd0 -_080E7C38: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080E7C70 - ldr r6, _080E7C68 @ =0x00009cd1 - adds r4, r3, r6 - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - ldr r2, _080E7C6C @ =0x00009cd0 - adds r1, r3, r2 - movs r2, 0 - ldrsb r2, [r1, r2] - adds r6, 0x1 - adds r1, r3, r6 - adds r2, r1 - lsls r0, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r2, r1] - cmp r0, r1 - blt _080E7BF6 - strb r5, [r4] - b _080E7BF6 - .align 2, 0 -_080E7C68: .4byte 0x00009cd1 -_080E7C6C: .4byte 0x00009cd0 -_080E7C70: - ldrh r1, [r7, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080E7CC4 - ldr r1, _080E7CBC @ =0x00009d55 - adds r0, r3, r1 - ldrb r1, [r0] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _080E7CA2 - negs r0, r1 - movs r4, 0xE0 - lsls r4, 1 - adds r2, r3, r4 - strb r0, [r2] - lsls r0, 24 - asrs r0, 24 - movs r1, 0x4 - negs r1, r1 - cmp r0, r1 - bge _080E7CA2 - strb r1, [r2] -_080E7CA2: - ldr r6, _080E7CC0 @ =0x00009cd0 - adds r1, r3, r6 - movs r2, 0xE0 - lsls r2, 1 - adds r0, r3, r2 - ldrb r0, [r0] - ldrb r4, [r1] - adds r0, r4 - strb r0, [r1] - movs r6, 0xDF - lsls r6, 1 - adds r1, r3, r6 - b _080E7D16 - .align 2, 0 -_080E7CBC: .4byte 0x00009d55 -_080E7CC0: .4byte 0x00009cd0 -_080E7CC4: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080E7D1A - ldr r0, _080E7D24 @ =0x00009d55 - adds r4, r3, r0 - movs r1, 0 - ldrsb r1, [r4, r1] - ldr r6, _080E7D28 @ =0x00009d54 - adds r2, r3, r6 - movs r0, 0 - ldrsb r0, [r2, r0] - subs r0, 0x4 - cmp r1, r0 - bge _080E7CFE - ldrb r1, [r4] - adds r1, 0x4 - ldrb r0, [r2] - subs r0, r1 - movs r2, 0xE0 - lsls r2, 1 - adds r1, r3, r2 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - ble _080E7CFE - movs r0, 0x4 - strb r0, [r1] -_080E7CFE: - ldr r4, _080E7D2C @ =0x00009cd0 - adds r1, r3, r4 - movs r6, 0xE0 - lsls r6, 1 - adds r0, r3, r6 - ldrb r0, [r0] - ldrb r2, [r1] - adds r0, r2 - strb r0, [r1] - movs r4, 0xDF - lsls r4, 1 - adds r1, r3, r4 -_080E7D16: - movs r0, 0x4 - strb r0, [r1] -_080E7D1A: - movs r0, 0 -_080E7D1C: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080E7D24: .4byte 0x00009d55 -_080E7D28: .4byte 0x00009d54 -_080E7D2C: .4byte 0x00009cd0 - thumb_func_end sub_80E7B40 - - thumb_func_start sub_80E7D30 -sub_80E7D30: @ 80E7D30 - push {r4,lr} - ldr r0, _080E7D60 @ =gSharedMem + 0x1000 - ldr r1, _080E7D64 @ =0x00009cd1 - adds r4, r0, r1 - ldr r2, _080E7D68 @ =0x00009cd0 - adds r1, r0, r2 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - adds r2, 0x2 - adds r0, r2 - adds r1, r0 - movs r2, 0 - ldrsb r2, [r4, r2] - ldrb r3, [r1] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - blt _080E7D5A - subs r0, r3, 0x1 - strb r0, [r4] -_080E7D5A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E7D60: .4byte gSharedMem + 0x1000 -_080E7D64: .4byte 0x00009cd1 -_080E7D68: .4byte 0x00009cd0 - thumb_func_end sub_80E7D30 - - thumb_func_start sub_80E7D6C -sub_80E7D6C: @ 80E7D6C - push {r4,r5,lr} - movs r4, 0 - ldr r0, _080E7D94 @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0xA] - cmp r4, r1 - bcs _080E7D8E - adds r5, r0, 0 -_080E7D7A: - adds r0, r4, 0 - ldr r1, _080E7D98 @ =0x0000ffff - bl sub_80E7F00 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrb r0, [r5, 0xA] - cmp r4, r0 - bcc _080E7D7A -_080E7D8E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E7D94: .4byte gSharedMem + 0x1000 -_080E7D98: .4byte 0x0000ffff - thumb_func_end sub_80E7D6C - - thumb_func_start sub_80E7D9C -sub_80E7D9C: @ 80E7D9C - push {r4,r5,lr} - movs r2, 0 - ldr r0, _080E7DCC @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0xA] - cmp r2, r1 - bcs _080E7DC6 - adds r3, r0, 0 - ldr r4, [r3, 0x4] - adds r5, r3, 0 - adds r5, 0xC -_080E7DB0: - lsls r0, r2, 1 - adds r1, r0, r4 - adds r0, r5 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - ldrb r0, [r3, 0xA] - cmp r2, r0 - bcc _080E7DB0 -_080E7DC6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E7DCC: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7D9C - - thumb_func_start sub_80E7DD0 -sub_80E7DD0: @ 80E7DD0 - push {r4,lr} - ldr r2, _080E7E28 @ =gSharedMem + 0x1000 - ldr r1, _080E7E2C @ =0x00009cd1 - adds r0, r2, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r1, 1 - ldr r3, _080E7E30 @ =0x00009cd0 - adds r0, r2, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 2 - adds r1, r0 - adds r3, 0x86 - adds r0, r2, r3 - adds r1, r0 - ldrh r4, [r1] - adds r0, r2, 0 - adds r0, 0x7D - ldrb r0, [r0] - cmp r0, 0 - beq _080E7E34 - adds r0, r2, 0 - adds r0, 0x86 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r2, 0 - adds r1, 0x7E - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x1 - bls _080E7E34 - adds r0, r4, 0 - bl sub_80EB2D4 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x7 - bne _080E7E34 - movs r0, 0 - b _080E7E46 - .align 2, 0 -_080E7E28: .4byte gSharedMem + 0x1000 -_080E7E2C: .4byte 0x00009cd1 -_080E7E30: .4byte 0x00009cd0 -_080E7E34: - ldr r0, _080E7E4C @ =gSharedMem + 0x1000 - adds r0, 0x27 - ldrb r0, [r0] - adds r1, r4, 0 - bl sub_80E7F00 - bl sub_80E95A4 - movs r0, 0x1 -_080E7E46: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080E7E4C: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7DD0 - - thumb_func_start sub_80E7E50 -sub_80E7E50: @ 80E7E50 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r5, 0 - movs r2, 0 - ldr r1, _080E7EF0 @ =gSharedMem + 0x1000 - adds r3, r1, 0 - adds r3, 0x84 - movs r0, 0 - ldrsb r0, [r3, r0] - cmp r2, r0 - bge _080E7EDE - mov r8, r1 - adds r0, r1, 0 - str r0, [sp] -_080E7E74: - mov r0, r8 - adds r0, 0x7E - adds r0, r2, r0 - movs r1, 0 - strb r1, [r0] - movs r3, 0 - ldr r6, _080E7EF4 @ =gSharedMem + 0x1083 - movs r0, 0 - ldrsb r0, [r6, r0] - adds r1, r2, 0x1 - str r1, [sp, 0x4] - cmp r3, r0 - bge _080E7ECE - ldr r6, [sp] - mov r12, r6 - movs r0, 0 - mov r10, r0 - ldr r1, _080E7EF4 @ =gSharedMem + 0x1083 - mov r9, r1 - ldr r7, _080E7EF8 @ =gSharedMem + 0x100C - lsls r4, r2, 1 -_080E7E9E: - lsls r1, r5, 1 - adds r2, r1, r7 - mov r6, r12 - ldr r0, [r6, 0x4] - adds r1, r0 - ldrh r0, [r1] - strh r0, [r2] - adds r0, r3, r4 - mov r1, r12 - adds r1, 0x8C - adds r0, r1 - mov r1, r10 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - mov r6, r9 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r3, r0 - blt _080E7E9E -_080E7ECE: - ldr r1, [sp, 0x4] - lsls r0, r1, 16 - lsrs r2, r0, 16 - ldr r6, _080E7EFC @ =gSharedMem + 0x1084 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r2, r0 - blt _080E7E74 -_080E7EDE: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E7EF0: .4byte gSharedMem + 0x1000 -_080E7EF4: .4byte gSharedMem + 0x1083 -_080E7EF8: .4byte gSharedMem + 0x100C -_080E7EFC: .4byte gSharedMem + 0x1084 - thumb_func_end sub_80E7E50 - - thumb_func_start sub_80E7F00 -sub_80E7F00: @ 80E7F00 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - ldr r7, _080E7F68 @ =gSharedMem + 0x1000 - adds r0, r7, 0 - adds r0, 0x83 - movs r4, 0 - ldrsb r4, [r0, r4] - adds r0, r6, 0 - adds r1, r4, 0 - bl __divsi3 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r6, 0 - adds r1, r4, 0 - bl __modsi3 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - lsls r0, r6, 1 - adds r1, r7, 0 - adds r1, 0xC - adds r0, r1 - ldrh r0, [r0] - bl sub_80EB2D4 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r9 - bl sub_80EB2D4 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r4, 0x7 - bne _080E7F6C - cmp r3, 0x7 - beq _080E7F7C - adds r1, r7, 0 - adds r1, 0x7E - adds r1, r5, r1 - ldrb r0, [r1] - subs r0, 0x1 - b _080E7F7A - .align 2, 0 -_080E7F68: .4byte gSharedMem + 0x1000 -_080E7F6C: - cmp r3, 0x7 - bne _080E7F7C - adds r1, r7, 0 - adds r1, 0x7E - adds r1, r5, r1 - ldrb r0, [r1] - adds r0, 0x1 -_080E7F7A: - strb r0, [r1] -_080E7F7C: - movs r3, 0 - ldr r2, _080E7FA4 @ =gSharedMem + 0x1000 - lsls r0, r5, 1 - add r0, r8 - adds r1, r2, 0 - adds r1, 0x8C - adds r0, r1 - strb r3, [r0] - lsls r0, r6, 1 - adds r2, 0xC - adds r0, r2 - mov r1, r9 - strh r1, [r0] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E7FA4: .4byte gSharedMem + 0x1000 - thumb_func_end sub_80E7F00 - - thumb_func_start sub_80E7FA8 -sub_80E7FA8: @ 80E7FA8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r0, 0 - mov r8, r0 - movs r5, 0 - ldr r0, _080E8040 @ =gSharedMem + 0x1000 - ldrb r1, [r0, 0xA] - cmp r8, r1 - bcs _080E802E - ldr r3, _080E8044 @ =0x0000a140 - adds r6, r0, r3 - ldr r1, _080E8048 @ =0x0000a16d - adds r1, r0 - mov r9, r1 -_080E7FC8: - ldr r3, _080E804C @ =0xffff5ec0 - adds r7, r6, r3 - ldr r0, [r7, 0x4] - lsls r4, r5, 1 - adds r0, r4, r0 - ldrh r1, [r0] - adds r0, r6, 0 - movs r2, 0 - bl sub_80EB218 - ldr r1, _080E8050 @ =0xffff5ecc - adds r0, r6, r1 - adds r0, r4 - ldrh r1, [r0] - mov r0, r9 - movs r2, 0 - bl sub_80EB218 - adds r1, r6, 0 - mov r2, r9 - ldrb r0, [r1] - adds r4, r5, 0x1 - ldrb r3, [r2] - cmp r0, r3 - bne _080E8018 - adds r3, r7, 0 - cmp r0, 0xFF - beq _080E8010 -_080E8000: - adds r1, 0x1 - adds r2, 0x1 - ldrb r0, [r1] - ldrb r5, [r2] - cmp r0, r5 - bne _080E8018 - cmp r0, 0xFF - bne _080E8000 -_080E8010: - ldrb r0, [r1] - ldrb r2, [r2] - cmp r0, r2 - beq _080E8024 -_080E8018: - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r3, _080E8040 @ =gSharedMem + 0x1000 -_080E8024: - lsls r0, r4, 16 - lsrs r5, r0, 16 - ldrb r3, [r3, 0xA] - cmp r5, r3 - bcc _080E7FC8 -_080E802E: - mov r1, r8 - lsls r0, r1, 24 - lsrs r0, 24 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080E8040: .4byte gSharedMem + 0x1000 -_080E8044: .4byte 0x0000a140 -_080E8048: .4byte 0x0000a16d -_080E804C: .4byte 0xffff5ec0 -_080E8050: .4byte 0xffff5ecc - thumb_func_end sub_80E7FA8 - - thumb_func_start sub_80E8054 -sub_80E8054: @ 80E8054 - push {r4,lr} - movs r1, 0 - ldr r2, _080E8078 @ =gSharedMem + 0x1000 - ldrb r0, [r2, 0xA] - cmp r1, r0 - bcs _080E808A - adds r4, r2, 0 - adds r4, 0xC - ldr r3, _080E807C @ =0x0000ffff - adds r2, r0, 0 -_080E8068: - lsls r0, r1, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r0, r3 - beq _080E8080 - movs r0, 0 - b _080E808C - .align 2, 0 -_080E8078: .4byte gSharedMem + 0x1000 -_080E807C: .4byte 0x0000ffff -_080E8080: - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r2 - bcc _080E8068 -_080E808A: - movs r0, 0x1 -_080E808C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80E8054 - - thumb_func_start sub_80E8094 -sub_80E8094: @ 80E8094 - push {r4-r7,lr} - movs r5, 0 - ldr r6, _080E80C4 @ =gSharedMem + 0xB140 - adds r7, r6, 0 - adds r7, 0x2D -_080E809E: - lsls r4, r5, 1 - ldr r1, _080E80C8 @ =0xffff5ecc - adds r0, r6, r1 - adds r0, r4 - ldrh r1, [r0] - adds r0, r6, 0 - movs r2, 0 - bl sub_80EB218 - ldr r0, _080E80CC @ =gMysteryEventPhrase - adds r4, r0 - ldrh r1, [r4] - adds r0, r7, 0 - movs r2, 0 - bl sub_80EB218 - adds r3, r6, 0 - adds r4, r7, 0 - b _080E80D8 - .align 2, 0 -_080E80C4: .4byte gSharedMem + 0xB140 -_080E80C8: .4byte 0xffff5ecc -_080E80CC: .4byte gMysteryEventPhrase -_080E80D0: - adds r4, 0x1 - adds r3, 0x1 - cmp r2, r1 - bne _080E80F4 -_080E80D8: - ldrb r2, [r3] - adds r0, r2, 0 - cmp r0, 0xFF - beq _080E80EE - ldrb r1, [r4] - adds r0, r1, 0 - cmp r0, 0xFF - bne _080E80D0 - ldrb r0, [r3] - cmp r0, 0xFF - bne _080E80F4 -_080E80EE: - ldrb r0, [r4] - cmp r0, 0xFF - beq _080E80F8 -_080E80F4: - movs r0, 0 - b _080E8104 -_080E80F8: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _080E809E - movs r0, 0x1 -_080E8104: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80E8094 - thumb_func_start sub_80E810C sub_80E810C: @ 80E810C push {r4-r7,lr} diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index c43804c23..b5e87337f 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -83,8 +83,11 @@ struct Shared1000 u8 filler9C7A[2]; u16 unk9C7C; // this is at 0x9FA8 in German s16 unk9C7E; - u8 filler9C80[0xDA4-0xC80]; - u8 unk9DA4[0x24]; + u8 unk9C80[0xC9-0x80]; + u8 unk9CC9[0xD12-0xCC9]; + u8 unk9D12[0x5B-0x12]; + u8 unk9D5B[0xA4-0x5B]; + u8 unk9DA4[0xC8-0xA4]; u8 filler9DC8[0xE14 - 0xDC8]; u8 unk9E14[0xE41 - 0xE14]; u8 unk9E41[0xF6E - 0xE41]; @@ -271,9 +274,6 @@ void sub_80EB218(); u16 sub_80EB2D4(); bool8 sub_80EB680(u16 *, u16, u16, u16); -// TODO: Integrate German code into this -#if ENGLISH - void sub_80E60D8(void) { u8 r4 = 3; @@ -542,13 +542,8 @@ void sub_80E6690(void) { u8 *pointers[] = { -#if ENGLISH - gSharedMem + 0xAC80, gSharedMem + 0xACC9, - gSharedMem + 0xAD12, gSharedMem + 0xAD5B, -#else - gSharedMem + 0xAFAC, gSharedMem + 0xAFF5, - gSharedMem + 0xB03E, gSharedMem + 0xB087, -#endif + shared1000.unk9C80, shared1000.unk9CC9, + shared1000.unk9D12, shared1000.unk9D5B, }; u8 *r3; u16 i; @@ -581,22 +576,6 @@ void sub_80E6690(void) r3[3] = 0xFF; } -#endif - -// local variable -#if GERMAN -u8 *const gUnknown_083DB7DC[] = -{ -#if ENGLISH - gSharedMem + 0xAC80, gSharedMem + 0xACC9, - gSharedMem + 0xAD12, gSharedMem + 0xAD5B, -#else - gSharedMem + 0xAFAC, gSharedMem + 0xAFF5, - gSharedMem + 0xB03E, gSharedMem + 0xB087, -#endif -}; -#endif - // Default profile phrase const u16 gUnknown_083DB7EC[] = { @@ -625,7 +604,6 @@ const u16 gUnknown_083DB7F4[] = const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); -#if ENGLISH // ResetDefaultEasyChatPhrases void InitEasyChatPhrases(void) { @@ -1795,5 +1773,3 @@ bool8 sub_80E8094(void) } return TRUE; } - -#endif -- cgit v1.2.3 From cf37681831a9a8289d5941e66ce673b896abf71f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 3 Jan 2018 14:30:23 -0600 Subject: decompile sub_80E810C - sub_80E872C --- asm/easy_chat.s | 828 ------------------------------------------------- data.txt | 10 + data/easy_chat.s | 147 --------- include/easy_chat.h | 92 ++++++ include/graphics.h | 2 + ld_script.txt | 2 + src/easy_chat_2.c | 403 ++++++++++++++++++++++++ src/easy_chat_before.c | 135 ++++---- 8 files changed, 561 insertions(+), 1058 deletions(-) create mode 100644 data.txt create mode 100644 src/easy_chat_2.c diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 117fa693f..5d2089c19 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,834 +5,6 @@ .text - thumb_func_start sub_80E810C -sub_80E810C: @ 80E810C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r5, 0 - ldr r6, _080E8198 @ =gSharedMem + 0xAE6E - ldr r0, _080E819C @ =0xffff6192 - adds r0, r6 - mov r9, r0 - movs r1, 0 - mov r8, r1 - adds r7, r6, 0 - adds r7, 0x80 - ldr r2, _080E81A0 @ =gBerryMasterWifePhrases - mov r10, r2 -_080E812C: - mov r0, r9 - ldrh r1, [r0, 0xC] - adds r0, r6, 0 - movs r2, 0 - bl sub_80EB218 - mov r1, r8 - strb r1, [r0] - adds r0, 0x1 - mov r2, r9 - ldrh r1, [r2, 0xE] - movs r2, 0 - bl sub_80EB218 - lsls r4, r5, 2 - mov r1, r10 - adds r0, r4, r1 - ldrh r1, [r0] - adds r0, r7, 0 - movs r2, 0 - bl sub_80EB218 - mov r2, r8 - strb r2, [r0] - adds r0, 0x1 - ldr r1, _080E81A4 @ =gBerryMasterWifePhrases + 0x2 - adds r4, r1 - ldrh r1, [r4] - movs r2, 0 - bl sub_80EB218 - adds r0, r6, 0 - adds r3, r7, 0 - adds r4, r5, 0x1 -_080E8170: - ldrb r2, [r0] - cmp r2, 0xFF - beq _080E818A - ldrb r1, [r3] - cmp r1, 0xFF - beq _080E8184 - adds r3, 0x1 - adds r0, 0x1 - cmp r2, r1 - beq _080E8170 -_080E8184: - ldrb r0, [r0] - cmp r0, 0xFF - bne _080E81A8 -_080E818A: - ldrb r0, [r3] - cmp r0, 0xFF - bne _080E81A8 - lsls r0, r4, 24 - lsrs r0, 24 - b _080E81B2 - .align 2, 0 -_080E8198: .4byte gSharedMem + 0xAE6E -_080E819C: .4byte 0xffff6192 -_080E81A0: .4byte gBerryMasterWifePhrases -_080E81A4: .4byte gBerryMasterWifePhrases + 0x2 -_080E81A8: - lsls r0, r4, 16 - lsrs r5, r0, 16 - cmp r5, 0x4 - bls _080E812C - movs r0, 0 -_080E81B2: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80E810C - - thumb_func_start sub_80E81C0 -sub_80E81C0: @ 80E81C0 - push {r4,lr} - ldr r0, _080E81EC @ =gStringVar2 - ldr r4, _080E81F0 @ =gSharedMem + 0x1000 - ldr r2, _080E81F4 @ =0x00009c7c - adds r1, r4, r2 - ldrh r1, [r1] - movs r2, 0 - bl sub_80EB218 - movs r1, 0 - strb r1, [r0] - adds r0, 0x1 - ldr r1, _080E81F8 @ =0x00009c7e - adds r4, r1 - ldrh r1, [r4] - movs r2, 0 - bl sub_80EB218 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E81EC: .4byte gStringVar2 -_080E81F0: .4byte gSharedMem + 0x1000 -_080E81F4: .4byte 0x00009c7c -_080E81F8: .4byte 0x00009c7e - thumb_func_end sub_80E81C0 - - thumb_func_start sub_80E81FC -sub_80E81FC: @ 80E81FC - push {lr} - movs r0, 0x5 - bl PlaySE - bl sub_80E95A4 - movs r0, 0 - movs r1, 0 - movs r2, 0x1D - movs r3, 0xD - bl MenuZeroFillWindowRect - pop {r0} - bx r0 - thumb_func_end sub_80E81FC - - thumb_func_start sub_80E8218 -sub_80E8218: @ 80E8218 - push {r4,r5,lr} - sub sp, 0x40 - mov r1, sp - ldr r0, _080E8260 @ =gSpriteSheets_Interview - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r4,r5} - stm r1!, {r2,r4,r5} - ldr r0, [r0] - str r0, [r1] - add r4, sp, 0x28 - adds r1, r4, 0 - ldr r0, _080E8264 @ =gSpritePalettes_Interview - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - mov r0, sp - bl LoadSpriteSheets - adds r0, r4, 0 - bl LoadSpritePalettes - bl sub_80E8268 - bl sub_80E8818 - bl sub_80E8A7C - add sp, 0x40 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E8260: .4byte gSpriteSheets_Interview -_080E8264: .4byte gSpritePalettes_Interview - thumb_func_end sub_80E8218 - - thumb_func_start sub_80E8268 -sub_80E8268: @ 80E8268 - push {lr} - ldr r0, _080E82B0 @ =gSpriteTemplate_83DBBFC - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080E82B4 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldr r0, _080E82B8 @ =gUnknown_083DB694 - ldr r3, [r0] - adds r0, r3, 0 - adds r0, 0x8A - ldrh r0, [r0] - lsls r0, 3 - adds r0, 0x8 - movs r2, 0 - strh r0, [r1, 0x22] - adds r0, r3, 0 - adds r0, 0x88 - ldrh r0, [r0] - lsls r0, 3 - adds r0, 0x4 - strh r0, [r1, 0x20] - strh r2, [r1, 0x2E] - strh r2, [r1, 0x30] - adds r0, r3, 0 - adds r0, 0x98 - str r1, [r0] - pop {r0} - bx r0 - .align 2, 0 -_080E82B0: .4byte gSpriteTemplate_83DBBFC -_080E82B4: .4byte gSprites -_080E82B8: .4byte gUnknown_083DB694 - thumb_func_end sub_80E8268 - - thumb_func_start sub_80E82BC -sub_80E82BC: @ 80E82BC - push {r4-r7,lr} - adds r3, r0, 0 - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _080E838C - ldr r0, _080E8334 @ =gUnknown_083DB694 - ldr r2, [r0] - adds r1, r2, 0 - adds r1, 0x87 - ldrb r1, [r1] - mov r12, r0 - cmp r1, 0 - beq _080E836C - adds r0, r2, 0 - adds r0, 0x86 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r2, 0 - adds r0, 0x85 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r4, r0, 16 - movs r7, 0 - movs r1, 0 - cmp r7, r4 - bcs _080E8316 - lsls r6, r5, 1 - adds r2, 0x8C -_080E8300: - adds r0, r1, r6 - adds r0, r2, r0 - ldrb r0, [r0] - adds r0, r7, r0 - lsls r0, 16 - lsrs r7, r0, 16 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r4 - bcc _080E8300 -_080E8316: - mov r0, r12 - ldr r2, [r0] - adds r0, r2, 0 - adds r0, 0x84 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r5, r0 - bne _080E8338 - movs r0, 0x60 - strh r0, [r3, 0x22] - lsls r0, r4, 3 - subs r0, r4 - adds r0, 0x3 - b _080E8356 - .align 2, 0 -_080E8334: .4byte gUnknown_083DB694 -_080E8338: - adds r1, r2, 0 - adds r1, 0x8A - lsls r0, r5, 1 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 3 - adds r0, 0x8 - strh r0, [r3, 0x22] - adds r0, r2, 0 - adds r0, 0x88 - ldrh r0, [r0] - adds r0, r7 - movs r1, 0xB - muls r1, r4 - adds r0, r1 -_080E8356: - lsls r0, 3 - adds r0, 0x4 - strh r0, [r3, 0x20] - movs r1, 0 - ldr r0, _080E8368 @ =0x0000fffa - strh r0, [r3, 0x24] - strh r1, [r3, 0x2E] - b _080E838C - .align 2, 0 -_080E8368: .4byte 0x0000fffa -_080E836C: - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _080E838C - strh r1, [r3, 0x2E] - ldrh r0, [r3, 0x24] - adds r0, 0x1 - strh r0, [r3, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _080E838C - ldr r0, _080E8394 @ =0x0000fffa - strh r0, [r3, 0x24] -_080E838C: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8394: .4byte 0x0000fffa - thumb_func_end sub_80E82BC - - thumb_func_start sub_80E8398 -sub_80E8398: @ 80E8398 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x1 - beq _080E83D4 - cmp r3, 0x1 - bgt _080E83AC - cmp r3, 0 - beq _080E83B2 - b _080E8416 -_080E83AC: - cmp r3, 0x2 - beq _080E83F8 - b _080E8416 -_080E83B2: - ldr r0, _080E83D0 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0x98 - ldr r1, [r0] - strh r3, [r1, 0x30] - ldr r1, [r0] - strh r3, [r1, 0x24] - ldr r1, [r0] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - b _080E8414 - .align 2, 0 -_080E83D0: .4byte gUnknown_083DB694 -_080E83D4: - ldr r0, _080E83F4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0x98 - ldr r0, [r1] - movs r2, 0 - strh r3, [r0, 0x30] - ldr r0, [r1] - strh r2, [r0, 0x24] - ldr r1, [r1] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - b _080E8414 - .align 2, 0 -_080E83F4: .4byte gUnknown_083DB694 -_080E83F8: - ldr r0, _080E841C @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0x98 - ldr r2, [r1] - movs r3, 0 - movs r0, 0x1 - strh r0, [r2, 0x30] - ldr r0, [r1] - strh r3, [r0, 0x24] - ldr r1, [r1] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 -_080E8414: - strb r0, [r1] -_080E8416: - pop {r0} - bx r0 - .align 2, 0 -_080E841C: .4byte gUnknown_083DB694 - thumb_func_end sub_80E8398 - - thumb_func_start sub_80E8420 -sub_80E8420: @ 80E8420 - push {r4-r7,lr} - sub sp, 0x18 - mov r1, sp - ldr r0, _080E84E0 @ =gSpriteTemplate_83DBCAC - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - mov r0, sp - movs r1, 0 - movs r2, 0 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080E84E4 @ =gUnknown_083DB694 - ldr r7, [r1] - adds r5, r7, 0 - adds r5, 0x9C - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r4, _080E84E8 @ =gSprites - adds r1, r4 - str r1, [r5] - ldr r0, _080E84EC @ =gSpriteAnimTable_83DBC8C - str r0, [sp, 0x8] - ldr r0, _080E84F0 @ =sub_80E872C - str r0, [sp, 0x14] - mov r0, sp - movs r1, 0 - movs r2, 0 - movs r3, 0x4 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - adds r6, r7, 0 - adds r6, 0xA0 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r6] - ldr r0, _080E84F4 @ =gSpriteAnimTable_83DBC9C - str r0, [sp, 0x8] - ldr r0, _080E84F8 @ =sub_80E8760 - str r0, [sp, 0x14] - mov r0, sp - movs r1, 0 - movs r2, 0 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - adds r2, r7, 0 - adds r2, 0xA4 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r2] - ldr r0, [r5] - movs r1, 0 - strh r1, [r0, 0x2E] - ldr r0, [r6] - strh r1, [r0, 0x2E] - ldr r0, [r2] - strh r1, [r0, 0x2E] - movs r0, 0x1 - bl IndexOfSpritePaletteTag - ldr r1, [r5] - lsls r0, 24 - lsrs r0, 20 - ldr r2, _080E84FC @ =0x00000101 - adds r0, r2 - strh r0, [r1, 0x34] - bl sub_80E8534 - adds r1, r7, 0 - adds r1, 0x96 - movs r0, 0x1 - strb r0, [r1] - ldr r1, _080E8500 @ =REG_BLDCNT - movs r3, 0xFD - lsls r3, 6 - adds r0, r3, 0 - strh r0, [r1] - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E84E0: .4byte gSpriteTemplate_83DBCAC -_080E84E4: .4byte gUnknown_083DB694 -_080E84E8: .4byte gSprites -_080E84EC: .4byte gSpriteAnimTable_83DBC8C -_080E84F0: .4byte sub_80E872C -_080E84F4: .4byte gSpriteAnimTable_83DBC9C -_080E84F8: .4byte sub_80E8760 -_080E84FC: .4byte 0x00000101 -_080E8500: .4byte REG_BLDCNT - thumb_func_end sub_80E8420 - - thumb_func_start sub_80E8504 -sub_80E8504: @ 80E8504 - push {r4,lr} - ldr r0, _080E8530 @ =gUnknown_083DB694 - ldr r4, [r0] - adds r0, r4, 0 - adds r0, 0x9C - ldr r0, [r0] - bl DestroySprite - adds r0, r4, 0 - adds r0, 0xA0 - ldr r0, [r0] - bl DestroySprite - adds r0, r4, 0 - adds r0, 0xA4 - ldr r0, [r0] - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E8530: .4byte gUnknown_083DB694 - thumb_func_end sub_80E8504 - - thumb_func_start sub_80E8534 -sub_80E8534: @ 80E8534 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r1, _080E8554 @ =gUnknown_083DB694 - ldr r3, [r1] - ldr r2, _080E8558 @ =0x000001b7 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r4, r1, 0 - cmp r0, 0 - beq _080E8560 - ldr r1, _080E855C @ =gUnknown_020388AC - movs r0, 0x1 - b _080E8598 - .align 2, 0 -_080E8554: .4byte gUnknown_083DB694 -_080E8558: .4byte 0x000001b7 -_080E855C: .4byte gUnknown_020388AC -_080E8560: - adds r0, r3, 0 - adds r0, 0x26 - ldrb r2, [r0] - cmp r2, 0 - bne _080E8578 - ldr r0, _080E8574 @ =gUnknown_020388AC - strb r2, [r0] - adds r7, r0, 0 - b _080E859C - .align 2, 0 -_080E8574: .4byte gUnknown_020388AC -_080E8578: - movs r1, 0xD4 - lsls r1, 1 - adds r0, r3, r1 - ldrh r1, [r0] - movs r0, 0xC0 - lsls r0, 3 - cmp r1, r0 - bne _080E8594 - ldr r1, _080E8590 @ =gUnknown_020388AC - movs r0, 0x2 - b _080E8598 - .align 2, 0 -_080E8590: .4byte gUnknown_020388AC -_080E8594: - ldr r1, _080E85F4 @ =gUnknown_020388AC - movs r0, 0x3 -_080E8598: - strb r0, [r1] - adds r7, r1, 0 -_080E859C: - ldr r2, [r4] - adds r4, r2, 0 - adds r4, 0x9C - ldr r1, [r4] - ldrb r0, [r7] - movs r3, 0 - mov r8, r3 - strh r0, [r1, 0x32] - adds r5, r2, 0 - adds r5, 0xA0 - ldr r1, [r5] - ldrb r0, [r7] - strh r0, [r1, 0x32] - adds r6, r2, 0 - adds r6, 0xA4 - ldr r1, [r6] - ldrb r0, [r7] - strh r0, [r1, 0x32] - ldr r0, [r4] - ldrb r1, [r7] - bl StartSpriteAnim - ldr r0, [r5] - ldrb r1, [r7] - bl StartSpriteAnim - ldr r0, [r6] - ldrb r1, [r7] - bl StartSpriteAnim - ldr r0, [r4] - movs r1, 0x8 - strh r1, [r0, 0x38] - ldr r0, [r4] - strh r1, [r0, 0x3A] - ldr r0, [r4] - mov r1, r8 - strh r1, [r0, 0x30] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E85F4: .4byte gUnknown_020388AC - thumb_func_end sub_80E8534 - - thumb_func_start sub_80E85F8 -sub_80E85F8: @ 80E85F8 - push {r4-r6,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E8624 - ldr r1, _080E8620 @ =gSineTable - movs r2, 0x30 - ldrsh r0, [r5, r2] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 21 - adds r0, 0x8 - strh r0, [r5, 0x38] - b _080E863A - .align 2, 0 -_080E8620: .4byte gSineTable -_080E8624: - ldr r1, _080E8688 @ =gSineTable - movs r2, 0x30 - ldrsh r0, [r5, r2] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - lsls r1, 16 - asrs r1, 21 - movs r0, 0x8 - subs r0, r1 - strh r0, [r5, 0x3A] -_080E863A: - ldrh r0, [r5, 0x30] - adds r0, 0x5 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x30] - ldr r2, _080E868C @ =REG_BLDALPHA - ldrh r0, [r5, 0x3A] - lsls r0, 8 - ldrh r1, [r5, 0x38] - orrs r0, r1 - strh r0, [r2] - ldr r0, _080E8690 @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0x96 - ldrb r0, [r0] - cmp r0, 0 - beq _080E871A - bl sub_80E8534 - adds r1, r6, 0 - adds r1, 0x9C - ldr r0, [r1] - movs r2, 0x8 - strh r2, [r0, 0x38] - ldr r0, [r1] - strh r2, [r0, 0x3A] - ldr r1, [r1] - movs r0, 0 - strh r0, [r1, 0x30] - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _080E86C4 - cmp r0, 0x1 - bgt _080E8694 - cmp r0, 0 - beq _080E869E - b _080E871A - .align 2, 0 -_080E8688: .4byte gSineTable -_080E868C: .4byte REG_BLDALPHA -_080E8690: .4byte gUnknown_083DB694 -_080E8694: - cmp r0, 0x2 - beq _080E86D6 - cmp r0, 0x3 - beq _080E86DE - b _080E871A -_080E869E: - ldr r2, _080E86C0 @ =0x000001a9 - adds r0, r6, r2 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x58 - muls r0, r1 - adds r0, 0x20 - strh r0, [r5, 0x20] - movs r1, 0xD4 - lsls r1, 1 - adds r0, r6, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r2, 0xC - b _080E870A - .align 2, 0 -_080E86C0: .4byte 0x000001a9 -_080E86C4: - movs r0, 0xD8 - strh r0, [r5, 0x20] - movs r1, 0xD4 - lsls r1, 1 - adds r0, r6, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - b _080E8714 -_080E86D6: - movs r0, 0x97 - strh r0, [r5, 0x20] - movs r0, 0x60 - b _080E8718 -_080E86DE: - ldr r4, _080E8720 @ =gUnknown_083DBCC4 - ldr r2, _080E8724 @ =0x000001a9 - adds r0, r6, r2 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0xD4 - lsls r0, 1 - adds r3, r6, r0 - movs r2, 0 - ldrsb r2, [r3, r2] - lsls r0, r2, 3 - subs r0, r2 - adds r1, r0 - adds r1, r4 - movs r0, 0 - ldrsb r0, [r1, r0] - lsls r0, 3 - adds r0, 0x1F - strh r0, [r5, 0x20] - movs r0, 0 - ldrsb r0, [r3, r0] - ldr r2, _080E8728 @ =0x000001b5 -_080E870A: - adds r1, r6, r2 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 -_080E8714: - lsls r0, 4 - adds r0, 0x60 -_080E8718: - strh r0, [r5, 0x22] -_080E871A: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E8720: .4byte gUnknown_083DBCC4 -_080E8724: .4byte 0x000001a9 -_080E8728: .4byte 0x000001b5 - thumb_func_end sub_80E85F8 - - thumb_func_start sub_80E872C -sub_80E872C: @ 80E872C - push {lr} - adds r2, r0, 0 - ldr r0, _080E875C @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0x96 - ldrb r0, [r0] - cmp r0, 0 - beq _080E8756 - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _080E8756 - adds r1, 0x9C - ldr r0, [r1] - ldrh r0, [r0, 0x20] - adds r0, 0x20 - strh r0, [r2, 0x20] - ldr r0, [r1] - ldrh r0, [r0, 0x22] - strh r0, [r2, 0x22] -_080E8756: - pop {r0} - bx r0 - .align 2, 0 -_080E875C: .4byte gUnknown_083DB694 - thumb_func_end sub_80E872C - thumb_func_start sub_80E8760 sub_80E8760: @ 80E8760 push {lr} diff --git a/data.txt b/data.txt new file mode 100644 index 000000000..4c3a16e5a --- /dev/null +++ b/data.txt @@ -0,0 +1,10 @@ +const struct SpriteTemplate gSpriteTemplate_83DBCAC = +{ + .tileTag = 1, + .paletteTag = 1, + .oam = &gOamData_83DBC14, + .anims = gSpriteAnimTable_83DBC7C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80E85F8, +}; diff --git a/data/easy_chat.s b/data/easy_chat.s index 98f88b1fc..6630e19d2 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,153 +8,6 @@ .section .rodata - .align 2 -InterviewPalette_1:: @ 83DB820 - .incbin "graphics/misc/interview_pal1.gbapal" - - .align 2 -InterviewArrowTiles: @ 83DB840 - .incbin "graphics/misc/interview_arrow.4bpp" - - .align 2 -InterviewButtonTiles: @ 83DB940 - .incbin "graphics/misc/interview_buttons.4bpp" - - .align 2 -gMenuInterviewFrame_Pal:: - .incbin "graphics/misc/interview_frame.gbapal" - - .align 2 -gMenuInterviewFrame_Gfx:: - .incbin "graphics/misc/interview_frame.4bpp.lz" - - .align 2 -InterviewTriangleCursorTiles: @ 83DBB94 - .incbin "graphics/misc/interview_triangle_cursor.4bpp" - - .align 2 -gSpriteSheets_Interview:: @ 83DBBB4 - obj_tiles InterviewTriangleCursorTiles, 0x20, 0 - obj_tiles gInterviewOutlineCursorTiles, 0x700, 1 - obj_tiles InterviewArrowTiles, 0x100, 2 - obj_tiles InterviewButtonTiles, 0x100, 3 - null_obj_tiles - - .align 2 -gSpritePalettes_Interview:: @ 83DBBDC - obj_pal InterviewPalette_0, 0 - obj_pal InterviewPalette_1, 1 - null_obj_pal - - .align 2 -gOamData_83DBBF4:: @ 83DBBF4 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteTemplate_83DBBFC:: @ 83DBBFC - spr_template 0, 0, gOamData_83DBBF4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E82BC - - .align 2 -gOamData_83DBC14:: @ 83DBC14 - .2byte 0x4400 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83DBC1C:: @ 83DBC1C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC24:: @ 83DBC24 -.ifdef ENGLISH - obj_image_anim_frame 8, 5 -.else - obj_image_anim_frame 0, 5 -.endif - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC2C:: @ 83DBC2C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC34:: @ 83DBC34 - obj_image_anim_frame 24, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC3C:: @ 83DBC3C - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC44:: @ 83DBC44 - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC4C:: @ 83DBC4C - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC54:: @ 83DBC54 - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC5C:: @ 83DBC5C - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC64:: @ 83DBC64 -.ifdef ENGLISH - obj_image_anim_frame 40, 5 -.else - obj_image_anim_frame 16, 5 -.endif - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC6C:: @ 83DBC6C - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC74:: @ 83DBC74 - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBC7C:: @ 83DBC7C - .4byte gSpriteAnim_83DBC1C - .4byte gSpriteAnim_83DBC24 - .4byte gSpriteAnim_83DBC2C - .4byte gSpriteAnim_83DBC34 - - .align 2 -gSpriteAnimTable_83DBC8C:: @ 83DBC8C - .4byte gSpriteAnim_83DBC3C - .4byte gSpriteAnim_83DBC44 - .4byte gSpriteAnim_83DBC4C - .4byte gSpriteAnim_83DBC54 - - .align 2 -gSpriteAnimTable_83DBC9C:: @ 83DBC9C - .4byte gSpriteAnim_83DBC5C - .4byte gSpriteAnim_83DBC64 - .4byte gSpriteAnim_83DBC6C - .4byte gSpriteAnim_83DBC74 - - .align 2 -gSpriteTemplate_83DBCAC:: @ 83DBCAC - spr_template 1, 1, gOamData_83DBC14, gSpriteAnimTable_83DBC7C, NULL, gDummySpriteAffineAnimTable, sub_80E85F8 - .align 2 gUnknown_083DBCC4:: @ 83DBCC4 .byte 1, 3, 5, 8, 10, 12, 15 diff --git a/include/easy_chat.h b/include/easy_chat.h index a752720a6..8d13ecc42 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -1,8 +1,100 @@ #ifndef GUARD_EASYCHAT_H #define GUARD_EASYCHAT_H +struct Sprite; + +struct Shared1000 +{ + void (*unk0)(void); // main cb 2 + u16 *unk4; + u8 unk8; + u8 unk9; + u8 unkA; + u8 unkB; + u16 unkC[(0x20-0xC)/2]; // unknown length + void (*unk20)(void); + u16 unk24; + u8 unk26; + u8 unk27; + u16 unk28; + u8 unk2A[11][2]; // unknown length + u8 unk40[4][14]; + u8 unk78[0x7D - 0x78]; // unknown length + u8 unk7D; + u8 unk7E[0x83-0x7E]; + s8 unk83; // s8? + //u8 unk83; // s8? + s8 unk84; + s8 unk85; + s8 unk86; + bool8 unk87; + u16 unk88; + u16 unk8A; + u8 unk8C[(0x96-0x8C)/2][2]; + u8 unk96; + u8 filler97; + struct Sprite *unk98; + struct Sprite *unk9C; + struct Sprite *unkA0; + struct Sprite *unkA4; + u8 fillerA8[0x1A8-0xA8]; + s8 unk1A8; + s8 unk1A9; + s8 unk1AA[0xB5-0xAA]; // unknown length + s8 unk1B5; + s8 unk1B6; + s8 unk1B7; + u8 unk1B8; + u8 unk1B9; + u16 unk1BA; + u8 filler1BC[0xBE - 0xBC]; + u8 unk1BE; + u8 filler1BF; + s8 unk1C0; + u8 filler1C1[3]; + void (*unk1C4)(void); + u8 filler1C8[0x4142-0x1C8]; +#if GERMAN + u8 filler4142_de[0x32A]; +#endif + u16 unk4142[(0x78-0x42)/2]; + u16 unk4178[(0x99A4-0x4178)/2]; // unknown length +#if GERMAN + u8 filler99A4_de[2]; +#endif + s8 unk99A4; + s8 unk99A5; + s8 unk99A6[0xA28-0x9A6]; + s8 unk9A28; + s8 unk9A29; + //u8 filler9A2A[0xC7C-0xA2A]; + u16 unk9A2A[0x94][2]; // unknown length + u8 filler9C7A[2]; + u16 unk9C7C; // this is at 0x9FA8 in German + s16 unk9C7E; + u8 unk9C80[0xC9-0x80]; + u8 unk9CC9[0xD12-0xCC9]; + u8 unk9D12[0x5B-0x12]; + u8 unk9D5B[0xA4-0x5B]; + u8 unk9DA4[0xC8-0xA4]; + u8 filler9DC8[0xE14 - 0xDC8]; + u8 unk9E14[0xE41 - 0xE14]; + u8 unk9E41[0x6E - 0x41]; + u8 unk9E6E[0xEE - 0x6E]; + u8 unk9EEE[0xF6E - 0xEEE]; + u8 unk9F6E[1]; // unknown length +}; + +#define static_assert(cond) \ + typedef char test_[(cond) ? 1 : -1] + +//static_assert(offsetof(struct Shared1000, unk1A8) == 0x1A8); + extern u8 gUnknown_020388AC; +// const pointer to shared1000. easy_chat might be two separate files. +extern struct Shared1000 *const gUnknown_083DB694; + void sub_80E62A0(u8 arg0, u16 *arg1, void (*arg2)(void), u8 arg3); u16 sub_80EB72C(u16 group); void sub_80EB6FC(u16 *, u16); diff --git a/include/graphics.h b/include/graphics.h index 488de07c0..130e21f58 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2656,4 +2656,6 @@ extern const u8 gNamingScreenRightPointingTriangleTiles[]; extern const u8 gNamingScreenUnderscoreTiles[]; extern const u16 gNamingScreenPalettes[][16]; +extern const u8 gInterviewOutlineCursorTiles[]; + #endif // GUARD_GRAPHICS_H diff --git a/ld_script.txt b/ld_script.txt index e74f57f7f..fc56922fe 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -303,6 +303,7 @@ SECTIONS { asm/battle_intro.o(.text); src/field/bike.o(.text); src/easy_chat_before.o(.text); + src/easy_chat_2.o(.text); asm/easy_chat.o(.text); src/easy_chat.o(.text); src/pokenav_before.o(.text); @@ -544,6 +545,7 @@ SECTIONS { data/battle_anim_80CA710.o(.rodata); src/field/bike.o(.rodata); src/easy_chat_before.o(.rodata); + src/easy_chat_2.o(.rodata); data/easy_chat.o(.rodata); data/pokenav.o(.rodata); src/pokemon/mon_markings.o(.rodata); diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c new file mode 100644 index 000000000..cc1877db1 --- /dev/null +++ b/src/easy_chat_2.c @@ -0,0 +1,403 @@ +#include "global.h" +#include "easy_chat.h" +#include "graphics.h" +#include "sprite.h" +#include "trig.h" + +void sub_80E8268(void); +void sub_80E82BC(struct Sprite *); +void sub_80E8534(void); +void sub_80E85F8(struct Sprite *); +void sub_80E872C(struct Sprite *); +void sub_80E8760(struct Sprite *); +void sub_80E8818(void); +void sub_80E8A7C(void); + +const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); +const u16 InterviewPalette_1[] = INCBIN_U16("graphics/misc/interview_pal1.gbapal"); +const u8 InterviewArrowTiles[] = INCBIN_U8("graphics/misc/interview_arrow.4bpp"); +const u8 InterviewButtonTiles[] = INCBIN_U8("graphics/misc/interview_buttons.4bpp"); +const u16 gMenuInterviewFrame_Pal[] = INCBIN_U16("graphics/misc/interview_frame.gbapal"); +const u8 gMenuInterviewFrame_Gfx[] = INCBIN_U8("graphics/misc/interview_frame.4bpp.lz"); +const u8 InterviewTriangleCursorTiles[] = INCBIN_U8("graphics/misc/interview_triangle_cursor.4bpp"); + +void sub_80E8218(void) +{ + struct SpriteSheet interviewSpriteSheets[] = + { + {InterviewTriangleCursorTiles, 0x20, 0}, + {gInterviewOutlineCursorTiles, 0x700, 1}, + {InterviewArrowTiles, 0x100, 2}, + {InterviewButtonTiles, 0x100, 3}, + {NULL, 0, 0}, + }; + struct SpritePalette interviewSpritePalettes[] = + { + {InterviewPalette_0, 0}, + {InterviewPalette_1, 1}, + {NULL, 0}, + }; + + LoadSpriteSheets(interviewSpriteSheets); + LoadSpritePalettes(interviewSpritePalettes); + sub_80E8268(); + sub_80E8818(); + sub_80E8A7C(); +} + +const struct OamData gOamData_83DBBF4 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct SpriteTemplate gSpriteTemplate_83DBBFC = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gOamData_83DBBF4, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80E82BC, +}; + +void sub_80E8268(void) +{ + u8 spriteId; + + spriteId = CreateSprite(&gSpriteTemplate_83DBBFC, 0, 0, 0); + gSprites[spriteId].pos1.y = gUnknown_083DB694->unk8A * 8 + 8; + gSprites[spriteId].pos1.x = gUnknown_083DB694->unk88 * 8 + 4; + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = 0; + gUnknown_083DB694->unk98 = &gSprites[spriteId]; +} + +void sub_80E82BC(struct Sprite *sprite) +{ + if (sprite->data[1] == 0) + { + if (gUnknown_083DB694->unk87) + { + u16 r5 = gUnknown_083DB694->unk86; + u16 r4 = gUnknown_083DB694->unk85; + u16 r7 = 0; + u16 i; + + for (i = 0; i < r4; i++) + r7 += gUnknown_083DB694->unk8C[r5][i]; + + if (r5 == gUnknown_083DB694->unk84) + { + sprite->pos1.y = 96; + sprite->pos1.x = (r4 * 7 + 3) * 8 + 4; + } + else + { + sprite->pos1.y = (gUnknown_083DB694->unk8A + r5 * 2) * 8 + 8; + sprite->pos1.x = (gUnknown_083DB694->unk88 + r7 + r4 * 11) * 8 + 4; + } + + sprite->pos2.x = -6; + sprite->data[0] = 0; + } + else + { + if (++sprite->data[0] > 2) + { + sprite->data[0] = 0; + if (++sprite->pos2.x > 0) + sprite->pos2.x = -6; + } + } + } +} + +void sub_80E8398(u8 a) +{ + switch (a) + { + case 0: + gUnknown_083DB694->unk98->data[1] = a; + gUnknown_083DB694->unk98->pos2.x = a; + gUnknown_083DB694->unk98->invisible = FALSE; + break; + case 1: + gUnknown_083DB694->unk98->data[1] = a; + gUnknown_083DB694->unk98->pos2.x = 0; + gUnknown_083DB694->unk98->invisible = FALSE; + break; + case 2: + gUnknown_083DB694->unk98->data[1] = 1; + gUnknown_083DB694->unk98->pos2.x = 0; + gUnknown_083DB694->unk98->invisible = TRUE; + break; + } +} + +const struct OamData gOamData_83DBC14 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_83DBC1C[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC24[] = +{ +#if ENGLISH + ANIMCMD_FRAME(8, 5), +#else + ANIMCMD_FRAME(0, 5), +#endif + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC2C[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC34[] = +{ + ANIMCMD_FRAME(24, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC3C[] = +{ + ANIMCMD_FRAME(32, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC44[] = +{ + ANIMCMD_FRAME(40, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC4C[] = +{ + ANIMCMD_FRAME(40, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC54[] = +{ + ANIMCMD_FRAME(40, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC5C[] = +{ + ANIMCMD_FRAME(48, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC64[] = +{ +#if ENGLISH + ANIMCMD_FRAME(40, 5), +#else + ANIMCMD_FRAME(16, 5), +#endif + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC6C[] = +{ + ANIMCMD_FRAME(48, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBC74[] = +{ + ANIMCMD_FRAME(40, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_83DBC7C[] = +{ + gSpriteAnim_83DBC1C, + gSpriteAnim_83DBC24, + gSpriteAnim_83DBC2C, + gSpriteAnim_83DBC34, +}; + +const union AnimCmd *const gSpriteAnimTable_83DBC8C[] = +{ + gSpriteAnim_83DBC3C, + gSpriteAnim_83DBC44, + gSpriteAnim_83DBC4C, + gSpriteAnim_83DBC54, +}; + +const union AnimCmd *const gSpriteAnimTable_83DBC9C[] = +{ + gSpriteAnim_83DBC5C, + gSpriteAnim_83DBC64, + gSpriteAnim_83DBC6C, + gSpriteAnim_83DBC74, +}; + +/* +const struct SpriteTemplate gSpriteTemplate_83DBCAC = +{ + .tileTag = 1, + .paletteTag = 1, + .oam = &gOamData_83DBC14, + .anims = gSpriteAnimTable_83DBC7C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80E85F8, +}; +*/ + +void sub_80E8420(void) +{ + struct SpriteTemplate spriteTemplate_83DBCAC = + { + .tileTag = 1, + .paletteTag = 1, + .oam = &gOamData_83DBC14, + .anims = gSpriteAnimTable_83DBC7C, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80E85F8, + }; + u8 spriteId; + + spriteId = CreateSprite(&spriteTemplate_83DBCAC, 0, 0, 3); + gUnknown_083DB694->unk9C = &gSprites[spriteId]; + + spriteTemplate_83DBCAC.anims = gSpriteAnimTable_83DBC8C; + spriteTemplate_83DBCAC.callback = sub_80E872C; + spriteId = CreateSprite(&spriteTemplate_83DBCAC, 0, 0, 4); + gUnknown_083DB694->unkA0 = &gSprites[spriteId]; + + spriteTemplate_83DBCAC.anims = gSpriteAnimTable_83DBC9C; + spriteTemplate_83DBCAC.callback = sub_80E8760; + spriteId = CreateSprite(&spriteTemplate_83DBCAC, 0, 0, 5); + gUnknown_083DB694->unkA4 = &gSprites[spriteId]; + + gUnknown_083DB694->unk9C->data[0] = 0; + gUnknown_083DB694->unkA0->data[0] = 0; + gUnknown_083DB694->unkA4->data[0] = 0; + + gUnknown_083DB694->unk9C->data[3] = 0x0101 + IndexOfSpritePaletteTag(1) * 16; + sub_80E8534(); + gUnknown_083DB694->unk96 = 1; + REG_BLDCNT = 0x3F40; +} + +void sub_80E8504(void) +{ + DestroySprite(gUnknown_083DB694->unk9C); + DestroySprite(gUnknown_083DB694->unkA0); + DestroySprite(gUnknown_083DB694->unkA4); +} + +void sub_80E8534(void) +{ + if (gUnknown_083DB694->unk1B7 != 0) + gUnknown_020388AC = 1; + else if (gUnknown_083DB694->unk26 == 0) + gUnknown_020388AC = 0; + else if (gUnknown_083DB694->unk1A8 == 0 && gUnknown_083DB694->unk1A9 == 6) + gUnknown_020388AC = 2; + else + gUnknown_020388AC = 3; + + gUnknown_083DB694->unk9C->data[2] = gUnknown_020388AC; + gUnknown_083DB694->unkA0->data[2] = gUnknown_020388AC; + gUnknown_083DB694->unkA4->data[2] = gUnknown_020388AC; + + StartSpriteAnim(gUnknown_083DB694->unk9C, gUnknown_020388AC); + StartSpriteAnim(gUnknown_083DB694->unkA0, gUnknown_020388AC); + StartSpriteAnim(gUnknown_083DB694->unkA4, gUnknown_020388AC); + + gUnknown_083DB694->unk9C->data[5] = 8; + gUnknown_083DB694->unk9C->data[6] = 8; + gUnknown_083DB694->unk9C->data[1] = 0; +} + +extern const s8 gUnknown_083DBCC4[][7]; + +void sub_80E85F8(struct Sprite *sprite) +{ + sprite->data[0]++; + if (sprite->data[0] & 1) + sprite->data[5] = 8 + (gSineTable[sprite->data[1]] >> 5); + else + sprite->data[6] = 8 - (gSineTable[sprite->data[1]] >> 5); + + sprite->data[1] = (sprite->data[1] + 5) & 0xFF; + + REG_BLDALPHA = (sprite->data[6] << 8) | sprite->data[5]; + + if (gUnknown_083DB694->unk96 != 0) + { + sub_80E8534(); + + gUnknown_083DB694->unk9C->data[5] = 8; + gUnknown_083DB694->unk9C->data[6] = 8; + gUnknown_083DB694->unk9C->data[1] = 0; + + switch (sprite->data[2]) + { + case 0: + sprite->pos1.x = gUnknown_083DB694->unk1A9 * 88 + 32; + sprite->pos1.y = (gUnknown_083DB694->unk1A8 - gUnknown_083DB694->unk1B5) * 16 + 96; + break; + case 1: + sprite->pos1.x = 216; + sprite->pos1.y = gUnknown_083DB694->unk1A8 * 16 + 96; + break; + case 2: + sprite->pos1.x = 151; + sprite->pos1.y = 96; + break; + case 3: + sprite->pos1.x = gUnknown_083DBCC4[gUnknown_083DB694->unk1A8][gUnknown_083DB694->unk1A9] * 8 + 31; + sprite->pos1.y = (gUnknown_083DB694->unk1A8 - gUnknown_083DB694->unk1B5) * 16 + 96; + break; + } + } +} + +void sub_80E872C(struct Sprite *sprite) +{ + if (gUnknown_083DB694->unk96 != 0 && sprite->data[2] == 0) + { + sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 32; + sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + } +} diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index b5e87337f..5d606ef10 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -6,10 +6,12 @@ #include "easy_chat.h" #include "event_data.h" #include "ewram.h" +#include "graphics.h" #include "main.h" #include "menu.h" #include "palette.h" #include "sound.h" +#include "sprite.h" #include "string_util.h" #include "strings.h" #include "unknown_task.h" @@ -19,86 +21,6 @@ extern const struct WindowConfig gWindowConfig_81E6DA8; extern void sub_80546B8(void); -struct Shared1000 -{ - void (*unk0)(void); // main cb 2 - u16 *unk4; - u8 unk8; - u8 unk9; - u8 unkA; - u8 unkB; - u16 unkC[(0x20-0xC)/2]; // unknown length - void (*unk20)(void); - u16 unk24; - u8 unk26; - u8 unk27; - u16 unk28; - u8 unk2A[11][2]; // unknown length - u8 unk40[4][14]; - u8 unk78[0x7D - 0x78]; // unknown length - u8 unk7D; - u8 unk7E[0x83-0x7E]; - s8 unk83; // s8? - //u8 unk83; // s8? - s8 unk84; - s8 unk85; - s8 unk86; - bool8 unk87; - u16 unk88; - u16 unk8A; - u8 unk8C[(0x96-0x8C)/2][2]; - u8 unk96; - u8 filler97[0x1A8-0x97]; - s8 unk1A8; - s8 unk1A9; - s8 unk1AA[0xB5-0xAA]; // unknown length - s8 unk1B5; - s8 unk1B6; - s8 unk1B7; - u8 unk1B8; - u8 unk1B9; - u16 unk1BA; - u8 filler1BC[0xBE - 0xBC]; - u8 unk1BE; - u8 filler1BF; - s8 unk1C0; - u8 filler1C1[3]; - void (*unk1C4)(void); - u8 filler1C8[0x4142-0x1C8]; -#if GERMAN - u8 filler4142_de[0x32A]; -#endif - u16 unk4142[(0x78-0x42)/2]; - u16 unk4178[(0x99A4-0x4178)/2]; // unknown length -#if GERMAN - u8 filler99A4_de[2]; -#endif - s8 unk99A4; - s8 unk99A5; - s8 unk99A6[0xA28-0x9A6]; - s8 unk9A28; - s8 unk9A29; - //u8 filler9A2A[0xC7C-0xA2A]; - u16 unk9A2A[0x94][2]; // unknown length - u8 filler9C7A[2]; - u16 unk9C7C; // this is at 0x9FA8 in German - s16 unk9C7E; - u8 unk9C80[0xC9-0x80]; - u8 unk9CC9[0xD12-0xCC9]; - u8 unk9D12[0x5B-0x12]; - u8 unk9D5B[0xA4-0x5B]; - u8 unk9DA4[0xC8-0xA4]; - u8 filler9DC8[0xE14 - 0xDC8]; - u8 unk9E14[0xE41 - 0xE14]; - u8 unk9E41[0xF6E - 0xE41]; - u8 unk9F6E[1]; // unknown length -}; - -#define static_assert(cond) \ - typedef char test_[(cond) ? 1 : -1] - -//static_assert(offsetof(struct Shared1000, unk9DA4) == 0x9DA4); - #define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) const u16 gMysteryEventPhrase[] = {EC_WORD_MYSTERY, EC_WORD_EVENT, EC_WORD_IS, EC_WORD_EXCITING}; @@ -231,12 +153,15 @@ u8 sub_80E810C(void); void sub_80E81C0(void); void sub_80E81FC(void); void sub_80E8218(void); + void sub_80E8398(); void sub_80E8420(void); void sub_80E8504(void); void sub_80E87CC(); + void sub_80E88F0(void); void sub_80E8958(); + void sub_80E8BF4(); void sub_80E8CEC(void); void sub_80E8D54(void); @@ -270,7 +195,7 @@ u8 sub_80EAD7C(u8); void sub_80EAECC(void); void sub_80EB040(void); void sub_80EB0B0(void); -void sub_80EB218(); +u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(); bool8 sub_80EB680(u16 *, u16, u16, u16); @@ -602,8 +527,6 @@ const u16 gUnknown_083DB7F4[] = EC_WORD_EXCL, }; -const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); - // ResetDefaultEasyChatPhrases void InitEasyChatPhrases(void) { @@ -1773,3 +1696,49 @@ bool8 sub_80E8094(void) } return TRUE; } + +u8 sub_80E810C(void) +{ + u16 i; + + for (i = 0; i < 5; i++) + { + u8 *ptr; + u8 *r3; + + ptr = sub_80EB218(shared1000.unk9E6E, shared1000.unkC[0], 0); + *ptr++ = CHAR_SPACE; + sub_80EB218(ptr, shared1000.unkC[1], 0); + + ptr = sub_80EB218(shared1000.unk9EEE, gBerryMasterWifePhrases[i][0], 0); + *ptr++ = CHAR_SPACE; + sub_80EB218(ptr, gBerryMasterWifePhrases[i][1], 0); + + ptr = shared1000.unk9E6E; + r3 = shared1000.unk9EEE; + while (*ptr != EOS && *r3 != EOS) + { + if (*ptr++ != *r3++) + break; + } + if (*ptr == EOS && *r3 == EOS) + return i + 1; + } + return 0; +} + +void sub_80E81C0(void) +{ + u8 *ptr; + + ptr = sub_80EB218(gStringVar2, shared1000.unk9C7C, 0); + *ptr++ = CHAR_SPACE; + sub_80EB218(ptr, shared1000.unk9C7E, 0); +} + +void sub_80E81FC(void) +{ + PlaySE(SE_SELECT); + sub_80E95A4(); + MenuZeroFillWindowRect(0, 0, 29, 13); +} -- cgit v1.2.3 From 324705201c8648830a9b5ed7926891bf38bfcabe Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 3 Jan 2018 20:24:50 -0600 Subject: decompile sub_80E8760 - sub_80E8B78 --- asm-de/easy_chat.s | 1379 --------------------------------------------------- asm/easy_chat.s | 605 ---------------------- data.txt | 10 - data/easy_chat.s | 47 -- include/easy_chat.h | 14 +- src/easy_chat_2.c | 307 +++++++++++- 6 files changed, 316 insertions(+), 2046 deletions(-) delete mode 100644 data.txt diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 906b8fe88..58c3944a9 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -5,1385 +5,6 @@ .text - thumb_func_start sub_80E810C -sub_80E810C: @ 80E810C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r5, 0 - ldr r6, _080E8198 @ =gSharedMem + 0xB19A - ldr r0, _080E819C @ =0xffff5e66 - adds r0, r6 - mov r9, r0 - movs r1, 0 - mov r8, r1 - adds r7, r6, 0 - adds r7, 0x80 - ldr r2, _080E81A0 @ =gBerryMasterWifePhrases - mov r10, r2 -_080E812C: - mov r0, r9 - ldrh r1, [r0, 0xC] - adds r0, r6, 0 - movs r2, 0 - bl sub_80EB218 - mov r1, r8 - strb r1, [r0] - adds r0, 0x1 - mov r2, r9 - ldrh r1, [r2, 0xE] - movs r2, 0 - bl sub_80EB218 - lsls r4, r5, 2 - mov r1, r10 - adds r0, r4, r1 - ldrh r1, [r0] - adds r0, r7, 0 - movs r2, 0 - bl sub_80EB218 - mov r2, r8 - strb r2, [r0] - adds r0, 0x1 - ldr r1, _080E81A4 @ =gBerryMasterWifePhrases + 0x2 - adds r4, r1 - ldrh r1, [r4] - movs r2, 0 - bl sub_80EB218 - adds r0, r6, 0 - adds r3, r7, 0 - adds r4, r5, 0x1 -_080E8170: - ldrb r2, [r0] - cmp r2, 0xFF - beq _080E818A - ldrb r1, [r3] - cmp r1, 0xFF - beq _080E8184 - adds r3, 0x1 - adds r0, 0x1 - cmp r2, r1 - beq _080E8170 -_080E8184: - ldrb r0, [r0] - cmp r0, 0xFF - bne _080E81A8 -_080E818A: - ldrb r0, [r3] - cmp r0, 0xFF - bne _080E81A8 - lsls r0, r4, 24 - lsrs r0, 24 - b _080E81B2 - .align 2, 0 -_080E8198: .4byte gSharedMem + 0xB19A -_080E819C: .4byte 0xffff5e66 -_080E81A0: .4byte gBerryMasterWifePhrases -_080E81A4: .4byte gBerryMasterWifePhrases + 0x2 -_080E81A8: - lsls r0, r4, 16 - lsrs r5, r0, 16 - cmp r5, 0x4 - bls _080E812C - movs r0, 0 -_080E81B2: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80E810C - - thumb_func_start sub_80E81C0 -sub_80E81C0: @ 80E81C0 - push {r4,lr} - ldr r0, _080E81EC @ =gStringVar2 - ldr r4, _080E81F0 @ =gSharedMem + 0x1000 - ldr r2, _080E81F4 @ =0x00009fa8 - adds r1, r4, r2 - ldrh r1, [r1] - movs r2, 0 - bl sub_80EB218 - movs r1, 0 - strb r1, [r0] - adds r0, 0x1 - ldr r1, _080E81F8 @ =0x00009faa - adds r4, r1 - ldrh r1, [r4] - movs r2, 0 - bl sub_80EB218 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E81EC: .4byte gStringVar2 -_080E81F0: .4byte gSharedMem + 0x1000 -_080E81F4: .4byte 0x00009fa8 -_080E81F8: .4byte 0x00009faa - thumb_func_end sub_80E81C0 - - thumb_func_start sub_80E81FC -sub_80E81FC: @ 80E81FC - push {lr} - movs r0, 0x5 - bl PlaySE - bl sub_80E95A4 - movs r0, 0 - movs r1, 0 - movs r2, 0x1D - movs r3, 0xD - bl MenuZeroFillWindowRect - pop {r0} - bx r0 - thumb_func_end sub_80E81FC - - thumb_func_start sub_80E8218 -sub_80E8218: @ 80E8218 - push {r4,r5,lr} - sub sp, 0x40 - mov r1, sp - ldr r0, _080E8260 @ =gSpriteSheets_Interview - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r4,r5} - stm r1!, {r2,r4,r5} - ldr r0, [r0] - str r0, [r1] - add r4, sp, 0x28 - adds r1, r4, 0 - ldr r0, _080E8264 @ =gSpritePalettes_Interview - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - mov r0, sp - bl LoadSpriteSheets - adds r0, r4, 0 - bl LoadSpritePalettes - bl sub_80E8268 - bl sub_80E8818 - bl sub_80E8A7C - add sp, 0x40 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E8260: .4byte gSpriteSheets_Interview -_080E8264: .4byte gSpritePalettes_Interview - thumb_func_end sub_80E8218 - - thumb_func_start sub_80E8268 -sub_80E8268: @ 80E8268 - push {lr} - ldr r0, _080E82B0 @ =gSpriteTemplate_83DBBFC - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080E82B4 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldr r0, _080E82B8 @ =gUnknown_083DB694 - ldr r3, [r0] - adds r0, r3, 0 - adds r0, 0x8A - ldrh r0, [r0] - lsls r0, 3 - adds r0, 0x8 - movs r2, 0 - strh r0, [r1, 0x22] - adds r0, r3, 0 - adds r0, 0x88 - ldrh r0, [r0] - lsls r0, 3 - adds r0, 0x4 - strh r0, [r1, 0x20] - strh r2, [r1, 0x2E] - strh r2, [r1, 0x30] - adds r0, r3, 0 - adds r0, 0x98 - str r1, [r0] - pop {r0} - bx r0 - .align 2, 0 -_080E82B0: .4byte gSpriteTemplate_83DBBFC -_080E82B4: .4byte gSprites -_080E82B8: .4byte gUnknown_083DB694 - thumb_func_end sub_80E8268 - - thumb_func_start sub_80E82BC -sub_80E82BC: @ 80E82BC - push {r4-r7,lr} - adds r3, r0, 0 - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _080E838C - ldr r0, _080E8334 @ =gUnknown_083DB694 - ldr r2, [r0] - adds r1, r2, 0 - adds r1, 0x87 - ldrb r1, [r1] - mov r12, r0 - cmp r1, 0 - beq _080E836C - adds r0, r2, 0 - adds r0, 0x86 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r2, 0 - adds r0, 0x85 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r4, r0, 16 - movs r7, 0 - movs r1, 0 - cmp r7, r4 - bcs _080E8316 - lsls r6, r5, 1 - adds r2, 0x8C -_080E8300: - adds r0, r1, r6 - adds r0, r2, r0 - ldrb r0, [r0] - adds r0, r7, r0 - lsls r0, 16 - lsrs r7, r0, 16 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r4 - bcc _080E8300 -_080E8316: - mov r0, r12 - ldr r2, [r0] - adds r0, r2, 0 - adds r0, 0x84 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r5, r0 - bne _080E8338 - movs r0, 0x60 - strh r0, [r3, 0x22] - lsls r0, r4, 3 - subs r0, r4 - adds r0, 0x3 - b _080E8356 - .align 2, 0 -_080E8334: .4byte gUnknown_083DB694 -_080E8338: - adds r1, r2, 0 - adds r1, 0x8A - lsls r0, r5, 1 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 3 - adds r0, 0x8 - strh r0, [r3, 0x22] - adds r0, r2, 0 - adds r0, 0x88 - ldrh r0, [r0] - adds r0, r7 - movs r1, 0xB - muls r1, r4 - adds r0, r1 -_080E8356: - lsls r0, 3 - adds r0, 0x4 - strh r0, [r3, 0x20] - movs r1, 0 - ldr r0, _080E8368 @ =0x0000fffa - strh r0, [r3, 0x24] - strh r1, [r3, 0x2E] - b _080E838C - .align 2, 0 -_080E8368: .4byte 0x0000fffa -_080E836C: - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _080E838C - strh r1, [r3, 0x2E] - ldrh r0, [r3, 0x24] - adds r0, 0x1 - strh r0, [r3, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _080E838C - ldr r0, _080E8394 @ =0x0000fffa - strh r0, [r3, 0x24] -_080E838C: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8394: .4byte 0x0000fffa - thumb_func_end sub_80E82BC - - thumb_func_start sub_80E8398 -sub_80E8398: @ 80E8398 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x1 - beq _080E83D4 - cmp r3, 0x1 - bgt _080E83AC - cmp r3, 0 - beq _080E83B2 - b _080E8416 -_080E83AC: - cmp r3, 0x2 - beq _080E83F8 - b _080E8416 -_080E83B2: - ldr r0, _080E83D0 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0x98 - ldr r1, [r0] - strh r3, [r1, 0x30] - ldr r1, [r0] - strh r3, [r1, 0x24] - ldr r1, [r0] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - b _080E8414 - .align 2, 0 -_080E83D0: .4byte gUnknown_083DB694 -_080E83D4: - ldr r0, _080E83F4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0x98 - ldr r0, [r1] - movs r2, 0 - strh r3, [r0, 0x30] - ldr r0, [r1] - strh r2, [r0, 0x24] - ldr r1, [r1] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - b _080E8414 - .align 2, 0 -_080E83F4: .4byte gUnknown_083DB694 -_080E83F8: - ldr r0, _080E841C @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0x98 - ldr r2, [r1] - movs r3, 0 - movs r0, 0x1 - strh r0, [r2, 0x30] - ldr r0, [r1] - strh r3, [r0, 0x24] - ldr r1, [r1] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 -_080E8414: - strb r0, [r1] -_080E8416: - pop {r0} - bx r0 - .align 2, 0 -_080E841C: .4byte gUnknown_083DB694 - thumb_func_end sub_80E8398 - - thumb_func_start sub_80E8420 -sub_80E8420: @ 80E8420 - push {r4-r7,lr} - sub sp, 0x18 - mov r1, sp - ldr r0, _080E84E0 @ =gSpriteTemplate_83DBCAC - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - mov r0, sp - movs r1, 0 - movs r2, 0 - movs r3, 0x3 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080E84E4 @ =gUnknown_083DB694 - ldr r7, [r1] - adds r5, r7, 0 - adds r5, 0x9C - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r4, _080E84E8 @ =gSprites - adds r1, r4 - str r1, [r5] - ldr r0, _080E84EC @ =gSpriteAnimTable_83DBC8C - str r0, [sp, 0x8] - ldr r0, _080E84F0 @ =sub_80E872C - str r0, [sp, 0x14] - mov r0, sp - movs r1, 0 - movs r2, 0 - movs r3, 0x4 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - adds r6, r7, 0 - adds r6, 0xA0 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r6] - ldr r0, _080E84F4 @ =gSpriteAnimTable_83DBC9C - str r0, [sp, 0x8] - ldr r0, _080E84F8 @ =sub_80E8760 - str r0, [sp, 0x14] - mov r0, sp - movs r1, 0 - movs r2, 0 - movs r3, 0x5 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - adds r2, r7, 0 - adds r2, 0xA4 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - str r1, [r2] - ldr r0, [r5] - movs r1, 0 - strh r1, [r0, 0x2E] - ldr r0, [r6] - strh r1, [r0, 0x2E] - ldr r0, [r2] - strh r1, [r0, 0x2E] - movs r0, 0x1 - bl IndexOfSpritePaletteTag - ldr r1, [r5] - lsls r0, 24 - lsrs r0, 20 - ldr r2, _080E84FC @ =0x00000101 - adds r0, r2 - strh r0, [r1, 0x34] - bl sub_80E8534 - adds r1, r7, 0 - adds r1, 0x96 - movs r0, 0x1 - strb r0, [r1] - ldr r1, _080E8500 @ =REG_BLDCNT - movs r3, 0xFD - lsls r3, 6 - adds r0, r3, 0 - strh r0, [r1] - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E84E0: .4byte gSpriteTemplate_83DBCAC -_080E84E4: .4byte gUnknown_083DB694 -_080E84E8: .4byte gSprites -_080E84EC: .4byte gSpriteAnimTable_83DBC8C -_080E84F0: .4byte sub_80E872C -_080E84F4: .4byte gSpriteAnimTable_83DBC9C -_080E84F8: .4byte sub_80E8760 -_080E84FC: .4byte 0x00000101 -_080E8500: .4byte REG_BLDCNT - thumb_func_end sub_80E8420 - - thumb_func_start sub_80E8504 -sub_80E8504: @ 80E8504 - push {r4,lr} - ldr r0, _080E8530 @ =gUnknown_083DB694 - ldr r4, [r0] - adds r0, r4, 0 - adds r0, 0x9C - ldr r0, [r0] - bl DestroySprite - adds r0, r4, 0 - adds r0, 0xA0 - ldr r0, [r0] - bl DestroySprite - adds r0, r4, 0 - adds r0, 0xA4 - ldr r0, [r0] - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E8530: .4byte gUnknown_083DB694 - thumb_func_end sub_80E8504 - - thumb_func_start sub_80E8534 -sub_80E8534: @ 80E8534 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r1, _080E8554 @ =gUnknown_083DB694 - ldr r3, [r1] - ldr r2, _080E8558 @ =0x000001b7 - adds r0, r3, r2 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r4, r1, 0 - cmp r0, 0 - beq _080E8560 - ldr r1, _080E855C @ =gUnknown_020388AC - movs r0, 0x1 - b _080E8598 - .align 2, 0 -_080E8554: .4byte gUnknown_083DB694 -_080E8558: .4byte 0x000001b7 -_080E855C: .4byte gUnknown_020388AC -_080E8560: - adds r0, r3, 0 - adds r0, 0x26 - ldrb r2, [r0] - cmp r2, 0 - bne _080E8578 - ldr r0, _080E8574 @ =gUnknown_020388AC - strb r2, [r0] - adds r7, r0, 0 - b _080E859C - .align 2, 0 -_080E8574: .4byte gUnknown_020388AC -_080E8578: - movs r1, 0xD4 - lsls r1, 1 - adds r0, r3, r1 - ldrh r1, [r0] - movs r0, 0xC0 - lsls r0, 3 - cmp r1, r0 - bne _080E8594 - ldr r1, _080E8590 @ =gUnknown_020388AC - movs r0, 0x2 - b _080E8598 - .align 2, 0 -_080E8590: .4byte gUnknown_020388AC -_080E8594: - ldr r1, _080E85F4 @ =gUnknown_020388AC - movs r0, 0x3 -_080E8598: - strb r0, [r1] - adds r7, r1, 0 -_080E859C: - ldr r2, [r4] - adds r4, r2, 0 - adds r4, 0x9C - ldr r1, [r4] - ldrb r0, [r7] - movs r3, 0 - mov r8, r3 - strh r0, [r1, 0x32] - adds r5, r2, 0 - adds r5, 0xA0 - ldr r1, [r5] - ldrb r0, [r7] - strh r0, [r1, 0x32] - adds r6, r2, 0 - adds r6, 0xA4 - ldr r1, [r6] - ldrb r0, [r7] - strh r0, [r1, 0x32] - ldr r0, [r4] - ldrb r1, [r7] - bl StartSpriteAnim - ldr r0, [r5] - ldrb r1, [r7] - bl StartSpriteAnim - ldr r0, [r6] - ldrb r1, [r7] - bl StartSpriteAnim - ldr r0, [r4] - movs r1, 0x8 - strh r1, [r0, 0x38] - ldr r0, [r4] - strh r1, [r0, 0x3A] - ldr r0, [r4] - mov r1, r8 - strh r1, [r0, 0x30] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E85F4: .4byte gUnknown_020388AC - thumb_func_end sub_80E8534 - - thumb_func_start sub_80E85F8 -sub_80E85F8: @ 80E85F8 - push {r4-r6,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E8624 - ldr r1, _080E8620 @ =gSineTable - movs r2, 0x30 - ldrsh r0, [r5, r2] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - lsls r0, 16 - asrs r0, 21 - adds r0, 0x8 - strh r0, [r5, 0x38] - b _080E863A - .align 2, 0 -_080E8620: .4byte gSineTable -_080E8624: - ldr r1, _080E8688 @ =gSineTable - movs r2, 0x30 - ldrsh r0, [r5, r2] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - lsls r1, 16 - asrs r1, 21 - movs r0, 0x8 - subs r0, r1 - strh r0, [r5, 0x3A] -_080E863A: - ldrh r0, [r5, 0x30] - adds r0, 0x5 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x30] - ldr r2, _080E868C @ =REG_BLDALPHA - ldrh r0, [r5, 0x3A] - lsls r0, 8 - ldrh r1, [r5, 0x38] - orrs r0, r1 - strh r0, [r2] - ldr r0, _080E8690 @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0x96 - ldrb r0, [r0] - cmp r0, 0 - beq _080E871A - bl sub_80E8534 - adds r1, r6, 0 - adds r1, 0x9C - ldr r0, [r1] - movs r2, 0x8 - strh r2, [r0, 0x38] - ldr r0, [r1] - strh r2, [r0, 0x3A] - ldr r1, [r1] - movs r0, 0 - strh r0, [r1, 0x30] - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _080E86C4 - cmp r0, 0x1 - bgt _080E8694 - cmp r0, 0 - beq _080E869E - b _080E871A - .align 2, 0 -_080E8688: .4byte gSineTable -_080E868C: .4byte REG_BLDALPHA -_080E8690: .4byte gUnknown_083DB694 -_080E8694: - cmp r0, 0x2 - beq _080E86D6 - cmp r0, 0x3 - beq _080E86DE - b _080E871A -_080E869E: - ldr r2, _080E86C0 @ =0x000001a9 - adds r0, r6, r2 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x58 - muls r0, r1 - adds r0, 0x20 - strh r0, [r5, 0x20] - movs r1, 0xD4 - lsls r1, 1 - adds r0, r6, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r2, 0xC - b _080E870A - .align 2, 0 -_080E86C0: .4byte 0x000001a9 -_080E86C4: - movs r0, 0xD6 - strh r0, [r5, 0x20] - movs r1, 0xD4 - lsls r1, 1 - adds r0, r6, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - b _080E8714 -_080E86D6: - movs r0, 0x97 - strh r0, [r5, 0x20] - movs r0, 0x60 - b _080E8718 -_080E86DE: - ldr r4, _080E8720 @ =gUnknown_083DBCC4 - ldr r2, _080E8724 @ =0x000001a9 - adds r0, r6, r2 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0xD4 - lsls r0, 1 - adds r3, r6, r0 - movs r2, 0 - ldrsb r2, [r3, r2] - lsls r0, r2, 3 - subs r0, r2 - adds r1, r0 - adds r1, r4 - movs r0, 0 - ldrsb r0, [r1, r0] - lsls r0, 3 - adds r0, 0x1F - strh r0, [r5, 0x20] - movs r0, 0 - ldrsb r0, [r3, r0] - ldr r2, _080E8728 @ =0x000001b5 -_080E870A: - adds r1, r6, r2 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 -_080E8714: - lsls r0, 4 - adds r0, 0x60 -_080E8718: - strh r0, [r5, 0x22] -_080E871A: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E8720: .4byte gUnknown_083DBCC4 -_080E8724: .4byte 0x000001a9 -_080E8728: .4byte 0x000001b5 - thumb_func_end sub_80E85F8 - - thumb_func_start sub_80E872C -sub_80E872C: @ 80E872C - push {lr} - adds r2, r0, 0 - ldr r0, _080E875C @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0x96 - ldrb r0, [r0] - cmp r0, 0 - beq _080E8756 - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _080E8756 - adds r1, 0x9C - ldr r0, [r1] - ldrh r0, [r0, 0x20] - adds r0, 0x20 - strh r0, [r2, 0x20] - ldr r0, [r1] - ldrh r0, [r0, 0x22] - strh r0, [r2, 0x22] -_080E8756: - pop {r0} - bx r0 - .align 2, 0 -_080E875C: .4byte gUnknown_083DB694 - thumb_func_end sub_80E872C - - thumb_func_start sub_80E8760 -sub_80E8760: @ 80E8760 - push {lr} - adds r2, r0, 0 - ldr r0, _080E8784 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0x96 - ldrb r0, [r0] - cmp r0, 0 - beq _080E87B2 - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0x1 - beq _080E8798 - cmp r0, 0x1 - bgt _080E8788 - cmp r0, 0 - beq _080E878E - b _080E87B2 - .align 2, 0 -_080E8784: .4byte gUnknown_083DB694 -_080E8788: - cmp r0, 0x2 - beq _080E87A2 - b _080E87B2 -_080E878E: - adds r1, 0x9C - ldr r0, [r1] - ldrh r0, [r0, 0x20] - adds r0, 0x40 - b _080E87AA -_080E8798: - adds r1, 0x9C - ldr r0, [r1] - ldrh r0, [r0, 0x20] - adds r0, 0x1C - b _080E87AA -_080E87A2: - adds r1, 0x9C - ldr r0, [r1] - ldrh r0, [r0, 0x20] - adds r0, 0x15 -_080E87AA: - strh r0, [r2, 0x20] - ldr r0, [r1] - ldrh r0, [r0, 0x22] - strh r0, [r2, 0x22] -_080E87B2: - pop {r0} - bx r0 - thumb_func_end sub_80E8760 - - thumb_func_start sub_80E87A4 -sub_80E87A4: @ 80E87A4 - push {r4,lr} - lsls r0, 24 - ldr r1, _080E87C8 @ =gUnknown_083DB694 - ldr r1, [r1] - adds r2, r1, 0 - adds r2, 0xA8 - ldr r3, [r2] - movs r4, 0 - cmp r0, 0 - bne _080E87BA - movs r4, 0x1 -_080E87BA: - movs r1, 0 - strh r4, [r3, 0x30] - ldr r0, [r2] - strh r1, [r0, 0x24] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E87C8: .4byte gUnknown_083DB694 - thumb_func_end sub_80E87A4 - - thumb_func_start sub_80E87CC -sub_80E87CC: @ 80E87CC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r0, _080E8810 @ =gUnknown_083DB694 - ldr r5, [r0] - adds r0, r5, 0 - adds r0, 0xA8 - ldr r0, [r0] - movs r3, 0 - cmp r4, 0 - bne _080E87E6 - movs r3, 0x1 -_080E87E6: - adds r2, r0, 0 - adds r2, 0x3E - lsls r3, 2 - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - adds r0, r4, 0 - bl sub_80E87A4 - cmp r4, 0 - beq _080E880A - ldr r0, _080E8814 @ =0x000001b9 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080E880A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E8810: .4byte gUnknown_083DB694 -_080E8814: .4byte 0x000001b9 - thumb_func_end sub_80E87CC - - thumb_func_start sub_80E8818 -sub_80E8818: @ 80E8818 - push {lr} - ldr r0, _080E8850 @ =gSpriteTemplate_83DBBFC - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080E8854 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x2E] - strh r0, [r1, 0x30] - ldr r0, _080E8858 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xA8 - str r1, [r0] - ldr r0, _080E885C @ =sub_80E8860 - str r0, [r1, 0x1C] - movs r0, 0 - bl sub_80E87CC - pop {r0} - bx r0 - .align 2, 0 -_080E8850: .4byte gSpriteTemplate_83DBBFC -_080E8854: .4byte gSprites -_080E8858: .4byte gUnknown_083DB694 -_080E885C: .4byte sub_80E8860 - thumb_func_end sub_80E8818 - - thumb_func_start sub_80E8860 -sub_80E8860: @ 80E8860 - push {r4,r5,lr} - adds r2, r0, 0 - movs r0, 0x30 - ldrsh r4, [r2, r0] - cmp r4, 0 - bne _080E88E4 - ldr r0, _080E88B0 @ =gUnknown_083DB694 - ldr r3, [r0] - ldr r1, _080E88B4 @ =0x000001b9 - adds r0, r3, r1 - ldrb r1, [r0] - cmp r1, 0 - beq _080E88C4 - ldr r5, _080E88B8 @ =0x00009cd1 - adds r0, r3, r5 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x58 - muls r0, r1 - adds r0, 0x2C - strh r0, [r2, 0x20] - ldr r1, _080E88BC @ =0x00009cd0 - adds r0, r3, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r5, 0x84 - adds r1, r3, r5 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 - lsls r0, 4 - adds r0, 0x60 - strh r0, [r2, 0x22] - ldr r0, _080E88C0 @ =0x0000fffa - strh r0, [r2, 0x24] - strh r4, [r2, 0x2E] - b _080E88E4 - .align 2, 0 -_080E88B0: .4byte gUnknown_083DB694 -_080E88B4: .4byte 0x000001b9 -_080E88B8: .4byte 0x00009cd1 -_080E88BC: .4byte 0x00009cd0 -_080E88C0: .4byte 0x0000fffa -_080E88C4: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _080E88E4 - strh r1, [r2, 0x2E] - ldrh r0, [r2, 0x24] - adds r0, 0x1 - strh r0, [r2, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _080E88E4 - ldr r0, _080E88EC @ =0x0000fffa - strh r0, [r2, 0x24] -_080E88E4: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E88EC: .4byte 0x0000fffa - thumb_func_end sub_80E8860 - - thumb_func_start sub_80E88F0 -sub_80E88F0: @ 80E88F0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r4, 0 - ldr r0, _080E8950 @ =gUnknown_083DB694 - mov r8, r0 - ldr r0, [r0] - movs r6, 0x4 - movs r5, 0 - movs r1, 0xB4 - adds r1, r0 - mov r12, r1 - adds r7, r0, 0 - adds r7, 0xAC -_080E890C: - lsls r2, r4, 2 - adds r3, r7, r2 - ldr r1, [r3] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r6 - strb r0, [r1] - ldr r0, [r3] - strh r5, [r0, 0x30] - add r2, r12 - ldr r1, [r2] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r6 - strb r0, [r1] - ldr r0, [r2] - strh r5, [r0, 0x30] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E890C - mov r1, r8 - ldr r0, [r1] - ldr r1, _080E8954 @ =0x00009f9c - adds r0, r1 - movs r1, 0 - strb r1, [r0] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8950: .4byte gUnknown_083DB694 -_080E8954: .4byte 0x00009f9c - thumb_func_end sub_80E88F0 - - thumb_func_start sub_80E8958 -sub_80E8958: @ 80E8958 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _080E89B4 - movs r0, 0x64 - mov r9, r0 - ldr r0, _080E8998 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r3, _080E899C @ =0x00009f98 - adds r1, r2, r3 - ldr r3, _080E89A0 @ =0x000001b5 - adds r0, r2, r3 - str r0, [r1] - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E89A8 - movs r1, 0xDB - lsls r1, 1 - adds r0, r2, r1 - ldrb r0, [r0] - subs r0, 0x4 - ldr r3, _080E89A4 @ =0x00009f9d - adds r1, r2, r3 - strb r0, [r1] - b _080E8A00 - .align 2, 0 -_080E8998: .4byte gUnknown_083DB694 -_080E899C: .4byte 0x00009f98 -_080E89A0: .4byte 0x000001b5 -_080E89A4: .4byte 0x00009f9d -_080E89A8: - ldr r1, _080E89B0 @ =0x00009f9d - adds r0, r2, r1 - strb r7, [r0] - b _080E8A00 - .align 2, 0 -_080E89B0: .4byte 0x00009f9d -_080E89B4: - movs r3, 0x78 - mov r9, r3 - ldr r0, _080E8A64 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r0, _080E8A68 @ =0x00009f98 - adds r1, r2, r0 - ldr r3, _080E8A6C @ =0x00009d55 - adds r0, r2, r3 - str r0, [r1] - ldr r1, _080E8A70 @ =0x00009d54 - adds r0, r2, r1 - ldrb r0, [r0] - subs r0, 0x4 - ldr r3, _080E8A74 @ =0x00009f9d - adds r1, r2, r3 - strb r0, [r1] - movs r4, 0 - adds r5, r2, 0 - adds r5, 0xB4 - movs r0, 0x5 - negs r0, r0 - mov r12, r0 - movs r6, 0x1 -_080E89E2: - lsls r3, r4, 2 - adds r3, r5, r3 - ldr r1, [r3] - adds r1, 0x3E - ldrb r2, [r1] - mov r0, r12 - ands r0, r2 - strb r0, [r1] - ldr r0, [r3] - strh r6, [r0, 0x30] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E89E2 -_080E8A00: - ldr r0, _080E8A64 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r3, _080E8A74 @ =0x00009f9d - adds r1, r2, r3 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bge _080E8A14 - movs r0, 0 - strb r0, [r1] -_080E8A14: - movs r4, 0 - adds r6, r2, 0 - adds r6, 0xAC - movs r0, 0x5 - negs r0, r0 - mov r8, r0 -_080E8A20: - lsls r2, r4, 2 - adds r2, r6, r2 - ldr r0, [r2] - mov r1, r9 - strh r1, [r0, 0x20] - ldr r1, [r2] - adds r1, 0x3E - ldrb r0, [r1] - mov r3, r8 - ands r0, r3 - strb r0, [r1] - ldr r0, [r2] - movs r5, 0x1 - strh r5, [r0, 0x30] - ldr r0, [r2] - adds r1, r7, 0 - bl StartSpriteAnim - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E8A20 - ldr r0, _080E8A64 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E8A78 @ =0x00009f9c - adds r0, r1 - strb r5, [r0] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8A64: .4byte gUnknown_083DB694 -_080E8A68: .4byte 0x00009f98 -_080E8A6C: .4byte 0x00009d55 -_080E8A70: .4byte 0x00009d54 -_080E8A74: .4byte 0x00009f9d -_080E8A78: .4byte 0x00009f9c - thumb_func_end sub_80E8958 - - thumb_func_start sub_80E8A7C -sub_80E8A7C: @ 80E8A7C - push {r4-r7,lr} - sub sp, 0x18 - mov r1, sp - ldr r0, _080E8B68 @ =gSpriteTemplate_83DBD18 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - movs r5, 0 -_080E8A8E: - lsls r2, r5, 3 - adds r2, r5 - lsls r2, 19 - movs r0, 0xA8 - lsls r0, 15 - adds r2, r0 - asrs r2, 16 - mov r0, sp - movs r1, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _080E8B6C @ =gUnknown_083DB694 - ldr r2, [r0] - lsls r0, r5, 2 - adds r2, 0xAC - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E8B70 @ =gSprites - adds r0, r1 - str r0, [r2] - strh r5, [r0, 0x2E] - ldr r3, [r2] - adds r3, 0x3F - movs r0, 0x1 - adds r2, r5, 0 - ands r2, r0 - lsls r2, 1 - ldrb r0, [r3] - movs r4, 0x3 - negs r4, r4 - adds r1, r4, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r3] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E8A8E - mov r0, sp - movs r1, 0x3 - strh r1, [r0] - ldr r0, _080E8B74 @ =gSpriteAnimTable_83DBD10 - str r0, [sp, 0x8] - movs r5, 0 - movs r7, 0x3F - movs r6, 0x40 -_080E8AF6: - lsls r4, r5, 2 - adds r1, r4, r5 - lsls r1, 19 - movs r0, 0x8E - lsls r0, 16 - adds r1, r0 - asrs r1, 16 - mov r0, sp - movs r2, 0x58 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _080E8B6C @ =gUnknown_083DB694 - ldr r2, [r0] - adds r2, 0xB4 - adds r2, r4 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E8B70 @ =gSprites - adds r0, r1 - str r0, [r2] - strh r5, [r0, 0x2E] - ldr r3, [r2] - ldrb r1, [r3, 0x1] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r6 - strb r0, [r3, 0x1] - ldr r3, [r2] - ldrb r1, [r3, 0x3] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r6 - strb r0, [r3, 0x3] - ldr r0, [r2] - lsls r1, r5, 24 - lsrs r1, 24 - bl StartSpriteAnim - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E8AF6 - movs r0, 0 - bl sub_80E8958 - bl sub_80E88F0 - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8B68: .4byte gSpriteTemplate_83DBD18 -_080E8B6C: .4byte gUnknown_083DB694 -_080E8B70: .4byte gSprites -_080E8B74: .4byte gSpriteAnimTable_83DBD10 - thumb_func_end sub_80E8A7C - thumb_func_start sub_80E8B78 sub_80E8B78: @ 80E8B78 push {r4,lr} diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 5d2089c19..9f4520b86 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,611 +5,6 @@ .text - thumb_func_start sub_80E8760 -sub_80E8760: @ 80E8760 - push {lr} - adds r2, r0, 0 - ldr r0, _080E8780 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0x96 - ldrb r0, [r0] - cmp r0, 0 - beq _080E879E - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _080E8784 - cmp r0, 0x2 - beq _080E878E - b _080E879E - .align 2, 0 -_080E8780: .4byte gUnknown_083DB694 -_080E8784: - adds r1, 0x9C - ldr r0, [r1] - ldrh r0, [r0, 0x20] - adds r0, 0x40 - b _080E8796 -_080E878E: - adds r1, 0x9C - ldr r0, [r1] - ldrh r0, [r0, 0x20] - adds r0, 0x15 -_080E8796: - strh r0, [r2, 0x20] - ldr r0, [r1] - ldrh r0, [r0, 0x22] - strh r0, [r2, 0x22] -_080E879E: - pop {r0} - bx r0 - thumb_func_end sub_80E8760 - - thumb_func_start sub_80E87A4 -sub_80E87A4: @ 80E87A4 - push {r4,lr} - lsls r0, 24 - ldr r1, _080E87C8 @ =gUnknown_083DB694 - ldr r1, [r1] - adds r2, r1, 0 - adds r2, 0xA8 - ldr r3, [r2] - movs r4, 0 - cmp r0, 0 - bne _080E87BA - movs r4, 0x1 -_080E87BA: - movs r1, 0 - strh r4, [r3, 0x30] - ldr r0, [r2] - strh r1, [r0, 0x24] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E87C8: .4byte gUnknown_083DB694 - thumb_func_end sub_80E87A4 - - thumb_func_start sub_80E87CC -sub_80E87CC: @ 80E87CC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r0, _080E8810 @ =gUnknown_083DB694 - ldr r5, [r0] - adds r0, r5, 0 - adds r0, 0xA8 - ldr r0, [r0] - movs r3, 0 - cmp r4, 0 - bne _080E87E6 - movs r3, 0x1 -_080E87E6: - adds r2, r0, 0 - adds r2, 0x3E - lsls r3, 2 - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - adds r0, r4, 0 - bl sub_80E87A4 - cmp r4, 0 - beq _080E880A - ldr r0, _080E8814 @ =0x000001b9 - adds r1, r5, r0 - movs r0, 0x1 - strb r0, [r1] -_080E880A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E8810: .4byte gUnknown_083DB694 -_080E8814: .4byte 0x000001b9 - thumb_func_end sub_80E87CC - - thumb_func_start sub_80E8818 -sub_80E8818: @ 80E8818 - push {lr} - ldr r0, _080E8850 @ =gSpriteTemplate_83DBBFC - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080E8854 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x2E] - strh r0, [r1, 0x30] - ldr r0, _080E8858 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xA8 - str r1, [r0] - ldr r0, _080E885C @ =sub_80E8860 - str r0, [r1, 0x1C] - movs r0, 0 - bl sub_80E87CC - pop {r0} - bx r0 - .align 2, 0 -_080E8850: .4byte gSpriteTemplate_83DBBFC -_080E8854: .4byte gSprites -_080E8858: .4byte gUnknown_083DB694 -_080E885C: .4byte sub_80E8860 - thumb_func_end sub_80E8818 - - thumb_func_start sub_80E8860 -sub_80E8860: @ 80E8860 - push {r4,r5,lr} - adds r2, r0, 0 - movs r0, 0x30 - ldrsh r4, [r2, r0] - cmp r4, 0 - bne _080E88E4 - ldr r0, _080E88B0 @ =gUnknown_083DB694 - ldr r3, [r0] - ldr r1, _080E88B4 @ =0x000001b9 - adds r0, r3, r1 - ldrb r1, [r0] - cmp r1, 0 - beq _080E88C4 - ldr r5, _080E88B8 @ =0x000099a5 - adds r0, r3, r5 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x58 - muls r0, r1 - adds r0, 0x2C - strh r0, [r2, 0x20] - ldr r1, _080E88BC @ =0x000099a4 - adds r0, r3, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r5, 0x84 - adds r1, r3, r5 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 - lsls r0, 4 - adds r0, 0x60 - strh r0, [r2, 0x22] - ldr r0, _080E88C0 @ =0x0000fffa - strh r0, [r2, 0x24] - strh r4, [r2, 0x2E] - b _080E88E4 - .align 2, 0 -_080E88B0: .4byte gUnknown_083DB694 -_080E88B4: .4byte 0x000001b9 -_080E88B8: .4byte 0x000099a5 -_080E88BC: .4byte 0x000099a4 -_080E88C0: .4byte 0x0000fffa -_080E88C4: - ldrh r0, [r2, 0x2E] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _080E88E4 - strh r1, [r2, 0x2E] - ldrh r0, [r2, 0x24] - adds r0, 0x1 - strh r0, [r2, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _080E88E4 - ldr r0, _080E88EC @ =0x0000fffa - strh r0, [r2, 0x24] -_080E88E4: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E88EC: .4byte 0x0000fffa - thumb_func_end sub_80E8860 - - thumb_func_start sub_80E88F0 -sub_80E88F0: @ 80E88F0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r4, 0 - ldr r0, _080E8950 @ =gUnknown_083DB694 - mov r8, r0 - ldr r0, [r0] - movs r6, 0x4 - movs r5, 0 - movs r1, 0xB4 - adds r1, r0 - mov r12, r1 - adds r7, r0, 0 - adds r7, 0xAC -_080E890C: - lsls r2, r4, 2 - adds r3, r7, r2 - ldr r1, [r3] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r6 - strb r0, [r1] - ldr r0, [r3] - strh r5, [r0, 0x30] - add r2, r12 - ldr r1, [r2] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r6 - strb r0, [r1] - ldr r0, [r2] - strh r5, [r0, 0x30] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E890C - mov r1, r8 - ldr r0, [r1] - ldr r1, _080E8954 @ =0x00009c70 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8950: .4byte gUnknown_083DB694 -_080E8954: .4byte 0x00009c70 - thumb_func_end sub_80E88F0 - - thumb_func_start sub_80E8958 -sub_80E8958: @ 80E8958 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0 - bne _080E89B4 - movs r0, 0x64 - mov r9, r0 - ldr r0, _080E8998 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r3, _080E899C @ =0x00009c6c - adds r1, r2, r3 - ldr r3, _080E89A0 @ =0x000001b5 - adds r0, r2, r3 - str r0, [r1] - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E89A8 - movs r1, 0xDB - lsls r1, 1 - adds r0, r2, r1 - ldrb r0, [r0] - subs r0, 0x4 - ldr r3, _080E89A4 @ =0x00009c71 - adds r1, r2, r3 - strb r0, [r1] - b _080E8A00 - .align 2, 0 -_080E8998: .4byte gUnknown_083DB694 -_080E899C: .4byte 0x00009c6c -_080E89A0: .4byte 0x000001b5 -_080E89A4: .4byte 0x00009c71 -_080E89A8: - ldr r1, _080E89B0 @ =0x00009c71 - adds r0, r2, r1 - strb r7, [r0] - b _080E8A00 - .align 2, 0 -_080E89B0: .4byte 0x00009c71 -_080E89B4: - movs r3, 0x78 - mov r9, r3 - ldr r0, _080E8A64 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r0, _080E8A68 @ =0x00009c6c - adds r1, r2, r0 - ldr r3, _080E8A6C @ =0x00009a29 - adds r0, r2, r3 - str r0, [r1] - ldr r1, _080E8A70 @ =0x00009a28 - adds r0, r2, r1 - ldrb r0, [r0] - subs r0, 0x4 - ldr r3, _080E8A74 @ =0x00009c71 - adds r1, r2, r3 - strb r0, [r1] - movs r4, 0 - adds r5, r2, 0 - adds r5, 0xB4 - movs r0, 0x5 - negs r0, r0 - mov r12, r0 - movs r6, 0x1 -_080E89E2: - lsls r3, r4, 2 - adds r3, r5, r3 - ldr r1, [r3] - adds r1, 0x3E - ldrb r2, [r1] - mov r0, r12 - ands r0, r2 - strb r0, [r1] - ldr r0, [r3] - strh r6, [r0, 0x30] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E89E2 -_080E8A00: - ldr r0, _080E8A64 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r3, _080E8A74 @ =0x00009c71 - adds r1, r2, r3 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bge _080E8A14 - movs r0, 0 - strb r0, [r1] -_080E8A14: - movs r4, 0 - adds r6, r2, 0 - adds r6, 0xAC - movs r0, 0x5 - negs r0, r0 - mov r8, r0 -_080E8A20: - lsls r2, r4, 2 - adds r2, r6, r2 - ldr r0, [r2] - mov r1, r9 - strh r1, [r0, 0x20] - ldr r1, [r2] - adds r1, 0x3E - ldrb r0, [r1] - mov r3, r8 - ands r0, r3 - strb r0, [r1] - ldr r0, [r2] - movs r5, 0x1 - strh r5, [r0, 0x30] - ldr r0, [r2] - adds r1, r7, 0 - bl StartSpriteAnim - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E8A20 - ldr r0, _080E8A64 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E8A78 @ =0x00009c70 - adds r0, r1 - strb r5, [r0] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8A64: .4byte gUnknown_083DB694 -_080E8A68: .4byte 0x00009c6c -_080E8A6C: .4byte 0x00009a29 -_080E8A70: .4byte 0x00009a28 -_080E8A74: .4byte 0x00009c71 -_080E8A78: .4byte 0x00009c70 - thumb_func_end sub_80E8958 - - thumb_func_start sub_80E8A7C -sub_80E8A7C: @ 80E8A7C - push {r4-r7,lr} - sub sp, 0x18 - mov r1, sp - ldr r0, _080E8B68 @ =gSpriteTemplate_83DBD18 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - movs r5, 0 -_080E8A8E: - lsls r2, r5, 3 - adds r2, r5 - lsls r2, 19 - movs r0, 0xA8 - lsls r0, 15 - adds r2, r0 - asrs r2, 16 - mov r0, sp - movs r1, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _080E8B6C @ =gUnknown_083DB694 - ldr r2, [r0] - lsls r0, r5, 2 - adds r2, 0xAC - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E8B70 @ =gSprites - adds r0, r1 - str r0, [r2] - strh r5, [r0, 0x2E] - ldr r3, [r2] - adds r3, 0x3F - movs r0, 0x1 - adds r2, r5, 0 - ands r2, r0 - lsls r2, 1 - ldrb r0, [r3] - movs r4, 0x3 - negs r4, r4 - adds r1, r4, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r3] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E8A8E - mov r0, sp - movs r1, 0x3 - strh r1, [r0] - ldr r0, _080E8B74 @ =gSpriteAnimTable_83DBD10 - str r0, [sp, 0x8] - movs r5, 0 - movs r7, 0x3F - movs r6, 0x40 -_080E8AF6: - lsls r4, r5, 2 - adds r1, r4, r5 - lsls r1, 19 - movs r0, 0x8E - lsls r0, 16 - adds r1, r0 - asrs r1, 16 - mov r0, sp - movs r2, 0x58 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _080E8B6C @ =gUnknown_083DB694 - ldr r2, [r0] - adds r2, 0xB4 - adds r2, r4 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E8B70 @ =gSprites - adds r0, r1 - str r0, [r2] - strh r5, [r0, 0x2E] - ldr r3, [r2] - ldrb r1, [r3, 0x1] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r6 - strb r0, [r3, 0x1] - ldr r3, [r2] - ldrb r1, [r3, 0x3] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r6 - strb r0, [r3, 0x3] - ldr r0, [r2] - lsls r1, r5, 24 - lsrs r1, 24 - bl StartSpriteAnim - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080E8AF6 - movs r0, 0 - bl sub_80E8958 - bl sub_80E88F0 - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8B68: .4byte gSpriteTemplate_83DBD18 -_080E8B6C: .4byte gUnknown_083DB694 -_080E8B70: .4byte gSprites -_080E8B74: .4byte gSpriteAnimTable_83DBD10 - thumb_func_end sub_80E8A7C - - thumb_func_start sub_80E8B78 -sub_80E8B78: @ 80E8B78 - push {r4,lr} - adds r3, r0, 0 - ldr r0, _080E8BB0 @ =gUnknown_083DB694 - ldr r1, [r0] - ldr r2, _080E8BB4 @ =0x00009c70 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080E8BE8 - movs r2, 0x30 - ldrsh r0, [r3, r2] - cmp r0, 0 - beq _080E8BE8 - movs r2, 0x2E - ldrsh r0, [r3, r2] - cmp r0, 0 - bne _080E8BBC - movs r4, 0 - ldr r2, _080E8BB8 @ =0x00009c6c - adds r0, r1, r2 - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bne _080E8BD6 - b _080E8BD4 - .align 2, 0 -_080E8BB0: .4byte gUnknown_083DB694 -_080E8BB4: .4byte 0x00009c70 -_080E8BB8: .4byte 0x00009c6c -_080E8BBC: - movs r4, 0 - ldr r2, _080E8BF0 @ =0x00009c6c - adds r0, r1, r2 - ldr r0, [r0] - adds r2, 0x5 - adds r1, r2 - movs r2, 0 - ldrsb r2, [r0, r2] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - bne _080E8BD6 -_080E8BD4: - movs r4, 0x1 -_080E8BD6: - adds r2, r3, 0 - adds r2, 0x3E - lsls r3, r4, 2 - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - orrs r0, r3 - strb r0, [r2] -_080E8BE8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E8BF0: .4byte 0x00009c6c - thumb_func_end sub_80E8B78 - thumb_func_start sub_80E8BF4 sub_80E8BF4: @ 80E8BF4 push {r4-r7,lr} diff --git a/data.txt b/data.txt deleted file mode 100644 index 4c3a16e5a..000000000 --- a/data.txt +++ /dev/null @@ -1,10 +0,0 @@ -const struct SpriteTemplate gSpriteTemplate_83DBCAC = -{ - .tileTag = 1, - .paletteTag = 1, - .oam = &gOamData_83DBC14, - .anims = gSpriteAnimTable_83DBC7C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80E85F8, -}; diff --git a/data/easy_chat.s b/data/easy_chat.s index 6630e19d2..9181ea296 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,53 +8,6 @@ .section .rodata - .align 2 -gUnknown_083DBCC4:: @ 83DBCC4 - .byte 1, 3, 5, 8, 10, 12, 15 - .byte 1, 3, 5, 8, 10, 12, 0 - .byte 1, 3, 5, 8, 10, 12, 14 - .byte 1, 3, 5, 8, 10, 12, 14 - - .align 2 -gOamData_83DBCE0:: @ 83DBCE0 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83DBCE8:: @ 83DBCE8 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBCF0:: @ 83DBCF0 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBCF8:: @ 83DBCF8 - .4byte gSpriteAnim_83DBCE8 - .4byte gSpriteAnim_83DBCF0 - - .align 2 -gSpriteAnim_83DBD00:: @ 83DBD00 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBD08:: @ 83DBD08 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBD10:: @ 83DBD10 - .4byte gSpriteAnim_83DBD00 - .4byte gSpriteAnim_83DBD08 - - .align 2 -gSpriteTemplate_83DBD18:: @ 83DBD18 - spr_template 2, 0, gOamData_83DBCE0, gSpriteAnimTable_83DBCF8, NULL, gDummySpriteAffineAnimTable, sub_80E8B78 - .align 2 gUnknown_083DBD30:: @ 83DBD30 obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006 diff --git a/include/easy_chat.h b/include/easy_chat.h index 8d13ecc42..58442a890 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -37,7 +37,10 @@ struct Shared1000 struct Sprite *unk9C; struct Sprite *unkA0; struct Sprite *unkA4; - u8 fillerA8[0x1A8-0xA8]; + struct Sprite *unkA8; + struct Sprite *unkAC[2]; + struct Sprite *unkB4[2]; + u8 fillerBC[0x1A8-0xBC]; s8 unk1A8; s8 unk1A9; s8 unk1AA[0xB5-0xAA]; // unknown length @@ -67,9 +70,12 @@ struct Shared1000 s8 unk99A6[0xA28-0x9A6]; s8 unk9A28; s8 unk9A29; - //u8 filler9A2A[0xC7C-0xA2A]; - u16 unk9A2A[0x94][2]; // unknown length - u8 filler9C7A[2]; + u16 unk9A2A[0x90][2]; // unknown length + u8 filler9C6A[2]; + s8 *unk9C6C; + u8 unk9C70; + s8 unk9C71; + u8 filler9C72[0xC-0x2]; u16 unk9C7C; // this is at 0x9FA8 in German s16 unk9C7E; u8 unk9C80[0xC9-0x80]; diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index cc1877db1..0c0bc9e80 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -11,7 +11,9 @@ void sub_80E85F8(struct Sprite *); void sub_80E872C(struct Sprite *); void sub_80E8760(struct Sprite *); void sub_80E8818(void); +void sub_80E8860(struct Sprite *); void sub_80E8A7C(void); +void sub_80E8B78(struct Sprite *); const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); const u16 InterviewPalette_1[] = INCBIN_U16("graphics/misc/interview_pal1.gbapal"); @@ -349,7 +351,13 @@ void sub_80E8534(void) gUnknown_083DB694->unk9C->data[1] = 0; } -extern const s8 gUnknown_083DBCC4[][7]; +const s8 gUnknown_083DBCC4[][7] = +{ + {1, 3, 5, 8, 10, 12, 15}, + {1, 3, 5, 8, 10, 12, 0}, + {1, 3, 5, 8, 10, 12, 14}, + {1, 3, 5, 8, 10, 12, 14}, +}; void sub_80E85F8(struct Sprite *sprite) { @@ -393,6 +401,7 @@ void sub_80E85F8(struct Sprite *sprite) } } + void sub_80E872C(struct Sprite *sprite) { if (gUnknown_083DB694->unk96 != 0 && sprite->data[2] == 0) @@ -401,3 +410,299 @@ void sub_80E872C(struct Sprite *sprite) sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; } } + +#if ENGLISH +void sub_80E8760(struct Sprite *sprite) +{ + if (gUnknown_083DB694->unk96 != 0) + { + switch (sprite->data[2]) + { + case 0: + sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 64; + sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + break; + case 2: + sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 21; + sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + break; + } + } +} +#else +__attribute__((naked)) +void sub_80E8760(struct Sprite *sprite) +{ + asm(".syntax unified\n\ + push {lr}\n\ + adds r2, r0, 0\n\ + ldr r0, _080E8784 @ =gUnknown_083DB694\n\ + ldr r1, [r0]\n\ + adds r0, r1, 0\n\ + adds r0, 0x96\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080E87B2\n\ + movs r3, 0x32\n\ + ldrsh r0, [r2, r3]\n\ + cmp r0, 0x1\n\ + beq _080E8798\n\ + cmp r0, 0x1\n\ + bgt _080E8788\n\ + cmp r0, 0\n\ + beq _080E878E\n\ + b _080E87B2\n\ + .align 2, 0\n\ +_080E8784: .4byte gUnknown_083DB694\n\ +_080E8788:\n\ + cmp r0, 0x2\n\ + beq _080E87A2\n\ + b _080E87B2\n\ +_080E878E:\n\ + adds r1, 0x9C\n\ + ldr r0, [r1]\n\ + ldrh r0, [r0, 0x20]\n\ + adds r0, 0x40\n\ + b _080E87AA\n\ +_080E8798:\n\ + adds r1, 0x9C\n\ + ldr r0, [r1]\n\ + ldrh r0, [r0, 0x20]\n\ + adds r0, 0x1C\n\ + b _080E87AA\n\ +_080E87A2:\n\ + adds r1, 0x9C\n\ + ldr r0, [r1]\n\ + ldrh r0, [r0, 0x20]\n\ + adds r0, 0x15\n\ +_080E87AA:\n\ + strh r0, [r2, 0x20]\n\ + ldr r0, [r1]\n\ + ldrh r0, [r0, 0x22]\n\ + strh r0, [r2, 0x22]\n\ +_080E87B2:\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif + +void sub_80E87A4(u8 a) +{ + gUnknown_083DB694->unkA8->data[1] = (a == 0); + gUnknown_083DB694->unkA8->pos2.x = 0; +} + +void sub_80E87CC(u8 a) +{ + gUnknown_083DB694->unkA8->invisible = (a == 0); + sub_80E87A4(a); + if (a != 0) + gUnknown_083DB694->unk1B9 = 1; +} + +void sub_80E8818(void) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83DBBFC, 0, 0, 0); + + gSprites[spriteId].data[0] = 0; + gSprites[spriteId].data[1] = 0; + gUnknown_083DB694->unkA8 = &gSprites[spriteId]; + gUnknown_083DB694->unkA8->callback = sub_80E8860; + sub_80E87CC(0); +} + +void sub_80E8860(struct Sprite *sprite) +{ + if (sprite->data[1] == 0) + { + if (gUnknown_083DB694->unk1B9 != 0) + { + sprite->pos1.x = gUnknown_083DB694->unk99A5 * 88 + 44; + sprite->pos1.y = (gUnknown_083DB694->unk99A4 - gUnknown_083DB694->unk9A29) * 16 + 96; + sprite->pos2.x = -6; + sprite->data[0] = 0; + } + else + { + sprite->data[0]++; + if (sprite->data[0] > 2) + { + sprite->data[0] = 0; + sprite->pos2.x++; + if (sprite->pos2.x > 0) + sprite->pos2.x = -6; + } + } + } +} + +void sub_80E88F0(void) +{ + u16 i; + + for (i = 0; i < 2; i++) + { + gUnknown_083DB694->unkAC[i]->invisible = TRUE; + gUnknown_083DB694->unkAC[i]->data[1] = 0; + gUnknown_083DB694->unkB4[i]->invisible = TRUE; + gUnknown_083DB694->unkB4[i]->data[1] = 0; + } + gUnknown_083DB694->unk9C70 = 0; +} + +void sub_80E8958(u8 animNum) +{ + s16 r9; + u16 i; + + if (animNum == 0) + { + r9 = 100; + gUnknown_083DB694->unk9C6C = &gUnknown_083DB694->unk1B5; + if (gUnknown_083DB694->unk26 == 0) + gUnknown_083DB694->unk9C71 = gUnknown_083DB694->unk1B6 - 4; + else + gUnknown_083DB694->unk9C71 = 0; + } + else + { + r9 = 120; + gUnknown_083DB694->unk9C6C = &gUnknown_083DB694->unk9A29; + gUnknown_083DB694->unk9C71 = gUnknown_083DB694->unk9A28 - 4; + for (i = 0; i < 2; i++) + { + gUnknown_083DB694->unkB4[i]->invisible = FALSE; + gUnknown_083DB694->unkB4[i]->data[1] = 1; + } + } + + if (gUnknown_083DB694->unk9C71 < 0) + gUnknown_083DB694->unk9C71 = 0; + + for (i = 0; i < 2; i++) + { + gUnknown_083DB694->unkAC[i]->pos1.x = r9; + gUnknown_083DB694->unkAC[i]->invisible = FALSE; + gUnknown_083DB694->unkAC[i]->data[1] = 1; + StartSpriteAnim(gUnknown_083DB694->unkAC[i], animNum); + } + + gUnknown_083DB694->unk9C70 = 1; +} + +const struct OamData gOamData_83DBCE0 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_83DBCE8[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBCF0[] = +{ + ANIMCMD_FRAME(4, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_83DBCF8[] = +{ + gSpriteAnim_83DBCE8, + gSpriteAnim_83DBCF0, +}; + +const union AnimCmd gSpriteAnim_83DBD00[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBD08[] = +{ + ANIMCMD_FRAME(4, 5), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_83DBD10[] = +{ + gSpriteAnim_83DBD00, + gSpriteAnim_83DBD08, +}; + +void sub_80E8A7C(void) +{ + struct SpriteTemplate spriteTemplate_83DBD18 = + { + .tileTag = 2, + .paletteTag = 0, + .oam = &gOamData_83DBCE0, + .anims = gSpriteAnimTable_83DBCF8, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80E8B78, + }; + u16 i; + u8 spriteId; + + for (i = 0; i < 2; i++) + { + spriteId = CreateSprite(&spriteTemplate_83DBD18, 0, 84 + i * 72 , 0); + gUnknown_083DB694->unkAC[i] = &gSprites[spriteId]; + gUnknown_083DB694->unkAC[i]->data[0] = i; + gUnknown_083DB694->unkAC[i]->vFlip = i; + } + + spriteTemplate_83DBD18.tileTag = 3; + spriteTemplate_83DBD18.anims = gSpriteAnimTable_83DBD10; + + for (i = 0; i < 2; i++) + { + spriteId = CreateSprite(&spriteTemplate_83DBD18, 142 + i * 40, 88, 0); + gUnknown_083DB694->unkB4[i] = &gSprites[spriteId]; + gUnknown_083DB694->unkB4[i]->data[0] = i; + gUnknown_083DB694->unkB4[i]->oam.shape = 1; + gUnknown_083DB694->unkB4[i]->oam.size = 1; + StartSpriteAnim(gUnknown_083DB694->unkB4[i], i); + } + + sub_80E8958(0); + sub_80E88F0(); +} + +void sub_80E8B78(struct Sprite *sprite) +{ + bool8 invisible; + + if (gUnknown_083DB694->unk9C70 != 0 && sprite->data[1] != 0) + { + if (sprite->data[0] == 0) + { + invisible = FALSE; + if (*gUnknown_083DB694->unk9C6C == 0) + invisible = TRUE; + sprite->invisible = invisible; + } + else + { + invisible = FALSE; + if (*gUnknown_083DB694->unk9C6C == gUnknown_083DB694->unk9C71) + invisible = TRUE; + sprite->invisible = invisible; + } + } +} -- cgit v1.2.3 From 4a01c3233aa8758a9a56fa419642c8bc4590d09a Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Thu, 4 Jan 2018 04:15:17 +0100 Subject: Decompiled poison.s --- asm/poison.s | 364 ----------------------------------------------- ld_script.txt | 2 +- src/battle/anim/poison.c | 115 +++++++++++++++ src/rom_8077ABC.c | 4 +- 4 files changed, 118 insertions(+), 367 deletions(-) delete mode 100755 asm/poison.s create mode 100644 src/battle/anim/poison.c diff --git a/asm/poison.s b/asm/poison.s deleted file mode 100755 index 234348df2..000000000 --- a/asm/poison.s +++ /dev/null @@ -1,364 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - @ poison - - thumb_func_start sub_80D9D70 -sub_80D9D70: @ 80D9D70 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080D9DC4 @ =gBattleAnimArgs - movs r1, 0x6 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080D9D86 - adds r0, r5, 0 - movs r1, 0x2 - bl StartSpriteAnim -_080D9D86: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80787B0 - ldrh r0, [r4, 0x4] - strh r0, [r5, 0x2E] - ldr r4, _080D9DC8 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - ldr r0, _080D9DCC @ =0x0000ffe2 - strh r0, [r5, 0x38] - adds r0, r5, 0 - bl sub_80786EC - ldr r0, _080D9DD0 @ =sub_80D9DD4 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9DC4: .4byte gBattleAnimArgs -_080D9DC8: .4byte gAnimBankTarget -_080D9DCC: .4byte 0x0000ffe2 -_080D9DD0: .4byte sub_80D9DD4 - thumb_func_end sub_80D9D70 - - thumb_func_start sub_80D9DD4 -sub_80D9DD4: @ 80D9DD4 - push {r4,lr} - adds r4, r0, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080D9DE8 - adds r0, r4, 0 - bl DestroyAnimSprite -_080D9DE8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9DD4 - - thumb_func_start sub_80D9DF0 -sub_80D9DF0: @ 80D9DF0 - push {r4-r6,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r5, _080D9E64 @ =gBattleAnimArgs - movs r1, 0x6 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080D9E08 - adds r0, r4, 0 - movs r1, 0x2 - bl StartSpriteAnim -_080D9E08: - adds r0, r4, 0 - movs r1, 0x1 - bl sub_80787B0 - ldr r0, _080D9E68 @ =gAnimBankTarget - ldrb r0, [r0] - mov r6, sp - adds r6, 0x2 - movs r1, 0x1 - mov r2, sp - adds r3, r6, 0 - bl sub_807A3FC - ldr r0, _080D9E6C @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080D9E36 - ldrh r0, [r5, 0x8] - negs r0, r0 - strh r0, [r5, 0x8] -_080D9E36: - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2E] - mov r1, sp - ldrh r0, [r5, 0x8] - ldrh r1, [r1] - adds r0, r1 - strh r0, [r4, 0x32] - ldrh r0, [r5, 0xA] - ldrh r6, [r6] - adds r0, r6 - strh r0, [r4, 0x36] - ldr r0, _080D9E70 @ =0x0000ffe2 - strh r0, [r4, 0x38] - adds r0, r4, 0 - bl sub_80786EC - ldr r0, _080D9E74 @ =sub_80D9E78 - str r0, [r4, 0x1C] - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080D9E64: .4byte gBattleAnimArgs -_080D9E68: .4byte gAnimBankTarget -_080D9E6C: .4byte gAnimBankAttacker -_080D9E70: .4byte 0x0000ffe2 -_080D9E74: .4byte sub_80D9E78 - thumb_func_end sub_80D9DF0 - - thumb_func_start sub_80D9E78 -sub_80D9E78: @ 80D9E78 - push {r4,lr} - adds r4, r0, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080D9E8C - adds r0, r4, 0 - bl DestroyAnimSprite -_080D9E8C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9E78 - - thumb_func_start sub_80D9E94 -sub_80D9E94: @ 80D9E94 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, _080D9EE0 @ =gBattleAnimArgs - ldrh r0, [r5, 0x4] - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x30] - ldrh r1, [r5] - adds r0, r1 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - strh r0, [r4, 0x34] - ldrh r1, [r5, 0x2] - adds r0, r1 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_8078A5C - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r2, 0x4 - ldrsh r1, [r5, r2] - bl __divsi3 - strh r0, [r4, 0x38] - movs r1, 0x32 - ldrsh r0, [r4, r1] - movs r2, 0x4 - ldrsh r1, [r5, r2] - bl __divsi3 - strh r0, [r4, 0x3A] - ldr r0, _080D9EE4 @ =sub_80D9EE8 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9EE0: .4byte gBattleAnimArgs -_080D9EE4: .4byte sub_80D9EE8 - thumb_func_end sub_80D9E94 - - thumb_func_start sub_80D9EE8 -sub_80D9EE8: @ 80D9EE8 - push {r4,lr} - adds r4, r0, 0 - bl sub_8078394 - ldrh r0, [r4, 0x30] - ldrh r1, [r4, 0x38] - subs r0, r1 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x32] - ldrh r1, [r4, 0x3A] - subs r0, r1 - strh r0, [r4, 0x32] - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080D9F0E - adds r0, r4, 0 - bl DestroyAnimSprite -_080D9F0E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9EE8 - - thumb_func_start sub_80D9F14 -sub_80D9F14: @ 80D9F14 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080D9F74 @ =gAnimBankTarget - ldrb r0, [r0] - adds r2, r4, 0 - adds r2, 0x20 - adds r3, r4, 0 - adds r3, 0x22 - movs r1, 0x1 - bl sub_807A3FC - ldr r0, _080D9F78 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080D9F40 - ldr r1, _080D9F7C @ =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] -_080D9F40: - ldr r0, _080D9F7C @ =gBattleAnimArgs - ldrh r2, [r0] - ldrh r1, [r4, 0x20] - adds r2, r1 - strh r2, [r4, 0x20] - ldrh r1, [r0, 0x2] - ldrh r3, [r4, 0x22] - adds r1, r3 - strh r1, [r4, 0x22] - ldrh r3, [r0, 0x8] - strh r3, [r4, 0x2E] - ldrh r0, [r0, 0x4] - adds r2, r0 - strh r2, [r4, 0x32] - adds r1, r3 - strh r1, [r4, 0x36] - ldr r0, _080D9F80 @ =sub_8078B34 - str r0, [r4, 0x1C] - ldr r1, _080D9F84 @ =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D9F74: .4byte gAnimBankTarget -_080D9F78: .4byte gAnimBankAttacker -_080D9F7C: .4byte gBattleAnimArgs -_080D9F80: .4byte sub_8078B34 -_080D9F84: .4byte DestroyAnimSprite - thumb_func_end sub_80D9F14 - - thumb_func_start sub_80D9F88 -sub_80D9F88: @ 80D9F88 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, _080D9FA0 @ =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080D9FA4 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_8078764 - b _080D9FDA - .align 2, 0 -_080D9FA0: .4byte gBattleAnimArgs -_080D9FA4: - ldr r0, _080D9FE4 @ =gAnimBankTarget - ldrb r0, [r0] - adds r2, r4, 0 - adds r2, 0x20 - adds r3, r4, 0 - adds r3, 0x22 - movs r1, 0x1 - bl sub_807A3FC - ldr r0, _080D9FE8 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080D9FCA - ldrh r0, [r5] - negs r0, r0 - strh r0, [r5] -_080D9FCA: - ldrh r0, [r5] - ldrh r1, [r4, 0x20] - adds r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r5, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] -_080D9FDA: - ldr r0, _080D9FEC @ =sub_80D9FF0 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080D9FE4: .4byte gAnimBankTarget -_080D9FE8: .4byte gAnimBankAttacker -_080D9FEC: .4byte sub_80D9FF0 - thumb_func_end sub_80D9F88 - - thumb_func_start sub_80D9FF0 -sub_80D9FF0: @ 80D9FF0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0xB - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x2E] - movs r1, 0x2E - ldrsh r0, [r4, r1] - movs r1, 0x4 - bl Sin - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x30] - adds r0, 0x30 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 24 - negs r0, r0 - strh r0, [r4, 0x26] - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080DA02C - adds r0, r4, 0 - bl DestroyAnimSprite -_080DA02C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D9FF0 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 6d35da842..af6e248d2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -290,7 +290,7 @@ SECTIONS { asm/current.o(.text); asm/ice.o(.text); asm/fight.o(.text); - asm/poison.o(.text); + src/battle/anim/poison.o(.text); asm/flying.o(.text); asm/psychic.o(.text); asm/bug.o(.text); diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c new file mode 100644 index 000000000..c53fb2a8b --- /dev/null +++ b/src/battle/anim/poison.c @@ -0,0 +1,115 @@ +#include "global.h" +#include "battle_anim.h" +#include "rom_8077ABC.h" +#include "trig.h" + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; + +void sub_80D9DD4(struct Sprite *sprite); +void sub_80D9E78(struct Sprite *sprite); +void sub_80D9EE8(struct Sprite *sprite); +void sub_80D9FF0(struct Sprite *sprite); + +void sub_80D9D70(struct Sprite *sprite) { + if (!gBattleAnimArgs[3]) { + StartSpriteAnim(sprite, 2); + } + sub_80787B0(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); + sprite->data[5] = -30; + sub_80786EC(sprite); + sprite->callback = sub_80D9DD4; +} + +void sub_80D9DD4(struct Sprite *sprite) { + if (sub_8078718(sprite)) { + DestroyAnimSprite(sprite); + } +} + +void sub_80D9DF0(struct Sprite *sprite) { + s16 l1, l2; + if (!gBattleAnimArgs[3]) { + StartSpriteAnim(sprite, 2); + } + sub_80787B0(sprite, 1); + sub_807A3FC(gAnimBankTarget, 1, &l1, &l2); + if (GetBankSide(gAnimBankAttacker)) { + gBattleAnimArgs[4] = -gBattleAnimArgs[4]; + } + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[2] = l1 + gBattleAnimArgs[4]; + sprite->data[4] = l2 + gBattleAnimArgs[5]; + sprite->data[5] = -30; + sub_80786EC(sprite); + sprite->callback = sub_80D9E78; +} + +void sub_80D9E78(struct Sprite *sprite) { + if (sub_8078718(sprite)) { + DestroyAnimSprite(sprite); + } +} + +void sub_80D9E94(struct Sprite *sprite) { + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[0]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1]; + sub_8078A5C(sprite); + sprite->data[5] = sprite->data[1] / gBattleAnimArgs[2]; + sprite->data[6] = sprite->data[2] / gBattleAnimArgs[2]; + sprite->callback = sub_80D9EE8; +} + +void sub_80D9EE8(struct Sprite *sprite) { + sub_8078394(sprite); + sprite->data[1] -= sprite->data[5]; + sprite->data[2] -= sprite->data[6]; + if (!sprite->data[0]) { + DestroyAnimSprite(sprite); + } +} + +void sub_80D9F14(struct Sprite *sprite) { + sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); + if (GetBankSide(gAnimBankAttacker)) { + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + } + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; + sprite->data[4] = sprite->pos1.y + sprite->data[0]; + sprite->callback = sub_8078B34; + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); +} + +void sub_80D9F88(struct Sprite *sprite) { + if (!gBattleAnimArgs[2]) { + sub_8078764(sprite, TRUE); + } else { + sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); + if (GetBankSide(gAnimBankAttacker)) { + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + } + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + } + sprite->callback = sub_80D9FF0; +} + +void sub_80D9FF0(struct Sprite *sprite) { + sprite->data[0] = (sprite->data[0] + 0xB) & 0xFF; + sprite->pos2.x = Sin(sprite->data[0], 4); + sprite->data[1] += 0x30; + sprite->pos2.y = -(sprite->data[1] >> 8); + if (sprite->affineAnimEnded) { + DestroyAnimSprite(sprite); + } +} \ No newline at end of file diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 9cf28a111..667f74a25 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -698,7 +698,7 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite) { sprite->pos2.y = 0; } -void sub_8078764(struct Sprite *sprite, u8 a2) { +void sub_8078764(struct Sprite *sprite, bool8 a2) { if (!a2) { sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0); sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1); @@ -1841,7 +1841,7 @@ int sub_807A100(u8 slot, u8 a2) { } } -void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) { +void sub_807A3FC(u8 slot, bool8 a2, s16 *a3, s16 *a4) { u8 v1, v2; s16 v3, v4; s16 v5, v6; -- cgit v1.2.3 From 3c709ef2ede275d6eeaa319a603c199a3906226b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 3 Jan 2018 23:55:30 -0500 Subject: A little tidying --- include/global.h | 8 -------- include/sprite.h | 4 ---- src/field/slot_machine.c | 1 - 3 files changed, 13 deletions(-) diff --git a/include/global.h b/include/global.h index 17dd0a88d..76300d36d 100644 --- a/include/global.h +++ b/include/global.h @@ -27,14 +27,6 @@ int strcmp (const char *, const char *); #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n") -#define nonmatching(fndec, x) {\ -__attribute__((naked))\ -fndec\ -{\ - asm_unified(x);\ -}\ -} - #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0])) #define POKEMON_SLOTS_NUMBER 412 diff --git a/include/sprite.h b/include/sprite.h index 2b7960f6f..b72c09989 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -120,10 +120,6 @@ union AffineAnimCmd {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} #define AFFINEANIMCMD_END \ {.type = AFFINEANIMCMDTYPE_END} -#define AFFINEANIMCMD_LOOP(_count) \ - {.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}} -#define AFFINEANIMCMD_JUMP(_target) \ - {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} struct AffineAnimState { diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index e1687b3d1..0e907674b 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -12,7 +12,6 @@ #include "trig.h" #include "graphics.h" #include "palette.h" -#include "task.h" #include "util.h" #include "text.h" #include "menu.h" -- cgit v1.2.3 From 86e1d1098e2554f21c42784115e9f69fb81b2925 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Jan 2018 00:09:07 -0500 Subject: Declare as static what can be so declared --- include/graphics.h | 5 + src/field/slot_machine.c | 1119 +++++++++++++++++++++++----------------------- 2 files changed, 562 insertions(+), 562 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 1d66172ca..17abb840e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2697,5 +2697,10 @@ extern const u16 gSlotMachineSpritePalette3[]; extern const u16 gSlotMachineSpritePalette4[]; extern const u16 gSlotMachineSpritePalette5[]; extern const u16 gSlotMachineSpritePalette6[]; +extern const u8 gSlotMachine_Gfx[]; +extern const u8 gSlotMachineReelTimeLights_Gfx[]; +extern const u16 gUnknown_08E95A18[]; +extern const u16 gUnknown_08E95AB8[]; +extern const u16 gUnknown_08E95FB8[]; #endif // GUARD_GRAPHICS_H diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 0e907674b..b21d8a082 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -80,7 +80,7 @@ static void sub_8102484(void); static void sub_81024F0(void); static bool8 sub_8102540(void); static u8 sub_8102578(void); -u16 dp15_jump_random_unknown(void); +static u16 dp15_jump_random_unknown(void); static u8 sub_81025BC(void); static void sub_81027A0(void); static void sub_81027D0(void); @@ -90,44 +90,44 @@ static u8 sub_81029D4(u8 c1, u8 c2, u8 c3); static void sub_8102A24(void); static void sub_8102A64(u8 taskId); static bool8 sub_8102A44(void); -bool8 sub_8102A9C(struct Task *task); -bool8 sub_8102AD0(struct Task *task); -bool8 sub_8102B80(struct Task *task); -u8 sub_8102BA4(u8 x, s16 y); +static bool8 sub_8102A9C(struct Task *task); +static bool8 sub_8102AD0(struct Task *task); +static bool8 sub_8102B80(struct Task *task); +static u8 sub_8102BA4(u8 x, s16 y); static void sub_8102DA8(void); static void sub_8102DEC(u8 a0); static void sub_8102E1C(u8 a0); static bool8 sub_8102E40(u8 a0); static void sub_8102E68(u8 taskId); -bool8 sub_8102EA0(struct Task *task); -bool8 sub_8102EA4(struct Task *task); -bool8 sub_8102EC0(struct Task *task); -bool8 sub_8102F4C(struct Task *task); -bool8 sub_8103008(struct Task *task); -bool8 sub_810305C(void); -bool8 sub_8103154(u8 a0, u8 a1); -bool8 sub_81031B4(u8 a0, u8 a1); -bool8 sub_81032C0(void); -bool8 sub_81032E8(void); -bool8 sub_810333C(void); -bool8 sub_81033DC(void); -bool8 sub_810341C(u8 a0); -bool8 sub_810347C(u8 a0); -void sub_81034F4(void); -void sub_8103540(void); -void sub_8103564(void); -void j5_08111E84(void); -void sub_8103668(void); -void sub_810380C(void); -void sub_8103830(void); -void sub_8103910(void); -void sub_8103A78(void); +static bool8 sub_8102EA0(struct Task *task); +static bool8 sub_8102EA4(struct Task *task); +static bool8 sub_8102EC0(struct Task *task); +static bool8 sub_8102F4C(struct Task *task); +static bool8 sub_8103008(struct Task *task); +static bool8 sub_810305C(void); +static bool8 sub_8103154(u8 a0, u8 a1); +static bool8 sub_81031B4(u8 a0, u8 a1); +static bool8 sub_81032C0(void); +static bool8 sub_81032E8(void); +static bool8 sub_810333C(void); +static bool8 sub_81033DC(void); +static bool8 sub_810341C(u8 a0); +static bool8 sub_810347C(u8 a0); +static void sub_81034F4(void); +static void sub_8103540(void); +static void sub_8103564(void); +static void j5_08111E84(void); +static void sub_8103668(void); +static void sub_810380C(void); +static void sub_8103830(void); +static void sub_8103910(void); +static void sub_8103A78(void); static void sub_8103C14(u8 a0); static void sub_8103C48(u8 taskId); static void sub_8103D50(u8 a0); -void sub_8103C78(struct Task *task, u8 taskId); -void sub_8103CAC(struct Task *task, u8 taskId); -void sub_8103CC8(struct Task *task, u8 taskId); +static void sub_8103C78(struct Task *task, u8 taskId); +static void sub_8103CAC(struct Task *task, u8 taskId); +static void sub_8103CC8(struct Task *task, u8 taskId); static void sub_8103D8C(u8 a0); static void sub_8103DC8(void); static void sub_8103E04(u8 a0); @@ -140,98 +140,94 @@ static bool8 sub_8103FA0(void); static void sub_8103FE8(u8 taskId); static void sub_8104048(void); static void sub_8104064(u8 unused); -bool8 sub_81040C8(void); +static bool8 sub_81040C8(void); static void sub_81040E8(u8 taskId); -void nullsub_68(struct Task *task); -void sub_810411C(struct Task *task); -void sub_8104144(struct Task *task); -void sub_81041AC(struct Task *task); +static void nullsub_68(struct Task *task); +static void sub_810411C(struct Task *task); +static void sub_8104144(struct Task *task); +static void sub_81041AC(struct Task *task); static void sub_810421C(struct Task *task); -void sub_810423C(u8 a0); +static void sub_810423C(u8 a0); static void sub_810430C(void); static bool8 sub_810432C(void); -void sub_810434C(u8 taskId); -void sub_810437C(struct Task *task); -void sub_81043EC(struct Task *task); -void sub_8104468(struct Task *task); -void sub_8104498(struct Task *task); -void sub_8104548(struct Task *task); -void sub_8104598(struct Task *task); -void sub_81045CC(struct Task *task); -void sub_810463C(struct Task *task); -void sub_81046C0(struct Task *task); -void sub_8104764(struct Task *task); -void sub_8104794(struct Task *task); -void sub_81047EC(struct Task *task); -void sub_8104860(struct Task *task); -void sub_81048A8(struct Task *task); -void sub_81048CC(struct Task *task); -void sub_8104940(struct Task *task); -void sub_81049C8(struct Task *task); -void sub_81049F8(struct Task *task); -void sub_8104A40(s16 a0, s16 a1); -void sub_8104A88(s16 a0); -void sub_8104AB8(u8 a0); -bool8 sub_8104AEC(void); -void sub_8104B0C(u8 taskId); -void sub_8104B3C(struct Task *task); -void sub_8104B60(struct Task *task); -void sub_8104B80(struct Task *task); -void sub_8104BC8(struct Task *task); -void sub_8104BFC(struct Task *task); -void sub_8104C44(struct Task *task); -void sub_8104C5C(void); -void sub_8104CAC(u8 arg0); -bool8 sub_8104E18(void); -void nullsub_69(struct Task *task); -void sub_8104E74(u8 taskId); -void sub_8104EA8(void); -void sub_8104F8C(void); -void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3); -void sub_81050C4(void); -void sub_8105100(void); -void sub_810514C(void); -void sub_81051C0(void); -void sub_8105284(void); -void sub_81052EC(void); -void sub_81053A0(void); -void sub_810545C(void); -void sub_81054B8(void); -void sub_8105524(void); -void sub_8105554(void); -void sub_8105578(void); -void sub_8105688(s16 a0); -void sub_81056C0(void); -void sub_81056F0(void); -void sub_81057E8(s16 a0); -void sub_8105804(void); -void sub_8105854(void); -void sub_81058A0(void); -void sub_81058C4(void); -void sub_81059B8(void); -void sub_81059E8(void); -bool8 sub_8105ACC(void); -void sub_8105AEC(void); -u8 sub_8105B1C(s16 x, s16 y); -void sub_8105B88(u8 spriteId); -u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4); -void sub_81063C0(void); -void sub_8106404(void); +static void sub_810434C(u8 taskId); +static void sub_810437C(struct Task *task); +static void sub_81043EC(struct Task *task); +static void sub_8104468(struct Task *task); +static void sub_8104498(struct Task *task); +static void sub_8104548(struct Task *task); +static void sub_8104598(struct Task *task); +static void sub_81045CC(struct Task *task); +static void sub_810463C(struct Task *task); +static void sub_81046C0(struct Task *task); +static void sub_8104764(struct Task *task); +static void sub_8104794(struct Task *task); +static void sub_81047EC(struct Task *task); +static void sub_8104860(struct Task *task); +static void sub_81048A8(struct Task *task); +static void sub_81048CC(struct Task *task); +static void sub_8104940(struct Task *task); +static void sub_81049C8(struct Task *task); +static void sub_81049F8(struct Task *task); +static void sub_8104A40(s16 a0, s16 a1); +static void sub_8104A88(s16 a0); +static void sub_8104AB8(u8 a0); +static bool8 sub_8104AEC(void); +static void sub_8104B0C(u8 taskId); +static void sub_8104B3C(struct Task *task); +static void sub_8104B60(struct Task *task); +static void sub_8104B80(struct Task *task); +static void sub_8104BC8(struct Task *task); +static void sub_8104BFC(struct Task *task); +static void sub_8104C44(struct Task *task); +static void sub_8104C5C(void); +static void sub_8104CAC(u8 arg0); +static bool8 sub_8104E18(void); +static void nullsub_69(struct Task *task); +static void sub_8104E74(u8 taskId); +static void sub_8104EA8(void); +static void sub_8104F8C(void); +static void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3); +static void sub_81050C4(void); +static void sub_8105100(void); +static void sub_810514C(void); +static void sub_81051C0(void); +static void sub_8105284(void); +static void sub_81052EC(void); +static void sub_81053A0(void); +static void sub_810545C(void); +static void sub_81054B8(void); +static void sub_8105524(void); +static void sub_8105554(void); +static void sub_8105578(void); +static void sub_8105688(s16 a0); +static void sub_81056C0(void); +static void sub_81056F0(void); +static void sub_81057E8(s16 a0); +static void sub_8105804(void); +static void sub_8105854(void); +static void sub_81058A0(void); +static void sub_81058C4(void); +static void sub_81059B8(void); +static void sub_81059E8(void); +static bool8 sub_8105ACC(void); +static void sub_8105AEC(void); +static u8 sub_8105B1C(s16 x, s16 y); +static void sub_8105B88(u8 spriteId); +static u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4); +static void sub_81063C0(void); +static void sub_8106404(void); static void sub_8106448(void); -void sub_81064B8(void); -void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); -void sub_81065DC(void); - -const struct UnkStruct1 *const gUnknown_083ED048[]; -extern const u16 gPalette_83EDE24[]; -extern const u8 gSlotMachine_Gfx[]; -extern const u16 gUnknown_08E95A18[]; -extern const u16 gUnknown_08E95AB8[]; -extern const u16 gUnknown_08E95FB8[]; -const u8 gUnknown_083ECD04[][3]; -const u8 gUnknown_083ECE3A[]; -const u16 gUnknown_083ECE42[]; -const u16 gUnknown_083ECE48[]; +static void sub_81064B8(void); +static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); +static void sub_81065DC(void); + +static const struct UnkStruct1 *const gUnknown_083ED048[]; +static const u16 gPalette_83EDE24[]; +static const u8 gUnknown_083ECD04[][3]; +static const u8 gUnknown_083ECE3A[]; +static const u16 gUnknown_083ECE42[]; +static const u16 gUnknown_083ECE48[]; void PlaySlotMachine(u8 arg0, void *ptr) { @@ -286,7 +282,7 @@ static void sub_8101954(void) UpdatePaletteFade(); } -void sub_810196C(void) +static void sub_810196C(void) { LoadOam(); ProcessSpriteCopyRequests(); @@ -304,7 +300,7 @@ static void sub_81019B0(u8 arg0, void *ptr) StoreWordInTwoHalfwords(task->data + 1, (intptr_t)ptr); } -void sub_81019EC(void) +static void sub_81019EC(void) { struct Task *task = &gTasks[FindTaskIdByFunc(nullsub_67)]; eSlotMachine->unk01 = task->data[0]; @@ -368,7 +364,7 @@ static void sub_8101B04(void) REG_BLDALPHA = 0x809; } -const s16 gUnknown_083ECCF8[][2]; +static const s16 gUnknown_083ECCF8[][2]; static void sub_8101BA4(void) { @@ -586,7 +582,7 @@ static bool8 sub_8101E3C(struct Task *task) return FALSE; } -void sub_8101F2C(const u8 *str) +static void sub_8101F2C(const u8 *str) { MenuDisplayMessageBox(); MenuPrint(str, 2, 15); @@ -958,7 +954,7 @@ static void sub_81024F0(void) } } -u8 sub_810250C(u8 a0) +static u8 sub_810250C(u8 a0) { u8 i; @@ -983,7 +979,7 @@ static bool8 sub_8102540(void) return FALSE; } -const u8 gUnknown_083ECD16[][6]; +static const u8 gUnknown_083ECD16[][6]; static u8 sub_8102578(void) { @@ -1001,7 +997,7 @@ static u8 sub_8102578(void) return i; } -const u8 gUnknown_083ECD28[][6]; +static const u8 gUnknown_083ECD28[][6]; static u8 sub_81025BC(void) { @@ -1035,10 +1031,10 @@ static u8 sub_81025BC(void) return i; } -const u8 gUnknown_083ECD46[][17]; -const u8 gUnknown_083ECDAC[][17]; +static const u8 gUnknown_083ECD46[][17]; +static const u8 gUnknown_083ECDAC[][17]; -u8 sub_810264C(u8 a0) +static u8 sub_810264C(u8 a0) { if (eSlotMachine->unk03 == 0) { @@ -1047,7 +1043,7 @@ u8 sub_810264C(u8 a0) return gUnknown_083ECDAC[a0][eSlotMachine->unk02]; } -void sub_8102680(void) +static void sub_8102680(void) { u8 rval; s16 i; @@ -1069,9 +1065,9 @@ void sub_8102680(void) eSlotMachine->unk05 = i; } -const u16 gUnknown_083ECE12[]; +static const u16 gUnknown_083ECE12[]; -bool8 sub_81026DC(u16 a0) +static bool8 sub_81026DC(u16 a0) { u16 rval = Random() & 0xff; if (rval < gUnknown_083ECE12[a0]) @@ -1081,10 +1077,10 @@ bool8 sub_81026DC(u16 a0) return FALSE; } -const u16 gUnknown_083ECE1C[][2]; -const u16 gUnknown_083ECE30[]; +static const u16 gUnknown_083ECE1C[][2]; +static const u16 gUnknown_083ECE30[]; -u16 dp15_jump_random_unknown(void) +static u16 dp15_jump_random_unknown(void) { u8 r4 = 0; u8 rval; @@ -1134,8 +1130,8 @@ static void sub_81027A0(void) } } -extern const u16 gUnknown_083ECE5A[]; -extern const u16 gUnknown_083ECE6C[]; +static const u16 gUnknown_083ECE5A[]; +static const u16 gUnknown_083ECE6C[]; static void sub_81027D0(void) { @@ -1219,7 +1215,7 @@ static void sub_810290C(void) } } -const u8 gUnknown_083ECE52[]; +static const u8 gUnknown_083ECE52[]; static u8 sub_81029D4(u8 c1, u8 c2, u8 c3) { @@ -1256,7 +1252,7 @@ static bool8 sub_8102A44(void) return FALSE; } -bool8 (*const gUnknown_083ECB20[])(struct Task *task) = { +static bool8 (*const gUnknown_083ECB20[])(struct Task *task) = { sub_8102A9C, sub_8102AD0, sub_8102B80 @@ -1267,7 +1263,7 @@ static void sub_8102A64(u8 taskId) while (gUnknown_083ECB20[gTasks[taskId].data[0]](gTasks + taskId)); } -bool8 sub_8102A9C(struct Task *task) +static bool8 sub_8102A9C(struct Task *task) { if (sub_8103E38()) { @@ -1281,7 +1277,7 @@ bool8 sub_8102A9C(struct Task *task) return FALSE; } -bool8 sub_8102AD0(struct Task *task) +static bool8 sub_8102AD0(struct Task *task) { if (!task->data[1]--) { @@ -1317,7 +1313,7 @@ bool8 sub_8102AD0(struct Task *task) return FALSE; } -bool8 sub_8102B80(struct Task *task) +static bool8 sub_8102B80(struct Task *task) { if (sub_8103E7C()) { @@ -1326,9 +1322,9 @@ bool8 sub_8102B80(struct Task *task) return FALSE; } -const u8 gUnknown_083ECCB2[][21]; +static const u8 gUnknown_083ECCB2[][21]; -u8 sub_8102BA4(u8 x, s16 y) +static u8 sub_8102BA4(u8 x, s16 y) { s16 offset = (eSlotMachine->unk28[x] + y) % 21; if (offset < 0) @@ -1338,7 +1334,7 @@ u8 sub_8102BA4(u8 x, s16 y) return gUnknown_083ECCB2[x][offset]; } -u8 sub_8102BF8(u8 x, s16 y) +static u8 sub_8102BF8(u8 x, s16 y) { s16 r6 = 0; if ((eSlotMachine->unk1C[x]) % 24) @@ -1346,9 +1342,9 @@ u8 sub_8102BF8(u8 x, s16 y) return sub_8102BA4(x, y + r6); } -const u8 gUnknown_083ECCF1[]; +static const u8 gUnknown_083ECCF1[]; -u8 sub_8102C48(s16 a0) +static u8 sub_8102C48(s16 a0) { s16 r1 = (eSlotMachine->unk16 + a0) % 6; if (r1 < 0) @@ -1356,14 +1352,14 @@ u8 sub_8102C48(s16 a0) return gUnknown_083ECCF1[r1]; } -void sub_8102C84(u8 a0, s16 a1) +static void sub_8102C84(u8 a0, s16 a1) { eSlotMachine->unk1C[a0] += a1; eSlotMachine->unk1C[a0] %= 504; eSlotMachine->unk28[a0] = 21 - eSlotMachine->unk1C[a0] / 24; } -s16 sub_8102CCC(u8 a0, s16 a1) +static s16 sub_8102CCC(u8 a0, s16 a1) { s16 r1 = eSlotMachine->unk1C[a0] % 24; if (r1 != 0) @@ -1376,14 +1372,14 @@ s16 sub_8102CCC(u8 a0, s16 a1) return r1; } -void sub_8102D28(s16 a0) +static void sub_8102D28(s16 a0) { eSlotMachine->unk14 += a0; eSlotMachine->unk14 %= 120; eSlotMachine->unk16 = 6 - eSlotMachine->unk14 / 20; } -s16 sub_8102D5C(s16 a0) +static s16 sub_8102D5C(s16 a0) { s16 r1 = eSlotMachine->unk14 % 20; if (r1 != 0) @@ -1424,7 +1420,7 @@ static bool8 sub_8102E40(u8 a0) return gTasks[eSlotMachine->unk3A[a0]].data[14]; } -bool8 (*const gUnknown_083ECB2C[])(struct Task *task) = { +static bool8 (*const gUnknown_083ECB2C[])(struct Task *task) = { sub_8102EA0, sub_8102EA4, sub_8102EC0, @@ -1437,29 +1433,29 @@ static void sub_8102E68(u8 taskId) while (gUnknown_083ECB2C[gTasks[taskId].data[0]](gTasks + taskId)); } -bool8 sub_8102EA0(struct Task *task) +static bool8 sub_8102EA0(struct Task *task) { return FALSE; } -bool8 sub_8102EA4(struct Task *task) +static bool8 sub_8102EA4(struct Task *task) { sub_8102C84(task->data[15], eSlotMachine->unk1A); return FALSE; } -bool8 (*const gUnknown_083ECB40[])(void) = { +static bool8 (*const gUnknown_083ECB40[])(void) = { sub_810305C, sub_81032C0, sub_81033DC }; -void (*const gUnknown_083ECB4C[])(void) = { +static void (*const gUnknown_083ECB4C[])(void) = { sub_81034F4, sub_8103540, sub_810380C }; -bool8 sub_8102EC0(struct Task *task) +static bool8 sub_8102EC0(struct Task *task) { task->data[0]++; eSlotMachine->unk34[task->data[15]] = 0; @@ -1473,7 +1469,7 @@ bool8 sub_8102EC0(struct Task *task) return TRUE; } -bool8 sub_8102F4C(struct Task *task) +static bool8 sub_8102F4C(struct Task *task) { u16 sp[] = {2, 4, 4, 4, 8}; s16 r2 = eSlotMachine->unk1C[task->data[15]] % 24; @@ -1496,7 +1492,7 @@ bool8 sub_8102F4C(struct Task *task) return FALSE; } -bool8 sub_8103008(struct Task *task) +static bool8 sub_8103008(struct Task *task) { eSlotMachine->unk22[task->data[15]] = task->data[1]; task->data[1] = -task->data[1]; @@ -1514,13 +1510,13 @@ bool8 sub_8103008(struct Task *task) return FALSE; } -bool8 (*const gUnknown_083ECB64[])(u8 a0, u8 a1) = { +static bool8 (*const gUnknown_083ECB64[])(u8 a0, u8 a1) = { sub_8103154, sub_81031B4, sub_81031B4 }; -bool8 sub_810305C(void) +static bool8 sub_810305C(void) { u8 r3 = sub_810250C(eSlotMachine->unk04); u8 r5 = r3; @@ -1532,7 +1528,7 @@ bool8 sub_810305C(void) return gUnknown_083ECB64[eSlotMachine->bet - 1](r5, r3); } -bool8 sub_81030A4(s16 a0, u8 a1, u8 a2) +static bool8 sub_81030A4(s16 a0, u8 a1, u8 a2) { u8 r1 = sub_8102BF8(0, a0); if (r1 == a1 || r1 == a2) @@ -1543,7 +1539,7 @@ bool8 sub_81030A4(s16 a0, u8 a1, u8 a2) return FALSE; } -bool8 sub_81030E0(s16 a0) +static bool8 sub_81030E0(s16 a0) { if (sub_8102BF8(0, 1 - a0) == 4 || sub_8102BF8(0, 2 - a0) == 4 || sub_8102BF8(0, 3 - a0) == 4) { @@ -1552,7 +1548,7 @@ bool8 sub_81030E0(s16 a0) return FALSE; } -bool8 sub_8103134(void) +static bool8 sub_8103134(void) { if (eSlotMachine->unk04 & 0xc2) { @@ -1561,7 +1557,7 @@ bool8 sub_8103134(void) return FALSE; } -bool8 sub_8103154(u8 a0, u8 a1) +static bool8 sub_8103154(u8 a0, u8 a1) { s16 i; @@ -1577,7 +1573,7 @@ bool8 sub_8103154(u8 a0, u8 a1) return FALSE; } -bool8 sub_81031B4(u8 a0, u8 a1) +static bool8 sub_81031B4(u8 a0, u8 a1) { s16 i; bool8 r6 = sub_8103134(); @@ -1621,18 +1617,18 @@ bool8 sub_81031B4(u8 a0, u8 a1) return FALSE; } -bool8 (*const gUnknown_083ECB70[])(void) = { +static bool8 (*const gUnknown_083ECB70[])(void) = { sub_81032E8, sub_81032E8, sub_810333C }; -bool8 sub_81032C0(void) +static bool8 sub_81032C0(void) { return gUnknown_083ECB70[eSlotMachine->bet - 1](); } -bool8 sub_81032E8(void) +static bool8 sub_81032E8(void) { s16 i; s16 unk34_0 = eSlotMachine->unk34[0]; @@ -1649,7 +1645,7 @@ bool8 sub_81032E8(void) return FALSE; } -bool8 sub_810333C(void) +static bool8 sub_810333C(void) { s16 i; if (sub_81032E8()) @@ -1683,13 +1679,13 @@ bool8 sub_810333C(void) return FALSE; } -bool8 (*const gUnknown_083ECB7C[])(u8 a0) = { +static bool8 (*const gUnknown_083ECB7C[])(u8 a0) = { sub_810341C, sub_810341C, sub_810347C }; -bool8 sub_81033DC(void) +static bool8 sub_81033DC(void) { u8 r3 = eSlotMachine->unk07; if (eSlotMachine->unk04 & 0x40) @@ -1703,7 +1699,7 @@ bool8 sub_81033DC(void) return gUnknown_083ECB7C[eSlotMachine->bet - 1](r3); } -bool8 sub_810341C(u8 a0) +static bool8 sub_810341C(u8 a0) { s16 i; s16 unk34_1 = eSlotMachine->unk34[1]; @@ -1720,7 +1716,7 @@ bool8 sub_810341C(u8 a0) return FALSE; } -bool8 sub_810347C(u8 a0) +static bool8 sub_810347C(u8 a0) { s16 i; s16 r8; @@ -1745,14 +1741,14 @@ bool8 sub_810347C(u8 a0) return FALSE; } -void sub_81034F4(void) +static void sub_81034F4(void) { s16 i; for (i = 0; sub_81030E0(i); i++); eSlotMachine->unk2E[0] = i; } -bool8 sub_8103520(u8 *a0) +static bool8 sub_8103520(u8 *a0) { if (*a0 == 0) { @@ -1767,18 +1763,18 @@ bool8 sub_8103520(u8 *a0) return FALSE; } -void (*const gUnknown_083ECB88[])(void) = { +static void (*const gUnknown_083ECB88[])(void) = { sub_8103564, j5_08111E84, sub_8103668 }; -void sub_8103540(void) +static void sub_8103540(void) { gUnknown_083ECB88[eSlotMachine->bet - 1](); } -void sub_8103564(void) +static void sub_8103564(void) { if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) { @@ -1799,7 +1795,7 @@ void sub_8103564(void) } } -void j5_08111E84(void) +static void j5_08111E84(void) { if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) { @@ -1822,7 +1818,7 @@ void j5_08111E84(void) #ifdef NONMATCHING // variable r6 is mistakenly plopped into r5, // and variable i is mistakenly plopped into r6 -void sub_8103668(void) +static void sub_8103668(void) { s16 i; s16 r6; @@ -2022,7 +2018,7 @@ __attribute__((naked)) void sub_8103668(void) } #endif // NONMATCHING -bool8 sub_8103764(u8 a0, u8 a1) +static bool8 sub_8103764(u8 a0, u8 a1) { if ((a0 == 0 && a1 == 1) || (a0 == 1 && a1 == 0)) { @@ -2031,7 +2027,7 @@ bool8 sub_8103764(u8 a0, u8 a1) return FALSE; } -bool8 sub_810378C(u8 a0, u8 a1, u8 a2) +static bool8 sub_810378C(u8 a0, u8 a1, u8 a2) { if ((a0 == 0 && a1 == 1 && a2 == 0) || (a0 == 1 && a1 == 0 && a2 == 1)) { @@ -2040,7 +2036,7 @@ bool8 sub_810378C(u8 a0, u8 a1, u8 a2) return FALSE; } -bool8 sub_81037BC(u8 a0, u8 a1, u8 a2) +static bool8 sub_81037BC(u8 a0, u8 a1, u8 a2) { if ((a0 == 0 && a1 == 1 && a2 == 0) || (a0 == 1 && a1 == 0 && a2 == 1) || @@ -2053,18 +2049,18 @@ bool8 sub_81037BC(u8 a0, u8 a1, u8 a2) return TRUE; } -void (*const gUnknown_083ECB94[])(void) = { +static void (*const gUnknown_083ECB94[])(void) = { sub_8103830, sub_8103910, sub_8103A78 }; -void sub_810380C(void) +static void sub_810380C(void) { gUnknown_083ECB94[eSlotMachine->bet - 1](); } -void sub_8103830(void) +static void sub_8103830(void) { s16 i = 0; u8 r5 = sub_8102BF8(0, 2 - eSlotMachine->unk2E[0]); @@ -2107,7 +2103,7 @@ void sub_8103830(void) eSlotMachine->unk2E[2] = i; } -void sub_8103910(void) +static void sub_8103910(void) { s16 sp0 = 0; s16 i; @@ -2155,7 +2151,7 @@ void sub_8103910(void) eSlotMachine->unk2E[2] = sp0; } -void sub_8103A78(void) +static void sub_8103A78(void) { u8 r6; u8 r5; @@ -2211,7 +2207,7 @@ static void sub_8103C14(u8 a0) sub_8103C48(taskId); } -void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId) = { +static void (*const gUnknown_083ECBA0[])(struct Task *task, u8 taskId) = { sub_8103C78, sub_8103CAC, sub_8103CC8 @@ -2222,29 +2218,29 @@ static void sub_8103C48(u8 taskId) gUnknown_083ECBA0[gTasks[taskId].data[0]](gTasks + taskId, taskId); } -const s16 gUnknown_083ECBAC[] = {5, 10, 15}; +static const s16 gUnknown_083ECBAC[] = {5, 10, 15}; -void sub_8103C78(struct Task *task, u8 taskId) +static void sub_8103C78(struct Task *task, u8 taskId) { sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x62, 0x63, 0x72, 0x73); task->data[0]++; } -void sub_8103CAC(struct Task *task, u8 taskId) +static void sub_8103CAC(struct Task *task, u8 taskId) { if (++task->data[1] > 11) task->data[0]++; } -void sub_8103CC8(struct Task *task, u8 taskId) +static void sub_8103CC8(struct Task *task, u8 taskId) { sub_81065A8(gUnknown_083ECBAC[task->data[15]], 0x42, 0x43, 0x52, 0x53); DestroyTask(taskId); } -extern const u16 *const gUnknown_083EDD08[]; -const u16 *const gUnknown_083EDD1C[]; -const u8 gUnknown_083EDD30[]; +static const u16 *const gUnknown_083EDD08[]; +static const u16 *const gUnknown_083EDD1C[]; +static const u8 gUnknown_083EDD30[]; static void sub_8103D00(u8 a0) { @@ -2256,8 +2252,8 @@ static void sub_8103D28(u8 a0) LoadPalette(gUnknown_083EDD1C[a0], gUnknown_083EDD30[a0], 2); } -const u8 gUnknown_083EDD35[][2]; -const u8 gUnknown_083EDD3B[]; +static const u8 gUnknown_083EDD35[][2]; +static const u8 gUnknown_083EDD3B[]; static void sub_8103D50(u8 a0) { @@ -2368,8 +2364,8 @@ static void sub_8103F70(void) sub_8103FE8(taskId); } -const u16 *const gUnknown_083EDDA0[]; -const u16 *const gUnknown_083EDDAC; +static const u16 *const gUnknown_083EDDA0[]; +static const u16 *const gUnknown_083EDDAC; static bool8 sub_8103FA0(void) { @@ -2412,7 +2408,7 @@ static void sub_8104064(u8 unused) task->data[15] = 1; } -void sub_8104098(void) +static void sub_8104098(void) { struct Task *task = gTasks + eSlotMachine->unk3E; sub_810421C(task); @@ -2420,12 +2416,12 @@ void sub_8104098(void) task->data[15] = 1; } -bool8 sub_81040C8(void) +static bool8 sub_81040C8(void) { return gTasks[eSlotMachine->unk3E].data[15]; } -void (*const gUnknown_083ECBB4[])(struct Task *task) = { +static void (*const gUnknown_083ECBB4[])(struct Task *task) = { nullsub_68, sub_810411C, sub_8104144, @@ -2437,24 +2433,24 @@ static void sub_81040E8(u8 taskId) gUnknown_083ECBB4[gTasks[taskId].data[0]](gTasks + taskId); } -void nullsub_68(struct Task *task) +static void nullsub_68(struct Task *task) { } -void sub_810411C(struct Task *task) +static void sub_810411C(struct Task *task) { task->data[2] = sub_8105B1C((task->data[1] << 3) + 20, 20); task->data[0]++; } -const u16 gUnknown_083ECBC4[][2] = { +static const u16 gUnknown_083ECBC4[][2] = { {0x9e, 0x6e}, {0x9f, 0x6f}, {0xaf, 0x7f} }; -void sub_8104144(struct Task *task) +static void sub_8104144(struct Task *task) { u16 *vaddr = (u16 *)BG_SCREEN_ADDR(29); if (gSprites[task->data[2]].data[7]) @@ -2472,7 +2468,7 @@ void sub_8104144(struct Task *task) } } -void sub_81041AC(struct Task *task) +static void sub_81041AC(struct Task *task) { u16 *vaddr = (u16 *)BG_SCREEN_ADDR(29); s16 r4 = task->data[1] + 2; @@ -2503,7 +2499,7 @@ static void sub_810421C(struct Task *task) task->data[i] = 0; } -void sub_810423C(u8 a0) +static void sub_810423C(u8 a0) { s16 i; u8 r3; @@ -2543,7 +2539,7 @@ static bool8 sub_810432C(void) return FALSE; } -void (*const gUnknown_083ECBD0[])(struct Task *task) = { +static void (*const gUnknown_083ECBD0[])(struct Task *task) = { sub_810437C, sub_81043EC, sub_8104468, @@ -2565,12 +2561,12 @@ void (*const gUnknown_083ECBD0[])(struct Task *task) = { sub_81049F8 }; -void sub_810434C(u8 taskId) +static void sub_810434C(u8 taskId) { gUnknown_083ECBD0[gTasks[taskId].data[0]](gTasks + taskId); } -void sub_810437C(struct Task *task) +static void sub_810437C(struct Task *task) { eSlotMachine->unk0A = 0; eSlotMachine->unk14 = 0; @@ -2594,7 +2590,7 @@ void sub_810437C(struct Task *task) PlayNewMapMusic(BGM_BD_TIME); } -void sub_81043EC(struct Task *task) +static void sub_81043EC(struct Task *task) { s16 r3; gSpriteCoordOffsetX -= 8; @@ -2615,7 +2611,7 @@ void sub_81043EC(struct Task *task) sub_8102D28(task->data[4] >> 8); } -void sub_8104468(struct Task *task) +static void sub_8104468(struct Task *task) { sub_8102D28(task->data[4] >> 8); if (++task->data[5] >= 60) @@ -2626,7 +2622,7 @@ void sub_8104468(struct Task *task) } } -void sub_8104498(struct Task *task) +static void sub_8104498(struct Task *task) { int r5; u8 sp0[] = {1, 1, 2, 2}; @@ -2647,7 +2643,7 @@ void sub_8104498(struct Task *task) } } -void sub_8104548(struct Task *task) +static void sub_8104548(struct Task *task) { sub_8102D28(task->data[4] >> 8); if (++task->data[5] >= 80) @@ -2659,7 +2655,7 @@ void sub_8104548(struct Task *task) } } -void sub_8104598(struct Task *task) +static void sub_8104598(struct Task *task) { sub_8102D28(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x80; @@ -2670,7 +2666,7 @@ void sub_8104598(struct Task *task) } } -void sub_81045CC(struct Task *task) +static void sub_81045CC(struct Task *task) { sub_8102D28(task->data[4] >> 8); task->data[4] = (u8)task->data[4] + 0x40; @@ -2696,7 +2692,7 @@ void sub_81045CC(struct Task *task) } } -void sub_810463C(struct Task *task) +static void sub_810463C(struct Task *task) { s16 r5 = eSlotMachine->unk14 % 20; if (r5) @@ -2717,7 +2713,7 @@ void sub_810463C(struct Task *task) } } -void sub_81046C0(struct Task *task) +static void sub_81046C0(struct Task *task) { if (++task->data[4] >= 60) { @@ -2746,7 +2742,7 @@ void sub_81046C0(struct Task *task) } } -void sub_8104764(struct Task *task) +static void sub_8104764(struct Task *task) { if ((task->data[4] == 0 || --task->data[4] == 0) && !sub_81040C8()) { @@ -2754,7 +2750,7 @@ void sub_8104764(struct Task *task) } } -void sub_8104794(struct Task *task) +static void sub_8104794(struct Task *task) { s16 r4; gSpriteCoordOffsetX -= 8; @@ -2772,7 +2768,7 @@ void sub_8104794(struct Task *task) } } -void sub_81047EC(struct Task *task) +static void sub_81047EC(struct Task *task) { eSlotMachine->unk0B = 0; eSlotMachine->unk0A = eSlotMachine->unk05; @@ -2797,7 +2793,7 @@ void sub_81047EC(struct Task *task) } } -void sub_8104860(struct Task *task) +static void sub_8104860(struct Task *task) { if (eSlotMachine->unk1A == task->data[1]) { @@ -2809,7 +2805,7 @@ void sub_8104860(struct Task *task) } } -void sub_81048A8(struct Task *task) +static void sub_81048A8(struct Task *task) { if (sub_8104E18()) { @@ -2817,7 +2813,7 @@ void sub_81048A8(struct Task *task) } } -void sub_81048CC(struct Task *task) +static void sub_81048CC(struct Task *task) { sub_81054B8(); sub_81056C0(); @@ -2833,7 +2829,7 @@ void sub_81048CC(struct Task *task) PlaySE(SE_W153); } -void sub_8104940(struct Task *task) +static void sub_8104940(struct Task *task) { gSpriteCoordOffsetY = task->data[4]; REG_BG1VOFS = task->data[4]; @@ -2853,7 +2849,7 @@ void sub_8104940(struct Task *task) } } -void sub_81049C8(struct Task *task) +static void sub_81049C8(struct Task *task) { gSpriteCoordOffsetY = 0; REG_BG1VOFS = 0; @@ -2864,7 +2860,7 @@ void sub_81049C8(struct Task *task) } } -void sub_81049F8(struct Task *task) +static void sub_81049F8(struct Task *task) { gSpriteCoordOffsetX = 0; REG_BG1HOFS = 0; @@ -2876,9 +2872,9 @@ void sub_81049F8(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_810434C)); } -extern const u16 gReelTimeWindowTilemap[]; +static const u16 gReelTimeWindowTilemap[]; -void sub_8104A40(s16 a0, s16 a1) +static void sub_8104A40(s16 a0, s16 a1) { s16 i; @@ -2889,7 +2885,7 @@ void sub_8104A40(s16 a0, s16 a1) } } -void sub_8104A88(s16 a0) +static void sub_8104A88(s16 a0) { s16 i; @@ -2899,21 +2895,21 @@ void sub_8104A88(s16 a0) } } -void sub_8104AB8(u8 a0) +static void sub_8104AB8(u8 a0) { u8 taskId = CreateTask(sub_8104B0C, 1); gTasks[taskId].data[1] = a0; sub_8104B0C(taskId); } -bool8 sub_8104AEC(void) +static bool8 sub_8104AEC(void) { if (FindTaskIdByFunc(sub_8104B0C) == 0xFF) return TRUE; return FALSE; } -void (*const gUnknown_083ECC30[])(struct Task *task) = { +static void (*const gUnknown_083ECC30[])(struct Task *task) = { sub_8104B3C, sub_8104B60, sub_8104B80, @@ -2925,18 +2921,18 @@ void (*const gUnknown_083ECC30[])(struct Task *task) = { sub_8104C44 }; -void sub_8104B0C(u8 taskId) +static void sub_8104B0C(u8 taskId) { gUnknown_083ECC30[gTasks[taskId].data[0]](gTasks + taskId); } -void sub_8104B3C(struct Task *task) +static void sub_8104B3C(struct Task *task) { BeginNormalPaletteFade(-1, 0, 0, 16, 0); task->data[0]++; } -void sub_8104B60(struct Task *task) +static void sub_8104B60(struct Task *task) { if (!gPaletteFade.active) { @@ -2944,7 +2940,7 @@ void sub_8104B60(struct Task *task) } } -void sub_8104B80(struct Task *task) +static void sub_8104B80(struct Task *task) { sub_8104DA4(); sub_81065DC(); @@ -2954,7 +2950,7 @@ void sub_8104B80(struct Task *task) task->data[0]++; } -void sub_8104BC8(struct Task *task) +static void sub_8104BC8(struct Task *task) { if (gMain.newKeys & (B_BUTTON | SELECT_BUTTON)) { @@ -2963,7 +2959,7 @@ void sub_8104BC8(struct Task *task) } } -void sub_8104BFC(struct Task *task) +static void sub_8104BFC(struct Task *task) { MenuZeroFillScreen(); BasicInitMenuWindow(&gWindowConfig_81E7128); @@ -2974,12 +2970,12 @@ void sub_8104BFC(struct Task *task) task->data[0]++; } -void sub_8104C44(struct Task *task) +static void sub_8104C44(struct Task *task) { DestroyTask(FindTaskIdByFunc(sub_8104B0C)); } -void sub_8104C5C(void) +static void sub_8104C5C(void) { u8 i; struct Task *task; @@ -2995,7 +2991,7 @@ void sub_8104C5C(void) static void LoadSlotMachineWheelOverlay(void); -void sub_8104CAC(u8 arg0) { +static void sub_8104CAC(u8 arg0) { u8 i; struct Task *task; @@ -3023,7 +3019,7 @@ void sub_8104CAC(u8 arg0) { } } -void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) +static void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) { u8 i; struct Task *task = gTasks + eSlotMachine->unk3D; @@ -3037,7 +3033,7 @@ void sub_8104D30(u8 a0, SpriteCallback a1, s16 a2, s16 a3, s16 a4) } } -void (*const gUnknown_083ED064[])(void); +static void (*const gUnknown_083ED064[])(void); void sub_8104DA4(void) { @@ -3055,7 +3051,7 @@ void sub_8104DA4(void) } } -bool8 sub_8104E18(void) +static bool8 sub_8104E18(void) { u8 i; struct Task *task = gTasks + eSlotMachine->unk3D; @@ -3070,23 +3066,23 @@ bool8 sub_8104E18(void) return TRUE; } -void (*const gUnknown_083ECC54[])(struct Task *task) = { +static void (*const gUnknown_083ECC54[])(struct Task *task) = { nullsub_69 }; -void sub_8104E74(u8 taskId) +static void sub_8104E74(u8 taskId) { gUnknown_083ECC54[gTasks[taskId].data[0]](gTasks + taskId); } -void nullsub_69(struct Task *task) +static void nullsub_69(struct Task *task) { } -extern const struct SpriteTemplate gSpriteTemplate_83ED414; +static const struct SpriteTemplate gSpriteTemplate_83ED414; -void sub_8104EA8(void) +static void sub_8104EA8(void) { s16 i; s16 j; @@ -3104,7 +3100,7 @@ void sub_8104EA8(void) } } -void sub_8104F18(struct Sprite *sprite) +static void sub_8104F18(struct Sprite *sprite) { sprite->data[2] = eSlotMachine->unk1C[sprite->data[0]] + sprite->data[1]; sprite->data[2] %= 120; @@ -3113,7 +3109,7 @@ void sub_8104F18(struct Sprite *sprite) SetSpriteSheetFrameTileNum(sprite); } -void sub_8104F8C(void) +static void sub_8104F8C(void) { s16 i; s16 x; @@ -3127,9 +3123,9 @@ void sub_8104F8C(void) } } -extern const struct SpriteTemplate gSpriteTemplate_83ED42C; +static const struct SpriteTemplate gSpriteTemplate_83ED42C; -void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3) +static void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3) { struct Sprite *sprite = gSprites + CreateSprite(&gSpriteTemplate_83ED42C, x, y, 13); sprite->oam.priority = 2; @@ -3139,7 +3135,7 @@ void sub_8104FF4(s16 x, s16 y, u8 a2, s16 a3) sprite->data[3] = -1; } -void sub_810506C(struct Sprite *sprite) +static void sub_810506C(struct Sprite *sprite) { u16 tag = eSlotMachine->coins; if (sprite->data[0]) @@ -3155,19 +3151,19 @@ void sub_810506C(struct Sprite *sprite) } } -extern const struct SpriteTemplate gSpriteTemplate_83ED444; -extern const struct SubspriteTable gSubspriteTables_83ED704[]; +static const struct SpriteTemplate gSpriteTemplate_83ED444; +static const struct SubspriteTable gSubspriteTables_83ED704[]; -void sub_81050C4(void) +static void sub_81050C4(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED444, 0x58, 0x48, 15); gSprites[spriteId].oam.priority = 3; SetSubspriteTables(gSprites + spriteId, gSubspriteTables_83ED704); } -extern const struct SpriteTemplate gSpriteTemplate_83ED45C; +static const struct SpriteTemplate gSpriteTemplate_83ED45C; -void sub_8105100(void) +static void sub_8105100(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED45C, 0x118, 0x50, 1); gSprites[spriteId].oam.priority = 1; @@ -3175,12 +3171,12 @@ void sub_8105100(void) eSlotMachine->unk3F = spriteId; } -void sub_810514C(void) +static void sub_810514C(void) { DestroySprite(gSprites + eSlotMachine->unk3F); } -void sub_8105170(struct Sprite *sprite) +static void sub_8105170(struct Sprite *sprite) { sprite->pos2.y = sprite->pos2.x = 0; if (sprite->animNum == 4) @@ -3193,12 +3189,12 @@ void sub_8105170(struct Sprite *sprite) } } -extern const struct SpriteTemplate gSpriteTemplate_83ED474; -extern const struct SpriteTemplate gSpriteTemplate_83ED48C; -extern const struct SubspriteTable gSubspriteTables_83ED73C[]; -extern const struct SubspriteTable gSubspriteTables_83ED75C[]; +static const struct SpriteTemplate gSpriteTemplate_83ED474; +static const struct SpriteTemplate gSpriteTemplate_83ED48C; +static const struct SubspriteTable gSubspriteTables_83ED73C[]; +static const struct SubspriteTable gSubspriteTables_83ED75C[]; -void sub_81051C0(void) +static void sub_81051C0(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED474, 0x170, 0x34, 7); struct Sprite *sprite = gSprites + spriteId; @@ -3215,10 +3211,10 @@ void sub_81051C0(void) eSlotMachine->unk49[1] = spriteId; } -extern const struct SpriteTemplate gSpriteTemplate_83ED4A4; -extern const struct SubspriteTable gSubspriteTables_83ED78C[]; +static const struct SpriteTemplate gSpriteTemplate_83ED4A4; +static const struct SubspriteTable gSubspriteTables_83ED78C[]; -void sub_8105284(void) +static void sub_8105284(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4A4, 0xa8 - gSpriteCoordOffsetX, 0x50, 7); struct Sprite *sprite = gSprites + spriteId; @@ -3228,9 +3224,9 @@ void sub_8105284(void) eSlotMachine->unk42 = spriteId; } -extern const struct SpriteTemplate gSpriteTemplate_83ED4BC; +static const struct SpriteTemplate gSpriteTemplate_83ED4BC; -void sub_81052EC(void) +static void sub_81052EC(void) { u8 i; s16 r5; @@ -3245,7 +3241,7 @@ void sub_81052EC(void) } } -void sub_810535C(struct Sprite *sprite) +static void sub_810535C(struct Sprite *sprite) { s16 r0 = (u16)(eSlotMachine->unk14 + sprite->data[7]); r0 %= 40; @@ -3253,10 +3249,10 @@ void sub_810535C(struct Sprite *sprite) StartSpriteAnimIfDifferent(sprite, sub_8102C48(r0 / 20)); } -extern const struct SpriteTemplate gSpriteTemplate_83ED4D4; -extern const struct SubspriteTable gSubspriteTables_83ED7B4[]; +static const struct SpriteTemplate gSpriteTemplate_83ED4D4; +static const struct SubspriteTable gSubspriteTables_83ED7B4[]; -void sub_81053A0(void) +static void sub_81053A0(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4D4, 0x170, 0x64, 9); struct Sprite *sprite = gSprites + spriteId; @@ -3273,10 +3269,10 @@ void sub_81053A0(void) eSlotMachine->unk4E[1] = spriteId; } -extern const struct SpriteTemplate gSpriteTemplate_83ED4EC; -extern const struct SubspriteTable gSubspriteTables_83ED7D4[]; +static const struct SpriteTemplate gSpriteTemplate_83ED4EC; +static const struct SubspriteTable gSubspriteTables_83ED7D4[]; -void sub_810545C(void) +static void sub_810545C(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED4EC, 0x170, 0x4c, 11); struct Sprite *sprite = gSprites + spriteId; @@ -3286,7 +3282,7 @@ void sub_810545C(void) eSlotMachine->unk40 = spriteId; } -void sub_81054B8(void) +static void sub_81054B8(void) { u8 i; @@ -3301,7 +3297,7 @@ void sub_81054B8(void) } } -void sub_8105524(void) +static void sub_8105524(void) { u8 i; for (i = 0; i < 2; i++) @@ -3310,14 +3306,14 @@ void sub_8105524(void) } } -void sub_8105554(void) +static void sub_8105554(void) { DestroySprite(gSprites + eSlotMachine->unk42); } -extern const struct SpriteTemplate gSpriteTemplate_83ED504; +static const struct SpriteTemplate gSpriteTemplate_83ED504; -void sub_8105578(void) +static void sub_8105578(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED504, 0x98, 0x20, 5); struct Sprite *sprite = gSprites + spriteId; @@ -3338,7 +3334,7 @@ void sub_8105578(void) sprite->data[7] = 0x20; } -void sub_810562C(struct Sprite *sprite) +static void sub_810562C(struct Sprite *sprite) { if (sprite->data[0] != 0) { @@ -3360,13 +3356,13 @@ void sub_810562C(struct Sprite *sprite) } } -void sub_8105688(s16 a0) +static void sub_8105688(s16 a0) { gSprites[eSlotMachine->unk50[0]].data[7] = a0; gSprites[eSlotMachine->unk50[1]].data[7] = a0; } -void sub_81056C0(void) +static void sub_81056C0(void) { u8 i; @@ -3376,9 +3372,9 @@ void sub_81056C0(void) } } -extern const struct SpriteTemplate gSpriteTemplate_83ED51C; +static const struct SpriteTemplate gSpriteTemplate_83ED51C; -void sub_81056F0(void) +static void sub_81056F0(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED51C, 0x48, 0x50, 3); gSprites[spriteId].oam.priority = 1; @@ -3394,9 +3390,9 @@ void sub_81056F0(void) eSlotMachine->unk52[1] = spriteId; } -extern const u8 gUnknown_083ECC58[2]; // don't remove this until decompiled through gUnknown_083ECCF8 +static const u8 gUnknown_083ECC58[2]; // don't remove this until decompiled through gUnknown_083ECCF8 -void sub_8105784(struct Sprite *sprite) +static void sub_8105784(struct Sprite *sprite) { u8 sp[] = {16, 0}; if (sprite->data[0] && --sprite->data[6] <= 0) @@ -3408,12 +3404,12 @@ void sub_8105784(struct Sprite *sprite) } } -void sub_81057E8(s16 a0) +static void sub_81057E8(s16 a0) { gSprites[eSlotMachine->unk52[0]].data[7] = a0; } -void sub_8105804(void) +static void sub_8105804(void) { u8 i; MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(7) << 4) + 0x103, 0, 0, 0); @@ -3423,28 +3419,28 @@ void sub_8105804(void) } } -extern const struct SpriteTemplate gSpriteTemplate_83ED534; +static const struct SpriteTemplate gSpriteTemplate_83ED534; -void sub_8105854(void) +static void sub_8105854(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED534, 0xa8, 0x50, 6); gSprites[spriteId].oam.priority = 1; eSlotMachine->unk41 = spriteId; } -void sub_8105894(struct Sprite *sprite) +static void sub_8105894(struct Sprite *sprite) { sprite->pos2.y = gSpriteCoordOffsetY; } -void sub_81058A0(void) +static void sub_81058A0(void) { DestroySprite(gSprites + eSlotMachine->unk41); } -extern const struct SpriteTemplate gSpriteTemplate_83ED54C; +static const struct SpriteTemplate gSpriteTemplate_83ED54C; -void sub_81058C4(void) +static void sub_81058C4(void) { u8 i; u16 sp[] = {0x0, 0x40, 0x80, 0xC0}; @@ -3459,7 +3455,7 @@ void sub_81058C4(void) } } -void sub_810594C(struct Sprite *sprite) +static void sub_810594C(struct Sprite *sprite) { sprite->data[0] -= 2; sprite->data[0] &= 0xff; @@ -3477,7 +3473,7 @@ void sub_810594C(struct Sprite *sprite) } } -void sub_81059B8(void) +static void sub_81059B8(void) { u8 i; for (i = 0; i < 4; i++) @@ -3486,9 +3482,9 @@ void sub_81059B8(void) } } -extern const struct SpriteTemplate gSpriteTemplate_83ED564; +static const struct SpriteTemplate gSpriteTemplate_83ED564; -void sub_81059E8(void) +static void sub_81059E8(void) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED564, 0xa8, 0x3c, 8); struct Sprite *sprite = gSprites + spriteId; @@ -3498,7 +3494,7 @@ void sub_81059E8(void) eSlotMachine->unk43 = spriteId; } -void sub_8105A38(struct Sprite *sprite) +static void sub_8105A38(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -3530,16 +3526,16 @@ u8 sub_8105ACC(void) return gSprites[eSlotMachine->unk43].data[7]; } -void sub_8105AEC(void) +static void sub_8105AEC(void) { struct Sprite *sprite = gSprites + eSlotMachine->unk43; FreeOamMatrix(sprite->oam.matrixNum); DestroySprite(sprite); } -extern const struct SpriteTemplate gSpriteTemplate_83ED6CC; +static const struct SpriteTemplate gSpriteTemplate_83ED6CC; -u8 sub_8105B1C(s16 x, s16 y) +static u8 sub_8105B1C(s16 x, s16 y) { u8 spriteId = CreateSprite(&gSpriteTemplate_83ED6CC, x, y, 12); struct Sprite *sprite = gSprites + spriteId; @@ -3549,31 +3545,31 @@ u8 sub_8105B1C(s16 x, s16 y) return spriteId; } -void sub_8105B70(struct Sprite *sprite) +static void sub_8105B70(struct Sprite *sprite) { if (sprite->affineAnimEnded) sprite->data[7] = 1; } -void sub_8105B88(u8 spriteId) +static void sub_8105B88(u8 spriteId) { struct Sprite *sprite = gSprites + spriteId; FreeOamMatrix(sprite->oam.matrixNum); DestroySprite(sprite); } -const s16 gUnknown_083ECE7E[][2]; -const SpriteCallback gUnknown_083ECF0C[]; +static const s16 gUnknown_083ECE7E[][2]; +static const SpriteCallback gUnknown_083ECF0C[]; u8 sub_8105BB4(u8 a0, u8 a1, s16 a2) { return sub_8105BF8(a0, gUnknown_083ECF0C[a1], gUnknown_083ECE7E[a1][0], gUnknown_083ECE7E[a1][1], a2); } -const struct SpriteTemplate *const gUnknown_083EDB5C[]; -const struct SubspriteTable *const gUnknown_083EDBC4[]; +static const struct SpriteTemplate *const gUnknown_083EDB5C[]; +static const struct SubspriteTable *const gUnknown_083EDBC4[]; -u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) +static u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) { u8 spriteId = CreateSprite(gUnknown_083EDB5C[templateIdx], x, y, 16); struct Sprite *sprite = gSprites + spriteId; @@ -3586,12 +3582,12 @@ u8 sub_8105BF8(u8 templateIdx, SpriteCallback callback, s16 x, s16 y, s16 a4) return spriteId; } -void sub_8105C64(struct Sprite *sprite) +static void sub_8105C64(struct Sprite *sprite) { sprite->data[7] = 0; } -void sub_8105C6C(struct Sprite *sprite) +static void sub_8105C6C(struct Sprite *sprite) { s16 sp0[] = {4, -4, 4, -4}; s16 sp8[] = {4, 4, -4, -4}; @@ -3610,26 +3606,26 @@ void sub_8105C6C(struct Sprite *sprite) } } -void sub_8105CF0(struct Sprite *sprite) +static void sub_8105CF0(struct Sprite *sprite) { sprite->hFlip = TRUE; sub_8105C6C(sprite); } -void sub_8105D08(struct Sprite *sprite) +static void sub_8105D08(struct Sprite *sprite) { sprite->vFlip = TRUE; sub_8105C6C(sprite); } -void sub_8105D20(struct Sprite *sprite) +static void sub_8105D20(struct Sprite *sprite) { sprite->hFlip = TRUE; sprite->vFlip = TRUE; sub_8105C6C(sprite); } -void sub_8105D3C(struct Sprite *sprite) +static void sub_8105D3C(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3660,7 +3656,7 @@ void sub_8105D3C(struct Sprite *sprite) } } -void sub_8105DA4(struct Sprite *sprite) +static void sub_8105DA4(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3691,7 +3687,7 @@ void sub_8105DA4(struct Sprite *sprite) } } -void sub_8105E08(struct Sprite *sprite) +static void sub_8105E08(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3733,7 +3729,7 @@ void sub_8105E08(struct Sprite *sprite) } } -void sub_8105EB4(struct Sprite *sprite) +static void sub_8105EB4(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3773,7 +3769,7 @@ void sub_8105EB4(struct Sprite *sprite) } } -void sub_8105F54(struct Sprite *sprite) +static void sub_8105F54(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3795,7 +3791,7 @@ void sub_8105F54(struct Sprite *sprite) } } -void sub_8105F9C(struct Sprite *sprite) +static void sub_8105F9C(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3831,9 +3827,9 @@ void sub_8105F9C(struct Sprite *sprite) } } -extern const u16 *const gUnknown_083EDE10[]; +static const u16 *const gUnknown_083EDE10[]; -void sub_8106058(struct Sprite *sprite) +static void sub_8106058(struct Sprite *sprite) { if (sprite->data[1] < 3) { @@ -3857,7 +3853,7 @@ void sub_8106058(struct Sprite *sprite) sprite->data[7] = 0; } -void sub_81060FC(struct Sprite *sprite) +static void sub_81060FC(struct Sprite *sprite) { s16 sp00[] = {0, -40, 0, 0, 48, 0, 24, 0}; s16 sp10[] = {-32, 0, -32, -48, 0, -48, 0, -48}; @@ -3902,7 +3898,7 @@ void sub_81060FC(struct Sprite *sprite) } } -void sub_81061C8(struct Sprite *sprite) +static void sub_81061C8(struct Sprite *sprite) { s16 sp0[] = {160, 192, 224, 104, 80, 64, 48, 24}; @@ -3919,7 +3915,7 @@ void sub_81061C8(struct Sprite *sprite) } } -void sub_8106230(struct Sprite *sprite) +static void sub_8106230(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3983,24 +3979,24 @@ void sub_8106230(struct Sprite *sprite) } } -void nullsub_70(void) +static void nullsub_70(void) { } -void sub_8106364(void) +static void sub_8106364(void) { REG_MOSAIC = 0; } -extern const u16 *const gUnknown_083EDE20; +static const u16 *const gUnknown_083EDE20; -void sub_8106370(void) +static void sub_8106370(void) { LoadPalette(gUnknown_083EDE20, (IndexOfSpritePaletteTag(6) << 4) + 0x100, 0x20); } -void sub_810639C(void) +static void sub_810639C(void) { eSlotMachine->win0h = 0xf0; eSlotMachine->win0v = 0xa0; @@ -4008,12 +4004,11 @@ void sub_810639C(void) eSlotMachine->winOut = 0x3f; } -extern const u8 gSlotMachineReelTimeLights_Gfx[]; -extern const u8 gUnknown_083EDE8C[]; -const struct SpriteSheet gUnknown_083EDC2C[]; -extern const struct SpritePalette gSlotMachineSpritePalettes[]; +static const u8 gUnknown_083EDE8C[]; +static const struct SpriteSheet gUnknown_083EDC2C[]; +static const struct SpritePalette gSlotMachineSpritePalettes[]; -void sub_81063C0(void) +static void sub_81063C0(void) { sub_8106404(); LZDecompressWram(gSlotMachineReelTimeLights_Gfx, ewram10000); @@ -4022,10 +4017,10 @@ void sub_81063C0(void) LoadSpritePalettes(gSlotMachineSpritePalettes); } -const u8 *const gUnknown_083EDCE4; -const struct SpriteSheet gUnknown_083EDCDC; +static const u8 *const gUnknown_083EDCE4; +static const struct SpriteSheet gUnknown_083EDCDC; -void sub_8106404(void) +static void sub_8106404(void) { u8 *dest = ewram10000; u8 i = 0; @@ -4068,7 +4063,7 @@ static void sub_8106448(void) { LoadPalette(gPalette_83EDE24, 208, 32); } -void sub_81064B8(void) { +static void sub_81064B8(void) { CpuCopy16(gUnknown_08E95AB8, BG_SCREEN_ADDR(29), 20 * 32 * 2); LoadSlotMachineWheelOverlay(); } @@ -4099,7 +4094,7 @@ static void LoadSlotMachineWheelOverlay(void) { } } -void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) { +static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) { u16 *vram = BG_SCREEN_ADDR(29); vram[15 * 32 + arg0] = arg1; @@ -4108,7 +4103,7 @@ void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) { vram[16 * 32 + 1 + arg0] = arg4; } -void sub_81065DC(void) { +static void sub_81065DC(void) { s16 y, x; u16 *screen; @@ -4124,23 +4119,23 @@ void sub_81065DC(void) { } } -const u8 gUnknown_083ECCB2[][21] = { +static const u8 gUnknown_083ECCB2[][21] = { {0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6}, {0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4}, {0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4} }; -const u8 gUnknown_083ECCF1[] = { +static const u8 gUnknown_083ECCF1[] = { 1, 0, 5, 4, 3, 2 }; -const s16 gUnknown_083ECCF8[][2] = { +static const s16 gUnknown_083ECCF8[][2] = { {0, 6}, {0, 10}, {0, 2} }; -const u8 gUnknown_083ECD04[][3] = { +static const u8 gUnknown_083ECD04[][3] = { {1, 1, 12}, {1, 1, 14}, {2, 2, 14}, @@ -4149,13 +4144,13 @@ const u8 gUnknown_083ECD04[][3] = { {3, 3, 16} }; -const u8 gUnknown_083ECD16[][6] = { +static const u8 gUnknown_083ECD16[][6] = { {25, 25, 30, 40, 40, 50}, {25, 25, 30, 30, 35, 35}, {25, 25, 30, 25, 25, 30} }; -const u8 gUnknown_083ECD28[][6] = { +static const u8 gUnknown_083ECD28[][6] = { {20, 25, 25, 20, 25, 25}, {12, 15, 15, 18, 19, 22}, {25, 25, 25, 30, 30, 40}, @@ -4163,7 +4158,7 @@ const u8 gUnknown_083ECD28[][6] = { {40, 40, 35, 35, 40, 40} }; -const u8 gUnknown_083ECD46[][17] = { +static const u8 gUnknown_083ECD46[][17] = { {243, 243, 243, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5}, { 5, 5, 5, 150, 150, 150, 150, 130, 130, 130, 130, 130, 130, 100, 100, 100, 5}, { 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40}, @@ -4172,7 +4167,7 @@ const u8 gUnknown_083ECD46[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6} }; -const u8 gUnknown_083ECDAC[][17] = { +static const u8 gUnknown_083ECDAC[][17] = { { 243, 243, 243, 200, 200, 200, 200, 160, 160, 160, 160, 160, 160, 70, 70, 70, 5}, { 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6}, { 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35}, @@ -4181,11 +4176,11 @@ const u8 gUnknown_083ECDAC[][17] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60} }; -const u16 gUnknown_083ECE12[] = { +static const u16 gUnknown_083ECE12[] = { 0x80, 0xaf, 0xc8, 0xe1, 0x100 }; -const u16 gUnknown_083ECE1C[][2] = { +static const u16 gUnknown_083ECE1C[][2] = { {10, 5}, {10, 10}, {10, 15}, @@ -4193,36 +4188,36 @@ const u16 gUnknown_083ECE1C[][2] = { {10, 35} }; -const u16 gUnknown_083ECE30[] = { +static const u16 gUnknown_083ECE30[] = { 0, 5, 10, 15, 20 }; -const u8 gUnknown_083ECE3A[] = { +static const u8 gUnknown_083ECE3A[] = { 6, 4, 3, 2, 5, 0, 0, 0 }; -const u16 gUnknown_083ECE42[] = { +static const u16 gUnknown_083ECE42[] = { 0x80, 0x20, 0x40 }; -const u16 gUnknown_083ECE48[] = { +static const u16 gUnknown_083ECE48[] = { 0x10, 0x08, 0x04, 0x02, 0x01 }; -const u8 gUnknown_083ECE52[] = { +static const u8 gUnknown_083ECE52[] = { 7, 8, 4, 3, 0, 5, 2 }; -const u16 gUnknown_083ECE5A[] = { +static const u16 gUnknown_083ECE5A[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x100 }; -const u16 gUnknown_083ECE6C[] = { +static const u16 gUnknown_083ECE6C[] = { 2, 4, 0, 6, 12, 3, 90, 300, 300 }; -const s16 gUnknown_083ECE7E[][2] = { +static const s16 gUnknown_083ECE7E[][2] = { { 0xd0, 0x38}, { 0xb8, 0x00}, { 0xc8, 0x08}, @@ -4260,7 +4255,7 @@ const s16 gUnknown_083ECE7E[][2] = { { 0x00, 0x00} }; -const SpriteCallback gUnknown_083ECF0C[] = { +static const SpriteCallback gUnknown_083ECF0C[] = { sub_8105C64, sub_8105F54, sub_8105F54, @@ -4363,7 +4358,7 @@ static const struct UnkStruct1 Unknown_83ED020[] = { {255, 0, 0} }; -const struct UnkStruct1 *const gUnknown_083ED048[] = { +static const struct UnkStruct1 *const gUnknown_083ED048[] = { Unknown_83ECF98, Unknown_83ECFA8, Unknown_83ECFC4, @@ -4373,7 +4368,7 @@ const struct UnkStruct1 *const gUnknown_083ED048[] = { Unknown_83ECFF8 }; -void (*const gUnknown_083ED064[])(void) = { +static void (*const gUnknown_083ED064[])(void) = { sub_810639C, sub_8106364, sub_8106370, @@ -4384,7 +4379,7 @@ void (*const gUnknown_083ED064[])(void) = { }; -const struct OamData gOamData_83ED080 = { +static const struct OamData gOamData_83ED080 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4400,7 +4395,7 @@ const struct OamData gOamData_83ED080 = { .affineParam = 0 }; -const struct OamData gOamData_83ED088 = { +static const struct OamData gOamData_83ED088 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4416,7 +4411,7 @@ const struct OamData gOamData_83ED088 = { .affineParam = 0 }; -const struct OamData gOamData_83ED090 = { +static const struct OamData gOamData_83ED090 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4432,7 +4427,7 @@ const struct OamData gOamData_83ED090 = { .affineParam = 0 }; -const struct OamData gOamData_83ED098 = { +static const struct OamData gOamData_83ED098 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4448,7 +4443,7 @@ const struct OamData gOamData_83ED098 = { .affineParam = 0 }; -const struct OamData gOamData_83ED0A0 = { +static const struct OamData gOamData_83ED0A0 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4464,7 +4459,7 @@ const struct OamData gOamData_83ED0A0 = { .affineParam = 0 }; -const struct OamData gOamData_83ED0A8 = { +static const struct OamData gOamData_83ED0A8 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4480,7 +4475,7 @@ const struct OamData gOamData_83ED0A8 = { .affineParam = 0 }; -const struct OamData gOamData_83ED0B0 = { +static const struct OamData gOamData_83ED0B0 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4496,7 +4491,7 @@ const struct OamData gOamData_83ED0B0 = { .affineParam = 0 }; -const struct OamData gOamData_83ED0B8 = { +static const struct OamData gOamData_83ED0B8 = { .y = 0x0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, @@ -4512,7 +4507,7 @@ const struct OamData gOamData_83ED0B8 = { .affineParam = 0 }; -const struct SpriteFrameImage gSpriteImageTable_83ED0C0[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED0C0[] = { {ewram13200 + 0x0000, 0x800}, {ewram13200 + 0x0800, 0x800}, {ewram13200 + 0x1000, 0x800}, @@ -4520,19 +4515,19 @@ const struct SpriteFrameImage gSpriteImageTable_83ED0C0[] = { {ewram13200 + 0x2000, 0x800} }; -const struct SpriteFrameImage gSpriteImageTable_83ED0E8[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED0E8[] = { {ewram13200 + 0x2800, 0x300} }; -const struct SpriteFrameImage gSpriteImageTable_83ED0F0[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED0F0[] = { {ewram13200 + 0x2B00, 0x500} }; -const struct SpriteFrameImage gSpriteImageTable_83ED0F8[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED0F8[] = { {ewram13200 + 0x3000, 0x600} }; -const struct SpriteFrameImage gSpriteImageTable_83ED100[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED100[] = { {gSpriteImage_8E988E8, 0x80}, {gSpriteImage_8E98968, 0x80}, {gSpriteImage_8E989E8, 0x80}, @@ -4541,83 +4536,83 @@ const struct SpriteFrameImage gSpriteImageTable_83ED100[] = { {gSpriteImage_8E98B68, 0x80} }; -const struct SpriteFrameImage gSpriteImageTable_83ED130[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED130[] = { {gSpriteImage_8E991E8, 0x200} }; -const struct SpriteFrameImage gSpriteImageTable_83ED138[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED138[] = { {gSpriteImage_8E99808, 0x40} }; -const struct SpriteFrameImage gSpriteImageTable_83ED140[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED140[] = { {gSpriteImage_8E98BE8, 0x100}, {gSpriteImage_8E98CE8, 0x100} }; -const struct SpriteFrameImage gSpriteImageTable_83ED150[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED150[] = { {gSpriteImage_8E993E8, 0x400} }; -const struct SpriteFrameImage gSpriteImageTable_83ED158[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED158[] = { {gSpriteImage_8E98DE8, 0x200}, {gSpriteImage_8E98FE8, 0x200} }; -const struct SpriteFrameImage gSpriteImageTable_83ED168[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED168[] = { {gSpriteImage_8E98848, 0x20} }; -const struct SpriteFrameImage gSpriteImageTable_83ED170[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED170[] = { {gSpriteImage_8E98868, 0x80} }; -const struct SpriteFrameImage gSpriteImageTable_83ED178[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED178[] = { {ewram10000 + 0x0000, 0x600} }; -const struct SpriteFrameImage gSpriteImageTable_83ED180[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED180[] = { {ewram10000 + 0x0600, 0x200} }; -const struct SpriteFrameImage gSpriteImageTable_83ED188[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED188[] = { {ewram10000 + 0x0800, 0x200} }; -const struct SpriteFrameImage gSpriteImageTable_83ED190[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED190[] = { {ewram10000 + 0x0A00, 0x200} }; -const struct SpriteFrameImage gSpriteImageTable_83ED198[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED198[] = { {ewram10000 + 0x0C00, 0x300} }; -const struct SpriteFrameImage gSpriteImageTable_83ED1A0[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED1A0[] = { {ewram10000 + 0x1000, 0x400} }; -const struct SpriteFrameImage gSpriteImageTable_83ED1A8[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED1A8[] = { {ewram10000 + 0x1400, 0x200} }; -const struct SpriteFrameImage gSpriteImageTable_83ED1B0[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED1B0[] = { {ewram10000 + 0x1600, 0x300} }; -const struct SpriteFrameImage gSpriteImageTable_83ED1B8[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED1B8[] = { {ewram10000 + 0x1900, 0x300} }; -const struct SpriteFrameImage gSpriteImageTable_83ED1C0[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED1C0[] = { {ewram10000 + 0x1C00, 0x200}, {ewram10000 + 0x1E00, 0x200}, {ewram10000 + 0x1E00, 0x200} // is this a typo? }; -const struct SpriteFrameImage gSpriteImageTable_83ED1D8[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED1D8[] = { {ewram10000 + 0x2000, 0x280} }; -const struct SpriteFrameImage gSpriteImageTable_83ED1E0[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED1E0[] = { {ewram10000 + 0x2280, 0x80}, {ewram10000 + 0x2300, 0x80}, {ewram10000 + 0x2380, 0x80}, @@ -4625,124 +4620,124 @@ const struct SpriteFrameImage gSpriteImageTable_83ED1E0[] = { {ewram10000 + 0x2480, 0x80} }; -const struct SpriteFrameImage gSpriteImageTable_83ED208[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED208[] = { {ewram10000 + 0x2600, 0x480}, {ewram10000 + 0x2A80, 0x480} }; -const struct SpriteFrameImage gSpriteImageTable_83ED218[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED218[] = { {ewram10000 + 0x2F00, 0x180}, {ewram10000 + 0x3080, 0x180} }; -const struct SpriteFrameImage gSpriteImageTable_83ED228[] = { +static const struct SpriteFrameImage gSpriteImageTable_83ED228[] = { {gSpriteImage_8E98828, 0x20} }; -const union AnimCmd gSpriteAnim_83ED230[] = { +static const union AnimCmd gSpriteAnim_83ED230[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED238[] = { +static const union AnimCmd gSpriteAnim_83ED238[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED240[] = { +static const union AnimCmd gSpriteAnim_83ED240[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED248[] = { +static const union AnimCmd gSpriteAnim_83ED248[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED254[] = { +static const union AnimCmd gSpriteAnim_83ED254[] = { ANIMCMD_FRAME(1, 8), ANIMCMD_FRAME(0, 8), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED260[] = { +static const union AnimCmd gSpriteAnim_83ED260[] = { ANIMCMD_FRAME(1, 4), ANIMCMD_FRAME(0, 4), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED26C[] = { +static const union AnimCmd gSpriteAnim_83ED26C[] = { ANIMCMD_FRAME(2, 32), ANIMCMD_FRAME(3, 32), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED278[] = { +static const union AnimCmd gSpriteAnim_83ED278[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED280[] = { +static const union AnimCmd gSpriteAnim_83ED280[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED288[] = { +static const union AnimCmd gSpriteAnim_83ED288[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED290[] = { +static const union AnimCmd gSpriteAnim_83ED290[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED298[] = { +static const union AnimCmd gSpriteAnim_83ED298[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED2A0[] = { +static const union AnimCmd gSpriteAnim_83ED2A0[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED2A8[] = { +static const union AnimCmd gSpriteAnim_83ED2A8[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED2B0[] = { +static const union AnimCmd gSpriteAnim_83ED2B0[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED2BC[] = { +static const union AnimCmd gSpriteAnim_83ED2BC[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_FRAME(1, 16), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED2C8[] = { +static const union AnimCmd gSpriteAnim_83ED2C8[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED2D4[] = { +static const union AnimCmd gSpriteAnim_83ED2D4[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED2DC[] = { +static const union AnimCmd gSpriteAnim_83ED2DC[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED2E8[] = { +static const union AnimCmd gSpriteAnim_83ED2E8[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(0, 16), @@ -4750,45 +4745,45 @@ const union AnimCmd gSpriteAnim_83ED2E8[] = { ANIMCMD_JUMP(0) }; -const union AnimCmd gSpriteAnim_83ED2FC[] = { +static const union AnimCmd gSpriteAnim_83ED2FC[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED304[] = { +static const union AnimCmd gSpriteAnim_83ED304[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED30C[] = { +static const union AnimCmd gSpriteAnim_83ED30C[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED314[] = { +static const union AnimCmd gSpriteAnim_83ED314[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED31C[] = { +static const union AnimCmd gSpriteAnim_83ED31C[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END }; -const union AnimCmd gSpriteAnim_83ED324[] = { +static const union AnimCmd gSpriteAnim_83ED324[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END }; -const union AnimCmd *const gSpriteAnimTable_83ED32C[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED32C[] = { gSpriteAnim_83ED230 }; -const union AnimCmd *const gSpriteAnimTable_83ED330[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED330[] = { gSpriteAnim_83ED238 }; -const union AnimCmd *const gSpriteAnimTable_83ED334[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED334[] = { gSpriteAnim_83ED240, gSpriteAnim_83ED248, gSpriteAnim_83ED254, @@ -4797,7 +4792,7 @@ const union AnimCmd *const gSpriteAnimTable_83ED334[] = { gSpriteAnim_83ED278 }; -const union AnimCmd *const gSpriteAnimTable_83ED34C[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED34C[] = { gSpriteAnim_83ED280, gSpriteAnim_83ED288, gSpriteAnim_83ED290, @@ -4806,29 +4801,29 @@ const union AnimCmd *const gSpriteAnimTable_83ED34C[] = { gSpriteAnim_83ED2A8 }; -const union AnimCmd *const gSpriteAnimTable_83ED364[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED364[] = { gSpriteAnim_83ED2B0 }; -const union AnimCmd *const gSpriteAnimTable_83ED368[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED368[] = { gSpriteAnim_83ED2BC }; -const union AnimCmd *const gSpriteAnimTable_83ED36C[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED36C[] = { gSpriteAnim_83ED2C8, gSpriteAnim_83ED2D4 }; -const union AnimCmd *const gSpriteAnimTable_83ED374[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED374[] = { gSpriteAnim_83ED2DC }; -const union AnimCmd *const gSpriteAnimTable_83ED378[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED378[] = { gSpriteAnim_83ED2E8, gSpriteAnim_83ED2FC }; -const union AnimCmd *const gSpriteAnimTable_83ED380[] = { +static const union AnimCmd *const gSpriteAnimTable_83ED380[] = { gSpriteAnim_83ED304, gSpriteAnim_83ED30C, gSpriteAnim_83ED314, @@ -4836,7 +4831,7 @@ const union AnimCmd *const gSpriteAnimTable_83ED380[] = { gSpriteAnim_83ED324 }; -const union AffineAnimCmd gSpriteAffineAnim_83ED394[] = { +static const union AffineAnimCmd gSpriteAffineAnim_83ED394[] = { AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_LOOP(0), AFFINEANIMCMD_FRAME(0x1, 0x1, 0, 1), @@ -4844,11 +4839,11 @@ const union AffineAnimCmd gSpriteAffineAnim_83ED394[] = { AFFINEANIMCMD_END }; -const union AffineAnimCmd *const gSpriteAffineAnimTable_83ED3BC[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_83ED3BC[] = { gSpriteAffineAnim_83ED394 }; -const union AffineAnimCmd gSpriteAffineAnim_83ED3C0[] = { +static const union AffineAnimCmd gSpriteAffineAnim_83ED3C0[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 32), AFFINEANIMCMD_FRAME(0x0, 0x0, 6, 32), AFFINEANIMCMD_FRAME(0x0, 0x0, 4, 16), @@ -4861,142 +4856,142 @@ const union AffineAnimCmd gSpriteAffineAnim_83ED3C0[] = { AFFINEANIMCMD_END }; -const union AffineAnimCmd *const gSpriteAffineAnimTable_83ED410[] = { +static const union AffineAnimCmd *const gSpriteAffineAnimTable_83ED410[] = { gSpriteAffineAnim_83ED3C0 }; -const struct SpriteTemplate gSpriteTemplate_83ED414 = { +static const struct SpriteTemplate gSpriteTemplate_83ED414 = { 0, 0, &gOamData_83ED0A0, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_8104F18 }; -const struct SpriteTemplate gSpriteTemplate_83ED42C = { +static const struct SpriteTemplate gSpriteTemplate_83ED42C = { 7, 4, &gOamData_83ED088, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_810506C }; -const struct SpriteTemplate gSpriteTemplate_83ED444 = { +static const struct SpriteTemplate gSpriteTemplate_83ED444 = { 17, 0, &gOamData_83ED0B8, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED45C = { +static const struct SpriteTemplate gSpriteTemplate_83ED45C = { 0xFFFF, 1, &gOamData_83ED0B8, gSpriteAnimTable_83ED334, gSpriteImageTable_83ED0C0, gDummySpriteAffineAnimTable, sub_8105170 }; -const struct SpriteTemplate gSpriteTemplate_83ED474 = { +static const struct SpriteTemplate gSpriteTemplate_83ED474 = { 0xFFFF, 2, &gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0E8, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED48C = { +static const struct SpriteTemplate gSpriteTemplate_83ED48C = { 0xFFFF, 3, &gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F0, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED4A4 = { +static const struct SpriteTemplate gSpriteTemplate_83ED4A4 = { 0xFFFF, 3, &gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F8, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED4BC = { +static const struct SpriteTemplate gSpriteTemplate_83ED4BC = { 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED34C, gSpriteImageTable_83ED100, gDummySpriteAffineAnimTable, sub_810535C }; -const struct SpriteTemplate gSpriteTemplate_83ED4D4 = { +static const struct SpriteTemplate gSpriteTemplate_83ED4D4 = { 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED130, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED4EC = { +static const struct SpriteTemplate gSpriteTemplate_83ED4EC = { 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED138, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED504 = { +static const struct SpriteTemplate gSpriteTemplate_83ED504 = { 0xFFFF, 4, &gOamData_83ED098, gSpriteAnimTable_83ED364, gSpriteImageTable_83ED140, gDummySpriteAffineAnimTable, sub_810562C }; -const struct SpriteTemplate gSpriteTemplate_83ED51C = { +static const struct SpriteTemplate gSpriteTemplate_83ED51C = { 0xFFFF, 7, &gOamData_83ED0A8, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED150, gDummySpriteAffineAnimTable, sub_8105784 }; -const struct SpriteTemplate gSpriteTemplate_83ED534 = { +static const struct SpriteTemplate gSpriteTemplate_83ED534 = { 0xFFFF, 5, &gOamData_83ED0A0, gSpriteAnimTable_83ED368, gSpriteImageTable_83ED158, gDummySpriteAffineAnimTable, sub_8105894 }; -const struct SpriteTemplate gSpriteTemplate_83ED54C = { +static const struct SpriteTemplate gSpriteTemplate_83ED54C = { 0xFFFF, 4, &gOamData_83ED080, gSpriteAnimTable_83ED330, gSpriteImageTable_83ED168, gDummySpriteAffineAnimTable, sub_810594C }; -const struct SpriteTemplate gSpriteTemplate_83ED564 = { +static const struct SpriteTemplate gSpriteTemplate_83ED564 = { 0xFFFF, 4, &gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED170, gSpriteAffineAnimTable_83ED3BC, sub_8105A38 }; -const struct SpriteTemplate gSpriteTemplate_83ED57C = { +static const struct SpriteTemplate gSpriteTemplate_83ED57C = { 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED178, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED594 = { +static const struct SpriteTemplate gSpriteTemplate_83ED594 = { 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED180, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED5AC = { +static const struct SpriteTemplate gSpriteTemplate_83ED5AC = { 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED188, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED5C4 = { +static const struct SpriteTemplate gSpriteTemplate_83ED5C4 = { 18, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED190, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED5DC = { +static const struct SpriteTemplate gSpriteTemplate_83ED5DC = { 0xFFFF, 6, &gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED198, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED5F4 = { +static const struct SpriteTemplate gSpriteTemplate_83ED5F4 = { 0xFFFF, 6, &gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A0, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED60C = { +static const struct SpriteTemplate gSpriteTemplate_83ED60C = { 19, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A8, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED624 = { +static const struct SpriteTemplate gSpriteTemplate_83ED624 = { 20, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B0, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED63C = { +static const struct SpriteTemplate gSpriteTemplate_83ED63C = { 21, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B8, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED654 = { +static const struct SpriteTemplate gSpriteTemplate_83ED654 = { 0xFFFF, 6, &gOamData_83ED0A0, gSpriteAnimTable_83ED36C, gSpriteImageTable_83ED1C0, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED66C = { +static const struct SpriteTemplate gSpriteTemplate_83ED66C = { 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1D8, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED684 = { +static const struct SpriteTemplate gSpriteTemplate_83ED684 = { 0xFFFF, 6, &gOamData_83ED090, gSpriteAnimTable_83ED380, gSpriteImageTable_83ED1E0, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED69C = { +static const struct SpriteTemplate gSpriteTemplate_83ED69C = { 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED378, gSpriteImageTable_83ED208, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED6B4 = { +static const struct SpriteTemplate gSpriteTemplate_83ED6B4 = { 0xFFFF, 6, &gOamData_83ED080, gSpriteAnimTable_83ED374, gSpriteImageTable_83ED218, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; -const struct SpriteTemplate gSpriteTemplate_83ED6CC = { +static const struct SpriteTemplate gSpriteTemplate_83ED6CC = { 0xFFFF, 4, &gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70 }; -const struct Subsprite gSubspriteTable_83ED6E4[] = { +static const struct Subsprite gSubspriteTable_83ED6E4[] = { {-64, -64, ST_OAM_SQUARE, 3, 0x0, 3}, {0, -64, ST_OAM_SQUARE, 3, 0x0, 3}, {-64, 0, ST_OAM_SQUARE, 3, 0x0, 3}, {0, 0, ST_OAM_SQUARE, 3, 0x0, 3} }; -const struct SubspriteTable gSubspriteTables_83ED704[] = { +static const struct SubspriteTable gSubspriteTables_83ED704[] = { {4, gSubspriteTable_83ED6E4} }; -const struct Subsprite gSubspriteTable_83ED70C[] = { +static const struct Subsprite gSubspriteTable_83ED70C[] = { {-32, -12, ST_OAM_H_RECTANGLE, 1, 0x0, 1}, {0, -12, ST_OAM_H_RECTANGLE, 1, 0x4, 1}, {-32, -4, ST_OAM_H_RECTANGLE, 1, 0x8, 1}, @@ -5005,21 +5000,21 @@ const struct Subsprite gSubspriteTable_83ED70C[] = { {0, 4, ST_OAM_H_RECTANGLE, 1, 0x14, 1} }; -const struct SubspriteTable gSubspriteTables_83ED73C[] = { +static const struct SubspriteTable gSubspriteTables_83ED73C[] = { {6, gSubspriteTable_83ED70C} }; -const struct Subsprite gSubspriteTable_83ED744[] = { +static const struct Subsprite gSubspriteTable_83ED744[] = { {-32, -20, ST_OAM_H_RECTANGLE, 3, 0x0, 1}, {-32, 12, ST_OAM_H_RECTANGLE, 1, 0x20, 1}, {0, 12, ST_OAM_H_RECTANGLE, 1, 0x24, 1} }; -const struct SubspriteTable gSubspriteTables_83ED75C[] = { +static const struct SubspriteTable gSubspriteTables_83ED75C[] = { {3, gSubspriteTable_83ED744} }; -const struct Subsprite gSubspriteTable_83ED764[] = { +static const struct Subsprite gSubspriteTable_83ED764[] = { {-32, -24, ST_OAM_H_RECTANGLE, 3, 0x0, 1}, {-32, 8, ST_OAM_H_RECTANGLE, 1, 0x20, 1}, {0, 8, ST_OAM_H_RECTANGLE, 1, 0x24, 1}, @@ -5027,32 +5022,32 @@ const struct Subsprite gSubspriteTable_83ED764[] = { {0, 16, ST_OAM_H_RECTANGLE, 1, 0x2c, 1} }; -const struct SubspriteTable gSubspriteTables_83ED78C[] = { +static const struct SubspriteTable gSubspriteTables_83ED78C[] = { {5, gSubspriteTable_83ED764} }; -const struct Subsprite gSubspriteTable_83ED794[] = { +static const struct Subsprite gSubspriteTable_83ED794[] = { {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 1}, {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 1}, {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 1}, {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 1} }; -const struct SubspriteTable gSubspriteTables_83ED7B4[] = { +static const struct SubspriteTable gSubspriteTables_83ED7B4[] = { {4, gSubspriteTable_83ED794} }; -const struct Subsprite gSubspriteTable_83ED7BC[] = { +static const struct Subsprite gSubspriteTable_83ED7BC[] = { {-8, -12, ST_OAM_H_RECTANGLE, 0, 0x0, 1}, {-8, -4, ST_OAM_H_RECTANGLE, 0, 0x0, 1}, {-8, 4, ST_OAM_H_RECTANGLE, 0, 0x0, 1} }; -const struct SubspriteTable gSubspriteTables_83ED7D4[] = { +static const struct SubspriteTable gSubspriteTables_83ED7D4[] = { {3, gSubspriteTable_83ED7BC} }; -const struct Subsprite gSubspriteTable_83ED7DC[] = { +static const struct Subsprite gSubspriteTable_83ED7DC[] = { {-32, -24, ST_OAM_H_RECTANGLE, 3, 0x0, 3}, {-32, 8, ST_OAM_H_RECTANGLE, 1, 0x20, 3}, {0, 8, ST_OAM_H_RECTANGLE, 1, 0x24, 3}, @@ -5060,44 +5055,44 @@ const struct Subsprite gSubspriteTable_83ED7DC[] = { {0, 16, ST_OAM_H_RECTANGLE, 1, 0x2c, 3} }; -const struct SubspriteTable gSubspriteTables_83ED804[] = { +static const struct SubspriteTable gSubspriteTables_83ED804[] = { {5, gSubspriteTable_83ED7DC} }; -const struct Subsprite gSubspriteTable_83ED80C[] = { +static const struct Subsprite gSubspriteTable_83ED80C[] = { {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 3} }; -const struct SubspriteTable gSubspriteTables_83ED82C[] = { +static const struct SubspriteTable gSubspriteTables_83ED82C[] = { {4, gSubspriteTable_83ED80C} }; -const struct Subsprite gSubspriteTable_83ED834[] = { +static const struct Subsprite gSubspriteTable_83ED834[] = { {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 3} }; -const struct SubspriteTable gSubspriteTables_83ED854[] = { +static const struct SubspriteTable gSubspriteTables_83ED854[] = { {4, gSubspriteTable_83ED834} }; -const struct Subsprite gSubspriteTable_83ED85C[] = { +static const struct Subsprite gSubspriteTable_83ED85C[] = { {-32, -8, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, {0, -8, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, {-32, 0, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, {0, 0, ST_OAM_H_RECTANGLE, 1, 0xc, 3} }; -const struct SubspriteTable gSubspriteTables_83ED87C[] = { +static const struct SubspriteTable gSubspriteTables_83ED87C[] = { {4, gSubspriteTable_83ED85C} }; -const struct Subsprite gSubspriteTable_83ED884[] = { +static const struct Subsprite gSubspriteTable_83ED884[] = { {-32, -12, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, {0, -12, ST_OAM_H_RECTANGLE, 1, 0x4, 3}, {-32, -4, ST_OAM_H_RECTANGLE, 1, 0x8, 3}, @@ -5106,24 +5101,24 @@ const struct Subsprite gSubspriteTable_83ED884[] = { {0, 4, ST_OAM_H_RECTANGLE, 1, 0x14, 3} }; -const struct SubspriteTable gSubspriteTables_83ED8B4[] = { +static const struct SubspriteTable gSubspriteTables_83ED8B4[] = { {6, gSubspriteTable_83ED884} }; -const struct Subsprite gSubspriteTable_83ED8BC[] = { +static const struct Subsprite gSubspriteTable_83ED8BC[] = { {-16, -16, ST_OAM_SQUARE, 2, 0x0, 3} }; -const struct Subsprite gSubspriteTable_83ED8C4[] = { +static const struct Subsprite gSubspriteTable_83ED8C4[] = { {-8, -8, ST_OAM_SQUARE, 1, 0x10, 3} }; -const struct SubspriteTable gSubspriteTables_83ED8CC[] = { +static const struct SubspriteTable gSubspriteTables_83ED8CC[] = { {1, gSubspriteTable_83ED8BC}, {1, gSubspriteTable_83ED8C4} }; -const struct Subsprite gSubspriteTable_83ED8DC[] = { +static const struct Subsprite gSubspriteTable_83ED8DC[] = { {-24, -24, ST_OAM_H_RECTANGLE, 1, 0x0, 3}, {8, -24, ST_OAM_H_RECTANGLE, 0, 0x4, 3}, {-24, -16, ST_OAM_H_RECTANGLE, 1, 0x6, 3}, @@ -5138,102 +5133,102 @@ const struct Subsprite gSubspriteTable_83ED8DC[] = { {8, 16, ST_OAM_H_RECTANGLE, 0, 0x22, 3} }; -const struct SubspriteTable gSubspriteTables_83ED93C[] = { +static const struct SubspriteTable gSubspriteTables_83ED93C[] = { 12, gSubspriteTable_83ED8DC }; -const struct Subsprite gSubspriteTable_83ED944[] = { +static const struct Subsprite gSubspriteTable_83ED944[] = { {-16, -12, ST_OAM_H_RECTANGLE, 2, 0x0, 3}, {-16, 4, ST_OAM_H_RECTANGLE, 0, 0x8, 3}, {0, 4, ST_OAM_H_RECTANGLE, 0, 0xa, 3} }; -const struct SubspriteTable gSubspriteTables_83ED95C[] = { +static const struct SubspriteTable gSubspriteTables_83ED95C[] = { {3, gSubspriteTable_83ED944} }; -const struct Subsprite gSubspriteTable_83ED964[] = { +static const struct Subsprite gSubspriteTable_83ED964[] = { {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, {-8, 0, ST_OAM_H_RECTANGLE, 0, 0x8, 3} }; -const struct SubspriteTable gSubspriteTables_83ED974[] = { +static const struct SubspriteTable gSubspriteTables_83ED974[] = { {2, gSubspriteTable_83ED964} }; -const struct Subsprite gSubspriteTable_83ED97C[] = { +static const struct Subsprite gSubspriteTable_83ED97C[] = { {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x2, 3}, {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xa, 3} }; -const struct SubspriteTable gSubspriteTables_83ED98C[] = { +static const struct SubspriteTable gSubspriteTables_83ED98C[] = { {2, gSubspriteTable_83ED97C} }; -const struct Subsprite gSubspriteTable_83ED994[] = { +static const struct Subsprite gSubspriteTable_83ED994[] = { {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x4, 3}, {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xc, 3} }; -const struct SubspriteTable gSubspriteTables_83ED9A4[] = { +static const struct SubspriteTable gSubspriteTables_83ED9A4[] = { {2, gSubspriteTable_83ED994} }; -const struct Subsprite gSubspriteTable_83ED9AC[] = { +static const struct Subsprite gSubspriteTable_83ED9AC[] = { {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x6, 3}, {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xe, 3} }; -const struct SubspriteTable gSubspriteTables_83ED9BC[] = { +static const struct SubspriteTable gSubspriteTables_83ED9BC[] = { {2, gSubspriteTable_83ED9AC} }; -const struct Subsprite gSubspriteTable_83ED9C4[] = { +static const struct Subsprite gSubspriteTable_83ED9C4[] = { {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, {-8, 0, ST_OAM_H_RECTANGLE, 0, 0x8, 3} }; -const struct SubspriteTable gSubspriteTables_83ED9D4[] = { +static const struct SubspriteTable gSubspriteTables_83ED9D4[] = { {2, gSubspriteTable_83ED9C4} }; -const struct Subsprite gSubspriteTable_83ED9DC[] = { +static const struct Subsprite gSubspriteTable_83ED9DC[] = { {-4, -8, ST_OAM_SQUARE, 0, 0x2, 3}, {-4, 0, ST_OAM_SQUARE, 0, 0xa, 3} }; -const struct SubspriteTable gSubspriteTables_83ED9EC[] = { +static const struct SubspriteTable gSubspriteTables_83ED9EC[] = { {2, gSubspriteTable_83ED9DC} }; -const struct Subsprite gSubspriteTable_83ED9F4[] = { +static const struct Subsprite gSubspriteTable_83ED9F4[] = { {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x3, 3}, {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xb, 3} }; -const struct SubspriteTable gSubspriteTables_83EDA04[] = { +static const struct SubspriteTable gSubspriteTables_83EDA04[] = { {2, gSubspriteTable_83ED9F4} }; -const struct Subsprite gSubspriteTable_83EDA0C[] = { +static const struct Subsprite gSubspriteTable_83EDA0C[] = { {-4, -8, ST_OAM_SQUARE, 0, 0x5, 3}, {-4, 0, ST_OAM_SQUARE, 0, 0xd, 3} }; -const struct SubspriteTable gSubspriteTables_83EDA1C[] = { +static const struct SubspriteTable gSubspriteTables_83EDA1C[] = { {2, gSubspriteTable_83EDA0C} }; -const struct Subsprite gSubspriteTable_83EDA24[] = { +static const struct Subsprite gSubspriteTable_83EDA24[] = { {-8, -8, ST_OAM_H_RECTANGLE, 0, 0x6, 3}, {-8, 0, ST_OAM_H_RECTANGLE, 0, 0xe, 3} }; -const struct SubspriteTable gSubspriteTables_83EDA34[] = { +static const struct SubspriteTable gSubspriteTables_83EDA34[] = { {2, gSubspriteTable_83EDA24} }; -const struct Subsprite gSubspriteTable_83EDA3C[] = { +static const struct Subsprite gSubspriteTable_83EDA3C[] = { {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, {4, -12, ST_OAM_SQUARE, 0, 0x2, 3}, {-12, -4, ST_OAM_H_RECTANGLE, 0, 0x8, 3}, @@ -5242,21 +5237,21 @@ const struct Subsprite gSubspriteTable_83EDA3C[] = { {4, 4, ST_OAM_SQUARE, 0, 0x12, 3} }; -const struct SubspriteTable gSubspriteTables_83EDA6C[] = { +static const struct SubspriteTable gSubspriteTables_83EDA6C[] = { {6, gSubspriteTable_83EDA3C} }; -const struct Subsprite gSubspriteTable_83EDA74[] = { +static const struct Subsprite gSubspriteTable_83EDA74[] = { {-8, -12, ST_OAM_H_RECTANGLE, 0, 0x3, 3}, {-8, -4, ST_OAM_H_RECTANGLE, 0, 0xb, 3}, {-8, 4, ST_OAM_H_RECTANGLE, 0, 0x13, 3} }; -const struct SubspriteTable gSubspriteTables_83EDA8C[] = { +static const struct SubspriteTable gSubspriteTables_83EDA8C[] = { {3, gSubspriteTable_83EDA74} }; -const struct Subsprite gSubspriteTable_83EDA94[] = { +static const struct Subsprite gSubspriteTable_83EDA94[] = { {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x5, 3}, {4, -12, ST_OAM_SQUARE, 0, 0x7, 3}, {-12, -4, ST_OAM_H_RECTANGLE, 0, 0xd, 3}, @@ -5265,11 +5260,11 @@ const struct Subsprite gSubspriteTable_83EDA94[] = { {4, 4, ST_OAM_SQUARE, 0, 0x17, 3} }; -const struct SubspriteTable gSubspriteTables_83EDAC4[] = { +static const struct SubspriteTable gSubspriteTables_83EDAC4[] = { {6, gSubspriteTable_83EDA94} }; -const struct Subsprite gSubspriteTable_83EDACC[] = { +static const struct Subsprite gSubspriteTable_83EDACC[] = { {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x0, 3}, {4, -12, ST_OAM_SQUARE, 0, 0x2, 3}, {-12, -4, ST_OAM_H_RECTANGLE, 0, 0x8, 3}, @@ -5278,21 +5273,21 @@ const struct Subsprite gSubspriteTable_83EDACC[] = { {4, 4, ST_OAM_SQUARE, 0, 0x12, 3} }; -const struct SubspriteTable gSubspriteTables_83EDAFC[] = { +static const struct SubspriteTable gSubspriteTables_83EDAFC[] = { {6, gSubspriteTable_83EDACC} }; -const struct Subsprite gSubspriteTable_83EDB04[] = { +static const struct Subsprite gSubspriteTable_83EDB04[] = { {-8, -12, ST_OAM_H_RECTANGLE, 0, 0x3, 3}, {-8, -4, ST_OAM_H_RECTANGLE, 0, 0xb, 3}, {-8, 4, ST_OAM_H_RECTANGLE, 0, 0x13, 3} }; -const struct SubspriteTable gSubspriteTables_83EDB1C[] = { +static const struct SubspriteTable gSubspriteTables_83EDB1C[] = { {3, gSubspriteTable_83EDB04} }; -const struct Subsprite gSubspriteTable_83EDB24[] = { +static const struct Subsprite gSubspriteTable_83EDB24[] = { {-12, -12, ST_OAM_H_RECTANGLE, 0, 0x5, 3}, {4, -12, ST_OAM_SQUARE, 0, 0x7, 3}, {-12, -4, ST_OAM_H_RECTANGLE, 0, 0xd, 3}, @@ -5301,11 +5296,11 @@ const struct Subsprite gSubspriteTable_83EDB24[] = { {4, 4, ST_OAM_SQUARE, 0, 0x17, 3} }; -const struct SubspriteTable gSubspriteTables_83EDB54[] = { +static const struct SubspriteTable gSubspriteTables_83EDB54[] = { {6, gSubspriteTable_83EDB24} }; -const struct SpriteTemplate *const gUnknown_083EDB5C[] = { +static const struct SpriteTemplate *const gUnknown_083EDB5C[] = { &gSpriteTemplate_83ED57C, &gSpriteTemplate_83ED594, &gSpriteTemplate_83ED5AC, @@ -5334,7 +5329,7 @@ const struct SpriteTemplate *const gUnknown_083EDB5C[] = { &gDummySpriteTemplate }; -const struct SubspriteTable *const gUnknown_083EDBC4[] = { +static const struct SubspriteTable *const gUnknown_083EDBC4[] = { gSubspriteTables_83ED804, gSubspriteTables_83ED82C, gSubspriteTables_83ED854, @@ -5363,7 +5358,7 @@ const struct SubspriteTable *const gUnknown_083EDBC4[] = { NULL }; -const struct SpriteSheet gUnknown_083EDC2C[] = { +static const struct SpriteSheet gUnknown_083EDC2C[] = { {gSlotMachineReelSymbol1Tiles, 0x200, 0}, {gSlotMachineReelSymbol2Tiles, 0x200, 1}, {gSlotMachineReelSymbol3Tiles, 0x200, 2}, @@ -5388,19 +5383,19 @@ const struct SpriteSheet gUnknown_083EDC2C[] = { {} }; -const struct SpriteSheet gUnknown_083EDCDC = { +static const struct SpriteSheet gUnknown_083EDCDC = { ewram10000 + 0x0000, 0x800, 17 }; -const u8 *const gUnknown_083EDCE4 = gUnknownPalette_08E997E8; +static const u8 *const gUnknown_083EDCE4 = gUnknownPalette_08E997E8; #ifdef SAPPHIRE -const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/sapphire_83EDD40.gbapal"); +static const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/sapphire_83EDD40.gbapal"); #elif defined(RUBY) -const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/ruby_83EDCE8.gbapal"); +static const u16 UnknownPalette_83EDCE8[] = INCBIN_U16("graphics/unknown/ruby_83EDCE8.gbapal"); #endif // RS -const u16 *const gUnknown_083EDD08[] = { +static const u16 *const gUnknown_083EDD08[] = { UnknownPalette_83EDCE8 + 10, UnknownPalette_83EDCE8 + 11, UnknownPalette_83EDCE8 + 12, @@ -5408,7 +5403,7 @@ const u16 *const gUnknown_083EDD08[] = { UnknownPalette_83EDCE8 + 14 }; -const u16 *const gUnknown_083EDD1C[] = { +static const u16 *const gUnknown_083EDD1C[] = { gUnknown_08E95A18 + 74, gUnknown_08E95A18 + 75, gUnknown_08E95A18 + 76, @@ -5416,51 +5411,51 @@ const u16 *const gUnknown_083EDD1C[] = { gUnknown_08E95A18 + 78 }; -const u8 gUnknown_083EDD30[] = { +static const u8 gUnknown_083EDD30[] = { 0x4a, 0x4b, 0x4c, 0x4e, 0x4d }; -const u8 gUnknown_083EDD35[][2] = { +static const u8 gUnknown_083EDD35[][2] = { {0, 0}, {1, 2}, {3, 4} }; -const u8 gUnknown_083EDD3B[] = {1, 2, 2}; +static const u8 gUnknown_083EDD3B[] = {1, 2, 2}; #ifdef SAPPHIRE -const u16 Unknown_83EDD3E[] = INCBIN_U16("graphics/unknown/sapphire_83EDD96.gbapal"); -const u16 Unknown_83EDD5E[] = INCBIN_U16("graphics/unknown/sapphire_83EDDB6.gbapal"); -const u16 Unknown_83EDD7E[] = INCBIN_U16("graphics/unknown/sapphire_83EDDD6.gbapal"); +static const u16 Unknown_83EDD3E[] = INCBIN_U16("graphics/unknown/sapphire_83EDD96.gbapal"); +static const u16 Unknown_83EDD5E[] = INCBIN_U16("graphics/unknown/sapphire_83EDDB6.gbapal"); +static const u16 Unknown_83EDD7E[] = INCBIN_U16("graphics/unknown/sapphire_83EDDD6.gbapal"); #elif defined (RUBY) -const u16 Unknown_83EDD3E[] = INCBIN_U16("graphics/unknown/ruby_83EDD3E.gbapal"); -const u16 Unknown_83EDD5E[] = INCBIN_U16("graphics/unknown/ruby_83EDD5E.gbapal"); -const u16 Unknown_83EDD7E[] = INCBIN_U16("graphics/unknown/ruby_83EDD7E.gbapal"); +static const u16 Unknown_83EDD3E[] = INCBIN_U16("graphics/unknown/ruby_83EDD3E.gbapal"); +static const u16 Unknown_83EDD5E[] = INCBIN_U16("graphics/unknown/ruby_83EDD5E.gbapal"); +static const u16 Unknown_83EDD7E[] = INCBIN_U16("graphics/unknown/ruby_83EDD7E.gbapal"); #endif // RS -const u16 *const gUnknown_083EDDA0[] = { +static const u16 *const gUnknown_083EDDA0[] = { Unknown_83EDD3E, Unknown_83EDD5E, Unknown_83EDD7E }; -const u16 *const gUnknown_083EDDAC = gUnknown_08E95A18 + 16; +static const u16 *const gUnknown_083EDDAC = gUnknown_08E95A18 + 16; -const u16 Palette_83EDDB0[] = INCBIN_U16("graphics/slot_machine/83EDDB0.gbapal"); -const u16 Palette_83EDDD0[] = INCBIN_U16("graphics/slot_machine/83EDDD0.gbapal"); -const u16 Palette_83EDDF0[] = INCBIN_U16("graphics/slot_machine/83EDDF0.gbapal"); +static const u16 Palette_83EDDB0[] = INCBIN_U16("graphics/slot_machine/83EDDB0.gbapal"); +static const u16 Palette_83EDDD0[] = INCBIN_U16("graphics/slot_machine/83EDDD0.gbapal"); +static const u16 Palette_83EDDF0[] = INCBIN_U16("graphics/slot_machine/83EDDF0.gbapal"); -const u16 *const gUnknown_083EDE10[] = { +static const u16 *const gUnknown_083EDE10[] = { Palette_83EDDB0, Palette_83EDDD0, Palette_83EDDF0, gSlotMachineSpritePalette6 }; -const u16 *const gUnknown_083EDE20 = gSlotMachineSpritePalette6; +static const u16 *const gUnknown_083EDE20 = gSlotMachineSpritePalette6; -const u16 gPalette_83EDE24[] = INCBIN_U16("graphics/slot_machine/83EDE24_pal.bin"); +static const u16 gPalette_83EDE24[] = INCBIN_U16("graphics/slot_machine/83EDE24_pal.bin"); -const struct SpritePalette gSlotMachineSpritePalettes[] = { +static const struct SpritePalette gSlotMachineSpritePalettes[] = { {gSlotMachineSpritePalette0, 0}, {gSlotMachineSpritePalette1, 1}, {gSlotMachineSpritePalette2, 2}, @@ -5472,6 +5467,6 @@ const struct SpritePalette gSlotMachineSpritePalettes[] = { {} }; -const u8 gUnknown_083EDE8C[] = INCBIN_U8("graphics/slot_machine/reel_time.4bpp.lz"); +static const u8 gUnknown_083EDE8C[] = INCBIN_U8("graphics/slot_machine/reel_time.4bpp.lz"); -const u16 gReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window_map.bin"); +static const u16 gReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window_map.bin"); -- cgit v1.2.3 From e395cc60199ef0b8dec56d3852037eaeeab42c56 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 Jan 2018 13:53:47 -0600 Subject: fix German build --- asm-de/easy_chat.s | 66 ------------------------------------------------------ 1 file changed, 66 deletions(-) diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 58c3944a9..a07a33111 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -5,72 +5,6 @@ .text - thumb_func_start sub_80E8B78 -sub_80E8B78: @ 80E8B78 - push {r4,lr} - adds r3, r0, 0 - ldr r0, _080E8BB0 @ =gUnknown_083DB694 - ldr r1, [r0] - ldr r2, _080E8BB4 @ =0x00009f9c - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _080E8BE8 - movs r2, 0x30 - ldrsh r0, [r3, r2] - cmp r0, 0 - beq _080E8BE8 - movs r2, 0x2E - ldrsh r0, [r3, r2] - cmp r0, 0 - bne _080E8BBC - movs r4, 0 - ldr r2, _080E8BB8 @ =0x00009f98 - adds r0, r1, r2 - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bne _080E8BD6 - b _080E8BD4 - .align 2, 0 -_080E8BB0: .4byte gUnknown_083DB694 -_080E8BB4: .4byte 0x00009f9c -_080E8BB8: .4byte 0x00009f98 -_080E8BBC: - movs r4, 0 - ldr r2, _080E8BF0 @ =0x00009f98 - adds r0, r1, r2 - ldr r0, [r0] - adds r2, 0x5 - adds r1, r2 - movs r2, 0 - ldrsb r2, [r0, r2] - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r2, r0 - bne _080E8BD6 -_080E8BD4: - movs r4, 0x1 -_080E8BD6: - adds r2, r3, 0 - adds r2, 0x3E - lsls r3, r4, 2 - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - orrs r0, r3 - strb r0, [r2] -_080E8BE8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E8BF0: .4byte 0x00009f98 - thumb_func_end sub_80E8B78 - thumb_func_start sub_80E8BF4 sub_80E8BF4: @ 80E8BF4 push {r4-r7,lr} -- cgit v1.2.3 From 5588053754c2f1e293123cb1b793b867848f7c04 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Thu, 4 Jan 2018 23:05:01 +0100 Subject: Formatted to fit with the rest of the source code --- src/battle/anim/poison.c | 83 +++++++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 29 deletions(-) diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c index c53fb2a8b..f31c441fb 100644 --- a/src/battle/anim/poison.c +++ b/src/battle/anim/poison.c @@ -12,104 +12,129 @@ void sub_80D9E78(struct Sprite *sprite); void sub_80D9EE8(struct Sprite *sprite); void sub_80D9FF0(struct Sprite *sprite); -void sub_80D9D70(struct Sprite *sprite) { - if (!gBattleAnimArgs[3]) { +void sub_80D9D70(struct Sprite *sprite) +{ + if (!gBattleAnimArgs[3]) StartSpriteAnim(sprite, 2); - } + sub_80787B0(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); sprite->data[5] = -30; + sub_80786EC(sprite); + sprite->callback = sub_80D9DD4; } -void sub_80D9DD4(struct Sprite *sprite) { - if (sub_8078718(sprite)) { +void sub_80D9DD4(struct Sprite *sprite) // same as sub_80D9E78 +{ + if (sub_8078718(sprite)) DestroyAnimSprite(sprite); - } } -void sub_80D9DF0(struct Sprite *sprite) { +void sub_80D9DF0(struct Sprite *sprite) +{ s16 l1, l2; - if (!gBattleAnimArgs[3]) { + if (!gBattleAnimArgs[3]) StartSpriteAnim(sprite, 2); - } + sub_80787B0(sprite, 1); sub_807A3FC(gAnimBankTarget, 1, &l1, &l2); - if (GetBankSide(gAnimBankAttacker)) { + + if (GetBankSide(gAnimBankAttacker)) gBattleAnimArgs[4] = -gBattleAnimArgs[4]; - } + sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = l1 + gBattleAnimArgs[4]; sprite->data[4] = l2 + gBattleAnimArgs[5]; sprite->data[5] = -30; + sub_80786EC(sprite); + sprite->callback = sub_80D9E78; } -void sub_80D9E78(struct Sprite *sprite) { - if (sub_8078718(sprite)) { +void sub_80D9E78(struct Sprite *sprite) // same as sub_80D9DD4 +{ + if (sub_8078718(sprite)) DestroyAnimSprite(sprite); - } } -void sub_80D9E94(struct Sprite *sprite) { +void sub_80D9E94(struct Sprite *sprite) +{ sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[0]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1]; + sub_8078A5C(sprite); + sprite->data[5] = sprite->data[1] / gBattleAnimArgs[2]; sprite->data[6] = sprite->data[2] / gBattleAnimArgs[2]; + sprite->callback = sub_80D9EE8; } -void sub_80D9EE8(struct Sprite *sprite) { +void sub_80D9EE8(struct Sprite *sprite) +{ sub_8078394(sprite); + sprite->data[1] -= sprite->data[5]; sprite->data[2] -= sprite->data[6]; - if (!sprite->data[0]) { + + if (!sprite->data[0]) DestroyAnimSprite(sprite); - } } -void sub_80D9F14(struct Sprite *sprite) { +void sub_80D9F14(struct Sprite *sprite) +{ sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); - if (GetBankSide(gAnimBankAttacker)) { + + if (GetBankSide(gAnimBankAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - } + sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; sprite->data[4] = sprite->pos1.y + sprite->data[0]; + sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } -void sub_80D9F88(struct Sprite *sprite) { - if (!gBattleAnimArgs[2]) { +void sub_80D9F88(struct Sprite *sprite) +{ + if (!gBattleAnimArgs[2]) + { sub_8078764(sprite, TRUE); - } else { + } + else + { sub_807A3FC(gAnimBankTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); - if (GetBankSide(gAnimBankAttacker)) { + + if (GetBankSide(gAnimBankAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; - } + sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; } + sprite->callback = sub_80D9FF0; } -void sub_80D9FF0(struct Sprite *sprite) { +void sub_80D9FF0(struct Sprite *sprite) +{ sprite->data[0] = (sprite->data[0] + 0xB) & 0xFF; sprite->pos2.x = Sin(sprite->data[0], 4); sprite->data[1] += 0x30; sprite->pos2.y = -(sprite->data[1] >> 8); - if (sprite->affineAnimEnded) { + + if (sprite->affineAnimEnded) DestroyAnimSprite(sprite); - } } \ No newline at end of file -- cgit v1.2.3 From 0a70c2c6938c260bd8d1d036660891beb26c5820 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Jan 2018 17:17:42 -0500 Subject: Get sub_8103668 matching --- include/ewram.h | 4 +- include/slot_machine.h | 33 ++- src/field/slot_machine.c | 535 ++++++++++++++++++----------------------------- 3 files changed, 232 insertions(+), 340 deletions(-) diff --git a/include/ewram.h b/include/ewram.h index 7b480a0e8..5a350840a 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -70,7 +70,7 @@ extern u8 gSharedMem[]; #define ewramF800 (&gSharedMem[0xF800]) #define ewram_2010000 (*(struct TradeEwramStruct *)(gSharedMem + 0x10000)) #define ewram10000 (&gSharedMem[0x10000]) -#define ewram10000_2 (void *)(gSharedMem + 0x10000) // slot machine +#define eSlotMachineGfxBuffer (void *)(gSharedMem + 0x10000) // slot machine #define ePokedexPalAddr3 (void *)(gSharedMem + 0x10000) #define ewram10800 (&gSharedMem[0x10800]) #define ewram11000 (&gSharedMem[0x11000]) @@ -78,7 +78,7 @@ extern u8 gSharedMem[]; #define ewram12000 (&gSharedMem[0x12000]) #define ewram12800 (&gSharedMem[0x12800]) #define ewram13000 (&gSharedMem[0x13000]) -#define ewram13200 (&gSharedMem[0x13200]) +#define eSlotMachineReelTimeGfxBuffer (&gSharedMem[0x13200]) #define ewram13800 (&gSharedMem[0x13800]) #define EWRAM_14000 ((u8 *)(gSharedMem + 0x14000)) #define ewram14000 (&gSharedMem[0x14000]) diff --git a/include/slot_machine.h b/include/slot_machine.h index 34431a8ef..5588d2bac 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -1,6 +1,29 @@ #ifndef GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H +enum { + SLOT_MACHINE_SYM_7_RED, + SLOT_MACHINE_SYM_7_BLUE, + SLOT_MACHINE_SYM_AZURILL, + SLOT_MACHINE_SYM_LOTAD, + SLOT_MACHINE_SYM_CHERRY, + SLOT_MACHINE_SYM_POWER, + SLOT_MACHINE_SYM_REPLAY +}; + +enum { + SLOT_MACHINE_MATCHED_1CHERRY, + SLOT_MACHINE_MATCHED_2CHERRY, + SLOT_MACHINE_MATCHED_REPLAY, + SLOT_MACHINE_MATCHED_LOTAD, + SLOT_MACHINE_MATCHED_AZURILL, + SLOT_MACHINE_MATCHED_POWER, + SLOT_MACHINE_MATCHED_777_MIXED, + SLOT_MACHINE_MATCHED_777_RED, + SLOT_MACHINE_MATCHED_777_BLUE, + SLOT_MACHINE_MATCHED_NONE +}; + struct SlotMachineEwramStruct { /*0x00*/ u8 state; /*0x01*/ u8 unk01; @@ -10,11 +33,11 @@ struct SlotMachineEwramStruct { /*0x05*/ u8 unk05; /*0x06*/ u8 unk06; /*0x07*/ u8 unk07; - /*0x08*/ u16 unk08; + /*0x08*/ u16 matchedSymbols; /*0x0A*/ u8 unk0A; /*0x0B*/ u8 unk0B; /*0x0C*/ s16 coins; - /*0x0E*/ s16 unk0E; + /*0x0E*/ s16 payout; /*0x10*/ s16 unk10; /*0x12*/ s16 bet; /*0x14*/ s16 unk14; @@ -26,7 +49,7 @@ struct SlotMachineEwramStruct { /*0x28*/ s16 unk28[3]; /*0x2E*/ s16 unk2E[3]; /*0x34*/ s16 unk34[3]; - /*0x3A*/ u8 unk3A[3]; + /*0x3A*/ u8 reelTasks[3]; /*0x3D*/ u8 unk3D; /*0x3E*/ u8 unk3E; /*0x3F*/ u8 unk3F; @@ -49,8 +72,8 @@ struct SlotMachineEwramStruct { /*0x64*/ MainCallback prevMainCb; }; -void PlaySlotMachine(u8, void *); +void PlaySlotMachine(u8 arg0, MainCallback cb); void sub_8104DA4(void); -u8 sub_8105BB4(u8, u8, s16); +u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2); #endif // GUARD_SLOT_MACHINE_H diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index b21d8a082..7691f4fa9 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -30,21 +30,21 @@ struct UnkStruct1 { #endif -static void sub_81018B8(void); -static void sub_8101954(void); -static void sub_81019B0(u8 arg0, void *ptr); -static void nullsub_67(u8 taskId); -static void sub_8101A28(void); -static void sub_8101A44(void); -static void sub_8101A8C(void); -static void sub_8101AE0(void); -static void sub_8101B04(void); -static void sub_8101BA4(void); -static void sub_8101C84(void); -static void sub_8101CA0(void); -static void sub_8101CC0(void); -static void sub_8101CD4(void); -static void sub_8101CEC(void); +static void CB2_SlotMachineSetup(void); +static void CB2_SlotMachineLoop(void); +static void PlaySlotMachine_Internal(u8 arg0, MainCallback cb); +static void SlotMachineDummyTask(u8 taskId); +static void SlotMachineSetup_0_0(void); +static void SlotMachineSetup_6_2(void); +static void SlotMachineSetup_1_0(void); +static void SlotMachineSetup_2_0(void); +static void SlotMachineSetup_2_1(void); +static void SlotMachineSetup_0_1(void); +static void SlotMachineSetup_3_0(void); +static void SlotMachineSetup_4_0(void); +static void SlotMachineSetup_5_0(void); +static void SlotMachineSetup_6_0(void); +static void SlotMachineSetup_6_1(void); static void sub_8101D04(void); static void sub_8101D24(u8 taskId); static bool8 sub_8101D5C(struct Task *task); @@ -82,11 +82,11 @@ static bool8 sub_8102540(void); static u8 sub_8102578(void); static u16 dp15_jump_random_unknown(void); static u8 sub_81025BC(void); -static void sub_81027A0(void); -static void sub_81027D0(void); -static void sub_8102840(void); -static void sub_810290C(void); -static u8 sub_81029D4(u8 c1, u8 c2, u8 c3); +static void CheckMatch(void); +static void CheckMatch_CenterRow(void); +static void CheckMatch_TopAndBottom(void); +static void CheckMatch_Diagonals(void); +static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3); static void sub_8102A24(void); static void sub_8102A64(u8 taskId); static bool8 sub_8102A44(void); @@ -229,52 +229,52 @@ static const u8 gUnknown_083ECE3A[]; static const u16 gUnknown_083ECE42[]; static const u16 gUnknown_083ECE48[]; -void PlaySlotMachine(u8 arg0, void *ptr) +void PlaySlotMachine(u8 arg0, MainCallback cb) { - sub_81019B0(arg0, ptr); - SetMainCallback2(sub_81018B8); + PlaySlotMachine_Internal(arg0, cb); + SetMainCallback2(CB2_SlotMachineSetup); } -static void sub_81018B8(void) +static void CB2_SlotMachineSetup(void) { switch (gMain.state) { case 0: - sub_8101A28(); - sub_8101BA4(); + SlotMachineSetup_0_0(); + SlotMachineSetup_0_1(); gMain.state++; break; case 1: - sub_8101A8C(); + SlotMachineSetup_1_0(); gMain.state++; break; case 2: - sub_8101AE0(); - sub_8101B04(); + SlotMachineSetup_2_0(); + SlotMachineSetup_2_1(); gMain.state++; break; case 3: - sub_8101C84(); + SlotMachineSetup_3_0(); gMain.state++; break; case 4: - sub_8101CA0(); + SlotMachineSetup_4_0(); gMain.state++; break; case 5: - sub_8101CC0(); + SlotMachineSetup_5_0(); gMain.state++; break; case 6: - sub_8101CD4(); - sub_8101CEC(); - sub_8101A44(); - SetMainCallback2(sub_8101954); + SlotMachineSetup_6_0(); + SlotMachineSetup_6_1(); + SlotMachineSetup_6_2(); + SetMainCallback2(CB2_SlotMachineLoop); break; } } -static void sub_8101954(void) +static void CB2_SlotMachineLoop(void) { RunTasks(); AnimateSprites(); @@ -282,7 +282,7 @@ static void sub_8101954(void) UpdatePaletteFade(); } -static void sub_810196C(void) +static void SlotMachine_VBlankCallback(void) { LoadOam(); ProcessSpriteCopyRequests(); @@ -293,35 +293,35 @@ static void sub_810196C(void) REG_WINOUT = eSlotMachine->winOut; } -static void sub_81019B0(u8 arg0, void *ptr) +static void PlaySlotMachine_Internal(u8 arg0, MainCallback cb) { - struct Task *task = &gTasks[CreateTask(nullsub_67, 0xFF)]; + struct Task *task = gTasks + CreateTask(SlotMachineDummyTask, 0xFF); task->data[0] = arg0; - StoreWordInTwoHalfwords(task->data + 1, (intptr_t)ptr); + StoreWordInTwoHalfwords(task->data + 1, (intptr_t)cb); } static void sub_81019EC(void) { - struct Task *task = &gTasks[FindTaskIdByFunc(nullsub_67)]; + struct Task *task = gTasks + FindTaskIdByFunc(SlotMachineDummyTask); eSlotMachine->unk01 = task->data[0]; LoadWordFromTwoHalfwords((u16 *)(task->data + 1), (u32 *)&eSlotMachine->prevMainCb); } -static void nullsub_67(u8 taskId) +static void SlotMachineDummyTask(u8 taskId) { } -static void sub_8101A28(void) +static void SlotMachineSetup_0_0(void) { SetVBlankCallback(NULL); SetHBlankCallback(NULL); REG_DISPCNT = 0; } -static void sub_8101A44(void) +static void SlotMachineSetup_6_2(void) { u16 imeBak; - SetVBlankCallback(sub_810196C); + SetVBlankCallback(SlotMachine_VBlankCallback); imeBak = REG_IME; REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; @@ -330,17 +330,17 @@ static void sub_8101A44(void) REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON; } -static void sub_8101A8C(void) +static void SlotMachineSetup_1_0(void) { DmaClearLarge16(3, (u16 *)(BG_VRAM), BG_VRAM_SIZE, 0x1000); } -static void sub_8101AE0(void) +static void SlotMachineSetup_2_0(void) { DmaClear16(3, (u16 *)OAM, OAM_SIZE); } -static void sub_8101B04(void) +static void SlotMachineSetup_2_1(void) { REG_BG0CNT = 0; REG_BG1CNT = 0; @@ -366,7 +366,7 @@ static void sub_8101B04(void) static const s16 gUnknown_083ECCF8[][2]; -static void sub_8101BA4(void) +static void SlotMachineSetup_0_1(void) { u8 i; @@ -375,11 +375,11 @@ static void sub_8101BA4(void) eSlotMachine->unk02 = 0; eSlotMachine->unk03 = Random() & 1; eSlotMachine->unk04 = 0; - eSlotMachine->unk08 = 0; + eSlotMachine->matchedSymbols = 0; eSlotMachine->unk0A = 0; eSlotMachine->unk0B = 0; eSlotMachine->coins = gSaveBlock1.coins; - eSlotMachine->unk0E = 0; + eSlotMachine->payout = 0; eSlotMachine->unk10 = 0; eSlotMachine->bet = 0; eSlotMachine->unk18 = 0; @@ -398,13 +398,13 @@ static void sub_8101BA4(void) } } -static void sub_8101C84(void) +static void SlotMachineSetup_3_0(void) { SetUpWindowConfig(&gWindowConfig_81E7128); InitMenuWindow(&gWindowConfig_81E7128); } -static void sub_8101CA0(void) +static void SlotMachineSetup_4_0(void) { ResetPaletteFade(); ResetSpriteData(); @@ -413,14 +413,14 @@ static void sub_8101CA0(void) ResetTasks(); } -static void sub_8101CC0(void) +static void SlotMachineSetup_5_0(void) { sub_8106448(); sub_81064B8(); sub_81063C0(); } -static void sub_8101CD4(void) +static void SlotMachineSetup_6_0(void) { sub_8104EA8(); sub_8104F8C(); @@ -428,7 +428,7 @@ static void sub_8101CD4(void) sub_81050C4(); } -static void sub_8101CEC(void) +static void SlotMachineSetup_6_1(void) { sub_8104048(); sub_8102DA8(); @@ -497,7 +497,7 @@ static bool8 sub_8101D8C(struct Task *task) static bool8 sub_8101DB0(struct Task *task) { - eSlotMachine->unk0E = 0; + eSlotMachine->payout = 0; eSlotMachine->bet = 0; eSlotMachine->unk18 = 0; eSlotMachine->unk04 &= 0xc0; @@ -691,27 +691,27 @@ static bool8 sub_8102090(struct Task *task) static bool8 sub_81020C8(struct Task *task) { eSlotMachine->unk04 &= 0xc0; - sub_81027A0(); + CheckMatch(); if (eSlotMachine->unk0A) { eSlotMachine->unk0A--; eSlotMachine->unk0B++; } - if (eSlotMachine->unk08) + if (eSlotMachine->matchedSymbols) { eSlotMachine->state = 15; sub_8102A24(); sub_8103F70(); - if ((eSlotMachine->unk10 -= eSlotMachine->unk0E) < 0) + if ((eSlotMachine->unk10 -= eSlotMachine->payout) < 0) { eSlotMachine->unk10 = 0; } - if (eSlotMachine->unk08 & 0x180) + if (eSlotMachine->matchedSymbols & 0x180) { PlayFanfare(BGM_ME_B_BIG); sub_8104CAC(6); } - else if (eSlotMachine->unk08 & 0x40) + else if (eSlotMachine->matchedSymbols & 0x40) { PlayFanfare(BGM_ME_B_BIG); sub_8104CAC(5); @@ -721,21 +721,21 @@ static bool8 sub_81020C8(struct Task *task) PlayFanfare(BGM_ME_B_SMALL); sub_8104CAC(2); } - if (eSlotMachine->unk08 & 0x1c0) + if (eSlotMachine->matchedSymbols & 0x1c0) { eSlotMachine->unk04 &= 0x3f; - if (eSlotMachine->unk08 & 0x180) + if (eSlotMachine->matchedSymbols & 0x180) { eSlotMachine->unk0A = 0; eSlotMachine->unk0B = 0; eSlotMachine->unk03 = 0; - if (eSlotMachine->unk08 & 0x100) + if (eSlotMachine->matchedSymbols & 0x100) { eSlotMachine->unk03 = 1; } } } - if (eSlotMachine->unk08 & 0x20 && eSlotMachine->unk02 < 16) + if (eSlotMachine->matchedSymbols & 0x20 && eSlotMachine->unk02 < 16) { eSlotMachine->unk02++; sub_8104064(eSlotMachine->unk02); @@ -767,20 +767,20 @@ static bool8 sub_81021FC(struct Task *task) if (sub_8103FA0()) { eSlotMachine->state = 19; - if (eSlotMachine->unk08 & 0x180) + if (eSlotMachine->matchedSymbols & 0x180) { IncrementGameStat(GAME_STAT_SLOT_JACKPOTS); } - if (eSlotMachine->unk08 & 0x04) + if (eSlotMachine->matchedSymbols & 0x04) { eSlotMachine->unk18 = 0; eSlotMachine->state = 9; } - if (eSlotMachine->unk08 & 0x20) + if (eSlotMachine->matchedSymbols & 0x20) { eSlotMachine->state = 17; } - if (eSlotMachine->unk0A && eSlotMachine->unk08 & 0x04) + if (eSlotMachine->unk0A && eSlotMachine->matchedSymbols & 0x04) { sub_8104CAC(4); eSlotMachine->state = 18; @@ -794,7 +794,7 @@ static bool8 sub_8102264(struct Task *task) if (!sub_81040C8()) { eSlotMachine->state = 19; - if (eSlotMachine->unk08 & 0x04) + if (eSlotMachine->matchedSymbols & 0x04) { eSlotMachine->state = 9; if (eSlotMachine->unk0A) @@ -812,7 +812,7 @@ static bool8 sub_81022A0(struct Task *task) if (sub_8104E18()) { eSlotMachine->state = 19; - if (eSlotMachine->unk08 & 0x04) + if (eSlotMachine->matchedSymbols & 0x04) { eSlotMachine->state = 9; } @@ -1116,126 +1116,126 @@ static u16 dp15_jump_random_unknown(void) return 8; } -static void sub_81027A0(void) +static void CheckMatch(void) { - eSlotMachine->unk08 = 0; - sub_81027D0(); + eSlotMachine->matchedSymbols = 0; + CheckMatch_CenterRow(); if (eSlotMachine->bet > 1) { - sub_8102840(); + CheckMatch_TopAndBottom(); } if (eSlotMachine->bet > 2) { - sub_810290C(); + CheckMatch_Diagonals(); } } -static const u16 gUnknown_083ECE5A[]; -static const u16 gUnknown_083ECE6C[]; +static const u16 sSlotMatchFlags[]; +static const u16 sSlotPayouts[]; -static void sub_81027D0(void) +static void CheckMatch_CenterRow(void) { - u8 c1, c2, c3, payout; + u8 c1, c2, c3, match; c1 = sub_8102BA4(0, 2); c2 = sub_8102BA4(1, 2); c3 = sub_8102BA4(2, 2); - payout = sub_81029D4(c1, c2, c3); - if (payout != 9) + match = GetMatchFromSymbolsInRow(c1, c2, c3); + if (match != SLOT_MACHINE_MATCHED_NONE) { - eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; - eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + eSlotMachine->payout += sSlotPayouts[match]; + eSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; sub_8103E04(0); } } -static void sub_8102840(void) +static void CheckMatch_TopAndBottom(void) { - u8 c1, c2, c3, payout; + u8 c1, c2, c3, match; c1 = sub_8102BA4(0, 1); c2 = sub_8102BA4(1, 1); c3 = sub_8102BA4(2, 1); - payout = sub_81029D4(c1, c2, c3); - if (payout != 9) + match = GetMatchFromSymbolsInRow(c1, c2, c3); + if (match != SLOT_MACHINE_MATCHED_NONE) { - if (payout == 0) + if (match == SLOT_MACHINE_MATCHED_1CHERRY) { - payout = 1; + match = SLOT_MACHINE_MATCHED_2CHERRY; } - eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; - eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + eSlotMachine->payout += sSlotPayouts[match]; + eSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; sub_8103E04(1); } c1 = sub_8102BA4(0, 3); c2 = sub_8102BA4(1, 3); c3 = sub_8102BA4(2, 3); - payout = sub_81029D4(c1, c2, c3); - if (payout != 9) + match = GetMatchFromSymbolsInRow(c1, c2, c3); + if (match != SLOT_MACHINE_MATCHED_NONE) { - if (payout == 0) + if (match == SLOT_MACHINE_MATCHED_1CHERRY) { - payout = 1; + match = SLOT_MACHINE_MATCHED_2CHERRY; } - eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; - eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + eSlotMachine->payout += sSlotPayouts[match]; + eSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; sub_8103E04(2); } } -static void sub_810290C(void) +static void CheckMatch_Diagonals(void) { - u8 c1, c2, c3, payout; + u8 c1, c2, c3, match; c1 = sub_8102BA4(0, 1); c2 = sub_8102BA4(1, 2); c3 = sub_8102BA4(2, 3); - payout = sub_81029D4(c1, c2, c3); - if (payout != 9) + match = GetMatchFromSymbolsInRow(c1, c2, c3); + if (match != SLOT_MACHINE_MATCHED_NONE) { - if (payout != 0) + if (match != SLOT_MACHINE_MATCHED_1CHERRY) { - eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; - eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + eSlotMachine->payout += sSlotPayouts[match]; + eSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; } sub_8103E04(3); } c1 = sub_8102BA4(0, 3); c2 = sub_8102BA4(1, 2); c3 = sub_8102BA4(2, 1); - payout = sub_81029D4(c1, c2, c3); - if (payout != 9) + match = GetMatchFromSymbolsInRow(c1, c2, c3); + if (match != SLOT_MACHINE_MATCHED_NONE) { - if (payout != 0) + if (match != SLOT_MACHINE_MATCHED_1CHERRY) { - eSlotMachine->unk0E += gUnknown_083ECE6C[payout]; - eSlotMachine->unk08 |= gUnknown_083ECE5A[payout]; + eSlotMachine->payout += sSlotPayouts[match]; + eSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; } sub_8103E04(4); } } -static const u8 gUnknown_083ECE52[]; +static const u8 sSym2Match[]; -static u8 sub_81029D4(u8 c1, u8 c2, u8 c3) +static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3) { if (c1 == c2 && c1 == c3) { - return gUnknown_083ECE52[c1]; + return sSym2Match[c1]; } - if (c1 == 0 && c2 == 0 && c3 == 1) + if (c1 == SLOT_MACHINE_SYM_7_RED && c2 == SLOT_MACHINE_SYM_7_RED && c3 == SLOT_MACHINE_SYM_7_BLUE) { - return 6; + return SLOT_MACHINE_MATCHED_777_MIXED; } - if (c1 == 1 && c2 == 1 && c3 == 0) + if (c1 == SLOT_MACHINE_SYM_7_BLUE && c2 == SLOT_MACHINE_SYM_7_BLUE && c3 == SLOT_MACHINE_SYM_7_RED) { - return 6; + return SLOT_MACHINE_MATCHED_777_MIXED; } - if (c1 == 4) + if (c1 == SLOT_MACHINE_SYM_CHERRY) { - return 0; + return SLOT_MACHINE_MATCHED_1CHERRY; } - return 9; + return SLOT_MACHINE_MATCHED_NONE; } static void sub_8102A24(void) @@ -1268,7 +1268,7 @@ static bool8 sub_8102A9C(struct Task *task) if (sub_8103E38()) { task->data[0]++; - if (eSlotMachine->unk0E == 0) + if (eSlotMachine->payout == 0) { task->data[0] = 2; return TRUE; @@ -1285,7 +1285,7 @@ static bool8 sub_8102AD0(struct Task *task) { PlaySE(SE_PIN); } - eSlotMachine->unk0E--; + eSlotMachine->payout--; if (eSlotMachine->coins < 9999) { eSlotMachine->coins++; @@ -1299,14 +1299,14 @@ static bool8 sub_8102AD0(struct Task *task) if (IsFanfareTaskInactive() && gMain.newKeys & START_BUTTON) { PlaySE(SE_PIN); - eSlotMachine->coins += eSlotMachine->unk0E; + eSlotMachine->coins += eSlotMachine->payout; if (eSlotMachine->coins > 9999) { eSlotMachine->coins = 9999; } - eSlotMachine->unk0E = 0; + eSlotMachine->payout = 0; } - if (eSlotMachine->unk0E == 0) + if (eSlotMachine->payout == 0) { task->data[0]++; } @@ -1399,25 +1399,25 @@ static void sub_8102DA8(void) { u8 taskId = CreateTask(sub_8102E68, 2); gTasks[taskId].data[15] = i; - eSlotMachine->unk3A[i] = taskId; + eSlotMachine->reelTasks[i] = taskId; sub_8102E68(taskId); } } static void sub_8102DEC(u8 a0) { - gTasks[eSlotMachine->unk3A[a0]].data[0] = 1; - gTasks[eSlotMachine->unk3A[a0]].data[14] = 1; + gTasks[eSlotMachine->reelTasks[a0]].data[0] = 1; + gTasks[eSlotMachine->reelTasks[a0]].data[14] = 1; } static void sub_8102E1C(u8 a0) { - gTasks[eSlotMachine->unk3A[a0]].data[0] = 2; + gTasks[eSlotMachine->reelTasks[a0]].data[0] = 2; } static bool8 sub_8102E40(u8 a0) { - return gTasks[eSlotMachine->unk3A[a0]].data[14]; + return gTasks[eSlotMachine->reelTasks[a0]].data[14]; } static bool8 (*const gUnknown_083ECB2C[])(struct Task *task) = { @@ -1816,8 +1816,6 @@ static void j5_08111E84(void) } } -#ifdef NONMATCHING // variable r6 is mistakenly plopped into r5, - // and variable i is mistakenly plopped into r6 static void sub_8103668(void) { s16 i; @@ -1845,34 +1843,34 @@ static void sub_8103668(void) return; } } - for (i = 1; i < 5; i++) + for (r6 = 1; r6 < 5; r6++) { - if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - i)) + if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - r6)) { if (eSlotMachine->unk34[0] == 1) { - if (i < 3) + if (r6 < 3) { eSlotMachine->unk34[1] = 2; - eSlotMachine->unk2E[1] = i + 1; + eSlotMachine->unk2E[1] = r6 + 1; } else { eSlotMachine->unk34[1] = 1; - eSlotMachine->unk2E[1] = i; + eSlotMachine->unk2E[1] = r6; } } else { - if (i < 3) + if (r6 < 3) { eSlotMachine->unk34[1] = 3; - eSlotMachine->unk2E[1] = i; + eSlotMachine->unk2E[1] = r6; } else { eSlotMachine->unk34[1] = 2; - eSlotMachine->unk2E[1] = i - 1; + eSlotMachine->unk2E[1] = r6 - 1; } } return; @@ -1882,141 +1880,6 @@ static void sub_8103668(void) } } } -#else -__attribute__((naked)) void sub_8103668(void) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tsub sp, 0x4\n" - "\tldr r4, _0810368C @ =gSharedMem\n" - "\tldrh r3, [r4, 0x34]\n" - "\tmovs r0, 0x34\n" - "\tldrsh r2, [r4, r0]\n" - "\tcmp r2, 0\n" - "\tbeq _0810375A\n" - "\tldrb r1, [r4, 0x4]\n" - "\tmovs r0, 0x80\n" - "\tands r0, r1\n" - "\tcmp r0, 0\n" - "\tbeq _0810375A\n" - "\tcmp r2, 0x2\n" - "\tbne _081036AE\n" - "\tbl j5_08111E84\n" - "\tb _0810375A\n" - "\t.align 2, 0\n" - "_0810368C: .4byte gSharedMem\n" - "_08103690:\n" - "\tldr r0, _0810369C @ =gSharedMem\n" - "\tmovs r1, 0\n" - "\tstrh r6, [r0, 0x36]\n" - "\tstrh r1, [r0, 0x30]\n" - "\tb _0810375A\n" - "\t.align 2, 0\n" - "_0810369C: .4byte gSharedMem\n" - "_081036A0:\n" - "\tmovs r0, 0x2\n" - "\tstrh r0, [r5, 0x36]\n" - "\tadds r0, r4, 0x1\n" - "\tstrh r0, [r5, 0x30]\n" - "\tb _0810375A\n" - "_081036AA:\n" - "\tmovs r0, 0x3\n" - "\tb _08103736\n" - "_081036AE:\n" - "\tldrh r1, [r4, 0x2E]\n" - "\tsubs r1, r3, r1\n" - "\tlsls r1, 16\n" - "\tasrs r1, 16\n" - "\tmovs r0, 0\n" - "\tbl sub_8102BF8\n" - "\tmov r1, sp\n" - "\tstrb r0, [r1]\n" - "\tmov r0, sp\n" - "\tbl sub_8103520\n" - "\tlsls r0, 24\n" - "\tcmp r0, 0\n" - "\tbeq _0810375A\n" - "\tmovs r6, 0x2\n" - "\tmovs r1, 0x34\n" - "\tldrsh r0, [r4, r1]\n" - "\tcmp r0, 0x3\n" - "\tbne _081036D8\n" - "\tmovs r6, 0x3\n" - "_081036D8:\n" - "\tmovs r5, 0\n" - "\tmov r7, sp\n" - "_081036DC:\n" - "\tlsls r0, r6, 16\n" - "\tasrs r4, r0, 16\n" - "\tmovs r0, 0x1\n" - "\tadds r1, r4, 0\n" - "\tbl sub_8102BF8\n" - "\tldrb r1, [r7]\n" - "\tlsls r0, 24\n" - "\tlsrs r0, 24\n" - "\tcmp r1, r0\n" - "\tbeq _08103690\n" - "\tlsls r1, r5, 16\n" - "\tmovs r0, 0x80\n" - "\tlsls r0, 9\n" - "\tadds r1, r0\n" - "\tsubs r0, r4, 0x1\n" - "\tlsls r0, 16\n" - "\tlsrs r6, r0, 16\n" - "\tlsrs r5, r1, 16\n" - "\tasrs r1, 16\n" - "\tcmp r1, 0x1\n" - "\tble _081036DC\n" - "\tmovs r6, 0x1\n" - "\tmov r7, sp\n" - "\tldr r5, _0810373C @ =gSharedMem\n" - "_0810370E:\n" - "\tldrh r1, [r5, 0x34]\n" - "\tlsls r0, r6, 16\n" - "\tasrs r4, r0, 16\n" - "\tsubs r1, r4\n" - "\tlsls r1, 16\n" - "\tasrs r1, 16\n" - "\tmovs r0, 0x1\n" - "\tbl sub_8102BF8\n" - "\tldrb r1, [r7]\n" - "\tlsls r0, 24\n" - "\tlsrs r0, 24\n" - "\tcmp r1, r0\n" - "\tbne _0810374E\n" - "\tmovs r1, 0x34\n" - "\tldrsh r0, [r5, r1]\n" - "\tcmp r0, 0x1\n" - "\tbne _08103740\n" - "\tcmp r4, 0x2\n" - "\tble _081036A0\n" - "_08103736:\n" - "\tstrh r0, [r5, 0x36]\n" - "\tstrh r6, [r5, 0x30]\n" - "\tb _0810375A\n" - "\t.align 2, 0\n" - "_0810373C: .4byte gSharedMem\n" - "_08103740:\n" - "\tcmp r4, 0x2\n" - "\tble _081036AA\n" - "\tmovs r0, 0x2\n" - "\tstrh r0, [r5, 0x36]\n" - "\tsubs r0, r4, 0x1\n" - "\tstrh r0, [r5, 0x30]\n" - "\tb _0810375A\n" - "_0810374E:\n" - "\tadds r0, r4, 0x1\n" - "\tlsls r0, 16\n" - "\tlsrs r6, r0, 16\n" - "\tasrs r0, 16\n" - "\tcmp r0, 0x4\n" - "\tble _0810370E\n" - "_0810375A:\n" - "\tadd sp, 0x4\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0"); -} -#endif // NONMATCHING static bool8 sub_8103764(u8 a0, u8 a1) { @@ -2872,7 +2735,7 @@ static void sub_81049F8(struct Task *task) DestroyTask(FindTaskIdByFunc(sub_810434C)); } -static const u16 gReelTimeWindowTilemap[]; +static const u16 sReelTimeWindowTilemap[]; static void sub_8104A40(s16 a0, s16 a1) { @@ -2880,7 +2743,7 @@ static void sub_8104A40(s16 a0, s16 a1) for (i = 4; i < 15; i++) { - u16 tile = gReelTimeWindowTilemap[a1 + (i - 4) * 20]; + u16 tile = sReelTimeWindowTilemap[a1 + (i - 4) * 20]; ((u16 *)BG_SCREEN_ADDR(28))[32 * i + a0] = tile; } } @@ -2997,7 +2860,7 @@ static void sub_8104CAC(u8 arg0) { sub_8104DA4(); - task = &gTasks[eSlotMachine->unk3D]; + task = gTasks + eSlotMachine->unk3D; task->data[1] = arg0; for (i = 0; gUnknown_083ED048[arg0][i].unk00 != 0xFF; i++) @@ -3139,7 +3002,7 @@ static void sub_810506C(struct Sprite *sprite) { u16 tag = eSlotMachine->coins; if (sprite->data[0]) - tag = eSlotMachine->unk0E; + tag = eSlotMachine->payout; if (sprite->data[3] != tag) { sprite->data[3] = tag; @@ -3561,9 +3424,9 @@ static void sub_8105B88(u8 spriteId) static const s16 gUnknown_083ECE7E[][2]; static const SpriteCallback gUnknown_083ECF0C[]; -u8 sub_8105BB4(u8 a0, u8 a1, s16 a2) +u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2) { - return sub_8105BF8(a0, gUnknown_083ECF0C[a1], gUnknown_083ECE7E[a1][0], gUnknown_083ECE7E[a1][1], a2); + return sub_8105BF8(templateIdx, gUnknown_083ECF0C[cbAndCoordsIdx], gUnknown_083ECE7E[cbAndCoordsIdx][0], gUnknown_083ECE7E[cbAndCoordsIdx][1], a2); } static const struct SpriteTemplate *const gUnknown_083EDB5C[]; @@ -4004,16 +3867,16 @@ static void sub_810639C(void) eSlotMachine->winOut = 0x3f; } -static const u8 gUnknown_083EDE8C[]; -static const struct SpriteSheet gUnknown_083EDC2C[]; +static const u8 sReelTimeGfx[]; +static const struct SpriteSheet sSlotMachineSpriteSheets[]; static const struct SpritePalette gSlotMachineSpritePalettes[]; static void sub_81063C0(void) { sub_8106404(); - LZDecompressWram(gSlotMachineReelTimeLights_Gfx, ewram10000); - LZDecompressWram(gUnknown_083EDE8C, ewram13200); - LoadSpriteSheets(gUnknown_083EDC2C); + LZDecompressWram(gSlotMachineReelTimeLights_Gfx, eSlotMachineGfxBuffer); + LZDecompressWram(sReelTimeGfx, eSlotMachineReelTimeGfxBuffer); + LoadSpriteSheets(sSlotMachineSpriteSheets); LoadSpritePalettes(gSlotMachineSpritePalettes); } @@ -4022,7 +3885,7 @@ static const struct SpriteSheet gUnknown_083EDCDC; static void sub_8106404(void) { - u8 *dest = ewram10000; + u8 *dest = eSlotMachineGfxBuffer; u8 i = 0; const struct SpriteSheet *sheet = &gUnknown_083EDCDC; const u8 *src = gUnknown_083EDCE4; @@ -4041,9 +3904,9 @@ static void sub_8106448(void) { u32 offsetRead, offsetWrite; u32 size; - LZDecompressWram(gSlotMachine_Gfx, ewram10000_2); + LZDecompressWram(gSlotMachine_Gfx, eSlotMachineGfxBuffer); - offsetRead = (u32)ewram10000_2; + offsetRead = (u32)eSlotMachineGfxBuffer; offsetWrite = BG_VRAM; size = SLOTMACHINE_GFX_TILES * 32; while (TRUE) @@ -4205,15 +4068,21 @@ static const u16 gUnknown_083ECE48[] = { 0x10, 0x08, 0x04, 0x02, 0x01 }; -static const u8 gUnknown_083ECE52[] = { - 7, 8, 4, 3, 0, 5, 2 +static const u8 sSym2Match[] = { + SLOT_MACHINE_MATCHED_777_RED, + SLOT_MACHINE_MATCHED_777_BLUE, + SLOT_MACHINE_MATCHED_AZURILL, + SLOT_MACHINE_MATCHED_LOTAD, + SLOT_MACHINE_MATCHED_1CHERRY, + SLOT_MACHINE_MATCHED_POWER, + SLOT_MACHINE_MATCHED_REPLAY }; -static const u16 gUnknown_083ECE5A[] = { +static const u16 sSlotMatchFlags[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x100 }; -static const u16 gUnknown_083ECE6C[] = { +static const u16 sSlotPayouts[] = { 2, 4, 0, 6, 12, 3, 90, 300, 300 }; @@ -4508,23 +4377,23 @@ static const struct OamData gOamData_83ED0B8 = { }; static const struct SpriteFrameImage gSpriteImageTable_83ED0C0[] = { - {ewram13200 + 0x0000, 0x800}, - {ewram13200 + 0x0800, 0x800}, - {ewram13200 + 0x1000, 0x800}, - {ewram13200 + 0x1800, 0x800}, - {ewram13200 + 0x2000, 0x800} + {eSlotMachineReelTimeGfxBuffer + 0x0000, 0x800}, + {eSlotMachineReelTimeGfxBuffer + 0x0800, 0x800}, + {eSlotMachineReelTimeGfxBuffer + 0x1000, 0x800}, + {eSlotMachineReelTimeGfxBuffer + 0x1800, 0x800}, + {eSlotMachineReelTimeGfxBuffer + 0x2000, 0x800} }; static const struct SpriteFrameImage gSpriteImageTable_83ED0E8[] = { - {ewram13200 + 0x2800, 0x300} + {eSlotMachineReelTimeGfxBuffer + 0x2800, 0x300} }; static const struct SpriteFrameImage gSpriteImageTable_83ED0F0[] = { - {ewram13200 + 0x2B00, 0x500} + {eSlotMachineReelTimeGfxBuffer + 0x2B00, 0x500} }; static const struct SpriteFrameImage gSpriteImageTable_83ED0F8[] = { - {ewram13200 + 0x3000, 0x600} + {eSlotMachineReelTimeGfxBuffer + 0x3000, 0x600} }; static const struct SpriteFrameImage gSpriteImageTable_83ED100[] = { @@ -4567,67 +4436,67 @@ static const struct SpriteFrameImage gSpriteImageTable_83ED170[] = { }; static const struct SpriteFrameImage gSpriteImageTable_83ED178[] = { - {ewram10000 + 0x0000, 0x600} + {eSlotMachineGfxBuffer + 0x0000, 0x600} }; static const struct SpriteFrameImage gSpriteImageTable_83ED180[] = { - {ewram10000 + 0x0600, 0x200} + {eSlotMachineGfxBuffer + 0x0600, 0x200} }; static const struct SpriteFrameImage gSpriteImageTable_83ED188[] = { - {ewram10000 + 0x0800, 0x200} + {eSlotMachineGfxBuffer + 0x0800, 0x200} }; static const struct SpriteFrameImage gSpriteImageTable_83ED190[] = { - {ewram10000 + 0x0A00, 0x200} + {eSlotMachineGfxBuffer + 0x0A00, 0x200} }; static const struct SpriteFrameImage gSpriteImageTable_83ED198[] = { - {ewram10000 + 0x0C00, 0x300} + {eSlotMachineGfxBuffer + 0x0C00, 0x300} }; static const struct SpriteFrameImage gSpriteImageTable_83ED1A0[] = { - {ewram10000 + 0x1000, 0x400} + {eSlotMachineGfxBuffer + 0x1000, 0x400} }; static const struct SpriteFrameImage gSpriteImageTable_83ED1A8[] = { - {ewram10000 + 0x1400, 0x200} + {eSlotMachineGfxBuffer + 0x1400, 0x200} }; static const struct SpriteFrameImage gSpriteImageTable_83ED1B0[] = { - {ewram10000 + 0x1600, 0x300} + {eSlotMachineGfxBuffer + 0x1600, 0x300} }; static const struct SpriteFrameImage gSpriteImageTable_83ED1B8[] = { - {ewram10000 + 0x1900, 0x300} + {eSlotMachineGfxBuffer + 0x1900, 0x300} }; static const struct SpriteFrameImage gSpriteImageTable_83ED1C0[] = { - {ewram10000 + 0x1C00, 0x200}, - {ewram10000 + 0x1E00, 0x200}, - {ewram10000 + 0x1E00, 0x200} // is this a typo? + {eSlotMachineGfxBuffer + 0x1C00, 0x200}, + {eSlotMachineGfxBuffer + 0x1E00, 0x200}, + {eSlotMachineGfxBuffer + 0x1E00, 0x200} // is this a typo? }; static const struct SpriteFrameImage gSpriteImageTable_83ED1D8[] = { - {ewram10000 + 0x2000, 0x280} + {eSlotMachineGfxBuffer + 0x2000, 0x280} }; static const struct SpriteFrameImage gSpriteImageTable_83ED1E0[] = { - {ewram10000 + 0x2280, 0x80}, - {ewram10000 + 0x2300, 0x80}, - {ewram10000 + 0x2380, 0x80}, - {ewram10000 + 0x2400, 0x80}, - {ewram10000 + 0x2480, 0x80} + {eSlotMachineGfxBuffer + 0x2280, 0x80}, + {eSlotMachineGfxBuffer + 0x2300, 0x80}, + {eSlotMachineGfxBuffer + 0x2380, 0x80}, + {eSlotMachineGfxBuffer + 0x2400, 0x80}, + {eSlotMachineGfxBuffer + 0x2480, 0x80} }; static const struct SpriteFrameImage gSpriteImageTable_83ED208[] = { - {ewram10000 + 0x2600, 0x480}, - {ewram10000 + 0x2A80, 0x480} + {eSlotMachineGfxBuffer + 0x2600, 0x480}, + {eSlotMachineGfxBuffer + 0x2A80, 0x480} }; static const struct SpriteFrameImage gSpriteImageTable_83ED218[] = { - {ewram10000 + 0x2F00, 0x180}, - {ewram10000 + 0x3080, 0x180} + {eSlotMachineGfxBuffer + 0x2F00, 0x180}, + {eSlotMachineGfxBuffer + 0x3080, 0x180} }; static const struct SpriteFrameImage gSpriteImageTable_83ED228[] = { @@ -5358,7 +5227,7 @@ static const struct SubspriteTable *const gUnknown_083EDBC4[] = { NULL }; -static const struct SpriteSheet gUnknown_083EDC2C[] = { +static const struct SpriteSheet sSlotMachineSpriteSheets[] = { {gSlotMachineReelSymbol1Tiles, 0x200, 0}, {gSlotMachineReelSymbol2Tiles, 0x200, 1}, {gSlotMachineReelSymbol3Tiles, 0x200, 2}, @@ -5376,15 +5245,15 @@ static const struct SpriteSheet gUnknown_083EDC2C[] = { {gSlotMachineNumber7Tiles, 0x40, 14}, {gSlotMachineNumber8Tiles, 0x40, 15}, {gSlotMachineNumber9Tiles, 0x40, 16}, - {ewram10000 + 0x0A00, 0x200, 18}, - {ewram10000 + 0x1400, 0x200, 19}, - {ewram10000 + 0x1600, 0x300, 20}, - {ewram10000 + 0x1900, 0x300, 21}, + {eSlotMachineGfxBuffer + 0x0A00, 0x200, 18}, + {eSlotMachineGfxBuffer + 0x1400, 0x200, 19}, + {eSlotMachineGfxBuffer + 0x1600, 0x300, 20}, + {eSlotMachineGfxBuffer + 0x1900, 0x300, 21}, {} }; static const struct SpriteSheet gUnknown_083EDCDC = { - ewram10000 + 0x0000, 0x800, 17 + eSlotMachineGfxBuffer + 0x0000, 0x800, 17 }; static const u8 *const gUnknown_083EDCE4 = gUnknownPalette_08E997E8; @@ -5467,6 +5336,6 @@ static const struct SpritePalette gSlotMachineSpritePalettes[] = { {} }; -static const u8 gUnknown_083EDE8C[] = INCBIN_U8("graphics/slot_machine/reel_time.4bpp.lz"); +static const u8 sReelTimeGfx[] = INCBIN_U8("graphics/slot_machine/reel_time.4bpp.lz"); -static const u16 gReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window_map.bin"); +static const u16 sReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window_map.bin"); -- cgit v1.2.3 From 59c99b2d65af9ea1d53d457c71dc7f0915d815c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Jan 2018 17:35:13 -0500 Subject: some renaming --- include/slot_machine.h | 16 ++-- src/field/slot_machine.c | 236 ++++++++++++++++++++++++++++++----------------- 2 files changed, 158 insertions(+), 94 deletions(-) diff --git a/include/slot_machine.h b/include/slot_machine.h index 5588d2bac..d932edff0 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -2,13 +2,13 @@ #define GUARD_SLOT_MACHINE_H enum { - SLOT_MACHINE_SYM_7_RED, - SLOT_MACHINE_SYM_7_BLUE, - SLOT_MACHINE_SYM_AZURILL, - SLOT_MACHINE_SYM_LOTAD, - SLOT_MACHINE_SYM_CHERRY, - SLOT_MACHINE_SYM_POWER, - SLOT_MACHINE_SYM_REPLAY + SLOT_MACHINE_TAG_7_RED, + SLOT_MACHINE_TAG_7_BLUE, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_CHERRY, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_REPLAY }; enum { @@ -46,7 +46,7 @@ struct SlotMachineEwramStruct { /*0x1A*/ s16 unk1A; /*0x1C*/ s16 unk1C[3]; /*0x22*/ u16 unk22[3]; - /*0x28*/ s16 unk28[3]; + /*0x28*/ s16 reelPositions[3]; /*0x2E*/ s16 unk2E[3]; /*0x34*/ s16 unk34[3]; /*0x3A*/ u8 reelTasks[3]; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 7691f4fa9..b1273ce7c 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -93,7 +93,7 @@ static bool8 sub_8102A44(void); static bool8 sub_8102A9C(struct Task *task); static bool8 sub_8102AD0(struct Task *task); static bool8 sub_8102B80(struct Task *task); -static u8 sub_8102BA4(u8 x, s16 y); +static u8 GetTagOfReelSymbolOnScreenAtPos(u8 x, s16 y); static void sub_8102DA8(void); static void sub_8102DEC(u8 a0); static void sub_8102E1C(u8 a0); @@ -392,8 +392,8 @@ static void SlotMachineSetup_0_1(void) for (i = 0; i < 3; i++) { eSlotMachine->unk22[i] = 0; - eSlotMachine->unk28[i] = gUnknown_083ECCF8[i][eSlotMachine->unk03] % 21; - eSlotMachine->unk1C[i] = 0x1f8 - eSlotMachine->unk28[i] * 24; + eSlotMachine->reelPositions[i] = gUnknown_083ECCF8[i][eSlotMachine->unk03] % 21; + eSlotMachine->unk1C[i] = 0x1f8 - eSlotMachine->reelPositions[i] * 24; eSlotMachine->unk1C[i] %= 0x1f8; } } @@ -1137,9 +1137,9 @@ static void CheckMatch_CenterRow(void) { u8 c1, c2, c3, match; - c1 = sub_8102BA4(0, 2); - c2 = sub_8102BA4(1, 2); - c3 = sub_8102BA4(2, 2); + c1 = GetTagOfReelSymbolOnScreenAtPos(0, 2); + c2 = GetTagOfReelSymbolOnScreenAtPos(1, 2); + c3 = GetTagOfReelSymbolOnScreenAtPos(2, 2); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1153,9 +1153,9 @@ static void CheckMatch_TopAndBottom(void) { u8 c1, c2, c3, match; - c1 = sub_8102BA4(0, 1); - c2 = sub_8102BA4(1, 1); - c3 = sub_8102BA4(2, 1); + c1 = GetTagOfReelSymbolOnScreenAtPos(0, 1); + c2 = GetTagOfReelSymbolOnScreenAtPos(1, 1); + c3 = GetTagOfReelSymbolOnScreenAtPos(2, 1); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1167,9 +1167,9 @@ static void CheckMatch_TopAndBottom(void) eSlotMachine->matchedSymbols |= sSlotMatchFlags[match]; sub_8103E04(1); } - c1 = sub_8102BA4(0, 3); - c2 = sub_8102BA4(1, 3); - c3 = sub_8102BA4(2, 3); + c1 = GetTagOfReelSymbolOnScreenAtPos(0, 3); + c2 = GetTagOfReelSymbolOnScreenAtPos(1, 3); + c3 = GetTagOfReelSymbolOnScreenAtPos(2, 3); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1187,9 +1187,9 @@ static void CheckMatch_Diagonals(void) { u8 c1, c2, c3, match; - c1 = sub_8102BA4(0, 1); - c2 = sub_8102BA4(1, 2); - c3 = sub_8102BA4(2, 3); + c1 = GetTagOfReelSymbolOnScreenAtPos(0, 1); + c2 = GetTagOfReelSymbolOnScreenAtPos(1, 2); + c3 = GetTagOfReelSymbolOnScreenAtPos(2, 3); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1200,9 +1200,9 @@ static void CheckMatch_Diagonals(void) } sub_8103E04(3); } - c1 = sub_8102BA4(0, 3); - c2 = sub_8102BA4(1, 2); - c3 = sub_8102BA4(2, 1); + c1 = GetTagOfReelSymbolOnScreenAtPos(0, 3); + c2 = GetTagOfReelSymbolOnScreenAtPos(1, 2); + c3 = GetTagOfReelSymbolOnScreenAtPos(2, 1); match = GetMatchFromSymbolsInRow(c1, c2, c3); if (match != SLOT_MACHINE_MATCHED_NONE) { @@ -1223,15 +1223,15 @@ static u8 GetMatchFromSymbolsInRow(u8 c1, u8 c2, u8 c3) { return sSym2Match[c1]; } - if (c1 == SLOT_MACHINE_SYM_7_RED && c2 == SLOT_MACHINE_SYM_7_RED && c3 == SLOT_MACHINE_SYM_7_BLUE) + if (c1 == SLOT_MACHINE_TAG_7_RED && c2 == SLOT_MACHINE_TAG_7_RED && c3 == SLOT_MACHINE_TAG_7_BLUE) { return SLOT_MACHINE_MATCHED_777_MIXED; } - if (c1 == SLOT_MACHINE_SYM_7_BLUE && c2 == SLOT_MACHINE_SYM_7_BLUE && c3 == SLOT_MACHINE_SYM_7_RED) + if (c1 == SLOT_MACHINE_TAG_7_BLUE && c2 == SLOT_MACHINE_TAG_7_BLUE && c3 == SLOT_MACHINE_TAG_7_RED) { return SLOT_MACHINE_MATCHED_777_MIXED; } - if (c1 == SLOT_MACHINE_SYM_CHERRY) + if (c1 == SLOT_MACHINE_TAG_CHERRY) { return SLOT_MACHINE_MATCHED_1CHERRY; } @@ -1322,24 +1322,24 @@ static bool8 sub_8102B80(struct Task *task) return FALSE; } -static const u8 gUnknown_083ECCB2[][21]; +static const u8 sReelSymbols[][21]; -static u8 sub_8102BA4(u8 x, s16 y) +static u8 GetTagOfReelSymbolOnScreenAtPos(u8 x, s16 y) { - s16 offset = (eSlotMachine->unk28[x] + y) % 21; + s16 offset = (eSlotMachine->reelPositions[x] + y) % 21; if (offset < 0) { offset += 21; } - return gUnknown_083ECCB2[x][offset]; + return sReelSymbols[x][offset]; } -static u8 sub_8102BF8(u8 x, s16 y) +static u8 GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(u8 x, s16 y) { s16 r6 = 0; if ((eSlotMachine->unk1C[x]) % 24) r6 = -1; - return sub_8102BA4(x, y + r6); + return GetTagOfReelSymbolOnScreenAtPos(x, y + r6); } static const u8 gUnknown_083ECCF1[]; @@ -1356,7 +1356,7 @@ static void sub_8102C84(u8 a0, s16 a1) { eSlotMachine->unk1C[a0] += a1; eSlotMachine->unk1C[a0] %= 504; - eSlotMachine->unk28[a0] = 21 - eSlotMachine->unk1C[a0] / 24; + eSlotMachine->reelPositions[a0] = 21 - eSlotMachine->unk1C[a0] / 24; } static s16 sub_8102CCC(u8 a0, s16 a1) @@ -1528,20 +1528,20 @@ static bool8 sub_810305C(void) return gUnknown_083ECB64[eSlotMachine->bet - 1](r5, r3); } -static bool8 sub_81030A4(s16 a0, u8 a1, u8 a2) +static bool8 sub_81030A4(s16 y, u8 tag1, u8 tag2) { - u8 r1 = sub_8102BF8(0, a0); - if (r1 == a1 || r1 == a2) + u8 tag = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, y); + if (tag == tag1 || tag == tag2) { - eSlotMachine->unk07 = r1; + eSlotMachine->unk07 = tag; return TRUE; } return FALSE; } -static bool8 sub_81030E0(s16 a0) +static bool8 sub_81030E0(s16 y) { - if (sub_8102BF8(0, 1 - a0) == 4 || sub_8102BF8(0, 2 - a0) == 4 || sub_8102BF8(0, 3 - a0) == 4) + if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 1 - y) == 4 || GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 2 - y) == 4 || GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 3 - y) == 4) { return TRUE; } @@ -1573,7 +1573,7 @@ static bool8 sub_8103154(u8 a0, u8 a1) return FALSE; } -static bool8 sub_81031B4(u8 a0, u8 a1) +static bool8 sub_81031B4(u8 tag1, u8 tag2) { s16 i; bool8 r6 = sub_8103134(); @@ -1581,7 +1581,7 @@ static bool8 sub_81031B4(u8 a0, u8 a1) { for (i = 1; i < 4; i++) { - if (sub_81030A4(i, a0, a1)) + if (sub_81030A4(i, tag1, tag2)) { eSlotMachine->unk34[0] = i; eSlotMachine->unk2E[0] = 0; @@ -1594,7 +1594,7 @@ static bool8 sub_81031B4(u8 a0, u8 a1) bool8 r7 = r6; if (r7 || !sub_81030E0(i)) { - if (sub_81030A4(1 - i, a0, a1)) + if (sub_81030A4(1 - i, tag1, tag2)) { if (i == 1 && (r7 || !sub_81030E0(3))) { @@ -1635,7 +1635,7 @@ static bool8 sub_81032E8(void) for (i = 0; i < 5; i++) { - if (sub_8102BF8(1, unk34_0 - i) == eSlotMachine->unk07) + if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, unk34_0 - i) == eSlotMachine->unk07) { eSlotMachine->unk34[1] = unk34_0; eSlotMachine->unk2E[1] = i; @@ -1654,7 +1654,7 @@ static bool8 sub_810333C(void) { for (i = 0; i < 5; i++) { - if (sub_8102BF8(1, 2 - i) == eSlotMachine->unk07) + if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - i) == eSlotMachine->unk07) { eSlotMachine->unk34[1] = 2; eSlotMachine->unk2E[1] = i; @@ -1668,7 +1668,7 @@ static bool8 sub_810333C(void) { for (i = 0; i < 5; i++) { - if (sub_8102BF8(1, 2 - i) == eSlotMachine->unk07) + if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - i) == eSlotMachine->unk07) { eSlotMachine->unk34[1] = 2; eSlotMachine->unk2E[1] = i; @@ -1706,7 +1706,7 @@ static bool8 sub_810341C(u8 a0) for (i = 0; i < 5; i++) { - if (sub_8102BF8(2, unk34_1 - i) == a0) + if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, unk34_1 - i) == a0) { eSlotMachine->unk34[2] = unk34_1; eSlotMachine->unk2E[2] = i; @@ -1731,7 +1731,7 @@ static bool8 sub_810347C(u8 a0) } for (i = 0; i < 5; i++) { - if (sub_8102BF8(2, r8 - i) == a0) + if (GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, r8 - i) == a0) { eSlotMachine->unk2E[2] = i; eSlotMachine->unk34[2] = r8; @@ -1778,13 +1778,13 @@ static void sub_8103564(void) { if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) { - u8 sp0 = sub_8102BF8(0, 2 - eSlotMachine->unk2E[0]); + u8 sp0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 2 - eSlotMachine->unk2E[0]); if (sub_8103520(&sp0)) { s16 i; for (i = 0; i < 5; i++) { - if (sp0 == sub_8102BF8(1, 2 - i)) + if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - i)) { eSlotMachine->unk34[1] = 2; eSlotMachine->unk2E[1] = i; @@ -1799,13 +1799,13 @@ static void j5_08111E84(void) { if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) { - u8 sp0 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + u8 sp0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); if (sub_8103520(&sp0)) { s16 i; for (i = 0; i < 5; i++) { - if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - i)) + if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, eSlotMachine->unk34[0] - i)) { eSlotMachine->unk34[1] = eSlotMachine->unk34[0]; eSlotMachine->unk2E[1] = i; @@ -1819,7 +1819,7 @@ static void j5_08111E84(void) static void sub_8103668(void) { s16 i; - s16 r6; + s16 j; if (eSlotMachine->unk34[0] != 0 && eSlotMachine->unk04 & 0x80) { if (eSlotMachine->unk34[0] == 2) @@ -1828,49 +1828,49 @@ static void sub_8103668(void) } else { - u8 sp0 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + u8 sp0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); if (sub_8103520(&sp0)) { - r6 = 2; + j = 2; if (eSlotMachine->unk34[0] == 3) - r6 = 3; - for (i = 0; i < 2; i++, r6--) + j = 3; + for (i = 0; i < 2; i++, j--) { - if (sp0 == sub_8102BF8(1, r6)) + if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, j)) { - eSlotMachine->unk34[1] = r6; + eSlotMachine->unk34[1] = j; eSlotMachine->unk2E[1] = 0; return; } } - for (r6 = 1; r6 < 5; r6++) + for (j = 1; j < 5; j++) { - if (sp0 == sub_8102BF8(1, eSlotMachine->unk34[0] - r6)) + if (sp0 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, eSlotMachine->unk34[0] - j)) { if (eSlotMachine->unk34[0] == 1) { - if (r6 < 3) + if (j < 3) { eSlotMachine->unk34[1] = 2; - eSlotMachine->unk2E[1] = r6 + 1; + eSlotMachine->unk2E[1] = j + 1; } else { eSlotMachine->unk34[1] = 1; - eSlotMachine->unk2E[1] = r6; + eSlotMachine->unk2E[1] = j; } } else { - if (r6 < 3) + if (j < 3) { eSlotMachine->unk34[1] = 3; - eSlotMachine->unk2E[1] = r6; + eSlotMachine->unk2E[1] = j; } else { eSlotMachine->unk34[1] = 2; - eSlotMachine->unk2E[1] = r6 - 1; + eSlotMachine->unk2E[1] = j - 1; } } return; @@ -1926,14 +1926,14 @@ static void sub_810380C(void) static void sub_8103830(void) { s16 i = 0; - u8 r5 = sub_8102BF8(0, 2 - eSlotMachine->unk2E[0]); - u8 r1 = sub_8102BF8(1, 2 - eSlotMachine->unk2E[1]); + u8 r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 2 - eSlotMachine->unk2E[0]); + u8 r1 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - eSlotMachine->unk2E[1]); if (r5 == r1) { while (1) { u8 r0; - if (!(r5 == (r0 = sub_8102BF8(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) + if (!(r5 == (r0 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 2 - i)) || (r5 == 0 && r0 == 1) || (r5 == 1 && r0 == 0))) { break; } @@ -1946,7 +1946,7 @@ static void sub_8103830(void) { for (i = 0; i < 5; i++) { - if (r5 == sub_8102BF8(2, 2 - i)) + if (r5 == GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 2 - i)) { eSlotMachine->unk2E[2] = i; return; @@ -1956,7 +1956,7 @@ static void sub_8103830(void) i = 0; while (1) { - if (r5 != sub_8102BF8(2, 2 - i)) + if (r5 != GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 2 - i)) { break; } @@ -1976,13 +1976,13 @@ static void sub_8103910(void) if (eSlotMachine->unk34[1] != 0 && eSlotMachine->unk34[0] == eSlotMachine->unk34[1] && eSlotMachine->unk04 & 0x80) { - r7 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); - r6 = sub_8102BF8(1, eSlotMachine->unk34[1] - eSlotMachine->unk2E[1]); + r7 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, eSlotMachine->unk34[1] - eSlotMachine->unk2E[1]); if (sub_8103764(r7, r6)) { for (i = 0; i < 5; i++) { - r4 = sub_8102BF8(2, eSlotMachine->unk34[1] - i); + r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, eSlotMachine->unk34[1] - i); if (r7 == r4) { sp0 = i; @@ -1996,9 +1996,9 @@ static void sub_8103910(void) s16 r8; for (i = 1, r8 = 0; i < 4; i++) { - r7 = sub_8102BF8(0, i - eSlotMachine->unk2E[0]); - r6 = sub_8102BF8(1, i - eSlotMachine->unk2E[1]); - r4 = sub_8102BF8(2, i - sp0); + r7 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, i - eSlotMachine->unk2E[0]); + r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, i - eSlotMachine->unk2E[1]); + r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, i - sp0); if (!sub_81037BC(r7, r6, r4) && (!sub_810378C(r7, r6, r4) || !(eSlotMachine->unk04 & 0x80))) { r8++; @@ -2025,8 +2025,8 @@ static void sub_8103A78(void) sub_8103910(); if (eSlotMachine->unk34[1] != 0 && eSlotMachine->unk34[0] != eSlotMachine->unk34[1] && eSlotMachine->unk04 & 0x80) { - r6 = sub_8102BF8(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); - r5 = sub_8102BF8(1, eSlotMachine->unk34[1] - eSlotMachine->unk2E[1]); + r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, eSlotMachine->unk34[0] - eSlotMachine->unk2E[0]); + r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, eSlotMachine->unk34[1] - eSlotMachine->unk2E[1]); if (sub_8103764(r6, r5)) { r8 = 1; @@ -2034,7 +2034,7 @@ static void sub_8103A78(void) r8 = 3; for (i = 0; i < 5; i++) { - r4 = sub_8102BF8(2, r8 - (eSlotMachine->unk2E[2] + i)); + r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, r8 - (eSlotMachine->unk2E[2] + i)); if (r6 == r4) { eSlotMachine->unk2E[2] += i; @@ -2045,18 +2045,18 @@ static void sub_8103A78(void) } while (1) { - r6 = sub_8102BF8(0, 1 - eSlotMachine->unk2E[0]); - r5 = sub_8102BF8(1, 2 - eSlotMachine->unk2E[1]); - r4 = sub_8102BF8(2, 3 - eSlotMachine->unk2E[2]); + r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 1 - eSlotMachine->unk2E[0]); + r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - eSlotMachine->unk2E[1]); + r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 3 - eSlotMachine->unk2E[2]); if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && eSlotMachine->unk04 & 0x80)) break; eSlotMachine->unk2E[2]++; } while (1) { - r6 = sub_8102BF8(0, 3 - eSlotMachine->unk2E[0]); - r5 = sub_8102BF8(1, 2 - eSlotMachine->unk2E[1]); - r4 = sub_8102BF8(2, 1 - eSlotMachine->unk2E[2]); + r6 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(0, 3 - eSlotMachine->unk2E[0]); + r5 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(1, 2 - eSlotMachine->unk2E[1]); + r4 = GetTagOfReelSymbolOnScreenAtPos_AdjustForPixelOffset(2, 1 - eSlotMachine->unk2E[2]); if (sub_81037BC(r6, r5, r4) || (sub_810378C(r6, r5, r4) && eSlotMachine->unk04 & 0x80)) break; eSlotMachine->unk2E[2]++; @@ -2968,7 +2968,7 @@ static void sub_8104F18(struct Sprite *sprite) sprite->data[2] = eSlotMachine->unk1C[sprite->data[0]] + sprite->data[1]; sprite->data[2] %= 120; sprite->pos1.y = eSlotMachine->unk22[sprite->data[0]] + 28 + sprite->data[2]; - sprite->sheetTileStart = GetSpriteTileStartByTag(sub_8102BA4(sprite->data[0], sprite->data[2] / 24)); + sprite->sheetTileStart = GetSpriteTileStartByTag(GetTagOfReelSymbolOnScreenAtPos(sprite->data[0], sprite->data[2] / 24)); SetSpriteSheetFrameTileNum(sprite); } @@ -3982,10 +3982,74 @@ static void sub_81065DC(void) { } } -static const u8 gUnknown_083ECCB2[][21] = { - {0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6}, - {0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4}, - {0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4} +static const u8 sReelSymbols[][21] = { + { + SLOT_MACHINE_TAG_7_RED, + SLOT_MACHINE_TAG_CHERRY, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_7_BLUE, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_CHERRY, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_7_RED, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_7_BLUE, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_REPLAY + }, { + SLOT_MACHINE_TAG_7_RED, + SLOT_MACHINE_TAG_CHERRY, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_CHERRY, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_7_BLUE, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_CHERRY, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_CHERRY, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_CHERRY + }, { + SLOT_MACHINE_TAG_7_RED, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_7_BLUE, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_AZURILL, + SLOT_MACHINE_TAG_POWER, + SLOT_MACHINE_TAG_REPLAY, + SLOT_MACHINE_TAG_LOTAD, + SLOT_MACHINE_TAG_CHERRY + } }; static const u8 gUnknown_083ECCF1[] = { -- cgit v1.2.3 From 5c427e8afed44ed3720cf97d6748fa9e806c9b83 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:37:52 -0800 Subject: Use song constants in scripts --- data-de/event_scripts.s | 46 +++++++++++----------- data/battle_scripts_2.s | 2 +- data/event_scripts.s | 46 +++++++++++----------- data/scripts/berry_tree.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/contest_hall.inc | 32 +++++++-------- data/scripts/day_care.inc | 4 +- data/scripts/magma_chimney.inc | 2 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 8 ++-- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 10 ++--- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DewfordTown_Gym.inc | 8 ++-- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 14 +++---- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 4 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 6 +-- data/scripts/maps/LilycoveCity.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 16 ++++---- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 4 +- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 6 +-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 22 +++++------ data/scripts/maps/MauvilleCity_Gym.inc | 4 +- data/scripts/maps/MauvilleCity_House2.inc | 2 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 4 +- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 4 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 6 +-- data/scripts/maps/PetalburgCity_Gym.inc | 6 +-- data/scripts/maps/PetalburgWoods.inc | 4 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route103.inc | 8 ++-- data/scripts/maps/Route110.inc | 6 +-- data/scripts/maps/Route110_TrickHouseEnd.inc | 6 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 10 ++--- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 ++-- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 14 +++---- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 10 ++--- data/scripts/maps/Route111.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 2 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/RustboroCity.inc | 18 ++++----- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 8 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RusturfTunnel.inc | 4 +- data/scripts/maps/SSTidalCorridor.inc | 14 +++---- data/scripts/maps/SeafloorCavern_Room9.inc | 12 +++--- data/scripts/maps/SealedChamber_InnerRoom.inc | 8 ++-- data/scripts/maps/SlateportCity.inc | 6 +-- data/scripts/maps/SlateportCity_ContestLobby.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 6 +-- .../maps/SlateportCity_OceanicMuseum_2F.inc | 4 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 ++-- data/scripts/maps/UnknownMap_25_34.inc | 10 ++--- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 4 +- data/scripts/players_house.inc | 12 +++--- data/scripts/safari_zone.inc | 4 +- 83 files changed, 271 insertions(+), 271 deletions(-) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index e786a6ab1..ab511dcd6 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -396,13 +396,13 @@ gStdScripts_End:: gUnknown_0815F36C:: @ 815F36C lockall - playse 2 + playse SE_PC_LOGON message UnknownString_81A3A72 dofieldeffect 61 waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_15F384 end @@ -458,12 +458,12 @@ EventScript_15F436: gUnknown_0815F43A:: @ 815F43A lockall message UnknownString_81A3A72 - playse 2 + playse SE_PC_LOGON dofieldeffect 61 waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_15F452 end @@ -1572,11 +1572,11 @@ Std_ObtainItem_Fail: @ 819FECC return PlayGetItemFanfare: - playfanfare 0x172 + playfanfare BGM_FANFA4 return PlayGetTMHMFanfare: - playfanfare 0x174 + playfanfare BGM_ME_WAZA return Std_ObtainDecoration: @ 819FEDA @@ -1594,7 +1594,7 @@ Std_ObtainDecoration_: @ 819FEE8 return Std_ObtainDecoration_Success: @ 819FF03 - playfanfare 0x172 + playfanfare BGM_FANFA4 message Message_ObtainedDecoration waitfanfare waitmessage @@ -1691,7 +1691,7 @@ gUnknown_081A0009:: @ 81A0009 lockall setvar VAR_SPECIAL_4, 0 special DoPCTurnOnEffect - playse 4 + playse SE_PC_ON msgbox UnknownString_81A09EC, 4 goto EventScript_1A0023 end @@ -1714,7 +1714,7 @@ EventScript_1A0033: end EventScript_1A0070: - playse 2 + playse SE_PC_LOGON msgbox UnknownString_81A0A54, 4 special PlayerPC waitstate @@ -1722,7 +1722,7 @@ EventScript_1A0070: end EventScript_1A0085: - playse 2 + playse SE_PC_LOGON checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_1A00AC checkflag FLAG_SYS_PC_LANETTE @@ -1743,7 +1743,7 @@ EventScript_1A00B5: EventScript_1A00BE: setvar VAR_SPECIAL_4, 0 - playse 3 + playse SE_PC_OFF special DoPCTurnOffEffect releaseall end @@ -1751,7 +1751,7 @@ EventScript_1A00BE: EventScript_1A00CB: checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE - playse 2 + playse SE_PC_LOGON special AccessHallOfFamePC waitstate goto EventScript_1A0033 @@ -2111,7 +2111,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5 - playfanfare 369 + playfanfare BGM_ME_BACHI waitfanfare return @@ -2120,7 +2120,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 - playfanfare 368 + playfanfare BGM_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty fadescreen 0 @@ -2139,7 +2139,7 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7 Route104_EventScript_1A02E7:: @ 81A02E7 Route109_EventScript_1A02E7:: @ 81A02E7 setflag FLAG_SPECIAL_FLAG_1 - playbgm 431, 0 + playbgm BGM_M_BOAT, FALSE return DewfordTown_EventScript_1A02EF:: @ 81A02EF @@ -2553,7 +2553,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F bufferitemname 0, VAR_SPECIAL_4 - playfanfare 372 + playfanfare BGM_ME_WAZA message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare @@ -2566,7 +2566,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 - playse 8 + playse SE_DOOR setmetatile 6, 1, 836, 0 setmetatile 6, 2, 837, 0 setmetatile 0, 2, 734, 1 @@ -2588,7 +2588,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 - playse 52 + playse SE_TRACK_DOOR setmetatile 5, 12, 518, 1 setmetatile 6, 12, 518, 1 setmetatile 7, 12, 518, 1 @@ -3742,7 +3742,7 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage - playse 9 + playse SE_KAIDAN setvar VAR_0x4097, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC @@ -3762,7 +3762,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage - playse 9 + playse SE_KAIDAN special sub_80BC440 end @@ -3781,7 +3781,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall setvar VAR_0x4097, 1 - playse 9 + playse SE_KAIDAN special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 @@ -4915,7 +4915,7 @@ S_FallDownHole:: @ 81C6BC5 delay 20 applymovement 255, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 warphole MAP_UNDEFINED waitstate @@ -4926,7 +4926,7 @@ gUnknown_081C6BDE:: @ 81C6BDE delay 20 applymovement 255, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 special sp13F_fall_to_last_warp waitstate diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 26f28726d..e113513d6 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -164,7 +164,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB finishaction BattleScript_RunByUsingItem: @ 81D9FDA - playse 17 + playse SE_NIGERU setbyte gBattleOutcome, BATTLE_RAN finishturn diff --git a/data/event_scripts.s b/data/event_scripts.s index 7d59b5234..b751a2e63 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -396,13 +396,13 @@ gStdScripts_End:: gUnknown_0815F36C:: @ 815F36C lockall - playse 2 + playse SE_PC_LOGON message UnknownString_81A3A72 dofieldeffect 61 waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_15F384 end @@ -458,12 +458,12 @@ EventScript_15F436: gUnknown_0815F43A:: @ 815F43A lockall message UnknownString_81A3A72 - playse 2 + playse SE_PC_LOGON dofieldeffect 61 waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_15F452 end @@ -1566,11 +1566,11 @@ Std_ObtainItem_Fail: @ 819FECC return PlayGetItemFanfare: - playfanfare 0x172 + playfanfare BGM_FANFA4 return PlayGetTMHMFanfare: - playfanfare 0x174 + playfanfare BGM_ME_WAZA return Std_ObtainDecoration: @ 819FEDA @@ -1588,7 +1588,7 @@ Std_ObtainDecoration_: @ 819FEE8 return Std_ObtainDecoration_Success: @ 819FF03 - playfanfare 0x172 + playfanfare BGM_FANFA4 message Message_ObtainedDecoration waitfanfare waitmessage @@ -1685,7 +1685,7 @@ gUnknown_081A0009:: @ 81A0009 lockall setvar VAR_SPECIAL_4, 0 special DoPCTurnOnEffect - playse 4 + playse SE_PC_ON msgbox UnknownString_81A09EC, 4 goto EventScript_1A0023 end @@ -1708,7 +1708,7 @@ EventScript_1A0033: end EventScript_1A0070: - playse 2 + playse SE_PC_LOGON msgbox UnknownString_81A0A54, 4 special PlayerPC waitstate @@ -1716,7 +1716,7 @@ EventScript_1A0070: end EventScript_1A0085: - playse 2 + playse SE_PC_LOGON checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_1A00AC checkflag FLAG_SYS_PC_LANETTE @@ -1737,7 +1737,7 @@ EventScript_1A00B5: EventScript_1A00BE: setvar VAR_SPECIAL_4, 0 - playse 3 + playse SE_PC_OFF special DoPCTurnOffEffect releaseall end @@ -1745,7 +1745,7 @@ EventScript_1A00BE: EventScript_1A00CB: checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE - playse 2 + playse SE_PC_LOGON special AccessHallOfFamePC waitstate goto EventScript_1A0033 @@ -2105,7 +2105,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5 - playfanfare 369 + playfanfare BGM_ME_BACHI waitfanfare return @@ -2114,7 +2114,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 - playfanfare 368 + playfanfare BGM_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty fadescreen 0 @@ -2133,7 +2133,7 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7 Route104_EventScript_1A02E7:: @ 81A02E7 Route109_EventScript_1A02E7:: @ 81A02E7 setflag FLAG_SPECIAL_FLAG_1 - playbgm 431, 0 + playbgm BGM_M_BOAT, FALSE return DewfordTown_EventScript_1A02EF:: @ 81A02EF @@ -2547,7 +2547,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F bufferitemname 0, VAR_SPECIAL_4 - playfanfare 372 + playfanfare BGM_ME_WAZA message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare @@ -2560,7 +2560,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 - playse 8 + playse SE_DOOR setmetatile 6, 1, 836, 0 setmetatile 6, 2, 837, 0 setmetatile 0, 2, 734, 1 @@ -2582,7 +2582,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 - playse 52 + playse SE_TRACK_DOOR setmetatile 5, 12, 518, 1 setmetatile 6, 12, 518, 1 setmetatile 7, 12, 518, 1 @@ -3721,7 +3721,7 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage - playse 9 + playse SE_KAIDAN setvar VAR_0x4097, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC @@ -3741,7 +3741,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage - playse 9 + playse SE_KAIDAN special sub_80BC440 end @@ -3760,7 +3760,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall setvar VAR_0x4097, 1 - playse 9 + playse SE_KAIDAN special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 @@ -4883,7 +4883,7 @@ S_FallDownHole:: @ 81C6BC5 delay 20 applymovement 255, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 warphole MAP_UNDEFINED waitstate @@ -4894,7 +4894,7 @@ gUnknown_081C6BDE:: @ 81C6BDE delay 20 applymovement 255, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 special sp13F_fall_to_last_warp waitstate diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 55b8e2439..817e2b1e4 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -113,7 +113,7 @@ Route102_EventScript_1A161D:: @ 81A161D goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD - playfanfare 387 + playfanfare BGM_ME_KINOMI waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b3926af65..397538eaf 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -136,7 +136,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 waitmovement 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 waitmessage - playse 21 + playse SE_PIN message OldaleTown_PokemonCenter_2F_Text_1A4E79 waitmessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 9c5c246e2..4a7712f58 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -345,13 +345,13 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 waitmovement 0 releaseall addobject 13 - playse 10 + playse SE_DANSA lockall applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addvar VAR_SPECIAL_6, -1 - playse 15 + playse SE_BOWA2 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E return @@ -371,7 +371,7 @@ LinkContestRoom1_EventScript_1A5370:: @ 81A5370 LinkContestRoom1_EventScript_1A5377:: @ 81A5377 call LinkContestRoom1_EventScript_1A53B3 call LinkContestRoom1_EventScript_1A53CE - playse 223 + playse SE_W227B waitmessage call LinkContestRoom1_EventScript_1A5A90 applymovement 1, LinkContestRoom1_Movement_1A5D9F @@ -408,7 +408,7 @@ LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 applymovement 1, LinkContestRoom1_Movement_1A5DAF waitmovement 0 - playse 223 + playse SE_W227B call LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -621,7 +621,7 @@ LinkContestRoom1_EventScript_1A5760:: @ 81A5760 compare VAR_TEMP_1, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 applymovement 6, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_1, 1 addvar VAR_TEMP_0, -1 @@ -634,7 +634,7 @@ LinkContestRoom1_EventScript_1A5784:: @ 81A5784 compare VAR_TEMP_2, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 applymovement 12, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_2, 1 addvar VAR_TEMP_0, -1 @@ -647,7 +647,7 @@ LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 compare VAR_TEMP_3, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB applymovement 7, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_3, 1 addvar VAR_TEMP_0, -1 @@ -660,7 +660,7 @@ LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC compare VAR_TEMP_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF applymovement 8, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_4, 1 addvar VAR_TEMP_0, -1 @@ -673,7 +673,7 @@ LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 compare VAR_TEMP_5, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 applymovement 9, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_5, 1 addvar VAR_TEMP_0, -1 @@ -686,7 +686,7 @@ LinkContestRoom1_EventScript_1A5814:: @ 81A5814 compare VAR_TEMP_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 applymovement 10, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_6, 1 addvar VAR_TEMP_0, -1 @@ -699,7 +699,7 @@ LinkContestRoom1_EventScript_1A5838:: @ 81A5838 compare VAR_TEMP_7, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B applymovement 11, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_7, 1 addvar VAR_TEMP_0, -1 @@ -712,7 +712,7 @@ LinkContestRoom1_EventScript_1A585C:: @ 81A585C compare VAR_TEMP_8, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F applymovement 15, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_8, 1 addvar VAR_TEMP_0, -1 @@ -805,7 +805,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A setvar VAR_TEMP_9, 1 showcontestresults setvar VAR_TEMP_9, 0 - playbgm 439, 0 + playbgm BGM_CON_FAN, FALSE return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 @@ -890,7 +890,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 - playse 223 + playse SE_W227B setvar VAR_TEMP_1, 0 return @@ -1002,7 +1002,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB waitmessage call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 - playse 223 + playse SE_W227B setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_1A5A90 delay 30 @@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LinkContestRoom1_Text_1A6D96, 4 waitfanfare special sub_80C4858 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 8c2325e04..ab91466d8 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298 Route117_EventScript_1B22B2:: @ 81B22B2 message Route117_Text_1B27A2 - playfanfare 367 + playfanfare BGM_FANFA1 waitfanfare waitmessage waitbuttonpress @@ -208,7 +208,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE waitmovement 0 specialvar RESULT, TakePokemonFromDaycare special PayMoneyFor - playse 95 + playse SE_REGI msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse playmoncry RESULT, 0 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index d104b52d4..11f42daf0 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -37,7 +37,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif applymovement 2, MtChimney_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 2, MtChimney_Movement_1A0833 waitmovement 0 applymovement 2, MtChimney_Movement_1A0835 diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index c27951abb..b4d29632e 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -34,7 +34,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 - playse 21 + playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 35e86543b..7b61190e5 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -66,7 +66,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 @@ -82,7 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 @@ -114,7 +114,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 5ec8197f9..d7b47cdfd 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -10,7 +10,7 @@ AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar VAR_SPECIAL_8, 1 - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 7853b3598..1ee0d35d2 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special SetBattleTowerParty - playfanfare 368 + playfanfare BGM_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty @@ -110,7 +110,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage - playse 55 + playse SE_SAVE waitse msgbox BattleTower_BattleRoom_Text_1C6D05, 4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 4058d5aae..5700480e2 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -84,7 +84,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -100,7 +100,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D special DetermineBattleTowerPrize setvar VAR_SPECIAL_4, 3 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD @@ -114,7 +114,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare setvar VAR_SPECIAL_4, 9 special BattleTowerUtil @@ -148,7 +148,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage @@ -166,7 +166,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage setvar VAR_SPECIAL_4, 1 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 669b0a5fe..904759cf1 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -37,7 +37,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playse 209 + playse SE_W197 setfieldeffectargument 0, 9 setfieldeffectargument 1, 13 setfieldeffectargument 2, 0 @@ -48,7 +48,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar RESULT, 2 .endif - playse 107 + playse SE_TAMA special sub_80818A4 waitstate special sub_80818FC diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index ee7d77d6b..ba933dbe9 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -56,25 +56,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playse 35 + playse SE_MU_PACHI animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playse 35 + playse SE_MU_PACHI animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playse 35 + playse SE_MU_PACHI animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playse 35 + playse SE_MU_PACHI animateflash 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 1ca62b61c..29c29c80b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -38,20 +38,20 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playbgm 454, 0 + playbgm BGM_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 - playse 8 + playse SE_DOOR setmetatile 6, 1, 838, 0 setmetatile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage - playse 8 + playse SE_DOOR checkplayergender compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C @@ -67,17 +67,17 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playbgm 415, 0 + playbgm BGM_GIRL_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playbgm 421, 0 + playbgm BGM_BOY_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 delay 40 - playse 21 + playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmovement 0 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 @@ -90,7 +90,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 delay 40 - playse 21 + playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmovement 0 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index d83745593..a738264fe 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 faceplayer checkflag FLAG_DEFEATED_ELITE_4_DRAKE goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 0e5b493e2..e3a4145d6 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA faceplayer checkflag FLAG_DEFEATED_ELITE_4_GLACIA goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 19219a626..d23f234db 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 faceplayer checkflag FLAG_DEFEATED_ELITE_4_PHOEBE goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 5957508ae..a787b0f90 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -64,7 +64,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 - playfanfare 369 + playfanfare BGM_ME_BACHI message EverGrandeCity_PokemonLeague_Text_191804 waitmessage waitfanfare @@ -86,7 +86,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playse 32 + playse SE_HAZURE msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index f3df03b7d..4531845ab 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 faceplayer checkflag FLAG_DEFEATED_ELITE_4_SYDNEY goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 270575bcb..641a201e3 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -22,13 +22,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 0c9880137..93a5115af 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playse 18 + playse SE_JIDO_DOA removeobject 4 clearflag FLAG_HIDE_LANETTE release diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 3d4a57c13..c9616266e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - playse 9 + playse SE_KAIDAN removeobject 1 release end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 43a8ed7cd..e81c3b69f 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -58,11 +58,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return LavaridgeTown_EventScript_14E570:: @ 814E570 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -282,7 +282,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare 370 + playfanfare BGM_FANFA4 message LavaridgeTown_Text_16C2EA waitfanfare waitmessage diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 5c05639fd..0d714003e 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -255,7 +255,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CDB0 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE @@ -286,7 +286,7 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CE23 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 377c2908d..591587be8 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -72,13 +72,13 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 special sub_80C4858 applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E waitmovement 0 - playse 21 + playse SE_PIN applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833 waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -245,13 +245,13 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 special sub_80C4858 applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 waitmovement 0 - playse 21 + playse SE_PIN applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833 waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -496,13 +496,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 9, 2, 545, 1 setmetatile 9, 3, 609, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 9, 2, 721, 1 setmetatile 9, 3, 729, 1 special DrawWholeMapView @@ -635,13 +635,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 3e4caf100..c8a3dcab9 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -41,7 +41,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall - playse 21 + playse SE_PIN applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 7e221122b..4878cc6bc 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -20,7 +20,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag FLAG_TEMP_2 - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index ff7722f13..da4009759 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index d4dedb0c2..12d8bfb4e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -25,7 +25,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 - playse 4 + playse SE_PC_ON special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index a3c8d23af..0c9a9054b 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special DeleteMonMove - playfanfare 378 + playfanfare BGM_ME_WASURE waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 releaseall diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index c11546bb5..ef2145bbb 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -99,7 +99,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 - playse 10 + playse SE_DANSA applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 @@ -868,7 +868,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message LittlerootTown_Text_16AA32 waitfanfare waitmessage diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 4ce1e277a..8a86cd946 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall - playse 21 + playse SE_PIN applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index af7a2976b..45e9e0783 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall - playse 21 + playse SE_PIN applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 waitmovement 0 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 8bd9a01d2..34300b13e 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -37,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playse 9 + playse SE_KAIDAN removeobject LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_STATE, 1 @@ -48,7 +48,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 44adab6f1..e1cb348fd 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 compare RESULT, 1 @@ -155,7 +155,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - playfanfare 370 + playfanfare BGM_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6861e46c8..d7f0611e1 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -95,7 +95,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 msgbox MauvilleCity_Text_165D01, 4 applymovement 6, MauvilleCity_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 6, MauvilleCity_Movement_1A0833 waitmovement 0 applymovement 6, MauvilleCity_Movement_1A0835 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c2b785254..c40c05d37 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 takecoins 1000 givedecoration 88 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 takecoins 1000 givedecoration 89 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA takecoins 1000 givedecoration 90 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C takecoins 1500 giveitem ITEM_TM32, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 takecoins 3500 giveitem ITEM_TM29, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 takecoins 4000 giveitem ITEM_TM35, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA takecoins 4000 giveitem ITEM_TM24, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 takecoins 4000 giveitem ITEM_TM13, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -468,7 +468,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 - playse 95 + playse SE_REGI goto MauvilleCity_GameCorner_EventScript_1570CA end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 05287c7de..fd9c673dc 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -91,7 +91,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView - playse 44 + playse SE_KI_GASYAN goto MauvilleCity_Gym_EventScript_15661D end @@ -146,7 +146,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playse 44 + playse SE_KI_GASYAN checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_1566E1 checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index a058003bc..32269ab89 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -14,7 +14,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 end MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 - playse 21 + playse SE_PIN applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0833 waitmovement 0 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index a3e396ab0..bf51408b8 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 waitmovement 0 applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 54a9546c4..bc22ce3fe 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -94,7 +94,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA releaseall end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index eababfa6c..9aa9d8ef3 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -31,7 +31,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835 @@ -79,7 +79,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar VAR_SPECIAL_4, RESULT removeobject 2 - playfanfare 370 + playfanfare BGM_FANFA4 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 1e4cdf256..b7d68b257 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 4, 1, 716, 0 setmetatile 5, 1, 717, 1 special DrawWholeMapView - playse 20 + playse SE_BAN setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 283b6bfed..ae33d7978 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -31,7 +31,7 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 0 - playse 21 + playse SE_PIN call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView releaseall @@ -41,7 +41,7 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 1 - playse 21 + playse SE_PIN call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 329313e74..a2d2616d3 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 closemessage switch FACING diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 2ac3f35f9..ea58f50c6 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - savebgm 420 + savebgm BGM_TSURETEK return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -181,8 +181,8 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, PetalburgCity_Movement_1A0839 waitmovement 0 - playbgm 420, 0 - playse 21 + playbgm BGM_TSURETEK, FALSE + playse SE_PIN applymovement 9, PetalburgCity_Movement_1A0833 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1bd1649cf..de141daf9 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -84,7 +84,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 255, PetalburgCity_Gym_Movement_1A0845 applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 - playse 9 + playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 @@ -143,7 +143,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 - playse 8 + playse SE_DOOR compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE compare VAR_SPECIAL_8, 1 @@ -195,7 +195,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 compare VAR_SPECIAL_8, 1 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 73eb4f661..149fd4e46 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -13,7 +13,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 6749f2136..6840c45f4 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm 410, 1 + playbgm BGM_EVENT0, TRUE msgbox Route101_Text_16D10E, 4 closemessage setobjectxy 2, 0, 15 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index bfcbeb87a..22c3fa391 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C applymovement 2, Route103_Movement_14ED67 waitmovement 0 - playse 10 + playse SE_DANSA applymovement 2, Route103_Movement_14ED6B waitmovement 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 applymovement 2, Route103_Movement_14ED71 waitmovement 0 - playse 10 + playse SE_DANSA applymovement 2, Route103_Movement_14ED74 waitmovement 0 goto Route103_EventScript_14ED46 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 586031a1a..d5219582c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914 end Route110_EventScript_14F92F:: @ 814F92F - savebgm 403 @ Bicycle music + savebgm BGM_CYCLING return Route110_MapScript2_14F933:: @ 814F933 @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return Route110_EventScript_14FDAC:: @ 814FDAC - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return Route110_EventScript_14FDB1:: @ 814FDB1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index c825c1234..e7e19b4dd 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 @@ -224,13 +224,13 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall turnobject 1, 3 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 - playse 178 + playse SE_W153 applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 8a8dd2763..e5a216db4 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -220,7 +220,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -243,7 +243,7 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A end Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D - playse 21 + playse SE_PIN applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833 waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 @@ -336,7 +336,7 @@ Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835 @@ -469,7 +469,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -714,7 +714,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - playfanfare 370 + playfanfare BGM_FANFA4 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waitmessage diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 9ebde8451..b1cb0c9df 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -36,7 +36,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall setvar VAR_TEMP_1, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView releaseall @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall setvar VAR_TEMP_2, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView releaseall @@ -54,7 +54,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall setvar VAR_TEMP_3, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView releaseall @@ -63,7 +63,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall setvar VAR_TEMP_4, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index cb129b06d..8d5392ae8 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -289,7 +289,7 @@ Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF call Route110_TrickHousePuzzle3_EventScript_162612 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle3_EventScript_161F12 goto Route110_TrickHousePuzzle3_EventScript_1626AD end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5fedee3a9..1bcdb8087 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -160,7 +160,7 @@ Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -182,7 +182,7 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 - playse 21 + playse SE_PIN applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -204,7 +204,7 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 - playse 21 + playse SE_PIN applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -226,7 +226,7 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 - playse 21 + playse SE_PIN applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -248,7 +248,7 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 - playse 21 + playse SE_PIN applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -389,7 +389,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse - playse 32 + playse SE_HAZURE msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -408,7 +408,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF waitse - playse 31 + playse SE_SEIKAI goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 66aa8b5e7..d1de7682f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -126,7 +126,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 @@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -156,7 +156,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 @@ -171,7 +171,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 @@ -186,7 +186,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 5336bd510..d0f4e6394 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -222,14 +222,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather 2 - fadenewbgm 360 + fadenewbgm BGM_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather 8 - fadenewbgm 409 + fadenewbgm BGM_ASHROAD doweather end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index bc32449cd..6c1e8559f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -197,7 +197,7 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, 4 closemessage fadescreen 1 - playse 5 + playse SE_SELECT delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 63decb5d6..0ed9e9b01 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -77,7 +77,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playse 10 + playse SE_DANSA applymovement 19, Route118_Movement_15106D waitmovement 0 delay 30 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index e82d7b313..8d9f88474 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -80,11 +80,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return Route119_EventScript_151259:: @ 8151259 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return Route119_EventScript_15125E:: @ 815125E diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 50f453465..b36500345 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - playfanfare 370 + playfanfare BGM_FANFA4 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 6235e3b1c..67fa830e9 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waitmessage diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 47d216d9f..c6bdbbdb7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -381,7 +381,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 RustboroCity_EventScript_14C691:: @ 814C691 applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -393,7 +393,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 RustboroCity_EventScript_14C6BD:: @ 814C6BD applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -405,7 +405,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD RustboroCity_EventScript_14C6E9:: @ 814C6E9 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -417,7 +417,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 RustboroCity_EventScript_14C715:: @ 814C715 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -489,7 +489,7 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 RustboroCity_EventScript_14C7FE:: @ 814C7FE applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -501,7 +501,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE RustboroCity_EventScript_14C82A:: @ 814C82A applymovement 9, RustboroCity_Movement_1A0843 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -513,7 +513,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A RustboroCity_EventScript_14C856:: @ 814C856 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -525,7 +525,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 RustboroCity_EventScript_14C882:: @ 814C882 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -539,7 +539,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 RustboroCity_EventScript_14C8B8:: @ 814C8B8 applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index c997935cc..9bbbaacfa 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -80,7 +80,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closemessage - playse 21 + playse SE_PIN applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -98,7 +98,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closemessage - playse 21 + playse SE_PIN applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -140,7 +140,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index af5d5d6ee..ff854d7ef 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closemessage - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index d50e7cec0..050cf28c2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B return RusturfTunnel_EventScript_15C92D:: @ 815C92D - playse 21 + playse SE_PIN applymovement 1, RusturfTunnel_Movement_1A0833 waitmovement 0 applymovement 1, RusturfTunnel_Movement_1A0835 @@ -309,7 +309,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index fc018a7b9..dd5aee95c 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 2 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199007, 4 releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar VAR_PORTHOLE_STATE, 6 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_1990F8, 4 return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 3 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_1990B4, 4 releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_1990B4, 4 return diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 574c7412e..54c99b371 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 0 .endif - playse 209 + playse SE_W197 setfieldeffectargument 0, 16 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 @@ -89,8 +89,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 1 .endif - playfanfare 388 - playse 107 + playfanfare BGM_ME_TAMA + playse SE_TAMA special sub_80818A4 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, 4 .endif - playse 2 + playse SE_PC_LOGON applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE @@ -143,7 +143,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4B11, 4 .endif closemessage - playse 3 + playse SE_PC_OFF delay 20 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 @@ -167,7 +167,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index cd778202c..d788be9b3 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -12,21 +12,21 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 - playse 49 + playse SE_TRACK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closemessage diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 4079763a3..d39f788d8 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -73,7 +73,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message SlateportCity_Text_1646DD waitfanfare waitmessage @@ -508,7 +508,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0841 waitmovement 0 msgbox SlateportCity_Text_1655E7, 4 - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE msgbox SlateportCity_Text_1656BC, 4 applymovement 6, SlateportCity_Movement_1A083F applymovement 1, SlateportCity_Movement_1A083F @@ -519,7 +519,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0845 waitmovement 0 msgbox SlateportCity_Text_16578F, 4 - playse 21 + playse SE_PIN applymovement 11, SlateportCity_Movement_1A0833 waitmovement 0 applymovement 11, SlateportCity_Movement_1A0835 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 2fd62e9af..59c5b13fc 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -22,13 +22,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index abbe3f78f..ad349932a 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -158,7 +158,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A lock faceplayer delay 8 - playse 21 + playse SE_PIN applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 waitmovement 0 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 @@ -180,7 +180,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse 9 + playse SE_KAIDAN removeobject 13 release end @@ -189,7 +189,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse 9 + playse SE_KAIDAN removeobject 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 007e42f90..5dae0bc6b 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closemessage - playbgm BGM_EVIL_TEAM, 1 + playbgm BGM_EVIL_TEAM, TRUE addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmovement 0 @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 - playse 9 + playse SE_KAIDAN removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 6e7d2614b..f7cc67236 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -206,7 +206,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 end SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A - playse 21 + playse SE_PIN applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 waitmovement 0 applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index e29700981..f2ccc9484 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -216,7 +216,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 applymovement 10, SootopolisCity_Movement_1A083F applymovement 255, SootopolisCity_Movement_1A0843 waitmovement 0 - playse 21 + playse SE_PIN applymovement 10, SootopolisCity_Movement_1A0833 waitmovement 0 applymovement 10, SootopolisCity_Movement_1A0835 @@ -237,7 +237,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169E82, 4 .endif - playse 21 + playse SE_PIN applymovement 5, SootopolisCity_Movement_1A0833 waitmovement 0 applymovement 5, SootopolisCity_Movement_1A0835 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 38514b03b..35fa306e6 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -49,7 +49,7 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -57,7 +57,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -65,7 +65,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -75,7 +75,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 delay 20 applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index e2afd07dc..ffd184ddf 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - savebgm 393 + savebgm BGM_TEST1 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - savebgm 394 + savebgm BGM_TEST2 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - savebgm 395 + savebgm BGM_TEST3 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - savebgm 396 + savebgm BGM_TEST4 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - savebgm 440 + savebgm BGM_CONTEST0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 016b2e7ba..37811dbc1 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -22,13 +22,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index d93ff7660..b1ead4060 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -73,7 +73,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 - playse 9 + playse SE_KAIDAN removeobject VAR_SPECIAL_8 releaseall end @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmovement 0 - playbgm 453, 0 + playbgm BGM_INTER_V, FALSE msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closemessage applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB @@ -185,7 +185,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmovement 0 - playbgm 453, 0 + playbgm BGM_INTER_V, FALSE msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closemessage applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 @@ -372,7 +372,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 @@ -396,7 +396,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B - playse 8 + playse SE_DOOR removeobject VAR_SPECIAL_9 setflag FLAG_RECEIVED_SS_TICKET setvar VAR_LITTLEROOT_HOUSES_STATE, 4 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 5dba65b8a..6b1e76a1b 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,7 +24,7 @@ EventScript_1C3443: gUnknown_081C3448:: @ 81C3448 lockall - playse 73 + playse SE_PINPON message UnknownString_81C34E4 waitmessage waitbuttonpress @@ -33,7 +33,7 @@ gUnknown_081C3448:: @ 81C3448 gUnknown_081C3459:: @ 81C3459 lockall - playse 73 + playse SE_PINPON message UnknownString_81C3514 waitmessage waitbuttonpress -- cgit v1.2.3 From 88c42ade4bfb4a285444c327663e72c7f438adea Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:52:51 -0800 Subject: Use weather constants in scripts (and giveegg) --- data-de/event_scripts.s | 5 +++-- data/event_scripts.s | 5 +++-- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 6 +++--- data/scripts/maps/Route111.inc | 6 +++--- data/scripts/maps/Route113.inc | 2 +- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index ab511dcd6..b8cc5d8f6 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/opponents.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/weather.h" #include "constants/vars.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @@ -2096,9 +2097,9 @@ Route127_EventScript_1A02C1:: @ 81A02C1 Route128_EventScript_1A02C1:: @ 81A02C1 SootopolisCity_EventScript_1A02C1:: @ 81A02C1 .ifdef SAPPHIRE - setweather 13 + setweather WEATHER_RAIN_HEAVY .else - setweather 12 + setweather WEATHER_DROUGHT .endif return diff --git a/data/event_scripts.s b/data/event_scripts.s index b751a2e63..8b0011893 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/opponents.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/weather.h" #include "constants/vars.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @@ -2090,9 +2091,9 @@ Route127_EventScript_1A02C1:: @ 81A02C1 Route128_EventScript_1A02C1:: @ 81A02C1 SootopolisCity_EventScript_1A02C1:: @ 81A02C1 .ifdef SAPPHIRE - setweather 13 + setweather WEATHER_RAIN_HEAVY .else - setweather 12 + setweather WEATHER_DROUGHT .endif return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 904759cf1..315dda886 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -33,7 +33,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4 .endif closemessage - setweather 0 + setweather WEATHER_NONE doweather special WaitWeather waitstate diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index bf1f0233d..efe5d6a6e 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -13,7 +13,7 @@ JaggedPass_MapScript1_15D274:: @ 815D274 end JaggedPass_EventScript_15D280:: @ 815D280 - setweather 7 + setweather WEATHER_ASH doweather return diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e81c3b69f..f1a6deed0 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -286,7 +286,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A message LavaridgeTown_Text_16C2EA waitfanfare waitmessage - giveegg 360 + giveegg SPECIES_WYNAUT release end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 76f1736c2..ec5864df5 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -13,15 +13,15 @@ MtPyre_Exterior_EventScript_15D492:: @ 815D492 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 - setweather 6 + setweather WEATHER_FOG_1 return MtPyre_Exterior_EventScript_15D4A7:: @ 815D4A7 - setweather 6 + setweather WEATHER_FOG_1 doweather end MtPyre_Exterior_EventScript_15D4AC:: @ 815D4AC - setweather 2 + setweather WEATHER_SUNNY doweather end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index d0f4e6394..c3d807f66 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -34,7 +34,7 @@ Route111_EventScript_14FFCD:: @ 814FFCD goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 - setweather 8 + setweather WEATHER_SANDSTORM Route111_EventScript_15000C:: @ 815000C return @@ -221,14 +221,14 @@ Route111_Movement_1501BA:: @ 81501BA step_end Route111_EventScript_1501BC:: @ 81501BC - setweather 2 + setweather WEATHER_SUNNY fadenewbgm BGM_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 - setweather 8 + setweather WEATHER_SANDSTORM fadenewbgm BGM_ASHROAD doweather end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 1b589fcde..a1593ba1e 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -18,7 +18,7 @@ Route113_EventScript_1505E5:: @ 81505E5 goto_if 0, Route113_EventScript_150604 compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_150604 - setweather 7 + setweather WEATHER_ASH return Route113_EventScript_150604:: @ 8150604 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index d2866cceb..3858c0e4f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -90,11 +90,11 @@ Route120_EventScript_1516EA:: @ 81516EA return Route120_EventScript_151711:: @ 8151711 - setweather 1 + setweather WEATHER_CLOUDS return Route120_EventScript_151715:: @ 8151715 - setweather 2 + setweather WEATHER_SUNNY return Route120_EventScript_151719:: @ 8151719 @@ -106,7 +106,7 @@ Route120_EventScript_151719:: @ 8151719 end Route120_EventScript_151735:: @ 8151735 - setweather 3 + setweather WEATHER_RAIN_LIGHT return Route120_EventScript_151739:: @ 8151739 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 54c99b371..afc076a65 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -62,7 +62,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B49C1, 4 .endif - setweather 0 + setweather WEATHER_NONE doweather special sub_8081924 waitstate -- cgit v1.2.3 From 25bf57596507492210c36cffb1dfb6b9bf626df7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Jan 2018 18:03:10 -0500 Subject: propagate SLOT_MACHINE_MATCHED enums --- include/slot_machine.h | 2 +- src/field/slot_machine.c | 56 +++++++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/include/slot_machine.h b/include/slot_machine.h index d932edff0..f886d9239 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -27,7 +27,7 @@ enum { struct SlotMachineEwramStruct { /*0x00*/ u8 state; /*0x01*/ u8 unk01; - /*0x02*/ u8 unk02; + /*0x02*/ u8 pikaPower; /*0x03*/ u8 unk03; /*0x04*/ u8 unk04; /*0x05*/ u8 unk05; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index b1273ce7c..bfad257d4 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -20,7 +20,7 @@ struct UnkStruct1 { /*0x00*/ u8 unk00; /*0x01*/ u8 unk01; - /*0x02*/ s16 unk02; + /*0x02*/ s16 pikaPower; }; #if ENGLISH @@ -372,7 +372,7 @@ static void SlotMachineSetup_0_1(void) sub_81019EC(); eSlotMachine->state = 0; - eSlotMachine->unk02 = 0; + eSlotMachine->pikaPower = 0; eSlotMachine->unk03 = Random() & 1; eSlotMachine->unk04 = 0; eSlotMachine->matchedSymbols = 0; @@ -481,7 +481,7 @@ static void sub_8101D24(u8 taskId) static bool8 sub_8101D5C(struct Task *task) { BeginNormalPaletteFade(-1, 0, 16, 0, 0); - sub_810423C(eSlotMachine->unk02); + sub_810423C(eSlotMachine->pikaPower); eSlotMachine->state++; return FALSE; } @@ -706,12 +706,12 @@ static bool8 sub_81020C8(struct Task *task) { eSlotMachine->unk10 = 0; } - if (eSlotMachine->matchedSymbols & 0x180) + if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { PlayFanfare(BGM_ME_B_BIG); sub_8104CAC(6); } - else if (eSlotMachine->matchedSymbols & 0x40) + else if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_MIXED)) { PlayFanfare(BGM_ME_B_BIG); sub_8104CAC(5); @@ -721,24 +721,24 @@ static bool8 sub_81020C8(struct Task *task) PlayFanfare(BGM_ME_B_SMALL); sub_8104CAC(2); } - if (eSlotMachine->matchedSymbols & 0x1c0) + if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { eSlotMachine->unk04 &= 0x3f; - if (eSlotMachine->matchedSymbols & 0x180) + if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED))) { eSlotMachine->unk0A = 0; eSlotMachine->unk0B = 0; eSlotMachine->unk03 = 0; - if (eSlotMachine->matchedSymbols & 0x100) + if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_BLUE)) { eSlotMachine->unk03 = 1; } } } - if (eSlotMachine->matchedSymbols & 0x20 && eSlotMachine->unk02 < 16) + if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER) && eSlotMachine->pikaPower < 16) { - eSlotMachine->unk02++; - sub_8104064(eSlotMachine->unk02); + eSlotMachine->pikaPower++; + sub_8104064(eSlotMachine->pikaPower); } } else @@ -767,20 +767,20 @@ static bool8 sub_81021FC(struct Task *task) if (sub_8103FA0()) { eSlotMachine->state = 19; - if (eSlotMachine->matchedSymbols & 0x180) + if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_RED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE))) { IncrementGameStat(GAME_STAT_SLOT_JACKPOTS); } - if (eSlotMachine->matchedSymbols & 0x04) + if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { eSlotMachine->unk18 = 0; eSlotMachine->state = 9; } - if (eSlotMachine->matchedSymbols & 0x20) + if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_POWER)) { eSlotMachine->state = 17; } - if (eSlotMachine->unk0A && eSlotMachine->matchedSymbols & 0x04) + if (eSlotMachine->unk0A && eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { sub_8104CAC(4); eSlotMachine->state = 18; @@ -794,7 +794,7 @@ static bool8 sub_8102264(struct Task *task) if (!sub_81040C8()) { eSlotMachine->state = 19; - if (eSlotMachine->matchedSymbols & 0x04) + if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { eSlotMachine->state = 9; if (eSlotMachine->unk0A) @@ -812,7 +812,7 @@ static bool8 sub_81022A0(struct Task *task) if (sub_8104E18()) { eSlotMachine->state = 19; - if (eSlotMachine->matchedSymbols & 0x04) + if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_REPLAY)) { eSlotMachine->state = 9; } @@ -1038,9 +1038,9 @@ static u8 sub_810264C(u8 a0) { if (eSlotMachine->unk03 == 0) { - return gUnknown_083ECD46[a0][eSlotMachine->unk02]; + return gUnknown_083ECD46[a0][eSlotMachine->pikaPower]; } - return gUnknown_083ECDAC[a0][eSlotMachine->unk02]; + return gUnknown_083ECDAC[a0][eSlotMachine->pikaPower]; } static void sub_8102680(void) @@ -2595,10 +2595,10 @@ static void sub_81046C0(struct Task *task) task->data[4] = 0xc0; StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 4); gSprites[eSlotMachine->unk3F].animCmdIndex = 0; - if (eSlotMachine->unk02) + if (eSlotMachine->pikaPower) { sub_8104098(); - eSlotMachine->unk02 = 0; + eSlotMachine->pikaPower = 0; } PlayFanfare(BGM_ME_B_SMALL); } @@ -2828,7 +2828,7 @@ static void sub_8104BFC(struct Task *task) BasicInitMenuWindow(&gWindowConfig_81E7128); sub_81064B8(); sub_8104CAC(task->data[1]); - sub_810423C(eSlotMachine->unk02); + sub_810423C(eSlotMachine->pikaPower); BeginNormalPaletteFade(-1, 0, 16, 0, 0); task->data[0]++; } @@ -2869,7 +2869,7 @@ static void sub_8104CAC(u8 arg0) { spriteId = sub_8105BB4( gUnknown_083ED048[arg0][i].unk00, gUnknown_083ED048[arg0][i].unk01, - gUnknown_083ED048[arg0][i].unk02 + gUnknown_083ED048[arg0][i].pikaPower ); task->data[4 + i] = spriteId; @@ -4143,7 +4143,15 @@ static const u8 sSym2Match[] = { }; static const u16 sSlotMatchFlags[] = { - 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x100 + 1 << SLOT_MACHINE_MATCHED_1CHERRY, + 1 << SLOT_MACHINE_MATCHED_2CHERRY, + 1 << SLOT_MACHINE_MATCHED_REPLAY, + 1 << SLOT_MACHINE_MATCHED_LOTAD, + 1 << SLOT_MACHINE_MATCHED_AZURILL, + 1 << SLOT_MACHINE_MATCHED_POWER, + 1 << SLOT_MACHINE_MATCHED_777_MIXED, + 1 << SLOT_MACHINE_MATCHED_777_RED, + 1 << SLOT_MACHINE_MATCHED_777_BLUE }; static const u16 sSlotPayouts[] = { -- cgit v1.2.3 From ed5f6107c4051c0a8056824ce0437862909b579d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Jan 2018 18:08:40 -0500 Subject: piKAPOWer --- src/field/slot_machine.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index bfad257d4..a524790b4 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -20,7 +20,7 @@ struct UnkStruct1 { /*0x00*/ u8 unk00; /*0x01*/ u8 unk01; - /*0x02*/ s16 pikaPower; + /*0x02*/ s16 unk02; }; #if ENGLISH @@ -139,7 +139,7 @@ static void sub_8103F70(void); static bool8 sub_8103FA0(void); static void sub_8103FE8(u8 taskId); static void sub_8104048(void); -static void sub_8104064(u8 unused); +static void sub_8104064(u8 pikaPower); static bool8 sub_81040C8(void); static void sub_81040E8(u8 taskId); static void nullsub_68(struct Task *task); @@ -147,7 +147,7 @@ static void sub_810411C(struct Task *task); static void sub_8104144(struct Task *task); static void sub_81041AC(struct Task *task); static void sub_810421C(struct Task *task); -static void sub_810423C(u8 a0); +static void sub_810423C(u8 pikaPower); static void sub_810430C(void); static bool8 sub_810432C(void); static void sub_810434C(u8 taskId); @@ -2262,7 +2262,7 @@ static void sub_8104048(void) eSlotMachine->unk3E = CreateTask(sub_81040E8, 8); } -static void sub_8104064(u8 unused) +static void sub_8104064(u8 pikaPower) { struct Task *task = gTasks + eSlotMachine->unk3E; sub_810421C(task); @@ -2362,13 +2362,13 @@ static void sub_810421C(struct Task *task) task->data[i] = 0; } -static void sub_810423C(u8 a0) +static void sub_810423C(u8 pikaPower) { s16 i; u8 r3; s16 r2 = 3; u16 *vaddr = (u16 *)BG_SCREEN_ADDR(29); - for (i = 0; i < a0; i++, r2++) + for (i = 0; i < pikaPower; i++, r2++) { r3 = 0; if (i == 0) @@ -2386,7 +2386,7 @@ static void sub_810423C(u8 a0) r3 = 2; vaddr[r2 + 0x40] = gUnknown_083ECBC4[r3][1]; } - gTasks[eSlotMachine->unk3E].data[1] = a0; + gTasks[eSlotMachine->unk3E].data[1] = pikaPower; } static void sub_810430C(void) @@ -2869,7 +2869,7 @@ static void sub_8104CAC(u8 arg0) { spriteId = sub_8105BB4( gUnknown_083ED048[arg0][i].unk00, gUnknown_083ED048[arg0][i].unk01, - gUnknown_083ED048[arg0][i].pikaPower + gUnknown_083ED048[arg0][i].unk02 ); task->data[4 + i] = spriteId; -- cgit v1.2.3 From c748287725a01561ba9f972b094d7b297cea2d8e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 15:24:19 -0800 Subject: Use -1 instead of 65535 for compare macro --- asm/macros/event.inc | 4 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/mauville_man.inc | 4 ++-- data/scripts/pokeblocks.inc | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 5176beff3..3b40883dc 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -231,8 +231,8 @@ .macro compare arg1, arg2 .if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8) compare_var_to_var \arg1, \arg2 - .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF) - compare_var_to_value \arg1, \arg2 + .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= -0xFFFF && \arg2 <= 0xFFFF) + compare_var_to_value \arg1, (\arg2 & 0xFFFF) .else .error "Invalid arguments for 'compare'" .endif diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 591587be8..bb13b95be 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -475,7 +475,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar VAR_SPECIAL_4, 65535 + addvar VAR_SPECIAL_4, -1 goto LilycoveCity_ContestLobby_EventScript_158DEE end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 58dacb2f3..0e1835ae4 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -141,7 +141,7 @@ do_trader_menu_get: waitstate compare VAR_SPECIAL_4, 0 goto_if_eq cancelled_get_menu - compare VAR_SPECIAL_4, 65535 + compare VAR_SPECIAL_4, -1 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO compare RESULT, NO @@ -178,7 +178,7 @@ do_trader_menu_give: waitstate compare VAR_SPECIAL_6, 0 goto_if_eq cancelled_give_menu - compare VAR_SPECIAL_6, 65535 + compare VAR_SPECIAL_6, -1 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull compare RESULT, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index eb12ab148..2f5dd6f47 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -54,9 +54,9 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, 65535 + compare RESULT, -1 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare RESULT, 65535 + compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -215,9 +215,9 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, 65535 + compare RESULT, -1 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare RESULT, 65535 + compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end -- cgit v1.2.3 From c6fd37b0dffe1975159699cee3ce57c9ea5716d4 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 Jan 2018 17:29:36 -0600 Subject: decompile sub_80E8BF4 - sub_80E95A4 --- asm/easy_chat.s | 1254 --------------------------------------------- data/easy_chat.s | 84 --- include/easy_chat.h | 26 +- include/field_map_obj.h | 2 +- include/graphics.h | 31 ++ src/easy_chat_2.c | 538 +++++++++++++++++++ src/field/field_map_obj.c | 4 +- 7 files changed, 592 insertions(+), 1347 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 9f4520b86..88585d607 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1260 +5,6 @@ .text - thumb_func_start sub_80E8BF4 -sub_80E8BF4: @ 80E8BF4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r1, 24 - lsrs r2, r1, 24 - ldr r0, _080E8C28 @ =gUnknown_083DBD30 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x4] - str r1, [sp, 0x8] - ldr r0, _080E8C2C @ =gUnknown_083DBD38 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0xC] - str r1, [sp, 0x10] - cmp r2, 0x2 - beq _080E8C20 - cmp r2, 0x5 - beq _080E8C30 -_080E8C20: - movs r4, 0x40 - movs r5, 0x28 - b _080E8C34 - .align 2, 0 -_080E8C28: .4byte gUnknown_083DBD30 -_080E8C2C: .4byte gUnknown_083DBD38 -_080E8C30: - movs r4, 0x24 - movs r5, 0x30 -_080E8C34: - cmp r3, 0 - beq _080E8C3C - cmp r3, 0x1 - beq _080E8C40 -_080E8C3C: - movs r0, 0x43 - b _080E8C42 -_080E8C40: - movs r0, 0x44 -_080E8C42: - mov r8, r0 - add r0, sp, 0x4 - bl LoadCompressedObjectPic - add r0, sp, 0xC - bl LoadSpritePalette - ldr r0, _080E8CDC @ =gSpriteTemplate_83DBD48 - adds r1, r4, 0 - adds r2, r5, 0 - movs r3, 0x1 - bl CreateSprite - ldr r0, _080E8CE0 @ =gSaveBlock2 - ldrb r0, [r0, 0x8] - movs r1, 0x69 - cmp r0, 0 - bne _080E8C68 - movs r1, 0x64 -_080E8C68: - ldr r7, _080E8CE4 @ =SpriteCallbackDummy - adds r2, r4, 0 - subs r2, 0xC - movs r6, 0 - str r6, [sp] - adds r0, r1, 0 - adds r1, r7, 0 - adds r3, r5, 0 - bl AddPseudoFieldObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _080E8C9E - ldr r1, _080E8CE8 @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x3 - bl StartSpriteAnim -_080E8C9E: - adds r2, r4, 0 - adds r2, 0xC - str r6, [sp] - mov r0, r8 - adds r1, r7, 0 - adds r3, r5, 0 - bl AddPseudoFieldObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _080E8CD0 - ldr r1, _080E8CE8 @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x2 - bl StartSpriteAnim -_080E8CD0: - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8CDC: .4byte gSpriteTemplate_83DBD48 -_080E8CE0: .4byte gSaveBlock2 -_080E8CE4: .4byte SpriteCallbackDummy -_080E8CE8: .4byte gSprites - thumb_func_end sub_80E8BF4 - - thumb_func_start sub_80E8CEC -sub_80E8CEC: @ 80E8CEC - push {lr} - ldr r0, _080E8D24 @ =gUnknown_083DBD60 - bl LoadCompressedObjectPic - ldr r0, _080E8D28 @ =gUnknown_083DBD68 - bl LoadSpritePalette - ldr r0, _080E8D2C @ =gSpriteTemplate_83DBDE4 - movs r1, 0xE0 - movs r2, 0x58 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080E8D3C - ldr r0, _080E8D30 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r0, _080E8D34 @ =0x00009c74 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E8D38 @ =gSprites - adds r0, r1 - str r0, [r2] - b _080E8D48 - .align 2, 0 -_080E8D24: .4byte gUnknown_083DBD60 -_080E8D28: .4byte gUnknown_083DBD68 -_080E8D2C: .4byte gSpriteTemplate_83DBDE4 -_080E8D30: .4byte gUnknown_083DB694 -_080E8D34: .4byte 0x00009c74 -_080E8D38: .4byte gSprites -_080E8D3C: - ldr r0, _080E8D4C @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E8D50 @ =0x00009c74 - adds r0, r1 - movs r1, 0 - str r1, [r0] -_080E8D48: - pop {r0} - bx r0 - .align 2, 0 -_080E8D4C: .4byte gUnknown_083DB694 -_080E8D50: .4byte 0x00009c74 - thumb_func_end sub_80E8CEC - - thumb_func_start sub_80E8D54 -sub_80E8D54: @ 80E8D54 - push {lr} - ldr r0, _080E8D78 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r1, _080E8D7C @ =0x00009c74 - adds r0, r2, r1 - ldr r1, [r0] - cmp r1, 0 - beq _080E8D88 - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E8D80 - adds r0, r1, 0 - movs r1, 0x1 - bl StartSpriteAnim - b _080E8D88 - .align 2, 0 -_080E8D78: .4byte gUnknown_083DB694 -_080E8D7C: .4byte 0x00009c74 -_080E8D80: - adds r0, r1, 0 - movs r1, 0x2 - bl StartSpriteAnim -_080E8D88: - pop {r0} - bx r0 - thumb_func_end sub_80E8D54 - - thumb_func_start sub_80E8D8C -sub_80E8D8C: @ 80E8D8C - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _080E8DB8 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r1, _080E8DBC @ =0x00009c74 - adds r0, r2, r1 - ldr r1, [r0] - cmp r1, 0 - beq _080E8DD2 - cmp r3, 0 - beq _080E8DCA - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E8DC0 - adds r0, r1, 0 - movs r1, 0x3 - bl StartSpriteAnim - b _080E8DD2 - .align 2, 0 -_080E8DB8: .4byte gUnknown_083DB694 -_080E8DBC: .4byte 0x00009c74 -_080E8DC0: - adds r0, r1, 0 - movs r1, 0x4 - bl StartSpriteAnim - b _080E8DD2 -_080E8DCA: - adds r0, r1, 0 - movs r1, 0x5 - bl StartSpriteAnim -_080E8DD2: - pop {r0} - bx r0 - thumb_func_end sub_80E8D8C - - thumb_func_start sub_80E8DD8 -sub_80E8DD8: @ 80E8DD8 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x8 - ldr r0, _080E8F2C @ =REG_BG0HOFS - movs r6, 0 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - adds r0, 0x4 - strh r6, [r0] - subs r0, 0x2 - strh r6, [r0] - adds r0, 0x4 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - ldr r1, _080E8F30 @ =REG_BG0CNT - movs r2, 0x8B - lsls r2, 8 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r2, _080E8F34 @ =0x00000d09 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080E8F38 @ =gUnknown_08E945D0 - ldr r1, _080E8F3C @ =gUnknown_083DB694 - ldr r1, [r1] - mov r8, r1 - movs r4, 0xE4 - lsls r4, 1 - add r4, r8 - movs r5, 0xA0 - lsls r5, 2 - adds r1, r4, 0 - adds r2, r5, 0 - bl CpuSet - ldr r0, _080E8F40 @ =gUnknown_08E953D0 - movs r1, 0xD9 - lsls r1, 3 - add r1, r8 - bl LZ77UnCompWram - ldr r0, _080E8F44 @ =gMenuWordGroupFrame_Gfx - ldr r1, _080E8F48 @ =0x06008000 - bl LZ77UnCompVram - ldr r1, _080E8F4C @ =0x06006800 - adds r0, r4, 0 - adds r2, r5, 0 - bl CpuSet - ldr r0, _080E8F50 @ =gMenuWordGroupFrame1_Pal - movs r1, 0x40 - movs r2, 0x40 - bl LoadPalette - ldr r1, _080E8F54 @ =REG_BG2CNT - ldr r2, _080E8F58 @ =0x00000e02 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _080E8F5C @ =0x06007000 - movs r5, 0x80 - lsls r5, 4 - mov r0, sp - strh r6, [r0] - ldr r4, _080E8F60 @ =0x040000d4 - str r0, [r4] - str r1, [r4, 0x4] - lsrs r0, r5, 1 - movs r2, 0x81 - lsls r2, 24 - orrs r0, r2 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _080E8F64 @ =gUnknown_08E9AB00 - ldr r2, _080E8F68 @ =0x06006000 - str r0, [r4] - str r2, [r4, 0x4] - ldr r0, _080E8F6C @ =0x80000020 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _080E8F70 @ =gUnknown_08E9AB60 - bl LZ77UnCompVram - ldr r0, _080E8F74 @ =gUnknown_08E9AB40 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, _080E8F78 @ =gUnknown_083DBDFC - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r1, _080E8F7C @ =REG_BG3CNT - ldr r2, _080E8F80 @ =0x00000f0f - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _080E8F84 @ =0x06007800 - movs r0, 0 - mov r9, r0 - str r0, [sp, 0x4] - add r0, sp, 0x4 - str r0, [r4] - str r1, [r4, 0x4] - lsrs r5, 2 - movs r0, 0x85 - lsls r0, 24 - orrs r5, r0 - str r5, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _080E8F88 @ =gUnknown_083DBE40 - movs r1, 0x20 - movs r2, 0x20 - bl LoadPalette - ldr r0, _080E8F8C @ =gPlttBufferUnfaded - adds r1, r0, 0 - adds r1, 0x7E - ldr r3, _080E8F90 @ =0x00007fff - strh r3, [r1] - subs r1, 0x1C - ldr r2, _080E8F94 @ =0x00006f5b - strh r2, [r1] - adds r0, 0x70 - ldr r1, _080E8F98 @ =0x0000739c - strh r1, [r0] - ldr r0, _080E8F9C @ =gPlttBufferFaded - adds r4, r0, 0 - adds r4, 0x7E - strh r3, [r4] - adds r3, r0, 0 - adds r3, 0x62 - strh r2, [r3] - adds r0, 0x70 - strh r1, [r0] - movs r1, 0xBC - add r8, r1 - mov r2, r8 - strb r6, [r2] - bl sub_80E8FA4 - bl sub_80E948C - movs r0, 0xA - bl sub_80E9198 - movs r0, 0 - bl sub_80E91D4 - bl sub_80E95A4 - ldr r0, _080E8FA0 @ =REG_BLDCNT - mov r1, r9 - strh r1, [r0] - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E8F2C: .4byte REG_BG0HOFS -_080E8F30: .4byte REG_BG0CNT -_080E8F34: .4byte 0x00000d09 -_080E8F38: .4byte gUnknown_08E945D0 -_080E8F3C: .4byte gUnknown_083DB694 -_080E8F40: .4byte gUnknown_08E953D0 -_080E8F44: .4byte gMenuWordGroupFrame_Gfx -_080E8F48: .4byte 0x06008000 -_080E8F4C: .4byte 0x06006800 -_080E8F50: .4byte gMenuWordGroupFrame1_Pal -_080E8F54: .4byte REG_BG2CNT -_080E8F58: .4byte 0x00000e02 -_080E8F5C: .4byte 0x06007000 -_080E8F60: .4byte 0x040000d4 -_080E8F64: .4byte gUnknown_08E9AB00 -_080E8F68: .4byte 0x06006000 -_080E8F6C: .4byte 0x80000020 -_080E8F70: .4byte gUnknown_08E9AB60 -_080E8F74: .4byte gUnknown_08E9AB40 -_080E8F78: .4byte gUnknown_083DBDFC -_080E8F7C: .4byte REG_BG3CNT -_080E8F80: .4byte 0x00000f0f -_080E8F84: .4byte 0x06007800 -_080E8F88: .4byte gUnknown_083DBE40 -_080E8F8C: .4byte gPlttBufferUnfaded -_080E8F90: .4byte 0x00007fff -_080E8F94: .4byte 0x00006f5b -_080E8F98: .4byte 0x0000739c -_080E8F9C: .4byte gPlttBufferFaded -_080E8FA0: .4byte REG_BLDCNT - thumb_func_end sub_80E8DD8 - - thumb_func_start sub_80E8FA4 -sub_80E8FA4: @ 80E8FA4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - movs r0, 0 - mov r9, r0 - mov r1, sp - adds r1, 0x18 - str r1, [sp, 0x24] - add r2, sp, 0xC - mov r12, r2 -_080E8FBE: - mov r3, r9 - lsls r1, r3, 1 - ldr r4, _080E90F4 @ =gMenuWordGroupFrame2_Pal + 0x2 - adds r0, r1, r4 - ldrh r2, [r0] - movs r0, 0x1F - ands r0, r2 - lsls r0, 8 - str r0, [sp] - ldr r5, _080E90F8 @ =gMenuWordGroupFrame2_Pal + 0x8 - adds r1, r5 - ldrh r1, [r1] - movs r0, 0x1F - ands r0, r1 - lsls r0, 8 - str r0, [sp, 0xC] - lsls r2, 16 - lsrs r0, r2, 21 - movs r3, 0x1F - ands r0, r3 - lsls r0, 8 - str r0, [sp, 0x4] - lsls r1, 16 - lsrs r0, r1, 21 - ands r0, r3 - lsls r0, 8 - mov r4, r12 - str r0, [r4, 0x4] - lsrs r2, 26 - ands r2, r3 - lsls r2, 8 - str r2, [sp, 0x8] - lsrs r1, 26 - ands r1, r3 - lsls r1, 8 - str r1, [r4, 0x8] - movs r3, 0 - mov r5, r9 - lsls r5, 3 - mov r10, r5 - mov r0, r9 - adds r0, 0x1 - str r0, [sp, 0x28] - ldr r4, [sp, 0x24] -_080E9016: - lsls r0, r3, 2 - adds r2, r4, r0 - mov r5, r12 - adds r1, r5, r0 - add r0, sp - ldr r1, [r1] - ldr r0, [r0] - subs r0, r1, r0 - cmp r0, 0 - bge _080E902C - adds r0, 0x7 -_080E902C: - asrs r0, 3 - str r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x2 - bls _080E9016 - movs r4, 0 - ldr r0, _080E90FC @ =gUnknown_083DB694 - ldr r1, [r0] - mov r0, r10 - add r0, r9 - lsls r0, 1 - mov r8, r0 - movs r5, 0x1F - ldr r6, [sp, 0x24] - ldr r0, _080E9100 @ =0x00009c34 - adds r7, r1, r0 -_080E9050: - lsls r2, r4, 1 - add r2, r8 - adds r2, r7, r2 - ldr r1, [sp, 0x8] - asrs r1, 8 - ands r1, r5 - lsls r1, 10 - ldr r0, [sp, 0x4] - asrs r0, 8 - ands r0, r5 - lsls r0, 5 - orrs r1, r0 - ldr r0, [sp] - asrs r0, 8 - ands r0, r5 - orrs r1, r0 - strh r1, [r2] - movs r3, 0 - adds r4, 0x1 -_080E9076: - lsls r0, r3, 2 - mov r1, sp - adds r2, r1, r0 - adds r0, r6, r0 - ldr r1, [r2] - ldr r0, [r0] - adds r1, r0 - str r1, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x2 - bls _080E9076 - lsls r0, r4, 16 - lsrs r4, r0, 16 - cmp r4, 0x7 - bls _080E9050 - ldr r2, _080E90FC @ =gUnknown_083DB694 - ldr r3, [r2] - mov r0, r10 - add r0, r9 - adds r0, r4 - lsls r0, 1 - ldr r4, _080E9100 @ =0x00009c34 - adds r2, r3, r4 - adds r2, r0 - mov r5, r12 - ldr r1, [r5, 0x8] - asrs r1, 8 - movs r0, 0x1F - ands r1, r0 - lsls r1, 10 - ldr r0, [r5, 0x4] - asrs r0, 8 - movs r4, 0x1F - ands r0, r4 - lsls r0, 5 - orrs r1, r0 - ldr r0, [sp, 0xC] - asrs r0, 8 - ands r0, r4 - orrs r1, r0 - strh r1, [r2] - ldr r5, [sp, 0x28] - lsls r0, r5, 16 - lsrs r0, 16 - mov r9, r0 - cmp r0, 0x2 - bhi _080E90DA - b _080E8FBE -_080E90DA: - ldr r0, _080E9104 @ =0x00009c32 - adds r1, r3, r0 - movs r0, 0 - strb r0, [r1] - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E90F4: .4byte gMenuWordGroupFrame2_Pal + 0x2 -_080E90F8: .4byte gMenuWordGroupFrame2_Pal + 0x8 -_080E90FC: .4byte gUnknown_083DB694 -_080E9100: .4byte 0x00009c34 -_080E9104: .4byte 0x00009c32 - thumb_func_end sub_80E8FA4 - - thumb_func_start sub_80E9108 -sub_80E9108: @ 80E9108 - push {r4-r7,lr} - lsls r0, 24 - ldr r1, _080E9164 @ =gUnknown_083DB694 - ldr r2, [r1] - ldr r3, _080E9168 @ =0x00009c32 - adds r1, r2, r3 - lsrs r0, 24 - ldrb r3, [r1] - adds r0, r3 - strb r0, [r1] - movs r4, 0 - ldr r0, _080E916C @ =gPlttBufferUnfaded - mov r12, r0 - adds r6, r1, 0 - ldr r3, _080E9170 @ =0x00009c34 - adds r5, r2, r3 - ldr r7, _080E9174 @ =gPlttBufferFaded -_080E912A: - adds r2, r4, 0 - adds r2, 0x51 - lsls r2, 1 - mov r0, r12 - adds r3, r2, r0 - ldrb r0, [r6] - lsls r0, 1 - lsls r1, r4, 3 - adds r1, r4 - lsls r1, 1 - adds r0, r1 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r3] - adds r2, r7 - ldrb r0, [r6] - lsls r0, 1 - adds r0, r1 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x2 - bls _080E912A - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9164: .4byte gUnknown_083DB694 -_080E9168: .4byte 0x00009c32 -_080E916C: .4byte gPlttBufferUnfaded -_080E9170: .4byte 0x00009c34 -_080E9174: .4byte gPlttBufferFaded - thumb_func_end sub_80E9108 - - thumb_func_start sub_80E9178 -sub_80E9178: @ 80E9178 - push {lr} - ldr r0, _080E9190 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E9194 @ =0x00009c32 - adds r0, r1 - movs r1, 0 - strb r1, [r0] - movs r0, 0 - bl sub_80E9108 - pop {r0} - bx r0 - .align 2, 0 -_080E9190: .4byte gUnknown_083DB694 -_080E9194: .4byte 0x00009c32 - thumb_func_end sub_80E9178 - - thumb_func_start sub_80E9198 -sub_80E9198: @ 80E9198 - ldr r1, _080E91A0 @ =gUnknown_03000740 - strb r0, [r1] - bx lr - .align 2, 0 -_080E91A0: .4byte gUnknown_03000740 - thumb_func_end sub_80E9198 - - thumb_func_start sub_80E91A4 -sub_80E91A4: @ 80E91A4 - ldr r0, _080E91AC @ =gUnknown_03000740 - ldrb r0, [r0] - bx lr - .align 2, 0 -_080E91AC: .4byte gUnknown_03000740 - thumb_func_end sub_80E91A4 - - thumb_func_start sub_80E91B0 -sub_80E91B0: @ 80E91B0 - push {lr} - sub sp, 0x8 - lsls r2, 24 - lsls r1, 27 - lsrs r1, 24 - lsrs r2, 21 - lsls r3, 27 - lsrs r3, 24 - str r3, [sp] - movs r3, 0x1 - str r3, [sp, 0x4] - movs r3, 0xB0 - bl sub_8072AB0 - add sp, 0x8 - pop {r0} - bx r0 - thumb_func_end sub_80E91B0 - - thumb_func_start sub_80E91D4 -sub_80E91D4: @ 80E91D4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r0, _080E91FC @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - cmp r4, 0xA - bne _080E9200 - movs r0, 0x3 - movs r1, 0xE - movs r2, 0x1A - movs r3, 0x13 - bl MenuZeroFillWindowRect - movs r0, 0xA - bl sub_80E9198 - b _080E935C - .align 2, 0 -_080E91FC: .4byte gWindowConfig_81E6DA8 -_080E9200: - bl sub_80E91A4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xA - bne _080E9218 - movs r0, 0x3 - movs r1, 0xE - movs r2, 0x1A - movs r3, 0x13 - bl MenuDrawTextWindow -_080E9218: - adds r0, r4, 0 - bl sub_80E9198 - cmp r4, 0x9 - bls _080E9224 - b _080E935C -_080E9224: - lsls r0, r4, 2 - ldr r1, _080E9230 @ =_080E9234 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9230: .4byte _080E9234 - .align 2, 0 -_080E9234: - .4byte _080E925C - .4byte _080E9284 - .4byte _080E92AC - .4byte _080E92C4 - .4byte _080E92F0 - .4byte _080E9308 - .4byte _080E9310 - .4byte _080E9318 - .4byte _080E933C - .4byte _080E9350 -_080E925C: - ldr r0, _080E9278 @ =gUnknown_083DB694 - ldr r4, [r0] - ldr r1, _080E927C @ =0x00009c80 - adds r0, r4, r1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E9280 @ =0x00009cc9 - adds r4, r0 - adds r0, r4, 0 - b _080E9326 - .align 2, 0 -_080E9278: .4byte gUnknown_083DB694 -_080E927C: .4byte 0x00009c80 -_080E9280: .4byte 0x00009cc9 -_080E9284: - ldr r0, _080E92A0 @ =gUnknown_083DB694 - ldr r4, [r0] - ldr r1, _080E92A4 @ =0x00009d12 - adds r0, r4, r1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E92A8 @ =0x00009d5b - adds r4, r0 - adds r0, r4, 0 - b _080E9326 - .align 2, 0 -_080E92A0: .4byte gUnknown_083DB694 -_080E92A4: .4byte 0x00009d12 -_080E92A8: .4byte 0x00009d5b -_080E92AC: - ldr r0, _080E92BC @ =gOtherText_TextDeletedConfirmPage1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E92C0 @ =gOtherText_TextDeletedConfirmPage2 - b _080E9326 - .align 2, 0 -_080E92BC: .4byte gOtherText_TextDeletedConfirmPage1 -_080E92C0: .4byte gOtherText_TextDeletedConfirmPage2 -_080E92C4: - ldr r0, _080E92D8 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0x4 - beq _080E92E0 - cmp r0, 0x9 - bne _080E92E8 - ldr r0, _080E92DC @ =gOtherText_QuitGivingInfo - b _080E933E - .align 2, 0 -_080E92D8: .4byte gUnknown_083DB694 -_080E92DC: .4byte gOtherText_QuitGivingInfo -_080E92E0: - ldr r0, _080E92E4 @ =gOtherText_StopGivingMail - b _080E933E - .align 2, 0 -_080E92E4: .4byte gOtherText_StopGivingMail -_080E92E8: - ldr r0, _080E92EC @ =gOtherText_QuitEditing - b _080E933E - .align 2, 0 -_080E92EC: .4byte gOtherText_QuitEditing -_080E92F0: - ldr r0, _080E9300 @ =gOtherText_EditedTextNoSavePage1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E9304 @ =gOtherText_EditedTextNoSavePage2 - b _080E9326 - .align 2, 0 -_080E9300: .4byte gOtherText_EditedTextNoSavePage1 -_080E9304: .4byte gOtherText_EditedTextNoSavePage2 -_080E9308: - ldr r0, _080E930C @ =gOtherText_EnterAPhraseOrWord - b _080E933E - .align 2, 0 -_080E930C: .4byte gOtherText_EnterAPhraseOrWord -_080E9310: - ldr r0, _080E9314 @ =gOtherText_TextNoDelete - b _080E933E - .align 2, 0 -_080E9314: .4byte gOtherText_TextNoDelete -_080E9318: - ldr r0, _080E9334 @ =gOtherText_OnlyOnePhrase - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E9338 @ =gOtherText_OriginalSongRestored -_080E9326: - movs r1, 0x4 - movs r2, 0x11 - movs r3, 0x2 - bl sub_80E91B0 - b _080E935C - .align 2, 0 -_080E9334: .4byte gOtherText_OnlyOnePhrase -_080E9338: .4byte gOtherText_OriginalSongRestored -_080E933C: - ldr r0, _080E934C @ =gOtherText_TrendyAlready -_080E933E: - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x4 - bl sub_80E91B0 - b _080E935C - .align 2, 0 -_080E934C: .4byte gOtherText_TrendyAlready -_080E9350: - ldr r0, _080E9364 @ =gOtherText_CombineTwoPhrases - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x4 - bl sub_80E91B0 -_080E935C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E9364: .4byte gOtherText_CombineTwoPhrases - thumb_func_end sub_80E91D4 - - thumb_func_start sub_80E9368 -sub_80E9368: @ 80E9368 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xD - bhi _080E93F8 - lsls r0, 2 - ldr r1, _080E937C @ =_080E9380 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E937C: .4byte _080E9380 - .align 2, 0 -_080E9380: - .4byte _080E93B8 - .4byte _080E93C0 - .4byte _080E93C8 - .4byte _080E93D0 - .4byte _080E93F8 - .4byte _080E93E8 - .4byte _080E93D8 - .4byte _080E93E8 - .4byte _080E93E8 - .4byte _080E93E0 - .4byte _080E93E8 - .4byte _080E93E8 - .4byte _080E93E8 - .4byte _080E93F0 -_080E93B8: - ldr r4, _080E93BC @ =gOtherText_Profile - b _080E93FA - .align 2, 0 -_080E93BC: .4byte gOtherText_Profile -_080E93C0: - ldr r4, _080E93C4 @ =gOtherText_AtBattleStart - b _080E93FA - .align 2, 0 -_080E93C4: .4byte gOtherText_AtBattleStart -_080E93C8: - ldr r4, _080E93CC @ =gOtherText_UponWinningBattle - b _080E93FA - .align 2, 0 -_080E93CC: .4byte gOtherText_UponWinningBattle -_080E93D0: - ldr r4, _080E93D4 @ =gOtherText_UponLosingBattle - b _080E93FA - .align 2, 0 -_080E93D4: .4byte gOtherText_UponLosingBattle -_080E93D8: - ldr r4, _080E93DC @ =gOtherText_TheBardsSong - b _080E93FA - .align 2, 0 -_080E93DC: .4byte gOtherText_TheBardsSong -_080E93E0: - ldr r4, _080E93E4 @ =gOtherText_WhatsHipHappening - b _080E93FA - .align 2, 0 -_080E93E4: .4byte gOtherText_WhatsHipHappening -_080E93E8: - ldr r4, _080E93EC @ =gOtherText_Interview - b _080E93FA - .align 2, 0 -_080E93EC: .4byte gOtherText_Interview -_080E93F0: - ldr r4, _080E93F4 @ =gOtherText_GoodSaying - b _080E93FA - .align 2, 0 -_080E93F4: .4byte gOtherText_GoodSaying -_080E93F8: - movs r4, 0 -_080E93FA: - ldr r0, _080E943C @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E9440 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r0, _080E9444 @ =0x00009f8e - adds r5, r2, r0 - movs r3, 0xFC - strb r3, [r5] - adds r0, 0x1 - adds r1, r2, r0 - movs r0, 0x5 - strb r0, [r1] - ldr r0, _080E9448 @ =0x00009f90 - adds r1, r2, r0 - movs r0, 0x1 - strb r0, [r1] - cmp r4, 0 - beq _080E9450 - ldr r1, _080E944C @ =0x00009f91 - adds r0, r2, r1 - adds r1, r4, 0 - movs r2, 0xF0 - movs r3, 0x2 - bl sub_8072C74 - adds r0, r5, 0 - movs r1, 0 - movs r2, 0 - bl MenuPrint - b _080E9476 - .align 2, 0 -_080E943C: .4byte gWindowConfig_81E6D8C -_080E9440: .4byte gUnknown_083DB694 -_080E9444: .4byte 0x00009f8e -_080E9448: .4byte 0x00009f90 -_080E944C: .4byte 0x00009f91 -_080E9450: - ldr r0, _080E9484 @ =0x00009f91 - adds r1, r2, r0 - strb r3, [r1] - movs r0, 0x11 - strb r0, [r1, 0x1] - movs r0, 0x10 - strb r0, [r1, 0x2] - movs r0, 0xFF - strb r0, [r1, 0x3] - adds r0, r5, 0 - movs r1, 0 - movs r2, 0 - bl MenuPrint - adds r0, r5, 0 - movs r1, 0x1C - movs r2, 0 - bl MenuPrint -_080E9476: - ldr r0, _080E9488 @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E9484: .4byte 0x00009f91 -_080E9488: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E9368 - - thumb_func_start sub_80E948C -sub_80E948C: @ 80E948C - push {lr} - sub sp, 0x10 - ldr r0, _080E94A8 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bls _080E949C - b _080E9594 -_080E949C: - lsls r0, 2 - ldr r1, _080E94AC @ =_080E94B0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E94A8: .4byte gUnknown_083DB694 -_080E94AC: .4byte _080E94B0 - .align 2, 0 -_080E94B0: - .4byte _080E9508 - .4byte _080E9530 - .4byte _080E9554 - .4byte _080E9578 - .4byte _080E94C8 - .4byte _080E94E8 -_080E94C8: - ldr r0, _080E94E0 @ =0x06006800 - ldr r3, _080E94E4 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0x1A - str r1, [sp, 0x4] - movs r1, 0x18 - str r1, [sp, 0x8] - movs r1, 0x6 - str r1, [sp, 0xC] - movs r1, 0x3 - b _080E9568 - .align 2, 0 -_080E94E0: .4byte 0x06006800 -_080E94E4: .4byte gUnknown_08E94AD0 -_080E94E8: - ldr r0, _080E9500 @ =0x06006800 - ldr r3, _080E9504 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0x12 - str r1, [sp, 0x4] - movs r1, 0xD - str r1, [sp, 0x8] - movs r1, 0x8 - str r1, [sp, 0xC] - movs r1, 0xE - b _080E951E - .align 2, 0 -_080E9500: .4byte 0x06006800 -_080E9504: .4byte gUnknown_08E94AD0 -_080E9508: - ldr r0, _080E9528 @ =0x06006800 - ldr r3, _080E952C @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0xA - str r1, [sp, 0x4] - movs r1, 0x1A - str r1, [sp, 0x8] - movs r1, 0x8 - str r1, [sp, 0xC] - movs r1, 0x2 -_080E951E: - movs r2, 0x2 - bl sub_809D104 - b _080E9594 - .align 2, 0 -_080E9528: .4byte 0x06006800 -_080E952C: .4byte gUnknown_08E94AD0 -_080E9530: - ldr r0, _080E954C @ =0x06006800 - ldr r3, _080E9550 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r1, 0x1A - str r1, [sp, 0x8] - movs r1, 0xA - str r1, [sp, 0xC] - movs r1, 0x2 - movs r2, 0 - bl sub_809D104 - b _080E9594 - .align 2, 0 -_080E954C: .4byte 0x06006800 -_080E9550: .4byte gUnknown_08E94AD0 -_080E9554: - ldr r0, _080E9570 @ =0x06006800 - ldr r3, _080E9574 @ =gUnknown_08E94AD0 - movs r2, 0xD - str r2, [sp] - movs r1, 0x12 - str r1, [sp, 0x4] - str r2, [sp, 0x8] - movs r1, 0x4 - str r1, [sp, 0xC] - movs r1, 0xE -_080E9568: - movs r2, 0x3 - bl sub_809D104 - b _080E9594 - .align 2, 0 -_080E9570: .4byte 0x06006800 -_080E9574: .4byte gUnknown_08E94AD0 -_080E9578: - ldr r0, _080E959C @ =0x06006800 - ldr r3, _080E95A0 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0x20 - str r1, [sp, 0x4] - movs r1, 0x18 - str r1, [sp, 0x8] - movs r1, 0x4 - str r1, [sp, 0xC] - movs r1, 0x3 - movs r2, 0x2 - bl sub_809D104 -_080E9594: - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_080E959C: .4byte 0x06006800 -_080E95A0: .4byte gUnknown_08E94AD0 - thumb_func_end sub_80E948C - - thumb_func_start sub_80E95A4 -sub_80E95A4: @ 80E95A4 - push {lr} - ldr r0, _080E95C0 @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E95C4 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bhi _080E9612 - lsls r0, 2 - ldr r1, _080E95C8 @ =_080E95CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E95C0: .4byte gWindowConfig_81E6D8C -_080E95C4: .4byte gUnknown_083DB694 -_080E95C8: .4byte _080E95CC - .align 2, 0 -_080E95CC: - .4byte _080E95F2 - .4byte _080E95F6 - .4byte _080E9600 - .4byte _080E960A - .4byte _080E95E4 - .4byte _080E95EE -_080E95E4: - movs r0, 0x4 - movs r1, 0x6 - bl sub_80E9620 - b _080E9612 -_080E95EE: - movs r0, 0x2 - b _080E9602 -_080E95F2: - movs r0, 0x3 - b _080E95F8 -_080E95F6: - movs r0, 0 -_080E95F8: - movs r1, 0x5 - bl sub_80E9620 - b _080E9612 -_080E9600: - movs r0, 0x4 -_080E9602: - movs r1, 0x11 - bl sub_80E9620 - b _080E9612 -_080E960A: - movs r0, 0x3 - movs r1, 0x6 - bl sub_80E9620 -_080E9612: - ldr r0, _080E961C @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - pop {r0} - bx r0 - .align 2, 0 -_080E961C: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E95A4 - thumb_func_start sub_80E9620 sub_80E9620: @ 80E9620 push {r4-r7,lr} diff --git a/data/easy_chat.s b/data/easy_chat.s index 9181ea296..44347345b 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,90 +8,6 @@ .section .rodata - .align 2 -gUnknown_083DBD30:: @ 83DBD30 - obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006 - - .align 2 -gUnknown_083DBD38:: @ 83DBD38 - obj_pal gMenuInterviewFrame_Pal, 0x0004 - - .align 2 -gOamData_83DBD40:: @ 83DBD40 - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteTemplate_83DBD48:: @ 83DBD48 - spr_template 6, 4, gOamData_83DBD40, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_083DBD60:: @ 83DBD60 - obj_tiles gMenuWordGroupIndicator_Gfx, 4096, 0x0007 - - .align 2 -gUnknown_083DBD68:: @ 83DBD68 - obj_pal gMenuWordGroupIndicator_Pal, 0x0005 - - .align 2 -gOamData_83DBD70:: @ 83DBD70 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83DBD78:: @ 83DBD78 - obj_image_anim_frame 96, 3 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBD80:: @ 83DBD80 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 96, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBD94:: @ 83DBD94 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 96, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBDA8:: @ 83DBDA8 - obj_image_anim_frame 64, 2 - obj_image_anim_frame 32, 2 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBDB4:: @ 83DBDB4 - obj_image_anim_frame 64, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBDC0:: @ 83DBDC0 - obj_image_anim_frame 64, 2 - obj_image_anim_frame 96, 2 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBDCC:: @ 83DBDCC - .4byte gSpriteAnim_83DBD78 - .4byte gSpriteAnim_83DBD80 - .4byte gSpriteAnim_83DBD94 - .4byte gSpriteAnim_83DBDA8 - .4byte gSpriteAnim_83DBDB4 - .4byte gSpriteAnim_83DBDC0 - - .align 2 -gSpriteTemplate_83DBDE4:: @ 83DBDE4 - spr_template 7, 5, gOamData_83DBD70, gSpriteAnimTable_83DBDCC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - gUnknown_083DBDFC:: @ 83DBDFC .incbin "graphics/unknown/unknown_3DBDFC.gbapal" diff --git a/include/easy_chat.h b/include/easy_chat.h index 58442a890..0c42f4685 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -10,7 +10,7 @@ struct Shared1000 u8 unk8; u8 unk9; u8 unkA; - u8 unkB; + u8 unkB; // reporter talked to (Gabby or Ty) u16 unkC[(0x20-0xC)/2]; // unknown length void (*unk20)(void); u16 unk24; @@ -40,7 +40,8 @@ struct Shared1000 struct Sprite *unkA8; struct Sprite *unkAC[2]; struct Sprite *unkB4[2]; - u8 fillerBC[0x1A8-0xBC]; + u8 unkBC; + u8 fillerBD[0x1A8-0xBD]; s8 unk1A8; s8 unk1A9; s8 unk1AA[0xB5-0xAA]; // unknown length @@ -56,7 +57,8 @@ struct Shared1000 s8 unk1C0; u8 filler1C1[3]; void (*unk1C4)(void); - u8 filler1C8[0x4142-0x1C8]; + u8 unk1C8[0x6C8-0x1C8]; + u8 unk6C8[0x4142-0x6C8]; #if GERMAN u8 filler4142_de[0x32A]; #endif @@ -70,12 +72,17 @@ struct Shared1000 s8 unk99A6[0xA28-0x9A6]; s8 unk9A28; s8 unk9A29; - u16 unk9A2A[0x90][2]; // unknown length + u16 unk9A2A[(0x9C32-0x9A2A)/4][2]; // unknown length + u8 unk9C32; + u8 filler9C33; + u16 unk9C34[3][9]; u8 filler9C6A[2]; s8 *unk9C6C; u8 unk9C70; s8 unk9C71; - u8 filler9C72[0xC-0x2]; + u8 filler9C72[2]; + struct Sprite *unk9C74; + u8 filler9C78[4]; u16 unk9C7C; // this is at 0x9FA8 in German s16 unk9C7E; u8 unk9C80[0xC9-0x80]; @@ -88,7 +95,13 @@ struct Shared1000 u8 unk9E41[0x6E - 0x41]; u8 unk9E6E[0xEE - 0x6E]; u8 unk9EEE[0xF6E - 0xEEE]; - u8 unk9F6E[1]; // unknown length + u8 unk9F6E[0x8E - 0x6E]; // unknown length + u8 unk9F8E[1]; // unknown length + /* + u8 unk9F8F; + u8 unk9F90; + u8 unk9F91[1]; // unknown length + */ }; #define static_assert(cond) \ @@ -97,6 +110,7 @@ struct Shared1000 //static_assert(offsetof(struct Shared1000, unk1A8) == 0x1A8); extern u8 gUnknown_020388AC; +extern u8 gUnknown_03000740; // const pointer to shared1000. easy_chat might be two separate files. extern struct Shared1000 *const gUnknown_083DB694; diff --git a/include/field_map_obj.h b/include/field_map_obj.h index f0b0bb5ab..cf3be36b2 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -337,7 +337,7 @@ void RemoveFieldObjectInternal(struct MapObject *); u8 SpawnSpecialFieldObject(struct MapObjectTemplate *); u8 show_sprite(u8, u8, u8); void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables); -u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority); +u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority); u8 sub_805B410(u8, u8, s16, s16, u8, u8); void sub_805B55C(s16 a, s16 b); void sub_805B710(u16 i, u16 i1); diff --git a/include/graphics.h b/include/graphics.h index 130e21f58..e869b88e9 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2656,6 +2656,37 @@ extern const u8 gNamingScreenRightPointingTriangleTiles[]; extern const u8 gNamingScreenUnderscoreTiles[]; extern const u16 gNamingScreenPalettes[][16]; +extern const u8 gUnknown_08E94510[]; +extern const u8 gUnknown_08E94550[]; +extern const u8 gUnknown_08E94590[]; +extern const u8 gUnknown_08E945D0[]; +extern const u8 gUnknown_08E94AD0[]; +extern const u8 gUnknown_08E953D0[]; +extern const u8 gUnknown_08E954B0[]; +extern const u8 gUnknown_08E95774[]; + +extern const u8 gMenuWordGroupIndicator_Gfx[]; +extern const u8 gMenuWordGroupFrame_Gfx[]; +extern const u16 gMenuWordGroupIndicator_Pal[]; +extern const u16 gMenuWordGroupFrame1_Pal[]; +extern const u16 gMenuWordGroupFrame2_Pal[]; + +extern const u8 gUnknown_08E99FB0[]; +extern const u8 gUnknown_08E9A100[]; +extern const u8 gUnknown_08E9A300[]; +extern const u8 gUnknown_08E9AB00[]; +extern const u8 gUnknown_08E9AB40[]; +extern const u8 gUnknown_08E9AB60[]; +extern const u8 gUnknown_08E9ABB4[]; +extern const u8 gUnknown_08E9AC2C[]; +extern const u8 gUnknown_08E9AC4C[]; + extern const u8 gInterviewOutlineCursorTiles[]; +extern const u8 gTitleScreenPressStart_Gfx[]; +extern const u16 gTitleScreenLogoShinePalette[]; +extern const u8 gUnknown_08E9D8CC[]; +extern const u8 gVersionTiles[]; +extern const u16 gUnknown_08E9F624[]; +extern const u8 gUnknown_08E9F7E4[]; #endif // GUARD_GRAPHICS_H diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 0c0bc9e80..15ffa4665 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1,9 +1,17 @@ #include "global.h" +#include "constants/map_objects.h" +#include "decompress.h" #include "easy_chat.h" +#include "field_map_obj.h" #include "graphics.h" +#include "menu.h" +#include "palette.h" #include "sprite.h" +#include "strings.h" #include "trig.h" +extern void sub_809D104(); + void sub_80E8268(void); void sub_80E82BC(struct Sprite *); void sub_80E8534(void); @@ -14,6 +22,12 @@ void sub_80E8818(void); void sub_80E8860(struct Sprite *); void sub_80E8A7C(void); void sub_80E8B78(struct Sprite *); +void sub_80E8FA4(void); +void sub_80E9198(u8); +void sub_80E91D4(u8); +void sub_80E948C(void); +void sub_80E95A4(void); +void sub_80E9620(u16, u16); const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); const u16 InterviewPalette_1[] = INCBIN_U16("graphics/misc/interview_pal1.gbapal"); @@ -706,3 +720,527 @@ void sub_80E8B78(struct Sprite *sprite) } } } + +// defined below +extern const struct SpriteTemplate gSpriteTemplate_83DBD48; + +void sub_80E8BF4(u8 reporter, u8 b) +{ + struct CompressedSpriteSheet gUnknown_083DBD30 = {gMenuInterviewFrame_Gfx, 2048, 0x0006}; + struct SpritePalette gUnknown_083DBD38 = {gMenuInterviewFrame_Pal, 0x0004}; + s16 x; + s16 y; + u16 gabbyTyGfxId; + u8 spriteId; + + switch (b) + { + case 2: + default: + x = 64; + y = 40; + break; + case 5: + x = 36; + y = 48; + break; + } + + switch (reporter) + { + case 0: // Gabby + default: + gabbyTyGfxId = MAP_OBJ_GFX_REPORTER_M; + break; + case 1: // Ty + gabbyTyGfxId = MAP_OBJ_GFX_REPORTER_F; + break; + } + + LoadCompressedObjectPic(&gUnknown_083DBD30); + LoadSpritePalette(&gUnknown_083DBD38); + CreateSprite(&gSpriteTemplate_83DBD48, x, y, 1); + + spriteId = AddPseudoFieldObject( + (gSaveBlock2.playerGender == MALE) ? MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL : MAP_OBJ_GFX_RIVAL_MAY_NORMAL, + SpriteCallbackDummy, x - 12, y, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 0; + StartSpriteAnim(&gSprites[spriteId], 3); + } + + spriteId = AddPseudoFieldObject(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].oam.priority = 0; + StartSpriteAnim(&gSprites[spriteId], 2); + } +} + +const struct OamData gOamData_83DBD40 = +{ + .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 SpriteTemplate gSpriteTemplate_83DBD48 = +{ + .tileTag = 6, + .paletteTag = 4, + .oam = &gOamData_83DBD40, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +const struct CompressedSpriteSheet gUnknown_083DBD60 = {gMenuWordGroupIndicator_Gfx, 4096, 0x0007}; + +const struct SpritePalette gUnknown_083DBD68 = {gMenuWordGroupIndicator_Pal, 0x0005}; + +const struct OamData gOamData_83DBD70 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +const union AnimCmd gSpriteAnim_83DBD78[] = +{ + ANIMCMD_FRAME(96, 3), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBD80[] = +{ + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(96, 4), + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBD94[] = +{ + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(96, 4), + ANIMCMD_FRAME(64, 4), + ANIMCMD_FRAME(32, 4), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBDA8[] = +{ + ANIMCMD_FRAME(64, 2), + ANIMCMD_FRAME(32, 2), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBDB4[] = +{ + ANIMCMD_FRAME(64, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_END, +}; + +const union AnimCmd gSpriteAnim_83DBDC0[] = +{ + ANIMCMD_FRAME(64, 2), + ANIMCMD_FRAME(96, 2), + ANIMCMD_END, +}; + +const union AnimCmd *const gSpriteAnimTable_83DBDCC[] = +{ + gSpriteAnim_83DBD78, + gSpriteAnim_83DBD80, + gSpriteAnim_83DBD94, + gSpriteAnim_83DBDA8, + gSpriteAnim_83DBDB4, + gSpriteAnim_83DBDC0, +}; + +const struct SpriteTemplate gSpriteTemplate_83DBDE4 = +{ + .tileTag = 7, + .paletteTag = 5, + .oam = &gOamData_83DBD70, + .anims = gSpriteAnimTable_83DBDCC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +void sub_80E8CEC(void) +{ + u8 spriteId; + + LoadCompressedObjectPic(&gUnknown_083DBD60); + LoadSpritePalette(&gUnknown_083DBD68); + + spriteId = CreateSprite(&gSpriteTemplate_83DBDE4, 224, 88, 0); + if (spriteId != MAX_SPRITES) + gUnknown_083DB694->unk9C74 = &gSprites[spriteId]; + else + gUnknown_083DB694->unk9C74 = NULL; +} + +void sub_80E8D54(void) +{ + if (gUnknown_083DB694->unk9C74 != NULL) + { + if (gUnknown_083DB694->unk26 == 0) + StartSpriteAnim(gUnknown_083DB694->unk9C74, 1); + else + StartSpriteAnim(gUnknown_083DB694->unk9C74, 2); + } +} + +void sub_80E8D8C(u8 a) +{ + if (gUnknown_083DB694->unk9C74 != NULL) + { + if (a != 0) + { + if (gUnknown_083DB694->unk26 == 0) + StartSpriteAnim(gUnknown_083DB694->unk9C74, 3); + else + StartSpriteAnim(gUnknown_083DB694->unk9C74, 4); + } + else + { + StartSpriteAnim(gUnknown_083DB694->unk9C74, 5); + } + } +} + +extern const u16 gUnknown_083DBDFC[]; + +extern const u16 gUnknown_083DBE40[]; + +void sub_80E8DD8(void) +{ + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2VOFS = 0; + REG_BG2HOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; + + REG_BG0CNT = 0x8B00; + REG_BG1CNT = 0x0D09; + + CpuCopy16(gUnknown_08E945D0, gUnknown_083DB694->unk1C8, 0x500); + LZ77UnCompWram(gUnknown_08E953D0, gUnknown_083DB694->unk6C8); + LZ77UnCompVram(gMenuWordGroupFrame_Gfx, (void *)(VRAM + 0x8000)); + CpuCopy16(gUnknown_083DB694->unk1C8, (void *)(VRAM + 0x6800), 0x500); + LoadPalette(gMenuWordGroupFrame1_Pal, 64, 64); + + REG_BG2CNT = 0x0E02; + + DmaClear16(3, (void *)(VRAM + 0x7000), 0x800); + DmaCopy16Defvars(3, gUnknown_08E9AB00, (void *)(VRAM + 0x6000), 64); + LZ77UnCompVram(gUnknown_08E9AB60, (void *)(VRAM + 0x7000)); + LoadPalette(gUnknown_08E9AB40, 0, 32); + LoadPalette(gUnknown_083DBDFC, 16, 32); + + REG_BG3CNT = 0x0F0F; + + DmaClear32(3, (void *)(VRAM + 0x7800), 0x800); + LoadPalette(gUnknown_083DBE40, 32, 32); + gPlttBufferUnfaded[63] = RGB(31, 31, 31); + gPlttBufferUnfaded[49] = RGB(27, 26, 27); + gPlttBufferUnfaded[56] = RGB(28, 28, 28); + gPlttBufferFaded[63] = RGB(31, 31, 31); + gPlttBufferFaded[49] = RGB(27, 26, 27); + gPlttBufferFaded[56] = RGB(28, 28, 28); + + gUnknown_083DB694->unkBC = 0; + sub_80E8FA4(); + sub_80E948C(); + sub_80E9198(10); + sub_80E91D4(0); + sub_80E95A4(); + + REG_BLDCNT = 0; +} + +// The components are ORed in the reverse order from the normal RGB macro +#define RGB_(r, g, b) ((((b) & 0x1F) << 10) | (((g) & 0x1F) << 5) | ((r) & 0x1F)) + +#define R_VAL(color) ((color) & 0x1F) +#define G_VAL(color) (((color) >> 5) & 0x1F) +#define B_VAL(color) (((color) >> 10) & 0x1F) + +void sub_80E8FA4(void) +{ + u16 i; + u16 r3; + u16 r4; + s32 sp0[3]; + s32 spC[3]; + s32 sp18[3]; + + for (i = 0; i < 3; i++) + { + sp0[0] = R_VAL(*(gMenuWordGroupFrame2_Pal + i + 1)) << 8; + spC[0] = R_VAL(*(gMenuWordGroupFrame2_Pal + i + 4)) << 8; + sp0[1] = G_VAL(*(gMenuWordGroupFrame2_Pal + i + 1)) << 8; + spC[1] = G_VAL(*(gMenuWordGroupFrame2_Pal + i + 4)) << 8; + sp0[2] = B_VAL(*(gMenuWordGroupFrame2_Pal + i + 1)) << 8; + spC[2] = B_VAL(*(gMenuWordGroupFrame2_Pal + i + 4)) << 8; + + for (r3 = 0; r3 < 3; r3++) + sp18[r3] = (spC[r3] - sp0[r3]) / 8; + + for (r4 = 0; r4 < 8; r4++) + { + gUnknown_083DB694->unk9C34[i][r4] = RGB_(sp0[0] >> 8, sp0[1] >> 8, sp0[2] >> 8); + for (r3 = 0; r3 < 3; r3++) + sp0[r3] += sp18[r3]; + } + gUnknown_083DB694->unk9C34[i][r4] = RGB_(spC[0] >> 8, spC[1] >> 8, spC[2] >> 8); + } + gUnknown_083DB694->unk9C32 = 0; +} + +void sub_80E9108(u8 a) +{ + u16 i; + + gUnknown_083DB694->unk9C32 += a; + for (i = 0; i < 3; i++) + { + gPlttBufferUnfaded[81 + i] = gUnknown_083DB694->unk9C34[i][gUnknown_083DB694->unk9C32]; + gPlttBufferFaded[81 + i] = gUnknown_083DB694->unk9C34[i][gUnknown_083DB694->unk9C32]; + } +} + +void sub_80E9178(void) +{ + gUnknown_083DB694->unk9C32 = 0; + sub_80E9108(0); +} + +void sub_80E9198(u8 a) +{ + gUnknown_03000740 = a; +} + +u8 sub_80E91A4(void) +{ + return gUnknown_03000740; +} + +void sub_80E91B0(const u8 *a, u8 b, u8 c, u8 d) +{ + sub_8072AB0(a, b * 8, c * 8, 176, d * 8, 1); +} + +void sub_80E91D4(u8 a) +{ + BasicInitMenuWindow(&gWindowConfig_81E6DA8); + + if (a == 10) + { + MenuZeroFillWindowRect(3, 14, 26, 19); + sub_80E9198(10); + return; + } + + //_080E9200 + if (sub_80E91A4() == 10) + MenuDrawTextWindow(3, 14, 26, 19); + + //_080E9218 + sub_80E9198(a); + switch (a) + { + case 0: + sub_80E91B0(gUnknown_083DB694->unk9C80, 4, 15, 2); + sub_80E91B0(gUnknown_083DB694->unk9CC9, 4, 17, 2); + break; + case 1: + sub_80E91B0(gUnknown_083DB694->unk9D12, 4, 15, 2); + sub_80E91B0(gUnknown_083DB694->unk9D5B, 4, 17, 2); + break; + case 2: + sub_80E91B0(gOtherText_TextDeletedConfirmPage1, 4, 15, 2); + sub_80E91B0(gOtherText_TextDeletedConfirmPage2, 4, 17, 2); + break; + case 3: + switch (gUnknown_083DB694->unk8) + { + case 9: + sub_80E91B0(gOtherText_QuitGivingInfo, 4, 15, 4); + break; + case 4: + sub_80E91B0(gOtherText_StopGivingMail, 4, 15, 4); + break; + default: + sub_80E91B0(gOtherText_QuitEditing, 4, 15, 4); + break; + } + break; + case 4: + sub_80E91B0(gOtherText_EditedTextNoSavePage1, 4, 15, 2); + sub_80E91B0(gOtherText_EditedTextNoSavePage2, 4, 17, 2); + break; + case 5: + sub_80E91B0(gOtherText_EnterAPhraseOrWord, 4, 15, 4); + break; + case 6: + sub_80E91B0(gOtherText_TextNoDelete, 4, 15, 4); + break; + case 7: + sub_80E91B0(gOtherText_OnlyOnePhrase, 4, 15, 2); + sub_80E91B0(gOtherText_OriginalSongRestored, 4, 17, 2); + break; + case 8: + sub_80E91B0(gOtherText_TrendyAlready, 4, 15, 4); + break; + case 9: + sub_80E91B0(gOtherText_CombineTwoPhrases, 4, 15, 4); + break; + } +} + +void sub_80E9368(u8 a) +{ + const u8 *r4; + + switch (a) + { + case 0: + r4 = gOtherText_Profile; + break; + case 1: + r4 = gOtherText_AtBattleStart; + break; + case 2: + r4 = gOtherText_UponWinningBattle; + break; + case 3: + r4 = gOtherText_UponLosingBattle; + break; + case 6: + r4 = gOtherText_TheBardsSong; + break; + case 9: + r4 = gOtherText_WhatsHipHappening; + break; + case 5: + case 7: + case 8: + case 10: + case 11: + case 12: + r4 = gOtherText_Interview; + break; + case 13: + r4 = gOtherText_GoodSaying; + break; + default: + r4 = NULL; + break; + } + + BasicInitMenuWindow(&gWindowConfig_81E6D8C); + gUnknown_083DB694->unk9F8E[0] = EXT_CTRL_CODE_BEGIN; + gUnknown_083DB694->unk9F8E[1] = 5; + gUnknown_083DB694->unk9F8E[2] = 1; + if (r4 != NULL) + { + sub_8072C74(gUnknown_083DB694->unk9F8E + 3, r4, 240, 2); + MenuPrint(gUnknown_083DB694->unk9F8E, 0, 0); + } + else + { + u8 *str = gUnknown_083DB694->unk9F8E + 3; + + str[0] = EXT_CTRL_CODE_BEGIN; + str[1] = 0x11; + str[2] = 0x10; + str[3] = EOS; + + MenuPrint(gUnknown_083DB694->unk9F8E, 0, 0); + MenuPrint(gUnknown_083DB694->unk9F8E, 28, 0); + } + BasicInitMenuWindow(&gWindowConfig_81E6DA8); +} + +void sub_80E948C(void) +{ + switch (gUnknown_083DB694->unk9) + { + case 4: + sub_809D104((void *)(VRAM + 0x6800), 3, 3, gUnknown_08E94AD0, 0, 26, 24, 6); + break; + case 5: + sub_809D104((void *)(VRAM + 0x6800), 14, 2, gUnknown_08E94AD0, 0, 18, 13, 8); + break; + case 0: + sub_809D104((void *)(VRAM + 0x6800), 2, 2, gUnknown_08E94AD0, 0, 10, 26, 8); + break; + case 1: + sub_809D104((void *)(VRAM + 0x6800), 2, 0, gUnknown_08E94AD0, 0, 0, 26, 10); + break; + case 2: + sub_809D104((void *)(VRAM + 0x6800), 14, 3, gUnknown_08E94AD0, 13, 18, 13, 4); + break; + case 3: + sub_809D104((void *)(VRAM + 0x6800), 3, 2, gUnknown_08E94AD0, 0, 32, 24, 4); + break; + } +} + +void sub_80E95A4(void) +{ + BasicInitMenuWindow(&gWindowConfig_81E6D8C); + switch (gUnknown_083DB694->unk9) + { + case 4: + sub_80E9620(4, 6); + break; + case 5: + sub_80E9620(2, 17); + break; + case 0: + sub_80E9620(3, 5); + break; + case 1: + sub_80E9620(0, 5); + break; + case 2: + sub_80E9620(4, 17); + break; + case 3: + sub_80E9620(3, 6); + break; + } + BasicInitMenuWindow(&gWindowConfig_81E6DA8); +} diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index ba7c3d68e..77b4c8b5c 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -2440,7 +2440,7 @@ void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjT MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObjTemplate->graphicsId, mapObjTemplate->movementType, sprTemplate, subspriteTables); } -u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c, s16 d, u8 subpriority) +u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) { struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; @@ -2449,7 +2449,7 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); if (spriteTemplate.paletteTag != 0xFFFF) sub_805BDF8(spriteTemplate.paletteTag); - spriteId = CreateSprite(&spriteTemplate, c, d, subpriority); + spriteId = CreateSprite(&spriteTemplate, x, y, subpriority); if (spriteId != 64 && subspriteTables != NULL) { SetSubspriteTables(&gSprites[spriteId], subspriteTables); -- cgit v1.2.3 From cbf59a23017f7bcab82d345abf268a2f67a3bfea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Jan 2018 18:58:41 -0500 Subject: Link libc from agbcc --- Makefile | 3 +- ld_script.txt | 4 +- src/libs/libc.c | 143 -------------------------------------------------------- 3 files changed, 5 insertions(+), 145 deletions(-) delete mode 100644 src/libs/libc.c diff --git a/Makefile b/Makefile index e7e2a7156..48adfd870 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ LD := $(DEVKITARM)/bin/arm-none-eabi-ld OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy LIBGCC := tools/agbcc/lib/libgcc.a +LIBC := tools/agbcc/lib/libc.a SHA1 := sha1sum -c @@ -161,7 +162,7 @@ build/$1/ld_script.ld: ld_script.txt build/$1/sym_bss.ld build/$1/sym_common.ld cd build/$1 && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" >ld_script.ld poke$1.elf: build/$1/ld_script.ld $$($1_OBJS) - cd build/$1 && $$(LD) -T ld_script.ld -Map ../../poke$1.map -o ../../$$@ $$($1_OBJS_REL) ../../$$(LIBGCC) + cd build/$1 && $$(LD) -T ld_script.ld -Map ../../poke$1.map -o ../../$$@ $$($1_OBJS_REL) ../../$$(LIBGCC) ../../$$(LIBC) poke$1.gba: %.gba: %.elf $$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $$< $$@ diff --git a/ld_script.txt b/ld_script.txt index 6d35da842..aef34202a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -433,7 +433,9 @@ 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/libs/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); } =0 .rodata : diff --git a/src/libs/libc.c b/src/libs/libc.c deleted file mode 100644 index 920673e3e..000000000 --- a/src/libs/libc.c +++ /dev/null @@ -1,143 +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); -} -- cgit v1.2.3 From 27024647438c3cfeb6218965821ac2c07122e132 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 16:03:26 -0800 Subject: Use constants for some item names stored in script vars --- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 ++-- data/scripts/maps/MauvilleCity_GameCorner.inc | 18 ++++++------ data/scripts/maps/Route110_TrickHouseEnd.inc | 4 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 4 +-- data/scripts/maps/Route113_GlassWorkshop.inc | 32 +++++++++++----------- .../maps/Route124_DivingTreasureHuntersHouse.inc | 16 +++++------ 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index da4009759..cd5e0d980 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -88,17 +88,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C - setvar VAR_TEMP_0, 26 + setvar VAR_TEMP_0, ITEM_FRESH_WATER goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 - setvar VAR_TEMP_0, 27 + setvar VAR_TEMP_0, ITEM_SODA_POP goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 - setvar VAR_TEMP_0, 28 + setvar VAR_TEMP_0, ITEM_LEMONADE goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c40c05d37..d150e1508 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 88 - checkdecorspace 88 + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 88 + givedecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 89 - checkdecorspace 89 + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 89 + givedecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 90 - checkdecorspace 90 + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 90 + givedecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index e7e19b4dd..68ce0f5a7 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE - givedecoration_std 32 + givedecoration_std DECOR_BLUE_TENT .else - givedecoration_std 31 + givedecoration_std DECOR_RED_TENT .endc compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index e5a216db4..f34bba6e6 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration_std 32 + givedecoration_std DECOR_BLUE_TENT .else - givedecoration_std 31 + givedecoration_std DECOR_RED_TENT .endif compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 6c1e8559f..e1bb038e3 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -67,7 +67,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar VAR_SPECIAL_8, 39 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 @@ -81,7 +81,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar VAR_SPECIAL_8, 40 + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 @@ -95,7 +95,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar VAR_SPECIAL_8, 41 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 @@ -109,7 +109,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar VAR_SPECIAL_8, 43 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 @@ -123,7 +123,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar VAR_SPECIAL_8, 42 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 @@ -138,7 +138,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 13 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 @@ -153,7 +153,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 6 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 @@ -246,50 +246,50 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 39 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 40 + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 41 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 43 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 42 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 13 - bufferdecorationname 0, 13 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR + bufferdecorationname 0, DECOR_PRETTY_CHAIR goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 6 - bufferdecorationname 0, 6 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK + bufferdecorationname 0, DECOR_PRETTY_DESK goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 4061dcd7e..bc71fac41 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,23 +224,23 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar VAR_SPECIAL_8, 48 - setvar VAR_SPECIAL_9, 95 + setvar VAR_SPECIAL_8, ITEM_RED_SHARD + setvar VAR_SPECIAL_9, ITEM_FIRE_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar VAR_SPECIAL_8, 50 - setvar VAR_SPECIAL_9, 96 + setvar VAR_SPECIAL_8, ITEM_YELLOW_SHARD + setvar VAR_SPECIAL_9, ITEM_THUNDER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar VAR_SPECIAL_8, 49 - setvar VAR_SPECIAL_9, 97 + setvar VAR_SPECIAL_8, ITEM_BLUE_SHARD + setvar VAR_SPECIAL_9, ITEM_WATER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar VAR_SPECIAL_8, 51 - setvar VAR_SPECIAL_9, 98 + setvar VAR_SPECIAL_8, ITEM_GREEN_SHARD + setvar VAR_SPECIAL_9, ITEM_LEAF_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 -- cgit v1.2.3 From 5f6867767ca6dfa9496816421242ad4d563e1758 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 4 Jan 2018 19:14:21 -0500 Subject: Remove obsolete libc rule --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 48adfd870..c1f6a6b4f 100644 --- a/Makefile +++ b/Makefile @@ -92,9 +92,6 @@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(A sound/songs/%.s: sound/songs/%.mid cd $(@D) && ../../$(MID) $( Date: Thu, 4 Jan 2018 16:19:02 -0800 Subject: Use MSGBOX_YESNO and YES/NO constants for yes/no message boxes --- data-de/event_scripts.s | 140 ++++++++++----------- data-de/field_move_scripts.inc | 24 ++-- data/event_scripts.s | 138 ++++++++++---------- data/field_move_scripts.inc | 24 ++-- data/scripts/berry_tree.inc | 18 +-- data/scripts/cable_club.inc | 16 +-- data/scripts/contest_hall.inc | 16 +-- data/scripts/day_care.inc | 36 +++--- data/scripts/gabby_and_ty.inc | 16 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 18 +-- data/scripts/maps/BattleTower_Lobby.inc | 12 +- data/scripts/maps/BattleTower_Outside.inc | 8 +- data/scripts/maps/DewfordTown.inc | 16 +-- data/scripts/maps/DewfordTown_Hall.inc | 6 +- data/scripts/maps/FallarborTown_House1.inc | 6 +- data/scripts/maps/FallarborTown_House2.inc | 4 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 4 +- data/scripts/maps/LilycoveCity.inc | 12 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 24 ++-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 4 +- data/scripts/maps/LilycoveCity_Harbor.inc | 8 +- data/scripts/maps/LilycoveCity_House3.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 12 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 18 +-- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 18 +-- data/scripts/maps/MauvilleCity_GameCorner.inc | 12 +- data/scripts/maps/MauvilleCity_House2.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 8 +- data/scripts/maps/MossdeepCity_House3.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 8 +- data/scripts/maps/MtChimney.inc | 8 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_Summit.inc | 24 ++-- data/scripts/maps/NewMauville_Entrance.inc | 4 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/PacifidlogTown_House4.inc | 6 +- data/scripts/maps/PetalburgCity_Gym.inc | 72 +++++------ data/scripts/maps/Route104_MrBrineysHouse.inc | 12 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 12 +- data/scripts/maps/Route109.inc | 4 +- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 4 +- data/scripts/maps/Route111.inc | 12 +- data/scripts/maps/Route111_OldLadysRestStop.inc | 12 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113_GlassWorkshop.inc | 28 ++--- data/scripts/maps/Route114_LanettesHouse.inc | 8 +- data/scripts/maps/Route118.inc | 6 +- data/scripts/maps/Route120.inc | 14 +-- data/scripts/maps/Route121_SafariZoneEntrance.inc | 8 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 8 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 16 +-- data/scripts/maps/RustboroCity_House1.inc | 4 +- data/scripts/maps/SafariZone_Southeast.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/scripts/maps/SlateportCity.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 16 +-- data/scripts/maps/SlateportCity_House1.inc | 12 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_House2.inc | 6 +- data/scripts/maps/SootopolisCity_House3.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SouthernIsland_Exterior.inc | 4 +- data/scripts/pokeblocks.inc | 18 +-- data/scripts/safari_zone.inc | 8 +- data/scripts/secret_power_tm.inc | 4 +- 72 files changed, 523 insertions(+), 523 deletions(-) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index b8cc5d8f6..020c9a97d 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -440,8 +440,8 @@ EventScript_15F3E2: end EventScript_15F419: - msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + msgbox UnknownString_81A38FB, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F384 closemessage special SecretBasePC_PackUp @@ -492,8 +492,8 @@ EventScript_15F4A1: compare RESULT, 2 goto_if_eq EventScript_15F503 special BufferSecretBaseOwnerName - msgbox UnknownString_81A3958, 5 - compare RESULT, 0 + msgbox UnknownString_81A3958, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC @@ -502,8 +502,8 @@ EventScript_15F4A1: end EventScript_15F4E0: - msgbox UnknownString_81A3982, 5 - compare RESULT, 0 + msgbox UnknownString_81A3982, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC @@ -1449,10 +1449,10 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer - msgbox gText_NurseJoy_Welcome, 5 - compare RESULT, 1 + msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO + compare RESULT, YES goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FD7C - compare RESULT, 0 + compare RESULT, NO goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDC7 end @@ -1670,10 +1670,10 @@ HiddenItemScript_Fail: UnusedMixRecordsScript: @ 819FFD5 lock faceplayer - msgbox UnusedMixRecordsPromptText, 5 - compare RESULT, 1 + msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO + compare RESULT, YES goto_if_eq UnusedMixRecordsScript_Yes - compare RESULT, 0 + compare RESULT, NO goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA @@ -1833,8 +1833,8 @@ UseSurfScript:: @ 81A0117 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT lockall - msgbox UseSurfPromptText, 5 - compare RESULT, 0 + msgbox UseSurfPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 dofieldeffect 9 @@ -2199,8 +2199,8 @@ Route101_EventScript_1A037F:: @ 81A037F Route103_EventScript_1A037F:: @ 81A037F lock faceplayer - msgbox Route101_Text_1C4449, 5 - compare RESULT, 0 + msgbox Route101_Text_1C4449, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release @@ -2448,8 +2448,8 @@ Route120_EventScript_1A0594:: @ 81A0594 end Route119_EventScript_1A05AE:: @ 81A05AE - msgbox Route119_Text_171BB6, 5 - compare RESULT, 1 + msgbox Route119_Text_171BB6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route119_EventScript_1A05C3 release end @@ -3653,8 +3653,8 @@ EventScript_1A2CB0: compare RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartymonnick 0, RESULT - msgbox UnknownString_8198F34, 5 - compare RESULT, 0 + msgbox UnknownString_8198F34, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3684,8 +3684,8 @@ EventScript_1A2D08: compare RESULT, 6 goto_if_eq EventScript_1A2D49 bufferpartymonnick 0, RESULT - msgbox UnknownString_81A197B, 5 - compare RESULT, 0 + msgbox UnknownString_81A197B, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3715,8 +3715,8 @@ EventScript_1A2D60: compare RESULT, 6 goto_if_eq EventScript_1A2DA1 bufferpartymonnick 0, RESULT - msgbox UnknownString_81A1A4B, 5 - compare RESULT, 0 + msgbox UnknownString_81A1A4B, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3759,8 +3759,8 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE applymovement 255, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 setvar VAR_0x4097, 1 - msgbox SecretBase_RedCave1_Text_198F89, 5 - compare RESULT, 1 + msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage playse SE_KAIDAN @@ -3807,18 +3807,18 @@ EventScript_1A2E45: setorcopyvar VAR_SPECIAL_4, RESULT lockall special GetSecretBaseNearbyMapName - msgbox UnknownString_81A3C71, 5 - compare RESULT, 0 + msgbox UnknownString_81A3C71, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A - msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + msgbox UnknownString_81A38FB, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A fadescreen 1 special MoveSecretBase closemessage fadescreen 0 - msgbox UnknownString_81A3CC9, 5 - compare RESULT, 0 + msgbox UnknownString_81A3CC9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A bufferpartymonnick 0, VAR_SPECIAL_4 buffermovename 1, MOVE_SECRET_POWER @@ -3971,8 +3971,8 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1AEA, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1AEA, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C @@ -4006,8 +4006,8 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1E67, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1E67, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C @@ -4041,8 +4041,8 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer - msgbox SecretBase_RedCave1_Text_1A218F, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A218F, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C @@ -4076,8 +4076,8 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A24E1, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A24E1, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C @@ -4111,8 +4111,8 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2830, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2830, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C @@ -4146,8 +4146,8 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1CB2, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1CB2, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C @@ -4181,8 +4181,8 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2026, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2026, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C @@ -4216,8 +4216,8 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A236A, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A236A, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C @@ -4251,8 +4251,8 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2663, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2663, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C @@ -4286,8 +4286,8 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2A13, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2A13, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C @@ -4427,10 +4427,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 - compare RESULT, 1 + msgbox SlateportCity_PokemonFanClub_Text_1A8704, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4475,18 +4475,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 - msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4531,10 +4531,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 - compare RESULT, 1 + msgbox SlateportCity_PokemonFanClub_Text_1A82F1, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end @@ -4608,10 +4608,10 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1A6F7C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4705,10 +4705,10 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox BattleTower_Lobby_Text_1A776D, 5 - compare RESULT, 1 + msgbox BattleTower_Lobby_Text_1A776D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq BattleTower_Lobby_EventScript_1AE241 - compare RESULT, 0 + compare RESULT, NO goto_if_eq BattleTower_Lobby_EventScript_1AE297 end diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index edecb0312..91f6ca620 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -8,8 +8,8 @@ S_CuttableTree:: @ 81B0DCC setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_CUT - msgbox UseCutPromptText, 5 - compare RESULT, 0 + msgbox UseCutPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -69,8 +69,8 @@ S_BreakableRock:: @ 81B0EB7 setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox UseRockSmashPromptText, 5 - compare RESULT, 0 + msgbox UseRockSmashPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -136,8 +136,8 @@ S_PushableBoulder:: @ 81B0FCB compare RESULT, 6 goto_if_eq CannotUseStrength setfieldeffectargument 0, RESULT - msgbox UseStrengthPromptText, 5 - compare RESULT, 0 + msgbox UseStrengthPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Strength_ChoseNo closemessage dofieldeffect 40 @@ -198,8 +198,8 @@ S_UseWaterfall:: @ 81B115A goto_if_eq Waterfall_NoMonKnows bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT - msgbox UseWaterfallPromptText, 5 - compare RESULT, 0 + msgbox UseWaterfallPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 dofieldeffect 43 @@ -232,8 +232,8 @@ UseDiveScript:: @ 81B1220 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UseDivePromptText, 5 - compare RESULT, 0 + msgbox UseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Dive_Done msgbox UsedDiveText, 4 dofieldeffect 44 @@ -255,8 +255,8 @@ S_UseDiveUnderwater:: @ 81B1269 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UnderwaterUseDivePromptText, 5 - compare RESULT, 0 + msgbox UnderwaterUseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 dofieldeffect 44 diff --git a/data/event_scripts.s b/data/event_scripts.s index 8b0011893..1ed419b52 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -440,8 +440,8 @@ EventScript_15F3E2: end EventScript_15F419: - msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + msgbox UnknownString_81A38FB, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F384 closemessage special SecretBasePC_PackUp @@ -492,8 +492,8 @@ EventScript_15F4A1: compare RESULT, 2 goto_if_eq EventScript_15F503 special BufferSecretBaseOwnerName - msgbox UnknownString_81A3958, 5 - compare RESULT, 0 + msgbox UnknownString_81A3958, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC @@ -502,8 +502,8 @@ EventScript_15F4A1: end EventScript_15F4E0: - msgbox UnknownString_81A3982, 5 - compare RESULT, 0 + msgbox UnknownString_81A3982, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC @@ -1444,9 +1444,9 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO - compare RESULT, 1 + compare RESULT, YES goto_if_eq do_heal_party - compare RESULT, 0 + compare RESULT, NO goto_if_eq dont_heal_party end @@ -1664,10 +1664,10 @@ HiddenItemScript_Fail: UnusedMixRecordsScript: @ 819FFD5 lock faceplayer - msgbox UnusedMixRecordsPromptText, 5 - compare RESULT, 1 + msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO + compare RESULT, YES goto_if_eq UnusedMixRecordsScript_Yes - compare RESULT, 0 + compare RESULT, NO goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA @@ -1827,8 +1827,8 @@ UseSurfScript:: @ 81A0117 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT lockall - msgbox UseSurfPromptText, 5 - compare RESULT, 0 + msgbox UseSurfPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 dofieldeffect 9 @@ -2193,8 +2193,8 @@ Route101_EventScript_1A037F:: @ 81A037F Route103_EventScript_1A037F:: @ 81A037F lock faceplayer - msgbox Route101_Text_1C4449, 5 - compare RESULT, 0 + msgbox Route101_Text_1C4449, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release @@ -2442,8 +2442,8 @@ Route120_EventScript_1A0594:: @ 81A0594 end Route119_EventScript_1A05AE:: @ 81A05AE - msgbox Route119_Text_171BB6, 5 - compare RESULT, 1 + msgbox Route119_Text_171BB6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route119_EventScript_1A05C3 release end @@ -3632,8 +3632,8 @@ EventScript_1A2CB0: compare RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartymonnick 0, RESULT - msgbox UnknownString_8198F34, 5 - compare RESULT, 0 + msgbox UnknownString_8198F34, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3663,8 +3663,8 @@ EventScript_1A2D08: compare RESULT, 6 goto_if_eq EventScript_1A2D49 bufferpartymonnick 0, RESULT - msgbox UnknownString_81A197B, 5 - compare RESULT, 0 + msgbox UnknownString_81A197B, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3694,8 +3694,8 @@ EventScript_1A2D60: compare RESULT, 6 goto_if_eq EventScript_1A2DA1 bufferpartymonnick 0, RESULT - msgbox UnknownString_81A1A4B, 5 - compare RESULT, 0 + msgbox UnknownString_81A1A4B, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3738,8 +3738,8 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE applymovement 255, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 setvar VAR_0x4097, 1 - msgbox SecretBase_RedCave1_Text_198F89, 5 - compare RESULT, 1 + msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage playse SE_KAIDAN @@ -3786,18 +3786,18 @@ EventScript_1A2E45: setorcopyvar VAR_SPECIAL_4, RESULT lockall special GetSecretBaseNearbyMapName - msgbox UnknownString_81A3C71, 5 - compare RESULT, 0 + msgbox UnknownString_81A3C71, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A - msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + msgbox UnknownString_81A38FB, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A fadescreen 1 special MoveSecretBase closemessage fadescreen 0 - msgbox UnknownString_81A3CC9, 5 - compare RESULT, 0 + msgbox UnknownString_81A3CC9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A bufferpartymonnick 0, VAR_SPECIAL_4 buffermovename 1, MOVE_SECRET_POWER @@ -3950,8 +3950,8 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1AEA, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1AEA, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C @@ -3985,8 +3985,8 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1E67, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1E67, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C @@ -4020,8 +4020,8 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer - msgbox SecretBase_RedCave1_Text_1A218F, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A218F, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C @@ -4055,8 +4055,8 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A24E1, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A24E1, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C @@ -4090,8 +4090,8 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2830, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2830, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C @@ -4125,8 +4125,8 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1CB2, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1CB2, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C @@ -4160,8 +4160,8 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2026, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2026, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C @@ -4195,8 +4195,8 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A236A, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A236A, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C @@ -4230,8 +4230,8 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2663, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2663, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C @@ -4265,8 +4265,8 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2A13, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2A13, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C @@ -4395,10 +4395,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 - compare RESULT, 1 + msgbox SlateportCity_PokemonFanClub_Text_1A8704, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4443,18 +4443,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 - msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4499,10 +4499,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 - compare RESULT, 1 + msgbox SlateportCity_PokemonFanClub_Text_1A82F1, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end @@ -4576,10 +4576,10 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1A6F7C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4673,10 +4673,10 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox BattleTower_Lobby_Text_1A776D, 5 - compare RESULT, 1 + msgbox BattleTower_Lobby_Text_1A776D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq BattleTower_Lobby_EventScript_1AE241 - compare RESULT, 0 + compare RESULT, NO goto_if_eq BattleTower_Lobby_EventScript_1AE297 end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 0a7112125..a4a7513e5 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -8,8 +8,8 @@ S_CuttableTree:: @ 81B0DCC setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_CUT - msgbox UseCutPromptText, 5 - compare RESULT, 0 + msgbox UseCutPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -66,8 +66,8 @@ S_BreakableRock:: @ 81B0EB7 setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox UseRockSmashPromptText, 5 - compare RESULT, 0 + msgbox UseRockSmashPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -133,8 +133,8 @@ S_PushableBoulder:: @ 81B0FCB compare RESULT, 6 goto_if_eq CannotUseStrength setfieldeffectargument 0, RESULT - msgbox UseStrengthPromptText, 5 - compare RESULT, 0 + msgbox UseStrengthPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Strength_ChoseNo closemessage dofieldeffect 40 @@ -195,8 +195,8 @@ S_UseWaterfall:: @ 81B115A goto_if_eq Waterfall_NoMonKnows bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT - msgbox UseWaterfallPromptText, 5 - compare RESULT, 0 + msgbox UseWaterfallPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 dofieldeffect 43 @@ -229,8 +229,8 @@ UseDiveScript:: @ 81B1220 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UseDivePromptText, 5 - compare RESULT, 0 + msgbox UseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Dive_Done msgbox UsedDiveText, 4 dofieldeffect 44 @@ -252,8 +252,8 @@ S_UseDiveUnderwater:: @ 81B1269 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UnderwaterUseDivePromptText, 5 - compare RESULT, 0 + msgbox UnderwaterUseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 dofieldeffect 44 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 817e2b1e4..9fb808074 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -31,10 +31,10 @@ Route102_EventScript_1A153D:: @ 81A153D end Route102_EventScript_1A1558:: @ 81A1558 - msgbox Route102_Text_1A16CD, 5 - compare RESULT, 1 + msgbox Route102_Text_1A16CD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route102_EventScript_1A1577 - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route102_EventScript_1A1593 end @@ -101,10 +101,10 @@ Route102_EventScript_1A15F9:: @ 81A15F9 buffernumberstring 1, VAR_SPECIAL_6 lock faceplayer - msgbox Route102_Text_1A17C0, 5 - compare RESULT, 1 + msgbox Route102_Text_1A17C0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route102_EventScript_1A161D - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D @@ -148,10 +148,10 @@ Route102_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 compare RESULT, 0 goto_if_eq Route102_EventScript_1A168D - msgbox Route102_Text_1A18E6, 5 - compare RESULT, 1 + msgbox Route102_Text_1A18E6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route102_EventScript_1A1693 - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route102_EventScript_1A168D Route102_EventScript_1A168D:: @ 81A168D diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 397538eaf..334a52382 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -351,10 +351,10 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer - msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 - compare RESULT, 0 + msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 1 + compare RESULT, YES goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A40FA OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA @@ -448,10 +448,10 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer - msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 - compare RESULT, 0 + msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, MSGBOX_YESNO + compare RESULT, NO goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 1 + compare RESULT, YES goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 @@ -790,8 +790,8 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 end TradeRoom_PromptToCancelLink:: @ 81A44E5 - msgbox TradeRoom_WillLinkBeTerminated, 5 - compare RESULT, 1 + msgbox TradeRoom_WillLinkBeTerminated, MSGBOX_YESNO + compare RESULT, YES goto_if_eq TradeRoom_TerminateLink erasebox 0, 0, 29, 19 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 4a7712f58..af2c39979 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -32,8 +32,8 @@ FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 end FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 - msgbox FallarborTown_ContestLobby_Text_1A64F4, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1A64F4, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 releaseall @@ -153,17 +153,17 @@ FallarborTown_ContestLobby_EventScript_1A50C8:: @ 81A50C8 end FallarborTown_ContestLobby_EventScript_1A50D7:: @ 81A50D7 - msgbox FallarborTown_ContestLobby_Text_1A67A3, 5 + msgbox FallarborTown_ContestLobby_Text_1A67A3, MSGBOX_YESNO switch RESULT - case 0, FallarborTown_ContestLobby_EventScript_1A5048 - case 1, FallarborTown_ContestLobby_EventScript_1A513D + case NO, FallarborTown_ContestLobby_EventScript_1A5048 + case YES, FallarborTown_ContestLobby_EventScript_1A513D end FallarborTown_ContestLobby_EventScript_1A50FB:: @ 81A50FB - msgbox FallarborTown_ContestLobby_Text_1A6724, 5 + msgbox FallarborTown_ContestLobby_Text_1A6724, MSGBOX_YESNO switch RESULT - case 0, FallarborTown_ContestLobby_EventScript_1A5048 - case 1, FallarborTown_ContestLobby_EventScript_1A513D + case NO, FallarborTown_ContestLobby_EventScript_1A5048 + case YES, FallarborTown_ContestLobby_EventScript_1A513D end FallarborTown_ContestLobby_EventScript_1A511F:: @ 81A511F diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index ab91466d8..0d0d83801 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -14,11 +14,11 @@ Route117_EventScript_1B222D:: @ 81B222D end Route117_EventScript_1B2262:: @ 81B2262 - msgbox Route117_Text_1B2659, 5 - compare RESULT, 1 + msgbox Route117_Text_1B2659, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_EventScript_1B2298 - msgbox Route117_Text_1B28C4, 5 - compare RESULT, 1 + msgbox Route117_Text_1B28C4, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag FLAG_PENDING_DAYCARE_EGG @@ -88,8 +88,8 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 goto_if_eq Route117_PokemonDayCare_EventScript_1B242B compare RESULT, 3 goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 - msgbox Route117_PokemonDayCare_Text_1B28F2, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B28F2, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release @@ -127,8 +127,8 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 end Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA - msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -162,11 +162,11 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B msgbox Route117_PokemonDayCare_Text_1B2A88, 4 setvar VAR_SPECIAL_4, 0 call Route117_PokemonDayCare_EventScript_1B241A - msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C - msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -189,8 +189,8 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special GetDaycareCost - msgbox Route117_PokemonDayCare_Text_1B2B49, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2B49, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -221,8 +221,8 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 - msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2A4F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -263,8 +263,8 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 call Route117_PokemonDayCare_EventScript_1B241A setvar VAR_SPECIAL_4, 1 call Route117_PokemonDayCare_EventScript_1B241A - msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index e2f43b77e..ad7a3d3c5 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -210,7 +210,7 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 call_if 1, Route111_EventScript_1AE5FD checkflag FLAG_TEMP_1 goto_if_eq Route111_EventScript_1AE73A - msgbox Route111_Text_1AC015, 5 + msgbox Route111_Text_1AC015, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end @@ -270,37 +270,37 @@ Route111_Movement_1AE69D:: @ 81AE69D step_end Route111_EventScript_1AE69F:: @ 81AE69F - msgbox Route111_Text_1AC60B, 5 + msgbox Route111_Text_1AC60B, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6AD:: @ 81AE6AD - msgbox Route111_Text_1AC3CF, 5 + msgbox Route111_Text_1AC3CF, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6BB:: @ 81AE6BB - msgbox Route111_Text_1AC18D, 5 + msgbox Route111_Text_1AC18D, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6C9:: @ 81AE6C9 - msgbox Route111_Text_1AC219, 5 + msgbox Route111_Text_1AC219, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6D7:: @ 81AE6D7 - msgbox Route111_Text_1AC2D6, 5 + msgbox Route111_Text_1AC2D6, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6E5:: @ 81AE6E5 - msgbox Route111_Text_1AC355, 5 + msgbox Route111_Text_1AC355, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6F3:: @ 81AE6F3 - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 setvar VAR_SPECIAL_4, 10 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 1ee0d35d2..ce7d7c0e9 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -59,24 +59,24 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special ScrSpecial_HealPlayerParty BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 - msgbox BattleTower_BattleRoom_Text_19AD09, 5 + msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_1609E0 - case 1, BattleTower_BattleRoom_EventScript_160A3C + case NO, BattleTower_BattleRoom_EventScript_1609E0 + case YES, BattleTower_BattleRoom_EventScript_160A3C case 127, BattleTower_BattleRoom_EventScript_1609E0 BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0 - msgbox BattleTower_BattleRoom_Text_19AD3C, 5 + msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_160A0E - case 1, BattleTower_BattleRoom_EventScript_160A94 + case NO, BattleTower_BattleRoom_EventScript_160A0E + case YES, BattleTower_BattleRoom_EventScript_160A94 case 127, BattleTower_BattleRoom_EventScript_160A0E BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E - msgbox BattleTower_BattleRoom_Text_19AD66, 5 + msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_1609B2 - case 1, BattleTower_BattleRoom_EventScript_160AB1 + case NO, BattleTower_BattleRoom_EventScript_1609B2 + case YES, BattleTower_BattleRoom_EventScript_160AB1 case 127, BattleTower_BattleRoom_EventScript_1609B2 BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5700480e2..14b85c5b0 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -221,10 +221,10 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA waitstate compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F - msgbox BattleTower_Lobby_Text_199FDA, 5 + msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO switch RESULT - case 0, BattleTower_Lobby_EventScript_16064F - case 1, BattleTower_Lobby_EventScript_160587 + case NO, BattleTower_Lobby_EventScript_16064F + case YES, BattleTower_Lobby_EventScript_160587 case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 @@ -334,10 +334,10 @@ BattleTower_Lobby_Movement_16069A:: @ 816069A BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 lock faceplayer - msgbox BattleTower_Lobby_Text_19A747, 5 + msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO switch RESULT - case 1, BattleTower_Lobby_EventScript_1606CC - case 0, BattleTower_Lobby_EventScript_1606F7 + case YES, BattleTower_Lobby_EventScript_1606CC + case NO, BattleTower_Lobby_EventScript_1606F7 release end diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 3992ffd2c..8f6cb4305 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -35,8 +35,8 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 end BattleTower_Outside_EventScript_1601D0:: @ 81601D0 - msgbox BattleTower_Outside_Text_199DF2, 5 - compare RESULT, 0 + msgbox BattleTower_Outside_Text_199DF2, MSGBOX_YESNO + compare RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -46,8 +46,8 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 end BattleTower_Outside_EventScript_1601FB:: @ 81601FB - msgbox BattleTower_Outside_Text_199E0E, 5 - compare RESULT, 0 + msgbox BattleTower_Outside_Text_199E0E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index dc733071f..50c9d8991 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -42,8 +42,8 @@ DewfordTown_EventScript_14E06B:: @ 814E06B end DewfordTown_EventScript_14E076:: @ 814E076 - msgbox DewfordTown_Text_16B3BC, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -76,10 +76,10 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 faceplayer checkflag FLAG_RECEIVED_OLD_ROD goto_if_eq DewfordTown_EventScript_14E11B - msgbox DewfordTown_Text_16B665, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B665, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E0F0 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_EventScript_14E111 end @@ -598,10 +598,10 @@ DewfordTown_EventScript_14E413:: @ 814E413 lock faceplayer call DewfordTown_EventScript_1A0102 - msgbox DewfordTown_Text_16B9CE, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E439 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_EventScript_14E443 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 530a4e04d..c4ccc769c 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -30,10 +30,10 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD faceplayer call DewfordTown_Hall_EventScript_1A0102 special BufferRandomHobbyOrLifestyleString - msgbox DewfordTown_Hall_Text_1755F9, 5 - compare RESULT, 1 + msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_Hall_EventScript_153300 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 3c5345f8f..d2b27f478 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -22,7 +22,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem_std ITEM_TM27 @@ -37,11 +37,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA FallarborTown_House1_EventScript_153C2D:: @ 8153C2D msgbox FallarborTown_House1_Text_177755, 4 - msgbox FallarborTown_House1_Text_17780E, 5 + msgbox FallarborTown_House1_Text_17780E, MSGBOX_YESNO return FallarborTown_House1_EventScript_153C3E:: @ 8153C3E - msgbox FallarborTown_House1_Text_1779B8, 5 + msgbox FallarborTown_House1_Text_1779B8, MSGBOX_YESNO return FallarborTown_House1_EventScript_153C47:: @ 8153C47 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 0546ef5be..7ceaabdef 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -16,9 +16,9 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 compare RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 - msgbox FallarborTown_House2_Text_177BDB, 5 + msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO switch RESULT - case 0, FallarborTown_House2_EventScript_153D60 + case NO, FallarborTown_House2_EventScript_153D60 goto FallarborTown_House2_EventScript_153CE4 end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 239c1410d..937b435a6 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -64,8 +64,8 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 end FortreeCity_EventScript_14C9CF:: @ 814C9CF - msgbox FortreeCity_Text_16788B, 5 - compare RESULT, 1 + msgbox FortreeCity_Text_16788B, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index f6f8aafa6..b308aa836 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -10,8 +10,8 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox FortreeCity_House1_Text_18568C, 5 - compare RESULT, 0 + msgbox FortreeCity_House1_Text_18568C, MSGBOX_YESNO + compare RESULT, NO goto_if_eq FortreeCity_House1_EventScript_157E95 special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index f1a6deed0..44a1e141b 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -274,8 +274,8 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A faceplayer checkflag FLAG_RECEIVED_LAVARIDGE_EGG goto_if_eq LavaridgeTown_EventScript_14E79E - msgbox LavaridgeTown_Text_16C174, 5 - compare RESULT, 0 + msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LavaridgeTown_EventScript_14E7B2 getpartysize compare RESULT, 6 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 0d714003e..6ed8054f8 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CDB9 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch VAR_STARTER_MON @@ -270,11 +270,11 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 end LilycoveCity_EventScript_14CDB0:: @ 814CDB0 - msgbox LilycoveCity_Text_167B55, 5 + msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO return LilycoveCity_EventScript_14CDB9:: @ 814CDB9 - msgbox LilycoveCity_Text_1679BF, 5 + msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO return LilycoveCity_EventScript_14CDC2:: @ 814CDC2 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CE2C - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch VAR_STARTER_MON @@ -301,11 +301,11 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 end LilycoveCity_EventScript_14CE23:: @ 814CE23 - msgbox LilycoveCity_Text_168067, 5 + msgbox LilycoveCity_Text_168067, MSGBOX_YESNO return LilycoveCity_EventScript_14CE2C:: @ 814CE2C - msgbox LilycoveCity_Text_167F75, 5 + msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO return LilycoveCity_EventScript_14CE35:: @ 814CE35 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index bb13b95be..7aceecef6 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -30,10 +30,10 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 fadescreen 1 drawcontestwinner 0 lockall - msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -55,8 +55,8 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE end LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 - msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -204,10 +204,10 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall fadescreen 1 drawcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -228,8 +228,8 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE end LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 - msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -327,8 +327,8 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA end LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 - msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare RESULT, 0 + msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog erasebox 0, 0, 15, 9 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 12d8bfb4e..db2b8edf9 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -13,8 +13,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare RESULT, 0 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag FLAG_DAILY_PICKED_LOTTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9554b8fa4..3b884c233 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -47,8 +47,8 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 end LilycoveCity_Harbor_EventScript_159933:: @ 8159933 - msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare RESULT, 0 + msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -58,8 +58,8 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 end LilycoveCity_Harbor_EventScript_15995B:: @ 815995B - msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare RESULT, 0 + msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 03203ed47..1a569bf5b 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -10,8 +10,8 @@ LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer - msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare RESULT, 0 + msgbox LilycoveCity_House3_Text_18B8CC, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closemessage diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 5d5b04114..95338f231 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -22,10 +22,10 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F end LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare RESULT, 0 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare RESULT, 1 + compare RESULT, YES goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0c9a9054b..8b8500a9c 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -5,10 +5,10 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE lockall applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO switch RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_159ADE - case 0, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall end @@ -31,10 +31,10 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName - msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO switch RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53 - case 0, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53 + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index e1cb348fd..10e4712bb 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -29,10 +29,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE waitmessage playfanfare BGM_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -43,10 +43,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA end LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA - msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -58,10 +58,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 end LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B - msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index d7f0611e1..652a25f6f 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -100,14 +100,14 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 waitmovement 0 applymovement 6, MauvilleCity_Movement_1A0835 waitmovement 0 - msgbox MauvilleCity_Text_165D50, 5 + msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare RESULT, 1 + compare RESULT, YES call_if 1, MauvilleCity_EventScript_14C23C - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_EventScript_14C285 closemessage switch FACING @@ -185,7 +185,7 @@ MauvilleCity_EventScript_14C285:: @ 814C285 MauvilleCity_EventScript_14C292:: @ 814C292 applymovement 6, MauvilleCity_Movement_1A0839 waitmovement 0 - msgbox MauvilleCity_Text_165EE2, 5 + msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 6c2dc57e1..6bd7f0f4f 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -9,18 +9,18 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 checkflag FLAG_DECLINED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 - msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 - msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -63,10 +63,10 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 end MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E - msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_1813A0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index d150e1508..e938a1b4c 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -143,8 +143,8 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C - msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -276,8 +276,8 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC - msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -391,8 +391,8 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 faceplayer checkflag FLAG_RECEIVED_STARTER_DOLL goto_if_eq MauvilleCity_GameCorner_EventScript_157072 - msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_156FDB diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 32269ab89..9d3bce68a 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -19,10 +19,10 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 waitmovement 0 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmovement 0 - msgbox MauvilleCity_House2_Text_1824D8, 5 - compare RESULT, 1 + msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_House2_EventScript_15731B - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index fd4b8cfbf..3d1baf143 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -70,8 +70,8 @@ MossdeepCity_EventScript_14D027:: @ 814D027 faceplayer checkflag FLAG_RECEIVED_KINGS_ROCK goto_if_eq MossdeepCity_EventScript_14D069 - msgbox MossdeepCity_Text_1690A9, 5 - compare RESULT, 0 + msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem_std ITEM_KINGS_ROCK diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index ad3b366a8..eac7f4adb 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -93,14 +93,14 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special BufferEReaderTrainerName - msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare RESULT, 0 + msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 - msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare RESULT, 0 + msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO + compare RESULT, NO call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 6632ac793..fb44685d8 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -6,8 +6,8 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 faceplayer checkflag FLAG_RECEIVED_SUPER_ROD goto_if_eq MossdeepCity_House3_EventScript_15A9B1 - msgbox MossdeepCity_House3_Text_18D909, 5 - compare RESULT, 0 + msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem_std ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 9aa9d8ef3..ce2f2aad5 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -71,8 +71,8 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall - msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare RESULT, 0 + msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 getpartysize compare RESULT, 6 @@ -85,8 +85,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C waitmessage givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferspeciesname 1, SPECIES_BELDUM - msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare RESULT, 1 + msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d93ec772a..be4799a45 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -17,8 +17,8 @@ MtChimney_EventScript_15CF95:: @ 815CF95 faceplayer showmoneybox 0, 0 nop - msgbox MtChimney_Text_195760, 5 - compare RESULT, 0 + msgbox MtChimney_Text_195760, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 compare RESULT, 0 @@ -410,8 +410,8 @@ MtChimney_EventScript_15D17D:: @ 815D17D goto_if 0, MtChimney_EventScript_15D1D0 checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 - msgbox MtChimney_Text_195870, 5 - compare RESULT, 0 + msgbox MtChimney_Text_195870, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem_std ITEM_METEORITE diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 6b919f2ca..aefc68bda 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -31,10 +31,10 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer - msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare RESULT, 1 + msgbox MtChimney_CableCarStation_Text_19256A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 9cd4eecd1..56ef5db79 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -139,13 +139,13 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF lock faceplayer .ifdef SAPPHIRE - msgbox UnknownString_81B586F, 5 + msgbox UnknownString_81B586F, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B64B3, 5 + msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES call_if 1, MtPyre_Summit_EventScript_15D611 - compare RESULT, 0 + compare RESULT, NO call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -185,13 +185,13 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 MtPyre_Summit_EventScript_15D64A:: @ 815D64A .ifdef SAPPHIRE - msgbox UnknownString_81B5647, 5 + msgbox UnknownString_81B5647, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B6283, 5 + msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -216,13 +216,13 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 MtPyre_Summit_EventScript_15D69B:: @ 815D69B .ifdef SAPPHIRE - msgbox UnknownString_81B56AB, 5 + msgbox UnknownString_81B56AB, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B62E7, 5 + msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index b7d68b257..2a4d8afce 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -29,8 +29,8 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC checkitem ITEM_BASEMENT_KEY, 1 compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D - msgbox NewMauville_Entrance_Text_1982D4, 5 - compare RESULT, 0 + msgbox NewMauville_Entrance_Text_1982D4, MSGBOX_YESNO + compare RESULT, NO goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmetatile 3, 0, 707, 0 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index f5f93f05a..f51aea6f7 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -10,8 +10,8 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox PacifidlogTown_House3_Text_17940E, 5 - compare RESULT, 0 + msgbox PacifidlogTown_House3_Text_17940E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq PacifidlogTown_House3_EventScript_154320 special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index b7a6c9f86..584366c88 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -12,10 +12,10 @@ PacifidlogTown_House4_EventScript_154355:: @ 8154355 PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer - msgbox PacifidlogTown_House4_Text_17963D, 5 - compare RESULT, 1 + msgbox PacifidlogTown_House4_Text_17963D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare RESULT, 0 + compare RESULT, NO goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index de141daf9..406f260b0 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -596,10 +596,10 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 85 - msgbox PetalburgCity_Gym_Text_17B870, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -626,10 +626,10 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 98 - msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -639,10 +639,10 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 - msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -652,10 +652,10 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 - msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -665,10 +665,10 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 - msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -678,10 +678,10 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 - msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -691,10 +691,10 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -704,10 +704,10 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -717,10 +717,10 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 - msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -730,10 +730,10 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 - msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -743,10 +743,10 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -756,10 +756,10 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index cb52908f5..4718f9bb9 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -36,8 +36,8 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 - msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191AAD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -53,15 +53,15 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 end Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 - msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191CC3, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E - msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191DA6, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 2de6bf51f..f7fbb58b5 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -24,19 +24,19 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare RESULT, 1 + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare RESULT, NO call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A - msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare RESULT, 1 + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare RESULT, NO call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 28bf046a4..c0344f150 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -278,8 +278,8 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 - msgbox Route109_Text_16E0F9, 5 - compare RESULT, 0 + msgbox Route109_Text_16E0F9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 7a12f5850..4c1574824 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -42,8 +42,8 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoneybox 0, 0 nop - msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare RESULT, 1 + msgbox Route109_SeashoreHouse_Text_19B702, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoneybox 0, 0 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index f34bba6e6..232d324a4 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -493,9 +493,9 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD end Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 - msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 + msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO closemessage - compare RESULT, 1 + compare RESULT, YES goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c3d807f66..c338091a0 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -51,8 +51,8 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall - msgbox Route111_Text_16FA54, 5 - compare RESULT, 0 + msgbox Route111_Text_16FA54, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_15005F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -73,8 +73,8 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall - msgbox Route111_Text_16FAED, 5 - compare RESULT, 0 + msgbox Route111_Text_16FAED, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_1500A5 giveitem_std ITEM_CLAW_FOSSIL closemessage @@ -237,8 +237,8 @@ Route111_EventScript_1501D1:: @ 81501D1 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_16F705, 5 - compare RESULT, 1 + msgbox Route111_Text_16F705, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index c0fb6f489..1263c4b83 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -9,10 +9,10 @@ Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer - msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare RESULT, 1 + msgbox Route111_OldLadysRestStop_Text_1923AF, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -20,10 +20,10 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC msgbox Route111_OldLadysRestStop_Text_192423, 4 closemessage call Route111_OldLadysRestStop_EventScript_1A02CA - msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare RESULT, 1 + msgbox Route111_OldLadysRestStop_Text_19244D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index cba6c33e8..adbea780e 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -32,10 +32,10 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer - msgbox Route112_CableCarStation_Text_1924F5, 5 - compare RESULT, 1 + msgbox Route112_CableCarStation_Text_1924F5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index e1bb038e3..3f991277f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -72,8 +72,8 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 @@ -86,8 +86,8 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 @@ -100,8 +100,8 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 @@ -114,8 +114,8 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -128,8 +128,8 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -143,8 +143,8 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 @@ -158,8 +158,8 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index f8ff5de73..c34d4fc7e 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -31,16 +31,16 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall - msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare RESULT, 1 + msgbox Route114_LanettesHouse_Text_192B4A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall end Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 - msgbox Route114_LanettesHouse_Text_192C01, 5 - compare RESULT, 1 + msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 0ed9e9b01..a4452d989 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -11,10 +11,10 @@ Route118_EventScript_150F34:: @ 8150F34 faceplayer checkflag FLAG_RECEIVED_GOOD_ROD goto_if_eq Route118_EventScript_150F89 - msgbox Route118_Text_170F12, 5 - compare RESULT, 1 + msgbox Route118_Text_170F12, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route118_EventScript_150F5E - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route118_EventScript_150F7F end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 3858c0e4f..bacdcd7dd 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -115,10 +115,10 @@ Route120_EventScript_151739:: @ 8151739 dodailyevents checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 goto_if_eq Route120_EventScript_151837 - msgbox Route120_Text_1C58F1, 5 - compare RESULT, 1 + msgbox Route120_Text_1C58F1, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route120_EventScript_151841 - compare RESULT, 0 + compare RESULT, NO call_if 1, Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -186,8 +186,8 @@ Route120_EventScript_151853:: @ 8151853 faceplayer checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 goto_if_eq Route120_EventScript_151884 - msgbox Route120_Text_171827, 5 - compare RESULT, 0 + msgbox Route120_Text_171827, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -199,8 +199,8 @@ Route120_EventScript_151877:: @ 8151877 end Route120_EventScript_151884:: @ 8151884 - msgbox Route120_Text_17196F, 5 - compare RESULT, 0 + msgbox Route120_Text_17196F, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 67fa830e9..ded372aa6 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -33,8 +33,8 @@ Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351 Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare RESULT, 1 + msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -51,8 +51,8 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 waitmovement 0 showmoneybox 0, 0 nop - msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare RESULT, 1 + msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index bc71fac41..9423cf845 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -246,8 +246,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitemname 0, VAR_SPECIAL_8 bufferitemname 1, VAR_SPECIAL_9 - msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare RESULT, 0 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace VAR_SPECIAL_9, 1 compare RESULT, 1 @@ -265,8 +265,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 - msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare RESULT, 1 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 9bbbaacfa..179140378 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -85,8 +85,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -103,8 +103,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -145,8 +145,8 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waitfanfare waitmessage givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -165,8 +165,8 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waitfanfare waitmessage givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 2e0d106bb..c0f1bc689 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -10,8 +10,8 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox RustboroCity_House1_Text_184EBA, 5 - compare RESULT, 0 + msgbox RustboroCity_House1_Text_184EBA, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_House1_EventScript_157CFB special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 2dbd716cb..b3eb297e9 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -54,8 +54,8 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 faceplayer compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 - msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare RESULT, 1 + msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 533c46850..4dcd88761 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -28,8 +28,8 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkitem ITEM_SHOAL_SHELL, 4 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 - msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare RESULT, 0 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, MSGBOX_YESNO + compare RESULT, NO goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index d39f788d8..ae8534ad9 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -287,10 +287,10 @@ SlateportCity_EventScript_14BCFD:: @ 814BCFD SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer - msgbox SlateportCity_Text_1650F1, 5 - compare RESULT, 1 + msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO + compare RESULT, YES call_if 1, SlateportCity_EventScript_14BD28 - compare RESULT, 0 + compare RESULT, NO call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 72f2d0382..4be5c6daf 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -190,8 +190,8 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 end SlateportCity_Harbor_EventScript_15613F:: @ 815613F - msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_156196 @@ -201,8 +201,8 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F end SlateportCity_Harbor_EventScript_156167:: @ 8156167 - msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 @@ -332,8 +332,8 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 end SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA - msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_TOOTH compare RESULT, 0 @@ -345,8 +345,8 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA end SlateportCity_Harbor_EventScript_15632A:: @ 815632A - msgbox SlateportCity_Harbor_Text_180412, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_SCALE compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index aa1157d7e..13de091cb 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -4,10 +4,10 @@ SlateportCity_House1_MapScripts:: @ 815567A SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer - msgbox SlateportCity_House1_Text_17D46A, 5 - compare RESULT, 1 + msgbox SlateportCity_House1_Text_17D46A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_House1_EventScript_15569C - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -38,10 +38,10 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - msgbox SlateportCity_House1_Text_17D505, 5 - compare RESULT, 1 + msgbox SlateportCity_House1_Text_17D505, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_House1_EventScript_155730 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index ad349932a..5d0fdb411 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -33,8 +33,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closemessage hidemoneybox 0, 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index f2ccc9484..367677751 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -127,8 +127,8 @@ SootopolisCity_EventScript_14D220:: @ 814D220 end SootopolisCity_EventScript_14D241:: @ 814D241 - msgbox SootopolisCity_Text_1C6540, 5 - compare RESULT, 1 + msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 011806291..e32e993dd 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -4,10 +4,10 @@ SootopolisCity_House2_MapScripts:: @ 815B2E4 SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer - msgbox SootopolisCity_House2_Text_18FA66, 5 - compare RESULT, 1 + msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO + compare RESULT, YES call_if 1, SootopolisCity_House2_EventScript_15B307 - compare RESULT, 0 + compare RESULT, NO call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index f1bf0bf19..6ffa30d3d 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -4,8 +4,8 @@ SootopolisCity_House3_MapScripts:: @ 815B319 SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer - msgbox SootopolisCity_House3_Text_18FB36, 5 - compare RESULT, 1 + msgbox SootopolisCity_House3_Text_18FB36, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index fb91202f3..d2fb4ed7b 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -6,8 +6,8 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 faceplayer checkflag FLAG_RECEIVED_WAILMER_DOLL goto_if_eq SootopolisCity_House6_EventScript_15B3CD - msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare RESULT, 0 + msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO + compare RESULT, NO call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration_std DECOR_WAILMER_DOLL diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index ab2a73460..874e3e901 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -9,8 +9,8 @@ SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer - msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare RESULT, 0 + msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closemessage diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 2f5dd6f47..589d4e21c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -38,10 +38,10 @@ LilycoveCity_ContestLobby_EventScript_1B7681:: @ 81B7681 SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall - msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B6E63, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end @@ -66,10 +66,10 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 end FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF - msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B6ED0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -222,10 +222,10 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 - msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B727C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 6b1e76a1b..f41fd1f8c 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -13,8 +13,8 @@ EventScript_1C341B: @ 81C341B gUnknown_081C342D:: @ 81C342D lockall - msgbox UnknownString_81C34B2, 5 - compare RESULT, 1 + msgbox UnknownString_81C34B2, MSGBOX_YESNO + compare RESULT, YES goto_if_eq EventScript_1C3443 releaseall end @@ -45,8 +45,8 @@ gUnknown_081C346A:: @ 81C346A special SafariZoneGetPokeblockNameInFeeder compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A9 - msgbox UnknownString_81C354E, 5 - compare RESULT, 1 + msgbox UnknownString_81C354E, MSGBOX_YESNO + compare RESULT, YES goto_if_eq EventScript_1C348E releaseall end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index deb30187f..2a5905191 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -1,8 +1,8 @@ Route111_EventScript_1A3858:: @ 81A3858 lock faceplayer - msgbox Route111_Text_1A3520, 5 - compare RESULT, 1 + msgbox Route111_Text_1A3520, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_EventScript_1A3877 msgbox Route111_Text_1A37B5, 4 release -- cgit v1.2.3 From 00d49feee5c005750185d836033fc33a220a09f5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 20:07:21 -0800 Subject: Wrap compare macro's args in parentheses --- asm/macros/event.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 3b40883dc..cf4c9628a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -229,10 +229,10 @@ @ Generic compare macro which attempts to deduce argument types based on their values @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers .macro compare arg1, arg2 - .if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8) - compare_var_to_var \arg1, \arg2 - .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= -0xFFFF && \arg2 <= 0xFFFF) - compare_var_to_value \arg1, (\arg2 & 0xFFFF) + .if (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && (((\arg2) >> 12) == 4 || ((\arg2) >> 12) == 8) + compare_var_to_var (\arg1), (\arg2) + .elseif (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && ((\arg2) >= -0xFFFF && (\arg2) <= 0xFFFF) + compare_var_to_value (\arg1), ((\arg2) & 0xFFFF) .else .error "Invalid arguments for 'compare'" .endif -- cgit v1.2.3 From d7970fba2fef5fd8949eb1b2c24f0556103bda27 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 Jan 2018 22:26:27 -0600 Subject: decompile sub_80E9620 - sub_80EA184 --- asm/easy_chat.s | 1547 ------------------------------------------------ data/easy_chat.s | 22 - include/easy_chat.h | 19 +- include/global.h | 2 +- src/easy_chat_2.c | 570 +++++++++++++++++- src/easy_chat_before.c | 4 +- 6 files changed, 578 insertions(+), 1586 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 88585d607..f99c93a51 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1553 +5,6 @@ .text - thumb_func_start sub_80E9620 -sub_80E9620: @ 80E9620 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - lsls r0, 16 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp, 0x14] - movs r1, 0 - mov r10, r1 - lsrs r7, r0, 16 - mov r9, r1 - ldr r0, _080E9644 @ =gUnknown_083DB694 - ldr r0, [r0] - b _080E971A - .align 2, 0 -_080E9644: .4byte gUnknown_083DB694 -_080E9648: - ldr r6, [sp, 0x14] - movs r2, 0 - mov r8, r2 - adds r0, r7, 0x2 - str r0, [sp, 0x1C] - mov r1, r9 - adds r1, 0x1 - str r1, [sp, 0x18] - b _080E96E4 -_080E965A: - mov r2, r10 - lsls r0, r2, 1 - adds r1, r5, 0 - adds r1, 0xC - adds r1, r0 - ldrh r0, [r1] - ldr r2, _080E9690 @ =0x0000ffff - cmp r0, r2 - bne _080E969C - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - movs r1, 0x9 - str r1, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - str r1, [sp, 0x10] - ldr r0, _080E9694 @ =0x06007000 - adds r1, r6, 0 - adds r2, r7, 0 - ldr r3, _080E9698 @ =gUnknown_083DBE1C - bl sub_8095C8C - adds r0, r6, 0 - adds r0, 0xB - b _080E96CC - .align 2, 0 -_080E9690: .4byte 0x0000ffff -_080E9694: .4byte 0x06007000 -_080E9698: .4byte gUnknown_083DBE1C -_080E969C: - ldr r0, _080E9738 @ =0x00009e14 - adds r4, r5, r0 - ldrh r1, [r1] - adds r0, r4, 0 - movs r2, 0xB - bl sub_80EB218 - lsls r1, r6, 24 - lsrs r1, 24 - lsls r2, r7, 24 - lsrs r2, 24 - adds r0, r4, 0 - bl MenuPrint - mov r1, r9 - lsls r0, r1, 1 - add r0, r8 - adds r1, r5, 0 - adds r1, 0x8C - adds r1, r0 - adds r0, r6, 0 - adds r0, 0xB - ldrb r1, [r1] - adds r0, r1 -_080E96CC: - lsls r0, 16 - lsrs r6, r0, 16 - mov r0, r10 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 -_080E96E4: - ldr r0, _080E973C @ =gUnknown_083DB694 - ldr r5, [r0] - adds r0, r5, 0 - adds r0, 0x83 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r8, r0 - bge _080E970A - ldrb r2, [r5, 0xA] - cmp r10, r2 - bcc _080E965A - lsls r1, r6, 24 - lsrs r1, 24 - lsls r2, r7, 24 - lsrs r2, 24 - ldr r0, _080E9740 @ =gUnknown_083DBEA8 - bl MenuPrint -_080E970A: - ldr r1, [sp, 0x1C] - lsls r0, r1, 16 - lsrs r7, r0, 16 - ldr r2, [sp, 0x18] - lsls r0, r2, 16 - lsrs r0, 16 - mov r9, r0 - adds r0, r5, 0 -_080E971A: - adds r0, 0x84 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r9, r0 - blt _080E9648 - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9738: .4byte 0x00009e14 -_080E973C: .4byte gUnknown_083DB694 -_080E9740: .4byte gUnknown_083DBEA8 - thumb_func_end sub_80E9620 - - thumb_func_start sub_80E9744 -sub_80E9744: @ 80E9744 - push {lr} - ldr r0, _080E9760 @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E9764 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bhi _080E97B2 - lsls r0, 2 - ldr r1, _080E9768 @ =_080E976C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9760: .4byte gWindowConfig_81E6D8C -_080E9764: .4byte gUnknown_083DB694 -_080E9768: .4byte _080E976C - .align 2, 0 -_080E976C: - .4byte _080E9792 - .4byte _080E9796 - .4byte _080E97A0 - .4byte _080E97AA - .4byte _080E9784 - .4byte _080E978E -_080E9784: - movs r0, 0x4 - movs r1, 0x6 - bl sub_80E97C0 - b _080E97B2 -_080E978E: - movs r0, 0x2 - b _080E97A2 -_080E9792: - movs r0, 0x3 - b _080E9798 -_080E9796: - movs r0, 0 -_080E9798: - movs r1, 0x5 - bl sub_80E97C0 - b _080E97B2 -_080E97A0: - movs r0, 0x4 -_080E97A2: - movs r1, 0x11 - bl sub_80E97C0 - b _080E97B2 -_080E97AA: - movs r0, 0x3 - movs r1, 0x6 - bl sub_80E97C0 -_080E97B2: - ldr r0, _080E97BC @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - pop {r0} - bx r0 - .align 2, 0 -_080E97BC: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E9744 - - thumb_func_start sub_80E97C0 -sub_80E97C0: @ 80E97C0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 16 - lsrs r5, r0, 16 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp] - movs r7, 0 - movs r3, 0 - ldr r1, _080E98B8 @ =gUnknown_083DB694 - ldr r0, [r1] - adds r0, 0x84 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r3, r0 - bge _080E98A6 -_080E97EA: - ldr r1, [r1] - ldr r0, _080E98BC @ =0x00009e6e - adds r2, r1, r0 - movs r6, 0 - adds r0, r1, 0 - adds r0, 0x83 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldr r4, [sp] - lsls r4, 24 - mov r8, r4 - lsls r4, r5, 24 - mov r9, r4 - adds r5, 0x2 - mov r10, r5 - adds r3, 0x1 - str r3, [sp, 0x4] - cmp r6, r0 - bge _080E985E - ldrb r1, [r1, 0xA] - cmp r7, r1 - bcs _080E985E - ldr r0, _080E98B8 @ =gUnknown_083DB694 - ldr r4, [r0] - ldr r5, _080E98C0 @ =0x0000ffff -_080E981E: - lsls r0, r7, 1 - adds r1, r4, 0 - adds r1, 0xC - adds r1, r0 - ldrh r0, [r1] - cmp r0, r5 - beq _080E983E - adds r1, r0, 0 - adds r0, r2, 0 - movs r2, 0 - bl sub_80EB218 - adds r2, r0, 0 - movs r0, 0 - strb r0, [r2] - adds r2, 0x1 -_080E983E: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r4, 0 - adds r0, 0x83 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r6, r0 - bge _080E985E - ldrb r0, [r4, 0xA] - cmp r7, r0 - bcc _080E981E -_080E985E: - ldr r1, _080E98B8 @ =gUnknown_083DB694 - ldr r4, [r1] - adds r0, r4, 0 - adds r0, 0x83 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0xB - muls r1, r0 - movs r0, 0xFC - strb r0, [r2] - movs r0, 0x13 - strb r0, [r2, 0x1] - lsls r1, 3 - strb r1, [r2, 0x2] - movs r0, 0xFF - strb r0, [r2, 0x3] - ldr r2, _080E98BC @ =0x00009e6e - adds r0, r4, r2 - mov r3, r8 - lsrs r1, r3, 24 - mov r3, r9 - lsrs r2, r3, 24 - bl MenuPrint - mov r1, r10 - lsls r0, r1, 16 - lsrs r5, r0, 16 - ldr r2, [sp, 0x4] - lsls r0, r2, 24 - lsrs r3, r0, 24 - ldr r1, _080E98B8 @ =gUnknown_083DB694 - adds r4, 0x84 - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r3, r0 - blt _080E97EA -_080E98A6: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E98B8: .4byte gUnknown_083DB694 -_080E98BC: .4byte 0x00009e6e -_080E98C0: .4byte 0x0000ffff - thumb_func_end sub_80E97C0 - - thumb_func_start sub_80E98C4 -sub_80E98C4: @ 80E98C4 - push {lr} - ldr r0, _080E98E0 @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E98E4 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bhi _080E9936 - lsls r0, 2 - ldr r1, _080E98E8 @ =_080E98EC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E98E0: .4byte gWindowConfig_81E6D8C -_080E98E4: .4byte gUnknown_083DB694 -_080E98E8: .4byte _080E98EC - .align 2, 0 -_080E98EC: - .4byte _080E990A - .4byte _080E9910 - .4byte _080E9916 - .4byte _080E991A - .4byte _080E9904 - .4byte _080E990A -_080E9904: - movs r1, 0x4 - movs r3, 0x2 - b _080E991E -_080E990A: - movs r1, 0x3 - movs r3, 0x2 - b _080E991E -_080E9910: - movs r1, 0x1 - movs r3, 0x3 - b _080E991E -_080E9916: - movs r1, 0x4 - b _080E991C -_080E991A: - movs r1, 0x3 -_080E991C: - movs r3, 0x1 -_080E991E: - lsls r3, 1 - adds r3, r1, r3 - subs r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0x2 - movs r2, 0x1B - bl MenuFillWindowRectWithBlankTile - ldr r0, _080E993C @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow -_080E9936: - pop {r0} - bx r0 - .align 2, 0 -_080E993C: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E98C4 - - thumb_func_start sub_80E9940 -sub_80E9940: @ 80E9940 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r5, r1, 24 - lsrs r5, 24 - movs r4, 0x7 - ands r4, r5 - lsls r3, r4, 1 - adds r1, r3, 0 - adds r3, 0x1 - movs r0, 0x2 - movs r2, 0x1F - bl MenuFillWindowRectWithBlankTile - adds r0, r6, 0 - adds r1, r5, 0 - bl sub_80E9A7C - lsls r4, 1 - adds r0, r6, 0 - movs r1, 0x2 - adds r2, r4, 0 - bl sub_80E9A60 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80E9940 - - thumb_func_start sub_80E9974 -sub_80E9974: @ 80E9974 - push {r4-r6,lr} - ldr r0, _080E99C4 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - ldr r0, _080E99C8 @ =gUnknown_083DB694 - ldr r2, [r0] - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E99D4 - ldr r1, _080E99CC @ =0x000001b5 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r1, r0, 16 - lsrs r4, r1, 16 - adds r0, 0x4 - cmp r4, r0 - bge _080E9A08 - adds r5, r2, 0 - ldr r2, _080E99CC @ =0x000001b5 - adds r6, r5, r2 -_080E99A4: - lsls r1, r4, 24 - lsrs r1, 24 - ldr r2, _080E99D0 @ =0x00009dc9 - adds r0, r5, r2 - bl sub_80E9940 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0 - ldrsb r0, [r6, r0] - adds r0, 0x4 - cmp r4, r0 - blt _080E99A4 - b _080E9A08 - .align 2, 0 -_080E99C4: .4byte gWindowConfig_81E6D54 -_080E99C8: .4byte gUnknown_083DB694 -_080E99CC: .4byte 0x000001b5 -_080E99D0: .4byte 0x00009dc9 -_080E99D4: - bl sub_80E9AD4 - ldr r4, _080E9A10 @ =gUnknown_083DBEAC - adds r0, r4, 0 - movs r1, 0x2 - movs r2, 0 - bl sub_80E9A60 - adds r0, r4, 0 - adds r0, 0x20 - movs r1, 0x2 - movs r2, 0x2 - bl sub_80E9A60 - adds r0, r4, 0 - adds r0, 0x40 - movs r1, 0x2 - movs r2, 0x4 - bl sub_80E9A60 - adds r4, 0x60 - adds r0, r4, 0 - movs r1, 0x2 - movs r2, 0x6 - bl sub_80E9A60 -_080E9A08: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E9A10: .4byte gUnknown_083DBEAC - thumb_func_end sub_80E9974 - - thumb_func_start sub_80E9A14 -sub_80E9A14: @ 80E9A14 - push {lr} - bl sub_80E9A4C - ldr r0, _080E9A44 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E9A40 - movs r0, 0xDD - lsls r0, 1 - adds r2, r1, r0 - ldr r3, _080E9A48 @ =0x000001b5 - adds r0, r1, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 4 - ldrh r1, [r2] - adds r0, r1 - strh r0, [r2] -_080E9A40: - pop {r0} - bx r0 - .align 2, 0 -_080E9A44: .4byte gUnknown_083DB694 -_080E9A48: .4byte 0x000001b5 - thumb_func_end sub_80E9A14 - - thumb_func_start sub_80E9A4C -sub_80E9A4C: @ 80E9A4C - ldr r0, _080E9A5C @ =gUnknown_083DB694 - ldr r0, [r0] - movs r2, 0xDD - lsls r2, 1 - adds r1, r0, r2 - movs r0, 0 - strh r0, [r1] - bx lr - .align 2, 0 -_080E9A5C: .4byte gUnknown_083DB694 - thumb_func_end sub_80E9A4C - - thumb_func_start sub_80E9A60 -sub_80E9A60: @ 80E9A60 - push {lr} - lsls r2, 16 - movs r3, 0xF0 - lsls r3, 12 - ands r3, r2 - lsls r1, 24 - lsrs r1, 24 - lsrs r3, 16 - adds r2, r3, 0 - bl MenuPrint - pop {r0} - bx r0 - thumb_func_end sub_80E9A60 - - thumb_func_start sub_80E9A7C -sub_80E9A7C: @ 80E9A7C - push {r4-r7,lr} - adds r2, r0, 0 - lsls r1, 16 - lsrs r7, r1, 16 - lsls r0, r7, 17 - lsrs r5, r0, 16 - movs r4, 0 - ldr r0, _080E9AD0 @ =gUnknown_083DB694 - ldr r6, [r0] -_080E9A8E: - movs r0, 0xFC - strb r0, [r2] - movs r0, 0x12 - strb r0, [r2, 0x1] - movs r0, 0x58 - muls r0, r4 - strb r0, [r2, 0x2] - adds r2, 0x3 - lsls r1, r7, 1 - adds r1, r4, r1 - adds r0, r6, 0 - adds r0, 0x2A - adds r0, r1 - ldrb r1, [r0] - adds r0, r2, 0 - movs r2, 0xB - bl sub_80EAD64 - adds r2, r0, 0 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r6, 0x28] - cmp r5, r0 - bcs _080E9ACA - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E9A8E -_080E9ACA: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9AD0: .4byte gUnknown_083DB694 - thumb_func_end sub_80E9A7C - - thumb_func_start sub_80E9AD4 -sub_80E9AD4: @ 80E9AD4 - push {r4,lr} - ldr r0, _080E9AF4 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - movs r4, 0 -_080E9ADE: - adds r0, r4, 0 - bl sub_80E9C74 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0xF - bls _080E9ADE - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E9AF4: .4byte gWindowConfig_81E6D54 - thumb_func_end sub_80E9AD4 - - thumb_func_start sub_80E9AF8 -sub_80E9AF8: @ 80E9AF8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 16 - lsrs r7, r0, 16 - adds r0, r7, 0 - bl sub_80E9C74 - ldr r4, _080E9B7C @ =gUnknown_083DB694 - ldr r5, [r4] - ldr r0, _080E9B80 @ =0x00009e14 - adds r0, r5 - mov r8, r0 - movs r0, 0xFC - mov r1, r8 - strb r0, [r1] - movs r0, 0x11 - strb r0, [r1, 0x1] - movs r0, 0x10 - strb r0, [r1, 0x2] - ldr r2, _080E9B84 @ =0x00009e17 - adds r2, r5 - mov r8, r2 - adds r0, r5, 0 - adds r0, 0x7D - ldrb r0, [r0] - cmp r0, 0 - beq _080E9BF4 - movs r6, 0 - ldr r3, _080E9B88 @ =0x000099a6 - adds r0, r5, r3 - adds r0, r7 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r6, r0 - blt _080E9B4A - b _080E9C52 -_080E9B4A: - lsls r0, r7, 2 - mov r9, r0 - ldr r1, _080E9B8C @ =0x00009a2a - adds r1, r5, r1 - str r1, [sp] - lsls r2, r7, 17 - mov r10, r2 -_080E9B58: - lsls r4, r6, 1 - mov r3, r9 - adds r0, r4, r3 - ldr r1, [sp] - adds r0, r1, r0 - ldrh r0, [r0] - bl sub_80EB2D4 - lsls r0, 16 - lsrs r0, 16 - adds r5, r4, 0 - cmp r0, 0x7 - bne _080E9B94 - ldr r0, _080E9B90 @ =gWindowConfig_81E6D70 - bl BasicInitMenuWindow - b _080E9B9A - .align 2, 0 -_080E9B7C: .4byte gUnknown_083DB694 -_080E9B80: .4byte 0x00009e14 -_080E9B84: .4byte 0x00009e17 -_080E9B88: .4byte 0x000099a6 -_080E9B8C: .4byte 0x00009a2a -_080E9B90: .4byte gWindowConfig_81E6D70 -_080E9B94: - ldr r0, _080E9BE0 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow -_080E9B9A: - ldr r2, _080E9BE4 @ =gUnknown_083DB694 - ldr r4, [r2] - mov r3, r9 - adds r1, r5, r3 - ldr r2, _080E9BE8 @ =0x00009a2a - adds r0, r4, r2 - adds r0, r1 - ldrh r1, [r0] - mov r0, r8 - movs r2, 0x9 - bl sub_80EB218 - ldr r3, _080E9BEC @ =0x00009e14 - adds r0, r4, r3 - movs r1, 0xB - muls r1, r6 - adds r1, 0x4 - lsls r1, 16 - lsrs r1, 16 - mov r3, r10 - lsrs r2, r3, 16 - bl sub_80E9A60 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, _080E9BF0 @ =0x000099a6 - adds r4, r0 - adds r4, r7 - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r6, r0 - blt _080E9B58 - b _080E9C52 - .align 2, 0 -_080E9BE0: .4byte gWindowConfig_81E6D54 -_080E9BE4: .4byte gUnknown_083DB694 -_080E9BE8: .4byte 0x00009a2a -_080E9BEC: .4byte 0x00009e14 -_080E9BF0: .4byte 0x000099a6 -_080E9BF4: - ldr r0, _080E9C64 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - movs r6, 0 - ldr r1, _080E9C68 @ =0x000099a6 - adds r0, r5, r1 - adds r0, r7 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r6, r0 - bge _080E9C52 - adds r4, r5, 0 - adds r0, r4, r1 - adds r0, r7 - mov r9, r0 - lsls r5, r7, 17 -_080E9C16: - lsls r1, r6, 1 - lsls r0, r7, 2 - adds r1, r0 - ldr r2, _080E9C6C @ =0x00009a2a - adds r0, r4, r2 - adds r0, r1 - ldrh r1, [r0] - mov r0, r8 - movs r2, 0x9 - bl sub_80EB218 - movs r0, 0xB - adds r1, r6, 0 - muls r1, r0 - adds r1, 0x4 - lsls r1, 16 - lsrs r1, 16 - ldr r3, _080E9C70 @ =0x00009e14 - adds r0, r4, r3 - lsrs r2, r5, 16 - bl sub_80E9A60 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - mov r1, r9 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r6, r0 - blt _080E9C16 -_080E9C52: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9C64: .4byte gWindowConfig_81E6D54 -_080E9C68: .4byte 0x000099a6 -_080E9C6C: .4byte 0x00009a2a -_080E9C70: .4byte 0x00009e14 - thumb_func_end sub_80E9AF8 - - thumb_func_start sub_80E9C74 -sub_80E9C74: @ 80E9C74 - push {lr} - lsls r0, 16 - movs r1, 0xE0 - lsls r1, 11 - ands r1, r0 - lsrs r1, 16 - lsls r3, r1, 1 - adds r1, r3, 0 - adds r3, 0x1 - movs r0, 0 - movs r2, 0x1D - bl MenuFillWindowRectWithBlankTile - pop {r0} - bx r0 - thumb_func_end sub_80E9C74 - - thumb_func_start sub_80E9C94 -sub_80E9C94: @ 80E9C94 - push {r4-r6,lr} - ldr r0, _080E9CAC @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r2, _080E9CB0 @ =0x00009a28 - adds r1, r0, r2 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0x3 - bgt _080E9CB4 - lsls r0, 16 - lsrs r0, 16 - b _080E9CB6 - .align 2, 0 -_080E9CAC: .4byte gUnknown_083DB694 -_080E9CB0: .4byte 0x00009a28 -_080E9CB4: - movs r0, 0x4 -_080E9CB6: - adds r5, r0, 0 - movs r4, 0 - cmp r4, r5 - bcs _080E9CF4 - ldr r0, _080E9CE0 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E9CE4 @ =0x00009a29 - adds r6, r0, r1 -_080E9CC6: - movs r0, 0 - ldrsb r0, [r6, r0] - adds r0, r4, r0 - lsls r0, 16 - lsrs r0, 16 - bl sub_80E9AF8 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r5 - bcc _080E9CC6 - b _080E9CF4 - .align 2, 0 -_080E9CE0: .4byte gUnknown_083DB694 -_080E9CE4: .4byte 0x00009a29 -_080E9CE8: - adds r0, r4, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r4, r1, 16 - bl sub_80E9C74 -_080E9CF4: - cmp r4, 0x3 - bls _080E9CE8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80E9C94 - - thumb_func_start sub_80E9D00 -sub_80E9D00: @ 80E9D00 - push {r4-r6,lr} - ldr r0, _080E9D28 @ =gUnknown_083DB694 - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r1, r2, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - ble _080E9D30 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r1, _080E9D2C @ =0x00009a29 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x4 - b _080E9D46 - .align 2, 0 -_080E9D28: .4byte gUnknown_083DB694 -_080E9D2C: .4byte 0x00009a29 -_080E9D30: - movs r0, 0 - ldrsb r0, [r1, r0] - negs r0, r0 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r1, _080E9D74 @ =0x00009a29 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, r4 -_080E9D46: - lsls r0, 16 - lsrs r5, r0, 16 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, _080E9D78 @ =0x0000ffff - cmp r4, r0 - beq _080E9D6E - adds r6, r0, 0 -_080E9D58: - adds r0, r5, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r5, r1, 16 - bl sub_80E9AF8 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r6 - bne _080E9D58 -_080E9D6E: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E9D74: .4byte 0x00009a29 -_080E9D78: .4byte 0x0000ffff - thumb_func_end sub_80E9D00 - - thumb_func_start sub_80E9D7C -sub_80E9D7C: @ 80E9D7C - push {r4-r7,lr} - ldr r0, _080E9DAC @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - ldr r0, _080E9DB0 @ =gUnknown_083DB694 - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r1, r2, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bge _080E9DB8 - negs r0, r0 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, _080E9DB4 @ =0x000001b5 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, r6 - b _080E9DCC - .align 2, 0 -_080E9DAC: .4byte gWindowConfig_81E6D54 -_080E9DB0: .4byte gUnknown_083DB694 -_080E9DB4: .4byte 0x000001b5 -_080E9DB8: - movs r0, 0 - ldrsb r0, [r1, r0] - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, _080E9DFC @ =0x000001b5 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x4 -_080E9DCC: - lsls r0, 16 - lsrs r4, r0, 16 - movs r5, 0 - cmp r5, r6 - bcs _080E9DF6 - ldr r0, _080E9E00 @ =gUnknown_083DB694 - ldr r7, [r0] -_080E9DDA: - lsls r1, r4, 24 - lsrs r1, 24 - ldr r2, _080E9E04 @ =0x00009dc9 - adds r0, r7, r2 - bl sub_80E9940 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r6 - bcc _080E9DDA -_080E9DF6: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9DFC: .4byte 0x000001b5 -_080E9E00: .4byte gUnknown_083DB694 -_080E9E04: .4byte 0x00009dc9 - thumb_func_end sub_80E9D7C - - thumb_func_start sub_80E9E08 -sub_80E9E08: @ 80E9E08 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080E9E4C @ =gUnknown_083DB694 - ldr r3, [r0] - movs r0, 0xDD - lsls r0, 1 - adds r1, r3, r0 - movs r5, 0xE0 - lsls r5, 1 - adds r2, r3, r5 - movs r0, 0 - ldrsb r0, [r2, r0] - lsls r0, 4 - ldrh r1, [r1] - adds r0, r1 - movs r1, 0x7F - ands r0, r1 - subs r5, 0x4 - adds r1, r3, r5 - strh r0, [r1] - adds r1, r4, 0 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0 - bge _080E9E3E - negs r1, r4 -_080E9E3E: - ldr r2, _080E9E50 @ =0x000001bf - adds r0, r3, r2 - strb r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E9E4C: .4byte gUnknown_083DB694 -_080E9E50: .4byte 0x000001bf - thumb_func_end sub_80E9E08 - - thumb_func_start sub_80E9E54 -sub_80E9E54: @ 80E9E54 - push {r4,lr} - ldr r0, _080E9E8C @ =gUnknown_083DB694 - ldr r2, [r0] - movs r0, 0xDD - lsls r0, 1 - adds r3, r2, r0 - ldr r1, _080E9E90 @ =0x000001bf - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrh r4, [r3] - adds r0, r4 - movs r1, 0x7F - ands r0, r1 - strh r0, [r3] - movs r3, 0 - movs r4, 0xDE - lsls r4, 1 - adds r1, r2, r4 - ldrh r1, [r1] - cmp r0, r1 - bne _080E9E84 - movs r3, 0x1 -_080E9E84: - adds r0, r3, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080E9E8C: .4byte gUnknown_083DB694 -_080E9E90: .4byte 0x000001bf - thumb_func_end sub_80E9E54 - - thumb_func_start nullsub_23 -nullsub_23: @ 80E9E94 - bx lr - thumb_func_end nullsub_23 - - thumb_func_start sub_80E9E98 -sub_80E9E98: @ 80E9E98 - ldr r0, _080E9EA4 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - movs r1, 0 - strh r1, [r0] - bx lr - .align 2, 0 -_080E9EA4: .4byte gUnknown_083DB694 - thumb_func_end sub_80E9E98 - - thumb_func_start sub_80E9EA8 -sub_80E9EA8: @ 80E9EA8 - push {lr} - ldr r1, _080E9EC4 @ =gUnknown_083DB694 - ldr r0, [r1] - adds r0, 0xBE - ldrh r0, [r0] - adds r2, r1, 0 - cmp r0, 0x5 - bhi _080E9F48 - lsls r0, 2 - ldr r1, _080E9EC8 @ =_080E9ECC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9EC4: .4byte gUnknown_083DB694 -_080E9EC8: .4byte _080E9ECC - .align 2, 0 -_080E9ECC: - .4byte _080E9EE4 - .4byte _080E9EF4 - .4byte _080E9F0C - .4byte _080E9F24 - .4byte _080E9F38 - .4byte _080E9F44 -_080E9EE4: - bl sub_80EA24C - ldr r0, _080E9F08 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080E9EF4: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9F48 - bl sub_80EA4A4 - ldr r0, _080E9F08 @ =gUnknown_083DB694 - ldr r1, [r0] - b _080E9F3A - .align 2, 0 -_080E9F08: .4byte gUnknown_083DB694 -_080E9F0C: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9F48 - bl sub_80EA704 - ldr r0, _080E9F20 @ =gUnknown_083DB694 - ldr r1, [r0] - b _080E9F3A - .align 2, 0 -_080E9F20: .4byte gUnknown_083DB694 -_080E9F24: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9F48 - ldr r0, _080E9F34 @ =gUnknown_083DB694 - ldr r1, [r0] - b _080E9F3A - .align 2, 0 -_080E9F34: .4byte gUnknown_083DB694 -_080E9F38: - ldr r1, [r2] -_080E9F3A: - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080E9F48 -_080E9F44: - movs r0, 0x1 - b _080E9F4A -_080E9F48: - movs r0, 0 -_080E9F4A: - pop {r1} - bx r1 - thumb_func_end sub_80E9EA8 - - thumb_func_start sub_80E9F50 -sub_80E9F50: @ 80E9F50 - push {lr} - ldr r0, _080E9F68 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - ldrh r0, [r0] - cmp r0, 0x6 - bhi _080E9FCC - lsls r0, 2 - ldr r1, _080E9F6C @ =_080E9F70 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9F68: .4byte gUnknown_083DB694 -_080E9F6C: .4byte _080E9F70 - .align 2, 0 -_080E9F70: - .4byte _080E9F8C - .4byte _080E9FAC - .4byte _080E9F96 - .4byte _080E9FAC - .4byte _080E9F9C - .4byte _080E9FAC - .4byte _080E9FC8 -_080E9F8C: - bl nullsub_23 - bl sub_80EA764 - b _080E9FA0 -_080E9F96: - bl sub_80EA5A0 - b _080E9FA0 -_080E9F9C: - bl sub_80EA348 -_080E9FA0: - ldr r0, _080E9FC4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080E9FAC: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9FCC - ldr r0, _080E9FC4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080E9FCC - .align 2, 0 -_080E9FC4: .4byte gUnknown_083DB694 -_080E9FC8: - movs r0, 0x1 - b _080E9FCE -_080E9FCC: - movs r0, 0 -_080E9FCE: - pop {r1} - bx r1 - thumb_func_end sub_80E9F50 - - thumb_func_start sub_80E9FD4 -sub_80E9FD4: @ 80E9FD4 - push {r4,lr} - ldr r0, _080E9FEC @ =gUnknown_083DB694 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0xBE - ldrh r0, [r4] - cmp r0, 0 - beq _080E9FF0 - cmp r0, 0x1 - beq _080E9FFE - b _080EA00C - .align 2, 0 -_080E9FEC: .4byte gUnknown_083DB694 -_080E9FF0: - bl nullsub_23 - bl sub_80EA5A0 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080E9FFE: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA00C - movs r0, 0x1 - b _080EA00E -_080EA00C: - movs r0, 0 -_080EA00E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80E9FD4 - - thumb_func_start sub_80EA014 -sub_80EA014: @ 80EA014 - push {r4,lr} - ldr r0, _080EA02C @ =gUnknown_083DB694 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0xBE - ldrh r0, [r4] - cmp r0, 0 - beq _080EA030 - cmp r0, 0x1 - beq _080EA03A - b _080EA048 - .align 2, 0 -_080EA02C: .4byte gUnknown_083DB694 -_080EA030: - bl sub_80EA4A4 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080EA03A: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA048 - movs r0, 0x1 - b _080EA04A -_080EA048: - movs r0, 0 -_080EA04A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80EA014 - - thumb_func_start sub_80EA050 -sub_80EA050: @ 80EA050 - push {lr} - ldr r0, _080EA068 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080EA0DC - lsls r0, 2 - ldr r1, _080EA06C @ =_080EA070 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080EA068: .4byte gUnknown_083DB694 -_080EA06C: .4byte _080EA070 - .align 2, 0 -_080EA070: - .4byte _080EA084 - .4byte _080EA08E - .4byte _080EA09E - .4byte _080EA0B4 - .4byte _080EA0D8 -_080EA084: - bl nullsub_23 - bl sub_80EA764 - b _080EA0C4 -_080EA08E: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA0DC - bl sub_80EA7F4 - b _080EA0C4 -_080EA09E: - movs r0, 0x1 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA0DC - bl sub_80EA8BC - b _080EA0C4 -_080EA0B4: - movs r0, 0x1 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA0DC -_080EA0C4: - ldr r0, _080EA0D4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080EA0DC - .align 2, 0 -_080EA0D4: .4byte gUnknown_083DB694 -_080EA0D8: - movs r0, 0x1 - b _080EA0DE -_080EA0DC: - movs r0, 0 -_080EA0DE: - pop {r1} - bx r1 - thumb_func_end sub_80EA050 - - thumb_func_start sub_80EA0E4 -sub_80EA0E4: @ 80EA0E4 - push {lr} - ldr r0, _080EA0FC @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080EA17C - lsls r0, 2 - ldr r1, _080EA100 @ =_080EA104 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080EA0FC: .4byte gUnknown_083DB694 -_080EA100: .4byte _080EA104 - .align 2, 0 -_080EA104: - .4byte _080EA118 - .4byte _080EA128 - .4byte _080EA144 - .4byte _080EA15C - .4byte _080EA178 -_080EA118: - bl sub_80EA948 - ldr r0, _080EA140 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080EA128: - movs r0, 0x1 - negs r0, r0 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA17C - bl sub_80EAA44 - b _080EA166 - .align 2, 0 -_080EA140: .4byte gUnknown_083DB694 -_080EA144: - movs r0, 0x1 - negs r0, r0 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA17C - bl sub_80EA704 - b _080EA166 -_080EA15C: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA17C -_080EA166: - ldr r0, _080EA174 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080EA17C - .align 2, 0 -_080EA174: .4byte gUnknown_083DB694 -_080EA178: - movs r0, 0x1 - b _080EA17E -_080EA17C: - movs r0, 0 -_080EA17E: - pop {r1} - bx r1 - thumb_func_end sub_80EA0E4 - - thumb_func_start sub_80EA184 -sub_80EA184: @ 80EA184 - push {r4,lr} - ldr r0, _080EA1A0 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0xBE - ldrh r0, [r4] - cmp r0, 0x1 - beq _080EA1B4 - cmp r0, 0x1 - bgt _080EA1A4 - cmp r0, 0 - beq _080EA1AA - b _080EA1D8 - .align 2, 0 -_080EA1A0: .4byte gUnknown_083DB694 -_080EA1A4: - cmp r0, 0x2 - beq _080EA1D0 - b _080EA1D8 -_080EA1AA: - bl sub_80EAAD4 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080EA1B4: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA1D8 - ldr r0, _080EA1CC @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080EA1D8 - .align 2, 0 -_080EA1CC: .4byte gUnknown_083DB694 -_080EA1D0: - bl sub_80E9178 - movs r0, 0x1 - b _080EA1DA -_080EA1D8: - movs r0, 0 -_080EA1DA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80EA184 - thumb_func_start sub_80EA1E0 sub_80EA1E0: @ 80EA1E0 push {r4-r6,lr} diff --git a/data/easy_chat.s b/data/easy_chat.s index 44347345b..49972fbb3 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,28 +8,6 @@ .section .rodata -gUnknown_083DBDFC:: @ 83DBDFC - .incbin "graphics/unknown/unknown_3DBDFC.gbapal" - - .align 1 -gUnknown_083DBE1C:: @ 83DBE1C - .2byte 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300 - .2byte 0x301, 0x301, 0x301, 0x301, 0x301, 0x300, 0x300, 0x300, 0x300 - -gUnknown_083DBE40:: @ 83DBE40 - .incbin "graphics/unknown/unknown_3DBE40.gbapal" - -@ unused tilemap? - .2byte 0x5036, 0x5037, 0x5038, 0x5039, 0x503A, 0x503B - .2byte 0x5046, 0x5047, 0x5048, 0x5049, 0x504A, 0x504B - .2byte 0x5056, 0x5057, 0x5058, 0x5059, 0x505A, 0x505B - .2byte 0x5030, 0x5031, 0x5032, 0x5033, 0x5034, 0x5035 - .2byte 0x5040, 0x5041, 0x5042, 0x5043, 0x5044, 0x5045 - .2byte 0x5050, 0x5051, 0x5052, 0x5053, 0x5054, 0x5055 - -gUnknown_083DBEA8:: @ 83DBEA8 - .string "{CLEAR_TO 88}$" - .ifdef GERMAN unk_83E7EB0: .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}" diff --git a/include/easy_chat.h b/include/easy_chat.h index 0c42f4685..7b3b849f0 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -41,7 +41,9 @@ struct Shared1000 struct Sprite *unkAC[2]; struct Sprite *unkB4[2]; u8 unkBC; - u8 fillerBD[0x1A8-0xBD]; + u8 fillerBD; + u16 unkBE; + u8 fillerC0[0x1A8-0xC0]; s8 unk1A8; s8 unk1A9; s8 unk1AA[0xB5-0xAA]; // unknown length @@ -51,9 +53,9 @@ struct Shared1000 u8 unk1B8; u8 unk1B9; u16 unk1BA; - u8 filler1BC[0xBE - 0xBC]; + u16 unk1BC; u8 unk1BE; - u8 filler1BF; + s8 unk1BF; s8 unk1C0; u8 filler1C1[3]; void (*unk1C4)(void); @@ -89,19 +91,14 @@ struct Shared1000 u8 unk9CC9[0xD12-0xCC9]; u8 unk9D12[0x5B-0x12]; u8 unk9D5B[0xA4-0x5B]; - u8 unk9DA4[0xC8-0xA4]; - u8 filler9DC8[0xE14 - 0xDC8]; + u8 unk9DA4[0xC9-0xA4]; + u8 unk9DC9[0xE14 - 0xDC9]; u8 unk9E14[0xE41 - 0xE14]; u8 unk9E41[0x6E - 0x41]; u8 unk9E6E[0xEE - 0x6E]; u8 unk9EEE[0xF6E - 0xEEE]; u8 unk9F6E[0x8E - 0x6E]; // unknown length - u8 unk9F8E[1]; // unknown length - /* - u8 unk9F8F; - u8 unk9F90; - u8 unk9F91[1]; // unknown length - */ + u8 unk9F8E[7]; // unknown length }; #define static_assert(cond) \ diff --git a/include/global.h b/include/global.h index 27b4b84a2..c7027eccf 100644 --- a/include/global.h +++ b/include/global.h @@ -41,7 +41,7 @@ fndec\ #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 -#define min(a, b) ((a) <= (b) ? (a) : (b)) +#define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b)) // why does GF hate 2d arrays diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 15ffa4665..ea3fe3936 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -10,6 +10,7 @@ #include "strings.h" #include "trig.h" +extern void sub_8095C8C(); extern void sub_809D104(); void sub_80E8268(void); @@ -28,6 +29,27 @@ void sub_80E91D4(u8); void sub_80E948C(void); void sub_80E95A4(void); void sub_80E9620(u16, u16); +void sub_80E97C0(u16, u16); +void sub_80E9A4C(void); +void sub_80E9A60(const u8 *, u16, u16); +void sub_80E9A7C(u8 *, u16); +void sub_80E9AD4(void); +void sub_80E9C74(u16); +u8 sub_80EA1E0(void); +void sub_80EA24C(void); +void sub_80EA348(void); +void sub_80EA4A4(void); +void sub_80EA5A0(void); +void sub_80EA704(void); +void sub_80EA764(void); +void sub_80EA7F4(void); +void sub_80EA8BC(void); +void sub_80EA948(void); +void sub_80EAA44(void); +void sub_80EAAD4(void); +u8 *sub_80EAD64(); +u8 *sub_80EB218(u8 *, u16, u16); +u16 sub_80EB2D4(u16); const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); const u16 InterviewPalette_1[] = INCBIN_U16("graphics/misc/interview_pal1.gbapal"); @@ -936,9 +958,28 @@ void sub_80E8D8C(u8 a) } } -extern const u16 gUnknown_083DBDFC[]; +const u16 gUnknown_083DBDFC[] = INCBIN_U16("graphics/unknown/unknown_3DBDFC.gbapal"); -extern const u16 gUnknown_083DBE40[]; +const u16 gUnknown_083DBE1C[] = +{ + 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, + 0x301, 0x301, 0x301, 0x301, 0x301, 0x300, 0x300, 0x300, 0x300, +}; + +const u16 gUnknown_083DBE40[] = INCBIN_U16("graphics/unknown/unknown_3DBE40.gbapal"); + +// unused tilemap? +const u16 gUnused_083DBE60[] = +{ + 0x5036, 0x5037, 0x5038, 0x5039, 0x503A, 0x503B, + 0x5046, 0x5047, 0x5048, 0x5049, 0x504A, 0x504B, + 0x5056, 0x5057, 0x5058, 0x5059, 0x505A, 0x505B, + 0x5030, 0x5031, 0x5032, 0x5033, 0x5034, 0x5035, + 0x5040, 0x5041, 0x5042, 0x5043, 0x5044, 0x5045, + 0x5050, 0x5051, 0x5052, 0x5053, 0x5054, 0x5055, +}; + +const u8 gUnknown_083DBEA8[] = _("{CLEAR_TO 88}"); void sub_80E8DD8(void) { @@ -1028,7 +1069,7 @@ void sub_80E8FA4(void) gUnknown_083DB694->unk9C32 = 0; } -void sub_80E9108(u8 a) +void sub_80E9108(s8 a) { u16 i; @@ -1244,3 +1285,526 @@ void sub_80E95A4(void) } BasicInitMenuWindow(&gWindowConfig_81E6DA8); } + +void sub_80E9620(u16 a, u16 b) +{ + u16 i; + u16 j; + u16 r10 = 0; + u16 r7 = a; + + for (i = 0; i < gUnknown_083DB694->unk84; i++) + { + u16 r6 = b; + + for (j = 0; j < gUnknown_083DB694->unk83; j++) + { + if (r10 >= gUnknown_083DB694->unkA) + { + MenuPrint(gUnknown_083DBEA8, r6, r7); + break; + } + if (gUnknown_083DB694->unkC[r10] == 0xFFFF) + { + sub_8095C8C((void *)(VRAM + 0x7000), r6, r7, gUnknown_083DBE1C, 0, 0, 9, 2, 9); + r6 += 11; + } + else + { + sub_80EB218(gUnknown_083DB694->unk9E14, gUnknown_083DB694->unkC[r10], 11); + MenuPrint(gUnknown_083DB694->unk9E14, r6, r7); + r6 += gUnknown_083DB694->unk8C[i][j] + 11; + } + r10++; + } + r7 += 2; + } +} + +void sub_80E9744(void) +{ + BasicInitMenuWindow(&gWindowConfig_81E6D8C); + switch (gUnknown_083DB694->unk9) + { + case 4: + sub_80E97C0(4, 6); + break; + case 5: + sub_80E97C0(2, 17); + break; + case 0: + sub_80E97C0(3, 5); + break; + case 1: + sub_80E97C0(0, 5); + break; + case 2: + sub_80E97C0(4, 17); + break; + case 3: + sub_80E97C0(3, 6); + break; + } + BasicInitMenuWindow(&gWindowConfig_81E6DA8); +} + +void sub_80E97C0(u16 a, u16 b) +{ + u8 i; + u8 r7 = 0; + + asm("":::"r9"); + + for (i = 0; i < gUnknown_083DB694->unk84; i++) + { + u8 r6; + u8 *r2 = gUnknown_083DB694->unk9E6E; + u32 r1; + + for (r6 = 0; r6 < gUnknown_083DB694->unk83; r6++) + { + if (r7 >= gUnknown_083DB694->unkA) + break; + if (gUnknown_083DB694->unkC[r7] != 0xFFFF) + { + r2 = sub_80EB218(r2, gUnknown_083DB694->unkC[r7], 0); + *r2++ = CHAR_SPACE; + } + r7++; + } + + r1 = gUnknown_083DB694->unk83 * 11; + r2[0] = EXT_CTRL_CODE_BEGIN; + r2[1] = 0x13; + r2[2] = r1 * 8; + r2[3] = EOS; + + MenuPrint(gUnknown_083DB694->unk9E6E, b, a); + + a += 2; + } +} + +void sub_80E98C4(void) +{ + u8 r1; + u8 r3; + + BasicInitMenuWindow(&gWindowConfig_81E6D8C); + switch (gUnknown_083DB694->unk9) + { + case 4: + r1 = 4; + r3 = 2; + break; + case 5: + r1 = 3; + r3 = 2; + break; + case 0: + r1 = 3; + r3 = 2; + break; + case 1: + r1 = 1; + r3 = 3; + break; + case 2: + r1 = 4; + r3 = 1; + break; + case 3: + r1 = 3; + r3 = 1; + break; + default: + return; + } + MenuFillWindowRectWithBlankTile(2, r1, 27, r3 * 2 + r1 - 1); + BasicInitMenuWindow(&gWindowConfig_81E6DA8); +} + +void sub_80E9940(u8 *a, u8 b) +{ + u8 r4 = (b & 7); + + MenuFillWindowRectWithBlankTile(2, r4 * 2, 31, r4 * 2 + 1); + sub_80E9A7C(a, b); + sub_80E9A60(a, 2, r4 * 2); +} + +extern const u8 gUnknown_083DBEAC[][32]; + +void sub_80E9974(void) +{ + BasicInitMenuWindow(&gWindowConfig_81E6D54); + if (gUnknown_083DB694->unk26 == 0) + { + u16 i; + + for (i = gUnknown_083DB694->unk1B5; i < gUnknown_083DB694->unk1B5 + 4; i++) + sub_80E9940(gUnknown_083DB694->unk9DC9, i); + } + else + { + sub_80E9AD4(); + sub_80E9A60(gUnknown_083DBEAC[0], 2, 0); + sub_80E9A60(gUnknown_083DBEAC[1], 2, 2); + sub_80E9A60(gUnknown_083DBEAC[2], 2, 4); + sub_80E9A60(gUnknown_083DBEAC[3], 2, 6); + } +} + +void sub_80E9A14(void) +{ + sub_80E9A4C(); + if (gUnknown_083DB694->unk26 == 0) + gUnknown_083DB694->unk1BA += gUnknown_083DB694->unk1B5 * 16; +} + +void sub_80E9A4C(void) +{ + gUnknown_083DB694->unk1BA = 0; +} + +void sub_80E9A60(const u8 *a, u16 b, u16 c) +{ + c &= 0xF; + MenuPrint(a, b, c); +} + +void sub_80E9A7C(u8 *a, u16 b) +{ + u16 i; + u16 r5 = b * 2; + + for (i = 0; i < 2; i++) + { + a[0] = EXT_CTRL_CODE_BEGIN; + a[1] = 0x12; + a[2] = 88 * i; + a += 3; + + a = sub_80EAD64(a, gUnknown_083DB694->unk2A[b][i], 11); + r5++; + if (r5 >= gUnknown_083DB694->unk28) + break; + } +} + +void sub_80E9AD4(void) +{ + u16 i; + + BasicInitMenuWindow(&gWindowConfig_81E6D54); + for (i = 0; i < 16; i++) + sub_80E9C74(i); +} + +void sub_80E9AF8(u16 a) +{ + u8 *r8; + u16 i; + + sub_80E9C74(a); + + r8 = gUnknown_083DB694->unk9E14; + r8[0] = EXT_CTRL_CODE_BEGIN; + r8[1] = 0x11; + r8[2] = 0x10; + r8 += 3; + + if (gUnknown_083DB694->unk7D != 0) + { + for (i = 0; i < gUnknown_083DB694->unk99A6[a]; i++) + { + if (sub_80EB2D4(gUnknown_083DB694->unk9A2A[a][i]) == 7) + BasicInitMenuWindow(&gWindowConfig_81E6D70); + else + BasicInitMenuWindow(&gWindowConfig_81E6D54); + sub_80EB218(r8, gUnknown_083DB694->unk9A2A[a][i], 9); + sub_80E9A60(gUnknown_083DB694->unk9E14, i * 11 + 4, a * 2); + } + } + else + { + BasicInitMenuWindow(&gWindowConfig_81E6D54); + for (i = 0; i < gUnknown_083DB694->unk99A6[a]; i++) + { + sub_80EB218(r8, gUnknown_083DB694->unk9A2A[a][i], 9); + sub_80E9A60(gUnknown_083DB694->unk9E14, i * 11 + 4, a * 2); + } + } +} + +void sub_80E9C74(u16 a) +{ + a &= 7; + MenuFillWindowRectWithBlankTile(0, a * 2, 29, a * 2 + 1); +} + +void sub_80E9C94(void) +{ + u16 r5 = min(gUnknown_083DB694->unk9A28, 4); + u16 i; + + for (i = 0; i < r5; i++) + sub_80E9AF8(gUnknown_083DB694->unk9A29 + i); + while (i < 4) + sub_80E9C74(i++); +} + +void sub_80E9D00(void) +{ + u16 r4; + u16 r5; + + if (gUnknown_083DB694->unk1C0 > 0) + { + r4 = gUnknown_083DB694->unk1C0; + r5 = gUnknown_083DB694->unk9A29 + 4; + } + else + { + r4 = -gUnknown_083DB694->unk1C0; + r5 = gUnknown_083DB694->unk9A29 - r4; + } + while (--r4 != 0xFFFF) + sub_80E9AF8(r5++); +} + +void sub_80E9D7C(void) +{ + u16 r6; + u16 r4; + u16 i; + + BasicInitMenuWindow(&gWindowConfig_81E6D54); + if (gUnknown_083DB694->unk1C0 < 0) + { + r6 = -gUnknown_083DB694->unk1C0; + r4 = gUnknown_083DB694->unk1B5 - r6; + } + else + { + r6 = gUnknown_083DB694->unk1C0; + r4 = gUnknown_083DB694->unk1B5 + 4; + } + for (i = 0; i < r6; i++) + { + sub_80E9940(gUnknown_083DB694->unk9DC9, r4); + r4++; + } +} + +void sub_80E9E08(u8 a) +{ + gUnknown_083DB694->unk1BC = (gUnknown_083DB694->unk1BA + gUnknown_083DB694->unk1C0 * 16) & 0x7F; + gUnknown_083DB694->unk1BF = (gUnknown_083DB694->unk1C0 < 0) ? -a : a; +} + +bool8 sub_80E9E54(void) +{ + gUnknown_083DB694->unk1BA = (gUnknown_083DB694->unk1BA + gUnknown_083DB694->unk1BF) & 0x7F; + return (gUnknown_083DB694->unk1BA == gUnknown_083DB694->unk1BC); +} + +void nullsub_23(void) +{ +} + +void sub_80E9E98(void) +{ + gUnknown_083DB694->unkBE = 0; +} + +bool8 sub_80E9EA8(void) +{ + switch (gUnknown_083DB694->unkBE) + { + case 0: + sub_80EA24C(); + gUnknown_083DB694->unkBE++; + // fall through + case 1: + if (sub_80EA1E0() != 0) + { + sub_80EA4A4(); + gUnknown_083DB694->unkBE++; + } + break; + case 2: + if (sub_80EA1E0() != 0) + { + sub_80EA704(); + gUnknown_083DB694->unkBE++; + } + break; + case 3: + if (sub_80EA1E0() != 0) + gUnknown_083DB694->unkBE++; + break; + case 4: + gUnknown_083DB694->unkBE++; + break; + case 5: + return TRUE; + } + return FALSE; +} + +bool8 sub_80E9F50(void) +{ + switch (gUnknown_083DB694->unkBE) + { + case 0: + nullsub_23(); + sub_80EA764(); + gUnknown_083DB694->unkBE++; + // fall through + case 1: + if (sub_80EA1E0() != 0) + gUnknown_083DB694->unkBE++; + break; + case 2: + sub_80EA5A0(); + gUnknown_083DB694->unkBE++; + // fall through + case 3: + if (sub_80EA1E0() != 0) + gUnknown_083DB694->unkBE++; + break; + case 4: + sub_80EA348(); + gUnknown_083DB694->unkBE++; + // fall through + case 5: + if (sub_80EA1E0() != 0) + gUnknown_083DB694->unkBE++; + break; + case 6: + return TRUE; + } + return FALSE; +} + +bool8 sub_80E9FD4(void) +{ + switch (gUnknown_083DB694->unkBE) + { + case 0: + nullsub_23(); + sub_80EA5A0(); + gUnknown_083DB694->unkBE++; + // fall through + case 1: + if (sub_80EA1E0() != 0) + return TRUE; + break; + } + return FALSE; +} + +bool8 sub_80EA014(void) +{ + switch (gUnknown_083DB694->unkBE) + { + case 0: + sub_80EA4A4(); + gUnknown_083DB694->unkBE++; + // fall through + case 1: + if (sub_80EA1E0() != 0) + return TRUE; + break; + } + return FALSE; +} + +bool8 sub_80EA050(void) +{ + switch (gUnknown_083DB694->unkBE) + { + case 0: + nullsub_23(); + sub_80EA764(); + gUnknown_083DB694->unkBE++; + break; + case 1: + if (sub_80EA1E0() != 0) + { + sub_80EA7F4(); + gUnknown_083DB694->unkBE++; + } + break; + case 2: + sub_80E9108(1); + if (sub_80EA1E0() != 0) + { + sub_80EA8BC(); + gUnknown_083DB694->unkBE++; + } + break; + case 3: + sub_80E9108(1); + if (sub_80EA1E0() != 0) + gUnknown_083DB694->unkBE++; + break; + case 4: + return TRUE; + } + return FALSE; +} + +bool8 sub_80EA0E4(void) +{ + switch (gUnknown_083DB694->unkBE) + { + case 0: + sub_80EA948(); + gUnknown_083DB694->unkBE++; + // fall through + case 1: + sub_80E9108(-1); + if (sub_80EA1E0() != 0) + { + sub_80EAA44(); + gUnknown_083DB694->unkBE++; + } + break; + case 2: + sub_80E9108(-1); + if (sub_80EA1E0() != 0) + { + sub_80EA704(); + gUnknown_083DB694->unkBE++; + } + break; + case 3: + if (sub_80EA1E0() != 0) + gUnknown_083DB694->unkBE++; + break; + case 4: + return TRUE; + } + return FALSE; +} + +bool8 sub_80EA184(void) +{ + switch (gUnknown_083DB694->unkBE) + { + case 0: + sub_80EAAD4(); + gUnknown_083DB694->unkBE++; + // fall through + case 1: + if (sub_80EA1E0() != 0) + gUnknown_083DB694->unkBE++; + break; + case 2: + sub_80E9178(); + return TRUE; + } + return FALSE; +} diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c index 5d606ef10..59e463260 100644 --- a/src/easy_chat_before.c +++ b/src/easy_chat_before.c @@ -180,7 +180,7 @@ void sub_80E9C94(void); void sub_80E9D00(void); void sub_80E9D7C(void); void sub_80E9E08(); -u8 sub_80E9E54(void); +bool8 sub_80E9E54(void); void sub_80E9E98(void); u8 sub_80E9EA8(void); u8 sub_80E9F50(void); @@ -1202,7 +1202,7 @@ void sub_80E7458(void) shared1000.unk24++; break; case 1: - if (sub_80E9E54() != 0) + if (sub_80E9E54()) { if (shared1000.unk1C4 == sub_80E6FC8) { -- cgit v1.2.3 From 501482beadd05c5ade13f6919c3c2cd42c86952d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 Jan 2018 23:18:53 -0600 Subject: fix German build --- asm-de/easy_chat.s | 1 + src/easy_chat_2.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index a07a33111..8e18f8a24 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -5,6 +5,7 @@ .text + thumb_func_start sub_80E8BF4 sub_80E8BF4: @ 80E8BF4 push {r4-r7,lr} diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index ea3fe3936..363cc49fa 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -422,7 +422,11 @@ void sub_80E85F8(struct Sprite *sprite) sprite->pos1.y = (gUnknown_083DB694->unk1A8 - gUnknown_083DB694->unk1B5) * 16 + 96; break; case 1: +#if ENGLISH sprite->pos1.x = 216; +#else + sprite->pos1.x = 214; +#endif sprite->pos1.y = gUnknown_083DB694->unk1A8 * 16 + 96; break; case 2: @@ -1435,6 +1439,7 @@ void sub_80E9940(u8 *a, u8 b) extern const u8 gUnknown_083DBEAC[][32]; +#if ENGLISH void sub_80E9974(void) { BasicInitMenuWindow(&gWindowConfig_81E6D54); @@ -1454,6 +1459,82 @@ void sub_80E9974(void) sub_80E9A60(gUnknown_083DBEAC[3], 2, 6); } } +#else +__attribute__((naked)) +void sub_80E9974(void) +{ + asm(".syntax unified\n\ + push {r4-r6,lr}\n\ + ldr r0, _080E99C4 @ =gWindowConfig_81E6D54\n\ + bl BasicInitMenuWindow\n\ + ldr r0, _080E99C8 @ =gUnknown_083DB694\n\ + ldr r2, [r0]\n\ + adds r0, r2, 0\n\ + adds r0, 0x26\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + bne _080E99D4\n\ + ldr r1, _080E99CC @ =0x000001b5\n\ + adds r0, r2, r1\n\ + ldrb r0, [r0]\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + lsls r1, r0, 16\n\ + lsrs r4, r1, 16\n\ + adds r0, 0x4\n\ + cmp r4, r0\n\ + bge _080E9A02\n\ + adds r5, r2, 0\n\ + ldr r2, _080E99CC @ =0x000001b5\n\ + adds r6, r5, r2\n\ +_080E99A4:\n\ + lsls r1, r4, 24\n\ + lsrs r1, 24\n\ + ldr r2, _080E99D0 @ =0x0000a0f5\n\ + adds r0, r5, r2\n\ + bl sub_80E9940\n\ + adds r0, r4, 0x1\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + movs r0, 0\n\ + ldrsb r0, [r6, r0]\n\ + adds r0, 0x4\n\ + cmp r4, r0\n\ + blt _080E99A4\n\ + b _080E9A02\n\ + .align 2, 0\n\ +_080E99C4: .4byte gWindowConfig_81E6D54\n\ +_080E99C8: .4byte gUnknown_083DB694\n\ +_080E99CC: .4byte 0x000001b5\n\ +_080E99D0: .4byte 0x0000a0f5\n\ +_080E99D4:\n\ + bl sub_80E9AD4\n\ + ldr r4, _080E9A08 @ =gUnknown_083DBEAC\n\ + ldr r0, [r4]\n\ + movs r1, 0x2\n\ + movs r2, 0\n\ + bl sub_80E9A60\n\ + ldr r0, [r4, 0x4]\n\ + movs r1, 0x2\n\ + movs r2, 0x2\n\ + bl sub_80E9A60\n\ + ldr r0, [r4, 0x8]\n\ + movs r1, 0x2\n\ + movs r2, 0x4\n\ + bl sub_80E9A60\n\ + ldr r0, [r4, 0xC]\n\ + movs r1, 0x2\n\ + movs r2, 0x6\n\ + bl sub_80E9A60\n\ +_080E9A02:\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080E9A08: .4byte gUnknown_083DBEAC\n\ + .syntax divided\n"); +} +#endif void sub_80E9A14(void) { -- cgit v1.2.3 From fd50ddbc15a838e9e5e378f3b4358de68332fd86 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 Jan 2018 23:50:01 -0600 Subject: actually fix German build --- asm-de/easy_chat.s | 2799 ---------------------------------------------------- 1 file changed, 2799 deletions(-) diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 8e18f8a24..75d7b77f4 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -5,2805 +5,6 @@ .text - - thumb_func_start sub_80E8BF4 -sub_80E8BF4: @ 80E8BF4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r1, 24 - lsrs r2, r1, 24 - ldr r0, _080E8C28 @ =gUnknown_083DBD30 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x4] - str r1, [sp, 0x8] - ldr r0, _080E8C2C @ =gUnknown_083DBD38 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0xC] - str r1, [sp, 0x10] - cmp r2, 0x2 - beq _080E8C20 - cmp r2, 0x5 - beq _080E8C30 -_080E8C20: - movs r4, 0x40 - movs r5, 0x28 - b _080E8C34 - .align 2, 0 -_080E8C28: .4byte gUnknown_083DBD30 -_080E8C2C: .4byte gUnknown_083DBD38 -_080E8C30: - movs r4, 0x24 - movs r5, 0x30 -_080E8C34: - cmp r3, 0 - beq _080E8C3C - cmp r3, 0x1 - beq _080E8C40 -_080E8C3C: - movs r0, 0x43 - b _080E8C42 -_080E8C40: - movs r0, 0x44 -_080E8C42: - mov r8, r0 - add r0, sp, 0x4 - bl LoadCompressedObjectPic - add r0, sp, 0xC - bl LoadSpritePalette - ldr r0, _080E8CDC @ =gSpriteTemplate_83DBD48 - adds r1, r4, 0 - adds r2, r5, 0 - movs r3, 0x1 - bl CreateSprite - ldr r0, _080E8CE0 @ =gSaveBlock2 - ldrb r0, [r0, 0x8] - movs r1, 0x69 - cmp r0, 0 - bne _080E8C68 - movs r1, 0x64 -_080E8C68: - ldr r7, _080E8CE4 @ =SpriteCallbackDummy - adds r2, r4, 0 - subs r2, 0xC - movs r6, 0 - str r6, [sp] - adds r0, r1, 0 - adds r1, r7, 0 - adds r3, r5, 0 - bl AddPseudoFieldObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _080E8C9E - ldr r1, _080E8CE8 @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x3 - bl StartSpriteAnim -_080E8C9E: - adds r2, r4, 0 - adds r2, 0xC - str r6, [sp] - mov r0, r8 - adds r1, r7, 0 - adds r3, r5, 0 - bl AddPseudoFieldObject - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _080E8CD0 - ldr r1, _080E8CE8 @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - movs r1, 0x2 - bl StartSpriteAnim -_080E8CD0: - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E8CDC: .4byte gSpriteTemplate_83DBD48 -_080E8CE0: .4byte gSaveBlock2 -_080E8CE4: .4byte SpriteCallbackDummy -_080E8CE8: .4byte gSprites - thumb_func_end sub_80E8BF4 - - thumb_func_start sub_80E8CEC -sub_80E8CEC: @ 80E8CEC - push {lr} - ldr r0, _080E8D24 @ =gUnknown_083DBD60 - bl LoadCompressedObjectPic - ldr r0, _080E8D28 @ =gUnknown_083DBD68 - bl LoadSpritePalette - ldr r0, _080E8D2C @ =gSpriteTemplate_83DBDE4 - movs r1, 0xE0 - movs r2, 0x58 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080E8D3C - ldr r0, _080E8D30 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r0, _080E8D34 @ =0x00009fa0 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080E8D38 @ =gSprites - adds r0, r1 - str r0, [r2] - b _080E8D48 - .align 2, 0 -_080E8D24: .4byte gUnknown_083DBD60 -_080E8D28: .4byte gUnknown_083DBD68 -_080E8D2C: .4byte gSpriteTemplate_83DBDE4 -_080E8D30: .4byte gUnknown_083DB694 -_080E8D34: .4byte 0x00009fa0 -_080E8D38: .4byte gSprites -_080E8D3C: - ldr r0, _080E8D4C @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E8D50 @ =0x00009fa0 - adds r0, r1 - movs r1, 0 - str r1, [r0] -_080E8D48: - pop {r0} - bx r0 - .align 2, 0 -_080E8D4C: .4byte gUnknown_083DB694 -_080E8D50: .4byte 0x00009fa0 - thumb_func_end sub_80E8CEC - - thumb_func_start sub_80E8D54 -sub_80E8D54: @ 80E8D54 - push {lr} - ldr r0, _080E8D78 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r1, _080E8D7C @ =0x00009fa0 - adds r0, r2, r1 - ldr r1, [r0] - cmp r1, 0 - beq _080E8D88 - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E8D80 - adds r0, r1, 0 - movs r1, 0x1 - bl StartSpriteAnim - b _080E8D88 - .align 2, 0 -_080E8D78: .4byte gUnknown_083DB694 -_080E8D7C: .4byte 0x00009fa0 -_080E8D80: - adds r0, r1, 0 - movs r1, 0x2 - bl StartSpriteAnim -_080E8D88: - pop {r0} - bx r0 - thumb_func_end sub_80E8D54 - - thumb_func_start sub_80E8D8C -sub_80E8D8C: @ 80E8D8C - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _080E8DB8 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r1, _080E8DBC @ =0x00009fa0 - adds r0, r2, r1 - ldr r1, [r0] - cmp r1, 0 - beq _080E8DD2 - cmp r3, 0 - beq _080E8DCA - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E8DC0 - adds r0, r1, 0 - movs r1, 0x3 - bl StartSpriteAnim - b _080E8DD2 - .align 2, 0 -_080E8DB8: .4byte gUnknown_083DB694 -_080E8DBC: .4byte 0x00009fa0 -_080E8DC0: - adds r0, r1, 0 - movs r1, 0x4 - bl StartSpriteAnim - b _080E8DD2 -_080E8DCA: - adds r0, r1, 0 - movs r1, 0x5 - bl StartSpriteAnim -_080E8DD2: - pop {r0} - bx r0 - thumb_func_end sub_80E8D8C - - thumb_func_start sub_80E8DD8 -sub_80E8DD8: @ 80E8DD8 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x8 - ldr r0, _080E8F2C @ =REG_BG0HOFS - movs r6, 0 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - adds r0, 0x4 - strh r6, [r0] - subs r0, 0x2 - strh r6, [r0] - adds r0, 0x4 - strh r6, [r0] - adds r0, 0x2 - strh r6, [r0] - ldr r1, _080E8F30 @ =REG_BG0CNT - movs r2, 0x8B - lsls r2, 8 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r2, _080E8F34 @ =0x00000d09 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080E8F38 @ =gUnknown_08E945D0 - ldr r1, _080E8F3C @ =gUnknown_083DB694 - ldr r1, [r1] - mov r8, r1 - movs r4, 0xE4 - lsls r4, 1 - add r4, r8 - movs r5, 0xA0 - lsls r5, 2 - adds r1, r4, 0 - adds r2, r5, 0 - bl CpuSet - ldr r0, _080E8F40 @ =gUnknown_08E953D0 - movs r1, 0xD9 - lsls r1, 3 - add r1, r8 - bl LZ77UnCompWram - ldr r0, _080E8F44 @ =gMenuWordGroupFrame_Gfx - ldr r1, _080E8F48 @ =0x06008000 - bl LZ77UnCompVram - ldr r1, _080E8F4C @ =0x06006800 - adds r0, r4, 0 - adds r2, r5, 0 - bl CpuSet - ldr r0, _080E8F50 @ =gMenuWordGroupFrame1_Pal - movs r1, 0x40 - movs r2, 0x40 - bl LoadPalette - ldr r1, _080E8F54 @ =REG_BG2CNT - ldr r2, _080E8F58 @ =0x00000e02 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _080E8F5C @ =0x06007000 - movs r5, 0x80 - lsls r5, 4 - mov r0, sp - strh r6, [r0] - ldr r4, _080E8F60 @ =0x040000d4 - str r0, [r4] - str r1, [r4, 0x4] - lsrs r0, r5, 1 - movs r2, 0x81 - lsls r2, 24 - orrs r0, r2 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _080E8F64 @ =gUnknown_08E9AB00 - ldr r2, _080E8F68 @ =0x06006000 - str r0, [r4] - str r2, [r4, 0x4] - ldr r0, _080E8F6C @ =0x80000020 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _080E8F70 @ =gUnknown_08E9AB60 - bl LZ77UnCompVram - ldr r0, _080E8F74 @ =gUnknown_08E9AB40 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, _080E8F78 @ =gUnknown_083DBDFC - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r1, _080E8F7C @ =REG_BG3CNT - ldr r2, _080E8F80 @ =0x00000f0f - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _080E8F84 @ =0x06007800 - movs r0, 0 - mov r9, r0 - str r0, [sp, 0x4] - add r0, sp, 0x4 - str r0, [r4] - str r1, [r4, 0x4] - lsrs r5, 2 - movs r0, 0x85 - lsls r0, 24 - orrs r5, r0 - str r5, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _080E8F88 @ =gUnknown_083DBE40 - movs r1, 0x20 - movs r2, 0x20 - bl LoadPalette - ldr r0, _080E8F8C @ =gPlttBufferUnfaded - adds r1, r0, 0 - adds r1, 0x7E - ldr r3, _080E8F90 @ =0x00007fff - strh r3, [r1] - subs r1, 0x1C - ldr r2, _080E8F94 @ =0x00006f5b - strh r2, [r1] - adds r0, 0x70 - ldr r1, _080E8F98 @ =0x0000739c - strh r1, [r0] - ldr r0, _080E8F9C @ =gPlttBufferFaded - adds r4, r0, 0 - adds r4, 0x7E - strh r3, [r4] - adds r3, r0, 0 - adds r3, 0x62 - strh r2, [r3] - adds r0, 0x70 - strh r1, [r0] - movs r1, 0xBC - add r8, r1 - mov r2, r8 - strb r6, [r2] - bl sub_80E8FA4 - bl sub_80E948C - movs r0, 0xA - bl sub_80E9198 - movs r0, 0 - bl sub_80E91D4 - bl sub_80E95A4 - ldr r0, _080E8FA0 @ =REG_BLDCNT - mov r1, r9 - strh r1, [r0] - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E8F2C: .4byte REG_BG0HOFS -_080E8F30: .4byte REG_BG0CNT -_080E8F34: .4byte 0x00000d09 -_080E8F38: .4byte gUnknown_08E945D0 -_080E8F3C: .4byte gUnknown_083DB694 -_080E8F40: .4byte gUnknown_08E953D0 -_080E8F44: .4byte gMenuWordGroupFrame_Gfx -_080E8F48: .4byte 0x06008000 -_080E8F4C: .4byte 0x06006800 -_080E8F50: .4byte gMenuWordGroupFrame1_Pal -_080E8F54: .4byte REG_BG2CNT -_080E8F58: .4byte 0x00000e02 -_080E8F5C: .4byte 0x06007000 -_080E8F60: .4byte 0x040000d4 -_080E8F64: .4byte gUnknown_08E9AB00 -_080E8F68: .4byte 0x06006000 -_080E8F6C: .4byte 0x80000020 -_080E8F70: .4byte gUnknown_08E9AB60 -_080E8F74: .4byte gUnknown_08E9AB40 -_080E8F78: .4byte gUnknown_083DBDFC -_080E8F7C: .4byte REG_BG3CNT -_080E8F80: .4byte 0x00000f0f -_080E8F84: .4byte 0x06007800 -_080E8F88: .4byte gUnknown_083DBE40 -_080E8F8C: .4byte gPlttBufferUnfaded -_080E8F90: .4byte 0x00007fff -_080E8F94: .4byte 0x00006f5b -_080E8F98: .4byte 0x0000739c -_080E8F9C: .4byte gPlttBufferFaded -_080E8FA0: .4byte REG_BLDCNT - thumb_func_end sub_80E8DD8 - - thumb_func_start sub_80E8FA4 -sub_80E8FA4: @ 80E8FA4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - movs r0, 0 - mov r9, r0 - mov r1, sp - adds r1, 0x18 - str r1, [sp, 0x24] - add r2, sp, 0xC - mov r12, r2 -_080E8FBE: - mov r3, r9 - lsls r1, r3, 1 - ldr r4, _080E90F4 @ =0x08e8f136 - adds r0, r1, r4 - ldrh r2, [r0] - movs r0, 0x1F - ands r0, r2 - lsls r0, 8 - str r0, [sp] - ldr r5, _080E90F8 @ =0x08e8f13c - adds r1, r5 - ldrh r1, [r1] - movs r0, 0x1F - ands r0, r1 - lsls r0, 8 - str r0, [sp, 0xC] - lsls r2, 16 - lsrs r0, r2, 21 - movs r3, 0x1F - ands r0, r3 - lsls r0, 8 - str r0, [sp, 0x4] - lsls r1, 16 - lsrs r0, r1, 21 - ands r0, r3 - lsls r0, 8 - mov r4, r12 - str r0, [r4, 0x4] - lsrs r2, 26 - ands r2, r3 - lsls r2, 8 - str r2, [sp, 0x8] - lsrs r1, 26 - ands r1, r3 - lsls r1, 8 - str r1, [r4, 0x8] - movs r3, 0 - mov r5, r9 - lsls r5, 3 - mov r10, r5 - mov r0, r9 - adds r0, 0x1 - str r0, [sp, 0x28] - ldr r4, [sp, 0x24] -_080E9016: - lsls r0, r3, 2 - adds r2, r4, r0 - mov r5, r12 - adds r1, r5, r0 - add r0, sp - ldr r1, [r1] - ldr r0, [r0] - subs r0, r1, r0 - cmp r0, 0 - bge _080E902C - adds r0, 0x7 -_080E902C: - asrs r0, 3 - str r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x2 - bls _080E9016 - movs r4, 0 - ldr r0, _080E90FC @ =gUnknown_083DB694 - ldr r1, [r0] - mov r0, r10 - add r0, r9 - lsls r0, 1 - mov r8, r0 - movs r5, 0x1F - ldr r6, [sp, 0x24] - ldr r0, _080E9100 @ =0x00009f60 - adds r7, r1, r0 -_080E9050: - lsls r2, r4, 1 - add r2, r8 - adds r2, r7, r2 - ldr r1, [sp, 0x8] - asrs r1, 8 - ands r1, r5 - lsls r1, 10 - ldr r0, [sp, 0x4] - asrs r0, 8 - ands r0, r5 - lsls r0, 5 - orrs r1, r0 - ldr r0, [sp] - asrs r0, 8 - ands r0, r5 - orrs r1, r0 - strh r1, [r2] - movs r3, 0 - adds r4, 0x1 -_080E9076: - lsls r0, r3, 2 - mov r1, sp - adds r2, r1, r0 - adds r0, r6, r0 - ldr r1, [r2] - ldr r0, [r0] - adds r1, r0 - str r1, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x2 - bls _080E9076 - lsls r0, r4, 16 - lsrs r4, r0, 16 - cmp r4, 0x7 - bls _080E9050 - ldr r2, _080E90FC @ =gUnknown_083DB694 - ldr r3, [r2] - mov r0, r10 - add r0, r9 - adds r0, r4 - lsls r0, 1 - ldr r4, _080E9100 @ =0x00009f60 - adds r2, r3, r4 - adds r2, r0 - mov r5, r12 - ldr r1, [r5, 0x8] - asrs r1, 8 - movs r0, 0x1F - ands r1, r0 - lsls r1, 10 - ldr r0, [r5, 0x4] - asrs r0, 8 - movs r4, 0x1F - ands r0, r4 - lsls r0, 5 - orrs r1, r0 - ldr r0, [sp, 0xC] - asrs r0, 8 - ands r0, r4 - orrs r1, r0 - strh r1, [r2] - ldr r5, [sp, 0x28] - lsls r0, r5, 16 - lsrs r0, 16 - mov r9, r0 - cmp r0, 0x2 - bhi _080E90DA - b _080E8FBE -_080E90DA: - ldr r0, _080E9104 @ =0x00009f5e - adds r1, r3, r0 - movs r0, 0 - strb r0, [r1] - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E90F4: .4byte 0x08e8f136 -_080E90F8: .4byte 0x08e8f13c -_080E90FC: .4byte gUnknown_083DB694 -_080E9100: .4byte 0x00009f60 -_080E9104: .4byte 0x00009f5e - thumb_func_end sub_80E8FA4 - - thumb_func_start sub_80E9108 -sub_80E9108: @ 80E9108 - push {r4-r7,lr} - lsls r0, 24 - ldr r1, _080E9164 @ =gUnknown_083DB694 - ldr r2, [r1] - ldr r3, _080E9168 @ =0x00009f5e - adds r1, r2, r3 - lsrs r0, 24 - ldrb r3, [r1] - adds r0, r3 - strb r0, [r1] - movs r4, 0 - ldr r0, _080E916C @ =gPlttBufferUnfaded - mov r12, r0 - adds r6, r1, 0 - ldr r3, _080E9170 @ =0x00009f60 - adds r5, r2, r3 - ldr r7, _080E9174 @ =gPlttBufferFaded -_080E912A: - adds r2, r4, 0 - adds r2, 0x51 - lsls r2, 1 - mov r0, r12 - adds r3, r2, r0 - ldrb r0, [r6] - lsls r0, 1 - lsls r1, r4, 3 - adds r1, r4 - lsls r1, 1 - adds r0, r1 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r3] - adds r2, r7 - ldrb r0, [r6] - lsls r0, 1 - adds r0, r1 - adds r0, r5, r0 - ldrh r0, [r0] - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x2 - bls _080E912A - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9164: .4byte gUnknown_083DB694 -_080E9168: .4byte 0x00009f5e -_080E916C: .4byte gPlttBufferUnfaded -_080E9170: .4byte 0x00009f60 -_080E9174: .4byte gPlttBufferFaded - thumb_func_end sub_80E9108 - - thumb_func_start sub_80E9178 -sub_80E9178: @ 80E9178 - push {lr} - ldr r0, _080E9190 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E9194 @ =0x00009f5e - adds r0, r1 - movs r1, 0 - strb r1, [r0] - movs r0, 0 - bl sub_80E9108 - pop {r0} - bx r0 - .align 2, 0 -_080E9190: .4byte gUnknown_083DB694 -_080E9194: .4byte 0x00009f5e - thumb_func_end sub_80E9178 - - thumb_func_start sub_80E9198 -sub_80E9198: @ 80E9198 - ldr r1, _080E91A0 @ =gUnknown_03000740 - strb r0, [r1] - bx lr - .align 2, 0 -_080E91A0: .4byte gUnknown_03000740 - thumb_func_end sub_80E9198 - - thumb_func_start sub_80E91A4 -sub_80E91A4: @ 80E91A4 - ldr r0, _080E91AC @ =gUnknown_03000740 - ldrb r0, [r0] - bx lr - .align 2, 0 -_080E91AC: .4byte gUnknown_03000740 - thumb_func_end sub_80E91A4 - - thumb_func_start sub_80E91B0 -sub_80E91B0: @ 80E91B0 - push {lr} - sub sp, 0x8 - lsls r2, 24 - lsls r1, 27 - lsrs r1, 24 - lsrs r2, 21 - lsls r3, 27 - lsrs r3, 24 - str r3, [sp] - movs r3, 0x1 - str r3, [sp, 0x4] - movs r3, 0xB0 - bl sub_8072AB0 - add sp, 0x8 - pop {r0} - bx r0 - thumb_func_end sub_80E91B0 - - thumb_func_start sub_80E91D4 -sub_80E91D4: @ 80E91D4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r0, _080E91FC @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - cmp r4, 0xA - bne _080E9200 - movs r0, 0x3 - movs r1, 0xE - movs r2, 0x1A - movs r3, 0x13 - bl MenuZeroFillWindowRect - movs r0, 0xA - bl sub_80E9198 - b _080E935C - .align 2, 0 -_080E91FC: .4byte gWindowConfig_81E6DA8 -_080E9200: - bl sub_80E91A4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xA - bne _080E9218 - movs r0, 0x3 - movs r1, 0xE - movs r2, 0x1A - movs r3, 0x13 - bl MenuDrawTextWindow -_080E9218: - adds r0, r4, 0 - bl sub_80E9198 - cmp r4, 0x9 - bls _080E9224 - b _080E935C -_080E9224: - lsls r0, r4, 2 - ldr r1, _080E9230 @ =_080E9234 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9230: .4byte _080E9234 - .align 2, 0 -_080E9234: - .4byte _080E925C - .4byte _080E9284 - .4byte _080E92AC - .4byte _080E92C4 - .4byte _080E92F0 - .4byte _080E9308 - .4byte _080E9310 - .4byte _080E9318 - .4byte _080E933C - .4byte _080E9350 -_080E925C: - ldr r0, _080E9278 @ =gUnknown_083DB694 - ldr r4, [r0] - ldr r1, _080E927C @ =0x00009fac - adds r0, r4, r1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E9280 @ =0x00009ff5 - adds r4, r0 - adds r0, r4, 0 - b _080E9326 - .align 2, 0 -_080E9278: .4byte gUnknown_083DB694 -_080E927C: .4byte 0x00009fac -_080E9280: .4byte 0x00009ff5 -_080E9284: - ldr r0, _080E92A0 @ =gUnknown_083DB694 - ldr r4, [r0] - ldr r1, _080E92A4 @ =0x0000a03e - adds r0, r4, r1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E92A8 @ =0x0000a087 - adds r4, r0 - adds r0, r4, 0 - b _080E9326 - .align 2, 0 -_080E92A0: .4byte gUnknown_083DB694 -_080E92A4: .4byte 0x0000a03e -_080E92A8: .4byte 0x0000a087 -_080E92AC: - ldr r0, _080E92BC @ =gOtherText_TextDeletedConfirmPage1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E92C0 @ =gOtherText_TextDeletedConfirmPage2 - b _080E9326 - .align 2, 0 -_080E92BC: .4byte gOtherText_TextDeletedConfirmPage1 -_080E92C0: .4byte gOtherText_TextDeletedConfirmPage2 -_080E92C4: - ldr r0, _080E92D8 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0x4 - beq _080E92E0 - cmp r0, 0x9 - bne _080E92E8 - ldr r0, _080E92DC @ =gOtherText_QuitGivingInfo - b _080E933E - .align 2, 0 -_080E92D8: .4byte gUnknown_083DB694 -_080E92DC: .4byte gOtherText_QuitGivingInfo -_080E92E0: - ldr r0, _080E92E4 @ =gOtherText_StopGivingMail - b _080E933E - .align 2, 0 -_080E92E4: .4byte gOtherText_StopGivingMail -_080E92E8: - ldr r0, _080E92EC @ =gOtherText_QuitEditing - b _080E933E - .align 2, 0 -_080E92EC: .4byte gOtherText_QuitEditing -_080E92F0: - ldr r0, _080E9300 @ =gOtherText_EditedTextNoSavePage1 - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E9304 @ =gOtherText_EditedTextNoSavePage2 - b _080E9326 - .align 2, 0 -_080E9300: .4byte gOtherText_EditedTextNoSavePage1 -_080E9304: .4byte gOtherText_EditedTextNoSavePage2 -_080E9308: - ldr r0, _080E930C @ =gOtherText_EnterAPhraseOrWord - b _080E933E - .align 2, 0 -_080E930C: .4byte gOtherText_EnterAPhraseOrWord -_080E9310: - ldr r0, _080E9314 @ =gOtherText_TextNoDelete - b _080E933E - .align 2, 0 -_080E9314: .4byte gOtherText_TextNoDelete -_080E9318: - ldr r0, _080E9334 @ =gOtherText_OnlyOnePhrase - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x2 - bl sub_80E91B0 - ldr r0, _080E9338 @ =gOtherText_OriginalSongRestored -_080E9326: - movs r1, 0x4 - movs r2, 0x11 - movs r3, 0x2 - bl sub_80E91B0 - b _080E935C - .align 2, 0 -_080E9334: .4byte gOtherText_OnlyOnePhrase -_080E9338: .4byte gOtherText_OriginalSongRestored -_080E933C: - ldr r0, _080E934C @ =gOtherText_TrendyAlready -_080E933E: - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x4 - bl sub_80E91B0 - b _080E935C - .align 2, 0 -_080E934C: .4byte gOtherText_TrendyAlready -_080E9350: - ldr r0, _080E9364 @ =gOtherText_CombineTwoPhrases - movs r1, 0x4 - movs r2, 0xF - movs r3, 0x4 - bl sub_80E91B0 -_080E935C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E9364: .4byte gOtherText_CombineTwoPhrases - thumb_func_end sub_80E91D4 - - thumb_func_start sub_80E9368 -sub_80E9368: @ 80E9368 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xD - bhi _080E93F8 - lsls r0, 2 - ldr r1, _080E937C @ =_080E9380 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E937C: .4byte _080E9380 - .align 2, 0 -_080E9380: - .4byte _080E93B8 - .4byte _080E93C0 - .4byte _080E93C8 - .4byte _080E93D0 - .4byte _080E93F8 - .4byte _080E93E8 - .4byte _080E93D8 - .4byte _080E93E8 - .4byte _080E93E8 - .4byte _080E93E0 - .4byte _080E93E8 - .4byte _080E93E8 - .4byte _080E93E8 - .4byte _080E93F0 -_080E93B8: - ldr r4, _080E93BC @ =gOtherText_Profile - b _080E93FA - .align 2, 0 -_080E93BC: .4byte gOtherText_Profile -_080E93C0: - ldr r4, _080E93C4 @ =gOtherText_AtBattleStart - b _080E93FA - .align 2, 0 -_080E93C4: .4byte gOtherText_AtBattleStart -_080E93C8: - ldr r4, _080E93CC @ =gOtherText_UponWinningBattle - b _080E93FA - .align 2, 0 -_080E93CC: .4byte gOtherText_UponWinningBattle -_080E93D0: - ldr r4, _080E93D4 @ =gOtherText_UponLosingBattle - b _080E93FA - .align 2, 0 -_080E93D4: .4byte gOtherText_UponLosingBattle -_080E93D8: - ldr r4, _080E93DC @ =gOtherText_TheBardsSong - b _080E93FA - .align 2, 0 -_080E93DC: .4byte gOtherText_TheBardsSong -_080E93E0: - ldr r4, _080E93E4 @ =gOtherText_WhatsHipHappening - b _080E93FA - .align 2, 0 -_080E93E4: .4byte gOtherText_WhatsHipHappening -_080E93E8: - ldr r4, _080E93EC @ =gOtherText_Interview - b _080E93FA - .align 2, 0 -_080E93EC: .4byte gOtherText_Interview -_080E93F0: - ldr r4, _080E93F4 @ =gOtherText_GoodSaying - b _080E93FA - .align 2, 0 -_080E93F4: .4byte gOtherText_GoodSaying -_080E93F8: - movs r4, 0 -_080E93FA: - ldr r0, _080E943C @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E9440 @ =gUnknown_083DB694 - ldr r2, [r0] - ldr r0, _080E9444 @ =0x0000a2ba - adds r5, r2, r0 - movs r3, 0xFC - strb r3, [r5] - adds r0, 0x1 - adds r1, r2, r0 - movs r0, 0x5 - strb r0, [r1] - ldr r0, _080E9448 @ =0x0000a2bc - adds r1, r2, r0 - movs r0, 0x1 - strb r0, [r1] - cmp r4, 0 - beq _080E9450 - ldr r1, _080E944C @ =0x0000a2bd - adds r0, r2, r1 - adds r1, r4, 0 - movs r2, 0xF0 - movs r3, 0x2 - bl sub_8072C74 - adds r0, r5, 0 - movs r1, 0 - movs r2, 0 - bl MenuPrint - b _080E9476 - .align 2, 0 -_080E943C: .4byte gWindowConfig_81E6D8C -_080E9440: .4byte gUnknown_083DB694 -_080E9444: .4byte 0x0000a2ba -_080E9448: .4byte 0x0000a2bc -_080E944C: .4byte 0x0000a2bd -_080E9450: - ldr r0, _080E9484 @ =0x0000a2bd - adds r1, r2, r0 - strb r3, [r1] - movs r0, 0x11 - strb r0, [r1, 0x1] - movs r0, 0x10 - strb r0, [r1, 0x2] - movs r0, 0xFF - strb r0, [r1, 0x3] - adds r0, r5, 0 - movs r1, 0 - movs r2, 0 - bl MenuPrint - adds r0, r5, 0 - movs r1, 0x1C - movs r2, 0 - bl MenuPrint -_080E9476: - ldr r0, _080E9488 @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E9484: .4byte 0x0000a2bd -_080E9488: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E9368 - - thumb_func_start sub_80E948C -sub_80E948C: @ 80E948C - push {lr} - sub sp, 0x10 - ldr r0, _080E94A8 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bls _080E949C - b _080E9594 -_080E949C: - lsls r0, 2 - ldr r1, _080E94AC @ =_080E94B0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E94A8: .4byte gUnknown_083DB694 -_080E94AC: .4byte _080E94B0 - .align 2, 0 -_080E94B0: - .4byte _080E9508 - .4byte _080E9530 - .4byte _080E9554 - .4byte _080E9578 - .4byte _080E94C8 - .4byte _080E94E8 -_080E94C8: - ldr r0, _080E94E0 @ =0x06006800 - ldr r3, _080E94E4 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0x1A - str r1, [sp, 0x4] - movs r1, 0x18 - str r1, [sp, 0x8] - movs r1, 0x6 - str r1, [sp, 0xC] - movs r1, 0x3 - b _080E9568 - .align 2, 0 -_080E94E0: .4byte 0x06006800 -_080E94E4: .4byte gUnknown_08E94AD0 -_080E94E8: - ldr r0, _080E9500 @ =0x06006800 - ldr r3, _080E9504 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0x12 - str r1, [sp, 0x4] - movs r1, 0xD - str r1, [sp, 0x8] - movs r1, 0x8 - str r1, [sp, 0xC] - movs r1, 0xE - b _080E951E - .align 2, 0 -_080E9500: .4byte 0x06006800 -_080E9504: .4byte gUnknown_08E94AD0 -_080E9508: - ldr r0, _080E9528 @ =0x06006800 - ldr r3, _080E952C @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0xA - str r1, [sp, 0x4] - movs r1, 0x1A - str r1, [sp, 0x8] - movs r1, 0x8 - str r1, [sp, 0xC] - movs r1, 0x2 -_080E951E: - movs r2, 0x2 - bl sub_809D104 - b _080E9594 - .align 2, 0 -_080E9528: .4byte 0x06006800 -_080E952C: .4byte gUnknown_08E94AD0 -_080E9530: - ldr r0, _080E954C @ =0x06006800 - ldr r3, _080E9550 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r1, 0x1A - str r1, [sp, 0x8] - movs r1, 0xA - str r1, [sp, 0xC] - movs r1, 0x2 - movs r2, 0 - bl sub_809D104 - b _080E9594 - .align 2, 0 -_080E954C: .4byte 0x06006800 -_080E9550: .4byte gUnknown_08E94AD0 -_080E9554: - ldr r0, _080E9570 @ =0x06006800 - ldr r3, _080E9574 @ =gUnknown_08E94AD0 - movs r2, 0xD - str r2, [sp] - movs r1, 0x12 - str r1, [sp, 0x4] - str r2, [sp, 0x8] - movs r1, 0x4 - str r1, [sp, 0xC] - movs r1, 0xE -_080E9568: - movs r2, 0x3 - bl sub_809D104 - b _080E9594 - .align 2, 0 -_080E9570: .4byte 0x06006800 -_080E9574: .4byte gUnknown_08E94AD0 -_080E9578: - ldr r0, _080E959C @ =0x06006800 - ldr r3, _080E95A0 @ =gUnknown_08E94AD0 - movs r1, 0 - str r1, [sp] - movs r1, 0x20 - str r1, [sp, 0x4] - movs r1, 0x18 - str r1, [sp, 0x8] - movs r1, 0x4 - str r1, [sp, 0xC] - movs r1, 0x3 - movs r2, 0x2 - bl sub_809D104 -_080E9594: - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_080E959C: .4byte 0x06006800 -_080E95A0: .4byte gUnknown_08E94AD0 - thumb_func_end sub_80E948C - - thumb_func_start sub_80E95A4 -sub_80E95A4: @ 80E95A4 - push {lr} - ldr r0, _080E95C0 @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E95C4 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bhi _080E9612 - lsls r0, 2 - ldr r1, _080E95C8 @ =_080E95CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E95C0: .4byte gWindowConfig_81E6D8C -_080E95C4: .4byte gUnknown_083DB694 -_080E95C8: .4byte _080E95CC - .align 2, 0 -_080E95CC: - .4byte _080E95F2 - .4byte _080E95F6 - .4byte _080E9600 - .4byte _080E960A - .4byte _080E95E4 - .4byte _080E95EE -_080E95E4: - movs r0, 0x4 - movs r1, 0x6 - bl sub_80E9620 - b _080E9612 -_080E95EE: - movs r0, 0x2 - b _080E9602 -_080E95F2: - movs r0, 0x3 - b _080E95F8 -_080E95F6: - movs r0, 0 -_080E95F8: - movs r1, 0x5 - bl sub_80E9620 - b _080E9612 -_080E9600: - movs r0, 0x4 -_080E9602: - movs r1, 0x11 - bl sub_80E9620 - b _080E9612 -_080E960A: - movs r0, 0x3 - movs r1, 0x6 - bl sub_80E9620 -_080E9612: - ldr r0, _080E961C @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - pop {r0} - bx r0 - .align 2, 0 -_080E961C: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E95A4 - - thumb_func_start sub_80E9620 -sub_80E9620: @ 80E9620 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - lsls r0, 16 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp, 0x14] - movs r1, 0 - mov r10, r1 - lsrs r7, r0, 16 - mov r9, r1 - ldr r0, _080E9644 @ =gUnknown_083DB694 - ldr r0, [r0] - b _080E971A - .align 2, 0 -_080E9644: .4byte gUnknown_083DB694 -_080E9648: - ldr r6, [sp, 0x14] - movs r2, 0 - mov r8, r2 - adds r0, r7, 0x2 - str r0, [sp, 0x1C] - mov r1, r9 - adds r1, 0x1 - str r1, [sp, 0x18] - b _080E96E4 -_080E965A: - mov r2, r10 - lsls r0, r2, 1 - adds r1, r5, 0 - adds r1, 0xC - adds r1, r0 - ldrh r0, [r1] - ldr r2, _080E9690 @ =0x0000ffff - cmp r0, r2 - bne _080E969C - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - movs r1, 0x9 - str r1, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - str r1, [sp, 0x10] - ldr r0, _080E9694 @ =0x06007000 - adds r1, r6, 0 - adds r2, r7, 0 - ldr r3, _080E9698 @ =gUnknown_083DBE1C - bl sub_8095C8C - adds r0, r6, 0 - adds r0, 0xB - b _080E96CC - .align 2, 0 -_080E9690: .4byte 0x0000ffff -_080E9694: .4byte 0x06007000 -_080E9698: .4byte gUnknown_083DBE1C -_080E969C: - ldr r0, _080E9738 @ =0x0000a140 - adds r4, r5, r0 - ldrh r1, [r1] - adds r0, r4, 0 - movs r2, 0xB - bl sub_80EB218 - lsls r1, r6, 24 - lsrs r1, 24 - lsls r2, r7, 24 - lsrs r2, 24 - adds r0, r4, 0 - bl MenuPrint - mov r1, r9 - lsls r0, r1, 1 - add r0, r8 - adds r1, r5, 0 - adds r1, 0x8C - adds r1, r0 - adds r0, r6, 0 - adds r0, 0xB - ldrb r1, [r1] - adds r0, r1 -_080E96CC: - lsls r0, 16 - lsrs r6, r0, 16 - mov r0, r10 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 -_080E96E4: - ldr r0, _080E973C @ =gUnknown_083DB694 - ldr r5, [r0] - adds r0, r5, 0 - adds r0, 0x83 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r8, r0 - bge _080E970A - ldrb r2, [r5, 0xA] - cmp r10, r2 - bcc _080E965A - lsls r1, r6, 24 - lsrs r1, 24 - lsls r2, r7, 24 - lsrs r2, 24 - ldr r0, _080E9740 @ =gUnknown_083DBEA8 - bl MenuPrint -_080E970A: - ldr r1, [sp, 0x1C] - lsls r0, r1, 16 - lsrs r7, r0, 16 - ldr r2, [sp, 0x18] - lsls r0, r2, 16 - lsrs r0, 16 - mov r9, r0 - adds r0, r5, 0 -_080E971A: - adds r0, 0x84 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r9, r0 - blt _080E9648 - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9738: .4byte 0x0000a140 -_080E973C: .4byte gUnknown_083DB694 -_080E9740: .4byte gUnknown_083DBEA8 - thumb_func_end sub_80E9620 - - thumb_func_start sub_80E9744 -sub_80E9744: @ 80E9744 - push {lr} - ldr r0, _080E9760 @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E9764 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bhi _080E97B2 - lsls r0, 2 - ldr r1, _080E9768 @ =_080E976C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9760: .4byte gWindowConfig_81E6D8C -_080E9764: .4byte gUnknown_083DB694 -_080E9768: .4byte _080E976C - .align 2, 0 -_080E976C: - .4byte _080E9792 - .4byte _080E9796 - .4byte _080E97A0 - .4byte _080E97AA - .4byte _080E9784 - .4byte _080E978E -_080E9784: - movs r0, 0x4 - movs r1, 0x6 - bl sub_80E97C0 - b _080E97B2 -_080E978E: - movs r0, 0x2 - b _080E97A2 -_080E9792: - movs r0, 0x3 - b _080E9798 -_080E9796: - movs r0, 0 -_080E9798: - movs r1, 0x5 - bl sub_80E97C0 - b _080E97B2 -_080E97A0: - movs r0, 0x4 -_080E97A2: - movs r1, 0x11 - bl sub_80E97C0 - b _080E97B2 -_080E97AA: - movs r0, 0x3 - movs r1, 0x6 - bl sub_80E97C0 -_080E97B2: - ldr r0, _080E97BC @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow - pop {r0} - bx r0 - .align 2, 0 -_080E97BC: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E9744 - - thumb_func_start sub_80E97C0 -sub_80E97C0: @ 80E97C0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 16 - lsrs r5, r0, 16 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp] - movs r7, 0 - movs r3, 0 - ldr r1, _080E98B8 @ =gUnknown_083DB694 - ldr r0, [r1] - adds r0, 0x84 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r3, r0 - bge _080E98A6 -_080E97EA: - ldr r1, [r1] - ldr r0, _080E98BC @ =0x0000a19a - adds r2, r1, r0 - movs r6, 0 - adds r0, r1, 0 - adds r0, 0x83 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldr r4, [sp] - lsls r4, 24 - mov r8, r4 - lsls r4, r5, 24 - mov r9, r4 - adds r5, 0x2 - mov r10, r5 - adds r3, 0x1 - str r3, [sp, 0x4] - cmp r6, r0 - bge _080E985E - ldrb r1, [r1, 0xA] - cmp r7, r1 - bcs _080E985E - ldr r0, _080E98B8 @ =gUnknown_083DB694 - ldr r4, [r0] - ldr r5, _080E98C0 @ =0x0000ffff -_080E981E: - lsls r0, r7, 1 - adds r1, r4, 0 - adds r1, 0xC - adds r1, r0 - ldrh r0, [r1] - cmp r0, r5 - beq _080E983E - adds r1, r0, 0 - adds r0, r2, 0 - movs r2, 0 - bl sub_80EB218 - adds r2, r0, 0 - movs r0, 0 - strb r0, [r2] - adds r2, 0x1 -_080E983E: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r4, 0 - adds r0, 0x83 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r6, r0 - bge _080E985E - ldrb r0, [r4, 0xA] - cmp r7, r0 - bcc _080E981E -_080E985E: - ldr r1, _080E98B8 @ =gUnknown_083DB694 - ldr r4, [r1] - adds r0, r4, 0 - adds r0, 0x83 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0xB - muls r1, r0 - movs r0, 0xFC - strb r0, [r2] - movs r0, 0x13 - strb r0, [r2, 0x1] - lsls r1, 3 - strb r1, [r2, 0x2] - movs r0, 0xFF - strb r0, [r2, 0x3] - ldr r2, _080E98BC @ =0x0000a19a - adds r0, r4, r2 - mov r3, r8 - lsrs r1, r3, 24 - mov r3, r9 - lsrs r2, r3, 24 - bl MenuPrint - mov r1, r10 - lsls r0, r1, 16 - lsrs r5, r0, 16 - ldr r2, [sp, 0x4] - lsls r0, r2, 24 - lsrs r3, r0, 24 - ldr r1, _080E98B8 @ =gUnknown_083DB694 - adds r4, 0x84 - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r3, r0 - blt _080E97EA -_080E98A6: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E98B8: .4byte gUnknown_083DB694 -_080E98BC: .4byte 0x0000a19a -_080E98C0: .4byte 0x0000ffff - thumb_func_end sub_80E97C0 - - thumb_func_start sub_80E98C4 -sub_80E98C4: @ 80E98C4 - push {lr} - ldr r0, _080E98E0 @ =gWindowConfig_81E6D8C - bl BasicInitMenuWindow - ldr r0, _080E98E4 @ =gUnknown_083DB694 - ldr r0, [r0] - ldrb r0, [r0, 0x9] - cmp r0, 0x5 - bhi _080E9936 - lsls r0, 2 - ldr r1, _080E98E8 @ =_080E98EC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E98E0: .4byte gWindowConfig_81E6D8C -_080E98E4: .4byte gUnknown_083DB694 -_080E98E8: .4byte _080E98EC - .align 2, 0 -_080E98EC: - .4byte _080E990A - .4byte _080E9910 - .4byte _080E9916 - .4byte _080E991A - .4byte _080E9904 - .4byte _080E990A -_080E9904: - movs r1, 0x4 - movs r3, 0x2 - b _080E991E -_080E990A: - movs r1, 0x3 - movs r3, 0x2 - b _080E991E -_080E9910: - movs r1, 0x1 - movs r3, 0x3 - b _080E991E -_080E9916: - movs r1, 0x4 - b _080E991C -_080E991A: - movs r1, 0x3 -_080E991C: - movs r3, 0x1 -_080E991E: - lsls r3, 1 - adds r3, r1, r3 - subs r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0x2 - movs r2, 0x1B - bl MenuFillWindowRectWithBlankTile - ldr r0, _080E993C @ =gWindowConfig_81E6DA8 - bl BasicInitMenuWindow -_080E9936: - pop {r0} - bx r0 - .align 2, 0 -_080E993C: .4byte gWindowConfig_81E6DA8 - thumb_func_end sub_80E98C4 - - thumb_func_start sub_80E9940 -sub_80E9940: @ 80E9940 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r5, r1, 24 - lsrs r5, 24 - movs r4, 0x7 - ands r4, r5 - lsls r3, r4, 1 - adds r1, r3, 0 - adds r3, 0x1 - movs r0, 0x2 - movs r2, 0x1F - bl MenuFillWindowRectWithBlankTile - adds r0, r6, 0 - adds r1, r5, 0 - bl sub_80E9A7C - lsls r4, 1 - adds r0, r6, 0 - movs r1, 0x2 - adds r2, r4, 0 - bl sub_80E9A60 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80E9940 - - thumb_func_start sub_80E9974 -sub_80E9974: @ 80E9974 - push {r4-r6,lr} - ldr r0, _080E99C4 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - ldr r0, _080E99C8 @ =gUnknown_083DB694 - ldr r2, [r0] - adds r0, r2, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E99D4 - ldr r1, _080E99CC @ =0x000001b5 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r1, r0, 16 - lsrs r4, r1, 16 - adds r0, 0x4 - cmp r4, r0 - bge _080E9A02 - adds r5, r2, 0 - ldr r2, _080E99CC @ =0x000001b5 - adds r6, r5, r2 -_080E99A4: - lsls r1, r4, 24 - lsrs r1, 24 - ldr r2, _080E99D0 @ =0x0000a0f5 - adds r0, r5, r2 - bl sub_80E9940 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0 - ldrsb r0, [r6, r0] - adds r0, 0x4 - cmp r4, r0 - blt _080E99A4 - b _080E9A02 - .align 2, 0 -_080E99C4: .4byte gWindowConfig_81E6D54 -_080E99C8: .4byte gUnknown_083DB694 -_080E99CC: .4byte 0x000001b5 -_080E99D0: .4byte 0x0000a0f5 -_080E99D4: - bl sub_80E9AD4 - ldr r4, _080E9A08 @ =gUnknown_083DBEAC - ldr r0, [r4] - movs r1, 0x2 - movs r2, 0 - bl sub_80E9A60 - ldr r0, [r4, 0x4] - movs r1, 0x2 - movs r2, 0x2 - bl sub_80E9A60 - ldr r0, [r4, 0x8] - movs r1, 0x2 - movs r2, 0x4 - bl sub_80E9A60 - ldr r0, [r4, 0xC] - movs r1, 0x2 - movs r2, 0x6 - bl sub_80E9A60 -_080E9A02: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E9A08: .4byte gUnknown_083DBEAC - thumb_func_end sub_80E9974 - - thumb_func_start sub_80E9A14 -sub_80E9A14: @ 80E9A14 - push {lr} - bl sub_80E9A4C - ldr r0, _080E9A44 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0x26 - ldrb r0, [r0] - cmp r0, 0 - bne _080E9A40 - movs r0, 0xDD - lsls r0, 1 - adds r2, r1, r0 - ldr r3, _080E9A48 @ =0x000001b5 - adds r0, r1, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 4 - ldrh r1, [r2] - adds r0, r1 - strh r0, [r2] -_080E9A40: - pop {r0} - bx r0 - .align 2, 0 -_080E9A44: .4byte gUnknown_083DB694 -_080E9A48: .4byte 0x000001b5 - thumb_func_end sub_80E9A14 - - thumb_func_start sub_80E9A4C -sub_80E9A4C: @ 80E9A4C - ldr r0, _080E9A5C @ =gUnknown_083DB694 - ldr r0, [r0] - movs r2, 0xDD - lsls r2, 1 - adds r1, r0, r2 - movs r0, 0 - strh r0, [r1] - bx lr - .align 2, 0 -_080E9A5C: .4byte gUnknown_083DB694 - thumb_func_end sub_80E9A4C - - thumb_func_start sub_80E9A60 -sub_80E9A60: @ 80E9A60 - push {lr} - lsls r2, 16 - movs r3, 0xF0 - lsls r3, 12 - ands r3, r2 - lsls r1, 24 - lsrs r1, 24 - lsrs r3, 16 - adds r2, r3, 0 - bl MenuPrint - pop {r0} - bx r0 - thumb_func_end sub_80E9A60 - - thumb_func_start sub_80E9A7C -sub_80E9A7C: @ 80E9A7C - push {r4-r7,lr} - adds r2, r0, 0 - lsls r1, 16 - lsrs r7, r1, 16 - lsls r0, r7, 17 - lsrs r5, r0, 16 - movs r4, 0 - ldr r0, _080E9AD0 @ =gUnknown_083DB694 - ldr r6, [r0] -_080E9A8E: - movs r0, 0xFC - strb r0, [r2] - movs r0, 0x12 - strb r0, [r2, 0x1] - movs r0, 0x58 - muls r0, r4 - strb r0, [r2, 0x2] - adds r2, 0x3 - lsls r1, r7, 1 - adds r1, r4, r1 - adds r0, r6, 0 - adds r0, 0x2A - adds r0, r1 - ldrb r1, [r0] - adds r0, r2, 0 - movs r2, 0xB - bl sub_80EAD64 - adds r2, r0, 0 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r6, 0x28] - cmp r5, r0 - bcs _080E9ACA - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080E9A8E -_080E9ACA: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9AD0: .4byte gUnknown_083DB694 - thumb_func_end sub_80E9A7C - - thumb_func_start sub_80E9AD4 -sub_80E9AD4: @ 80E9AD4 - push {r4,lr} - ldr r0, _080E9AF4 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - movs r4, 0 -_080E9ADE: - adds r0, r4, 0 - bl sub_80E9C74 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0xF - bls _080E9ADE - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E9AF4: .4byte gWindowConfig_81E6D54 - thumb_func_end sub_80E9AD4 - - thumb_func_start sub_80E9AF8 -sub_80E9AF8: @ 80E9AF8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 16 - lsrs r7, r0, 16 - adds r0, r7, 0 - bl sub_80E9C74 - ldr r4, _080E9B7C @ =gUnknown_083DB694 - ldr r5, [r4] - ldr r0, _080E9B80 @ =0x0000a140 - adds r0, r5 - mov r8, r0 - movs r0, 0xFC - mov r1, r8 - strb r0, [r1] - movs r0, 0x11 - strb r0, [r1, 0x1] - movs r0, 0x10 - strb r0, [r1, 0x2] - ldr r2, _080E9B84 @ =0x0000a143 - adds r2, r5 - mov r8, r2 - adds r0, r5, 0 - adds r0, 0x7D - ldrb r0, [r0] - cmp r0, 0 - beq _080E9BF4 - movs r6, 0 - ldr r3, _080E9B88 @ =0x00009cd2 - adds r0, r5, r3 - adds r0, r7 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r6, r0 - blt _080E9B4A - b _080E9C52 -_080E9B4A: - lsls r0, r7, 2 - mov r9, r0 - ldr r1, _080E9B8C @ =0x00009d56 - adds r1, r5, r1 - str r1, [sp] - lsls r2, r7, 17 - mov r10, r2 -_080E9B58: - lsls r4, r6, 1 - mov r3, r9 - adds r0, r4, r3 - ldr r1, [sp] - adds r0, r1, r0 - ldrh r0, [r0] - bl sub_80EB2D4 - lsls r0, 16 - lsrs r0, 16 - adds r5, r4, 0 - cmp r0, 0x7 - bne _080E9B94 - ldr r0, _080E9B90 @ =gWindowConfig_81E6D70 - bl BasicInitMenuWindow - b _080E9B9A - .align 2, 0 -_080E9B7C: .4byte gUnknown_083DB694 -_080E9B80: .4byte 0x0000a140 -_080E9B84: .4byte 0x0000a143 -_080E9B88: .4byte 0x00009cd2 -_080E9B8C: .4byte 0x00009d56 -_080E9B90: .4byte gWindowConfig_81E6D70 -_080E9B94: - ldr r0, _080E9BE0 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow -_080E9B9A: - ldr r2, _080E9BE4 @ =gUnknown_083DB694 - ldr r4, [r2] - mov r3, r9 - adds r1, r5, r3 - ldr r2, _080E9BE8 @ =0x00009d56 - adds r0, r4, r2 - adds r0, r1 - ldrh r1, [r0] - mov r0, r8 - movs r2, 0x9 - bl sub_80EB218 - ldr r3, _080E9BEC @ =0x0000a140 - adds r0, r4, r3 - movs r1, 0xB - muls r1, r6 - adds r1, 0x4 - lsls r1, 16 - lsrs r1, 16 - mov r3, r10 - lsrs r2, r3, 16 - bl sub_80E9A60 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, _080E9BF0 @ =0x00009cd2 - adds r4, r0 - adds r4, r7 - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r6, r0 - blt _080E9B58 - b _080E9C52 - .align 2, 0 -_080E9BE0: .4byte gWindowConfig_81E6D54 -_080E9BE4: .4byte gUnknown_083DB694 -_080E9BE8: .4byte 0x00009d56 -_080E9BEC: .4byte 0x0000a140 -_080E9BF0: .4byte 0x00009cd2 -_080E9BF4: - ldr r0, _080E9C64 @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - movs r6, 0 - ldr r1, _080E9C68 @ =0x00009cd2 - adds r0, r5, r1 - adds r0, r7 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r6, r0 - bge _080E9C52 - adds r4, r5, 0 - adds r0, r4, r1 - adds r0, r7 - mov r9, r0 - lsls r5, r7, 17 -_080E9C16: - lsls r1, r6, 1 - lsls r0, r7, 2 - adds r1, r0 - ldr r2, _080E9C6C @ =0x00009d56 - adds r0, r4, r2 - adds r0, r1 - ldrh r1, [r0] - mov r0, r8 - movs r2, 0x9 - bl sub_80EB218 - movs r0, 0xB - adds r1, r6, 0 - muls r1, r0 - adds r1, 0x4 - lsls r1, 16 - lsrs r1, 16 - ldr r3, _080E9C70 @ =0x0000a140 - adds r0, r4, r3 - lsrs r2, r5, 16 - bl sub_80E9A60 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - mov r1, r9 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r6, r0 - blt _080E9C16 -_080E9C52: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9C64: .4byte gWindowConfig_81E6D54 -_080E9C68: .4byte 0x00009cd2 -_080E9C6C: .4byte 0x00009d56 -_080E9C70: .4byte 0x0000a140 - thumb_func_end sub_80E9AF8 - - thumb_func_start sub_80E9C74 -sub_80E9C74: @ 80E9C74 - push {lr} - lsls r0, 16 - movs r1, 0xE0 - lsls r1, 11 - ands r1, r0 - lsrs r1, 16 - lsls r3, r1, 1 - adds r1, r3, 0 - adds r3, 0x1 - movs r0, 0 - movs r2, 0x1D - bl MenuFillWindowRectWithBlankTile - pop {r0} - bx r0 - thumb_func_end sub_80E9C74 - - thumb_func_start sub_80E9C94 -sub_80E9C94: @ 80E9C94 - push {r4-r6,lr} - ldr r0, _080E9CAC @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r2, _080E9CB0 @ =0x00009d54 - adds r1, r0, r2 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0x3 - bgt _080E9CB4 - lsls r0, 16 - lsrs r0, 16 - b _080E9CB6 - .align 2, 0 -_080E9CAC: .4byte gUnknown_083DB694 -_080E9CB0: .4byte 0x00009d54 -_080E9CB4: - movs r0, 0x4 -_080E9CB6: - adds r5, r0, 0 - movs r4, 0 - cmp r4, r5 - bcs _080E9CF4 - ldr r0, _080E9CE0 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080E9CE4 @ =0x00009d55 - adds r6, r0, r1 -_080E9CC6: - movs r0, 0 - ldrsb r0, [r6, r0] - adds r0, r4, r0 - lsls r0, 16 - lsrs r0, 16 - bl sub_80E9AF8 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r5 - bcc _080E9CC6 - b _080E9CF4 - .align 2, 0 -_080E9CE0: .4byte gUnknown_083DB694 -_080E9CE4: .4byte 0x00009d55 -_080E9CE8: - adds r0, r4, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r4, r1, 16 - bl sub_80E9C74 -_080E9CF4: - cmp r4, 0x3 - bls _080E9CE8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80E9C94 - - thumb_func_start sub_80E9D00 -sub_80E9D00: @ 80E9D00 - push {r4-r6,lr} - ldr r0, _080E9D28 @ =gUnknown_083DB694 - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r1, r2, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - ble _080E9D30 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r1, _080E9D2C @ =0x00009d55 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x4 - b _080E9D46 - .align 2, 0 -_080E9D28: .4byte gUnknown_083DB694 -_080E9D2C: .4byte 0x00009d55 -_080E9D30: - movs r0, 0 - ldrsb r0, [r1, r0] - negs r0, r0 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r1, _080E9D74 @ =0x00009d55 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, r4 -_080E9D46: - lsls r0, 16 - lsrs r5, r0, 16 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, _080E9D78 @ =0x0000ffff - cmp r4, r0 - beq _080E9D6E - adds r6, r0, 0 -_080E9D58: - adds r0, r5, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r5, r1, 16 - bl sub_80E9AF8 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r6 - bne _080E9D58 -_080E9D6E: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E9D74: .4byte 0x00009d55 -_080E9D78: .4byte 0x0000ffff - thumb_func_end sub_80E9D00 - - thumb_func_start sub_80E9D7C -sub_80E9D7C: @ 80E9D7C - push {r4-r7,lr} - ldr r0, _080E9DAC @ =gWindowConfig_81E6D54 - bl BasicInitMenuWindow - ldr r0, _080E9DB0 @ =gUnknown_083DB694 - ldr r2, [r0] - movs r0, 0xE0 - lsls r0, 1 - adds r1, r2, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0 - bge _080E9DB8 - negs r0, r0 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, _080E9DB4 @ =0x000001b5 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - subs r0, r6 - b _080E9DCC - .align 2, 0 -_080E9DAC: .4byte gWindowConfig_81E6D54 -_080E9DB0: .4byte gUnknown_083DB694 -_080E9DB4: .4byte 0x000001b5 -_080E9DB8: - movs r0, 0 - ldrsb r0, [r1, r0] - lsls r0, 16 - lsrs r6, r0, 16 - ldr r1, _080E9DFC @ =0x000001b5 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, 0x4 -_080E9DCC: - lsls r0, 16 - lsrs r4, r0, 16 - movs r5, 0 - cmp r5, r6 - bcs _080E9DF6 - ldr r0, _080E9E00 @ =gUnknown_083DB694 - ldr r7, [r0] -_080E9DDA: - lsls r1, r4, 24 - lsrs r1, 24 - ldr r2, _080E9E04 @ =0x0000a0f5 - adds r0, r7, r2 - bl sub_80E9940 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, r6 - bcc _080E9DDA -_080E9DF6: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E9DFC: .4byte 0x000001b5 -_080E9E00: .4byte gUnknown_083DB694 -_080E9E04: .4byte 0x0000a0f5 - thumb_func_end sub_80E9D7C - - thumb_func_start sub_80E9E08 -sub_80E9E08: @ 80E9E08 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080E9E4C @ =gUnknown_083DB694 - ldr r3, [r0] - movs r0, 0xDD - lsls r0, 1 - adds r1, r3, r0 - movs r5, 0xE0 - lsls r5, 1 - adds r2, r3, r5 - movs r0, 0 - ldrsb r0, [r2, r0] - lsls r0, 4 - ldrh r1, [r1] - adds r0, r1 - movs r1, 0x7F - ands r0, r1 - subs r5, 0x4 - adds r1, r3, r5 - strh r0, [r1] - adds r1, r4, 0 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0 - bge _080E9E3E - negs r1, r4 -_080E9E3E: - ldr r2, _080E9E50 @ =0x000001bf - adds r0, r3, r2 - strb r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E9E4C: .4byte gUnknown_083DB694 -_080E9E50: .4byte 0x000001bf - thumb_func_end sub_80E9E08 - - thumb_func_start sub_80E9E54 -sub_80E9E54: @ 80E9E54 - push {r4,lr} - ldr r0, _080E9E8C @ =gUnknown_083DB694 - ldr r2, [r0] - movs r0, 0xDD - lsls r0, 1 - adds r3, r2, r0 - ldr r1, _080E9E90 @ =0x000001bf - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrh r4, [r3] - adds r0, r4 - movs r1, 0x7F - ands r0, r1 - strh r0, [r3] - movs r3, 0 - movs r4, 0xDE - lsls r4, 1 - adds r1, r2, r4 - ldrh r1, [r1] - cmp r0, r1 - bne _080E9E84 - movs r3, 0x1 -_080E9E84: - adds r0, r3, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080E9E8C: .4byte gUnknown_083DB694 -_080E9E90: .4byte 0x000001bf - thumb_func_end sub_80E9E54 - - thumb_func_start nullsub_23 -nullsub_23: @ 80E9E94 - bx lr - thumb_func_end nullsub_23 - - thumb_func_start sub_80E9E98 -sub_80E9E98: @ 80E9E98 - ldr r0, _080E9EA4 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - movs r1, 0 - strh r1, [r0] - bx lr - .align 2, 0 -_080E9EA4: .4byte gUnknown_083DB694 - thumb_func_end sub_80E9E98 - - thumb_func_start sub_80E9EA8 -sub_80E9EA8: @ 80E9EA8 - push {lr} - ldr r1, _080E9EC4 @ =gUnknown_083DB694 - ldr r0, [r1] - adds r0, 0xBE - ldrh r0, [r0] - adds r2, r1, 0 - cmp r0, 0x5 - bhi _080E9F48 - lsls r0, 2 - ldr r1, _080E9EC8 @ =_080E9ECC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9EC4: .4byte gUnknown_083DB694 -_080E9EC8: .4byte _080E9ECC - .align 2, 0 -_080E9ECC: - .4byte _080E9EE4 - .4byte _080E9EF4 - .4byte _080E9F0C - .4byte _080E9F24 - .4byte _080E9F38 - .4byte _080E9F44 -_080E9EE4: - bl sub_80EA24C - ldr r0, _080E9F08 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080E9EF4: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9F48 - bl sub_80EA4A4 - ldr r0, _080E9F08 @ =gUnknown_083DB694 - ldr r1, [r0] - b _080E9F3A - .align 2, 0 -_080E9F08: .4byte gUnknown_083DB694 -_080E9F0C: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9F48 - bl sub_80EA704 - ldr r0, _080E9F20 @ =gUnknown_083DB694 - ldr r1, [r0] - b _080E9F3A - .align 2, 0 -_080E9F20: .4byte gUnknown_083DB694 -_080E9F24: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9F48 - ldr r0, _080E9F34 @ =gUnknown_083DB694 - ldr r1, [r0] - b _080E9F3A - .align 2, 0 -_080E9F34: .4byte gUnknown_083DB694 -_080E9F38: - ldr r1, [r2] -_080E9F3A: - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080E9F48 -_080E9F44: - movs r0, 0x1 - b _080E9F4A -_080E9F48: - movs r0, 0 -_080E9F4A: - pop {r1} - bx r1 - thumb_func_end sub_80E9EA8 - - thumb_func_start sub_80E9F50 -sub_80E9F50: @ 80E9F50 - push {lr} - ldr r0, _080E9F68 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - ldrh r0, [r0] - cmp r0, 0x6 - bhi _080E9FCC - lsls r0, 2 - ldr r1, _080E9F6C @ =_080E9F70 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E9F68: .4byte gUnknown_083DB694 -_080E9F6C: .4byte _080E9F70 - .align 2, 0 -_080E9F70: - .4byte _080E9F8C - .4byte _080E9FAC - .4byte _080E9F96 - .4byte _080E9FAC - .4byte _080E9F9C - .4byte _080E9FAC - .4byte _080E9FC8 -_080E9F8C: - bl nullsub_23 - bl sub_80EA764 - b _080E9FA0 -_080E9F96: - bl sub_80EA5A0 - b _080E9FA0 -_080E9F9C: - bl sub_80EA348 -_080E9FA0: - ldr r0, _080E9FC4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080E9FAC: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080E9FCC - ldr r0, _080E9FC4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080E9FCC - .align 2, 0 -_080E9FC4: .4byte gUnknown_083DB694 -_080E9FC8: - movs r0, 0x1 - b _080E9FCE -_080E9FCC: - movs r0, 0 -_080E9FCE: - pop {r1} - bx r1 - thumb_func_end sub_80E9F50 - - thumb_func_start sub_80E9FD4 -sub_80E9FD4: @ 80E9FD4 - push {r4,lr} - ldr r0, _080E9FEC @ =gUnknown_083DB694 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0xBE - ldrh r0, [r4] - cmp r0, 0 - beq _080E9FF0 - cmp r0, 0x1 - beq _080E9FFE - b _080EA00C - .align 2, 0 -_080E9FEC: .4byte gUnknown_083DB694 -_080E9FF0: - bl nullsub_23 - bl sub_80EA5A0 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080E9FFE: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA00C - movs r0, 0x1 - b _080EA00E -_080EA00C: - movs r0, 0 -_080EA00E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80E9FD4 - - thumb_func_start sub_80EA014 -sub_80EA014: @ 80EA014 - push {r4,lr} - ldr r0, _080EA02C @ =gUnknown_083DB694 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0xBE - ldrh r0, [r4] - cmp r0, 0 - beq _080EA030 - cmp r0, 0x1 - beq _080EA03A - b _080EA048 - .align 2, 0 -_080EA02C: .4byte gUnknown_083DB694 -_080EA030: - bl sub_80EA4A4 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080EA03A: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA048 - movs r0, 0x1 - b _080EA04A -_080EA048: - movs r0, 0 -_080EA04A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80EA014 - - thumb_func_start sub_80EA050 -sub_80EA050: @ 80EA050 - push {lr} - ldr r0, _080EA068 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080EA0DC - lsls r0, 2 - ldr r1, _080EA06C @ =_080EA070 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080EA068: .4byte gUnknown_083DB694 -_080EA06C: .4byte _080EA070 - .align 2, 0 -_080EA070: - .4byte _080EA084 - .4byte _080EA08E - .4byte _080EA09E - .4byte _080EA0B4 - .4byte _080EA0D8 -_080EA084: - bl nullsub_23 - bl sub_80EA764 - b _080EA0C4 -_080EA08E: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA0DC - bl sub_80EA7F4 - b _080EA0C4 -_080EA09E: - movs r0, 0x1 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA0DC - bl sub_80EA8BC - b _080EA0C4 -_080EA0B4: - movs r0, 0x1 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA0DC -_080EA0C4: - ldr r0, _080EA0D4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080EA0DC - .align 2, 0 -_080EA0D4: .4byte gUnknown_083DB694 -_080EA0D8: - movs r0, 0x1 - b _080EA0DE -_080EA0DC: - movs r0, 0 -_080EA0DE: - pop {r1} - bx r1 - thumb_func_end sub_80EA050 - - thumb_func_start sub_80EA0E4 -sub_80EA0E4: @ 80EA0E4 - push {lr} - ldr r0, _080EA0FC @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBE - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080EA17C - lsls r0, 2 - ldr r1, _080EA100 @ =_080EA104 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080EA0FC: .4byte gUnknown_083DB694 -_080EA100: .4byte _080EA104 - .align 2, 0 -_080EA104: - .4byte _080EA118 - .4byte _080EA128 - .4byte _080EA144 - .4byte _080EA15C - .4byte _080EA178 -_080EA118: - bl sub_80EA948 - ldr r0, _080EA140 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] -_080EA128: - movs r0, 0x1 - negs r0, r0 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA17C - bl sub_80EAA44 - b _080EA166 - .align 2, 0 -_080EA140: .4byte gUnknown_083DB694 -_080EA144: - movs r0, 0x1 - negs r0, r0 - bl sub_80E9108 - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA17C - bl sub_80EA704 - b _080EA166 -_080EA15C: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA17C -_080EA166: - ldr r0, _080EA174 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080EA17C - .align 2, 0 -_080EA174: .4byte gUnknown_083DB694 -_080EA178: - movs r0, 0x1 - b _080EA17E -_080EA17C: - movs r0, 0 -_080EA17E: - pop {r1} - bx r1 - thumb_func_end sub_80EA0E4 - - thumb_func_start sub_80EA184 -sub_80EA184: @ 80EA184 - push {r4,lr} - ldr r0, _080EA1A0 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r4, r0, 0 - adds r4, 0xBE - ldrh r0, [r4] - cmp r0, 0x1 - beq _080EA1B4 - cmp r0, 0x1 - bgt _080EA1A4 - cmp r0, 0 - beq _080EA1AA - b _080EA1D8 - .align 2, 0 -_080EA1A0: .4byte gUnknown_083DB694 -_080EA1A4: - cmp r0, 0x2 - beq _080EA1D0 - b _080EA1D8 -_080EA1AA: - bl sub_80EAAD4 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] -_080EA1B4: - bl sub_80EA1E0 - lsls r0, 24 - cmp r0, 0 - beq _080EA1D8 - ldr r0, _080EA1CC @ =gUnknown_083DB694 - ldr r1, [r0] - adds r1, 0xBE - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _080EA1D8 - .align 2, 0 -_080EA1CC: .4byte gUnknown_083DB694 -_080EA1D0: - bl sub_80E9178 - movs r0, 0x1 - b _080EA1DA -_080EA1D8: - movs r0, 0 -_080EA1DA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80EA184 - thumb_func_start sub_80EA1E0 sub_80EA1E0: @ 80EA1E0 push {r4-r6,lr} -- cgit v1.2.3 From 737e1403b6b2578d768e2cc808c5b2c60cb3af49 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 00:18:16 -0600 Subject: decompile German code --- data/easy_chat.s | 28 --------- src/easy_chat_2.c | 169 +++++++++++------------------------------------------- 2 files changed, 33 insertions(+), 164 deletions(-) diff --git a/data/easy_chat.s b/data/easy_chat.s index 49972fbb3..d41ffccce 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,34 +8,6 @@ .section .rodata -.ifdef GERMAN -unk_83E7EB0: - .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}" -unk_83E7EC5: - .string "mehr$" -unk_83E7ECA:: - .string "{UNKNOWN_14 8} G H I J K L $" -unk_83E7EE1: - .string "{UNKNOWN_14 8} M N O P Q R S $" -unk_83E7EF8: - .string "{UNKNOWN_14 8} T U V W X Y Z $" -.endif - - .align 2 -gUnknown_083DBEAC:: @ 83DBEAC -.ifdef ENGLISH - .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others$", 0x20 - .string "{UNKNOWN_14 8} G H I J K L $", 0x20 - .string "{UNKNOWN_14 8} M N O P Q R S $", 0x20 - .string "{UNKNOWN_14 8} T U V W X Y Z $", 0x20 -.else - .4byte unk_83E7EB0 - .4byte unk_83E7ECA - .4byte unk_83E7EE1 - .4byte unk_83E7EF8 - .4byte unk_83E7EC5 -.endif - @ 83DBF2C .include "data/text/easy_chat/group_words.inc" diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 363cc49fa..e0e5d5cd4 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -451,7 +451,6 @@ void sub_80E872C(struct Sprite *sprite) } } -#if ENGLISH void sub_80E8760(struct Sprite *sprite) { if (gUnknown_083DB694->unk96 != 0) @@ -462,6 +461,12 @@ void sub_80E8760(struct Sprite *sprite) sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 64; sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; break; +#if GERMAN + case 1: + sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 28; + sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + break; +#endif case 2: sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 21; sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; @@ -469,63 +474,6 @@ void sub_80E8760(struct Sprite *sprite) } } } -#else -__attribute__((naked)) -void sub_80E8760(struct Sprite *sprite) -{ - asm(".syntax unified\n\ - push {lr}\n\ - adds r2, r0, 0\n\ - ldr r0, _080E8784 @ =gUnknown_083DB694\n\ - ldr r1, [r0]\n\ - adds r0, r1, 0\n\ - adds r0, 0x96\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080E87B2\n\ - movs r3, 0x32\n\ - ldrsh r0, [r2, r3]\n\ - cmp r0, 0x1\n\ - beq _080E8798\n\ - cmp r0, 0x1\n\ - bgt _080E8788\n\ - cmp r0, 0\n\ - beq _080E878E\n\ - b _080E87B2\n\ - .align 2, 0\n\ -_080E8784: .4byte gUnknown_083DB694\n\ -_080E8788:\n\ - cmp r0, 0x2\n\ - beq _080E87A2\n\ - b _080E87B2\n\ -_080E878E:\n\ - adds r1, 0x9C\n\ - ldr r0, [r1]\n\ - ldrh r0, [r0, 0x20]\n\ - adds r0, 0x40\n\ - b _080E87AA\n\ -_080E8798:\n\ - adds r1, 0x9C\n\ - ldr r0, [r1]\n\ - ldrh r0, [r0, 0x20]\n\ - adds r0, 0x1C\n\ - b _080E87AA\n\ -_080E87A2:\n\ - adds r1, 0x9C\n\ - ldr r0, [r1]\n\ - ldrh r0, [r0, 0x20]\n\ - adds r0, 0x15\n\ -_080E87AA:\n\ - strh r0, [r2, 0x20]\n\ - ldr r0, [r1]\n\ - ldrh r0, [r0, 0x22]\n\ - strh r0, [r2, 0x22]\n\ -_080E87B2:\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif void sub_80E87A4(u8 a) { @@ -1437,9 +1385,34 @@ void sub_80E9940(u8 *a, u8 b) sub_80E9A60(a, 2, r4 * 2); } -extern const u8 gUnknown_083DBEAC[][32]; - #if ENGLISH + +extern const u8 gUnknown_083DBEAC[][32] = +{ + __("{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others"), // missing terminator + _("{UNKNOWN_14 8} G H I J K L $"), + _("{UNKNOWN_14 8} M N O P Q R S $"), + _("{UNKNOWN_14 8} T U V W X Y Z $"), +}; + +#else + +const u8 unk_83E7EB0[] = __("{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}"); // missing terminator +const u8 unk_83E7EC5[] = _("mehr"); +const u8 unk_83E7ECA[] = _("{UNKNOWN_14 8} G H I J K L "); +const u8 unk_83E7EE1[] = _("{UNKNOWN_14 8} M N O P Q R S "); +const u8 unk_83E7EF8[] = _("{UNKNOWN_14 8} T U V W X Y Z "); +const u8 *const gUnknown_083DBEAC[] = +{ + unk_83E7EB0, + unk_83E7ECA, + unk_83E7EE1, + unk_83E7EF8, + unk_83E7EC5, +}; + +#endif + void sub_80E9974(void) { BasicInitMenuWindow(&gWindowConfig_81E6D54); @@ -1459,82 +1432,6 @@ void sub_80E9974(void) sub_80E9A60(gUnknown_083DBEAC[3], 2, 6); } } -#else -__attribute__((naked)) -void sub_80E9974(void) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - ldr r0, _080E99C4 @ =gWindowConfig_81E6D54\n\ - bl BasicInitMenuWindow\n\ - ldr r0, _080E99C8 @ =gUnknown_083DB694\n\ - ldr r2, [r0]\n\ - adds r0, r2, 0\n\ - adds r0, 0x26\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - bne _080E99D4\n\ - ldr r1, _080E99CC @ =0x000001b5\n\ - adds r0, r2, r1\n\ - ldrb r0, [r0]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - lsls r1, r0, 16\n\ - lsrs r4, r1, 16\n\ - adds r0, 0x4\n\ - cmp r4, r0\n\ - bge _080E9A02\n\ - adds r5, r2, 0\n\ - ldr r2, _080E99CC @ =0x000001b5\n\ - adds r6, r5, r2\n\ -_080E99A4:\n\ - lsls r1, r4, 24\n\ - lsrs r1, 24\n\ - ldr r2, _080E99D0 @ =0x0000a0f5\n\ - adds r0, r5, r2\n\ - bl sub_80E9940\n\ - adds r0, r4, 0x1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - movs r0, 0\n\ - ldrsb r0, [r6, r0]\n\ - adds r0, 0x4\n\ - cmp r4, r0\n\ - blt _080E99A4\n\ - b _080E9A02\n\ - .align 2, 0\n\ -_080E99C4: .4byte gWindowConfig_81E6D54\n\ -_080E99C8: .4byte gUnknown_083DB694\n\ -_080E99CC: .4byte 0x000001b5\n\ -_080E99D0: .4byte 0x0000a0f5\n\ -_080E99D4:\n\ - bl sub_80E9AD4\n\ - ldr r4, _080E9A08 @ =gUnknown_083DBEAC\n\ - ldr r0, [r4]\n\ - movs r1, 0x2\n\ - movs r2, 0\n\ - bl sub_80E9A60\n\ - ldr r0, [r4, 0x4]\n\ - movs r1, 0x2\n\ - movs r2, 0x2\n\ - bl sub_80E9A60\n\ - ldr r0, [r4, 0x8]\n\ - movs r1, 0x2\n\ - movs r2, 0x4\n\ - bl sub_80E9A60\n\ - ldr r0, [r4, 0xC]\n\ - movs r1, 0x2\n\ - movs r2, 0x6\n\ - bl sub_80E9A60\n\ -_080E9A02:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080E9A08: .4byte gUnknown_083DBEAC\n\ - .syntax divided\n"); -} -#endif void sub_80E9A14(void) { -- cgit v1.2.3 From 60e30230906b16ea40aa6ecc18890661169ce163 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 00:35:54 -0600 Subject: fix build --- src/easy_chat_2.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index e0e5d5cd4..bac1873cc 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1387,18 +1387,17 @@ void sub_80E9940(u8 *a, u8 b) #if ENGLISH -extern const u8 gUnknown_083DBEAC[][32] = +const u8 gUnknown_083DBEAC[][32] = { - __("{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others"), // missing terminator - _("{UNKNOWN_14 8} G H I J K L $"), - _("{UNKNOWN_14 8} M N O P Q R S $"), - _("{UNKNOWN_14 8} T U V W X Y Z $"), + _("{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others"), + _("{UNKNOWN_14 8} G H I J K L "), + _("{UNKNOWN_14 8} M N O P Q R S "), + _("{UNKNOWN_14 8} T U V W X Y Z "), }; #else -const u8 unk_83E7EB0[] = __("{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}"); // missing terminator -const u8 unk_83E7EC5[] = _("mehr"); +const u8 unk_83E7EB0[] = _("{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}mehr"); const u8 unk_83E7ECA[] = _("{UNKNOWN_14 8} G H I J K L "); const u8 unk_83E7EE1[] = _("{UNKNOWN_14 8} M N O P Q R S "); const u8 unk_83E7EF8[] = _("{UNKNOWN_14 8} T U V W X Y Z "); @@ -1408,7 +1407,7 @@ const u8 *const gUnknown_083DBEAC[] = unk_83E7ECA, unk_83E7EE1, unk_83E7EF8, - unk_83E7EC5, + unk_83E7EB0 + 21, // pointer to "mehr". What is this for? }; #endif -- cgit v1.2.3 From aed64560bc222e4ea5ccec266c0d77859a05eaac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 11:36:47 -0800 Subject: Add friendly macros for goto_if and call_if variants --- asm/macros/event.inc | 66 +++++++- data-de/event_scripts.s | 157 ++++++++---------- data-de/field_move_scripts.inc | 12 +- data/event_scripts.s | 157 ++++++++---------- data/field_move_scripts.inc | 12 +- data/scripts/cable_club.inc | 23 ++- data/scripts/contest_hall.inc | 131 ++++++++------- data/scripts/day_care.inc | 6 +- data/scripts/gabby_and_ty.inc | 18 +-- data/scripts/magma_chimney.inc | 14 +- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 6 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 9 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 36 ++--- .../maps/AbandonedShip_HiddenFloorRooms.inc | 14 +- data/scripts/maps/AncientTomb.inc | 9 +- data/scripts/maps/AquaHideout_1F.inc | 6 +- data/scripts/maps/AquaHideout_B1F.inc | 3 +- data/scripts/maps/BattleTower_Lobby.inc | 20 +-- data/scripts/maps/CaveOfOrigin_1F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B1F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B2F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B3F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 +- data/scripts/maps/DesertRuins.inc | 9 +- data/scripts/maps/DewfordTown.inc | 12 +- data/scripts/maps/DewfordTown_Gym.inc | 20 +-- data/scripts/maps/DewfordTown_Hall.inc | 7 +- data/scripts/maps/DewfordTown_House2.inc | 3 +- data/scripts/maps/EverGrandeCity.inc | 3 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 13 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 8 +- data/scripts/maps/FallarborTown.inc | 3 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 3 +- data/scripts/maps/FallarborTown_House1.inc | 15 +- data/scripts/maps/FallarborTown_House2.inc | 3 +- data/scripts/maps/FortreeCity.inc | 3 +- data/scripts/maps/FortreeCity_Gym.inc | 12 +- data/scripts/maps/FortreeCity_House1.inc | 5 +- data/scripts/maps/FortreeCity_House2.inc | 6 +- data/scripts/maps/FortreeCity_House4.inc | 9 +- data/scripts/maps/GraniteCave_1F.inc | 3 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/IslandCave.inc | 12 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 42 +++-- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 14 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 3 +- data/scripts/maps/LilycoveCity.inc | 65 +++----- data/scripts/maps/LilycoveCity_ContestLobby.inc | 19 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 6 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 3 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 22 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 17 +- data/scripts/maps/LilycoveCity_Harbor.inc | 23 ++- data/scripts/maps/LilycoveCity_House2.inc | 3 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 33 ++-- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 3 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 16 +- data/scripts/maps/LittlerootTown.inc | 103 ++++++------ .../maps/LittlerootTown_BrendansHouse_1F.inc | 11 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 5 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 21 ++- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 34 ++-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 20 ++- data/scripts/maps/MagmaHideout_B1F.inc | 3 +- data/scripts/maps/MauvilleCity.inc | 20 +-- data/scripts/maps/MauvilleCity_BikeShop.inc | 6 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 28 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 35 ++-- data/scripts/maps/MauvilleCity_House1.inc | 3 +- data/scripts/maps/MauvilleCity_House2.inc | 3 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 3 +- data/scripts/maps/MossdeepCity.inc | 6 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 20 +-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 36 ++--- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 3 +- data/scripts/maps/MossdeepCity_House4.inc | 3 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 7 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 10 +- data/scripts/maps/MtChimney.inc | 8 +- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/MtPyre_1F.inc | 3 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 37 ++--- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 9 +- data/scripts/maps/OldaleTown.inc | 18 +-- data/scripts/maps/OldaleTown_Mart.inc | 6 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 3 +- data/scripts/maps/PacifidlogTown_House2.inc | 18 +-- data/scripts/maps/PacifidlogTown_House3.inc | 5 +- data/scripts/maps/PetalburgCity.inc | 20 +-- data/scripts/maps/PetalburgCity_Gym.inc | 179 ++++++++++----------- data/scripts/maps/PetalburgCity_Mart.inc | 3 +- .../maps/PetalburgCity_PokemonCenter_1F.inc | 6 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 21 +-- data/scripts/maps/PetalburgWoods.inc | 3 +- data/scripts/maps/Route104.inc | 21 +-- data/scripts/maps/Route104_MrBrineysHouse.inc | 14 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 26 ++- data/scripts/maps/Route104_Prototype.inc | 30 ++-- data/scripts/maps/Route105.inc | 3 +- data/scripts/maps/Route109.inc | 6 +- data/scripts/maps/Route109_SeashoreHouse.inc | 15 +- data/scripts/maps/Route110.inc | 24 +-- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 6 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 83 +++++----- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 36 ++--- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 90 +++++------ data/scripts/maps/Route110_TrickHousePuzzle7.inc | 77 +++------ data/scripts/maps/Route111.inc | 26 ++- .../maps/Route111_WinstrateFamilysHouse.inc | 6 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route113.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 28 ++-- data/scripts/maps/Route114.inc | 6 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 3 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 3 +- data/scripts/maps/Route114_LanettesHouse.inc | 5 +- data/scripts/maps/Route116.inc | 28 ++-- data/scripts/maps/Route116_TunnelersRestHouse.inc | 3 +- data/scripts/maps/Route117.inc | 3 +- data/scripts/maps/Route118.inc | 9 +- data/scripts/maps/Route119.inc | 29 ++-- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 2 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 7 +- data/scripts/maps/Route120.inc | 48 +++--- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route123.inc | 3 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 21 +-- data/scripts/maps/Route124.inc | 3 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 11 +- data/scripts/maps/Route125.inc | 3 +- data/scripts/maps/Route126.inc | 3 +- data/scripts/maps/Route127.inc | 3 +- data/scripts/maps/Route128.inc | 3 +- data/scripts/maps/Route131.inc | 3 +- data/scripts/maps/RustboroCity.inc | 35 ++-- data/scripts/maps/RustboroCity_CuttersHouse.inc | 3 +- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 27 ++-- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 20 ++- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 11 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 3 +- data/scripts/maps/RustboroCity_Gym.inc | 14 +- data/scripts/maps/RustboroCity_House1.inc | 5 +- data/scripts/maps/RustboroCity_Mart.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 7 +- data/scripts/maps/RusturfTunnel.inc | 27 ++-- data/scripts/maps/SSTidalCorridor.inc | 25 ++- data/scripts/maps/SSTidalRooms.inc | 3 +- data/scripts/maps/SafariZone_Southeast.inc | 2 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 3 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 6 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 8 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 45 ++---- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 9 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SkyPillar_Top.inc | 3 +- data/scripts/maps/SlateportCity.inc | 43 +++-- data/scripts/maps/SlateportCity_ContestHall.inc | 3 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 3 +- data/scripts/maps/SlateportCity_Harbor.inc | 32 ++-- data/scripts/maps/SlateportCity_House1.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 5 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 47 +++--- .../maps/SlateportCity_SternsShipyard_1F.inc | 12 +- data/scripts/maps/SootopolisCity.inc | 38 ++--- data/scripts/maps/SootopolisCity_Gym_1F.inc | 21 +-- data/scripts/maps/SootopolisCity_House1.inc | 3 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 5 +- data/scripts/maps/SootopolisCity_Mart.inc | 12 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 12 +- data/scripts/maps/SouthernIsland_Interior.inc | 9 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 6 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 14 +- data/scripts/maps/VerdanturfTown.inc | 6 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 3 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 24 +-- data/scripts/maps/VictoryRoad_1F.inc | 3 +- data/scripts/mystery_event_club.inc | 13 +- data/scripts/players_house.inc | 42 +++-- data/scripts/pokeblocks.inc | 10 +- data/scripts/safari_zone.inc | 4 +- data/scripts/secret_power_tm.inc | 6 +- data/scripts/tv.inc | 10 +- 197 files changed, 1418 insertions(+), 1910 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index cf4c9628a..b29af7a04 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1361,10 +1361,74 @@ @ Supplementary - .macro goto_if_eq dest + .macro goto_if_unset flag, dest + checkflag \flag + goto_if 0, \dest + .endm + + .macro goto_if_set flag, dest + checkflag \flag + goto_if 1, \dest + .endm + + .macro goto_if_lt dest @ LESS THAN + goto_if 0, \dest + .endm + + .macro goto_if_eq dest @ EQUAL goto_if 1, \dest .endm + .macro goto_if_gt dest @ GREATER THAN + goto_if 2, \dest + .endm + + .macro goto_if_le dest @ LESS THAN OR EQUAL + goto_if 3, \dest + .endm + + .macro goto_if_ge dest @ GREATER THAN OR EQUAL + goto_if 4, \dest + .endm + + .macro goto_if_ne dest @ NOT EQUAL + goto_if 5, \dest + .endm + + .macro call_if_unset flag, dest + checkflag \flag + call_if 0, \dest + .endm + + .macro call_if_set flag, dest + checkflag \flag + call_if 1, \dest + .endm + + .macro call_if_lt dest @ LESS THAN + call_if 0, \dest + .endm + + .macro call_if_eq dest @ EQUAL + call_if 1, \dest + .endm + + .macro call_if_gt dest @ GREATER THAN + call_if 2, \dest + .endm + + .macro call_if_le dest @ LESS THAN OR EQUAL + call_if 3, \dest + .endm + + .macro call_if_ge dest @ GREATER THAN OR EQUAL + call_if 4, \dest + .endm + + .macro call_if_ne dest @ NOT EQUAL + call_if 5, \dest + .endm + .macro switch var copyvar VAR_SPECIAL_0, \var .endm diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 020c9a97d..18fb0a64d 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -410,8 +410,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag FLAG_DECORATION_16 - goto_if_eq EventScript_15F3A0 + goto_if_set FLAG_DECORATION_16, EventScript_15F3A0 goto EventScript_15F3E2 end @@ -954,7 +953,7 @@ gUnknown_0819F818:: @ 819F818 waitmovement 0 specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - goto_if 5, EventScript_19F83F + goto_if_ne EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -968,10 +967,10 @@ gUnknown_0819F840:: @ 819F840 call EventScript_19F8E5 specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - goto_if 5, EventScript_19F877 + goto_if_ne EventScript_19F877 special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, EventScript_19F870 + goto_if_ne EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -1017,7 +1016,7 @@ gUnknown_0819F8AE:: @ 819F8AE goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, EventScript_19F8DE + goto_if_ne EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech @@ -1308,14 +1307,10 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR special sub_810FAA0 - checkflag FLAG_RECEIVED_SS_TICKET - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 - checkflag FLAG_LATIOS_OR_LATIAS_ROAMING - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 - checkflag FLAG_RECEIVED_BELDUM - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A - checkflag FLAG_RECEIVED_HM08 - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62 + call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70 + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A + call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E return EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A @@ -1343,10 +1338,8 @@ S_WhiteOut:: @ 819FC74 end EventScript_19FC84: - checkflag FLAG_RECEIVED_GO_GOGGLES - goto_if_eq Route101_EventScript_1A14DC - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if 0, Route101_EventScript_1A14DC + goto_if_set FLAG_RECEIVED_GO_GOGGLES, Route101_EventScript_1A14DC + goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Route101_EventScript_1A14DC clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 return @@ -1409,16 +1402,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B - checkflag FLAG_RECEIVED_POKENAV - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 - checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F - checkflag FLAG_HIDE_MR_BRINEY_ROUTE109 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 + goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, OldaleTown_PokemonCenter_1F_EventScript_19FD49 + goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_19FD4F + goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49 @@ -1467,8 +1455,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty - checkflag FLAG_POKERUS_EXPLAINED - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE + goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1516,9 +1503,9 @@ Std_ObtainItem_: @ 819FE07 checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket compare VAR_SPECIAL_7, 0x1 - call_if 1, Std_ObtainItem_Success + call_if_eq Std_ObtainItem_Success compare VAR_SPECIAL_7, 0x0 - call_if 1, Std_ObtainItem_Fail + call_if_eq Std_ObtainItem_Fail return GetItem_HandlePocket: @@ -1533,31 +1520,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstdstring 2, 0xE compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstdstring 2, 0xF compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstdstring 2, 0x10 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstdstring 2, 0x11 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetTMHMFanfare + call_if_eq PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstdstring 2, 0x12 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return Std_ObtainItem_Success: @ 819FEB7 @@ -1589,9 +1576,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecorationname 1, VAR_SPECIAL_0 compare VAR_SPECIAL_7, 1 - call_if 1, Std_ObtainDecoration_Success + call_if_eq Std_ObtainDecoration_Success compare VAR_SPECIAL_7, 0 - call_if 1, Std_ObtainDecoration_Fail + call_if_eq Std_ObtainDecoration_Fail return Std_ObtainDecoration_Success: @ 819FF03 @@ -1617,9 +1604,9 @@ Std_FindItem: @ 819FF21 checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket compare VAR_SPECIAL_7, 1 - call_if 1, Std_FindItem_Success + call_if_eq Std_FindItem_Success compare VAR_SPECIAL_7, 0 - call_if 1, Std_FindItem_Fail + call_if_eq Std_FindItem_Fail release return @@ -1724,10 +1711,8 @@ EventScript_1A0070: EventScript_1A0085: playse SE_PC_LOGON - checkflag FLAG_SYS_PC_LANETTE - call_if 0, EventScript_1A00AC - checkflag FLAG_SYS_PC_LANETTE - call_if 1, EventScript_1A00B5 + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_1A00AC + call_if_set FLAG_SYS_PC_LANETTE, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem waitstate @@ -1750,8 +1735,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, EventScript_1A00BE + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A00BE playse SE_PC_LOGON special AccessHallOfFamePC waitstate @@ -2156,21 +2140,21 @@ Route103_EventScript_1A02F4:: @ 81A02F4 compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_1A14DC compare VAR_BIRCH_STATE, 0 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 1 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 2 - call_if 1, Route101_EventScript_1A0365 + call_if_eq Route101_EventScript_1A0365 compare VAR_BIRCH_STATE, 3 - call_if 1, Route101_EventScript_1A0365 + call_if_eq Route101_EventScript_1A0365 compare VAR_BIRCH_STATE, 4 - call_if 1, Route101_EventScript_1A0372 + call_if_eq Route101_EventScript_1A0372 compare VAR_BIRCH_STATE, 5 - call_if 1, Route101_EventScript_1A0372 + call_if_eq Route101_EventScript_1A0372 compare VAR_BIRCH_STATE, 6 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 7 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 return Route101_EventScript_1A0358:: @ 81A0358 @@ -2297,9 +2281,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 1 - call_if 1, BattleTower_Outside_EventScript_160B2F + call_if_eq BattleTower_Outside_EventScript_160B2F compare FACING, 3 - call_if 1, BattleTower_Outside_EventScript_160B3A + call_if_eq BattleTower_Outside_EventScript_160B3A delay 30 hideobjectat 255, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E @@ -2467,19 +2451,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare VAR_SPECIAL_4, 1 - call_if 1, Route119_EventScript_1A0646 + call_if_eq Route119_EventScript_1A0646 compare VAR_SPECIAL_4, 2 - call_if 1, Route119_EventScript_1A064A + call_if_eq Route119_EventScript_1A064A compare VAR_SPECIAL_4, 3 - call_if 1, Route119_EventScript_1A064E + call_if_eq Route119_EventScript_1A064E compare VAR_SPECIAL_4, 4 - call_if 1, Route119_EventScript_1A0652 + call_if_eq Route119_EventScript_1A0652 compare VAR_SPECIAL_4, 5 - call_if 1, Route119_EventScript_1A0656 + call_if_eq Route119_EventScript_1A0656 compare VAR_SPECIAL_4, 6 - call_if 1, Route119_EventScript_1A065A + call_if_eq Route119_EventScript_1A065A compare VAR_SPECIAL_4, 7 - call_if 1, Route119_EventScript_1A065E + call_if_eq Route119_EventScript_1A065E setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE @@ -3965,8 +3949,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3086 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock @@ -4000,8 +3983,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3102 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock @@ -4035,8 +4017,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A317E + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock @@ -4070,8 +4051,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A31FA + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock @@ -4105,8 +4085,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3276 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock @@ -4140,8 +4119,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock @@ -4175,8 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A336E + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock @@ -4210,8 +4187,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A33EA + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock @@ -4245,8 +4221,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3466 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock @@ -4280,8 +4255,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock @@ -4472,8 +4446,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO compare RESULT, YES @@ -4601,8 +4574,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E + goto_if_set FLAG_TEMP_2, FallarborTown_ContestLobby_EventScript_1AE17E setvar VAR_SPECIAL_5, 6 special InterviewBefore compare RESULT, 1 @@ -4662,7 +4634,7 @@ LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 - goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE + goto_if_ne FallarborTown_ContestLobby_EventScript_1AE1FE setvar VAR_SPECIAL_5, 6 special InterviewBefore compare RESULT, 1 @@ -4698,8 +4670,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF lock faceplayer - checkflag FLAG_TEMP_2 - goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 + goto_if_set FLAG_TEMP_2, BattleTower_Lobby_EventScript_1AE2E3 setvar VAR_SPECIAL_5, 7 special InterviewBefore compare RESULT, 1 @@ -4718,9 +4689,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 multichoice 19, 8, 45, 1 copyvar VAR_SPECIAL_8, RESULT compare RESULT, 0 - call_if 1, BattleTower_Lobby_EventScript_1AE2A1 + call_if_eq BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 - call_if 1, BattleTower_Lobby_EventScript_1AE2AA + call_if_eq BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar VAR_SPECIAL_4, 12 copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 91f6ca620..86a4d1b24 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -1,7 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag FLAG_BADGE01_GET - goto_if 0, CannotUseCut + goto_if_unset FLAG_BADGE01_GET, CannotUseCut checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut @@ -61,8 +60,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag FLAG_BADGE03_GET - goto_if 0, CannotUseRockSmash + goto_if_unset FLAG_BADGE03_GET, CannotUseRockSmash checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash @@ -128,10 +126,8 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag FLAG_BADGE04_GET - goto_if 0, CannotUseStrength - checkflag FLAG_SYS_USE_STRENGTH - goto_if_eq AlreadyUsedStrength + goto_if_unset FLAG_BADGE04_GET, CannotUseStrength + goto_if_set FLAG_SYS_USE_STRENGTH, AlreadyUsedStrength checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength diff --git a/data/event_scripts.s b/data/event_scripts.s index 1ed419b52..1c8cff8d6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -410,8 +410,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag FLAG_DECORATION_16 - goto_if_eq EventScript_15F3A0 + goto_if_set FLAG_DECORATION_16, EventScript_15F3A0 goto EventScript_15F3E2 end @@ -948,7 +947,7 @@ gUnknown_0819F818:: @ 819F818 waitmovement 0 specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - goto_if 5, EventScript_19F83F + goto_if_ne EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -962,10 +961,10 @@ gUnknown_0819F840:: @ 819F840 call EventScript_19F8E5 specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - goto_if 5, EventScript_19F877 + goto_if_ne EventScript_19F877 special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, EventScript_19F870 + goto_if_ne EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -1011,7 +1010,7 @@ gUnknown_0819F8AE:: @ 819F8AE goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, EventScript_19F8DE + goto_if_ne EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech @@ -1302,14 +1301,10 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR special sub_810FAA0 - checkflag FLAG_RECEIVED_SS_TICKET - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 - checkflag FLAG_LATIOS_OR_LATIAS_ROAMING - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 - checkflag FLAG_RECEIVED_BELDUM - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A - checkflag FLAG_RECEIVED_HM08 - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62 + call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70 + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A + call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E return EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A @@ -1337,10 +1332,8 @@ S_WhiteOut:: @ 819FC74 end EventScript_19FC84: - checkflag FLAG_RECEIVED_GO_GOGGLES - goto_if_eq Route101_EventScript_1A14DC - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if 0, Route101_EventScript_1A14DC + goto_if_set FLAG_RECEIVED_GO_GOGGLES, Route101_EventScript_1A14DC + goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Route101_EventScript_1A14DC clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 return @@ -1403,16 +1396,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B - checkflag FLAG_RECEIVED_POKENAV - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 - checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F - checkflag FLAG_HIDE_MR_BRINEY_ROUTE109 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 + goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, OldaleTown_PokemonCenter_1F_EventScript_19FD49 + goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_19FD4F + goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49 @@ -1461,8 +1449,7 @@ do_heal_party:: @ 819FD7C applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty - checkflag FLAG_POKERUS_EXPLAINED - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE + goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1510,9 +1497,9 @@ Std_ObtainItem_: @ 819FE07 checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket compare VAR_SPECIAL_7, 0x1 - call_if 1, Std_ObtainItem_Success + call_if_eq Std_ObtainItem_Success compare VAR_SPECIAL_7, 0x0 - call_if 1, Std_ObtainItem_Fail + call_if_eq Std_ObtainItem_Fail return GetItem_HandlePocket: @@ -1527,31 +1514,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstdstring 2, 0xE compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstdstring 2, 0xF compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstdstring 2, 0x10 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstdstring 2, 0x11 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetTMHMFanfare + call_if_eq PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstdstring 2, 0x12 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return Std_ObtainItem_Success: @ 819FEB7 @@ -1583,9 +1570,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecorationname 1, VAR_SPECIAL_0 compare VAR_SPECIAL_7, 1 - call_if 1, Std_ObtainDecoration_Success + call_if_eq Std_ObtainDecoration_Success compare VAR_SPECIAL_7, 0 - call_if 1, Std_ObtainDecoration_Fail + call_if_eq Std_ObtainDecoration_Fail return Std_ObtainDecoration_Success: @ 819FF03 @@ -1611,9 +1598,9 @@ Std_FindItem: @ 819FF21 checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket compare VAR_SPECIAL_7, 1 - call_if 1, Std_FindItem_Success + call_if_eq Std_FindItem_Success compare VAR_SPECIAL_7, 0 - call_if 1, Std_FindItem_Fail + call_if_eq Std_FindItem_Fail release return @@ -1718,10 +1705,8 @@ EventScript_1A0070: EventScript_1A0085: playse SE_PC_LOGON - checkflag FLAG_SYS_PC_LANETTE - call_if 0, EventScript_1A00AC - checkflag FLAG_SYS_PC_LANETTE - call_if 1, EventScript_1A00B5 + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_1A00AC + call_if_set FLAG_SYS_PC_LANETTE, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem waitstate @@ -1744,8 +1729,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, EventScript_1A00BE + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A00BE playse SE_PC_LOGON special AccessHallOfFamePC waitstate @@ -2150,21 +2134,21 @@ Route103_EventScript_1A02F4:: @ 81A02F4 compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_1A14DC compare VAR_BIRCH_STATE, 0 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 1 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 2 - call_if 1, Route101_EventScript_1A0365 + call_if_eq Route101_EventScript_1A0365 compare VAR_BIRCH_STATE, 3 - call_if 1, Route101_EventScript_1A0365 + call_if_eq Route101_EventScript_1A0365 compare VAR_BIRCH_STATE, 4 - call_if 1, Route101_EventScript_1A0372 + call_if_eq Route101_EventScript_1A0372 compare VAR_BIRCH_STATE, 5 - call_if 1, Route101_EventScript_1A0372 + call_if_eq Route101_EventScript_1A0372 compare VAR_BIRCH_STATE, 6 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 7 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 return Route101_EventScript_1A0358:: @ 81A0358 @@ -2291,9 +2275,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 1 - call_if 1, BattleTower_Outside_EventScript_160B2F + call_if_eq BattleTower_Outside_EventScript_160B2F compare FACING, 3 - call_if 1, BattleTower_Outside_EventScript_160B3A + call_if_eq BattleTower_Outside_EventScript_160B3A delay 30 hideobjectat 255, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E @@ -2461,19 +2445,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare VAR_SPECIAL_4, 1 - call_if 1, Route119_EventScript_1A0646 + call_if_eq Route119_EventScript_1A0646 compare VAR_SPECIAL_4, 2 - call_if 1, Route119_EventScript_1A064A + call_if_eq Route119_EventScript_1A064A compare VAR_SPECIAL_4, 3 - call_if 1, Route119_EventScript_1A064E + call_if_eq Route119_EventScript_1A064E compare VAR_SPECIAL_4, 4 - call_if 1, Route119_EventScript_1A0652 + call_if_eq Route119_EventScript_1A0652 compare VAR_SPECIAL_4, 5 - call_if 1, Route119_EventScript_1A0656 + call_if_eq Route119_EventScript_1A0656 compare VAR_SPECIAL_4, 6 - call_if 1, Route119_EventScript_1A065A + call_if_eq Route119_EventScript_1A065A compare VAR_SPECIAL_4, 7 - call_if 1, Route119_EventScript_1A065E + call_if_eq Route119_EventScript_1A065E setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE @@ -3944,8 +3928,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3086 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock @@ -3979,8 +3962,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3102 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock @@ -4014,8 +3996,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A317E + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock @@ -4049,8 +4030,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A31FA + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock @@ -4084,8 +4064,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3276 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock @@ -4119,8 +4098,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock @@ -4154,8 +4132,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A336E + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock @@ -4189,8 +4166,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A33EA + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock @@ -4224,8 +4200,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3466 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock @@ -4259,8 +4234,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock @@ -4440,8 +4414,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO compare RESULT, YES @@ -4569,8 +4542,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E + goto_if_set FLAG_TEMP_2, FallarborTown_ContestLobby_EventScript_1AE17E setvar VAR_SPECIAL_5, 6 special InterviewBefore compare RESULT, 1 @@ -4630,7 +4602,7 @@ LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 - goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE + goto_if_ne FallarborTown_ContestLobby_EventScript_1AE1FE setvar VAR_SPECIAL_5, 6 special InterviewBefore compare RESULT, 1 @@ -4666,8 +4638,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF lock faceplayer - checkflag FLAG_TEMP_2 - goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 + goto_if_set FLAG_TEMP_2, BattleTower_Lobby_EventScript_1AE2E3 setvar VAR_SPECIAL_5, 7 special InterviewBefore compare RESULT, 1 @@ -4686,9 +4657,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 multichoice 19, 8, 45, 1 copyvar VAR_SPECIAL_8, RESULT compare RESULT, 0 - call_if 1, BattleTower_Lobby_EventScript_1AE2A1 + call_if_eq BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 - call_if 1, BattleTower_Lobby_EventScript_1AE2AA + call_if_eq BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar VAR_SPECIAL_4, 12 copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index a4a7513e5..f5ba25643 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,7 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag FLAG_BADGE01_GET - goto_if 0, CannotUseCut + goto_if_unset FLAG_BADGE01_GET, CannotUseCut checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut @@ -58,8 +57,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag FLAG_BADGE03_GET - goto_if 0, CannotUseRockSmash + goto_if_unset FLAG_BADGE03_GET, CannotUseRockSmash checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash @@ -125,10 +123,8 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag FLAG_BADGE04_GET - goto_if 0, CannotUseStrength - checkflag FLAG_SYS_USE_STRENGTH - goto_if_eq AlreadyUsedStrength + goto_if_unset FLAG_BADGE04_GET, CannotUseStrength + goto_if_set FLAG_SYS_USE_STRENGTH, AlreadyUsedStrength checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 334a52382..0e2012de9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -174,8 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -282,7 +281,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 + goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar VAR_SPECIAL_4, 2 return @@ -346,8 +345,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -407,7 +405,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 2 - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 + goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_1A41E1 specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE @@ -443,8 +441,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B + goto_if_unset FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_1A434B copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -691,7 +688,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A442D:: @ 81A442D @@ -699,7 +696,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4442:: @ 81A4442 @@ -707,7 +704,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4457:: @ 81A4457 @@ -715,7 +712,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A446C:: @ 81A446C @@ -771,7 +768,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD RecordCorner_EventScript_1A44BC:: @ 81A44BC compare VAR_TEMP_0, 0 - goto_if 5, RecordCorner_EventScript_1A44D6 + goto_if_ne RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 waitmessage diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index af2c39979..7f0f6b710 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -6,11 +6,10 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 faceplayer checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 - call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD + call_if_eq FallarborTown_ContestLobby_EventScript_1A4EDD compare VAR_CONTEST_PRIZE_PICKUP, 0 - goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E - checkflag FLAG_TEMP_1 - goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F + goto_if_ne FallarborTown_ContestLobby_EventScript_1A4F4E + goto_if_set FLAG_TEMP_1, FallarborTown_ContestLobby_EventScript_1A4F8F bufferstdstring 0, VAR_SPECIAL_B msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 @@ -40,8 +39,7 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 end FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 - checkflag FLAG_RECEIVED_CONTEST_PASS - goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 + goto_if_set FLAG_RECEIVED_CONTEST_PASS, FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 giveitem_std ITEM_CONTEST_PASS setflag FLAG_RECEIVED_CONTEST_PASS @@ -288,7 +286,7 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5880 addvar VAR_SPECIAL_6, 1 compare VAR_SPECIAL_6, 4 - goto_if 5, LinkContestRoom1_EventScript_1A527A + goto_if_ne LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar VAR_TEMP_1, 6 return @@ -432,15 +430,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 compare VAR_CONTEST_LOCATION, 1 - call_if 1, LinkContestRoom1_EventScript_1A555A + call_if_eq LinkContestRoom1_EventScript_1A555A compare VAR_CONTEST_LOCATION, 2 - call_if 1, LinkContestRoom1_EventScript_1A55B8 + call_if_eq LinkContestRoom1_EventScript_1A55B8 compare VAR_CONTEST_LOCATION, 3 - call_if 1, LinkContestRoom1_EventScript_1A5616 + call_if_eq LinkContestRoom1_EventScript_1A5616 compare VAR_CONTEST_LOCATION, 4 - call_if 1, LinkContestRoom1_EventScript_1A5674 + call_if_eq LinkContestRoom1_EventScript_1A5674 compare VAR_CONTEST_LOCATION, 5 - call_if 1, LinkContestRoom1_EventScript_1A56D2 + call_if_eq LinkContestRoom1_EventScript_1A56D2 setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 setvar VAR_TEMP_3, 9 @@ -450,7 +448,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 setvar VAR_TEMP_7, 9 setvar VAR_TEMP_8, 9 compare VAR_TEMP_0, 0 - call_if 2, LinkContestRoom1_EventScript_1A54EB + call_if_gt LinkContestRoom1_EventScript_1A54EB setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -465,123 +463,123 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB setvar RESULT, 8 special ScriptRandom compare RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_1A5760 + call_if_eq LinkContestRoom1_EventScript_1A5760 compare RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_1A5784 + call_if_eq LinkContestRoom1_EventScript_1A5784 compare RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_1A57A8 + call_if_eq LinkContestRoom1_EventScript_1A57A8 compare RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_1A57CC + call_if_eq LinkContestRoom1_EventScript_1A57CC compare RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_1A57F0 + call_if_eq LinkContestRoom1_EventScript_1A57F0 compare RESULT, 5 - call_if 1, LinkContestRoom1_EventScript_1A5814 + call_if_eq LinkContestRoom1_EventScript_1A5814 compare RESULT, 6 - call_if 1, LinkContestRoom1_EventScript_1A5838 + call_if_eq LinkContestRoom1_EventScript_1A5838 compare RESULT, 7 - call_if 1, LinkContestRoom1_EventScript_1A585C + call_if_eq LinkContestRoom1_EventScript_1A585C compare VAR_TEMP_0, 0 - goto_if 2, LinkContestRoom1_EventScript_1A54EB + goto_if_gt LinkContestRoom1_EventScript_1A54EB waitmovement 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A compare VAR_SPECIAL_4, 80 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 70 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 60 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 50 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 40 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 30 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 20 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 10 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 compare VAR_SPECIAL_4, 230 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 210 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 190 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 170 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 150 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 130 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 110 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 90 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 compare VAR_SPECIAL_4, 380 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 350 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 320 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 290 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 260 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 230 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 200 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 170 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 compare VAR_SPECIAL_4, 600 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 560 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 520 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 480 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 440 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 400 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 360 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 320 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 compare VAR_SPECIAL_4, 600 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 550 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 500 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 450 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 400 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 300 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 200 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 100 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return @@ -909,7 +907,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 addvar VAR_TEMP_1, 1 lockall compare VAR_CONTEST_LOCATION, 1 - call_if 2, LinkContestRoom1_EventScript_1A5AE4 + call_if_gt LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB applymovement 7, LinkContestRoom1_Movement_1A5DB7 @@ -919,7 +917,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 applymovement 6, LinkContestRoom1_Movement_1A5DB3 applymovement 8, LinkContestRoom1_Movement_1A5DAF compare VAR_TEMP_1, 4 - goto_if 5, LinkContestRoom1_EventScript_1A5A90 + goto_if_ne LinkContestRoom1_EventScript_1A5A90 delay 30 return @@ -996,8 +994,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 - checkflag FLAG_TEMP_2 - goto_if_eq LinkContestRoom1_EventScript_1A5BF6 + goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_1A5BF6 msgbox LinkContestRoom1_Text_1A6DC5, 3 waitmessage call LinkContestRoom1_EventScript_1A5C7F @@ -1118,7 +1115,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare VAR_CONTEST_LOCATION, 2 - call_if 1, LinkContestRoom1_EventScript_1A5C42 + call_if_eq LinkContestRoom1_EventScript_1A5C42 incrementgamestat GAME_STAT_WON_CONTEST specialvar RESULT, sub_80C4440 compare RESULT, 0 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 0d0d83801..fc5df6abe 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -29,7 +29,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 6 - goto_if 5, Route117_EventScript_1B22B2 + goto_if_ne Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release end @@ -49,7 +49,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialvar RESULT, sub_8042B4C compare RESULT, 1 - call_if 1, Route117_EventScript_1B22DE + call_if_eq Route117_EventScript_1B22DE return Route117_EventScript_1B22DE:: @ 81B22DE @@ -155,7 +155,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialvar RESULT, GetNumLevelsGainedFromDaycare compare RESULT, 0 - call_if 5, Route117_PokemonDayCare_EventScript_1B2411 + call_if_ne Route117_PokemonDayCare_EventScript_1B2411 return Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ad7a3d3c5..5ddcf4a65 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -203,13 +203,12 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - call_if 1, Route111_EventScript_1AE5E0 + call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 - call_if 1, Route111_EventScript_1AE5EB + call_if_eq Route111_EventScript_1AE5EB compare FACING, 4 - call_if 1, Route111_EventScript_1AE5FD - checkflag FLAG_TEMP_1 - goto_if_eq Route111_EventScript_1AE73A + call_if_eq Route111_EventScript_1AE5FD + goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A msgbox Route111_Text_1AC015, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end @@ -237,13 +236,12 @@ Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - call_if 1, Route111_EventScript_1AE5E0 + call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 - call_if 1, Route111_EventScript_1AE5EB + call_if_eq Route111_EventScript_1AE5EB compare FACING, 4 - call_if 1, Route111_EventScript_1AE5FD - checkflag FLAG_TEMP_1 - goto_if_eq Route111_EventScript_1AE73A + call_if_eq Route111_EventScript_1AE5FD + goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A specialvar RESULT, GabbyAndTyGetLastQuote compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 11f42daf0..ed81e6628 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -1,10 +1,8 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 lock faceplayer - checkflag FLAG_EVIL_LEADER_PLEASE_STOP - call_if 0, MtChimney_EventScript_1B2CB9 - checkflag FLAG_EVIL_LEADER_PLEASE_STOP - call_if 1, MtChimney_EventScript_1B2CC2 + call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9 + call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2 closemessage applymovement 1, MtChimney_Movement_1A083D waitmovement 0 @@ -68,9 +66,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB setobjectxyperm 1, 10, 12 addobject 1 compare FACING, 4 - call_if 1, MtChimney_EventScript_1B2D7D + call_if_eq MtChimney_EventScript_1B2D7D compare FACING, 2 - call_if 1, MtChimney_EventScript_1B2D88 + call_if_eq MtChimney_EventScript_1B2D88 applymovement 255, MtChimney_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE @@ -80,9 +78,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif closemessage compare FACING, 4 - call_if 1, MtChimney_EventScript_1B2D93 + call_if_eq MtChimney_EventScript_1B2D93 compare FACING, 2 - call_if 1, MtChimney_EventScript_1B2D9E + call_if_eq MtChimney_EventScript_1B2D9E removeobject 1 setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 2430ba4af..22c76847a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -4,13 +4,11 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer - checkflag FLAG_EXCHANGED_SCANNER - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 - checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index b4d29632e..c34f2c28b 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 - checkflag FLAG_USED_STORAGE_KEY - call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 - checkflag FLAG_USED_STORAGE_KEY - call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9B6 + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 @@ -28,8 +26,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall - checkflag FLAG_USED_STORAGE_KEY - goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 + goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 7b61190e5..e8e48a6f6 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A - checkflag FLAG_USED_ROOM_1_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB - checkflag FLAG_USED_ROOM_2_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 - checkflag FLAG_USED_ROOM_4_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF - checkflag FLAG_USED_ROOM_6_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 - checkflag FLAG_USED_ROOM_1_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - checkflag FLAG_USED_ROOM_2_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - checkflag FLAG_USED_ROOM_4_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - checkflag FLAG_USED_ROOM_6_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 @@ -60,8 +52,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall - checkflag FLAG_USED_ROOM_1_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF @@ -76,8 +67,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall - checkflag FLAG_USED_ROOM_2_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 @@ -92,8 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall - checkflag FLAG_USED_ROOM_4_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 @@ -108,8 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall - checkflag FLAG_USED_ROOM_6_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 9ad419da1..7f9b06500 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89 compare VAR_TEMP_2, 36 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F compare VAR_TEMP_3, 2 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 @@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 delay 10 end @@ -59,7 +59,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B waitfieldeffect 54 delay 10 end @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 delay 10 end @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 delay 10 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index b849f41ba..8ff39c0a4 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,8 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AncientTomb_EventScript_15EFD8 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_15EFD8 end AncientTomb_EventScript_15EFD8:: @ 815EFD8 @@ -18,8 +17,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag FLAG_SYS_BRAILLE_FLY - call_if 0, AncientTomb_EventScript_15EFEA + call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15EFEA end AncientTomb_EventScript_15EFEA:: @ 815EFEA @@ -33,8 +31,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag FLAG_SYS_BRAILLE_FLY - goto_if_eq AncientTomb_EventScript_15F038 + goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index 028a0ee7b..ee49ba695 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -10,8 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer - checkflag FLAG_MT_PYRE_ORB_STOLEN - goto_if_eq AquaHideout_1F_EventScript_15D7E3 + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release end @@ -25,8 +24,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer - checkflag FLAG_MT_PYRE_ORB_STOLEN - goto_if_eq AquaHideout_1F_EventScript_15D802 + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 82d0c10c5..3be8d487d 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,8 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AquaHideout_B1F_EventScript_15D846 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_15D846 end AquaHideout_B1F_EventScript_15D846:: @ 815D846 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 14b85c5b0..57eb62dfe 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -13,13 +13,11 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar VAR_SPECIAL_4, 10 special SetBattleTowerProperty - checkflag FLAG_RECEIVED_GOLD_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1602E4 - checkflag FLAG_RECEIVED_SILVER_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1602CD + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 50 - goto_if 0, BattleTower_Lobby_EventScript_1602E4 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -27,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 100 - goto_if 0, BattleTower_Lobby_EventScript_1602E4 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -119,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar VAR_SPECIAL_4, 9 special BattleTowerUtil compare RESULT, 49 - goto_if 5, BattleTower_Lobby_EventScript_1603F8 + goto_if_ne BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 @@ -387,10 +385,8 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer - checkflag FLAG_RECEIVED_GOLD_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1607C5 - checkflag FLAG_RECEIVED_SILVER_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_160773 + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD @@ -404,7 +400,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 - goto_if 0, BattleTower_Lobby_EventScript_1607C5 + goto_if_lt BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 6411aad49..58c6563f6 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index b8d4149b6..c79eb088e 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index 9b014d0e9..66b02ee9f 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index d6f7bdaf1..8084ceb43 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 315dda886..aa79e1213 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,8 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, CaveOfOrigin_B4F_EventScript_15DDC1 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 @@ -19,8 +18,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3 end CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 @@ -67,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar RESULT, GetBattleOutcome compare RESULT, 1 - call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 + call_if_eq CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 7aa56a82d..2627a8261 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,8 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_15CB0D + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_15CB0D end DesertRuins_EventScript_15CB0D:: @ 815CB0D @@ -14,8 +13,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_15CB1B + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB1B end DesertRuins_EventScript_15CB1B:: @ 815CB1B @@ -33,8 +31,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_if_eq DesertRuins_EventScript_15CB6D + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 50c9d8991..e7aeccbd0 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -9,8 +9,7 @@ DewfordTown_MapScript1_14DFFE:: @ 814DFFE DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, DewfordTown_EventScript_14E076 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waitmessage multichoicedefault 21, 6, 0, 2, 0 @@ -74,8 +73,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer - checkflag FLAG_RECEIVED_OLD_ROD - goto_if_eq DewfordTown_EventScript_14E11B + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, MSGBOX_YESNO compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E0F0 @@ -176,10 +174,8 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN - checkflag FLAG_DELIVERED_DEVON_GOODS - call_if 0, DewfordTown_EventScript_14E281 - checkflag FLAG_DELIVERED_DEVON_GOODS - call_if 1, DewfordTown_EventScript_14E28A + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281 + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A closemessage copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_DEWFORD_TOWN diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index ba933dbe9..2dc15d92c 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -82,17 +82,17 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 checktrainerflag OPPONENT_HIDEKI - goto_if 0, DewfordTown_Gym_EventScript_153135 + goto_if_lt DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA - goto_if 0, DewfordTown_Gym_EventScript_153143 + goto_if_lt DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA - goto_if 0, DewfordTown_Gym_EventScript_153151 + goto_if_lt DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 @@ -100,8 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 - checkflag FLAG_RECEIVED_TM08 - goto_if 0, DewfordTown_Gym_EventScript_1531B5 + goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release end @@ -116,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag FLAG_BADGE02_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, DewfordTown_Gym_EventScript_1A00FB + call_if_eq DewfordTown_Gym_EventScript_1A00FB setvar VAR_SPECIAL_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 @@ -164,8 +163,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238 DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer - checkflag FLAG_DEFEATED_DEWFORD_GYM - goto_if_eq DewfordTown_Gym_EventScript_153254 + goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release end @@ -177,15 +175,13 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag FLAG_BADGE02_GET - goto_if_eq DewfordTown_Gym_EventScript_15327E + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag FLAG_BADGE02_GET - goto_if_eq DewfordTown_Gym_EventScript_15327E + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index c4ccc769c..84334068e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -218,9 +218,9 @@ DewfordTown_Hall_EventScript_153535:: @ 8153535 DewfordTown_Hall_EventScript_153556:: @ 8153556 compare FACING, 2 - call_if 1, DewfordTown_Hall_EventScript_15356D + call_if_eq DewfordTown_Hall_EventScript_15356D compare FACING, 1 - call_if 1, DewfordTown_Hall_EventScript_153578 + call_if_eq DewfordTown_Hall_EventScript_153578 return DewfordTown_Hall_EventScript_15356D:: @ 815356D @@ -252,8 +252,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - checkflag FLAG_RECEIVED_TM36 - goto_if_eq DewfordTown_Hall_EventScript_1535D1 + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem_std ITEM_TM36 compare RESULT, 0 diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index e704efa50..a2341bc76 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -4,8 +4,7 @@ DewfordTown_House2_MapScripts:: @ 81535DB DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer - checkflag FLAG_RECEIVED_SILK_SCARF - goto_if_eq DewfordTown_House2_EventScript_153615 + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem_std ITEM_SILK_SCARF compare RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index 9a1bd9fa7..293780716 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, EverGrandeCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_1A02C1 end EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 29c29c80b..78009271b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -54,9 +54,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse SE_DOOR checkplayergender compare RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkplayergender @@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkplayergender compare RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index a738264fe..8eb7bbc45 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 - checkflag FLAG_DEFEATED_ELITE_4_DRAKE - call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758 compare VAR_ELITE_4_STATE, 4 - call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E + call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E end EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758 @@ -41,8 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_DRAKE - goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index e3a4145d6..a72b84440 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 - checkflag FLAG_DEFEATED_ELITE_4_GLACIA - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare VAR_ELITE_4_STATE, 3 - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE @@ -41,8 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_GLACIA - goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index d23f234db..2d09f1ebb 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F - checkflag FLAG_DEFEATED_ELITE_4_PHOEBE - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare VAR_ELITE_4_STATE, 2 - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A end EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624 @@ -41,8 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_PHOEBE - goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a787b0f90..a8eb820ea 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -5,8 +5,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B setrespawn 20 setflag FLAG_SYS_POKEMON_LEAGUE_FLY - checkflag FLAG_ENTERED_ELITE_FOUR - call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B + call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B end EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B @@ -47,18 +46,16 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall - checkflag FLAG_ENTERED_ELITE_FOUR - goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 + goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 - call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 + call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34 compare VAR_TEMP_0, 8 - call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F + call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 4531845ab..45a729c0a 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -5,10 +5,9 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F - checkflag FLAG_DEFEATED_ELITE_4_SYDNEY - call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 + call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564 compare VAR_ELITE_4_STATE, 1 - call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A + call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A end EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 @@ -42,8 +41,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_SYDNEY - goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD + goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 23295f778..a168a0ef5 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -12,8 +12,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if_eq FallarborTown_EventScript_14E80A + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 641a201e3..11dd6159e 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -92,8 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E end FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 - checkflag FLAG_CONTEST_SKETCH_CREATED - goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 + goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index d2b27f478..f62a2da37 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -8,8 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer - checkflag FLAG_RECEIVED_TM27 - goto_if_eq FallarborTown_House1_EventScript_153C54 + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA @@ -18,10 +17,8 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - checkflag FLAG_TEMP_2 - call_if 0, FallarborTown_House1_EventScript_153C2D - checkflag FLAG_TEMP_2 - call_if 1, FallarborTown_House1_EventScript_153C3E + call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D + call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 @@ -58,10 +55,8 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer - checkflag FLAG_RECEIVED_TM27 - goto_if_eq FallarborTown_House1_EventScript_153C86 - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if_eq FallarborTown_House1_EventScript_153C7C + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86 + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release end diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 7ceaabdef..bb1656fc2 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -5,8 +5,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall applymovement 1, FallarborTown_House2_Movement_1A0839 waitmovement 0 - checkflag FLAG_TEMP_1 - goto_if_eq FallarborTown_House2_EventScript_153CB6 + goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_153CB6 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 937b435a6..e576df5bd 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -18,8 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955 FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer - checkflag FLAG_KECLEON_FLED_FORTREE - goto_if_eq FortreeCity_EventScript_14C973 + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 9217ba8f4..94df378f8 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,8 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 - checkflag FLAG_RECEIVED_TM40 - goto_if 0, FortreeCity_Gym_EventScript_157F3E + goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release end @@ -67,8 +66,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer - checkflag FLAG_DEFEATED_FORTREE_GYM - goto_if_eq FortreeCity_Gym_EventScript_157FD3 + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release end @@ -80,15 +78,13 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag FLAG_BADGE06_GET - goto_if_eq FortreeCity_Gym_EventScript_157FFD + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag FLAG_BADGE06_GET - goto_if_eq FortreeCity_Gym_EventScript_157FFD + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index b308aa836..443cc3a5c 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -4,8 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12 FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer - checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED - goto_if_eq FortreeCity_House1_EventScript_157EAD + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD setvar VAR_SPECIAL_8, 1 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, FortreeCity_House1_EventScript_157E9F + goto_if_ne FortreeCity_House1_EventScript_157E9F copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ae70b8644..107c3708c 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -4,10 +4,8 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - checkflag FLAG_RECEIVED_TM10 - goto_if_eq FortreeCity_House2_EventScript_158157 - checkflag FLAG_MET_HIDDEN_POWER_GIVER - call_if 0, FortreeCity_House2_EventScript_15814B + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157 + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 switch RESULT diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 1b1b41877..490ef0c9b 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -7,12 +7,9 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall - checkflag FLAG_RECEIVED_MENTAL_HERB - goto_if_eq FortreeCity_House4_EventScript_158204 - checkflag FLAG_WINGULL_DELIVERED_MAIL - goto_if_eq FortreeCity_House4_EventScript_1581D6 - checkflag FLAG_WINGULL_SENT_ON_ERRAND - goto_if_eq FortreeCity_House4_EventScript_1581C2 + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204 + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6 + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 33296e510..7419b5866 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -4,8 +4,7 @@ GraniteCave_1F_MapScripts:: @ 815CBA6 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer - checkflag FLAG_RECEIVED_HM05 - goto_if_eq GraniteCave_1F_EventScript_15CBD3 + goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index c9616266e..9c69e649e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -11,17 +11,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem_std ITEM_TM47 compare RESULT, 0 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closemessage compare FACING, 2 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 1 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC78 compare FACING, 3 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D playse SE_KAIDAN removeobject 1 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index dbc71b6bb..d8576e883 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, IslandCave_EventScript_15EED0 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_15EED0 end IslandCave_EventScript_15EED0:: @ 815EED0 @@ -14,8 +13,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag FLAG_SYS_BRAILLE_WAIT - call_if 0, IslandCave_EventScript_15EEDE + call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EEDE end IslandCave_EventScript_15EEDE:: @ 815EEDE @@ -45,8 +43,7 @@ S_OpenRegiceChamber:: @ 815EF19 IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag FLAG_SYS_BRAILLE_WAIT - goto_if_eq IslandCave_EventScript_15EF72 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait waitstate @@ -61,8 +58,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag FLAG_SYS_BRAILLE_WAIT - goto_if_eq IslandCave_EventScript_15EF95 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95 special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index efe5d6a6e..d75420e88 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -9,7 +9,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 JaggedPass_MapScript1_15D274:: @ 815D274 compare VAR_JAGGED_PASS_ASH_WEATHER, 1 - call_if 1, JaggedPass_EventScript_15D280 + call_if_eq JaggedPass_EventScript_15D280 end JaggedPass_EventScript_15D280:: @ 815D280 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 44a1e141b..a7f71baf6 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -5,12 +5,11 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - call_if 1, LavaridgeTown_EventScript_14E4DF + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 compare VAR_LAVARIDGE_RIVAL_STATE, 2 - call_if 1, LavaridgeTown_EventScript_14E4D0 + call_if_eq LavaridgeTown_EventScript_14E4D0 end LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 @@ -45,11 +44,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_14E56B compare RESULT, 1 - call_if 1, LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_14E570 compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E68F + call_if_eq LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB @@ -71,9 +70,9 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 setvar VAR_SPECIAL_8, 0 checkplayergender compare RESULT, 0 - call_if 1, LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_14E56B compare RESULT, 1 - call_if 1, LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_14E570 checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB @@ -100,16 +99,16 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E646 + call_if_eq LavaridgeTown_EventScript_14E646 compare VAR_SPECIAL_8, 0 - call_if 1, LavaridgeTown_EventScript_14E64E + call_if_eq LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E69A + call_if_eq LavaridgeTown_EventScript_14E69A compare VAR_SPECIAL_8, 0 - call_if 1, LavaridgeTown_EventScript_14E6A5 + call_if_eq LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 @@ -129,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 LavaridgeTown_EventScript_14E64E:: @ 814E64E compare FACING, 2 - call_if 1, LavaridgeTown_EventScript_14E67B + call_if_eq LavaridgeTown_EventScript_14E67B compare FACING, 1 - call_if 1, LavaridgeTown_EventScript_14E680 + call_if_eq LavaridgeTown_EventScript_14E680 compare FACING, 3 - call_if 1, LavaridgeTown_EventScript_14E685 + call_if_eq LavaridgeTown_EventScript_14E685 compare FACING, 4 - call_if 1, LavaridgeTown_EventScript_14E68A + call_if_eq LavaridgeTown_EventScript_14E68A return LavaridgeTown_EventScript_14E67B:: @ 814E67B @@ -166,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 compare FACING, 2 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 compare FACING, 1 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 compare FACING, 3 - call_if 1, LavaridgeTown_EventScript_14E6DD + call_if_eq LavaridgeTown_EventScript_14E6DD compare FACING, 4 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 return LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 @@ -272,8 +271,7 @@ LavaridgeTown_EventScript_14E751:: @ 814E751 LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer - checkflag FLAG_RECEIVED_LAVARIDGE_EGG - goto_if_eq LavaridgeTown_EventScript_14E79E + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO compare RESULT, NO goto_if_eq LavaridgeTown_EventScript_14E7B2 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 1bbad53bf..52d614436 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -70,8 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 - checkflag FLAG_RECEIVED_TM50 - goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 + goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release end @@ -85,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB + call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB setvar VAR_SPECIAL_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE @@ -135,8 +134,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release end @@ -148,15 +146,13 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag FLAG_BADGE04_GET - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag FLAG_BADGE04_GET - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 913734dd5..71fc2cbfe 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -28,8 +28,7 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer - checkflag FLAG_RECEIVED_CHARCOAL - goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 + goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem_std ITEM_CHARCOAL compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 6ed8054f8..ee29b0f05 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -7,8 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, LilycoveCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E end @@ -28,10 +27,8 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmetatile 71, 6, 368, 0 setmetatile 72, 6, 445, 0 .endif - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - call_if 0, LilycoveCity_EventScript_14CABE - checkflag FLAG_BADGE07_GET - call_if 1, LilycoveCity_EventScript_14CB2B + call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE + call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B end LilycoveCity_EventScript_14CABE:: @ 814CABE @@ -64,8 +61,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE - goto_if_eq LilycoveCity_EventScript_14CBB4 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY @@ -89,8 +85,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_EventScript_14CBDC + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release end @@ -107,8 +102,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6 LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq LilycoveCity_EventScript_14CC04 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release end @@ -121,8 +115,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04 LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq LilycoveCity_EventScript_14CC23 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release end @@ -147,8 +140,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_EventScript_14CC5D + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release end @@ -186,8 +178,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CCC0 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall end @@ -211,8 +202,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall - checkflag FLAG_MET_WAILMER_TRAINER - goto_if_eq LilycoveCity_EventScript_14CD18 + goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 waitmovement 0 @@ -256,10 +246,8 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 LilycoveCity_EventScript_14CD60:: @ 814CD60 playbgm BGM_GIRL_SUP, TRUE - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 1, LilycoveCity_EventScript_14CDB0 - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 0, LilycoveCity_EventScript_14CDB9 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 @@ -287,10 +275,8 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playbgm BGM_BOY_SUP, TRUE - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 1, LilycoveCity_EventScript_14CE23 - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 0, LilycoveCity_EventScript_14CE2C + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 @@ -349,20 +335,18 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - call_if 1, LilycoveCity_EventScript_14CEEE + call_if_eq LilycoveCity_EventScript_14CEEE compare RESULT, 1 - call_if 1, LilycoveCity_EventScript_14CEF7 + call_if_eq LilycoveCity_EventScript_14CEF7 clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag FLAG_HIDE_MAY_PICHU_DOLL goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag FLAG_BADGE08_GET - goto_if_eq LilycoveCity_EventScript_14CEE8 + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8 return LilycoveCity_EventScript_14CEE8:: @ 814CEE8 @@ -374,8 +358,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CF09 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,12 +369,11 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - call_if 1, LilycoveCity_EventScript_14CF47 + call_if_eq LilycoveCity_EventScript_14CF47 compare RESULT, 1 - call_if 1, LilycoveCity_EventScript_14CF50 + call_if_eq LilycoveCity_EventScript_14CF50 clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B end @@ -401,8 +383,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CF62 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7aceecef6..a04629903 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,8 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end @@ -45,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_158948 + call_if_eq LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 removeobject 4 @@ -188,8 +187,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end @@ -218,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 + call_if_eq LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 removeobject 11 @@ -307,8 +305,7 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA - checkflag FLAG_TEMP_2 - goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waitmessage setflag FLAG_TEMP_2 @@ -402,8 +399,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 end LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA - checkflag FLAG_TEMP_3 - call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 + call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waitmessage multichoice 0, 0, 4, 0 @@ -707,8 +703,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E end LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 - checkflag FLAG_RECEIVED_CONTEST_PASS - goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 + goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index c8a3dcab9..b80b0873b 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,10 +3,8 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 4878cc6bc..06b982610 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -4,10 +4,8 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 - checkflag FLAG_TEMP_2 - call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 1198054f0..f895ea99d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -4,8 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index cd5e0d980..e2274110c 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 getpricereduction 3 compare RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F compare RESULT, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 faceplayer getpricereduction 3 compare RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release end @@ -128,22 +128,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 @@ -155,7 +155,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 @@ -167,7 +167,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index db2b8edf9..f6b23bc05 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -10,9 +10,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E faceplayer dodailyevents compare VAR_LOTTERY_PRIZE, 0 - goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 - checkflag FLAG_DAILY_PICKED_LOTTO_TICKET - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1 + goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO compare RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 @@ -37,18 +36,18 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare VAR_SPECIAL_6, 0 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare VAR_SPECIAL_6, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitemname 0, VAR_SPECIAL_5 compare VAR_SPECIAL_4, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare VAR_SPECIAL_4, 2 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E81 compare VAR_SPECIAL_4, 3 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare VAR_SPECIAL_4, 4 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem_std VAR_SPECIAL_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 3b884c233..5dc217585 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,8 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_Harbor_EventScript_1598CD + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release end @@ -81,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A delay 30 hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_SPECIAL_4, 2 @@ -106,12 +105,9 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, LilycoveCity_Harbor_EventScript_1598BA - checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS - goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, LilycoveCity_Harbor_EventScript_1598BA + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA + goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 @@ -130,9 +126,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 removeobject 4 compare FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty @@ -159,8 +155,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d0065c9e8..0572c23cc 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -4,8 +4,7 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer - checkflag FLAG_RECEIVED_TM44 - goto_if_eq LilycoveCity_House2_EventScript_159BDA + goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem_std ITEM_TM44 compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 120054e91..9cf3ecbd7 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -4,32 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - checkflag FLAG_COOL_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - checkflag FLAG_BEAUTY_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - checkflag FLAG_CUTE_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - checkflag FLAG_SMART_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - checkflag FLAG_TOUGH_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD @@ -96,8 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall - checkflag FLAG_RECEIVED_GLASS_ORNAMENT - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 + goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialvar VAR_SPECIAL_4, sub_80C4D50 switch VAR_SPECIAL_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C @@ -146,36 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall - checkflag FLAG_CUTE_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall - checkflag FLAG_TOUGH_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall - checkflag FLAG_COOL_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall - checkflag FLAG_BEAUTY_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall - checkflag FLAG_SMART_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index f6eb35c98..cff88caf0 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,8 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 4656f0182..85ee953ac 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -72,35 +72,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 setvar VAR_SPECIAL_4, 8 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar VAR_SPECIAL_4, 9 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar VAR_SPECIAL_4, 10 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar VAR_SPECIAL_4, 11 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar VAR_SPECIAL_4, 12 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar VAR_SPECIAL_4, 13 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar VAR_SPECIAL_4, 14 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar VAR_SPECIAL_4, 15 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index ef2145bbb..57ad9aae5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -6,19 +6,18 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag FLAG_VISITED_LITTLEROOT_TOWN compare VAR_LITTLEROOT_INTRO_STATE, 2 - call_if 1, LittlerootTown_EventScript_14D57B - checkflag FLAG_RESCUED_BIRCH - call_if 0, LittlerootTown_EventScript_14D583 + call_if_eq LittlerootTown_EventScript_14D57B + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583 compare VAR_LITTLEROOT_STATE, 3 - call_if 1, LittlerootTown_EventScript_14D5A6 + call_if_eq LittlerootTown_EventScript_14D5A6 compare VAR_LITTLEROOT_HOUSES_STATE, 4 - call_if 1, LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_14D570 compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - call_if 1, LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_14D570 compare VAR_OLDALE_STATE, 1 - call_if 1, LittlerootTown_EventScript_14D567 + call_if_eq LittlerootTown_EventScript_14D567 compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if 1, LittlerootTown_EventScript_14D563 + call_if_eq LittlerootTown_EventScript_14D563 end LittlerootTown_EventScript_14D563:: @ 814D563 @@ -56,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 setobjectmovementtype 4, 8 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D5C5 + call_if_eq LittlerootTown_EventScript_14D5C5 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D5CD + call_if_eq LittlerootTown_EventScript_14D5CD return LittlerootTown_EventScript_14D5C5:: @ 814D5C5 @@ -187,12 +186,10 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6 LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq LittlerootTown_EventScript_14D72F - checkflag FLAG_RESCUED_BIRCH - goto_if_eq LittlerootTown_EventScript_14D722 + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722 compare VAR_LITTLEROOT_STATE, 0 - goto_if 5, LittlerootTown_EventScript_14D708 + goto_if_ne LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release end @@ -335,9 +332,9 @@ LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D822 + call_if_eq LittlerootTown_EventScript_14D822 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D82B + call_if_eq LittlerootTown_EventScript_14D82B releaseall end @@ -353,9 +350,9 @@ LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D84E + call_if_eq LittlerootTown_EventScript_14D84E compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D857 + call_if_eq LittlerootTown_EventScript_14D857 releaseall end @@ -408,27 +405,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D93C + call_if_eq LittlerootTown_EventScript_14D93C compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D947 + call_if_eq LittlerootTown_EventScript_14D947 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_14D926 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D931 + call_if_eq LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closemessage checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D952 + call_if_eq LittlerootTown_EventScript_14D952 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D995 + call_if_eq LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14DAAA + call_if_eq LittlerootTown_EventScript_14DAAA compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14DAED + call_if_eq LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -454,32 +451,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 LittlerootTown_EventScript_14D952:: @ 814D952 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_14D9D8 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_14D9ED compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DA02 + call_if_eq LittlerootTown_EventScript_14DA02 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DA17 + call_if_eq LittlerootTown_EventScript_14DA17 compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DA2C + call_if_eq LittlerootTown_EventScript_14DA2C compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DA41 + call_if_eq LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_14D9D8 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_14D9ED compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DA56 + call_if_eq LittlerootTown_EventScript_14DA56 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DA6B + call_if_eq LittlerootTown_EventScript_14DA6B compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DA80 + call_if_eq LittlerootTown_EventScript_14DA80 compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DA95 + call_if_eq LittlerootTown_EventScript_14DA95 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 @@ -554,32 +551,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 LittlerootTown_EventScript_14DAAA:: @ 814DAAA compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_14DB30 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_14DB3B compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DB46 + call_if_eq LittlerootTown_EventScript_14DB46 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DB6C + call_if_eq LittlerootTown_EventScript_14DB6C compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DB92 + call_if_eq LittlerootTown_EventScript_14DB92 compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DBB8 + call_if_eq LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_14DB30 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_14DB3B compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DBDE + call_if_eq LittlerootTown_EventScript_14DBDE compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DC04 + call_if_eq LittlerootTown_EventScript_14DC04 compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DC2A + call_if_eq LittlerootTown_EventScript_14DC2A compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DC50 + call_if_eq LittlerootTown_EventScript_14DC50 return LittlerootTown_EventScript_14DB30:: @ 814DB30 @@ -843,9 +840,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 faceplayer checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_14D926 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D931 + call_if_eq LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 8a86cd946..1de2e91a4 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 - checkflag FLAG_RECEIVED_RUNNING_SHOES - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660 + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673 end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 @@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4 compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index e0e1a1086..ed6818fa0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,10 +4,9 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar VAR_0x4089, 0 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 45e9e0783..8096589aa 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -6,9 +6,8 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E - checkflag FLAG_RECEIVED_RUNNING_SHOES - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E @@ -28,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902 compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6 end LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA @@ -118,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1 compare RESULT, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -135,10 +134,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 - checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21 + goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 34300b13e..ede58e7a5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,10 +4,9 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar VAR_0x4089, 0 end @@ -30,13 +29,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall - checkflag FLAG_MET_RIVAL_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse SE_KAIDAN removeobject LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 @@ -58,11 +56,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closemessage compare FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29 compare FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34 compare FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 @@ -92,11 +90,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closemessage compare FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F @@ -114,22 +112,20 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB - checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED - checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 10e4712bb..7608ba65d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -86,9 +86,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer compare VAR_BIRCH_LAB_STATE, 3 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 - checkflag FLAG_BIRCH_AIDE_MET - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90 + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 setflag FLAG_BIRCH_AIDE_MET release @@ -107,8 +106,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer - checkflag FLAG_UNKNOWN_BIRCH_380 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F + goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 @@ -125,9 +123,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED setvar VAR_ROUTE102_ACCESSIBLE, 1 @@ -140,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 return @@ -149,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 return @@ -189,9 +187,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 faceplayer checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE compare RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 6dbdc0461..a55d260ab 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,8 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, MagmaHideout_B1F_EventScript_15F2B8 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MagmaHideout_B1F_EventScript_15F2B8 end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 652a25f6f..03974ddae 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -8,8 +8,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar VAR_MAUVILLE_GYM_STATE, 0 - checkflag FLAG_RECEIVED_TM24 - call_if 1, MauvilleCity_EventScript_14C053 + call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053 end MauvilleCity_EventScript_14C053:: @ 814C053 @@ -52,8 +51,7 @@ MauvilleCity_EventScript_14C099:: @ 814C099 MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer - checkflag FLAG_TV_EXPLAINED - goto_if_eq MauvilleCity_EventScript_14C0BA + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 setflag FLAG_TV_EXPLAINED release @@ -67,8 +65,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer - checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - goto_if_eq MauvilleCity_EventScript_14C0E4 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closemessage applymovement 7, MauvilleCity_Movement_1A083D @@ -86,8 +83,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall - checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - goto_if_eq MauvilleCity_EventScript_14C292 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165BE3, 4 @@ -106,7 +102,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 MauvilleCity_EventScript_14C154:: @ 814C154 compare RESULT, YES - call_if 1, MauvilleCity_EventScript_14C23C + call_if_eq MauvilleCity_EventScript_14C23C compare RESULT, NO goto_if_eq MauvilleCity_EventScript_14C285 closemessage @@ -284,12 +280,10 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer - checkflag FLAG_RECEIVED_TM24 - goto_if_eq MauvilleCity_EventScript_14C368 + goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368 compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_14C33C - checkflag FLAG_RECEIVED_BASEMENT_KEY - goto_if_eq MauvilleCity_EventScript_14C332 + goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 giveitem_std ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 6bd7f0f4f..08f11d641 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -4,10 +4,8 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer - checkflag FLAG_RECEIVED_BIKE - goto_if_eq MauvilleCity_BikeShop_EventScript_15686E - checkflag FLAG_DECLINED_BIKE - goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 + goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_15686E + goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO compare RESULT, YES diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index e938a1b4c..2b784aeb9 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -34,7 +34,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C @@ -53,7 +53,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C @@ -155,7 +155,7 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 @@ -171,7 +171,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 @@ -187,7 +187,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 @@ -290,7 +290,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -305,7 +305,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -320,7 +320,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -335,7 +335,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -350,7 +350,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -389,8 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer - checkflag FLAG_RECEIVED_STARTER_DOLL - goto_if_eq MauvilleCity_GameCorner_EventScript_157072 + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_157068 @@ -460,11 +459,10 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C - checkflag FLAG_RECEIVED_20_COINS - goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_1570CA checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 1 - goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA + goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index fd9c673dc..1dc7fc0c7 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -3,8 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1565A7 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1565A7 switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D @@ -13,8 +12,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 end MauvilleCity_Gym_EventScript_156491:: @ 8156491 - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if_eq MauvilleCity_Gym_EventScript_15649B + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_15649B end MauvilleCity_Gym_EventScript_15649B:: @ 815649B @@ -69,8 +67,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB - checkflag FLAG_RECEIVED_TM34 - goto_if 0, MauvilleCity_Gym_EventScript_15661D + goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 @@ -86,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag FLAG_BADGE03_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, MauvilleCity_Gym_EventScript_1A00FB + call_if_eq MauvilleCity_Gym_EventScript_1A00FB setvar VAR_SPECIAL_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 @@ -111,8 +108,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 @@ -122,8 +118,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 @@ -133,8 +128,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 @@ -147,10 +141,8 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if_eq MauvilleCity_Gym_EventScript_1566E1 - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if 0, MauvilleCity_Gym_EventScript_1566DC + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 + goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -191,8 +183,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_156757 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release end @@ -204,15 +195,13 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag FLAG_BADGE03_GET - goto_if_eq MauvilleCity_Gym_EventScript_156781 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag FLAG_BADGE03_GET - goto_if_eq MauvilleCity_Gym_EventScript_156781 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index 210288517..eb21a49e9 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -4,8 +4,7 @@ MauvilleCity_House1_MapScripts:: @ 81569FC MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer - checkflag FLAG_RECEIVED_HM06 - goto_if_eq MauvilleCity_House1_EventScript_156A29 + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 9d3bce68a..f18d278b5 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -4,8 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer - checkflag FLAG_RECEIVED_COIN_CASE - goto_if_eq MauvilleCity_House2_EventScript_15733D + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 compare RESULT, 1 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index bf51408b8..272d7ed6e 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -215,8 +215,7 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer - checkflag FLAG_MET_PROF_COSMO - goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E + goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E setflag FLAG_MET_PROF_COSMO msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 3d1baf143..7ec338927 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,8 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, MossdeepCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1 end MossdeepCity_EventScript_14CFAE:: @ 814CFAE @@ -68,8 +67,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011 MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer - checkflag FLAG_RECEIVED_KINGS_ROCK - goto_if_eq MossdeepCity_EventScript_14D069 + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO compare RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index eac7f4adb..364778613 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special ValidateEReaderTrainer compare RESULT, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 @@ -18,9 +18,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special ValidateEReaderTrainer compare RESULT, 0 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E compare VAR_GAME_CORNER_STATE, 0 - call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF + call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E @@ -50,11 +50,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 compare VAR_GAME_CORNER_STATE, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22 compare VAR_GAME_CORNER_STATE, 2 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD2B compare VAR_GAME_CORNER_STATE, 3 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar VAR_GAME_CORNER_STATE, 0 releaseall @@ -101,7 +101,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO compare RESULT, NO - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog compare RESULT, 0 @@ -112,11 +112,11 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closemessage compare FACING, 2 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04 compare FACING, 4 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9f20b6310..f62693756 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -23,11 +23,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special StartSpecialBattle waitstate compare RESULT, 3 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5 compare RESULT, 1 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3 compare RESULT, 2 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE closemessage special ScrSpecial_HealPlayerParty applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index bc22ce3fe..341962431 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -3,26 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 - goto_if_eq MossdeepCity_Gym_EventScript_15A510 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 - goto_if_eq MossdeepCity_Gym_EventScript_15A528 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 - goto_if_eq MossdeepCity_Gym_EventScript_15A540 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 - goto_if_eq MossdeepCity_Gym_EventScript_15A558 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 @@ -50,8 +46,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 - checkflag FLAG_RECEIVED_TM04 - goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 + goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release end @@ -82,8 +77,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 - goto_if_eq MossdeepCity_Gym_EventScript_15A621 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -109,8 +103,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 - goto_if_eq MossdeepCity_Gym_EventScript_15A675 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -130,8 +123,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 - goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -151,8 +143,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 - goto_if_eq MossdeepCity_Gym_EventScript_15A71D + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -210,8 +201,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer - checkflag FLAG_DEFEATED_MOSSDEEP_GYM - goto_if_eq MossdeepCity_Gym_EventScript_15A7ED + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release end @@ -228,15 +218,13 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag FLAG_BADGE07_GET - goto_if_eq MossdeepCity_Gym_EventScript_15A81A + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag FLAG_BADGE07_GET - goto_if_eq MossdeepCity_Gym_EventScript_15A81A + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 1da204ff0..415dbfc33 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE compare FACING, 2 - call_if 1, MossdeepCity_House2_EventScript_15A8AE + call_if_eq MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 - call_if 1, MossdeepCity_House2_EventScript_15A8B9 + call_if_eq MossdeepCity_House2_EventScript_15A8B9 removeobject 3 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index fb44685d8..4c4d6cbdd 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -4,8 +4,7 @@ MossdeepCity_House3_MapScripts:: @ 815A971 MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer - checkflag FLAG_RECEIVED_SUPER_ROD - goto_if_eq MossdeepCity_House3_EventScript_15A9B1 + goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO compare RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 856ee1287..5fb0f97ff 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,8 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq MossdeepCity_House4_EventScript_15AB46 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 884124567..83b859c26 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -8,9 +8,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B specialvar RESULT, GetWeekCount buffernumberstring 0, RESULT compare RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closemessage applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 @@ -32,8 +32,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer - checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem_std ITEM_SUN_STONE compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index ce2f2aad5..d9ad70f70 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,8 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF @@ -15,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 compare VAR_STEVENS_HOUSE_STATE, 1 - call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 + call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5 end MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 @@ -87,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 + call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM releaseall @@ -113,8 +112,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall - checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER - goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 + goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index be4799a45..ac7c00013 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -26,7 +26,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 - call_if 1, MtChimney_EventScript_15D000 + call_if_eq MtChimney_EventScript_15D000 giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 @@ -406,10 +406,8 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if 0, MtChimney_EventScript_15D1D0 - checkflag FLAG_RECEIVED_METEORITE - goto_if_eq MtChimney_EventScript_15D1C6 + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0 + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, MSGBOX_YESNO compare RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index aefc68bda..d73c427f8 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 compare VAR_CABLE_CAR_STATION_STATE, 1 - call_if 1, MtChimney_CableCarStation_EventScript_15C111 + call_if_eq MtChimney_CableCarStation_EventScript_15C111 end MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 7073000d5..f34c31da0 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -4,8 +4,7 @@ MtPyre_1F_MapScripts:: @ 815D322 MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer - checkflag FLAG_RECEIVED_CLEANSE_TAG - goto_if_eq MtPyre_1F_EventScript_15D352 + goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index ec5864df5..f8b4141d7 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -9,7 +9,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 12 - goto_if 0, MtPyre_Exterior_EventScript_15D4A3 + goto_if_lt MtPyre_Exterior_EventScript_15D4A3 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 56ef5db79..d37100938 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -31,11 +31,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 waitmovement 0 delay 50 compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D593 + call_if_eq MtPyre_Summit_EventScript_15D593 compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D59E + call_if_eq MtPyre_Summit_EventScript_15D59E compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D59F + call_if_eq MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 .else @@ -53,11 +53,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 delay 20 call MtPyre_Summit_EventScript_15D57A compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D5AA + call_if_eq MtPyre_Summit_EventScript_15D5AA compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D5BF + call_if_eq MtPyre_Summit_EventScript_15D5BF compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D5CA + call_if_eq MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 .else @@ -144,9 +144,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif compare RESULT, YES - call_if 1, MtPyre_Summit_EventScript_15D611 + call_if_eq MtPyre_Summit_EventScript_15D611 compare RESULT, NO - call_if 1, MtPyre_Summit_EventScript_15D61A + call_if_eq MtPyre_Summit_EventScript_15D61A release end @@ -169,12 +169,9 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer - checkflag FLAG_RETURNED_RED_OR_BLUE_ORB - goto_if_eq MtPyre_Summit_EventScript_15D6C4 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq MtPyre_Summit_EventScript_15D64A - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if_eq MtPyre_Summit_EventScript_15D6BA + goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 .else @@ -269,11 +266,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 waitmovement 0 delay 50 compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D75E + call_if_eq MtPyre_Summit_EventScript_15D75E compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D769 + call_if_eq MtPyre_Summit_EventScript_15D769 compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D774 + call_if_eq MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 .else @@ -281,11 +278,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 .endif closemessage compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D77F + call_if_eq MtPyre_Summit_EventScript_15D77F compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D78A + call_if_eq MtPyre_Summit_EventScript_15D78A compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D795 + call_if_eq MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 releaseall diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 2a4d8afce..1c8bdfb3f 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A NewMauville_Entrance_MapScript1_15E495:: @ 815E495 compare VAR_NEW_MAUVILLE_STATE, 0 - call_if 1, NewMauville_Entrance_EventScript_15E4A1 + call_if_eq NewMauville_Entrance_EventScript_15E4A1 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ae33d7978..e045cda5d 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -6,11 +6,10 @@ NewMauville_Inside_MapScripts:: @ 815E55F NewMauville_Inside_MapScript1_15E56F:: @ 815E56F compare VAR_TEMP_1, 1 - call_if 1, NewMauville_Inside_EventScript_15E5DA + call_if_eq NewMauville_Inside_EventScript_15E5DA compare VAR_TEMP_2, 1 - call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NewMauville_Inside_EventScript_15E58F + call_if_eq NewMauville_Inside_EventScript_15E728 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_15E58F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F @@ -24,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 NewMauville_Inside_MapScript1_15E59E:: @ 815E59E compare VAR_NEW_MAUVILLE_STATE, 2 - call_if 1, NewMauville_Inside_EventScript_15E88B + call_if_eq NewMauville_Inside_EventScript_15E88B end NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index a2d2616d3..9b1c9dd80 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -5,12 +5,9 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag FLAG_VISITED_OLDALE_TOWN - checkflag FLAG_ADVENTURE_STARTED - call_if 0, OldaleTown_EventScript_14DD92 - checkflag FLAG_RECEIVED_POTION_OLDALE - call_if 0, OldaleTown_EventScript_14DD9E - checkflag FLAG_ADVENTURE_STARTED - call_if 1, OldaleTown_EventScript_14DD8C + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92 + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C end OldaleTown_EventScript_14DD8C:: @ 814DD8C @@ -38,10 +35,8 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3 OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer - checkflag FLAG_RECEIVED_POTION_OLDALE - goto_if_eq OldaleTown_EventScript_14DE79 - checkflag FLAG_TEMP_1 - goto_if_eq OldaleTown_EventScript_14DE79 + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 playbgm BGM_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 @@ -195,8 +190,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_EventScript_14DF26 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closemessage applymovement 3, OldaleTown_Movement_1A083D diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index f90c787c2..15cf40027 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -6,8 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 faceplayer message OldaleTown_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_Mart_EventScript_152FA8 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 release @@ -43,8 +42,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_Mart_EventScript_152FDB + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index d94e02227..c993807c6 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,8 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index df7f42a8b..8ad949bf2 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -6,28 +6,24 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_1541B4 - checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - goto_if_eq PacifidlogTown_House2_EventScript_154254 - checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER - call_if 1, PacifidlogTown_House2_EventScript_1541CE - checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER - call_if 0, PacifidlogTown_House2_EventScript_1541D7 + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254 + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541D7 setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - goto_if 4, PacifidlogTown_House2_EventScript_1541EC + goto_if_ge PacifidlogTown_House2_EventScript_1541EC specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 2 - goto_if 4, PacifidlogTown_House2_EventScript_15421B + goto_if_ge PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 - checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - goto_if 0, PacifidlogTown_House2_EventScript_1A14DC + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 - call_if 1, PacifidlogTown_House2_EventScript_1541E8 + call_if_eq PacifidlogTown_House2_EventScript_1541E8 return PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index f51aea6f7..3b21ac996 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -4,8 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer - checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED - goto_if_eq PacifidlogTown_House3_EventScript_154338 + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_154338 setvar VAR_SPECIAL_8, 2 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, PacifidlogTown_House3_EventScript_15432A + goto_if_ne PacifidlogTown_House3_EventScript_15432A copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index ea58f50c6..cb47a0edd 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -6,9 +6,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_PETALBURG_STATE, 0 - call_if 1, PetalburgCity_EventScript_14B731 + call_if_eq PetalburgCity_EventScript_14B731 compare VAR_PETALBURG_STATE, 2 - call_if 1, PetalburgCity_EventScript_14B739 + call_if_eq PetalburgCity_EventScript_14B739 end PetalburgCity_EventScript_14B731:: @ 814B731 @@ -188,23 +188,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_EventScript_14B91B + call_if_eq PetalburgCity_EventScript_14B91B compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_EventScript_14B930 + call_if_eq PetalburgCity_EventScript_14B930 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_EventScript_14B93B + call_if_eq PetalburgCity_EventScript_14B93B compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_EventScript_14B950 + call_if_eq PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_EventScript_14B965 + call_if_eq PetalburgCity_EventScript_14B965 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_EventScript_14B977 + call_if_eq PetalburgCity_EventScript_14B977 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_EventScript_14B989 + call_if_eq PetalburgCity_EventScript_14B989 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_EventScript_14B99B + call_if_eq PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 applymovement 255, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 406f260b0..54c0e89f6 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -9,26 +9,26 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 compare VAR_PETALBURG_GYM_STATE, 7 - call_if 4, PetalburgCity_Gym_EventScript_1544ED + call_if_ge PetalburgCity_Gym_EventScript_1544ED end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL - call_if 1, PetalburgCity_Gym_EventScript_154FBB + call_if_eq PetalburgCity_Gym_EventScript_154FBB checktrainerflag OPPONENT_MARY - call_if 1, PetalburgCity_Gym_EventScript_154FDC + call_if_eq PetalburgCity_Gym_EventScript_154FDC checktrainerflag OPPONENT_PARKER - call_if 1, PetalburgCity_Gym_EventScript_154FFD + call_if_eq PetalburgCity_Gym_EventScript_154FFD checktrainerflag OPPONENT_LORI - call_if 1, PetalburgCity_Gym_EventScript_15501E + call_if_eq PetalburgCity_Gym_EventScript_15501E checktrainerflag OPPONENT_GEORGE - call_if 1, PetalburgCity_Gym_EventScript_15503F + call_if_eq PetalburgCity_Gym_EventScript_15503F checktrainerflag OPPONENT_JODY - call_if 1, PetalburgCity_Gym_EventScript_155060 + call_if_eq PetalburgCity_Gym_EventScript_155060 checktrainerflag OPPONENT_BERKE - call_if 1, PetalburgCity_Gym_EventScript_155081 + call_if_eq PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -45,11 +45,10 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED PetalburgCity_Gym_MapScript1_15451B:: @ 815451B compare VAR_PETALBURG_GYM_STATE, 1 - call_if 1, PetalburgCity_Gym_EventScript_15453B + call_if_eq PetalburgCity_Gym_EventScript_15453B compare VAR_PETALBURG_GYM_STATE, 6 - call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, PetalburgCity_Gym_EventScript_15454B + call_if_lt PetalburgCity_Gym_EventScript_154543 + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B end PetalburgCity_Gym_EventScript_15453B:: @ 815453B @@ -145,65 +144,65 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse SE_DOOR compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1547EE + call_if_eq PetalburgCity_Gym_EventScript_1547EE compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_154800 + call_if_eq PetalburgCity_Gym_EventScript_154800 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_15481C + call_if_eq PetalburgCity_Gym_EventScript_15481C compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_15481C + call_if_eq PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_154884 + call_if_eq PetalburgCity_Gym_EventScript_154884 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_15488F + call_if_eq PetalburgCity_Gym_EventScript_15488F compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548A1 + call_if_eq PetalburgCity_Gym_EventScript_1548A1 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548B3 + call_if_eq PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1548C5 + call_if_eq PetalburgCity_Gym_EventScript_1548C5 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_1548D0 + call_if_eq PetalburgCity_Gym_EventScript_1548D0 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548DB + call_if_eq PetalburgCity_Gym_EventScript_1548DB compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548E6 + call_if_eq PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_15492F + call_if_eq PetalburgCity_Gym_EventScript_15492F compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_154930 + call_if_eq PetalburgCity_Gym_EventScript_154930 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_15493B + call_if_eq PetalburgCity_Gym_EventScript_15493B compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_15493C + call_if_eq PetalburgCity_Gym_EventScript_15493C compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_1548FC + call_if_eq PetalburgCity_Gym_EventScript_1548FC compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm BGM_TSURETEK, FALSE compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_154835 + call_if_eq PetalburgCity_Gym_EventScript_154835 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_15484E + call_if_eq PetalburgCity_Gym_EventScript_15484E compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_154860 + call_if_eq PetalburgCity_Gym_EventScript_154860 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_154872 + call_if_eq PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar VAR_PETALBURG_GYM_STATE, 1 @@ -354,10 +353,8 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - checkflag FLAG_RECEIVED_TM42 - goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq PetalburgCity_Gym_EventScript_154B69 + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release end @@ -420,22 +417,22 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage compare FACING, 2 - call_if 1, PetalburgCity_Gym_EventScript_154ABC + call_if_eq PetalburgCity_Gym_EventScript_154ABC compare FACING, 1 - call_if 1, PetalburgCity_Gym_EventScript_154AC7 + call_if_eq PetalburgCity_Gym_EventScript_154AC7 compare FACING, 3 - call_if 1, PetalburgCity_Gym_EventScript_154AD2 + call_if_eq PetalburgCity_Gym_EventScript_154AD2 compare FACING, 4 - call_if 1, PetalburgCity_Gym_EventScript_154ADD + call_if_eq PetalburgCity_Gym_EventScript_154ADD delay 70 compare FACING, 2 - call_if 1, PetalburgCity_Gym_EventScript_154AE8 + call_if_eq PetalburgCity_Gym_EventScript_154AE8 compare FACING, 1 - call_if 1, PetalburgCity_Gym_EventScript_154AF3 + call_if_eq PetalburgCity_Gym_EventScript_154AF3 compare FACING, 3 - call_if 1, PetalburgCity_Gym_EventScript_154AFE + call_if_eq PetalburgCity_Gym_EventScript_154AFE compare FACING, 4 - call_if 1, PetalburgCity_Gym_EventScript_154B09 + call_if_eq PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release end @@ -593,7 +590,7 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 85 msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO @@ -623,7 +620,7 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO @@ -636,7 +633,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -649,7 +646,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -662,7 +659,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -675,7 +672,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -688,7 +685,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -701,7 +698,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -714,7 +711,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -727,7 +724,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -740,7 +737,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -753,7 +750,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -765,8 +762,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154E29 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -783,8 +779,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154E65 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -801,8 +796,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154EA1 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -819,8 +813,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154EDD + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -837,8 +830,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F19 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -855,8 +847,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F55 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -873,8 +864,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F91 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -892,72 +882,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar VAR_SPECIAL_4, 1 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar VAR_SPECIAL_4, 2 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar VAR_SPECIAL_4, 3 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar VAR_SPECIAL_4, 4 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar VAR_SPECIAL_4, 5 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar VAR_SPECIAL_4, 6 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar VAR_SPECIAL_4, 7 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar VAR_SPECIAL_4, 8 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return @@ -1021,8 +1011,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187 PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_1551A0 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release end @@ -1034,15 +1023,13 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag FLAG_BADGE05_GET - goto_if_eq PetalburgCity_Gym_EventScript_1551CA + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag FLAG_BADGE05_GET - goto_if_eq PetalburgCity_Gym_EventScript_1551CA + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index 66e247323..7584f6f19 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -6,8 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 faceplayer message PetalburgCity_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS - goto_if_eq PetalburgCity_Mart_EventScript_1552EA + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 8dda62ea1..136cc11c5 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F compare VAR_STARTER_MON, 0 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155272 compare VAR_STARTER_MON, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15527B compare VAR_STARTER_MON, 2 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 08bbcb0c7..d642d70ed 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -4,22 +4,17 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 - checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY - goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_1543F7 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154427 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154406 + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -49,10 +44,8 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_15446D + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 149fd4e46..17908440c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -241,8 +241,7 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer - checkflag FLAG_RECEIVED_MIRACLE_SEED - goto_if_eq PetalburgWoods_EventScript_15CF0B + goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem_std ITEM_MIRACLE_SEED compare RESULT, 0 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c90a97531..a3824efcf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,10 +17,8 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_EventScript_14EEC4 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_14EEC4 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return @@ -31,8 +29,7 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 - goto_if_eq Route104_EventScript_14EEFF + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 @@ -50,8 +47,7 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag FLAG_RECEIVED_WHITE_HERB - goto_if_eq Route104_EventScript_14EF38 + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem_std ITEM_WHITE_HERB compare RESULT, 0 @@ -104,8 +100,7 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag FLAG_RECEIVED_TM09 - goto_if_eq Route104_EventScript_14EFC2 + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem_std ITEM_TM09 compare RESULT, 0 @@ -158,10 +153,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_EventScript_14F08B - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if_eq Route104_EventScript_14F095 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 4718f9bb9..514b1b9cc 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -5,9 +5,8 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_BRINEY_HOUSE_STATE, 1 - call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 - checkflag FLAG_RECEIVED_POKENAV - call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 + call_if_eq Route104_MrBrineysHouse_EventScript_15BCD4 + call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_15BCD0 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 @@ -24,12 +23,9 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer - checkflag FLAG_MR_BRINEY_SAILING_INTRO - call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E + call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_15BD0E + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_15BD65 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index f7fbb58b5..5e70a8ec2 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -4,10 +4,8 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag FLAG_LANDMARK_FLOWER_SHOP - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end @@ -18,26 +16,24 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer - checkflag FLAG_TEMP_1 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A + goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, NO - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, NO - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -72,8 +68,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer - checkflag FLAG_RECEIVED_WAILMER_PAIL - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 + goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release end @@ -90,8 +85,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, ITEM_CHERI_BERRY diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index b3b256d79..7f1c4ca75 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -5,21 +5,20 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_CINDY_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_LUCAS_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 - checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 - goto_if_eq Route104_Prototype_EventScript_160CFB + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB release end @@ -32,21 +31,20 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_CINDY_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_LUCAS_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 - checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 - goto_if_eq Route104_Prototype_EventScript_160CFB + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 30157e52f..305a2e9af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -3,8 +3,7 @@ Route105_MapScripts:: @ 814F298 .byte 0 Route105_MapScript1_14F29E:: @ 814F29E - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route105_EventScript_14F2A8 + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_14F2A8 end Route105_EventScript_14F2A8:: @ 814F2A8 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index c0344f150..c70365b6a 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -271,8 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D Route109_EventScript_14F680:: @ 814F680 lock faceplayer - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, Route109_EventScript_14F691 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end @@ -328,8 +327,7 @@ Route109_EventScript_14F725:: @ 814F725 lock faceplayer special GetPlayerBigGuyGirlString - checkflag FLAG_RECEIVED_SOFT_SAND - goto_if_eq Route109_EventScript_14F762 + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem_std ITEM_SOFT_SAND compare RESULT, 0 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 4c1574824..e52958c50 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -9,12 +9,9 @@ Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer - checkflag FLAG_RECEIVED_6_SODA_POP - goto_if_eq Route109_SeashoreHouse_EventScript_160E36 - checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS - goto_if_eq Route109_SeashoreHouse_EventScript_160E08 - checkflag FLAG_TEMP_2 - goto_if_eq Route109_SeashoreHouse_EventScript_160DFE + goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_160E36 + goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS, Route109_SeashoreHouse_EventScript_160E08 + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 setflag FLAG_TEMP_2 release @@ -95,11 +92,11 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 checktrainerflag OPPONENT_DWAYNE - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_JOHANNA - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index d5219582c..070340760 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -13,7 +13,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 compare VAR_CYCLING_CHALLENGE_STATE, 1 - call_if 1, Route110_EventScript_14F92F + call_if_eq Route110_EventScript_14F92F end Route110_EventScript_14F92F:: @ 814F92F @@ -327,9 +327,9 @@ Route110_EventScript_14FD34:: @ 814FD34 lockall checkplayergender compare RESULT, 0 - call_if 1, Route110_EventScript_14FDA7 + call_if_eq Route110_EventScript_14FDA7 compare RESULT, 1 - call_if 1, Route110_EventScript_14FDAC + call_if_eq Route110_EventScript_14FDAC applymovement 28, Route110_Movement_1A0845 waitmovement 0 applymovement 28, Route110_Movement_1A0833 @@ -338,11 +338,11 @@ Route110_EventScript_14FD34:: @ 814FD34 waitmovement 0 delay 30 compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF14 + call_if_eq Route110_EventScript_14FF14 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF1F + call_if_eq Route110_EventScript_14FF1F compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF2A + call_if_eq Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 @@ -426,22 +426,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF56 + call_if_eq Route110_EventScript_14FF56 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF5E + call_if_eq Route110_EventScript_14FF5E compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF66 + call_if_eq Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF35 + call_if_eq Route110_EventScript_14FF35 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF40 + call_if_eq Route110_EventScript_14FF40 compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF4B + call_if_eq Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 savebgm 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index af72dedd0..f05e2caa2 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE compare VAR_CYCLING_CHALLENGE_STATE, 3 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 compare VAR_CYCLING_CHALLENGE_STATE, 2 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 @@ -25,7 +25,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 lockall specialvar RESULT, GetPlayerAvatarBike @ player state? compare RESULT, 2 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 68ce0f5a7..020c61258 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_161994 + call_if_eq Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 @@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closemessage compare FACING, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_161C74 + call_if_eq Route110_TrickHouseEnd_EventScript_161C74 compare FACING, 2 - call_if 1, Route110_TrickHouseEnd_EventScript_161C7F + call_if_eq Route110_TrickHouseEnd_EventScript_161C7F compare FACING, 3 - call_if 1, Route110_TrickHouseEnd_EventScript_161C8A + call_if_eq Route110_TrickHouseEnd_EventScript_161C8A compare FACING, 4 - call_if 1, Route110_TrickHouseEnd_EventScript_161C95 + call_if_eq Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closemessage @@ -172,7 +172,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF givedecoration_std DECOR_RED_TENT .endc compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C61 + call_if_eq Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E special ResetTrickHouseEndRoomFlag diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 232d324a4..527f09d27 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -13,11 +13,11 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 @@ -45,56 +45,49 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_16103C + call_if_eq Route110_TrickHouseEntrance_EventScript_16103C compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_161046 + call_if_eq Route110_TrickHouseEntrance_EventScript_161046 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_161050 + call_if_eq Route110_TrickHouseEntrance_EventScript_161050 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_16105A + call_if_eq Route110_TrickHouseEntrance_EventScript_16105A compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_161064 + call_if_eq Route110_TrickHouseEntrance_EventScript_161064 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_16106E + call_if_eq Route110_TrickHouseEntrance_EventScript_16106E compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_161078 + call_if_eq Route110_TrickHouseEntrance_EventScript_161078 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 - call_if 1, Route110_TrickHouseEntrance_EventScript_161082 + call_if_eq Route110_TrickHouseEntrance_EventScript_161082 return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag FLAG_BADGE03_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag FLAG_BADGE04_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag FLAG_BADGE05_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag FLAG_BADGE06_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag FLAG_BADGE07_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag FLAG_BADGE08_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 @@ -214,7 +207,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_161327 + call_if_eq Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closemessage delay 20 @@ -249,21 +242,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD + call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF + call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA + call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_161303 + call_if_eq Route110_TrickHouseEntrance_EventScript_161303 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_16130C + call_if_eq Route110_TrickHouseEntrance_EventScript_16130C closemessage setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 @@ -372,7 +365,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -382,7 +375,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -392,7 +385,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -402,7 +395,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -412,7 +405,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -422,7 +415,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -432,7 +425,7 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -457,7 +450,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall end @@ -727,11 +720,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_16190B + call_if_eq Route110_TrickHouseEntrance_EventScript_16190B setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index b1cb0c9df..cdde15d1a 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E2C compare VAR_TEMP_2, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E3F compare VAR_TEMP_3, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E52 compare VAR_TEMP_4, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 8d5392ae8..14a021e8d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 @@ -32,19 +32,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 1, 3, 600, 0 setmetatile 10, 2, 600, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F + call_if_eq Route110_TrickHousePuzzle3_EventScript_161F9F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FA9 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FB3 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FBD compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FC7 compare VAR_TEMP_8, 6 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FD1 compare VAR_TEMP_8, 7 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FDB return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F @@ -303,19 +303,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar VAR_TEMP_6, 0 setvar VAR_TEMP_7, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162683 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162689 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F + call_if_eq Route110_TrickHousePuzzle3_EventScript_16268F compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162695 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B + call_if_eq Route110_TrickHousePuzzle3_EventScript_16269B compare VAR_TEMP_8, 6 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A1 compare VAR_TEMP_8, 7 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 @@ -348,9 +348,9 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 1bcdb8087..5ec1a4d64 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -166,11 +166,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 switch RESULT @@ -188,11 +188,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 switch RESULT @@ -210,11 +210,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 switch RESULT @@ -232,11 +232,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 switch RESULT @@ -254,11 +254,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 switch RESULT @@ -419,80 +419,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F43 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F4E compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F59 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F64 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F7A compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F85 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F90 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F9B compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FB1 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FBC compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FC7 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FD2 compare VAR_TEMP_9, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FE8 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FF3 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FFE compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163009 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F + call_if_eq Route110_TrickHousePuzzle5_EventScript_16301F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A + call_if_eq Route110_TrickHousePuzzle5_EventScript_16302A compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163035 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163040 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B + call_if_eq Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163056 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163061 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C + call_if_eq Route110_TrickHousePuzzle5_EventScript_16306C compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163077 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163082 return Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index d1de7682f..1ee608166 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -10,16 +10,11 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 end Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 @@ -87,7 +82,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 + call_if_eq Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B @@ -121,76 +116,56 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c338091a0..11af07dce 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -4,8 +4,7 @@ Route111_MapScripts:: @ 814FF91 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route111_EventScript_14FFA6 + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6 end Route111_EventScript_14FFA6:: @ 814FFA6 @@ -17,21 +16,21 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 checktrainerflag OPPONENT_VICKY - goto_if 0, Route111_EventScript_15000D + goto_if_lt Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C compare VAR_TEMP_1, 107 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_1, 72 - goto_if 2, Route111_EventScript_150009 + goto_if_gt Route111_EventScript_150009 compare VAR_TEMP_0, 2000 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_0, 8 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 setweather WEATHER_SANDSTORM @@ -121,8 +120,7 @@ Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 - goto_if_eq Route111_EventScript_150100 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 @@ -174,13 +172,13 @@ Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage compare VAR_SPECIAL_4, 0 - call_if 1, Route111_EventScript_150188 + call_if_eq Route111_EventScript_150188 compare VAR_SPECIAL_4, 1 - call_if 1, Route111_EventScript_150193 + call_if_eq Route111_EventScript_150193 compare VAR_SPECIAL_4, 2 - call_if 1, Route111_EventScript_15019E + call_if_eq Route111_EventScript_15019E compare VAR_SPECIAL_4, 3 - call_if 1, Route111_EventScript_1501A9 + call_if_eq Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 8352db786..020b51791 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -13,8 +13,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer setvar VAR_SPECIAL_8, 3 - checkflag FLAG_RECEIVED_MACHO_BRACE - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 + goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem_std ITEM_MACHO_BRACE compare RESULT, 0 @@ -40,8 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer setvar VAR_SPECIAL_8, 4 - checkflag FLAG_TEMP_4 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index adbea780e..96eb68046 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_CABLE_CAR_STATION_STATE, 2 - call_if 1, Route112_CableCarStation_EventScript_15C052 + call_if_eq Route112_CableCarStation_EventScript_15C052 end Route112_CableCarStation_EventScript_15C052:: @ 815C052 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index a1593ba1e..41b289db0 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -15,9 +15,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 19 - goto_if 0, Route113_EventScript_150604 + goto_if_lt Route113_EventScript_150604 compare VAR_TEMP_0, 84 - goto_if 2, Route113_EventScript_150604 + goto_if_gt Route113_EventScript_150604 setweather WEATHER_ASH return diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 3f991277f..e42a6f89a 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_GLASS_WORKSHOP_STATE, 1 - call_if 1, Route113_GlassWorkshop_EventScript_16355F + call_if_eq Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F @@ -16,7 +16,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer compare VAR_GLASS_WORKSHOP_STATE, 10 - goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 + goto_if_ge Route113_GlassWorkshop_EventScript_1638D2 compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 compare VAR_GLASS_WORKSHOP_STATE, 1 @@ -39,7 +39,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_163818 + goto_if_lt Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -71,7 +71,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -85,7 +85,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -99,7 +99,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -113,7 +113,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -127,7 +127,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -142,7 +142,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -157,7 +157,7 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare VAR_SPECIAL_9, 0 - call_if 1, Route113_GlassWorkshop_EventScript_163889 + call_if_eq Route113_GlassWorkshop_EventScript_163889 compare VAR_SPECIAL_9, 1 - call_if 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare VAR_SPECIAL_9, 0 - call_if 1, Route113_GlassWorkshop_EventScript_163889 + call_if_eq Route113_GlassWorkshop_EventScript_163889 compare VAR_SPECIAL_9, 1 - call_if 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index f6bb6d8ba..30ab8c572 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,8 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 - goto_if_eq Route114_EventScript_150778 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 @@ -27,8 +26,7 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag FLAG_RECEIVED_TM05 - goto_if_eq Route114_EventScript_1507B9 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem_std ITEM_TM05 compare RESULT, 0 diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 1a1445fde..b191db5f6 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -9,8 +9,7 @@ Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer - checkflag FLAG_RECEIVED_TM28 - goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem_std ITEM_TM28 compare RESULT, 0 diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 2ce9c1bfa..740a48314 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -4,8 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer - checkflag FLAG_RECEIVED_FOSSIL_MON - goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E + goto_if_set FLAG_RECEIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index c34d4fc7e..30eb844ac 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -9,8 +9,7 @@ Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer - checkflag FLAG_RECEIVED_DOLL_LANETTE - goto_if_eq Route114_LanettesHouse_EventScript_15C28F + goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_15C28F setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE @@ -41,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route114_LanettesHouse_EventScript_15C2CC + call_if_eq Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 4e08705cf..eea14e25d 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -3,8 +3,7 @@ Route116_MapScripts:: @ 8150A31 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 - checkflag FLAG_RECOVERED_DEVON_GOODS - call_if 1, Route116_EventScript_150A41 + call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A41 end Route116_EventScript_150A41:: @ 8150A41 @@ -14,10 +13,8 @@ Route116_EventScript_150A41:: @ 8150A41 Route116_EventScript_150A49:: @ 8150A49 lock faceplayer - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq Route116_EventScript_150A67 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq Route116_EventScript_150A71 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67 + goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release end @@ -35,8 +32,7 @@ Route116_EventScript_150A71:: @ 8150A71 Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq Route116_EventScript_150B04 + goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end @@ -49,13 +45,13 @@ Route116_EventScript_150A94:: @ 8150A94 msgbox Route116_Text_1707B8, 4 closemessage compare FACING, 2 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 1 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 3 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 4 - call_if 1, Route116_EventScript_150AF9 + call_if_eq Route116_EventScript_150AF9 removeobject LAST_TALKED clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F setflag FLAG_RECEIVED_REPEAT_BALL @@ -182,13 +178,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 delay 20 compare FACING, 2 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 1 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 3 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 4 - call_if 1, Route116_EventScript_150C42 + call_if_eq Route116_EventScript_150C42 removeobject LAST_TALKED release end diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 24091c4ac..5ec6ef642 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -17,8 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index fa648f79e..9f42412ab 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,8 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, Route117_EventScript_150D56 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 Route117_EventScript_150D56:: @ 8150D56 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index a4452d989..569a7103e 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -9,8 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E Route118_EventScript_150F34:: @ 8150F34 lock faceplayer - checkflag FLAG_RECEIVED_GOOD_ROD - goto_if_eq Route118_EventScript_150F89 + goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89 msgbox Route118_Text_170F12, MSGBOX_YESNO compare RESULT, YES goto_if_eq Route118_EventScript_150F5E @@ -84,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 msgbox Route118_Text_170D66, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, Route118_EventScript_151048 + call_if_eq Route118_EventScript_151048 compare VAR_SPECIAL_8, 1 - call_if 1, Route118_EventScript_151053 + call_if_eq Route118_EventScript_151053 compare VAR_SPECIAL_8, 2 - call_if 1, Route118_EventScript_15105E + call_if_eq Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 8d9f88474..4b9f3ce5f 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,15 +4,14 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route119_EventScript_15117C + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C end Route119_EventScript_15117C:: @ 815117C compare VAR_SPECIAL_4, 6 - call_if 1, Route119_EventScript_151193 + call_if_eq Route119_EventScript_151193 compare VAR_SPECIAL_4, 7 - call_if 1, Route119_EventScript_151197 + call_if_eq Route119_EventScript_151197 return Route119_EventScript_151193:: @ 8151193 @@ -28,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_EventScript_1511B9 + call_if_eq Route119_EventScript_1511B9 special SetRoute119Weather end @@ -53,21 +52,21 @@ Route119_EventScript_1511DB:: @ 81511DB addobject 25 checkplayergender compare RESULT, 0 - call_if 1, Route119_EventScript_151254 + call_if_eq Route119_EventScript_151254 compare RESULT, 1 - call_if 1, Route119_EventScript_151259 + call_if_eq Route119_EventScript_151259 delay 65 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513A6 + call_if_eq Route119_EventScript_1513A6 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513B1 + call_if_eq Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513D2 + call_if_eq Route119_EventScript_1513D2 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513E1 + call_if_eq Route119_EventScript_1513E1 removeobject 25 addobject 16 delay 30 @@ -155,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closemessage compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513D2 + call_if_eq Route119_EventScript_1513D2 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513E1 + call_if_eq Route119_EventScript_1513E1 removeobject 16 addobject 25 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513BC + call_if_eq Route119_EventScript_1513BC compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513C7 + call_if_eq Route119_EventScript_1513C7 removeobject 25 setvar VAR_ROUTE119_STATE, 1 savebgm 0 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 8a5c1033f..e5ca6550b 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 + call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41 end Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index b36500345..81037941f 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -5,9 +5,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0 end Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 @@ -87,7 +87,6 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer - checkflag FLAG_RECEIVED_CASTFORM - goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index bacdcd7dd..b49834564 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,23 +5,22 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route120_EventScript_151628 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_151628 end Route120_EventScript_151628:: @ 8151628 compare VAR_SPECIAL_4, 0 - call_if 1, Route120_EventScript_15166B + call_if_eq Route120_EventScript_15166B compare VAR_SPECIAL_4, 1 - call_if 1, Route120_EventScript_151672 + call_if_eq Route120_EventScript_151672 compare VAR_SPECIAL_4, 2 - call_if 1, Route120_EventScript_151676 + call_if_eq Route120_EventScript_151676 compare VAR_SPECIAL_4, 3 - call_if 1, Route120_EventScript_15167A + call_if_eq Route120_EventScript_15167A compare VAR_SPECIAL_4, 4 - call_if 1, Route120_EventScript_15167E + call_if_eq Route120_EventScript_15167E compare VAR_SPECIAL_4, 5 - call_if 1, Route120_EventScript_151682 + call_if_eq Route120_EventScript_151682 return Route120_EventScript_15166B:: @ 815166B @@ -50,12 +49,9 @@ Route120_EventScript_151682:: @ 8151682 return Route120_MapScript1_151686:: @ 8151686 - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route120_EventScript_1516A2 - checkflag FLAG_RECEIVED_DEVON_SCOPE - call_if 1, Route120_EventScript_1516B5 - checkflag FLAG_RECEIVED_DEVON_SCOPE - call_if 0, Route120_EventScript_1516DA + call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1516A2 + call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516B5 + call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516DA end Route120_EventScript_1516A2:: @ 81516A2 @@ -82,11 +78,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 14 - goto_if 3, Route120_EventScript_151715 + goto_if_le Route120_EventScript_151715 compare VAR_TEMP_1, 60 - goto_if 3, Route120_EventScript_151719 + goto_if_le Route120_EventScript_151719 compare VAR_TEMP_1, 61 - goto_if 4, Route120_EventScript_151711 + goto_if_ge Route120_EventScript_151711 return Route120_EventScript_151711:: @ 8151711 @@ -99,9 +95,9 @@ Route120_EventScript_151715:: @ 8151715 Route120_EventScript_151719:: @ 8151719 compare VAR_TEMP_0, 7 - goto_if 3, Route120_EventScript_151735 + goto_if_le Route120_EventScript_151735 compare VAR_TEMP_0, 19 - goto_if 3, Route120_EventScript_151715 + goto_if_le Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -113,13 +109,12 @@ Route120_EventScript_151739:: @ 8151739 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 - goto_if_eq Route120_EventScript_151837 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837 msgbox Route120_Text_1C58F1, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route120_EventScript_151841 + call_if_eq Route120_EventScript_151841 compare RESULT, NO - call_if 1, Route120_EventScript_15184A + call_if_eq Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC @@ -184,8 +179,7 @@ Route120_EventScript_15184A:: @ 815184A Route120_EventScript_151853:: @ 8151853 lock faceplayer - checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 - goto_if_eq Route120_EventScript_151884 + goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884 msgbox Route120_Text_171827, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route120_EventScript_151877 @@ -209,9 +203,9 @@ Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closemessage compare FACING, 2 - call_if 1, Route120_EventScript_15197F + call_if_eq Route120_EventScript_15197F compare FACING, 3 - call_if 1, Route120_EventScript_15198A + call_if_eq Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 delay 20 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index ded372aa6..2648e19ce 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -89,7 +89,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 getpartysize compare RESULT, 6 - goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F + goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index a25c306cc..5f77ea023 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -9,8 +9,7 @@ Route123_MapScript1_151C59:: @ 8151C59 Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer - checkflag FLAG_RECEIVED_TM19 - goto_if_eq Route123_EventScript_151CAC + goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 26edb6fbb..3356df83b 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -10,8 +10,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER - goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 addvar RESULT, 20 @@ -40,8 +39,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE - goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar VAR_SPECIAL_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 @@ -86,8 +84,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E - checkflag FLAG_RECEIVED_SPELON_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_SPELON_BERRY compare RESULT, 0 @@ -97,8 +94,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F - checkflag FLAG_RECEIVED_PAMTRE_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_PAMTRE_BERRY compare RESULT, 0 @@ -108,8 +104,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 - checkflag FLAG_RECEIVED_WATMEL_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_WATMEL_BERRY compare RESULT, 0 @@ -119,8 +114,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 - checkflag FLAG_RECEIVED_DURIN_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_DURIN_BERRY compare RESULT, 0 @@ -130,8 +124,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 - checkflag FLAG_RECEIVED_BELUE_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_BELUE_BERRY compare RESULT, 0 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 289ea2d29..3f02fc6e3 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,8 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route124_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1 end Route124_EventScript_151DEF:: @ 8151DEF diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 9423cf845..7bcddfe19 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -9,8 +9,7 @@ Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer - checkflag FLAG_MET_DIVING_TREASURE_HUNTER - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 + goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 setflag FLAG_MET_DIVING_TREASURE_HUNTER goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E @@ -32,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E9C return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 58bf75c51..a1495ac83 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,8 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route125_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index a89087994..4a28abfb7 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,8 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route126_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_1A02C1 end Route126_EventScript_15200E:: @ 815200E diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 5fb122821..7552f7c5d 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,8 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route127_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1 end Route127_EventScript_15207A:: @ 815207A diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index a97a1e93f..6550db979 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,8 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route128_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index efa26ecd2..ffd204bb9 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,8 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route131_EventScript_15244E + call_if_set FLAG_SYS_GAME_CLEAR, Route131_EventScript_15244E end Route131_EventScript_15244E:: @ 815244E diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c6bdbbdb7..415138d67 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,8 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_EventScript_14C39B + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release end @@ -36,8 +35,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_EventScript_14C3CF + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release end @@ -50,8 +48,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag FLAG_RECEIVED_POKENAV - goto_if_eq RustboroCity_EventScript_14C3EE + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release end @@ -326,8 +323,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_EventScript_14C614 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release end @@ -364,13 +360,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 RustboroCity_EventScript_14C650:: @ 814C650 compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C691 + call_if_eq RustboroCity_EventScript_14C691 compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C6BD + call_if_eq RustboroCity_EventScript_14C6BD compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C6E9 + call_if_eq RustboroCity_EventScript_14C6E9 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C715 + call_if_eq RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 @@ -458,19 +454,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 RustboroCity_EventScript_14C77D:: @ 814C77D compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C7FE + call_if_eq RustboroCity_EventScript_14C7FE compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C82A + call_if_eq RustboroCity_EventScript_14C82A compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C856 + call_if_eq RustboroCity_EventScript_14C856 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C882 + call_if_eq RustboroCity_EventScript_14C882 compare VAR_TEMP_1, 4 - call_if 1, RustboroCity_EventScript_14C8B8 + call_if_eq RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL compare RESULT, 0 - call_if 1, RustboroCity_EventScript_14C7F5 + call_if_eq RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS @@ -549,8 +545,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag FLAG_MET_RIVAL_RUSTBORO - goto_if_eq RustboroCity_EventScript_14C917 + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 3371005c0..e18a1e029 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -4,8 +4,7 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer - checkflag FLAG_RECEIVED_HM01 - goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index f9e902763..7b56c72a2 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -3,8 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - checkflag FLAG_RETURNED_DEVON_GOODS - call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157416 end RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 @@ -15,10 +14,8 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release end @@ -36,12 +33,9 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release end @@ -59,12 +53,9 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 179140378..b7b36dd6d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release end @@ -24,9 +24,8 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release end @@ -40,9 +39,8 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag FLAG_RECEIVED_POKENAV - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release end @@ -56,7 +54,7 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release end @@ -147,7 +145,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -167,7 +165,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index ff854d7ef..0b71effee 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 compare VAR_DEVON_CORP_3F_STATE, 0 - call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D + call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D end RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D @@ -146,10 +146,8 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer - checkflag FLAG_RECEIVED_EXP_SHARE - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D @@ -181,8 +179,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer - checkflag FLAG_RECEIVED_REPEAT_BALL - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 3a2242c7a..5ed9ac0ef 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -8,8 +8,7 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer - checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO - goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem_std ITEM_PREMIER_BALL compare RESULT, 0 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 1e2256b47..bcd597541 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,8 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE - checkflag FLAG_RECEIVED_TM39 - goto_if 0, RustboroCity_Gym_EventScript_15793C + goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release end @@ -21,7 +20,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setvar VAR_SPECIAL_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, RustboroCity_Gym_EventScript_1A00FB + call_if_eq RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end @@ -47,8 +46,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977 RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer - checkflag FLAG_DEFEATED_RUSTBORO_GYM - goto_if_eq RustboroCity_Gym_EventScript_1579A3 + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release end @@ -60,15 +58,13 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_Gym_EventScript_1579CD + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_Gym_EventScript_1579CD + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index c0f1bc689..abbac505b 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -4,8 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer - checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED - goto_if_eq RustboroCity_House1_EventScript_157D13 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13 setvar VAR_SPECIAL_8, 0 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, RustboroCity_House1_EventScript_157D05 + goto_if_ne RustboroCity_House1_EventScript_157D05 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index 69f977e79..c8e3f3a43 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -6,10 +6,8 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 faceplayer message RustboroCity_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if 0, RustboroCity_Mart_EventScript_157BEF - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq RustboroCity_Mart_EventScript_157C18 + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18 end RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 21fdf3d3b..155df8de5 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -77,12 +77,11 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer - checkflag FLAG_RECEIVED_QUICK_CLAW - goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 - call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E + call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E compare FACING, 3 - call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 + call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem_std ITEM_QUICK_CLAW compare RESULT, 0 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 050cf28c2..7c715b6c2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -11,7 +11,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 compare VAR_RUSTURF_TUNNEL_STATE, 2 - call_if 1, RusturfTunnel_EventScript_15C773 + call_if_eq RusturfTunnel_EventScript_15C773 end RusturfTunnel_EventScript_15C773:: @ 815C773 @@ -32,8 +32,7 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer - checkflag FLAG_TEMP_1 - goto_if_eq RusturfTunnel_EventScript_15C7BC + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, 4 closemessage @@ -53,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C8CA + call_if_eq RusturfTunnel_EventScript_15C8CA compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C8DF + call_if_eq RusturfTunnel_EventScript_15C8DF compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8EA + call_if_eq RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C8EB + call_if_eq RusturfTunnel_EventScript_15C8EB compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8EB + call_if_eq RusturfTunnel_EventScript_15C8EB giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C880 + call_if_eq RusturfTunnel_EventScript_15C880 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C892 + call_if_eq RusturfTunnel_EventScript_15C892 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8AE + call_if_eq RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C8F7 + call_if_eq RusturfTunnel_EventScript_15C8F7 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C909 + call_if_eq RusturfTunnel_EventScript_15C909 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C91B + call_if_eq RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index dd5aee95c..cd830f2b0 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -124,8 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -134,8 +133,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 SSTidalCorridor_EventScript_15FE17:: @ 815FE17 setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release @@ -163,8 +161,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer - checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS - goto_if_eq SSTidalCorridor_EventScript_15FE7A + goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 release @@ -177,21 +174,21 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A SSTidalCorridor_EventScript_15FE84:: @ 815FE84 checktrainerflag OPPONENT_PHILLIP - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEONARD - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_COLTON - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_TUCKER - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_THOMAS - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEA_AND_JED - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_GARRET - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 0390177de..58e7c3235 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -4,8 +4,7 @@ SSTidalRooms_MapScripts:: @ 815FF05 SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer - checkflag FLAG_RECEIVED_TM49 - goto_if_eq SSTidalRooms_EventScript_15FF3D + goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem_std ITEM_TM49 compare RESULT, 0 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index b3eb297e9..493aa55a1 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -21,7 +21,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B SafariZone_Southeast_MapScript1_160073:: @ 8160073 compare VAR_SAFARI_ZONE_STATE, 2 - call_if 1, SafariZone_Southeast_EventScript_16007F + call_if_eq SafariZone_Southeast_EventScript_16007F end SafariZone_Southeast_EventScript_16007F:: @ 816007F diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index d788be9b3..11aba3ac8 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -6,8 +6,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbuttonpress erasebox 0, 0, 29, 19 - checkflag FLAG_REGI_DOORS_OPENED - goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 + goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index ad17819c2..1f2159010 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,8 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag FLAG_SYS_BRAILLE_DIG - call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F0F5 end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 @@ -109,8 +108,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag FLAG_SYS_BRAILLE_DIG - goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 4dcd88761..2005cb67b 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E @@ -20,8 +19,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag FLAG_SYS_SHOAL_ITEM - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 @@ -33,7 +31,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106 compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index b6aba9523..21997d076 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB @@ -21,47 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 end ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E213 setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E22B setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E243 setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E256 setmetatile 16, 13, 857, 1 return @@ -70,8 +61,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -88,8 +78,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -101,8 +90,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -114,8 +102,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -127,8 +114,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -145,8 +131,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index c7cb08a9b..19223a499 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 end ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E412 setmetatile 18, 2, 856, 1 return @@ -17,8 +16,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B @@ -36,8 +34,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer - checkflag FLAG_RECEIVED_FOCUS_BAND - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E + goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem_std ITEM_FOCUS_BAND compare RESULT, 0 diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index efcad59d3..5f9726038 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D end ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3B6 setmetatile 11, 11, 856, 1 return @@ -17,8 +16,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 07a78d2c4..82149a4bc 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,8 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SkyPillar_Top_EventScript_15F312 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_15F312 end SkyPillar_Top_EventScript_15F312:: @ 815F312 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index ae8534ad9..4af912ed3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -13,7 +13,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BA68 + call_if_eq SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C @@ -68,10 +68,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 - call_if 1, SlateportCity_EventScript_14BB35 + call_if_eq SlateportCity_EventScript_14BB35 specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 - call_if 1, SlateportCity_EventScript_14BB2B + call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 playfanfare BGM_FANFA4 message SlateportCity_Text_1646DD @@ -96,7 +96,7 @@ SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BB56 + call_if_eq SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release end @@ -110,7 +110,7 @@ SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BB77 + call_if_eq SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release end @@ -124,9 +124,8 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BBA1 - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if_eq SlateportCity_EventScript_14BBAB + call_if_eq SlateportCity_EventScript_14BBA1 + goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release end @@ -145,7 +144,7 @@ SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BBCC + call_if_eq SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release end @@ -169,7 +168,7 @@ SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BC0A + call_if_eq SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release end @@ -182,8 +181,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer - checkflag FLAG_DOCK_REJECTED_DEVON_GOODS - goto_if_eq SlateportCity_EventScript_14BC29 + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release end @@ -199,10 +197,8 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_EventScript_14BC63 - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_EventScript_14BC59 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63 + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall end @@ -235,8 +231,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_EventScript_14BCA5 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall end @@ -254,7 +249,7 @@ SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BCCF + call_if_eq SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release end @@ -289,9 +284,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 faceplayer msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO compare RESULT, YES - call_if 1, SlateportCity_EventScript_14BD28 + call_if_eq SlateportCity_EventScript_14BD28 compare RESULT, NO - call_if 1, SlateportCity_EventScript_14BD31 + call_if_eq SlateportCity_EventScript_14BD31 release end @@ -410,8 +405,7 @@ SlateportCity_EventScript_14BE16:: @ 814BE16 SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if 0, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage pokemartdecoration SlateportCity_Decorations2 @@ -442,8 +436,7 @@ SlateportCity_Decorations2:: @ 814BE40 @ 814BE60 lock faceplayer - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if 0, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage pokemartdecoration SlateportCity_Decorations3 diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 0a6f40c75..4151579a2 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -12,8 +12,7 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer - checkflag FLAG_RECEIVED_TM41 - goto_if_eq SlateportCity_ContestHall_EventScript_155595 + goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem_std ITEM_TM41 compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 59c5b13fc..22f797968 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -101,8 +101,7 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall - checkflag FLAG_RECEIVED_POKEBLOCK_CASE - goto_if_eq SlateportCity_ContestLobby_EventScript_155526 + goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 4be5c6daf..82a17b0a6 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -6,9 +6,8 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_SLATEPORT_HARBOR_STATE, 1 - call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, SlateportCity_Harbor_EventScript_155F85 + call_if_eq SlateportCity_Harbor_EventScript_155F89 + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 @@ -64,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 compare VAR_SPECIAL_8, 0 - call_if 1, SlateportCity_Harbor_EventScript_15605C + call_if_eq SlateportCity_Harbor_EventScript_15605C compare VAR_SPECIAL_8, 1 - call_if 1, SlateportCity_Harbor_EventScript_156071 + call_if_eq SlateportCity_Harbor_EventScript_156071 compare VAR_SPECIAL_8, 2 - call_if 1, SlateportCity_Harbor_EventScript_156086 + call_if_eq SlateportCity_Harbor_EventScript_156086 compare VAR_SPECIAL_8, 3 - call_if 1, SlateportCity_Harbor_EventScript_156086 + call_if_eq SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT @@ -159,8 +158,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_Harbor_EventScript_1560D9 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release end @@ -224,9 +222,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 delay 30 hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare FACING, 2 - call_if 1, SlateportCity_Harbor_EventScript_1561EF + call_if_eq SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 - call_if 1, SlateportCity_Harbor_EventScript_1561E4 + call_if_eq SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_SPECIAL_4, 5 @@ -268,12 +266,9 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_Harbor_EventScript_15626F - checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE - goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq SlateportCity_Harbor_EventScript_156258 + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F + goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258 compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 @@ -305,8 +300,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_Harbor_EventScript_15629D + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 13de091cb..be2955937 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -16,7 +16,7 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 - goto_if 5, SlateportCity_House1_EventScript_1556C9 + goto_if_ne SlateportCity_House1_EventScript_1556C9 compare VAR_SPECIAL_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 5d0fdb411..c8ece697d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -57,8 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D end SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage hidemoneybox 0, 0 @@ -173,7 +172,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 compare FACING, 2 - goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD + goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD end SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 5dae0bc6b..d84982e2e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -22,21 +22,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmovement 0 compare FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 compare FACING, 4 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 compare FACING, 4 - call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 compare FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index f7cc67236..6a8c88e1e 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -23,18 +23,13 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar VAR_TEMP_2, 0 - checkflag FLAG_RECEIVED_YELLOW_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_GREEN_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_PINK_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_BLUE_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_RED_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 compare VAR_TEMP_2, 5 - call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D + call_if_eq SlateportCity_PokemonFanClub_EventScript_15588D compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 @@ -49,16 +44,11 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar VAR_TEMP_1, 0 - checkflag FLAG_RECEIVED_YELLOW_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE - checkflag FLAG_RECEIVED_GREEN_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 - checkflag FLAG_RECEIVED_PINK_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 - checkflag FLAG_RECEIVED_BLUE_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 - checkflag FLAG_RECEIVED_RED_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 + call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_1559FE + call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_1559E7 + call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_1559D0 + call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_1559B9 + call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferleadmonspeciesname 0 switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_155899 @@ -146,7 +136,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialvar RESULT, CheckLeadMonCool compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559B3 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 @@ -156,7 +146,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialvar RESULT, CheckLeadMonBeauty compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559CA return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA @@ -166,7 +156,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialvar RESULT, CheckLeadMonCute compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559E1 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 @@ -176,7 +166,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialvar RESULT, CheckLeadMonSmart compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559F8 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 @@ -186,7 +176,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialvar RESULT, CheckLeadMonTough compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F + call_if_eq SlateportCity_PokemonFanClub_EventScript_155A0F return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F @@ -196,12 +186,11 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer - checkflag FLAG_RECEIVED_SOOTHE_BELL - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 + goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A + goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 46dc8419c..dd31e8e26 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,14 +3,10 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF - checkflag FLAG_DOCK_REJECTED_DEVON_GOODS - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_155388 + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_15539C + goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 367677751..669d4ecfa 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -5,10 +5,8 @@ SootopolisCity_MapScripts:: @ 814D07D .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 0, SootopolisCity_EventScript_14D0A0 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 1, SootopolisCity_EventScript_14D0B1 + call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0 + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1 end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 @@ -17,8 +15,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 0, SootopolisCity_EventScript_14D0BB + call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB return SootopolisCity_EventScript_14D0BB:: @ 814D0BB @@ -35,10 +32,8 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag FLAG_VISITED_SOOTOPOLIS_CITY - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, SootopolisCity_EventScript_14D159 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, SootopolisCity_EventScript_14D123 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159 + call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123 end SootopolisCity_EventScript_14D123:: @ 814D123 @@ -46,7 +41,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 compare VAR_SOOTOPOLIS_STATE, 1 - call_if 1, SootopolisCity_EventScript_14D142 + call_if_eq SootopolisCity_EventScript_14D142 return SootopolisCity_EventScript_14D142:: @ 814D142 @@ -68,8 +63,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165 SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D183 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release end @@ -92,8 +86,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F faceplayer dodailyevents special GetPlayerBigGuyGirlString - checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS - goto_if_eq SootopolisCity_EventScript_14D241 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 @@ -142,8 +135,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer - checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM - goto_if_eq SootopolisCity_EventScript_14D27D + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release end @@ -156,8 +148,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D29C + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release end @@ -170,8 +161,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D2BB + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release end @@ -184,8 +174,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D2DA + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release end @@ -445,8 +434,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D4AD + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 .else diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 35fa306e6..44bcda12f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E compare VAR_ICE_STEP_COUNT, 8 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85 compare VAR_ICE_STEP_COUNT, 28 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73 compare VAR_ICE_STEP_COUNT, 69 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -87,10 +87,8 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D - checkflag FLAG_RECEIVED_TM03 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag FLAG_BADGE06_GET - goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A + goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release end @@ -124,8 +122,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer - checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release end @@ -137,15 +134,13 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag FLAG_BADGE08_GET - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag FLAG_BADGE08_GET - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 074c9a179..67be3738b 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -4,8 +4,7 @@ SootopolisCity_House1_MapScripts:: @ 815B29A SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer - checkflag FLAG_RECEIVED_TM31 - goto_if_eq SootopolisCity_House1_EventScript_15B2C7 + goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem_std ITEM_TM31 setflag FLAG_RECEIVED_TM31 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index e32e993dd..d714993d4 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 faceplayer msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO compare RESULT, YES - call_if 1, SootopolisCity_House2_EventScript_15B307 + call_if_eq SootopolisCity_House2_EventScript_15B307 compare RESULT, NO - call_if 1, SootopolisCity_House2_EventScript_15B310 + call_if_eq SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index d2fb4ed7b..24c59500a 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -4,11 +4,10 @@ SootopolisCity_House6_MapScripts:: @ 815B385 SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer - checkflag FLAG_RECEIVED_WAILMER_DOLL - goto_if_eq SootopolisCity_House6_EventScript_15B3CD + goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO compare RESULT, NO - call_if 1, SootopolisCity_House6_EventScript_15B3C3 + call_if_eq SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration_std DECOR_WAILMER_DOLL compare RESULT, 0 diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 115ed0453..1687bd91e 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -29,10 +29,8 @@ SootopolisCity_Mart_Items:: @ 815B234 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_Mart_EventScript_15B268 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_Mart_EventScript_15B268 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B268 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release end @@ -45,10 +43,8 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268 SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_Mart_EventScript_15B290 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_Mart_EventScript_15B290 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B290 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release end diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 9eb5b4a57..820dd4858 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -17,10 +17,8 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release end @@ -33,10 +31,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index cbc451a18..5878a43d5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,8 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SouthernIsland_Interior_EventScript_160B68 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_160B68 end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 @@ -44,10 +43,8 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 - checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS - goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, SouthernIsland_Interior_EventScript_160C08 + goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08 + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08 setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy applymovement 127, SouthernIsland_Interior_Movement_160C12 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index d991a7096..d34558e40 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -6,8 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9BB end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB @@ -15,8 +14,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9C9 end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 8d3e8e723..3151c4575 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 compare VAR_SPECIAL_4, 12 - goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 compare VAR_SPECIAL_5, 44 - goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index ffd184ddf..44b9463b4 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -14,15 +14,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId compare RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_15F5E0 + call_if_eq LinkContestRoom1_EventScript_15F5E0 compare RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_15F5E4 + call_if_eq LinkContestRoom1_EventScript_15F5E4 compare RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_15F5E8 + call_if_eq LinkContestRoom1_EventScript_15F5E8 compare RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_15F5EC + call_if_eq LinkContestRoom1_EventScript_15F5EC compare RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_15F5F0 + call_if_eq LinkContestRoom1_EventScript_15F5F0 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 @@ -47,7 +47,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 compare VAR_TEMP_9, 1 - call_if 1, LinkContestRoom1_EventScript_15F600 + call_if_eq LinkContestRoom1_EventScript_15F600 end LinkContestRoom1_EventScript_15F600:: @ 815F600 @@ -76,7 +76,7 @@ LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 compare VAR_TEMP_0, 8 - goto_if 0, LinkContestRoom1_EventScript_15F630 + goto_if_lt LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index ca2a3c245..c8adf85c3 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -11,8 +11,7 @@ VerdanturfTown_MapScript1_14E85A:: @ 814E85A VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_EventScript_14E885 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 applymovement 2, VerdanturfTown_Movement_1A083D waitmovement 0 @@ -37,8 +36,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_EventScript_14E8C0 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 37811dbc1..85b524c99 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -101,8 +101,7 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer - checkflag FLAG_RECEIVED_TM45 - goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 + goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem_std ITEM_TM45 compare RESULT, 0 diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index 205a4315c..4410beaba 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -4,8 +4,7 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer - checkflag FLAG_WALLY_SPEECH - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 + goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 setflag FLAG_WALLY_SPEECH release @@ -19,10 +18,8 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_153FA5 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release end @@ -44,10 +41,8 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 - checkflag FLAG_DEFEATED_WALLY_MAUVILLE - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153FE0 + goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release end @@ -65,12 +60,9 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_154025 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_15401B + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index ed0440343..4f3180318 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,8 +3,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - call_if 1, VictoryRoad_1F_EventScript_15DE93 + call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index b02ab4faa..4813caa68 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,8 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer - checkflag FLAG_SYS_CHAT_USED - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB + goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end @@ -30,7 +29,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A lock faceplayer compare VAR_SPECIAL_4, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 @@ -84,7 +83,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 lock faceplayer compare VAR_SPECIAL_4, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 @@ -97,10 +96,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D end PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 - checkflag FLAG_BADGE05_GET - goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - checkflag FLAG_SYS_EXDATA_ENABLE - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if_unset FLAG_BADGE05_GET, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if_set FLAG_SYS_EXDATA_ENABLE, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 setflag FLAG_SYS_EXDATA_ENABLE msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index b1ead4060..3d8f5532f 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -9,9 +9,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 compare VAR_SPECIAL_5, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F compare VAR_SPECIAL_5, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 @@ -59,8 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB - checkflag FLAG_SET_WALL_CLOCK - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 + goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 @@ -70,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag FLAG_HIDE_MACHOKE_MOVER_2 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse SE_KAIDAN removeobject VAR_SPECIAL_8 releaseall @@ -256,14 +255,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - checkflag FLAG_BADGE05_GET - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D - checkflag FLAG_RESCUED_BIRCH - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 + goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 compare VAR_LITTLEROOT_INTRO_STATE, 7 - goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C + goto_if_ge LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release end @@ -274,8 +271,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 end LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D - checkflag FLAG_RECEIVED_AMULET_COIN - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 + goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem_std ITEM_AMULET_COIN compare RESULT, 0 @@ -363,13 +359,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 playse SE_PIN @@ -379,23 +375,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE waitmovement 0 delay 20 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse SE_DOOR removeobject VAR_SPECIAL_9 setflag FLAG_RECEIVED_SS_TICKET diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 589d4e21c..4b21aa99b 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -55,7 +55,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, -1 - goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF + goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -76,8 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR - goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -162,8 +161,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR - goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -216,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, -1 - goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 + goto_if_ne FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index f41fd1f8c..d34b357ea 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -44,7 +44,7 @@ gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder compare RESULT, 0xFFFF - goto_if 5, EventScript_1C34A9 + goto_if_ne EventScript_1C34A9 msgbox UnknownString_81C354E, MSGBOX_YESNO compare RESULT, YES goto_if_eq EventScript_1C348E @@ -56,7 +56,7 @@ EventScript_1C348E: special OpenPokeblockCaseOnFeeder waitstate compare RESULT, 0xFFFF - goto_if 5, EventScript_1C34A0 + goto_if_ne EventScript_1C34A0 end EventScript_1C34A0: diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 2a5905191..1f5e074d9 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -17,11 +17,11 @@ Route111_EventScript_1A3877:: @ 81A3877 setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT compare FACING, 3 - call_if 1, Route111_EventScript_1A38C3 + call_if_eq Route111_EventScript_1A38C3 compare FACING, 4 - call_if 1, Route111_EventScript_1A38C3 + call_if_eq Route111_EventScript_1A38C3 compare FACING, 2 - call_if 1, Route111_EventScript_1A38CE + call_if_eq Route111_EventScript_1A38CE removeobject LAST_TALKED release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index cf82cf943..5a84a1b48 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,10 +7,8 @@ Event_TV:: @ 81A6E72 goto_if_eq EventScript_1A6F01 compare RESULT, 1 goto_if_eq EventScript_1A6F0B - checkflag FLAG_SYS_TV_START - goto_if 0, EventScript_1A6EF1 - checkflag FLAG_SYS_TV_WATCH - goto_if_eq EventScript_1A6EF1 + goto_if_unset FLAG_SYS_TV_START, EventScript_1A6EF1 + goto_if_set FLAG_SYS_TV_WATCH, EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 goto_if_eq EventScript_1A6F66 @@ -27,7 +25,7 @@ EventScript_1A6EBB: copyvar VAR_SPECIAL_4, RESULT specialvar RESULT, GetTVShowType compare RESULT, 0 - goto_if 5, EventScript_1A6F21 + goto_if_ne EventScript_1A6F21 end EventScript_1A6EF1: @@ -60,7 +58,7 @@ EventScript_1A6F21: waitmessage waitbuttonpress compare RESULT, 1 - goto_if 5, EventScript_1A6F21 + goto_if_ne EventScript_1A6F21 goto EventScript_1A6F37 end -- cgit v1.2.3 From 43b4ba34dc05dc6be31b58f0b18df1b3d57f608d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 12:39:57 -0800 Subject: Add friendly macros for checking trainer flags --- asm/macros/event.inc | 20 +++++++++++ data/scripts/maps/DewfordTown_Gym.inc | 12 +++---- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 30 ++++++---------- data/scripts/maps/PetalburgCity_Gym.inc | 51 ++++++++++------------------ data/scripts/maps/Route104_Prototype.inc | 36 +++++++------------- data/scripts/maps/Route109_SeashoreHouse.inc | 9 ++--- data/scripts/maps/Route111.inc | 3 +- data/scripts/maps/SSTidalCorridor.inc | 24 +++++-------- 8 files changed, 75 insertions(+), 110 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index b29af7a04..fcbd3a055 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1361,6 +1361,26 @@ @ Supplementary + .macro goto_if_trainer_not_defeated opponent, dest + checktrainerflag \opponent + goto_if 0, \dest + .endm + + .macro goto_if_trainer_defeated opponent, dest + checktrainerflag \opponent + goto_if 1, \dest + .endm + + .macro call_if_trainer_not_defeated opponent, dest + checktrainerflag \opponent + call_if 0, \dest + .endm + + .macro call_if_trainer_defeated opponent, dest + checktrainerflag \opponent + call_if 1, \dest + .endm + .macro goto_if_unset flag, dest checkflag \flag goto_if 0, \dest diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 2dc15d92c..7cdf3dd6a 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -7,8 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - checktrainerflag OPPONENT_BRAWLY - goto_if_eq DewfordTown_Gym_EventScript_1530AA + goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 compare VAR_SPECIAL_0, 0 @@ -81,18 +80,15 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 - checktrainerflag OPPONENT_HIDEKI - goto_if_lt DewfordTown_Gym_EventScript_153135 + goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - checktrainerflag OPPONENT_TESSA - goto_if_lt DewfordTown_Gym_EventScript_153143 + goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - checktrainerflag OPPONENT_LAURA - goto_if_lt DewfordTown_Gym_EventScript_153151 + goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 52d614436..c0604400e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -13,56 +13,46 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - checktrainerflag OPPONENT_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - checktrainerflag OPPONENT_ZANE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - checktrainerflag OPPONENT_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - checktrainerflag OPPONENT_SADIE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - checktrainerflag OPPONENT_ANDY - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - checktrainerflag OPPONENT_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - checktrainerflag OPPONENT_ZANE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - checktrainerflag OPPONENT_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - checktrainerflag OPPONENT_SADIE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - checktrainerflag OPPONENT_ANDY - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 54c0e89f6..1199b3571 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -15,20 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A - checktrainerflag OPPONENT_RANDALL - call_if_eq PetalburgCity_Gym_EventScript_154FBB - checktrainerflag OPPONENT_MARY - call_if_eq PetalburgCity_Gym_EventScript_154FDC - checktrainerflag OPPONENT_PARKER - call_if_eq PetalburgCity_Gym_EventScript_154FFD - checktrainerflag OPPONENT_LORI - call_if_eq PetalburgCity_Gym_EventScript_15501E - checktrainerflag OPPONENT_GEORGE - call_if_eq PetalburgCity_Gym_EventScript_15503F - checktrainerflag OPPONENT_JODY - call_if_eq PetalburgCity_Gym_EventScript_155060 - checktrainerflag OPPONENT_BERKE - call_if_eq PetalburgCity_Gym_EventScript_155081 + call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -632,8 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - checktrainerflag OPPONENT_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -645,8 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - checktrainerflag OPPONENT_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -658,8 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - checktrainerflag OPPONENT_MARY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -671,8 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - checktrainerflag OPPONENT_MARY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -684,8 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - checktrainerflag OPPONENT_PARKER - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,8 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - checktrainerflag OPPONENT_LORI - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -710,8 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - checktrainerflag OPPONENT_LORI - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -723,8 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - checktrainerflag OPPONENT_GEORGE - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -736,8 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - checktrainerflag OPPONENT_JODY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -749,8 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - checktrainerflag OPPONENT_BERKE - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 7f1c4ca75..e0aba01c9 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -4,18 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - checktrainerflag OPPONENT_BRIANNA_1 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_CINDY_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_LUCAS_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_MIKE_1 - goto_if_lt Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -30,18 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - checktrainerflag OPPONENT_BRIANNA_1 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_CINDY_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_LUCAS_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_MIKE_1 - goto_if_lt Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e52958c50..13d37e7bd 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -91,12 +91,9 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - checktrainerflag OPPONENT_DWAYNE - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_JOHANNA - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_SIMON - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 11af07dce..99fa29efb 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -15,8 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - checktrainerflag OPPONENT_VICKY - goto_if_lt Route111_EventScript_15000D + goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index cd830f2b0..7bc5a7fdd 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -173,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - checktrainerflag OPPONENT_PHILLIP - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEONARD - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_COLTON - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_TUCKER - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_THOMAS - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEA_AND_JED - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_GARRET - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_ANETTE - goto_if_lt SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return -- cgit v1.2.3 From 4149e858836f39836c476a8a6bc1403a6429c141 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 15:28:36 -0600 Subject: decompile sub_80EA1E0 - sub_80EAD7C --- asm/easy_chat.s | 1510 --------------------------------------------------- include/easy_chat.h | 18 +- src/easy_chat_2.c | 311 ++++++++++- src/unknown_task.c | 1 + 4 files changed, 326 insertions(+), 1514 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index f99c93a51..6469aaf62 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,1516 +5,6 @@ .text - thumb_func_start sub_80EA1E0 -sub_80EA1E0: @ 80EA1E0 - push {r4-r6,lr} - ldr r0, _080EA240 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0xC4 - ldrh r0, [r0] - cmp r0, 0 - beq _080EA244 - movs r4, 0 - adds r0, r1, 0 - adds r0, 0xC2 - ldrh r2, [r0] - cmp r4, r2 - bcs _080EA228 - adds r5, r1, 0 - adds r6, r0, 0 -_080EA200: - lsls r0, r4, 4 - adds r0, 0xC8 - adds r0, r5, r0 - bl sub_80EAC0C - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r1 - adds r0, r5, r0 - bl sub_80EAC48 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrh r2, [r6] - cmp r4, r2 - bcc _080EA200 -_080EA228: - ldr r0, _080EA240 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r2, r1, 0 - adds r2, 0xBC - movs r0, 0x1 - strb r0, [r2] - adds r1, 0xC4 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - movs r0, 0 - b _080EA246 - .align 2, 0 -_080EA240: .4byte gUnknown_083DB694 -_080EA244: - movs r0, 0x1 -_080EA246: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80EA1E0 - - thumb_func_start sub_80EA24C -sub_80EA24C: @ 80EA24C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA340 @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0xF - str r6, [sp] - ldr r1, _080EA344 @ =0x0000fffe - mov r8, r1 - str r1, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xD - movs r2, 0xE - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r1, 0x2 - mov r9, r1 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xE - movs r3, 0xC - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x1E - movs r2, 0 - mov r3, r8 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r6, 0x10 - str r6, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xD - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - str r6, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - mov r1, r9 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0xC - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x1E - movs r2, 0x9 - mov r3, r8 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x4 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x6 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA340: .4byte gUnknown_083DB694 -_080EA344: .4byte 0x0000fffe - thumb_func_end sub_80EA24C - - thumb_func_start sub_80EA348 -sub_80EA348: @ 80EA348 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA49C @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r5, 0xF - str r5, [sp] - movs r1, 0x2 - mov r9, r1 - str r1, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r6, r7, r1 - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r1, _080EA4A0 @ =0x0000fffe - mov r8, r1 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xE - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0x12 - movs r2, 0 - movs r3, 0x2 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r5, 0x10 - str r5, [sp] - mov r1, r9 - str r1, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - mov r1, r8 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0x12 - movs r2, 0x9 - movs r3, 0x2 - bl sub_80EAC30 - movs r1, 0x84 - lsls r1, 1 - adds r0, r7, r1 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - mov r1, r9 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0x1 - bl sub_80EABD4 - movs r1, 0xBC - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x50 - adds r6, r7, r1 - str r6, [sp, 0x4] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0 - bl sub_80EAC30 - movs r1, 0x8C - lsls r1, 1 - adds r0, r7, r1 - str r5, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xE - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xC2 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0x18 - movs r2, 0xE - mov r3, r8 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xC2 - movs r1, 0x6 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA49C: .4byte gUnknown_083DB694 -_080EA4A0: .4byte 0x0000fffe - thumb_func_end sub_80EA348 - - thumb_func_start sub_80EA4A4 -sub_80EA4A4: @ 80EA4A4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA598 @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0xF - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - ldr r1, _080EA59C @ =0x0000ffff - mov r8, r1 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - mov r1, r8 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xE - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r1, 0x10 - mov r9, r1 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - movs r6, 0x1 - str r6, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r6, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xC2 - movs r1, 0x4 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA598: .4byte gUnknown_083DB694 -_080EA59C: .4byte 0x0000ffff - thumb_func_end sub_80EA4A4 - - thumb_func_start sub_80EA5A0 -sub_80EA5A0: @ 80EA5A0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA6FC @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0xF - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - movs r1, 0x1 - mov r8, r1 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r2, 0xA - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - mov r1, r8 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xA - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r1, 0x14 - mov r9, r1 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - ldr r6, _080EA700 @ =0x0000ffff - str r6, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x5 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r6, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0x5 - movs r3, 0 - bl sub_80EAC30 - movs r1, 0x84 - lsls r1, 1 - adds r0, r7, r1 - movs r1, 0xA - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - mov r1, r8 - str r1, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xA - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xBC - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x50 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0x1 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - movs r1, 0x8C - lsls r1, 1 - adds r0, r7, r1 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r6, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0x14 - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xC2 - lsls r1, 1 - adds r0, r7, r1 - str r6, [sp] - str r5, [sp, 0x4] - movs r1, 0x1 - movs r2, 0x14 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x6 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x4 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA6FC: .4byte gUnknown_083DB694 -_080EA700: .4byte 0x0000ffff - thumb_func_end sub_80EA5A0 - - thumb_func_start sub_80EA704 -sub_80EA704: @ 80EA704 - push {r4-r6,lr} - sub sp, 0x14 - ldr r0, _080EA75C @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0xC8 - movs r1, 0x14 - str r1, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r5, 0x1 - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xC - movs r3, 0x19 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r6, r1 - ldr r3, _080EA760 @ =0x0000ffff - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0x5 - movs r2, 0xA - bl sub_80EAC30 - adds r0, r6, 0 - adds r0, 0xC2 - strh r5, [r0] - adds r1, r6, 0 - adds r1, 0xC4 - movs r0, 0x5 - strh r0, [r1] - add sp, 0x14 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EA75C: .4byte gUnknown_083DB694 -_080EA760: .4byte 0x0000ffff - thumb_func_end sub_80EA704 - - thumb_func_start sub_80EA764 -sub_80EA764: @ 80EA764 - push {r4-r7,lr} - sub sp, 0x14 - ldr r0, _080EA7EC @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0x14 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r5, _080EA7F0 @ =0x0000ffff - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xC - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r7, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1E - movs r2, 0xC - movs r3, 0x1F - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r7, r2 - str r1, [sp, 0x4] - movs r1, 0x1E - movs r2, 0xC - adds r3, r5, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x2 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x6 - strh r0, [r1] - add sp, 0x14 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA7EC: .4byte gUnknown_083DB694 -_080EA7F0: .4byte 0x0000ffff - thumb_func_end sub_80EA764 - - thumb_func_start sub_80EA7F4 -sub_80EA7F4: @ 80EA7F4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - ldr r0, _080EA8B4 @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0x14 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r5, 0x1 - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x14 - movs r2, 0xA - movs r3, 0x19 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - ldr r3, _080EA8B8 @ =0x0000ffff - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r2, r7 - mov r8, r2 - str r2, [sp, 0x4] - movs r1, 0x19 - movs r2, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r7, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xA - movs r3, 0x4 - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - mov r2, r8 - str r2, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x3 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x2 - strh r0, [r1] - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA8B4: .4byte gUnknown_083DB694 -_080EA8B8: .4byte 0x0000ffff - thumb_func_end sub_80EA7F4 - - thumb_func_start sub_80EA8BC -sub_80EA8BC: @ 80EA8BC - push {r4-r6,lr} - sub sp, 0x14 - ldr r0, _080EA944 @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0xC8 - movs r5, 0x14 - str r5, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x3 - movs r2, 0xA - movs r3, 0x4 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r6, 0 - adds r0, 0xD8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x2 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r1, r6, 0 - adds r1, 0xC2 - movs r0, 0x2 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x1 - strh r0, [r1] - add sp, 0x14 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EA944: .4byte gUnknown_083DB694 - thumb_func_end sub_80EA8BC - - thumb_func_start sub_80EA948 -sub_80EA948: @ 80EA948 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EAA3C @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0x14 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r5, _080EAA40 @ =0x0000ffff - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x2 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x80 - adds r1, r7 - mov r9, r1 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x3 - movs r2, 0xA - movs r3, 0x5 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r1, r7 - mov r8, r1 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1A - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - mov r1, r9 - str r1, [sp, 0x4] - movs r1, 0x1A - movs r2, 0xA - adds r3, r5, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x19 - movs r2, 0xA - movs r3, 0x1A - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - mov r1, r8 - str r1, [sp, 0x4] - movs r1, 0x1D - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x4 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x2 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EAA3C: .4byte gUnknown_083DB694 -_080EAA40: .4byte 0x0000ffff - thumb_func_end sub_80EA948 - - thumb_func_start sub_80EAA44 -sub_80EAA44: @ 80EAA44 - push {r4-r6,lr} - sub sp, 0x14 - ldr r0, _080EAACC @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0xC8 - movs r5, 0x14 - str r5, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0x18 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r6, 0 - adds r0, 0xD8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r1, _080EAAD0 @ =0x0000ffff - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x17 - movs r2, 0xA - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0x1D - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r1, r6, 0 - adds r1, 0xC2 - movs r0, 0x2 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x1 - strh r0, [r1] - add sp, 0x14 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EAACC: .4byte gUnknown_083DB694 -_080EAAD0: .4byte 0x0000ffff - thumb_func_end sub_80EAA44 - - thumb_func_start sub_80EAAD4 -sub_80EAAD4: @ 80EAAD4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EABCC @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r1, 0xF - str r1, [sp] - movs r4, 0 - str r4, [sp, 0x4] - movs r5, 0x1 - str r5, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r1, r7 - mov r8, r1 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - movs r1, 0x14 - mov r9, r1 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - ldr r6, _080EABD0 @ =0x0000ffff - str r6, [sp, 0x10] - movs r1, 0 - movs r2, 0xF - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r5, [sp] - mov r1, r8 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0x5 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r1, 0xA - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r5, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x68 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r6, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0x14 - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r6, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x14 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x4 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x5 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EABCC: .4byte gUnknown_083DB694 -_080EABD0: .4byte 0x0000ffff - thumb_func_end sub_80EAAD4 - - thumb_func_start sub_80EABD4 -sub_80EABD4: @ 80EABD4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r5, [sp, 0x1C] - ldr r6, [sp, 0x20] - ldr r4, [sp, 0x24] - mov r9, r4 - ldr r4, [sp, 0x28] - ldr r7, [sp, 0x2C] - mov r8, r7 - strh r1, [r0] - strh r3, [r0, 0x2] - strh r2, [r0, 0x4] - strh r5, [r0, 0x6] - strh r6, [r0, 0x8] - strh r4, [r0, 0xA] - mov r1, r9 - strh r1, [r0, 0xC] - mov r4, r8 - strh r4, [r0, 0xE] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80EABD4 - - thumb_func_start sub_80EAC0C -sub_80EAC0C: @ 80EAC0C - ldrh r1, [r0, 0x8] - ldrh r2, [r0] - adds r1, r2 - strh r1, [r0] - ldrh r1, [r0, 0xA] - ldrh r2, [r0, 0x2] - adds r1, r2 - strh r1, [r0, 0x2] - ldrh r1, [r0, 0xC] - ldrh r2, [r0, 0x4] - adds r1, r2 - strh r1, [r0, 0x4] - ldrh r1, [r0, 0xE] - ldrh r2, [r0, 0x6] - adds r1, r2 - strh r1, [r0, 0x6] - bx lr - thumb_func_end sub_80EAC0C - - thumb_func_start sub_80EAC30 -sub_80EAC30: @ 80EAC30 - push {r4,r5,lr} - ldr r4, [sp, 0xC] - ldr r5, [sp, 0x10] - strh r1, [r0] - strh r2, [r0, 0x2] - strh r3, [r0, 0x4] - strh r4, [r0, 0x6] - str r5, [r0, 0x8] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80EAC30 - - thumb_func_start sub_80EAC48 -sub_80EAC48: @ 80EAC48 - ldrh r1, [r0, 0x4] - ldrh r2, [r0] - adds r1, r2 - strh r1, [r0] - ldrh r1, [r0, 0x6] - ldrh r2, [r0, 0x2] - adds r1, r2 - strh r1, [r0, 0x2] - bx lr - thumb_func_end sub_80EAC48 - - thumb_func_start sub_80EAC5C -sub_80EAC5C: @ 80EAC5C - push {r4-r6,lr} - ldr r0, _080EACB4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0xBC - ldrb r0, [r0] - cmp r0, 0 - beq _080EACAC - movs r4, 0 - adds r0, r1, 0 - adds r0, 0xC2 - ldrh r2, [r0] - cmp r4, r2 - bcs _080EACA2 - adds r5, r1, 0 - adds r6, r0, 0 -_080EAC7C: - lsls r1, r4, 4 - adds r1, 0xC8 - adds r1, r5, r1 - lsls r2, r4, 1 - adds r2, r4 - lsls r2, 2 - movs r0, 0xA4 - lsls r0, 1 - adds r2, r0 - adds r2, r5, r2 - ldr r0, _080EACB8 @ =0x06006800 - bl sub_80EACBC - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrh r2, [r6] - cmp r4, r2 - bcc _080EAC7C -_080EACA2: - ldr r0, _080EACB4 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBC - movs r1, 0 - strb r1, [r0] -_080EACAC: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EACB4: .4byte gUnknown_083DB694 -_080EACB8: .4byte 0x06006800 - thumb_func_end sub_80EAC5C - - thumb_func_start sub_80EACBC -sub_80EACBC: @ 80EACBC - push {r4-r7,lr} - sub sp, 0x10 - adds r7, r0, 0 - adds r3, r1, 0 - adds r4, r2, 0 - ldrh r2, [r3, 0x2] - ldrh r0, [r3] - subs r2, r0 - ldrh r0, [r3, 0x6] - ldrh r1, [r3, 0x4] - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - lsls r6, r2, 16 - cmp r6, 0 - ble _080EACFE - lsls r5, r0, 16 - cmp r5, 0 - ble _080EACFE - ldrh r1, [r3] - ldrh r2, [r3, 0x4] - ldr r3, [r4, 0x8] - ldrh r0, [r4] - str r0, [sp] - ldrh r0, [r4, 0x2] - str r0, [sp, 0x4] - lsrs r0, r6, 16 - str r0, [sp, 0x8] - lsrs r0, r5, 16 - str r0, [sp, 0xC] - adds r0, r7, 0 - bl sub_809D104 -_080EACFE: - add sp, 0x10 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80EACBC - - thumb_func_start sub_80EAD08 -sub_80EAD08: @ 80EAD08 - push {r4,r5,lr} - ldr r0, _080EAD58 @ =gUnknown_03004DC0 - ldrb r1, [r0, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - ldr r1, _080EAD5C @ =gUnknown_03004DE0 - adds r4, r0, r1 - adds r4, 0xB0 - ldr r0, _080EAD60 @ =gUnknown_083DB694 - ldr r1, [r0] - movs r0, 0xDD - lsls r0, 1 - adds r1, r0 - ldrh r0, [r1] - adds r2, r0, 0 - subs r2, 0x58 - movs r0, 0xFF - ands r2, r0 - movs r3, 0 - movs r5, 0xFF -_080EAD32: - ldrh r0, [r1] - adds r0, r3 - cmp r0, 0x80 - bne _080EAD42 - negs r0, r3 - adds r2, r0, 0 - subs r2, 0x58 - ands r2, r5 -_080EAD42: - strh r2, [r4] - adds r4, 0x2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3F - bls _080EAD32 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080EAD58: .4byte gUnknown_03004DC0 -_080EAD5C: .4byte gUnknown_03004DE0 -_080EAD60: .4byte gUnknown_083DB694 - thumb_func_end sub_80EAD08 - - thumb_func_start sub_80EAD64 -sub_80EAD64: @ 80EAD64 - push {lr} - lsls r1, 24 - ldr r2, _080EAD78 @ =gEasyChatGroupNames - lsrs r1, 22 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - pop {r1} - bx r1 - .align 2, 0 -_080EAD78: .4byte gEasyChatGroupNames - thumb_func_end sub_80EAD64 - - thumb_func_start sub_80EAD7C -sub_80EAD7C: @ 80EAD7C - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x14 - beq _080EADA2 - cmp r0, 0x14 - bgt _080EAD9C - cmp r0, 0x11 - blt _080EADBA - ldr r0, _080EAD98 @ =0x00000804 - bl FlagGet - b _080EADB4 - .align 2, 0 -_080EAD98: .4byte 0x00000804 -_080EAD9C: - cmp r1, 0x15 - beq _080EADB0 - b _080EADBA -_080EADA2: - ldr r0, _080EADAC @ =0x00000806 - bl FlagGet - b _080EADB4 - .align 2, 0 -_080EADAC: .4byte 0x00000806 -_080EADB0: - bl sub_80EB9C8 -_080EADB4: - lsls r0, 24 - lsrs r0, 24 - b _080EADBC -_080EADBA: - movs r0, 0x1 -_080EADBC: - pop {r1} - bx r1 - thumb_func_end sub_80EAD7C - thumb_func_start sub_80EADC0 sub_80EADC0: @ 80EADC0 push {lr} diff --git a/include/easy_chat.h b/include/easy_chat.h index 7b3b849f0..2fe11dd11 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -3,6 +3,15 @@ struct Sprite; +struct UnknownEasyChatStruct1 +{ + u16 unk0; + u16 unk2; + u16 unk4; + u16 unk6; + void *unk8; +}; + struct Shared1000 { void (*unk0)(void); // main cb 2 @@ -21,7 +30,7 @@ struct Shared1000 u8 unk40[4][14]; u8 unk78[0x7D - 0x78]; // unknown length u8 unk7D; - u8 unk7E[0x83-0x7E]; + u8 unk7E[5]; s8 unk83; // s8? //u8 unk83; // s8? s8 unk84; @@ -43,7 +52,12 @@ struct Shared1000 u8 unkBC; u8 fillerBD; u16 unkBE; - u8 fillerC0[0x1A8-0xC0]; + u8 fillerC0[2]; + u16 unkC2; // length of unkC8 and unk148 arrays + u16 unkC4; + u8 fillerC6[2]; + u16 unkC8[(0x148-0xC8)/16][8]; + struct UnknownEasyChatStruct1 unk148[(0x1A8-0x148)/12]; s8 unk1A8; s8 unk1A9; s8 unk1AA[0xB5-0xAA]; // unknown length diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index bac1873cc..8fbc54458 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1,17 +1,21 @@ #include "global.h" +#include "constants/easy_chat.h" #include "constants/map_objects.h" #include "decompress.h" #include "easy_chat.h" +#include "event_data.h" #include "field_map_obj.h" #include "graphics.h" #include "menu.h" #include "palette.h" #include "sprite.h" +#include "string_util.h" #include "strings.h" #include "trig.h" +#include "unknown_task.h" extern void sub_8095C8C(); -extern void sub_809D104(); +extern void sub_809D104(void *, u16, u16, const void *, u16, u16, u16, u16); void sub_80E8268(void); void sub_80E82BC(struct Sprite *); @@ -47,9 +51,15 @@ void sub_80EA8BC(void); void sub_80EA948(void); void sub_80EAA44(void); void sub_80EAAD4(void); -u8 *sub_80EAD64(); +void sub_80EABD4(u16 *, u16, u16, u16, u16, u16, u16, u16, u16); +void sub_80EAC0C(u16 *); +void sub_80EAC30(struct UnknownEasyChatStruct1 *, u16, u16, u16, u16, void *); +void sub_80EAC48(struct UnknownEasyChatStruct1 *); +void sub_80EACBC(void *, u16 *, struct UnknownEasyChatStruct1 *); +u8 *sub_80EAD64(u8 *, u8, int); u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(u16); +u8 sub_80EB9C8(void); const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); const u16 InterviewPalette_1[] = INCBIN_U16("graphics/misc/interview_pal1.gbapal"); @@ -1785,3 +1795,300 @@ bool8 sub_80EA184(void) } return FALSE; } + +bool8 sub_80EA1E0(void) +{ + u16 i; + + if (gUnknown_083DB694->unkC4 != 0) + { + for (i = 0; i < gUnknown_083DB694->unkC2; i++) + { + sub_80EAC0C(gUnknown_083DB694->unkC8[i]); + sub_80EAC48(&gUnknown_083DB694->unk148[i]); + } + gUnknown_083DB694->unkBC = 1; + gUnknown_083DB694->unkC4--; + return FALSE; + } + return TRUE; +} + +void sub_80EA24C(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 13, 14, 13, 15, -2, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 14, 12, 15, 0, 0, 2, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 30, 0, -2, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[2], 13, 15, 13, 16, -2, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 9, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 12, 16, 0, 0, 2, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[3], 30, 9, -2, 0, gUnknown_083DB694->unk6C8); + + gUnknown_083DB694->unkC2 = 4; + gUnknown_083DB694->unkC4 = 6; +} + +void sub_80EA348(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 1, 14, 13, 15, 2, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 14, 24, 15, 0, 0, -2, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 18, 0, 2, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 15, 13, 16, 2, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 9, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 24, 16, 0, 0, -2, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[3], 18, 9, 2, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[4], 1, 14, 1, 16, 0, 0, 2, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[4], 1, 14, 0, 0, gUnknown_083DB694->unk1C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[5], 24, 14, 24, 16, -2, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[5], 24, 14, -2, 0, gUnknown_083DB694->unk1C8); + + gUnknown_083DB694->unkC2 = 6; + gUnknown_083DB694->unkC4 = 6; +} + +void sub_80EA4A4(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 1, 14, 13, 15, 0, -1, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 14, 24, 15, 0, -1, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 18, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 15, 13, 16, 0, 0, 0, 1); + sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 9, 0, -1, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 24, 16, 0, 0, 0, 1); + sub_80EAC30(&gUnknown_083DB694->unk148[3], 18, 9, 0, -1, gUnknown_083DB694->unk6C8); + + gUnknown_083DB694->unkC2 = 4; + gUnknown_083DB694->unkC4 = 4; +} + +void sub_80EA5A0(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 1, 10, 13, 15, 0, 1, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 10, 24, 15, 0, 1, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 18, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 15, 13, 20, 0, 0, 0, -1); + sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 5, 0, 1, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 24, 20, 0, 0, 0, -1); + sub_80EAC30(&gUnknown_083DB694->unk148[3], 18, 5, 0, 1, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[4], 1, 10, 24, 10, 0, 0, 0, 1); + sub_80EAC30(&gUnknown_083DB694->unk148[4], 1, 10, 0, 0, gUnknown_083DB694->unk1C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[5], 1, 20, 24, 20, 0, -1, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[5], 1, 20, 0, -1, gUnknown_083DB694->unk1C8); + + gUnknown_083DB694->unkC2 = 6; + gUnknown_083DB694->unkC4 = 4; +} + +void sub_80EA704(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 24, 12, 25, 20, 0, 0, 1, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 5, 10, -1, 0, gUnknown_083DB694->unk6C8); + + gUnknown_083DB694->unkC2 = 1; + gUnknown_083DB694->unkC4 = 5; +} + +void sub_80EA764(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 24, 12, 30, 20, 0, 0, -1, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 10, 1, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 30, 12, 31, 20, -1, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 30, 12, -1, 0, gUnknown_083DB694->unk1C8); + + gUnknown_083DB694->unkC2 = 2; + gUnknown_083DB694->unkC4 = 6; +} + +void sub_80EA7F4(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 20, 10, 25, 20, 0, 0, 1, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 25, 0, -1, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 0, 10, 1, 20, 0, 0, 1, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 10, 4, 20, 1, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + gUnknown_083DB694->unkC2 = 3; + gUnknown_083DB694->unkC4 = 2; +} + +void sub_80EA8BC(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 3, 10, 4, 20, 0, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 0, 10, 2, 20, 0, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + + gUnknown_083DB694->unkC2 = 2; + gUnknown_083DB694->unkC4 = 1; +} + +void sub_80EA948(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 0, 10, 2, 20, 0, 0, -1, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 3, 10, 5, 20, -1, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[2], 26, 10, 30, 20, -1, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[2], 26, 10, -1, 0, gUnknown_083DB694->unk1C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[3], 25, 10, 26, 20, -1, 0, -1, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[3], 29, 0, 0, 0, gUnknown_083DB694->unk6C8); + + gUnknown_083DB694->unkC2 = 4; + gUnknown_083DB694->unkC4 = 2; +} + +void sub_80EAA44(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 24, 10, 30, 20, 0, 0, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 24, 10, 0, 0, gUnknown_083DB694->unk1C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 23, 10, 24, 20, 0, 0, -1, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 29, 0, 0, 0, gUnknown_083DB694->unk6C8); + + gUnknown_083DB694->unkC2 = 2; + gUnknown_083DB694->unkC4 = 1; +} + +void sub_80EAAD4(void) +{ + sub_80EABD4(gUnknown_083DB694->unkC8[0], 0, 10, 30, 15, 0, 1, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[1], 0, 15, 30, 20, 0, 0, 0, -1); + sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 5, 0, 1, gUnknown_083DB694->unk6C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[2], 0, 10, 30, 10, 0, 0, 0, 1); + sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + + sub_80EABD4(gUnknown_083DB694->unkC8[3], 0, 20, 30, 20, 0, -1, 0, 0); + sub_80EAC30(&gUnknown_083DB694->unk148[3], 0, 20, 0, -1, gUnknown_083DB694->unk1C8); + + gUnknown_083DB694->unkC2 = 4; + gUnknown_083DB694->unkC4 = 5; +} + +void sub_80EABD4(u16 *a, u16 b, u16 c, u16 d, u16 e, u16 f, u16 g, u16 h, u16 i) +{ + a[0] = b; + a[1] = d; + a[2] = c; + a[3] = e; + a[4] = f; + a[5] = h; + a[6] = g; + a[7] = i; +} + +void sub_80EAC0C(u16 *a) +{ + a[0] += a[4]; + a[1] += a[5]; + a[2] += a[6]; + a[3] += a[7]; +} + +void sub_80EAC30(struct UnknownEasyChatStruct1 *a, u16 b, u16 c, u16 d, u16 e, void *f) +{ + a->unk0 = b; + a->unk2 = c; + a->unk4 = d; + a->unk6 = e; + a->unk8 = f; +} + +void sub_80EAC48(struct UnknownEasyChatStruct1 *a) +{ + a->unk0 += a->unk4; + a->unk2 += a->unk6; +} + +void sub_80EAC5C(void) +{ + u16 i; + + if (gUnknown_083DB694->unkBC != 0) + { + for (i = 0; i < gUnknown_083DB694->unkC2; i++) + sub_80EACBC((void *)(VRAM + 0x6800), gUnknown_083DB694->unkC8[i], &gUnknown_083DB694->unk148[i]); + gUnknown_083DB694->unkBC = 0; + } +} + +void sub_80EACBC(void *a, u16 *b, struct UnknownEasyChatStruct1 *c) +{ + s16 r6 = b[1] - b[0]; + s16 r5 = b[3] - b[2]; + + if (r6 > 0 && r5 > 0) + sub_809D104(a, b[0], b[2], c->unk8, c->unk0, c->unk2, r6, r5); +} + +// Strange... +void sub_80EAD08(void) +{ + u16 *r4; + u16 r2; + u16 i; + + r4 = gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; + r4 += 88; + r2 = (gUnknown_083DB694->unk1BA - 88) & 0xFF; + + for (i = 0; i < 64; i++) + { + if (gUnknown_083DB694->unk1BA + i == 128) + r2 = (-i - 88) & 0xFF; + *r4++ = r2; + } +} + +extern const u8 *const gEasyChatGroupNames[]; + +u8 *sub_80EAD64(u8 *a, u8 b, int unused) +{ + return StringCopy(a, gEasyChatGroupNames[b]); +} + +bool8 sub_80EAD7C(u8 group) +{ + switch (group) + { + case EC_GROUP_TRENDY_SAYING: + return FlagGet(FLAG_SYS_HIPSTER_MEET); + case EC_GROUP_EVENTS: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + return FlagGet(FLAG_SYS_GAME_CLEAR); + case EC_GROUP_POKEMON_2: + return sub_80EB9C8(); + } + return TRUE; +} + diff --git a/src/unknown_task.c b/src/unknown_task.c index c9ba95d42..62245502a 100644 --- a/src/unknown_task.c +++ b/src/unknown_task.c @@ -20,6 +20,7 @@ extern u8 gUnknown_0202FFA4; extern struct UnknownTaskStruct2 gUnknown_03004DC0; +// Is this a struct? extern u16 gUnknown_03004DE0[][0x3C0]; void remove_some_task(void) -- cgit v1.2.3 From 0bbbc1c6dfc6c2b8646276de94cedab9ddc8bc4b Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sat, 6 Jan 2018 00:06:06 +0100 Subject: Started decompiling wisp_fire.s --- asm/wisp_fire.s | 144 -------------------------------------------- ld_script.txt | 1 + src/battle/anim/wisp_fire.c | 48 +++++++++++++++ 3 files changed, 49 insertions(+), 144 deletions(-) create mode 100644 src/battle/anim/wisp_fire.c diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s index a6407589f..5fc7a07ab 100755 --- a/asm/wisp_fire.s +++ b/asm/wisp_fire.s @@ -7,150 +7,6 @@ @ wisp_fire - thumb_func_start sub_80D5CC0 -sub_80D5CC0: @ 80D5CC0 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _080D5CD8 - ldr r0, _080D5D4C @ =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r4, 0x30] - adds r0, r1, 0x1 - strh r0, [r4, 0x2E] -_080D5CD8: - movs r0, 0xC0 - lsls r0, 1 - adds r1, r0, 0 - ldrh r2, [r4, 0x34] - adds r1, r2 - strh r1, [r4, 0x34] - ldrh r0, [r4, 0x36] - adds r0, 0xA0 - strh r0, [r4, 0x36] - movs r2, 0x30 - ldrsh r0, [r4, r2] - lsls r1, 16 - asrs r1, 24 - bl Sin - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - ldrh r1, [r4, 0x36] - lsls r1, 16 - asrs r1, 24 - bl Cos - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x30] - adds r2, r0, 0x7 - movs r0, 0xFF - ands r2, r0 - strh r2, [r4, 0x30] - ldr r0, _080D5D50 @ =gMain - ldr r1, _080D5D54 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080D5D84 - adds r0, r2, 0 - subs r0, 0x40 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x83 - bls _080D5D5C - ldr r0, _080D5D58 @ =gAnimBankTarget - ldrb r0, [r0] - bl sub_8079ED4 - movs r1, 0x3 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r4, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x5] - b _080D5DA0 - .align 2, 0 -_080D5D4C: .4byte gBattleAnimArgs -_080D5D50: .4byte gMain -_080D5D54: .4byte 0x0000043d -_080D5D58: .4byte gAnimBankTarget -_080D5D5C: - ldr r0, _080D5D80 @ =gAnimBankTarget - ldrb r0, [r0] - bl sub_8079ED4 - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - movs r1, 0x3 - ands r0, r1 - lsls r0, 2 - ldrb r2, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r4, 0x5] - b _080D5DA0 - .align 2, 0 -_080D5D80: .4byte gAnimBankTarget -_080D5D84: - adds r0, r2, 0 - subs r0, 0x40 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x83 - bls _080D5D98 - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1D - b _080D5D9E -_080D5D98: - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1F -_080D5D9E: - strb r0, [r1] -_080D5DA0: - ldrh r0, [r4, 0x32] - adds r0, 0x1 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - ble _080D5DC8 - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_080D5DC8: - movs r2, 0x32 - ldrsh r0, [r4, r2] - cmp r0, 0x1E - bne _080D5DD6 - adds r0, r4, 0 - bl DestroyAnimSprite -_080D5DD6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80D5CC0 - thumb_func_start sub_80D5DDC sub_80D5DDC: @ 80D5DDC push {r4,lr} diff --git a/ld_script.txt b/ld_script.txt index af6e248d2..4eeaab513 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -283,6 +283,7 @@ SECTIONS { src/battle/anim/fire_2.o(.text); src/battle/anim/heated_rock.o(.text); src/battle/anim/wisp_orb.o(.text); + src/battle/anim/wisp_fire.o(.text); asm/wisp_fire.o(.text); src/battle/anim/thunder.o(.text); src/battle/anim/beta_beat_up.o(.text); diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c new file mode 100644 index 000000000..e31c15d9c --- /dev/null +++ b/src/battle/anim/wisp_fire.c @@ -0,0 +1,48 @@ +#include "global.h" +#include "battle_anim.h" +#include "main.h" +#include "rom_8077ABC.h" +#include "trig.h" + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankTarget; +// extern u8 gAnimBankAttacker; + +void sub_80D5CC0(struct Sprite *sprite) +{ + if (!sprite->data[0]) + { + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[0] += 1; + } + + sprite->data[3] += 0xC0 * 2; + sprite->data[4] += 0xA0; + + sprite->pos2.x = Sin(sprite->data[1], sprite->data[3] >> 8); + sprite->pos2.y = Cos(sprite->data[1], sprite->data[4] >> 8); + + sprite->data[1] = (sprite->data[1] + 7) & 0xFF; + + if (gMain.inBattle) + if ((u16) (sprite->data[1] - 0x40) > 0x83) + sprite->oam.priority = sub_8079ED4(gAnimBankTarget); + else + sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; + else + if ((u16) (sprite->data[1] - 0x40) > 0x83) + sprite->subpriority = 0x1D; + else + sprite->subpriority = 0x1F; + + if (++sprite->data[2] > 0x14) + sprite->invisible ^= 1; + + if (sprite->data[2] == 0x1E) + DestroyAnimSprite(sprite); +} + +// void sub_80D5DDC(struct Sprite *sprite) +// { + +// } \ No newline at end of file -- cgit v1.2.3 From 3c375d2cb4189d19c650145c4ddeedc7c43b76a2 Mon Sep 17 00:00:00 2001 From: M Date: Sat, 19 Aug 2017 16:44:22 +0200 Subject: Almost decompiled roulette_util, started decompiling roulette --- asm/roulette.s | 4 +- asm/roulette_util.s | 4 +- diff.sh | 7 + include/roulette_util.h | 51 +++++++ ld_script.txt | 2 + src/roulette.c | 33 ++++ src/roulette_util.c | 389 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 487 insertions(+), 3 deletions(-) create mode 100644 diff.sh create mode 100644 include/roulette_util.h create mode 100644 src/roulette.c create mode 100644 src/roulette_util.c diff --git a/asm/roulette.s b/asm/roulette.s index 04b3ac9b8..7ed4109fa 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -4,7 +4,7 @@ .syntax unified .text - +/* thumb_func_start sub_81150FC sub_81150FC: @ 81150FC push {lr} @@ -25,7 +25,7 @@ _0811511C: .align 2, 0 _08115120: .4byte gSharedMem + 0x19000 thumb_func_end sub_81150FC - +*/ thumb_func_start sub_8115124 sub_8115124: @ 8115124 push {r4,lr} diff --git a/asm/roulette_util.s b/asm/roulette_util.s index 5ddaa3a6e..ac2b1126a 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -4,7 +4,7 @@ .syntax unified .text - +/* thumb_func_start sub_8124918 sub_8124918: @ 8124918 push {lr} @@ -18,6 +18,7 @@ sub_8124918: @ 8124918 bx r0 thumb_func_end sub_8124918 + thumb_func_start sub_812492C sub_812492C: @ 812492C push {r4-r7,lr} @@ -777,3 +778,4 @@ _08124E76: thumb_func_end sub_8124E2C .align 2, 0 @ Don't pad with nop. +*/ diff --git a/diff.sh b/diff.sh new file mode 100644 index 000000000..a4b465b6e --- /dev/null +++ b/diff.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" +OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" +$OBJDUMP $OPTIONS baserom.gba > baserom.dump +$OBJDUMP $OPTIONS pokeruby.gba > pokeruby.dump +diff baserom.dump pokeruby.dump diff --git a/include/roulette_util.h b/include/roulette_util.h new file mode 100644 index 000000000..833c84241 --- /dev/null +++ b/include/roulette_util.h @@ -0,0 +1,51 @@ +#ifndef ROULETTE_UTIL_H +#define ROULETTE_UTIL_H + +struct UnkStruct1 +{ + u16 val0; + u16 val1; + u8 val2; + u8 val3; + u8 val4; + s8 field0:5; + s8 field1:2; + s8 field2:1; +}; + +struct UnkStruct3 +{ + u8 field0:7; + u8 field1:1; + u8 val1; + s8 val2; + s8 val3; + u16 val4; + u16 val5; + u8 val6; + u8 val7; + u8 val8; + s8 field2:5; + s8 field3:2; + s8 field4:1; +}; + +struct UnkStruct0 +{ + u8 val0; + u8 val1; //unused ? + u16 val2; //flag for each UnkStruct3 + struct UnkStruct3 val3[0x10]; +}; + + +void sub_8124918(struct UnkStruct0 *); +u8 sub_812492C(struct UnkStruct0 *, u8, struct UnkStruct1 *); +u8 unref_sub_81249B0(struct UnkStruct0 *, u8); +void task_tutorial_controls_fadein(struct UnkStruct0 *); +void sub_8124CE8(struct UnkStruct0 *, u16); +void sub_8124D3C(struct UnkStruct0 *, u16); +void sub_8124DDC(u16 *, u16, u8, u8, u8, u8); +void sub_8124E2C(u16 *, u16 *, u8, u8, u8, u8); + +#endif diff --git a/ld_script.txt b/ld_script.txt index 3d63bca17..e194a8dfb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -336,6 +336,7 @@ SECTIONS { src/battle/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/scene/evolution_scene.o(.text); + src/roulette.o(.text); asm/roulette.o(.text); asm/pokedex_cry_screen.o(.text); src/pokemon/pokedex_cry_screen.o(.text); @@ -348,6 +349,7 @@ SECTIONS { src/battle/battle_message.o(.text); src/field/choose_party.o(.text); asm/cable_car.o(.text); + src/roulette_util.o(.text); asm/roulette_util.o(.text); asm/cable_car_util.o(.text); src/unused_8124F94.o(.text); diff --git a/src/roulette.c b/src/roulette.c new file mode 100644 index 000000000..e15d6ee2f --- /dev/null +++ b/src/roulette.c @@ -0,0 +1,33 @@ +#include "global.h" + +#include "roulette_util.h" +#include "task.h" +#include "palette.h" + +extern u8 gUnknown_02019000[]; + +extern u8 ewram[]; +//#define ewram190B8 ((struct UnkStruct0 *) (ewram + 0x190B8)) +#define ewram19000 ((u8 *) (ewram + 0x19000)) + + +void sub_81150FC(void) +{ + struct UnkStruct0 *s; + u8 *p; + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + p = ewram19000; + s = (struct UnkStruct0 *)(&p[0xB8]); + if (s->val0) + task_tutorial_controls_fadein(s); +} + +void sub_8115124(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + +} diff --git a/src/roulette_util.c b/src/roulette_util.c new file mode 100644 index 000000000..9dc92a1df --- /dev/null +++ b/src/roulette_util.c @@ -0,0 +1,389 @@ +#include "global.h" +#include "roulette_util.h" + +static u8 sub_81249E4(struct UnkStruct3 *); +static u8 sub_8124BEC(struct UnkStruct3 *); + +extern u16 gPlttBufferFaded[]; +extern u16 gPlttBufferUnfaded[]; + +void sub_8124918(struct UnkStruct0 *r0) +{ + r0->val0 = 0; + r0->val2 = 0; + memset((&r0->val3), 0, 0xC0); +} + +u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) +{ + if (!(r1 < 0x10) || (r0->val3[r1].field1)) + { + return 0xFF; + } + else + { + r0->val3[r1].val4 = r2->val0; + r0->val3[r1].val5 = r2->val1; + r0->val3[r1].val6 = r2->val2; + r0->val3[r1].val7 = r2->val3; + r0->val3[r1].val8 = r2->val4; + + r0->val3[r1].field2 = r2->field0; + r0->val3[r1].field3 = r2->field1; + r0->val3[r1].field4 = r2->field2; + + r0->val3[r1].field0 = 0x0; + r0->val3[r1].field1 = 0x1; + + r0->val3[r1].val2 = 0x0; + r0->val3[r1].val1 = 0x0; + if (r0->val3[r1].field4 < 0) + r0->val3[r1].val3 = 0xFF; + else + r0->val3[r1].val3 = 0x1; + return r1; + } +} + +#ifdef NONMATCHING + //Functionally equivalent +u8 unref_sub_81249B0(struct UnkStruct0 *r0, u8 r1) +{ + if (!(r1 < 0x10) || (r0->val3[r1].field1)) + { + return 0xFF; + } + else + { + memset(&(r0->val3[r1]), 0, 0xC); + return r1; + } +} +#else +__attribute__((naked)) +u8 unref_sub_81249B0(struct UnkStruct0 *r0 , u8 r1) +{ + asm(".syntax unified\n\ + push {r4,lr}\n\ + adds r2, r0, 0\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + adds r4, r1, 0\n\ + cmp r4, 0xF\n\ + bhi _081249DC\n\ + lsls r0, r4, 1\n\ + adds r0, r4\n\ + lsls r0, 2\n\ + adds r1, r2, r0\n\ + ldrb r0, [r1, 0x4]\n\ + lsrs r0, 7\n\ + cmp r0, 0\n\ + beq _081249DC\n\ + adds r0, r1, 0x4\n\ + movs r1, 0\n\ + movs r2, 0xC\n\ + bl memset\n\ + adds r0, r4, 0\n\ + b _081249DE\n\ + _081249DC:\n\ + movs r0, 0xFF\n\ + _081249DE:\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ + .syntax divided\n"); +} +#endif + +u8 sub_81249E4(struct UnkStruct3 *r0) +{ + u8 i; + u8 returnval; + for (i = 0; i < r0->val6; i++) + { + u32 offset = r0->val5 + i; + struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset]; + struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset]; + switch(r0->field0) + { + case 0x1: + if ((u32)(faded->r + r0->val3) < 0x20) + faded->r += r0->val3; + if ((u32)(faded->g + r0->val3) < 0x20) + faded->g += r0->val3; + if ((u32)(faded->b + r0->val3) < 0x20) + faded->b += r0->val3; + break; + case 0x2: + if (r0->val3 < 0) + { + if (!(faded->r + r0->val3 < unfaded->r)) + faded->r += r0->val3; + if (!(faded->g + r0->val3 < unfaded->g)) + faded->g += r0->val3; + if (!(faded->b + r0->val3 < unfaded->b)) + faded->b += r0->val3; + } + else + { + if (!(faded->r + r0->val3 > unfaded->r)) + faded->r += r0->val3; + if (!(faded->g + r0->val3 > unfaded->g)) + faded->g += r0->val3; + if (!(faded->b + r0->val3 > unfaded->b)) + faded->b += r0->val3; + } + break; + } + } + if (((u32)r0->val2++) != r0->field2) + { + returnval = 0x0; + } + else + { + r0->val2 = 0x0; + r0->val3 = r0->val3 * -1; + if (r0->field0 == 0x1) + r0->field0++; + else + r0->field0--; + returnval = 0x1; + } + return returnval; +} + +u8 sub_8124BEC(struct UnkStruct3 *r0) +{ + u8 rg2 = 0; + switch (r0->field0) + { + case 0x1: + for (rg2 = 0; rg2 < r0->val6; rg2++) + gPlttBufferFaded[r0->val5 + rg2] = r0->val4; + r0->field0++; + break; + case 0x2: + for (rg2 = 0; rg2 < r0->val6; rg2++) + gPlttBufferFaded[r0->val5 + rg2] = gPlttBufferUnfaded[r0->val5 + rg2]; + r0->field0--; + break; + } + return 0x1; +} + +void task_tutorial_controls_fadein(struct UnkStruct0 *r0) +{ + u8 i = 0; + if (r0->val0) + { + for (i = 0; i < 0x10; i++) + { + if ((r0->val2 >> i) & 0x1) + { + if (((u8)--r0->val3[i].val1) == 0xFF) // if underflow ? + { + if (r0->val3[i].val4 & (0x80 << 8)) // PlttData->unused_15 ? + sub_81249E4(&r0->val3[i]); + else + sub_8124BEC(&r0->val3[i]); + r0->val3[i].val1 = r0->val3[i].val7; + } + } + } + } +} + +void sub_8124CE8(struct UnkStruct0 *r0, u16 r1) +{ + u8 i = 0; + r0->val0++; + for (i = 0; i < 0x10; i++) + { + if ((r1 >> i) & 0x1) + { + if (r0->val3[i].field1) + { + r0->val2 |= 0x1 << i; + r0->val3[i].field0 = 0x1; + } + } + } +} + +void sub_8124D3C(struct UnkStruct0 *r0, u16 r1) +{ + u8 i; + for (i = 0; i < 0x10; i++) + { + if ((r0->val2 >> i) & 0x1) + { + if (r0->val3[i].field1) + { + if ((r1 >> i) & 0x1) + { + u32 offset = r0->val3[i].val5; + u16 *faded = &gPlttBufferFaded[offset]; + u16 *unfaded = &gPlttBufferUnfaded[offset]; + memcpy(faded, unfaded, r0->val3[i].val6 * 2); + r0->val3[i].field0 = 0x0; + r0->val3[i].val2 = 0x0; + r0->val3[i].val1 = 0x0; + if (r0->val3[i].field4 < 0) + r0->val3[i].val3 = 0xFF; + else + r0->val3[i].val3 = 0x1; + } + } + } + } + if (r1 == 0xFFFF) + { + r0->val0 = 0x0; + r0->val2 = 0x0; + } + else + { + r0->val2 = r0->val2 & ~r1; + } +} +#ifdef NONMATCHING +void sub_8124DDC(u16 *r0, u16 r1, u8 r2, u8 r3, u8 r4, u8 r5) +{ + u16 *rg0; + u8 c; + u8 i = 0; + u32 offset= r3 * 0x20 + r2; + rg0 = &r0[offset]; + for (i = 0; i < r5; i++) + { + rg0 = &rg0[i * 0x20 ]; + c = 0; + for (c = 0; c < r4; c++) + { + *rg0++ = r1; + } + } +} +#else +__attribute__((naked)) +void sub_8124DDC(u16 *r0, u16 r1, u8 r2, u8 r3, u8 r4, u8 r5) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + adds r6, r0, 0\n\ + ldr r0, [sp, 0x14]\n\ + ldr r4, [sp, 0x18]\n\ + lsls r1, 16\n\ + lsrs r7, r1, 16\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + lsls r3, 24\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + movs r1, 0\n\ + lsrs r3, 19\n\ + adds r3, r2\n\ + lsls r3, 1\n\ + adds r6, r3\n\ + cmp r1, r4\n\ + bcs _08124E26\n\ +_08124E04:\n\ + lsls r0, r1, 6\n\ + adds r2, r6, r0\n\ + movs r0, 0\n\ + adds r3, r1, 0x1\n\ + cmp r0, r5\n\ + bcs _08124E1E\n\ +_08124E10:\n\ + strh r7, [r2]\n\ + adds r2, 0x2\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, r5\n\ + bcc _08124E10\n\ +_08124E1E:\n\ + lsls r0, r3, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, r4\n\ + bcc _08124E04\n\ +_08124E26:\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif +#ifdef NONMATCHING +void sub_8124E2C(u16 *r0, u16 *r1, u8 r2, u8 r3, u8 r4, u8 r5) +{ + u16 *rg0; + u8 c; + u8 i = 0; + u32 offset= r3 * 0x20 + r2; + //rg0 = &r0[offset]; + for (i = 0; i < r5; i++) + { + rg0 = &r0[offset + i * 0x20 ]; + c = 0; + for (c = 0; c < r4; c++) + { + *(rg0++) = *(r1++); + } + } +} +#else +__attribute__((naked)) +void sub_8124E2C(u16 *r0, u16 *r1, u8 r2, u8 r3, u8 r4, u8 r5) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + adds r7, r0, 0\n\ + ldr r0, [sp, 0x14]\n\ + ldr r4, [sp, 0x18]\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + lsls r3, 24\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + lsls r4, 24\n\ + lsrs r6, r4, 24\n\ + movs r4, 0\n\ + lsrs r3, 19\n\ + adds r3, r2\n\ + lsls r3, 1\n\ + adds r7, r3\n\ + cmp r4, r6\n\ + bcs _08124E76\n\ + _08124E50:\n\ + lsls r0, r4, 6\n\ + adds r2, r7, r0\n\ + movs r3, 0\n\ + adds r4, 0x1\n\ + cmp r3, r5\n\ + bcs _08124E6E\n\ + _08124E5C:\n\ + ldrh r0, [r1]\n\ + strh r0, [r2]\n\ + adds r1, 0x2\n\ + adds r2, 0x2\n\ + adds r0, r3, 0x1\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + cmp r3, r5\n\ + bcc _08124E5C\n\ + _08124E6E:\n\ + lsls r0, r4, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, r6\n\ + bcc _08124E50\n\ + _08124E76:\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif -- cgit v1.2.3 From 102a039e1e1419e69b45cee55094f5bbdbe16cf1 Mon Sep 17 00:00:00 2001 From: M Date: Sat, 26 Aug 2017 02:14:40 +0200 Subject: Decompiled roulette.s up to sub_8115B58 --- asm/roulette.s | 6 +- src/roulette.c | 691 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/roulette_util.c | 2 +- 3 files changed, 691 insertions(+), 8 deletions(-) diff --git a/asm/roulette.s b/asm/roulette.s index 7ed4109fa..9b21d7196 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -25,7 +25,7 @@ _0811511C: .align 2, 0 _08115120: .4byte gSharedMem + 0x19000 thumb_func_end sub_81150FC -*/ + thumb_func_start sub_8115124 sub_8115124: @ 8115124 push {r4,lr} @@ -399,7 +399,7 @@ _0811545C: .4byte 0x0000043c _08115460: ldr r0, _08115480 @ =gWindowConfig_81E6C3C bl SetUpWindowConfig - ldr r0, _08115484 @ =gWindowConfig_81E6CE4 + ldr r0, _08115484 @ =InitMenuWindow bl InitMenuWindow ldr r0, _08115488 @ =gUnknown_083F86BC movs r2, 0xE0 @@ -1472,7 +1472,7 @@ _08115D4C: .4byte 0x000003ff _08115D50: .4byte gUnknown_083F8C00 _08115D54: .4byte gSharedMem + 0x19000 thumb_func_end sub_8115B58 - +*/ thumb_func_start sub_8115D58 sub_8115D58: @ 8115D58 push {lr} diff --git a/src/roulette.c b/src/roulette.c index e15d6ee2f..3a0702d1d 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -3,25 +3,179 @@ #include "roulette_util.h" #include "task.h" #include "palette.h" +#include "text.h" +#include "pokemon.h" +#include "species.h" +#include "rtc.h" +#include "main.h" +#include "menu_helpers.h" +#include "unknown_task.h" +#include "menu.h" +#include "trig.h" +#include "sprite.h" +#include "menu_cursor.h" +#include "sound.h" extern u8 gUnknown_02019000[]; +extern u16 gSpecialVar_0x8004; +extern struct Unkg083F8DF4 gUnknown_083F8DF4[]; +extern u8 gUnknown_083F8EC4; +extern u8 gUnknown_083F8DF0[]; +extern u8 gUnknown_083F8E34[]; +extern const u8 gUnknown_08E8096C[]; +extern const u8 gRouletteWheelTiles[]; +extern const u8 gRouletteCenter_Gfx[]; +extern const u8 gRouletteHeadersTiles[]; +extern const u8 gRouletteCreditTiles[]; +extern const u8 gRouletteNumbersTiles[]; +extern const u8 gRouletteMultiplierTiles[]; +extern const u8 gUnknown_083F86BC[]; +extern const u8 gUnknown_083F88BC[]; +extern const u8 gUnknown_083F8A60[]; + +extern u16 gPlttBufferFaded[]; +extern u16 gPlttBufferUnfaded[]; + +extern const u8 gUnknown_081C4157[]; + +extern const struct YesNoFuncTable gUnknown_083F8EBC; +extern const u8 gUnknown_081C41E3; + +struct StructUnknown_083F8C00 +{ + u32 var00; + u32 var04; + u32 var08; + u32 var0C; + u32 var10; +}; + +extern const struct StructUnknown_083F8C00 gUnknown_083F8C00[]; + +const extern u8 gUnknown_083F8ECA[]; + + +void sub_8117838(u8); +void sub_811857C(void); +void sub_81184D8(void); +void sub_8117F2C(void); +void sub_8117900(void); +void sub_8117BBC(void); +void sub_8117DF4(void); + +void sub_81180F4(u16); +void sub_81182F8(u8); +void sub_811829C(u8); +void sub_8117158(u8); + +void sub_81156BC(u8); +void sub_8115634(u8); + +void sub_8116CAC(u8); +void sub_8116CF8(void); +void sub_81185E8(void); +void sub_81182F8(u8); +void sub_81159BC(u8); +void sub_8116C34(u8, TaskFunc, u16, u16); + +void sub_8116AB0(u8); + +void sub_8115E14(u8); + +void sub_8116EF8(u8); + extern u8 ewram[]; -//#define ewram190B8 ((struct UnkStruct0 *) (ewram + 0x190B8)) + +#define ewram18a20 ((u16 *) (ewram + 0x18a20)) +#define ewram18a32 ((u16 *) (ewram + 0x18A32)) +#define ewram18a80 ((u16 *) (ewram + 0x18a80)) #define ewram19000 ((u8 *) (ewram + 0x19000)) +#define ewram190b8 ((u8 *) (ewram + 0x190B8)) +#define RDATA ((struct RData *) (ewram + 0x19000)) +#define UNKDATA ((struct UnkStruct0 *) (ewram + 0x190B8)) + +//////////////// +struct OamMatrix +{ + s16 a; + s16 b; + s16 c; + s16 d; +}; + +struct SpriteCopyRequest +{ + const u8 *src; + u8 *dest; + u16 size; +}; + +struct OamDimensions +{ + s8 width; + s8 height; +}; +//////////////// + +struct Unkg083F8DF4 +{ + u8 var00; + u8 var01; + u8 var02; + u8 var03; + u8 var04; + u8 v[0x1B]; +}; + +struct RData /* ewram + 0x19000 */ +{ + u8 v00; + u8 var01; + u8 var02; + u8 v03; + u8 var04_0:2; + u8 var04_2:5; + u8 var04_7:1; + u8 v7[0x3]; + u32 var08; // may be bitfield + u8 v0[0xD]; + u8 var19; + u8 var1A_0:4; + u8 var1A_4:4; + u8 var1B[0x6]; + u8 var21; + u8 var22; + u8 var23; + s16 var24; + u16 var26; + s16 var28; + s16 var2A; + struct OamMatrix var2C; + u16 var34; + u8 v99[0x6]; + u8 var3C; + u8 v67[0x28]; + u8 var65[0x4]; + u8 v6[0x3B]; + u8 varA4; + u8 varA5; // taskid +}; +void sub_8117434(void); + void sub_81150FC(void) { - struct UnkStruct0 *s; u8 *p; + struct UnkStruct0 *s; RunTasks(); AnimateSprites(); BuildOamBuffer(); p = ewram19000; s = (struct UnkStruct0 *)(&p[0xB8]); if (s->val0) - task_tutorial_controls_fadein(s); + task_tutorial_controls_fadein(s); } void sub_8115124(void) @@ -29,5 +183,534 @@ void sub_8115124(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - + sub_8117434(); + REG_BG1HOFS = 0x200 - RDATA->var26; + if (RDATA->var01) + REG_BLDALPHA = RDATA->var34; + if (RDATA->var2A != 0) + { + DmaCopy16(3, &gBGTilemapBuffers[1][0xE0], (void *)(VRAM + 0x21C0), 0x340); + RDATA->var2A = 0x0; + } + switch (RDATA->var28) + { + case 0x1: + REG_BG0CNT = (0x20 * 0xF8); + DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); + RDATA->var28 = 0x2; + break; + case 0x2: + DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); + break; + case 0xFF: + REG_BG0CNT = 0x1F08; + DmaFill16(3, 0x0, (void *)(VRAM + 0xF9C0), 0x340); + RDATA->var28 = 0x0; + break; + case 0x0: + } +} +#ifdef NONMATCHING +void sub_8115238(void) +{ + u8 i; + u32 temp; + struct Unkg083F8DF4 *s0; + u16 arr[0x3]; // the third is never used ? + memcpy(&arr, &gUnknown_083F8EC4, 0x6); + memset(RDATA, 0x0, 0x17C); + RDATA->var04_0 = (gSpecialVar_0x8004 & 0x1); + if (gSpecialVar_0x8004 & 0x80) + RDATA->var04_7 = 0x1; + s0 = &gUnknown_083F8DF4[0]; + RDATA->var22 = s0[RDATA->var04_0].var03; + RDATA->var23 = s0[RDATA->var04_0].var04; + temp = gUnknown_083F8DF0[RDATA->var04_0 + RDATA->var04_7 * 2]; + RDATA->var19 = temp; + RDATA->var1A_4 = 0x1; + if (temp == 0x1) + { + u16 *faded = &gPlttBufferFaded[0]; + u16 *unfaded = &gPlttBufferUnfaded[0]; + faded[0x51] = arr[0]; + faded[0x0] = arr[0]; + unfaded[0x51] = arr[0]; + unfaded[0x0] = arr[0]; + } + else + { + u16 *faded = &gPlttBufferFaded[0]; + u16 *unfaded = &gPlttBufferUnfaded[0]; + faded[0x51] = arr[1]; + faded[0x0] = arr[1]; + unfaded[0x51] = arr[1]; + unfaded[0x0] = arr[1]; + } + sub_8124918(UNKDATA); + for (i = 0; i < 0xD; i++) + sub_812492C(UNKDATA, i, (struct UnkStruct1 *)&gUnknown_083F8E34[i * 8]); + for (i = 0; i < 0x6; i++) + { + switch (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2)) + { + case SPECIES_TAILLOW: + RDATA->var02 |= 0x2; + break; + case SPECIES_SHROOMISH: + RDATA->var02 |= 0x1; + break; + } + } + RtcCalcLocalTime(); +} +#else +__attribute__((naked)) +void sub_8115238(void) +{ + asm(".syntax unified\n\ + push {r4-r6,lr}\n\ + sub sp, 0x8\n\ + ldr r1, _081152C0 @ =gUnknown_083F8EC4\n\ + mov r0, sp\n\ + movs r2, 0x6\n\ + bl memcpy\n\ + ldr r5, _081152C4 @ =0x02019000\n\ + movs r2, 0xBE\n\ + lsls r2, 1\n\ + adds r0, r5, 0\n\ + movs r1, 0\n\ + bl memset\n\ + ldr r0, _081152C8 @ =gSpecialVar_0x8004\n\ + ldrh r2, [r0]\n\ + movs r0, 0x1\n\ + ands r0, r2\n\ + ldrb r1, [r5, 0x4]\n\ + movs r3, 0x4\n\ + negs r3, r3\n\ + ands r3, r1\n\ + orrs r3, r0\n\ + strb r3, [r5, 0x4]\n\ + movs r0, 0x80\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _08115276\n\ + movs r0, 0x80\n\ + orrs r3, r0\n\ + strb r3, [r5, 0x4]\n\ + _08115276:\n\ + ldr r3, _081152CC @ =gUnknown_083F8DF4\n\ + ldrb r2, [r5, 0x4]\n\ + lsls r1, r2, 30\n\ + lsrs r0, r1, 25\n\ + adds r0, r3\n\ + ldrb r0, [r0, 0x3]\n\ + adds r4, r5, 0\n\ + adds r4, 0x22\n\ + strb r0, [r4]\n\ + lsrs r0, r1, 25\n\ + adds r0, r3\n\ + ldrb r0, [r0, 0x4]\n\ + adds r3, r5, 0\n\ + adds r3, 0x23\n\ + strb r0, [r3]\n\ + ldr r0, _081152D0 @ =gUnknown_083F8DF0\n\ + lsrs r1, 30\n\ + lsls r2, 24\n\ + lsrs r2, 31\n\ + lsls r2, 1\n\ + adds r1, r2\n\ + adds r1, r0\n\ + ldrb r2, [r1]\n\ + strb r2, [r5, 0x19]\n\ + ldrb r1, [r5, 0x1A]\n\ + movs r0, 0xF\n\ + ands r0, r1\n\ + movs r1, 0x10\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x1A]\n\ + cmp r2, 0x1\n\ + bne _081152DC\n\ + ldr r4, _081152D4 @ =gPlttBufferUnfaded\n\ + ldr r3, _081152D8 @ =gPlttBufferFaded\n\ + mov r0, sp\n\ + ldrh r2, [r0]\n\ + b _081152E4\n\ + .align 2, 0\n\ + _081152C0: .4byte gUnknown_083F8EC4\n\ + _081152C4: .4byte 0x02019000\n\ + _081152C8: .4byte gSpecialVar_0x8004\n\ + _081152CC: .4byte gUnknown_083F8DF4\n\ + _081152D0: .4byte gUnknown_083F8DF0\n\ + _081152D4: .4byte gPlttBufferUnfaded\n\ + _081152D8: .4byte gPlttBufferFaded\n\ + _081152DC:\n\ + ldr r4, _08115348 @ =gPlttBufferUnfaded\n\ + ldr r3, _0811534C @ =gPlttBufferFaded\n\ + mov r0, sp\n\ + ldrh r2, [r0, 0x2]\n\ + _081152E4:\n\ + adds r0, r3, 0\n\ + adds r0, 0xA2\n\ + strh r2, [r0]\n\ + ldr r1, _08115350 @ =0x0000ffff\n\ + adds r0, r1, 0\n\ + ands r0, r2\n\ + strh r0, [r3]\n\ + ands r0, r1\n\ + adds r2, r4, 0\n\ + adds r2, 0xA2\n\ + strh r0, [r2]\n\ + ands r0, r1\n\ + strh r0, [r4]\n\ + ldr r0, _08115354 @ =0x020190b8\n\ + bl sub_8124918\n\ + movs r4, 0\n\ + ldr r5, _08115358 @ =gUnknown_083F8E34\n\ + _08115308:\n\ + lsls r2, r4, 3\n\ + adds r2, r5\n\ + ldr r0, _08115354 @ =0x020190b8\n\ + adds r1, r4, 0\n\ + bl sub_812492C\n\ + adds r0, r4, 0x1\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, 0xC\n\ + bls _08115308\n\ + movs r4, 0\n\ + ldr r5, _0811535C @ =0x02019000\n\ + _08115322:\n\ + movs r0, 0x64\n\ + muls r0, r4\n\ + ldr r1, _08115360 @ =gPlayerParty\n\ + adds r0, r1\n\ + movs r1, 0x41\n\ + bl GetMonData\n\ + adds r1, r0, 0\n\ + movs r0, 0x98\n\ + lsls r0, 1\n\ + cmp r1, r0\n\ + beq _08115364\n\ + adds r0, 0x2\n\ + cmp r1, r0\n\ + bne _0811536C\n\ + ldrb r0, [r5, 0x2]\n\ + movs r1, 0x1\n\ + b _08115368\n\ + .align 2, 0\n\ + _08115348: .4byte gPlttBufferUnfaded\n\ + _0811534C: .4byte gPlttBufferFaded\n\ + _08115350: .4byte 0x0000ffff\n\ + _08115354: .4byte 0x020190b8\n\ + _08115358: .4byte gUnknown_083F8E34\n\ + _0811535C: .4byte 0x02019000\n\ + _08115360: .4byte gPlayerParty\n\ + _08115364:\n\ + ldrb r0, [r5, 0x2]\n\ + movs r1, 0x2\n\ + _08115368:\n\ + orrs r0, r1\n\ + strb r0, [r5, 0x2]\n\ + _0811536C:\n\ + adds r0, r4, 0x1\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, 0x5\n\ + bls _08115322\n\ + bl RtcCalcLocalTime\n\ + add sp, 0x8\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif + +void sub_8115384(void) +{ + u32 temp_IME; + u8 taskid; + switch (gMain.state) + { + case 0x0: + SetVBlankCallback(NULL); + remove_some_task(); + sub_80F9438(); + sub_80F9368(); + REG_BG2CNT = 0x4686; + REG_BG1CNT = 0x4401; + REG_BLDCNT = 0x2400; + REG_BLDALPHA = 0x060A; + LZ77UnCompVram(&gUnknown_08E8096C, (void *)VRAM); + LZ77UnCompVram(&gRouletteWheelTiles, (void *)(VRAM + 0x4000)); + gMain.state++; + break; + case 0x1: + ResetPaletteFade(); + ResetSpriteData(); + ResetTasks(); + gMain.state++; + break; + case 0x2: + SetUpWindowConfig(&gWindowConfig_81E6C3C); + InitMenuWindow(&gWindowConfig_81E6CE4); + LoadPalette(&gUnknown_083F86BC, 0x0, 0x1C0); + gMain.state++; + break; + case 0x3: + sub_8115238(); + sub_80F9020(); + LZ77UnCompWram(&gUnknown_083F88BC, (void *)(ewram + 0x18800)); + LZ77UnCompVram(&gUnknown_083F8A60, (void *)(VRAM + 0x3000)); + gMain.state++; + break; + case 0x4: + sub_8117838(0x0); + sub_811857C(); + sub_81184D8(); + sub_8117F2C(); + sub_8117900(); + sub_8117BBC(); + sub_8117DF4(); + gMain.state++; + break; + case 0x5: + AnimateSprites(); + BuildOamBuffer(); + sub_81180F4(gSaveBlock1.coins); + sub_81182F8(0x6); + sub_811829C(0x0); + sub_8117158(0x0); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C4157[0], 0x1, 0xF); + gSpriteCoordOffsetX = -0x3C; + gSpriteCoordOffsetY = 0x0; + gMain.state++; + break; + case 0x6: + REG_DISPCNT = 0x1741; + gMain.state++; + break; + case 0x7: + temp_IME = REG_IME; + REG_IME = 0x0; //disable interrupts + REG_IE |= 0x1; //enable VBlank interrupt + REG_IME = temp_IME; //reenable interrupts + REG_DISPSTAT |= 0x8; + SetVBlankCallback(&sub_8115124); + BeginHardwarePaletteFade(0xFF, 0x0, 0x10, 0x0 , 0x1); + taskid = RDATA->varA4 = CreateTask(&sub_81156BC, 0x0); + gTasks[taskid].data[0x6] = 0x6; + gTasks[taskid].data[0xD] = gSaveBlock1.coins; + RDATA->varA5 = CreateTask(&sub_8115634, 0x1); + SetMainCallback2(&sub_81150FC); + break; + } +} + +void sub_8115634(u8 unused) +{ + s16 sin; + s16 cos; + s32 cos32; + if (RDATA->var21++ == RDATA->var23) + { + RDATA->var21 = 0x0; + if ((RDATA->var24 -= RDATA->var22) < 0) + RDATA->var24 = 0x168 - RDATA->var22; + } + sin = Sin2(RDATA->var24); + cos = Cos2(RDATA->var24); + sin = sin / 16; + cos32 = cos / 16; + RDATA->var2C.d = cos32; + RDATA->var2C.a = cos32; + RDATA->var2C.b = sin; + RDATA->var2C.c = -sin; +} + +void sub_81156BC(u8 taskid) +{ + if (UpdatePaletteFade() == 0) + { + REG_BLDCNT |= 0x2400; + REG_BLDALPHA = 0x0808; + gTasks[taskid].data[0x6] = 0; + sub_8116CAC(taskid); + sub_8116CF8(); + sub_81185E8(); + sub_8117158(0); + sub_81182F8(0x6); + sub_8116C34(taskid, &sub_81159BC, 0xFFFF, 0x3); + } +} + +void sub_8115734(u8 taskid) +{ + DisplayYesNoMenu(0x14, 0x8, 0x1); + sub_814AAF8(0x2D9E); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C41E3, 0x1, 0xF); + DoYesNoFuncWithChoice(taskid, &gUnknown_083F8EBC); +} + +void sub_811577C(u8 taskid) +{ + MenuZeroFillWindowRect(0x14, 0x8, 0x1A, 0xD); + gTasks[taskid].func = &sub_81159BC; +} + +void sub_81157AC(u8 taskid) +{ + DestroyTask(RDATA->varA5); + sub_8116AB0(taskid); +} + +void sub_81157D0(u8 r0) +{ + u8 temp0, temp1; + switch (r0) + { + case 0x0: + sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); + break; + case 0x1: + case 0x2: + case 0x3: + case 0x4: + temp0 = (r0 * 3 + 0xE); + sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a32, temp0, 0x7, 0x3, 0xD); + break; + case 0x5: + case 0xA: + case 0xF: + temp1 = ((r0 - 1) / 5 * 3 + 0xA); + sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a80, 0xE, temp1, 0x10, 0x3); + break; + default: + temp0 = ((r0 % 5) * 3 + 0xE); + temp1 = ((r0 - 1) / 5 * 3 + 0x7); + sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a20, temp0, temp1, 0x3, 0x3); + } +} + +void sub_8115928(u8 taskid, bool8 r1) +{ + if (!r1) + sub_811829C(gTasks[taskid].data[0x4]); + else + sub_811829C(RDATA->var1B[RDATA->var1A_0]); + sub_81157D0(gTasks[taskid].data[0x4]); +} + +void sub_811597C(u8 taskid) +{ + RDATA->var28 = 0x1; + sub_81157D0(gTasks[taskid].data[0x4]); + RDATA->var23 = 0x2; + RDATA->var21 = 0x0; + gTasks[taskid].func = &sub_8115E14; +} + +void sub_81159BC(u8 taskid) +{ + s16 i; + if(RDATA->var08 & 0x20) + { + for (i = 0xB; (i < 0xE); i++) + if ((RDATA->var08 & gUnknown_083F8C00[i].var08) == 0) + break; + } + else + { + for (i = 0x6; (i < 0xA); i++) + if ((RDATA->var08 & gUnknown_083F8C00[i].var08) == 0) + break; + } + gTasks[taskid].data[0x4] = i; + sub_8116CAC(taskid); + sub_8117158(gTasks[taskid].data[0x4]); + sub_811829C(gTasks[taskid].data[0x4]); + sub_8116EF8(gTasks[taskid].data[0x4]); + gTasks[taskid].data[0x1] = 0x0; + gTasks[taskid].func = &sub_811597C; +} + +bool8 sub_8115A94(s16 *r0, u8 r1) +{ + s8 temp1 = 0; + s8 temp = 0; + s8 arr[0x4]; + s8 t; + memcpy(&arr, gUnknown_083F8ECA, 0x4); + t = (u8)*r0; + switch (r1) + { + case 0x0: + case 0x1: + temp1 = (*r0 % 5); + temp = temp1 + 0xF; + if (temp1 == 0) + temp1 = 0x5; + break; + case 0x2: + case 0x3: + temp1 = (s16)(*r0 / 5) * 5; + temp = temp1 + 0x4; + if (temp1 == 0) + temp1 = 0x1; + break; + } + *r0 += arr[r1]; + if (*r0 < temp1) + *r0 = temp; + if (*r0 > temp) + *r0 = temp1; + if (*r0 != t) + return TRUE; + return FALSE; +} + + +void sub_8115B58(u8 r0) +{ + bool8 var0; + if (!(gMain.newKeys & DPAD_UP) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x0))) + if (!(gMain.newKeys & DPAD_DOWN) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x1))) + if (!(gMain.newKeys & DPAD_LEFT) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x2))) + if (!(gMain.newKeys & DPAD_RIGHT) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x3))) + if (var0) + { + u8 i; + //u16 temp5; + sub_8117158(gTasks[r0].data[0x4]); + sub_8115928(r0, FALSE); + gTasks[r0].data[0x1] = 0; + PlaySE(0x5); + sub_8124D3C(UNKDATA, 0xFFFF); + UNKDATA->val3[0xF].field1 = 0x0; + UNKDATA->val3[0xE].field1 = 0x0; + UNKDATA->val3[0xD].field1 = 0x0; + sub_8116EF8(gTasks[r0].data[0x4]); + for (i = 0; i < 4; i++) + { + struct Sprite *sprite = &gSprites[RDATA->var65[i]]; + //u16 *temp0 = ; //deoptimize ->var65 + sprite->oam.tileNum = ((*sprite->anims)->type + sprite->sheetTileStart); + } + //temp5 = (); + if ((u16)(gTasks[r0].data[0x4] - 1) < 0x4) + { + if ((RDATA->var08 & gUnknown_083F8C00[gTasks[r0].data[0x4]].var08) == 0) + { + //u16 temp1 = gTasks[r0].data[0x4] - 1; + u32 temp2 = gSprites[RDATA->var65[(u8)(gTasks[r0].data[0x4] - 1)]].sheetTileStart; + temp2 += (u16)((*gSprites[RDATA->var65[r0]].anims + 1)->type); + gSprites[RDATA->var65[r0]].oam.tileNum = temp2; + } + } + } } diff --git a/src/roulette_util.c b/src/roulette_util.c index 9dc92a1df..7501c3d80 100644 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -102,7 +102,7 @@ u8 sub_81249E4(struct UnkStruct3 *r0) for (i = 0; i < r0->val6; i++) { u32 offset = r0->val5 + i; - struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset]; + struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset]; struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset]; switch(r0->field0) { -- cgit v1.2.3 From 1b87916e0549cf4a087fde6b1c12e9c362ac4d68 Mon Sep 17 00:00:00 2001 From: M Date: Tue, 26 Sep 2017 18:27:22 +0200 Subject: decompiled up to sub_8116EF8, added roulette header --- asm/roulette.s | 4 +- include/roulette.h | 41 ++ include/roulette_util.h | 42 +- src/roulette.c | 1171 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 1154 insertions(+), 104 deletions(-) create mode 100644 include/roulette.h diff --git a/asm/roulette.s b/asm/roulette.s index 9b21d7196..8572c3e6e 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -1472,7 +1472,7 @@ _08115D4C: .4byte 0x000003ff _08115D50: .4byte gUnknown_083F8C00 _08115D54: .4byte gSharedMem + 0x19000 thumb_func_end sub_8115B58 -*/ + thumb_func_start sub_8115D58 sub_8115D58: @ 8115D58 push {lr} @@ -3693,7 +3693,7 @@ _08116EF2: pop {r1} bx r1 thumb_func_end sub_8116E5C - +*/ thumb_func_start sub_8116EF8 sub_8116EF8: @ 8116EF8 push {r4-r7,lr} diff --git a/include/roulette.h b/include/roulette.h new file mode 100644 index 000000000..8c3ed0a34 --- /dev/null +++ b/include/roulette.h @@ -0,0 +1,41 @@ +#ifndef GUARD_ROULETTE_H +#define GUARD_ROULETTE_H + +struct UnkStruct1 +{ + u16 val0; + u16 val1; + u8 val2; + u8 val3; + u8 val4; + s8 field0:5; + s8 field1:2; + s8 field2:1; +}; + +struct UnkStruct3 +{ + u8 field0:7; + u8 field1:1; + u8 val1; + s8 val2; + s8 val3; + u16 val4; + u16 val5; + u8 val6; + u8 val7; + u8 val8; + s8 field2:5; + s8 field3:2; + s8 field4:1; +}; + +struct UnkStruct0 +{ + u8 val0; + u8 val1; + u16 val2; //flag for each UnkStruct3 + struct UnkStruct3 val3[0x10]; +}; + +#endif diff --git a/include/roulette_util.h b/include/roulette_util.h index 833c84241..ed925b5bd 100644 --- a/include/roulette_util.h +++ b/include/roulette_util.h @@ -1,43 +1,7 @@ -#ifndef ROULETTE_UTIL_H -#define ROULETTE_UTIL_H - -struct UnkStruct1 -{ - u16 val0; - u16 val1; - u8 val2; - u8 val3; - u8 val4; - s8 field0:5; - s8 field1:2; - s8 field2:1; -}; - -struct UnkStruct3 -{ - u8 field0:7; - u8 field1:1; - u8 val1; - s8 val2; - s8 val3; - u16 val4; - u16 val5; - u8 val6; - u8 val7; - u8 val8; - s8 field2:5; - s8 field3:2; - s8 field4:1; -}; - -struct UnkStruct0 -{ - u8 val0; - u8 val1; //unused ? - u16 val2; //flag for each UnkStruct3 - struct UnkStruct3 val3[0x10]; -}; +#ifndef GUARD_ROULETTE_UTIL_H +#define GUARD_ROULETTE_UTIL_H +#include "roulette.h" void sub_8124918(struct UnkStruct0 *); u8 sub_812492C(struct UnkStruct0 *, u8, struct UnkStruct1 *); diff --git a/src/roulette.c b/src/roulette.c index 3a0702d1d..76b5a4d9c 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1,5 +1,5 @@ #include "global.h" - +#include "roulette.h" #include "roulette_util.h" #include "task.h" #include "palette.h" @@ -15,6 +15,13 @@ #include "sprite.h" #include "menu_cursor.h" #include "sound.h" +#include "songs.h" +#include "m4a.h" +#include "rng.h" +#include "game_stat.h" +#include "rom4.h" +#include "string_util.h" +#include "field_fadetransition.h" extern u8 gUnknown_02019000[]; extern u16 gSpecialVar_0x8004; @@ -41,19 +48,50 @@ extern const u8 gUnknown_081C4157[]; extern const struct YesNoFuncTable gUnknown_083F8EBC; extern const u8 gUnknown_081C41E3; +extern const u16 gUnknown_083F8ECE; + struct StructUnknown_083F8C00 { - u32 var00; + u8 var00; + u8 var01; + u16 var02; u32 var04; u32 var08; u32 var0C; - u32 var10; + u16 var10; + u16 var12; +}; + +struct StructgUnknown_083F8D90 +{ + u8 var00; + u8 var01; + u8 var02; + u8 var03; + u32 var04; }; extern const struct StructUnknown_083F8C00 gUnknown_083F8C00[]; const extern u8 gUnknown_083F8ECA[]; +const extern u8 gUnknown_081C41A5; +const extern u8 gUnknown_081C4199; +const extern u8 gUnknown_081C41AE; + +const extern u8 gUnknown_081C41BD; + +const extern u8 gUnknown_081C41F1; +const extern u8 gUnknown_081C4231; +const extern u8 gUnknown_081C41D2; + +extern const struct StructgUnknown_083F8D90 gUnknown_083F8D90[]; +extern const u32 gUnknown_083F8ED8[]; +extern const u32 gUnknown_083F8EE8[]; + +extern const struct UnkStruct1 gUnknown_083F8E9C[]; + +void sub_8117434(void); void sub_8117838(u8); void sub_811857C(void); @@ -84,6 +122,39 @@ void sub_8115E14(u8); void sub_8116EF8(u8); +void sub_8115ECC(u8); + +u8 sub_8117380(u8); + +void sub_8117AA8(u8, u8); +void sub_8117C60(u8, u8); +void sub_8116100(u8); + +void sub_8116308(u8); + +void sub_81191F4(struct Sprite *); +void sub_811637C(u8); + +u8 sub_8116D54(u8, u8); +u8 sub_8116E5C(u8 ,u8); +void sub_8116474(u8); + +void sub_81184CC(struct Sprite *); +void sub_8117D68(u8); +void sub_8116514(u8); + +void sub_8116638(u8); + +void sub_811677C(u8); +void sub_81167F4(u8); + +void sub_8116880(u8); +void sub_81157AC(u8); + +void sub_8116B40(u8); + + +void dp01t_12_3_battle_menu(u8); extern u8 ewram[]; @@ -91,12 +162,17 @@ extern u8 ewram[]; #define ewram18a32 ((u16 *) (ewram + 0x18A32)) #define ewram18a80 ((u16 *) (ewram + 0x18a80)) #define ewram19000 ((u8 *) (ewram + 0x19000)) -#define ewram190b8 ((u8 *) (ewram + 0x190B8)) #define RDATA ((struct RData *) (ewram + 0x19000)) -#define UNKDATA ((struct UnkStruct0 *) (ewram + 0x190B8)) -//////////////// -struct OamMatrix +#define S16TOPOSFLOAT(val) \ +({ \ + s16 v = (val); \ + float f = (float)v; \ + if(v < 0) f += 65536.0f; \ + f; \ +}) + +struct Matrix { s16 a; s16 b; @@ -104,20 +180,6 @@ struct OamMatrix s16 d; }; -struct SpriteCopyRequest -{ - const u8 *src; - u8 *dest; - u16 size; -}; - -struct OamDimensions -{ - s8 width; - s8 height; -}; -//////////////// - struct Unkg083F8DF4 { u8 var00; @@ -125,21 +187,29 @@ struct Unkg083F8DF4 u8 var02; u8 var03; u8 var04; - u8 v[0x1B]; + u8 v[0x13]; + s16 var18; + s16 var1A; //is this signed or not ? + u8 v2[0x4]; }; struct RData /* ewram + 0x19000 */ { - u8 v00; + u8 var00; u8 var01; u8 var02; - u8 v03; + u8 var03_0:5; + u8 var03_5:1; + u8 var03_6:1; + u8 var03_7:1; u8 var04_0:2; u8 var04_2:5; u8 var04_7:1; u8 v7[0x3]; - u32 var08; // may be bitfield - u8 v0[0xD]; + u32 var08; + u8 var0C[0x6]; + u8 var12[0x4]; + u8 var16[0x3]; u8 var19; u8 var1A_0:4; u8 var1A_4:4; @@ -148,23 +218,43 @@ struct RData /* ewram + 0x19000 */ u8 var22; u8 var23; s16 var24; - u16 var26; + s16 var26; s16 var28; s16 var2A; - struct OamMatrix var2C; + struct Matrix var2C; u16 var34; - u8 v99[0x6]; - u8 var3C; - u8 v67[0x28]; - u8 var65[0x4]; - u8 v6[0x3B]; + u8 v99[0x2]; + struct Sprite *var38; + u8 var3C[0x30]; // TODO: add some defines for the different areas + u8 var6C; + u8 v6[0xF]; + u8 var7C; + u8 var7D; + u8 var7E; + u8 var7F; + s16 var80; + s16 var82; + s16 var84; + s16 var86; + float var88; + float var8C; + float var90; + float var94; + float var98; + float var9C; + float varA0; u8 varA4; u8 varA5; // taskid + u8 v51[0x2]; + u16 varA8; + u16 varAA; + TaskFunc varAC; + u8 v46[0x4]; + TaskFunc varB4; + struct UnkStruct0 varB8; }; -void sub_8117434(void); - void sub_81150FC(void) { u8 *p; @@ -246,9 +336,9 @@ void sub_8115238(void) unfaded[0x51] = arr[1]; unfaded[0x0] = arr[1]; } - sub_8124918(UNKDATA); + sub_8124918((&RDATA->varB8)); for (i = 0; i < 0xD; i++) - sub_812492C(UNKDATA, i, (struct UnkStruct1 *)&gUnknown_083F8E34[i * 8]); + sub_812492C((&RDATA->varB8), i, (struct UnkStruct1 *)&gUnknown_083F8E34[i * 8]); for (i = 0; i < 0x6; i++) { switch (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2)) @@ -649,15 +739,15 @@ bool8 sub_8115A94(s16 *r0, u8 r1) t = (u8)*r0; switch (r1) { - case 0x0: - case 0x1: + case 0x0: + case 0x1: temp1 = (*r0 % 5); temp = temp1 + 0xF; if (temp1 == 0) temp1 = 0x5; break; - case 0x2: - case 0x3: + case 0x2: + case 0x3: temp1 = (s16)(*r0 / 5) * 5; temp = temp1 + 0x4; if (temp1 == 0) @@ -674,10 +764,10 @@ bool8 sub_8115A94(s16 *r0, u8 r1) return FALSE; } - void sub_8115B58(u8 r0) { - bool8 var0; + u8 z = 0x0; + bool8 var0 = FALSE; if (!(gMain.newKeys & DPAD_UP) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x0))) if (!(gMain.newKeys & DPAD_DOWN) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x1))) if (!(gMain.newKeys & DPAD_LEFT) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x2))) @@ -685,32 +775,987 @@ void sub_8115B58(u8 r0) if (var0) { u8 i; - //u16 temp5; sub_8117158(gTasks[r0].data[0x4]); sub_8115928(r0, FALSE); - gTasks[r0].data[0x1] = 0; - PlaySE(0x5); - sub_8124D3C(UNKDATA, 0xFFFF); - UNKDATA->val3[0xF].field1 = 0x0; - UNKDATA->val3[0xE].field1 = 0x0; - UNKDATA->val3[0xD].field1 = 0x0; + gTasks[r0].data[0x1] = z; + PlaySE(SE_SELECT); + sub_8124D3C((&RDATA->varB8), 0xFFFF); + (&RDATA->varB8)->val3[0xF].field1 = 0x0; + (&RDATA->varB8)->val3[0xE].field1 = 0x0; + (&RDATA->varB8)->val3[0xD].field1 = 0x0; sub_8116EF8(gTasks[r0].data[0x4]); - for (i = 0; i < 4; i++) + for (i = 0; i < 0x4; i++) { - struct Sprite *sprite = &gSprites[RDATA->var65[i]]; - //u16 *temp0 = ; //deoptimize ->var65 - sprite->oam.tileNum = ((*sprite->anims)->type + sprite->sheetTileStart); + gSprites[RDATA->var3C[i + 0x29]].oam.tileNum = + gSprites[RDATA->var3C[i + 0x29]].sheetTileStart + + (*gSprites[RDATA->var3C[i + 0x29]].anims)->type; } - //temp5 = (); - if ((u16)(gTasks[r0].data[0x4] - 1) < 0x4) + if ((u16)(gTasks[r0].data[0x4] - 1) < 0x4 && !(RDATA->var08 & gUnknown_083F8C00[gTasks[r0].data[0x4]].var08) ) { - if ((RDATA->var08 & gUnknown_083F8C00[gTasks[r0].data[0x4]].var08) == 0) - { - //u16 temp1 = gTasks[r0].data[0x4] - 1; - u32 temp2 = gSprites[RDATA->var65[(u8)(gTasks[r0].data[0x4] - 1)]].sheetTileStart; - temp2 += (u16)((*gSprites[RDATA->var65[r0]].anims + 1)->type); - gSprites[RDATA->var65[r0]].oam.tileNum = temp2; - } + z = gTasks[r0].data[0x4] - 1; + gSprites[RDATA->var3C[z + 0x29]].oam.tileNum = + gSprites[RDATA->var3C[z + 0x29]].sheetTileStart + + (*gSprites[RDATA->var3C[z + 0x29]].anims + 1)->type; } } } + +void sub_8115D58(u8 r0) +{ + RDATA->var28 = 0xFF; + if (RDATA->var19 == 1) + RDATA->var23 = 1; + else + RDATA->var23 = 0; + RDATA->var21 = 0; + gTasks[r0].data[0x1] = 0x20; + gTasks[r0].func = &sub_8115ECC; +} + +void sub_8115DA0(u8 taskid) +{ + RDATA->var1B[RDATA->var1A_0] = gTasks[taskid].data[0x4]; + gTasks[taskid].data[0x2] = sub_8117380(RDATA->var1B[RDATA->var1A_0]); + sub_811829C(RDATA->var1B[RDATA->var1A_0]); + if ((gTasks[taskid].data[0xD] -= RDATA->var19) < 0) + gTasks[taskid].data[0xD] = 0; + sub_81180F4(gTasks[taskid].data[0xD]); + gTasks[taskid].func = &sub_8115D58; +} + +void sub_8115E14(u8 taskid) +{ + sub_8115B58(taskid); + switch (gTasks[taskid].data[0x1]) + { + case 0x0: + sub_81157D0(gTasks[taskid].data[0x4]); + gTasks[taskid].data[0x1]+= 1; + break; + case 0x1E: + sub_81157D0(0); + gTasks[taskid].data[0x1]+= 1; + break; + case 0x3B: + gTasks[taskid].data[0x1] = 0; + break; + default: + gTasks[taskid].data[0x1]++; + } + if (gMain.newKeys & A_BUTTON) + { + if ((RDATA->var08 & gUnknown_083F8C00[gTasks[taskid].data[0x4]].var08)) + PlaySE(SE_BOO); + else + { + m4aSongNumStart(SE_REGI); + gTasks[taskid].func = &sub_8115DA0; + } + } +} + +void sub_8115ECC(u8 taskid) +{ + if (gTasks[taskid].data[0x1]-- > 0) + { + if (gTasks[taskid].data[0x1] > 0x2) + gSpriteCoordOffsetX += 0x2; + if ((RDATA->var26 += 0x4) == 0x68) + gSprites[RDATA->var3C[0x19]].callback = &SpriteCallbackDummy; + } + else + { + sub_8117AA8(0x1, 0xFF); + sub_8117C60(0x1, 0xFF); + gTasks[taskid].func = &sub_8116100; + gTasks[taskid].data[0x1] = 0; + } +} + +u8 sub_8115F58(u16 r0, u16 r1) +{ + u8 timeh; + switch (RDATA->var02) + { + case 0x1: // SHROOMISH + case 0x2: // TAILLOW + // one of the two is in party + timeh = gLocalTime.hours - 0x4; + if (!(timeh > 0x5)) + { + if (!(r0 < 0xC || (r1 & 0x1))) + return 0x1; + else + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02 / 2; + } + } + else if (!(r1 & 0x3)) + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02 / 2; + } + else + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02; + } + break; + case 0x3: + // both are in party + timeh = gLocalTime.hours - 0x4; + if (!(timeh > 0x6)) + { + if (r0 < 0x6 || (r1 & 0x1)) + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02 / 2; + } + else + { + return 0x1; + } + } + else if ((r1 & 0x1) && !(r0 < 0x7)) + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02 / 4; + } + else + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02 / 2; + } + break; + case 0: + default: + // neither is in party + timeh = gLocalTime.hours - 0x4; + if (!(timeh > 5)) + { + if (!(r1 & 0x3)) + { + return 0x1; + } + else + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02 / 2; + } + } + else if (!(r1 & 0x3)) + { + if (!(r0 < 0xD)) + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02 / 2; + } + else + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02; + } + } + else if (r1 & (0x80 << 8)) + { + if (!(r0 < 0xD)) + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var02; + } + else + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var01; + } + } + else + { + struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[RDATA->var04_0].var01 * 2; + } + } +} + +#ifdef NONMATCHING +void sub_8116100(u8 taskid) +{ + u8 randf; + u16 floatr; + float tempf; + u32 zzz; + s8 randfinal; + s8 r5; + u16 g; + u16 rand; + u16 randmod; + s16 angles[0x4]; // angles in 90 degree steps + u8 zero = 0x0; + memcpy(angles, &gUnknown_083F8ECE, 0x8); + rand = Random(); + randmod = rand % 0x64; + RDATA->var7C = gTasks[taskid].data[0x6]; + RDATA->var7F = zero; + RDATA->var7E = zero; + RDATA->var7D = zero; + randf = sub_8115F58(gTasks[taskid].data[0x8], rand); + randfinal = (rand % randf) - (randf / 2); + if (gLocalTime.hours < 0xD) + r5 = 0x0; + else + r5 = 0x1; + if (randmod < 0x50) + r5 *= 2; + else + r5 = (1 - r5) * 2; + g = (&gUnknown_083F8DF4[RDATA->var04_0])->var1A; + RDATA->var80 = (g + randfinal); + tempf = S16TOPOSFLOAT(g + randfinal); + // some register differences here + floatr = tempf / 5.0f; + zzz = floatr * 3; + RDATA->var82 = floatr * 3; + RDATA->var84 = floatr; + RDATA->var86 = floatr; + // + RDATA->var88 = S16TOPOSFLOAT(angles[(rand & 0x1) + r5]); + RDATA->var8C = S16TOPOSFLOAT((&gUnknown_083F8DF4[RDATA->var04_0])->var18); + RDATA->var90 = ((RDATA->var8C * 0.5f) - RDATA->var8C) / S16TOPOSFLOAT(zzz); + RDATA->var94 = 68.0f; + RDATA->var9C = 0.0f; + RDATA->var98 = -(8.0f / S16TOPOSFLOAT(zzz)); + RDATA->varA0 = 36.0f; + gTasks[taskid].func = &sub_8116308; +} +#else +__attribute__((naked)) +void sub_8116100(u8 taskid) +{ +asm(".syntax unified\n\ +push {r4-r7,lr}\n\ +mov r7, r10\n\ +mov r6, r9\n\ +mov r5, r8\n\ +push {r5-r7}\n\ +sub sp, 0x8\n\ +lsls r0, 24\n\ +lsrs r0, 24\n\ +mov r9, r0\n\ +movs r4, 0\n\ +ldr r1, _08116188 @ =gUnknown_083F8ECE\n\ +mov r0, sp\n\ +movs r2, 0x8\n\ +bl memcpy\n\ +bl Random\n\ +lsls r0, 16\n\ +lsrs r7, r0, 16\n\ +adds r0, r7, 0\n\ +movs r1, 0x64\n\ +bl __umodsi3\n\ +lsls r0, 16\n\ +lsrs r6, r0, 16\n\ +ldr r3, _0811618C @ =0x02019000\n\ +ldr r1, _08116190 @ =gTasks\n\ +mov r2, r9\n\ +lsls r0, r2, 2\n\ +add r0, r9\n\ +lsls r0, 3\n\ +adds r0, r1\n\ +ldrh r2, [r0, 0x14]\n\ +adds r1, r3, 0\n\ +adds r1, 0x7C\n\ +strb r2, [r1]\n\ +adds r1, 0x3\n\ +strb r4, [r1]\n\ +subs r1, 0x1\n\ +strb r4, [r1]\n\ +subs r1, 0x1\n\ +strb r4, [r1]\n\ +ldrh r0, [r0, 0x18]\n\ +adds r1, r7, 0\n\ +bl sub_8115F58\n\ +adds r4, r0, 0\n\ +lsls r4, 24\n\ +lsrs r1, r4, 24\n\ +adds r0, r7, 0\n\ +bl __modsi3\n\ +lsrs r4, 25\n\ +subs r0, r4\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +ldr r0, _08116194 @ =gLocalTime\n\ +ldrb r0, [r0, 0x2]\n\ +lsls r0, 24\n\ +asrs r0, 24\n\ +movs r5, 0x1\n\ +cmp r0, 0xC\n\ +bgt _08116180\n\ +movs r5, 0\n\ +_08116180:\n\ +cmp r6, 0x4F\n\ +bhi _08116198\n\ +lsls r0, r5, 25\n\ +b _081161A2\n\ +.align 2, 0\n\ +_08116188: .4byte gUnknown_083F8ECE\n\ +_0811618C: .4byte 0x02019000\n\ +_08116190: .4byte gTasks\n\ +_08116194: .4byte gLocalTime\n\ +_08116198:\n\ +lsls r1, r5, 24\n\ +asrs r1, 24\n\ +movs r0, 0x1\n\ +subs r0, r1\n\ +lsls r0, 25\n\ +_081161A2:\n\ +lsrs r5, r0, 24\n\ +ldr r6, _081162D8 @ =0x02019000\n\ +ldrb r0, [r6, 0x4]\n\ +lsls r0, 30\n\ +mov r10, r0\n\ +lsrs r0, 25\n\ +ldr r1, _081162DC @ =gUnknown_083F8DF4\n\ +adds r0, r1\n\ +lsls r4, 24\n\ +asrs r4, 24\n\ +ldrh r0, [r0, 0x1A]\n\ +adds r4, r0\n\ +adds r0, r6, 0\n\ +adds r0, 0x80\n\ +strh r4, [r0]\n\ +lsls r4, 16\n\ +asrs r4, 16\n\ +adds r0, r4, 0\n\ +bl __floatsisf\n\ +cmp r4, 0\n\ +bge _081161D4\n\ +ldr r1, _081162E0 @ =0x47800000\n\ +bl __addsf3\n\ +_081161D4:\n\ +ldr r1, _081162E4 @ =0x40a00000\n\ +bl __divsf3\n\ +bl __fixunssfsi\n\ +lsls r0, 16\n\ +lsrs r4, r0, 16\n\ +lsls r0, r4, 1\n\ +adds r0, r4\n\ +mov r8, r0\n\ +adds r0, r6, 0\n\ +adds r0, 0x82\n\ +mov r2, r8\n\ +strh r2, [r0]\n\ +adds r0, 0x2\n\ +strh r4, [r0]\n\ +adds r0, 0x2\n\ +strh r4, [r0]\n\ +movs r0, 0x1\n\ +ands r0, r7\n\ +lsls r1, r5, 24\n\ +asrs r1, 24\n\ +adds r0, r1\n\ +lsls r0, 1\n\ +add r0, sp\n\ +movs r1, 0\n\ +ldrsh r4, [r0, r1]\n\ +adds r0, r4, 0\n\ +bl __floatsisf\n\ +cmp r4, 0\n\ +bge _0811621A\n\ +ldr r1, _081162E0 @ =0x47800000\n\ +bl __addsf3\n\ +_0811621A:\n\ +ldr r2, _081162E8 @ =0x02019088\n\ +str r0, [r2]\n\ +adds r7, r6, 0\n\ +adds r7, 0x8C\n\ +mov r1, r10\n\ +lsrs r0, r1, 25\n\ +ldr r2, _081162DC @ =gUnknown_083F8DF4\n\ +adds r0, r2\n\ +movs r1, 0x18\n\ +ldrsh r4, [r0, r1]\n\ +adds r0, r4, 0\n\ +bl __floatsisf\n\ +adds r5, r0, 0\n\ +cmp r4, 0\n\ +bge _08116242\n\ +ldr r1, _081162E0 @ =0x47800000\n\ +bl __addsf3\n\ +adds r5, r0, 0\n\ +_08116242:\n\ +str r5, [r7]\n\ +adds r7, r6, 0\n\ +adds r7, 0x90\n\ +ldr r1, _081162EC @ =0x3f000000\n\ +adds r0, r5, 0\n\ +bl __mulsf3\n\ +adds r1, r5, 0\n\ +bl __subsf3\n\ +adds r5, r0, 0\n\ +mov r2, r8\n\ +lsls r0, r2, 16\n\ +asrs r4, r0, 16\n\ +adds r0, r4, 0\n\ +bl __floatsisf\n\ +adds r2, r0, 0\n\ +cmp r4, 0\n\ +bge _08116272\n\ +ldr r1, _081162E0 @ =0x47800000\n\ +bl __addsf3\n\ +adds r2, r0, 0\n\ +_08116272:\n\ +adds r0, r5, 0\n\ +adds r1, r2, 0\n\ +bl __divsf3\n\ +str r0, [r7]\n\ +adds r1, r6, 0\n\ +adds r1, 0x94\n\ +ldr r0, _081162F0 @ =0x42880000\n\ +str r0, [r1]\n\ +adds r1, 0x8\n\ +ldr r0, _081162F4 @ =0x00000000\n\ +str r0, [r1]\n\ +adds r5, r6, 0\n\ +adds r5, 0x98\n\ +adds r0, r4, 0\n\ +bl __floatsisf\n\ +adds r2, r0, 0\n\ +cmp r4, 0\n\ +bge _081162A2\n\ +ldr r1, _081162E0 @ =0x47800000\n\ +bl __addsf3\n\ +adds r2, r0, 0\n\ +_081162A2:\n\ +ldr r0, _081162F8 @ =0x41000000\n\ +adds r1, r2, 0\n\ +bl __divsf3\n\ +bl __negsf2\n\ +str r0, [r5]\n\ +adds r1, r6, 0\n\ +adds r1, 0xA0\n\ +ldr r0, _081162FC @ =0x42100000\n\ +str r0, [r1]\n\ +ldr r1, _08116300 @ =gTasks\n\ +mov r2, r9\n\ +lsls r0, r2, 2\n\ +add r0, r9\n\ +lsls r0, 3\n\ +adds r0, r1\n\ +ldr r1, _08116304 @ =sub_8116308\n\ +str r1, [r0]\n\ +add sp, 0x8\n\ +pop {r3-r5}\n\ +mov r8, r3\n\ +mov r9, r4\n\ +mov r10, r5\n\ +pop {r4-r7}\n\ +pop {r0}\n\ +bx r0\n\ +.align 2, 0\n\ +_081162D8: .4byte 0x02019000\n\ +_081162DC: .4byte gUnknown_083F8DF4\n\ +_081162E0: .4byte 0x47800000\n\ +_081162E4: .4byte 0x40a00000\n\ +_081162E8: .4byte 0x02019088\n\ +_081162EC: .4byte 0x3f000000\n\ +_081162F0: .4byte 0x42880000\n\ +_081162F4: .4byte 0x00000000\n\ +_081162F8: .4byte 0x41000000\n\ +_081162FC: .4byte 0x42100000\n\ +_08116300: .4byte gTasks\n\ +_08116304: .4byte sub_8116308\n\ +.syntax divided\n"); +} +#endif + +void sub_8116308(u8 taskid) +{ + u8 index; + RDATA->var03_7 = 1; + index = RDATA->var3C[RDATA->var7C]; + RDATA->var38 = &gSprites[index]; + (&gSprites[index])->callback = &sub_81191F4; + gTasks[taskid].data[0x6]++; + gTasks[taskid].data[0x8]++; + sub_81182F8(0x6 - gTasks[taskid].data[0x6]); + m4aSongNumStart(SE_TAMAKORO); + gTasks[taskid].func = &sub_811637C; +} + +void sub_811637C(u8 taskid) +{ + if (RDATA->var7D) + { + if (RDATA->var03_5) + { + if (RDATA->var03_6) + { + RDATA->var03_6 = FALSE; + RDATA->var03_5 = FALSE; + } + } + else + { + if (!gTasks[taskid].data[0x1]) + { + u8 temp = sub_8116E5C(sub_8116D54(taskid, RDATA->var7E), RDATA->var1B[RDATA->var1A_0]); + gTasks[taskid].data[0x5] = temp; + if (temp == 1) + sub_8124CE8((&RDATA->varB8), 0x1000); + } + if (gTasks[taskid].data[0x1] < 0x3D) + { + if (gMain.newKeys & A_BUTTON) + gTasks[taskid].data[0x1] = 0x3C; + gTasks[taskid].data[0x1]++; + } + else + { + sub_8117158(RDATA->var1B[RDATA->var1A_0]); + sub_8117AA8(0x0, (u8)gTasks[taskid].data[0xC]); + sub_8117C60(0x0, (u8)gTasks[taskid].data[0x6] - 0x1); + gTasks[taskid].data[0x1] = 0x20; + gTasks[taskid].func = &sub_8116474; + } + } + } +} + +void sub_8116474(u8 taskid) +{ + if (gTasks[taskid].data[0x1]-- > 0x0) + { + if(gTasks[taskid].data[0x1] > 0x2) + gSpriteCoordOffsetX -= 0x2; + if((RDATA->var26 -= 0x4) == 0x68) + gSprites[RDATA->var3C[0x19]].callback = &sub_81184CC; + } + else + { + sub_8117D68(gTasks[taskid].data[0xC]); + if (gTasks[taskid].data[0x5] == 1) + gTasks[taskid].data[0x1] = 0x79; + else + gTasks[taskid].data[0x1] = 0x3D; + gTasks[taskid].func = &sub_8116514; + } +} + +void sub_8116514(u8 taskid) +{ + if (gTasks[taskid].data[0x1]-- > 0x1) + { + switch(gTasks[taskid].data[0x1] % 0x10) + { + case 0x8: + sub_8117AA8(0x0, 0xFF); + sub_8117C60(0x0, 0xFF); + break; + case 0x0: + sub_8117AA8(0x0, (u8)gTasks[taskid].data[0xC]); + sub_8117C60(0x0, (u8)gTasks[taskid].data[0x6] - 0x1); + break; + } + } + else + { + sub_8116C34(taskid, &sub_8116638, 0x1E, 0x0); + } +} + +void sub_811659C(u8 taskid) +{ + switch(gTasks[taskid].data[0x5]) + { + case 0x1: + case 0x2: + if (IsFanfareTaskInactive()) + { + u32 wins = GetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS); + if(wins < ++gTasks[taskid].data[0xB]) + SetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS, gTasks[taskid].data[0xB]); + sub_8116C34(taskid, &sub_811677C, 0xFFFF, 0x3); + } + break; + case 0: + default: + if (!IsSEPlaying()) + { + gTasks[taskid].data[0xB] = FALSE; + sub_8116C34(taskid, &sub_81167F4, 0xFFFF, 0x3); + } + } +} + +void sub_8116638(u8 taskid) +{ + switch(gTasks[taskid].data[0x5]) + { + case 0x1: + case 0x2: + if (gTasks[taskid].data[0x2] == 0xC) + { + PlayFanfare(BGM_ME_B_BIG); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C41A5, 0x1, 0xF); + } + else + { + PlayFanfare(BGM_ME_B_SMALL); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C4199, 0x1, 0xF); + } + break; + case 0: + default: + m4aSongNumStart(SE_HAZURE); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C41AE, 0x1, 0xF); + } + gTasks[taskid].data[0x1] = 0x0; + gTasks[taskid].func = &sub_811659C; +} + +void sub_81166E8(u8 taskid) +{ + s32 r0 = gTasks[taskid].data[0x7]; + switch(r0) + { + case 0x0: + gTasks[taskid].data[0xD]++; + m4aSongNumStart(SE_PIN); + sub_81180F4(gTasks[taskid].data[0xD]); + if (gTasks[taskid].data[0xD] > 0x270E) + { + gTasks[taskid].data[0x1] = r0; + } + else + { + gTasks[taskid].data[0x1]--; + gTasks[taskid].data[0x7]++; + } + break; + case 0x3: + m4aSongNumStop(SE_PIN); + gTasks[taskid].data[0x7] = 0x0; + break; + default: + gTasks[taskid].data[0x7]++; + } + if (gTasks[taskid].data[0x1] == 0x0) + sub_8116C34(taskid, &sub_81167F4, 0xFFFF, 0x3); +} + +void sub_811677C(u8 taskid) +{ + ConvertIntToDecimalStringN((u8 *)&gStringVar1, (RDATA->var19 * gTasks[taskid].data[0x2]), STR_CONV_MODE_LEFT_ALIGN, 0x2); + StringExpandPlaceholders((u8 *)&gStringVar4, &gUnknown_081C41BD); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint((u8 *)&gStringVar4, 0x1, 0xF); + gTasks[taskid].data[0x1] = (RDATA->var19 * gTasks[taskid].data[0x2]); + gTasks[taskid].data[0x7] = 0x0; + gTasks[taskid].func = &sub_81166E8; +} + +void sub_81167F4(u8 taskid) +{ + sub_8124D3C((&RDATA->varB8), 0xFFFF); + (&RDATA->varB8)->val3[0xF].field1 = 0x0; + (&RDATA->varB8)->val3[0xE].field1 = 0x0; + (&RDATA->varB8)->val3[0xD].field1 = 0x0; + gSprites[RDATA->var3C[0x7 + gUnknown_083F8C00[gTasks[taskid].data[0xC]].var00]].invisible = TRUE; + gTasks[taskid].func = &sub_8116880; +} + +void sub_8116880(u8 taskid) +{ + u8 i = 0; + gTasks[taskid].data[0x4] = i; + RDATA->var1B[RDATA->var1A_0] = 0x0; + sub_8117158(0x0); + gSprites[RDATA->var6C].invisible = TRUE; + for (i = 0; i < 0x4; i++) + { + gSprites[RDATA->var3C[i + 0x29]].oam.tileNum = + gSprites[RDATA->var3C[i + 0x29]].sheetTileStart + + (*gSprites[RDATA->var3C[i + 0x29]].anims)->type; + } + if (!(gTasks[taskid].data[0xD] < RDATA->var19)) + { + if (gTasks[taskid].data[0x6] == 0x6) + { + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C41F1, 0x1, 0xF); + sub_8116C34(taskid, &dp01t_12_3_battle_menu, 0xFFFF, 0x3); + } + else if (gTasks[taskid].data[0xD] == 0x270F) + { + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C4231, 0x1, 0xF); + sub_8116C34(taskid, &sub_8115734, 0xFFFF, 0x3); + } + else + { + gTasks[taskid].func = &sub_8115734; + } + } + else + { + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C41D2, 0x1, 0xF); + sub_8116C34(taskid, &sub_81157AC, 0x3C, 0x3); + } +} + +void dp01t_12_3_battle_menu(u8 taskid) +{ + u8 i = 0x0; + gTasks[taskid].data[0x6] = 0x0; + sub_8116CAC(taskid); + sub_8116CF8(); + sub_81185E8(); + sub_8117158(0x0); + sub_81182F8(0x6); + for (i = 0; i < 0xC; i++) + gSprites[RDATA->var3C[i + 0x7]].invisible = FALSE; + if (gTasks[taskid].data[0xD] == 0x270F) + { + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C4231, 0x1, 0xF); + sub_8116C34(taskid, &sub_8115734, 0xFFFF, 0x3); + } + else + { + gTasks[taskid].func = &sub_8115734; + } +} + +void sub_8116AB0(u8 taskid) +{ + sub_8124D3C((&RDATA->varB8), 0xFFFF); + sub_8124918((&RDATA->varB8)); + gSaveBlock1.coins = gTasks[taskid].data[0xD]; + if (gSaveBlock1.coins < RDATA->var19) + gSpecialVar_0x8004 = TRUE; + else + gSpecialVar_0x8004 = FALSE; + BeginHardwarePaletteFade(0xFF, 0x0, 0x0, 0x10, 0x0); + gTasks[taskid].func = &sub_8116B40; +} + +void sub_8116B40(u8 taskid) // end oulette ? +{ + if (UpdatePaletteFade() == 0) + { + SetVBlankCallback(0x0); + memset(RDATA, 0x0, 0x17C); + gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0x0; + sub_80F9368(); + FreeAllSpritePalettes(); + ResetPaletteFade(); + ResetSpriteData(); + sub_80F9020(); + REG_BLDCNT = 0x0; + REG_BLDALPHA = 0x0; + REG_BLDY = 0x0; + gFieldCallback = &sub_8080990; + SetMainCallback2(&c2_exit_to_overworld_2_switch); + DestroyTask(taskid); + } +} + +void sub_8116BC0(u8 taskid) +{ + if(RDATA->varA8 == 0 || gMain.newKeys & RDATA->varAA) + { + gTasks[taskid].func = RDATA->varAC; + if (RDATA->varAA > 0) + PlaySE(SE_SELECT); + RDATA->varAC = NULL; + RDATA->varAA = 0x0; + RDATA->varA8 = 0x0; + } + if (RDATA->varA8 != 0xFFFF) + RDATA->varA8--; +} + +void sub_8116C34(u8 taskid, TaskFunc r1, u16 r2, u16 r3) +{ + RDATA->varB4 = gTasks[taskid].func; + if(r1 == NULL) + r1 = RDATA->varB4; + RDATA->varAC = r1; + RDATA->varA8 = r2; + if (r2 == 0xFFFF && r3 == 0) + RDATA->varAA = 0xFFFF; + else + RDATA->varAA = r3; + gTasks[taskid].func = &sub_8116BC0; +} + +void sub_8116CAC(u8 taskid) +{ + u8 i = 0; + RDATA->var00 = i; + RDATA->var03_0 = 0x0; + RDATA->var03_5 = 0x0; + RDATA->var03_6 = 0x0; + RDATA->var03_7 = 0x0; + for (i = 0; i < 0x6; i++) + RDATA->var1B[i] = 0x0; + RDATA->var1A_0 = 0x0; + gTasks[taskid].data[0x1] = 0x0; +} + +void sub_8116CF8(void) +{ + u8 i; + RDATA->var08 = 0x0; + for (i = 0; i < 0x6; i++) + RDATA->var0C[i] = 0x0; + for (i = 0; i < 0x4; i++) + RDATA->var12[i] = 0x0; + for (i = 0; i < 0x3; i++) + RDATA->var16[i] = 0x0; + sub_8117C60(0x1, 0xFF); +} + +u8 sub_8116D54(u8 taskid, u8 r1) +{ + u32 t0[0x4]; + u32 t1[0x3]; + memcpy(t0, gUnknown_083F8ED8, 0x10); + memcpy(t1, gUnknown_083F8EE8, 0xC); + if (r1 > 0xB) + { + return 0x0; + } + else + { + u8 i; + u8 z; + RDATA->var0C[gTasks[taskid].data[0x6] - 1] = gUnknown_083F8D90[r1].var02; + gTasks[taskid].data[0xC] = gUnknown_083F8D90[r1].var02; + RDATA->var08 |= gUnknown_083F8D90[r1].var04; + for (i = 0; i < 0x4; i++) + { + if (gUnknown_083F8D90[r1].var04 & t0[i]) + RDATA->var12[i]++; + if (RDATA->var12[i] > 0x2) + RDATA->var08 |= t0[i]; + } + for (z = 0; z < 0x3; z++) + { + if (gUnknown_083F8D90[r1].var04 & t1[z]) + RDATA->var16[z]++; + if (RDATA->var16[z] > 0x3) + RDATA->var08 |= t1[z]; + } + return gUnknown_083F8D90[r1].var02; + } +} + +u8 sub_8116E5C(u8 r0, u8 r1) +{ + u8 t = r0; + if (--r0 < 0x13) + { + switch(r1) + { + case 0x0: + return 0x3; + break; + case 0x1 ... 0x4: + if (t == r1 + 5 || t == r1 + 10 || t == r1 + 15) + return 0x1; + break; + case 0x5: + case 0xA: + case 0xF: + if (!(t < r1 + 1) && !(t > r1 + 4)) + return 0x1; + break; + default: + if (t == r1) + return 0x1; + } + } + return 0x0; +} +/* +void sub_8116EF8(u8 r0) +{ + + u32 var0 = 0x0; + struct UnkStruct1 var1[0x3]; + u32 var2; + u16 var3; + u32 var4; + u8 i; + switch(r0) + { + case 0x5: + case 0xA: + case 0xF: + for (i = (r0 + 0x1); i < (r0 + 0x5); i++) + if (!(RDATA->var08 & gUnknown_083F8C00[i].var08)) + var0 |= gUnknown_083F8C00[i].var10; + var0 &= 0xDFFF; + sub_8124CE8(&RDATA->varB8, var0); + break; + default: + memcpy(var1, gUnknown_083F8E9C, 0x18); + if ((u8)(r0 - 0x1) < 0x4) + var2 = 0x3; + else + var2 = 0x1; + var3 = ((r0 / 0x5) - 0x1); + switch((u8)r0 % 0x5) + { + case 0x1: + var3 = gSprites[RDATA->var3C[0x7 + 0x0]].oam.paletteNum * 0x10; + break; + case 0x2: + var3 = gSprites[RDATA->var3C[0x7 + 0x1]].oam.paletteNum * 0x10; + break; + case 0x3: + var3 = gSprites[RDATA->var3C[0x7 + 0x2]].oam.paletteNum * 0x10; + break; + case 0x4: + var3 = gSprites[RDATA->var3C[0x7 + 0x3]].oam.paletteNum * 0x10; + break; + } + if (var2 == 0x1) + { + if (!(RDATA->var08 & gUnknown_083F8C00[r0].var08)) + { + var4 = (r0 / 0x5); + var1[var4 - 0x1].val1 += var3; + sub_812492C(&RDATA->varB8, 0xD, &var1[var4 - 0x2]); + sub_8124CE8(&RDATA->varB8, var0 |= gUnknown_083F8C00[r0].var10); + } + } + else + { + //u8 i; + for (i = 0; i < 0x3; i++) + { + u8 var4 = i * 0x5 + r0 + 0x5; + if (!(RDATA->var08 & gUnknown_083F8C00[var4].var08)) + { + u8 var5 = (var4 / 0x5); + var1[var5 - 0x1].val1 += var3; + sub_812492C(&RDATA->varB8, (u8)(0xD + i), &var1[var5 - 0x2]); + if (var2 == 0x3) + var0 = gUnknown_083F8C00[var4].var10; + var2--; + } + } + if (var2 != 0x2) + var0 = 0x0; + sub_8124CE8(&RDATA->varB8, var0 |= gUnknown_083F8C00[r0].var10); + } + } +} +*/ -- cgit v1.2.3 From ed7956354c7e6a761f777c2c43f5538a862656a1 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 19 Nov 2017 10:05:43 +0100 Subject: decompiled up to sub_811857C --- asm/roulette.s | 4 +- include/roulette.h | 3 + src/roulette.c | 1648 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/roulette_util.c | 80 ++- 4 files changed, 1671 insertions(+), 64 deletions(-) diff --git a/asm/roulette.s b/asm/roulette.s index 8572c3e6e..f91a336af 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -3693,7 +3693,7 @@ _08116EF2: pop {r1} bx r1 thumb_func_end sub_8116E5C -*/ + thumb_func_start sub_8116EF8 sub_8116EF8: @ 8116EF8 push {r4-r7,lr} @@ -6614,7 +6614,7 @@ _081185DC: .4byte gSharedMem + 0x1903C _081185E0: .4byte gSprites _081185E4: .4byte gSpriteTemplate_83FA40C thumb_func_end sub_811857C - +*/ thumb_func_start sub_81185E8 sub_81185E8: @ 81185E8 push {r4-r7,lr} diff --git a/include/roulette.h b/include/roulette.h index 8c3ed0a34..5bd2e5240 100644 --- a/include/roulette.h +++ b/include/roulette.h @@ -20,6 +20,7 @@ struct UnkStruct3 u8 val1; s8 val2; s8 val3; + /* u16 val4; u16 val5; u8 val6; @@ -28,6 +29,8 @@ struct UnkStruct3 s8 field2:5; s8 field3:2; s8 field4:1; + */ + struct UnkStruct1 val4; }; struct UnkStruct0 diff --git a/src/roulette.c b/src/roulette.c index 76b5a4d9c..1661cce03 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -22,6 +22,10 @@ #include "rom4.h" #include "string_util.h" #include "field_fadetransition.h" +#include "script.h" +#include "strings2.h" + +asm(".include \"constants/gba_constants.inc\""); extern u8 gUnknown_02019000[]; extern u16 gSpecialVar_0x8004; @@ -53,9 +57,14 @@ extern const u16 gUnknown_083F8ECE; struct StructUnknown_083F8C00 { u8 var00; - u8 var01; - u16 var02; - u32 var04; + u8 var01_0:4; + u8 var01_4:4; + u8 var02; + u8 var03; + u8 var04; + u8 var05; + u8 var06; + u8 var07; u32 var08; u32 var0C; u16 var10; @@ -91,6 +100,45 @@ extern const u32 gUnknown_083F8EE8[]; extern const struct UnkStruct1 gUnknown_083F8E9C[]; +extern const u8 gUnknown_083F8EF4[]; + +extern const struct YesNoFuncTable gUnknown_083F8EB4; + +//Strings TODO: give proper names +extern const u8 gUnknown_081C40DF; +extern const u8 gUnknown_081C4139; +extern const u8 gUnknown_081C411C; + +extern const u8 gUnknown_083F92A8[]; +extern const u8 gUnknown_083F90FC[]; +extern const u8 gUnknown_083F9D3C[]; +extern const struct SpritePalette gUnknown_083F9E30; +extern const struct SpriteSheet gUnknown_083F9F54; +extern const struct SpriteSheet gUnknown_083F9F5C; +extern const struct SpriteTemplate gSpriteTemplate_83FA07C[]; +extern const struct SpriteTemplate gSpriteTemplate_83F9FD4[]; +extern const struct SpriteTemplate gSpriteTemplate_83FA034[]; + +extern const struct SpriteTemplate gSpriteTemplate_83FA40C; + +extern const struct SpriteSheet gUnknown_083F9EE8; +extern const struct SpriteTemplate gSpriteTemplate_83FA0DC[]; + +extern struct OamMatrix gOamMatrices[]; + +extern const struct SpriteSheet gUnknown_083FA21C[]; +extern const struct SpriteTemplate gSpriteTemplate_83FA2B0; +extern const struct SpriteTemplate gSpriteTemplate_83FA2C8; +extern const struct SpriteTemplate gSpriteTemplate_83FA2E0; +extern const struct SpriteTemplate gSpriteTemplate_83FA2F8; +extern const struct SpriteTemplate gSpriteTemplate_83FA310; + +extern const u8 gUnknown_083FA608[0x5]; + +extern const struct SpriteSheet gUnknown_083FA42C; +extern const struct SpriteTemplate gSpriteTemplate_83FA434; + + void sub_8117434(void); void sub_8117838(u8); @@ -158,10 +206,15 @@ void dp01t_12_3_battle_menu(u8); extern u8 ewram[]; +#define ewram17000 ((u16 *) (ewram + 0x17000)) //money stuff? +#define ewram17E00 ((u16 *) (ewram + 0x17E00)) +#define ewram17800 ((u16 *) (ewram + 0x17800)) +#define ewram18000 ((u16 *) (ewram + 0x18000)) +#define ewram18800 ((u16 *) (ewram + 0x18800)) +#define ewram189a0 ((u16 *) (ewram + 0x189a0)) #define ewram18a20 ((u16 *) (ewram + 0x18a20)) #define ewram18a32 ((u16 *) (ewram + 0x18A32)) #define ewram18a80 ((u16 *) (ewram + 0x18a80)) -#define ewram19000 ((u8 *) (ewram + 0x19000)) #define RDATA ((struct RData *) (ewram + 0x19000)) #define S16TOPOSFLOAT(val) \ @@ -172,7 +225,7 @@ extern u8 ewram[]; f; \ }) -struct Matrix +struct OamMatrix { s16 a; s16 b; @@ -221,13 +274,11 @@ struct RData /* ewram + 0x19000 */ s16 var26; s16 var28; s16 var2A; - struct Matrix var2C; + struct OamMatrix var2C; u16 var34; u8 v99[0x2]; struct Sprite *var38; - u8 var3C[0x30]; // TODO: add some defines for the different areas - u8 var6C; - u8 v6[0xF]; + u8 var3C[0x40]; // Sprite IDs ? TODO: add some defines for the different areas u8 var7C; u8 var7D; u8 var7E; @@ -257,15 +308,11 @@ struct RData /* ewram + 0x19000 */ void sub_81150FC(void) { - u8 *p; - struct UnkStruct0 *s; RunTasks(); AnimateSprites(); BuildOamBuffer(); - p = ewram19000; - s = (struct UnkStruct0 *)(&p[0xB8]); - if (s->val0) - task_tutorial_controls_fadein(s); + if (RDATA->varB8.val0) + task_tutorial_controls_fadein(&RDATA->varB8); } void sub_8115124(void) @@ -1474,7 +1521,7 @@ void sub_8116880(u8 taskid) gTasks[taskid].data[0x4] = i; RDATA->var1B[RDATA->var1A_0] = 0x0; sub_8117158(0x0); - gSprites[RDATA->var6C].invisible = TRUE; + gSprites[RDATA->var3C[0x30]].invisible = TRUE; for (i = 0; i < 0x4; i++) { gSprites[RDATA->var3C[i + 0x29]].oam.tileNum = @@ -1683,7 +1730,8 @@ u8 sub_8116E5C(u8 r0, u8 r1) } return 0x0; } -/* + +#ifdef NONMATCHING // stack variable switched with a register variable void sub_8116EF8(u8 r0) { @@ -1738,7 +1786,6 @@ void sub_8116EF8(u8 r0) } else { - //u8 i; for (i = 0; i < 0x3; i++) { u8 var4 = i * 0x5 + r0 + 0x5; @@ -1758,4 +1805,1569 @@ void sub_8116EF8(u8 r0) } } } + +#else +__attribute__((naked)) +void sub_8116EF8(u8 r0) +{ +asm(".syntax unified\n\ +push {r4-r7,lr}\n\ +mov r7, r10\n\ +mov r6, r9\n\ +mov r5, r8\n\ +push {r5-r7}\n\ +sub sp, 0x20\n\ +lsls r0, 24\n\ +lsrs r6, r0, 24\n\ +movs r0, 0\n\ +str r0, [sp, 0x18]\n\ +cmp r6, 0xA\n\ +beq _08116F1E\n\ +cmp r6, 0xA\n\ +bgt _08116F1A\n\ +cmp r6, 0x5\n\ +beq _08116F1E\n\ +b _08116F7C\n\ +_08116F1A:\n\ +cmp r6, 0xF\n\ +bne _08116F7C\n\ +_08116F1E:\n\ +adds r0, r6, 0x1\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +adds r0, r6, 0x5\n\ +ldr r7, _08116F70 @ =0x020190b8\n\ +cmp r4, r0\n\ +bge _08116F5E\n\ +adds r1, r7, 0\n\ +subs r1, 0xB8\n\ +ldr r3, _08116F74 @ =gUnknown_083F8C00\n\ +ldr r5, [r1, 0x8]\n\ +adds r6, r3, 0\n\ +adds r6, 0x8\n\ +adds r2, r0, 0\n\ +_08116F3A:\n\ +lsls r0, r4, 2\n\ +adds r0, r4\n\ +lsls r1, r0, 2\n\ +adds r0, r1, r6\n\ +ldr r0, [r0]\n\ +ands r0, r5\n\ +cmp r0, 0\n\ +bne _08116F54\n\ +adds r0, r1, r3\n\ +ldrh r0, [r0, 0x10]\n\ +ldr r1, [sp, 0x18]\n\ +orrs r1, r0\n\ +str r1, [sp, 0x18]\n\ +_08116F54:\n\ +adds r0, r4, 0x1\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +cmp r4, r2\n\ +blt _08116F3A\n\ +_08116F5E:\n\ +ldr r0, _08116F78 @ =0x0000dfff\n\ +ldr r2, [sp, 0x18]\n\ +ands r2, r0\n\ +str r2, [sp, 0x18]\n\ +adds r0, r7, 0\n\ +adds r1, r2, 0\n\ +bl sub_8124CE8\n\ +b _0811713C\n\ +.align 2, 0\n\ +_08116F70: .4byte 0x020190b8\n\ +_08116F74: .4byte gUnknown_083F8C00\n\ +_08116F78: .4byte 0x0000dfff\n\ +_08116F7C:\n\ +mov r0, sp\n\ +ldr r1, _08116FC8 @ =gUnknown_083F8E9C\n\ +ldm r1!, {r2-r4}\n\ +stm r0!, {r2-r4}\n\ +ldm r1!, {r2-r4}\n\ +stm r0!, {r2-r4}\n\ +subs r0, r6, 0x1\n\ +lsls r0, 24\n\ +lsrs r0, 24\n\ +movs r3, 0x1\n\ +mov r10, r3\n\ +cmp r0, 0x3\n\ +bhi _08116F9A\n\ +movs r4, 0x3\n\ +mov r10, r4\n\ +_08116F9A:\n\ +adds r0, r6, 0\n\ +movs r1, 0x5\n\ +bl __udivsi3\n\ +lsls r0, 24\n\ +lsrs r0, 8\n\ +ldr r1, _08116FCC @ =0xffff0000\n\ +adds r0, r1\n\ +lsrs r7, r0, 16\n\ +adds r0, r6, 0\n\ +movs r1, 0x5\n\ +bl __umodsi3\n\ +lsls r0, 24\n\ +lsrs r0, 24\n\ +cmp r0, 0x2\n\ +beq _08116FF8\n\ +cmp r0, 0x2\n\ +bgt _08116FD4\n\ +cmp r0, 0x1\n\ +beq _08116FE4\n\ +ldr r4, _08116FD0 @ =0x02019000\n\ +b _0811703A\n\ +.align 2, 0\n\ +_08116FC8: .4byte gUnknown_083F8E9C\n\ +_08116FCC: .4byte 0xffff0000\n\ +_08116FD0: .4byte 0x02019000\n\ +_08116FD4:\n\ +cmp r0, 0x3\n\ +beq _0811700C\n\ +cmp r0, 0x4\n\ +beq _08117020\n\ +ldr r4, _08116FE0 @ =0x02019000\n\ +b _0811703A\n\ +.align 2, 0\n\ +_08116FE0: .4byte 0x02019000\n\ +_08116FE4:\n\ +ldr r3, _08116FF0 @ =gSprites\n\ +ldr r2, _08116FF4 @ =0x02019000\n\ +adds r0, r2, 0\n\ +adds r0, 0x43\n\ +b _08117028\n\ +.align 2, 0\n\ +_08116FF0: .4byte gSprites\n\ +_08116FF4: .4byte 0x02019000\n\ +_08116FF8:\n\ +ldr r3, _08117004 @ =gSprites\n\ +ldr r2, _08117008 @ =0x02019000\n\ +adds r0, r2, 0\n\ +adds r0, 0x44\n\ +b _08117028\n\ +.align 2, 0\n\ +_08117004: .4byte gSprites\n\ +_08117008: .4byte 0x02019000\n\ +_0811700C:\n\ +ldr r3, _08117018 @ =gSprites\n\ +ldr r2, _0811701C @ =0x02019000\n\ +adds r0, r2, 0\n\ +adds r0, 0x45\n\ +b _08117028\n\ +.align 2, 0\n\ +_08117018: .4byte gSprites\n\ +_0811701C: .4byte 0x02019000\n\ +_08117020:\n\ +ldr r3, _08117088 @ =gSprites\n\ +ldr r2, _0811708C @ =0x02019000\n\ +adds r0, r2, 0\n\ +adds r0, 0x46\n\ +_08117028:\n\ +ldrb r1, [r0]\n\ +lsls r0, r1, 4\n\ +adds r0, r1\n\ +lsls r0, 2\n\ +adds r0, r3\n\ +ldrb r0, [r0, 0x5]\n\ +lsrs r0, 4\n\ +lsls r7, r0, 4\n\ +adds r4, r2, 0\n\ +_0811703A:\n\ +mov r2, r10\n\ +cmp r2, 0x1\n\ +bne _08117094\n\ +ldr r1, _08117090 @ =gUnknown_083F8C00\n\ +lsls r2, r6, 2\n\ +adds r0, r2, r6\n\ +lsls r0, 2\n\ +adds r1, 0x8\n\ +adds r0, r1\n\ +ldr r1, [r4, 0x8]\n\ +ldr r0, [r0]\n\ +ands r1, r0\n\ +str r2, [sp, 0x1C]\n\ +cmp r1, 0\n\ +bne _0811713C\n\ +adds r0, r6, 0\n\ +movs r1, 0x5\n\ +bl __udivsi3\n\ +lsls r0, 24\n\ +lsrs r0, 24\n\ +subs r1, r0, 0x1\n\ +lsls r1, 3\n\ +mov r3, sp\n\ +adds r2, r3, r1\n\ +ldrh r1, [r2, 0x2]\n\ +adds r1, r7, r1\n\ +strh r1, [r2, 0x2]\n\ +adds r1, r4, 0\n\ +adds r1, 0xB8\n\ +lsls r0, 3\n\ +subs r0, 0x8\n\ +adds r2, r3, r0\n\ +adds r0, r1, 0\n\ +movs r1, 0xD\n\ +bl sub_812492C\n\ +b _08117122\n\ +.align 2, 0\n\ +_08117088: .4byte gSprites\n\ +_0811708C: .4byte 0x02019000\n\ +_08117090: .4byte gUnknown_083F8C00\n\ +_08117094:\n\ +movs r4, 0\n\ +lsls r0, r6, 2\n\ +str r0, [sp, 0x1C]\n\ +ldr r1, _0811714C @ =0x02019000\n\ +mov r8, r1\n\ +ldr r2, _08117150 @ =gUnknown_083F8C00\n\ +mov r9, r2\n\ +_081170A2:\n\ +lsls r0, r4, 2\n\ +adds r0, r4\n\ +adds r0, r6, r0\n\ +adds r0, 0x5\n\ +lsls r0, 24\n\ +lsrs r2, r0, 24\n\ +lsls r0, r2, 2\n\ +adds r0, r2\n\ +lsls r5, r0, 2\n\ +mov r0, r9\n\ +adds r0, 0x8\n\ +adds r0, r5, r0\n\ +mov r3, r8\n\ +ldr r1, [r3, 0x8]\n\ +ldr r0, [r0]\n\ +ands r1, r0\n\ +cmp r1, 0\n\ +bne _0811710E\n\ +adds r0, r2, 0\n\ +movs r1, 0x5\n\ +bl __udivsi3\n\ +lsls r0, 24\n\ +lsrs r0, 24\n\ +subs r1, r0, 0x1\n\ +lsls r1, 3\n\ +mov r3, sp\n\ +adds r2, r3, r1\n\ +ldrh r1, [r2, 0x2]\n\ +adds r1, r7, r1\n\ +strh r1, [r2, 0x2]\n\ +adds r1, r4, 0\n\ +adds r1, 0xD\n\ +lsls r1, 24\n\ +lsrs r1, 24\n\ +lsls r0, 3\n\ +subs r0, 0x8\n\ +adds r2, r3, r0\n\ +mov r0, r8\n\ +adds r0, 0xB8\n\ +bl sub_812492C\n\ +mov r0, r10\n\ +cmp r0, 0x3\n\ +bne _08117104\n\ +mov r1, r9\n\ +adds r0, r5, r1\n\ +ldrh r0, [r0, 0x10]\n\ +str r0, [sp, 0x18]\n\ +_08117104:\n\ +mov r0, r10\n\ +subs r0, 0x1\n\ +lsls r0, 24\n\ +lsrs r0, 24\n\ +mov r10, r0\n\ +_0811710E:\n\ +adds r0, r4, 0x1\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +cmp r4, 0x2\n\ +bls _081170A2\n\ +mov r2, r10\n\ +cmp r2, 0x2\n\ +beq _08117122\n\ +movs r3, 0\n\ +str r3, [sp, 0x18]\n\ +_08117122:\n\ +ldr r0, _08117154 @ =0x020190b8\n\ +ldr r2, _08117150 @ =gUnknown_083F8C00\n\ +ldr r4, [sp, 0x1C]\n\ +adds r1, r4, r6\n\ +lsls r1, 2\n\ +adds r1, r2\n\ +ldrh r1, [r1, 0x10]\n\ +ldr r2, [sp, 0x18]\n\ +orrs r2, r1\n\ +str r2, [sp, 0x18]\n\ +adds r1, r2, 0\n\ +bl sub_8124CE8\n\ +_0811713C:\n\ +add sp, 0x20\n\ +pop {r3-r5}\n\ +mov r8, r3\n\ +mov r9, r4\n\ +mov r10, r5\n\ +pop {r4-r7}\n\ +pop {r0}\n\ +bx r0\n\ +.align 2, 0\n\ +_0811714C: .4byte 0x02019000\n\ +_08117150: .4byte gUnknown_083F8C00\n\ +_08117154: .4byte 0x020190b8\n\ +.syntax divided\n"); +} +#endif + +#ifdef NONMATCHING //not enough stack usage +void sub_8117158(u8 r0) +{ + u8 i; + u8 l; + u8 v[0x5]; + u8 z; + u8 var0; + u8 var1; + u16 var2; + RDATA->var2A = 0x1; + sub_8117AA8(0x0, 0x0); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18800, 0xE, 0x7, 0x10, 0xD); + switch(r0) + { + case 0x0: + return; + case 0x1 ... 0x4: + l = 0x4; + for (i = 0x0; i < l; i++) + v[i] = i * 0x5 + r0; + break; + case 0x5: + case 0xA: + case 0xF: + l = 0x5; + for (i = 0x0; i < l; i++) + v[i] = i + r0; + break; + default: + l = 0x1; + v[0] = r0; + } + for (i = 0x0; i < l; i++) + { + //_0811727C + var0 = gUnknown_083F8C00[v[i]].var06; + var1 = gUnknown_083F8C00[v[i]].var03; + for (z = 0; z < 0x3; z++) + { + var2 = (gUnknown_083F8C00[v[i]].var04 + z) * 0x20; + gBGTilemapBuffers[2][var2 + var1 + 0x0] = ewram189a0[(var0 + z) * 0x3 + 0x0]; + gBGTilemapBuffers[2][var2 + var1 + 0x1] = ewram189a0[(var0 + z) * 0x3 + 0x1]; + gBGTilemapBuffers[2][var2 + var1 + 0x2] = ewram189a0[(var0 + z) * 0x3 + 0x2]; + } + //_08117350 + } +} +#else +__attribute__((naked)) +void sub_8117158(u8 r0) +{ +asm(".syntax unified\n\ +push {r4-r7,lr}\n\ +mov r7, r10\n\ +mov r6, r9\n\ +mov r5, r8\n\ +push {r5-r7}\n\ +sub sp, 0x24\n\ +lsls r0, 24\n\ +lsrs r5, r0, 24\n\ +ldr r4, _0811719C @ =0x02019000\n\ +movs r0, 0x1\n\ +strh r0, [r4, 0x2A]\n\ +movs r0, 0\n\ +movs r1, 0\n\ +bl sub_8117AA8\n\ +ldr r0, _081171A0 @ =gBGTilemapBuffers + 0x800\n\ +ldr r1, _081171A4 @ =0xfffff800\n\ +adds r4, r1\n\ +movs r1, 0x10\n\ +str r1, [sp]\n\ +movs r1, 0xD\n\ +str r1, [sp, 0x4]\n\ +adds r1, r4, 0\n\ +movs r2, 0xE\n\ +movs r3, 0x7\n\ +bl sub_8124E2C\n\ +cmp r5, 0xF\n\ +bhi _08117250\n\ +lsls r0, r5, 2\n\ +ldr r1, _081171A8 @ =_081171AC\n\ +adds r0, r1\n\ +ldr r0, [r0]\n\ +mov pc, r0\n\ +.align 2, 0\n\ +_0811719C: .4byte 0x02019000\n\ +_081171A0: .4byte gBGTilemapBuffers + 0x800\n\ +_081171A4: .4byte 0xfffff800\n\ +_081171A8: .4byte _081171AC\n\ +.align 2, 0\n\ +_081171AC:\n\ +.4byte _08117360\n\ +.4byte _081171EC\n\ +.4byte _081171EC\n\ +.4byte _081171EC\n\ +.4byte _081171EC\n\ +.4byte _08117220\n\ +.4byte _08117250\n\ +.4byte _08117250\n\ +.4byte _08117250\n\ +.4byte _08117250\n\ +.4byte _08117220\n\ +.4byte _08117250\n\ +.4byte _08117250\n\ +.4byte _08117250\n\ +.4byte _08117250\n\ +.4byte _08117220\n\ +_081171EC:\n\ +movs r0, 0x4\n\ +str r0, [sp, 0x18]\n\ +add r1, sp, 0x8\n\ +movs r0, 0\n\ +strb r0, [r1]\n\ +adds r0, r1, 0\n\ +ldrb r0, [r0]\n\ +cmp r0, 0x3\n\ +bhi _08117258\n\ +add r4, sp, 0x10\n\ +adds r3, r1, 0\n\ +_08117202:\n\ +ldrb r2, [r3]\n\ +adds r2, r4\n\ +ldrb r1, [r3]\n\ +lsls r0, r1, 2\n\ +adds r0, r1\n\ +adds r0, r5, r0\n\ +strb r0, [r2]\n\ +ldrb r0, [r3]\n\ +adds r0, 0x1\n\ +strb r0, [r3]\n\ +ldrb r0, [r3]\n\ +ldr r1, [sp, 0x18]\n\ +cmp r0, r1\n\ +bcc _08117202\n\ +b _08117258\n\ +_08117220:\n\ +movs r0, 0x5\n\ +str r0, [sp, 0x18]\n\ +add r1, sp, 0x8\n\ +movs r0, 0\n\ +strb r0, [r1]\n\ +adds r0, r1, 0\n\ +ldrb r0, [r0]\n\ +cmp r0, 0x4\n\ +bhi _08117258\n\ +add r3, sp, 0x10\n\ +adds r2, r1, 0\n\ +_08117236:\n\ +ldrb r1, [r2]\n\ +adds r1, r3\n\ +ldrb r0, [r2]\n\ +adds r0, r5, r0\n\ +strb r0, [r1]\n\ +ldrb r0, [r2]\n\ +adds r0, 0x1\n\ +strb r0, [r2]\n\ +ldrb r0, [r2]\n\ +ldr r1, [sp, 0x18]\n\ +cmp r0, r1\n\ +bcc _08117236\n\ +b _08117258\n\ +_08117250:\n\ +movs r0, 0x1\n\ +str r0, [sp, 0x18]\n\ +add r0, sp, 0x10\n\ +strb r5, [r0]\n\ +_08117258:\n\ +add r1, sp, 0x8\n\ +movs r0, 0\n\ +strb r0, [r1]\n\ +adds r0, r1, 0\n\ +ldrb r0, [r0]\n\ +ldr r1, [sp, 0x18]\n\ +cmp r0, r1\n\ +bcs _08117360\n\ +mov r0, sp\n\ +adds r0, 0xE\n\ +str r0, [sp, 0x1C]\n\ +add r1, sp, 0x10\n\ +mov r9, r1\n\ +add r0, sp, 0x8\n\ +mov r12, r0\n\ +mov r1, sp\n\ +adds r1, 0xA\n\ +str r1, [sp, 0x20]\n\ +_0811727C:\n\ +mov r1, r12\n\ +ldrb r0, [r1]\n\ +add r0, r9\n\ +ldrb r1, [r0]\n\ +lsls r0, r1, 2\n\ +adds r0, r1\n\ +lsls r0, 2\n\ +ldr r1, _08117370 @ =gUnknown_083F8C00\n\ +adds r0, r1\n\ +ldrb r0, [r0, 0x6]\n\ +ldr r1, [sp, 0x1C]\n\ +strb r0, [r1]\n\ +mov r1, r12\n\ +ldrb r0, [r1]\n\ +add r0, r9\n\ +ldrb r1, [r0]\n\ +lsls r0, r1, 2\n\ +adds r0, r1\n\ +lsls r0, 2\n\ +ldr r1, _08117370 @ =gUnknown_083F8C00\n\ +adds r0, r1\n\ +ldrb r0, [r0, 0x3]\n\ +ldr r1, [sp, 0x20]\n\ +strh r0, [r1]\n\ +mov r4, sp\n\ +adds r4, 0x9\n\ +movs r0, 0\n\ +strb r0, [r4]\n\ +ldrb r0, [r4]\n\ +cmp r0, 0x2\n\ +bhi _08117350\n\ +add r5, sp, 0xC\n\ +ldr r7, [sp, 0x20]\n\ +ldr r0, _08117374 @ =gBGTilemapBuffers + 0x800\n\ +mov r8, r0\n\ +ldr r6, [sp, 0x1C]\n\ +ldr r1, _08117378 @ =0x020189a0\n\ +mov r10, r1\n\ +_081172C8:\n\ +mov r1, r12\n\ +ldrb r0, [r1]\n\ +add r0, r9\n\ +ldrb r0, [r0]\n\ +lsls r1, r0, 2\n\ +adds r1, r0\n\ +lsls r1, 2\n\ +ldr r0, _08117370 @ =gUnknown_083F8C00\n\ +adds r1, r0\n\ +adds r3, r4, 0\n\ +ldrb r0, [r4]\n\ +ldrb r1, [r1, 0x4]\n\ +adds r0, r1\n\ +lsls r0, 5\n\ +strh r0, [r5]\n\ +ldrh r0, [r7]\n\ +ldrh r2, [r5]\n\ +adds r2, r0\n\ +lsls r2, 1\n\ +add r2, r8\n\ +ldrb r0, [r6]\n\ +ldrb r1, [r4]\n\ +adds r1, r0\n\ +lsls r0, r1, 1\n\ +adds r0, r1\n\ +lsls r0, 1\n\ +add r0, r10\n\ +ldrh r0, [r0]\n\ +strh r0, [r2]\n\ +ldrh r0, [r7]\n\ +ldrh r2, [r5]\n\ +adds r2, r0\n\ +adds r2, 0x1\n\ +lsls r2, 1\n\ +add r2, r8\n\ +ldrb r0, [r6]\n\ +ldrb r1, [r4]\n\ +adds r1, r0\n\ +lsls r0, r1, 1\n\ +adds r0, r1\n\ +lsls r0, 1\n\ +mov r1, r10\n\ +adds r1, 0x2\n\ +adds r0, r1\n\ +ldrh r0, [r0]\n\ +strh r0, [r2]\n\ +ldrh r0, [r7]\n\ +ldrh r2, [r5]\n\ +adds r2, r0\n\ +adds r2, 0x2\n\ +lsls r2, 1\n\ +add r2, r8\n\ +ldrb r0, [r6]\n\ +ldrb r1, [r4]\n\ +adds r1, r0\n\ +lsls r0, r1, 1\n\ +adds r0, r1\n\ +lsls r0, 1\n\ +ldr r1, _0811737C @ =0x020189a4\n\ +adds r0, r1\n\ +ldrh r0, [r0]\n\ +strh r0, [r2]\n\ +ldrb r0, [r4]\n\ +adds r0, 0x1\n\ +strb r0, [r4]\n\ +ldrb r0, [r3]\n\ +cmp r0, 0x2\n\ +bls _081172C8\n\ +_08117350:\n\ +mov r1, r12\n\ +ldrb r0, [r1]\n\ +adds r0, 0x1\n\ +strb r0, [r1]\n\ +ldrb r0, [r1]\n\ +ldr r1, [sp, 0x18]\n\ +cmp r0, r1\n\ +bcc _0811727C\n\ +_08117360:\n\ +add sp, 0x24\n\ +pop {r3-r5}\n\ +mov r8, r3\n\ +mov r9, r4\n\ +mov r10, r5\n\ +pop {r4-r7}\n\ +pop {r0}\n\ +bx r0\n\ +.align 2, 0\n\ +_08117370: .4byte gUnknown_083F8C00\n\ +_08117374: .4byte gBGTilemapBuffers + 0x800\n\ +_08117378: .4byte 0x020189a0\n\ +_0811737C: .4byte 0x020189a4\n\ +.syntax divided\n"); +} +#endif + +#ifdef NONMATCHING +u8 sub_8117380(u8 r0) +{ + u8 var0[0x5]; + u8 t; + u8 z; + memcpy(var0, gUnknown_083F8EF4, 0x5); + if (r0 > 0x13) + r0 = 0x0; + switch (gUnknown_083F8C00[r0].var01_0) + { + case 0x3: + z = r0 / 0x5 - 0x1; + if (RDATA->var16[z] > 0x3) + return 0x0; + return var0[RDATA->var16[z] + 0x1]; + case 0x4: + t = r0 - 0x1; + if (RDATA->var12[t] > 0x2) + return 0x0; + return var0[RDATA->var12[t] + 0x2]; + case 0xC: + if (RDATA->var08 & gUnknown_083F8C00[r0].var08) + return 0x0; + return var0[0x4]; + default: + } + return 0x0; +} +#else +__attribute__((naked)) +u8 sub_8117380(u8 r0) +{ +asm(".syntax unified\n\ +push {r4,lr}\n\ +sub sp, 0x8\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +ldr r1, _081173B8 @ =gUnknown_083F8EF4\n\ +mov r0, sp\n\ +movs r2, 0x5\n\ +bl memcpy\n\ +cmp r4, 0x13\n\ +bls _08117398\n\ +movs r4, 0\n\ +_08117398:\n\ +ldr r3, _081173BC @ =gUnknown_083F8C00\n\ +lsls r0, r4, 2\n\ +adds r0, r4\n\ +lsls r2, r0, 2\n\ +adds r0, r2, r3\n\ +ldrb r0, [r0, 0x1]\n\ +lsls r0, 28\n\ +lsrs r0, 28\n\ +cmp r0, 0x4\n\ +beq _081173EC\n\ +cmp r0, 0x4\n\ +bgt _081173C0\n\ +cmp r0, 0x3\n\ +beq _081173C6\n\ +b _08117428\n\ +.align 2, 0\n\ +_081173B8: .4byte gUnknown_083F8EF4\n\ +_081173BC: .4byte gUnknown_083F8C00\n\ +_081173C0:\n\ +cmp r0, 0xC\n\ +beq _0811740C\n\ +b _08117428\n\ +_081173C6:\n\ +adds r0, r4, 0\n\ +movs r1, 0x5\n\ +bl __udivsi3\n\ +subs r0, 0x1\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +ldr r0, _081173E8 @ =0x02019000\n\ +adds r0, 0x16\n\ +adds r1, r4, r0\n\ +ldrb r0, [r1]\n\ +cmp r0, 0x3\n\ +bhi _08117428\n\ +ldrb r0, [r1]\n\ +adds r0, 0x1\n\ +b _08117402\n\ +.align 2, 0\n\ +_081173E8: .4byte 0x02019000\n\ +_081173EC:\n\ +subs r0, r4, 0x1\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +ldr r0, _08117408 @ =0x02019000\n\ +adds r0, 0x12\n\ +adds r1, r4, r0\n\ +ldrb r0, [r1]\n\ +cmp r0, 0x2\n\ +bhi _08117428\n\ +ldrb r0, [r1]\n\ +adds r0, 0x2\n\ +_08117402:\n\ +add r0, sp\n\ +ldrb r0, [r0]\n\ +b _0811742A\n\ +.align 2, 0\n\ +_08117408: .4byte 0x02019000\n\ +_0811740C:\n\ +ldr r1, _08117424 @ =0x02019000\n\ +adds r0, r3, 0\n\ +adds r0, 0x8\n\ +adds r0, r2, r0\n\ +ldr r1, [r1, 0x8]\n\ +ldr r0, [r0]\n\ +ands r1, r0\n\ +cmp r1, 0\n\ +bne _08117428\n\ +mov r0, sp\n\ +ldrb r0, [r0, 0x4]\n\ +b _0811742A\n\ +.align 2, 0\n\ +_08117424: .4byte 0x02019000\n\ +_08117428:\n\ +movs r0, 0\n\ +_0811742A:\n\ +add sp, 0x8\n\ +pop {r4}\n\ +pop {r1}\n\ +bx r1\n\ +.syntax divided\n"); +} +#endif + +#ifdef NONMATCHING +void sub_8117434(void) //sprite rotation ? +{ + s32 x1; + s32 x2; + REG_BG2PA = RDATA->var2C.a; + REG_BG2PB = RDATA->var2C.b; + REG_BG2PC = RDATA->var2C.c; + REG_BG2PD = RDATA->var2C.d; + x1 = 0x7400 - RDATA->var2C.a * (gSpriteCoordOffsetX + 0x74) + - RDATA->var2C.b * (gSpriteCoordOffsetY + 0x50); + x2 = 0x5400 - RDATA->var2C.c * gSpriteCoordOffsetX + - RDATA->var2C.d * gSpriteCoordOffsetY; + REG_BG2X_L = x1; + REG_BG2X_H = (x1 & 0x0fff0000) >> 16; + REG_BG2Y_L = x2; + REG_BG2Y_H = (x2 & 0x0fff0000) >> 16; +} +#else +__attribute__((naked)) +void sub_8117434(void) +{ +asm(".syntax unified\n\ +push {r4-r6,lr}\n\ +ldr r1, _081174AC @ =REG_BG2PA\n\ +ldr r4, _081174B0 @ =0x02019000\n\ +ldrh r0, [r4, 0x2C]\n\ +strh r0, [r1]\n\ +adds r1, 0x2\n\ +ldrh r0, [r4, 0x2E]\n\ +strh r0, [r1]\n\ +adds r1, 0x2\n\ +ldrh r0, [r4, 0x30]\n\ +strh r0, [r1]\n\ +adds r1, 0x2\n\ +ldrh r0, [r4, 0x32]\n\ +strh r0, [r1]\n\ +movs r0, 0x2E\n\ +ldrsh r2, [r4, r0]\n\ +ldr r0, _081174B4 @ =gSpriteCoordOffsetY\n\ +movs r3, 0\n\ +ldrsh r1, [r0, r3]\n\ +adds r1, 0x50\n\ +adds r0, r2, 0\n\ +muls r0, r1\n\ +movs r2, 0xE8\n\ +lsls r2, 7\n\ +subs r2, r0\n\ +movs r6, 0x2C\n\ +ldrsh r5, [r4, r6]\n\ +ldr r0, _081174B8 @ =gSpriteCoordOffsetX\n\ +movs r6, 0\n\ +ldrsh r3, [r0, r6]\n\ +adds r3, 0x74\n\ +adds r0, r5, 0\n\ +muls r0, r3\n\ +subs r2, r0\n\ +movs r5, 0x32\n\ +ldrsh r0, [r4, r5]\n\ +muls r0, r1\n\ +movs r1, 0xA8\n\ +lsls r1, 7\n\ +subs r1, r0\n\ +movs r6, 0x30\n\ +ldrsh r0, [r4, r6]\n\ +muls r0, r3\n\ +subs r1, r0\n\ +ldr r0, _081174BC @ =REG_BG2X_L\n\ +strh r2, [r0]\n\ +adds r0, 0x2\n\ +ldr r3, _081174C0 @ =0x0fff0000\n\ +ands r2, r3\n\ +asrs r2, 16\n\ +strh r2, [r0]\n\ +adds r0, 0x2\n\ +strh r1, [r0]\n\ +adds r0, 0x2\n\ +ands r1, r3\n\ +asrs r1, 16\n\ +strh r1, [r0]\n\ +pop {r4-r6}\n\ +pop {r0}\n\ +bx r0\n\ +.align 2, 0\n\ +_081174AC: .4byte REG_BG2PA\n\ +_081174B0: .4byte 0x02019000\n\ +_081174B4: .4byte gSpriteCoordOffsetY\n\ +_081174B8: .4byte gSpriteCoordOffsetX\n\ +_081174BC: .4byte REG_BG2X_L\n\ +_081174C0: .4byte 0x0fff0000\n\ +.syntax divided\n"); +} +#endif + +s16 sub_81174C4(s16 r0, s16 r1) +{ + s32 t = r0 * r1; + t /= 0x100; + return t; +} + +s16 sub_81174E0(s16 r0) +{ + s32 t = 0x10000; + return t / r0; +} + +void sub_81174F8(u8 r0) +{ + DisplayYesNoMenu(0x14, 0x8, 0x1); + sub_814AAF8(0x2D9E); + DoYesNoFuncWithChoice(r0, &gUnknown_083F8EB4); +} + +void sub_8117528(u8 taskid) +{ + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + SetMainCallback2(&sub_8115384); + DestroyTask(taskid); + } +} + +void sub_811755C(u8 taskid) +{ + MenuZeroFillWindowRect(0x14, 0x8, 0x1A, 0xD); + MenuZeroFillScreen(); + BeginNormalPaletteFade(-0x1, 0x0, 0x0, 0x10, 0x0); + gPaletteFade.delayCounter = gPaletteFade.multipurpose2; + UpdatePaletteFade(); + gTasks[taskid].func = &sub_8117528; +} + +void sub_81175C0(u8 taskid) +{ + MenuZeroFillScreen(); + ScriptContext2_Disable(); + DestroyTask(taskid); +} + +void sub_81175DC(u8 taskid) +{ + gTasks[taskid].data[0]++; + if (!(gMain.newKeys & (A_BUTTON | B_BUTTON)) && gTasks[taskid].data[0] < 0x3D) + return; + gSpecialVar_0x8004 = 0x1; + MenuZeroFillScreen(); + ScriptContext2_Disable(); + DestroyTask(taskid); +} + +void sub_8117630(u8 taskid) +{ + u32 temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 0x1) + (gSpecialVar_0x8004 >> 0x7 << 0x1)]; + ConvertIntToDecimalStringN(gStringVar1, temp, 0x2, 0x1); + StringExpandPlaceholders(gStringVar4, &gUnknown_081C40DF); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(gStringVar4, 0x1, 0xF); + gTasks[taskid].func = &sub_81174F8; +} + +void Task_Roulette_0(u8 taskid) +{ + s32 temp; + ConvertIntToDecimalStringN(gStringVar1, gTasks[taskid].data[0xD], 0x1, 0x4); + StringExpandPlaceholders(gStringVar4, gOtherText_Coins); + MenuDrawTextWindow(0x0, 0x0, 0x9, 0x3); + MenuPrint_RightAligned(gStringVar4, 0x9, 0x1); + temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 0x1) + (gSpecialVar_0x8004 >> 0x7 << 0x1)]; + ConvertIntToDecimalStringN(gStringVar1, temp, 0x2, 0x1); + if (gTasks[taskid].data[0xD] >= temp) + { + if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 0x1)) + { + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(&gUnknown_081C4139, 0x1, 0xF); + sub_8116C34(taskid , &sub_8117630, 0xFFFF, 0x3); + } + else + { + StringExpandPlaceholders(gStringVar4, &gUnknown_081C40DF); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(gStringVar4, 0x1, 0xF); + gTasks[taskid].func = &sub_81174F8; + } + } + else + { + StringExpandPlaceholders(gStringVar4, &gUnknown_081C411C); + MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); + MenuPrint(gStringVar4, 0x1, 0xF); + gTasks[taskid].func = &sub_81175DC; + gTasks[taskid].data[0xD] = 0x0; + gTasks[taskid].data[0x0] = 0x0; + } +} + +void PlayRoulette() +{ + u8 taskid; + ScriptContext2_Enable(); + taskid = CreateTask(&Task_Roulette_0, 0x0); + gTasks[taskid].data[0xD] = gSaveBlock1.coins; +} + +void sub_8117838(u8 r0) +{ + if (!r0) + { + FreeAllSpritePalettes(); + LoadSpritePalettes(&gUnknown_083F9E30); + LZ77UnCompWram(gUnknown_083F92A8, ewram17000); + LZ77UnCompWram(gUnknown_083F90FC, ewram17E00); + LZ77UnCompWram(gUnknown_083F9D3C, ewram18000); + } + else + { + FreeAllSpritePalettes(); + } +} + +u8 sub_8117890(const struct SpriteTemplate *r0, u8 r1, u16 *r2) +{ + u16 temp; + u8 spriteid = CreateSprite(r0, 0x74, 0x50, r0->oam->y); + gSprites[spriteid].data0 = *r2; + gSprites[spriteid].data1 = r1; + gSprites[spriteid].coordOffsetEnabled = TRUE; + gSprites[spriteid].animPaused = TRUE; + gSprites[spriteid].affineAnimPaused = TRUE; + temp = *r2; + *r2 += 0x1E; + if (*r2 > 0x167) + *r2 = temp - 0x14A; + return spriteid; +} + +void sub_8117900(void) +{ + u8 i, j; + u8 spriteid; + struct SpriteSheet s; + LZ77UnCompWram(gUnknown_083F9F54.data, ewram); + s.data = ewram; + s.size = gUnknown_083F9F54.size; + s.tag = gUnknown_083F9F54.tag; + LoadSpriteSheet(&s); + LZ77UnCompWram(gUnknown_083F9F5C.data, ewram); + s.data = ewram; + s.size = gUnknown_083F9F5C.size; + s.tag = gUnknown_083F9F5C.tag; + LoadSpriteSheet(&s); + for (i = 0; i < 0x3; i++) + { + u8 o = i * 0x18; + for (j = 0; j < 0x4; j++) + { + spriteid = RDATA->var3C[0x1D + i * 0x4 + j] = + CreateSprite(&gSpriteTemplate_83FA07C[j], j * 0x18 + 0x94, o + 0x5C, 0x1E); + gSprites[spriteid].animPaused = TRUE; + o += 0x18; + if (o > 0x47) + o = 0x0; + } + } + for (i = 0x0; i < 0x4; i++) + { + spriteid = RDATA->var3C[0x29 + i] = + CreateSprite(&gSpriteTemplate_83F9FD4[i], (s16)(i * 0x18 + 0x94), 0x46, 0x1E); + gSprites[spriteid].animPaused = TRUE; + } + for (i = 0x0; i < 0x3; i++) + { + spriteid = RDATA->var3C[0x2D + i] = + CreateSprite(&gSpriteTemplate_83FA034[i], 0x7E, (s16)(i * 0x18 + 0x5C), 0x1E); + gSprites[spriteid].animPaused = TRUE; + } +} + +void unref_sub_8117A74(void) //destroy all sprites at 0x1D +{ + u8 i; + for (i = 0x0; i < 0xC; i++) + DestroySprite(&gSprites[RDATA->var3C[0x1D + i]]); +} + +void sub_8117AA8(u8 r0, u8 r1) +{ + u8 i; + switch(r0) + { + case 0x1: + for (i = 0x0; i < 0x13; i++) + gSprites[RDATA->var3C[0x1D + i]].invisible = TRUE; + break; + case 0x0: + for (i = 0x0; i < 0xC; i++) + { + if (!(RDATA->var08 & gUnknown_083F8D90[i].var04)) + gSprites[RDATA->var3C[0x1D + i]].invisible = FALSE; + else if(!(gUnknown_083F8D90[i].var02 == r1)) + gSprites[RDATA->var3C[0x1D + i]].invisible = TRUE; + else + gSprites[RDATA->var3C[0x1D + i]].invisible = FALSE; + } + for ( ; i < 0x13; i++) + gSprites[RDATA->var3C[0x1D + i]].invisible = FALSE; + break; + } +} + +void sub_8117BBC(void) +{ + u8 i; + for (i = 0x0; i < 0x6; i++) + { + RDATA->var3C[0x31 + i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x14, 0xA); + gSprites[RDATA->var3C[0x31 + i]].invisible = TRUE; + gSprites[RDATA->var3C[0x31 + i]].data0 = 0x1; + gSprites[RDATA->var3C[0x31 + i]].callback = &sub_81184CC; + gSprites[RDATA->var3C[0x31 + i]].oam.priority = 0x1; + StartSpriteAnim(&gSprites[RDATA->var3C[0x31 + i]], 0x8); + } +} + +void sub_8117C60(u8 r0, u8 r1) +{ + u8 i = 0x0; + if (r0) + { + for ( ; i < 0x6; i++) + gSprites[RDATA->var3C[0x31 + i]].invisible = TRUE; + } + else + { + for ( ; i < 0x6; i++) + { + if (!(RDATA->var0C[i]) || (i == r1)) + { + gSprites[RDATA->var3C[0x31 + i]].invisible = TRUE; + } + else + { + gSprites[RDATA->var3C[0x31 + i]].invisible = FALSE; + gSprites[RDATA->var3C[0x31 + i]].pos1.x = (gUnknown_083F8C00[RDATA->var0C[i]].var03 + 0x1) * 0x8 + 0x4; + gSprites[RDATA->var3C[0x31 + i]].pos1.y = (gUnknown_083F8C00[RDATA->var0C[i]].var04 + 0x1) * 0x8 + 0x3; + } + } + } +} + +void sub_8117D68(u8 r0) +{ + if (!r0) + { + gSprites[RDATA->var3C[0x30]].invisible = TRUE; + } + else + { + gSprites[RDATA->var3C[0x30]].invisible = FALSE; + gSprites[RDATA->var3C[0x30]].pos1.x = (gUnknown_083F8C00[r0].var03 + 0x2) * 0x8; + gSprites[RDATA->var3C[0x30]].pos1.y = (gUnknown_083F8C00[r0].var04 + 0x2) * 0x8; + } +} + +void sub_8117DF4(void) +{ + u8 i, j; + u16 k; + struct SpriteSheet s; + LZ77UnCompWram(gUnknown_083F9EE8.data, ewram); + s.data = ewram; + s.size = gUnknown_083F9EE8.size; + s.tag = gUnknown_083F9EE8.tag; + LoadSpriteSheet(&s); + k = 0xF; + for (i = 0x0; i < 0x3; i++) + { + for (j = 0x0; j < 0x4; j++) + { + u8 spriteid; + spriteid = + RDATA->var3C[0x7 + i * 0x4 + j] = sub_8117890(&gSpriteTemplate_83FA0DC[i * 0x4 + j], 0x28, &k); + gSprites[spriteid].animPaused = TRUE; + gSprites[spriteid].affineAnimPaused = TRUE; + } + } +} + +#ifdef NONMATCHING +void sub_8117E98(struct Sprite *sprite) +{ + struct OamMatrix *m; + u8 p; + u16 angle; + s16 cos, sin, z; + u32 cos32; + angle = RDATA->var24 + sprite->data0; + z = angle; + if (z > 359) + angle = z - 360; + sin = Sin2(angle); + cos = Cos2(angle); + sprite->pos2.x = sin * sprite->data1 >> 0xC; + sprite->pos2.y = -cos * sprite->data1 >> 0xC; + p = sprite->oam.matrixNum; + sin = sin / 0x10; + m = &gOamMatrices[p]; + cos32 = cos / 0x10; + + m->d = cos32; + m->a = cos32; + m->b = sin; + m->c = -sin; +} +#else +__attribute__((naked)) +void sub_8117E98(struct Sprite *r0) +{ +asm(".syntax unified\n\ +push {r4-r6,lr}\n\ +adds r6, r0, 0\n\ +ldr r0, _08117F1C @ =0x02019000\n\ +ldrh r1, [r6, 0x2E]\n\ +ldrh r0, [r0, 0x24]\n\ +adds r1, r0\n\ +lsls r1, 16\n\ +lsrs r4, r1, 16\n\ +asrs r1, 16\n\ +ldr r0, _08117F20 @ =0x00000167\n\ +cmp r1, r0\n\ +ble _08117EB8\n\ +ldr r2, _08117F24 @ =0xfffffe98\n\ +adds r0, r1, r2\n\ +lsls r0, 16\n\ +lsrs r4, r0, 16\n\ +_08117EB8:\n\ +adds r0, r4, 0\n\ +bl Sin2\n\ +lsls r0, 16\n\ +lsrs r5, r0, 16\n\ +adds r0, r4, 0\n\ +bl Cos2\n\ +lsls r2, r5, 16\n\ +asrs r2, 16\n\ +movs r3, 0x30\n\ +ldrsh r1, [r6, r3]\n\ +muls r1, r2\n\ +asrs r1, 12\n\ +strh r1, [r6, 0x24]\n\ +lsls r0, 16\n\ +asrs r4, r0, 16\n\ +negs r1, r4\n\ +movs r3, 0x30\n\ +ldrsh r0, [r6, r3]\n\ +muls r0, r1\n\ +asrs r0, 12\n\ +strh r0, [r6, 0x26]\n\ +ldrb r0, [r6, 0x3]\n\ +lsls r0, 26\n\ +lsrs r3, r0, 27\n\ +cmp r2, 0\n\ +bge _08117EF2\n\ +adds r2, 0xF\n\ +_08117EF2:\n\ +lsls r0, r2, 12\n\ +lsrs r5, r0, 16\n\ +ldr r1, _08117F28 @ =gOamMatrices\n\ +lsls r0, r3, 3\n\ +adds r1, r0, r1\n\ +adds r0, r4, 0\n\ +cmp r0, 0\n\ +bge _08117F04\n\ +adds r0, 0xF\n\ +_08117F04:\n\ +asrs r0, 4\n\ +strh r0, [r1, 0x6]\n\ +strh r0, [r1]\n\ +strh r5, [r1, 0x2]\n\ +lsls r0, r5, 16\n\ +asrs r0, 16\n\ +negs r0, r0\n\ +strh r0, [r1, 0x4]\n\ +pop {r4-r6}\n\ +pop {r0}\n\ +bx r0\n\ +.align 2, 0\n\ +_08117F1C: .4byte 0x02019000\n\ +_08117F20: .4byte 0x00000167\n\ +_08117F24: .4byte 0xfffffe98\n\ +_08117F28: .4byte gOamMatrices\n\ +.syntax divided\n"); +} +#endif + +void sub_8117F2C(void) +{ + u8 i; + for (i = 0x0; i < 0x5; i++) + { + struct SpriteSheet s; + LZ77UnCompWram(gUnknown_083FA21C[i].data, ewram); + s.data = ewram; + s.size = gUnknown_083FA21C[i].size; + s.tag = gUnknown_083FA21C[i].tag; + LoadSpriteSheet(&s); + } + RDATA->var3C[0x14] = CreateSprite(&gSpriteTemplate_83FA2B0, 0xD0, 0x10, 0x4); + gSprites[RDATA->var3C[0x14]].animPaused = TRUE; + for (i = 0x0; i < 0x4; i++) + { + RDATA->var3C[0x15 + i] = CreateSprite(&gSpriteTemplate_83FA2C8, (s16)(i * 0x8 + 0xC4), 0x18, 0x0); + gSprites[RDATA->var3C[0x15 + i]].invisible = TRUE; + gSprites[RDATA->var3C[0x15 + i]].animPaused = TRUE; + } + RDATA->var3C[0x19] = CreateSprite(&gSpriteTemplate_83FA2E0, 0x78, 0x44, 0x4); + gSprites[RDATA->var3C[0x19]].animPaused = TRUE; + for (i = 0x0; i < 0x3; i++) + { + RDATA->var3C[0x1A + i] = CreateSprite(&gSpriteTemplate_83FA2F8, (s16)(i * 0x10 + 0xC0), 0x24, 0x4); + gSprites[RDATA->var3C[0x1A + i]].invisible = TRUE; + gSprites[RDATA->var3C[0x1A + i]].animPaused = TRUE; + } + RDATA->var3C[0x30] = CreateSprite(&gSpriteTemplate_83FA310, 0x98, 0x60, 0x9); + gSprites[RDATA->var3C[0x30]].oam.priority = 0x1; + gSprites[RDATA->var3C[0x30]].animPaused = TRUE; + gSprites[RDATA->var3C[0x30]].invisible = TRUE; +} + +void sub_81180F4(u16 r0) +{ + u8 i; + u16 d = 1000; + bool8 v = FALSE; + for (i = 0x0; i < 0x4; i++) + { + u8 t = r0 / d; + gSprites[RDATA->var3C[0x15 + i]].invisible = TRUE; + if (t > 0x0 || v || i == 0x3) + { + gSprites[RDATA->var3C[0x15 + i]].invisible = FALSE; + gSprites[RDATA->var3C[0x15 + i]].oam.tileNum = + gSprites[RDATA->var3C[0x15 + i]].sheetTileStart + + (*gSprites[RDATA->var3C[0x15 + i]].anims + t)->type; + v = TRUE; + } + r0 = r0 % d; + d = d / 10; + } +} + +#ifdef NONMATCHING +u8 sub_81181E8(u8 r0) +{ + u8 t[0x5]; + memcpy(&t, &gUnknown_083FA608, 0x5); + if (r0 > 0x13) + r0 = 0x0; + switch(gUnknown_083F8C00[r0].var01_0) + { + case 0x3: + r0 = r0 / 0x5 - 0x1; + if ((u32)RDATA->var16[r0] < 0x4) + return t[0x1 + RDATA->var16[r0]]; // couldn't recreate redundant loads + break; + case 0x4: + r0 = r0 - 0x1; + if (RDATA->var12[r0] < 0x3) + return t[0x2 + RDATA->var12[r0]]; + break; + case 0xC: + if (!(RDATA->var08 & gUnknown_083F8C00[r0].var08)) + return t[0x4]; + break; + } + return 0x0; +} +#else +__attribute__((naked)) +u8 sub_81181E8(u8 r0) +{ +asm(".syntax unified\n\ +push {r4,lr}\n\ +sub sp, 0x8\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +ldr r1, _08118220 @ =gUnknown_083FA608\n\ +mov r0, sp\n\ +movs r2, 0x5\n\ +bl memcpy\n\ +cmp r4, 0x13\n\ +bls _08118200\n\ +movs r4, 0\n\ +_08118200:\n\ +ldr r3, _08118224 @ =gUnknown_083F8C00\n\ +lsls r0, r4, 2\n\ +adds r0, r4\n\ +lsls r2, r0, 2\n\ +adds r0, r2, r3\n\ +ldrb r0, [r0, 0x1]\n\ +lsls r0, 28\n\ +lsrs r0, 28\n\ +cmp r0, 0x4\n\ +beq _08118254\n\ +cmp r0, 0x4\n\ +bgt _08118228\n\ +cmp r0, 0x3\n\ +beq _0811822E\n\ +b _08118290\n\ +.align 2, 0\n\ +_08118220: .4byte gUnknown_083FA608\n\ +_08118224: .4byte gUnknown_083F8C00\n\ +_08118228:\n\ +cmp r0, 0xC\n\ +beq _08118274\n\ +b _08118290\n\ +_0811822E:\n\ +adds r0, r4, 0\n\ +movs r1, 0x5\n\ +bl __udivsi3\n\ +subs r0, 0x1\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +ldr r0, _08118250 @ =0x02019000\n\ +adds r0, 0x16\n\ +adds r1, r4, r0\n\ +ldrb r0, [r1]\n\ +cmp r0, 0x3\n\ +bhi _08118290\n\ +ldrb r0, [r1]\n\ +adds r0, 0x1\n\ +b _0811826A\n\ +.align 2, 0\n\ +_08118250: .4byte 0x02019000\n\ +_08118254:\n\ +subs r0, r4, 0x1\n\ +lsls r0, 24\n\ +lsrs r4, r0, 24\n\ +ldr r0, _08118270 @ =0x02019000\n\ +adds r0, 0x12\n\ +adds r1, r4, r0\n\ +ldrb r0, [r1]\n\ +cmp r0, 0x2\n\ +bhi _08118290\n\ +ldrb r0, [r1]\n\ +adds r0, 0x2\n\ +_0811826A:\n\ +add r0, sp\n\ +ldrb r0, [r0]\n\ +b _08118292\n\ +.align 2, 0\n\ +_08118270: .4byte 0x02019000\n\ +_08118274:\n\ +ldr r1, _0811828C @ =0x02019000\n\ +adds r0, r3, 0\n\ +adds r0, 0x8\n\ +adds r0, r2, r0\n\ +ldr r1, [r1, 0x8]\n\ +ldr r0, [r0]\n\ +ands r1, r0\n\ +cmp r1, 0\n\ +bne _08118290\n\ +mov r0, sp\n\ +ldrb r0, [r0, 0x4]\n\ +b _08118292\n\ +.align 2, 0\n\ +_0811828C: .4byte 0x02019000\n\ +_08118290:\n\ +movs r0, 0\n\ +_08118292:\n\ +add sp, 0x8\n\ +pop {r4}\n\ +pop {r1}\n\ +bx r1\n\ +.syntax divided\n"); +} +#endif + +void sub_811829C(u8 r0) +{ + struct Sprite *s = &gSprites[RDATA->var3C[0x19]]; + s->animCmdIndex = sub_81181E8(r0); + s->oam.tileNum = + s->sheetTileStart + + (*s->anims + s->animCmdIndex)->type; +} + +void sub_81182F8(u8 r0) +{ + u8 i; + u8 t = 0x0; + if (RDATA->var19 == 0x1) + t = 0x2; + switch(r0) + { + case 0x6: + for (i = 0x0; i < 0x3; i++) + { + gSprites[RDATA->var3C[0x1A + i]].invisible = FALSE; + gSprites[RDATA->var3C[0x1A + i]].oam.tileNum = + gSprites[RDATA->var3C[0x1A + i]].sheetTileStart + + (*gSprites[RDATA->var3C[0x1A + i]].anims)->type; + } + break; + case 0x5: + gSprites[RDATA->var3C[0x1C]].oam.tileNum = + gSprites[RDATA->var3C[0x1C]].sheetTileStart + + (*gSprites[RDATA->var3C[0x1C]].anims + t + 0x1)->type; + break; + case 0x4: + gSprites[RDATA->var3C[0x1C]].oam.tileNum = + gSprites[RDATA->var3C[0x1C]].sheetTileStart + + (*gSprites[RDATA->var3C[0x1C]].anims + t + 0x2)->type; + break; + case 0x3: + gSprites[RDATA->var3C[0x1B]].oam.tileNum = + gSprites[RDATA->var3C[0x1B]].sheetTileStart + + (*gSprites[RDATA->var3C[0x1B]].anims + t + 0x1)->type; + break; + case 0x2: + gSprites[RDATA->var3C[0x1B]].oam.tileNum = + gSprites[RDATA->var3C[0x1B]].sheetTileStart + + (*gSprites[RDATA->var3C[0x1B]].anims + t + 0x2)->type; + break; + case 0x1: + gSprites[RDATA->var3C[0x1A]].oam.tileNum = + gSprites[RDATA->var3C[0x1A]].sheetTileStart + + (*gSprites[RDATA->var3C[0x1A]].anims + t + 0x1)->type; + break; + case 0x0: + default: + for (i = 0x0; i < 0x3; i++) + { + gSprites[RDATA->var3C[0x1A + i]].oam.tileNum = + gSprites[RDATA->var3C[0x1A + i]].sheetTileStart + + (*gSprites[RDATA->var3C[0x1A + i]].anims + t + 2)->type; + } + } +} + +void sub_81184CC(struct Sprite *sprite) +{ + sprite->pos2.x = RDATA->var26; +} + +void sub_81184D8(void) +{ + u8 spriteid; + struct SpriteSheet s; + LZ77UnCompWram(gUnknown_083FA42C.data, ewram); + s.data = ewram; + s.size = gUnknown_083FA42C.size; + s.tag = gUnknown_083FA42C.tag; + LoadSpriteSheet(&s); + spriteid = CreateSprite(&gSpriteTemplate_83FA434, 0x74, 0x50, 0x51); + gSprites[spriteid].data0 = RDATA->var24; + gSprites[spriteid].data1 = 0x0; + gSprites[spriteid].animPaused = TRUE; + gSprites[spriteid].affineAnimPaused = TRUE; + gSprites[spriteid].coordOffsetEnabled = TRUE; +} + +void sub_8118554(struct Sprite *sprite) +{ + u32 t = sprite->oam.matrixNum; + struct OamMatrix *m = &gOamMatrices[0]; + m[t].d = RDATA->var2C.a; + m[t].a = RDATA->var2C.a; + m[t].b = RDATA->var2C.b; + m[t].c = RDATA->var2C.c; +} + +void sub_811857C(void) +{ + u8 i; + for (i = 0x0; i < 0x6; i++) + { + u8 spriteid = + RDATA->var3C[i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x50, 0x39 - i); + if (spriteid != 0x40) + { + gSprites[RDATA->var3C[i]].invisible = TRUE; + gSprites[RDATA->var3C[i]].coordOffsetEnabled = TRUE; + } + } +} +/* +void sub_81185E8(void) +{ + u8 t = RDATA->var3C[0x0]; + u8 i; + for (i = 0x0; i < 0x6; i++) + { + u8 j; + gSprites[t].invisible = TRUE; + gSprites[t].callback = &SpriteCallbackDummy; + StartSpriteAnim(&gSprites[t], 0x0); + for (j = 0x0; j < 0x8; j++) + *(&gSprites[t].data0 + j) = 0x0; // zero allocation not quite right + t++; + } +} */ diff --git a/src/roulette_util.c b/src/roulette_util.c index 7501c3d80..bb47ed540 100644 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -1,5 +1,6 @@ #include "global.h" #include "roulette_util.h" +#include "roulette.h" static u8 sub_81249E4(struct UnkStruct3 *); static u8 sub_8124BEC(struct UnkStruct3 *); @@ -17,47 +18,38 @@ void sub_8124918(struct UnkStruct0 *r0) u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) { if (!(r1 < 0x10) || (r0->val3[r1].field1)) - { - return 0xFF; - } - else - { - r0->val3[r1].val4 = r2->val0; - r0->val3[r1].val5 = r2->val1; - r0->val3[r1].val6 = r2->val2; - r0->val3[r1].val7 = r2->val3; - r0->val3[r1].val8 = r2->val4; + return 0xFF; - r0->val3[r1].field2 = r2->field0; - r0->val3[r1].field3 = r2->field1; - r0->val3[r1].field4 = r2->field2; + r0->val3[r1].val4.val0 = r2->val0; + r0->val3[r1].val4.val1 = r2->val1; + r0->val3[r1].val4.val2 = r2->val2; + r0->val3[r1].val4.val3 = r2->val3; + r0->val3[r1].val4.val4 = r2->val4; + r0->val3[r1].val4.field0 = r2->field0; + r0->val3[r1].val4.field1 = r2->field1; + r0->val3[r1].val4.field2 = r2->field2; - r0->val3[r1].field0 = 0x0; - r0->val3[r1].field1 = 0x1; + //Why not r0->val3[r1].val4 = *r2; ? - r0->val3[r1].val2 = 0x0; - r0->val3[r1].val1 = 0x0; - if (r0->val3[r1].field4 < 0) - r0->val3[r1].val3 = 0xFF; - else - r0->val3[r1].val3 = 0x1; - return r1; - } + r0->val3[r1].field0 = 0x0; + r0->val3[r1].field1 = 0x1; + + r0->val3[r1].val2 = 0x0; + r0->val3[r1].val1 = 0x0; + if (r0->val3[r1].val4.field2 < 0) + r0->val3[r1].val3 = 0xFF; + else + r0->val3[r1].val3 = 0x1; + return r1; } #ifdef NONMATCHING - //Functionally equivalent u8 unref_sub_81249B0(struct UnkStruct0 *r0, u8 r1) { if (!(r1 < 0x10) || (r0->val3[r1].field1)) - { - return 0xFF; - } - else - { - memset(&(r0->val3[r1]), 0, 0xC); - return r1; - } + return 0xFF; + r0->val3[r1] = (struct UnkStruct3){0}; + return r1; } #else __attribute__((naked)) @@ -99,9 +91,9 @@ u8 sub_81249E4(struct UnkStruct3 *r0) { u8 i; u8 returnval; - for (i = 0; i < r0->val6; i++) + for (i = 0; i < r0->val4.val2; i++) { - u32 offset = r0->val5 + i; + u32 offset = r0->val4.val1 + i; struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset]; struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset]; switch(r0->field0) @@ -136,7 +128,7 @@ u8 sub_81249E4(struct UnkStruct3 *r0) break; } } - if (((u32)r0->val2++) != r0->field2) + if (((u32)r0->val2++) != r0->val4.field0) { returnval = 0x0; } @@ -159,13 +151,13 @@ u8 sub_8124BEC(struct UnkStruct3 *r0) switch (r0->field0) { case 0x1: - for (rg2 = 0; rg2 < r0->val6; rg2++) - gPlttBufferFaded[r0->val5 + rg2] = r0->val4; + for (rg2 = 0; rg2 < r0->val4.val2; rg2++) + gPlttBufferFaded[r0->val4.val1 + rg2] = r0->val4.val0; r0->field0++; break; case 0x2: - for (rg2 = 0; rg2 < r0->val6; rg2++) - gPlttBufferFaded[r0->val5 + rg2] = gPlttBufferUnfaded[r0->val5 + rg2]; + for (rg2 = 0; rg2 < r0->val4.val2; rg2++) + gPlttBufferFaded[r0->val4.val1 + rg2] = gPlttBufferUnfaded[r0->val4.val1 + rg2]; r0->field0--; break; } @@ -183,11 +175,11 @@ void task_tutorial_controls_fadein(struct UnkStruct0 *r0) { if (((u8)--r0->val3[i].val1) == 0xFF) // if underflow ? { - if (r0->val3[i].val4 & (0x80 << 8)) // PlttData->unused_15 ? + if (r0->val3[i].val4.val0 & (0x80 << 8)) // PlttData->unused_15 ? sub_81249E4(&r0->val3[i]); else sub_8124BEC(&r0->val3[i]); - r0->val3[i].val1 = r0->val3[i].val7; + r0->val3[i].val1 = r0->val3[i].val4.val3; } } } @@ -222,14 +214,14 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1) { if ((r1 >> i) & 0x1) { - u32 offset = r0->val3[i].val5; + u32 offset = r0->val3[i].val4.val1; u16 *faded = &gPlttBufferFaded[offset]; u16 *unfaded = &gPlttBufferUnfaded[offset]; - memcpy(faded, unfaded, r0->val3[i].val6 * 2); + memcpy(faded, unfaded, r0->val3[i].val4.val2 * 2); r0->val3[i].field0 = 0x0; r0->val3[i].val2 = 0x0; r0->val3[i].val1 = 0x0; - if (r0->val3[i].field4 < 0) + if (r0->val3[i].val4.field2 < 0) r0->val3[i].val3 = 0xFF; else r0->val3[i].val3 = 0x1; -- cgit v1.2.3 From 5753d1b615345ad55d926da75d8680181bbda01a Mon Sep 17 00:00:00 2001 From: M Date: Sun, 19 Nov 2017 23:23:59 +0100 Subject: decompiled up to sub_811889C --- asm/roulette.s | 4 +- src/roulette.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 166 insertions(+), 33 deletions(-) diff --git a/asm/roulette.s b/asm/roulette.s index f91a336af..5cf9b5b79 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -6614,7 +6614,7 @@ _081185DC: .4byte gSharedMem + 0x1903C _081185E0: .4byte gSprites _081185E4: .4byte gSpriteTemplate_83FA40C thumb_func_end sub_811857C -*/ + thumb_func_start sub_81185E8 sub_81185E8: @ 81185E8 push {r4-r7,lr} @@ -7084,7 +7084,7 @@ _0811899C: .4byte sub_8118834 _081189A0: .4byte 0x00000000 _081189A4: .4byte 0xbf800000 thumb_func_end sub_811889C - +*/ thumb_func_start sub_81189A8 sub_81189A8: @ 81189A8 push {r4-r7,lr} diff --git a/src/roulette.c b/src/roulette.c index 1661cce03..19fc3d604 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -19,7 +19,7 @@ #include "m4a.h" #include "rng.h" #include "game_stat.h" -#include "rom4.h" +#include "overworld.h" #include "string_util.h" #include "field_fadetransition.h" #include "script.h" @@ -138,6 +138,10 @@ extern const u8 gUnknown_083FA608[0x5]; extern const struct SpriteSheet gUnknown_083FA42C; extern const struct SpriteTemplate gSpriteTemplate_83FA434; +extern void (*gFieldCallback)(void); + +extern struct MusicPlayerInfo gMPlay_SE1; +extern struct MusicPlayerInfo gMPlay_SE2; void sub_8117434(void); @@ -204,18 +208,18 @@ void sub_8116B40(u8); void dp01t_12_3_battle_menu(u8); -extern u8 ewram[]; +extern u8 gSharedMem[]; -#define ewram17000 ((u16 *) (ewram + 0x17000)) //money stuff? -#define ewram17E00 ((u16 *) (ewram + 0x17E00)) -#define ewram17800 ((u16 *) (ewram + 0x17800)) -#define ewram18000 ((u16 *) (ewram + 0x18000)) -#define ewram18800 ((u16 *) (ewram + 0x18800)) -#define ewram189a0 ((u16 *) (ewram + 0x189a0)) -#define ewram18a20 ((u16 *) (ewram + 0x18a20)) -#define ewram18a32 ((u16 *) (ewram + 0x18A32)) -#define ewram18a80 ((u16 *) (ewram + 0x18a80)) -#define RDATA ((struct RData *) (ewram + 0x19000)) +#define ewram17000 ((u16 *) (gSharedMem + 0x17000)) //money stuff? +#define ewram17E00 ((u16 *) (gSharedMem + 0x17E00)) +#define ewram17800 ((u16 *) (gSharedMem + 0x17800)) +#define ewram18000 ((u16 *) (gSharedMem + 0x18000)) +#define ewram18800 ((u16 *) (gSharedMem + 0x18800)) +#define ewram189a0 ((u16 *) (gSharedMem + 0x189a0)) +#define ewram18a20 ((u16 *) (gSharedMem + 0x18a20)) +#define ewram18a32 ((u16 *) (gSharedMem + 0x18A32)) +#define ewram18a80 ((u16 *) (gSharedMem + 0x18a80)) +#define RDATA ((struct RData *) (gSharedMem + 0x19000)) #define S16TOPOSFLOAT(val) \ ({ \ @@ -597,7 +601,7 @@ void sub_8115384(void) case 0x3: sub_8115238(); sub_80F9020(); - LZ77UnCompWram(&gUnknown_083F88BC, (void *)(ewram + 0x18800)); + LZ77UnCompWram(&gUnknown_083F88BC, (void *)(ewram18800)); LZ77UnCompVram(&gUnknown_083F8A60, (void *)(VRAM + 0x3000)); gMain.state++; break; @@ -2793,8 +2797,8 @@ u8 sub_8117890(const struct SpriteTemplate *r0, u8 r1, u16 *r2) { u16 temp; u8 spriteid = CreateSprite(r0, 0x74, 0x50, r0->oam->y); - gSprites[spriteid].data0 = *r2; - gSprites[spriteid].data1 = r1; + gSprites[spriteid].data[0] = *r2; + gSprites[spriteid].data[1] = r1; gSprites[spriteid].coordOffsetEnabled = TRUE; gSprites[spriteid].animPaused = TRUE; gSprites[spriteid].affineAnimPaused = TRUE; @@ -2810,13 +2814,13 @@ void sub_8117900(void) u8 i, j; u8 spriteid; struct SpriteSheet s; - LZ77UnCompWram(gUnknown_083F9F54.data, ewram); - s.data = ewram; + LZ77UnCompWram(gUnknown_083F9F54.data, gSharedMem); + s.data = gSharedMem; s.size = gUnknown_083F9F54.size; s.tag = gUnknown_083F9F54.tag; LoadSpriteSheet(&s); - LZ77UnCompWram(gUnknown_083F9F5C.data, ewram); - s.data = ewram; + LZ77UnCompWram(gUnknown_083F9F5C.data, gSharedMem); + s.data = gSharedMem; s.size = gUnknown_083F9F5C.size; s.tag = gUnknown_083F9F5C.tag; LoadSpriteSheet(&s); @@ -2886,7 +2890,7 @@ void sub_8117BBC(void) { RDATA->var3C[0x31 + i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x14, 0xA); gSprites[RDATA->var3C[0x31 + i]].invisible = TRUE; - gSprites[RDATA->var3C[0x31 + i]].data0 = 0x1; + gSprites[RDATA->var3C[0x31 + i]].data[0] = 0x1; gSprites[RDATA->var3C[0x31 + i]].callback = &sub_81184CC; gSprites[RDATA->var3C[0x31 + i]].oam.priority = 0x1; StartSpriteAnim(&gSprites[RDATA->var3C[0x31 + i]], 0x8); @@ -2938,8 +2942,8 @@ void sub_8117DF4(void) u8 i, j; u16 k; struct SpriteSheet s; - LZ77UnCompWram(gUnknown_083F9EE8.data, ewram); - s.data = ewram; + LZ77UnCompWram(gUnknown_083F9EE8.data, gSharedMem); + s.data = gSharedMem; s.size = gUnknown_083F9EE8.size; s.tag = gUnknown_083F9EE8.tag; LoadSpriteSheet(&s); @@ -3069,8 +3073,8 @@ void sub_8117F2C(void) for (i = 0x0; i < 0x5; i++) { struct SpriteSheet s; - LZ77UnCompWram(gUnknown_083FA21C[i].data, ewram); - s.data = ewram; + LZ77UnCompWram(gUnknown_083FA21C[i].data, gSharedMem); + s.data = gSharedMem; s.size = gUnknown_083FA21C[i].size; s.tag = gUnknown_083FA21C[i].tag; LoadSpriteSheet(&s); @@ -3317,14 +3321,14 @@ void sub_81184D8(void) { u8 spriteid; struct SpriteSheet s; - LZ77UnCompWram(gUnknown_083FA42C.data, ewram); - s.data = ewram; + LZ77UnCompWram(gUnknown_083FA42C.data, gSharedMem); + s.data = gSharedMem; s.size = gUnknown_083FA42C.size; s.tag = gUnknown_083FA42C.tag; LoadSpriteSheet(&s); spriteid = CreateSprite(&gSpriteTemplate_83FA434, 0x74, 0x50, 0x51); - gSprites[spriteid].data0 = RDATA->var24; - gSprites[spriteid].data1 = 0x0; + gSprites[spriteid].data[0] = RDATA->var24; + gSprites[spriteid].data[1] = 0x0; gSprites[spriteid].animPaused = TRUE; gSprites[spriteid].affineAnimPaused = TRUE; gSprites[spriteid].coordOffsetEnabled = TRUE; @@ -3354,7 +3358,7 @@ void sub_811857C(void) } } } -/* + void sub_81185E8(void) { u8 t = RDATA->var3C[0x0]; @@ -3366,8 +3370,137 @@ void sub_81185E8(void) gSprites[t].callback = &SpriteCallbackDummy; StartSpriteAnim(&gSprites[t], 0x0); for (j = 0x0; j < 0x8; j++) - *(&gSprites[t].data0 + j) = 0x0; // zero allocation not quite right + gSprites[t].data[j] = 0x0; t++; } } -*/ + +s16 sub_811866C(struct Sprite *sprite) +{ + if (RDATA->var24 > sprite->data[0x3]) + { + sprite->data[0x6] = 360 - RDATA->var24 + sprite->data[0x3]; + if (sprite->data[0x6] > 359) + sprite->data[0x6] -=360; + } + else + sprite->data[0x6] = sprite->data[0x3] - RDATA->var24; + return sprite->data[0x6]; +} + +u8 sub_81186B8(struct Sprite *sprite) +{ + RDATA->var7E = (u8)(((float)(s16)sub_811866C(sprite)) / 30.0f); + return RDATA->var7E; +} + +s16 sub_81186E8(struct Sprite *sprite) +{ + s16 t = sub_811866C(sprite) % 30; + u16 z; + if (t == 0xE) + { + z = 0x0; + return sprite->data[0x2] = z; + } + else if (t > 0xD) + { + z = (u16)(0x2B - t); + return sprite->data[0x2] = z; + } + else + { + z = (u16)(0xE - t); + return sprite->data[0x2] = z; + } +} + +void sub_8118724(struct Sprite *sprite) +{ + s16 sin, cos; + RDATA->var8C += RDATA->var90; + RDATA->var88 += RDATA->var8C; + if (RDATA->var88 >= 360) + RDATA->var88 -= 360.0f; + else + if (RDATA->var88 < 0.0f) + RDATA->var88 += 360.0f; + sprite->data[0x3] = RDATA->var88; + RDATA->var98 += RDATA->var9C; + RDATA->var94 += RDATA->var98; + sprite->data[0x4] = RDATA->var94; + sin = Sin2(sprite->data[0x3]); + cos = Cos2(sprite->data[0x3]); + sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; + sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; + if (IsSEPlaying()) + { + m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, sprite->pos2.x); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, sprite->pos2.x); + } +} + +void sub_8118834(struct Sprite *sprite) +{ + s16 sin, cos; + sprite->data[0x3] = RDATA->var24 + sprite->data[0x6]; + if (sprite->data[0x3] > 359) + sprite->data[0x3] -= 360; + sin = Sin2(sprite->data[0x3]); + cos = Cos2(sprite->data[0x3]); + sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; + sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; + sprite->pos2.y += gSpriteCoordOffsetY; +} + +void sub_811889C(struct Sprite *sprite) +{ + sub_8118724(sprite); + sprite->data[0x2]++; + if ((u16)(sprite->data[0x4] + 0x84) > 0xD4) + sprite->invisible = TRUE; + else + sprite->invisible = FALSE; + if (!(sprite->data[0x2] < 30)) + { + if (!sprite->data[0x0]) + { + if (RDATA->var94 <= RDATA->varA0 - 2.0f) + { + RDATA->var7D = 0xFF; + RDATA->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + RDATA->var9C = RDATA->var98 = 0.0f; + RDATA->var8C = -1.0f; + } + } + else + { + if (RDATA->var94 >= RDATA->varA0 - 2.0f) + { + RDATA->var7D = 0xFF; + RDATA->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + RDATA->var9C = RDATA->var98 = 0.0f; + RDATA->var8C = -1.0f; + } + } + } +} + +void sub_81189A8(struct Sprite *sprite) +{ + +} -- cgit v1.2.3 From 184f6cb48c5f78d69c5cc3e3da928457e2ecd7dc Mon Sep 17 00:00:00 2001 From: M Date: Mon, 20 Nov 2017 07:19:30 +0100 Subject: added void m4aSongNumStartOrChange(u16); to m4a.h --- include/m4a.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/m4a.h b/include/m4a.h index 7d016c98b..57a749a58 100644 --- a/include/m4a.h +++ b/include/m4a.h @@ -8,6 +8,7 @@ void m4aSoundVSync(void); void m4aSoundInit(void); void m4aSoundMain(void); void m4aSongNumStart(u16); +void m4aSongNumStartOrChange(u16); void m4aSongNumStop(u16 n); void m4aMPlayAllStop(void); void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo); -- cgit v1.2.3 From 50a9e8f0f514aadce63626253ddd230a4aba1e49 Mon Sep 17 00:00:00 2001 From: Made-s Date: Mon, 20 Nov 2017 14:29:48 +0100 Subject: begin decompiling sub_81189A8 --- asm/roulette.s | 4 ++-- src/roulette.c | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/asm/roulette.s b/asm/roulette.s index 5cf9b5b79..02fbb7c5d 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -7084,7 +7084,7 @@ _0811899C: .4byte sub_8118834 _081189A0: .4byte 0x00000000 _081189A4: .4byte 0xbf800000 thumb_func_end sub_811889C -*/ + thumb_func_start sub_81189A8 sub_81189A8: @ 81189A8 push {r4-r7,lr} @@ -7261,7 +7261,7 @@ _08118B24: .4byte 0x40000000 _08118B28: .4byte 0x00000000 _08118B2C: .4byte sub_811889C thumb_func_end sub_81189A8 - +*/ thumb_func_start sub_8118B30 sub_8118B30: @ 8118B30 push {r4,r5,lr} diff --git a/src/roulette.c b/src/roulette.c index 19fc3d604..ef9f8507d 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -244,7 +244,9 @@ struct Unkg083F8DF4 u8 var02; u8 var03; u8 var04; - u8 v[0x13]; + u8 v[0x8]; + u16 var0C; + u8 v1[0x9]; s16 var18; s16 var1A; //is this signed or not ? u8 v2[0x4]; @@ -3502,5 +3504,34 @@ void sub_811889C(struct Sprite *sprite) void sub_81189A8(struct Sprite *sprite) { - + float f0, f1, f2; + sub_8118724(sprite); + switch(sprite->data[0x3]) + { + case 0: + if (sprite->data[0x0]) + return; + f0 = ((float)sprite->data[0x8]); + f1 = ((f0 * (float)(gUnknown_083F8DF4[RDATA->var04_0].var01)) + (float)(gUnknown_083F8DF4[RDATA->var04_0].var02 - 0x1)); + f2 = ((float)gUnknown_083F8DF4[RDATA->var04_0].var0C) / f0; + break; + case 180: + if (!sprite->data[0x0]) + return; + f0 = ((float)sprite->data[0x8]); + f1 = ((f0 * (float)(gUnknown_083F8DF4[RDATA->var04_0].var01)) + (float)(gUnknown_083F8DF4[RDATA->var04_0].var02 - 0x1)); + f2 = ((float)gUnknown_083F8DF4[RDATA->var04_0].var0C) / f0; + break; + default: return; + } + RDATA->varA0 = RDATA->var94; + RDATA->var98 = f2; + RDATA->var9C = -((f2 + f2) / f1 + (2.0f / (f1 * f1))); + RDATA->var8C = 0.0f; + sprite->animPaused = FALSE; + sprite->animNum = 0x0; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; + sprite->callback = &sub_811889C; + sprite->data[0x2] = 0x0; } -- cgit v1.2.3 From ba4b0d8dd2587667c04e6cc63e31afe16fba1381 Mon Sep 17 00:00:00 2001 From: Made-s Date: Thu, 23 Nov 2017 14:50:16 +0100 Subject: start decompiling ub_8118DE4 --- asm/roulette.s | 4 +- src/roulette.c | 264 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 230 insertions(+), 38 deletions(-) diff --git a/asm/roulette.s b/asm/roulette.s index 02fbb7c5d..1fda9ece9 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -7261,7 +7261,7 @@ _08118B24: .4byte 0x40000000 _08118B28: .4byte 0x00000000 _08118B2C: .4byte sub_811889C thumb_func_end sub_81189A8 -*/ + thumb_func_start sub_8118B30 sub_8118B30: @ 8118B30 push {r4,r5,lr} @@ -7811,7 +7811,7 @@ _08118F80: .4byte 0xbfc00000 _08118F84: .4byte 0x3dae147b _08118F88: .4byte sub_8118D2C thumb_func_end sub_8118DE4 - +*/ thumb_func_start sub_8118F8C sub_8118F8C: @ 8118F8C push {r4-r7,lr} diff --git a/src/roulette.c b/src/roulette.c index ef9f8507d..0250857a2 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -205,6 +205,11 @@ void sub_81157AC(u8); void sub_8116B40(u8); +void sub_8119224(struct Sprite *); +void sub_81193D4(struct Sprite *); +void sub_811952C(struct Sprite *); + + void dp01t_12_3_battle_menu(u8); @@ -221,14 +226,6 @@ extern u8 gSharedMem[]; #define ewram18a80 ((u16 *) (gSharedMem + 0x18a80)) #define RDATA ((struct RData *) (gSharedMem + 0x19000)) -#define S16TOPOSFLOAT(val) \ -({ \ - s16 v = (val); \ - float f = (float)v; \ - if(v < 0) f += 65536.0f; \ - f; \ -}) - struct OamMatrix { s16 a; @@ -244,12 +241,12 @@ struct Unkg083F8DF4 u8 var02; u8 var03; u8 var04; - u8 v[0x8]; + u8 v[0x7]; u16 var0C; - u8 v1[0x9]; - s16 var18; - s16 var1A; //is this signed or not ? - u8 v2[0x4]; + u8 v1[0xA]; + u16 var18; + u16 var1A; //is this signed or not ? + float var1C; }; struct RData /* ewram + 0x19000 */ @@ -1035,15 +1032,12 @@ u8 sub_8115F58(u16 r0, u16 r1) void sub_8116100(u8 taskid) { u8 randf; - u16 floatr; - float tempf; - u32 zzz; s8 randfinal; s8 r5; u16 g; u16 rand; u16 randmod; - s16 angles[0x4]; // angles in 90 degree steps + u16 angles[0x4]; // angles in 90 degree steps u8 zero = 0x0; memcpy(angles, &gUnknown_083F8ECE, 0x8); rand = Random(); @@ -1064,20 +1058,18 @@ void sub_8116100(u8 taskid) r5 = (1 - r5) * 2; g = (&gUnknown_083F8DF4[RDATA->var04_0])->var1A; RDATA->var80 = (g + randfinal); - tempf = S16TOPOSFLOAT(g + randfinal); - // some register differences here - floatr = tempf / 5.0f; - zzz = floatr * 3; - RDATA->var82 = floatr * 3; - RDATA->var84 = floatr; - RDATA->var86 = floatr; // - RDATA->var88 = S16TOPOSFLOAT(angles[(rand & 0x1) + r5]); - RDATA->var8C = S16TOPOSFLOAT((&gUnknown_083F8DF4[RDATA->var04_0])->var18); - RDATA->var90 = ((RDATA->var8C * 0.5f) - RDATA->var8C) / S16TOPOSFLOAT(zzz); + g = ((float)(u16)(g + randfinal)) / 5.0f; + RDATA->var82 = g * 3; + RDATA->var84 = g; + RDATA->var86 = g; + // + RDATA->var88 = (float)(angles[(rand & 0x1) + r5]); + RDATA->var8C = (float)((&gUnknown_083F8DF4[RDATA->var04_0])->var18); + RDATA->var90 = ((RDATA->var8C * 0.5f) - RDATA->var8C) / (float)(u16)(g * 3); RDATA->var94 = 68.0f; RDATA->var9C = 0.0f; - RDATA->var98 = -(8.0f / S16TOPOSFLOAT(zzz)); + RDATA->var98 = -(8.0f / (float)(u16)(g * 3)); RDATA->varA0 = 36.0f; gTasks[taskid].func = &sub_8116308; } @@ -3505,22 +3497,35 @@ void sub_811889C(struct Sprite *sprite) void sub_81189A8(struct Sprite *sprite) { float f0, f1, f2; + struct Unkg083F8DF4 *p; sub_8118724(sprite); switch(sprite->data[0x3]) { case 0: - if (sprite->data[0x0]) + if (sprite->data[0x0] != 0x1) + { + f0 = ((float)sprite->data[0x7]); + p = &gUnknown_083F8DF4[0]; + f1 = (f0 * ((float)(s32)p[RDATA->var04_0].var01) + (float)((s32)p[RDATA->var04_0].var02 - 0x1)); + f2 = (f0 / ((float)(s32)p[RDATA->var04_0].var0C)); + } + else + { return; - f0 = ((float)sprite->data[0x8]); - f1 = ((f0 * (float)(gUnknown_083F8DF4[RDATA->var04_0].var01)) + (float)(gUnknown_083F8DF4[RDATA->var04_0].var02 - 0x1)); - f2 = ((float)gUnknown_083F8DF4[RDATA->var04_0].var0C) / f0; + } break; case 180: - if (!sprite->data[0x0]) + if (sprite->data[0x0] != 0x0) + { + f0 = ((float)sprite->data[0x7]); + p = &gUnknown_083F8DF4[0]; + f1 = (f0 * ((float)(s32)p[RDATA->var04_0].var01) + (float)((s32)p[RDATA->var04_0].var02 - 0x1)); + f2 = -(f0 / ((float)(s32)p[RDATA->var04_0].var0C)); + } + else + { return; - f0 = ((float)sprite->data[0x8]); - f1 = ((f0 * (float)(gUnknown_083F8DF4[RDATA->var04_0].var01)) + (float)(gUnknown_083F8DF4[RDATA->var04_0].var02 - 0x1)); - f2 = ((float)gUnknown_083F8DF4[RDATA->var04_0].var0C) / f0; + } break; default: return; } @@ -3535,3 +3540,190 @@ void sub_81189A8(struct Sprite *sprite) sprite->callback = &sub_811889C; sprite->data[0x2] = 0x0; } + +void sub_8118B30(struct Sprite *sprite) +{ + sprite->pos2.y = (s32)(((float)sprite->data[0x2]) * 0.05f * ((float)sprite->data[0x2])) - 45; + sprite->data[0x2]++; + if (sprite->data[0x2] > 29 && sprite->pos2.y >= 0) + { + RDATA->var7D = 0xFF; + RDATA->var03_7 = FALSE; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + RDATA->var03_6 = TRUE; + } +} + +void sub_8118BD8(struct Sprite *sprite) +{ + if (sprite->data[0x2]++ < 45) + { + sprite->pos2.y--; + if(sprite->data[0x2] == 45) + { + if (gSprites[RDATA->var3C[0x37]].animCmdIndex == 0x1) + sprite->pos2.y++; + } + } + else + { + if (sprite->data[0x2] < sprite->data[0x7]) + { + if (gSprites[RDATA->var3C[0x37]].animDelayCounter == 0x0) + { + if (gSprites[RDATA->var3C[0x37]].animCmdIndex == 0x1) + sprite->pos2.y++; + else + sprite->pos2.y--; + } + } + else + { + sprite->animPaused = FALSE; + sprite->animNum = 0x1; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; + sprite->data[0x2] = 0x0; + sprite->callback = &sub_8118B30; + m4aSongNumStart(0x3D); + } + } +} + +void sub_8118CAC(struct Sprite *sprite) +{ + sub_8118724(sprite); + switch(sprite->data[0x3]) + { + case 90: + if (sprite->data[0x0] != 0x1) + { + sprite->callback = &sub_8118BD8; + sprite->data[0x2] = 0x0; + } + break; + case 270: + if (sprite->data[0x0] != 0x0) + { + sprite->callback = &sub_8118BD8; + sprite->data[0x2] = 0x0; + } + break; + } +} + +void sub_8118CEC(struct Sprite *sprite) +{ + sub_8118724(sprite); + switch(RDATA->var03_0) + { + default: + case 0x0: + sub_8119224(sprite); + sprite->callback = &sub_81189A8; + break; + case 0x1: + sub_81193D4(sprite); + sprite->callback = &sub_8118CAC; + break; + } +} + +void sub_8118D2C(struct Sprite *sprite) +{ + sub_8118724(sprite); + if (sprite->data[0x2]-- == 0x10) + RDATA->var98 *= -1.0f; + if (sprite->data[0x2] == 0x0) + { + if (!sprite->data[0x0]) + { + RDATA->var7D = 0xFF; + RDATA->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + } + else + { + sprite->animPaused = TRUE; + m4aSongNumStart(0x38); + sub_811952C(sprite); + } + } +} + +void sub_8118DE4(struct Sprite *sprite) +{ + sub_8118724(sprite); + sprite->data[0x2] = 0x0; + sub_81186B8(sprite); + if (!(gUnknown_083F8D90[RDATA->var7E].var04 & RDATA->var08)) + { + RDATA->var7D = 0xFF; + RDATA->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + } + else + { + u8 t; + u32 z; + m4aSongNumStart(0x38); + if ((z = (Random() & 0x1))) + { + RDATA->var8C = 0.0f; + t = (RDATA->var7E + 0x1) % 0xC; + RDATA->var7F = t; + } + else + { + RDATA->var8C = gUnknown_083F8DF4[RDATA->var04_0].var1C * 2; + t = (RDATA->var7E + 0xB) % 0xC; + RDATA->var7F = t; + } + if (gUnknown_083F8D90[t].var04 & RDATA->var08) + { + sprite->data[0x0] = 0x1; + sprite->data[0x2] = gUnknown_083F8DF4[RDATA->var04_0].var02; + } + else + { + sprite->data[0x0] = gUnknown_083F8D90[t].var04 & RDATA->var08; + if (RDATA->var04_0) + { + sprite->data[0x2] = gUnknown_083F8DF4[RDATA->var04_0].var01; + } + else + { + sprite->data[0x2] = gUnknown_083F8DF4[RDATA->var04_0].var02; + if (z) + { + RDATA->var8C = 1.5f; + } + else + { + RDATA->var8C = -1.5f; + } + } + } + RDATA->var98 = 0.085000000894069671630859375f; + sprite->callback = &sub_8118D2C; + sprite->data[0x1] = 0x5; + } +} -- cgit v1.2.3 From e9bb490023f346697b4f432a9add1fe158f2038d Mon Sep 17 00:00:00 2001 From: M Date: Sat, 6 Jan 2018 00:21:01 +0100 Subject: finish roulette file --- asm/roulette.s | 4 +- include/ewram.h | 8 +- include/roulette.h | 53 +- include/roulette_util.h | 1 - src/roulette.c | 2776 +++++++++++++++++++++++++++++++---------------- src/roulette_util.c | 615 +++++------ 6 files changed, 2191 insertions(+), 1266 deletions(-) diff --git a/asm/roulette.s b/asm/roulette.s index 1fda9ece9..5050cf7a7 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -7811,7 +7811,7 @@ _08118F80: .4byte 0xbfc00000 _08118F84: .4byte 0x3dae147b _08118F88: .4byte sub_8118D2C thumb_func_end sub_8118DE4 -*/ + thumb_func_start sub_8118F8C sub_8118F8C: @ 8118F8C push {r4-r7,lr} @@ -9655,4 +9655,4 @@ _08119E34: .4byte sub_8119D08 _08119E38: .4byte sub_8119BCC thumb_func_end sub_8119D80 - .align 2, 0 @ Don't pad with nop. + .align 2, 0 @ Don't pad with nop.*/ diff --git a/include/ewram.h b/include/ewram.h index 5a350840a..fbc010853 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -192,13 +192,14 @@ extern u8 gSharedMem[]; #define B_FUNCTION_STACK ((struct funcStack *) (gSharedMem + 0x17140)) #define ewram17160 (gSharedMem[0x17160]) #define ewram17800 ((struct Struct2017800 *) (gSharedMem + 0x17800)) +#define ewram17800_2 (&gSharedMem[0x17800]) #define EWRAM_17800 ((struct UnknownStruct1 *)(gSharedMem + 0x17800)) #define eTransformStatuses ((struct TransformStatus *)(gSharedMem + 0x17800)) -#define ewram17800_2 (&gSharedMem[0x17800]) #define ewram17810 ((struct Struct2017810 *) (gSharedMem + 0x17810)) #define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810)) #define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840)) #define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850)) +#define ewram17E00 ((u16 *)(gSharedMem + 0x17E00)) #define ewram_2018000 (*(struct PlayerRecords *)(gSharedMem + 0x18000)) #define EWRAM_18000 ((u16 *)(gSharedMem + 0x18000)) #define ewram18000 ((u16 *)(gSharedMem + 0x18000)) @@ -212,8 +213,13 @@ extern u8 gSharedMem[]; #define ewram18300 ((u16 *)(gSharedMem + 0x18300)) #define ewram18800 (&gSharedMem[0x18800]) #define ePokedexView2 (struct PokedexView *)(gSharedMem + 0x18800) +#define ewram189a0 ((u16 *)(gSharedMem + 0x189A0)) +#define ewram18a20 ((u16 *)(gSharedMem + 0x18A20)) +#define ewram18a32 ((u16 *)(gSharedMem + 0x18A32)) +#define ewram18a80 ((u16 *)(gSharedMem + 0x18a80)) #define ewram19000 (&gSharedMem[0x19000]) #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) +#define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) #define ewram19348 (*(struct Struct2019348 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) diff --git a/include/roulette.h b/include/roulette.h index 5bd2e5240..9cf0ba1d2 100644 --- a/include/roulette.h +++ b/include/roulette.h @@ -3,42 +3,39 @@ struct UnkStruct1 { - u16 val0; - u16 val1; - u8 val2; - u8 val3; - u8 val4; - s8 field0:5; - s8 field1:2; - s8 field2:1; + u16 var00; + u16 var02; + u8 var04; + u8 var05; + u8 var06; + s8 var07_0:5; + s8 var07_5:2; + s8 var07_7:1; }; struct UnkStruct3 { - u8 field0:7; - u8 field1:1; - u8 val1; - s8 val2; - s8 val3; - /* - u16 val4; - u16 val5; - u8 val6; - u8 val7; - u8 val8; - s8 field2:5; - s8 field3:2; - s8 field4:1; - */ - struct UnkStruct1 val4; + u8 var00_0:7; + u8 var00_7:1; + u8 var01; + s8 var02; + s8 var03; + struct UnkStruct1 var04; }; struct UnkStruct0 { - u8 val0; - u8 val1; - u16 val2; //flag for each UnkStruct3 - struct UnkStruct3 val3[0x10]; + u8 var00; + u8 var01; + u16 var02; //flag for each UnkStruct3 + struct UnkStruct3 var04[0x10]; }; +s16 sub_81174C4(s16, s16); +s16 sub_81174E0(s16); + +void PlayRoulette(void); + + + #endif diff --git a/include/roulette_util.h b/include/roulette_util.h index ed925b5bd..daeaeeeef 100644 --- a/include/roulette_util.h +++ b/include/roulette_util.h @@ -5,7 +5,6 @@ void sub_8124918(struct UnkStruct0 *); u8 sub_812492C(struct UnkStruct0 *, u8, struct UnkStruct1 *); -u8 unref_sub_81249B0(struct UnkStruct0 *, u8); void task_tutorial_controls_fadein(struct UnkStruct0 *); void sub_8124CE8(struct UnkStruct0 *, u16); void sub_8124D3C(struct UnkStruct0 *, u16); diff --git a/src/roulette.c b/src/roulette.c index 0250857a2..36c15bf23 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1,60 +1,121 @@ #include "global.h" -#include "roulette.h" -#include "roulette_util.h" -#include "task.h" -#include "palette.h" -#include "text.h" -#include "pokemon.h" -#include "species.h" -#include "rtc.h" + +#include "ewram.h" +#include "field_fadetransition.h" +#include "game_stat.h" +#include "m4a.h" #include "main.h" -#include "menu_helpers.h" -#include "unknown_task.h" #include "menu.h" -#include "trig.h" -#include "sprite.h" #include "menu_cursor.h" -#include "sound.h" -#include "songs.h" -#include "m4a.h" -#include "rng.h" -#include "game_stat.h" +#include "menu_helpers.h" #include "overworld.h" -#include "string_util.h" -#include "field_fadetransition.h" +#include "palette.h" +#include "pokemon.h" +#include "rng.h" +#include "roulette.h" +#include "roulette_util.h" +#include "rtc.h" +#include "songs.h" +#include "sound.h" #include "script.h" +#include "species.h" +#include "sprite.h" #include "strings2.h" +#include "string_util.h" +#include "task.h" +#include "text.h" +#include "trig.h" +#include "unknown_task.h" asm(".include \"constants/gba_constants.inc\""); -extern u8 gUnknown_02019000[]; -extern u16 gSpecialVar_0x8004; -extern struct Unkg083F8DF4 gUnknown_083F8DF4[]; -extern u8 gUnknown_083F8EC4; -extern u8 gUnknown_083F8DF0[]; -extern u8 gUnknown_083F8E34[]; -extern const u8 gUnknown_08E8096C[]; -extern const u8 gRouletteWheelTiles[]; -extern const u8 gRouletteCenter_Gfx[]; -extern const u8 gRouletteHeadersTiles[]; -extern const u8 gRouletteCreditTiles[]; -extern const u8 gRouletteNumbersTiles[]; -extern const u8 gRouletteMultiplierTiles[]; -extern const u8 gUnknown_083F86BC[]; -extern const u8 gUnknown_083F88BC[]; -extern const u8 gUnknown_083F8A60[]; - -extern u16 gPlttBufferFaded[]; -extern u16 gPlttBufferUnfaded[]; - -extern const u8 gUnknown_081C4157[]; +struct OamMatrix +{ + s16 a; + s16 b; + s16 c; + s16 d; +}; -extern const struct YesNoFuncTable gUnknown_083F8EBC; -extern const u8 gUnknown_081C41E3; +struct Roulette /* ewram + 0x19000 */ +{ + u8 var00; + u8 var01; + u8 var02; + u8 var03_0:5; + u8 var03_5:1; + u8 var03_6:1; + u8 var03_7:1; + u8 var04_0:2; + u8 var04_2:5; + u8 var04_7:1; + u32 var08; + u8 var0C[0x6]; + u8 var12[0x4]; + u8 var16[0x3]; + u8 var19; + u8 var1A_0:4; + u8 var1A_4:4; + u8 var1B[0x6]; + u8 var21; + u8 var22; + u8 var23; + s16 var24; + s16 var26; + s16 var28; + s16 var2A; + struct OamMatrix var2C; + u16 var34; + struct Sprite *var38; + u8 var3C[0x40]; // Sprite IDs + u8 var7C; + u8 var7D; + u8 var7E; + u8 var7F; + s16 var80; + s16 var82; + s16 var84; + s16 var86; + float var88; + float var8C; + float var90; + float var94; + float var98; + float var9C; + float varA0; + u8 varA4; + u8 varA5; + u8 v51[0x2]; + u16 varA8; + u16 varAA; + TaskFunc varAC; + u8 v46[0x4]; + TaskFunc varB4; + struct UnkStruct0 varB8; +}; -extern const u16 gUnknown_083F8ECE; +struct StructgUnknown_083F8DF4 +{ + u8 var00; + u8 var01; + u8 var02; + u8 var03; + u8 var04; + u8 v[0x3]; + u16 var08; + u16 var0A; + u16 var0C; + u16 v13[0x1]; + u16 var10; + u16 var12; + u16 var14; + u8 v1[0x2]; + u16 var18; + u16 var1A; + float var1C; +}; -struct StructUnknown_083F8C00 +struct StructgUnknown_083F8C00 { u8 var00; u8 var01_0:4; @@ -63,8 +124,8 @@ struct StructUnknown_083F8C00 u8 var03; u8 var04; u8 var05; - u8 var06; - u8 var07; + u8 var06; + u8 var07; u32 var08; u32 var0C; u16 var10; @@ -80,35 +141,147 @@ struct StructgUnknown_083F8D90 u32 var04; }; -extern const struct StructUnknown_083F8C00 gUnknown_083F8C00[]; +static void sub_81150FC(void); +static void sub_8115124(void); +static void sub_8115238(void); +static void sub_8115384(void); +static void sub_8115634(u8); +static void sub_81156BC(u8); +static void sub_8115734(u8); +void sub_811577C(u8); +void sub_81157AC(u8); +static void sub_81157D0(u8); +static void sub_8115928(u8, u8); +static void sub_811597C(u8); +static void sub_81159BC(u8); +static u8 sub_8115A94(s16 *, u8); +void sub_8115B58(u8); +static void sub_8115DA0(u8); +static void sub_8115E14(u8); +static void sub_8115ECC(u8); +u8 sub_8115F58(u16, u16); +static void sub_8116100(u8); +void sub_8116308(u8); +static void sub_811637C(u8); +static void sub_8116474(u8); +static void sub_8116514(u8); +static void sub_811659C(u8); +static void sub_8116638(u8); +static void sub_81166E8(u8); +static void sub_811677C(u8); +static void sub_81167F4(u8); +static void sub_8116880(u8); +static void dp01t_12_3_battle_menu(u8); +static void sub_8116AB0(u8); +static void sub_8116B40(u8); +static void sub_8116BC0(u8); +static void sub_8116C34(u8, TaskFunc, u16, u16); +static void sub_8116CAC(u8); +static void sub_8116CF8(void); +static u8 sub_8116D54(u8, u8); +static u8 sub_8116E5C(u8, u8); +static void sub_8116EF8(u8); +static void sub_8117158(u8); +static u8 sub_8117380(u8); +static void sub_8117434(void); +static void sub_81174F8(u8); +static void sub_8117528(u8); +void sub_811755C(u8); +void sub_81175C0(u8); +static void sub_81175DC(u8); +static void sub_8117630(u8); +static void Task_Roulette_0(u8); +static void sub_8117838(u8); +static u8 sub_8117890(const struct SpriteTemplate *, u8, u16 *); +static void sub_8117900(void); +void unref_sub_8117A74(void); +static void sub_8117AA8(u8, u8); +static void sub_8117BBC(void); +static void sub_8117C60(u8, u8); +static void sub_8117D68(u8); +static void sub_8117DF4(void); +void sub_8117E98(struct Sprite *); +static void sub_8117F2C(void); +static void sub_81180F4(u16); +static u8 sub_81181E8(u8); +static void sub_811829C(u8); +static void sub_81182F8(u8); +void sub_81184CC(struct Sprite *); +static void sub_81184D8(void); +void sub_8118554(struct Sprite *); +static void sub_811857C(void); +static void sub_81185E8(void); +static s16 sub_811866C(struct Sprite *); +static u8 sub_81186B8(struct Sprite *); +static s16 sub_81186E8(struct Sprite *); +static void sub_8118724(struct Sprite *); +static void sub_8118834(struct Sprite *); +static void sub_811889C(struct Sprite *); +static void sub_81189A8(struct Sprite *); +static void sub_8118B30(struct Sprite *); +static void sub_8118BD8(struct Sprite *); +static void sub_8118CAC(struct Sprite *); +void sub_8118CEC(struct Sprite *); +void sub_8118D2C(struct Sprite *); +static void sub_8118DE4(struct Sprite *); +static void sub_8118F8C(struct Sprite *); +static void sub_8119088(struct Sprite *); +static void sub_8119134(struct Sprite *); +static void sub_81191F4(struct Sprite *); +static void sub_8119224(struct Sprite *); +static void sub_81193D4(struct Sprite *); +static void sub_811952C(struct Sprite *); +static void sub_8119780(struct Sprite *); +static void sub_81197D8(struct Sprite *); +static void sub_8119898(struct Sprite *); +void sub_8119964(struct Sprite *); +static void sub_8119A90(struct Sprite *); +static void sub_8119AAC(struct Sprite *); +static void sub_8119B24(struct Sprite *); +static void sub_8119BCC(struct Sprite *); +static void sub_8119D08(struct Sprite *); +void sub_8119D80(struct Sprite *); +extern u8 gUnknown_02019000[]; +extern u16 gSpecialVar_0x8004; +extern struct StructgUnknown_083F8DF4 gUnknown_083F8DF4[]; +extern u8 gUnknown_083F8EC4; +extern u8 gUnknown_083F8DF0[]; +extern u8 gUnknown_083F8E34[]; +extern const u8 gUnknown_08E8096C[]; +extern const u8 gRouletteWheelTiles[]; +extern const u8 gRouletteCenter_Gfx[]; +extern const u8 gRouletteHeadersTiles[]; +extern const u8 gRouletteCreditTiles[]; +extern const u8 gRouletteNumbersTiles[]; +extern const u8 gRouletteMultiplierTiles[]; +extern const u16 gUnknown_083F86BC[]; +extern const u8 gUnknown_083F88BC[]; +extern const u8 gUnknown_083F8A60[]; +extern u16 gPlttBufferFaded[]; +extern u16 gPlttBufferUnfaded[]; +extern const u8 gUnknown_081C4157[]; +extern const struct YesNoFuncTable gUnknown_083F8EBC; +extern const u8 gUnknown_081C41E3; +extern const u16 gUnknown_083F8ECE; +extern const struct StructgUnknown_083F8C00 gUnknown_083F8C00[]; const extern u8 gUnknown_083F8ECA[]; - const extern u8 gUnknown_081C41A5; const extern u8 gUnknown_081C4199; const extern u8 gUnknown_081C41AE; - const extern u8 gUnknown_081C41BD; - const extern u8 gUnknown_081C41F1; const extern u8 gUnknown_081C4231; const extern u8 gUnknown_081C41D2; - extern const struct StructgUnknown_083F8D90 gUnknown_083F8D90[]; extern const u32 gUnknown_083F8ED8[]; extern const u32 gUnknown_083F8EE8[]; - extern const struct UnkStruct1 gUnknown_083F8E9C[]; - extern const u8 gUnknown_083F8EF4[]; - extern const struct YesNoFuncTable gUnknown_083F8EB4; - -//Strings TODO: give proper names extern const u8 gUnknown_081C40DF; extern const u8 gUnknown_081C4139; extern const u8 gUnknown_081C411C; - extern const u8 gUnknown_083F92A8[]; extern const u8 gUnknown_083F90FC[]; extern const u8 gUnknown_083F9D3C[]; @@ -118,286 +291,127 @@ extern const struct SpriteSheet gUnknown_083F9F5C; extern const struct SpriteTemplate gSpriteTemplate_83FA07C[]; extern const struct SpriteTemplate gSpriteTemplate_83F9FD4[]; extern const struct SpriteTemplate gSpriteTemplate_83FA034[]; - extern const struct SpriteTemplate gSpriteTemplate_83FA40C; - extern const struct SpriteSheet gUnknown_083F9EE8; extern const struct SpriteTemplate gSpriteTemplate_83FA0DC[]; - extern struct OamMatrix gOamMatrices[]; - extern const struct SpriteSheet gUnknown_083FA21C[]; extern const struct SpriteTemplate gSpriteTemplate_83FA2B0; extern const struct SpriteTemplate gSpriteTemplate_83FA2C8; extern const struct SpriteTemplate gSpriteTemplate_83FA2E0; extern const struct SpriteTemplate gSpriteTemplate_83FA2F8; extern const struct SpriteTemplate gSpriteTemplate_83FA310; - extern const u8 gUnknown_083FA608[0x5]; - extern const struct SpriteSheet gUnknown_083FA42C; extern const struct SpriteTemplate gSpriteTemplate_83FA434; - extern void (*gFieldCallback)(void); - extern struct MusicPlayerInfo gMPlay_SE1; extern struct MusicPlayerInfo gMPlay_SE2; - -void sub_8117434(void); - -void sub_8117838(u8); -void sub_811857C(void); -void sub_81184D8(void); -void sub_8117F2C(void); -void sub_8117900(void); -void sub_8117BBC(void); -void sub_8117DF4(void); - -void sub_81180F4(u16); -void sub_81182F8(u8); -void sub_811829C(u8); -void sub_8117158(u8); - -void sub_81156BC(u8); -void sub_8115634(u8); - -void sub_8116CAC(u8); -void sub_8116CF8(void); -void sub_81185E8(void); -void sub_81182F8(u8); -void sub_81159BC(u8); -void sub_8116C34(u8, TaskFunc, u16, u16); - -void sub_8116AB0(u8); - -void sub_8115E14(u8); - -void sub_8116EF8(u8); - -void sub_8115ECC(u8); - -u8 sub_8117380(u8); - -void sub_8117AA8(u8, u8); -void sub_8117C60(u8, u8); -void sub_8116100(u8); - -void sub_8116308(u8); - -void sub_81191F4(struct Sprite *); -void sub_811637C(u8); - -u8 sub_8116D54(u8, u8); -u8 sub_8116E5C(u8 ,u8); -void sub_8116474(u8); - -void sub_81184CC(struct Sprite *); -void sub_8117D68(u8); -void sub_8116514(u8); - -void sub_8116638(u8); - -void sub_811677C(u8); -void sub_81167F4(u8); - -void sub_8116880(u8); -void sub_81157AC(u8); - -void sub_8116B40(u8); - -void sub_8119224(struct Sprite *); -void sub_81193D4(struct Sprite *); -void sub_811952C(struct Sprite *); +extern const u16 gUnknown_083FA60E[0x2][0x2]; +extern const struct SpriteTemplate gSpriteTemplate_83FA50C; +extern const struct SpriteTemplate gSpriteTemplate_83FA5C0[]; +extern const u16 gUnknown_083FA616[0x2][0x2]; +extern const struct SpriteTemplate gSpriteTemplate_83FA524; +extern const struct SpriteTemplate gSpriteTemplate_83FA5F0; +extern const u16 gUnknown_083FA61E[0xA]; +extern const u16 gUnknown_083FA632[]; +extern const s8 gUnknown_083FA64A[0x2]; +extern const s8 gUnknown_083FA64C[0x8][0x2]; -void dp01t_12_3_battle_menu(u8); -extern u8 gSharedMem[]; - -#define ewram17000 ((u16 *) (gSharedMem + 0x17000)) //money stuff? -#define ewram17E00 ((u16 *) (gSharedMem + 0x17E00)) -#define ewram17800 ((u16 *) (gSharedMem + 0x17800)) -#define ewram18000 ((u16 *) (gSharedMem + 0x18000)) -#define ewram18800 ((u16 *) (gSharedMem + 0x18800)) -#define ewram189a0 ((u16 *) (gSharedMem + 0x189a0)) -#define ewram18a20 ((u16 *) (gSharedMem + 0x18a20)) -#define ewram18a32 ((u16 *) (gSharedMem + 0x18A32)) -#define ewram18a80 ((u16 *) (gSharedMem + 0x18a80)) -#define RDATA ((struct RData *) (gSharedMem + 0x19000)) - -struct OamMatrix +void sub_81150FC(void) { - s16 a; - s16 b; - s16 c; - s16 d; -}; + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + if (eRoulette->varB8.var00) + task_tutorial_controls_fadein(&eRoulette->varB8); +} -struct Unkg083F8DF4 +void sub_8115124(void) { - u8 var00; - u8 var01; - u8 var02; - u8 var03; - u8 var04; - u8 v[0x7]; - u16 var0C; - u8 v1[0xA]; - u16 var18; - u16 var1A; //is this signed or not ? - float var1C; -}; + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + sub_8117434(); + REG_BG1HOFS = 0x200 - eRoulette->var26; + if (eRoulette->var01) + REG_BLDALPHA = eRoulette->var34; + if (eRoulette->var2A != 0) + { + DmaCopy16(3, &gBGTilemapBuffers[1][0xE0], (void *)(VRAM + 0x21C0), 0x340); + eRoulette->var2A = 0x0; + } + switch (eRoulette->var28) + { + case 0x1: + REG_BG0CNT = (0x20 * 0xF8); + DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); + eRoulette->var28 = 0x2; + break; + case 0x2: + DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); + break; + case 0xFF: + REG_BG0CNT = 0x1F08; + DmaFill16(3, 0x0, (void *)(VRAM + 0xF9C0), 0x340); + eRoulette->var28 = 0x0; + break; + case 0x0: + } +} +#ifdef NONMATCHING -struct RData /* ewram + 0x19000 */ -{ - u8 var00; - u8 var01; - u8 var02; - u8 var03_0:5; - u8 var03_5:1; - u8 var03_6:1; - u8 var03_7:1; - u8 var04_0:2; - u8 var04_2:5; - u8 var04_7:1; - u8 v7[0x3]; - u32 var08; - u8 var0C[0x6]; - u8 var12[0x4]; - u8 var16[0x3]; - u8 var19; - u8 var1A_0:4; - u8 var1A_4:4; - u8 var1B[0x6]; - u8 var21; - u8 var22; - u8 var23; - s16 var24; - s16 var26; - s16 var28; - s16 var2A; - struct OamMatrix var2C; - u16 var34; - u8 v99[0x2]; - struct Sprite *var38; - u8 var3C[0x40]; // Sprite IDs ? TODO: add some defines for the different areas - u8 var7C; - u8 var7D; - u8 var7E; - u8 var7F; - s16 var80; - s16 var82; - s16 var84; - s16 var86; - float var88; - float var8C; - float var90; - float var94; - float var98; - float var9C; - float varA0; - u8 varA4; - u8 varA5; // taskid - u8 v51[0x2]; - u16 varA8; - u16 varAA; - TaskFunc varAC; - u8 v46[0x4]; - TaskFunc varB4; - struct UnkStruct0 varB8; -}; - - -void sub_81150FC(void) -{ - RunTasks(); - AnimateSprites(); - BuildOamBuffer(); - if (RDATA->varB8.val0) - task_tutorial_controls_fadein(&RDATA->varB8); -} - -void sub_8115124(void) -{ - LoadOam(); - ProcessSpriteCopyRequests(); - TransferPlttBuffer(); - sub_8117434(); - REG_BG1HOFS = 0x200 - RDATA->var26; - if (RDATA->var01) - REG_BLDALPHA = RDATA->var34; - if (RDATA->var2A != 0) - { - DmaCopy16(3, &gBGTilemapBuffers[1][0xE0], (void *)(VRAM + 0x21C0), 0x340); - RDATA->var2A = 0x0; - } - switch (RDATA->var28) - { - case 0x1: - REG_BG0CNT = (0x20 * 0xF8); - DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); - RDATA->var28 = 0x2; - break; - case 0x2: - DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); - break; - case 0xFF: - REG_BG0CNT = 0x1F08; - DmaFill16(3, 0x0, (void *)(VRAM + 0xF9C0), 0x340); - RDATA->var28 = 0x0; - break; - case 0x0: - } -} -#ifdef NONMATCHING -void sub_8115238(void) +void sub_8115238(void) { u8 i; u32 temp; - struct Unkg083F8DF4 *s0; - u16 arr[0x3]; // the third is never used ? + struct PlttData t; + struct PlttData *unfaded; + struct PlttData *faded; + struct StructgUnknown_083F8DF4 *s0; + struct PlttData arr[0x3]; // the third is never used ? memcpy(&arr, &gUnknown_083F8EC4, 0x6); - memset(RDATA, 0x0, 0x17C); - RDATA->var04_0 = (gSpecialVar_0x8004 & 0x1); + memset(eRoulette, 0x0, 0x17C); + eRoulette->var04_0 = (gSpecialVar_0x8004 & 0x1); if (gSpecialVar_0x8004 & 0x80) - RDATA->var04_7 = 0x1; + eRoulette->var04_7 = 0x1; s0 = &gUnknown_083F8DF4[0]; - RDATA->var22 = s0[RDATA->var04_0].var03; - RDATA->var23 = s0[RDATA->var04_0].var04; - temp = gUnknown_083F8DF0[RDATA->var04_0 + RDATA->var04_7 * 2]; - RDATA->var19 = temp; - RDATA->var1A_4 = 0x1; + eRoulette->var22 = s0[eRoulette->var04_0].var03; + eRoulette->var23 = s0[eRoulette->var04_0].var04; + temp = gUnknown_083F8DF0[eRoulette->var04_0 + eRoulette->var04_7 * 2]; + eRoulette->var19 = temp; + eRoulette->var1A_4 = 0x1; if (temp == 0x1) { - u16 *faded = &gPlttBufferFaded[0]; - u16 *unfaded = &gPlttBufferUnfaded[0]; - faded[0x51] = arr[0]; - faded[0x0] = arr[0]; - unfaded[0x51] = arr[0]; - unfaded[0x0] = arr[0]; + unfaded = (struct PlttData *)&gPlttBufferUnfaded[0]; + faded = (struct PlttData *)&gPlttBufferFaded[0]; + t = arr[0]; } else { - u16 *faded = &gPlttBufferFaded[0]; - u16 *unfaded = &gPlttBufferUnfaded[0]; - faded[0x51] = arr[1]; - faded[0x0] = arr[1]; - unfaded[0x51] = arr[1]; - unfaded[0x0] = arr[1]; + unfaded = (struct PlttData *)&gPlttBufferUnfaded[0]; + faded = (struct PlttData *)&gPlttBufferFaded[0]; + t = arr[1]; } - sub_8124918((&RDATA->varB8)); + faded[0x51] = t; + faded[0x0] = faded[0x51]; + unfaded[0x51] = t; + unfaded[0x0] = t; + sub_8124918((&eRoulette->varB8)); for (i = 0; i < 0xD; i++) - sub_812492C((&RDATA->varB8), i, (struct UnkStruct1 *)&gUnknown_083F8E34[i * 8]); + sub_812492C((&eRoulette->varB8), i, (struct UnkStruct1 *)&gUnknown_083F8E34[i * 8]); for (i = 0; i < 0x6; i++) { switch (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2)) { case SPECIES_TAILLOW: - RDATA->var02 |= 0x2; + eRoulette->var02 |= 0x2; break; case SPECIES_SHROOMISH: - RDATA->var02 |= 0x1; + eRoulette->var02 |= 0x1; break; } } @@ -639,10 +653,10 @@ void sub_8115384(void) REG_DISPSTAT |= 0x8; SetVBlankCallback(&sub_8115124); BeginHardwarePaletteFade(0xFF, 0x0, 0x10, 0x0 , 0x1); - taskid = RDATA->varA4 = CreateTask(&sub_81156BC, 0x0); + taskid = eRoulette->varA4 = CreateTask(&sub_81156BC, 0x0); gTasks[taskid].data[0x6] = 0x6; gTasks[taskid].data[0xD] = gSaveBlock1.coins; - RDATA->varA5 = CreateTask(&sub_8115634, 0x1); + eRoulette->varA5 = CreateTask(&sub_8115634, 0x1); SetMainCallback2(&sub_81150FC); break; } @@ -653,20 +667,20 @@ void sub_8115634(u8 unused) s16 sin; s16 cos; s32 cos32; - if (RDATA->var21++ == RDATA->var23) + if (eRoulette->var21++ == eRoulette->var23) { - RDATA->var21 = 0x0; - if ((RDATA->var24 -= RDATA->var22) < 0) - RDATA->var24 = 0x168 - RDATA->var22; + eRoulette->var21 = 0x0; + if ((eRoulette->var24 -= eRoulette->var22) < 0) + eRoulette->var24 = 0x168 - eRoulette->var22; } - sin = Sin2(RDATA->var24); - cos = Cos2(RDATA->var24); + sin = Sin2(eRoulette->var24); + cos = Cos2(eRoulette->var24); sin = sin / 16; cos32 = cos / 16; - RDATA->var2C.d = cos32; - RDATA->var2C.a = cos32; - RDATA->var2C.b = sin; - RDATA->var2C.c = -sin; + eRoulette->var2C.d = cos32; + eRoulette->var2C.a = cos32; + eRoulette->var2C.b = sin; + eRoulette->var2C.c = -sin; } void sub_81156BC(u8 taskid) @@ -702,7 +716,7 @@ void sub_811577C(u8 taskid) void sub_81157AC(u8 taskid) { - DestroyTask(RDATA->varA5); + DestroyTask(eRoulette->varA5); sub_8116AB0(taskid); } @@ -737,37 +751,37 @@ void sub_81157D0(u8 r0) } } -void sub_8115928(u8 taskid, bool8 r1) +void sub_8115928(u8 taskid, u8 r1) { if (!r1) sub_811829C(gTasks[taskid].data[0x4]); else - sub_811829C(RDATA->var1B[RDATA->var1A_0]); + sub_811829C(eRoulette->var1B[eRoulette->var1A_0]); sub_81157D0(gTasks[taskid].data[0x4]); } void sub_811597C(u8 taskid) { - RDATA->var28 = 0x1; + eRoulette->var28 = 0x1; sub_81157D0(gTasks[taskid].data[0x4]); - RDATA->var23 = 0x2; - RDATA->var21 = 0x0; + eRoulette->var23 = 0x2; + eRoulette->var21 = 0x0; gTasks[taskid].func = &sub_8115E14; } void sub_81159BC(u8 taskid) { s16 i; - if(RDATA->var08 & 0x20) + if(eRoulette->var08 & 0x20) { for (i = 0xB; (i < 0xE); i++) - if ((RDATA->var08 & gUnknown_083F8C00[i].var08) == 0) + if ((eRoulette->var08 & gUnknown_083F8C00[i].var08) == 0) break; } else { for (i = 0x6; (i < 0xA); i++) - if ((RDATA->var08 & gUnknown_083F8C00[i].var08) == 0) + if ((eRoulette->var08 & gUnknown_083F8C00[i].var08) == 0) break; } gTasks[taskid].data[0x4] = i; @@ -779,7 +793,7 @@ void sub_81159BC(u8 taskid) gTasks[taskid].func = &sub_811597C; } -bool8 sub_8115A94(s16 *r0, u8 r1) +u8 sub_8115A94(s16 *r0, u8 r1) { s8 temp1 = 0; s8 temp = 0; @@ -829,45 +843,45 @@ void sub_8115B58(u8 r0) sub_8115928(r0, FALSE); gTasks[r0].data[0x1] = z; PlaySE(SE_SELECT); - sub_8124D3C((&RDATA->varB8), 0xFFFF); - (&RDATA->varB8)->val3[0xF].field1 = 0x0; - (&RDATA->varB8)->val3[0xE].field1 = 0x0; - (&RDATA->varB8)->val3[0xD].field1 = 0x0; + sub_8124D3C((&eRoulette->varB8), 0xFFFF); + (&eRoulette->varB8)->var04[0xF].var00_7 = 0x0; + (&eRoulette->varB8)->var04[0xE].var00_7 = 0x0; + (&eRoulette->varB8)->var04[0xD].var00_7 = 0x0; sub_8116EF8(gTasks[r0].data[0x4]); for (i = 0; i < 0x4; i++) { - gSprites[RDATA->var3C[i + 0x29]].oam.tileNum = - gSprites[RDATA->var3C[i + 0x29]].sheetTileStart - + (*gSprites[RDATA->var3C[i + 0x29]].anims)->type; + gSprites[eRoulette->var3C[i + 0x29]].oam.tileNum = + gSprites[eRoulette->var3C[i + 0x29]].sheetTileStart + + (*gSprites[eRoulette->var3C[i + 0x29]].anims)->type; } - if ((u16)(gTasks[r0].data[0x4] - 1) < 0x4 && !(RDATA->var08 & gUnknown_083F8C00[gTasks[r0].data[0x4]].var08) ) + if ((u16)(gTasks[r0].data[0x4] - 1) < 0x4 && !(eRoulette->var08 & gUnknown_083F8C00[gTasks[r0].data[0x4]].var08) ) { z = gTasks[r0].data[0x4] - 1; - gSprites[RDATA->var3C[z + 0x29]].oam.tileNum = - gSprites[RDATA->var3C[z + 0x29]].sheetTileStart - + (*gSprites[RDATA->var3C[z + 0x29]].anims + 1)->type; + gSprites[eRoulette->var3C[z + 0x29]].oam.tileNum = + gSprites[eRoulette->var3C[z + 0x29]].sheetTileStart + + (*gSprites[eRoulette->var3C[z + 0x29]].anims + 1)->type; } } } void sub_8115D58(u8 r0) { - RDATA->var28 = 0xFF; - if (RDATA->var19 == 1) - RDATA->var23 = 1; + eRoulette->var28 = 0xFF; + if (eRoulette->var19 == 1) + eRoulette->var23 = 1; else - RDATA->var23 = 0; - RDATA->var21 = 0; + eRoulette->var23 = 0; + eRoulette->var21 = 0; gTasks[r0].data[0x1] = 0x20; gTasks[r0].func = &sub_8115ECC; } void sub_8115DA0(u8 taskid) { - RDATA->var1B[RDATA->var1A_0] = gTasks[taskid].data[0x4]; - gTasks[taskid].data[0x2] = sub_8117380(RDATA->var1B[RDATA->var1A_0]); - sub_811829C(RDATA->var1B[RDATA->var1A_0]); - if ((gTasks[taskid].data[0xD] -= RDATA->var19) < 0) + eRoulette->var1B[eRoulette->var1A_0] = gTasks[taskid].data[0x4]; + gTasks[taskid].data[0x2] = sub_8117380(eRoulette->var1B[eRoulette->var1A_0]); + sub_811829C(eRoulette->var1B[eRoulette->var1A_0]); + if ((gTasks[taskid].data[0xD] -= eRoulette->var19) < 0) gTasks[taskid].data[0xD] = 0; sub_81180F4(gTasks[taskid].data[0xD]); gTasks[taskid].func = &sub_8115D58; @@ -894,7 +908,7 @@ void sub_8115E14(u8 taskid) } if (gMain.newKeys & A_BUTTON) { - if ((RDATA->var08 & gUnknown_083F8C00[gTasks[taskid].data[0x4]].var08)) + if ((eRoulette->var08 & gUnknown_083F8C00[gTasks[taskid].data[0x4]].var08)) PlaySE(SE_BOO); else { @@ -910,8 +924,8 @@ void sub_8115ECC(u8 taskid) { if (gTasks[taskid].data[0x1] > 0x2) gSpriteCoordOffsetX += 0x2; - if ((RDATA->var26 += 0x4) == 0x68) - gSprites[RDATA->var3C[0x19]].callback = &SpriteCallbackDummy; + if ((eRoulette->var26 += 0x4) == 0x68) + gSprites[eRoulette->var3C[0x19]].callback = &SpriteCallbackDummy; } else { @@ -925,7 +939,7 @@ void sub_8115ECC(u8 taskid) u8 sub_8115F58(u16 r0, u16 r1) { u8 timeh; - switch (RDATA->var02) + switch (eRoulette->var02) { case 0x1: // SHROOMISH case 0x2: // TAILLOW @@ -937,19 +951,19 @@ u8 sub_8115F58(u16 r0, u16 r1) return 0x1; else { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02 / 2; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02 / 2; } } else if (!(r1 & 0x3)) { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02 / 2; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02 / 2; } else { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02; } break; case 0x3: @@ -959,8 +973,8 @@ u8 sub_8115F58(u16 r0, u16 r1) { if (r0 < 0x6 || (r1 & 0x1)) { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02 / 2; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02 / 2; } else { @@ -969,13 +983,13 @@ u8 sub_8115F58(u16 r0, u16 r1) } else if ((r1 & 0x1) && !(r0 < 0x7)) { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02 / 4; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02 / 4; } else { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02 / 2; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02 / 2; } break; case 0: @@ -990,40 +1004,40 @@ u8 sub_8115F58(u16 r0, u16 r1) } else { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02 / 2; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02 / 2; } } else if (!(r1 & 0x3)) { if (!(r0 < 0xD)) { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02 / 2; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02 / 2; } else { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02; } } else if (r1 & (0x80 << 8)) { if (!(r0 < 0xD)) { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var02; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var02; } else { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var01; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var01; } } else { - struct Unkg083F8DF4 *p = &gUnknown_083F8DF4[0]; - return p[RDATA->var04_0].var01 * 2; + struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; + return p[eRoulette->var04_0].var01 * 2; } } } @@ -1042,10 +1056,10 @@ void sub_8116100(u8 taskid) memcpy(angles, &gUnknown_083F8ECE, 0x8); rand = Random(); randmod = rand % 0x64; - RDATA->var7C = gTasks[taskid].data[0x6]; - RDATA->var7F = zero; - RDATA->var7E = zero; - RDATA->var7D = zero; + eRoulette->var7C = gTasks[taskid].data[0x6]; + eRoulette->var7F = zero; + eRoulette->var7E = zero; + eRoulette->var7D = zero; randf = sub_8115F58(gTasks[taskid].data[0x8], rand); randfinal = (rand % randf) - (randf / 2); if (gLocalTime.hours < 0xD) @@ -1056,21 +1070,21 @@ void sub_8116100(u8 taskid) r5 *= 2; else r5 = (1 - r5) * 2; - g = (&gUnknown_083F8DF4[RDATA->var04_0])->var1A; - RDATA->var80 = (g + randfinal); + g = (&gUnknown_083F8DF4[eRoulette->var04_0])->var1A; + eRoulette->var80 = (g + randfinal); // g = ((float)(u16)(g + randfinal)) / 5.0f; - RDATA->var82 = g * 3; - RDATA->var84 = g; - RDATA->var86 = g; + eRoulette->var82 = g * 3; + eRoulette->var84 = g; + eRoulette->var86 = g; // - RDATA->var88 = (float)(angles[(rand & 0x1) + r5]); - RDATA->var8C = (float)((&gUnknown_083F8DF4[RDATA->var04_0])->var18); - RDATA->var90 = ((RDATA->var8C * 0.5f) - RDATA->var8C) / (float)(u16)(g * 3); - RDATA->var94 = 68.0f; - RDATA->var9C = 0.0f; - RDATA->var98 = -(8.0f / (float)(u16)(g * 3)); - RDATA->varA0 = 36.0f; + eRoulette->var88 = (float)(angles[(rand & 0x1) + r5]); + eRoulette->var8C = (float)((&gUnknown_083F8DF4[eRoulette->var04_0])->var18); + eRoulette->var90 = ((eRoulette->var8C * 0.5f) - eRoulette->var8C) / (float)(u16)(g * 3); + eRoulette->var94 = 68.0f; + eRoulette->var9C = 0.0f; + eRoulette->var98 = -(8.0f / (float)(u16)(g * 3)); + eRoulette->varA0 = 36.0f; gTasks[taskid].func = &sub_8116308; } #else @@ -1317,9 +1331,9 @@ _08116304: .4byte sub_8116308\n\ void sub_8116308(u8 taskid) { u8 index; - RDATA->var03_7 = 1; - index = RDATA->var3C[RDATA->var7C]; - RDATA->var38 = &gSprites[index]; + eRoulette->var03_7 = 1; + index = eRoulette->var3C[eRoulette->var7C]; + eRoulette->var38 = &gSprites[index]; (&gSprites[index])->callback = &sub_81191F4; gTasks[taskid].data[0x6]++; gTasks[taskid].data[0x8]++; @@ -1330,24 +1344,24 @@ void sub_8116308(u8 taskid) void sub_811637C(u8 taskid) { - if (RDATA->var7D) + if (eRoulette->var7D) { - if (RDATA->var03_5) + if (eRoulette->var03_5) { - if (RDATA->var03_6) + if (eRoulette->var03_6) { - RDATA->var03_6 = FALSE; - RDATA->var03_5 = FALSE; + eRoulette->var03_6 = FALSE; + eRoulette->var03_5 = FALSE; } } else { if (!gTasks[taskid].data[0x1]) { - u8 temp = sub_8116E5C(sub_8116D54(taskid, RDATA->var7E), RDATA->var1B[RDATA->var1A_0]); + u8 temp = sub_8116E5C(sub_8116D54(taskid, eRoulette->var7E), eRoulette->var1B[eRoulette->var1A_0]); gTasks[taskid].data[0x5] = temp; if (temp == 1) - sub_8124CE8((&RDATA->varB8), 0x1000); + sub_8124CE8((&eRoulette->varB8), 0x1000); } if (gTasks[taskid].data[0x1] < 0x3D) { @@ -1357,7 +1371,7 @@ void sub_811637C(u8 taskid) } else { - sub_8117158(RDATA->var1B[RDATA->var1A_0]); + sub_8117158(eRoulette->var1B[eRoulette->var1A_0]); sub_8117AA8(0x0, (u8)gTasks[taskid].data[0xC]); sub_8117C60(0x0, (u8)gTasks[taskid].data[0x6] - 0x1); gTasks[taskid].data[0x1] = 0x20; @@ -1373,8 +1387,8 @@ void sub_8116474(u8 taskid) { if(gTasks[taskid].data[0x1] > 0x2) gSpriteCoordOffsetX -= 0x2; - if((RDATA->var26 -= 0x4) == 0x68) - gSprites[RDATA->var3C[0x19]].callback = &sub_81184CC; + if((eRoulette->var26 -= 0x4) == 0x68) + gSprites[eRoulette->var3C[0x19]].callback = &sub_81184CC; } else { @@ -1494,22 +1508,22 @@ void sub_81166E8(u8 taskid) void sub_811677C(u8 taskid) { - ConvertIntToDecimalStringN((u8 *)&gStringVar1, (RDATA->var19 * gTasks[taskid].data[0x2]), STR_CONV_MODE_LEFT_ALIGN, 0x2); + ConvertIntToDecimalStringN((u8 *)&gStringVar1, (eRoulette->var19 * gTasks[taskid].data[0x2]), STR_CONV_MODE_LEFT_ALIGN, 0x2); StringExpandPlaceholders((u8 *)&gStringVar4, &gUnknown_081C41BD); MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); MenuPrint((u8 *)&gStringVar4, 0x1, 0xF); - gTasks[taskid].data[0x1] = (RDATA->var19 * gTasks[taskid].data[0x2]); + gTasks[taskid].data[0x1] = (eRoulette->var19 * gTasks[taskid].data[0x2]); gTasks[taskid].data[0x7] = 0x0; gTasks[taskid].func = &sub_81166E8; } void sub_81167F4(u8 taskid) { - sub_8124D3C((&RDATA->varB8), 0xFFFF); - (&RDATA->varB8)->val3[0xF].field1 = 0x0; - (&RDATA->varB8)->val3[0xE].field1 = 0x0; - (&RDATA->varB8)->val3[0xD].field1 = 0x0; - gSprites[RDATA->var3C[0x7 + gUnknown_083F8C00[gTasks[taskid].data[0xC]].var00]].invisible = TRUE; + sub_8124D3C((&eRoulette->varB8), 0xFFFF); + (&eRoulette->varB8)->var04[0xF].var00_7 = 0x0; + (&eRoulette->varB8)->var04[0xE].var00_7 = 0x0; + (&eRoulette->varB8)->var04[0xD].var00_7 = 0x0; + gSprites[eRoulette->var3C[0x7 + gUnknown_083F8C00[gTasks[taskid].data[0xC]].var00]].invisible = TRUE; gTasks[taskid].func = &sub_8116880; } @@ -1517,16 +1531,16 @@ void sub_8116880(u8 taskid) { u8 i = 0; gTasks[taskid].data[0x4] = i; - RDATA->var1B[RDATA->var1A_0] = 0x0; + eRoulette->var1B[eRoulette->var1A_0] = 0x0; sub_8117158(0x0); - gSprites[RDATA->var3C[0x30]].invisible = TRUE; + gSprites[eRoulette->var3C[0x30]].invisible = TRUE; for (i = 0; i < 0x4; i++) { - gSprites[RDATA->var3C[i + 0x29]].oam.tileNum = - gSprites[RDATA->var3C[i + 0x29]].sheetTileStart - + (*gSprites[RDATA->var3C[i + 0x29]].anims)->type; + gSprites[eRoulette->var3C[i + 0x29]].oam.tileNum = + gSprites[eRoulette->var3C[i + 0x29]].sheetTileStart + + (*gSprites[eRoulette->var3C[i + 0x29]].anims)->type; } - if (!(gTasks[taskid].data[0xD] < RDATA->var19)) + if (!(gTasks[taskid].data[0xD] < eRoulette->var19)) { if (gTasks[taskid].data[0x6] == 0x6) { @@ -1563,7 +1577,7 @@ void dp01t_12_3_battle_menu(u8 taskid) sub_8117158(0x0); sub_81182F8(0x6); for (i = 0; i < 0xC; i++) - gSprites[RDATA->var3C[i + 0x7]].invisible = FALSE; + gSprites[eRoulette->var3C[i + 0x7]].invisible = FALSE; if (gTasks[taskid].data[0xD] == 0x270F) { MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); @@ -1578,10 +1592,10 @@ void dp01t_12_3_battle_menu(u8 taskid) void sub_8116AB0(u8 taskid) { - sub_8124D3C((&RDATA->varB8), 0xFFFF); - sub_8124918((&RDATA->varB8)); + sub_8124D3C((&eRoulette->varB8), 0xFFFF); + sub_8124918((&eRoulette->varB8)); gSaveBlock1.coins = gTasks[taskid].data[0xD]; - if (gSaveBlock1.coins < RDATA->var19) + if (gSaveBlock1.coins < eRoulette->var19) gSpecialVar_0x8004 = TRUE; else gSpecialVar_0x8004 = FALSE; @@ -1594,7 +1608,7 @@ void sub_8116B40(u8 taskid) // end oulette ? if (UpdatePaletteFade() == 0) { SetVBlankCallback(0x0); - memset(RDATA, 0x0, 0x17C); + memset(eRoulette, 0x0, 0x17C); gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0x0; sub_80F9368(); FreeAllSpritePalettes(); @@ -1612,57 +1626,57 @@ void sub_8116B40(u8 taskid) // end oulette ? void sub_8116BC0(u8 taskid) { - if(RDATA->varA8 == 0 || gMain.newKeys & RDATA->varAA) + if(eRoulette->varA8 == 0 || gMain.newKeys & eRoulette->varAA) { - gTasks[taskid].func = RDATA->varAC; - if (RDATA->varAA > 0) + gTasks[taskid].func = eRoulette->varAC; + if (eRoulette->varAA > 0) PlaySE(SE_SELECT); - RDATA->varAC = NULL; - RDATA->varAA = 0x0; - RDATA->varA8 = 0x0; + eRoulette->varAC = NULL; + eRoulette->varAA = 0x0; + eRoulette->varA8 = 0x0; } - if (RDATA->varA8 != 0xFFFF) - RDATA->varA8--; + if (eRoulette->varA8 != 0xFFFF) + eRoulette->varA8--; } void sub_8116C34(u8 taskid, TaskFunc r1, u16 r2, u16 r3) { - RDATA->varB4 = gTasks[taskid].func; + eRoulette->varB4 = gTasks[taskid].func; if(r1 == NULL) - r1 = RDATA->varB4; - RDATA->varAC = r1; - RDATA->varA8 = r2; + r1 = eRoulette->varB4; + eRoulette->varAC = r1; + eRoulette->varA8 = r2; if (r2 == 0xFFFF && r3 == 0) - RDATA->varAA = 0xFFFF; + eRoulette->varAA = 0xFFFF; else - RDATA->varAA = r3; + eRoulette->varAA = r3; gTasks[taskid].func = &sub_8116BC0; } void sub_8116CAC(u8 taskid) { u8 i = 0; - RDATA->var00 = i; - RDATA->var03_0 = 0x0; - RDATA->var03_5 = 0x0; - RDATA->var03_6 = 0x0; - RDATA->var03_7 = 0x0; + eRoulette->var00 = i; + eRoulette->var03_0 = 0x0; + eRoulette->var03_5 = 0x0; + eRoulette->var03_6 = 0x0; + eRoulette->var03_7 = 0x0; for (i = 0; i < 0x6; i++) - RDATA->var1B[i] = 0x0; - RDATA->var1A_0 = 0x0; + eRoulette->var1B[i] = 0x0; + eRoulette->var1A_0 = 0x0; gTasks[taskid].data[0x1] = 0x0; } void sub_8116CF8(void) { u8 i; - RDATA->var08 = 0x0; + eRoulette->var08 = 0x0; for (i = 0; i < 0x6; i++) - RDATA->var0C[i] = 0x0; + eRoulette->var0C[i] = 0x0; for (i = 0; i < 0x4; i++) - RDATA->var12[i] = 0x0; + eRoulette->var12[i] = 0x0; for (i = 0; i < 0x3; i++) - RDATA->var16[i] = 0x0; + eRoulette->var16[i] = 0x0; sub_8117C60(0x1, 0xFF); } @@ -1680,22 +1694,22 @@ u8 sub_8116D54(u8 taskid, u8 r1) { u8 i; u8 z; - RDATA->var0C[gTasks[taskid].data[0x6] - 1] = gUnknown_083F8D90[r1].var02; + eRoulette->var0C[gTasks[taskid].data[0x6] - 1] = gUnknown_083F8D90[r1].var02; gTasks[taskid].data[0xC] = gUnknown_083F8D90[r1].var02; - RDATA->var08 |= gUnknown_083F8D90[r1].var04; + eRoulette->var08 |= gUnknown_083F8D90[r1].var04; for (i = 0; i < 0x4; i++) { if (gUnknown_083F8D90[r1].var04 & t0[i]) - RDATA->var12[i]++; - if (RDATA->var12[i] > 0x2) - RDATA->var08 |= t0[i]; + eRoulette->var12[i]++; + if (eRoulette->var12[i] > 0x2) + eRoulette->var08 |= t0[i]; } for (z = 0; z < 0x3; z++) { if (gUnknown_083F8D90[r1].var04 & t1[z]) - RDATA->var16[z]++; - if (RDATA->var16[z] > 0x3) - RDATA->var08 |= t1[z]; + eRoulette->var16[z]++; + if (eRoulette->var16[z] > 0x3) + eRoulette->var08 |= t1[z]; } return gUnknown_083F8D90[r1].var02; } @@ -1745,10 +1759,10 @@ void sub_8116EF8(u8 r0) case 0xA: case 0xF: for (i = (r0 + 0x1); i < (r0 + 0x5); i++) - if (!(RDATA->var08 & gUnknown_083F8C00[i].var08)) + if (!(eRoulette->var08 & gUnknown_083F8C00[i].var08)) var0 |= gUnknown_083F8C00[i].var10; var0 &= 0xDFFF; - sub_8124CE8(&RDATA->varB8, var0); + sub_8124CE8(&eRoulette->varB8, var0); break; default: memcpy(var1, gUnknown_083F8E9C, 0x18); @@ -1760,26 +1774,26 @@ void sub_8116EF8(u8 r0) switch((u8)r0 % 0x5) { case 0x1: - var3 = gSprites[RDATA->var3C[0x7 + 0x0]].oam.paletteNum * 0x10; + var3 = gSprites[eRoulette->var3C[0x7 + 0x0]].oam.paletteNum * 0x10; break; case 0x2: - var3 = gSprites[RDATA->var3C[0x7 + 0x1]].oam.paletteNum * 0x10; + var3 = gSprites[eRoulette->var3C[0x7 + 0x1]].oam.paletteNum * 0x10; break; case 0x3: - var3 = gSprites[RDATA->var3C[0x7 + 0x2]].oam.paletteNum * 0x10; + var3 = gSprites[eRoulette->var3C[0x7 + 0x2]].oam.paletteNum * 0x10; break; case 0x4: - var3 = gSprites[RDATA->var3C[0x7 + 0x3]].oam.paletteNum * 0x10; + var3 = gSprites[eRoulette->var3C[0x7 + 0x3]].oam.paletteNum * 0x10; break; } if (var2 == 0x1) { - if (!(RDATA->var08 & gUnknown_083F8C00[r0].var08)) + if (!(eRoulette->var08 & gUnknown_083F8C00[r0].var08)) { var4 = (r0 / 0x5); - var1[var4 - 0x1].val1 += var3; - sub_812492C(&RDATA->varB8, 0xD, &var1[var4 - 0x2]); - sub_8124CE8(&RDATA->varB8, var0 |= gUnknown_083F8C00[r0].var10); + var1[var4 - 0x1].var02 += var3; + sub_812492C(&eRoulette->varB8, 0xD, &var1[var4 - 0x2]); + sub_8124CE8(&eRoulette->varB8, var0 |= gUnknown_083F8C00[r0].var10); } } else @@ -1787,11 +1801,11 @@ void sub_8116EF8(u8 r0) for (i = 0; i < 0x3; i++) { u8 var4 = i * 0x5 + r0 + 0x5; - if (!(RDATA->var08 & gUnknown_083F8C00[var4].var08)) + if (!(eRoulette->var08 & gUnknown_083F8C00[var4].var08)) { u8 var5 = (var4 / 0x5); - var1[var5 - 0x1].val1 += var3; - sub_812492C(&RDATA->varB8, (u8)(0xD + i), &var1[var5 - 0x2]); + var1[var5 - 0x1].var02 += var3; + sub_812492C(&eRoulette->varB8, (u8)(0xD + i), &var1[var5 - 0x2]); if (var2 == 0x3) var0 = gUnknown_083F8C00[var4].var10; var2--; @@ -1799,7 +1813,7 @@ void sub_8116EF8(u8 r0) } if (var2 != 0x2) var0 = 0x0; - sub_8124CE8(&RDATA->varB8, var0 |= gUnknown_083F8C00[r0].var10); + sub_8124CE8(&eRoulette->varB8, var0 |= gUnknown_083F8C00[r0].var10); } } } @@ -2124,7 +2138,7 @@ void sub_8117158(u8 r0) u8 var0; u8 var1; u16 var2; - RDATA->var2A = 0x1; + eRoulette->var2A = 0x1; sub_8117AA8(0x0, 0x0); sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18800, 0xE, 0x7, 0x10, 0xD); switch(r0) @@ -2448,16 +2462,16 @@ u8 sub_8117380(u8 r0) { case 0x3: z = r0 / 0x5 - 0x1; - if (RDATA->var16[z] > 0x3) + if (eRoulette->var16[z] > 0x3) return 0x0; - return var0[RDATA->var16[z] + 0x1]; + return var0[eRoulette->var16[z] + 0x1]; case 0x4: t = r0 - 0x1; - if (RDATA->var12[t] > 0x2) + if (eRoulette->var12[t] > 0x2) return 0x0; - return var0[RDATA->var12[t] + 0x2]; + return var0[eRoulette->var12[t] + 0x2]; case 0xC: - if (RDATA->var08 & gUnknown_083F8C00[r0].var08) + if (eRoulette->var08 & gUnknown_083F8C00[r0].var08) return 0x0; return var0[0x4]; default: @@ -2565,99 +2579,23 @@ bx r1\n\ } #endif -#ifdef NONMATCHING -void sub_8117434(void) //sprite rotation ? +void sub_8117434(void) { s32 x1; s32 x2; - REG_BG2PA = RDATA->var2C.a; - REG_BG2PB = RDATA->var2C.b; - REG_BG2PC = RDATA->var2C.c; - REG_BG2PD = RDATA->var2C.d; - x1 = 0x7400 - RDATA->var2C.a * (gSpriteCoordOffsetX + 0x74) - - RDATA->var2C.b * (gSpriteCoordOffsetY + 0x50); - x2 = 0x5400 - RDATA->var2C.c * gSpriteCoordOffsetX - - RDATA->var2C.d * gSpriteCoordOffsetY; + REG_BG2PA = eRoulette->var2C.a; + REG_BG2PB = eRoulette->var2C.b; + REG_BG2PC = eRoulette->var2C.c; + REG_BG2PD = eRoulette->var2C.d; + x1 = 0x7400 - eRoulette->var2C.a * (gSpriteCoordOffsetX + 0x74) + - eRoulette->var2C.b * (gSpriteCoordOffsetY + 0x50); + x2 = 0x5400 - eRoulette->var2C.c * (gSpriteCoordOffsetX + 0x74) + - eRoulette->var2C.d * (gSpriteCoordOffsetY + 0x50); REG_BG2X_L = x1; REG_BG2X_H = (x1 & 0x0fff0000) >> 16; REG_BG2Y_L = x2; REG_BG2Y_H = (x2 & 0x0fff0000) >> 16; } -#else -__attribute__((naked)) -void sub_8117434(void) -{ -asm(".syntax unified\n\ -push {r4-r6,lr}\n\ -ldr r1, _081174AC @ =REG_BG2PA\n\ -ldr r4, _081174B0 @ =0x02019000\n\ -ldrh r0, [r4, 0x2C]\n\ -strh r0, [r1]\n\ -adds r1, 0x2\n\ -ldrh r0, [r4, 0x2E]\n\ -strh r0, [r1]\n\ -adds r1, 0x2\n\ -ldrh r0, [r4, 0x30]\n\ -strh r0, [r1]\n\ -adds r1, 0x2\n\ -ldrh r0, [r4, 0x32]\n\ -strh r0, [r1]\n\ -movs r0, 0x2E\n\ -ldrsh r2, [r4, r0]\n\ -ldr r0, _081174B4 @ =gSpriteCoordOffsetY\n\ -movs r3, 0\n\ -ldrsh r1, [r0, r3]\n\ -adds r1, 0x50\n\ -adds r0, r2, 0\n\ -muls r0, r1\n\ -movs r2, 0xE8\n\ -lsls r2, 7\n\ -subs r2, r0\n\ -movs r6, 0x2C\n\ -ldrsh r5, [r4, r6]\n\ -ldr r0, _081174B8 @ =gSpriteCoordOffsetX\n\ -movs r6, 0\n\ -ldrsh r3, [r0, r6]\n\ -adds r3, 0x74\n\ -adds r0, r5, 0\n\ -muls r0, r3\n\ -subs r2, r0\n\ -movs r5, 0x32\n\ -ldrsh r0, [r4, r5]\n\ -muls r0, r1\n\ -movs r1, 0xA8\n\ -lsls r1, 7\n\ -subs r1, r0\n\ -movs r6, 0x30\n\ -ldrsh r0, [r4, r6]\n\ -muls r0, r3\n\ -subs r1, r0\n\ -ldr r0, _081174BC @ =REG_BG2X_L\n\ -strh r2, [r0]\n\ -adds r0, 0x2\n\ -ldr r3, _081174C0 @ =0x0fff0000\n\ -ands r2, r3\n\ -asrs r2, 16\n\ -strh r2, [r0]\n\ -adds r0, 0x2\n\ -strh r1, [r0]\n\ -adds r0, 0x2\n\ -ands r1, r3\n\ -asrs r1, 16\n\ -strh r1, [r0]\n\ -pop {r4-r6}\n\ -pop {r0}\n\ -bx r0\n\ -.align 2, 0\n\ -_081174AC: .4byte REG_BG2PA\n\ -_081174B0: .4byte 0x02019000\n\ -_081174B4: .4byte gSpriteCoordOffsetY\n\ -_081174B8: .4byte gSpriteCoordOffsetX\n\ -_081174BC: .4byte REG_BG2X_L\n\ -_081174C0: .4byte 0x0fff0000\n\ -.syntax divided\n"); -} -#endif s16 sub_81174C4(s16 r0, s16 r1) { @@ -2763,7 +2701,7 @@ void Task_Roulette_0(u8 taskid) } } -void PlayRoulette() +void PlayRoulette(void) { u8 taskid; ScriptContext2_Enable(); @@ -2823,7 +2761,7 @@ void sub_8117900(void) u8 o = i * 0x18; for (j = 0; j < 0x4; j++) { - spriteid = RDATA->var3C[0x1D + i * 0x4 + j] = + spriteid = eRoulette->var3C[0x1D + i * 0x4 + j] = CreateSprite(&gSpriteTemplate_83FA07C[j], j * 0x18 + 0x94, o + 0x5C, 0x1E); gSprites[spriteid].animPaused = TRUE; o += 0x18; @@ -2833,13 +2771,13 @@ void sub_8117900(void) } for (i = 0x0; i < 0x4; i++) { - spriteid = RDATA->var3C[0x29 + i] = + spriteid = eRoulette->var3C[0x29 + i] = CreateSprite(&gSpriteTemplate_83F9FD4[i], (s16)(i * 0x18 + 0x94), 0x46, 0x1E); gSprites[spriteid].animPaused = TRUE; } for (i = 0x0; i < 0x3; i++) { - spriteid = RDATA->var3C[0x2D + i] = + spriteid = eRoulette->var3C[0x2D + i] = CreateSprite(&gSpriteTemplate_83FA034[i], 0x7E, (s16)(i * 0x18 + 0x5C), 0x1E); gSprites[spriteid].animPaused = TRUE; } @@ -2849,7 +2787,7 @@ void unref_sub_8117A74(void) //destroy all sprites at 0x1D { u8 i; for (i = 0x0; i < 0xC; i++) - DestroySprite(&gSprites[RDATA->var3C[0x1D + i]]); + DestroySprite(&gSprites[eRoulette->var3C[0x1D + i]]); } void sub_8117AA8(u8 r0, u8 r1) @@ -2859,20 +2797,20 @@ void sub_8117AA8(u8 r0, u8 r1) { case 0x1: for (i = 0x0; i < 0x13; i++) - gSprites[RDATA->var3C[0x1D + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x1D + i]].invisible = TRUE; break; case 0x0: for (i = 0x0; i < 0xC; i++) { - if (!(RDATA->var08 & gUnknown_083F8D90[i].var04)) - gSprites[RDATA->var3C[0x1D + i]].invisible = FALSE; + if (!(eRoulette->var08 & gUnknown_083F8D90[i].var04)) + gSprites[eRoulette->var3C[0x1D + i]].invisible = FALSE; else if(!(gUnknown_083F8D90[i].var02 == r1)) - gSprites[RDATA->var3C[0x1D + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x1D + i]].invisible = TRUE; else - gSprites[RDATA->var3C[0x1D + i]].invisible = FALSE; + gSprites[eRoulette->var3C[0x1D + i]].invisible = FALSE; } for ( ; i < 0x13; i++) - gSprites[RDATA->var3C[0x1D + i]].invisible = FALSE; + gSprites[eRoulette->var3C[0x1D + i]].invisible = FALSE; break; } } @@ -2882,12 +2820,12 @@ void sub_8117BBC(void) u8 i; for (i = 0x0; i < 0x6; i++) { - RDATA->var3C[0x31 + i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x14, 0xA); - gSprites[RDATA->var3C[0x31 + i]].invisible = TRUE; - gSprites[RDATA->var3C[0x31 + i]].data[0] = 0x1; - gSprites[RDATA->var3C[0x31 + i]].callback = &sub_81184CC; - gSprites[RDATA->var3C[0x31 + i]].oam.priority = 0x1; - StartSpriteAnim(&gSprites[RDATA->var3C[0x31 + i]], 0x8); + eRoulette->var3C[0x31 + i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x14, 0xA); + gSprites[eRoulette->var3C[0x31 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x31 + i]].data[0] = 0x1; + gSprites[eRoulette->var3C[0x31 + i]].callback = &sub_81184CC; + gSprites[eRoulette->var3C[0x31 + i]].oam.priority = 0x1; + StartSpriteAnim(&gSprites[eRoulette->var3C[0x31 + i]], 0x8); } } @@ -2897,21 +2835,21 @@ void sub_8117C60(u8 r0, u8 r1) if (r0) { for ( ; i < 0x6; i++) - gSprites[RDATA->var3C[0x31 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x31 + i]].invisible = TRUE; } else { for ( ; i < 0x6; i++) { - if (!(RDATA->var0C[i]) || (i == r1)) + if (!(eRoulette->var0C[i]) || (i == r1)) { - gSprites[RDATA->var3C[0x31 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x31 + i]].invisible = TRUE; } else { - gSprites[RDATA->var3C[0x31 + i]].invisible = FALSE; - gSprites[RDATA->var3C[0x31 + i]].pos1.x = (gUnknown_083F8C00[RDATA->var0C[i]].var03 + 0x1) * 0x8 + 0x4; - gSprites[RDATA->var3C[0x31 + i]].pos1.y = (gUnknown_083F8C00[RDATA->var0C[i]].var04 + 0x1) * 0x8 + 0x3; + gSprites[eRoulette->var3C[0x31 + i]].invisible = FALSE; + gSprites[eRoulette->var3C[0x31 + i]].pos1.x = (gUnknown_083F8C00[eRoulette->var0C[i]].var03 + 0x1) * 0x8 + 0x4; + gSprites[eRoulette->var3C[0x31 + i]].pos1.y = (gUnknown_083F8C00[eRoulette->var0C[i]].var04 + 0x1) * 0x8 + 0x3; } } } @@ -2921,13 +2859,13 @@ void sub_8117D68(u8 r0) { if (!r0) { - gSprites[RDATA->var3C[0x30]].invisible = TRUE; + gSprites[eRoulette->var3C[0x30]].invisible = TRUE; } else { - gSprites[RDATA->var3C[0x30]].invisible = FALSE; - gSprites[RDATA->var3C[0x30]].pos1.x = (gUnknown_083F8C00[r0].var03 + 0x2) * 0x8; - gSprites[RDATA->var3C[0x30]].pos1.y = (gUnknown_083F8C00[r0].var04 + 0x2) * 0x8; + gSprites[eRoulette->var3C[0x30]].invisible = FALSE; + gSprites[eRoulette->var3C[0x30]].pos1.x = (gUnknown_083F8C00[r0].var03 + 0x2) * 0x8; + gSprites[eRoulette->var3C[0x30]].pos1.y = (gUnknown_083F8C00[r0].var04 + 0x2) * 0x8; } } @@ -2948,7 +2886,7 @@ void sub_8117DF4(void) { u8 spriteid; spriteid = - RDATA->var3C[0x7 + i * 0x4 + j] = sub_8117890(&gSpriteTemplate_83FA0DC[i * 0x4 + j], 0x28, &k); + eRoulette->var3C[0x7 + i * 0x4 + j] = sub_8117890(&gSpriteTemplate_83FA0DC[i * 0x4 + j], 0x28, &k); gSprites[spriteid].animPaused = TRUE; gSprites[spriteid].affineAnimPaused = TRUE; } @@ -2963,14 +2901,14 @@ void sub_8117E98(struct Sprite *sprite) u16 angle; s16 cos, sin, z; u32 cos32; - angle = RDATA->var24 + sprite->data0; + angle = eRoulette->var24 + sprite->data[0x0]; z = angle; if (z > 359) angle = z - 360; sin = Sin2(angle); cos = Cos2(angle); - sprite->pos2.x = sin * sprite->data1 >> 0xC; - sprite->pos2.y = -cos * sprite->data1 >> 0xC; + sprite->pos2.x = sin * sprite->data[0x1] >> 0xC; + sprite->pos2.y = -cos * sprite->data[0x1] >> 0xC; p = sprite->oam.matrixNum; sin = sin / 0x10; m = &gOamMatrices[p]; @@ -3073,26 +3011,26 @@ void sub_8117F2C(void) s.tag = gUnknown_083FA21C[i].tag; LoadSpriteSheet(&s); } - RDATA->var3C[0x14] = CreateSprite(&gSpriteTemplate_83FA2B0, 0xD0, 0x10, 0x4); - gSprites[RDATA->var3C[0x14]].animPaused = TRUE; + eRoulette->var3C[0x14] = CreateSprite(&gSpriteTemplate_83FA2B0, 0xD0, 0x10, 0x4); + gSprites[eRoulette->var3C[0x14]].animPaused = TRUE; for (i = 0x0; i < 0x4; i++) { - RDATA->var3C[0x15 + i] = CreateSprite(&gSpriteTemplate_83FA2C8, (s16)(i * 0x8 + 0xC4), 0x18, 0x0); - gSprites[RDATA->var3C[0x15 + i]].invisible = TRUE; - gSprites[RDATA->var3C[0x15 + i]].animPaused = TRUE; + eRoulette->var3C[0x15 + i] = CreateSprite(&gSpriteTemplate_83FA2C8, (s16)(i * 0x8 + 0xC4), 0x18, 0x0); + gSprites[eRoulette->var3C[0x15 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x15 + i]].animPaused = TRUE; } - RDATA->var3C[0x19] = CreateSprite(&gSpriteTemplate_83FA2E0, 0x78, 0x44, 0x4); - gSprites[RDATA->var3C[0x19]].animPaused = TRUE; + eRoulette->var3C[0x19] = CreateSprite(&gSpriteTemplate_83FA2E0, 0x78, 0x44, 0x4); + gSprites[eRoulette->var3C[0x19]].animPaused = TRUE; for (i = 0x0; i < 0x3; i++) { - RDATA->var3C[0x1A + i] = CreateSprite(&gSpriteTemplate_83FA2F8, (s16)(i * 0x10 + 0xC0), 0x24, 0x4); - gSprites[RDATA->var3C[0x1A + i]].invisible = TRUE; - gSprites[RDATA->var3C[0x1A + i]].animPaused = TRUE; + eRoulette->var3C[0x1A + i] = CreateSprite(&gSpriteTemplate_83FA2F8, (s16)(i * 0x10 + 0xC0), 0x24, 0x4); + gSprites[eRoulette->var3C[0x1A + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x1A + i]].animPaused = TRUE; } - RDATA->var3C[0x30] = CreateSprite(&gSpriteTemplate_83FA310, 0x98, 0x60, 0x9); - gSprites[RDATA->var3C[0x30]].oam.priority = 0x1; - gSprites[RDATA->var3C[0x30]].animPaused = TRUE; - gSprites[RDATA->var3C[0x30]].invisible = TRUE; + eRoulette->var3C[0x30] = CreateSprite(&gSpriteTemplate_83FA310, 0x98, 0x60, 0x9); + gSprites[eRoulette->var3C[0x30]].oam.priority = 0x1; + gSprites[eRoulette->var3C[0x30]].animPaused = TRUE; + gSprites[eRoulette->var3C[0x30]].invisible = TRUE; } void sub_81180F4(u16 r0) @@ -3103,13 +3041,13 @@ void sub_81180F4(u16 r0) for (i = 0x0; i < 0x4; i++) { u8 t = r0 / d; - gSprites[RDATA->var3C[0x15 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x15 + i]].invisible = TRUE; if (t > 0x0 || v || i == 0x3) { - gSprites[RDATA->var3C[0x15 + i]].invisible = FALSE; - gSprites[RDATA->var3C[0x15 + i]].oam.tileNum = - gSprites[RDATA->var3C[0x15 + i]].sheetTileStart - + (*gSprites[RDATA->var3C[0x15 + i]].anims + t)->type; + gSprites[eRoulette->var3C[0x15 + i]].invisible = FALSE; + gSprites[eRoulette->var3C[0x15 + i]].oam.tileNum = + gSprites[eRoulette->var3C[0x15 + i]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x15 + i]].anims + t)->type; v = TRUE; } r0 = r0 % d; @@ -3128,16 +3066,16 @@ u8 sub_81181E8(u8 r0) { case 0x3: r0 = r0 / 0x5 - 0x1; - if ((u32)RDATA->var16[r0] < 0x4) - return t[0x1 + RDATA->var16[r0]]; // couldn't recreate redundant loads + if ((u32)eRoulette->var16[r0] < 0x4) + return t[0x1 + eRoulette->var16[r0]]; // couldn't recreate redundant loads break; case 0x4: r0 = r0 - 0x1; - if (RDATA->var12[r0] < 0x3) - return t[0x2 + RDATA->var12[r0]]; + if (eRoulette->var12[r0] < 0x3) + return t[0x2 + eRoulette->var12[r0]]; break; case 0xC: - if (!(RDATA->var08 & gUnknown_083F8C00[r0].var08)) + if (!(eRoulette->var08 & gUnknown_083F8C00[r0].var08)) return t[0x4]; break; } @@ -3246,7 +3184,7 @@ bx r1\n\ void sub_811829C(u8 r0) { - struct Sprite *s = &gSprites[RDATA->var3C[0x19]]; + struct Sprite *s = &gSprites[eRoulette->var3C[0x19]]; s->animCmdIndex = sub_81181E8(r0); s->oam.tileNum = s->sheetTileStart @@ -3257,58 +3195,58 @@ void sub_81182F8(u8 r0) { u8 i; u8 t = 0x0; - if (RDATA->var19 == 0x1) + if (eRoulette->var19 == 0x1) t = 0x2; switch(r0) { case 0x6: for (i = 0x0; i < 0x3; i++) { - gSprites[RDATA->var3C[0x1A + i]].invisible = FALSE; - gSprites[RDATA->var3C[0x1A + i]].oam.tileNum = - gSprites[RDATA->var3C[0x1A + i]].sheetTileStart - + (*gSprites[RDATA->var3C[0x1A + i]].anims)->type; + gSprites[eRoulette->var3C[0x1A + i]].invisible = FALSE; + gSprites[eRoulette->var3C[0x1A + i]].oam.tileNum = + gSprites[eRoulette->var3C[0x1A + i]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x1A + i]].anims)->type; } break; case 0x5: - gSprites[RDATA->var3C[0x1C]].oam.tileNum = - gSprites[RDATA->var3C[0x1C]].sheetTileStart - + (*gSprites[RDATA->var3C[0x1C]].anims + t + 0x1)->type; + gSprites[eRoulette->var3C[0x1C]].oam.tileNum = + gSprites[eRoulette->var3C[0x1C]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x1C]].anims + t + 0x1)->type; break; case 0x4: - gSprites[RDATA->var3C[0x1C]].oam.tileNum = - gSprites[RDATA->var3C[0x1C]].sheetTileStart - + (*gSprites[RDATA->var3C[0x1C]].anims + t + 0x2)->type; + gSprites[eRoulette->var3C[0x1C]].oam.tileNum = + gSprites[eRoulette->var3C[0x1C]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x1C]].anims + t + 0x2)->type; break; case 0x3: - gSprites[RDATA->var3C[0x1B]].oam.tileNum = - gSprites[RDATA->var3C[0x1B]].sheetTileStart - + (*gSprites[RDATA->var3C[0x1B]].anims + t + 0x1)->type; + gSprites[eRoulette->var3C[0x1B]].oam.tileNum = + gSprites[eRoulette->var3C[0x1B]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x1B]].anims + t + 0x1)->type; break; case 0x2: - gSprites[RDATA->var3C[0x1B]].oam.tileNum = - gSprites[RDATA->var3C[0x1B]].sheetTileStart - + (*gSprites[RDATA->var3C[0x1B]].anims + t + 0x2)->type; + gSprites[eRoulette->var3C[0x1B]].oam.tileNum = + gSprites[eRoulette->var3C[0x1B]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x1B]].anims + t + 0x2)->type; break; case 0x1: - gSprites[RDATA->var3C[0x1A]].oam.tileNum = - gSprites[RDATA->var3C[0x1A]].sheetTileStart - + (*gSprites[RDATA->var3C[0x1A]].anims + t + 0x1)->type; + gSprites[eRoulette->var3C[0x1A]].oam.tileNum = + gSprites[eRoulette->var3C[0x1A]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x1A]].anims + t + 0x1)->type; break; case 0x0: default: for (i = 0x0; i < 0x3; i++) { - gSprites[RDATA->var3C[0x1A + i]].oam.tileNum = - gSprites[RDATA->var3C[0x1A + i]].sheetTileStart - + (*gSprites[RDATA->var3C[0x1A + i]].anims + t + 2)->type; + gSprites[eRoulette->var3C[0x1A + i]].oam.tileNum = + gSprites[eRoulette->var3C[0x1A + i]].sheetTileStart + + (*gSprites[eRoulette->var3C[0x1A + i]].anims + t + 2)->type; } } } void sub_81184CC(struct Sprite *sprite) { - sprite->pos2.x = RDATA->var26; + sprite->pos2.x = eRoulette->var26; } void sub_81184D8(void) @@ -3321,7 +3259,7 @@ void sub_81184D8(void) s.tag = gUnknown_083FA42C.tag; LoadSpriteSheet(&s); spriteid = CreateSprite(&gSpriteTemplate_83FA434, 0x74, 0x50, 0x51); - gSprites[spriteid].data[0] = RDATA->var24; + gSprites[spriteid].data[0] = eRoulette->var24; gSprites[spriteid].data[1] = 0x0; gSprites[spriteid].animPaused = TRUE; gSprites[spriteid].affineAnimPaused = TRUE; @@ -3332,252 +3270,1284 @@ void sub_8118554(struct Sprite *sprite) { u32 t = sprite->oam.matrixNum; struct OamMatrix *m = &gOamMatrices[0]; - m[t].d = RDATA->var2C.a; - m[t].a = RDATA->var2C.a; - m[t].b = RDATA->var2C.b; - m[t].c = RDATA->var2C.c; + m[t].d = eRoulette->var2C.a; + m[t].a = eRoulette->var2C.a; + m[t].b = eRoulette->var2C.b; + m[t].c = eRoulette->var2C.c; +} + +void sub_811857C(void) +{ + u8 i; + for (i = 0x0; i < 0x6; i++) + { + u8 spriteid = + eRoulette->var3C[i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x50, 0x39 - i); + if (spriteid != 0x40) + { + gSprites[eRoulette->var3C[i]].invisible = TRUE; + gSprites[eRoulette->var3C[i]].coordOffsetEnabled = TRUE; + } + } +} + +void sub_81185E8(void) +{ + u8 t = eRoulette->var3C[0x0]; + u8 i; + for (i = 0x0; i < 0x6; i++) + { + u8 j; + gSprites[t].invisible = TRUE; + gSprites[t].callback = &SpriteCallbackDummy; + StartSpriteAnim(&gSprites[t], 0x0); + for (j = 0x0; j < 0x8; j++) + gSprites[t].data[j] = 0x0; + t++; + } +} + +s16 sub_811866C(struct Sprite *sprite) +{ + if (eRoulette->var24 > sprite->data[0x3]) + { + sprite->data[0x6] = 360 - eRoulette->var24 + sprite->data[0x3]; + if (sprite->data[0x6] > 359) + sprite->data[0x6] -=360; + } + else + sprite->data[0x6] = sprite->data[0x3] - eRoulette->var24; + return sprite->data[0x6]; +} + +u8 sub_81186B8(struct Sprite *sprite) +{ + eRoulette->var7E = (u8)(((float)(s16)sub_811866C(sprite)) / 30.0f); + return eRoulette->var7E; +} + +s16 sub_81186E8(struct Sprite *sprite) +{ + s16 t = sub_811866C(sprite) % 30; + u16 z; + if (t == 0xE) + { + z = 0x0; + return sprite->data[0x2] = z; + } + else if (t > 0xD) + { + z = (u16)(0x2B - t); + return sprite->data[0x2] = z; + } + else + { + z = (u16)(0xE - t); + return sprite->data[0x2] = z; + } +} + +void sub_8118724(struct Sprite *sprite) +{ + s16 sin, cos; + eRoulette->var8C += eRoulette->var90; + eRoulette->var88 += eRoulette->var8C; + if (eRoulette->var88 >= 360) + eRoulette->var88 -= 360.0f; + else + if (eRoulette->var88 < 0.0f) + eRoulette->var88 += 360.0f; + sprite->data[0x3] = eRoulette->var88; + eRoulette->var98 += eRoulette->var9C; + eRoulette->var94 += eRoulette->var98; + sprite->data[0x4] = eRoulette->var94; + sin = Sin2(sprite->data[0x3]); + cos = Cos2(sprite->data[0x3]); + sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; + sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; + if (IsSEPlaying()) + { + m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, sprite->pos2.x); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, sprite->pos2.x); + } +} + +void sub_8118834(struct Sprite *sprite) +{ + s16 sin, cos; + sprite->data[0x3] = eRoulette->var24 + sprite->data[0x6]; + if (sprite->data[0x3] > 359) + sprite->data[0x3] -= 360; + sin = Sin2(sprite->data[0x3]); + cos = Cos2(sprite->data[0x3]); + sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; + sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; + sprite->pos2.y += gSpriteCoordOffsetY; +} + +void sub_811889C(struct Sprite *sprite) +{ + sub_8118724(sprite); + sprite->data[0x2]++; + if ((u16)(sprite->data[0x4] + 0x84) > 0xD4) + sprite->invisible = TRUE; + else + sprite->invisible = FALSE; + if (!(sprite->data[0x2] < 30)) + { + if (!sprite->data[0x0]) + { + if (eRoulette->var94 <= eRoulette->varA0 - 2.0f) + { + eRoulette->var7D = 0xFF; + eRoulette->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + eRoulette->var9C = eRoulette->var98 = 0.0f; + eRoulette->var8C = -1.0f; + } + } + else + { + if (eRoulette->var94 >= eRoulette->varA0 - 2.0f) + { + eRoulette->var7D = 0xFF; + eRoulette->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + eRoulette->var9C = eRoulette->var98 = 0.0f; + eRoulette->var8C = -1.0f; + } + } + } +} + +void sub_81189A8(struct Sprite *sprite) +{ + float f0, f1, f2; + struct StructgUnknown_083F8DF4 *p; + sub_8118724(sprite); + switch(sprite->data[0x3]) + { + case 0: + if (sprite->data[0x0] != 0x1) + { + f0 = ((float)sprite->data[0x7]); + p = &gUnknown_083F8DF4[0]; + f1 = (f0 * ((float)(s32)p[eRoulette->var04_0].var01) + (float)((s32)p[eRoulette->var04_0].var02 - 0x1)); + f2 = (f0 / ((float)(s32)p[eRoulette->var04_0].var0C)); + } + else + { + return; + } + break; + case 180: + if (sprite->data[0x0] != 0x0) + { + f0 = ((float)sprite->data[0x7]); + p = &gUnknown_083F8DF4[0]; + f1 = (f0 * ((float)(s32)p[eRoulette->var04_0].var01) + (float)((s32)p[eRoulette->var04_0].var02 - 0x1)); + f2 = -(f0 / ((float)(s32)p[eRoulette->var04_0].var0C)); + } + else + { + return; + } + break; + default: return; + } + eRoulette->varA0 = eRoulette->var94; + eRoulette->var98 = f2; + eRoulette->var9C = -((f2 + f2) / f1 + (2.0f / (f1 * f1))); + eRoulette->var8C = 0.0f; + sprite->animPaused = FALSE; + sprite->animNum = 0x0; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; + sprite->callback = &sub_811889C; + sprite->data[0x2] = 0x0; +} + +void sub_8118B30(struct Sprite *sprite) +{ + sprite->pos2.y = (s32)(((float)sprite->data[0x2]) * 0.05f * ((float)sprite->data[0x2])) - 45; + sprite->data[0x2]++; + if (sprite->data[0x2] > 29 && sprite->pos2.y >= 0) + { + eRoulette->var7D = 0xFF; + eRoulette->var03_7 = FALSE; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + eRoulette->var03_6 = TRUE; + } +} + +void sub_8118BD8(struct Sprite *sprite) +{ + if (sprite->data[0x2]++ < 45) + { + sprite->pos2.y--; + if(sprite->data[0x2] == 45) + { + if (gSprites[eRoulette->var3C[0x37]].animCmdIndex == 0x1) + sprite->pos2.y++; + } + } + else + { + if (sprite->data[0x2] < sprite->data[0x7]) + { + if (gSprites[eRoulette->var3C[0x37]].animDelayCounter == 0x0) + { + if (gSprites[eRoulette->var3C[0x37]].animCmdIndex == 0x1) + sprite->pos2.y++; + else + sprite->pos2.y--; + } + } + else + { + sprite->animPaused = FALSE; + sprite->animNum = 0x1; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; + sprite->data[0x2] = 0x0; + sprite->callback = &sub_8118B30; + m4aSongNumStart(0x3D); + } + } +} + +void sub_8118CAC(struct Sprite *sprite) +{ + sub_8118724(sprite); + switch(sprite->data[0x3]) + { + case 90: + if (sprite->data[0x0] != 0x1) + { + sprite->callback = &sub_8118BD8; + sprite->data[0x2] = 0x0; + } + break; + case 270: + if (sprite->data[0x0] != 0x0) + { + sprite->callback = &sub_8118BD8; + sprite->data[0x2] = 0x0; + } + break; + } +} + +void sub_8118CEC(struct Sprite *sprite) +{ + sub_8118724(sprite); + switch(eRoulette->var03_0) + { + default: + case 0x0: + sub_8119224(sprite); + sprite->callback = &sub_81189A8; + break; + case 0x1: + sub_81193D4(sprite); + sprite->callback = &sub_8118CAC; + break; + } +} + +void sub_8118D2C(struct Sprite *sprite) +{ + sub_8118724(sprite); + if (sprite->data[0x2]-- == 0x10) + eRoulette->var98 *= -1.0f; + if (sprite->data[0x2] == 0x0) + { + if (!sprite->data[0x0]) + { + eRoulette->var7D = 0xFF; + eRoulette->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + } + else + { + sprite->animPaused = TRUE; + m4aSongNumStart(0x38); + sub_811952C(sprite); + } + } +} + +#ifdef NONMATCHING +void sub_8118DE4(struct Sprite *sprite) +{ + sub_8118724(sprite); + sprite->data[0x2] = 0x0; + sub_81186B8(sprite); + if (!(gUnknown_083F8D90[eRoulette->var7E].var04 & eRoulette->var08)) + { + eRoulette->var7D = 0xFF; + eRoulette->var03_7 = 0x0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + sub_81186B8(sprite); + sprite->data[0x4] = 30; + sub_811866C(sprite); + sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; + sprite->callback = &sub_8118834; + m4aSongNumStartOrChange(0x47); + } + else + { + u8 t; + u32 z; + m4aSongNumStart(0x38); + if ((z = (Random() & 0x1))) + { + u32 o; + eRoulette->var8C = 0.0f; + o = (eRoulette->var7E + 0x1) % 0xC; + t = o; + eRoulette->var7F = o; + } + else + { + eRoulette->var8C = gUnknown_083F8DF4[eRoulette->var04_0].var1C * 2; // couldn't replicate loads + t = (eRoulette->var7E + 0xB) % 0xC; + eRoulette->var7F = eRoulette->var7E; + } + if (gUnknown_083F8D90[t].var04 & eRoulette->var08) + { + sprite->data[0x0] = 0x1; + sprite->data[0x2] = (&gUnknown_083F8DF4[eRoulette->var04_0])->var02; + } + else + { + sprite->data[0x0] = gUnknown_083F8D90[t].var04 & eRoulette->var08; + if (eRoulette->var04_0) + { + sprite->data[0x2] = (&gUnknown_083F8DF4[eRoulette->var04_0])->var01; + } + else + { + sprite->data[0x2] = (&gUnknown_083F8DF4[eRoulette->var04_0])->var02; + if (z) + { + eRoulette->var8C = 1.5f; + } + else + { + eRoulette->var8C = -1.5f; + } + } + } + eRoulette->var98 = 0.085f; + sprite->callback = &sub_8118D2C; + sprite->data[0x1] = 0x5; + } +} +#else +__attribute__((naked)) +void sub_8118DE4(struct Sprite *sprite) +{ +asm(".syntax unified\n\ +push {r4-r7,lr}\n\ +mov r7, r9\n\ +mov r6, r8\n\ +push {r6,r7}\n\ +adds r7, r0, 0\n\ +bl sub_8118724\n\ +movs r0, 0\n\ +strh r0, [r7, 0x32]\n\ +adds r0, r7, 0\n\ +bl sub_81186B8\n\ +ldr r1, _08118E70 @ =gUnknown_083F8D90\n\ +ldr r6, _08118E74 @ =gSharedMem + 0x19000\n\ +movs r0, 0x7E\n\ +adds r0, r6\n\ +mov r8, r0\n\ +ldrb r0, [r0]\n\ +lsls r0, 3\n\ +adds r1, 0x4\n\ +adds r0, r1\n\ +ldr r0, [r0]\n\ +ldr r1, [r6, 0x8]\n\ +ands r0, r1\n\ +cmp r0, 0\n\ +bne _08118E7C\n\ +adds r1, r6, 0\n\ +adds r1, 0x7D\n\ +movs r0, 0xFF\n\ +strb r0, [r1]\n\ +ldrb r1, [r6, 0x3]\n\ +movs r0, 0x7F\n\ +ands r0, r1\n\ +strb r0, [r6, 0x3]\n\ +adds r0, r7, 0\n\ +adds r0, 0x2B\n\ +ldrb r1, [r0]\n\ +adds r1, 0x3\n\ +lsls r1, 24\n\ +lsrs r1, 24\n\ +adds r0, r7, 0\n\ +bl StartSpriteAnim\n\ +adds r0, r7, 0\n\ +bl sub_81186B8\n\ +movs r0, 0x1E\n\ +strh r0, [r7, 0x36]\n\ +adds r0, r7, 0\n\ +bl sub_811866C\n\ +movs r1, 0x3A\n\ +ldrsh r0, [r7, r1]\n\ +movs r1, 0x1E\n\ +bl __divsi3\n\ +lsls r0, 16\n\ +asrs r0, 16\n\ +lsls r1, r0, 4\n\ +subs r1, r0\n\ +lsls r1, 1\n\ +adds r1, 0xF\n\ +strh r1, [r7, 0x3A]\n\ +ldr r0, _08118E78 @ =sub_8118834\n\ +str r0, [r7, 0x1C]\n\ +movs r0, 0x47\n\ +bl m4aSongNumStartOrChange\n\ +b _08118F74\n\ +.align 2, 0\n\ +_08118E70: .4byte gUnknown_083F8D90\n\ +_08118E74: .4byte gSharedMem + 0x19000\n\ +_08118E78: .4byte sub_8118834\n\ +_08118E7C:\n\ +movs r0, 0x38\n\ +bl m4aSongNumStart\n\ +bl Random\n\ +movs r2, 0x1\n\ +mov r9, r2\n\ +mov r1, r9\n\ +ands r1, r0\n\ +mov r9, r1\n\ +cmp r1, 0\n\ +beq _08118EC0\n\ +adds r1, r6, 0\n\ +adds r1, 0x8C\n\ +ldr r0, _08118EB8 @ =0x00000000\n\ +str r0, [r1]\n\ +mov r2, r8\n\ +ldrb r0, [r2]\n\ +adds r0, 0x1\n\ +movs r1, 0xC\n\ +bl __modsi3\n\ +lsls r1, r0, 24\n\ +lsrs r2, r1, 24\n\ +adds r1, r6, 0\n\ +adds r1, 0x7F\n\ +strb r0, [r1]\n\ +ldr r5, _08118EBC @ =gUnknown_083F8DF4\n\ +b _08118EF4\n\ +.align 2, 0\n\ +_08118EB8: .4byte 0x00000000\n\ +_08118EBC: .4byte gUnknown_083F8DF4\n\ +_08118EC0:\n\ +adds r4, r6, 0\n\ +adds r4, 0x8C\n\ +ldr r5, _08118F1C @ =gUnknown_083F8DF4\n\ +ldrb r0, [r6, 0x4]\n\ +lsls r0, 30\n\ +lsrs r0, 25\n\ +adds r1, r5, 0\n\ +adds r1, 0x1C\n\ +adds r0, r1\n\ +ldr r1, [r0]\n\ +adds r0, r1, 0\n\ +bl __addsf3\n\ +str r0, [r4]\n\ +mov r0, r8\n\ +ldrb r4, [r0]\n\ +adds r0, r4, 0\n\ +adds r0, 0xB\n\ +movs r1, 0xC\n\ +bl __modsi3\n\ +lsls r0, 24\n\ +lsrs r2, r0, 24\n\ +adds r0, r6, 0\n\ +adds r0, 0x7F\n\ +strb r4, [r0]\n\ +_08118EF4:\n\ +ldr r0, _08118F20 @ =gUnknown_083F8D90\n\ +lsls r1, r2, 3\n\ +adds r0, 0x4\n\ +adds r1, r0\n\ +ldr r2, _08118F24 @ =gSharedMem + 0x19000\n\ +ldr r1, [r1]\n\ +ldr r0, [r2, 0x8]\n\ +ands r1, r0\n\ +cmp r1, 0\n\ +beq _08118F28\n\ +movs r0, 0x1\n\ +strh r0, [r7, 0x2E]\n\ +ldrb r0, [r2, 0x4]\n\ +lsls r0, 30\n\ +lsrs r0, 25\n\ +adds r0, r5\n\ +ldrb r0, [r0, 0x2]\n\ +strh r0, [r7, 0x32]\n\ +b _08118F64\n\ +.align 2, 0\n\ +_08118F1C: .4byte gUnknown_083F8DF4\n\ +_08118F20: .4byte gUnknown_083F8D90\n\ +_08118F24: .4byte gSharedMem + 0x19000\n\ +_08118F28:\n\ +strh r1, [r7, 0x2E]\n\ +ldrb r1, [r2, 0x4]\n\ +movs r0, 0x3\n\ +ands r0, r1\n\ +cmp r0, 0\n\ +beq _08118F40\n\ +lsls r0, r1, 30\n\ +lsrs r0, 25\n\ +adds r0, r5\n\ +ldrb r0, [r0, 0x1]\n\ +strh r0, [r7, 0x32]\n\ +b _08118F64\n\ +_08118F40:\n\ +lsls r0, r1, 30\n\ +lsrs r0, 25\n\ +adds r0, r5\n\ +ldrb r0, [r0, 0x2]\n\ +strh r0, [r7, 0x32]\n\ +mov r1, r9\n\ +cmp r1, 0\n\ +beq _08118F5C\n\ +adds r1, r2, 0\n\ +adds r1, 0x8C\n\ +ldr r0, _08118F58 @ =0x3f000000\n\ +b _08118F62\n\ +.align 2, 0\n\ +_08118F58: .4byte 0x3f000000\n\ +_08118F5C:\n\ +adds r1, r2, 0\n\ +adds r1, 0x8C\n\ +ldr r0, _08118F80 @ =0xbfc00000\n\ +_08118F62:\n\ +str r0, [r1]\n\ +_08118F64:\n\ +adds r1, r2, 0\n\ +adds r1, 0x98\n\ +ldr r0, _08118F84 @ =0x3dae147b\n\ +str r0, [r1]\n\ +ldr r0, _08118F88 @ =sub_8118D2C\n\ +str r0, [r7, 0x1C]\n\ +movs r0, 0x5\n\ +strh r0, [r7, 0x30]\n\ +_08118F74:\n\ +pop {r3,r4}\n\ +mov r8, r3\n\ +mov r9, r4\n\ +pop {r4-r7}\n\ +pop {r0}\n\ +bx r0\n\ +.align 2, 0\n\ +_08118F80: .4byte 0xbfc00000\n\ +_08118F84: .4byte 0x3dae147b\n\ +_08118F88: .4byte sub_8118D2C\n\ +.syntax divided\n"); +} +#endif + +void sub_8118F8C(struct Sprite *sprite) +{ + sub_8118724(sprite); + if (!(eRoulette->var8C > 0.5f)) + { + sub_81186B8(sprite); + if (sub_81186E8(sprite) == 0x0) + { + struct StructgUnknown_083F8DF4 *p; + eRoulette->var90 = 0.0f; + p = &gUnknown_083F8DF4[0]; + eRoulette->var8C -= ((float)p[eRoulette->var04_0].var03) + / ((float)(s16)((&p[eRoulette->var04_0])->var04 + 0x1)); + sprite->data[0x1] = 0x4; + sprite->callback = &sub_8118DE4; + } + else + { + if (eRoulette->var90 != 0.0f) + { + if (eRoulette->var8C < 0.0f) + { + eRoulette->var90 = 0.0f; + eRoulette->var8C = 0.0f; + eRoulette->var98 /= 1.2; + } + } + } + } +} + +void sub_8119088(struct Sprite *sprite) +{ + sub_8118724(sprite); + if (!(eRoulette->var94 > 40.f)) + { + eRoulette->var98 = - ( 4.0f / (float)(u16)eRoulette->var86); + eRoulette->var90 = - (eRoulette->var8C / (float)(u16)eRoulette->var86); + sprite->animNum = 0x2; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; + sprite->data[0x1] = 0x3; + sprite->callback = &sub_8118F8C; + } +} + +void sub_8119134(struct Sprite *sprite) +{ + sub_8118724(sprite); + if (!(eRoulette->var94 > 60.0f)) + { + m4aSongNumStartOrChange(0x5D); + eRoulette->var98 = - ( 20.0f / (float)(u16)eRoulette->var84); + eRoulette->var90 = ((1.0f - eRoulette->var8C) / (float)(u16)eRoulette->var84); + sprite->animNum = 0x1; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; + sprite->data[0x1] = 0x2; + sprite->callback = &sub_8119088; + } +} + +void sub_81191F4(struct Sprite *sprite) +{ + sprite->data[0x1] = 0x1; + sprite->data[0x2] = 0x0; + sub_8118724(sprite); + sprite->invisible = FALSE; + sprite->callback = &sub_8119134; +} + +void sub_8119224(struct Sprite *sprite) +{ + u16 t; + u8 i; + s16 s[0x2][0x2]; + struct Roulette *p; + memcpy(s, &gUnknown_083FA60E, 0x8); + t = sprite->data[0x7] - 0x2; + p = eRoulette; + p->var3C[0x37] = CreateSprite(&gSpriteTemplate_83FA50C, 0x24, -0xC, 0x32); + p->var3C[0x38] = CreateSprite(&gSpriteTemplate_83FA5C0[0x0], s[sprite->data[0x0]][0x0], s[sprite->data[0x0]][0x1], 0x3B); + p->var3C[0x39] = CreateSprite(&gSpriteTemplate_83FA5C0[0x1], 0x24, 0x8C, 0x33); + gSprites[eRoulette->var3C[0x39]].oam.objMode = 0x1; + for (i = 0x0; i < 0x3; i++) + { + gSprites[eRoulette->var3C[0x37 + i]].coordOffsetEnabled = FALSE; + gSprites[eRoulette->var3C[0x37 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[0x37 + i]].animPaused = TRUE; + gSprites[eRoulette->var3C[0x37 + i]].affineAnimPaused = TRUE; + gSprites[eRoulette->var3C[0x37 + i]].data[0x4] = eRoulette->var3C[0x37]; + gSprites[eRoulette->var3C[0x37 + i]].data[0x5] = eRoulette->var3C[0x38]; + gSprites[eRoulette->var3C[0x37 + i]].data[0x6] = eRoulette->var3C[0x39]; + gSprites[eRoulette->var3C[0x37 + i]].data[0x2] = t; + gSprites[eRoulette->var3C[0x37 + i]].data[0x3] = (sprite->data[0x7] * (&gUnknown_083F8DF4[eRoulette->var04_0])->var01) + + ((&gUnknown_083F8DF4[eRoulette->var04_0])->var02 + 0xFFFF); + } + gSprites[eRoulette->var3C[0x38]].coordOffsetEnabled = TRUE; + eRoulette->var38 = sprite; +} + +void sub_81193D4(struct Sprite *sprite) +{ + u8 i = 0; + s16 t; + s16 s[0x2][0x2]; + struct StructgUnknown_083F8DF4 *p; + memcpy(s, &gUnknown_083FA616, 0x8); + t = sprite->data[0x7] - 0x2; + eRoulette->var3C[0x37] = CreateSprite(&gSpriteTemplate_83FA524, s[sprite->data[0x0]][0x0], s[sprite->data[0x0]][0x1], 0x32); + StartSpriteAnim(&gSprites[eRoulette->var3C[0x37]], sprite->data[0x0]); + eRoulette->var3C[0x38] = CreateSprite(&gSpriteTemplate_83FA5F0, s[sprite->data[0x0]][0x0], s[sprite->data[0x0]][0x1], 0x33); + gSprites[eRoulette->var3C[0x38]].affineAnimPaused = TRUE; + gSprites[eRoulette->var3C[0x38]].animPaused = TRUE; + sprite->data[0x7] = (t * (p = &gUnknown_083F8DF4[0])[eRoulette->var04_0].var01) + (p[eRoulette->var04_0].var10 + 0x2D); + for (; i < 0x2; i++) + { + gSprites[eRoulette->var3C[0x37 + i]].data[0x4] = eRoulette->var3C[0x37]; + gSprites[eRoulette->var3C[0x37 + i]].data[0x5] = eRoulette->var3C[0x38]; + gSprites[eRoulette->var3C[0x37 + i]].data[0x6] = eRoulette->var3C[0x38]; + gSprites[eRoulette->var3C[0x37 + i]].data[0x2] = t; + gSprites[eRoulette->var3C[0x37 + i]].data[0x3] = sprite->data[0x7] - 0x2D; + } + eRoulette->var38 = sprite; +} + +#ifdef NONMATCHING +void sub_811952C(struct Sprite *sprite) +{ + u8 z; + register u8 h asm("r10") = 0x0; + u8 j = 0x5; + u32 p = 0x0; + u16 o; + u8 i; + u8 s[0xA] = (u8[]){0,0,0,0,0,0,0,0,0,0}; + u16 t = Random(); + eRoulette->var7D = 0x1; + eRoulette->var03_5 = TRUE; + eRoulette->var03_6 = FALSE; + eRoulette->var7E = 0xFF; + eRoulette->var88 = sprite->data[0x3]; + eRoulette->var98 = 0.0f; + eRoulette->var8C = (&gUnknown_083F8DF4[eRoulette->var04_0])->var1C; //couldn't replicate load, same as sub_8118DE4 + o = (eRoulette->var04_0 * 30 + 33) + (0x1 - eRoulette->var03_0) * 15; + for (i = 0x0; i < 0x4; i++) + { + if (o < sprite->data[0x3] && !(sprite->data[0x3] > o + 90)) + { + sprite->data[0x0] = i * 0x2; + eRoulette->var03_0 = 0x1 & i; + break; + } + if (i == 0x3) + { + sprite->data[0x0] = 0x1; + eRoulette->var03_0 = 0x1; + break; + } + o += 90; + } + if (eRoulette->var03_0) + { + if (sprite->data[0x0]) + { + PlayCry1(0x130, -0x3F); + } + else + { + PlayCry1(0x130, 0x3F); + } + } + else + { + PlayCry1(0x132, -0x3F); + } + i = 0x2; + z = (eRoulette->var7F + 0x2) % 0xC; + if (eRoulette->var03_0 == 0x1 && eRoulette->var04_0 == 0x1) + j += 0x6; + else + j += i; + for (; i < j; i++) + { + if (!(eRoulette->var08 & gUnknown_083F8D90[z].var04)) + { + s[h++] = i; + if (!p && (gUnknown_083F8D90[z].var04 & gUnknown_083F8C00[eRoulette->var1B[eRoulette->var1A_0]].var00)) + { + p = i; + } + } + z = (z + 0x1) % 0xC; + } + if ((eRoulette->var03_0 + 0x1) & eRoulette->var02) + { + if (p && (t & 0xFF) <= 0xBF) + { + sprite->data[0x7] = p; + } + else + { + sprite->data[0x7] = s[t % h]; + } + } + else + { + sprite->data[0x7] = s[t % h]; + } + sprite->callback = &sub_8118CEC; +} +#else +__attribute__((naked)) +void sub_811952C(struct Sprite *sprite) +{ +asm(".syntax unified\n\ +push {r4-r7,lr}\n\ +mov r7, r10\n\ +mov r6, r9\n\ +mov r5, r8\n\ +push {r5-r7}\n\ +sub sp, 0x14\n\ +mov r8, r0\n\ +movs r0, 0\n\ +mov r10, r0\n\ +movs r1, 0x5\n\ +mov r9, r1\n\ +movs r2, 0\n\ +str r2, [sp, 0xC]\n\ +mov r0, sp\n\ +movs r1, 0\n\ +movs r2, 0xA\n\ +bl memset\n\ +bl Random\n\ +lsls r0, 16\n\ +lsrs r0, 16\n\ +str r0, [sp, 0x10]\n\ +ldr r7, _08119610 @ =gSharedMem + 0x19000\n\ +adds r0, r7, 0\n\ +adds r0, 0x7D\n\ +movs r6, 0x1\n\ +strb r6, [r0]\n\ +ldrb r4, [r7, 0x3]\n\ +movs r0, 0x20\n\ +orrs r4, r0\n\ +movs r0, 0x41\n\ +negs r0, r0\n\ +ands r4, r0\n\ +strb r4, [r7, 0x3]\n\ +adds r1, r7, 0\n\ +adds r1, 0x7E\n\ +movs r0, 0xFF\n\ +strb r0, [r1]\n\ +adds r5, r7, 0\n\ +adds r5, 0x88\n\ +mov r3, r8\n\ +movs r1, 0x34\n\ +ldrsh r0, [r3, r1]\n\ +bl __floatsisf\n\ +str r0, [r5]\n\ +adds r1, r7, 0\n\ +adds r1, 0x98\n\ +ldr r0, _08119614 @ =0x00000000\n\ +str r0, [r1]\n\ +adds r3, r7, 0\n\ +adds r3, 0x8C\n\ +ldr r2, _08119618 @ =gUnknown_083F8DF4\n\ +ldrb r0, [r7, 0x4]\n\ +lsls r0, 30\n\ +lsrs r1, r0, 25\n\ +adds r2, 0x1C\n\ +adds r1, r2\n\ +ldr r1, [r1]\n\ +str r1, [r3]\n\ +lsrs r0, 30\n\ +lsls r1, r0, 4\n\ +subs r1, r0\n\ +lsls r1, 1\n\ +adds r1, 0x21\n\ +lsls r4, 27\n\ +lsrs r4, 27\n\ +subs r6, r4\n\ +lsls r0, r6, 4\n\ +subs r0, r6\n\ +adds r1, r0\n\ +lsls r1, 16\n\ +lsrs r1, 16\n\ +mov r5, r10\n\ +mov r3, r8\n\ +movs r0, 0x34\n\ +ldrsh r2, [r3, r0]\n\ +_081195C8:\n\ +cmp r1, r2\n\ +bge _081195D4\n\ +adds r0, r1, 0\n\ +adds r0, 0x5A\n\ +cmp r2, r0\n\ +ble _08119638\n\ +_081195D4:\n\ +cmp r5, 0x3\n\ +beq _0811961C\n\ +adds r0, r1, 0\n\ +adds r0, 0x5A\n\ +lsls r0, 16\n\ +lsrs r1, r0, 16\n\ +adds r0, r5, 0x1\n\ +lsls r0, 24\n\ +lsrs r5, r0, 24\n\ +cmp r5, 0x3\n\ +bls _081195C8\n\ +_081195EA:\n\ +ldr r0, _08119610 @ =gSharedMem + 0x19000\n\ +ldrb r1, [r0, 0x3]\n\ +movs r0, 0x1F\n\ +ands r0, r1\n\ +cmp r0, 0\n\ +beq _08119664\n\ +mov r1, r8\n\ +movs r2, 0x2E\n\ +ldrsh r0, [r1, r2]\n\ +cmp r0, 0\n\ +beq _08119658\n\ +movs r0, 0x98\n\ +lsls r0, 1\n\ +movs r1, 0x3F\n\ +negs r1, r1\n\ +bl PlayCry1\n\ +b _08119670\n\ +.align 2, 0\n\ +_08119610: .4byte gSharedMem + 0x19000\n\ +_08119614: .4byte 0x00000000\n\ +_08119618: .4byte gUnknown_083F8DF4\n\ +_0811961C:\n\ +movs r0, 0x1\n\ +mov r3, r8\n\ +strh r0, [r3, 0x2E]\n\ +ldr r2, _08119634 @ =gSharedMem + 0x19000\n\ +ldrb r1, [r2, 0x3]\n\ +subs r0, 0x21\n\ +ands r0, r1\n\ +movs r1, 0x1\n\ +orrs r0, r1\n\ +strb r0, [r2, 0x3]\n\ +b _081195EA\n\ +.align 2, 0\n\ +_08119634: .4byte gSharedMem + 0x19000\n\ +_08119638:\n\ +lsrs r0, r5, 1\n\ +mov r1, r8\n\ +strh r0, [r1, 0x2E]\n\ +ldr r3, _08119654 @ =gSharedMem + 0x19000\n\ +movs r1, 0x1\n\ +ands r1, r5\n\ +ldrb r2, [r3, 0x3]\n\ +movs r0, 0x20\n\ +negs r0, r0\n\ +ands r0, r2\n\ +orrs r0, r1\n\ +strb r0, [r3, 0x3]\n\ +b _081195EA\n\ +.align 2, 0\n\ +_08119654: .4byte gSharedMem + 0x19000\n\ +_08119658:\n\ +movs r0, 0x98\n\ +lsls r0, 1\n\ +movs r1, 0x3F\n\ +bl PlayCry1\n\ +b _08119670\n\ +_08119664:\n\ +movs r0, 0x99\n\ +lsls r0, 1\n\ +movs r1, 0x3F\n\ +negs r1, r1\n\ +bl PlayCry1\n\ +_08119670:\n\ +movs r5, 0x2\n\ +ldr r4, _081196A0 @ =gSharedMem + 0x19000\n\ +adds r0, r4, 0\n\ +adds r0, 0x7F\n\ +ldrb r0, [r0]\n\ +adds r0, 0x2\n\ +movs r1, 0xC\n\ +bl __modsi3\n\ +lsls r0, 24\n\ +lsrs r3, r0, 24\n\ +ldrb r1, [r4, 0x3]\n\ +movs r0, 0x1F\n\ +ands r0, r1\n\ +cmp r0, 0x1\n\ +bne _081196A4\n\ +ldrb r1, [r4, 0x4]\n\ +movs r0, 0x3\n\ +ands r0, r1\n\ +cmp r0, 0x1\n\ +bne _081196A4\n\ +mov r0, r9\n\ +adds r0, 0x6\n\ +b _081196A8\n\ +.align 2, 0\n\ +_081196A0: .4byte gSharedMem + 0x19000\n\ +_081196A4:\n\ +mov r2, r9\n\ +adds r0, r2, r5\n\ +_081196A8:\n\ +lsls r0, 24\n\ +lsrs r0, 24\n\ +mov r9, r0\n\ +cmp r5, r9\n\ +bcs _0811970E\n\ +ldr r6, _08119734 @ =gSharedMem + 0x19000\n\ +ldr r7, _08119738 @ =gUnknown_083F8C00 + 0xC\n\ +_081196B6:\n\ +lsls r0, r3, 3\n\ +ldr r1, _0811973C @ =gUnknown_083F8D90 + 0x4\n\ +adds r0, r1\n\ +ldr r1, [r6, 0x8]\n\ +ldr r2, [r0]\n\ +ands r1, r2\n\ +cmp r1, 0\n\ +bne _081196F8\n\ +mov r0, r10\n\ +adds r1, r0, 0x1\n\ +lsls r1, 24\n\ +lsrs r1, 24\n\ +mov r10, r1\n\ +add r0, sp\n\ +strb r5, [r0]\n\ +ldr r0, [sp, 0xC]\n\ +cmp r0, 0\n\ +bne _081196F8\n\ +ldrb r0, [r6, 0x1A]\n\ +lsls r0, 28\n\ +lsrs r0, 28\n\ +ldr r1, _08119740 @ =gSharedMem + 0x1901B\n\ +adds r0, r1\n\ +ldrb r1, [r0]\n\ +lsls r0, r1, 2\n\ +adds r0, r1\n\ +lsls r0, 2\n\ +adds r0, r7\n\ +ldr r0, [r0]\n\ +ands r2, r0\n\ +cmp r2, 0\n\ +beq _081196F8\n\ +str r5, [sp, 0xC]\n\ +_081196F8:\n\ +adds r0, r3, 0x1\n\ +movs r1, 0xC\n\ +bl __modsi3\n\ +lsls r0, 24\n\ +lsrs r3, r0, 24\n\ +adds r0, r5, 0x1\n\ +lsls r0, 24\n\ +lsrs r5, r0, 24\n\ +cmp r5, r9\n\ +bcc _081196B6\n\ +_0811970E:\n\ +ldrb r0, [r4, 0x3]\n\ +lsls r0, 27\n\ +lsrs r0, 27\n\ +adds r0, 0x1\n\ +ldrb r1, [r4, 0x2]\n\ +ands r0, r1\n\ +cmp r0, 0\n\ +beq _08119756\n\ +ldr r2, [sp, 0xC]\n\ +cmp r2, 0\n\ +beq _08119744\n\ +movs r0, 0xFF\n\ +ldr r3, [sp, 0x10]\n\ +ands r0, r3\n\ +cmp r0, 0xBF\n\ +bhi _08119744\n\ +mov r0, r8\n\ +strh r2, [r0, 0x3C]\n\ +b _08119766\n\ +.align 2, 0\n\ +_08119734: .4byte gSharedMem + 0x19000\n\ +_08119738: .4byte gUnknown_083F8C00 + 0xC\n\ +_0811973C: .4byte gUnknown_083F8D90 + 0x4\n\ +_08119740: .4byte gSharedMem + 0x1901B\n\ +_08119744:\n\ +ldr r0, [sp, 0x10]\n\ +mov r1, r10\n\ +bl __modsi3\n\ +add r0, sp\n\ +ldrb r0, [r0]\n\ +mov r1, r8\n\ +strh r0, [r1, 0x3C]\n\ +b _08119766\n\ +_08119756:\n\ +ldr r0, [sp, 0x10]\n\ +mov r1, r10\n\ +bl __modsi3\n\ +add r0, sp\n\ +ldrb r0, [r0]\n\ +mov r2, r8\n\ +strh r0, [r2, 0x3C]\n\ +_08119766:\n\ +ldr r3, _0811977C @ =sub_8118CEC\n\ +mov r0, r8\n\ +str r3, [r0, 0x1C]\n\ +add sp, 0x14\n\ +pop {r3-r5}\n\ +mov r8, r3\n\ +mov r9, r4\n\ +mov r10, r5\n\ +pop {r4-r7}\n\ +pop {r0}\n\ +bx r0\n\ +.align 2, 0\n\ +_0811977C: .4byte sub_8118CEC\n\ +.syntax divided\n"); } +#endif -void sub_811857C(void) +void sub_8119780(struct Sprite *sprite) { - u8 i; - for (i = 0x0; i < 0x6; i++) + if (!(sprite->data[0x1]++ < sprite->data[0x3])) { - u8 spriteid = - RDATA->var3C[i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x50, 0x39 - i); - if (spriteid != 0x40) + if ((sprite->pos1.x -= 0x2) < -0x10) { - gSprites[RDATA->var3C[i]].invisible = TRUE; - gSprites[RDATA->var3C[i]].coordOffsetEnabled = TRUE; + if (!eRoulette->var03_6) + { + eRoulette->var03_6 = TRUE; + } + DestroySprite(sprite); + eRoulette->var01 = 0x0; + eRoulette->var34 = gUnknown_083FA61E[0x0]; } } } -void sub_81185E8(void) -{ - u8 t = RDATA->var3C[0x0]; - u8 i; - for (i = 0x0; i < 0x6; i++) - { - u8 j; - gSprites[t].invisible = TRUE; - gSprites[t].callback = &SpriteCallbackDummy; - StartSpriteAnim(&gSprites[t], 0x0); - for (j = 0x0; j < 0x8; j++) - gSprites[t].data[j] = 0x0; - t++; - } -} - -s16 sub_811866C(struct Sprite *sprite) -{ - if (RDATA->var24 > sprite->data[0x3]) - { - sprite->data[0x6] = 360 - RDATA->var24 + sprite->data[0x3]; - if (sprite->data[0x6] > 359) - sprite->data[0x6] -=360; - } - else - sprite->data[0x6] = sprite->data[0x3] - RDATA->var24; - return sprite->data[0x6]; -} - -u8 sub_81186B8(struct Sprite *sprite) -{ - RDATA->var7E = (u8)(((float)(s16)sub_811866C(sprite)) / 30.0f); - return RDATA->var7E; -} - -s16 sub_81186E8(struct Sprite *sprite) +void sub_81197D8(struct Sprite *sprite) { - s16 t = sub_811866C(sprite) % 30; - u16 z; - if (t == 0xE) - { - z = 0x0; - return sprite->data[0x2] = z; - } - else if (t > 0xD) + u16 t[0x3][0x4]; + s32 p, z; + memcpy(t, &gUnknown_083FA632, 0x18); + if (sprite->data[0x1]++ < sprite->data[0x3]) { - z = (u16)(0x2B - t); - return sprite->data[0x2] = z; + if(sprite->data[0x1] & 0x1) + { + gSpriteCoordOffsetY = t[sprite->data[0x2] / 0x2][sprite->data[0x7]]; + p = z = sprite->data[0x7] + 0x1; + if (z < 0) + p += 0x3; + sprite->data[0x7] = z - ((p >> 2) * 4); + } + sprite->invisible ^= 0x1; } else { - z = (u16)(0xE - t); - return sprite->data[0x2] = z; + gSpriteCoordOffsetY = 0x0; + gSprites[eRoulette->var3C[0x37]].animPaused = FALSE; + DestroySprite(sprite); } } -void sub_8118724(struct Sprite *sprite) +void sub_8119898(struct Sprite *sprite) { - s16 sin, cos; - RDATA->var8C += RDATA->var90; - RDATA->var88 += RDATA->var8C; - if (RDATA->var88 >= 360) - RDATA->var88 -= 360.0f; - else - if (RDATA->var88 < 0.0f) - RDATA->var88 += 360.0f; - sprite->data[0x3] = RDATA->var88; - RDATA->var98 += RDATA->var9C; - RDATA->var94 += RDATA->var98; - sprite->data[0x4] = RDATA->var94; - sin = Sin2(sprite->data[0x3]); - cos = Cos2(sprite->data[0x3]); - sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; - sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; - if (IsSEPlaying()) + float t; + sprite->data[0x1]++; + t = sprite->data[0x1]; + sprite->pos2.y = t * 0.039f * t; + eRoulette->var34 = gUnknown_083FA61E[(eRoulette->var01 - 0x1) / 2]; + if (eRoulette->var01 < 0x13) + eRoulette->var01++; + if (sprite->data[0x1] > 0x3C) { - m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, sprite->pos2.x); - m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, sprite->pos2.x); + sprite->data[0x1] = 0x0; + sprite->callback = &sub_8119780; + gSprites[sprite->data[0x6]].callback = &sub_8119780; + gSprites[sprite->data[0x6]].data[0x1] = -0x2; + gSprites[sprite->data[0x5]].invisible = FALSE; + gSprites[sprite->data[0x5]].callback = &sub_81197D8; + m4aSongNumStart(0xD6); } } -void sub_8118834(struct Sprite *sprite) -{ - s16 sin, cos; - sprite->data[0x3] = RDATA->var24 + sprite->data[0x6]; - if (sprite->data[0x3] > 359) - sprite->data[0x3] -= 360; - sin = Sin2(sprite->data[0x3]); - cos = Cos2(sprite->data[0x3]); - sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; - sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; - sprite->pos2.y += gSpriteCoordOffsetY; -} - -void sub_811889C(struct Sprite *sprite) +void sub_8119964(struct Sprite *sprite) { - sub_8118724(sprite); - sprite->data[0x2]++; - if ((u16)(sprite->data[0x4] + 0x84) > 0xD4) - sprite->invisible = TRUE; - else - sprite->invisible = FALSE; - if (!(sprite->data[0x2] < 30)) + if(sprite->data[0x7] == 0x0) { - if (!sprite->data[0x0]) + register u32 t asm("r2"); + u32 z ; + if (eRoulette->var38->data[0x0] == 0x0) { - if (RDATA->var94 <= RDATA->varA0 - 2.0f) - { - RDATA->var7D = 0xFF; - RDATA->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); - sub_81186B8(sprite); - sprite->data[0x4] = 30; - sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; - sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); - RDATA->var9C = RDATA->var98 = 0.0f; - RDATA->var8C = -1.0f; - } + t = eRoulette->var38->data[0x3]; + z = gUnknown_083F8DF4[eRoulette->var04_0].var08; } else { - if (RDATA->var94 >= RDATA->varA0 - 2.0f) - { - RDATA->var7D = 0xFF; - RDATA->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); - sub_81186B8(sprite); - sprite->data[0x4] = 30; - sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; - sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); - RDATA->var9C = RDATA->var98 = 0.0f; - RDATA->var8C = -1.0f; - } + t = eRoulette->var38->data[0x3]; + z = gUnknown_083F8DF4[eRoulette->var04_0].var08; + z += 0xB4; + } + if (t == z) + { + sprite->invisible = FALSE; + sprite->data[0x7]++; + m4aSongNumStart(0x2B); + eRoulette->var01 = 0x1; + eRoulette->var34 = gUnknown_083FA61E[0x0]; } } -} - -void sub_81189A8(struct Sprite *sprite) -{ - float f0, f1, f2; - struct Unkg083F8DF4 *p; - sub_8118724(sprite); - switch(sprite->data[0x3]) + else { - case 0: - if (sprite->data[0x0] != 0x1) + u32 t, z; + eRoulette->var34 = gUnknown_083FA61E[(eRoulette->var01 - 0x1) / 2]; + if (eRoulette->var01 < 0x13) + eRoulette->var01++; + if (eRoulette->var38->data[0x0] == 0x0) { - f0 = ((float)sprite->data[0x7]); - p = &gUnknown_083F8DF4[0]; - f1 = (f0 * ((float)(s32)p[RDATA->var04_0].var01) + (float)((s32)p[RDATA->var04_0].var02 - 0x1)); - f2 = (f0 / ((float)(s32)p[RDATA->var04_0].var0C)); + t = eRoulette->var38->data[0x3]; + z = gUnknown_083F8DF4[eRoulette->var04_0].var0A; } else { - return; - } - break; - case 180: - if (sprite->data[0x0] != 0x0) - { - f0 = ((float)sprite->data[0x7]); - p = &gUnknown_083F8DF4[0]; - f1 = (f0 * ((float)(s32)p[RDATA->var04_0].var01) + (float)((s32)p[RDATA->var04_0].var02 - 0x1)); - f2 = -(f0 / ((float)(s32)p[RDATA->var04_0].var0C)); + t = eRoulette->var38->data[0x3]; + z = gUnknown_083F8DF4[eRoulette->var04_0].var0A ; + z += 0xB4; } - else + if (t == z) { - return; + gSprites[sprite->data[0x4]].callback = &sub_8119898; + gSprites[sprite->data[0x4]].invisible = FALSE; + sprite->callback = &SpriteCallbackDummy; + sprite->data[0x7] = 0x0; } - break; - default: return; } - RDATA->varA0 = RDATA->var94; - RDATA->var98 = f2; - RDATA->var9C = -((f2 + f2) / f1 + (2.0f / (f1 * f1))); - RDATA->var8C = 0.0f; - sprite->animPaused = FALSE; - sprite->animNum = 0x0; - sprite->animBeginning = TRUE; - sprite->animEnded = FALSE; - sprite->callback = &sub_811889C; - sprite->data[0x2] = 0x0; } -void sub_8118B30(struct Sprite *sprite) +void sub_8119A90(struct Sprite *sprite) { - sprite->pos2.y = (s32)(((float)sprite->data[0x2]) * 0.05f * ((float)sprite->data[0x2])) - 45; - sprite->data[0x2]++; - if (sprite->data[0x2] > 29 && sprite->pos2.y >= 0) + sprite->invisible ^= 0x1; +} + +void sub_8119AAC(struct Sprite *sprite) +{ + if (sprite->pos1.y > -0x10) { - RDATA->var7D = 0xFF; - RDATA->var03_7 = FALSE; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); - sub_81186B8(sprite); - sprite->data[0x4] = 30; - sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; - sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); - RDATA->var03_6 = TRUE; + sprite->pos1.y--; + } + else + { + sprite->callback = &SpriteCallbackDummy; + sprite->invisible = TRUE; + sprite->animPaused = TRUE; + m4aSongNumStop(0x5E); + DestroySprite(sprite); + FreeOamMatrix(gSprites[eRoulette->var3C[0x38]].oam.matrixNum); + DestroySprite(&gSprites[eRoulette->var3C[0x38]]); } } -void sub_8118BD8(struct Sprite *sprite) +void sub_8119B24(struct Sprite *sprite) { - if (sprite->data[0x2]++ < 45) + if (!(sprite->data[0x1] < 0x0)) { - sprite->pos2.y--; - if(sprite->data[0x2] == 45) - { - if (gSprites[RDATA->var3C[0x37]].animCmdIndex == 0x1) - sprite->pos2.y++; - } + sprite->data[0x1]--; + sprite->pos1.y--; + if (sprite->data[0x1] == 0x0 && sprite->animCmdIndex == 0x1) + sprite->pos2.y++; } else { - if (sprite->data[0x2] < sprite->data[0x7]) + if (!(sprite->data[0x3] < 0x0)) { - if (gSprites[RDATA->var3C[0x37]].animDelayCounter == 0x0) + sprite->data[0x3]--; + if (sprite->animDelayCounter == 0x0) { - if (gSprites[RDATA->var3C[0x37]].animCmdIndex == 0x1) + if (sprite->animCmdIndex == 0x1) sprite->pos2.y++; else sprite->pos2.y--; @@ -3585,145 +4555,93 @@ void sub_8118BD8(struct Sprite *sprite) } else { - sprite->animPaused = FALSE; - sprite->animNum = 0x1; - sprite->animBeginning = TRUE; - sprite->animEnded = FALSE; - sprite->data[0x2] = 0x0; - sprite->callback = &sub_8118B30; - m4aSongNumStart(0x3D); + m4aSongNumStart(0x2B); + StartSpriteAnim(sprite, eRoulette->var38->data[0x0] + 0x4); + sprite->callback = &sub_8119AAC; + gSprites[sprite->data[0x6]].affineAnimPaused = FALSE; } } } -void sub_8118CAC(struct Sprite *sprite) +void sub_8119BCC(struct Sprite *sprite) { - sub_8118724(sprite); - switch(sprite->data[0x3]) + s8 t[0x2]; //sign + s8 z[0x8][0x2]; + memcpy(t, &gUnknown_083FA64A, 0x2); + memcpy(z, &gUnknown_083FA64C, 0x10); + if (sprite->data[0x1]-- > 0x7) { - case 90: - if (sprite->data[0x0] != 0x1) - { - sprite->callback = &sub_8118BD8; - sprite->data[0x2] = 0x0; - } - break; - case 270: - if (sprite->data[0x0] != 0x0) + sprite->pos1.x += t[eRoulette->var38->data[0x0]] * 0x2; + if (IsSEPlaying()) { - sprite->callback = &sub_8118BD8; - sprite->data[0x2] = 0x0; + s8 u = -((0x74 - sprite->pos1.x) / 0x2); + m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF,u); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, u); } - break; - } -} - -void sub_8118CEC(struct Sprite *sprite) -{ - sub_8118724(sprite); - switch(RDATA->var03_0) - { - default: - case 0x0: - sub_8119224(sprite); - sprite->callback = &sub_81189A8; - break; - case 0x1: - sub_81193D4(sprite); - sprite->callback = &sub_8118CAC; - break; } -} - -void sub_8118D2C(struct Sprite *sprite) -{ - sub_8118724(sprite); - if (sprite->data[0x2]-- == 0x10) - RDATA->var98 *= -1.0f; - if (sprite->data[0x2] == 0x0) + else { - if (!sprite->data[0x0]) + if (!(sprite->data[0x1] < 0x0)) { - RDATA->var7D = 0xFF; - RDATA->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); - sub_81186B8(sprite); - sprite->data[0x4] = 30; - sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; - sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); + sprite->pos1.x += t[eRoulette->var38->data[0x0]] * z[0x7 - sprite->data[0x1]][0x0]; + sprite->pos1.y += z[0x7 - sprite->data[0x1]][0x1]; } else { - sprite->animPaused = TRUE; - m4aSongNumStart(0x38); - sub_811952C(sprite); + m4aSongNumStartOrChange(0x5E); + if(eRoulette->var38->data[0x0] == 0x0) + PlayCry1(0x130, 0x3F); + else + PlayCry1(0x130, -0x3F); + StartSpriteAnim(sprite, eRoulette->var38->data[0x0] + 0x2); + sprite->data[0x1] = 45; + sprite->callback = &sub_8119B24; } } } -void sub_8118DE4(struct Sprite *sprite) +void sub_8119D08(struct Sprite *sprite) { - sub_8118724(sprite); - sprite->data[0x2] = 0x0; - sub_81186B8(sprite); - if (!(gUnknown_083F8D90[RDATA->var7E].var04 & RDATA->var08)) + s8 t[0x2]; //sign + memcpy(t, &gUnknown_083FA64A, 0x2); + if (!(sprite->data[0x1]-- < 0x0)) { - RDATA->var7D = 0xFF; - RDATA->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); - sub_81186B8(sprite); - sprite->data[0x4] = 30; - sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; - sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); + sprite->pos1.x += t[eRoulette->var38->data[0x0]] * 0x2; + gSprites[sprite->data[0x6]].invisible ^= 0x1; } else { - u8 t; - u32 z; - m4aSongNumStart(0x38); - if ((z = (Random() & 0x1))) + sprite->callback = &sub_8119A90; + } +} + +void sub_8119D80(struct Sprite *sprite) +{ + if (eRoulette->var38->data[0x0] == 0x0) + { + if (eRoulette->var38->data[0x3] == gUnknown_083F8DF4[eRoulette->var04_0].var12 + 90) { - RDATA->var8C = 0.0f; - t = (RDATA->var7E + 0x1) % 0xC; - RDATA->var7F = t; + gSprites[sprite->data[0x6]].data[0x1] = 0x34; + gSprites[sprite->data[0x4]].data[0x1] = 0x34; } else { - RDATA->var8C = gUnknown_083F8DF4[RDATA->var04_0].var1C * 2; - t = (RDATA->var7E + 0xB) % 0xC; - RDATA->var7F = t; + return; } - if (gUnknown_083F8D90[t].var04 & RDATA->var08) + } + else + { + if (eRoulette->var38->data[0x3] == gUnknown_083F8DF4[eRoulette->var04_0].var14 + 270) { - sprite->data[0x0] = 0x1; - sprite->data[0x2] = gUnknown_083F8DF4[RDATA->var04_0].var02; + gSprites[sprite->data[0x6]].data[0x1] = 0x2E; + gSprites[sprite->data[0x4]].data[0x1] = 0x2E; } else { - sprite->data[0x0] = gUnknown_083F8D90[t].var04 & RDATA->var08; - if (RDATA->var04_0) - { - sprite->data[0x2] = gUnknown_083F8DF4[RDATA->var04_0].var01; - } - else - { - sprite->data[0x2] = gUnknown_083F8DF4[RDATA->var04_0].var02; - if (z) - { - RDATA->var8C = 1.5f; - } - else - { - RDATA->var8C = -1.5f; - } - } + return; } - RDATA->var98 = 0.085000000894069671630859375f; - sprite->callback = &sub_8118D2C; - sprite->data[0x1] = 0x5; } + gSprites[sprite->data[0x6]].callback = &sub_8119D08; + gSprites[sprite->data[0x4]].callback = &sub_8119BCC; + m4aSongNumStart(0x2B); } diff --git a/src/roulette_util.c b/src/roulette_util.c index bb47ed540..53585714e 100644 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -4,378 +4,383 @@ static u8 sub_81249E4(struct UnkStruct3 *); static u8 sub_8124BEC(struct UnkStruct3 *); +u8 unref_sub_81249B0(struct UnkStruct0 *, u8); extern u16 gPlttBufferFaded[]; extern u16 gPlttBufferUnfaded[]; void sub_8124918(struct UnkStruct0 *r0) { - r0->val0 = 0; - r0->val2 = 0; - memset((&r0->val3), 0, 0xC0); + r0->var00 = 0; + r0->var02 = 0; + memset((&r0->var04), 0, 0xC0); } u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) { - if (!(r1 < 0x10) || (r0->val3[r1].field1)) - return 0xFF; + if (!(r1 < 0x10) || (r0->var04[r1].var00_7)) + return 0xFF; - r0->val3[r1].val4.val0 = r2->val0; - r0->val3[r1].val4.val1 = r2->val1; - r0->val3[r1].val4.val2 = r2->val2; - r0->val3[r1].val4.val3 = r2->val3; - r0->val3[r1].val4.val4 = r2->val4; - r0->val3[r1].val4.field0 = r2->field0; - r0->val3[r1].val4.field1 = r2->field1; - r0->val3[r1].val4.field2 = r2->field2; + r0->var04[r1].var04.var00 = r2->var00; + r0->var04[r1].var04.var02 = r2->var02; + r0->var04[r1].var04.var04 = r2->var04; + r0->var04[r1].var04.var05 = r2->var05; + r0->var04[r1].var04.var06 = r2->var06; + r0->var04[r1].var04.var07_0 = r2->var07_0; + r0->var04[r1].var04.var07_5 = r2->var07_5; + r0->var04[r1].var04.var07_7 = r2->var07_7; - //Why not r0->val3[r1].val4 = *r2; ? - r0->val3[r1].field0 = 0x0; - r0->val3[r1].field1 = 0x1; + r0->var04[r1].var00_0 = 0x0; + r0->var04[r1].var00_7 = 0x1; - r0->val3[r1].val2 = 0x0; - r0->val3[r1].val1 = 0x0; - if (r0->val3[r1].val4.field2 < 0) - r0->val3[r1].val3 = 0xFF; - else - r0->val3[r1].val3 = 0x1; - return r1; + r0->var04[r1].var02 = 0x0; + r0->var04[r1].var01 = 0x0; + if (r0->var04[r1].var04.var07_7 < 0) + r0->var04[r1].var03 = 0xFF; + else + r0->var04[r1].var03 = 0x1; + return r1; } #ifdef NONMATCHING u8 unref_sub_81249B0(struct UnkStruct0 *r0, u8 r1) { - if (!(r1 < 0x10) || (r0->val3[r1].field1)) - return 0xFF; - r0->val3[r1] = (struct UnkStruct3){0}; - return r1; + if (r1 < 0x10) + { + if (r0->var04[r1].var00_7) + { + r0->var04[r1] = (struct UnkStruct3){0}; + return r1; + } + } + return 0xFF; } #else __attribute__((naked)) u8 unref_sub_81249B0(struct UnkStruct0 *r0 , u8 r1) { - asm(".syntax unified\n\ - push {r4,lr}\n\ - adds r2, r0, 0\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - adds r4, r1, 0\n\ - cmp r4, 0xF\n\ - bhi _081249DC\n\ - lsls r0, r4, 1\n\ - adds r0, r4\n\ - lsls r0, 2\n\ - adds r1, r2, r0\n\ - ldrb r0, [r1, 0x4]\n\ - lsrs r0, 7\n\ - cmp r0, 0\n\ - beq _081249DC\n\ - adds r0, r1, 0x4\n\ - movs r1, 0\n\ - movs r2, 0xC\n\ - bl memset\n\ - adds r0, r4, 0\n\ - b _081249DE\n\ - _081249DC:\n\ - movs r0, 0xFF\n\ - _081249DE:\n\ - pop {r4}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided\n"); + asm(".syntax unified\n\ + push {r4,lr}\n\ + adds r2, r0, 0\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + adds r4, r1, 0\n\ + cmp r4, 0xF\n\ + bhi _081249DC\n\ + lsls r0, r4, 1\n\ + adds r0, r4\n\ + lsls r0, 2\n\ + adds r1, r2, r0\n\ + ldrb r0, [r1, 0x4]\n\ + lsrs r0, 7\n\ + cmp r0, 0\n\ + beq _081249DC\n\ + adds r0, r1, 0x4\n\ + movs r1, 0\n\ + movs r2, 0xC\n\ + bl memset\n\ + adds r0, r4, 0\n\ + b _081249DE\n\ + _081249DC:\n\ + movs r0, 0xFF\n\ + _081249DE:\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ + .syntax divided\n"); } #endif u8 sub_81249E4(struct UnkStruct3 *r0) { - u8 i; - u8 returnval; - for (i = 0; i < r0->val4.val2; i++) - { - u32 offset = r0->val4.val1 + i; - struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset]; - struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset]; - switch(r0->field0) - { - case 0x1: - if ((u32)(faded->r + r0->val3) < 0x20) - faded->r += r0->val3; - if ((u32)(faded->g + r0->val3) < 0x20) - faded->g += r0->val3; - if ((u32)(faded->b + r0->val3) < 0x20) - faded->b += r0->val3; - break; - case 0x2: - if (r0->val3 < 0) - { - if (!(faded->r + r0->val3 < unfaded->r)) - faded->r += r0->val3; - if (!(faded->g + r0->val3 < unfaded->g)) - faded->g += r0->val3; - if (!(faded->b + r0->val3 < unfaded->b)) - faded->b += r0->val3; - } - else - { - if (!(faded->r + r0->val3 > unfaded->r)) - faded->r += r0->val3; - if (!(faded->g + r0->val3 > unfaded->g)) - faded->g += r0->val3; - if (!(faded->b + r0->val3 > unfaded->b)) - faded->b += r0->val3; - } - break; - } - } - if (((u32)r0->val2++) != r0->val4.field0) - { - returnval = 0x0; - } - else - { - r0->val2 = 0x0; - r0->val3 = r0->val3 * -1; - if (r0->field0 == 0x1) - r0->field0++; - else - r0->field0--; - returnval = 0x1; - } - return returnval; + u8 i; + u8 returnval; + for (i = 0; i < r0->var04.var04; i++) + { + u32 offset = r0->var04.var02 + i; + struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset]; + struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset]; + switch(r0->var00_0) + { + case 0x1: + if ((u32)(faded->r + r0->var03) < 0x20) + faded->r += r0->var03; + if ((u32)(faded->g + r0->var03) < 0x20) + faded->g += r0->var03; + if ((u32)(faded->b + r0->var03) < 0x20) + faded->b += r0->var03; + break; + case 0x2: + if (r0->var03 < 0) + { + if (!(faded->r + r0->var03 < unfaded->r)) + faded->r += r0->var03; + if (!(faded->g + r0->var03 < unfaded->g)) + faded->g += r0->var03; + if (!(faded->b + r0->var03 < unfaded->b)) + faded->b += r0->var03; + } + else + { + if (!(faded->r + r0->var03 > unfaded->r)) + faded->r += r0->var03; + if (!(faded->g + r0->var03 > unfaded->g)) + faded->g += r0->var03; + if (!(faded->b + r0->var03 > unfaded->b)) + faded->b += r0->var03; + } + break; + } + } + if (((u32)r0->var02++) != r0->var04.var07_0) + { + returnval = 0x0; + } + else + { + r0->var02 = 0x0; + r0->var03 = r0->var03 * -1; + if (r0->var00_0 == 0x1) + r0->var00_0++; + else + r0->var00_0--; + returnval = 0x1; + } + return returnval; } u8 sub_8124BEC(struct UnkStruct3 *r0) { - u8 rg2 = 0; - switch (r0->field0) - { - case 0x1: - for (rg2 = 0; rg2 < r0->val4.val2; rg2++) - gPlttBufferFaded[r0->val4.val1 + rg2] = r0->val4.val0; - r0->field0++; - break; - case 0x2: - for (rg2 = 0; rg2 < r0->val4.val2; rg2++) - gPlttBufferFaded[r0->val4.val1 + rg2] = gPlttBufferUnfaded[r0->val4.val1 + rg2]; - r0->field0--; - break; - } - return 0x1; + u8 rg2 = 0; + switch (r0->var00_0) + { + case 0x1: + for (rg2 = 0; rg2 < r0->var04.var04; rg2++) + gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00; + r0->var00_0++; + break; + case 0x2: + for (rg2 = 0; rg2 < r0->var04.var04; rg2++) + gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2]; + r0->var00_0--; + break; + } + return 0x1; } void task_tutorial_controls_fadein(struct UnkStruct0 *r0) { - u8 i = 0; - if (r0->val0) - { - for (i = 0; i < 0x10; i++) - { - if ((r0->val2 >> i) & 0x1) - { - if (((u8)--r0->val3[i].val1) == 0xFF) // if underflow ? - { - if (r0->val3[i].val4.val0 & (0x80 << 8)) // PlttData->unused_15 ? - sub_81249E4(&r0->val3[i]); - else - sub_8124BEC(&r0->val3[i]); - r0->val3[i].val1 = r0->val3[i].val4.val3; - } - } - } - } + u8 i = 0; + if (r0->var00) + { + for (i = 0; i < 0x10; i++) + { + if ((r0->var02 >> i) & 0x1) + { + if (((u8)--r0->var04[i].var01) == 0xFF) // if underflow ? + { + if (r0->var04[i].var04.var00 & (0x80 << 8)) // PlttData->unused_15 ? + sub_81249E4(&r0->var04[i]); + else + sub_8124BEC(&r0->var04[i]); + r0->var04[i].var01 = r0->var04[i].var04.var05; + } + } + } + } } void sub_8124CE8(struct UnkStruct0 *r0, u16 r1) { - u8 i = 0; - r0->val0++; - for (i = 0; i < 0x10; i++) - { - if ((r1 >> i) & 0x1) - { - if (r0->val3[i].field1) - { - r0->val2 |= 0x1 << i; - r0->val3[i].field0 = 0x1; - } - } - } + u8 i = 0; + r0->var00++; + for (i = 0; i < 0x10; i++) + { + if ((r1 >> i) & 0x1) + { + if (r0->var04[i].var00_7) + { + r0->var02 |= 0x1 << i; + r0->var04[i].var00_0 = 0x1; + } + } + } } void sub_8124D3C(struct UnkStruct0 *r0, u16 r1) { - u8 i; - for (i = 0; i < 0x10; i++) - { - if ((r0->val2 >> i) & 0x1) - { - if (r0->val3[i].field1) - { - if ((r1 >> i) & 0x1) - { - u32 offset = r0->val3[i].val4.val1; - u16 *faded = &gPlttBufferFaded[offset]; - u16 *unfaded = &gPlttBufferUnfaded[offset]; - memcpy(faded, unfaded, r0->val3[i].val4.val2 * 2); - r0->val3[i].field0 = 0x0; - r0->val3[i].val2 = 0x0; - r0->val3[i].val1 = 0x0; - if (r0->val3[i].val4.field2 < 0) - r0->val3[i].val3 = 0xFF; - else - r0->val3[i].val3 = 0x1; - } - } - } - } - if (r1 == 0xFFFF) - { - r0->val0 = 0x0; - r0->val2 = 0x0; - } - else - { - r0->val2 = r0->val2 & ~r1; - } + u8 i; + for (i = 0; i < 0x10; i++) + { + if ((r0->var02 >> i) & 0x1) + { + if (r0->var04[i].var00_7) + { + if ((r1 >> i) & 0x1) + { + u32 offset = r0->var04[i].var04.var02; + u16 *faded = &gPlttBufferFaded[offset]; + u16 *unfaded = &gPlttBufferUnfaded[offset]; + memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2); + r0->var04[i].var00_0 = 0x0; + r0->var04[i].var02 = 0x0; + r0->var04[i].var01 = 0x0; + if (r0->var04[i].var04.var07_7 < 0) + r0->var04[i].var03 = 0xFF; + else + r0->var04[i].var03 = 0x1; + } + } + } + } + if (r1 == 0xFFFF) + { + r0->var00 = 0x0; + r0->var02 = 0x0; + } + else + { + r0->var02 = r0->var02 & ~r1; + } } #ifdef NONMATCHING void sub_8124DDC(u16 *r0, u16 r1, u8 r2, u8 r3, u8 r4, u8 r5) { - u16 *rg0; - u8 c; - u8 i = 0; - u32 offset= r3 * 0x20 + r2; - rg0 = &r0[offset]; - for (i = 0; i < r5; i++) - { - rg0 = &rg0[i * 0x20 ]; - c = 0; - for (c = 0; c < r4; c++) - { - *rg0++ = r1; - } - } + u16 *rg0; + u8 c; + u8 i = 0; + u32 offset= r3 * 0x20 + r2; + rg0 = &r0[offset]; + for (i = 0; i < r5; i++) + { + rg0 = &rg0[i * 0x20 ]; + c = 0; + for (c = 0; c < r4; c++) + { + *rg0++ = r1; + } + } } #else __attribute__((naked)) void sub_8124DDC(u16 *r0, u16 r1, u8 r2, u8 r3, u8 r4, u8 r5) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - adds r6, r0, 0\n\ - ldr r0, [sp, 0x14]\n\ - ldr r4, [sp, 0x18]\n\ - lsls r1, 16\n\ - lsrs r7, r1, 16\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - lsls r3, 24\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - movs r1, 0\n\ - lsrs r3, 19\n\ - adds r3, r2\n\ - lsls r3, 1\n\ - adds r6, r3\n\ - cmp r1, r4\n\ - bcs _08124E26\n\ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + adds r6, r0, 0\n\ + ldr r0, [sp, 0x14]\n\ + ldr r4, [sp, 0x18]\n\ + lsls r1, 16\n\ + lsrs r7, r1, 16\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + lsls r3, 24\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + movs r1, 0\n\ + lsrs r3, 19\n\ + adds r3, r2\n\ + lsls r3, 1\n\ + adds r6, r3\n\ + cmp r1, r4\n\ + bcs _08124E26\n\ _08124E04:\n\ - lsls r0, r1, 6\n\ - adds r2, r6, r0\n\ - movs r0, 0\n\ - adds r3, r1, 0x1\n\ - cmp r0, r5\n\ - bcs _08124E1E\n\ + lsls r0, r1, 6\n\ + adds r2, r6, r0\n\ + movs r0, 0\n\ + adds r3, r1, 0x1\n\ + cmp r0, r5\n\ + bcs _08124E1E\n\ _08124E10:\n\ - strh r7, [r2]\n\ - adds r2, 0x2\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, r5\n\ - bcc _08124E10\n\ + strh r7, [r2]\n\ + adds r2, 0x2\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + cmp r0, r5\n\ + bcc _08124E10\n\ _08124E1E:\n\ - lsls r0, r3, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, r4\n\ - bcc _08124E04\n\ + lsls r0, r3, 24\n\ + lsrs r1, r0, 24\n\ + cmp r1, r4\n\ + bcc _08124E04\n\ _08124E26:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); } #endif #ifdef NONMATCHING void sub_8124E2C(u16 *r0, u16 *r1, u8 r2, u8 r3, u8 r4, u8 r5) { - u16 *rg0; - u8 c; - u8 i = 0; - u32 offset= r3 * 0x20 + r2; - //rg0 = &r0[offset]; - for (i = 0; i < r5; i++) - { - rg0 = &r0[offset + i * 0x20 ]; - c = 0; - for (c = 0; c < r4; c++) - { - *(rg0++) = *(r1++); - } - } + u16 *rg0; + u8 c; + u8 i = 0; + u32 offset= r3 * 0x20 + r2; + //rg0 = &r0[offset]; + for (i = 0; i < r5; i++) + { + rg0 = &r0[offset + i * 0x20 ]; + c = 0; + for (c = 0; c < r4; c++) + { + *(rg0++) = *(r1++); + } + } } #else __attribute__((naked)) void sub_8124E2C(u16 *r0, u16 *r1, u8 r2, u8 r3, u8 r4, u8 r5) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - adds r7, r0, 0\n\ - ldr r0, [sp, 0x14]\n\ - ldr r4, [sp, 0x18]\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - lsls r3, 24\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - lsls r4, 24\n\ - lsrs r6, r4, 24\n\ - movs r4, 0\n\ - lsrs r3, 19\n\ - adds r3, r2\n\ - lsls r3, 1\n\ - adds r7, r3\n\ - cmp r4, r6\n\ - bcs _08124E76\n\ - _08124E50:\n\ - lsls r0, r4, 6\n\ - adds r2, r7, r0\n\ - movs r3, 0\n\ - adds r4, 0x1\n\ - cmp r3, r5\n\ - bcs _08124E6E\n\ - _08124E5C:\n\ - ldrh r0, [r1]\n\ - strh r0, [r2]\n\ - adds r1, 0x2\n\ - adds r2, 0x2\n\ - adds r0, r3, 0x1\n\ - lsls r0, 24\n\ - lsrs r3, r0, 24\n\ - cmp r3, r5\n\ - bcc _08124E5C\n\ - _08124E6E:\n\ - lsls r0, r4, 24\n\ - lsrs r4, r0, 24\n\ - cmp r4, r6\n\ - bcc _08124E50\n\ - _08124E76:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + adds r7, r0, 0\n\ + ldr r0, [sp, 0x14]\n\ + ldr r4, [sp, 0x18]\n\ + lsls r2, 24\n\ + lsrs r2, 24\n\ + lsls r3, 24\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + lsls r4, 24\n\ + lsrs r6, r4, 24\n\ + movs r4, 0\n\ + lsrs r3, 19\n\ + adds r3, r2\n\ + lsls r3, 1\n\ + adds r7, r3\n\ + cmp r4, r6\n\ + bcs _08124E76\n\ + _08124E50:\n\ + lsls r0, r4, 6\n\ + adds r2, r7, r0\n\ + movs r3, 0\n\ + adds r4, 0x1\n\ + cmp r3, r5\n\ + bcs _08124E6E\n\ + _08124E5C:\n\ + ldrh r0, [r1]\n\ + strh r0, [r2]\n\ + adds r1, 0x2\n\ + adds r2, 0x2\n\ + adds r0, r3, 0x1\n\ + lsls r0, 24\n\ + lsrs r3, r0, 24\n\ + cmp r3, r5\n\ + bcc _08124E5C\n\ + _08124E6E:\n\ + lsls r0, r4, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, r6\n\ + bcc _08124E50\n\ + _08124E76:\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); } #endif -- cgit v1.2.3 From bc5fdb16a8d374972a4dc93e61eacaa6061e3f61 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 19:38:29 -0500 Subject: get sub_812446C matching --- src/scene/cable_car.c | 199 ++++++++++++-------------------------------------- 1 file changed, 47 insertions(+), 152 deletions(-) diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index d65022ae8..c735f8ace 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -44,7 +44,11 @@ struct CableCarEwramStruct1 { u8 filler_0000e[6]; u8 unk_0014; u8 unk_0015; - u8 filler_0016[0xe6]; + u8 filler_0016[5]; + u8 unk_001b; + u8 filler_001c[6]; + u16 unk_0022[9][12]; + u8 filler_00fa[2]; u16 unk_00fc[0x400]; u16 unk_08fc[0x400]; }; // size 0x10FC @@ -206,7 +210,7 @@ void sub_8123244(void) DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE); gUnknown_02039274 = eCableCar1; DmaFill16Large(3, 0, eCableCar1, 0x10FC, 0x1000); - gMain.state ++; + gMain.state++; break; case 1: ResetSpriteData(); @@ -214,17 +218,17 @@ void sub_8123244(void) FreeAllSpritePalettes(); ResetPaletteFade(); StartWeather(); - for (i = 0; i < 20; i ++) + for (i = 0; i < 20; i++) { gWeatherPtr->sprites.s2.ashSprites[i] = NULL; } InitMapMusic(); ResetMapMusic(); gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0; - gMain.state ++; + gMain.state++; break; case 2: - for (i = 0; i < 3; i ++) + for (i = 0; i < 3; i++) { LoadCompressedObjectPic(&gUnknown_08401CF8[i]); } @@ -235,28 +239,28 @@ void sub_8123244(void) LZDecompressWram(gCableCarPylonStemTilemap, eCableCar2->pylonStemTilemap); LoadPalette(gCableCarBG_Pal, 0, 0x80); LZ77UnCompVram(gCableCarBG_Gfx, (u16 *)BG_VRAM); - gMain.state ++; + gMain.state++; break; case 3: sub_8124118(); RunTasks(); - gMain.state ++; + gMain.state++; break; case 4: if (gUnknown_02039274->unk_0002 == 7) { - gMain.state ++; + gMain.state++; } else if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL) { - for (i = 0; i < 20; i ++) + for (i = 0; i < 20; i++) { if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) { gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; } } - gMain.state ++; + gMain.state++; } break; case 5: @@ -264,7 +268,7 @@ void sub_8123244(void) sub_8124F08((u16 *)BG_SCREEN_ADDR(30), eCableCar2->mountainTilemap, 0, 0, 30, 20); sub_8124F08(gUnknown_02039274->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); sub_8124F08(gUnknown_02039274->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 20); - gMain.state ++; + gMain.state++; break; case 6: sub_81248AC(gSpecialVar_0x8004); @@ -276,13 +280,13 @@ void sub_8123244(void) sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 12, 20, 12, 3); sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 12, 23, 12, 3); sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 24, 23, 12, 3); - gMain.state ++; + gMain.state++; break; case 7: BeginNormalPaletteFade(-1, 3, 16, 0, 0); FadeInNewBGM(BGM_ROPEWAY, 1); sub_8123FBC(1); - gMain.state ++; + gMain.state++; break; case 8: imebak = REG_IME; @@ -321,7 +325,7 @@ void sub_8123740(void) sub_8123FBC(0); gSpriteCoordOffsetX = 0; sub_807C9B4(0); - for (; i < 20; i ++) + for (; i < 20; i++) { gWeatherPtr->sprites.s2.ashSprites[i] = NULL; } @@ -343,7 +347,7 @@ void sub_8123878(u8 taskId) u8 i; i = 0; - gUnknown_02039274->unk_0006 ++; + gUnknown_02039274->unk_0006++; switch (gUnknown_02039274->unk_0001) { case 0: @@ -359,7 +363,7 @@ void sub_8123878(u8 taskId) case 7: if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0) { - for (; i < 20; i ++) + for (; i < 20; i++) { if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) { @@ -376,7 +380,7 @@ void sub_8123878(u8 taskId) } else if (gUnknown_02039274->unk_0006 >= gUnknown_02039274->unk_0004 + 8) { - for (; i < 20; i ++) + for (; i < 20; i++) { if (gWeatherPtr->sprites.s2.ashSprites[i] != NULL) { @@ -414,15 +418,15 @@ void sub_81239E4(u8 taskId) { if (gUnknown_02039274->unk_0001 != 255) { - gUnknown_02039274->unk_0014 --; + gUnknown_02039274->unk_0014--; if ((gUnknown_02039274->unk_0006 % 2) == 0) { - gUnknown_02039274->unk_0015 --; + gUnknown_02039274->unk_0015--; } if ((gUnknown_02039274->unk_0006 % 8) == 0) { - gUnknown_02039274->unk_000c --; - gUnknown_02039274->unk_000d --; + gUnknown_02039274->unk_000c--; + gUnknown_02039274->unk_000d--; } switch (gUnknown_02039274->unk_0014) { @@ -450,15 +454,15 @@ void sub_8123AF8(u8 taskId) { if (gUnknown_02039274->unk_0001 != 255) { - gUnknown_02039274->unk_0014 ++; + gUnknown_02039274->unk_0014++; if ((gUnknown_02039274->unk_0006 % 2) == 0) { - gUnknown_02039274->unk_0015 ++; + gUnknown_02039274->unk_0015++; } if ((gUnknown_02039274->unk_0006 % 8) == 0) { - gUnknown_02039274->unk_000c ++; - gUnknown_02039274->unk_000d ++; + gUnknown_02039274->unk_000c++; + gUnknown_02039274->unk_000d++; } switch (gUnknown_02039274->unk_0014) { @@ -572,24 +576,24 @@ void sub_8123EB8(struct Sprite *sprite) sprite->pos1.x += 2 * sprite->centerToCornerVecX; sprite->pos1.y += 16 + sprite->centerToCornerVecY; } - if (++ sprite->data[0] >= sprite->data[2]) + if (++sprite->data[0] >= sprite->data[2]) { switch (sprite->data[1]) { case 0: - sprite->pos1.x ++; + sprite->pos1.x++; if ((sprite->data[0] % 4) == 0) { - sprite->pos1.y ++; + sprite->pos1.y++; } break; case 1: if ((sprite->data[0] % 2) != 0) { - sprite->pos1.x ++; + sprite->pos1.x++; if ((sprite->pos1.x % 4) == 0) { - sprite->pos1.y ++; + sprite->pos1.y++; } } break; @@ -607,24 +611,24 @@ void sub_8123F44(struct Sprite *sprite) { sprite->pos1.y += 16 + sprite->centerToCornerVecY; } - if (++ sprite->data[0] >= sprite->data[2]) + if (++sprite->data[0] >= sprite->data[2]) { switch (sprite->data[1]) { case 0: - sprite->pos1.x --; + sprite->pos1.x--; if ((sprite->data[0] % 4) == 0) { - sprite->pos1.y --; + sprite->pos1.y--; } break; case 1: if ((sprite->data[0] % 2) != 0) { - sprite->pos1.x --; + sprite->pos1.x--; if ((sprite->pos1.x % 4) == 0) { - sprite->pos1.y --; + sprite->pos1.y--; } } break; @@ -788,7 +792,7 @@ void sub_8124118(void) sub_807C9B4(7); break; } - for (i = 0; i < 9; i ++) + for (i = 0; i < 9; i++) { spriteId = CreateSprite(&gSpriteTemplate_8401D40[2], 16 * i + 0x60, 8 * i - 8, 0x68); gSprites[spriteId].pos2.x = 8; @@ -835,8 +839,6 @@ void sub_8124118(void) } } -#ifdef NONMATCHING -// this is nowhere near correct void sub_812446C(void) { u8 i; @@ -844,122 +846,15 @@ void sub_812446C(void) u8 k; u8 offset; - for (i = 0, k = 0, offset = 36 * (gUnknown_02039274->unk_001b + 2); i < 3; i ++) + for (i = 0, k = 0, offset = 0x24 * (gUnknown_02039274->unk_001b + 2); i < 3; i++) { - for (j = 0; j < 12; j ++) + for (j = 0; j < 12; j++) { - gUnknown_02039274->unk_0022[i][k] = eCableCar2->mtChimneyTilemap[0][offset + k]; - gUnknown_02039274->unk_0022[i + 3][k] = eCableCar2->mtChimneyTilemap[0][k]; - gUnknown_02039274->unk_0022[i + 6][k] = eCableCar2->mtChimneyTilemap[2][k]; - k ++; + gUnknown_02039274->unk_0022[i][j] = *(eCableCar2->mtChimneyTilemap + (offset++)); + gUnknown_02039274->unk_0022[i + 3][j] = eCableCar2->mtChimneyTilemap[k]; + gUnknown_02039274->unk_0022[i + 6][j] = (eCableCar2->mtChimneyTilemap + 0x24)[k]; + k++; } } gUnknown_02039274->unk_001b = (gUnknown_02039274->unk_001b + 1) % 3; -} -#else -__attribute__((naked)) void sub_812446C(void) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r10\n" - "\tmov r6, r9\n" - "\tmov r5, r8\n" - "\tpush {r5-r7}\n" - "\tsub sp, 0x8\n" - "\tmovs r3, 0\n" - "\tmov r9, r3\n" - "\tldr r2, _08124530 @ =gUnknown_02039274\n" - "\tldr r0, [r2]\n" - "\tldrb r1, [r0, 0x1B]\n" - "\tadds r1, 0x2\n" - "\tlsls r0, r1, 3\n" - "\tadds r0, r1\n" - "\tlsls r0, 26\n" - "\tlsrs r0, 24\n" - "\tmov r12, r0\n" - "_0812448E:\n" - "\tmovs r6, 0\n" - "\tlsls r0, r3, 1\n" - "\tadds r1, r3, 0x3\n" - "\tadds r2, r3, 0x6\n" - "\tadds r4, r3, 0x1\n" - "\tstr r4, [sp]\n" - "\tadds r0, r3\n" - "\tlsls r0, 3\n" - "\tmov r10, r0\n" - "\tlsls r0, r1, 1\n" - "\tadds r0, r1\n" - "\tlsls r0, 3\n" - "\tmov r8, r0\n" - "\tlsls r0, r2, 1\n" - "\tadds r0, r2\n" - "\tlsls r0, 3\n" - "\tstr r0, [sp, 0x4]\n" - "_081244B0:\n" - "\tldr r7, _08124530 @ =gUnknown_02039274\n" - "\tldr r5, [r7]\n" - "\tlsls r3, r6, 1\n" - "\tmov r0, r10\n" - "\tadds r2, r3, r0\n" - "\tadds r4, r5, 0\n" - "\tadds r4, 0x22\n" - "\tadds r2, r4, r2\n" - "\tmov r1, r12\n" - "\tadds r0, r1, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r0, 24\n" - "\tmov r12, r0\n" - "\tlsls r1, 1\n" - "\tldr r7, _08124534 @ =0x02019000\n" - "\tadds r1, r7\n" - "\tldrh r0, [r1]\n" - "\tstrh r0, [r2]\n" - "\tmov r0, r8\n" - "\tadds r1, r3, r0\n" - "\tadds r1, r4, r1\n" - "\tmov r7, r9\n" - "\tlsls r2, r7, 1\n" - "\tldr r7, _08124534 @ =0x02019000\n" - "\tadds r0, r2, r7\n" - "\tldrh r0, [r0]\n" - "\tstrh r0, [r1]\n" - "\tldr r0, [sp, 0x4]\n" - "\tadds r3, r0\n" - "\tadds r4, r3\n" - "\tldr r1, _08124538 @ =0x02019048\n" - "\tadds r2, r1\n" - "\tldrh r0, [r2]\n" - "\tstrh r0, [r4]\n" - "\tmov r0, r9\n" - "\tadds r0, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r0, 24\n" - "\tmov r9, r0\n" - "\tadds r0, r6, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r6, r0, 24\n" - "\tcmp r6, 0xB\n" - "\tbls _081244B0\n" - "\tldr r4, [sp]\n" - "\tlsls r0, r4, 24\n" - "\tlsrs r3, r0, 24\n" - "\tcmp r3, 0x2\n" - "\tbls _0812448E\n" - "\tldrb r0, [r5, 0x1B]\n" - "\tadds r0, 0x1\n" - "\tmovs r1, 0x3\n" - "\tbl __modsi3\n" - "\tstrb r0, [r5, 0x1B]\n" - "\tadd sp, 0x8\n" - "\tpop {r3-r5}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tmov r10, r5\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.align 2, 0\n" - "_08124530: .4byte gUnknown_02039274\n" - "_08124534: .4byte 0x02019000\n" - "_08124538: .4byte 0x02019048"); -} -#endif +} \ No newline at end of file -- cgit v1.2.3 From 81aec4e8dfe9171f7482ff3a38148dbb0e92d407 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 19:51:31 -0500 Subject: through sub_8124598 --- asm/cable_car.s | 98 --------------------------------------------------- src/scene/cable_car.c | 54 +++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 106 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index c7128c69f..92518cef6 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -5,104 +5,6 @@ .text - thumb_func_start sub_812453C -sub_812453C: @ 812453C - push {r4,r5,lr} - ldr r5, _08124594 @ =gUnknown_02039274 - ldr r4, [r5] - ldrb r0, [r4, 0x1C] - adds r0, 0x1 - movs r1, 0x60 - bl __modsi3 - strb r0, [r4, 0x1C] - ldr r1, [r5] - ldrb r0, [r1, 0x1F] - ldrb r2, [r1, 0x1D] - subs r0, r2 - strb r0, [r1, 0x8] - ldr r2, [r5] - adds r0, r2, 0 - adds r0, 0x20 - ldrb r0, [r0] - ldrb r1, [r2, 0x1E] - subs r0, r1 - strb r0, [r2, 0x9] - ldr r1, [r5] - ldrb r0, [r1, 0x1D] - adds r0, 0x1 - strb r0, [r1, 0x1D] - ldr r2, [r5] - ldrb r0, [r2, 0x1D] - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08124580 - ldrb r0, [r2, 0x1E] - adds r0, 0x1 - strb r0, [r2, 0x1E] -_08124580: - ldr r0, [r5] - ldrb r0, [r0, 0x1D] - cmp r0, 0x10 - bls _0812458C - bl sub_81245F4 -_0812458C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08124594: .4byte gUnknown_02039274 - thumb_func_end sub_812453C - - thumb_func_start sub_8124598 -sub_8124598: @ 8124598 - push {r4,r5,lr} - ldr r5, _081245F0 @ =gUnknown_02039274 - ldr r4, [r5] - ldrb r0, [r4, 0x1C] - adds r0, 0x1 - movs r1, 0x60 - bl __modsi3 - strb r0, [r4, 0x1C] - ldr r1, [r5] - ldrb r0, [r1, 0x1D] - ldrb r2, [r1, 0x1F] - adds r0, r2 - strb r0, [r1, 0x8] - ldr r1, [r5] - adds r2, r1, 0 - adds r2, 0x20 - ldrb r0, [r1, 0x1E] - ldrb r2, [r2] - adds r0, r2 - strb r0, [r1, 0x9] - ldr r1, [r5] - ldrb r0, [r1, 0x1D] - adds r0, 0x1 - strb r0, [r1, 0x1D] - ldr r2, [r5] - ldrb r0, [r2, 0x1D] - movs r1, 0x3 - ands r0, r1 - cmp r0, 0 - bne _081245DC - ldrb r0, [r2, 0x1E] - adds r0, 0x1 - strb r0, [r2, 0x1E] -_081245DC: - ldr r0, [r5] - ldrb r0, [r0, 0x1D] - cmp r0, 0x10 - bls _081245E8 - bl sub_812476C -_081245E8: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081245F0: .4byte gUnknown_02039274 - thumb_func_end sub_8124598 - thumb_func_start sub_81245F4 sub_81245F4: @ 81245F4 push {r4-r7,lr} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index c735f8ace..3582ce4fd 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -46,7 +46,11 @@ struct CableCarEwramStruct1 { u8 unk_0015; u8 filler_0016[5]; u8 unk_001b; - u8 filler_001c[6]; + u8 unk_001c; + u8 unk_001d; + u8 unk_001e; + u8 unk_001f; + u8 unk_0020; u16 unk_0022[9][12]; u8 filler_00fa[2]; u16 unk_00fc[0x400]; @@ -74,20 +78,22 @@ EWRAM_DATA u32 filler_02039280 = 0; // Static ROM declarations void sub_8123244(void); -void sub_8124118(void); -void sub_81248AC(u8); -void sub_8123FBC(u8); -void sub_8123C40(void); void sub_8123724(void); void sub_8123878(u8 taskId); void sub_81239E4(u8 taskId); void sub_8123AF8(u8 taskId); -void sub_812453C(void); -void sub_8124598(void); -void sub_8123CB8(struct Sprite *sprite); +void sub_8123C40(void); void nullsub_76(struct Sprite *sprite); +void sub_8123CB8(struct Sprite *sprite); void sub_8123EB8(struct Sprite *sprite); void sub_8123F44(struct Sprite *sprite); +void sub_8123FBC(u8); +void sub_8124118(void); +void sub_812453C(void); +void sub_8124598(void); +void sub_81245F4(void); +void sub_812476C(void); +void sub_81248AC(u8); // .rodata @@ -857,4 +863,36 @@ void sub_812446C(void) } } gUnknown_02039274->unk_001b = (gUnknown_02039274->unk_001b + 1) % 3; +} + +void sub_812453C(void) +{ + gUnknown_02039274->unk_001c = (gUnknown_02039274->unk_001c + 1) % 0x60; + gUnknown_02039274->unk_0008 = gUnknown_02039274->unk_001f - gUnknown_02039274->unk_001d; + gUnknown_02039274->unk_0009 = gUnknown_02039274->unk_0020 - gUnknown_02039274->unk_001e; + gUnknown_02039274->unk_001d++; + if ((gUnknown_02039274->unk_001d % 4) == 0) + { + gUnknown_02039274->unk_001e++; + } + if (gUnknown_02039274->unk_001d > 16) + { + sub_81245F4(); + } +} + +void sub_8124598(void) +{ + gUnknown_02039274->unk_001c = (gUnknown_02039274->unk_001c + 1) % 0x60; + gUnknown_02039274->unk_0008 = gUnknown_02039274->unk_001f + gUnknown_02039274->unk_001d; + gUnknown_02039274->unk_0009 = gUnknown_02039274->unk_0020 + gUnknown_02039274->unk_001e; + gUnknown_02039274->unk_001d++; + if ((gUnknown_02039274->unk_001d % 4) == 0) + { + gUnknown_02039274->unk_001e++; + } + if (gUnknown_02039274->unk_001d > 16) + { + sub_812476C(); + } } \ No newline at end of file -- cgit v1.2.3 From 319eb710ed84f816b7c8194b35c53a8d32e916c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 21:13:50 -0500 Subject: through sub_81245F4 --- asm/cable_car.s | 188 ----------------------------------------------- include/cable_car_util.h | 4 +- src/scene/cable_car.c | 40 +++++++++- 3 files changed, 39 insertions(+), 193 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index 92518cef6..c4b9d9ab7 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -5,194 +5,6 @@ .text - thumb_func_start sub_81245F4 -sub_81245F4: @ 81245F4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r0, 0 - mov r12, r0 - ldr r2, _0812475C @ =gUnknown_02039274 - ldr r0, [r2] - mov r1, r12 - strb r1, [r0, 0x1E] - strb r1, [r0, 0x1D] - ldr r1, [r2] - ldrb r0, [r1, 0x8] - strb r0, [r1, 0x1F] - ldr r0, [r2] - ldrb r1, [r0, 0x9] - adds r0, 0x20 - strb r1, [r0] - ldr r4, [r2] - ldrb r1, [r4, 0x19] - adds r3, r1, 0 - adds r3, 0x1E - adds r0, r3, 0 - mov r9, r2 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - strb r0, [r4, 0x19] - mov r2, r9 - ldr r1, [r2] - ldrb r0, [r1, 0x18] - subs r0, 0x2 - strb r0, [r1, 0x18] - ldr r0, [r2] - ldrb r1, [r0, 0x1A] - adds r2, r1, 0 - adds r2, 0x17 - adds r0, r2, 0 - ldr r3, _08124760 @ =gUnknown_0203927A - mov r10, r3 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - mov r4, r10 - strb r0, [r4] - ldr r7, _08124764 @ =gUnknown_02039278 - ldr r0, _08124768 @ =gUnknown_02039279 - mov r8, r0 -_08124658: - mov r1, r9 - ldr r3, [r1] - ldrb r0, [r3, 0x19] - strb r0, [r7] - mov r2, r10 - ldrb r0, [r2] - mov r4, r12 - adds r1, r0, r4 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - mov r1, r8 - strb r0, [r1] - ldrb r2, [r7] - lsls r2, 1 - ldrb r0, [r1] - lsls r0, 6 - adds r2, r0 - adds r6, r3, 0 - adds r6, 0xFC - adds r2, r6, r2 - ldrb r1, [r3, 0x18] - lsls r1, 1 - mov r4, r12 - lsls r0, r4, 1 - add r0, r12 - lsls r5, r0, 3 - adds r1, r5 - adds r4, r3, 0 - adds r4, 0x22 - adds r1, r4, r1 - ldrh r0, [r1] - strh r0, [r2] - ldrb r1, [r7] - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r7] - ldrb r1, [r7] - lsls r1, 1 - mov r2, r8 - ldrb r0, [r2] - lsls r0, 6 - adds r1, r0 - adds r1, r6, r1 - ldrb r0, [r3, 0x18] - adds r0, 0x1 - lsls r0, 1 - adds r0, r5 - adds r0, r4, r0 - ldrh r0, [r0] - strh r0, [r1] - mov r0, r12 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - cmp r0, 0x8 - bls _08124658 - ldr r4, _08124764 @ =gUnknown_02039278 - mov r5, r9 - ldr r3, [r5] - ldrb r1, [r3, 0x19] - adds r2, r1, 0 - adds r2, 0x1E - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r4] - adds r0, r3, 0 - adds r0, 0xFC - ldrb r2, [r4] - movs r1, 0x2 - str r1, [sp] - movs r6, 0x20 - str r6, [sp, 0x4] - movs r1, 0 - movs r3, 0 - bl sub_8124E7C - ldr r1, [r5] - ldrb r0, [r1, 0x18] - cmp r0, 0 - bne _0812474C - ldrb r2, [r1, 0x1A] - adds r3, r2, 0 - adds r3, 0x1D - adds r0, r3, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - strb r0, [r1, 0x1A] - mov r3, r9 - ldr r1, [r3] - movs r0, 0xC - strb r0, [r1, 0x18] - bl sub_812446C - mov r4, r9 - ldr r1, [r4] - ldrb r3, [r1, 0x1A] - adds r4, r3, 0x1 - adds r0, r4, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r4, r0 - ldr r2, _08124764 @ =gUnknown_02039278 - strb r0, [r2] - adds r0, r1, 0 - adds r0, 0xFC - ldrb r3, [r2] - str r6, [sp] - movs r1, 0x9 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - bl sub_8124E7C -_0812474C: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812475C: .4byte gUnknown_02039274 -_08124760: .4byte gUnknown_0203927A -_08124764: .4byte gUnknown_02039278 -_08124768: .4byte gUnknown_02039279 - thumb_func_end sub_81245F4 - thumb_func_start sub_812476C sub_812476C: @ 812476C push {r4-r7,lr} diff --git a/include/cable_car_util.h b/include/cable_car_util.h index 76198af02..d109190b0 100644 --- a/include/cable_car_util.h +++ b/include/cable_car_util.h @@ -7,7 +7,7 @@ // Exported ROM declarations -void sub_8124F08(u16 *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height); -void sub_8124E7C(u16 *dest, u16 a1, u8 a2, u8 a3, u8 a4, u8 a5); +void sub_8124F08(void *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height); +void sub_8124E7C(void *dest, u16 a1, u8 a2, u8 a3, u8 a4, u8 a5); #endif //GUARD_CABLE_CAR_UTIL_H diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 3582ce4fd..3d93010a2 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -44,7 +44,11 @@ struct CableCarEwramStruct1 { u8 filler_0000e[6]; u8 unk_0014; u8 unk_0015; - u8 filler_0016[5]; + u8 unk_0016; + u8 unk_0017; + u8 unk_0018; + u8 unk_0019; + u8 unk_001a; u8 unk_001b; u8 unk_001c; u8 unk_001d; @@ -53,7 +57,7 @@ struct CableCarEwramStruct1 { u8 unk_0020; u16 unk_0022[9][12]; u8 filler_00fa[2]; - u16 unk_00fc[0x400]; + u16 unk_00fc[0x20][0x20]; u16 unk_08fc[0x400]; }; // size 0x10FC @@ -895,4 +899,34 @@ void sub_8124598(void) { sub_812476C(); } -} \ No newline at end of file +} + +void sub_81245F4(void) +{ + u8 i = 0; + + gUnknown_02039274->unk_001d = gUnknown_02039274->unk_001e = 0; + gUnknown_02039274->unk_001f = gUnknown_02039274->unk_0008; + gUnknown_02039274->unk_0020 = gUnknown_02039274->unk_0009; + gUnknown_02039274->unk_0019 = (gUnknown_02039274->unk_0019 + 30) % 32; + gUnknown_02039274->unk_0018 -= 2; + gUnknown_0203927A = (gUnknown_02039274->unk_001a + 23) % 32; + for (i = 0; i < 9; i++) + { + gUnknown_02039278 = gUnknown_02039274->unk_0019; + gUnknown_02039279 = (gUnknown_0203927A + i) % 32; + gUnknown_02039274->unk_00fc[gUnknown_02039279][gUnknown_02039278] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018]; + gUnknown_02039278 = (gUnknown_02039278 + 1) % 32; + gUnknown_02039274->unk_00fc[gUnknown_02039279][gUnknown_02039278] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018 + 1]; + } + gUnknown_02039278 = (gUnknown_02039274->unk_0019 + 30) % 32; + sub_8124E7C(gUnknown_02039274->unk_00fc, 0, gUnknown_02039278, 0, 2, 32); + if (gUnknown_02039274->unk_0018 == 0) + { + gUnknown_02039274->unk_001a = (gUnknown_02039274->unk_001a + 29) % 32; + gUnknown_02039274->unk_0018 = 12; + sub_812446C(); + gUnknown_02039278 = (gUnknown_02039274->unk_001a + 1) % 32; + sub_8124E7C(gUnknown_02039274->unk_00fc, 0, 0, gUnknown_02039278, 32, 9); + } +} -- cgit v1.2.3 From 66a7a42a108c2d6c86c80d28397ea243969094cd Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 20:23:49 -0600 Subject: decompile sub_80EADC0 - sub_80EB37C --- asm/easy_chat.s | 815 ---------------------------------------------------- include/easy_chat.h | 6 +- src/easy_chat.c | 103 ------- src/easy_chat_2.c | 313 +++++++++++++++++++- 4 files changed, 312 insertions(+), 925 deletions(-) diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 6469aaf62..a71aefb42 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -5,819 +5,4 @@ .text - thumb_func_start sub_80EADC0 -sub_80EADC0: @ 80EADC0 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r1, 16 - lsrs r3, r1, 16 - cmp r2, 0x15 - bhi _080EAE82 - lsls r0, r2, 2 - ldr r1, _080EADD8 @ =_080EADDC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080EADD8: .4byte _080EADDC - .align 2, 0 -_080EADDC: - .4byte _080EAE50 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE62 - .4byte _080EAE62 - .4byte _080EAE62 - .4byte _080EAE34 - .4byte _080EAE78 -_080EAE34: - ldr r0, _080EAE4C @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, r2 - adds r0, 0x67 - ldrb r0, [r0] - cmp r0, 0 - beq _080EAE70 - lsls r0, r3, 24 - lsrs r0, 24 - bl sub_80EB868 - b _080EAE7C - .align 2, 0 -_080EAE4C: .4byte gUnknown_083DB694 -_080EAE50: - adds r0, r3, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - b _080EAE7C -_080EAE62: - ldr r0, _080EAE74 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, r2 - adds r0, 0x67 - ldrb r0, [r0] - cmp r0, 0 - bne _080EAE82 -_080EAE70: - movs r0, 0 - b _080EAE84 - .align 2, 0 -_080EAE74: .4byte gUnknown_083DB694 -_080EAE78: - bl sub_80EB9C8 -_080EAE7C: - lsls r0, 24 - lsrs r0, 24 - b _080EAE84 -_080EAE82: - movs r0, 0x1 -_080EAE84: - pop {r1} - bx r1 - thumb_func_end sub_80EADC0 - - thumb_func_start sub_80EAE88 -sub_80EAE88: @ 80EAE88 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - beq _080EAEA6 - cmp r4, 0x14 - beq _080EAEB2 - adds r0, r4, 0 - bl sub_80EAD7C - lsls r0, 24 - cmp r0, 0 - bne _080EAEBC - movs r0, 0 - b _080EAEC2 -_080EAEA6: - movs r0, 0 - bl GetHoennPokedexCount - lsls r0, 16 - lsrs r0, 16 - b _080EAEC2 -_080EAEB2: - bl sub_80EB8C0 - lsls r0, 24 - lsrs r0, 24 - b _080EAEC2 -_080EAEBC: - ldr r0, _080EAEC8 @ =gEasyChatGroupSizes - adds r0, r4, r0 - ldrb r0, [r0] -_080EAEC2: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080EAEC8: .4byte gEasyChatGroupSizes - thumb_func_end sub_80EAE88 - - thumb_func_start sub_80EAECC -sub_80EAECC: @ 80EAECC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - movs r0, 0 - mov r8, r0 - ldr r1, _080EAF10 @ =gUnknown_083DB694 - ldr r0, [r1] - ldr r3, _080EAF14 @ =0x00004142 - adds r3, r0, r3 - str r3, [sp, 0x4] -_080EAEE6: - ldr r1, _080EAF18 @ =gEasyChatWordsByLetter - mov r7, r8 - lsls r2, r7, 1 - adds r0, r2, r1 - ldrh r4, [r0] - mov r3, r8 - adds r3, 0x1 - lsls r0, r3, 1 - adds r0, r1 - ldrh r0, [r0] - str r0, [sp] - ldr r0, [sp, 0x4] - adds r1, r0, r2 - movs r0, 0 - strh r0, [r1] - mov r9, r0 - adds r6, r4, 0 - mov r10, r2 - str r3, [sp, 0x8] - b _080EB00C - .align 2, 0 -_080EAF10: .4byte gUnknown_083DB694 -_080EAF14: .4byte 0x00004142 -_080EAF18: .4byte gEasyChatWordsByLetter -_080EAF1C: - ldr r2, _080EAFB0 @ =gEasyChatWordsAlphabetized - adds r0, r6, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r6, r1, 16 - lsls r0, 1 - adds r0, r2 - ldrh r1, [r0] - adds r4, r1, 0 - ldr r0, _080EAFB4 @ =0x0000feff - cmp r1, r0 - bls _080EAFCC - movs r0, 0xFF - ands r1, r0 - movs r7, 0 - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r3, _080EAFB8 @ =0x0000ffff - cmp r5, r3 - beq _080EB00C - mov r1, r8 - lsls r0, r1, 8 - subs r0, r1 - lsls r3, r0, 1 -_080EAF4E: - adds r1, r6, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 1 - ldr r0, _080EAFB0 @ =gEasyChatWordsAlphabetized - adds r1, r0 - ldrh r4, [r1] - lsrs r0, r4, 9 - ldr r1, _080EAFBC @ =0x000001ff - adds r2, r1, 0 - adds r1, r4, 0 - ands r1, r2 - str r3, [sp, 0xC] - bl sub_80EADC0 - lsls r0, 24 - ldr r3, [sp, 0xC] - cmp r0, 0 - beq _080EAFA2 - cmp r7, 0 - bne _080EAFA2 - ldr r7, _080EAFC0 @ =gUnknown_083DB694 - ldr r2, [r7] - mov r1, r9 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - lsls r1, 1 - adds r1, r3 - ldr r7, _080EAFC4 @ =0x00000b78 - adds r0, r2, r7 - adds r0, r1 - strh r4, [r0] - ldr r0, _080EAFC8 @ =0x00004142 - adds r2, r0 - add r2, r10 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - movs r7, 0x1 -_080EAFA2: - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r1, _080EAFB8 @ =0x0000ffff - cmp r5, r1 - bne _080EAF4E - b _080EB00C - .align 2, 0 -_080EAFB0: .4byte gEasyChatWordsAlphabetized -_080EAFB4: .4byte 0x0000feff -_080EAFB8: .4byte 0x0000ffff -_080EAFBC: .4byte 0x000001ff -_080EAFC0: .4byte gUnknown_083DB694 -_080EAFC4: .4byte 0x00000b78 -_080EAFC8: .4byte 0x00004142 -_080EAFCC: - lsrs r0, r4, 9 - ldr r3, _080EB030 @ =0x000001ff - adds r2, r3, 0 - adds r1, r4, 0 - ands r1, r2 - bl sub_80EADC0 - lsls r0, 24 - cmp r0, 0 - beq _080EB00C - ldr r7, _080EB034 @ =gUnknown_083DB694 - ldr r2, [r7] - mov r1, r9 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - mov r3, r8 - lsls r0, r3, 8 - subs r0, r3 - adds r0, r1 - lsls r0, 1 - ldr r7, _080EB038 @ =0x00000b78 - adds r1, r2, r7 - adds r1, r0 - strh r4, [r1] - ldr r0, _080EB03C @ =0x00004142 - adds r2, r0 - add r2, r10 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] -_080EB00C: - ldr r1, [sp] - cmp r6, r1 - bcc _080EAF1C - ldr r3, [sp, 0x8] - lsls r0, r3, 16 - lsrs r0, 16 - mov r8, r0 - cmp r0, 0x1A - bhi _080EB020 - b _080EAEE6 -_080EB020: - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EB030: .4byte 0x000001ff -_080EB034: .4byte gUnknown_083DB694 -_080EB038: .4byte 0x00000b78 -_080EB03C: .4byte 0x00004142 - thumb_func_end sub_80EAECC - - thumb_func_start sub_80EB040 -sub_80EB040: @ 80EB040 - push {r4-r6,lr} - movs r3, 0 -_080EB044: - adds r6, r3, 0x1 - cmp r3, 0 - beq _080EB094 - cmp r3, 0x15 - beq _080EB094 - cmp r3, 0x12 - beq _080EB094 - cmp r3, 0x13 - beq _080EB094 - ldr r0, _080EB0A4 @ =gEasyChatGroupWords - lsls r1, r3, 2 - adds r1, r0 - ldr r2, [r1] - movs r4, 0 - ldrb r0, [r2] - cmp r0, 0xFF - beq _080EB094 - ldr r0, _080EB0A8 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080EB0AC @ =0x000041a4 - adds r5, r0, r1 -_080EB06E: - lsls r0, r4, 2 - lsls r1, r3, 10 - adds r0, r1 - adds r0, r5, r0 - str r2, [r0] - ldrb r0, [r2] - adds r1, r4, 0x1 - cmp r0, 0xFF - beq _080EB088 -_080EB080: - adds r2, 0x1 - ldrb r0, [r2] - cmp r0, 0xFF - bne _080EB080 -_080EB088: - adds r2, 0x1 - lsls r0, r1, 16 - lsrs r4, r0, 16 - ldrb r0, [r2] - cmp r0, 0xFF - bne _080EB06E -_080EB094: - lsls r0, r6, 16 - lsrs r3, r0, 16 - cmp r3, 0x15 - bls _080EB044 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EB0A4: .4byte gEasyChatGroupWords -_080EB0A8: .4byte gUnknown_083DB694 -_080EB0AC: .4byte 0x000041a4 - thumb_func_end sub_80EB040 - - thumb_func_start sub_80EB0B0 -sub_80EB0B0: @ 80EB0B0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r3, _080EB184 @ =gUnknown_083DB694 - ldr r4, [r3] - adds r0, r4, 0 - adds r0, 0x26 - ldrb r5, [r0] - cmp r5, 0 - bne _080EB19C - movs r0, 0xDC - lsls r0, 1 - adds r2, r4, r0 - ldrb r6, [r2] - lsls r1, r6, 1 - ldr r7, _080EB188 @ =0x00004178 - adds r0, r4, r7 - adds r0, r1 - strh r5, [r0] - movs r7, 0 - movs r0, 0 - mov r9, r0 - ldr r1, _080EB18C @ =gEasyChatGroupOrders - lsls r0, r6, 2 - adds r0, r1 - ldr r0, [r0] - str r0, [sp] - movs r1, 0 - mov r8, r1 - ldr r1, _080EB190 @ =gEasyChatGroupSizes - ldrb r0, [r2] - adds r0, r1 - ldrb r0, [r0] - cmp r8, r0 - bcc _080EB0FE - b _080EB1FA -_080EB0FE: - movs r2, 0xDC - lsls r2, 1 - adds r2, r4, r2 - str r2, [sp, 0x4] - lsls r5, r6, 24 - mov r10, r5 -_080EB10A: - mov r1, r8 - lsls r0, r1, 1 - ldr r2, [sp] - adds r5, r0, r2 - ldrh r1, [r5] - mov r2, r10 - lsrs r0, r2, 24 - bl sub_80EADC0 - lsls r0, 24 - cmp r0, 0 - beq _080EB16A - ldr r0, _080EB184 @ =gUnknown_083DB694 - ldr r3, [r0] - lsls r1, r7, 1 - mov r2, r9 - lsls r0, r2, 2 - adds r1, r0 - ldr r0, _080EB194 @ =0x00009a2a - adds r4, r3, r0 - adds r4, r1 - movs r0, 0x7F - ands r0, r6 - lsls r0, 9 - ldrh r1, [r5] - ldr r5, _080EB198 @ =0x000001ff - adds r2, r5, 0 - ands r1, r2 - orrs r0, r1 - strh r0, [r4] - lsls r0, r6, 1 - ldr r1, _080EB188 @ =0x00004178 - adds r3, r1 - adds r3, r0 - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1 - bls _080EB16A - movs r7, 0 - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 -_080EB16A: - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r1, _080EB190 @ =gEasyChatGroupSizes - ldr r2, [sp, 0x4] - ldrb r0, [r2] - adds r0, r1 - ldrb r0, [r0] - cmp r8, r0 - bcc _080EB10A - b _080EB1FA - .align 2, 0 -_080EB184: .4byte gUnknown_083DB694 -_080EB188: .4byte 0x00004178 -_080EB18C: .4byte gEasyChatGroupOrders -_080EB190: .4byte gEasyChatGroupSizes -_080EB194: .4byte 0x00009a2a -_080EB198: .4byte 0x000001ff -_080EB19C: - movs r5, 0xDC - lsls r5, 1 - adds r0, r4, r5 - ldrb r2, [r0] - movs r3, 0 - movs r6, 0 - movs r5, 0 - lsls r1, r2, 1 - ldr r7, _080EB20C @ =0x00004142 - adds r0, r4, r7 - adds r1, r0, r1 - ldrh r0, [r1] - cmp r5, r0 - bcs _080EB1FA - ldr r7, _080EB210 @ =0x00009a2a - adds r7, r4 - mov r8, r7 - lsls r0, r2, 8 - subs r0, r2 - lsls r7, r0, 1 - ldr r0, _080EB214 @ =0x00000b78 - adds r2, r4, r0 - adds r4, r1, 0 -_080EB1CA: - lsls r1, r3, 1 - lsls r0, r6, 2 - adds r1, r0 - add r1, r8 - lsls r0, r5, 1 - adds r0, r7 - adds r0, r2, r0 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x1 - bls _080EB1EE - movs r3, 0 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_080EB1EE: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r1, [r4] - cmp r5, r1 - bcc _080EB1CA -_080EB1FA: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EB20C: .4byte 0x00004142 -_080EB210: .4byte 0x00009a2a -_080EB214: .4byte 0x00000b78 - thumb_func_end sub_80EB0B0 - - thumb_func_start sub_80EB218 -sub_80EB218: @ 80EB218 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - lsls r6, r1, 16 - lsrs r4, r6, 16 - adds r7, r4, 0 - lsls r2, 16 - lsrs r2, 16 - mov r8, r2 - adds r0, r4, 0 - bl sub_80EB37C - lsls r0, 24 - cmp r0, 0 - beq _080EB240 - ldr r1, _080EB23C @ =gOtherText_ThreeQuestions - b _080EB2A2 - .align 2, 0 -_080EB23C: .4byte gOtherText_ThreeQuestions -_080EB240: - ldr r0, _080EB250 @ =0x0000ffff - cmp r4, r0 - bne _080EB254 - adds r1, r5, 0 - movs r0, 0xFF - strb r0, [r1] - b _080EB2AA - .align 2, 0 -_080EB250: .4byte 0x0000ffff -_080EB254: - lsrs r2, r6, 25 - ldr r1, _080EB268 @ =0x000001ff - ands r1, r7 - cmp r2, 0x13 - bgt _080EB26C - cmp r2, 0x12 - bge _080EB280 - cmp r2, 0 - beq _080EB270 - b _080EB290 - .align 2, 0 -_080EB268: .4byte 0x000001ff -_080EB26C: - cmp r2, 0x15 - bne _080EB290 -_080EB270: - movs r0, 0xB - muls r1, r0 - ldr r0, _080EB27C @ =gSpeciesNames - adds r1, r0 - b _080EB2A2 - .align 2, 0 -_080EB27C: .4byte gSpeciesNames -_080EB280: - movs r0, 0xD - muls r1, r0 - ldr r0, _080EB28C @ =gMoveNames - adds r1, r0 - b _080EB2A2 - .align 2, 0 -_080EB28C: .4byte gMoveNames -_080EB290: - ldr r0, _080EB2CC @ =gUnknown_083DB694 - ldr r0, [r0] - lsls r1, 2 - lsls r2, 10 - adds r1, r2 - ldr r2, _080EB2D0 @ =0x000041a4 - adds r0, r2 - adds r0, r1 - ldr r1, [r0] -_080EB2A2: - adds r0, r5, 0 - bl StringCopy - adds r1, r0, 0 -_080EB2AA: - movs r0, 0xFC - strb r0, [r1] - movs r0, 0x13 - strb r0, [r1, 0x1] - mov r2, r8 - lsls r0, r2, 3 - strb r0, [r1, 0x2] - adds r1, 0x3 - movs r0, 0xFF - strb r0, [r1] - adds r0, r1, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080EB2CC: .4byte gUnknown_083DB694 -_080EB2D0: .4byte 0x000041a4 - thumb_func_end sub_80EB218 - - thumb_func_start sub_80EB2D4 -sub_80EB2D4: @ 80EB2D4 - push {r4-r6,lr} - lsls r5, r0, 16 - lsrs r4, r5, 16 - adds r6, r4, 0 - adds r0, r4, 0 - bl sub_80EB37C - lsls r0, 24 - cmp r0, 0 - beq _080EB2F8 - ldr r0, _080EB2F4 @ =gOtherText_ThreeQuestions - bl StringLength - lsls r0, 16 - lsrs r0, 16 - b _080EB374 - .align 2, 0 -_080EB2F4: .4byte gOtherText_ThreeQuestions -_080EB2F8: - ldr r0, _080EB304 @ =0x0000ffff - cmp r4, r0 - bne _080EB308 - movs r0, 0 - b _080EB374 - .align 2, 0 -_080EB304: .4byte 0x0000ffff -_080EB308: - lsrs r2, r5, 25 - ldr r1, _080EB31C @ =0x000001ff - ands r1, r6 - cmp r2, 0x13 - bgt _080EB320 - cmp r2, 0x12 - bge _080EB334 - cmp r2, 0 - beq _080EB324 - b _080EB344 - .align 2, 0 -_080EB31C: .4byte 0x000001ff -_080EB320: - cmp r2, 0x15 - bne _080EB344 -_080EB324: - movs r0, 0xB - muls r1, r0 - ldr r0, _080EB330 @ =gSpeciesNames - adds r1, r0 - b _080EB356 - .align 2, 0 -_080EB330: .4byte gSpeciesNames -_080EB334: - movs r0, 0xD - muls r1, r0 - ldr r0, _080EB340 @ =gMoveNames - adds r1, r0 - b _080EB356 - .align 2, 0 -_080EB340: .4byte gMoveNames -_080EB344: - ldr r0, _080EB35C @ =gUnknown_083DB694 - ldr r0, [r0] - lsls r1, 2 - lsls r2, 10 - adds r1, r2 - ldr r2, _080EB360 @ =0x000041a4 - adds r0, r2 - adds r0, r1 - ldr r1, [r0] -_080EB356: - movs r2, 0 - b _080EB36C - .align 2, 0 -_080EB35C: .4byte gUnknown_083DB694 -_080EB360: .4byte 0x000041a4 -_080EB364: - adds r1, 0x1 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 -_080EB36C: - ldrb r0, [r1] - cmp r0, 0xFF - bne _080EB364 - adds r0, r2, 0 -_080EB374: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80EB2D4 - - thumb_func_start sub_80EB37C -sub_80EB37C: @ 80EB37C - push {r4,r5,lr} - lsls r1, r0, 16 - lsrs r3, r1, 16 - ldr r0, _080EB3A0 @ =0x0000ffff - cmp r3, r0 - beq _080EB3EA - lsrs r2, r1, 25 - ldr r5, _080EB3A4 @ =0x000001ff - ands r5, r3 - cmp r2, 0x15 - bhi _080EB3F4 - cmp r2, 0x13 - bgt _080EB3A8 - cmp r2, 0x12 - bge _080EB3AC - cmp r2, 0 - beq _080EB3AC - b _080EB3E0 - .align 2, 0 -_080EB3A0: .4byte 0x0000ffff -_080EB3A4: .4byte 0x000001ff -_080EB3A8: - cmp r2, 0x15 - bne _080EB3E0 -_080EB3AC: - ldr r0, _080EB3D8 @ =gEasyChatGroupWords - lsls r1, r2, 2 - adds r1, r0 - ldr r4, [r1] - movs r3, 0 - ldr r0, _080EB3DC @ =gEasyChatGroupSizes - adds r0, r2, r0 - ldrb r0, [r0] - cmp r3, r0 - bcs _080EB3F4 - adds r1, r0, 0 -_080EB3C2: - lsls r0, r3, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r5, r0 - beq _080EB3EA - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r1 - bcc _080EB3C2 - b _080EB3F4 - .align 2, 0 -_080EB3D8: .4byte gEasyChatGroupWords -_080EB3DC: .4byte gEasyChatGroupSizes -_080EB3E0: - ldr r0, _080EB3F0 @ =gEasyChatGroupSizes - adds r0, r2, r0 - ldrb r0, [r0] - cmp r5, r0 - bcs _080EB3F4 -_080EB3EA: - movs r0, 0 - b _080EB3F6 - .align 2, 0 -_080EB3F0: .4byte gEasyChatGroupSizes -_080EB3F4: - movs r0, 0x1 -_080EB3F6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80EB37C - .align 2, 0 @ Don't pad with nop. diff --git a/include/easy_chat.h b/include/easy_chat.h index 2fe11dd11..d2b562931 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -74,12 +74,14 @@ struct Shared1000 u8 filler1C1[3]; void (*unk1C4)(void); u8 unk1C8[0x6C8-0x1C8]; - u8 unk6C8[0x4142-0x6C8]; + u8 unk6C8[0xB78-0x6C8]; + u16 unkB78[0x1B][255]; #if GERMAN u8 filler4142_de[0x32A]; #endif u16 unk4142[(0x78-0x42)/2]; - u16 unk4178[(0x99A4-0x4178)/2]; // unknown length + u16 unk4178[(0x41A4-0x4178)/2]; // unknown length + const u8 *unk41A4[0x16][0x100]; #if GERMAN u8 filler99A4_de[2]; #endif diff --git a/src/easy_chat.c b/src/easy_chat.c index 338505a4b..88afa8fe3 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -23,109 +23,6 @@ extern u16 gSpecialVar_0x8004; // put this in .bss, damnit! __attribute__((section(".bss"))) u8 gUnknown_03000740 = 0; -/* - -extern const u8 *const gUnknown_083DB694[]; - -u16 sub_80EB2D4(u16 a) -{ - u16 r2; - u16 r1; - const u8 *str; - - if (sub_80EB37C(a) != 0) - return StringLength(gOtherText_ThreeQuestions); - //_080EB2F8 - if (a == 0xFFFF) - return 0; - //_080EB308 - r2 = a >> 9; - r1 = a & 0x1FF; - switch (r2) - { - case 0: - case 0x13: - case 0x14: - case 0x15: - str = gSpeciesNames[r1]; - break; - case 0x12: - str = gMoveNames[r1]; - break; - case 0x15: - str = - } -} -*/ - -#ifdef NONMATCHING -bool8 sub_80EB37C(u16 a) -{ - u16 i; - u16 r2; - u16 r5; - u16 *r4; - - if (a == 0xFFFF) - return FALSE; - - r2 = a >> 9; - r5 = a & 0x1FF; - - if (r2 <= 0x15) - { - /* - switch (r2) - { - case EC_GROUP_MOVE_1: - case EC_GROUP_MOVE_2: - case EC_GROUP_POKEMON: - case EC_GROUP_POKEMON_2: - case EC_GROUP_TRENDY_SAYING: - r4 = gEasyChatGroupWords[r2]; - for (i = 0; i < gEasyChatGroupSizes[r2]; i++) - { - if (r5 == r4[i]) - return FALSE; - } - break; - default: - if (r5 < gEasyChatGroupSizes[a]) - return FALSE; - break; - } - */ - if ((r2 == EC_GROUP_MOVE_1 || r2 == EC_GROUP_MOVE_2) - || (r2 == EC_GROUP_POKEMON || r2 == EC_GROUP_POKEMON_2)) - { - r4 = gEasyChatGroupWords[r2]; - for (i = 0; i < gEasyChatGroupSizes[r2]; i++) - { - if (r5 == r4[i]) - return FALSE; - } - } - else if (r2 == EC_GROUP_TRENDY_SAYING) - { - r4 = gEasyChatGroupWords[r2]; - for (i = 0; i < gEasyChatGroupSizes[r2]; i++) - { - if (r5 == r4[i]) - return FALSE; - } - } - else - { - if (r5 < gEasyChatGroupSizes[a]) - return FALSE; - } - } - return TRUE; -} -#else - -#endif - // returns the end of the destination buffer text u8 *EasyChat_GetWordText(u8 *dst, u16 word) { diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 8fbc54458..5dc4bb1c1 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1,6 +1,7 @@ #include "global.h" #include "constants/easy_chat.h" #include "constants/map_objects.h" +#include "data2.h" #include "decompress.h" #include "easy_chat.h" #include "event_data.h" @@ -8,9 +9,11 @@ #include "graphics.h" #include "menu.h" #include "palette.h" +#include "pokedex.h" #include "sprite.h" #include "string_util.h" #include "strings.h" +#include "strings2.h" #include "trig.h" #include "unknown_task.h" @@ -59,6 +62,8 @@ void sub_80EACBC(void *, u16 *, struct UnknownEasyChatStruct1 *); u8 *sub_80EAD64(u8 *, u8, int); u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(u16); +bool8 sub_80EB37C(u16); +bool8 sub_80EB868(u8); u8 sub_80EB9C8(void); const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); @@ -1075,11 +1080,9 @@ void sub_80E91D4(u8 a) return; } - //_080E9200 if (sub_80E91A4() == 10) MenuDrawTextWindow(3, 14, 26, 19); - //_080E9218 sub_80E9198(a); switch (a) { @@ -2070,10 +2073,13 @@ void sub_80EAD08(void) } extern const u8 *const gEasyChatGroupNames[]; +extern const u8 gEasyChatGroupSizes[]; +extern const u16 gEasyChatWordsByLetter[]; +extern const u16 gEasyChatWordsAlphabetized[]; -u8 *sub_80EAD64(u8 *a, u8 b, int unused) +u8 *sub_80EAD64(u8 *a, u8 group, int unused) { - return StringCopy(a, gEasyChatGroupNames[b]); + return StringCopy(a, gEasyChatGroupNames[group]); } bool8 sub_80EAD7C(u8 group) @@ -2088,7 +2094,304 @@ bool8 sub_80EAD7C(u8 group) return FlagGet(FLAG_SYS_GAME_CLEAR); case EC_GROUP_POKEMON_2: return sub_80EB9C8(); + default: + return TRUE; + } +} + +bool8 sub_80EADC0(u8 group, u16 word) +{ + switch (group) + { + case EC_GROUP_TRENDY_SAYING: + if (gUnknown_083DB694->unk40[2][11 + group] == 0) + return FALSE; + return sub_80EB868(word); + case EC_GROUP_POKEMON: + return GetSetPokedexFlag(SpeciesToNationalPokedexNum(word), 0); + case EC_GROUP_EVENTS: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + if (gUnknown_083DB694->unk40[2][11 + group] == 0) + return FALSE; + return TRUE; + case EC_GROUP_POKEMON_2: + return sub_80EB9C8(); + default: + return TRUE; + } +} + +u16 sub_80EAE88(u8 group) +{ + switch (group) + { + case 0: + return GetHoennPokedexCount(0); + case 0x14: + return sub_80EB8C0(); + default: + if (sub_80EAD7C(group)) + return gEasyChatGroupSizes[group]; + return FALSE; + } +} + +void sub_80EAECC(void) +{ + u16 i; + u16 r9; + u16 r6; + u16 r5; + bool8 r7; + + for (i = 0; i < 27; i++) + { + u16 word = gEasyChatWordsByLetter[i]; + u16 sp0 = gEasyChatWordsByLetter[i + 1]; + + gUnknown_083DB694->unk4142[i] = 0; + r9 = 0; + r6 = word; + while (r6 < sp0) + { + u16 word = gEasyChatWordsAlphabetized[r6++]; + + if (word > 0xFEFF) + { + r5 = word & 0xFF; + r7 = FALSE; + while (--r5 != 0xFFFF) + { + word = gEasyChatWordsAlphabetized[r6++]; + if (sub_80EADC0(EC_GROUP(word), EC_INDEX(word)) && !r7) + { + gUnknown_083DB694->unkB78[i][r9++] = word; + gUnknown_083DB694->unk4142[i]++; + r7 = TRUE; + } + } + } + else + { + if (sub_80EADC0(EC_GROUP(word), EC_INDEX(word))) + { + gUnknown_083DB694->unkB78[i][r9++] = word; + gUnknown_083DB694->unk4142[i]++; + } + } + } } - return TRUE; } +extern const u8 *const gEasyChatGroupWords[]; +extern const u16 *const gEasyChatGroupOrders[]; +extern const u8 gEasyChatGroupSizes[]; + +// loads strings of all easy chat words except for the species and move names. +void sub_80EB040(void) +{ + u16 group; + u16 index; + + for (group = 0; group <= EC_GROUP_POKEMON_2; group++) + { + if (group != EC_GROUP_POKEMON + && group != EC_GROUP_POKEMON_2 + && group != EC_GROUP_MOVE_1 + && group != EC_GROUP_MOVE_2) + { + const u8 *wordText = gEasyChatGroupWords[group]; + + index = 0; + while (*wordText != EOS) + { + gUnknown_083DB694->unk41A4[group][index] = wordText; + + // Find the end of the current word + while (*wordText != EOS) + wordText++; + // Skip over the EOS + wordText++; + + index++; + } + } + } +} + +void sub_80EB0B0(void) +{ + const u16 *sp0; + u16 r7; + u16 r9; + u16 r8; + + if (gUnknown_083DB694->unk26 == 0) + { + u16 r6 = gUnknown_083DB694->unk1B8; + + gUnknown_083DB694->unk4178[r6] = 0; + r7 = 0; + r9 = 0; + sp0 = gEasyChatGroupOrders[r6]; + for (r8 = 0; r8 < gEasyChatGroupSizes[gUnknown_083DB694->unk1B8]; r8++) + { + if (sub_80EADC0(r6, sp0[r8])) + { + gUnknown_083DB694->unk9A2A[r9][r7] = ((r6 & 0x7F) << 9) | (sp0[r8] & 0x1FF); + gUnknown_083DB694->unk4178[r6]++; + r7++; + if (r7 > 1) + { + r7 = 0; + r9++; + } + } + } + } + else + { + u8 r2 = gUnknown_083DB694->unk1B8; + u16 r3 = 0; + u16 r6 = 0; + u16 r5; + + for (r5 = 0; r5 < gUnknown_083DB694->unk4142[r2]; r5++) + { + gUnknown_083DB694->unk9A2A[r6][r3] = gUnknown_083DB694->unkB78[r2][r5]; + r3++; + if (r3 > 1) + { + r3 = 0; + r6++; + } + } + } +} + +u8 *sub_80EB218(u8 *a, u16 word, u16 c) +{ + u8 *wordText; + + if (sub_80EB37C(word)) + { + wordText = StringCopy(a, gOtherText_ThreeQuestions); + } + else if (word == 0xFFFF) + { + wordText = a; + wordText[0] = EOS; // Why? It's going to get overwritten. + } + else + { + u16 group = EC_GROUP(word); + u16 index = EC_INDEX(word); + + switch (group) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + wordText = StringCopy(a, gSpeciesNames[index]); + break; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + wordText = StringCopy(a, gMoveNames[index]); + break; + default: + wordText = StringCopy(a, gUnknown_083DB694->unk41A4[group][index]); + break; + } + } + + wordText[0] = EXT_CTRL_CODE_BEGIN; + wordText[1] = 0x13; + wordText[2] = c * 8; + wordText += 3; + + *wordText = EOS; + + return wordText; +} + +u16 sub_80EB2D4(u16 word) +{ + const u8 *wordText; + u16 length; + + if (sub_80EB37C(word)) + { + return StringLength(gOtherText_ThreeQuestions); + } + else if (word == 0xFFFF) + { + return 0; + } + else + { + u16 group = EC_GROUP(word); + u16 index = EC_INDEX(word); + + switch (group) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + wordText = gSpeciesNames[index]; + break; + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + wordText = gMoveNames[index]; + break; + default: + wordText = gUnknown_083DB694->unk41A4[group][index]; + break; + } + } + + length = 0; + while (*wordText != EOS) + { + wordText++; + length++; + } + return length; +} + +bool8 sub_80EB37C(u16 word) +{ + const u16 *r4; + u16 r3; + + if (word == 0xFFFF) + { + return FALSE; + } + else + { + u16 group = EC_GROUP(word); + u16 index = EC_INDEX(word); + + if (group <= EC_GROUP_POKEMON_2) + { + switch (group) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + r4 = (u16 *)gEasyChatGroupWords[group]; + for (r3 = 0; r3 < gEasyChatGroupSizes[group]; r3++) + { + if (index == r4[r3]) + return FALSE; + } + break; + default: + if (index < gEasyChatGroupSizes[group]) + return FALSE; + break; + } + } + return TRUE; + } +} -- cgit v1.2.3 From 675cf09efa0f32e5aee4d96fb85a69d4cce7ebb9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 21:29:32 -0500 Subject: sub_812476C --- asm/cable_car.s | 161 -------------------------------------------------- src/scene/cable_car.c | 28 +++++++++ 2 files changed, 28 insertions(+), 161 deletions(-) diff --git a/asm/cable_car.s b/asm/cable_car.s index c4b9d9ab7..59b613556 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -5,167 +5,6 @@ .text - thumb_func_start sub_812476C -sub_812476C: @ 812476C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r0, 0 - mov r12, r0 - ldr r2, _0812489C @ =gUnknown_02039274 - ldr r0, [r2] - mov r1, r12 - strb r1, [r0, 0x1E] - strb r1, [r0, 0x1D] - ldr r1, [r2] - ldrb r0, [r1, 0x8] - strb r0, [r1, 0x1F] - ldr r0, [r2] - ldrb r1, [r0, 0x9] - adds r0, 0x20 - strb r1, [r0] - ldr r4, [r2] - ldrb r1, [r4, 0x19] - adds r3, r1, 0x2 - adds r0, r3, 0 - mov r9, r2 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - strb r0, [r4, 0x19] - mov r2, r9 - ldr r1, [r2] - ldrb r0, [r1, 0x18] - adds r0, 0x2 - strb r0, [r1, 0x18] - ldr r1, _081248A0 @ =gUnknown_0203927D - ldr r0, [r2] - ldrb r0, [r0, 0x1A] - strb r0, [r1] - ldr r4, _081248A4 @ =gUnknown_0203927C - mov r10, r4 - ldr r7, _081248A8 @ =gUnknown_0203927B - mov r8, r10 -_081247C0: - mov r0, r9 - ldr r3, [r0] - ldrb r0, [r3, 0x19] - strb r0, [r7] - ldr r1, _081248A0 @ =gUnknown_0203927D - ldrb r0, [r1] - mov r2, r12 - adds r1, r0, r2 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - mov r4, r8 - strb r0, [r4] - ldrb r2, [r7] - lsls r2, 1 - ldrb r0, [r4] - lsls r0, 6 - adds r2, r0 - adds r6, r3, 0 - adds r6, 0xFC - adds r2, r6, r2 - ldrb r1, [r3, 0x18] - lsls r1, 1 - mov r4, r12 - lsls r0, r4, 1 - add r0, r12 - lsls r5, r0, 3 - adds r1, r5 - adds r4, r3, 0 - adds r4, 0x22 - adds r1, r4, r1 - ldrh r0, [r1] - strh r0, [r2] - ldrb r1, [r7] - adds r2, r1, 0x1 - adds r0, r2, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r2, r0 - strb r0, [r7] - ldrb r1, [r7] - lsls r1, 1 - mov r2, r8 - ldrb r0, [r2] - lsls r0, 6 - adds r1, r0 - adds r1, r6, r1 - ldrb r0, [r3, 0x18] - adds r0, 0x1 - lsls r0, 1 - adds r0, r5 - adds r0, r4, r0 - ldrh r0, [r0] - strh r0, [r1] - mov r0, r12 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - cmp r0, 0x8 - bls _081247C0 - mov r4, r9 - ldr r1, [r4] - ldrb r2, [r1, 0x1A] - adds r3, r2, 0 - adds r3, 0x17 - adds r0, r3, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - mov r2, r10 - strb r0, [r2] - adds r0, r1, 0 - adds r0, 0xFC - ldrb r2, [r1, 0x19] - mov r1, r10 - ldrb r3, [r1] - movs r1, 0x2 - str r1, [sp] - movs r1, 0x9 - str r1, [sp, 0x4] - movs r1, 0 - bl sub_8124E7C - ldr r1, [r4] - ldrb r0, [r1, 0x18] - cmp r0, 0xA - bne _0812488C - ldrb r2, [r1, 0x1A] - adds r3, r2, 0x3 - adds r0, r3, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r3, r0 - strb r0, [r1, 0x1A] - mov r2, r9 - ldr r1, [r2] - movs r0, 0xFE - strb r0, [r1, 0x18] - bl sub_812446C -_0812488C: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812489C: .4byte gUnknown_02039274 -_081248A0: .4byte gUnknown_0203927D -_081248A4: .4byte gUnknown_0203927C -_081248A8: .4byte gUnknown_0203927B - thumb_func_end sub_812476C - thumb_func_start sub_81248AC sub_81248AC: @ 81248AC push {lr} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 3d93010a2..edfc566e8 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -930,3 +930,31 @@ void sub_81245F4(void) sub_8124E7C(gUnknown_02039274->unk_00fc, 0, 0, gUnknown_02039278, 32, 9); } } + +void sub_812476C(void) +{ + u8 i = 0; + + gUnknown_02039274->unk_001d = gUnknown_02039274->unk_001e = 0; + gUnknown_02039274->unk_001f = gUnknown_02039274->unk_0008; + gUnknown_02039274->unk_0020 = gUnknown_02039274->unk_0009; + gUnknown_02039274->unk_0019 = (gUnknown_02039274->unk_0019 + 2) % 32; + gUnknown_02039274->unk_0018 += 2; + gUnknown_0203927D = gUnknown_02039274->unk_001a; + for (i = 0; i < 9; i++) + { + gUnknown_0203927B = gUnknown_02039274->unk_0019; + gUnknown_0203927C = (gUnknown_0203927D + i) % 32; + gUnknown_02039274->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018]; + gUnknown_0203927B = (gUnknown_0203927B + 1) % 32; + gUnknown_02039274->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018 + 1]; + } + gUnknown_0203927C = (gUnknown_02039274->unk_001a + 23) % 32; + sub_8124E7C(gUnknown_02039274->unk_00fc, 0, gUnknown_02039274->unk_0019, gUnknown_0203927C, 2, 9); + if (gUnknown_02039274->unk_0018 == 10) + { + gUnknown_02039274->unk_001a = (gUnknown_02039274->unk_001a + 3) % 32; + gUnknown_02039274->unk_0018 = 0xfe; + sub_812446C(); + } +} -- cgit v1.2.3 From 27d47d5a8e6e8362acf4af1c9b6f7cd3a66d335e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 21:33:27 -0500 Subject: sub_81248AC --- asm/cable_car.s | 63 --------------------------------------------------- ld_script.txt | 1 - src/scene/cable_car.c | 25 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 64 deletions(-) delete mode 100644 asm/cable_car.s diff --git a/asm/cable_car.s b/asm/cable_car.s deleted file mode 100644 index 59b613556..000000000 --- a/asm/cable_car.s +++ /dev/null @@ -1,63 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_81248AC -sub_81248AC: @ 81248AC - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _081248BA - cmp r0, 0x1 - beq _081248E4 -_081248BA: - ldr r1, _081248E0 @ =gUnknown_02039274 - ldr r2, [r1] - movs r3, 0 - movs r0, 0x2 - strb r0, [r2, 0x1B] - ldr r0, [r1] - strb r3, [r0, 0x19] - ldr r2, [r1] - movs r0, 0x14 - strb r0, [r2, 0x1A] - ldr r1, [r1] - movs r0, 0xC - strb r0, [r1, 0x18] - bl sub_812446C - bl sub_81245F4 - b _08124906 - .align 2, 0 -_081248E0: .4byte gUnknown_02039274 -_081248E4: - ldr r1, _08124914 @ =gUnknown_02039274 - ldr r2, [r1] - movs r0, 0x2 - strb r0, [r2, 0x1B] - ldr r2, [r1] - movs r0, 0x1C - strb r0, [r2, 0x19] - ldr r2, [r1] - movs r0, 0x14 - strb r0, [r2, 0x1A] - ldr r1, [r1] - movs r0, 0x4 - strb r0, [r1, 0x18] - bl sub_812446C - bl sub_812476C -_08124906: - ldr r0, _08124914 @ =gUnknown_02039274 - ldr r1, [r0] - movs r0, 0 - strb r0, [r1, 0x1C] - pop {r0} - bx r0 - .align 2, 0 -_08124914: .4byte gUnknown_02039274 - thumb_func_end sub_81248AC - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 0571d8823..07345eb18 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -348,7 +348,6 @@ SECTIONS { src/battle/battle_message.o(.text); src/field/choose_party.o(.text); src/scene/cable_car.o(.text); - asm/cable_car.o(.text); asm/roulette_util.o(.text); asm/cable_car_util.o(.text); src/unused_8124F94.o(.text); diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index edfc566e8..f12d80dba 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -958,3 +958,28 @@ void sub_812476C(void) sub_812446C(); } } + +void sub_81248AC(u8 a0) +{ + switch (a0) + { + case 0: + default: + gUnknown_02039274->unk_001b = 2; + gUnknown_02039274->unk_0019 = 0; + gUnknown_02039274->unk_001a = 20; + gUnknown_02039274->unk_0018 = 12; + sub_812446C(); + sub_81245F4(); + break; + case 1: + gUnknown_02039274->unk_001b = 2; + gUnknown_02039274->unk_0019 = 28; + gUnknown_02039274->unk_001a = 20; + gUnknown_02039274->unk_0018 = 4; + sub_812446C(); + sub_812476C(); + break; + } + gUnknown_02039274->unk_001c = 0; +} -- cgit v1.2.3 From fe7e54d6d8d158409316af91ca4e119a6af73faf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 21:37:20 -0500 Subject: Make static what can be made static --- include/graphics.h | 7 ++++ src/scene/cable_car.c | 106 ++++++++++++++++++++++++-------------------------- 2 files changed, 57 insertions(+), 56 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 17abb840e..32f3a1c1f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2703,4 +2703,11 @@ extern const u16 gUnknown_08E95A18[]; extern const u16 gUnknown_08E95AB8[]; extern const u16 gUnknown_08E95FB8[]; +extern const u8 gCableCar_Gfx[]; +extern const u8 gCableCarDoor_Gfx[]; +extern const u8 gCableCarCord_Gfx[]; +extern const u16 gCableCar_Pal[]; +extern const u16 gCableCarBG_Pal[]; +extern const u8 gCableCarBG_Gfx[]; + #endif // GUARD_GRAPHICS_H diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index f12d80dba..6b1c8aa3c 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -9,6 +9,7 @@ #include "script.h" #include "task.h" #include "sound.h" +#include "graphics.h" #include "constants/songs.h" #include "decompress.h" #include "field_weather.h" @@ -81,40 +82,33 @@ EWRAM_DATA u32 filler_02039280 = 0; // Static ROM declarations -void sub_8123244(void); -void sub_8123724(void); -void sub_8123878(u8 taskId); -void sub_81239E4(u8 taskId); -void sub_8123AF8(u8 taskId); -void sub_8123C40(void); -void nullsub_76(struct Sprite *sprite); -void sub_8123CB8(struct Sprite *sprite); -void sub_8123EB8(struct Sprite *sprite); -void sub_8123F44(struct Sprite *sprite); -void sub_8123FBC(u8); -void sub_8124118(void); -void sub_812453C(void); -void sub_8124598(void); -void sub_81245F4(void); -void sub_812476C(void); -void sub_81248AC(u8); +static void sub_8123244(void); +static void sub_8123724(void); +static void sub_8123878(u8 taskId); +static void sub_81239E4(u8 taskId); +static void sub_8123AF8(u8 taskId); +static void sub_8123C40(void); +static void nullsub_76(struct Sprite *sprite); +static void sub_8123CB8(struct Sprite *sprite); +static void sub_8123EB8(struct Sprite *sprite); +static void sub_8123F44(struct Sprite *sprite); +static void sub_8123FBC(u8); +static void sub_8124118(void); +static void sub_812453C(void); +static void sub_8124598(void); +static void sub_81245F4(void); +static void sub_812476C(void); +static void sub_81248AC(u8); // .rodata -extern const u8 gCableCar_Gfx[]; -extern const u8 gCableCarDoor_Gfx[]; -extern const u8 gCableCarCord_Gfx[]; -extern const u16 gCableCar_Pal[]; -extern const u16 gCableCarBG_Pal[]; -extern const u8 gCableCarBG_Gfx[]; +static const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz"); -const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz"); +static const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz"); -const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz"); +static const u8 gCableCarMountainTilemap[] = INCBIN_U8("graphics/misc/cable_car_mountain_map.bin.lz"); -const u8 gCableCarMountainTilemap[] = INCBIN_U8("graphics/misc/cable_car_mountain_map.bin.lz"); - -const u16 gCableCarPylonHookTilemapEntries[] = { +static const u16 gCableCarPylonHookTilemapEntries[] = { 0x3000, 0x3001, 0x3002, @@ -127,38 +121,38 @@ const u16 gCableCarPylonHookTilemapEntries[] = { 0x3009 }; -const u8 gCableCarPylonStemTilemap[] = INCBIN_U8("graphics/misc/cable_car_pylon_stem_map.bin.lz"); +static const u8 gCableCarPylonStemTilemap[] = INCBIN_U8("graphics/misc/cable_car_pylon_stem_map.bin.lz"); -const struct CompressedSpriteSheet gUnknown_08401CF8[] = { +static const struct CompressedSpriteSheet gUnknown_08401CF8[] = { { gCableCar_Gfx, 0x800, 1 }, { gCableCarDoor_Gfx, 0x40, 2 }, { gCableCarCord_Gfx, 0x80, 3 }, { } }; -const struct SpritePalette gUnknown_08401D18[] = { +static const struct SpritePalette gUnknown_08401D18[] = { { gCableCar_Pal, 1 }, { } }; -const struct OamData gOamData_8401D28 = { +static const struct OamData gOamData_8401D28 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .size = 3, .priority = 2 }; -const struct OamData gOamData_8401D30 = { +static const struct OamData gOamData_8401D30 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .shape = ST_OAM_H_RECTANGLE, .priority = 2 }; -const struct OamData gOamData_8401D38 = { +static const struct OamData gOamData_8401D38 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .size = 1, .priority = 2 }; -const struct SpriteTemplate gSpriteTemplate_8401D40[] = { +static const struct SpriteTemplate gSpriteTemplate_8401D40[] = { { 1, 1, @@ -188,7 +182,7 @@ const struct SpriteTemplate gSpriteTemplate_8401D40[] = { // .text -void sub_81231EC(u8 taskId) +static void sub_81231EC(u8 taskId) { if (!gPaletteFade.active) { @@ -204,7 +198,7 @@ void sub_8123218(void) BeginNormalPaletteFade(-1, 0, 0, 16, 0); } -void sub_8123244(void) +static void sub_8123244(void) { u8 i; u16 imebak; @@ -318,7 +312,7 @@ void sub_8123244(void) } } -void sub_8123724(void) +static void sub_8123724(void) { RunTasks(); AnimateSprites(); @@ -327,7 +321,7 @@ void sub_8123724(void) MapMusicMain(); } -void sub_8123740(void) +static void sub_8123740(void) { u8 i; @@ -352,7 +346,7 @@ void sub_8123740(void) SetMainCallback2(CB2_LoadMap); } -void sub_8123878(u8 taskId) +static void sub_8123878(u8 taskId) { u8 i; @@ -424,7 +418,7 @@ void sub_8123878(u8 taskId) } } -void sub_81239E4(u8 taskId) +static void sub_81239E4(u8 taskId) { if (gUnknown_02039274->unk_0001 != 255) { @@ -460,7 +454,7 @@ void sub_81239E4(u8 taskId) gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 1) % 128; } -void sub_8123AF8(u8 taskId) +static void sub_8123AF8(u8 taskId) { if (gUnknown_02039274->unk_0001 != 255) { @@ -506,7 +500,7 @@ void sub_8123AF8(u8 taskId) } } -void sub_8123C40(void) +static void sub_8123C40(void) { DmaCopy16(3, gUnknown_02039274->unk_00fc, BG_SCREEN_ADDR(28), 0x800); DmaCopy16(3, gUnknown_02039274->unk_08fc, BG_SCREEN_ADDR(31), 0x800); @@ -521,12 +515,12 @@ void sub_8123C40(void) TransferPlttBuffer(); } -void nullsub_76(struct Sprite *sprite) +static void nullsub_76(struct Sprite *sprite) { } -void sub_8123CB8(struct Sprite *sprite) +static void sub_8123CB8(struct Sprite *sprite) { if (gUnknown_02039274->unk_0001 != 255) { @@ -543,7 +537,7 @@ void sub_8123CB8(struct Sprite *sprite) } } -void sub_8123D98(struct Sprite *sprite) +static void sub_8123D98(struct Sprite *sprite) { if (gUnknown_02039274->unk_0001 != 255) { @@ -579,7 +573,7 @@ void sub_8123D98(struct Sprite *sprite) } } -void sub_8123EB8(struct Sprite *sprite) +static void sub_8123EB8(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -615,7 +609,7 @@ void sub_8123EB8(struct Sprite *sprite) } } -void sub_8123F44(struct Sprite *sprite) +static void sub_8123F44(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -650,7 +644,7 @@ void sub_8123F44(struct Sprite *sprite) } } -void sub_8123FBC(bool8 which) +static void sub_8123FBC(bool8 which) { switch (which) { @@ -720,7 +714,7 @@ void sub_8123FBC(bool8 which) } } -void sub_8124118(void) +static void sub_8124118(void) { u8 spriteId; u8 i; @@ -849,7 +843,7 @@ void sub_8124118(void) } } -void sub_812446C(void) +static void sub_812446C(void) { u8 i; u8 j; @@ -869,7 +863,7 @@ void sub_812446C(void) gUnknown_02039274->unk_001b = (gUnknown_02039274->unk_001b + 1) % 3; } -void sub_812453C(void) +static void sub_812453C(void) { gUnknown_02039274->unk_001c = (gUnknown_02039274->unk_001c + 1) % 0x60; gUnknown_02039274->unk_0008 = gUnknown_02039274->unk_001f - gUnknown_02039274->unk_001d; @@ -885,7 +879,7 @@ void sub_812453C(void) } } -void sub_8124598(void) +static void sub_8124598(void) { gUnknown_02039274->unk_001c = (gUnknown_02039274->unk_001c + 1) % 0x60; gUnknown_02039274->unk_0008 = gUnknown_02039274->unk_001f + gUnknown_02039274->unk_001d; @@ -901,7 +895,7 @@ void sub_8124598(void) } } -void sub_81245F4(void) +static void sub_81245F4(void) { u8 i = 0; @@ -931,7 +925,7 @@ void sub_81245F4(void) } } -void sub_812476C(void) +static void sub_812476C(void) { u8 i = 0; @@ -959,7 +953,7 @@ void sub_812476C(void) } } -void sub_81248AC(u8 a0) +static void sub_81248AC(u8 a0) { switch (a0) { -- cgit v1.2.3 From 2692979c40ce3bc93901ea7194c68c01d14c1c9f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 21:46:59 -0500 Subject: some renaming --- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/specials.inc | 2 +- src/scene/cable_car.c | 352 ++++++++++++------------ 4 files changed, 179 insertions(+), 179 deletions(-) diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index aefc68bda..6b0858bc5 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index adbea780e..0264342ea 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end diff --git a/data/specials.inc b/data/specials.inc index 032a3884c..6904a2b6b 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -159,7 +159,7 @@ gSpecials:: def_special GetRivalSonDaughterString def_special SetFlagInVar def_special CableCarWarp - def_special sub_8123218 + def_special CableCar def_special Overworld_PlaySpecialMapMusic def_special StartWallClock def_special ScrSpecial_ViewWallClock diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 6b1c8aa3c..288c5d40d 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -71,7 +71,7 @@ struct CableCarEwramStruct2 { // Static RAM declarations -EWRAM_DATA struct CableCarEwramStruct1 *gUnknown_02039274 = NULL; +EWRAM_DATA struct CableCarEwramStruct1 *sCableCarPtr = NULL; EWRAM_DATA u8 gUnknown_02039278 = 0; EWRAM_DATA u8 gUnknown_02039279 = 0; EWRAM_DATA u8 gUnknown_0203927A = 0; @@ -82,18 +82,18 @@ EWRAM_DATA u32 filler_02039280 = 0; // Static ROM declarations -static void sub_8123244(void); -static void sub_8123724(void); +static void CableCarMainCallback_Setup(void); +static void CableCarMainCallback_Run(void); static void sub_8123878(u8 taskId); static void sub_81239E4(u8 taskId); static void sub_8123AF8(u8 taskId); -static void sub_8123C40(void); +static void CableCarVblankCallback(void); static void nullsub_76(struct Sprite *sprite); static void sub_8123CB8(struct Sprite *sprite); static void sub_8123EB8(struct Sprite *sprite); static void sub_8123F44(struct Sprite *sprite); static void sub_8123FBC(u8); -static void sub_8124118(void); +static void LoadSprites(void); static void sub_812453C(void); static void sub_8124598(void); static void sub_81245F4(void); @@ -182,23 +182,23 @@ static const struct SpriteTemplate gSpriteTemplate_8401D40[] = { // .text -static void sub_81231EC(u8 taskId) +static void CableCarTask1(u8 taskId) { if (!gPaletteFade.active) { - SetMainCallback2(sub_8123244); + SetMainCallback2(CableCarMainCallback_Setup); DestroyTask(taskId); } } -void sub_8123218(void) +void CableCar(void) { ScriptContext2_Enable(); - CreateTask(sub_81231EC, 1); + CreateTask(CableCarTask1, 1); BeginNormalPaletteFade(-1, 0, 0, 16, 0); } -static void sub_8123244(void) +static void CableCarMainCallback_Setup(void) { u8 i; u16 imebak; @@ -212,7 +212,7 @@ static void sub_8123244(void) DmaFill16Large(3, 0, VRAM, VRAM_SIZE, 0x1000); DmaFill32Defvars(3, 0, OAM, OAM_SIZE); DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE); - gUnknown_02039274 = eCableCar1; + sCableCarPtr = eCableCar1; DmaFill16Large(3, 0, eCableCar1, 0x10FC, 0x1000); gMain.state++; break; @@ -246,12 +246,12 @@ static void sub_8123244(void) gMain.state++; break; case 3: - sub_8124118(); + LoadSprites(); RunTasks(); gMain.state++; break; case 4: - if (gUnknown_02039274->unk_0002 == 7) + if (sCableCarPtr->unk_0002 == 7) { gMain.state++; } @@ -270,20 +270,20 @@ static void sub_8123244(void) case 5: sub_8124F08((u16 *)BG_SCREEN_ADDR(29), eCableCar2->treeTilemap, 0, 17, 32, 15); sub_8124F08((u16 *)BG_SCREEN_ADDR(30), eCableCar2->mountainTilemap, 0, 0, 30, 20); - sub_8124F08(gUnknown_02039274->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); - sub_8124F08(gUnknown_02039274->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 20); + sub_8124F08(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); + sub_8124F08(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 20); gMain.state++; break; case 6: sub_81248AC(gSpecialVar_0x8004); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x48, 0, 14, 12, 3); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x6C, 12, 17, 12, 3); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x90, 24, 20, 12, 3); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 0, 17, 12, 3); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0, 20, 12, 3); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 12, 20, 12, 3); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 12, 23, 12, 3); - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 24, 23, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x48, 0, 14, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x6C, 12, 17, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x90, 24, 20, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 0, 17, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0, 20, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 12, 20, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 12, 23, 12, 3); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 24, 23, 12, 3); gMain.state++; break; case 7: @@ -297,22 +297,22 @@ static void sub_8123244(void) REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; REG_IME = imebak; - SetVBlankCallback(sub_8123C40); - SetMainCallback2(sub_8123724); + SetVBlankCallback(CableCarVblankCallback); + SetMainCallback2(CableCarMainCallback_Run); CreateTask(sub_8123878, 0); if (gSpecialVar_0x8004 == 0) { - gUnknown_02039274->unk_0000 = CreateTask(sub_81239E4, 1); + sCableCarPtr->unk_0000 = CreateTask(sub_81239E4, 1); } else { - gUnknown_02039274->unk_0000 = CreateTask(sub_8123AF8, 1); + sCableCarPtr->unk_0000 = CreateTask(sub_8123AF8, 1); } break; } } -static void sub_8123724(void) +static void CableCarMainCallback_Run(void) { RunTasks(); AnimateSprites(); @@ -337,7 +337,7 @@ static void sub_8123740(void) ResetSpriteData(); ResetPaletteFade(); DmaFill32Large(3, 0, gSharedMem, 0x20000, 0x1000); - gUnknown_02039274 = NULL; + sCableCarPtr = NULL; DmaFill16Large(3, 0, VRAM, VRAM_SIZE, 0x1000); DmaFill32Defvars(3, 0, OAM, OAM_SIZE); DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE); @@ -351,18 +351,18 @@ static void sub_8123878(u8 taskId) u8 i; i = 0; - gUnknown_02039274->unk_0006++; - switch (gUnknown_02039274->unk_0001) + sCableCarPtr->unk_0006++; + switch (sCableCarPtr->unk_0001) { case 0: - if (gUnknown_02039274->unk_0006 == gUnknown_02039274->unk_0004) + if (sCableCarPtr->unk_0006 == sCableCarPtr->unk_0004) { - DoWeatherEffect(gUnknown_02039274->unk_0002); - gUnknown_02039274->unk_0001 = 1; + DoWeatherEffect(sCableCarPtr->unk_0002); + sCableCarPtr->unk_0001 = 1; } break; case 1: - switch (gUnknown_02039274->unk_0002) + switch (sCableCarPtr->unk_0002) { case 7: if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0) @@ -374,15 +374,15 @@ static void sub_8123878(u8 taskId) gWeatherPtr->sprites.s2.ashSprites[i]->oam.priority = 0; } } - gUnknown_02039274->unk_0001 = 2; + sCableCarPtr->unk_0001 = 2; } break; case 2: if (gWeatherPtr->currWeather == 2) { - gUnknown_02039274->unk_0001 = 2; + sCableCarPtr->unk_0001 = 2; } - else if (gUnknown_02039274->unk_0006 >= gUnknown_02039274->unk_0004 + 8) + else if (sCableCarPtr->unk_0006 >= sCableCarPtr->unk_0004 + 8) { for (; i < 20; i++) { @@ -396,9 +396,9 @@ static void sub_8123878(u8 taskId) } break; case 2: - if (gUnknown_02039274->unk_0006 == 570) + if (sCableCarPtr->unk_0006 == 570) { - gUnknown_02039274->unk_0001 = 3; + sCableCarPtr->unk_0001 = 3; BeginNormalPaletteFade(-1, 3, 0, 16, 0); FadeOutBGM(4); } @@ -406,13 +406,13 @@ static void sub_8123878(u8 taskId) case 3: if (!gPaletteFade.active) { - gUnknown_02039274->unk_0001 = 255; + sCableCarPtr->unk_0001 = 255; } break; case 255: SetVBlankCallback(NULL); DestroyTask(taskId); - DestroyTask(gUnknown_02039274->unk_0000); + DestroyTask(sCableCarPtr->unk_0000); SetMainCallback2(sub_8123740); break; } @@ -420,33 +420,33 @@ static void sub_8123878(u8 taskId) static void sub_81239E4(u8 taskId) { - if (gUnknown_02039274->unk_0001 != 255) + if (sCableCarPtr->unk_0001 != 255) { - gUnknown_02039274->unk_0014--; - if ((gUnknown_02039274->unk_0006 % 2) == 0) + sCableCarPtr->unk_0014--; + if ((sCableCarPtr->unk_0006 % 2) == 0) { - gUnknown_02039274->unk_0015--; + sCableCarPtr->unk_0015--; } - if ((gUnknown_02039274->unk_0006 % 8) == 0) + if ((sCableCarPtr->unk_0006 % 8) == 0) { - gUnknown_02039274->unk_000c--; - gUnknown_02039274->unk_000d--; + sCableCarPtr->unk_000c--; + sCableCarPtr->unk_000d--; } - switch (gUnknown_02039274->unk_0014) + switch (sCableCarPtr->unk_0014) { case 175: - sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 0, 22, 2, 10); + sub_8124E7C(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10); break; case 40: - sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 3, 0, 2, 2); + sub_8124E7C(sCableCarPtr->unk_08fc, 0, 3, 0, 2, 2); break; case 32: - sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 2, 0, 1, 2); + sub_8124E7C(sCableCarPtr->unk_08fc, 0, 2, 0, 1, 2); break; case 16: - sub_8124F08(gUnknown_02039274->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); - sub_8124F08(gUnknown_02039274->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); - gUnknown_02039274->unk_0015 = 64; + sub_8124F08(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); + sub_8124F08(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); + sCableCarPtr->unk_0015 = 64; break; } } @@ -456,42 +456,42 @@ static void sub_81239E4(u8 taskId) static void sub_8123AF8(u8 taskId) { - if (gUnknown_02039274->unk_0001 != 255) + if (sCableCarPtr->unk_0001 != 255) { - gUnknown_02039274->unk_0014++; - if ((gUnknown_02039274->unk_0006 % 2) == 0) + sCableCarPtr->unk_0014++; + if ((sCableCarPtr->unk_0006 % 2) == 0) { - gUnknown_02039274->unk_0015++; + sCableCarPtr->unk_0015++; } - if ((gUnknown_02039274->unk_0006 % 8) == 0) + if ((sCableCarPtr->unk_0006 % 8) == 0) { - gUnknown_02039274->unk_000c++; - gUnknown_02039274->unk_000d++; + sCableCarPtr->unk_000c++; + sCableCarPtr->unk_000d++; } - switch (gUnknown_02039274->unk_0014) + switch (sCableCarPtr->unk_0014) { case 176: - sub_8124F08(gUnknown_02039274->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); + sub_8124F08(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); break; case 16: - sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 2, 0, 3, 2); - sub_8124E7C(gUnknown_02039274->unk_08fc, 0, 0, 22, 2, 10); - gUnknown_02039274->unk_0015 = 192; + sub_8124E7C(sCableCarPtr->unk_08fc, 0, 2, 0, 3, 2); + sub_8124E7C(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10); + sCableCarPtr->unk_0015 = 192; break; case 32: - gUnknown_02039274->unk_08fc[2] = (gCableCarPylonHookTilemapEntries + 2)[0]; - gUnknown_02039274->unk_08fc[3] = (gCableCarPylonHookTilemapEntries + 2)[1]; - gUnknown_02039274->unk_08fc[34] = (gCableCarPylonHookTilemapEntries + 2)[5]; - gUnknown_02039274->unk_08fc[35] = (gCableCarPylonHookTilemapEntries + 2)[6]; + sCableCarPtr->unk_08fc[2] = (gCableCarPylonHookTilemapEntries + 2)[0]; + sCableCarPtr->unk_08fc[3] = (gCableCarPylonHookTilemapEntries + 2)[1]; + sCableCarPtr->unk_08fc[34] = (gCableCarPylonHookTilemapEntries + 2)[5]; + sCableCarPtr->unk_08fc[35] = (gCableCarPylonHookTilemapEntries + 2)[6]; break; case 40: - gUnknown_02039274->unk_08fc[4] = (gCableCarPylonHookTilemapEntries + 4)[0]; - gUnknown_02039274->unk_08fc[36] = (gCableCarPylonHookTilemapEntries + 4)[5]; + sCableCarPtr->unk_08fc[4] = (gCableCarPylonHookTilemapEntries + 4)[0]; + sCableCarPtr->unk_08fc[36] = (gCableCarPylonHookTilemapEntries + 4)[5]; break; } } sub_8124598(); - if (gUnknown_02039274->unk_0006 < gUnknown_02039274->unk_0004) { + if (sCableCarPtr->unk_0006 < sCableCarPtr->unk_0004) { gSpriteCoordOffsetX = (gSpriteCoordOffsetX + 247) % 248; } else @@ -500,16 +500,16 @@ static void sub_8123AF8(u8 taskId) } } -static void sub_8123C40(void) +static void CableCarVblankCallback(void) { - DmaCopy16(3, gUnknown_02039274->unk_00fc, BG_SCREEN_ADDR(28), 0x800); - DmaCopy16(3, gUnknown_02039274->unk_08fc, BG_SCREEN_ADDR(31), 0x800); - REG_BG3HOFS = gUnknown_02039274->unk_0014; - REG_BG3VOFS = gUnknown_02039274->unk_0015; - REG_BG1HOFS = gUnknown_02039274->unk_000c; - REG_BG1VOFS = gUnknown_02039274->unk_000d; - REG_BG0HOFS = gUnknown_02039274->unk_0008; - REG_BG0VOFS = gUnknown_02039274->unk_0009; + DmaCopy16(3, sCableCarPtr->unk_00fc, BG_SCREEN_ADDR(28), 0x800); + DmaCopy16(3, sCableCarPtr->unk_08fc, BG_SCREEN_ADDR(31), 0x800); + REG_BG3HOFS = sCableCarPtr->unk_0014; + REG_BG3VOFS = sCableCarPtr->unk_0015; + REG_BG1HOFS = sCableCarPtr->unk_000c; + REG_BG1VOFS = sCableCarPtr->unk_000d; + REG_BG0HOFS = sCableCarPtr->unk_0008; + REG_BG0VOFS = sCableCarPtr->unk_0009; LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -522,34 +522,34 @@ static void nullsub_76(struct Sprite *sprite) static void sub_8123CB8(struct Sprite *sprite) { - if (gUnknown_02039274->unk_0001 != 255) + if (sCableCarPtr->unk_0001 != 255) { if (gSpecialVar_0x8004 == 0) { - sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); - sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } else { - sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); - sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } } } static void sub_8123D98(struct Sprite *sprite) { - if (gUnknown_02039274->unk_0001 != 255) + if (sCableCarPtr->unk_0001 != 255) { if (gSpecialVar_0x8004 == 0) { - sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); - sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.x = sprite->data[0] - (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->pos1.y = sprite->data[1] - (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } else { - sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); - sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(gUnknown_02039274->unk_0006)); + sprite->pos1.x = sprite->data[0] + (u8)(0.14f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); + sprite->pos1.y = sprite->data[1] + (u8)(0.067f * S16TOPOSFLOAT(sCableCarPtr->unk_0006)); } switch (sprite->data[2]) { @@ -680,30 +680,30 @@ static void sub_8123FBC(bool8 which) REG_WIN1V = 0; if (gSpecialVar_0x8004 == 0) { - gUnknown_02039274->unk_0014 = 0xb0; - gUnknown_02039274->unk_0015 = 0x10; - gUnknown_02039274->unk_000c = 0x00; - gUnknown_02039274->unk_000d = 0x50; - gUnknown_02039274->unk_0009 = 0; - gUnknown_02039274->unk_0009 = 0; + sCableCarPtr->unk_0014 = 0xb0; + sCableCarPtr->unk_0015 = 0x10; + sCableCarPtr->unk_000c = 0x00; + sCableCarPtr->unk_000d = 0x50; + sCableCarPtr->unk_0009 = 0; + sCableCarPtr->unk_0009 = 0; } else { - gUnknown_02039274->unk_0014 = 0x60; - gUnknown_02039274->unk_0015 = 0xe8; - gUnknown_02039274->unk_000c = 0x00; - gUnknown_02039274->unk_000d = 0x04; - gUnknown_02039274->unk_0009 = 0; - gUnknown_02039274->unk_0009 = 0; + sCableCarPtr->unk_0014 = 0x60; + sCableCarPtr->unk_0015 = 0xe8; + sCableCarPtr->unk_000c = 0x00; + sCableCarPtr->unk_000d = 0x04; + sCableCarPtr->unk_0009 = 0; + sCableCarPtr->unk_0009 = 0; } - REG_BG3HOFS = gUnknown_02039274->unk_0014; - REG_BG3VOFS = gUnknown_02039274->unk_0015; + REG_BG3HOFS = sCableCarPtr->unk_0014; + REG_BG3VOFS = sCableCarPtr->unk_0015; REG_BG2HOFS = 0; REG_BG2VOFS = 0; - REG_BG1HOFS = gUnknown_02039274->unk_000c; - REG_BG1VOFS = gUnknown_02039274->unk_000d; - REG_BG0HOFS = gUnknown_02039274->unk_0008; - REG_BG0VOFS = gUnknown_02039274->unk_0009; + REG_BG1HOFS = sCableCarPtr->unk_000c; + REG_BG1VOFS = sCableCarPtr->unk_000d; + REG_BG0HOFS = sCableCarPtr->unk_0008; + REG_BG0VOFS = sCableCarPtr->unk_0009; REG_BG0CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(28) | BGCNT_WRAP; REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(29) | BGCNT_WRAP; REG_BG2CNT = BGCNT_PRIORITY(3) | BGCNT_SCREENBASE(30) | BGCNT_WRAP; @@ -714,7 +714,7 @@ static void sub_8123FBC(bool8 which) } } -static void sub_8124118(void) +static void LoadSprites(void) { u8 spriteId; u8 i; @@ -767,12 +767,12 @@ static void sub_8124118(void) gSprites[spriteId].pos2.y = 4; gSprites[spriteId].data[0] = 0xc8; gSprites[spriteId].data[1] = 0x63; - gUnknown_02039274->unk_0002 = 7; - gUnknown_02039274->unk_0004 = 0x15e; + sCableCarPtr->unk_0002 = 7; + sCableCarPtr->unk_0004 = 0x15e; sub_807C9B4(2); break; case 1: - sub_8124F08(gUnknown_02039274->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); + sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66); if (spriteId != MAX_SPRITES) { @@ -791,8 +791,8 @@ static void sub_8124118(void) gSprites[spriteId].pos2.y = 4; gSprites[spriteId].data[0] = 0x80; gSprites[spriteId].data[1] = 0x41; - gUnknown_02039274->unk_0002 = 2; - gUnknown_02039274->unk_0004 = 0x109; + sCableCarPtr->unk_0002 = 2; + sCableCarPtr->unk_0004 = 0x109; sub_807C9B4(7); break; } @@ -850,30 +850,30 @@ static void sub_812446C(void) u8 k; u8 offset; - for (i = 0, k = 0, offset = 0x24 * (gUnknown_02039274->unk_001b + 2); i < 3; i++) + for (i = 0, k = 0, offset = 0x24 * (sCableCarPtr->unk_001b + 2); i < 3; i++) { for (j = 0; j < 12; j++) { - gUnknown_02039274->unk_0022[i][j] = *(eCableCar2->mtChimneyTilemap + (offset++)); - gUnknown_02039274->unk_0022[i + 3][j] = eCableCar2->mtChimneyTilemap[k]; - gUnknown_02039274->unk_0022[i + 6][j] = (eCableCar2->mtChimneyTilemap + 0x24)[k]; + sCableCarPtr->unk_0022[i][j] = *(eCableCar2->mtChimneyTilemap + (offset++)); + sCableCarPtr->unk_0022[i + 3][j] = eCableCar2->mtChimneyTilemap[k]; + sCableCarPtr->unk_0022[i + 6][j] = (eCableCar2->mtChimneyTilemap + 0x24)[k]; k++; } } - gUnknown_02039274->unk_001b = (gUnknown_02039274->unk_001b + 1) % 3; + sCableCarPtr->unk_001b = (sCableCarPtr->unk_001b + 1) % 3; } static void sub_812453C(void) { - gUnknown_02039274->unk_001c = (gUnknown_02039274->unk_001c + 1) % 0x60; - gUnknown_02039274->unk_0008 = gUnknown_02039274->unk_001f - gUnknown_02039274->unk_001d; - gUnknown_02039274->unk_0009 = gUnknown_02039274->unk_0020 - gUnknown_02039274->unk_001e; - gUnknown_02039274->unk_001d++; - if ((gUnknown_02039274->unk_001d % 4) == 0) + sCableCarPtr->unk_001c = (sCableCarPtr->unk_001c + 1) % 0x60; + sCableCarPtr->unk_0008 = sCableCarPtr->unk_001f - sCableCarPtr->unk_001d; + sCableCarPtr->unk_0009 = sCableCarPtr->unk_0020 - sCableCarPtr->unk_001e; + sCableCarPtr->unk_001d++; + if ((sCableCarPtr->unk_001d % 4) == 0) { - gUnknown_02039274->unk_001e++; + sCableCarPtr->unk_001e++; } - if (gUnknown_02039274->unk_001d > 16) + if (sCableCarPtr->unk_001d > 16) { sub_81245F4(); } @@ -881,15 +881,15 @@ static void sub_812453C(void) static void sub_8124598(void) { - gUnknown_02039274->unk_001c = (gUnknown_02039274->unk_001c + 1) % 0x60; - gUnknown_02039274->unk_0008 = gUnknown_02039274->unk_001f + gUnknown_02039274->unk_001d; - gUnknown_02039274->unk_0009 = gUnknown_02039274->unk_0020 + gUnknown_02039274->unk_001e; - gUnknown_02039274->unk_001d++; - if ((gUnknown_02039274->unk_001d % 4) == 0) + sCableCarPtr->unk_001c = (sCableCarPtr->unk_001c + 1) % 0x60; + sCableCarPtr->unk_0008 = sCableCarPtr->unk_001f + sCableCarPtr->unk_001d; + sCableCarPtr->unk_0009 = sCableCarPtr->unk_0020 + sCableCarPtr->unk_001e; + sCableCarPtr->unk_001d++; + if ((sCableCarPtr->unk_001d % 4) == 0) { - gUnknown_02039274->unk_001e++; + sCableCarPtr->unk_001e++; } - if (gUnknown_02039274->unk_001d > 16) + if (sCableCarPtr->unk_001d > 16) { sub_812476C(); } @@ -899,29 +899,29 @@ static void sub_81245F4(void) { u8 i = 0; - gUnknown_02039274->unk_001d = gUnknown_02039274->unk_001e = 0; - gUnknown_02039274->unk_001f = gUnknown_02039274->unk_0008; - gUnknown_02039274->unk_0020 = gUnknown_02039274->unk_0009; - gUnknown_02039274->unk_0019 = (gUnknown_02039274->unk_0019 + 30) % 32; - gUnknown_02039274->unk_0018 -= 2; - gUnknown_0203927A = (gUnknown_02039274->unk_001a + 23) % 32; + sCableCarPtr->unk_001d = sCableCarPtr->unk_001e = 0; + sCableCarPtr->unk_001f = sCableCarPtr->unk_0008; + sCableCarPtr->unk_0020 = sCableCarPtr->unk_0009; + sCableCarPtr->unk_0019 = (sCableCarPtr->unk_0019 + 30) % 32; + sCableCarPtr->unk_0018 -= 2; + gUnknown_0203927A = (sCableCarPtr->unk_001a + 23) % 32; for (i = 0; i < 9; i++) { - gUnknown_02039278 = gUnknown_02039274->unk_0019; + gUnknown_02039278 = sCableCarPtr->unk_0019; gUnknown_02039279 = (gUnknown_0203927A + i) % 32; - gUnknown_02039274->unk_00fc[gUnknown_02039279][gUnknown_02039278] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018]; + sCableCarPtr->unk_00fc[gUnknown_02039279][gUnknown_02039278] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018]; gUnknown_02039278 = (gUnknown_02039278 + 1) % 32; - gUnknown_02039274->unk_00fc[gUnknown_02039279][gUnknown_02039278] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018 + 1]; + sCableCarPtr->unk_00fc[gUnknown_02039279][gUnknown_02039278] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018 + 1]; } - gUnknown_02039278 = (gUnknown_02039274->unk_0019 + 30) % 32; - sub_8124E7C(gUnknown_02039274->unk_00fc, 0, gUnknown_02039278, 0, 2, 32); - if (gUnknown_02039274->unk_0018 == 0) + gUnknown_02039278 = (sCableCarPtr->unk_0019 + 30) % 32; + sub_8124E7C(sCableCarPtr->unk_00fc, 0, gUnknown_02039278, 0, 2, 32); + if (sCableCarPtr->unk_0018 == 0) { - gUnknown_02039274->unk_001a = (gUnknown_02039274->unk_001a + 29) % 32; - gUnknown_02039274->unk_0018 = 12; + sCableCarPtr->unk_001a = (sCableCarPtr->unk_001a + 29) % 32; + sCableCarPtr->unk_0018 = 12; sub_812446C(); - gUnknown_02039278 = (gUnknown_02039274->unk_001a + 1) % 32; - sub_8124E7C(gUnknown_02039274->unk_00fc, 0, 0, gUnknown_02039278, 32, 9); + gUnknown_02039278 = (sCableCarPtr->unk_001a + 1) % 32; + sub_8124E7C(sCableCarPtr->unk_00fc, 0, 0, gUnknown_02039278, 32, 9); } } @@ -929,26 +929,26 @@ static void sub_812476C(void) { u8 i = 0; - gUnknown_02039274->unk_001d = gUnknown_02039274->unk_001e = 0; - gUnknown_02039274->unk_001f = gUnknown_02039274->unk_0008; - gUnknown_02039274->unk_0020 = gUnknown_02039274->unk_0009; - gUnknown_02039274->unk_0019 = (gUnknown_02039274->unk_0019 + 2) % 32; - gUnknown_02039274->unk_0018 += 2; - gUnknown_0203927D = gUnknown_02039274->unk_001a; + sCableCarPtr->unk_001d = sCableCarPtr->unk_001e = 0; + sCableCarPtr->unk_001f = sCableCarPtr->unk_0008; + sCableCarPtr->unk_0020 = sCableCarPtr->unk_0009; + sCableCarPtr->unk_0019 = (sCableCarPtr->unk_0019 + 2) % 32; + sCableCarPtr->unk_0018 += 2; + gUnknown_0203927D = sCableCarPtr->unk_001a; for (i = 0; i < 9; i++) { - gUnknown_0203927B = gUnknown_02039274->unk_0019; + gUnknown_0203927B = sCableCarPtr->unk_0019; gUnknown_0203927C = (gUnknown_0203927D + i) % 32; - gUnknown_02039274->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018]; + sCableCarPtr->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018]; gUnknown_0203927B = (gUnknown_0203927B + 1) % 32; - gUnknown_02039274->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = gUnknown_02039274->unk_0022[i][gUnknown_02039274->unk_0018 + 1]; + sCableCarPtr->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018 + 1]; } - gUnknown_0203927C = (gUnknown_02039274->unk_001a + 23) % 32; - sub_8124E7C(gUnknown_02039274->unk_00fc, 0, gUnknown_02039274->unk_0019, gUnknown_0203927C, 2, 9); - if (gUnknown_02039274->unk_0018 == 10) + gUnknown_0203927C = (sCableCarPtr->unk_001a + 23) % 32; + sub_8124E7C(sCableCarPtr->unk_00fc, 0, sCableCarPtr->unk_0019, gUnknown_0203927C, 2, 9); + if (sCableCarPtr->unk_0018 == 10) { - gUnknown_02039274->unk_001a = (gUnknown_02039274->unk_001a + 3) % 32; - gUnknown_02039274->unk_0018 = 0xfe; + sCableCarPtr->unk_001a = (sCableCarPtr->unk_001a + 3) % 32; + sCableCarPtr->unk_0018 = 0xfe; sub_812446C(); } } @@ -959,21 +959,21 @@ static void sub_81248AC(u8 a0) { case 0: default: - gUnknown_02039274->unk_001b = 2; - gUnknown_02039274->unk_0019 = 0; - gUnknown_02039274->unk_001a = 20; - gUnknown_02039274->unk_0018 = 12; + sCableCarPtr->unk_001b = 2; + sCableCarPtr->unk_0019 = 0; + sCableCarPtr->unk_001a = 20; + sCableCarPtr->unk_0018 = 12; sub_812446C(); sub_81245F4(); break; case 1: - gUnknown_02039274->unk_001b = 2; - gUnknown_02039274->unk_0019 = 28; - gUnknown_02039274->unk_001a = 20; - gUnknown_02039274->unk_0018 = 4; + sCableCarPtr->unk_001b = 2; + sCableCarPtr->unk_0019 = 28; + sCableCarPtr->unk_001a = 20; + sCableCarPtr->unk_0018 = 4; sub_812446C(); sub_812476C(); break; } - gUnknown_02039274->unk_001c = 0; + sCableCarPtr->unk_001c = 0; } -- cgit v1.2.3 From 60ab994a0fdf75bc007a5349f424b6e346604de6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 21:27:40 -0600 Subject: fix German build --- include/easy_chat.h | 19 ++--- src/easy_chat_2.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 228 insertions(+), 13 deletions(-) diff --git a/include/easy_chat.h b/include/easy_chat.h index d2b562931..9342663d8 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -75,16 +75,14 @@ struct Shared1000 void (*unk1C4)(void); u8 unk1C8[0x6C8-0x1C8]; u8 unk6C8[0xB78-0x6C8]; - u16 unkB78[0x1B][255]; #if GERMAN - u8 filler4142_de[0x32A]; + u16 unkB78[0x1B][270]; +#else + u16 unkB78[0x1B][255]; #endif - u16 unk4142[(0x78-0x42)/2]; + u16 unk4142[(0x78-0x42)/2]; //0x446C u16 unk4178[(0x41A4-0x4178)/2]; // unknown length - const u8 *unk41A4[0x16][0x100]; -#if GERMAN - u8 filler99A4_de[2]; -#endif + const u8 *unk41A4[0x16][0x100]; //0x44CE in german s8 unk99A4; s8 unk99A5; s8 unk99A6[0xA28-0x9A6]; @@ -117,11 +115,6 @@ struct Shared1000 u8 unk9F8E[7]; // unknown length }; -#define static_assert(cond) \ - typedef char test_[(cond) ? 1 : -1] - -//static_assert(offsetof(struct Shared1000, unk1A8) == 0x1A8); - extern u8 gUnknown_020388AC; extern u8 gUnknown_03000740; @@ -145,7 +138,7 @@ u16 sub_80EB8EC(void); u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3); #if GERMAN -u32 de_sub_80EB748(u32, u32); +u32 de_sub_80EB748(s32, s32); #endif #endif // GUARD_EASYCHAT_H diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 5dc4bb1c1..f9843cda9 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -2137,6 +2137,195 @@ u16 sub_80EAE88(u8 group) } } +#if GERMAN +__attribute__((naked)) +void sub_80EAECC(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x10\n\ + movs r7, 0\n\ + ldr r1, _080EAF08 @ =gUnknown_083DB694\n\ + ldr r0, [r1]\n\ + ldr r3, _080EAF0C @ =0x0000446c\n\ + adds r3, r0, r3\n\ + str r3, [sp, 0x4]\n\ +_080EAEE4:\n\ + ldr r1, _080EAF10 @ =gEasyChatWordsByLetter\n\ + lsls r2, r7, 1\n\ + adds r0, r2, r1\n\ + ldrh r4, [r0]\n\ + adds r3, r7, 0x1\n\ + lsls r0, r3, 1\n\ + adds r0, r1\n\ + ldrh r0, [r0]\n\ + str r0, [sp]\n\ + ldr r0, [sp, 0x4]\n\ + adds r1, r0, r2\n\ + movs r0, 0\n\ + strh r0, [r1]\n\ + mov r9, r0\n\ + adds r6, r4, 0\n\ + mov r10, r2\n\ + str r3, [sp, 0x8]\n\ + b _080EB00C\n\ + .align 2, 0\n\ +_080EAF08: .4byte gUnknown_083DB694\n\ +_080EAF0C: .4byte 0x0000446c\n\ +_080EAF10: .4byte gEasyChatWordsByLetter\n\ +_080EAF14:\n\ + ldr r2, _080EAFAC @ =gEasyChatWordsAlphabetized\n\ + adds r0, r6, 0\n\ + adds r1, r0, 0x1\n\ + lsls r1, 16\n\ + lsrs r6, r1, 16\n\ + lsls r0, 1\n\ + adds r0, r2\n\ + ldrh r1, [r0]\n\ + adds r4, r1, 0\n\ + ldr r0, _080EAFB0 @ =0x0000feff\n\ + cmp r1, r0\n\ + bls _080EAFC8\n\ + movs r0, 0xFF\n\ + ands r1, r0\n\ + movs r3, 0\n\ + subs r0, r1, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + ldr r0, _080EAFB4 @ =0x0000ffff\n\ + cmp r5, r0\n\ + beq _080EB00C\n\ + lsls r0, r7, 4\n\ + adds r0, r7\n\ + lsls r0, 3\n\ + subs r0, r7\n\ + lsls r0, 2\n\ + mov r8, r0\n\ +_080EAF4A:\n\ + adds r1, r6, 0\n\ + adds r0, r1, 0x1\n\ + lsls r0, 16\n\ + lsrs r6, r0, 16\n\ + lsls r1, 1\n\ + ldr r0, _080EAFAC @ =gEasyChatWordsAlphabetized\n\ + adds r1, r0\n\ + ldrh r4, [r1]\n\ + lsrs r0, r4, 9\n\ + ldr r1, _080EAFB8 @ =0x000001ff\n\ + adds r2, r1, 0\n\ + adds r1, r4, 0\n\ + ands r1, r2\n\ + str r3, [sp, 0xC]\n\ + bl sub_80EADC0\n\ + lsls r0, 24\n\ + ldr r3, [sp, 0xC]\n\ + cmp r0, 0\n\ + beq _080EAF9E\n\ + cmp r3, 0\n\ + bne _080EAF9E\n\ + ldr r3, _080EAFBC @ =gUnknown_083DB694\n\ + ldr r2, [r3]\n\ + mov r1, r9\n\ + adds r0, r1, 0x1\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r9, r0\n\ + lsls r1, 1\n\ + add r1, r8\n\ + ldr r3, _080EAFC0 @ =0x00000b78\n\ + adds r0, r2, r3\n\ + adds r0, r1\n\ + strh r4, [r0]\n\ + ldr r0, _080EAFC4 @ =0x0000446c\n\ + adds r2, r0\n\ + add r2, r10\n\ + ldrh r0, [r2]\n\ + adds r0, 0x1\n\ + strh r0, [r2]\n\ + movs r3, 0x1\n\ +_080EAF9E:\n\ + subs r0, r5, 0x1\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + ldr r1, _080EAFB4 @ =0x0000ffff\n\ + cmp r5, r1\n\ + bne _080EAF4A\n\ + b _080EB00C\n\ + .align 2, 0\n\ +_080EAFAC: .4byte gEasyChatWordsAlphabetized\n\ +_080EAFB0: .4byte 0x0000feff\n\ +_080EAFB4: .4byte 0x0000ffff\n\ +_080EAFB8: .4byte 0x000001ff\n\ +_080EAFBC: .4byte gUnknown_083DB694\n\ +_080EAFC0: .4byte 0x00000b78\n\ +_080EAFC4: .4byte 0x0000446c\n\ +_080EAFC8:\n\ + lsrs r0, r4, 9\n\ + ldr r3, _080EB030 @ =0x000001ff\n\ + adds r2, r3, 0\n\ + adds r1, r4, 0\n\ + ands r1, r2\n\ + bl sub_80EADC0\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080EB00C\n\ + ldr r0, _080EB034 @ =gUnknown_083DB694\n\ + ldr r2, [r0]\n\ + mov r1, r9\n\ + adds r0, r1, 0x1\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r9, r0\n\ + lsls r1, 1\n\ + lsls r0, r7, 4\n\ + adds r0, r7\n\ + lsls r0, 3\n\ + subs r0, r7\n\ + lsls r0, 2\n\ + adds r1, r0\n\ + ldr r3, _080EB038 @ =0x00000b78\n\ + adds r0, r2, r3\n\ + adds r0, r1\n\ + strh r4, [r0]\n\ + ldr r0, _080EB03C @ =0x0000446c\n\ + adds r2, r0\n\ + add r2, r10\n\ + ldrh r0, [r2]\n\ + adds r0, 0x1\n\ + strh r0, [r2]\n\ +_080EB00C:\n\ + ldr r1, [sp]\n\ + cmp r6, r1\n\ + bcs _080EB014\n\ + b _080EAF14\n\ +_080EB014:\n\ + ldr r3, [sp, 0x8]\n\ + lsls r0, r3, 16\n\ + lsrs r7, r0, 16\n\ + cmp r7, 0x1A\n\ + bhi _080EB020\n\ + b _080EAEE4\n\ +_080EB020:\n\ + add sp, 0x10\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080EB030: .4byte 0x000001ff\n\ +_080EB034: .4byte gUnknown_083DB694\n\ +_080EB038: .4byte 0x00000b78\n\ +_080EB03C: .4byte 0x0000446c\n\ + .syntax divided\n"); +} +#else void sub_80EAECC(void) { u16 i; @@ -2183,6 +2372,7 @@ void sub_80EAECC(void) } } } +#endif extern const u8 *const gEasyChatGroupWords[]; extern const u16 *const gEasyChatGroupOrders[]; @@ -2395,3 +2585,35 @@ bool8 sub_80EB37C(u16 word) return TRUE; } } + +#if GERMAN +u32 de_sub_80EB748(s32 group, s32 index) +{ + s32 i; + u16 *words; + u32 r7 = 0; + + switch (group) + { + case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_2: + case EC_GROUP_MOVE_1: + case EC_GROUP_MOVE_2: + words = (u16 *)gEasyChatGroupWords[group]; + for (i = 0; i < gEasyChatGroupSizes[group]; i++) + { + if (index == words[i]) + { + r7 = i; + break; + } + } + break; + default: + r7 = index; + break; + } + + return r7; +} +#endif -- cgit v1.2.3 From 734fd136657fac2908cf96c674f0441b6c833dab Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 21:29:18 -0600 Subject: actually fix German build --- asm-de/easy_chat.s | 2387 ---------------------------------------------------- 1 file changed, 2387 deletions(-) diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 75d7b77f4..a71aefb42 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -5,2391 +5,4 @@ .text - thumb_func_start sub_80EA1E0 -sub_80EA1E0: @ 80EA1E0 - push {r4-r6,lr} - ldr r0, _080EA240 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0xC4 - ldrh r0, [r0] - cmp r0, 0 - beq _080EA244 - movs r4, 0 - adds r0, r1, 0 - adds r0, 0xC2 - ldrh r2, [r0] - cmp r4, r2 - bcs _080EA228 - adds r5, r1, 0 - adds r6, r0, 0 -_080EA200: - lsls r0, r4, 4 - adds r0, 0xC8 - adds r0, r5, r0 - bl sub_80EAC0C - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r1 - adds r0, r5, r0 - bl sub_80EAC48 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrh r2, [r6] - cmp r4, r2 - bcc _080EA200 -_080EA228: - ldr r0, _080EA240 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r2, r1, 0 - adds r2, 0xBC - movs r0, 0x1 - strb r0, [r2] - adds r1, 0xC4 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - movs r0, 0 - b _080EA246 - .align 2, 0 -_080EA240: .4byte gUnknown_083DB694 -_080EA244: - movs r0, 0x1 -_080EA246: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80EA1E0 - - thumb_func_start sub_80EA24C -sub_80EA24C: @ 80EA24C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA340 @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0xF - str r6, [sp] - ldr r1, _080EA344 @ =0x0000fffe - mov r8, r1 - str r1, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xD - movs r2, 0xE - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r1, 0x2 - mov r9, r1 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xE - movs r3, 0xC - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x1E - movs r2, 0 - mov r3, r8 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r6, 0x10 - str r6, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xD - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - str r6, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - mov r1, r9 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0xC - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x1E - movs r2, 0x9 - mov r3, r8 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x4 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x6 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA340: .4byte gUnknown_083DB694 -_080EA344: .4byte 0x0000fffe - thumb_func_end sub_80EA24C - - thumb_func_start sub_80EA348 -sub_80EA348: @ 80EA348 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA49C @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r5, 0xF - str r5, [sp] - movs r1, 0x2 - mov r9, r1 - str r1, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r6, r7, r1 - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r1, _080EA4A0 @ =0x0000fffe - mov r8, r1 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xE - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0x12 - movs r2, 0 - movs r3, 0x2 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r5, 0x10 - str r5, [sp] - mov r1, r9 - str r1, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - mov r1, r8 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0x12 - movs r2, 0x9 - movs r3, 0x2 - bl sub_80EAC30 - movs r1, 0x84 - lsls r1, 1 - adds r0, r7, r1 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - mov r1, r9 - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0x1 - bl sub_80EABD4 - movs r1, 0xBC - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x50 - adds r6, r7, r1 - str r6, [sp, 0x4] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0 - bl sub_80EAC30 - movs r1, 0x8C - lsls r1, 1 - adds r0, r7, r1 - str r5, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xE - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xC2 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r6, [sp, 0x4] - movs r1, 0x18 - movs r2, 0xE - mov r3, r8 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xC2 - movs r1, 0x6 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA49C: .4byte gUnknown_083DB694 -_080EA4A0: .4byte 0x0000fffe - thumb_func_end sub_80EA348 - - thumb_func_start sub_80EA4A4 -sub_80EA4A4: @ 80EA4A4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA598 @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0xF - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - ldr r1, _080EA59C @ =0x0000ffff - mov r8, r1 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xE - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - mov r1, r8 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xE - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r1, 0x10 - mov r9, r1 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - movs r6, 0x1 - str r6, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r6, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0x9 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xC2 - movs r1, 0x4 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA598: .4byte gUnknown_083DB694 -_080EA59C: .4byte 0x0000ffff - thumb_func_end sub_80EA4A4 - - thumb_func_start sub_80EA5A0 -sub_80EA5A0: @ 80EA5A0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EA6FC @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0xF - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - movs r1, 0x1 - mov r8, r1 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r2, 0xA - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - mov r1, r8 - str r1, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0xC - movs r2, 0xA - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r1, 0x14 - mov r9, r1 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - ldr r6, _080EA700 @ =0x0000ffff - str r6, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xF - movs r3, 0xD - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x5 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r6, [sp, 0x10] - movs r1, 0xC - movs r2, 0xF - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - mov r1, r8 - str r1, [sp] - str r5, [sp, 0x4] - movs r1, 0x12 - movs r2, 0x5 - movs r3, 0 - bl sub_80EAC30 - movs r1, 0x84 - lsls r1, 1 - adds r0, r7, r1 - movs r1, 0xA - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - mov r1, r8 - str r1, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xA - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xBC - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x50 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0x1 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - movs r1, 0x8C - lsls r1, 1 - adds r0, r7, r1 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r6, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0x14 - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xC2 - lsls r1, 1 - adds r0, r7, r1 - str r6, [sp] - str r5, [sp, 0x4] - movs r1, 0x1 - movs r2, 0x14 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x6 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x4 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA6FC: .4byte gUnknown_083DB694 -_080EA700: .4byte 0x0000ffff - thumb_func_end sub_80EA5A0 - - thumb_func_start sub_80EA704 -sub_80EA704: @ 80EA704 - push {r4-r6,lr} - sub sp, 0x14 - ldr r0, _080EA75C @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0xC8 - movs r1, 0x14 - str r1, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r5, 0x1 - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xC - movs r3, 0x19 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r6, r1 - ldr r3, _080EA760 @ =0x0000ffff - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0x5 - movs r2, 0xA - bl sub_80EAC30 - adds r0, r6, 0 - adds r0, 0xC2 - strh r5, [r0] - adds r1, r6, 0 - adds r1, 0xC4 - movs r0, 0x5 - strh r0, [r1] - add sp, 0x14 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EA75C: .4byte gUnknown_083DB694 -_080EA760: .4byte 0x0000ffff - thumb_func_end sub_80EA704 - - thumb_func_start sub_80EA764 -sub_80EA764: @ 80EA764 - push {r4-r7,lr} - sub sp, 0x14 - ldr r0, _080EA7EC @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0x14 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r5, _080EA7F0 @ =0x0000ffff - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xC - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r7, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1E - movs r2, 0xC - movs r3, 0x1F - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r7, r2 - str r1, [sp, 0x4] - movs r1, 0x1E - movs r2, 0xC - adds r3, r5, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x2 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x6 - strh r0, [r1] - add sp, 0x14 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA7EC: .4byte gUnknown_083DB694 -_080EA7F0: .4byte 0x0000ffff - thumb_func_end sub_80EA764 - - thumb_func_start sub_80EA7F4 -sub_80EA7F4: @ 80EA7F4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - ldr r0, _080EA8B4 @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0x14 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - movs r5, 0x1 - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x14 - movs r2, 0xA - movs r3, 0x19 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - ldr r3, _080EA8B8 @ =0x0000ffff - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r2, r7 - mov r8, r2 - str r2, [sp, 0x4] - movs r1, 0x19 - movs r2, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r7, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r2, 0xA - movs r3, 0x4 - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - mov r2, r8 - str r2, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x3 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x2 - strh r0, [r1] - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EA8B4: .4byte gUnknown_083DB694 -_080EA8B8: .4byte 0x0000ffff - thumb_func_end sub_80EA7F4 - - thumb_func_start sub_80EA8BC -sub_80EA8BC: @ 80EA8BC - push {r4-r6,lr} - sub sp, 0x14 - ldr r0, _080EA944 @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0xC8 - movs r5, 0x14 - str r5, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x3 - movs r2, 0xA - movs r3, 0x4 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r6, 0 - adds r0, 0xD8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x2 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r1, r6, 0 - adds r1, 0xC2 - movs r0, 0x2 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x1 - strh r0, [r1] - add sp, 0x14 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EA944: .4byte gUnknown_083DB694 - thumb_func_end sub_80EA8BC - - thumb_func_start sub_80EA948 -sub_80EA948: @ 80EA948 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EAA3C @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r6, 0x14 - str r6, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r5, _080EAA40 @ =0x0000ffff - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x2 - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x80 - adds r1, r7 - mov r9, r1 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x3 - movs r2, 0xA - movs r3, 0x5 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r1, r7 - mov r8, r1 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1A - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - mov r1, r9 - str r1, [sp, 0x4] - movs r1, 0x1A - movs r2, 0xA - adds r3, r5, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - str r6, [sp] - str r5, [sp, 0x4] - str r4, [sp, 0x8] - str r5, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x19 - movs r2, 0xA - movs r3, 0x1A - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - mov r1, r8 - str r1, [sp, 0x4] - movs r1, 0x1D - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x4 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x2 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EAA3C: .4byte gUnknown_083DB694 -_080EAA40: .4byte 0x0000ffff - thumb_func_end sub_80EA948 - - thumb_func_start sub_80EAA44 -sub_80EAA44: @ 80EAA44 - push {r4-r6,lr} - sub sp, 0x14 - ldr r0, _080EAACC @ =gUnknown_083DB694 - ldr r6, [r0] - adds r0, r6, 0 - adds r0, 0xC8 - movs r5, 0x14 - str r5, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x18 - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xE4 - lsls r2, 1 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0x18 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r6, 0 - adds r0, 0xD8 - str r5, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - ldr r1, _080EAAD0 @ =0x0000ffff - str r1, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x17 - movs r2, 0xA - movs r3, 0x18 - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r6, r1 - str r4, [sp] - movs r2, 0xD9 - lsls r2, 3 - adds r1, r6, r2 - str r1, [sp, 0x4] - movs r1, 0x1D - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r1, r6, 0 - adds r1, 0xC2 - movs r0, 0x2 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x1 - strh r0, [r1] - add sp, 0x14 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EAACC: .4byte gUnknown_083DB694 -_080EAAD0: .4byte 0x0000ffff - thumb_func_end sub_80EAA44 - - thumb_func_start sub_80EAAD4 -sub_80EAAD4: @ 80EAAD4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - ldr r0, _080EABCC @ =gUnknown_083DB694 - ldr r7, [r0] - adds r0, r7, 0 - adds r0, 0xC8 - movs r1, 0xF - str r1, [sp] - movs r4, 0 - str r4, [sp, 0x4] - movs r5, 0x1 - str r5, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xA4 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - movs r1, 0xD9 - lsls r1, 3 - adds r1, r7 - mov r8, r1 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xD8 - movs r1, 0x14 - mov r9, r1 - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - ldr r6, _080EABD0 @ =0x0000ffff - str r6, [sp, 0x10] - movs r1, 0 - movs r2, 0xF - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xAA - lsls r1, 1 - adds r0, r7, r1 - str r5, [sp] - mov r1, r8 - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0x5 - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xE8 - movs r1, 0xA - str r1, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r5, [sp, 0x10] - movs r1, 0 - movs r2, 0xA - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xB0 - lsls r1, 1 - adds r0, r7, r1 - str r4, [sp] - adds r1, 0x68 - adds r5, r7, r1 - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0xA - movs r3, 0 - bl sub_80EAC30 - adds r0, r7, 0 - adds r0, 0xF8 - mov r1, r9 - str r1, [sp] - str r4, [sp, 0x4] - str r6, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0 - movs r2, 0x14 - movs r3, 0x1E - bl sub_80EABD4 - movs r1, 0xB6 - lsls r1, 1 - adds r0, r7, r1 - str r6, [sp] - str r5, [sp, 0x4] - movs r1, 0 - movs r2, 0x14 - movs r3, 0 - bl sub_80EAC30 - adds r1, r7, 0 - adds r1, 0xC2 - movs r0, 0x4 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0x5 - strh r0, [r1] - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EABCC: .4byte gUnknown_083DB694 -_080EABD0: .4byte 0x0000ffff - thumb_func_end sub_80EAAD4 - - thumb_func_start sub_80EABD4 -sub_80EABD4: @ 80EABD4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r5, [sp, 0x1C] - ldr r6, [sp, 0x20] - ldr r4, [sp, 0x24] - mov r9, r4 - ldr r4, [sp, 0x28] - ldr r7, [sp, 0x2C] - mov r8, r7 - strh r1, [r0] - strh r3, [r0, 0x2] - strh r2, [r0, 0x4] - strh r5, [r0, 0x6] - strh r6, [r0, 0x8] - strh r4, [r0, 0xA] - mov r1, r9 - strh r1, [r0, 0xC] - mov r4, r8 - strh r4, [r0, 0xE] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80EABD4 - - thumb_func_start sub_80EAC0C -sub_80EAC0C: @ 80EAC0C - ldrh r1, [r0, 0x8] - ldrh r2, [r0] - adds r1, r2 - strh r1, [r0] - ldrh r1, [r0, 0xA] - ldrh r2, [r0, 0x2] - adds r1, r2 - strh r1, [r0, 0x2] - ldrh r1, [r0, 0xC] - ldrh r2, [r0, 0x4] - adds r1, r2 - strh r1, [r0, 0x4] - ldrh r1, [r0, 0xE] - ldrh r2, [r0, 0x6] - adds r1, r2 - strh r1, [r0, 0x6] - bx lr - thumb_func_end sub_80EAC0C - - thumb_func_start sub_80EAC30 -sub_80EAC30: @ 80EAC30 - push {r4,r5,lr} - ldr r4, [sp, 0xC] - ldr r5, [sp, 0x10] - strh r1, [r0] - strh r2, [r0, 0x2] - strh r3, [r0, 0x4] - strh r4, [r0, 0x6] - str r5, [r0, 0x8] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80EAC30 - - thumb_func_start sub_80EAC48 -sub_80EAC48: @ 80EAC48 - ldrh r1, [r0, 0x4] - ldrh r2, [r0] - adds r1, r2 - strh r1, [r0] - ldrh r1, [r0, 0x6] - ldrh r2, [r0, 0x2] - adds r1, r2 - strh r1, [r0, 0x2] - bx lr - thumb_func_end sub_80EAC48 - - thumb_func_start sub_80EAC5C -sub_80EAC5C: @ 80EAC5C - push {r4-r6,lr} - ldr r0, _080EACB4 @ =gUnknown_083DB694 - ldr r1, [r0] - adds r0, r1, 0 - adds r0, 0xBC - ldrb r0, [r0] - cmp r0, 0 - beq _080EACAC - movs r4, 0 - adds r0, r1, 0 - adds r0, 0xC2 - ldrh r2, [r0] - cmp r4, r2 - bcs _080EACA2 - adds r5, r1, 0 - adds r6, r0, 0 -_080EAC7C: - lsls r1, r4, 4 - adds r1, 0xC8 - adds r1, r5, r1 - lsls r2, r4, 1 - adds r2, r4 - lsls r2, 2 - movs r0, 0xA4 - lsls r0, 1 - adds r2, r0 - adds r2, r5, r2 - ldr r0, _080EACB8 @ =0x06006800 - bl sub_80EACBC - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldrh r2, [r6] - cmp r4, r2 - bcc _080EAC7C -_080EACA2: - ldr r0, _080EACB4 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, 0xBC - movs r1, 0 - strb r1, [r0] -_080EACAC: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EACB4: .4byte gUnknown_083DB694 -_080EACB8: .4byte 0x06006800 - thumb_func_end sub_80EAC5C - - thumb_func_start sub_80EACBC -sub_80EACBC: @ 80EACBC - push {r4-r7,lr} - sub sp, 0x10 - adds r7, r0, 0 - adds r3, r1, 0 - adds r4, r2, 0 - ldrh r2, [r3, 0x2] - ldrh r0, [r3] - subs r2, r0 - ldrh r0, [r3, 0x6] - ldrh r1, [r3, 0x4] - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - lsls r6, r2, 16 - cmp r6, 0 - ble _080EACFE - lsls r5, r0, 16 - cmp r5, 0 - ble _080EACFE - ldrh r1, [r3] - ldrh r2, [r3, 0x4] - ldr r3, [r4, 0x8] - ldrh r0, [r4] - str r0, [sp] - ldrh r0, [r4, 0x2] - str r0, [sp, 0x4] - lsrs r0, r6, 16 - str r0, [sp, 0x8] - lsrs r0, r5, 16 - str r0, [sp, 0xC] - adds r0, r7, 0 - bl sub_809D104 -_080EACFE: - add sp, 0x10 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80EACBC - - thumb_func_start sub_80EAD08 -sub_80EAD08: @ 80EAD08 - push {r4,r5,lr} - ldr r0, _080EAD58 @ =gUnknown_03004DC0 - ldrb r1, [r0, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - ldr r1, _080EAD5C @ =gUnknown_03004DE0 - adds r4, r0, r1 - adds r4, 0xB0 - ldr r0, _080EAD60 @ =gUnknown_083DB694 - ldr r1, [r0] - movs r0, 0xDD - lsls r0, 1 - adds r1, r0 - ldrh r0, [r1] - adds r2, r0, 0 - subs r2, 0x58 - movs r0, 0xFF - ands r2, r0 - movs r3, 0 - movs r5, 0xFF -_080EAD32: - ldrh r0, [r1] - adds r0, r3 - cmp r0, 0x80 - bne _080EAD42 - negs r0, r3 - adds r2, r0, 0 - subs r2, 0x58 - ands r2, r5 -_080EAD42: - strh r2, [r4] - adds r4, 0x2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x3F - bls _080EAD32 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080EAD58: .4byte gUnknown_03004DC0 -_080EAD5C: .4byte gUnknown_03004DE0 -_080EAD60: .4byte gUnknown_083DB694 - thumb_func_end sub_80EAD08 - - thumb_func_start sub_80EAD64 -sub_80EAD64: @ 80EAD64 - push {lr} - lsls r1, 24 - ldr r2, _080EAD78 @ =gEasyChatGroupNames - lsrs r1, 22 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - pop {r1} - bx r1 - .align 2, 0 -_080EAD78: .4byte gEasyChatGroupNames - thumb_func_end sub_80EAD64 - - thumb_func_start sub_80EAD7C -sub_80EAD7C: @ 80EAD7C - push {lr} - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x14 - beq _080EADA2 - cmp r0, 0x14 - bgt _080EAD9C - cmp r0, 0x11 - blt _080EADBA - ldr r0, _080EAD98 @ =0x00000804 - bl FlagGet - b _080EADB4 - .align 2, 0 -_080EAD98: .4byte 0x00000804 -_080EAD9C: - cmp r1, 0x15 - beq _080EADB0 - b _080EADBA -_080EADA2: - ldr r0, _080EADAC @ =0x00000806 - bl FlagGet - b _080EADB4 - .align 2, 0 -_080EADAC: .4byte 0x00000806 -_080EADB0: - bl sub_80EB9C8 -_080EADB4: - lsls r0, 24 - lsrs r0, 24 - b _080EADBC -_080EADBA: - movs r0, 0x1 -_080EADBC: - pop {r1} - bx r1 - thumb_func_end sub_80EAD7C - - thumb_func_start sub_80EADC0 -sub_80EADC0: @ 80EADC0 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r1, 16 - lsrs r3, r1, 16 - cmp r2, 0x15 - bhi _080EAE82 - lsls r0, r2, 2 - ldr r1, _080EADD8 @ =_080EADDC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080EADD8: .4byte _080EADDC - .align 2, 0 -_080EADDC: - .4byte _080EAE50 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE82 - .4byte _080EAE62 - .4byte _080EAE62 - .4byte _080EAE62 - .4byte _080EAE34 - .4byte _080EAE78 -_080EAE34: - ldr r0, _080EAE4C @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, r2 - adds r0, 0x67 - ldrb r0, [r0] - cmp r0, 0 - beq _080EAE70 - lsls r0, r3, 24 - lsrs r0, 24 - bl sub_80EB868 - b _080EAE7C - .align 2, 0 -_080EAE4C: .4byte gUnknown_083DB694 -_080EAE50: - adds r0, r3, 0 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl GetSetPokedexFlag - b _080EAE7C -_080EAE62: - ldr r0, _080EAE74 @ =gUnknown_083DB694 - ldr r0, [r0] - adds r0, r2 - adds r0, 0x67 - ldrb r0, [r0] - cmp r0, 0 - bne _080EAE82 -_080EAE70: - movs r0, 0 - b _080EAE84 - .align 2, 0 -_080EAE74: .4byte gUnknown_083DB694 -_080EAE78: - bl sub_80EB9C8 -_080EAE7C: - lsls r0, 24 - lsrs r0, 24 - b _080EAE84 -_080EAE82: - movs r0, 0x1 -_080EAE84: - pop {r1} - bx r1 - thumb_func_end sub_80EADC0 - - thumb_func_start sub_80EAE88 -sub_80EAE88: @ 80EAE88 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - beq _080EAEA6 - cmp r4, 0x14 - beq _080EAEB2 - adds r0, r4, 0 - bl sub_80EAD7C - lsls r0, 24 - cmp r0, 0 - bne _080EAEBC - movs r0, 0 - b _080EAEC2 -_080EAEA6: - movs r0, 0 - bl GetHoennPokedexCount - lsls r0, 16 - lsrs r0, 16 - b _080EAEC2 -_080EAEB2: - bl sub_80EB8C0 - lsls r0, 24 - lsrs r0, 24 - b _080EAEC2 -_080EAEBC: - ldr r0, _080EAEC8 @ =gEasyChatGroupSizes - adds r0, r4, r0 - ldrb r0, [r0] -_080EAEC2: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080EAEC8: .4byte gEasyChatGroupSizes - thumb_func_end sub_80EAE88 - - thumb_func_start sub_80EAECC -sub_80EAECC: @ 80EAECC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - movs r7, 0 - ldr r1, _080EAF08 @ =gUnknown_083DB694 - ldr r0, [r1] - ldr r3, _080EAF0C @ =0x0000446c - adds r3, r0, r3 - str r3, [sp, 0x4] -_080EAEE4: - ldr r1, _080EAF10 @ =gEasyChatWordsByLetter - lsls r2, r7, 1 - adds r0, r2, r1 - ldrh r4, [r0] - adds r3, r7, 0x1 - lsls r0, r3, 1 - adds r0, r1 - ldrh r0, [r0] - str r0, [sp] - ldr r0, [sp, 0x4] - adds r1, r0, r2 - movs r0, 0 - strh r0, [r1] - mov r9, r0 - adds r6, r4, 0 - mov r10, r2 - str r3, [sp, 0x8] - b _080EB00C - .align 2, 0 -_080EAF08: .4byte gUnknown_083DB694 -_080EAF0C: .4byte 0x0000446c -_080EAF10: .4byte gEasyChatWordsByLetter -_080EAF14: - ldr r2, _080EAFAC @ =gEasyChatWordsAlphabetized - adds r0, r6, 0 - adds r1, r0, 0x1 - lsls r1, 16 - lsrs r6, r1, 16 - lsls r0, 1 - adds r0, r2 - ldrh r1, [r0] - adds r4, r1, 0 - ldr r0, _080EAFB0 @ =0x0000feff - cmp r1, r0 - bls _080EAFC8 - movs r0, 0xFF - ands r1, r0 - movs r3, 0 - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _080EAFB4 @ =0x0000ffff - cmp r5, r0 - beq _080EB00C - lsls r0, r7, 4 - adds r0, r7 - lsls r0, 3 - subs r0, r7 - lsls r0, 2 - mov r8, r0 -_080EAF4A: - adds r1, r6, 0 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 1 - ldr r0, _080EAFAC @ =gEasyChatWordsAlphabetized - adds r1, r0 - ldrh r4, [r1] - lsrs r0, r4, 9 - ldr r1, _080EAFB8 @ =0x000001ff - adds r2, r1, 0 - adds r1, r4, 0 - ands r1, r2 - str r3, [sp, 0xC] - bl sub_80EADC0 - lsls r0, 24 - ldr r3, [sp, 0xC] - cmp r0, 0 - beq _080EAF9E - cmp r3, 0 - bne _080EAF9E - ldr r3, _080EAFBC @ =gUnknown_083DB694 - ldr r2, [r3] - mov r1, r9 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - lsls r1, 1 - add r1, r8 - ldr r3, _080EAFC0 @ =0x00000b78 - adds r0, r2, r3 - adds r0, r1 - strh r4, [r0] - ldr r0, _080EAFC4 @ =0x0000446c - adds r2, r0 - add r2, r10 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - movs r3, 0x1 -_080EAF9E: - subs r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r1, _080EAFB4 @ =0x0000ffff - cmp r5, r1 - bne _080EAF4A - b _080EB00C - .align 2, 0 -_080EAFAC: .4byte gEasyChatWordsAlphabetized -_080EAFB0: .4byte 0x0000feff -_080EAFB4: .4byte 0x0000ffff -_080EAFB8: .4byte 0x000001ff -_080EAFBC: .4byte gUnknown_083DB694 -_080EAFC0: .4byte 0x00000b78 -_080EAFC4: .4byte 0x0000446c -_080EAFC8: - lsrs r0, r4, 9 - ldr r3, _080EB030 @ =0x000001ff - adds r2, r3, 0 - adds r1, r4, 0 - ands r1, r2 - bl sub_80EADC0 - lsls r0, 24 - cmp r0, 0 - beq _080EB00C - ldr r0, _080EB034 @ =gUnknown_083DB694 - ldr r2, [r0] - mov r1, r9 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - lsls r1, 1 - lsls r0, r7, 4 - adds r0, r7 - lsls r0, 3 - subs r0, r7 - lsls r0, 2 - adds r1, r0 - ldr r3, _080EB038 @ =0x00000b78 - adds r0, r2, r3 - adds r0, r1 - strh r4, [r0] - ldr r0, _080EB03C @ =0x0000446c - adds r2, r0 - add r2, r10 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] -_080EB00C: - ldr r1, [sp] - cmp r6, r1 - bcs _080EB014 - b _080EAF14 -_080EB014: - ldr r3, [sp, 0x8] - lsls r0, r3, 16 - lsrs r7, r0, 16 - cmp r7, 0x1A - bhi _080EB020 - b _080EAEE4 -_080EB020: - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EB030: .4byte 0x000001ff -_080EB034: .4byte gUnknown_083DB694 -_080EB038: .4byte 0x00000b78 -_080EB03C: .4byte 0x0000446c - thumb_func_end sub_80EAECC - - thumb_func_start sub_80EB040 -sub_80EB040: @ 80EB040 - push {r4-r6,lr} - movs r3, 0 -_080EB044: - adds r6, r3, 0x1 - cmp r3, 0 - beq _080EB094 - cmp r3, 0x15 - beq _080EB094 - cmp r3, 0x12 - beq _080EB094 - cmp r3, 0x13 - beq _080EB094 - ldr r0, _080EB0A4 @ =gEasyChatGroupWords - lsls r1, r3, 2 - adds r1, r0 - ldr r2, [r1] - movs r4, 0 - ldrb r0, [r2] - cmp r0, 0xFF - beq _080EB094 - ldr r0, _080EB0A8 @ =gUnknown_083DB694 - ldr r0, [r0] - ldr r1, _080EB0AC @ =0x000044d0 - adds r5, r0, r1 -_080EB06E: - lsls r0, r4, 2 - lsls r1, r3, 10 - adds r0, r1 - adds r0, r5, r0 - str r2, [r0] - ldrb r0, [r2] - adds r1, r4, 0x1 - cmp r0, 0xFF - beq _080EB088 -_080EB080: - adds r2, 0x1 - ldrb r0, [r2] - cmp r0, 0xFF - bne _080EB080 -_080EB088: - adds r2, 0x1 - lsls r0, r1, 16 - lsrs r4, r0, 16 - ldrb r0, [r2] - cmp r0, 0xFF - bne _080EB06E -_080EB094: - lsls r0, r6, 16 - lsrs r3, r0, 16 - cmp r3, 0x15 - bls _080EB044 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080EB0A4: .4byte gEasyChatGroupWords -_080EB0A8: .4byte gUnknown_083DB694 -_080EB0AC: .4byte 0x000044d0 - thumb_func_end sub_80EB040 - - thumb_func_start sub_80EB0B0 -sub_80EB0B0: @ 80EB0B0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r3, _080EB184 @ =gUnknown_083DB694 - ldr r4, [r3] - adds r0, r4, 0 - adds r0, 0x26 - ldrb r5, [r0] - cmp r5, 0 - bne _080EB19C - movs r0, 0xDC - lsls r0, 1 - adds r2, r4, r0 - ldrb r6, [r2] - lsls r1, r6, 1 - ldr r7, _080EB188 @ =0x000044a2 - adds r0, r4, r7 - adds r0, r1 - strh r5, [r0] - movs r7, 0 - movs r0, 0 - mov r9, r0 - ldr r1, _080EB18C @ =gEasyChatGroupOrders - lsls r0, r6, 2 - adds r0, r1 - ldr r0, [r0] - str r0, [sp] - movs r1, 0 - mov r8, r1 - ldr r1, _080EB190 @ =gEasyChatGroupSizes - ldrb r0, [r2] - adds r0, r1 - ldrb r0, [r0] - cmp r8, r0 - bcc _080EB0FE - b _080EB1FE -_080EB0FE: - movs r2, 0xDC - lsls r2, 1 - adds r2, r4, r2 - str r2, [sp, 0x4] - lsls r5, r6, 24 - mov r10, r5 -_080EB10A: - mov r1, r8 - lsls r0, r1, 1 - ldr r2, [sp] - adds r5, r0, r2 - ldrh r1, [r5] - mov r2, r10 - lsrs r0, r2, 24 - bl sub_80EADC0 - lsls r0, 24 - cmp r0, 0 - beq _080EB16A - ldr r0, _080EB184 @ =gUnknown_083DB694 - ldr r3, [r0] - lsls r1, r7, 1 - mov r2, r9 - lsls r0, r2, 2 - adds r1, r0 - ldr r0, _080EB194 @ =0x00009d56 - adds r4, r3, r0 - adds r4, r1 - movs r0, 0x7F - ands r0, r6 - lsls r0, 9 - ldrh r1, [r5] - ldr r5, _080EB198 @ =0x000001ff - adds r2, r5, 0 - ands r1, r2 - orrs r0, r1 - strh r0, [r4] - lsls r0, r6, 1 - ldr r1, _080EB188 @ =0x000044a2 - adds r3, r1 - adds r3, r0 - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1 - bls _080EB16A - movs r7, 0 - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 -_080EB16A: - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r1, _080EB190 @ =gEasyChatGroupSizes - ldr r2, [sp, 0x4] - ldrb r0, [r2] - adds r0, r1 - ldrb r0, [r0] - cmp r8, r0 - bcc _080EB10A - b _080EB1FE - .align 2, 0 -_080EB184: .4byte gUnknown_083DB694 -_080EB188: .4byte 0x000044a2 -_080EB18C: .4byte gEasyChatGroupOrders -_080EB190: .4byte gEasyChatGroupSizes -_080EB194: .4byte 0x00009d56 -_080EB198: .4byte 0x000001ff -_080EB19C: - movs r5, 0xDC - lsls r5, 1 - adds r0, r4, r5 - ldrb r2, [r0] - movs r3, 0 - movs r6, 0 - movs r5, 0 - lsls r1, r2, 1 - ldr r7, _080EB210 @ =0x0000446c - adds r0, r4, r7 - adds r1, r0, r1 - ldrh r0, [r1] - cmp r5, r0 - bcs _080EB1FE - ldr r7, _080EB214 @ =0x00009d56 - adds r7, r4 - mov r8, r7 - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 3 - subs r0, r2 - lsls r7, r0, 2 - ldr r0, _080EB218 @ =0x00000b78 - adds r2, r4, r0 - adds r4, r1, 0 -_080EB1CE: - lsls r1, r3, 1 - lsls r0, r6, 2 - adds r1, r0 - add r1, r8 - lsls r0, r5, 1 - adds r0, r7 - adds r0, r2, r0 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x1 - bls _080EB1F2 - movs r3, 0 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_080EB1F2: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r1, [r4] - cmp r5, r1 - bcc _080EB1CE -_080EB1FE: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080EB210: .4byte 0x0000446c -_080EB214: .4byte 0x00009d56 -_080EB218: .4byte 0x00000b78 - thumb_func_end sub_80EB0B0 - - thumb_func_start sub_80EB218 -sub_80EB218: @ 80EB218 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - lsls r6, r1, 16 - lsrs r4, r6, 16 - adds r7, r4, 0 - lsls r2, 16 - lsrs r2, 16 - mov r8, r2 - adds r0, r4, 0 - bl sub_80EB37C - lsls r0, 24 - cmp r0, 0 - beq _080EB240 - ldr r1, _080EB23C @ =gOtherText_ThreeQuestions - b _080EB2A2 - .align 2, 0 -_080EB23C: .4byte gOtherText_ThreeQuestions -_080EB240: - ldr r0, _080EB250 @ =0x0000ffff - cmp r4, r0 - bne _080EB254 - adds r1, r5, 0 - movs r0, 0xFF - strb r0, [r1] - b _080EB2AA - .align 2, 0 -_080EB250: .4byte 0x0000ffff -_080EB254: - lsrs r2, r6, 25 - ldr r1, _080EB268 @ =0x000001ff - ands r1, r7 - cmp r2, 0x13 - bgt _080EB26C - cmp r2, 0x12 - bge _080EB280 - cmp r2, 0 - beq _080EB270 - b _080EB290 - .align 2, 0 -_080EB268: .4byte 0x000001ff -_080EB26C: - cmp r2, 0x15 - bne _080EB290 -_080EB270: - movs r0, 0xB - muls r1, r0 - ldr r0, _080EB27C @ =gSpeciesNames - adds r1, r0 - b _080EB2A2 - .align 2, 0 -_080EB27C: .4byte gSpeciesNames -_080EB280: - movs r0, 0xD - muls r1, r0 - ldr r0, _080EB28C @ =gMoveNames - adds r1, r0 - b _080EB2A2 - .align 2, 0 -_080EB28C: .4byte gMoveNames -_080EB290: - ldr r0, _080EB2CC @ =gUnknown_083DB694 - ldr r0, [r0] - lsls r1, 2 - lsls r2, 10 - adds r1, r2 - ldr r2, _080EB2D0 @ =0x000044d0 - adds r0, r2 - adds r0, r1 - ldr r1, [r0] -_080EB2A2: - adds r0, r5, 0 - bl StringCopy - adds r1, r0, 0 -_080EB2AA: - movs r0, 0xFC - strb r0, [r1] - movs r0, 0x13 - strb r0, [r1, 0x1] - mov r2, r8 - lsls r0, r2, 3 - strb r0, [r1, 0x2] - adds r1, 0x3 - movs r0, 0xFF - strb r0, [r1] - adds r0, r1, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080EB2CC: .4byte gUnknown_083DB694 -_080EB2D0: .4byte 0x000044d0 - thumb_func_end sub_80EB218 - - thumb_func_start sub_80EB2D4 -sub_80EB2D4: @ 80EB2D4 - push {r4-r6,lr} - lsls r5, r0, 16 - lsrs r4, r5, 16 - adds r6, r4, 0 - adds r0, r4, 0 - bl sub_80EB37C - lsls r0, 24 - cmp r0, 0 - beq _080EB2F8 - ldr r0, _080EB2F4 @ =gOtherText_ThreeQuestions - bl StringLength - lsls r0, 16 - lsrs r0, 16 - b _080EB374 - .align 2, 0 -_080EB2F4: .4byte gOtherText_ThreeQuestions -_080EB2F8: - ldr r0, _080EB304 @ =0x0000ffff - cmp r4, r0 - bne _080EB308 - movs r0, 0 - b _080EB374 - .align 2, 0 -_080EB304: .4byte 0x0000ffff -_080EB308: - lsrs r2, r5, 25 - ldr r1, _080EB31C @ =0x000001ff - ands r1, r6 - cmp r2, 0x13 - bgt _080EB320 - cmp r2, 0x12 - bge _080EB334 - cmp r2, 0 - beq _080EB324 - b _080EB344 - .align 2, 0 -_080EB31C: .4byte 0x000001ff -_080EB320: - cmp r2, 0x15 - bne _080EB344 -_080EB324: - movs r0, 0xB - muls r1, r0 - ldr r0, _080EB330 @ =gSpeciesNames - adds r1, r0 - b _080EB356 - .align 2, 0 -_080EB330: .4byte gSpeciesNames -_080EB334: - movs r0, 0xD - muls r1, r0 - ldr r0, _080EB340 @ =gMoveNames - adds r1, r0 - b _080EB356 - .align 2, 0 -_080EB340: .4byte gMoveNames -_080EB344: - ldr r0, _080EB35C @ =gUnknown_083DB694 - ldr r0, [r0] - lsls r1, 2 - lsls r2, 10 - adds r1, r2 - ldr r2, _080EB360 @ =0x000044d0 - adds r0, r2 - adds r0, r1 - ldr r1, [r0] -_080EB356: - movs r2, 0 - b _080EB36C - .align 2, 0 -_080EB35C: .4byte gUnknown_083DB694 -_080EB360: .4byte 0x000044d0 -_080EB364: - adds r1, 0x1 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 -_080EB36C: - ldrb r0, [r1] - cmp r0, 0xFF - bne _080EB364 - adds r0, r2, 0 -_080EB374: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80EB2D4 - - thumb_func_start sub_80EB37C -sub_80EB37C: @ 80EB37C - push {r4,r5,lr} - lsls r1, r0, 16 - lsrs r3, r1, 16 - ldr r0, _080EB3A0 @ =0x0000ffff - cmp r3, r0 - beq _080EB3EA - lsrs r2, r1, 25 - ldr r5, _080EB3A4 @ =0x000001ff - ands r5, r3 - cmp r2, 0x15 - bhi _080EB3F4 - cmp r2, 0x13 - bgt _080EB3A8 - cmp r2, 0x12 - bge _080EB3AC - cmp r2, 0 - beq _080EB3AC - b _080EB3E0 - .align 2, 0 -_080EB3A0: .4byte 0x0000ffff -_080EB3A4: .4byte 0x000001ff -_080EB3A8: - cmp r2, 0x15 - bne _080EB3E0 -_080EB3AC: - ldr r0, _080EB3D8 @ =gEasyChatGroupWords - lsls r1, r2, 2 - adds r1, r0 - ldr r4, [r1] - movs r3, 0 - ldr r0, _080EB3DC @ =gEasyChatGroupSizes - adds r0, r2, r0 - ldrb r0, [r0] - cmp r3, r0 - bcs _080EB3F4 - adds r1, r0, 0 -_080EB3C2: - lsls r0, r3, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r5, r0 - beq _080EB3EA - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r1 - bcc _080EB3C2 - b _080EB3F4 - .align 2, 0 -_080EB3D8: .4byte gEasyChatGroupWords -_080EB3DC: .4byte gEasyChatGroupSizes -_080EB3E0: - ldr r0, _080EB3F0 @ =gEasyChatGroupSizes - adds r0, r2, r0 - ldrb r0, [r0] - cmp r5, r0 - bcs _080EB3F4 -_080EB3EA: - movs r0, 0 - b _080EB3F6 - .align 2, 0 -_080EB3F0: .4byte gEasyChatGroupSizes -_080EB3F4: - movs r0, 0x1 -_080EB3F6: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80EB37C - - thumb_func_start de_sub_80EB748 -de_sub_80EB748: @ 80EB3FC - push {r4-r7,lr} - adds r3, r0, 0 - adds r5, r1, 0 - movs r7, 0 - cmp r3, 0x13 - bgt _080EB412 - cmp r3, 0x12 - bge _080EB416 - cmp r3, 0 - beq _080EB416 - b _080EB458 -_080EB412: - cmp r3, 0x15 - bne _080EB458 -_080EB416: - ldr r1, _080EB438 @ =gEasyChatGroupWords - lsls r0, r3, 2 - adds r0, r1 - ldr r4, [r0] - movs r2, 0 - ldr r0, _080EB43C @ =gEasyChatGroupSizes - adds r1, r3, r0 - adds r6, r0, 0 - ldrb r1, [r1] - cmp r2, r1 - bge _080EB45A - ldrh r0, [r4] - cmp r5, r0 - bne _080EB440 - movs r7, 0 - b _080EB45A - .align 2, 0 -_080EB438: .4byte gEasyChatGroupWords -_080EB43C: .4byte gEasyChatGroupSizes -_080EB440: - adds r2, 0x1 - adds r0, r3, r6 - ldrb r0, [r0] - cmp r2, r0 - bge _080EB45A - lsls r0, r2, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r5, r0 - bne _080EB440 - adds r7, r2, 0 - b _080EB45A -_080EB458: - adds r7, r5, 0 -_080EB45A: - adds r0, r7, 0 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end de_sub_80EB748 - .align 2, 0 @ Don't pad with nop. -- cgit v1.2.3 From 2ea6caea07ef5926b344871fc283fc1984bd2414 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 21:40:52 -0600 Subject: remove asm and combine easy chat files --- asm-de/easy_chat.s | 8 - asm/easy_chat.s | 8 - ld_script.txt | 6 +- src/easy_chat.c | 446 ------------- src/easy_chat_1.c | 1744 ++++++++++++++++++++++++++++++++++++++++++++++++ src/easy_chat_2.c | 429 ++++++++++++ src/easy_chat_before.c | 1744 ------------------------------------------------ sym_bss.txt | 2 +- 8 files changed, 2176 insertions(+), 2211 deletions(-) delete mode 100644 asm-de/easy_chat.s delete mode 100644 asm/easy_chat.s delete mode 100644 src/easy_chat.c create mode 100644 src/easy_chat_1.c delete mode 100644 src/easy_chat_before.c diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s deleted file mode 100644 index a71aefb42..000000000 --- a/asm-de/easy_chat.s +++ /dev/null @@ -1,8 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/easy_chat.s b/asm/easy_chat.s deleted file mode 100644 index a71aefb42..000000000 --- a/asm/easy_chat.s +++ /dev/null @@ -1,8 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 6d5b32237..1b50c1f65 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -302,10 +302,8 @@ SECTIONS { asm/normal.o(.text); asm/battle_intro.o(.text); src/field/bike.o(.text); - src/easy_chat_before.o(.text); + src/easy_chat_1.o(.text); src/easy_chat_2.o(.text); - asm/easy_chat.o(.text); - src/easy_chat.o(.text); src/pokenav_before.o(.text); asm/pokenav.o(.text); src/pokenav_after.o(.text); @@ -543,7 +541,7 @@ SECTIONS { src/field/item_use.o(.rodata); data/battle_anim_80CA710.o(.rodata); src/field/bike.o(.rodata); - src/easy_chat_before.o(.rodata); + src/easy_chat_1.o(.rodata); src/easy_chat_2.o(.rodata); data/easy_chat.o(.rodata); data/pokenav.o(.rodata); diff --git a/src/easy_chat.c b/src/easy_chat.c deleted file mode 100644 index 88afa8fe3..000000000 --- a/src/easy_chat.c +++ /dev/null @@ -1,446 +0,0 @@ -#include "global.h" -#include "easy_chat.h" -#include "ewram.h" -#include "constants/easy_chat.h" -#include "data2.h" -#include "event_data.h" -#include "field_message_box.h" -#include "pokedex.h" -#include "random.h" -#include "string_util.h" -#include "strings.h" -#include "strings2.h" -#include "text.h" - -static u16 sub_80EB9D8(void); -static u16 sub_80EB960(void); - -extern void *gEasyChatGroupWords[]; -extern const u8 gEasyChatGroupSizes[]; - -extern u16 gSpecialVar_0x8004; - -// put this in .bss, damnit! -__attribute__((section(".bss"))) u8 gUnknown_03000740 = 0; - -// returns the end of the destination buffer text -u8 *EasyChat_GetWordText(u8 *dst, u16 word) -{ - u16 group; - u16 wordIndex; - u8 *src; - u16 i; - - if (sub_80EB37C(word)) - return StringCopy(dst, gOtherText_ThreeQuestions); - - if (word == 0xFFFF) - { - *dst = EOS; - return dst; - } - else - { - group = EC_GROUP(word); - wordIndex = EC_INDEX(word); - switch (group) - { - case EC_GROUP_POKEMON: // 0 - case EC_GROUP_POKEMON_2: // 21 - dst = StringCopy(dst, gSpeciesNames[wordIndex]); - break; - case EC_GROUP_MOVE_1: // 18 - case EC_GROUP_MOVE_2: // 19 - dst = StringCopy(dst, gMoveNames[wordIndex]); - break; - default: - src = gEasyChatGroupWords[group]; - for (i = wordIndex - 1; i != 0xFFFF; i--) - { - while (*src++ != EOS) - ; - } - dst = StringCopy(dst, src); - break; - } - *dst = EOS; - return dst; - } -} - -u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3) -{ - u16 i; - u16 n; - - const u16 i1 = arg2 - 1; - - for (i = 0; i < arg3; i++) - { - u16 word; - - for (n = 0; n < i1; n++) - { - dst = EasyChat_GetWordText(dst, words[0]); - - if (words[0] != 0xFFFF) - { - dst[0] = CHAR_SPACE; - dst++; - } - - words++; - } - - word = words[0]; - words++; - dst = EasyChat_GetWordText(dst, word); - - dst[0] = CHAR_NEWLINE; - dst++; - } - - dst--; - dst[0] = EOS; - - return dst; -} - -u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3) -{ - u16 i; - u16 n; - - const u16 i1 = arg2 - 1; - - for (i = 0; i < arg3; i++) - { - u16 word; - - for (n = 0; n < i1; n++) - { - dst = EasyChat_GetWordText(dst, words[0]); - - if (words[0] != 0xFFFF) - { - dst[0] = CHAR_SPACE; - dst++; - } - - words++; - } - - word = words[0]; - words++; - dst = EasyChat_GetWordText(dst, word); - - // Only difference with ConvertEasyChatWordsToString - dst[0] = (i == 0) ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL; - dst++; - } - - dst--; - dst[0] = EOS; - - return dst; -} - - -u16 unref_sub_80EB5E0(u16 arg0) -{ - const u8 *chars; - u16 i; - u16 length; - int group, word; - - - if (arg0 == 0xFFFF) - return 0; - - group = EC_GROUP(arg0); - word = EC_INDEX(arg0); - switch (group) - { - case EC_GROUP_POKEMON: // 0 - case EC_GROUP_POKEMON_2: // 21 - chars = gSpeciesNames[word]; - break; - case EC_GROUP_MOVE_1: // 18 - case EC_GROUP_MOVE_2: // 19 - chars = gMoveNames[word]; - break; - default: - chars = gEasyChatGroupWords[group]; - for (i = word - 1; i != 0xFFFF; i--) - { - while (*chars++ != EOS) - ; - } - break; - } - - length = 0; - while (*chars != EOS) - { - chars++; - length++; - } - - return length; -} - -bool8 sub_80EB680(u16 *arg0, u16 arg1, u16 arg2, u16 arg3) -{ - return FALSE; -} - -void unref_sub_80EB684(u8 arg0, u16 arg1) -{ - u16 *ptr; - u16 c; - - // FIXME: find actual tv shows used - switch (arg0) - { - case 5: - c = 6; - ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x04); - break; - case 7: - c = 2; - ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x1C); - break; - case 8: - c = 1; - ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x02); - break; - default: - return; - } - - c -= 1; - while (c != 0xFFFF) - { - *ptr = -1; - ptr++; - c -= 1; - } -} - -void sub_80EB6FC(u16 *arg0, u16 arg1) -{ - u16 i; - - for (i = arg1 - 1; i != 0xFFFF; i--) - { - *arg0 = 0xFFFF; - arg0++; - } - -} - -u16 sub_80EB72C(u16 group) -{ - u16 local1 = Random() % gEasyChatGroupSizes[group]; - - if (group == EC_GROUP_POKEMON - || group == EC_GROUP_POKEMON_2 - || group == EC_GROUP_MOVE_1 - || group == EC_GROUP_MOVE_2) - { - local1 = ((u16 *) gEasyChatGroupWords[group])[local1]; - } - - return ((group & 0x7F) << 9) | (local1 & 0x1FF); -} - -u16 sub_80EB784(u16 group) -{ - if (!sub_80EAD7C(group)) - return -1; - - if (group != EC_GROUP_POKEMON) - { - if (group == EC_GROUP_TRENDY_SAYING) - return sub_80EB960(); - } - else - { - return sub_80EB9D8(); - } - - return sub_80EB72C(group); -} - -void sub_80EB7C4(void) -{ - u16 *words; - u16 arg1, arg2; - - switch (gSpecialVar_0x8004) - { - case 0: - words = gSaveBlock1.easyChats.unk2B1C; - arg1 = 2; - arg2 = 2; - break; - case 1: - words = gSaveBlock1.easyChats.unk2B28; - if (sub_80EB680(gSaveBlock1.easyChats.unk2B28, 3, 2, 20)) - { - arg1 = 2; - arg2 = 3; - } - else - { - arg1 = 3; - arg2 = 2; - } - break; - case 2: - words = gSaveBlock1.easyChats.unk2B34; - arg1 = 3; - arg2 = 2; - break; - case 3: - words = gSaveBlock1.easyChats.unk2B40; - arg1 = 3; - arg2 = 2; - break; - default: - return; - } - - ConvertEasyChatWordsToString(gStringVar4, words, arg1, arg2); - ShowFieldAutoScrollMessage(gStringVar4); -} - -void BufferRandomHobbyOrLifestyleString(void) -{ - u16 group, local2; - - if (Random() & 1) - group = EC_GROUP_HOBBIES; - else - group = EC_GROUP_LIFESTYLE; - - local2 = sub_80EB784(group); - EasyChat_GetWordText(gStringVar2, local2); -} - -u8 sub_80EB868(u8 arg0) -{ - int offset; - int index; - - index = arg0 / 8; - offset = arg0 % 8; - return (gSaveBlock1.unk2D8C[index] >> offset) & 1; -} - -void sub_80EB890(u8 arg0) -{ - int offset; - int index; - - if (arg0 < 33) - { - index = arg0 / 8; - offset = arg0 % 8; - gSaveBlock1.unk2D8C[index] |= 1 << offset; - } -} - -u8 sub_80EB8C0(void) -{ - u8 i, count; - - for (i = 0, count = 0; i < 33; i++) - { - if (sub_80EB868(i)) - count++; - } - return count; -} - -u16 sub_80EB8EC(void) -{ - u16 i; - u16 local1, local2; - - local1 = sub_80EB8C0(); - if (local1 == 33) - return -1; - - local2 = Random() % (33 - local1); - for (i = 0; i < 33; i++) - { - if (sub_80EB868(i) == 0) - { - if (local2 == 0) - { - sub_80EB890(i); - return (i & 0x1FF) | 0x2800; - } - local2--; - } - } - return -1; -} - -static u16 sub_80EB960(void) -{ - u16 i; - u16 local1; - - local1 = sub_80EB8C0(); - if (local1 == 0) - return -1; - - local1 = Random() % local1; - for (i = 0; i < 33; i++) - { - if (sub_80EB868(i)) - { - if (local1 == 0) - return (i & 0x1FF) | 0x2800; - local1--; - } - } - - return -1; -} - -u8 sub_80EB9C8(void) -{ - return IsNationalPokedexEnabled(); -} - -static u16 sub_80EB9D8(void) -{ - u16 *speciesList; - u16 local1; - u16 i; - - local1 = sub_80EAE88(0); - - if (local1 == 0) - return -1; - - local1 = Random() % local1; - speciesList = (u16 *) gEasyChatGroupWords[EC_GROUP_POKEMON]; - for (i = 0; i < gEasyChatGroupSizes[EC_GROUP_POKEMON]; i++) - { - const u16 dexNum = SpeciesToNationalPokedexNum(*speciesList); - const u8 local2 = GetSetPokedexFlag(dexNum, 0); - - if (local2) - { - if (local1 == 0) - return *speciesList & 0x1FF; - local1--; - } - speciesList++; - } - return -1; -} diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c new file mode 100644 index 000000000..59e463260 --- /dev/null +++ b/src/easy_chat_1.c @@ -0,0 +1,1744 @@ +#include "global.h" +#include "constants/easy_chat.h" +#include "constants/songs.h" +#include "constants/species.h" +#include "dewford_trend.h" +#include "easy_chat.h" +#include "event_data.h" +#include "ewram.h" +#include "graphics.h" +#include "main.h" +#include "menu.h" +#include "palette.h" +#include "sound.h" +#include "sprite.h" +#include "string_util.h" +#include "strings.h" +#include "unknown_task.h" + +extern const struct WindowConfig gWindowConfig_81E6D54; +extern const struct WindowConfig gWindowConfig_81E6DA8; + +extern void sub_80546B8(void); + +#define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) + +const u16 gMysteryEventPhrase[] = {EC_WORD_MYSTERY, EC_WORD_EVENT, EC_WORD_IS, EC_WORD_EXCITING}; + +const u16 gBerryMasterWifePhrases[][2] = +{ +#if ENGLISH + {EC_WORD_GREAT, EC_WORD_BATTLE}, + {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, + {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, + {EC_WORD_COOL, EC_POKEMON(LATIOS)}, + {EC_WORD_SUPER, EC_WORD_HUSTLE}, +#else + {EC_WORD_GREAT, EC_WORD_FIGHT}, + {EC_WORD_CONTEST, EC_WORD_CHALLENGE}, + {EC_POKEMON(LATIAS), EC_WORD_OVERWHELMING}, + {EC_POKEMON(LATIOS), EC_WORD_COOL}, + {EC_WORD_SUPER, 0xFFFF}, +#endif +}; + +// const pointer to shared1000. easy_chat might be two separate files. +struct Shared1000 *const gUnknown_083DB694 = &shared1000; + +const struct UnknownTaskStruct gUnknown_083DB698 = +{ + ®_BG3VOFS, + ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, + 1 +}; + +const u8 gUnknown_083DB6A4[] = {4, 0, 0, 0, 1, 5, 0, 2, 2, 3, 2, 2, 2, 3}; + +// choose by alphabet keyboard +const u8 gUnknown_083DB6B2[][16] = +{ + _("ABCDEF "), + _("GHIJKL"), + _("MNOPQRS"), + _("TUVWXYZ"), +}; + +struct EasyChatPrompt +{ + const u8 *text1; + const u8 *text2; + bool8 unk8; +}; + +const struct EasyChatPrompt gUnknown_083DB6F4[] = +{ + {OtherText_MakeProfilePage1, OtherText_MakeProfilePage2, TRUE}, + {OtherText_MakeMessagePage1, OtherText_MakeMessagePage2, TRUE}, + {OtherText_CombineNinePhrasesPage1, OtherText_CombineNinePhrasesPage2, TRUE}, + {OtherText_DescribeFeelingsPage1, OtherText_DescribeFeelingsPage2, TRUE}, + {OtherText_ImproveBardSongPage1, OtherText_ImproveBardSongPage2, TRUE}, + {OtherText_CombineTwoPhrasesPage1, OtherText_CombineTwoPhrasesPage2, TRUE}, + {OtherText_YourProfile, OtherText_ConfirmTrendyPage2, FALSE}, + {OtherText_YourFeelingBattle, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_SetWinMessage, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_SetLossMessage, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_MailMessage, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_MailSalutation, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_NewSong, OtherText_ConfirmTrendyPage2, FALSE}, + {OtherText_TheAnswer, OtherText_ConfirmTrendyPage2, FALSE}, + {OtherText_ConfirmTrendyPage1, OtherText_ConfirmTrendyPage2, TRUE}, + {OtherText_HipsterPage1, OtherText_HipsterPage2, TRUE}, + {OtherText_WithFourPhrases, OtherText_CombineNinePhrasesPage2, TRUE}, +}; + +const u8 gUnknown_083DB7C0[][2] = +{ + { 0, 6}, + { 1, 7}, + { 1, 8}, + { 1, 9}, + { 2, 10}, + {16, 13}, + { 4, 12}, + { 3, 13}, + { 3, 13}, + { 5, 14}, + { 3, 13}, + { 3, 13}, + { 3, 13}, + {15, 13}, +}; + +void sub_80E62F8(void); +void sub_80E6424(void); +void sub_80E6554(void); +void sub_80E6630(void); +void sub_80E6690(void); +void sub_80E682C(void (*)(void)); +void sub_80E69F8(void); +void sub_80E6A6C(void); +void sub_80E6A88(void); +void sub_80E6AA8(void); +void sub_80E6AC4(void); +void sub_80E6AE4(void); +void sub_80E6BC0(void); +void sub_80E6C84(void); +void sub_80E6D7C(void); +void sub_80E6F68(void); +void sub_80E6FC8(void); +void sub_80E7114(void); +void sub_80E718C(void); +void sub_80E7218(void); +void sub_80E7294(void); +void sub_80E7324(void); +void sub_80E73D0(void); +void sub_80E7458(void); +void sub_80E752C(void); +void sub_80E7574(void); +bool8 sub_80E75D8(void); +bool8 sub_80E77C8(void); +void sub_80E7A98(void); +void sub_80E7AD4(void); +bool8 sub_80E7B40(void); +void sub_80E7D30(void); +void sub_80E7D6C(void); +void sub_80E7D9C(void); +bool8 sub_80E7DD0(void); +void sub_80E7E50(void); +void sub_80E7F00(u16, u16); +u8 sub_80E7FA8(void); +bool8 sub_80E8054(void); +u8 sub_80E8094(void); +u8 sub_80E810C(void); +void sub_80E81C0(void); +void sub_80E81FC(void); +void sub_80E8218(void); + +void sub_80E8398(); +void sub_80E8420(void); +void sub_80E8504(void); +void sub_80E87CC(); + +void sub_80E88F0(void); +void sub_80E8958(); + +void sub_80E8BF4(); +void sub_80E8CEC(void); +void sub_80E8D54(void); +void sub_80E8D8C(); +void sub_80E8DD8(void); +void sub_80E91D4(); +void sub_80E9368(); +void sub_80E95A4(void); +void sub_80E9744(void); +void sub_80E98C4(void); +void sub_80E9974(void); +void sub_80E9A14(void); +void sub_80E9A4C(void); +void sub_80E9AD4(void); +void sub_80E9C94(void); +void sub_80E9D00(void); +void sub_80E9D7C(void); +void sub_80E9E08(); +bool8 sub_80E9E54(void); +void sub_80E9E98(void); +u8 sub_80E9EA8(void); +u8 sub_80E9F50(void); +u8 sub_80E9FD4(void); +u8 sub_80EA014(void); +u8 sub_80EA050(void); +u8 sub_80EA0E4(void); +u8 sub_80EA184(void); +void sub_80EAC5C(void); +void sub_80EAD08(void); +u8 sub_80EAD7C(u8); +void sub_80EAECC(void); +void sub_80EB040(void); +void sub_80EB0B0(void); +u8 *sub_80EB218(u8 *, u16, u16); +u16 sub_80EB2D4(); +bool8 sub_80EB680(u16 *, u16, u16, u16); + +void sub_80E60D8(void) +{ + u8 r4 = 3; + u16 *r1; + + switch (gSpecialVar_0x8004) + { + case 0: + r1 = gSaveBlock1.easyChats.unk2B1C; + break; + case 1: + r1 = gSaveBlock1.easyChats.unk2B28; + break; + case 2: + r1 = gSaveBlock1.easyChats.unk2B34; + break; + case 3: + r1 = gSaveBlock1.easyChats.unk2B40; + break; + case 4: + r1 = gSaveBlock1.mail[gSpecialVar_0x8005].words; + break; + case 6: + { + struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard; + u16 i; + for (i = 0; i < 6; i++) + bard->temporaryLyrics[i] = bard->songLyrics[i]; + r1 = bard->temporaryLyrics; + } + break; + case 5: + // TODO: Is this the right TV show? + r1 = gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubLetter.pad04; + r4 = gSpecialVar_0x8006; + break; + case 7: + // TODO: Is this the right TV show? + r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubOpinions.var1C[gSpecialVar_0x8006]; + r4 = 1; + break; + case 8: + // TODO: Is this the right TV show? + r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubOpinions.var02; + r4 = 0; + break; + case 9: + r1 = NULL; + break; + case 10: + r1 = &gSaveBlock1.gabbyAndTyData.quote; + *r1 = 0xFFFF; + r4 = 1; + break; + case 11: + // TODO: Is this the right TV show? + r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].bravoTrainer.var04[gSpecialVar_0x8006]; + r4 = 0; + break; + case 12: + // TODO: Is this the right TV show? + r1 = gSaveBlock1.tvShows[gSpecialVar_0x8005].bravoTrainerTower.var18; + r4 = 1; + break; + case 13: + shared1000.unk9C7C = 0xFFFF; + shared1000.unk9C7E = -1; + r1 = &shared1000.unk9C7C; + break; + default: + return; + } + sub_80E62A0(gSpecialVar_0x8004, r1, sub_80546B8, r4); +} + +void sub_80E62A0(u8 a, u16 *b, void (*c)(void), u8 d) +{ + shared1000.unk0 = c; + shared1000.unk4 = b; + shared1000.unk8 = a; + shared1000.unkB = d; + if (a == 9) + { + shared1000.unk4 = &shared1000.unk9C7C; + shared1000.unk9C7C = gSaveBlock1.easyChatPairs[0].words[0]; + shared1000.unk9C7E = gSaveBlock1.easyChatPairs[0].words[1]; + } + SetMainCallback2(sub_80E62F8); +} + +void sub_80E62F8(void) +{ + switch (gMain.state) + { + case 0: + default: + REG_DISPCNT = 0; + SetVBlankCallback(0); + ResetPaletteFade(); + ResetSpriteData(); + dp12_8087EA4(); + remove_some_task(); + sub_80EAD08(); + sub_80895F8(gUnknown_083DB698); + FreeSpriteTileRanges(); + FreeAllSpritePalettes(); + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E6DA8); + break; + case 2: + InitMenuWindow(&gWindowConfig_81E6D54); + InitMenuWindow(&gWindowConfig_81E6DA8); + MenuZeroFillScreen(); + break; + case 3: + sub_80E6424(); + break; + case 4: + sub_80E8DD8(); + break; + case 5: + sub_80E8218(); + sub_80E8CEC(); + break; + case 6: + sub_80E69F8(); + sub_80E682C(sub_80E6AA8); + SetVBlankCallback(sub_80E6A6C); + break; + case 7: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + break; + case 8: + REG_DISPCNT = 0x1F40; + SetMainCallback2(sub_80E6A88); + FlagSet(FLAG_SYS_CHAT_USED); + break; + } + gMain.state++; +} + +void sub_80E6424(void) +{ + shared1000.unk9 = gUnknown_083DB6A4[shared1000.unk8]; + switch (shared1000.unk9) + { + case 4: + shared1000.unkA = 4; + shared1000.unk83 = 2; + shared1000.unk84 = 2; + shared1000.unk88 = 5; + shared1000.unk8A = 4; + break; + case 5: + shared1000.unkA = 4; + shared1000.unk83 = 1; + shared1000.unk84 = 4; + shared1000.unk88 = 16; + shared1000.unk8A = 2; + break; + case 0: + shared1000.unkA = 6; + shared1000.unk83 = 2; + shared1000.unk84 = 3; + shared1000.unk88 = 4; + shared1000.unk8A = 3; + break; + case 1: + shared1000.unkA = 9; + shared1000.unk83 = 2; + shared1000.unk84 = 5; + shared1000.unk88 = 4; + shared1000.unk8A = 0; + break; + case 2: + shared1000.unkA = 1; + shared1000.unk83 = 1; + shared1000.unk84 = 1; + shared1000.unk88 = 16; + shared1000.unk8A = 4; + break; + case 3: + shared1000.unkA = 2; + shared1000.unk83 = 2; + shared1000.unk84 = 1; + shared1000.unk88 = 5; + shared1000.unk8A = 3; + break; + } + shared1000.unk86 = 0; + shared1000.unk85 = 0; + shared1000.unk87 = 0; + shared1000.unk26 = 0; + shared1000.unk1BA = 0; + shared1000.unk1BE = 2; + sub_80E6554(); + sub_80EAECC(); + sub_80EB040(); + sub_80E7E50(); + sub_80E6630(); + sub_80E6690(); +} + +void sub_80E6554(void) +{ + u16 r4 = 0; + u16 r7; + u16 r5; + + for (r7 = 0; ; r7++) + { + for (r5 = 0; r5 < 2; r5++) + { + shared1000.unk2A[r7][r5] = r4++; + if (r4 == 17) + break; + } + if (r4 == 17) + break; + } + shared1000.unk28 = 17; + while (r4 < 22) + { + if (sub_80EAD7C(r4) != 0) + { + r5++; + if (r5 > 1) + { + r7++; + r5 = 0; + } + shared1000.unk2A[r7][r5] = r4; + shared1000.unk78[r4 - 17] = 1; // hmm... + shared1000.unk28++; + } + else + { + shared1000.unk78[r4 - 17] = 0; + } + r4++; + } + shared1000.unk1B6 = (shared1000.unk28 + 1) / 2; +} + +void sub_80E6630(void) +{ + u8 i; + u8 r3; + + for (i = 0; i < 4; i++) + { + const u8 *row = gUnknown_083DB6B2[i]; + + for (r3 = 0; row[r3] != EOS; r3++) + { + if (row[r3] != CHAR_SPACE) + shared1000.unk40[i][r3] = row[r3] + 0x46; + else + shared1000.unk40[i][r3] = CHAR_SPACE; + } + } +} + +void sub_80E6690(void) +{ + u8 *pointers[] = + { + shared1000.unk9C80, shared1000.unk9CC9, + shared1000.unk9D12, shared1000.unk9D5B, + }; + u8 *r3; + u16 i; + + for (i = 0; i < 2; i++) + { + const struct EasyChatPrompt *prompt = &gUnknown_083DB6F4[gUnknown_083DB7C0[shared1000.unk8][i]]; + + r3 = StringCopy(pointers[i * 2 + 0], prompt->text1); + if (prompt->unk8) + { + StringCopy(pointers[i * 2 + 1], prompt->text2); + } + else + { + *r3++ = CHAR_SPACE; + StringCopy(r3, prompt->text2); + *pointers[i * 2 + 1] = EOS; + } + } + + for (i = 0; i < 0x24; i++) + shared1000.unk9DA4[i] = 0; + shared1000.unk9DA4[i] = 0xFF; + + r3 = shared1000.unk9F6E; + r3[0] = EXT_CTRL_CODE_BEGIN; + r3[1] = 0x11; + r3[2] = 0xE0; + r3[3] = 0xFF; +} + +// Default profile phrase +const u16 gUnknown_083DB7EC[] = +{ +#if ENGLISH + EC_WORD_I_AM, + EC_WORD_A, + EC_WORD_POKEMON, + EC_WORD_GREAT, +#else + EC_WORD_I_AM, + EC_WORD_BIG, + EC_WORD_IN, + EC_WORD_POKEMON, +#endif +}; + +const u16 gUnknown_083DB7F4[] = +{ + EC_WORD_ARE, + EC_WORD_YOU, + EC_WORD_READY, + EC_WORD_QUES, + EC_WORD_HERE_I_COME, + EC_WORD_EXCL, +}; + +// ResetDefaultEasyChatPhrases +void InitEasyChatPhrases(void) +{ + u16 i; + u16 j; + + for (i = 0; i < 4; i++) + gSaveBlock1.easyChats.unk2B1C[i] = gUnknown_083DB7EC[i]; + + for (i = 0; i < 6; i++) + gSaveBlock1.easyChats.unk2B28[i] = gUnknown_083DB7F4[i]; + + for (i = 0; i < 6; i++) + { + gSaveBlock1.easyChats.unk2B34[i] = 0xFFFF; + gSaveBlock1.easyChats.unk2B40[i] = 0xFFFF; + } + + for (i = 0; i < 16; i++) + { + for (j = 0; j < 9; j++) + gSaveBlock1.mail[i].words[j] = 0xFFFF; + } + + for (i = 0; i < 64; i++) + gSaveBlock1.unk2D8C[i] = 0; +} + +void sub_80E682C(void (*func)(void)) +{ + shared1000.unk20 = func; + shared1000.unk24 = 0; +} + +void sub_80E683C(void) +{ + u16 i; + + if (shared1000.unk26 == 0) + { + for (i = 0; i < shared1000.unk1B6; i++) + shared1000.unk1AA[i] = 2; + shared1000.unk1AA[i - 1] = shared1000.unk28 % 2; + if (shared1000.unk1AA[i - 1] == 0) + shared1000.unk1AA[i - 1] = 2; + } + else + { + shared1000.unk1AA[0] = 7; + shared1000.unk1AA[1] = 6; + shared1000.unk1AA[2] = 7; + shared1000.unk1AA[3] = 7; + } + shared1000.unk1A8 = 0; + shared1000.unk1A9 = 0; + shared1000.unk1B5 = 0; + shared1000.unk1B7 = 0; + sub_80E9A4C(); +} + +void sub_80E68E8(void) +{ + sub_80EB0B0(); + if (shared1000.unk26 == 0) + { + u16 i; + u8 r6; + + r6 = shared1000.unk1B8; + shared1000.unk9A28 = (shared1000.unk4178[r6] + 1) / 2; + for (i = 0; i < shared1000.unk9A28; i++) + shared1000.unk99A6[i] = 2; + i--; + shared1000.unk99A6[i] = shared1000.unk4178[r6] % 2; + if (shared1000.unk99A6[i] == 0) + shared1000.unk99A6[i] = 2; + } + else + { + u16 i; + u8 r6; + + r6 = shared1000.unk1B8; + shared1000.unk9A28 = (shared1000.unk4142[r6] + 1) / 2; + for (i = 0; i < shared1000.unk9A28; i++) + shared1000.unk99A6[i] = 2; + i--; + shared1000.unk99A6[i] = shared1000.unk4142[r6] % 2; + if (shared1000.unk99A6[i] == 0) + shared1000.unk99A6[i] = 2; + } + shared1000.unk99A4 = 0; + shared1000.unk99A5 = 0; + shared1000.unk9A29 = 0; + sub_80E9A4C(); +} + +void sub_80E69F8(void) +{ + switch (shared1000.unk8) + { + case 0: + case 1: + case 2: + case 3: + case 4: + case 6: + case 9: + case 13: + default: + sub_80E9368(shared1000.unk8); + break; + case 5: + case 7: + case 8: + case 10: + case 11: + case 12: + sub_80E9368(shared1000.unk8); + sub_80E8BF4(shared1000.unkB, shared1000.unk9); + break; + } +} + +void sub_80E6A6C(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + sub_80EAC5C(); + TransferPlttBuffer(); + sub_8089668(); +} + +void sub_80E6A88(void) +{ + shared1000.unk20(); + AnimateSprites(); + BuildOamBuffer(); + sub_80EAD08(); +} + +void sub_80E6AA8(void) +{ + if (!UpdatePaletteFade()) + sub_80E682C(sub_80E6AC4); +} + +void sub_80E6AC4(void) +{ + sub_80E88F0(); + sub_80E8398(0); + sub_80E91D4(0); + sub_80E682C(sub_80E6AE4); +} + +void sub_80E6AE4(void) +{ + shared1000.unk87 = sub_80E75D8(); + if (shared1000.unk87) + PlaySE(SE_SELECT); + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + if (shared1000.unk86 == shared1000.unk84) + { + switch (shared1000.unk85) + { + case 0: + sub_80E682C(sub_80E6BC0); + return; + case 1: + sub_80E682C(sub_80E6C84); + return; + case 2: + sub_80E682C(sub_80E6D7C); + return; + } + } + else + { + shared1000.unk27 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + sub_80E7574(); + sub_80E682C(sub_80E6F68); + return; + } + } + if (gMain.newKeys & B_BUTTON) + { + sub_80E682C(sub_80E6C84); + } +} + +void sub_80E6BC0(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8398(2); + if (shared1000.unk8 == 6) + { + sub_80E91D4(6); + shared1000.unk24 = 100; + } + else + { + sub_80E91D4(2); + DisplayYesNoMenu(23, 8, 1); + MoveMenuCursor(1); + shared1000.unk24++; + } + break; + case 1: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + sub_80E7D6C(); + sub_80E98C4(); + sub_80E95A4(); + shared1000.unk24++; + break; + case -1: + case 1: + shared1000.unk24++; + break; + } + break; + case 2: + sub_80E81FC(); + sub_80E682C(sub_80E6AC4); + break; + case 100: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E6C84(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8398(2); + sub_80E91D4(3); + DisplayYesNoMenu(23, 8, 0); + MoveMenuCursor(1); + if (shared1000.unk8 == 9 + || shared1000.unk8 == 4 + || shared1000.unk8 == 7 + || shared1000.unk8 == 8 + || shared1000.unk8 == 10 + || shared1000.unk8 == 11 + || shared1000.unk8 == 12 + || shared1000.unk8 == 5 + || shared1000.unk8 == 13) + shared1000.unk24 = 2; + else + shared1000.unk24++; + break; + case 1: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + sub_80E91D4(4); + DisplayYesNoMenu(23, 8, 0); + MoveMenuCursor(1); + shared1000.unk24++; + break; + case -1: + case 1: + shared1000.unk24 = 0xFF; + break; + } + break; + case 2: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + gSpecialVar_Result = 0; + sub_80E682C(sub_80E752C); + break; + case -1: + case 1: + shared1000.unk24 = 0xFF; + break; + } + break; + case 0xFF: + HandleDestroyMenuCursors(); + sub_80E81FC(); + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E6D7C(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8398(2); + if (sub_80E8054()) + { + sub_80E91D4(5); + shared1000.unk24 = 10; + break; + } + if (shared1000.unk8 == 9) + { + if (sub_80E7FA8() == 0) + { + sub_80E91D4(8); + shared1000.unk24 = 10; + break; + } + if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) + { + sub_80E91D4(9); + shared1000.unk24 = 10; + break; + } + } + if (shared1000.unk8 == 4 && sub_80E7FA8() == 0) + { + sub_80E682C(sub_80E6C84); + } + else + { + sub_80E91D4(1); + sub_80E9744(); + DisplayYesNoMenu(23, 8, 0); + MoveMenuCursor(0); + shared1000.unk24++; + } + break; + case 1: + switch (ProcessMenuInputNoWrap_()) + { + case 0: + gSpecialVar_Result = (sub_80E7FA8() != 0); + sub_80E7D9C(); + if (shared1000.unk8 == 0) + gSpecialVar_0x8004 = sub_80E8094(); + if (shared1000.unk8 == 9) // dewford trend? + { + sub_80E81C0(); + gSpecialVar_0x8004 = sub_80FA364(&shared1000.unk9C7C); + } + if (shared1000.unk8 == 13) + { + if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) + gSpecialVar_Result = 0; + gSpecialVar_0x8004 = sub_80E810C(); + } + sub_80E682C(sub_80E752C); + break; + case -1: + case 1: + HandleDestroyMenuCursors(); + sub_80E81FC(); + if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) + { + shared1000.unk24 = 100; + } + else + { + sub_80E95A4(); + sub_80E682C(sub_80E6AC4); + } + break; + } + break; + case 10: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + sub_80E682C(sub_80E6AC4); + break; + case 100: + sub_80E91D4(7); + shared1000.unk24++; + // fall through + case 101: + if (gMain.newKeys & A_BUTTON) + shared1000.unk24++; + break; + case 102: + sub_80E7E50(); + sub_80E95A4(); + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E6F68(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8398(1); + sub_80E91D4(10); + sub_80E683C(); + sub_80E9974(); + sub_80E9E98(); + shared1000.unk24++; + break; + case 1: + if (sub_80E9EA8() != 0) + { + sub_80E8D8C(1); + sub_80E8420(); + sub_80E8958(0); + sub_80E682C(sub_80E6FC8); + } + break; + } +} + +void sub_80E6FC8(void) +{ + shared1000.unk96 = sub_80E77C8(); + if (shared1000.unk1C0 != 0) + { + PlaySE(SE_SELECT); + shared1000.unk1C4 = sub_80E6FC8; + sub_80E682C(sub_80E7458); + } + else + { + if (shared1000.unk96) + PlaySE(SE_SELECT); + if (gMain.newKeys & A_BUTTON) + { + if (shared1000.unk1B7 != 0) + { + PlaySE(SE_SELECT); + switch (shared1000.unk1A8) + { + case 1: + sub_80E682C(sub_80E718C); + break; + case 2: + if (shared1000.unk8 != 6) + { + sub_80E7F00(shared1000.unk27, 0xFFFF); + sub_80E7574(); + sub_80E95A4(); + } + break; + case 3: + sub_80E682C(sub_80E7114); + break; + } + } + else + { + if (shared1000.unk26 == 0 + || shared1000.unk4142[shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]] != 0) + { + PlaySE(SE_SELECT); + sub_80E7AD4(); + sub_80E682C(sub_80E7218); + } + } + } + else if (gMain.newKeys & B_BUTTON) + { + sub_80E682C(sub_80E7114); + } + else if (gMain.newKeys & SELECT_BUTTON) + { + sub_80E682C(sub_80E718C); + } + } +} + +void sub_80E7114(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8504(); + sub_80E9E98(); + sub_80E88F0(); + sub_80E8D8C(0); + shared1000.unk24++; + break; + case 1: + case 2: + shared1000.unk24++; + break; + case 3: + if (sub_80E9F50() != 0) + shared1000.unk24++; + break; + case 4: + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E718C(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E8504(); + sub_80E9E98(); + sub_80E88F0(); + shared1000.unk24++; + sub_80E8D54(); + break; + case 1: + if (sub_80E9FD4() != 0) + { + shared1000.unk26 = !shared1000.unk26; + sub_80E683C(); + sub_80E9974(); + sub_80E9E98(); + shared1000.unk24++; + } + break; + default: + shared1000.unk24++; + break; + case 8: + if (sub_80EA014() != 0) + { + sub_80E8420(); + sub_80E8958(0); + sub_80E682C(sub_80E6FC8); + } + break; + } +} + +void sub_80E7218(void) +{ + switch (shared1000.unk24) + { + default: + shared1000.unk24++; + break; + case 8: + sub_80E8D8C(0); + sub_80E8504(); + sub_80E9AD4(); + sub_80E68E8(); + sub_80E88F0(); + sub_80E9E98(); + shared1000.unk24++; + break; + case 9: + if (sub_80EA050() != 0) + { + sub_80E9C94(); + shared1000.unk24++; + } + break; + case 10: + sub_80E87CC(1); + sub_80E8958(1); + sub_80E682C(sub_80E7294); + break; + case 11: + break; + } +} + +void sub_80E7294(void) +{ + shared1000.unk1B9 = sub_80E7B40(); + if (shared1000.unk1C0 != 0) + { + PlaySE(SE_SELECT); + shared1000.unk1C4 = sub_80E7294; + sub_80E682C(sub_80E7458); + } + else + { + if (shared1000.unk1B9) + PlaySE(SE_SELECT); + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + sub_80E682C(sub_80E7324); + } + else if (gMain.newKeys & B_BUTTON) + { + sub_80E682C(sub_80E73D0); + } + } +} + +void sub_80E7324(void) +{ + switch (shared1000.unk24) + { + case 0: + if (!sub_80E7DD0()) + { + sub_80E682C(sub_80E7294); + } + else + { + sub_80E88F0(); + sub_80E87CC(0); + shared1000.unk24++; + } + break; + case 1: + shared1000.unk24++; + break; + case 2: + sub_80E9E98(); + shared1000.unk24++; + break; + case 3: + if (sub_80EA184() != 0) + shared1000.unk24++; + break; + case 4: + if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) + sub_80E682C(sub_80E6D7C); + else + sub_80E682C(sub_80E6AC4); + break; + } +} + +void sub_80E73D0(void) +{ + switch (shared1000.unk24) + { + case 0: + sub_80E87CC(0); + sub_80E88F0(); + shared1000.unk24++; + break; + case 1: + sub_80E9AD4(); + sub_80E9E98(); + shared1000.unk24++; + break; + case 2: + if (sub_80EA0E4() != 0) + { + sub_80E8D8C(1); + sub_80E9A14(); + shared1000.unk24++; + } + break; + case 3: + sub_80E8420(); + sub_80E8958(0); + shared1000.unk24++; + break; + case 4: + sub_80E9974(); + sub_80E682C(sub_80E6FC8); + break; + } +} + +void sub_80E7458(void) +{ + switch (shared1000.unk24) + { + case 0: + if (shared1000.unk1C4 == sub_80E6FC8) + sub_80E9D7C(); + else + sub_80E9D00(); + sub_80E9E08(shared1000.unk1BE); + shared1000.unk24++; + break; + case 1: + if (sub_80E9E54()) + { + if (shared1000.unk1C4 == sub_80E6FC8) + { + sub_80E9D7C(); + shared1000.unk1B5 += shared1000.unk1C0; + sub_80E7A98(); + shared1000.unk96 = TRUE; + } + else + { + shared1000.unk9A29 += shared1000.unk1C0; + sub_80E7D30(); + shared1000.unk1B9 = 1; + } + shared1000.unk1BE = 2; + sub_80E682C(shared1000.unk1C4); + } + break; + } +} + +void sub_80E752C(void) +{ + switch (shared1000.unk24) + { + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + shared1000.unk24++; + break; + case 1: + if (!UpdatePaletteFade()) + SetMainCallback2(shared1000.unk0); + break; + } +} + +void sub_80E7574(void) +{ + if (shared1000.unk8 == 1 + && shared1000.unk7E[shared1000.unk86] == 2 + && sub_80EB2D4(shared1000.unkC[shared1000.unk27]) != 7) + shared1000.unk7D = 1; + else + shared1000.unk7D = 0; + shared1000.unk7D = 0; // What the hell? +} + +bool8 sub_80E75D8(void) +{ + bool8 pressedUpDown = FALSE; + u8 r0; + + if (gMain.newKeys & START_BUTTON) + { + shared1000.unk86 = shared1000.unk84; + shared1000.unk85 = 2; + return TRUE; + } + + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + shared1000.unk86--; + if (shared1000.unk86 < 0) + shared1000.unk86 = shared1000.unk84; + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + shared1000.unk86++; + if (shared1000.unk86 > shared1000.unk84) + shared1000.unk86 = 0; + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + if (shared1000.unk9 == 2) + { + if (shared1000.unk86 == shared1000.unk84) + shared1000.unk85 = 2; + else + shared1000.unk85 = 0; + return TRUE; + } + else + { + if (shared1000.unk85 >= shared1000.unk83) + shared1000.unk85 = shared1000.unk83 - 1; + if (shared1000.unk86 != shared1000.unk84) + { + r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + if (r0 >= shared1000.unkA) + shared1000.unk85 = r0 - shared1000.unkA; + } + return TRUE; + } + } + else + { + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + if (--shared1000.unk85 < 0) + { + if (shared1000.unk86 == shared1000.unk84) + { + shared1000.unk85 = 2; + } + else + { + shared1000.unk85 = shared1000.unk83 - 1; + r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + if (r0 >= shared1000.unkA) + shared1000.unk85 = r0 - shared1000.unkA; + } + } + return TRUE; + } + if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + if (shared1000.unk86 == shared1000.unk84) + { + if (++shared1000.unk85 > 2) + shared1000.unk85 = 0; + } + else + { + if (++shared1000.unk85 >= shared1000.unk83) + shared1000.unk85 = 0; + r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + if (r0 >= shared1000.unkA) + shared1000.unk85 = r0 - shared1000.unkA; + } + return TRUE; + } + } + return FALSE; +} + +bool8 sub_80E77C8(void) +{ + bool8 pressedLeftRight = FALSE; + bool8 pressedUpDown; + + if (shared1000.unk1B7 != 0) + { + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + shared1000.unk1A8--; + if (shared1000.unk1A8 < 1) + shared1000.unk1A8 = 3; + return TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + shared1000.unk1A8++; + if (shared1000.unk1A8 > 3) + shared1000.unk1A8 = 1; + return TRUE; + } + } + else + { + if (shared1000.unk26 == 1) + { + pressedUpDown = FALSE; + + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + shared1000.unk1A8--; + if (shared1000.unk1A8 < 0) + shared1000.unk1A8 = 3; + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + shared1000.unk1A8++; + if (shared1000.unk1A8 > 3) + shared1000.unk1A8 = 0; + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + sub_80E7A98(); + return TRUE; + } + } + else + { + pressedUpDown = FALSE; + shared1000.unk1C0 = 0; + + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + if (shared1000.unk1A8 == 0) + return FALSE; + shared1000.unk1A8--; + if (shared1000.unk1A8 < shared1000.unk1B5) + shared1000.unk1C0 = -1; + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + if (shared1000.unk1A8 >= shared1000.unk1B6 - 1) + return FALSE; + shared1000.unk1A8++; + if (shared1000.unk1A8 > shared1000.unk1B5 + 3) + shared1000.unk1C0 = 1; + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + if (shared1000.unk1C0 == 0) + { + sub_80E7A98(); + return TRUE; + } + return FALSE; + } + } + } + + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + if (shared1000.unk1A9 != 0) + shared1000.unk1A9--; + else + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; + pressedLeftRight = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + if (shared1000.unk1B7 != 0 + || shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]) + shared1000.unk1A9 = 0; + else + shared1000.unk1A9++; + pressedLeftRight = TRUE; + } + + if (pressedLeftRight) + { + s8 r9 = shared1000.unk1B7; + + shared1000.unk1B7 = (shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]); + if (shared1000.unk1B7 != 0) + { + shared1000.unk1A8 -= shared1000.unk1B5; + if (shared1000.unk1A8 == 0) + { + shared1000.unk1A8 = 1; + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; + } + } + else if (r9 != 0) + { + shared1000.unk1A8 += shared1000.unk1B5; + if (shared1000.unk1A9 != 0) + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; + } + return TRUE; + } + + return FALSE; +} + +void sub_80E7A98(void) +{ + if (shared1000.unk1A9 >= shared1000.unk1AA[shared1000.unk1A8]) + shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; +} + +void sub_80E7AD4(void) +{ + if (shared1000.unk26 == 0) + shared1000.unk1B8 = shared1000.unk2A[shared1000.unk1A8][shared1000.unk1A9]; + else + shared1000.unk1B8 = shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]; +} + +bool8 sub_80E7B40(void) +{ + bool8 pressedUpDown = FALSE; + + shared1000.unk1C0 = 0; + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + if (shared1000.unk99A4 == 0) + return FALSE; + shared1000.unk99A4--; + if (shared1000.unk99A4 < shared1000.unk9A29) + { + shared1000.unk1C0 = -1; + return FALSE; + } + pressedUpDown = TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + if (shared1000.unk99A4 >= shared1000.unk9A28 - 1) + return FALSE; + shared1000.unk99A4++; + if (shared1000.unk99A4 >= shared1000.unk9A29 + 4) + { + shared1000.unk1C0 = 1; + return FALSE; + } + pressedUpDown = TRUE; + } + + if (pressedUpDown) + { + sub_80E7D30(); + return TRUE; + } + + if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + shared1000.unk99A5--; + if (shared1000.unk99A5 < 0) + shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; + return TRUE; + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + shared1000.unk99A5++; + if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) + shared1000.unk99A5 = 0; + return TRUE; + } + + if (gMain.newKeys & START_BUTTON) + { + if (shared1000.unk9A29 != 0) + { + shared1000.unk1C0 = -shared1000.unk9A29; + if (shared1000.unk1C0 < -4) + shared1000.unk1C0 = -4; + } + shared1000.unk99A4 += shared1000.unk1C0; + shared1000.unk1BE = 4; + } + else if (gMain.newKeys & SELECT_BUTTON) + { + if (shared1000.unk9A29 < shared1000.unk9A28 - 4) + { + shared1000.unk1C0 = shared1000.unk9A28 - 4 - shared1000.unk9A29; + if (shared1000.unk1C0 > 4) + shared1000.unk1C0 = 4; + } + shared1000.unk99A4 += shared1000.unk1C0; + shared1000.unk1BE = 4; + } + + return FALSE; +} + +void sub_80E7D30(void) +{ + if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) + shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; +} + +void sub_80E7D6C(void) +{ + u16 i; + + for (i = 0; i < shared1000.unkA; i++) + sub_80E7F00(i, 0xFFFF); +} + +void sub_80E7D9C(void) +{ + u16 i; + + for (i = 0; i < shared1000.unkA; i++) + shared1000.unk4[i] = shared1000.unkC[i]; +} + +bool8 sub_80E7DD0(void) +{ + u16 r4 = shared1000.unk9A2A[shared1000.unk99A4][shared1000.unk99A5]; + + if (shared1000.unk7D != 0 + && shared1000.unk7E[shared1000.unk86] > 1 + && sub_80EB2D4(r4) == 7) + return FALSE; + + sub_80E7F00(shared1000.unk27, r4); + sub_80E95A4(); + return TRUE; +} + +void sub_80E7E50(void) +{ + u16 r5 = 0; + u16 i; + u16 j; + + for (i = 0; i < shared1000.unk84; i++) + { + shared1000.unk7E[i] = 0; + for (j = 0; j < shared1000.unk83; j++) + { + shared1000.unkC[r5] = shared1000.unk4[r5]; + shared1000.unk8C[i][j] = 0; + r5++; + } + } +} + +void sub_80E7F00(u16 a, u16 b) +{ + u16 r5 = a / shared1000.unk83; + u16 r8 = a % shared1000.unk83; + u16 r4 = sub_80EB2D4(shared1000.unkC[a]); + u16 r3 = sub_80EB2D4(b); + + if (r4 == 7) + { + if (r3 != 7) + shared1000.unk7E[r5]--; + } + else + { + if (r3 == 7) + shared1000.unk7E[r5]++; + } + r3 = 0; + shared1000.unk8C[r5][r8] = r3; + shared1000.unkC[a] = b; +} + +u8 sub_80E7FA8(void) +{ + u16 r8 = 0; + u16 i; + u8 *r1; + u8 *r2; + + for (i = 0; i < shared1000.unkA; i++) + { + sub_80EB218(shared1000.unk9E14, shared1000.unk4[i], 0); + sub_80EB218(shared1000.unk9E41, shared1000.unkC[i], 0); + r1 = shared1000.unk9E14; + r2 = shared1000.unk9E41; + while (*r1 == *r2 && *r1 != 0xFF) + { + r1++; + r2++; + } + if (*r1 != *r2) + r8++; + } + return r8; +} + +bool8 sub_80E8054(void) +{ + u16 i; + + for (i = 0; i < shared1000.unkA; i++) + { + if (shared1000.unkC[i] != 0xFFFF) + return FALSE; + } + return TRUE; +} + +// CheckMysteryEventPhrase +bool8 sub_80E8094(void) +{ + u16 i; + u8 *r3; + u8 *r4; + + for (i = 0; i < 4; i++) + { + sub_80EB218(shared1000.unk9E14, shared1000.unkC[i], 0); + sub_80EB218(shared1000.unk9E41, gMysteryEventPhrase[i], 0); + r3 = shared1000.unk9E14; + r4 = shared1000.unk9E41; + while (*r3 != 0xFF && *r4 != 0xFF) + { + if (*r3++ != *r4++) + return FALSE; + } + if (*r3 != 0xFF || *r4 != 0xFF) + return FALSE; + } + return TRUE; +} + +u8 sub_80E810C(void) +{ + u16 i; + + for (i = 0; i < 5; i++) + { + u8 *ptr; + u8 *r3; + + ptr = sub_80EB218(shared1000.unk9E6E, shared1000.unkC[0], 0); + *ptr++ = CHAR_SPACE; + sub_80EB218(ptr, shared1000.unkC[1], 0); + + ptr = sub_80EB218(shared1000.unk9EEE, gBerryMasterWifePhrases[i][0], 0); + *ptr++ = CHAR_SPACE; + sub_80EB218(ptr, gBerryMasterWifePhrases[i][1], 0); + + ptr = shared1000.unk9E6E; + r3 = shared1000.unk9EEE; + while (*ptr != EOS && *r3 != EOS) + { + if (*ptr++ != *r3++) + break; + } + if (*ptr == EOS && *r3 == EOS) + return i + 1; + } + return 0; +} + +void sub_80E81C0(void) +{ + u8 *ptr; + + ptr = sub_80EB218(gStringVar2, shared1000.unk9C7C, 0); + *ptr++ = CHAR_SPACE; + sub_80EB218(ptr, shared1000.unk9C7E, 0); +} + +void sub_80E81FC(void) +{ + PlaySE(SE_SELECT); + sub_80E95A4(); + MenuZeroFillWindowRect(0, 0, 29, 13); +} diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index f9843cda9..767128750 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -6,10 +6,12 @@ #include "easy_chat.h" #include "event_data.h" #include "field_map_obj.h" +#include "field_message_box.h" #include "graphics.h" #include "menu.h" #include "palette.h" #include "pokedex.h" +#include "random.h" #include "sprite.h" #include "string_util.h" #include "strings.h" @@ -64,7 +66,12 @@ u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(u16); bool8 sub_80EB37C(u16); bool8 sub_80EB868(u8); +static u16 sub_80EB960(void); u8 sub_80EB9C8(void); +static u16 sub_80EB9D8(void); + +// put this in .bss, damnit! +__attribute__((section(".bss"))) u8 gUnknown_03000740 = 0; const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); const u16 InterviewPalette_1[] = INCBIN_U16("graphics/misc/interview_pal1.gbapal"); @@ -2617,3 +2624,425 @@ u32 de_sub_80EB748(s32 group, s32 index) return r7; } #endif + +// returns the end of the destination buffer text +u8 *EasyChat_GetWordText(u8 *dst, u16 word) +{ + u16 group; + u16 wordIndex; + const u8 *src; + u16 i; + + if (sub_80EB37C(word)) + return StringCopy(dst, gOtherText_ThreeQuestions); + + if (word == 0xFFFF) + { + *dst = EOS; + return dst; + } + else + { + group = EC_GROUP(word); + wordIndex = EC_INDEX(word); + switch (group) + { + case EC_GROUP_POKEMON: // 0 + case EC_GROUP_POKEMON_2: // 21 + dst = StringCopy(dst, gSpeciesNames[wordIndex]); + break; + case EC_GROUP_MOVE_1: // 18 + case EC_GROUP_MOVE_2: // 19 + dst = StringCopy(dst, gMoveNames[wordIndex]); + break; + default: + src = gEasyChatGroupWords[group]; + for (i = wordIndex - 1; i != 0xFFFF; i--) + { + while (*src++ != EOS) + ; + } + dst = StringCopy(dst, src); + break; + } + *dst = EOS; + return dst; + } +} + +u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3) +{ + u16 i; + u16 n; + + const u16 i1 = arg2 - 1; + + for (i = 0; i < arg3; i++) + { + u16 word; + + for (n = 0; n < i1; n++) + { + dst = EasyChat_GetWordText(dst, words[0]); + + if (words[0] != 0xFFFF) + { + dst[0] = CHAR_SPACE; + dst++; + } + + words++; + } + + word = words[0]; + words++; + dst = EasyChat_GetWordText(dst, word); + + dst[0] = CHAR_NEWLINE; + dst++; + } + + dst--; + dst[0] = EOS; + + return dst; +} + +u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3) +{ + u16 i; + u16 n; + + const u16 i1 = arg2 - 1; + + for (i = 0; i < arg3; i++) + { + u16 word; + + for (n = 0; n < i1; n++) + { + dst = EasyChat_GetWordText(dst, words[0]); + + if (words[0] != 0xFFFF) + { + dst[0] = CHAR_SPACE; + dst++; + } + + words++; + } + + word = words[0]; + words++; + dst = EasyChat_GetWordText(dst, word); + + // Only difference with ConvertEasyChatWordsToString + dst[0] = (i == 0) ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL; + dst++; + } + + dst--; + dst[0] = EOS; + + return dst; +} + + +u16 unref_sub_80EB5E0(u16 arg0) +{ + const u8 *chars; + u16 i; + u16 length; + int group, word; + + + if (arg0 == 0xFFFF) + return 0; + + group = EC_GROUP(arg0); + word = EC_INDEX(arg0); + switch (group) + { + case EC_GROUP_POKEMON: // 0 + case EC_GROUP_POKEMON_2: // 21 + chars = gSpeciesNames[word]; + break; + case EC_GROUP_MOVE_1: // 18 + case EC_GROUP_MOVE_2: // 19 + chars = gMoveNames[word]; + break; + default: + chars = gEasyChatGroupWords[group]; + for (i = word - 1; i != 0xFFFF; i--) + { + while (*chars++ != EOS) + ; + } + break; + } + + length = 0; + while (*chars != EOS) + { + chars++; + length++; + } + + return length; +} + +bool8 sub_80EB680(u16 *arg0, u16 arg1, u16 arg2, u16 arg3) +{ + return FALSE; +} + +void unref_sub_80EB684(u8 arg0, u16 arg1) +{ + u16 *ptr; + u16 c; + + // FIXME: find actual tv shows used + switch (arg0) + { + case 5: + c = 6; + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x04); + break; + case 7: + c = 2; + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x1C); + break; + case 8: + c = 1; + ptr = (u16*)((void *)&gSaveBlock1.tvShows[arg1] + 0x02); + break; + default: + return; + } + + c -= 1; + while (c != 0xFFFF) + { + *ptr = -1; + ptr++; + c -= 1; + } +} + +void sub_80EB6FC(u16 *arg0, u16 arg1) +{ + u16 i; + + for (i = arg1 - 1; i != 0xFFFF; i--) + { + *arg0 = 0xFFFF; + arg0++; + } + +} + +u16 sub_80EB72C(u16 group) +{ + u16 local1 = Random() % gEasyChatGroupSizes[group]; + + if (group == EC_GROUP_POKEMON + || group == EC_GROUP_POKEMON_2 + || group == EC_GROUP_MOVE_1 + || group == EC_GROUP_MOVE_2) + { + local1 = ((u16 *) gEasyChatGroupWords[group])[local1]; + } + + return ((group & 0x7F) << 9) | (local1 & 0x1FF); +} + +u16 sub_80EB784(u16 group) +{ + if (!sub_80EAD7C(group)) + return -1; + + if (group != EC_GROUP_POKEMON) + { + if (group == EC_GROUP_TRENDY_SAYING) + return sub_80EB960(); + } + else + { + return sub_80EB9D8(); + } + + return sub_80EB72C(group); +} + +void sub_80EB7C4(void) +{ + u16 *words; + u16 arg1, arg2; + + switch (gSpecialVar_0x8004) + { + case 0: + words = gSaveBlock1.easyChats.unk2B1C; + arg1 = 2; + arg2 = 2; + break; + case 1: + words = gSaveBlock1.easyChats.unk2B28; + if (sub_80EB680(gSaveBlock1.easyChats.unk2B28, 3, 2, 20)) + { + arg1 = 2; + arg2 = 3; + } + else + { + arg1 = 3; + arg2 = 2; + } + break; + case 2: + words = gSaveBlock1.easyChats.unk2B34; + arg1 = 3; + arg2 = 2; + break; + case 3: + words = gSaveBlock1.easyChats.unk2B40; + arg1 = 3; + arg2 = 2; + break; + default: + return; + } + + ConvertEasyChatWordsToString(gStringVar4, words, arg1, arg2); + ShowFieldAutoScrollMessage(gStringVar4); +} + +void BufferRandomHobbyOrLifestyleString(void) +{ + u16 group, local2; + + if (Random() & 1) + group = EC_GROUP_HOBBIES; + else + group = EC_GROUP_LIFESTYLE; + + local2 = sub_80EB784(group); + EasyChat_GetWordText(gStringVar2, local2); +} + +u8 sub_80EB868(u8 arg0) +{ + int offset; + int index; + + index = arg0 / 8; + offset = arg0 % 8; + return (gSaveBlock1.unk2D8C[index] >> offset) & 1; +} + +void sub_80EB890(u8 arg0) +{ + int offset; + int index; + + if (arg0 < 33) + { + index = arg0 / 8; + offset = arg0 % 8; + gSaveBlock1.unk2D8C[index] |= 1 << offset; + } +} + +u8 sub_80EB8C0(void) +{ + u8 i, count; + + for (i = 0, count = 0; i < 33; i++) + { + if (sub_80EB868(i)) + count++; + } + return count; +} + +u16 sub_80EB8EC(void) +{ + u16 i; + u16 local1, local2; + + local1 = sub_80EB8C0(); + if (local1 == 33) + return -1; + + local2 = Random() % (33 - local1); + for (i = 0; i < 33; i++) + { + if (sub_80EB868(i) == 0) + { + if (local2 == 0) + { + sub_80EB890(i); + return (i & 0x1FF) | 0x2800; + } + local2--; + } + } + return -1; +} + +static u16 sub_80EB960(void) +{ + u16 i; + u16 local1; + + local1 = sub_80EB8C0(); + if (local1 == 0) + return -1; + + local1 = Random() % local1; + for (i = 0; i < 33; i++) + { + if (sub_80EB868(i)) + { + if (local1 == 0) + return (i & 0x1FF) | 0x2800; + local1--; + } + } + + return -1; +} + +u8 sub_80EB9C8(void) +{ + return IsNationalPokedexEnabled(); +} + +static u16 sub_80EB9D8(void) +{ + u16 *speciesList; + u16 local1; + u16 i; + + local1 = sub_80EAE88(0); + + if (local1 == 0) + return -1; + + local1 = Random() % local1; + speciesList = (u16 *) gEasyChatGroupWords[EC_GROUP_POKEMON]; + for (i = 0; i < gEasyChatGroupSizes[EC_GROUP_POKEMON]; i++) + { + const u16 dexNum = SpeciesToNationalPokedexNum(*speciesList); + const u8 local2 = GetSetPokedexFlag(dexNum, 0); + + if (local2) + { + if (local1 == 0) + return *speciesList & 0x1FF; + local1--; + } + speciesList++; + } + return -1; +} diff --git a/src/easy_chat_before.c b/src/easy_chat_before.c deleted file mode 100644 index 59e463260..000000000 --- a/src/easy_chat_before.c +++ /dev/null @@ -1,1744 +0,0 @@ -#include "global.h" -#include "constants/easy_chat.h" -#include "constants/songs.h" -#include "constants/species.h" -#include "dewford_trend.h" -#include "easy_chat.h" -#include "event_data.h" -#include "ewram.h" -#include "graphics.h" -#include "main.h" -#include "menu.h" -#include "palette.h" -#include "sound.h" -#include "sprite.h" -#include "string_util.h" -#include "strings.h" -#include "unknown_task.h" - -extern const struct WindowConfig gWindowConfig_81E6D54; -extern const struct WindowConfig gWindowConfig_81E6DA8; - -extern void sub_80546B8(void); - -#define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) - -const u16 gMysteryEventPhrase[] = {EC_WORD_MYSTERY, EC_WORD_EVENT, EC_WORD_IS, EC_WORD_EXCITING}; - -const u16 gBerryMasterWifePhrases[][2] = -{ -#if ENGLISH - {EC_WORD_GREAT, EC_WORD_BATTLE}, - {EC_WORD_CHALLENGE, EC_WORD_CONTEST}, - {EC_WORD_OVERWHELMING, EC_POKEMON(LATIAS)}, - {EC_WORD_COOL, EC_POKEMON(LATIOS)}, - {EC_WORD_SUPER, EC_WORD_HUSTLE}, -#else - {EC_WORD_GREAT, EC_WORD_FIGHT}, - {EC_WORD_CONTEST, EC_WORD_CHALLENGE}, - {EC_POKEMON(LATIAS), EC_WORD_OVERWHELMING}, - {EC_POKEMON(LATIOS), EC_WORD_COOL}, - {EC_WORD_SUPER, 0xFFFF}, -#endif -}; - -// const pointer to shared1000. easy_chat might be two separate files. -struct Shared1000 *const gUnknown_083DB694 = &shared1000; - -const struct UnknownTaskStruct gUnknown_083DB698 = -{ - ®_BG3VOFS, - ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, - 1 -}; - -const u8 gUnknown_083DB6A4[] = {4, 0, 0, 0, 1, 5, 0, 2, 2, 3, 2, 2, 2, 3}; - -// choose by alphabet keyboard -const u8 gUnknown_083DB6B2[][16] = -{ - _("ABCDEF "), - _("GHIJKL"), - _("MNOPQRS"), - _("TUVWXYZ"), -}; - -struct EasyChatPrompt -{ - const u8 *text1; - const u8 *text2; - bool8 unk8; -}; - -const struct EasyChatPrompt gUnknown_083DB6F4[] = -{ - {OtherText_MakeProfilePage1, OtherText_MakeProfilePage2, TRUE}, - {OtherText_MakeMessagePage1, OtherText_MakeMessagePage2, TRUE}, - {OtherText_CombineNinePhrasesPage1, OtherText_CombineNinePhrasesPage2, TRUE}, - {OtherText_DescribeFeelingsPage1, OtherText_DescribeFeelingsPage2, TRUE}, - {OtherText_ImproveBardSongPage1, OtherText_ImproveBardSongPage2, TRUE}, - {OtherText_CombineTwoPhrasesPage1, OtherText_CombineTwoPhrasesPage2, TRUE}, - {OtherText_YourProfile, OtherText_ConfirmTrendyPage2, FALSE}, - {OtherText_YourFeelingBattle, OtherText_ConfirmTrendyPage2, TRUE}, - {OtherText_SetWinMessage, OtherText_ConfirmTrendyPage2, TRUE}, - {OtherText_SetLossMessage, OtherText_ConfirmTrendyPage2, TRUE}, - {OtherText_MailMessage, OtherText_ConfirmTrendyPage2, TRUE}, - {OtherText_MailSalutation, OtherText_ConfirmTrendyPage2, TRUE}, - {OtherText_NewSong, OtherText_ConfirmTrendyPage2, FALSE}, - {OtherText_TheAnswer, OtherText_ConfirmTrendyPage2, FALSE}, - {OtherText_ConfirmTrendyPage1, OtherText_ConfirmTrendyPage2, TRUE}, - {OtherText_HipsterPage1, OtherText_HipsterPage2, TRUE}, - {OtherText_WithFourPhrases, OtherText_CombineNinePhrasesPage2, TRUE}, -}; - -const u8 gUnknown_083DB7C0[][2] = -{ - { 0, 6}, - { 1, 7}, - { 1, 8}, - { 1, 9}, - { 2, 10}, - {16, 13}, - { 4, 12}, - { 3, 13}, - { 3, 13}, - { 5, 14}, - { 3, 13}, - { 3, 13}, - { 3, 13}, - {15, 13}, -}; - -void sub_80E62F8(void); -void sub_80E6424(void); -void sub_80E6554(void); -void sub_80E6630(void); -void sub_80E6690(void); -void sub_80E682C(void (*)(void)); -void sub_80E69F8(void); -void sub_80E6A6C(void); -void sub_80E6A88(void); -void sub_80E6AA8(void); -void sub_80E6AC4(void); -void sub_80E6AE4(void); -void sub_80E6BC0(void); -void sub_80E6C84(void); -void sub_80E6D7C(void); -void sub_80E6F68(void); -void sub_80E6FC8(void); -void sub_80E7114(void); -void sub_80E718C(void); -void sub_80E7218(void); -void sub_80E7294(void); -void sub_80E7324(void); -void sub_80E73D0(void); -void sub_80E7458(void); -void sub_80E752C(void); -void sub_80E7574(void); -bool8 sub_80E75D8(void); -bool8 sub_80E77C8(void); -void sub_80E7A98(void); -void sub_80E7AD4(void); -bool8 sub_80E7B40(void); -void sub_80E7D30(void); -void sub_80E7D6C(void); -void sub_80E7D9C(void); -bool8 sub_80E7DD0(void); -void sub_80E7E50(void); -void sub_80E7F00(u16, u16); -u8 sub_80E7FA8(void); -bool8 sub_80E8054(void); -u8 sub_80E8094(void); -u8 sub_80E810C(void); -void sub_80E81C0(void); -void sub_80E81FC(void); -void sub_80E8218(void); - -void sub_80E8398(); -void sub_80E8420(void); -void sub_80E8504(void); -void sub_80E87CC(); - -void sub_80E88F0(void); -void sub_80E8958(); - -void sub_80E8BF4(); -void sub_80E8CEC(void); -void sub_80E8D54(void); -void sub_80E8D8C(); -void sub_80E8DD8(void); -void sub_80E91D4(); -void sub_80E9368(); -void sub_80E95A4(void); -void sub_80E9744(void); -void sub_80E98C4(void); -void sub_80E9974(void); -void sub_80E9A14(void); -void sub_80E9A4C(void); -void sub_80E9AD4(void); -void sub_80E9C94(void); -void sub_80E9D00(void); -void sub_80E9D7C(void); -void sub_80E9E08(); -bool8 sub_80E9E54(void); -void sub_80E9E98(void); -u8 sub_80E9EA8(void); -u8 sub_80E9F50(void); -u8 sub_80E9FD4(void); -u8 sub_80EA014(void); -u8 sub_80EA050(void); -u8 sub_80EA0E4(void); -u8 sub_80EA184(void); -void sub_80EAC5C(void); -void sub_80EAD08(void); -u8 sub_80EAD7C(u8); -void sub_80EAECC(void); -void sub_80EB040(void); -void sub_80EB0B0(void); -u8 *sub_80EB218(u8 *, u16, u16); -u16 sub_80EB2D4(); -bool8 sub_80EB680(u16 *, u16, u16, u16); - -void sub_80E60D8(void) -{ - u8 r4 = 3; - u16 *r1; - - switch (gSpecialVar_0x8004) - { - case 0: - r1 = gSaveBlock1.easyChats.unk2B1C; - break; - case 1: - r1 = gSaveBlock1.easyChats.unk2B28; - break; - case 2: - r1 = gSaveBlock1.easyChats.unk2B34; - break; - case 3: - r1 = gSaveBlock1.easyChats.unk2B40; - break; - case 4: - r1 = gSaveBlock1.mail[gSpecialVar_0x8005].words; - break; - case 6: - { - struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard; - u16 i; - for (i = 0; i < 6; i++) - bard->temporaryLyrics[i] = bard->songLyrics[i]; - r1 = bard->temporaryLyrics; - } - break; - case 5: - // TODO: Is this the right TV show? - r1 = gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubLetter.pad04; - r4 = gSpecialVar_0x8006; - break; - case 7: - // TODO: Is this the right TV show? - r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubOpinions.var1C[gSpecialVar_0x8006]; - r4 = 1; - break; - case 8: - // TODO: Is this the right TV show? - r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].fanclubOpinions.var02; - r4 = 0; - break; - case 9: - r1 = NULL; - break; - case 10: - r1 = &gSaveBlock1.gabbyAndTyData.quote; - *r1 = 0xFFFF; - r4 = 1; - break; - case 11: - // TODO: Is this the right TV show? - r1 = &gSaveBlock1.tvShows[gSpecialVar_0x8005].bravoTrainer.var04[gSpecialVar_0x8006]; - r4 = 0; - break; - case 12: - // TODO: Is this the right TV show? - r1 = gSaveBlock1.tvShows[gSpecialVar_0x8005].bravoTrainerTower.var18; - r4 = 1; - break; - case 13: - shared1000.unk9C7C = 0xFFFF; - shared1000.unk9C7E = -1; - r1 = &shared1000.unk9C7C; - break; - default: - return; - } - sub_80E62A0(gSpecialVar_0x8004, r1, sub_80546B8, r4); -} - -void sub_80E62A0(u8 a, u16 *b, void (*c)(void), u8 d) -{ - shared1000.unk0 = c; - shared1000.unk4 = b; - shared1000.unk8 = a; - shared1000.unkB = d; - if (a == 9) - { - shared1000.unk4 = &shared1000.unk9C7C; - shared1000.unk9C7C = gSaveBlock1.easyChatPairs[0].words[0]; - shared1000.unk9C7E = gSaveBlock1.easyChatPairs[0].words[1]; - } - SetMainCallback2(sub_80E62F8); -} - -void sub_80E62F8(void) -{ - switch (gMain.state) - { - case 0: - default: - REG_DISPCNT = 0; - SetVBlankCallback(0); - ResetPaletteFade(); - ResetSpriteData(); - dp12_8087EA4(); - remove_some_task(); - sub_80EAD08(); - sub_80895F8(gUnknown_083DB698); - FreeSpriteTileRanges(); - FreeAllSpritePalettes(); - break; - case 1: - SetUpWindowConfig(&gWindowConfig_81E6DA8); - break; - case 2: - InitMenuWindow(&gWindowConfig_81E6D54); - InitMenuWindow(&gWindowConfig_81E6DA8); - MenuZeroFillScreen(); - break; - case 3: - sub_80E6424(); - break; - case 4: - sub_80E8DD8(); - break; - case 5: - sub_80E8218(); - sub_80E8CEC(); - break; - case 6: - sub_80E69F8(); - sub_80E682C(sub_80E6AA8); - SetVBlankCallback(sub_80E6A6C); - break; - case 7: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); - break; - case 8: - REG_DISPCNT = 0x1F40; - SetMainCallback2(sub_80E6A88); - FlagSet(FLAG_SYS_CHAT_USED); - break; - } - gMain.state++; -} - -void sub_80E6424(void) -{ - shared1000.unk9 = gUnknown_083DB6A4[shared1000.unk8]; - switch (shared1000.unk9) - { - case 4: - shared1000.unkA = 4; - shared1000.unk83 = 2; - shared1000.unk84 = 2; - shared1000.unk88 = 5; - shared1000.unk8A = 4; - break; - case 5: - shared1000.unkA = 4; - shared1000.unk83 = 1; - shared1000.unk84 = 4; - shared1000.unk88 = 16; - shared1000.unk8A = 2; - break; - case 0: - shared1000.unkA = 6; - shared1000.unk83 = 2; - shared1000.unk84 = 3; - shared1000.unk88 = 4; - shared1000.unk8A = 3; - break; - case 1: - shared1000.unkA = 9; - shared1000.unk83 = 2; - shared1000.unk84 = 5; - shared1000.unk88 = 4; - shared1000.unk8A = 0; - break; - case 2: - shared1000.unkA = 1; - shared1000.unk83 = 1; - shared1000.unk84 = 1; - shared1000.unk88 = 16; - shared1000.unk8A = 4; - break; - case 3: - shared1000.unkA = 2; - shared1000.unk83 = 2; - shared1000.unk84 = 1; - shared1000.unk88 = 5; - shared1000.unk8A = 3; - break; - } - shared1000.unk86 = 0; - shared1000.unk85 = 0; - shared1000.unk87 = 0; - shared1000.unk26 = 0; - shared1000.unk1BA = 0; - shared1000.unk1BE = 2; - sub_80E6554(); - sub_80EAECC(); - sub_80EB040(); - sub_80E7E50(); - sub_80E6630(); - sub_80E6690(); -} - -void sub_80E6554(void) -{ - u16 r4 = 0; - u16 r7; - u16 r5; - - for (r7 = 0; ; r7++) - { - for (r5 = 0; r5 < 2; r5++) - { - shared1000.unk2A[r7][r5] = r4++; - if (r4 == 17) - break; - } - if (r4 == 17) - break; - } - shared1000.unk28 = 17; - while (r4 < 22) - { - if (sub_80EAD7C(r4) != 0) - { - r5++; - if (r5 > 1) - { - r7++; - r5 = 0; - } - shared1000.unk2A[r7][r5] = r4; - shared1000.unk78[r4 - 17] = 1; // hmm... - shared1000.unk28++; - } - else - { - shared1000.unk78[r4 - 17] = 0; - } - r4++; - } - shared1000.unk1B6 = (shared1000.unk28 + 1) / 2; -} - -void sub_80E6630(void) -{ - u8 i; - u8 r3; - - for (i = 0; i < 4; i++) - { - const u8 *row = gUnknown_083DB6B2[i]; - - for (r3 = 0; row[r3] != EOS; r3++) - { - if (row[r3] != CHAR_SPACE) - shared1000.unk40[i][r3] = row[r3] + 0x46; - else - shared1000.unk40[i][r3] = CHAR_SPACE; - } - } -} - -void sub_80E6690(void) -{ - u8 *pointers[] = - { - shared1000.unk9C80, shared1000.unk9CC9, - shared1000.unk9D12, shared1000.unk9D5B, - }; - u8 *r3; - u16 i; - - for (i = 0; i < 2; i++) - { - const struct EasyChatPrompt *prompt = &gUnknown_083DB6F4[gUnknown_083DB7C0[shared1000.unk8][i]]; - - r3 = StringCopy(pointers[i * 2 + 0], prompt->text1); - if (prompt->unk8) - { - StringCopy(pointers[i * 2 + 1], prompt->text2); - } - else - { - *r3++ = CHAR_SPACE; - StringCopy(r3, prompt->text2); - *pointers[i * 2 + 1] = EOS; - } - } - - for (i = 0; i < 0x24; i++) - shared1000.unk9DA4[i] = 0; - shared1000.unk9DA4[i] = 0xFF; - - r3 = shared1000.unk9F6E; - r3[0] = EXT_CTRL_CODE_BEGIN; - r3[1] = 0x11; - r3[2] = 0xE0; - r3[3] = 0xFF; -} - -// Default profile phrase -const u16 gUnknown_083DB7EC[] = -{ -#if ENGLISH - EC_WORD_I_AM, - EC_WORD_A, - EC_WORD_POKEMON, - EC_WORD_GREAT, -#else - EC_WORD_I_AM, - EC_WORD_BIG, - EC_WORD_IN, - EC_WORD_POKEMON, -#endif -}; - -const u16 gUnknown_083DB7F4[] = -{ - EC_WORD_ARE, - EC_WORD_YOU, - EC_WORD_READY, - EC_WORD_QUES, - EC_WORD_HERE_I_COME, - EC_WORD_EXCL, -}; - -// ResetDefaultEasyChatPhrases -void InitEasyChatPhrases(void) -{ - u16 i; - u16 j; - - for (i = 0; i < 4; i++) - gSaveBlock1.easyChats.unk2B1C[i] = gUnknown_083DB7EC[i]; - - for (i = 0; i < 6; i++) - gSaveBlock1.easyChats.unk2B28[i] = gUnknown_083DB7F4[i]; - - for (i = 0; i < 6; i++) - { - gSaveBlock1.easyChats.unk2B34[i] = 0xFFFF; - gSaveBlock1.easyChats.unk2B40[i] = 0xFFFF; - } - - for (i = 0; i < 16; i++) - { - for (j = 0; j < 9; j++) - gSaveBlock1.mail[i].words[j] = 0xFFFF; - } - - for (i = 0; i < 64; i++) - gSaveBlock1.unk2D8C[i] = 0; -} - -void sub_80E682C(void (*func)(void)) -{ - shared1000.unk20 = func; - shared1000.unk24 = 0; -} - -void sub_80E683C(void) -{ - u16 i; - - if (shared1000.unk26 == 0) - { - for (i = 0; i < shared1000.unk1B6; i++) - shared1000.unk1AA[i] = 2; - shared1000.unk1AA[i - 1] = shared1000.unk28 % 2; - if (shared1000.unk1AA[i - 1] == 0) - shared1000.unk1AA[i - 1] = 2; - } - else - { - shared1000.unk1AA[0] = 7; - shared1000.unk1AA[1] = 6; - shared1000.unk1AA[2] = 7; - shared1000.unk1AA[3] = 7; - } - shared1000.unk1A8 = 0; - shared1000.unk1A9 = 0; - shared1000.unk1B5 = 0; - shared1000.unk1B7 = 0; - sub_80E9A4C(); -} - -void sub_80E68E8(void) -{ - sub_80EB0B0(); - if (shared1000.unk26 == 0) - { - u16 i; - u8 r6; - - r6 = shared1000.unk1B8; - shared1000.unk9A28 = (shared1000.unk4178[r6] + 1) / 2; - for (i = 0; i < shared1000.unk9A28; i++) - shared1000.unk99A6[i] = 2; - i--; - shared1000.unk99A6[i] = shared1000.unk4178[r6] % 2; - if (shared1000.unk99A6[i] == 0) - shared1000.unk99A6[i] = 2; - } - else - { - u16 i; - u8 r6; - - r6 = shared1000.unk1B8; - shared1000.unk9A28 = (shared1000.unk4142[r6] + 1) / 2; - for (i = 0; i < shared1000.unk9A28; i++) - shared1000.unk99A6[i] = 2; - i--; - shared1000.unk99A6[i] = shared1000.unk4142[r6] % 2; - if (shared1000.unk99A6[i] == 0) - shared1000.unk99A6[i] = 2; - } - shared1000.unk99A4 = 0; - shared1000.unk99A5 = 0; - shared1000.unk9A29 = 0; - sub_80E9A4C(); -} - -void sub_80E69F8(void) -{ - switch (shared1000.unk8) - { - case 0: - case 1: - case 2: - case 3: - case 4: - case 6: - case 9: - case 13: - default: - sub_80E9368(shared1000.unk8); - break; - case 5: - case 7: - case 8: - case 10: - case 11: - case 12: - sub_80E9368(shared1000.unk8); - sub_80E8BF4(shared1000.unkB, shared1000.unk9); - break; - } -} - -void sub_80E6A6C(void) -{ - LoadOam(); - ProcessSpriteCopyRequests(); - sub_80EAC5C(); - TransferPlttBuffer(); - sub_8089668(); -} - -void sub_80E6A88(void) -{ - shared1000.unk20(); - AnimateSprites(); - BuildOamBuffer(); - sub_80EAD08(); -} - -void sub_80E6AA8(void) -{ - if (!UpdatePaletteFade()) - sub_80E682C(sub_80E6AC4); -} - -void sub_80E6AC4(void) -{ - sub_80E88F0(); - sub_80E8398(0); - sub_80E91D4(0); - sub_80E682C(sub_80E6AE4); -} - -void sub_80E6AE4(void) -{ - shared1000.unk87 = sub_80E75D8(); - if (shared1000.unk87) - PlaySE(SE_SELECT); - if (gMain.newKeys & A_BUTTON) - { - PlaySE(SE_SELECT); - if (shared1000.unk86 == shared1000.unk84) - { - switch (shared1000.unk85) - { - case 0: - sub_80E682C(sub_80E6BC0); - return; - case 1: - sub_80E682C(sub_80E6C84); - return; - case 2: - sub_80E682C(sub_80E6D7C); - return; - } - } - else - { - shared1000.unk27 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; - sub_80E7574(); - sub_80E682C(sub_80E6F68); - return; - } - } - if (gMain.newKeys & B_BUTTON) - { - sub_80E682C(sub_80E6C84); - } -} - -void sub_80E6BC0(void) -{ - switch (shared1000.unk24) - { - case 0: - sub_80E8398(2); - if (shared1000.unk8 == 6) - { - sub_80E91D4(6); - shared1000.unk24 = 100; - } - else - { - sub_80E91D4(2); - DisplayYesNoMenu(23, 8, 1); - MoveMenuCursor(1); - shared1000.unk24++; - } - break; - case 1: - switch (ProcessMenuInputNoWrap_()) - { - case 0: - sub_80E7D6C(); - sub_80E98C4(); - sub_80E95A4(); - shared1000.unk24++; - break; - case -1: - case 1: - shared1000.unk24++; - break; - } - break; - case 2: - sub_80E81FC(); - sub_80E682C(sub_80E6AC4); - break; - case 100: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - sub_80E682C(sub_80E6AC4); - break; - } -} - -void sub_80E6C84(void) -{ - switch (shared1000.unk24) - { - case 0: - sub_80E8398(2); - sub_80E91D4(3); - DisplayYesNoMenu(23, 8, 0); - MoveMenuCursor(1); - if (shared1000.unk8 == 9 - || shared1000.unk8 == 4 - || shared1000.unk8 == 7 - || shared1000.unk8 == 8 - || shared1000.unk8 == 10 - || shared1000.unk8 == 11 - || shared1000.unk8 == 12 - || shared1000.unk8 == 5 - || shared1000.unk8 == 13) - shared1000.unk24 = 2; - else - shared1000.unk24++; - break; - case 1: - switch (ProcessMenuInputNoWrap_()) - { - case 0: - sub_80E91D4(4); - DisplayYesNoMenu(23, 8, 0); - MoveMenuCursor(1); - shared1000.unk24++; - break; - case -1: - case 1: - shared1000.unk24 = 0xFF; - break; - } - break; - case 2: - switch (ProcessMenuInputNoWrap_()) - { - case 0: - gSpecialVar_Result = 0; - sub_80E682C(sub_80E752C); - break; - case -1: - case 1: - shared1000.unk24 = 0xFF; - break; - } - break; - case 0xFF: - HandleDestroyMenuCursors(); - sub_80E81FC(); - sub_80E682C(sub_80E6AC4); - break; - } -} - -void sub_80E6D7C(void) -{ - switch (shared1000.unk24) - { - case 0: - sub_80E8398(2); - if (sub_80E8054()) - { - sub_80E91D4(5); - shared1000.unk24 = 10; - break; - } - if (shared1000.unk8 == 9) - { - if (sub_80E7FA8() == 0) - { - sub_80E91D4(8); - shared1000.unk24 = 10; - break; - } - if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) - { - sub_80E91D4(9); - shared1000.unk24 = 10; - break; - } - } - if (shared1000.unk8 == 4 && sub_80E7FA8() == 0) - { - sub_80E682C(sub_80E6C84); - } - else - { - sub_80E91D4(1); - sub_80E9744(); - DisplayYesNoMenu(23, 8, 0); - MoveMenuCursor(0); - shared1000.unk24++; - } - break; - case 1: - switch (ProcessMenuInputNoWrap_()) - { - case 0: - gSpecialVar_Result = (sub_80E7FA8() != 0); - sub_80E7D9C(); - if (shared1000.unk8 == 0) - gSpecialVar_0x8004 = sub_80E8094(); - if (shared1000.unk8 == 9) // dewford trend? - { - sub_80E81C0(); - gSpecialVar_0x8004 = sub_80FA364(&shared1000.unk9C7C); - } - if (shared1000.unk8 == 13) - { - if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) - gSpecialVar_Result = 0; - gSpecialVar_0x8004 = sub_80E810C(); - } - sub_80E682C(sub_80E752C); - break; - case -1: - case 1: - HandleDestroyMenuCursors(); - sub_80E81FC(); - if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) - { - shared1000.unk24 = 100; - } - else - { - sub_80E95A4(); - sub_80E682C(sub_80E6AC4); - } - break; - } - break; - case 10: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - sub_80E682C(sub_80E6AC4); - break; - case 100: - sub_80E91D4(7); - shared1000.unk24++; - // fall through - case 101: - if (gMain.newKeys & A_BUTTON) - shared1000.unk24++; - break; - case 102: - sub_80E7E50(); - sub_80E95A4(); - sub_80E682C(sub_80E6AC4); - break; - } -} - -void sub_80E6F68(void) -{ - switch (shared1000.unk24) - { - case 0: - sub_80E8398(1); - sub_80E91D4(10); - sub_80E683C(); - sub_80E9974(); - sub_80E9E98(); - shared1000.unk24++; - break; - case 1: - if (sub_80E9EA8() != 0) - { - sub_80E8D8C(1); - sub_80E8420(); - sub_80E8958(0); - sub_80E682C(sub_80E6FC8); - } - break; - } -} - -void sub_80E6FC8(void) -{ - shared1000.unk96 = sub_80E77C8(); - if (shared1000.unk1C0 != 0) - { - PlaySE(SE_SELECT); - shared1000.unk1C4 = sub_80E6FC8; - sub_80E682C(sub_80E7458); - } - else - { - if (shared1000.unk96) - PlaySE(SE_SELECT); - if (gMain.newKeys & A_BUTTON) - { - if (shared1000.unk1B7 != 0) - { - PlaySE(SE_SELECT); - switch (shared1000.unk1A8) - { - case 1: - sub_80E682C(sub_80E718C); - break; - case 2: - if (shared1000.unk8 != 6) - { - sub_80E7F00(shared1000.unk27, 0xFFFF); - sub_80E7574(); - sub_80E95A4(); - } - break; - case 3: - sub_80E682C(sub_80E7114); - break; - } - } - else - { - if (shared1000.unk26 == 0 - || shared1000.unk4142[shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]] != 0) - { - PlaySE(SE_SELECT); - sub_80E7AD4(); - sub_80E682C(sub_80E7218); - } - } - } - else if (gMain.newKeys & B_BUTTON) - { - sub_80E682C(sub_80E7114); - } - else if (gMain.newKeys & SELECT_BUTTON) - { - sub_80E682C(sub_80E718C); - } - } -} - -void sub_80E7114(void) -{ - switch (shared1000.unk24) - { - case 0: - sub_80E8504(); - sub_80E9E98(); - sub_80E88F0(); - sub_80E8D8C(0); - shared1000.unk24++; - break; - case 1: - case 2: - shared1000.unk24++; - break; - case 3: - if (sub_80E9F50() != 0) - shared1000.unk24++; - break; - case 4: - sub_80E682C(sub_80E6AC4); - break; - } -} - -void sub_80E718C(void) -{ - switch (shared1000.unk24) - { - case 0: - sub_80E8504(); - sub_80E9E98(); - sub_80E88F0(); - shared1000.unk24++; - sub_80E8D54(); - break; - case 1: - if (sub_80E9FD4() != 0) - { - shared1000.unk26 = !shared1000.unk26; - sub_80E683C(); - sub_80E9974(); - sub_80E9E98(); - shared1000.unk24++; - } - break; - default: - shared1000.unk24++; - break; - case 8: - if (sub_80EA014() != 0) - { - sub_80E8420(); - sub_80E8958(0); - sub_80E682C(sub_80E6FC8); - } - break; - } -} - -void sub_80E7218(void) -{ - switch (shared1000.unk24) - { - default: - shared1000.unk24++; - break; - case 8: - sub_80E8D8C(0); - sub_80E8504(); - sub_80E9AD4(); - sub_80E68E8(); - sub_80E88F0(); - sub_80E9E98(); - shared1000.unk24++; - break; - case 9: - if (sub_80EA050() != 0) - { - sub_80E9C94(); - shared1000.unk24++; - } - break; - case 10: - sub_80E87CC(1); - sub_80E8958(1); - sub_80E682C(sub_80E7294); - break; - case 11: - break; - } -} - -void sub_80E7294(void) -{ - shared1000.unk1B9 = sub_80E7B40(); - if (shared1000.unk1C0 != 0) - { - PlaySE(SE_SELECT); - shared1000.unk1C4 = sub_80E7294; - sub_80E682C(sub_80E7458); - } - else - { - if (shared1000.unk1B9) - PlaySE(SE_SELECT); - if (gMain.newKeys & A_BUTTON) - { - PlaySE(SE_SELECT); - sub_80E682C(sub_80E7324); - } - else if (gMain.newKeys & B_BUTTON) - { - sub_80E682C(sub_80E73D0); - } - } -} - -void sub_80E7324(void) -{ - switch (shared1000.unk24) - { - case 0: - if (!sub_80E7DD0()) - { - sub_80E682C(sub_80E7294); - } - else - { - sub_80E88F0(); - sub_80E87CC(0); - shared1000.unk24++; - } - break; - case 1: - shared1000.unk24++; - break; - case 2: - sub_80E9E98(); - shared1000.unk24++; - break; - case 3: - if (sub_80EA184() != 0) - shared1000.unk24++; - break; - case 4: - if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) - sub_80E682C(sub_80E6D7C); - else - sub_80E682C(sub_80E6AC4); - break; - } -} - -void sub_80E73D0(void) -{ - switch (shared1000.unk24) - { - case 0: - sub_80E87CC(0); - sub_80E88F0(); - shared1000.unk24++; - break; - case 1: - sub_80E9AD4(); - sub_80E9E98(); - shared1000.unk24++; - break; - case 2: - if (sub_80EA0E4() != 0) - { - sub_80E8D8C(1); - sub_80E9A14(); - shared1000.unk24++; - } - break; - case 3: - sub_80E8420(); - sub_80E8958(0); - shared1000.unk24++; - break; - case 4: - sub_80E9974(); - sub_80E682C(sub_80E6FC8); - break; - } -} - -void sub_80E7458(void) -{ - switch (shared1000.unk24) - { - case 0: - if (shared1000.unk1C4 == sub_80E6FC8) - sub_80E9D7C(); - else - sub_80E9D00(); - sub_80E9E08(shared1000.unk1BE); - shared1000.unk24++; - break; - case 1: - if (sub_80E9E54()) - { - if (shared1000.unk1C4 == sub_80E6FC8) - { - sub_80E9D7C(); - shared1000.unk1B5 += shared1000.unk1C0; - sub_80E7A98(); - shared1000.unk96 = TRUE; - } - else - { - shared1000.unk9A29 += shared1000.unk1C0; - sub_80E7D30(); - shared1000.unk1B9 = 1; - } - shared1000.unk1BE = 2; - sub_80E682C(shared1000.unk1C4); - } - break; - } -} - -void sub_80E752C(void) -{ - switch (shared1000.unk24) - { - case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - shared1000.unk24++; - break; - case 1: - if (!UpdatePaletteFade()) - SetMainCallback2(shared1000.unk0); - break; - } -} - -void sub_80E7574(void) -{ - if (shared1000.unk8 == 1 - && shared1000.unk7E[shared1000.unk86] == 2 - && sub_80EB2D4(shared1000.unkC[shared1000.unk27]) != 7) - shared1000.unk7D = 1; - else - shared1000.unk7D = 0; - shared1000.unk7D = 0; // What the hell? -} - -bool8 sub_80E75D8(void) -{ - bool8 pressedUpDown = FALSE; - u8 r0; - - if (gMain.newKeys & START_BUTTON) - { - shared1000.unk86 = shared1000.unk84; - shared1000.unk85 = 2; - return TRUE; - } - - if (gMain.newAndRepeatedKeys & DPAD_UP) - { - shared1000.unk86--; - if (shared1000.unk86 < 0) - shared1000.unk86 = shared1000.unk84; - pressedUpDown = TRUE; - } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) - { - shared1000.unk86++; - if (shared1000.unk86 > shared1000.unk84) - shared1000.unk86 = 0; - pressedUpDown = TRUE; - } - - if (pressedUpDown) - { - if (shared1000.unk9 == 2) - { - if (shared1000.unk86 == shared1000.unk84) - shared1000.unk85 = 2; - else - shared1000.unk85 = 0; - return TRUE; - } - else - { - if (shared1000.unk85 >= shared1000.unk83) - shared1000.unk85 = shared1000.unk83 - 1; - if (shared1000.unk86 != shared1000.unk84) - { - r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; - if (r0 >= shared1000.unkA) - shared1000.unk85 = r0 - shared1000.unkA; - } - return TRUE; - } - } - else - { - if (gMain.newAndRepeatedKeys & DPAD_LEFT) - { - if (--shared1000.unk85 < 0) - { - if (shared1000.unk86 == shared1000.unk84) - { - shared1000.unk85 = 2; - } - else - { - shared1000.unk85 = shared1000.unk83 - 1; - r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; - if (r0 >= shared1000.unkA) - shared1000.unk85 = r0 - shared1000.unkA; - } - } - return TRUE; - } - if (gMain.newAndRepeatedKeys & DPAD_RIGHT) - { - if (shared1000.unk86 == shared1000.unk84) - { - if (++shared1000.unk85 > 2) - shared1000.unk85 = 0; - } - else - { - if (++shared1000.unk85 >= shared1000.unk83) - shared1000.unk85 = 0; - r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; - if (r0 >= shared1000.unkA) - shared1000.unk85 = r0 - shared1000.unkA; - } - return TRUE; - } - } - return FALSE; -} - -bool8 sub_80E77C8(void) -{ - bool8 pressedLeftRight = FALSE; - bool8 pressedUpDown; - - if (shared1000.unk1B7 != 0) - { - if (gMain.newAndRepeatedKeys & DPAD_UP) - { - shared1000.unk1A8--; - if (shared1000.unk1A8 < 1) - shared1000.unk1A8 = 3; - return TRUE; - } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) - { - shared1000.unk1A8++; - if (shared1000.unk1A8 > 3) - shared1000.unk1A8 = 1; - return TRUE; - } - } - else - { - if (shared1000.unk26 == 1) - { - pressedUpDown = FALSE; - - if (gMain.newAndRepeatedKeys & DPAD_UP) - { - shared1000.unk1A8--; - if (shared1000.unk1A8 < 0) - shared1000.unk1A8 = 3; - pressedUpDown = TRUE; - } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) - { - shared1000.unk1A8++; - if (shared1000.unk1A8 > 3) - shared1000.unk1A8 = 0; - pressedUpDown = TRUE; - } - - if (pressedUpDown) - { - sub_80E7A98(); - return TRUE; - } - } - else - { - pressedUpDown = FALSE; - shared1000.unk1C0 = 0; - - if (gMain.newAndRepeatedKeys & DPAD_UP) - { - if (shared1000.unk1A8 == 0) - return FALSE; - shared1000.unk1A8--; - if (shared1000.unk1A8 < shared1000.unk1B5) - shared1000.unk1C0 = -1; - pressedUpDown = TRUE; - } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) - { - if (shared1000.unk1A8 >= shared1000.unk1B6 - 1) - return FALSE; - shared1000.unk1A8++; - if (shared1000.unk1A8 > shared1000.unk1B5 + 3) - shared1000.unk1C0 = 1; - pressedUpDown = TRUE; - } - - if (pressedUpDown) - { - if (shared1000.unk1C0 == 0) - { - sub_80E7A98(); - return TRUE; - } - return FALSE; - } - } - } - - if (gMain.newAndRepeatedKeys & DPAD_LEFT) - { - if (shared1000.unk1A9 != 0) - shared1000.unk1A9--; - else - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; - pressedLeftRight = TRUE; - } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) - { - if (shared1000.unk1B7 != 0 - || shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]) - shared1000.unk1A9 = 0; - else - shared1000.unk1A9++; - pressedLeftRight = TRUE; - } - - if (pressedLeftRight) - { - s8 r9 = shared1000.unk1B7; - - shared1000.unk1B7 = (shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]); - if (shared1000.unk1B7 != 0) - { - shared1000.unk1A8 -= shared1000.unk1B5; - if (shared1000.unk1A8 == 0) - { - shared1000.unk1A8 = 1; - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; - } - } - else if (r9 != 0) - { - shared1000.unk1A8 += shared1000.unk1B5; - if (shared1000.unk1A9 != 0) - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; - } - return TRUE; - } - - return FALSE; -} - -void sub_80E7A98(void) -{ - if (shared1000.unk1A9 >= shared1000.unk1AA[shared1000.unk1A8]) - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; -} - -void sub_80E7AD4(void) -{ - if (shared1000.unk26 == 0) - shared1000.unk1B8 = shared1000.unk2A[shared1000.unk1A8][shared1000.unk1A9]; - else - shared1000.unk1B8 = shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]; -} - -bool8 sub_80E7B40(void) -{ - bool8 pressedUpDown = FALSE; - - shared1000.unk1C0 = 0; - if (gMain.newAndRepeatedKeys & DPAD_UP) - { - if (shared1000.unk99A4 == 0) - return FALSE; - shared1000.unk99A4--; - if (shared1000.unk99A4 < shared1000.unk9A29) - { - shared1000.unk1C0 = -1; - return FALSE; - } - pressedUpDown = TRUE; - } - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) - { - if (shared1000.unk99A4 >= shared1000.unk9A28 - 1) - return FALSE; - shared1000.unk99A4++; - if (shared1000.unk99A4 >= shared1000.unk9A29 + 4) - { - shared1000.unk1C0 = 1; - return FALSE; - } - pressedUpDown = TRUE; - } - - if (pressedUpDown) - { - sub_80E7D30(); - return TRUE; - } - - if (gMain.newAndRepeatedKeys & DPAD_LEFT) - { - shared1000.unk99A5--; - if (shared1000.unk99A5 < 0) - shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; - return TRUE; - } - else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) - { - shared1000.unk99A5++; - if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) - shared1000.unk99A5 = 0; - return TRUE; - } - - if (gMain.newKeys & START_BUTTON) - { - if (shared1000.unk9A29 != 0) - { - shared1000.unk1C0 = -shared1000.unk9A29; - if (shared1000.unk1C0 < -4) - shared1000.unk1C0 = -4; - } - shared1000.unk99A4 += shared1000.unk1C0; - shared1000.unk1BE = 4; - } - else if (gMain.newKeys & SELECT_BUTTON) - { - if (shared1000.unk9A29 < shared1000.unk9A28 - 4) - { - shared1000.unk1C0 = shared1000.unk9A28 - 4 - shared1000.unk9A29; - if (shared1000.unk1C0 > 4) - shared1000.unk1C0 = 4; - } - shared1000.unk99A4 += shared1000.unk1C0; - shared1000.unk1BE = 4; - } - - return FALSE; -} - -void sub_80E7D30(void) -{ - if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) - shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; -} - -void sub_80E7D6C(void) -{ - u16 i; - - for (i = 0; i < shared1000.unkA; i++) - sub_80E7F00(i, 0xFFFF); -} - -void sub_80E7D9C(void) -{ - u16 i; - - for (i = 0; i < shared1000.unkA; i++) - shared1000.unk4[i] = shared1000.unkC[i]; -} - -bool8 sub_80E7DD0(void) -{ - u16 r4 = shared1000.unk9A2A[shared1000.unk99A4][shared1000.unk99A5]; - - if (shared1000.unk7D != 0 - && shared1000.unk7E[shared1000.unk86] > 1 - && sub_80EB2D4(r4) == 7) - return FALSE; - - sub_80E7F00(shared1000.unk27, r4); - sub_80E95A4(); - return TRUE; -} - -void sub_80E7E50(void) -{ - u16 r5 = 0; - u16 i; - u16 j; - - for (i = 0; i < shared1000.unk84; i++) - { - shared1000.unk7E[i] = 0; - for (j = 0; j < shared1000.unk83; j++) - { - shared1000.unkC[r5] = shared1000.unk4[r5]; - shared1000.unk8C[i][j] = 0; - r5++; - } - } -} - -void sub_80E7F00(u16 a, u16 b) -{ - u16 r5 = a / shared1000.unk83; - u16 r8 = a % shared1000.unk83; - u16 r4 = sub_80EB2D4(shared1000.unkC[a]); - u16 r3 = sub_80EB2D4(b); - - if (r4 == 7) - { - if (r3 != 7) - shared1000.unk7E[r5]--; - } - else - { - if (r3 == 7) - shared1000.unk7E[r5]++; - } - r3 = 0; - shared1000.unk8C[r5][r8] = r3; - shared1000.unkC[a] = b; -} - -u8 sub_80E7FA8(void) -{ - u16 r8 = 0; - u16 i; - u8 *r1; - u8 *r2; - - for (i = 0; i < shared1000.unkA; i++) - { - sub_80EB218(shared1000.unk9E14, shared1000.unk4[i], 0); - sub_80EB218(shared1000.unk9E41, shared1000.unkC[i], 0); - r1 = shared1000.unk9E14; - r2 = shared1000.unk9E41; - while (*r1 == *r2 && *r1 != 0xFF) - { - r1++; - r2++; - } - if (*r1 != *r2) - r8++; - } - return r8; -} - -bool8 sub_80E8054(void) -{ - u16 i; - - for (i = 0; i < shared1000.unkA; i++) - { - if (shared1000.unkC[i] != 0xFFFF) - return FALSE; - } - return TRUE; -} - -// CheckMysteryEventPhrase -bool8 sub_80E8094(void) -{ - u16 i; - u8 *r3; - u8 *r4; - - for (i = 0; i < 4; i++) - { - sub_80EB218(shared1000.unk9E14, shared1000.unkC[i], 0); - sub_80EB218(shared1000.unk9E41, gMysteryEventPhrase[i], 0); - r3 = shared1000.unk9E14; - r4 = shared1000.unk9E41; - while (*r3 != 0xFF && *r4 != 0xFF) - { - if (*r3++ != *r4++) - return FALSE; - } - if (*r3 != 0xFF || *r4 != 0xFF) - return FALSE; - } - return TRUE; -} - -u8 sub_80E810C(void) -{ - u16 i; - - for (i = 0; i < 5; i++) - { - u8 *ptr; - u8 *r3; - - ptr = sub_80EB218(shared1000.unk9E6E, shared1000.unkC[0], 0); - *ptr++ = CHAR_SPACE; - sub_80EB218(ptr, shared1000.unkC[1], 0); - - ptr = sub_80EB218(shared1000.unk9EEE, gBerryMasterWifePhrases[i][0], 0); - *ptr++ = CHAR_SPACE; - sub_80EB218(ptr, gBerryMasterWifePhrases[i][1], 0); - - ptr = shared1000.unk9E6E; - r3 = shared1000.unk9EEE; - while (*ptr != EOS && *r3 != EOS) - { - if (*ptr++ != *r3++) - break; - } - if (*ptr == EOS && *r3 == EOS) - return i + 1; - } - return 0; -} - -void sub_80E81C0(void) -{ - u8 *ptr; - - ptr = sub_80EB218(gStringVar2, shared1000.unk9C7C, 0); - *ptr++ = CHAR_SPACE; - sub_80EB218(ptr, shared1000.unk9C7E, 0); -} - -void sub_80E81FC(void) -{ - PlaySE(SE_SELECT); - sub_80E95A4(); - MenuZeroFillWindowRect(0, 0, 29, 13); -} diff --git a/sym_bss.txt b/sym_bss.txt index f6ee61fb7..d2d218ec4 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -25,7 +25,7 @@ .include "src/engine/record_mixing.o" .include "src/field/tv.o" .include "src/battle/battle_anim_80CA710.o" - .include "src/easy_chat.o" + .include "src/easy_chat_2.o" .include "src/pokenav_before.o" .include "src/field/mauville_man.o" .include "src/field/menu_helpers.o" -- cgit v1.2.3 From e28c11ef9518c80e23ce0076b8ba9be4cb140015 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 23:07:57 -0500 Subject: Update delcarations of cable car util funtions --- include/cable_car_util.h | 4 ++-- src/scene/cable_car.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/cable_car_util.h b/include/cable_car_util.h index d109190b0..f1f52bb3c 100644 --- a/include/cable_car_util.h +++ b/include/cable_car_util.h @@ -7,7 +7,7 @@ // Exported ROM declarations -void sub_8124F08(void *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height); -void sub_8124E7C(void *dest, u16 a1, u8 a2, u8 a3, u8 a4, u8 a5); +void sub_8124F08(u16 dest[][32], const u16 *src, u8 x, u8 y, u8 width, u8 height); +void sub_8124E7C(u16 dest[][32], u16 a1, u8 a2, u8 a3, u8 a4, u8 a5); #endif //GUARD_CABLE_CAR_UTIL_H diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 288c5d40d..f57233556 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -59,7 +59,7 @@ struct CableCarEwramStruct1 { u16 unk_0022[9][12]; u8 filler_00fa[2]; u16 unk_00fc[0x20][0x20]; - u16 unk_08fc[0x400]; + u16 unk_08fc[0x20][0x20]; }; // size 0x10FC struct CableCarEwramStruct2 { @@ -268,8 +268,8 @@ static void CableCarMainCallback_Setup(void) } break; case 5: - sub_8124F08((u16 *)BG_SCREEN_ADDR(29), eCableCar2->treeTilemap, 0, 17, 32, 15); - sub_8124F08((u16 *)BG_SCREEN_ADDR(30), eCableCar2->mountainTilemap, 0, 0, 30, 20); + sub_8124F08((void *)BG_SCREEN_ADDR(29), eCableCar2->treeTilemap, 0, 17, 32, 15); + sub_8124F08((void *)BG_SCREEN_ADDR(30), eCableCar2->mountainTilemap, 0, 0, 30, 20); sub_8124F08(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); sub_8124F08(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 20); gMain.state++; @@ -479,14 +479,14 @@ static void sub_8123AF8(u8 taskId) sCableCarPtr->unk_0015 = 192; break; case 32: - sCableCarPtr->unk_08fc[2] = (gCableCarPylonHookTilemapEntries + 2)[0]; - sCableCarPtr->unk_08fc[3] = (gCableCarPylonHookTilemapEntries + 2)[1]; - sCableCarPtr->unk_08fc[34] = (gCableCarPylonHookTilemapEntries + 2)[5]; - sCableCarPtr->unk_08fc[35] = (gCableCarPylonHookTilemapEntries + 2)[6]; + sCableCarPtr->unk_08fc[0][2] = (gCableCarPylonHookTilemapEntries + 2)[0]; + sCableCarPtr->unk_08fc[0][3] = (gCableCarPylonHookTilemapEntries + 2)[1]; + sCableCarPtr->unk_08fc[1][2] = (gCableCarPylonHookTilemapEntries + 2)[5]; + sCableCarPtr->unk_08fc[1][3] = (gCableCarPylonHookTilemapEntries + 2)[6]; break; case 40: - sCableCarPtr->unk_08fc[4] = (gCableCarPylonHookTilemapEntries + 4)[0]; - sCableCarPtr->unk_08fc[36] = (gCableCarPylonHookTilemapEntries + 4)[5]; + sCableCarPtr->unk_08fc[0][4] = (gCableCarPylonHookTilemapEntries + 4)[0]; + sCableCarPtr->unk_08fc[1][4] = (gCableCarPylonHookTilemapEntries + 4)[5]; break; } } -- cgit v1.2.3 From 7d181ec03bdc8e5b9424e08e4428b76bab8eb5fd Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 22:18:57 -0600 Subject: minor cleanup --- include/constants/easy_chat.h | 4 +- include/easy_chat.h | 25 +- src/easy_chat_1.c | 710 +++++++++++++++++++------------------- src/easy_chat_2.c | 776 +++++++++++++++++++++--------------------- 4 files changed, 756 insertions(+), 759 deletions(-) diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 12350aebe..215dac48c 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_EASY_CHAT_H #define GUARD_CONSTANTS_EASY_CHAT_H -#define EC_GROUP_POKEMON 0x0 +#define EC_GROUP_POKEMON_1 0x0 #define EC_GROUP_TRAINER 0x1 #define EC_GROUP_STATUS 0x2 #define EC_GROUP_BATTLE 0x3 @@ -1053,7 +1053,7 @@ #define EC_WORD_YOUNG (EC_GROUP_TRENDY_SAYING << 9) | 0x1f #define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20 -#define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon) +#define EC_POKEMON(mon) ((EC_GROUP_POKEMON_1 << 9) | SPECIES_##mon) #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon) #define EC_MOVE(move) ((EC_GROUP_MOVE_1 << 9) | MOVE_##move) #define EC_MOVE2(move) ((EC_GROUP_MOVE_2 << 9) | MOVE_##move) diff --git a/include/easy_chat.h b/include/easy_chat.h index 9342663d8..a70d7ad0c 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -18,21 +18,20 @@ struct Shared1000 u16 *unk4; u8 unk8; u8 unk9; - u8 unkA; + u8 unkA; // length of unkC array u8 unkB; // reporter talked to (Gabby or Ty) - u16 unkC[(0x20-0xC)/2]; // unknown length + u16 unkC[9]; void (*unk20)(void); u16 unk24; u8 unk26; u8 unk27; u16 unk28; - u8 unk2A[11][2]; // unknown length + u8 unk2A[11][2]; u8 unk40[4][14]; - u8 unk78[0x7D - 0x78]; // unknown length + u8 unk78[5]; u8 unk7D; u8 unk7E[5]; - s8 unk83; // s8? - //u8 unk83; // s8? + s8 unk83; s8 unk84; s8 unk85; s8 unk86; @@ -60,7 +59,7 @@ struct Shared1000 struct UnknownEasyChatStruct1 unk148[(0x1A8-0x148)/12]; s8 unk1A8; s8 unk1A9; - s8 unk1AA[0xB5-0xAA]; // unknown length + s8 unk1AA[0xB5-0xAA]; s8 unk1B5; s8 unk1B6; s8 unk1B7; @@ -73,19 +72,19 @@ struct Shared1000 s8 unk1C0; u8 filler1C1[3]; void (*unk1C4)(void); - u8 unk1C8[0x6C8-0x1C8]; + u8 unk1C8[0x500]; u8 unk6C8[0xB78-0x6C8]; #if GERMAN - u16 unkB78[0x1B][270]; + u16 unkB78[27][270]; #else - u16 unkB78[0x1B][255]; + u16 unkB78[27][255]; #endif u16 unk4142[(0x78-0x42)/2]; //0x446C u16 unk4178[(0x41A4-0x4178)/2]; // unknown length - const u8 *unk41A4[0x16][0x100]; //0x44CE in german + const u8 *ecWordStrings[0x16][0x100]; //0x44CE in german s8 unk99A4; s8 unk99A5; - s8 unk99A6[0xA28-0x9A6]; + s8 unk99A6[130]; s8 unk9A28; s8 unk9A29; u16 unk9A2A[(0x9C32-0x9A2A)/4][2]; // unknown length @@ -119,7 +118,7 @@ extern u8 gUnknown_020388AC; extern u8 gUnknown_03000740; // const pointer to shared1000. easy_chat might be two separate files. -extern struct Shared1000 *const gUnknown_083DB694; +extern struct Shared1000 *const gEasyChatStruct; void sub_80E62A0(u8 arg0, u16 *arg1, void (*arg2)(void), u8 arg3); u16 sub_80EB72C(u16 group); diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 59e463260..a1a67152e 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -21,8 +21,6 @@ extern const struct WindowConfig gWindowConfig_81E6DA8; extern void sub_80546B8(void); -#define shared1000 (*(struct Shared1000 *)(gSharedMem + 0x1000)) - const u16 gMysteryEventPhrase[] = {EC_WORD_MYSTERY, EC_WORD_EVENT, EC_WORD_IS, EC_WORD_EXCITING}; const u16 gBerryMasterWifePhrases[][2] = @@ -42,8 +40,8 @@ const u16 gBerryMasterWifePhrases[][2] = #endif }; -// const pointer to shared1000. easy_chat might be two separate files. -struct Shared1000 *const gUnknown_083DB694 = &shared1000; +// const pointer to gEasyChatStruct-> easy_chat might be two separate files. +struct Shared1000 *const gEasyChatStruct = (struct Shared1000 *)(gSharedMem + 0x1000); const struct UnknownTaskStruct gUnknown_083DB698 = { @@ -193,7 +191,7 @@ void sub_80EAC5C(void); void sub_80EAD08(void); u8 sub_80EAD7C(u8); void sub_80EAECC(void); -void sub_80EB040(void); +void LoadEasyChatStrings(void); void sub_80EB0B0(void); u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(); @@ -264,9 +262,9 @@ void sub_80E60D8(void) r4 = 1; break; case 13: - shared1000.unk9C7C = 0xFFFF; - shared1000.unk9C7E = -1; - r1 = &shared1000.unk9C7C; + gEasyChatStruct->unk9C7C = 0xFFFF; + gEasyChatStruct->unk9C7E = -1; + r1 = &gEasyChatStruct->unk9C7C; break; default: return; @@ -276,15 +274,15 @@ void sub_80E60D8(void) void sub_80E62A0(u8 a, u16 *b, void (*c)(void), u8 d) { - shared1000.unk0 = c; - shared1000.unk4 = b; - shared1000.unk8 = a; - shared1000.unkB = d; + gEasyChatStruct->unk0 = c; + gEasyChatStruct->unk4 = b; + gEasyChatStruct->unk8 = a; + gEasyChatStruct->unkB = d; if (a == 9) { - shared1000.unk4 = &shared1000.unk9C7C; - shared1000.unk9C7C = gSaveBlock1.easyChatPairs[0].words[0]; - shared1000.unk9C7E = gSaveBlock1.easyChatPairs[0].words[1]; + gEasyChatStruct->unk4 = &gEasyChatStruct->unk9C7C; + gEasyChatStruct->unk9C7C = gSaveBlock1.easyChatPairs[0].words[0]; + gEasyChatStruct->unk9C7E = gSaveBlock1.easyChatPairs[0].words[1]; } SetMainCallback2(sub_80E62F8); } @@ -343,61 +341,61 @@ void sub_80E62F8(void) void sub_80E6424(void) { - shared1000.unk9 = gUnknown_083DB6A4[shared1000.unk8]; - switch (shared1000.unk9) + gEasyChatStruct->unk9 = gUnknown_083DB6A4[gEasyChatStruct->unk8]; + switch (gEasyChatStruct->unk9) { case 4: - shared1000.unkA = 4; - shared1000.unk83 = 2; - shared1000.unk84 = 2; - shared1000.unk88 = 5; - shared1000.unk8A = 4; + gEasyChatStruct->unkA = 4; + gEasyChatStruct->unk83 = 2; + gEasyChatStruct->unk84 = 2; + gEasyChatStruct->unk88 = 5; + gEasyChatStruct->unk8A = 4; break; case 5: - shared1000.unkA = 4; - shared1000.unk83 = 1; - shared1000.unk84 = 4; - shared1000.unk88 = 16; - shared1000.unk8A = 2; + gEasyChatStruct->unkA = 4; + gEasyChatStruct->unk83 = 1; + gEasyChatStruct->unk84 = 4; + gEasyChatStruct->unk88 = 16; + gEasyChatStruct->unk8A = 2; break; case 0: - shared1000.unkA = 6; - shared1000.unk83 = 2; - shared1000.unk84 = 3; - shared1000.unk88 = 4; - shared1000.unk8A = 3; + gEasyChatStruct->unkA = 6; + gEasyChatStruct->unk83 = 2; + gEasyChatStruct->unk84 = 3; + gEasyChatStruct->unk88 = 4; + gEasyChatStruct->unk8A = 3; break; case 1: - shared1000.unkA = 9; - shared1000.unk83 = 2; - shared1000.unk84 = 5; - shared1000.unk88 = 4; - shared1000.unk8A = 0; + gEasyChatStruct->unkA = 9; + gEasyChatStruct->unk83 = 2; + gEasyChatStruct->unk84 = 5; + gEasyChatStruct->unk88 = 4; + gEasyChatStruct->unk8A = 0; break; case 2: - shared1000.unkA = 1; - shared1000.unk83 = 1; - shared1000.unk84 = 1; - shared1000.unk88 = 16; - shared1000.unk8A = 4; + gEasyChatStruct->unkA = 1; + gEasyChatStruct->unk83 = 1; + gEasyChatStruct->unk84 = 1; + gEasyChatStruct->unk88 = 16; + gEasyChatStruct->unk8A = 4; break; case 3: - shared1000.unkA = 2; - shared1000.unk83 = 2; - shared1000.unk84 = 1; - shared1000.unk88 = 5; - shared1000.unk8A = 3; + gEasyChatStruct->unkA = 2; + gEasyChatStruct->unk83 = 2; + gEasyChatStruct->unk84 = 1; + gEasyChatStruct->unk88 = 5; + gEasyChatStruct->unk8A = 3; break; } - shared1000.unk86 = 0; - shared1000.unk85 = 0; - shared1000.unk87 = 0; - shared1000.unk26 = 0; - shared1000.unk1BA = 0; - shared1000.unk1BE = 2; + gEasyChatStruct->unk86 = 0; + gEasyChatStruct->unk85 = 0; + gEasyChatStruct->unk87 = 0; + gEasyChatStruct->unk26 = 0; + gEasyChatStruct->unk1BA = 0; + gEasyChatStruct->unk1BE = 2; sub_80E6554(); sub_80EAECC(); - sub_80EB040(); + LoadEasyChatStrings(); sub_80E7E50(); sub_80E6630(); sub_80E6690(); @@ -413,14 +411,14 @@ void sub_80E6554(void) { for (r5 = 0; r5 < 2; r5++) { - shared1000.unk2A[r7][r5] = r4++; + gEasyChatStruct->unk2A[r7][r5] = r4++; if (r4 == 17) break; } if (r4 == 17) break; } - shared1000.unk28 = 17; + gEasyChatStruct->unk28 = 17; while (r4 < 22) { if (sub_80EAD7C(r4) != 0) @@ -431,17 +429,17 @@ void sub_80E6554(void) r7++; r5 = 0; } - shared1000.unk2A[r7][r5] = r4; - shared1000.unk78[r4 - 17] = 1; // hmm... - shared1000.unk28++; + gEasyChatStruct->unk2A[r7][r5] = r4; + gEasyChatStruct->unk78[r4 - 17] = 1; // hmm... + gEasyChatStruct->unk28++; } else { - shared1000.unk78[r4 - 17] = 0; + gEasyChatStruct->unk78[r4 - 17] = 0; } r4++; } - shared1000.unk1B6 = (shared1000.unk28 + 1) / 2; + gEasyChatStruct->unk1B6 = (gEasyChatStruct->unk28 + 1) / 2; } void sub_80E6630(void) @@ -456,9 +454,9 @@ void sub_80E6630(void) for (r3 = 0; row[r3] != EOS; r3++) { if (row[r3] != CHAR_SPACE) - shared1000.unk40[i][r3] = row[r3] + 0x46; + gEasyChatStruct->unk40[i][r3] = row[r3] + 0x46; else - shared1000.unk40[i][r3] = CHAR_SPACE; + gEasyChatStruct->unk40[i][r3] = CHAR_SPACE; } } } @@ -467,15 +465,15 @@ void sub_80E6690(void) { u8 *pointers[] = { - shared1000.unk9C80, shared1000.unk9CC9, - shared1000.unk9D12, shared1000.unk9D5B, + gEasyChatStruct->unk9C80, gEasyChatStruct->unk9CC9, + gEasyChatStruct->unk9D12, gEasyChatStruct->unk9D5B, }; u8 *r3; u16 i; for (i = 0; i < 2; i++) { - const struct EasyChatPrompt *prompt = &gUnknown_083DB6F4[gUnknown_083DB7C0[shared1000.unk8][i]]; + const struct EasyChatPrompt *prompt = &gUnknown_083DB6F4[gUnknown_083DB7C0[gEasyChatStruct->unk8][i]]; r3 = StringCopy(pointers[i * 2 + 0], prompt->text1); if (prompt->unk8) @@ -491,10 +489,10 @@ void sub_80E6690(void) } for (i = 0; i < 0x24; i++) - shared1000.unk9DA4[i] = 0; - shared1000.unk9DA4[i] = 0xFF; + gEasyChatStruct->unk9DA4[i] = 0; + gEasyChatStruct->unk9DA4[i] = 0xFF; - r3 = shared1000.unk9F6E; + r3 = gEasyChatStruct->unk9F6E; r3[0] = EXT_CTRL_CODE_BEGIN; r3[1] = 0x11; r3[2] = 0xE0; @@ -557,76 +555,76 @@ void InitEasyChatPhrases(void) void sub_80E682C(void (*func)(void)) { - shared1000.unk20 = func; - shared1000.unk24 = 0; + gEasyChatStruct->unk20 = func; + gEasyChatStruct->unk24 = 0; } void sub_80E683C(void) { u16 i; - if (shared1000.unk26 == 0) + if (gEasyChatStruct->unk26 == 0) { - for (i = 0; i < shared1000.unk1B6; i++) - shared1000.unk1AA[i] = 2; - shared1000.unk1AA[i - 1] = shared1000.unk28 % 2; - if (shared1000.unk1AA[i - 1] == 0) - shared1000.unk1AA[i - 1] = 2; + for (i = 0; i < gEasyChatStruct->unk1B6; i++) + gEasyChatStruct->unk1AA[i] = 2; + gEasyChatStruct->unk1AA[i - 1] = gEasyChatStruct->unk28 % 2; + if (gEasyChatStruct->unk1AA[i - 1] == 0) + gEasyChatStruct->unk1AA[i - 1] = 2; } else { - shared1000.unk1AA[0] = 7; - shared1000.unk1AA[1] = 6; - shared1000.unk1AA[2] = 7; - shared1000.unk1AA[3] = 7; + gEasyChatStruct->unk1AA[0] = 7; + gEasyChatStruct->unk1AA[1] = 6; + gEasyChatStruct->unk1AA[2] = 7; + gEasyChatStruct->unk1AA[3] = 7; } - shared1000.unk1A8 = 0; - shared1000.unk1A9 = 0; - shared1000.unk1B5 = 0; - shared1000.unk1B7 = 0; + gEasyChatStruct->unk1A8 = 0; + gEasyChatStruct->unk1A9 = 0; + gEasyChatStruct->unk1B5 = 0; + gEasyChatStruct->unk1B7 = 0; sub_80E9A4C(); } void sub_80E68E8(void) { sub_80EB0B0(); - if (shared1000.unk26 == 0) + if (gEasyChatStruct->unk26 == 0) { u16 i; u8 r6; - r6 = shared1000.unk1B8; - shared1000.unk9A28 = (shared1000.unk4178[r6] + 1) / 2; - for (i = 0; i < shared1000.unk9A28; i++) - shared1000.unk99A6[i] = 2; + r6 = gEasyChatStruct->unk1B8; + gEasyChatStruct->unk9A28 = (gEasyChatStruct->unk4178[r6] + 1) / 2; + for (i = 0; i < gEasyChatStruct->unk9A28; i++) + gEasyChatStruct->unk99A6[i] = 2; i--; - shared1000.unk99A6[i] = shared1000.unk4178[r6] % 2; - if (shared1000.unk99A6[i] == 0) - shared1000.unk99A6[i] = 2; + gEasyChatStruct->unk99A6[i] = gEasyChatStruct->unk4178[r6] % 2; + if (gEasyChatStruct->unk99A6[i] == 0) + gEasyChatStruct->unk99A6[i] = 2; } else { u16 i; u8 r6; - r6 = shared1000.unk1B8; - shared1000.unk9A28 = (shared1000.unk4142[r6] + 1) / 2; - for (i = 0; i < shared1000.unk9A28; i++) - shared1000.unk99A6[i] = 2; + r6 = gEasyChatStruct->unk1B8; + gEasyChatStruct->unk9A28 = (gEasyChatStruct->unk4142[r6] + 1) / 2; + for (i = 0; i < gEasyChatStruct->unk9A28; i++) + gEasyChatStruct->unk99A6[i] = 2; i--; - shared1000.unk99A6[i] = shared1000.unk4142[r6] % 2; - if (shared1000.unk99A6[i] == 0) - shared1000.unk99A6[i] = 2; + gEasyChatStruct->unk99A6[i] = gEasyChatStruct->unk4142[r6] % 2; + if (gEasyChatStruct->unk99A6[i] == 0) + gEasyChatStruct->unk99A6[i] = 2; } - shared1000.unk99A4 = 0; - shared1000.unk99A5 = 0; - shared1000.unk9A29 = 0; + gEasyChatStruct->unk99A4 = 0; + gEasyChatStruct->unk99A5 = 0; + gEasyChatStruct->unk9A29 = 0; sub_80E9A4C(); } void sub_80E69F8(void) { - switch (shared1000.unk8) + switch (gEasyChatStruct->unk8) { case 0: case 1: @@ -637,7 +635,7 @@ void sub_80E69F8(void) case 9: case 13: default: - sub_80E9368(shared1000.unk8); + sub_80E9368(gEasyChatStruct->unk8); break; case 5: case 7: @@ -645,8 +643,8 @@ void sub_80E69F8(void) case 10: case 11: case 12: - sub_80E9368(shared1000.unk8); - sub_80E8BF4(shared1000.unkB, shared1000.unk9); + sub_80E9368(gEasyChatStruct->unk8); + sub_80E8BF4(gEasyChatStruct->unkB, gEasyChatStruct->unk9); break; } } @@ -662,7 +660,7 @@ void sub_80E6A6C(void) void sub_80E6A88(void) { - shared1000.unk20(); + gEasyChatStruct->unk20(); AnimateSprites(); BuildOamBuffer(); sub_80EAD08(); @@ -684,15 +682,15 @@ void sub_80E6AC4(void) void sub_80E6AE4(void) { - shared1000.unk87 = sub_80E75D8(); - if (shared1000.unk87) + gEasyChatStruct->unk87 = sub_80E75D8(); + if (gEasyChatStruct->unk87) PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if (shared1000.unk86 == shared1000.unk84) + if (gEasyChatStruct->unk86 == gEasyChatStruct->unk84) { - switch (shared1000.unk85) + switch (gEasyChatStruct->unk85) { case 0: sub_80E682C(sub_80E6BC0); @@ -707,7 +705,7 @@ void sub_80E6AE4(void) } else { - shared1000.unk27 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; + gEasyChatStruct->unk27 = gEasyChatStruct->unk86 * gEasyChatStruct->unk83 + gEasyChatStruct->unk85; sub_80E7574(); sub_80E682C(sub_80E6F68); return; @@ -721,21 +719,21 @@ void sub_80E6AE4(void) void sub_80E6BC0(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: sub_80E8398(2); - if (shared1000.unk8 == 6) + if (gEasyChatStruct->unk8 == 6) { sub_80E91D4(6); - shared1000.unk24 = 100; + gEasyChatStruct->unk24 = 100; } else { sub_80E91D4(2); DisplayYesNoMenu(23, 8, 1); MoveMenuCursor(1); - shared1000.unk24++; + gEasyChatStruct->unk24++; } break; case 1: @@ -745,11 +743,11 @@ void sub_80E6BC0(void) sub_80E7D6C(); sub_80E98C4(); sub_80E95A4(); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case -1: case 1: - shared1000.unk24++; + gEasyChatStruct->unk24++; break; } break; @@ -766,25 +764,25 @@ void sub_80E6BC0(void) void sub_80E6C84(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: sub_80E8398(2); sub_80E91D4(3); DisplayYesNoMenu(23, 8, 0); MoveMenuCursor(1); - if (shared1000.unk8 == 9 - || shared1000.unk8 == 4 - || shared1000.unk8 == 7 - || shared1000.unk8 == 8 - || shared1000.unk8 == 10 - || shared1000.unk8 == 11 - || shared1000.unk8 == 12 - || shared1000.unk8 == 5 - || shared1000.unk8 == 13) - shared1000.unk24 = 2; + if (gEasyChatStruct->unk8 == 9 + || gEasyChatStruct->unk8 == 4 + || gEasyChatStruct->unk8 == 7 + || gEasyChatStruct->unk8 == 8 + || gEasyChatStruct->unk8 == 10 + || gEasyChatStruct->unk8 == 11 + || gEasyChatStruct->unk8 == 12 + || gEasyChatStruct->unk8 == 5 + || gEasyChatStruct->unk8 == 13) + gEasyChatStruct->unk24 = 2; else - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 1: switch (ProcessMenuInputNoWrap_()) @@ -793,11 +791,11 @@ void sub_80E6C84(void) sub_80E91D4(4); DisplayYesNoMenu(23, 8, 0); MoveMenuCursor(1); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case -1: case 1: - shared1000.unk24 = 0xFF; + gEasyChatStruct->unk24 = 0xFF; break; } break; @@ -810,7 +808,7 @@ void sub_80E6C84(void) break; case -1: case 1: - shared1000.unk24 = 0xFF; + gEasyChatStruct->unk24 = 0xFF; break; } break; @@ -824,32 +822,32 @@ void sub_80E6C84(void) void sub_80E6D7C(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: sub_80E8398(2); if (sub_80E8054()) { sub_80E91D4(5); - shared1000.unk24 = 10; + gEasyChatStruct->unk24 = 10; break; } - if (shared1000.unk8 == 9) + if (gEasyChatStruct->unk8 == 9) { if (sub_80E7FA8() == 0) { sub_80E91D4(8); - shared1000.unk24 = 10; + gEasyChatStruct->unk24 = 10; break; } - if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) + if (gEasyChatStruct->unkC[0] == 0xFFFF || gEasyChatStruct->unkC[1] == 0xFFFF) { sub_80E91D4(9); - shared1000.unk24 = 10; + gEasyChatStruct->unk24 = 10; break; } } - if (shared1000.unk8 == 4 && sub_80E7FA8() == 0) + if (gEasyChatStruct->unk8 == 4 && sub_80E7FA8() == 0) { sub_80E682C(sub_80E6C84); } @@ -859,7 +857,7 @@ void sub_80E6D7C(void) sub_80E9744(); DisplayYesNoMenu(23, 8, 0); MoveMenuCursor(0); - shared1000.unk24++; + gEasyChatStruct->unk24++; } break; case 1: @@ -868,16 +866,16 @@ void sub_80E6D7C(void) case 0: gSpecialVar_Result = (sub_80E7FA8() != 0); sub_80E7D9C(); - if (shared1000.unk8 == 0) + if (gEasyChatStruct->unk8 == 0) gSpecialVar_0x8004 = sub_80E8094(); - if (shared1000.unk8 == 9) // dewford trend? + if (gEasyChatStruct->unk8 == 9) // dewford trend? { sub_80E81C0(); - gSpecialVar_0x8004 = sub_80FA364(&shared1000.unk9C7C); + gSpecialVar_0x8004 = sub_80FA364(&gEasyChatStruct->unk9C7C); } - if (shared1000.unk8 == 13) + if (gEasyChatStruct->unk8 == 13) { - if (shared1000.unkC[0] == 0xFFFF || shared1000.unkC[1] == 0xFFFF) + if (gEasyChatStruct->unkC[0] == 0xFFFF || gEasyChatStruct->unkC[1] == 0xFFFF) gSpecialVar_Result = 0; gSpecialVar_0x8004 = sub_80E810C(); } @@ -887,9 +885,9 @@ void sub_80E6D7C(void) case 1: HandleDestroyMenuCursors(); sub_80E81FC(); - if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) + if (gEasyChatStruct->unk8 == 6 && sub_80E7FA8() != 0) { - shared1000.unk24 = 100; + gEasyChatStruct->unk24 = 100; } else { @@ -905,11 +903,11 @@ void sub_80E6D7C(void) break; case 100: sub_80E91D4(7); - shared1000.unk24++; + gEasyChatStruct->unk24++; // fall through case 101: if (gMain.newKeys & A_BUTTON) - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 102: sub_80E7E50(); @@ -921,7 +919,7 @@ void sub_80E6D7C(void) void sub_80E6F68(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: sub_80E8398(1); @@ -929,7 +927,7 @@ void sub_80E6F68(void) sub_80E683C(); sub_80E9974(); sub_80E9E98(); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 1: if (sub_80E9EA8() != 0) @@ -945,31 +943,31 @@ void sub_80E6F68(void) void sub_80E6FC8(void) { - shared1000.unk96 = sub_80E77C8(); - if (shared1000.unk1C0 != 0) + gEasyChatStruct->unk96 = sub_80E77C8(); + if (gEasyChatStruct->unk1C0 != 0) { PlaySE(SE_SELECT); - shared1000.unk1C4 = sub_80E6FC8; + gEasyChatStruct->unk1C4 = sub_80E6FC8; sub_80E682C(sub_80E7458); } else { - if (shared1000.unk96) + if (gEasyChatStruct->unk96) PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) { - if (shared1000.unk1B7 != 0) + if (gEasyChatStruct->unk1B7 != 0) { PlaySE(SE_SELECT); - switch (shared1000.unk1A8) + switch (gEasyChatStruct->unk1A8) { case 1: sub_80E682C(sub_80E718C); break; case 2: - if (shared1000.unk8 != 6) + if (gEasyChatStruct->unk8 != 6) { - sub_80E7F00(shared1000.unk27, 0xFFFF); + sub_80E7F00(gEasyChatStruct->unk27, 0xFFFF); sub_80E7574(); sub_80E95A4(); } @@ -981,8 +979,8 @@ void sub_80E6FC8(void) } else { - if (shared1000.unk26 == 0 - || shared1000.unk4142[shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]] != 0) + if (gEasyChatStruct->unk26 == 0 + || gEasyChatStruct->unk4142[gEasyChatStruct->unk40[gEasyChatStruct->unk1A8][gEasyChatStruct->unk1A9]] != 0) { PlaySE(SE_SELECT); sub_80E7AD4(); @@ -1003,22 +1001,22 @@ void sub_80E6FC8(void) void sub_80E7114(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: sub_80E8504(); sub_80E9E98(); sub_80E88F0(); sub_80E8D8C(0); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 1: case 2: - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 3: if (sub_80E9F50() != 0) - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 4: sub_80E682C(sub_80E6AC4); @@ -1028,27 +1026,27 @@ void sub_80E7114(void) void sub_80E718C(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: sub_80E8504(); sub_80E9E98(); sub_80E88F0(); - shared1000.unk24++; + gEasyChatStruct->unk24++; sub_80E8D54(); break; case 1: if (sub_80E9FD4() != 0) { - shared1000.unk26 = !shared1000.unk26; + gEasyChatStruct->unk26 = !gEasyChatStruct->unk26; sub_80E683C(); sub_80E9974(); sub_80E9E98(); - shared1000.unk24++; + gEasyChatStruct->unk24++; } break; default: - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 8: if (sub_80EA014() != 0) @@ -1063,10 +1061,10 @@ void sub_80E718C(void) void sub_80E7218(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { default: - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 8: sub_80E8D8C(0); @@ -1075,13 +1073,13 @@ void sub_80E7218(void) sub_80E68E8(); sub_80E88F0(); sub_80E9E98(); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 9: if (sub_80EA050() != 0) { sub_80E9C94(); - shared1000.unk24++; + gEasyChatStruct->unk24++; } break; case 10: @@ -1096,16 +1094,16 @@ void sub_80E7218(void) void sub_80E7294(void) { - shared1000.unk1B9 = sub_80E7B40(); - if (shared1000.unk1C0 != 0) + gEasyChatStruct->unk1B9 = sub_80E7B40(); + if (gEasyChatStruct->unk1C0 != 0) { PlaySE(SE_SELECT); - shared1000.unk1C4 = sub_80E7294; + gEasyChatStruct->unk1C4 = sub_80E7294; sub_80E682C(sub_80E7458); } else { - if (shared1000.unk1B9) + if (gEasyChatStruct->unk1B9) PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) { @@ -1121,7 +1119,7 @@ void sub_80E7294(void) void sub_80E7324(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: if (!sub_80E7DD0()) @@ -1132,22 +1130,22 @@ void sub_80E7324(void) { sub_80E88F0(); sub_80E87CC(0); - shared1000.unk24++; + gEasyChatStruct->unk24++; } break; case 1: - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 2: sub_80E9E98(); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 3: if (sub_80EA184() != 0) - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 4: - if (shared1000.unk8 == 6 && sub_80E7FA8() != 0) + if (gEasyChatStruct->unk8 == 6 && sub_80E7FA8() != 0) sub_80E682C(sub_80E6D7C); else sub_80E682C(sub_80E6AC4); @@ -1157,30 +1155,30 @@ void sub_80E7324(void) void sub_80E73D0(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: sub_80E87CC(0); sub_80E88F0(); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 1: sub_80E9AD4(); sub_80E9E98(); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 2: if (sub_80EA0E4() != 0) { sub_80E8D8C(1); sub_80E9A14(); - shared1000.unk24++; + gEasyChatStruct->unk24++; } break; case 3: sub_80E8420(); sub_80E8958(0); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 4: sub_80E9974(); @@ -1191,34 +1189,34 @@ void sub_80E73D0(void) void sub_80E7458(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: - if (shared1000.unk1C4 == sub_80E6FC8) + if (gEasyChatStruct->unk1C4 == sub_80E6FC8) sub_80E9D7C(); else sub_80E9D00(); - sub_80E9E08(shared1000.unk1BE); - shared1000.unk24++; + sub_80E9E08(gEasyChatStruct->unk1BE); + gEasyChatStruct->unk24++; break; case 1: if (sub_80E9E54()) { - if (shared1000.unk1C4 == sub_80E6FC8) + if (gEasyChatStruct->unk1C4 == sub_80E6FC8) { sub_80E9D7C(); - shared1000.unk1B5 += shared1000.unk1C0; + gEasyChatStruct->unk1B5 += gEasyChatStruct->unk1C0; sub_80E7A98(); - shared1000.unk96 = TRUE; + gEasyChatStruct->unk96 = TRUE; } else { - shared1000.unk9A29 += shared1000.unk1C0; + gEasyChatStruct->unk9A29 += gEasyChatStruct->unk1C0; sub_80E7D30(); - shared1000.unk1B9 = 1; + gEasyChatStruct->unk1B9 = 1; } - shared1000.unk1BE = 2; - sub_80E682C(shared1000.unk1C4); + gEasyChatStruct->unk1BE = 2; + sub_80E682C(gEasyChatStruct->unk1C4); } break; } @@ -1226,28 +1224,28 @@ void sub_80E7458(void) void sub_80E752C(void) { - switch (shared1000.unk24) + switch (gEasyChatStruct->unk24) { case 0: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - shared1000.unk24++; + gEasyChatStruct->unk24++; break; case 1: if (!UpdatePaletteFade()) - SetMainCallback2(shared1000.unk0); + SetMainCallback2(gEasyChatStruct->unk0); break; } } void sub_80E7574(void) { - if (shared1000.unk8 == 1 - && shared1000.unk7E[shared1000.unk86] == 2 - && sub_80EB2D4(shared1000.unkC[shared1000.unk27]) != 7) - shared1000.unk7D = 1; + if (gEasyChatStruct->unk8 == 1 + && gEasyChatStruct->unk7E[gEasyChatStruct->unk86] == 2 + && sub_80EB2D4(gEasyChatStruct->unkC[gEasyChatStruct->unk27]) != 7) + gEasyChatStruct->unk7D = 1; else - shared1000.unk7D = 0; - shared1000.unk7D = 0; // What the hell? + gEasyChatStruct->unk7D = 0; + gEasyChatStruct->unk7D = 0; // What the hell? } bool8 sub_80E75D8(void) @@ -1257,45 +1255,45 @@ bool8 sub_80E75D8(void) if (gMain.newKeys & START_BUTTON) { - shared1000.unk86 = shared1000.unk84; - shared1000.unk85 = 2; + gEasyChatStruct->unk86 = gEasyChatStruct->unk84; + gEasyChatStruct->unk85 = 2; return TRUE; } if (gMain.newAndRepeatedKeys & DPAD_UP) { - shared1000.unk86--; - if (shared1000.unk86 < 0) - shared1000.unk86 = shared1000.unk84; + gEasyChatStruct->unk86--; + if (gEasyChatStruct->unk86 < 0) + gEasyChatStruct->unk86 = gEasyChatStruct->unk84; pressedUpDown = TRUE; } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - shared1000.unk86++; - if (shared1000.unk86 > shared1000.unk84) - shared1000.unk86 = 0; + gEasyChatStruct->unk86++; + if (gEasyChatStruct->unk86 > gEasyChatStruct->unk84) + gEasyChatStruct->unk86 = 0; pressedUpDown = TRUE; } if (pressedUpDown) { - if (shared1000.unk9 == 2) + if (gEasyChatStruct->unk9 == 2) { - if (shared1000.unk86 == shared1000.unk84) - shared1000.unk85 = 2; + if (gEasyChatStruct->unk86 == gEasyChatStruct->unk84) + gEasyChatStruct->unk85 = 2; else - shared1000.unk85 = 0; + gEasyChatStruct->unk85 = 0; return TRUE; } else { - if (shared1000.unk85 >= shared1000.unk83) - shared1000.unk85 = shared1000.unk83 - 1; - if (shared1000.unk86 != shared1000.unk84) + if (gEasyChatStruct->unk85 >= gEasyChatStruct->unk83) + gEasyChatStruct->unk85 = gEasyChatStruct->unk83 - 1; + if (gEasyChatStruct->unk86 != gEasyChatStruct->unk84) { - r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; - if (r0 >= shared1000.unkA) - shared1000.unk85 = r0 - shared1000.unkA; + r0 = gEasyChatStruct->unk86 * gEasyChatStruct->unk83 + gEasyChatStruct->unk85; + if (r0 >= gEasyChatStruct->unkA) + gEasyChatStruct->unk85 = r0 - gEasyChatStruct->unkA; } return TRUE; } @@ -1304,36 +1302,36 @@ bool8 sub_80E75D8(void) { if (gMain.newAndRepeatedKeys & DPAD_LEFT) { - if (--shared1000.unk85 < 0) + if (--gEasyChatStruct->unk85 < 0) { - if (shared1000.unk86 == shared1000.unk84) + if (gEasyChatStruct->unk86 == gEasyChatStruct->unk84) { - shared1000.unk85 = 2; + gEasyChatStruct->unk85 = 2; } else { - shared1000.unk85 = shared1000.unk83 - 1; - r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; - if (r0 >= shared1000.unkA) - shared1000.unk85 = r0 - shared1000.unkA; + gEasyChatStruct->unk85 = gEasyChatStruct->unk83 - 1; + r0 = gEasyChatStruct->unk86 * gEasyChatStruct->unk83 + gEasyChatStruct->unk85; + if (r0 >= gEasyChatStruct->unkA) + gEasyChatStruct->unk85 = r0 - gEasyChatStruct->unkA; } } return TRUE; } if (gMain.newAndRepeatedKeys & DPAD_RIGHT) { - if (shared1000.unk86 == shared1000.unk84) + if (gEasyChatStruct->unk86 == gEasyChatStruct->unk84) { - if (++shared1000.unk85 > 2) - shared1000.unk85 = 0; + if (++gEasyChatStruct->unk85 > 2) + gEasyChatStruct->unk85 = 0; } else { - if (++shared1000.unk85 >= shared1000.unk83) - shared1000.unk85 = 0; - r0 = shared1000.unk86 * shared1000.unk83 + shared1000.unk85; - if (r0 >= shared1000.unkA) - shared1000.unk85 = r0 - shared1000.unkA; + if (++gEasyChatStruct->unk85 >= gEasyChatStruct->unk83) + gEasyChatStruct->unk85 = 0; + r0 = gEasyChatStruct->unk86 * gEasyChatStruct->unk83 + gEasyChatStruct->unk85; + if (r0 >= gEasyChatStruct->unkA) + gEasyChatStruct->unk85 = r0 - gEasyChatStruct->unkA; } return TRUE; } @@ -1346,41 +1344,41 @@ bool8 sub_80E77C8(void) bool8 pressedLeftRight = FALSE; bool8 pressedUpDown; - if (shared1000.unk1B7 != 0) + if (gEasyChatStruct->unk1B7 != 0) { if (gMain.newAndRepeatedKeys & DPAD_UP) { - shared1000.unk1A8--; - if (shared1000.unk1A8 < 1) - shared1000.unk1A8 = 3; + gEasyChatStruct->unk1A8--; + if (gEasyChatStruct->unk1A8 < 1) + gEasyChatStruct->unk1A8 = 3; return TRUE; } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - shared1000.unk1A8++; - if (shared1000.unk1A8 > 3) - shared1000.unk1A8 = 1; + gEasyChatStruct->unk1A8++; + if (gEasyChatStruct->unk1A8 > 3) + gEasyChatStruct->unk1A8 = 1; return TRUE; } } else { - if (shared1000.unk26 == 1) + if (gEasyChatStruct->unk26 == 1) { pressedUpDown = FALSE; if (gMain.newAndRepeatedKeys & DPAD_UP) { - shared1000.unk1A8--; - if (shared1000.unk1A8 < 0) - shared1000.unk1A8 = 3; + gEasyChatStruct->unk1A8--; + if (gEasyChatStruct->unk1A8 < 0) + gEasyChatStruct->unk1A8 = 3; pressedUpDown = TRUE; } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - shared1000.unk1A8++; - if (shared1000.unk1A8 > 3) - shared1000.unk1A8 = 0; + gEasyChatStruct->unk1A8++; + if (gEasyChatStruct->unk1A8 > 3) + gEasyChatStruct->unk1A8 = 0; pressedUpDown = TRUE; } @@ -1393,30 +1391,30 @@ bool8 sub_80E77C8(void) else { pressedUpDown = FALSE; - shared1000.unk1C0 = 0; + gEasyChatStruct->unk1C0 = 0; if (gMain.newAndRepeatedKeys & DPAD_UP) { - if (shared1000.unk1A8 == 0) + if (gEasyChatStruct->unk1A8 == 0) return FALSE; - shared1000.unk1A8--; - if (shared1000.unk1A8 < shared1000.unk1B5) - shared1000.unk1C0 = -1; + gEasyChatStruct->unk1A8--; + if (gEasyChatStruct->unk1A8 < gEasyChatStruct->unk1B5) + gEasyChatStruct->unk1C0 = -1; pressedUpDown = TRUE; } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - if (shared1000.unk1A8 >= shared1000.unk1B6 - 1) + if (gEasyChatStruct->unk1A8 >= gEasyChatStruct->unk1B6 - 1) return FALSE; - shared1000.unk1A8++; - if (shared1000.unk1A8 > shared1000.unk1B5 + 3) - shared1000.unk1C0 = 1; + gEasyChatStruct->unk1A8++; + if (gEasyChatStruct->unk1A8 > gEasyChatStruct->unk1B5 + 3) + gEasyChatStruct->unk1C0 = 1; pressedUpDown = TRUE; } if (pressedUpDown) { - if (shared1000.unk1C0 == 0) + if (gEasyChatStruct->unk1C0 == 0) { sub_80E7A98(); return TRUE; @@ -1428,41 +1426,41 @@ bool8 sub_80E77C8(void) if (gMain.newAndRepeatedKeys & DPAD_LEFT) { - if (shared1000.unk1A9 != 0) - shared1000.unk1A9--; + if (gEasyChatStruct->unk1A9 != 0) + gEasyChatStruct->unk1A9--; else - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; + gEasyChatStruct->unk1A9 = gEasyChatStruct->unk1AA[gEasyChatStruct->unk1A8]; pressedLeftRight = TRUE; } else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) { - if (shared1000.unk1B7 != 0 - || shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]) - shared1000.unk1A9 = 0; + if (gEasyChatStruct->unk1B7 != 0 + || gEasyChatStruct->unk1A9 == gEasyChatStruct->unk1AA[gEasyChatStruct->unk1A8]) + gEasyChatStruct->unk1A9 = 0; else - shared1000.unk1A9++; + gEasyChatStruct->unk1A9++; pressedLeftRight = TRUE; } if (pressedLeftRight) { - s8 r9 = shared1000.unk1B7; + s8 r9 = gEasyChatStruct->unk1B7; - shared1000.unk1B7 = (shared1000.unk1A9 == shared1000.unk1AA[shared1000.unk1A8]); - if (shared1000.unk1B7 != 0) + gEasyChatStruct->unk1B7 = (gEasyChatStruct->unk1A9 == gEasyChatStruct->unk1AA[gEasyChatStruct->unk1A8]); + if (gEasyChatStruct->unk1B7 != 0) { - shared1000.unk1A8 -= shared1000.unk1B5; - if (shared1000.unk1A8 == 0) + gEasyChatStruct->unk1A8 -= gEasyChatStruct->unk1B5; + if (gEasyChatStruct->unk1A8 == 0) { - shared1000.unk1A8 = 1; - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8]; + gEasyChatStruct->unk1A8 = 1; + gEasyChatStruct->unk1A9 = gEasyChatStruct->unk1AA[gEasyChatStruct->unk1A8]; } } else if (r9 != 0) { - shared1000.unk1A8 += shared1000.unk1B5; - if (shared1000.unk1A9 != 0) - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; + gEasyChatStruct->unk1A8 += gEasyChatStruct->unk1B5; + if (gEasyChatStruct->unk1A9 != 0) + gEasyChatStruct->unk1A9 = gEasyChatStruct->unk1AA[gEasyChatStruct->unk1A8] - 1; } return TRUE; } @@ -1472,43 +1470,43 @@ bool8 sub_80E77C8(void) void sub_80E7A98(void) { - if (shared1000.unk1A9 >= shared1000.unk1AA[shared1000.unk1A8]) - shared1000.unk1A9 = shared1000.unk1AA[shared1000.unk1A8] - 1; + if (gEasyChatStruct->unk1A9 >= gEasyChatStruct->unk1AA[gEasyChatStruct->unk1A8]) + gEasyChatStruct->unk1A9 = gEasyChatStruct->unk1AA[gEasyChatStruct->unk1A8] - 1; } void sub_80E7AD4(void) { - if (shared1000.unk26 == 0) - shared1000.unk1B8 = shared1000.unk2A[shared1000.unk1A8][shared1000.unk1A9]; + if (gEasyChatStruct->unk26 == 0) + gEasyChatStruct->unk1B8 = gEasyChatStruct->unk2A[gEasyChatStruct->unk1A8][gEasyChatStruct->unk1A9]; else - shared1000.unk1B8 = shared1000.unk40[shared1000.unk1A8][shared1000.unk1A9]; + gEasyChatStruct->unk1B8 = gEasyChatStruct->unk40[gEasyChatStruct->unk1A8][gEasyChatStruct->unk1A9]; } bool8 sub_80E7B40(void) { bool8 pressedUpDown = FALSE; - shared1000.unk1C0 = 0; + gEasyChatStruct->unk1C0 = 0; if (gMain.newAndRepeatedKeys & DPAD_UP) { - if (shared1000.unk99A4 == 0) + if (gEasyChatStruct->unk99A4 == 0) return FALSE; - shared1000.unk99A4--; - if (shared1000.unk99A4 < shared1000.unk9A29) + gEasyChatStruct->unk99A4--; + if (gEasyChatStruct->unk99A4 < gEasyChatStruct->unk9A29) { - shared1000.unk1C0 = -1; + gEasyChatStruct->unk1C0 = -1; return FALSE; } pressedUpDown = TRUE; } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - if (shared1000.unk99A4 >= shared1000.unk9A28 - 1) + if (gEasyChatStruct->unk99A4 >= gEasyChatStruct->unk9A28 - 1) return FALSE; - shared1000.unk99A4++; - if (shared1000.unk99A4 >= shared1000.unk9A29 + 4) + gEasyChatStruct->unk99A4++; + if (gEasyChatStruct->unk99A4 >= gEasyChatStruct->unk9A29 + 4) { - shared1000.unk1C0 = 1; + gEasyChatStruct->unk1C0 = 1; return FALSE; } pressedUpDown = TRUE; @@ -1522,40 +1520,40 @@ bool8 sub_80E7B40(void) if (gMain.newAndRepeatedKeys & DPAD_LEFT) { - shared1000.unk99A5--; - if (shared1000.unk99A5 < 0) - shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; + gEasyChatStruct->unk99A5--; + if (gEasyChatStruct->unk99A5 < 0) + gEasyChatStruct->unk99A5 = gEasyChatStruct->unk99A6[gEasyChatStruct->unk99A4] - 1; return TRUE; } else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) { - shared1000.unk99A5++; - if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) - shared1000.unk99A5 = 0; + gEasyChatStruct->unk99A5++; + if (gEasyChatStruct->unk99A5 >= gEasyChatStruct->unk99A6[gEasyChatStruct->unk99A4]) + gEasyChatStruct->unk99A5 = 0; return TRUE; } if (gMain.newKeys & START_BUTTON) { - if (shared1000.unk9A29 != 0) + if (gEasyChatStruct->unk9A29 != 0) { - shared1000.unk1C0 = -shared1000.unk9A29; - if (shared1000.unk1C0 < -4) - shared1000.unk1C0 = -4; + gEasyChatStruct->unk1C0 = -gEasyChatStruct->unk9A29; + if (gEasyChatStruct->unk1C0 < -4) + gEasyChatStruct->unk1C0 = -4; } - shared1000.unk99A4 += shared1000.unk1C0; - shared1000.unk1BE = 4; + gEasyChatStruct->unk99A4 += gEasyChatStruct->unk1C0; + gEasyChatStruct->unk1BE = 4; } else if (gMain.newKeys & SELECT_BUTTON) { - if (shared1000.unk9A29 < shared1000.unk9A28 - 4) + if (gEasyChatStruct->unk9A29 < gEasyChatStruct->unk9A28 - 4) { - shared1000.unk1C0 = shared1000.unk9A28 - 4 - shared1000.unk9A29; - if (shared1000.unk1C0 > 4) - shared1000.unk1C0 = 4; + gEasyChatStruct->unk1C0 = gEasyChatStruct->unk9A28 - 4 - gEasyChatStruct->unk9A29; + if (gEasyChatStruct->unk1C0 > 4) + gEasyChatStruct->unk1C0 = 4; } - shared1000.unk99A4 += shared1000.unk1C0; - shared1000.unk1BE = 4; + gEasyChatStruct->unk99A4 += gEasyChatStruct->unk1C0; + gEasyChatStruct->unk1BE = 4; } return FALSE; @@ -1563,15 +1561,15 @@ bool8 sub_80E7B40(void) void sub_80E7D30(void) { - if (shared1000.unk99A5 >= shared1000.unk99A6[shared1000.unk99A4]) - shared1000.unk99A5 = shared1000.unk99A6[shared1000.unk99A4] - 1; + if (gEasyChatStruct->unk99A5 >= gEasyChatStruct->unk99A6[gEasyChatStruct->unk99A4]) + gEasyChatStruct->unk99A5 = gEasyChatStruct->unk99A6[gEasyChatStruct->unk99A4] - 1; } void sub_80E7D6C(void) { u16 i; - for (i = 0; i < shared1000.unkA; i++) + for (i = 0; i < gEasyChatStruct->unkA; i++) sub_80E7F00(i, 0xFFFF); } @@ -1579,20 +1577,20 @@ void sub_80E7D9C(void) { u16 i; - for (i = 0; i < shared1000.unkA; i++) - shared1000.unk4[i] = shared1000.unkC[i]; + for (i = 0; i < gEasyChatStruct->unkA; i++) + gEasyChatStruct->unk4[i] = gEasyChatStruct->unkC[i]; } bool8 sub_80E7DD0(void) { - u16 r4 = shared1000.unk9A2A[shared1000.unk99A4][shared1000.unk99A5]; + u16 r4 = gEasyChatStruct->unk9A2A[gEasyChatStruct->unk99A4][gEasyChatStruct->unk99A5]; - if (shared1000.unk7D != 0 - && shared1000.unk7E[shared1000.unk86] > 1 + if (gEasyChatStruct->unk7D != 0 + && gEasyChatStruct->unk7E[gEasyChatStruct->unk86] > 1 && sub_80EB2D4(r4) == 7) return FALSE; - sub_80E7F00(shared1000.unk27, r4); + sub_80E7F00(gEasyChatStruct->unk27, r4); sub_80E95A4(); return TRUE; } @@ -1603,13 +1601,13 @@ void sub_80E7E50(void) u16 i; u16 j; - for (i = 0; i < shared1000.unk84; i++) + for (i = 0; i < gEasyChatStruct->unk84; i++) { - shared1000.unk7E[i] = 0; - for (j = 0; j < shared1000.unk83; j++) + gEasyChatStruct->unk7E[i] = 0; + for (j = 0; j < gEasyChatStruct->unk83; j++) { - shared1000.unkC[r5] = shared1000.unk4[r5]; - shared1000.unk8C[i][j] = 0; + gEasyChatStruct->unkC[r5] = gEasyChatStruct->unk4[r5]; + gEasyChatStruct->unk8C[i][j] = 0; r5++; } } @@ -1617,24 +1615,24 @@ void sub_80E7E50(void) void sub_80E7F00(u16 a, u16 b) { - u16 r5 = a / shared1000.unk83; - u16 r8 = a % shared1000.unk83; - u16 r4 = sub_80EB2D4(shared1000.unkC[a]); + u16 r5 = a / gEasyChatStruct->unk83; + u16 r8 = a % gEasyChatStruct->unk83; + u16 r4 = sub_80EB2D4(gEasyChatStruct->unkC[a]); u16 r3 = sub_80EB2D4(b); if (r4 == 7) { if (r3 != 7) - shared1000.unk7E[r5]--; + gEasyChatStruct->unk7E[r5]--; } else { if (r3 == 7) - shared1000.unk7E[r5]++; + gEasyChatStruct->unk7E[r5]++; } r3 = 0; - shared1000.unk8C[r5][r8] = r3; - shared1000.unkC[a] = b; + gEasyChatStruct->unk8C[r5][r8] = r3; + gEasyChatStruct->unkC[a] = b; } u8 sub_80E7FA8(void) @@ -1644,12 +1642,12 @@ u8 sub_80E7FA8(void) u8 *r1; u8 *r2; - for (i = 0; i < shared1000.unkA; i++) + for (i = 0; i < gEasyChatStruct->unkA; i++) { - sub_80EB218(shared1000.unk9E14, shared1000.unk4[i], 0); - sub_80EB218(shared1000.unk9E41, shared1000.unkC[i], 0); - r1 = shared1000.unk9E14; - r2 = shared1000.unk9E41; + sub_80EB218(gEasyChatStruct->unk9E14, gEasyChatStruct->unk4[i], 0); + sub_80EB218(gEasyChatStruct->unk9E41, gEasyChatStruct->unkC[i], 0); + r1 = gEasyChatStruct->unk9E14; + r2 = gEasyChatStruct->unk9E41; while (*r1 == *r2 && *r1 != 0xFF) { r1++; @@ -1665,9 +1663,9 @@ bool8 sub_80E8054(void) { u16 i; - for (i = 0; i < shared1000.unkA; i++) + for (i = 0; i < gEasyChatStruct->unkA; i++) { - if (shared1000.unkC[i] != 0xFFFF) + if (gEasyChatStruct->unkC[i] != 0xFFFF) return FALSE; } return TRUE; @@ -1682,10 +1680,10 @@ bool8 sub_80E8094(void) for (i = 0; i < 4; i++) { - sub_80EB218(shared1000.unk9E14, shared1000.unkC[i], 0); - sub_80EB218(shared1000.unk9E41, gMysteryEventPhrase[i], 0); - r3 = shared1000.unk9E14; - r4 = shared1000.unk9E41; + sub_80EB218(gEasyChatStruct->unk9E14, gEasyChatStruct->unkC[i], 0); + sub_80EB218(gEasyChatStruct->unk9E41, gMysteryEventPhrase[i], 0); + r3 = gEasyChatStruct->unk9E14; + r4 = gEasyChatStruct->unk9E41; while (*r3 != 0xFF && *r4 != 0xFF) { if (*r3++ != *r4++) @@ -1706,16 +1704,16 @@ u8 sub_80E810C(void) u8 *ptr; u8 *r3; - ptr = sub_80EB218(shared1000.unk9E6E, shared1000.unkC[0], 0); + ptr = sub_80EB218(gEasyChatStruct->unk9E6E, gEasyChatStruct->unkC[0], 0); *ptr++ = CHAR_SPACE; - sub_80EB218(ptr, shared1000.unkC[1], 0); + sub_80EB218(ptr, gEasyChatStruct->unkC[1], 0); - ptr = sub_80EB218(shared1000.unk9EEE, gBerryMasterWifePhrases[i][0], 0); + ptr = sub_80EB218(gEasyChatStruct->unk9EEE, gBerryMasterWifePhrases[i][0], 0); *ptr++ = CHAR_SPACE; sub_80EB218(ptr, gBerryMasterWifePhrases[i][1], 0); - ptr = shared1000.unk9E6E; - r3 = shared1000.unk9EEE; + ptr = gEasyChatStruct->unk9E6E; + r3 = gEasyChatStruct->unk9EEE; while (*ptr != EOS && *r3 != EOS) { if (*ptr++ != *r3++) @@ -1731,9 +1729,9 @@ void sub_80E81C0(void) { u8 *ptr; - ptr = sub_80EB218(gStringVar2, shared1000.unk9C7C, 0); + ptr = sub_80EB218(gStringVar2, gEasyChatStruct->unk9C7C, 0); *ptr++ = CHAR_SPACE; - sub_80EB218(ptr, shared1000.unk9C7E, 0); + sub_80EB218(ptr, gEasyChatStruct->unk9C7E, 0); } void sub_80E81FC(void) diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 767128750..8a3bb9ab9 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -61,7 +61,7 @@ void sub_80EAC0C(u16 *); void sub_80EAC30(struct UnknownEasyChatStruct1 *, u16, u16, u16, u16, void *); void sub_80EAC48(struct UnknownEasyChatStruct1 *); void sub_80EACBC(void *, u16 *, struct UnknownEasyChatStruct1 *); -u8 *sub_80EAD64(u8 *, u8, int); +u8 *CopyEasyChatGroupName(u8 *, u8, int); u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(u16); bool8 sub_80EB37C(u16); @@ -138,36 +138,36 @@ void sub_80E8268(void) u8 spriteId; spriteId = CreateSprite(&gSpriteTemplate_83DBBFC, 0, 0, 0); - gSprites[spriteId].pos1.y = gUnknown_083DB694->unk8A * 8 + 8; - gSprites[spriteId].pos1.x = gUnknown_083DB694->unk88 * 8 + 4; + gSprites[spriteId].pos1.y = gEasyChatStruct->unk8A * 8 + 8; + gSprites[spriteId].pos1.x = gEasyChatStruct->unk88 * 8 + 4; gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = 0; - gUnknown_083DB694->unk98 = &gSprites[spriteId]; + gEasyChatStruct->unk98 = &gSprites[spriteId]; } void sub_80E82BC(struct Sprite *sprite) { if (sprite->data[1] == 0) { - if (gUnknown_083DB694->unk87) + if (gEasyChatStruct->unk87) { - u16 r5 = gUnknown_083DB694->unk86; - u16 r4 = gUnknown_083DB694->unk85; + u16 r5 = gEasyChatStruct->unk86; + u16 r4 = gEasyChatStruct->unk85; u16 r7 = 0; u16 i; for (i = 0; i < r4; i++) - r7 += gUnknown_083DB694->unk8C[r5][i]; + r7 += gEasyChatStruct->unk8C[r5][i]; - if (r5 == gUnknown_083DB694->unk84) + if (r5 == gEasyChatStruct->unk84) { sprite->pos1.y = 96; sprite->pos1.x = (r4 * 7 + 3) * 8 + 4; } else { - sprite->pos1.y = (gUnknown_083DB694->unk8A + r5 * 2) * 8 + 8; - sprite->pos1.x = (gUnknown_083DB694->unk88 + r7 + r4 * 11) * 8 + 4; + sprite->pos1.y = (gEasyChatStruct->unk8A + r5 * 2) * 8 + 8; + sprite->pos1.x = (gEasyChatStruct->unk88 + r7 + r4 * 11) * 8 + 4; } sprite->pos2.x = -6; @@ -190,19 +190,19 @@ void sub_80E8398(u8 a) switch (a) { case 0: - gUnknown_083DB694->unk98->data[1] = a; - gUnknown_083DB694->unk98->pos2.x = a; - gUnknown_083DB694->unk98->invisible = FALSE; + gEasyChatStruct->unk98->data[1] = a; + gEasyChatStruct->unk98->pos2.x = a; + gEasyChatStruct->unk98->invisible = FALSE; break; case 1: - gUnknown_083DB694->unk98->data[1] = a; - gUnknown_083DB694->unk98->pos2.x = 0; - gUnknown_083DB694->unk98->invisible = FALSE; + gEasyChatStruct->unk98->data[1] = a; + gEasyChatStruct->unk98->pos2.x = 0; + gEasyChatStruct->unk98->invisible = FALSE; break; case 2: - gUnknown_083DB694->unk98->data[1] = 1; - gUnknown_083DB694->unk98->pos2.x = 0; - gUnknown_083DB694->unk98->invisible = TRUE; + gEasyChatStruct->unk98->data[1] = 1; + gEasyChatStruct->unk98->pos2.x = 0; + gEasyChatStruct->unk98->invisible = TRUE; break; } } @@ -356,57 +356,57 @@ void sub_80E8420(void) u8 spriteId; spriteId = CreateSprite(&spriteTemplate_83DBCAC, 0, 0, 3); - gUnknown_083DB694->unk9C = &gSprites[spriteId]; + gEasyChatStruct->unk9C = &gSprites[spriteId]; spriteTemplate_83DBCAC.anims = gSpriteAnimTable_83DBC8C; spriteTemplate_83DBCAC.callback = sub_80E872C; spriteId = CreateSprite(&spriteTemplate_83DBCAC, 0, 0, 4); - gUnknown_083DB694->unkA0 = &gSprites[spriteId]; + gEasyChatStruct->unkA0 = &gSprites[spriteId]; spriteTemplate_83DBCAC.anims = gSpriteAnimTable_83DBC9C; spriteTemplate_83DBCAC.callback = sub_80E8760; spriteId = CreateSprite(&spriteTemplate_83DBCAC, 0, 0, 5); - gUnknown_083DB694->unkA4 = &gSprites[spriteId]; + gEasyChatStruct->unkA4 = &gSprites[spriteId]; - gUnknown_083DB694->unk9C->data[0] = 0; - gUnknown_083DB694->unkA0->data[0] = 0; - gUnknown_083DB694->unkA4->data[0] = 0; + gEasyChatStruct->unk9C->data[0] = 0; + gEasyChatStruct->unkA0->data[0] = 0; + gEasyChatStruct->unkA4->data[0] = 0; - gUnknown_083DB694->unk9C->data[3] = 0x0101 + IndexOfSpritePaletteTag(1) * 16; + gEasyChatStruct->unk9C->data[3] = 0x0101 + IndexOfSpritePaletteTag(1) * 16; sub_80E8534(); - gUnknown_083DB694->unk96 = 1; + gEasyChatStruct->unk96 = 1; REG_BLDCNT = 0x3F40; } void sub_80E8504(void) { - DestroySprite(gUnknown_083DB694->unk9C); - DestroySprite(gUnknown_083DB694->unkA0); - DestroySprite(gUnknown_083DB694->unkA4); + DestroySprite(gEasyChatStruct->unk9C); + DestroySprite(gEasyChatStruct->unkA0); + DestroySprite(gEasyChatStruct->unkA4); } void sub_80E8534(void) { - if (gUnknown_083DB694->unk1B7 != 0) + if (gEasyChatStruct->unk1B7 != 0) gUnknown_020388AC = 1; - else if (gUnknown_083DB694->unk26 == 0) + else if (gEasyChatStruct->unk26 == 0) gUnknown_020388AC = 0; - else if (gUnknown_083DB694->unk1A8 == 0 && gUnknown_083DB694->unk1A9 == 6) + else if (gEasyChatStruct->unk1A8 == 0 && gEasyChatStruct->unk1A9 == 6) gUnknown_020388AC = 2; else gUnknown_020388AC = 3; - gUnknown_083DB694->unk9C->data[2] = gUnknown_020388AC; - gUnknown_083DB694->unkA0->data[2] = gUnknown_020388AC; - gUnknown_083DB694->unkA4->data[2] = gUnknown_020388AC; + gEasyChatStruct->unk9C->data[2] = gUnknown_020388AC; + gEasyChatStruct->unkA0->data[2] = gUnknown_020388AC; + gEasyChatStruct->unkA4->data[2] = gUnknown_020388AC; - StartSpriteAnim(gUnknown_083DB694->unk9C, gUnknown_020388AC); - StartSpriteAnim(gUnknown_083DB694->unkA0, gUnknown_020388AC); - StartSpriteAnim(gUnknown_083DB694->unkA4, gUnknown_020388AC); + StartSpriteAnim(gEasyChatStruct->unk9C, gUnknown_020388AC); + StartSpriteAnim(gEasyChatStruct->unkA0, gUnknown_020388AC); + StartSpriteAnim(gEasyChatStruct->unkA4, gUnknown_020388AC); - gUnknown_083DB694->unk9C->data[5] = 8; - gUnknown_083DB694->unk9C->data[6] = 8; - gUnknown_083DB694->unk9C->data[1] = 0; + gEasyChatStruct->unk9C->data[5] = 8; + gEasyChatStruct->unk9C->data[6] = 8; + gEasyChatStruct->unk9C->data[1] = 0; } const s8 gUnknown_083DBCC4[][7] = @@ -429,19 +429,19 @@ void sub_80E85F8(struct Sprite *sprite) REG_BLDALPHA = (sprite->data[6] << 8) | sprite->data[5]; - if (gUnknown_083DB694->unk96 != 0) + if (gEasyChatStruct->unk96 != 0) { sub_80E8534(); - gUnknown_083DB694->unk9C->data[5] = 8; - gUnknown_083DB694->unk9C->data[6] = 8; - gUnknown_083DB694->unk9C->data[1] = 0; + gEasyChatStruct->unk9C->data[5] = 8; + gEasyChatStruct->unk9C->data[6] = 8; + gEasyChatStruct->unk9C->data[1] = 0; switch (sprite->data[2]) { case 0: - sprite->pos1.x = gUnknown_083DB694->unk1A9 * 88 + 32; - sprite->pos1.y = (gUnknown_083DB694->unk1A8 - gUnknown_083DB694->unk1B5) * 16 + 96; + sprite->pos1.x = gEasyChatStruct->unk1A9 * 88 + 32; + sprite->pos1.y = (gEasyChatStruct->unk1A8 - gEasyChatStruct->unk1B5) * 16 + 96; break; case 1: #if ENGLISH @@ -449,15 +449,15 @@ void sub_80E85F8(struct Sprite *sprite) #else sprite->pos1.x = 214; #endif - sprite->pos1.y = gUnknown_083DB694->unk1A8 * 16 + 96; + sprite->pos1.y = gEasyChatStruct->unk1A8 * 16 + 96; break; case 2: sprite->pos1.x = 151; sprite->pos1.y = 96; break; case 3: - sprite->pos1.x = gUnknown_083DBCC4[gUnknown_083DB694->unk1A8][gUnknown_083DB694->unk1A9] * 8 + 31; - sprite->pos1.y = (gUnknown_083DB694->unk1A8 - gUnknown_083DB694->unk1B5) * 16 + 96; + sprite->pos1.x = gUnknown_083DBCC4[gEasyChatStruct->unk1A8][gEasyChatStruct->unk1A9] * 8 + 31; + sprite->pos1.y = (gEasyChatStruct->unk1A8 - gEasyChatStruct->unk1B5) * 16 + 96; break; } } @@ -466,32 +466,32 @@ void sub_80E85F8(struct Sprite *sprite) void sub_80E872C(struct Sprite *sprite) { - if (gUnknown_083DB694->unk96 != 0 && sprite->data[2] == 0) + if (gEasyChatStruct->unk96 != 0 && sprite->data[2] == 0) { - sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 32; - sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 32; + sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; } } void sub_80E8760(struct Sprite *sprite) { - if (gUnknown_083DB694->unk96 != 0) + if (gEasyChatStruct->unk96 != 0) { switch (sprite->data[2]) { case 0: - sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 64; - sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 64; + sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; break; #if GERMAN case 1: - sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 28; - sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 28; + sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; break; #endif case 2: - sprite->pos1.x = gUnknown_083DB694->unk9C->pos1.x + 21; - sprite->pos1.y = gUnknown_083DB694->unk9C->pos1.y; + sprite->pos1.x = gEasyChatStruct->unk9C->pos1.x + 21; + sprite->pos1.y = gEasyChatStruct->unk9C->pos1.y; break; } } @@ -499,16 +499,16 @@ void sub_80E8760(struct Sprite *sprite) void sub_80E87A4(u8 a) { - gUnknown_083DB694->unkA8->data[1] = (a == 0); - gUnknown_083DB694->unkA8->pos2.x = 0; + gEasyChatStruct->unkA8->data[1] = (a == 0); + gEasyChatStruct->unkA8->pos2.x = 0; } void sub_80E87CC(u8 a) { - gUnknown_083DB694->unkA8->invisible = (a == 0); + gEasyChatStruct->unkA8->invisible = (a == 0); sub_80E87A4(a); if (a != 0) - gUnknown_083DB694->unk1B9 = 1; + gEasyChatStruct->unk1B9 = 1; } void sub_80E8818(void) @@ -517,8 +517,8 @@ void sub_80E8818(void) gSprites[spriteId].data[0] = 0; gSprites[spriteId].data[1] = 0; - gUnknown_083DB694->unkA8 = &gSprites[spriteId]; - gUnknown_083DB694->unkA8->callback = sub_80E8860; + gEasyChatStruct->unkA8 = &gSprites[spriteId]; + gEasyChatStruct->unkA8->callback = sub_80E8860; sub_80E87CC(0); } @@ -526,10 +526,10 @@ void sub_80E8860(struct Sprite *sprite) { if (sprite->data[1] == 0) { - if (gUnknown_083DB694->unk1B9 != 0) + if (gEasyChatStruct->unk1B9 != 0) { - sprite->pos1.x = gUnknown_083DB694->unk99A5 * 88 + 44; - sprite->pos1.y = (gUnknown_083DB694->unk99A4 - gUnknown_083DB694->unk9A29) * 16 + 96; + sprite->pos1.x = gEasyChatStruct->unk99A5 * 88 + 44; + sprite->pos1.y = (gEasyChatStruct->unk99A4 - gEasyChatStruct->unk9A29) * 16 + 96; sprite->pos2.x = -6; sprite->data[0] = 0; } @@ -553,12 +553,12 @@ void sub_80E88F0(void) for (i = 0; i < 2; i++) { - gUnknown_083DB694->unkAC[i]->invisible = TRUE; - gUnknown_083DB694->unkAC[i]->data[1] = 0; - gUnknown_083DB694->unkB4[i]->invisible = TRUE; - gUnknown_083DB694->unkB4[i]->data[1] = 0; + gEasyChatStruct->unkAC[i]->invisible = TRUE; + gEasyChatStruct->unkAC[i]->data[1] = 0; + gEasyChatStruct->unkB4[i]->invisible = TRUE; + gEasyChatStruct->unkB4[i]->data[1] = 0; } - gUnknown_083DB694->unk9C70 = 0; + gEasyChatStruct->unk9C70 = 0; } void sub_80E8958(u8 animNum) @@ -569,36 +569,36 @@ void sub_80E8958(u8 animNum) if (animNum == 0) { r9 = 100; - gUnknown_083DB694->unk9C6C = &gUnknown_083DB694->unk1B5; - if (gUnknown_083DB694->unk26 == 0) - gUnknown_083DB694->unk9C71 = gUnknown_083DB694->unk1B6 - 4; + gEasyChatStruct->unk9C6C = &gEasyChatStruct->unk1B5; + if (gEasyChatStruct->unk26 == 0) + gEasyChatStruct->unk9C71 = gEasyChatStruct->unk1B6 - 4; else - gUnknown_083DB694->unk9C71 = 0; + gEasyChatStruct->unk9C71 = 0; } else { r9 = 120; - gUnknown_083DB694->unk9C6C = &gUnknown_083DB694->unk9A29; - gUnknown_083DB694->unk9C71 = gUnknown_083DB694->unk9A28 - 4; + gEasyChatStruct->unk9C6C = &gEasyChatStruct->unk9A29; + gEasyChatStruct->unk9C71 = gEasyChatStruct->unk9A28 - 4; for (i = 0; i < 2; i++) { - gUnknown_083DB694->unkB4[i]->invisible = FALSE; - gUnknown_083DB694->unkB4[i]->data[1] = 1; + gEasyChatStruct->unkB4[i]->invisible = FALSE; + gEasyChatStruct->unkB4[i]->data[1] = 1; } } - if (gUnknown_083DB694->unk9C71 < 0) - gUnknown_083DB694->unk9C71 = 0; + if (gEasyChatStruct->unk9C71 < 0) + gEasyChatStruct->unk9C71 = 0; for (i = 0; i < 2; i++) { - gUnknown_083DB694->unkAC[i]->pos1.x = r9; - gUnknown_083DB694->unkAC[i]->invisible = FALSE; - gUnknown_083DB694->unkAC[i]->data[1] = 1; - StartSpriteAnim(gUnknown_083DB694->unkAC[i], animNum); + gEasyChatStruct->unkAC[i]->pos1.x = r9; + gEasyChatStruct->unkAC[i]->invisible = FALSE; + gEasyChatStruct->unkAC[i]->data[1] = 1; + StartSpriteAnim(gEasyChatStruct->unkAC[i], animNum); } - gUnknown_083DB694->unk9C70 = 1; + gEasyChatStruct->unk9C70 = 1; } const struct OamData gOamData_83DBCE0 = @@ -672,9 +672,9 @@ void sub_80E8A7C(void) for (i = 0; i < 2; i++) { spriteId = CreateSprite(&spriteTemplate_83DBD18, 0, 84 + i * 72 , 0); - gUnknown_083DB694->unkAC[i] = &gSprites[spriteId]; - gUnknown_083DB694->unkAC[i]->data[0] = i; - gUnknown_083DB694->unkAC[i]->vFlip = i; + gEasyChatStruct->unkAC[i] = &gSprites[spriteId]; + gEasyChatStruct->unkAC[i]->data[0] = i; + gEasyChatStruct->unkAC[i]->vFlip = i; } spriteTemplate_83DBD18.tileTag = 3; @@ -683,11 +683,11 @@ void sub_80E8A7C(void) for (i = 0; i < 2; i++) { spriteId = CreateSprite(&spriteTemplate_83DBD18, 142 + i * 40, 88, 0); - gUnknown_083DB694->unkB4[i] = &gSprites[spriteId]; - gUnknown_083DB694->unkB4[i]->data[0] = i; - gUnknown_083DB694->unkB4[i]->oam.shape = 1; - gUnknown_083DB694->unkB4[i]->oam.size = 1; - StartSpriteAnim(gUnknown_083DB694->unkB4[i], i); + gEasyChatStruct->unkB4[i] = &gSprites[spriteId]; + gEasyChatStruct->unkB4[i]->data[0] = i; + gEasyChatStruct->unkB4[i]->oam.shape = 1; + gEasyChatStruct->unkB4[i]->oam.size = 1; + StartSpriteAnim(gEasyChatStruct->unkB4[i], i); } sub_80E8958(0); @@ -698,19 +698,19 @@ void sub_80E8B78(struct Sprite *sprite) { bool8 invisible; - if (gUnknown_083DB694->unk9C70 != 0 && sprite->data[1] != 0) + if (gEasyChatStruct->unk9C70 != 0 && sprite->data[1] != 0) { if (sprite->data[0] == 0) { invisible = FALSE; - if (*gUnknown_083DB694->unk9C6C == 0) + if (*gEasyChatStruct->unk9C6C == 0) invisible = TRUE; sprite->invisible = invisible; } else { invisible = FALSE; - if (*gUnknown_083DB694->unk9C6C == gUnknown_083DB694->unk9C71) + if (*gEasyChatStruct->unk9C6C == gEasyChatStruct->unk9C71) invisible = TRUE; sprite->invisible = invisible; } @@ -898,36 +898,36 @@ void sub_80E8CEC(void) spriteId = CreateSprite(&gSpriteTemplate_83DBDE4, 224, 88, 0); if (spriteId != MAX_SPRITES) - gUnknown_083DB694->unk9C74 = &gSprites[spriteId]; + gEasyChatStruct->unk9C74 = &gSprites[spriteId]; else - gUnknown_083DB694->unk9C74 = NULL; + gEasyChatStruct->unk9C74 = NULL; } void sub_80E8D54(void) { - if (gUnknown_083DB694->unk9C74 != NULL) + if (gEasyChatStruct->unk9C74 != NULL) { - if (gUnknown_083DB694->unk26 == 0) - StartSpriteAnim(gUnknown_083DB694->unk9C74, 1); + if (gEasyChatStruct->unk26 == 0) + StartSpriteAnim(gEasyChatStruct->unk9C74, 1); else - StartSpriteAnim(gUnknown_083DB694->unk9C74, 2); + StartSpriteAnim(gEasyChatStruct->unk9C74, 2); } } void sub_80E8D8C(u8 a) { - if (gUnknown_083DB694->unk9C74 != NULL) + if (gEasyChatStruct->unk9C74 != NULL) { if (a != 0) { - if (gUnknown_083DB694->unk26 == 0) - StartSpriteAnim(gUnknown_083DB694->unk9C74, 3); + if (gEasyChatStruct->unk26 == 0) + StartSpriteAnim(gEasyChatStruct->unk9C74, 3); else - StartSpriteAnim(gUnknown_083DB694->unk9C74, 4); + StartSpriteAnim(gEasyChatStruct->unk9C74, 4); } else { - StartSpriteAnim(gUnknown_083DB694->unk9C74, 5); + StartSpriteAnim(gEasyChatStruct->unk9C74, 5); } } } @@ -969,10 +969,10 @@ void sub_80E8DD8(void) REG_BG0CNT = 0x8B00; REG_BG1CNT = 0x0D09; - CpuCopy16(gUnknown_08E945D0, gUnknown_083DB694->unk1C8, 0x500); - LZ77UnCompWram(gUnknown_08E953D0, gUnknown_083DB694->unk6C8); + CpuCopy16(gUnknown_08E945D0, gEasyChatStruct->unk1C8, 0x500); + LZ77UnCompWram(gUnknown_08E953D0, gEasyChatStruct->unk6C8); LZ77UnCompVram(gMenuWordGroupFrame_Gfx, (void *)(VRAM + 0x8000)); - CpuCopy16(gUnknown_083DB694->unk1C8, (void *)(VRAM + 0x6800), 0x500); + CpuCopy16(gEasyChatStruct->unk1C8, (void *)(VRAM + 0x6800), 0x500); LoadPalette(gMenuWordGroupFrame1_Pal, 64, 64); REG_BG2CNT = 0x0E02; @@ -994,7 +994,7 @@ void sub_80E8DD8(void) gPlttBufferFaded[49] = RGB(27, 26, 27); gPlttBufferFaded[56] = RGB(28, 28, 28); - gUnknown_083DB694->unkBC = 0; + gEasyChatStruct->unkBC = 0; sub_80E8FA4(); sub_80E948C(); sub_80E9198(10); @@ -1034,30 +1034,30 @@ void sub_80E8FA4(void) for (r4 = 0; r4 < 8; r4++) { - gUnknown_083DB694->unk9C34[i][r4] = RGB_(sp0[0] >> 8, sp0[1] >> 8, sp0[2] >> 8); + gEasyChatStruct->unk9C34[i][r4] = RGB_(sp0[0] >> 8, sp0[1] >> 8, sp0[2] >> 8); for (r3 = 0; r3 < 3; r3++) sp0[r3] += sp18[r3]; } - gUnknown_083DB694->unk9C34[i][r4] = RGB_(spC[0] >> 8, spC[1] >> 8, spC[2] >> 8); + gEasyChatStruct->unk9C34[i][r4] = RGB_(spC[0] >> 8, spC[1] >> 8, spC[2] >> 8); } - gUnknown_083DB694->unk9C32 = 0; + gEasyChatStruct->unk9C32 = 0; } void sub_80E9108(s8 a) { u16 i; - gUnknown_083DB694->unk9C32 += a; + gEasyChatStruct->unk9C32 += a; for (i = 0; i < 3; i++) { - gPlttBufferUnfaded[81 + i] = gUnknown_083DB694->unk9C34[i][gUnknown_083DB694->unk9C32]; - gPlttBufferFaded[81 + i] = gUnknown_083DB694->unk9C34[i][gUnknown_083DB694->unk9C32]; + gPlttBufferUnfaded[81 + i] = gEasyChatStruct->unk9C34[i][gEasyChatStruct->unk9C32]; + gPlttBufferFaded[81 + i] = gEasyChatStruct->unk9C34[i][gEasyChatStruct->unk9C32]; } } void sub_80E9178(void) { - gUnknown_083DB694->unk9C32 = 0; + gEasyChatStruct->unk9C32 = 0; sub_80E9108(0); } @@ -1094,19 +1094,19 @@ void sub_80E91D4(u8 a) switch (a) { case 0: - sub_80E91B0(gUnknown_083DB694->unk9C80, 4, 15, 2); - sub_80E91B0(gUnknown_083DB694->unk9CC9, 4, 17, 2); + sub_80E91B0(gEasyChatStruct->unk9C80, 4, 15, 2); + sub_80E91B0(gEasyChatStruct->unk9CC9, 4, 17, 2); break; case 1: - sub_80E91B0(gUnknown_083DB694->unk9D12, 4, 15, 2); - sub_80E91B0(gUnknown_083DB694->unk9D5B, 4, 17, 2); + sub_80E91B0(gEasyChatStruct->unk9D12, 4, 15, 2); + sub_80E91B0(gEasyChatStruct->unk9D5B, 4, 17, 2); break; case 2: sub_80E91B0(gOtherText_TextDeletedConfirmPage1, 4, 15, 2); sub_80E91B0(gOtherText_TextDeletedConfirmPage2, 4, 17, 2); break; case 3: - switch (gUnknown_083DB694->unk8) + switch (gEasyChatStruct->unk8) { case 9: sub_80E91B0(gOtherText_QuitGivingInfo, 4, 15, 4); @@ -1183,32 +1183,32 @@ void sub_80E9368(u8 a) } BasicInitMenuWindow(&gWindowConfig_81E6D8C); - gUnknown_083DB694->unk9F8E[0] = EXT_CTRL_CODE_BEGIN; - gUnknown_083DB694->unk9F8E[1] = 5; - gUnknown_083DB694->unk9F8E[2] = 1; + gEasyChatStruct->unk9F8E[0] = EXT_CTRL_CODE_BEGIN; + gEasyChatStruct->unk9F8E[1] = 5; + gEasyChatStruct->unk9F8E[2] = 1; if (r4 != NULL) { - sub_8072C74(gUnknown_083DB694->unk9F8E + 3, r4, 240, 2); - MenuPrint(gUnknown_083DB694->unk9F8E, 0, 0); + sub_8072C74(gEasyChatStruct->unk9F8E + 3, r4, 240, 2); + MenuPrint(gEasyChatStruct->unk9F8E, 0, 0); } else { - u8 *str = gUnknown_083DB694->unk9F8E + 3; + u8 *str = gEasyChatStruct->unk9F8E + 3; str[0] = EXT_CTRL_CODE_BEGIN; str[1] = 0x11; str[2] = 0x10; str[3] = EOS; - MenuPrint(gUnknown_083DB694->unk9F8E, 0, 0); - MenuPrint(gUnknown_083DB694->unk9F8E, 28, 0); + MenuPrint(gEasyChatStruct->unk9F8E, 0, 0); + MenuPrint(gEasyChatStruct->unk9F8E, 28, 0); } BasicInitMenuWindow(&gWindowConfig_81E6DA8); } void sub_80E948C(void) { - switch (gUnknown_083DB694->unk9) + switch (gEasyChatStruct->unk9) { case 4: sub_809D104((void *)(VRAM + 0x6800), 3, 3, gUnknown_08E94AD0, 0, 26, 24, 6); @@ -1234,7 +1234,7 @@ void sub_80E948C(void) void sub_80E95A4(void) { BasicInitMenuWindow(&gWindowConfig_81E6D8C); - switch (gUnknown_083DB694->unk9) + switch (gEasyChatStruct->unk9) { case 4: sub_80E9620(4, 6); @@ -1265,27 +1265,27 @@ void sub_80E9620(u16 a, u16 b) u16 r10 = 0; u16 r7 = a; - for (i = 0; i < gUnknown_083DB694->unk84; i++) + for (i = 0; i < gEasyChatStruct->unk84; i++) { u16 r6 = b; - for (j = 0; j < gUnknown_083DB694->unk83; j++) + for (j = 0; j < gEasyChatStruct->unk83; j++) { - if (r10 >= gUnknown_083DB694->unkA) + if (r10 >= gEasyChatStruct->unkA) { MenuPrint(gUnknown_083DBEA8, r6, r7); break; } - if (gUnknown_083DB694->unkC[r10] == 0xFFFF) + if (gEasyChatStruct->unkC[r10] == 0xFFFF) { sub_8095C8C((void *)(VRAM + 0x7000), r6, r7, gUnknown_083DBE1C, 0, 0, 9, 2, 9); r6 += 11; } else { - sub_80EB218(gUnknown_083DB694->unk9E14, gUnknown_083DB694->unkC[r10], 11); - MenuPrint(gUnknown_083DB694->unk9E14, r6, r7); - r6 += gUnknown_083DB694->unk8C[i][j] + 11; + sub_80EB218(gEasyChatStruct->unk9E14, gEasyChatStruct->unkC[r10], 11); + MenuPrint(gEasyChatStruct->unk9E14, r6, r7); + r6 += gEasyChatStruct->unk8C[i][j] + 11; } r10++; } @@ -1296,7 +1296,7 @@ void sub_80E9620(u16 a, u16 b) void sub_80E9744(void) { BasicInitMenuWindow(&gWindowConfig_81E6D8C); - switch (gUnknown_083DB694->unk9) + switch (gEasyChatStruct->unk9) { case 4: sub_80E97C0(4, 6); @@ -1327,31 +1327,31 @@ void sub_80E97C0(u16 a, u16 b) asm("":::"r9"); - for (i = 0; i < gUnknown_083DB694->unk84; i++) + for (i = 0; i < gEasyChatStruct->unk84; i++) { u8 r6; - u8 *r2 = gUnknown_083DB694->unk9E6E; + u8 *r2 = gEasyChatStruct->unk9E6E; u32 r1; - for (r6 = 0; r6 < gUnknown_083DB694->unk83; r6++) + for (r6 = 0; r6 < gEasyChatStruct->unk83; r6++) { - if (r7 >= gUnknown_083DB694->unkA) + if (r7 >= gEasyChatStruct->unkA) break; - if (gUnknown_083DB694->unkC[r7] != 0xFFFF) + if (gEasyChatStruct->unkC[r7] != 0xFFFF) { - r2 = sub_80EB218(r2, gUnknown_083DB694->unkC[r7], 0); + r2 = sub_80EB218(r2, gEasyChatStruct->unkC[r7], 0); *r2++ = CHAR_SPACE; } r7++; } - r1 = gUnknown_083DB694->unk83 * 11; + r1 = gEasyChatStruct->unk83 * 11; r2[0] = EXT_CTRL_CODE_BEGIN; r2[1] = 0x13; r2[2] = r1 * 8; r2[3] = EOS; - MenuPrint(gUnknown_083DB694->unk9E6E, b, a); + MenuPrint(gEasyChatStruct->unk9E6E, b, a); a += 2; } @@ -1363,7 +1363,7 @@ void sub_80E98C4(void) u8 r3; BasicInitMenuWindow(&gWindowConfig_81E6D8C); - switch (gUnknown_083DB694->unk9) + switch (gEasyChatStruct->unk9) { case 4: r1 = 4; @@ -1435,12 +1435,12 @@ const u8 *const gUnknown_083DBEAC[] = void sub_80E9974(void) { BasicInitMenuWindow(&gWindowConfig_81E6D54); - if (gUnknown_083DB694->unk26 == 0) + if (gEasyChatStruct->unk26 == 0) { u16 i; - for (i = gUnknown_083DB694->unk1B5; i < gUnknown_083DB694->unk1B5 + 4; i++) - sub_80E9940(gUnknown_083DB694->unk9DC9, i); + for (i = gEasyChatStruct->unk1B5; i < gEasyChatStruct->unk1B5 + 4; i++) + sub_80E9940(gEasyChatStruct->unk9DC9, i); } else { @@ -1455,13 +1455,13 @@ void sub_80E9974(void) void sub_80E9A14(void) { sub_80E9A4C(); - if (gUnknown_083DB694->unk26 == 0) - gUnknown_083DB694->unk1BA += gUnknown_083DB694->unk1B5 * 16; + if (gEasyChatStruct->unk26 == 0) + gEasyChatStruct->unk1BA += gEasyChatStruct->unk1B5 * 16; } void sub_80E9A4C(void) { - gUnknown_083DB694->unk1BA = 0; + gEasyChatStruct->unk1BA = 0; } void sub_80E9A60(const u8 *a, u16 b, u16 c) @@ -1470,21 +1470,21 @@ void sub_80E9A60(const u8 *a, u16 b, u16 c) MenuPrint(a, b, c); } -void sub_80E9A7C(u8 *a, u16 b) +void sub_80E9A7C(u8 *dest, u16 b) { u16 i; u16 r5 = b * 2; for (i = 0; i < 2; i++) { - a[0] = EXT_CTRL_CODE_BEGIN; - a[1] = 0x12; - a[2] = 88 * i; - a += 3; + dest[0] = EXT_CTRL_CODE_BEGIN; + dest[1] = 0x12; + dest[2] = 88 * i; + dest += 3; - a = sub_80EAD64(a, gUnknown_083DB694->unk2A[b][i], 11); + dest = CopyEasyChatGroupName(dest, gEasyChatStruct->unk2A[b][i], 11); r5++; - if (r5 >= gUnknown_083DB694->unk28) + if (r5 >= gEasyChatStruct->unk28) break; } } @@ -1505,31 +1505,31 @@ void sub_80E9AF8(u16 a) sub_80E9C74(a); - r8 = gUnknown_083DB694->unk9E14; + r8 = gEasyChatStruct->unk9E14; r8[0] = EXT_CTRL_CODE_BEGIN; r8[1] = 0x11; r8[2] = 0x10; r8 += 3; - if (gUnknown_083DB694->unk7D != 0) + if (gEasyChatStruct->unk7D != 0) { - for (i = 0; i < gUnknown_083DB694->unk99A6[a]; i++) + for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++) { - if (sub_80EB2D4(gUnknown_083DB694->unk9A2A[a][i]) == 7) + if (sub_80EB2D4(gEasyChatStruct->unk9A2A[a][i]) == 7) BasicInitMenuWindow(&gWindowConfig_81E6D70); else BasicInitMenuWindow(&gWindowConfig_81E6D54); - sub_80EB218(r8, gUnknown_083DB694->unk9A2A[a][i], 9); - sub_80E9A60(gUnknown_083DB694->unk9E14, i * 11 + 4, a * 2); + sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9); + sub_80E9A60(gEasyChatStruct->unk9E14, i * 11 + 4, a * 2); } } else { BasicInitMenuWindow(&gWindowConfig_81E6D54); - for (i = 0; i < gUnknown_083DB694->unk99A6[a]; i++) + for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++) { - sub_80EB218(r8, gUnknown_083DB694->unk9A2A[a][i], 9); - sub_80E9A60(gUnknown_083DB694->unk9E14, i * 11 + 4, a * 2); + sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9); + sub_80E9A60(gEasyChatStruct->unk9E14, i * 11 + 4, a * 2); } } } @@ -1542,11 +1542,11 @@ void sub_80E9C74(u16 a) void sub_80E9C94(void) { - u16 r5 = min(gUnknown_083DB694->unk9A28, 4); + u16 r5 = min(gEasyChatStruct->unk9A28, 4); u16 i; for (i = 0; i < r5; i++) - sub_80E9AF8(gUnknown_083DB694->unk9A29 + i); + sub_80E9AF8(gEasyChatStruct->unk9A29 + i); while (i < 4) sub_80E9C74(i++); } @@ -1556,15 +1556,15 @@ void sub_80E9D00(void) u16 r4; u16 r5; - if (gUnknown_083DB694->unk1C0 > 0) + if (gEasyChatStruct->unk1C0 > 0) { - r4 = gUnknown_083DB694->unk1C0; - r5 = gUnknown_083DB694->unk9A29 + 4; + r4 = gEasyChatStruct->unk1C0; + r5 = gEasyChatStruct->unk9A29 + 4; } else { - r4 = -gUnknown_083DB694->unk1C0; - r5 = gUnknown_083DB694->unk9A29 - r4; + r4 = -gEasyChatStruct->unk1C0; + r5 = gEasyChatStruct->unk9A29 - r4; } while (--r4 != 0xFFFF) sub_80E9AF8(r5++); @@ -1577,33 +1577,33 @@ void sub_80E9D7C(void) u16 i; BasicInitMenuWindow(&gWindowConfig_81E6D54); - if (gUnknown_083DB694->unk1C0 < 0) + if (gEasyChatStruct->unk1C0 < 0) { - r6 = -gUnknown_083DB694->unk1C0; - r4 = gUnknown_083DB694->unk1B5 - r6; + r6 = -gEasyChatStruct->unk1C0; + r4 = gEasyChatStruct->unk1B5 - r6; } else { - r6 = gUnknown_083DB694->unk1C0; - r4 = gUnknown_083DB694->unk1B5 + 4; + r6 = gEasyChatStruct->unk1C0; + r4 = gEasyChatStruct->unk1B5 + 4; } for (i = 0; i < r6; i++) { - sub_80E9940(gUnknown_083DB694->unk9DC9, r4); + sub_80E9940(gEasyChatStruct->unk9DC9, r4); r4++; } } void sub_80E9E08(u8 a) { - gUnknown_083DB694->unk1BC = (gUnknown_083DB694->unk1BA + gUnknown_083DB694->unk1C0 * 16) & 0x7F; - gUnknown_083DB694->unk1BF = (gUnknown_083DB694->unk1C0 < 0) ? -a : a; + gEasyChatStruct->unk1BC = (gEasyChatStruct->unk1BA + gEasyChatStruct->unk1C0 * 16) & 0x7F; + gEasyChatStruct->unk1BF = (gEasyChatStruct->unk1C0 < 0) ? -a : a; } bool8 sub_80E9E54(void) { - gUnknown_083DB694->unk1BA = (gUnknown_083DB694->unk1BA + gUnknown_083DB694->unk1BF) & 0x7F; - return (gUnknown_083DB694->unk1BA == gUnknown_083DB694->unk1BC); + gEasyChatStruct->unk1BA = (gEasyChatStruct->unk1BA + gEasyChatStruct->unk1BF) & 0x7F; + return (gEasyChatStruct->unk1BA == gEasyChatStruct->unk1BC); } void nullsub_23(void) @@ -1612,37 +1612,37 @@ void nullsub_23(void) void sub_80E9E98(void) { - gUnknown_083DB694->unkBE = 0; + gEasyChatStruct->unkBE = 0; } bool8 sub_80E9EA8(void) { - switch (gUnknown_083DB694->unkBE) + switch (gEasyChatStruct->unkBE) { case 0: sub_80EA24C(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 1: if (sub_80EA1E0() != 0) { sub_80EA4A4(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; } break; case 2: if (sub_80EA1E0() != 0) { sub_80EA704(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; } break; case 3: if (sub_80EA1E0() != 0) - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 4: - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 5: return TRUE; @@ -1652,32 +1652,32 @@ bool8 sub_80E9EA8(void) bool8 sub_80E9F50(void) { - switch (gUnknown_083DB694->unkBE) + switch (gEasyChatStruct->unkBE) { case 0: nullsub_23(); sub_80EA764(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 1: if (sub_80EA1E0() != 0) - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 2: sub_80EA5A0(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 3: if (sub_80EA1E0() != 0) - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 4: sub_80EA348(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 5: if (sub_80EA1E0() != 0) - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 6: return TRUE; @@ -1687,12 +1687,12 @@ bool8 sub_80E9F50(void) bool8 sub_80E9FD4(void) { - switch (gUnknown_083DB694->unkBE) + switch (gEasyChatStruct->unkBE) { case 0: nullsub_23(); sub_80EA5A0(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 1: if (sub_80EA1E0() != 0) @@ -1704,11 +1704,11 @@ bool8 sub_80E9FD4(void) bool8 sub_80EA014(void) { - switch (gUnknown_083DB694->unkBE) + switch (gEasyChatStruct->unkBE) { case 0: sub_80EA4A4(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 1: if (sub_80EA1E0() != 0) @@ -1720,18 +1720,18 @@ bool8 sub_80EA014(void) bool8 sub_80EA050(void) { - switch (gUnknown_083DB694->unkBE) + switch (gEasyChatStruct->unkBE) { case 0: nullsub_23(); sub_80EA764(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 1: if (sub_80EA1E0() != 0) { sub_80EA7F4(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; } break; case 2: @@ -1739,13 +1739,13 @@ bool8 sub_80EA050(void) if (sub_80EA1E0() != 0) { sub_80EA8BC(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; } break; case 3: sub_80E9108(1); if (sub_80EA1E0() != 0) - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 4: return TRUE; @@ -1755,18 +1755,18 @@ bool8 sub_80EA050(void) bool8 sub_80EA0E4(void) { - switch (gUnknown_083DB694->unkBE) + switch (gEasyChatStruct->unkBE) { case 0: sub_80EA948(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 1: sub_80E9108(-1); if (sub_80EA1E0() != 0) { sub_80EAA44(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; } break; case 2: @@ -1774,12 +1774,12 @@ bool8 sub_80EA0E4(void) if (sub_80EA1E0() != 0) { sub_80EA704(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; } break; case 3: if (sub_80EA1E0() != 0) - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 4: return TRUE; @@ -1789,15 +1789,15 @@ bool8 sub_80EA0E4(void) bool8 sub_80EA184(void) { - switch (gUnknown_083DB694->unkBE) + switch (gEasyChatStruct->unkBE) { case 0: sub_80EAAD4(); - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; // fall through case 1: if (sub_80EA1E0() != 0) - gUnknown_083DB694->unkBE++; + gEasyChatStruct->unkBE++; break; case 2: sub_80E9178(); @@ -1810,15 +1810,15 @@ bool8 sub_80EA1E0(void) { u16 i; - if (gUnknown_083DB694->unkC4 != 0) + if (gEasyChatStruct->unkC4 != 0) { - for (i = 0; i < gUnknown_083DB694->unkC2; i++) + for (i = 0; i < gEasyChatStruct->unkC2; i++) { - sub_80EAC0C(gUnknown_083DB694->unkC8[i]); - sub_80EAC48(&gUnknown_083DB694->unk148[i]); + sub_80EAC0C(gEasyChatStruct->unkC8[i]); + sub_80EAC48(&gEasyChatStruct->unk148[i]); } - gUnknown_083DB694->unkBC = 1; - gUnknown_083DB694->unkC4--; + gEasyChatStruct->unkBC = 1; + gEasyChatStruct->unkC4--; return FALSE; } return TRUE; @@ -1826,182 +1826,182 @@ bool8 sub_80EA1E0(void) void sub_80EA24C(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 13, 14, 13, 15, -2, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 13, 14, 13, 15, -2, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 14, 12, 15, 0, 0, 2, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 30, 0, -2, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 12, 14, 12, 15, 0, 0, 2, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 30, 0, -2, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[2], 13, 15, 13, 16, -2, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 9, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[2], 13, 15, 13, 16, -2, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[2], 0, 9, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 12, 16, 0, 0, 2, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[3], 30, 9, -2, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[3], 12, 15, 12, 16, 0, 0, 2, 0); + sub_80EAC30(&gEasyChatStruct->unk148[3], 30, 9, -2, 0, gEasyChatStruct->unk6C8); - gUnknown_083DB694->unkC2 = 4; - gUnknown_083DB694->unkC4 = 6; + gEasyChatStruct->unkC2 = 4; + gEasyChatStruct->unkC4 = 6; } void sub_80EA348(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 1, 14, 13, 15, 2, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 1, 14, 13, 15, 2, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 14, 24, 15, 0, 0, -2, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 18, 0, 2, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 12, 14, 24, 15, 0, 0, -2, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 18, 0, 2, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 15, 13, 16, 2, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 9, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[2], 1, 15, 13, 16, 2, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[2], 0, 9, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 24, 16, 0, 0, -2, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[3], 18, 9, 2, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[3], 12, 15, 24, 16, 0, 0, -2, 0); + sub_80EAC30(&gEasyChatStruct->unk148[3], 18, 9, 2, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[4], 1, 14, 1, 16, 0, 0, 2, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[4], 1, 14, 0, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[4], 1, 14, 1, 16, 0, 0, 2, 0); + sub_80EAC30(&gEasyChatStruct->unk148[4], 1, 14, 0, 0, gEasyChatStruct->unk1C8); - sub_80EABD4(gUnknown_083DB694->unkC8[5], 24, 14, 24, 16, -2, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[5], 24, 14, -2, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[5], 24, 14, 24, 16, -2, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[5], 24, 14, -2, 0, gEasyChatStruct->unk1C8); - gUnknown_083DB694->unkC2 = 6; - gUnknown_083DB694->unkC4 = 6; + gEasyChatStruct->unkC2 = 6; + gEasyChatStruct->unkC4 = 6; } void sub_80EA4A4(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 1, 14, 13, 15, 0, -1, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 1, 14, 13, 15, 0, -1, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 14, 24, 15, 0, -1, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 18, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 12, 14, 24, 15, 0, -1, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 18, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 15, 13, 16, 0, 0, 0, 1); - sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 9, 0, -1, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[2], 1, 15, 13, 16, 0, 0, 0, 1); + sub_80EAC30(&gEasyChatStruct->unk148[2], 0, 9, 0, -1, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 24, 16, 0, 0, 0, 1); - sub_80EAC30(&gUnknown_083DB694->unk148[3], 18, 9, 0, -1, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[3], 12, 15, 24, 16, 0, 0, 0, 1); + sub_80EAC30(&gEasyChatStruct->unk148[3], 18, 9, 0, -1, gEasyChatStruct->unk6C8); - gUnknown_083DB694->unkC2 = 4; - gUnknown_083DB694->unkC4 = 4; + gEasyChatStruct->unkC2 = 4; + gEasyChatStruct->unkC4 = 4; } void sub_80EA5A0(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 1, 10, 13, 15, 0, 1, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 1, 10, 13, 15, 0, 1, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 12, 10, 24, 15, 0, 1, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 18, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 12, 10, 24, 15, 0, 1, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 18, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 15, 13, 20, 0, 0, 0, -1); - sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 5, 0, 1, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[2], 1, 15, 13, 20, 0, 0, 0, -1); + sub_80EAC30(&gEasyChatStruct->unk148[2], 0, 5, 0, 1, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[3], 12, 15, 24, 20, 0, 0, 0, -1); - sub_80EAC30(&gUnknown_083DB694->unk148[3], 18, 5, 0, 1, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[3], 12, 15, 24, 20, 0, 0, 0, -1); + sub_80EAC30(&gEasyChatStruct->unk148[3], 18, 5, 0, 1, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[4], 1, 10, 24, 10, 0, 0, 0, 1); - sub_80EAC30(&gUnknown_083DB694->unk148[4], 1, 10, 0, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[4], 1, 10, 24, 10, 0, 0, 0, 1); + sub_80EAC30(&gEasyChatStruct->unk148[4], 1, 10, 0, 0, gEasyChatStruct->unk1C8); - sub_80EABD4(gUnknown_083DB694->unkC8[5], 1, 20, 24, 20, 0, -1, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[5], 1, 20, 0, -1, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[5], 1, 20, 24, 20, 0, -1, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[5], 1, 20, 0, -1, gEasyChatStruct->unk1C8); - gUnknown_083DB694->unkC2 = 6; - gUnknown_083DB694->unkC4 = 4; + gEasyChatStruct->unkC2 = 6; + gEasyChatStruct->unkC4 = 4; } void sub_80EA704(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 24, 12, 25, 20, 0, 0, 1, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 5, 10, -1, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 24, 12, 25, 20, 0, 0, 1, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 5, 10, -1, 0, gEasyChatStruct->unk6C8); - gUnknown_083DB694->unkC2 = 1; - gUnknown_083DB694->unkC4 = 5; + gEasyChatStruct->unkC2 = 1; + gEasyChatStruct->unkC4 = 5; } void sub_80EA764(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 24, 12, 30, 20, 0, 0, -1, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 10, 1, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 24, 12, 30, 20, 0, 0, -1, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 10, 1, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 30, 12, 31, 20, -1, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 30, 12, -1, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 30, 12, 31, 20, -1, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 30, 12, -1, 0, gEasyChatStruct->unk1C8); - gUnknown_083DB694->unkC2 = 2; - gUnknown_083DB694->unkC4 = 6; + gEasyChatStruct->unkC2 = 2; + gEasyChatStruct->unkC4 = 6; } void sub_80EA7F4(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 20, 10, 25, 20, 0, 0, 1, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 25, 0, -1, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 20, 10, 25, 20, 0, 0, 1, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 25, 0, -1, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 0, 10, 1, 20, 0, 0, 1, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 0, 10, 1, 20, 0, 0, 1, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 0, 10, 0, 0, gEasyChatStruct->unk1C8); - sub_80EABD4(gUnknown_083DB694->unkC8[2], 1, 10, 4, 20, 1, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[2], 1, 10, 4, 20, 1, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[2], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - gUnknown_083DB694->unkC2 = 3; - gUnknown_083DB694->unkC4 = 2; + gEasyChatStruct->unkC2 = 3; + gEasyChatStruct->unkC4 = 2; } void sub_80EA8BC(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 3, 10, 4, 20, 0, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 3, 10, 4, 20, 0, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 0, 10, 2, 20, 0, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 0, 10, 2, 20, 0, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 0, 10, 0, 0, gEasyChatStruct->unk1C8); - gUnknown_083DB694->unkC2 = 2; - gUnknown_083DB694->unkC4 = 1; + gEasyChatStruct->unkC2 = 2; + gEasyChatStruct->unkC4 = 1; } void sub_80EA948(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 0, 10, 2, 20, 0, 0, -1, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 0, 10, 2, 20, 0, 0, -1, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 10, 0, 0, gEasyChatStruct->unk1C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 3, 10, 5, 20, -1, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 3, 10, 5, 20, -1, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[2], 26, 10, 30, 20, -1, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[2], 26, 10, -1, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[2], 26, 10, 30, 20, -1, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[2], 26, 10, -1, 0, gEasyChatStruct->unk1C8); - sub_80EABD4(gUnknown_083DB694->unkC8[3], 25, 10, 26, 20, -1, 0, -1, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[3], 29, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[3], 25, 10, 26, 20, -1, 0, -1, 0); + sub_80EAC30(&gEasyChatStruct->unk148[3], 29, 0, 0, 0, gEasyChatStruct->unk6C8); - gUnknown_083DB694->unkC2 = 4; - gUnknown_083DB694->unkC4 = 2; + gEasyChatStruct->unkC2 = 4; + gEasyChatStruct->unkC4 = 2; } void sub_80EAA44(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 24, 10, 30, 20, 0, 0, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 24, 10, 0, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 24, 10, 30, 20, 0, 0, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 24, 10, 0, 0, gEasyChatStruct->unk1C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 23, 10, 24, 20, 0, 0, -1, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 29, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 23, 10, 24, 20, 0, 0, -1, 0); + sub_80EAC30(&gEasyChatStruct->unk148[1], 29, 0, 0, 0, gEasyChatStruct->unk6C8); - gUnknown_083DB694->unkC2 = 2; - gUnknown_083DB694->unkC4 = 1; + gEasyChatStruct->unkC2 = 2; + gEasyChatStruct->unkC4 = 1; } void sub_80EAAD4(void) { - sub_80EABD4(gUnknown_083DB694->unkC8[0], 0, 10, 30, 15, 0, 1, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[0], 0, 0, 0, 0, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[0], 0, 10, 30, 15, 0, 1, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[0], 0, 0, 0, 0, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[1], 0, 15, 30, 20, 0, 0, 0, -1); - sub_80EAC30(&gUnknown_083DB694->unk148[1], 0, 5, 0, 1, gUnknown_083DB694->unk6C8); + sub_80EABD4(gEasyChatStruct->unkC8[1], 0, 15, 30, 20, 0, 0, 0, -1); + sub_80EAC30(&gEasyChatStruct->unk148[1], 0, 5, 0, 1, gEasyChatStruct->unk6C8); - sub_80EABD4(gUnknown_083DB694->unkC8[2], 0, 10, 30, 10, 0, 0, 0, 1); - sub_80EAC30(&gUnknown_083DB694->unk148[2], 0, 10, 0, 0, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[2], 0, 10, 30, 10, 0, 0, 0, 1); + sub_80EAC30(&gEasyChatStruct->unk148[2], 0, 10, 0, 0, gEasyChatStruct->unk1C8); - sub_80EABD4(gUnknown_083DB694->unkC8[3], 0, 20, 30, 20, 0, -1, 0, 0); - sub_80EAC30(&gUnknown_083DB694->unk148[3], 0, 20, 0, -1, gUnknown_083DB694->unk1C8); + sub_80EABD4(gEasyChatStruct->unkC8[3], 0, 20, 30, 20, 0, -1, 0, 0); + sub_80EAC30(&gEasyChatStruct->unk148[3], 0, 20, 0, -1, gEasyChatStruct->unk1C8); - gUnknown_083DB694->unkC2 = 4; - gUnknown_083DB694->unkC4 = 5; + gEasyChatStruct->unkC2 = 4; + gEasyChatStruct->unkC4 = 5; } void sub_80EABD4(u16 *a, u16 b, u16 c, u16 d, u16 e, u16 f, u16 g, u16 h, u16 i) @@ -2043,11 +2043,11 @@ void sub_80EAC5C(void) { u16 i; - if (gUnknown_083DB694->unkBC != 0) + if (gEasyChatStruct->unkBC != 0) { - for (i = 0; i < gUnknown_083DB694->unkC2; i++) - sub_80EACBC((void *)(VRAM + 0x6800), gUnknown_083DB694->unkC8[i], &gUnknown_083DB694->unk148[i]); - gUnknown_083DB694->unkBC = 0; + for (i = 0; i < gEasyChatStruct->unkC2; i++) + sub_80EACBC((void *)(VRAM + 0x6800), gEasyChatStruct->unkC8[i], &gEasyChatStruct->unk148[i]); + gEasyChatStruct->unkBC = 0; } } @@ -2069,11 +2069,11 @@ void sub_80EAD08(void) r4 = gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; r4 += 88; - r2 = (gUnknown_083DB694->unk1BA - 88) & 0xFF; + r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF; for (i = 0; i < 64; i++) { - if (gUnknown_083DB694->unk1BA + i == 128) + if (gEasyChatStruct->unk1BA + i == 128) r2 = (-i - 88) & 0xFF; *r4++ = r2; } @@ -2084,9 +2084,9 @@ extern const u8 gEasyChatGroupSizes[]; extern const u16 gEasyChatWordsByLetter[]; extern const u16 gEasyChatWordsAlphabetized[]; -u8 *sub_80EAD64(u8 *a, u8 group, int unused) +u8 *CopyEasyChatGroupName(u8 *dest, u8 group, int unused) { - return StringCopy(a, gEasyChatGroupNames[group]); + return StringCopy(dest, gEasyChatGroupNames[group]); } bool8 sub_80EAD7C(u8 group) @@ -2111,15 +2111,15 @@ bool8 sub_80EADC0(u8 group, u16 word) switch (group) { case EC_GROUP_TRENDY_SAYING: - if (gUnknown_083DB694->unk40[2][11 + group] == 0) + if (gEasyChatStruct->unk40[2][11 + group] == 0) return FALSE; return sub_80EB868(word); - case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_1: return GetSetPokedexFlag(SpeciesToNationalPokedexNum(word), 0); case EC_GROUP_EVENTS: case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: - if (gUnknown_083DB694->unk40[2][11 + group] == 0) + if (gEasyChatStruct->unk40[2][11 + group] == 0) return FALSE; return TRUE; case EC_GROUP_POKEMON_2: @@ -2133,9 +2133,9 @@ u16 sub_80EAE88(u8 group) { switch (group) { - case 0: + case EC_GROUP_POKEMON_1: return GetHoennPokedexCount(0); - case 0x14: + case EC_GROUP_TRENDY_SAYING: return sub_80EB8C0(); default: if (sub_80EAD7C(group)) @@ -2156,7 +2156,7 @@ void sub_80EAECC(void) push {r5-r7}\n\ sub sp, 0x10\n\ movs r7, 0\n\ - ldr r1, _080EAF08 @ =gUnknown_083DB694\n\ + ldr r1, _080EAF08 @ =gEasyChatStruct\n\ ldr r0, [r1]\n\ ldr r3, _080EAF0C @ =0x0000446c\n\ adds r3, r0, r3\n\ @@ -2181,7 +2181,7 @@ _080EAEE4:\n\ str r3, [sp, 0x8]\n\ b _080EB00C\n\ .align 2, 0\n\ -_080EAF08: .4byte gUnknown_083DB694\n\ +_080EAF08: .4byte gEasyChatStruct\n\ _080EAF0C: .4byte 0x0000446c\n\ _080EAF10: .4byte gEasyChatWordsByLetter\n\ _080EAF14:\n\ @@ -2234,7 +2234,7 @@ _080EAF4A:\n\ beq _080EAF9E\n\ cmp r3, 0\n\ bne _080EAF9E\n\ - ldr r3, _080EAFBC @ =gUnknown_083DB694\n\ + ldr r3, _080EAFBC @ =gEasyChatStruct\n\ ldr r2, [r3]\n\ mov r1, r9\n\ adds r0, r1, 0x1\n\ @@ -2267,7 +2267,7 @@ _080EAFAC: .4byte gEasyChatWordsAlphabetized\n\ _080EAFB0: .4byte 0x0000feff\n\ _080EAFB4: .4byte 0x0000ffff\n\ _080EAFB8: .4byte 0x000001ff\n\ -_080EAFBC: .4byte gUnknown_083DB694\n\ +_080EAFBC: .4byte gEasyChatStruct\n\ _080EAFC0: .4byte 0x00000b78\n\ _080EAFC4: .4byte 0x0000446c\n\ _080EAFC8:\n\ @@ -2280,7 +2280,7 @@ _080EAFC8:\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _080EB00C\n\ - ldr r0, _080EB034 @ =gUnknown_083DB694\n\ + ldr r0, _080EB034 @ =gEasyChatStruct\n\ ldr r2, [r0]\n\ mov r1, r9\n\ adds r0, r1, 0x1\n\ @@ -2327,7 +2327,7 @@ _080EB020:\n\ bx r0\n\ .align 2, 0\n\ _080EB030: .4byte 0x000001ff\n\ -_080EB034: .4byte gUnknown_083DB694\n\ +_080EB034: .4byte gEasyChatStruct\n\ _080EB038: .4byte 0x00000b78\n\ _080EB03C: .4byte 0x0000446c\n\ .syntax divided\n"); @@ -2346,7 +2346,7 @@ void sub_80EAECC(void) u16 word = gEasyChatWordsByLetter[i]; u16 sp0 = gEasyChatWordsByLetter[i + 1]; - gUnknown_083DB694->unk4142[i] = 0; + gEasyChatStruct->unk4142[i] = 0; r9 = 0; r6 = word; while (r6 < sp0) @@ -2362,8 +2362,8 @@ void sub_80EAECC(void) word = gEasyChatWordsAlphabetized[r6++]; if (sub_80EADC0(EC_GROUP(word), EC_INDEX(word)) && !r7) { - gUnknown_083DB694->unkB78[i][r9++] = word; - gUnknown_083DB694->unk4142[i]++; + gEasyChatStruct->unkB78[i][r9++] = word; + gEasyChatStruct->unk4142[i]++; r7 = TRUE; } } @@ -2372,8 +2372,8 @@ void sub_80EAECC(void) { if (sub_80EADC0(EC_GROUP(word), EC_INDEX(word))) { - gUnknown_083DB694->unkB78[i][r9++] = word; - gUnknown_083DB694->unk4142[i]++; + gEasyChatStruct->unkB78[i][r9++] = word; + gEasyChatStruct->unk4142[i]++; } } } @@ -2386,14 +2386,14 @@ extern const u16 *const gEasyChatGroupOrders[]; extern const u8 gEasyChatGroupSizes[]; // loads strings of all easy chat words except for the species and move names. -void sub_80EB040(void) +void LoadEasyChatStrings(void) { u16 group; u16 index; for (group = 0; group <= EC_GROUP_POKEMON_2; group++) { - if (group != EC_GROUP_POKEMON + if (group != EC_GROUP_POKEMON_1 && group != EC_GROUP_POKEMON_2 && group != EC_GROUP_MOVE_1 && group != EC_GROUP_MOVE_2) @@ -2403,7 +2403,7 @@ void sub_80EB040(void) index = 0; while (*wordText != EOS) { - gUnknown_083DB694->unk41A4[group][index] = wordText; + gEasyChatStruct->ecWordStrings[group][index] = wordText; // Find the end of the current word while (*wordText != EOS) @@ -2424,20 +2424,20 @@ void sub_80EB0B0(void) u16 r9; u16 r8; - if (gUnknown_083DB694->unk26 == 0) + if (gEasyChatStruct->unk26 == 0) { - u16 r6 = gUnknown_083DB694->unk1B8; + u16 group = gEasyChatStruct->unk1B8; - gUnknown_083DB694->unk4178[r6] = 0; + gEasyChatStruct->unk4178[group] = 0; r7 = 0; r9 = 0; - sp0 = gEasyChatGroupOrders[r6]; - for (r8 = 0; r8 < gEasyChatGroupSizes[gUnknown_083DB694->unk1B8]; r8++) + sp0 = gEasyChatGroupOrders[group]; + for (r8 = 0; r8 < gEasyChatGroupSizes[gEasyChatStruct->unk1B8]; r8++) { - if (sub_80EADC0(r6, sp0[r8])) + if (sub_80EADC0(group, sp0[r8])) { - gUnknown_083DB694->unk9A2A[r9][r7] = ((r6 & 0x7F) << 9) | (sp0[r8] & 0x1FF); - gUnknown_083DB694->unk4178[r6]++; + gEasyChatStruct->unk9A2A[r9][r7] = ((group & 0x7F) << 9) | (sp0[r8] & 0x1FF); + gEasyChatStruct->unk4178[group]++; r7++; if (r7 > 1) { @@ -2449,14 +2449,14 @@ void sub_80EB0B0(void) } else { - u8 r2 = gUnknown_083DB694->unk1B8; + u8 r2 = gEasyChatStruct->unk1B8; u16 r3 = 0; u16 r6 = 0; u16 r5; - for (r5 = 0; r5 < gUnknown_083DB694->unk4142[r2]; r5++) + for (r5 = 0; r5 < gEasyChatStruct->unk4142[r2]; r5++) { - gUnknown_083DB694->unk9A2A[r6][r3] = gUnknown_083DB694->unkB78[r2][r5]; + gEasyChatStruct->unk9A2A[r6][r3] = gEasyChatStruct->unkB78[r2][r5]; r3++; if (r3 > 1) { @@ -2467,17 +2467,17 @@ void sub_80EB0B0(void) } } -u8 *sub_80EB218(u8 *a, u16 word, u16 c) +u8 *sub_80EB218(u8 *dest, u16 word, u16 c) { u8 *wordText; if (sub_80EB37C(word)) { - wordText = StringCopy(a, gOtherText_ThreeQuestions); + wordText = StringCopy(dest, gOtherText_ThreeQuestions); } else if (word == 0xFFFF) { - wordText = a; + wordText = dest; wordText[0] = EOS; // Why? It's going to get overwritten. } else @@ -2487,16 +2487,16 @@ u8 *sub_80EB218(u8 *a, u16 word, u16 c) switch (group) { - case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_1: case EC_GROUP_POKEMON_2: - wordText = StringCopy(a, gSpeciesNames[index]); + wordText = StringCopy(dest, gSpeciesNames[index]); break; case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: - wordText = StringCopy(a, gMoveNames[index]); + wordText = StringCopy(dest, gMoveNames[index]); break; default: - wordText = StringCopy(a, gUnknown_083DB694->unk41A4[group][index]); + wordText = StringCopy(dest, gEasyChatStruct->ecWordStrings[group][index]); break; } } @@ -2531,7 +2531,7 @@ u16 sub_80EB2D4(u16 word) switch (group) { - case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_1: case EC_GROUP_POKEMON_2: wordText = gSpeciesNames[index]; break; @@ -2540,7 +2540,7 @@ u16 sub_80EB2D4(u16 word) wordText = gMoveNames[index]; break; default: - wordText = gUnknown_083DB694->unk41A4[group][index]; + wordText = gEasyChatStruct->ecWordStrings[group][index]; break; } } @@ -2557,7 +2557,7 @@ u16 sub_80EB2D4(u16 word) bool8 sub_80EB37C(u16 word) { const u16 *r4; - u16 r3; + u16 i; if (word == 0xFFFF) { @@ -2572,14 +2572,14 @@ bool8 sub_80EB37C(u16 word) { switch (group) { - case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_1: case EC_GROUP_POKEMON_2: case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: r4 = (u16 *)gEasyChatGroupWords[group]; - for (r3 = 0; r3 < gEasyChatGroupSizes[group]; r3++) + for (i = 0; i < gEasyChatGroupSizes[group]; i++) { - if (index == r4[r3]) + if (index == r4[i]) return FALSE; } break; @@ -2602,7 +2602,7 @@ u32 de_sub_80EB748(s32 group, s32 index) switch (group) { - case EC_GROUP_POKEMON: + case EC_GROUP_POKEMON_1: case EC_GROUP_POKEMON_2: case EC_GROUP_MOVE_1: case EC_GROUP_MOVE_2: @@ -2647,7 +2647,7 @@ u8 *EasyChat_GetWordText(u8 *dst, u16 word) wordIndex = EC_INDEX(word); switch (group) { - case EC_GROUP_POKEMON: // 0 + case EC_GROUP_POKEMON_1: // 0 case EC_GROUP_POKEMON_2: // 21 dst = StringCopy(dst, gSpeciesNames[wordIndex]); break; @@ -2763,7 +2763,7 @@ u16 unref_sub_80EB5E0(u16 arg0) word = EC_INDEX(arg0); switch (group) { - case EC_GROUP_POKEMON: // 0 + case EC_GROUP_POKEMON_1: // 0 case EC_GROUP_POKEMON_2: // 21 chars = gSpeciesNames[word]; break; @@ -2845,7 +2845,7 @@ u16 sub_80EB72C(u16 group) { u16 local1 = Random() % gEasyChatGroupSizes[group]; - if (group == EC_GROUP_POKEMON + if (group == EC_GROUP_POKEMON_1 || group == EC_GROUP_POKEMON_2 || group == EC_GROUP_MOVE_1 || group == EC_GROUP_MOVE_2) @@ -2861,7 +2861,7 @@ u16 sub_80EB784(u16 group) if (!sub_80EAD7C(group)) return -1; - if (group != EC_GROUP_POKEMON) + if (group != EC_GROUP_POKEMON_1) { if (group == EC_GROUP_TRENDY_SAYING) return sub_80EB960(); @@ -3030,8 +3030,8 @@ static u16 sub_80EB9D8(void) return -1; local1 = Random() % local1; - speciesList = (u16 *) gEasyChatGroupWords[EC_GROUP_POKEMON]; - for (i = 0; i < gEasyChatGroupSizes[EC_GROUP_POKEMON]; i++) + speciesList = (u16 *)gEasyChatGroupWords[EC_GROUP_POKEMON_1]; + for (i = 0; i < gEasyChatGroupSizes[EC_GROUP_POKEMON_1]; i++) { const u16 dexNum = SpeciesToNationalPokedexNum(*speciesList); const u8 local2 = GetSetPokedexFlag(dexNum, 0); -- cgit v1.2.3 From e95436b9024f2c32a2a005c97cf35f426fadab62 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 22:33:15 -0600 Subject: tabs to spaces --- ld_script.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ld_script.txt b/ld_script.txt index 1b50c1f65..5bfc8b171 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -303,7 +303,7 @@ SECTIONS { asm/battle_intro.o(.text); src/field/bike.o(.text); src/easy_chat_1.o(.text); - src/easy_chat_2.o(.text); + src/easy_chat_2.o(.text); src/pokenav_before.o(.text); asm/pokenav.o(.text); src/pokenav_after.o(.text); -- cgit v1.2.3 From 8d035c81528d172570338ec82c07770e7ebcfe50 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 22:15:05 -0700 Subject: cable car util --- asm/cable_car_util.s | 162 -------------------------------------------- include/cable_car_util.h | 4 +- ld_script.txt | 2 +- src/engine/cable_car_util.c | 46 +++++++++++++ src/scene/cable_car.c | 48 ++++++------- 5 files changed, 73 insertions(+), 189 deletions(-) delete mode 100644 asm/cable_car_util.s create mode 100644 src/engine/cable_car_util.c diff --git a/asm/cable_car_util.s b/asm/cable_car_util.s deleted file mode 100644 index 50ef19dec..000000000 --- a/asm/cable_car_util.s +++ /dev/null @@ -1,162 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_8124E7C -sub_8124E7C: @ 8124E7C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r10, r0 - ldr r0, [sp, 0x24] - ldr r4, [sp, 0x28] - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - lsls r2, 24 - lsrs r2, 24 - str r2, [sp] - lsls r3, 24 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r4, 24 - lsrs r4, 24 - mov r8, r4 - movs r0, 0 - lsrs r4, r3, 24 - cmp r0, r8 - bcs _08124EF6 -_08124EAE: - ldr r2, [sp] - movs r3, 0 - adds r6, r4, 0x1 - adds r0, 0x1 - mov r12, r0 - cmp r3, r7 - bcs _08124EE0 - lsls r5, r4, 6 -_08124EBE: - lsls r0, r2, 1 - adds r0, r5 - add r0, r10 - mov r1, r9 - strh r1, [r0] - adds r1, r2, 0x1 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r7 - bcc _08124EBE -_08124EE0: - adds r0, r6, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r6, r0 - lsls r0, 24 - lsrs r4, r0, 24 - mov r1, r12 - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, r8 - bcc _08124EAE -_08124EF6: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8124E7C - - thumb_func_start sub_8124F08 -sub_8124F08: @ 8124F08 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r10, r0 - ldr r0, [sp, 0x24] - ldr r4, [sp, 0x28] - lsls r2, 24 - lsrs r2, 24 - str r2, [sp] - lsls r3, 24 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - lsls r4, 24 - lsrs r4, 24 - mov r9, r4 - movs r0, 0 - adds r5, r1, 0 - lsrs r4, r3, 24 - cmp r0, r9 - bcs _08124F82 -_08124F38: - ldr r2, [sp] - movs r3, 0 - adds r7, r4, 0x1 - adds r0, 0x1 - mov r8, r0 - cmp r3, r12 - bcs _08124F6C - lsls r6, r4, 6 -_08124F48: - lsls r0, r2, 1 - adds r0, r6 - add r0, r10 - ldrh r1, [r5] - strh r1, [r0] - adds r5, 0x2 - adds r1, r2, 0x1 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r12 - bcc _08124F48 -_08124F6C: - adds r0, r7, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r7, r0 - lsls r0, 24 - lsrs r4, r0, 24 - mov r1, r8 - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, r9 - bcc _08124F38 -_08124F82: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8124F08 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/cable_car_util.h b/include/cable_car_util.h index f1f52bb3c..7126331a1 100644 --- a/include/cable_car_util.h +++ b/include/cable_car_util.h @@ -7,7 +7,7 @@ // Exported ROM declarations -void sub_8124F08(u16 dest[][32], const u16 *src, u8 x, u8 y, u8 width, u8 height); -void sub_8124E7C(u16 dest[][32], u16 a1, u8 a2, u8 a3, u8 a4, u8 a5); +void CableCarUtil_FillWrapped(void *dest, u16 value, u8 x, u8 y, u8 width, u8 height); +void CableCarUtil_CopyWrapped(void *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height); #endif //GUARD_CABLE_CAR_UTIL_H diff --git a/ld_script.txt b/ld_script.txt index 07345eb18..dc7f4784f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -349,7 +349,7 @@ SECTIONS { src/field/choose_party.o(.text); src/scene/cable_car.o(.text); asm/roulette_util.o(.text); - asm/cable_car_util.o(.text); + src/engine/cable_car_util.o(.text); src/unused_8124F94.o(.text); src/engine/save.o(.text); src/engine/mystery_event_script.o(.text); diff --git a/src/engine/cable_car_util.c b/src/engine/cable_car_util.c new file mode 100644 index 000000000..27f703b42 --- /dev/null +++ b/src/engine/cable_car_util.c @@ -0,0 +1,46 @@ +#include "global.h" +#include "cable_car_util.h" + +// static types + +// static declarations + +// rodata + +// text + +void CableCarUtil_FillWrapped(void *dest, u16 value, u8 x, u8 y, u8 width, u8 height) +{ + u8 i; + u8 j; + u8 _x; + u8 _y; + + for (i = 0, _y = y; i < height; i++) + { + for (_x = x, j = 0; j < width; j++) + { + *(u16 *)&((u8 *)dest)[_y * 64 + _x * 2] = value; + _x = (_x + 1) % 32; + } + _y = (_y + 1) % 32; + } +} +void CableCarUtil_CopyWrapped(void *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height) +{ + u8 i; + u8 j; + u8 _x; + u8 _y; + const u16 *_src; + + for (i = 0, _src = src, _y = y; i < height; i++) + { + for (_x = x, j = 0; j < width; j++) + { + *(u16 *)&((u8 *)dest)[_y * 64 + _x * 2] = *_src++; + _x = (_x + 1) % 32; + } + _y = (_y + 1) % 32; + } +} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index f57233556..52a0aeebf 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -268,22 +268,22 @@ static void CableCarMainCallback_Setup(void) } break; case 5: - sub_8124F08((void *)BG_SCREEN_ADDR(29), eCableCar2->treeTilemap, 0, 17, 32, 15); - sub_8124F08((void *)BG_SCREEN_ADDR(30), eCableCar2->mountainTilemap, 0, 0, 30, 20); - sub_8124F08(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); - sub_8124F08(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 20); + CableCarUtil_CopyWrapped((void *)BG_SCREEN_ADDR(29), eCableCar2->treeTilemap, 0, 17, 32, 15); + CableCarUtil_CopyWrapped((void *)BG_SCREEN_ADDR(30), eCableCar2->mountainTilemap, 0, 0, 30, 20); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 20); gMain.state++; break; case 6: sub_81248AC(gSpecialVar_0x8004); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x48, 0, 14, 12, 3); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x6C, 12, 17, 12, 3); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x90, 24, 20, 12, 3); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 0, 17, 12, 3); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0, 20, 12, 3); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 12, 20, 12, 3); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 12, 23, 12, 3); - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 24, 23, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x48, 0, 14, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x6C, 12, 17, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x90, 24, 20, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 0, 17, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0, 20, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 12, 20, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 12, 23, 12, 3); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x00, 24, 23, 12, 3); gMain.state++; break; case 7: @@ -435,17 +435,17 @@ static void sub_81239E4(u8 taskId) switch (sCableCarPtr->unk_0014) { case 175: - sub_8124E7C(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10); + CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10); break; case 40: - sub_8124E7C(sCableCarPtr->unk_08fc, 0, 3, 0, 2, 2); + CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 3, 0, 2, 2); break; case 32: - sub_8124E7C(sCableCarPtr->unk_08fc, 0, 2, 0, 1, 2); + CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 2, 0, 1, 2); break; case 16: - sub_8124F08(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); - sub_8124F08(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, gCableCarPylonHookTilemapEntries, 0, 0, 5, 2); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); sCableCarPtr->unk_0015 = 64; break; } @@ -471,11 +471,11 @@ static void sub_8123AF8(u8 taskId) switch (sCableCarPtr->unk_0014) { case 176: - sub_8124F08(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_08fc, eCableCar2->pylonStemTilemap, 0, 2, 2, 30); break; case 16: - sub_8124E7C(sCableCarPtr->unk_08fc, 0, 2, 0, 3, 2); - sub_8124E7C(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10); + CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 2, 0, 3, 2); + CableCarUtil_FillWrapped(sCableCarPtr->unk_08fc, 0, 0, 22, 2, 10); sCableCarPtr->unk_0015 = 192; break; case 32: @@ -772,7 +772,7 @@ static void LoadSprites(void) sub_807C9B4(2); break; case 1: - sub_8124F08(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); + CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66); if (spriteId != MAX_SPRITES) { @@ -914,14 +914,14 @@ static void sub_81245F4(void) sCableCarPtr->unk_00fc[gUnknown_02039279][gUnknown_02039278] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018 + 1]; } gUnknown_02039278 = (sCableCarPtr->unk_0019 + 30) % 32; - sub_8124E7C(sCableCarPtr->unk_00fc, 0, gUnknown_02039278, 0, 2, 32); + CableCarUtil_FillWrapped(sCableCarPtr->unk_00fc, 0, gUnknown_02039278, 0, 2, 32); if (sCableCarPtr->unk_0018 == 0) { sCableCarPtr->unk_001a = (sCableCarPtr->unk_001a + 29) % 32; sCableCarPtr->unk_0018 = 12; sub_812446C(); gUnknown_02039278 = (sCableCarPtr->unk_001a + 1) % 32; - sub_8124E7C(sCableCarPtr->unk_00fc, 0, 0, gUnknown_02039278, 32, 9); + CableCarUtil_FillWrapped(sCableCarPtr->unk_00fc, 0, 0, gUnknown_02039278, 32, 9); } } @@ -944,7 +944,7 @@ static void sub_812476C(void) sCableCarPtr->unk_00fc[gUnknown_0203927C][gUnknown_0203927B] = sCableCarPtr->unk_0022[i][sCableCarPtr->unk_0018 + 1]; } gUnknown_0203927C = (sCableCarPtr->unk_001a + 23) % 32; - sub_8124E7C(sCableCarPtr->unk_00fc, 0, sCableCarPtr->unk_0019, gUnknown_0203927C, 2, 9); + CableCarUtil_FillWrapped(sCableCarPtr->unk_00fc, 0, sCableCarPtr->unk_0019, gUnknown_0203927C, 2, 9); if (sCableCarPtr->unk_0018 == 10) { sCableCarPtr->unk_001a = (sCableCarPtr->unk_001a + 3) % 32; -- cgit v1.2.3 From e03aeeec0de589ce361eb37edb4fc091f0959a1a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 00:17:11 -0500 Subject: Rename vars in cable car util --- src/engine/cable_car_util.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/engine/cable_car_util.c b/src/engine/cable_car_util.c index 27f703b42..02bfbc195 100644 --- a/src/engine/cable_car_util.c +++ b/src/engine/cable_car_util.c @@ -9,38 +9,39 @@ // text -void CableCarUtil_FillWrapped(void *dest, u16 value, u8 x, u8 y, u8 width, u8 height) +void CableCarUtil_FillWrapped(void *dest, u16 value, u8 left, u8 top, u8 width, u8 height) { u8 i; u8 j; - u8 _x; - u8 _y; + u8 x; + u8 y; - for (i = 0, _y = y; i < height; i++) + for (i = 0, y = top; i < height; i++) { - for (_x = x, j = 0; j < width; j++) + for (x = left, j = 0; j < width; j++) { - *(u16 *)&((u8 *)dest)[_y * 64 + _x * 2] = value; - _x = (_x + 1) % 32; + *(u16 *)&((u8 *)dest)[y * 64 + x * 2] = value; + x = (x + 1) % 32; } - _y = (_y + 1) % 32; + y = (y + 1) % 32; } } -void CableCarUtil_CopyWrapped(void *dest, const u16 *src, u8 x, u8 y, u8 width, u8 height) + +void CableCarUtil_CopyWrapped(void *dest, const u16 *src, u8 left, u8 top, u8 width, u8 height) { u8 i; u8 j; - u8 _x; - u8 _y; + u8 x; + u8 y; const u16 *_src; - for (i = 0, _src = src, _y = y; i < height; i++) + for (i = 0, _src = src, y = top; i < height; i++) { - for (_x = x, j = 0; j < width; j++) + for (x = left, j = 0; j < width; j++) { - *(u16 *)&((u8 *)dest)[_y * 64 + _x * 2] = *_src++; - _x = (_x + 1) % 32; + *(u16 *)&((u8 *)dest)[y * 64 + x * 2] = *_src++; + x = (x + 1) % 32; } - _y = (_y + 1) % 32; + y = (y + 1) % 32; } } -- cgit v1.2.3 From ac4e2d3290db2bd8912899b063a7e7824b981b08 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 6 Jan 2018 01:01:19 -0600 Subject: combine asm-de into asm --- .travis.yml | 1 - asm-de/contest_link_80C2020.s | 5638 ----------------------------------------- asm-de/contest_link_80C857C.s | 1408 ---------- asm/contest_link_80C2020.s | 271 ++ asm/contest_link_80C857C.s | 510 +++- 5 files changed, 779 insertions(+), 7049 deletions(-) delete mode 100644 asm-de/contest_link_80C2020.s delete mode 100644 asm-de/contest_link_80C857C.s diff --git a/.travis.yml b/.travis.yml index 56bea002d..04b2597b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,6 @@ matrix: env: _="Build German" before_script: - cp override-de.mk override.mk - - rsync -avhI asm-de/ asm/ - rsync -avhI data-de/ data/ - rsync -avhI graphics-de/ graphics/ script: diff --git a/asm-de/contest_link_80C2020.s b/asm-de/contest_link_80C2020.s deleted file mode 100644 index 0213fe90c..000000000 --- a/asm-de/contest_link_80C2020.s +++ /dev/null @@ -1,5638 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_80C2020 -sub_80C2020: @ 80C2020 - push {r4,r5,lr} - movs r5, 0x80 - lsls r5, 19 - movs r0, 0x40 - strh r0, [r5] - ldr r4, _080C20F0 @ =gWindowConfig_81E6FA0 - adds r0, r4, 0 - bl SetUpWindowConfig - ldr r0, _080C20F4 @ =gMenuWindow - adds r1, r4, 0 - bl InitWindowFromConfig - ldr r1, _080C20F8 @ =REG_BG0CNT - movs r2, 0xF8 - lsls r2, 6 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r3, _080C20FC @ =0x00001803 - adds r0, r3, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r2, _080C2100 @ =0x00001c03 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r3, _080C2104 @ =0x00003a03 - adds r0, r3, 0 - strh r0, [r1] - ldr r0, _080C2108 @ =REG_MOSAIC - movs r2, 0 - strh r2, [r0] - adds r1, 0x3A - ldr r3, _080C210C @ =0x00003f3f - adds r0, r3, 0 - strh r0, [r1] - adds r1, 0x2 - subs r3, 0x11 - adds r0, r3, 0 - strh r0, [r1] - ldr r0, _080C2110 @ =REG_WIN0H - strh r2, [r0] - adds r0, 0x4 - strh r2, [r0] - subs r0, 0x2 - strh r2, [r0] - adds r0, 0x4 - strh r2, [r0] - adds r0, 0xA - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - subs r0, 0x44 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - adds r0, 0x2 - strh r2, [r0] - ldrh r0, [r5] - movs r3, 0xFE - lsls r3, 7 - adds r1, r3, 0 - orrs r0, r1 - strh r0, [r5] - ldr r0, _080C2114 @ =gUnknown_030042A4 - strh r2, [r0] - ldr r0, _080C2118 @ =gUnknown_030042A0 - strh r2, [r0] - ldr r0, _080C211C @ =gBattle_BG1_X - strh r2, [r0] - ldr r0, _080C2120 @ =gBattle_BG1_Y - strh r2, [r0] - ldr r0, _080C2124 @ =gBattle_BG2_X - strh r2, [r0] - ldr r0, _080C2128 @ =gBattle_BG2_Y - strh r2, [r0] - ldr r0, _080C212C @ =gUnknown_030041B0 - strh r2, [r0] - ldr r0, _080C2130 @ =gUnknown_030041B8 - strh r2, [r0] - ldr r0, _080C2134 @ =gBattle_WIN0H - strh r2, [r0] - ldr r0, _080C2138 @ =gBattle_WIN0V - strh r2, [r0] - ldr r0, _080C213C @ =gBattle_WIN1H - strh r2, [r0] - ldr r0, _080C2140 @ =gBattle_WIN1V - strh r2, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C20F0: .4byte gWindowConfig_81E6FA0 -_080C20F4: .4byte gMenuWindow -_080C20F8: .4byte REG_BG0CNT -_080C20FC: .4byte 0x00001803 -_080C2100: .4byte 0x00001c03 -_080C2104: .4byte 0x00003a03 -_080C2108: .4byte REG_MOSAIC -_080C210C: .4byte 0x00003f3f -_080C2110: .4byte REG_WIN0H -_080C2114: .4byte gUnknown_030042A4 -_080C2118: .4byte gUnknown_030042A0 -_080C211C: .4byte gBattle_BG1_X -_080C2120: .4byte gBattle_BG1_Y -_080C2124: .4byte gBattle_BG2_X -_080C2128: .4byte gBattle_BG2_Y -_080C212C: .4byte gUnknown_030041B0 -_080C2130: .4byte gUnknown_030041B8 -_080C2134: .4byte gBattle_WIN0H -_080C2138: .4byte gBattle_WIN0V -_080C213C: .4byte gBattle_WIN1H -_080C2140: .4byte gBattle_WIN1V - thumb_func_end sub_80C2020 - - thumb_func_start sub_80C2144 -sub_80C2144: @ 80C2144 - push {r4-r7,lr} - sub sp, 0x4 - movs r2, 0xC0 - lsls r2, 19 - movs r3, 0xC0 - lsls r3, 9 - ldr r0, _080C220C @ =gUnknown_08D1977C - mov r12, r0 - movs r5, 0 - ldr r1, _080C2210 @ =0x040000d4 - movs r4, 0x80 - lsls r4, 5 - ldr r6, _080C2214 @ =0x85000400 - movs r7, 0x85 - lsls r7, 24 -_080C2162: - str r5, [sp] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - str r6, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r4 - subs r3, r4 - cmp r3, r4 - bhi _080C2162 - str r5, [sp] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 2 - orrs r0, r7 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r1, 0xC0 - lsls r1, 19 - mov r0, r12 - bl LZDecompressVram - ldr r0, _080C2218 @ =gUnknown_08D1A490 - ldr r1, _080C221C @ =0x0600d000 - bl LZDecompressVram - ldr r0, _080C2220 @ =gUnknown_08D1A364 - ldr r1, _080C2224 @ =0x0600e000 - bl LZDecompressVram - ldr r0, _080C2228 @ =gUnknown_08D1A250 - ldr r1, _080C222C @ =0x0600f000 - bl LZDecompressVram - bl sub_80C37E4 - ldr r0, _080C2230 @ =gUnknown_08D1A618 - movs r2, 0x80 - lsls r2, 2 - movs r1, 0 - bl LoadCompressedPalette - ldr r0, _080C2234 @ =gWindowConfig_81E6FA0 - bl LoadFontDefaultPalette - movs r6, 0 -_080C21C0: - lsls r5, r6, 24 - lsrs r5, 24 - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80C3990 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80C39E4 - movs r5, 0 - lsls r1, r6, 1 - adds r2, r6, 0x1 - mov r12, r2 - lsls r4, 24 - asrs r7, r4, 24 - adds r1, r6 - lsls r1, 6 - lsls r4, r0, 24 -_080C21EC: - ldr r6, _080C2238 @ =0x000060b2 - cmp r5, r7 - bge _080C21F4 - adds r6, 0x2 -_080C21F4: - asrs r2, r4, 24 - adds r0, r2, 0 - cmp r2, 0 - bge _080C21FE - negs r0, r2 -_080C21FE: - cmp r5, r0 - bge _080C2240 - ldr r3, _080C223C @ =0x000060a4 - cmp r2, 0 - bge _080C2242 - adds r3, 0x2 - b _080C2242 - .align 2, 0 -_080C220C: .4byte gUnknown_08D1977C -_080C2210: .4byte 0x040000d4 -_080C2214: .4byte 0x85000400 -_080C2218: .4byte gUnknown_08D1A490 -_080C221C: .4byte 0x0600d000 -_080C2220: .4byte gUnknown_08D1A364 -_080C2224: .4byte 0x0600e000 -_080C2228: .4byte gUnknown_08D1A250 -_080C222C: .4byte 0x0600f000 -_080C2230: .4byte gUnknown_08D1A618 -_080C2234: .4byte gWindowConfig_81E6FA0 -_080C2238: .4byte 0x000060b2 -_080C223C: .4byte 0x000060a4 -_080C2240: - ldr r3, _080C2264 @ =0x000060a2 -_080C2242: - ldr r2, _080C2268 @ =0x0600c166 - adds r0, r1, r2 - strh r6, [r0] - adds r2, 0x40 - adds r0, r1, r2 - strh r3, [r0] - adds r1, 0x2 - adds r5, 0x1 - cmp r5, 0x9 - ble _080C21EC - mov r6, r12 - cmp r6, 0x3 - ble _080C21C0 - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C2264: .4byte 0x000060a2 -_080C2268: .4byte 0x0600c166 - thumb_func_end sub_80C2144 - - thumb_func_start sub_80C226C -sub_80C226C: @ 80C226C - push {r4-r7,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, _080C2288 @ =gContestPlayerMonIndex - ldrb r0, [r0] - cmp r5, r0 - bne _080C2294 - ldr r0, _080C228C @ =gDisplayedStringBattle - ldr r1, _080C2290 @ =gUnknown_083D17DC - bl StringCopy - adds r2, r0, 0 - b _080C2296 - .align 2, 0 -_080C2288: .4byte gContestPlayerMonIndex -_080C228C: .4byte gDisplayedStringBattle -_080C2290: .4byte gUnknown_083D17DC -_080C2294: - ldr r2, _080C22E8 @ =gDisplayedStringBattle -_080C2296: - movs r4, 0xFC - strb r4, [r2] - movs r0, 0x6 - strb r0, [r2, 0x1] - movs r0, 0x4 - strb r0, [r2, 0x2] - adds r2, 0x3 - lsls r6, r5, 6 - ldr r7, _080C22EC @ =gContestMons + 0x2 - adds r1, r6, r7 - adds r0, r2, 0 - bl StringCopy - adds r2, r0, 0 - strb r4, [r2] - movs r0, 0x13 - strb r0, [r2, 0x1] - movs r0, 0x32 - strb r0, [r2, 0x2] - adds r2, 0x3 - ldr r1, _080C22F0 @ =gUnknown_083D17E0 - adds r0, r2, 0 - bl StringCopy - adds r2, r0, 0 - ldr r0, _080C22F4 @ =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C22FC - lsls r4, r5, 3 - subs r1, r4, r5 - lsls r1, 2 - ldr r0, _080C22F8 @ =gLinkPlayers + 0x8 - adds r1, r0 - adds r0, r2, 0 - bl StringCopy - b _080C230A - .align 2, 0 -_080C22E8: .4byte gDisplayedStringBattle -_080C22EC: .4byte gContestMons + 0x2 -_080C22F0: .4byte gUnknown_083D17E0 -_080C22F4: .4byte gIsLinkContest -_080C22F8: .4byte gLinkPlayers + 0x8 -_080C22FC: - adds r1, r7, 0 - adds r1, 0xB - adds r1, r6, r1 - adds r0, r2, 0 - bl StringCopy - lsls r4, r5, 3 -_080C230A: - ldr r0, _080C2334 @ =gMenuWindow - ldr r1, _080C2338 @ =gDisplayedStringBattle - adds r2, r4, r5 - lsls r2, 18 - ldr r3, _080C233C @ =0x03020000 - adds r2, r3 - lsrs r2, 16 - lsls r3, r5, 1 - adds r3, r5 - adds r3, 0x4 - lsls r3, 24 - lsrs r3, 24 - str r3, [sp] - movs r3, 0x7 - bl sub_8003460 - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C2334: .4byte gMenuWindow -_080C2338: .4byte gDisplayedStringBattle -_080C233C: .4byte 0x03020000 - thumb_func_end sub_80C226C - - thumb_func_start sub_80C2340 -sub_80C2340: @ 80C2340 - push {r4,lr} - movs r4, 0 -_080C2344: - lsls r0, r4, 24 - lsrs r0, 24 - bl sub_80C226C - adds r4, 0x1 - cmp r4, 0x3 - ble _080C2344 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C2340 - - thumb_func_start sub_80C2358 -sub_80C2358: @ 80C2358 - push {r4,r5,lr} - sub sp, 0x4 - ldr r5, _080C240C @ =gPaletteFade - ldrb r0, [r5, 0x8] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r5, 0x8] - movs r0, 0 - bl SetVBlankCallback - bl sub_80C2020 - bl dp12_8087EA4 - bl ResetPaletteFade - bl ResetSpriteData - bl ResetTasks - bl FreeAllSpritePalettes - bl sub_80C2144 - bl sub_80C310C - movs r0, 0 - movs r1, 0x1 - bl sub_80C30D4 - bl sub_80C2340 - ldr r4, _080C2410 @ =gSharedMem + 0x18000 - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x18 - bl memset - adds r0, r4, 0 - adds r0, 0x18 - movs r1, 0 - movs r2, 0x50 - bl memset - bl sub_80C33DC - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldrb r1, [r5, 0x8] - movs r0, 0x7F - ands r0, r1 - strb r0, [r5, 0x8] - ldr r0, _080C2414 @ =sub_80C24F4 - movs r1, 0x5 - bl CreateTask - strb r0, [r4, 0x2] - ldr r0, _080C2418 @ =sub_80C2430 - bl SetMainCallback2 - ldr r1, _080C241C @ =gBattle_WIN1H - movs r0, 0xF0 - strh r0, [r1] - ldr r1, _080C2420 @ =gBattle_WIN1V - ldr r2, _080C2424 @ =0x000080a0 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080C2428 @ =sub_80C2F28 - movs r1, 0x14 - bl CreateTask - bl sub_80C3F00 - movs r0, 0xDF - lsls r0, 1 - bl PlayBGM - ldr r0, _080C242C @ =sub_80C2448 - bl SetVBlankCallback - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C240C: .4byte gPaletteFade -_080C2410: .4byte gSharedMem + 0x18000 -_080C2414: .4byte sub_80C24F4 -_080C2418: .4byte sub_80C2430 -_080C241C: .4byte gBattle_WIN1H -_080C2420: .4byte gBattle_WIN1V -_080C2424: .4byte 0x000080a0 -_080C2428: .4byte sub_80C2F28 -_080C242C: .4byte sub_80C2448 - thumb_func_end sub_80C2358 - - thumb_func_start sub_80C2430 -sub_80C2430: @ 80C2430 - push {lr} - bl AnimateSprites - bl BuildOamBuffer - bl RunTasks - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_80C2430 - - thumb_func_start sub_80C2448 -sub_80C2448: @ 80C2448 - push {lr} - ldr r1, _080C24C0 @ =REG_BG0HOFS - ldr r0, _080C24C4 @ =gUnknown_030042A4 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - ldr r0, _080C24C8 @ =gUnknown_030042A0 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - ldr r0, _080C24CC @ =gBattle_BG1_X - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - ldr r0, _080C24D0 @ =gBattle_BG1_Y - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - ldr r0, _080C24D4 @ =gBattle_BG2_X - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - ldr r0, _080C24D8 @ =gBattle_BG2_Y - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - ldr r0, _080C24DC @ =gUnknown_030041B0 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x2 - ldr r0, _080C24E0 @ =gUnknown_030041B8 - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x22 - ldr r0, _080C24E4 @ =gBattle_WIN0H - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x4 - ldr r0, _080C24E8 @ =gBattle_WIN0V - ldrh r0, [r0] - strh r0, [r1] - subs r1, 0x2 - ldr r0, _080C24EC @ =gBattle_WIN1H - ldrh r0, [r0] - strh r0, [r1] - adds r1, 0x4 - ldr r0, _080C24F0 @ =gBattle_WIN1V - ldrh r0, [r0] - strh r0, [r1] - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - bl sub_8089668 - pop {r0} - bx r0 - .align 2, 0 -_080C24C0: .4byte REG_BG0HOFS -_080C24C4: .4byte gUnknown_030042A4 -_080C24C8: .4byte gUnknown_030042A0 -_080C24CC: .4byte gBattle_BG1_X -_080C24D0: .4byte gBattle_BG1_Y -_080C24D4: .4byte gBattle_BG2_X -_080C24D8: .4byte gBattle_BG2_Y -_080C24DC: .4byte gUnknown_030041B0 -_080C24E0: .4byte gUnknown_030041B8 -_080C24E4: .4byte gBattle_WIN0H -_080C24E8: .4byte gBattle_WIN0V -_080C24EC: .4byte gBattle_WIN1H -_080C24F0: .4byte gBattle_WIN1V - thumb_func_end sub_80C2448 - - thumb_func_start sub_80C24F4 -sub_80C24F4: @ 80C24F4 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r2, r4, 0 - ldr r0, _080C252C @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080C254E - ldr r0, _080C2530 @ =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C2540 - ldr r0, _080C2534 @ =gOtherText_LinkStandby - bl sub_80C3698 - ldr r1, _080C2538 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _080C253C @ =sub_80C255C - str r1, [r0] - b _080C254E - .align 2, 0 -_080C252C: .4byte gPaletteFade -_080C2530: .4byte gIsLinkContest -_080C2534: .4byte gOtherText_LinkStandby -_080C2538: .4byte gTasks -_080C253C: .4byte sub_80C255C -_080C2540: - ldr r0, _080C2554 @ =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldr r0, _080C2558 @ =sub_80C2600 - str r0, [r1] -_080C254E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C2554: .4byte gTasks -_080C2558: .4byte sub_80C2600 - thumb_func_end sub_80C24F4 - - thumb_func_start sub_80C255C -sub_80C255C: @ 80C255C - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080C2594 @ =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _080C258C - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bne _080C258C - ldr r0, _080C2598 @ =sub_80C25A4 - movs r1, 0 - bl CreateTask - ldr r1, _080C259C @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _080C25A0 @ =TaskDummy - str r1, [r0] -_080C258C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C2594: .4byte gReceivedRemoteLinkPlayers -_080C2598: .4byte sub_80C25A4 -_080C259C: .4byte gTasks -_080C25A0: .4byte TaskDummy - thumb_func_end sub_80C255C - - thumb_func_start sub_80C25A4 -sub_80C25A4: @ 80C25A4 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080C25B8 @ =sub_80C89DC - ldr r2, _080C25BC @ =sub_80C25C0 - bl SetTaskFuncWithFollowupFunc - pop {r0} - bx r0 - .align 2, 0 -_080C25B8: .4byte sub_80C89DC -_080C25BC: .4byte sub_80C25C0 - thumb_func_end sub_80C25A4 - - thumb_func_start sub_80C25C0 -sub_80C25C0: @ 80C25C0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C25EC - adds r0, r4, 0 - bl DestroyTask - ldr r2, _080C25F4 @ =gTasks - ldr r0, _080C25F8 @ =gSharedMem + 0x18000 - ldrb r1, [r0, 0x2] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldr r1, _080C25FC @ =sub_80C2600 - str r1, [r0] - bl sub_80C3764 -_080C25EC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C25F4: .4byte gTasks -_080C25F8: .4byte gSharedMem + 0x18000 -_080C25FC: .4byte sub_80C2600 - thumb_func_end sub_80C25C0 - - thumb_func_start sub_80C2600 -sub_80C2600: @ 80C2600 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C2644 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r5, r1, r2 - ldrh r1, [r5, 0x8] - movs r2, 0x8 - ldrsh r0, [r5, r2] - cmp r0, 0 - bne _080C2654 - ldr r0, _080C2648 @ =sub_80C2F64 - movs r1, 0x14 - bl CreateTask - ldr r4, _080C264C @ =gContestText_AnnounceResults - ldr r0, _080C2650 @ =gSharedMem + 0x18000 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_80C3158 - adds r0, r4, 0 - bl sub_80C34AC - lsls r0, 16 - asrs r0, 16 - movs r3, 0x88 - lsls r3, 3 - movs r1, 0x90 - movs r2, 0x78 - b _080C26A6 - .align 2, 0 -_080C2644: .4byte gTasks -_080C2648: .4byte sub_80C2F64 -_080C264C: .4byte gContestText_AnnounceResults -_080C2650: .4byte gSharedMem + 0x18000 -_080C2654: - cmp r0, 0x1 - bne _080C2668 - ldr r0, _080C2664 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x4] - cmp r0, 0 - bne _080C26D4 - b _080C267C - .align 2, 0 -_080C2664: .4byte gSharedMem + 0x18000 -_080C2668: - cmp r0, 0x2 - bne _080C2684 - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x15 - bne _080C26D4 - movs r0, 0 -_080C267C: - strh r0, [r5, 0xA] - adds r0, r1, 0x1 - strh r0, [r5, 0x8] - b _080C26D4 -_080C2684: - cmp r0, 0x3 - bne _080C26C0 - ldr r4, _080C26B4 @ =gContestText_PreliminaryResults - ldr r0, _080C26B8 @ =gSharedMem + 0x18000 - ldrb r1, [r0] - adds r0, r4, 0 - bl sub_80C3158 - adds r0, r4, 0 - bl sub_80C34AC - lsls r0, 16 - asrs r0, 16 - ldr r2, _080C26BC @ =0x0000ffff - movs r3, 0x88 - lsls r3, 3 - movs r1, 0x90 -_080C26A6: - bl sub_80C34CC - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _080C26D4 - .align 2, 0 -_080C26B4: .4byte gContestText_PreliminaryResults -_080C26B8: .4byte gSharedMem + 0x18000 -_080C26BC: .4byte 0x0000ffff -_080C26C0: - cmp r0, 0x4 - bne _080C26D4 - ldr r0, _080C26DC @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x4] - cmp r0, 0x2 - bne _080C26D4 - movs r0, 0 - strh r0, [r5, 0x8] - ldr r0, _080C26E0 @ =sub_80C26E4 - str r0, [r5] -_080C26D4: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C26DC: .4byte gSharedMem + 0x18000 -_080C26E0: .4byte sub_80C26E4 - thumb_func_end sub_80C2600 - - thumb_func_start sub_80C26E4 -sub_80C26E4: @ 80C26E4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C2708 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080C2744 - cmp r0, 0x1 - bgt _080C270C - cmp r0, 0 - beq _080C2712 - b _080C2766 - .align 2, 0 -_080C2708: .4byte gTasks -_080C270C: - cmp r0, 0x2 - beq _080C2754 - b _080C2766 -_080C2712: - ldr r5, _080C2738 @ =gSharedMem + 0x18000 - ldrb r0, [r5, 0xA] - cmp r0, 0 - bne _080C2766 - ldrh r1, [r4, 0xC] - adds r0, r1, 0x1 - strh r0, [r4, 0xC] - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - bl sub_80C40D4 - ldrb r0, [r5, 0x14] - cmp r0, 0 - bne _080C273C - movs r0, 0x2 - strh r0, [r4, 0x8] - b _080C2766 - .align 2, 0 -_080C2738: .4byte gSharedMem + 0x18000 -_080C273C: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C2766 -_080C2744: - ldr r0, _080C2750 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x14] - cmp r0, 0 - bne _080C2766 - strh r0, [r4, 0x8] - b _080C2766 - .align 2, 0 -_080C2750: .4byte gSharedMem + 0x18000 -_080C2754: - movs r0, 0x88 - lsls r0, 3 - bl sub_80C3520 - movs r0, 0 - strh r0, [r4, 0x8] - strh r0, [r4, 0xC] - ldr r0, _080C276C @ =sub_80C2770 - str r0, [r4] -_080C2766: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C276C: .4byte sub_80C2770 - thumb_func_end sub_80C26E4 - - thumb_func_start sub_80C2770 -sub_80C2770: @ 80C2770 - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - adds r4, r2, 0 - ldr r5, _080C27BC @ =gSharedMem + 0x18000 - ldrb r3, [r5, 0x4] - cmp r3, 0 - bne _080C27CC - ldr r1, _080C27C0 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0, r1 - ldrh r0, [r1, 0xA] - adds r0, 0x1 - strh r0, [r1, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x15 - bne _080C27DE - strh r3, [r1, 0xA] - ldr r4, _080C27C4 @ =gContestText_Round2Results - ldrb r1, [r5] - adds r0, r4, 0 - bl sub_80C3158 - adds r0, r4, 0 - bl sub_80C34AC - lsls r0, 16 - asrs r0, 16 - ldr r2, _080C27C8 @ =0x0000ffff - movs r3, 0x88 - lsls r3, 3 - movs r1, 0x90 - bl sub_80C34CC - b _080C27DE - .align 2, 0 -_080C27BC: .4byte gSharedMem + 0x18000 -_080C27C0: .4byte gTasks -_080C27C4: .4byte gContestText_Round2Results -_080C27C8: .4byte 0x0000ffff -_080C27CC: - cmp r3, 0x2 - bne _080C27DE - ldr r0, _080C27E4 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, _080C27E8 @ =sub_80C27EC - str r0, [r1] -_080C27DE: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C27E4: .4byte gTasks -_080C27E8: .4byte sub_80C27EC - thumb_func_end sub_80C2770 - - thumb_func_start sub_80C27EC -sub_80C27EC: @ 80C27EC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C2810 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080C284C - cmp r0, 0x1 - bgt _080C2814 - cmp r0, 0 - beq _080C281A - b _080C286C - .align 2, 0 -_080C2810: .4byte gTasks -_080C2814: - cmp r0, 0x2 - beq _080C285C - b _080C286C -_080C281A: - ldr r5, _080C2840 @ =gSharedMem + 0x18000 - ldrb r0, [r5, 0xA] - cmp r0, 0 - bne _080C286C - ldrh r1, [r4, 0xC] - adds r0, r1, 0x1 - strh r0, [r4, 0xC] - lsls r1, 24 - lsrs r1, 24 - movs r0, 0x1 - bl sub_80C40D4 - ldrb r0, [r5, 0x14] - cmp r0, 0 - bne _080C2844 - movs r0, 0x2 - strh r0, [r4, 0x8] - b _080C286C - .align 2, 0 -_080C2840: .4byte gSharedMem + 0x18000 -_080C2844: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C286C -_080C284C: - ldr r0, _080C2858 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x14] - cmp r0, 0 - bne _080C286C - strh r0, [r4, 0x8] - b _080C286C - .align 2, 0 -_080C2858: .4byte gSharedMem + 0x18000 -_080C285C: - movs r0, 0x88 - lsls r0, 3 - bl sub_80C3520 - movs r0, 0 - strh r0, [r4, 0x8] - ldr r0, _080C2874 @ =sub_80C2878 - str r0, [r4] -_080C286C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C2874: .4byte sub_80C2878 - thumb_func_end sub_80C27EC - - thumb_func_start sub_80C2878 -sub_80C2878: @ 80C2878 - push {r4-r7,lr} - sub sp, 0x64 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080C28A0 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r2, r1, 0 - cmp r0, 0x5 - bls _080C2896 - b _080C2A80 -_080C2896: - lsls r0, 2 - ldr r1, _080C28A4 @ =_080C28A8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C28A0: .4byte gTasks -_080C28A4: .4byte _080C28A8 - .align 2, 0 -_080C28A8: - .4byte _080C28C0 - .4byte _080C28E0 - .4byte _080C28FE - .4byte _080C2938 - .4byte _080C299C - .4byte _080C2A70 -_080C28C0: - ldr r0, _080C28DC @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x4] - cmp r0, 0 - beq _080C28CA - b _080C2A80 -_080C28CA: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r2 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080C2A80 - .align 2, 0 -_080C28DC: .4byte gSharedMem + 0x18000 -_080C28E0: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r1, r0, r2 - ldrh r0, [r1, 0xA] - adds r0, 0x1 - strh r0, [r1, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - beq _080C28F8 - b _080C2A80 -_080C28F8: - movs r0, 0 - strh r0, [r1, 0xA] - b _080C2A4A -_080C28FE: - movs r4, 0 - lsls r6, r5, 2 - ldr r7, _080C292C @ =gTasks -_080C2904: - ldr r0, _080C2930 @ =sub_80C3A5C - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r7 - ldr r0, _080C2934 @ =gContestFinalStandings - adds r0, r4, r0 - ldrb r0, [r0] - strh r0, [r1, 0x8] - strh r4, [r1, 0xA] - adds r4, 0x1 - cmp r4, 0x3 - ble _080C2904 - b _080C2A42 - .align 2, 0 -_080C292C: .4byte gTasks -_080C2930: .4byte sub_80C3A5C -_080C2934: .4byte gContestFinalStandings -_080C2938: - ldr r0, _080C2990 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x5] - cmp r0, 0x4 - beq _080C2942 - b _080C2A80 -_080C2942: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r2 - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1F - beq _080C295A - b _080C2A80 -_080C295A: - movs r0, 0 - strh r0, [r4, 0xA] - ldr r0, _080C2994 @ =sub_80C3B30 - movs r1, 0xA - bl CreateTask - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - movs r4, 0 - ldr r1, _080C2998 @ =gContestFinalStandings - ldrb r0, [r1] - cmp r0, 0 - beq _080C2984 -_080C2976: - adds r4, 0x1 - cmp r4, 0x3 - bgt _080C2984 - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080C2976 -_080C2984: - lsls r0, r4, 24 - lsrs r0, 24 - movs r1, 0xE - bl sub_80C3E60 - b _080C2A80 - .align 2, 0 -_080C2990: .4byte gSharedMem + 0x18000 -_080C2994: .4byte sub_80C3B30 -_080C2998: .4byte gContestFinalStandings -_080C299C: - lsls r1, r5, 2 - adds r0, r1, r5 - lsls r0, 3 - adds r2, r0, r2 - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - adds r6, r1, 0 - cmp r0, 0x15 - bne _080C2A80 - movs r0, 0 - strh r0, [r2, 0xA] - movs r4, 0 - ldr r2, _080C29F4 @ =gContestFinalStandings - ldrb r0, [r2] - ldr r1, _080C29F8 @ =gIsLinkContest - ldr r3, _080C29FC @ =gStringVar1 - cmp r0, 0 - beq _080C29D4 -_080C29C6: - adds r4, 0x1 - cmp r4, 0x3 - bgt _080C29D4 - adds r0, r4, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080C29C6 -_080C29D4: - ldrb r1, [r1] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C2A04 - lsls r1, r4, 3 - subs r1, r4 - lsls r1, 2 - ldr r0, _080C2A00 @ =gLinkPlayers + 0x8 - adds r1, r0 - adds r0, r3, 0 - bl StringCopy - lsls r4, 6 - b _080C2A10 - .align 2, 0 -_080C29F4: .4byte gContestFinalStandings -_080C29F8: .4byte gIsLinkContest -_080C29FC: .4byte gStringVar1 -_080C2A00: .4byte gLinkPlayers + 0x8 -_080C2A04: - lsls r4, 6 - ldr r1, _080C2A54 @ =gUnknown_0203857D - adds r1, r4, r1 - adds r0, r3, 0 - bl StringCopy -_080C2A10: - ldr r0, _080C2A58 @ =gStringVar2 - ldr r1, _080C2A5C @ =gContestMons + 0x2 - adds r1, r4, r1 - bl StringCopy - ldr r1, _080C2A60 @ =gContestText_PokeWon - mov r0, sp - bl StringExpandPlaceholders - ldr r0, _080C2A64 @ =gSharedMem + 0x18000 - ldrb r1, [r0] - mov r0, sp - bl sub_80C3158 - mov r0, sp - bl sub_80C34AC - lsls r0, 16 - asrs r0, 16 - ldr r2, _080C2A68 @ =0x0000ffff - movs r3, 0x88 - lsls r3, 3 - movs r1, 0x90 - bl sub_80C34CC -_080C2A42: - ldr r0, _080C2A6C @ =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 -_080C2A4A: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C2A80 - .align 2, 0 -_080C2A54: .4byte gUnknown_0203857D -_080C2A58: .4byte gStringVar2 -_080C2A5C: .4byte gContestMons + 0x2 -_080C2A60: .4byte gContestText_PokeWon -_080C2A64: .4byte gSharedMem + 0x18000 -_080C2A68: .4byte 0x0000ffff -_080C2A6C: .4byte gTasks -_080C2A70: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r2 - movs r1, 0 - strh r1, [r0, 0x8] - ldr r1, _080C2A88 @ =sub_80C2A8C - str r1, [r0] -_080C2A80: - add sp, 0x64 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C2A88: .4byte sub_80C2A8C - thumb_func_end sub_80C2878 - - thumb_func_start sub_80C2A8C -sub_80C2A8C: @ 80C2A8C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, _080C2ABC @ =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r4, r1, 0 - cmp r0, 0x5 - bls _080C2AB2 - b _080C2D04 -_080C2AB2: - lsls r0, 2 - ldr r1, _080C2AC0 @ =_080C2AC4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C2ABC: .4byte gTasks -_080C2AC0: .4byte _080C2AC4 - .align 2, 0 -_080C2AC4: - .4byte _080C2ADC - .4byte _080C2C04 - .4byte _080C2C54 - .4byte _080C2C64 - .4byte _080C2CA8 - .4byte _080C2CE8 -_080C2ADC: - ldr r1, _080C2BC4 @ =gBattle_WIN0H - movs r0, 0xF0 - strh r0, [r1] - ldr r1, _080C2BC8 @ =gBattle_WIN0V - ldr r3, _080C2BCC @ =0x00005050 - adds r0, r3, 0 - strh r0, [r1] - movs r1, 0 - ldr r3, _080C2BD0 @ =gContestFinalStandings - ldrb r0, [r3] - lsls r4, r7, 2 - mov r10, r4 - ldr r2, _080C2BD4 @ =gContestMons - ldr r5, _080C2BD8 @ =gMonFrontPicTable - mov r12, r5 - ldr r4, _080C2BDC @ =gMonFrontPicCoords - mov r8, r4 - ldr r5, _080C2BE0 @ =gUnknown_081FAF4C - mov r9, r5 - cmp r0, 0 - beq _080C2B14 -_080C2B06: - adds r1, 0x1 - cmp r1, 0x3 - bgt _080C2B14 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _080C2B06 -_080C2B14: - lsls r1, 6 - adds r0, r1, r2 - ldrh r6, [r0] - adds r0, r2, 0 - adds r0, 0x38 - adds r0, r1, r0 - ldr r4, [r0] - adds r0, r2, 0 - adds r0, 0x3C - adds r1, r0 - ldr r1, [r1] - str r1, [sp, 0xC] - lsls r0, r6, 3 - add r0, r12 - lsls r2, r6, 2 - add r2, r8 - ldrb r1, [r2] - ldrb r2, [r2, 0x1] - mov r5, r9 - ldr r3, [r5, 0x4] - str r3, [sp] - str r6, [sp, 0x4] - str r4, [sp, 0x8] - ldr r3, _080C2BE4 @ =gSharedMem - bl HandleLoadSpecialPokePic - adds r0, r6, 0 - ldr r1, [sp, 0xC] - adds r2, r4, 0 - bl GetMonSpritePalStructFromOtIdPersonality - adds r4, r0, 0 - bl LoadCompressedObjectPalette - adds r0, r6, 0 - movs r1, 0x1 - bl GetMonSpriteTemplate_803C56C - ldr r0, _080C2BE8 @ =gUnknown_02024E8C - ldrh r1, [r4, 0x4] - strh r1, [r0, 0x2] - movs r1, 0x88 - lsls r1, 1 - movs r2, 0x50 - movs r3, 0xA - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r5, _080C2BEC @ =gSprites - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r3, r2, r5 - strh r6, [r3, 0x30] - ldrb r4, [r3, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r4 - strb r1, [r3, 0x5] - adds r5, 0x1C - adds r2, r5 - ldr r1, _080C2BF0 @ =sub_80C3C44 - str r1, [r2] - ldr r2, _080C2BE4 @ =gSharedMem - movs r3, 0xC0 - lsls r3, 9 - adds r1, r2, r3 - strb r0, [r1, 0x8] - ldr r0, _080C2BF4 @ =gUnknown_083D17CC - bl LoadCompressedObjectPic - ldr r0, _080C2BF8 @ =gUnknown_083D17D4 - bl LoadCompressedObjectPalette - ldr r0, _080C2BFC @ =sub_80C3D04 - movs r1, 0xA - bl CreateTask - ldr r0, _080C2C00 @ =gTasks - mov r4, r10 - adds r1, r4, r7 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C2D04 - .align 2, 0 -_080C2BC4: .4byte gBattle_WIN0H -_080C2BC8: .4byte gBattle_WIN0V -_080C2BCC: .4byte 0x00005050 -_080C2BD0: .4byte gContestFinalStandings -_080C2BD4: .4byte gContestMons -_080C2BD8: .4byte gMonFrontPicTable -_080C2BDC: .4byte gMonFrontPicCoords -_080C2BE0: .4byte gUnknown_081FAF4C -_080C2BE4: .4byte gSharedMem -_080C2BE8: .4byte gUnknown_02024E8C -_080C2BEC: .4byte gSprites -_080C2BF0: .4byte sub_80C3C44 -_080C2BF4: .4byte gUnknown_083D17CC -_080C2BF8: .4byte gUnknown_083D17D4 -_080C2BFC: .4byte sub_80C3D04 -_080C2C00: .4byte gTasks -_080C2C04: - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r4, r0, r4 - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - bne _080C2D04 - movs r0, 0 - strh r0, [r4, 0xE] - ldrh r0, [r4, 0xC] - adds r0, 0x2 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x20 - ble _080C2C30 - movs r0, 0x20 - strh r0, [r4, 0xC] -_080C2C30: - ldrb r2, [r4, 0xC] - ldr r3, _080C2C50 @ =gBattle_WIN0V - movs r0, 0x50 - subs r0, r2 - lsls r0, 8 - adds r1, r2, 0 - adds r1, 0x50 - orrs r0, r1 - strh r0, [r3] - cmp r2, 0x20 - bne _080C2D04 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C2D04 - .align 2, 0 -_080C2C50: .4byte gBattle_WIN0V -_080C2C54: - ldr r0, _080C2C60 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x6] - cmp r0, 0x1 - bne _080C2D04 - b _080C2CD0 - .align 2, 0 -_080C2C60: .4byte gSharedMem + 0x18000 -_080C2C64: - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r3, r0, r4 - ldrh r0, [r3, 0xA] - adds r0, 0x1 - strh r0, [r3, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x79 - bne _080C2D04 - movs r0, 0 - strh r0, [r3, 0xA] - ldr r2, _080C2C9C @ =gSprites - ldr r0, _080C2CA0 @ =gSharedMem + 0x18000 - ldrb r1, [r0, 0x8] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, _080C2CA4 @ =sub_80C3CB8 - str r1, [r0] - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] - b _080C2D04 - .align 2, 0 -_080C2C9C: .4byte gSprites -_080C2CA0: .4byte gSharedMem + 0x18000 -_080C2CA4: .4byte sub_80C3CB8 -_080C2CA8: - ldr r0, _080C2CE0 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x6] - cmp r0, 0x2 - bne _080C2D04 - ldr r3, _080C2CE4 @ =gBattle_WIN0V - ldrh r0, [r3] - lsrs r2, r0, 8 - adds r0, r2, 0x2 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x50 - bls _080C2CC2 - movs r2, 0x50 -_080C2CC2: - lsls r1, r2, 8 - movs r0, 0xA0 - subs r0, r2 - orrs r1, r0 - strh r1, [r3] - cmp r2, 0x50 - bne _080C2D04 -_080C2CD0: - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r4 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080C2D04 - .align 2, 0 -_080C2CE0: .4byte gSharedMem + 0x18000 -_080C2CE4: .4byte gBattle_WIN0V -_080C2CE8: - ldr r2, _080C2D14 @ =gSharedMem + 0x18000 - ldrb r0, [r2, 0x6] - cmp r0, 0x2 - bne _080C2D04 - movs r1, 0 - movs r0, 0x1 - strb r0, [r2, 0x9] - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r4 - strh r1, [r0, 0x8] - ldr r1, _080C2D18 @ =sub_80C2D1C - str r1, [r0] -_080C2D04: - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C2D14: .4byte gSharedMem + 0x18000 -_080C2D18: .4byte sub_80C2D1C - thumb_func_end sub_80C2A8C - - thumb_func_start sub_80C2D1C -sub_80C2D1C: @ 80C2D1C - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, _080C2D6C @ =gMain - ldrh r1, [r0, 0x2E] - movs r2, 0x1 - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _080C2D66 - ldr r0, _080C2D70 @ =gIsLinkContest - ldrb r1, [r0] - adds r0, r2, 0 - ands r0, r1 - lsls r6, r7, 2 - cmp r0, 0 - bne _080C2D5A - ldr r5, _080C2D74 @ =gContestMons - movs r4, 0x3 -_080C2D42: - ldrh r0, [r5] - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x2 - bl GetSetPokedexFlag - adds r5, 0x40 - subs r4, 0x1 - cmp r4, 0 - bge _080C2D42 -_080C2D5A: - ldr r0, _080C2D78 @ =gTasks - adds r1, r6, r7 - lsls r1, 3 - adds r1, r0 - ldr r0, _080C2D7C @ =sub_80C2D80 - str r0, [r1] -_080C2D66: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C2D6C: .4byte gMain -_080C2D70: .4byte gIsLinkContest -_080C2D74: .4byte gContestMons -_080C2D78: .4byte gTasks -_080C2D7C: .4byte sub_80C2D80 - thumb_func_end sub_80C2D1C - - thumb_func_start sub_80C2D80 -sub_80C2D80: @ 80C2D80 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080C2DAC @ =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C2DBC - ldr r0, _080C2DB0 @ =gOtherText_LinkStandby - bl sub_80C3698 - bl sub_800832C - ldr r1, _080C2DB4 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _080C2DB8 @ =sub_80C2DD8 - str r1, [r0] - b _080C2DCA - .align 2, 0 -_080C2DAC: .4byte gIsLinkContest -_080C2DB0: .4byte gOtherText_LinkStandby -_080C2DB4: .4byte gTasks -_080C2DB8: .4byte sub_80C2DD8 -_080C2DBC: - ldr r0, _080C2DD0 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, _080C2DD4 @ =sub_80C2E14 - str r0, [r1] -_080C2DCA: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C2DD0: .4byte gTasks -_080C2DD4: .4byte sub_80C2E14 - thumb_func_end sub_80C2D80 - - thumb_func_start sub_80C2DD8 -sub_80C2DD8: @ 80C2DD8 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080C2E04 @ =gReceivedRemoteLinkPlayers - ldrb r1, [r0] - cmp r1, 0 - bne _080C2DFC - ldr r0, _080C2E08 @ =gIsLinkContest - strb r1, [r0] - bl sub_80C3764 - ldr r1, _080C2E0C @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _080C2E10 @ =sub_80C2E14 - str r1, [r0] -_080C2DFC: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C2E04: .4byte gReceivedRemoteLinkPlayers -_080C2E08: .4byte gIsLinkContest -_080C2E0C: .4byte gTasks -_080C2E10: .4byte sub_80C2E14 - thumb_func_end sub_80C2DD8 - - thumb_func_start sub_80C2E14 -sub_80C2E14: @ 80C2E14 - push {r4-r6,lr} - sub sp, 0x4 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r1, _080C2E80 @ =gContestFinalStandings - ldr r0, _080C2E84 @ =gContestPlayerMonIndex - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - bl sub_80BE284 - movs r0, 0x2 - bl sub_810FB10 - ldr r0, _080C2E88 @ =gSpecialVar_ContestRank - ldrb r0, [r0] - bl Contest_SaveWinner - movs r0, 0xFE - bl Contest_SaveWinner - ldr r4, _080C2E8C @ =gSharedMem - ldr r0, _080C2E90 @ =0x00015ddf - adds r1, r4, r0 - movs r6, 0 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0xFE - movs r1, 0 - bl sub_80B2C4C - ldr r1, _080C2E94 @ =0x00015dde - adds r4, r1 - strb r0, [r4] - str r6, [sp] - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginHardwarePaletteFade - ldr r1, _080C2E98 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldr r1, _080C2E9C @ =sub_80C2EA0 - str r1, [r0] - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C2E80: .4byte gContestFinalStandings -_080C2E84: .4byte gContestPlayerMonIndex -_080C2E88: .4byte gSpecialVar_ContestRank -_080C2E8C: .4byte gSharedMem -_080C2E90: .4byte 0x00015ddf -_080C2E94: .4byte 0x00015dde -_080C2E98: .4byte gTasks -_080C2E9C: .4byte sub_80C2EA0 - thumb_func_end sub_80C2E14 - - thumb_func_start sub_80C2EA0 -sub_80C2EA0: @ 80C2EA0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - adds r5, r2, 0 - ldr r0, _080C2ED8 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0 - bne _080C2F18 - ldr r1, _080C2EDC @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080C2EE8 - ldr r0, _080C2EE0 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x3] - bl DestroyTask - ldr r0, _080C2EE4 @ =0x0000ffff - b _080C2EEE - .align 2, 0 -_080C2ED8: .4byte gPaletteFade -_080C2EDC: .4byte gTasks -_080C2EE0: .4byte gSharedMem + 0x18000 -_080C2EE4: .4byte 0x0000ffff -_080C2EE8: - cmp r0, 0x1 - bne _080C2F04 - ldr r0, _080C2F00 @ =0xffff0000 -_080C2EEE: - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - b _080C2F18 - .align 2, 0 -_080C2F00: .4byte 0xffff0000 -_080C2F04: - ldr r0, _080C2F20 @ =REG_BLDCNT - strh r3, [r0] - adds r0, 0x4 - strh r3, [r0] - adds r0, r5, 0 - bl DestroyTask - ldr r0, _080C2F24 @ =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 -_080C2F18: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C2F20: .4byte REG_BLDCNT -_080C2F24: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music - thumb_func_end sub_80C2EA0 - - thumb_func_start sub_80C2F28 -sub_80C2F28: @ 80C2F28 - push {r4,r5,lr} - ldr r2, _080C2F5C @ =gUnknown_030041B0 - ldrh r3, [r2] - adds r0, r3, 0x2 - strh r0, [r2] - ldr r4, _080C2F60 @ =gUnknown_030041B8 - ldrh r5, [r4] - adds r1, r5, 0x1 - strh r1, [r4] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xFF - bls _080C2F48 - adds r0, r3, 0 - subs r0, 0xFD - strh r0, [r2] -_080C2F48: - lsls r0, r1, 16 - lsrs r0, 16 - cmp r0, 0xFF - bls _080C2F56 - adds r0, r5, 0 - subs r0, 0xFE - strh r0, [r4] -_080C2F56: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C2F5C: .4byte gUnknown_030041B0 -_080C2F60: .4byte gUnknown_030041B8 - thumb_func_end sub_80C2F28 - - thumb_func_start sub_80C2F64 -sub_80C2F64: @ 80C2F64 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080C2F94 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r2, r0, r1 - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - bne _080C2FE6 - movs r0, 0 - strh r0, [r2, 0x8] - movs r3, 0xC - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _080C2F98 - ldrh r0, [r2, 0xA] - adds r0, 0x1 - b _080C2F9C - .align 2, 0 -_080C2F94: .4byte gTasks -_080C2F98: - ldrh r0, [r2, 0xA] - subs r0, 0x1 -_080C2F9C: - strh r0, [r2, 0xA] - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r1, r0, r1 - movs r2, 0xA - ldrsh r0, [r1, r2] - cmp r0, 0x10 - bne _080C2FB2 - movs r0, 0x1 - b _080C2FB6 -_080C2FB2: - cmp r0, 0 - bne _080C2FB8 -_080C2FB6: - strh r0, [r1, 0xC] -_080C2FB8: - ldr r0, _080C3000 @ =gTasks - lsls r4, r5, 2 - adds r4, r5 - lsls r4, 3 - adds r4, r0 - ldrb r2, [r4, 0xA] - ldr r3, _080C3004 @ =0x00002ede - movs r0, 0x6B - movs r1, 0x1 - bl BlendPalette - ldrb r2, [r4, 0xA] - ldr r3, _080C3008 @ =0x00007fff - movs r0, 0x68 - movs r1, 0x1 - bl BlendPalette - ldrb r2, [r4, 0xA] - ldr r3, _080C300C @ =0x000077be - movs r0, 0x6E - movs r1, 0x1 - bl BlendPalette -_080C2FE6: - ldr r1, _080C3000 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r3, 0xA - ldrsh r4, [r0, r3] - cmp r4, 0 - bne _080C3014 - ldr r0, _080C3010 @ =gSharedMem + 0x18000 - strb r4, [r0, 0xA] - b _080C301A - .align 2, 0 -_080C3000: .4byte gTasks -_080C3004: .4byte 0x00002ede -_080C3008: .4byte 0x00007fff -_080C300C: .4byte 0x000077be -_080C3010: .4byte gSharedMem + 0x18000 -_080C3014: - ldr r1, _080C3020 @ =gSharedMem + 0x18000 - movs r0, 0x1 - strb r0, [r1, 0xA] -_080C301A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C3020: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C2F64 - - thumb_func_start sub_80C3024 -sub_80C3024: @ 80C3024 - push {r4-r6,lr} - ldr r6, [sp, 0x10] - lsls r0, 16 - lsrs r0, 16 - lsls r1, 24 - lsrs r4, r1, 24 - lsls r2, 24 - lsrs r5, r2, 24 - lsls r3, 24 - cmp r3, 0 - beq _080C30B0 - adds r1, r6, 0 - bl GetMonIconPtr - lsls r1, r5, 9 - adds r0, r1 - adds r0, 0x80 - lsls r1, r4, 9 - ldr r2, _080C30A0 @ =0x06004000 - adds r1, r2 - ldr r2, _080C30A4 @ =0x040000d4 - str r0, [r2] - str r1, [r2, 0x4] - ldr r0, _080C30A8 @ =0x84000060 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - adds r1, r4, 0 - adds r1, 0xA - lsls r1, 28 - lsls r0, r4, 20 - movs r2, 0x80 - lsls r2, 18 - adds r0, r2 - orrs r0, r1 - lsrs r1, r0, 16 - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 21 - movs r2, 0x83 - lsls r2, 16 - adds r0, r2 - lsrs r5, r0, 16 - movs r2, 0 - ldr r6, _080C30AC @ =0x0600c000 -_080C307C: - lsls r0, r2, 5 - adds r4, r2, 0x1 - adds r0, r5 - movs r3, 0x3 - lsls r0, 1 - adds r2, r0, r6 -_080C3088: - strh r1, [r2] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080C3088 - adds r2, r4, 0 - cmp r2, 0x2 - ble _080C307C - b _080C30CA - .align 2, 0 -_080C30A0: .4byte 0x06004000 -_080C30A4: .4byte 0x040000d4 -_080C30A8: .4byte 0x84000060 -_080C30AC: .4byte 0x0600c000 -_080C30B0: - adds r1, r6, 0 - bl GetMonIconPtr - lsls r1, r5, 9 - adds r0, r1 - adds r0, 0x80 - lsls r1, r4, 9 - ldr r2, _080C30D0 @ =0x06004000 - adds r1, r2 - movs r2, 0xC0 - lsls r2, 1 - bl RequestSpriteCopy -_080C30CA: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C30D0: .4byte 0x06004000 - thumb_func_end sub_80C3024 - - thumb_func_start sub_80C30D4 -sub_80C30D4: @ 80C30D4 - push {r4-r7,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - movs r5, 0 - ldr r4, _080C3108 @ =gContestMons -_080C30E4: - ldrh r0, [r4] - lsls r1, r5, 24 - lsrs r1, 24 - ldr r2, [r4, 0x38] - str r2, [sp] - adds r2, r7, 0 - adds r3, r6, 0 - bl sub_80C3024 - adds r4, 0x40 - adds r5, 0x1 - cmp r5, 0x3 - ble _080C30E4 - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C3108: .4byte gContestMons - thumb_func_end sub_80C30D4 - - thumb_func_start sub_80C310C -sub_80C310C: @ 80C310C - push {r4-r6,lr} - movs r4, 0 - ldr r6, _080C314C @ =gMonIconPaletteIndices - movs r5, 0xA0 - lsls r5, 16 -_080C3116: - ldr r1, _080C3150 @ =gContestMons - lsls r0, r4, 6 - adds r0, r1 - ldrh r0, [r0] - movs r1, 0 - bl mon_icon_convert_unown_species_id - lsls r0, 16 - lsrs r0, 16 - adds r0, r6 - ldrb r0, [r0] - lsls r0, 5 - ldr r1, _080C3154 @ =gMonIconPalettes - adds r0, r1 - lsrs r1, r5, 16 - movs r2, 0x20 - bl LoadPalette - movs r0, 0x80 - lsls r0, 13 - adds r5, r0 - adds r4, 0x1 - cmp r4, 0x3 - ble _080C3116 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C314C: .4byte gMonIconPaletteIndices -_080C3150: .4byte gContestMons -_080C3154: .4byte gMonIconPalettes - thumb_func_end sub_80C310C - - thumb_func_start sub_80C3158 -sub_80C3158: @ 80C3158 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - mov r9, r0 - lsls r1, 24 - lsrs r1, 24 - lsls r2, r1, 4 - adds r2, r1 - lsls r2, 2 - ldr r3, _080C32C0 @ =gSprites - adds r2, r3 - mov r1, sp - ldrh r0, [r2, 0x4] - lsls r0, 22 - lsrs r0, 22 - strh r0, [r1] - mov r4, sp - movs r0, 0x2E - ldrsh r1, [r2, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r0, [r0, 0x4] - lsls r0, 22 - lsrs r0, 22 - strh r0, [r4, 0x2] - movs r0, 0x30 - ldrsh r1, [r2, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r0, [r0, 0x4] - lsls r0, 22 - lsrs r0, 22 - strh r0, [r4, 0x4] - movs r0, 0x32 - ldrsh r1, [r2, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r0, [r0, 0x4] - lsls r0, 22 - lsrs r0, 22 - strh r0, [r4, 0x6] - ldr r1, _080C32C4 @ =gWindowConfig_81E7278 - mov r8, r1 - ldr r7, _080C32C8 @ =0x06010000 - ldr r2, _080C32CC @ =0x040000d4 - ldr r6, _080C32D0 @ =0x85000100 - mov r1, sp - movs r5, 0 - add r3, sp, 0x8 - movs r4, 0x3 -_080C31CE: - ldrh r0, [r1] - lsls r0, 5 - adds r0, r7 - str r5, [sp, 0x8] - str r3, [r2] - str r0, [r2, 0x4] - str r6, [r2, 0x8] - ldr r0, [r2, 0x8] - adds r1, 0x2 - subs r4, 0x1 - cmp r4, 0 - bge _080C31CE - mov r0, r8 - mov r1, r9 - bl GetStringWidthGivenWindowConfig - lsls r0, 24 - lsrs r5, r0, 24 - ldr r2, _080C32D4 @ =gDisplayedStringBattle - ldr r1, _080C32D8 @ =gUnknown_083D17E2 - adds r0, r2, 0 - bl StringCopy - adds r2, r0, 0 - mvns r0, r5 - adds r1, r0, 0x1 - movs r0, 0x7 - ands r1, r0 - cmp r1, 0 - beq _080C3218 - movs r0, 0xFC - strb r0, [r2] - movs r0, 0x11 - strb r0, [r2, 0x1] - lsrs r0, r1, 1 - strb r0, [r2, 0x2] - adds r2, 0x3 -_080C3218: - adds r6, r5, 0x7 - movs r1, 0x8 - negs r1, r1 - adds r0, r1, 0 - ands r6, r0 - lsls r6, 24 - lsrs r5, r6, 24 - adds r0, r2, 0 - mov r1, r9 - bl StringCopy - adds r2, r0, 0 - movs r0, 0xFC - strb r0, [r2] - movs r0, 0x13 - strb r0, [r2, 0x1] - strb r5, [r2, 0x2] - movs r0, 0xFF - strb r0, [r2, 0x3] - ldr r0, _080C32DC @ =gSharedMem + 0x18068 - mov r10, r0 - ldr r1, _080C32D4 @ =gDisplayedStringBattle - bl sub_80034D4 - mov r0, sp - ldrh r4, [r0] - lsls r4, 5 - ldr r1, _080C32C8 @ =0x06010000 - adds r7, r4, r1 - ldr r0, _080C32E0 @ =gUnknown_083D1624 - mov r9, r0 - ldr r1, _080C32E4 @ =REG_BG0CNT - mov r8, r1 - adds r1, r7, 0 - mov r2, r8 - bl CpuSet - mov r5, r9 - adds r5, 0x80 - ldr r0, _080C32E8 @ =0x06010100 - adds r1, r4, r0 - adds r0, r5, 0 - mov r2, r8 - bl CpuSet - ldr r0, _080C32EC @ =0x06010200 - adds r1, r4, r0 - adds r0, r5, 0 - mov r2, r8 - bl CpuSet - mov r0, r9 - adds r0, 0x40 - ldr r1, _080C32F0 @ =0x06010300 - adds r4, r1 - adds r1, r4, 0 - mov r2, r8 - bl CpuSet - lsrs r5, r6, 27 - movs r4, 0 - cmp r4, r5 - bgt _080C3382 - mov r6, sp - mov r0, r10 - adds r0, 0x20 - str r0, [sp, 0xC] - mov r1, r10 - str r1, [sp, 0x10] - ldr r0, _080C32F4 @ =0x0600fd20 - str r0, [sp, 0x14] - ldr r1, _080C32F8 @ =0x0600fe20 - str r1, [sp, 0x18] - ldr r0, _080C32FC @ =0x0600ff20 - mov r10, r0 - ldr r1, _080C3300 @ =0x06010020 - mov r9, r1 -_080C32B2: - cmp r4, 0x6 - bgt _080C3304 - ldrh r0, [r6] - lsls r0, 5 - mov r1, r9 - b _080C3322 - .align 2, 0 -_080C32C0: .4byte gSprites -_080C32C4: .4byte gWindowConfig_81E7278 -_080C32C8: .4byte 0x06010000 -_080C32CC: .4byte 0x040000d4 -_080C32D0: .4byte 0x85000100 -_080C32D4: .4byte gDisplayedStringBattle -_080C32D8: .4byte gUnknown_083D17E2 -_080C32DC: .4byte gSharedMem + 0x18068 -_080C32E0: .4byte gUnknown_083D1624 -_080C32E4: .4byte REG_BG0CNT -_080C32E8: .4byte 0x06010100 -_080C32EC: .4byte 0x06010200 -_080C32F0: .4byte 0x06010300 -_080C32F4: .4byte 0x0600fd20 -_080C32F8: .4byte 0x0600fe20 -_080C32FC: .4byte 0x0600ff20 -_080C3300: .4byte 0x06010020 -_080C3304: - cmp r4, 0xE - bgt _080C3310 - ldrh r0, [r6, 0x2] - lsls r0, 5 - mov r1, r10 - b _080C3322 -_080C3310: - cmp r4, 0x16 - bgt _080C331C - ldrh r0, [r6, 0x4] - lsls r0, 5 - ldr r1, [sp, 0x18] - b _080C3322 -_080C331C: - ldrh r0, [r6, 0x6] - lsls r0, 5 - ldr r1, [sp, 0x14] -_080C3322: - adds r7, r0, r1 - cmp r4, r5 - beq _080C3382 - ldr r0, _080C33D0 @ =gUnknown_083D16E4 - adds r1, r7, 0 - mov r2, r8 - bl CpuSet - movs r0, 0xC0 - lsls r0, 2 - adds r1, r7, r0 - ldr r0, _080C33D0 @ =gUnknown_083D16E4 - adds r0, 0x20 - mov r2, r8 - bl CpuSet - movs r0, 0x80 - lsls r0, 1 - adds r1, r7, r0 - ldr r0, [sp, 0x10] - mov r2, r8 - bl CpuSet - movs r0, 0x80 - lsls r0, 2 - adds r1, r7, r0 - ldr r0, [sp, 0xC] - mov r2, r8 - bl CpuSet - ldr r1, [sp, 0xC] - adds r1, 0x40 - str r1, [sp, 0xC] - ldr r0, [sp, 0x10] - adds r0, 0x40 - str r0, [sp, 0x10] - ldr r1, [sp, 0x14] - adds r1, 0x20 - str r1, [sp, 0x14] - ldr r0, [sp, 0x18] - adds r0, 0x20 - str r0, [sp, 0x18] - movs r1, 0x20 - add r10, r1 - add r9, r1 - adds r4, 0x1 - cmp r4, r5 - ble _080C32B2 -_080C3382: - ldr r4, _080C33D4 @ =gUnknown_083D1644 - ldr r5, _080C33D8 @ =REG_BG0CNT - adds r0, r4, 0 - adds r1, r7, 0 - adds r2, r5, 0 - bl CpuSet - adds r6, r4, 0 - adds r6, 0x80 - movs r0, 0x80 - lsls r0, 1 - adds r1, r7, r0 - adds r0, r6, 0 - adds r2, r5, 0 - bl CpuSet - movs r0, 0x80 - lsls r0, 2 - adds r1, r7, r0 - adds r0, r6, 0 - adds r2, r5, 0 - bl CpuSet - adds r4, 0x40 - movs r0, 0xC0 - lsls r0, 2 - adds r1, r7, r0 - adds r0, r4, 0 - adds r2, r5, 0 - bl CpuSet - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C33D0: .4byte gUnknown_083D16E4 -_080C33D4: .4byte gUnknown_083D1644 -_080C33D8: .4byte REG_BG0CNT - thumb_func_end sub_80C3158 - - thumb_func_start sub_80C33DC -sub_80C33DC: @ 80C33DC - push {r4-r6,lr} - sub sp, 0x20 - mov r1, sp - ldr r0, _080C3498 @ =gSpriteTemplate_83D174C - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - add r5, sp, 0x18 - ldr r6, _080C349C @ =gUnknown_083D1764 - movs r4, 0x7 -_080C33F2: - adds r0, r6, 0 - bl LoadSpriteSheet - adds r6, 0x8 - subs r4, 0x1 - cmp r4, 0 - bge _080C33F2 - ldr r0, _080C34A0 @ =gUnknown_083D17A4 - bl LoadSpritePalette - movs r4, 0 - mov r6, sp -_080C340A: - mov r0, sp - movs r1, 0x88 - lsls r1, 1 - movs r2, 0x90 - movs r3, 0xA - bl CreateSprite - adds r1, r5, r4 - strb r0, [r1] - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - adds r4, 0x1 - cmp r4, 0x7 - ble _080C340A - ldr r2, _080C34A4 @ =gSprites - ldrb r1, [r5] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r5, 0x1] - movs r3, 0 - strh r1, [r0, 0x2E] - ldrb r1, [r5] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r5, 0x2] - strh r1, [r0, 0x30] - ldrb r1, [r5] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r5, 0x3] - strh r1, [r0, 0x32] - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r5, 0x5] - strh r1, [r0, 0x2E] - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r5, 0x6] - strh r1, [r0, 0x30] - ldrb r1, [r5, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r5, 0x7] - strh r1, [r0, 0x32] - ldr r1, _080C34A8 @ =gSharedMem + 0x18000 - ldrb r0, [r5] - strb r0, [r1] - strb r3, [r1, 0x4] - ldrb r0, [r5, 0x4] - strb r0, [r1, 0x1] - bl sub_80C3764 - add sp, 0x20 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C3498: .4byte gSpriteTemplate_83D174C -_080C349C: .4byte gUnknown_083D1764 -_080C34A0: .4byte gUnknown_083D17A4 -_080C34A4: .4byte gSprites -_080C34A8: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C33DC - - thumb_func_start sub_80C34AC -sub_80C34AC: @ 80C34AC - push {lr} - bl StringLength - lsls r0, 16 - lsrs r0, 16 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 25 - lsrs r1, 25 - movs r0, 0x70 - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_80C34AC - - thumb_func_start sub_80C34CC -sub_80C34CC: @ 80C34CC - push {r4-r6,lr} - mov r6, r8 - push {r6} - ldr r4, _080C3514 @ =gSharedMem + 0x18000 - mov r8, r4 - ldrb r5, [r4] - lsls r4, r5, 4 - adds r4, r5 - lsls r4, 2 - ldr r5, _080C3518 @ =gSprites - adds r4, r5 - movs r6, 0 - movs r5, 0x88 - lsls r5, 1 - strh r5, [r4, 0x20] - strh r1, [r4, 0x22] - strh r6, [r4, 0x24] - strh r6, [r4, 0x26] - lsls r0, 16 - asrs r0, 16 - adds r0, 0x20 - strh r0, [r4, 0x36] - strh r2, [r4, 0x38] - strh r3, [r4, 0x3A] - strh r6, [r4, 0x3C] - ldr r0, _080C351C @ =sub_80C3588 - str r0, [r4, 0x1C] - movs r0, 0x1 - mov r1, r8 - strb r0, [r1, 0x4] - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C3514: .4byte gSharedMem + 0x18000 -_080C3518: .4byte gSprites -_080C351C: .4byte sub_80C3588 - thumb_func_end sub_80C34CC - - thumb_func_start sub_80C3520 -sub_80C3520: @ 80C3520 - push {r4,r5,lr} - ldr r4, _080C3558 @ =gSharedMem + 0x18000 - ldrb r2, [r4] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r2, _080C355C @ =gSprites - adds r1, r2 - ldrh r2, [r1, 0x24] - ldrh r3, [r1, 0x20] - adds r2, r3 - movs r3, 0 - strh r2, [r1, 0x20] - ldrh r2, [r1, 0x26] - ldrh r5, [r1, 0x22] - adds r2, r5 - strh r2, [r1, 0x22] - strh r3, [r1, 0x26] - strh r3, [r1, 0x24] - strh r0, [r1, 0x3A] - strh r3, [r1, 0x3C] - ldr r0, _080C3560 @ =sub_80C3630 - str r0, [r1, 0x1C] - movs r0, 0x3 - strb r0, [r4, 0x4] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C3558: .4byte gSharedMem + 0x18000 -_080C355C: .4byte gSprites -_080C3560: .4byte sub_80C3630 - thumb_func_end sub_80C3520 - - thumb_func_start sub_80C3564 -sub_80C3564: @ 80C3564 - movs r3, 0 - movs r2, 0 - movs r1, 0x88 - lsls r1, 1 - strh r1, [r0, 0x20] - movs r1, 0x90 - strh r1, [r0, 0x22] - strh r2, [r0, 0x26] - strh r2, [r0, 0x24] - ldr r1, _080C3580 @ =SpriteCallbackDummy - str r1, [r0, 0x1C] - ldr r0, _080C3584 @ =gSharedMem + 0x18000 - strb r3, [r0, 0x4] - bx lr - .align 2, 0 -_080C3580: .4byte SpriteCallbackDummy -_080C3584: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C3564 - - thumb_func_start sub_80C3588 -sub_80C3588: @ 80C3588 - push {r4-r7,lr} - adds r3, r0, 0 - ldrh r2, [r3, 0x3A] - ldrh r0, [r3, 0x3C] - adds r2, r0 - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r3, 0x20] - subs r0, r1 - strh r0, [r3, 0x20] - movs r1, 0xFF - ands r2, r1 - strh r2, [r3, 0x3C] - lsls r0, 16 - asrs r0, 16 - ldrh r2, [r3, 0x36] - movs r4, 0x36 - ldrsh r1, [r3, r4] - cmp r0, r1 - bge _080C35B2 - strh r2, [r3, 0x20] -_080C35B2: - movs r4, 0 - ldr r6, _080C35F4 @ =gSprites - movs r5, 0x40 - adds r2, r3, 0 - adds r2, 0x2E -_080C35BC: - movs r7, 0 - ldrsh r0, [r2, r7] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - ldrh r0, [r3, 0x24] - ldrh r7, [r3, 0x20] - adds r0, r7 - adds r0, r5 - strh r0, [r1, 0x20] - adds r5, 0x40 - adds r2, 0x2 - adds r4, 0x1 - cmp r4, 0x2 - ble _080C35BC - movs r0, 0x20 - ldrsh r1, [r3, r0] - movs r2, 0x36 - ldrsh r0, [r3, r2] - cmp r1, r0 - bne _080C35EC - ldr r0, _080C35F8 @ =sub_80C35FC - str r0, [r3, 0x1C] -_080C35EC: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C35F4: .4byte gSprites -_080C35F8: .4byte sub_80C35FC - thumb_func_end sub_80C3588 - - thumb_func_start sub_80C35FC -sub_80C35FC: @ 80C35FC - push {lr} - adds r2, r0, 0 - ldr r0, _080C3628 @ =gSharedMem + 0x18000 - movs r1, 0x2 - strb r1, [r0, 0x4] - ldrh r3, [r2, 0x38] - ldr r1, _080C362C @ =0xffff0000 - lsrs r0, r1, 16 - cmp r3, r0 - beq _080C3624 - subs r0, r3, 0x1 - strh r0, [r2, 0x38] - lsls r0, 16 - asrs r0, 16 - asrs r1, 16 - cmp r0, r1 - bne _080C3624 - ldrh r0, [r2, 0x3A] - bl sub_80C3520 -_080C3624: - pop {r0} - bx r0 - .align 2, 0 -_080C3628: .4byte gSharedMem + 0x18000 -_080C362C: .4byte 0xffff0000 - thumb_func_end sub_80C35FC - - thumb_func_start sub_80C3630 -sub_80C3630: @ 80C3630 - push {r4-r7,lr} - adds r3, r0, 0 - ldrh r2, [r3, 0x3A] - ldrh r0, [r3, 0x3C] - adds r2, r0 - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r3, 0x20] - subs r0, r1 - strh r0, [r3, 0x20] - movs r0, 0xFF - ands r2, r0 - strh r2, [r3, 0x3C] - movs r4, 0 - ldr r6, _080C3694 @ =gSprites - movs r5, 0x40 - adds r2, r3, 0 - adds r2, 0x2E -_080C3654: - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - ldrh r0, [r3, 0x24] - ldrh r7, [r3, 0x20] - adds r0, r7 - adds r0, r5 - strh r0, [r1, 0x20] - adds r5, 0x40 - adds r2, 0x2 - adds r4, 0x1 - cmp r4, 0x2 - ble _080C3654 - movs r1, 0x20 - ldrsh r0, [r3, r1] - movs r2, 0x24 - ldrsh r1, [r3, r2] - adds r0, r1 - movs r1, 0xE0 - negs r1, r1 - cmp r0, r1 - bge _080C368C - adds r0, r3, 0 - bl sub_80C3564 -_080C368C: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C3694: .4byte gSprites - thumb_func_end sub_80C3630 - - thumb_func_start sub_80C3698 -sub_80C3698: @ 80C3698 - push {r4-r7,lr} - adds r4, r0, 0 - ldr r5, _080C374C @ =gSharedMem + 0x18000 - ldrb r1, [r5, 0x1] - bl sub_80C3158 - adds r0, r4, 0 - bl sub_80C34AC - lsls r0, 16 - lsrs r0, 16 - ldrb r2, [r5, 0x1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r3, _080C3750 @ =gSprites - adds r4, r1, r3 - adds r0, 0x20 - strh r0, [r4, 0x20] - movs r0, 0x50 - strh r0, [r4, 0x22] - adds r5, r4, 0 - adds r5, 0x3E - ldrb r1, [r5] - movs r2, 0x5 - negs r2, r2 - adds r0, r2, 0 - ands r0, r1 - strb r0, [r5] - movs r5, 0 - adds r6, r3, 0 - mov r12, r2 - movs r3, 0x40 -_080C36DA: - lsls r0, r5, 1 - adds r2, r4, 0 - adds r2, 0x2E - adds r2, r0 - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - ldrh r0, [r4, 0x24] - ldrh r7, [r4, 0x20] - adds r0, r7 - adds r0, r3 - strh r0, [r1, 0x20] - movs r0, 0 - ldrsh r1, [r2, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - ldrh r1, [r4, 0x22] - strh r1, [r0, 0x22] - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - adds r1, 0x3E - ldrb r2, [r1] - mov r0, r12 - ands r0, r2 - strb r0, [r1] - adds r3, 0x40 - adds r5, 0x1 - cmp r5, 0x2 - ble _080C36DA - ldr r1, _080C3754 @ =gBattle_WIN0H - movs r0, 0xF0 - strh r0, [r1] - ldr r2, _080C3758 @ =gBattle_WIN0V - ldrh r1, [r4, 0x22] - adds r0, r1, 0 - subs r0, 0x10 - lsls r0, 8 - adds r1, 0x10 - orrs r0, r1 - strh r0, [r2] - ldr r1, _080C375C @ =REG_WININ - ldr r2, _080C3760 @ =0x00003f3e - adds r0, r2, 0 - strh r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C374C: .4byte gSharedMem + 0x18000 -_080C3750: .4byte gSprites -_080C3754: .4byte gBattle_WIN0H -_080C3758: .4byte gBattle_WIN0V -_080C375C: .4byte REG_WININ -_080C3760: .4byte 0x00003f3e - thumb_func_end sub_80C3698 - - thumb_func_start sub_80C3764 -sub_80C3764: @ 80C3764 - push {r4-r7,lr} - ldr r0, _080C37C8 @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x1] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - ldr r3, _080C37CC @ =gSprites - adds r2, r3 - movs r0, 0x3E - adds r0, r2 - mov r12, r0 - ldrb r0, [r0] - movs r1, 0x4 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldr r7, _080C37D0 @ =gBattle_WIN0H - ldr r6, _080C37D4 @ =gBattle_WIN0V - adds r5, r3, 0 - movs r4, 0x4 - adds r2, 0x2E - movs r3, 0x2 -_080C3790: - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080C3790 - movs r1, 0 - strh r1, [r7] - strh r1, [r6] - ldr r0, _080C37D8 @ =REG_WIN0H - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - ldr r1, _080C37DC @ =REG_WININ - ldr r2, _080C37E0 @ =0x00003f3f - adds r0, r2, 0 - strh r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C37C8: .4byte gSharedMem + 0x18000 -_080C37CC: .4byte gSprites -_080C37D0: .4byte gBattle_WIN0H -_080C37D4: .4byte gBattle_WIN0V -_080C37D8: .4byte REG_WIN0H -_080C37DC: .4byte REG_WININ -_080C37E0: .4byte 0x00003f3f - thumb_func_end sub_80C3764 - - thumb_func_start de_sub_80C39A8 -de_sub_80C39A8: @ 80C39A8 - push {r4,lr} - sub sp, 0x10 - adds r1, r0, 0 - ldr r0, _de_080C39DC @ =gIsLinkContest - ldrb r0, [r0] - movs r4, 0x1 - ands r4, r0 - cmp r4, 0 - beq _de_080C39E8 - ldr r0, _de_080C39E0 @ =0x0600e000 - lsls r1, 16 - lsrs r1, 16 - ldr r3, _de_080C39E4 @ =gUnknown_08E964B8 - movs r2, 0xB - str r2, [sp] - movs r4, 0x3 - str r4, [sp, 0x4] - movs r2, 0x8 - str r2, [sp, 0x8] - str r4, [sp, 0xC] - movs r2, 0 - bl sub_809D104 - movs r0, 0x8 - b _de_080C3A74 - .align 2, 0 -_de_080C39DC: .4byte gIsLinkContest -_de_080C39E0: .4byte 0x0600e000 -_de_080C39E4: .4byte gUnknown_08E964B8 -_de_080C39E8: - ldr r0, _de_080C3A08 @ =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r0, 0 - bne _de_080C3A14 - ldr r0, _de_080C3A0C @ =0x0600e000 - lsls r1, 16 - lsrs r1, 16 - ldr r3, _de_080C3A10 @ =gUnknown_08E964B8 - str r4, [sp] - str r4, [sp, 0x4] - movs r2, 0xB - str r2, [sp, 0x8] - movs r2, 0x3 - str r2, [sp, 0xC] - b _de_080C3A6C - .align 2, 0 -_de_080C3A08: .4byte gSpecialVar_ContestRank -_de_080C3A0C: .4byte 0x0600e000 -_de_080C3A10: .4byte gUnknown_08E964B8 -_de_080C3A14: - cmp r0, 0x1 - bne _de_080C3A2C - ldr r0, _de_080C3A24 @ =0x0600e000 - lsls r1, 16 - lsrs r1, 16 - ldr r3, _de_080C3A28 @ =gUnknown_08E964B8 - movs r2, 0xB - b _de_080C3A3A - .align 2, 0 -_de_080C3A24: .4byte 0x0600e000 -_de_080C3A28: .4byte gUnknown_08E964B8 -_de_080C3A2C: - cmp r0, 0x2 - bne _de_080C3A58 - ldr r0, _de_080C3A50 @ =0x0600e000 - lsls r1, 16 - lsrs r1, 16 - ldr r3, _de_080C3A54 @ =gUnknown_08E964B8 - movs r2, 0x15 -_de_080C3A3A: - str r2, [sp] - str r4, [sp, 0x4] - movs r2, 0xA - str r2, [sp, 0x8] - movs r2, 0x3 - str r2, [sp, 0xC] - movs r2, 0 - bl sub_809D104 - movs r0, 0xA - b _de_080C3A74 - .align 2, 0 -_de_080C3A50: .4byte 0x0600e000 -_de_080C3A54: .4byte gUnknown_08E964B8 -_de_080C3A58: - ldr r0, _de_080C3A7C @ =0x0600e000 - lsls r1, 16 - lsrs r1, 16 - ldr r3, _de_080C3A80 @ =gUnknown_08E964B8 - str r4, [sp] - movs r4, 0x3 - str r4, [sp, 0x4] - movs r2, 0xB - str r2, [sp, 0x8] - str r4, [sp, 0xC] -_de_080C3A6C: - movs r2, 0 - bl sub_809D104 - movs r0, 0xB -_de_080C3A74: - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_de_080C3A7C: .4byte 0x0600e000 -_de_080C3A80: .4byte gUnknown_08E964B8 - thumb_func_end de_sub_80C39A8 - - thumb_func_start de_sub_80C3A84 -de_sub_80C3A84: @ 80C3A84 - push {r4,lr} - sub sp, 0x10 - adds r2, r0, 0 - ldr r0, _de_080C3AAC @ =gSpecialVar_ContestCategory - ldrh r4, [r0] - cmp r4, 0 - bne _de_080C3AB8 - str r4, [r1] - ldr r0, _de_080C3AB0 @ =0x0600e000 - lsls r1, r2, 16 - lsrs r1, 16 - ldr r3, _de_080C3AB4 @ =gUnknown_08E964B8 - movs r2, 0x13 - str r2, [sp] - movs r4, 0x3 - str r4, [sp, 0x4] - movs r2, 0x7 - str r2, [sp, 0x8] - str r4, [sp, 0xC] - b _de_080C3AD6 - .align 2, 0 -_de_080C3AAC: .4byte gSpecialVar_ContestCategory -_de_080C3AB0: .4byte 0x0600e000 -_de_080C3AB4: .4byte gUnknown_08E964B8 -_de_080C3AB8: - cmp r4, 0x1 - bne _de_080C3AE8 - str r4, [r1] - ldr r0, _de_080C3AE0 @ =0x0600e000 - lsls r1, r2, 16 - lsrs r1, 16 - ldr r3, _de_080C3AE4 @ =gUnknown_08E964B8 - movs r2, 0 - str r2, [sp] - movs r2, 0x6 - str r2, [sp, 0x4] - movs r2, 0x7 - str r2, [sp, 0x8] - movs r2, 0x3 - str r2, [sp, 0xC] -_de_080C3AD6: - movs r2, 0 - bl sub_809D104 - movs r0, 0x7 - b _de_080C3B68 - .align 2, 0 -_de_080C3AE0: .4byte 0x0600e000 -_de_080C3AE4: .4byte gUnknown_08E964B8 -_de_080C3AE8: - cmp r4, 0x2 - bne _de_080C3B18 - str r4, [r1] - ldr r0, _de_080C3B10 @ =0x0600e000 - lsls r1, r2, 16 - lsrs r1, 16 - ldr r3, _de_080C3B14 @ =gUnknown_08E964B8 - movs r2, 0x7 - str r2, [sp] - movs r2, 0x6 - str r2, [sp, 0x4] - movs r2, 0x4 - str r2, [sp, 0x8] - movs r2, 0x3 - str r2, [sp, 0xC] - movs r2, 0 - bl sub_809D104 - movs r0, 0x4 - b _de_080C3B68 - .align 2, 0 -_de_080C3B10: .4byte 0x0600e000 -_de_080C3B14: .4byte gUnknown_08E964B8 -_de_080C3B18: - cmp r4, 0x3 - bne _de_080C3B44 - str r4, [r1] - ldr r0, _de_080C3B3C @ =0x0600e000 - lsls r1, r2, 16 - lsrs r1, 16 - ldr r3, _de_080C3B40 @ =gUnknown_08E964B8 - movs r2, 0xB - str r2, [sp] - movs r2, 0x6 - str r2, [sp, 0x4] - str r2, [sp, 0x8] - str r4, [sp, 0xC] - movs r2, 0 - bl sub_809D104 - movs r0, 0x6 - b _de_080C3B68 - .align 2, 0 -_de_080C3B3C: .4byte 0x0600e000 -_de_080C3B40: .4byte gUnknown_08E964B8 -_de_080C3B44: - movs r0, 0x4 - str r0, [r1] - ldr r0, _de_080C3B70 @ =0x0600e000 - lsls r1, r2, 16 - lsrs r1, 16 - ldr r3, _de_080C3B74 @ =gUnknown_08E964B8 - movs r2, 0x11 - str r2, [sp] - movs r2, 0x6 - str r2, [sp, 0x4] - movs r2, 0x5 - str r2, [sp, 0x8] - movs r2, 0x3 - str r2, [sp, 0xC] - movs r2, 0 - bl sub_809D104 - movs r0, 0x5 -_de_080C3B68: - add sp, 0x10 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_de_080C3B70: .4byte 0x0600e000 -_de_080C3B74: .4byte gUnknown_08E964B8 - thumb_func_end de_sub_80C3A84 - - thumb_func_start sub_80C37E4 -sub_80C37E4: @ 80C37E4 - push {r4,r5,lr} - sub sp, 0x4 - movs r0, 0x6 - bl de_sub_80C39A8 - lsls r0, 16 - asrs r0, 16 - adds r0, 0x6 - mov r1, sp - bl de_sub_80C3A84 - ldr r5, _080C3824 @ =0x00000fff - ldr r0, [sp] - lsls r4, r0, 12 - ldr r2, _080C3828 @ =0x0600e000 - movs r3, 0x7F -_080C3804: - ldrh r1, [r2] - adds r0, r5, 0 - ands r0, r1 - strh r0, [r2] - ldrh r1, [r2] - adds r0, r4, 0 - orrs r0, r1 - strh r0, [r2] - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080C3804 - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C3824: .4byte 0x00000fff -_080C3828: .4byte 0x0600e000 - thumb_func_end sub_80C37E4 - - thumb_func_start sub_80C3990 -sub_80C3990: @ 80C3990 - push {r4,r5,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r1, _080C39DC @ =gUnknown_02038670 - lsrs r0, 23 - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - lsls r4, r0, 16 - adds r0, r4, 0 - movs r1, 0x3F - bl __udivsi3 - adds r1, r0, 0 - ldr r0, _080C39E0 @ =0x0000ffff - ands r0, r1 - cmp r0, 0 - beq _080C39BC - movs r0, 0x80 - lsls r0, 9 - adds r1, r0 -_080C39BC: - lsrs r1, 16 - cmp r1, 0 - bne _080C39C8 - cmp r4, 0 - beq _080C39C8 - movs r1, 0x1 -_080C39C8: - cmp r5, 0 - beq _080C39D2 - cmp r1, 0xA - bls _080C39D2 - movs r1, 0xA -_080C39D2: - lsls r0, r1, 24 - lsrs r0, 24 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080C39DC: .4byte gUnknown_02038670 -_080C39E0: .4byte 0x0000ffff - thumb_func_end sub_80C3990 - - thumb_func_start sub_80C39E4 -sub_80C39E4: @ 80C39E4 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - ldr r1, _080C3A44 @ =gUnknown_02038688 - lsls r0, r5, 1 - adds r0, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - adds r7, r1, 0 - cmp r0, 0 - bge _080C3A00 - negs r0, r0 -_080C3A00: - lsls r4, r0, 16 - adds r0, r4, 0 - movs r1, 0x50 - bl __udivsi3 - adds r2, r0, 0 - ldr r0, _080C3A48 @ =0x0000ffff - ands r0, r2 - cmp r0, 0 - beq _080C3A1A - movs r0, 0x80 - lsls r0, 9 - adds r2, r0 -_080C3A1A: - lsrs r2, 16 - cmp r2, 0 - bne _080C3A26 - cmp r4, 0 - beq _080C3A26 - movs r2, 0x1 -_080C3A26: - cmp r6, 0 - beq _080C3A30 - cmp r2, 0xA - bls _080C3A30 - movs r2, 0xA -_080C3A30: - lsls r0, r5, 1 - adds r0, r7 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _080C3A4C - negs r0, r2 - lsls r0, 24 - b _080C3A4E - .align 2, 0 -_080C3A44: .4byte gUnknown_02038688 -_080C3A48: .4byte 0x0000ffff -_080C3A4C: - lsls r0, r2, 24 -_080C3A4E: - lsrs r0, 24 - lsls r0, 24 - asrs r0, 24 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80C39E4 - - thumb_func_start sub_80C3A5C -sub_80C3A5C: @ 80C3A5C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r1, _080C3A90 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r3, r0, r1 - ldrh r2, [r3, 0x1C] - movs r1, 0x1C - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _080C3A94 - movs r1, 0x8 - ldrsh r0, [r3, r1] - movs r1, 0x3 - subs r1, r0 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - strh r0, [r3, 0x1E] - adds r0, r2, 0x1 - strh r0, [r3, 0x1C] - b _080C3B12 - .align 2, 0 -_080C3A90: .4byte gTasks -_080C3A94: - cmp r0, 0x1 - bne _080C3B12 - ldrh r0, [r3, 0x1E] - subs r0, 0x1 - strh r0, [r3, 0x1E] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080C3B12 - movs r0, 0x8 - ldrsh r2, [r3, r0] - lsls r2, 17 - ldr r1, _080C3B18 @ =0x50430000 - adds r2, r1 - lsrs r2, 16 - movs r0, 0xA - ldrsh r1, [r3, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 6 - ldr r1, _080C3B1C @ =0x0600e142 - adds r0, r1 - strh r2, [r0] - movs r0, 0xA - ldrsh r1, [r3, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 6 - ldr r1, _080C3B20 @ =0x0600e144 - adds r0, r1 - adds r1, r2, 0x1 - strh r1, [r0] - movs r0, 0xA - ldrsh r1, [r3, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 6 - ldr r1, _080C3B24 @ =0x0600e182 - adds r0, r1 - adds r1, r2, 0 - adds r1, 0x10 - strh r1, [r0] - movs r0, 0xA - ldrsh r1, [r3, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 6 - ldr r1, _080C3B28 @ =0x0600e184 - adds r0, r1 - adds r2, 0x11 - strh r2, [r0] - ldr r1, _080C3B2C @ =gSharedMem + 0x18000 - ldrb r0, [r1, 0x5] - adds r0, 0x1 - strb r0, [r1, 0x5] - adds r0, r4, 0 - bl DestroyTask - movs r0, 0x18 - bl PlaySE -_080C3B12: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C3B18: .4byte 0x50430000 -_080C3B1C: .4byte 0x0600e142 -_080C3B20: .4byte 0x0600e144 -_080C3B24: .4byte 0x0600e182 -_080C3B28: .4byte 0x0600e184 -_080C3B2C: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C3A5C - - thumb_func_start sub_80C3B30 -sub_80C3B30: @ 80C3B30 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - movs r5, 0 - ldr r1, _080C3BC0 @ =gContestFinalStandings - ldrb r0, [r1] - ldr r2, _080C3BC4 @ =gTasks - mov r10, r2 - cmp r0, 0 - beq _080C3B5C -_080C3B4E: - adds r5, 0x1 - cmp r5, 0x3 - bgt _080C3B5C - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _080C3B4E -_080C3B5C: - movs r1, 0 - lsls r0, r5, 1 - mov r2, r12 - lsls r2, 2 - mov r9, r2 - adds r0, r5 - lsls r0, 5 - mov r8, r0 - ldr r7, _080C3BC8 @ =0x00000fff - movs r0, 0x90 - lsls r0, 8 - adds r6, r0, 0 -_080C3B74: - lsls r0, r1, 5 - adds r4, r1, 0x1 - add r0, r8 - movs r3, 0x1D - lsls r0, 1 - ldr r1, _080C3BCC @ =0x0600e100 - adds r2, r0, r1 -_080C3B82: - ldrh r1, [r2] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r6 - strh r0, [r2] - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080C3B82 - adds r1, r4, 0 - cmp r1, 0x2 - ble _080C3B74 - mov r0, r9 - add r0, r12 - lsls r0, 3 - add r0, r10 - strh r5, [r0, 0x1C] - movs r1, 0x1 - strh r1, [r0, 0x20] - ldr r2, _080C3BD0 @ =sub_80C3BD8 - str r2, [r0] - mov r1, r12 - ldr r0, _080C3BD4 @ =gSharedMem + 0x18000 - strb r1, [r0, 0x3] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C3BC0: .4byte gContestFinalStandings -_080C3BC4: .4byte gTasks -_080C3BC8: .4byte 0x00000fff -_080C3BCC: .4byte 0x0600e100 -_080C3BD0: .4byte sub_80C3BD8 -_080C3BD4: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C3B30 - - thumb_func_start sub_80C3BD8 -sub_80C3BD8: @ 80C3BD8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C3C24 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] - lsls r0, 16 - asrs r5, r0, 16 - cmp r5, 0x1 - bne _080C3C3C - movs r0, 0 - strh r0, [r4, 0x1E] - ldrh r2, [r4, 0x20] - lsls r2, 24 - lsrs r2, 24 - ldr r3, _080C3C28 @ =0x00006f8d - movs r0, 0x91 - movs r1, 0x1 - bl BlendPalette - movs r1, 0x22 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080C3C2C - ldrh r0, [r4, 0x20] - adds r0, 0x1 - strh r0, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - bne _080C3C3C - strh r5, [r4, 0x22] - b _080C3C3C - .align 2, 0 -_080C3C24: .4byte gTasks -_080C3C28: .4byte 0x00006f8d -_080C3C2C: - ldrh r0, [r4, 0x20] - subs r0, 0x1 - strh r0, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bne _080C3C3C - strh r0, [r4, 0x22] -_080C3C3C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80C3BD8 - - thumb_func_start sub_80C3C44 -sub_80C3C44: @ 80C3C44 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x2E] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r0, 0x9 - bgt _080C3C6C - adds r0, r1, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bne _080C3CA8 - ldrh r0, [r4, 0x30] - movs r1, 0 - bl PlayCry1 - movs r0, 0 - strh r0, [r4, 0x30] - b _080C3CA8 -_080C3C6C: - movs r0, 0xC0 - lsls r0, 3 - adds r2, r0, 0 - ldrh r1, [r4, 0x30] - adds r2, r1 - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r4, 0x20] - subs r0, r1 - strh r0, [r4, 0x20] - movs r1, 0xFF - ands r2, r1 - strh r2, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x77 - bgt _080C3C92 - movs r0, 0x78 - strh r0, [r4, 0x20] -_080C3C92: - movs r2, 0x20 - ldrsh r0, [r4, r2] - cmp r0, 0x78 - bne _080C3CA8 - ldr r0, _080C3CB0 @ =SpriteCallbackDummy - str r0, [r4, 0x1C] - movs r0, 0 - strh r0, [r4, 0x30] - ldr r1, _080C3CB4 @ =gSharedMem + 0x18000 - movs r0, 0x1 - strb r0, [r1, 0x6] -_080C3CA8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C3CB0: .4byte SpriteCallbackDummy -_080C3CB4: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C3C44 - - thumb_func_start sub_80C3CB8 -sub_80C3CB8: @ 80C3CB8 - push {lr} - adds r3, r0, 0 - movs r0, 0xC0 - lsls r0, 3 - adds r2, r0, 0 - ldrh r0, [r3, 0x30] - adds r2, r0 - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r3, 0x20] - subs r0, r1 - strh r0, [r3, 0x20] - movs r1, 0xFF - ands r2, r1 - strh r2, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bge _080C3CF8 - ldr r0, _080C3CFC @ =SpriteCallbackDummy - str r0, [r3, 0x1C] - adds r2, r3, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r1, _080C3D00 @ =gSharedMem + 0x18000 - movs r0, 0x2 - strb r0, [r1, 0x6] -_080C3CF8: - pop {r0} - bx r0 - .align 2, 0 -_080C3CFC: .4byte SpriteCallbackDummy -_080C3D00: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C3CB8 - - thumb_func_start sub_80C3D04 -sub_80C3D04: @ 80C3D04 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, _080C3DD8 @ =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r1, r0, r1 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _080C3DBE - movs r0, 0 - strh r0, [r1, 0x8] - ldr r0, _080C3DDC @ =gSharedMem + 0x18000 - mov r8, r0 - ldrb r0, [r0, 0x7] - cmp r0, 0x27 - bhi _080C3DBE - ldr r4, _080C3DE0 @ =gSpriteTemplate_83D17B4 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xF0 - bl __umodsi3 - adds r1, r0, 0 - subs r1, 0x14 - lsls r1, 16 - asrs r1, 16 - adds r0, r4, 0 - movs r2, 0x2C - movs r3, 0x5 - bl CreateSprite - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl Random - ldr r1, _080C3DE4 @ =gSprites - lsls r5, r4, 4 - adds r5, r4 - lsls r5, 2 - adds r5, r1 - lsls r0, 23 - lsrs r0, 23 - strh r0, [r5, 0x2E] - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x18 - bl __umodsi3 - adds r0, 0x10 - strh r0, [r5, 0x30] - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xFF - ands r0, r1 - adds r0, 0x30 - strh r0, [r5, 0x32] - bl Random - ldrh r6, [r5, 0x4] - lsls r4, r6, 22 - lsrs r4, 22 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x11 - bl __umodsi3 - adds r4, r0 - ldr r1, _080C3DE8 @ =0x000003ff - adds r0, r1, 0 - ands r4, r0 - ldr r0, _080C3DEC @ =0xfffffc00 - ands r0, r6 - orrs r0, r4 - strh r0, [r5, 0x4] - mov r1, r8 - ldrb r0, [r1, 0x7] - adds r0, 0x1 - strb r0, [r1, 0x7] -_080C3DBE: - ldr r0, _080C3DDC @ =gSharedMem + 0x18000 - ldrb r0, [r0, 0x9] - cmp r0, 0 - beq _080C3DCC - adds r0, r7, 0 - bl DestroyTask -_080C3DCC: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C3DD8: .4byte gTasks -_080C3DDC: .4byte gSharedMem + 0x18000 -_080C3DE0: .4byte gSpriteTemplate_83D17B4 -_080C3DE4: .4byte gSprites -_080C3DE8: .4byte 0x000003ff -_080C3DEC: .4byte 0xfffffc00 - thumb_func_end sub_80C3D04 - - thumb_func_start sub_80C3DF0 -sub_80C3DF0: @ 80C3DF0 - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - ldrh r1, [r4, 0x34] - adds r0, r1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 24 - movs r2, 0x30 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - ldrh r1, [r4, 0x32] - ldrh r0, [r4, 0x36] - adds r1, r0 - lsls r0, r1, 16 - asrs r0, 24 - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - movs r0, 0xFF - ands r1, r0 - strh r1, [r4, 0x36] - ldrh r0, [r4, 0x22] - adds r0, 0x1 - strh r0, [r4, 0x22] - ldr r5, _080C3E5C @ =gSharedMem + 0x18000 - ldrb r0, [r5, 0x9] - cmp r0, 0 - beq _080C3E3A - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] -_080C3E3A: - movs r1, 0x20 - ldrsh r0, [r4, r1] - cmp r0, 0xF8 - bgt _080C3E4A - movs r2, 0x22 - ldrsh r0, [r4, r2] - cmp r0, 0x74 - ble _080C3E56 -_080C3E4A: - adds r0, r4, 0 - bl DestroySprite - ldrb r0, [r5, 0x7] - subs r0, 0x1 - strb r0, [r5, 0x7] -_080C3E56: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C3E5C: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C3DF0 - - thumb_func_start sub_80C3E60 -sub_80C3E60: @ 80C3E60 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - ldr r0, _080C3E98 @ =sub_80C3EA4 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C3E9C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0x8] - strh r5, [r1, 0xA] - ldr r0, _080C3EA0 @ =gContestMons - lsls r4, 6 - adds r4, r0 - ldrh r0, [r4] - strh r0, [r1, 0xC] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C3E98: .4byte sub_80C3EA4 -_080C3E9C: .4byte gTasks -_080C3EA0: .4byte gContestMons - thumb_func_end sub_80C3E60 - - thumb_func_start sub_80C3EA4 -sub_80C3EA4: @ 80C3EA4 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C3EF8 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrb r5, [r4, 0x8] - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - movs r2, 0xA - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _080C3EEE - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r0, [r4, 0xC] - ldrb r2, [r4, 0x1E] - ldr r1, _080C3EFC @ =gContestMons - lsls r3, r5, 6 - adds r1, 0x38 - adds r3, r1 - ldr r1, [r3] - str r1, [sp] - adds r1, r5, 0 - movs r3, 0 - bl sub_80C3024 - ldrh r0, [r4, 0x1E] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x1E] -_080C3EEE: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C3EF8: .4byte gTasks -_080C3EFC: .4byte gContestMons - thumb_func_end sub_80C3EA4 - - thumb_func_start sub_80C3F00 -sub_80C3F00: @ 80C3F00 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, _080C4098 @ =gUnknown_02038678 - ldrh r2, [r0] - adds r4, r0, 0 - adds r3, r4, 0x2 - movs r0, 0x2 - mov r8, r0 -_080C3F16: - lsls r0, r2, 16 - asrs r0, 16 - movs r5, 0 - ldrsh r1, [r3, r5] - cmp r0, r1 - bge _080C3F24 - ldrh r2, [r3] -_080C3F24: - adds r3, 0x2 - movs r0, 0x1 - negs r0, r0 - add r8, r0 - mov r1, r8 - cmp r1, 0 - bge _080C3F16 - lsls r0, r2, 16 - mov r9, r0 - cmp r0, 0 - bge _080C3F62 - ldrh r2, [r4] - adds r3, r4, 0x2 - movs r4, 0x2 - mov r8, r4 -_080C3F42: - lsls r0, r2, 16 - asrs r0, 16 - movs r5, 0 - ldrsh r1, [r3, r5] - cmp r0, r1 - ble _080C3F50 - ldrh r2, [r3] -_080C3F50: - adds r3, 0x2 - movs r0, 0x1 - negs r0, r0 - add r8, r0 - lsls r1, r2, 16 - mov r9, r1 - mov r4, r8 - cmp r4, 0 - bge _080C3F42 -_080C3F62: - movs r5, 0 - mov r8, r5 - mov r10, r5 -_080C3F68: - ldr r0, _080C409C @ =gUnknown_02038670 - mov r1, r8 - lsls r7, r1, 1 - adds r0, r7, r0 - movs r2, 0 - ldrsh r1, [r0, r2] - lsls r0, r1, 5 - subs r0, r1 - lsls r0, 2 - adds r0, r1 - lsls r0, 3 - mov r4, r9 - asrs r6, r4, 16 - adds r1, r6, 0 - cmp r6, 0 - bge _080C3F8A - negs r1, r6 -_080C3F8A: - bl __divsi3 - adds r4, r0, 0 - movs r1, 0xA - bl __modsi3 - cmp r0, 0x4 - ble _080C3F9C - adds r4, 0xA -_080C3F9C: - ldr r0, _080C40A0 @ =gSharedMem + 0x18018 - mov r1, r10 - adds r5, r1, r0 - adds r0, r4, 0 - movs r1, 0xA - bl __divsi3 - str r0, [r5] - ldr r0, _080C40A4 @ =gUnknown_02038688 - adds r7, r0 - movs r2, 0 - ldrsh r1, [r7, r2] - cmp r1, 0 - bge _080C3FBA - negs r1, r1 -_080C3FBA: - lsls r0, r1, 5 - subs r0, r1 - lsls r0, 2 - adds r0, r1 - lsls r0, 3 - adds r1, r6, 0 - cmp r1, 0 - bge _080C3FCC - negs r1, r1 -_080C3FCC: - bl __divsi3 - adds r4, r0, 0 - movs r1, 0xA - bl __modsi3 - cmp r0, 0x4 - ble _080C3FDE - adds r4, 0xA -_080C3FDE: - adds r0, r4, 0 - movs r1, 0xA - bl __divsi3 - str r0, [r5, 0x4] - movs r4, 0 - ldrsh r0, [r7, r4] - cmp r0, 0 - bge _080C3FF4 - movs r0, 0x1 - strb r0, [r5, 0x10] -_080C3FF4: - ldr r1, [r5] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - subs r0, r1 - lsls r0, 11 - movs r1, 0x64 - bl __divsi3 - adds r1, r0, 0 - movs r4, 0xFF - ands r0, r4 - cmp r0, 0x7F - bls _080C4016 - movs r0, 0x80 - lsls r0, 1 - adds r1, r0 -_080C4016: - lsrs r0, r1, 8 - str r0, [r5, 0x8] - ldr r1, [r5, 0x4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - subs r0, r1 - lsls r0, 11 - movs r1, 0x64 - bl __divsi3 - adds r1, r0, 0 - ands r0, r4 - cmp r0, 0x7F - bls _080C403A - movs r2, 0x80 - lsls r2, 1 - adds r1, r2 -_080C403A: - lsrs r0, r1, 8 - str r0, [r5, 0xC] - mov r0, r8 - lsls r4, r0, 24 - lsrs r4, 24 - adds r0, r4, 0 - movs r1, 0x1 - bl sub_80C3990 - strb r0, [r5, 0x11] - adds r0, r4, 0 - movs r1, 0x1 - bl sub_80C39E4 - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bge _080C4060 - negs r0, r0 -_080C4060: - strb r0, [r5, 0x12] - ldr r0, _080C40A8 @ =gContestFinalStandings - add r0, r8 - ldrb r0, [r0] - cmp r0, 0 - beq _080C40B4 - ldr r4, [r5, 0x8] - ldrh r2, [r5, 0x8] - ldr r3, [r5, 0xC] - ldrh r1, [r5, 0xC] - ldrb r0, [r5, 0x10] - cmp r0, 0 - beq _080C4080 - lsls r0, r1, 16 - negs r0, r0 - lsrs r1, r0, 16 -_080C4080: - lsls r0, r2, 16 - asrs r2, r0, 16 - lsls r0, r1, 16 - asrs r1, r0, 16 - adds r0, r2, r1 - cmp r0, 0x58 - bne _080C40B4 - cmp r1, 0 - ble _080C40AC - subs r0, r3, 0x1 - str r0, [r5, 0xC] - b _080C40B4 - .align 2, 0 -_080C4098: .4byte gUnknown_02038678 -_080C409C: .4byte gUnknown_02038670 -_080C40A0: .4byte gSharedMem + 0x18018 -_080C40A4: .4byte gUnknown_02038688 -_080C40A8: .4byte gContestFinalStandings -_080C40AC: - cmp r2, 0 - ble _080C40B4 - subs r0, r4, 0x1 - str r0, [r5, 0x8] -_080C40B4: - movs r1, 0x14 - add r10, r1 - movs r2, 0x1 - add r8, r2 - mov r4, r8 - cmp r4, 0x3 - bgt _080C40C4 - b _080C3F68 -_080C40C4: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C3F00 - - thumb_func_start sub_80C40D4 -sub_80C40D4: @ 80C40D4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 24 - lsls r1, 24 - lsrs r7, r1, 24 - movs r1, 0 - mov r10, r1 - movs r2, 0 - str r2, [sp] - cmp r0, 0 - bne _080C4198 - mov r8, r2 - ldr r0, _080C417C @ =gSharedMem + 0x18018 - subs r1, 0x18 - adds r1, r0 - mov r9, r1 - adds r4, r0, 0 - adds r4, 0x8 - movs r6, 0xA0 -_080C4102: - ldrb r0, [r4, 0x9] - cmp r7, r0 - bcs _080C416A - adds r0, 0x13 - adds r0, r6, r0 - subs r0, r7 - lsls r0, 1 - ldr r2, _080C4180 @ =0x0600bffe - adds r0, r2 - ldr r2, _080C4184 @ =0x000060b3 - adds r1, r2, 0 - strh r1, [r0] - ldr r0, _080C4188 @ =sub_80C42C0 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, [r4] - lsls r0, 16 - ldrb r1, [r4, 0x9] - bl __udivsi3 - adds r1, r7, 0x1 - adds r3, r0, 0 - muls r3, r1 - ldr r0, _080C418C @ =0x0000ffff - ands r0, r3 - ldr r1, _080C4190 @ =0x00007fff - cmp r0, r1 - bls _080C4146 - movs r0, 0x80 - lsls r0, 9 - adds r3, r0 -_080C4146: - ldr r1, _080C4194 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - mov r1, r8 - strh r1, [r0, 0x8] - lsrs r1, r3, 16 - strh r1, [r0, 0xA] - mov r2, r9 - ldrb r0, [r2, 0x14] - adds r0, 0x1 - strb r0, [r2, 0x14] - mov r0, r10 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 -_080C416A: - adds r4, 0x14 - adds r6, 0x60 - movs r0, 0x1 - add r8, r0 - mov r1, r8 - cmp r1, 0x3 - ble _080C4102 - b _080C4292 - .align 2, 0 -_080C417C: .4byte gSharedMem + 0x18018 -_080C4180: .4byte 0x0600bffe -_080C4184: .4byte 0x000060b3 -_080C4188: .4byte sub_80C42C0 -_080C418C: .4byte 0x0000ffff -_080C4190: .4byte 0x00007fff -_080C4194: .4byte gTasks -_080C4198: - movs r2, 0 - mov r8, r2 - ldr r0, _080C4220 @ =gSharedMem + 0x18018 - mov r12, r0 - mov r9, r2 - movs r1, 0xC0 - str r1, [sp, 0x4] -_080C41A6: - mov r6, r9 - add r6, r12 - ldrb r1, [r6, 0x12] - ldrb r0, [r6, 0x10] - ldr r2, _080C4224 @ =0x000060a3 - cmp r0, 0 - beq _080C41B6 - adds r2, 0x2 -_080C41B6: - lsls r0, r1, 24 - asrs r0, 24 - cmp r7, r0 - bge _080C427E - adds r0, 0x13 - ldr r1, [sp, 0x4] - adds r0, r1, r0 - subs r0, r7 - lsls r0, 1 - ldr r1, _080C4228 @ =0x0600bffe - adds r0, r1 - strh r2, [r0] - ldr r0, _080C422C @ =sub_80C42C0 - movs r1, 0xA - bl CreateTask - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, [r6, 0xC] - lsls r0, 16 - ldrb r1, [r6, 0x12] - bl __udivsi3 - adds r1, r7, 0x1 - adds r3, r0, 0 - muls r3, r1 - ldr r0, _080C4230 @ =0x0000ffff - ands r0, r3 - ldr r1, _080C4234 @ =0x00007fff - cmp r0, r1 - bls _080C41FA - movs r2, 0x80 - lsls r2, 9 - adds r3, r2 -_080C41FA: - ldr r1, _080C4238 @ =gTasks - lsls r2, r5, 2 - adds r0, r2, r5 - lsls r0, 3 - adds r4, r0, r1 - mov r0, r8 - strh r0, [r4, 0x8] - ldrb r0, [r6, 0x10] - adds r6, r1, 0 - cmp r0, 0 - beq _080C423C - movs r0, 0x1 - strh r0, [r4, 0xC] - ldr r0, [sp] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - b _080C4246 - .align 2, 0 -_080C4220: .4byte gSharedMem + 0x18018 -_080C4224: .4byte 0x000060a3 -_080C4228: .4byte 0x0600bffe -_080C422C: .4byte sub_80C42C0 -_080C4230: .4byte 0x0000ffff -_080C4234: .4byte 0x00007fff -_080C4238: .4byte gTasks -_080C423C: - mov r0, r10 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 -_080C4246: - ldr r0, _080C4264 @ =gSharedMem + 0x18018 - mov r1, r9 - adds r4, r1, r0 - ldrb r1, [r4, 0x10] - mov r12, r0 - cmp r1, 0 - beq _080C4268 - adds r0, r2, r5 - lsls r0, 3 - adds r0, r6 - lsrs r2, r3, 16 - ldr r1, [r4, 0x8] - subs r1, r2 - b _080C4274 - .align 2, 0 -_080C4264: .4byte gSharedMem + 0x18018 -_080C4268: - adds r0, r2, r5 - lsls r0, 3 - adds r0, r6 - lsrs r2, r3, 16 - ldr r1, [r4, 0x8] - adds r1, r2 -_080C4274: - strh r1, [r0, 0xA] - ldr r1, _080C42BC @ =gSharedMem + 0x18000 - ldrb r0, [r1, 0x14] - adds r0, 0x1 - strb r0, [r1, 0x14] -_080C427E: - movs r2, 0x14 - add r9, r2 - ldr r0, [sp, 0x4] - adds r0, 0x60 - str r0, [sp, 0x4] - movs r1, 0x1 - add r8, r1 - mov r2, r8 - cmp r2, 0x3 - ble _080C41A6 -_080C4292: - ldr r0, [sp] - cmp r0, 0 - beq _080C429E - movs r0, 0x16 - bl PlaySE -_080C429E: - mov r1, r10 - cmp r1, 0 - beq _080C42AA - movs r0, 0x15 - bl PlaySE -_080C42AA: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C42BC: .4byte gSharedMem + 0x18000 - thumb_func_end sub_80C40D4 - - thumb_func_start sub_80C42C0 -sub_80C42C0: @ 80C42C0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - movs r6, 0 - mov r9, r6 - ldr r1, _080C4308 @ =gTasks - lsls r0, 2 - add r0, r12 - lsls r0, 3 - adds r0, r1 - ldrb r5, [r0, 0x8] - ldrh r7, [r0, 0xA] - ldrh r1, [r0, 0xC] - mov r8, r1 - movs r2, 0xC - ldrsh r0, [r0, r2] - cmp r0, 0 - beq _080C4310 - ldr r1, _080C430C @ =gSharedMem + 0x18000 - lsls r2, r5, 1 - adds r0, r1, 0 - adds r0, 0xC - adds r0, r2, r0 - movs r3, 0 - ldrsh r0, [r0, r3] - mov r10, r1 - adds r4, r2, 0 - cmp r0, 0 - bgt _080C4328 - b _080C4326 - .align 2, 0 -_080C4308: .4byte gTasks -_080C430C: .4byte gSharedMem + 0x18000 -_080C4310: - ldr r1, _080C4350 @ =gSharedMem + 0x18000 - lsls r2, r5, 1 - adds r0, r1, 0 - adds r0, 0xC - adds r0, r2, r0 - movs r3, 0 - ldrsh r0, [r0, r3] - mov r10, r1 - adds r4, r2, 0 - cmp r0, 0x57 - ble _080C4328 -_080C4326: - movs r6, 0x1 -_080C4328: - mov r0, r10 - adds r0, 0xC - adds r3, r4, r0 - ldrh r2, [r3] - movs r0, 0 - ldrsh r1, [r3, r0] - lsls r0, r7, 16 - asrs r0, 16 - cmp r1, r0 - bne _080C4340 - movs r1, 0x1 - mov r9, r1 -_080C4340: - mov r0, r9 - cmp r0, 0 - bne _080C4362 - cmp r6, 0 - beq _080C4354 - strh r7, [r3] - b _080C4362 - .align 2, 0 -_080C4350: .4byte gSharedMem + 0x18000 -_080C4354: - mov r1, r8 - cmp r1, 0 - beq _080C435E - subs r0, r2, 0x1 - b _080C4360 -_080C435E: - adds r0, r2, 0x1 -_080C4360: - strh r0, [r3] -_080C4362: - cmp r6, 0 - bne _080C43C8 - mov r2, r9 - cmp r2, 0 - bne _080C43CE - movs r2, 0 - ldr r0, _080C4388 @ =gSharedMem + 0x1800C - adds r6, r4, r0 - adds r0, r4, r5 - lsls r5, r0, 5 -_080C4376: - movs r0, 0 - ldrsh r3, [r6, r0] - adds r0, r2, 0x1 - lsls r1, r0, 3 - adds r4, r0, 0 - cmp r3, r1 - blt _080C438C - movs r0, 0x8 - b _080C43A8 - .align 2, 0 -_080C4388: .4byte gSharedMem + 0x1800C -_080C438C: - lsls r0, r2, 3 - cmp r3, r0 - blt _080C43A6 - adds r0, r3, 0 - cmp r3, 0 - bge _080C439A - adds r0, r3, 0x7 -_080C439A: - asrs r0, 3 - lsls r0, 3 - subs r0, r3, r0 - lsls r0, 24 - lsrs r0, 24 - b _080C43A8 -_080C43A6: - movs r0, 0 -_080C43A8: - cmp r0, 0x3 - bhi _080C43B4 - ldr r3, _080C43B0 @ =0x0000504c - b _080C43B6 - .align 2, 0 -_080C43B0: .4byte 0x0000504c -_080C43B4: - ldr r3, _080C43EC @ =0x00005057 -_080C43B6: - adds r1, r0, r3 - adds r0, r5, r2 - lsls r0, 1 - ldr r2, _080C43F0 @ =0x0600e18e - adds r0, r2 - strh r1, [r0] - adds r2, r4, 0 - cmp r2, 0xA - ble _080C4376 -_080C43C8: - mov r3, r9 - cmp r3, 0 - beq _080C43DC -_080C43CE: - mov r1, r10 - ldrb r0, [r1, 0x14] - subs r0, 0x1 - strb r0, [r1, 0x14] - mov r0, r12 - bl DestroyTask -_080C43DC: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C43EC: .4byte 0x00005057 -_080C43F0: .4byte 0x0600e18e - thumb_func_end sub_80C42C0 - - thumb_func_start sub_80C43F4 -sub_80C43F4: @ 80C43F4 - push {r4,r5,lr} - ldr r0, _080C442C @ =gUnknown_02038694 - ldrb r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _080C4430 @ =gPlayerParty - adds r0, r1 - bl sub_80AE47C - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - cmp r5, 0 - beq _080C4422 - ldr r4, _080C4434 @ =gSpecialVar_ContestCategory - ldrb r0, [r4] - ldr r1, _080C4438 @ =gSpecialVar_ContestRank - ldrb r1, [r1] - bl Contest_InitAllPokemon - ldrb r0, [r4] - bl sub_80AE82C -_080C4422: - ldr r0, _080C443C @ =gSpecialVar_Result - strh r5, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C442C: .4byte gUnknown_02038694 -_080C4430: .4byte gPlayerParty -_080C4434: .4byte gSpecialVar_ContestCategory -_080C4438: .4byte gSpecialVar_ContestRank -_080C443C: .4byte gSpecialVar_Result - thumb_func_end sub_80C43F4 - - thumb_func_start sub_80C4440 -sub_80C4440: @ 80C4440 - push {r4,lr} - movs r4, 0 - ldr r0, _080C4464 @ =gUnknown_02038694 - ldrb r1, [r0] - movs r0, 0x64 - muls r1, r0 - ldr r0, _080C4468 @ =gPlayerParty - adds r2, r1, r0 - ldr r0, _080C446C @ =gSpecialVar_ContestCategory - ldrh r0, [r0] - cmp r0, 0x4 - bhi _080C44B2 - lsls r0, 2 - ldr r1, _080C4470 @ =_080C4474 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C4464: .4byte gUnknown_02038694 -_080C4468: .4byte gPlayerParty -_080C446C: .4byte gSpecialVar_ContestCategory -_080C4470: .4byte _080C4474 - .align 2, 0 -_080C4474: - .4byte _080C4488 - .4byte _080C448E - .4byte _080C4494 - .4byte _080C449A - .4byte _080C44A0 -_080C4488: - adds r0, r2, 0 - movs r1, 0x32 - b _080C44A4 -_080C448E: - adds r0, r2, 0 - movs r1, 0x33 - b _080C44A4 -_080C4494: - adds r0, r2, 0 - movs r1, 0x34 - b _080C44A4 -_080C449A: - adds r0, r2, 0 - movs r1, 0x35 - b _080C44A4 -_080C44A0: - adds r0, r2, 0 - movs r1, 0x36 -_080C44A4: - bl GetMonData - ldr r1, _080C44BC @ =gSpecialVar_ContestRank - ldrh r1, [r1] - cmp r0, r1 - bls _080C44B2 - movs r4, 0x1 -_080C44B2: - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080C44BC: .4byte gSpecialVar_ContestRank - thumb_func_end sub_80C4440 - - thumb_func_start sub_80C44C0 -sub_80C44C0: @ 80C44C0 - push {r4-r7,lr} - sub sp, 0x4 - ldr r1, _080C44E8 @ =gContestFinalStandings - ldr r0, _080C44EC @ =gContestPlayerMonIndex - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080C44D4 - b _080C465E -_080C44D4: - ldr r0, _080C44F0 @ =gSpecialVar_ContestCategory - ldrh r0, [r0] - cmp r0, 0x4 - bls _080C44DE - b _080C465E -_080C44DE: - lsls r0, 2 - ldr r1, _080C44F4 @ =_080C44F8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C44E8: .4byte gContestFinalStandings -_080C44EC: .4byte gContestPlayerMonIndex -_080C44F0: .4byte gSpecialVar_ContestCategory -_080C44F4: .4byte _080C44F8 - .align 2, 0 -_080C44F8: - .4byte _080C450C - .4byte _080C4554 - .4byte _080C4598 - .4byte _080C45DC - .4byte _080C4624 -_080C450C: - ldr r6, _080C4548 @ =gUnknown_02038694 - ldrb r0, [r6] - movs r5, 0x64 - muls r0, r5 - ldr r4, _080C454C @ =gPlayerParty - adds r0, r4 - movs r1, 0x32 - bl GetMonData - lsls r0, 24 - lsrs r1, r0, 24 - mov r0, sp - strb r1, [r0] - ldr r0, _080C4550 @ =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r1, r0 - bls _080C4530 - b _080C465E -_080C4530: - adds r0, r1, 0 - cmp r0, 0x3 - bls _080C4538 - b _080C465E -_080C4538: - adds r1, r0, 0x1 - mov r0, sp - strb r1, [r0] - ldrb r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x32 - b _080C4610 - .align 2, 0 -_080C4548: .4byte gUnknown_02038694 -_080C454C: .4byte gPlayerParty -_080C4550: .4byte gSpecialVar_ContestRank -_080C4554: - mov r4, sp - ldr r7, _080C458C @ =gUnknown_02038694 - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, _080C4590 @ =gPlayerParty - adds r0, r5 - movs r1, 0x33 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, _080C4594 @ =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bhi _080C465E - cmp r2, 0x3 - bhi _080C465E - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x33 - b _080C4610 - .align 2, 0 -_080C458C: .4byte gUnknown_02038694 -_080C4590: .4byte gPlayerParty -_080C4594: .4byte gSpecialVar_ContestRank -_080C4598: - mov r4, sp - ldr r7, _080C45D0 @ =gUnknown_02038694 - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, _080C45D4 @ =gPlayerParty - adds r0, r5 - movs r1, 0x34 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, _080C45D8 @ =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bhi _080C465E - cmp r2, 0x3 - bhi _080C465E - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x34 - b _080C4610 - .align 2, 0 -_080C45D0: .4byte gUnknown_02038694 -_080C45D4: .4byte gPlayerParty -_080C45D8: .4byte gSpecialVar_ContestRank -_080C45DC: - mov r4, sp - ldr r7, _080C4618 @ =gUnknown_02038694 - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, _080C461C @ =gPlayerParty - adds r0, r5 - movs r1, 0x35 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, _080C4620 @ =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bhi _080C465E - cmp r2, 0x3 - bhi _080C465E - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x35 -_080C4610: - mov r2, sp - bl SetMonData - b _080C465E - .align 2, 0 -_080C4618: .4byte gUnknown_02038694 -_080C461C: .4byte gPlayerParty -_080C4620: .4byte gSpecialVar_ContestRank -_080C4624: - mov r4, sp - ldr r7, _080C4668 @ =gUnknown_02038694 - ldrb r0, [r7] - movs r6, 0x64 - muls r0, r6 - ldr r5, _080C466C @ =gPlayerParty - adds r0, r5 - movs r1, 0x36 - bl GetMonData - strb r0, [r4] - mov r0, sp - ldrb r2, [r0] - ldr r0, _080C4670 @ =gSpecialVar_ContestRank - ldrh r0, [r0] - cmp r2, r0 - bhi _080C465E - cmp r2, 0x3 - bhi _080C465E - mov r1, sp - adds r0, r2, 0x1 - strb r0, [r1] - ldrb r0, [r7] - muls r0, r6 - adds r0, r5 - movs r1, 0x36 - mov r2, sp - bl SetMonData -_080C465E: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C4668: .4byte gUnknown_02038694 -_080C466C: .4byte gPlayerParty -_080C4670: .4byte gSpecialVar_ContestRank - thumb_func_end sub_80C44C0 - - thumb_func_start sub_80C4674 -sub_80C4674: @ 80C4674 - push {r4,lr} - adds r4, r0, 0 - bl StringCopy - ldrb r0, [r4] - cmp r0, 0xFC - bne _080C4690 - ldrb r0, [r4, 0x1] - cmp r0, 0x15 - bne _080C4690 - adds r0, r4, 0 - movs r1, 0x1 - bl ConvertInternationalString -_080C4690: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C4674 - - thumb_func_start sub_80C4698 -sub_80C4698: @ 80C4698 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - lsls r1, r4, 6 - ldr r0, _080C46E0 @ =gContestMons + 0x2 - adds r1, r0 - adds r0, r5, 0 - bl StringCopy - ldr r0, _080C46E4 @ =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C46DA - ldr r0, _080C46E8 @ =gLinkPlayers - lsls r1, r4, 3 - subs r1, r4 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1, 0x1A] - cmp r0, 0x1 - bne _080C46DA - adds r0, r5, 0 - bl sub_80C86A0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl ConvertInternationalString -_080C46DA: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C46E0: .4byte gContestMons + 0x2 -_080C46E4: .4byte gIsLinkContest -_080C46E8: .4byte gLinkPlayers - thumb_func_end sub_80C4698 - - thumb_func_start sub_80C46EC -sub_80C46EC: @ 80C46EC - push {lr} - ldr r0, _080C4710 @ =gIsLinkContest - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C4720 - ldr r0, _080C4714 @ =gStringVar1 - ldr r1, _080C4718 @ =gSpecialVar_0x8006 - ldrh r2, [r1] - lsls r1, r2, 3 - subs r1, r2 - lsls r1, 2 - ldr r2, _080C471C @ =gLinkPlayers + 0x8 - adds r1, r2 - bl sub_80C4674 - b _080C4730 - .align 2, 0 -_080C4710: .4byte gIsLinkContest -_080C4714: .4byte gStringVar1 -_080C4718: .4byte gSpecialVar_0x8006 -_080C471C: .4byte gLinkPlayers + 0x8 -_080C4720: - ldr r0, _080C4734 @ =gStringVar1 - ldr r1, _080C4738 @ =gSpecialVar_0x8006 - ldrh r1, [r1] - lsls r1, 6 - ldr r2, _080C473C @ =gUnknown_0203857D - adds r1, r2 - bl sub_80C4674 -_080C4730: - pop {r0} - bx r0 - .align 2, 0 -_080C4734: .4byte gStringVar1 -_080C4738: .4byte gSpecialVar_0x8006 -_080C473C: .4byte gUnknown_0203857D - thumb_func_end sub_80C46EC - - thumb_func_start sub_80C4740 -sub_80C4740: @ 80C4740 - push {lr} - ldr r0, _080C4750 @ =gStringVar3 - ldr r1, _080C4754 @ =gSpecialVar_0x8006 - ldrb r1, [r1] - bl sub_80C4698 - pop {r0} - bx r0 - .align 2, 0 -_080C4750: .4byte gStringVar3 -_080C4754: .4byte gSpecialVar_0x8006 - thumb_func_end sub_80C4740 - - thumb_func_start sub_80C4758 -sub_80C4758: @ 80C4758 - push {r4-r6,lr} - movs r1, 0 - movs r2, 0 - ldr r5, _080C4794 @ =gSpecialVar_0x8004 - ldr r4, _080C4798 @ =gUnknown_02038670 - ldr r0, _080C479C @ =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r0, r4 - movs r6, 0 - ldrsh r3, [r0, r6] -_080C476E: - lsls r0, r1, 1 - adds r0, r4 - movs r6, 0 - ldrsh r0, [r0, r6] - cmp r3, r0 - bge _080C4780 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 -_080C4780: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _080C476E - strh r2, [r5] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C4794: .4byte gSpecialVar_0x8004 -_080C4798: .4byte gUnknown_02038670 -_080C479C: .4byte gSpecialVar_0x8006 - thumb_func_end sub_80C4758 - - thumb_func_start sub_80C47A0 -sub_80C47A0: @ 80C47A0 - ldr r2, _080C47B4 @ =gSpecialVar_0x8004 - ldr r1, _080C47B8 @ =gUnknown_02038670 - ldr r0, _080C47BC @ =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - bx lr - .align 2, 0 -_080C47B4: .4byte gSpecialVar_0x8004 -_080C47B8: .4byte gUnknown_02038670 -_080C47BC: .4byte gSpecialVar_0x8006 - thumb_func_end sub_80C47A0 - - thumb_func_start sub_80C47C0 -sub_80C47C0: @ 80C47C0 - push {lr} - movs r1, 0 - ldr r2, _080C47E8 @ =gContestFinalStandings - ldrb r0, [r2] - ldr r3, _080C47EC @ =gSpecialVar_0x8005 - cmp r0, 0 - beq _080C47E0 -_080C47CE: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bhi _080C47E0 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080C47CE -_080C47E0: - strh r1, [r3] - pop {r0} - bx r0 - .align 2, 0 -_080C47E8: .4byte gContestFinalStandings -_080C47EC: .4byte gSpecialVar_0x8005 - thumb_func_end sub_80C47C0 - - thumb_func_start sub_80C47F0 -sub_80C47F0: @ 80C47F0 - push {r4,lr} - movs r2, 0 - ldr r3, _080C4830 @ =gContestFinalStandings - ldrb r0, [r3] - ldr r1, _080C4834 @ =gIsLinkContest - ldr r4, _080C4838 @ =gStringVar3 - cmp r0, 0 - beq _080C4812 -_080C4800: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bhi _080C4812 - adds r0, r2, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _080C4800 -_080C4812: - ldrb r1, [r1] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080C4840 - lsls r1, r2, 3 - subs r1, r2 - lsls r1, 2 - ldr r0, _080C483C @ =gLinkPlayers + 0x8 - adds r1, r0 - adds r0, r4, 0 - bl sub_80C4674 - b _080C484C - .align 2, 0 -_080C4830: .4byte gContestFinalStandings -_080C4834: .4byte gIsLinkContest -_080C4838: .4byte gStringVar3 -_080C483C: .4byte gLinkPlayers + 0x8 -_080C4840: - lsls r1, r2, 6 - ldr r0, _080C4854 @ =gUnknown_0203857D - adds r1, r0 - adds r0, r4, 0 - bl sub_80C4674 -_080C484C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C4854: .4byte gUnknown_0203857D - thumb_func_end sub_80C47F0 - - thumb_func_start sub_80C4858 -sub_80C4858: @ 80C4858 - push {lr} - movs r1, 0 - ldr r2, _080C4884 @ =gContestFinalStandings - ldrb r0, [r2] - ldr r3, _080C4888 @ =gStringVar1 - cmp r0, 0 - beq _080C4878 -_080C4866: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bhi _080C4878 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _080C4866 -_080C4878: - adds r0, r3, 0 - bl sub_80C4698 - pop {r0} - bx r0 - .align 2, 0 -_080C4884: .4byte gContestFinalStandings -_080C4888: .4byte gStringVar1 - thumb_func_end sub_80C4858 - - thumb_func_start sub_80C488C -sub_80C488C: @ 80C488C - push {lr} - ldr r0, _080C4898 @ =CB2_StartContest - bl SetMainCallback2 - pop {r0} - bx r0 - .align 2, 0 -_080C4898: .4byte CB2_StartContest - thumb_func_end sub_80C488C - - thumb_func_start sub_80C489C -sub_80C489C: @ 80C489C - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _080C48C0 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080C48BA - adds r0, r2, 0 - bl DestroyTask - ldr r0, _080C48C4 @ =sub_80C488C - bl SetMainCallback2 -_080C48BA: - pop {r0} - bx r0 - .align 2, 0 -_080C48C0: .4byte gPaletteFade -_080C48C4: .4byte sub_80C488C - thumb_func_end sub_80C489C - - thumb_func_start sub_80C48C8 -sub_80C48C8: @ 80C48C8 - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - ldr r0, _080C48F0 @ =sub_80C489C - movs r1, 0xA - bl CreateTask - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_080C48F0: .4byte sub_80C489C - thumb_func_end sub_80C48C8 - - thumb_func_start sub_80C48F4 -sub_80C48F4: @ 80C48F4 - ldr r2, _080C4908 @ =gSpecialVar_0x8004 - ldr r1, _080C490C @ =gContestMons - ldr r0, _080C4910 @ =gSpecialVar_0x8006 - ldrh r0, [r0] - lsls r0, 6 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - bx lr - .align 2, 0 -_080C4908: .4byte gSpecialVar_0x8004 -_080C490C: .4byte gContestMons -_080C4910: .4byte gSpecialVar_0x8006 - thumb_func_end sub_80C48F4 - - thumb_func_start sub_80C4914 -sub_80C4914: @ 80C4914 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _080C4938 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080C4932 - adds r0, r2, 0 - bl DestroyTask - ldr r0, _080C493C @ =sub_80C2358 - bl SetMainCallback2 -_080C4932: - pop {r0} - bx r0 - .align 2, 0 -_080C4938: .4byte gPaletteFade -_080C493C: .4byte sub_80C2358 - thumb_func_end sub_80C4914 - - thumb_func_start sub_80C4940 -sub_80C4940: @ 80C4940 - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - ldr r0, _080C4968 @ =sub_80C4914 - movs r1, 0xA - bl CreateTask - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_080C4968: .4byte sub_80C4914 - thumb_func_end sub_80C4940 - - thumb_func_start sub_80C496C -sub_80C496C: @ 80C496C - ldr r0, _080C4978 @ =gSpecialVar_0x8004 - ldr r1, _080C497C @ =gContestPlayerMonIndex - ldrb r1, [r1] - strh r1, [r0] - bx lr - .align 2, 0 -_080C4978: .4byte gSpecialVar_0x8004 -_080C497C: .4byte gContestPlayerMonIndex - thumb_func_end sub_80C496C - - thumb_func_start sub_80C4980 -sub_80C4980: @ 80C4980 - push {r4-r6,lr} - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - bl ScriptContext2_Enable - ldr r6, _080C49B8 @ =sub_80C8604 - adds r0, r6, 0 - movs r1, 0 - bl CreateTask - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r2, _080C49BC @ =sub_80C49C4 - adds r0, r4, 0 - adds r1, r6, 0 - bl SetTaskFuncWithFollowupFunc - ldr r1, _080C49C0 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - strh r5, [r0, 0x1A] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C49B8: .4byte sub_80C8604 -_080C49BC: .4byte sub_80C49C4 -_080C49C0: .4byte gTasks - thumb_func_end sub_80C4980 - - thumb_func_start sub_80C49C4 -sub_80C49C4: @ 80C49C4 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _080C49E4 @ =gUnknown_02038694 - ldrb r0, [r0] - bl Contest_CreatePlayerMon - ldr r1, _080C49E8 @ =sub_80C8734 - ldr r2, _080C49EC @ =sub_80C49F0 - adds r0, r4, 0 - bl SetTaskFuncWithFollowupFunc - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C49E4: .4byte gUnknown_02038694 -_080C49E8: .4byte sub_80C8734 -_080C49EC: .4byte sub_80C49F0 - thumb_func_end sub_80C49C4 - - thumb_func_start sub_80C49F0 -sub_80C49F0: @ 80C49F0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080C4A04 @ =sub_80C88AC - ldr r2, _080C4A08 @ =sub_80C4A0C - bl SetTaskFuncWithFollowupFunc - pop {r0} - bx r0 - .align 2, 0 -_080C4A04: .4byte sub_80C88AC -_080C4A08: .4byte sub_80C4A0C - thumb_func_end sub_80C49F0 - - thumb_func_start sub_80C4A0C -sub_80C4A0C: @ 80C4A0C - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080C4A20 @ =sub_80C8E1C - ldr r2, _080C4A24 @ =sub_80C4A28 - bl SetTaskFuncWithFollowupFunc - pop {r0} - bx r0 - .align 2, 0 -_080C4A20: .4byte sub_80C8E1C -_080C4A24: .4byte sub_80C4A28 - thumb_func_end sub_80C4A0C - - thumb_func_start sub_80C4A28 -sub_80C4A28: @ 80C4A28 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080C4A3C @ =sub_80C8938 - ldr r2, _080C4A40 @ =sub_80C4A44 - bl SetTaskFuncWithFollowupFunc - pop {r0} - bx r0 - .align 2, 0 -_080C4A3C: .4byte sub_80C8938 -_080C4A40: .4byte sub_80C4A44 - thumb_func_end sub_80C4A28 - - thumb_func_start sub_80C4A44 -sub_80C4A44: @ 80C4A44 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r5, r0, 24 - movs r3, 0 - ldr r0, _080C4AA0 @ =gSpecialVar_0x8004 - mov r8, r0 - add r1, sp, 0x4 - mov r12, r1 - lsls r1, r5, 2 - adds r0, r1, r5 - lsls r4, r0, 3 - ldr r6, _080C4AA4 @ =gTasks + 0x8 - adds r7, r1, 0 -_080C4A64: - mov r0, sp - adds r2, r0, r3 - adds r1, r3, 0x1 - lsls r0, r1, 1 - adds r0, r4 - adds r0, r6 - ldrh r0, [r0] - strb r0, [r2] - lsls r1, 24 - lsrs r3, r1, 24 - cmp r3, 0x3 - bls _080C4A64 - movs r3, 0 - mov r2, sp -_080C4A80: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - bhi _080C4A96 - mov r0, sp - adds r1, r0, r3 - ldrb r0, [r2] - ldrb r1, [r1] - cmp r0, r1 - beq _080C4A80 -_080C4A96: - cmp r3, 0x4 - bne _080C4AA8 - movs r0, 0 - b _080C4AAA - .align 2, 0 -_080C4AA0: .4byte gSpecialVar_0x8004 -_080C4AA4: .4byte gTasks + 0x8 -_080C4AA8: - movs r0, 0x1 -_080C4AAA: - mov r1, r8 - strh r0, [r1] - movs r3, 0 - mov r4, r12 - adds r0, r7, r5 - lsls r2, r0, 3 - ldr r6, _080C4AF8 @ =gTasks + 0x8 -_080C4AB8: - adds r1, r4, r3 - adds r0, r3, 0x5 - lsls r0, 1 - adds r0, r2 - adds r0, r6 - ldrh r0, [r0] - strb r0, [r1] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - bls _080C4AB8 - mov r0, r12 - bl sub_80C4B34 - ldr r1, _080C4AFC @ =gUnknown_0203869B - strb r0, [r1] - ldr r0, _080C4B00 @ =gSpecialVar_ContestCategory - ldrb r0, [r0] - bl sub_80AE82C - ldr r1, _080C4B04 @ =sub_80C8EBC - ldr r2, _080C4B08 @ =sub_80C4B0C - adds r0, r5, 0 - bl SetTaskFuncWithFollowupFunc - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C4AF8: .4byte gTasks + 0x8 -_080C4AFC: .4byte gUnknown_0203869B -_080C4B00: .4byte gSpecialVar_ContestCategory -_080C4B04: .4byte sub_80C8EBC -_080C4B08: .4byte sub_80C4B0C - thumb_func_end sub_80C4A44 - - thumb_func_start sub_80C4B0C -sub_80C4B0C: @ 80C4B0C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - bl sub_80B0F28 - ldr r1, _080C4B2C @ =sub_80C8F34 - ldr r2, _080C4B30 @ =sub_80C4B5C - adds r0, r4, 0 - bl SetTaskFuncWithFollowupFunc - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C4B2C: .4byte sub_80C8F34 -_080C4B30: .4byte sub_80C4B5C - thumb_func_end sub_80C4B0C - - thumb_func_start sub_80C4B34 -sub_80C4B34: @ 80C4B34 - push {r4,lr} - adds r3, r0, 0 - movs r4, 0 - movs r2, 0x1 -_080C4B3C: - adds r0, r3, r4 - adds r1, r3, r2 - ldrb r0, [r0] - ldrb r1, [r1] - cmp r0, r1 - bcs _080C4B4C - lsls r0, r2, 24 - lsrs r4, r0, 24 -_080C4B4C: - adds r2, 0x1 - cmp r2, 0x3 - ble _080C4B3C - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80C4B34 - - thumb_func_start sub_80C4B5C -sub_80C4B5C: @ 80C4B5C - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080C4B84 @ =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0x1 - bne _080C4B90 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C4B9E - ldr r0, _080C4B88 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, _080C4B8C @ =sub_80C4BA4 - str r0, [r1] - b _080C4B9E - .align 2, 0 -_080C4B84: .4byte gSpecialVar_0x8004 -_080C4B88: .4byte gTasks -_080C4B8C: .4byte sub_80C4BA4 -_080C4B90: - adds r0, r4, 0 - bl DestroyTask - bl ScriptContext2_Disable - bl EnableBothScriptContexts -_080C4B9E: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C4B5C - - thumb_func_start sub_80C4BA4 -sub_80C4BA4: @ 80C4BA4 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_800832C - ldr r1, _080C4BC4 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _080C4BC8 @ =sub_80C4BCC - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C4BC4: .4byte gTasks -_080C4BC8: .4byte sub_80C4BCC - thumb_func_end sub_80C4BA4 - - thumb_func_start sub_80C4BCC -sub_80C4BCC: @ 80C4BCC - push {lr} - lsls r0, 24 - lsrs r1, r0, 24 - ldr r0, _080C4BEC @ =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _080C4BE8 - adds r0, r1, 0 - bl DestroyTask - bl ScriptContext2_Disable - bl EnableBothScriptContexts -_080C4BE8: - pop {r0} - bx r0 - .align 2, 0 -_080C4BEC: .4byte gReceivedRemoteLinkPlayers - thumb_func_end sub_80C4BCC - - .align 2, 0 @ Don't pad with nop. diff --git a/asm-de/contest_link_80C857C.s b/asm-de/contest_link_80C857C.s deleted file mode 100644 index e3a8b674d..000000000 --- a/asm-de/contest_link_80C857C.s +++ /dev/null @@ -1,1408 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_80C857C -sub_80C857C: @ 80C857C - push {r4,r5,lr} - adds r2, r0, 0 - lsls r4, r1, 16 - lsrs r4, 16 - ldr r5, _080C85A8 @ =gSharedMem + 0x1E000 - adds r0, r5, 0 - adds r1, r2, 0 - adds r2, r4, 0 - bl memcpy - bl bitmask_all_link_players_but_self - lsls r0, 24 - lsrs r0, 24 - adds r1, r5, 0 - adds r2, r4, 0 - bl SendBlock - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C85A8: .4byte gSharedMem + 0x1E000 - thumb_func_end sub_80C857C - - thumb_func_start sub_80C85AC -sub_80C85AC: @ 80C85AC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x80 - lsls r1, 17 - lsls r1, r0 - lsrs r4, r1, 24 - bl GetBlockReceivedStatus - adds r1, r4, 0 - ands r1, r0 - cmp r1, 0 - beq _080C85D0 - adds r0, r4, 0 - bl ResetBlockReceivedFlag - movs r0, 0x1 - b _080C85D2 -_080C85D0: - movs r0, 0 -_080C85D2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80C85AC - - thumb_func_start sub_80C85D8 -sub_80C85D8: @ 80C85D8 - push {r4,lr} - movs r4, 0 -_080C85DC: - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - asrs r0, r4 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080C85F2 - movs r0, 0 - b _080C85FE -_080C85F2: - adds r4, 0x1 - cmp r4, 0x3 - ble _080C85DC - bl ResetBlockReceivedFlags - movs r0, 0x1 -_080C85FE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80C85D8 - - thumb_func_start sub_80C8604 -sub_80C8604: @ 80C8604 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C861C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - ldr r0, _080C8620 @ =sub_80C8644 - str r0, [r1] - bx lr - .align 2, 0 -_080C861C: .4byte gTasks -_080C8620: .4byte sub_80C8644 - thumb_func_end sub_80C8604 - - thumb_func_start sub_80C8644 -sub_80C8644: @ 80C8644 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C8658 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, _080C865C @ =sub_80C8660 - str r0, [r1] - bx lr - .align 2, 0 -_080C8658: .4byte gTasks -_080C865C: .4byte sub_80C8660 - thumb_func_end sub_80C8644 - - thumb_func_start sub_80C8660 -sub_80C8660: @ 80C8660 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080C8694 @ =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _080C868E - bl GetMultiplayerId - ldr r1, _080C8698 @ =gContestPlayerMonIndex - strb r0, [r1] - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bne _080C868E - ldr r1, _080C869C @ =gIsLinkContest - movs r0, 0x1 - strb r0, [r1] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc -_080C868E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C8694: .4byte gReceivedRemoteLinkPlayers -_080C8698: .4byte gContestPlayerMonIndex -_080C869C: .4byte gIsLinkContest - thumb_func_end sub_80C8660 - - thumb_func_start sub_80C86A0 -sub_80C86A0: @ 80C86A0 - push {r4,r5,lr} - adds r4, r0, 0 - movs r5, 0x5 - ldrb r0, [r4] - cmp r0, 0xFC - bne _080C86B6 - ldrb r0, [r4, 0x1] - cmp r0, 0x15 - bne _080C86B6 - movs r0, 0x5 - b _080C872C -_080C86B6: - adds r0, r4, 0 - bl StringLength - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bhi _080C872A - ldrb r0, [r4] - cmp r0, 0xFF - beq _080C872A -_080C86CA: - ldrb r1, [r4] - adds r0, r1, 0 - adds r0, 0x45 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x33 - bls _080C871E - adds r0, r1, 0 - adds r0, 0x5F - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x9 - bls _080C871E - adds r0, r1, 0 - cmp r0, 0 - beq _080C871E - cmp r0, 0xAD - beq _080C871E - cmp r0, 0xB8 - beq _080C871E - cmp r0, 0xAB - beq _080C871E - cmp r0, 0xAC - beq _080C871E - cmp r0, 0xB5 - beq _080C871E - cmp r0, 0xB6 - beq _080C871E - cmp r0, 0xBA - beq _080C871E - cmp r0, 0xAE - beq _080C871E - cmp r0, 0xB0 - beq _080C871E - cmp r0, 0xB1 - beq _080C871E - cmp r0, 0xB2 - beq _080C871E - cmp r0, 0xB3 - beq _080C871E - cmp r0, 0xB1 - bne _080C8728 -_080C871E: - adds r4, 0x1 - ldrb r0, [r4] - cmp r0, 0xFF - bne _080C86CA - b _080C872A -_080C8728: - movs r5, 0x1 -_080C872A: - adds r0, r5, 0 -_080C872C: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80C86A0 - - thumb_func_start sub_80C8734 -sub_80C8734: @ 80C8734 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080C8760 @ =gTasks - lsls r4, r5, 2 - adds r0, r4, r5 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - cmp r0, 0x1 - beq _080C8800 - cmp r0, 0x1 - bgt _080C8764 - cmp r0, 0 - beq _080C8770 - b _080C88E0 - .align 2, 0 -_080C8760: .4byte gTasks -_080C8764: - cmp r0, 0x2 - bne _080C876A - b _080C88D4_B -_080C876A: - cmp r0, 0x8 - beq _080C8770 - b _080C88E0 -_080C8770: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C87D4 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - bne _080C8786 - b _080C88EE -_080C8786: - ldr r0, _080C87A0 @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r0 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080C87A4 - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080C88EE - .align 2, 0 -_080C87A0: .4byte gTasks -_080C87A4: - ldr r0, _080C87C8 @ =gBlockSendBuffer - ldr r1, _080C87CC @ =gContestPlayerMonIndex - ldrb r1, [r1] - lsls r1, 6 - ldr r2, _080C87D0 @ =gContestMons - adds r1, r2 - movs r2, 0x40 - bl memcpy - movs r0, 0 - bl de_sub_80C9274 - movs r0, 0x2 - bl sub_8007E9C - movs r0, 0x1 - strh r0, [r4, 0x8] - b _080C88EE - .align 2, 0 -_080C87C8: .4byte gBlockSendBuffer -_080C87CC: .4byte gContestPlayerMonIndex -_080C87D0: .4byte gContestMons -_080C87D4: - ldr r0, _080C87F0 @ =gBlockSendBuffer - ldr r1, _080C87F4 @ =gContestPlayerMonIndex - ldrb r1, [r1] - lsls r1, 6 - ldr r2, _080C87F8 @ =gContestMons - adds r1, r2 - movs r2, 0x40 - bl memcpy - movs r0, 0 - bl de_sub_80C9294 - ldr r1, _080C87FC @ =gTasks - b _080C88E0 - .align 2, 0 -_080C87F0: .4byte gBlockSendBuffer -_080C87F4: .4byte gContestPlayerMonIndex -_080C87F8: .4byte gContestMons -_080C87FC: .4byte gTasks -_080C8800: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C88EE - movs r2, 0 - mov r8, r2 - str r4, [sp] - ldr r0, _080C884C @ =gContestMons - ldr r7, _080C8850 @ =gLinkPlayers - movs r6, 0 - mov r10, r0 - movs r3, 0xFF - mov r9, r3 -_080C881C: - mov r0, r8 - lsls r1, r0, 8 - ldr r0, _080C8854 @ =gBlockRecvBuffer - adds r1, r0 - mov r0, r10 - movs r2, 0x40 - bl memcpy - ldr r1, _080C8858 @ =gContestMons + 0x2 - adds r4, r6, r1 - ldrh r0, [r7, 0x1A] - cmp r0, 0x1 - bne _080C885C - adds r0, r4, 0 - bl sub_80C86A0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl ConvertInternationalString - b _080C8872 - .align 2, 0 -_080C884C: .4byte gContestMons -_080C8850: .4byte gLinkPlayers -_080C8854: .4byte gBlockRecvBuffer -_080C8858: .4byte gContestMons + 0x2 -_080C885C: - ldrb r0, [r4, 0xA] - cmp r0, 0xFC - bne _080C886C - adds r0, r4, 0 - movs r1, 0x1 - bl ConvertInternationalString - b _080C8872 -_080C886C: - strb r0, [r4, 0x5] - mov r2, r9 - strb r2, [r4, 0xA] -_080C8872: - ldr r0, _080C88A0 @ =gUnknown_0203857D - adds r4, r6, r0 - ldrh r0, [r7, 0x1A] - cmp r0, 0x1 - bne _080C88A4 - mov r3, r9 - strb r3, [r4, 0x7] - ldrb r0, [r4, 0x4] - strb r0, [r4, 0x6] - ldrb r0, [r4, 0x3] - strb r0, [r4, 0x5] - ldrb r0, [r4, 0x2] - strb r0, [r4, 0x4] - ldrb r0, [r4, 0x1] - strb r0, [r4, 0x3] - ldrb r0, [r4] - strb r0, [r4, 0x2] - movs r0, 0x15 - strb r0, [r4, 0x1] - movs r0, 0xFC - strb r0, [r4] - b _080C88AC - .align 2, 0 -_080C88A0: .4byte gUnknown_0203857D -_080C88A4: - ldrb r0, [r4, 0x7] - strb r0, [r4, 0x5] - mov r0, r9 - strb r0, [r4, 0x7] -_080C88AC: - adds r7, 0x1C - adds r6, 0x40 - movs r1, 0x40 - add r10, r1 - movs r2, 0x1 - add r8, r2 - mov r3, r8 - cmp r3, 0x3 - ble _080C881C - ldr r0, _080C88D0 @ =gTasks - ldr r2, [sp] - adds r1, r2, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C88EE - .align 2, 0 -_080C88D0: .4byte gTasks -_080C88D4_B: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C88EE -_080C88E0: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_080C88EE: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8734 - - thumb_func_start sub_80C88AC -sub_80C88AC: @ 80C88AC - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C88D4 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _080C88D8 - cmp r0, 0x1 - beq _080C88FC - movs r0, 0 - strh r0, [r5, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8924 - .align 2, 0 -_080C88D4: .4byte gTasks -_080C88D8: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C891E - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8924 - ldr r0, _080C88F8 @ =gRngValue - movs r1, 0x4 - bl sub_80C857C - b _080C891E - .align 2, 0 -_080C88F8: .4byte gRngValue -_080C88FC: - movs r0, 0 - bl sub_80C85AC - lsls r0, 24 - cmp r0, 0 - beq _080C8924 - ldr r0, _080C892C @ =gRngValue - ldr r4, _080C8930 @ =gBlockRecvBuffer - adds r1, r4, 0 - movs r2, 0x4 - bl memcpy - ldr r0, _080C8934 @ =gUnknown_03005D28 - adds r1, r4, 0 - movs r2, 0x4 - bl memcpy -_080C891E: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_080C8924: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C892C: .4byte gRngValue -_080C8930: .4byte gBlockRecvBuffer -_080C8934: .4byte gUnknown_03005D28 - thumb_func_end sub_80C88AC - - thumb_func_start sub_80C8938 -sub_80C8938: @ 80C8938 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080C8960 @ =gTasks - lsls r5, r4, 2 - adds r0, r5, r4 - lsls r6, r0, 3 - adds r2, r6, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - mov r8, r1 - cmp r0, 0x1 - beq _080C89C4 - cmp r0, 0x1 - bgt _080C8964 - cmp r0, 0 - beq _080C896C - b _080C8A0C - .align 2, 0 -_080C8960: .4byte gTasks -_080C8964: - cmp r0, 0x2 - beq _080C8A00 - cmp r0, 0x8 - bne _080C8A0C -_080C896C: - ldr r1, _080C89A0 @ =gBlockSendBuffer - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - mov r2, r8 - adds r4, r0, r2 - ldrh r0, [r4, 0x1A] - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C89B6 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8A1A - movs r3, 0x8 - ldrsh r0, [r4, r3] - cmp r0, 0 - bne _080C89A4 - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080C8A1A - .align 2, 0 -_080C89A0: .4byte gBlockSendBuffer -_080C89A4: - movs r0, 0x1 - bl de_sub_80C9274 - movs r0, 0x2 - bl sub_8007E9C - movs r0, 0x1 - strh r0, [r4, 0x8] - b _080C8A1A -_080C89B6: - movs r0, 0x1 - bl de_sub_80C9294 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C8A1A -_080C89C4: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8A1A - movs r3, 0 - adds r7, r5, 0 - ldr r1, _080C89FC @ =gBlockRecvBuffer - mov r0, r8 - adds r0, 0xA - adds r2, r6, r0 - movs r5, 0x80 - lsls r5, 1 -_080C89DE: - ldrh r0, [r1] - strh r0, [r2] - adds r1, r5 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C89DE - adds r1, r7, r4 - lsls r1, 3 - add r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C8A1A - .align 2, 0 -_080C89FC: .4byte gBlockRecvBuffer -_080C8A00: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc - b _080C8A1A -_080C8A0C: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - add r0, r8 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_080C8A1A: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8938 - - thumb_func_start sub_80C89DC -sub_80C89DC: @ 80C89DC - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C8A04 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8A08 - cmp r0, 0x1 - beq _080C8A20 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8A30 - .align 2, 0 -_080C8A04: .4byte gTasks -_080C8A08: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8A30 - ldr r0, _080C8A1C @ =gContestPlayerMonIndex - movs r1, 0x1 - bl sub_80C857C - b _080C8A2A - .align 2, 0 -_080C8A1C: .4byte gContestPlayerMonIndex -_080C8A20: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8A30 -_080C8A2A: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080C8A30: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C89DC - - thumb_func_start sub_80C8A38 -sub_80C8A38: @ 80C8A38 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r7, _080C8A60 @ =gTasks - lsls r6, r5, 2 - adds r0, r6, r5 - lsls r0, 3 - adds r4, r0, r7 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8A64 - cmp r0, 0x1 - beq _080C8A94 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C8AC2 - .align 2, 0 -_080C8A60: .4byte gTasks -_080C8A64: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8AC2 - ldr r0, _080C8A8C @ =gContestPlayerMonIndex - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - ldr r1, _080C8A90 @ =gSharedMem + 0x19266 - adds r0, r1 - movs r1, 0x2 - bl sub_80C857C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C8AC2 - .align 2, 0 -_080C8A8C: .4byte gContestPlayerMonIndex -_080C8A90: .4byte gSharedMem + 0x19266 -_080C8A94: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8AC2 - ldr r1, _080C8AC8 @ =gBlockRecvBuffer - ldr r3, _080C8ACC @ =gSharedMem + 0x19266 - movs r4, 0x80 - lsls r4, 1 - movs r2, 0x3 -_080C8AA8: - ldrh r0, [r1] - strh r0, [r3] - adds r1, r4 - adds r3, 0x1C - subs r2, 0x1 - cmp r2, 0 - bge _080C8AA8 - adds r1, r6, r5 - lsls r1, 3 - adds r1, r7 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_080C8AC2: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8AC8: .4byte gBlockRecvBuffer -_080C8ACC: .4byte gSharedMem + 0x19266 - thumb_func_end sub_80C8A38 - - thumb_func_start sub_80C8AD0 -sub_80C8AD0: @ 80C8AD0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080C8AF8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - adds r3, r1, 0 - cmp r0, 0xB - bls _080C8AEC - b _080C8C70 -_080C8AEC: - lsls r0, 2 - ldr r1, _080C8AFC @ =_080C8B00 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C8AF8: .4byte gTasks -_080C8AFC: .4byte _080C8B00 - .align 2, 0 -_080C8B00: - .4byte _080C8B30 - .4byte _080C8B4C - .4byte _080C8B74 - .4byte _080C8B98 - .4byte _080C8BB0 - .4byte _080C8B74 - .4byte _080C8BD8 - .4byte _080C8BF0 - .4byte _080C8B74 - .4byte _080C8C18 - .4byte _080C8C30 - .4byte _080C8B74 -_080C8B30: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - bne _080C8B3C - b _080C8C7A -_080C8B3C: - ldr r0, _080C8B48 @ =gUnknown_02038678 - movs r1, 0x8 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8B48: .4byte gUnknown_02038678 -_080C8B4C: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - bne _080C8B58 - b _080C8C7A -_080C8B58: - ldr r0, _080C8B68 @ =gUnknown_02038678 - ldr r1, _080C8B6C @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8B70 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - b _080C8C48 - .align 2, 0 -_080C8B68: .4byte gUnknown_02038678 -_080C8B6C: .4byte gUnknown_0203869B -_080C8B70: .4byte gBlockRecvBuffer -_080C8B74: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r3 - ldrh r0, [r2, 0xA] - adds r1, r0, 0x1 - strh r1, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bgt _080C8B8C - b _080C8C7A -_080C8B8C: - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _080C8C7A -_080C8B98: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8BAC @ =gUnknown_02038680 - movs r1, 0x8 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8BAC: .4byte gUnknown_02038680 -_080C8BB0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8BCC @ =gUnknown_02038680 - ldr r1, _080C8BD0 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8BD4 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - b _080C8C48 - .align 2, 0 -_080C8BCC: .4byte gUnknown_02038680 -_080C8BD0: .4byte gUnknown_0203869B -_080C8BD4: .4byte gBlockRecvBuffer -_080C8BD8: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8BEC @ =gUnknown_02038688 - movs r1, 0x8 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8BEC: .4byte gUnknown_02038688 -_080C8BF0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8C0C @ =gUnknown_02038688 - ldr r1, _080C8C10 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8C14 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - b _080C8C48 - .align 2, 0 -_080C8C0C: .4byte gUnknown_02038688 -_080C8C10: .4byte gUnknown_0203869B -_080C8C14: .4byte gBlockRecvBuffer -_080C8C18: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8C2C @ =gContestFinalStandings - movs r1, 0x4 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8C2C: .4byte gContestFinalStandings -_080C8C30: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8C60 @ =gContestFinalStandings - ldr r1, _080C8C64 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8C68 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x4 -_080C8C48: - bl memcpy -_080C8C4C: - ldr r1, _080C8C6C @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080C8C7A - .align 2, 0 -_080C8C60: .4byte gContestFinalStandings -_080C8C64: .4byte gUnknown_0203869B -_080C8C68: .4byte gBlockRecvBuffer -_080C8C6C: .4byte gTasks -_080C8C70: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc -_080C8C7A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C8AD0 - - thumb_func_start sub_80C8C80 -sub_80C8C80: @ 80C8C80 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080C8CA8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - adds r3, r1, 0 - cmp r0, 0xB - bls _080C8C9C - b _080C8E0C -_080C8C9C: - lsls r0, 2 - ldr r1, _080C8CAC @ =_080C8CB0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C8CA8: .4byte gTasks -_080C8CAC: .4byte _080C8CB0 - .align 2, 0 -_080C8CB0: - .4byte _080C8CE0 - .4byte _080C8CFC - .4byte _080C8D24 - .4byte _080C8D46 - .4byte _080C8D60 - .4byte _080C8D24 - .4byte _080C8D88 - .4byte _080C8DA0 - .4byte _080C8D24 - .4byte _080C8DB4 - .4byte _080C8DCC - .4byte _080C8D24 -_080C8CE0: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - bne _080C8CEC - b _080C8E16 -_080C8CEC: - ldr r0, _080C8CF8 @ =gSharedMem + 0x19260 - movs r1, 0x70 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8CF8: .4byte gSharedMem + 0x19260 -_080C8CFC: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - bne _080C8D08 - b _080C8E16 -_080C8D08: - ldr r0, _080C8D18 @ =gSharedMem + 0x19260 - ldr r1, _080C8D1C @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8D20 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x70 - b _080C8DE4 - .align 2, 0 -_080C8D18: .4byte gSharedMem + 0x19260 -_080C8D1C: .4byte gUnknown_0203869B -_080C8D20: .4byte gBlockRecvBuffer -_080C8D24: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r3 - ldrh r0, [r2, 0xA] - adds r1, r0, 0x1 - strh r1, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - ble _080C8E16 - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _080C8E16 -_080C8D46: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8D5C @ =gSharedMem + 0x192D0 - movs r1, 0x14 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8D5C: .4byte gSharedMem + 0x192D0 -_080C8D60: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8D7C @ =gSharedMem + 0x192D0 - ldr r1, _080C8D80 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8D84 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x14 - b _080C8DE4 - .align 2, 0 -_080C8D7C: .4byte gSharedMem + 0x192D0 -_080C8D80: .4byte gUnknown_0203869B -_080C8D84: .4byte gBlockRecvBuffer -_080C8D88: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8D9C @ =gSharedMem + 0x19328 - movs r1, 0x4 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8D9C: .4byte gSharedMem + 0x19328 -_080C8DA0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8DB0 @ =gSharedMem + 0x19328 - b _080C8DD8 - .align 2, 0 -_080C8DB0: .4byte gSharedMem + 0x19328 -_080C8DB4: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8DC8 @ =gUnknown_02038696 - movs r1, 0x4 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8DC8: .4byte gUnknown_02038696 -_080C8DCC: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8DFC @ =gUnknown_02038696 -_080C8DD8: - ldr r1, _080C8E00 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8E04 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x4 -_080C8DE4: - bl memcpy -_080C8DE8: - ldr r1, _080C8E08 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080C8E16 - .align 2, 0 -_080C8DFC: .4byte gUnknown_02038696 -_080C8E00: .4byte gUnknown_0203869B -_080C8E04: .4byte gBlockRecvBuffer -_080C8E08: .4byte gTasks -_080C8E0C: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc -_080C8E16: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C8C80 - - thumb_func_start sub_80C8E1C -sub_80C8E1C: @ 80C8E1C - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080C8E40 @ =gTasks - lsls r4, r5, 2 - adds r0, r4, r5 - lsls r6, r0, 3 - adds r2, r6, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - adds r7, r1, 0 - cmp r0, 0x1 - beq _080C8EB0 - cmp r0, 0x1 - bgt _080C8E44 - cmp r0, 0 - beq _080C8E4C - b _080C8EF8 - .align 2, 0 -_080C8E40: .4byte gTasks -_080C8E44: - cmp r0, 0x2 - beq _080C8EEC - cmp r0, 0x8 - bne _080C8EF8 -_080C8E4C: - ldr r1, _080C8E80 @ =gBlockSendBuffer - movs r0, 0x64 - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C8E9A - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8F06 - ldr r0, _080C8E84 @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r0 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080C8E88 - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080C8F06 - .align 2, 0 -_080C8E80: .4byte gBlockSendBuffer -_080C8E84: .4byte gTasks -_080C8E88: - movs r0, 0 - bl de_sub_80C9274 - movs r0, 0x2 - bl sub_8007E9C - movs r0, 0x1 - strh r0, [r4, 0x8] - b _080C8F06 -_080C8E9A: - movs r0, 0 - bl de_sub_80C9294 - ldr r0, _080C8EAC @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - b _080C8EDE - .align 2, 0 -_080C8EAC: .4byte gTasks -_080C8EB0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8F06 - adds r1, r4, 0 - ldr r4, _080C8EE8 @ =gBlockRecvBuffer - adds r0, r7, 0 - adds r0, 0x12 - adds r2, r6, r0 - movs r6, 0x80 - lsls r6, 1 - movs r3, 0x3 -_080C8ECA: - ldrh r0, [r4] - strh r0, [r2] - adds r4, r6 - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080C8ECA - adds r1, r5 - lsls r1, 3 - adds r1, r7 -_080C8EDE: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C8F06 - .align 2, 0 -_080C8EE8: .4byte gBlockRecvBuffer -_080C8EEC: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C8F06 -_080C8EF8: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r7 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_080C8F06: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8E1C - - thumb_func_start sub_80C8EBC -sub_80C8EBC: @ 80C8EBC - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C8EE4 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8EE8_B - cmp r0, 0x1 - beq _080C8F00 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8F22 - .align 2, 0 -_080C8EE4: .4byte gTasks -_080C8EE8_B: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8F22 - ldr r0, _080C8EFC @ =gUnknown_02038670 - movs r1, 0x8 - bl sub_80C857C - b _080C8F1C - .align 2, 0 -_080C8EFC: .4byte gUnknown_02038670 -_080C8F00: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8F22 - ldr r0, _080C8F28 @ =gUnknown_02038670 - ldr r1, _080C8F2C @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8F30 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - bl memcpy -_080C8F1C: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080C8F22: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C8F28: .4byte gUnknown_02038670 -_080C8F2C: .4byte gUnknown_0203869B -_080C8F30: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8EBC - - thumb_func_start sub_80C8F34 -sub_80C8F34: @ 80C8F34 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C8F5C @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8F60 - cmp r0, 0x1 - beq _080C8F78 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8F9A - .align 2, 0 -_080C8F5C: .4byte gTasks -_080C8F60: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8F9A - ldr r0, _080C8F74 @ =gUnknown_02038696 - movs r1, 0x4 - bl sub_80C857C - b _080C8F94 - .align 2, 0 -_080C8F74: .4byte gUnknown_02038696 -_080C8F78: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8F9A - ldr r0, _080C8FA0 @ =gUnknown_02038696 - ldr r1, _080C8FA4 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8FA8 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x4 - bl memcpy -_080C8F94: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080C8F9A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C8FA0: .4byte gUnknown_02038696 -_080C8FA4: .4byte gUnknown_0203869B -_080C8FA8: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8F34 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 26ed8e3fe..6bd98cc8a 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -2947,6 +2947,7 @@ _080C37DC: .4byte REG_WININ _080C37E0: .4byte 0x00003f3f thumb_func_end sub_80C3764 +.ifdef ENGLISH thumb_func_start sub_80C37E4 sub_80C37E4: @ 80C37E4 push {r4-r6,lr} @@ -3156,6 +3157,276 @@ _080C3984: .4byte 0x0600e000 _080C3988: .4byte gUnknown_08E964B8 _080C398C: .4byte 0x00000fff thumb_func_end sub_80C37E4 +.else + thumb_func_start de_sub_80C39A8 +de_sub_80C39A8: @ 80C39A8 + push {r4,lr} + sub sp, 0x10 + adds r1, r0, 0 + ldr r0, _de_080C39DC @ =gIsLinkContest + ldrb r0, [r0] + movs r4, 0x1 + ands r4, r0 + cmp r4, 0 + beq _de_080C39E8 + ldr r0, _de_080C39E0 @ =0x0600e000 + lsls r1, 16 + lsrs r1, 16 + ldr r3, _de_080C39E4 @ =gUnknown_08E964B8 + movs r2, 0xB + str r2, [sp] + movs r4, 0x3 + str r4, [sp, 0x4] + movs r2, 0x8 + str r2, [sp, 0x8] + str r4, [sp, 0xC] + movs r2, 0 + bl sub_809D104 + movs r0, 0x8 + b _de_080C3A74 + .align 2, 0 +_de_080C39DC: .4byte gIsLinkContest +_de_080C39E0: .4byte 0x0600e000 +_de_080C39E4: .4byte gUnknown_08E964B8 +_de_080C39E8: + ldr r0, _de_080C3A08 @ =gSpecialVar_ContestRank + ldrh r0, [r0] + cmp r0, 0 + bne _de_080C3A14 + ldr r0, _de_080C3A0C @ =0x0600e000 + lsls r1, 16 + lsrs r1, 16 + ldr r3, _de_080C3A10 @ =gUnknown_08E964B8 + str r4, [sp] + str r4, [sp, 0x4] + movs r2, 0xB + str r2, [sp, 0x8] + movs r2, 0x3 + str r2, [sp, 0xC] + b _de_080C3A6C + .align 2, 0 +_de_080C3A08: .4byte gSpecialVar_ContestRank +_de_080C3A0C: .4byte 0x0600e000 +_de_080C3A10: .4byte gUnknown_08E964B8 +_de_080C3A14: + cmp r0, 0x1 + bne _de_080C3A2C + ldr r0, _de_080C3A24 @ =0x0600e000 + lsls r1, 16 + lsrs r1, 16 + ldr r3, _de_080C3A28 @ =gUnknown_08E964B8 + movs r2, 0xB + b _de_080C3A3A + .align 2, 0 +_de_080C3A24: .4byte 0x0600e000 +_de_080C3A28: .4byte gUnknown_08E964B8 +_de_080C3A2C: + cmp r0, 0x2 + bne _de_080C3A58 + ldr r0, _de_080C3A50 @ =0x0600e000 + lsls r1, 16 + lsrs r1, 16 + ldr r3, _de_080C3A54 @ =gUnknown_08E964B8 + movs r2, 0x15 +_de_080C3A3A: + str r2, [sp] + str r4, [sp, 0x4] + movs r2, 0xA + str r2, [sp, 0x8] + movs r2, 0x3 + str r2, [sp, 0xC] + movs r2, 0 + bl sub_809D104 + movs r0, 0xA + b _de_080C3A74 + .align 2, 0 +_de_080C3A50: .4byte 0x0600e000 +_de_080C3A54: .4byte gUnknown_08E964B8 +_de_080C3A58: + ldr r0, _de_080C3A7C @ =0x0600e000 + lsls r1, 16 + lsrs r1, 16 + ldr r3, _de_080C3A80 @ =gUnknown_08E964B8 + str r4, [sp] + movs r4, 0x3 + str r4, [sp, 0x4] + movs r2, 0xB + str r2, [sp, 0x8] + str r4, [sp, 0xC] +_de_080C3A6C: + movs r2, 0 + bl sub_809D104 + movs r0, 0xB +_de_080C3A74: + add sp, 0x10 + pop {r4} + pop {r1} + bx r1 + .align 2, 0 +_de_080C3A7C: .4byte 0x0600e000 +_de_080C3A80: .4byte gUnknown_08E964B8 + thumb_func_end de_sub_80C39A8 + + thumb_func_start de_sub_80C3A84 +de_sub_80C3A84: @ 80C3A84 + push {r4,lr} + sub sp, 0x10 + adds r2, r0, 0 + ldr r0, _de_080C3AAC @ =gSpecialVar_ContestCategory + ldrh r4, [r0] + cmp r4, 0 + bne _de_080C3AB8 + str r4, [r1] + ldr r0, _de_080C3AB0 @ =0x0600e000 + lsls r1, r2, 16 + lsrs r1, 16 + ldr r3, _de_080C3AB4 @ =gUnknown_08E964B8 + movs r2, 0x13 + str r2, [sp] + movs r4, 0x3 + str r4, [sp, 0x4] + movs r2, 0x7 + str r2, [sp, 0x8] + str r4, [sp, 0xC] + b _de_080C3AD6 + .align 2, 0 +_de_080C3AAC: .4byte gSpecialVar_ContestCategory +_de_080C3AB0: .4byte 0x0600e000 +_de_080C3AB4: .4byte gUnknown_08E964B8 +_de_080C3AB8: + cmp r4, 0x1 + bne _de_080C3AE8 + str r4, [r1] + ldr r0, _de_080C3AE0 @ =0x0600e000 + lsls r1, r2, 16 + lsrs r1, 16 + ldr r3, _de_080C3AE4 @ =gUnknown_08E964B8 + movs r2, 0 + str r2, [sp] + movs r2, 0x6 + str r2, [sp, 0x4] + movs r2, 0x7 + str r2, [sp, 0x8] + movs r2, 0x3 + str r2, [sp, 0xC] +_de_080C3AD6: + movs r2, 0 + bl sub_809D104 + movs r0, 0x7 + b _de_080C3B68 + .align 2, 0 +_de_080C3AE0: .4byte 0x0600e000 +_de_080C3AE4: .4byte gUnknown_08E964B8 +_de_080C3AE8: + cmp r4, 0x2 + bne _de_080C3B18 + str r4, [r1] + ldr r0, _de_080C3B10 @ =0x0600e000 + lsls r1, r2, 16 + lsrs r1, 16 + ldr r3, _de_080C3B14 @ =gUnknown_08E964B8 + movs r2, 0x7 + str r2, [sp] + movs r2, 0x6 + str r2, [sp, 0x4] + movs r2, 0x4 + str r2, [sp, 0x8] + movs r2, 0x3 + str r2, [sp, 0xC] + movs r2, 0 + bl sub_809D104 + movs r0, 0x4 + b _de_080C3B68 + .align 2, 0 +_de_080C3B10: .4byte 0x0600e000 +_de_080C3B14: .4byte gUnknown_08E964B8 +_de_080C3B18: + cmp r4, 0x3 + bne _de_080C3B44 + str r4, [r1] + ldr r0, _de_080C3B3C @ =0x0600e000 + lsls r1, r2, 16 + lsrs r1, 16 + ldr r3, _de_080C3B40 @ =gUnknown_08E964B8 + movs r2, 0xB + str r2, [sp] + movs r2, 0x6 + str r2, [sp, 0x4] + str r2, [sp, 0x8] + str r4, [sp, 0xC] + movs r2, 0 + bl sub_809D104 + movs r0, 0x6 + b _de_080C3B68 + .align 2, 0 +_de_080C3B3C: .4byte 0x0600e000 +_de_080C3B40: .4byte gUnknown_08E964B8 +_de_080C3B44: + movs r0, 0x4 + str r0, [r1] + ldr r0, _de_080C3B70 @ =0x0600e000 + lsls r1, r2, 16 + lsrs r1, 16 + ldr r3, _de_080C3B74 @ =gUnknown_08E964B8 + movs r2, 0x11 + str r2, [sp] + movs r2, 0x6 + str r2, [sp, 0x4] + movs r2, 0x5 + str r2, [sp, 0x8] + movs r2, 0x3 + str r2, [sp, 0xC] + movs r2, 0 + bl sub_809D104 + movs r0, 0x5 +_de_080C3B68: + add sp, 0x10 + pop {r4} + pop {r1} + bx r1 + .align 2, 0 +_de_080C3B70: .4byte 0x0600e000 +_de_080C3B74: .4byte gUnknown_08E964B8 + thumb_func_end de_sub_80C3A84 + + thumb_func_start sub_80C37E4 +sub_80C37E4: @ 80C37E4 + push {r4,r5,lr} + sub sp, 0x4 + movs r0, 0x6 + bl de_sub_80C39A8 + lsls r0, 16 + asrs r0, 16 + adds r0, 0x6 + mov r1, sp + bl de_sub_80C3A84 + ldr r5, _080C3824 @ =0x00000fff + ldr r0, [sp] + lsls r4, r0, 12 + ldr r2, _080C3828 @ =0x0600e000 + movs r3, 0x7F +_080C3804: + ldrh r1, [r2] + adds r0, r5, 0 + ands r0, r1 + strh r0, [r2] + ldrh r1, [r2] + adds r0, r4, 0 + orrs r0, r1 + strh r0, [r2] + adds r2, 0x2 + subs r3, 0x1 + cmp r3, 0 + bge _080C3804 + add sp, 0x4 + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_080C3824: .4byte 0x00000fff +_080C3828: .4byte 0x0600e000 + thumb_func_end sub_80C37E4 +.endif thumb_func_start sub_80C3990 sub_80C3990: @ 80C3990 diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 0ff6823b5..13d01d5a9 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -82,6 +82,7 @@ _080C85FE: bx r1 thumb_func_end sub_80C85D8 +.ifdef ENGLISH thumb_func_start sub_80C8604 sub_80C8604: @ 80C8604 push {r4-r6,lr} @@ -116,6 +117,26 @@ _080C8638: .4byte gTasks _080C863C: .4byte sub_80C8644 _080C8640: .4byte gBlockRecvBuffer thumb_func_end sub_80C8604 +.else + thumb_func_start sub_80C8604 +sub_80C8604: @ 80C8604 + lsls r0, 24 + lsrs r0, 24 + ldr r2, _080C861C @ =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + movs r0, 0 + strh r0, [r1, 0x8] + ldr r0, _080C8620 @ =sub_80C8644 + str r0, [r1] + bx lr + .align 2, 0 +_080C861C: .4byte gTasks +_080C8620: .4byte sub_80C8644 + thumb_func_end sub_80C8604 +.endif thumb_func_start sub_80C8644 sub_80C8644: @ 80C8644 @@ -170,14 +191,22 @@ _080C869C: .4byte gIsLinkContest sub_80C86A0: @ 80C86A0 push {r4,r5,lr} adds r4, r0, 0 +.ifdef ENGLISH movs r5, 0x2 +.else + movs r5, 0x5 +.endif ldrb r0, [r4] cmp r0, 0xFC bne _080C86B6 ldrb r0, [r4, 0x1] cmp r0, 0x15 bne _080C86B6 +.ifdef ENGLISH movs r0, 0x2 +.else + movs r0, 0x5 +.endif b _080C872C _080C86B6: adds r0, r4, 0 @@ -248,6 +277,7 @@ _080C872C: bx r1 thumb_func_end sub_80C86A0 +.ifdef ENGLISH thumb_func_start sub_80C8734 sub_80C8734: @ 80C8734 push {r4-r7,lr} @@ -429,6 +459,232 @@ _080C8896: .align 2, 0 _080C88A8: .4byte gTasks thumb_func_end sub_80C8734 +.else + thumb_func_start sub_80C8734 +sub_80C8734: @ 80C8734 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x4 + lsls r0, 24 + lsrs r5, r0, 24 + ldr r1, _080C8760 @ =gTasks + lsls r4, r5, 2 + adds r0, r4, r5 + lsls r0, 3 + adds r2, r0, r1 + movs r3, 0x8 + ldrsh r0, [r2, r3] + cmp r0, 0x1 + beq _080C8800 + cmp r0, 0x1 + bgt _080C8764 + cmp r0, 0 + beq _080C8770 + b _080C88E0 + .align 2, 0 +_080C8760: .4byte gTasks +_080C8764: + cmp r0, 0x2 + bne _080C876A + b _080C88D4_B +_080C876A: + cmp r0, 0x8 + beq _080C8770 + b _080C88E0 +_080C8770: + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + bne _080C87D4 + bl sub_8007ECC + lsls r0, 24 + cmp r0, 0 + bne _080C8786 + b _080C88EE +_080C8786: + ldr r0, _080C87A0 @ =gTasks + lsls r1, r5, 2 + adds r1, r5 + lsls r1, 3 + adds r4, r1, r0 + movs r1, 0x8 + ldrsh r0, [r4, r1] + cmp r0, 0 + bne _080C87A4 + movs r0, 0x3 + strh r0, [r4, 0x8] + b _080C88EE + .align 2, 0 +_080C87A0: .4byte gTasks +_080C87A4: + ldr r0, _080C87C8 @ =gBlockSendBuffer + ldr r1, _080C87CC @ =gContestPlayerMonIndex + ldrb r1, [r1] + lsls r1, 6 + ldr r2, _080C87D0 @ =gContestMons + adds r1, r2 + movs r2, 0x40 + bl memcpy + movs r0, 0 + bl de_sub_80C9274 + movs r0, 0x2 + bl sub_8007E9C + movs r0, 0x1 + strh r0, [r4, 0x8] + b _080C88EE + .align 2, 0 +_080C87C8: .4byte gBlockSendBuffer +_080C87CC: .4byte gContestPlayerMonIndex +_080C87D0: .4byte gContestMons +_080C87D4: + ldr r0, _080C87F0 @ =gBlockSendBuffer + ldr r1, _080C87F4 @ =gContestPlayerMonIndex + ldrb r1, [r1] + lsls r1, 6 + ldr r2, _080C87F8 @ =gContestMons + adds r1, r2 + movs r2, 0x40 + bl memcpy + movs r0, 0 + bl de_sub_80C9294 + ldr r1, _080C87FC @ =gTasks + b _080C88E0 + .align 2, 0 +_080C87F0: .4byte gBlockSendBuffer +_080C87F4: .4byte gContestPlayerMonIndex +_080C87F8: .4byte gContestMons +_080C87FC: .4byte gTasks +_080C8800: + bl sub_80C85D8 + lsls r0, 24 + cmp r0, 0 + beq _080C88EE + movs r2, 0 + mov r8, r2 + str r4, [sp] + ldr r0, _080C884C @ =gContestMons + ldr r7, _080C8850 @ =gLinkPlayers + movs r6, 0 + mov r10, r0 + movs r3, 0xFF + mov r9, r3 +_080C881C: + mov r0, r8 + lsls r1, r0, 8 + ldr r0, _080C8854 @ =gBlockRecvBuffer + adds r1, r0 + mov r0, r10 + movs r2, 0x40 + bl memcpy + ldr r1, _080C8858 @ =gContestMons + 0x2 + adds r4, r6, r1 + ldrh r0, [r7, 0x1A] + cmp r0, 0x1 + bne _080C885C + adds r0, r4, 0 + bl sub_80C86A0 + adds r1, r0, 0 + lsls r1, 24 + lsrs r1, 24 + adds r0, r4, 0 + bl ConvertInternationalString + b _080C8872 + .align 2, 0 +_080C884C: .4byte gContestMons +_080C8850: .4byte gLinkPlayers +_080C8854: .4byte gBlockRecvBuffer +_080C8858: .4byte gContestMons + 0x2 +_080C885C: + ldrb r0, [r4, 0xA] + cmp r0, 0xFC + bne _080C886C + adds r0, r4, 0 + movs r1, 0x1 + bl ConvertInternationalString + b _080C8872 +_080C886C: + strb r0, [r4, 0x5] + mov r2, r9 + strb r2, [r4, 0xA] +_080C8872: + ldr r0, _080C88A0 @ =gUnknown_0203857D + adds r4, r6, r0 + ldrh r0, [r7, 0x1A] + cmp r0, 0x1 + bne _080C88A4 + mov r3, r9 + strb r3, [r4, 0x7] + ldrb r0, [r4, 0x4] + strb r0, [r4, 0x6] + ldrb r0, [r4, 0x3] + strb r0, [r4, 0x5] + ldrb r0, [r4, 0x2] + strb r0, [r4, 0x4] + ldrb r0, [r4, 0x1] + strb r0, [r4, 0x3] + ldrb r0, [r4] + strb r0, [r4, 0x2] + movs r0, 0x15 + strb r0, [r4, 0x1] + movs r0, 0xFC + strb r0, [r4] + b _080C88AC + .align 2, 0 +_080C88A0: .4byte gUnknown_0203857D +_080C88A4: + ldrb r0, [r4, 0x7] + strb r0, [r4, 0x5] + mov r0, r9 + strb r0, [r4, 0x7] +_080C88AC: + adds r7, 0x1C + adds r6, 0x40 + movs r1, 0x40 + add r10, r1 + movs r2, 0x1 + add r8, r2 + mov r3, r8 + cmp r3, 0x3 + ble _080C881C + ldr r0, _080C88D0 @ =gTasks + ldr r2, [sp] + adds r1, r2, r5 + lsls r1, 3 + adds r1, r0 + ldrh r0, [r1, 0x8] + adds r0, 0x1 + strh r0, [r1, 0x8] + b _080C88EE + .align 2, 0 +_080C88D0: .4byte gTasks +_080C88D4_B: + movs r0, 0 + strh r0, [r2, 0x8] + adds r0, r5, 0 + bl SwitchTaskToFollowupFunc + b _080C88EE +_080C88E0: + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + adds r0, r1 + ldrh r1, [r0, 0x8] + adds r1, 0x1 + strh r1, [r0, 0x8] +_080C88EE: + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_80C8734 +.endif thumb_func_start sub_80C88AC sub_80C88AC: @ 80C88AC @@ -497,6 +753,7 @@ _080C8930: .4byte gBlockRecvBuffer _080C8934: .4byte gUnknown_03005D28 thumb_func_end sub_80C88AC +.ifdef ENGLISH thumb_func_start sub_80C8938 sub_80C8938: @ 80C8938 push {r4-r7,lr} @@ -582,6 +839,129 @@ _080C89CE: .align 2, 0 _080C89D8: .4byte gBlockRecvBuffer thumb_func_end sub_80C8938 +.else + thumb_func_start sub_80C8938 +sub_80C8938: @ 80C8938 + push {r4-r7,lr} + mov r7, r8 + push {r7} + lsls r0, 24 + lsrs r4, r0, 24 + ldr r1, _080C8960 @ =gTasks + lsls r5, r4, 2 + adds r0, r5, r4 + lsls r6, r0, 3 + adds r2, r6, r1 + movs r3, 0x8 + ldrsh r0, [r2, r3] + mov r8, r1 + cmp r0, 0x1 + beq _080C89C4 + cmp r0, 0x1 + bgt _080C8964 + cmp r0, 0 + beq _080C896C + b _080C8A0C + .align 2, 0 +_080C8960: .4byte gTasks +_080C8964: + cmp r0, 0x2 + beq _080C8A00 + cmp r0, 0x8 + bne _080C8A0C +_080C896C: + ldr r1, _080C89A0 @ =gBlockSendBuffer + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + mov r2, r8 + adds r4, r0, r2 + ldrh r0, [r4, 0x1A] + strb r0, [r1] + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + bne _080C89B6 + bl sub_8007ECC + lsls r0, 24 + cmp r0, 0 + beq _080C8A1A + movs r3, 0x8 + ldrsh r0, [r4, r3] + cmp r0, 0 + bne _080C89A4 + movs r0, 0x3 + strh r0, [r4, 0x8] + b _080C8A1A + .align 2, 0 +_080C89A0: .4byte gBlockSendBuffer +_080C89A4: + movs r0, 0x1 + bl de_sub_80C9274 + movs r0, 0x2 + bl sub_8007E9C + movs r0, 0x1 + strh r0, [r4, 0x8] + b _080C8A1A +_080C89B6: + movs r0, 0x1 + bl de_sub_80C9294 + ldrh r0, [r4, 0x8] + adds r0, 0x1 + strh r0, [r4, 0x8] + b _080C8A1A +_080C89C4: + bl sub_80C85D8 + lsls r0, 24 + cmp r0, 0 + beq _080C8A1A + movs r3, 0 + adds r7, r5, 0 + ldr r1, _080C89FC @ =gBlockRecvBuffer + mov r0, r8 + adds r0, 0xA + adds r2, r6, r0 + movs r5, 0x80 + lsls r5, 1 +_080C89DE: + ldrh r0, [r1] + strh r0, [r2] + adds r1, r5 + adds r2, 0x2 + adds r3, 0x1 + cmp r3, 0x3 + ble _080C89DE + adds r1, r7, r4 + lsls r1, 3 + add r1, r8 + ldrh r0, [r1, 0x8] + adds r0, 0x1 + strh r0, [r1, 0x8] + b _080C8A1A + .align 2, 0 +_080C89FC: .4byte gBlockRecvBuffer +_080C8A00: + movs r0, 0 + strh r0, [r2, 0x8] + adds r0, r4, 0 + bl SwitchTaskToFollowupFunc + b _080C8A1A +_080C8A0C: + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + add r0, r8 + ldrh r1, [r0, 0x8] + adds r1, 0x1 + strh r1, [r0, 0x8] +_080C8A1A: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_80C8938 +.endif thumb_func_start sub_80C89DC sub_80C89DC: @ 80C89DC @@ -1096,6 +1476,7 @@ _080C8E16: bx r0 thumb_func_end sub_80C8C80 +.ifdef ENGLISH thumb_func_start sub_80C8E1C sub_80C8E1C: @ 80C8E1C push {r4-r7,lr} @@ -1179,6 +1560,131 @@ _080C8EAE: .align 2, 0 _080C8EB8: .4byte gBlockRecvBuffer thumb_func_end sub_80C8E1C +.else + thumb_func_start sub_80C8E1C +sub_80C8E1C: @ 80C8E1C + push {r4-r7,lr} + lsls r0, 24 + lsrs r5, r0, 24 + ldr r1, _080C8E40 @ =gTasks + lsls r4, r5, 2 + adds r0, r4, r5 + lsls r6, r0, 3 + adds r2, r6, r1 + movs r3, 0x8 + ldrsh r0, [r2, r3] + adds r7, r1, 0 + cmp r0, 0x1 + beq _080C8EB0 + cmp r0, 0x1 + bgt _080C8E44 + cmp r0, 0 + beq _080C8E4C + b _080C8EF8 + .align 2, 0 +_080C8E40: .4byte gTasks +_080C8E44: + cmp r0, 0x2 + beq _080C8EEC + cmp r0, 0x8 + bne _080C8EF8 +_080C8E4C: + ldr r1, _080C8E80 @ =gBlockSendBuffer + movs r0, 0x64 + strb r0, [r1] + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + bne _080C8E9A + bl sub_8007ECC + lsls r0, 24 + cmp r0, 0 + beq _080C8F06 + ldr r0, _080C8E84 @ =gTasks + lsls r1, r5, 2 + adds r1, r5 + lsls r1, 3 + adds r4, r1, r0 + movs r1, 0x8 + ldrsh r0, [r4, r1] + cmp r0, 0 + bne _080C8E88 + movs r0, 0x3 + strh r0, [r4, 0x8] + b _080C8F06 + .align 2, 0 +_080C8E80: .4byte gBlockSendBuffer +_080C8E84: .4byte gTasks +_080C8E88: + movs r0, 0 + bl de_sub_80C9274 + movs r0, 0x2 + bl sub_8007E9C + movs r0, 0x1 + strh r0, [r4, 0x8] + b _080C8F06 +_080C8E9A: + movs r0, 0 + bl de_sub_80C9294 + ldr r0, _080C8EAC @ =gTasks + lsls r1, r5, 2 + adds r1, r5 + lsls r1, 3 + adds r1, r0 + b _080C8EDE + .align 2, 0 +_080C8EAC: .4byte gTasks +_080C8EB0: + bl sub_80C85D8 + lsls r0, 24 + cmp r0, 0 + beq _080C8F06 + adds r1, r4, 0 + ldr r4, _080C8EE8 @ =gBlockRecvBuffer + adds r0, r7, 0 + adds r0, 0x12 + adds r2, r6, r0 + movs r6, 0x80 + lsls r6, 1 + movs r3, 0x3 +_080C8ECA: + ldrh r0, [r4] + strh r0, [r2] + adds r4, r6 + adds r2, 0x2 + subs r3, 0x1 + cmp r3, 0 + bge _080C8ECA + adds r1, r5 + lsls r1, 3 + adds r1, r7 +_080C8EDE: + ldrh r0, [r1, 0x8] + adds r0, 0x1 + strh r0, [r1, 0x8] + b _080C8F06 + .align 2, 0 +_080C8EE8: .4byte gBlockRecvBuffer +_080C8EEC: + movs r0, 0 + strh r0, [r2, 0x8] + adds r0, r5, 0 + bl SwitchTaskToFollowupFunc + b _080C8F06 +_080C8EF8: + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + adds r0, r7 + ldrh r1, [r0, 0x8] + adds r1, 0x1 + strh r1, [r0, 0x8] +_080C8F06: + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_80C8E1C +.endif thumb_func_start sub_80C8EBC sub_80C8EBC: @ 80C8EBC @@ -1193,7 +1699,7 @@ sub_80C8EBC: @ 80C8EBC movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq _080C8EE8 + beq _080C8EE8_B cmp r0, 0x1 beq _080C8F00 movs r0, 0 @@ -1203,7 +1709,7 @@ sub_80C8EBC: @ 80C8EBC b _080C8F22 .align 2, 0 _080C8EE4: .4byte gTasks -_080C8EE8: +_080C8EE8_B: bl sub_8007ECC lsls r0, 24 cmp r0, 0 -- cgit v1.2.3 From 842ffa33b3964d43a896be4f9248c33200b7137a Mon Sep 17 00:00:00 2001 From: M Date: Sat, 6 Jan 2018 14:55:38 +0100 Subject: fix indents and build, remove diff.sh --- diff.sh | 7 ------- include/roulette.h | 3 --- ld_script.txt | 4 ++-- src/roulette.c | 16 +++------------- 4 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 diff.sh diff --git a/diff.sh b/diff.sh deleted file mode 100644 index a4b465b6e..000000000 --- a/diff.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" -OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" -$OBJDUMP $OPTIONS baserom.gba > baserom.dump -$OBJDUMP $OPTIONS pokeruby.gba > pokeruby.dump -diff baserom.dump pokeruby.dump diff --git a/include/roulette.h b/include/roulette.h index 9cf0ba1d2..7d114a073 100644 --- a/include/roulette.h +++ b/include/roulette.h @@ -33,9 +33,6 @@ struct UnkStruct0 s16 sub_81174C4(s16, s16); s16 sub_81174E0(s16); - void PlayRoulette(void); - - #endif diff --git a/ld_script.txt b/ld_script.txt index e194a8dfb..d2586f3c3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -336,7 +336,7 @@ SECTIONS { src/battle/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/scene/evolution_scene.o(.text); - src/roulette.o(.text); + src/roulette.o(.text); asm/roulette.o(.text); asm/pokedex_cry_screen.o(.text); src/pokemon/pokedex_cry_screen.o(.text); @@ -349,7 +349,7 @@ SECTIONS { src/battle/battle_message.o(.text); src/field/choose_party.o(.text); asm/cable_car.o(.text); - src/roulette_util.o(.text); + src/roulette_util.o(.text); asm/roulette_util.o(.text); asm/cable_car_util.o(.text); src/unused_8124F94.o(.text); diff --git a/src/roulette.c b/src/roulette.c index 36c15bf23..1d612d071 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1,8 +1,7 @@ #include "global.h" - #include "ewram.h" #include "field_fadetransition.h" -#include "game_stat.h" +#include "constants/game_stat.h" #include "m4a.h" #include "main.h" #include "menu.h" @@ -11,14 +10,13 @@ #include "overworld.h" #include "palette.h" #include "pokemon.h" -#include "rng.h" #include "roulette.h" #include "roulette_util.h" #include "rtc.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "strings2.h" #include "string_util.h" @@ -29,14 +27,6 @@ asm(".include \"constants/gba_constants.inc\""); -struct OamMatrix -{ - s16 a; - s16 b; - s16 c; - s16 d; -}; - struct Roulette /* ewram + 0x19000 */ { u8 var00; -- cgit v1.2.3 From 95d687493b0b78d9cbee17a009a326e6879d67c8 Mon Sep 17 00:00:00 2001 From: M Date: Sat, 6 Jan 2018 16:24:56 +0100 Subject: match sub_8124DDC and sub_8124E2C --- src/roulette_util.c | 150 ++++++++-------------------------------------------- 1 file changed, 22 insertions(+), 128 deletions(-) diff --git a/src/roulette_util.c b/src/roulette_util.c index 53585714e..3d5b03a5c 100644 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -244,143 +244,37 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1) r0->var02 = r0->var02 & ~r1; } } -#ifdef NONMATCHING -void sub_8124DDC(u16 *r0, u16 r1, u8 r2, u8 r3, u8 r4, u8 r5) +void sub_8124DDC(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height) { - u16 *rg0; - u8 c; - u8 i = 0; - u32 offset= r3 * 0x20 + r2; - rg0 = &r0[offset]; - for (i = 0; i < r5; i++) + + u16 *_dest; + u8 i; + u8 j; + i = 0x0; + dest = &dest[top * 32 + left]; + for (; i < height; i++) { - rg0 = &rg0[i * 0x20 ]; - c = 0; - for (c = 0; c < r4; c++) + _dest = dest + i * 32; + for (j = 0; j < width; j++) { - *rg0++ = r1; + *_dest++ = src; } } } -#else -__attribute__((naked)) -void sub_8124DDC(u16 *r0, u16 r1, u8 r2, u8 r3, u8 r4, u8 r5) +void sub_8124E2C(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - adds r6, r0, 0\n\ - ldr r0, [sp, 0x14]\n\ - ldr r4, [sp, 0x18]\n\ - lsls r1, 16\n\ - lsrs r7, r1, 16\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - lsls r3, 24\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - movs r1, 0\n\ - lsrs r3, 19\n\ - adds r3, r2\n\ - lsls r3, 1\n\ - adds r6, r3\n\ - cmp r1, r4\n\ - bcs _08124E26\n\ -_08124E04:\n\ - lsls r0, r1, 6\n\ - adds r2, r6, r0\n\ - movs r0, 0\n\ - adds r3, r1, 0x1\n\ - cmp r0, r5\n\ - bcs _08124E1E\n\ -_08124E10:\n\ - strh r7, [r2]\n\ - adds r2, 0x2\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, r5\n\ - bcc _08124E10\n\ -_08124E1E:\n\ - lsls r0, r3, 24\n\ - lsrs r1, r0, 24\n\ - cmp r1, r4\n\ - bcc _08124E04\n\ -_08124E26:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif -#ifdef NONMATCHING -void sub_8124E2C(u16 *r0, u16 *r1, u8 r2, u8 r3, u8 r4, u8 r5) -{ - u16 *rg0; - u8 c; - u8 i = 0; - u32 offset= r3 * 0x20 + r2; - //rg0 = &r0[offset]; - for (i = 0; i < r5; i++) + u16 *_dest; + u16 *_src = src; + u8 i; + u8 j; + i = 0x0; + dest = &dest[top * 32 + left]; + for (; i < height; i++) { - rg0 = &r0[offset + i * 0x20 ]; - c = 0; - for (c = 0; c < r4; c++) + _dest = dest + i * 32; + for (j = 0; j < width; j++) { - *(rg0++) = *(r1++); + *_dest++ = *_src++; } } } -#else -__attribute__((naked)) -void sub_8124E2C(u16 *r0, u16 *r1, u8 r2, u8 r3, u8 r4, u8 r5) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - adds r7, r0, 0\n\ - ldr r0, [sp, 0x14]\n\ - ldr r4, [sp, 0x18]\n\ - lsls r2, 24\n\ - lsrs r2, 24\n\ - lsls r3, 24\n\ - lsls r0, 24\n\ - lsrs r5, r0, 24\n\ - lsls r4, 24\n\ - lsrs r6, r4, 24\n\ - movs r4, 0\n\ - lsrs r3, 19\n\ - adds r3, r2\n\ - lsls r3, 1\n\ - adds r7, r3\n\ - cmp r4, r6\n\ - bcs _08124E76\n\ - _08124E50:\n\ - lsls r0, r4, 6\n\ - adds r2, r7, r0\n\ - movs r3, 0\n\ - adds r4, 0x1\n\ - cmp r3, r5\n\ - bcs _08124E6E\n\ - _08124E5C:\n\ - ldrh r0, [r1]\n\ - strh r0, [r2]\n\ - adds r1, 0x2\n\ - adds r2, 0x2\n\ - adds r0, r3, 0x1\n\ - lsls r0, 24\n\ - lsrs r3, r0, 24\n\ - cmp r3, r5\n\ - bcc _08124E5C\n\ - _08124E6E:\n\ - lsls r0, r4, 24\n\ - lsrs r4, r0, 24\n\ - cmp r4, r6\n\ - bcc _08124E50\n\ - _08124E76:\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif -- cgit v1.2.3 From e4a84faabf3f4e2f005e55a88babce7e8ae49c58 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 10:49:52 -0500 Subject: through unref_sub_8095C60 --- asm/pokemon_storage_system.s | 241 ----------------------------------- include/decoration.h | 5 - include/pokemon.h | 8 +- ld_script.txt | 3 +- src/field/choose_party.c | 3 +- src/field/field_effect.c | 1 + src/pokemon/pokemon_storage_system.c | 88 +++++++++++++ 7 files changed, 97 insertions(+), 252 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 69c6d9e4f..211481692 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,247 +5,6 @@ .text - thumb_func_start sub_8095ADC -sub_8095ADC: @ 8095ADC - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - movs r4, 0 - movs r5, 0 - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r6, r0, 5 -_08095AF0: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 4 - ldr r1, _08095B20 @ =gPokemonStorage + 0x4 - adds r0, r1 - adds r0, r6, r0 - movs r1, 0xB - bl GetBoxMonData - cmp r0, 0 - beq _08095B0C - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08095B0C: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1D - bls _08095AF0 - lsls r0, r5, 24 - lsrs r0, 24 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08095B20: .4byte gPokemonStorage + 0x4 - thumb_func_end sub_8095ADC - - thumb_func_start sub_8095B24 -sub_8095B24: @ 8095B24 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - movs r4, 0 - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r5, r0, 5 -_08095B36: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 4 - ldr r1, _08095B54 @ =gPokemonStorage + 0x4 - adds r0, r1 - adds r0, r5, r0 - movs r1, 0xB - bl GetBoxMonData - cmp r0, 0 - bne _08095B58 - lsls r0, r4, 16 - asrs r0, 16 - b _08095B66 - .align 2, 0 -_08095B54: .4byte gPokemonStorage + 0x4 -_08095B58: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1D - bls _08095B36 - movs r0, 0x1 - negs r0, r0 -_08095B66: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8095B24 - - thumb_func_start GetNumValidDaycarePartyMons -GetNumValidDaycarePartyMons: @ 8095B6C - push {r4-r6,lr} - movs r5, 0 - movs r6, 0 -_08095B72: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, _08095BB0 @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - cmp r0, 0 - beq _08095B9A - adds r0, r4, 0 - movs r1, 0x2D - bl GetMonData - cmp r0, 0 - bne _08095B9A - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_08095B9A: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x5 - bls _08095B72 - lsls r0, r6, 24 - lsrs r0, 24 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08095BB0: .4byte gPlayerParty - thumb_func_end GetNumValidDaycarePartyMons - - thumb_func_start CountAlivePartyMonsExceptOne -CountAlivePartyMonsExceptOne: @ 8095BB4 - push {r4-r7,lr} - lsls r0, 24 - movs r5, 0 - movs r6, 0 - lsrs r7, r0, 24 -_08095BBE: - cmp r5, r7 - beq _08095BF6 - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, _08095C0C @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - cmp r0, 0 - beq _08095BF6 - adds r0, r4, 0 - movs r1, 0x2D - bl GetMonData - cmp r0, 0 - bne _08095BF6 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _08095BF6 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_08095BF6: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x5 - bls _08095BBE - lsls r0, r6, 24 - lsrs r0, 24 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08095C0C: .4byte gPlayerParty - thumb_func_end CountAlivePartyMonsExceptOne - - thumb_func_start CountAlivePartyMonsExceptSelectedOne -CountAlivePartyMonsExceptSelectedOne: @ 8095C10 - push {lr} - ldr r0, _08095C24 @ =gSpecialVar_0x8004 - ldrb r0, [r0] - bl CountAlivePartyMonsExceptOne - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_08095C24: .4byte gSpecialVar_0x8004 - thumb_func_end CountAlivePartyMonsExceptSelectedOne - - thumb_func_start StorageSystemGetPartySize -StorageSystemGetPartySize: @ 8095C28 - push {r4,r5,lr} - movs r4, 0 - movs r5, 0 -_08095C2E: - movs r0, 0x64 - muls r0, r4 - ldr r1, _08095C5C @ =gPlayerParty - adds r0, r1 - movs r1, 0xB - bl GetMonData - cmp r0, 0 - beq _08095C46 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08095C46: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x5 - bls _08095C2E - lsls r0, r5, 24 - lsrs r0, 24 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08095C5C: .4byte gPlayerParty - thumb_func_end StorageSystemGetPartySize - - thumb_func_start unref_sub_8095C60 -unref_sub_8095C60: @ 8095C60 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r4, r2, 16 - lsrs r4, 16 - bl StringCopy - adds r1, r0, 0 - adds r5, r4 - cmp r1, r5 - bcs _08095C7E - movs r0, 0 -_08095C76: - strb r0, [r1] - adds r1, 0x1 - cmp r1, r5 - bcc _08095C76 -_08095C7E: - movs r0, 0xFF - strb r0, [r1] - adds r0, r1, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end unref_sub_8095C60 - thumb_func_start sub_8095C8C sub_8095C8C: @ 8095C8C push {r4-r7,lr} diff --git a/include/decoration.h b/include/decoration.h index 972e82faf..3d619a598 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -127,10 +127,6 @@ extern u8 gUnknown_020388F5; extern u8 gUnknown_020388F6; extern u8 gUnknown_020388D6[16]; extern u8 gUnknown_020388E6[12]; -extern u16 gSpecialVar_0x8004; -extern u16 gSpecialVar_0x8005; -extern u16 gSpecialVar_0x8006; -extern u16 gSpecialVar_0x8007; extern u16 gUnknown_020391A4; extern u16 gUnknown_020391A6; extern u8 gUnknown_020391A8; @@ -161,7 +157,6 @@ extern const struct YesNoFuncTable gUnknown_083ECAA0; extern u8 sub_8134194(u8); // src/decoration_inventory extern bool8 sub_81341D4(void); // src/decoration_inventory extern void sub_8134104(u8); // src/decoration_inventory -extern bool8 sub_807D770(void); extern void sub_8109DAC(u8); // src/trader extern void ReshowPlayerPC(u8); // src/player_pc void Task_SecretBasePC_Decoration(u8); diff --git a/include/pokemon.h b/include/pokemon.h index a1c30f1f3..89599d994 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -418,10 +418,10 @@ struct BattleMove struct PokemonStorage { - /*0x00*/ u8 currentBox; - /*0x01*/ struct BoxPokemon boxes[14][30]; - u8 boxNames[14][9]; - u8 unkArray[14]; + /*0x0000*/ u8 currentBox; + /*0x0004*/ struct BoxPokemon boxes[14][30]; + /*0x8344*/ u8 boxNames[14][9]; + /*0x83c2*/ u8 unkArray[14]; }; struct SpindaSpot diff --git a/ld_script.txt b/ld_script.txt index 5bfc8b171..d0256f397 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -128,8 +128,9 @@ SECTIONS { src/engine/save_menu_util.o(.text); src/battle/battle_party_menu.o(.text); asm/unk_text_8095904.o(.text); - asm/pokemon_storage_system.o(.text); src/pokemon/pokemon_storage_system.o(.text); + asm/pokemon_storage_system.o(.text); + src/pokemon/pokemon_storage_system.o(.text.8098898); asm/pokemon_storage_system.o(.text_8098A38); src/pokemon/pokemon_icon.o(.text); src/pokemon/pokemon_summary_screen.o(.text); diff --git a/src/field/choose_party.c b/src/field/choose_party.c index d278eda4a..52763b911 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -1,5 +1,5 @@ #include "global.h" -#include "decoration.h" +#include "event_data.h" #include "field_fadetransition.h" #include "main.h" #include "menu.h" @@ -7,6 +7,7 @@ #include "palette.h" #include "party_menu.h" #include "pokemon_menu.h" +#include "field_weather.h" #include "pokemon.h" #include "pokemon_summary_screen.h" #include "overworld.h" diff --git a/src/field/field_effect.c b/src/field/field_effect.c index 1e2aaa4ed..1fe238901 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -25,6 +25,7 @@ #include "field_map_obj.h" #include "util.h" #include "field_effect_helpers.h" +#include "pokemon_storage_system.h" #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 4a68b846a..2ea7161cf 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -2,6 +2,7 @@ #include "pokemon_storage_system.h" #include "menu.h" #include "string_util.h" +#include "event_data.h" #include "ewram.h" struct StorageAction { @@ -13,6 +14,93 @@ extern const struct StorageAction gUnknown_083B6DF4[]; EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; +u8 sub_8095ADC(u8 boxId) +{ + u16 i; + u16 count; + + for (i = 0, count = 0; i < 30; i++) + { + if (GetBoxMonData(gPokemonStorage.boxes[boxId] + i, MON_DATA_SPECIES) != 0) + count++; + } + return count; +} + +s16 sub_8095B24(u8 boxId) +{ + u16 i; + + for (i = 0; i < 30; i++) + { + if (GetBoxMonData(gPokemonStorage.boxes[boxId] + i, MON_DATA_SPECIES) == 0) + return i; + } + return -1; +} + +u8 GetNumValidDaycarePartyMons(void) +{ + u16 i; + u16 count; + + for (i = 0, count = 0; i < PARTY_SIZE; i++) + { + struct Pokemon *pokemon = gPlayerParty + i; + if (GetMonData(pokemon, MON_DATA_SPECIES) != 0 && !GetMonData(pokemon, MON_DATA_IS_EGG)) + count++; + } + return count; +} + +u8 CountAlivePartyMonsExceptOne(u8 toSkip) +{ + u16 i; + u16 count; + + for (i = 0, count = 0; i < PARTY_SIZE; i++) + { + if (i != toSkip) + { + struct Pokemon *pokemon = gPlayerParty + i; + if (GetMonData(pokemon, MON_DATA_SPECIES) != 0 && !GetMonData(pokemon, MON_DATA_IS_EGG) && GetMonData(pokemon, MON_DATA_HP) != 0) + count++; + } + } + return count; +} + +u8 CountAlivePartyMonsExceptSelectedOne(void) +{ + return CountAlivePartyMonsExceptOne(gSpecialVar_0x8004); +} + +u8 StorageSystemGetPartySize(void) +{ + u16 i; + u16 count; + + for (i = 0, count = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(gPlayerParty + i, MON_DATA_SPECIES) != 0) + count++; + } + return count; +} + +u8 *unref_sub_8095C60(u8 *dest, const u8 *src, u16 pad) +{ + u8 *_dest = StringCopy(dest, src); + while (_dest < dest + pad) + { + *_dest++ = CHAR_SPACE; + } + *_dest = EOS; + return _dest; +} + +asm(".section .text.8098898"); + void sub_8098898(u8 index) { u8 *ptr; -- cgit v1.2.3 From 6ce6e18fd50951ec784f5534f0bcb929aadd24d6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 11:05:39 -0500 Subject: sub_8095C8C --- asm/pokemon_storage_system.s | 67 ------------------------------------ src/pokemon/pokemon_storage_system.c | 15 ++++++++ 2 files changed, 15 insertions(+), 67 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 211481692..91f4911ce 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,73 +5,6 @@ .text - thumb_func_start sub_8095C8C -sub_8095C8C: @ 8095C8C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r6, r0, 0 - adds r7, r3, 0 - ldr r5, [sp, 0x1C] - ldr r4, [sp, 0x20] - ldr r0, [sp, 0x24] - mov r9, r0 - ldr r0, [sp, 0x28] - ldr r3, [sp, 0x2C] - lsls r1, 16 - lsrs r1, 16 - lsls r2, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r4, 16 - lsrs r4, 16 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - lsls r3, 16 - lsrs r3, 16 - mov r0, r9 - lsls r0, 17 - mov r9, r0 - lsrs r2, 11 - adds r2, r1 - lsls r2, 1 - adds r6, r2 - adds r0, r4, 0 - muls r0, r3 - adds r0, r5 - lsls r0, 1 - adds r7, r0 - movs r4, 0 - cmp r4, r8 - bcs _08095CFC - mov r0, r9 - lsrs r0, 1 - mov r9, r0 - lsls r5, r3, 1 -_08095CE2: - adds r0, r7, 0 - adds r1, r6, 0 - mov r3, r9 - lsrs r2, r3, 16 - bl CpuSet - adds r6, 0x40 - adds r7, r5 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, r8 - bcc _08095CE2 -_08095CFC: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8095C8C - thumb_func_start unref_sub_8095D08 unref_sub_8095D08: @ 8095D08 push {r4-r7,lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 2ea7161cf..3c029b0aa 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -99,6 +99,21 @@ u8 *unref_sub_8095C60(u8 *dest, const u8 *src, u16 pad) return _dest; } +void sub_8095C8C(u16 *dest, u16 dest_left, u16 dest_top, u16 *src, u16 src_left, u16 src_top, u16 dest_width, u16 dest_height, u16 src_width) +{ + u16 i; + + dest_width *= 2; + dest += dest_top * 0x20 + dest_left; + src += src_top * src_width + src_left; + for (i = 0; i < dest_height; i++) + { + CpuCopy16(src, dest, dest_width); + dest += 0x20; + src += src_width; + } +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 4db981200c1d011c370a45d123c31b397b7d62cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 11:54:46 -0500 Subject: nonmatching unref_sub_8095D08 --- asm/pokemon_storage_system.s | 103 -------------------------- include/gba/macro.h | 2 +- src/pokemon/pokemon_storage_system.c | 138 ++++++++++++++++++++++++++++++++++- 3 files changed, 138 insertions(+), 105 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 91f4911ce..76fac44bc 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,109 +5,6 @@ .text - thumb_func_start unref_sub_8095D08 -unref_sub_8095D08: @ 8095D08 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - adds r4, r0, 0 - ldr r0, [sp, 0x28] - lsls r1, 16 - lsrs r1, 16 - lsls r2, 16 - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - lsrs r2, 11 - adds r2, r1 - lsls r2, 1 - adds r4, r2 - lsls r3, 17 - lsrs r0, r3, 16 - str r0, [sp, 0x4] - movs r0, 0 - cmp r0, r10 - bcs _08095DB2 - movs r6, 0x80 - lsls r6, 5 - mov r5, sp - ldr r7, _08095D74 @ =0x040000d4 - lsrs r3, 17 - mov r9, r3 - mov r1, r9 - movs r2, 0x81 - lsls r2, 24 - orrs r1, r2 - mov r9, r1 -_08095D4E: - adds r3, r4, 0 - ldr r2, [sp, 0x4] - movs r1, 0x40 - adds r1, r4 - mov r8, r1 - adds r0, 0x1 - mov r12, r0 - cmp r2, r6 - bhi _08095D78 - movs r0, 0 - strh r0, [r5] - mov r2, sp - str r2, [r7] - str r4, [r7, 0x4] - mov r0, r9 - str r0, [r7, 0x8] - ldr r0, [r7, 0x8] - b _08095DA6 - .align 2, 0 -_08095D74: .4byte 0x040000d4 -_08095D78: - movs r4, 0 - strh r4, [r5] - ldr r1, _08095DC4 @ =0x040000d4 - mov r0, sp - str r0, [r1] - str r3, [r1, 0x4] - ldr r0, _08095DC8 @ =0x81000800 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r6 - subs r2, r6 - cmp r2, r6 - bhi _08095D78 - strh r4, [r5] - mov r0, sp - str r0, [r1] - str r3, [r1, 0x4] - lsrs r0, r2, 1 - movs r2, 0x81 - lsls r2, 24 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] -_08095DA6: - mov r4, r8 - mov r1, r12 - lsls r0, r1, 16 - lsrs r0, 16 - cmp r0, r10 - bcc _08095D4E -_08095DB2: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08095DC4: .4byte 0x040000d4 -_08095DC8: .4byte 0x81000800 - thumb_func_end unref_sub_8095D08 - thumb_func_start StorageSystemGetNextMonIndex StorageSystemGetNextMonIndex: @ 8095DCC push {r4-r7,lr} diff --git a/include/gba/macro.h b/include/gba/macro.h index d9e6739b3..540e08375 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -105,7 +105,7 @@ #define DmaClearLarge(dmaNum, dest, size, block, bit) \ { \ - const void *_dest = dest; \ + void *_dest = dest; \ u32 _size = size; \ while (1) \ { \ diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 3c029b0aa..5cb61f365 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -99,7 +99,7 @@ u8 *unref_sub_8095C60(u8 *dest, const u8 *src, u16 pad) return _dest; } -void sub_8095C8C(u16 *dest, u16 dest_left, u16 dest_top, u16 *src, u16 src_left, u16 src_top, u16 dest_width, u16 dest_height, u16 src_width) +void sub_8095C8C(u16 *dest, u16 dest_left, u16 dest_top, const u16 *src, u16 src_left, u16 src_top, u16 dest_width, u16 dest_height, u16 src_width) { u16 i; @@ -114,6 +114,142 @@ void sub_8095C8C(u16 *dest, u16 dest_left, u16 dest_top, u16 *src, u16 src_left, } } +#ifdef NONMATCHING +void unref_sub_8095D08(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height) +{ + u16 i; + + dest += dest_top * 0x20 + dest_left; + width *= 2; + for (i = 0; i < height; dest += 0x20, i++) + { + void *_dest = dest; + size_t _size = width; + if (_size <= 0x1000) + { + DmaFill16(3, 0, _dest, _size); + } + else + { + while (1) + { + DmaFill16(3, 0, _dest, 0x1000); + _dest += 0x1000; + _size -= 0x1000; + if (_size <= 0x1000) + { + DmaFill16(3, 0, _dest, _size); + break; + } + } + } + } +} +#else +__attribute__((naked)) void unref_sub_8095D08(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tsub sp, 0x8\n" + "\tadds r4, r0, 0\n" + "\tldr r0, [sp, 0x28]\n" + "\tlsls r1, 16\n" + "\tlsrs r1, 16\n" + "\tlsls r2, 16\n" + "\tlsls r0, 16\n" + "\tlsrs r0, 16\n" + "\tmov r10, r0\n" + "\tlsrs r2, 11\n" + "\tadds r2, r1\n" + "\tlsls r2, 1\n" + "\tadds r4, r2\n" + "\tlsls r3, 17\n" + "\tlsrs r0, r3, 16\n" + "\tstr r0, [sp, 0x4]\n" + "\tmovs r0, 0\n" + "\tcmp r0, r10\n" + "\tbcs _08095DB2\n" + "\tmovs r6, 0x80\n" + "\tlsls r6, 5\n" + "\tmov r5, sp\n" + "\tldr r7, _08095D74 @ =0x040000d4\n" + "\tlsrs r3, 17\n" + "\tmov r9, r3\n" + "\tmov r1, r9\n" + "\tmovs r2, 0x81\n" + "\tlsls r2, 24\n" + "\torrs r1, r2\n" + "\tmov r9, r1\n" + "_08095D4E:\n" + "\tadds r3, r4, 0\n" + "\tldr r2, [sp, 0x4]\n" + "\tmovs r1, 0x40\n" + "\tadds r1, r4\n" + "\tmov r8, r1\n" + "\tadds r0, 0x1\n" + "\tmov r12, r0\n" + "\tcmp r2, r6\n" + "\tbhi _08095D78\n" + "\tmovs r0, 0\n" + "\tstrh r0, [r5]\n" + "\tmov r2, sp\n" + "\tstr r2, [r7]\n" + "\tstr r4, [r7, 0x4]\n" + "\tmov r0, r9\n" + "\tstr r0, [r7, 0x8]\n" + "\tldr r0, [r7, 0x8]\n" + "\tb _08095DA6\n" + "\t.align 2, 0\n" + "_08095D74: .4byte 0x040000d4\n" + "_08095D78:\n" + "\tmovs r4, 0\n" + "\tstrh r4, [r5]\n" + "\tldr r1, _08095DC4 @ =0x040000d4\n" + "\tmov r0, sp\n" + "\tstr r0, [r1]\n" + "\tstr r3, [r1, 0x4]\n" + "\tldr r0, _08095DC8 @ =0x81000800\n" + "\tstr r0, [r1, 0x8]\n" + "\tldr r0, [r1, 0x8]\n" + "\tadds r3, r6\n" + "\tsubs r2, r6\n" + "\tcmp r2, r6\n" + "\tbhi _08095D78\n" + "\tstrh r4, [r5]\n" + "\tmov r0, sp\n" + "\tstr r0, [r1]\n" + "\tstr r3, [r1, 0x4]\n" + "\tlsrs r0, r2, 1\n" + "\tmovs r2, 0x81\n" + "\tlsls r2, 24\n" + "\torrs r0, r2\n" + "\tstr r0, [r1, 0x8]\n" + "\tldr r0, [r1, 0x8]\n" + "_08095DA6:\n" + "\tmov r4, r8\n" + "\tmov r1, r12\n" + "\tlsls r0, r1, 16\n" + "\tlsrs r0, 16\n" + "\tcmp r0, r10\n" + "\tbcc _08095D4E\n" + "_08095DB2:\n" + "\tadd sp, 0x8\n" + "\tpop {r3-r5}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tmov r10, r5\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" + "_08095DC4: .4byte 0x040000d4\n" + "_08095DC8: .4byte 0x81000800"); +} +#endif + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From a7e900e31b472385fda5fab48fc3c76212a0e0c2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 12:47:00 -0500 Subject: StorageSystemGetNextMonIndex --- asm/pokemon_storage_system.s | 116 ----------------------------------- src/pokemon/pokemon_storage_system.c | 31 ++++++++++ 2 files changed, 31 insertions(+), 116 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 76fac44bc..cf8091735 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,122 +5,6 @@ .text - thumb_func_start StorageSystemGetNextMonIndex -StorageSystemGetNextMonIndex: @ 8095DCC - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r8, r0 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r7, r2, 24 - lsls r3, 24 - lsrs r0, r3, 24 - cmp r0, 0 - beq _08095DE8 - cmp r0, 0x2 - bne _08095DEC -_08095DE8: - movs r2, 0x1 - b _08095DEE -_08095DEC: - ldr r2, _08095E38 @ =0x0000ffff -_08095DEE: - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _08095E44 - lsls r0, r1, 24 - asrs r0, 24 - lsls r2, 16 - asrs r1, r2, 16 - adds r1, r0 - lsls r0, r1, 16 - asrs r1, r0, 16 - adds r6, r2, 0 - cmp r1, 0 - blt _08095E90 - cmp r1, r7 - bgt _08095E90 -_08095E10: - asrs r4, r0, 16 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 4 - add r0, r8 - movs r1, 0xB - bl GetBoxMonData - cmp r0, 0 - bne _08095E3C - asrs r0, r6, 16 - adds r0, r4, r0 - lsls r0, 16 - asrs r2, r0, 16 - cmp r2, 0 - blt _08095E90 - cmp r2, r7 - ble _08095E10 - b _08095E90 - .align 2, 0 -_08095E38: .4byte 0x0000ffff -_08095E3C: - adds r0, r4, 0 - b _08095E94 -_08095E40: - adds r0, r5, 0 - b _08095E94 -_08095E44: - lsls r0, r1, 24 - asrs r0, 24 - lsls r2, 16 - asrs r1, r2, 16 - adds r1, r0 - lsls r0, r1, 16 - asrs r1, r0, 16 - adds r6, r2, 0 - cmp r1, 0 - blt _08095E90 - cmp r1, r7 - bgt _08095E90 -_08095E5C: - asrs r5, r0, 16 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 4 - mov r1, r8 - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetBoxMonData - cmp r0, 0 - beq _08095E80 - adds r0, r4, 0 - movs r1, 0x2D - bl GetBoxMonData - cmp r0, 0 - beq _08095E40 -_08095E80: - asrs r0, r6, 16 - adds r0, r5, r0 - lsls r0, 16 - asrs r2, r0, 16 - cmp r2, 0 - blt _08095E90 - cmp r2, r7 - ble _08095E5C -_08095E90: - movs r0, 0x1 - negs r0, r0 -_08095E94: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end StorageSystemGetNextMonIndex - thumb_func_start StorageSystemClearMessageWindow StorageSystemClearMessageWindow: @ 8095EA0 push {lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 5cb61f365..745a27bf6 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -250,6 +250,37 @@ __attribute__((naked)) void unref_sub_8095D08(u16 *dest, u16 dest_left, u16 dest } #endif +s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx, u8 mode) +{ + s16 i; + s16 direction; + if (mode == 0 || mode == 2) + { + direction = 1; + } + else + { + direction = -1; + } + if (mode == 2 || mode == 3) + { + for (i = startIdx + direction; i >= 0 && i <= stopIdx; i += direction) + { + if (GetBoxMonData(box + i, MON_DATA_SPECIES) != 0) + return i; + } + } + else + { + for (i = startIdx + direction; i >= 0 && i <= stopIdx; i += direction) + { + if (GetBoxMonData(box + i, MON_DATA_SPECIES) != 0 && !GetBoxMonData(box + i, MON_DATA_IS_EGG)) + return i; + } + } + return -1; +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From f813e926e6438c04167a563225b9fca0939fa758 Mon Sep 17 00:00:00 2001 From: M Date: Sat, 6 Jan 2018 19:00:11 +0100 Subject: remove asm --- asm/roulette.s | 9658 --------------------------------------------------- asm/roulette_util.s | 781 ----- ld_script.txt | 2 - 3 files changed, 10441 deletions(-) delete mode 100644 asm/roulette.s delete mode 100644 asm/roulette_util.s diff --git a/asm/roulette.s b/asm/roulette.s deleted file mode 100644 index 5050cf7a7..000000000 --- a/asm/roulette.s +++ /dev/null @@ -1,9658 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text -/* - thumb_func_start sub_81150FC -sub_81150FC: @ 81150FC - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - ldr r0, _08115120 @ =gSharedMem + 0x19000 - adds r1, r0, 0 - adds r1, 0xB8 - ldrb r0, [r1] - cmp r0, 0 - beq _0811511C - adds r0, r1, 0 - bl task_tutorial_controls_fadein -_0811511C: - pop {r0} - bx r0 - .align 2, 0 -_08115120: .4byte gSharedMem + 0x19000 - thumb_func_end sub_81150FC - - thumb_func_start sub_8115124 -sub_8115124: @ 8115124 - push {r4,lr} - sub sp, 0x4 - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - bl sub_8117434 - ldr r2, _08115188 @ =REG_BG1HOFS - ldr r3, _0811518C @ =gSharedMem + 0x19000 - ldrh r1, [r3, 0x26] - movs r4, 0x80 - lsls r4, 2 - adds r0, r4, 0 - subs r0, r1 - strh r0, [r2] - ldrb r0, [r3, 0x1] - cmp r0, 0 - beq _08115154 - ldr r1, _08115190 @ =REG_BLDALPHA - ldrh r0, [r3, 0x34] - strh r0, [r1] -_08115154: - movs r1, 0x2A - ldrsh r0, [r3, r1] - cmp r0, 0 - beq _08115170 - ldr r1, _08115194 @ =0x040000d4 - ldr r0, _08115198 @ =gBGTilemapBuffers + 0x800 + 0x1C0 - str r0, [r1] - ldr r0, _0811519C @ =0x060021c0 - str r0, [r1, 0x4] - ldr r0, _081151A0 @ =0x800001a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0 - strh r0, [r3, 0x2A] -_08115170: - movs r2, 0x28 - ldrsh r0, [r3, r2] - cmp r0, 0x1 - beq _081151A4 - cmp r0, 0x1 - ble _0811521A - cmp r0, 0x2 - beq _081151D4 - cmp r0, 0xFF - beq _081151F8 - b _0811521A - .align 2, 0 -_08115188: .4byte REG_BG1HOFS -_0811518C: .4byte gSharedMem + 0x19000 -_08115190: .4byte REG_BLDALPHA -_08115194: .4byte 0x040000d4 -_08115198: .4byte gBGTilemapBuffers + 0x800 + 0x1C0 -_0811519C: .4byte 0x060021c0 -_081151A0: .4byte 0x800001a0 -_081151A4: - ldr r1, _081151C4 @ =REG_BG0CNT - movs r4, 0xF8 - lsls r4, 5 - adds r0, r4, 0 - strh r0, [r1] - adds r1, 0xCC - ldr r0, _081151C8 @ =gBGTilemapBuffers + 0x1000 + 0x1C0 - str r0, [r1] - ldr r0, _081151CC @ =0x0600f9c0 - str r0, [r1, 0x4] - ldr r0, _081151D0 @ =0x800001a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0x2 - b _08115218 - .align 2, 0 -_081151C4: .4byte REG_BG0CNT -_081151C8: .4byte gBGTilemapBuffers + 0x1000 + 0x1C0 -_081151CC: .4byte 0x0600f9c0 -_081151D0: .4byte 0x800001a0 -_081151D4: - ldr r1, _081151E8 @ =0x040000d4 - ldr r0, _081151EC @ =gBGTilemapBuffers + 0x1000 + 0x1C0 - str r0, [r1] - ldr r0, _081151F0 @ =0x0600f9c0 - str r0, [r1, 0x4] - ldr r0, _081151F4 @ =0x800001a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - b _0811521A - .align 2, 0 -_081151E8: .4byte 0x040000d4 -_081151EC: .4byte gBGTilemapBuffers + 0x1000 + 0x1C0 -_081151F0: .4byte 0x0600f9c0 -_081151F4: .4byte 0x800001a0 -_081151F8: - ldr r1, _08115224 @ =REG_BG0CNT - ldr r2, _08115228 @ =0x00001f08 - adds r0, r2, 0 - strh r0, [r1] - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, _0811522C @ =0x040000d4 - mov r4, sp - str r4, [r1] - ldr r0, _08115230 @ =0x0600f9c0 - str r0, [r1, 0x4] - ldr r0, _08115234 @ =0x810001a0 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0 -_08115218: - strh r0, [r3, 0x28] -_0811521A: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08115224: .4byte REG_BG0CNT -_08115228: .4byte 0x00001f08 -_0811522C: .4byte 0x040000d4 -_08115230: .4byte 0x0600f9c0 -_08115234: .4byte 0x810001a0 - thumb_func_end sub_8115124 - - thumb_func_start sub_8115238 -sub_8115238: @ 8115238 - push {r4-r6,lr} - sub sp, 0x8 - ldr r1, _081152C0 @ =gUnknown_083F8EC4 - mov r0, sp - movs r2, 0x6 - bl memcpy - ldr r5, _081152C4 @ =gSharedMem + 0x19000 - movs r2, 0xBE - lsls r2, 1 - adds r0, r5, 0 - movs r1, 0 - bl memset - ldr r0, _081152C8 @ =gSpecialVar_0x8004 - ldrh r2, [r0] - movs r0, 0x1 - ands r0, r2 - ldrb r1, [r5, 0x4] - movs r3, 0x4 - negs r3, r3 - ands r3, r1 - orrs r3, r0 - strb r3, [r5, 0x4] - movs r0, 0x80 - ands r0, r2 - cmp r0, 0 - beq _08115276 - movs r0, 0x80 - orrs r3, r0 - strb r3, [r5, 0x4] -_08115276: - ldr r3, _081152CC @ =gUnknown_083F8DF4 - ldrb r2, [r5, 0x4] - lsls r1, r2, 30 - lsrs r0, r1, 25 - adds r0, r3 - ldrb r0, [r0, 0x3] - adds r4, r5, 0 - adds r4, 0x22 - strb r0, [r4] - lsrs r0, r1, 25 - adds r0, r3 - ldrb r0, [r0, 0x4] - adds r3, r5, 0 - adds r3, 0x23 - strb r0, [r3] - ldr r0, _081152D0 @ =gUnknown_083F8DF0 - lsrs r1, 30 - lsls r2, 24 - lsrs r2, 31 - lsls r2, 1 - adds r1, r2 - adds r1, r0 - ldrb r2, [r1] - strb r2, [r5, 0x19] - ldrb r1, [r5, 0x1A] - movs r0, 0xF - ands r0, r1 - movs r1, 0x10 - orrs r0, r1 - strb r0, [r5, 0x1A] - cmp r2, 0x1 - bne _081152DC - ldr r4, _081152D4 @ =gPlttBufferUnfaded - ldr r3, _081152D8 @ =gPlttBufferFaded - mov r0, sp - ldrh r2, [r0] - b _081152E4 - .align 2, 0 -_081152C0: .4byte gUnknown_083F8EC4 -_081152C4: .4byte gSharedMem + 0x19000 -_081152C8: .4byte gSpecialVar_0x8004 -_081152CC: .4byte gUnknown_083F8DF4 -_081152D0: .4byte gUnknown_083F8DF0 -_081152D4: .4byte gPlttBufferUnfaded -_081152D8: .4byte gPlttBufferFaded -_081152DC: - ldr r4, _08115348 @ =gPlttBufferUnfaded - ldr r3, _0811534C @ =gPlttBufferFaded - mov r0, sp - ldrh r2, [r0, 0x2] -_081152E4: - adds r0, r3, 0 - adds r0, 0xA2 - strh r2, [r0] - ldr r1, _08115350 @ =0x0000ffff - adds r0, r1, 0 - ands r0, r2 - strh r0, [r3] - ands r0, r1 - adds r2, r4, 0 - adds r2, 0xA2 - strh r0, [r2] - ands r0, r1 - strh r0, [r4] - ldr r0, _08115354 @ =gSharedMem + 0x190B8 - bl sub_8124918 - movs r4, 0 - ldr r5, _08115358 @ =gUnknown_083F8E34 -_08115308: - lsls r2, r4, 3 - adds r2, r5 - ldr r0, _08115354 @ =gSharedMem + 0x190B8 - adds r1, r4, 0 - bl sub_812492C - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xC - bls _08115308 - movs r4, 0 - ldr r5, _0811535C @ =gSharedMem + 0x19000 -_08115322: - movs r0, 0x64 - muls r0, r4 - ldr r1, _08115360 @ =gPlayerParty - adds r0, r1 - movs r1, 0x41 - bl GetMonData - adds r1, r0, 0 - movs r0, 0x98 - lsls r0, 1 - cmp r1, r0 - beq _08115364 - adds r0, 0x2 - cmp r1, r0 - bne _0811536C - ldrb r0, [r5, 0x2] - movs r1, 0x1 - b _08115368 - .align 2, 0 -_08115348: .4byte gPlttBufferUnfaded -_0811534C: .4byte gPlttBufferFaded -_08115350: .4byte 0x0000ffff -_08115354: .4byte gSharedMem + 0x190B8 -_08115358: .4byte gUnknown_083F8E34 -_0811535C: .4byte gSharedMem + 0x19000 -_08115360: .4byte gPlayerParty -_08115364: - ldrb r0, [r5, 0x2] - movs r1, 0x2 -_08115368: - orrs r0, r1 - strb r0, [r5, 0x2] -_0811536C: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _08115322 - bl RtcCalcLocalTime - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8115238 - - thumb_func_start sub_8115384 -sub_8115384: @ 8115384 - push {r4,lr} - sub sp, 0x4 - ldr r1, _081153A4 @ =gMain - ldr r2, _081153A8 @ =0x0000043c - adds r0, r1, r2 - ldrb r0, [r0] - adds r2, r1, 0 - cmp r0, 0x7 - bls _08115398 - b _081155FE -_08115398: - lsls r0, 2 - ldr r1, _081153AC @ =_081153B0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081153A4: .4byte gMain -_081153A8: .4byte 0x0000043c -_081153AC: .4byte _081153B0 - .align 2, 0 -_081153B0: - .4byte _081153D0 - .4byte _08115444 - .4byte _08115460 - .4byte _08115494 - .4byte _081154CC - .4byte _081154FC - .4byte _0811556C - .4byte _0811558C -_081153D0: - movs r0, 0 - bl SetVBlankCallback - bl remove_some_task - bl sub_80F9438 - bl sub_80F9368 - ldr r1, _08115420 @ =REG_BG2CNT - ldr r3, _08115424 @ =0x00004686 - adds r0, r3, 0 - strh r0, [r1] - subs r1, 0x2 - ldr r2, _08115428 @ =0x00004401 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x46 - movs r3, 0x90 - lsls r3, 6 - adds r0, r3, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r2, _0811542C @ =0x0000060a - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _08115430 @ =gUnknown_08E8096C - movs r1, 0xC0 - lsls r1, 19 - bl LZ77UnCompVram - ldr r0, _08115434 @ =gRouletteWheelTiles - ldr r1, _08115438 @ =0x06004000 - bl LZ77UnCompVram - ldr r1, _0811543C @ =gMain - ldr r3, _08115440 @ =0x0000043c - adds r1, r3 - b _0811557A - .align 2, 0 -_08115420: .4byte REG_BG2CNT -_08115424: .4byte 0x00004686 -_08115428: .4byte 0x00004401 -_0811542C: .4byte 0x0000060a -_08115430: .4byte gUnknown_08E8096C -_08115434: .4byte gRouletteWheelTiles -_08115438: .4byte 0x06004000 -_0811543C: .4byte gMain -_08115440: .4byte 0x0000043c -_08115444: - bl ResetPaletteFade - bl ResetSpriteData - bl ResetTasks - ldr r1, _08115458 @ =gMain - ldr r0, _0811545C @ =0x0000043c - adds r1, r0 - b _0811557A - .align 2, 0 -_08115458: .4byte gMain -_0811545C: .4byte 0x0000043c -_08115460: - ldr r0, _08115480 @ =gWindowConfig_81E6C3C - bl SetUpWindowConfig - ldr r0, _08115484 @ =InitMenuWindow - bl InitMenuWindow - ldr r0, _08115488 @ =gUnknown_083F86BC - movs r2, 0xE0 - lsls r2, 1 - movs r1, 0 - bl LoadPalette - ldr r1, _0811548C @ =gMain - ldr r2, _08115490 @ =0x0000043c - adds r1, r2 - b _0811557A - .align 2, 0 -_08115480: .4byte gWindowConfig_81E6C3C -_08115484: .4byte gWindowConfig_81E6CE4 -_08115488: .4byte gUnknown_083F86BC -_0811548C: .4byte gMain -_08115490: .4byte 0x0000043c -_08115494: - bl sub_8115238 - bl sub_80F9020 - ldr r0, _081154B4 @ =gUnknown_083F88BC - ldr r1, _081154B8 @ =gSharedMem + 0x18800 - bl LZ77UnCompWram - ldr r0, _081154BC @ =gUnknown_083F8A60 - ldr r1, _081154C0 @ =0x06003000 - bl LZ77UnCompVram - ldr r1, _081154C4 @ =gMain - ldr r3, _081154C8 @ =0x0000043c - adds r1, r3 - b _0811557A - .align 2, 0 -_081154B4: .4byte gUnknown_083F88BC -_081154B8: .4byte gSharedMem + 0x18800 -_081154BC: .4byte gUnknown_083F8A60 -_081154C0: .4byte 0x06003000 -_081154C4: .4byte gMain -_081154C8: .4byte 0x0000043c -_081154CC: - movs r0, 0 - bl sub_8117838 - bl sub_811857C - bl sub_81184D8 - bl sub_8117F2C - bl sub_8117900 - bl sub_8117BBC - bl sub_8117DF4 - ldr r1, _081154F4 @ =gMain - ldr r0, _081154F8 @ =0x0000043c - adds r1, r0 - b _0811557A - .align 2, 0 -_081154F4: .4byte gMain -_081154F8: .4byte 0x0000043c -_081154FC: - bl AnimateSprites - bl BuildOamBuffer - ldr r0, _08115550 @ =gSaveBlock1 - ldr r1, _08115554 @ =0x00000494 - adds r0, r1 - ldrh r0, [r0] - bl sub_81180F4 - movs r0, 0x6 - bl sub_81182F8 - movs r0, 0 - bl sub_811829C - movs r0, 0 - bl sub_8117158 - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _08115558 @ =gUnknown_081C4157 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _0811555C @ =gSpriteCoordOffsetX - movs r2, 0x3C - negs r2, r2 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _08115560 @ =gSpriteCoordOffsetY - movs r0, 0 - strh r0, [r1] - ldr r1, _08115564 @ =gMain - ldr r3, _08115568 @ =0x0000043c - adds r1, r3 - b _0811557A - .align 2, 0 -_08115550: .4byte gSaveBlock1 -_08115554: .4byte 0x00000494 -_08115558: .4byte gUnknown_081C4157 -_0811555C: .4byte gSpriteCoordOffsetX -_08115560: .4byte gSpriteCoordOffsetY -_08115564: .4byte gMain -_08115568: .4byte 0x0000043c -_0811556C: - movs r1, 0x80 - lsls r1, 19 - ldr r3, _08115584 @ =0x00001741 - adds r0, r3, 0 - strh r0, [r1] - ldr r0, _08115588 @ =0x0000043c - adds r1, r2, r0 -_0811557A: - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _081155FE - .align 2, 0 -_08115584: .4byte 0x00001741 -_08115588: .4byte 0x0000043c -_0811558C: - ldr r3, _08115608 @ =0x04000208 - ldrh r2, [r3] - movs r0, 0 - strh r0, [r3] - ldr r4, _0811560C @ =0x04000200 - ldrh r0, [r4] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r4] - strh r2, [r3] - ldr r2, _08115610 @ =REG_DISPSTAT - ldrh r0, [r2] - movs r1, 0x8 - orrs r0, r1 - strh r0, [r2] - ldr r0, _08115614 @ =sub_8115124 - bl SetVBlankCallback - movs r0, 0x1 - str r0, [sp] - movs r0, 0xFF - movs r1, 0 - movs r2, 0x10 - movs r3, 0 - bl BeginHardwarePaletteFade - ldr r0, _08115618 @ =sub_81156BC - movs r1, 0 - bl CreateTask - ldr r4, _0811561C @ =gSharedMem + 0x19000 - adds r1, r4, 0 - adds r1, 0xA4 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08115620 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0x6 - strh r0, [r1, 0x14] - ldr r0, _08115624 @ =gSaveBlock1 - ldr r2, _08115628 @ =0x00000494 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1, 0x22] - ldr r0, _0811562C @ =sub_8115634 - movs r1, 0x1 - bl CreateTask - adds r4, 0xA5 - strb r0, [r4] - ldr r0, _08115630 @ =sub_81150FC - bl SetMainCallback2 -_081155FE: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08115608: .4byte 0x04000208 -_0811560C: .4byte 0x04000200 -_08115610: .4byte REG_DISPSTAT -_08115614: .4byte sub_8115124 -_08115618: .4byte sub_81156BC -_0811561C: .4byte gSharedMem + 0x19000 -_08115620: .4byte gTasks -_08115624: .4byte gSaveBlock1 -_08115628: .4byte 0x00000494 -_0811562C: .4byte sub_8115634 -_08115630: .4byte sub_81150FC - thumb_func_end sub_8115384 - - thumb_func_start sub_8115634 -sub_8115634: @ 8115634 - push {r4-r6,lr} - ldr r0, _081156B8 @ =gSharedMem + 0x19000 - adds r3, r0, 0 - adds r3, 0x21 - ldrb r1, [r3] - adds r2, r1, 0x1 - strb r2, [r3] - adds r2, r0, 0 - adds r2, 0x23 - lsls r1, 24 - lsrs r1, 24 - adds r6, r0, 0 - ldrb r2, [r2] - cmp r1, r2 - bne _08115674 - movs r0, 0 - strb r0, [r3] - adds r2, r6, 0 - adds r2, 0x22 - ldrb r1, [r2] - ldrh r0, [r6, 0x24] - subs r0, r1 - strh r0, [r6, 0x24] - lsls r0, 16 - cmp r0, 0 - bge _08115674 - ldrb r1, [r2] - movs r2, 0xB4 - lsls r2, 1 - adds r0, r2, 0 - subs r0, r1 - strh r0, [r6, 0x24] -_08115674: - adds r4, r6, 0 - ldrh r0, [r4, 0x24] - bl Sin2 - lsls r0, 16 - lsrs r5, r0, 16 - ldrh r0, [r4, 0x24] - bl Cos2 - lsls r0, 16 - lsrs r1, r0, 16 - lsls r0, r5, 16 - asrs r0, 16 - cmp r0, 0 - bge _08115694 - adds r0, 0xF -_08115694: - lsls r0, 12 - lsrs r5, r0, 16 - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0 - bge _081156A2 - adds r0, 0xF -_081156A2: - asrs r0, 4 - strh r0, [r6, 0x32] - strh r0, [r6, 0x2C] - strh r5, [r6, 0x2E] - lsls r0, r5, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r6, 0x30] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081156B8: .4byte gSharedMem + 0x19000 - thumb_func_end sub_8115634 - - thumb_func_start sub_81156BC -sub_81156BC: @ 81156BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl UpdatePaletteFade - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0 - bne _08115716 - ldr r2, _0811571C @ =REG_BLDCNT - ldrh r0, [r2] - movs r5, 0x90 - lsls r5, 6 - adds r1, r5, 0 - orrs r0, r1 - strh r0, [r2] - ldr r1, _08115720 @ =REG_BLDALPHA - ldr r2, _08115724 @ =0x00000808 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _08115728 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - strh r3, [r0, 0x14] - adds r0, r4, 0 - bl sub_8116CAC - bl sub_8116CF8 - bl sub_81185E8 - movs r0, 0 - bl sub_8117158 - movs r0, 0x6 - bl sub_81182F8 - ldr r1, _0811572C @ =sub_81159BC - ldr r2, _08115730 @ =0x0000ffff - adds r0, r4, 0 - movs r3, 0x3 - bl sub_8116C34 -_08115716: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811571C: .4byte REG_BLDCNT -_08115720: .4byte REG_BLDALPHA -_08115724: .4byte 0x00000808 -_08115728: .4byte gTasks -_0811572C: .4byte sub_81159BC -_08115730: .4byte 0x0000ffff - thumb_func_end sub_81156BC - - thumb_func_start sub_8115734 -sub_8115734: @ 8115734 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x14 - movs r1, 0x8 - movs r2, 0x1 - bl DisplayYesNoMenu - ldr r0, _08115770 @ =0x00002d9e - bl sub_814AAF8 - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _08115774 @ =gUnknown_081C41E3 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _08115778 @ =gUnknown_083F8EBC - adds r0, r4, 0 - bl DoYesNoFuncWithChoice - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08115770: .4byte 0x00002d9e -_08115774: .4byte gUnknown_081C41E3 -_08115778: .4byte gUnknown_083F8EBC - thumb_func_end sub_8115734 - - thumb_func_start sub_811577C -sub_811577C: @ 811577C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x14 - movs r1, 0x8 - movs r2, 0x1A - movs r3, 0xD - bl MenuZeroFillWindowRect - ldr r1, _081157A4 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _081157A8 @ =sub_81159BC - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081157A4: .4byte gTasks -_081157A8: .4byte sub_81159BC - thumb_func_end sub_811577C - - thumb_func_start sub_81157AC -sub_81157AC: @ 81157AC - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _081157CC @ =gSharedMem + 0x19000 - adds r0, 0xA5 - ldrb r0, [r0] - bl DestroyTask - adds r0, r4, 0 - bl sub_8116AB0 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081157CC: .4byte gSharedMem + 0x19000 - thumb_func_end sub_81157AC - - thumb_func_start sub_81157D0 -sub_81157D0: @ 81157D0 - push {r4-r7,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bhi _081158C8 - lsls r0, r4, 2 - ldr r1, _081157E8 @ =_081157EC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_081157E8: .4byte _081157EC - .align 2, 0 -_081157EC: - .4byte _0811582C - .4byte _08115848 - .4byte _08115848 - .4byte _08115848 - .4byte _08115848 - .4byte _08115884 - .4byte _081158C8 - .4byte _081158C8 - .4byte _081158C8 - .4byte _081158C8 - .4byte _08115884 - .4byte _081158C8 - .4byte _081158C8 - .4byte _081158C8 - .4byte _081158C8 - .4byte _08115884 -_0811582C: - ldr r0, _08115844 @ =gBGTilemapBuffers + 0x1000 - movs r1, 0x10 - str r1, [sp] - movs r1, 0xD - str r1, [sp, 0x4] - movs r1, 0 - movs r2, 0xE - movs r3, 0x7 - bl sub_8124DDC - b _08115918 - .align 2, 0 -_08115844: .4byte gBGTilemapBuffers + 0x1000 -_08115848: - lsls r0, r4, 1 - adds r0, r4 - adds r0, 0xE - lsls r0, 24 - lsrs r7, r0, 24 - ldr r5, _0811587C @ =gBGTilemapBuffers + 0x1000 - movs r0, 0x10 - str r0, [sp] - movs r4, 0xD - str r4, [sp, 0x4] - adds r0, r5, 0 - movs r1, 0 - movs r2, 0xE - movs r3, 0x7 - bl sub_8124DDC - ldr r1, _08115880 @ =gSharedMem + 0x18A32 - movs r0, 0x3 - str r0, [sp] - str r4, [sp, 0x4] - adds r0, r5, 0 - adds r2, r7, 0 - movs r3, 0x7 - bl sub_8124E2C - b _08115918 - .align 2, 0 -_0811587C: .4byte gBGTilemapBuffers + 0x1000 -_08115880: .4byte gSharedMem + 0x18A32 -_08115884: - subs r0, r4, 0x1 - movs r1, 0x5 - bl __divsi3 - lsls r1, r0, 1 - adds r1, r0 - adds r1, 0xA - lsls r1, 24 - lsrs r6, r1, 24 - ldr r5, _081158C0 @ =gBGTilemapBuffers + 0x1000 - movs r4, 0x10 - str r4, [sp] - movs r0, 0xD - str r0, [sp, 0x4] - adds r0, r5, 0 - movs r1, 0 - movs r2, 0xE - movs r3, 0x7 - bl sub_8124DDC - ldr r1, _081158C4 @ =gSharedMem + 0x18A80 - str r4, [sp] - movs r0, 0x3 - str r0, [sp, 0x4] - adds r0, r5, 0 - movs r2, 0xE - adds r3, r6, 0 - bl sub_8124E2C - b _08115918 - .align 2, 0 -_081158C0: .4byte gBGTilemapBuffers + 0x1000 -_081158C4: .4byte gSharedMem + 0x18A80 -_081158C8: - adds r0, r4, 0 - movs r1, 0x5 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r0 - adds r1, 0xE - lsls r1, 24 - lsrs r7, r1, 24 - subs r0, r4, 0x1 - movs r1, 0x5 - bl __divsi3 - lsls r1, r0, 1 - adds r1, r0 - adds r1, 0x7 - lsls r1, 24 - lsrs r6, r1, 24 - ldr r4, _08115920 @ =gBGTilemapBuffers + 0x1000 - movs r0, 0x10 - str r0, [sp] - movs r0, 0xD - str r0, [sp, 0x4] - adds r0, r4, 0 - movs r1, 0 - movs r2, 0xE - movs r3, 0x7 - bl sub_8124DDC - ldr r1, _08115924 @ =gSharedMem + 0x18A20 - movs r0, 0x3 - str r0, [sp] - str r0, [sp, 0x4] - adds r0, r4, 0 - adds r2, r7, 0 - adds r3, r6, 0 - bl sub_8124E2C -_08115918: - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08115920: .4byte gBGTilemapBuffers + 0x1000 -_08115924: .4byte gSharedMem + 0x18A20 - thumb_func_end sub_81157D0 - - thumb_func_start sub_8115928 -sub_8115928: @ 8115928 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r1, 24 - cmp r1, 0 - bne _0811594C - ldr r1, _08115948 @ =gTasks - lsls r4, r5, 2 - adds r0, r4, r5 - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0, 0x10] - bl sub_811829C - b _08115960 - .align 2, 0 -_08115948: .4byte gTasks -_0811594C: - ldr r0, _08115974 @ =gSharedMem + 0x19000 - ldrb r1, [r0, 0x1A] - lsls r1, 28 - lsrs r1, 28 - adds r0, 0x1B - adds r1, r0 - ldrb r0, [r1] - bl sub_811829C - lsls r4, r5, 2 -_08115960: - ldr r0, _08115978 @ =gTasks - adds r1, r4, r5 - lsls r1, 3 - adds r1, r0 - ldrb r0, [r1, 0x10] - bl sub_81157D0 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08115974: .4byte gSharedMem + 0x19000 -_08115978: .4byte gTasks - thumb_func_end sub_8115928 - - thumb_func_start sub_811597C -sub_811597C: @ 811597C - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r5, _081159B0 @ =gSharedMem + 0x19000 - movs r6, 0 - movs r1, 0x1 - strh r1, [r5, 0x28] - ldr r1, _081159B4 @ =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldrb r0, [r4, 0x10] - bl sub_81157D0 - adds r1, r5, 0 - adds r1, 0x23 - movs r0, 0x2 - strb r0, [r1] - adds r5, 0x21 - strb r6, [r5] - ldr r0, _081159B8 @ =sub_8115E14 - str r0, [r4] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081159B0: .4byte gSharedMem + 0x19000 -_081159B4: .4byte gTasks -_081159B8: .4byte sub_8115E14 - thumb_func_end sub_811597C - - thumb_func_start sub_81159BC -sub_81159BC: @ 81159BC - push {r4-r7,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r3, _08115A10 @ =gSharedMem + 0x19000 - ldr r1, [r3, 0x8] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08115A1C - movs r2, 0xB - ldr r5, _08115A14 @ =gUnknown_083F8C00 - adds r0, r5, 0 - adds r0, 0xE4 - ldr r0, [r0] - ands r1, r0 - ldr r0, _08115A18 @ =gTasks - mov r12, r0 - lsls r7, r6, 2 - cmp r1, 0 - beq _08115A5A - adds r4, r3, 0 - adds r3, r5, 0 - adds r3, 0x8 -_081159EA: - lsls r0, r2, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r2, r0, 16 - asrs r1, r0, 16 - cmp r1, 0xD - bgt _08115A5A - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldr r1, [r4, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _081159EA - b _08115A5A - .align 2, 0 -_08115A10: .4byte gSharedMem + 0x19000 -_08115A14: .4byte gUnknown_083F8C00 -_08115A18: .4byte gTasks -_08115A1C: - movs r2, 0x6 - ldr r5, _08115A88 @ =gUnknown_083F8C00 - adds r0, r5, 0 - adds r0, 0x80 - ldr r0, [r0] - ands r1, r0 - ldr r0, _08115A8C @ =gTasks - mov r12, r0 - lsls r7, r6, 2 - cmp r1, 0 - beq _08115A5A - adds r4, r3, 0 - adds r3, r5, 0 - adds r3, 0x8 -_08115A38: - lsls r0, r2, 16 - movs r1, 0x80 - lsls r1, 9 - adds r0, r1 - lsrs r2, r0, 16 - asrs r1, r0, 16 - cmp r1, 0x9 - bgt _08115A5A - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldr r1, [r4, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _08115A38 -_08115A5A: - adds r4, r7, r6 - lsls r4, 3 - add r4, r12 - movs r5, 0 - strh r2, [r4, 0x10] - adds r0, r6, 0 - bl sub_8116CAC - ldrb r0, [r4, 0x10] - bl sub_8117158 - ldrb r0, [r4, 0x10] - bl sub_811829C - ldrb r0, [r4, 0x10] - bl sub_8116EF8 - strh r5, [r4, 0xA] - ldr r0, _08115A90 @ =sub_811597C - str r0, [r4] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08115A88: .4byte gUnknown_083F8C00 -_08115A8C: .4byte gTasks -_08115A90: .4byte sub_811597C - thumb_func_end sub_81159BC - - thumb_func_start sub_8115A94 -sub_8115A94: @ 8115A94 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r4, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - movs r6, 0 - movs r7, 0 - ldr r1, _08115ADC @ =gUnknown_083F8ECA - mov r0, sp - movs r2, 0x4 - bl memcpy - ldrb r0, [r4] - mov r8, r0 - cmp r5, 0 - blt _08115B08 - cmp r5, 0x1 - bgt _08115AE0 - movs r1, 0 - ldrsh r0, [r4, r1] - movs r1, 0x5 - bl __modsi3 - lsls r0, 24 - lsrs r6, r0, 24 - movs r2, 0xF0 - lsls r2, 20 - adds r1, r0, r2 - lsrs r7, r1, 24 - cmp r0, 0 - bne _08115B08 - movs r6, 0x5 - b _08115B08 - .align 2, 0 -_08115ADC: .4byte gUnknown_083F8ECA -_08115AE0: - cmp r5, 0x3 - bgt _08115B08 - movs r1, 0 - ldrsh r0, [r4, r1] - movs r1, 0x5 - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 24 - lsrs r6, r1, 24 - movs r2, 0x80 - lsls r2, 19 - adds r0, r1, r2 - lsrs r7, r0, 24 - cmp r1, 0 - bne _08115B08 - movs r6, 0x1 -_08115B08: - mov r1, sp - adds r0, r1, r5 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrh r2, [r4] - adds r0, r2 - strh r0, [r4] - lsls r1, r6, 24 - asrs r3, r1, 24 - lsls r0, 16 - asrs r0, 16 - lsls r2, r7, 24 - cmp r0, r3 - bge _08115B2A - asrs r0, r2, 24 - strh r0, [r4] -_08115B2A: - movs r0, 0 - ldrsh r1, [r4, r0] - asrs r0, r2, 24 - cmp r1, r0 - ble _08115B36 - strh r3, [r4] -_08115B36: - mov r1, r8 - lsls r0, r1, 24 - movs r2, 0 - ldrsh r1, [r4, r2] - asrs r0, 24 - cmp r1, r0 - bne _08115B48 - movs r0, 0 - b _08115B4A -_08115B48: - movs r0, 0x1 -_08115B4A: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8115A94 - - thumb_func_start sub_8115B58 -sub_8115B58: @ 8115B58 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r7, r0, 24 - movs r0, 0 - mov r8, r0 - movs r5, 0 - ldr r4, _08115D30 @ =gMain - ldrh r1, [r4, 0x2E] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08115B94 - movs r5, 0x1 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, _08115D34 @ =gTasks + 0x8 - adds r0, r1 - adds r0, 0x8 - movs r1, 0 - bl sub_8115A94 - lsls r0, 24 - cmp r0, 0 - bne _08115B94 - b _08115D20 -_08115B94: - ldrh r1, [r4, 0x2E] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08115BBA - movs r5, 0x1 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, _08115D34 @ =gTasks + 0x8 - adds r0, r1 - adds r0, 0x8 - movs r1, 0x1 - bl sub_8115A94 - lsls r0, 24 - cmp r0, 0 - bne _08115BBA - b _08115D20 -_08115BBA: - ldrh r1, [r4, 0x2E] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08115BE0 - movs r5, 0x1 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, _08115D34 @ =gTasks + 0x8 - adds r0, r1 - adds r0, 0x8 - movs r1, 0x2 - bl sub_8115A94 - lsls r0, 24 - cmp r0, 0 - bne _08115BE0 - b _08115D20 -_08115BE0: - ldrh r1, [r4, 0x2E] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _08115C06 - movs r5, 0x1 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, _08115D34 @ =gTasks + 0x8 - adds r0, r1 - adds r0, 0x8 - movs r1, 0x3 - bl sub_8115A94 - lsls r0, 24 - cmp r0, 0 - bne _08115C06 - b _08115D20 -_08115C06: - cmp r5, 0 - bne _08115C0C - b _08115D20 -_08115C0C: - ldr r0, _08115D38 @ =gTasks - lsls r6, r7, 2 - adds r4, r6, r7 - lsls r4, 3 - adds r4, r0 - ldrb r0, [r4, 0x10] - bl sub_8117158 - adds r0, r7, 0 - movs r1, 0 - bl sub_8115928 - mov r1, r8 - strh r1, [r4, 0xA] - movs r0, 0x5 - bl PlaySE - ldr r5, _08115D3C @ =gSharedMem + 0x190B8 - ldr r1, _08115D40 @ =0x0000ffff - adds r0, r5, 0 - bl sub_8124D3C - adds r3, r5, 0 - adds r3, 0xB8 - ldrb r2, [r3] - movs r1, 0x7F - adds r0, r1, 0 - ands r0, r2 - strb r0, [r3] - subs r3, 0xC - ldrb r2, [r3] - adds r0, r1, 0 - ands r0, r2 - strb r0, [r3] - adds r2, r5, 0 - adds r2, 0xA0 - ldrb r0, [r2] - ands r1, r0 - strb r1, [r2] - ldrb r0, [r4, 0x10] - bl sub_8116EF8 - movs r4, 0 - mov r12, r6 - ldr r6, _08115D44 @ =gSprites - movs r2, 0x7C - negs r2, r2 - adds r2, r5 - mov r10, r2 - movs r0, 0x8 - adds r0, r6 - mov r8, r0 - ldr r1, _08115D48 @ =0xfffffc00 - mov r9, r1 - ldr r2, _08115D4C @ =0x000003ff - adds r5, r2, 0 -_08115C7C: - adds r0, r4, 0 - adds r0, 0x29 - add r0, r10 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r3, r0, r6 - adds r2, r3, 0 - adds r2, 0x40 - add r0, r8 - ldr r0, [r0] - ldr r0, [r0] - ldrh r1, [r0] - ldrh r2, [r2] - adds r1, r2 - ands r1, r5 - ldrh r2, [r3, 0x4] - mov r0, r9 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bls _08115C7C - ldr r0, _08115D38 @ =gTasks - mov r2, r12 - adds r1, r2, r7 - lsls r1, 3 - adds r1, r0 - ldrh r3, [r1, 0x10] - subs r0, r3, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - bhi _08115D20 - ldr r2, _08115D50 @ =gUnknown_083F8C00 - movs r0, 0x10 - ldrsh r1, [r1, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, 0x8 - adds r0, r2 - ldr r2, _08115D54 @ =gSharedMem + 0x19000 - ldr r1, [r2, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _08115D20 - subs r0, r3, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - adds r0, r2, 0 - add r0, r8 - adds r0, 0x65 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08115D44 @ =gSprites - adds r3, r0, r1 - adds r2, r3, 0 - adds r2, 0x40 - adds r1, 0x8 - adds r0, r1 - ldr r0, [r0] - ldr r0, [r0] - ldrh r1, [r0, 0x4] - ldrh r2, [r2] - adds r1, r2 - ldr r2, _08115D4C @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - ldr r0, _08115D48 @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] -_08115D20: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08115D30: .4byte gMain -_08115D34: .4byte gTasks + 0x8 -_08115D38: .4byte gTasks -_08115D3C: .4byte gSharedMem + 0x190B8 -_08115D40: .4byte 0x0000ffff -_08115D44: .4byte gSprites -_08115D48: .4byte 0xfffffc00 -_08115D4C: .4byte 0x000003ff -_08115D50: .4byte gUnknown_083F8C00 -_08115D54: .4byte gSharedMem + 0x19000 - thumb_func_end sub_8115B58 - - thumb_func_start sub_8115D58 -sub_8115D58: @ 8115D58 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r1, _08115D70 @ =gSharedMem + 0x19000 - movs r0, 0xFF - strh r0, [r1, 0x28] - ldrb r0, [r1, 0x19] - cmp r0, 0x1 - bne _08115D74 - adds r2, r1, 0 - adds r2, 0x23 - b _08115D7A - .align 2, 0 -_08115D70: .4byte gSharedMem + 0x19000 -_08115D74: - adds r2, r1, 0 - adds r2, 0x23 - movs r0, 0 -_08115D7A: - strb r0, [r2] - adds r1, 0x21 - movs r0, 0 - strb r0, [r1] - ldr r1, _08115D98 @ =gTasks - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 3 - adds r0, r1 - movs r1, 0x20 - strh r1, [r0, 0xA] - ldr r1, _08115D9C @ =sub_8115ECC - str r1, [r0] - pop {r0} - bx r0 - .align 2, 0 -_08115D98: .4byte gTasks -_08115D9C: .4byte sub_8115ECC - thumb_func_end sub_8115D58 - - thumb_func_start sub_8115DA0 -sub_8115DA0: @ 8115DA0 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r4, _08115E08 @ =gSharedMem + 0x19000 - ldrb r2, [r4, 0x1A] - lsls r2, 28 - lsrs r2, 28 - adds r5, r4, 0 - adds r5, 0x1B - adds r2, r5 - ldr r3, _08115E0C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r6, r1, r3 - ldrh r0, [r6, 0x10] - strb r0, [r2] - ldrb r0, [r4, 0x1A] - lsls r0, 28 - lsrs r0, 28 - adds r0, r5 - ldrb r0, [r0] - bl sub_8117380 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0xC] - ldrb r0, [r4, 0x1A] - lsls r0, 28 - lsrs r0, 28 - adds r0, r5 - ldrb r0, [r0] - bl sub_811829C - ldrb r1, [r4, 0x19] - ldrh r0, [r6, 0x22] - subs r0, r1 - strh r0, [r6, 0x22] - lsls r0, 16 - cmp r0, 0 - bge _08115DF6 - movs r0, 0 - strh r0, [r6, 0x22] -_08115DF6: - ldrh r0, [r6, 0x22] - bl sub_81180F4 - ldr r0, _08115E10 @ =sub_8115D58 - str r0, [r6] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08115E08: .4byte gSharedMem + 0x19000 -_08115E0C: .4byte gTasks -_08115E10: .4byte sub_8115D58 - thumb_func_end sub_8115DA0 - - thumb_func_start sub_8115E14 -sub_8115E14: @ 8115E14 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - bl sub_8115B58 - ldr r1, _08115E3C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0x1E - beq _08115E4A - cmp r0, 0x1E - bgt _08115E40 - cmp r0, 0 - beq _08115E46 - b _08115E5E - .align 2, 0 -_08115E3C: .4byte gTasks -_08115E40: - cmp r0, 0x3B - beq _08115E58 - b _08115E5E -_08115E46: - ldrb r0, [r4, 0x10] - b _08115E4C -_08115E4A: - movs r0, 0 -_08115E4C: - bl sub_81157D0 - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - b _08115E6E -_08115E58: - movs r0, 0 - strh r0, [r4, 0xA] - b _08115E6E -_08115E5E: - ldr r0, _08115EA8 @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0xA] - adds r0, 0x1 - strh r0, [r1, 0xA] -_08115E6E: - ldr r0, _08115EAC @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08115EC2 - ldr r3, _08115EB0 @ =gSharedMem + 0x19000 - ldr r2, _08115EB4 @ =gUnknown_083F8C00 - ldr r1, _08115EA8 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r0, 0x10 - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, 0x8 - adds r0, r2 - ldr r1, [r3, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _08115EB8 - movs r0, 0x16 - bl PlaySE - b _08115EC2 - .align 2, 0 -_08115EA8: .4byte gTasks -_08115EAC: .4byte gMain -_08115EB0: .4byte gSharedMem + 0x19000 -_08115EB4: .4byte gUnknown_083F8C00 -_08115EB8: - movs r0, 0x5F - bl m4aSongNumStart - ldr r0, _08115EC8 @ =sub_8115DA0 - str r0, [r4] -_08115EC2: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08115EC8: .4byte sub_8115DA0 - thumb_func_end sub_8115E14 - - thumb_func_start sub_8115ECC -sub_8115ECC: @ 8115ECC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08115F20 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r0, [r4, 0xA] - subs r1, r0, 0x1 - strh r1, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - ble _08115F34 - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _08115EF8 - ldr r1, _08115F24 @ =gSpriteCoordOffsetX - ldrh r0, [r1] - adds r0, 0x2 - strh r0, [r1] -_08115EF8: - ldr r1, _08115F28 @ =gSharedMem + 0x19000 - ldrh r0, [r1, 0x26] - adds r0, 0x4 - strh r0, [r1, 0x26] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x68 - bne _08115F4C - ldr r2, _08115F2C @ =gSprites - adds r0, r1, 0 - adds r0, 0x55 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, _08115F30 @ =SpriteCallbackDummy - str r1, [r0] - b _08115F4C - .align 2, 0 -_08115F20: .4byte gTasks -_08115F24: .4byte gSpriteCoordOffsetX -_08115F28: .4byte gSharedMem + 0x19000 -_08115F2C: .4byte gSprites -_08115F30: .4byte SpriteCallbackDummy -_08115F34: - movs r0, 0x1 - movs r1, 0xFF - bl sub_8117AA8 - movs r0, 0x1 - movs r1, 0xFF - bl sub_8117C60 - ldr r0, _08115F54 @ =sub_8116100 - str r0, [r4] - movs r0, 0 - strh r0, [r4, 0xA] -_08115F4C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08115F54: .4byte sub_8116100 - thumb_func_end sub_8115ECC - - thumb_func_start sub_8115F58 -sub_8115F58: @ 8115F58 - push {r4,lr} - lsls r0, 16 - lsrs r3, r0, 16 - lsls r1, 16 - lsrs r1, 16 - ldr r0, _08115F74 @ =gSharedMem + 0x19000 - ldrb r2, [r0, 0x2] - adds r4, r0, 0 - cmp r2, 0x2 - bgt _08115F78 - cmp r2, 0x1 - bge _08115F7E - b _08116048 - .align 2, 0 -_08115F74: .4byte gSharedMem + 0x19000 -_08115F78: - cmp r2, 0x3 - beq _08115FE0 - b _08116048 -_08115F7E: - ldr r0, _08115FA8 @ =gLocalTime - ldrb r0, [r0, 0x2] - subs r0, 0x4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bhi _08115FB0 - cmp r3, 0xB - bls _08115F98 - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0811605E -_08115F98: - ldr r0, _08115FAC @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - lsrs r0, 1 - b _081160F4 - .align 2, 0 -_08115FA8: .4byte gLocalTime -_08115FAC: .4byte gUnknown_083F8DF4 -_08115FB0: - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08115FCC - ldr r0, _08115FC8 @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - lsrs r0, 1 - b _081160F4 - .align 2, 0 -_08115FC8: .4byte gUnknown_083F8DF4 -_08115FCC: - ldr r0, _08115FDC @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - b _081160F4 - .align 2, 0 -_08115FDC: .4byte gUnknown_083F8DF4 -_08115FE0: - ldr r0, _0811600C @ =gLocalTime - ldrb r0, [r0, 0x2] - subs r0, 0x4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x6 - bhi _08116014 - cmp r3, 0x5 - bls _08115FFA - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0811605E -_08115FFA: - ldr r0, _08116010 @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - lsrs r0, 1 - b _081160F4 - .align 2, 0 -_0811600C: .4byte gLocalTime -_08116010: .4byte gUnknown_083F8DF4 -_08116014: - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08116034 - cmp r3, 0x6 - bls _08116034 - ldr r0, _08116030 @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - lsrs r0, 2 - b _081160F4 - .align 2, 0 -_08116030: .4byte gUnknown_083F8DF4 -_08116034: - ldr r0, _08116044 @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - lsrs r0, 1 - b _081160F4 - .align 2, 0 -_08116044: .4byte gUnknown_083F8DF4 -_08116048: - ldr r0, _08116064 @ =gLocalTime - ldrb r0, [r0, 0x2] - subs r0, 0x4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bhi _0811607C - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08116068 -_0811605E: - movs r0, 0x1 - b _081160F4 - .align 2, 0 -_08116064: .4byte gLocalTime -_08116068: - ldr r0, _08116078 @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - lsrs r0, 1 - b _081160F4 - .align 2, 0 -_08116078: .4byte gUnknown_083F8DF4 -_0811607C: - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _081160B0 - cmp r3, 0xC - bls _0811609C - ldr r0, _08116098 @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - lsrs r0, 1 - b _081160F4 - .align 2, 0 -_08116098: .4byte gUnknown_083F8DF4 -_0811609C: - ldr r0, _081160AC @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - b _081160F4 - .align 2, 0 -_081160AC: .4byte gUnknown_083F8DF4 -_081160B0: - movs r0, 0x80 - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _081160E4 - cmp r3, 0xC - bls _081160D0 - ldr r0, _081160CC @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x2] - b _081160F4 - .align 2, 0 -_081160CC: .4byte gUnknown_083F8DF4 -_081160D0: - ldr r0, _081160E0 @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x1] - b _081160F4 - .align 2, 0 -_081160E0: .4byte gUnknown_083F8DF4 -_081160E4: - ldr r0, _081160FC @ =gUnknown_083F8DF4 - ldrb r1, [r4, 0x4] - lsls r1, 30 - lsrs r1, 25 - adds r1, r0 - ldrb r0, [r1, 0x1] - lsls r0, 25 - lsrs r0, 24 -_081160F4: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081160FC: .4byte gUnknown_083F8DF4 - thumb_func_end sub_8115F58 - - thumb_func_start sub_8116100 -sub_8116100: @ 8116100 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - movs r4, 0 - ldr r1, _08116188 @ =gUnknown_083F8ECE - mov r0, sp - movs r2, 0x8 - bl memcpy - bl Random - lsls r0, 16 - lsrs r7, r0, 16 - adds r0, r7, 0 - movs r1, 0x64 - bl __umodsi3 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r3, _0811618C @ =gSharedMem + 0x19000 - ldr r1, _08116190 @ =gTasks - mov r2, r9 - lsls r0, r2, 2 - add r0, r9 - lsls r0, 3 - adds r0, r1 - ldrh r2, [r0, 0x14] - adds r1, r3, 0 - adds r1, 0x7C - strb r2, [r1] - adds r1, 0x3 - strb r4, [r1] - subs r1, 0x1 - strb r4, [r1] - subs r1, 0x1 - strb r4, [r1] - ldrh r0, [r0, 0x18] - adds r1, r7, 0 - bl sub_8115F58 - adds r4, r0, 0 - lsls r4, 24 - lsrs r1, r4, 24 - adds r0, r7, 0 - bl __modsi3 - lsrs r4, 25 - subs r0, r4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _08116194 @ =gLocalTime - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - movs r5, 0x1 - cmp r0, 0xC - bgt _08116180 - movs r5, 0 -_08116180: - cmp r6, 0x4F - bhi _08116198 - lsls r0, r5, 25 - b _081161A2 - .align 2, 0 -_08116188: .4byte gUnknown_083F8ECE -_0811618C: .4byte gSharedMem + 0x19000 -_08116190: .4byte gTasks -_08116194: .4byte gLocalTime -_08116198: - lsls r1, r5, 24 - asrs r1, 24 - movs r0, 0x1 - subs r0, r1 - lsls r0, 25 -_081161A2: - lsrs r5, r0, 24 - ldr r6, _081162D8 @ =gSharedMem + 0x19000 - ldrb r0, [r6, 0x4] - lsls r0, 30 - mov r10, r0 - lsrs r0, 25 - ldr r1, _081162DC @ =gUnknown_083F8DF4 - adds r0, r1 - lsls r4, 24 - asrs r4, 24 - ldrh r0, [r0, 0x1A] - adds r4, r0 - adds r0, r6, 0 - adds r0, 0x80 - strh r4, [r0] - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _081161D4 - ldr r1, _081162E0 @ =0x47800000 - bl __addsf3 -_081161D4: - ldr r1, _081162E4 @ =0x40a00000 - bl __divsf3 - bl __fixunssfsi - lsls r0, 16 - lsrs r4, r0, 16 - lsls r0, r4, 1 - adds r0, r4 - mov r8, r0 - adds r0, r6, 0 - adds r0, 0x82 - mov r2, r8 - strh r2, [r0] - adds r0, 0x2 - strh r4, [r0] - adds r0, 0x2 - strh r4, [r0] - movs r0, 0x1 - ands r0, r7 - lsls r1, r5, 24 - asrs r1, 24 - adds r0, r1 - lsls r0, 1 - add r0, sp - movs r1, 0 - ldrsh r4, [r0, r1] - adds r0, r4, 0 - bl __floatsisf - cmp r4, 0 - bge _0811621A - ldr r1, _081162E0 @ =0x47800000 - bl __addsf3 -_0811621A: - ldr r2, _081162E8 @ =gSharedMem + 0x19088 - str r0, [r2] - adds r7, r6, 0 - adds r7, 0x8C - mov r1, r10 - lsrs r0, r1, 25 - ldr r2, _081162DC @ =gUnknown_083F8DF4 - adds r0, r2 - movs r1, 0x18 - ldrsh r4, [r0, r1] - adds r0, r4, 0 - bl __floatsisf - adds r5, r0, 0 - cmp r4, 0 - bge _08116242 - ldr r1, _081162E0 @ =0x47800000 - bl __addsf3 - adds r5, r0, 0 -_08116242: - str r5, [r7] - adds r7, r6, 0 - adds r7, 0x90 - ldr r1, _081162EC @ =0x3f000000 - adds r0, r5, 0 - bl __mulsf3 - adds r1, r5, 0 - bl __subsf3 - adds r5, r0, 0 - mov r2, r8 - lsls r0, r2, 16 - asrs r4, r0, 16 - adds r0, r4, 0 - bl __floatsisf - adds r2, r0, 0 - cmp r4, 0 - bge _08116272 - ldr r1, _081162E0 @ =0x47800000 - bl __addsf3 - adds r2, r0, 0 -_08116272: - adds r0, r5, 0 - adds r1, r2, 0 - bl __divsf3 - str r0, [r7] - adds r1, r6, 0 - adds r1, 0x94 - ldr r0, _081162F0 @ =0x42880000 - str r0, [r1] - adds r1, 0x8 - ldr r0, _081162F4 @ =0x00000000 - str r0, [r1] - adds r5, r6, 0 - adds r5, 0x98 - adds r0, r4, 0 - bl __floatsisf - adds r2, r0, 0 - cmp r4, 0 - bge _081162A2 - ldr r1, _081162E0 @ =0x47800000 - bl __addsf3 - adds r2, r0, 0 -_081162A2: - ldr r0, _081162F8 @ =0x41000000 - adds r1, r2, 0 - bl __divsf3 - bl __negsf2 - str r0, [r5] - adds r1, r6, 0 - adds r1, 0xA0 - ldr r0, _081162FC @ =0x42100000 - str r0, [r1] - ldr r1, _08116300 @ =gTasks - mov r2, r9 - lsls r0, r2, 2 - add r0, r9 - lsls r0, 3 - adds r0, r1 - ldr r1, _08116304 @ =sub_8116308 - str r1, [r0] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081162D8: .4byte gSharedMem + 0x19000 -_081162DC: .4byte gUnknown_083F8DF4 -_081162E0: .4byte 0x47800000 -_081162E4: .4byte 0x40a00000 -_081162E8: .4byte gSharedMem + 0x19088 -_081162EC: .4byte 0x3f000000 -_081162F0: .4byte 0x42880000 -_081162F4: .4byte 0x00000000 -_081162F8: .4byte 0x41000000 -_081162FC: .4byte 0x42100000 -_08116300: .4byte gTasks -_08116304: .4byte sub_8116308 - thumb_func_end sub_8116100 - - thumb_func_start sub_8116308 -sub_8116308: @ 8116308 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, _08116368 @ =gSharedMem + 0x19000 - ldrb r1, [r3, 0x3] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r3, 0x3] - adds r2, r3, 0 - adds r2, 0x7C - adds r1, r3, 0 - adds r1, 0x3C - ldrb r2, [r2] - adds r1, r2 - ldrb r2, [r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r2, _0811636C @ =gSprites - adds r1, r2 - str r1, [r3, 0x38] - ldr r2, _08116370 @ =sub_81191F4 - str r2, [r1, 0x1C] - ldr r1, _08116374 @ =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - ldrh r1, [r4, 0x14] - adds r1, 0x1 - strh r1, [r4, 0x14] - ldrh r0, [r4, 0x18] - adds r0, 0x1 - strh r0, [r4, 0x18] - movs r0, 0x6 - subs r0, r1 - lsls r0, 24 - lsrs r0, 24 - bl sub_81182F8 - movs r0, 0x5C - bl m4aSongNumStart - ldr r0, _08116378 @ =sub_811637C - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08116368: .4byte gSharedMem + 0x19000 -_0811636C: .4byte gSprites -_08116370: .4byte sub_81191F4 -_08116374: .4byte gTasks -_08116378: .4byte sub_811637C - thumb_func_end sub_8116308 - - thumb_func_start sub_811637C -sub_811637C: @ 811637C - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r4, _081163B0 @ =gSharedMem + 0x19000 - adds r0, r4, 0 - adds r0, 0x7D - ldrb r0, [r0] - cmp r0, 0 - beq _08116464 - ldrb r1, [r4, 0x3] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _081163B4 - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08116464 - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r4, 0x3] - b _08116464 - .align 2, 0 -_081163B0: .4byte gSharedMem + 0x19000 -_081163B4: - ldr r2, _08116428 @ =gTasks - lsls r1, r5, 2 - adds r0, r1, r5 - lsls r0, 3 - adds r6, r0, r2 - movs r2, 0xA - ldrsh r0, [r6, r2] - adds r7, r1, 0 - cmp r0, 0 - bne _08116400 - adds r0, r4, 0 - adds r0, 0x7E - ldrb r1, [r0] - adds r0, r5, 0 - bl sub_8116D54 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r4, 0x1A] - lsls r1, 28 - lsrs r1, 28 - adds r2, r4, 0 - adds r2, 0x1B - adds r1, r2 - ldrb r1, [r1] - bl sub_8116E5C - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x12] - cmp r0, 0x1 - bne _08116400 - adds r0, r4, 0 - adds r0, 0xB8 - movs r1, 0x80 - lsls r1, 5 - bl sub_8124CE8 -_08116400: - ldr r0, _08116428 @ =gTasks - adds r1, r7, r5 - lsls r1, 3 - adds r4, r1, r0 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0x3C - bgt _08116430 - ldr r0, _0811642C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08116420 - movs r0, 0x3C - strh r0, [r4, 0xA] -_08116420: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - b _08116464 - .align 2, 0 -_08116428: .4byte gTasks -_0811642C: .4byte gMain -_08116430: - ldr r1, _0811646C @ =gSharedMem + 0x19000 - ldrb r0, [r1, 0x1A] - lsls r0, 28 - lsrs r0, 28 - adds r1, 0x1B - adds r0, r1 - ldrb r0, [r0] - bl sub_8117158 - ldrh r1, [r4, 0x20] - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - bl sub_8117AA8 - ldrb r1, [r4, 0x14] - subs r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - bl sub_8117C60 - movs r0, 0x20 - strh r0, [r4, 0xA] - ldr r0, _08116470 @ =sub_8116474 - str r0, [r4] -_08116464: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811646C: .4byte gSharedMem + 0x19000 -_08116470: .4byte sub_8116474 - thumb_func_end sub_811637C - - thumb_func_start sub_8116474 -sub_8116474: @ 8116474 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _081164C8 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0xA] - subs r1, r0, 0x1 - strh r1, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - ble _081164DC - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x2 - ble _081164A0 - ldr r1, _081164CC @ =gSpriteCoordOffsetX - ldrh r0, [r1] - subs r0, 0x2 - strh r0, [r1] -_081164A0: - ldr r1, _081164D0 @ =gSharedMem + 0x19000 - ldrh r0, [r1, 0x26] - subs r0, 0x4 - strh r0, [r1, 0x26] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x68 - bne _08116504 - ldr r2, _081164D4 @ =gSprites - adds r0, r1, 0 - adds r0, 0x55 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, _081164D8 @ =sub_81184CC - str r1, [r0] - b _08116504 - .align 2, 0 -_081164C8: .4byte gTasks -_081164CC: .4byte gSpriteCoordOffsetX -_081164D0: .4byte gSharedMem + 0x19000 -_081164D4: .4byte gSprites -_081164D8: .4byte sub_81184CC -_081164DC: - ldrh r0, [r4, 0x20] - lsls r0, 24 - lsrs r0, 24 - bl sub_8117D68 - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _081164F2 - movs r0, 0x79 - b _081164F4 -_081164F2: - movs r0, 0x3D -_081164F4: - strh r0, [r4, 0xA] - ldr r0, _0811650C @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldr r0, _08116510 @ =sub_8116514 - str r0, [r1] -_08116504: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811650C: .4byte gTasks -_08116510: .4byte sub_8116514 - thumb_func_end sub_8116474 - - thumb_func_start sub_8116514 -sub_8116514: @ 8116514 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _08116564 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0xA] - subs r1, r0, 0x1 - strh r1, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _08116584 - movs r0, 0xA - ldrsh r1, [r4, r0] - adds r0, r1, 0 - cmp r1, 0 - bge _0811653E - adds r0, 0xF -_0811653E: - asrs r0, 4 - lsls r0, 4 - subs r0, r1, r0 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - beq _08116568 - cmp r0, 0x8 - bne _08116590 - movs r0, 0 - movs r1, 0xFF - bl sub_8117AA8 - movs r0, 0 - movs r1, 0xFF - bl sub_8117C60 - b _08116590 - .align 2, 0 -_08116564: .4byte gTasks -_08116568: - ldrh r1, [r4, 0x20] - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - bl sub_8117AA8 - ldrb r1, [r4, 0x14] - subs r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - bl sub_8117C60 - b _08116590 -_08116584: - ldr r1, _08116598 @ =sub_8116638 - adds r0, r2, 0 - movs r2, 0x1E - movs r3, 0 - bl sub_8116C34 -_08116590: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08116598: .4byte sub_8116638 - thumb_func_end sub_8116514 - - thumb_func_start sub_811659C -sub_811659C: @ 811659C - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _081165F4 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08116600 - cmp r0, 0 - blt _08116600 - cmp r0, 0x2 - bgt _08116600 - bl IsFanfareTaskInactive - lsls r0, 24 - cmp r0, 0 - beq _08116624 - movs r0, 0x1D - bl GetGameStat - ldrh r1, [r4, 0x1E] - adds r1, 0x1 - strh r1, [r4, 0x1E] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - bcs _081165E4 - movs r0, 0x1E - ldrsh r1, [r4, r0] - movs r0, 0x1D - bl SetGameStat -_081165E4: - ldr r1, _081165F8 @ =sub_811677C - ldr r2, _081165FC @ =0x0000ffff - adds r0, r5, 0 - movs r3, 0x3 - bl sub_8116C34 - b _08116624 - .align 2, 0 -_081165F4: .4byte gTasks -_081165F8: .4byte sub_811677C -_081165FC: .4byte 0x0000ffff -_08116600: - bl IsSEPlaying - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0 - bne _08116624 - ldr r1, _0811662C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - strh r2, [r0, 0x1E] - ldr r1, _08116630 @ =sub_81167F4 - ldr r2, _08116634 @ =0x0000ffff - adds r0, r5, 0 - movs r3, 0x3 - bl sub_8116C34 -_08116624: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811662C: .4byte gTasks -_08116630: .4byte sub_81167F4 -_08116634: .4byte 0x0000ffff - thumb_func_end sub_811659C - - thumb_func_start sub_8116638 -sub_8116638: @ 8116638 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _08116678 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r2, 0x12 - ldrsh r1, [r0, r2] - cmp r1, 0 - beq _081166A8 - cmp r1, 0 - blt _081166A8 - cmp r1, 0x2 - bgt _081166A8 - movs r1, 0xC - ldrsh r0, [r0, r1] - cmp r0, 0xC - bne _08116684 - ldr r0, _0811667C @ =0x00000185 - bl PlayFanfare - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _08116680 @ =gUnknown_081C41A5 - b _0811669A - .align 2, 0 -_08116678: .4byte gTasks -_0811667C: .4byte 0x00000185 -_08116680: .4byte gUnknown_081C41A5 -_08116684: - movs r0, 0xC3 - lsls r0, 1 - bl PlayFanfare - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _081166A4 @ =gUnknown_081C4199 -_0811669A: - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - b _081166C4 - .align 2, 0 -_081166A4: .4byte gUnknown_081C4199 -_081166A8: - movs r0, 0x20 - bl m4aSongNumStart - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _081166DC @ =gUnknown_081C41AE - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint -_081166C4: - ldr r1, _081166E0 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r1, 0 - strh r1, [r0, 0xA] - ldr r1, _081166E4 @ =sub_811659C - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081166DC: .4byte gUnknown_081C41AE -_081166E0: .4byte gTasks -_081166E4: .4byte sub_811659C - thumb_func_end sub_8116638 - - thumb_func_start sub_81166E8 -sub_81166E8: @ 81166E8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, _0811670C @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r4, r0, r1 - movs r0, 0x16 - ldrsh r5, [r4, r0] - cmp r5, 0 - beq _08116710 - cmp r5, 0x3 - beq _08116740 - ldrh r0, [r4, 0x16] - adds r0, 0x1 - b _08116748 - .align 2, 0 -_0811670C: .4byte gTasks -_08116710: - ldrh r0, [r4, 0x22] - adds r0, 0x1 - strh r0, [r4, 0x22] - movs r0, 0x15 - bl m4aSongNumStart - ldrh r0, [r4, 0x22] - bl sub_81180F4 - movs r2, 0x22 - ldrsh r1, [r4, r2] - ldr r0, _08116730 @ =0x0000270e - cmp r1, r0 - ble _08116734 - strh r5, [r4, 0xA] - b _0811674A - .align 2, 0 -_08116730: .4byte 0x0000270e -_08116734: - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0x16] - adds r0, 0x1 - b _08116748 -_08116740: - movs r0, 0x15 - bl m4aSongNumStop - movs r0, 0 -_08116748: - strh r0, [r4, 0x16] -_0811674A: - ldr r0, _08116770 @ =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r1, r0 - movs r2, 0xA - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _08116768 - ldr r1, _08116774 @ =sub_81167F4 - ldr r2, _08116778 @ =0x0000ffff - adds r0, r6, 0 - movs r3, 0x3 - bl sub_8116C34 -_08116768: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08116770: .4byte gTasks -_08116774: .4byte sub_81167F4 -_08116778: .4byte 0x0000ffff - thumb_func_end sub_81166E8 - - thumb_func_start sub_811677C -sub_811677C: @ 811677C - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, _081167DC @ =gStringVar1 - ldr r6, _081167E0 @ =gSharedMem + 0x19000 - ldrb r2, [r6, 0x19] - ldr r1, _081167E4 @ =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - movs r1, 0xC - ldrsh r0, [r4, r1] - adds r1, r2, 0 - muls r1, r0 - adds r0, r3, 0 - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - ldr r5, _081167E8 @ =gStringVar4 - ldr r1, _081167EC @ =gUnknown_081C41BD - adds r0, r5, 0 - bl StringExpandPlaceholders - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - adds r0, r5, 0 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldrb r1, [r6, 0x19] - movs r2, 0xC - ldrsh r0, [r4, r2] - muls r0, r1 - movs r1, 0 - strh r0, [r4, 0xA] - strh r1, [r4, 0x16] - ldr r0, _081167F0 @ =sub_81166E8 - str r0, [r4] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081167DC: .4byte gStringVar1 -_081167E0: .4byte gSharedMem + 0x19000 -_081167E4: .4byte gTasks -_081167E8: .4byte gStringVar4 -_081167EC: .4byte gUnknown_081C41BD -_081167F0: .4byte sub_81166E8 - thumb_func_end sub_811677C - - thumb_func_start sub_81167F4 -sub_81167F4: @ 81167F4 - push {r4-r6,lr} - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r4, _08116868 @ =gSharedMem + 0x190B8 - ldr r1, _0811686C @ =0x0000ffff - adds r0, r4, 0 - bl sub_8124D3C - adds r3, r4, 0 - adds r3, 0xB8 - ldrb r2, [r3] - movs r1, 0x7F - adds r0, r1, 0 - ands r0, r2 - strb r0, [r3] - subs r3, 0xC - ldrb r2, [r3] - adds r0, r1, 0 - ands r0, r2 - strb r0, [r3] - adds r2, r4, 0 - adds r2, 0xA0 - ldrb r0, [r2] - ands r1, r0 - strb r1, [r2] - ldr r6, _08116870 @ =gSprites - ldr r2, _08116874 @ =gUnknown_083F8C00 - ldr r0, _08116878 @ =gTasks - lsls r3, r5, 2 - adds r3, r5 - lsls r3, 3 - adds r3, r0 - movs r0, 0x20 - ldrsh r1, [r3, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0] - adds r4, r0 - subs r4, 0x75 - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldr r0, _0811687C @ =sub_8116880 - str r0, [r3] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08116868: .4byte gSharedMem + 0x190B8 -_0811686C: .4byte 0x0000ffff -_08116870: .4byte gSprites -_08116874: .4byte gUnknown_083F8C00 -_08116878: .4byte gTasks -_0811687C: .4byte sub_8116880 - thumb_func_end sub_81167F4 - - thumb_func_start sub_8116880 -sub_8116880: @ 8116880 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r6, r0, 24 - movs r5, 0 - ldr r1, _08116954 @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r1 - movs r2, 0 - strh r5, [r0, 0x10] - ldr r4, _08116958 @ =gSharedMem + 0x19000 - ldrb r0, [r4, 0x1A] - lsls r0, 28 - lsrs r0, 28 - adds r1, r4, 0 - adds r1, 0x1B - adds r0, r1 - strb r2, [r0] - movs r0, 0 - bl sub_8117158 - ldr r3, _0811695C @ =gSprites - adds r0, r4, 0 - adds r0, 0x6C - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - adds r7, r3, 0 - movs r0, 0x3C - adds r0, r4 - mov r10, r0 - movs r1, 0x8 - adds r1, r7 - mov r8, r1 - ldr r0, _08116960 @ =0xfffffc00 - mov r9, r0 - ldr r1, _08116964 @ =0x000003ff - mov r12, r1 -_081168E4: - adds r0, r5, 0 - adds r0, 0x29 - add r0, r10 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r3, r0, r7 - adds r2, r3, 0 - adds r2, 0x40 - add r0, r8 - ldr r0, [r0] - ldr r0, [r0] - ldrh r1, [r0] - ldrh r2, [r2] - adds r1, r2 - mov r0, r12 - ands r1, r0 - ldrh r2, [r3, 0x4] - mov r0, r9 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bls _081168E4 - ldr r0, _08116954 @ =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r2, r1, r0 - movs r1, 0x22 - ldrsh r0, [r2, r1] - ldrb r4, [r4, 0x19] - cmp r0, r4 - blt _081169BC - movs r1, 0x14 - ldrsh r0, [r2, r1] - cmp r0, 0x6 - bne _08116970 - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _08116968 @ =gUnknown_081C41F1 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _0811696C @ =dp01t_12_3_battle_menu - b _08116992 - .align 2, 0 -_08116954: .4byte gTasks -_08116958: .4byte gSharedMem + 0x19000 -_0811695C: .4byte gSprites -_08116960: .4byte 0xfffffc00 -_08116964: .4byte 0x000003ff -_08116968: .4byte gUnknown_081C41F1 -_0811696C: .4byte dp01t_12_3_battle_menu -_08116970: - movs r0, 0x22 - ldrsh r1, [r2, r0] - ldr r0, _081169A0 @ =0x0000270f - cmp r1, r0 - bne _081169B0 - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _081169A4 @ =gUnknown_081C4231 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _081169A8 @ =sub_8115734 -_08116992: - ldr r2, _081169AC @ =0x0000ffff - adds r0, r6, 0 - movs r3, 0x3 - bl sub_8116C34 - b _081169DE - .align 2, 0 -_081169A0: .4byte 0x0000270f -_081169A4: .4byte gUnknown_081C4231 -_081169A8: .4byte sub_8115734 -_081169AC: .4byte 0x0000ffff -_081169B0: - ldr r0, _081169B8 @ =sub_8115734 - str r0, [r2] - b _081169DE - .align 2, 0 -_081169B8: .4byte sub_8115734 -_081169BC: - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _081169EC @ =gUnknown_081C41D2 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _081169F0 @ =sub_81157AC - adds r0, r6, 0 - movs r2, 0x3C - movs r3, 0x3 - bl sub_8116C34 -_081169DE: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081169EC: .4byte gUnknown_081C41D2 -_081169F0: .4byte sub_81157AC - thumb_func_end sub_8116880 - - thumb_func_start dp01t_12_3_battle_menu -dp01t_12_3_battle_menu: @ 81169F4 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - ldr r1, _08116A84 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - strh r4, [r0, 0x14] - adds r0, r5, 0 - bl sub_8116CAC - bl sub_8116CF8 - bl sub_81185E8 - movs r0, 0 - bl sub_8117158 - movs r0, 0x6 - bl sub_81182F8 - ldr r7, _08116A88 @ =gSprites - ldr r3, _08116A8C @ =gSharedMem + 0x1903C - movs r6, 0x5 - negs r6, r6 -_08116A2A: - adds r0, r4, 0x7 - adds r0, r3 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - adds r1, 0x3E - ldrb r2, [r1] - adds r0, r6, 0 - ands r0, r2 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xB - bls _08116A2A - ldr r1, _08116A84 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r2, r0, r1 - movs r0, 0x22 - ldrsh r1, [r2, r0] - ldr r0, _08116A90 @ =0x0000270f - cmp r1, r0 - bne _08116AA0 - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _08116A94 @ =gUnknown_081C4231 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _08116A98 @ =sub_8115734 - ldr r2, _08116A9C @ =0x0000ffff - adds r0, r5, 0 - movs r3, 0x3 - bl sub_8116C34 - b _08116AA4 - .align 2, 0 -_08116A84: .4byte gTasks -_08116A88: .4byte gSprites -_08116A8C: .4byte gSharedMem + 0x1903C -_08116A90: .4byte 0x0000270f -_08116A94: .4byte gUnknown_081C4231 -_08116A98: .4byte sub_8115734 -_08116A9C: .4byte 0x0000ffff -_08116AA0: - ldr r0, _08116AAC @ =sub_8115734 - str r0, [r2] -_08116AA4: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08116AAC: .4byte sub_8115734 - thumb_func_end dp01t_12_3_battle_menu - - thumb_func_start sub_8116AB0 -sub_8116AB0: @ 8116AB0 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r4, _08116AF0 @ =gSharedMem + 0x190B8 - ldr r1, _08116AF4 @ =0x0000ffff - adds r0, r4, 0 - bl sub_8124D3C - adds r0, r4, 0 - bl sub_8124918 - ldr r1, _08116AF8 @ =gSaveBlock1 - ldr r2, _08116AFC @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r2 - ldrh r0, [r0, 0x22] - ldr r2, _08116B00 @ =0x00000494 - adds r1, r2 - strh r0, [r1] - subs r4, 0xB8 - lsls r0, 16 - lsrs r0, 16 - ldrb r4, [r4, 0x19] - cmp r0, r4 - bcs _08116B08 - ldr r1, _08116B04 @ =gSpecialVar_0x8004 - movs r0, 0x1 - b _08116B0C - .align 2, 0 -_08116AF0: .4byte gSharedMem + 0x190B8 -_08116AF4: .4byte 0x0000ffff -_08116AF8: .4byte gSaveBlock1 -_08116AFC: .4byte gTasks -_08116B00: .4byte 0x00000494 -_08116B04: .4byte gSpecialVar_0x8004 -_08116B08: - ldr r1, _08116B34 @ =gSpecialVar_0x8004 - movs r0, 0 -_08116B0C: - strh r0, [r1] - movs r0, 0 - str r0, [sp] - movs r0, 0xFF - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginHardwarePaletteFade - ldr r1, _08116B38 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldr r1, _08116B3C @ =sub_8116B40 - str r1, [r0] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08116B34: .4byte gSpecialVar_0x8004 -_08116B38: .4byte gTasks -_08116B3C: .4byte sub_8116B40 - thumb_func_end sub_8116AB0 - - thumb_func_start sub_8116B40 -sub_8116B40: @ 8116B40 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - bl UpdatePaletteFade - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _08116B9E - movs r0, 0 - bl SetVBlankCallback - ldr r0, _08116BA4 @ =gSharedMem + 0x19000 - movs r2, 0xBE - lsls r2, 1 - movs r1, 0 - bl memset - ldr r1, _08116BA8 @ =gSpriteCoordOffsetX - ldr r0, _08116BAC @ =gSpriteCoordOffsetY - strh r4, [r0] - strh r4, [r1] - bl sub_80F9368 - bl FreeAllSpritePalettes - bl ResetPaletteFade - bl ResetSpriteData - bl sub_80F9020 - ldr r0, _08116BB0 @ =REG_BLDCNT - strh r4, [r0] - adds r0, 0x2 - strh r4, [r0] - adds r0, 0x2 - strh r4, [r0] - ldr r1, _08116BB4 @ =gFieldCallback - ldr r0, _08116BB8 @ =sub_8080990 - str r0, [r1] - ldr r0, _08116BBC @ =c2_exit_to_overworld_2_switch - bl SetMainCallback2 - adds r0, r5, 0 - bl DestroyTask -_08116B9E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08116BA4: .4byte gSharedMem + 0x19000 -_08116BA8: .4byte gSpriteCoordOffsetX -_08116BAC: .4byte gSpriteCoordOffsetY -_08116BB0: .4byte REG_BLDCNT -_08116BB4: .4byte gFieldCallback -_08116BB8: .4byte sub_8080990 -_08116BBC: .4byte c2_exit_to_overworld_2_switch - thumb_func_end sub_8116B40 - - thumb_func_start sub_8116BC0 -sub_8116BC0: @ 8116BC0 - push {r4-r7,lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _08116C24 @ =gSharedMem + 0x19000 - adds r7, r0, 0 - adds r7, 0xA8 - ldrh r1, [r7] - adds r6, r0, 0 - cmp r1, 0 - beq _08116BE4 - ldr r0, _08116C28 @ =gMain - adds r2, r6, 0 - adds r2, 0xAA - ldrh r1, [r0, 0x2E] - ldrh r0, [r2] - ands r0, r1 - cmp r0, 0 - beq _08116C0E -_08116BE4: - ldr r1, _08116C2C @ =gTasks - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 3 - adds r0, r1 - adds r5, r6, 0 - adds r5, 0xAC - ldr r1, [r5] - str r1, [r0] - adds r4, r6, 0 - adds r4, 0xAA - ldrh r0, [r4] - cmp r0, 0 - beq _08116C06 - movs r0, 0x5 - bl PlaySE -_08116C06: - movs r0, 0 - str r0, [r5] - strh r0, [r4] - strh r0, [r7] -_08116C0E: - adds r2, r6, 0 - adds r2, 0xA8 - ldrh r1, [r2] - ldr r0, _08116C30 @ =0x0000ffff - cmp r1, r0 - beq _08116C1E - subs r0, r1, 0x1 - strh r0, [r2] -_08116C1E: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08116C24: .4byte gSharedMem + 0x19000 -_08116C28: .4byte gMain -_08116C2C: .4byte gTasks -_08116C30: .4byte 0x0000ffff - thumb_func_end sub_8116BC0 - - thumb_func_start sub_8116C34 -sub_8116C34: @ 8116C34 - push {r4-r7,lr} - adds r5, r1, 0 - lsls r0, 24 - lsrs r6, r0, 24 - lsls r2, 16 - lsrs r4, r2, 16 - lsls r3, 16 - lsrs r3, 16 - ldr r0, _08116C84 @ =gSharedMem + 0x19000 - mov r12, r0 - mov r2, r12 - adds r2, 0xB4 - ldr r1, _08116C88 @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r1 - ldr r0, [r0] - str r0, [r2] - mov r2, r12 - adds r7, r1, 0 - cmp r5, 0 - bne _08116C64 - adds r5, r0, 0 -_08116C64: - adds r0, r2, 0 - adds r0, 0xAC - str r5, [r0] - subs r0, 0x4 - strh r4, [r0] - ldr r0, _08116C8C @ =0x0000ffff - cmp r4, r0 - bne _08116C90 - cmp r3, 0 - bne _08116C90 - adds r1, r2, 0 - adds r1, 0xAA - ldrh r0, [r1] - orrs r4, r0 - strh r4, [r1] - b _08116C96 - .align 2, 0 -_08116C84: .4byte gSharedMem + 0x19000 -_08116C88: .4byte gTasks -_08116C8C: .4byte 0x0000ffff -_08116C90: - adds r0, r2, 0 - adds r0, 0xAA - strh r3, [r0] -_08116C96: - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r7 - ldr r1, _08116CA8 @ =sub_8116BC0 - str r1, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08116CA8: .4byte sub_8116BC0 - thumb_func_end sub_8116C34 - - thumb_func_start sub_8116CAC -sub_8116CAC: @ 8116CAC - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r2, 0 - ldr r0, _08116CF0 @ =gSharedMem + 0x19000 - strb r2, [r0] - movs r1, 0 - strb r1, [r0, 0x3] - adds r3, r0, 0 - ldr r6, _08116CF4 @ =gTasks - adds r4, r3, 0 - adds r4, 0x1B -_08116CC4: - adds r0, r2, r4 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x5 - bls _08116CC4 - ldrb r1, [r3, 0x1A] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - strb r0, [r3, 0x1A] - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r6 - movs r1, 0 - strh r1, [r0, 0xA] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08116CF0: .4byte gSharedMem + 0x19000 -_08116CF4: .4byte gTasks - thumb_func_end sub_8116CAC - - thumb_func_start sub_8116CF8 -sub_8116CF8: @ 8116CF8 - push {lr} - ldr r1, _08116D48 @ =gSharedMem + 0x19000 - movs r0, 0 - str r0, [r1, 0x8] - movs r2, 0 - adds r1, 0xC - movs r3, 0 -_08116D06: - adds r0, r2, r1 - strb r3, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x5 - bls _08116D06 - movs r2, 0 - ldr r3, _08116D4C @ =gSharedMem + 0x19012 - movs r1, 0 -_08116D1A: - adds r0, r2, r3 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3 - bls _08116D1A - movs r2, 0 - ldr r3, _08116D50 @ =gSharedMem + 0x19016 - movs r1, 0 -_08116D2E: - adds r0, r2, r3 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x2 - bls _08116D2E - movs r0, 0x1 - movs r1, 0xFF - bl sub_8117C60 - pop {r0} - bx r0 - .align 2, 0 -_08116D48: .4byte gSharedMem + 0x19000 -_08116D4C: .4byte gSharedMem + 0x19012 -_08116D50: .4byte gSharedMem + 0x19016 - thumb_func_end sub_8116CF8 - - thumb_func_start sub_8116D54 -sub_8116D54: @ 8116D54 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x1C - lsls r0, 24 - lsrs r3, r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - mov r1, sp - ldr r0, _08116D88 @ =gUnknown_083F8ED8 - ldm r0!, {r2,r4,r6} - stm r1!, {r2,r4,r6} - ldr r0, [r0] - str r0, [r1] - add r2, sp, 0x10 - adds r1, r2, 0 - ldr r0, _08116D8C @ =gUnknown_083F8EE8 - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - mov r9, r2 - cmp r5, 0xB - bls _08116D90 - movs r0, 0 - b _08116E38 - .align 2, 0 -_08116D88: .4byte gUnknown_083F8ED8 -_08116D8C: .4byte gUnknown_083F8EE8 -_08116D90: - ldr r6, _08116E48 @ =gSharedMem + 0x19000 - ldr r1, _08116E4C @ =gTasks - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 3 - adds r0, r1 - movs r7, 0x14 - ldrsh r2, [r0, r7] - adds r2, r6, r2 - ldr r4, _08116E50 @ =gUnknown_083F8D90 - lsls r5, 3 - adds r3, r5, r4 - ldrb r1, [r3, 0x2] - strb r1, [r2, 0xB] - ldrb r1, [r3, 0x2] - strh r1, [r0, 0x20] - adds r0, r4, 0x4 - adds r0, r5, r0 - ldr r1, [r6, 0x8] - ldr r0, [r0] - orrs r1, r0 - str r1, [r6, 0x8] - movs r3, 0 - mov r8, r4 - mov r12, r5 - adds r5, r0, 0 - adds r4, r6, 0 - adds r4, 0x12 -_08116DC8: - lsls r0, r3, 2 - mov r1, sp - adds r2, r1, r0 - ldr r0, [r2] - ands r0, r5 - cmp r0, 0 - beq _08116DDE - adds r1, r3, r4 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08116DDE: - adds r0, r3, r4 - ldrb r0, [r0] - cmp r0, 0x2 - bls _08116DEE - ldr r0, [r6, 0x8] - ldr r1, [r2] - orrs r0, r1 - str r0, [r6, 0x8] -_08116DEE: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - bls _08116DC8 - movs r2, 0 - ldr r0, _08116E54 @ =gUnknown_083F8D90 + 0x4 - add r0, r12 - ldr r7, [r0] - ldr r4, _08116E58 @ =gSharedMem + 0x19016 - mov r5, r9 -_08116E04: - lsls r0, r2, 2 - adds r3, r5, r0 - ldr r0, [r3] - ands r0, r7 - cmp r0, 0 - beq _08116E18 - adds r1, r2, r4 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08116E18: - adds r0, r2, r4 - ldrb r0, [r0] - cmp r0, 0x3 - bls _08116E28 - ldr r0, [r6, 0x8] - ldr r1, [r3] - orrs r0, r1 - str r0, [r6, 0x8] -_08116E28: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x2 - bls _08116E04 - mov r0, r12 - add r0, r8 - ldrb r0, [r0, 0x2] -_08116E38: - add sp, 0x1C - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08116E48: .4byte gSharedMem + 0x19000 -_08116E4C: .4byte gTasks -_08116E50: .4byte gUnknown_083F8D90 -_08116E54: .4byte gUnknown_083F8D90 + 0x4 -_08116E58: .4byte gSharedMem + 0x19016 - thumb_func_end sub_8116D54 - - thumb_func_start sub_8116E5C -sub_8116E5C: @ 8116E5C - push {lr} - lsls r0, 24 - lsls r1, 24 - lsrs r2, r1, 24 - lsrs r3, r0, 24 - movs r1, 0xFF - lsls r1, 24 - adds r0, r1 - lsrs r0, 24 - cmp r0, 0x12 - bhi _08116EF0 - cmp r2, 0xF - bhi _08116EEC - lsls r0, r2, 2 - ldr r1, _08116E80 @ =_08116E84 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08116E80: .4byte _08116E84 - .align 2, 0 -_08116E84: - .4byte _08116EC4 - .4byte _08116EC8 - .4byte _08116EC8 - .4byte _08116EC8 - .4byte _08116EC8 - .4byte _08116EDC - .4byte _08116EEC - .4byte _08116EEC - .4byte _08116EEC - .4byte _08116EEC - .4byte _08116EDC - .4byte _08116EEC - .4byte _08116EEC - .4byte _08116EEC - .4byte _08116EEC - .4byte _08116EDC -_08116EC4: - movs r0, 0x3 - b _08116EF2 -_08116EC8: - adds r0, r2, 0x5 - cmp r3, r0 - beq _08116EE8 - adds r0, 0x5 - cmp r3, r0 - beq _08116EE8 - adds r0, 0x5 - cmp r3, r0 - bne _08116EF0 - b _08116EE8 -_08116EDC: - adds r0, r2, 0x1 - cmp r3, r0 - blt _08116EF0 - adds r0, r2, 0x4 - cmp r3, r0 - bgt _08116EF0 -_08116EE8: - movs r0, 0x1 - b _08116EF2 -_08116EEC: - cmp r3, r2 - beq _08116EE8 -_08116EF0: - movs r0, 0 -_08116EF2: - pop {r1} - bx r1 - thumb_func_end sub_8116E5C - - thumb_func_start sub_8116EF8 -sub_8116EF8: @ 8116EF8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0 - str r0, [sp, 0x18] - cmp r6, 0xA - beq _08116F1E - cmp r6, 0xA - bgt _08116F1A - cmp r6, 0x5 - beq _08116F1E - b _08116F7C -_08116F1A: - cmp r6, 0xF - bne _08116F7C -_08116F1E: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r6, 0x5 - ldr r7, _08116F70 @ =gSharedMem + 0x190B8 - cmp r4, r0 - bge _08116F5E - adds r1, r7, 0 - subs r1, 0xB8 - ldr r3, _08116F74 @ =gUnknown_083F8C00 - ldr r5, [r1, 0x8] - adds r6, r3, 0 - adds r6, 0x8 - adds r2, r0, 0 -_08116F3A: - lsls r0, r4, 2 - adds r0, r4 - lsls r1, r0, 2 - adds r0, r1, r6 - ldr r0, [r0] - ands r0, r5 - cmp r0, 0 - bne _08116F54 - adds r0, r1, r3 - ldrh r0, [r0, 0x10] - ldr r1, [sp, 0x18] - orrs r1, r0 - str r1, [sp, 0x18] -_08116F54: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r2 - blt _08116F3A -_08116F5E: - ldr r0, _08116F78 @ =0x0000dfff - ldr r2, [sp, 0x18] - ands r2, r0 - str r2, [sp, 0x18] - adds r0, r7, 0 - adds r1, r2, 0 - bl sub_8124CE8 - b _0811713C - .align 2, 0 -_08116F70: .4byte gSharedMem + 0x190B8 -_08116F74: .4byte gUnknown_083F8C00 -_08116F78: .4byte 0x0000dfff -_08116F7C: - mov r0, sp - ldr r1, _08116FC8 @ =gUnknown_083F8E9C - ldm r1!, {r2-r4} - stm r0!, {r2-r4} - ldm r1!, {r2-r4} - stm r0!, {r2-r4} - subs r0, r6, 0x1 - lsls r0, 24 - lsrs r0, 24 - movs r3, 0x1 - mov r10, r3 - cmp r0, 0x3 - bhi _08116F9A - movs r4, 0x3 - mov r10, r4 -_08116F9A: - adds r0, r6, 0 - movs r1, 0x5 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 8 - ldr r1, _08116FCC @ =0xffff0000 - adds r0, r1 - lsrs r7, r0, 16 - adds r0, r6, 0 - movs r1, 0x5 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _08116FF8 - cmp r0, 0x2 - bgt _08116FD4 - cmp r0, 0x1 - beq _08116FE4 - ldr r4, _08116FD0 @ =gSharedMem + 0x19000 - b _0811703A - .align 2, 0 -_08116FC8: .4byte gUnknown_083F8E9C -_08116FCC: .4byte 0xffff0000 -_08116FD0: .4byte gSharedMem + 0x19000 -_08116FD4: - cmp r0, 0x3 - beq _0811700C - cmp r0, 0x4 - beq _08117020 - ldr r4, _08116FE0 @ =gSharedMem + 0x19000 - b _0811703A - .align 2, 0 -_08116FE0: .4byte gSharedMem + 0x19000 -_08116FE4: - ldr r3, _08116FF0 @ =gSprites - ldr r2, _08116FF4 @ =gSharedMem + 0x19000 - adds r0, r2, 0 - adds r0, 0x43 - b _08117028 - .align 2, 0 -_08116FF0: .4byte gSprites -_08116FF4: .4byte gSharedMem + 0x19000 -_08116FF8: - ldr r3, _08117004 @ =gSprites - ldr r2, _08117008 @ =gSharedMem + 0x19000 - adds r0, r2, 0 - adds r0, 0x44 - b _08117028 - .align 2, 0 -_08117004: .4byte gSprites -_08117008: .4byte gSharedMem + 0x19000 -_0811700C: - ldr r3, _08117018 @ =gSprites - ldr r2, _0811701C @ =gSharedMem + 0x19000 - adds r0, r2, 0 - adds r0, 0x45 - b _08117028 - .align 2, 0 -_08117018: .4byte gSprites -_0811701C: .4byte gSharedMem + 0x19000 -_08117020: - ldr r3, _08117088 @ =gSprites - ldr r2, _0811708C @ =gSharedMem + 0x19000 - adds r0, r2, 0 - adds r0, 0x46 -_08117028: - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrb r0, [r0, 0x5] - lsrs r0, 4 - lsls r7, r0, 4 - adds r4, r2, 0 -_0811703A: - mov r2, r10 - cmp r2, 0x1 - bne _08117094 - ldr r1, _08117090 @ =gUnknown_083F8C00 - lsls r2, r6, 2 - adds r0, r2, r6 - lsls r0, 2 - adds r1, 0x8 - adds r0, r1 - ldr r1, [r4, 0x8] - ldr r0, [r0] - ands r1, r0 - str r2, [sp, 0x1C] - cmp r1, 0 - bne _0811713C - adds r0, r6, 0 - movs r1, 0x5 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - subs r1, r0, 0x1 - lsls r1, 3 - mov r3, sp - adds r2, r3, r1 - ldrh r1, [r2, 0x2] - adds r1, r7, r1 - strh r1, [r2, 0x2] - adds r1, r4, 0 - adds r1, 0xB8 - lsls r0, 3 - subs r0, 0x8 - adds r2, r3, r0 - adds r0, r1, 0 - movs r1, 0xD - bl sub_812492C - b _08117122 - .align 2, 0 -_08117088: .4byte gSprites -_0811708C: .4byte gSharedMem + 0x19000 -_08117090: .4byte gUnknown_083F8C00 -_08117094: - movs r4, 0 - lsls r0, r6, 2 - str r0, [sp, 0x1C] - ldr r1, _0811714C @ =gSharedMem + 0x19000 - mov r8, r1 - ldr r2, _08117150 @ =gUnknown_083F8C00 - mov r9, r2 -_081170A2: - lsls r0, r4, 2 - adds r0, r4 - adds r0, r6, r0 - adds r0, 0x5 - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r5, r0, 2 - mov r0, r9 - adds r0, 0x8 - adds r0, r5, r0 - mov r3, r8 - ldr r1, [r3, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _0811710E - adds r0, r2, 0 - movs r1, 0x5 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - subs r1, r0, 0x1 - lsls r1, 3 - mov r3, sp - adds r2, r3, r1 - ldrh r1, [r2, 0x2] - adds r1, r7, r1 - strh r1, [r2, 0x2] - adds r1, r4, 0 - adds r1, 0xD - lsls r1, 24 - lsrs r1, 24 - lsls r0, 3 - subs r0, 0x8 - adds r2, r3, r0 - mov r0, r8 - adds r0, 0xB8 - bl sub_812492C - mov r0, r10 - cmp r0, 0x3 - bne _08117104 - mov r1, r9 - adds r0, r5, r1 - ldrh r0, [r0, 0x10] - str r0, [sp, 0x18] -_08117104: - mov r0, r10 - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 -_0811710E: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _081170A2 - mov r2, r10 - cmp r2, 0x2 - beq _08117122 - movs r3, 0 - str r3, [sp, 0x18] -_08117122: - ldr r0, _08117154 @ =gSharedMem + 0x190B8 - ldr r2, _08117150 @ =gUnknown_083F8C00 - ldr r4, [sp, 0x1C] - adds r1, r4, r6 - lsls r1, 2 - adds r1, r2 - ldrh r1, [r1, 0x10] - ldr r2, [sp, 0x18] - orrs r2, r1 - str r2, [sp, 0x18] - adds r1, r2, 0 - bl sub_8124CE8 -_0811713C: - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811714C: .4byte gSharedMem + 0x19000 -_08117150: .4byte gUnknown_083F8C00 -_08117154: .4byte gSharedMem + 0x190B8 - thumb_func_end sub_8116EF8 - - thumb_func_start sub_8117158 -sub_8117158: @ 8117158 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x24 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r4, _0811719C @ =gSharedMem + 0x19000 - movs r0, 0x1 - strh r0, [r4, 0x2A] - movs r0, 0 - movs r1, 0 - bl sub_8117AA8 - ldr r0, _081171A0 @ =gBGTilemapBuffers + 0x800 - ldr r1, _081171A4 @ =0xfffff800 - adds r4, r1 - movs r1, 0x10 - str r1, [sp] - movs r1, 0xD - str r1, [sp, 0x4] - adds r1, r4, 0 - movs r2, 0xE - movs r3, 0x7 - bl sub_8124E2C - cmp r5, 0xF - bhi _08117250 - lsls r0, r5, 2 - ldr r1, _081171A8 @ =_081171AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0811719C: .4byte gSharedMem + 0x19000 -_081171A0: .4byte gBGTilemapBuffers + 0x800 -_081171A4: .4byte 0xfffff800 -_081171A8: .4byte _081171AC - .align 2, 0 -_081171AC: - .4byte _08117360 - .4byte _081171EC - .4byte _081171EC - .4byte _081171EC - .4byte _081171EC - .4byte _08117220 - .4byte _08117250 - .4byte _08117250 - .4byte _08117250 - .4byte _08117250 - .4byte _08117220 - .4byte _08117250 - .4byte _08117250 - .4byte _08117250 - .4byte _08117250 - .4byte _08117220 -_081171EC: - movs r0, 0x4 - str r0, [sp, 0x18] - add r1, sp, 0x8 - movs r0, 0 - strb r0, [r1] - adds r0, r1, 0 - ldrb r0, [r0] - cmp r0, 0x3 - bhi _08117258 - add r4, sp, 0x10 - adds r3, r1, 0 -_08117202: - ldrb r2, [r3] - adds r2, r4 - ldrb r1, [r3] - lsls r0, r1, 2 - adds r0, r1 - adds r0, r5, r0 - strb r0, [r2] - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - ldrb r0, [r3] - ldr r1, [sp, 0x18] - cmp r0, r1 - bcc _08117202 - b _08117258 -_08117220: - movs r0, 0x5 - str r0, [sp, 0x18] - add r1, sp, 0x8 - movs r0, 0 - strb r0, [r1] - adds r0, r1, 0 - ldrb r0, [r0] - cmp r0, 0x4 - bhi _08117258 - add r3, sp, 0x10 - adds r2, r1, 0 -_08117236: - ldrb r1, [r2] - adds r1, r3 - ldrb r0, [r2] - adds r0, r5, r0 - strb r0, [r1] - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - ldrb r0, [r2] - ldr r1, [sp, 0x18] - cmp r0, r1 - bcc _08117236 - b _08117258 -_08117250: - movs r0, 0x1 - str r0, [sp, 0x18] - add r0, sp, 0x10 - strb r5, [r0] -_08117258: - add r1, sp, 0x8 - movs r0, 0 - strb r0, [r1] - adds r0, r1, 0 - ldrb r0, [r0] - ldr r1, [sp, 0x18] - cmp r0, r1 - bcs _08117360 - mov r0, sp - adds r0, 0xE - str r0, [sp, 0x1C] - add r1, sp, 0x10 - mov r9, r1 - add r0, sp, 0x8 - mov r12, r0 - mov r1, sp - adds r1, 0xA - str r1, [sp, 0x20] -_0811727C: - mov r1, r12 - ldrb r0, [r1] - add r0, r9 - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - ldr r1, _08117370 @ =gUnknown_083F8C00 - adds r0, r1 - ldrb r0, [r0, 0x6] - ldr r1, [sp, 0x1C] - strb r0, [r1] - mov r1, r12 - ldrb r0, [r1] - add r0, r9 - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - ldr r1, _08117370 @ =gUnknown_083F8C00 - adds r0, r1 - ldrb r0, [r0, 0x3] - ldr r1, [sp, 0x20] - strh r0, [r1] - mov r4, sp - adds r4, 0x9 - movs r0, 0 - strb r0, [r4] - ldrb r0, [r4] - cmp r0, 0x2 - bhi _08117350 - add r5, sp, 0xC - ldr r7, [sp, 0x20] - ldr r0, _08117374 @ =gBGTilemapBuffers + 0x800 - mov r8, r0 - ldr r6, [sp, 0x1C] - ldr r1, _08117378 @ =gSharedMem + 0x189A0 - mov r10, r1 -_081172C8: - mov r1, r12 - ldrb r0, [r1] - add r0, r9 - ldrb r0, [r0] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 2 - ldr r0, _08117370 @ =gUnknown_083F8C00 - adds r1, r0 - adds r3, r4, 0 - ldrb r0, [r4] - ldrb r1, [r1, 0x4] - adds r0, r1 - lsls r0, 5 - strh r0, [r5] - ldrh r0, [r7] - ldrh r2, [r5] - adds r2, r0 - lsls r2, 1 - add r2, r8 - ldrb r0, [r6] - ldrb r1, [r4] - adds r1, r0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - add r0, r10 - ldrh r0, [r0] - strh r0, [r2] - ldrh r0, [r7] - ldrh r2, [r5] - adds r2, r0 - adds r2, 0x1 - lsls r2, 1 - add r2, r8 - ldrb r0, [r6] - ldrb r1, [r4] - adds r1, r0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - mov r1, r10 - adds r1, 0x2 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - ldrh r0, [r7] - ldrh r2, [r5] - adds r2, r0 - adds r2, 0x2 - lsls r2, 1 - add r2, r8 - ldrb r0, [r6] - ldrb r1, [r4] - adds r1, r0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - ldr r1, _0811737C @ =gSharedMem + 0x189A4 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - ldrb r0, [r3] - cmp r0, 0x2 - bls _081172C8 -_08117350: - mov r1, r12 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldrb r0, [r1] - ldr r1, [sp, 0x18] - cmp r0, r1 - bcc _0811727C -_08117360: - add sp, 0x24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08117370: .4byte gUnknown_083F8C00 -_08117374: .4byte gBGTilemapBuffers + 0x800 -_08117378: .4byte gSharedMem + 0x189A0 -_0811737C: .4byte gSharedMem + 0x189A4 - thumb_func_end sub_8117158 - - thumb_func_start sub_8117380 -sub_8117380: @ 8117380 - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _081173B8 @ =gUnknown_083F8EF4 - mov r0, sp - movs r2, 0x5 - bl memcpy - cmp r4, 0x13 - bls _08117398 - movs r4, 0 -_08117398: - ldr r3, _081173BC @ =gUnknown_083F8C00 - lsls r0, r4, 2 - adds r0, r4 - lsls r2, r0, 2 - adds r0, r2, r3 - ldrb r0, [r0, 0x1] - lsls r0, 28 - lsrs r0, 28 - cmp r0, 0x4 - beq _081173EC - cmp r0, 0x4 - bgt _081173C0 - cmp r0, 0x3 - beq _081173C6 - b _08117428 - .align 2, 0 -_081173B8: .4byte gUnknown_083F8EF4 -_081173BC: .4byte gUnknown_083F8C00 -_081173C0: - cmp r0, 0xC - beq _0811740C - b _08117428 -_081173C6: - adds r0, r4, 0 - movs r1, 0x5 - bl __udivsi3 - subs r0, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _081173E8 @ =gSharedMem + 0x19000 - adds r0, 0x16 - adds r1, r4, r0 - ldrb r0, [r1] - cmp r0, 0x3 - bhi _08117428 - ldrb r0, [r1] - adds r0, 0x1 - b _08117402 - .align 2, 0 -_081173E8: .4byte gSharedMem + 0x19000 -_081173EC: - subs r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _08117408 @ =gSharedMem + 0x19000 - adds r0, 0x12 - adds r1, r4, r0 - ldrb r0, [r1] - cmp r0, 0x2 - bhi _08117428 - ldrb r0, [r1] - adds r0, 0x2 -_08117402: - add r0, sp - ldrb r0, [r0] - b _0811742A - .align 2, 0 -_08117408: .4byte gSharedMem + 0x19000 -_0811740C: - ldr r1, _08117424 @ =gSharedMem + 0x19000 - adds r0, r3, 0 - adds r0, 0x8 - adds r0, r2, r0 - ldr r1, [r1, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _08117428 - mov r0, sp - ldrb r0, [r0, 0x4] - b _0811742A - .align 2, 0 -_08117424: .4byte gSharedMem + 0x19000 -_08117428: - movs r0, 0 -_0811742A: - add sp, 0x8 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8117380 - - thumb_func_start sub_8117434 -sub_8117434: @ 8117434 - push {r4-r6,lr} - ldr r1, _081174AC @ =REG_BG2PA - ldr r4, _081174B0 @ =gSharedMem + 0x19000 - ldrh r0, [r4, 0x2C] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r4, 0x2E] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r4, 0x30] - strh r0, [r1] - adds r1, 0x2 - ldrh r0, [r4, 0x32] - strh r0, [r1] - movs r0, 0x2E - ldrsh r2, [r4, r0] - ldr r0, _081174B4 @ =gSpriteCoordOffsetY - movs r3, 0 - ldrsh r1, [r0, r3] - adds r1, 0x50 - adds r0, r2, 0 - muls r0, r1 - movs r2, 0xE8 - lsls r2, 7 - subs r2, r0 - movs r6, 0x2C - ldrsh r5, [r4, r6] - ldr r0, _081174B8 @ =gSpriteCoordOffsetX - movs r6, 0 - ldrsh r3, [r0, r6] - adds r3, 0x74 - adds r0, r5, 0 - muls r0, r3 - subs r2, r0 - movs r5, 0x32 - ldrsh r0, [r4, r5] - muls r0, r1 - movs r1, 0xA8 - lsls r1, 7 - subs r1, r0 - movs r6, 0x30 - ldrsh r0, [r4, r6] - muls r0, r3 - subs r1, r0 - ldr r0, _081174BC @ =REG_BG2X_L - strh r2, [r0] - adds r0, 0x2 - ldr r3, _081174C0 @ =0x0fff0000 - ands r2, r3 - asrs r2, 16 - strh r2, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - ands r1, r3 - asrs r1, 16 - strh r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081174AC: .4byte REG_BG2PA -_081174B0: .4byte gSharedMem + 0x19000 -_081174B4: .4byte gSpriteCoordOffsetY -_081174B8: .4byte gSpriteCoordOffsetX -_081174BC: .4byte REG_BG2X_L -_081174C0: .4byte 0x0fff0000 - thumb_func_end sub_8117434 - - thumb_func_start sub_81174C4 -sub_81174C4: @ 81174C4 - push {lr} - lsls r0, 16 - asrs r0, 16 - lsls r1, 16 - asrs r1, 16 - muls r0, r1 - adds r1, r0, 0 - cmp r0, 0 - bge _081174D8 - adds r1, 0xFF -_081174D8: - lsls r0, r1, 8 - asrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_81174C4 - - thumb_func_start sub_81174E0 -sub_81174E0: @ 81174E0 - push {lr} - adds r1, r0, 0 - movs r0, 0x80 - lsls r0, 9 - lsls r1, 16 - asrs r1, 16 - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_81174E0 - - thumb_func_start sub_81174F8 -sub_81174F8: @ 81174F8 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x14 - movs r1, 0x8 - movs r2, 0x1 - bl DisplayYesNoMenu - ldr r0, _08117520 @ =0x00002d9e - bl sub_814AAF8 - ldr r1, _08117524 @ =gUnknown_083F8EB4 - adds r0, r4, 0 - bl DoYesNoFuncWithChoice - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08117520: .4byte 0x00002d9e -_08117524: .4byte gUnknown_083F8EB4 - thumb_func_end sub_81174F8 - - thumb_func_start sub_8117528 -sub_8117528: @ 8117528 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _08117554 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0811754C - movs r0, 0 - bl SetVBlankCallback - ldr r0, _08117558 @ =sub_8115384 - bl SetMainCallback2 - adds r0, r4, 0 - bl DestroyTask -_0811754C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08117554: .4byte gPaletteFade -_08117558: .4byte sub_8115384 - thumb_func_end sub_8117528 - - thumb_func_start sub_811755C -sub_811755C: @ 811755C - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x14 - movs r1, 0x8 - movs r2, 0x1A - movs r3, 0xD - bl MenuZeroFillWindowRect - bl MenuZeroFillScreen - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r2, _081175B4 @ =gPaletteFade - ldrb r1, [r2, 0x8] - lsls r1, 26 - lsrs r1, 26 - ldrb r3, [r2, 0x4] - movs r0, 0x40 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2, 0x4] - bl UpdatePaletteFade - ldr r1, _081175B8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _081175BC @ =sub_8117528 - str r1, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081175B4: .4byte gPaletteFade -_081175B8: .4byte gTasks -_081175BC: .4byte sub_8117528 - thumb_func_end sub_811755C - - thumb_func_start sub_81175C0 -sub_81175C0: @ 81175C0 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl MenuZeroFillScreen - bl ScriptContext2_Disable - adds r0, r4, 0 - bl DestroyTask - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81175C0 - - thumb_func_start sub_81175DC -sub_81175DC: @ 81175DC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - ldr r1, _08117624 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r2, r1, 0x1 - strh r2, [r0, 0x8] - ldr r0, _08117628 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08117608 - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x3C - ble _0811761C -_08117608: - ldr r1, _0811762C @ =gSpecialVar_0x8004 - movs r0, 0x1 - strh r0, [r1] - bl MenuZeroFillScreen - bl ScriptContext2_Disable - adds r0, r4, 0 - bl DestroyTask -_0811761C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08117624: .4byte gTasks -_08117628: .4byte gMain -_0811762C: .4byte gSpecialVar_0x8004 - thumb_func_end sub_81175DC - - thumb_func_start sub_8117630 -sub_8117630: @ 8117630 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r2, _0811768C @ =gUnknown_083F8DF0 - ldr r0, _08117690 @ =gSpecialVar_0x8004 - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - lsrs r1, 7 - lsls r1, 1 - adds r0, r1 - adds r0, r2 - ldrb r1, [r0] - ldr r0, _08117694 @ =gStringVar1 - movs r2, 0x2 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - ldr r5, _08117698 @ =gStringVar4 - ldr r1, _0811769C @ =gUnknown_081C40DF - adds r0, r5, 0 - bl StringExpandPlaceholders - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - adds r0, r5, 0 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _081176A0 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, _081176A4 @ =sub_81174F8 - str r1, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811768C: .4byte gUnknown_083F8DF0 -_08117690: .4byte gSpecialVar_0x8004 -_08117694: .4byte gStringVar1 -_08117698: .4byte gStringVar4 -_0811769C: .4byte gUnknown_081C40DF -_081176A0: .4byte gTasks -_081176A4: .4byte sub_81174F8 - thumb_func_end sub_8117630 - - thumb_func_start Task_Roulette_0 -Task_Roulette_0: @ 81176A8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, _08117758 @ =gStringVar1 - mov r10, r0 - ldr r1, _0811775C @ =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r6, r0, r1 - movs r0, 0x22 - ldrsh r1, [r6, r0] - mov r0, r10 - movs r2, 0x1 - movs r3, 0x4 - bl ConvertIntToDecimalStringN - ldr r5, _08117760 @ =gStringVar4 - ldr r1, _08117764 @ =gOtherText_Coins - adds r0, r5, 0 - bl StringExpandPlaceholders - movs r0, 0 - movs r1, 0 - movs r2, 0x9 - movs r3, 0x3 - bl MenuDrawTextWindow - adds r0, r5, 0 - movs r1, 0x9 - movs r2, 0x1 - bl MenuPrint_RightAligned - ldr r2, _08117768 @ =gUnknown_083F8DF0 - ldr r1, _0811776C @ =gSpecialVar_0x8004 - mov r8, r1 - ldrh r1, [r1] - movs r0, 0x1 - mov r9, r0 - ands r0, r1 - lsrs r1, 7 - lsls r1, 1 - adds r0, r1 - adds r0, r2 - ldrb r4, [r0] - mov r0, r10 - adds r1, r4, 0 - movs r2, 0x2 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - movs r1, 0x22 - ldrsh r0, [r6, r1] - cmp r0, r4 - blt _081177BC - mov r0, r8 - ldrh r1, [r0] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0811777C - mov r0, r9 - ands r0, r1 - cmp r0, 0 - beq _0811777C - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _08117770 @ =gUnknown_081C4139 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _08117774 @ =sub_8117630 - ldr r2, _08117778 @ =0x0000ffff - adds r0, r7, 0 - movs r3, 0x3 - bl sub_8116C34 - b _081177E4 - .align 2, 0 -_08117758: .4byte gStringVar1 -_0811775C: .4byte gTasks -_08117760: .4byte gStringVar4 -_08117764: .4byte gOtherText_Coins -_08117768: .4byte gUnknown_083F8DF0 -_0811776C: .4byte gSpecialVar_0x8004 -_08117770: .4byte gUnknown_081C4139 -_08117774: .4byte sub_8117630 -_08117778: .4byte 0x0000ffff -_0811777C: - ldr r4, _081177AC @ =gStringVar4 - ldr r1, _081177B0 @ =gUnknown_081C40DF - adds r0, r4, 0 - bl StringExpandPlaceholders - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - adds r0, r4, 0 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r1, _081177B4 @ =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - ldr r1, _081177B8 @ =sub_81174F8 - str r1, [r0] - b _081177E4 - .align 2, 0 -_081177AC: .4byte gStringVar4 -_081177B0: .4byte gUnknown_081C40DF -_081177B4: .4byte gTasks -_081177B8: .4byte sub_81174F8 -_081177BC: - ldr r1, _081177F4 @ =gUnknown_081C411C - adds r0, r5, 0 - bl StringExpandPlaceholders - movs r0, 0 - movs r1, 0xE - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - adds r0, r5, 0 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - ldr r0, _081177F8 @ =sub_81175DC - str r0, [r6] - movs r0, 0 - strh r0, [r6, 0x22] - strh r0, [r6, 0x8] -_081177E4: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081177F4: .4byte gUnknown_081C411C -_081177F8: .4byte sub_81175DC - thumb_func_end Task_Roulette_0 - - thumb_func_start PlayRoulette -PlayRoulette: @ 81177FC - push {lr} - bl ScriptContext2_Enable - ldr r0, _08117828 @ =Task_Roulette_0 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0811782C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, _08117830 @ =gSaveBlock1 - ldr r2, _08117834 @ =0x00000494 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1, 0x22] - pop {r0} - bx r0 - .align 2, 0 -_08117828: .4byte Task_Roulette_0 -_0811782C: .4byte gTasks -_08117830: .4byte gSaveBlock1 -_08117834: .4byte 0x00000494 - thumb_func_end PlayRoulette - - thumb_func_start sub_8117838 -sub_8117838: @ 8117838 - push {r4,lr} - lsls r0, 24 - cmp r0, 0 - bne _08117884 - bl FreeAllSpritePalettes - ldr r0, _08117870 @ =gUnknown_083F9E30 - bl LoadSpritePalettes - ldr r0, _08117874 @ =gUnknown_083F92A8 - ldr r4, _08117878 @ =gSharedMem + 0x17000 - adds r1, r4, 0 - bl LZ77UnCompWram - ldr r0, _0811787C @ =gUnknown_083F90FC - movs r2, 0xE0 - lsls r2, 4 - adds r1, r4, r2 - bl LZ77UnCompWram - ldr r0, _08117880 @ =gUnknown_083F9D3C - movs r1, 0x80 - lsls r1, 5 - adds r4, r1 - adds r1, r4, 0 - bl LZ77UnCompWram - b _08117888 - .align 2, 0 -_08117870: .4byte gUnknown_083F9E30 -_08117874: .4byte gUnknown_083F92A8 -_08117878: .4byte gSharedMem + 0x17000 -_0811787C: .4byte gUnknown_083F90FC -_08117880: .4byte gUnknown_083F9D3C -_08117884: - bl FreeAllSpritePalettes -_08117888: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8117838 - - thumb_func_start sub_8117890 -sub_8117890: @ 8117890 - push {r4-r6,lr} - adds r4, r1, 0 - adds r6, r2, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r1, [r0, 0x4] - ldrb r3, [r1] - movs r1, 0x74 - movs r2, 0x50 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - ldr r0, _081178F4 @ =gSprites - lsls r1, r5, 4 - adds r1, r5 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r6] - strh r0, [r1, 0x2E] - strh r4, [r1, 0x30] - adds r3, r1, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r2, 0x2 - orrs r0, r2 - strb r0, [r3] - adds r1, 0x2C - ldrb r0, [r1] - movs r2, 0x40 - orrs r0, r2 - movs r2, 0x80 - orrs r0, r2 - strb r0, [r1] - ldrh r2, [r6] - adds r0, r2, 0 - adds r0, 0x1E - strh r0, [r6] - lsls r0, 16 - ldr r1, _081178F8 @ =0x01670000 - cmp r0, r1 - bls _081178EC - ldr r1, _081178FC @ =0xfffffeb6 - adds r0, r2, r1 - strh r0, [r6] -_081178EC: - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081178F4: .4byte gSprites -_081178F8: .4byte 0x01670000 -_081178FC: .4byte 0xfffffeb6 - thumb_func_end sub_8117890 - - thumb_func_start sub_8117900 -sub_8117900: @ 8117900 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - ldr r4, _08117A50 @ =gUnknown_083F9F54 - ldr r0, [r4] - ldr r5, _08117A54 @ =gSharedMem - adds r1, r5, 0 - bl LZ77UnCompWram - str r5, [sp] - mov r6, sp - ldrh r1, [r4, 0x6] - lsls r1, 16 - ldrh r0, [r4, 0x4] - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet - ldr r4, _08117A58 @ =gUnknown_083F9F5C - ldr r0, [r4] - adds r1, r5, 0 - bl LZ77UnCompWram - str r5, [sp] - ldrh r0, [r4, 0x4] - strh r0, [r6, 0x4] - ldrh r0, [r4, 0x6] - strh r0, [r6, 0x6] - mov r0, sp - bl LoadSpriteSheet - movs r7, 0 - ldr r0, _08117A5C @ =0x0001903c - adds r0, r5 - mov r9, r0 - ldr r0, _08117A60 @ =gSprites - mov r8, r0 -_08117950: - lsls r0, r7, 1 - adds r0, r7 - lsls r0, 27 - lsrs r4, r0, 24 - movs r6, 0 - lsls r5, r7, 2 -_0811795C: - lsls r1, r6, 1 - adds r1, r6 - lsls r1, 3 - ldr r0, _08117A64 @ =gSpriteTemplate_83FA07C - adds r0, r1, r0 - adds r1, 0x94 - adds r2, r4, 0 - adds r2, 0x5C - movs r3, 0x1E - bl CreateSprite - adds r1, r6, 0 - adds r1, 0x1D - adds r1, r5, r1 - add r1, r9 - strb r0, [r1] - lsls r0, 24 - lsrs r1, r0, 24 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r0] - adds r0, r4, 0 - adds r0, 0x18 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x47 - bls _081179A0 - movs r4, 0 -_081179A0: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _0811795C - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x2 - bls _08117950 - movs r7, 0 - ldr r5, _08117A68 @ =gSharedMem + 0x1903C - ldr r4, _08117A60 @ =gSprites -_081179BA: - lsls r1, r7, 1 - adds r1, r7 - lsls r1, 3 - ldr r0, _08117A6C @ =gSpriteTemplate_83F9FD4 - adds r0, r1, r0 - adds r1, 0x94 - lsls r1, 16 - asrs r1, 16 - movs r2, 0x46 - movs r3, 0x1E - bl CreateSprite - adds r1, r7, 0 - adds r1, 0x29 - adds r1, r5 - strb r0, [r1] - lsls r0, 24 - lsrs r1, r0, 24 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r0] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x3 - bls _081179BA - movs r7, 0 - ldr r5, _08117A68 @ =gSharedMem + 0x1903C - ldr r4, _08117A60 @ =gSprites -_08117A00: - lsls r2, r7, 1 - adds r2, r7 - lsls r2, 3 - ldr r0, _08117A70 @ =gSpriteTemplate_83FA034 - adds r0, r2, r0 - adds r2, 0x5C - lsls r2, 16 - asrs r2, 16 - movs r1, 0x7E - movs r3, 0x1E - bl CreateSprite - adds r1, r7, 0 - adds r1, 0x2D - adds r1, r5 - strb r0, [r1] - lsls r0, 24 - lsrs r1, r0, 24 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r0] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x2 - bls _08117A00 - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08117A50: .4byte gUnknown_083F9F54 -_08117A54: .4byte gSharedMem -_08117A58: .4byte gUnknown_083F9F5C -_08117A5C: .4byte 0x0001903c -_08117A60: .4byte gSprites -_08117A64: .4byte gSpriteTemplate_83FA07C -_08117A68: .4byte gSharedMem + 0x1903C -_08117A6C: .4byte gSpriteTemplate_83F9FD4 -_08117A70: .4byte gSpriteTemplate_83FA034 - thumb_func_end sub_8117900 - - thumb_func_start unref_sub_8117A74 -unref_sub_8117A74: @ 8117A74 - push {r4,r5,lr} - movs r4, 0 - ldr r5, _08117AA0 @ =gSharedMem + 0x1903C -_08117A7A: - adds r0, r4, 0 - adds r0, 0x1D - adds r0, r5 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08117AA4 @ =gSprites - adds r0, r1 - bl DestroySprite - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xB - bls _08117A7A - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08117AA0: .4byte gSharedMem + 0x1903C -_08117AA4: .4byte gSprites - thumb_func_end unref_sub_8117A74 - - thumb_func_start sub_8117AA8 -sub_8117AA8: @ 8117AA8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - cmp r0, 0 - beq _08117AF8 - cmp r0, 0x1 - bne _08117BA8 - movs r3, 0 - ldr r5, _08117AF0 @ =gSprites - ldr r4, _08117AF4 @ =gSharedMem + 0x1903C - movs r2, 0x4 -_08117ACA: - adds r0, r3, 0 - adds r0, 0x1D - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r2 - strb r1, [r0] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x12 - bls _08117ACA - b _08117BA8 - .align 2, 0 -_08117AF0: .4byte gSprites -_08117AF4: .4byte gSharedMem + 0x1903C -_08117AF8: - movs r3, 0 - ldr r0, _08117B48 @ =gUnknown_083F8D90 - mov r12, r0 - ldr r7, _08117B4C @ =gSharedMem + 0x19000 - movs r1, 0x4 - add r1, r12 - mov r9, r1 - ldr r5, _08117B50 @ =gSprites - adds r4, r7, 0 - adds r4, 0x3C - movs r6, 0x5 - negs r6, r6 -_08117B10: - lsls r2, r3, 3 - mov r1, r9 - adds r0, r2, r1 - ldr r1, [r7, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _08117B54 - mov r1, r12 - adds r0, r2, r1 - ldrb r0, [r0, 0x2] - cmp r0, r8 - beq _08117B54 - adds r0, r3, 0 - adds r0, 0x1D - adds r0, r4 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _08117B6E - .align 2, 0 -_08117B48: .4byte gUnknown_083F8D90 -_08117B4C: .4byte gSharedMem + 0x19000 -_08117B50: .4byte gSprites -_08117B54: - adds r0, r3, 0 - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - adds r1, 0x3E - ldrb r2, [r1] - adds r0, r6, 0 - ands r0, r2 - strb r0, [r1] -_08117B6E: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0xB - bls _08117B10 - cmp r3, 0x12 - bhi _08117BA8 - ldr r6, _08117BB4 @ =gSprites - ldr r4, _08117BB8 @ =gSharedMem + 0x1903C - movs r5, 0x5 - negs r5, r5 -_08117B84: - adds r0, r3, 0 - adds r0, 0x1D - adds r0, r4 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - adds r1, 0x3E - ldrb r2, [r1] - adds r0, r5, 0 - ands r0, r2 - strb r0, [r1] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x12 - bls _08117B84 -_08117BA8: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08117BB4: .4byte gSprites -_08117BB8: .4byte gSharedMem + 0x1903C - thumb_func_end sub_8117AA8 - - thumb_func_start sub_8117BBC -sub_8117BBC: @ 8117BBC - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r5, 0 - ldr r0, _08117C50 @ =gSharedMem + 0x1903C - mov r8, r0 - ldr r4, _08117C54 @ =gSprites - movs r6, 0x4 -_08117BCC: - ldr r0, _08117C58 @ =gSpriteTemplate_83FA40C - movs r1, 0x74 - movs r2, 0x14 - movs r3, 0xA - bl CreateSprite - adds r3, r5, 0 - adds r3, 0x31 - add r3, r8 - strb r0, [r3] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r6 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x1 - strh r1, [r0, 0x2E] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r4, 0 - adds r1, 0x1C - adds r0, r1 - ldr r1, _08117C5C @ =sub_81184CC - str r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r1, [r0, 0x5] - movs r7, 0xD - negs r7, r7 - adds r2, r7, 0 - ands r1, r2 - orrs r1, r6 - strb r1, [r0, 0x5] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x8 - bl StartSpriteAnim - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x5 - bls _08117BCC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08117C50: .4byte gSharedMem + 0x1903C -_08117C54: .4byte gSprites -_08117C58: .4byte gSpriteTemplate_83FA40C -_08117C5C: .4byte sub_81184CC - thumb_func_end sub_8117BBC - - thumb_func_start sub_8117C60 -sub_8117C60: @ 8117C60 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - movs r5, 0 - cmp r0, 0 - beq _08117CAC - ldr r4, _08117CA4 @ =gSprites - ldr r3, _08117CA8 @ =gSharedMem + 0x1903C - movs r2, 0x4 -_08117C7E: - adds r0, r5, 0 - adds r0, 0x31 - adds r0, r3 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r2 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x5 - bls _08117C7E - b _08117D58 - .align 2, 0 -_08117CA4: .4byte gSprites -_08117CA8: .4byte gSharedMem + 0x1903C -_08117CAC: - ldr r0, _08117CEC @ =gSharedMem + 0x19000 - mov r12, r0 - ldr r6, _08117CF0 @ =gSprites - movs r0, 0x3C - add r0, r12 - mov r8, r0 - ldr r7, _08117CF4 @ =gUnknown_083F8C00 - movs r0, 0x5 - negs r0, r0 - mov r10, r0 -_08117CC0: - mov r0, r12 - adds r0, 0xC - adds r4, r5, r0 - ldrb r0, [r4] - cmp r0, 0 - beq _08117CD0 - cmp r5, r9 - bne _08117CF8 -_08117CD0: - adds r0, r5, 0 - adds r0, 0x31 - add r0, r8 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _08117D4E - .align 2, 0 -_08117CEC: .4byte gSharedMem + 0x19000 -_08117CF0: .4byte gSprites -_08117CF4: .4byte gUnknown_083F8C00 -_08117CF8: - adds r3, r5, 0 - adds r3, 0x31 - add r3, r8 - ldrb r0, [r3] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - adds r1, 0x3E - ldrb r2, [r1] - mov r0, r10 - ands r0, r2 - strb r0, [r1] - ldrb r0, [r3] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r6 - ldrb r1, [r4] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r7 - ldrb r0, [r0, 0x3] - adds r0, 0x1 - lsls r0, 3 - adds r0, 0x4 - strh r0, [r2, 0x20] - ldrb r0, [r3] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r6 - ldrb r1, [r4] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r7 - ldrb r0, [r0, 0x4] - adds r0, 0x1 - lsls r0, 3 - adds r0, 0x3 - strh r0, [r2, 0x22] -_08117D4E: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x5 - bls _08117CC0 -_08117D58: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8117C60 - - thumb_func_start sub_8117D68 -sub_8117D68: @ 8117D68 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _08117D98 - ldr r2, _08117D90 @ =gSprites - ldr r0, _08117D94 @ =gSharedMem + 0x19000 - adds r0, 0x6C - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _08117DE2 - .align 2, 0 -_08117D90: .4byte gSprites -_08117D94: .4byte gSharedMem + 0x19000 -_08117D98: - ldr r4, _08117DE8 @ =gSprites - ldr r3, _08117DEC @ =gSharedMem + 0x19000 - adds r3, 0x6C - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - ldrb r0, [r3] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldr r0, _08117DF0 @ =gUnknown_083F8C00 - lsls r2, r5, 2 - adds r2, r5 - lsls r2, 2 - adds r2, r0 - ldrb r0, [r2, 0x3] - adds r0, 0x2 - lsls r0, 3 - strh r0, [r1, 0x20] - ldrb r0, [r3] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrb r0, [r2, 0x4] - adds r0, 0x2 - lsls r0, 3 - strh r0, [r1, 0x22] -_08117DE2: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08117DE8: .4byte gSprites -_08117DEC: .4byte gSharedMem + 0x19000 -_08117DF0: .4byte gUnknown_083F8C00 - thumb_func_end sub_8117D68 - - thumb_func_start sub_8117DF4 -sub_8117DF4: @ 8117DF4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - ldr r4, _08117E84 @ =gUnknown_083F9EE8 - ldr r0, [r4] - ldr r5, _08117E88 @ =gSharedMem - adds r1, r5, 0 - bl LZ77UnCompWram - str r5, [sp, 0x4] - add r0, sp, 0x4 - ldrh r2, [r4, 0x6] - lsls r2, 16 - ldrh r1, [r4, 0x4] - orrs r1, r2 - str r1, [r0, 0x4] - bl LoadSpriteSheet - movs r1, 0xF - mov r0, sp - strh r1, [r0] - movs r0, 0 - ldr r1, _08117E8C @ =0x0001903c - adds r1, r5 - mov r8, r1 - ldr r7, _08117E90 @ =gSprites -_08117E2A: - movs r4, 0 - adds r6, r0, 0x1 - lsls r5, r0, 2 -_08117E30: - adds r1, r5, r4 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - ldr r1, _08117E94 @ =gSpriteTemplate_83FA0DC - adds r0, r1 - movs r1, 0x28 - mov r2, sp - bl sub_8117890 - adds r1, r4, 0x7 - adds r1, r5, r1 - add r1, r8 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - adds r1, 0x2C - ldrb r0, [r1] - movs r2, 0x40 - orrs r0, r2 - movs r2, 0x80 - orrs r0, r2 - strb r0, [r1] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bls _08117E30 - lsls r0, r6, 24 - lsrs r0, 24 - cmp r0, 0x2 - bls _08117E2A - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08117E84: .4byte gUnknown_083F9EE8 -_08117E88: .4byte gSharedMem -_08117E8C: .4byte 0x0001903c -_08117E90: .4byte gSprites -_08117E94: .4byte gSpriteTemplate_83FA0DC - thumb_func_end sub_8117DF4 - - thumb_func_start sub_8117E98 -sub_8117E98: @ 8117E98 - push {r4-r6,lr} - adds r6, r0, 0 - ldr r0, _08117F1C @ =gSharedMem + 0x19000 - ldrh r1, [r6, 0x2E] - ldrh r0, [r0, 0x24] - adds r1, r0 - lsls r1, 16 - lsrs r4, r1, 16 - asrs r1, 16 - ldr r0, _08117F20 @ =0x00000167 - cmp r1, r0 - ble _08117EB8 - ldr r2, _08117F24 @ =0xfffffe98 - adds r0, r1, r2 - lsls r0, 16 - lsrs r4, r0, 16 -_08117EB8: - adds r0, r4, 0 - bl Sin2 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r4, 0 - bl Cos2 - lsls r2, r5, 16 - asrs r2, 16 - movs r3, 0x30 - ldrsh r1, [r6, r3] - muls r1, r2 - asrs r1, 12 - strh r1, [r6, 0x24] - lsls r0, 16 - asrs r4, r0, 16 - negs r1, r4 - movs r3, 0x30 - ldrsh r0, [r6, r3] - muls r0, r1 - asrs r0, 12 - strh r0, [r6, 0x26] - ldrb r0, [r6, 0x3] - lsls r0, 26 - lsrs r3, r0, 27 - cmp r2, 0 - bge _08117EF2 - adds r2, 0xF -_08117EF2: - lsls r0, r2, 12 - lsrs r5, r0, 16 - ldr r1, _08117F28 @ =gOamMatrices - lsls r0, r3, 3 - adds r1, r0, r1 - adds r0, r4, 0 - cmp r0, 0 - bge _08117F04 - adds r0, 0xF -_08117F04: - asrs r0, 4 - strh r0, [r1, 0x6] - strh r0, [r1] - strh r5, [r1, 0x2] - lsls r0, r5, 16 - asrs r0, 16 - negs r0, r0 - strh r0, [r1, 0x4] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08117F1C: .4byte gSharedMem + 0x19000 -_08117F20: .4byte 0x00000167 -_08117F24: .4byte 0xfffffe98 -_08117F28: .4byte gOamMatrices - thumb_func_end sub_8117E98 - - thumb_func_start sub_8117F2C -sub_8117F2C: @ 8117F2C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r5, 0 - ldr r7, _081180C8 @ =gSharedMem - mov r6, sp -_08117F3A: - ldr r0, _081180CC @ =gUnknown_083FA21C - lsls r4, r5, 3 - adds r4, r0 - ldr r0, [r4] - adds r1, r7, 0 - bl LZ77UnCompWram - str r7, [sp] - ldrh r2, [r4, 0x4] - ldr r0, _081180D0 @ =0xffff0000 - ldr r1, [r6, 0x4] - ands r1, r0 - orrs r1, r2 - str r1, [r6, 0x4] - ldrh r2, [r4, 0x6] - lsls r2, 16 - ldr r0, _081180D4 @ =0x0000ffff - ands r0, r1 - orrs r0, r2 - str r0, [r6, 0x4] - mov r0, sp - bl LoadSpriteSheet - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x4 - bls _08117F3A - ldr r0, _081180D8 @ =gSpriteTemplate_83FA2B0 - movs r1, 0xD0 - movs r2, 0x10 - movs r3, 0x4 - bl CreateSprite - ldr r4, _081180DC @ =gSharedMem + 0x19000 - adds r1, r4, 0 - adds r1, 0x50 - strb r0, [r1] - ldr r3, _081180E0 @ =gSprites - ldrb r1, [r1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r0] - movs r5, 0 - adds r4, 0x3C - adds r7, r3, 0 -_08117FA2: - lsls r1, r5, 19 - movs r0, 0xC4 - lsls r0, 16 - adds r1, r0 - asrs r1, 16 - ldr r0, _081180E4 @ =gSpriteTemplate_83FA2C8 - movs r2, 0x18 - movs r3, 0 - bl CreateSprite - adds r3, r5, 0 - adds r3, 0x15 - adds r3, r4 - strb r0, [r3] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r7 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r7 - adds r0, 0x2C - ldrb r1, [r0] - movs r6, 0x40 - orrs r1, r6 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bls _08117FA2 - ldr r0, _081180E8 @ =gSpriteTemplate_83FA2E0 - movs r1, 0x78 - movs r2, 0x44 - movs r3, 0x4 - bl CreateSprite - ldr r3, _081180DC @ =gSharedMem + 0x19000 - adds r1, r3, 0 - adds r1, 0x55 - strb r0, [r1] - ldr r2, _081180E0 @ =gSprites - ldrb r1, [r1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x2C - ldrb r1, [r0] - orrs r1, r6 - strb r1, [r0] - movs r5, 0 - adds r3, 0x3C - mov r8, r3 - adds r4, r2, 0 -_08118020: - lsls r1, r5, 20 - movs r0, 0xC0 - lsls r0, 16 - adds r1, r0 - asrs r1, 16 - ldr r0, _081180EC @ =gSpriteTemplate_83FA2F8 - movs r2, 0x24 - movs r3, 0x4 - bl CreateSprite - adds r2, r5, 0 - adds r2, 0x1A - add r2, r8 - strb r0, [r2] - ldrb r1, [r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r1, [r0] - movs r7, 0x4 - orrs r1, r7 - strb r1, [r0] - ldrb r1, [r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x2C - ldrb r1, [r0] - movs r6, 0x40 - orrs r1, r6 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _08118020 - ldr r0, _081180F0 @ =gSpriteTemplate_83FA310 - movs r1, 0x98 - movs r2, 0x60 - movs r3, 0x9 - bl CreateSprite - ldr r3, _081180DC @ =gSharedMem + 0x19000 - adds r3, 0x6C - strb r0, [r3] - ldr r4, _081180E0 @ =gSprites - ldrb r0, [r3] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r7 - strb r0, [r1, 0x5] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x2C - ldrb r1, [r0] - orrs r1, r6 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r7 - strb r1, [r0] - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081180C8: .4byte gSharedMem -_081180CC: .4byte gUnknown_083FA21C -_081180D0: .4byte 0xffff0000 -_081180D4: .4byte 0x0000ffff -_081180D8: .4byte gSpriteTemplate_83FA2B0 -_081180DC: .4byte gSharedMem + 0x19000 -_081180E0: .4byte gSprites -_081180E4: .4byte gSpriteTemplate_83FA2C8 -_081180E8: .4byte gSpriteTemplate_83FA2E0 -_081180EC: .4byte gSpriteTemplate_83FA2F8 -_081180F0: .4byte gSpriteTemplate_83FA310 - thumb_func_end sub_8117F2C - - thumb_func_start sub_81180F4 -sub_81180F4: @ 81180F4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 16 - lsrs r7, r0, 16 - movs r0, 0xFA - lsls r0, 2 - mov r8, r0 - movs r4, 0 - movs r6, 0 - ldr r1, _081181D4 @ =gSharedMem + 0x19000 - mov r9, r1 - ldr r0, _081181D8 @ =gSprites - mov r10, r0 -_08118114: - adds r0, r7, 0 - mov r1, r8 - bl __udivsi3 - lsls r0, 24 - lsrs r5, r0, 24 - adds r3, r6, 0 - adds r3, 0x15 - mov r0, r9 - adds r0, 0x3C - adds r0, r3, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _081181D8 @ =gSprites - adds r0, r1 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - adds r0, r3, 0 - cmp r5, 0 - bne _0811814E - cmp r4, 0 - bne _0811814E - cmp r6, 0x3 - bne _081181A2 -_0811814E: - mov r3, r9 - adds r3, 0x3C - adds r3, r0, r3 - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r10 - adds r0, 0x3E - ldrb r1, [r0] - movs r4, 0x5 - negs r4, r4 - adds r2, r4, 0 - ands r1, r2 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - mov r1, r10 - adds r3, r0, r1 - adds r4, r3, 0 - adds r4, 0x40 - ldr r1, _081181DC @ =gSprites + 0x8 - adds r0, r1 - ldr r0, [r0] - ldr r1, [r0] - lsls r0, r5, 2 - adds r0, r1 - ldrh r2, [r0] - ldrh r4, [r4] - adds r2, r4 - ldr r4, _081181E0 @ =0x000003ff - adds r0, r4, 0 - ands r2, r0 - ldrh r0, [r3, 0x4] - ldr r4, _081181E4 @ =0xfffffc00 - adds r1, r4, 0 - ands r0, r1 - orrs r0, r2 - strh r0, [r3, 0x4] - movs r4, 0x1 -_081181A2: - adds r0, r7, 0 - mov r1, r8 - bl __umodsi3 - lsls r0, 16 - lsrs r7, r0, 16 - mov r0, r8 - movs r1, 0xA - bl __udivsi3 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _08118114 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081181D4: .4byte gSharedMem + 0x19000 -_081181D8: .4byte gSprites -_081181DC: .4byte gSprites + 0x8 -_081181E0: .4byte 0x000003ff -_081181E4: .4byte 0xfffffc00 - thumb_func_end sub_81180F4 - - thumb_func_start sub_81181E8 -sub_81181E8: @ 81181E8 - push {r4,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _08118220 @ =gUnknown_083FA608 - mov r0, sp - movs r2, 0x5 - bl memcpy - cmp r4, 0x13 - bls _08118200 - movs r4, 0 -_08118200: - ldr r3, _08118224 @ =gUnknown_083F8C00 - lsls r0, r4, 2 - adds r0, r4 - lsls r2, r0, 2 - adds r0, r2, r3 - ldrb r0, [r0, 0x1] - lsls r0, 28 - lsrs r0, 28 - cmp r0, 0x4 - beq _08118254 - cmp r0, 0x4 - bgt _08118228 - cmp r0, 0x3 - beq _0811822E - b _08118290 - .align 2, 0 -_08118220: .4byte gUnknown_083FA608 -_08118224: .4byte gUnknown_083F8C00 -_08118228: - cmp r0, 0xC - beq _08118274 - b _08118290 -_0811822E: - adds r0, r4, 0 - movs r1, 0x5 - bl __udivsi3 - subs r0, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _08118250 @ =gSharedMem + 0x19000 - adds r0, 0x16 - adds r1, r4, r0 - ldrb r0, [r1] - cmp r0, 0x3 - bhi _08118290 - ldrb r0, [r1] - adds r0, 0x1 - b _0811826A - .align 2, 0 -_08118250: .4byte gSharedMem + 0x19000 -_08118254: - subs r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _08118270 @ =gSharedMem + 0x19000 - adds r0, 0x12 - adds r1, r4, r0 - ldrb r0, [r1] - cmp r0, 0x2 - bhi _08118290 - ldrb r0, [r1] - adds r0, 0x2 -_0811826A: - add r0, sp - ldrb r0, [r0] - b _08118292 - .align 2, 0 -_08118270: .4byte gSharedMem + 0x19000 -_08118274: - ldr r1, _0811828C @ =gSharedMem + 0x19000 - adds r0, r3, 0 - adds r0, 0x8 - adds r0, r2, r0 - ldr r1, [r1, 0x8] - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _08118290 - mov r0, sp - ldrb r0, [r0, 0x4] - b _08118292 - .align 2, 0 -_0811828C: .4byte gSharedMem + 0x19000 -_08118290: - movs r0, 0 -_08118292: - add sp, 0x8 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81181E8 - - thumb_func_start sub_811829C -sub_811829C: @ 811829C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _081182E8 @ =gSharedMem + 0x19000 - adds r1, 0x55 - ldrb r2, [r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r2, _081182EC @ =gSprites - adds r4, r1, r2 - bl sub_81181E8 - adds r3, r4, 0 - adds r3, 0x2B - strb r0, [r3] - adds r2, r4, 0 - adds r2, 0x40 - ldr r1, [r4, 0x8] - ldrb r0, [r3] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldrh r1, [r0] - ldrh r2, [r2] - adds r1, r2 - ldr r2, _081182F0 @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r4, 0x4] - ldr r0, _081182F4 @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081182E8: .4byte gSharedMem + 0x19000 -_081182EC: .4byte gSprites -_081182F0: .4byte 0x000003ff -_081182F4: .4byte 0xfffffc00 - thumb_func_end sub_811829C - - thumb_func_start sub_81182F8 -sub_81182F8: @ 81182F8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r2, r0, 24 - movs r5, 0 - ldr r0, _08118320 @ =gSharedMem + 0x19000 - ldrb r1, [r0, 0x19] - adds r3, r0, 0 - cmp r1, 0x1 - bne _08118310 - movs r5, 0x2 -_08118310: - cmp r2, 0x6 - bls _08118316 - b _08118464 -_08118316: - lsls r0, r2, 2 - ldr r1, _08118324 @ =_08118328 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08118320: .4byte gSharedMem + 0x19000 -_08118324: .4byte _08118328 - .align 2, 0 -_08118328: - .4byte _08118464 - .4byte _08118420 - .4byte _081183F8 - .4byte _081183EC - .4byte _081183C4 - .4byte _081183B8 - .4byte _08118344 -_08118344: - movs r4, 0 - ldr r5, _081183A8 @ =gSprites - ldr r0, _081183AC @ =gSharedMem + 0x1903C - mov r8, r0 - movs r2, 0x5 - negs r2, r2 - mov r12, r2 - adds r6, r5, 0 - adds r6, 0x8 - ldr r7, _081183B0 @ =0xfffffc00 -_08118358: - adds r3, r4, 0 - adds r3, 0x1A - add r3, r8 - ldrb r0, [r3] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - adds r1, 0x3E - ldrb r2, [r1] - mov r0, r12 - ands r0, r2 - strb r0, [r1] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r3, r0, r5 - adds r2, r3, 0 - adds r2, 0x40 - adds r0, r6 - ldr r0, [r0] - ldr r0, [r0] - ldrh r1, [r0] - ldrh r2, [r2] - adds r1, r2 - ldr r2, _081183B4 @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - adds r0, r7, 0 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _08118358 - b _081184B2 - .align 2, 0 -_081183A8: .4byte gSprites -_081183AC: .4byte gSharedMem + 0x1903C -_081183B0: .4byte 0xfffffc00 -_081183B4: .4byte 0x000003ff -_081183B8: - ldr r2, _081183C0 @ =gSprites - adds r0, r3, 0 - adds r0, 0x58 - b _08118426 - .align 2, 0 -_081183C0: .4byte gSprites -_081183C4: - ldr r2, _081183E8 @ =gSprites - adds r0, r3, 0 - adds r0, 0x58 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r3, r0, r2 - adds r4, r3, 0 - adds r4, 0x40 - adds r2, 0x8 - adds r0, r2 - ldr r0, [r0] - ldr r1, [r0] - lsls r0, r5, 2 - adds r0, r1 - ldrh r1, [r0, 0x8] - b _08118442 - .align 2, 0 -_081183E8: .4byte gSprites -_081183EC: - ldr r2, _081183F4 @ =gSprites - adds r0, r3, 0 - adds r0, 0x57 - b _08118426 - .align 2, 0 -_081183F4: .4byte gSprites -_081183F8: - ldr r2, _0811841C @ =gSprites - adds r0, r3, 0 - adds r0, 0x57 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r3, r0, r2 - adds r4, r3, 0 - adds r4, 0x40 - adds r2, 0x8 - adds r0, r2 - ldr r0, [r0] - ldr r1, [r0] - lsls r0, r5, 2 - adds r0, r1 - ldrh r1, [r0, 0x8] - b _08118442 - .align 2, 0 -_0811841C: .4byte gSprites -_08118420: - ldr r2, _08118458 @ =gSprites - adds r0, r3, 0 - adds r0, 0x56 -_08118426: - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r3, r0, r2 - adds r4, r3, 0 - adds r4, 0x40 - adds r2, 0x8 - adds r0, r2 - ldr r0, [r0] - ldr r1, [r0] - lsls r0, r5, 2 - adds r0, r1 - ldrh r1, [r0, 0x4] -_08118442: - ldrh r4, [r4] - adds r1, r4 - ldr r2, _0811845C @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - ldr r0, _08118460 @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - b _081184B2 - .align 2, 0 -_08118458: .4byte gSprites -_0811845C: .4byte 0x000003ff -_08118460: .4byte 0xfffffc00 -_08118464: - movs r4, 0 - lsls r6, r5, 2 - ldr r5, _081184BC @ =gSprites - ldr r0, _081184C0 @ =gSharedMem + 0x1903C - mov r8, r0 - adds r7, r5, 0 - adds r7, 0x8 - ldr r2, _081184C4 @ =0xfffffc00 - mov r12, r2 -_08118476: - adds r0, r4, 0 - adds r0, 0x1A - add r0, r8 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r3, r0, r5 - adds r2, r3, 0 - adds r2, 0x40 - adds r0, r7 - ldr r0, [r0] - ldr r0, [r0] - adds r0, r6, r0 - ldrh r1, [r0, 0x8] - ldrh r2, [r2] - adds r1, r2 - ldr r2, _081184C8 @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - mov r0, r12 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _08118476 -_081184B2: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081184BC: .4byte gSprites -_081184C0: .4byte gSharedMem + 0x1903C -_081184C4: .4byte 0xfffffc00 -_081184C8: .4byte 0x000003ff - thumb_func_end sub_81182F8 - - thumb_func_start sub_81184CC -sub_81184CC: @ 81184CC - ldr r1, _081184D4 @ =gSharedMem + 0x19000 - ldrh r1, [r1, 0x26] - strh r1, [r0, 0x24] - bx lr - .align 2, 0 -_081184D4: .4byte gSharedMem + 0x19000 - thumb_func_end sub_81184CC - - thumb_func_start sub_81184D8 -sub_81184D8: @ 81184D8 - push {r4,r5,lr} - sub sp, 0x8 - ldr r4, _08118544 @ =gUnknown_083FA42C - ldr r0, [r4] - ldr r5, _08118548 @ =gSharedMem - adds r1, r5, 0 - bl LZ77UnCompWram - str r5, [sp] - ldrh r1, [r4, 0x6] - lsls r1, 16 - ldrh r0, [r4, 0x4] - orrs r0, r1 - str r0, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet - ldr r0, _0811854C @ =gSpriteTemplate_83FA434 - movs r1, 0x74 - movs r2, 0x50 - movs r3, 0x51 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08118550 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0xC8 - lsls r0, 9 - adds r5, r0 - ldrh r0, [r5, 0x24] - movs r2, 0 - strh r0, [r1, 0x2E] - strh r2, [r1, 0x30] - adds r3, r1, 0 - adds r3, 0x2C - ldrb r0, [r3] - movs r2, 0x40 - orrs r0, r2 - movs r2, 0x80 - orrs r0, r2 - strb r0, [r3] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x2 - orrs r0, r2 - strb r0, [r1] - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08118544: .4byte gUnknown_083FA42C -_08118548: .4byte gSharedMem -_0811854C: .4byte gSpriteTemplate_83FA434 -_08118550: .4byte gSprites - thumb_func_end sub_81184D8 - - thumb_func_start sub_8118554 -sub_8118554: @ 8118554 - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - ldr r1, _08118574 @ =gOamMatrices - lsls r0, 3 - adds r0, r1 - ldr r2, _08118578 @ =gSharedMem + 0x19000 - ldrh r1, [r2, 0x2C] - strh r1, [r0, 0x6] - ldrh r1, [r2, 0x2C] - strh r1, [r0] - ldrh r1, [r2, 0x2E] - strh r1, [r0, 0x2] - ldrh r1, [r2, 0x30] - strh r1, [r0, 0x4] - bx lr - .align 2, 0 -_08118574: .4byte gOamMatrices -_08118578: .4byte gSharedMem + 0x19000 - thumb_func_end sub_8118554 - - thumb_func_start sub_811857C -sub_811857C: @ 811857C - push {r4-r6,lr} - movs r4, 0 - ldr r6, _081185DC @ =gSharedMem + 0x1903C - ldr r5, _081185E0 @ =gSprites -_08118584: - movs r3, 0x39 - subs r3, r4 - lsls r3, 24 - lsrs r3, 24 - ldr r0, _081185E4 @ =gSpriteTemplate_83FA40C - movs r1, 0x74 - movs r2, 0x50 - bl CreateSprite - adds r3, r4, r6 - strb r0, [r3] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _081185CA - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] -_081185CA: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _08118584 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081185DC: .4byte gSharedMem + 0x1903C -_081185E0: .4byte gSprites -_081185E4: .4byte gSpriteTemplate_83FA40C - thumb_func_end sub_811857C - - thumb_func_start sub_81185E8 -sub_81185E8: @ 81185E8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, _08118660 @ =gSharedMem + 0x19000 - adds r0, 0x3C - ldrb r5, [r0] - movs r6, 0 - ldr r7, _08118664 @ =gSprites - movs r0, 0x1C - adds r0, r7 - mov r10, r0 - movs r1, 0x2E - adds r1, r7 - mov r9, r1 - mov r8, r6 -_0811860A: - lsls r4, r5, 4 - adds r4, r5 - lsls r4, 2 - adds r0, r4, r7 - adds r3, r0, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r3] - mov r1, r10 - adds r2, r4, r1 - ldr r1, _08118668 @ =SpriteCallbackDummy - str r1, [r2] - movs r1, 0 - bl StartSpriteAnim - movs r1, 0 - adds r2, r5, 0x1 - adds r3, r6, 0x1 -_08118632: - lsls r0, r1, 1 - adds r0, r4 - add r0, r9 - mov r5, r8 - strh r5, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x7 - bls _08118632 - lsls r0, r2, 24 - lsrs r5, r0, 24 - lsls r0, r3, 24 - lsrs r6, r0, 24 - cmp r6, 0x5 - bls _0811860A - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08118660: .4byte gSharedMem + 0x19000 -_08118664: .4byte gSprites -_08118668: .4byte SpriteCallbackDummy - thumb_func_end sub_81185E8 - - thumb_func_start sub_811866C -sub_811866C: @ 811866C - push {r4,r5,lr} - adds r3, r0, 0 - ldr r0, _0811869C @ =gSharedMem + 0x19000 - ldrh r4, [r0, 0x24] - movs r2, 0x24 - ldrsh r1, [r0, r2] - ldrh r2, [r3, 0x34] - movs r5, 0x34 - ldrsh r0, [r3, r5] - cmp r1, r0 - ble _081186A8 - movs r1, 0xB4 - lsls r1, 1 - adds r0, r2, r1 - subs r2, r0, r4 - strh r2, [r3, 0x3A] - lsls r1, r2, 16 - ldr r0, _081186A0 @ =0x01670000 - cmp r1, r0 - ble _081186AC - ldr r5, _081186A4 @ =0xfffffe98 - adds r0, r2, r5 - b _081186AA - .align 2, 0 -_0811869C: .4byte gSharedMem + 0x19000 -_081186A0: .4byte 0x01670000 -_081186A4: .4byte 0xfffffe98 -_081186A8: - subs r0, r2, r4 -_081186AA: - strh r0, [r3, 0x3A] -_081186AC: - movs r1, 0x3A - ldrsh r0, [r3, r1] - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_811866C - - thumb_func_start sub_81186B8 -sub_81186B8: @ 81186B8 - push {r4,lr} - bl sub_811866C - ldr r4, _081186E0 @ =gSharedMem + 0x19000 - lsls r0, 16 - asrs r0, 16 - bl __floatsisf - ldr r1, _081186E4 @ =0x41f00000 - bl __divsf3 - bl __fixunssfsi - adds r4, 0x7E - strb r0, [r4] - ldrb r0, [r4] - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_081186E0: .4byte gSharedMem + 0x19000 -_081186E4: .4byte 0x41f00000 - thumb_func_end sub_81186B8 - - thumb_func_start sub_81186E8 -sub_81186E8: @ 81186E8 - push {r4,lr} - adds r4, r0, 0 - bl sub_811866C - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1E - bl __modsi3 - lsls r0, 16 - asrs r1, r0, 16 - cmp r1, 0xE - bne _08118708 - movs r0, 0 - strh r0, [r4, 0x32] - b _0811871E -_08118708: - cmp r1, 0xD - bgt _08118710 - movs r0, 0xE - b _08118712 -_08118710: - movs r0, 0x2B -_08118712: - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - strh r0, [r4, 0x32] - lsls r0, 16 - asrs r0, 16 -_0811871E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81186E8 - - thumb_func_start sub_8118724 -sub_8118724: @ 8118724 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - ldr r5, _08118770 @ =gSharedMem + 0x19000 - adds r4, r5, 0 - adds r4, 0x8C - adds r1, r5, 0 - adds r1, 0x90 - ldr r0, [r4] - ldr r1, [r1] - bl __addsf3 - adds r1, r0, 0 - str r1, [r4] - movs r0, 0x88 - adds r0, r5 - mov r8, r0 - ldr r0, [r0] - bl __addsf3 - adds r4, r0, 0 - mov r1, r8 - str r4, [r1] - ldr r7, _08118774 @ =0x43b40000 - adds r1, r7, 0 - bl __gesf2 - cmp r0, 0 - blt _08118778 - adds r0, r4, 0 - adds r1, r7, 0 - bl __subsf3 - mov r2, r8 - str r0, [r2] - b _08118790 - .align 2, 0 -_08118770: .4byte gSharedMem + 0x19000 -_08118774: .4byte 0x43b40000 -_08118778: - ldr r1, _08118824 @ =0x00000000 - adds r0, r4, 0 - bl __ltsf2 - cmp r0, 0 - bge _08118790 - adds r0, r4, 0 - adds r1, r7, 0 - bl __addsf3 - mov r1, r8 - str r0, [r1] -_08118790: - adds r0, r5, 0 - adds r0, 0x88 - ldr r0, [r0] - bl __fixsfsi - strh r0, [r6, 0x34] - adds r4, r5, 0 - adds r4, 0x98 - adds r1, r5, 0 - adds r1, 0x9C - ldr r0, [r4] - ldr r1, [r1] - bl __addsf3 - adds r1, r0, 0 - str r1, [r4] - subs r4, 0x4 - ldr r0, [r4] - bl __addsf3 - str r0, [r4] - bl __fixsfsi - strh r0, [r6, 0x36] - ldrh r0, [r6, 0x34] - bl Sin2 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldrh r0, [r6, 0x34] - bl Cos2 - lsls r4, 16 - asrs r4, 16 - movs r2, 0x36 - ldrsh r1, [r6, r2] - muls r1, r4 - asrs r1, 12 - strh r1, [r6, 0x24] - lsls r0, 16 - asrs r0, 16 - negs r0, r0 - movs r2, 0x36 - ldrsh r1, [r6, r2] - muls r0, r1 - asrs r0, 12 - strh r0, [r6, 0x26] - bl IsSEPlaying - lsls r0, 24 - cmp r0, 0 - beq _08118818 - ldr r0, _08118828 @ =gMPlay_SE1 - ldr r4, _0811882C @ =0x0000ffff - ldrh r2, [r6, 0x24] - lsls r2, 24 - asrs r2, 24 - adds r1, r4, 0 - bl m4aMPlayPanpotControl - ldr r0, _08118830 @ =gMPlay_SE2 - ldrh r2, [r6, 0x24] - lsls r2, 24 - asrs r2, 24 - adds r1, r4, 0 - bl m4aMPlayPanpotControl -_08118818: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08118824: .4byte 0x00000000 -_08118828: .4byte gMPlay_SE1 -_0811882C: .4byte 0x0000ffff -_08118830: .4byte gMPlay_SE2 - thumb_func_end sub_8118724 - - thumb_func_start sub_8118834 -sub_8118834: @ 8118834 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r1, _0811888C @ =gSharedMem + 0x19000 - ldrh r0, [r5, 0x3A] - ldrh r1, [r1, 0x24] - adds r2, r0, r1 - strh r2, [r5, 0x34] - lsls r1, r2, 16 - ldr r0, _08118890 @ =0x01670000 - cmp r1, r0 - ble _08118850 - ldr r1, _08118894 @ =0xfffffe98 - adds r0, r2, r1 - strh r0, [r5, 0x34] -_08118850: - ldrh r0, [r5, 0x34] - bl Sin2 - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldrh r0, [r5, 0x34] - bl Cos2 - lsls r4, 16 - asrs r4, 16 - movs r2, 0x36 - ldrsh r1, [r5, r2] - muls r1, r4 - asrs r1, 12 - strh r1, [r5, 0x24] - lsls r0, 16 - asrs r0, 16 - negs r0, r0 - movs r2, 0x36 - ldrsh r1, [r5, r2] - muls r0, r1 - ldr r1, _08118898 @ =gSpriteCoordOffsetY - asrs r0, 12 - ldrh r1, [r1] - adds r0, r1 - strh r0, [r5, 0x26] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0811888C: .4byte gSharedMem + 0x19000 -_08118890: .4byte 0x01670000 -_08118894: .4byte 0xfffffe98 -_08118898: .4byte gSpriteCoordOffsetY - thumb_func_end sub_8118834 - - thumb_func_start sub_811889C -sub_811889C: @ 811889C - push {r4-r6,lr} - adds r5, r0, 0 - bl sub_8118724 - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x36] - adds r0, 0x84 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xD4 - bls _081188C2 - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - b _081188CE -_081188C2: - adds r2, r5, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 -_081188CE: - strb r0, [r2] - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0x1D - ble _0811898E - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _08118908 - ldr r6, _08118900 @ =gSharedMem + 0x19000 - adds r4, r6, 0 - adds r4, 0x94 - adds r0, r6, 0 - adds r0, 0xA0 - ldr r0, [r0] - ldr r1, _08118904 @ =0x40000000 - bl __subsf3 - adds r1, r0, 0 - ldr r0, [r4] - bl __lesf2 - cmp r0, 0 - bgt _0811898E - b _08118926 - .align 2, 0 -_08118900: .4byte gSharedMem + 0x19000 -_08118904: .4byte 0x40000000 -_08118908: - ldr r6, _08118994 @ =gSharedMem + 0x19000 - adds r4, r6, 0 - adds r4, 0x94 - adds r0, r6, 0 - adds r0, 0xA0 - ldr r0, [r0] - ldr r1, _08118998 @ =0x40000000 - bl __subsf3 - adds r1, r0, 0 - ldr r0, [r4] - bl __gesf2 - cmp r0, 0 - blt _0811898E -_08118926: - adds r1, r6, 0 - adds r1, 0x7D - movs r0, 0xFF - strb r0, [r1] - ldrb r1, [r6, 0x3] - movs r0, 0x7F - ands r0, r1 - strb r0, [r6, 0x3] - adds r0, r5, 0 - adds r0, 0x2B - ldrb r1, [r0] - adds r1, 0x3 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl StartSpriteAnim - adds r0, r5, 0 - bl sub_81186B8 - movs r0, 0x1E - strh r0, [r5, 0x36] - adds r0, r5, 0 - bl sub_811866C - movs r1, 0x3A - ldrsh r0, [r5, r1] - movs r1, 0x1E - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r1, 1 - adds r1, 0xF - strh r1, [r5, 0x3A] - ldr r0, _0811899C @ =sub_8118834 - str r0, [r5, 0x1C] - movs r0, 0x47 - bl m4aSongNumStartOrChange - adds r2, r6, 0 - adds r2, 0x9C - adds r1, r6, 0 - adds r1, 0x98 - ldr r0, _081189A0 @ =0x00000000 - str r0, [r1] - str r0, [r2] - subs r1, 0xC - ldr r0, _081189A4 @ =0xbf800000 - str r0, [r1] -_0811898E: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08118994: .4byte gSharedMem + 0x19000 -_08118998: .4byte 0x40000000 -_0811899C: .4byte sub_8118834 -_081189A0: .4byte 0x00000000 -_081189A4: .4byte 0xbf800000 - thumb_func_end sub_811889C - - thumb_func_start sub_81189A8 -sub_81189A8: @ 81189A8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r7, r0, 0 - bl sub_8118724 - movs r1, 0x34 - ldrsh r0, [r7, r1] - cmp r0, 0 - beq _081189C6 - cmp r0, 0xB4 - beq _08118A2C - b _08118B0C -_081189C6: - movs r1, 0x2E - ldrsh r0, [r7, r1] - cmp r0, 0x1 - bne _081189D0 - b _08118B0C -_081189D0: - movs r1, 0x3C - ldrsh r0, [r7, r1] - bl __floatsisf - mov r8, r0 - ldr r0, _08118A24 @ =gUnknown_083F8DF4 - mov r9, r0 - ldr r1, _08118A28 @ =gSharedMem + 0x19000 - mov r10, r1 - ldrb r4, [r1, 0x4] - lsls r4, 30 - lsrs r0, r4, 25 - add r0, r9 - ldrb r0, [r0, 0x1] - bl __floatsisf - adds r1, r0, 0 - mov r0, r8 - bl __mulsf3 - adds r6, r0, 0 - lsrs r0, r4, 25 - add r0, r9 - ldrb r0, [r0, 0x2] - subs r0, 0x1 - bl __floatsisf - adds r1, r0, 0 - adds r0, r6, 0 - bl __addsf3 - adds r5, r0, 0 - lsrs r4, 25 - add r4, r9 - ldrh r0, [r4, 0xC] - bl __floatsisf - adds r1, r0, 0 - mov r0, r8 - bl __divsf3 - b _08118A8A - .align 2, 0 -_08118A24: .4byte gUnknown_083F8DF4 -_08118A28: .4byte gSharedMem + 0x19000 -_08118A2C: - movs r1, 0x2E - ldrsh r0, [r7, r1] - cmp r0, 0 - beq _08118B0C - movs r1, 0x3C - ldrsh r0, [r7, r1] - bl __floatsisf - mov r8, r0 - ldr r0, _08118B1C @ =gUnknown_083F8DF4 - mov r9, r0 - ldr r1, _08118B20 @ =gSharedMem + 0x19000 - mov r10, r1 - ldrb r4, [r1, 0x4] - lsls r4, 30 - lsrs r0, r4, 25 - add r0, r9 - ldrb r0, [r0, 0x1] - bl __floatsisf - adds r1, r0, 0 - mov r0, r8 - bl __mulsf3 - adds r6, r0, 0 - lsrs r0, r4, 25 - add r0, r9 - ldrb r0, [r0, 0x2] - subs r0, 0x1 - bl __floatsisf - adds r1, r0, 0 - adds r0, r6, 0 - bl __addsf3 - adds r5, r0, 0 - lsrs r4, 25 - add r4, r9 - ldrh r0, [r4, 0xC] - bl __floatsisf - adds r1, r0, 0 - mov r0, r8 - bl __divsf3 - bl __negsf2 -_08118A8A: - adds r2, r0, 0 - mov r6, r10 - adds r1, r6, 0 - adds r1, 0xA0 - adds r0, r6, 0 - adds r0, 0x94 - ldr r0, [r0] - str r0, [r1] - adds r0, r6, 0 - adds r0, 0x98 - str r2, [r0] - movs r0, 0x9C - adds r0, r6 - mov r8, r0 - adds r0, r2, 0 - adds r1, r2, 0 - bl __addsf3 - adds r1, r5, 0 - bl __divsf3 - adds r4, r0, 0 - adds r0, r5, 0 - adds r1, r5, 0 - bl __mulsf3 - adds r1, r0, 0 - ldr r0, _08118B24 @ =0x40000000 - bl __divsf3 - adds r1, r0, 0 - adds r0, r4, 0 - bl __addsf3 - bl __negsf2 - mov r1, r8 - str r0, [r1] - adds r1, r6, 0 - adds r1, 0x8C - ldr r0, _08118B28 @ =0x00000000 - str r0, [r1] - adds r2, r7, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - adds r0, r7, 0 - adds r0, 0x2A - movs r2, 0 - strb r2, [r0] - adds r3, r7, 0 - adds r3, 0x3F - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r3] - ldr r0, _08118B2C @ =sub_811889C - str r0, [r7, 0x1C] - strh r2, [r7, 0x32] -_08118B0C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08118B1C: .4byte gUnknown_083F8DF4 -_08118B20: .4byte gSharedMem + 0x19000 -_08118B24: .4byte 0x40000000 -_08118B28: .4byte 0x00000000 -_08118B2C: .4byte sub_811889C - thumb_func_end sub_81189A8 - - thumb_func_start sub_8118B30 -sub_8118B30: @ 8118B30 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x32 - ldrsh r0, [r5, r1] - bl __floatsisf - adds r4, r0, 0 - ldr r1, _08118BCC @ =0x3d4ccccd - bl __mulsf3 - adds r1, r4, 0 - bl __mulsf3 - bl __fixsfsi - adds r1, r0, 0 - subs r1, 0x2D - strh r1, [r5, 0x26] - ldrh r0, [r5, 0x32] - adds r0, 0x1 - strh r0, [r5, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1D - ble _08118BC6 - lsls r0, r1, 16 - cmp r0, 0 - blt _08118BC6 - ldr r4, _08118BD0 @ =gSharedMem + 0x19000 - adds r1, r4, 0 - adds r1, 0x7D - movs r0, 0xFF - strb r0, [r1] - ldrb r1, [r4, 0x3] - movs r0, 0x7F - ands r0, r1 - strb r0, [r4, 0x3] - adds r0, r5, 0 - adds r0, 0x2B - ldrb r1, [r0] - adds r1, 0x3 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl StartSpriteAnim - adds r0, r5, 0 - bl sub_81186B8 - movs r0, 0x1E - strh r0, [r5, 0x36] - adds r0, r5, 0 - bl sub_811866C - movs r1, 0x3A - ldrsh r0, [r5, r1] - movs r1, 0x1E - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r1, 1 - adds r1, 0xF - strh r1, [r5, 0x3A] - ldr r0, _08118BD4 @ =sub_8118834 - str r0, [r5, 0x1C] - movs r0, 0x47 - bl m4aSongNumStartOrChange - ldrb r0, [r4, 0x3] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r4, 0x3] -_08118BC6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08118BCC: .4byte 0x3d4ccccd -_08118BD0: .4byte gSharedMem + 0x19000 -_08118BD4: .4byte sub_8118834 - thumb_func_end sub_8118B30 - - thumb_func_start sub_8118BD8 -sub_8118BD8: @ 8118BD8 - push {r4,lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x32] - adds r1, r0, 0x1 - strh r1, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2C - bgt _08118C1C - ldrh r4, [r3, 0x26] - subs r0, r4, 0x1 - strh r0, [r3, 0x26] - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x2D - bne _08118CA2 - ldr r2, _08118C14 @ =gSprites - ldr r0, _08118C18 @ =gSharedMem + 0x19000 - adds r0, 0x73 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x2B - ldrb r0, [r0] - cmp r0, 0x1 - bne _08118CA2 - strh r4, [r3, 0x26] - b _08118CA2 - .align 2, 0 -_08118C14: .4byte gSprites -_08118C18: .4byte gSharedMem + 0x19000 -_08118C1C: - lsls r0, r1, 16 - asrs r0, 16 - movs r2, 0x3C - ldrsh r1, [r3, r2] - cmp r0, r1 - bge _08118C68 - ldr r2, _08118C58 @ =gSprites - ldr r0, _08118C5C @ =gSharedMem + 0x19000 - adds r0, 0x73 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r0, r2 - adds r0, r1, 0 - adds r0, 0x2C - ldrb r0, [r0] - lsls r0, 26 - cmp r0, 0 - bne _08118CA2 - adds r0, r1, 0 - adds r0, 0x2B - ldrb r0, [r0] - cmp r0, 0x1 - bne _08118C60 - ldrh r0, [r3, 0x26] - adds r0, 0x1 - strh r0, [r3, 0x26] - b _08118CA2 - .align 2, 0 -_08118C58: .4byte gSprites -_08118C5C: .4byte gSharedMem + 0x19000 -_08118C60: - ldrh r0, [r3, 0x26] - subs r0, 0x1 - strh r0, [r3, 0x26] - b _08118CA2 -_08118C68: - adds r2, r3, 0 - adds r2, 0x2C - ldrb r1, [r2] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - adds r1, r3, 0 - adds r1, 0x2A - movs r2, 0 - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x3F - adds r0, r3 - mov r12, r0 - ldrb r0, [r0] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - mov r1, r12 - strb r0, [r1] - strh r2, [r3, 0x32] - ldr r0, _08118CA8 @ =sub_8118B30 - str r0, [r3, 0x1C] - movs r0, 0x3D - bl m4aSongNumStart -_08118CA2: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08118CA8: .4byte sub_8118B30 - thumb_func_end sub_8118BD8 - - thumb_func_start sub_8118CAC -sub_8118CAC: @ 8118CAC - push {r4,lr} - adds r4, r0, 0 - bl sub_8118724 - movs r0, 0x34 - ldrsh r1, [r4, r0] - cmp r1, 0x5A - beq _08118CC6 - movs r0, 0x87 - lsls r0, 1 - cmp r1, r0 - beq _08118CD0 - b _08118CE0 -_08118CC6: - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _08118CE0 - b _08118CD8 -_08118CD0: - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08118CE0 -_08118CD8: - ldr r0, _08118CE8 @ =sub_8118BD8 - str r0, [r4, 0x1C] - movs r0, 0 - strh r0, [r4, 0x32] -_08118CE0: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08118CE8: .4byte sub_8118BD8 - thumb_func_end sub_8118CAC - - thumb_func_start sub_8118CEC -sub_8118CEC: @ 8118CEC - push {r4,lr} - adds r4, r0, 0 - bl sub_8118724 - ldr r0, _08118D10 @ =gSharedMem + 0x19000 - ldrb r0, [r0, 0x3] - lsls r0, 27 - lsrs r0, 27 - cmp r0, 0 - beq _08118D04 - cmp r0, 0x1 - beq _08118D18 -_08118D04: - adds r0, r4, 0 - bl sub_8119224 - ldr r0, _08118D14 @ =sub_81189A8 - b _08118D20 - .align 2, 0 -_08118D10: .4byte gSharedMem + 0x19000 -_08118D14: .4byte sub_81189A8 -_08118D18: - adds r0, r4, 0 - bl sub_81193D4 - ldr r0, _08118D28 @ =sub_8118CAC -_08118D20: - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08118D28: .4byte sub_8118CAC - thumb_func_end sub_8118CEC - - thumb_func_start sub_8118D2C -sub_8118D2C: @ 8118D2C - push {r4,r5,lr} - adds r5, r0, 0 - bl sub_8118724 - ldrh r0, [r5, 0x32] - subs r0, 0x1 - strh r0, [r5, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - bne _08118D50 - ldr r4, _08118DB8 @ =gSharedMem + 0x19000 - adds r4, 0x98 - ldr r0, [r4] - ldr r1, _08118DBC @ =0xbf800000 - bl __mulsf3 - str r0, [r4] -_08118D50: - movs r1, 0x32 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _08118DDC - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _08118DC4 - ldr r1, _08118DB8 @ =gSharedMem + 0x19000 - adds r2, r1, 0 - adds r2, 0x7D - movs r0, 0xFF - strb r0, [r2] - ldrb r2, [r1, 0x3] - movs r0, 0x7F - ands r0, r2 - strb r0, [r1, 0x3] - adds r0, r5, 0 - adds r0, 0x2B - ldrb r1, [r0] - adds r1, 0x3 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl StartSpriteAnim - adds r0, r5, 0 - bl sub_81186B8 - movs r0, 0x1E - strh r0, [r5, 0x36] - adds r0, r5, 0 - bl sub_811866C - movs r1, 0x3A - ldrsh r0, [r5, r1] - movs r1, 0x1E - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r1, 1 - adds r1, 0xF - strh r1, [r5, 0x3A] - ldr r0, _08118DC0 @ =sub_8118834 - str r0, [r5, 0x1C] - movs r0, 0x47 - bl m4aSongNumStartOrChange - b _08118DDC - .align 2, 0 -_08118DB8: .4byte gSharedMem + 0x19000 -_08118DBC: .4byte 0xbf800000 -_08118DC0: .4byte sub_8118834 -_08118DC4: - adds r0, r5, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r0] - movs r0, 0x38 - bl m4aSongNumStart - adds r0, r5, 0 - bl sub_811952C -_08118DDC: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8118D2C - - thumb_func_start sub_8118DE4 -sub_8118DE4: @ 8118DE4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r7, r0, 0 - bl sub_8118724 - movs r0, 0 - strh r0, [r7, 0x32] - adds r0, r7, 0 - bl sub_81186B8 - ldr r1, _08118E70 @ =gUnknown_083F8D90 - ldr r6, _08118E74 @ =gSharedMem + 0x19000 - movs r0, 0x7E - adds r0, r6 - mov r8, r0 - ldrb r0, [r0] - lsls r0, 3 - adds r1, 0x4 - adds r0, r1 - ldr r0, [r0] - ldr r1, [r6, 0x8] - ands r0, r1 - cmp r0, 0 - bne _08118E7C - adds r1, r6, 0 - adds r1, 0x7D - movs r0, 0xFF - strb r0, [r1] - ldrb r1, [r6, 0x3] - movs r0, 0x7F - ands r0, r1 - strb r0, [r6, 0x3] - adds r0, r7, 0 - adds r0, 0x2B - ldrb r1, [r0] - adds r1, 0x3 - lsls r1, 24 - lsrs r1, 24 - adds r0, r7, 0 - bl StartSpriteAnim - adds r0, r7, 0 - bl sub_81186B8 - movs r0, 0x1E - strh r0, [r7, 0x36] - adds r0, r7, 0 - bl sub_811866C - movs r1, 0x3A - ldrsh r0, [r7, r1] - movs r1, 0x1E - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r1, 1 - adds r1, 0xF - strh r1, [r7, 0x3A] - ldr r0, _08118E78 @ =sub_8118834 - str r0, [r7, 0x1C] - movs r0, 0x47 - bl m4aSongNumStartOrChange - b _08118F74 - .align 2, 0 -_08118E70: .4byte gUnknown_083F8D90 -_08118E74: .4byte gSharedMem + 0x19000 -_08118E78: .4byte sub_8118834 -_08118E7C: - movs r0, 0x38 - bl m4aSongNumStart - bl Random - movs r2, 0x1 - mov r9, r2 - mov r1, r9 - ands r1, r0 - mov r9, r1 - cmp r1, 0 - beq _08118EC0 - adds r1, r6, 0 - adds r1, 0x8C - ldr r0, _08118EB8 @ =0x00000000 - str r0, [r1] - mov r2, r8 - ldrb r0, [r2] - adds r0, 0x1 - movs r1, 0xC - bl __modsi3 - lsls r1, r0, 24 - lsrs r2, r1, 24 - adds r1, r6, 0 - adds r1, 0x7F - strb r0, [r1] - ldr r5, _08118EBC @ =gUnknown_083F8DF4 - b _08118EF4 - .align 2, 0 -_08118EB8: .4byte 0x00000000 -_08118EBC: .4byte gUnknown_083F8DF4 -_08118EC0: - adds r4, r6, 0 - adds r4, 0x8C - ldr r5, _08118F1C @ =gUnknown_083F8DF4 - ldrb r0, [r6, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r1, r5, 0 - adds r1, 0x1C - adds r0, r1 - ldr r1, [r0] - adds r0, r1, 0 - bl __addsf3 - str r0, [r4] - mov r0, r8 - ldrb r4, [r0] - adds r0, r4, 0 - adds r0, 0xB - movs r1, 0xC - bl __modsi3 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r6, 0 - adds r0, 0x7F - strb r4, [r0] -_08118EF4: - ldr r0, _08118F20 @ =gUnknown_083F8D90 - lsls r1, r2, 3 - adds r0, 0x4 - adds r1, r0 - ldr r2, _08118F24 @ =gSharedMem + 0x19000 - ldr r1, [r1] - ldr r0, [r2, 0x8] - ands r1, r0 - cmp r1, 0 - beq _08118F28 - movs r0, 0x1 - strh r0, [r7, 0x2E] - ldrb r0, [r2, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r0, r5 - ldrb r0, [r0, 0x2] - strh r0, [r7, 0x32] - b _08118F64 - .align 2, 0 -_08118F1C: .4byte gUnknown_083F8DF4 -_08118F20: .4byte gUnknown_083F8D90 -_08118F24: .4byte gSharedMem + 0x19000 -_08118F28: - strh r1, [r7, 0x2E] - ldrb r1, [r2, 0x4] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _08118F40 - lsls r0, r1, 30 - lsrs r0, 25 - adds r0, r5 - ldrb r0, [r0, 0x1] - strh r0, [r7, 0x32] - b _08118F64 -_08118F40: - lsls r0, r1, 30 - lsrs r0, 25 - adds r0, r5 - ldrb r0, [r0, 0x2] - strh r0, [r7, 0x32] - mov r1, r9 - cmp r1, 0 - beq _08118F5C - adds r1, r2, 0 - adds r1, 0x8C - ldr r0, _08118F58 @ =0x3f000000 - b _08118F62 - .align 2, 0 -_08118F58: .4byte 0x3f000000 -_08118F5C: - adds r1, r2, 0 - adds r1, 0x8C - ldr r0, _08118F80 @ =0xbfc00000 -_08118F62: - str r0, [r1] -_08118F64: - adds r1, r2, 0 - adds r1, 0x98 - ldr r0, _08118F84 @ =0x3dae147b - str r0, [r1] - ldr r0, _08118F88 @ =sub_8118D2C - str r0, [r7, 0x1C] - movs r0, 0x5 - strh r0, [r7, 0x30] -_08118F74: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08118F80: .4byte 0xbfc00000 -_08118F84: .4byte 0x3dae147b -_08118F88: .4byte sub_8118D2C - thumb_func_end sub_8118DE4 - - thumb_func_start sub_8118F8C -sub_8118F8C: @ 8118F8C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r6, r0, 0 - bl sub_8118724 - ldr r5, _08119018 @ =gSharedMem + 0x19000 - movs r0, 0x8C - adds r0, r5 - mov r8, r0 - ldr r0, [r0] - ldr r1, _0811901C @ =0x3f000000 - bl __gtsf2 - cmp r0, 0 - bgt _0811906E - adds r0, r6, 0 - bl sub_81186B8 - adds r0, r6, 0 - bl sub_81186E8 - lsls r0, 16 - cmp r0, 0 - bne _08119030 - adds r1, r5, 0 - adds r1, 0x90 - ldr r0, _08119020 @ =0x00000000 - str r0, [r1] - ldr r1, _08119024 @ =gUnknown_083F8DF4 - mov r9, r1 - ldrb r0, [r5, 0x4] - lsls r7, r0, 30 - lsrs r0, r7, 25 - add r0, r9 - movs r4, 0x3 - ldrsb r4, [r0, r4] - adds r0, r4, 0 - bl __floatsisf - adds r5, r0, 0 - cmp r4, 0 - bge _08118FEC - ldr r1, _08119028 @ =0x43800000 - bl __addsf3 - adds r5, r0, 0 -_08118FEC: - lsrs r0, r7, 25 - add r0, r9 - ldrb r0, [r0, 0x4] - adds r0, 0x1 - bl __floatsisf - adds r1, r0, 0 - adds r0, r5, 0 - bl __divsf3 - adds r1, r0, 0 - mov r2, r8 - ldr r0, [r2] - bl __subsf3 - mov r1, r8 - str r0, [r1] - movs r0, 0x4 - strh r0, [r6, 0x30] - ldr r0, _0811902C @ =sub_8118DE4 - str r0, [r6, 0x1C] - b _0811906E - .align 2, 0 -_08119018: .4byte gSharedMem + 0x19000 -_0811901C: .4byte 0x3f000000 -_08119020: .4byte 0x00000000 -_08119024: .4byte gUnknown_083F8DF4 -_08119028: .4byte 0x43800000 -_0811902C: .4byte sub_8118DE4 -_08119030: - adds r6, r5, 0 - adds r6, 0x90 - ldr r0, [r6] - ldr r4, _0811907C @ =0x00000000 - adds r1, r4, 0 - bl __nesf2 - cmp r0, 0 - beq _0811906E - mov r2, r8 - ldr r0, [r2] - adds r1, r4, 0 - bl __ltsf2 - cmp r0, 0 - bge _0811906E - str r4, [r6] - mov r0, r8 - str r4, [r0] - adds r4, r5, 0 - adds r4, 0x98 - ldr r0, [r4] - bl __extendsfdf2 - ldr r2, _08119080 @ =0x3ff33333 - ldr r3, _08119084 @ =0x33333333 - bl __divdf3 - bl __truncdfsf2 - str r0, [r4] -_0811906E: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811907C: .4byte 0x00000000 -_08119080: .4byte 0x3ff33333 -_08119084: .4byte 0x33333333 - thumb_func_end sub_8118F8C - - thumb_func_start sub_8119088 -sub_8119088: @ 8119088 - push {r4-r7,lr} - adds r6, r0, 0 - bl sub_8118724 - ldr r5, _08119120 @ =gSharedMem + 0x19000 - adds r0, r5, 0 - adds r0, 0x94 - ldr r0, [r0] - ldr r1, _08119124 @ =0x42200000 - bl __gtsf2 - cmp r0, 0 - bgt _0811911A - adds r7, r5, 0 - adds r7, 0x98 - adds r0, r5, 0 - adds r0, 0x86 - movs r1, 0 - ldrsh r4, [r0, r1] - adds r0, r4, 0 - bl __floatsisf - adds r2, r0, 0 - cmp r4, 0 - bge _081190C2 - ldr r1, _08119128 @ =0x47800000 - bl __addsf3 - adds r2, r0, 0 -_081190C2: - ldr r0, _0811912C @ =0x40800000 - adds r1, r2, 0 - bl __divsf3 - bl __negsf2 - str r0, [r7] - adds r7, r5, 0 - adds r7, 0x90 - adds r5, 0x8C - adds r0, r4, 0 - bl __floatsisf - adds r2, r0, 0 - cmp r4, 0 - bge _081190EA - ldr r1, _08119128 @ =0x47800000 - bl __addsf3 - adds r2, r0, 0 -_081190EA: - ldr r0, [r5] - adds r1, r2, 0 - bl __divsf3 - bl __negsf2 - str r0, [r7] - adds r1, r6, 0 - adds r1, 0x2A - movs r0, 0x2 - strb r0, [r1] - adds r2, r6, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r2] - movs r0, 0x3 - strh r0, [r6, 0x30] - ldr r0, _08119130 @ =sub_8118F8C - str r0, [r6, 0x1C] -_0811911A: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08119120: .4byte gSharedMem + 0x19000 -_08119124: .4byte 0x42200000 -_08119128: .4byte 0x47800000 -_0811912C: .4byte 0x40800000 -_08119130: .4byte sub_8118F8C - thumb_func_end sub_8119088 - - thumb_func_start sub_8119134 -sub_8119134: @ 8119134 - push {r4-r7,lr} - adds r6, r0, 0 - bl sub_8118724 - ldr r4, _081191DC @ =gSharedMem + 0x19000 - adds r0, r4, 0 - adds r0, 0x94 - ldr r0, [r0] - ldr r1, _081191E0 @ =0x42700000 - bl __gtsf2 - cmp r0, 0 - bgt _081191D4 - movs r0, 0x5D - bl m4aSongNumStartOrChange - adds r7, r4, 0 - adds r7, 0x98 - adds r0, r4, 0 - adds r0, 0x84 - movs r1, 0 - ldrsh r5, [r0, r1] - adds r0, r5, 0 - bl __floatsisf - adds r2, r0, 0 - cmp r5, 0 - bge _08119174 - ldr r1, _081191E4 @ =0x47800000 - bl __addsf3 - adds r2, r0, 0 -_08119174: - ldr r0, _081191E8 @ =0x41a00000 - adds r1, r2, 0 - bl __divsf3 - bl __negsf2 - str r0, [r7] - adds r7, r4, 0 - adds r7, 0x90 - adds r0, r4, 0 - adds r0, 0x8C - ldr r1, [r0] - ldr r0, _081191EC @ =0x3f800000 - bl __subsf3 - adds r4, r0, 0 - adds r0, r5, 0 - bl __floatsisf - adds r2, r0, 0 - cmp r5, 0 - bge _081191A8 - ldr r1, _081191E4 @ =0x47800000 - bl __addsf3 - adds r2, r0, 0 -_081191A8: - adds r0, r4, 0 - adds r1, r2, 0 - bl __divsf3 - str r0, [r7] - adds r1, r6, 0 - adds r1, 0x2A - movs r0, 0x1 - strb r0, [r1] - adds r2, r6, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r2] - movs r0, 0x2 - strh r0, [r6, 0x30] - ldr r0, _081191F0 @ =sub_8119088 - str r0, [r6, 0x1C] -_081191D4: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081191DC: .4byte gSharedMem + 0x19000 -_081191E0: .4byte 0x42700000 -_081191E4: .4byte 0x47800000 -_081191E8: .4byte 0x41a00000 -_081191EC: .4byte 0x3f800000 -_081191F0: .4byte sub_8119088 - thumb_func_end sub_8119134 - - thumb_func_start sub_81191F4 -sub_81191F4: @ 81191F4 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0 - movs r0, 0x1 - strh r0, [r4, 0x30] - strh r1, [r4, 0x32] - adds r0, r4, 0 - bl sub_8118724 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, _08119220 @ =sub_8119134 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08119220: .4byte sub_8119134 - thumb_func_end sub_81191F4 - - thumb_func_start sub_8119224 -sub_8119224: @ 8119224 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - adds r7, r0, 0 - ldr r1, _081193B8 @ =gUnknown_083FA60E - mov r0, sp - movs r2, 0x8 - bl memcpy - ldrh r0, [r7, 0x3C] - subs r0, 0x2 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - ldr r5, _081193BC @ =gSharedMem + 0x19000 - ldr r0, _081193C0 @ =gSpriteTemplate_83FA50C - movs r2, 0xC - negs r2, r2 - movs r1, 0x24 - movs r3, 0x32 - bl CreateSprite - adds r1, r5, 0 - adds r1, 0x73 - strb r0, [r1] - ldr r4, _081193C4 @ =gSpriteTemplate_83FA5C0 - movs r0, 0x2E - ldrsh r2, [r7, r0] - lsls r2, 2 - mov r1, sp - adds r0, r1, r2 - movs r3, 0 - ldrsh r1, [r0, r3] - mov r0, sp - adds r0, 0x2 - adds r0, r2 - movs r3, 0 - ldrsh r2, [r0, r3] - adds r0, r4, 0 - movs r3, 0x3B - bl CreateSprite - adds r1, r5, 0 - adds r1, 0x74 - strb r0, [r1] - adds r4, 0x18 - adds r0, r4, 0 - movs r1, 0x24 - movs r2, 0x8C - movs r3, 0x33 - bl CreateSprite - adds r1, r5, 0 - adds r1, 0x75 - strb r0, [r1] - ldr r3, _081193C8 @ =gSprites - ldrb r1, [r1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrb r2, [r0, 0x1] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0, 0x1] - movs r6, 0 - adds r4, r3, 0 - mov r12, r5 - ldr r0, _081193CC @ =gUnknown_083F8DF4 - mov r8, r0 - mov r10, r12 -_081192BE: - mov r1, r12 - adds r3, r1, r6 - adds r3, 0x73 - ldrb r0, [r3] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x3 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r1, r12 - adds r1, 0x73 - ldrb r1, [r1] - strh r1, [r0, 0x36] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r5, r12 - adds r5, 0x74 - ldrb r1, [r5] - strh r1, [r0, 0x38] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r1, r12 - adds r1, 0x75 - ldrb r1, [r1] - strh r1, [r0, 0x3A] - ldrb r1, [r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r1, r9 - strh r1, [r0, 0x32] - ldrb r0, [r3] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r4 - movs r0, 0x3C - ldrsh r3, [r7, r0] - mov r0, r12 - ldrb r1, [r0, 0x4] - lsls r1, 30 - lsrs r0, r1, 25 - add r0, r8 - ldrb r0, [r0, 0x1] - muls r3, r0 - lsrs r1, 25 - add r1, r8 - ldrb r0, [r1, 0x2] - ldr r1, _081193D0 @ =0x0000ffff - adds r0, r1 - adds r3, r0 - strh r3, [r2, 0x34] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r2, _081193C8 @ =gSprites - cmp r6, 0x2 - bls _081192BE - ldrb r1, [r5] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] - mov r3, r10 - str r7, [r3, 0x38] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081193B8: .4byte gUnknown_083FA60E -_081193BC: .4byte gSharedMem + 0x19000 -_081193C0: .4byte gSpriteTemplate_83FA50C -_081193C4: .4byte gSpriteTemplate_83FA5C0 -_081193C8: .4byte gSprites -_081193CC: .4byte gUnknown_083F8DF4 -_081193D0: .4byte 0x0000ffff - thumb_func_end sub_8119224 - - thumb_func_start sub_81193D4 -sub_81193D4: @ 81193D4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - adds r7, r0, 0 - movs r0, 0 - mov r8, r0 - ldr r1, _08119514 @ =gUnknown_083FA616 - mov r0, sp - movs r2, 0x8 - bl memcpy - ldrh r0, [r7, 0x3C] - subs r0, 0x2 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - ldr r0, _08119518 @ =gSpriteTemplate_83FA524 - movs r1, 0x2E - ldrsh r2, [r7, r1] - lsls r2, 2 - mov r3, sp - adds r1, r3, r2 - movs r3, 0 - ldrsh r1, [r1, r3] - mov r4, sp - adds r4, 0x2 - adds r2, r4, r2 - movs r3, 0 - ldrsh r2, [r2, r3] - movs r3, 0x32 - bl CreateSprite - ldr r6, _0811951C @ =gSharedMem + 0x19000 - adds r1, r6, 0 - adds r1, 0x73 - strb r0, [r1] - ldrb r1, [r1] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r5, _08119520 @ =gSprites - adds r0, r5 - ldrh r1, [r7, 0x2E] - lsls r1, 24 - lsrs r1, 24 - bl StartSpriteAnim - ldr r0, _08119524 @ =gSpriteTemplate_83FA5F0 - movs r1, 0x2E - ldrsh r2, [r7, r1] - lsls r2, 2 - mov r3, sp - adds r1, r3, r2 - movs r3, 0 - ldrsh r1, [r1, r3] - adds r4, r2 - movs r3, 0 - ldrsh r2, [r4, r3] - movs r3, 0x33 - bl CreateSprite - adds r4, r6, 0 - adds r4, 0x74 - strb r0, [r4] - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r0, 0x2C - ldrb r1, [r0] - movs r2, 0x40 - orrs r1, r2 - strb r1, [r0] - mov r0, r9 - lsls r2, r0, 16 - asrs r2, 16 - ldr r3, _08119528 @ =gUnknown_083F8DF4 - ldrb r1, [r6, 0x4] - lsls r1, 30 - lsrs r0, r1, 25 - adds r0, r3 - ldrb r0, [r0, 0x1] - muls r2, r0 - lsrs r1, 25 - adds r1, r3 - ldrh r0, [r1, 0x10] - adds r0, 0x2D - adds r2, r0 - strh r2, [r7, 0x3C] - adds r3, r6, 0 -_081194A2: - mov r1, r8 - adds r2, r6, r1 - adds r2, 0x73 - ldrb r1, [r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - adds r1, r6, 0 - adds r1, 0x73 - ldrb r1, [r1] - strh r1, [r0, 0x36] - ldrb r1, [r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrb r1, [r4] - strh r1, [r0, 0x38] - ldrb r1, [r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrb r1, [r4] - strh r1, [r0, 0x3A] - ldrb r1, [r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - mov r1, r9 - strh r1, [r0, 0x32] - ldrb r0, [r2] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - ldrh r0, [r7, 0x3C] - subs r0, 0x2D - strh r0, [r1, 0x34] - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - cmp r0, 0x1 - bls _081194A2 - str r7, [r3, 0x38] - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08119514: .4byte gUnknown_083FA616 -_08119518: .4byte gSpriteTemplate_83FA524 -_0811951C: .4byte gSharedMem + 0x19000 -_08119520: .4byte gSprites -_08119524: .4byte gSpriteTemplate_83FA5F0 -_08119528: .4byte gUnknown_083F8DF4 - thumb_func_end sub_81193D4 - - thumb_func_start sub_811952C -sub_811952C: @ 811952C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - mov r8, r0 - movs r0, 0 - mov r10, r0 - movs r1, 0x5 - mov r9, r1 - movs r2, 0 - str r2, [sp, 0xC] - mov r0, sp - movs r1, 0 - movs r2, 0xA - bl memset - bl Random - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x10] - ldr r7, _08119610 @ =gSharedMem + 0x19000 - adds r0, r7, 0 - adds r0, 0x7D - movs r6, 0x1 - strb r6, [r0] - ldrb r4, [r7, 0x3] - movs r0, 0x20 - orrs r4, r0 - movs r0, 0x41 - negs r0, r0 - ands r4, r0 - strb r4, [r7, 0x3] - adds r1, r7, 0 - adds r1, 0x7E - movs r0, 0xFF - strb r0, [r1] - adds r5, r7, 0 - adds r5, 0x88 - mov r3, r8 - movs r1, 0x34 - ldrsh r0, [r3, r1] - bl __floatsisf - str r0, [r5] - adds r1, r7, 0 - adds r1, 0x98 - ldr r0, _08119614 @ =0x00000000 - str r0, [r1] - adds r3, r7, 0 - adds r3, 0x8C - ldr r2, _08119618 @ =gUnknown_083F8DF4 - ldrb r0, [r7, 0x4] - lsls r0, 30 - lsrs r1, r0, 25 - adds r2, 0x1C - adds r1, r2 - ldr r1, [r1] - str r1, [r3] - lsrs r0, 30 - lsls r1, r0, 4 - subs r1, r0 - lsls r1, 1 - adds r1, 0x21 - lsls r4, 27 - lsrs r4, 27 - subs r6, r4 - lsls r0, r6, 4 - subs r0, r6 - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - mov r5, r10 - mov r3, r8 - movs r0, 0x34 - ldrsh r2, [r3, r0] -_081195C8: - cmp r1, r2 - bge _081195D4 - adds r0, r1, 0 - adds r0, 0x5A - cmp r2, r0 - ble _08119638 -_081195D4: - cmp r5, 0x3 - beq _0811961C - adds r0, r1, 0 - adds r0, 0x5A - lsls r0, 16 - lsrs r1, r0, 16 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bls _081195C8 -_081195EA: - ldr r0, _08119610 @ =gSharedMem + 0x19000 - ldrb r1, [r0, 0x3] - movs r0, 0x1F - ands r0, r1 - cmp r0, 0 - beq _08119664 - mov r1, r8 - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _08119658 - movs r0, 0x98 - lsls r0, 1 - movs r1, 0x3F - negs r1, r1 - bl PlayCry1 - b _08119670 - .align 2, 0 -_08119610: .4byte gSharedMem + 0x19000 -_08119614: .4byte 0x00000000 -_08119618: .4byte gUnknown_083F8DF4 -_0811961C: - movs r0, 0x1 - mov r3, r8 - strh r0, [r3, 0x2E] - ldr r2, _08119634 @ =gSharedMem + 0x19000 - ldrb r1, [r2, 0x3] - subs r0, 0x21 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x3] - b _081195EA - .align 2, 0 -_08119634: .4byte gSharedMem + 0x19000 -_08119638: - lsrs r0, r5, 1 - mov r1, r8 - strh r0, [r1, 0x2E] - ldr r3, _08119654 @ =gSharedMem + 0x19000 - movs r1, 0x1 - ands r1, r5 - ldrb r2, [r3, 0x3] - movs r0, 0x20 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x3] - b _081195EA - .align 2, 0 -_08119654: .4byte gSharedMem + 0x19000 -_08119658: - movs r0, 0x98 - lsls r0, 1 - movs r1, 0x3F - bl PlayCry1 - b _08119670 -_08119664: - movs r0, 0x99 - lsls r0, 1 - movs r1, 0x3F - negs r1, r1 - bl PlayCry1 -_08119670: - movs r5, 0x2 - ldr r4, _081196A0 @ =gSharedMem + 0x19000 - adds r0, r4, 0 - adds r0, 0x7F - ldrb r0, [r0] - adds r0, 0x2 - movs r1, 0xC - bl __modsi3 - lsls r0, 24 - lsrs r3, r0, 24 - ldrb r1, [r4, 0x3] - movs r0, 0x1F - ands r0, r1 - cmp r0, 0x1 - bne _081196A4 - ldrb r1, [r4, 0x4] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0x1 - bne _081196A4 - mov r0, r9 - adds r0, 0x6 - b _081196A8 - .align 2, 0 -_081196A0: .4byte gSharedMem + 0x19000 -_081196A4: - mov r2, r9 - adds r0, r2, r5 -_081196A8: - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - cmp r5, r9 - bcs _0811970E - ldr r6, _08119734 @ =gSharedMem + 0x19000 - ldr r7, _08119738 @ =gUnknown_083F8C00 + 0xC -_081196B6: - lsls r0, r3, 3 - ldr r1, _0811973C @ =gUnknown_083F8D90 + 0x4 - adds r0, r1 - ldr r1, [r6, 0x8] - ldr r2, [r0] - ands r1, r2 - cmp r1, 0 - bne _081196F8 - mov r0, r10 - adds r1, r0, 0x1 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - add r0, sp - strb r5, [r0] - ldr r0, [sp, 0xC] - cmp r0, 0 - bne _081196F8 - ldrb r0, [r6, 0x1A] - lsls r0, 28 - lsrs r0, 28 - ldr r1, _08119740 @ =gSharedMem + 0x1901B - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r7 - ldr r0, [r0] - ands r2, r0 - cmp r2, 0 - beq _081196F8 - str r5, [sp, 0xC] -_081196F8: - adds r0, r3, 0x1 - movs r1, 0xC - bl __modsi3 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, r9 - bcc _081196B6 -_0811970E: - ldrb r0, [r4, 0x3] - lsls r0, 27 - lsrs r0, 27 - adds r0, 0x1 - ldrb r1, [r4, 0x2] - ands r0, r1 - cmp r0, 0 - beq _08119756 - ldr r2, [sp, 0xC] - cmp r2, 0 - beq _08119744 - movs r0, 0xFF - ldr r3, [sp, 0x10] - ands r0, r3 - cmp r0, 0xBF - bhi _08119744 - mov r0, r8 - strh r2, [r0, 0x3C] - b _08119766 - .align 2, 0 -_08119734: .4byte gSharedMem + 0x19000 -_08119738: .4byte gUnknown_083F8C00 + 0xC -_0811973C: .4byte gUnknown_083F8D90 + 0x4 -_08119740: .4byte gSharedMem + 0x1901B -_08119744: - ldr r0, [sp, 0x10] - mov r1, r10 - bl __modsi3 - add r0, sp - ldrb r0, [r0] - mov r1, r8 - strh r0, [r1, 0x3C] - b _08119766 -_08119756: - ldr r0, [sp, 0x10] - mov r1, r10 - bl __modsi3 - add r0, sp - ldrb r0, [r0] - mov r2, r8 - strh r0, [r2, 0x3C] -_08119766: - ldr r3, _0811977C @ =sub_8118CEC - mov r0, r8 - str r3, [r0, 0x1C] - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811977C: .4byte sub_8118CEC - thumb_func_end sub_811952C - - thumb_func_start sub_8119780 -sub_8119780: @ 8119780 - push {r4,lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x30] - adds r1, r0, 0x1 - strh r1, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x34 - ldrsh r1, [r2, r3] - cmp r0, r1 - blt _081197CA - ldrh r0, [r2, 0x20] - subs r0, 0x2 - strh r0, [r2, 0x20] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x10 - negs r1, r1 - cmp r0, r1 - bge _081197CA - ldr r4, _081197D0 @ =gSharedMem + 0x19000 - ldrb r1, [r4, 0x3] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _081197BA - movs r0, 0x40 - orrs r0, r1 - strb r0, [r4, 0x3] -_081197BA: - adds r0, r2, 0 - bl DestroySprite - movs r0, 0 - strb r0, [r4, 0x1] - ldr r0, _081197D4 @ =gUnknown_083FA61E - ldrh r0, [r0] - strh r0, [r4, 0x34] -_081197CA: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081197D0: .4byte gSharedMem + 0x19000 -_081197D4: .4byte gUnknown_083FA61E - thumb_func_end sub_8119780 - - thumb_func_start sub_81197D8 -sub_81197D8: @ 81197D8 - push {r4,lr} - sub sp, 0x18 - adds r4, r0, 0 - ldr r1, _08119854 @ =gUnknown_083FA632 - mov r0, sp - movs r2, 0x18 - bl memcpy - ldrh r0, [r4, 0x30] - adds r2, r0, 0x1 - strh r2, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x34 - ldrsh r1, [r4, r3] - cmp r0, r1 - bge _0811985C - movs r0, 0x1 - ands r2, r0 - cmp r2, 0 - beq _08119836 - ldr r3, _08119858 @ =gSpriteCoordOffsetY - movs r0, 0x3C - ldrsh r2, [r4, r0] - lsls r2, 1 - movs r1, 0x32 - ldrsh r0, [r4, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r0, 3 - adds r2, r0 - mov r1, sp - adds r0, r1, r2 - ldrh r0, [r0] - strh r0, [r3] - movs r3, 0x3C - ldrsh r2, [r4, r3] - adds r1, r2, 0x1 - adds r0, r1, 0 - cmp r1, 0 - bge _0811982E - adds r0, r2, 0x4 -_0811982E: - asrs r0, 2 - lsls r0, 2 - subs r0, r1, r0 - strh r0, [r4, 0x3C] -_08119836: - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - b _08119884 - .align 2, 0 -_08119854: .4byte gUnknown_083FA632 -_08119858: .4byte gSpriteCoordOffsetY -_0811985C: - ldr r1, _0811988C @ =gSpriteCoordOffsetY - movs r0, 0 - strh r0, [r1] - ldr r2, _08119890 @ =gSprites - ldr r0, _08119894 @ =gSharedMem + 0x19000 - adds r0, 0x73 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x2C - ldrb r2, [r0] - movs r1, 0x41 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - adds r0, r4, 0 - bl DestroySprite -_08119884: - add sp, 0x18 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0811988C: .4byte gSpriteCoordOffsetY -_08119890: .4byte gSprites -_08119894: .4byte gSharedMem + 0x19000 - thumb_func_end sub_81197D8 - - thumb_func_start sub_8119898 -sub_8119898: @ 8119898 - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x30] - adds r0, 0x1 - strh r0, [r5, 0x30] - movs r1, 0x30 - ldrsh r0, [r5, r1] - bl __floatsisf - adds r4, r0, 0 - ldr r1, _08119948 @ =0x3d1fbe77 - bl __mulsf3 - adds r1, r4, 0 - bl __mulsf3 - bl __fixsfsi - strh r0, [r5, 0x26] - ldr r3, _0811994C @ =gSharedMem + 0x19000 - ldr r2, _08119950 @ =gUnknown_083FA61E - ldrb r0, [r3, 0x1] - subs r0, 0x1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r3, 0x34] - ldrb r0, [r3, 0x1] - cmp r0, 0x12 - bhi _081198DE - adds r0, 0x1 - strb r0, [r3, 0x1] -_081198DE: - movs r1, 0x30 - ldrsh r0, [r5, r1] - cmp r0, 0x3C - ble _08119940 - movs r0, 0 - strh r0, [r5, 0x30] - ldr r3, _08119954 @ =sub_8119780 - str r3, [r5, 0x1C] - ldr r2, _08119958 @ =gSprites - movs r0, 0x3A - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r4, r2, 0 - adds r4, 0x1C - adds r0, r4 - str r3, [r0] - movs r0, 0x3A - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, _0811995C @ =0x0000fffe - strh r1, [r0, 0x30] - movs r0, 0x38 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - movs r0, 0x38 - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldr r1, _08119960 @ =sub_81197D8 - str r1, [r0] - movs r0, 0xD6 - bl m4aSongNumStart -_08119940: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08119948: .4byte 0x3d1fbe77 -_0811994C: .4byte gSharedMem + 0x19000 -_08119950: .4byte gUnknown_083FA61E -_08119954: .4byte sub_8119780 -_08119958: .4byte gSprites -_0811995C: .4byte 0x0000fffe -_08119960: .4byte sub_81197D8 - thumb_func_end sub_8119898 - - thumb_func_start sub_8119964 -sub_8119964: @ 8119964 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x3C - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _081199E4 - ldr r3, _08119990 @ =gSharedMem + 0x19000 - ldr r1, [r3, 0x38] - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _08119998 - movs r0, 0x34 - ldrsh r2, [r1, r0] - ldr r1, _08119994 @ =gUnknown_083F8DF4 - ldrb r0, [r3, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r0, r1 - ldrh r0, [r0, 0x8] - b _081199AA - .align 2, 0 -_08119990: .4byte gSharedMem + 0x19000 -_08119994: .4byte gUnknown_083F8DF4 -_08119998: - movs r0, 0x34 - ldrsh r2, [r1, r0] - ldr r1, _081199D8 @ =gUnknown_083F8DF4 - ldrb r0, [r3, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r0, r1 - ldrh r0, [r0, 0x8] - adds r0, 0xB4 -_081199AA: - cmp r2, r0 - bne _08119A78 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldrh r0, [r4, 0x3C] - adds r0, 0x1 - strh r0, [r4, 0x3C] - movs r0, 0x2B - bl m4aSongNumStart - ldr r1, _081199DC @ =gSharedMem + 0x19000 - movs r0, 0x1 - strb r0, [r1, 0x1] - ldr r0, _081199E0 @ =gUnknown_083FA61E - ldrh r0, [r0] - strh r0, [r1, 0x34] - b _08119A78 - .align 2, 0 -_081199D8: .4byte gUnknown_083F8DF4 -_081199DC: .4byte gSharedMem + 0x19000 -_081199E0: .4byte gUnknown_083FA61E -_081199E4: - ldr r3, _08119A20 @ =gSharedMem + 0x19000 - ldr r2, _08119A24 @ =gUnknown_083FA61E - ldrb r0, [r3, 0x1] - subs r0, 0x1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - strh r0, [r3, 0x34] - ldrb r0, [r3, 0x1] - cmp r0, 0x12 - bhi _08119A04 - adds r0, 0x1 - strb r0, [r3, 0x1] -_08119A04: - ldr r1, [r3, 0x38] - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _08119A2C - movs r0, 0x34 - ldrsh r2, [r1, r0] - ldr r1, _08119A28 @ =gUnknown_083F8DF4 - ldrb r0, [r3, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r0, r1 - ldrh r0, [r0, 0xA] - b _08119A3E - .align 2, 0 -_08119A20: .4byte gSharedMem + 0x19000 -_08119A24: .4byte gUnknown_083FA61E -_08119A28: .4byte gUnknown_083F8DF4 -_08119A2C: - movs r0, 0x34 - ldrsh r2, [r1, r0] - ldr r1, _08119A80 @ =gUnknown_083F8DF4 - ldrb r0, [r3, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r0, r1 - ldrh r0, [r0, 0xA] - adds r0, 0xB4 -_08119A3E: - cmp r2, r0 - bne _08119A78 - ldr r2, _08119A84 @ =gSprites - movs r0, 0x36 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r1, r2, 0 - adds r1, 0x1C - adds r0, r1 - ldr r1, _08119A88 @ =sub_8119898 - str r1, [r0] - movs r0, 0x36 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - ldr r0, _08119A8C @ =SpriteCallbackDummy - str r0, [r4, 0x1C] - movs r0, 0 - strh r0, [r4, 0x3C] -_08119A78: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08119A80: .4byte gUnknown_083F8DF4 -_08119A84: .4byte gSprites -_08119A88: .4byte sub_8119898 -_08119A8C: .4byte SpriteCallbackDummy - thumb_func_end sub_8119964 - - thumb_func_start sub_8119A90 -sub_8119A90: @ 8119A90 - adds r0, 0x3E - ldrb r3, [r0] - lsls r1, r3, 29 - lsrs r1, 31 - movs r2, 0x1 - eors r2, r1 - lsls r2, 2 - movs r1, 0x5 - negs r1, r1 - ands r1, r3 - orrs r1, r2 - strb r1, [r0] - bx lr - thumb_func_end sub_8119A90 - - thumb_func_start sub_8119AAC -sub_8119AAC: @ 8119AAC - push {r4,r5,lr} - adds r4, r0, 0 - ldrh r2, [r4, 0x22] - movs r0, 0x22 - ldrsh r1, [r4, r0] - movs r0, 0x10 - negs r0, r0 - cmp r1, r0 - ble _08119AC4 - subs r0, r2, 0x1 - strh r0, [r4, 0x22] - b _08119B12 -_08119AC4: - ldr r0, _08119B18 @ =SpriteCallbackDummy - str r0, [r4, 0x1C] - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - subs r2, 0x12 - ldrb r0, [r2] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x5E - bl m4aSongNumStop - adds r0, r4, 0 - bl DestroySprite - ldr r5, _08119B1C @ =gSprites - ldr r4, _08119B20 @ =gSharedMem + 0x19000 - adds r4, 0x74 - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - bl DestroySprite -_08119B12: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08119B18: .4byte SpriteCallbackDummy -_08119B1C: .4byte gSprites -_08119B20: .4byte gSharedMem + 0x19000 - thumb_func_end sub_8119AAC - - thumb_func_start sub_8119B24 -sub_8119B24: @ 8119B24 - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0 - blt _08119B4E - subs r1, 0x1 - strh r1, [r4, 0x30] - ldrh r0, [r4, 0x22] - subs r0, 0x1 - strh r0, [r4, 0x22] - lsls r1, 16 - cmp r1, 0 - bne _08119BB8 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - cmp r0, 0x1 - bne _08119BB8 - b _08119B74 -_08119B4E: - ldrh r1, [r4, 0x34] - movs r2, 0x34 - ldrsh r0, [r4, r2] - cmp r0, 0 - blt _08119B84 - subs r0, r1, 0x1 - strh r0, [r4, 0x34] - adds r0, r4, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r0, 0x3F - ands r0, r1 - cmp r0, 0 - bne _08119BB8 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - cmp r0, 0x1 - bne _08119B7C -_08119B74: - ldrh r0, [r4, 0x26] - adds r0, 0x1 - strh r0, [r4, 0x26] - b _08119BB8 -_08119B7C: - ldrh r0, [r4, 0x26] - subs r0, 0x1 - strh r0, [r4, 0x26] - b _08119BB8 -_08119B84: - movs r0, 0x2B - bl m4aSongNumStart - ldr r0, _08119BC0 @ =gSharedMem + 0x19000 - ldr r0, [r0, 0x38] - ldrh r1, [r0, 0x2E] - adds r1, 0x4 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAnim - ldr r0, _08119BC4 @ =sub_8119AAC - str r0, [r4, 0x1C] - ldr r2, _08119BC8 @ =gSprites - movs r0, 0x3A - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x2C - ldrb r2, [r0] - movs r1, 0x7F - ands r1, r2 - strb r1, [r0] -_08119BB8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08119BC0: .4byte gSharedMem + 0x19000 -_08119BC4: .4byte sub_8119AAC -_08119BC8: .4byte gSprites - thumb_func_end sub_8119B24 - - thumb_func_start sub_8119BCC -sub_8119BCC: @ 8119BCC - push {r4,r5,lr} - sub sp, 0x14 - adds r4, r0, 0 - ldr r1, _08119C44 @ =gUnknown_083FA64A - mov r0, sp - movs r2, 0x2 - bl memcpy - add r5, sp, 0x4 - ldr r1, _08119C48 @ =gUnknown_083FA64C - adds r0, r5, 0 - movs r2, 0x10 - bl memcpy - ldrh r0, [r4, 0x30] - subs r1, r0, 0x1 - strh r1, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x7 - ble _08119C5C - ldr r0, _08119C4C @ =gSharedMem + 0x19000 - ldr r0, [r0, 0x38] - movs r1, 0x2E - ldrsh r0, [r0, r1] - add r0, sp - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - bl IsSEPlaying - lsls r0, 24 - cmp r0, 0 - beq _08119CF6 - movs r1, 0x20 - ldrsh r0, [r4, r1] - movs r4, 0x74 - subs r4, r0 - lsrs r0, r4, 31 - adds r4, r0 - asrs r4, 1 - negs r4, r4 - ldr r0, _08119C50 @ =gMPlay_SE1 - ldr r5, _08119C54 @ =0x0000ffff - lsls r4, 24 - asrs r4, 24 - adds r1, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - ldr r0, _08119C58 @ =gMPlay_SE2 - adds r1, r5, 0 - adds r2, r4, 0 - bl m4aMPlayPanpotControl - b _08119CF6 - .align 2, 0 -_08119C44: .4byte gUnknown_083FA64A -_08119C48: .4byte gUnknown_083FA64C -_08119C4C: .4byte gSharedMem + 0x19000 -_08119C50: .4byte gMPlay_SE1 -_08119C54: .4byte 0x0000ffff -_08119C58: .4byte gMPlay_SE2 -_08119C5C: - lsls r0, r1, 16 - cmp r0, 0 - blt _08119CAC - ldr r0, _08119CA8 @ =gSharedMem + 0x19000 - ldr r0, [r0, 0x38] - movs r2, 0x2E - ldrsh r0, [r0, r2] - add r0, sp - movs r2, 0 - ldrsb r2, [r0, r2] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x7 - subs r0, r1, r0 - lsls r0, 1 - adds r0, r5, r0 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - muls r0, r2 - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - movs r2, 0x30 - ldrsh r0, [r4, r2] - subs r1, r0 - lsls r1, 1 - mov r0, sp - adds r0, 0x5 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - b _08119CF6 - .align 2, 0 -_08119CA8: .4byte gSharedMem + 0x19000 -_08119CAC: - movs r0, 0x5E - bl m4aSongNumStartOrChange - ldr r0, _08119CCC @ =gSharedMem + 0x19000 - ldr r0, [r0, 0x38] - movs r2, 0x2E - ldrsh r0, [r0, r2] - cmp r0, 0 - bne _08119CD0 - movs r0, 0x98 - lsls r0, 1 - movs r1, 0x3F - bl PlayCry1 - b _08119CDC - .align 2, 0 -_08119CCC: .4byte gSharedMem + 0x19000 -_08119CD0: - movs r0, 0x98 - lsls r0, 1 - movs r1, 0x3F - negs r1, r1 - bl PlayCry1 -_08119CDC: - ldr r0, _08119D00 @ =gSharedMem + 0x19000 - ldr r0, [r0, 0x38] - ldrh r1, [r0, 0x2E] - adds r1, 0x2 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAnim - movs r0, 0x2D - strh r0, [r4, 0x30] - ldr r0, _08119D04 @ =sub_8119B24 - str r0, [r4, 0x1C] -_08119CF6: - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08119D00: .4byte gSharedMem + 0x19000 -_08119D04: .4byte sub_8119B24 - thumb_func_end sub_8119BCC - - thumb_func_start sub_8119D08 -sub_8119D08: @ 8119D08 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldr r1, _08119D64 @ =gUnknown_083FA64A - mov r0, sp - movs r2, 0x2 - bl memcpy - ldrh r0, [r4, 0x30] - subs r1, r0, 0x1 - strh r1, [r4, 0x30] - lsls r0, 16 - cmp r0, 0 - blt _08119D70 - ldr r0, _08119D68 @ =gSharedMem + 0x19000 - ldr r0, [r0, 0x38] - movs r1, 0x2E - ldrsh r0, [r0, r1] - add r0, sp - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 1 - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - ldr r1, _08119D6C @ =gSprites - movs r2, 0x3A - ldrsh r0, [r4, r2] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r1 - adds r2, 0x3E - ldrb r3, [r2] - lsls r0, r3, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] - b _08119D74 - .align 2, 0 -_08119D64: .4byte gUnknown_083FA64A -_08119D68: .4byte gSharedMem + 0x19000 -_08119D6C: .4byte gSprites -_08119D70: - ldr r0, _08119D7C @ =sub_8119A90 - str r0, [r4, 0x1C] -_08119D74: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08119D7C: .4byte sub_8119A90 - thumb_func_end sub_8119D08 - - thumb_func_start sub_8119D80 -sub_8119D80: @ 8119D80 - push {r4,lr} - adds r4, r0, 0 - ldr r3, _08119DB8 @ =gSharedMem + 0x19000 - ldr r1, [r3, 0x38] - movs r2, 0x2E - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _08119DC4 - movs r0, 0x34 - ldrsh r2, [r1, r0] - ldr r1, _08119DBC @ =gUnknown_083F8DF4 - ldrb r0, [r3, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r0, r1 - ldrh r0, [r0, 0x12] - adds r0, 0x5A - cmp r2, r0 - bne _08119E26 - ldr r2, _08119DC0 @ =gSprites - movs r0, 0x3A - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r3, 0x34 - b _08119DEE - .align 2, 0 -_08119DB8: .4byte gSharedMem + 0x19000 -_08119DBC: .4byte gUnknown_083F8DF4 -_08119DC0: .4byte gSprites -_08119DC4: - movs r0, 0x34 - ldrsh r2, [r1, r0] - ldr r1, _08119E2C @ =gUnknown_083F8DF4 - ldrb r0, [r3, 0x4] - lsls r0, 30 - lsrs r0, 25 - adds r0, r1 - ldrh r0, [r0, 0x14] - movs r1, 0x87 - lsls r1, 1 - adds r0, r1 - cmp r2, r0 - bne _08119E26 - ldr r2, _08119E30 @ =gSprites - movs r0, 0x3A - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - movs r3, 0x2E -_08119DEE: - strh r3, [r0, 0x30] - movs r0, 0x36 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r3, [r0, 0x30] - movs r0, 0x3A - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, _08119E34 @ =sub_8119D08 - str r1, [r0] - movs r0, 0x36 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r1, _08119E38 @ =sub_8119BCC - str r1, [r0] - movs r0, 0x2B - bl m4aSongNumStart -_08119E26: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08119E2C: .4byte gUnknown_083F8DF4 -_08119E30: .4byte gSprites -_08119E34: .4byte sub_8119D08 -_08119E38: .4byte sub_8119BCC - thumb_func_end sub_8119D80 - - .align 2, 0 @ Don't pad with nop.*/ diff --git a/asm/roulette_util.s b/asm/roulette_util.s deleted file mode 100644 index ac2b1126a..000000000 --- a/asm/roulette_util.s +++ /dev/null @@ -1,781 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text -/* - thumb_func_start sub_8124918 -sub_8124918: @ 8124918 - push {lr} - movs r1, 0 - strb r1, [r0] - strh r1, [r0, 0x2] - adds r0, 0x4 - movs r2, 0xC0 - bl memset - pop {r0} - bx r0 - thumb_func_end sub_8124918 - - - thumb_func_start sub_812492C -sub_812492C: @ 812492C - push {r4-r7,lr} - adds r3, r0, 0 - lsls r1, 24 - lsrs r6, r1, 24 - cmp r6, 0xF - bhi _08124948 - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 2 - adds r5, r3, r0 - ldrb r7, [r5, 0x4] - lsrs r0, r7, 7 - cmp r0, 0 - beq _0812494C -_08124948: - movs r0, 0xFF - b _081249AA -_0812494C: - ldrh r0, [r2] - movs r4, 0 - strh r0, [r5, 0x8] - ldrh r0, [r2, 0x2] - strh r0, [r5, 0xA] - ldrb r0, [r2, 0x4] - strb r0, [r5, 0xC] - ldrb r0, [r2, 0x5] - strb r0, [r5, 0xD] - ldrb r0, [r2, 0x6] - strb r0, [r5, 0xE] - ldrb r3, [r2, 0x7] - lsls r0, r3, 27 - lsrs r0, 27 - ldrb r2, [r5, 0xF] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - movs r0, 0x60 - ands r0, r3 - movs r2, 0x61 - negs r2, r2 - ands r1, r2 - orrs r1, r0 - lsls r3, 24 - asrs r3, 31 - lsls r3, 7 - movs r0, 0x7F - ands r1, r0 - orrs r1, r3 - strb r1, [r5, 0xF] - subs r0, 0xFF - ands r0, r7 - movs r2, 0x80 - orrs r0, r2 - strb r0, [r5, 0x4] - strb r4, [r5, 0x6] - strb r4, [r5, 0x5] - lsls r1, 24 - cmp r1, 0 - bge _081249A4 - movs r0, 0xFF - b _081249A6 -_081249A4: - movs r0, 0x1 -_081249A6: - strb r0, [r5, 0x7] - adds r0, r6, 0 -_081249AA: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_812492C - - thumb_func_start unref_sub_81249B0 -unref_sub_81249B0: @ 81249B0 - push {r4,lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r4, r1, 0 - cmp r4, 0xF - bhi _081249DC - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r1, r2, r0 - ldrb r0, [r1, 0x4] - lsrs r0, 7 - cmp r0, 0 - beq _081249DC - adds r0, r1, 0x4 - movs r1, 0 - movs r2, 0xC - bl memset - adds r0, r4, 0 - b _081249DE -_081249DC: - movs r0, 0xFF -_081249DE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end unref_sub_81249B0 - - thumb_func_start sub_81249E4 -sub_81249E4: @ 81249E4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - adds r5, r0, 0 - movs r0, 0 - mov r12, r0 - ldrb r1, [r5, 0x8] - cmp r12, r1 - bcc _081249FC - b _08124B94 -_081249FC: - movs r7, 0x1F - ldr r0, _08124A2C @ =0xfffffc1f - mov r10, r0 - movs r1, 0x7D - negs r1, r1 - mov r9, r1 - movs r0, 0x1F - mov r8, r0 -_08124A0C: - ldrh r0, [r5, 0x6] - add r0, r12 - lsls r0, 1 - ldr r1, _08124A30 @ =gPlttBufferFaded - adds r3, r0, r1 - ldr r1, _08124A34 @ =gPlttBufferUnfaded - adds r6, r0, r1 - ldrb r0, [r5] - lsls r0, 25 - lsrs r0, 25 - cmp r0, 0x1 - beq _08124A38 - cmp r0, 0x2 - beq _08124A96 - b _08124B82 - .align 2, 0 -_08124A2C: .4byte 0xfffffc1f -_08124A30: .4byte gPlttBufferFaded -_08124A34: .4byte gPlttBufferUnfaded -_08124A38: - ldr r0, [r3] - lsls r2, r0, 27 - lsrs r0, r2, 27 - movs r1, 0x3 - ldrsb r1, [r5, r1] - adds r0, r1 - cmp r0, 0x1F - bhi _08124A5A - lsrs r0, r2, 27 - adds r0, r1 - ands r0, r7 - ldrb r2, [r3] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_08124A5A: - ldr r0, [r3] - lsls r2, r0, 22 - lsrs r0, r2, 27 - movs r1, 0x3 - ldrsb r1, [r5, r1] - adds r0, r1 - cmp r0, 0x1F - bhi _08124A7E - lsrs r0, r2, 27 - adds r0, r1 - mov r1, r8 - ands r0, r1 - lsls r0, 5 - ldrh r2, [r3] - mov r1, r10 - ands r1, r2 - orrs r1, r0 - strh r1, [r3] -_08124A7E: - ldr r0, [r3] - lsls r2, r0, 17 - lsrs r0, r2, 27 - movs r1, 0x3 - ldrsb r1, [r5, r1] - adds r0, r1 - cmp r0, 0x1F - bls _08124A90 - b _08124B82 -_08124A90: - lsrs r0, r2, 27 - adds r0, r1 - b _08124B74 -_08124A96: - movs r0, 0x3 - ldrsb r0, [r5, r0] - cmp r0, 0 - bge _08124B08 - ldr r0, [r3] - lsls r4, r0, 27 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 27 - lsrs r0, 27 - cmp r1, r0 - blt _08124AC6 - lsrs r0, r4, 27 - adds r0, r2 - ands r0, r7 - ldrb r2, [r3] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_08124AC6: - ldr r0, [r3] - lsls r4, r0, 22 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 22 - lsrs r0, 27 - cmp r1, r0 - blt _08124AF0 - lsrs r0, r4, 27 - adds r0, r2 - mov r1, r8 - ands r0, r1 - lsls r0, 5 - ldrh r2, [r3] - mov r1, r10 - ands r1, r2 - orrs r1, r0 - strh r1, [r3] -_08124AF0: - ldr r0, [r3] - lsls r4, r0, 17 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 17 - lsrs r0, 27 - cmp r1, r0 - blt _08124B82 - b _08124B70 -_08124B08: - ldr r0, [r3] - lsls r4, r0, 27 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 27 - lsrs r0, 27 - cmp r1, r0 - bgt _08124B30 - lsrs r0, r4, 27 - adds r0, r2 - ands r0, r7 - ldrb r2, [r3] - movs r1, 0x20 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_08124B30: - ldr r0, [r3] - lsls r4, r0, 22 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 22 - lsrs r0, 27 - cmp r1, r0 - bgt _08124B5A - lsrs r0, r4, 27 - adds r0, r2 - mov r1, r8 - ands r0, r1 - lsls r0, 5 - ldrh r2, [r3] - mov r1, r10 - ands r1, r2 - orrs r1, r0 - strh r1, [r3] -_08124B5A: - ldr r0, [r3] - lsls r4, r0, 17 - lsrs r1, r4, 27 - movs r2, 0x3 - ldrsb r2, [r5, r2] - adds r1, r2 - ldr r0, [r6] - lsls r0, 17 - lsrs r0, 27 - cmp r1, r0 - bgt _08124B82 -_08124B70: - lsrs r0, r4, 27 - adds r0, r2 -_08124B74: - ands r0, r7 - lsls r0, 2 - ldrb r2, [r3, 0x1] - mov r1, r9 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0x1] -_08124B82: - mov r0, r12 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - ldrb r0, [r5, 0x8] - cmp r12, r0 - bcs _08124B94 - b _08124A0C -_08124B94: - ldrb r1, [r5, 0x2] - adds r0, r1, 0x1 - strb r0, [r5, 0x2] - ldrb r0, [r5, 0xB] - lsls r0, 27 - lsls r1, 24 - asrs r0, 3 - cmp r1, r0 - beq _08124BAA - movs r0, 0 - b _08124BDE -_08124BAA: - movs r0, 0 - strb r0, [r5, 0x2] - movs r0, 0x3 - ldrsb r0, [r5, r0] - negs r0, r0 - strb r0, [r5, 0x3] - ldrb r2, [r5] - movs r1, 0x7F - movs r0, 0x7F - ands r0, r2 - cmp r0, 0x1 - bne _08124BCA - lsls r0, r2, 25 - lsrs r0, 25 - adds r0, 0x1 - b _08124BD0 -_08124BCA: - lsls r0, r2, 25 - lsrs r0, 25 - subs r0, 0x1 -_08124BD0: - ands r0, r1 - movs r1, 0x80 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r5] - movs r0, 0x1 -_08124BDE: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_81249E4 - - thumb_func_start sub_8124BEC -sub_8124BEC: @ 8124BEC - push {r4,r5,lr} - adds r3, r0, 0 - movs r2, 0 - ldrb r0, [r3] - lsls r0, 25 - lsrs r0, 25 - cmp r0, 0x1 - beq _08124C02 - cmp r0, 0x2 - beq _08124C30 - b _08124C6A -_08124C02: - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcs _08124C22 - ldr r4, _08124C2C @ =gPlttBufferFaded -_08124C0A: - ldrh r0, [r3, 0x6] - adds r0, r2 - lsls r0, 1 - adds r0, r4 - ldrh r1, [r3, 0x4] - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcc _08124C0A -_08124C22: - ldrb r2, [r3] - lsls r1, r2, 25 - lsrs r1, 25 - adds r1, 0x1 - b _08124C5C - .align 2, 0 -_08124C2C: .4byte gPlttBufferFaded -_08124C30: - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcs _08124C54 - ldr r5, _08124C74 @ =gPlttBufferFaded - ldr r4, _08124C78 @ =gPlttBufferUnfaded -_08124C3A: - ldrh r0, [r3, 0x6] - adds r0, r2 - lsls r0, 1 - adds r1, r0, r5 - adds r0, r4 - ldrh r0, [r0] - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - ldrb r0, [r3, 0x8] - cmp r2, r0 - bcc _08124C3A -_08124C54: - ldrb r2, [r3] - lsls r1, r2, 25 - lsrs r1, 25 - subs r1, 0x1 -_08124C5C: - movs r0, 0x7F - ands r1, r0 - movs r0, 0x80 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_08124C6A: - movs r0, 0x1 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08124C74: .4byte gPlttBufferFaded -_08124C78: .4byte gPlttBufferUnfaded - thumb_func_end sub_8124BEC - - thumb_func_start task_tutorial_controls_fadein -task_tutorial_controls_fadein: @ 8124C7C - push {r4-r6,lr} - adds r4, r0, 0 - movs r5, 0 - ldrb r0, [r4] - cmp r0, 0 - beq _08124CE0 -_08124C88: - ldrh r0, [r4, 0x2] - asrs r0, r5 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08124CD6 - lsls r1, r5, 1 - adds r0, r1, r5 - lsls r3, r0, 2 - adds r2, r4, r3 - ldrb r0, [r2, 0x5] - subs r0, 0x1 - strb r0, [r2, 0x5] - lsls r0, 24 - lsrs r0, 24 - adds r6, r1, 0 - cmp r0, 0xFF - bne _08124CD6 - ldrh r0, [r2, 0x8] - movs r2, 0x80 - lsls r2, 8 - adds r1, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _08124CC4 - adds r0, r3, 0x4 - adds r0, r4, r0 - bl sub_81249E4 - b _08124CCC -_08124CC4: - adds r0, r3, 0x4 - adds r0, r4, r0 - bl sub_8124BEC -_08124CCC: - adds r0, r6, r5 - lsls r0, 2 - adds r0, r4, r0 - ldrb r1, [r0, 0xD] - strb r1, [r0, 0x5] -_08124CD6: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _08124C88 -_08124CE0: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end task_tutorial_controls_fadein - - thumb_func_start sub_8124CE8 -sub_8124CE8: @ 8124CE8 - push {r4-r7,lr} - adds r3, r0, 0 - lsls r1, 16 - lsrs r6, r1, 16 - movs r4, 0 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - movs r5, 0x1 - movs r7, 0x80 - negs r7, r7 -_08124CFE: - adds r0, r6, 0 - asrs r0, r4 - ands r0, r5 - cmp r0, 0 - beq _08124D2C - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r2, r3, r0 - ldrb r0, [r2, 0x4] - lsrs r0, 7 - cmp r0, 0 - beq _08124D2C - adds r0, r5, 0 - lsls r0, r4 - ldrh r1, [r3, 0x2] - orrs r0, r1 - strh r0, [r3, 0x2] - ldrb r1, [r2, 0x4] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r5 - strb r0, [r2, 0x4] -_08124D2C: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bls _08124CFE - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8124CE8 - - thumb_func_start sub_8124D3C -sub_8124D3C: @ 8124D3C - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r0, 0 - lsls r1, 16 - lsrs r7, r1, 16 - movs r5, 0 - movs r3, 0x1 -_08124D4A: - ldrh r0, [r6, 0x2] - asrs r0, r5 - ands r0, r3 - cmp r0, 0 - beq _08124DB2 - lsls r0, r5, 1 - adds r0, r5 - lsls r0, 2 - adds r4, r6, r0 - ldrb r0, [r4, 0x4] - lsrs r0, 7 - cmp r0, 0 - beq _08124DB2 - adds r0, r7, 0 - asrs r0, r5 - ands r0, r3 - cmp r0, 0 - beq _08124DB2 - ldrh r1, [r4, 0xA] - lsls r1, 1 - ldr r0, _08124DA8 @ =gPlttBufferFaded - adds r0, r1, r0 - ldr r2, _08124DAC @ =gPlttBufferUnfaded - adds r1, r2 - ldrb r2, [r4, 0xC] - lsls r2, 1 - str r3, [sp] - bl memcpy - ldrb r0, [r4, 0x4] - movs r2, 0x80 - negs r2, r2 - adds r1, r2, 0 - ands r0, r1 - strb r0, [r4, 0x4] - movs r0, 0 - strb r0, [r4, 0x6] - strb r0, [r4, 0x5] - ldrb r0, [r4, 0xF] - lsls r0, 24 - ldr r3, [sp] - cmp r0, 0 - bge _08124DB0 - movs r0, 0xFF - strb r0, [r4, 0x7] - b _08124DB2 - .align 2, 0 -_08124DA8: .4byte gPlttBufferFaded -_08124DAC: .4byte gPlttBufferUnfaded -_08124DB0: - strb r3, [r4, 0x7] -_08124DB2: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xF - bls _08124D4A - ldr r0, _08124DC8 @ =0x0000ffff - cmp r7, r0 - bne _08124DCC - movs r0, 0 - strb r0, [r6] - b _08124DD0 - .align 2, 0 -_08124DC8: .4byte 0x0000ffff -_08124DCC: - ldrh r0, [r6, 0x2] - bics r0, r7 -_08124DD0: - strh r0, [r6, 0x2] - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8124D3C - - thumb_func_start sub_8124DDC -sub_8124DDC: @ 8124DDC - push {r4-r7,lr} - adds r6, r0, 0 - ldr r0, [sp, 0x14] - ldr r4, [sp, 0x18] - lsls r1, 16 - lsrs r7, r1, 16 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r4, 24 - movs r1, 0 - lsrs r3, 19 - adds r3, r2 - lsls r3, 1 - adds r6, r3 - cmp r1, r4 - bcs _08124E26 -_08124E04: - lsls r0, r1, 6 - adds r2, r6, r0 - movs r0, 0 - adds r3, r1, 0x1 - cmp r0, r5 - bcs _08124E1E -_08124E10: - strh r7, [r2] - adds r2, 0x2 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, r5 - bcc _08124E10 -_08124E1E: - lsls r0, r3, 24 - lsrs r1, r0, 24 - cmp r1, r4 - bcc _08124E04 -_08124E26: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8124DDC - - thumb_func_start sub_8124E2C -sub_8124E2C: @ 8124E2C - push {r4-r7,lr} - adds r7, r0, 0 - ldr r0, [sp, 0x14] - ldr r4, [sp, 0x18] - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r6, r4, 24 - movs r4, 0 - lsrs r3, 19 - adds r3, r2 - lsls r3, 1 - adds r7, r3 - cmp r4, r6 - bcs _08124E76 -_08124E50: - lsls r0, r4, 6 - adds r2, r7, r0 - movs r3, 0 - adds r4, 0x1 - cmp r3, r5 - bcs _08124E6E -_08124E5C: - ldrh r0, [r1] - strh r0, [r2] - adds r1, 0x2 - adds r2, 0x2 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r5 - bcc _08124E5C -_08124E6E: - lsls r0, r4, 24 - lsrs r4, r0, 24 - cmp r4, r6 - bcc _08124E50 -_08124E76: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8124E2C - - .align 2, 0 @ Don't pad with nop. -*/ diff --git a/ld_script.txt b/ld_script.txt index d2586f3c3..8bf867a21 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -337,7 +337,6 @@ SECTIONS { asm/pokedex_area_screen.o(.text); src/scene/evolution_scene.o(.text); src/roulette.o(.text); - asm/roulette.o(.text); asm/pokedex_cry_screen.o(.text); src/pokemon/pokedex_cry_screen.o(.text); asm/pokedex_cry_screen.o(.text_811A4F8); @@ -350,7 +349,6 @@ SECTIONS { src/field/choose_party.o(.text); asm/cable_car.o(.text); src/roulette_util.o(.text); - asm/roulette_util.o(.text); asm/cable_car_util.o(.text); src/unused_8124F94.o(.text); src/engine/save.o(.text); -- cgit v1.2.3 From b3551bc2f328c286c6ecc45ea288665d46b44260 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 6 Jan 2018 12:27:27 -0600 Subject: fix some code and formatting anomalies --- de_after.sh | 0 de_before.sh | 3 +- include/battle.h | 10 - include/contest.h | 167 + include/ewram.h | 1 - src/battle/battle_7.c | 9 +- src/battle/contest_link_80C857C.c | 39 +- src/contest.c | 209 +- src/de_rom_8040FE0.c | 74 +- src/easy_chat_1.c | 26 +- src/pokenav_after.c | 16 +- src/pokenav_before.c | 6402 +++++++++++++++++++------------------ src/rom_8077ABC.c | 1618 ++++++---- 13 files changed, 4470 insertions(+), 4104 deletions(-) mode change 100644 => 100755 de_after.sh mode change 100644 => 100755 de_before.sh diff --git a/de_after.sh b/de_after.sh old mode 100644 new mode 100755 diff --git a/de_before.sh b/de_before.sh old mode 100644 new mode 100755 index a68790143..392726948 --- a/de_before.sh +++ b/de_before.sh @@ -1,4 +1,3 @@ -cp override-de.mk -rsync -avhI asm-de/ asm/ +cp override-de.mk override.mk rsync -avhI data-de/ data/ rsync -avhI graphics-de/ graphics/ diff --git a/include/battle.h b/include/battle.h index 0881cf82c..0824fc46c 100644 --- a/include/battle.h +++ b/include/battle.h @@ -368,16 +368,6 @@ struct Struct2017100 u32 arr[4]; }; -struct Struct2019348 -{ - u16 unk0; - u16 unk2; - u8 unk4; - u32 unk8; - u32 unkC; - u32 unk10; -}; - struct Struct2017800 { u8 invisible:1; diff --git a/include/contest.h b/include/contest.h index 10392c00e..6e71358a2 100644 --- a/include/contest.h +++ b/include/contest.h @@ -87,4 +87,171 @@ bool8 Contest_SaveWinner(u8); u8 sub_80B2C4C(u8, u8); void Contest_ResetWinners(void); +// Contest Shared EWRAM + +struct Shared18000 +{ + /*0x18000*/ u8 unk18000; + /*0x18001*/ u8 filler18001[3]; + /*0x18004*/ u16 unk18004[16][16]; + /*0x18204*/ u16 unk18204[0x200]; + /*0x18604*/ u16 unk18604[0x200]; + /*0x18A04*/ u8 unk18A04[0x800]; +}; + +struct Contest +{ + /*0x19204*/ u8 playerMoveChoice; + /*0x19205*/ u8 turnNumber; + /*0x19206*/ u8 unk19206[4]; // seems to only be used by an unref function + /*0x1920A*/ u16 unk1920A_0:1; // Task active flags? + u16 unk1920A_1:1; + u16 unk1920A_2:1; + u16 unk1920A_3:1; + u16 unk1920A_4:1; + u16 unk1920A_5:1; + u16 unk1920A_6:1; + u16 unk1920A_7:1; + /*0x1920B*/ u16 unk1920B_0:1; + u16 unk1920B_1:1; + u16 unk1920B_2:1; + /*0x1920C*/ u8 mainTaskId; + /*0x1920D*/ u8 unk1920D[4]; + /*0x19211*/ u8 unk19211; + /*0x19212*/ u8 unk19212; + /*0x19213*/ u8 filler19213; + /*0x19214*/ u8 unk19214; + /*0x19215*/ u8 unk19215; + /*0x19216*/ u8 unk19216; // sprite ID + /*0x19217*/ s8 applauseLevel; + /*0x19218*/ u8 unk19218[4]; + /*0x1921C*/ u32 unk1921C; // saved RNG value? + u16 unk19220[5][4]; // move history? + u8 unk19248[5][4]; // excitement history + u8 applauseMeterSpriteId; // sprite ID + /*0x1925D*/ u8 unk1925D; + /*0x1925E*/ u8 unk1925E; +}; + +struct ContestantStatus +{ + s16 appeal1; // move appeal? + s16 appeal2; // final appeal after end of turn, maybe? + s16 unk4; + u16 currMove; + u16 prevMove; + u8 moveCategory; + u8 unkB_0:2; + u8 unkB_2:2; + u8 moveRepeatCount:3; + u8 unkB_7:1; // used a one-time move? + u8 unkC_0:1; + u8 unkC_1:2; + s8 unkD; + u8 unkE; + u8 unkF; + u8 unk10_0:1; + u8 unk10_1:1; + u8 unk10_2:1; + u8 unk10_3:1; + u8 unk10_4:2; + u8 unk10_6:2; + u8 unk11_0:2; + u8 unk11_2:1; + u8 unk11_3:1; + u8 unk11_4:1; + u8 unk11_5:1; + u8 unk12; + u8 unk13; // status action? + u8 unk14; + u8 disappointedRepeat:1; + u8 unk15_1:1; + u8 unk15_2:1; + u8 unk15_3:1; + u8 unk15_4:1; + u8 unk15_5:1; + u8 unk15_6:1; + u8 unk16; + u8 unk17; + u8 unk18; + u8 unk19; // turn position + u8 attentionLevel; // How much the Pokemon "stood out" + u8 unk1B; +}; + +struct UnknownContestStruct3 +{ + u8 unk0; + u8 unk1; + //u8 unk2_0:1; + //u8 unk2_1:1; + u8 unk2; // maybe a bitfield + u8 filler3; +}; + +// possibly the same as UnknownContestStruct3? +struct UnknownContestStruct4 +{ + u8 unk0; // sprite ID + u8 unk1; // sprite ID + u8 unk2_0:1; + u8 unk2_1:1; + u8 unk2_2:1; + u8 filler3; +}; + +struct UnknownContestStruct5 +{ + s8 bits_0; // current move excitement? + u8 bits_8:1; + u8 bits_9:3; + u8 bits_C:4; + s8 unk2; + u8 filler3; +}; + +struct UnknownContestStruct7 +{ + u8 unk0[4]; + u16 unk4; + u16 unk6; + u8 filler8[0xD-8]; + u8 unkD[4]; + u8 unk11; + u8 filler12[2]; +}; + +struct UnknownContestStruct8 +{ + u16 unk0; + u16 unk2; + u8 unk4_0:1; + u8 unk5; + u8 filler6[2]; + u32 unk8; + u32 unkC; + u32 unk10; +}; + +struct UnknownContestStruct6 +{ + s32 unk0; + s32 unk4; + s32 unk8; + s32 unkC; +}; + +#define shared15800 (gSharedMem + 0x15800) +#define shared15DE0 (*(struct ContestWinner *)(gSharedMem + 0x15DE0)) +#define shared16800 (gSharedMem + 0x16800) +#define shared18000 (*(struct Shared18000 *)(gSharedMem + 0x18000)) +#define shared18004 ((u16 *)(gSharedMem + 0x18004)) +#define sContest (*(struct Contest *)(gSharedMem + 0x19204)) +#define sContestantStatus ((struct ContestantStatus *)(gSharedMem + 0x19260)) +#define shared192D0 (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0)) +#define shared192E4 (gSharedMem + 0x192E4) +#define shared19328 (*(struct UnknownContestStruct5 *)(gSharedMem + 0x19328)) +#define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338)) +#define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348)) + #endif // GUARD_CONTEST_H diff --git a/include/ewram.h b/include/ewram.h index 5a350840a..60fa43b41 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -215,7 +215,6 @@ extern u8 gSharedMem[]; #define ewram19000 (&gSharedMem[0x19000]) #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) -#define ewram19348 (*(struct Struct2019348 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) #define ewram1A000 (&gSharedMem[0x1A000]) diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 7ca9ac3c4..e11971606 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -3,6 +3,7 @@ #include "battle_anim.h" #include "battle_interface.h" #include "blend_palette.h" +#include "contest.h" #include "data2.h" #include "decompress.h" #include "main.h" @@ -629,9 +630,9 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) if (IsContest()) { r10 = 0; - species = ewram19348.unk2; - personalityValue = ewram19348.unk8; - otId = ewram19348.unkC; + species = shared19348.unk2; + personalityValue = shared19348.unk8; + otId = shared19348.unkC; HandleLoadSpecialPokePic( &gMonBackPicTable[species], gMonBackPicCoords[species].coords, @@ -639,7 +640,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) eVoidSharedArr2, gUnknown_081FAF4C[0], species, - ewram19348.unk10); + shared19348.unk10); } else { diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 0ae98af09..616a72d27 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -3,52 +3,33 @@ #if GERMAN -void de_sub_80C9274(bool32 arg0) { - if (deUnkValue2 != 1) - { - return; - } - - if (arg0) - { - deUnkValue2 = 3; - } - else +void de_sub_80C9274(bool32 arg0) +{ + if (deUnkValue2 == 1) { - deUnkValue2 = 2; + if (arg0) + deUnkValue2 = 3; + else + deUnkValue2 = 2; } } -void de_sub_80C9294(bool32 arg0) { +void de_sub_80C9294(bool32 arg0) +{ if (deUnkValue2 == 1) { if (arg0) - { deUnkValue2 = 3; - } else - { deUnkValue2 = 2; - } - - return; } - - - if (deUnkValue2 == 2) + else if (deUnkValue2 == 2) { SendBlock(0, sBlockRequestLookupTable[deUnkValue1].address, sBlockRequestLookupTable[deUnkValue1].size); - if (arg0) - { deUnkValue2 = 0; - } else - { deUnkValue2 = 1; - } - - return; } } diff --git a/src/contest.c b/src/contest.c index f5aab709d..365f92538 100644 --- a/src/contest.c +++ b/src/contest.c @@ -39,171 +39,6 @@ extern void sub_80C8C80(u8); extern void sub_81288F4(); extern u8 sub_8128944(void); -struct Shared18000 -{ - /*0x18000*/ u8 unk18000; - /*0x18001*/ u8 filler18001[3]; - /*0x18004*/ u16 unk18004[16][16]; - /*0x18204*/ u16 unk18204[0x200]; - /*0x18604*/ u16 unk18604[0x200]; - /*0x18A04*/ u8 unk18A04[0x800]; -}; - -struct Contest -{ - /*0x19204*/ u8 playerMoveChoice; - /*0x19205*/ u8 turnNumber; - /*0x19206*/ u8 unk19206[4]; // seems to only be used by an unref function - /*0x1920A*/ u16 unk1920A_0:1; // Task active flags? - u16 unk1920A_1:1; - u16 unk1920A_2:1; - u16 unk1920A_3:1; - u16 unk1920A_4:1; - u16 unk1920A_5:1; - u16 unk1920A_6:1; - u16 unk1920A_7:1; - /*0x1920B*/ u16 unk1920B_0:1; - u16 unk1920B_1:1; - u16 unk1920B_2:1; - /*0x1920C*/ u8 mainTaskId; - /*0x1920D*/ u8 unk1920D[4]; - /*0x19211*/ u8 unk19211; - /*0x19212*/ u8 unk19212; - /*0x19213*/ u8 filler19213; - /*0x19214*/ u8 unk19214; - /*0x19215*/ u8 unk19215; - /*0x19216*/ u8 unk19216; // sprite ID - /*0x19217*/ s8 applauseLevel; - /*0x19218*/ u8 unk19218[4]; - /*0x1921C*/ u32 unk1921C; // saved RNG value? - u16 unk19220[5][4]; // move history? - u8 unk19248[5][4]; // excitement history - u8 applauseMeterSpriteId; // sprite ID - /*0x1925D*/ u8 unk1925D; - /*0x1925E*/ u8 unk1925E; -}; - -struct ContestantStatus -{ - s16 appeal1; // move appeal? - s16 appeal2; // final appeal after end of turn, maybe? - s16 unk4; - u16 currMove; - u16 prevMove; - u8 moveCategory; - u8 unkB_0:2; - u8 unkB_2:2; - u8 moveRepeatCount:3; - u8 unkB_7:1; // used a one-time move? - u8 unkC_0:1; - u8 unkC_1:2; - s8 unkD; - u8 unkE; - u8 unkF; - u8 unk10_0:1; - u8 unk10_1:1; - u8 unk10_2:1; - u8 unk10_3:1; - u8 unk10_4:2; - u8 unk10_6:2; - u8 unk11_0:2; - u8 unk11_2:1; - u8 unk11_3:1; - u8 unk11_4:1; - u8 unk11_5:1; - u8 unk12; - u8 unk13; // status action? - u8 unk14; - u8 disappointedRepeat:1; - u8 unk15_1:1; - u8 unk15_2:1; - u8 unk15_3:1; - u8 unk15_4:1; - u8 unk15_5:1; - u8 unk15_6:1; - u8 unk16; - u8 unk17; - u8 unk18; - u8 unk19; // turn position - u8 attentionLevel; // How much the Pokemon "stood out" - u8 unk1B; -}; - -struct UnknownContestStruct3 -{ - u8 unk0; - u8 unk1; - //u8 unk2_0:1; - //u8 unk2_1:1; - u8 unk2; // maybe a bitfield - u8 filler3; -}; - -// possibly the same as UnknownContestStruct3? -struct UnknownContestStruct4 -{ - u8 unk0; // sprite ID - u8 unk1; // sprite ID - u8 unk2_0:1; - u8 unk2_1:1; - u8 unk2_2:1; - u8 filler3; -}; - -struct UnknownContestStruct5 -{ - s8 bits_0; // current move excitement? - u8 bits_8:1; - u8 bits_9:3; - u8 bits_C:4; - s8 unk2; - u8 filler3; -}; - -struct UnknownContestStruct7 -{ - u8 unk0[4]; - u16 unk4; - u16 unk6; - u8 filler8[0xD-8]; - u8 unkD[4]; - u8 unk11; - u8 filler12[2]; -}; - -struct UnknownContestStruct8 -{ - u16 unk0; - u16 unk2; - u8 unk4_0:1; - u8 unk5; - u8 filler6[2]; - u32 unk8; - u32 unkC; - u32 unk10; -}; - -struct UnknownContestStruct6 -{ - s32 unk0; - s32 unk4; - s32 unk8; - s32 unkC; -}; - -#define shared15800 (gSharedMem + 0x15800) -#define shared15DE0 (*(struct ContestWinner *)(gSharedMem + 0x15DE0)) -#define shared16800 (gSharedMem + 0x16800) -#define shared18000 (*(struct Shared18000 *)(gSharedMem + 0x18000)) -#define shared18004 ((u16 *)(gSharedMem + 0x18004)) -#define sContest (*(struct Contest *)(gSharedMem + 0x19204)) -#define sContestantStatus ((struct ContestantStatus *)(gSharedMem + 0x19260)) -#define shared192D0_ (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0)) -#define shared192E4 (gSharedMem + 0x192E4) -#define shared19328 (*(struct UnknownContestStruct5 *)(gSharedMem + 0x19328)) -#define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338)) -#define shared19348_ (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348)) - extern struct MusicPlayerInfo gMPlay_SE1; extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; @@ -555,7 +390,7 @@ void ClearContestVars(void) sContestantStatus[i].unk14 = 0xFF; } - memset(&shared192D0_, 0, sizeof(shared192D0_)); + memset(&shared192D0, 0, sizeof(shared192D0)); memset(shared192E4, 0, 0x44 * sizeof(*shared192E4)); memset(&shared19328, 0, sizeof(shared19328)); memset(shared19338, 0, 4 * sizeof(*shared19338)); @@ -1063,7 +898,7 @@ void sub_80AC2CC(u8 taskId) { case 0: sub_80B0D7C(); - for (i = 0; sContest.unk19214 != shared192D0_.unk0[i]; i++) + for (i = 0; sContest.unk19214 != shared192D0.unk0[i]; i++) ; sContest.unk19215 = i; r7 = sContest.unk19215; @@ -1106,7 +941,7 @@ void sub_80AC2CC(u8 taskId) case 3: for (i = 0; i < 4; i++) gBattleMonForms[i] = 0; - memset(&shared19348_, 0, sizeof(shared19348_)); + memset(&shared19348, 0, sizeof(shared19348)); sub_80B28F0(sContest.unk19215); spriteId = sub_80AE9FC( gContestMons[sContest.unk19215].species, @@ -4528,13 +4363,13 @@ void sub_80B114C(u8 contestant) } sContestantStatus[contestant].appeal1 = gContestEffects[effect].appeal; sContestantStatus[contestant].appeal2 = gContestEffects[effect].appeal; - shared192D0_.unk4 = gContestEffects[effect].jam; - shared192D0_.unk6 = gContestEffects[effect].jam; - shared192D0_.unk11 = contestant; + shared192D0.unk4 = gContestEffects[effect].jam; + shared192D0.unk6 = gContestEffects[effect].jam; + shared192D0.unk11 = contestant; for (i = 0; i < 4; i++) { sContestantStatus[i].unkE = 0; - shared192D0_.unkD[i] = 0; + shared192D0.unkD[i] = 0; } if (sContestantStatus[contestant].unk15_4 && AreMovesContestCombo(sContestantStatus[contestant].prevMove, sContestantStatus[contestant].currMove) == 0) sContestantStatus[contestant].unk15_4 = 0; @@ -4637,13 +4472,13 @@ void sub_80B146C(u8 a, u8 b) { StringCopy(gStringVar1, gContestMons[a].nickname); StringCopy(gStringVar2, gMoveNames[sContestantStatus[a].currMove]); - if (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_COOL) + if (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_COOL) StringCopy(gStringVar3, gText_Contest_Shyness); - else if (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) + else if (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_BEAUTY) StringCopy(gStringVar3, gText_Contest_Anxiety); - else if (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_CUTE) + else if (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_CUTE) StringCopy(gStringVar3, gText_Contest_Laziness); - else if (gContestMoves[sContestantStatus[shared192D0_.unk11].currMove].contestCategory == CONTEST_CATEGORY_SMART) + else if (gContestMoves[sContestantStatus[shared192D0.unk11].currMove].contestCategory == CONTEST_CATEGORY_SMART) StringCopy(gStringVar3, gText_Contest_Hesitancy); else StringCopy(gStringVar3, gText_Contest_Fear); @@ -4708,7 +4543,7 @@ void sub_80B159C(void) for (i = 0; i < 4; i++) { - shared192D0_.unk0[i] = sp0[i]; + shared192D0.unk0[i] = sp0[i]; sContestantStatus[i].unk19 = 0xFF; sContestantStatus[i].unk10_6 = 0; gUnknown_02038696[i] = sp0[i]; @@ -5083,7 +4918,7 @@ void sub_80B20C4(void) for (i = 0; i < 4; i++) { - if (shared192D0_.unkD[i] != 0 && !Contest_IsMonsTurnDisabled(i)) + if (shared192D0.unkD[i] != 0 && !Contest_IsMonsTurnDisabled(i)) { u8 r4 = gUnknown_02038696[i] * 5 + 2; u16 r0 = sub_80AEFE8(i, 3); @@ -5339,7 +5174,7 @@ void sub_80B2790(u8 a) u16 species = SanitizeSpecies(gContestMons[a].species); u8 r5_2; - memset(&shared19348_, 0, sizeof(shared19348_)); + memset(&shared19348, 0, sizeof(shared19348)); ClearBattleAnimationVars(); for (i = 0; i < 4; i++) gBattleMonForms[i] = 0; @@ -5354,9 +5189,9 @@ void sub_80B2790(u8 a) case MOVE_TRANSFORM: case MOVE_ROLE_PLAY: r5_2 = sContestantStatus[a].unk1B; - shared19348_.unk2 = SanitizeSpecies(gContestMons[r5_2].species); - shared19348_.unk10 = gContestMons[r5_2].personality; - shared19348_.unk4_0 = 1; + shared19348.unk2 = SanitizeSpecies(gContestMons[r5_2].species); + shared19348.unk10 = gContestMons[r5_2].personality; + shared19348.unk4_0 = 1; break; case MOVE_RETURN: gAnimFriendship = 0xFF; @@ -5384,17 +5219,17 @@ void sub_80B2790(u8 a) void sub_80B28CC(int unused) { - memset(&shared19348_, 0, sizeof(shared19348_)); + memset(&shared19348, 0, sizeof(shared19348)); if (sContest.unk1925E != 0) sContest.unk1925E--; } void sub_80B28F0(u8 a) { - shared19348_.unk5 = a; - shared19348_.unk0 = SanitizeSpecies(gContestMons[a].species); - shared19348_.unk8 = gContestMons[a].personality; - shared19348_.unkC = gContestMons[a].otId; + shared19348.unk5 = a; + shared19348.unk0 = SanitizeSpecies(gContestMons[a].species); + shared19348.unk8 = gContestMons[a].personality; + shared19348.unkC = gContestMons[a].otId; } void sub_80B292C(void) diff --git a/src/de_rom_8040FE0.c b/src/de_rom_8040FE0.c index 53ad4a806..ad1cbf473 100644 --- a/src/de_rom_8040FE0.c +++ b/src/de_rom_8040FE0.c @@ -2,54 +2,33 @@ #include "battle.h" #include "battle_tower.h" #include "ewram.h" +#include "trainer.h" #if GERMAN -enum { - TRAINER_CLASS_NAME_LEADER = 25, - TRAINER_CLASS_NAME_SCHOOL_KID = 26, - TRAINER_CLASS_NAME_EXPERT = 30, - TRAINER_CLASS_NAME_POKEMON_TRAINER_3 = 46, -}; - -enum { - TRAINER_CLASS_LEADER_F = 26, - TRAINER_CLASS_ELITE_FOUR_F = 25, - TRAINER_CLASS_SCHOOL_KID_F = 30, - TRAINER_CLASS_BIRD_KEEPER = 46, - TRAINER_CLASS_MAY_1 = 61, - TRAINER_CLASS_MAY_2 = 62, - TRAINER_CLASS_MAY_3 = 63, -}; - extern u8 gTrainerClassNames[][13]; extern struct Trainer gTrainers[]; -u8 *de_sub_8040FE0(u8 gender) { +u8 *de_sub_8040FE0(u8 gender) +{ if (gender) - { gender++; - - } - gender = TRAINER_CLASS_NAME_SCHOOL_KID; return gTrainerClassNames[gender]; } -u8 *de_sub_8040FF4(u8 gender) { - if (gender) { +u8 *de_sub_8040FF4(u8 gender) +{ + if (gender) gender++; - } - gender = TRAINER_CLASS_NAME_POKEMON_TRAINER_3; return gTrainerClassNames[gender]; } -u8 *de_sub_804100C(u8 gender) { - if (gender) { +u8 *de_sub_804100C(u8 gender) +{ + if (gender) gender++; - } - gender = TRAINER_CLASS_NAME_LEADER; return gTrainerClassNames[gender]; } @@ -60,7 +39,8 @@ u8 de_sub_81364AC(void); u8 get_trainer_class_name_index(void); u8 de_sub_81364F8(void); -u8 *de_sub_8041024(s32 arg0, u32 arg1) { +u8 *de_sub_8041024(s32 arg0, u32 arg1) +{ u8 nameIndex, trainerClass, gender; struct Trainer *trainer; u8 local2; @@ -71,68 +51,39 @@ u8 *de_sub_8041024(s32 arg0, u32 arg1) { nameIndex = GetSecretBaseTrainerNameIndex(); gender = eSecretBaseRecord.gender; if (nameIndex == TRAINER_CLASS_NAME_SCHOOL_KID) - { return de_sub_8040FE0(gender); - } - return gTrainerClassNames[nameIndex]; - case 0x100: trainerClass = de_sub_81364AC(); nameIndex = get_trainer_class_name_index(); if (trainerClass == TRAINER_CLASS_SCHOOL_KID_F) - { return de_sub_8040FE0(FEMALE); - } if (trainerClass == TRAINER_CLASS_MAY_1 || trainerClass == TRAINER_CLASS_MAY_2 || trainerClass == TRAINER_CLASS_MAY_3) - { return de_sub_8040FF4(FEMALE); - } - return gTrainerClassNames[nameIndex]; - case 0x800: trainerClass = de_sub_81364F8(); nameIndex = GetEReaderTrainerClassNameIndex(); if (trainerClass == TRAINER_CLASS_SCHOOL_KID_F) - { return de_sub_8040FE0(FEMALE); - } if (trainerClass == TRAINER_CLASS_MAY_1 || trainerClass == TRAINER_CLASS_MAY_2 || trainerClass == TRAINER_CLASS_MAY_3) - { return de_sub_8040FF4(FEMALE); - } - return gTrainerClassNames[nameIndex]; - default: trainer = &gTrainers[arg1]; trainerClass = trainer->trainerClass; local2 = sub_803FC58(arg1); - if (trainerClass == TRAINER_CLASS_LEADER_F) - { return de_sub_8040FE0(local2); - } - if (trainerClass == TRAINER_CLASS_BIRD_KEEPER && local2 == FEMALE) - { return de_sub_8040FF4(FEMALE); - } - if (trainerClass == TRAINER_CLASS_ELITE_FOUR_F) { if (gTrainers[arg1].doubleBattle == TRUE) - { return de_sub_804100C(FEMALE); - } else - { return de_sub_804100C(MALE); - } } - - return gTrainerClassNames[trainerClass]; } } @@ -264,7 +215,8 @@ _08041108: .4byte gTrainerClassNames\n\ } #endif -u32 de_sub_804110C(u32 arg0, u32 arg1) { +u32 de_sub_804110C(u32 arg0, u32 arg1) +{ return arg1; } diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index a1a67152e..e5b6cf7c3 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -91,19 +91,19 @@ const struct EasyChatPrompt gUnknown_083DB6F4[] = const u8 gUnknown_083DB7C0[][2] = { - { 0, 6}, - { 1, 7}, - { 1, 8}, - { 1, 9}, - { 2, 10}, - {16, 13}, - { 4, 12}, - { 3, 13}, - { 3, 13}, - { 5, 14}, - { 3, 13}, - { 3, 13}, - { 3, 13}, + { 0, 6}, + { 1, 7}, + { 1, 8}, + { 1, 9}, + { 2, 10}, + {16, 13}, + { 4, 12}, + { 3, 13}, + { 3, 13}, + { 5, 14}, + { 3, 13}, + { 3, 13}, + { 3, 13}, {15, 13}, }; diff --git a/src/pokenav_after.c b/src/pokenav_after.c index 84ed7b14b..330305ea3 100644 --- a/src/pokenav_after.c +++ b/src/pokenav_after.c @@ -6,16 +6,10 @@ #include "de_rom_8040FE0.h" #include "string_util.h" -void sub_80F700C(u8 *arg0, u16 arg1) { - struct Trainer *trainer; - u8 *ptr; - -#if ENGLISH - trainer = (struct Trainer *) &gTrainers[gUnknown_083DFEC4->unkCEE8[arg1].unk0]; -#elif GERMAN - const u16 trainerIndex = gUnknown_083DFEC4->unkCEE8[arg1].unk0; - trainer = (struct Trainer *) &gTrainers[trainerIndex]; -#endif +void sub_80F700C(u8 *arg0, u16 arg1) +{ + const struct Trainer *trainer = &gTrainers[gUnknown_083DFEC4->unkCEE8[arg1].unk0]; + u8 *ptr = arg0; ptr = arg0; if (arg1 < gUnknown_083DFEC4->unkD158) @@ -23,7 +17,7 @@ void sub_80F700C(u8 *arg0, u16 arg1) { #if ENGLISH ptr = StringCopy(ptr, gTrainerClassNames[trainer->trainerClass]); #elif GERMAN - ptr = StringCopy(ptr, de_sub_8041024(0, trainerIndex)); + ptr = StringCopy(ptr, de_sub_8041024(0, gUnknown_083DFEC4->unkCEE8[arg1].unk0)); #endif ptr[0] = 0xFC; diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 7693cba7d..8a67390ad 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -22,69 +22,70 @@ extern u8 ewram[]; -struct UnknownPokenav0 { - /* 0x0000 */ u8 var0[0x0300]; - /* 0x0300 */ void (*var300)(void); - /* 0x0304 */ u16 var304; - /* 0x0306 */ u16 var306; - /* 0x0308 */ u32 var308; - /* 0x030C */ u8 fill030C[0x6a9f]; - /* 0x6dab */ u8 var6dab; - /* 0x6dac */ u8 var6dac; - /* 0x6dad */ u8 var6dad; - /* 0x6dae */ u8 var6dae; - /* 0x6daf */ u8 fill6daf[0x3]; - /* 0x6db2 */ u8 var6db2[5]; - /* 0x6db7 */ u8 fill6db7[0x25]; - /* 0x6ddc */ s8 var6ddc; - /* 0x6ddd */ u8 fill6ddd[0x13]; - /* 0x6df0 */ s8 var6df0; - /* 0x6df1 */ u8 fill6df1[0xB]; - /* 0x6dfc */ u8 var6dfc; - /* 0x6dfd */ u8 fill6dfd[0x17]; - /* 0x6e14 */ u8 var6e14; - /* 0x6e15 */ u8 var6e15; - /* 0x6e16 */ u8 var6e16; - /* 0x6e17 */ u8 var6e17; - /* 0x6e18 */ u8 fill6e18[0x78]; - /* 0x6e90 */ u8 var6e90; - /* 0x6e91 */ u8 fill6e91[0x4]; - /* 0x6e95 */ u8 var6e95; - /* 0x6e96 */ u8 var6e96[0x814]; - /* 0x76AA */ u8 var76aa; - /* 0x76AB */ u8 fill76AB[0x10BD]; - /* 0x8768 */ u32 var8768; - /* 0x876C */ u8 fill876C[0x2]; - /* 0x876E */ u8 var876E; - /* 0x876F */ u8 fill876F[0x5]; - /* 0x8774 */ s16 var8774; - /* 0x8776 */ u8 fill8776[0x55]; - /* 0x87CB */ u8 var87CB; - /* 0x87CC */ u8 fill87CC[0xC]; - /* 0x87D8 */ u8 var87D8; - /* 0x87D9 */ u8 fill87D9[0x1]; - /* 0x87DA */ s16 var87DA; - /* 0x87DC */ s16 var87DC; - /* 0x87DE */ u8 fill87DE[0x4a]; - /* 0x8828 */ u8 playerPartyCount; - /* 0x8829 */ u8 fill8829[0x07bf]; - /* 0x8FE8 */ s8 var8fe8; - /* 0x8FE9 */ u8 fill8FE9[0x16]; - /* 0x8FFF */ u8 var8fff[5]; - /* 0x9004 */ u8 fill9004[0x340]; - /* 0x9344 */ u8 var9344; - /* 0x9345 */ u8 fill9345[0x3b8b]; - /* 0xced0 */ u32 varCED0; - /* 0xced4 */ u8 fillCED4[0x284]; - /* 0xD158 */ u16 varD158; - /* 0xD15A */ u8 fillD15A[0x8]; - /* 0xD162 */ u8 varD162; +struct UnknownPokenav0 +{ + /* 0x0000 */ u8 var0[0x0300]; + /* 0x0300 */ void (*var300)(void); + /* 0x0304 */ u16 var304; + /* 0x0306 */ u16 var306; + /* 0x0308 */ u32 var308; + /* 0x030C */ u8 fill030C[0x6a9f]; + /* 0x6dab */ u8 var6dab; + /* 0x6dac */ u8 var6dac; + /* 0x6dad */ u8 var6dad; + /* 0x6dae */ u8 var6dae; + /* 0x6daf */ u8 fill6daf[0x3]; + /* 0x6db2 */ u8 var6db2[5]; + /* 0x6db7 */ u8 fill6db7[0x25]; + /* 0x6ddc */ s8 var6ddc; + /* 0x6ddd */ u8 fill6ddd[0x13]; + /* 0x6df0 */ s8 var6df0; + /* 0x6df1 */ u8 fill6df1[0xB]; + /* 0x6dfc */ u8 var6dfc; + /* 0x6dfd */ u8 fill6dfd[0x17]; + /* 0x6e14 */ u8 var6e14; + /* 0x6e15 */ u8 var6e15; + /* 0x6e16 */ u8 var6e16; + /* 0x6e17 */ u8 var6e17; + /* 0x6e18 */ u8 fill6e18[0x78]; + /* 0x6e90 */ u8 var6e90; + /* 0x6e91 */ u8 fill6e91[0x4]; + /* 0x6e95 */ u8 var6e95; + /* 0x6e96 */ u8 var6e96[0x814]; + /* 0x76AA */ u8 var76aa; + /* 0x76AB */ u8 fill76AB[0x10BD]; + /* 0x8768 */ u32 var8768; + /* 0x876C */ u8 fill876C[0x2]; + /* 0x876E */ u8 var876E; + /* 0x876F */ u8 fill876F[0x5]; + /* 0x8774 */ s16 var8774; + /* 0x8776 */ u8 fill8776[0x55]; + /* 0x87CB */ u8 var87CB; + /* 0x87CC */ u8 fill87CC[0xC]; + /* 0x87D8 */ u8 var87D8; + /* 0x87D9 */ u8 fill87D9[0x1]; + /* 0x87DA */ s16 var87DA; + /* 0x87DC */ s16 var87DC; + /* 0x87DE */ u8 fill87DE[0x4a]; + /* 0x8828 */ u8 playerPartyCount; + /* 0x8829 */ u8 fill8829[0x07bf]; + /* 0x8FE8 */ s8 var8fe8; + /* 0x8FE9 */ u8 fill8FE9[0x16]; + /* 0x8FFF */ u8 var8fff[5]; + /* 0x9004 */ u8 fill9004[0x340]; + /* 0x9344 */ u8 var9344; + /* 0x9345 */ u8 fill9345[0x3b8b]; + /* 0xced0 */ u32 varCED0; + /* 0xced4 */ u8 fillCED4[0x284]; + /* 0xD158 */ u16 varD158; + /* 0xD15A */ u8 fillD15A[0x8]; + /* 0xD162 */ u8 varD162; }; struct UnknownPokenav0_1 { - u8 fill6dad[0x6dad]; - s8 var6dad; - s8 var6dae; + u8 fill6dad[0x6dad]; + s8 var6dad; + s8 var6dae; }; IWRAM_DATA void (*gUnknown_03000744)(void); @@ -297,1140 +298,1280 @@ extern void sub_80F19FC(); extern u16 gKeyRepeatStartDelay; -void sub_80EBA5C() { - switch (gMain.state) { - default: - gMain.state = 0; - case 0: - ewram0_10.var6dac = is_c1_link_related_active(); - if (!ewram0_10.var6dac) { - ewram0_10.var6dab = 0; - gMain.state++; - SetMainCallback2(&sub_80EBBE8); - break; - } - break; - case 1: - SetVBlankCallback(NULL); - break; - case 2: - ResetPaletteFade(); - break; - case 3: - ResetSpriteData(); - break; - case 4: - FreeAllSpritePalettes(); - break; - case 5: - ResetTasks(); - break; - case 6: - remove_some_task(); - break; - case 7: - sub_80F1A90(); - gMain.state++; - case 8: - if (sub_80F1AC4()) return; - break; - case 9: - sub_80F2688(); - gMain.state++; - - case 10: - if (sub_80F26BC()) return; - break; - case 11: - sub_80F36F0(); - gMain.state++; - case 12: - if (sub_80F3724()) return; - break; - case 13: - sub_80EBC10(); - sub_80EBDBC(&sub_80EBDD8); - break; - case 14: - ewram0_10.var6dab = 1; - PlaySE(SE_PN_ON); - SetMainCallback2(&sub_80EBD90); - SetVBlankCallback(&sub_80EBD18); - sub_80F1A74(); - break; - } - - gMain.state++; +void sub_80EBA5C() +{ + switch (gMain.state) + { + default: + gMain.state = 0; + case 0: + ewram0_10.var6dac = is_c1_link_related_active(); + if (!ewram0_10.var6dac) + { + ewram0_10.var6dab = 0; + gMain.state++; + SetMainCallback2(&sub_80EBBE8); + } + break; + case 1: + SetVBlankCallback(NULL); + break; + case 2: + ResetPaletteFade(); + break; + case 3: + ResetSpriteData(); + break; + case 4: + FreeAllSpritePalettes(); + break; + case 5: + ResetTasks(); + break; + case 6: + remove_some_task(); + break; + case 7: + sub_80F1A90(); + gMain.state++; + case 8: + if (sub_80F1AC4()) + return; + break; + case 9: + sub_80F2688(); + gMain.state++; + // fall through + case 10: + if (sub_80F26BC()) + return; + break; + case 11: + sub_80F36F0(); + gMain.state++; + case 12: + if (sub_80F3724()) + return; + break; + case 13: + sub_80EBC10(); + sub_80EBDBC(&sub_80EBDD8); + break; + case 14: + ewram0_10.var6dab = 1; + PlaySE(SE_PN_ON); + SetMainCallback2(&sub_80EBD90); + SetVBlankCallback(&sub_80EBD18); + sub_80F1A74(); + break; + } + + gMain.state++; } -void sub_80EBBE8() { - u8 var1; - if (!ewram0_10.var6dab) { - var1 = ewram0_10.var6dab; - do { - sub_80EBA5C(); - var1 = ewram0_10.var6dab; - } while (!var1); - } +void sub_80EBBE8() +{ + while (!ewram0_10.var6dab) + sub_80EBA5C(); } -void sub_80EBC10() { - u16 i; - u16 *var1; - - gKeyRepeatStartDelay = 0x14; - ewram0_10.playerPartyCount = CalculatePlayerPartyCount(); - ewram0_10.var6ddc = 0; - ewram0_10.var9344 = 0; - ewram0_10.var8768 = 0; - ewram0_10.varCED0 = 0; - - for (i = 0; i < 5; ++i) { - ewram0_10.var8fff[i] = 0; - var1 = (u16 *)ewram0_10.var0; - var1[i*2 + 0x4820] = 0x9B; - var1[i*2 + 0x4821] = 0x5B; - } - - ewram0_10.var6e95 = 0; - sub_80EBCA8(); +void sub_80EBC10() +{ + u16 i; + u16 *var1; + + gKeyRepeatStartDelay = 0x14; + ewram0_10.playerPartyCount = CalculatePlayerPartyCount(); + ewram0_10.var6ddc = 0; + ewram0_10.var9344 = 0; + ewram0_10.var8768 = 0; + ewram0_10.varCED0 = 0; + + for (i = 0; i < 5; ++i) + { + ewram0_10.var8fff[i] = 0; + var1 = (u16 *)ewram0_10.var0; + var1[i*2 + 0x4820] = 0x9B; + var1[i*2 + 0x4821] = 0x5B; + } + + ewram0_10.var6e95 = 0; + sub_80EBCA8(); } -void sub_80EBCA8() { - ewram0_10.var6db2[0] = 1; - ewram0_10.var6db2[1] = 2; - ewram0_10.var6db2[2] = 3; +void sub_80EBCA8() +{ + ewram0_10.var6db2[0] = 1; + ewram0_10.var6db2[1] = 2; + ewram0_10.var6db2[2] = 3; - if (FlagGet(FLAG_SYS_RIBBON_GET)) { - ewram0_10.var6db2[3] = 4; - } - else { - ewram0_10.var6db2[3] = 0; - } + if (FlagGet(FLAG_SYS_RIBBON_GET)) + ewram0_10.var6db2[3] = 4; + else + ewram0_10.var6db2[3] = 0; - ewram0_10.var6db2[4] = 5; + ewram0_10.var6db2[4] = 5; } -void sub_80EBD18() { - LoadOam(); - ProcessSpriteCopyRequests(); - TransferPlttBuffer(); - sub_80F1FF0(); +void sub_80EBD18() +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + sub_80F1FF0(); } -void sub_80EBD30() { - LoadOam(); - ProcessSpriteCopyRequests(); - TransferPlttBuffer(); - UpdateRegionMapVideoRegs(); - sub_80EFE7C(); +void sub_80EBD30() +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + UpdateRegionMapVideoRegs(); + sub_80EFE7C(); } -void sub_80EBD4C() { - LoadOam(); - ProcessSpriteCopyRequests(); - TransferPlttBuffer(); - sub_80F5BF0(); - sub_8089668(); +void sub_80EBD4C() +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + sub_80F5BF0(); + sub_8089668(); } -void sub_80EBD68() { - LoadOam(); - ProcessSpriteCopyRequests(); - TransferPlttBuffer(); - sub_80F6F64(); +void sub_80EBD68() +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + sub_80F6F64(); } -void sub_80EBD80() { - LoadOam(); - ProcessSpriteCopyRequests(); +void sub_80EBD80() +{ + LoadOam(); + ProcessSpriteCopyRequests(); } -void sub_80EBD90() { - ewram0_10.var300(); - AnimateSprites(); - BuildOamBuffer(); - RunTasks(); - UpdatePaletteFade(); - sub_80F19FC(); +void sub_80EBD90() +{ + ewram0_10.var300(); + AnimateSprites(); + BuildOamBuffer(); + RunTasks(); + UpdatePaletteFade(); + sub_80F19FC(); } -void sub_80EBDBC(void (*func)(void)) { - ewram0_10.var300 = func; - ewram0_10.var304 = 0; +void sub_80EBDBC(void (*func)(void)) +{ + ewram0_10.var300 = func; + ewram0_10.var304 = 0; } -void sub_80EBDD8() { - switch (ewram0_10.var304) { - case 0: - SetVBlankCallback(NULL); - REG_DISPCNT = 0; - ewram0_10.var6dad = ewram0_10.var6ddc; - ewram0_10.var6dae = 5; - ewram0_10.var304++; - break; - case 1: - sub_80F3FF0(); - ewram0_10.var304++; - case 2: - if (sub_80F4024()) return; - ewram0_10.var304++; - break; - case 3: - sub_80F2598(); - ewram0_10.var304++; - break; - case 4: - sub_80EEE20(); - ewram0_10.var304++; - case 5: - if (sub_80EEE54()) return; - sub_80EEE08(); - ewram0_10.var304++; - return; - case 6: - sub_80EF248(0); - ewram0_10.var304++; - case 7: - if (sub_80EF284(0)) return; - ewram0_10.var304++; - break; - case 8: - sub_80F1B8C(0); - ewram0_10.var304++; - case 9: - if (sub_80F1BC8(0)) return; - ewram0_10.var304++; - break; - case 10: - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 11: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); - ewram0_10.var304++; - return; - case 12: - sub_80EED2C(0); - ewram0_10.var304++; - return; - case 13: - if (gPaletteFade.active) return; - ewram0_10.var304++; - return; - case 14: - sub_80F2C80(0); - ewram0_10.var304++; - case 15: - if (sub_80F2CBC(0)) return; - ewram0_10.var304++; - break; - case 16: - sub_80F1DF0(); - ewram0_10.var304++; - return; - case 17: - if (!sub_80F1E50()) { - sub_80EF428(0, 0); - sub_80EBDBC(&sub_80EC268); +void sub_80EBDD8() +{ + switch (ewram0_10.var304) + { + case 0: + SetVBlankCallback(NULL); + REG_DISPCNT = 0; + ewram0_10.var6dad = ewram0_10.var6ddc; + ewram0_10.var6dae = 5; + ewram0_10.var304++; + break; + case 1: + sub_80F3FF0(); + ewram0_10.var304++; + // fall through + case 2: + if (!sub_80F4024()) + ewram0_10.var304++; + break; + case 3: + sub_80F2598(); + ewram0_10.var304++; + break; + case 4: + sub_80EEE20(); + ewram0_10.var304++; + // fall through + case 5: + if (!sub_80EEE54()) + { + sub_80EEE08(); + ewram0_10.var304++; } - return; - - } - + break; + case 6: + sub_80EF248(0); + ewram0_10.var304++; + // fall through + case 7: + if (!sub_80EF284(0)) + ewram0_10.var304++; + break; + case 8: + sub_80F1B8C(0); + ewram0_10.var304++; + // fall through + case 9: + if (!sub_80F1BC8(0)) + ewram0_10.var304++; + break; + case 10: + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 11: + BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + ewram0_10.var304++; + break; + case 12: + sub_80EED2C(0); + ewram0_10.var304++; + break; + case 13: + if (!gPaletteFade.active) + ewram0_10.var304++; + break; + case 14: + sub_80F2C80(0); + ewram0_10.var304++; + // fall through + case 15: + if (!sub_80F2CBC(0)) + ewram0_10.var304++; + break; + case 16: + sub_80F1DF0(); + ewram0_10.var304++; + break; + case 17: + if (!sub_80F1E50()) + { + sub_80EF428(0, 0); + sub_80EBDBC(&sub_80EC268); + } + break; + } } -void sub_80EC00C() { - switch (ewram0_10.var304) { - case 0: - if (!sub_80EEF78()) { - SetVBlankCallback(&sub_80EBD80); - sub_80EED1C(); - ewram0_10.var6dad = ewram0_10.var6ddc; - ewram0_10.var6dae = 5; - sub_80EEE08(); +void sub_80EC00C() +{ + switch (ewram0_10.var304) + { + case 0: + if (!sub_80EEF78()) + { + SetVBlankCallback(&sub_80EBD80); + sub_80EED1C(); + ewram0_10.var6dad = ewram0_10.var6ddc; + ewram0_10.var6dae = 5; + sub_80EEE08(); + ewram0_10.var304++; + } + break; + case 1: + sub_80EF248(0); + ewram0_10.var304++; + // fall through + case 2: + if (!sub_80EF284(0)) + ewram0_10.var304++; + break; + case 3: + sub_80F1B8C(0); + ewram0_10.var304++; + // fall through + case 4: + if (!sub_80F1BC8(0)) + ewram0_10.var304++; + break; + case 5: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 6: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 7: + sub_80EED2C(0); + ewram0_10.var304++; + break; + case 8: + if (!gPaletteFade.active) + ewram0_10.var304++; + break; + case 9: + sub_80F2598(); + ewram0_10.var304++; + break; + case 10: + sub_80F2C80(0); + ewram0_10.var304++; + // fall through + case 11: + if (!sub_80F2CBC(0)) ewram0_10.var304++; + break; + case 12: + sub_80F1DF0(); + ewram0_10.var304++; + break; + case 13: + if (!sub_80F1E50()) + { + sub_80EF428(0, ewram0_10.var6dad); + sub_80EBDBC(&sub_80EC268); } break; - case 1: - sub_80EF248(0); - ewram0_10.var304++; - case 2: - if (sub_80EF284(0)) return; - ewram0_10.var304++; - break; - case 3: - sub_80F1B8C(0); - ewram0_10.var304++; - case 4: - if (sub_80F1BC8(0)) return; - ewram0_10.var304++; - break; - case 5: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 7: - sub_80EED2C(0); - ewram0_10.var304++; - break; - case 8: - if (gPaletteFade.active) return; - ewram0_10.var304++; - return; - case 9: - sub_80F2598(); - ewram0_10.var304++; - break; - case 10: - sub_80F2C80(0); - ewram0_10.var304++; - case 11: - if (sub_80F2CBC(0)) return; - ewram0_10.var304++; - return; - case 12: - sub_80F1DF0(); - ewram0_10.var304++; - return; - case 13: - if (sub_80F1E50()) return; - sub_80EF428(0, ewram0_10.var6dad); - sub_80EBDBC(&sub_80EC268); - } + } } -void sub_80EC210() { - switch (ewram0_10.var304) { - case 0: - sub_80F2D04(1); - sub_80EE9C0(0, ewram0_10.var6ddc, 0); - ewram0_10.var304++; +void sub_80EC210() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F2D04(1); + sub_80EE9C0(0, ewram0_10.var6ddc, 0); + ewram0_10.var304++; + break; + case 1: + if (!sub_80EEA0C()) + sub_80EBDBC(&sub_80EC268); break; - case 1: - if (sub_80EEA0C()) return; - sub_80EBDBC(&sub_80EC268); - } + } } -void sub_80EC268() { - u8 var1; - switch (ewram0_10.var304) { - case 0: - if (sub_80EEC10() != 0) { - PlaySE(0x5); - sub_80EF428(0, ewram0_10.var6dad); - sub_80EED9C(); - break; - } - else { - if (gMain.newKeys & A_BUTTON) { - ewram0_10.var6ddc = ewram0_10.var6dad; - switch (ewram0_10.var6db2[ewram0_10.var6ddc] - 1) { - case 0: - PlaySE(5); - sub_80EBDBC(&sub_80EC4A0); - break; - case 1: - PlaySE(5); - sub_80EBDBC(&sub_80EC81C); - break; - case 4: - ewram0_10.var304 = 1; - break; - case 3: - ewram0_10.var304 = 2; - break; - case 2: - ewram0_10.var304 = 6; - break; - } +void sub_80EC268() +{ + u8 var1; + + switch (ewram0_10.var304) + { + case 0: + if (sub_80EEC10() != 0) + { + PlaySE(SE_SELECT); + sub_80EF428(0, ewram0_10.var6dad); + sub_80EED9C(); + } + else + { + if (gMain.newKeys & A_BUTTON) + { + ewram0_10.var6ddc = ewram0_10.var6dad; + switch (ewram0_10.var6db2[ewram0_10.var6ddc] - 1) + { + case 0: + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EC4A0); + break; + case 1: + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EC81C); + break; + case 4: + ewram0_10.var304 = 1; + break; + case 3: + ewram0_10.var304 = 2; + break; + case 2: + ewram0_10.var304 = 6; + break; + } + } + else if (gMain.newKeys & B_BUTTON) + { + ewram0_10.var304 = 1; + } + } + break; + case 1: + sub_80F208C(); + sub_80EBDBC(&sub_80EE96C); + break; + case 2: + sub_80F6208(); + ewram0_10.var304++; + // fall through + case 3: + if (!sub_80F6250()) + ewram0_10.var304++; + break; + case 4: + if (!sub_8055870()) + { + if (ewram0_10.var8fe8 != 0) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EDB88); } - else if (gMain.newKeys & B_BUTTON) { - ewram0_10.var304 = 1; + else + { + PlaySE(0x20); + sub_80EF428(0, 5); + ewram0_10.var304 = 0xFF; } - break; } - case 1: - sub_80F208C(); - sub_80EBDBC(&sub_80EE96C); - break; - case 2: - sub_80F6208(); - ewram0_10.var304++; - case 3: - if (sub_80F6250()) return; - ewram0_10.var304++; break; - case 4: - if (sub_8055870()) return; - if (ewram0_10.var8fe8 != 0) { - PlaySE(0x5); - sub_80EBDBC(&sub_80EDB88); - break; - } - else { - PlaySE(0x20); - sub_80EF428(0, 5); - ewram0_10.var304 = 0xFF; - break; - } - case 6: - sub_80F6C20(); - if (ewram0_10.varD158 != 0) { - PlaySE(0x5); - sub_80EBDBC(&sub_80EE3D8); - break; - } - else { - PlaySE(0x20); - sub_80EF428(0, 6); - ewram0_10.var304 = 0xFF; - break; - } - case 0xFF: - if ((var1 = sub_80EEC10()) != 0) { - PlaySE(0x5); - sub_80EF428(0, ewram0_10.var6dad); - ewram0_10.var304 = 0; - sub_80EED9C(); - } - else { - if (!(gMain.newKeys & (A_BUTTON | B_BUTTON))) return; + case 6: + sub_80F6C20(); + if (ewram0_10.varD158 != 0) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EE3D8); + } + else + { + PlaySE(0x20); + sub_80EF428(0, 6); + ewram0_10.var304 = 0xFF; + } + break; + case 0xFF: + if ((var1 = sub_80EEC10()) != 0) + { + PlaySE(SE_SELECT); + sub_80EF428(0, ewram0_10.var6dad); + ewram0_10.var304 = 0; + sub_80EED9C(); + } + else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { sub_80EF428(0, ewram0_10.var6dad); ewram0_10.var304 = var1; - break; } - } + break; + } } -void sub_80EC4A0() { - u32 var1; - u32 var2; - switch (ewram0_10.var304) { - case 0: - sub_80F1E84(); - sub_80F2D04(0); - ewram0_10.var304++; - break; - case 1: - if (!sub_80F1F10()) { - if (gSaveBlock2.regionMapZoom) { - var1 = 0x7; - } - else var1 = 0x8; - sub_80EEFBC(var1); +void sub_80EC4A0() +{ + u32 var1; + + switch (ewram0_10.var304) + { + case 0: + sub_80F1E84(); + sub_80F2D04(0); + ewram0_10.var304++; + break; + case 1: + if (!sub_80F1F10()) + { + if (gSaveBlock2.regionMapZoom) + var1 = 0x7; + else + var1 = 0x8; + sub_80EEFBC(var1); + ewram0_10.var304++; + } + break; + case 2: + if (!sub_80EEF34()) + { + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + ewram0_10.var304++; + } + break; + case 3: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); ewram0_10.var304++; } - break; - case 2: - if (!(var2 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var2); + break; + case 4: + sub_80F2620(); + ewram0_10.var304++; + break; + case 5: + sub_80EF814(); + ewram0_10.var304++; + break; + case 6: + sub_80EF840(); + ewram0_10.var304++; + // fall through + case 7: + if (!sub_80EF874()) ewram0_10.var304++; - } - break; - case 3: - if (gPaletteFade.active) return; - SetVBlankCallback(NULL); - sub_80EED0C(); - ewram0_10.var304++; - break; - case 4: - sub_80F2620(); - ewram0_10.var304++; - break; - case 5: - sub_80EF814(); - ewram0_10.var304++; - break; - case 6: - sub_80EF840(); - ewram0_10.var304++; - case 7: - if (sub_80EF874()) return; - ewram0_10.var304++; - break; - case 8: - sub_80F2C80(0x4); - ewram0_10.var304++; - case 9: - if (sub_80F2CBC(0x4)) return; - ewram0_10.var304++; - break; - case 0xA: - sub_80F2DD8(); - SetVBlankCallback(&sub_80EBD30); - ewram0_10.var304++; - break; - case 0xB: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 0xC: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - ewram0_10.var304++; - break; - case 0xD: - sub_80EED2C(0x1); - ewram0_10.var304++; + break; + case 8: + sub_80F2C80(0x4); + ewram0_10.var304++; + // fall through + case 9: + if (!sub_80F2CBC(0x4)) + ewram0_10.var304++; + break; + case 0xA: + sub_80F2DD8(); + SetVBlankCallback(&sub_80EBD30); + ewram0_10.var304++; + break; + case 0xB: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 0xC: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + ewram0_10.var304++; + break; + case 0xD: + sub_80EED2C(0x1); + ewram0_10.var304++; + break; + case 0xE: + if (!gPaletteFade.active) + sub_80EBDBC(&sub_80EC67C); break; - case 0xE: - if (gPaletteFade.active) return; - sub_80EBDBC(&sub_80EC67C); - } + } } -void sub_80EC67C() { - u32 var1; - u32 var2; - switch (ewram0_10.var304) { - case 0: - switch (sub_80FAB60()) { - case 1: - sub_80EED9C(); - break; - case 3: - sub_80EF9F8(); - break; - case 4: - PlaySE(0x5); - ewram0_10.var304 = 1; - break; - case 5: - PlaySE(0x5); - ewram0_10.var304 = 4; - break; - } - break; - case 1: - if (!ewram0_10.var6e90) { +void sub_80EC67C() +{ + switch (ewram0_10.var304) + { + case 0: + switch (sub_80FAB60()) + { + case 1: + sub_80EED9C(); + break; + case 3: + sub_80EF9F8(); + break; + case 4: + PlaySE(SE_SELECT); + ewram0_10.var304 = 1; + break; + case 5: + PlaySE(SE_SELECT); + ewram0_10.var304 = 4; + break; + } + break; + case 1: + if (!ewram0_10.var6e90) + { + sub_80FAEC4(); + ewram0_10.var304++; + } + else if (!sub_80EFBDC(1)) + { sub_80FAEC4(); ewram0_10.var304++; - break; } - if (sub_80EFBDC(1)) return; - sub_80FAEC4(); - ewram0_10.var304++; - break; - case 2: - if ((var2 = sub_80FAFC0())) return; - if (!ewram0_10.var6e90) { + break; + case 2: + if (!sub_80FAFC0()) + { + if (!ewram0_10.var6e90) + { + sub_80EFBB0(); + ewram0_10.var304 = 0; + } + else + { + ewram0_10.var304++; + } + } + break; + case 3: + if (!sub_80EFBDC(0)) + { sub_80EFBB0(); - ewram0_10.var304 = var2; - break; + ewram0_10.var304 = 0; + } + break; + case 4: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 5: + if (!gPaletteFade.active) + { + sub_80F2DF4(); + sub_80F2D04(0x4); + gSaveBlock2.regionMapZoom = (ewram0_10.var6e90 == 1) ? 1 : 0; + sub_80EBDBC(&sub_80EC00C); } - ewram0_10.var304++; - break; - case 3: - if ((var1 = sub_80EFBDC(0))) return; - sub_80EFBB0(); - ewram0_10.var304 = var1; - break; - case 4: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; break; - case 5: - if (gPaletteFade.active) return; - sub_80F2DF4(); - sub_80F2D04(0x4); - gSaveBlock2.regionMapZoom = (ewram0_10.var6e90 == 1) ? 1 : 0; - sub_80EBDBC(&sub_80EC00C); - } + } } -void sub_80EC81C() { - switch (ewram0_10.var304) { - case 0: - sub_80F2D04(0); - sub_80EE9C0(1, 0, 1); - ewram0_10.var304++; +void sub_80EC81C() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F2D04(0); + sub_80EE9C0(1, 0, 1); + ewram0_10.var304++; + break; + case 1: + if (!sub_80EEA0C()) + sub_80EBDBC(&sub_80EC86C); break; - case 1: - if (sub_80EEA0C()) return; - sub_80EBDBC(&sub_80EC86C); - } + } } -void sub_80EC86C() { - switch (ewram0_10.var304) { - case 0: - if (sub_80EEC90()) { - PlaySE(0x5); - sub_80EF428(1, ewram0_10.var6dad); - sub_80EED9C(); - break; - } - if (gMain.newKeys & A_BUTTON) { - PlaySE(0x5); - ewram0_10.var6df0 = ewram0_10.var6dad; - switch (ewram0_10.var6df0) { - case 0: - sub_80EBDBC(&sub_80ED620); - break; - case 1: - sub_80EBDBC(&sub_80EC960); - break; - case 2: - sub_80EBDBC(&sub_80EC210); - break; - } - break; - } - else if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - ewram0_10.var6df0 = 0x2; - ewram0_10.var6dad = 0x2; - ewram0_10.var304++; - break; - } +void sub_80EC86C() +{ + switch (ewram0_10.var304) + { + case 0: + if (sub_80EEC90()) + { + PlaySE(SE_SELECT); + sub_80EF428(1, ewram0_10.var6dad); + sub_80EED9C(); + } + else if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + ewram0_10.var6df0 = ewram0_10.var6dad; + switch (ewram0_10.var6df0) + { + case 0: + sub_80EBDBC(&sub_80ED620); + break; + case 1: + sub_80EBDBC(&sub_80EC960); + break; + case 2: + sub_80EBDBC(&sub_80EC210); + break; + } + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + ewram0_10.var6df0 = 0x2; + ewram0_10.var6dad = 0x2; + ewram0_10.var304++; + } + break; + case 1: + if (!sub_80F1E6C()) + sub_80EBDBC(&sub_80EC210); break; - case 1: - if (sub_80F1E6C()) return; - sub_80EBDBC(&sub_80EC210); - } + } } -void sub_80EC960() { - switch (ewram0_10.var304) { - case 0: - sub_80EE9C0(2, 0, 5); - ewram0_10.var304++; +void sub_80EC960() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80EE9C0(2, 0, 5); + ewram0_10.var304++; + break; + case 1: + if (!sub_80EEA0C()) + sub_80EBDBC(&sub_80ECC08); break; - case 1: - if (sub_80EEA0C()) return; - sub_80EBDBC(&sub_80ECC08); - } + } } -void sub_80EC9A8() { - switch (ewram0_10.var304) { - case 0: - sub_80F2D04(5); - sub_80EE9C0(1, ewram0_10.var6df0, 0xC); - ewram0_10.var304++; - break; - case 1: - if (sub_80EEA0C()) return; - sub_80EBDBC(&sub_80EC86C); - sub_80EF428(1, ewram0_10.var6dad); - } -} - -void sub_80ECA10() { - switch (ewram0_10.var304) { - case 0: - if (sub_80EEF78()) return; - SetVBlankCallback(&sub_80EBD80); - sub_80EED1C(); - ewram0_10.var6dad = ewram0_10.var6df0; - ewram0_10.var6dae = 0x3; - sub_80EEE08(); - ewram0_10.var304++; - break; - case 1: - sub_80EF248(0x1); - ewram0_10.var304++; - case 2: - if (sub_80EF284(0x1)) return; - ewram0_10.var304++; - break; - case 3: - sub_80F1B8C(0x1); - ewram0_10.var304++; - case 4: - if (sub_80F1BC8(0x1)) return; - ewram0_10.var304++; - break; - case 5: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 7: - sub_80EED2C(0); - ewram0_10.var304++; - break; - case 8: - sub_80F2598(); - ewram0_10.var304++; - break; - case 9: - if (gPaletteFade.active) return; - ewram0_10.var304++; +void sub_80EC9A8() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F2D04(5); + sub_80EE9C0(1, ewram0_10.var6df0, 0xC); + ewram0_10.var304++; + break; + case 1: + if (!sub_80EEA0C()) + { + sub_80EBDBC(&sub_80EC86C); + sub_80EF428(1, ewram0_10.var6dad); + } break; - case 0xA: - sub_80F2C80(0x1); - ewram0_10.var304++; + } +} - case 0xB: - if (sub_80F2CBC(0x1)) return; - ewram0_10.var304++; - break; - case 0xC: - sub_80F1DF0(); - ewram0_10.var304++; +void sub_80ECA10() +{ + switch (ewram0_10.var304) + { + case 0: + if (!sub_80EEF78()) + { + SetVBlankCallback(&sub_80EBD80); + sub_80EED1C(); + ewram0_10.var6dad = ewram0_10.var6df0; + ewram0_10.var6dae = 0x3; + sub_80EEE08(); + ewram0_10.var304++; + } + break; + case 1: + sub_80EF248(0x1); + ewram0_10.var304++; + case 2: + if (!sub_80EF284(0x1)) + ewram0_10.var304++; + break; + case 3: + sub_80F1B8C(0x1); + ewram0_10.var304++; + case 4: + if (!sub_80F1BC8(0x1)) + ewram0_10.var304++; + break; + case 5: + if (sub_8055870()) return; + ewram0_10.var304++; + break; + case 6: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 7: + sub_80EED2C(0); + ewram0_10.var304++; + break; + case 8: + sub_80F2598(); + ewram0_10.var304++; + break; + case 9: + if (!gPaletteFade.active) + ewram0_10.var304++; + break; + case 0xA: + sub_80F2C80(0x1); + ewram0_10.var304++; + // fall through + case 0xB: + if (!sub_80F2CBC(0x1)) + ewram0_10.var304++; + break; + case 0xC: + sub_80F1DF0(); + ewram0_10.var304++; + break; + case 0xD: + if (!sub_80F1E50()) + { + sub_80EF428(1, ewram0_10.var6dad); + sub_80EBDBC(&sub_80EC86C); + } break; - case 0xD: - if (sub_80F1E50()) return; - sub_80EF428(1, ewram0_10.var6dad); - sub_80EBDBC(&sub_80EC86C); - } + } } -void sub_80ECC08() { - switch (ewram0_10.var304) { - case 0: - if (sub_80EEC90()) { - PlaySE(0x5); - sub_80EF428(2, ewram0_10.var6dad); - sub_80EED9C(); - break; - } +void sub_80ECC08() +{ + switch (ewram0_10.var304) + { + case 0: + if (sub_80EEC90()) + { + PlaySE(SE_SELECT); + sub_80EF428(2, ewram0_10.var6dad); + sub_80EED9C(); + } + else if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + switch ((s8)ewram0_10.var6dad) + { + case 0: + ewram0_10.var87D8 = 22; + break; + case 1: + ewram0_10.var87D8 = 23; + break; + case 2: + ewram0_10.var87D8 = 24; + break; + case 3: + ewram0_10.var87D8 = 33; + break; + case 4: + ewram0_10.var87D8 = 47; + break; + case 5: + sub_80EBDBC(&sub_80EC9A8); + return; + } - if (gMain.newKeys & A_BUTTON) { - PlaySE(0x5); - switch ((s8)ewram0_10.var6dad) { - case 0: - ewram0_10.var87D8 = 22; - break; - case 1: - ewram0_10.var87D8 = 23; - break; - case 2: - ewram0_10.var87D8 = 24; - break; - case 3: - ewram0_10.var87D8 = 33; - break; - case 4: - ewram0_10.var87D8 = 47; - break; - case 5: - sub_80EBDBC(&sub_80EC9A8); - return; - } + ewram0_10.var6dfc = ewram0_10.var6dad; + ewram0_10.var76aa = 1; + sub_80EBDBC(&sub_80ED01C); + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + ewram0_10.var6dad = 0x5; + ewram0_10.var304++; + } + break; + case 1: + if (!sub_80F1E6C()) + sub_80EBDBC(&sub_80EC9A8); + break; + } +} - ewram0_10.var6dfc = ewram0_10.var6dad; - ewram0_10.var76aa = 1; - sub_80EBDBC(&sub_80ED01C); +void sub_80ECD80() +{ + switch (ewram0_10.var304) + { + case 0: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 1: + if (!gPaletteFade.active) + ewram0_10.var304++; + break; + case 2: + if (!sub_80EEF78()) + { + SetVBlankCallback(&sub_80EBD80); + ewram0_10.var304++; } - else if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - ewram0_10.var6dad = 0x5; + break; + case 3: + sub_80EED1C(); + sub_80F3130(); + ewram0_10.var304++; + break; + case 4: + sub_80F2D6C(0x1); + ewram0_10.var304++; + break; + case 5: + sub_80F2D6C(0x5); + ewram0_10.var304++; + break; + case 6: + ewram0_10.var6dad = ewram0_10.var6dfc; + ewram0_10.var6dae = 0x6; + sub_80EEE08(); + ewram0_10.var304++; + break; + case 7: + sub_80EF248(0x2); + ewram0_10.var304++; + // fall through + case 8: + if (!sub_80EF284(0x2)) + ewram0_10.var304++; + break; + case 9: + sub_80F1B8C(0x2); + ewram0_10.var304++; + // fall through + case 10: + if (!sub_80F1BC8(0x2)) + ewram0_10.var304++; + break; + case 11: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 12: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 13: + sub_80EED2C(0); + ewram0_10.var304++; + break; + case 14: + sub_80F2598(); + ewram0_10.var304++; + break; + case 15: + if (!gPaletteFade.active) + ewram0_10.var304++; + break; + case 16: + sub_80F2C80(0x1); + ewram0_10.var304++; + // fall through + case 17: + if (!sub_80F2CBC(0x1)) + { + ewram0_10.var306 = 0; ewram0_10.var304++; } + break; + case 18: + sub_80F2C80(0x5); + ewram0_10.var304++; + // fall through + case 19: + if (!sub_80F2CBC(0x5)) + { + sub_80F1DF0(); + ewram0_10.var304++; + } + break; + case 20: + if (!sub_80F1E50()) + { + sub_80EF428(2, ewram0_10.var6dad); + sub_80EBDBC(&sub_80ECC08); + } break; - case 1: - if (sub_80F1E6C()) return;; - sub_80EBDBC(&sub_80EC9A8); - break; - } -} - -void sub_80ECD80() { - u16 var1; - switch (ewram0_10.var304) { - case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; - break; - case 1: - if (gPaletteFade.active) return; - ewram0_10.var304++; - break; - case 2: - if (sub_80EEF78()) return; - SetVBlankCallback(&sub_80EBD80); - ewram0_10.var304++; - break; - case 3: - sub_80EED1C(); - sub_80F3130(); - ewram0_10.var304++; - break; - case 4: - sub_80F2D6C(0x1); - ewram0_10.var304++; - break; - case 5: - sub_80F2D6C(0x5); - ewram0_10.var304++; - break; - case 6: - ewram0_10.var6dad = ewram0_10.var6dfc; - ewram0_10.var6dae = 0x6; - sub_80EEE08(); - ewram0_10.var304++; - break; - case 7: - sub_80EF248(0x2); - ewram0_10.var304++; - case 8: - if (sub_80EF284(0x2)) return; - ewram0_10.var304++; - break; - case 9: - sub_80F1B8C(0x2); - ewram0_10.var304++; - case 10: - if (sub_80F1BC8(0x2)) return; - ewram0_10.var304++; - break; - case 11: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 12: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 13: - sub_80EED2C(0); - ewram0_10.var304++; - break; - case 14: - sub_80F2598(); - ewram0_10.var304++; - break; - case 15: - if (gPaletteFade.active) return; - ewram0_10.var304++; - break; - case 16: - sub_80F2C80(0x1); - ewram0_10.var304++; - case 17: - if ((var1 = sub_80F2CBC(0x1))) return; - ewram0_10.var306 = var1; - ewram0_10.var304++; - break; - case 18: - sub_80F2C80(0x5); - ewram0_10.var304++; - case 19: - if (sub_80F2CBC(0x5)) return; - sub_80F1DF0(); - ewram0_10.var304++; - break; - case 20: - if (sub_80F1E50()) return; - sub_80EF428(2, ewram0_10.var6dad); - sub_80EBDBC(&sub_80ECC08); - } + } } -void sub_80ED01C() { - u16 var1; - u16 var3; - switch (ewram0_10.var304) { - case 0: - sub_80F1E84(); - sub_80F2D04(0x1); - sub_80F2D04(0x5); - ewram0_10.var304++; - break; - case 1: - if (sub_80F1F10()) return; - sub_80EEFBC(0); - ewram0_10.var304++; - break; - case 2: - if ((var1 = sub_80EEF34())) return; - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); - ewram0_10.var304++; - break; - case 3: - if (gPaletteFade.active) return; - SetVBlankCallback(NULL); - sub_80EED0C(); - sub_80EF814(); - ewram0_10.var304++; - break; - case 4: - sub_80F2620(); - ewram0_10.var304++; - break; - case 5: - sub_80F4D44(); - ewram0_10.var304++; - case 6: - if (!sub_80F4D88()) { - ewram0_10.var304 += 2; - break; +void sub_80ED01C() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F1E84(); + sub_80F2D04(0x1); + sub_80F2D04(0x5); + ewram0_10.var304++; + break; + case 1: + if (!sub_80F1F10()) + { + sub_80EEFBC(0); + ewram0_10.var304++; } - ewram0_10.var304++; - break; - case 7: - if (sub_8055870()) return; - ewram0_10.var304--; - break; - case 8: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 9: - sub_80F0264(0); - ewram0_10.var304++; - case 10: - if (sub_80F02A0()) return; - ewram0_10.var304++; - break; - case 11: - sub_80F3008(0); - ewram0_10.var304++; - break; - case 12: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 13: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 14: - sub_80EED2C(0x4); - ewram0_10.var304++; - break; - case 15: - if (gPaletteFade.active) return; - ewram0_10.var306 = (u8)(gPaletteFade.active << 24); - ewram0_10.var304++; - break; - case 16: - sub_80F2C80(0x1); - ewram0_10.var304++; - case 17: - if ((var3 = sub_80F2CBC(0x1))) return; - ewram0_10.var306 = var3; - ewram0_10.var304++; - break; - case 18: - sub_80F2C80(ewram0_10.var6dfc + 7); - ewram0_10.var304++; - case 19: - if (sub_80F2CBC(ewram0_10.var6dfc + 7)) return; - sub_80EBDBC(&sub_80ED31C); - break; - } + break; + case 2: + if (!sub_80EEF34()) + { + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + ewram0_10.var304++; + } + break; + case 3: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80EF814(); + ewram0_10.var304++; + } + break; + case 4: + sub_80F2620(); + ewram0_10.var304++; + break; + case 5: + sub_80F4D44(); + ewram0_10.var304++; + // fall through + case 6: + if (!sub_80F4D88()) + ewram0_10.var304 += 2; + else + ewram0_10.var304 += 1; + break; + case 7: + if (!sub_8055870()) + ewram0_10.var304--; + break; + case 8: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 9: + sub_80F0264(0); + ewram0_10.var304++; + // fall through + case 10: + if (!sub_80F02A0()) + ewram0_10.var304++; + break; + case 11: + sub_80F3008(0); + ewram0_10.var304++; + break; + case 12: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 13: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 14: + sub_80EED2C(0x4); + ewram0_10.var304++; + break; + case 15: + if (!gPaletteFade.active) + { + ewram0_10.var306 = 0; + ewram0_10.var304++; + } + break; + case 16: + sub_80F2C80(0x1); + ewram0_10.var304++; + // fall through + case 17: + if (!sub_80F2CBC(0x1)) + { + ewram0_10.var306 = 0; + ewram0_10.var304++; + } + break; + case 18: + sub_80F2C80(ewram0_10.var6dfc + 7); + ewram0_10.var304++; + // fall through + case 19: + if (!sub_80F2CBC(ewram0_10.var6dfc + 7)) + sub_80EBDBC(&sub_80ED31C); + break; + } } -void sub_80ED31C() { - switch (ewram0_10.var304) { - case 0: - switch (sub_80F5DD4()) { - case 1: - PlaySE(0x5); +void sub_80ED31C() +{ + switch (ewram0_10.var304) + { + case 0: + switch (sub_80F5DD4()) + { + case 1: + PlaySE(SE_SELECT); + ShowMapNamePopUpWindow(); + break; + case 2: + PlaySE(SE_SELECT); + ewram0_10.var304++; + break; + default: + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80ED4D8); + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80ECD80); + } + break; + } + break; + case 1: + if (!sub_80F0718()) + { ShowMapNamePopUpWindow(); - break; - case 2: - PlaySE(0x5); + sub_80F3264(); ewram0_10.var304++; - break; - default: - if (gMain.newKeys & A_BUTTON) { - PlaySE(0x5); - sub_80EBDBC(&sub_80ED4D8); - } - else if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80EBDBC(&sub_80ECD80); - } - break; } - break; - case 1: - if (sub_80F0718()) return; - ShowMapNamePopUpWindow(); - sub_80F3264(); - ewram0_10.var304++; - break; - case 2: - if (sub_8055870()) return; - ewram0_10.var304 = 0; - break; - } + break; + case 2: + if (!sub_8055870()) + ewram0_10.var304 = 0; + break; + } } -void sub_80ED3D0() { - switch (ewram0_10.var304) { - case 0: - SetVBlankCallback(NULL); - ewram0_10.var304++; - break; - case 1: - sub_80EED0C(); - sub_80F6134(); - ewram0_10.var304++; - break; - case 2: - sub_80EEFBC(0); - ewram0_10.var304++; - break; - case 3: - sub_80F0264(0); - ewram0_10.var304++; - case 4: - if (sub_80F02A0()) return; - ewram0_10.var304++; - break; - case 5: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 6: - sub_80F3008(0); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 7: - sub_80EED2C(0x4); - ewram0_10.var304++; +void sub_80ED3D0() +{ + switch (ewram0_10.var304) + { + case 0: + SetVBlankCallback(NULL); + ewram0_10.var304++; + break; + case 1: + sub_80EED0C(); + sub_80F6134(); + ewram0_10.var304++; + break; + case 2: + sub_80EEFBC(0); + ewram0_10.var304++; + break; + case 3: + sub_80F0264(0); + ewram0_10.var304++; + // fall through + case 4: + if (!sub_80F02A0()) + ewram0_10.var304++; + break; + case 5: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 6: + sub_80F3008(0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 7: + sub_80EED2C(0x4); + ewram0_10.var304++; + break; + case 8: + if (!gPaletteFade.active) + sub_80EBDBC(&sub_80ED31C); break; - case 8: - if (gPaletteFade.active) return; - sub_80EBDBC(&sub_80ED31C); - } + } } -void sub_80ED4D8() { - switch (ewram0_10.var304) { - case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; - break; - case 1: - if (gPaletteFade.active) return; - SetVBlankCallback(NULL); - sub_80EED0C(); - sub_80F3130(); - ewram0_10.var304++; - break; - case 2: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 3: - sub_80F4CF0(); - ewram0_10.var304++; - break; - case 4: - sub_80EFF34(); - ewram0_10.var304++; - case 5: - if (sub_80EFF68()) return; - ewram0_10.var304++; - break; - case 6: - sub_80F35B4(); - sub_80EEFBC(0x2); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(sub_80EBD4C); - ewram0_10.var304++; - break; - case 7: - sub_80EED2C(0x2); - ewram0_10.var304++; - break; - case 8: - if (gPaletteFade.active) return; - sub_80EBDBC(&sub_80ED858); - break; - } +void sub_80ED4D8() +{ + switch (ewram0_10.var304) + { + case 0: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 1: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80F3130(); + ewram0_10.var304++; + } + break; + case 2: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 3: + sub_80F4CF0(); + ewram0_10.var304++; + break; + case 4: + sub_80EFF34(); + ewram0_10.var304++; + // fall through + case 5: + if (!sub_80EFF68()) + ewram0_10.var304++; + break; + case 6: + sub_80F35B4(); + sub_80EEFBC(0x2); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(sub_80EBD4C); + ewram0_10.var304++; + break; + case 7: + sub_80EED2C(0x2); + ewram0_10.var304++; + break; + case 8: + if (!gPaletteFade.active) + sub_80EBDBC(&sub_80ED858); + break; + } } -void sub_80ED620() { - u8 var1; - switch (ewram0_10.var304) { - case 0: - sub_80F1E84(); - sub_80F2D04(0x1); - ewram0_10.var304++; - break; - case 1: - if (sub_80F1F10()) return; - sub_80EEFBC(0x1); - ewram0_10.var304++; - break; - case 2: - if (!(var1 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); +void sub_80ED620() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F1E84(); + sub_80F2D04(0x1); + ewram0_10.var304++; + break; + case 1: + if (!sub_80F1F10()) + { + sub_80EEFBC(0x1); ewram0_10.var304++; } - break; - case 3: - if (gPaletteFade.active) return; - SetVBlankCallback(NULL); - sub_80EED0C(); - sub_80EF814(); - ewram0_10.var76aa = (u8)(gPaletteFade.active << 24); - ewram0_10.var304++; - break; - case 4: - sub_80F2620(); - ewram0_10.var304++; - break; - case 5: - ewram0_10.varD162 = 0x2; - sub_80F4BD0(); - ewram0_10.var304++; - break; - case 6: - sub_80EFF34(); - ewram0_10.var304++; - case 7: - if (sub_80EFF68()) return; - ewram0_10.var304++; - break; - case 8: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 9: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 10: - sub_80F33A8(); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD4C); - ewram0_10.var304++; - break; - case 11: - sub_80EED2C(0x2); - ewram0_10.var304++; - break; - case 12: - if (gPaletteFade.active) return; - ewram0_10.var304++; - break; - case 13: - sub_80F2C80(0x1); - ewram0_10.var304++; - case 14: - if (sub_80F2CBC(0x1)) return; - ewram0_10.var304++; - break; - case 15: - sub_80F2C80(0x6); - ewram0_10.var304++; - case 16: - if (sub_80F2CBC(0x6)) return; - sub_80EBDBC(&sub_80ED858); - break; - } + break; + case 2: + if (!sub_80EEF34()) + { + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + ewram0_10.var304++; + } + break; + case 3: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80EF814(); + ewram0_10.var76aa = 0; + ewram0_10.var304++; + } + break; + case 4: + sub_80F2620(); + ewram0_10.var304++; + break; + case 5: + ewram0_10.varD162 = 0x2; + sub_80F4BD0(); + ewram0_10.var304++; + break; + case 6: + sub_80EFF34(); + ewram0_10.var304++; + // fall through + case 7: + if (!sub_80EFF68()) + ewram0_10.var304++; + break; + case 8: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 9: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 10: + sub_80F33A8(); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD4C); + ewram0_10.var304++; + break; + case 11: + sub_80EED2C(0x2); + ewram0_10.var304++; + break; + case 12: + if (!gPaletteFade.active) + ewram0_10.var304++; + break; + case 13: + sub_80F2C80(0x1); + ewram0_10.var304++; + case 14: + if (!sub_80F2CBC(0x1)) + ewram0_10.var304++; + break; + case 15: + sub_80F2C80(0x6); + ewram0_10.var304++; + // fall through + case 16: + if (!sub_80F2CBC(0x6)) + sub_80EBDBC(&sub_80ED858); + break; + } } #if 0 @@ -1448,1834 +1589,1869 @@ void sub_80F357C(); void sub_80F4FDC(); void sub_80ED858() { - u8 var1; - switch (ewram0_10.var304) { - case 0: - sub_80F4F78(); - sub_80F5B38(); - ewram0_10.var304 = 0x1; - break; - case 1: - if (sub_80F5B50()) return; - ewram0_10.var304 = 0x2; - break; - case 2: - sub_80F0174(0x1); - ewram0_10.var304 = 0x3; - break; - case 3: - if (sub_80F4FB4()) return; - sub_80F3C94(); - sub_80F3D00(); - ewram0_10.var304 = 0x4; - break; - case 4: - if ( (gMain.heldKeys & 0x40) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var87DC)) ) { - PlaySE(0x5); - sub_80F5060(0x1); - move_anim_execute(); - ewram0_10.var304 = 0x5; - } - else if ( (gMain.heldKeys & 0x80) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var76aa >= ewram0_10.var87DC)) ) { - PlaySE(0x5); - sub_80F5060(0); - move_anim_execute(); - ewram0_10.var304 = 0x5; - } - if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80F4FDC(); - move_anim_execute(); - ewram0_10.var304 = 0x9; - } - else if (gMain.newKeys & A_BUTTON) { - if (ewram0_10.var76aa) { - if (ewram0_10.var6dac) { - PlaySE(0x5); - ewram0_10.var304 = 0x7; - } - } - else if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) { - PlaySE(0x5); - ewram0_10.var304 = 0x9; - } - } + u8 var1; + switch (ewram0_10.var304) { + case 0: + sub_80F4F78(); + sub_80F5B38(); + ewram0_10.var304 = 0x1; + break; + case 1: + if (sub_80F5B50()) return; + ewram0_10.var304 = 0x2; + break; + case 2: + sub_80F0174(0x1); + ewram0_10.var304 = 0x3; + break; + case 3: + if (sub_80F4FB4()) return; + sub_80F3C94(); + sub_80F3D00(); + ewram0_10.var304 = 0x4; + break; + case 4: + if ( (gMain.heldKeys & 0x40) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var87DC)) ) { + PlaySE(SE_SELECT); + sub_80F5060(0x1); + move_anim_execute(); + ewram0_10.var304 = 0x5; + } + else if ( (gMain.heldKeys & 0x80) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var76aa >= ewram0_10.var87DC)) ) { + PlaySE(SE_SELECT); + sub_80F5060(0); + move_anim_execute(); + ewram0_10.var304 = 0x5; + } + if (gMain.newKeys & B_BUTTON) { + PlaySE(SE_SELECT); + sub_80F4FDC(); + move_anim_execute(); + ewram0_10.var304 = 0x9; + } + else if (gMain.newKeys & A_BUTTON) { + if (ewram0_10.var76aa) { + if (ewram0_10.var6dac) { + PlaySE(SE_SELECT); + ewram0_10.var304 = 0x7; + } + } + else if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) { + PlaySE(SE_SELECT); + ewram0_10.var304 = 0x9; + } + } /* - if (gMain.heldKeys & 0x40) { - if (ewram0_10.var87CB) { - if (ewram0_10.var76aa) { - if (!ewram0_10.var87DC) goto label1; - } - PlaySE(0x5); - sub_80F5060(0x1); - move_anim_execute(); - ewram0_10.var304 = 0x5; + if (gMain.heldKeys & 0x40) { + if (ewram0_10.var87CB) { + if (ewram0_10.var76aa) { + if (!ewram0_10.var87DC) goto label1; + } + PlaySE(SE_SELECT); + sub_80F5060(0x1); + move_anim_execute(); + ewram0_10.var304 = 0x5; - } - else goto label1; - } - else goto label1; - break; + } + else goto label1; + } + else goto label1; + break; label1: - if (gMain.heldKeys & 0x80) { - if (ewram0_10.var87CB) { - if (ewram0_10.var76aa) { - if (!(ewram0_10.var76aa < ewram0_10.var87DC)) goto label2; - } - PlaySE(0x5); - sub_80F5060(0x1); - move_anim_execute(); - ewram0_10.var304 = 0x5; - } - else goto label2; - } - else goto label2; - break; + if (gMain.heldKeys & 0x80) { + if (ewram0_10.var87CB) { + if (ewram0_10.var76aa) { + if (!(ewram0_10.var76aa < ewram0_10.var87DC)) goto label2; + } + PlaySE(SE_SELECT); + sub_80F5060(0x1); + move_anim_execute(); + ewram0_10.var304 = 0x5; + } + else goto label2; + } + else goto label2; + break; label2: - if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80F4FDC(); - move_anim_execute(); - ewram0_10.var304 = 0x9; - } - else if (gMain.newKeys & A_BUTTON) { - if (!ewram0_10.var76aa) { - if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) { - PlaySE(0x5); - ewram0_10.var304 = 0x9; - } - } - else { - PlaySE(0x5); - ewram0_10.var304 = 0x9; - } - } + if (gMain.newKeys & B_BUTTON) { + PlaySE(SE_SELECT); + sub_80F4FDC(); + move_anim_execute(); + ewram0_10.var304 = 0x9; + } + else if (gMain.newKeys & A_BUTTON) { + if (!ewram0_10.var76aa) { + if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) { + PlaySE(SE_SELECT); + ewram0_10.var304 = 0x9; + } + } + else { + PlaySE(SE_SELECT); + ewram0_10.var304 = 0x9; + } + } */ - break; + break; - case 5: - if (gpu_sync_bg_show()) return; - sub_80F3D00(); - ewram0_10.var304 = 0x6; - break; - case 6: - if (sub_8055870()) return; - ewram0_10.var304 = 0x4; - break; - case 7: - sub_80EEFBC(0x3); - sub_80F3668(); - ewram0_10.var304 = 0x8; - break; - case 8: - if (sub_80F7500()) return; - sub_80EEFBC(0x2); - sub_80F3698(); - ewram0_10.var304 = 0x4; - break; - case 9: - if (!(var1 = sub_80F5038())) { - sub_80F0174(0); - sub_80F2F48(); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); - ewram0_10.var304 = 0xB; - } - break; - case 0xA: - if (gPaletteFade.active) return; - sub_80F3CE8(); - sub_80F5BDC(); - if (!ewram0_10.var76aa) { - sub_80F357C(); - sub_80F2D6C(0x1); - sub_80F2D6C(0x6); - sub_80EBDBC(&sub_80ECA10); - } - else { - sub_80F3614(); - sub_80EBDBC(&sub_80ED3D0); - } - break; - } + case 5: + if (gpu_sync_bg_show()) return; + sub_80F3D00(); + ewram0_10.var304 = 0x6; + break; + case 6: + if (sub_8055870()) return; + ewram0_10.var304 = 0x4; + break; + case 7: + sub_80EEFBC(0x3); + sub_80F3668(); + ewram0_10.var304 = 0x8; + break; + case 8: + if (sub_80F7500()) return; + sub_80EEFBC(0x2); + sub_80F3698(); + ewram0_10.var304 = 0x4; + break; + case 9: + if (!(var1 = sub_80F5038())) { + sub_80F0174(0); + sub_80F2F48(); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); + ewram0_10.var304 = 0xB; + } + break; + case 0xA: + if (gPaletteFade.active) return; + sub_80F3CE8(); + sub_80F5BDC(); + if (!ewram0_10.var76aa) { + sub_80F357C(); + sub_80F2D6C(0x1); + sub_80F2D6C(0x6); + sub_80EBDBC(&sub_80ECA10); + } + else { + sub_80F3614(); + sub_80EBDBC(&sub_80ED3D0); + } + break; + } } #else __attribute__((naked)) void sub_80ED858() { - asm_unified("push {r4,r5,lr}\n\ - sub sp, 0x4\n\ - ldr r1, _080ED878 @ =gSharedMem\n\ - movs r2, 0xC1\n\ - lsls r2, 2\n\ - adds r0, r1, r2\n\ - ldrh r0, [r0]\n\ - adds r5, r1, 0\n\ - cmp r0, 0xB\n\ - bls _080ED86E\n\ - b _080EDB7A\n\ + asm_unified("push {r4,r5,lr}\n\ + sub sp, 0x4\n\ + ldr r1, _080ED878 @ =gSharedMem\n\ + movs r2, 0xC1\n\ + lsls r2, 2\n\ + adds r0, r1, r2\n\ + ldrh r0, [r0]\n\ + adds r5, r1, 0\n\ + cmp r0, 0xB\n\ + bls _080ED86E\n\ + b _080EDB7A\n\ _080ED86E:\n\ - lsls r0, 2\n\ - ldr r1, _080ED87C @ =_080ED880\n\ - adds r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ - .align 2, 0\n\ + lsls r0, 2\n\ + ldr r1, _080ED87C @ =_080ED880\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ + .align 2, 0\n\ _080ED878: .4byte gSharedMem\n\ _080ED87C: .4byte _080ED880\n\ - .align 2, 0\n\ + .align 2, 0\n\ _080ED880:\n\ - .4byte _080ED8B0\n\ - .4byte _080ED8CC\n\ - .4byte _080ED8EC\n\ - .4byte _080ED904\n\ - .4byte _080ED91A\n\ - .4byte _080EDA68\n\ - .4byte _080EDA8C\n\ - .4byte _080EDAA4\n\ - .4byte _080EDAC0\n\ - .4byte _080EDAE8\n\ - .4byte _080EDB7A\n\ - .4byte _080EDB28\n\ + .4byte _080ED8B0\n\ + .4byte _080ED8CC\n\ + .4byte _080ED8EC\n\ + .4byte _080ED904\n\ + .4byte _080ED91A\n\ + .4byte _080EDA68\n\ + .4byte _080EDA8C\n\ + .4byte _080EDAA4\n\ + .4byte _080EDAC0\n\ + .4byte _080EDAE8\n\ + .4byte _080EDB7A\n\ + .4byte _080EDB28\n\ _080ED8B0:\n\ - bl sub_80F4F78\n\ - bl sub_80F5B38\n\ - ldr r0, _080ED8C8 @ =gSharedMem\n\ - movs r4, 0xC1\n\ - lsls r4, 2\n\ - adds r0, r4\n\ - movs r1, 0x1\n\ - strh r1, [r0]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + bl sub_80F4F78\n\ + bl sub_80F5B38\n\ + ldr r0, _080ED8C8 @ =gSharedMem\n\ + movs r4, 0xC1\n\ + lsls r4, 2\n\ + adds r0, r4\n\ + movs r1, 0x1\n\ + strh r1, [r0]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080ED8C8: .4byte gSharedMem\n\ _080ED8CC:\n\ - bl sub_80F5B50\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080ED8D8\n\ - b _080EDB7A\n\ + bl sub_80F5B50\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080ED8D8\n\ + b _080EDB7A\n\ _080ED8D8:\n\ - ldr r0, _080ED8E8 @ =gSharedMem\n\ - movs r1, 0xC1\n\ - lsls r1, 2\n\ - adds r0, r1\n\ - movs r1, 0x2\n\ - strh r1, [r0]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + ldr r0, _080ED8E8 @ =gSharedMem\n\ + movs r1, 0xC1\n\ + lsls r1, 2\n\ + adds r0, r1\n\ + movs r1, 0x2\n\ + strh r1, [r0]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080ED8E8: .4byte gSharedMem\n\ _080ED8EC:\n\ - movs r0, 0x1\n\ - bl sub_80F0174\n\ - ldr r0, _080ED900 @ =gSharedMem\n\ - movs r2, 0xC1\n\ - lsls r2, 2\n\ - adds r0, r2\n\ - movs r1, 0x3\n\ - strh r1, [r0]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + movs r0, 0x1\n\ + bl sub_80F0174\n\ + ldr r0, _080ED900 @ =gSharedMem\n\ + movs r2, 0xC1\n\ + lsls r2, 2\n\ + adds r0, r2\n\ + movs r1, 0x3\n\ + strh r1, [r0]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080ED900: .4byte gSharedMem\n\ _080ED904:\n\ - bl sub_80F4FB4\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080ED910\n\ - b _080EDB7A\n\ + bl sub_80F4FB4\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080ED910\n\ + b _080EDB7A\n\ _080ED910:\n\ - bl sub_80F3C94\n\ - bl sub_80F3D00\n\ - b _080EDAD4\n\ + bl sub_80F3C94\n\ + bl sub_80F3D00\n\ + b _080EDAD4\n\ _080ED91A:\n\ - ldr r2, _080ED960 @ =gMain\n\ - ldrh r1, [r2, 0x2C]\n\ - movs r0, 0x40\n\ - ands r0, r1\n\ - adds r3, r2, 0\n\ - cmp r0, 0\n\ - beq _080ED970\n\ - ldr r1, _080ED964 @ =0x000087cb\n\ - adds r0, r5, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080ED970\n\ - ldr r2, _080ED968 @ =0x000076aa\n\ - adds r0, r5, r2\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080ED948\n\ - ldr r4, _080ED96C @ =0x000087dc\n\ - adds r0, r5, r4\n\ - movs r1, 0\n\ - ldrsh r0, [r0, r1]\n\ - cmp r0, 0\n\ - beq _080ED970\n\ + ldr r2, _080ED960 @ =gMain\n\ + ldrh r1, [r2, 0x2C]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + adds r3, r2, 0\n\ + cmp r0, 0\n\ + beq _080ED970\n\ + ldr r1, _080ED964 @ =0x000087cb\n\ + adds r0, r5, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080ED970\n\ + ldr r2, _080ED968 @ =0x000076aa\n\ + adds r0, r5, r2\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080ED948\n\ + ldr r4, _080ED96C @ =0x000087dc\n\ + adds r0, r5, r4\n\ + movs r1, 0\n\ + ldrsh r0, [r0, r1]\n\ + cmp r0, 0\n\ + beq _080ED970\n\ _080ED948:\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0x1\n\ - bl sub_80F5060\n\ - bl move_anim_execute\n\ - movs r2, 0xC1\n\ - lsls r2, 2\n\ - adds r1, r5, r2\n\ - b _080ED9B8\n\ - .align 2, 0\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + bl sub_80F5060\n\ + bl move_anim_execute\n\ + movs r2, 0xC1\n\ + lsls r2, 2\n\ + adds r1, r5, r2\n\ + b _080ED9B8\n\ + .align 2, 0\n\ _080ED960: .4byte gMain\n\ _080ED964: .4byte 0x000087cb\n\ _080ED968: .4byte 0x000076aa\n\ _080ED96C: .4byte 0x000087dc\n\ _080ED970:\n\ - ldrh r1, [r3, 0x2C]\n\ - movs r0, 0x80\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080ED9CC\n\ - ldr r4, _080ED9C0 @ =0x000087cb\n\ - adds r0, r5, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080ED9CC\n\ - ldr r1, _080ED9C4 @ =0x000076aa\n\ - adds r0, r5, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080ED9A2\n\ - ldr r2, _080ED9C8 @ =0x000087dc\n\ - adds r0, r5, r2\n\ - subs r4, 0x57\n\ - adds r1, r5, r4\n\ - movs r4, 0\n\ - ldrsh r2, [r0, r4]\n\ - movs r4, 0\n\ - ldrsh r0, [r1, r4]\n\ - cmp r2, r0\n\ - bge _080ED9CC\n\ + ldrh r1, [r3, 0x2C]\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080ED9CC\n\ + ldr r4, _080ED9C0 @ =0x000087cb\n\ + adds r0, r5, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080ED9CC\n\ + ldr r1, _080ED9C4 @ =0x000076aa\n\ + adds r0, r5, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080ED9A2\n\ + ldr r2, _080ED9C8 @ =0x000087dc\n\ + adds r0, r5, r2\n\ + subs r4, 0x57\n\ + adds r1, r5, r4\n\ + movs r4, 0\n\ + ldrsh r2, [r0, r4]\n\ + movs r4, 0\n\ + ldrsh r0, [r1, r4]\n\ + cmp r2, r0\n\ + bge _080ED9CC\n\ _080ED9A2:\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0\n\ - bl sub_80F5060\n\ - bl move_anim_execute\n\ - movs r0, 0xC1\n\ - lsls r0, 2\n\ - adds r1, r5, r0\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0\n\ + bl sub_80F5060\n\ + bl move_anim_execute\n\ + movs r0, 0xC1\n\ + lsls r0, 2\n\ + adds r1, r5, r0\n\ _080ED9B8:\n\ - movs r0, 0x5\n\ - strh r0, [r1]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + movs r0, 0x5\n\ + strh r0, [r1]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080ED9C0: .4byte 0x000087cb\n\ _080ED9C4: .4byte 0x000076aa\n\ _080ED9C8: .4byte 0x000087dc\n\ _080ED9CC:\n\ - ldrh r2, [r3, 0x2E]\n\ - movs r0, 0x2\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _080ED9F8\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - bl sub_80F4FDC\n\ - bl move_anim_execute\n\ - ldr r0, _080ED9F4 @ =gSharedMem\n\ - movs r1, 0xC1\n\ - lsls r1, 2\n\ - adds r0, r1\n\ - movs r1, 0x9\n\ - strh r1, [r0]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + ldrh r2, [r3, 0x2E]\n\ + movs r0, 0x2\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _080ED9F8\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + bl sub_80F4FDC\n\ + bl move_anim_execute\n\ + ldr r0, _080ED9F4 @ =gSharedMem\n\ + movs r1, 0xC1\n\ + lsls r1, 2\n\ + adds r0, r1\n\ + movs r1, 0x9\n\ + strh r1, [r0]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080ED9F4: .4byte gSharedMem\n\ _080ED9F8:\n\ - movs r0, 0x1\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - bne _080EDA02\n\ - b _080EDB7A\n\ + movs r0, 0x1\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _080EDA02\n\ + b _080EDB7A\n\ _080EDA02:\n\ - adds r4, r5, 0\n\ - ldr r2, _080EDA38 @ =0x000076aa\n\ - adds r0, r4, r2\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - bne _080EDA44\n\ - ldr r1, _080EDA3C @ =0x000087dc\n\ - adds r0, r4, r1\n\ - movs r2, 0\n\ - ldrsh r1, [r0, r2]\n\ - ldr r2, _080EDA40 @ =0x000087da\n\ - adds r0, r4, r2\n\ - movs r2, 0\n\ - ldrsh r0, [r0, r2]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - beq _080EDA26\n\ - b _080EDB7A\n\ + adds r4, r5, 0\n\ + ldr r2, _080EDA38 @ =0x000076aa\n\ + adds r0, r4, r2\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + bne _080EDA44\n\ + ldr r1, _080EDA3C @ =0x000087dc\n\ + adds r0, r4, r1\n\ + movs r2, 0\n\ + ldrsh r1, [r0, r2]\n\ + ldr r2, _080EDA40 @ =0x000087da\n\ + adds r0, r4, r2\n\ + movs r2, 0\n\ + ldrsh r0, [r0, r2]\n\ + subs r0, 0x1\n\ + cmp r1, r0\n\ + beq _080EDA26\n\ + b _080EDB7A\n\ _080EDA26:\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r0, 0xC1\n\ - lsls r0, 2\n\ - adds r1, r4, r0\n\ - movs r0, 0x9\n\ - strh r0, [r1]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0xC1\n\ + lsls r0, 2\n\ + adds r1, r4, r0\n\ + movs r0, 0x9\n\ + strh r0, [r1]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080EDA38: .4byte 0x000076aa\n\ _080EDA3C: .4byte 0x000087dc\n\ _080EDA40: .4byte 0x000087da\n\ _080EDA44:\n\ - ldr r1, _080EDA64 @ =0x00006dac\n\ - adds r0, r5, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - beq _080EDA50\n\ - b _080EDB7A\n\ + ldr r1, _080EDA64 @ =0x00006dac\n\ + adds r0, r5, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _080EDA50\n\ + b _080EDB7A\n\ _080EDA50:\n\ - movs r0, 0x5\n\ - bl PlaySE\n\ - movs r2, 0xC1\n\ - lsls r2, 2\n\ - adds r1, r5, r2\n\ - movs r0, 0x7\n\ - strh r0, [r1]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r2, 0xC1\n\ + lsls r2, 2\n\ + adds r1, r5, r2\n\ + movs r0, 0x7\n\ + strh r0, [r1]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080EDA64: .4byte 0x00006dac\n\ _080EDA68:\n\ - bl gpu_sync_bg_show\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080EDA74\n\ - b _080EDB7A\n\ + bl gpu_sync_bg_show\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080EDA74\n\ + b _080EDB7A\n\ _080EDA74:\n\ - bl sub_80F3D00\n\ - ldr r0, _080EDA88 @ =gSharedMem\n\ - movs r4, 0xC1\n\ - lsls r4, 2\n\ - adds r0, r4\n\ - movs r1, 0x6\n\ - strh r1, [r0]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + bl sub_80F3D00\n\ + ldr r0, _080EDA88 @ =gSharedMem\n\ + movs r4, 0xC1\n\ + lsls r4, 2\n\ + adds r0, r4\n\ + movs r1, 0x6\n\ + strh r1, [r0]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080EDA88: .4byte gSharedMem\n\ _080EDA8C:\n\ - bl sub_8055870\n\ - cmp r0, 0\n\ - bne _080EDB7A\n\ - ldr r0, _080EDAA0 @ =gSharedMem\n\ - movs r1, 0xC1\n\ - lsls r1, 2\n\ - adds r0, r1\n\ - b _080EDADC\n\ - .align 2, 0\n\ + bl sub_8055870\n\ + cmp r0, 0\n\ + bne _080EDB7A\n\ + ldr r0, _080EDAA0 @ =gSharedMem\n\ + movs r1, 0xC1\n\ + lsls r1, 2\n\ + adds r0, r1\n\ + b _080EDADC\n\ + .align 2, 0\n\ _080EDAA0: .4byte gSharedMem\n\ _080EDAA4:\n\ - movs r0, 0x3\n\ - bl sub_80EEFBC\n\ - bl sub_80F3668\n\ - ldr r0, _080EDABC @ =gSharedMem\n\ - movs r2, 0xC1\n\ - lsls r2, 2\n\ - adds r0, r2\n\ - movs r1, 0x8\n\ - strh r1, [r0]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + movs r0, 0x3\n\ + bl sub_80EEFBC\n\ + bl sub_80F3668\n\ + ldr r0, _080EDABC @ =gSharedMem\n\ + movs r2, 0xC1\n\ + lsls r2, 2\n\ + adds r0, r2\n\ + movs r1, 0x8\n\ + strh r1, [r0]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080EDABC: .4byte gSharedMem\n\ _080EDAC0:\n\ - bl sub_80F7500\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080EDB7A\n\ - movs r0, 0x2\n\ - bl sub_80EEFBC\n\ - bl sub_80F3698\n\ + bl sub_80F7500\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080EDB7A\n\ + movs r0, 0x2\n\ + bl sub_80EEFBC\n\ + bl sub_80F3698\n\ _080EDAD4:\n\ - ldr r0, _080EDAE4 @ =gSharedMem\n\ - movs r4, 0xC1\n\ - lsls r4, 2\n\ - adds r0, r4\n\ + ldr r0, _080EDAE4 @ =gSharedMem\n\ + movs r4, 0xC1\n\ + lsls r4, 2\n\ + adds r0, r4\n\ _080EDADC:\n\ - movs r1, 0x4\n\ - strh r1, [r0]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + movs r1, 0x4\n\ + strh r1, [r0]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080EDAE4: .4byte gSharedMem\n\ _080EDAE8:\n\ - bl sub_80F5038\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ - cmp r4, 0\n\ - bne _080EDB7A\n\ - movs r0, 0\n\ - bl sub_80F0174\n\ - bl sub_80F2F48\n\ - ldr r5, _080EDB24 @ =gSharedMem\n\ - movs r1, 0xC2\n\ - lsls r1, 2\n\ - adds r0, r5, r1\n\ - ldr r0, [r0]\n\ - movs r1, 0x1\n\ - negs r1, r1\n\ - str r4, [sp]\n\ - movs r2, 0\n\ - movs r3, 0x10\n\ - bl BeginNormalPaletteFade\n\ - movs r2, 0xC1\n\ - lsls r2, 2\n\ - adds r1, r5, r2\n\ - movs r0, 0xB\n\ - strh r0, [r1]\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + bl sub_80F5038\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, 0\n\ + bne _080EDB7A\n\ + movs r0, 0\n\ + bl sub_80F0174\n\ + bl sub_80F2F48\n\ + ldr r5, _080EDB24 @ =gSharedMem\n\ + movs r1, 0xC2\n\ + lsls r1, 2\n\ + adds r0, r5, r1\n\ + ldr r0, [r0]\n\ + movs r1, 0x1\n\ + negs r1, r1\n\ + str r4, [sp]\n\ + movs r2, 0\n\ + movs r3, 0x10\n\ + bl BeginNormalPaletteFade\n\ + movs r2, 0xC1\n\ + lsls r2, 2\n\ + adds r1, r5, r2\n\ + movs r0, 0xB\n\ + strh r0, [r1]\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080EDB24: .4byte gSharedMem\n\ _080EDB28:\n\ - ldr r0, _080EDB60 @ =gPaletteFade\n\ - ldrb r1, [r0, 0x7]\n\ - movs r0, 0x80\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _080EDB7A\n\ - bl sub_80F3CE8\n\ - bl sub_80F5BDC\n\ - ldr r0, _080EDB64 @ =gSharedMem\n\ - ldr r4, _080EDB68 @ =0x000076aa\n\ - adds r0, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, 0\n\ - bne _080EDB70\n\ - bl sub_80F357C\n\ - movs r0, 0x1\n\ - bl sub_80F2D6C\n\ - movs r0, 0x6\n\ - bl sub_80F2D6C\n\ - ldr r0, _080EDB6C @ =sub_80ECA10\n\ - bl sub_80EBDBC\n\ - b _080EDB7A\n\ - .align 2, 0\n\ + ldr r0, _080EDB60 @ =gPaletteFade\n\ + ldrb r1, [r0, 0x7]\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080EDB7A\n\ + bl sub_80F3CE8\n\ + bl sub_80F5BDC\n\ + ldr r0, _080EDB64 @ =gSharedMem\n\ + ldr r4, _080EDB68 @ =0x000076aa\n\ + adds r0, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + bne _080EDB70\n\ + bl sub_80F357C\n\ + movs r0, 0x1\n\ + bl sub_80F2D6C\n\ + movs r0, 0x6\n\ + bl sub_80F2D6C\n\ + ldr r0, _080EDB6C @ =sub_80ECA10\n\ + bl sub_80EBDBC\n\ + b _080EDB7A\n\ + .align 2, 0\n\ _080EDB60: .4byte gPaletteFade\n\ _080EDB64: .4byte gSharedMem\n\ _080EDB68: .4byte 0x000076aa\n\ _080EDB6C: .4byte sub_80ECA10\n\ _080EDB70:\n\ - bl sub_80F3614\n\ - ldr r0, _080EDB84 @ =sub_80ED3D0\n\ - bl sub_80EBDBC\n\ + bl sub_80F3614\n\ + ldr r0, _080EDB84 @ =sub_80ED3D0\n\ + bl sub_80EBDBC\n\ _080EDB7A:\n\ - add sp, 0x4\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ + add sp, 0x4\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ _080EDB84: .4byte sub_80ED3D0\n"); } #endif -void sub_80EDB88() { - u8 var1; - switch (ewram0_10.var304) { - case 0: - sub_80F1E84(); - sub_80F2D04(0); - ewram0_10.var304++; - break; - case 1: - if (sub_80F1F10()) return; - sub_80EEFBC(0x4); - ewram0_10.var304++; - break; - case 2: - if (!(var1 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); +void sub_80EDB88() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F1E84(); + sub_80F2D04(0); + ewram0_10.var304++; + break; + case 1: + if (!sub_80F1F10()) + { + sub_80EEFBC(0x4); ewram0_10.var304++; } - break; - case 3: - if (gPaletteFade.active) return; - SetVBlankCallback(0); - sub_80EED0C(); - sub_80EF814(); - ewram0_10.var304++; - break; - case 4: - sub_80F2620(); - ewram0_10.var304++; - break; - case 5: - sub_80F638C(); - ewram0_10.var304++; - case 6: - if (!sub_80F63D0()) { - ewram0_10.var304 += 0x2; - break; + break; + case 2: + if (!sub_80EEF34()) + { + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + ewram0_10.var304++; + } + break; + case 3: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80EF814(); + ewram0_10.var304++; } - ewram0_10.var304++; - break; - case 7: - if (sub_8055870()) return; - ewram0_10.var304--; - break; - case 8: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 9: - sub_80F0264(0x1); - ewram0_10.var304++; - case 10: - if (sub_80F02A0()) return; - ewram0_10.var304++; - break; - case 11: - sub_80F2C80(0x2); - ewram0_10.var304++; - case 12: - if (sub_80F2CBC(0x2)) return; - ewram0_10.var304++; - break; - case 13: - sub_80F3008(0x1); - ewram0_10.var304++; - break; - case 14: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 15: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 16: - sub_80EED2C(0x4); - ewram0_10.var304++; - break; - case 17: - if (gPaletteFade.active) return; - sub_80EBDBC(&sub_80EDDBC); - break; - } + break; + case 4: + sub_80F2620(); + ewram0_10.var304++; + break; + case 5: + sub_80F638C(); + ewram0_10.var304++; + case 6: + if (!sub_80F63D0()) + ewram0_10.var304 += 2; + else + ewram0_10.var304 += 1; + break; + case 7: + if (!sub_8055870()) + ewram0_10.var304--; + break; + case 8: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 9: + sub_80F0264(0x1); + ewram0_10.var304++; + case 10: + if (!sub_80F02A0()) + ewram0_10.var304++; + break; + case 11: + sub_80F2C80(0x2); + ewram0_10.var304++; + case 12: + if (!sub_80F2CBC(0x2)) + ewram0_10.var304++; + break; + case 13: + sub_80F3008(0x1); + ewram0_10.var304++; + break; + case 14: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 15: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 16: + sub_80EED2C(0x4); + ewram0_10.var304++; + break; + case 17: + if (!gPaletteFade.active) + sub_80EBDBC(&sub_80EDDBC); + break; + } } -void sub_80EDDBC() { - switch (ewram0_10.var304) { - case 0: - switch (sub_80F5DD4()) { - case 1: - PlaySE(0x5); +void sub_80EDDBC() +{ + switch (ewram0_10.var304) + { + case 0: + switch (sub_80F5DD4()) + { + case 1: + PlaySE(SE_SELECT); + ShowMapNamePopUpWindow(); + break; + case 2: + PlaySE(SE_SELECT); + ewram0_10.var304++; + break; + default: + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EDEE4); + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EDE70); + } + break; + } + break; + case 1: + if (!sub_80F0718()) + { ShowMapNamePopUpWindow(); - break; - case 2: - PlaySE(0x5); + sub_80F3264(); ewram0_10.var304++; - break; - default: - if (gMain.newKeys & A_BUTTON) { - PlaySE(0x5); - sub_80EBDBC(&sub_80EDEE4); - } - else if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80EBDBC(&sub_80EDE70); - } - break; } - break; - case 1: - if (sub_80F0718()) return; - ShowMapNamePopUpWindow(); - sub_80F3264(); - ewram0_10.var304++; - break; - case 2: - if (sub_8055870()) return; - ewram0_10.var304 = 0; - break; + break; + case 2: + if (!sub_8055870()) + ewram0_10.var304 = 0; + break; - } + } } -void sub_80EDE70() { - switch (ewram0_10.var304) { - case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; - break; - case 1: - if (gPaletteFade.active) return; - sub_80F3130(); - sub_80F2D6C(0x2); - ewram0_10.var304++; - break; - case 2: - sub_80EBDBC(&sub_80EC00C); - break; - } +void sub_80EDE70() +{ + switch (ewram0_10.var304) + { + case 0: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 1: + if (!gPaletteFade.active) + { + sub_80F3130(); + sub_80F2D6C(0x2); + ewram0_10.var304++; + } + break; + case 2: + sub_80EBDBC(&sub_80EC00C); + break; + } } -void sub_80EDEE4() { - switch (ewram0_10.var304) { - case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; - break; - case 1: - if (gPaletteFade.active) return; - SetVBlankCallback(NULL); - sub_80EED0C(); - sub_80F3130(); - ewram0_10.var304++; - break; - case 2: - sub_80F66E0(); - sub_80EEE08(); - ewram0_10.var304++; - break; - case 3: - if (sub_80F1080()) return; - ewram0_10.var304++; - break; - case 4: - sub_80EEFBC(0x5); - sub_80F38B8(); - ewram0_10.var304++; - case 5: - if (sub_80F38EC()) return; - ewram0_10.var304++; - break; - case 6: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 7: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 8: - sub_80EED2C(0x3); - ewram0_10.var304++; - break; - case 9: - if (gPaletteFade.active) return; - ewram0_10.var304++; - break; - case 10: - if (sub_80F170C()) return; - sub_80EBDBC(&sub_80EE06C); - break; - } +void sub_80EDEE4() +{ + switch (ewram0_10.var304) + { + case 0: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 1: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80F3130(); + ewram0_10.var304++; + } + break; + case 2: + sub_80F66E0(); + sub_80EEE08(); + ewram0_10.var304++; + break; + case 3: + if (!sub_80F1080()) + ewram0_10.var304++; + break; + case 4: + sub_80EEFBC(0x5); + sub_80F38B8(); + ewram0_10.var304++; + case 5: + if (!sub_80F38EC()) + ewram0_10.var304++; + break; + case 6: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 7: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 8: + sub_80EED2C(0x3); + ewram0_10.var304++; + break; + case 9: + if (!gPaletteFade.active) + ewram0_10.var304++; + break; + case 10: + if (!sub_80F170C()) + sub_80EBDBC(&sub_80EE06C); + break; + } } -void sub_80EE06C() { - u32 var1; - u16 var2; - switch (ewram0_10.var304) { - case 0: - sub_80F15A8(); - ewram0_10.var304++; - break; - case 1: - if (gMain.newAndRepeatedKeys & 0x40) { - if (ewram0_10.var87DC) { - PlaySE(0x5); - sub_80F6A4C(-1); - ewram0_10.var304++; - } - else goto label1; - } - else goto label1; - break; -label1: - if (gMain.newAndRepeatedKeys & 0x80) { - if (ewram0_10.var87DC < ewram0_10.var8774) { - PlaySE(0x5); - sub_80F6A4C(1); - ewram0_10.var304++; - } - else goto label2; +void sub_80EE06C() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F15A8(); + ewram0_10.var304++; + break; + case 1: + if ((gMain.newAndRepeatedKeys & 0x40) && (ewram0_10.var87DC)) + { + PlaySE(SE_SELECT); + sub_80F6A4C(-1); + ewram0_10.var304++; + } + else if ((gMain.newAndRepeatedKeys & 0x80) && ewram0_10.var87DC < ewram0_10.var8774) + { + PlaySE(SE_SELECT); + sub_80F6A4C(1); + ewram0_10.var304++; + } + else if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EEFBC(0xB); + ewram0_10.var304 = 0x4; + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EE294); + } + break; + case 2: + if (!sub_80F6AF0()) + ewram0_10.var304++; + break; + case 3: + if (!sub_8055870()) + ewram0_10.var304 = 0; + break; + case 4: + sub_80F3B00(); + ewram0_10.var304++; + break; + case 5: + if (!sub_80F3B58()) + { + sub_80F1494(); + ewram0_10.var304++; + sub_80EED9C(); } - else goto label2; - break; -label2: - if (gMain.newKeys & A_BUTTON) { - PlaySE(0x5); - sub_80EEFBC(0xB); + break; + case 6: + switch (sub_80F68E8()) + { + case 1: + PlaySE(SE_SELECT); + sub_80F3B94(); + ewram0_10.var304 = 0x7; + break; + default: + case 0: + if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + sub_80F3B94(); + ewram0_10.var304 = 0x8; + } + break; + } + break; + case 7: + if (!sub_80F3BD4()) ewram0_10.var304 = 0x4; + break; + case 8: + if (!sub_80F3BD4()) + { + sub_80EEFBC(0x5); + ewram0_10.var304 = 0; } - else if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80EBDBC(&sub_80EE294); - } - break; - case 2: - if (sub_80F6AF0()) return; - ewram0_10.var304++; - break; - case 3: - var1 = sub_8055870(); - if (var1) return; - ewram0_10.var304 = var1; - break; - case 4: - sub_80F3B00(); - ewram0_10.var304++; - break; - case 5: - if (sub_80F3B58()) return; - sub_80F1494(); - ewram0_10.var304++; - sub_80EED9C(); - break; - case 6: - switch (sub_80F68E8()) { - case 1: - PlaySE(0x5); - sub_80F3B94(); - ewram0_10.var304 = 0x7; - break; - default: - case 0: - if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80F3B94(); - ewram0_10.var304 = 0x8; - } - break; - } - break; - case 7: - if (sub_80F3BD4()) return; - ewram0_10.var304 = 0x4; - break; - case 8: - var2 = sub_80F3BD4(); - if (var2) return; - sub_80EEFBC(0x5); - ewram0_10.var304 = var2; - break; - } + break; + } } -void sub_80EE294() { - switch (ewram0_10.var304) { - case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; - break; - case 1: - if (gPaletteFade.active) return; - SetVBlankCallback(NULL); - sub_80EED0C(); - sub_80F3C2C(); - sub_80EEE08(); - ewram0_10.var304++; - break; - case 2: - sub_80F6134(); - sub_80F0264(0x1); - ewram0_10.var304++; - case 3: - if (sub_80F02A0()) return; - ewram0_10.var304++; - break; - case 4: - sub_80EEFBC(0x4); - sub_80F3008(0x1); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 5: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - ewram0_10.var304++; - break; - case 7: - sub_80EED2C(0x4); - ewram0_10.var304++; - break; - case 8: - if (gPaletteFade.active) return; - sub_80EBDBC(&sub_80EDDBC); - break; - } +void sub_80EE294() +{ + switch (ewram0_10.var304) + { + case 0: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 1: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80F3C2C(); + sub_80EEE08(); + ewram0_10.var304++; + } + break; + case 2: + sub_80F6134(); + sub_80F0264(0x1); + ewram0_10.var304++; + case 3: + if (!sub_80F02A0()) + ewram0_10.var304++; + break; + case 4: + sub_80EEFBC(0x4); + sub_80F3008(0x1); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 5: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 6: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + ewram0_10.var304++; + break; + case 7: + sub_80EED2C(0x4); + ewram0_10.var304++; + break; + case 8: + if (!gPaletteFade.active) + sub_80EBDBC(&sub_80EDDBC); + break; + } } -void sub_80EE3D8() { - u8 var1; - switch (ewram0_10.var304) { - case 0: - sub_80F1E84(); - sub_80F2D04(0); - ewram0_10.var304++; - break; - case 1: - if (sub_80F1F10()) return; - sub_80EEFBC(0x9); - ewram0_10.var304++; - break; - case 2: - if (!(var1 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); +void sub_80EE3D8() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F1E84(); + sub_80F2D04(0); + ewram0_10.var304++; + break; + case 1: + if (!sub_80F1F10()) + { + sub_80EEFBC(0x9); ewram0_10.var304++; } - break; - case 3: - if (gPaletteFade.active) return; - SetVBlankCallback(NULL); - sub_80EED0C(); - sub_80EF814(); - sub_80EEE08(); - ewram0_10.var304++; - break; - case 4: - sub_80F2620(); - ewram0_10.var304++; - break; - case 5: - sub_80F0264(0x2); - ewram0_10.var304++; - case 6: - if (sub_80F02A0()) return; - ewram0_10.var304++; - break; - case 7: - sub_80F2C80(0x3); - ewram0_10.var304++; - case 8: - if (sub_80F2CBC(0x3)) return; - ewram0_10.var304++; - break; - case 9: - sub_80F3008(0x2); - ewram0_10.var304++; - break; - case 10: - if (sub_8055870()) return; - ewram0_10.var304++; - break; - case 11: - sub_80F6F10(); - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - SetVBlankCallback(&sub_80EBD68); - ewram0_10.var304++; - break; - case 12: - sub_80EED2C(0x5); - ewram0_10.var304++; - break; - case 13: - if (gPaletteFade.active) return; - sub_80EBDBC(&sub_80EE58C); - break; - } + break; + case 2: + if (!sub_80EEF34()) + { + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, 0); + ewram0_10.var304++; + } + break; + case 3: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80EF814(); + sub_80EEE08(); + ewram0_10.var304++; + } + break; + case 4: + sub_80F2620(); + ewram0_10.var304++; + break; + case 5: + sub_80F0264(0x2); + ewram0_10.var304++; + case 6: + if (!sub_80F02A0()) + ewram0_10.var304++; + break; + case 7: + sub_80F2C80(0x3); + ewram0_10.var304++; + case 8: + if (!sub_80F2CBC(0x3)) + ewram0_10.var304++; + break; + case 9: + sub_80F3008(0x2); + ewram0_10.var304++; + break; + case 10: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 11: + sub_80F6F10(); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + SetVBlankCallback(&sub_80EBD68); + ewram0_10.var304++; + break; + case 12: + sub_80EED2C(0x5); + ewram0_10.var304++; + break; + case 13: + if (!gPaletteFade.active) + sub_80EBDBC(&sub_80EE58C); + break; + } } -void sub_80EE58C() { - switch (ewram0_10.var304) { - case 0: - switch (sub_80F5DD4()) { - case 1: - PlaySE(0x5); +void sub_80EE58C() +{ + switch (ewram0_10.var304) + { + case 0: + switch (sub_80F5DD4()) + { + case 1: + PlaySE(SE_SELECT); + sub_80F0FFC(ewram0_10.var876E); + break; + case 2: + PlaySE(SE_SELECT); + ewram0_10.var304++; + break; + default: + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EE658); + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + sub_80EBDBC(&sub_80EE8F4); + } + break; + } + break; + case 1: + if (!sub_80F0718()) + { sub_80F0FFC(ewram0_10.var876E); - break; - case 2: - PlaySE(0x5); + sub_80F3264(); ewram0_10.var304++; - break; - default: - if (gMain.newKeys & A_BUTTON) { - PlaySE(0x5); - sub_80EBDBC(&sub_80EE658); - } - else if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80EBDBC(&sub_80EE8F4); - } - break; } - break; - case 1: - if (sub_80F0718()) return; - sub_80F0FFC(ewram0_10.var876E); - sub_80F3264(); - ewram0_10.var304++; - break; - case 2: - if (sub_8055870()) return; - ewram0_10.var304 = 0; - break; - } + break; + case 2: + if (!sub_8055870()) + ewram0_10.var304 = 0; + break; + } } -void sub_80EE658() { - switch (ewram0_10.var304) { - case 0: - sub_80F3294(0x1); - sub_80EEFBC(0xA); - sub_80F0B24(); - ewram0_10.var304++; - break; - case 1: - if (sub_80F0B44()) return; - ewram0_10.var304++; - break; - case 2: - sub_80F0F64(); - ewram0_10.var304++; - break; - case 3: - if (sub_80F0FEC()) return; - sub_80F6FB8(0x1); - ewram0_10.var304++; - break; - case 4: - sub_80F6DB8(); - ewram0_10.var304++; - break; - case 5: - sub_80F700C((u8 *)(gSharedMem + 0x8788), *(u16 *)(gSharedMem + 0x8788 - 0x1A)); - sub_80F42C4((u8 *)(gSharedMem + 0x8788)); - ewram0_10.var304++; - break; - case 6: - sub_80F0CD8(); - ewram0_10.var304++; - case 7: - if (sub_80F6E9C()) return; - if (sub_80F0D5C()) return; - ewram0_10.var304++; - break; - case 8: - if (gMain.heldKeys & 0x40) { - if (ewram0_10.var87DC) { - PlaySE(0x5); - sub_80F708C(-1); - ewram0_10.var304 = 0x10; - } - else goto label1; +void sub_80EE658() +{ + switch (ewram0_10.var304) + { + case 0: + sub_80F3294(0x1); + sub_80EEFBC(0xA); + sub_80F0B24(); + ewram0_10.var304++; + break; + case 1: + if (!sub_80F0B44()) + ewram0_10.var304++; + break; + case 2: + sub_80F0F64(); + ewram0_10.var304++; + break; + case 3: + if (!sub_80F0FEC()) + { + sub_80F6FB8(0x1); + ewram0_10.var304++; } - else goto label1; - break; -label1: - if (gMain.heldKeys & 0x80) { - if (ewram0_10.var87DC < ewram0_10.var8774) { - PlaySE(0x5); - sub_80F708C(1); - ewram0_10.var304 = 0x10; - } - else goto label2; + break; + case 4: + sub_80F6DB8(); + ewram0_10.var304++; + break; + case 5: + sub_80F700C((u8 *)(gSharedMem + 0x8788), *(u16 *)(gSharedMem + 0x8788 - 0x1A)); + sub_80F42C4((u8 *)(gSharedMem + 0x8788)); + ewram0_10.var304++; + break; + case 6: + sub_80F0CD8(); + ewram0_10.var304++; + case 7: + if (!sub_80F6E9C() && !sub_80F0D5C()) + ewram0_10.var304++; + break; + case 8: + if ((gMain.heldKeys & 0x40) && ewram0_10.var87DC) + { + PlaySE(SE_SELECT); + sub_80F708C(-1); + ewram0_10.var304 = 0x10; + } + else if ((gMain.heldKeys & 0x80) && ewram0_10.var87DC < ewram0_10.var8774) + { + PlaySE(SE_SELECT); + sub_80F708C(1); + ewram0_10.var304 = 0x10; + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + sub_80F4394(); + sub_80F0EC0(); + ewram0_10.var304++; + } + break; + case 9: + if (!sub_80F6ED4() && !sub_80F0EF4()) + { + sub_80F6FB8(0); + sub_80F2FB0(); + ewram0_10.var304++; } - else goto label2; - break; -label2: - if (gMain.newKeys & B_BUTTON) { - PlaySE(0x5); - sub_80F4394(); - sub_80F0EC0(); + break; + case 10: + sub_80F6134(); + ewram0_10.var304++; + break; + case 11: + sub_80F0FA0(); + ewram0_10.var304++; + break; + case 12: + if (!sub_80F0FEC()) + ewram0_10.var304++; + break; + case 13: + sub_80F0C28(); + ewram0_10.var304++; + break; + case 14: + if (!sub_80F0C48()) ewram0_10.var304++; - } - break; - case 9: - if (sub_80F6ED4()) return; - if (sub_80F0EF4()) return; - sub_80F6FB8(0); - sub_80F2FB0(); - ewram0_10.var304++; - break; - case 10: - sub_80F6134(); - ewram0_10.var304++; - break; - case 11: - sub_80F0FA0(); - ewram0_10.var304++; - break; - case 12: - if (sub_80F0FEC()) return; - ewram0_10.var304++; - break; - case 13: - sub_80F0C28(); - ewram0_10.var304++; - break; - case 14: - if (sub_80F0C48()) return; - ewram0_10.var304++; - break; - case 15: - sub_80EEFBC(0x9); - sub_80F3294(0); - sub_80EBDBC(&sub_80EE58C); - sub_80EED9C(); - break; - case 16: - if (sub_80F70FC()) return; - ewram0_10.var304++; - break; - case 17: - if (sub_8055870()) return; - ewram0_10.var304 = 0x8; - break; - } + break; + case 15: + sub_80EEFBC(0x9); + sub_80F3294(0); + sub_80EBDBC(&sub_80EE58C); + sub_80EED9C(); + break; + case 16: + if (!sub_80F70FC()) + ewram0_10.var304++; + break; + case 17: + if (!sub_8055870()) + ewram0_10.var304 = 0x8; + break; + } } -void sub_80EE8F4() { - switch (ewram0_10.var304) { - case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; - break; - case 1: - if (gPaletteFade.active) return; - sub_80F3130(); - sub_80F2D6C(0x2); - sub_80F6FFC(); - ewram0_10.var304++; - break; - case 2: - sub_80EBDBC(&sub_80EC00C); - break; - } +void sub_80EE8F4() +{ + switch (ewram0_10.var304) + { + case 0: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 1: + if (!gPaletteFade.active) + { + sub_80F3130(); + sub_80F2D6C(0x2); + sub_80F6FFC(); + ewram0_10.var304++; + } + break; + case 2: + sub_80EBDBC(&sub_80EC00C); + break; + } } -void sub_80EE96C() { - u16 var1 = ewram0_10.var304; - if (!var1) { - PlaySE(0x6F); - BeginNormalPaletteFade(-1, 0, 0, 0x10, var1); - ewram0_10.var304++; - } - else { - if (gPaletteFade.active) return; - sub_80F5BDC(); - sub_805469C(); - } +void sub_80EE96C() +{ + if (!ewram0_10.var304) + { + PlaySE(0x6F); + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + ewram0_10.var304++; + } + else + { + if (!gPaletteFade.active) + { + sub_80F5BDC(); + sub_805469C(); + } + } } -void sub_80EE9C0(u8 param1, u8 param2, u8 param3) { - sub_80F1E84(); - ewram0_10.var6e14 = param1; - ewram0_10.var6e15 = param2; - ewram0_10.var6e16 = 0; - ewram0_10.var6e17 = param3; +void sub_80EE9C0(u8 param1, u8 param2, u8 param3) +{ + sub_80F1E84(); + ewram0_10.var6e14 = param1; + ewram0_10.var6e15 = param2; + ewram0_10.var6e16 = 0; + ewram0_10.var6e17 = param3; } #if 0 bool8 sub_80EEA0C() { - switch (ewram0_10.var6e16) { - case 0: - if (sub_80F1F10()) return 1; - if (ewram0_10.var6e17 != 0xC) { - ewram0_10.var6e16 = 0x1; - return 1; - } - else { - ewram0_10.var6e16 = 0x3; - return 1; - } - case 1: - sub_80F2C80(ewram0_10.var6e17); - ewram0_10.var6e16++; - case 2: - if (sub_80F2CBC(ewram0_10.var6e17)) return 1; - ewram0_10.var6e16++; - case 3: - - } + switch (ewram0_10.var6e16) { + case 0: + if (sub_80F1F10()) return 1; + if (ewram0_10.var6e17 != 0xC) { + ewram0_10.var6e16 = 0x1; + return 1; + } + else { + ewram0_10.var6e16 = 0x3; + return 1; + } + case 1: + sub_80F2C80(ewram0_10.var6e17); + ewram0_10.var6e16++; + case 2: + if (sub_80F2CBC(ewram0_10.var6e17)) return 1; + ewram0_10.var6e16++; + case 3: + + } } #else __attribute__((naked)) bool8 sub_80EEA0C() { - asm_unified( - "push {r4,lr}\n\ - ldr r1, _080EEA28 @ =gSharedMem\n\ - ldr r2, _080EEA2C @ =0x00006e16\n\ - adds r0, r1, r2\n\ - ldrb r0, [r0]\n\ - adds r3, r1, 0\n\ - cmp r0, 0x8\n\ - bls _080EEA1E\n\ - b _080EEBFA\n\ + asm_unified( + "push {r4,lr}\n\ + ldr r1, _080EEA28 @ =gSharedMem\n\ + ldr r2, _080EEA2C @ =0x00006e16\n\ + adds r0, r1, r2\n\ + ldrb r0, [r0]\n\ + adds r3, r1, 0\n\ + cmp r0, 0x8\n\ + bls _080EEA1E\n\ + b _080EEBFA\n\ _080EEA1E:\n\ - lsls r0, 2\n\ - ldr r1, _080EEA30 @ =_080EEA34\n\ - adds r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ - .align 2, 0\n\ + lsls r0, 2\n\ + ldr r1, _080EEA30 @ =_080EEA34\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ + .align 2, 0\n\ _080EEA28: .4byte gSharedMem\n\ _080EEA2C: .4byte 0x00006e16\n\ _080EEA30: .4byte _080EEA34\n\ - .align 2, 0\n\ + .align 2, 0\n\ _080EEA34:\n\ - .4byte _080EEA58\n\ - .4byte _080EEA98\n\ - .4byte _080EEAAE\n\ - .4byte _080EEAD4\n\ - .4byte _080EEB3E\n\ - .4byte _080EEB68\n\ - .4byte _080EEB88\n\ - .4byte _080EEBAC\n\ - .4byte _080EEBE4\n\ + .4byte _080EEA58\n\ + .4byte _080EEA98\n\ + .4byte _080EEAAE\n\ + .4byte _080EEAD4\n\ + .4byte _080EEB3E\n\ + .4byte _080EEB68\n\ + .4byte _080EEB88\n\ + .4byte _080EEBAC\n\ + .4byte _080EEBE4\n\ _080EEA58:\n\ - bl sub_80F1F10\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080EEA64\n\ - b _080EEC08\n\ + bl sub_80F1F10\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080EEA64\n\ + b _080EEC08\n\ _080EEA64:\n\ - ldr r1, _080EEA7C @ =gSharedMem\n\ - ldr r4, _080EEA80 @ =0x00006e17\n\ - adds r0, r1, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, 0xC\n\ - beq _080EEA88\n\ - ldr r0, _080EEA84 @ =0x00006e16\n\ - adds r1, r0\n\ - movs r0, 0x1\n\ - strb r0, [r1]\n\ - b _080EEC08\n\ - .align 2, 0\n\ + ldr r1, _080EEA7C @ =gSharedMem\n\ + ldr r4, _080EEA80 @ =0x00006e17\n\ + adds r0, r1, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, 0xC\n\ + beq _080EEA88\n\ + ldr r0, _080EEA84 @ =0x00006e16\n\ + adds r1, r0\n\ + movs r0, 0x1\n\ + strb r0, [r1]\n\ + b _080EEC08\n\ + .align 2, 0\n\ _080EEA7C: .4byte gSharedMem\n\ _080EEA80: .4byte 0x00006e17\n\ _080EEA84: .4byte 0x00006e16\n\ _080EEA88:\n\ - ldr r2, _080EEA94 @ =0x00006e16\n\ - adds r1, r2\n\ - movs r0, 0x3\n\ - strb r0, [r1]\n\ - b _080EEC08\n\ - .align 2, 0\n\ + ldr r2, _080EEA94 @ =0x00006e16\n\ + adds r1, r2\n\ + movs r0, 0x3\n\ + strb r0, [r1]\n\ + b _080EEC08\n\ + .align 2, 0\n\ _080EEA94: .4byte 0x00006e16\n\ _080EEA98:\n\ - ldr r4, _080EEAC8 @ =gSharedMem\n\ - ldr r1, _080EEACC @ =0x00006e17\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0]\n\ - bl sub_80F2C80\n\ - ldr r2, _080EEAD0 @ =0x00006e16\n\ - adds r4, r2\n\ - ldrb r0, [r4]\n\ - adds r0, 0x1\n\ - strb r0, [r4]\n\ + ldr r4, _080EEAC8 @ =gSharedMem\n\ + ldr r1, _080EEACC @ =0x00006e17\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0]\n\ + bl sub_80F2C80\n\ + ldr r2, _080EEAD0 @ =0x00006e16\n\ + adds r4, r2\n\ + ldrb r0, [r4]\n\ + adds r0, 0x1\n\ + strb r0, [r4]\n\ _080EEAAE:\n\ - ldr r4, _080EEAC8 @ =gSharedMem\n\ - ldr r1, _080EEACC @ =0x00006e17\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0]\n\ - bl sub_80F2CBC\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080EEAC2\n\ - b _080EEC08\n\ + ldr r4, _080EEAC8 @ =gSharedMem\n\ + ldr r1, _080EEACC @ =0x00006e17\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0]\n\ + bl sub_80F2CBC\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080EEAC2\n\ + b _080EEC08\n\ _080EEAC2:\n\ - ldr r2, _080EEAD0 @ =0x00006e16\n\ - adds r1, r4, r2\n\ - b _080EEB76\n\ - .align 2, 0\n\ + ldr r2, _080EEAD0 @ =0x00006e16\n\ + adds r1, r4, r2\n\ + b _080EEB76\n\ + .align 2, 0\n\ _080EEAC8: .4byte gSharedMem\n\ _080EEACC: .4byte 0x00006e17\n\ _080EEAD0: .4byte 0x00006e16\n\ _080EEAD4:\n\ - adds r2, r3, 0\n\ - ldr r4, _080EEAF8 @ =0x00006e15\n\ - adds r0, r2, r4\n\ - ldrb r1, [r0]\n\ - subs r4, 0x68\n\ - adds r0, r2, r4\n\ - strb r1, [r0]\n\ - ldr r1, _080EEAFC @ =0x00006e14\n\ - adds r0, r2, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x1\n\ - beq _080EEB14\n\ - cmp r0, 0x1\n\ - bgt _080EEB00\n\ - cmp r0, 0\n\ - beq _080EEB06\n\ - b _080EEB28\n\ - .align 2, 0\n\ + adds r2, r3, 0\n\ + ldr r4, _080EEAF8 @ =0x00006e15\n\ + adds r0, r2, r4\n\ + ldrb r1, [r0]\n\ + subs r4, 0x68\n\ + adds r0, r2, r4\n\ + strb r1, [r0]\n\ + ldr r1, _080EEAFC @ =0x00006e14\n\ + adds r0, r2, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x1\n\ + beq _080EEB14\n\ + cmp r0, 0x1\n\ + bgt _080EEB00\n\ + cmp r0, 0\n\ + beq _080EEB06\n\ + b _080EEB28\n\ + .align 2, 0\n\ _080EEAF8: .4byte 0x00006e15\n\ _080EEAFC: .4byte 0x00006e14\n\ _080EEB00:\n\ - cmp r0, 0x2\n\ - beq _080EEB20\n\ - b _080EEB28\n\ + cmp r0, 0x2\n\ + beq _080EEB20\n\ + b _080EEB28\n\ _080EEB06:\n\ - ldr r4, _080EEB10 @ =0x00006dae\n\ - adds r1, r2, r4\n\ - movs r0, 0x5\n\ - b _080EEB26\n\ - .align 2, 0\n\ + ldr r4, _080EEB10 @ =0x00006dae\n\ + adds r1, r2, r4\n\ + movs r0, 0x5\n\ + b _080EEB26\n\ + .align 2, 0\n\ _080EEB10: .4byte 0x00006dae\n\ _080EEB14:\n\ - ldr r0, _080EEB1C @ =0x00006dae\n\ - adds r1, r2, r0\n\ - movs r0, 0x3\n\ - b _080EEB26\n\ - .align 2, 0\n\ + ldr r0, _080EEB1C @ =0x00006dae\n\ + adds r1, r2, r0\n\ + movs r0, 0x3\n\ + b _080EEB26\n\ + .align 2, 0\n\ _080EEB1C: .4byte 0x00006dae\n\ _080EEB20:\n\ - ldr r2, _080EEB58 @ =0x00006dae\n\ - adds r1, r3, r2\n\ - movs r0, 0x6\n\ + ldr r2, _080EEB58 @ =0x00006dae\n\ + adds r1, r3, r2\n\ + movs r0, 0x6\n\ _080EEB26:\n\ - strb r0, [r1]\n\ + strb r0, [r1]\n\ _080EEB28:\n\ - ldr r4, _080EEB5C @ =gSharedMem\n\ - ldr r1, _080EEB60 @ =0x00006e14\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0]\n\ - bl sub_80F1B8C\n\ - ldr r2, _080EEB64 @ =0x00006e16\n\ - adds r4, r2\n\ - ldrb r0, [r4]\n\ - adds r0, 0x1\n\ - strb r0, [r4]\n\ + ldr r4, _080EEB5C @ =gSharedMem\n\ + ldr r1, _080EEB60 @ =0x00006e14\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0]\n\ + bl sub_80F1B8C\n\ + ldr r2, _080EEB64 @ =0x00006e16\n\ + adds r4, r2\n\ + ldrb r0, [r4]\n\ + adds r0, 0x1\n\ + strb r0, [r4]\n\ _080EEB3E:\n\ - ldr r4, _080EEB5C @ =gSharedMem\n\ - ldr r1, _080EEB60 @ =0x00006e14\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0]\n\ - bl sub_80F1BC8\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080EEC08\n\ - ldr r2, _080EEB64 @ =0x00006e16\n\ - adds r1, r4, r2\n\ - b _080EEB76\n\ - .align 2, 0\n\ + ldr r4, _080EEB5C @ =gSharedMem\n\ + ldr r1, _080EEB60 @ =0x00006e14\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0]\n\ + bl sub_80F1BC8\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080EEC08\n\ + ldr r2, _080EEB64 @ =0x00006e16\n\ + adds r1, r4, r2\n\ + b _080EEB76\n\ + .align 2, 0\n\ _080EEB58: .4byte 0x00006dae\n\ _080EEB5C: .4byte gSharedMem\n\ _080EEB60: .4byte 0x00006e14\n\ _080EEB64: .4byte 0x00006e16\n\ _080EEB68:\n\ - bl sub_8055870\n\ - cmp r0, 0\n\ - bne _080EEC08\n\ - ldr r1, _080EEB80 @ =gSharedMem\n\ - ldr r4, _080EEB84 @ =0x00006e16\n\ - adds r1, r4\n\ + bl sub_8055870\n\ + cmp r0, 0\n\ + bne _080EEC08\n\ + ldr r1, _080EEB80 @ =gSharedMem\n\ + ldr r4, _080EEB84 @ =0x00006e16\n\ + adds r1, r4\n\ _080EEB76:\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - b _080EEC08\n\ - .align 2, 0\n\ + ldrb r0, [r1]\n\ + adds r0, 0x1\n\ + strb r0, [r1]\n\ + b _080EEC08\n\ + .align 2, 0\n\ _080EEB80: .4byte gSharedMem\n\ _080EEB84: .4byte 0x00006e16\n\ _080EEB88:\n\ - bl sub_80F1DF0\n\ - ldr r4, _080EEBA0 @ =gSharedMem\n\ - ldr r1, _080EEBA4 @ =0x00006e14\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0]\n\ - bl sub_80EF490\n\ - ldr r2, _080EEBA8 @ =0x00006e16\n\ - adds r4, r2\n\ - b _080EEBCC\n\ - .align 2, 0\n\ + bl sub_80F1DF0\n\ + ldr r4, _080EEBA0 @ =gSharedMem\n\ + ldr r1, _080EEBA4 @ =0x00006e14\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0]\n\ + bl sub_80EF490\n\ + ldr r2, _080EEBA8 @ =0x00006e16\n\ + adds r4, r2\n\ + b _080EEBCC\n\ + .align 2, 0\n\ _080EEBA0: .4byte gSharedMem\n\ _080EEBA4: .4byte 0x00006e14\n\ _080EEBA8: .4byte 0x00006e16\n\ _080EEBAC:\n\ - bl sub_80F1E50\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080EEC08\n\ - ldr r4, _080EEBD4 @ =gSharedMem\n\ - ldr r1, _080EEBD8 @ =0x00006e14\n\ - adds r0, r4, r1\n\ - ldrb r0, [r0]\n\ - ldr r2, _080EEBDC @ =0x00006dad\n\ - adds r1, r4, r2\n\ - ldrb r1, [r1]\n\ - bl sub_80EF428\n\ - ldr r0, _080EEBE0 @ =0x00006e16\n\ - adds r4, r0\n\ + bl sub_80F1E50\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080EEC08\n\ + ldr r4, _080EEBD4 @ =gSharedMem\n\ + ldr r1, _080EEBD8 @ =0x00006e14\n\ + adds r0, r4, r1\n\ + ldrb r0, [r0]\n\ + ldr r2, _080EEBDC @ =0x00006dad\n\ + adds r1, r4, r2\n\ + ldrb r1, [r1]\n\ + bl sub_80EF428\n\ + ldr r0, _080EEBE0 @ =0x00006e16\n\ + adds r4, r0\n\ _080EEBCC:\n\ - ldrb r0, [r4]\n\ - adds r0, 0x1\n\ - strb r0, [r4]\n\ - b _080EEC08\n\ - .align 2, 0\n\ + ldrb r0, [r4]\n\ + adds r0, 0x1\n\ + strb r0, [r4]\n\ + b _080EEC08\n\ + .align 2, 0\n\ _080EEBD4: .4byte gSharedMem\n\ _080EEBD8: .4byte 0x00006e14\n\ _080EEBDC: .4byte 0x00006dad\n\ _080EEBE0: .4byte 0x00006e16\n\ _080EEBE4:\n\ - bl sub_80EF4F8\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080EEC08\n\ - ldr r1, _080EEC00 @ =gSharedMem\n\ - ldr r2, _080EEC04 @ =0x00006e16\n\ - adds r1, r2\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ + bl sub_80EF4F8\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080EEC08\n\ + ldr r1, _080EEC00 @ =gSharedMem\n\ + ldr r2, _080EEC04 @ =0x00006e16\n\ + adds r1, r2\n\ + ldrb r0, [r1]\n\ + adds r0, 0x1\n\ + strb r0, [r1]\n\ _080EEBFA:\n\ - movs r0, 0\n\ - b _080EEC0A\n\ - .align 2, 0\n\ + movs r0, 0\n\ + b _080EEC0A\n\ + .align 2, 0\n\ _080EEC00: .4byte gSharedMem\n\ _080EEC04: .4byte 0x00006e16\n\ _080EEC08:\n\ - movs r0, 0x1\n\ + movs r0, 0x1\n\ _080EEC0A:\n\ - pop {r4}\n\ - pop {r1}\n\ - bx r1\n" + pop {r4}\n\ + pop {r1}\n\ + bx r1\n" - ); + ); } #endif // var6dad and var6dae must be s8 in this func -bool8 sub_80EEC10() { - if (gMain.newKeys & 0x40) { - do { - if (--ewram0_11.var6dad < 0) { - ewram0_11.var6dad = ewram0_11.var6dae - 1; - } - - } while (!ewram0_10.var6db2[ewram0_11.var6dad]); - return 1; - } - if (gMain.newKeys & 0x80) { - do { - if (++ewram0_11.var6dad >= ewram0_11.var6dae) { - ewram0_11.var6dad = 0; - } - } while (!ewram0_10.var6db2[ewram0_11.var6dad]); - return 1; - } - return 0; +bool8 sub_80EEC10() +{ + if (gMain.newKeys & 0x40) + { + do + { + if (--ewram0_11.var6dad < 0) + ewram0_11.var6dad = ewram0_11.var6dae - 1; + } while (!ewram0_10.var6db2[ewram0_11.var6dad]); + return TRUE; + } + if (gMain.newKeys & 0x80) + { + do + { + if (++ewram0_11.var6dad >= ewram0_11.var6dae) + ewram0_11.var6dad = 0; + } while (!ewram0_10.var6db2[ewram0_11.var6dad]); + return TRUE; + } + return FALSE; } -bool8 sub_80EEC90() { - if (gMain.newKeys & 0x40) { - if (--ewram0_11.var6dad < 0) { - ewram0_11.var6dad = ewram0_11.var6dae - 1; - } - return 1; - } - if (gMain.newKeys & 0x80) { - if (++ewram0_11.var6dad >= ewram0_11.var6dae) { - ewram0_11.var6dad = 0; - } - return 1; - } - return 0; +bool8 sub_80EEC90() +{ + if (gMain.newKeys & 0x40) + { + if (--ewram0_11.var6dad < 0) + ewram0_11.var6dad = ewram0_11.var6dae - 1; + return TRUE; + } + if (gMain.newKeys & 0x80) + { + if (++ewram0_11.var6dad >= ewram0_11.var6dae) + ewram0_11.var6dad = 0; + return TRUE; + } + return FALSE; } -void sub_80EED0C() { - REG_DISPCNT = 512; +void sub_80EED0C() +{ + REG_DISPCNT = 512; } -void sub_80EED1C() { - REG_DISPCNT = 0x92 << 5; +void sub_80EED1C() +{ + REG_DISPCNT = 0x92 << 5; } -void sub_80EED2C(u8 param1) { - switch (param1) { - case 0: - REG_DISPCNT = 0xFA << 5; - break; - case 1: - REG_DISPCNT = 0x1741; - break; - case 3: - case 4: - REG_DISPCNT = 0xFA << 5; - break; - case 2: - REG_DISPCNT = 0x7b40; - break; - case 5: - REG_DISPCNT = 0xFD << 6; - break; - } +void sub_80EED2C(u8 param1) +{ + switch (param1) { + case 0: + REG_DISPCNT = 0xFA << 5; + break; + case 1: + REG_DISPCNT = 0x1741; + break; + case 3: + case 4: + REG_DISPCNT = 0xFA << 5; + break; + case 2: + REG_DISPCNT = 0x7b40; + break; + case 5: + REG_DISPCNT = 0xFD << 6; + break; + } } -void sub_80EED9C(void) { - gUnknown_03000744 = ewram0_10.var300; - ewram0_10.var300 = &sub_80EEDC4; - ewram0_10.var300(); +void sub_80EED9C(void) +{ + gUnknown_03000744 = ewram0_10.var300; + ewram0_10.var300 = &sub_80EEDC4; + ewram0_10.var300(); } -void sub_80EEDC4(void) { - if (sub_8055870() != 0x1) { - ewram0_10.var300 = gUnknown_03000744; - } +void sub_80EEDC4(void) +{ + if (sub_8055870() != 0x1) + ewram0_10.var300 = gUnknown_03000744; } -void sub_80EEDE8(void) { - REG_BG0HOFS = 0; - REG_BG0VOFS = 0; - REG_BG2VOFS = 0; - REG_BG2HOFS = 0; - REG_BG3HOFS = 0; - REG_BG3VOFS = 0; +void sub_80EEDE8(void) +{ + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG2VOFS = 0; + REG_BG2HOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; } -void sub_80EEE08(void) { - gUnknown_083DFEC4->unkD160 = 0; +void sub_80EEE08(void) +{ + gUnknown_083DFEC4->unkD160 = 0; } -void sub_80EEE20(void) { - gUnknown_083DFEC4->unkD160 = 0; - if (!gUnknown_083DFEC4->unk6DAC) { - while (sub_80EEE54()); - } +void sub_80EEE20(void) +{ + gUnknown_083DFEC4->unkD160 = 0; + if (!gUnknown_083DFEC4->unk6DAC) + { + while (sub_80EEE54()) + ; + } } -bool8 sub_80EEE54(void) { - switch (gUnknown_083DFEC4->unkD160) { - case 0: - LZ77UnCompVram(gPokenavHoennMapMisc_Gfx, (void *)VRAM + 0xC000); - break; - case 1: - LZ77UnCompVram(gUnknown_08E99FB0, (void *)VRAM + 0xD800); - break; - case 2: - LoadPalette(gPokenavHoennMap1_Pal, 0x10, 0x20); - break; - case 3: - sub_80EF58C(0); - sub_80EF58C(1); - sub_80EF58C(2); - break; - case 4: - gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0; - REG_BG1HOFS = 0; - REG_BG1VOFS = 0; - REG_BG1CNT = 0x1B0C; - gUnknown_083DFEC4->unkD160++; - default: - return 0; - } - gUnknown_083DFEC4->unkD160++; - return 1; +bool8 sub_80EEE54(void) +{ + switch (gUnknown_083DFEC4->unkD160) + { + case 0: + LZ77UnCompVram(gPokenavHoennMapMisc_Gfx, (void *)VRAM + 0xC000); + break; + case 1: + LZ77UnCompVram(gUnknown_08E99FB0, (void *)VRAM + 0xD800); + break; + case 2: + LoadPalette(gPokenavHoennMap1_Pal, 0x10, 0x20); + break; + case 3: + sub_80EF58C(0); + sub_80EF58C(1); + sub_80EF58C(2); + break; + case 4: + gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG1CNT = 0x1B0C; + gUnknown_083DFEC4->unkD160++; + default: + return FALSE; + } + gUnknown_083DFEC4->unkD160++; + return TRUE; } -bool8 sub_80EEF34(void) { - bool8 retVal = TRUE; +bool8 sub_80EEF34(void) +{ + bool8 retVal = TRUE; - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 32) - { - return FALSE; - } + if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 32) + return FALSE; - gUnknown_083DFEC4->unk030C.unk030C.unk0 += 2; - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 > 31) - { - gUnknown_083DFEC4->unk030C.unk030C.unk0 = 32; - retVal = FALSE; - } + gUnknown_083DFEC4->unk030C.unk030C.unk0 += 2; + if (gUnknown_083DFEC4->unk030C.unk030C.unk0 > 31) + { + gUnknown_083DFEC4->unk030C.unk030C.unk0 = 32; + retVal = FALSE; + } - REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0; - return retVal; + REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0; + return retVal; } bool8 sub_80EEF78(void) { - bool8 retVal = TRUE; - - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 0) - { - return FALSE; - } - - gUnknown_083DFEC4->unk030C.unk030C.unk0 -= 2; - if (gUnknown_083DFEC4->unk030C.unk030C.unk0 <= 0) - { - gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0; - retVal = FALSE; - } - - REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0; - return retVal; + bool8 retVal = TRUE; + + if (gUnknown_083DFEC4->unk030C.unk030C.unk0 == 0) + return FALSE; + + gUnknown_083DFEC4->unk030C.unk030C.unk0 -= 2; + if (gUnknown_083DFEC4->unk030C.unk030C.unk0 <= 0) + { + gUnknown_083DFEC4->unk030C.unk030C.unk0 = 0; + retVal = FALSE; + } + + REG_BG1VOFS = gUnknown_083DFEC4->unk030C.unk030C.unk0; + return retVal; } void sub_80EEFBC(u8 a) { - u8 var1; + u8 var1; - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 0, 17, 2); + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 0, 17, 2); - switch (a) - { - case 0: - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 17, 0, 10, 2); - sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - case 11: - sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - case 2: - var1 = gUnknown_083DFEC4->unk6DAC; - if (!var1) - { - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 2, 10, 2); - sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, var1, 6, 7, 2); - } - else - { - sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); - } - break; - case 3: - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 4, 10, 2); - sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - case 4: - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 2, 10, 2); - sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - case 7: - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 4, 10, 2); - sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - case 8: - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 4, 10, 2); - sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - case 5: - case 9: - sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 2, 10, 2); - sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - case 10: - sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2); - break; - } + switch (a) + { + case 0: + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 17, 0, 10, 2); + sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + case 11: + sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + case 2: + var1 = gUnknown_083DFEC4->unk6DAC; + if (!var1) + { + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 2, 10, 2); + sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, var1, 6, 7, 2); + } + else + { + sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); + } + break; + case 3: + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 4, 10, 2); + sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + case 4: + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 2, 10, 2); + sub_809D104((void *)VRAM + 0xD800, 10, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + case 7: + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 10, 4, 10, 2); + sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + case 8: + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 20, 4, 10, 2); + sub_809D104((void *)VRAM + 0xD800, 7, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + case 5: + case 9: + sub_809D104((void *)VRAM + 0xD800, 0, 22, gUnknown_08E9A100, 0, 2, 10, 2); + sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + case 10: + sub_809D104((void *)VRAM + 0xD800, 8, 22, gUnknown_08E9A100, 0, 6, 7, 2); + break; + } } void sub_80EF248(u8 a) { - gUnknown_083DFEC4->unkD160 = 0; + gUnknown_083DFEC4->unkD160 = 0; - if (!gUnknown_083DFEC4->unk6DAC) - { - while (sub_80EF284(a)); - } + if (!gUnknown_083DFEC4->unk6DAC) + { + while (sub_80EF284(a)) + ; + } } bool8 sub_80EF284(u8 a) { - switch (gUnknown_083DFEC4->unkD160) - { - case 0: - sub_80EEDE8(); - break; - case 1: - SetUpWindowConfig(&gWindowConfig_81E7224); - break; - case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E7224); - break; - case 3: - if (!MultistepInitMenuWindowContinue()) - { - return TRUE; - } - break; - case 4: - DmaCopy16Defvars(3, gUnknown_083DFEEC, (void *)VRAM + 0x5000, 0xA0); - break; - case 5: - LZ77UnCompVram(gUnknown_083DFF8C, (void *)VRAM + 0xF800); - break; - case 6: - DmaCopy16Defvars(3, gUnknown_083E005C, (void *)VRAM + 0x8000, 0x20); - break; - case 7: - LZ77UnCompVram(gUnknown_083E007C, (void *)VRAM + 0xE000); - break; - case 8: - LZ77UnCompVram(gPokenavOutlineTilemap, (void *)VRAM + 0xE800); - break; - case 9: - LZ77UnCompVram(gPokenavOutlineTiles, (void *)VRAM + 0x8020); - break; - case 10: - sub_80EF54C(a); - LoadPalette(gUnknown_083DFECC, 0xF0, 0x20); - LoadPalette(gPokenavOutlinePalette, 0x40, 0x20); - sub_80EF7D4(); - break; - case 11: - REG_BG0CNT = 0x1F01; - REG_BG2CNT = 0x1D0A; - REG_BG3CNT = 0x1C0B; - REG_BLDCNT = 0; - - gUnknown_083DFEC4->unkD160++; - return FALSE; - default: - return FALSE; - } - - gUnknown_083DFEC4->unkD160++; - return TRUE; + switch (gUnknown_083DFEC4->unkD160) + { + case 0: + sub_80EEDE8(); + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E7224); + break; + case 2: + MultistepInitMenuWindowBegin(&gWindowConfig_81E7224); + break; + case 3: + if (!MultistepInitMenuWindowContinue()) + return TRUE; + break; + case 4: + DmaCopy16Defvars(3, gUnknown_083DFEEC, (void *)VRAM + 0x5000, 0xA0); + break; + case 5: + LZ77UnCompVram(gUnknown_083DFF8C, (void *)VRAM + 0xF800); + break; + case 6: + DmaCopy16Defvars(3, gUnknown_083E005C, (void *)VRAM + 0x8000, 0x20); + break; + case 7: + LZ77UnCompVram(gUnknown_083E007C, (void *)VRAM + 0xE000); + break; + case 8: + LZ77UnCompVram(gPokenavOutlineTilemap, (void *)VRAM + 0xE800); + break; + case 9: + LZ77UnCompVram(gPokenavOutlineTiles, (void *)VRAM + 0x8020); + break; + case 10: + sub_80EF54C(a); + LoadPalette(gUnknown_083DFECC, 0xF0, 0x20); + LoadPalette(gPokenavOutlinePalette, 0x40, 0x20); + sub_80EF7D4(); + break; + case 11: + REG_BG0CNT = 0x1F01; + REG_BG2CNT = 0x1D0A; + REG_BG3CNT = 0x1C0B; + REG_BLDCNT = 0; + + gUnknown_083DFEC4->unkD160++; + return FALSE; + default: + return FALSE; + } + + gUnknown_083DFEC4->unkD160++; + return TRUE; } void sub_80EF428(u8 a, u8 b) { - u8 *tileBuffer; - const u8 *pcText = 0; + u8 *tileBuffer; + const u8 *pcText = 0; - switch (a) - { - case 0: - pcText = gUnknown_083E31B0[b]; - break; - case 1: - pcText = gUnknown_083E31CC[b]; - break; - case 2: - pcText = gUnknown_083E31D8[b]; - break; - } + switch (a) + { + case 0: + pcText = gUnknown_083E31B0[b]; + break; + case 1: + pcText = gUnknown_083E31CC[b]; + break; + case 2: + pcText = gUnknown_083E31D8[b]; + break; + } - tileBuffer = gUnknown_083DFEC8; - sub_8072C74(&tileBuffer[0x800], pcText, 0xC0, 2); - MenuPrint(&tileBuffer[0x800], 3, 17); + tileBuffer = gUnknown_083DFEC8; + sub_8072C74(&tileBuffer[0x800], pcText, 0xC0, 2); + MenuPrint(&tileBuffer[0x800], 3, 17); } void sub_80EF490(u8 a) { - u16 var1, var2; - - if (a == 2) - { - a = 1; - } - - gUnknown_083DFEC4->unkCE4E = a * 30; - var1 = gUnknown_083DFEC4->unkCE4C; - var2 = a * 30; - if (var1 < var2) - { - gUnknown_083DFEC4->unkCE50 = 2; - } - else if (var1 > var2) - { - gUnknown_083DFEC4->unkCE50 = -2; - } - else - { - gUnknown_083DFEC4->unkCE50 = 0; - } + u16 var1, var2; + + if (a == 2) + a = 1; + + gUnknown_083DFEC4->unkCE4E = a * 30; + var1 = gUnknown_083DFEC4->unkCE4C; + var2 = a * 30; + if (var1 < var2) + gUnknown_083DFEC4->unkCE50 = 2; + else if (var1 > var2) + gUnknown_083DFEC4->unkCE50 = -2; + else + gUnknown_083DFEC4->unkCE50 = 0; } bool8 sub_80EF4F8(void) { - u16 *palettes; + u16 *palettes; - if (gUnknown_083DFEC4->unkCE4C == gUnknown_083DFEC4->unkCE4E) - { - return FALSE; - } - else - { - gUnknown_083DFEC4->unkCE4C = gUnknown_083DFEC4->unkCE50 + gUnknown_083DFEC4->unkCE4C; + if (gUnknown_083DFEC4->unkCE4C == gUnknown_083DFEC4->unkCE4E) + { + return FALSE; + } + else + { + gUnknown_083DFEC4->unkCE4C = gUnknown_083DFEC4->unkCE50 + gUnknown_083DFEC4->unkCE4C; - palettes = gUnknown_083DFEC4->palettesCE52; - LoadPalette(&palettes[gUnknown_083DFEC4->unkCE4C], 0x31, 4); - return TRUE; - } + palettes = gUnknown_083DFEC4->palettesCE52; + LoadPalette(&palettes[gUnknown_083DFEC4->unkCE4C], 0x31, 4); + return TRUE; + } } void sub_80EF54C(u8 a) { - if (a == 2) - { - a = 1; - } + if (a == 2) + a = 1; - gUnknown_083DFEC4->unkCE4C = a * 30; - LoadPalette(&gUnknown_083DFEC4->palettesCE52[gUnknown_083DFEC4->unkCE4C], 0x31, 4); + gUnknown_083DFEC4->unkCE4C = a * 30; + LoadPalette(&gUnknown_083DFEC4->palettesCE52[gUnknown_083DFEC4->unkCE4C], 0x31, 4); } void sub_80EF58C(u8 a) { - u16 i; - u16 * palettes; - const u16 *var1; - - switch (a) - { - case 0: - for (i = 0; i < 62; i++) - { - gUnknown_083DFEC4->palettesCE52[i] = 0; - } - break; - case 1: - palettes = gUnknown_083DFEC4->palettesCE52; - var1 = gUnknown_083E003C; - sub_80EF624(&var1[1], &var1[3], 16, 2, palettes); - break; - case 2: - palettes = gUnknown_083DFEC4->palettesCE8E; - var1 = gUnknown_083E003C; - sub_80EF624(&var1[3], &var1[7], 16, 2, palettes); - break; - } + u16 i; + u16 * palettes; + const u16 *var1; + + switch (a) + { + case 0: + for (i = 0; i < 62; i++) + gUnknown_083DFEC4->palettesCE52[i] = 0; + break; + case 1: + palettes = gUnknown_083DFEC4->palettesCE52; + var1 = gUnknown_083E003C; + sub_80EF624(&var1[1], &var1[3], 16, 2, palettes); + break; + case 2: + palettes = gUnknown_083DFEC4->palettesCE8E; + var1 = gUnknown_083E003C; + sub_80EF624(&var1[3], &var1[7], 16, 2, palettes); + break; + } } #ifdef NONMATCHING void sub_80EF624(const u16 *a, const u16 *b, u8 c, u8 d, u16 *palettes) { - u16 red1, green1, blue1; - u16 red2, green2, blue2; - s32 redDiv, greenDiv, blueDiv; - u16 *palettes2; - u16 i, j; - - i = 0; - while (i < d) - { - red1 = (*a & 0x1F) << 8; - green1 = ((*a >> 5) & 0x1F) << 8; - blue1 = ((*a >> 10) & 0x1F) << 8; - - red2 = (*b & 0x1F) << 8; - green2 = ((*b >> 5) & 0x1F) << 8; - blue2 = ((*b >> 10) & 0x1F) << 8; - - redDiv = (red2 - red1) / c; - greenDiv = (green2 - green1) / c; - blueDiv = (blue2 - blue1) / c; - - palettes2 = palettes; - for (j = 0; j < c - 1; j++) - { - *palettes2 = (((blue1 << 8) >> 16) << 10) | (((green1 << 8) >> 16) << 5) | ((red1 << 8) >> 16); - palettes2 += d; - red1 += redDiv; - green1 += greenDiv; - blue1 += blueDiv; - } + u16 red1, green1, blue1; + u16 red2, green2, blue2; + s32 redDiv, greenDiv, blueDiv; + u16 *palettes2; + u16 i, j; + + i = 0; + while (i < d) + { + red1 = (*a & 0x1F) << 8; + green1 = ((*a >> 5) & 0x1F) << 8; + blue1 = ((*a >> 10) & 0x1F) << 8; - *palettes2 = (red2 >> 8) | (blue2 << 2) | (green2 >> 3); - palettes++; + red2 = (*b & 0x1F) << 8; + green2 = ((*b >> 5) & 0x1F) << 8; + blue2 = ((*b >> 10) & 0x1F) << 8; - a++; - b++; - i++; - } + redDiv = (red2 - red1) / c; + greenDiv = (green2 - green1) / c; + blueDiv = (blue2 - blue1) / c; + + palettes2 = palettes; + for (j = 0; j < c - 1; j++) + { + *palettes2 = (((blue1 << 8) >> 16) << 10) | (((green1 << 8) >> 16) << 5) | ((red1 << 8) >> 16); + palettes2 += d; + red1 += redDiv; + green1 += greenDiv; + blue1 += blueDiv; + } + + *palettes2 = (red2 >> 8) | (blue2 << 2) | (green2 >> 3); + palettes++; + + a++; + b++; + i++; + } } #else __attribute__((naked)) @@ -3430,151 +3606,142 @@ _080EF72E:\n\ void sub_80EF740(void) { - gUnknown_083DFEC4->unk6DA0 = (gUnknown_083DFEC4->unk6DA0 + 1) & 1; - if (gUnknown_083DFEC4->unk6DA0) - { - gUnknown_083DFEC4->unk6DA2++; - } + gUnknown_083DFEC4->unk6DA0 = (gUnknown_083DFEC4->unk6DA0 + 1) & 1; + if (gUnknown_083DFEC4->unk6DA0) + gUnknown_083DFEC4->unk6DA2++; - REG_BG3HOFS = gUnknown_083DFEC4->unk6DA2; + REG_BG3HOFS = gUnknown_083DFEC4->unk6DA2; } void sub_80EF780(u8 taskId) { - if (gTasks[taskId].data[0] == 0 || (gUnknown_083DFEC4->unk6DA2 & 0x7) != 0) - { - sub_80EF740(); - } - else - { - u16 value = gUnknown_083DFEC4->unk6DA2 & 0x7; - gUnknown_083DFEC4->unk6DA2 = value; - gUnknown_083DFEC4->unk6DA0 = value; - REG_BG3HOFS = value; - } + if (gTasks[taskId].data[0] == 0 || (gUnknown_083DFEC4->unk6DA2 & 0x7) != 0) + { + sub_80EF740(); + } + else + { + u16 value = gUnknown_083DFEC4->unk6DA2 & 0x7; + gUnknown_083DFEC4->unk6DA2 = value; + gUnknown_083DFEC4->unk6DA0 = value; + REG_BG3HOFS = value; + } } void sub_80EF7D4(void) { - gUnknown_083DFEC4->unk6DA2 = 0; - gUnknown_083DFEC4->unk6DA0 = 0; - gUnknown_083DFEC4->taskId6DA4 = CreateTask(sub_80EF780, 80); + gUnknown_083DFEC4->unk6DA2 = 0; + gUnknown_083DFEC4->unk6DA0 = 0; + gUnknown_083DFEC4->taskId6DA4 = CreateTask(sub_80EF780, 80); } void sub_80EF814(void) { - if (FuncIsActiveTask(sub_80EF780)) - { - DestroyTask(gUnknown_083DFEC4->taskId6DA4); - } + if (FuncIsActiveTask(sub_80EF780)) + DestroyTask(gUnknown_083DFEC4->taskId6DA4); } void sub_80EF840(void) { - gUnknown_083DFEC4->unkD160 = 0; + gUnknown_083DFEC4->unkD160 = 0; - if (gUnknown_083DFEC4->unk6DAC == 0) - { - while (sub_80EF874() != 0); - } + if (gUnknown_083DFEC4->unk6DAC == 0) + { + while (sub_80EF874() != 0) + ; + } } bool8 sub_80EF874(void) { - switch (gUnknown_083DFEC4->unkD160) - { - case 0: - sub_80EEDE8(); - break; - case 1: - SetUpWindowConfig(&gWindowConfig_81E7224); - break; - case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E7224); - break; - case 3: - if (!MultistepInitMenuWindowContinue()) - { - return TRUE; - } - break; - case 4: - MenuZeroFillScreen(); - break; - case 5: - sub_80FA904(&gUnknown_083DFEC4->regionMap, gSaveBlock2.regionMapZoom ? TRUE : FALSE); - break; - case 6: - if (sub_80FA940()) - { - return TRUE; - } - break; - case 7: - LZ77UnCompVram(gPokenavHoennMapSquares_Gfx, (void *)VRAM + 0x5000); - break; - case 8: - LoadPalette(gPokenavHoennMapSquares_Pal, 0x30, 0x20); - sub_80EFC3C(); - break; - case 9: - if (sub_80EFC64()) - { - return TRUE; - } - break; - case 10: - MenuDrawTextWindow(13, 3, 29, 17); - sub_80EF9F8(); - break; - case 11: - if (!gUnknown_083DFEC4->regionMap.zoomed) - { - gUnknown_083DFEC4->unk7698 = 160; - REG_BG0VOFS = 160; - } - else - { - gUnknown_083DFEC4->unk7698 = 256; - REG_BG0VOFS = 0; - } + switch (gUnknown_083DFEC4->unkD160) + { + case 0: + sub_80EEDE8(); + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E7224); + break; + case 2: + MultistepInitMenuWindowBegin(&gWindowConfig_81E7224); + break; + case 3: + if (!MultistepInitMenuWindowContinue()) + return TRUE; + break; + case 4: + MenuZeroFillScreen(); + break; + case 5: + sub_80FA904(&gUnknown_083DFEC4->regionMap, gSaveBlock2.regionMapZoom ? TRUE : FALSE); + break; + case 6: + if (sub_80FA940()) + return TRUE; + break; + case 7: + LZ77UnCompVram(gPokenavHoennMapSquares_Gfx, (void *)VRAM + 0x5000); + break; + case 8: + LoadPalette(gPokenavHoennMapSquares_Pal, 0x30, 0x20); + sub_80EFC3C(); + break; + case 9: + if (sub_80EFC64()) + return TRUE; + break; + case 10: + MenuDrawTextWindow(13, 3, 29, 17); + sub_80EF9F8(); + break; + case 11: + if (!gUnknown_083DFEC4->regionMap.zoomed) + { + gUnknown_083DFEC4->unk7698 = 160; + REG_BG0VOFS = 160; + } + else + { + gUnknown_083DFEC4->unk7698 = 256; + REG_BG0VOFS = 0; + } - REG_BG0CNT = REG_BG0CNT; - REG_BG0CNT |= 1; - REG_BLDCNT = 0; - break; - default: - return FALSE; - } + REG_BG0CNT = REG_BG0CNT; + REG_BG0CNT |= 1; + REG_BLDCNT = 0; + break; + default: + return FALSE; + } - gUnknown_083DFEC4->unkD160++; - return TRUE; + gUnknown_083DFEC4->unkD160++; + return TRUE; } asm(".include \"constants/gba_constants.inc\"\n"); void sub_80EF9F8(void) { - bool8 someBool = FALSE; + bool8 someBool = FALSE; u16 top = 4; - u16 mapSectionId; - u8 b; + u16 mapSectionId; + u8 b; - switch (gUnknown_083DFEC4->regionMap.unk16) - { + switch (gUnknown_083DFEC4->regionMap.unk16) + { case 0: break; - case 1: - case 4: - sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); - top += 2; - if (gLinkOpen == TRUE) - { - sub_80F1A80(); + case 1: + case 4: + sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); + top += 2; + if (gLinkOpen == TRUE) + { + sub_80F1A80(); someBool = TRUE; - } - else - { + } + else + { u16 i; for (i = 0; i < 4; i++) @@ -3589,99 +3756,95 @@ void sub_80EF9F8(void) sub_8072A18(secName, 0x70, top * 8, 0x78, 1); top += 2; } - } - break; - case 2: - sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); - top += 2; - mapSectionId = gUnknown_083DFEC4->regionMap.mapSectionId; + } + break; + case 2: + sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); + top += 2; + mapSectionId = gUnknown_083DFEC4->regionMap.mapSectionId; b = gUnknown_083DFEC4->regionMap.everGrandeCityArea; if (gUnknown_083DFEC4->unkCDCC[mapSectionId][b] != NULL) - { - MenuFillWindowRectWithBlankTile(14, top, 15, 15); - MenuFillWindowRectWithBlankTile(26, top, 28, 15); - sub_8095C8C((void *)(VRAM + 0xF800), 16, 6, gUnknown_083DFEC4->unkCDCC[mapSectionId][b], 0, 0, 10, 10, 10); - top += 11; - } - break; - case 3: - sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); - top += 2; - break; - } + { + MenuFillWindowRectWithBlankTile(14, top, 15, 15); + MenuFillWindowRectWithBlankTile(26, top, 28, 15); + sub_8095C8C((void *)(VRAM + 0xF800), 16, 6, gUnknown_083DFEC4->unkCDCC[mapSectionId][b], 0, 0, 10, 10, 10); + top += 11; + } + break; + case 3: + sub_8072A18(gUnknown_083DFEC4->regionMap.mapSectionName, 0x70, top * 8, 0x78, 1); + top += 2; + break; + } // Epic fail by the compiler at optimizing this. if (!someBool && top < 16) MenuFillWindowRectWithBlankTile(14, top, 28, 15); - if (gUnknown_083DFEC4->regionMap.unk16 == 2) - sub_80EFD74(); - else - sub_80EFDA0(); + if (gUnknown_083DFEC4->regionMap.unk16 == 2) + sub_80EFD74(); + else + sub_80EFDA0(); } void sub_80EFBB0(void) { - if (!gUnknown_083DFEC4->regionMap.zoomed) - { - sub_80EEFBC(8); - } - else - { - sub_80EEFBC(7); - } + if (!gUnknown_083DFEC4->regionMap.zoomed) + sub_80EEFBC(8); + else + sub_80EEFBC(7); } bool8 sub_80EFBDC(bool8 a) { - bool8 retVal = TRUE; - u16 var1 = gUnknown_083DFEC4->unk7698; + bool8 retVal = TRUE; + u16 var1 = gUnknown_083DFEC4->unk7698; - if (a) - { - if (var1 > 168) - { - var1 = var1 - 8; - } - else - { - var1 = 160; - retVal = FALSE; - } - } - else - { - if (var1 < 248) - { - var1 = var1 + 8; - } - else - { - var1 = 256; - retVal = FALSE; - } - } + if (a) + { + if (var1 > 168) + { + var1 = var1 - 8; + } + else + { + var1 = 160; + retVal = FALSE; + } + } + else + { + if (var1 < 248) + { + var1 = var1 + 8; + } + else + { + var1 = 256; + retVal = FALSE; + } + } - gUnknown_083DFEC4->unk7698 = var1; - REG_BG0VOFS = var1 & 0xFF; + gUnknown_083DFEC4->unk7698 = var1; + REG_BG0VOFS = var1 & 0xFF; - return retVal; + return retVal; } void sub_80EFC3C(void) { - gUnknown_083DFEC4->unkBC9A = 0; - gUnknown_083DFEC4->unkBC9B = 0; - sub_80EFD3C(); + gUnknown_083DFEC4->unkBC9A = 0; + gUnknown_083DFEC4->unkBC9B = 0; + sub_80EFD3C(); } bool8 sub_80EFC64(void) { - u16 i; - u8 var1; - u16 var2; + u16 i; + u8 var1; + u16 var2; - if (gUnknown_083DFEC4->unkBC9A >= 16) + if (gUnknown_083DFEC4->unkBC9A >= 16) return FALSE; var1 = gUnknown_083DFEC4->unkBC9A; @@ -3709,345 +3872,330 @@ bool8 sub_80EFC64(void) void sub_80EFD3C(void) { - gUnknown_083DFEC4->unk769E = 0; - gUnknown_083DFEC4->unk769C = 47; - gUnknown_083DFEC4->unk769D = 0; - gUnknown_083DFEC4->unk769A = 0; + gUnknown_083DFEC4->unk769E = 0; + gUnknown_083DFEC4->unk769C = 47; + gUnknown_083DFEC4->unk769D = 0; + gUnknown_083DFEC4->unk769A = 0; } void sub_80EFD74(void) { - gUnknown_083DFEC4->unk769E = 1; - - if (gUnknown_083DFEC4->unk769D == 1) - { - gUnknown_083DFEC4->unk769D = 2; - } + gUnknown_083DFEC4->unk769E = 1; + if (gUnknown_083DFEC4->unk769D == 1) + gUnknown_083DFEC4->unk769D = 2; } void sub_80EFDA0(void) { - sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9AC2C, 0, 0, 15, 1, 15); - gUnknown_083DFEC4->unk769E = 0; + sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9AC2C, 0, 0, 15, 1, 15); + gUnknown_083DFEC4->unk769E = 0; } void sub_80EFDE4(u8 param0) { - u16 var1 = 60 - gUnknown_083DFEC4->unk769C; + u16 var1 = 60 - gUnknown_083DFEC4->unk769C; - if (var1 > 15) - { - var1 = 15; - } + if (var1 > 15) + var1 = 15; - if (gUnknown_083DFEC4->unk769E != 0) - { - sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9ABB4, gUnknown_083DFEC4->unk769C, 0, var1, 1, 60); + if (gUnknown_083DFEC4->unk769E != 0) + { + sub_8095C8C((void *)VRAM + 0xF800, 14, 16, gUnknown_08E9ABB4, gUnknown_083DFEC4->unk769C, 0, var1, 1, 60); - if (var1 < 15) - { - u16 var2 = var1 + 14; + if (var1 < 15) + { + u16 var2 = var1 + 14; - sub_8095C8C((void *)VRAM + 0xF800, var2, 16, gUnknown_08E9ABB4, 0, 0, (u16)(15 - var1), 1, 60); - } - } + sub_8095C8C((void *)VRAM + 0xF800, var2, 16, gUnknown_08E9ABB4, 0, 0, (u16)(15 - var1), 1, 60); + } + } } void sub_80EFE7C(void) { - u16 var1; - u8 var2 = gUnknown_083DFEC4->unk769D; + u16 var1; + u8 var2 = gUnknown_083DFEC4->unk769D; - switch (var2) - { - case 0: - var1 = ++gUnknown_083DFEC4->unk769C; + switch (var2) + { + case 0: + var1 = ++gUnknown_083DFEC4->unk769C; - if (var1 > 59) - { - gUnknown_083DFEC4->unk769C = var2; - } + if (var1 > 59) + gUnknown_083DFEC4->unk769C = var2; - sub_80EFDE4(gUnknown_083DFEC4->unk769E); + sub_80EFDE4(gUnknown_083DFEC4->unk769E); - switch (gUnknown_083DFEC4->unk769C) - { - case 0: - case 15: - case 30: - case 45: - gUnknown_083DFEC4->unk769D = 1; - gUnknown_083DFEC4->unk769A = 0; - break; - } - break; - case 1: - var1 = ++gUnknown_083DFEC4->unk769A; - if (var1 > 120) - { - gUnknown_083DFEC4->unk769A = 0; - gUnknown_083DFEC4->unk769D = 0; - } - break; - case 2: - sub_80EFDE4(1); - gUnknown_083DFEC4->unk769D = 1; - break; - } + switch (gUnknown_083DFEC4->unk769C) + { + case 0: + case 15: + case 30: + case 45: + gUnknown_083DFEC4->unk769D = 1; + gUnknown_083DFEC4->unk769A = 0; + break; + } + break; + case 1: + var1 = ++gUnknown_083DFEC4->unk769A; + if (var1 > 120) + { + gUnknown_083DFEC4->unk769A = 0; + gUnknown_083DFEC4->unk769D = 0; + } + break; + case 2: + sub_80EFDE4(1); + gUnknown_083DFEC4->unk769D = 1; + break; + } } void sub_80EFF34(void) { - gUnknown_083DFEC4->unkD160 = 0; + gUnknown_083DFEC4->unkD160 = 0; - if (gUnknown_083DFEC4->unk6DAC == 0) - { - while (sub_80EFF68()); - } + if (gUnknown_083DFEC4->unk6DAC == 0) + { + while (sub_80EFF68()) + ; + } } bool8 sub_80EFF68(void) { - switch (gUnknown_083DFEC4->unkD160) - { - case 0: - sub_80EEDE8(); - gUnknown_083DFEC4->unkD162[0] = 11; - break; - case 1: - SetUpWindowConfig(&gWindowConfig_81E7080); - break; - case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E7080); - break; - case 3: - if (!MultistepInitMenuWindowContinue()) - { - return TRUE; - } - break; - case 4: - MenuZeroFillScreen(); - break; - case 5: - sub_80F1614(); - break; - case 6: - if (sub_80F162C(0)) - { - return TRUE; - } - break; - case 7: - LZ77UnCompVram(gPokenavConditionView_Gfx, (void *)VRAM + 0x5000); - break; - case 8: - LZ77UnCompVram(gUnknown_08E9AC4C, (void *)VRAM + 0xF000); - LoadPalette(gPokenavConditionMenu2_Pal, 0x20, 0x20); - break; - case 9: - if (gUnknown_083DFEC4->unk76AA == 1) - { - sub_8095C8C((void *)VRAM + 0xF000, 0, 5, gUnknown_083E01AC, 0, 0, 9, 4, 9); - } - break; - case 10: - LZ77UnCompVram(gUnknown_08E9FEB4, (void *)VRAM + 0xB800); - break; - case 11: - LoadPalette(gUnknown_083E0254, 0x30, 0x20); - LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); - LoadPalette(&gPokenavConditionMenu2_Pal[2], 0xB1, 0x2); - LoadPalette(&gPokenavConditionMenu2_Pal[16], 0xB5, 0x2); - LoadPalette(&gPokenavConditionMenu2_Pal[30], 0xBF, 0x2); - sub_80F01A4(); - break; - case 12: - sub_80F01E0((u16)gUnknown_083DFEC4->unk8fe9); - break; - case 13: - REG_BG3CNT = 0x1E03; - REG_BG2CNT = 0x1702; - REG_BLDCNT = 0x844; - REG_BLDALPHA = 0x40B; - break; - default: - return FALSE; - } + switch (gUnknown_083DFEC4->unkD160) + { + case 0: + sub_80EEDE8(); + gUnknown_083DFEC4->unkD162[0] = 11; + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E7080); + break; + case 2: + MultistepInitMenuWindowBegin(&gWindowConfig_81E7080); + break; + case 3: + if (!MultistepInitMenuWindowContinue()) + return TRUE; + break; + case 4: + MenuZeroFillScreen(); + break; + case 5: + sub_80F1614(); + break; + case 6: + if (sub_80F162C(0)) + return TRUE; + break; + case 7: + LZ77UnCompVram(gPokenavConditionView_Gfx, (void *)VRAM + 0x5000); + break; + case 8: + LZ77UnCompVram(gUnknown_08E9AC4C, (void *)VRAM + 0xF000); + LoadPalette(gPokenavConditionMenu2_Pal, 0x20, 0x20); + break; + case 9: + if (gUnknown_083DFEC4->unk76AA == 1) + sub_8095C8C((void *)VRAM + 0xF000, 0, 5, gUnknown_083E01AC, 0, 0, 9, 4, 9); + break; + case 10: + LZ77UnCompVram(gUnknown_08E9FEB4, (void *)VRAM + 0xB800); + break; + case 11: + LoadPalette(gUnknown_083E0254, 0x30, 0x20); + LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); + LoadPalette(&gPokenavConditionMenu2_Pal[2], 0xB1, 0x2); + LoadPalette(&gPokenavConditionMenu2_Pal[16], 0xB5, 0x2); + LoadPalette(&gPokenavConditionMenu2_Pal[30], 0xBF, 0x2); + sub_80F01A4(); + break; + case 12: + sub_80F01E0((u16)gUnknown_083DFEC4->unk8fe9); + break; + case 13: + REG_BG3CNT = 0x1E03; + REG_BG2CNT = 0x1702; + REG_BLDCNT = 0x844; + REG_BLDALPHA = 0x40B; + break; + default: + return FALSE; + } - gUnknown_083DFEC4->unkD160++; - return TRUE; + gUnknown_083DFEC4->unkD160++; + return TRUE; } -void sub_80F0174(bool8 a) +void sub_80F0174(bool8 bg2on) { - if (a) - { - REG_DISPCNT |= DISPCNT_BG2_ON; - } - else - { - REG_DISPCNT &= ~DISPCNT_BG2_ON; - } + if (bg2on) + REG_DISPCNT |= DISPCNT_BG2_ON; + else + REG_DISPCNT &= ~DISPCNT_BG2_ON; } void sub_80F01A4(void) { - REG_WIN0H = WIN_RANGE(0, 240); - REG_WIN1H = WIN_RANGE(0, 155); - REG_WIN0V = WIN_RANGE(56, 121); - REG_WIN1V = WIN_RANGE(56, 121); - REG_WININ = 0x3F3F; - REG_WINOUT = 0x001B; + REG_WIN0H = WIN_RANGE(0, 240); + REG_WIN1H = WIN_RANGE(0, 155); + REG_WIN0V = WIN_RANGE(56, 121); + REG_WIN1V = WIN_RANGE(56, 121); + REG_WININ = 0x3F3F; + REG_WINOUT = 0x001B; } void sub_80F01E0(u16 a) { - MenuPrint(gUnknown_083DFEC4->unk8829[a], 13, 1); - - if (gUnknown_083DFEC4->unk76AA == 1) - { - MenuPrint(gUnknown_083DFEC4->unk88E9[a], 13, 3); - sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk2); - MenuPrint(gUnknown_083DFEC4->unk8788, 1, 6); - } + MenuPrint(gUnknown_083DFEC4->unk8829[a], 13, 1); + + if (gUnknown_083DFEC4->unk76AA == 1) + { + MenuPrint(gUnknown_083DFEC4->unk88E9[a], 13, 3); + sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk2); + MenuPrint(gUnknown_083DFEC4->unk8788, 1, 6); + } } void sub_80F0264(u8 a) { - gUnknown_083DFEC4->unk306 = 0; - gUnknown_083DFEC4->unk87CA = a; + gUnknown_083DFEC4->unk306 = 0; + gUnknown_083DFEC4->unk87CA = a; - if (gUnknown_083DFEC4->unk6DAC == 0) - { - while (sub_80F02A0()); - } + if (gUnknown_083DFEC4->unk6DAC == 0) + { + while (sub_80F02A0()) + ; + } } #ifdef NONMATCHING // small nonmatching part is in the third else clause in case 7. bool8 sub_80F02A0(void) { - const u16 *pointer; + const u16 *pointer; - switch (gUnknown_083DFEC4->unk306) - { - case 0: - sub_80EEDE8(); + switch (gUnknown_083DFEC4->unk306) + { + case 0: + sub_80EEDE8(); - gUnknown_083DFEC4->unk87C8 = gUnknown_083DFEC4->unk87CA == 1; - gUnknown_083DFEC4->unkD162[0] = 11; - break; - case 1: - SetUpWindowConfig(&gWindowConfig_81E70D4); - break; - case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E70D4); - break; - case 3: - if (!MultistepInitMenuWindowContinue()) - { - return TRUE; - } - break; - case 4: - MenuZeroFillScreen(); - break; - case 5: - LZ77UnCompVram(gUnknown_08E9FC64, (void *)VRAM + 0xE800); - break; - case 6: - LZ77UnCompVram(gPokenavConditionSearch2_Gfx, (void *)VRAM + 0x8000); - break; - case 7: - LoadPalette(gUnknown_083E02B4, 0xB0, 0x20); - LoadPalette(gUnknown_083E02B4, 0xF0, 0x20); - LoadPalette(gUnknown_083E0334, 0x40, 0x20); + gUnknown_083DFEC4->unk87C8 = gUnknown_083DFEC4->unk87CA == 1; + gUnknown_083DFEC4->unkD162[0] = 11; + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E70D4); + break; + case 2: + MultistepInitMenuWindowBegin(&gWindowConfig_81E70D4); + break; + case 3: + if (!MultistepInitMenuWindowContinue()) + { + return TRUE; + } + break; + case 4: + MenuZeroFillScreen(); + break; + case 5: + LZ77UnCompVram(gUnknown_08E9FC64, (void *)VRAM + 0xE800); + break; + case 6: + LZ77UnCompVram(gPokenavConditionSearch2_Gfx, (void *)VRAM + 0x8000); + break; + case 7: + LoadPalette(gUnknown_083E02B4, 0xB0, 0x20); + LoadPalette(gUnknown_083E02B4, 0xF0, 0x20); + LoadPalette(gUnknown_083E0334, 0x40, 0x20); - if (gUnknown_083DFEC4->unk87CA == 0) - { - LoadPalette(gPokenavConditionSearch2_Pal, 0x30, 0x20); - gPlttBufferUnfaded[0] = gPokenavConditionSearch2_Pal[5]; - LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); - LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2); - LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); - LoadPalette(&gPokenavConditionSearch2_Pal[5], 0xBF, 0x2); - } - else if (gUnknown_083DFEC4->unk87CA == 1) - { - LoadPalette(gUnknown_083E0274, 0x30, 0x20); - gPlttBufferUnfaded[0] = gUnknown_083E0274[5]; - LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); - LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2); - LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); - LoadPalette(&gUnknown_083E0274[5], 0xBF, 0x2); - } - else - { - LoadPalette(gUnknown_08E9F9E8, 0x30, 0x20); - pointer = &gUnknown_08E9F9E8[5]; - gPlttBufferUnfaded[0] = gUnknown_08E9F9E8[5]; - LoadPalette(gUnknown_083E0314, 0x50, 0x20); - LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2); - LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); - LoadPalette(pointer, 0xBF, 0x2); - LoadPalette(pointer, 0x5F, 0x2); - } - break; - case 8: - if (gUnknown_083DFEC4->unk87CA != 2) - { - sub_8095C8C((void *)VRAM + 0xE800, 0, 5, gUnknown_08E9FD1C, 0, 0, 9, 4, 9); - } - else - { - sub_8095C8C((void *)VRAM + 0xE800, 0, 4, gUnknown_08E9FE54, 0, 0, 12, 10, 12); - sub_8095C8C((void *)VRAM + 0xE800, 0, 8, gUnknown_08E9FD64, 0, 0, 12, 10, 12); - } - break; - case 9: - LZ77UnCompVram(gUnknown_083E0354, (void *)VRAM + 0x5000); - break; - case 10: - DmaClear16(3, (void *)VRAM + 0xF800, 0x800); - break; - case 11: - sub_80F0900(); - break; - case 12: - if (sub_80F0944()) - { - return TRUE; - } - break; - case 13: - if (gUnknown_083DFEC4->unk87CA != 2) - { - ShowMapNamePopUpWindow(); - } - else - { - sub_80F081C(0); - sub_80F0FFC(gUnknown_083DFEC4->unk876E); - } - break; - case 14: - REG_BG2CNT = 0x1D0A; - REG_BG3CNT = 0x1E03; - REG_BG0CNT = 0x1F01; - REG_BG3VOFS = 0xF8; - - gUnknown_083DFEC4->unk8776 = 0xF8; - gUnknown_083DFEC4->unk8778 = 0; - - REG_BLDCNT = 0; - gUnknown_083DFEC4->unkD160++; - return FALSE; - default: - return FALSE; - } - - gUnknown_083DFEC4->unk306++; - return TRUE; + if (gUnknown_083DFEC4->unk87CA == 0) + { + LoadPalette(gPokenavConditionSearch2_Pal, 0x30, 0x20); + gPlttBufferUnfaded[0] = gPokenavConditionSearch2_Pal[5]; + LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); + LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2); + LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); + LoadPalette(&gPokenavConditionSearch2_Pal[5], 0xBF, 0x2); + } + else if (gUnknown_083DFEC4->unk87CA == 1) + { + LoadPalette(gUnknown_083E0274, 0x30, 0x20); + gPlttBufferUnfaded[0] = gUnknown_083E0274[5]; + LoadPalette(gUnknownPalette_81E6692, 0xB0, 0x20); + LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2); + LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); + LoadPalette(&gUnknown_083E0274[5], 0xBF, 0x2); + } + else + { + LoadPalette(gUnknown_08E9F9E8, 0x30, 0x20); + pointer = &gUnknown_08E9F9E8[5]; + gPlttBufferUnfaded[0] = gUnknown_08E9F9E8[5]; + LoadPalette(gUnknown_083E0314, 0x50, 0x20); + LoadPalette(&gUnknown_083E02B4[1], 0xB1, 0x2); + LoadPalette(&gUnknown_083E02B4[8], 0xB5, 0x2); + LoadPalette(pointer, 0xBF, 0x2); + LoadPalette(pointer, 0x5F, 0x2); + } + break; + case 8: + if (gUnknown_083DFEC4->unk87CA != 2) + { + sub_8095C8C((void *)VRAM + 0xE800, 0, 5, gUnknown_08E9FD1C, 0, 0, 9, 4, 9); + } + else + { + sub_8095C8C((void *)VRAM + 0xE800, 0, 4, gUnknown_08E9FE54, 0, 0, 12, 10, 12); + sub_8095C8C((void *)VRAM + 0xE800, 0, 8, gUnknown_08E9FD64, 0, 0, 12, 10, 12); + } + break; + case 9: + LZ77UnCompVram(gUnknown_083E0354, (void *)VRAM + 0x5000); + break; + case 10: + DmaClear16(3, (void *)VRAM + 0xF800, 0x800); + break; + case 11: + sub_80F0900(); + break; + case 12: + if (sub_80F0944()) + { + return TRUE; + } + break; + case 13: + if (gUnknown_083DFEC4->unk87CA != 2) + { + ShowMapNamePopUpWindow(); + } + else + { + sub_80F081C(0); + sub_80F0FFC(gUnknown_083DFEC4->unk876E); + } + break; + case 14: + REG_BG2CNT = 0x1D0A; + REG_BG3CNT = 0x1E03; + REG_BG0CNT = 0x1F01; + REG_BG3VOFS = 0xF8; + + gUnknown_083DFEC4->unk8776 = 0xF8; + gUnknown_083DFEC4->unk8778 = 0; + + REG_BLDCNT = 0; + gUnknown_083DFEC4->unkD160++; + return FALSE; + default: + return FALSE; + } + + gUnknown_083DFEC4->unk306++; + return TRUE; } #else __attribute__((naked)) diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 9cf28a111..001cd85f6 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -1,13 +1,14 @@ #include "global.h" +#include "constants/species.h" #include "rom_8077ABC.h" #include "battle.h" #include "battle_anim.h" #include "blend_palette.h" +#include "contest.h" #include "data2.h" #include "decompress.h" #include "palette.h" #include "pokemon_icon.h" -#include "constants/species.h" #include "sprite.h" #include "task.h" #include "trig.h" @@ -31,52 +32,28 @@ #define gTransformPersonalities gTransformedPersonalities #define gBattleMonSprites gObjectBankIDs - -struct Struct_unk_2019348 { - u16 field_0; - u16 field_2; - u8 field_4; - u32 field_8; - u32 field_c; - u32 field_10; -}; - -struct TransformStatus { +struct TransformStatus +{ u16 unknown; u16 species; }; -struct Struct_gUnknown_0837F578 { +struct Struct_gUnknown_0837F578 +{ u8 field_0; u8 field_1; }; -struct Struct_2017810 { +struct Struct_2017810 +{ u8 filler_0[6]; u8 field_6; u8 filler_7[5]; }; -struct Color { - u16 r:5; - u16 g:5; - u16 b:5; -}; - -struct BGCnt { - u16 priority:2; - u16 charBase:2; - u16 unused:2; - u16 mosaic:1; - u16 colorMode:1; - u16 screenBase:5; - u16 overflow:1; - u16 size:2; -}; - -#define BG1CNT (*(volatile struct BGCnt*)REG_ADDR_BG1CNT) -#define BG2CNT (*(volatile struct BGCnt*)REG_ADDR_BG2CNT) -#define BG3CNT (*(volatile struct BGCnt*)REG_ADDR_BG3CNT) +#define BG1CNT (*(vBgCnt *)REG_ADDR_BG1CNT) +#define BG2CNT (*(vBgCnt *)REG_ADDR_BG2CNT) +#define BG3CNT (*(vBgCnt *)REG_ADDR_BG3CNT) extern struct OamData gOamData_837DF9C[]; extern const union AnimCmd *const gDummySpriteAnimTable[]; @@ -102,7 +79,8 @@ extern u8 UpdateMonIconFrame(struct Sprite *sprite); EWRAM_DATA union AffineAnimCmd *gUnknown_0202F7D4 = NULL; EWRAM_DATA u32 filler_0202F7D8[3] = {0}; -const struct Struct_gUnknown_0837F578 gUnknown_0837F578[][4] = { +const struct Struct_gUnknown_0837F578 gUnknown_0837F578[][4] = +{ { { 72, 80 }, { 176, 40 }, @@ -120,14 +98,16 @@ const struct Struct_gUnknown_0837F578 gUnknown_0837F578[][4] = { // One entry for each of the four Castform forms. // Coords are probably front pic coords or back pic coords, but this data does not seem to be // used during battle, party summary, or pokedex screens. -const struct MonCoords gCastformFrontSpriteCoords[] = { +const struct MonCoords gCastformFrontSpriteCoords[] = +{ { 0x44, 17 }, // NORMAL { 0x66, 9 }, // SUN { 0x46, 9 }, // RAIN { 0x86, 8 }, // HAIL }; -const u8 gCastformElevations[] = { +const u8 gCastformElevations[] = +{ 13, // NORMAL 14, // SUN 13, // RAIN @@ -135,14 +115,16 @@ const u8 gCastformElevations[] = { }; // Y position of the backsprite for each of the four Castform forms. -const u8 gCastformBackSpriteYCoords[] = { +const u8 gCastformBackSpriteYCoords[] = +{ 0, // NORMAL 0, // SUN 0, // RAIN 0, // HAIL }; -const struct SpriteTemplate gSpriteTemplate_837F5B0[] = { +const struct SpriteTemplate gSpriteTemplate_837F5B0[] = +{ { .tileTag = 55125, .paletteTag = 55125, @@ -151,7 +133,8 @@ const struct SpriteTemplate gSpriteTemplate_837F5B0[] = { .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, - }, { + }, + { .tileTag = 55126, .paletteTag = 55126, .oam = gOamData_837DF9C, @@ -162,23 +145,26 @@ const struct SpriteTemplate gSpriteTemplate_837F5B0[] = { } }; -const struct SpriteSheet gUnknown_0837F5E0[] = { +const struct SpriteSheet gUnknown_0837F5E0[] = +{ { gMiscBlank_Gfx, 0x800, 55125, }, { gMiscBlank_Gfx, 0x800, 55126, }, }; -u8 GetBankPosition(u8 slot, u8 a2) { +u8 GetBankPosition(u8 slot, u8 a2) +{ u8 var; u16 species; struct TransformStatus *transform; - if (IsContest()) { - if (a2 == 3 && slot == 3) { + if (IsContest()) + { + if (a2 == 3 && slot == 3) a2 = 1; - } } - switch (a2) { + switch (a2) + { case 0: case 2: var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBankIdentity(slot)].field_0; @@ -189,339 +175,402 @@ u8 GetBankPosition(u8 slot, u8 a2) { case 3: case 4: default: - if (IsContest()) { - if (ewram19348.unk4 & 1) { - species = ewram19348.unk2; - } else { - species = ewram19348.unk0; - } - } else { - if (GetBankSide(slot)) { + if (IsContest()) + { + if (shared19348.unk4_0) + species = shared19348.unk2; + else + species = shared19348.unk0; + } + else + { + if (GetBankSide(slot)) + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - } else { + else species = transform->species; - } - } else { + } + else + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - } else { + else species = transform->species; - } } } - if (a2 == 3) { + if (a2 == 3) var = sub_8077E44(slot, species, 1); - } else { + else var = sub_8077E44(slot, species, 0); - } break; } return var; } -u8 sub_8077BFC(u8 slot, u16 species) { +u8 sub_8077BFC(u8 slot, u16 species) +{ u16 letter; u32 personality; struct TransformStatus *transform; u8 ret; u16 var; - if (!GetBankSide(slot) || IsContest()) { - if (species == SPECIES_UNOWN) { - if (IsContest()) { - if (ewram19348.unk4 & 1) { - personality = ewram19348.unk10; - } else { - personality = ewram19348.unk8; - } - } else { + if (GetBankSide(slot) == 0 || IsContest()) + { + if (species == SPECIES_UNOWN) + { + if (IsContest()) + { + if (shared19348.unk4_0) + personality = shared19348.unk10; + else + personality = shared19348.unk8; + } + else + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { + else personality = gTransformPersonalities[slot]; - } } letter = GET_UNOWN_LETTER(personality); - if (!letter) { + if (!letter) var = species; - } else { + else var = letter + SPECIES_UNOWN_B - 1; - } ret = gMonBackPicCoords[var].y_offset; - } else if (species == SPECIES_CASTFORM) { + } + else if (species == SPECIES_CASTFORM) + { ret = gCastformBackSpriteYCoords[gBattleMonForms[slot]]; - } else if (species > NUM_SPECIES) { + } + else if (species > NUM_SPECIES) + { ret = gMonBackPicCoords[0].y_offset; - } else { + } + else + { ret = gMonBackPicCoords[species].y_offset; } - } else { - if (species == SPECIES_UNOWN) { + } + else + { + if (species == SPECIES_UNOWN) + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { + else personality = gTransformPersonalities[slot]; - } letter = GET_UNOWN_LETTER(personality); - if (!letter) { + if (!letter) var = species; - } else { + else var = letter + SPECIES_UNOWN_B - 1; - } ret = gMonFrontPicCoords[var].y_offset; - } else if (species == SPECIES_CASTFORM) { + } + else if (species == SPECIES_CASTFORM) + { ret = gCastformFrontSpriteCoords[gBattleMonForms[slot]].y_offset; - } else if (species > NUM_SPECIES) { + } + else if (species > NUM_SPECIES) + { ret = gMonFrontPicCoords[0].y_offset; - } else { + } + else + { ret = gMonFrontPicCoords[species].y_offset; } } return ret; } -u8 sub_8077DD8(u8 slot, u16 species) { +u8 sub_8077DD8(u8 slot, u16 species) +{ u8 ret = 0; - if (GetBankSide(slot) == 1) { - if (!IsContest()) { - if (species == SPECIES_CASTFORM) { + if (GetBankSide(slot) == 1) + { + if (!IsContest()) + { + if (species == SPECIES_CASTFORM) ret = gCastformElevations[gBattleMonForms[slot]]; - } else if (species > NUM_SPECIES) { + else if (species > NUM_SPECIES) ret = gEnemyMonElevation[0]; - } else { + else ret = gEnemyMonElevation[species]; - } } } return ret; } -u8 sub_8077E44(u8 slot, u16 species, u8 a3) { +u8 sub_8077E44(u8 slot, u16 species, u8 a3) +{ u16 offset; u8 y; - if (GetBankSide(slot) == 0 || IsContest()) { + + if (GetBankSide(slot) == 0 || IsContest()) + { offset = sub_8077BFC(slot, species); - } else { + } + else + { offset = sub_8077BFC(slot, species); offset -= sub_8077DD8(slot, species); } y = offset + gUnknown_0837F578[IS_DOUBLE_BATTLE()][GetBankIdentity(slot)].field_1; - if (a3) { - if (GetBankSide(slot) == 0) { + if (a3) + { + if (GetBankSide(slot) == 0) y += 8; - } - if (y > 104) y = 104; + if (y > 104) + y = 104; } return y; } -u8 sub_8077EE4(u8 slot, u8 a2) { +u8 sub_8077EE4(u8 slot, u8 a2) +{ u16 species; struct TransformStatus *transform; - if (a2 == 3 || a2 == 4) { - if (IsContest()) { - if (ewram19348.unk4 & 1) { - species = ewram19348.unk2; - } else { - species = ewram19348.unk0; - } - } else { + if (a2 == 3 || a2 == 4) + { + if (IsContest()) + { + if (shared19348.unk4_0) + species = shared19348.unk2; + else + species = shared19348.unk0; + } + else + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) species = gAnimSpeciesByBanks[slot]; - } else { + else species = transform->species; - } } - if (a2 == 3) { + if (a2 == 3) return sub_8077E44(slot, species, 1); - } else { + else return sub_8077E44(slot, species, 0); - } - } else { + } + else + { return GetBankPosition(slot, a2); } } -u8 sub_8077F68(u8 slot) { +u8 sub_8077F68(u8 slot) +{ return GetBankPosition(slot, 4); } -u8 sub_8077F7C(u8 slot) { +u8 sub_8077F7C(u8 slot) +{ u16 var; - if (GetBankSide(slot)) { + if (GetBankSide(slot) != 0) var = GetBankPosition(slot, 1) + 16; - } else { + else var = GetBankPosition(slot, 1) + 17; - } return var; } -u8 sub_8077FC0(u8 slot) { +u8 sub_8077FC0(u8 slot) +{ u16 var; u8 r6; struct TransformStatus *transform; + r6 = GetBankPosition(slot, 1); - if (!IsContest()) { - if (GetBankSide(slot)) { + if (!IsContest()) + { + if (GetBankSide(slot) != 0) + { transform = &eTransformStatuses[slot]; if (!transform->species) { var = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); } else { var = transform->species; } - } else { + } + else + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) var = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - } else { + else var = transform->species; - } } - if (GetBankSide(slot)) { + if (GetBankSide(slot) != 0) r6 -= sub_8077DD8(slot, var); - } } return r6; } -u8 GetAnimBankSpriteId(u8 whichBank) { +u8 GetAnimBankSpriteId(u8 whichBank) +{ u8 *sprites; - if (whichBank == ANIM_BANK_ATTACKER) { - if (IsBankSpritePresent(gAnimBankAttacker)) { + + if (whichBank == ANIM_BANK_ATTACKER) + { + if (IsBankSpritePresent(gAnimBankAttacker)) + { sprites = gBattleMonSprites; return sprites[gAnimBankAttacker]; - } else { + } + else + { return 0xff; } - } else if (whichBank == ANIM_BANK_TARGET) { - if (IsBankSpritePresent(gAnimBankTarget)) { + } + else if (whichBank == ANIM_BANK_TARGET) + { + if (IsBankSpritePresent(gAnimBankTarget)) + { sprites = gBattleMonSprites; return sprites[gAnimBankTarget]; - } else { + } + else + { return 0xff; } - } else if (whichBank == ANIM_BANK_ATK_PARTNER) { - if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { + } + else if (whichBank == ANIM_BANK_ATK_PARTNER) + { + if (!IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) return 0xff; - } else { + else return gBattleMonSprites[gAnimBankAttacker ^ 2]; - } - } else { - if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + } + else + { + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) return gBattleMonSprites[gAnimBankTarget ^ 2]; - } else { + else return 0xff; - } } } -void StoreSpriteCallbackInData(struct Sprite *sprite, void (*callback)(struct Sprite*)) { +void StoreSpriteCallbackInData(struct Sprite *sprite, void (*callback)(struct Sprite*)) +{ sprite->data[6] = (u32)(callback) & 0xffff; sprite->data[7] = (u32)(callback) >> 16; } -void SetCallbackToStoredInData(struct Sprite *sprite) { +void SetCallbackToStoredInData(struct Sprite *sprite) +{ u32 callback = (u16)sprite->data[6] | (sprite->data[7] << 16); sprite->callback = (void (*)(struct Sprite *))callback; } -void sub_8078114(struct Sprite *sprite) { - if (sprite->data[3]) { +void sub_8078114(struct Sprite *sprite) +{ + if (sprite->data[3]) + { sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]); sprite->data[0] += sprite->data[2]; - if (sprite->data[0] >= 0x100) { + if (sprite->data[0] >= 0x100) sprite->data[0] -= 0x100; - } else if (sprite->data[0] < 0) { + else if (sprite->data[0] < 0) sprite->data[0] += 0x100; - } sprite->data[3]--; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void sub_8078174(struct Sprite *sprite) { - if (sprite->data[3]) { +void sub_8078174(struct Sprite *sprite) +{ + if (sprite->data[3]) + { sprite->pos2.x = Sin(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); sprite->pos2.y = Cos(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]); sprite->data[0] += sprite->data[2]; sprite->data[5] += sprite->data[4]; - if (sprite->data[0] >= 0x100) { + if (sprite->data[0] >= 0x100) sprite->data[0] -= 0x100; - } else if (sprite->data[0] < 0) { + else if (sprite->data[0] < 0) sprite->data[0] += 0x100; - } sprite->data[3]--; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void unref_sub_80781F0(struct Sprite *sprite) { - if (sprite->data[3]) { +void unref_sub_80781F0(struct Sprite *sprite) +{ + if (sprite->data[3]) + { sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); sprite->pos2.y = Cos(sprite->data[4], sprite->data[1]); sprite->data[0] += sprite->data[2]; sprite->data[4] += sprite->data[5]; - if (sprite->data[0] >= 0x100) { + if (sprite->data[0] >= 0x100) sprite->data[0] -= 0x100; - } else if (sprite->data[0] < 0) { + else if (sprite->data[0] < 0) sprite->data[0] += 0x100; - } - if (sprite->data[4] >= 0x100) { + if (sprite->data[4] >= 0x100) sprite->data[4] -= 0x100; - } else if (sprite->data[4] < 0) { + else if (sprite->data[4] < 0) sprite->data[4] += 0x100; - } sprite->data[3]--; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void sub_8078278(struct Sprite *sprite) { - if (sprite->data[3]) { +void sub_8078278(struct Sprite *sprite) +{ + if (sprite->data[3]) + { sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]); sprite->pos2.y = Cos(sprite->data[0], sprite->data[4]); sprite->data[0] += sprite->data[2]; - if (sprite->data[0] >= 0x100) { + if (sprite->data[0] >= 0x100) sprite->data[0] -= 0x100; - } else if (sprite->data[0] < 0) { + else if (sprite->data[0] < 0) sprite->data[0] += 0x100; - } sprite->data[3]--; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void sub_80782D8(struct Sprite *sprite) { - if (sprite->data[0] > 0) { +void sub_80782D8(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) sprite->data[0]--; - } else { + else SetCallbackToStoredInData(sprite); - } } -void sub_80782F8(struct Sprite *sprite) { +void sub_80782F8(struct Sprite *sprite) +{ sub_8078314(sprite); sprite->callback = sub_8078364; sprite->callback(sprite); } -void sub_8078314(struct Sprite *sprite) { +void sub_8078314(struct Sprite *sprite) +{ s16 old; int v1; - if (sprite->data[1] > sprite->data[2]) { + + if (sprite->data[1] > sprite->data[2]) sprite->data[0] = -sprite->data[0]; - } v1 = sprite->data[2] - sprite->data[1]; old = sprite->data[0]; sprite->data[0] = abs(v1 / sprite->data[0]); @@ -529,42 +578,55 @@ void sub_8078314(struct Sprite *sprite) { sprite->data[1] = old; } -void sub_8078364(struct Sprite *sprite) { - if (sprite->data[0] > 0) { +void sub_8078364(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { sprite->data[0]--; sprite->pos2.x += sprite->data[1]; sprite->pos2.y += sprite->data[2]; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void sub_8078394(struct Sprite *sprite) { - if (sprite->data[0] > 0) { +void sub_8078394(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { sprite->data[0]--; sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; sprite->pos2.x = sprite->data[3] >> 8; sprite->pos2.y = sprite->data[4] >> 8; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void sub_80783D0(struct Sprite *sprite) { - if (sprite->data[0] > 0) { +void sub_80783D0(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { sprite->data[0]--; sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; sprite->pos2.x = sprite->data[3] >> 8; sprite->pos2.y = sprite->data[4] >> 8; - } else { + } + else + { SetCallbackToStoredInData(sprite); } UpdateMonIconFrame(sprite); } -void unref_sub_8078414(struct Sprite *sprite) { +void unref_sub_8078414(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); @@ -572,51 +634,65 @@ void unref_sub_8078414(struct Sprite *sprite) { sprite->callback = sub_80782F8; } -void sub_8078458(struct Sprite *sprite) { - if (sprite->data[0] > 0) { +void sub_8078458(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { sprite->data[0]--; gSprites[sprite->data[3]].pos2.x += sprite->data[1]; gSprites[sprite->data[3]].pos2.y += sprite->data[2]; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void sub_80784A8(struct Sprite *sprite) { - if (sprite->data[0] > 0) { +void sub_80784A8(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { sprite->data[0]--; sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; gSprites[sprite->data[5]].pos2.x = sprite->data[3] >> 8; gSprites[sprite->data[5]].pos2.y = sprite->data[4] >> 8; - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void sub_8078504(struct Sprite *sprite) { - if (sprite->data[0] > 0) { +void sub_8078504(struct Sprite *sprite) +{ + if (sprite->data[0] > 0) + { sprite->data[0]--; sprite->pos2.x = sprite->data[2] >> 8; sprite->data[2] += sprite->data[1]; sprite->pos2.y = sprite->data[4] >> 8; sprite->data[4] += sprite->data[3]; - if (sprite->data[0] % sprite->data[5] == 0) { - if (sprite->data[5]) { + if (sprite->data[0] % sprite->data[5] == 0) + { + if (sprite->data[5]) sprite->invisible ^= 1; - } } - } else { + } + else + { SetCallbackToStoredInData(sprite); } } -void move_anim_8074EE0(struct Sprite *sprite) { +void move_anim_8074EE0(struct Sprite *sprite) +{ FreeSpriteOamMatrix(sprite); DestroyAnimSprite(sprite); } -void unref_sub_8078588(struct Sprite *sprite) { +void unref_sub_8078588(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x + sprite->pos2.x; sprite->data[3] = sprite->pos1.y + sprite->pos2.y; sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); @@ -624,57 +700,68 @@ void unref_sub_8078588(struct Sprite *sprite) { sprite->callback = sub_80782F8; } -void unref_sub_80785CC(struct Sprite *sprite) { +void unref_sub_80785CC(struct Sprite *sprite) +{ ResetPaletteStructByUid(sprite->data[5]); move_anim_8074EE0(sprite); } -void sub_80785E4(struct Sprite *sprite) { - if (sprite->affineAnimEnded) { +void sub_80785E4(struct Sprite *sprite) +{ + if (sprite->affineAnimEnded) SetCallbackToStoredInData(sprite); - } } -void sub_8078600(struct Sprite *sprite) { - if (sprite->animEnded) { +void sub_8078600(struct Sprite *sprite) +{ + if (sprite->animEnded) SetCallbackToStoredInData(sprite); - } } -void sub_807861C(struct Sprite *sprite) { +void sub_807861C(struct Sprite *sprite) +{ REG_BLDCNT = 0; REG_BLDALPHA = 0; DestroyAnimSprite(sprite); } -void sub_8078634(u8 task) { +void sub_8078634(u8 task) +{ REG_BLDCNT = 0; REG_BLDALPHA = 0; DestroyAnimVisualTask(task); } -void sub_8078650(struct Sprite *sprite) { +void sub_8078650(struct Sprite *sprite) +{ sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); } -void sub_807867C(struct Sprite *sprite, s16 a2) { +void sub_807867C(struct Sprite *sprite, s16 a2) +{ u16 v1 = GetBankPosition(gAnimBankAttacker, 0); u16 v2 = GetBankPosition(gAnimBankTarget, 0); - if (v1 > v2) { + + if (v1 > v2) + { sprite->pos1.x -= a2; - } else if (v1 < v2) { + } + else if (v1 < v2) + { sprite->pos1.x += a2; - } else { - if (GetBankSide(gAnimBankAttacker)) { + } + else + { + if (GetBankSide(gAnimBankAttacker) != 0) sprite->pos1.x -= a2; - } else { + else sprite->pos1.x += a2; - } } } -void sub_80786EC(struct Sprite *sprite) { +void sub_80786EC(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; obj_translate_based_on_private_1_2_3_4(sprite); @@ -682,24 +769,27 @@ void sub_80786EC(struct Sprite *sprite) { sprite->data[7] = 0; } -bool8 sub_8078718(struct Sprite *sprite) { - if (sub_8078B5C(sprite)) { +bool8 sub_8078718(struct Sprite *sprite) +{ + if (sub_8078B5C(sprite)) return TRUE; - } sprite->data[7] += sprite->data[6]; sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]); return FALSE; } -void oamt_add_pos2_onto_pos1(struct Sprite *sprite) { +void oamt_add_pos2_onto_pos1(struct Sprite *sprite) +{ sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.x = 0; sprite->pos2.y = 0; } -void sub_8078764(struct Sprite *sprite, u8 a2) { - if (!a2) { +void sub_8078764(struct Sprite *sprite, u8 a2) +{ + if (!a2) + { sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 0); sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 1); } @@ -707,11 +797,15 @@ void sub_8078764(struct Sprite *sprite, u8 a2) { sprite->pos1.y += gBattleAnimArgs[1]; } -void sub_80787B0(struct Sprite *sprite, u8 a2) { - if (!a2) { +void sub_80787B0(struct Sprite *sprite, u8 a2) +{ + if (!a2) + { sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0); sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1); - } else { + } + else + { sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 2); sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 3); } @@ -719,103 +813,127 @@ void sub_80787B0(struct Sprite *sprite, u8 a2) { sprite->pos1.y += gBattleAnimArgs[1]; } -u8 GetBankSide(u8 slot) { +u8 GetBankSide(u8 slot) +{ return gBanksBySide[slot] & 1; } -u8 GetBankIdentity(u8 slot) { +u8 GetBankIdentity(u8 slot) +{ return gBanksBySide[slot]; } -u8 GetBankByPlayerAI(u8 slot) { +u8 GetBankByPlayerAI(u8 slot) +{ u8 i; - for (i = 0; i < gNoOfAllBanks; i++) { - if (gBanksBySide[i] == slot) { + + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBanksBySide[i] == slot) break; - } } return i; } -bool8 IsBankSpritePresent(u8 slot) { - if (IsContest()) { - if (gAnimBankAttacker == slot) { +bool8 IsBankSpritePresent(u8 slot) +{ + if (IsContest()) + { + if (gAnimBankAttacker == slot) return TRUE; - } - if (gAnimBankTarget == slot) { + if (gAnimBankTarget == slot) return TRUE; - } return FALSE; - } else { - if (gBanksBySide[slot] == 0xff) { + } + else + { + if (gBanksBySide[slot] == 0xff) return FALSE; - } - if (GetBankSide(slot)) { - if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) { + if (GetBankSide(slot)) + { + if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) return TRUE; - } - } else { - if (GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) { + } + else + { + if (GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) return TRUE; - } } return FALSE; } } -bool8 IsDoubleBattle() { +bool8 IsDoubleBattle() +{ return IS_DOUBLE_BATTLE(); } -void sub_8078914(struct Struct_sub_8078914 *unk) { - if (IsContest()) { - unk->field_0 = (u8 *)0x6008000; - unk->field_4 = (u8 *)0x600f000; +void sub_8078914(struct Struct_sub_8078914 *unk) +{ + if (IsContest()) + { + unk->field_0 = (u8 *)(VRAM + 0x8000); + unk->field_4 = (u8 *)(VRAM + 0xf000); unk->field_8 = 0xe; - } else { - unk->field_0 = (u8 *)0x6004000; - unk->field_4 = (u8 *)0x600e000; + } + else + { + unk->field_0 = (u8 *)(VRAM + 0x4000); + unk->field_4 = (u8 *)(VRAM + 0xe000); unk->field_8 = 0x8; } } -void sub_8078954(struct Struct_sub_8078914 *unk) { - if (IsContest()) { - unk->field_0 = (u8 *)0x6008000; - unk->field_4 = (u8 *)0x600f000; +void sub_8078954(struct Struct_sub_8078914 *unk) +{ + if (IsContest()) + { + unk->field_0 = (u8 *)(VRAM + 0x8000); + unk->field_4 = (u8 *)(VRAM + 0xf000); unk->field_8 = 0xe; - } else if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) { - unk->field_0 = (u8 *)0x6004000; - unk->field_4 = (u8 *)0x600e000; + } + else if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) + { + unk->field_0 = (u8 *)(VRAM + 0x4000); + unk->field_4 = (u8 *)(VRAM + 0xe000); unk->field_8 = 0x8; - } else { - unk->field_0 = (u8 *)0x6006000; - unk->field_4 = (u8 *)0x600f000; + } + else + { + unk->field_0 = (u8 *)(VRAM + 0x6000); + unk->field_4 = (u8 *)(VRAM + 0xf000); unk->field_8 = 0x9; } } -u8 sub_80789BC() { - if (IsContest()) { +u8 sub_80789BC() +{ + if (IsContest()) return 1; - } return 2; } -void sub_80789D4(bool8 a1) { - if (!a1) { - BG3CNT.size = 0; - BG3CNT.overflow = 1; - } else if (IsContest()) { - BG3CNT.size = 0; - BG3CNT.overflow = 1; - } else { - BG3CNT.size = 1; - BG3CNT.overflow = 0; +void sub_80789D4(bool8 a1) +{ + if (!a1) + { + BG3CNT.screenSize = 0; + BG3CNT.areaOverflowMode = 1; + } + else if (IsContest()) + { + BG3CNT.screenSize = 0; + BG3CNT.areaOverflowMode = 1; + } + else + { + BG3CNT.screenSize = 1; + BG3CNT.areaOverflowMode = 0; } } -void sub_8078A34(struct Sprite *sprite) { +void sub_8078A34(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sub_8078A5C(sprite); @@ -823,7 +941,8 @@ void sub_8078A34(struct Sprite *sprite) { sprite->callback(sprite); } -void sub_8078A5C(struct Sprite *sprite) { +void sub_8078A5C(struct Sprite *sprite) +{ s16 x = (sprite->data[2] - sprite->data[1]) << 8; s16 y = (sprite->data[4] - sprite->data[3]) << 8; sprite->data[1] = x / sprite->data[0]; @@ -832,32 +951,36 @@ void sub_8078A5C(struct Sprite *sprite) { sprite->data[3] = 0; } -void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite) { +void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite) +{ int x = sprite->data[2] - sprite->data[1]; int y = sprite->data[4] - sprite->data[3]; bool8 r8 = x < 0; bool8 r9 = y < 0; u16 x2 = abs(x) << 8; u16 y2 = abs(y) << 8; + x2 = x2 / sprite->data[0]; y2 = y2 / sprite->data[0]; - if (r8) { + + if (r8) x2 |= 1; - } else { + else x2 &= ~1; - } - if (r9) { + + if (r9) y2 |= 1; - } else { + else y2 &= ~1; - } + sprite->data[1] = x2; sprite->data[2] = y2; sprite->data[4] = 0; sprite->data[3] = 0; } -void sub_8078B34(struct Sprite *sprite) { +void sub_8078B34(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; obj_translate_based_on_private_1_2_3_4(sprite); @@ -865,46 +988,51 @@ void sub_8078B34(struct Sprite *sprite) { sprite->callback(sprite); } -bool8 sub_8078B5C(struct Sprite *sprite) { +bool8 sub_8078B5C(struct Sprite *sprite) +{ u16 v1, v2, x, y; - if (!sprite->data[0]) { + + if (!sprite->data[0]) return TRUE; - } + v1 = sprite->data[1]; v2 = sprite->data[2]; x = sprite->data[3]; y = sprite->data[4]; x += v1; y += v2; - if (v1 & 1) { + + if (v1 & 1) sprite->pos2.x = -(x >> 8); - } else { + else sprite->pos2.x = x >> 8; - } - if (v2 & 1) { + + if (v2 & 1) sprite->pos2.y = -(y >> 8); - } else { + else sprite->pos2.y = y >> 8; - } + sprite->data[3] = x; sprite->data[4] = y; sprite->data[0]--; return FALSE; } -void sub_8078BB8(struct Sprite *sprite) { - if (sub_8078B5C(sprite)) { +void sub_8078BB8(struct Sprite *sprite) +{ + if (sub_8078B5C(sprite)) SetCallbackToStoredInData(sprite); - } } -void sub_8078BD4(struct Sprite *sprite) { +void sub_8078BD4(struct Sprite *sprite) +{ int v1 = abs(sprite->data[2] - sprite->data[1]) << 8; sprite->data[0] = v1 / sprite->data[0]; obj_translate_based_on_private_1_2_3_4(sprite); } -void sub_8078C00(struct Sprite *sprite) { +void sub_8078C00(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sub_8078BD4(sprite); @@ -912,32 +1040,36 @@ void sub_8078C00(struct Sprite *sprite) { sprite->callback(sprite); } -void sub_8078C28(struct Sprite *sprite) { +void sub_8078C28(struct Sprite *sprite) +{ int x = sprite->data[2] - sprite->data[1]; int y = sprite->data[4] - sprite->data[3]; bool8 x_sign = x < 0; bool8 y_sign = y < 0; u16 x2 = abs(x) << 4; u16 y2 = abs(y) << 4; + x2 /= sprite->data[0]; y2 /= sprite->data[0]; - if (x_sign) { + + if (x_sign) x2 |= 1; - } else { + else x2 &= ~1; - } - if (y_sign) { + + if (y_sign) y2 |= 1; - } else { + else y2 &= ~1; - } + sprite->data[1] = x2; sprite->data[2] = y2; sprite->data[4] = 0; sprite->data[3] = 0; } -void sub_8078CC0(struct Sprite *sprite) { +void sub_8078CC0(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sub_8078C28(sprite); @@ -945,46 +1077,51 @@ void sub_8078CC0(struct Sprite *sprite) { sprite->callback(sprite); } -bool8 sub_8078CE8(struct Sprite *sprite) { +bool8 sub_8078CE8(struct Sprite *sprite) +{ u16 v1, v2, x, y; - if (!sprite->data[0]) { + + if (!sprite->data[0]) return TRUE; - } + v1 = sprite->data[1]; v2 = sprite->data[2]; x = sprite->data[3]; y = sprite->data[4]; x += v1; y += v2; - if (v1 & 1) { + + if (v1 & 1) sprite->pos2.x = -(x >> 4); - } else { + else sprite->pos2.x = x >> 4; - } - if (v2 & 1) { + + if (v2 & 1) sprite->pos2.y = -(y >> 4); - } else { + else sprite->pos2.y = y >> 4; - } + sprite->data[3] = x; sprite->data[4] = y; sprite->data[0]--; return FALSE; } -void sub_8078D44(struct Sprite *sprite) { - if (sub_8078CE8(sprite)) { +void sub_8078D44(struct Sprite *sprite) +{ + if (sub_8078CE8(sprite)) SetCallbackToStoredInData(sprite); - } } -void sub_8078D60(struct Sprite *sprite) { +void sub_8078D60(struct Sprite *sprite) +{ int v1 = abs(sprite->data[2] - sprite->data[1]) << 4; sprite->data[0] = v1 / sprite->data[0]; sub_8078C28(sprite); } -void sub_8078D8C(struct Sprite *sprite) { +void sub_8078D8C(struct Sprite *sprite) +{ sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sub_8078D60(sprite); @@ -992,16 +1129,17 @@ void sub_8078D8C(struct Sprite *sprite) { sprite->callback(sprite); } -void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) { +void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) +{ int i; struct ObjAffineSrcData src; struct OamMatrix matrix; + src.xScale = xScale; src.yScale = yScale; src.rotation = rotation; - if (sub_8078E38()) { + if (sub_8078E38()) src.xScale = -src.xScale; - } i = gSprites[sprite].oam.matrixNum; ObjAffineSet(&src, &matrix, 1, 2); gOamMatrices[i].a = matrix.a; @@ -1010,31 +1148,33 @@ void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) { gOamMatrices[i].d = matrix.d; } -bool8 sub_8078E38() { - if (IsContest()) { - if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */) { +bool8 sub_8078E38() +{ + if (IsContest()) + { + if (gSprites[GetAnimBankSpriteId(0)].data[2] == 0xc9 /* XXX SPECIES_UNOWN? */) return FALSE; - } return TRUE; } return FALSE; } -void sub_8078E70(u8 sprite, u8 a2) { +void sub_8078E70(u8 sprite, u8 a2) +{ u8 r7 = gSprites[sprite].data[0]; - if (IsContest() || IsAnimBankSpriteVisible(r7)) { + + if (IsContest() || IsAnimBankSpriteVisible(r7)) gSprites[sprite].invisible = FALSE; - } gSprites[sprite].oam.objMode = a2; gSprites[sprite].affineAnimPaused = TRUE; - if (!IsContest() && !gSprites[sprite].oam.affineMode) { + if (!IsContest() && !gSprites[sprite].oam.affineMode) gSprites[sprite].oam.matrixNum = ewram17810[r7].unk6; - } gSprites[sprite].oam.affineMode = 3; CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode); } -void sub_8078F40(u8 sprite) { +void sub_8078F40(u8 sprite) +{ obj_id_set_rotscale(sprite, 0x100, 0x100, 0); gSprites[sprite].oam.affineMode = 1; gSprites[sprite].oam.objMode = 0; @@ -1042,31 +1182,33 @@ void sub_8078F40(u8 sprite) { CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode); } -void sub_8078F9C(u8 sprite) { +void sub_8078F9C(u8 sprite) +{ u16 matrix = gSprites[sprite].oam.matrixNum; s16 c = gOamMatrices[matrix].c; - if (c < 0) { + + if (c < 0) c = -c; - } gSprites[sprite].pos2.y = c >> 3; } // related to obj_id_set_rotscale -void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation) { +void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation) +{ int i; struct ObjAffineSrcData src; struct OamMatrix matrix; - if (sprite->oam.affineMode & 1) { + + if (sprite->oam.affineMode & 1) + { sprite->affineAnimPaused = TRUE; - if (a2) { + if (a2) CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - } src.xScale = xScale; src.yScale = yScale; src.rotation = rotation; - if (sub_8078E38()) { + if (sub_8078E38()) src.xScale = -src.xScale; - } i = sprite->oam.matrixNum; ObjAffineSet(&src, &matrix, 1, 2); gOamMatrices[i].a = matrix.a; @@ -1076,56 +1218,67 @@ void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 ro } } -void sub_8079098(struct Sprite *sprite) { +void sub_8079098(struct Sprite *sprite) +{ sub_8078FDC(sprite, TRUE, 0x100, 0x100, 0); sprite->affineAnimPaused = FALSE; CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); } -static u16 ArcTan2_(s16 a, s16 b) { +static u16 ArcTan2_(s16 a, s16 b) +{ return ArcTan2(a, b); } -u16 sub_80790F0(s16 a, s16 b) { +u16 sub_80790F0(s16 a, s16 b) +{ u16 var = ArcTan2_(a, b); return -var; } -void sub_8079108(u16 a1, bool8 a2) { +void sub_8079108(u16 a1, bool8 a2) +{ int i; - struct Color *c; - struct Color *c2; + struct PlttData *c; + struct PlttData *c2; u16 average; a1 *= 0x10; - if (!a2) { - for (i = 0; i < 0x10; i++) { - c = (struct Color *)&gPlttBufferUnfaded[a1 + i]; + if (!a2) + { + for (i = 0; i < 0x10; i++) + { + c = (struct PlttData *)&gPlttBufferUnfaded[a1 + i]; average = c->r + c->g + c->b; average /= 3; - c2 = (struct Color *)&gPlttBufferFaded[a1 + i]; + c2 = (struct PlttData *)&gPlttBufferFaded[a1 + i]; c2->r = average; c2->g = average; c2->b = average; } - } else { + } + else + { CpuCopy32(&gPlttBufferUnfaded[a1], &gPlttBufferFaded[a1], 0x20); } } -u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) { +u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) +{ u32 var = 0; u32 shift; - if (a1) { - if (!IsContest()) { + + if (a1) + { + if (!IsContest()) var = 0xe; - } else { + else var = 1 << sub_80789BC(); - } } - if (a2) { + if (a2) + { shift = gAnimBankAttacker + 16; var |= 1 << shift; } @@ -1133,61 +1286,77 @@ u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) { shift = gAnimBankTarget + 16; var |= 1 << shift; } - if (a4) { - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { + if (a4) + { + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + { shift = (gAnimBankAttacker ^ 2) + 16; var |= 1 << shift; } } - if (a5) { - if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + if (a5) + { + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) + { shift = (gAnimBankTarget ^ 2) + 16; var |= 1 << shift; } } - if (a6) { - if (!IsContest()) { + if (a6) + { + if (!IsContest()) var |= 0x100; - } else { + else var |= 0x4000; - } } - if (a7) { - if (!IsContest()) { + if (a7) + { + if (!IsContest()) var |= 0x200; - } } return var; } -u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) { +u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) +{ u32 var = 0; u32 shift; - if (IsContest()) { - if (a1) { + + if (IsContest()) + { + if (a1) + { var |= 1 << 18; return var; } - } else { - if (a1) { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(0))) { + } + else + { + if (a1) + { + if (IsAnimBankSpriteVisible(GetBankByPlayerAI(0))) var |= 1 << (GetBankByPlayerAI(0) + 16); - } } - if (a2) { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(2))) { + if (a2) + { + if (IsAnimBankSpriteVisible(GetBankByPlayerAI(2))) + { shift = GetBankByPlayerAI(2) + 16; var |= 1 << shift; } } - if (a3) { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(1))) { + if (a3) + { + if (IsAnimBankSpriteVisible(GetBankByPlayerAI(1))) + { shift = GetBankByPlayerAI(1) + 16; var |= 1 << shift; } } - if (a4) { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(3))) { + if (a4) + { + if (IsAnimBankSpriteVisible(GetBankByPlayerAI(3))) + { shift = GetBankByPlayerAI(3) + 16; var |= 1 << shift; } @@ -1196,51 +1365,57 @@ u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) { return var; } -u8 sub_80793A8(u8 a1) { +u8 sub_80793A8(u8 a1) +{ return a1; } -u8 unref_sub_80793B0(u8 a1) { +u8 unref_sub_80793B0(u8 a1) +{ return GetBankByPlayerAI(a1); } -void sub_80793C4(struct Sprite *sprite) { +void sub_80793C4(struct Sprite *sprite) +{ bool8 var; - if (!sprite->data[0]) { - if (!gBattleAnimArgs[3]) { + + if (!sprite->data[0]) + { + if (!gBattleAnimArgs[3]) var = TRUE; - } else { + else var = FALSE; - } - if (!gBattleAnimArgs[2]) { + if (!gBattleAnimArgs[2]) sub_80787B0(sprite, var); - } else { + else sub_8078764(sprite, var); - } sprite->data[0]++; - } else if (sprite->animEnded || sprite->affineAnimEnded) { + } + else if (sprite->animEnded || sprite->affineAnimEnded) + { move_anim_8074EE0(sprite); } } -void sub_807941C(struct Sprite *sprite) { +void sub_807941C(struct Sprite *sprite) +{ bool8 v1; u8 v2; - if (!(gBattleAnimArgs[5] & 0xff00)) { + + if (!(gBattleAnimArgs[5] & 0xff00)) v1 = TRUE; - } else { + else v1 = FALSE; - } - if (!(gBattleAnimArgs[5] & 0xff)) { + + if (!(gBattleAnimArgs[5] & 0xff)) v2 = 3; - } else { + else v2 = 1; - } + sub_80787B0(sprite, v1); - if (GetBankSide(gAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBankPosition(gAnimBankTarget, v2) + gBattleAnimArgs[3]; @@ -1248,11 +1423,11 @@ void sub_807941C(struct Sprite *sprite) { StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } -void sub_80794A8(struct Sprite *sprite) { +void sub_80794A8(struct Sprite *sprite) +{ sub_80787B0(sprite, 1); - if (GetBankSide(gAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; @@ -1261,31 +1436,38 @@ void sub_80794A8(struct Sprite *sprite) { sprite->callback = sub_8079518; } -void sub_8079518(struct Sprite *sprite) { - if (sub_8078718(sprite)) { +void sub_8079518(struct Sprite *sprite) +{ + if (sub_8078718(sprite)) DestroyAnimSprite(sprite); - } } -void sub_8079534(struct Sprite *sprite) { +void sub_8079534(struct Sprite *sprite) +{ u8 r4, slot, r7; - if (!gBattleAnimArgs[6]) { + + if (!gBattleAnimArgs[6]) + { r4 = 1; r7 = 3; - } else { + } + else + { r4 = 0; r7 = 1; } - if (!gBattleAnimArgs[5]) { + if (!gBattleAnimArgs[5]) + { sub_80787B0(sprite, r4); slot = gAnimBankAttacker; - } else { + } + else + { sub_8078764(sprite, r4); slot = gAnimBankTarget; } - if (GetBankSide(gAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } sub_8078764(sprite, r4); sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBankPosition(slot, 2) + gBattleAnimArgs[2]; @@ -1294,43 +1476,47 @@ void sub_8079534(struct Sprite *sprite) { StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } -s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) { +s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) +{ u16 i; u8 sprite = GetAnimBankSpriteId(a1); - if (sprite != 0xff) { - for (i = 0; i < 0x40; i++) { - if (gSprites[i].inUse) { - continue; + + if (sprite != 0xff) + { + for (i = 0; i < 0x40; i++) + { + if (!gSprites[i].inUse) + { + gSprites[i] = gSprites[sprite]; + gSprites[i].oam.objMode = 1; + gSprites[i].invisible = FALSE; + return i; } - gSprites[i] = gSprites[sprite]; - gSprites[i].oam.objMode = 1; - gSprites[i].invisible = FALSE; - return i; } } return -1; } -void obj_delete_but_dont_free_vram(struct Sprite *sprite) { +void obj_delete_but_dont_free_vram(struct Sprite *sprite) +{ sprite->usingSheet = TRUE; DestroySprite(sprite); } -void sub_8079670(u8 task) { +void sub_8079670(u8 task) +{ s16 v1 = 0; s16 v2 = 0; - if (gBattleAnimArgs[2] > gBattleAnimArgs[0]) { + + if (gBattleAnimArgs[2] > gBattleAnimArgs[0]) v2 = 1; - } - if (gBattleAnimArgs[2] < gBattleAnimArgs[0]) { + if (gBattleAnimArgs[2] < gBattleAnimArgs[0]) v2 = -1; - } - if (gBattleAnimArgs[3] > gBattleAnimArgs[1]) { + if (gBattleAnimArgs[3] > gBattleAnimArgs[1]) v1 = 1; - } - if (gBattleAnimArgs[3] < gBattleAnimArgs[1]) { + if (gBattleAnimArgs[3] < gBattleAnimArgs[1]) v1 = -1; - } + gTasks[task].data[0] = 0; gTasks[task].data[1] = gBattleAnimArgs[4]; gTasks[task].data[2] = 0; @@ -1344,30 +1530,38 @@ void sub_8079670(u8 task) { gTasks[task].func = sub_80796F8; } -void sub_80796F8(u8 taskId) { +void sub_80796F8(u8 taskId) +{ struct Task *task = &gTasks[taskId]; - if (++task->data[0] > task->data[1]) { + + if (++task->data[0] > task->data[1]) + { task->data[0] = 0; - if (++task->data[2] & 1) { - if (task->data[3] != task->data[7]) { + if (++task->data[2] & 1) + { + if (task->data[3] != task->data[7]) task->data[3] += task->data[5]; - } - } else { - if (task->data[4] != task->data[8]) { + } + else + { + if (task->data[4] != task->data[8]) task->data[4] += task->data[6]; - } } REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; - if (task->data[3] == task->data[7] && task->data[4] == task->data[8]) { + if (task->data[3] == task->data[7] && task->data[4] == task->data[8]) + { DestroyAnimVisualTask(taskId); return; } } } -void sub_8079790(u8 task) { +void sub_8079790(u8 task) +{ u8 sprite = GetAnimBankSpriteId(gBattleAnimArgs[0]); - if (sprite == 0xff) { + + if (sprite == 0xff) + { DestroyAnimVisualTask(task); return; } @@ -1375,7 +1569,8 @@ void sub_8079790(u8 task) { sub_80797EC(&gTasks[task]); } -void sub_80797EC(struct Task *task) { +void sub_80797EC(struct Task *task) +{ task->data[1] = gBattleAnimArgs[1]; task->data[2] = 0; task->data[3] = gBattleAnimArgs[2]; @@ -1386,24 +1581,33 @@ void sub_80797EC(struct Task *task) { task->func = sub_8079814; } -void sub_8079814(u8 taskId) { +void sub_8079814(u8 taskId) +{ struct Task *task = &gTasks[taskId]; - if (++task->data[4] >= task->data[5]) { + + if (++task->data[4] >= task->data[5]) + { task->data[4] = 0; - if (!task->data[6]) { + if (!task->data[6]) + { task->data[2]++; BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]); - if (task->data[2] == task->data[3]) { + if (task->data[2] == task->data[3]) task->data[6] = 1; - } - } else { + } + else + { task->data[2]--; BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]); - if (!task->data[2]) { - if (--task->data[7]) { + if (!task->data[2]) + { + if (--task->data[7]) + { task->data[4] = 0; task->data[6] = 0; - } else { + } + else + { DestroyAnimVisualTask(taskId); return; } @@ -1412,9 +1616,12 @@ void sub_8079814(u8 taskId) { } } -void sub_80798AC(u8 task) { +void sub_80798AC(u8 task) +{ u8 palette = IndexOfSpritePaletteTag(gBattleAnimArgs[0]); - if (palette == 0xff) { + + if (palette == 0xff) + { DestroyAnimVisualTask(task); return; } @@ -1422,7 +1629,8 @@ void sub_80798AC(u8 task) { sub_80797EC(&gTasks[task]); } -void sub_80798F4(struct Task *task, u8 a2, const void *a3) { +void sub_80798F4(struct Task *task, u8 a2, const void *a3) +{ task->data[7] = 0; task->data[8] = 0; task->data[9] = 0; @@ -1434,11 +1642,14 @@ void sub_80798F4(struct Task *task, u8 a2, const void *a3) { sub_8078E70(a2, 0); } -bool8 sub_807992C(struct Task *task) { +bool8 sub_807992C(struct Task *task) +{ gUnknown_0202F7D4 = sub_8079BFC(task->data[13], task->data[14]) + (task->data[7] << 3); - switch (gUnknown_0202F7D4->type) { + switch (gUnknown_0202F7D4->type) + { default: - if (!gUnknown_0202F7D4->frame.duration) { + if (!gUnknown_0202F7D4->frame.duration) + { task->data[10] = gUnknown_0202F7D4->frame.xScale; task->data[11] = gUnknown_0202F7D4->frame.yScale; task->data[12] = gUnknown_0202F7D4->frame.rotation; @@ -1450,44 +1661,49 @@ bool8 sub_807992C(struct Task *task) { task->data[12] += gUnknown_0202F7D4->frame.rotation; obj_id_set_rotscale(task->data[15], task->data[10], task->data[11], task->data[12]); sub_8079A64(task->data[15]); - if (++task->data[8] >= gUnknown_0202F7D4->frame.duration) { + if (++task->data[8] >= gUnknown_0202F7D4->frame.duration) + { task->data[8] = 0; task->data[7]++; } break; - case AFFINEANIMCMDTYPE_JUMP: task->data[7] = gUnknown_0202F7D4->jump.target; break; - case AFFINEANIMCMDTYPE_LOOP: - if (gUnknown_0202F7D4->loop.count) { - if (task->data[9]) { - if (!--task->data[9]) { + if (gUnknown_0202F7D4->loop.count) + { + if (task->data[9]) + { + if (!--task->data[9]) + { task->data[7]++; break; } - } else { + } + else + { task->data[9] = gUnknown_0202F7D4->loop.count; } - if (!task->data[7]) { + if (!task->data[7]) + { break; } - for (;;) { + for (;;) + { task->data[7]--; gUnknown_0202F7D4--; - if (gUnknown_0202F7D4->type == AFFINEANIMCMDTYPE_LOOP) { + if (gUnknown_0202F7D4->type == AFFINEANIMCMDTYPE_LOOP) + { task->data[7]++; return TRUE; } - if (!task->data[7]) { + if (!task->data[7]) return TRUE; - } } } task->data[7]++; break; - case 0x7fff: gSprites[task->data[15]].pos2.y = 0; sub_8078F40(task->data[15]); @@ -1497,52 +1713,62 @@ bool8 sub_807992C(struct Task *task) { return TRUE; } -void sub_8079A64(u8 sprite) { +void sub_8079A64(u8 sprite) +{ int var = 0x40 - sub_8079B10(sprite) * 2; u16 matrix = gSprites[sprite].oam.matrixNum; int var2 = (var << 8) / gOamMatrices[matrix].d; - if (var2 > 0x80) { + + if (var2 > 0x80) var2 = 0x80; - } gSprites[sprite].pos2.y = (var - var2) / 2; } -void sub_8079AB8(u8 sprite, u8 sprite2) { +void sub_8079AB8(u8 sprite, u8 sprite2) +{ int var = 0x40 - sub_8079B10(sprite2) * 2; u16 matrix = gSprites[sprite].oam.matrixNum; int var2 = (var << 8) / gOamMatrices[matrix].d; - if (var2 > 0x80) { + + if (var2 > 0x80) var2 = 0x80; - } gSprites[sprite].pos2.y = (var - var2) / 2; } -u16 sub_8079B10(u8 sprite) { +u16 sub_8079B10(u8 sprite) +{ struct TransformStatus *transform; u8 slot = gSprites[sprite].data[0]; u16 species; u16 i; - for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) { - if (gBattleMonSprites[i] == sprite) { - if (IsContest()) { - species = ewram19348.unk0; + + for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) + { + if (gBattleMonSprites[i] == sprite) + { + if (IsContest()) + { + species = shared19348.unk0; return gMonBackPicCoords[species].y_offset; - } else { - if (!GetBankSide(i)) { + } + else + { + if (!GetBankSide(i)) + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES); - } else { + else species = transform->species; - } return gMonBackPicCoords[species].y_offset; - } else { + } + else + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES); - } else { + else species = transform->species; - } return gMonFrontPicCoords[species].y_offset; } } @@ -1551,19 +1777,22 @@ u16 sub_8079B10(u8 sprite) { return 0x40; } -void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr) { +void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr) +{ *bottom = ((intptr_t) ptr) & 0xffff; *top = (((intptr_t) ptr) >> 16) & 0xffff; } -void *sub_8079BFC(s16 bottom, s16 top) { +void *sub_8079BFC(s16 bottom, s16 top) +{ return (void *)((u16)bottom | ((u16)top << 16)); } // possible new file -void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7) { +void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7) +{ task->data[8] = a7; task->data[15] = a2; // spriteId task->data[9] = a3; @@ -1574,124 +1803,133 @@ void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a task->data[12] = (a6 - a4) / a7; } -u8 sub_8079C74(struct Task *task) { - if (!task->data[8]) { +u8 sub_8079C74(struct Task *task) +{ + if (!task->data[8]) return 0; - } - if (--task->data[8]) { + + if (--task->data[8] != 0) + { task->data[9] += task->data[11]; task->data[10] += task->data[12]; - } else { + } + else + { task->data[9] = task->data[13]; task->data[10] = task->data[14]; } obj_id_set_rotscale(task->data[15], task->data[9], task->data[10], 0); - if (task->data[8]) { + if (task->data[8]) sub_8079A64(task->data[15]); - } else { + else gSprites[task->data[15]].pos2.y = 0; - } return task->data[8]; } -void sub_8079CEC(u8 task) { +void sub_8079CEC(u8 task) +{ u16 v1; - if (gAnimFriendship <= 30) { + + if (gAnimFriendship <= 30) v1 = 0; - } else if (gAnimFriendship <= 100) { + else if (gAnimFriendship <= 100) v1 = 1; - } else if (gAnimFriendship <= 200) { + else if (gAnimFriendship <= 200) v1 = 2; - } else { + else v1 = 3; - } gBattleAnimArgs[7] = v1; DestroyAnimVisualTask(task); } -void unref_sub_8079D20(u8 priority) { - if (IsAnimBankSpriteVisible(gAnimBankTarget)) { +void unref_sub_8079D20(u8 priority) +{ + if (IsAnimBankSpriteVisible(gAnimBankTarget)) gSprites[gBattleMonSprites[gAnimBankTarget]].oam.priority = priority; - } - if (IsAnimBankSpriteVisible(gAnimBankAttacker)) { + if (IsAnimBankSpriteVisible(gAnimBankAttacker)) gSprites[gBattleMonSprites[gAnimBankAttacker]].oam.priority = priority; - } - if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) { + if (IsAnimBankSpriteVisible(gAnimBankTarget ^ 2)) gSprites[gBattleMonSprites[gAnimBankTarget ^ 2]].oam.priority = priority; - } - if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) gSprites[gBattleMonSprites[gAnimBankAttacker ^ 2]].oam.priority = priority; - } } -void sub_8079E24() { +void sub_8079E24() +{ int i; - for (i = 0; i < gNoOfAllBanks; i++) { - if (IsAnimBankSpriteVisible(i)) { + + for (i = 0; i < gNoOfAllBanks; i++) + { + if (IsAnimBankSpriteVisible(i)) + { gSprites[gBattleMonSprites[i]].subpriority = sub_8079E90(i); gSprites[gBattleMonSprites[i]].oam.priority = 2; } } } -u8 sub_8079E90(u8 slot) { +u8 sub_8079E90(u8 slot) +{ u8 status; u8 ret; - if (IsContest()) { - if (slot == 2) { + + if (IsContest()) + { + if (slot == 2) return 30; - } else { + else return 40; - } - } else { + } + else + { status = GetBankIdentity(slot); - if (status == 0) { + if (status == 0) ret = 30; - } else if (status == 2) { + else if (status == 2) ret = 20; - } else if (status == 1) { + else if (status == 1) ret = 40; - } else { + else ret = 50; - } } return ret; } -u8 sub_8079ED4(u8 slot) { +u8 sub_8079ED4(u8 slot) +{ u8 status = GetBankIdentity(slot); - if (IsContest()) { + + if (IsContest()) return 2; - } - if (status == 0 || status == 3) { + if (status == 0 || status == 3) return BG2CNT.priority; - } else { + else return BG1CNT.priority; - } } -u8 GetBankIdentity_permutated(u8 slot) { +u8 GetBankIdentity_permutated(u8 slot) +{ u8 status; - if (!IsContest()) { + + if (!IsContest()) + { status = GetBankIdentity(slot); - if (status == 0 || status == 3) { + if (status == 0 || status == 3) return 2; - } else { + else return 1; - } } return 1; } -u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, u32 a8) { - void *src; - void *dest; - int size; - +u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, u32 a8) +{ u8 sprite; u16 sheet = LoadSpriteSheet(&gUnknown_0837F5E0[a3]); u16 palette = AllocSpritePalette(gSpriteTemplate_837F5B0[a3].paletteTag); - if (!isBackpic) { + + if (!isBackpic) + { LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(species, a8, a7), (palette * 0x10) + 0x100, 0x20); LoadSpecialPokePic( &gMonFrontPicTable[species], @@ -1703,9 +1941,10 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, a7, 1 ); - } else { - LoadCompressedPalette( - GetMonSpritePalFromOtIdPersonality(species, a8, a7), (palette * 0x10) + 0x100, 0x20); + } + else + { + LoadCompressedPalette(GetMonSpritePalFromOtIdPersonality(species, a8, a7), (palette * 0x10) + 0x100, 0x20); LoadSpecialPokePic( &gMonBackPicTable[species], gMonBackPicCoords[species].coords, @@ -1718,28 +1957,28 @@ u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, ); } - src = (void *)0x2000000; - dest = (void *)(0x6010000 + (sheet * 0x20)); - size = 0x800; - DmaCopy32(3, src, dest, size); + DmaCopy32Defvars(3, (void *)0x2000000, (void *)(VRAM + 0x10000 + (sheet * 0x20)), 0x800); - if (!isBackpic) { + if (!isBackpic) sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonFrontPicCoords[species].y_offset, a6); - } else { + else sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6); - } - if (IsContest()) { + + if (IsContest()) + { gSprites[sprite].affineAnims = gSpriteAffineAnimTable_81E7C18; StartSpriteAffineAnim(&gSprites[sprite], 0); } return sprite; } -void sub_807A0F4(struct Sprite *sprite) { +void sub_807A0F4(struct Sprite *sprite) +{ DestroySpriteAndFreeResources(sprite); } -int sub_807A100(u8 slot, u8 a2) { +int sub_807A100(u8 slot, u8 a2) +{ u16 species; u32 personality; u16 letter; @@ -1747,80 +1986,113 @@ int sub_807A100(u8 slot, u8 a2) { int ret; const struct MonCoords *coords; struct TransformStatus *transform; - if (IsContest()) { - if (ewram19348.unk4 & 1) { - species = ewram19348.unk2; - personality = ewram19348.unk10; - } else { - species = ewram19348.unk0; - personality = ewram19348.unk8; + + if (IsContest()) + { + if (shared19348.unk4_0) + { + species = shared19348.unk2; + personality = shared19348.unk10; + } + else + { + species = shared19348.unk0; + personality = shared19348.unk8; } - if (species == SPECIES_UNOWN) { + if (species == SPECIES_UNOWN) + { letter = GET_UNOWN_LETTER(personality); - if (!letter) { + if (!letter) var = SPECIES_UNOWN; - } else { + else var = letter + SPECIES_UNOWN_B - 1; - } coords = &gMonBackPicCoords[var]; - } else if (species == SPECIES_CASTFORM) { + } + else if (species == SPECIES_CASTFORM) + { coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]]; - } else if (species <= SPECIES_EGG) { + } + else if (species <= SPECIES_EGG) + { coords = &gMonBackPicCoords[species]; - } else { + } + else + { coords = &gMonBackPicCoords[0]; } - } else { - if (!GetBankSide(slot)) { + } + else + { + if (!GetBankSide(slot)) + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) + { species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { + } + else + { species = transform->species; personality = gTransformPersonalities[slot]; } - if (species == SPECIES_UNOWN) { + if (species == SPECIES_UNOWN) + { letter = GET_UNOWN_LETTER(personality); - if (!letter) { + if (!letter) var = SPECIES_UNOWN; - } else { + else var = letter + SPECIES_UNOWN_B - 1; - } coords = &gMonBackPicCoords[var]; - } else if (species > SPECIES_EGG) { + } + else if (species > SPECIES_EGG) + { coords = &gMonBackPicCoords[0]; - } else { + } + else + { coords = &gMonBackPicCoords[species]; } - } else { + } + else + { transform = &eTransformStatuses[slot]; - if (!transform->species) { + if (!transform->species) + { species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { + } + else + { species = transform->species; personality = gTransformPersonalities[slot]; } - if (species == SPECIES_UNOWN) { + if (species == SPECIES_UNOWN) + { letter = GET_UNOWN_LETTER(personality); - if (!letter) { + if (!letter) var = SPECIES_UNOWN; - } else { + else var = letter + SPECIES_UNOWN_B - 1; - } coords = &gMonFrontPicCoords[var]; - } else if (species == SPECIES_CASTFORM) { + } + else if (species == SPECIES_CASTFORM) + { coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]]; - } else if (species > SPECIES_EGG) { + } + else if (species > SPECIES_EGG) + { coords = &gMonFrontPicCoords[0]; - } else { + } + else + { coords = &gMonFrontPicCoords[species]; } } } - switch (a2) { + switch (a2) + { case 0: return (coords->coords & 0xf) * 8; case 1: @@ -1841,23 +2113,31 @@ int sub_807A100(u8 slot, u8 a2) { } } -void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) { +void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) +{ u8 v1, v2; s16 v3, v4; s16 v5, v6; - if (!a2) { + + if (!a2) + { v1 = 0; v2 = 1; - } else { + } + else + { v1 = 2; v2 = 3; } v3 = GetBankPosition(slot, v1); v4 = GetBankPosition(slot, v2); - if (IsDoubleBattle() && !IsContest()) { + if (IsDoubleBattle() && !IsContest()) + { v5 = GetBankPosition(slot ^ 2, v1); v6 = GetBankPosition(slot ^ 2, v2); - } else { + } + else + { v5 = v3; v6 = v4; } @@ -1865,7 +2145,8 @@ void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) { *a4 = (v4 + v6) / 2; } -u8 sub_807A4A0(int a1, u8 sprite, int a3) { +u8 sub_807A4A0(int a1, u8 sprite, int a3) +{ u8 new_sprite = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); gSprites[new_sprite] = gSprites[sprite]; gSprites[new_sprite].usingSheet = TRUE; @@ -1876,13 +2157,17 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) { return new_sprite; } -void sub_807A544(struct Sprite *sprite) { +void sub_807A544(struct Sprite *sprite) +{ sub_8078650(sprite); - if (GetBankSide(gAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) + { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; sprite->hFlip = TRUE; - } else { + } + else + { sprite->pos1.x += gBattleAnimArgs[0]; } sprite->pos1.y += gBattleAnimArgs[1]; @@ -1894,11 +2179,15 @@ void sub_807A544(struct Sprite *sprite) { sprite->callback = sub_8078504; } -void sub_807A5C4(struct Sprite *sprite) { - if (GetBankSide(gAnimBankAttacker)) { +void sub_807A5C4(struct Sprite *sprite) +{ + if (GetBankSide(gAnimBankAttacker)) + { sprite->pos1.x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] *= -1; - } else { + } + else + { sprite->pos1.x += gBattleAnimArgs[0]; } sprite->pos1.y += gBattleAnimArgs[1]; @@ -1911,19 +2200,20 @@ void sub_807A5C4(struct Sprite *sprite) { sprite->callback = sub_8078504; } -void sub_807A63C(struct Sprite *sprite) { +void sub_807A63C(struct Sprite *sprite) +{ sub_8078650(sprite); - if (GetBankSide(gAnimBankAttacker)) { + if (GetBankSide(gAnimBankAttacker)) sprite->pos1.x -= gBattleAnimArgs[0]; - } else { + else sprite->pos1.x += gBattleAnimArgs[0]; - } sprite->pos1.y += gBattleAnimArgs[1]; sprite->callback = sub_8078600; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } -void sub_807A69C(u8 taskId) { +void sub_807A69C(u8 taskId) +{ u16 src; u16 dest; struct Task *task = &gTasks[taskId]; @@ -1938,23 +2228,25 @@ void sub_807A69C(u8 taskId) { dest = (task->data[4] + 0x10) * 0x10; src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10; task->data[6] = sub_8079E90(gAnimBankAttacker); - if (task->data[6] == 20 || task->data[6] == 40) { + if (task->data[6] == 20 || task->data[6] == 40) task->data[6] = 2; - } else { + else task->data[6] = 3; - } CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20); BlendPalette(dest, 0x10, gBattleAnimArgs[1], gBattleAnimArgs[0]); task->func = sub_807A784; } -void sub_807A784(u8 taskId) { +void sub_807A784(u8 taskId) +{ struct Task *task = &gTasks[taskId]; - switch (task->data[2]) { + switch (task->data[2]) + { case 0: sub_807A850(task, taskId); gSprites[task->data[0]].pos2.x += task->data[1]; - if (++task->data[3] == 5) { + if (++task->data[3] == 5) + { task->data[3]--; task->data[2]++; } @@ -1962,13 +2254,15 @@ void sub_807A784(u8 taskId) { case 1: sub_807A850(task, taskId); gSprites[task->data[0]].pos2.x -= task->data[1]; - if (--task->data[3] == 0) { + if (--task->data[3] == 0) + { gSprites[task->data[0]].pos2.x = 0; task->data[2]++; } break; case 2: - if (!task->data[5]) { + if (!task->data[5]) + { FreeSpritePaletteByTag(10097); DestroyAnimVisualTask(taskId); } @@ -1976,9 +2270,11 @@ void sub_807A784(u8 taskId) { } } -void sub_807A850(struct Task *task, u8 taskId) { +void sub_807A850(struct Task *task, u8 taskId) +{ s16 sprite = duplicate_obj_of_side_rel2move_in_transparent_mode(0); - if (sprite >= 0) { + if (sprite >= 0) + { gSprites[sprite].oam.priority = task->data[6]; gSprites[sprite].oam.paletteNum = task->data[4]; gSprites[sprite].data[0] = 8; @@ -1990,8 +2286,10 @@ void sub_807A850(struct Task *task, u8 taskId) { } } -void sub_807A8D4(struct Sprite *sprite) { - if (--sprite->data[0] == 0) { +void sub_807A8D4(struct Sprite *sprite) +{ + if (--sprite->data[0] == 0) + { gTasks[sprite->data[1]].data[5]--; obj_delete_but_dont_free_vram(sprite); } @@ -2000,38 +2298,40 @@ void sub_807A8D4(struct Sprite *sprite) { void sub_807A908(struct Sprite *sprite) { sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); - if (!GetBankSide(gAnimBankAttacker)) { + if (!GetBankSide(gAnimBankAttacker)) sprite->data[0] = 5; - } else { + else sprite->data[0] = -10; - } sprite->data[1] = -40; sprite->callback = sub_807A960; } -void sub_807A960(struct Sprite *sprite) { +void sub_807A960(struct Sprite *sprite) +{ sprite->data[2] += sprite->data[0]; sprite->data[3] += sprite->data[1]; sprite->pos2.x = sprite->data[2] / 10; sprite->pos2.y = sprite->data[3] / 10; - if (sprite->data[1] < -20) { + if (sprite->data[1] < -20) sprite->data[1]++; - } - if ((sprite->pos1.y + sprite->pos2.y) < -32) { + if (sprite->pos1.y + sprite->pos2.y < -32) DestroyAnimSprite(sprite); - } } -void sub_807A9BC(struct Sprite *sprite) { +void sub_807A9BC(struct Sprite *sprite) +{ int x; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4]; sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5]; - if (!GetBankSide(gAnimBankTarget)) { + if (!GetBankSide(gAnimBankTarget)) + { x = (u16)gBattleAnimArgs[4] + 30; sprite->pos1.x += x; sprite->pos1.y = gBattleAnimArgs[5] - 20; - } else { + } + else + { x = (u16)gBattleAnimArgs[4] - 30; sprite->pos1.x += x; sprite->pos1.y = gBattleAnimArgs[5] - 80; -- cgit v1.2.3 From e16471c52a1905921629ef823cb9e417a0707201 Mon Sep 17 00:00:00 2001 From: M Date: Sat, 6 Jan 2018 19:43:20 +0100 Subject: correct load order --- ld_script.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ld_script.txt b/ld_script.txt index 8fe0479a4..33838c2be 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -347,8 +347,8 @@ SECTIONS { src/battle/battle_controller_linkpartner.o(.text); src/battle/battle_message.o(.text); src/field/choose_party.o(.text); - src/roulette_util.o(.text); src/scene/cable_car.o(.text); + src/roulette_util.o(.text); src/engine/cable_car_util.o(.text); src/unused_8124F94.o(.text); src/engine/save.o(.text); -- cgit v1.2.3 From d19de32aba198ac2e5691cab088b3d84cd390b39 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 15:16:51 -0500 Subject: through Task_PokemonStorageSystem --- asm/pokemon_storage_system.s | 298 ----------------------------------- src/pokemon/pokemon_storage_system.c | 124 ++++++++++++++- 2 files changed, 123 insertions(+), 299 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index cf8091735..8fc6cfdb2 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,304 +5,6 @@ .text - thumb_func_start StorageSystemClearMessageWindow -StorageSystemClearMessageWindow: @ 8095EA0 - push {lr} - movs r0, 0x2 - movs r1, 0xF - movs r2, 0x1B - movs r3, 0x12 - bl MenuFillWindowRectWithBlankTile - pop {r0} - bx r0 - thumb_func_end StorageSystemClearMessageWindow - - thumb_func_start Task_PokemonStorageSystem -Task_PokemonStorageSystem: @ 8095EB4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _08095ED8 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _08095ECE - b _080960F4 -_08095ECE: - lsls r0, 2 - ldr r1, _08095EDC @ =_08095EE0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08095ED8: .4byte gTasks -_08095EDC: .4byte _08095EE0 - .align 2, 0 -_08095EE0: - .4byte _08095EF4 - .4byte _08095F1C - .4byte _08095F30 - .4byte _08096042 - .4byte _080960DC -_08095EF4: - ldrb r0, [r4, 0xA] - bl StorageSystemCreatePrimaryMenu - bl MenuDisplayMessageBox - ldr r1, _08095F18 @ =gUnknown_083B600C - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 3 - adds r1, 0x4 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x2 - movs r2, 0xF - bl MenuPrint - b _08095F28 - .align 2, 0 -_08095F18: .4byte gUnknown_083B600C -_08095F1C: - bl sub_807D770 - lsls r0, 24 - cmp r0, 0 - bne _08095F28 - b _080960F4 -_08095F28: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080960F4 -_08095F30: - bl ProcessMenuInput - lsls r0, 24 - asrs r0, 24 - strh r0, [r4, 0xC] - movs r3, 0xC - ldrsh r1, [r4, r3] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08095FC8 - cmp r1, r0 - bgt _08095F52 - subs r0, 0x1 - cmp r1, r0 - beq _08095F58 - b _08095FE8 -_08095F52: - cmp r1, 0x3 - beq _08095FC8 - b _08095FE8 -_08095F58: - ldrh r3, [r4, 0xA] - strh r3, [r4, 0xE] - ldr r2, _08095FC0 @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08095F76 - subs r0, r3, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - cmp r0, 0 - bge _08095F76 - movs r0, 0x3 - strh r0, [r4, 0xE] -_08095F76: - ldrh r1, [r2, 0x2E] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08095F92 - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _08095F92 - movs r0, 0 - strh r0, [r4, 0xE] -_08095F92: - lsls r0, r3, 16 - asrs r0, 16 - ldrh r2, [r4, 0xE] - movs r3, 0xE - ldrsh r1, [r4, r3] - cmp r0, r1 - bne _08095FA2 - b _080960F4 -_08095FA2: - strh r2, [r4, 0xA] - bl StorageSystemClearMessageWindow - ldr r0, _08095FC4 @ =gUnknown_083B600C - movs r2, 0xA - ldrsh r1, [r4, r2] - lsls r1, 3 - adds r0, 0x4 - adds r1, r0 - ldr r0, [r1] - movs r1, 0x2 - movs r2, 0xF - bl MenuPrint - b _080960F4 - .align 2, 0 -_08095FC0: .4byte gMain -_08095FC4: .4byte gUnknown_083B600C -_08095FC8: - bl HandleDestroyMenuCursors - movs r0, 0 - movs r1, 0 - movs r2, 0xD - movs r3, 0x9 - bl MenuZeroFillWindowRect - bl ScriptContext2_Disable - bl EnableBothScriptContexts - adds r0, r5, 0 - bl DestroyTask - b _080960F4 -_08095FE8: - movs r3, 0xC - ldrsh r0, [r4, r3] - cmp r0, 0 - bne _08096008 - bl StorageSystemGetPartySize - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x6 - bne _08096008 - bl StorageSystemClearMessageWindow - ldr r0, _08096004 @ =gPCText_PartyFull2 - b _08096022 - .align 2, 0 -_08096004: .4byte gPCText_PartyFull2 -_08096008: - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _08096034 - bl StorageSystemGetPartySize - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08096034 - bl StorageSystemClearMessageWindow - ldr r0, _08096030 @ =gPCText_OnlyOne -_08096022: - movs r1, 0x2 - movs r2, 0xF - bl MenuPrint - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080960F4 - .align 2, 0 -_08096030: .4byte gPCText_OnlyOne -_08096034: - movs r0, 0x1 - movs r1, 0 - bl fade_screen - movs r0, 0x4 - strh r0, [r4, 0x8] - b _080960F4 -_08096042: - ldr r0, _08096088 @ =gMain - ldrh r1, [r0, 0x2E] - movs r3, 0x3 - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - bne _080960B8 - movs r0, 0x40 - ands r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0 - beq _08096090 - ldrh r0, [r4, 0xA] - subs r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - cmp r0, 0 - bge _0809606A - strh r3, [r4, 0xA] -_0809606A: - movs r0, 0x1 - negs r0, r0 - bl MoveMenuCursor - bl GetMenuCursorPos - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0xA] - bl StorageSystemClearMessageWindow - ldr r1, _0809608C @ =gUnknown_083B600C - movs r3, 0xA - ldrsh r0, [r4, r3] - b _080960C2 - .align 2, 0 -_08096088: .4byte gMain -_0809608C: .4byte gUnknown_083B600C -_08096090: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _080960F4 - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _080960A8 - strh r2, [r4, 0xA] -_080960A8: - movs r0, 0x1 - bl MoveMenuCursor - bl GetMenuCursorPos - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0xA] -_080960B8: - bl StorageSystemClearMessageWindow - ldr r1, _080960D8 @ =gUnknown_083B600C - movs r2, 0xA - ldrsh r0, [r4, r2] -_080960C2: - lsls r0, 3 - adds r1, 0x4 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x2 - movs r2, 0xF - bl MenuPrint - movs r0, 0x2 - strh r0, [r4, 0x8] - b _080960F4 - .align 2, 0 -_080960D8: .4byte gUnknown_083B600C -_080960DC: - ldr r0, _080960FC @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080960F4 - ldrb r0, [r4, 0xC] - bl task_intro_29 - adds r0, r5, 0 - bl DestroyTask -_080960F4: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080960FC: .4byte gPaletteFade - thumb_func_end Task_PokemonStorageSystem - thumb_func_start ShowPokemonStorageSystem ShowPokemonStorageSystem: @ 8096100 push {lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 745a27bf6..a5a3bdcd8 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -1,17 +1,32 @@ #include "global.h" -#include "pokemon_storage_system.h" +#include "palette.h" +#include "field_weather.h" #include "menu.h" +#include "main.h" +#include "strings.h" #include "string_util.h" #include "event_data.h" #include "ewram.h" +#include "script.h" +#include "pokemon_storage_system.h" struct StorageAction { u8 *text; u8 format; }; +struct ReverseMenuAction { + u32 unk0; + u8 *text; +}; + +void StorageSystemCreatePrimaryMenu(u8 whichMenu); +void task_intro_29(u8 whichMenu); + extern const struct StorageAction gUnknown_083B6DF4[]; +extern const struct ReverseMenuAction gUnknown_083B600C[]; + EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; u8 sub_8095ADC(u8 boxId) @@ -281,6 +296,113 @@ s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx return -1; } +void StorageSystemClearMessageWindow(void) +{ + MenuFillWindowRectWithBlankTile(2, 15, 27, 18); +} + +void Task_PokemonStorageSystem(u8 taskId) +{ + struct Task *task = gTasks + taskId; + switch (task->data[0]) + { + case 0: + StorageSystemCreatePrimaryMenu(task->data[1]); + MenuDisplayMessageBox(); + MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + task->data[0]++; + break; + case 1: + if (sub_807D770()) + { + task->data[0]++; + } + break; + case 2: + task->data[2] = ProcessMenuInput(); + switch(task->data[2]) + { + case -2: + task->data[3] = task->data[1]; + if (gMain.newKeys & DPAD_UP && --task->data[3] < 0) + task->data[3] = 3; + + if (gMain.newKeys & DPAD_DOWN && ++task->data[3] > 3) + task->data[3] = 0; + if (task->data[1] != task->data[3]) + { + task->data[1] = task->data[3]; + StorageSystemClearMessageWindow(); + MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + } + break; + case -1: + case 3: + HandleDestroyMenuCursors(); + MenuZeroFillWindowRect(0, 0, 13, 9); + ScriptContext2_Disable(); + EnableBothScriptContexts(); + DestroyTask(taskId); + break; + default: + if (task->data[2] == 0 && StorageSystemGetPartySize() == PARTY_SIZE) + { + StorageSystemClearMessageWindow(); + MenuPrint(gPCText_PartyFull2, 2, 15); + task->data[0] = 3; + } + else if (task->data[2] == 1 && StorageSystemGetPartySize() == 1) + { + StorageSystemClearMessageWindow(); + MenuPrint(gPCText_OnlyOne, 2, 15); + task->data[0] = 3; + } + else + { + fade_screen(1, 0); + task->data[0] = 4; + } + break; + } + break; + case 3: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + StorageSystemClearMessageWindow(); + MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + task->data[0] = 2; + } + else if (gMain.newKeys & DPAD_UP) + { + if (--task->data[1] < 0) + task->data[1] = 3; + MoveMenuCursor(-1); + task->data[1] = GetMenuCursorPos(); + StorageSystemClearMessageWindow(); + MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + task->data[0] = 2; + } + else if (gMain.newKeys & DPAD_DOWN) + { + if (++task->data[1] > 3) + task->data[1] = 0; + MoveMenuCursor(1); + task->data[1] = GetMenuCursorPos(); + StorageSystemClearMessageWindow(); + MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + task->data[0] = 2; + } + break; + case 4: + if (!gPaletteFade.active) + { + task_intro_29(task->data[2]); + DestroyTask(taskId); + } + break; + } +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 666654ff6dcec5916a7eac8425a5ddaae3be1a0e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 16:04:53 -0500 Subject: through ResetPokemonStorageSystem --- asm/pokemon_storage_system.s | 179 ----------------------------------- include/decoration.h | 1 - include/pokemon.h | 2 +- src/pokemon/pokemon_storage_system.c | 65 ++++++++++++- 4 files changed, 65 insertions(+), 182 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8fc6cfdb2..0f7180cc2 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,185 +5,6 @@ .text - thumb_func_start ShowPokemonStorageSystem -ShowPokemonStorageSystem: @ 8096100 - push {lr} - ldr r0, _08096128 @ =Task_PokemonStorageSystem - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0809612C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - strh r0, [r1, 0xA] - bl ScriptContext2_Enable - pop {r0} - bx r0 - .align 2, 0 -_08096128: .4byte Task_PokemonStorageSystem -_0809612C: .4byte gTasks - thumb_func_end ShowPokemonStorageSystem - - thumb_func_start sub_8096130 -sub_8096130: @ 8096130 - push {lr} - ldr r0, _0809615C @ =Task_PokemonStorageSystem - movs r1, 0x50 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08096160 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - ldr r0, _08096164 @ =gUnknown_02038474 - ldrb r0, [r0] - strh r0, [r1, 0xA] - bl pal_fill_black - pop {r0} - bx r0 - .align 2, 0 -_0809615C: .4byte Task_PokemonStorageSystem -_08096160: .4byte gTasks -_08096164: .4byte gUnknown_02038474 - thumb_func_end sub_8096130 - - thumb_func_start StorageSystemCreatePrimaryMenu -StorageSystemCreatePrimaryMenu: @ 8096168 - push {r4,lr} - sub sp, 0x8 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - movs r1, 0 - movs r2, 0xD - movs r3, 0x9 - bl MenuDrawTextWindow - ldr r3, _080961A4 @ =gUnknown_083B600C - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0x4 - bl PrintMenuItems - str r4, [sp] - movs r0, 0xC - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0x1 - movs r2, 0x1 - movs r3, 0x4 - bl InitMenu - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080961A4: .4byte gUnknown_083B600C - thumb_func_end StorageSystemCreatePrimaryMenu - - thumb_func_start sub_80961A8 -sub_80961A8: @ 80961A8 - push {lr} - ldr r1, _080961C4 @ =gUnknown_02038474 - ldr r0, _080961C8 @ =gUnknown_083B6DB4 - ldr r0, [r0] - ldrb r0, [r0, 0x5] - strb r0, [r1] - ldr r1, _080961CC @ =gFieldCallback - ldr r0, _080961D0 @ =sub_8096130 - str r0, [r1] - ldr r0, _080961D4 @ =c2_exit_to_overworld_2_switch - bl SetMainCallback2 - pop {r0} - bx r0 - .align 2, 0 -_080961C4: .4byte gUnknown_02038474 -_080961C8: .4byte gUnknown_083B6DB4 -_080961CC: .4byte gFieldCallback -_080961D0: .4byte sub_8096130 -_080961D4: .4byte c2_exit_to_overworld_2_switch - thumb_func_end sub_80961A8 - - thumb_func_start ResetPokemonStorageSystem -ResetPokemonStorageSystem: @ 80961D8 - push {r4-r7,lr} - ldr r1, _08096258 @ =gPokemonStorage - movs r0, 0 - strb r0, [r1] - movs r5, 0 - adds r7, r1, 0x4 -_080961E4: - movs r4, 0 - lsls r1, r5, 2 - adds r1, r5 - lsls r0, r1, 4 - subs r0, r1 - lsls r6, r0, 5 -_080961F0: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 4 - adds r0, r7 - adds r0, r6, r0 - bl ZeroBoxMonData - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1D - bls _080961F0 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0xD - bls _080961E4 - movs r5, 0 -_08096214: - lsls r0, r5, 3 - adds r0, r5 - ldr r6, _0809625C @ =gPokemonStorage + 0x8344 - adds r0, r6 - ldr r1, _08096260 @ =gPCText_BOX - bl StringCopy - adds r4, r5, 0x1 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - lsls r4, 16 - lsrs r5, r4, 16 - cmp r5, 0xD - bls _08096214 - movs r5, 0 - adds r3, r6, 0 - adds r3, 0x7E - movs r2, 0x3 -_0809623E: - adds r0, r5, r3 - adds r1, r5, 0 - ands r1, r2 - strb r1, [r0] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0xD - bls _0809623E - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08096258: .4byte gPokemonStorage -_0809625C: .4byte gPokemonStorage + 0x8344 -_08096260: .4byte gPCText_BOX - thumb_func_end ResetPokemonStorageSystem - thumb_func_start sub_8096264 sub_8096264: @ 8096264 push {r4-r6,lr} diff --git a/include/decoration.h b/include/decoration.h index 3d619a598..4ac26998e 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -133,7 +133,6 @@ extern u8 gUnknown_020391A8; extern u8 gUnknown_020391A9; extern u8 gUnknown_020391AA; extern u8 gUnknown_02039234; -extern void (*gFieldCallback)(void); extern const struct YesNoFuncTable gUnknown_083EC96C[]; extern struct UnkStruct_020391B4 gUnknown_020391B4[16]; diff --git a/include/pokemon.h b/include/pokemon.h index 89599d994..7edd3395f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -421,7 +421,7 @@ struct PokemonStorage /*0x0000*/ u8 currentBox; /*0x0004*/ struct BoxPokemon boxes[14][30]; /*0x8344*/ u8 boxNames[14][9]; - /*0x83c2*/ u8 unkArray[14]; + /*0x83c2*/ u8 wallpaper[14]; }; struct SpindaSpot diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index a5a3bdcd8..8f0753a2d 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -1,6 +1,8 @@ #include "global.h" #include "palette.h" #include "field_weather.h" +#include "overworld.h" +#include "field_fadetransition.h" #include "menu.h" #include "main.h" #include "strings.h" @@ -20,14 +22,21 @@ struct ReverseMenuAction { u8 *text; }; +struct PokemonStorageSystemData { + u8 filler_0000[5]; + u8 unk_0005; +}; + +const struct PokemonStorageSystemData *gUnknown_083B6DB4; + void StorageSystemCreatePrimaryMenu(u8 whichMenu); void task_intro_29(u8 whichMenu); extern const struct StorageAction gUnknown_083B6DF4[]; - extern const struct ReverseMenuAction gUnknown_083B600C[]; EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; +EWRAM_DATA u8 gUnknown_02038474; u8 sub_8095ADC(u8 boxId) { @@ -403,6 +412,60 @@ void Task_PokemonStorageSystem(u8 taskId) } } +void ShowPokemonStorageSystem(void) +{ + u8 taskId = CreateTask(Task_PokemonStorageSystem, 80); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + ScriptContext2_Enable(); +} + +void sub_8096130(void) +{ + u8 taskId = CreateTask(Task_PokemonStorageSystem, 80); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = gUnknown_02038474; + pal_fill_black(); +} + +void StorageSystemCreatePrimaryMenu(u8 a0) +{ + MenuDrawTextWindow(0, 0, 13, 9); + PrintMenuItems(1, 1, 4, (const struct MenuAction *)gUnknown_083B600C); + InitMenu(0, 1, 1, 4, a0, 12); +} + +void sub_80961A8(void) +{ + gUnknown_02038474 = gUnknown_083B6DB4->unk_0005; + gFieldCallback = sub_8096130; + SetMainCallback2(c2_exit_to_overworld_2_switch); +} + +void ResetPokemonStorageSystem(void) +{ + u16 boxId; + u16 boxMon; + + gPokemonStorage.currentBox = 0; + for (boxId = 0; boxId < 14; boxId++) + { + for (boxMon = 0; boxMon < 30; boxMon++) + { + ZeroBoxMonData(gPokemonStorage.boxes[boxId] + boxMon); + } + } + for (boxId = 0; boxId < 14; boxId++) + { + u8 *dest = StringCopy(gPokemonStorage.boxNames[boxId], gPCText_BOX); + ConvertIntToDecimalStringN(dest, boxId + 1, STR_CONV_MODE_LEFT_ALIGN, 2); + } + for (boxId = 0; boxId < 14; boxId++) + { + gPokemonStorage.wallpaper[boxId] = boxId & 0x03; + } +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 92577647185e885298bfe3e4159f702730bdf310 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 16:40:49 -0500 Subject: sub_8096264 --- asm/pokemon_storage_system.s | 81 ------------------------------ data/pokemon_storage_system.s | 55 -------------------- ld_script.txt | 1 + src/pokemon/pokemon_storage_system.c | 97 +++++++++++++++++++++++++++++++----- 4 files changed, 86 insertions(+), 148 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 0f7180cc2..d04e8cec7 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,87 +5,6 @@ .text - thumb_func_start sub_8096264 -sub_8096264: @ 8096264 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0x20 - mov r8, r0 - adds r4, r1, 0 - adds r6, r2, 0 - mov r9, r3 - lsls r4, 16 - lsrs r4, 16 - lsls r6, 16 - lsrs r6, 16 - mov r0, r9 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r0, _080962F4 @ =gBoxSelectionPopupPalette - str r0, [sp, 0x18] - ldr r1, _080962F8 @ =0xffff0000 - add r5, sp, 0x18 - ldr r0, [r5, 0x4] - ands r0, r1 - orrs r0, r6 - str r0, [r5, 0x4] - mov r1, sp - ldr r0, _080962FC @ =gBoxSelectionPopupCenterTiles - str r0, [sp] - movs r0, 0x80 - lsls r0, 4 - strh r0, [r1, 0x4] - strh r4, [r1, 0x6] - ldr r0, _08096300 @ =gBoxSelectionPopupSidesTiles - str r0, [sp, 0x8] - movs r0, 0xC0 - lsls r0, 1 - strh r0, [r1, 0xC] - adds r0, r4, 0x1 - strh r0, [r1, 0xE] - add r0, sp, 0x10 - movs r1, 0 - movs r2, 0x8 - bl memset - adds r0, r5, 0 - bl LoadSpritePalette - mov r0, sp - bl LoadSpriteSheets - ldr r0, _08096304 @ =gUnknown_02038478 - mov r1, r8 - str r1, [r0] - movs r0, 0x90 - lsls r0, 2 - add r0, r8 - strh r4, [r0] - ldr r0, _08096308 @ =0x00000242 - add r0, r8 - strh r6, [r0] - ldr r0, _0809630C @ =0x0000023e - add r8, r0 - mov r0, r9 - mov r1, r8 - strb r0, [r1] - add sp, 0x20 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080962F4: .4byte gBoxSelectionPopupPalette -_080962F8: .4byte 0xffff0000 -_080962FC: .4byte gBoxSelectionPopupCenterTiles -_08096300: .4byte gBoxSelectionPopupSidesTiles -_08096304: .4byte gUnknown_02038478 -_08096308: .4byte 0x00000242 -_0809630C: .4byte 0x0000023e - thumb_func_end sub_8096264 - thumb_func_start sub_8096310 sub_8096310: @ 8096310 push {r4,r5,lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index b765656f7..6bdb0edd0 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,61 +3,6 @@ .section .rodata - .align 2 -gUnknown_083B600C:: @ 83B600C - .4byte PCText_WithdrawPoke, PCText_MovePokeToParty - .4byte PCText_DepositPoke, PCText_StorePokeInBox - .4byte PCText_MovePoke, PCText_OrganizeBoxesParty - .4byte PCText_SeeYa, PCText_ReturnToPrevMenu - - .align 2 -gSpriteAnim_83B602C:: @ 83B602C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83B6034:: @ 83B6034 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83B603C:: @ 83B603C - obj_image_anim_frame 6, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83B6044:: @ 83B6044 - obj_image_anim_frame 10, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83B604C:: @ 83B604C - .4byte gSpriteAnim_83B602C - .4byte gSpriteAnim_83B6034 - .4byte gSpriteAnim_83B603C - .4byte gSpriteAnim_83B6044 - - .align 2 -gSpriteAffineAnim_83B605C:: @ 83B605C - obj_rot_scal_anim_frame 0xE0, 0xE0, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83B606C:: @ 83B606C - .4byte gSpriteAffineAnim_83B605C - - .align 2 -gBoxSelectionPopupPalette:: @ 83B6070 - .incbin "graphics/pokemon_storage/box_selection_popup.gbapal" - - .align 2 -gBoxSelectionPopupCenterTiles:: @ 83B6090 - .incbin "graphics/pokemon_storage/box_selection_popup_center.4bpp" - - .align 2 -gBoxSelectionPopupSidesTiles:: @ 83B6890 - .incbin "graphics/pokemon_storage/box_selection_popup_sides.4bpp" - .align 2 gPokemonStorageScrollingBGPalette:: @ 83B6A10 .incbin "graphics/pokemon_storage/scrolling_bg.gbapal" diff --git a/ld_script.txt b/ld_script.txt index d0256f397..4ac9ea4ee 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -510,6 +510,7 @@ SECTIONS { src/pokemon/pokedex.o(.rodata); src/engine/trainer_card.o(.rodata); src/battle/battle_party_menu.o(.rodata); + src/pokemon/pokemon_storage_system.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon/pokemon_icon.o(.rodata); src/pokemon/pokemon_summary_screen.o(.rodata); diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 8f0753a2d..bc43616a9 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -17,9 +17,9 @@ struct StorageAction { u8 format; }; -struct ReverseMenuAction { - u32 unk0; - u8 *text; +struct PSS_MenuStringPtrs { + const u8 *text; + const u8 *desc; }; struct PokemonStorageSystemData { @@ -27,16 +27,71 @@ struct PokemonStorageSystemData { u8 unk_0005; }; -const struct PokemonStorageSystemData *gUnknown_083B6DB4; +struct UnkPSSStruct_2002370 { + u8 filler_0000[0x23e]; + u8 unk_023e; + u16 unk_0240; + u16 unk_0242; +}; void StorageSystemCreatePrimaryMenu(u8 whichMenu); void task_intro_29(u8 whichMenu); +const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { + {PCText_WithdrawPoke, PCText_MovePokeToParty}, + {PCText_DepositPoke, PCText_StorePokeInBox}, + {PCText_MovePoke, PCText_OrganizeBoxesParty}, + {PCText_SeeYa, PCText_ReturnToPrevMenu} +}; + +const union AnimCmd gSpriteAnim_83B602C[] = { + ANIMCMD_FRAME( 0, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83B6034[] = { + ANIMCMD_FRAME( 4, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83B603C[] = { + ANIMCMD_FRAME( 6, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83B6044[] = { + ANIMCMD_FRAME(10, 5), + ANIMCMD_END +}; + +const union AnimCmd *const gSpriteAnimTable_83B604C[] = { + gSpriteAnim_83B602C, + gSpriteAnim_83B6034, + gSpriteAnim_83B603C, + gSpriteAnim_83B6044 +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B605C[] = { + AFFINEANIMCMD_FRAME(0xe0, 0xe0, 0, 0), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_83B606C[] = { + gSpriteAffineAnim_83B605C +}; + +const u16 gBoxSelectionPopupPalette[] = INCBIN_U16("graphics/pokemon_storage/box_selection_popup.gbapal"); + +const u8 gBoxSelectionPopupCenterTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_center.4bpp"); + +const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp"); + extern const struct StorageAction gUnknown_083B6DF4[]; -extern const struct ReverseMenuAction gUnknown_083B600C[]; +extern const struct PokemonStorageSystemData *gUnknown_083B6DB4; EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; EWRAM_DATA u8 gUnknown_02038474; +EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478; u8 sub_8095ADC(u8 boxId) { @@ -318,7 +373,7 @@ void Task_PokemonStorageSystem(u8 taskId) case 0: StorageSystemCreatePrimaryMenu(task->data[1]); MenuDisplayMessageBox(); - MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + MenuPrint(gUnknown_083B600C[task->data[1]].desc, 2, 15); task->data[0]++; break; case 1: @@ -342,7 +397,7 @@ void Task_PokemonStorageSystem(u8 taskId) { task->data[1] = task->data[3]; StorageSystemClearMessageWindow(); - MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + MenuPrint(gUnknown_083B600C[task->data[1]].desc, 2, 15); } break; case -1: @@ -378,7 +433,7 @@ void Task_PokemonStorageSystem(u8 taskId) if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { StorageSystemClearMessageWindow(); - MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + MenuPrint(gUnknown_083B600C[task->data[1]].desc, 2, 15); task->data[0] = 2; } else if (gMain.newKeys & DPAD_UP) @@ -388,7 +443,7 @@ void Task_PokemonStorageSystem(u8 taskId) MoveMenuCursor(-1); task->data[1] = GetMenuCursorPos(); StorageSystemClearMessageWindow(); - MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + MenuPrint(gUnknown_083B600C[task->data[1]].desc, 2, 15); task->data[0] = 2; } else if (gMain.newKeys & DPAD_DOWN) @@ -398,7 +453,7 @@ void Task_PokemonStorageSystem(u8 taskId) MoveMenuCursor(1); task->data[1] = GetMenuCursorPos(); StorageSystemClearMessageWindow(); - MenuPrint(gUnknown_083B600C[task->data[1]].text, 2, 15); + MenuPrint(gUnknown_083B600C[task->data[1]].desc, 2, 15); task->data[0] = 2; } break; @@ -428,11 +483,11 @@ void sub_8096130(void) pal_fill_black(); } -void StorageSystemCreatePrimaryMenu(u8 a0) +void StorageSystemCreatePrimaryMenu(u8 whichMenu) { MenuDrawTextWindow(0, 0, 13, 9); PrintMenuItems(1, 1, 4, (const struct MenuAction *)gUnknown_083B600C); - InitMenu(0, 1, 1, 4, a0, 12); + InitMenu(0, 1, 1, 4, whichMenu, 12); } void sub_80961A8(void) @@ -466,6 +521,24 @@ void ResetPokemonStorageSystem(void) } } +void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3) +{ + struct SpritePalette palette = { + gBoxSelectionPopupPalette, palTag + }; + struct SpriteSheet sheets[] = { + {gBoxSelectionPopupCenterTiles, 0x800, tileTag}, + {gBoxSelectionPopupSidesTiles, 0x180, tileTag + 1}, + {} + }; + LoadSpritePalette(&palette); + LoadSpriteSheets(sheets); + gUnknown_02038478 = a0; + a0->unk_0240 = tileTag; + a0->unk_0242 = palTag; + a0->unk_023e = a3; +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 344b8bffbb969cca8b1c23ddf994c0c8ec6fe1f8 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sat, 6 Jan 2018 22:41:38 +0100 Subject: Finished decompiling wisp_fire --- asm/wisp_fire.s | 534 -------------------------------------------- ld_script.txt | 1 - src/battle/anim/wisp_fire.c | 160 ++++++++++++- 3 files changed, 154 insertions(+), 541 deletions(-) delete mode 100755 asm/wisp_fire.s diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s deleted file mode 100755 index 5fc7a07ab..000000000 --- a/asm/wisp_fire.s +++ /dev/null @@ -1,534 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - @ wisp_fire - - thumb_func_start sub_80D5DDC -sub_80D5DDC: @ 80D5DDC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080D5E3C @ =gTasks - adds r4, r1, r0 - ldr r0, _080D5E40 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - movs r2, 0x1 - negs r2, r2 - adds r1, r2, 0 - cmp r0, 0 - bne _080D5E02 - movs r1, 0x1 -_080D5E02: - strh r1, [r4, 0x20] - ldr r0, _080D5E44 @ =gAnimBankTarget - ldrb r1, [r0] - movs r0, 0x2 - eors r0, r1 - bl IsAnimBankSpriteVisible - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1 - strh r0, [r4, 0x22] - movs r0, 0x1 - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x24] - movs r0, 0x3 - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x26] - ldr r0, _080D5E48 @ =sub_80D5E4C - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D5E3C: .4byte gTasks -_080D5E40: .4byte gAnimBankAttacker -_080D5E44: .4byte gAnimBankTarget -_080D5E48: .4byte sub_80D5E4C - thumb_func_end sub_80D5DDC - - thumb_func_start sub_80D5E4C -sub_80D5E4C: @ 80D5E4C - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _080D5E70 @ =gTasks - adds r2, r0, r1 - movs r0, 0x8 - ldrsh r3, [r2, r0] - cmp r3, 0x1 - beq _080D5F14 - cmp r3, 0x1 - bgt _080D5E74 - cmp r3, 0 - beq _080D5E82 - b _080D6074 - .align 2, 0 -_080D5E70: .4byte gTasks -_080D5E74: - cmp r3, 0x2 - bne _080D5E7A - b _080D5F9C -_080D5E7A: - cmp r3, 0x3 - bne _080D5E80 - b _080D6030 -_080D5E80: - b _080D6074 -_080D5E82: - movs r1, 0x20 - ldrsh r0, [r2, r1] - lsls r0, 1 - ldrh r5, [r2, 0x1C] - adds r0, r5 - strh r0, [r2, 0x1C] - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080D5EB4 - strh r3, [r2, 0xA] - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080D5EB0 - movs r0, 0x2 - b _080D5EB2 -_080D5EB0: - ldr r0, _080D5F0C @ =0x0000fffe -_080D5EB2: - strh r0, [r2, 0x1E] -_080D5EB4: - movs r1, 0 - strh r1, [r2, 0xE] - movs r7, 0x22 - ldrsh r0, [r2, r7] - cmp r1, r0 - bge _080D5EF6 - ldr r4, _080D5F10 @ =gSprites - adds r3, r2, 0 - adds r3, 0x8 -_080D5EC6: - movs r1, 0xE - ldrsh r0, [r2, r1] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r5, 0 - ldrsh r0, [r0, r5] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r2, 0x1E] - ldrh r7, [r2, 0x1C] - adds r0, r7 - strh r0, [r1, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r5, 0x22 - ldrsh r1, [r2, r5] - cmp r0, r1 - blt _080D5EC6 -_080D5EF6: - ldrh r0, [r2, 0x1A] - adds r0, 0x1 - strh r0, [r2, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - beq _080D5F06 - b _080D6074 -_080D5F06: - movs r0, 0 - strh r0, [r2, 0x1A] - b _080D6020 - .align 2, 0 -_080D5F0C: .4byte 0x0000fffe -_080D5F10: .4byte gSprites -_080D5F14: - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _080D5F3C - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] - ands r0, r3 - lsls r0, 16 - cmp r0, 0 - beq _080D5F38 - movs r0, 0x2 - b _080D5F3A -_080D5F38: - ldr r0, _080D5F94 @ =0x0000fffe -_080D5F3A: - strh r0, [r2, 0x1E] -_080D5F3C: - movs r1, 0 - strh r1, [r2, 0xE] - movs r7, 0x22 - ldrsh r0, [r2, r7] - cmp r1, r0 - bge _080D5F7E - ldr r4, _080D5F98 @ =gSprites - adds r3, r2, 0 - adds r3, 0x8 -_080D5F4E: - movs r1, 0xE - ldrsh r0, [r2, r1] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r5, 0 - ldrsh r0, [r0, r5] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r2, 0x1E] - ldrh r7, [r2, 0x1C] - adds r0, r7 - strh r0, [r1, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r5, 0x22 - ldrsh r1, [r2, r5] - cmp r0, r1 - blt _080D5F4E -_080D5F7E: - ldrh r0, [r2, 0x1A] - adds r0, 0x1 - strh r0, [r2, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x60 - bne _080D6074 - movs r0, 0 - strh r0, [r2, 0x1A] - b _080D6020 - .align 2, 0 -_080D5F94: .4byte 0x0000fffe -_080D5F98: .4byte gSprites -_080D5F9C: - movs r7, 0x20 - ldrsh r1, [r2, r7] - lsls r1, 1 - ldrh r0, [r2, 0x1C] - subs r0, r1 - strh r0, [r2, 0x1C] - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080D5FD0 - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080D5FCC - strh r3, [r2, 0x1E] - b _080D5FD0 -_080D5FCC: - ldr r0, _080D6028 @ =0x0000fffe - strh r0, [r2, 0x1E] -_080D5FD0: - movs r1, 0 - strh r1, [r2, 0xE] - movs r3, 0x22 - ldrsh r0, [r2, r3] - cmp r1, r0 - bge _080D6012 - ldr r4, _080D602C @ =gSprites - adds r3, r2, 0 - adds r3, 0x8 -_080D5FE2: - movs r5, 0xE - ldrsh r0, [r2, r5] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r7, 0 - ldrsh r0, [r0, r7] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - ldrh r0, [r2, 0x1E] - ldrh r5, [r2, 0x1C] - adds r0, r5 - strh r0, [r1, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r7, 0x22 - ldrsh r1, [r2, r7] - cmp r0, r1 - blt _080D5FE2 -_080D6012: - ldrh r0, [r2, 0x1A] - adds r0, 0x1 - strh r0, [r2, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - bne _080D6074 -_080D6020: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _080D6074 - .align 2, 0 -_080D6028: .4byte 0x0000fffe -_080D602C: .4byte gSprites -_080D6030: - movs r1, 0 - strh r1, [r2, 0xE] - movs r3, 0x22 - ldrsh r0, [r2, r3] - cmp r1, r0 - bge _080D606E - ldr r6, _080D607C @ =gSprites - adds r3, r2, 0 - adds r3, 0x8 - movs r5, 0 -_080D6044: - movs r7, 0xE - ldrsh r0, [r2, r7] - adds r0, 0xE - lsls r0, 1 - adds r0, r3, r0 - movs r7, 0 - ldrsh r1, [r0, r7] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - strh r5, [r0, 0x24] - ldrh r0, [r2, 0xE] - adds r0, 0x1 - strh r0, [r2, 0xE] - lsls r0, 16 - asrs r0, 16 - movs r7, 0x22 - ldrsh r1, [r2, r7] - cmp r0, r1 - blt _080D6044 -_080D606E: - adds r0, r4, 0 - bl DestroyAnimVisualTask -_080D6074: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080D607C: .4byte gSprites - thumb_func_end sub_80D5E4C - - thumb_func_start sub_80D6080 -sub_80D6080: @ 80D6080 - push {r4,lr} - sub sp, 0xC - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - mov r0, sp - bl sub_8078914 - mov r0, sp - ldrb r0, [r0, 0x8] - lsls r0, 4 - ldr r1, _080D60B0 @ =gBattleAnimArgs - ldrb r2, [r1] - ldrh r3, [r1, 0x2] - movs r1, 0x10 - bl BlendPalette - adds r0, r4, 0 - bl DestroyAnimVisualTask - add sp, 0xC - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080D60B0: .4byte gBattleAnimArgs - thumb_func_end sub_80D6080 - - thumb_func_start sub_80D60B4 -sub_80D60B4: @ 80D60B4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, _080D610C @ =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - mov r9, r1 - ldr r4, _080D6110 @ =gBattleAnimArgs - mov r8, r4 - cmp r0, 0 - bne _080D60EA - ldrh r0, [r4] - strh r0, [r2, 0xA] - ldrh r0, [r4, 0x2] - strh r0, [r2, 0xC] - ldrh r0, [r4, 0x4] - strh r0, [r2, 0xE] - ldrh r0, [r4, 0x6] - strh r0, [r2, 0x10] -_080D60EA: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - ldr r1, _080D6114 @ =gObjectBankIDs - ldr r0, _080D6118 @ =gAnimBankTarget - ldrb r0, [r0] - adds r0, r1 - ldrb r6, [r0] - movs r5, 0x10 - ldrsh r0, [r2, r5] - cmp r0, 0 - bne _080D6120 - ldr r4, _080D611C @ =gUnknown_083D9794 - movs r1, 0x8 - ldrsh r0, [r2, r1] - b _080D6126 - .align 2, 0 -_080D610C: .4byte gTasks -_080D6110: .4byte gBattleAnimArgs -_080D6114: .4byte gObjectBankIDs -_080D6118: .4byte gAnimBankTarget -_080D611C: .4byte gUnknown_083D9794 -_080D6120: - ldr r4, _080D616C @ =gUnknown_083D97A4 - movs r3, 0x8 - ldrsh r0, [r2, r3] -_080D6126: - movs r1, 0xA - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - adds r0, r4 - ldrb r5, [r0] - lsls r0, r7, 2 - adds r1, r0, r7 - lsls r1, 3 - add r1, r9 - movs r4, 0xE - ldrsh r1, [r1, r4] - mov r12, r0 - cmp r1, 0x1 - bne _080D6174 - ldr r2, _080D6170 @ =gSprites - lsls r3, r6, 4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - mov r10, r0 - mov r0, r8 - movs r4, 0x2 - ldrsh r1, [r0, r4] - lsls r0, r5, 24 - asrs r0, 24 - muls r0, r1 - cmp r0, 0 - bge _080D6164 - negs r0, r0 -_080D6164: - mov r5, r10 - strh r0, [r5, 0x26] - b _080D618E - .align 2, 0 -_080D616C: .4byte gUnknown_083D97A4 -_080D6170: .4byte gSprites -_080D6174: - ldr r3, _080D61C4 @ =gSprites - lsls r4, r6, 4 - adds r2, r4, r6 - lsls r2, 2 - adds r2, r3 - lsls r0, r5, 24 - asrs r0, 24 - mov r5, r8 - ldrh r1, [r5, 0x2] - muls r0, r1 - strh r0, [r2, 0x24] - adds r2, r3, 0 - adds r3, r4, 0 -_080D618E: - mov r1, r12 - adds r0, r1, r7 - lsls r0, 3 - add r0, r9 - movs r4, 0x8 - ldrsh r1, [r0, r4] - movs r5, 0xA - ldrsh r0, [r0, r5] - cmp r1, r0 - bne _080D61B4 - adds r0, r3, r6 - lsls r0, 2 - adds r0, r2 - movs r1, 0 - strh r1, [r0, 0x24] - strh r1, [r0, 0x26] - adds r0, r7, 0 - bl DestroyAnimVisualTask -_080D61B4: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080D61C4: .4byte gSprites - thumb_func_end sub_80D60B4 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 125d288cf..3af44e1c6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -284,7 +284,6 @@ SECTIONS { src/battle/anim/heated_rock.o(.text); src/battle/anim/wisp_orb.o(.text); src/battle/anim/wisp_fire.o(.text); - asm/wisp_fire.o(.text); src/battle/anim/thunder.o(.text); src/battle/anim/beta_beat_up.o(.text); src/battle/anim/shock.o(.text); diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c index e31c15d9c..348ce6426 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -1,12 +1,20 @@ #include "global.h" #include "battle_anim.h" +#include "blend_palette.h" #include "main.h" #include "rom_8077ABC.h" +#include "task.h" #include "trig.h" extern s16 gBattleAnimArgs[]; extern u8 gAnimBankTarget; -// extern u8 gAnimBankAttacker; +extern u8 gAnimBankAttacker; + +extern u8 gObjectBankIDs[]; +extern s8 gUnknown_083D9794[16]; +extern s8 gUnknown_083D97A4[16]; + +void sub_80D5E4C(u8 taskId); void sub_80D5CC0(struct Sprite *sprite) { @@ -25,15 +33,19 @@ void sub_80D5CC0(struct Sprite *sprite) sprite->data[1] = (sprite->data[1] + 7) & 0xFF; if (gMain.inBattle) - if ((u16) (sprite->data[1] - 0x40) > 0x83) + { + if (sprite->data[1] < 64 || sprite->data[1] > 195) sprite->oam.priority = sub_8079ED4(gAnimBankTarget); else sprite->oam.priority = sub_8079ED4(gAnimBankTarget) + 1; + } else - if ((u16) (sprite->data[1] - 0x40) > 0x83) + { + if (sprite->data[1] < 64 || sprite->data[1] > 195) sprite->subpriority = 0x1D; else sprite->subpriority = 0x1F; + } if (++sprite->data[2] > 0x14) sprite->invisible ^= 1; @@ -42,7 +54,143 @@ void sub_80D5CC0(struct Sprite *sprite) DestroyAnimSprite(sprite); } -// void sub_80D5DDC(struct Sprite *sprite) -// { +void sub_80D5DDC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + task->data[12] = !GetBankSide(gAnimBankAttacker) ? 1 : -1; + task->data[13] = IsAnimBankSpriteVisible(gAnimBankTarget ^ 2) + 1; + task->data[14] = GetAnimBankSpriteId(1); + task->data[15] = GetAnimBankSpriteId(3); + + task->func = sub_80D5E4C; +} + +void sub_80D5E4C(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[10] += task->data[12] * 2; + if (++task->data[1] >= 2) + { + task->data[1] = 0; + task->data[2]++; + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 16) + { + task->data[9] = 0; + task->data[0]++; + } + break; + case 1: + if (++task->data[1] >= 5) + { + task->data[1] = 0; + task->data[2]++; + + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } + + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 96) + { + task->data[9] = 0; + task->data[0]++; + } + break; + case 2: + task->data[10] -= task->data[12] * 2; + + if (++task->data[1] >= 2) + { + task->data[1] = 0; + task->data[2]++; + + if (task->data[2] & 1) + task->data[11] = 2; + else + task->data[11] = -2; + } -// } \ No newline at end of file + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11]; + } + + if (++task->data[9] == 16) + { + task->data[0]++; + } + break; + case 3: + for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++) + { + gSprites[task->data[task->data[3] + 14]].pos2.x = 0; + } + + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80D6080(u8 taskId) +{ + struct Struct_sub_8078914 unk; + sub_8078914(&unk); + BlendPalette(unk.field_8 << 4, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]); // u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor + DestroyAnimVisualTask(taskId); +} + +void sub_80D60B4(u8 taskId) +{ + s8 unk; + u8 spriteId; + + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[1] = gBattleAnimArgs[0]; + gTasks[taskId].data[2] = gBattleAnimArgs[1]; + gTasks[taskId].data[3] = gBattleAnimArgs[2]; + gTasks[taskId].data[4] = gBattleAnimArgs[3]; + } + gTasks[taskId].data[0]++; + + spriteId = gObjectBankIDs[gAnimBankTarget]; + + if (!gTasks[taskId].data[4]) + unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10]; + else + unk = gUnknown_083D97A4[gTasks[taskId].data[0] % 10]; + + if (gTasks[taskId].data[3] == 1) + gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * unk < 0 ? -(gBattleAnimArgs[1] * unk) : gBattleAnimArgs[1] * unk; + else + gSprites[spriteId].pos2.x = gBattleAnimArgs[1] * unk; + + if (gTasks[taskId].data[0] == gTasks[taskId].data[1]) + { + gSprites[spriteId].pos2.x = 0; + gSprites[spriteId].pos2.y = 0; + DestroyAnimVisualTask(taskId); + } +} \ No newline at end of file -- cgit v1.2.3 From dbcd5075b036cdd700cdff2b863e9884037ddfca Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 7 Jan 2018 01:47:42 +0100 Subject: Split battle_anim_81258BC.s and decompile unused --- Makefile | 2 +- asm/battle_anim_81258BC.s | 732 -------------------------------------------- asm/battle_anim_sfx.s | 677 ++++++++++++++++++++++++++++++++++++++++ ld_script.txt | 6 +- src/battle/anim/sfx.c | 2 + src/unused/unused_8124F94.c | 126 ++++++++ src/unused/unused_81258BC.c | 36 +++ src/unused_8124F94.c | 126 -------- 8 files changed, 846 insertions(+), 861 deletions(-) delete mode 100644 asm/battle_anim_81258BC.s create mode 100644 asm/battle_anim_sfx.s create mode 100644 src/battle/anim/sfx.c create mode 100644 src/unused/unused_8124F94.c create mode 100644 src/unused/unused_81258BC.c delete mode 100644 src/unused_8124F94.c diff --git a/Makefile b/Makefile index c1f6a6b4f..275df021e 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d $(VERSIONS) $(VERSIONS:%=compare_%) -$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs}})) +$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs,/unused}})) C_SRCS := $(shell find src -iname "*.c") ASM_SRCS := $(wildcard asm/*.s) diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s deleted file mode 100644 index 2c19ad731..000000000 --- a/asm/battle_anim_81258BC.s +++ /dev/null @@ -1,732 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start unref_sub_812AECC -unref_sub_812AECC: @ 812AECC - push {lr} - bl RunMysteryEventScript - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x1 - beq _0812AEEA - cmp r0, 0x1 - ble _0812AF08 - cmp r1, 0x2 - beq _0812AEF4 - cmp r1, 0x3 - beq _0812AEFA - b _0812AF08 -_0812AEEA: - movs r0, 0x16 - bl PlaySE - movs r0, 0x1 - b _0812AF0A -_0812AEF4: - bl sub_812AF10 - b _0812AF08 -_0812AEFA: - movs r0, 0x16 - bl PlaySE - bl sub_812AF10 - movs r0, 0x1 - b _0812AF0A -_0812AF08: - movs r0, 0 -_0812AF0A: - pop {r1} - bx r1 - thumb_func_end unref_sub_812AECC - - thumb_func_start sub_812AF10 -sub_812AF10: @ 812AF10 - push {lr} - movs r0, 0x2 - movs r1, 0xE - movs r2, 0x1B - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r0, _0812AF2C @ =gStringVar4 - movs r1, 0x3 - movs r2, 0xF - bl MenuPrint - pop {r0} - bx r0 - .align 2, 0 -_0812AF2C: .4byte gStringVar4 - thumb_func_end sub_812AF10 - - thumb_func_start sub_812AF30 -sub_812AF30: @ 812AF30 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0812AF8C @ =gTasks - lsls r6, r0, 2 - adds r6, r0 - lsls r6, 3 - adds r6, r1 - ldr r1, _0812AF90 @ =gBattleAnimArgs - ldrh r0, [r1] - strh r0, [r6, 0x8] - ldrh r0, [r1, 0x2] - strh r0, [r6, 0xA] - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r5, r0, 0 - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x2 - bl CalculatePanIncrement - strh r4, [r6, 0xC] - strh r5, [r6, 0xE] - lsls r0, 24 - asrs r0, 24 - strh r0, [r6, 0x10] - movs r0, 0xA - strh r0, [r6, 0x1C] - ldr r0, _0812AF94 @ =sub_812AF98 - str r0, [r6] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812AF8C: .4byte gTasks -_0812AF90: .4byte gBattleAnimArgs -_0812AF94: .4byte sub_812AF98 - thumb_func_end sub_812AF30 - - thumb_func_start sub_812AF98 -sub_812AF98: @ 812AF98 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0812AFC8 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r5, [r4, 0xC] - ldrb r6, [r4, 0x10] - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6F - bne _0812AFD0 - movs r0, 0x5 - strh r0, [r4, 0x1C] - strh r1, [r4, 0x1E] - ldr r0, _0812AFCC @ =sub_812B004 - str r0, [r4] - b _0812AFFE - .align 2, 0 -_0812AFC8: .4byte gTasks -_0812AFCC: .4byte sub_812B004 -_0812AFD0: - ldrh r0, [r4, 0x1C] - adds r0, 0x1 - strh r0, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xB - bne _0812AFEA - strh r1, [r4, 0x1C] - ldrh r0, [r4, 0x8] - lsls r1, r5, 24 - asrs r1, 24 - bl PlaySE12WithPanning -_0812AFEA: - lsls r1, r6, 24 - asrs r1, 24 - lsls r0, r5, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - asrs r0, 16 - bl sub_8077104 - strh r0, [r4, 0xC] -_0812AFFE: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812AF98 - - thumb_func_start sub_812B004 -sub_812B004: @ 812B004 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _0812B054 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x1C] - adds r0, 0x1 - strh r0, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _0812B04C - movs r0, 0 - strh r0, [r4, 0x1C] - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - ldrh r0, [r4, 0xA] - lsls r1, 24 - asrs r1, 24 - bl PlaySE12WithPanning - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - bne _0812B04C - adds r0, r5, 0 - bl DestroyAnimSoundTask -_0812B04C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B054: .4byte gTasks - thumb_func_end sub_812B004 - - thumb_func_start sub_812B058 -sub_812B058: @ 812B058 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r8, r0 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, _0812B0FC @ =gBattleAnimArgs - ldrh r1, [r0] - str r1, [sp] - ldrb r5, [r0, 0x4] - ldrb r6, [r0, 0x6] - ldrb r3, [r0, 0x8] - mov r10, r3 - ldrb r7, [r0, 0xA] - ldrb r1, [r0, 0xC] - mov r9, r1 - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - asrs r5, 24 - adds r0, r5, 0 - bl BattleAnimAdjustPanning - adds r5, r0, 0 - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - lsls r6, 24 - asrs r6, 24 - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl CalculatePanIncrement - ldr r2, _0812B100 @ =gTasks - mov r3, r8 - lsls r1, r3, 2 - add r1, r8 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - mov r6, sp - ldrh r6, [r6] - strh r6, [r1, 0x8] - strh r4, [r1, 0xA] - strh r5, [r1, 0xC] - lsls r0, 24 - asrs r0, 24 - strh r0, [r1, 0xE] - mov r0, r10 - strh r0, [r1, 0x10] - strh r7, [r1, 0x12] - mov r3, r9 - strh r3, [r1, 0x14] - strh r2, [r1, 0x1C] - strh r4, [r1, 0x1E] - strh r3, [r1, 0x20] - ldr r2, _0812B104 @ =sub_812B108 - str r2, [r1] - mov r0, r8 - bl _call_via_r2 - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812B0FC: .4byte gBattleAnimArgs -_0812B100: .4byte gTasks -_0812B104: .4byte sub_812B108 - thumb_func_end sub_812B058 - - thumb_func_start sub_812B108 -sub_812B108: @ 812B108 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _0812B14C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x20] - adds r1, r0, 0x1 - strh r1, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x14 - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _0812B150 - movs r0, 0 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x8] - movs r1, 0x1E - ldrsb r1, [r4, r1] - bl PlaySE12WithPanning - ldrh r0, [r4, 0x10] - subs r0, 0x1 - strh r0, [r4, 0x10] - lsls r0, 16 - cmp r0, 0 - bne _0812B150 - adds r0, r5, 0 - bl DestroyAnimSoundTask - b _0812B182 - .align 2, 0 -_0812B14C: .4byte gTasks -_0812B150: - ldr r1, _0812B188 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _0812B182 - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r0, [r4, 0xE] - ldrh r1, [r4, 0x1E] - adds r0, r1 - strh r0, [r4, 0x1E] - movs r2, 0x1E - ldrsh r0, [r4, r2] - bl sub_8077104 - strh r0, [r4, 0x1E] -_0812B182: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B188: .4byte gTasks - thumb_func_end sub_812B108 - - thumb_func_start sub_812B18C -sub_812B18C: @ 812B18C - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - lsls r0, 24 - lsrs r6, r0, 24 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _0812B1CC - ldr r0, _0812B1BC @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812B1C4 - ldr r0, _0812B1C0 @ =gSharedMem + 0x19348 - ldrh r4, [r0] - b _0812B272 - .align 2, 0 -_0812B1BC: .4byte gBattleAnimArgs -_0812B1C0: .4byte gSharedMem + 0x19348 -_0812B1C4: - adds r0, r5, 0 - bl DestroyAnimVisualTask - b _0812B272 -_0812B1CC: - ldr r0, _0812B1E0 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r1, [r0, r2] - adds r2, r0, 0 - cmp r1, 0 - bne _0812B1E8 - ldr r0, _0812B1E4 @ =gAnimBankAttacker - ldrb r4, [r0] - b _0812B20E - .align 2, 0 -_0812B1E0: .4byte gBattleAnimArgs -_0812B1E4: .4byte gAnimBankAttacker -_0812B1E8: - cmp r1, 0x1 - bne _0812B1F8 - ldr r0, _0812B1F4 @ =gAnimBankTarget - ldrb r4, [r0] - b _0812B20E - .align 2, 0 -_0812B1F4: .4byte gAnimBankTarget -_0812B1F8: - cmp r1, 0x2 - bne _0812B204 - ldr r0, _0812B200 @ =gAnimBankAttacker - b _0812B206 - .align 2, 0 -_0812B200: .4byte gAnimBankAttacker -_0812B204: - ldr r0, _0812B230 @ =gAnimBankTarget -_0812B206: - ldrb r1, [r0] - movs r0, 0x2 - adds r4, r0, 0 - eors r4, r1 -_0812B20E: - movs r1, 0 - ldrsh r0, [r2, r1] - cmp r0, 0x1 - beq _0812B21A - cmp r0, 0x3 - bne _0812B234 -_0812B21A: - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - bne _0812B234 - adds r0, r5, 0 - bl DestroyAnimVisualTask - b _0812B2B0 - .align 2, 0 -_0812B230: .4byte gAnimBankTarget -_0812B234: - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _0812B258 - ldr r1, _0812B250 @ =gBattlePartyID - lsls r0, r4, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _0812B254 @ =gEnemyParty - b _0812B266 - .align 2, 0 -_0812B250: .4byte gBattlePartyID -_0812B254: .4byte gEnemyParty -_0812B258: - ldr r1, _0812B290 @ =gBattlePartyID - lsls r0, r4, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _0812B294 @ =gPlayerParty -_0812B266: - adds r0, r1 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 -_0812B272: - cmp r4, 0 - beq _0812B2AA - ldr r0, _0812B298 @ =gBattleAnimArgs - ldrh r2, [r0, 0x2] - movs r1, 0x2 - ldrsh r0, [r0, r1] - cmp r0, 0xFF - bne _0812B29C - lsls r1, r6, 24 - asrs r1, 24 - adds r0, r4, 0 - bl PlayCry1 - b _0812B2AA - .align 2, 0 -_0812B290: .4byte gBattlePartyID -_0812B294: .4byte gPlayerParty -_0812B298: .4byte gBattleAnimArgs -_0812B29C: - lsls r1, r6, 24 - asrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - adds r0, r4, 0 - bl PlayCry3 -_0812B2AA: - adds r0, r5, 0 - bl DestroyAnimVisualTask -_0812B2B0: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812B18C - - thumb_func_start sub_812B2B8 -sub_812B2B8: @ 812B2B8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - lsls r0, 24 - lsrs r4, r0, 24 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _0812B2DC - ldr r0, _0812B2D8 @ =gSharedMem + 0x19348 - b _0812B2E6 - .align 2, 0 -_0812B2D8: .4byte gSharedMem + 0x19348 -_0812B2DC: - ldr r1, _0812B304 @ =gAnimSpeciesByBanks - ldr r0, _0812B308 @ =gAnimBankAttacker - ldrb r0, [r0] - lsls r0, 1 - adds r0, r1 -_0812B2E6: - ldrh r0, [r0] - cmp r0, 0 - beq _0812B2F6 - lsls r1, r4, 24 - asrs r1, 24 - movs r2, 0x4 - bl PlayCry3 -_0812B2F6: - adds r0, r5, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B304: .4byte gAnimSpeciesByBanks -_0812B308: .4byte gAnimBankAttacker - thumb_func_end sub_812B2B8 - - thumb_func_start sub_812B30C -sub_812B30C: @ 812B30C - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0812B33C @ =gBattleAnimArgs - ldrh r5, [r0] - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - adds r0, r5, 0 - bl PlaySE1WithPanning - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B33C: .4byte gBattleAnimArgs - thumb_func_end sub_812B30C - - thumb_func_start sub_812B340 -sub_812B340: @ 812B340 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0812B370 @ =gBattleAnimArgs - ldrh r5, [r0] - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - adds r0, r5, 0 - bl PlaySE2WithPanning - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B370: .4byte gBattleAnimArgs - thumb_func_end sub_812B340 - - thumb_func_start sub_812B374 -sub_812B374: @ 812B374 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - mov r8, r0 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, _0812B3F8 @ =gBattleAnimArgs - ldrb r5, [r0, 0x2] - ldrb r6, [r0, 0x4] - ldrh r1, [r0, 0x6] - mov r9, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - asrs r5, 24 - adds r0, r5, 0 - bl BattleAnimAdjustPanning - adds r5, r0, 0 - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - lsls r6, 24 - asrs r6, 24 - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl CalculatePanIncrement - ldr r2, _0812B3FC @ =gTasks - mov r3, r8 - lsls r1, r3, 2 - add r1, r8 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r4, [r1, 0xA] - strh r5, [r1, 0xC] - lsls r0, 24 - asrs r0, 24 - strh r0, [r1, 0xE] - mov r0, r9 - strh r0, [r1, 0x12] - strh r2, [r1, 0x1C] - strh r4, [r1, 0x1E] - ldr r2, _0812B400 @ =sub_812B404 - str r2, [r1] - mov r0, r8 - bl _call_via_r2 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812B3F8: .4byte gBattleAnimArgs -_0812B3FC: .4byte gTasks -_0812B400: .4byte sub_812B404 - thumb_func_end sub_812B374 - - thumb_func_start sub_812B404 -sub_812B404: @ 812B404 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - ldr r1, _0812B45C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r2, [r4, 0xE] - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x12 - ldrsh r1, [r4, r3] - cmp r0, r1 - bne _0812B43E - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r1, [r4, 0x1E] - adds r0, r2, r1 - strh r0, [r4, 0x1E] - movs r2, 0x1E - ldrsh r0, [r4, r2] - bl sub_8077104 - strh r0, [r4, 0x1E] -_0812B43E: - ldr r1, _0812B460 @ =gUnknown_0202F7D2 - ldrh r0, [r4, 0x1E] - strb r0, [r1] - movs r3, 0x1E - ldrsh r1, [r4, r3] - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _0812B456 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_0812B456: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B45C: .4byte gTasks -_0812B460: .4byte gUnknown_0202F7D2 - thumb_func_end sub_812B404 - - .align 2, 0 @ Don't pad with nop. - \ No newline at end of file diff --git a/asm/battle_anim_sfx.s b/asm/battle_anim_sfx.s new file mode 100644 index 000000000..520c119cb --- /dev/null +++ b/asm/battle_anim_sfx.s @@ -0,0 +1,677 @@ + .include "constants/gba_constants.inc" + .include "asm/macros.inc" + + .syntax unified + + .text + + thumb_func_start sub_812AF30 +sub_812AF30: @ 812AF30 + push {r4-r6,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r1, _0812AF8C @ =gTasks + lsls r6, r0, 2 + adds r6, r0 + lsls r6, 3 + adds r6, r1 + ldr r1, _0812AF90 @ =gBattleAnimArgs + ldrh r0, [r1] + strh r0, [r6, 0x8] + ldrh r0, [r1, 0x2] + strh r0, [r6, 0xA] + movs r0, 0x40 + negs r0, r0 + bl BattleAnimAdjustPanning + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0x3F + bl BattleAnimAdjustPanning + adds r5, r0, 0 + lsls r4, 24 + asrs r4, 24 + lsls r5, 24 + asrs r5, 24 + adds r0, r4, 0 + adds r1, r5, 0 + movs r2, 0x2 + bl CalculatePanIncrement + strh r4, [r6, 0xC] + strh r5, [r6, 0xE] + lsls r0, 24 + asrs r0, 24 + strh r0, [r6, 0x10] + movs r0, 0xA + strh r0, [r6, 0x1C] + ldr r0, _0812AF94 @ =sub_812AF98 + str r0, [r6] + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_0812AF8C: .4byte gTasks +_0812AF90: .4byte gBattleAnimArgs +_0812AF94: .4byte sub_812AF98 + thumb_func_end sub_812AF30 + + thumb_func_start sub_812AF98 +sub_812AF98: @ 812AF98 + push {r4-r6,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, _0812AFC8 @ =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r4, r1, r2 + ldrh r5, [r4, 0xC] + ldrb r6, [r4, 0x10] + ldrh r0, [r4, 0x1E] + adds r0, 0x1 + movs r1, 0 + strh r0, [r4, 0x1E] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x6F + bne _0812AFD0 + movs r0, 0x5 + strh r0, [r4, 0x1C] + strh r1, [r4, 0x1E] + ldr r0, _0812AFCC @ =sub_812B004 + str r0, [r4] + b _0812AFFE + .align 2, 0 +_0812AFC8: .4byte gTasks +_0812AFCC: .4byte sub_812B004 +_0812AFD0: + ldrh r0, [r4, 0x1C] + adds r0, 0x1 + strh r0, [r4, 0x1C] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0xB + bne _0812AFEA + strh r1, [r4, 0x1C] + ldrh r0, [r4, 0x8] + lsls r1, r5, 24 + asrs r1, 24 + bl PlaySE12WithPanning +_0812AFEA: + lsls r1, r6, 24 + asrs r1, 24 + lsls r0, r5, 16 + asrs r0, 16 + adds r0, r1 + lsls r0, 16 + asrs r0, 16 + bl sub_8077104 + strh r0, [r4, 0xC] +_0812AFFE: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_812AF98 + + thumb_func_start sub_812B004 +sub_812B004: @ 812B004 + push {r4,r5,lr} + lsls r0, 24 + lsrs r5, r0, 24 + ldr r1, _0812B054 @ =gTasks + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + adds r4, r0, r1 + ldrh r0, [r4, 0x1C] + adds r0, 0x1 + strh r0, [r4, 0x1C] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x6 + bne _0812B04C + movs r0, 0 + strh r0, [r4, 0x1C] + movs r0, 0x3F + bl BattleAnimAdjustPanning + adds r1, r0, 0 + ldrh r0, [r4, 0xA] + lsls r1, 24 + asrs r1, 24 + bl PlaySE12WithPanning + ldrh r0, [r4, 0x1E] + adds r0, 0x1 + strh r0, [r4, 0x1E] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x2 + bne _0812B04C + adds r0, r5, 0 + bl DestroyAnimSoundTask +_0812B04C: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_0812B054: .4byte gTasks + thumb_func_end sub_812B004 + + thumb_func_start sub_812B058 +sub_812B058: @ 812B058 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x4 + mov r8, r0 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + ldr r0, _0812B0FC @ =gBattleAnimArgs + ldrh r1, [r0] + str r1, [sp] + ldrb r5, [r0, 0x4] + ldrb r6, [r0, 0x6] + ldrb r3, [r0, 0x8] + mov r10, r3 + ldrb r7, [r0, 0xA] + ldrb r1, [r0, 0xC] + mov r9, r1 + ldrb r0, [r0, 0x2] + lsls r0, 24 + asrs r0, 24 + bl BattleAnimAdjustPanning + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + lsls r5, 24 + asrs r5, 24 + adds r0, r5, 0 + bl BattleAnimAdjustPanning + adds r5, r0, 0 + lsls r4, 24 + asrs r4, 24 + lsls r5, 24 + asrs r5, 24 + lsls r6, 24 + asrs r6, 24 + adds r0, r4, 0 + adds r1, r5, 0 + adds r2, r6, 0 + bl CalculatePanIncrement + ldr r2, _0812B100 @ =gTasks + mov r3, r8 + lsls r1, r3, 2 + add r1, r8 + lsls r1, 3 + adds r1, r2 + movs r2, 0 + mov r6, sp + ldrh r6, [r6] + strh r6, [r1, 0x8] + strh r4, [r1, 0xA] + strh r5, [r1, 0xC] + lsls r0, 24 + asrs r0, 24 + strh r0, [r1, 0xE] + mov r0, r10 + strh r0, [r1, 0x10] + strh r7, [r1, 0x12] + mov r3, r9 + strh r3, [r1, 0x14] + strh r2, [r1, 0x1C] + strh r4, [r1, 0x1E] + strh r3, [r1, 0x20] + ldr r2, _0812B104 @ =sub_812B108 + str r2, [r1] + mov r0, r8 + bl _call_via_r2 + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_0812B0FC: .4byte gBattleAnimArgs +_0812B100: .4byte gTasks +_0812B104: .4byte sub_812B108 + thumb_func_end sub_812B058 + + thumb_func_start sub_812B108 +sub_812B108: @ 812B108 + push {r4,r5,lr} + lsls r0, 24 + lsrs r5, r0, 24 + ldr r1, _0812B14C @ =gTasks + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + adds r4, r0, r1 + ldrh r0, [r4, 0x20] + adds r1, r0, 0x1 + strh r1, [r4, 0x20] + lsls r0, 16 + asrs r0, 16 + movs r2, 0x14 + ldrsh r1, [r4, r2] + cmp r0, r1 + bne _0812B150 + movs r0, 0 + strh r0, [r4, 0x20] + ldrh r0, [r4, 0x8] + movs r1, 0x1E + ldrsb r1, [r4, r1] + bl PlaySE12WithPanning + ldrh r0, [r4, 0x10] + subs r0, 0x1 + strh r0, [r4, 0x10] + lsls r0, 16 + cmp r0, 0 + bne _0812B150 + adds r0, r5, 0 + bl DestroyAnimSoundTask + b _0812B182 + .align 2, 0 +_0812B14C: .4byte gTasks +_0812B150: + ldr r1, _0812B188 @ =gTasks + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + adds r4, r0, r1 + ldrh r0, [r4, 0x1C] + adds r1, r0, 0x1 + strh r1, [r4, 0x1C] + lsls r0, 16 + asrs r0, 16 + movs r2, 0x12 + ldrsh r1, [r4, r2] + cmp r0, r1 + bne _0812B182 + movs r0, 0 + strh r0, [r4, 0x1C] + ldrh r0, [r4, 0xE] + ldrh r1, [r4, 0x1E] + adds r0, r1 + strh r0, [r4, 0x1E] + movs r2, 0x1E + ldrsh r0, [r4, r2] + bl sub_8077104 + strh r0, [r4, 0x1E] +_0812B182: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_0812B188: .4byte gTasks + thumb_func_end sub_812B108 + + thumb_func_start sub_812B18C +sub_812B18C: @ 812B18C + push {r4-r6,lr} + lsls r0, 24 + lsrs r5, r0, 24 + movs r4, 0 + movs r0, 0x40 + negs r0, r0 + bl BattleAnimAdjustPanning + lsls r0, 24 + lsrs r6, r0, 24 + bl IsContest + lsls r0, 24 + cmp r0, 0 + beq _0812B1CC + ldr r0, _0812B1BC @ =gBattleAnimArgs + movs r1, 0 + ldrsh r0, [r0, r1] + cmp r0, 0 + bne _0812B1C4 + ldr r0, _0812B1C0 @ =gSharedMem + 0x19348 + ldrh r4, [r0] + b _0812B272 + .align 2, 0 +_0812B1BC: .4byte gBattleAnimArgs +_0812B1C0: .4byte gSharedMem + 0x19348 +_0812B1C4: + adds r0, r5, 0 + bl DestroyAnimVisualTask + b _0812B272 +_0812B1CC: + ldr r0, _0812B1E0 @ =gBattleAnimArgs + movs r2, 0 + ldrsh r1, [r0, r2] + adds r2, r0, 0 + cmp r1, 0 + bne _0812B1E8 + ldr r0, _0812B1E4 @ =gAnimBankAttacker + ldrb r4, [r0] + b _0812B20E + .align 2, 0 +_0812B1E0: .4byte gBattleAnimArgs +_0812B1E4: .4byte gAnimBankAttacker +_0812B1E8: + cmp r1, 0x1 + bne _0812B1F8 + ldr r0, _0812B1F4 @ =gAnimBankTarget + ldrb r4, [r0] + b _0812B20E + .align 2, 0 +_0812B1F4: .4byte gAnimBankTarget +_0812B1F8: + cmp r1, 0x2 + bne _0812B204 + ldr r0, _0812B200 @ =gAnimBankAttacker + b _0812B206 + .align 2, 0 +_0812B200: .4byte gAnimBankAttacker +_0812B204: + ldr r0, _0812B230 @ =gAnimBankTarget +_0812B206: + ldrb r1, [r0] + movs r0, 0x2 + adds r4, r0, 0 + eors r4, r1 +_0812B20E: + movs r1, 0 + ldrsh r0, [r2, r1] + cmp r0, 0x1 + beq _0812B21A + cmp r0, 0x3 + bne _0812B234 +_0812B21A: + adds r0, r4, 0 + bl IsAnimBankSpriteVisible + lsls r0, 24 + cmp r0, 0 + bne _0812B234 + adds r0, r5, 0 + bl DestroyAnimVisualTask + b _0812B2B0 + .align 2, 0 +_0812B230: .4byte gAnimBankTarget +_0812B234: + adds r0, r4, 0 + bl GetBankSide + lsls r0, 24 + cmp r0, 0 + beq _0812B258 + ldr r1, _0812B250 @ =gBattlePartyID + lsls r0, r4, 1 + adds r0, r1 + ldrh r1, [r0] + movs r0, 0x64 + muls r0, r1 + ldr r1, _0812B254 @ =gEnemyParty + b _0812B266 + .align 2, 0 +_0812B250: .4byte gBattlePartyID +_0812B254: .4byte gEnemyParty +_0812B258: + ldr r1, _0812B290 @ =gBattlePartyID + lsls r0, r4, 1 + adds r0, r1 + ldrh r1, [r0] + movs r0, 0x64 + muls r0, r1 + ldr r1, _0812B294 @ =gPlayerParty +_0812B266: + adds r0, r1 + movs r1, 0xB + bl GetMonData + lsls r0, 16 + lsrs r4, r0, 16 +_0812B272: + cmp r4, 0 + beq _0812B2AA + ldr r0, _0812B298 @ =gBattleAnimArgs + ldrh r2, [r0, 0x2] + movs r1, 0x2 + ldrsh r0, [r0, r1] + cmp r0, 0xFF + bne _0812B29C + lsls r1, r6, 24 + asrs r1, 24 + adds r0, r4, 0 + bl PlayCry1 + b _0812B2AA + .align 2, 0 +_0812B290: .4byte gBattlePartyID +_0812B294: .4byte gPlayerParty +_0812B298: .4byte gBattleAnimArgs +_0812B29C: + lsls r1, r6, 24 + asrs r1, 24 + lsls r2, 24 + lsrs r2, 24 + adds r0, r4, 0 + bl PlayCry3 +_0812B2AA: + adds r0, r5, 0 + bl DestroyAnimVisualTask +_0812B2B0: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_812B18C + + thumb_func_start sub_812B2B8 +sub_812B2B8: @ 812B2B8 + push {r4,r5,lr} + lsls r0, 24 + lsrs r5, r0, 24 + movs r0, 0x40 + negs r0, r0 + bl BattleAnimAdjustPanning + lsls r0, 24 + lsrs r4, r0, 24 + bl IsContest + lsls r0, 24 + cmp r0, 0 + beq _0812B2DC + ldr r0, _0812B2D8 @ =gSharedMem + 0x19348 + b _0812B2E6 + .align 2, 0 +_0812B2D8: .4byte gSharedMem + 0x19348 +_0812B2DC: + ldr r1, _0812B304 @ =gAnimSpeciesByBanks + ldr r0, _0812B308 @ =gAnimBankAttacker + ldrb r0, [r0] + lsls r0, 1 + adds r0, r1 +_0812B2E6: + ldrh r0, [r0] + cmp r0, 0 + beq _0812B2F6 + lsls r1, r4, 24 + asrs r1, 24 + movs r2, 0x4 + bl PlayCry3 +_0812B2F6: + adds r0, r5, 0 + bl DestroyAnimVisualTask + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_0812B304: .4byte gAnimSpeciesByBanks +_0812B308: .4byte gAnimBankAttacker + thumb_func_end sub_812B2B8 + + thumb_func_start sub_812B30C +sub_812B30C: @ 812B30C + push {r4,r5,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + ldr r0, _0812B33C @ =gBattleAnimArgs + ldrh r5, [r0] + ldrb r0, [r0, 0x2] + lsls r0, 24 + asrs r0, 24 + bl BattleAnimAdjustPanning + adds r1, r0, 0 + lsls r1, 24 + asrs r1, 24 + adds r0, r5, 0 + bl PlaySE1WithPanning + adds r0, r4, 0 + bl DestroyAnimVisualTask + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_0812B33C: .4byte gBattleAnimArgs + thumb_func_end sub_812B30C + + thumb_func_start sub_812B340 +sub_812B340: @ 812B340 + push {r4,r5,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + ldr r0, _0812B370 @ =gBattleAnimArgs + ldrh r5, [r0] + ldrb r0, [r0, 0x2] + lsls r0, 24 + asrs r0, 24 + bl BattleAnimAdjustPanning + adds r1, r0, 0 + lsls r1, 24 + asrs r1, 24 + adds r0, r5, 0 + bl PlaySE2WithPanning + adds r0, r4, 0 + bl DestroyAnimVisualTask + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_0812B370: .4byte gBattleAnimArgs + thumb_func_end sub_812B340 + + thumb_func_start sub_812B374 +sub_812B374: @ 812B374 + push {r4-r6,lr} + mov r6, r9 + mov r5, r8 + push {r5,r6} + mov r8, r0 + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + ldr r0, _0812B3F8 @ =gBattleAnimArgs + ldrb r5, [r0, 0x2] + ldrb r6, [r0, 0x4] + ldrh r1, [r0, 0x6] + mov r9, r1 + ldrb r0, [r0] + lsls r0, 24 + asrs r0, 24 + bl BattleAnimAdjustPanning + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + lsls r5, 24 + asrs r5, 24 + adds r0, r5, 0 + bl BattleAnimAdjustPanning + adds r5, r0, 0 + lsls r4, 24 + asrs r4, 24 + lsls r5, 24 + asrs r5, 24 + lsls r6, 24 + asrs r6, 24 + adds r0, r4, 0 + adds r1, r5, 0 + adds r2, r6, 0 + bl CalculatePanIncrement + ldr r2, _0812B3FC @ =gTasks + mov r3, r8 + lsls r1, r3, 2 + add r1, r8 + lsls r1, 3 + adds r1, r2 + movs r2, 0 + strh r4, [r1, 0xA] + strh r5, [r1, 0xC] + lsls r0, 24 + asrs r0, 24 + strh r0, [r1, 0xE] + mov r0, r9 + strh r0, [r1, 0x12] + strh r2, [r1, 0x1C] + strh r4, [r1, 0x1E] + ldr r2, _0812B400 @ =sub_812B404 + str r2, [r1] + mov r0, r8 + bl _call_via_r2 + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r6} + pop {r0} + bx r0 + .align 2, 0 +_0812B3F8: .4byte gBattleAnimArgs +_0812B3FC: .4byte gTasks +_0812B400: .4byte sub_812B404 + thumb_func_end sub_812B374 + + thumb_func_start sub_812B404 +sub_812B404: @ 812B404 + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + adds r5, r0, 0 + ldr r1, _0812B45C @ =gTasks + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + adds r4, r0, r1 + ldrh r2, [r4, 0xE] + ldrh r0, [r4, 0x1C] + adds r1, r0, 0x1 + strh r1, [r4, 0x1C] + lsls r0, 16 + asrs r0, 16 + movs r3, 0x12 + ldrsh r1, [r4, r3] + cmp r0, r1 + bne _0812B43E + movs r0, 0 + strh r0, [r4, 0x1C] + ldrh r1, [r4, 0x1E] + adds r0, r2, r1 + strh r0, [r4, 0x1E] + movs r2, 0x1E + ldrsh r0, [r4, r2] + bl sub_8077104 + strh r0, [r4, 0x1E] +_0812B43E: + ldr r1, _0812B460 @ =gUnknown_0202F7D2 + ldrh r0, [r4, 0x1E] + strb r0, [r1] + movs r3, 0x1E + ldrsh r1, [r4, r3] + movs r2, 0xC + ldrsh r0, [r4, r2] + cmp r1, r0 + bne _0812B456 + adds r0, r5, 0 + bl DestroyAnimVisualTask +_0812B456: + pop {r4,r5} + pop {r0} + bx r0 + .align 2, 0 +_0812B45C: .4byte gTasks +_0812B460: .4byte gUnknown_0202F7D2 + thumb_func_end sub_812B404 + + .align 2, 0 @ Don't pad with nop. + \ No newline at end of file diff --git a/ld_script.txt b/ld_script.txt index 9a2cbe4e5..b2d17b5ec 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -350,12 +350,14 @@ SECTIONS { src/scene/cable_car.o(.text); asm/roulette_util.o(.text); src/engine/cable_car_util.o(.text); - src/unused_8124F94.o(.text); + src/unused/unused_8124F94.o(.text); src/engine/save.o(.text); src/engine/mystery_event_script.o(.text); src/field/field_effect_helpers.o(.text); asm/contest_ai.o(.text); - asm/battle_anim_81258BC.o(.text); + src/unused/unused_81258BC.o(.text); + src/battle/anim/sfx.o(.text); + asm/battle_anim_sfx.o(.text); src/battle/battle_controller_safari.o(.text); src/field/fldeff_sweetscent.o(.text); asm/battle_anim_812C144.o(.text); diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c new file mode 100644 index 000000000..265271ac5 --- /dev/null +++ b/src/battle/anim/sfx.c @@ -0,0 +1,2 @@ +#include "global.h" + diff --git a/src/unused/unused_8124F94.c b/src/unused/unused_8124F94.c new file mode 100644 index 000000000..5f76fa92e --- /dev/null +++ b/src/unused/unused_8124F94.c @@ -0,0 +1,126 @@ +#include "global.h" +#include "decompress.h" +#include "palette.h" + +struct UnknownStruct2 +{ + void *src; + u8 unk4; + u8 unk5; + u8 unk6; + u16 unk8; +}; + +struct UnknownStruct3 +{ + u16 *paletteSrc; + u8 unk4; + u8 paletteCount; +}; + +struct UnknownStruct1 +{ + u8 paletteNum; + u8 unk1; + u16 unk2; + u8 *dest; + struct UnknownStruct3 unk8[16]; + struct UnknownStruct2 unk88[32]; +}; + +void unref_sub_8124F94(struct UnknownStruct1 *a) +{ + a->unk1 = 0; + a->paletteNum = 0; + a->unk2 = 0; + a->dest = (void *)VRAM; + DmaFill16(3, 0, a->unk8, sizeof(a->unk8)); + DmaFill16(3, 0, a->unk88, sizeof(a->unk88)); +} + +u8 unref_sub_8124FD8(struct UnknownStruct1 *a, const struct UnknownStruct2 *b) +{ + while (1) + { + s32 r6; + s32 temp; + + // Couldn't get it to match any other way + if (a->unk1 < 32 && b->src == NULL) + return 0; + if (a->unk1 >= 32) + break; + + a->unk88[a->unk1].src = b->src; + a->unk88[a->unk1].unk6 = b->unk6; + a->unk88[a->unk1].unk4 = b->unk4; + a->unk88[a->unk1].unk5 = b->unk5; + r6 = b->unk4 * b->unk5; + if (a->unk2 + r6 > 0x400) + return 2; + if (b->unk8 == 0) + { + DmaCopy16(3, b->src, a->dest + a->unk2 * 64, r6 * 32); + } + else + { + LZDecompressWram(b->src, a->dest + a->unk2 * 64); + } + a->unk88[a->unk1].unk8 = a->unk2; + temp = r6 + a->unk2; + a->unk2 = temp; + a->unk1++; + b++; + } + return 1; +} + +u8 unref_sub_81250A4(struct UnknownStruct1 *a, struct UnknownStruct3 *b) +{ + while (1) + { + // Couldn't get it to match any other way + if (a->paletteNum < 16 && b->paletteSrc == NULL) + return 0; + if (a->paletteNum >= 16) + break; + + a->unk8[a->paletteNum].paletteSrc = b->paletteSrc; + a->unk8[a->paletteNum].unk4 = b->unk4; + if (b->paletteCount == 0) + { + LoadPalette(b->paletteSrc, a->paletteNum * 16, 32); + } + else + { + u16 palette[16]; + + LZDecompressWram(b->paletteSrc, palette); + LoadPalette(palette, a->paletteNum * 16, 32); + } + a->unk8[a->paletteNum].paletteCount = a->paletteNum; + a->paletteNum = a->paletteNum + 1; + b++; + } + return 1; +} + +u8 unref_sub_8125118(struct UnknownStruct1 *a, struct UnknownStruct3 *b) +{ + u16 palettes[16][16] = {0}; + u8 r7 = b->paletteCount; + u8 i; + + LZDecompressWram(b->paletteSrc, palettes); + for (i = a->paletteNum; i < r7; i++) + { + if (a->paletteNum + i >= 16) + return 1; + a->unk8[i].paletteSrc = b->paletteSrc; + a->unk8[i].unk4 = b->unk4 + i; + a->unk8[i].paletteCount = a->paletteNum; + LoadPalette(palettes[i], a->paletteNum * 16, sizeof(palettes[i])); + a->paletteNum++; + } + return 0; +} diff --git a/src/unused/unused_81258BC.c b/src/unused/unused_81258BC.c new file mode 100644 index 000000000..c509ea4c9 --- /dev/null +++ b/src/unused/unused_81258BC.c @@ -0,0 +1,36 @@ +#include "constants/songs.h" +#include "global.h" +#include "menu.h" +#include "mystery_event_script.h" +#include "sound.h" +#include "text.h" + +void sub_812AF10(void); + +bool8 unref_sub_812AECC(u8 *script) +{ + u8 result = RunMysteryEventScript(script); + switch (result) + { + case 0: + return FALSE; + case 1: + PlaySE(SE_BOO); + return TRUE; + case 2: + sub_812AF10(); + return FALSE; + case 3: + PlaySE(SE_BOO); + sub_812AF10(); + return TRUE; + default: + return FALSE; + } +} + +void sub_812AF10(void) +{ + MenuDrawTextWindow(2, 14, 27, 19); + MenuPrint(gStringVar4, 3, 15); +} \ No newline at end of file diff --git a/src/unused_8124F94.c b/src/unused_8124F94.c deleted file mode 100644 index 5f76fa92e..000000000 --- a/src/unused_8124F94.c +++ /dev/null @@ -1,126 +0,0 @@ -#include "global.h" -#include "decompress.h" -#include "palette.h" - -struct UnknownStruct2 -{ - void *src; - u8 unk4; - u8 unk5; - u8 unk6; - u16 unk8; -}; - -struct UnknownStruct3 -{ - u16 *paletteSrc; - u8 unk4; - u8 paletteCount; -}; - -struct UnknownStruct1 -{ - u8 paletteNum; - u8 unk1; - u16 unk2; - u8 *dest; - struct UnknownStruct3 unk8[16]; - struct UnknownStruct2 unk88[32]; -}; - -void unref_sub_8124F94(struct UnknownStruct1 *a) -{ - a->unk1 = 0; - a->paletteNum = 0; - a->unk2 = 0; - a->dest = (void *)VRAM; - DmaFill16(3, 0, a->unk8, sizeof(a->unk8)); - DmaFill16(3, 0, a->unk88, sizeof(a->unk88)); -} - -u8 unref_sub_8124FD8(struct UnknownStruct1 *a, const struct UnknownStruct2 *b) -{ - while (1) - { - s32 r6; - s32 temp; - - // Couldn't get it to match any other way - if (a->unk1 < 32 && b->src == NULL) - return 0; - if (a->unk1 >= 32) - break; - - a->unk88[a->unk1].src = b->src; - a->unk88[a->unk1].unk6 = b->unk6; - a->unk88[a->unk1].unk4 = b->unk4; - a->unk88[a->unk1].unk5 = b->unk5; - r6 = b->unk4 * b->unk5; - if (a->unk2 + r6 > 0x400) - return 2; - if (b->unk8 == 0) - { - DmaCopy16(3, b->src, a->dest + a->unk2 * 64, r6 * 32); - } - else - { - LZDecompressWram(b->src, a->dest + a->unk2 * 64); - } - a->unk88[a->unk1].unk8 = a->unk2; - temp = r6 + a->unk2; - a->unk2 = temp; - a->unk1++; - b++; - } - return 1; -} - -u8 unref_sub_81250A4(struct UnknownStruct1 *a, struct UnknownStruct3 *b) -{ - while (1) - { - // Couldn't get it to match any other way - if (a->paletteNum < 16 && b->paletteSrc == NULL) - return 0; - if (a->paletteNum >= 16) - break; - - a->unk8[a->paletteNum].paletteSrc = b->paletteSrc; - a->unk8[a->paletteNum].unk4 = b->unk4; - if (b->paletteCount == 0) - { - LoadPalette(b->paletteSrc, a->paletteNum * 16, 32); - } - else - { - u16 palette[16]; - - LZDecompressWram(b->paletteSrc, palette); - LoadPalette(palette, a->paletteNum * 16, 32); - } - a->unk8[a->paletteNum].paletteCount = a->paletteNum; - a->paletteNum = a->paletteNum + 1; - b++; - } - return 1; -} - -u8 unref_sub_8125118(struct UnknownStruct1 *a, struct UnknownStruct3 *b) -{ - u16 palettes[16][16] = {0}; - u8 r7 = b->paletteCount; - u8 i; - - LZDecompressWram(b->paletteSrc, palettes); - for (i = a->paletteNum; i < r7; i++) - { - if (a->paletteNum + i >= 16) - return 1; - a->unk8[i].paletteSrc = b->paletteSrc; - a->unk8[i].unk4 = b->unk4 + i; - a->unk8[i].paletteCount = a->paletteNum; - LoadPalette(palettes[i], a->paletteNum * 16, sizeof(palettes[i])); - a->paletteNum++; - } - return 0; -} -- cgit v1.2.3 From d4df8046d45e50e19d2305bd4388e47087949960 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 6 Jan 2018 21:52:05 -0500 Subject: use firered isagbprint.h and NDEBUG --- include/assert.h | 43 ----------------------------------------- include/config.h | 4 ++-- include/gba/gba.h | 1 + include/gba/isagbprint.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/global.h | 3 +-- src/engine/main.c | 4 ++-- src/libs/libisagbprn.c | 2 +- 7 files changed, 57 insertions(+), 50 deletions(-) delete mode 100755 include/assert.h create mode 100755 include/gba/isagbprint.h diff --git a/include/assert.h b/include/assert.h deleted file mode 100755 index 0c1e5bf77..000000000 --- a/include/assert.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef GUARD_GBASDKASSERT_H -#define GUARD_GBASDKASSERT_H - -// this header is based on the -// GBA SDK IsAgbAssert.h. - -#ifdef NOAGBPRN - #define AGBPrintInit() - #define AGBPutc(pBuf) - #define AGBPrint(pBuf) - #define AGBPrintf(...) - #define AGBPrintFlush1Block() - #define AGBPrintFlush() - #define AGBAssert(pFile, nLine, pExpression, nStopProgram) -#else - // without NOAGBPRN defined, this enables asserts for usage - // on a standard GBA debugger unit or in emulators that - // support it. - - void AGBPrintInit(void); - void AGBPutc(const char pBuf); - void AGBPrint(const char *pBuf); - void AGBPrintf(const char *pBuf, ...); - void AGBPrintFlush1Block(void); - void AGBPrintFlush(void); - void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); -#endif - -// when using AGB_WARNING, be sure to flush after as AGBAssert does not flush the string to console -// immediately after usage. -#ifdef NOAGBPRN - #define AGB_ASSERT(expression) -#else - #define AGB_ASSERT(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 1); -#endif - -#ifdef NOAGBPRN - #define AGB_WARNING(expression) -#else - #define AGB_WARNING(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 0); -#endif - -#endif diff --git a/include/config.h b/include/config.h index d9ed70a7c..7661324db 100644 --- a/include/config.h +++ b/include/config.h @@ -4,7 +4,7 @@ // In the Generation 3 games, Asserts were used in various debug builds. // Ruby/Sapphire and Emerald do not have these asserts while Fire Red // still has them in the ROM. This is because the developers forgot -// to define NOAGBPRN before release, which is actually supposed to be +// to define NDEBUG before release, which is actually supposed to be // NDEBUG, however this has been changed as Ruby's actual debug build // does not use the AGBPrint features. @@ -15,7 +15,7 @@ // authoritative. These additions are for user convenience based on // officially recommended SDK practices for debugging and is therefore // still in part authoritative. -#define NOAGBPRN +#define NDEBUG #ifndef REVISION #define REVISION 0 diff --git a/include/gba/gba.h b/include/gba/gba.h index 42ae3cdde..349344031 100644 --- a/include/gba/gba.h +++ b/include/gba/gba.h @@ -7,5 +7,6 @@ #include "gba/multiboot.h" #include "gba/syscall.h" #include "gba/macro.h" +#include "gba/isagbprint.h" #endif // GUARD_GBA_GBA_H diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h new file mode 100755 index 000000000..c5eb456c3 --- /dev/null +++ b/include/gba/isagbprint.h @@ -0,0 +1,50 @@ +#ifndef GUARD_GBA_ISAGBPRINT_H +#define GUARD_GBA_ISAGBPRINT_H + +#ifdef NDEBUG +#define AGBPrintInit() +#define AGBPutc(cChr) +#define AGBPrint(pBuf) +#define AGBPrintf(pBuf, ...) +#define AGBPrintFlush1Block() +#define AGBPrintFlush() +#define AGBAssert(pFile, nLine, pExpression, nStopProgram) +#else +void AGBPrintInit(void); +void AGBPutc(const char cChr); +void AGBPrint(const char *pBuf); +void AGBPrintf(const char *pBuf, ...); +void AGBPrintFlush1Block(void); +void AGBPrintFlush(void); +void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); +#endif + +#undef AGB_ASSERT +#ifdef NDEBUG +#define AGB_ASSERT(exp) +#else +#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); +#endif + +#undef AGB_WARNING +#ifdef NDEBUG +#define AGB_WARNING(exp) +#else +#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); +#endif + +// for matching purposes + +#ifdef NDEBUG +#define AGB_ASSERT_EX(exp, file, line) +#else +#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); +#endif + +#ifdef NDEBUG +#define AGB_WARNING_EX(exp, file, line) +#else +#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); +#endif + +#endif // GUARD_GBA_ISAGBPRINT_H diff --git a/include/global.h b/include/global.h index 4c118db13..d0af4a4d1 100644 --- a/include/global.h +++ b/include/global.h @@ -1,9 +1,8 @@ #ifndef GUARD_GLOBAL_H #define GUARD_GLOBAL_H +#include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" -#include "config.h" -#include "assert.h" // IDE support #if defined(__APPLE__) || defined(__CYGWIN__) diff --git a/src/engine/main.c b/src/engine/main.c index e52551f72..92b81d475 100644 --- a/src/engine/main.c +++ b/src/engine/main.c @@ -83,7 +83,7 @@ static void WaitForVBlank(void); #define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON) -#ifndef NOAGBPRN +#ifndef NDEBUG #include // don't include if not needed. #endif @@ -105,7 +105,7 @@ void AgbMain() // In Fire Red, AGBPrintInit is called at this spot. For user convenience, I // opt to initialize the print area here. It is up to the user where they choose // to print stuff from, as anything else declared is NOT authoritative. -#ifndef NOAGBPRN +#ifndef NDEBUG AGBPrintInit(); __mb_cur_max = 1; // fix for AGBPrintf #endif diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index 867044217..eccc31f48 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -25,7 +25,7 @@ struct AGBPrintStruct typedef void (*LPFN_PRINT_FLUSH)(void); -#ifndef NOAGBPRN +#ifndef NDEBUG void AGBPrintFlush1Block(void); void AGBPrintInit(void) -- cgit v1.2.3 From aa023a5cb52c7b7a4cb2e23aadcd7db4bf0b3483 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 6 Jan 2018 22:21:05 -0500 Subject: through sub_80963D0 --- asm/pokemon_storage_system.s | 319 ----------------------------------- src/pokemon/pokemon_storage_system.c | 113 ++++++++++++- 2 files changed, 112 insertions(+), 320 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index d04e8cec7..ebbc84a5b 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,325 +5,6 @@ .text - thumb_func_start sub_8096310 -sub_8096310: @ 8096310 - push {r4,r5,lr} - ldr r4, _08096344 @ =gUnknown_02038478 - ldr r0, [r4] - ldr r1, _08096348 @ =0x00000242 - adds r0, r1 - ldrh r0, [r0] - bl FreeSpritePaletteByTag - ldr r0, [r4] - movs r5, 0x90 - lsls r5, 2 - adds r0, r5 - ldrh r0, [r0] - bl FreeSpriteTilesByTag - ldr r0, [r4] - adds r0, r5 - ldrh r0, [r0] - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - bl FreeSpriteTilesByTag - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08096344: .4byte gUnknown_02038478 -_08096348: .4byte 0x00000242 - thumb_func_end sub_8096310 - - thumb_func_start sub_809634C -sub_809634C: @ 809634C - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl sub_80963D0 - pop {r0} - bx r0 - thumb_func_end sub_809634C - - thumb_func_start sub_809635C -sub_809635C: @ 809635C - push {lr} - bl sub_809658C - pop {r0} - bx r0 - thumb_func_end sub_809635C - - thumb_func_start sub_8096368 -sub_8096368: @ 8096368 - push {lr} - ldr r0, _08096380 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08096384 - movs r0, 0x5 - bl PlaySE - movs r0, 0xC9 - b _080963CC - .align 2, 0 -_08096380: .4byte gMain -_08096384: - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080963A4 - movs r0, 0x5 - bl PlaySE - ldr r0, _080963A0 @ =gUnknown_02038478 - ldr r0, [r0] - movs r1, 0x8F - lsls r1, 2 - adds r0, r1 - ldrb r0, [r0] - b _080963CC - .align 2, 0 -_080963A0: .4byte gUnknown_02038478 -_080963A4: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080963B8 - movs r0, 0x5 - bl PlaySE - bl sub_809662C - b _080963CA -_080963B8: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080963CA - movs r0, 0x5 - bl PlaySE - bl sub_80965F8 -_080963CA: - movs r0, 0xC8 -_080963CC: - pop {r1} - bx r1 - thumb_func_end sub_8096368 - - thumb_func_start sub_80963D0 -sub_80963D0: @ 80963D0 - push {r4-r6,lr} - sub sp, 0x3C - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - movs r0, 0 - movs r1, 0 - str r0, [sp, 0x34] - str r1, [sp, 0x38] - movs r1, 0xC0 - lsls r1, 24 - ldr r0, [sp, 0x34] - orrs r0, r1 - str r0, [sp, 0x34] - ldr r1, _08096564 @ =0xffff0fff - add r4, sp, 0x34 - ldr r0, [r4, 0x4] - ands r0, r1 - movs r1, 0x80 - lsls r1, 5 - orrs r0, r1 - str r0, [r4, 0x4] - add r1, sp, 0x1C - movs r2, 0 - strh r2, [r1] - mov r0, sp - adds r0, 0x1E - strh r2, [r0] - str r4, [sp, 0x20] - ldr r0, _08096568 @ =gDummySpriteAnimTable - str r0, [sp, 0x24] - str r2, [sp, 0x28] - ldr r0, _0809656C @ =gDummySpriteAffineAnimTable - str r0, [sp, 0x2C] - ldr r0, _08096570 @ =SpriteCallbackDummy - str r0, [sp, 0x30] - add r0, sp, 0x4 - movs r2, 0x18 - bl memcpy - ldr r6, _08096574 @ =gUnknown_02038478 - ldr r0, [r6] - movs r1, 0x8F - lsls r1, 2 - adds r0, r1 - strb r5, [r0] - add r2, sp, 0x4 - ldr r1, [r6] - movs r5, 0x90 - lsls r5, 2 - adds r0, r1, r5 - ldrh r0, [r0] - strh r0, [r2] - ldr r3, _08096578 @ =0x00000242 - adds r1, r3 - ldrh r0, [r1] - strh r0, [r2, 0x2] - adds r0, r2, 0 - movs r1, 0xA0 - movs r2, 0x60 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - ldr r3, [r6] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0809657C @ =gSprites - adds r0, r1 - str r0, [r3] - ldrb r2, [r4, 0x1] - movs r1, 0x3F - adds r0, r1, 0 - ands r0, r2 - movs r2, 0x80 - orrs r0, r2 - strb r0, [r4, 0x1] - ldrb r0, [r4, 0x3] - ands r1, r0 - movs r0, 0x40 - orrs r1, r0 - strb r1, [r4, 0x3] - add r1, sp, 0x4 - adds r3, r5 - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r1] - ldr r0, _08096580 @ =gSpriteAnimTable_83B604C - str r0, [sp, 0xC] - movs r4, 0 -_08096488: - ldr r0, [r6] - ldr r1, _08096584 @ =0x0000023e - adds r0, r1 - ldrb r3, [r0] - add r0, sp, 0x4 - movs r1, 0x7C - movs r2, 0x50 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - ldr r2, [r6] - lsls r3, r4, 2 - adds r2, 0x4 - adds r2, r3 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0809657C @ =gSprites - adds r1, r0, r1 - str r1, [r2] - movs r5, 0 - movs r0, 0x2 - ands r0, r4 - cmp r0, 0 - beq _080964C2 - movs r0, 0xC4 - strh r0, [r1, 0x20] - movs r5, 0x2 -_080964C2: - movs r0, 0x1 - ands r0, r4 - cmp r0, 0 - beq _080964E6 - ldr r1, [r6] - adds r1, 0x4 - adds r1, r3 - ldr r2, [r1] - movs r0, 0x70 - strh r0, [r2, 0x22] - ldr r2, [r1] - ldrb r1, [r2, 0x3] - movs r0, 0x3F - ands r0, r1 - strb r0, [r2, 0x3] - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_080964E6: - ldr r0, [r6] - adds r0, 0x4 - adds r0, r3 - ldr r0, [r0] - lsls r1, r5, 24 - lsrs r1, 24 - bl StartSpriteAnim - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x3 - bls _08096488 - movs r4, 0 - ldr r5, _08096574 @ =gUnknown_02038478 -_08096504: - lsls r0, r4, 3 - adds r0, r4 - lsls r0, 19 - movs r3, 0xF8 - lsls r3, 15 - adds r0, r3 - lsrs r0, 16 - lsls r2, r4, 24 - lsrs r2, 24 - ldr r1, [r5] - ldr r3, _08096584 @ =0x0000023e - adds r1, r3 - ldrb r1, [r1] - str r1, [sp] - movs r1, 0x58 - movs r3, 0 - bl sub_809A9A0 - adds r2, r0, 0 - ldr r0, [r5] - lsls r1, r4, 2 - adds r0, 0x20 - adds r0, r1 - str r2, [r0] - cmp r2, 0 - beq _0809654C - movs r1, 0x1 - cmp r4, 0 - bne _08096544 - movs r3, 0x1 - negs r3, r3 - adds r1, r3, 0 -_08096544: - strh r1, [r2, 0x2E] - ldr r1, [r0] - ldr r0, _08096588 @ =sub_8096784 - str r0, [r1, 0x1C] -_0809654C: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _08096504 - bl sub_809665C - add sp, 0x3C - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08096564: .4byte 0xffff0fff -_08096568: .4byte gDummySpriteAnimTable -_0809656C: .4byte gDummySpriteAffineAnimTable -_08096570: .4byte SpriteCallbackDummy -_08096574: .4byte gUnknown_02038478 -_08096578: .4byte 0x00000242 -_0809657C: .4byte gSprites -_08096580: .4byte gSpriteAnimTable_83B604C -_08096584: .4byte 0x0000023e -_08096588: .4byte sub_8096784 - thumb_func_end sub_80963D0 - thumb_func_start sub_809658C sub_809658C: @ 809658C push {r4-r6,lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index bc43616a9..37414f32b 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -1,5 +1,7 @@ #include "global.h" #include "palette.h" +#include "constants/songs.h" +#include "sound.h" #include "field_weather.h" #include "overworld.h" #include "field_fadetransition.h" @@ -28,7 +30,13 @@ struct PokemonStorageSystemData { }; struct UnkPSSStruct_2002370 { - u8 filler_0000[0x23e]; + struct Sprite *unk_0000; + struct Sprite *unk_0004[4]; + u32 unk_0014[3]; + struct Sprite *unk_0020[2]; + u8 filler_0028[0x214]; + u8 unk_023c; + u8 unk_023d; u8 unk_023e; u16 unk_0240; u16 unk_0242; @@ -36,6 +44,13 @@ struct UnkPSSStruct_2002370 { void StorageSystemCreatePrimaryMenu(u8 whichMenu); void task_intro_29(u8 whichMenu); +void sub_80963D0(u8 a0); +void sub_809658C(void); +void sub_80965F8(void); +void sub_809662C(void); +void sub_809665C(void); +void sub_8096784(struct Sprite *sprite); +struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { {PCText_WithdrawPoke, PCText_MovePokeToParty}, @@ -539,6 +554,102 @@ void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3 a0->unk_023e = a3; } +void sub_8096310(void) +{ + FreeSpritePaletteByTag(gUnknown_02038478->unk_0242); + FreeSpriteTilesByTag(gUnknown_02038478->unk_0240); + FreeSpriteTilesByTag(gUnknown_02038478->unk_0240 + 1); +} + +void sub_809634C(u8 a0) +{ + sub_80963D0(a0); +} + +void sub_809635C(void) +{ + sub_809658C(); +} + +u8 sub_8096368(void) +{ + if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + return 201; + } + if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + return gUnknown_02038478->unk_023c; + } + if (gMain.newKeys & DPAD_LEFT) + { + PlaySE(SE_SELECT); + sub_809662C(); + } + else if (gMain.newKeys & DPAD_RIGHT) + { + PlaySE(SE_SELECT); + sub_80965F8(); + } + return 200; +} + +void sub_80963D0(u8 a0) +{ + u16 i; + u8 spriteId; + struct SpriteTemplate template; + struct OamData oamData = {}; + oamData.size = 3; + oamData.paletteNum = 1; + template = (struct SpriteTemplate){ + 0, 0, &oamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + }; + + gUnknown_02038478->unk_023c = a0; + template.tileTag = gUnknown_02038478->unk_0240; + template.paletteTag = gUnknown_02038478->unk_0242; + + spriteId = CreateSprite(&template, 0xa0, 0x60, 0); + gUnknown_02038478->unk_0000 = gSprites + spriteId; + + oamData.shape = ST_OAM_V_RECTANGLE; + oamData.size = 1; + template.tileTag = gUnknown_02038478->unk_0240 + 1; + template.anims = gSpriteAnimTable_83B604C; + for (i = 0; i < 4; i++) + { + u16 r5; + spriteId = CreateSprite(&template, 0x7c, 0x50, gUnknown_02038478->unk_023e); + gUnknown_02038478->unk_0004[i] = gSprites + spriteId; + r5 = 0; + if (i & 2) + { + gUnknown_02038478->unk_0004[i]->pos1.x = 0xc4; + r5 = 2; + } + if (i & 1) + { + gUnknown_02038478->unk_0004[i]->pos1.y = 0x70; + gUnknown_02038478->unk_0004[i]->oam.size = 0; + r5++; + } + StartSpriteAnim(gUnknown_02038478->unk_0004[i], r5); + } + for (i = 0; i < 2; i++) + { + gUnknown_02038478->unk_0020[i] = sub_809A9A0(72 * i + 0x7c, 0x58, i, 0, gUnknown_02038478->unk_023e); + if (gUnknown_02038478->unk_0020[i]) + { + gUnknown_02038478->unk_0020[i]->data[0] = (i == 0 ? -1 : 1); + gUnknown_02038478->unk_0020[i]->callback = sub_8096784; + } + } + sub_809665C(); +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 39810d713630fbadbd16f00862deca1f12d3a91d Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 7 Jan 2018 15:05:49 +0100 Subject: Started decompiling move animation sfx --- asm/battle_anim_sfx.s | 108 ----------------------------------------------- include/battle_anim.h | 2 + src/battle/anim/sfx.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 108 deletions(-) diff --git a/asm/battle_anim_sfx.s b/asm/battle_anim_sfx.s index 520c119cb..ef6a0181d 100644 --- a/asm/battle_anim_sfx.s +++ b/asm/battle_anim_sfx.s @@ -5,114 +5,6 @@ .text - thumb_func_start sub_812AF30 -sub_812AF30: @ 812AF30 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0812AF8C @ =gTasks - lsls r6, r0, 2 - adds r6, r0 - lsls r6, 3 - adds r6, r1 - ldr r1, _0812AF90 @ =gBattleAnimArgs - ldrh r0, [r1] - strh r0, [r6, 0x8] - ldrh r0, [r1, 0x2] - strh r0, [r6, 0xA] - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r5, r0, 0 - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0x2 - bl CalculatePanIncrement - strh r4, [r6, 0xC] - strh r5, [r6, 0xE] - lsls r0, 24 - asrs r0, 24 - strh r0, [r6, 0x10] - movs r0, 0xA - strh r0, [r6, 0x1C] - ldr r0, _0812AF94 @ =sub_812AF98 - str r0, [r6] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812AF8C: .4byte gTasks -_0812AF90: .4byte gBattleAnimArgs -_0812AF94: .4byte sub_812AF98 - thumb_func_end sub_812AF30 - - thumb_func_start sub_812AF98 -sub_812AF98: @ 812AF98 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0812AFC8 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r5, [r4, 0xC] - ldrb r6, [r4, 0x10] - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - movs r1, 0 - strh r0, [r4, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6F - bne _0812AFD0 - movs r0, 0x5 - strh r0, [r4, 0x1C] - strh r1, [r4, 0x1E] - ldr r0, _0812AFCC @ =sub_812B004 - str r0, [r4] - b _0812AFFE - .align 2, 0 -_0812AFC8: .4byte gTasks -_0812AFCC: .4byte sub_812B004 -_0812AFD0: - ldrh r0, [r4, 0x1C] - adds r0, 0x1 - strh r0, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xB - bne _0812AFEA - strh r1, [r4, 0x1C] - ldrh r0, [r4, 0x8] - lsls r1, r5, 24 - asrs r1, 24 - bl PlaySE12WithPanning -_0812AFEA: - lsls r1, r6, 24 - asrs r1, 24 - lsls r0, r5, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - asrs r0, 16 - bl sub_8077104 - strh r0, [r4, 0xC] -_0812AFFE: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812AF98 - thumb_func_start sub_812B004 sub_812B004: @ 812B004 push {r4,r5,lr} diff --git a/include/battle_anim.h b/include/battle_anim.h index d456950f6..99167d7c6 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -60,5 +60,7 @@ void DestroyAnimVisualTask(u8 task); bool8 IsAnimBankSpriteVisible(u8); s8 BattleAnimAdjustPanning(s8 a); void sub_80763FC(u16 a, u16 *b, u32 c, u8 d); +s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); +s16 sub_8077104(s16 a); #endif diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index 265271ac5..a66a15371 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -1,2 +1,115 @@ #include "global.h" +#include "battle_anim.h" +#include "sound.h" +#include "task.h" + +extern s16 gBattleAnimArgs[]; + +void sub_812AF98(u8 taskId); +void sub_812B004(u8 taskId); +void sub_812B004(u8 taskId); + +void sub_812AF30(u8 taskId) +{ + s8 sourcePan, targetPan, incrementPan; + + TASK.data[0] = gBattleAnimArgs[0]; + TASK.data[1] = gBattleAnimArgs[1]; + + sourcePan = BattleAnimAdjustPanning(-64); + targetPan = BattleAnimAdjustPanning(63); + incrementPan = CalculatePanIncrement(sourcePan, targetPan, 2); + + TASK.data[2] = sourcePan; + TASK.data[3] = targetPan; + TASK.data[4] = incrementPan; + TASK.data[10] = 10; + + TASK.func = sub_812AF98; +} + +#ifdef NONMATCHING +void sub_812AF98(u8 taskId) // r4 := TASK +{ + s16 pan = TASK.data[2]; // r5 + s8 var0 = TASK.data[4]; // r6 + + if (++TASK.data[11] == 111) + { + TASK.data[10] = 5; + TASK.data[11] = 0; + TASK.func = sub_812B004; + } + else + { + if (++TASK.data[10] == 11) + { + TASK.data[10] = 0; + PlaySE12WithPanning(TASK.data[0], pan); + } + TASK.data[2] = sub_8077104(var0 + pan); + } +} +#else +__attribute__((naked)) +void sub_812AF98(u8 taskId) +{ + asm(".syntax unified\n\ + push {r4-r6,lr}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + ldr r2, _0812AFC8 @ =gTasks\n\ + lsls r1, r0, 2\n\ + adds r1, r0\n\ + lsls r1, 3\n\ + adds r4, r1, r2\n\ + ldrh r5, [r4, 0xC]\n\ + ldrb r6, [r4, 0x10]\n\ + ldrh r0, [r4, 0x1E]\n\ + adds r0, 0x1\n\ + movs r1, 0\n\ + strh r0, [r4, 0x1E]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + cmp r0, 0x6F\n\ + bne _0812AFD0\n\ + movs r0, 0x5\n\ + strh r0, [r4, 0x1C]\n\ + strh r1, [r4, 0x1E]\n\ + ldr r0, _0812AFCC @ =sub_812B004\n\ + str r0, [r4]\n\ + b _0812AFFE\n\ + .align 2, 0\n\ +_0812AFC8: .4byte gTasks\n\ +_0812AFCC: .4byte sub_812B004\n\ +_0812AFD0:\n\ + ldrh r0, [r4, 0x1C]\n\ + adds r0, 0x1\n\ + strh r0, [r4, 0x1C]\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + cmp r0, 0xB\n\ + bne _0812AFEA\n\ + strh r1, [r4, 0x1C]\n\ + ldrh r0, [r4, 0x8]\n\ + lsls r1, r5, 24\n\ + asrs r1, 24\n\ + bl PlaySE12WithPanning\n\ +_0812AFEA:\n\ + lsls r1, r6, 24\n\ + asrs r1, 24\n\ + lsls r0, r5, 16\n\ + asrs r0, 16\n\ + adds r0, r1\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + bl sub_8077104\n\ + strh r0, [r4, 0xC]\n\ +_0812AFFE:\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif // NONMATCHING -- cgit v1.2.3 From 589df520baf710078abf2756d35662bda944861c Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 7 Jan 2018 16:20:21 +0100 Subject: sub_812B004 - sub_812B058 --- asm/battle_anim_sfx.s | 128 ---------------------------------------------- include/battle_anim.h | 1 + src/battle/anim/sfx.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 128 deletions(-) diff --git a/asm/battle_anim_sfx.s b/asm/battle_anim_sfx.s index ef6a0181d..4e92cfcee 100644 --- a/asm/battle_anim_sfx.s +++ b/asm/battle_anim_sfx.s @@ -5,134 +5,6 @@ .text - thumb_func_start sub_812B004 -sub_812B004: @ 812B004 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _0812B054 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x1C] - adds r0, 0x1 - strh r0, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - bne _0812B04C - movs r0, 0 - strh r0, [r4, 0x1C] - movs r0, 0x3F - bl BattleAnimAdjustPanning - adds r1, r0, 0 - ldrh r0, [r4, 0xA] - lsls r1, 24 - asrs r1, 24 - bl PlaySE12WithPanning - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - bne _0812B04C - adds r0, r5, 0 - bl DestroyAnimSoundTask -_0812B04C: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B054: .4byte gTasks - thumb_func_end sub_812B004 - - thumb_func_start sub_812B058 -sub_812B058: @ 812B058 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r8, r0 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, _0812B0FC @ =gBattleAnimArgs - ldrh r1, [r0] - str r1, [sp] - ldrb r5, [r0, 0x4] - ldrb r6, [r0, 0x6] - ldrb r3, [r0, 0x8] - mov r10, r3 - ldrb r7, [r0, 0xA] - ldrb r1, [r0, 0xC] - mov r9, r1 - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - asrs r5, 24 - adds r0, r5, 0 - bl BattleAnimAdjustPanning - adds r5, r0, 0 - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - lsls r6, 24 - asrs r6, 24 - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl CalculatePanIncrement - ldr r2, _0812B100 @ =gTasks - mov r3, r8 - lsls r1, r3, 2 - add r1, r8 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - mov r6, sp - ldrh r6, [r6] - strh r6, [r1, 0x8] - strh r4, [r1, 0xA] - strh r5, [r1, 0xC] - lsls r0, 24 - asrs r0, 24 - strh r0, [r1, 0xE] - mov r0, r10 - strh r0, [r1, 0x10] - strh r7, [r1, 0x12] - mov r3, r9 - strh r3, [r1, 0x14] - strh r2, [r1, 0x1C] - strh r4, [r1, 0x1E] - strh r3, [r1, 0x20] - ldr r2, _0812B104 @ =sub_812B108 - str r2, [r1] - mov r0, r8 - bl _call_via_r2 - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812B0FC: .4byte gBattleAnimArgs -_0812B100: .4byte gTasks -_0812B104: .4byte sub_812B108 - thumb_func_end sub_812B058 - thumb_func_start sub_812B108 sub_812B108: @ 812B108 push {r4,r5,lr} diff --git a/include/battle_anim.h b/include/battle_anim.h index 99167d7c6..7b966cf4c 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -62,5 +62,6 @@ s8 BattleAnimAdjustPanning(s8 a); void sub_80763FC(u16 a, u16 *b, u32 c, u8 d); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); s16 sub_8077104(s16 a); +void DestroyAnimSoundTask(u8 taskId); #endif diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index a66a15371..e7e3c867e 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -8,6 +8,7 @@ extern s16 gBattleAnimArgs[]; void sub_812AF98(u8 taskId); void sub_812B004(u8 taskId); void sub_812B004(u8 taskId); +void sub_812B108(u8 taskId); void sub_812AF30(u8 taskId) { @@ -113,3 +114,140 @@ _0812AFFE:\n\ } #endif // NONMATCHING +void sub_812B004(u8 taskId) +{ + s8 pan; + + if (++TASK.data[10] == 6) + { + TASK.data[10] = 0; + + pan = BattleAnimAdjustPanning(0x3f); + PlaySE12WithPanning(TASK.data[1], pan); + + if (++TASK.data[11] == 2) + { + DestroyAnimSoundTask(taskId); + } + } +} + +#ifdef NONMATCHING +void sub_812B058(u8 taskId) +{ + s16 sp, r10, r7, r9; + s8 r5, r6, r4, r0; + + sp = gBattleAnimArgs[0]; + r5 = gBattleAnimArgs[2]; + r6 = gBattleAnimArgs[3]; + r10 = gBattleAnimArgs[4]; + r7 = gBattleAnimArgs[5]; + r9 = gBattleAnimArgs[6]; + r4 = BattleAnimAdjustPanning(gBattleAnimArgs[1]); + r5 = BattleAnimAdjustPanning(r5); + r0 = CalculatePanIncrement(r4, r5, r6); + + TASK.data[0] = sp; + TASK.data[1] = r4; + TASK.data[2] = r5; + TASK.data[3] = r0; + TASK.data[4] = r10; + TASK.data[5] = r7; + TASK.data[6] = r9; + TASK.data[10] = 0; + TASK.data[11] = r4; + TASK.data[12] = r9; + + TASK.func = sub_812B108; + sub_812B108(taskId); +} +#else +__attribute__((naked)) +void sub_812B058(u8 taskId) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x4\n\ + mov r8, r0\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + ldr r0, _0812B0FC @ =gBattleAnimArgs\n\ + ldrh r1, [r0]\n\ + str r1, [sp]\n\ + ldrb r5, [r0, 0x4]\n\ + ldrb r6, [r0, 0x6]\n\ + ldrb r3, [r0, 0x8]\n\ + mov r10, r3\n\ + ldrb r7, [r0, 0xA]\n\ + ldrb r1, [r0, 0xC]\n\ + mov r9, r1\n\ + ldrb r0, [r0, 0x2]\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + bl BattleAnimAdjustPanning\n\ + adds r4, r0, 0\n\ + lsls r4, 24\n\ + lsrs r4, 24\n\ + lsls r5, 24\n\ + asrs r5, 24\n\ + adds r0, r5, 0\n\ + bl BattleAnimAdjustPanning\n\ + adds r5, r0, 0\n\ + lsls r4, 24\n\ + asrs r4, 24\n\ + lsls r5, 24\n\ + asrs r5, 24\n\ + lsls r6, 24\n\ + asrs r6, 24\n\ + adds r0, r4, 0\n\ + adds r1, r5, 0\n\ + adds r2, r6, 0\n\ + bl CalculatePanIncrement\n\ + ldr r2, _0812B100 @ =gTasks\n\ + mov r3, r8\n\ + lsls r1, r3, 2\n\ + add r1, r8\n\ + lsls r1, 3\n\ + adds r1, r2\n\ + movs r2, 0\n\ + mov r6, sp\n\ + ldrh r6, [r6]\n\ + strh r6, [r1, 0x8]\n\ + strh r4, [r1, 0xA]\n\ + strh r5, [r1, 0xC]\n\ + lsls r0, 24\n\ + asrs r0, 24\n\ + strh r0, [r1, 0xE]\n\ + mov r0, r10\n\ + strh r0, [r1, 0x10]\n\ + strh r7, [r1, 0x12]\n\ + mov r3, r9\n\ + strh r3, [r1, 0x14]\n\ + strh r2, [r1, 0x1C]\n\ + strh r4, [r1, 0x1E]\n\ + strh r3, [r1, 0x20]\n\ + ldr r2, _0812B104 @ =sub_812B108\n\ + str r2, [r1]\n\ + mov r0, r8\n\ + bl _call_via_r2\n\ + add sp, 0x4\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_0812B0FC: .4byte gBattleAnimArgs\n\ +_0812B100: .4byte gTasks\n\ +_0812B104: .4byte sub_812B108\n\ + .syntax divided\n"); +} +#endif // NONMATCHING -- cgit v1.2.3 From e99816d2082d009457105a5e74524f97b80661c0 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 7 Jan 2018 23:12:28 +0100 Subject: Decompiled sub_812B108 --- asm/battle_anim_sfx.s | 69 --------------------------------------------------- src/battle/anim/sfx.c | 22 ++++++++++++++++ 2 files changed, 22 insertions(+), 69 deletions(-) diff --git a/asm/battle_anim_sfx.s b/asm/battle_anim_sfx.s index 4e92cfcee..1d0358bee 100644 --- a/asm/battle_anim_sfx.s +++ b/asm/battle_anim_sfx.s @@ -5,75 +5,6 @@ .text - thumb_func_start sub_812B108 -sub_812B108: @ 812B108 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _0812B14C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x20] - adds r1, r0, 0x1 - strh r1, [r4, 0x20] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x14 - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _0812B150 - movs r0, 0 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x8] - movs r1, 0x1E - ldrsb r1, [r4, r1] - bl PlaySE12WithPanning - ldrh r0, [r4, 0x10] - subs r0, 0x1 - strh r0, [r4, 0x10] - lsls r0, 16 - cmp r0, 0 - bne _0812B150 - adds r0, r5, 0 - bl DestroyAnimSoundTask - b _0812B182 - .align 2, 0 -_0812B14C: .4byte gTasks -_0812B150: - ldr r1, _0812B188 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x12 - ldrsh r1, [r4, r2] - cmp r0, r1 - bne _0812B182 - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r0, [r4, 0xE] - ldrh r1, [r4, 0x1E] - adds r0, r1 - strh r0, [r4, 0x1E] - movs r2, 0x1E - ldrsh r0, [r4, r2] - bl sub_8077104 - strh r0, [r4, 0x1E] -_0812B182: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B188: .4byte gTasks - thumb_func_end sub_812B108 - thumb_func_start sub_812B18C sub_812B18C: @ 812B18C push {r4-r6,lr} diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index e7e3c867e..981022f1e 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -251,3 +251,25 @@ _0812B104: .4byte sub_812B108\n\ .syntax divided\n"); } #endif // NONMATCHING + +void sub_812B108(u8 taskId) +{ + if (TASK.data[12]++ == TASK.data[6]) + { + TASK.data[12] = 0; + PlaySE12WithPanning(TASK.data[0], TASK.data[11]); + + if (--TASK.data[4] == 0) + { + DestroyAnimSoundTask(taskId); + return; + } + } + + if (TASK.data[10]++ == TASK.data[5]) + { + TASK.data[10] = 0; + TASK.data[11] += TASK.data[3]; + TASK.data[11] = sub_8077104(TASK.data[11]); + } +} -- cgit v1.2.3 From 92fa7570b99d216f75becbd362a124a12cc1dcde Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jan 2018 18:44:14 -0500 Subject: through task_intro_29 --- asm/pokemon_storage_system.s | 309 +---------------------------------- include/ewram.h | 1 + src/pokemon/pokemon_storage_system.c | 125 ++++++++++++-- 3 files changed, 116 insertions(+), 319 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index ebbc84a5b..b4addb8e7 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,313 +5,6 @@ .text - thumb_func_start sub_809658C -sub_809658C: @ 809658C - push {r4-r6,lr} - ldr r4, _080965F4 @ =gUnknown_02038478 - ldr r0, [r4] - ldr r0, [r0] - cmp r0, 0 - beq _080965A2 - bl DestroySprite - ldr r1, [r4] - movs r0, 0 - str r0, [r1] -_080965A2: - movs r5, 0 - adds r6, r4, 0 -_080965A6: - ldr r0, [r6] - lsls r4, r5, 2 - adds r0, 0x4 - adds r0, r4 - ldr r0, [r0] - cmp r0, 0 - beq _080965C2 - bl DestroySprite - ldr r0, [r6] - adds r0, 0x4 - adds r0, r4 - movs r1, 0 - str r1, [r0] -_080965C2: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x3 - bls _080965A6 - movs r5, 0 -_080965CE: - ldr r0, _080965F4 @ =gUnknown_02038478 - ldr r0, [r0] - lsls r1, r5, 2 - adds r0, 0x20 - adds r0, r1 - ldr r0, [r0] - cmp r0, 0 - beq _080965E2 - bl DestroySprite -_080965E2: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _080965CE - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080965F4: .4byte gUnknown_02038478 - thumb_func_end sub_809658C - - thumb_func_start sub_80965F8 -sub_80965F8: @ 80965F8 - push {lr} - ldr r2, _08096628 @ =gUnknown_02038478 - ldr r1, [r2] - movs r0, 0x8F - lsls r0, 2 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xD - bls _0809661E - ldr r0, [r2] - movs r1, 0x8F - lsls r1, 2 - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_0809661E: - bl sub_809665C - pop {r0} - bx r0 - .align 2, 0 -_08096628: .4byte gUnknown_02038478 - thumb_func_end sub_80965F8 - - thumb_func_start sub_809662C -sub_809662C: @ 809662C - push {lr} - ldr r0, _08096644 @ =gUnknown_02038478 - ldr r2, [r0] - movs r1, 0x8F - lsls r1, 2 - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08096648 - subs r1, r0, 0x1 - b _0809664A - .align 2, 0 -_08096644: .4byte gUnknown_02038478 -_08096648: - movs r1, 0xD -_0809664A: - movs r3, 0x8F - lsls r3, 2 - adds r0, r2, r3 - strb r1, [r0] - bl sub_809665C - pop {r0} - bx r0 - thumb_func_end sub_809662C - - thumb_func_start sub_809665C -sub_809665C: @ 809665C - push {r4-r7,lr} - ldr r5, _080966B4 @ =gUnknown_02038478 - ldr r0, [r5] - movs r4, 0x8F - lsls r4, 2 - adds r0, r4 - ldrb r0, [r0] - bl sub_8095ADC - lsls r0, 24 - lsrs r7, r0, 24 - ldr r2, _080966B8 @ =gStringVar1 - movs r6, 0xFC - strb r6, [r2] - movs r0, 0x4 - strb r0, [r2, 0x1] - movs r0, 0xF - strb r0, [r2, 0x2] - movs r0, 0x1 - strb r0, [r2, 0x3] - movs r0, 0xE - strb r0, [r2, 0x4] - adds r2, 0x5 - ldr r0, [r5] - adds r0, r4 - ldrb r0, [r0] - lsls r1, r0, 3 - adds r1, r0 - ldr r0, _080966BC @ =gPokemonStorage + 0x8344 - adds r1, r0 - adds r0, r2, 0 - bl StringCopy - adds r2, r0, 0 - movs r0, 0xFE - strb r0, [r2] - strb r6, [r2, 0x1] - movs r0, 0x11 - strb r0, [r2, 0x2] - cmp r7, 0x9 - bhi _080966C0 - movs r0, 0x28 - b _080966C2 - .align 2, 0 -_080966B4: .4byte gUnknown_02038478 -_080966B8: .4byte gStringVar1 -_080966BC: .4byte gPokemonStorage + 0x8344 -_080966C0: - movs r0, 0x22 -_080966C2: - strb r0, [r2, 0x3] - adds r2, 0x4 - adds r0, r2, 0 - adds r1, r7, 0 - bl ConvertIntToDecimalString - adds r2, r0, 0 - movs r0, 0xBA - strb r0, [r2] - movs r0, 0xA4 - strb r0, [r2, 0x1] - movs r0, 0xA1 - strb r0, [r2, 0x2] - movs r0, 0xFF - strb r0, [r2, 0x3] - ldr r0, _080966F0 @ =gStringVar1 - movs r1, 0 - movs r2, 0x1 - bl sub_80966F4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080966F0: .4byte gStringVar1 - thumb_func_end sub_809665C - - thumb_func_start sub_80966F4 -sub_80966F4: @ 80966F4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x4 - mov r8, r0 - adds r5, r1, 0 - adds r4, r2, 0 - lsls r5, 16 - lsrs r5, 16 - lsls r4, 16 - lsrs r4, 16 - ldr r0, _08096764 @ =gUnknown_02038478 - ldr r0, [r0] - movs r1, 0x90 - lsls r1, 2 - adds r0, r1 - ldrh r0, [r0] - bl GetSpriteTileStartByTag - adds r6, r0, 0 - lsls r6, 16 - lsrs r6, 11 - lsls r4, 8 - ldr r2, _08096768 @ =0x06010000 - adds r4, r2 - adds r6, r4 - lsls r5, 5 - adds r6, r5 - ldr r0, _0809676C @ =gUnknown_083B6DB8 - ldr r5, [r0] - mov r1, sp - ldr r2, _08096770 @ =0x00001111 - adds r0, r2, 0 - strh r0, [r1] - ldr r4, _08096774 @ =0x040000d4 - str r1, [r4] - str r5, [r4, 0x4] - ldr r0, _08096778 @ =0x81000200 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _0809677C @ =gWindowConfig_81E6D38 - adds r1, r5, 0 - mov r2, r8 - bl sub_8004E3C - str r5, [r4] - str r6, [r4, 0x4] - ldr r0, _08096780 @ =0x80000200 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08096764: .4byte gUnknown_02038478 -_08096768: .4byte 0x06010000 -_0809676C: .4byte gUnknown_083B6DB8 -_08096770: .4byte 0x00001111 -_08096774: .4byte 0x040000d4 -_08096778: .4byte 0x81000200 -_0809677C: .4byte gWindowConfig_81E6D38 -_08096780: .4byte 0x80000200 - thumb_func_end sub_80966F4 - - thumb_func_start sub_8096784 -sub_8096784: @ 8096784 - push {lr} - adds r1, r0, 0 - ldrh r0, [r1, 0x30] - adds r0, 0x1 - movs r2, 0 - strh r0, [r1, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _080967B4 - strh r2, [r1, 0x30] - ldrh r0, [r1, 0x2E] - ldrh r3, [r1, 0x24] - adds r0, r3 - strh r0, [r1, 0x24] - ldrh r0, [r1, 0x32] - adds r0, 0x1 - strh r0, [r1, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080967B4 - strh r2, [r1, 0x32] - strh r2, [r1, 0x24] -_080967B4: - pop {r0} - bx r0 - thumb_func_end sub_8096784 - - thumb_func_start task_intro_29 -task_intro_29: @ 80967B8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080967D0 @ =gUnknown_0203847D - strb r0, [r1] - ldr r1, _080967D4 @ =gSharedMem - strb r0, [r1, 0x5] - ldr r0, _080967D8 @ =sub_8096884 - bl SetMainCallback2 - pop {r0} - bx r0 - .align 2, 0 -_080967D0: .4byte gUnknown_0203847D -_080967D4: .4byte gSharedMem -_080967D8: .4byte sub_8096884 - thumb_func_end task_intro_29 - thumb_func_start sub_80967DC sub_80967DC: @ 80967DC ldr r0, _08096800 @ =REG_BG0HOFS @@ -9960,7 +9653,7 @@ sub_809B62C: @ 809B62C lsls r0, 24 lsrs r6, r0, 24 adds r0, r6, 0 - bl sub_8095B24 + bl GetIndexOfFirstEmptySpaceInBoxN lsls r0, 16 lsrs r4, r0, 16 asrs r0, 16 diff --git a/include/ewram.h b/include/ewram.h index 5a350840a..9a281368f 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -28,6 +28,7 @@ extern u8 gSharedMem[]; #define ewram0_9(i) (u8 *)(ewram_addr + (i * 0x20)) #define ewram0_10 (*(struct UnknownPokenav0*)(gSharedMem + 0)) #define ewram0_11 (*(struct UnknownPokenav0_1*)(gSharedMem + 0)) +#define ePokemonStorageSystem (*(struct PokemonStorageSystemData *)(gSharedMem + 0)) #define ewram4 (*(struct UnknownStruct8 *)(gSharedMem + 0x4)) #define ewram520 ((struct UnknownStruct7 *)(gSharedMem + 0x00520)) #define ewram520_2 (u8 *)(ewram_addr + 0x520) diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 37414f32b..30c0f2b67 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -35,7 +35,7 @@ struct UnkPSSStruct_2002370 { u32 unk_0014[3]; struct Sprite *unk_0020[2]; u8 filler_0028[0x214]; - u8 unk_023c; + u8 curBox; u8 unk_023d; u8 unk_023e; u16 unk_0240; @@ -43,13 +43,15 @@ struct UnkPSSStruct_2002370 { }; void StorageSystemCreatePrimaryMenu(u8 whichMenu); -void task_intro_29(u8 whichMenu); -void sub_80963D0(u8 a0); +void sub_80963D0(u8 curBox); void sub_809658C(void); void sub_80965F8(void); void sub_809662C(void); void sub_809665C(void); +void sub_80966F4(const u8 *sourceString, u16 x, u16 y); void sub_8096784(struct Sprite *sprite); +void task_intro_29(u8 whichMenu); +void sub_8096884(void); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { @@ -103,12 +105,15 @@ const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/bo extern const struct StorageAction gUnknown_083B6DF4[]; extern const struct PokemonStorageSystemData *gUnknown_083B6DB4; +extern u8 *const gUnknown_083B6DB8; EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; EWRAM_DATA u8 gUnknown_02038474; EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478; +EWRAM_DATA u8 gUnknown_0203847C; +EWRAM_DATA u8 gUnknown_0203847D; -u8 sub_8095ADC(u8 boxId) +static u8 CountPokemonInBoxN(u8 boxId) { u16 i; u16 count; @@ -121,7 +126,7 @@ u8 sub_8095ADC(u8 boxId) return count; } -s16 sub_8095B24(u8 boxId) +s16 GetIndexOfFirstEmptySpaceInBoxN(u8 boxId) { u16 i; @@ -561,9 +566,9 @@ void sub_8096310(void) FreeSpriteTilesByTag(gUnknown_02038478->unk_0240 + 1); } -void sub_809634C(u8 a0) +void sub_809634C(u8 curBox) { - sub_80963D0(a0); + sub_80963D0(curBox); } void sub_809635C(void) @@ -581,7 +586,7 @@ u8 sub_8096368(void) if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - return gUnknown_02038478->unk_023c; + return gUnknown_02038478->curBox; } if (gMain.newKeys & DPAD_LEFT) { @@ -596,7 +601,7 @@ u8 sub_8096368(void) return 200; } -void sub_80963D0(u8 a0) +void sub_80963D0(u8 curBox) { u16 i; u8 spriteId; @@ -608,11 +613,11 @@ void sub_80963D0(u8 a0) 0, 0, &oamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy }; - gUnknown_02038478->unk_023c = a0; + gUnknown_02038478->curBox = curBox; template.tileTag = gUnknown_02038478->unk_0240; template.paletteTag = gUnknown_02038478->unk_0242; - spriteId = CreateSprite(&template, 0xa0, 0x60, 0); + spriteId = CreateSprite(&template, 0xA0, 0x60, 0); gUnknown_02038478->unk_0000 = gSprites + spriteId; oamData.shape = ST_OAM_V_RECTANGLE; @@ -650,6 +655,104 @@ void sub_80963D0(u8 a0) sub_809665C(); } +void sub_809658C(void) +{ + u16 i; + if (gUnknown_02038478->unk_0000) + { + DestroySprite(gUnknown_02038478->unk_0000); + gUnknown_02038478->unk_0000 = NULL; + } + for (i = 0; i < 4; i++) + { + if (gUnknown_02038478->unk_0004[i]) + { + DestroySprite(gUnknown_02038478->unk_0004[i]); + gUnknown_02038478->unk_0004[i] = NULL; + } + } + for (i = 0; i < 2; i++) + { + if (gUnknown_02038478->unk_0020[i]) + DestroySprite(gUnknown_02038478->unk_0020[i]); + } +} + +void sub_80965F8(void) +{ + if (++gUnknown_02038478->curBox > 13) + gUnknown_02038478->curBox = 0; + sub_809665C(); +} + +void sub_809662C(void) +{ + gUnknown_02038478->curBox = (gUnknown_02038478->curBox == 0 ? 13 : gUnknown_02038478->curBox - 1); + sub_809665C(); +} + +void sub_809665C(void) +{ + u8 nPokemonInBox = CountPokemonInBoxN(gUnknown_02038478->curBox); + u8 *stringVar = gStringVar1; + + stringVar[0] = EXT_CTRL_CODE_BEGIN; + stringVar[1] = 0x04; // EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW + stringVar[2] = 0x0F; // TEXT_COLOR_WHITE2 + stringVar[3] = 0x01; // TEXT_COLOR_DARK_GREY + stringVar[4] = 0x0E; // TEXT_COLOR_LIGHT_BLUE + stringVar += 5; + + stringVar = StringCopy(stringVar, gPokemonStorage.boxNames[gUnknown_02038478->curBox]); + + stringVar[0] = CHAR_NEWLINE; + stringVar[1] = EXT_CTRL_CODE_BEGIN; + stringVar[2] = 0x11; // EXT_CTRL_CODE_CLEAR + if (nPokemonInBox < 10) + stringVar[3] = 0x28; + else + stringVar[3] = 0x22; + stringVar += 4; + + stringVar = ConvertIntToDecimalString(stringVar, nPokemonInBox); + + stringVar[0] = CHAR_SLASH; + stringVar[1] = CHAR_0 + 3; + stringVar[2] = CHAR_0 + 0; + stringVar[3] = EOS; + sub_80966F4(gStringVar1, 0, 1); +} + +void sub_80966F4(const u8 *sourceString, u16 x, u16 y) +{ + u16 *vdest = (u16 *)(BG_CHAR_ADDR(4) + (GetSpriteTileStartByTag(gUnknown_02038478->unk_0240) * 32) + y * 256 + x * 32); + u8 *tileBuff = gUnknown_083B6DB8; + DmaFill16(3, 0x1111, tileBuff, 0x400); + sub_8004E3C(&gWindowConfig_81E6D38, tileBuff, sourceString); + DmaCopy16(3, tileBuff, vdest, 0x400); +} + +void sub_8096784(struct Sprite *sprite) +{ + if (++sprite->data[1] > 3) + { + sprite->data[1] = 0; + sprite->pos2.x += sprite->data[0]; + if (++sprite->data[2] > 5) + { + sprite->data[2] = 0; + sprite->pos2.x = 0; + } + } +} + +void task_intro_29(u8 whichMenu) +{ + gUnknown_0203847D = whichMenu; + ePokemonStorageSystem.unk_0005 = whichMenu; + SetMainCallback2(sub_8096884); +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 47acecb873695944a230820e57c6c8fd4658eaff Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 7 Jan 2018 18:11:16 -0600 Subject: match SaveCurrentWinStreak --- src/field/battle_tower.c | 113 +++++++---------------------------------------- 1 file changed, 15 insertions(+), 98 deletions(-) diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index caebc6a7b..24726a325 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -132,7 +132,7 @@ static const u8 sMaleTrainerClasses[] = { TRAINER_CLASS_POKEMON_BREEDER_M, TRAINER_CLASS_POKEMON_RANGER_M, TRAINER_CLASS_BUG_CATCHER, - TRAINER_CLASS_HIKER, + TRAINER_CLASS_HIKER, }; static const u8 sFemaleTrainerClasses[] = { @@ -255,7 +255,7 @@ static void ResetBattleTowerStreak(u8 levelType); static void ValidateBattleTowerRecordChecksums(void); static void PrintEReaderTrainerFarewellMessage(void); extern void SetBattleTowerTrainerGfxId(u8); -extern void sub_8135A3C(void); +static void SaveCurrentWinStreak(void); static void sub_8135CFC(void); static void CheckMonBattleTowerBanlist(u16, u16, u16, u8, u8, u16 *, u16 *, u8 *); static void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *); @@ -1538,7 +1538,7 @@ void CheckPartyBattleTowerBanlist(void) StringAppend(gStringVar1, BattleText_Format8); return; } - + if (1 & counter) StringAppend(gStringVar1, BattleText_Format6); else @@ -1699,7 +1699,7 @@ void SetBattleTowerProperty(void) } gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]++; - sub_8135A3C(); + SaveCurrentWinStreak(); gSpecialVar_Result = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType]; gStringVar1[0] = gSaveBlock2.battleTower.curChallengeBattleNum[battleTowerLevelType] + 0xA1; @@ -1711,7 +1711,7 @@ void SetBattleTowerProperty(void) gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType]++; } - sub_8135A3C(); + SaveCurrentWinStreak(); gSpecialVar_Result = gSaveBlock2.battleTower.curStreakChallengesNum[battleTowerLevelType]; break; case 8: @@ -1801,118 +1801,35 @@ void SetBattleTowerParty(void) ReducePlayerPartyToThree(); } -#ifdef NONMATCHING -void sub_8135A3C(void) +static void SaveCurrentWinStreak(void) { - u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; - u16 winStreak = GetCurrentBattleTowerWinStreak(battleTowerLevelType); + u8 levelType = gSaveBlock2.battleTower.battleTowerLevelType; + u16 streak = GetCurrentBattleTowerWinStreak(levelType); - if (gSaveBlock2.battleTower.recordWinStreaks[battleTowerLevelType] < winStreak) - { - gSaveBlock2.battleTower.recordWinStreaks[battleTowerLevelType] = winStreak; - } + if (gSaveBlock2.battleTower.recordWinStreaks[levelType] < streak) + gSaveBlock2.battleTower.recordWinStreaks[levelType] = streak; if (gSaveBlock2.battleTower.recordWinStreaks[0] > gSaveBlock2.battleTower.recordWinStreaks[1]) { - u16 streak = gSaveBlock2.battleTower.recordWinStreaks[0]; + streak = gSaveBlock2.battleTower.recordWinStreaks[0]; SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, streak); + if (streak > 9999) - { gSaveBlock2.battleTower.bestBattleTowerWinStreak = 9999; - } else - { gSaveBlock2.battleTower.bestBattleTowerWinStreak = streak; - } } else { - u16 streak = gSaveBlock2.battleTower.recordWinStreaks[1]; + streak = gSaveBlock2.battleTower.recordWinStreaks[1]; SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, streak); + if (streak > 9999) - { gSaveBlock2.battleTower.bestBattleTowerWinStreak = 9999; - } else - { gSaveBlock2.battleTower.bestBattleTowerWinStreak = streak; - } } } -#else -__attribute__((naked)) -void sub_8135A3C(void) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - ldr r6, _08135A84 @ =gSaveBlock2\n\ - ldr r1, _08135A88 @ =0x00000554\n\ - adds r0, r6, r1\n\ - ldrb r4, [r0]\n\ - lsls r4, 31\n\ - lsrs r4, 31\n\ - adds r0, r4, 0\n\ - bl GetCurrentBattleTowerWinStreak\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - lsls r4, 1\n\ - movs r3, 0xAC\n\ - lsls r3, 3\n\ - adds r2, r6, r3\n\ - adds r4, r2\n\ - ldrh r0, [r4]\n\ - cmp r0, r5\n\ - bcs _08135A66\n\ - strh r5, [r4]\n\ -_08135A66:\n\ - ldr r0, _08135A8C @ =0x00000562\n\ - adds r1, r6, r0\n\ - ldrh r0, [r2]\n\ - ldrh r3, [r1]\n\ - cmp r0, r3\n\ - bls _08135A94\n\ - adds r5, r0, 0\n\ - movs r0, 0x20\n\ - adds r1, r5, 0\n\ - bl SetGameStat\n\ - ldr r1, _08135A90 @ =0x0000270f\n\ - cmp r5, r1\n\ - bhi _08135AA4\n\ - b _08135AB4\n\ - .align 2, 0\n\ -_08135A84: .4byte gSaveBlock2\n\ -_08135A88: .4byte 0x00000554\n\ -_08135A8C: .4byte 0x00000562\n\ -_08135A90: .4byte 0x0000270f\n\ -_08135A94:\n\ - ldrh r5, [r1]\n\ - movs r0, 0x20\n\ - adds r1, r5, 0\n\ - bl SetGameStat\n\ - ldr r1, _08135AAC @ =0x0000270f\n\ - cmp r5, r1\n\ - bls _08135AB4\n\ -_08135AA4:\n\ - ldr r2, _08135AB0 @ =0x00000572\n\ - adds r0, r6, r2\n\ - strh r1, [r0]\n\ - b _08135ABA\n\ - .align 2, 0\n\ -_08135AAC: .4byte 0x0000270f\n\ -_08135AB0: .4byte 0x00000572\n\ -_08135AB4:\n\ - ldr r3, _08135AC0 @ =0x00000572\n\ - adds r0, r6, r3\n\ - strh r5, [r0]\n\ -_08135ABA:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_08135AC0: .4byte 0x00000572\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void sub_8135AC4(void) { @@ -1951,7 +1868,7 @@ void sub_8135AC4(void) } SetBattleTowerRecordChecksum(&gSaveBlock2.battleTower.playerRecord); - sub_8135A3C(); + SaveCurrentWinStreak(); } void SaveBattleTowerProgress(void) -- cgit v1.2.3 From bbb65b40f9e6e68b0412ce47755d61200727fbf7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 7 Jan 2018 18:18:57 -0600 Subject: match DetermineBattleTowerPrize --- src/field/battle_tower.c | 72 +++--------------------------------------------- 1 file changed, 4 insertions(+), 68 deletions(-) diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 24726a325..88115d28a 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -1985,79 +1985,15 @@ u16 GetCurrentBattleTowerWinStreak(u8 battleTowerLevelType) return winStreak; } -#ifdef NONMATCHING void DetermineBattleTowerPrize(void) { - u16 prizeItem; - struct SaveBlock2 *saveBlock = &gSaveBlock2; - u8 battleTowerLevelType = saveBlock->battleTower.battleTowerLevelType; + u8 levelType = gSaveBlock2.battleTower.battleTowerLevelType; - if (saveBlock->battleTower.curStreakChallengesNum[battleTowerLevelType] - 1 > 5) - { - prizeItem = sLongStreakPrizes[Random() % ARRAY_COUNT(sLongStreakPrizes)]; - } + if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1 > 5) + gSaveBlock2.battleTower.prizeItem = sLongStreakPrizes[Random() % ARRAY_COUNT(sLongStreakPrizes)]; else - { - prizeItem = sShortStreakPrizes[Random() % ARRAY_COUNT(sShortStreakPrizes)]; - } - - saveBlock->battleTower.prizeItem = prizeItem; -} -#else -__attribute__((naked)) -void DetermineBattleTowerPrize(void) -{ - asm(".syntax unified\n\ - push {r4,r5,lr}\n\ - ldr r5, _08135DB0 @ =gSaveBlock2\n\ - ldr r1, _08135DB4 @ =0x00000554\n\ - adds r0, r5, r1\n\ - ldrb r0, [r0]\n\ - lsls r0, 31\n\ - lsrs r0, 31\n\ - lsls r0, 1\n\ - ldr r2, _08135DB8 @ =0x0000055c\n\ - adds r1, r5, r2\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - subs r0, 0x1\n\ - cmp r0, 0x5\n\ - ble _08135DC0\n\ - bl Random\n\ - ldr r4, _08135DBC @ =sLongStreakPrizes\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0x9\n\ - b _08135DCC\n\ - .align 2, 0\n\ -_08135DB0: .4byte gSaveBlock2\n\ -_08135DB4: .4byte 0x00000554\n\ -_08135DB8: .4byte 0x0000055c\n\ -_08135DBC: .4byte sLongStreakPrizes\n\ -_08135DC0:\n\ - bl Random\n\ - ldr r4, _08135DE8 @ =sShortStreakPrizes\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - movs r1, 0x6\n\ -_08135DCC:\n\ - bl __umodsi3\n\ - lsls r0, 16\n\ - lsrs r0, 15\n\ - adds r0, r4\n\ - ldrh r1, [r0]\n\ - movs r2, 0xAD\n\ - lsls r2, 3\n\ - adds r0, r5, r2\n\ - strh r1, [r0]\n\ - pop {r4,r5}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_08135DE8: .4byte sShortStreakPrizes\n\ - .syntax divided\n"); + gSaveBlock2.battleTower.prizeItem = sShortStreakPrizes[Random() % ARRAY_COUNT(sShortStreakPrizes)]; } -#endif // NONMATCHING void GiveBattleTowerPrize(void) { -- cgit v1.2.3 From b9ad9b3ad547b200e66b293169acbbfe4f50f76d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jan 2018 19:20:15 -0500 Subject: through sub_8096874 --- asm/pokemon_storage_system.s | 88 ------------------------------------ include/main.h | 2 + include/sprite.h | 1 + src/engine/naming_screen.c | 2 - src/field/use_pokeblock.c | 1 - src/pokemon/pokemon_storage_system.c | 47 +++++++++++++++++++ src/pokenav_before.c | 5 +- 7 files changed, 51 insertions(+), 95 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index b4addb8e7..da5d00899 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,94 +5,6 @@ .text - thumb_func_start sub_80967DC -sub_80967DC: @ 80967DC - ldr r0, _08096800 @ =REG_BG0HOFS - movs r1, 0 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - subs r0, 0x2 - strh r1, [r0] - adds r0, 0x4 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - bx lr - .align 2, 0 -_08096800: .4byte REG_BG0HOFS - thumb_func_end sub_80967DC - - thumb_func_start sub_8096804 -sub_8096804: @ 8096804 - push {lr} - bl ResetPaletteFade - bl ResetSpriteData - bl FreeSpriteTileRanges - bl FreeAllSpritePalettes - bl ResetTasks - ldr r1, _0809683C @ =gReservedSpriteTileCount - movs r2, 0xA0 - lsls r2, 2 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _08096840 @ =gSharedMem + 0x20 - adds r1, r0, 0 - adds r1, 0x8 - movs r2, 0x8 - bl sub_809CFDC - ldr r1, _08096844 @ =gKeyRepeatStartDelay - movs r0, 0x14 - strh r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0809683C: .4byte gReservedSpriteTileCount -_08096840: .4byte gSharedMem + 0x20 -_08096844: .4byte gKeyRepeatStartDelay - thumb_func_end sub_8096804 - - thumb_func_start sub_8096848 -sub_8096848: @ 8096848 - push {lr} - bl sub_809B0D4 - ldr r2, _08096868 @ =gUnknown_0203847C - movs r1, 0 - ldr r0, _0809686C @ =gSharedMem - ldrb r0, [r0, 0x5] - cmp r0, 0x1 - bne _0809685C - movs r1, 0x1 -_0809685C: - strb r1, [r2] - ldr r1, _08096870 @ =gUnknown_0203847E - movs r0, 0 - strb r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08096868: .4byte gUnknown_0203847C -_0809686C: .4byte gSharedMem -_08096870: .4byte gUnknown_0203847E - thumb_func_end sub_8096848 - - thumb_func_start sub_8096874 -sub_8096874: @ 8096874 - movs r1, 0x80 - lsls r1, 19 - movs r2, 0xFA - lsls r2, 5 - adds r0, r2, 0 - strh r0, [r1] - bx lr - thumb_func_end sub_8096874 - thumb_func_start sub_8096884 sub_8096884: @ 8096884 push {lr} diff --git a/include/main.h b/include/main.h index ff9bb89c7..78403225e 100644 --- a/include/main.h +++ b/include/main.h @@ -51,6 +51,8 @@ extern bool8 gLinkVSyncDisabled; extern const u8 gGameVersion; extern const u8 gGameLanguage; +extern u16 gKeyRepeatStartDelay; + void AgbMain(void); void SetMainCallback2(MainCallback callback); void InitKeys(void); diff --git a/include/sprite.h b/include/sprite.h index b72c09989..3ad418356 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -235,6 +235,7 @@ extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[]; extern s16 gSpriteCoordOffsetX; extern s16 gSpriteCoordOffsetY; extern u8 gReservedSpritePaletteCount; +extern u16 gReservedSpriteTileCount; extern u8 gOamLimit; diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index 440504d5a..6f34fd678 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -26,8 +26,6 @@ #define COLUMN_COUNT 10 #endif -extern u16 gKeyRepeatStartDelay; - extern u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality); const u8 gSpriteImage_83CE094[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp"); diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 7253ac901..354193c14 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -104,7 +104,6 @@ static EWRAM_DATA struct Pokeblock *gUnknown_0203930C = NULL; EWRAM_DATA u8 gPokeblockMonID = 0; EWRAM_DATA s16 gPokeblockGain = 0; -extern u16 gKeyRepeatStartDelay; extern u16 gSpecialVar_ItemId; // FIXME: remove after merge of #349 Pokeblock static void launch_c3_walk_stairs_and_run_once(void (*const)(void)); diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 30c0f2b67..9e559354b 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -24,9 +24,17 @@ struct PSS_MenuStringPtrs { const u8 *desc; }; +struct UnkStruct_2000020 { + struct UnkStruct_2000020 *unk_00; + u8 unk_04; + u8 unk_05; +}; + struct PokemonStorageSystemData { u8 filler_0000[5]; u8 unk_0005; + u8 filler_0006[26]; + struct UnkStruct_2000020 unk_0020[100]; // refine size later }; struct UnkPSSStruct_2002370 { @@ -53,6 +61,8 @@ void sub_8096784(struct Sprite *sprite); void task_intro_29(u8 whichMenu); void sub_8096884(void); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); +void sub_809B0D4(void); +void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 * a1, u8 a2); const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { {PCText_WithdrawPoke, PCText_MovePokeToParty}, @@ -112,6 +122,7 @@ EWRAM_DATA u8 gUnknown_02038474; EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478; EWRAM_DATA u8 gUnknown_0203847C; EWRAM_DATA u8 gUnknown_0203847D; +EWRAM_DATA u8 gUnknown_0203847E; static u8 CountPokemonInBoxN(u8 boxId) { @@ -753,6 +764,42 @@ void task_intro_29(u8 whichMenu) SetMainCallback2(sub_8096884); } +void sub_80967DC(void) +{ + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2VOFS = 0; + REG_BG2HOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; +} + +void sub_8096804(void) +{ + ResetPaletteFade(); + ResetSpriteData(); + FreeSpriteTileRanges(); + FreeAllSpritePalettes(); + ResetTasks(); + gReservedSpriteTileCount = 0x280; + sub_809CFDC(ePokemonStorageSystem.unk_0020, ePokemonStorageSystem.unk_0020 + 1, 8); + gKeyRepeatStartDelay = 20; +} + +void sub_8096848(void) +{ + sub_809B0D4(); + gUnknown_0203847C = (ePokemonStorageSystem.unk_0005 == 1 ? 1 : 0); + gUnknown_0203847E = 0; +} + +void sub_8096874(void) +{ + REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 7693cba7d..53f17b211 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -294,9 +294,6 @@ extern void sub_80F5BF0(); extern void sub_80F6F64(); extern void sub_80F19FC(); -extern u16 gKeyRepeatStartDelay; - - void sub_80EBA5C() { switch (gMain.state) { default: @@ -378,7 +375,7 @@ void sub_80EBC10() { u16 i; u16 *var1; - gKeyRepeatStartDelay = 0x14; + gKeyRepeatStartDelay = 20; ewram0_10.playerPartyCount = CalculatePlayerPartyCount(); ewram0_10.var6ddc = 0; ewram0_10.var9344 = 0; -- cgit v1.2.3 From bfeaa80fcd9409645325c2f7ae94850f970fbb58 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jan 2018 19:47:59 -0500 Subject: through sub_8096884 --- asm/pokemon_storage_system.s | 119 ----------------------------------- include/mon_markings.h | 26 ++++++++ src/pokemon/mon_markings.c | 20 +----- src/pokemon/pokemon_storage_system.c | 74 +++++++++++++++++++++- 4 files changed, 100 insertions(+), 139 deletions(-) create mode 100644 include/mon_markings.h diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index da5d00899..071ac48e9 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,125 +5,6 @@ .text - thumb_func_start sub_8096884 -sub_8096884: @ 8096884 - push {lr} - ldr r0, _080968A0 @ =gMain - ldr r1, _080968A4 @ =0x0000043c - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x9 - bls _08096894 - b _08096986 -_08096894: - lsls r0, 2 - ldr r1, _080968A8 @ =_080968AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080968A0: .4byte gMain -_080968A4: .4byte 0x0000043c -_080968A8: .4byte _080968AC - .align 2, 0 -_080968AC: - .4byte _080968D4 - .4byte _080968E8 - .4byte _080968F4 - .4byte _08096904 - .4byte _0809690E - .4byte _08096918 - .4byte _0809691E - .4byte _08096924 - .4byte _0809692A - .4byte _08096964 -_080968D4: - movs r0, 0 - bl SetVBlankCallback - movs r1, 0x80 - lsls r1, 19 - movs r0, 0 - strh r0, [r1] - bl sub_8096804 - b _0809697A -_080968E8: - ldr r0, _080968F0 @ =gWindowConfig_81E6D00 - bl SetUpWindowConfig - b _0809697A - .align 2, 0 -_080968F0: .4byte gWindowConfig_81E6D00 -_080968F4: - ldr r0, _08096900 @ =gWindowConfig_81E6D00 - bl InitMenuWindow - bl MenuZeroFillScreen - b _0809697A - .align 2, 0 -_08096900: .4byte gWindowConfig_81E6D00 -_08096904: - bl sub_80967DC - bl sub_8096848 - b _0809697A -_0809690E: - bl sub_8098B48 - bl sub_809AA24 - b _0809697A -_08096918: - bl sub_8097DE0 - b _0809697A -_0809691E: - bl sub_8097E70 - b _0809697A -_08096924: - bl sub_8098400 - b _0809697A -_0809692A: - ldr r0, _08096950 @ =gPokemonStorage - ldrb r0, [r0] - bl sub_8099BF8 - ldr r2, _08096954 @ =gSharedMem - ldr r1, _08096958 @ =0x000012bc - adds r0, r2, r1 - movs r1, 0xA - strh r1, [r0] - ldr r1, _0809695C @ =0x000012be - adds r2, r1 - ldr r1, _08096960 @ =0x0000dacb - strh r1, [r2] - bl sub_80F727C - bl sub_80F7404 - b _0809697A - .align 2, 0 -_08096950: .4byte gPokemonStorage -_08096954: .4byte gSharedMem -_08096958: .4byte 0x000012bc -_0809695C: .4byte 0x000012be -_08096960: .4byte 0x0000dacb -_08096964: - bl sub_8096874 - ldr r0, _0809698C @ =sub_8096BF0 - bl sub_8096BE0 - ldr r0, _08096990 @ =sub_8096B38 - bl SetMainCallback2 - ldr r0, _08096994 @ =sub_8096AFC - bl SetVBlankCallback -_0809697A: - ldr r1, _08096998 @ =gMain - ldr r0, _0809699C @ =0x0000043c - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08096986: - pop {r0} - bx r0 - .align 2, 0 -_0809698C: .4byte sub_8096BF0 -_08096990: .4byte sub_8096B38 -_08096994: .4byte sub_8096AFC -_08096998: .4byte gMain -_0809699C: .4byte 0x0000043c - thumb_func_end sub_8096884 - thumb_func_start sub_80969A0 sub_80969A0: @ 80969A0 push {r4,lr} diff --git a/include/mon_markings.h b/include/mon_markings.h new file mode 100644 index 000000000..a2b0ac821 --- /dev/null +++ b/include/mon_markings.h @@ -0,0 +1,26 @@ +#ifndef POKERUBY_MON_MARKINGS_H +#define POKERUBY_MON_MARKINGS_H + +struct PokemonMarkMenu +{ + /*0x0000*/ u16 baseTileTag; + /*0x0002*/ u16 basePaletteTag; + /*0x0004*/ u8 markings; // bit flags + /*0x0005*/ s8 cursorPos; + /*0x0006*/ bool8 markingsArray[4]; + /*0x000A*/ u8 cursorBaseY; + /*0x000B*/ bool8 spriteSheetLoadRequired; + /*0x000C*/ struct Sprite *menuWindowSprites[2]; // upper and lower halves of menu window + /*0x0014*/ struct Sprite *menuMarkingSprites[4]; + /*0x0024*/ struct Sprite *menuTextSprite; + /*0x0028*/ const u8 *frameTiles; + /*0x002C*/ const u16 *framePalette; + /*0x0030*/ u8 menuWindowSpriteTiles[0x1000]; + /*0x1030*/ u8 filler1030[0x80]; + /*0x10B0*/ u8 tileLoadState; +}; + +void sub_80F7404(void); +void sub_80F727C(struct PokemonMarkMenu *ptr); + +#endif //POKERUBY_MON_MARKINGS_H diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c index b4144ea34..d27719c4a 100644 --- a/src/pokemon/mon_markings.c +++ b/src/pokemon/mon_markings.c @@ -5,6 +5,7 @@ #include "constants/songs.h" #include "sound.h" #include "sprite.h" +#include "mon_markings.h" #ifdef GERMAN #define MENU_TEXT_SPRITE_X_OFFSET 24 @@ -12,25 +13,6 @@ #define MENU_TEXT_SPRITE_X_OFFSET 32 #endif -struct PokemonMarkMenu -{ - /*0x0000*/ u16 baseTileTag; - /*0x0002*/ u16 basePaletteTag; - /*0x0004*/ u8 markings; // bit flags - /*0x0005*/ s8 cursorPos; - /*0x0006*/ bool8 markingsArray[4]; - /*0x000A*/ u8 cursorBaseY; - /*0x000B*/ bool8 spriteSheetLoadRequired; - /*0x000C*/ struct Sprite *menuWindowSprites[2]; // upper and lower halves of menu window - /*0x0014*/ struct Sprite *menuMarkingSprites[4]; - /*0x0024*/ struct Sprite *menuTextSprite; - /*0x0028*/ const u8 *frameTiles; - /*0x002C*/ const u16 *framePalette; - /*0x0030*/ u8 menuWindowSpriteTiles[0x1000]; - /*0x1030*/ u8 filler1030[0x80]; - /*0x10B0*/ u8 tileLoadState; -}; - extern u8 gPokenavConditionMenuMisc_Gfx[]; extern u16 gUnknown_08E966B8[]; diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 9e559354b..91d56a4b9 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -3,6 +3,7 @@ #include "constants/songs.h" #include "sound.h" #include "field_weather.h" +#include "mon_markings.h" #include "overworld.h" #include "field_fadetransition.h" #include "menu.h" @@ -34,7 +35,9 @@ struct PokemonStorageSystemData { u8 filler_0000[5]; u8 unk_0005; u8 filler_0006[26]; - struct UnkStruct_2000020 unk_0020[100]; // refine size later + struct UnkStruct_2000020 unk_0020[595]; // refine size later + u8 filler_12b8[4]; + struct PokemonMarkMenu unk_12bc; }; struct UnkPSSStruct_2002370 { @@ -60,6 +63,16 @@ void sub_80966F4(const u8 *sourceString, u16 x, u16 y); void sub_8096784(struct Sprite *sprite); void task_intro_29(u8 whichMenu); void sub_8096884(void); +void sub_8096AFC(void); +void sub_8096B38(void); +void sub_8096BE0(void (*func)(void)); +void sub_8096BF0(void); +void sub_8097DE0(void); +void sub_8097E70(void); +void sub_8098400(void); +void sub_8099BF8(u8 a0); +void sub_8098B48(void); +void sub_809AA24(void); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); void sub_809B0D4(void); void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 * a1, u8 a2); @@ -800,6 +813,65 @@ void sub_8096874(void) REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; } +void sub_8096884(void) +{ + switch (gMain.state) + { + case 0: + SetVBlankCallback(NULL); + REG_DISPCNT = 0; + sub_8096804(); + gMain.state++; + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E6D00); + gMain.state++; + break; + case 2: + InitMenuWindow(&gWindowConfig_81E6D00); + MenuZeroFillScreen(); + gMain.state++; + break; + case 3: + sub_80967DC(); + sub_8096848(); + gMain.state++; + break; + case 4: + sub_8098B48(); + sub_809AA24(); + gMain.state++; + break; + case 5: + sub_8097DE0(); + gMain.state++; + break; + case 6: + sub_8097E70(); + gMain.state++; + break; + case 7: + sub_8098400(); + gMain.state++; + break; + case 8: + sub_8099BF8(gPokemonStorage.currentBox); + ePokemonStorageSystem.unk_12bc.baseTileTag = 0x000a; + ePokemonStorageSystem.unk_12bc.basePaletteTag = 0xdacb; + sub_80F727C(&ePokemonStorageSystem.unk_12bc); + sub_80F7404(); + gMain.state++; + break; + case 9: + sub_8096874(); + sub_8096BE0(sub_8096BF0); + SetMainCallback2(sub_8096B38); + SetVBlankCallback(sub_8096AFC); + gMain.state++; + break; + } +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 376e2470e9e4f5a0a7cc94b9d7677ea6f7601dfa Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 8 Jan 2018 01:49:16 +0100 Subject: Matched sub_812AF98 --- src/battle/anim/sfx.c | 72 ++++----------------------------------------------- 1 file changed, 5 insertions(+), 67 deletions(-) diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index 981022f1e..99f050dcb 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -29,11 +29,10 @@ void sub_812AF30(u8 taskId) TASK.func = sub_812AF98; } -#ifdef NONMATCHING -void sub_812AF98(u8 taskId) // r4 := TASK +void sub_812AF98(u8 taskId) { - s16 pan = TASK.data[2]; // r5 - s8 var0 = TASK.data[4]; // r6 + s16 pan = TASK.data[2]; + s8 var0 = TASK.data[4]; if (++TASK.data[11] == 111) { @@ -48,71 +47,10 @@ void sub_812AF98(u8 taskId) // r4 := TASK TASK.data[10] = 0; PlaySE12WithPanning(TASK.data[0], pan); } - TASK.data[2] = sub_8077104(var0 + pan); + pan += var0; + TASK.data[2] = sub_8077104(pan); } } -#else -__attribute__((naked)) -void sub_812AF98(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - ldr r2, _0812AFC8 @ =gTasks\n\ - lsls r1, r0, 2\n\ - adds r1, r0\n\ - lsls r1, 3\n\ - adds r4, r1, r2\n\ - ldrh r5, [r4, 0xC]\n\ - ldrb r6, [r4, 0x10]\n\ - ldrh r0, [r4, 0x1E]\n\ - adds r0, 0x1\n\ - movs r1, 0\n\ - strh r0, [r4, 0x1E]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - cmp r0, 0x6F\n\ - bne _0812AFD0\n\ - movs r0, 0x5\n\ - strh r0, [r4, 0x1C]\n\ - strh r1, [r4, 0x1E]\n\ - ldr r0, _0812AFCC @ =sub_812B004\n\ - str r0, [r4]\n\ - b _0812AFFE\n\ - .align 2, 0\n\ -_0812AFC8: .4byte gTasks\n\ -_0812AFCC: .4byte sub_812B004\n\ -_0812AFD0:\n\ - ldrh r0, [r4, 0x1C]\n\ - adds r0, 0x1\n\ - strh r0, [r4, 0x1C]\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - cmp r0, 0xB\n\ - bne _0812AFEA\n\ - strh r1, [r4, 0x1C]\n\ - ldrh r0, [r4, 0x8]\n\ - lsls r1, r5, 24\n\ - asrs r1, 24\n\ - bl PlaySE12WithPanning\n\ -_0812AFEA:\n\ - lsls r1, r6, 24\n\ - asrs r1, 24\n\ - lsls r0, r5, 16\n\ - asrs r0, 16\n\ - adds r0, r1\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - bl sub_8077104\n\ - strh r0, [r4, 0xC]\n\ -_0812AFFE:\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void sub_812B004(u8 taskId) { -- cgit v1.2.3 From 3f9ca66670d59f8fad77c5a8952f1d43f13da1ea Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 7 Jan 2018 18:52:34 -0600 Subject: match CB2_PartyMenuMain --- src/field/party_menu.c | 56 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 52 deletions(-) diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 9c1150515..7160da93b 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -490,9 +490,6 @@ extern const u8 gStatusPal_Icons[]; #define WINDOW_RIGHT (29) #endif - -#ifdef NONMATCHING -// Main handler for the party menu. void CB2_PartyMenuMain(void) { const struct PartyMonTextSettingsStruct *textSettings; @@ -506,62 +503,17 @@ void CB2_PartyMenuMain(void) { // Draw mon name, level, and hp sprites DrawPartyMenuMonText( - textSettings[i].xOffset * 8, - textSettings[i].yOffset * 8, - textSettings[i].oamSettings, + textSettings->xOffset * 8, + textSettings->yOffset * 8, + textSettings->oamSettings, 0, (i << 5) | 0x200); + textSettings++; } RunTasks(); UpdatePaletteFade(); } -#else -__attribute__((naked)) -void CB2_PartyMenuMain(void) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - sub sp, 0x4\n\ - bl AnimateSprites\n\ - bl BuildOamBuffer\n\ - ldr r0, _0806AF2C @ =gPartyMenuType\n\ - ldrb r1, [r0]\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 4\n\ - ldr r1, _0806AF30 @ =PartyMonTextSettings\n\ - adds r5, r0, r1\n\ - movs r6, 0\n\ -_0806AEF8:\n\ - ldrb r0, [r5]\n\ - lsls r0, 3\n\ - ldrb r1, [r5, 0x1]\n\ - lsls r1, 3\n\ - ldr r2, [r5, 0x4]\n\ - lsls r3, r6, 5\n\ - movs r4, 0x80\n\ - lsls r4, 2\n\ - orrs r3, r4\n\ - str r3, [sp]\n\ - movs r3, 0\n\ - bl DrawPartyMenuMonText\n\ - adds r5, 0x8\n\ - adds r6, 0x1\n\ - cmp r6, 0x5\n\ - ble _0806AEF8\n\ - bl RunTasks\n\ - bl UpdatePaletteFade\n\ - add sp, 0x4\n\ - pop {r4-r6}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_0806AF2C: .4byte gPartyMenuType\n\ -_0806AF30: .4byte PartyMonTextSettings\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void VBlankCB_PartyMenu(void) { -- cgit v1.2.3 From 0947fdf167bff7fe67e1344fea8b287fc59a6cd2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jan 2018 21:27:40 -0500 Subject: sub_80969A0 --- asm/pokemon_storage_system.s | 150 ----------------------------------- src/pokemon/pokemon_storage_system.c | 97 ++++++++++++++++++++-- sym_ewram.txt | 54 ------------- 3 files changed, 90 insertions(+), 211 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 071ac48e9..47324f443 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,156 +5,6 @@ .text - thumb_func_start sub_80969A0 -sub_80969A0: @ 80969A0 - push {r4,lr} - sub sp, 0x4 - ldr r0, _080969BC @ =gMain - ldr r1, _080969C0 @ =0x0000043c - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0xA - bls _080969B2 - b _08096AE4 -_080969B2: - lsls r0, 2 - ldr r1, _080969C4 @ =_080969C8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080969BC: .4byte gMain -_080969C0: .4byte 0x0000043c -_080969C4: .4byte _080969C8 - .align 2, 0 -_080969C8: - .4byte _080969F4 - .4byte _08096A34 - .4byte _08096A40 - .4byte _08096A50 - .4byte _08096A56 - .4byte _08096A60 - .4byte _08096A66 - .4byte _08096A6C - .4byte _08096A72 - .4byte _08096AAC - .4byte _08096AC8 -_080969F4: - movs r0, 0 - bl SetVBlankCallback - movs r1, 0x80 - lsls r1, 19 - movs r0, 0 - strh r0, [r1] - ldr r1, _08096A28 @ =gSharedMem - ldr r0, _08096A2C @ =gUnknown_0203847D - ldrb r0, [r0] - strb r0, [r1, 0x5] - bl sub_8096804 - ldr r4, _08096A30 @ =gUnknown_0203847F - ldrb r0, [r4] - cmp r0, 0x1 - bne _08096A1A - bl sub_809BBC0 -_08096A1A: - ldrb r0, [r4] - cmp r0, 0 - bne _08096AD8 - bl sub_809BD14 - b _08096AD8 - .align 2, 0 -_08096A28: .4byte gSharedMem -_08096A2C: .4byte gUnknown_0203847D -_08096A30: .4byte gUnknown_0203847F -_08096A34: - ldr r0, _08096A3C @ =gWindowConfig_81E6D00 - bl SetUpWindowConfig - b _08096AD8 - .align 2, 0 -_08096A3C: .4byte gWindowConfig_81E6D00 -_08096A40: - ldr r0, _08096A4C @ =gWindowConfig_81E6D00 - bl InitMenuWindow - bl MenuZeroFillScreen - b _08096AD8 - .align 2, 0 -_08096A4C: .4byte gWindowConfig_81E6D00 -_08096A50: - bl sub_80967DC - b _08096AD8 -_08096A56: - bl sub_8098B48 - bl sub_809AA98 - b _08096AD8 -_08096A60: - bl sub_8097DE0 - b _08096AD8 -_08096A66: - bl sub_8097E70 - b _08096AD8 -_08096A6C: - bl sub_8098400 - b _08096AD8 -_08096A72: - ldr r0, _08096A98 @ =gPokemonStorage - ldrb r0, [r0] - bl sub_8099BF8 - ldr r2, _08096A9C @ =gSharedMem - ldr r1, _08096AA0 @ =0x000012bc - adds r0, r2, r1 - movs r1, 0xA - strh r1, [r0] - ldr r1, _08096AA4 @ =0x000012be - adds r2, r1 - ldr r1, _08096AA8 @ =0x0000dacb - strh r1, [r2] - bl sub_80F727C - bl sub_80F7404 - b _08096AD8 - .align 2, 0 -_08096A98: .4byte gPokemonStorage -_08096A9C: .4byte gSharedMem -_08096AA0: .4byte 0x000012bc -_08096AA4: .4byte 0x000012be -_08096AA8: .4byte 0x0000dacb -_08096AAC: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r0, _08096AC4 @ =sub_8096AFC - bl SetVBlankCallback - b _08096AD8 - .align 2, 0 -_08096AC4: .4byte sub_8096AFC -_08096AC8: - bl sub_8096874 - ldr r0, _08096AEC @ =sub_8096C68 - bl sub_8096BE0 - ldr r0, _08096AF0 @ =sub_8096B38 - bl SetMainCallback2 -_08096AD8: - ldr r1, _08096AF4 @ =gMain - ldr r0, _08096AF8 @ =0x0000043c - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08096AE4: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08096AEC: .4byte sub_8096C68 -_08096AF0: .4byte sub_8096B38 -_08096AF4: .4byte gMain -_08096AF8: .4byte 0x0000043c - thumb_func_end sub_80969A0 - thumb_func_start sub_8096AFC sub_8096AFC: @ 8096AFC push {lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 91d56a4b9..2b36f5d71 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -67,15 +67,19 @@ void sub_8096AFC(void); void sub_8096B38(void); void sub_8096BE0(void (*func)(void)); void sub_8096BF0(void); +void sub_8096C68(void); void sub_8097DE0(void); void sub_8097E70(void); void sub_8098400(void); void sub_8099BF8(u8 a0); void sub_8098B48(void); -void sub_809AA24(void); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); +void sub_809AA24(void); +void sub_809AA98(void); void sub_809B0D4(void); -void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 * a1, u8 a2); +void sub_809BBC0(void); +void sub_809BD14(void); +void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { {PCText_WithdrawPoke, PCText_MovePokeToParty}, @@ -131,11 +135,23 @@ extern const struct PokemonStorageSystemData *gUnknown_083B6DB4; extern u8 *const gUnknown_083B6DB8; EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; -EWRAM_DATA u8 gUnknown_02038474; -EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478; -EWRAM_DATA u8 gUnknown_0203847C; -EWRAM_DATA u8 gUnknown_0203847D; -EWRAM_DATA u8 gUnknown_0203847E; +EWRAM_DATA u8 gUnknown_02038470[3] = {}; +EWRAM_DATA u8 gUnknown_02038473 = 0; +EWRAM_DATA u8 gUnknown_02038474 = 0; +EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478 = NULL; +EWRAM_DATA u8 gUnknown_0203847C = 0; +EWRAM_DATA u8 gUnknown_0203847D = 0; +EWRAM_DATA u8 gUnknown_0203847E = 0; +EWRAM_DATA u8 gUnknown_0203847F = 0; +EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; +EWRAM_DATA u8 gUnknown_020384E4 = 0; +EWRAM_DATA u8 gUnknown_020384E5 = 0; +EWRAM_DATA u8 gUnknown_020384E6 = 0; +EWRAM_DATA u8 gUnknown_020384E7 = 0; +EWRAM_DATA u8 gUnknown_020384E8 = 0; +EWRAM_DATA u8 gUnknown_020384E9 = 0; +EWRAM_DATA u16 gUnknown_020384EA = 0; +EWRAM_DATA u32 gUnknown_020384EC = 0; static u8 CountPokemonInBoxN(u8 boxId) { @@ -872,6 +888,73 @@ void sub_8096884(void) } } +void sub_80969A0(void) +{ + switch (gMain.state) + { + case 0: + SetVBlankCallback(NULL); + REG_DISPCNT = 0x0000; + ePokemonStorageSystem.unk_0005 = gUnknown_0203847D; + sub_8096804(); + if (gUnknown_0203847F == 1) + sub_809BBC0(); + if (gUnknown_0203847F == 0) + sub_809BD14(); + gMain.state++; + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E6D00); + gMain.state++; + break; + case 2: + InitMenuWindow(&gWindowConfig_81E6D00); + MenuZeroFillScreen(); + gMain.state++; + break; + case 3: + sub_80967DC(); + gMain.state++; + break; + case 4: + sub_8098B48(); + sub_809AA98(); + gMain.state++; + break; + case 5: + sub_8097DE0(); + gMain.state++; + break; + case 6: + sub_8097E70(); + gMain.state++; + break; + case 7: + sub_8098400(); + gMain.state++; + break; + case 8: + sub_8099BF8(gPokemonStorage.currentBox); + ePokemonStorageSystem.unk_12bc.baseTileTag = 0x000a; + ePokemonStorageSystem.unk_12bc.basePaletteTag = 0xdacb; + sub_80F727C(&ePokemonStorageSystem.unk_12bc); + sub_80F7404(); + gMain.state++; + break; + case 9: + BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); + SetVBlankCallback(sub_8096AFC); + gMain.state++; + break; + case 10: + sub_8096874(); + sub_8096BE0(sub_8096C68); + SetMainCallback2(sub_8096B38); + gMain.state++; + break; + } +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { diff --git a/sym_ewram.txt b/sym_ewram.txt index 6f7be47c1..de949bbe7 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -379,60 +379,6 @@ gUnknown_0202FFA4: @ 202FFA4 .include "src/engine/trainer_card.o" .include "src/pokemon/pokemon_storage_system.o" -@ still pokemon_storage_system - - .align 2 -gUnknown_02038470: @ 2038470 - .space 0x3 - -gUnknown_02038473: @ 2038473 - .space 0x1 - -gUnknown_02038474: @ 2038474 - .space 0x4 - -gUnknown_02038478: @ 2038478 - .space 0x4 - -gUnknown_0203847C: @ 203847C - .space 0x1 - -gUnknown_0203847D: @ 203847D - .space 0x1 - -gUnknown_0203847E: @ 203847E - .space 0x1 - -gUnknown_0203847F: @ 203847F - .space 0x1 - -gUnknown_02038480: @ 2038480 - .space 0x64 - -gUnknown_020384E4: @ 20384E4 - .space 0x1 - -gUnknown_020384E5: @ 20384E5 - .space 0x1 - -gUnknown_020384E6: @ 20384E6 - .space 0x1 - -gUnknown_020384E7: @ 20384E7 - .space 0x1 - -gUnknown_020384E8: @ 20384E8 - .space 0x1 - -gUnknown_020384E9: @ 20384E9 - .space 0x1 - -gUnknown_020384EA: @ 20384EA - .space 0x2 - -gUnknown_020384EC: @ 20384EC - .space 0x4 - @ pokemon_summary_screen gUnknown_020384F0: @ 20384F0 -- cgit v1.2.3 From ceebbe19918520c65ed9bdcd79d4ae5fbb669d88 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jan 2018 22:03:21 -0500 Subject: through sub_8096BE0 --- asm/pokemon_storage_system.s | 117 ----------------------------------- include/mon_markings.h | 2 +- src/pokemon/pokemon_storage_system.c | 74 +++++++++++++++++++--- 3 files changed, 66 insertions(+), 127 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 47324f443..4db9c1667 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,123 +5,6 @@ .text - thumb_func_start sub_8096AFC -sub_8096AFC: @ 8096AFC - push {lr} - ldr r2, _08096B2C @ =REG_BG2HOFS - ldr r1, _08096B30 @ =gSharedMem - ldr r3, _08096B34 @ =0x000008b4 - adds r0, r1, r3 - ldrh r0, [r0] - strh r0, [r2] - adds r2, 0x4 - ldrh r0, [r1, 0xA] - strh r0, [r2] - adds r2, 0x2 - ldrh r0, [r1, 0x8] - strh r0, [r2] - bl LoadOam - bl ProcessSpriteCopyRequests - bl sub_809CFF0 - bl TransferPlttBuffer - pop {r0} - bx r0 - .align 2, 0 -_08096B2C: .4byte REG_BG2HOFS -_08096B30: .4byte gSharedMem -_08096B34: .4byte 0x000008b4 - thumb_func_end sub_8096AFC - - thumb_func_start sub_8096B38 -sub_8096B38: @ 8096B38 - push {lr} - ldr r0, _08096B58 @ =gSharedMem - ldr r0, [r0] - bl _call_via_r0 - bl sub_8097E44 - bl sub_8098734 - bl AnimateSprites - bl BuildOamBuffer - pop {r0} - bx r0 - .align 2, 0 -_08096B58: .4byte gSharedMem - thumb_func_end sub_8096B38 - - thumb_func_start sub_8096B5C -sub_8096B5C: @ 8096B5C - push {r4,r5,lr} - sub sp, 0x8 - ldr r4, _08096B70 @ =gSharedMem - ldrb r0, [r4, 0x6] - cmp r0, 0 - beq _08096B74 - cmp r0, 0x1 - beq _08096BAC - b _08096BCC - .align 2, 0 -_08096B70: .4byte gSharedMem -_08096B74: - ldr r1, _08096B98 @ =0x00002690 - adds r0, r4, r1 - ldr r0, [r0] - ldr r2, _08096B9C @ =0x0000268d - adds r1, r4, r2 - ldrb r1, [r1] - ldr r3, _08096BA0 @ =0x0000268c - adds r2, r4, r3 - ldrb r2, [r2] - ldr r3, _08096BA4 @ =sub_80969A0 - ldr r5, _08096BA8 @ =0x0000268e - adds r4, r5 - ldrb r4, [r4] - str r4, [sp] - bl ShowPokemonSummaryScreen - b _08096BCC - .align 2, 0 -_08096B98: .4byte 0x00002690 -_08096B9C: .4byte 0x0000268d -_08096BA0: .4byte 0x0000268c -_08096BA4: .4byte sub_80969A0 -_08096BA8: .4byte 0x0000268e -_08096BAC: - ldr r0, _08096BD4 @ =gPokemonStorage - ldrb r2, [r0] - lsls r1, r2, 3 - adds r1, r2 - ldr r2, _08096BD8 @ =0x00008344 - adds r0, r2 - adds r1, r0 - movs r0, 0 - str r0, [sp] - ldr r0, _08096BDC @ =sub_80969A0 - str r0, [sp, 0x4] - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl DoNamingScreen -_08096BCC: - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08096BD4: .4byte gPokemonStorage -_08096BD8: .4byte 0x00008344 -_08096BDC: .4byte sub_80969A0 - thumb_func_end sub_8096B5C - - thumb_func_start sub_8096BE0 -sub_8096BE0: @ 8096BE0 - ldr r1, _08096BEC @ =gSharedMem - str r0, [r1] - movs r0, 0 - strb r0, [r1, 0x4] - bx lr - .align 2, 0 -_08096BEC: .4byte gSharedMem - thumb_func_end sub_8096BE0 - thumb_func_start sub_8096BF0 sub_8096BF0: @ 8096BF0 push {r4,lr} diff --git a/include/mon_markings.h b/include/mon_markings.h index a2b0ac821..eae80861a 100644 --- a/include/mon_markings.h +++ b/include/mon_markings.h @@ -18,7 +18,7 @@ struct PokemonMarkMenu /*0x0030*/ u8 menuWindowSpriteTiles[0x1000]; /*0x1030*/ u8 filler1030[0x80]; /*0x10B0*/ u8 tileLoadState; -}; +}; // 10b4 void sub_80F7404(void); void sub_80F727C(struct PokemonMarkMenu *ptr); diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 2b36f5d71..f09d9b302 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -13,6 +13,8 @@ #include "event_data.h" #include "ewram.h" #include "script.h" +#include "pokemon_summary_screen.h" +#include "naming_screen.h" #include "pokemon_storage_system.h" struct StorageAction { @@ -31,15 +33,6 @@ struct UnkStruct_2000020 { u8 unk_05; }; -struct PokemonStorageSystemData { - u8 filler_0000[5]; - u8 unk_0005; - u8 filler_0006[26]; - struct UnkStruct_2000020 unk_0020[595]; // refine size later - u8 filler_12b8[4]; - struct PokemonMarkMenu unk_12bc; -}; - struct UnkPSSStruct_2002370 { struct Sprite *unk_0000; struct Sprite *unk_0004[4]; @@ -51,6 +44,27 @@ struct UnkPSSStruct_2002370 { u8 unk_023e; u16 unk_0240; u16 unk_0242; +}; // 0244 + +struct PokemonStorageSystemData { + void (*unk_0000)(void); + u8 unk_0004; + u8 unk_0005; + u8 unk_0006; + u16 unk_0008; + u16 unk_000a; + u8 filler_000c[20]; + struct UnkStruct_2000020 unk_0020[274]; // refine size later + u8 filler_08b0[4]; + u16 unk_08b4; + u8 filler_08b6[0xa06]; + struct PokemonMarkMenu unk_12bc; + struct UnkPSSStruct_2002370 unk_2370; + u8 filler_25b4[0xd8]; + u8 unk_268c; + u8 unk_268d; + u8 unk_268e; + struct Pokemon *unk_2690; }; void StorageSystemCreatePrimaryMenu(u8 whichMenu); @@ -69,8 +83,10 @@ void sub_8096BE0(void (*func)(void)); void sub_8096BF0(void); void sub_8096C68(void); void sub_8097DE0(void); +void sub_8097E44(void); void sub_8097E70(void); void sub_8098400(void); +void sub_8098734(void); void sub_8099BF8(u8 a0); void sub_8098B48(void); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); @@ -80,6 +96,7 @@ void sub_809B0D4(void); void sub_809BBC0(void); void sub_809BD14(void); void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); +void sub_809CFF0(void); const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { {PCText_WithdrawPoke, PCText_MovePokeToParty}, @@ -955,6 +972,45 @@ void sub_80969A0(void) } } +void sub_8096AFC(void) +{ + REG_BG2HOFS = ePokemonStorageSystem.unk_08b4; + REG_BG3HOFS = ePokemonStorageSystem.unk_000a; + REG_BG3VOFS = ePokemonStorageSystem.unk_0008; + LoadOam(); + ProcessSpriteCopyRequests(); + sub_809CFF0(); + TransferPlttBuffer(); +} + +void sub_8096B38(void) +{ + ePokemonStorageSystem.unk_0000(); + sub_8097E44(); + sub_8098734(); + AnimateSprites(); + BuildOamBuffer(); +} + +void sub_8096B5C(void) +{ + switch (ePokemonStorageSystem.unk_0006) + { + case 0: + ShowPokemonSummaryScreen(ePokemonStorageSystem.unk_2690, ePokemonStorageSystem.unk_268d, ePokemonStorageSystem.unk_268c, sub_80969A0, ePokemonStorageSystem.unk_268e); + break; + case 1: + DoNamingScreen(1, gPokemonStorage.boxNames[gPokemonStorage.currentBox], 0, 0, 0, sub_80969A0); + break; + } +} + +void sub_8096BE0(void (*func)(void)) +{ + ePokemonStorageSystem.unk_0000 = func; + ePokemonStorageSystem.unk_0004 = 0; +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 02fea36a2e43523c9e9401897ac2fdbeb37ed3d4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jan 2018 22:25:16 -0500 Subject: through sub_8096C68 --- asm/pokemon_storage_system.s | 79 ------------------------------------ include/pc_screen_effect.h | 19 +++++++++ src/field/pc_screen_effect.c | 17 ++------ src/pokemon/pokemon_storage_system.c | 35 +++++++++++++++- src/scene/hall_of_fame.c | 4 +- 5 files changed, 58 insertions(+), 96 deletions(-) create mode 100644 include/pc_screen_effect.h diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 4db9c1667..49bb3995e 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,85 +5,6 @@ .text - thumb_func_start sub_8096BF0 -sub_8096BF0: @ 8096BF0 - push {r4,lr} - ldr r4, _08096C04 @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0x1 - beq _08096C16 - cmp r0, 0x1 - bgt _08096C08 - cmp r0, 0 - beq _08096C0E - b _08096C5C - .align 2, 0 -_08096C04: .4byte gSharedMem -_08096C08: - cmp r0, 0x2 - beq _08096C4C - b _08096C5C -_08096C0E: - movs r0, 0x1 - negs r0, r0 - movs r1, 0x10 - b _08096C38 -_08096C16: - movs r0, 0x2 - bl PlaySE - movs r1, 0 - movs r0, 0xE - strh r0, [r4, 0xC] - ldr r0, _08096C48 @ =0x0000dad0 - strh r0, [r4, 0xE] - strh r1, [r4, 0x10] - strh r1, [r4, 0x12] - adds r0, r4, 0 - adds r0, 0xC - bl sub_80C5CD4 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 -_08096C38: - movs r2, 0 - bl BlendPalettes - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08096C5C - .align 2, 0 -_08096C48: .4byte 0x0000dad0 -_08096C4C: - bl sub_80C5DCC - lsls r0, 24 - cmp r0, 0 - beq _08096C5C - ldr r0, _08096C64 @ =sub_8096C84 - bl sub_8096BE0 -_08096C5C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08096C64: .4byte sub_8096C84 - thumb_func_end sub_8096BF0 - - thumb_func_start sub_8096C68 -sub_8096C68: @ 8096C68 - push {lr} - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _08096C7A - ldr r0, _08096C80 @ =sub_8096C84 - bl sub_8096BE0 -_08096C7A: - pop {r0} - bx r0 - .align 2, 0 -_08096C80: .4byte sub_8096C84 - thumb_func_end sub_8096C68 - thumb_func_start sub_8096C84 sub_8096C84: @ 8096C84 push {r4,lr} diff --git a/include/pc_screen_effect.h b/include/pc_screen_effect.h new file mode 100644 index 000000000..a791fc66f --- /dev/null +++ b/include/pc_screen_effect.h @@ -0,0 +1,19 @@ +#ifndef POKERUBY_PC_SCREEN_EFFECT_H +#define POKERUBY_PC_SCREEN_EFFECT_H + +struct PCScreenEffectStruct +{ + /*0x00*/ u16 tileTag; + /*0x02*/ u16 paletteTag; + /*0x04*/ u16 unk04; + /*0x06*/ u16 unk06; + /*0x08*/ u16 unk08; + /*0x0A*/ u16 unk0A; + /*0x0C*/ s16 unk0C; + /*0x10*/ u32 selectedPalettes; +}; + +void sub_80C5CD4(struct PCScreenEffectStruct *unkStruct); +bool8 sub_80C5DCC(void); + +#endif //POKERUBY_PC_SCREEN_EFFECT_H diff --git a/src/field/pc_screen_effect.c b/src/field/pc_screen_effect.c index 364fca0aa..dda569ea4 100644 --- a/src/field/pc_screen_effect.c +++ b/src/field/pc_screen_effect.c @@ -2,18 +2,7 @@ #include "main.h" #include "palette.h" #include "sprite.h" - -struct UnkStruct -{ - /*0x00*/ u16 tileTag; - /*0x02*/ u16 paletteTag; - /*0x04*/ u16 unk04; - /*0x06*/ u16 unk06; - /*0x08*/ u16 unk08; - /*0x0A*/ u16 unk0A; - /*0x0C*/ s16 unk0C; - /*0x10*/ u32 selectedPalettes; -}; +#include "pc_screen_effect.h" void sub_80C603C(void); void sub_80C6078(void); @@ -30,7 +19,7 @@ extern const u16 gUnknownPal_083D18EC[16]; extern const u8 gUnknownGfx_083D190C[128]; -extern struct UnkStruct *gUnknown_020387EC; +extern struct PCScreenEffectStruct *gUnknown_020387EC; const struct SpriteSheet gUnknown_083D1898 = { gUnknownGfx_083D190C, sizeof(gUnknownGfx_083D190C), 0 }; @@ -58,7 +47,7 @@ const struct SpriteTemplate gSpriteTemplate_83D18C0 = sub_80C6130, }; -void sub_80C5CD4(struct UnkStruct *unkStruct) +void sub_80C5CD4(struct PCScreenEffectStruct *unkStruct) { u16 i; diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index f09d9b302..d6119476c 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -14,6 +14,7 @@ #include "ewram.h" #include "script.h" #include "pokemon_summary_screen.h" +#include "pc_screen_effect.h" #include "naming_screen.h" #include "pokemon_storage_system.h" @@ -53,7 +54,7 @@ struct PokemonStorageSystemData { u8 unk_0006; u16 unk_0008; u16 unk_000a; - u8 filler_000c[20]; + struct PCScreenEffectStruct unk_000c; struct UnkStruct_2000020 unk_0020[274]; // refine size later u8 filler_08b0[4]; u16 unk_08b4; @@ -82,6 +83,7 @@ void sub_8096B38(void); void sub_8096BE0(void (*func)(void)); void sub_8096BF0(void); void sub_8096C68(void); +void sub_8096C84(void); void sub_8097DE0(void); void sub_8097E44(void); void sub_8097E70(void); @@ -1011,6 +1013,37 @@ void sub_8096BE0(void (*func)(void)) ePokemonStorageSystem.unk_0004 = 0; } +void sub_8096BF0(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + BlendPalettes(0xffffffff, 16, 0); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + PlaySE(SE_PC_LOGON); + ePokemonStorageSystem.unk_000c.tileTag = 14; + ePokemonStorageSystem.unk_000c.paletteTag = 0xdad0; + ePokemonStorageSystem.unk_000c.unk04 = 0; + ePokemonStorageSystem.unk_000c.unk06 = 0; + sub_80C5CD4(&ePokemonStorageSystem.unk_000c); + BlendPalettes(0xffffffff, 0, 0); + ePokemonStorageSystem.unk_0004++; + break; + case 2: + if (sub_80C5DCC()) + sub_8096BE0(sub_8096C84); + break; + } +} + +void sub_8096C68(void) +{ + if (!UpdatePaletteFade()) + sub_8096BE0(sub_8096C84); +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 1751ee99c..812c28137 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -17,6 +17,7 @@ #include "decompress.h" #include "random.h" #include "trig.h" +#include "pc_screen_effect.h" #include "ewram.h" static EWRAM_DATA u32 sUnknown_0203931C = 0; @@ -89,7 +90,6 @@ static bool8 sub_81438C4(void); // functions from different files void sub_81439D0(void); -void sub_80C5CD4(void*); // ? void sub_80C5E38(void*); // ? bool8 sub_80C5DCC(void); bool8 sub_80C5F98(void); @@ -811,7 +811,7 @@ void sub_81428CC(void) fameMons = eHallOfFameMons1; fameMons->mons[0] = sDummyFameMon; - sub_80C5CD4(fameMons); + sub_80C5CD4((struct PCScreenEffectStruct *)fameMons); gMain.state++; } break; -- cgit v1.2.3 From 17d5ba39acb897e07e6842cbff5b1172cc6f7951 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 7 Jan 2018 19:36:27 -0800 Subject: Match sub_806BC3C --- src/field/party_menu.c | 72 +++----------------------------------------------- 1 file changed, 3 insertions(+), 69 deletions(-) diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 7160da93b..790aede60 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -1178,8 +1178,6 @@ void sub_806BBEC(u8 a) } } -#ifdef NONMATCHING -// The original THUMB is preserving r8 for seemingly no reason. Unsure how to match. void sub_806BC3C(u8 monIndex, u8 b) { u16 *vramPtr = gUnknown_08376918[IsDoubleBattle()][monIndex]; @@ -1192,74 +1190,10 @@ void sub_806BC3C(u8 monIndex, u8 b) vramPtr[i] = gUnknown_08E9A300[offset] + 0x10C; vramPtr[i + 0x20] = gUnknown_08E9A300[offset + 0x20] + 0x10C; } + + // Some dead code was likely optimized out, but the compiler still think r8 was used. + asm("":::"r8"); } -#else -__attribute__((naked)) -void sub_806BC3C(u8 monIndex, u8 b) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - adds r4, r0, 0\n\ - adds r5, r1, 0\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - lsls r5, 24\n\ - lsrs r5, 24\n\ - ldr r6, _0806BCB0 @ =gUnknown_08376918\n\ - bl IsDoubleBattle\n\ - lsls r4, 2\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - lsls r1, r0, 1\n\ - adds r1, r0\n\ - lsls r1, 3\n\ - adds r4, r1\n\ - adds r4, r6\n\ - ldr r7, [r4]\n\ - movs r6, 0\n\ - adds r0, r5, 0\n\ - movs r1, 0x7\n\ - bl __udivsi3\n\ - lsls r0, 24\n\ - lsrs r4, r0, 19\n\ - ldr r5, _0806BCB4 @ =gUnknown_08E9A300\n\ - movs r0, 0x86\n\ - lsls r0, 1\n\ - adds r3, r0, 0\n\ -_0806BC7C:\n\ - adds r1, r6, r4\n\ - lsls r2, r6, 1\n\ - adds r2, r7\n\ - lsls r0, r1, 1\n\ - adds r0, r5\n\ - ldrh r0, [r0]\n\ - adds r0, r3, r0\n\ - strh r0, [r2]\n\ - adds r2, 0x40\n\ - adds r1, 0x20\n\ - lsls r1, 1\n\ - adds r1, r5\n\ - ldrh r1, [r1]\n\ - adds r0, r3, r1\n\ - strh r0, [r2]\n\ - adds r0, r6, 0x1\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - cmp r6, 0x6\n\ - bls _0806BC7C\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_0806BCB0: .4byte gUnknown_08376918\n\ -_0806BCB4: .4byte gUnknown_08E9A300\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void unref_sub_806BCB8(u8 a) { -- cgit v1.2.3 From 36841a8498134931be3d1c73927f6fec4482fb30 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 6 Jan 2018 13:56:53 -0800 Subject: Decompile more battle_2 functions --- asm/battle_2.s | 1999 ------------------------------------------------ include/pokemon.h | 2 +- src/battle/battle_2.c | 1645 ++++++++++++++++++++++++++++++++++++++- src/battle/battle_ai.c | 4 +- 4 files changed, 1647 insertions(+), 2003 deletions(-) diff --git a/asm/battle_2.s b/asm/battle_2.s index 5a751ba55..edd7fffde 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -5,2005 +5,6 @@ .text - thumb_func_start sub_8012324 -sub_8012324: @ 8012324 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - ldr r0, _08012340 @ =gBattleCommunication - movs r1, 0 - strb r1, [r0, 0x4] - ldr r0, _08012344 @ =gActiveBank - strb r1, [r0] - ldr r0, _08012348 @ =gNoOfAllBanks - bl _08012F74 - .align 2, 0 -_08012340: .4byte gBattleCommunication -_08012344: .4byte gActiveBank -_08012348: .4byte gNoOfAllBanks -_0801234C: - ldr r4, _08012374 @ =gActiveBank - ldrb r0, [r4] - bl GetBankIdentity - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _08012378 @ =gBattleCommunication - ldrb r0, [r4] - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x6 - bls _08012368 - bl _08012F66 -_08012368: - lsls r0, 2 - ldr r1, _0801237C @ =_08012380 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08012374: .4byte gActiveBank -_08012378: .4byte gBattleCommunication -_0801237C: .4byte _08012380 - .align 2, 0 -_08012380: - .4byte _0801239C - .4byte _080124C8 - .4byte _08012A28 - .4byte _08012DA8 - .4byte _08012E50 - .4byte _08012E94 - .4byte _08012F38 -_0801239C: - ldr r4, _08012434 @ =gSharedMem - ldr r0, _08012438 @ =gActiveBank - ldrb r0, [r0] - ldr r1, _0801243C @ =0x00016068 - adds r0, r1 - adds r0, r4 - movs r1, 0x6 - strb r1, [r0] - ldr r0, _08012440 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _080123F8 - movs r1, 0x2 - movs r0, 0x2 - ands r0, r5 - cmp r0, 0 - beq _080123F8 - eors r5, r1 - adds r0, r5, 0 - bl GetBankByPlayerAI - ldr r2, _08012444 @ =0x000160a6 - adds r1, r4, r2 - ldrb r1, [r1] - ldr r2, _08012448 @ =gBitTable - lsls r0, 24 - lsrs r0, 22 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _080123F8 - ldr r4, _0801244C @ =gBattleCommunication - adds r0, r5, 0 - bl GetBankByPlayerAI - lsls r0, 24 - lsrs r0, 24 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0x4 - beq _080123F8 - bl _08012F66 -_080123F8: - ldr r0, _08012434 @ =gSharedMem - ldr r3, _08012444 @ =0x000160a6 - adds r0, r3 - ldrb r3, [r0] - ldr r1, _08012448 @ =gBitTable - ldr r4, _08012438 @ =gActiveBank - ldrb r2, [r4] - lsls r0, r2, 2 - adds r0, r1 - ldr r0, [r0] - ands r3, r0 - cmp r3, 0 - beq _08012468 - ldr r0, _08012450 @ =gActionForBanks - adds r0, r2, r0 - movs r1, 0xD - strb r1, [r0] - ldr r0, _08012440 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _08012454 - ldr r0, _0801244C @ =gBattleCommunication - ldrb r1, [r4] - adds r1, r0 - movs r0, 0x4 - strb r0, [r1] - bl _08012F66 - .align 2, 0 -_08012434: .4byte gSharedMem -_08012438: .4byte gActiveBank -_0801243C: .4byte 0x00016068 -_08012440: .4byte gBattleTypeFlags -_08012444: .4byte 0x000160a6 -_08012448: .4byte gBitTable -_0801244C: .4byte gBattleCommunication -_08012450: .4byte gActionForBanks -_08012454: - ldr r0, _08012464 @ =gBattleCommunication - ldrb r1, [r4] - adds r1, r0 - movs r0, 0x3 - strb r0, [r1] - bl _08012F66 - .align 2, 0 -_08012464: .4byte gBattleCommunication -_08012468: - ldr r1, _0801249C @ =gBattleMons - movs r0, 0x58 - muls r0, r2 - adds r1, 0x50 - adds r0, r1 - ldr r1, [r0] - movs r0, 0x80 - lsls r0, 5 - ands r0, r1 - cmp r0, 0 - bne _08012488 - movs r0, 0x80 - lsls r0, 15 - ands r1, r0 - cmp r1, 0 - beq _080124A8 -_08012488: - ldr r0, _080124A0 @ =gActionForBanks - adds r0, r2, r0 - strb r3, [r0] - ldr r1, _080124A4 @ =gBattleCommunication - ldrb r0, [r4] - adds r0, r1 - movs r1, 0x3 - strb r1, [r0] - bl _08012F66 - .align 2, 0 -_0801249C: .4byte gBattleMons -_080124A0: .4byte gActionForBanks -_080124A4: .4byte gBattleCommunication -_080124A8: - ldr r0, _080124C0 @ =gActionForBanks - ldrb r1, [r0] - ldr r0, _080124C4 @ =gBattleBufferB - ldrb r2, [r0, 0x1] - ldrb r0, [r0, 0x2] - lsls r0, 8 - orrs r2, r0 - movs r0, 0 - bl Emitcmd18 - bl _08012E32 - .align 2, 0 -_080124C0: .4byte gActionForBanks -_080124C4: .4byte gBattleBufferB -_080124C8: - ldr r4, _08012520 @ =gBattleExecBuffer - ldr r1, _08012524 @ =gBitTable - ldr r3, _08012528 @ =gActiveBank - ldrb r5, [r3] - lsls r0, r5, 2 - adds r0, r1 - ldr r2, [r0] - lsls r0, r2, 4 - movs r1, 0xF0 - lsls r1, 24 - orrs r0, r1 - orrs r0, r2 - lsls r1, r2, 8 - orrs r0, r1 - lsls r2, 12 - orrs r0, r2 - ldr r1, [r4] - ands r1, r0 - mov r8, r3 - cmp r1, 0 - beq _080124F6 - bl _08012F66 -_080124F6: - ldr r2, _0801252C @ =gActionForBanks - adds r2, r5, r2 - ldr r1, _08012530 @ =gBattleBufferB - lsls r0, r5, 9 - adds r1, 0x1 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - ldrb r0, [r3] - lsls r0, 9 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0xC - bls _08012514 - b _08012968 -_08012514: - lsls r0, 2 - ldr r1, _08012534 @ =_08012538 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08012520: .4byte gBattleExecBuffer -_08012524: .4byte gBitTable -_08012528: .4byte gActiveBank -_0801252C: .4byte gActionForBanks -_08012530: .4byte gBattleBufferB -_08012534: .4byte _08012538 - .align 2, 0 -_08012538: - .4byte _0801256C - .4byte _080126B4 - .4byte _080126E0 - .4byte _08012968 - .4byte _08012968 - .4byte _080128B0 - .4byte _08012908 - .4byte _08012968 - .4byte _08012968 - .4byte _08012968 - .4byte _08012968 - .4byte _08012968 - .4byte _0801292C -_0801256C: - bl AreAllMovesUnusable - lsls r0, 24 - cmp r0, 0 - beq _080125D0 - ldr r0, _080125B4 @ =gBattleCommunication - ldr r2, _080125B8 @ =gActiveBank - ldrb r1, [r2] - adds r1, r0 - movs r4, 0 - movs r0, 0x5 - strb r0, [r1] - ldr r3, _080125BC @ =gSharedMem - ldrb r0, [r2] - ldr r1, _080125C0 @ =0x00016060 - adds r0, r1 - adds r0, r3 - strb r4, [r0] - ldrb r0, [r2] - ldr r4, _080125C4 @ =0x00016094 - adds r0, r4 - adds r0, r3 - movs r1, 0x3 - strb r1, [r0] - ldrb r1, [r2] - ldr r0, _080125C8 @ =0x00016010 - adds r2, r1, r0 - adds r2, r3 - ldr r0, _080125CC @ =gBattleBufferB - lsls r1, 9 - adds r0, 0x3 - adds r1, r0 - ldrb r0, [r1] - strb r0, [r2] - bl _08012F90 - .align 2, 0 -_080125B4: .4byte gBattleCommunication -_080125B8: .4byte gActiveBank -_080125BC: .4byte gSharedMem -_080125C0: .4byte 0x00016060 -_080125C4: .4byte 0x00016094 -_080125C8: .4byte 0x00016010 -_080125CC: .4byte gBattleBufferB -_080125D0: - ldr r1, _080125FC @ =gDisableStructs - ldr r5, _08012600 @ =gActiveBank - ldrb r4, [r5] - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - adds r0, r1 - ldrh r2, [r0, 0x6] - cmp r2, 0 - beq _0801260C - ldr r1, _08012604 @ =gChosenMovesByBanks - lsls r0, r4, 1 - adds r0, r1 - strh r2, [r0] - ldr r1, _08012608 @ =gBattleCommunication - ldrb r0, [r5] - adds r0, r1 - movs r1, 0x3 - strb r1, [r0] - bl _08012F90 - .align 2, 0 -_080125FC: .4byte gDisableStructs -_08012600: .4byte gActiveBank -_08012604: .4byte gChosenMovesByBanks -_08012608: .4byte gBattleCommunication -_0801260C: - add r2, sp, 0x4 - ldr r3, _080126AC @ =gBattleMons - movs r1, 0x58 - adds r0, r4, 0 - muls r0, r1 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r2, 0x10] - ldrb r0, [r5] - muls r0, r1 - adds r0, r3 - adds r0, 0x21 - ldrb r0, [r0] - strb r0, [r2, 0x12] - ldrb r0, [r5] - muls r0, r1 - adds r0, r3 - adds r0, 0x22 - ldrb r0, [r0] - strb r0, [r2, 0x13] - movs r4, 0 - mov r1, sp - adds r1, 0xC - str r1, [sp, 0x18] - add r2, sp, 0x10 - mov r10, r2 - mov r8, r3 - adds r7, r5, 0 - movs r6, 0x58 - movs r3, 0xC - add r3, r8 - mov r9, r3 - add r5, sp, 0x4 -_0801264E: - lsls r2, r4, 1 - ldrb r0, [r7] - muls r0, r6 - adds r0, r2, r0 - add r0, r9 - ldrh r0, [r0] - strh r0, [r5] - ldr r0, [sp, 0x18] - adds r3, r0, r4 - ldrb r0, [r7] - muls r0, r6 - adds r0, r4, r0 - mov r1, r8 - adds r1, 0x24 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r3] - ldrb r0, [r7] - adds r1, r0, 0 - muls r1, r6 - adds r2, r1 - add r2, r9 - ldrh r0, [r2] - add r1, r8 - adds r1, 0x3B - ldrb r1, [r1] - lsls r2, r4, 24 - lsrs r2, 24 - bl CalculatePPWithBonus - mov r2, r10 - adds r1, r2, r4 - strb r0, [r1] - adds r5, 0x2 - adds r4, 0x1 - cmp r4, 0x3 - ble _0801264E - ldr r0, _080126B0 @ =gBattleTypeFlags - ldrb r0, [r0] - movs r1, 0x1 - ands r1, r0 - movs r0, 0 - movs r2, 0 - add r3, sp, 0x4 - bl Emitcmd20 - b _0801289E - .align 2, 0 -_080126AC: .4byte gBattleMons -_080126B0: .4byte gBattleTypeFlags -_080126B4: - ldr r0, _080126D0 @ =gBattleTypeFlags - ldrh r1, [r0] - ldr r0, _080126D4 @ =0x00000902 - ands r0, r1 - cmp r0, 0 - bne _080126C2 - b _08012908 -_080126C2: - ldr r1, _080126D8 @ =gUnknown_02024C1C - mov r3, r8 - ldrb r0, [r3] - lsls r0, 2 - adds r0, r1 - ldr r1, _080126DC @ =BattleScript_ActionSelectionItemsCantBeUsed - b _080129CC - .align 2, 0 -_080126D0: .4byte gBattleTypeFlags -_080126D4: .4byte 0x00000902 -_080126D8: .4byte gUnknown_02024C1C -_080126DC: .4byte BattleScript_ActionSelectionItemsCantBeUsed -_080126E0: - ldr r3, _08012738 @ =gSharedMem - ldr r5, _0801273C @ =gActiveBank - ldrb r0, [r5] - ldr r4, _08012740 @ =0x00016064 - adds r1, r0, r4 - adds r1, r3 - ldr r2, _08012744 @ =gBattlePartyID - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - strb r0, [r1] - ldr r7, _08012748 @ =gBattleMons - ldrb r2, [r5] - movs r6, 0x58 - adds r0, r2, 0 - muls r0, r6 - adds r1, r7, 0 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - ldr r1, _0801274C @ =0x0400e000 - ands r0, r1 - cmp r0, 0 - bne _08012722 - ldr r0, _08012750 @ =gStatuses3 - lsls r1, r2, 2 - adds r1, r0 - ldr r1, [r1] - movs r0, 0x80 - lsls r0, 3 - ands r1, r0 - cmp r1, 0 - beq _08012758 -_08012722: - lsls r0, r2, 1 - adds r0, r2 - ldr r2, _08012754 @ =0x0001606c - adds r1, r3, r2 - adds r0, r1 - str r0, [sp] - movs r0, 0 - movs r1, 0x2 - movs r2, 0x6 - b _0801286C - .align 2, 0 -_08012738: .4byte gSharedMem -_0801273C: .4byte gActiveBank -_08012740: .4byte 0x00016064 -_08012744: .4byte gBattlePartyID -_08012748: .4byte gBattleMons -_0801274C: .4byte 0x0400e000 -_08012750: .4byte gStatuses3 -_08012754: .4byte 0x0001606c -_08012758: - str r1, [sp] - movs r0, 0xC - adds r1, r2, 0 - movs r2, 0x17 - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _080127E0 - ldrb r1, [r5] - str r4, [sp] - movs r0, 0xC - movs r2, 0x47 - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - beq _080127A8 - ldrb r0, [r5] - muls r0, r6 - adds r1, r0, r7 - adds r0, r1, 0 - adds r0, 0x21 - ldrb r0, [r0] - cmp r0, 0x2 - beq _080127A8 - adds r0, r1, 0 - adds r0, 0x22 - ldrb r0, [r0] - cmp r0, 0x2 - beq _080127A8 - adds r0, r1, 0 - adds r0, 0x20 - ldrb r0, [r0] - cmp r0, 0x1A - bne _080127E0 -_080127A8: - ldr r5, _08012808 @ =gActiveBank - ldrb r1, [r5] - movs r0, 0 - str r0, [sp] - movs r0, 0xF - movs r2, 0x2A - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - beq _08012818 - ldr r2, _0801280C @ =gBattleMons - ldrb r1, [r5] - movs r0, 0x58 - muls r0, r1 - adds r1, r0, r2 - adds r0, r1, 0 - adds r0, 0x21 - ldrb r0, [r0] - cmp r0, 0x8 - beq _080127E0 - adds r0, r1, 0 - adds r0, 0x22 - ldrb r0, [r0] - cmp r0, 0x8 - bne _08012818 -_080127E0: - subs r1, r4, 0x1 - lsls r1, 4 - movs r0, 0x4 - orrs r1, r0 - lsls r1, 24 - lsrs r1, 24 - ldr r0, _08012810 @ =gLastUsedAbility - ldrb r3, [r0] - ldr r0, _08012808 @ =gActiveBank - ldrb r2, [r0] - lsls r0, r2, 1 - adds r0, r2 - ldr r2, _08012814 @ =gSharedMem + 0x1606C - adds r0, r2 - str r0, [sp] - movs r0, 0 - movs r2, 0x6 - bl EmitChoosePokemon - b _0801289E - .align 2, 0 -_08012808: .4byte gActiveBank -_0801280C: .4byte gBattleMons -_08012810: .4byte gLastUsedAbility -_08012814: .4byte gSharedMem + 0x1606C -_08012818: - ldr r0, _08012830 @ =gActiveBank - ldrb r1, [r0] - mov r8, r0 - cmp r1, 0x2 - bne _08012840 - ldr r0, _08012834 @ =gActionForBanks - ldrb r0, [r0] - cmp r0, 0x2 - bne _08012840 - ldr r3, _08012838 @ =gSharedMem - ldr r4, _0801283C @ =0x00016068 - b _08012854 - .align 2, 0 -_08012830: .4byte gActiveBank -_08012834: .4byte gActionForBanks -_08012838: .4byte gSharedMem -_0801283C: .4byte 0x00016068 -_08012840: - mov r2, r8 - ldrb r0, [r2] - cmp r0, 0x3 - bne _08012884 - ldr r0, _08012874 @ =gActionForBanks - ldrb r0, [r0, 0x1] - cmp r0, 0x2 - bne _08012884 - ldr r3, _08012878 @ =gSharedMem - ldr r4, _0801287C @ =0x00016069 -_08012854: - adds r0, r3, r4 - ldrb r2, [r0] - mov r0, r8 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - ldr r1, _08012880 @ =0x0001606c - adds r3, r1 - adds r0, r3 - str r0, [sp] - movs r0, 0 - movs r1, 0 -_0801286C: - movs r3, 0 - bl EmitChoosePokemon - b _0801289E - .align 2, 0 -_08012874: .4byte gActionForBanks -_08012878: .4byte gSharedMem -_0801287C: .4byte 0x00016069 -_08012880: .4byte 0x0001606c -_08012884: - ldr r0, _080128A8 @ =gActiveBank - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - ldr r1, _080128AC @ =gSharedMem + 0x1606C - adds r0, r1 - str r0, [sp] - movs r0, 0 - movs r1, 0 - movs r2, 0x6 - movs r3, 0 - bl EmitChoosePokemon -_0801289E: - ldr r0, _080128A8 @ =gActiveBank - ldrb r0, [r0] - bl MarkBufferBankForExecution - b _08012968 - .align 2, 0 -_080128A8: .4byte gActiveBank -_080128AC: .4byte gSharedMem + 0x1606C -_080128B0: - bl PlayerPartyAndPokemonStorageFull - lsls r0, 24 - cmp r0, 0 - beq _08012968 - ldr r1, _080128EC @ =gUnknown_02024C1C - ldr r2, _080128F0 @ =gActiveBank - ldrb r0, [r2] - lsls r0, 2 - adds r0, r1 - ldr r1, _080128F4 @ =BattleScript_PrintFullBox - str r1, [r0] - ldr r0, _080128F8 @ =gBattleCommunication - ldrb r1, [r2] - adds r1, r0 - movs r3, 0 - movs r0, 0x5 - strb r0, [r1] - ldr r1, _080128FC @ =gSharedMem - ldrb r0, [r2] - ldr r4, _08012900 @ =0x00016060 - adds r0, r4 - adds r0, r1 - strb r3, [r0] - ldrb r0, [r2] - ldr r2, _08012904 @ =0x00016094 - adds r0, r2 - adds r0, r1 - strb r3, [r0] - b _08012F90 - .align 2, 0 -_080128EC: .4byte gUnknown_02024C1C -_080128F0: .4byte gActiveBank -_080128F4: .4byte BattleScript_PrintFullBox -_080128F8: .4byte gBattleCommunication -_080128FC: .4byte gSharedMem -_08012900: .4byte 0x00016060 -_08012904: .4byte 0x00016094 -_08012908: - ldr r4, _08012924 @ =gActiveBank - ldrb r0, [r4] - lsls r1, r0, 1 - adds r1, r0 - ldr r0, _08012928 @ =gSharedMem + 0x1606C - adds r1, r0 - movs r0, 0 - bl EmitOpenBag - ldrb r0, [r4] - bl MarkBufferBankForExecution - b _08012968 - .align 2, 0 -_08012924: .4byte gActiveBank -_08012928: .4byte gSharedMem + 0x1606C -_0801292C: - ldr r4, _08012964 @ =gBattleCommunication - mov r3, r8 - ldrb r1, [r3] - adds r1, r4 - movs r5, 0 - movs r0, 0x6 - strb r0, [r1] - ldrb r0, [r3] - bl GetBankIdentity - movs r1, 0x2 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByPlayerAI - lsls r0, 24 - lsrs r0, 24 - adds r0, r4 - strb r5, [r0] - movs r0, 0 - bl Emitcmd50 - mov r4, r8 - ldrb r0, [r4] - bl MarkBufferBankForExecution - b _08012F90 - .align 2, 0 -_08012964: .4byte gBattleCommunication -_08012968: - ldr r0, _08012994 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0xA - ands r0, r1 - cmp r0, 0x8 - bne _080129A8 - ldr r0, _08012998 @ =gBattleBufferB - ldr r4, _0801299C @ =gActiveBank - ldrb r1, [r4] - lsls r1, 9 - adds r0, 0x1 - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0x3 - bne _080129A8 - ldr r0, _080129A0 @ =BattleScript_PrintCantRunFromTrainer - bl b_call_bc_move_exec - ldr r1, _080129A4 @ =gBattleCommunication - ldrb r0, [r4] - adds r0, r1 - b _08012BFE - .align 2, 0 -_08012994: .4byte gBattleTypeFlags -_08012998: .4byte gBattleBufferB -_0801299C: .4byte gActiveBank -_080129A0: .4byte BattleScript_PrintCantRunFromTrainer -_080129A4: .4byte gBattleCommunication -_080129A8: - bl CanRunFromBattle - lsls r0, 24 - cmp r0, 0 - beq _08012A14 - ldr r0, _080129F4 @ =gBattleBufferB - ldr r3, _080129F8 @ =gActiveBank - ldrb r2, [r3] - lsls r1, r2, 9 - adds r0, 0x1 - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0x3 - bne _08012A14 - ldr r1, _080129FC @ =gUnknown_02024C1C - lsls r0, r2, 2 - adds r0, r1 - ldr r1, _08012A00 @ =BattleScript_PrintCantEscapeFromBattle -_080129CC: - str r1, [r0] - ldr r0, _08012A04 @ =gBattleCommunication - ldrb r1, [r3] - adds r1, r0 - movs r2, 0 - movs r0, 0x5 - strb r0, [r1] - ldr r1, _08012A08 @ =gSharedMem - ldrb r0, [r3] - ldr r4, _08012A0C @ =0x00016060 - adds r0, r4 - adds r0, r1 - strb r2, [r0] - ldrb r0, [r3] - ldr r3, _08012A10 @ =0x00016094 - adds r0, r3 - adds r0, r1 - strb r2, [r0] - b _08012F90 - .align 2, 0 -_080129F4: .4byte gBattleBufferB -_080129F8: .4byte gActiveBank -_080129FC: .4byte gUnknown_02024C1C -_08012A00: .4byte BattleScript_PrintCantEscapeFromBattle -_08012A04: .4byte gBattleCommunication -_08012A08: .4byte gSharedMem -_08012A0C: .4byte 0x00016060 -_08012A10: .4byte 0x00016094 -_08012A14: - ldr r2, _08012A20 @ =gBattleCommunication - ldr r0, _08012A24 @ =gActiveBank - ldrb r1, [r0] - adds r1, r2 - b _08012E3E - .align 2, 0 -_08012A20: .4byte gBattleCommunication -_08012A24: .4byte gActiveBank -_08012A28: - ldr r4, _08012A6C @ =gBattleExecBuffer - ldr r1, _08012A70 @ =gBitTable - ldr r3, _08012A74 @ =gActiveBank - ldrb r5, [r3] - lsls r0, r5, 2 - adds r0, r1 - ldr r2, [r0] - lsls r0, r2, 4 - movs r1, 0xF0 - lsls r1, 24 - orrs r0, r1 - orrs r0, r2 - lsls r1, r2, 8 - orrs r0, r1 - lsls r2, 12 - orrs r0, r2 - ldr r1, [r4] - ands r1, r0 - mov r8, r3 - cmp r1, 0 - beq _08012A54 - b _08012F66 -_08012A54: - ldr r1, _08012A78 @ =gActionForBanks - adds r0, r5, r1 - ldrb r0, [r0] - adds r3, r1, 0 - cmp r0, 0x9 - bls _08012A62 - b _08012F66 -_08012A62: - lsls r0, 2 - ldr r1, _08012A7C @ =_08012A80 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08012A6C: .4byte gBattleExecBuffer -_08012A70: .4byte gBitTable -_08012A74: .4byte gActiveBank -_08012A78: .4byte gActionForBanks -_08012A7C: .4byte _08012A80 - .align 2, 0 -_08012A80: - .4byte _08012AA8 - .4byte _08012BB0 - .4byte _08012BE8 - .4byte _08012CE0 - .4byte _08012D04 - .4byte _08012D18 - .4byte _08012D2C - .4byte _08012D5C - .4byte _08012D70 - .4byte _08012D94 -_08012AA8: - ldr r0, _08012AC8 @ =gBattleBufferB - mov r1, r8 - ldrb r4, [r1] - lsls r1, r4, 9 - adds r2, r0, 0x1 - adds r1, r2 - ldrb r1, [r1] - adds r6, r0, 0 - cmp r1, 0x9 - bgt _08012ACC - cmp r1, 0x3 - blt _08012ACC - adds r0, r4, r3 - strb r1, [r0] - b _08012F90 - .align 2, 0 -_08012AC8: .4byte gBattleBufferB -_08012ACC: - adds r3, r6, 0 - mov r5, r8 - ldrb r4, [r5] - lsls r1, r4, 9 - adds r7, r3, 0x2 - adds r0, r1, r7 - ldrb r2, [r0] - adds r3, 0x3 - mov r9, r3 - add r1, r9 - ldrb r0, [r1] - lsls r0, 8 - orrs r2, r0 - ldr r0, _08012AF4 @ =0x0000ffff - cmp r2, r0 - bne _08012AFC - ldr r0, _08012AF8 @ =gBattleCommunication - adds r0, r4, r0 - b _08012BFE - .align 2, 0 -_08012AF4: .4byte 0x0000ffff -_08012AF8: .4byte gBattleCommunication -_08012AFC: - bl sub_8015894 - lsls r0, 24 - cmp r0, 0 - beq _08012B48 - ldr r0, _08012B38 @ =gBattleCommunication - ldrb r1, [r5] - adds r1, r0 - movs r2, 0 - movs r0, 0x5 - strb r0, [r1] - ldr r3, _08012B3C @ =gSharedMem - ldrb r0, [r5] - ldr r4, _08012B40 @ =0x00016060 - adds r0, r4 - adds r0, r3 - strb r2, [r0] - ldrb r0, [r5] - lsls r0, 9 - adds r1, r6, 0x1 - adds r0, r1 - strb r2, [r0] - ldrb r0, [r5] - ldr r1, _08012B44 @ =0x00016094 - adds r0, r1 - adds r0, r3 - movs r1, 0x1 - strb r1, [r0] - b _08012F90 - .align 2, 0 -_08012B38: .4byte gBattleCommunication -_08012B3C: .4byte gSharedMem -_08012B40: .4byte 0x00016060 -_08012B44: .4byte 0x00016094 -_08012B48: - ldr r6, _08012B98 @ =gSharedMem - mov r2, r8 - ldrb r0, [r2] - ldr r2, _08012B9C @ =0x0001608c - adds r1, r0, r2 - adds r1, r6 - lsls r0, 9 - adds r0, r7 - ldrb r0, [r0] - strb r0, [r1] - ldr r0, _08012BA0 @ =gChosenMovesByBanks - mov r4, r8 - ldrb r3, [r4] - lsls r5, r3, 1 - adds r5, r0 - ldr r4, _08012BA4 @ =gBattleMons - adds r2, r3, r2 - adds r2, r6 - ldrb r0, [r2] - lsls r0, 1 - movs r1, 0x58 - muls r1, r3 - adds r0, r1 - adds r4, 0xC - adds r0, r4 - ldrh r0, [r0] - strh r0, [r5] - mov r1, r8 - ldrb r0, [r1] - ldr r2, _08012BA8 @ =0x00016010 - adds r1, r0, r2 - adds r1, r6 - lsls r0, 9 - add r0, r9 - ldrb r0, [r0] - strb r0, [r1] - ldr r0, _08012BAC @ =gBattleCommunication - mov r3, r8 - ldrb r1, [r3] - b _08012E3C - .align 2, 0 -_08012B98: .4byte gSharedMem -_08012B9C: .4byte 0x0001608c -_08012BA0: .4byte gChosenMovesByBanks -_08012BA4: .4byte gBattleMons -_08012BA8: .4byte 0x00016010 -_08012BAC: .4byte gBattleCommunication -_08012BB0: - ldr r2, _08012BD8 @ =gBattleBufferB - ldr r5, _08012BDC @ =gActiveBank - ldrb r4, [r5] - lsls r1, r4, 9 - adds r0, r2, 0x1 - adds r0, r1, r0 - ldrb r3, [r0] - adds r2, 0x2 - adds r1, r2 - ldrb r0, [r1] - lsls r0, 8 - orrs r3, r0 - cmp r3, 0 - bne _08012BCE - b _08012F60 -_08012BCE: - ldr r0, _08012BE0 @ =gLastUsedItem - strh r3, [r0] - ldr r0, _08012BE4 @ =gBattleCommunication - ldrb r1, [r5] - b _08012E3C - .align 2, 0 -_08012BD8: .4byte gBattleBufferB -_08012BDC: .4byte gActiveBank -_08012BE0: .4byte gLastUsedItem -_08012BE4: .4byte gBattleCommunication -_08012BE8: - ldr r4, _08012C04 @ =gBattleBufferB - ldr r7, _08012C08 @ =gActiveBank - ldrb r2, [r7] - lsls r0, r2, 9 - adds r1, r4, 0x1 - adds r0, r1 - ldrb r1, [r0] - cmp r1, 0x6 - bne _08012C10 - ldr r0, _08012C0C @ =gBattleCommunication - adds r0, r2, r0 -_08012BFE: - movs r1, 0 - strb r1, [r0] - b _08012F66 - .align 2, 0 -_08012C04: .4byte gBattleBufferB -_08012C08: .4byte gActiveBank -_08012C0C: .4byte gBattleCommunication -_08012C10: - ldr r0, _08012CC4 @ =gSharedMem - mov r12, r0 - ldr r3, _08012CC8 @ =0x00016068 - adds r0, r2, r3 - add r0, r12 - strb r1, [r0] - ldr r0, _08012CCC @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08012CBE - ldrb r0, [r7] - lsls r1, r0, 1 - adds r1, r0 - ldr r5, _08012CD0 @ =0x0001606c - adds r1, r5 - add r1, r12 - ldrb r2, [r1] - movs r0, 0xF - ands r0, r2 - strb r0, [r1] - ldrb r0, [r7] - lsls r2, r0, 1 - adds r2, r0 - adds r2, r5 - add r2, r12 - lsls r0, 9 - adds r6, r4, 0x2 - adds r0, r6 - ldrb r1, [r0] - movs r3, 0xF0 - adds r0, r3, 0 - ands r0, r1 - ldrb r1, [r2] - orrs r0, r1 - strb r0, [r2] - ldrb r0, [r7] - lsls r1, r0, 1 - adds r1, r0 - ldr r2, _08012CD4 @ =0x0001606d - adds r1, r2 - add r1, r12 - lsls r0, 9 - adds r4, 0x3 - mov r8, r4 - add r0, r8 - ldrb r0, [r0] - strb r0, [r1] - ldrb r0, [r7] - movs r4, 0x2 - eors r0, r4 - lsls r1, r0, 1 - adds r1, r0 - adds r1, r5 - add r1, r12 - ldrb r2, [r1] - adds r0, r3, 0 - ands r0, r2 - strb r0, [r1] - ldrb r0, [r7] - eors r0, r4 - lsls r1, r0, 1 - adds r1, r0 - adds r1, r5 - add r1, r12 - ldrb r0, [r7] - lsls r0, 9 - adds r0, r6 - ldrb r0, [r0] - ands r3, r0 - lsrs r3, 4 - ldrb r0, [r1] - orrs r3, r0 - strb r3, [r1] - ldrb r0, [r7] - eors r4, r0 - lsls r1, r4, 1 - adds r1, r4 - ldr r3, _08012CD8 @ =0x0001606e - adds r1, r3 - add r1, r12 - ldrb r0, [r7] - lsls r0, 9 - add r0, r8 - ldrb r0, [r0] - strb r0, [r1] -_08012CBE: - ldr r0, _08012CDC @ =gBattleCommunication - ldrb r1, [r7] - b _08012E3C - .align 2, 0 -_08012CC4: .4byte gSharedMem -_08012CC8: .4byte 0x00016068 -_08012CCC: .4byte gBattleTypeFlags -_08012CD0: .4byte 0x0001606c -_08012CD4: .4byte 0x0001606d -_08012CD8: .4byte 0x0001606e -_08012CDC: .4byte gBattleCommunication -_08012CE0: - ldr r2, _08012CF8 @ =gHitMarker - ldr r0, [r2] - movs r1, 0x80 - lsls r1, 8 - orrs r0, r1 - str r0, [r2] - ldr r2, _08012CFC @ =gBattleCommunication - ldr r0, _08012D00 @ =gActiveBank - ldrb r1, [r0] - adds r1, r2 - b _08012E3E - .align 2, 0 -_08012CF8: .4byte gHitMarker -_08012CFC: .4byte gBattleCommunication -_08012D00: .4byte gActiveBank -_08012D04: - ldr r2, _08012D10 @ =gBattleCommunication - ldr r0, _08012D14 @ =gActiveBank - ldrb r1, [r0] - adds r1, r2 - b _08012E3E - .align 2, 0 -_08012D10: .4byte gBattleCommunication -_08012D14: .4byte gActiveBank -_08012D18: - ldr r2, _08012D24 @ =gBattleCommunication - ldr r0, _08012D28 @ =gActiveBank - ldrb r1, [r0] - adds r1, r2 - b _08012E3E - .align 2, 0 -_08012D24: .4byte gBattleCommunication -_08012D28: .4byte gActiveBank -_08012D2C: - ldr r2, _08012D50 @ =gBattleBufferB - ldr r0, _08012D54 @ =gActiveBank - ldrb r4, [r0] - lsls r1, r4, 9 - adds r0, r2, 0x1 - adds r0, r1, r0 - ldrb r3, [r0] - adds r2, 0x2 - adds r1, r2 - ldrb r0, [r1] - lsls r0, 8 - orrs r3, r0 - cmp r3, 0 - bne _08012D4A - b _08012F60 -_08012D4A: - ldr r1, _08012D58 @ =gBattleCommunication - adds r1, r4, r1 - b _08012E3E - .align 2, 0 -_08012D50: .4byte gBattleBufferB -_08012D54: .4byte gActiveBank -_08012D58: .4byte gBattleCommunication -_08012D5C: - ldr r2, _08012D68 @ =gBattleCommunication - ldr r0, _08012D6C @ =gActiveBank - ldrb r1, [r0] - adds r1, r2 - b _08012E3E - .align 2, 0 -_08012D68: .4byte gBattleCommunication -_08012D6C: .4byte gActiveBank -_08012D70: - ldr r2, _08012D88 @ =gHitMarker - ldr r0, [r2] - movs r1, 0x80 - lsls r1, 8 - orrs r0, r1 - str r0, [r2] - ldr r2, _08012D8C @ =gBattleCommunication - ldr r0, _08012D90 @ =gActiveBank - ldrb r1, [r0] - adds r1, r2 - b _08012E3E - .align 2, 0 -_08012D88: .4byte gHitMarker -_08012D8C: .4byte gBattleCommunication -_08012D90: .4byte gActiveBank -_08012D94: - ldr r2, _08012DA0 @ =gBattleCommunication - ldr r0, _08012DA4 @ =gActiveBank - ldrb r1, [r0] - adds r1, r2 - b _08012E3E - .align 2, 0 -_08012DA0: .4byte gBattleCommunication -_08012DA4: .4byte gActiveBank -_08012DA8: - ldr r3, _08012E10 @ =gBattleExecBuffer - ldr r4, _08012E14 @ =gBitTable - ldr r0, _08012E18 @ =gActiveBank - ldrb r0, [r0] - lsls r0, 2 - adds r0, r4 - ldr r2, [r0] - lsls r1, r2, 4 - movs r0, 0xF0 - lsls r0, 24 - orrs r1, r0 - orrs r1, r2 - lsls r0, r2, 8 - orrs r1, r0 - lsls r2, 12 - orrs r1, r2 - ldr r0, [r3] - ands r0, r1 - cmp r0, 0 - beq _08012DD2 - b _08012F66 -_08012DD2: - ldr r0, _08012E1C @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x41 - ands r0, r1 - cmp r0, 0x1 - bne _08012E06 - movs r1, 0x2 - movs r0, 0x2 - ands r0, r5 - cmp r0, 0 - bne _08012E06 - adds r0, r5, 0 - eors r0, r1 - bl GetBankByPlayerAI - ldr r1, _08012E20 @ =gSharedMem - ldr r2, _08012E24 @ =0x000160a6 - adds r1, r2 - ldrb r1, [r1] - lsls r0, 24 - lsrs r0, 22 - adds r0, r4 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _08012E28 -_08012E06: - movs r0, 0 - movs r1, 0 - bl EmitLinkStandbyMsg - b _08012E30 - .align 2, 0 -_08012E10: .4byte gBattleExecBuffer -_08012E14: .4byte gBitTable -_08012E18: .4byte gActiveBank -_08012E1C: .4byte gBattleTypeFlags -_08012E20: .4byte gSharedMem -_08012E24: .4byte 0x000160a6 -_08012E28: - movs r0, 0 - movs r1, 0x1 - bl EmitLinkStandbyMsg -_08012E30: - ldr r4, _08012E48 @ =gActiveBank -_08012E32: - ldrb r0, [r4] - bl MarkBufferBankForExecution - ldr r0, _08012E4C @ =gBattleCommunication - ldrb r1, [r4] -_08012E3C: - adds r1, r0 -_08012E3E: - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _08012F66 - .align 2, 0 -_08012E48: .4byte gActiveBank -_08012E4C: .4byte gBattleCommunication -_08012E50: - ldr r3, _08012E84 @ =gBattleExecBuffer - ldr r1, _08012E88 @ =gBitTable - ldr r0, _08012E8C @ =gActiveBank - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r2, [r0] - lsls r1, r2, 4 - movs r0, 0xF0 - lsls r0, 24 - orrs r1, r0 - orrs r1, r2 - lsls r0, r2, 8 - orrs r1, r0 - lsls r2, 12 - orrs r1, r2 - ldr r0, [r3] - ands r0, r1 - cmp r0, 0 - bne _08012F66 - ldr r1, _08012E90 @ =gBattleCommunication - ldrb r0, [r1, 0x4] - adds r0, 0x1 - strb r0, [r1, 0x4] - b _08012F66 - .align 2, 0 -_08012E84: .4byte gBattleExecBuffer -_08012E88: .4byte gBitTable -_08012E8C: .4byte gActiveBank -_08012E90: .4byte gBattleCommunication -_08012E94: - ldr r2, _08012EB8 @ =gSharedMem - ldr r5, _08012EBC @ =gActiveBank - ldrb r1, [r5] - ldr r3, _08012EC0 @ =0x00016060 - adds r0, r1, r3 - adds r0, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _08012ECC - ldr r0, _08012EC4 @ =gBattleCommunication - adds r0, r1, r0 - ldr r4, _08012EC8 @ =0x00016094 - adds r1, r4 - adds r1, r2 - ldrb r1, [r1] - strb r1, [r0] - b _08012F66 - .align 2, 0 -_08012EB8: .4byte gSharedMem -_08012EBC: .4byte gActiveBank -_08012EC0: .4byte 0x00016060 -_08012EC4: .4byte gBattleCommunication -_08012EC8: .4byte 0x00016094 -_08012ECC: - ldr r0, _08012F20 @ =gBankAttacker - strb r1, [r0] - ldr r7, _08012F24 @ =gBattlescriptCurrInstr - ldr r6, _08012F28 @ =gUnknown_02024C1C - ldrb r0, [r5] - lsls r0, 2 - adds r0, r6 - ldr r4, [r0] - str r4, [r7] - ldr r3, _08012F2C @ =gBattleExecBuffer - ldr r1, _08012F30 @ =gBitTable - ldrb r0, [r5] - lsls r0, 2 - adds r0, r1 - ldr r2, [r0] - lsls r1, r2, 4 - movs r0, 0xF0 - lsls r0, 24 - orrs r1, r0 - orrs r1, r2 - lsls r0, r2, 8 - orrs r1, r0 - lsls r2, 12 - orrs r1, r2 - ldr r0, [r3] - ands r0, r1 - cmp r0, 0 - bne _08012F12 - ldr r0, _08012F34 @ =gBattleScriptingCommandsTable - ldrb r1, [r4] - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] - bl _call_via_r0 -_08012F12: - ldrb r0, [r5] - lsls r0, 2 - adds r0, r6 - ldr r1, [r7] - str r1, [r0] - b _08012F66 - .align 2, 0 -_08012F20: .4byte gBankAttacker -_08012F24: .4byte gBattlescriptCurrInstr -_08012F28: .4byte gUnknown_02024C1C -_08012F2C: .4byte gBattleExecBuffer -_08012F30: .4byte gBitTable -_08012F34: .4byte gBattleScriptingCommandsTable -_08012F38: - ldr r3, _08012FA0 @ =gBattleExecBuffer - ldr r1, _08012FA4 @ =gBitTable - ldr r0, _08012FA8 @ =gActiveBank - ldrb r4, [r0] - lsls r0, r4, 2 - adds r0, r1 - ldr r2, [r0] - lsls r0, r2, 4 - movs r1, 0xF0 - lsls r1, 24 - orrs r0, r1 - orrs r0, r2 - lsls r1, r2, 8 - orrs r0, r1 - lsls r2, 12 - orrs r0, r2 - ldr r3, [r3] - ands r3, r0 - cmp r3, 0 - bne _08012F66 -_08012F60: - ldr r0, _08012FAC @ =gBattleCommunication - adds r0, r4, r0 - strb r3, [r0] -_08012F66: - ldr r0, _08012FA8 @ =gActiveBank - ldrb r1, [r0] - adds r1, 0x1 - strb r1, [r0] - ldr r0, _08012FB0 @ =gNoOfAllBanks - lsls r1, 24 - lsrs r1, 24 -_08012F74: - adds r2, r0, 0 - ldrb r0, [r2] - cmp r1, r0 - bcs _08012F80 - bl _0801234C -_08012F80: - ldr r0, _08012FAC @ =gBattleCommunication - ldrb r0, [r0, 0x4] - ldrb r2, [r2] - cmp r0, r2 - bne _08012F90 - ldr r1, _08012FB4 @ =gBattleMainFunc - ldr r0, _08012FB8 @ =sub_80133C8 - str r0, [r1] -_08012F90: - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08012FA0: .4byte gBattleExecBuffer -_08012FA4: .4byte gBitTable -_08012FA8: .4byte gActiveBank -_08012FAC: .4byte gBattleCommunication -_08012FB0: .4byte gNoOfAllBanks -_08012FB4: .4byte gBattleMainFunc -_08012FB8: .4byte sub_80133C8 - thumb_func_end sub_8012324 - - thumb_func_start sub_8012FBC -sub_8012FBC: @ 8012FBC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - ldr r2, _08012FE8 @ =gUnknown_02024A76 - adds r4, r0, r2 - ldrb r5, [r4] - adds r2, r1, r2 - ldrb r3, [r2] - strb r3, [r4] - strb r5, [r2] - ldr r2, _08012FEC @ =gTurnOrder - adds r0, r2 - ldrb r5, [r0] - adds r1, r2 - ldrb r2, [r1] - strb r2, [r0] - strb r5, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08012FE8: .4byte gUnknown_02024A76 -_08012FEC: .4byte gTurnOrder - thumb_func_end sub_8012FBC - - thumb_func_start GetWhoStrikesFirst -GetWhoStrikesFirst: @ 8012FF0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r2, 24 - lsrs r2, 24 - str r2, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - str r0, [sp] - movs r0, 0x13 - movs r1, 0 - movs r2, 0xD - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - cmp r0, 0 - bne _080130B8 - ldr r1, [sp, 0x8] - str r1, [sp] - movs r0, 0x13 - movs r1, 0 - movs r2, 0x4D - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - cmp r0, 0 - bne _080130B8 - ldr r1, _08013070 @ =gBattleMons - movs r0, 0x58 - mov r2, r9 - muls r2, r0 - adds r0, r2, 0 - adds r0, r1 - adds r0, 0x20 - ldrb r3, [r0] - cmp r3, 0x21 - bne _0801305C - ldr r0, _08013074 @ =gBattleWeather - ldrh r1, [r0] - movs r0, 0x7 - ands r0, r1 - cmp r0, 0 - bne _0801306C -_0801305C: - cmp r3, 0x22 - bne _08013078 - ldr r0, _08013074 @ =gBattleWeather - ldrh r1, [r0] - movs r0, 0x60 - ands r0, r1 - cmp r0, 0 - beq _08013078 -_0801306C: - movs r3, 0x2 - b _0801307A - .align 2, 0 -_08013070: .4byte gBattleMons -_08013074: .4byte gBattleWeather -_08013078: - movs r3, 0x1 -_0801307A: - movs r0, 0x58 - mov r1, r10 - muls r1, r0 - adds r0, r1, 0 - ldr r2, _080130B0 @ =gBattleMons - adds r0, r2 - adds r0, 0x20 - ldrb r2, [r0] - cmp r2, 0x21 - bne _0801309A - ldr r0, _080130B4 @ =gBattleWeather - ldrh r1, [r0] - movs r0, 0x7 - ands r0, r1 - cmp r0, 0 - bne _080130AA -_0801309A: - cmp r2, 0x22 - bne _080130BA - ldr r0, _080130B4 @ =gBattleWeather - ldrh r1, [r0] - movs r0, 0x60 - ands r0, r1 - cmp r0, 0 - beq _080130BA -_080130AA: - movs r7, 0x2 - b _080130BC - .align 2, 0 -_080130B0: .4byte gBattleMons -_080130B4: .4byte gBattleWeather -_080130B8: - movs r3, 0x1 -_080130BA: - movs r7, 0x1 -_080130BC: - ldr r1, _08013100 @ =gBattleMons - movs r0, 0x58 - mov r2, r9 - muls r2, r0 - adds r0, r2, 0 - adds r4, r0, r1 - ldrh r0, [r4, 0x6] - muls r3, r0 - ldr r2, _08013104 @ =gStatStageRatios - movs r1, 0x1B - ldrsb r1, [r4, r1] - lsls r1, 1 - adds r0, r1, r2 - ldrb r0, [r0] - muls r0, r3 - adds r2, 0x1 - adds r1, r2 - ldrb r1, [r1] - bl __divsi3 - mov r8, r0 - ldrh r0, [r4, 0x2E] - cmp r0, 0xAF - bne _0801310C - ldr r1, _08013108 @ =gEnigmaBerries - mov r3, r9 - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r0, r1 - ldrb r6, [r0, 0x7] - ldrb r5, [r0, 0x1A] - b _08013120 - .align 2, 0 -_08013100: .4byte gBattleMons -_08013104: .4byte gStatStageRatios -_08013108: .4byte gEnigmaBerries -_0801310C: - ldrh r0, [r4, 0x2E] - bl ItemId_GetHoldEffect - lsls r0, 24 - lsrs r6, r0, 24 - ldrh r0, [r4, 0x2E] - bl ItemId_GetHoldEffectParam - lsls r0, 24 - lsrs r5, r0, 24 -_08013120: - ldr r0, _080131DC @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08013154 - ldr r0, _080131E0 @ =0x00000809 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08013154 - mov r0, r9 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _08013154 - movs r0, 0x6E - mov r1, r8 - muls r1, r0 - adds r0, r1, 0 - movs r1, 0x64 - bl __udivsi3 - mov r8, r0 -_08013154: - cmp r6, 0x18 - bne _0801315E - mov r2, r8 - lsrs r2, 1 - mov r8, r2 -_0801315E: - ldr r1, _080131E4 @ =gBattleMons - movs r0, 0x58 - mov r3, r9 - muls r3, r0 - adds r0, r3, 0 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - movs r1, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0801317C - mov r0, r8 - lsrs r0, 2 - mov r8, r0 -_0801317C: - cmp r6, 0x1A - bne _08013198 - ldr r0, _080131E8 @ =gRandomTurnNumber - ldrh r4, [r0] - lsls r0, r5, 16 - subs r0, r5 - movs r1, 0x64 - bl __divsi3 - cmp r4, r0 - bge _08013198 - movs r1, 0x1 - negs r1, r1 - mov r8, r1 -_08013198: - ldr r1, _080131E4 @ =gBattleMons - movs r0, 0x58 - mov r2, r10 - muls r2, r0 - adds r0, r2, 0 - adds r4, r0, r1 - ldrh r0, [r4, 0x6] - adds r3, r0, 0 - muls r3, r7 - ldr r2, _080131EC @ =gStatStageRatios - movs r1, 0x1B - ldrsb r1, [r4, r1] - lsls r1, 1 - adds r0, r1, r2 - ldrb r0, [r0] - muls r0, r3 - adds r2, 0x1 - adds r1, r2 - ldrb r1, [r1] - bl __divsi3 - adds r7, r0, 0 - ldrh r0, [r4, 0x2E] - cmp r0, 0xAF - bne _080131F4 - ldr r1, _080131F0 @ =gEnigmaBerries - mov r3, r10 - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r0, r1 - ldrb r6, [r0, 0x7] - ldrb r5, [r0, 0x1A] - b _08013208 - .align 2, 0 -_080131DC: .4byte gBattleTypeFlags -_080131E0: .4byte 0x00000809 -_080131E4: .4byte gBattleMons -_080131E8: .4byte gRandomTurnNumber -_080131EC: .4byte gStatStageRatios -_080131F0: .4byte gEnigmaBerries -_080131F4: - ldrh r0, [r4, 0x2E] - bl ItemId_GetHoldEffect - lsls r0, 24 - lsrs r6, r0, 24 - ldrh r0, [r4, 0x2E] - bl ItemId_GetHoldEffectParam - lsls r0, 24 - lsrs r5, r0, 24 -_08013208: - ldr r0, _08013280 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _08013238 - ldr r0, _08013284 @ =0x00000809 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08013238 - mov r0, r10 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _08013238 - movs r0, 0x6E - muls r0, r7 - movs r1, 0x64 - bl __udivsi3 - adds r7, r0, 0 -_08013238: - cmp r6, 0x18 - bne _0801323E - lsrs r7, 1 -_0801323E: - ldr r2, _08013288 @ =gBattleMons - movs r0, 0x58 - mov r1, r10 - muls r1, r0 - adds r0, r1, 0 - adds r1, r2, 0 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - movs r1, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0801325A - lsrs r7, 2 -_0801325A: - cmp r6, 0x1A - bne _08013274 - ldr r0, _0801328C @ =gRandomTurnNumber - ldrh r4, [r0] - lsls r0, r5, 16 - subs r0, r5 - movs r1, 0x64 - bl __divsi3 - cmp r4, r0 - bge _08013274 - movs r7, 0x1 - negs r7, r7 -_08013274: - ldr r2, [sp, 0x4] - cmp r2, 0 - beq _08013290 - movs r3, 0 - b _08013334 - .align 2, 0 -_08013280: .4byte gBattleTypeFlags -_08013284: .4byte 0x00000809 -_08013288: .4byte gBattleMons -_0801328C: .4byte gRandomTurnNumber -_08013290: - ldr r0, _080132B0 @ =gActionForBanks - mov r3, r9 - adds r1, r3, r0 - ldrb r1, [r1] - adds r2, r0, 0 - cmp r1, 0 - bne _080132E4 - ldr r0, _080132B4 @ =gProtectStructs - lsls r1, r3, 4 - adds r1, r0 - ldrb r0, [r1] - lsls r0, 29 - cmp r0, 0 - bge _080132B8 - movs r3, 0xA5 - b _080132E6 - .align 2, 0 -_080132B0: .4byte gActionForBanks -_080132B4: .4byte gProtectStructs -_080132B8: - ldr r1, _080132D8 @ =gSharedMem - ldr r0, _080132DC @ =0x0001608c - add r0, r9 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 1 - movs r1, 0x58 - mov r3, r9 - muls r3, r1 - adds r1, r3, 0 - adds r0, r1 - ldr r1, _080132E0 @ =gBattleMons - adds r1, 0xC - adds r0, r1 - ldrh r3, [r0] - b _080132E6 - .align 2, 0 -_080132D8: .4byte gSharedMem -_080132DC: .4byte 0x0001608c -_080132E0: .4byte gBattleMons -_080132E4: - movs r3, 0 -_080132E6: - mov r1, r10 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _08013334 - ldr r0, _08013304 @ =gProtectStructs - lsls r1, 4 - adds r1, r0 - ldrb r0, [r1] - lsls r0, 29 - cmp r0, 0 - bge _08013308 - movs r2, 0xA5 - b _08013336 - .align 2, 0 -_08013304: .4byte gProtectStructs -_08013308: - ldr r1, _08013328 @ =gSharedMem - ldr r0, _0801332C @ =0x0001608c - add r0, r10 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 1 - movs r1, 0x58 - mov r2, r10 - muls r2, r1 - adds r1, r2, 0 - adds r0, r1 - ldr r1, _08013330 @ =gBattleMons - adds r1, 0xC - adds r0, r1 - ldrh r2, [r0] - b _08013336 - .align 2, 0 -_08013328: .4byte gSharedMem -_0801332C: .4byte 0x0001608c -_08013330: .4byte gBattleMons -_08013334: - movs r2, 0 -_08013336: - ldr r4, _08013380 @ =gBattleMoves - lsls r0, r3, 1 - adds r0, r3 - lsls r0, 2 - adds r0, r4 - movs r1, 0x7 - ldrsb r1, [r0, r1] - lsls r3, r2, 1 - cmp r1, 0 - bne _0801335A - adds r0, r3, r2 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x7] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _08013398 -_0801335A: - adds r0, r3, r2 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x7] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _0801338E - cmp r8, r7 - bne _08013384 - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _08013384 - movs r3, 0x2 - b _080133B4 - .align 2, 0 -_08013380: .4byte gBattleMoves -_08013384: - cmp r8, r7 - bcs _080133B6 - movs r0, 0x1 - str r0, [sp, 0x8] - b _080133B6 -_0801338E: - cmp r1, r0 - bge _080133B6 - movs r1, 0x1 - str r1, [sp, 0x8] - b _080133B6 -_08013398: - cmp r8, r7 - bne _080133AE - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _080133AE - movs r2, 0x2 - str r2, [sp, 0x8] - b _080133B6 -_080133AE: - cmp r8, r7 - bcs _080133B6 - movs r3, 0x1 -_080133B4: - str r3, [sp, 0x8] -_080133B6: - ldr r0, [sp, 0x8] - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end GetWhoStrikesFirst - thumb_func_start sub_80133C8 sub_80133C8: @ 80133C8 push {r4-r7,lr} diff --git a/include/pokemon.h b/include/pokemon.h index a1c30f1f3..b6c6e0030 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -405,7 +405,7 @@ struct BattleMove u8 pp; u8 secondaryEffectChance; u8 target; - u8 priority; + s8 priority; u8 flags; u8 pad[3]; }; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index b0654950b..90d0d40e3 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -4,6 +4,7 @@ #include "battle_interface.h" #include "battle_setup.h" #include "data2.h" +#include "event_data.h" #include "item.h" #include "link.h" #include "main.h" @@ -26,9 +27,10 @@ #include "trig.h" #include "unknown_task.h" #include "util.h" +#include "constants/battle_move_effects.h" #include "constants/items.h" #include "constants/hold_effects.h" -#include "constants/battle_move_effects.h" +#include "constants/moves.h" #include "ewram.h" struct UnknownStruct7 @@ -56,6 +58,8 @@ struct UnknownStruct12 extern const u16 gUnknown_08D004E0[]; extern const struct MonCoords gCastformFrontSpriteCoords[]; +extern u8 gStatStageRatios[][2]; +extern u8 gUnknown_02024A76[4]; extern struct UnknownPokemonStruct2 gUnknown_02023A00[]; extern u8 gBattleBufferB[][0x200]; extern u8 gActiveBank; @@ -2352,3 +2356,1642 @@ void sub_8012324(void) } } */ +__attribute__((naked)) +void sub_8012324(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x1C\n\ + ldr r0, _08012340 @ =gBattleCommunication\n\ + movs r1, 0\n\ + strb r1, [r0, 0x4]\n\ + ldr r0, _08012344 @ =gActiveBank\n\ + strb r1, [r0]\n\ + ldr r0, _08012348 @ =gNoOfAllBanks\n\ + bl _08012F74\n\ + .align 2, 0\n\ +_08012340: .4byte gBattleCommunication\n\ +_08012344: .4byte gActiveBank\n\ +_08012348: .4byte gNoOfAllBanks\n\ +_0801234C:\n\ + ldr r4, _08012374 @ =gActiveBank\n\ + ldrb r0, [r4]\n\ + bl GetBankIdentity\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + ldr r1, _08012378 @ =gBattleCommunication\n\ + ldrb r0, [r4]\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x6\n\ + bls _08012368\n\ + bl _08012F66\n\ +_08012368:\n\ + lsls r0, 2\n\ + ldr r1, _0801237C @ =_08012380\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ + .align 2, 0\n\ +_08012374: .4byte gActiveBank\n\ +_08012378: .4byte gBattleCommunication\n\ +_0801237C: .4byte _08012380\n\ + .align 2, 0\n\ +_08012380:\n\ + .4byte _0801239C\n\ + .4byte _080124C8\n\ + .4byte _08012A28\n\ + .4byte _08012DA8\n\ + .4byte _08012E50\n\ + .4byte _08012E94\n\ + .4byte _08012F38\n\ +_0801239C:\n\ + ldr r4, _08012434 @ =gSharedMem\n\ + ldr r0, _08012438 @ =gActiveBank\n\ + ldrb r0, [r0]\n\ + ldr r1, _0801243C @ =0x00016068\n\ + adds r0, r1\n\ + adds r0, r4\n\ + movs r1, 0x6\n\ + strb r1, [r0]\n\ + ldr r0, _08012440 @ =gBattleTypeFlags\n\ + ldrh r1, [r0]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080123F8\n\ + movs r1, 0x2\n\ + movs r0, 0x2\n\ + ands r0, r5\n\ + cmp r0, 0\n\ + beq _080123F8\n\ + eors r5, r1\n\ + adds r0, r5, 0\n\ + bl GetBankByPlayerAI\n\ + ldr r2, _08012444 @ =0x000160a6\n\ + adds r1, r4, r2\n\ + ldrb r1, [r1]\n\ + ldr r2, _08012448 @ =gBitTable\n\ + lsls r0, 24\n\ + lsrs r0, 22\n\ + adds r0, r2\n\ + ldr r0, [r0]\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + bne _080123F8\n\ + ldr r4, _0801244C @ =gBattleCommunication\n\ + adds r0, r5, 0\n\ + bl GetBankByPlayerAI\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + adds r0, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x4\n\ + beq _080123F8\n\ + bl _08012F66\n\ +_080123F8:\n\ + ldr r0, _08012434 @ =gSharedMem\n\ + ldr r3, _08012444 @ =0x000160a6\n\ + adds r0, r3\n\ + ldrb r3, [r0]\n\ + ldr r1, _08012448 @ =gBitTable\n\ + ldr r4, _08012438 @ =gActiveBank\n\ + ldrb r2, [r4]\n\ + lsls r0, r2, 2\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + ands r3, r0\n\ + cmp r3, 0\n\ + beq _08012468\n\ + ldr r0, _08012450 @ =gActionForBanks\n\ + adds r0, r2, r0\n\ + movs r1, 0xD\n\ + strb r1, [r0]\n\ + ldr r0, _08012440 @ =gBattleTypeFlags\n\ + ldrh r1, [r0]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _08012454\n\ + ldr r0, _0801244C @ =gBattleCommunication\n\ + ldrb r1, [r4]\n\ + adds r1, r0\n\ + movs r0, 0x4\n\ + strb r0, [r1]\n\ + bl _08012F66\n\ + .align 2, 0\n\ +_08012434: .4byte gSharedMem\n\ +_08012438: .4byte gActiveBank\n\ +_0801243C: .4byte 0x00016068\n\ +_08012440: .4byte gBattleTypeFlags\n\ +_08012444: .4byte 0x000160a6\n\ +_08012448: .4byte gBitTable\n\ +_0801244C: .4byte gBattleCommunication\n\ +_08012450: .4byte gActionForBanks\n\ +_08012454:\n\ + ldr r0, _08012464 @ =gBattleCommunication\n\ + ldrb r1, [r4]\n\ + adds r1, r0\n\ + movs r0, 0x3\n\ + strb r0, [r1]\n\ + bl _08012F66\n\ + .align 2, 0\n\ +_08012464: .4byte gBattleCommunication\n\ +_08012468:\n\ + ldr r1, _0801249C @ =gBattleMons\n\ + movs r0, 0x58\n\ + muls r0, r2\n\ + adds r1, 0x50\n\ + adds r0, r1\n\ + ldr r1, [r0]\n\ + movs r0, 0x80\n\ + lsls r0, 5\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _08012488\n\ + movs r0, 0x80\n\ + lsls r0, 15\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _080124A8\n\ +_08012488:\n\ + ldr r0, _080124A0 @ =gActionForBanks\n\ + adds r0, r2, r0\n\ + strb r3, [r0]\n\ + ldr r1, _080124A4 @ =gBattleCommunication\n\ + ldrb r0, [r4]\n\ + adds r0, r1\n\ + movs r1, 0x3\n\ + strb r1, [r0]\n\ + bl _08012F66\n\ + .align 2, 0\n\ +_0801249C: .4byte gBattleMons\n\ +_080124A0: .4byte gActionForBanks\n\ +_080124A4: .4byte gBattleCommunication\n\ +_080124A8:\n\ + ldr r0, _080124C0 @ =gActionForBanks\n\ + ldrb r1, [r0]\n\ + ldr r0, _080124C4 @ =gBattleBufferB\n\ + ldrb r2, [r0, 0x1]\n\ + ldrb r0, [r0, 0x2]\n\ + lsls r0, 8\n\ + orrs r2, r0\n\ + movs r0, 0\n\ + bl Emitcmd18\n\ + bl _08012E32\n\ + .align 2, 0\n\ +_080124C0: .4byte gActionForBanks\n\ +_080124C4: .4byte gBattleBufferB\n\ +_080124C8:\n\ + ldr r4, _08012520 @ =gBattleExecBuffer\n\ + ldr r1, _08012524 @ =gBitTable\n\ + ldr r3, _08012528 @ =gActiveBank\n\ + ldrb r5, [r3]\n\ + lsls r0, r5, 2\n\ + adds r0, r1\n\ + ldr r2, [r0]\n\ + lsls r0, r2, 4\n\ + movs r1, 0xF0\n\ + lsls r1, 24\n\ + orrs r0, r1\n\ + orrs r0, r2\n\ + lsls r1, r2, 8\n\ + orrs r0, r1\n\ + lsls r2, 12\n\ + orrs r0, r2\n\ + ldr r1, [r4]\n\ + ands r1, r0\n\ + mov r8, r3\n\ + cmp r1, 0\n\ + beq _080124F6\n\ + bl _08012F66\n\ +_080124F6:\n\ + ldr r2, _0801252C @ =gActionForBanks\n\ + adds r2, r5, r2\n\ + ldr r1, _08012530 @ =gBattleBufferB\n\ + lsls r0, r5, 9\n\ + adds r1, 0x1\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + strb r0, [r2]\n\ + ldrb r0, [r3]\n\ + lsls r0, 9\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, 0xC\n\ + bls _08012514\n\ + b _08012968\n\ +_08012514:\n\ + lsls r0, 2\n\ + ldr r1, _08012534 @ =_08012538\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ + .align 2, 0\n\ +_08012520: .4byte gBattleExecBuffer\n\ +_08012524: .4byte gBitTable\n\ +_08012528: .4byte gActiveBank\n\ +_0801252C: .4byte gActionForBanks\n\ +_08012530: .4byte gBattleBufferB\n\ +_08012534: .4byte _08012538\n\ + .align 2, 0\n\ +_08012538:\n\ + .4byte _0801256C\n\ + .4byte _080126B4\n\ + .4byte _080126E0\n\ + .4byte _08012968\n\ + .4byte _08012968\n\ + .4byte _080128B0\n\ + .4byte _08012908\n\ + .4byte _08012968\n\ + .4byte _08012968\n\ + .4byte _08012968\n\ + .4byte _08012968\n\ + .4byte _08012968\n\ + .4byte _0801292C\n\ +_0801256C:\n\ + bl AreAllMovesUnusable\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080125D0\n\ + ldr r0, _080125B4 @ =gBattleCommunication\n\ + ldr r2, _080125B8 @ =gActiveBank\n\ + ldrb r1, [r2]\n\ + adds r1, r0\n\ + movs r4, 0\n\ + movs r0, 0x5\n\ + strb r0, [r1]\n\ + ldr r3, _080125BC @ =gSharedMem\n\ + ldrb r0, [r2]\n\ + ldr r1, _080125C0 @ =0x00016060\n\ + adds r0, r1\n\ + adds r0, r3\n\ + strb r4, [r0]\n\ + ldrb r0, [r2]\n\ + ldr r4, _080125C4 @ =0x00016094\n\ + adds r0, r4\n\ + adds r0, r3\n\ + movs r1, 0x3\n\ + strb r1, [r0]\n\ + ldrb r1, [r2]\n\ + ldr r0, _080125C8 @ =0x00016010\n\ + adds r2, r1, r0\n\ + adds r2, r3\n\ + ldr r0, _080125CC @ =gBattleBufferB\n\ + lsls r1, 9\n\ + adds r0, 0x3\n\ + adds r1, r0\n\ + ldrb r0, [r1]\n\ + strb r0, [r2]\n\ + bl _08012F90\n\ + .align 2, 0\n\ +_080125B4: .4byte gBattleCommunication\n\ +_080125B8: .4byte gActiveBank\n\ +_080125BC: .4byte gSharedMem\n\ +_080125C0: .4byte 0x00016060\n\ +_080125C4: .4byte 0x00016094\n\ +_080125C8: .4byte 0x00016010\n\ +_080125CC: .4byte gBattleBufferB\n\ +_080125D0:\n\ + ldr r1, _080125FC @ =gDisableStructs\n\ + ldr r5, _08012600 @ =gActiveBank\n\ + ldrb r4, [r5]\n\ + lsls r0, r4, 3\n\ + subs r0, r4\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldrh r2, [r0, 0x6]\n\ + cmp r2, 0\n\ + beq _0801260C\n\ + ldr r1, _08012604 @ =gChosenMovesByBanks\n\ + lsls r0, r4, 1\n\ + adds r0, r1\n\ + strh r2, [r0]\n\ + ldr r1, _08012608 @ =gBattleCommunication\n\ + ldrb r0, [r5]\n\ + adds r0, r1\n\ + movs r1, 0x3\n\ + strb r1, [r0]\n\ + bl _08012F90\n\ + .align 2, 0\n\ +_080125FC: .4byte gDisableStructs\n\ +_08012600: .4byte gActiveBank\n\ +_08012604: .4byte gChosenMovesByBanks\n\ +_08012608: .4byte gBattleCommunication\n\ +_0801260C:\n\ + add r2, sp, 0x4\n\ + ldr r3, _080126AC @ =gBattleMons\n\ + movs r1, 0x58\n\ + adds r0, r4, 0\n\ + muls r0, r1\n\ + adds r0, r3\n\ + ldrh r0, [r0]\n\ + strh r0, [r2, 0x10]\n\ + ldrb r0, [r5]\n\ + muls r0, r1\n\ + adds r0, r3\n\ + adds r0, 0x21\n\ + ldrb r0, [r0]\n\ + strb r0, [r2, 0x12]\n\ + ldrb r0, [r5]\n\ + muls r0, r1\n\ + adds r0, r3\n\ + adds r0, 0x22\n\ + ldrb r0, [r0]\n\ + strb r0, [r2, 0x13]\n\ + movs r4, 0\n\ + mov r1, sp\n\ + adds r1, 0xC\n\ + str r1, [sp, 0x18]\n\ + add r2, sp, 0x10\n\ + mov r10, r2\n\ + mov r8, r3\n\ + adds r7, r5, 0\n\ + movs r6, 0x58\n\ + movs r3, 0xC\n\ + add r3, r8\n\ + mov r9, r3\n\ + add r5, sp, 0x4\n\ +_0801264E:\n\ + lsls r2, r4, 1\n\ + ldrb r0, [r7]\n\ + muls r0, r6\n\ + adds r0, r2, r0\n\ + add r0, r9\n\ + ldrh r0, [r0]\n\ + strh r0, [r5]\n\ + ldr r0, [sp, 0x18]\n\ + adds r3, r0, r4\n\ + ldrb r0, [r7]\n\ + muls r0, r6\n\ + adds r0, r4, r0\n\ + mov r1, r8\n\ + adds r1, 0x24\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + strb r0, [r3]\n\ + ldrb r0, [r7]\n\ + adds r1, r0, 0\n\ + muls r1, r6\n\ + adds r2, r1\n\ + add r2, r9\n\ + ldrh r0, [r2]\n\ + add r1, r8\n\ + adds r1, 0x3B\n\ + ldrb r1, [r1]\n\ + lsls r2, r4, 24\n\ + lsrs r2, 24\n\ + bl CalculatePPWithBonus\n\ + mov r2, r10\n\ + adds r1, r2, r4\n\ + strb r0, [r1]\n\ + adds r5, 0x2\n\ + adds r4, 0x1\n\ + cmp r4, 0x3\n\ + ble _0801264E\n\ + ldr r0, _080126B0 @ =gBattleTypeFlags\n\ + ldrb r0, [r0]\n\ + movs r1, 0x1\n\ + ands r1, r0\n\ + movs r0, 0\n\ + movs r2, 0\n\ + add r3, sp, 0x4\n\ + bl Emitcmd20\n\ + b _0801289E\n\ + .align 2, 0\n\ +_080126AC: .4byte gBattleMons\n\ +_080126B0: .4byte gBattleTypeFlags\n\ +_080126B4:\n\ + ldr r0, _080126D0 @ =gBattleTypeFlags\n\ + ldrh r1, [r0]\n\ + ldr r0, _080126D4 @ =0x00000902\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080126C2\n\ + b _08012908\n\ +_080126C2:\n\ + ldr r1, _080126D8 @ =gUnknown_02024C1C\n\ + mov r3, r8\n\ + ldrb r0, [r3]\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldr r1, _080126DC @ =BattleScript_ActionSelectionItemsCantBeUsed\n\ + b _080129CC\n\ + .align 2, 0\n\ +_080126D0: .4byte gBattleTypeFlags\n\ +_080126D4: .4byte 0x00000902\n\ +_080126D8: .4byte gUnknown_02024C1C\n\ +_080126DC: .4byte BattleScript_ActionSelectionItemsCantBeUsed\n\ +_080126E0:\n\ + ldr r3, _08012738 @ =gSharedMem\n\ + ldr r5, _0801273C @ =gActiveBank\n\ + ldrb r0, [r5]\n\ + ldr r4, _08012740 @ =0x00016064\n\ + adds r1, r0, r4\n\ + adds r1, r3\n\ + ldr r2, _08012744 @ =gBattlePartyID\n\ + lsls r0, 1\n\ + adds r0, r2\n\ + ldrh r0, [r0]\n\ + strb r0, [r1]\n\ + ldr r7, _08012748 @ =gBattleMons\n\ + ldrb r2, [r5]\n\ + movs r6, 0x58\n\ + adds r0, r2, 0\n\ + muls r0, r6\n\ + adds r1, r7, 0\n\ + adds r1, 0x50\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + ldr r1, _0801274C @ =0x0400e000\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _08012722\n\ + ldr r0, _08012750 @ =gStatuses3\n\ + lsls r1, r2, 2\n\ + adds r1, r0\n\ + ldr r1, [r1]\n\ + movs r0, 0x80\n\ + lsls r0, 3\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _08012758\n\ +_08012722:\n\ + lsls r0, r2, 1\n\ + adds r0, r2\n\ + ldr r2, _08012754 @ =0x0001606c\n\ + adds r1, r3, r2\n\ + adds r0, r1\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + movs r1, 0x2\n\ + movs r2, 0x6\n\ + b _0801286C\n\ + .align 2, 0\n\ +_08012738: .4byte gSharedMem\n\ +_0801273C: .4byte gActiveBank\n\ +_08012740: .4byte 0x00016064\n\ +_08012744: .4byte gBattlePartyID\n\ +_08012748: .4byte gBattleMons\n\ +_0801274C: .4byte 0x0400e000\n\ +_08012750: .4byte gStatuses3\n\ +_08012754: .4byte 0x0001606c\n\ +_08012758:\n\ + str r1, [sp]\n\ + movs r0, 0xC\n\ + adds r1, r2, 0\n\ + movs r2, 0x17\n\ + movs r3, 0\n\ + bl AbilityBattleEffects\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, 0\n\ + bne _080127E0\n\ + ldrb r1, [r5]\n\ + str r4, [sp]\n\ + movs r0, 0xC\n\ + movs r2, 0x47\n\ + movs r3, 0\n\ + bl AbilityBattleEffects\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, 0\n\ + beq _080127A8\n\ + ldrb r0, [r5]\n\ + muls r0, r6\n\ + adds r1, r0, r7\n\ + adds r0, r1, 0\n\ + adds r0, 0x21\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x2\n\ + beq _080127A8\n\ + adds r0, r1, 0\n\ + adds r0, 0x22\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x2\n\ + beq _080127A8\n\ + adds r0, r1, 0\n\ + adds r0, 0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x1A\n\ + bne _080127E0\n\ +_080127A8:\n\ + ldr r5, _08012808 @ =gActiveBank\n\ + ldrb r1, [r5]\n\ + movs r0, 0\n\ + str r0, [sp]\n\ + movs r0, 0xF\n\ + movs r2, 0x2A\n\ + movs r3, 0\n\ + bl AbilityBattleEffects\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + cmp r4, 0\n\ + beq _08012818\n\ + ldr r2, _0801280C @ =gBattleMons\n\ + ldrb r1, [r5]\n\ + movs r0, 0x58\n\ + muls r0, r1\n\ + adds r1, r0, r2\n\ + adds r0, r1, 0\n\ + adds r0, 0x21\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x8\n\ + beq _080127E0\n\ + adds r0, r1, 0\n\ + adds r0, 0x22\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x8\n\ + bne _08012818\n\ +_080127E0:\n\ + subs r1, r4, 0x1\n\ + lsls r1, 4\n\ + movs r0, 0x4\n\ + orrs r1, r0\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ + ldr r0, _08012810 @ =gLastUsedAbility\n\ + ldrb r3, [r0]\n\ + ldr r0, _08012808 @ =gActiveBank\n\ + ldrb r2, [r0]\n\ + lsls r0, r2, 1\n\ + adds r0, r2\n\ + ldr r2, _08012814 @ =gSharedMem + 0x1606C\n\ + adds r0, r2\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + movs r2, 0x6\n\ + bl EmitChoosePokemon\n\ + b _0801289E\n\ + .align 2, 0\n\ +_08012808: .4byte gActiveBank\n\ +_0801280C: .4byte gBattleMons\n\ +_08012810: .4byte gLastUsedAbility\n\ +_08012814: .4byte gSharedMem + 0x1606C\n\ +_08012818:\n\ + ldr r0, _08012830 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + mov r8, r0\n\ + cmp r1, 0x2\n\ + bne _08012840\n\ + ldr r0, _08012834 @ =gActionForBanks\n\ + ldrb r0, [r0]\n\ + cmp r0, 0x2\n\ + bne _08012840\n\ + ldr r3, _08012838 @ =gSharedMem\n\ + ldr r4, _0801283C @ =0x00016068\n\ + b _08012854\n\ + .align 2, 0\n\ +_08012830: .4byte gActiveBank\n\ +_08012834: .4byte gActionForBanks\n\ +_08012838: .4byte gSharedMem\n\ +_0801283C: .4byte 0x00016068\n\ +_08012840:\n\ + mov r2, r8\n\ + ldrb r0, [r2]\n\ + cmp r0, 0x3\n\ + bne _08012884\n\ + ldr r0, _08012874 @ =gActionForBanks\n\ + ldrb r0, [r0, 0x1]\n\ + cmp r0, 0x2\n\ + bne _08012884\n\ + ldr r3, _08012878 @ =gSharedMem\n\ + ldr r4, _0801287C @ =0x00016069\n\ +_08012854:\n\ + adds r0, r3, r4\n\ + ldrb r2, [r0]\n\ + mov r0, r8\n\ + ldrb r1, [r0]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + ldr r1, _08012880 @ =0x0001606c\n\ + adds r3, r1\n\ + adds r0, r3\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + movs r1, 0\n\ +_0801286C:\n\ + movs r3, 0\n\ + bl EmitChoosePokemon\n\ + b _0801289E\n\ + .align 2, 0\n\ +_08012874: .4byte gActionForBanks\n\ +_08012878: .4byte gSharedMem\n\ +_0801287C: .4byte 0x00016069\n\ +_08012880: .4byte 0x0001606c\n\ +_08012884:\n\ + ldr r0, _080128A8 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + lsls r0, r1, 1\n\ + adds r0, r1\n\ + ldr r1, _080128AC @ =gSharedMem + 0x1606C\n\ + adds r0, r1\n\ + str r0, [sp]\n\ + movs r0, 0\n\ + movs r1, 0\n\ + movs r2, 0x6\n\ + movs r3, 0\n\ + bl EmitChoosePokemon\n\ +_0801289E:\n\ + ldr r0, _080128A8 @ =gActiveBank\n\ + ldrb r0, [r0]\n\ + bl MarkBufferBankForExecution\n\ + b _08012968\n\ + .align 2, 0\n\ +_080128A8: .4byte gActiveBank\n\ +_080128AC: .4byte gSharedMem + 0x1606C\n\ +_080128B0:\n\ + bl PlayerPartyAndPokemonStorageFull\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _08012968\n\ + ldr r1, _080128EC @ =gUnknown_02024C1C\n\ + ldr r2, _080128F0 @ =gActiveBank\n\ + ldrb r0, [r2]\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldr r1, _080128F4 @ =BattleScript_PrintFullBox\n\ + str r1, [r0]\n\ + ldr r0, _080128F8 @ =gBattleCommunication\n\ + ldrb r1, [r2]\n\ + adds r1, r0\n\ + movs r3, 0\n\ + movs r0, 0x5\n\ + strb r0, [r1]\n\ + ldr r1, _080128FC @ =gSharedMem\n\ + ldrb r0, [r2]\n\ + ldr r4, _08012900 @ =0x00016060\n\ + adds r0, r4\n\ + adds r0, r1\n\ + strb r3, [r0]\n\ + ldrb r0, [r2]\n\ + ldr r2, _08012904 @ =0x00016094\n\ + adds r0, r2\n\ + adds r0, r1\n\ + strb r3, [r0]\n\ + b _08012F90\n\ + .align 2, 0\n\ +_080128EC: .4byte gUnknown_02024C1C\n\ +_080128F0: .4byte gActiveBank\n\ +_080128F4: .4byte BattleScript_PrintFullBox\n\ +_080128F8: .4byte gBattleCommunication\n\ +_080128FC: .4byte gSharedMem\n\ +_08012900: .4byte 0x00016060\n\ +_08012904: .4byte 0x00016094\n\ +_08012908:\n\ + ldr r4, _08012924 @ =gActiveBank\n\ + ldrb r0, [r4]\n\ + lsls r1, r0, 1\n\ + adds r1, r0\n\ + ldr r0, _08012928 @ =gSharedMem + 0x1606C\n\ + adds r1, r0\n\ + movs r0, 0\n\ + bl EmitOpenBag\n\ + ldrb r0, [r4]\n\ + bl MarkBufferBankForExecution\n\ + b _08012968\n\ + .align 2, 0\n\ +_08012924: .4byte gActiveBank\n\ +_08012928: .4byte gSharedMem + 0x1606C\n\ +_0801292C:\n\ + ldr r4, _08012964 @ =gBattleCommunication\n\ + mov r3, r8\n\ + ldrb r1, [r3]\n\ + adds r1, r4\n\ + movs r5, 0\n\ + movs r0, 0x6\n\ + strb r0, [r1]\n\ + ldrb r0, [r3]\n\ + bl GetBankIdentity\n\ + movs r1, 0x2\n\ + eors r0, r1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + bl GetBankByPlayerAI\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + adds r0, r4\n\ + strb r5, [r0]\n\ + movs r0, 0\n\ + bl Emitcmd50\n\ + mov r4, r8\n\ + ldrb r0, [r4]\n\ + bl MarkBufferBankForExecution\n\ + b _08012F90\n\ + .align 2, 0\n\ +_08012964: .4byte gBattleCommunication\n\ +_08012968:\n\ + ldr r0, _08012994 @ =gBattleTypeFlags\n\ + ldrh r1, [r0]\n\ + movs r0, 0xA\n\ + ands r0, r1\n\ + cmp r0, 0x8\n\ + bne _080129A8\n\ + ldr r0, _08012998 @ =gBattleBufferB\n\ + ldr r4, _0801299C @ =gActiveBank\n\ + ldrb r1, [r4]\n\ + lsls r1, 9\n\ + adds r0, 0x1\n\ + adds r1, r0\n\ + ldrb r0, [r1]\n\ + cmp r0, 0x3\n\ + bne _080129A8\n\ + ldr r0, _080129A0 @ =BattleScript_PrintCantRunFromTrainer\n\ + bl b_call_bc_move_exec\n\ + ldr r1, _080129A4 @ =gBattleCommunication\n\ + ldrb r0, [r4]\n\ + adds r0, r1\n\ + b _08012BFE\n\ + .align 2, 0\n\ +_08012994: .4byte gBattleTypeFlags\n\ +_08012998: .4byte gBattleBufferB\n\ +_0801299C: .4byte gActiveBank\n\ +_080129A0: .4byte BattleScript_PrintCantRunFromTrainer\n\ +_080129A4: .4byte gBattleCommunication\n\ +_080129A8:\n\ + bl CanRunFromBattle\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _08012A14\n\ + ldr r0, _080129F4 @ =gBattleBufferB\n\ + ldr r3, _080129F8 @ =gActiveBank\n\ + ldrb r2, [r3]\n\ + lsls r1, r2, 9\n\ + adds r0, 0x1\n\ + adds r1, r0\n\ + ldrb r0, [r1]\n\ + cmp r0, 0x3\n\ + bne _08012A14\n\ + ldr r1, _080129FC @ =gUnknown_02024C1C\n\ + lsls r0, r2, 2\n\ + adds r0, r1\n\ + ldr r1, _08012A00 @ =BattleScript_PrintCantEscapeFromBattle\n\ +_080129CC:\n\ + str r1, [r0]\n\ + ldr r0, _08012A04 @ =gBattleCommunication\n\ + ldrb r1, [r3]\n\ + adds r1, r0\n\ + movs r2, 0\n\ + movs r0, 0x5\n\ + strb r0, [r1]\n\ + ldr r1, _08012A08 @ =gSharedMem\n\ + ldrb r0, [r3]\n\ + ldr r4, _08012A0C @ =0x00016060\n\ + adds r0, r4\n\ + adds r0, r1\n\ + strb r2, [r0]\n\ + ldrb r0, [r3]\n\ + ldr r3, _08012A10 @ =0x00016094\n\ + adds r0, r3\n\ + adds r0, r1\n\ + strb r2, [r0]\n\ + b _08012F90\n\ + .align 2, 0\n\ +_080129F4: .4byte gBattleBufferB\n\ +_080129F8: .4byte gActiveBank\n\ +_080129FC: .4byte gUnknown_02024C1C\n\ +_08012A00: .4byte BattleScript_PrintCantEscapeFromBattle\n\ +_08012A04: .4byte gBattleCommunication\n\ +_08012A08: .4byte gSharedMem\n\ +_08012A0C: .4byte 0x00016060\n\ +_08012A10: .4byte 0x00016094\n\ +_08012A14:\n\ + ldr r2, _08012A20 @ =gBattleCommunication\n\ + ldr r0, _08012A24 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, r2\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012A20: .4byte gBattleCommunication\n\ +_08012A24: .4byte gActiveBank\n\ +_08012A28:\n\ + ldr r4, _08012A6C @ =gBattleExecBuffer\n\ + ldr r1, _08012A70 @ =gBitTable\n\ + ldr r3, _08012A74 @ =gActiveBank\n\ + ldrb r5, [r3]\n\ + lsls r0, r5, 2\n\ + adds r0, r1\n\ + ldr r2, [r0]\n\ + lsls r0, r2, 4\n\ + movs r1, 0xF0\n\ + lsls r1, 24\n\ + orrs r0, r1\n\ + orrs r0, r2\n\ + lsls r1, r2, 8\n\ + orrs r0, r1\n\ + lsls r2, 12\n\ + orrs r0, r2\n\ + ldr r1, [r4]\n\ + ands r1, r0\n\ + mov r8, r3\n\ + cmp r1, 0\n\ + beq _08012A54\n\ + b _08012F66\n\ +_08012A54:\n\ + ldr r1, _08012A78 @ =gActionForBanks\n\ + adds r0, r5, r1\n\ + ldrb r0, [r0]\n\ + adds r3, r1, 0\n\ + cmp r0, 0x9\n\ + bls _08012A62\n\ + b _08012F66\n\ +_08012A62:\n\ + lsls r0, 2\n\ + ldr r1, _08012A7C @ =_08012A80\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ + .align 2, 0\n\ +_08012A6C: .4byte gBattleExecBuffer\n\ +_08012A70: .4byte gBitTable\n\ +_08012A74: .4byte gActiveBank\n\ +_08012A78: .4byte gActionForBanks\n\ +_08012A7C: .4byte _08012A80\n\ + .align 2, 0\n\ +_08012A80:\n\ + .4byte _08012AA8\n\ + .4byte _08012BB0\n\ + .4byte _08012BE8\n\ + .4byte _08012CE0\n\ + .4byte _08012D04\n\ + .4byte _08012D18\n\ + .4byte _08012D2C\n\ + .4byte _08012D5C\n\ + .4byte _08012D70\n\ + .4byte _08012D94\n\ +_08012AA8:\n\ + ldr r0, _08012AC8 @ =gBattleBufferB\n\ + mov r1, r8\n\ + ldrb r4, [r1]\n\ + lsls r1, r4, 9\n\ + adds r2, r0, 0x1\n\ + adds r1, r2\n\ + ldrb r1, [r1]\n\ + adds r6, r0, 0\n\ + cmp r1, 0x9\n\ + bgt _08012ACC\n\ + cmp r1, 0x3\n\ + blt _08012ACC\n\ + adds r0, r4, r3\n\ + strb r1, [r0]\n\ + b _08012F90\n\ + .align 2, 0\n\ +_08012AC8: .4byte gBattleBufferB\n\ +_08012ACC:\n\ + adds r3, r6, 0\n\ + mov r5, r8\n\ + ldrb r4, [r5]\n\ + lsls r1, r4, 9\n\ + adds r7, r3, 0x2\n\ + adds r0, r1, r7\n\ + ldrb r2, [r0]\n\ + adds r3, 0x3\n\ + mov r9, r3\n\ + add r1, r9\n\ + ldrb r0, [r1]\n\ + lsls r0, 8\n\ + orrs r2, r0\n\ + ldr r0, _08012AF4 @ =0x0000ffff\n\ + cmp r2, r0\n\ + bne _08012AFC\n\ + ldr r0, _08012AF8 @ =gBattleCommunication\n\ + adds r0, r4, r0\n\ + b _08012BFE\n\ + .align 2, 0\n\ +_08012AF4: .4byte 0x0000ffff\n\ +_08012AF8: .4byte gBattleCommunication\n\ +_08012AFC:\n\ + bl sub_8015894\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _08012B48\n\ + ldr r0, _08012B38 @ =gBattleCommunication\n\ + ldrb r1, [r5]\n\ + adds r1, r0\n\ + movs r2, 0\n\ + movs r0, 0x5\n\ + strb r0, [r1]\n\ + ldr r3, _08012B3C @ =gSharedMem\n\ + ldrb r0, [r5]\n\ + ldr r4, _08012B40 @ =0x00016060\n\ + adds r0, r4\n\ + adds r0, r3\n\ + strb r2, [r0]\n\ + ldrb r0, [r5]\n\ + lsls r0, 9\n\ + adds r1, r6, 0x1\n\ + adds r0, r1\n\ + strb r2, [r0]\n\ + ldrb r0, [r5]\n\ + ldr r1, _08012B44 @ =0x00016094\n\ + adds r0, r1\n\ + adds r0, r3\n\ + movs r1, 0x1\n\ + strb r1, [r0]\n\ + b _08012F90\n\ + .align 2, 0\n\ +_08012B38: .4byte gBattleCommunication\n\ +_08012B3C: .4byte gSharedMem\n\ +_08012B40: .4byte 0x00016060\n\ +_08012B44: .4byte 0x00016094\n\ +_08012B48:\n\ + ldr r6, _08012B98 @ =gSharedMem\n\ + mov r2, r8\n\ + ldrb r0, [r2]\n\ + ldr r2, _08012B9C @ =0x0001608c\n\ + adds r1, r0, r2\n\ + adds r1, r6\n\ + lsls r0, 9\n\ + adds r0, r7\n\ + ldrb r0, [r0]\n\ + strb r0, [r1]\n\ + ldr r0, _08012BA0 @ =gChosenMovesByBanks\n\ + mov r4, r8\n\ + ldrb r3, [r4]\n\ + lsls r5, r3, 1\n\ + adds r5, r0\n\ + ldr r4, _08012BA4 @ =gBattleMons\n\ + adds r2, r3, r2\n\ + adds r2, r6\n\ + ldrb r0, [r2]\n\ + lsls r0, 1\n\ + movs r1, 0x58\n\ + muls r1, r3\n\ + adds r0, r1\n\ + adds r4, 0xC\n\ + adds r0, r4\n\ + ldrh r0, [r0]\n\ + strh r0, [r5]\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + ldr r2, _08012BA8 @ =0x00016010\n\ + adds r1, r0, r2\n\ + adds r1, r6\n\ + lsls r0, 9\n\ + add r0, r9\n\ + ldrb r0, [r0]\n\ + strb r0, [r1]\n\ + ldr r0, _08012BAC @ =gBattleCommunication\n\ + mov r3, r8\n\ + ldrb r1, [r3]\n\ + b _08012E3C\n\ + .align 2, 0\n\ +_08012B98: .4byte gSharedMem\n\ +_08012B9C: .4byte 0x0001608c\n\ +_08012BA0: .4byte gChosenMovesByBanks\n\ +_08012BA4: .4byte gBattleMons\n\ +_08012BA8: .4byte 0x00016010\n\ +_08012BAC: .4byte gBattleCommunication\n\ +_08012BB0:\n\ + ldr r2, _08012BD8 @ =gBattleBufferB\n\ + ldr r5, _08012BDC @ =gActiveBank\n\ + ldrb r4, [r5]\n\ + lsls r1, r4, 9\n\ + adds r0, r2, 0x1\n\ + adds r0, r1, r0\n\ + ldrb r3, [r0]\n\ + adds r2, 0x2\n\ + adds r1, r2\n\ + ldrb r0, [r1]\n\ + lsls r0, 8\n\ + orrs r3, r0\n\ + cmp r3, 0\n\ + bne _08012BCE\n\ + b _08012F60\n\ +_08012BCE:\n\ + ldr r0, _08012BE0 @ =gLastUsedItem\n\ + strh r3, [r0]\n\ + ldr r0, _08012BE4 @ =gBattleCommunication\n\ + ldrb r1, [r5]\n\ + b _08012E3C\n\ + .align 2, 0\n\ +_08012BD8: .4byte gBattleBufferB\n\ +_08012BDC: .4byte gActiveBank\n\ +_08012BE0: .4byte gLastUsedItem\n\ +_08012BE4: .4byte gBattleCommunication\n\ +_08012BE8:\n\ + ldr r4, _08012C04 @ =gBattleBufferB\n\ + ldr r7, _08012C08 @ =gActiveBank\n\ + ldrb r2, [r7]\n\ + lsls r0, r2, 9\n\ + adds r1, r4, 0x1\n\ + adds r0, r1\n\ + ldrb r1, [r0]\n\ + cmp r1, 0x6\n\ + bne _08012C10\n\ + ldr r0, _08012C0C @ =gBattleCommunication\n\ + adds r0, r2, r0\n\ +_08012BFE:\n\ + movs r1, 0\n\ + strb r1, [r0]\n\ + b _08012F66\n\ + .align 2, 0\n\ +_08012C04: .4byte gBattleBufferB\n\ +_08012C08: .4byte gActiveBank\n\ +_08012C0C: .4byte gBattleCommunication\n\ +_08012C10:\n\ + ldr r0, _08012CC4 @ =gSharedMem\n\ + mov r12, r0\n\ + ldr r3, _08012CC8 @ =0x00016068\n\ + adds r0, r2, r3\n\ + add r0, r12\n\ + strb r1, [r0]\n\ + ldr r0, _08012CCC @ =gBattleTypeFlags\n\ + ldrh r1, [r0]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _08012CBE\n\ + ldrb r0, [r7]\n\ + lsls r1, r0, 1\n\ + adds r1, r0\n\ + ldr r5, _08012CD0 @ =0x0001606c\n\ + adds r1, r5\n\ + add r1, r12\n\ + ldrb r2, [r1]\n\ + movs r0, 0xF\n\ + ands r0, r2\n\ + strb r0, [r1]\n\ + ldrb r0, [r7]\n\ + lsls r2, r0, 1\n\ + adds r2, r0\n\ + adds r2, r5\n\ + add r2, r12\n\ + lsls r0, 9\n\ + adds r6, r4, 0x2\n\ + adds r0, r6\n\ + ldrb r1, [r0]\n\ + movs r3, 0xF0\n\ + adds r0, r3, 0\n\ + ands r0, r1\n\ + ldrb r1, [r2]\n\ + orrs r0, r1\n\ + strb r0, [r2]\n\ + ldrb r0, [r7]\n\ + lsls r1, r0, 1\n\ + adds r1, r0\n\ + ldr r2, _08012CD4 @ =0x0001606d\n\ + adds r1, r2\n\ + add r1, r12\n\ + lsls r0, 9\n\ + adds r4, 0x3\n\ + mov r8, r4\n\ + add r0, r8\n\ + ldrb r0, [r0]\n\ + strb r0, [r1]\n\ + ldrb r0, [r7]\n\ + movs r4, 0x2\n\ + eors r0, r4\n\ + lsls r1, r0, 1\n\ + adds r1, r0\n\ + adds r1, r5\n\ + add r1, r12\n\ + ldrb r2, [r1]\n\ + adds r0, r3, 0\n\ + ands r0, r2\n\ + strb r0, [r1]\n\ + ldrb r0, [r7]\n\ + eors r0, r4\n\ + lsls r1, r0, 1\n\ + adds r1, r0\n\ + adds r1, r5\n\ + add r1, r12\n\ + ldrb r0, [r7]\n\ + lsls r0, 9\n\ + adds r0, r6\n\ + ldrb r0, [r0]\n\ + ands r3, r0\n\ + lsrs r3, 4\n\ + ldrb r0, [r1]\n\ + orrs r3, r0\n\ + strb r3, [r1]\n\ + ldrb r0, [r7]\n\ + eors r4, r0\n\ + lsls r1, r4, 1\n\ + adds r1, r4\n\ + ldr r3, _08012CD8 @ =0x0001606e\n\ + adds r1, r3\n\ + add r1, r12\n\ + ldrb r0, [r7]\n\ + lsls r0, 9\n\ + add r0, r8\n\ + ldrb r0, [r0]\n\ + strb r0, [r1]\n\ +_08012CBE:\n\ + ldr r0, _08012CDC @ =gBattleCommunication\n\ + ldrb r1, [r7]\n\ + b _08012E3C\n\ + .align 2, 0\n\ +_08012CC4: .4byte gSharedMem\n\ +_08012CC8: .4byte 0x00016068\n\ +_08012CCC: .4byte gBattleTypeFlags\n\ +_08012CD0: .4byte 0x0001606c\n\ +_08012CD4: .4byte 0x0001606d\n\ +_08012CD8: .4byte 0x0001606e\n\ +_08012CDC: .4byte gBattleCommunication\n\ +_08012CE0:\n\ + ldr r2, _08012CF8 @ =gHitMarker\n\ + ldr r0, [r2]\n\ + movs r1, 0x80\n\ + lsls r1, 8\n\ + orrs r0, r1\n\ + str r0, [r2]\n\ + ldr r2, _08012CFC @ =gBattleCommunication\n\ + ldr r0, _08012D00 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, r2\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012CF8: .4byte gHitMarker\n\ +_08012CFC: .4byte gBattleCommunication\n\ +_08012D00: .4byte gActiveBank\n\ +_08012D04:\n\ + ldr r2, _08012D10 @ =gBattleCommunication\n\ + ldr r0, _08012D14 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, r2\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012D10: .4byte gBattleCommunication\n\ +_08012D14: .4byte gActiveBank\n\ +_08012D18:\n\ + ldr r2, _08012D24 @ =gBattleCommunication\n\ + ldr r0, _08012D28 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, r2\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012D24: .4byte gBattleCommunication\n\ +_08012D28: .4byte gActiveBank\n\ +_08012D2C:\n\ + ldr r2, _08012D50 @ =gBattleBufferB\n\ + ldr r0, _08012D54 @ =gActiveBank\n\ + ldrb r4, [r0]\n\ + lsls r1, r4, 9\n\ + adds r0, r2, 0x1\n\ + adds r0, r1, r0\n\ + ldrb r3, [r0]\n\ + adds r2, 0x2\n\ + adds r1, r2\n\ + ldrb r0, [r1]\n\ + lsls r0, 8\n\ + orrs r3, r0\n\ + cmp r3, 0\n\ + bne _08012D4A\n\ + b _08012F60\n\ +_08012D4A:\n\ + ldr r1, _08012D58 @ =gBattleCommunication\n\ + adds r1, r4, r1\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012D50: .4byte gBattleBufferB\n\ +_08012D54: .4byte gActiveBank\n\ +_08012D58: .4byte gBattleCommunication\n\ +_08012D5C:\n\ + ldr r2, _08012D68 @ =gBattleCommunication\n\ + ldr r0, _08012D6C @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, r2\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012D68: .4byte gBattleCommunication\n\ +_08012D6C: .4byte gActiveBank\n\ +_08012D70:\n\ + ldr r2, _08012D88 @ =gHitMarker\n\ + ldr r0, [r2]\n\ + movs r1, 0x80\n\ + lsls r1, 8\n\ + orrs r0, r1\n\ + str r0, [r2]\n\ + ldr r2, _08012D8C @ =gBattleCommunication\n\ + ldr r0, _08012D90 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, r2\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012D88: .4byte gHitMarker\n\ +_08012D8C: .4byte gBattleCommunication\n\ +_08012D90: .4byte gActiveBank\n\ +_08012D94:\n\ + ldr r2, _08012DA0 @ =gBattleCommunication\n\ + ldr r0, _08012DA4 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, r2\n\ + b _08012E3E\n\ + .align 2, 0\n\ +_08012DA0: .4byte gBattleCommunication\n\ +_08012DA4: .4byte gActiveBank\n\ +_08012DA8:\n\ + ldr r3, _08012E10 @ =gBattleExecBuffer\n\ + ldr r4, _08012E14 @ =gBitTable\n\ + ldr r0, _08012E18 @ =gActiveBank\n\ + ldrb r0, [r0]\n\ + lsls r0, 2\n\ + adds r0, r4\n\ + ldr r2, [r0]\n\ + lsls r1, r2, 4\n\ + movs r0, 0xF0\n\ + lsls r0, 24\n\ + orrs r1, r0\n\ + orrs r1, r2\n\ + lsls r0, r2, 8\n\ + orrs r1, r0\n\ + lsls r2, 12\n\ + orrs r1, r2\n\ + ldr r0, [r3]\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _08012DD2\n\ + b _08012F66\n\ +_08012DD2:\n\ + ldr r0, _08012E1C @ =gBattleTypeFlags\n\ + ldrh r1, [r0]\n\ + movs r0, 0x41\n\ + ands r0, r1\n\ + cmp r0, 0x1\n\ + bne _08012E06\n\ + movs r1, 0x2\n\ + movs r0, 0x2\n\ + ands r0, r5\n\ + cmp r0, 0\n\ + bne _08012E06\n\ + adds r0, r5, 0\n\ + eors r0, r1\n\ + bl GetBankByPlayerAI\n\ + ldr r1, _08012E20 @ =gSharedMem\n\ + ldr r2, _08012E24 @ =0x000160a6\n\ + adds r1, r2\n\ + ldrb r1, [r1]\n\ + lsls r0, 24\n\ + lsrs r0, 22\n\ + adds r0, r4\n\ + ldr r0, [r0]\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _08012E28\n\ +_08012E06:\n\ + movs r0, 0\n\ + movs r1, 0\n\ + bl EmitLinkStandbyMsg\n\ + b _08012E30\n\ + .align 2, 0\n\ +_08012E10: .4byte gBattleExecBuffer\n\ +_08012E14: .4byte gBitTable\n\ +_08012E18: .4byte gActiveBank\n\ +_08012E1C: .4byte gBattleTypeFlags\n\ +_08012E20: .4byte gSharedMem\n\ +_08012E24: .4byte 0x000160a6\n\ +_08012E28:\n\ + movs r0, 0\n\ + movs r1, 0x1\n\ + bl EmitLinkStandbyMsg\n\ +_08012E30:\n\ + ldr r4, _08012E48 @ =gActiveBank\n\ +_08012E32:\n\ + ldrb r0, [r4]\n\ + bl MarkBufferBankForExecution\n\ + ldr r0, _08012E4C @ =gBattleCommunication\n\ + ldrb r1, [r4]\n\ +_08012E3C:\n\ + adds r1, r0\n\ +_08012E3E:\n\ + ldrb r0, [r1]\n\ + adds r0, 0x1\n\ + strb r0, [r1]\n\ + b _08012F66\n\ + .align 2, 0\n\ +_08012E48: .4byte gActiveBank\n\ +_08012E4C: .4byte gBattleCommunication\n\ +_08012E50:\n\ + ldr r3, _08012E84 @ =gBattleExecBuffer\n\ + ldr r1, _08012E88 @ =gBitTable\n\ + ldr r0, _08012E8C @ =gActiveBank\n\ + ldrb r0, [r0]\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldr r2, [r0]\n\ + lsls r1, r2, 4\n\ + movs r0, 0xF0\n\ + lsls r0, 24\n\ + orrs r1, r0\n\ + orrs r1, r2\n\ + lsls r0, r2, 8\n\ + orrs r1, r0\n\ + lsls r2, 12\n\ + orrs r1, r2\n\ + ldr r0, [r3]\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _08012F66\n\ + ldr r1, _08012E90 @ =gBattleCommunication\n\ + ldrb r0, [r1, 0x4]\n\ + adds r0, 0x1\n\ + strb r0, [r1, 0x4]\n\ + b _08012F66\n\ + .align 2, 0\n\ +_08012E84: .4byte gBattleExecBuffer\n\ +_08012E88: .4byte gBitTable\n\ +_08012E8C: .4byte gActiveBank\n\ +_08012E90: .4byte gBattleCommunication\n\ +_08012E94:\n\ + ldr r2, _08012EB8 @ =gSharedMem\n\ + ldr r5, _08012EBC @ =gActiveBank\n\ + ldrb r1, [r5]\n\ + ldr r3, _08012EC0 @ =0x00016060\n\ + adds r0, r1, r3\n\ + adds r0, r2\n\ + ldrb r0, [r0]\n\ + cmp r0, 0\n\ + beq _08012ECC\n\ + ldr r0, _08012EC4 @ =gBattleCommunication\n\ + adds r0, r1, r0\n\ + ldr r4, _08012EC8 @ =0x00016094\n\ + adds r1, r4\n\ + adds r1, r2\n\ + ldrb r1, [r1]\n\ + strb r1, [r0]\n\ + b _08012F66\n\ + .align 2, 0\n\ +_08012EB8: .4byte gSharedMem\n\ +_08012EBC: .4byte gActiveBank\n\ +_08012EC0: .4byte 0x00016060\n\ +_08012EC4: .4byte gBattleCommunication\n\ +_08012EC8: .4byte 0x00016094\n\ +_08012ECC:\n\ + ldr r0, _08012F20 @ =gBankAttacker\n\ + strb r1, [r0]\n\ + ldr r7, _08012F24 @ =gBattlescriptCurrInstr\n\ + ldr r6, _08012F28 @ =gUnknown_02024C1C\n\ + ldrb r0, [r5]\n\ + lsls r0, 2\n\ + adds r0, r6\n\ + ldr r4, [r0]\n\ + str r4, [r7]\n\ + ldr r3, _08012F2C @ =gBattleExecBuffer\n\ + ldr r1, _08012F30 @ =gBitTable\n\ + ldrb r0, [r5]\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldr r2, [r0]\n\ + lsls r1, r2, 4\n\ + movs r0, 0xF0\n\ + lsls r0, 24\n\ + orrs r1, r0\n\ + orrs r1, r2\n\ + lsls r0, r2, 8\n\ + orrs r1, r0\n\ + lsls r2, 12\n\ + orrs r1, r2\n\ + ldr r0, [r3]\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _08012F12\n\ + ldr r0, _08012F34 @ =gBattleScriptingCommandsTable\n\ + ldrb r1, [r4]\n\ + lsls r1, 2\n\ + adds r1, r0\n\ + ldr r0, [r1]\n\ + bl _call_via_r0\n\ +_08012F12:\n\ + ldrb r0, [r5]\n\ + lsls r0, 2\n\ + adds r0, r6\n\ + ldr r1, [r7]\n\ + str r1, [r0]\n\ + b _08012F66\n\ + .align 2, 0\n\ +_08012F20: .4byte gBankAttacker\n\ +_08012F24: .4byte gBattlescriptCurrInstr\n\ +_08012F28: .4byte gUnknown_02024C1C\n\ +_08012F2C: .4byte gBattleExecBuffer\n\ +_08012F30: .4byte gBitTable\n\ +_08012F34: .4byte gBattleScriptingCommandsTable\n\ +_08012F38:\n\ + ldr r3, _08012FA0 @ =gBattleExecBuffer\n\ + ldr r1, _08012FA4 @ =gBitTable\n\ + ldr r0, _08012FA8 @ =gActiveBank\n\ + ldrb r4, [r0]\n\ + lsls r0, r4, 2\n\ + adds r0, r1\n\ + ldr r2, [r0]\n\ + lsls r0, r2, 4\n\ + movs r1, 0xF0\n\ + lsls r1, 24\n\ + orrs r0, r1\n\ + orrs r0, r2\n\ + lsls r1, r2, 8\n\ + orrs r0, r1\n\ + lsls r2, 12\n\ + orrs r0, r2\n\ + ldr r3, [r3]\n\ + ands r3, r0\n\ + cmp r3, 0\n\ + bne _08012F66\n\ +_08012F60:\n\ + ldr r0, _08012FAC @ =gBattleCommunication\n\ + adds r0, r4, r0\n\ + strb r3, [r0]\n\ +_08012F66:\n\ + ldr r0, _08012FA8 @ =gActiveBank\n\ + ldrb r1, [r0]\n\ + adds r1, 0x1\n\ + strb r1, [r0]\n\ + ldr r0, _08012FB0 @ =gNoOfAllBanks\n\ + lsls r1, 24\n\ + lsrs r1, 24\n\ +_08012F74:\n\ + adds r2, r0, 0\n\ + ldrb r0, [r2]\n\ + cmp r1, r0\n\ + bcs _08012F80\n\ + bl _0801234C\n\ +_08012F80:\n\ + ldr r0, _08012FAC @ =gBattleCommunication\n\ + ldrb r0, [r0, 0x4]\n\ + ldrb r2, [r2]\n\ + cmp r0, r2\n\ + bne _08012F90\n\ + ldr r1, _08012FB4 @ =gBattleMainFunc\n\ + ldr r0, _08012FB8 @ =sub_80133C8\n\ + str r0, [r1]\n\ +_08012F90:\n\ + add sp, 0x1C\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_08012FA0: .4byte gBattleExecBuffer\n\ +_08012FA4: .4byte gBitTable\n\ +_08012FA8: .4byte gActiveBank\n\ +_08012FAC: .4byte gBattleCommunication\n\ +_08012FB0: .4byte gNoOfAllBanks\n\ +_08012FB4: .4byte gBattleMainFunc\n\ +_08012FB8: .4byte sub_80133C8\n\ + .syntax divided\n"); +} + +void sub_8012FBC(u8 a, u8 b) +{ + int temp; + + temp = gUnknown_02024A76[a]; + gUnknown_02024A76[a] = gUnknown_02024A76[b]; + gUnknown_02024A76[b] = temp; + + temp = gTurnOrder[a]; + gTurnOrder[a] = gTurnOrder[b]; + gTurnOrder[b] = temp; +} + +// Determines which of the two given mons will strike first in a battle. +// Returns: +// 0 = first mon moves first +// 1 = second mon moves first +// 2 = second mon moves first because it won a 50/50 roll +u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities) +{ + int bank1SpeedMultiplier, bank2SpeedMultiplier; + u32 bank1AdjustedSpeed, bank2AdjustedSpeed; + u8 heldItemEffect; + u8 heldItemEffectParam; + u16 bank1Move; + u16 bank2Move; + u8 strikesFirst = 0; + + // Check for abilities that boost speed in weather. + if (WEATHER_HAS_EFFECT) + { + if ((gBattleMons[bank1].ability == ABILITY_SWIFT_SWIM && (gBattleWeather & WEATHER_RAIN_ANY)) + || (gBattleMons[bank1].ability == ABILITY_CHLOROPHYLL && (gBattleWeather & WEATHER_SUN_ANY))) + bank1SpeedMultiplier = 2; + else + bank1SpeedMultiplier = 1; + + if ((gBattleMons[bank2].ability == ABILITY_SWIFT_SWIM && (gBattleWeather & WEATHER_RAIN_ANY)) + || (gBattleMons[bank2].ability == ABILITY_CHLOROPHYLL && (gBattleWeather & WEATHER_SUN_ANY))) + bank2SpeedMultiplier = 2; + else + bank2SpeedMultiplier = 1; + } + else + { + bank1SpeedMultiplier = 1; + bank2SpeedMultiplier = 1; + } + + // Calculate adjusted speed for first mon. + bank1AdjustedSpeed = (gBattleMons[bank1].speed * bank1SpeedMultiplier) + * gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][0] / gStatStageRatios[gBattleMons[bank1].statStages[STAT_STAGE_SPEED]][1]; + + if (gBattleMons[bank1].item == ITEM_ENIGMA_BERRY) + { + heldItemEffect = gEnigmaBerries[bank1].holdEffect; + heldItemEffectParam = gEnigmaBerries[bank1].holdEffectParam; + } + else + { + heldItemEffect = ItemId_GetHoldEffect(gBattleMons[bank1].item); + heldItemEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank1].item); + } + + // Only give badge speed boost to the player's mon. + if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBankSide(bank1) == 0) + bank1AdjustedSpeed = (bank1AdjustedSpeed * 110) / 100; + + if (heldItemEffect == HOLD_EFFECT_MACHO_BRACE) + bank1AdjustedSpeed /= 2; + + if (gBattleMons[bank1].status1 & STATUS_PARALYSIS) + bank1AdjustedSpeed /= 4; + + if (heldItemEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (heldItemEffectParam * 0xFFFF) / 100) + bank1AdjustedSpeed = UINT_MAX; + + // Calculate adjusted speed for second mon. + bank2AdjustedSpeed = gBattleMons[bank2].speed * bank2SpeedMultiplier + * gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][0] / gStatStageRatios[gBattleMons[bank2].statStages[STAT_STAGE_SPEED]][1]; + + if (gBattleMons[bank2].item == ITEM_ENIGMA_BERRY) + { + heldItemEffect = gEnigmaBerries[bank2].holdEffect; + heldItemEffectParam = gEnigmaBerries[bank2].holdEffectParam; + } + else + { + heldItemEffect = ItemId_GetHoldEffect(gBattleMons[bank2].item); + heldItemEffectParam = ItemId_GetHoldEffectParam(gBattleMons[bank2].item); + } + + // Only give badge speed boost to the player's mon. + if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && FlagGet(FLAG_BADGE03_GET) && GetBankSide(bank2) == 0) + { + bank2AdjustedSpeed = (bank2AdjustedSpeed * 110) / 100; + } + + if (heldItemEffect == HOLD_EFFECT_MACHO_BRACE) + bank2AdjustedSpeed /= 2; + + if (gBattleMons[bank2].status1 & STATUS_PARALYSIS) + bank2AdjustedSpeed /= 4; + + if (heldItemEffect == HOLD_EFFECT_QUICK_CLAW && gRandomTurnNumber < (heldItemEffectParam * 0xFFFF) / 100) + bank2AdjustedSpeed = UINT_MAX; + + if (ignoreMovePriorities) + { + bank1Move = MOVE_NONE; + bank2Move = MOVE_NONE; + } + else + { + if (gActionForBanks[bank1] == 0) + { + if (gProtectStructs[bank1].onlyStruggle) + bank1Move = MOVE_STRUGGLE; + else + bank1Move = gBattleMons[bank1].moves[ewram1608Carr(bank1)]; + } + else + bank1Move = MOVE_NONE; + + if (gActionForBanks[bank2] == 0) + { + if (gProtectStructs[bank2].onlyStruggle) + bank2Move = MOVE_STRUGGLE; + else + bank2Move = gBattleMons[bank2].moves[ewram1608Carr(bank2)]; + } + else + bank2Move = MOVE_NONE; + } + + if (gBattleMoves[bank1Move].priority != 0 || gBattleMoves[bank2Move].priority != 0) + { + if (gBattleMoves[bank1Move].priority == gBattleMoves[bank2Move].priority) + { + if (bank1AdjustedSpeed == bank2AdjustedSpeed && (Random() & 1)) + strikesFirst = 2; + else if (bank1AdjustedSpeed < bank2AdjustedSpeed) + strikesFirst = 1; + } + else if (gBattleMoves[bank1Move].priority < gBattleMoves[bank2Move].priority) + strikesFirst = 1; + } + else + { + if (bank1AdjustedSpeed == bank2AdjustedSpeed && (Random() & 1)) + strikesFirst = 2; + else if (bank1AdjustedSpeed < bank2AdjustedSpeed) + strikesFirst = 1; + } + + return strikesFirst; +} diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 1fa7a2ed2..6b892ea7a 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -1275,7 +1275,7 @@ static void BattleAICmd_if_arg_not_equal(void) static void BattleAICmd_if_would_go_first(void) { - if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, 1) == gAIScriptPtr[1]) + if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, TRUE) == gAIScriptPtr[1]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1283,7 +1283,7 @@ static void BattleAICmd_if_would_go_first(void) static void BattleAICmd_if_would_not_go_first(void) { - if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, 1) != gAIScriptPtr[1]) + if (GetWhoStrikesFirst(gBankAttacker, gBankTarget, TRUE) != gAIScriptPtr[1]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; -- cgit v1.2.3 From c0e0004ffabfcb9bc9827bdce28e3c18a6e52922 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 7 Jan 2018 10:59:12 -0800 Subject: Decompile through HandleEndTurn_BattleWon, and update trainer class constant names --- asm/battle_2.s | 1052 ++-------------------- asm/battle_9.s | 38 +- asm/battle_anim_813F0F4.s | 18 +- asm/battle_intro.s | 2 +- asm/dark.s | 2 +- asm/ice.s | 2 +- asm/pokemon_item_effect.s | 4 +- asm/psychic.s | 6 +- constants/trainer_constants.inc | 270 +++--- data-de/trainers.inc | 1388 +++++++++++++++--------------- data/data2a.s | 2 +- data/trainer_money.inc | 108 +-- data/trainers.inc | 1388 +++++++++++++++--------------- include/battle.h | 9 +- include/constants/battle_constants.h | 24 + include/ewram.h | 2 + include/rom_8077ABC.h | 6 +- include/trainer.h | 270 +++--- src/battle/anim/fire_2.c | 4 +- src/battle/battle_2.c | 313 ++++++- src/battle/battle_3.c | 62 +- src/battle/battle_4.c | 124 +-- src/battle/battle_7.c | 10 +- src/battle/battle_ai.c | 2 +- src/battle/battle_anim_80A7E7C.c | 8 +- src/battle/battle_controller_opponent.c | 24 +- src/battle/battle_controller_player.c | 22 +- src/battle/battle_controller_safari.c | 6 +- src/battle/battle_controller_wally.c | 6 +- src/battle/battle_message.c | 16 +- src/battle/battle_party_menu.c | 14 +- src/battle/pokeball.c | 10 +- src/battle/reshow_battle_screen.c | 4 +- src/data/battle_tower/trainers.h | 200 ++--- src/data/battle_tower/trainers_de.h | 200 ++--- src/data/pokemon/trainer_class_lookups.h | 160 ++-- src/de_rom_8040FE0.c | 22 +- src/field/battle_tower.c | 100 +-- src/pokemon/pokemon_2.c | 8 +- src/pokemon/pokemon_data.c | 4 +- src/rom_8077ABC.c | 40 +- sym_ewram.txt | 6 +- 42 files changed, 2671 insertions(+), 3285 deletions(-) diff --git a/asm/battle_2.s b/asm/battle_2.s index edd7fffde..f985f570b 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -5,914 +5,10 @@ .text - thumb_func_start sub_80133C8 -sub_80133C8: @ 80133C8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r3, 0 - ldr r0, _0801341C @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08013434 - ldr r0, _08013420 @ =gActiveBank - strb r3, [r0] - ldr r4, _08013424 @ =gNoOfAllBanks - mov r8, r0 - ldrb r0, [r4] - cmp r3, r0 - bcc _080133F0 - b _08013622 -_080133F0: - ldr r7, _08013428 @ =gUnknown_02024A76 - ldr r6, _0801342C @ =gActionForBanks - mov r2, r8 - ldr r5, _08013430 @ =gTurnOrder -_080133F8: - adds r1, r3, r7 - ldrb r0, [r2] - adds r0, r6 - ldrb r0, [r0] - strb r0, [r1] - adds r1, r3, r5 - ldrb r0, [r2] - strb r0, [r1] - adds r3, 0x1 - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r4] - cmp r0, r1 - bcc _080133F8 - b _08013622 - .align 2, 0 -_0801341C: .4byte gBattleTypeFlags -_08013420: .4byte gActiveBank -_08013424: .4byte gNoOfAllBanks -_08013428: .4byte gUnknown_02024A76 -_0801342C: .4byte gActionForBanks -_08013430: .4byte gTurnOrder -_08013434: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08013484 - ldr r0, _08013478 @ =gActiveBank - strb r3, [r0] - ldr r1, _0801347C @ =gNoOfAllBanks - mov r8, r0 - adds r2, r1, 0 - ldrb r2, [r2] - cmp r3, r2 - bcs _08013494 - ldr r0, _08013480 @ =gActionForBanks - ldrb r1, [r0] - adds r4, r0, 0 - cmp r1, 0x3 - beq _08013492 -_08013456: - mov r7, r8 - ldrb r0, [r7] - adds r0, 0x1 - strb r0, [r7] - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0801347C @ =gNoOfAllBanks - ldrb r1, [r1] - cmp r0, r1 - bcs _08013494 - ldrb r0, [r7] - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0x3 - bne _08013456 - b _08013492 - .align 2, 0 -_08013478: .4byte gActiveBank -_0801347C: .4byte gNoOfAllBanks -_08013480: .4byte gActionForBanks -_08013484: - ldr r0, _080134FC @ =gActionForBanks - ldrb r0, [r0] - ldr r2, _08013500 @ =gActiveBank - mov r8, r2 - cmp r0, 0x3 - bne _08013494 - strb r3, [r2] -_08013492: - movs r3, 0x5 -_08013494: - cmp r3, 0x5 - bne _08013520 - ldr r6, _08013504 @ =gUnknown_02024A76 - ldr r1, _080134FC @ =gActionForBanks - mov r3, r8 - ldrb r0, [r3] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r6] - ldr r2, _08013508 @ =gTurnOrder - ldrb r0, [r3] - strb r0, [r2] - movs r3, 0x1 - movs r5, 0 - adds r4, r1, 0 - ldr r7, _0801350C @ =gBattleMainFunc - mov r9, r7 - ldr r0, _08013510 @ =bc_80154A0 - mov r12, r0 - ldr r1, _08013514 @ =gSharedMem - mov r10, r1 - ldr r7, _08013518 @ =gNoOfAllBanks - ldrb r7, [r7] - cmp r5, r7 - bge _080134EC - adds r7, r6, 0 - adds r6, r4, 0 - adds r4, r2, 0 - ldr r2, _08013518 @ =gNoOfAllBanks -_080134CE: - mov r0, r8 - ldrb r0, [r0] - cmp r5, r0 - beq _080134E4 - adds r1, r3, r7 - adds r0, r5, r6 - ldrb r0, [r0] - strb r0, [r1] - adds r0, r3, r4 - strb r5, [r0] - adds r3, 0x1 -_080134E4: - adds r5, 0x1 - ldrb r1, [r2] - cmp r5, r1 - blt _080134CE -_080134EC: - mov r2, r12 - mov r3, r9 - str r2, [r3] - ldr r1, _0801351C @ =0x0001601d - add r1, r10 - movs r0, 0 - strb r0, [r1] - b _08013632 - .align 2, 0 -_080134FC: .4byte gActionForBanks -_08013500: .4byte gActiveBank -_08013504: .4byte gUnknown_02024A76 -_08013508: .4byte gTurnOrder -_0801350C: .4byte gBattleMainFunc -_08013510: .4byte bc_80154A0 -_08013514: .4byte gSharedMem -_08013518: .4byte gNoOfAllBanks -_0801351C: .4byte 0x0001601d -_08013520: - movs r0, 0 - mov r7, r8 - strb r0, [r7] - ldr r1, _080135B0 @ =gNoOfAllBanks - ldrb r0, [r1] - cmp r0, 0 - beq _08013566 - ldr r6, _080135B4 @ =gActionForBanks - mov r2, r8 - ldr r5, _080135B8 @ =gUnknown_02024A76 - ldr r4, _080135BC @ =gTurnOrder -_08013536: - ldrb r0, [r2] - adds r0, r6 - ldrb r1, [r0] - subs r0, r1, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _08013554 - adds r0, r3, r5 - strb r1, [r0] - adds r1, r3, r4 - mov r7, r8 - ldrb r0, [r7] - strb r0, [r1] - adds r3, 0x1 -_08013554: - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080135B0 @ =gNoOfAllBanks - ldrb r1, [r1] - cmp r0, r1 - bcc _08013536 -_08013566: - movs r0, 0 - mov r2, r8 - strb r0, [r2] - ldr r7, _080135B0 @ =gNoOfAllBanks - ldrb r0, [r7] - cmp r0, 0 - beq _080135AA - ldr r6, _080135B4 @ =gActionForBanks - ldr r5, _080135B8 @ =gUnknown_02024A76 - ldr r4, _080135BC @ =gTurnOrder -_0801357A: - ldrb r0, [r2] - adds r0, r6 - ldrb r1, [r0] - subs r0, r1, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08013598 - adds r0, r3, r5 - strb r1, [r0] - adds r1, r3, r4 - mov r7, r8 - ldrb r0, [r7] - strb r0, [r1] - adds r3, 0x1 -_08013598: - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - lsls r0, 24 - lsrs r0, 24 - ldr r1, _080135B0 @ =gNoOfAllBanks - ldrb r1, [r1] - cmp r0, r1 - bcc _0801357A -_080135AA: - movs r5, 0 - b _08013618 - .align 2, 0 -_080135B0: .4byte gNoOfAllBanks -_080135B4: .4byte gActionForBanks -_080135B8: .4byte gUnknown_02024A76 -_080135BC: .4byte gTurnOrder -_080135C0: - adds r4, r5, 0x1 - adds r7, r4, 0 - ldrb r1, [r1] - cmp r7, r1 - bge _08013616 - ldr r6, _08013640 @ =gUnknown_02024A76 - lsls r2, r5, 24 - mov r8, r2 -_080135D0: - ldr r0, _08013644 @ =gTurnOrder - adds r1, r5, r0 - ldrb r3, [r1] - adds r0, r4, r0 - ldrb r1, [r0] - adds r0, r5, r6 - ldrb r2, [r0] - cmp r2, 0x1 - beq _0801360C - adds r0, r4, r6 - ldrb r0, [r0] - cmp r0, 0x1 - beq _0801360C - cmp r2, 0x2 - beq _0801360C - cmp r0, 0x2 - beq _0801360C - adds r0, r3, 0 - movs r2, 0 - bl GetWhoStrikesFirst - lsls r0, 24 - cmp r0, 0 - beq _0801360C - lsls r1, r4, 24 - lsrs r1, 24 - mov r3, r8 - lsrs r0, r3, 24 - bl sub_8012FBC -_0801360C: - adds r4, 0x1 - ldr r0, _08013648 @ =gNoOfAllBanks - ldrb r0, [r0] - cmp r4, r0 - blt _080135D0 -_08013616: - adds r5, r7, 0 -_08013618: - ldr r1, _08013648 @ =gNoOfAllBanks - ldrb r0, [r1] - subs r0, 0x1 - cmp r5, r0 - blt _080135C0 -_08013622: - ldr r1, _0801364C @ =gBattleMainFunc - ldr r0, _08013650 @ =bc_80154A0 - str r0, [r1] - ldr r0, _08013654 @ =gSharedMem - ldr r7, _08013658 @ =0x0001601d - adds r0, r7 - movs r1, 0 - strb r1, [r0] -_08013632: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08013640: .4byte gUnknown_02024A76 -_08013644: .4byte gTurnOrder -_08013648: .4byte gNoOfAllBanks -_0801364C: .4byte gBattleMainFunc -_08013650: .4byte bc_80154A0 -_08013654: .4byte gSharedMem -_08013658: .4byte 0x0001601d - thumb_func_end sub_80133C8 - - thumb_func_start TurnValuesCleanUp -TurnValuesCleanUp: @ 801365C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r1, _080136B4 @ =gActiveBank - movs r0, 0 - strb r0, [r1] - ldr r0, _080136B8 @ =gNoOfAllBanks - ldrb r2, [r0] - adds r5, r1, 0 - cmp r2, 0 - beq _08013754 - ldr r7, _080136BC @ =gProtectStructs - adds r6, r5, 0 - ldr r0, _080136C0 @ =gUnknown_02024AD0 - mov r12, r0 - ldr r1, _080136C4 @ =gDisableStructs - mov r8, r1 - mov r10, r8 -_0801368A: - mov r2, r9 - cmp r2, 0 - beq _080136C8 - ldrb r1, [r6] - lsls r1, 4 - adds r1, r7 - ldrb r2, [r1] - movs r0, 0x2 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldrb r1, [r6] - lsls r1, 4 - adds r1, r7 - ldrb r2, [r1] - movs r0, 0x3 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - b _08013724 - .align 2, 0 -_080136B4: .4byte gActiveBank -_080136B8: .4byte gNoOfAllBanks -_080136BC: .4byte gProtectStructs -_080136C0: .4byte gUnknown_02024AD0 -_080136C4: .4byte gDisableStructs -_080136C8: - ldrb r0, [r6] - lsls r0, 4 - adds r2, r0, r7 - movs r1, 0 - mov r4, r10 - movs r3, 0 -_080136D4: - adds r0, r2, r1 - strb r3, [r0] - adds r1, 0x1 - cmp r1, 0xF - bls _080136D4 - ldrb r1, [r5] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r1, r0, r4 - ldrb r0, [r1, 0x16] - cmp r0, 0 - beq _080136F2 - subs r0, 0x1 - strb r0, [r1, 0x16] -_080136F2: - ldrb r1, [r5] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r1, r0, r4 - ldrb r0, [r1, 0x19] - cmp r0, 0 - beq _08013724 - subs r0, 0x1 - strb r0, [r1, 0x19] - ldrb r2, [r5] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x19] - cmp r0, 0 - bne _08013724 - movs r0, 0x58 - muls r2, r0 - add r2, r12 - ldr r0, [r2] - ldr r1, _0801376C @ =0xffbfffff - ands r0, r1 - str r0, [r2] -_08013724: - ldrb r2, [r5] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - add r0, r8 - ldrb r0, [r0, 0xA] - cmp r0, 0 - bne _08013742 - movs r0, 0x58 - muls r2, r0 - add r2, r12 - ldr r0, [r2] - ldr r1, _08013770 @ =0xfeffffff - ands r0, r1 - str r0, [r2] -_08013742: - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08013774 @ =gNoOfAllBanks - ldrb r1, [r1] - cmp r0, r1 - bcc _0801368A -_08013754: - movs r0, 0 - ldr r2, _08013778 @ =gSideTimer - strb r0, [r2, 0x8] - strb r0, [r2, 0x14] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0801376C: .4byte 0xffbfffff -_08013770: .4byte 0xfeffffff -_08013774: .4byte gNoOfAllBanks -_08013778: .4byte gSideTimer - thumb_func_end TurnValuesCleanUp - - thumb_func_start SpecialStatusesClear -SpecialStatusesClear: @ 801377C - push {r4-r6,lr} - ldr r2, _080137C0 @ =gActiveBank - movs r0, 0 - strb r0, [r2] - ldr r0, _080137C4 @ =gNoOfAllBanks - ldrb r1, [r0] - adds r6, r0, 0 - cmp r1, 0 - beq _080137BA - adds r3, r2, 0 - movs r4, 0 - ldr r5, _080137C8 @ =gSpecialStatuses -_08013794: - ldrb r1, [r3] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, r0, r5 - movs r1, 0 -_080137A0: - adds r0, r2, r1 - strb r4, [r0] - adds r1, 0x1 - cmp r1, 0x13 - bls _080137A0 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6] - cmp r0, r1 - bcc _08013794 -_080137BA: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080137C0: .4byte gActiveBank -_080137C4: .4byte gNoOfAllBanks -_080137C8: .4byte gSpecialStatuses - thumb_func_end SpecialStatusesClear - - thumb_func_start bc_80154A0 -bc_80154A0: @ 80137CC - push {r4-r7,lr} - ldr r0, _08013850 @ =gHitMarker - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 8 - ands r0, r1 - cmp r0, 0 - bne _08013884 - ldr r0, _08013854 @ =gSharedMem - ldr r1, _08013858 @ =0x0001601d - adds r2, r0, r1 - ldr r0, _0801385C @ =gNoOfAllBanks - ldrb r1, [r2] - adds r7, r0, 0 - ldrb r0, [r7] - cmp r1, r0 - bcs _08013884 - ldr r6, _08013860 @ =gActiveBank - ldr r5, _08013864 @ =gBankAttacker - adds r4, r2, 0 - movs r1, 0x84 - lsls r1, 1 - mov r12, r1 -_080137FA: - ldrb r0, [r4] - strb r0, [r5] - strb r0, [r6] - adds r0, 0x1 - strb r0, [r4] - ldr r1, _08013868 @ =gChosenMovesByBanks - ldrb r3, [r6] - lsls r0, r3, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r12 - bne _0801387C - ldr r1, _0801386C @ =gBattleMons - movs r0, 0x58 - muls r0, r3 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - bne _0801387C - ldr r2, _08013870 @ =gDisableStructs - ldrb r1, [r5] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x18] - lsls r0, 31 - cmp r0, 0 - bne _0801387C - ldr r0, _08013874 @ =gProtectStructs - lsls r1, r3, 4 - adds r1, r0 - ldrb r0, [r1] - lsls r0, 29 - cmp r0, 0 - blt _0801387C - ldr r0, _08013878 @ =BattleScript_FocusPunchSetUp - bl b_call_bc_move_exec - b _080138BE - .align 2, 0 -_08013850: .4byte gHitMarker -_08013854: .4byte gSharedMem -_08013858: .4byte 0x0001601d -_0801385C: .4byte gNoOfAllBanks -_08013860: .4byte gActiveBank -_08013864: .4byte gBankAttacker -_08013868: .4byte gChosenMovesByBanks -_0801386C: .4byte gBattleMons -_08013870: .4byte gDisableStructs -_08013874: .4byte gProtectStructs -_08013878: .4byte BattleScript_FocusPunchSetUp -_0801387C: - ldrb r0, [r4] - ldrb r2, [r7] - cmp r0, r2 - bcc _080137FA -_08013884: - bl b_clear_atk_up_if_hit_flag_unless_enraged - ldr r1, _080138C4 @ =gCurrentMoveTurn - movs r0, 0 - strb r0, [r1] - ldr r1, _080138C8 @ =gFightStateTracker - ldr r0, _080138CC @ =gUnknown_02024A76 - movs r2, 0 - ldrb r0, [r0] - strb r0, [r1] - ldr r0, _080138D0 @ =gDynamicBasePower - movs r3, 0 - strh r2, [r0] - ldr r1, _080138D4 @ =gSharedMem - ldr r2, _080138D8 @ =0x0001601c - adds r0, r1, r2 - strb r3, [r0] - ldr r2, _080138DC @ =gBattleMainFunc - ldr r0, _080138E0 @ =sub_80138F0 - str r0, [r2] - ldr r0, _080138E4 @ =gBattleCommunication - strb r3, [r0, 0x3] - strb r3, [r0, 0x4] - ldr r2, _080138E8 @ =0x00016112 - adds r0, r1, r2 - strb r3, [r0] - ldr r0, _080138EC @ =0x00017130 - adds r1, r0 - strb r3, [r1] -_080138BE: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080138C4: .4byte gCurrentMoveTurn -_080138C8: .4byte gFightStateTracker -_080138CC: .4byte gUnknown_02024A76 -_080138D0: .4byte gDynamicBasePower -_080138D4: .4byte gSharedMem -_080138D8: .4byte 0x0001601c -_080138DC: .4byte gBattleMainFunc -_080138E0: .4byte sub_80138F0 -_080138E4: .4byte gBattleCommunication -_080138E8: .4byte 0x00016112 -_080138EC: .4byte 0x00017130 - thumb_func_end bc_80154A0 - - thumb_func_start sub_80138F0 -sub_80138F0: @ 80138F0 - push {r4-r6,lr} - ldr r6, _08013944 @ =gBattleOutcome - ldrb r0, [r6] - ldr r2, _08013948 @ =gFightStateTracker - cmp r0, 0 - beq _08013900 - movs r0, 0xC - strb r0, [r2] -_08013900: - ldr r1, _0801394C @ =gSharedMem - ldr r4, _08013950 @ =gCurrentMoveTurn - ldrb r0, [r4] - ldr r3, _08013954 @ =0x00016057 - adds r5, r1, r3 - strb r0, [r5] - ldr r1, _08013958 @ =gUnknown_081FA640 - ldrb r0, [r2] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - ldr r0, _0801395C @ =gNoOfAllBanks - ldrb r1, [r4] - ldrb r0, [r0] - cmp r1, r0 - bcc _08013970 - ldr r2, _08013960 @ =gHitMarker - ldr r0, [r2] - ldr r1, _08013964 @ =0xffefffff - ands r0, r1 - str r0, [r2] - ldr r3, _08013968 @ =gBattleMainFunc - ldr r2, _0801396C @ =gUnknown_081FA678 - ldrb r1, [r6] - movs r0, 0x7F - ands r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r0, [r0] - str r0, [r3] - b _08013984 - .align 2, 0 -_08013944: .4byte gBattleOutcome -_08013948: .4byte gFightStateTracker -_0801394C: .4byte gSharedMem -_08013950: .4byte gCurrentMoveTurn -_08013954: .4byte 0x00016057 -_08013958: .4byte gUnknown_081FA640 -_0801395C: .4byte gNoOfAllBanks -_08013960: .4byte gHitMarker -_08013964: .4byte 0xffefffff -_08013968: .4byte gBattleMainFunc -_0801396C: .4byte gUnknown_081FA678 -_08013970: - ldrb r0, [r5] - cmp r0, r1 - beq _08013984 - ldr r2, _0801398C @ =gHitMarker - ldr r0, [r2] - ldr r1, _08013990 @ =0xfffffdff - ands r0, r1 - ldr r1, _08013994 @ =0xfff7ffff - ands r0, r1 - str r0, [r2] -_08013984: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0801398C: .4byte gHitMarker -_08013990: .4byte 0xfffffdff -_08013994: .4byte 0xfff7ffff - thumb_func_end sub_80138F0 - - thumb_func_start sub_8013998 -sub_8013998: @ 8013998 - push {r4,lr} - ldr r1, _080139D0 @ =gFightStateTracker - movs r0, 0 - strb r0, [r1] - ldr r0, _080139D4 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080139EC - ldr r1, _080139D8 @ =gBattleTextBuff1 - ldr r4, _080139DC @ =gBattleOutcome - ldrb r0, [r4] - strb r0, [r1] - movs r0, 0 - bl GetBankByPlayerAI - ldr r1, _080139E0 @ =gBankAttacker - strb r0, [r1] - ldr r1, _080139E4 @ =gBattlescriptCurrInstr - ldr r0, _080139E8 @ =gUnknown_081D8E02 - str r0, [r1] - ldrb r1, [r4] - movs r0, 0x7F - ands r0, r1 - strb r0, [r4] - b _08013B48 - .align 2, 0 -_080139D0: .4byte gFightStateTracker -_080139D4: .4byte gBattleTypeFlags -_080139D8: .4byte gBattleTextBuff1 -_080139DC: .4byte gBattleOutcome -_080139E0: .4byte gBankAttacker -_080139E4: .4byte gBattlescriptCurrInstr -_080139E8: .4byte gUnknown_081D8E02 -_080139EC: - movs r0, 0x90 - lsls r0, 4 - ands r0, r1 - cmp r0, 0 - beq _08013A04 - ldr r1, _080139FC @ =gBattlescriptCurrInstr - ldr r0, _08013A00 @ =gUnknown_081D8E0D - b _08013B46 - .align 2, 0 -_080139FC: .4byte gBattlescriptCurrInstr -_08013A00: .4byte gUnknown_081D8E0D -_08013A04: - movs r0, 0xA - ands r0, r1 - cmp r0, 0x8 - beq _08013A0E - b _08013B42 -_08013A0E: - bl BattleMusicStop - ldr r1, _08013A3C @ =gBattlescriptCurrInstr - ldr r0, _08013A40 @ =BattleScript_LocalTrainerBattleWon - str r0, [r1] - ldr r2, _08013A44 @ =gTrainers - ldr r0, _08013A48 @ =gTrainerBattleOpponent - ldrh r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x1] - subs r0, 0x2 - cmp r0, 0x31 - bls _08013A30 - b _08013B38 -_08013A30: - lsls r0, 2 - ldr r1, _08013A4C @ =_08013A50 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08013A3C: .4byte gBattlescriptCurrInstr -_08013A40: .4byte BattleScript_LocalTrainerBattleWon -_08013A44: .4byte gTrainers -_08013A48: .4byte gTrainerBattleOpponent -_08013A4C: .4byte _08013A50 - .align 2, 0 -_08013A50: - .4byte _08013B24 - .4byte _08013B24 - .4byte _08013B24 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B18 - .4byte _08013B2E - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B18 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B38 - .4byte _08013B24 - .4byte _08013B24 - .4byte _08013B24 -_08013B18: - ldr r0, _08013B20 @ =0x00000163 - bl PlayBGM - b _08013B48 - .align 2, 0 -_08013B20: .4byte 0x00000163 -_08013B24: - movs r0, 0xD4 - lsls r0, 1 - bl PlayBGM - b _08013B48 -_08013B2E: - movs r0, 0xB1 - lsls r0, 1 - bl PlayBGM - b _08013B48 -_08013B38: - movs r0, 0xCE - lsls r0, 1 - bl PlayBGM - b _08013B48 -_08013B42: - ldr r1, _08013B54 @ =gBattlescriptCurrInstr - ldr r0, _08013B58 @ =BattleScript_PayDayMoneyAndPickUpItems -_08013B46: - str r0, [r1] -_08013B48: - ldr r1, _08013B5C @ =gBattleMainFunc - ldr r0, _08013B60 @ =sub_8013C9C - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08013B54: .4byte gBattlescriptCurrInstr -_08013B58: .4byte BattleScript_PayDayMoneyAndPickUpItems -_08013B5C: .4byte gBattleMainFunc -_08013B60: .4byte sub_8013C9C - thumb_func_end sub_8013998 - thumb_func_start sub_8013B64 sub_8013B64: @ 8013B64 push {r4,lr} - ldr r1, _08013B9C @ =gFightStateTracker + ldr r1, _08013B9C @ =gCurrentActionFuncId movs r0, 0 strb r0, [r1] ldr r0, _08013BA0 @ =gBattleTypeFlags @@ -926,7 +22,7 @@ sub_8013B64: @ 8013B64 ldrb r0, [r4] strb r0, [r1] movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _08013BAC @ =gBankAttacker strb r0, [r1] ldr r1, _08013BB0 @ =gBattlescriptCurrInstr @@ -938,7 +34,7 @@ sub_8013B64: @ 8013B64 strb r0, [r4] b _08013BBE .align 2, 0 -_08013B9C: .4byte gFightStateTracker +_08013B9C: .4byte gCurrentActionFuncId _08013BA0: .4byte gBattleTypeFlags _08013BA4: .4byte gBattleTextBuff1 _08013BA8: .4byte gBattleOutcome @@ -966,7 +62,7 @@ _08013BD8: .4byte sub_8013C9C thumb_func_start sub_8013BDC sub_8013BDC: @ 8013BDC push {lr} - ldr r1, _08013C04 @ =gFightStateTracker + ldr r1, _08013C04 @ =gCurrentActionFuncId movs r0, 0 strb r0, [r1] ldr r1, _08013C08 @ =gProtectStructs @@ -985,7 +81,7 @@ sub_8013BDC: @ 8013BDC ldr r0, _08013C14 @ =BattleScript_GotAwaySafely b _08013C2C .align 2, 0 -_08013C04: .4byte gFightStateTracker +_08013C04: .4byte gCurrentActionFuncId _08013C08: .4byte gProtectStructs _08013C0C: .4byte gBankAttacker _08013C10: .4byte gBattlescriptCurrInstr @@ -1016,7 +112,7 @@ _08013C44: .4byte sub_8013C9C thumb_func_start sub_8013C48 sub_8013C48: @ 8013C48 - ldr r1, _08013C7C @ =gFightStateTracker + ldr r1, _08013C7C @ =gCurrentActionFuncId movs r0, 0 strb r0, [r1] ldr r1, _08013C80 @ =gBattleTextBuff1 @@ -1043,7 +139,7 @@ sub_8013C48: @ 8013C48 str r0, [r1] bx lr .align 2, 0 -_08013C7C: .4byte gFightStateTracker +_08013C7C: .4byte gCurrentActionFuncId _08013C80: .4byte gBattleTextBuff1 _08013C84: .4byte gBankAttacker _08013C88: .4byte gBattlePartyID @@ -1056,7 +152,7 @@ _08013C98: .4byte sub_8013C9C thumb_func_start sub_8013C9C sub_8013C9C: @ 8013C9C push {r4-r7,lr} - ldr r0, _08013D00 @ =gFightStateTracker + ldr r0, _08013D00 @ =gCurrentActionFuncId ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -1104,7 +200,7 @@ _08013CCE: bl StringCopy b _08013D36 .align 2, 0 -_08013D00: .4byte gFightStateTracker +_08013D00: .4byte gCurrentActionFuncId _08013D04: .4byte gBattleTypeFlags _08013D08: .4byte 0x00000b92 _08013D0C: .4byte gActiveBank @@ -1391,7 +487,7 @@ _08013F50: .4byte gEnemyParty thumb_func_start sub_8013F54 sub_8013F54: @ 8013F54 push {lr} - ldr r0, _08013F84 @ =gFightStateTracker + ldr r0, _08013F84 @ =gCurrentActionFuncId ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -1415,7 +511,7 @@ _08013F74: str r1, [r0] b _08013FAA .align 2, 0 -_08013F84: .4byte gFightStateTracker +_08013F84: .4byte gCurrentActionFuncId _08013F88: .4byte gSharedMem + 0x17140 _08013F8C: .4byte gBattleMainFunc _08013F90: @@ -1476,7 +572,7 @@ sub_8013FE8: @ 8013FE8 str r0, [sp] ldr r7, _08014028 @ =gBankAttacker ldr r1, _0801402C @ =gTurnOrder - ldr r0, _08014030 @ =gCurrentMoveTurn + ldr r0, _08014030 @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -1494,17 +590,17 @@ sub_8013FE8: @ 8013FE8 ands r2, r0 cmp r2, 0 beq _08014044 - ldr r1, _08014040 @ =gFightStateTracker + ldr r1, _08014040 @ =gCurrentActionFuncId movs r0, 0xC b _080146CC .align 2, 0 _08014028: .4byte gBankAttacker _0801402C: .4byte gTurnOrder -_08014030: .4byte gCurrentMoveTurn +_08014030: .4byte gCurrentTurnActionNumber _08014034: .4byte gSharedMem _08014038: .4byte 0x000160a6 _0801403C: .4byte gBitTable -_08014040: .4byte gFightStateTracker +_08014040: .4byte gCurrentActionFuncId _08014044: ldr r1, _080140B8 @ =gCritMultiplier movs r0, 0x1 @@ -1791,7 +887,7 @@ _080142B0: eors r0, r1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08014320 @ =gSideTimer + ldr r1, _08014320 @ =gSideTimers lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -1834,7 +930,7 @@ _080142B0: _08014314: .4byte gBattleResults _08014318: .4byte gCurrentMove _0801431C: .4byte gBankAttacker -_08014320: .4byte gSideTimer +_08014320: .4byte gSideTimers _08014324: .4byte gBattleMoves _08014328: .4byte gBattleMons _0801432C: .4byte gBankTarget @@ -1849,7 +945,7 @@ _08014330: bne _08014342 b _0801461C _08014342: - ldr r1, _0801445C @ =gSideTimer + ldr r1, _0801445C @ =gSideTimers lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -1991,7 +1087,7 @@ _0801441E: .align 2, 0 _08014454: .4byte gBattleTypeFlags _08014458: .4byte gBankAttacker -_0801445C: .4byte gSideTimer +_0801445C: .4byte gSideTimers _08014460: .4byte gBattleMoves _08014464: .4byte gCurrentMove _08014468: .4byte gBattleMons @@ -2014,7 +1110,7 @@ _08014484: _08014494: movs r0, 0x2 _08014496: - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _080144A0 @ =gBankTarget strb r0, [r1] b _080144B6 @@ -2071,7 +1167,7 @@ _08014504: eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity strb r0, [r5] ldrb r1, [r7] ldrb r2, [r5] @@ -2162,7 +1258,7 @@ _080145C0: _080145D0: movs r0, 0x2 _080145D2: - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _0801460C @ =gBankTarget strb r0, [r1] ldr r0, _08014610 @ =gAbsentBankFlags @@ -2239,7 +1335,7 @@ _08014674: eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity strb r0, [r5] ldrb r1, [r6] ldrb r2, [r5] @@ -2257,7 +1353,7 @@ _0801469A: eors r0, r1 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity strb r0, [r5] _080146AC: ldr r4, _080146E0 @ =gBattlescriptCurrInstr @@ -2274,7 +1370,7 @@ _080146AC: adds r0, r3 ldr r0, [r0] str r0, [r4] - ldr r1, _080146F0 @ =gFightStateTracker + ldr r1, _080146F0 @ =gCurrentActionFuncId movs r0, 0xA _080146CC: strb r0, [r1] @@ -2291,7 +1387,7 @@ _080146E0: .4byte gBattlescriptCurrInstr _080146E4: .4byte gBattleScriptsForMoveEffects _080146E8: .4byte gBattleMoves _080146EC: .4byte gCurrentMove -_080146F0: .4byte gFightStateTracker +_080146F0: .4byte gCurrentActionFuncId thumb_func_end sub_8013FE8 thumb_func_start sub_80146F4 @@ -2299,7 +1395,7 @@ sub_80146F4: @ 80146F4 push {r4,lr} ldr r3, _08014764 @ =gBankAttacker ldr r1, _08014768 @ =gTurnOrder - ldr r0, _0801476C @ =gCurrentMoveTurn + ldr r0, _0801476C @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -2339,7 +1435,7 @@ sub_80146F4: @ 80146F4 ldr r1, _08014790 @ =gBattlescriptCurrInstr ldr r0, _08014794 @ =BattleScript_ActionSwitch str r0, [r1] - ldr r1, _08014798 @ =gFightStateTracker + ldr r1, _08014798 @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] ldr r1, _0801479C @ =gBattleResults @@ -2355,7 +1451,7 @@ _0801475C: .align 2, 0 _08014764: .4byte gBankAttacker _08014768: .4byte gTurnOrder -_0801476C: .4byte gCurrentMoveTurn +_0801476C: .4byte gCurrentTurnActionNumber _08014770: .4byte gUnknown_030042A4 _08014774: .4byte gUnknown_030042A0 _08014778: .4byte gActionSelectionCursor @@ -2366,7 +1462,7 @@ _08014788: .4byte 0x00016064 _0801478C: .4byte 0x00016003 _08014790: .4byte gBattlescriptCurrInstr _08014794: .4byte BattleScript_ActionSwitch -_08014798: .4byte gFightStateTracker +_08014798: .4byte gCurrentActionFuncId _0801479C: .4byte gBattleResults thumb_func_end sub_80146F4 @@ -2380,7 +1476,7 @@ sub_80147A0: @ 80147A0 ldr r4, _08014804 @ =gBankAttacker ldr r2, _08014808 @ =gBankTarget ldr r1, _0801480C @ =gTurnOrder - ldr r0, _08014810 @ =gCurrentMoveTurn + ldr r0, _08014810 @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -2425,7 +1521,7 @@ sub_80147A0: @ 80147A0 _08014804: .4byte gBankAttacker _08014808: .4byte gBankTarget _0801480C: .4byte gTurnOrder -_08014810: .4byte gCurrentMoveTurn +_08014810: .4byte gCurrentTurnActionNumber _08014814: .4byte gUnknown_030042A4 _08014818: .4byte gUnknown_030042A0 _0801481C: .4byte gDisableStructs @@ -2718,7 +1814,7 @@ _08014A74: str r0, [r1] _08014A8C: movs r0, 0xA - ldr r2, _08014AB4 @ =gFightStateTracker + ldr r2, _08014AB4 @ =gCurrentActionFuncId strb r0, [r2] pop {r3-r5} mov r8, r3 @@ -2733,7 +1829,7 @@ _08014AA4: .4byte gBankAttacker _08014AA8: .4byte gBattlescriptCurrInstr _08014AAC: .4byte gBattlescriptsForUsingItem _08014AB0: .4byte 0x000160d8 -_08014AB4: .4byte gFightStateTracker +_08014AB4: .4byte gCurrentActionFuncId thumb_func_end sub_80147A0 thumb_func_start sub_8014AB8 @@ -2871,7 +1967,7 @@ _08014BB6: _08014BC2: cmp r5, 0 beq _08014BD4 - ldr r1, _08014BE8 @ =gCurrentMoveTurn + ldr r1, _08014BE8 @ =gCurrentTurnActionNumber ldr r0, _08014BEC @ =gNoOfAllBanks ldrb r0, [r0] strb r0, [r1] @@ -2887,7 +1983,7 @@ _08014BD4: _08014BDC: .4byte gBattleTypeFlags _08014BE0: .4byte gSharedMem _08014BE4: .4byte 0x00016078 -_08014BE8: .4byte gCurrentMoveTurn +_08014BE8: .4byte gCurrentTurnActionNumber _08014BEC: .4byte gNoOfAllBanks _08014BF0: .4byte gBattleOutcome thumb_func_end sub_8014AB8 @@ -2897,7 +1993,7 @@ sub_8014BF4: @ 8014BF4 push {r4-r6,lr} ldr r4, _08014C44 @ =gBankAttacker ldr r1, _08014C48 @ =gTurnOrder - ldr r5, _08014C4C @ =gCurrentMoveTurn + ldr r5, _08014C4C @ =gCurrentTurnActionNumber ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -2937,7 +2033,7 @@ _08014C28: .align 2, 0 _08014C44: .4byte gBankAttacker _08014C48: .4byte gTurnOrder -_08014C4C: .4byte gCurrentMoveTurn +_08014C4C: .4byte gCurrentTurnActionNumber _08014C50: .4byte gBattleTypeFlags _08014C54: .4byte gNoOfAllBanks _08014C58: .4byte gActiveBank @@ -3001,7 +2097,7 @@ _08014C9C: ldr r1, _08014CE8 @ =gBattlescriptCurrInstr ldr r0, _08014CEC @ =BattleScript_PrintFailedToRunString str r0, [r1] - ldr r1, _08014CF0 @ =gFightStateTracker + ldr r1, _08014CF0 @ =gCurrentActionFuncId movs r0, 0xA b _08014D3E .align 2, 0 @@ -3010,7 +2106,7 @@ _08014CE0: .4byte 0xfdffffff _08014CE4: .4byte gBattleCommunication _08014CE8: .4byte gBattlescriptCurrInstr _08014CEC: .4byte BattleScript_PrintFailedToRunString -_08014CF0: .4byte gFightStateTracker +_08014CF0: .4byte gCurrentActionFuncId _08014CF4: ldr r1, _08014D1C @ =gBattleMons ldrb r2, [r4] @@ -3029,7 +2125,7 @@ _08014CF4: ldr r1, _08014D28 @ =gBattlescriptCurrInstr ldr r0, _08014D2C @ =BattleScript_PrintFailedToRunString str r0, [r1] - ldr r1, _08014D30 @ =gFightStateTracker + ldr r1, _08014D30 @ =gCurrentActionFuncId movs r0, 0xA b _08014D3E .align 2, 0 @@ -3038,7 +2134,7 @@ _08014D20: .4byte 0x0400e000 _08014D24: .4byte gBattleCommunication _08014D28: .4byte gBattlescriptCurrInstr _08014D2C: .4byte BattleScript_PrintFailedToRunString -_08014D30: .4byte gFightStateTracker +_08014D30: .4byte gCurrentActionFuncId _08014D34: ldr r0, _08014D48 @ =gNoOfAllBanks ldrb r0, [r0] @@ -3060,7 +2156,7 @@ _08014D4C: .4byte gBattleOutcome sub_8014D50: @ 8014D50 ldr r2, _08014D78 @ =gBankAttacker ldr r1, _08014D7C @ =gTurnOrder - ldr r0, _08014D80 @ =gCurrentMoveTurn + ldr r0, _08014D80 @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -3074,26 +2170,26 @@ sub_8014D50: @ 8014D50 ldr r0, _08014D90 @ =gBattlescriptsForSafariActions ldr r0, [r0] str r0, [r1] - ldr r1, _08014D94 @ =gFightStateTracker + ldr r1, _08014D94 @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] bx lr .align 2, 0 _08014D78: .4byte gBankAttacker _08014D7C: .4byte gTurnOrder -_08014D80: .4byte gCurrentMoveTurn +_08014D80: .4byte gCurrentTurnActionNumber _08014D84: .4byte gUnknown_030042A4 _08014D88: .4byte gUnknown_030042A0 _08014D8C: .4byte gBattlescriptCurrInstr _08014D90: .4byte gBattlescriptsForSafariActions -_08014D94: .4byte gFightStateTracker +_08014D94: .4byte gCurrentActionFuncId thumb_func_end sub_8014D50 thumb_func_start sub_8014D98 sub_8014D98: @ 8014D98 ldr r2, _08014DD0 @ =gBankAttacker ldr r1, _08014DD4 @ =gTurnOrder - ldr r0, _08014DD8 @ =gCurrentMoveTurn + ldr r0, _08014DD8 @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -3114,21 +2210,21 @@ sub_8014D98: @ 8014D98 ldr r0, _08014DF0 @ =gBattlescriptsForBallThrow ldr r0, [r0, 0x14] str r0, [r1] - ldr r1, _08014DF4 @ =gFightStateTracker + ldr r1, _08014DF4 @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] bx lr .align 2, 0 _08014DD0: .4byte gBankAttacker _08014DD4: .4byte gTurnOrder -_08014DD8: .4byte gCurrentMoveTurn +_08014DD8: .4byte gCurrentTurnActionNumber _08014DDC: .4byte gUnknown_030042A4 _08014DE0: .4byte gUnknown_030042A0 _08014DE4: .4byte gNumSafariBalls _08014DE8: .4byte gLastUsedItem _08014DEC: .4byte gBattlescriptCurrInstr _08014DF0: .4byte gBattlescriptsForBallThrow -_08014DF4: .4byte gFightStateTracker +_08014DF4: .4byte gCurrentActionFuncId thumb_func_end sub_8014D98 thumb_func_start sub_8014DF8 @@ -3136,7 +2232,7 @@ sub_8014DF8: @ 8014DF8 push {r4-r6,lr} ldr r3, _08014E68 @ =gBankAttacker ldr r1, _08014E6C @ =gTurnOrder - ldr r0, _08014E70 @ =gCurrentMoveTurn + ldr r0, _08014E70 @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -3192,7 +2288,7 @@ _08014E42: .align 2, 0 _08014E68: .4byte gBankAttacker _08014E6C: .4byte gTurnOrder -_08014E70: .4byte gCurrentMoveTurn +_08014E70: .4byte gCurrentTurnActionNumber _08014E74: .4byte gUnknown_030042A4 _08014E78: .4byte gUnknown_030042A0 _08014E7C: .4byte gBattleCommunication @@ -3211,7 +2307,7 @@ _08014E9C: ldr r0, _08014EB4 @ =gBattlescriptsForSafariActions ldr r0, [r0, 0x8] str r0, [r1] - ldr r1, _08014EB8 @ =gFightStateTracker + ldr r1, _08014EB8 @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] pop {r4-r6} @@ -3220,7 +2316,7 @@ _08014E9C: .align 2, 0 _08014EB0: .4byte gBattlescriptCurrInstr _08014EB4: .4byte gBattlescriptsForSafariActions -_08014EB8: .4byte gFightStateTracker +_08014EB8: .4byte gCurrentActionFuncId thumb_func_end sub_8014DF8 thumb_func_start sub_8014EBC @@ -3228,7 +2324,7 @@ sub_8014EBC: @ 8014EBC push {r4,r5,lr} ldr r2, _08014F28 @ =gBankAttacker ldr r1, _08014F2C @ =gTurnOrder - ldr r0, _08014F30 @ =gCurrentMoveTurn + ldr r0, _08014F30 @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -3284,7 +2380,7 @@ _08014F18: .align 2, 0 _08014F28: .4byte gBankAttacker _08014F2C: .4byte gTurnOrder -_08014F30: .4byte gCurrentMoveTurn +_08014F30: .4byte gCurrentTurnActionNumber _08014F34: .4byte gUnknown_030042A4 _08014F38: .4byte gUnknown_030042A0 _08014F3C: .4byte gSharedMem @@ -3302,7 +2398,7 @@ _08014F5A: ldr r0, _08014F78 @ =gBattlescriptsForSafariActions ldr r0, [r0, 0x4] str r0, [r1] - ldr r1, _08014F7C @ =gFightStateTracker + ldr r1, _08014F7C @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] pop {r4,r5} @@ -3312,7 +2408,7 @@ _08014F5A: _08014F70: .4byte gBattleCommunication _08014F74: .4byte gBattlescriptCurrInstr _08014F78: .4byte gBattlescriptsForSafariActions -_08014F7C: .4byte gFightStateTracker +_08014F7C: .4byte gCurrentActionFuncId thumb_func_end sub_8014EBC thumb_func_start bs8_exit_by_flight @@ -3320,7 +2416,7 @@ bs8_exit_by_flight: @ 8014F80 push {r4,lr} ldr r2, _08014FA8 @ =gBankAttacker ldr r1, _08014FAC @ =gTurnOrder - ldr r4, _08014FB0 @ =gCurrentMoveTurn + ldr r4, _08014FB0 @ =gCurrentTurnActionNumber ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -3339,7 +2435,7 @@ bs8_exit_by_flight: @ 8014F80 .align 2, 0 _08014FA8: .4byte gBankAttacker _08014FAC: .4byte gTurnOrder -_08014FB0: .4byte gCurrentMoveTurn +_08014FB0: .4byte gCurrentTurnActionNumber _08014FB4: .4byte gNoOfAllBanks _08014FB8: .4byte gBattleOutcome thumb_func_end bs8_exit_by_flight @@ -3348,7 +2444,7 @@ _08014FB8: .4byte gBattleOutcome sub_8014FBC: @ 8014FBC ldr r3, _08015008 @ =gBankAttacker ldr r1, _0801500C @ =gTurnOrder - ldr r0, _08015010 @ =gCurrentMoveTurn + ldr r0, _08015010 @ =gCurrentTurnActionNumber ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -3376,7 +2472,7 @@ sub_8014FBC: @ 8014FBC ldr r0, _08015028 @ =gBattlescriptsForSafariActions ldr r0, [r0, 0xC] str r0, [r1] - ldr r1, _0801502C @ =gFightStateTracker + ldr r1, _0801502C @ =gCurrentActionFuncId movs r0, 0xA strb r0, [r1] ldr r1, _08015030 @ =gUnknown_02024A76 @@ -3386,14 +2482,14 @@ sub_8014FBC: @ 8014FBC .align 2, 0 _08015008: .4byte gBankAttacker _0801500C: .4byte gTurnOrder -_08015010: .4byte gCurrentMoveTurn +_08015010: .4byte gCurrentTurnActionNumber _08015014: .4byte gUnknown_030042A4 _08015018: .4byte gUnknown_030042A0 _0801501C: .4byte gBattleTextBuff1 _08015020: .4byte gBattlePartyID _08015024: .4byte gBattlescriptCurrInstr _08015028: .4byte gBattlescriptsForSafariActions -_0801502C: .4byte gFightStateTracker +_0801502C: .4byte gCurrentActionFuncId _08015030: .4byte gUnknown_02024A76 thumb_func_end sub_8014FBC @@ -3409,7 +2505,7 @@ bsB_exit_by_move: @ 8015034 ldr r2, _08015058 @ =0x00016059 adds r0, r2 strb r1, [r0] - ldr r1, _0801505C @ =gFightStateTracker + ldr r1, _0801505C @ =gCurrentActionFuncId movs r0, 0xC strb r0, [r1] _08015050: @@ -3418,16 +2514,16 @@ _08015050: .align 2, 0 _08015054: .4byte gSharedMem _08015058: .4byte 0x00016059 -_0801505C: .4byte gFightStateTracker +_0801505C: .4byte gCurrentActionFuncId thumb_func_end bsB_exit_by_move thumb_func_start sub_8015060 sub_8015060: @ 8015060 - ldr r1, _08015080 @ =gCurrentMoveTurn + ldr r1, _08015080 @ =gCurrentTurnActionNumber ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, _08015084 @ =gFightStateTracker + ldr r3, _08015084 @ =gCurrentActionFuncId ldr r2, _08015088 @ =gUnknown_02024A76 ldrb r0, [r1] adds r0, r2 @@ -3440,8 +2536,8 @@ sub_8015060: @ 8015060 str r0, [r2] bx lr .align 2, 0 -_08015080: .4byte gCurrentMoveTurn -_08015084: .4byte gFightStateTracker +_08015080: .4byte gCurrentTurnActionNumber +_08015084: .4byte gCurrentActionFuncId _08015088: .4byte gUnknown_02024A76 _0801508C: .4byte gHitMarker _08015090: .4byte 0xf1e892af @@ -3450,11 +2546,11 @@ _08015090: .4byte 0xf1e892af thumb_func_start bsC_8016D70 bsC_8016D70: @ 8015094 push {r4,r5,lr} - ldr r1, _0801510C @ =gCurrentMoveTurn + ldr r1, _0801510C @ =gCurrentTurnActionNumber ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, _08015110 @ =gFightStateTracker + ldr r3, _08015110 @ =gCurrentActionFuncId ldr r2, _08015114 @ =gUnknown_02024A76 ldrb r0, [r1] adds r0, r2 @@ -3509,8 +2605,8 @@ bsC_8016D70: @ 8015094 pop {r0} bx r0 .align 2, 0 -_0801510C: .4byte gCurrentMoveTurn -_08015110: .4byte gFightStateTracker +_0801510C: .4byte gCurrentTurnActionNumber +_08015110: .4byte gCurrentActionFuncId _08015114: .4byte gUnknown_02024A76 _08015118: .4byte gHitMarker _0801511C: .4byte 0xf1e892af diff --git a/asm/battle_9.s b/asm/battle_9.s index dce32d076..b86914ca6 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -95,7 +95,7 @@ _0803609C: .4byte 0x000160c8 _080360A0: ldr r4, _080361D8 @ =gBattleMons movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 movs r1, 0x58 @@ -108,7 +108,7 @@ _080360A0: b _080361C8 _080360BC: movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r2, r0, 24 movs r6, 0 @@ -187,7 +187,7 @@ _08036110: movs r1, 0x2E bl GetMonData movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r2, r0, 24 movs r4, 0 @@ -312,7 +312,7 @@ _08036242: eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _08036290 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _08036294 @ =gBitTable @@ -339,7 +339,7 @@ _08036298: eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r7, r0, 24 b _080362B2 @@ -656,7 +656,7 @@ ai_has_super_effective_move_on_field: @ 8036514 lsrs r0, 24 mov r8, r0 movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r3, r0, 24 ldr r0, _080365AC @ =gAbsentBankFlags @@ -733,7 +733,7 @@ _080365C0: b _08036640 _080365C4: movs r0, 0x2 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r3, r0, 24 ldr r0, _0803664C @ =gAbsentBankFlags @@ -909,7 +909,7 @@ _080366F6: eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _08036748 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _0803674C @ =gBitTable @@ -938,7 +938,7 @@ _08036750: eors r0, r4 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -1238,7 +1238,7 @@ _080369A0: eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _080369F4 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _080369F8 @ =gBitTable @@ -1265,7 +1265,7 @@ _080369FC: eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r6, r0, 24 b _08036A18 @@ -1427,7 +1427,7 @@ _08036B28: cmp r0, 0 bne _08036B78 movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 @@ -1439,11 +1439,11 @@ _08036B70: .4byte gActiveBank _08036B74: .4byte 0x000160c8 _08036B78: movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x3 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r5, r0, 24 _08036B8C: @@ -1636,7 +1636,7 @@ sub_8036CD4: @ 8036CD4 eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _08036D24 @ =gAbsentBankFlags ldrb r1, [r1] ldr r2, _08036D28 @ =gBitTable @@ -1661,7 +1661,7 @@ _08036D2C: eors r0, r5 lsls r0, 24 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x10] @@ -1692,7 +1692,7 @@ _08036D70: .4byte gAbsentBankFlags _08036D74: .4byte gBitTable _08036D78: movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -2598,7 +2598,7 @@ _08037468: ldrb r0, [r0, 0x16] cmp r0, 0 beq _080374A8 - ldr r0, _080374A4 @ =gSideTimer + ldr r0, _080374A4 @ =gSideTimers lsls r1, r3, 1 adds r1, r3 lsls r1, 2 @@ -2613,7 +2613,7 @@ _08037496: .align 2, 0 _0803749C: .4byte gActiveBank _080374A0: .4byte gDisableStructs -_080374A4: .4byte gSideTimer +_080374A4: .4byte gSideTimers _080374A8: mov r1, r8 cmp r1, 0 diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index 73f399caa..fb9c25a82 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -1366,7 +1366,7 @@ _0813FBE0: lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 bl sub_8079E90 @@ -1418,7 +1418,7 @@ _0813FBE0: ldr r0, _0813FCAC @ =SpriteCallbackDummy str r0, [r4] movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _0813FCB0 @ =gObjectBankIDs lsls r0, 24 lsrs r0, 24 @@ -1462,7 +1462,7 @@ sub_813FCBC: @ 813FCBC lsrs r5, r0, 24 ldr r6, _0813FD1C @ =gSprites movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _0813FD20 @ =gObjectBankIDs lsls r0, 24 lsrs r0, 24 @@ -1519,7 +1519,7 @@ sub_813FD34: @ 813FD34 lsrs r5, r0, 24 ldr r6, _0813FD88 @ =gSprites movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r4, _0813FD8C @ =gObjectBankIDs lsls r0, 24 lsrs r0, 24 @@ -1535,7 +1535,7 @@ sub_813FD34: @ 813FD34 cmp r0, 0 bge _0813FD80 movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -5483,7 +5483,7 @@ sub_8141C30: @ 8141C30 movs r0, 0x1E strh r0, [r4, 0x2E] movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -5495,7 +5495,7 @@ sub_8141C30: @ 8141C30 adds r0, r1 strh r0, [r4, 0x32] movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -5644,11 +5644,11 @@ sub_8141D7C: @ 8141D7C lsls r4, 24 lsrs r4, 24 movs r0, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _08141DA4 @ =gAnimBankAttacker strb r0, [r1] movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity ldr r1, _08141DA8 @ =gAnimBankTarget strb r0, [r1] adds r0, r4, 0 diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 10b504a79..4bfcf42fb 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -1474,7 +1474,7 @@ sub_80E4EF8: @ 80E4EF8 lsls r5, 24 lsrs r5, 24 adds r0, r4, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 ldr r2, _080E4FCC @ =0x040000d4 diff --git a/asm/dark.s b/asm/dark.s index 3fcc3f56c..f3274861c 100755 --- a/asm/dark.s +++ b/asm/dark.s @@ -1940,7 +1940,7 @@ _080E0E8A: beq _080E0EB6 _080E0E90: adds r0, r4, 0 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 diff --git a/asm/ice.s b/asm/ice.s index 1fad057ed..557be621c 100755 --- a/asm/ice.s +++ b/asm/ice.s @@ -2701,7 +2701,7 @@ sub_80D8BA8: @ 80D8BA8 ldrh r0, [r4, 0x2] lsls r0, 20 lsrs r0, 24 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index 822c4c566..a8b8fa401 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -529,7 +529,7 @@ _0803E59C: adds r6, r2, 0 cmp r0, 0 beq _0803E5E4 - ldr r5, _0803E758 @ =gSideTimer + ldr r5, _0803E758 @ =gSideTimers ldr r4, _0803E75C @ =gActiveBank ldrb r0, [r4] bl GetBankSide @@ -738,7 +738,7 @@ _0803E74E: str r5, [sp, 0x1C] bl _0803F14C .align 2, 0 -_0803E758: .4byte gSideTimer +_0803E758: .4byte gSideTimers _0803E75C: .4byte gActiveBank _0803E760: .4byte gExperienceTables _0803E764: .4byte gBaseStats diff --git a/asm/psychic.s b/asm/psychic.s index 7a6000335..20e558bf6 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -39,7 +39,7 @@ _080DB77E: cmp r0, 0 bne _080DB7DA movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r4, r0, 24 adds r7, r4, 0 @@ -274,7 +274,7 @@ sub_80DB92C: @ 80DB92C cmp r0, 0 bne _080DB9BC movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 @@ -349,7 +349,7 @@ sub_80DB9E4: @ 80DB9E4 cmp r0, 0 bne _080DBA3C movs r0, 0x1 - bl GetBankByPlayerAI + bl GetBankByIdentity lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 diff --git a/constants/trainer_constants.inc b/constants/trainer_constants.inc index 48ed3036e..920ac1e32 100644 --- a/constants/trainer_constants.inc +++ b/constants/trainer_constants.inc @@ -1,80 +1,80 @@ - .set TRAINER_CLASS_AQUA_LEADER, 0 - .set TRAINER_CLASS_TEAM_AQUA_M, 1 - .set TRAINER_CLASS_TEAM_AQUA_F, 2 - .set TRAINER_CLASS_AROMA_LADY, 3 - .set TRAINER_CLASS_RUIN_MANIAC, 4 - .set TRAINER_CLASS_INTERVIEWER, 5 - .set TRAINER_CLASS_TUBER_F, 6 - .set TRAINER_CLASS_TUBER_M, 7 - .set TRAINER_CLASS_COOL_TRAINER_M, 8 - .set TRAINER_CLASS_COOL_TRAINER_F, 9 - .set TRAINER_CLASS_HEX_MANIAC, 10 - .set TRAINER_CLASS_LADY, 11 - .set TRAINER_CLASS_BEAUTY, 12 - .set TRAINER_CLASS_RICH_BOY, 13 - .set TRAINER_CLASS_POKEMANIAC, 14 - .set TRAINER_CLASS_SWIMMER_M, 15 - .set TRAINER_CLASS_BLACK_BELT, 16 - .set TRAINER_CLASS_GUITARIST, 17 - .set TRAINER_CLASS_KINDLER, 18 - .set TRAINER_CLASS_CAMPER, 19 - .set TRAINER_CLASS_BUG_MANIAC, 20 - .set TRAINER_CLASS_PSYCHIC_M, 21 - .set TRAINER_CLASS_PSYCHIC_F, 22 - .set TRAINER_CLASS_GENTLEMAN, 23 - .set TRAINER_CLASS_ELITE_FOUR_M, 24 - .set TRAINER_CLASS_ELITE_FOUR_F, 25 - .set TRAINER_CLASS_LEADER_F, 26 - .set TRAINER_CLASS_LEADER_M, 27 - .set TRAINER_CLASS_LEADER_MF, 28 - .set TRAINER_CLASS_SCHOOL_KID_M, 29 - .set TRAINER_CLASS_SCHOOL_KID_F, 30 - .set TRAINER_CLASS_SR_AND_JR, 31 - .set TRAINER_CLASS_POKEFAN_M, 32 - .set TRAINER_CLASS_POKEFAN_F, 33 - .set TRAINER_CLASS_EXPERT_M, 34 - .set TRAINER_CLASS_EXPERT_F, 35 - .set TRAINER_CLASS_YOUNGSTER, 36 - .set TRAINER_CLASS_CHAMPION, 37 - .set TRAINER_CLASS_FISHERMAN, 38 - .set TRAINER_CLASS_CYCLING_TRIATHLETE_M, 39 - .set TRAINER_CLASS_CYCLING_TRIATHLETE_F, 40 - .set TRAINER_CLASS_RUNNING_TRIATHLETE_M, 41 - .set TRAINER_CLASS_RUNNING_TRIATHLETE_F, 42 - .set TRAINER_CLASS_SWIMMING_TRIATHLETE_M, 43 - .set TRAINER_CLASS_SWIMMING_TRIATHLETE_F, 44 - .set TRAINER_CLASS_DRAGON_TAMER, 45 - .set TRAINER_CLASS_BIRD_KEEPER, 46 - .set TRAINER_CLASS_NINJA_BOY, 47 - .set TRAINER_CLASS_BATTLE_GIRL, 48 - .set TRAINER_CLASS_PARASOL_LADY, 49 - .set TRAINER_CLASS_SWIMMER_F, 50 - .set TRAINER_CLASS_PICNICKER, 51 - .set TRAINER_CLASS_TWINS, 52 - .set TRAINER_CLASS_SAILOR, 53 - .set TRAINER_CLASS_BOARDER_1, 54 - .set TRAINER_CLASS_BOARDER_2, 55 - .set TRAINER_CLASS_COLLECTOR, 56 - .set TRAINER_CLASS_WALLY, 57 - .set TRAINER_CLASS_BRENDAN_1, 58 - .set TRAINER_CLASS_BRENDAN_2, 59 - .set TRAINER_CLASS_BRENDAN_3, 60 - .set TRAINER_CLASS_MAY_1, 61 - .set TRAINER_CLASS_MAY_2, 62 - .set TRAINER_CLASS_MAY_3, 63 - .set TRAINER_CLASS_POKEMON_BREEDER_M, 64 - .set TRAINER_CLASS_POKEMON_BREEDER_F, 65 - .set TRAINER_CLASS_POKEMON_RANGER_M, 66 - .set TRAINER_CLASS_POKEMON_RANGER_F, 67 - .set TRAINER_CLASS_MAGMA_LEADER, 68 - .set TRAINER_CLASS_TEAM_MAGMA_M, 69 - .set TRAINER_CLASS_TEAM_MAGMA_F, 70 - .set TRAINER_CLASS_LASS, 71 - .set TRAINER_CLASS_BUG_CATCHER, 72 - .set TRAINER_CLASS_HIKER, 73 - .set TRAINER_CLASS_YOUNG_COUPLE, 74 - .set TRAINER_CLASS_OLD_COUPLE, 75 - .set TRAINER_CLASS_SIS_AND_BRO, 76 + .set FACILITY_CLASS_AQUA_LEADER, 0 + .set FACILITY_CLASS_TEAM_AQUA_M, 1 + .set FACILITY_CLASS_TEAM_AQUA_F, 2 + .set FACILITY_CLASS_AROMA_LADY, 3 + .set FACILITY_CLASS_RUIN_MANIAC, 4 + .set FACILITY_CLASS_INTERVIEWER, 5 + .set FACILITY_CLASS_TUBER_F, 6 + .set FACILITY_CLASS_TUBER_M, 7 + .set FACILITY_CLASS_COOL_TRAINER_M, 8 + .set FACILITY_CLASS_COOL_TRAINER_F, 9 + .set FACILITY_CLASS_HEX_MANIAC, 10 + .set FACILITY_CLASS_LADY, 11 + .set FACILITY_CLASS_BEAUTY, 12 + .set FACILITY_CLASS_RICH_BOY, 13 + .set FACILITY_CLASS_POKEMANIAC, 14 + .set FACILITY_CLASS_SWIMMER_M, 15 + .set FACILITY_CLASS_BLACK_BELT, 16 + .set FACILITY_CLASS_GUITARIST, 17 + .set FACILITY_CLASS_KINDLER, 18 + .set FACILITY_CLASS_CAMPER, 19 + .set FACILITY_CLASS_BUG_MANIAC, 20 + .set FACILITY_CLASS_PSYCHIC_M, 21 + .set FACILITY_CLASS_PSYCHIC_F, 22 + .set FACILITY_CLASS_GENTLEMAN, 23 + .set FACILITY_CLASS_ELITE_FOUR_M, 24 + .set FACILITY_CLASS_ELITE_FOUR_F, 25 + .set FACILITY_CLASS_LEADER_F, 26 + .set FACILITY_CLASS_LEADER_M, 27 + .set FACILITY_CLASS_LEADER_MF, 28 + .set FACILITY_CLASS_SCHOOL_KID_M, 29 + .set FACILITY_CLASS_SCHOOL_KID_F, 30 + .set FACILITY_CLASS_SR_AND_JR, 31 + .set FACILITY_CLASS_POKEFAN_M, 32 + .set FACILITY_CLASS_POKEFAN_F, 33 + .set FACILITY_CLASS_EXPERT_M, 34 + .set FACILITY_CLASS_EXPERT_F, 35 + .set FACILITY_CLASS_YOUNGSTER, 36 + .set FACILITY_CLASS_CHAMPION, 37 + .set FACILITY_CLASS_FISHERMAN, 38 + .set FACILITY_CLASS_CYCLING_TRIATHLETE_M, 39 + .set FACILITY_CLASS_CYCLING_TRIATHLETE_F, 40 + .set FACILITY_CLASS_RUNNING_TRIATHLETE_M, 41 + .set FACILITY_CLASS_RUNNING_TRIATHLETE_F, 42 + .set FACILITY_CLASS_SWIMMING_TRIATHLETE_M, 43 + .set FACILITY_CLASS_SWIMMING_TRIATHLETE_F, 44 + .set FACILITY_CLASS_DRAGON_TAMER, 45 + .set FACILITY_CLASS_BIRD_KEEPER, 46 + .set FACILITY_CLASS_NINJA_BOY, 47 + .set FACILITY_CLASS_BATTLE_GIRL, 48 + .set FACILITY_CLASS_PARASOL_LADY, 49 + .set FACILITY_CLASS_SWIMMER_F, 50 + .set FACILITY_CLASS_PICNICKER, 51 + .set FACILITY_CLASS_TWINS, 52 + .set FACILITY_CLASS_SAILOR, 53 + .set FACILITY_CLASS_BOARDER_1, 54 + .set FACILITY_CLASS_BOARDER_2, 55 + .set FACILITY_CLASS_COLLECTOR, 56 + .set FACILITY_CLASS_WALLY, 57 + .set FACILITY_CLASS_BRENDAN_1, 58 + .set FACILITY_CLASS_BRENDAN_2, 59 + .set FACILITY_CLASS_BRENDAN_3, 60 + .set FACILITY_CLASS_MAY_1, 61 + .set FACILITY_CLASS_MAY_2, 62 + .set FACILITY_CLASS_MAY_3, 63 + .set FACILITY_CLASS_POKEMON_BREEDER_M, 64 + .set FACILITY_CLASS_POKEMON_BREEDER_F, 65 + .set FACILITY_CLASS_POKEMON_RANGER_M, 66 + .set FACILITY_CLASS_POKEMON_RANGER_F, 67 + .set FACILITY_CLASS_MAGMA_LEADER, 68 + .set FACILITY_CLASS_TEAM_MAGMA_M, 69 + .set FACILITY_CLASS_TEAM_MAGMA_F, 70 + .set FACILITY_CLASS_LASS, 71 + .set FACILITY_CLASS_BUG_CATCHER, 72 + .set FACILITY_CLASS_HIKER, 73 + .set FACILITY_CLASS_YOUNG_COUPLE, 74 + .set FACILITY_CLASS_OLD_COUPLE, 75 + .set FACILITY_CLASS_SIS_AND_BRO, 76 .set TRAINER_PIC_BRENDAN, 0 .set TRAINER_PIC_MAY, 1 @@ -160,64 +160,64 @@ .set TRAINER_PIC_GLACIA, 81 .set TRAINER_PIC_DRAKE, 82 - .set TRAINER_CLASS_NAME_POKEMON_TRAINER_1, 0 - .set TRAINER_CLASS_NAME_POKEMON_TRAINER_2, 1 - .set TRAINER_CLASS_NAME_AQUA_LEADER, 2 - .set TRAINER_CLASS_NAME_TEAM_AQUA, 3 - .set TRAINER_CLASS_NAME_AQUA_ADMIN, 4 - .set TRAINER_CLASS_NAME_AROMA_LADY, 5 - .set TRAINER_CLASS_NAME_RUIN_MANIAC, 6 - .set TRAINER_CLASS_NAME_INTERVIEWER, 7 - .set TRAINER_CLASS_NAME_TUBER_F, 8 - .set TRAINER_CLASS_NAME_TUBER_M, 9 - .set TRAINER_CLASS_NAME_COOL_TRAINER, 10 - .set TRAINER_CLASS_NAME_HEX_MANIAC, 11 - .set TRAINER_CLASS_NAME_LADY, 12 - .set TRAINER_CLASS_NAME_BEAUTY, 13 - .set TRAINER_CLASS_NAME_RICH_BOY, 14 - .set TRAINER_CLASS_NAME_POKEMANIAC, 15 - .set TRAINER_CLASS_NAME_SWIMMER_M, 16 - .set TRAINER_CLASS_NAME_BLACK_BELT, 17 - .set TRAINER_CLASS_NAME_GUITARIST, 18 - .set TRAINER_CLASS_NAME_KINDLER, 19 - .set TRAINER_CLASS_NAME_CAMPER, 20 - .set TRAINER_CLASS_NAME_BUG_MANIAC, 21 - .set TRAINER_CLASS_NAME_PSYCHIC, 22 - .set TRAINER_CLASS_NAME_GENTLEMAN, 23 - .set TRAINER_CLASS_NAME_ELITE_FOUR, 24 - .set TRAINER_CLASS_NAME_LEADER, 25 - .set TRAINER_CLASS_NAME_SCHOOL_KID, 26 - .set TRAINER_CLASS_NAME_SR_AND_JR, 27 - .set TRAINER_CLASS_NAME_WINSTRATE, 28 - .set TRAINER_CLASS_NAME_POKEFAN, 29 - .set TRAINER_CLASS_NAME_EXPERT, 30 - .set TRAINER_CLASS_NAME_YOUNGSTER, 31 - .set TRAINER_CLASS_NAME_CHAMPION, 32 - .set TRAINER_CLASS_NAME_FISHERMAN, 33 - .set TRAINER_CLASS_NAME_TRIATHLETE, 34 - .set TRAINER_CLASS_NAME_DRAGON_TAMER, 35 - .set TRAINER_CLASS_NAME_BIRD_KEEPER, 36 - .set TRAINER_CLASS_NAME_NINJA_BOY, 37 - .set TRAINER_CLASS_NAME_BATTLE_GIRL, 38 - .set TRAINER_CLASS_NAME_PARASOL_LADY, 39 - .set TRAINER_CLASS_NAME_SWIMMER_F, 40 - .set TRAINER_CLASS_NAME_PICNICKER, 41 - .set TRAINER_CLASS_NAME_TWINS, 42 - .set TRAINER_CLASS_NAME_SAILOR, 43 - .set TRAINER_CLASS_NAME_BOARDER, 44 - .set TRAINER_CLASS_NAME_COLLECTOR, 45 - .set TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 46 - .set TRAINER_CLASS_NAME_POKEMON_BREEDER, 47 - .set TRAINER_CLASS_NAME_POKEMON_RANGER, 48 - .set TRAINER_CLASS_NAME_MAGMA_LEADER, 49 - .set TRAINER_CLASS_NAME_TEAM_MAGMA, 50 - .set TRAINER_CLASS_NAME_MAGMA_ADMIN, 51 - .set TRAINER_CLASS_NAME_LASS, 52 - .set TRAINER_CLASS_NAME_BUG_CATCHER, 53 - .set TRAINER_CLASS_NAME_HIKER, 54 - .set TRAINER_CLASS_NAME_YOUNG_COUPLE, 55 - .set TRAINER_CLASS_NAME_OLD_COUPLE, 56 - .set TRAINER_CLASS_NAME_SIS_AND_BRO, 57 + .set TRAINER_CLASS_POKEMON_TRAINER_1, 0 + .set TRAINER_CLASS_POKEMON_TRAINER_2, 1 + .set TRAINER_CLASS_AQUA_LEADER, 2 + .set TRAINER_CLASS_TEAM_AQUA, 3 + .set TRAINER_CLASS_AQUA_ADMIN, 4 + .set TRAINER_CLASS_AROMA_LADY, 5 + .set TRAINER_CLASS_RUIN_MANIAC, 6 + .set TRAINER_CLASS_INTERVIEWER, 7 + .set TRAINER_CLASS_TUBER_F, 8 + .set TRAINER_CLASS_TUBER_M, 9 + .set TRAINER_CLASS_COOL_TRAINER, 10 + .set TRAINER_CLASS_HEX_MANIAC, 11 + .set TRAINER_CLASS_LADY, 12 + .set TRAINER_CLASS_BEAUTY, 13 + .set TRAINER_CLASS_RICH_BOY, 14 + .set TRAINER_CLASS_POKEMANIAC, 15 + .set TRAINER_CLASS_SWIMMER_M, 16 + .set TRAINER_CLASS_BLACK_BELT, 17 + .set TRAINER_CLASS_GUITARIST, 18 + .set TRAINER_CLASS_KINDLER, 19 + .set TRAINER_CLASS_CAMPER, 20 + .set TRAINER_CLASS_BUG_MANIAC, 21 + .set TRAINER_CLASS_PSYCHIC, 22 + .set TRAINER_CLASS_GENTLEMAN, 23 + .set TRAINER_CLASS_ELITE_FOUR, 24 + .set TRAINER_CLASS_LEADER, 25 + .set TRAINER_CLASS_SCHOOL_KID, 26 + .set TRAINER_CLASS_SR_AND_JR, 27 + .set TRAINER_CLASS_WINSTRATE, 28 + .set TRAINER_CLASS_POKEFAN, 29 + .set TRAINER_CLASS_EXPERT, 30 + .set TRAINER_CLASS_YOUNGSTER, 31 + .set TRAINER_CLASS_CHAMPION, 32 + .set TRAINER_CLASS_FISHERMAN, 33 + .set TRAINER_CLASS_TRIATHLETE, 34 + .set TRAINER_CLASS_DRAGON_TAMER, 35 + .set TRAINER_CLASS_BIRD_KEEPER, 36 + .set TRAINER_CLASS_NINJA_BOY, 37 + .set TRAINER_CLASS_BATTLE_GIRL, 38 + .set TRAINER_CLASS_PARASOL_LADY, 39 + .set TRAINER_CLASS_SWIMMER_F, 40 + .set TRAINER_CLASS_PICNICKER, 41 + .set TRAINER_CLASS_TWINS, 42 + .set TRAINER_CLASS_SAILOR, 43 + .set TRAINER_CLASS_BOARDER, 44 + .set TRAINER_CLASS_COLLECTOR, 45 + .set TRAINER_CLASS_POKEMON_TRAINER_3, 46 + .set TRAINER_CLASS_POKEMON_BREEDER, 47 + .set TRAINER_CLASS_POKEMON_RANGER, 48 + .set TRAINER_CLASS_MAGMA_LEADER, 49 + .set TRAINER_CLASS_TEAM_MAGMA, 50 + .set TRAINER_CLASS_MAGMA_ADMIN, 51 + .set TRAINER_CLASS_LASS, 52 + .set TRAINER_CLASS_BUG_CATCHER, 53 + .set TRAINER_CLASS_HIKER, 54 + .set TRAINER_CLASS_YOUNG_COUPLE, 55 + .set TRAINER_CLASS_OLD_COUPLE, 56 + .set TRAINER_CLASS_SIS_AND_BRO, 57 .set TRAINER_ENCOUNTER_MUSIC_MALE, 0 @ standard male encounter music .set TRAINER_ENCOUNTER_MUSIC_FEMALE, 1 @ standard female encounter music diff --git a/data-de/trainers.inc b/data-de/trainers.inc index 47e4c2289..39bfd9bfe 100644 --- a/data-de/trainers.inc +++ b/data-de/trainers.inc @@ -2,7 +2,7 @@ gTrainers:: @ 81F04FC @ NONE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_1 + .byte TRAINER_CLASS_POKEMON_TRAINER_1 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "$", 12 @@ -14,7 +14,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ADRIAN$", 12 @@ -26,7 +26,7 @@ gTrainers:: @ 81F04FC @ GRUNT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -38,7 +38,7 @@ gTrainers:: @ 81F04FC @ GRUNT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -50,7 +50,7 @@ gTrainers:: @ 81F04FC @ GRUNT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -62,7 +62,7 @@ gTrainers:: @ 81F04FC @ GRUNT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -74,7 +74,7 @@ gTrainers:: @ 81F04FC @ GRUNT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -86,7 +86,7 @@ gTrainers:: @ 81F04FC @ GRUNT_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -98,7 +98,7 @@ gTrainers:: @ 81F04FC @ GRUNT_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -110,7 +110,7 @@ gTrainers:: @ 81F04FC @ GRUNT_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -122,7 +122,7 @@ gTrainers:: @ 81F04FC @ GRUNT_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -134,7 +134,7 @@ gTrainers:: @ 81F04FC @ GRUNT_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -146,7 +146,7 @@ gTrainers:: @ 81F04FC @ GRUNT_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -158,7 +158,7 @@ gTrainers:: @ 81F04FC @ GRUNT_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -170,7 +170,7 @@ gTrainers:: @ 81F04FC @ GRUNT_13 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -182,7 +182,7 @@ gTrainers:: @ 81F04FC @ GRUNT_14 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -194,7 +194,7 @@ gTrainers:: @ 81F04FC @ GRUNT_15 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -206,7 +206,7 @@ gTrainers:: @ 81F04FC @ GRUNT_16 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -218,7 +218,7 @@ gTrainers:: @ 81F04FC @ GRUNT_17 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -230,7 +230,7 @@ gTrainers:: @ 81F04FC @ GRUNT_18 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -242,7 +242,7 @@ gTrainers:: @ 81F04FC @ GRUNT_19 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -254,7 +254,7 @@ gTrainers:: @ 81F04FC @ GRUNT_20 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -266,7 +266,7 @@ gTrainers:: @ 81F04FC @ GRUNT_21 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -278,7 +278,7 @@ gTrainers:: @ 81F04FC @ GRUNT_22 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -290,7 +290,7 @@ gTrainers:: @ 81F04FC @ GRUNT_23 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -302,7 +302,7 @@ gTrainers:: @ 81F04FC @ GRUNT_24 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "RÜPEL$", 12 @@ -314,7 +314,7 @@ gTrainers:: @ 81F04FC @ GRUNT_25 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "RÜPEL$", 12 @@ -326,7 +326,7 @@ gTrainers:: @ 81F04FC @ GRUNT_26 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "RÜPEL$", 12 @@ -338,7 +338,7 @@ gTrainers:: @ 81F04FC @ GRUNT_27 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "RÜPEL$", 12 @@ -350,7 +350,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "$", 12 @@ -362,7 +362,7 @@ gTrainers:: @ 81F04FC @ MATT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "WOLFGANG$", 12 @@ -374,7 +374,7 @@ gTrainers:: @ 81F04FC @ MATT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "WOLFGANG$", 12 @@ -386,7 +386,7 @@ gTrainers:: @ 81F04FC @ SHELLY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F .string "KORDULA$", 12 @@ -398,7 +398,7 @@ gTrainers:: @ 81F04FC @ SHELLY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F .string "KORDULA$", 12 @@ -410,7 +410,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ADRIAN$", 12 @@ -422,7 +422,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ADRIAN$", 12 @@ -434,7 +434,7 @@ gTrainers:: @ 81F04FC @ DAISY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "MARGARETE$", 12 @@ -446,7 +446,7 @@ gTrainers:: @ 81F04FC @ ROSE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSEMARIE$", 12 @@ -458,7 +458,7 @@ gTrainers:: @ 81F04FC @ LILY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "LILLY$", 12 @@ -470,7 +470,7 @@ gTrainers:: @ 81F04FC @ VIOLET .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ERIKA$", 12 @@ -482,7 +482,7 @@ gTrainers:: @ 81F04FC @ ROSE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSEMARIE$", 12 @@ -494,7 +494,7 @@ gTrainers:: @ 81F04FC @ ROSE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSEMARIE$", 12 @@ -506,7 +506,7 @@ gTrainers:: @ 81F04FC @ ROSE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSEMARIE$", 12 @@ -518,7 +518,7 @@ gTrainers:: @ 81F04FC @ ROSE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSEMARIE$", 12 @@ -530,7 +530,7 @@ gTrainers:: @ 81F04FC @ DUSTY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "RÜDIGER$", 12 @@ -542,7 +542,7 @@ gTrainers:: @ 81F04FC @ CHIP .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "RUPRECHT$", 12 @@ -554,7 +554,7 @@ gTrainers:: @ 81F04FC @ FOSTER .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "RUBEN$", 12 @@ -566,7 +566,7 @@ gTrainers:: @ 81F04FC @ DUSTY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "RÜDIGER$", 12 @@ -578,7 +578,7 @@ gTrainers:: @ 81F04FC @ DUSTY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "RÜDIGER$", 12 @@ -590,7 +590,7 @@ gTrainers:: @ 81F04FC @ DUSTY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "RÜDIGER$", 12 @@ -602,7 +602,7 @@ gTrainers:: @ 81F04FC @ DUSTY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "RÜDIGER$", 12 @@ -614,7 +614,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "PIA & UDO$", 12 @@ -626,7 +626,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "PIA & UDO$", 12 @@ -638,7 +638,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "PIA & UDO$", 12 @@ -650,7 +650,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "PIA & UDO$", 12 @@ -662,7 +662,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "PIA & UDO$", 12 @@ -674,7 +674,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "PIA & UDO$", 12 @@ -686,7 +686,7 @@ gTrainers:: @ 81F04FC @ LOLA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -698,7 +698,7 @@ gTrainers:: @ 81F04FC @ CARMEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "CARMEN$", 12 @@ -710,7 +710,7 @@ gTrainers:: @ 81F04FC @ GWEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "HILDE $", 12 @@ -722,7 +722,7 @@ gTrainers:: @ 81F04FC @ LOLA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -734,7 +734,7 @@ gTrainers:: @ 81F04FC @ LOLA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -746,7 +746,7 @@ gTrainers:: @ 81F04FC @ LOLA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -758,7 +758,7 @@ gTrainers:: @ 81F04FC @ LOLA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -770,7 +770,7 @@ gTrainers:: @ 81F04FC @ RICKY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "GÜNTHER$", 12 @@ -782,7 +782,7 @@ gTrainers:: @ 81F04FC @ SIMON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "SIMON$", 12 @@ -794,7 +794,7 @@ gTrainers:: @ 81F04FC @ CHARLIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "HILMAR$", 12 @@ -806,7 +806,7 @@ gTrainers:: @ 81F04FC @ RICKY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "GÜNTHER$", 12 @@ -818,7 +818,7 @@ gTrainers:: @ 81F04FC @ RICKY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "GÜNTHER$", 12 @@ -830,7 +830,7 @@ gTrainers:: @ 81F04FC @ RICKY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "GÜNTHER$", 12 @@ -842,7 +842,7 @@ gTrainers:: @ 81F04FC @ RICKY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "GÜNTHER$", 12 @@ -854,7 +854,7 @@ gTrainers:: @ 81F04FC @ RANDALL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "HUBERT$", 12 @@ -866,7 +866,7 @@ gTrainers:: @ 81F04FC @ PARKER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PATRICK$", 12 @@ -878,7 +878,7 @@ gTrainers:: @ 81F04FC @ GEORGE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "NILS$", 12 @@ -890,7 +890,7 @@ gTrainers:: @ 81F04FC @ BERKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "CHRISTIAN$", 12 @@ -902,7 +902,7 @@ gTrainers:: @ 81F04FC @ CLYDE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "OSKAR$", 12 @@ -914,7 +914,7 @@ gTrainers:: @ 81F04FC @ VINCENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "OTFRIED$", 12 @@ -926,7 +926,7 @@ gTrainers:: @ 81F04FC @ LEROY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "OTMAR$", 12 @@ -938,7 +938,7 @@ gTrainers:: @ 81F04FC @ WILTON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PASCAL$", 12 @@ -950,7 +950,7 @@ gTrainers:: @ 81F04FC @ EDGAR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "EDGAR$", 12 @@ -962,7 +962,7 @@ gTrainers:: @ 81F04FC @ ALBERT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PABLO$", 12 @@ -974,7 +974,7 @@ gTrainers:: @ 81F04FC @ SAMUEL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "RICHARD$", 12 @@ -986,7 +986,7 @@ gTrainers:: @ 81F04FC @ VITO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PAUL$", 12 @@ -998,7 +998,7 @@ gTrainers:: @ 81F04FC @ OWEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "RAIMUND$", 12 @@ -1010,7 +1010,7 @@ gTrainers:: @ 81F04FC @ WILTON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PASCAL$", 12 @@ -1022,7 +1022,7 @@ gTrainers:: @ 81F04FC @ WILTON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PASCAL$", 12 @@ -1034,7 +1034,7 @@ gTrainers:: @ 81F04FC @ WILTON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PASCAL$", 12 @@ -1046,7 +1046,7 @@ gTrainers:: @ 81F04FC @ WILTON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PASCAL$", 12 @@ -1058,7 +1058,7 @@ gTrainers:: @ 81F04FC @ WARREN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "MARKUS$", 12 @@ -1070,7 +1070,7 @@ gTrainers:: @ 81F04FC @ MARY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "YVONNE$", 12 @@ -1082,7 +1082,7 @@ gTrainers:: @ 81F04FC @ LORI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "RAMONA$", 12 @@ -1094,7 +1094,7 @@ gTrainers:: @ 81F04FC @ JODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "ROSWITA$", 12 @@ -1106,7 +1106,7 @@ gTrainers:: @ 81F04FC @ WENDY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "VIOLA$", 12 @@ -1118,7 +1118,7 @@ gTrainers:: @ 81F04FC @ ELAINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "FRAUKE$", 12 @@ -1130,7 +1130,7 @@ gTrainers:: @ 81F04FC @ BROOKE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "VERONIKA$", 12 @@ -1142,7 +1142,7 @@ gTrainers:: @ 81F04FC @ JENNIFER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "MARIANNE$", 12 @@ -1154,7 +1154,7 @@ gTrainers:: @ 81F04FC @ HOPE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "TRUDLINDE$", 12 @@ -1166,7 +1166,7 @@ gTrainers:: @ 81F04FC @ SHANNON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "THERESA$", 12 @@ -1178,7 +1178,7 @@ gTrainers:: @ 81F04FC @ MICHELLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "MICHELLE$", 12 @@ -1190,7 +1190,7 @@ gTrainers:: @ 81F04FC @ CAROLINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "KAROLINE$", 12 @@ -1202,7 +1202,7 @@ gTrainers:: @ 81F04FC @ JULIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "MICHAELA$", 12 @@ -1214,7 +1214,7 @@ gTrainers:: @ 81F04FC @ BROOKE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "VERONIKA$", 12 @@ -1226,7 +1226,7 @@ gTrainers:: @ 81F04FC @ BROOKE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "VERONIKA$", 12 @@ -1238,7 +1238,7 @@ gTrainers:: @ 81F04FC @ BROOKE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "VERONIKA$", 12 @@ -1250,7 +1250,7 @@ gTrainers:: @ 81F04FC @ BROOKE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "VERONIKA$", 12 @@ -1262,7 +1262,7 @@ gTrainers:: @ 81F04FC @ PATRICIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "WALBURGA$", 12 @@ -1274,7 +1274,7 @@ gTrainers:: @ 81F04FC @ KINDRA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "GUNDULA$", 12 @@ -1286,7 +1286,7 @@ gTrainers:: @ 81F04FC @ TAMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "BRUNHILDE$", 12 @@ -1298,7 +1298,7 @@ gTrainers:: @ 81F04FC @ VALERIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TABITHA$", 12 @@ -1310,7 +1310,7 @@ gTrainers:: @ 81F04FC @ TASHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "PANDORA$", 12 @@ -1322,7 +1322,7 @@ gTrainers:: @ 81F04FC @ VALERIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TABITHA$", 12 @@ -1334,7 +1334,7 @@ gTrainers:: @ 81F04FC @ VALERIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TABITHA$", 12 @@ -1346,7 +1346,7 @@ gTrainers:: @ 81F04FC @ VALERIE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TABITHA$", 12 @@ -1358,7 +1358,7 @@ gTrainers:: @ 81F04FC @ VALERIE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TABITHA$", 12 @@ -1370,7 +1370,7 @@ gTrainers:: @ 81F04FC @ CINDY_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "PATRIZIA$", 12 @@ -1382,7 +1382,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "$", 12 @@ -1394,7 +1394,7 @@ gTrainers:: @ 81F04FC @ BRIANNA_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "NATASCHA$", 12 @@ -1406,7 +1406,7 @@ gTrainers:: @ 81F04FC @ CINDY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "PATRIZIA$", 12 @@ -1418,7 +1418,7 @@ gTrainers:: @ 81F04FC @ BRIANNA_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "NATASCHA$", 12 @@ -1430,7 +1430,7 @@ gTrainers:: @ 81F04FC @ ANETTE .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "ANETTE$", 12 @@ -1442,7 +1442,7 @@ gTrainers:: @ 81F04FC @ CINDY_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "PATRIZIA$", 12 @@ -1454,7 +1454,7 @@ gTrainers:: @ 81F04FC @ CINDY_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "PATRIZIA$", 12 @@ -1466,7 +1466,7 @@ gTrainers:: @ 81F04FC @ CINDY_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "PATRIZIA$", 12 @@ -1478,7 +1478,7 @@ gTrainers:: @ 81F04FC @ CINDY_6 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "PATRIZIA$", 12 @@ -1490,7 +1490,7 @@ gTrainers:: @ 81F04FC @ MELISSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "MELISSA$", 12 @@ -1502,7 +1502,7 @@ gTrainers:: @ 81F04FC @ SHEILA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "SYLVIA$", 12 @@ -1514,7 +1514,7 @@ gTrainers:: @ 81F04FC @ SHIRLEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "MIRJAM$", 12 @@ -1526,7 +1526,7 @@ gTrainers:: @ 81F04FC @ JESSICA_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "GERMAINE$", 12 @@ -1538,7 +1538,7 @@ gTrainers:: @ 81F04FC @ CONNIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "FRANCESCA$", 12 @@ -1550,7 +1550,7 @@ gTrainers:: @ 81F04FC @ BRIDGET .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "SALMA$", 12 @@ -1562,7 +1562,7 @@ gTrainers:: @ 81F04FC @ OLIVIA .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "TIA$", 12 @@ -1574,7 +1574,7 @@ gTrainers:: @ 81F04FC @ TIFFANY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "DANIELA$", 12 @@ -1586,7 +1586,7 @@ gTrainers:: @ 81F04FC @ JESSICA_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "GERMAINE$", 12 @@ -1598,7 +1598,7 @@ gTrainers:: @ 81F04FC @ JESSICA_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "GERMAINE$", 12 @@ -1610,7 +1610,7 @@ gTrainers:: @ 81F04FC @ JESSICA_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "GERMAINE$", 12 @@ -1622,7 +1622,7 @@ gTrainers:: @ 81F04FC @ JESSICA_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "GERMAINE$", 12 @@ -1634,7 +1634,7 @@ gTrainers:: @ 81F04FC @ WINSTON_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "RENE$", 12 @@ -1646,7 +1646,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "$", 12 @@ -1658,7 +1658,7 @@ gTrainers:: @ 81F04FC @ GARRET .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "KAI$", 12 @@ -1670,7 +1670,7 @@ gTrainers:: @ 81F04FC @ WINSTON_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "RENE$", 12 @@ -1682,7 +1682,7 @@ gTrainers:: @ 81F04FC @ WINSTON_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "RENE$", 12 @@ -1694,7 +1694,7 @@ gTrainers:: @ 81F04FC @ WINSTON_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "RENE$", 12 @@ -1706,7 +1706,7 @@ gTrainers:: @ 81F04FC @ WINSTON_5 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "RENE$", 12 @@ -1718,7 +1718,7 @@ gTrainers:: @ 81F04FC @ STEVE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "HIRO$", 12 @@ -1730,7 +1730,7 @@ gTrainers:: @ 81F04FC @ CHRIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "CHRIS$", 12 @@ -1742,7 +1742,7 @@ gTrainers:: @ 81F04FC @ MARK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "MARK$", 12 @@ -1754,7 +1754,7 @@ gTrainers:: @ 81F04FC @ KENN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "KLAUS$", 12 @@ -1766,7 +1766,7 @@ gTrainers:: @ 81F04FC @ STEVE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "HIRO$", 12 @@ -1778,7 +1778,7 @@ gTrainers:: @ 81F04FC @ STEVE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "HIRO$", 12 @@ -1790,7 +1790,7 @@ gTrainers:: @ 81F04FC @ STEVE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "HIRO$", 12 @@ -1802,7 +1802,7 @@ gTrainers:: @ 81F04FC @ STEVE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "HIRO$", 12 @@ -1814,7 +1814,7 @@ gTrainers:: @ 81F04FC @ LUIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "KONSTANTIN$", 12 @@ -1826,7 +1826,7 @@ gTrainers:: @ 81F04FC @ AUSTIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "GUIDO$", 12 @@ -1838,7 +1838,7 @@ gTrainers:: @ 81F04FC @ DOUGLAS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "IGNAZ$", 12 @@ -1850,7 +1850,7 @@ gTrainers:: @ 81F04FC @ DARRIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "MANUEL$", 12 @@ -1862,7 +1862,7 @@ gTrainers:: @ 81F04FC @ TONY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "KEVIN$", 12 @@ -1874,7 +1874,7 @@ gTrainers:: @ 81F04FC @ JEROME .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "OSWALD$", 12 @@ -1886,7 +1886,7 @@ gTrainers:: @ 81F04FC @ MATTHEW .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "UMBERTO$", 12 @@ -1898,7 +1898,7 @@ gTrainers:: @ 81F04FC @ DAVID .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "WINFRIED$", 12 @@ -1910,7 +1910,7 @@ gTrainers:: @ 81F04FC @ SPENCER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "LEOPOLD$", 12 @@ -1922,7 +1922,7 @@ gTrainers:: @ 81F04FC @ ROLAND .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "THOMAS$", 12 @@ -1934,7 +1934,7 @@ gTrainers:: @ 81F04FC @ CODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TIMO$", 12 @@ -1946,7 +1946,7 @@ gTrainers:: @ 81F04FC @ STAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "BALTHASAR$", 12 @@ -1958,7 +1958,7 @@ gTrainers:: @ 81F04FC @ BARRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "BASIL$", 12 @@ -1970,7 +1970,7 @@ gTrainers:: @ 81F04FC @ DEAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DAGOBERT$", 12 @@ -1982,7 +1982,7 @@ gTrainers:: @ 81F04FC @ RODNEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DIETER$", 12 @@ -1994,7 +1994,7 @@ gTrainers:: @ 81F04FC @ RICHARD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "ENNO$", 12 @@ -2006,7 +2006,7 @@ gTrainers:: @ 81F04FC @ HERMAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "BENNO$", 12 @@ -2018,7 +2018,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "$", 12 @@ -2030,7 +2030,7 @@ gTrainers:: @ 81F04FC @ GILBERT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "ERICH$", 12 @@ -2042,7 +2042,7 @@ gTrainers:: @ 81F04FC @ FRANKLIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "KASPER$", 12 @@ -2054,7 +2054,7 @@ gTrainers:: @ 81F04FC @ DANNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "MARCEL$", 12 @@ -2066,7 +2066,7 @@ gTrainers:: @ 81F04FC @ JACK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "PEDRO$", 12 @@ -2078,7 +2078,7 @@ gTrainers:: @ 81F04FC @ DUDLEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "THEODOR$", 12 @@ -2090,7 +2090,7 @@ gTrainers:: @ 81F04FC @ CHAD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "JANNIK$", 12 @@ -2102,7 +2102,7 @@ gTrainers:: @ 81F04FC @ TONY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "KEVIN$", 12 @@ -2114,7 +2114,7 @@ gTrainers:: @ 81F04FC @ TONY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "KEVIN$", 12 @@ -2126,7 +2126,7 @@ gTrainers:: @ 81F04FC @ TONY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "KEVIN$", 12 @@ -2138,7 +2138,7 @@ gTrainers:: @ 81F04FC @ TONY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "KEVIN$", 12 @@ -2150,7 +2150,7 @@ gTrainers:: @ 81F04FC @ HIDEKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "SATORU$", 12 @@ -2162,7 +2162,7 @@ gTrainers:: @ 81F04FC @ HITOSHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "SHIGERU$", 12 @@ -2174,7 +2174,7 @@ gTrainers:: @ 81F04FC @ KIYO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "YU$", 12 @@ -2186,7 +2186,7 @@ gTrainers:: @ 81F04FC @ KOICHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "JUNICHI$", 12 @@ -2198,7 +2198,7 @@ gTrainers:: @ 81F04FC @ NOB_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "MINORU$", 12 @@ -2210,7 +2210,7 @@ gTrainers:: @ 81F04FC @ NOB_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "MINORU$", 12 @@ -2222,7 +2222,7 @@ gTrainers:: @ 81F04FC @ NOB_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "MINORU$", 12 @@ -2234,7 +2234,7 @@ gTrainers:: @ 81F04FC @ NOB_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "MINORU$", 12 @@ -2246,7 +2246,7 @@ gTrainers:: @ 81F04FC @ NOB_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "MINORU$", 12 @@ -2258,7 +2258,7 @@ gTrainers:: @ 81F04FC @ YUJI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "HIDEO$", 12 @@ -2270,7 +2270,7 @@ gTrainers:: @ 81F04FC @ DAISUKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "KENJI$", 12 @@ -2282,7 +2282,7 @@ gTrainers:: @ 81F04FC @ ATSUSHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "HIROSHI$", 12 @@ -2294,7 +2294,7 @@ gTrainers:: @ 81F04FC @ KIRK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "CHUCK$", 12 @@ -2306,7 +2306,7 @@ gTrainers:: @ 81F04FC @ SCOTT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "TREY$", 12 @@ -2318,7 +2318,7 @@ gTrainers:: @ 81F04FC @ HARVEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KERRY$", 12 @@ -2330,7 +2330,7 @@ gTrainers:: @ 81F04FC @ SHAWN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "REINHARD$", 12 @@ -2342,7 +2342,7 @@ gTrainers:: @ 81F04FC @ RANDY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "JEFF$", 12 @@ -2354,7 +2354,7 @@ gTrainers:: @ 81F04FC @ DALTON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KIRK$", 12 @@ -2366,7 +2366,7 @@ gTrainers:: @ 81F04FC @ DALTON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KIRK$", 12 @@ -2378,7 +2378,7 @@ gTrainers:: @ 81F04FC @ DALTON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KIRK$", 12 @@ -2390,7 +2390,7 @@ gTrainers:: @ 81F04FC @ DALTON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KIRK$", 12 @@ -2402,7 +2402,7 @@ gTrainers:: @ 81F04FC @ DALTON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KIRK$", 12 @@ -2414,7 +2414,7 @@ gTrainers:: @ 81F04FC @ COLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HENDRIK$", 12 @@ -2426,7 +2426,7 @@ gTrainers:: @ 81F04FC @ FLINT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HEINZ$", 12 @@ -2438,7 +2438,7 @@ gTrainers:: @ 81F04FC @ AXLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HAGEN$", 12 @@ -2450,7 +2450,7 @@ gTrainers:: @ 81F04FC @ JAKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HANNES$", 12 @@ -2462,7 +2462,7 @@ gTrainers:: @ 81F04FC @ ANDY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HARTMANN$", 12 @@ -2474,7 +2474,7 @@ gTrainers:: @ 81F04FC @ BERNIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HASSO$", 12 @@ -2486,7 +2486,7 @@ gTrainers:: @ 81F04FC @ BERNIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HASSO$", 12 @@ -2498,7 +2498,7 @@ gTrainers:: @ 81F04FC @ BERNIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HASSO$", 12 @@ -2510,7 +2510,7 @@ gTrainers:: @ 81F04FC @ BERNIE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HASSO$", 12 @@ -2522,7 +2522,7 @@ gTrainers:: @ 81F04FC @ BERNIE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "HASSO$", 12 @@ -2534,7 +2534,7 @@ gTrainers:: @ 81F04FC @ DREW .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ISSIDOR$", 12 @@ -2546,7 +2546,7 @@ gTrainers:: @ 81F04FC @ CLIFF .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "IVAN$", 12 @@ -2558,7 +2558,7 @@ gTrainers:: @ 81F04FC @ LARRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "KAREL$", 12 @@ -2570,7 +2570,7 @@ gTrainers:: @ 81F04FC @ SHANE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "KUNO$", 12 @@ -2582,7 +2582,7 @@ gTrainers:: @ 81F04FC @ JUSTIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "LAURENZ$", 12 @@ -2594,7 +2594,7 @@ gTrainers:: @ 81F04FC @ ETHAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "EWALD$", 12 @@ -2606,7 +2606,7 @@ gTrainers:: @ 81F04FC @ JEFF .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "RAPHAEL$", 12 @@ -2618,7 +2618,7 @@ gTrainers:: @ 81F04FC @ TRAVIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "RONALD$", 12 @@ -2630,7 +2630,7 @@ gTrainers:: @ 81F04FC @ ETHAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "EWALD$", 12 @@ -2642,7 +2642,7 @@ gTrainers:: @ 81F04FC @ ETHAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "EWALD$", 12 @@ -2654,7 +2654,7 @@ gTrainers:: @ 81F04FC @ ETHAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "EWALD$", 12 @@ -2666,7 +2666,7 @@ gTrainers:: @ 81F04FC @ ETHAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "EWALD$", 12 @@ -2678,7 +2678,7 @@ gTrainers:: @ 81F04FC @ BRENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "ROMEO$", 12 @@ -2690,7 +2690,7 @@ gTrainers:: @ 81F04FC @ DONALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "TILL$", 12 @@ -2702,7 +2702,7 @@ gTrainers:: @ 81F04FC @ TAYLOR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "URIEL$", 12 @@ -2714,7 +2714,7 @@ gTrainers:: @ 81F04FC @ BRANDON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRUNO$", 12 @@ -2726,7 +2726,7 @@ gTrainers:: @ 81F04FC @ DEREK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BURKARD$", 12 @@ -2738,7 +2738,7 @@ gTrainers:: @ 81F04FC @ BRANDON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRUNO$", 12 @@ -2750,7 +2750,7 @@ gTrainers:: @ 81F04FC @ BRANDON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRUNO$", 12 @@ -2762,7 +2762,7 @@ gTrainers:: @ 81F04FC @ BRANDON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRUNO$", 12 @@ -2774,7 +2774,7 @@ gTrainers:: @ 81F04FC @ BRANDON_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRUNO$", 12 @@ -2786,7 +2786,7 @@ gTrainers:: @ 81F04FC @ EDWARD .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "WENDELIN$", 12 @@ -2798,7 +2798,7 @@ gTrainers:: @ 81F04FC @ PRESTON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "URBAN$", 12 @@ -2810,7 +2810,7 @@ gTrainers:: @ 81F04FC @ VIRGIL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "ZOLTAN$", 12 @@ -2822,7 +2822,7 @@ gTrainers:: @ 81F04FC @ FRITZ .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "XAVER$", 12 @@ -2834,7 +2834,7 @@ gTrainers:: @ 81F04FC @ WILLIAM .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "WULF$", 12 @@ -2846,7 +2846,7 @@ gTrainers:: @ 81F04FC @ JOSHUA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "JONAS$", 12 @@ -2858,7 +2858,7 @@ gTrainers:: @ 81F04FC @ CAMERON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "MAXIMILIAN$", 12 @@ -2870,7 +2870,7 @@ gTrainers:: @ 81F04FC @ CAMERON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "MAXIMILIAN$", 12 @@ -2882,7 +2882,7 @@ gTrainers:: @ 81F04FC @ CAMERON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "MAXIMILIAN$", 12 @@ -2894,7 +2894,7 @@ gTrainers:: @ 81F04FC @ CAMERON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "MAXIMILIAN$", 12 @@ -2906,7 +2906,7 @@ gTrainers:: @ 81F04FC @ CAMERON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "MAXIMILIAN$", 12 @@ -2918,7 +2918,7 @@ gTrainers:: @ 81F04FC @ JACLYN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "COSIMA$", 12 @@ -2930,7 +2930,7 @@ gTrainers:: @ 81F04FC @ HANNAH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "HANNAH$", 12 @@ -2942,7 +2942,7 @@ gTrainers:: @ 81F04FC @ SAMANTHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "SAMANTHA$", 12 @@ -2954,7 +2954,7 @@ gTrainers:: @ 81F04FC @ MAURA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "DOLORES$", 12 @@ -2966,7 +2966,7 @@ gTrainers:: @ 81F04FC @ KAYLA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "CAMILLA$", 12 @@ -2978,7 +2978,7 @@ gTrainers:: @ 81F04FC @ ALEXIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "ALEXIS$", 12 @@ -2990,7 +2990,7 @@ gTrainers:: @ 81F04FC @ JACKI_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "KORNELIA$", 12 @@ -3002,7 +3002,7 @@ gTrainers:: @ 81F04FC @ JACKI_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "KORNELIA$", 12 @@ -3014,7 +3014,7 @@ gTrainers:: @ 81F04FC @ JACKI_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "KORNELIA$", 12 @@ -3026,7 +3026,7 @@ gTrainers:: @ 81F04FC @ JACKI_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "KORNELIA$", 12 @@ -3038,7 +3038,7 @@ gTrainers:: @ 81F04FC @ JACKI_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "KORNELIA$", 12 @@ -3050,7 +3050,7 @@ gTrainers:: @ 81F04FC @ WALTER_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "ABRAHAM$", 12 @@ -3062,7 +3062,7 @@ gTrainers:: @ 81F04FC @ TUCKER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "CLAUDIO$", 12 @@ -3074,7 +3074,7 @@ gTrainers:: @ 81F04FC @ THOMAS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "NIKOLAI$", 12 @@ -3086,7 +3086,7 @@ gTrainers:: @ 81F04FC @ WALTER_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "ABRAHAM$", 12 @@ -3098,7 +3098,7 @@ gTrainers:: @ 81F04FC @ WALTER_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "ABRAHAM$", 12 @@ -3110,7 +3110,7 @@ gTrainers:: @ 81F04FC @ WALTER_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "ABRAHAM$", 12 @@ -3122,7 +3122,7 @@ gTrainers:: @ 81F04FC @ WALTER_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "ABRAHAM$", 12 @@ -3134,7 +3134,7 @@ gTrainers:: @ 81F04FC @ SIDNEY .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_SIDNEY .string "ULRICH$", 12 @@ -3146,7 +3146,7 @@ gTrainers:: @ 81F04FC @ PHOEBE .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_PHOEBE .string "ANTONIA$", 12 @@ -3158,7 +3158,7 @@ gTrainers:: @ 81F04FC @ GLACIA .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_GLACIA .string "FROSINA$", 12 @@ -3170,7 +3170,7 @@ gTrainers:: @ 81F04FC @ DRAKE .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_DRAKE .string "DRAGAN$", 12 @@ -3182,7 +3182,7 @@ gTrainers:: @ 81F04FC @ ROXANNE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_ROXANNE .string "FELIZIA$", 12 @@ -3194,7 +3194,7 @@ gTrainers:: @ 81F04FC @ BRAWLY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRAWLY .string "KAMILLO$", 12 @@ -3206,7 +3206,7 @@ gTrainers:: @ 81F04FC @ WATTSON .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WATTSON .string "WALTER$", 12 @@ -3218,7 +3218,7 @@ gTrainers:: @ 81F04FC @ FLANNERY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_FLANNERY .string "FLAVIA$", 12 @@ -3230,7 +3230,7 @@ gTrainers:: @ 81F04FC @ NORMAN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_NORMAN .string "NORMAN$", 12 @@ -3242,7 +3242,7 @@ gTrainers:: @ 81F04FC @ WINONA .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_WINONA .string "WIBKE$", 12 @@ -3254,7 +3254,7 @@ gTrainers:: @ 81F04FC @ TATE_AND_LIZA .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_TATE_AND_LIZA .string "BEN&SVENJA$", 12 @@ -3266,7 +3266,7 @@ gTrainers:: @ 81F04FC @ WALLACE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLACE .string "WASSILI$", 12 @@ -3278,7 +3278,7 @@ gTrainers:: @ 81F04FC @ JERRY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "ORLANDO$", 12 @@ -3290,7 +3290,7 @@ gTrainers:: @ 81F04FC @ TED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "RAMON$", 12 @@ -3302,7 +3302,7 @@ gTrainers:: @ 81F04FC @ PAUL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JÜRGEN$", 12 @@ -3314,7 +3314,7 @@ gTrainers:: @ 81F04FC @ JERRY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "ORLANDO$", 12 @@ -3326,7 +3326,7 @@ gTrainers:: @ 81F04FC @ JERRY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "ORLANDO$", 12 @@ -3338,7 +3338,7 @@ gTrainers:: @ 81F04FC @ JERRY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "ORLANDO$", 12 @@ -3350,7 +3350,7 @@ gTrainers:: @ 81F04FC @ JERRY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "ORLANDO$", 12 @@ -3362,7 +3362,7 @@ gTrainers:: @ 81F04FC @ KAREN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KERSTIN$", 12 @@ -3374,7 +3374,7 @@ gTrainers:: @ 81F04FC @ GEORGIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "ARIANE$", 12 @@ -3386,7 +3386,7 @@ gTrainers:: @ 81F04FC @ KAREN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KERSTIN$", 12 @@ -3398,7 +3398,7 @@ gTrainers:: @ 81F04FC @ KAREN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KERSTIN$", 12 @@ -3410,7 +3410,7 @@ gTrainers:: @ 81F04FC @ KAREN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KERSTIN$", 12 @@ -3422,7 +3422,7 @@ gTrainers:: @ 81F04FC @ KAREN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KERSTIN$", 12 @@ -3434,7 +3434,7 @@ gTrainers:: @ 81F04FC @ KATE_AND_JOY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "EVA & UTE$", 12 @@ -3446,7 +3446,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "IRM & IDA$", 12 @@ -3458,7 +3458,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "IRM & IDA$", 12 @@ -3470,7 +3470,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "IRM & IDA$", 12 @@ -3482,7 +3482,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "IRM & IDA$", 12 @@ -3494,7 +3494,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "IRM & IDA$", 12 @@ -3506,7 +3506,7 @@ gTrainers:: @ 81F04FC @ VICTOR .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "VIKTOR$", 12 @@ -3518,7 +3518,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3530,7 +3530,7 @@ gTrainers:: @ 81F04FC @ COLTON .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "ATTILA$", 12 @@ -3542,7 +3542,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3554,7 +3554,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3566,7 +3566,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3578,7 +3578,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3590,7 +3590,7 @@ gTrainers:: @ 81F04FC @ VICTORIA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "VIKTORIA$", 12 @@ -3602,7 +3602,7 @@ gTrainers:: @ 81F04FC @ VANESSA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "VANESSA$", 12 @@ -3614,7 +3614,7 @@ gTrainers:: @ 81F04FC @ MARISSA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "EVELYN$", 12 @@ -3626,7 +3626,7 @@ gTrainers:: @ 81F04FC @ ISABEL_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3638,7 +3638,7 @@ gTrainers:: @ 81F04FC @ ISABEL_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3650,7 +3650,7 @@ gTrainers:: @ 81F04FC @ ISABEL_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3662,7 +3662,7 @@ gTrainers:: @ 81F04FC @ ISABEL_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3674,7 +3674,7 @@ gTrainers:: @ 81F04FC @ ISABEL_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3686,7 +3686,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "THEOBALD$", 12 @@ -3698,7 +3698,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "THEOBALD$", 12 @@ -3710,7 +3710,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "THEOBALD$", 12 @@ -3722,7 +3722,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "THEOBALD$", 12 @@ -3734,7 +3734,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "THEOBALD$", 12 @@ -3746,7 +3746,7 @@ gTrainers:: @ 81F04FC @ VICKY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "VICKY$", 12 @@ -3758,7 +3758,7 @@ gTrainers:: @ 81F04FC @ SHELBY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "WALTRAUD$", 12 @@ -3770,7 +3770,7 @@ gTrainers:: @ 81F04FC @ SHELBY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "WALTRAUD$", 12 @@ -3782,7 +3782,7 @@ gTrainers:: @ 81F04FC @ SHELBY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "WALTRAUD$", 12 @@ -3794,7 +3794,7 @@ gTrainers:: @ 81F04FC @ SHELBY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "WALTRAUD$", 12 @@ -3806,7 +3806,7 @@ gTrainers:: @ 81F04FC @ SHELBY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "WALTRAUD$", 12 @@ -3818,7 +3818,7 @@ gTrainers:: @ 81F04FC @ CALVIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ANSGAR$", 12 @@ -3830,7 +3830,7 @@ gTrainers:: @ 81F04FC @ BILLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "FRIDOLIN$", 12 @@ -3842,7 +3842,7 @@ gTrainers:: @ 81F04FC @ JOSH .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "GASTON$", 12 @@ -3854,7 +3854,7 @@ gTrainers:: @ 81F04FC @ TOMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "DOMINIK$", 12 @@ -3866,7 +3866,7 @@ gTrainers:: @ 81F04FC @ JOEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "LUDGER$", 12 @@ -3878,7 +3878,7 @@ gTrainers:: @ 81F04FC @ BEN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "EGON$", 12 @@ -3890,7 +3890,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -3902,7 +3902,7 @@ gTrainers:: @ 81F04FC @ KEVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "JULIUS$", 12 @@ -3914,7 +3914,7 @@ gTrainers:: @ 81F04FC @ NEAL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "MORITZ$", 12 @@ -3926,7 +3926,7 @@ gTrainers:: @ 81F04FC @ DILLON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "SÖNCKE$", 12 @@ -3938,7 +3938,7 @@ gTrainers:: @ 81F04FC @ CALVIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ANSGAR$", 12 @@ -3950,7 +3950,7 @@ gTrainers:: @ 81F04FC @ CALVIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ANSGAR$", 12 @@ -3962,7 +3962,7 @@ gTrainers:: @ 81F04FC @ CALVIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ANSGAR$", 12 @@ -3974,7 +3974,7 @@ gTrainers:: @ 81F04FC @ CALVIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ANSGAR$", 12 @@ -3986,7 +3986,7 @@ gTrainers:: @ 81F04FC @ EDDIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "HENRY$", 12 @@ -3998,7 +3998,7 @@ gTrainers:: @ 81F04FC @ ALLEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "HUGO$", 12 @@ -4010,7 +4010,7 @@ gTrainers:: @ 81F04FC @ TIMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "FRIEDER$", 12 @@ -4022,7 +4022,7 @@ gTrainers:: @ 81F04FC @ STEVEN .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CHAMPION + .byte TRAINER_CLASS_CHAMPION .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_STEVEN .string "TROY$", 12 @@ -4034,7 +4034,7 @@ gTrainers:: @ 81F04FC @ ANDREW .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ANSGAR$", 12 @@ -4046,7 +4046,7 @@ gTrainers:: @ 81F04FC @ IVAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ANGELO$", 12 @@ -4058,7 +4058,7 @@ gTrainers:: @ 81F04FC @ CLAUDE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ANSELM$", 12 @@ -4070,7 +4070,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALOIS$", 12 @@ -4082,7 +4082,7 @@ gTrainers:: @ 81F04FC @ NED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ARTHUR$", 12 @@ -4094,7 +4094,7 @@ gTrainers:: @ 81F04FC @ DALE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALBIN$", 12 @@ -4106,7 +4106,7 @@ gTrainers:: @ 81F04FC @ NOLAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "AMADEUS$", 12 @@ -4118,7 +4118,7 @@ gTrainers:: @ 81F04FC @ BARNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALBRECHT$", 12 @@ -4130,7 +4130,7 @@ gTrainers:: @ 81F04FC @ WADE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALAIN$", 12 @@ -4142,7 +4142,7 @@ gTrainers:: @ 81F04FC @ CARTER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ARMIN$", 12 @@ -4154,7 +4154,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALOIS$", 12 @@ -4166,7 +4166,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALOIS$", 12 @@ -4178,7 +4178,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALOIS$", 12 @@ -4190,7 +4190,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALOIS$", 12 @@ -4202,7 +4202,7 @@ gTrainers:: @ 81F04FC @ RONALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ACHMED$", 12 @@ -4214,7 +4214,7 @@ gTrainers:: @ 81F04FC @ JACOB .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "ROMAN$", 12 @@ -4226,7 +4226,7 @@ gTrainers:: @ 81F04FC @ ANTHONY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "EMIL$", 12 @@ -4238,7 +4238,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "EGIDIUS$", 12 @@ -4250,7 +4250,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "EGIDIUS$", 12 @@ -4262,7 +4262,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "EGIDIUS$", 12 @@ -4274,7 +4274,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "EGIDIUS$", 12 @@ -4286,7 +4286,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "EGIDIUS$", 12 @@ -4298,7 +4298,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "IRMGARD$", 12 @@ -4310,7 +4310,7 @@ gTrainers:: @ 81F04FC @ JASMINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "MARTHA$", 12 @@ -4322,7 +4322,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "IRMGARD$", 12 @@ -4334,7 +4334,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "IRMGARD$", 12 @@ -4346,7 +4346,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "IRMGARD$", 12 @@ -4358,7 +4358,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "IRMGARD$", 12 @@ -4370,7 +4370,7 @@ gTrainers:: @ 81F04FC @ DYLAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "IGOR$", 12 @@ -4382,7 +4382,7 @@ gTrainers:: @ 81F04FC @ DYLAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "IGOR$", 12 @@ -4394,7 +4394,7 @@ gTrainers:: @ 81F04FC @ DYLAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "IGOR$", 12 @@ -4406,7 +4406,7 @@ gTrainers:: @ 81F04FC @ DYLAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "IGOR$", 12 @@ -4418,7 +4418,7 @@ gTrainers:: @ 81F04FC @ DYLAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "IGOR$", 12 @@ -4430,7 +4430,7 @@ gTrainers:: @ 81F04FC @ MARIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "JUTTA$", 12 @@ -4442,7 +4442,7 @@ gTrainers:: @ 81F04FC @ MARIA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "JUTTA$", 12 @@ -4454,7 +4454,7 @@ gTrainers:: @ 81F04FC @ MARIA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "JUTTA$", 12 @@ -4466,7 +4466,7 @@ gTrainers:: @ 81F04FC @ MARIA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "JUTTA$", 12 @@ -4478,7 +4478,7 @@ gTrainers:: @ 81F04FC @ MARIA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "JUTTA$", 12 @@ -4490,7 +4490,7 @@ gTrainers:: @ 81F04FC @ CALEB .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "OLEG$", 12 @@ -4502,7 +4502,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "$", 12 @@ -4514,7 +4514,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "KASPAR$", 12 @@ -4526,7 +4526,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "$", 12 @@ -4538,7 +4538,7 @@ gTrainers:: @ 81F04FC @ CHASE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "FERDINAND$", 12 @@ -4550,7 +4550,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "KASPAR$", 12 @@ -4562,7 +4562,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "KASPAR$", 12 @@ -4574,7 +4574,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "KASPAR$", 12 @@ -4586,7 +4586,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "KASPAR$", 12 @@ -4598,7 +4598,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "$", 12 @@ -4610,7 +4610,7 @@ gTrainers:: @ 81F04FC @ CONNOR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "MIRA$", 12 @@ -4622,7 +4622,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "$", 12 @@ -4634,7 +4634,7 @@ gTrainers:: @ 81F04FC @ KATELYN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "MECHTHILD$", 12 @@ -4646,7 +4646,7 @@ gTrainers:: @ 81F04FC @ ALLISON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "LOTTE$", 12 @@ -4658,7 +4658,7 @@ gTrainers:: @ 81F04FC @ KATELYN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "MECHTHILD$", 12 @@ -4670,7 +4670,7 @@ gTrainers:: @ 81F04FC @ KATELYN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "MECHTHILD$", 12 @@ -4682,7 +4682,7 @@ gTrainers:: @ 81F04FC @ KATELYN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "MECHTHILD$", 12 @@ -4694,7 +4694,7 @@ gTrainers:: @ 81F04FC @ KATELYN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "MECHTHILD$", 12 @@ -4706,7 +4706,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "ALFONS$", 12 @@ -4718,7 +4718,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "ALFONS$", 12 @@ -4730,7 +4730,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "ALFONS$", 12 @@ -4742,7 +4742,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "ALFONS$", 12 @@ -4754,7 +4754,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "ALFONS$", 12 @@ -4766,7 +4766,7 @@ gTrainers:: @ 81F04FC @ AARON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "EDMUND$", 12 @@ -4778,7 +4778,7 @@ gTrainers:: @ 81F04FC @ PERRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "JOSCHKA$", 12 @@ -4790,7 +4790,7 @@ gTrainers:: @ 81F04FC @ HUGH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ENRICO$", 12 @@ -4802,7 +4802,7 @@ gTrainers:: @ 81F04FC @ PHIL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "HENRY$", 12 @@ -4814,7 +4814,7 @@ gTrainers:: @ 81F04FC @ JARED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "HIOB$", 12 @@ -4826,7 +4826,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "$", 12 @@ -4838,7 +4838,7 @@ gTrainers:: @ 81F04FC @ TANNER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ANATOL$", 12 @@ -4850,7 +4850,7 @@ gTrainers:: @ 81F04FC @ WILL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "BJÖRN$", 12 @@ -4862,7 +4862,7 @@ gTrainers:: @ 81F04FC @ COLIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "WIM$", 12 @@ -4874,7 +4874,7 @@ gTrainers:: @ 81F04FC @ ROBERT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "FRITJOF$", 12 @@ -4886,7 +4886,7 @@ gTrainers:: @ 81F04FC @ BENNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "GENADI$", 12 @@ -4898,7 +4898,7 @@ gTrainers:: @ 81F04FC @ CHESTER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "VITALI$", 12 @@ -4910,7 +4910,7 @@ gTrainers:: @ 81F04FC @ ROBERT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "FRITJOF$", 12 @@ -4922,7 +4922,7 @@ gTrainers:: @ 81F04FC @ ROBERT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "FRITJOF$", 12 @@ -4934,7 +4934,7 @@ gTrainers:: @ 81F04FC @ ROBERT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "FRITJOF$", 12 @@ -4946,7 +4946,7 @@ gTrainers:: @ 81F04FC @ ROBERT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "FRITJOF$", 12 @@ -4958,7 +4958,7 @@ gTrainers:: @ 81F04FC @ ALEX .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ARNE$", 12 @@ -4970,7 +4970,7 @@ gTrainers:: @ 81F04FC @ BECK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "VINCENT$", 12 @@ -4982,7 +4982,7 @@ gTrainers:: @ 81F04FC @ YASU .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "VALENTIN$", 12 @@ -4994,7 +4994,7 @@ gTrainers:: @ 81F04FC @ TAKASHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "EUGEN$", 12 @@ -5006,7 +5006,7 @@ gTrainers:: @ 81F04FC @ MAKOTO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "HERIBERT$", 12 @@ -5018,7 +5018,7 @@ gTrainers:: @ 81F04FC @ HIDEO_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "SAUL$", 12 @@ -5030,7 +5030,7 @@ gTrainers:: @ 81F04FC @ LAO_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "EDUARD$", 12 @@ -5042,7 +5042,7 @@ gTrainers:: @ 81F04FC @ LUNG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "ARND$", 12 @@ -5054,7 +5054,7 @@ gTrainers:: @ 81F04FC @ LAO_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "EDUARD$", 12 @@ -5066,7 +5066,7 @@ gTrainers:: @ 81F04FC @ LAO_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "EDUARD$", 12 @@ -5078,7 +5078,7 @@ gTrainers:: @ 81F04FC @ LAO_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "EDUARD$", 12 @@ -5090,7 +5090,7 @@ gTrainers:: @ 81F04FC @ LAO_5 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "EDUARD$", 12 @@ -5102,7 +5102,7 @@ gTrainers:: @ 81F04FC @ TESSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "TAMARA$", 12 @@ -5114,7 +5114,7 @@ gTrainers:: @ 81F04FC @ LAURA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "LAURA$", 12 @@ -5126,7 +5126,7 @@ gTrainers:: @ 81F04FC @ CYNDY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "ELFI$", 12 @@ -5138,7 +5138,7 @@ gTrainers:: @ 81F04FC @ CORA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "THEA$", 12 @@ -5150,7 +5150,7 @@ gTrainers:: @ 81F04FC @ JILL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "AGNES$", 12 @@ -5162,7 +5162,7 @@ gTrainers:: @ 81F04FC @ CYNDY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "ELFI$", 12 @@ -5174,7 +5174,7 @@ gTrainers:: @ 81F04FC @ CYNDY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "ELFI$", 12 @@ -5186,7 +5186,7 @@ gTrainers:: @ 81F04FC @ CYNDY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "ELFI$", 12 @@ -5198,7 +5198,7 @@ gTrainers:: @ 81F04FC @ CYNDY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "ELFI$", 12 @@ -5210,7 +5210,7 @@ gTrainers:: @ 81F04FC @ MADELINE_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "SASKIA$", 12 @@ -5222,7 +5222,7 @@ gTrainers:: @ 81F04FC @ CLARISSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "GERDA$", 12 @@ -5234,7 +5234,7 @@ gTrainers:: @ 81F04FC @ ANGELICA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MARIKA$", 12 @@ -5246,7 +5246,7 @@ gTrainers:: @ 81F04FC @ MADELINE_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "SASKIA$", 12 @@ -5258,7 +5258,7 @@ gTrainers:: @ 81F04FC @ MADELINE_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "SASKIA$", 12 @@ -5270,7 +5270,7 @@ gTrainers:: @ 81F04FC @ MADELINE_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "SASKIA$", 12 @@ -5282,7 +5282,7 @@ gTrainers:: @ 81F04FC @ MADELINE_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "SASKIA$", 12 @@ -5294,7 +5294,7 @@ gTrainers:: @ 81F04FC @ BEVERLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DAGMAR$", 12 @@ -5306,7 +5306,7 @@ gTrainers:: @ 81F04FC @ DAWN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "HEIDRUN$", 12 @@ -5318,7 +5318,7 @@ gTrainers:: @ 81F04FC @ NICOLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "NICOLE$", 12 @@ -5330,7 +5330,7 @@ gTrainers:: @ 81F04FC @ DENISE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DENISE$", 12 @@ -5342,7 +5342,7 @@ gTrainers:: @ 81F04FC @ BETH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ALMUT$", 12 @@ -5354,7 +5354,7 @@ gTrainers:: @ 81F04FC @ TARA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "SIEGLINDE$", 12 @@ -5366,7 +5366,7 @@ gTrainers:: @ 81F04FC @ MISSY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MARION$", 12 @@ -5378,7 +5378,7 @@ gTrainers:: @ 81F04FC @ ALICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ALICE$", 12 @@ -5390,7 +5390,7 @@ gTrainers:: @ 81F04FC @ JENNY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MONIKA$", 12 @@ -5402,7 +5402,7 @@ gTrainers:: @ 81F04FC @ GRACE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ILONA$", 12 @@ -5414,7 +5414,7 @@ gTrainers:: @ 81F04FC @ TANYA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "EMILIE$", 12 @@ -5426,7 +5426,7 @@ gTrainers:: @ 81F04FC @ SHARON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "GUDRUN$", 12 @@ -5438,7 +5438,7 @@ gTrainers:: @ 81F04FC @ NIKKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ASTRID$", 12 @@ -5450,7 +5450,7 @@ gTrainers:: @ 81F04FC @ BRENDA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "OTTILIE$", 12 @@ -5462,7 +5462,7 @@ gTrainers:: @ 81F04FC @ KATIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "SENTA$", 12 @@ -5474,7 +5474,7 @@ gTrainers:: @ 81F04FC @ SUSIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JANKA$", 12 @@ -5486,7 +5486,7 @@ gTrainers:: @ 81F04FC @ KARA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "RENATE$", 12 @@ -5498,7 +5498,7 @@ gTrainers:: @ 81F04FC @ DANA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "VICKI$", 12 @@ -5510,7 +5510,7 @@ gTrainers:: @ 81F04FC @ ERIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "REBECCA$", 12 @@ -5522,7 +5522,7 @@ gTrainers:: @ 81F04FC @ DEBRA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ANJA$", 12 @@ -5534,7 +5534,7 @@ gTrainers:: @ 81F04FC @ LINDA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "GISELA$", 12 @@ -5546,7 +5546,7 @@ gTrainers:: @ 81F04FC @ KAYLEE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "PAOLA$", 12 @@ -5558,7 +5558,7 @@ gTrainers:: @ 81F04FC @ LAUREL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "BIRTE$", 12 @@ -5570,7 +5570,7 @@ gTrainers:: @ 81F04FC @ DARCY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DOROTHEA$", 12 @@ -5582,7 +5582,7 @@ gTrainers:: @ 81F04FC @ JENNY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MONIKA$", 12 @@ -5594,7 +5594,7 @@ gTrainers:: @ 81F04FC @ JENNY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MONIKA$", 12 @@ -5606,7 +5606,7 @@ gTrainers:: @ 81F04FC @ JENNY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MONIKA$", 12 @@ -5618,7 +5618,7 @@ gTrainers:: @ 81F04FC @ JENNY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MONIKA$", 12 @@ -5630,7 +5630,7 @@ gTrainers:: @ 81F04FC @ HEIDI .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "JANA$", 12 @@ -5642,7 +5642,7 @@ gTrainers:: @ 81F04FC @ BECKY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "HEIDI$", 12 @@ -5654,7 +5654,7 @@ gTrainers:: @ 81F04FC @ CAROL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "NATALIE$", 12 @@ -5666,7 +5666,7 @@ gTrainers:: @ 81F04FC @ NANCY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "NANCY$", 12 @@ -5678,7 +5678,7 @@ gTrainers:: @ 81F04FC @ MARTHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "MARTHA$", 12 @@ -5690,7 +5690,7 @@ gTrainers:: @ 81F04FC @ DIANA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "GWENDOLIN$", 12 @@ -5702,7 +5702,7 @@ gTrainers:: @ 81F04FC @ NINA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "NADJA$", 12 @@ -5714,7 +5714,7 @@ gTrainers:: @ 81F04FC @ IRENE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "IRENE$", 12 @@ -5726,7 +5726,7 @@ gTrainers:: @ 81F04FC @ DIANA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "GWENDOLIN$", 12 @@ -5738,7 +5738,7 @@ gTrainers:: @ 81F04FC @ DIANA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "GWENDOLIN$", 12 @@ -5750,7 +5750,7 @@ gTrainers:: @ 81F04FC @ DIANA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "GWENDOLIN$", 12 @@ -5762,7 +5762,7 @@ gTrainers:: @ 81F04FC @ DIANA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "GWENDOLIN$", 12 @@ -5774,7 +5774,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "NORA & JO$", 12 @@ -5786,7 +5786,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "NORA & JO$", 12 @@ -5798,7 +5798,7 @@ gTrainers:: @ 81F04FC @ GINA_AND_MIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "GINA & MIA$", 12 @@ -5810,7 +5810,7 @@ gTrainers:: @ 81F04FC @ MIU_AND_YUKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "LEA & GRIT$", 12 @@ -5822,7 +5822,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "NORA & JO$", 12 @@ -5834,7 +5834,7 @@ gTrainers:: @ 81F04FC @ GINA_AND_MIA_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "GINA & MIA$", 12 @@ -5846,7 +5846,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "NORA & JO$", 12 @@ -5858,7 +5858,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "NORA & JO$", 12 @@ -5870,7 +5870,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "NORA & JO$", 12 @@ -5882,7 +5882,7 @@ gTrainers:: @ 81F04FC @ HUEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "TASSILO$", 12 @@ -5894,7 +5894,7 @@ gTrainers:: @ 81F04FC @ EDMOND .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "MONTY$", 12 @@ -5906,7 +5906,7 @@ gTrainers:: @ 81F04FC @ ERNEST_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ELERT$", 12 @@ -5918,7 +5918,7 @@ gTrainers:: @ 81F04FC @ DWAYNE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "RETO$", 12 @@ -5930,7 +5930,7 @@ gTrainers:: @ 81F04FC @ PHILLIP .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "GUNNAR$", 12 @@ -5942,7 +5942,7 @@ gTrainers:: @ 81F04FC @ LEONARD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "LEONARD$", 12 @@ -5954,7 +5954,7 @@ gTrainers:: @ 81F04FC @ DUNCAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "PIERRE$", 12 @@ -5966,7 +5966,7 @@ gTrainers:: @ 81F04FC @ ERNEST_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ELERT$", 12 @@ -5978,7 +5978,7 @@ gTrainers:: @ 81F04FC @ ERNEST_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ELERT$", 12 @@ -5990,7 +5990,7 @@ gTrainers:: @ 81F04FC @ ERNEST_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ELERT$", 12 @@ -6002,7 +6002,7 @@ gTrainers:: @ 81F04FC @ ERNEST_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ELERT$", 12 @@ -6014,7 +6014,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6026,7 +6026,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6038,7 +6038,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_13 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6050,7 +6050,7 @@ gTrainers:: @ 81F04FC @ SONNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "WENZEL$", 12 @@ -6062,7 +6062,7 @@ gTrainers:: @ 81F04FC @ DONOVAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "STANISLAUS$", 12 @@ -6074,7 +6074,7 @@ gTrainers:: @ 81F04FC @ GERALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "GERALD$", 12 @@ -6086,7 +6086,7 @@ gTrainers:: @ 81F04FC @ KELVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "AARON$", 12 @@ -6098,7 +6098,7 @@ gTrainers:: @ 81F04FC @ KODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ALBERT$", 12 @@ -6110,7 +6110,7 @@ gTrainers:: @ 81F04FC @ TEVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ANDRE$", 12 @@ -6122,7 +6122,7 @@ gTrainers:: @ 81F04FC @ DAMON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "AMON$", 12 @@ -6134,7 +6134,7 @@ gTrainers:: @ 81F04FC @ PABLO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "PABLO$", 12 @@ -6146,7 +6146,7 @@ gTrainers:: @ 81F04FC @ EDWIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6158,7 +6158,7 @@ gTrainers:: @ 81F04FC @ HECTOR_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "HEKTOR$", 12 @@ -6170,7 +6170,7 @@ gTrainers:: @ 81F04FC @ HECTOR_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "HEKTOR$", 12 @@ -6182,7 +6182,7 @@ gTrainers:: @ 81F04FC @ EDWIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6194,7 +6194,7 @@ gTrainers:: @ 81F04FC @ EDWIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6206,7 +6206,7 @@ gTrainers:: @ 81F04FC @ EDWIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6218,7 +6218,7 @@ gTrainers:: @ 81F04FC @ EDWIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6230,7 +6230,7 @@ gTrainers:: @ 81F04FC @ WALLY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "HEIKO$", 12 @@ -6242,7 +6242,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6254,7 +6254,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6266,7 +6266,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6278,7 +6278,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6290,7 +6290,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6302,7 +6302,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6314,7 +6314,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6326,7 +6326,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6338,7 +6338,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -6350,7 +6350,7 @@ gTrainers:: @ 81F04FC @ MAY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6362,7 +6362,7 @@ gTrainers:: @ 81F04FC @ MAY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6374,7 +6374,7 @@ gTrainers:: @ 81F04FC @ MAY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6386,7 +6386,7 @@ gTrainers:: @ 81F04FC @ MAY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6398,7 +6398,7 @@ gTrainers:: @ 81F04FC @ MAY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6410,7 +6410,7 @@ gTrainers:: @ 81F04FC @ MAY_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6422,7 +6422,7 @@ gTrainers:: @ 81F04FC @ MAY_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6434,7 +6434,7 @@ gTrainers:: @ 81F04FC @ MAY_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6446,7 +6446,7 @@ gTrainers:: @ 81F04FC @ MAY_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -6458,7 +6458,7 @@ gTrainers:: @ 81F04FC @ ISAAC_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "BLASIUS$", 12 @@ -6470,7 +6470,7 @@ gTrainers:: @ 81F04FC @ RILEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "CLIFF$", 12 @@ -6482,7 +6482,7 @@ gTrainers:: @ 81F04FC @ AIDAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "DARIO$", 12 @@ -6494,7 +6494,7 @@ gTrainers:: @ 81F04FC @ ISAAC_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "BLASIUS$", 12 @@ -6506,7 +6506,7 @@ gTrainers:: @ 81F04FC @ ISAAC_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "BLASIUS$", 12 @@ -6518,7 +6518,7 @@ gTrainers:: @ 81F04FC @ ISAAC_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "BLASIUS$", 12 @@ -6530,7 +6530,7 @@ gTrainers:: @ 81F04FC @ ISAAC_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "BLASIUS$", 12 @@ -6542,7 +6542,7 @@ gTrainers:: @ 81F04FC @ LYDIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6554,7 +6554,7 @@ gTrainers:: @ 81F04FC @ ALEXIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "DORIS$", 12 @@ -6566,7 +6566,7 @@ gTrainers:: @ 81F04FC @ DANIELLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "DUNJA$", 12 @@ -6578,7 +6578,7 @@ gTrainers:: @ 81F04FC @ LYDIA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6590,7 +6590,7 @@ gTrainers:: @ 81F04FC @ LYDIA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6602,7 +6602,7 @@ gTrainers:: @ 81F04FC @ LYDIA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6614,7 +6614,7 @@ gTrainers:: @ 81F04FC @ LYDIA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6626,7 +6626,7 @@ gTrainers:: @ 81F04FC @ JACKSON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "ECKBERT$", 12 @@ -6638,7 +6638,7 @@ gTrainers:: @ 81F04FC @ CARLOS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "EDWARD$", 12 @@ -6650,7 +6650,7 @@ gTrainers:: @ 81F04FC @ SEBASTIAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "EILMAR$", 12 @@ -6662,7 +6662,7 @@ gTrainers:: @ 81F04FC @ JACKSON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "ECKBERT$", 12 @@ -6674,7 +6674,7 @@ gTrainers:: @ 81F04FC @ JACKSON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "ECKBERT$", 12 @@ -6686,7 +6686,7 @@ gTrainers:: @ 81F04FC @ JACKSON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "ECKBERT$", 12 @@ -6698,7 +6698,7 @@ gTrainers:: @ 81F04FC @ JACKSON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "ECKBERT$", 12 @@ -6710,7 +6710,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "HANNELORE$", 12 @@ -6722,7 +6722,7 @@ gTrainers:: @ 81F04FC @ JENNA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "INGEBORG$", 12 @@ -6734,7 +6734,7 @@ gTrainers:: @ 81F04FC @ SOPHIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "SOPHIA$", 12 @@ -6746,7 +6746,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "HANNELORE$", 12 @@ -6758,7 +6758,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "HANNELORE$", 12 @@ -6770,7 +6770,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "HANNELORE$", 12 @@ -6782,7 +6782,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "HANNELORE$", 12 @@ -6794,7 +6794,7 @@ gTrainers:: @ 81F04FC @ MAXIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MARC$", 12 @@ -6806,7 +6806,7 @@ gTrainers:: @ 81F04FC @ GRUNT_28 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6818,7 +6818,7 @@ gTrainers:: @ 81F04FC @ GRUNT_29 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6830,7 +6830,7 @@ gTrainers:: @ 81F04FC @ GRUNT_30 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6842,7 +6842,7 @@ gTrainers:: @ 81F04FC @ GRUNT_31 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6854,7 +6854,7 @@ gTrainers:: @ 81F04FC @ GRUNT_32 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6866,7 +6866,7 @@ gTrainers:: @ 81F04FC @ GRUNT_33 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6878,7 +6878,7 @@ gTrainers:: @ 81F04FC @ GRUNT_34 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6890,7 +6890,7 @@ gTrainers:: @ 81F04FC @ GRUNT_35 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6902,7 +6902,7 @@ gTrainers:: @ 81F04FC @ GRUNT_36 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6914,7 +6914,7 @@ gTrainers:: @ 81F04FC @ GRUNT_37 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6926,7 +6926,7 @@ gTrainers:: @ 81F04FC @ GRUNT_38 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6938,7 +6938,7 @@ gTrainers:: @ 81F04FC @ GRUNT_39 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6950,7 +6950,7 @@ gTrainers:: @ 81F04FC @ GRUNT_40 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6962,7 +6962,7 @@ gTrainers:: @ 81F04FC @ GRUNT_41 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6974,7 +6974,7 @@ gTrainers:: @ 81F04FC @ GRUNT_42 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6986,7 +6986,7 @@ gTrainers:: @ 81F04FC @ GRUNT_43 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -6998,7 +6998,7 @@ gTrainers:: @ 81F04FC @ GRUNT_44 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7010,7 +7010,7 @@ gTrainers:: @ 81F04FC @ GRUNT_45 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7022,7 +7022,7 @@ gTrainers:: @ 81F04FC @ GRUNT_46 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7034,7 +7034,7 @@ gTrainers:: @ 81F04FC @ GRUNT_47 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7046,7 +7046,7 @@ gTrainers:: @ 81F04FC @ GRUNT_48 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7058,7 +7058,7 @@ gTrainers:: @ 81F04FC @ GRUNT_49 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7070,7 +7070,7 @@ gTrainers:: @ 81F04FC @ GRUNT_50 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7082,7 +7082,7 @@ gTrainers:: @ 81F04FC @ GRUNT_51 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "RÜPEL$", 12 @@ -7094,7 +7094,7 @@ gTrainers:: @ 81F04FC @ GRUNT_52 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "RÜPEL$", 12 @@ -7106,7 +7106,7 @@ gTrainers:: @ 81F04FC @ GRUNT_53 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "RÜPEL$", 12 @@ -7118,7 +7118,7 @@ gTrainers:: @ 81F04FC @ GRUNT_54 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "RÜPEL$", 12 @@ -7130,7 +7130,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_14 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "$", 12 @@ -7142,7 +7142,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_15 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "$", 12 @@ -7154,7 +7154,7 @@ gTrainers:: @ 81F04FC @ TABITHA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "KALLE$", 12 @@ -7166,7 +7166,7 @@ gTrainers:: @ 81F04FC @ TABITHA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "KALLE$", 12 @@ -7178,7 +7178,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_16 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "$", 12 @@ -7190,7 +7190,7 @@ gTrainers:: @ 81F04FC @ COURTNEY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F .string "JÖRDIS$", 12 @@ -7202,7 +7202,7 @@ gTrainers:: @ 81F04FC @ COURTNEY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F .string "JÖRDIS$", 12 @@ -7214,7 +7214,7 @@ gTrainers:: @ 81F04FC @ MAXIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MARC$", 12 @@ -7226,7 +7226,7 @@ gTrainers:: @ 81F04FC @ MAXIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MARC$", 12 @@ -7238,7 +7238,7 @@ gTrainers:: @ 81F04FC @ TIANA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "KARIN$", 12 @@ -7250,7 +7250,7 @@ gTrainers:: @ 81F04FC @ HALEY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ELISA$", 12 @@ -7262,7 +7262,7 @@ gTrainers:: @ 81F04FC @ JANICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "RICARDA$", 12 @@ -7274,7 +7274,7 @@ gTrainers:: @ 81F04FC @ VIVI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "SIEGLINDE$", 12 @@ -7286,7 +7286,7 @@ gTrainers:: @ 81F04FC @ HALEY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ELISA$", 12 @@ -7298,7 +7298,7 @@ gTrainers:: @ 81F04FC @ HALEY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ELISA$", 12 @@ -7310,7 +7310,7 @@ gTrainers:: @ 81F04FC @ HALEY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ELISA$", 12 @@ -7322,7 +7322,7 @@ gTrainers:: @ 81F04FC @ HALEY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ELISA$", 12 @@ -7334,7 +7334,7 @@ gTrainers:: @ 81F04FC @ SALLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "FREDERIKE$", 12 @@ -7346,7 +7346,7 @@ gTrainers:: @ 81F04FC @ ROBIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ROBIN$", 12 @@ -7358,7 +7358,7 @@ gTrainers:: @ 81F04FC @ ANDREA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "FRIEDA$", 12 @@ -7370,7 +7370,7 @@ gTrainers:: @ 81F04FC @ CRISSY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ADELHEID$", 12 @@ -7382,7 +7382,7 @@ gTrainers:: @ 81F04FC @ RICK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "BALDUR$", 12 @@ -7394,7 +7394,7 @@ gTrainers:: @ 81F04FC @ LYLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "DETWIN$", 12 @@ -7406,7 +7406,7 @@ gTrainers:: @ 81F04FC @ JOSE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "EROS$", 12 @@ -7418,7 +7418,7 @@ gTrainers:: @ 81F04FC @ DOUG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "EUSEBIUS$", 12 @@ -7430,7 +7430,7 @@ gTrainers:: @ 81F04FC @ GREG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GANGOLF$", 12 @@ -7442,7 +7442,7 @@ gTrainers:: @ 81F04FC @ KENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GERIT$", 12 @@ -7454,7 +7454,7 @@ gTrainers:: @ 81F04FC @ JAMES_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GERNOT$", 12 @@ -7466,7 +7466,7 @@ gTrainers:: @ 81F04FC @ JAMES_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GERNOT$", 12 @@ -7478,7 +7478,7 @@ gTrainers:: @ 81F04FC @ JAMES_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GERNOT$", 12 @@ -7490,7 +7490,7 @@ gTrainers:: @ 81F04FC @ JAMES_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GERNOT$", 12 @@ -7502,7 +7502,7 @@ gTrainers:: @ 81F04FC @ JAMES_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GERNOT$", 12 @@ -7514,7 +7514,7 @@ gTrainers:: @ 81F04FC @ BRICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "GISBERT$", 12 @@ -7526,7 +7526,7 @@ gTrainers:: @ 81F04FC @ TRENT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "HEIMKE$", 12 @@ -7538,7 +7538,7 @@ gTrainers:: @ 81F04FC @ LENNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "JANNO$", 12 @@ -7550,7 +7550,7 @@ gTrainers:: @ 81F04FC @ LUCAS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "KLODWIG$", 12 @@ -7562,7 +7562,7 @@ gTrainers:: @ 81F04FC @ ALAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LANZELOT$", 12 @@ -7574,7 +7574,7 @@ gTrainers:: @ 81F04FC @ CLARK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LUZIUS$", 12 @@ -7586,7 +7586,7 @@ gTrainers:: @ 81F04FC @ ERIC .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "MAURIZIO$", 12 @@ -7598,7 +7598,7 @@ gTrainers:: @ 81F04FC @ LUCAS_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "KLODWIG$", 12 @@ -7610,7 +7610,7 @@ gTrainers:: @ 81F04FC @ MIKE_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "MELVIN$", 12 @@ -7622,7 +7622,7 @@ gTrainers:: @ 81F04FC @ MIKE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "MELVIN$", 12 @@ -7634,7 +7634,7 @@ gTrainers:: @ 81F04FC @ TRENT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "HEIMKE$", 12 @@ -7646,7 +7646,7 @@ gTrainers:: @ 81F04FC @ TRENT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "HEIMKE$", 12 @@ -7658,7 +7658,7 @@ gTrainers:: @ 81F04FC @ TRENT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "HEIMKE$", 12 @@ -7670,7 +7670,7 @@ gTrainers:: @ 81F04FC @ TRENT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "HEIMKE$", 12 @@ -7682,7 +7682,7 @@ gTrainers:: @ 81F04FC @ DEZ_AND_LUKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "INA & LEIF$", 12 @@ -7694,7 +7694,7 @@ gTrainers:: @ 81F04FC @ LEA_AND_JED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LENA & UWE$", 12 @@ -7706,7 +7706,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "GESA & PIT$", 12 @@ -7718,7 +7718,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "GESA & PIT$", 12 @@ -7730,7 +7730,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "GESA & PIT$", 12 @@ -7742,7 +7742,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "GESA & PIT$", 12 @@ -7754,7 +7754,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "GESA & PIT$", 12 @@ -7766,7 +7766,7 @@ gTrainers:: @ 81F04FC @ JOHANNA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "CORDULA$", 12 @@ -7778,7 +7778,7 @@ gTrainers:: @ 81F04FC @ ZANE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "OTBERT$", 12 @@ -7790,7 +7790,7 @@ gTrainers:: @ 81F04FC @ VIVIAN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "BÄRBEL$", 12 @@ -7802,7 +7802,7 @@ gTrainers:: @ 81F04FC @ SADIE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CHANTAL$", 12 @@ -7814,7 +7814,7 @@ gTrainers:: @ 81F04FC @ HIDEO_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "SAUL$", 12 @@ -7826,7 +7826,7 @@ gTrainers:: @ 81F04FC @ KEIGO .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "NELSON$", 12 @@ -7838,7 +7838,7 @@ gTrainers:: @ 81F04FC @ TSUNAO .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "NIKODEMUS$", 12 @@ -7850,7 +7850,7 @@ gTrainers:: @ 81F04FC @ TERRELL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "NESTOR$", 12 @@ -7862,7 +7862,7 @@ gTrainers:: @ 81F04FC @ KYLEE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "MIREILLE$", 12 @@ -7874,7 +7874,7 @@ gTrainers:: @ 81F04FC @ WALLY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "HEIKO$", 12 @@ -7886,7 +7886,7 @@ gTrainers:: @ 81F04FC @ WALLY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "HEIKO$", 12 @@ -7898,7 +7898,7 @@ gTrainers:: @ 81F04FC @ WALLY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "HEIKO$", 12 @@ -7910,7 +7910,7 @@ gTrainers:: @ 81F04FC @ WALLY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "HEIKO$", 12 @@ -7922,7 +7922,7 @@ gTrainers:: @ 81F04FC @ WALLY_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "HEIKO$", 12 @@ -7934,7 +7934,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -7946,7 +7946,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -7958,7 +7958,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRIX$", 12 @@ -7970,7 +7970,7 @@ gTrainers:: @ 81F04FC @ MAY_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -7982,7 +7982,7 @@ gTrainers:: @ 81F04FC @ MAY_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -7994,7 +7994,7 @@ gTrainers:: @ 81F04FC @ MAY_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAIKE$", 12 @@ -8006,7 +8006,7 @@ gTrainers:: @ 81F04FC @ JONAH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "OLOF$", 12 @@ -8018,7 +8018,7 @@ gTrainers:: @ 81F04FC @ HENRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "PIUS$", 12 @@ -8030,7 +8030,7 @@ gTrainers:: @ 81F04FC @ ROGER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "AMATUS$", 12 @@ -8042,7 +8042,7 @@ gTrainers:: @ 81F04FC @ ALEXA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "ANNABEL$", 12 @@ -8054,7 +8054,7 @@ gTrainers:: @ 81F04FC @ RUBEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "TRUTZ$", 12 @@ -8066,7 +8066,7 @@ gTrainers:: @ 81F04FC @ KOJI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "REMIGIUS$", 12 @@ -8078,7 +8078,7 @@ gTrainers:: @ 81F04FC @ WAYNE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ALVARO$", 12 @@ -8090,7 +8090,7 @@ gTrainers:: @ 81F04FC @ BYRON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "AMALRICH$", 12 @@ -8102,7 +8102,7 @@ gTrainers:: @ 81F04FC @ REED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "ANDOLIN$", 12 @@ -8114,7 +8114,7 @@ gTrainers:: @ 81F04FC @ TISHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "IMKE$", 12 @@ -8126,7 +8126,7 @@ gTrainers:: @ 81F04FC @ TORI_AND_TIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "LI & FLO$", 12 @@ -8138,7 +8138,7 @@ gTrainers:: @ 81F04FC @ KIM_AND_IRIS .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ZOE & IRIS$", 12 @@ -8150,7 +8150,7 @@ gTrainers:: @ 81F04FC @ TYRA_AND_IVY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "TYRA & IVY$", 12 @@ -8162,7 +8162,7 @@ gTrainers:: @ 81F04FC @ MEL_AND_PAUL .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "GELI & OLE$", 12 @@ -8174,7 +8174,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "URS & EVI$", 12 @@ -8186,7 +8186,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "URS & EVI$", 12 @@ -8198,7 +8198,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "URS & EVI$", 12 @@ -8210,7 +8210,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "URS & EVI$", 12 @@ -8222,7 +8222,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "URS & EVI$", 12 @@ -8234,7 +8234,7 @@ gTrainers:: @ 81F04FC @ RELI_AND_IAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "TOBI & UNA$", 12 @@ -8246,7 +8246,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "TOM & UTA$", 12 @@ -8258,7 +8258,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "TOM & UTA$", 12 @@ -8270,7 +8270,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "TOM & UTA$", 12 @@ -8282,7 +8282,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "TOM & UTA$", 12 @@ -8294,7 +8294,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "TOM & UTA$", 12 @@ -8306,7 +8306,7 @@ gTrainers:: @ 81F04FC @ LISA_AND_RAY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "ERKO & BEA$", 12 @@ -8318,7 +8318,7 @@ gTrainers:: @ 81F04FC @ EUGENE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ABELKE$", 12 diff --git a/data/data2a.s b/data/data2a.s index 103b723e8..3bd3f6ebd 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -964,7 +964,7 @@ gUnknown_081FA640:: @ 81FA640 .align 2 gUnknown_081FA678:: @ 81FA678 .4byte bc_8013B1C - .4byte sub_8013998 + .4byte HandleEndTurn_BattleWon .4byte sub_8013B64 .4byte sub_8013B64 .4byte sub_8013BDC diff --git a/data/trainer_money.inc b/data/trainer_money.inc index 95da92fea..ceffb0a61 100644 --- a/data/trainer_money.inc +++ b/data/trainer_money.inc @@ -1,58 +1,58 @@ @ This is a factor in how much money you get for beating a trainer. .align 2 gTrainerMoney:: @ 81F98F0 - .byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_F, 1, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_M, 1, 0, 0 - .byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0 - .byte TRAINER_CLASS_NAME_COOL_TRAINER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 - .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 - .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 - .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 - .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 - .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 - .byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0 - .byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0 - .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 - .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 - .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 - .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 - .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 - .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 - .byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 15, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMON_RANGER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 + .byte TRAINER_CLASS_TEAM_AQUA, 5, 0, 0 + .byte TRAINER_CLASS_AQUA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_AQUA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_AROMA_LADY, 10, 0, 0 + .byte TRAINER_CLASS_RUIN_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_INTERVIEWER, 12, 0, 0 + .byte TRAINER_CLASS_TUBER_F, 1, 0, 0 + .byte TRAINER_CLASS_TUBER_M, 1, 0, 0 + .byte TRAINER_CLASS_SIS_AND_BRO, 3, 0, 0 + .byte TRAINER_CLASS_COOL_TRAINER, 12, 0, 0 + .byte TRAINER_CLASS_HEX_MANIAC, 6, 0, 0 + .byte TRAINER_CLASS_LADY, 50, 0, 0 + .byte TRAINER_CLASS_BEAUTY, 20, 0, 0 + .byte TRAINER_CLASS_RICH_BOY, 50, 0, 0 + .byte TRAINER_CLASS_POKEMANIAC, 15, 0, 0 + .byte TRAINER_CLASS_SWIMMER_M, 2, 0, 0 + .byte TRAINER_CLASS_BLACK_BELT, 8, 0, 0 + .byte TRAINER_CLASS_GUITARIST, 8, 0, 0 + .byte TRAINER_CLASS_KINDLER, 8, 0, 0 + .byte TRAINER_CLASS_CAMPER, 4, 0, 0 + .byte TRAINER_CLASS_OLD_COUPLE, 10, 0, 0 + .byte TRAINER_CLASS_BUG_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_PSYCHIC, 6, 0, 0 + .byte TRAINER_CLASS_GENTLEMAN, 20, 0, 0 + .byte TRAINER_CLASS_ELITE_FOUR, 25, 0, 0 + .byte TRAINER_CLASS_LEADER, 25, 0, 0 + .byte TRAINER_CLASS_SCHOOL_KID, 5, 0, 0 + .byte TRAINER_CLASS_SR_AND_JR, 4, 0, 0 + .byte TRAINER_CLASS_POKEFAN, 20, 0, 0 + .byte TRAINER_CLASS_EXPERT, 10, 0, 0 + .byte TRAINER_CLASS_YOUNGSTER, 4, 0, 0 + .byte TRAINER_CLASS_CHAMPION, 50, 0, 0 + .byte TRAINER_CLASS_FISHERMAN, 10, 0, 0 + .byte TRAINER_CLASS_TRIATHLETE, 10, 0, 0 + .byte TRAINER_CLASS_DRAGON_TAMER, 12, 0, 0 + .byte TRAINER_CLASS_BIRD_KEEPER, 8, 0, 0 + .byte TRAINER_CLASS_NINJA_BOY, 3, 0, 0 + .byte TRAINER_CLASS_BATTLE_GIRL, 6, 0, 0 + .byte TRAINER_CLASS_PARASOL_LADY, 10, 0, 0 + .byte TRAINER_CLASS_SWIMMER_F, 2, 0, 0 + .byte TRAINER_CLASS_PICNICKER, 4, 0, 0 + .byte TRAINER_CLASS_TWINS, 3, 0, 0 + .byte TRAINER_CLASS_SAILOR, 8, 0, 0 + .byte TRAINER_CLASS_COLLECTOR, 15, 0, 0 + .byte TRAINER_CLASS_POKEMON_TRAINER_3, 15, 0, 0 + .byte TRAINER_CLASS_POKEMON_BREEDER, 10, 0, 0 + .byte TRAINER_CLASS_POKEMON_RANGER, 12, 0, 0 + .byte TRAINER_CLASS_TEAM_MAGMA, 5, 0, 0 + .byte TRAINER_CLASS_MAGMA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_MAGMA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_LASS, 4, 0, 0 + .byte TRAINER_CLASS_BUG_CATCHER, 4, 0, 0 + .byte TRAINER_CLASS_HIKER, 10, 0, 0 + .byte TRAINER_CLASS_YOUNG_COUPLE, 8, 0, 0 .byte -1, 5, 0, 0 diff --git a/data/trainers.inc b/data/trainers.inc index 8e80cd77f..be9ce1a81 100644 --- a/data/trainers.inc +++ b/data/trainers.inc @@ -2,7 +2,7 @@ gTrainers:: @ 81F04FC @ NONE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_1 + .byte TRAINER_CLASS_POKEMON_TRAINER_1 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "$", 12 @@ -14,7 +14,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ARCHIE$", 12 @@ -26,7 +26,7 @@ gTrainers:: @ 81F04FC @ GRUNT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -38,7 +38,7 @@ gTrainers:: @ 81F04FC @ GRUNT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -50,7 +50,7 @@ gTrainers:: @ 81F04FC @ GRUNT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -62,7 +62,7 @@ gTrainers:: @ 81F04FC @ GRUNT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -74,7 +74,7 @@ gTrainers:: @ 81F04FC @ GRUNT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -86,7 +86,7 @@ gTrainers:: @ 81F04FC @ GRUNT_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -98,7 +98,7 @@ gTrainers:: @ 81F04FC @ GRUNT_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -110,7 +110,7 @@ gTrainers:: @ 81F04FC @ GRUNT_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -122,7 +122,7 @@ gTrainers:: @ 81F04FC @ GRUNT_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -134,7 +134,7 @@ gTrainers:: @ 81F04FC @ GRUNT_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -146,7 +146,7 @@ gTrainers:: @ 81F04FC @ GRUNT_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -158,7 +158,7 @@ gTrainers:: @ 81F04FC @ GRUNT_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -170,7 +170,7 @@ gTrainers:: @ 81F04FC @ GRUNT_13 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -182,7 +182,7 @@ gTrainers:: @ 81F04FC @ GRUNT_14 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -194,7 +194,7 @@ gTrainers:: @ 81F04FC @ GRUNT_15 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -206,7 +206,7 @@ gTrainers:: @ 81F04FC @ GRUNT_16 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -218,7 +218,7 @@ gTrainers:: @ 81F04FC @ GRUNT_17 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -230,7 +230,7 @@ gTrainers:: @ 81F04FC @ GRUNT_18 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -242,7 +242,7 @@ gTrainers:: @ 81F04FC @ GRUNT_19 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -254,7 +254,7 @@ gTrainers:: @ 81F04FC @ GRUNT_20 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -266,7 +266,7 @@ gTrainers:: @ 81F04FC @ GRUNT_21 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -278,7 +278,7 @@ gTrainers:: @ 81F04FC @ GRUNT_22 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -290,7 +290,7 @@ gTrainers:: @ 81F04FC @ GRUNT_23 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -302,7 +302,7 @@ gTrainers:: @ 81F04FC @ GRUNT_24 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -314,7 +314,7 @@ gTrainers:: @ 81F04FC @ GRUNT_25 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "GRUNT$", 12 @@ -326,7 +326,7 @@ gTrainers:: @ 81F04FC @ GRUNT_26 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "GRUNT$", 12 @@ -338,7 +338,7 @@ gTrainers:: @ 81F04FC @ GRUNT_27 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "GRUNT$", 12 @@ -350,7 +350,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "$", 12 @@ -362,7 +362,7 @@ gTrainers:: @ 81F04FC @ MATT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "MATT$", 12 @@ -374,7 +374,7 @@ gTrainers:: @ 81F04FC @ MATT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "MATT$", 12 @@ -386,7 +386,7 @@ gTrainers:: @ 81F04FC @ SHELLY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F .string "SHELLY$", 12 @@ -398,7 +398,7 @@ gTrainers:: @ 81F04FC @ SHELLY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F .string "SHELLY$", 12 @@ -410,7 +410,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ARCHIE$", 12 @@ -422,7 +422,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ARCHIE$", 12 @@ -434,7 +434,7 @@ gTrainers:: @ 81F04FC @ DAISY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "DAISY$", 12 @@ -446,7 +446,7 @@ gTrainers:: @ 81F04FC @ ROSE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -458,7 +458,7 @@ gTrainers:: @ 81F04FC @ LILY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "LILY$", 12 @@ -470,7 +470,7 @@ gTrainers:: @ 81F04FC @ VIOLET .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "VIOLET$", 12 @@ -482,7 +482,7 @@ gTrainers:: @ 81F04FC @ ROSE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -494,7 +494,7 @@ gTrainers:: @ 81F04FC @ ROSE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -506,7 +506,7 @@ gTrainers:: @ 81F04FC @ ROSE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -518,7 +518,7 @@ gTrainers:: @ 81F04FC @ ROSE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -530,7 +530,7 @@ gTrainers:: @ 81F04FC @ DUSTY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -542,7 +542,7 @@ gTrainers:: @ 81F04FC @ CHIP .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "CHIP$", 12 @@ -554,7 +554,7 @@ gTrainers:: @ 81F04FC @ FOSTER .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "FOSTER$", 12 @@ -566,7 +566,7 @@ gTrainers:: @ 81F04FC @ DUSTY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -578,7 +578,7 @@ gTrainers:: @ 81F04FC @ DUSTY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -590,7 +590,7 @@ gTrainers:: @ 81F04FC @ DUSTY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -602,7 +602,7 @@ gTrainers:: @ 81F04FC @ DUSTY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -614,7 +614,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -626,7 +626,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -638,7 +638,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -650,7 +650,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -662,7 +662,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -674,7 +674,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -686,7 +686,7 @@ gTrainers:: @ 81F04FC @ LOLA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -698,7 +698,7 @@ gTrainers:: @ 81F04FC @ CARMEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "CARMEN$", 12 @@ -710,7 +710,7 @@ gTrainers:: @ 81F04FC @ GWEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "GWEN $", 12 @@ -722,7 +722,7 @@ gTrainers:: @ 81F04FC @ LOLA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -734,7 +734,7 @@ gTrainers:: @ 81F04FC @ LOLA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -746,7 +746,7 @@ gTrainers:: @ 81F04FC @ LOLA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -758,7 +758,7 @@ gTrainers:: @ 81F04FC @ LOLA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -770,7 +770,7 @@ gTrainers:: @ 81F04FC @ RICKY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -782,7 +782,7 @@ gTrainers:: @ 81F04FC @ SIMON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "SIMON$", 12 @@ -794,7 +794,7 @@ gTrainers:: @ 81F04FC @ CHARLIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "CHARLIE$", 12 @@ -806,7 +806,7 @@ gTrainers:: @ 81F04FC @ RICKY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -818,7 +818,7 @@ gTrainers:: @ 81F04FC @ RICKY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -830,7 +830,7 @@ gTrainers:: @ 81F04FC @ RICKY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -842,7 +842,7 @@ gTrainers:: @ 81F04FC @ RICKY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -854,7 +854,7 @@ gTrainers:: @ 81F04FC @ RANDALL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "RANDALL$", 12 @@ -866,7 +866,7 @@ gTrainers:: @ 81F04FC @ PARKER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PARKER$", 12 @@ -878,7 +878,7 @@ gTrainers:: @ 81F04FC @ GEORGE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "GEORGE$", 12 @@ -890,7 +890,7 @@ gTrainers:: @ 81F04FC @ BERKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "BERKE$", 12 @@ -902,7 +902,7 @@ gTrainers:: @ 81F04FC @ CLYDE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "CLYDE$", 12 @@ -914,7 +914,7 @@ gTrainers:: @ 81F04FC @ VINCENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "VINCENT$", 12 @@ -926,7 +926,7 @@ gTrainers:: @ 81F04FC @ LEROY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "LEROY$", 12 @@ -938,7 +938,7 @@ gTrainers:: @ 81F04FC @ WILTON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -950,7 +950,7 @@ gTrainers:: @ 81F04FC @ EDGAR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "EDGAR$", 12 @@ -962,7 +962,7 @@ gTrainers:: @ 81F04FC @ ALBERT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "ALBERT$", 12 @@ -974,7 +974,7 @@ gTrainers:: @ 81F04FC @ SAMUEL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "SAMUEL$", 12 @@ -986,7 +986,7 @@ gTrainers:: @ 81F04FC @ VITO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "VITO$", 12 @@ -998,7 +998,7 @@ gTrainers:: @ 81F04FC @ OWEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "OWEN$", 12 @@ -1010,7 +1010,7 @@ gTrainers:: @ 81F04FC @ WILTON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1022,7 +1022,7 @@ gTrainers:: @ 81F04FC @ WILTON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1034,7 +1034,7 @@ gTrainers:: @ 81F04FC @ WILTON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1046,7 +1046,7 @@ gTrainers:: @ 81F04FC @ WILTON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1058,7 +1058,7 @@ gTrainers:: @ 81F04FC @ WARREN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WARREN$", 12 @@ -1070,7 +1070,7 @@ gTrainers:: @ 81F04FC @ MARY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "MARY$", 12 @@ -1082,7 +1082,7 @@ gTrainers:: @ 81F04FC @ LORI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "LORI$", 12 @@ -1094,7 +1094,7 @@ gTrainers:: @ 81F04FC @ JODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "JODY$", 12 @@ -1106,7 +1106,7 @@ gTrainers:: @ 81F04FC @ WENDY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "WENDY$", 12 @@ -1118,7 +1118,7 @@ gTrainers:: @ 81F04FC @ ELAINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "ELAINE$", 12 @@ -1130,7 +1130,7 @@ gTrainers:: @ 81F04FC @ BROOKE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1142,7 +1142,7 @@ gTrainers:: @ 81F04FC @ JENNIFER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "JENNIFER$", 12 @@ -1154,7 +1154,7 @@ gTrainers:: @ 81F04FC @ HOPE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "HOPE$", 12 @@ -1166,7 +1166,7 @@ gTrainers:: @ 81F04FC @ SHANNON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "SHANNON$", 12 @@ -1178,7 +1178,7 @@ gTrainers:: @ 81F04FC @ MICHELLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "MICHELLE$", 12 @@ -1190,7 +1190,7 @@ gTrainers:: @ 81F04FC @ CAROLINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "CAROLINE$", 12 @@ -1202,7 +1202,7 @@ gTrainers:: @ 81F04FC @ JULIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "JULIE$", 12 @@ -1214,7 +1214,7 @@ gTrainers:: @ 81F04FC @ BROOKE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1226,7 +1226,7 @@ gTrainers:: @ 81F04FC @ BROOKE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1238,7 +1238,7 @@ gTrainers:: @ 81F04FC @ BROOKE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1250,7 +1250,7 @@ gTrainers:: @ 81F04FC @ BROOKE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1262,7 +1262,7 @@ gTrainers:: @ 81F04FC @ PATRICIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "PATRICIA$", 12 @@ -1274,7 +1274,7 @@ gTrainers:: @ 81F04FC @ KINDRA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "KINDRA$", 12 @@ -1286,7 +1286,7 @@ gTrainers:: @ 81F04FC @ TAMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TAMMY$", 12 @@ -1298,7 +1298,7 @@ gTrainers:: @ 81F04FC @ VALERIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1310,7 +1310,7 @@ gTrainers:: @ 81F04FC @ TASHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TASHA$", 12 @@ -1322,7 +1322,7 @@ gTrainers:: @ 81F04FC @ VALERIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1334,7 +1334,7 @@ gTrainers:: @ 81F04FC @ VALERIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1346,7 +1346,7 @@ gTrainers:: @ 81F04FC @ VALERIE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1358,7 +1358,7 @@ gTrainers:: @ 81F04FC @ VALERIE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1370,7 +1370,7 @@ gTrainers:: @ 81F04FC @ CINDY_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1382,7 +1382,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "$", 12 @@ -1394,7 +1394,7 @@ gTrainers:: @ 81F04FC @ BRIANNA_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "BRIANNA$", 12 @@ -1406,7 +1406,7 @@ gTrainers:: @ 81F04FC @ CINDY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1418,7 +1418,7 @@ gTrainers:: @ 81F04FC @ BRIANNA_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "BRIANNA$", 12 @@ -1430,7 +1430,7 @@ gTrainers:: @ 81F04FC @ ANETTE .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "ANETTE$", 12 @@ -1442,7 +1442,7 @@ gTrainers:: @ 81F04FC @ CINDY_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1454,7 +1454,7 @@ gTrainers:: @ 81F04FC @ CINDY_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1466,7 +1466,7 @@ gTrainers:: @ 81F04FC @ CINDY_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1478,7 +1478,7 @@ gTrainers:: @ 81F04FC @ CINDY_6 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1490,7 +1490,7 @@ gTrainers:: @ 81F04FC @ MELISSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "MELISSA$", 12 @@ -1502,7 +1502,7 @@ gTrainers:: @ 81F04FC @ SHEILA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "SHEILA$", 12 @@ -1514,7 +1514,7 @@ gTrainers:: @ 81F04FC @ SHIRLEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "SHIRLEY$", 12 @@ -1526,7 +1526,7 @@ gTrainers:: @ 81F04FC @ JESSICA_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1538,7 +1538,7 @@ gTrainers:: @ 81F04FC @ CONNIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "CONNIE$", 12 @@ -1550,7 +1550,7 @@ gTrainers:: @ 81F04FC @ BRIDGET .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "BRIDGET$", 12 @@ -1562,7 +1562,7 @@ gTrainers:: @ 81F04FC @ OLIVIA .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "OLIVIA$", 12 @@ -1574,7 +1574,7 @@ gTrainers:: @ 81F04FC @ TIFFANY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "TIFFANY$", 12 @@ -1586,7 +1586,7 @@ gTrainers:: @ 81F04FC @ JESSICA_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1598,7 +1598,7 @@ gTrainers:: @ 81F04FC @ JESSICA_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1610,7 +1610,7 @@ gTrainers:: @ 81F04FC @ JESSICA_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1622,7 +1622,7 @@ gTrainers:: @ 81F04FC @ JESSICA_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1634,7 +1634,7 @@ gTrainers:: @ 81F04FC @ WINSTON_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1646,7 +1646,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "$", 12 @@ -1658,7 +1658,7 @@ gTrainers:: @ 81F04FC @ GARRET .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "GARRET$", 12 @@ -1670,7 +1670,7 @@ gTrainers:: @ 81F04FC @ WINSTON_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1682,7 +1682,7 @@ gTrainers:: @ 81F04FC @ WINSTON_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1694,7 +1694,7 @@ gTrainers:: @ 81F04FC @ WINSTON_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1706,7 +1706,7 @@ gTrainers:: @ 81F04FC @ WINSTON_5 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1718,7 +1718,7 @@ gTrainers:: @ 81F04FC @ STEVE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1730,7 +1730,7 @@ gTrainers:: @ 81F04FC @ CHRIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "CHRIS$", 12 @@ -1742,7 +1742,7 @@ gTrainers:: @ 81F04FC @ MARK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "MARK$", 12 @@ -1754,7 +1754,7 @@ gTrainers:: @ 81F04FC @ KENN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "KENN$", 12 @@ -1766,7 +1766,7 @@ gTrainers:: @ 81F04FC @ STEVE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1778,7 +1778,7 @@ gTrainers:: @ 81F04FC @ STEVE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1790,7 +1790,7 @@ gTrainers:: @ 81F04FC @ STEVE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1802,7 +1802,7 @@ gTrainers:: @ 81F04FC @ STEVE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1814,7 +1814,7 @@ gTrainers:: @ 81F04FC @ LUIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "LUIS$", 12 @@ -1826,7 +1826,7 @@ gTrainers:: @ 81F04FC @ AUSTIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "AUSTIN$", 12 @@ -1838,7 +1838,7 @@ gTrainers:: @ 81F04FC @ DOUGLAS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DOUGLAS$", 12 @@ -1850,7 +1850,7 @@ gTrainers:: @ 81F04FC @ DARRIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DARRIN$", 12 @@ -1862,7 +1862,7 @@ gTrainers:: @ 81F04FC @ TONY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -1874,7 +1874,7 @@ gTrainers:: @ 81F04FC @ JEROME .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "JEROME$", 12 @@ -1886,7 +1886,7 @@ gTrainers:: @ 81F04FC @ MATTHEW .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "MATTHEW$", 12 @@ -1898,7 +1898,7 @@ gTrainers:: @ 81F04FC @ DAVID .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DAVID$", 12 @@ -1910,7 +1910,7 @@ gTrainers:: @ 81F04FC @ SPENCER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "SPENCER$", 12 @@ -1922,7 +1922,7 @@ gTrainers:: @ 81F04FC @ ROLAND .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "ROLAND$", 12 @@ -1934,7 +1934,7 @@ gTrainers:: @ 81F04FC @ CODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "CODY$", 12 @@ -1946,7 +1946,7 @@ gTrainers:: @ 81F04FC @ STAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "STAN$", 12 @@ -1958,7 +1958,7 @@ gTrainers:: @ 81F04FC @ BARRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "BARRY$", 12 @@ -1970,7 +1970,7 @@ gTrainers:: @ 81F04FC @ DEAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DEAN$", 12 @@ -1982,7 +1982,7 @@ gTrainers:: @ 81F04FC @ RODNEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "RODNEY$", 12 @@ -1994,7 +1994,7 @@ gTrainers:: @ 81F04FC @ RICHARD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "RICHARD$", 12 @@ -2006,7 +2006,7 @@ gTrainers:: @ 81F04FC @ HERMAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "HERMAN$", 12 @@ -2018,7 +2018,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "$", 12 @@ -2030,7 +2030,7 @@ gTrainers:: @ 81F04FC @ GILBERT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "GILBERT$", 12 @@ -2042,7 +2042,7 @@ gTrainers:: @ 81F04FC @ FRANKLIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "FRANKLIN$", 12 @@ -2054,7 +2054,7 @@ gTrainers:: @ 81F04FC @ DANNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DANNY$", 12 @@ -2066,7 +2066,7 @@ gTrainers:: @ 81F04FC @ JACK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "JACK$", 12 @@ -2078,7 +2078,7 @@ gTrainers:: @ 81F04FC @ DUDLEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DUDLEY$", 12 @@ -2090,7 +2090,7 @@ gTrainers:: @ 81F04FC @ CHAD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "CHAD$", 12 @@ -2102,7 +2102,7 @@ gTrainers:: @ 81F04FC @ TONY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2114,7 +2114,7 @@ gTrainers:: @ 81F04FC @ TONY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2126,7 +2126,7 @@ gTrainers:: @ 81F04FC @ TONY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2138,7 +2138,7 @@ gTrainers:: @ 81F04FC @ TONY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2150,7 +2150,7 @@ gTrainers:: @ 81F04FC @ HIDEKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "HIDEKI$", 12 @@ -2162,7 +2162,7 @@ gTrainers:: @ 81F04FC @ HITOSHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "HITOSHI$", 12 @@ -2174,7 +2174,7 @@ gTrainers:: @ 81F04FC @ KIYO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "KIYO$", 12 @@ -2186,7 +2186,7 @@ gTrainers:: @ 81F04FC @ KOICHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "KOICHI$", 12 @@ -2198,7 +2198,7 @@ gTrainers:: @ 81F04FC @ NOB_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2210,7 +2210,7 @@ gTrainers:: @ 81F04FC @ NOB_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2222,7 +2222,7 @@ gTrainers:: @ 81F04FC @ NOB_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2234,7 +2234,7 @@ gTrainers:: @ 81F04FC @ NOB_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2246,7 +2246,7 @@ gTrainers:: @ 81F04FC @ NOB_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2258,7 +2258,7 @@ gTrainers:: @ 81F04FC @ YUJI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "YUJI$", 12 @@ -2270,7 +2270,7 @@ gTrainers:: @ 81F04FC @ DAISUKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "DAISUKE$", 12 @@ -2282,7 +2282,7 @@ gTrainers:: @ 81F04FC @ ATSUSHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "ATSUSHI$", 12 @@ -2294,7 +2294,7 @@ gTrainers:: @ 81F04FC @ KIRK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KIRK$", 12 @@ -2306,7 +2306,7 @@ gTrainers:: @ 81F04FC @ SCOTT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "SCOTT$", 12 @@ -2318,7 +2318,7 @@ gTrainers:: @ 81F04FC @ HARVEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "HARVEY$", 12 @@ -2330,7 +2330,7 @@ gTrainers:: @ 81F04FC @ SHAWN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "SHAWN$", 12 @@ -2342,7 +2342,7 @@ gTrainers:: @ 81F04FC @ RANDY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "RANDY$", 12 @@ -2354,7 +2354,7 @@ gTrainers:: @ 81F04FC @ DALTON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2366,7 +2366,7 @@ gTrainers:: @ 81F04FC @ DALTON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2378,7 +2378,7 @@ gTrainers:: @ 81F04FC @ DALTON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2390,7 +2390,7 @@ gTrainers:: @ 81F04FC @ DALTON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2402,7 +2402,7 @@ gTrainers:: @ 81F04FC @ DALTON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2414,7 +2414,7 @@ gTrainers:: @ 81F04FC @ COLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "COLE$", 12 @@ -2426,7 +2426,7 @@ gTrainers:: @ 81F04FC @ FLINT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "FLINT$", 12 @@ -2438,7 +2438,7 @@ gTrainers:: @ 81F04FC @ AXLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "AXLE$", 12 @@ -2450,7 +2450,7 @@ gTrainers:: @ 81F04FC @ JAKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "JAKE$", 12 @@ -2462,7 +2462,7 @@ gTrainers:: @ 81F04FC @ ANDY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "ANDY$", 12 @@ -2474,7 +2474,7 @@ gTrainers:: @ 81F04FC @ BERNIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2486,7 +2486,7 @@ gTrainers:: @ 81F04FC @ BERNIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2498,7 +2498,7 @@ gTrainers:: @ 81F04FC @ BERNIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2510,7 +2510,7 @@ gTrainers:: @ 81F04FC @ BERNIE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2522,7 +2522,7 @@ gTrainers:: @ 81F04FC @ BERNIE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2534,7 +2534,7 @@ gTrainers:: @ 81F04FC @ DREW .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "DREW$", 12 @@ -2546,7 +2546,7 @@ gTrainers:: @ 81F04FC @ CLIFF .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "CLIFF$", 12 @@ -2558,7 +2558,7 @@ gTrainers:: @ 81F04FC @ LARRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "LARRY$", 12 @@ -2570,7 +2570,7 @@ gTrainers:: @ 81F04FC @ SHANE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "SHANE$", 12 @@ -2582,7 +2582,7 @@ gTrainers:: @ 81F04FC @ JUSTIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "JUSTIN$", 12 @@ -2594,7 +2594,7 @@ gTrainers:: @ 81F04FC @ ETHAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2606,7 +2606,7 @@ gTrainers:: @ 81F04FC @ JEFF .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "JEFF$", 12 @@ -2618,7 +2618,7 @@ gTrainers:: @ 81F04FC @ TRAVIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "TRAVIS$", 12 @@ -2630,7 +2630,7 @@ gTrainers:: @ 81F04FC @ ETHAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2642,7 +2642,7 @@ gTrainers:: @ 81F04FC @ ETHAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2654,7 +2654,7 @@ gTrainers:: @ 81F04FC @ ETHAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2666,7 +2666,7 @@ gTrainers:: @ 81F04FC @ ETHAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2678,7 +2678,7 @@ gTrainers:: @ 81F04FC @ BRENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRENT$", 12 @@ -2690,7 +2690,7 @@ gTrainers:: @ 81F04FC @ DONALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "DONALD$", 12 @@ -2702,7 +2702,7 @@ gTrainers:: @ 81F04FC @ TAYLOR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "TAYLOR$", 12 @@ -2714,7 +2714,7 @@ gTrainers:: @ 81F04FC @ BRANDON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2726,7 +2726,7 @@ gTrainers:: @ 81F04FC @ DEREK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "DEREK$", 12 @@ -2738,7 +2738,7 @@ gTrainers:: @ 81F04FC @ BRANDON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2750,7 +2750,7 @@ gTrainers:: @ 81F04FC @ BRANDON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2762,7 +2762,7 @@ gTrainers:: @ 81F04FC @ BRANDON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2774,7 +2774,7 @@ gTrainers:: @ 81F04FC @ BRANDON_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2786,7 +2786,7 @@ gTrainers:: @ 81F04FC @ EDWARD .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "EDWARD$", 12 @@ -2798,7 +2798,7 @@ gTrainers:: @ 81F04FC @ PRESTON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "PRESTON$", 12 @@ -2810,7 +2810,7 @@ gTrainers:: @ 81F04FC @ VIRGIL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "VIRGIL$", 12 @@ -2822,7 +2822,7 @@ gTrainers:: @ 81F04FC @ FRITZ .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "FRITZ$", 12 @@ -2834,7 +2834,7 @@ gTrainers:: @ 81F04FC @ WILLIAM .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "WILLIAM$", 12 @@ -2846,7 +2846,7 @@ gTrainers:: @ 81F04FC @ JOSHUA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "JOSHUA$", 12 @@ -2858,7 +2858,7 @@ gTrainers:: @ 81F04FC @ CAMERON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2870,7 +2870,7 @@ gTrainers:: @ 81F04FC @ CAMERON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2882,7 +2882,7 @@ gTrainers:: @ 81F04FC @ CAMERON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2894,7 +2894,7 @@ gTrainers:: @ 81F04FC @ CAMERON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2906,7 +2906,7 @@ gTrainers:: @ 81F04FC @ CAMERON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2918,7 +2918,7 @@ gTrainers:: @ 81F04FC @ JACLYN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACLYN$", 12 @@ -2930,7 +2930,7 @@ gTrainers:: @ 81F04FC @ HANNAH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "HANNAH$", 12 @@ -2942,7 +2942,7 @@ gTrainers:: @ 81F04FC @ SAMANTHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "SAMANTHA$", 12 @@ -2954,7 +2954,7 @@ gTrainers:: @ 81F04FC @ MAURA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "MAURA$", 12 @@ -2966,7 +2966,7 @@ gTrainers:: @ 81F04FC @ KAYLA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "KAYLA$", 12 @@ -2978,7 +2978,7 @@ gTrainers:: @ 81F04FC @ ALEXIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "ALEXIS$", 12 @@ -2990,7 +2990,7 @@ gTrainers:: @ 81F04FC @ JACKI_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3002,7 +3002,7 @@ gTrainers:: @ 81F04FC @ JACKI_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3014,7 +3014,7 @@ gTrainers:: @ 81F04FC @ JACKI_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3026,7 +3026,7 @@ gTrainers:: @ 81F04FC @ JACKI_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3038,7 +3038,7 @@ gTrainers:: @ 81F04FC @ JACKI_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3050,7 +3050,7 @@ gTrainers:: @ 81F04FC @ WALTER_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3062,7 +3062,7 @@ gTrainers:: @ 81F04FC @ TUCKER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "TUCKER$", 12 @@ -3074,7 +3074,7 @@ gTrainers:: @ 81F04FC @ THOMAS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "THOMAS$", 12 @@ -3086,7 +3086,7 @@ gTrainers:: @ 81F04FC @ WALTER_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3098,7 +3098,7 @@ gTrainers:: @ 81F04FC @ WALTER_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3110,7 +3110,7 @@ gTrainers:: @ 81F04FC @ WALTER_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3122,7 +3122,7 @@ gTrainers:: @ 81F04FC @ WALTER_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3134,7 +3134,7 @@ gTrainers:: @ 81F04FC @ SIDNEY .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_SIDNEY .string "SIDNEY$", 12 @@ -3146,7 +3146,7 @@ gTrainers:: @ 81F04FC @ PHOEBE .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_PHOEBE .string "PHOEBE$", 12 @@ -3158,7 +3158,7 @@ gTrainers:: @ 81F04FC @ GLACIA .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_GLACIA .string "GLACIA$", 12 @@ -3170,7 +3170,7 @@ gTrainers:: @ 81F04FC @ DRAKE .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_DRAKE .string "DRAKE$", 12 @@ -3182,7 +3182,7 @@ gTrainers:: @ 81F04FC @ ROXANNE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_ROXANNE .string "ROXANNE$", 12 @@ -3194,7 +3194,7 @@ gTrainers:: @ 81F04FC @ BRAWLY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRAWLY .string "BRAWLY$", 12 @@ -3206,7 +3206,7 @@ gTrainers:: @ 81F04FC @ WATTSON .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WATTSON .string "WATTSON$", 12 @@ -3218,7 +3218,7 @@ gTrainers:: @ 81F04FC @ FLANNERY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_FLANNERY .string "FLANNERY$", 12 @@ -3230,7 +3230,7 @@ gTrainers:: @ 81F04FC @ NORMAN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_NORMAN .string "NORMAN$", 12 @@ -3242,7 +3242,7 @@ gTrainers:: @ 81F04FC @ WINONA .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_WINONA .string "WINONA$", 12 @@ -3254,7 +3254,7 @@ gTrainers:: @ 81F04FC @ TATE_AND_LIZA .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_TATE_AND_LIZA .string "TATE&LIZA$", 12 @@ -3266,7 +3266,7 @@ gTrainers:: @ 81F04FC @ WALLACE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLACE .string "WALLACE$", 12 @@ -3278,7 +3278,7 @@ gTrainers:: @ 81F04FC @ JERRY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3290,7 +3290,7 @@ gTrainers:: @ 81F04FC @ TED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "TED$", 12 @@ -3302,7 +3302,7 @@ gTrainers:: @ 81F04FC @ PAUL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "PAUL$", 12 @@ -3314,7 +3314,7 @@ gTrainers:: @ 81F04FC @ JERRY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3326,7 +3326,7 @@ gTrainers:: @ 81F04FC @ JERRY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3338,7 +3338,7 @@ gTrainers:: @ 81F04FC @ JERRY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3350,7 +3350,7 @@ gTrainers:: @ 81F04FC @ JERRY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3362,7 +3362,7 @@ gTrainers:: @ 81F04FC @ KAREN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3374,7 +3374,7 @@ gTrainers:: @ 81F04FC @ GEORGIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "GEORGIA$", 12 @@ -3386,7 +3386,7 @@ gTrainers:: @ 81F04FC @ KAREN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3398,7 +3398,7 @@ gTrainers:: @ 81F04FC @ KAREN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3410,7 +3410,7 @@ gTrainers:: @ 81F04FC @ KAREN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3422,7 +3422,7 @@ gTrainers:: @ 81F04FC @ KAREN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3434,7 +3434,7 @@ gTrainers:: @ 81F04FC @ KATE_AND_JOY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "KATE & JOY$", 12 @@ -3446,7 +3446,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3458,7 +3458,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3470,7 +3470,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3482,7 +3482,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3494,7 +3494,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3506,7 +3506,7 @@ gTrainers:: @ 81F04FC @ VICTOR .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "VICTOR$", 12 @@ -3518,7 +3518,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3530,7 +3530,7 @@ gTrainers:: @ 81F04FC @ COLTON .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "COLTON$", 12 @@ -3542,7 +3542,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3554,7 +3554,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3566,7 +3566,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3578,7 +3578,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3590,7 +3590,7 @@ gTrainers:: @ 81F04FC @ VICTORIA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "VICTORIA$", 12 @@ -3602,7 +3602,7 @@ gTrainers:: @ 81F04FC @ VANESSA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "VANESSA$", 12 @@ -3614,7 +3614,7 @@ gTrainers:: @ 81F04FC @ MARISSA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "MARISSA$", 12 @@ -3626,7 +3626,7 @@ gTrainers:: @ 81F04FC @ ISABEL_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3638,7 +3638,7 @@ gTrainers:: @ 81F04FC @ ISABEL_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3650,7 +3650,7 @@ gTrainers:: @ 81F04FC @ ISABEL_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3662,7 +3662,7 @@ gTrainers:: @ 81F04FC @ ISABEL_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3674,7 +3674,7 @@ gTrainers:: @ 81F04FC @ ISABEL_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3686,7 +3686,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3698,7 +3698,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3710,7 +3710,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3722,7 +3722,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3734,7 +3734,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3746,7 +3746,7 @@ gTrainers:: @ 81F04FC @ VICKY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "VICKY$", 12 @@ -3758,7 +3758,7 @@ gTrainers:: @ 81F04FC @ SHELBY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3770,7 +3770,7 @@ gTrainers:: @ 81F04FC @ SHELBY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3782,7 +3782,7 @@ gTrainers:: @ 81F04FC @ SHELBY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3794,7 +3794,7 @@ gTrainers:: @ 81F04FC @ SHELBY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3806,7 +3806,7 @@ gTrainers:: @ 81F04FC @ SHELBY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3818,7 +3818,7 @@ gTrainers:: @ 81F04FC @ CALVIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3830,7 +3830,7 @@ gTrainers:: @ 81F04FC @ BILLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "BILLY$", 12 @@ -3842,7 +3842,7 @@ gTrainers:: @ 81F04FC @ JOSH .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "JOSH$", 12 @@ -3854,7 +3854,7 @@ gTrainers:: @ 81F04FC @ TOMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "TOMMY$", 12 @@ -3866,7 +3866,7 @@ gTrainers:: @ 81F04FC @ JOEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "JOEY$", 12 @@ -3878,7 +3878,7 @@ gTrainers:: @ 81F04FC @ BEN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "BEN$", 12 @@ -3890,7 +3890,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -3902,7 +3902,7 @@ gTrainers:: @ 81F04FC @ KEVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "KEVIN$", 12 @@ -3914,7 +3914,7 @@ gTrainers:: @ 81F04FC @ NEAL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "NEAL$", 12 @@ -3926,7 +3926,7 @@ gTrainers:: @ 81F04FC @ DILLON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "DILLON$", 12 @@ -3938,7 +3938,7 @@ gTrainers:: @ 81F04FC @ CALVIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3950,7 +3950,7 @@ gTrainers:: @ 81F04FC @ CALVIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3962,7 +3962,7 @@ gTrainers:: @ 81F04FC @ CALVIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3974,7 +3974,7 @@ gTrainers:: @ 81F04FC @ CALVIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3986,7 +3986,7 @@ gTrainers:: @ 81F04FC @ EDDIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "EDDIE$", 12 @@ -3998,7 +3998,7 @@ gTrainers:: @ 81F04FC @ ALLEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ALLEN$", 12 @@ -4010,7 +4010,7 @@ gTrainers:: @ 81F04FC @ TIMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "TIMMY$", 12 @@ -4022,7 +4022,7 @@ gTrainers:: @ 81F04FC @ STEVEN .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CHAMPION + .byte TRAINER_CLASS_CHAMPION .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_STEVEN .string "STEVEN$", 12 @@ -4034,7 +4034,7 @@ gTrainers:: @ 81F04FC @ ANDREW .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ANDREW$", 12 @@ -4046,7 +4046,7 @@ gTrainers:: @ 81F04FC @ IVAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "IVAN$", 12 @@ -4058,7 +4058,7 @@ gTrainers:: @ 81F04FC @ CLAUDE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "CLAUDE$", 12 @@ -4070,7 +4070,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4082,7 +4082,7 @@ gTrainers:: @ 81F04FC @ NED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "NED$", 12 @@ -4094,7 +4094,7 @@ gTrainers:: @ 81F04FC @ DALE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "DALE$", 12 @@ -4106,7 +4106,7 @@ gTrainers:: @ 81F04FC @ NOLAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "NOLAN$", 12 @@ -4118,7 +4118,7 @@ gTrainers:: @ 81F04FC @ BARNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "BARNY$", 12 @@ -4130,7 +4130,7 @@ gTrainers:: @ 81F04FC @ WADE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "WADE$", 12 @@ -4142,7 +4142,7 @@ gTrainers:: @ 81F04FC @ CARTER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "CARTER$", 12 @@ -4154,7 +4154,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4166,7 +4166,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4178,7 +4178,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4190,7 +4190,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4202,7 +4202,7 @@ gTrainers:: @ 81F04FC @ RONALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "RONALD$", 12 @@ -4214,7 +4214,7 @@ gTrainers:: @ 81F04FC @ JACOB .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "JACOB$", 12 @@ -4226,7 +4226,7 @@ gTrainers:: @ 81F04FC @ ANTHONY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "ANTHONY$", 12 @@ -4238,7 +4238,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4250,7 +4250,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4262,7 +4262,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4274,7 +4274,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4286,7 +4286,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4298,7 +4298,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4310,7 +4310,7 @@ gTrainers:: @ 81F04FC @ JASMINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "JASMINE$", 12 @@ -4322,7 +4322,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4334,7 +4334,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4346,7 +4346,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4358,7 +4358,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4370,7 +4370,7 @@ gTrainers:: @ 81F04FC @ DYLAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4382,7 +4382,7 @@ gTrainers:: @ 81F04FC @ DYLAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4394,7 +4394,7 @@ gTrainers:: @ 81F04FC @ DYLAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4406,7 +4406,7 @@ gTrainers:: @ 81F04FC @ DYLAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4418,7 +4418,7 @@ gTrainers:: @ 81F04FC @ DYLAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4430,7 +4430,7 @@ gTrainers:: @ 81F04FC @ MARIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4442,7 +4442,7 @@ gTrainers:: @ 81F04FC @ MARIA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4454,7 +4454,7 @@ gTrainers:: @ 81F04FC @ MARIA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4466,7 +4466,7 @@ gTrainers:: @ 81F04FC @ MARIA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4478,7 +4478,7 @@ gTrainers:: @ 81F04FC @ MARIA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4490,7 +4490,7 @@ gTrainers:: @ 81F04FC @ CALEB .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "CALEB$", 12 @@ -4502,7 +4502,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "$", 12 @@ -4514,7 +4514,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4526,7 +4526,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "$", 12 @@ -4538,7 +4538,7 @@ gTrainers:: @ 81F04FC @ CHASE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "CHASE$", 12 @@ -4550,7 +4550,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4562,7 +4562,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4574,7 +4574,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4586,7 +4586,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4598,7 +4598,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "$", 12 @@ -4610,7 +4610,7 @@ gTrainers:: @ 81F04FC @ CONNOR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "CONNOR$", 12 @@ -4622,7 +4622,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "$", 12 @@ -4634,7 +4634,7 @@ gTrainers:: @ 81F04FC @ KATELYN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4646,7 +4646,7 @@ gTrainers:: @ 81F04FC @ ALLISON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "ALLISON$", 12 @@ -4658,7 +4658,7 @@ gTrainers:: @ 81F04FC @ KATELYN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4670,7 +4670,7 @@ gTrainers:: @ 81F04FC @ KATELYN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4682,7 +4682,7 @@ gTrainers:: @ 81F04FC @ KATELYN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4694,7 +4694,7 @@ gTrainers:: @ 81F04FC @ KATELYN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4706,7 +4706,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4718,7 +4718,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4730,7 +4730,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4742,7 +4742,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4754,7 +4754,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4766,7 +4766,7 @@ gTrainers:: @ 81F04FC @ AARON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "AARON$", 12 @@ -4778,7 +4778,7 @@ gTrainers:: @ 81F04FC @ PERRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "PERRY$", 12 @@ -4790,7 +4790,7 @@ gTrainers:: @ 81F04FC @ HUGH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "HUGH$", 12 @@ -4802,7 +4802,7 @@ gTrainers:: @ 81F04FC @ PHIL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "PHIL$", 12 @@ -4814,7 +4814,7 @@ gTrainers:: @ 81F04FC @ JARED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "JARED$", 12 @@ -4826,7 +4826,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "$", 12 @@ -4838,7 +4838,7 @@ gTrainers:: @ 81F04FC @ TANNER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "TANNER$", 12 @@ -4850,7 +4850,7 @@ gTrainers:: @ 81F04FC @ WILL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "WILL$", 12 @@ -4862,7 +4862,7 @@ gTrainers:: @ 81F04FC @ COLIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "COLIN$", 12 @@ -4874,7 +4874,7 @@ gTrainers:: @ 81F04FC @ ROBERT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4886,7 +4886,7 @@ gTrainers:: @ 81F04FC @ BENNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "BENNY$", 12 @@ -4898,7 +4898,7 @@ gTrainers:: @ 81F04FC @ CHESTER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "CHESTER$", 12 @@ -4910,7 +4910,7 @@ gTrainers:: @ 81F04FC @ ROBERT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4922,7 +4922,7 @@ gTrainers:: @ 81F04FC @ ROBERT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4934,7 +4934,7 @@ gTrainers:: @ 81F04FC @ ROBERT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4946,7 +4946,7 @@ gTrainers:: @ 81F04FC @ ROBERT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4958,7 +4958,7 @@ gTrainers:: @ 81F04FC @ ALEX .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ALEX$", 12 @@ -4970,7 +4970,7 @@ gTrainers:: @ 81F04FC @ BECK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "BECK$", 12 @@ -4982,7 +4982,7 @@ gTrainers:: @ 81F04FC @ YASU .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "YASU$", 12 @@ -4994,7 +4994,7 @@ gTrainers:: @ 81F04FC @ TAKASHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "TAKASHI$", 12 @@ -5006,7 +5006,7 @@ gTrainers:: @ 81F04FC @ MAKOTO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "MAKOTO$", 12 @@ -5018,7 +5018,7 @@ gTrainers:: @ 81F04FC @ HIDEO_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "HIDEO$", 12 @@ -5030,7 +5030,7 @@ gTrainers:: @ 81F04FC @ LAO_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5042,7 +5042,7 @@ gTrainers:: @ 81F04FC @ LUNG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LUNG$", 12 @@ -5054,7 +5054,7 @@ gTrainers:: @ 81F04FC @ LAO_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5066,7 +5066,7 @@ gTrainers:: @ 81F04FC @ LAO_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5078,7 +5078,7 @@ gTrainers:: @ 81F04FC @ LAO_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5090,7 +5090,7 @@ gTrainers:: @ 81F04FC @ LAO_5 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5102,7 +5102,7 @@ gTrainers:: @ 81F04FC @ TESSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "TESSA$", 12 @@ -5114,7 +5114,7 @@ gTrainers:: @ 81F04FC @ LAURA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "LAURA$", 12 @@ -5126,7 +5126,7 @@ gTrainers:: @ 81F04FC @ CYNDY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5138,7 +5138,7 @@ gTrainers:: @ 81F04FC @ CORA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CORA$", 12 @@ -5150,7 +5150,7 @@ gTrainers:: @ 81F04FC @ JILL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "JILL$", 12 @@ -5162,7 +5162,7 @@ gTrainers:: @ 81F04FC @ CYNDY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5174,7 +5174,7 @@ gTrainers:: @ 81F04FC @ CYNDY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5186,7 +5186,7 @@ gTrainers:: @ 81F04FC @ CYNDY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5198,7 +5198,7 @@ gTrainers:: @ 81F04FC @ CYNDY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5210,7 +5210,7 @@ gTrainers:: @ 81F04FC @ MADELINE_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5222,7 +5222,7 @@ gTrainers:: @ 81F04FC @ CLARISSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "CLARISSA$", 12 @@ -5234,7 +5234,7 @@ gTrainers:: @ 81F04FC @ ANGELICA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "ANGELICA$", 12 @@ -5246,7 +5246,7 @@ gTrainers:: @ 81F04FC @ MADELINE_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5258,7 +5258,7 @@ gTrainers:: @ 81F04FC @ MADELINE_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5270,7 +5270,7 @@ gTrainers:: @ 81F04FC @ MADELINE_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5282,7 +5282,7 @@ gTrainers:: @ 81F04FC @ MADELINE_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5294,7 +5294,7 @@ gTrainers:: @ 81F04FC @ BEVERLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "BEVERLY$", 12 @@ -5306,7 +5306,7 @@ gTrainers:: @ 81F04FC @ DAWN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DAWN$", 12 @@ -5318,7 +5318,7 @@ gTrainers:: @ 81F04FC @ NICOLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "NICOLE$", 12 @@ -5330,7 +5330,7 @@ gTrainers:: @ 81F04FC @ DENISE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DENISE$", 12 @@ -5342,7 +5342,7 @@ gTrainers:: @ 81F04FC @ BETH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "BETH$", 12 @@ -5354,7 +5354,7 @@ gTrainers:: @ 81F04FC @ TARA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "TARA$", 12 @@ -5366,7 +5366,7 @@ gTrainers:: @ 81F04FC @ MISSY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MISSY$", 12 @@ -5378,7 +5378,7 @@ gTrainers:: @ 81F04FC @ ALICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ALICE$", 12 @@ -5390,7 +5390,7 @@ gTrainers:: @ 81F04FC @ JENNY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5402,7 +5402,7 @@ gTrainers:: @ 81F04FC @ GRACE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "GRACE$", 12 @@ -5414,7 +5414,7 @@ gTrainers:: @ 81F04FC @ TANYA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "TANYA$", 12 @@ -5426,7 +5426,7 @@ gTrainers:: @ 81F04FC @ SHARON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "SHARON$", 12 @@ -5438,7 +5438,7 @@ gTrainers:: @ 81F04FC @ NIKKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "NIKKI$", 12 @@ -5450,7 +5450,7 @@ gTrainers:: @ 81F04FC @ BRENDA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "BRENDA$", 12 @@ -5462,7 +5462,7 @@ gTrainers:: @ 81F04FC @ KATIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "KATIE$", 12 @@ -5474,7 +5474,7 @@ gTrainers:: @ 81F04FC @ SUSIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "SUSIE$", 12 @@ -5486,7 +5486,7 @@ gTrainers:: @ 81F04FC @ KARA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "KARA$", 12 @@ -5498,7 +5498,7 @@ gTrainers:: @ 81F04FC @ DANA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DANA$", 12 @@ -5510,7 +5510,7 @@ gTrainers:: @ 81F04FC @ ERIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ERIN$", 12 @@ -5522,7 +5522,7 @@ gTrainers:: @ 81F04FC @ DEBRA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DEBRA$", 12 @@ -5534,7 +5534,7 @@ gTrainers:: @ 81F04FC @ LINDA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "LINDA$", 12 @@ -5546,7 +5546,7 @@ gTrainers:: @ 81F04FC @ KAYLEE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "KAYLEE$", 12 @@ -5558,7 +5558,7 @@ gTrainers:: @ 81F04FC @ LAUREL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "LAUREL$", 12 @@ -5570,7 +5570,7 @@ gTrainers:: @ 81F04FC @ DARCY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DARCY$", 12 @@ -5582,7 +5582,7 @@ gTrainers:: @ 81F04FC @ JENNY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5594,7 +5594,7 @@ gTrainers:: @ 81F04FC @ JENNY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5606,7 +5606,7 @@ gTrainers:: @ 81F04FC @ JENNY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5618,7 +5618,7 @@ gTrainers:: @ 81F04FC @ JENNY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5630,7 +5630,7 @@ gTrainers:: @ 81F04FC @ HEIDI .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "HEIDI$", 12 @@ -5642,7 +5642,7 @@ gTrainers:: @ 81F04FC @ BECKY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "BECKY$", 12 @@ -5654,7 +5654,7 @@ gTrainers:: @ 81F04FC @ CAROL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "CAROL$", 12 @@ -5666,7 +5666,7 @@ gTrainers:: @ 81F04FC @ NANCY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "NANCY$", 12 @@ -5678,7 +5678,7 @@ gTrainers:: @ 81F04FC @ MARTHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "MARTHA$", 12 @@ -5690,7 +5690,7 @@ gTrainers:: @ 81F04FC @ DIANA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5702,7 +5702,7 @@ gTrainers:: @ 81F04FC @ NINA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "NINA$", 12 @@ -5714,7 +5714,7 @@ gTrainers:: @ 81F04FC @ IRENE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "IRENE$", 12 @@ -5726,7 +5726,7 @@ gTrainers:: @ 81F04FC @ DIANA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5738,7 +5738,7 @@ gTrainers:: @ 81F04FC @ DIANA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5750,7 +5750,7 @@ gTrainers:: @ 81F04FC @ DIANA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5762,7 +5762,7 @@ gTrainers:: @ 81F04FC @ DIANA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5774,7 +5774,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5786,7 +5786,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5798,7 +5798,7 @@ gTrainers:: @ 81F04FC @ GINA_AND_MIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "GINA & MIA$", 12 @@ -5810,7 +5810,7 @@ gTrainers:: @ 81F04FC @ MIU_AND_YUKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "MIU & YUKI$", 12 @@ -5822,7 +5822,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5834,7 +5834,7 @@ gTrainers:: @ 81F04FC @ GINA_AND_MIA_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "GINA & MIA$", 12 @@ -5846,7 +5846,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5858,7 +5858,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5870,7 +5870,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5882,7 +5882,7 @@ gTrainers:: @ 81F04FC @ HUEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "HUEY$", 12 @@ -5894,7 +5894,7 @@ gTrainers:: @ 81F04FC @ EDMOND .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "EDMOND$", 12 @@ -5906,7 +5906,7 @@ gTrainers:: @ 81F04FC @ ERNEST_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -5918,7 +5918,7 @@ gTrainers:: @ 81F04FC @ DWAYNE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "DWAYNE$", 12 @@ -5930,7 +5930,7 @@ gTrainers:: @ 81F04FC @ PHILLIP .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "PHILLIP$", 12 @@ -5942,7 +5942,7 @@ gTrainers:: @ 81F04FC @ LEONARD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "LEONARD$", 12 @@ -5954,7 +5954,7 @@ gTrainers:: @ 81F04FC @ DUNCAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "DUNCAN$", 12 @@ -5966,7 +5966,7 @@ gTrainers:: @ 81F04FC @ ERNEST_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -5978,7 +5978,7 @@ gTrainers:: @ 81F04FC @ ERNEST_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -5990,7 +5990,7 @@ gTrainers:: @ 81F04FC @ ERNEST_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -6002,7 +6002,7 @@ gTrainers:: @ 81F04FC @ ERNEST_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -6014,7 +6014,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6026,7 +6026,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6038,7 +6038,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_13 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6050,7 +6050,7 @@ gTrainers:: @ 81F04FC @ SONNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "SONNY$", 12 @@ -6062,7 +6062,7 @@ gTrainers:: @ 81F04FC @ DONOVAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "DONOVAN$", 12 @@ -6074,7 +6074,7 @@ gTrainers:: @ 81F04FC @ GERALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "GERALD$", 12 @@ -6086,7 +6086,7 @@ gTrainers:: @ 81F04FC @ KELVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "KELVIN$", 12 @@ -6098,7 +6098,7 @@ gTrainers:: @ 81F04FC @ KODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "KODY$", 12 @@ -6110,7 +6110,7 @@ gTrainers:: @ 81F04FC @ TEVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "TEVIN$", 12 @@ -6122,7 +6122,7 @@ gTrainers:: @ 81F04FC @ DAMON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "DAMON$", 12 @@ -6134,7 +6134,7 @@ gTrainers:: @ 81F04FC @ PABLO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "PABLO$", 12 @@ -6146,7 +6146,7 @@ gTrainers:: @ 81F04FC @ EDWIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6158,7 +6158,7 @@ gTrainers:: @ 81F04FC @ HECTOR_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "HECTOR$", 12 @@ -6170,7 +6170,7 @@ gTrainers:: @ 81F04FC @ HECTOR_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "HECTOR$", 12 @@ -6182,7 +6182,7 @@ gTrainers:: @ 81F04FC @ EDWIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6194,7 +6194,7 @@ gTrainers:: @ 81F04FC @ EDWIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6206,7 +6206,7 @@ gTrainers:: @ 81F04FC @ EDWIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6218,7 +6218,7 @@ gTrainers:: @ 81F04FC @ EDWIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6230,7 +6230,7 @@ gTrainers:: @ 81F04FC @ WALLY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -6242,7 +6242,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6254,7 +6254,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6266,7 +6266,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6278,7 +6278,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6290,7 +6290,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6302,7 +6302,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6314,7 +6314,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6326,7 +6326,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6338,7 +6338,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6350,7 +6350,7 @@ gTrainers:: @ 81F04FC @ MAY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6362,7 +6362,7 @@ gTrainers:: @ 81F04FC @ MAY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6374,7 +6374,7 @@ gTrainers:: @ 81F04FC @ MAY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6386,7 +6386,7 @@ gTrainers:: @ 81F04FC @ MAY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6398,7 +6398,7 @@ gTrainers:: @ 81F04FC @ MAY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6410,7 +6410,7 @@ gTrainers:: @ 81F04FC @ MAY_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6422,7 +6422,7 @@ gTrainers:: @ 81F04FC @ MAY_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6434,7 +6434,7 @@ gTrainers:: @ 81F04FC @ MAY_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6446,7 +6446,7 @@ gTrainers:: @ 81F04FC @ MAY_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6458,7 +6458,7 @@ gTrainers:: @ 81F04FC @ ISAAC_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6470,7 +6470,7 @@ gTrainers:: @ 81F04FC @ RILEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "RILEY$", 12 @@ -6482,7 +6482,7 @@ gTrainers:: @ 81F04FC @ AIDAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "AIDAN$", 12 @@ -6494,7 +6494,7 @@ gTrainers:: @ 81F04FC @ ISAAC_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6506,7 +6506,7 @@ gTrainers:: @ 81F04FC @ ISAAC_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6518,7 +6518,7 @@ gTrainers:: @ 81F04FC @ ISAAC_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6530,7 +6530,7 @@ gTrainers:: @ 81F04FC @ ISAAC_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6542,7 +6542,7 @@ gTrainers:: @ 81F04FC @ LYDIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6554,7 +6554,7 @@ gTrainers:: @ 81F04FC @ ALEXIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "ALEXIA$", 12 @@ -6566,7 +6566,7 @@ gTrainers:: @ 81F04FC @ DANIELLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "DANIELLE$", 12 @@ -6578,7 +6578,7 @@ gTrainers:: @ 81F04FC @ LYDIA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6590,7 +6590,7 @@ gTrainers:: @ 81F04FC @ LYDIA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6602,7 +6602,7 @@ gTrainers:: @ 81F04FC @ LYDIA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6614,7 +6614,7 @@ gTrainers:: @ 81F04FC @ LYDIA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6626,7 +6626,7 @@ gTrainers:: @ 81F04FC @ JACKSON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6638,7 +6638,7 @@ gTrainers:: @ 81F04FC @ CARLOS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "CARLOS$", 12 @@ -6650,7 +6650,7 @@ gTrainers:: @ 81F04FC @ SEBASTIAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "SEBASTIAN$", 12 @@ -6662,7 +6662,7 @@ gTrainers:: @ 81F04FC @ JACKSON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6674,7 +6674,7 @@ gTrainers:: @ 81F04FC @ JACKSON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6686,7 +6686,7 @@ gTrainers:: @ 81F04FC @ JACKSON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6698,7 +6698,7 @@ gTrainers:: @ 81F04FC @ JACKSON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6710,7 +6710,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6722,7 +6722,7 @@ gTrainers:: @ 81F04FC @ JENNA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "JENNA$", 12 @@ -6734,7 +6734,7 @@ gTrainers:: @ 81F04FC @ SOPHIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "SOPHIA$", 12 @@ -6746,7 +6746,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6758,7 +6758,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6770,7 +6770,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6782,7 +6782,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6794,7 +6794,7 @@ gTrainers:: @ 81F04FC @ MAXIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MAXIE$", 12 @@ -6806,7 +6806,7 @@ gTrainers:: @ 81F04FC @ GRUNT_28 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6818,7 +6818,7 @@ gTrainers:: @ 81F04FC @ GRUNT_29 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6830,7 +6830,7 @@ gTrainers:: @ 81F04FC @ GRUNT_30 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6842,7 +6842,7 @@ gTrainers:: @ 81F04FC @ GRUNT_31 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6854,7 +6854,7 @@ gTrainers:: @ 81F04FC @ GRUNT_32 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6866,7 +6866,7 @@ gTrainers:: @ 81F04FC @ GRUNT_33 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6878,7 +6878,7 @@ gTrainers:: @ 81F04FC @ GRUNT_34 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6890,7 +6890,7 @@ gTrainers:: @ 81F04FC @ GRUNT_35 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6902,7 +6902,7 @@ gTrainers:: @ 81F04FC @ GRUNT_36 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6914,7 +6914,7 @@ gTrainers:: @ 81F04FC @ GRUNT_37 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6926,7 +6926,7 @@ gTrainers:: @ 81F04FC @ GRUNT_38 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6938,7 +6938,7 @@ gTrainers:: @ 81F04FC @ GRUNT_39 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6950,7 +6950,7 @@ gTrainers:: @ 81F04FC @ GRUNT_40 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6962,7 +6962,7 @@ gTrainers:: @ 81F04FC @ GRUNT_41 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6974,7 +6974,7 @@ gTrainers:: @ 81F04FC @ GRUNT_42 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6986,7 +6986,7 @@ gTrainers:: @ 81F04FC @ GRUNT_43 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6998,7 +6998,7 @@ gTrainers:: @ 81F04FC @ GRUNT_44 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7010,7 +7010,7 @@ gTrainers:: @ 81F04FC @ GRUNT_45 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7022,7 +7022,7 @@ gTrainers:: @ 81F04FC @ GRUNT_46 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7034,7 +7034,7 @@ gTrainers:: @ 81F04FC @ GRUNT_47 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7046,7 +7046,7 @@ gTrainers:: @ 81F04FC @ GRUNT_48 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7058,7 +7058,7 @@ gTrainers:: @ 81F04FC @ GRUNT_49 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7070,7 +7070,7 @@ gTrainers:: @ 81F04FC @ GRUNT_50 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7082,7 +7082,7 @@ gTrainers:: @ 81F04FC @ GRUNT_51 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7094,7 +7094,7 @@ gTrainers:: @ 81F04FC @ GRUNT_52 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "GRUNT$", 12 @@ -7106,7 +7106,7 @@ gTrainers:: @ 81F04FC @ GRUNT_53 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "GRUNT$", 12 @@ -7118,7 +7118,7 @@ gTrainers:: @ 81F04FC @ GRUNT_54 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "GRUNT$", 12 @@ -7130,7 +7130,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_14 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "$", 12 @@ -7142,7 +7142,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_15 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "$", 12 @@ -7154,7 +7154,7 @@ gTrainers:: @ 81F04FC @ TABITHA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "TABITHA$", 12 @@ -7166,7 +7166,7 @@ gTrainers:: @ 81F04FC @ TABITHA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "TABITHA$", 12 @@ -7178,7 +7178,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_16 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "$", 12 @@ -7190,7 +7190,7 @@ gTrainers:: @ 81F04FC @ COURTNEY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F .string "COURTNEY$", 12 @@ -7202,7 +7202,7 @@ gTrainers:: @ 81F04FC @ COURTNEY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F .string "COURTNEY$", 12 @@ -7214,7 +7214,7 @@ gTrainers:: @ 81F04FC @ MAXIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MAXIE$", 12 @@ -7226,7 +7226,7 @@ gTrainers:: @ 81F04FC @ MAXIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MAXIE$", 12 @@ -7238,7 +7238,7 @@ gTrainers:: @ 81F04FC @ TIANA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "TIANA$", 12 @@ -7250,7 +7250,7 @@ gTrainers:: @ 81F04FC @ HALEY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7262,7 +7262,7 @@ gTrainers:: @ 81F04FC @ JANICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "JANICE$", 12 @@ -7274,7 +7274,7 @@ gTrainers:: @ 81F04FC @ VIVI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "VIVI$", 12 @@ -7286,7 +7286,7 @@ gTrainers:: @ 81F04FC @ HALEY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7298,7 +7298,7 @@ gTrainers:: @ 81F04FC @ HALEY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7310,7 +7310,7 @@ gTrainers:: @ 81F04FC @ HALEY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7322,7 +7322,7 @@ gTrainers:: @ 81F04FC @ HALEY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7334,7 +7334,7 @@ gTrainers:: @ 81F04FC @ SALLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "SALLY$", 12 @@ -7346,7 +7346,7 @@ gTrainers:: @ 81F04FC @ ROBIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ROBIN$", 12 @@ -7358,7 +7358,7 @@ gTrainers:: @ 81F04FC @ ANDREA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ANDREA$", 12 @@ -7370,7 +7370,7 @@ gTrainers:: @ 81F04FC @ CRISSY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "CRISSY$", 12 @@ -7382,7 +7382,7 @@ gTrainers:: @ 81F04FC @ RICK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "RICK$", 12 @@ -7394,7 +7394,7 @@ gTrainers:: @ 81F04FC @ LYLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "LYLE$", 12 @@ -7406,7 +7406,7 @@ gTrainers:: @ 81F04FC @ JOSE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JOSE$", 12 @@ -7418,7 +7418,7 @@ gTrainers:: @ 81F04FC @ DOUG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "DOUG$", 12 @@ -7430,7 +7430,7 @@ gTrainers:: @ 81F04FC @ GREG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GREG$", 12 @@ -7442,7 +7442,7 @@ gTrainers:: @ 81F04FC @ KENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "KENT$", 12 @@ -7454,7 +7454,7 @@ gTrainers:: @ 81F04FC @ JAMES_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7466,7 +7466,7 @@ gTrainers:: @ 81F04FC @ JAMES_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7478,7 +7478,7 @@ gTrainers:: @ 81F04FC @ JAMES_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7490,7 +7490,7 @@ gTrainers:: @ 81F04FC @ JAMES_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7502,7 +7502,7 @@ gTrainers:: @ 81F04FC @ JAMES_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7514,7 +7514,7 @@ gTrainers:: @ 81F04FC @ BRICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "BRICE$", 12 @@ -7526,7 +7526,7 @@ gTrainers:: @ 81F04FC @ TRENT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7538,7 +7538,7 @@ gTrainers:: @ 81F04FC @ LENNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LENNY$", 12 @@ -7550,7 +7550,7 @@ gTrainers:: @ 81F04FC @ LUCAS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LUCAS$", 12 @@ -7562,7 +7562,7 @@ gTrainers:: @ 81F04FC @ ALAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "ALAN$", 12 @@ -7574,7 +7574,7 @@ gTrainers:: @ 81F04FC @ CLARK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "CLARK$", 12 @@ -7586,7 +7586,7 @@ gTrainers:: @ 81F04FC @ ERIC .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "ERIC$", 12 @@ -7598,7 +7598,7 @@ gTrainers:: @ 81F04FC @ LUCAS_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LUCAS$", 12 @@ -7610,7 +7610,7 @@ gTrainers:: @ 81F04FC @ MIKE_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "MIKE$", 12 @@ -7622,7 +7622,7 @@ gTrainers:: @ 81F04FC @ MIKE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "MIKE$", 12 @@ -7634,7 +7634,7 @@ gTrainers:: @ 81F04FC @ TRENT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7646,7 +7646,7 @@ gTrainers:: @ 81F04FC @ TRENT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7658,7 +7658,7 @@ gTrainers:: @ 81F04FC @ TRENT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7670,7 +7670,7 @@ gTrainers:: @ 81F04FC @ TRENT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7682,7 +7682,7 @@ gTrainers:: @ 81F04FC @ DEZ_AND_LUKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "DEZ & LUKE$", 12 @@ -7694,7 +7694,7 @@ gTrainers:: @ 81F04FC @ LEA_AND_JED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LEA & JED$", 12 @@ -7706,7 +7706,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7718,7 +7718,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7730,7 +7730,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7742,7 +7742,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7754,7 +7754,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7766,7 +7766,7 @@ gTrainers:: @ 81F04FC @ JOHANNA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JOHANNA$", 12 @@ -7778,7 +7778,7 @@ gTrainers:: @ 81F04FC @ ZANE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "ZANE$", 12 @@ -7790,7 +7790,7 @@ gTrainers:: @ 81F04FC @ VIVIAN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "VIVIAN$", 12 @@ -7802,7 +7802,7 @@ gTrainers:: @ 81F04FC @ SADIE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "SADIE$", 12 @@ -7814,7 +7814,7 @@ gTrainers:: @ 81F04FC @ HIDEO_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "HIDEO$", 12 @@ -7826,7 +7826,7 @@ gTrainers:: @ 81F04FC @ KEIGO .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "KEIGO$", 12 @@ -7838,7 +7838,7 @@ gTrainers:: @ 81F04FC @ TSUNAO .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "TSUNAO$", 12 @@ -7850,7 +7850,7 @@ gTrainers:: @ 81F04FC @ TERRELL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "TERRELL$", 12 @@ -7862,7 +7862,7 @@ gTrainers:: @ 81F04FC @ KYLEE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "KYLEE$", 12 @@ -7874,7 +7874,7 @@ gTrainers:: @ 81F04FC @ WALLY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7886,7 +7886,7 @@ gTrainers:: @ 81F04FC @ WALLY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7898,7 +7898,7 @@ gTrainers:: @ 81F04FC @ WALLY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7910,7 +7910,7 @@ gTrainers:: @ 81F04FC @ WALLY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7922,7 +7922,7 @@ gTrainers:: @ 81F04FC @ WALLY_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7934,7 +7934,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -7946,7 +7946,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -7958,7 +7958,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -7970,7 +7970,7 @@ gTrainers:: @ 81F04FC @ MAY_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -7982,7 +7982,7 @@ gTrainers:: @ 81F04FC @ MAY_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -7994,7 +7994,7 @@ gTrainers:: @ 81F04FC @ MAY_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -8006,7 +8006,7 @@ gTrainers:: @ 81F04FC @ JONAH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "JONAH$", 12 @@ -8018,7 +8018,7 @@ gTrainers:: @ 81F04FC @ HENRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "HENRY$", 12 @@ -8030,7 +8030,7 @@ gTrainers:: @ 81F04FC @ ROGER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ROGER$", 12 @@ -8042,7 +8042,7 @@ gTrainers:: @ 81F04FC @ ALEXA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "ALEXA$", 12 @@ -8054,7 +8054,7 @@ gTrainers:: @ 81F04FC @ RUBEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "RUBEN$", 12 @@ -8066,7 +8066,7 @@ gTrainers:: @ 81F04FC @ KOJI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "KOJI$", 12 @@ -8078,7 +8078,7 @@ gTrainers:: @ 81F04FC @ WAYNE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "WAYNE$", 12 @@ -8090,7 +8090,7 @@ gTrainers:: @ 81F04FC @ BYRON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "BYRON$", 12 @@ -8102,7 +8102,7 @@ gTrainers:: @ 81F04FC @ REED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "REED$", 12 @@ -8114,7 +8114,7 @@ gTrainers:: @ 81F04FC @ TISHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "TISHA$", 12 @@ -8126,7 +8126,7 @@ gTrainers:: @ 81F04FC @ TORI_AND_TIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "TORI & TIA$", 12 @@ -8138,7 +8138,7 @@ gTrainers:: @ 81F04FC @ KIM_AND_IRIS .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "KIM & IRIS$", 12 @@ -8150,7 +8150,7 @@ gTrainers:: @ 81F04FC @ TYRA_AND_IVY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "TYRA & IVY$", 12 @@ -8162,7 +8162,7 @@ gTrainers:: @ 81F04FC @ MEL_AND_PAUL .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "MEL & PAUL$", 12 @@ -8174,7 +8174,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8186,7 +8186,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8198,7 +8198,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8210,7 +8210,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8222,7 +8222,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8234,7 +8234,7 @@ gTrainers:: @ 81F04FC @ RELI_AND_IAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RELI & IAN$", 12 @@ -8246,7 +8246,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8258,7 +8258,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8270,7 +8270,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8282,7 +8282,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8294,7 +8294,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8306,7 +8306,7 @@ gTrainers:: @ 81F04FC @ LISA_AND_RAY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "LISA & RAY$", 12 @@ -8318,7 +8318,7 @@ gTrainers:: @ 81F04FC @ EUGENE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "EUGENE$", 12 diff --git a/include/battle.h b/include/battle.h index 0824fc46c..dd35cc303 100644 --- a/include/battle.h +++ b/include/battle.h @@ -501,7 +501,7 @@ extern struct DisableStruct gDisableStructs[MAX_BANKS_BATTLE]; extern struct BattleResults gBattleResults; extern struct ProtectStruct gProtectStructs[MAX_BANKS_BATTLE]; extern struct SpecialStatus gSpecialStatuses[MAX_BANKS_BATTLE]; -extern struct sideTimer gSideTimer[2]; +extern struct sideTimer gSideTimers[2]; extern struct WishFutureKnock gWishFutureKnock; extern struct AI_ThinkingStruct gAIThinkingSpace; extern struct Struct20238C8 gUnknown_020238C8; @@ -641,11 +641,8 @@ void BattleTurnPassed(void); // asm/battle_2.o void sub_8012324(void); -void sub_8012FBC(u8, u8); +void SwapTurnOrder(u8, u8); u8 GetWhoStrikesFirst(u8, u8, u8); -void TurnValuesCleanUp(u8); -void SpecialStatusesClear(void); -void sub_80138F0(void); void sub_80155A4(); void CancelMultiTurnMoves(u8 bank); void PrepareStringBattle(); @@ -660,6 +657,7 @@ u8 sub_80170DC(); u8 sub_80173A4(); u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 move); u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn); +void b_clear_atk_up_if_hit_flag_unless_enraged(void); // asm/battle_4.o void AI_CalcDmg(u8, u8); @@ -686,6 +684,7 @@ void sub_80324F8(struct Pokemon *, u8); void sub_8032638(); void sub_8032AA8(u8, u8); void SetBankFuncToOpponentBufferRunCommand(void); +void BattleMusicStop(void); // asm/battle_9.o void SetBankFuncToLinkOpponentBufferRunCommand(void); diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h index f7efb0dfd..892b3e7f6 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle_constants.h @@ -65,6 +65,7 @@ #define HITMARKER_PURSUIT_TRAP 0x00001000 #define HITMARKER_IGNORE_SAFEGUARD 0x00002000 #define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 +#define HITMARKER_RUN 0x00008000 #define HITMARKER_IGNORE_ON_AIR 0x00010000 #define HITMARKER_IGNORE_UNDERGROUND 0x00020000 #define HITMARKER_IGNORE_UNDERWATER 0x00040000 @@ -88,6 +89,11 @@ #define MOVESTATUS_ENDURED (1 << 6) #define MOVESTATUS_HUNGON (1 << 7) +#define IDENTITY_PLAYER_MON1 0 +#define IDENTITY_OPPONENT_MON1 1 +#define IDENTITY_PLAYER_MON2 2 +#define IDENTITY_OPPONENT_MON2 3 + #define BATTLE_TYPE_DOUBLE 0x0001 #define BATTLE_TYPE_LINK 0x0002 #define BATTLE_TYPE_WILD 0x0004 @@ -117,6 +123,8 @@ #define BATTLE_OUT_OF_BALLS 0x8 #define BATTLE_OPPONENT_TELEPORTED 0xA +#define OUTCOME_LINK_BATTLE_RUN 0x80 + #define SIDE_STATUS_REFLECT (1 << 0) #define SIDE_STATUS_LIGHTSCREEN (1 << 1) #define SIDE_STATUS_X4 (1 << 2) @@ -126,6 +134,22 @@ #define SIDE_STATUS_MIST (1 << 8) #define SIDE_STATUS_SPIKES_DAMAGED (1 << 9) +#define ACTION_USE_MOVE 0 +#define ACTION_USE_ITEM 1 +#define ACTION_SWITCH 2 +#define ACTION_RUN 3 +#define ACTION_WATCHES_CAREFULLY 4 +#define ACTION_SAFARI_ZONE_BALL 5 +#define ACTION_POKEBLOCK_CASE 6 +#define ACTION_GO_NEAR 7 +#define ACTION_SAFARI_ZONE_RUN 8 +#define ACTION_9 9 +#define ACTION_RUN_BATTLESCRIPT 10 // when executing an action +#define ACTION_CANCEL_PARTNER 12 // when choosing an action +#define ACTION_FINISHED 12 // when executing an action +#define ACTION_NOTHING_FAINTED 13 // when choosing an action +#define ACTION_INIT_VALUE 0xFF + #define TARGET_SELECTED_POKEMON 0 #define TARGET_SPECIAL (1 << 0) #define TARGET_UNK2 (1 << 1) diff --git a/include/ewram.h b/include/ewram.h index 07f9d1ad2..d5e53393b 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -108,6 +108,7 @@ extern u8 gSharedMem[]; #define ewram16010arr(bank) (gSharedMem[0x16010 + bank]) #define ewram1601B (gSharedMem[0x1601B]) #define eDynamicMoveType (gSharedMem[0x1601C]) +#define eFocusPunchBank (gSharedMem[0x1601D]) #define eDmgMultiplier (gSharedMem[0x1601F]) #define ewram16020 ((u8 *)(gSharedMem + 0x16020)) #define ewram16020arr(i) (gSharedMem[0x16020 + i]) @@ -175,6 +176,7 @@ extern u8 gSharedMem[]; #define ewram16108arr(i) (gSharedMem[0x16108 + i]) #define ewram16110 (gSharedMem[0x16110]) #define ewram16111 (gSharedMem[0x16111]) +#define eMultihitMoveEffect (gSharedMem[0x16112]) #define ewram16113 (gSharedMem[0x16113]) #define ewram16400 (gSharedMem + 0x16400) #define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gSharedMem + 0x16800)) diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index dda90c48f..21ec88a90 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -25,9 +25,9 @@ u8 GetBankSide(u8 slot); u8 GetBankSide(u8); u8 GetBankIdentity(u8); u8 GetBankIdentity(u8 slot); -u8 GetBankByPlayerAI(u8); -u8 GetBankByPlayerAI(u8); -u8 GetBankByPlayerAI(u8 state); +u8 GetBankByIdentity(u8); +u8 GetBankByIdentity(u8); +u8 GetBankByIdentity(u8 state); bool8 IsBankSpritePresent(u8); bool8 IsDoubleBattle(); u8 IsDoubleBattle(void); diff --git a/include/trainer.h b/include/trainer.h index 2e0beb342..e8f2776d2 100644 --- a/include/trainer.h +++ b/include/trainer.h @@ -17,83 +17,83 @@ #define TRAINER_ENCOUNTER_MUSIC_RICH 13 // Rich Boys and Gentlemen enum { - TRAINER_CLASS_AQUA_LEADER, - TRAINER_CLASS_TEAM_AQUA_M, - TRAINER_CLASS_TEAM_AQUA_F, - TRAINER_CLASS_AROMA_LADY, - TRAINER_CLASS_RUIN_MANIAC, - TRAINER_CLASS_INTERVIEWER, - TRAINER_CLASS_TUBER_F, - TRAINER_CLASS_TUBER_M, - TRAINER_CLASS_COOL_TRAINER_M, - TRAINER_CLASS_COOL_TRAINER_F, - TRAINER_CLASS_HEX_MANIAC, - TRAINER_CLASS_LADY, - TRAINER_CLASS_BEAUTY, - TRAINER_CLASS_RICH_BOY, - TRAINER_CLASS_POKEMANIAC, - TRAINER_CLASS_SWIMMER_M, - TRAINER_CLASS_BLACK_BELT, - TRAINER_CLASS_GUITARIST, - TRAINER_CLASS_KINDLER, - TRAINER_CLASS_CAMPER, - TRAINER_CLASS_BUG_MANIAC, - TRAINER_CLASS_PSYCHIC_M, - TRAINER_CLASS_PSYCHIC_F, - TRAINER_CLASS_GENTLEMAN, - TRAINER_CLASS_ELITE_FOUR_M, - TRAINER_CLASS_ELITE_FOUR_F, - TRAINER_CLASS_LEADER_F, - TRAINER_CLASS_LEADER_M, - TRAINER_CLASS_LEADER_MF, - TRAINER_CLASS_SCHOOL_KID_M, - TRAINER_CLASS_SCHOOL_KID_F, - TRAINER_CLASS_SR_AND_JR, - TRAINER_CLASS_POKEFAN_M, - TRAINER_CLASS_POKEFAN_F, - TRAINER_CLASS_EXPERT_M, - TRAINER_CLASS_EXPERT_F, - TRAINER_CLASS_YOUNGSTER, - TRAINER_CLASS_CHAMPION, - TRAINER_CLASS_FISHERMAN, - TRAINER_CLASS_CYCLING_TRIATHLETE_M, - TRAINER_CLASS_CYCLING_TRIATHLETE_F, - TRAINER_CLASS_RUNNING_TRIATHLETE_M, - TRAINER_CLASS_RUNNING_TRIATHLETE_F, - TRAINER_CLASS_SWIMMING_TRIATHLETE_M, - TRAINER_CLASS_SWIMMING_TRIATHLETE_F, - TRAINER_CLASS_DRAGON_TAMER, - TRAINER_CLASS_BIRD_KEEPER, - TRAINER_CLASS_NINJA_BOY, - TRAINER_CLASS_BATTLE_GIRL, - TRAINER_CLASS_PARASOL_LADY, - TRAINER_CLASS_SWIMMER_F, - TRAINER_CLASS_PICNICKER, - TRAINER_CLASS_TWINS, - TRAINER_CLASS_SAILOR, - TRAINER_CLASS_BOARDER_1, - TRAINER_CLASS_BOARDER_2, - TRAINER_CLASS_COLLECTOR, - TRAINER_CLASS_WALLY, - TRAINER_CLASS_BRENDAN_1, - TRAINER_CLASS_BRENDAN_2, - TRAINER_CLASS_BRENDAN_3, - TRAINER_CLASS_MAY_1, - TRAINER_CLASS_MAY_2, - TRAINER_CLASS_MAY_3, - TRAINER_CLASS_POKEMON_BREEDER_M, - TRAINER_CLASS_POKEMON_BREEDER_F, - TRAINER_CLASS_POKEMON_RANGER_M, - TRAINER_CLASS_POKEMON_RANGER_F, - TRAINER_CLASS_MAGMA_LEADER, - TRAINER_CLASS_TEAM_MAGMA_M, - TRAINER_CLASS_TEAM_MAGMA_F, - TRAINER_CLASS_LASS, - TRAINER_CLASS_BUG_CATCHER, - TRAINER_CLASS_HIKER, - TRAINER_CLASS_YOUNG_COUPLE, - TRAINER_CLASS_OLD_COUPLE, - TRAINER_CLASS_SIS_AND_BRO + FACILITY_CLASS_AQUA_LEADER, + FACILITY_CLASS_TEAM_AQUA_M, + FACILITY_CLASS_TEAM_AQUA_F, + FACILITY_CLASS_AROMA_LADY, + FACILITY_CLASS_RUIN_MANIAC, + FACILITY_CLASS_INTERVIEWER, + FACILITY_CLASS_TUBER_F, + FACILITY_CLASS_TUBER_M, + FACILITY_CLASS_COOL_TRAINER_M, + FACILITY_CLASS_COOL_TRAINER_F, + FACILITY_CLASS_HEX_MANIAC, + FACILITY_CLASS_LADY, + FACILITY_CLASS_BEAUTY, + FACILITY_CLASS_RICH_BOY, + FACILITY_CLASS_POKEMANIAC, + FACILITY_CLASS_SWIMMER_M, + FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_GUITARIST, + FACILITY_CLASS_KINDLER, + FACILITY_CLASS_CAMPER, + FACILITY_CLASS_BUG_MANIAC, + FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_PSYCHIC_F, + FACILITY_CLASS_GENTLEMAN, + FACILITY_CLASS_ELITE_FOUR_M, + FACILITY_CLASS_ELITE_FOUR_F, + FACILITY_CLASS_LEADER_F, + FACILITY_CLASS_LEADER_M, + FACILITY_CLASS_LEADER_MF, + FACILITY_CLASS_SCHOOL_KID_M, + FACILITY_CLASS_SCHOOL_KID_F, + FACILITY_CLASS_SR_AND_JR, + FACILITY_CLASS_POKEFAN_M, + FACILITY_CLASS_POKEFAN_F, + FACILITY_CLASS_EXPERT_M, + FACILITY_CLASS_EXPERT_F, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_CHAMPION, + FACILITY_CLASS_FISHERMAN, + FACILITY_CLASS_CYCLING_TRIATHLETE_M, + FACILITY_CLASS_CYCLING_TRIATHLETE_F, + FACILITY_CLASS_RUNNING_TRIATHLETE_M, + FACILITY_CLASS_RUNNING_TRIATHLETE_F, + FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + FACILITY_CLASS_DRAGON_TAMER, + FACILITY_CLASS_BIRD_KEEPER, + FACILITY_CLASS_NINJA_BOY, + FACILITY_CLASS_BATTLE_GIRL, + FACILITY_CLASS_PARASOL_LADY, + FACILITY_CLASS_SWIMMER_F, + FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_TWINS, + FACILITY_CLASS_SAILOR, + FACILITY_CLASS_BOARDER_1, + FACILITY_CLASS_BOARDER_2, + FACILITY_CLASS_COLLECTOR, + FACILITY_CLASS_WALLY, + FACILITY_CLASS_BRENDAN_1, + FACILITY_CLASS_BRENDAN_2, + FACILITY_CLASS_BRENDAN_3, + FACILITY_CLASS_MAY_1, + FACILITY_CLASS_MAY_2, + FACILITY_CLASS_MAY_3, + FACILITY_CLASS_POKEMON_BREEDER_M, + FACILITY_CLASS_POKEMON_BREEDER_F, + FACILITY_CLASS_POKEMON_RANGER_M, + FACILITY_CLASS_POKEMON_RANGER_F, + FACILITY_CLASS_MAGMA_LEADER, + FACILITY_CLASS_TEAM_MAGMA_M, + FACILITY_CLASS_TEAM_MAGMA_F, + FACILITY_CLASS_LASS, + FACILITY_CLASS_BUG_CATCHER, + FACILITY_CLASS_HIKER, + FACILITY_CLASS_YOUNG_COUPLE, + FACILITY_CLASS_OLD_COUPLE, + FACILITY_CLASS_SIS_AND_BRO }; enum { @@ -183,64 +183,64 @@ enum { }; enum { - TRAINER_CLASS_NAME_POKEMON_TRAINER_1, - TRAINER_CLASS_NAME_POKEMON_TRAINER_2, - TRAINER_CLASS_NAME_AQUA_LEADER, - TRAINER_CLASS_NAME_TEAM_AQUA, - TRAINER_CLASS_NAME_AQUA_ADMIN, - TRAINER_CLASS_NAME_AROMA_LADY, - TRAINER_CLASS_NAME_RUIN_MANIAC, - TRAINER_CLASS_NAME_INTERVIEWER, - TRAINER_CLASS_NAME_TUBER_F, - TRAINER_CLASS_NAME_TUBER_M, - TRAINER_CLASS_NAME_COOL_TRAINER, - TRAINER_CLASS_NAME_HEX_MANIAC, - TRAINER_CLASS_NAME_LADY, - TRAINER_CLASS_NAME_BEAUTY, - TRAINER_CLASS_NAME_RICH_BOY, - TRAINER_CLASS_NAME_POKEMANIAC, - TRAINER_CLASS_NAME_SWIMMER_M, - TRAINER_CLASS_NAME_BLACK_BELT, - TRAINER_CLASS_NAME_GUITARIST, - TRAINER_CLASS_NAME_KINDLER, - TRAINER_CLASS_NAME_CAMPER, - TRAINER_CLASS_NAME_BUG_MANIAC, - TRAINER_CLASS_NAME_PSYCHIC, - TRAINER_CLASS_NAME_GENTLEMAN, - TRAINER_CLASS_NAME_ELITE_FOUR, - TRAINER_CLASS_NAME_LEADER, - TRAINER_CLASS_NAME_SCHOOL_KID, - TRAINER_CLASS_NAME_SR_AND_JR, - TRAINER_CLASS_NAME_WINSTRATE, - TRAINER_CLASS_NAME_POKEFAN, - TRAINER_CLASS_NAME_EXPERT, - TRAINER_CLASS_NAME_YOUNGSTER, - TRAINER_CLASS_NAME_CHAMPION, - TRAINER_CLASS_NAME_FISHERMAN, - TRAINER_CLASS_NAME_TRIATHLETE, - TRAINER_CLASS_NAME_DRAGON_TAMER, - TRAINER_CLASS_NAME_BIRD_KEEPER, - TRAINER_CLASS_NAME_NINJA_BOY, - TRAINER_CLASS_NAME_BATTLE_GIRL, - TRAINER_CLASS_NAME_PARASOL_LADY, - TRAINER_CLASS_NAME_SWIMMER_F, - TRAINER_CLASS_NAME_PICNICKER, - TRAINER_CLASS_NAME_TWINS, - TRAINER_CLASS_NAME_SAILOR, - TRAINER_CLASS_NAME_BOARDER, - TRAINER_CLASS_NAME_COLLECTOR, - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, - TRAINER_CLASS_NAME_POKEMON_BREEDER, - TRAINER_CLASS_NAME_POKEMON_RANGER, - TRAINER_CLASS_NAME_MAGMA_LEADER, - TRAINER_CLASS_NAME_TEAM_MAGMA, - TRAINER_CLASS_NAME_MAGMA_ADMIN, - TRAINER_CLASS_NAME_LASS, - TRAINER_CLASS_NAME_BUG_CATCHER, - TRAINER_CLASS_NAME_HIKER, - TRAINER_CLASS_NAME_YOUNG_COUPLE, - TRAINER_CLASS_NAME_OLD_COUPLE, - TRAINER_CLASS_NAME_SIS_AND_BRO + TRAINER_CLASS_POKEMON_TRAINER_1, + TRAINER_CLASS_POKEMON_TRAINER_2, + TRAINER_CLASS_AQUA_LEADER, + TRAINER_CLASS_TEAM_AQUA, + TRAINER_CLASS_AQUA_ADMIN, + TRAINER_CLASS_AROMA_LADY, + TRAINER_CLASS_RUIN_MANIAC, + TRAINER_CLASS_INTERVIEWER, + TRAINER_CLASS_TUBER_F, + TRAINER_CLASS_TUBER_M, + TRAINER_CLASS_COOL_TRAINER, + TRAINER_CLASS_HEX_MANIAC, + TRAINER_CLASS_LADY, + TRAINER_CLASS_BEAUTY, + TRAINER_CLASS_RICH_BOY, + TRAINER_CLASS_POKEMANIAC, + TRAINER_CLASS_SWIMMER_M, + TRAINER_CLASS_BLACK_BELT, + TRAINER_CLASS_GUITARIST, + TRAINER_CLASS_KINDLER, + TRAINER_CLASS_CAMPER, + TRAINER_CLASS_BUG_MANIAC, + TRAINER_CLASS_PSYCHIC, + TRAINER_CLASS_GENTLEMAN, + TRAINER_CLASS_ELITE_FOUR, + TRAINER_CLASS_LEADER, + TRAINER_CLASS_SCHOOL_KID, + TRAINER_CLASS_SR_AND_JR, + TRAINER_CLASS_WINSTRATE, + TRAINER_CLASS_POKEFAN, + TRAINER_CLASS_EXPERT, + TRAINER_CLASS_YOUNGSTER, + TRAINER_CLASS_CHAMPION, + TRAINER_CLASS_FISHERMAN, + TRAINER_CLASS_TRIATHLETE, + TRAINER_CLASS_DRAGON_TAMER, + TRAINER_CLASS_BIRD_KEEPER, + TRAINER_CLASS_NINJA_BOY, + TRAINER_CLASS_BATTLE_GIRL, + TRAINER_CLASS_PARASOL_LADY, + TRAINER_CLASS_SWIMMER_F, + TRAINER_CLASS_PICNICKER, + TRAINER_CLASS_TWINS, + TRAINER_CLASS_SAILOR, + TRAINER_CLASS_BOARDER, + TRAINER_CLASS_COLLECTOR, + TRAINER_CLASS_POKEMON_TRAINER_3, + TRAINER_CLASS_POKEMON_BREEDER, + TRAINER_CLASS_POKEMON_RANGER, + TRAINER_CLASS_MAGMA_LEADER, + TRAINER_CLASS_TEAM_MAGMA, + TRAINER_CLASS_MAGMA_ADMIN, + TRAINER_CLASS_LASS, + TRAINER_CLASS_BUG_CATCHER, + TRAINER_CLASS_HIKER, + TRAINER_CLASS_YOUNG_COUPLE, + TRAINER_CLASS_OLD_COUPLE, + TRAINER_CLASS_SIS_AND_BRO }; #endif // GUARD_TRAINER_H diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 6dc304232..4d577a765 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -23,8 +23,8 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3); void sub_80D51A8(struct Sprite *sprite) { if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget) - && (gAnimBankAttacker == GetBankByPlayerAI(2) - || gAnimBankAttacker == GetBankByPlayerAI(3))) + && (gAnimBankAttacker == GetBankByIdentity(2) + || gAnimBankAttacker == GetBankByIdentity(3))) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->callback = sub_8079534; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 90d0d40e3..92e9e3e1d 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -24,6 +24,7 @@ #include "sprite.h" #include "task.h" #include "text.h" +#include "trainer.h" #include "trig.h" #include "unknown_task.h" #include "util.h" @@ -66,7 +67,7 @@ extern u8 gActiveBank; extern u32 gBattleExecBuffer; extern u8 gNoOfAllBanks; extern u16 gBattlePartyID[]; -extern u8 gFightStateTracker; +extern u8 gCurrentActionFuncId; extern u8 gTurnOrder[]; extern struct UnknownStruct12 gUnknown_02024AD0[]; extern u8 gObjectBankIDs[]; @@ -133,8 +134,26 @@ extern u16 gBattleWeather; extern u32 gBattleMoveDamage; extern struct BattlePokemon gBattleMons[]; extern u8 gBattleMoveFlags; +extern const u8 BattleScript_FocusPunchSetUp[]; +extern u16 gDynamicBasePower; +extern u8 gCurrentTurnActionNumber; +extern void (* const gUnknown_081FA640[])(void); +extern void (* const gUnknown_081FA678[])(void); +extern u8* gBattlescriptCurrInstr; +extern u8 gUnknown_081D8E02[]; +extern u8 BattleScript_PayDayMoneyAndPickUpItems[]; +extern u8 gUnknown_081D8E0D[]; +extern u8 BattleScript_LocalTrainerBattleWon[]; + +void b_call_bc_move_exec(const u8* BS_ptr); static void BattlePrepIntroSlide(void); +void CheckFocusPunch_ClearVarsBeforeTurnStarts(void); +void SetActionsAndBanksTurnOrder(void); +static void TurnValuesCleanUp(u8); +void SpecialStatusesClear(void); +static void RunTurnActionsFunctions(void); +void sub_8013C9C(); void sub_800E7C4(void) { @@ -1538,7 +1557,7 @@ void sub_8010874(void) for (i = 0; i < 2; i++) { gSideAffecting[i] = 0; - MEMSET_ALT(&gSideTimer[i], 0, 12, j, r4); + MEMSET_ALT(&gSideTimers[i], 0, 12, j, r4); } gBankAttacker = 0; @@ -1791,7 +1810,7 @@ static void BattlePrepIntroSlide(void) { if (gBattleExecBuffer == 0) { - gActiveBank = GetBankByPlayerAI(0); + gActiveBank = GetBankByIdentity(0); EmitIntroSlide(0, gBattleTerrain); MarkBufferBankForExecution(gActiveBank); gBattleMainFunc = sub_8011384; @@ -1895,7 +1914,7 @@ void bc_801333C(void) hpStatus[i].status = GetMonData(&gEnemyParty[i], MON_DATA_STATUS); } } - gActiveBank = GetBankByPlayerAI(1); + gActiveBank = GetBankByIdentity(1); EmitDrawPartyStatusSummary(0, hpStatus, 0x80); MarkBufferBankForExecution(gActiveBank); @@ -1913,7 +1932,7 @@ void bc_801333C(void) hpStatus[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS); } } - gActiveBank = GetBankByPlayerAI(0); + gActiveBank = GetBankByIdentity(0); EmitDrawPartyStatusSummary(0, hpStatus, 0x80); MarkBufferBankForExecution(gActiveBank); @@ -1948,7 +1967,7 @@ void bc_battle_begin_message(void) { if (gBattleExecBuffer == 0) { - gActiveBank = GetBankByPlayerAI(1); + gActiveBank = GetBankByIdentity(1); PrepareStringBattle(0, gActiveBank); gBattleMainFunc = sub_8011800; } @@ -1967,7 +1986,7 @@ void sub_8011800(void) { if (gBattleExecBuffer == 0) { - PrepareStringBattle(1, GetBankByPlayerAI(1)); + PrepareStringBattle(1, GetBankByIdentity(1)); gBattleMainFunc = sub_8011834; } } @@ -2019,7 +2038,7 @@ void sub_8011970(void) if (gBattleExecBuffer == 0) { if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) - PrepareStringBattle(1, GetBankByPlayerAI(0)); + PrepareStringBattle(1, GetBankByIdentity(0)); gBattleMainFunc = sub_80119B4; } } @@ -2085,7 +2104,7 @@ void BattleBeginFirstTurn(void) for (j = i + 1; j < gNoOfAllBanks; j++) { if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 1) != 0) - sub_8012FBC(i, j); + SwapTurnOrder(i, j); } } } @@ -2199,8 +2218,8 @@ void BattleTurnPassed(void) gBattleCommunication[i] = 0; if (gBattleOutcome != 0) { - gFightStateTracker = 12; - gBattleMainFunc = sub_80138F0; + gCurrentActionFuncId = 12; + gBattleMainFunc = RunTurnActionsFunctions; return; } if (gBattleResults.battleTurnCounter < 0xFF) @@ -2323,8 +2342,8 @@ void sub_8012324(void) ewram16068arr(gActiveBank) = 6; if (!(gBattleTypeFlags & 0x40) && (r5 & 2) - && !(ewram160A6 & gBitTable[GetBankByPlayerAI(r5 ^ 2)]) - && gBattleCommunication[GetBankByPlayerAI(r5)] != 4) + && !(ewram160A6 & gBitTable[GetBankByIdentity(r5 ^ 2)]) + && gBattleCommunication[GetBankByIdentity(r5)] != 4) break; //_080123F8 if (ewram160A6 & gBitTable[gActiveBank]) @@ -2431,7 +2450,7 @@ _0801239C:\n\ beq _080123F8\n\ eors r5, r1\n\ adds r0, r5, 0\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ ldr r2, _08012444 @ =0x000160a6\n\ adds r1, r4, r2\n\ ldrb r1, [r1]\n\ @@ -2445,7 +2464,7 @@ _0801239C:\n\ bne _080123F8\n\ ldr r4, _0801244C @ =gBattleCommunication\n\ adds r0, r5, 0\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ lsls r0, 24\n\ lsrs r0, 24\n\ adds r0, r4\n\ @@ -3071,7 +3090,7 @@ _0801292C:\n\ eors r0, r1\n\ lsls r0, 24\n\ lsrs r0, 24\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ lsls r0, 24\n\ lsrs r0, 24\n\ adds r0, r4\n\ @@ -3621,7 +3640,7 @@ _08012DD2:\n\ bne _08012E06\n\ adds r0, r5, 0\n\ eors r0, r1\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ ldr r1, _08012E20 @ =gSharedMem\n\ ldr r2, _08012E24 @ =0x000160a6\n\ adds r1, r2\n\ @@ -3816,7 +3835,7 @@ _08012F80:\n\ cmp r0, r2\n\ bne _08012F90\n\ ldr r1, _08012FB4 @ =gBattleMainFunc\n\ - ldr r0, _08012FB8 @ =sub_80133C8\n\ + ldr r0, _08012FB8 @ =SetActionsAndBanksTurnOrder\n\ str r0, [r1]\n\ _08012F90:\n\ add sp, 0x1C\n\ @@ -3834,11 +3853,11 @@ _08012FA8: .4byte gActiveBank\n\ _08012FAC: .4byte gBattleCommunication\n\ _08012FB0: .4byte gNoOfAllBanks\n\ _08012FB4: .4byte gBattleMainFunc\n\ -_08012FB8: .4byte sub_80133C8\n\ +_08012FB8: .4byte SetActionsAndBanksTurnOrder\n\ .syntax divided\n"); } -void sub_8012FBC(u8 a, u8 b) +void SwapTurnOrder(u8 a, u8 b) { int temp; @@ -3995,3 +4014,257 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities) return strikesFirst; } + +void SetActionsAndBanksTurnOrder(void) +{ + s32 var = 0; + s32 i, j; + + if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) + { + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + gUnknown_02024A76[var] = gActionForBanks[gActiveBank]; + gTurnOrder[var] = gActiveBank; + var++; + } + } + else + { + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + if (gActionForBanks[gActiveBank] == ACTION_RUN) + { + var = 5; + break; + } + } + } + else + { + if (gActionForBanks[0] == ACTION_RUN) + { + gActiveBank = 0; + var = 5; + } + } + + if (var == 5) + { + gUnknown_02024A76[0] = gActionForBanks[gActiveBank]; + gTurnOrder[0] = gActiveBank; + var = 1; + for (i = 0; i < gNoOfAllBanks; i++) + { + if (i != gActiveBank) + { + gUnknown_02024A76[var] = gActionForBanks[i]; + gTurnOrder[var] = i; + var++; + } + } + gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; + eFocusPunchBank = 0; + return; + } + else + { + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH) + { + gUnknown_02024A76[var] = gActionForBanks[gActiveBank]; + gTurnOrder[var] = gActiveBank; + var++; + } + } + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH) + { + gUnknown_02024A76[var] = gActionForBanks[gActiveBank]; + gTurnOrder[var] = gActiveBank; + var++; + } + } + for (i = 0; i < gNoOfAllBanks - 1; i++) + { + for (j = i + 1; j < gNoOfAllBanks; j++) + { + u8 bank1 = gTurnOrder[i]; + u8 bank2 = gTurnOrder[j]; + if (gUnknown_02024A76[i] != ACTION_USE_ITEM + && gUnknown_02024A76[j] != ACTION_USE_ITEM + && gUnknown_02024A76[i] != ACTION_SWITCH + && gUnknown_02024A76[j] != ACTION_SWITCH) + { + if (GetWhoStrikesFirst(bank1, bank2, FALSE)) + SwapTurnOrder(i, j); + } + } + } + } + } + gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; + eFocusPunchBank = 0; +} + +static void TurnValuesCleanUp(bool8 var0) +{ + s32 i; + u8 *dataPtr; + + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + if (var0) + { + gProtectStructs[gActiveBank].protected = 0; + gProtectStructs[gActiveBank].endured = 0; + } + else + { + dataPtr = (u8*)(&gProtectStructs[gActiveBank]); + for (i = 0; i < sizeof(struct ProtectStruct); i++) + dataPtr[i] = 0; + + if (gDisableStructs[gActiveBank].isFirstTurn) + gDisableStructs[gActiveBank].isFirstTurn--; + + if (gDisableStructs[gActiveBank].rechargeCounter) + { + gDisableStructs[gActiveBank].rechargeCounter--; + if (gDisableStructs[gActiveBank].rechargeCounter == 0) + gBattleMons[gActiveBank].status2 &= ~(STATUS2_RECHARGE); + } + } + + if (gDisableStructs[gActiveBank].substituteHP == 0) + gBattleMons[gActiveBank].status2 &= ~(STATUS2_SUBSTITUTE); + } + + gSideTimers[0].followmeTimer = 0; + gSideTimers[1].followmeTimer = 0; +} + +void SpecialStatusesClear(void) +{ + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + s32 i; + u8 *dataPtr = (u8*)(&gSpecialStatuses[gActiveBank]); + + for (i = 0; i < sizeof(struct SpecialStatus); i++) + dataPtr[i] = 0; + } +} + +void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) +{ + if (!(gHitMarker & HITMARKER_RUN)) + { + while (eFocusPunchBank < gNoOfAllBanks) + { + gActiveBank = gBankAttacker = eFocusPunchBank; + eFocusPunchBank++; + if (gChosenMovesByBanks[gActiveBank] == MOVE_FOCUS_PUNCH + && !(gBattleMons[gActiveBank].status1 & STATUS_SLEEP) + && !(gDisableStructs[gBankAttacker].truantCounter) + && !(gProtectStructs[gActiveBank].onlyStruggle)) + { + b_call_bc_move_exec(BattleScript_FocusPunchSetUp); + return; + } + } + } + + b_clear_atk_up_if_hit_flag_unless_enraged(); + gCurrentTurnActionNumber = 0; + { + // something stupid needed to match + u8 zero; + gCurrentActionFuncId = gUnknown_02024A76[(zero = 0)]; + } + + gDynamicBasePower = 0; + BATTLE_STRUCT->dynamicMoveType = 0; + gBattleMainFunc = RunTurnActionsFunctions; + gBattleCommunication[3] = 0; + gBattleCommunication[4] = 0; + eMultihitMoveEffect = 0; + ewram17130 = 0; +} + +static void RunTurnActionsFunctions(void) +{ + if (gBattleOutcome != 0) + gCurrentActionFuncId = 12; + + BATTLE_STRUCT->unk16057 = gCurrentTurnActionNumber; + gUnknown_081FA640[gCurrentActionFuncId](); + + if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished + { + gHitMarker &= ~(HITMARKER_x100000); + gBattleMainFunc = gUnknown_081FA678[gBattleOutcome & 0x7F]; + } + else + { + if (BATTLE_STRUCT->unk16057 != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank + { + gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING); + gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE); + } + } +} + +void HandleEndTurn_BattleWon(void) +{ + gCurrentActionFuncId = 0; + + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gBattleTextBuff1[0] = gBattleOutcome; + gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1); + gBattlescriptCurrInstr = gUnknown_081D8E02; + gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN); + } + else if (gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)) + { + gBattlescriptCurrInstr = gUnknown_081D8E0D; + } + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) + { + BattleMusicStop(); + gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon; + + switch (gTrainers[gTrainerBattleOpponent].trainerClass) + { + case TRAINER_CLASS_ELITE_FOUR: + case TRAINER_CLASS_CHAMPION: + PlayBGM(BGM_KACHI5); + break; + case TRAINER_CLASS_TEAM_AQUA: + case TRAINER_CLASS_TEAM_MAGMA: + case TRAINER_CLASS_AQUA_ADMIN: + case TRAINER_CLASS_AQUA_LEADER: + case TRAINER_CLASS_MAGMA_ADMIN: + case TRAINER_CLASS_MAGMA_LEADER: + PlayBGM(BGM_KACHI4); + break; + case TRAINER_CLASS_LEADER: + PlayBGM(BGM_KACHI3); + break; + default: + PlayBGM(BGM_KACHI1); + break; + } + } + else + { + gBattlescriptCurrInstr = BattleScript_PayDayMoneyAndPickUpItems; + } + + gBattleMainFunc = sub_8013C9C; +} diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index e5a730598..cfa188fa4 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -50,7 +50,7 @@ extern u8 gTakenDmgBanks[4]; extern u8 gBattleMoveFlags; extern u8 gLastUsedAbility; extern u8 gBattleTextBuff2[]; -extern u8 gFightStateTracker; +extern u8 gCurrentActionFuncId; extern struct BattleEnigmaBerry gEnigmaBerries[4]; extern u8 gUnknown_02024BE5; extern u8 gCurrMovePos; @@ -69,7 +69,7 @@ extern const u8 gStatusConditionString_LoveJpn[]; extern const BattleCmdFunc gBattleScriptingCommandsTable[]; u8 IsImprisoned(u8 bank, u16 move); -u8 GetBankByPlayerAI(u8 ID); +u8 GetBankByIdentity(u8 ID); u8 GetBankIdentity(u8 bank); u8 GetBankSide(u8 bank); void b_call_bc_move_exec(u8* BS_ptr); @@ -320,9 +320,9 @@ bool8 AreAllMovesUnusable(void) gProtectStructs[gActiveBank].onlyStruggle = 1; gUnknown_02024C1C[gActiveBank] = BattleScript_NoMovesLeft; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - gBattleBufferB[gActiveBank][3] = GetBankByPlayerAI((GetBankIdentity(gActiveBank) ^ 1) | (Random() & 2)); + gBattleBufferB[gActiveBank][3] = GetBankByIdentity((GetBankIdentity(gActiveBank) ^ 1) | (Random() & 2)); else - gBattleBufferB[gActiveBank][3] = GetBankByPlayerAI(GetBankIdentity(gActiveBank) ^ 1); + gBattleBufferB[gActiveBank][3] = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ 1); } else gProtectStructs[gActiveBank].onlyStruggle = 0; @@ -380,7 +380,7 @@ u8 UpdateTurnCounters(void) for (j = i + 1; j < gNoOfAllBanks; j++) { if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 0)) - sub_8012FBC(i, j); + SwapTurnOrder(i, j); } } BATTLE_STRUCT->turncountersTracker++; @@ -392,7 +392,7 @@ u8 UpdateTurnCounters(void) if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT) { - if (--gSideTimer[sideBank].reflectTimer == 0) + if (--gSideTimers[sideBank].reflectTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT; @@ -421,7 +421,7 @@ u8 UpdateTurnCounters(void) gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN) { - if (--gSideTimer[sideBank].lightscreenTimer == 0) + if (--gSideTimers[sideBank].lightscreenTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN; b_call_bc_move_exec(BattleScript_SideStatusWoreOff); @@ -448,7 +448,7 @@ u8 UpdateTurnCounters(void) while (BATTLE_STRUCT->turnSideTracker < 2) { gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; - if (gSideTimer[sideBank].mistTimer && --gSideTimer[sideBank].mistTimer == 0) + if (gSideTimers[sideBank].mistTimer && --gSideTimers[sideBank].mistTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST; b_call_bc_move_exec(BattleScript_SideStatusWoreOff); @@ -476,7 +476,7 @@ u8 UpdateTurnCounters(void) gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD) { - if (--gSideTimer[sideBank].safeguardTimer == 0) + if (--gSideTimers[sideBank].safeguardTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD; b_call_bc_move_exec(BattleScript_SafeguardEnds); @@ -1363,14 +1363,14 @@ bool8 sub_8018018(u8 bank, u8 r1, u8 r2) { if (GetBankSide(bank) == 1) { - r7 = GetBankByPlayerAI(1); - r6 = GetBankByPlayerAI(3); + r7 = GetBankByIdentity(1); + r6 = GetBankByIdentity(3); party = gEnemyParty; } else { - r7 = GetBankByPlayerAI(0); - r6 = GetBankByPlayerAI(2); + r7 = GetBankByIdentity(0); + r6 = GetBankByIdentity(2); party = gPlayerParty; } if (r1 == 6) @@ -2053,15 +2053,15 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { u8 target2; side = (GetBankIdentity(i) ^ 1) & 1; - target1 = GetBankByPlayerAI(side); - target2 = GetBankByPlayerAI(side + 2); + target1 = GetBankByIdentity(side); + target2 = GetBankByIdentity(side + 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0 && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0) { //_080199AE - gActiveBank = GetBankByPlayerAI(((Random() & 1) * 2) | side); + gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | side); gBattleMons[i].ability = gBattleMons[gActiveBank].ability; gLastUsedAbility = gBattleMons[gActiveBank].ability; effect++; @@ -2256,7 +2256,7 @@ void b_call_bc_move_exec(u8* BS_ptr) gBattlescriptCurrInstr = BS_ptr; B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; gBattleMainFunc = sub_8013F54; - gFightStateTracker = 0; + gCurrentActionFuncId = 0; } void b_push_move_exec(u8* BS_ptr) @@ -3028,14 +3028,14 @@ void unref_sub_801B40C(void) { if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank + 2]) { - gSideTimer[GetBankIdentity(bank) & 1].field3 = (bank) | ((bank + 2) << 4); - gSideTimer[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; + gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank) | ((bank + 2) << 4); + gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4; } if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank + 2] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank]) { - gSideTimer[GetBankIdentity(bank) & 1].field3 = (bank + 2) | ((bank) << 4); - gSideTimer[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; + gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank + 2) | ((bank) << 4); + gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4; } bank++; @@ -3067,8 +3067,8 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target { case 0: side = GetBankSide(gBankAttacker) ^ 1; - if (gSideTimer[side].followmeTimer && gBattleMons[gSideTimer[side].followmeTarget].hp) - targetBank = gSideTimer[side].followmeTarget; + if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) + targetBank = gSideTimers[side].followmeTarget; else { side = GetBankSide(gBankAttacker); @@ -3090,35 +3090,35 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target case 8: case 32: case 64: - targetBank = GetBankByPlayerAI((GetBankIdentity(gBankAttacker) & 1) ^ 1); + targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1); if (gAbsentBankFlags & gBitTable[targetBank]) targetBank ^= 2; break; case 4: side = GetBankSide(gBankAttacker) ^ 1; - if (gSideTimer[side].followmeTimer && gBattleMons[gSideTimer[side].followmeTarget].hp) - targetBank = gSideTimer[side].followmeTarget; + if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) + targetBank = gSideTimers[side].followmeTarget; else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & 4) { if (GetBankSide(gBankAttacker) == 0) { if (Random() & 1) - targetBank = GetBankByPlayerAI(1); + targetBank = GetBankByIdentity(1); else - targetBank = GetBankByPlayerAI(3); + targetBank = GetBankByIdentity(3); } else { if (Random() & 1) - targetBank = GetBankByPlayerAI(0); + targetBank = GetBankByIdentity(0); else - targetBank = GetBankByPlayerAI(2); + targetBank = GetBankByIdentity(2); } if (gAbsentBankFlags & gBitTable[targetBank]) targetBank ^= 2; } else - targetBank = GetBankByPlayerAI((GetBankIdentity(gBankAttacker) & 1) ^ 1); + targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1); break; case 2: case 16: diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 0c147e471..d9789f76d 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -58,7 +58,7 @@ extern u8 gBankAttacker; extern u8 gBankTarget; extern u8* gBattlescriptCurrInstr; extern u8 gCurrMovePos; -extern u8 gFightStateTracker; +extern u8 gCurrentActionFuncId; extern u32 gHitMarker; extern u8 gBattleMoveFlags; extern u8 gBattleCommunication[]; @@ -94,7 +94,7 @@ extern u8 gActionForBanks[4]; extern u16 gUnknown_02024C2C[4]; //last used moves 2, used by sketch extern u16 gUnknown_030041B0; extern u16 gUnknown_02024C4C[4]; //last used moves by banks, another one -extern u8 gCurrentMoveTurn; +extern u8 gCurrentTurnActionNumber; extern u16 gTrappingMoves[]; //extern functions @@ -129,7 +129,7 @@ u8 GetSetPokedexFlag(u16 nationalNum, u8 caseID); u16 SpeciesToNationalPokedexNum(u16 species); u8 sub_803FC34(u8 bank); u16 sub_803FBFC(u8 a); -u8 GetBankByPlayerAI(u8 ID); +u8 GetBankByIdentity(u8 ID); void sub_8012258(u8); void sub_80157C4(u8 bank); //update sent pokes in battle //MonTryLearningNewMove teach poke a move @@ -1028,7 +1028,7 @@ static void atk00_attackcanceler(void) int i; if (gBattleOutcome) { - gFightStateTracker = 0xC; + gCurrentActionFuncId = 0xC; return; } if (gBattleMons[gBankAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING)) @@ -2518,7 +2518,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) } else { - if (BankGetTurnOrder(gEffectBank) > gCurrentMoveTurn) + if (BankGetTurnOrder(gEffectBank) > gCurrentTurnActionNumber) gBattleMons[gEffectBank].status2 |= gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattlescriptCurrInstr++; return; } @@ -3861,7 +3861,7 @@ _0801ED14: .4byte BattleScript_FlinchPrevention\n\ _0801ED18:\n\ adds r0, r2, 0\n\ bl BankGetTurnOrder\n\ - ldr r1, _0801ED54 @ =gCurrentMoveTurn\n\ + ldr r1, _0801ED54 @ =gCurrentTurnActionNumber\n\ lsls r0, 24\n\ lsrs r0, 24\n\ ldrb r1, [r1]\n\ @@ -3887,7 +3887,7 @@ _0801ED2E:\n\ str r1, [r2]\n\ bl _0801F5DC\n\ .align 2, 0\n\ -_0801ED54: .4byte gCurrentMoveTurn\n\ +_0801ED54: .4byte gCurrentTurnActionNumber\n\ _0801ED58: .4byte gStatusFlagsForMoveEffects\n\ _0801ED5C: .4byte gBattleCommunication\n\ _0801ED60:\n\ @@ -7290,14 +7290,14 @@ static void atk3D_end(void) { gBattleMoveFlags = 0; gActiveBank = 0; - gFightStateTracker = 0xB; + gCurrentActionFuncId = 0xB; } static void atk3E_end2(void) { //not much difference between this and 3D. It's more apparent in Emerald gActiveBank = 0; - gFightStateTracker = 0xB; + gCurrentActionFuncId = 0xB; } static void atk3F_end3(void) //pops the main function stack @@ -7467,7 +7467,7 @@ static void atk48_playstatchangeanimation(void) if (!(T2_READ_8(gBattlescriptCurrInstr + 3))) { u8 ability; - if (gSideTimer[GetBankIdentity(gActiveBank) & 1].mistTimer) + if (gSideTimers[GetBankIdentity(gActiveBank) & 1].mistTimer) continue; ability = gBattleMons[gActiveBank].ability; if (ability == ABILITY_CLEAR_BODY || ability == ABILITY_WHITE_SMOKE || (ability == ABILITY_KEEN_EYE && curr_stat == 6) || (ability == ABILITY_HYPER_CUTTER && curr_stat == 1)) @@ -7602,7 +7602,7 @@ _0802167C:\n\ lsls r0, r1, 1\n\ adds r0, r1\n\ lsls r0, 2\n\ - ldr r1, _08021704 @ =gSideTimer\n\ + ldr r1, _08021704 @ =gSideTimers\n\ adds r0, r1\n\ ldrb r0, [r0, 0x2]\n\ ldr r3, [sp]\n\ @@ -7665,7 +7665,7 @@ _080216E4:\n\ b _08021770\n\ .align 2, 0\n\ _08021700: .4byte gActiveBank\n\ -_08021704: .4byte gSideTimer\n\ +_08021704: .4byte gSideTimers\n\ _08021708: .4byte gBattleMons\n\ _0802170C: .4byte gBattlescriptCurrInstr\n\ _08021710:\n\ @@ -9154,7 +9154,7 @@ _080221C0:\n\ eors r0, r1\n\ lsls r0, 24\n\ lsrs r0, 24\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ lsls r0, 24\n\ lsrs r2, r0, 24\n\ ldr r1, _080222CC @ =gBattleMons\n\ @@ -9457,18 +9457,18 @@ static void atk4F_jumpifcantswitch(void) { if (GetBankSide(gActiveBank) == 1) { - r7 = GetBankByPlayerAI(1); + r7 = GetBankByIdentity(1); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - to_cmp = GetBankByPlayerAI(3); + to_cmp = GetBankByIdentity(3); else to_cmp = r7; party = gEnemyParty; } else { - r7 = GetBankByPlayerAI(0); + r7 = GetBankByIdentity(0); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - to_cmp = GetBankByPlayerAI(2); + to_cmp = GetBankByIdentity(2); else to_cmp = r7; party = gPlayerParty; @@ -10528,7 +10528,7 @@ _080232C4:\n\ eors r0, r1\n\ lsls r0, 24\n\ lsrs r0, 24\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ ldr r4, _08023310 @ =gActiveBank\n\ strb r0, [r4]\n\ ldr r0, _08023314 @ =gAbsentBankFlags\n\ @@ -10632,7 +10632,7 @@ static void atk52_switchineffects(void) gSideAffecting[GetBankSide(gActiveBank)] |= SIDE_STATUS_SPIKES_DAMAGED; - spikesDmg = (5 - gSideTimer[GetBankSide(gActiveBank)].spikesAmount) * 2; + spikesDmg = (5 - gSideTimers[GetBankSide(gActiveBank)].spikesAmount) * 2; gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / (spikesDmg); if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; @@ -10690,9 +10690,9 @@ static void atk52_switchineffects(void) static void atk53_trainerslidein(void) { if (!T2_READ_8(gBattlescriptCurrInstr + 1)) - gActiveBank = GetBankByPlayerAI(0); + gActiveBank = GetBankByIdentity(0); else - gActiveBank = GetBankByPlayerAI(1); + gActiveBank = GetBankByIdentity(1); EmitTrainerSlide(0); MarkBufferBankForExecution(gActiveBank); @@ -10725,7 +10725,7 @@ static void atk56_playfaintcry(void) static void atk57(void) { - gActiveBank = GetBankByPlayerAI(0); + gActiveBank = GetBankByIdentity(0); Emitcmd55(0, gBattleOutcome); MarkBufferBankForExecution(gActiveBank); gBattlescriptCurrInstr += 1; @@ -10758,12 +10758,12 @@ void atk59_handlelearnnewmove(void) } else { - gActiveBank = GetBankByPlayerAI(0); + gActiveBank = GetBankByIdentity(0); if (gBattlePartyID[gActiveBank] == BATTLE_STRUCT->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED)) GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) //what is else if { - gActiveBank = GetBankByPlayerAI(2); + gActiveBank = GetBankByIdentity(2); if (gBattlePartyID[gActiveBank] == BATTLE_STRUCT->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED)) GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret); } @@ -11907,7 +11907,7 @@ static void atk6D_resetsentmonsvalue(void) static void atk6E_setatktoplayer0(void) { - gBankAttacker = GetBankByPlayerAI(0); + gBankAttacker = GetBankByIdentity(0); gBattlescriptCurrInstr++; } @@ -12020,8 +12020,8 @@ static void atk76_various(void) u8 side; gBankAttacker = gBankTarget; side = GetBankSide(gBankAttacker) ^ 1; - if (gSideTimer[side].followmeTimer && gBattleMons[gSideTimer[side].followmeTarget].hp) - gBankTarget = gSideTimer[side].followmeTarget; + if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) + gBankTarget = gSideTimers[side].followmeTarget; else gBankTarget = gActiveBank; } @@ -12080,7 +12080,7 @@ static void atk77_setprotectlike(void) //protect and endure if (last_move != MOVE_PROTECT && last_move != MOVE_DETECT && last_move != MOVE_ENDURE) gDisableStructs[gBankAttacker].protectUses = 0; - if (gCurrentMoveTurn == (gNoOfAllBanks - 1)) + if (gCurrentTurnActionNumber == (gNoOfAllBanks - 1)) not_last_turn = 0; if (sProtectSuccessRates[gDisableStructs[gBankAttacker].protectUses] > Random() && not_last_turn) @@ -12266,7 +12266,7 @@ static void atk7E_setreflect(void) else { gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_REFLECT; - gSideTimer[GetBankIdentity(gBankAttacker) & 1].reflectTimer = 5; + gSideTimers[GetBankIdentity(gBankAttacker) & 1].reflectTimer = 5; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMons(1) == 2) gBattleCommunication[MULTISTRING_CHOOSER] = 2; else @@ -12502,7 +12502,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) if ((statchanger << 0x18) < 0) //stat decrease { - if (gSideTimer[GetBankIdentity(gActiveBank) & 1].mistTimer && !r9 && gCurrentMove != MOVE_CURSE) + if (gSideTimers[GetBankIdentity(gActiveBank) & 1].mistTimer && !r9 && gCurrentMove != MOVE_CURSE) { if (flags == 1) { @@ -12728,7 +12728,7 @@ _08025E88:\n\ blt _08025EAC\n\ b _080261B0\n\ _08025EAC:\n\ - ldr r4, _08025F04 @ =gSideTimer\n\ + ldr r4, _08025F04 @ =gSideTimers\n\ ldr r1, _08025EF8 @ =gActiveBank\n\ ldrb r0, [r1]\n\ bl GetBankIdentity\n\ @@ -12769,7 +12769,7 @@ _08025EAC:\n\ _08025EF8: .4byte gActiveBank\n\ _08025EFC: .4byte gBankTarget\n\ _08025F00: .4byte gBattleTextBuff1\n\ -_08025F04: .4byte gSideTimer\n\ +_08025F04: .4byte gSideTimers\n\ _08025F08: .4byte gCurrentMove\n\ _08025F0C: .4byte gSpecialStatuses\n\ _08025F10: .4byte gBattlescriptCurrInstr\n\ @@ -13488,7 +13488,7 @@ static void atk92_setlightscreen(void) else { gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_LIGHTSCREEN; - gSideTimer[GetBankIdentity(gBankAttacker) & 1].lightscreenTimer = 5; + gSideTimers[GetBankIdentity(gBankAttacker) & 1].lightscreenTimer = 5; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMons(1) == 2) gBattleCommunication[MULTISTRING_CHOOSER] = 4; else @@ -14034,7 +14034,7 @@ static void atk98_updatestatusicon(void) } if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2); + gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); if (!(gAbsentBankFlags & gBitTable[gActiveBank])) { EmitStatusIconUpdate(0, gBattleMons[gActiveBank].status1, gBattleMons[gActiveBank].status2); @@ -14047,14 +14047,14 @@ static void atk98_updatestatusicon(void) static void atk99_setmist(void) { - if (gSideTimer[GetBankIdentity(gBankAttacker) & 1].mistTimer) + if (gSideTimers[GetBankIdentity(gBankAttacker) & 1].mistTimer) { gBattleMoveFlags |= MOVESTATUS_FAILED; gBattleCommunication[MULTISTRING_CHOOSER] = 1; } else { - gSideTimer[GetBankIdentity(gBankAttacker) & 1].mistTimer = 5; + gSideTimers[GetBankIdentity(gBankAttacker) & 1].mistTimer = 5; gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_MIST; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } @@ -14315,8 +14315,8 @@ static void atkA1_counterdamagecalculator(void) if (gProtectStructs[gBankAttacker].physicalDmg && atk_side != def_side && gBattleMons[gProtectStructs[gBankAttacker].physicalBank].hp) { gBattleMoveDamage = gProtectStructs[gBankAttacker].physicalDmg * 2; - if (gSideTimer[def_side].followmeTimer && gBattleMons[gSideTimer[def_side].followmeTarget].hp) - gBankTarget = gSideTimer[def_side].followmeTarget; + if (gSideTimers[def_side].followmeTimer && gBattleMons[gSideTimers[def_side].followmeTarget].hp) + gBankTarget = gSideTimers[def_side].followmeTarget; else gBankTarget = gProtectStructs[gBankAttacker].physicalBank; gBattlescriptCurrInstr += 5; @@ -14335,8 +14335,8 @@ static void atkA2_mirrorcoatdamagecalculator(void) //a copy of atkA1 with the ph if (gProtectStructs[gBankAttacker].specialDmg && atk_side != def_side && gBattleMons[gProtectStructs[gBankAttacker].specialBank].hp) { gBattleMoveDamage = gProtectStructs[gBankAttacker].specialDmg * 2; - if (gSideTimer[def_side].followmeTimer && gBattleMons[gSideTimer[def_side].followmeTarget].hp) - gBankTarget = gSideTimer[def_side].followmeTarget; + if (gSideTimers[def_side].followmeTimer && gBattleMons[gSideTimers[def_side].followmeTarget].hp) + gBankTarget = gSideTimers[def_side].followmeTarget; else gBankTarget = gProtectStructs[gBankAttacker].specialBank; gBattlescriptCurrInstr += 5; @@ -14948,7 +14948,7 @@ static void atkAE_healpartystatus(void) gBattleCommunication[MULTISTRING_CHOOSER] |= 1; } - gActiveBank = BATTLE_STRUCT->scriptingActive = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2); + gActiveBank = BATTLE_STRUCT->scriptingActive = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank])) { if (gBattleMons[gActiveBank].ability != ABILITY_SOUNDPROOF) @@ -14986,7 +14986,7 @@ static void atkAE_healpartystatus(void) to_heal = 0x3F; gBattleMons[gBankAttacker].status1 = zero2; - gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2); + gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank])) gBattleMons[gActiveBank].status1 = 0; @@ -15018,7 +15018,7 @@ static void atkAF_cursetarget(void) static void atkB0_trysetspikes(void) { u8 side = GetBankSide(gBankAttacker) ^ 1; - if (gSideTimer[side].spikesAmount == 3) + if (gSideTimers[side].spikesAmount == 3) { gSpecialStatuses[gBankAttacker].flag20 = 1; gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -15026,7 +15026,7 @@ static void atkB0_trysetspikes(void) else { gSideAffecting[side] |= SIDE_STATUS_SPIKES; - gSideTimer[side].spikesAmount++; + gSideTimers[side].spikesAmount++; gBattlescriptCurrInstr += 5; } } @@ -15167,7 +15167,7 @@ static void atkB8_setsafeguard(void) else { gSideAffecting[GetBankIdentity(gBankAttacker) & 1] |= SIDE_STATUS_SAFEGUARD; - gSideTimer[GetBankIdentity(gBankAttacker) & 1].safeguardTimer = 5; + gSideTimers[GetBankIdentity(gBankAttacker) & 1].safeguardTimer = 5; gBattleCommunication[MULTISTRING_CHOOSER] = 5; } gBattlescriptCurrInstr++; @@ -15234,16 +15234,16 @@ static void atkBA_jumpifnopursuitswitchdmg(void) if (gMultiHitCounter == 1) { if (GetBankSide(gBankAttacker) == 0) - gBankTarget = GetBankByPlayerAI(1); + gBankTarget = GetBankByIdentity(1); else - gBankTarget = GetBankByPlayerAI(0); + gBankTarget = GetBankByIdentity(0); } else { if (GetBankSide(gBankAttacker) == 0) - gBankTarget = GetBankByPlayerAI(3); + gBankTarget = GetBankByIdentity(3); else - gBankTarget = GetBankByPlayerAI(2); + gBankTarget = GetBankByIdentity(2); } if (gActionForBanks[gBankTarget] == 0 && gBankAttacker == ewram16010arr(gBankTarget) && !(gBattleMons[gBankTarget].status1 & (STATUS_SLEEP | STATUS_FREEZE)) @@ -15334,7 +15334,7 @@ static void atkBE_rapidspinfree(void) //rapid spin else if (gSideAffecting[GetBankSide(gBankAttacker)] & SIDE_STATUS_SPIKES) { gSideAffecting[GetBankSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES); - gSideTimer[GetBankSide(gBankAttacker)].spikesAmount = 0; + gSideTimers[GetBankSide(gBankAttacker)].spikesAmount = 0; b_movescr_stack_push_cursor(); gBattlescriptCurrInstr = BattleScript_SpikesFree; } @@ -15935,8 +15935,8 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) //memento static void atkCA_setforcedtarget(void) //follow me { - gSideTimer[GetBankSide(gBankAttacker)].followmeTimer = 1; - gSideTimer[GetBankSide(gBankAttacker)].followmeTarget = gBankAttacker; + gSideTimers[GetBankSide(gBankAttacker)].followmeTimer = 1; + gSideTimers[GetBankSide(gBankAttacker)].followmeTarget = gBankAttacker; gBattlescriptCurrInstr++; } @@ -16004,7 +16004,7 @@ static void atkD0_settaunt(void) static void atkD1_trysethelpinghand(void) { - gBankTarget = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2); + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gBankTarget]) && !gProtectStructs[gBankAttacker].helpingHand && !gProtectStructs[gBankTarget].helpingHand) { @@ -16774,7 +16774,7 @@ static void atkDF_trysetmagiccoat(void) { gBankTarget = gBankAttacker; gSpecialStatuses[gBankAttacker].flag20 = 1; - if (gCurrentMoveTurn == gNoOfAllBanks - 1) //last turn + if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else { @@ -16786,7 +16786,7 @@ static void atkDF_trysetmagiccoat(void) static void atkE0_trysetsnatch(void) { gSpecialStatuses[gBankAttacker].flag20 = 1; - if (gCurrentMoveTurn == gNoOfAllBanks - 1) //last turn + if (gCurrentTurnActionNumber == gNoOfAllBanks - 1) //last turn gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else { @@ -17011,7 +17011,7 @@ static void atkEB_settypetoterrain(void) static void atkEC_pursuitrelated(void) { - gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2); + gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]) && gActionForBanks[gActiveBank] == 0 && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT) { gUnknown_02024A76[gActiveBank] = 11; @@ -17039,12 +17039,12 @@ static void atkED_snatchsetbanks(void) static void atkEE_removelightscreenreflect(void) //brick break { u8 side = GetBankSide(gBankAttacker) ^ 1; - if (gSideTimer[side].reflectTimer || gSideTimer[side].lightscreenTimer) + if (gSideTimers[side].reflectTimer || gSideTimers[side].lightscreenTimer) { gSideAffecting[side] &= ~(SIDE_STATUS_REFLECT); gSideAffecting[side] &= ~(SIDE_STATUS_LIGHTSCREEN); - gSideTimer[side].reflectTimer = 0; - gSideTimer[side].lightscreenTimer = 0; + gSideTimers[side].reflectTimer = 0; + gSideTimers[side].lightscreenTimer = 0; BATTLE_STRUCT->animTurn = 1; BATTLE_STRUCT->animTargetsHit = 1; } @@ -17428,11 +17428,11 @@ static void atkF5_removeattackerstatus1(void) static void atkF6_finishaction(void) { - gFightStateTracker = 0xC; + gCurrentActionFuncId = 0xC; } static void atkF7_finishturn(void) { - gFightStateTracker = 0xC; - gCurrentMoveTurn = gNoOfAllBanks; + gCurrentActionFuncId = 0xC; + gCurrentTurnActionNumber = gNoOfAllBanks; } diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index e11971606..1c79d7ebf 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -795,7 +795,7 @@ void sub_80324F8(struct Pokemon *pkmn, u8 b) void BattleMusicStop(void) { - u8 r4 = GetBankByPlayerAI(0); + u8 r4 = GetBankByIdentity(0); ewram17800[r4].unk0_1 = 0; if (IsDoubleBattle()) @@ -815,8 +815,8 @@ void sub_8032638(void) { if (gMain.inBattle) { - u8 r8 = GetBankByPlayerAI(0); - u8 r9 = GetBankByPlayerAI(2); + u8 r8 = GetBankByIdentity(0); + u8 r9 = GetBankByIdentity(2); u8 r4 = pokemon_order_func(gBattlePartyID[r8]); u8 r5 = pokemon_order_func(gBattlePartyID[r9]); @@ -857,12 +857,12 @@ void sub_80327CC(void) u8 r5; LoadCompressedObjectPic(&gUnknown_081FAF24); - r5 = GetBankByPlayerAI(1); + r5 = GetBankByIdentity(1); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data[0] = r5; if (IsDoubleBattle()) { - r5 = GetBankByPlayerAI(3); + r5 = GetBankByIdentity(3); ewram17810[r5].unk7 = CreateSprite(&gSpriteTemplate_81FAF34, GetBankPosition(r5, 0), GetBankPosition(r5, 1) + 32, 0xC8); gSprites[ewram17810[r5].unk7].data[0] = r5; } diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 6b892ea7a..977e91f5c 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -1321,7 +1321,7 @@ static void BattleAICmd_count_alive_pokemon(void) u32 status; var = gBattlePartyID[index]; status = GetBankIdentity(index) ^ 2; - var2 = gBattlePartyID[GetBankByPlayerAI(status)]; + var2 = gBattlePartyID[GetBankByIdentity(status)]; } else { diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c index 3097f1a0e..c35434df0 100644 --- a/src/battle/battle_anim_80A7E7C.c +++ b/src/battle/battle_anim_80A7E7C.c @@ -108,17 +108,17 @@ void sub_80A7FA0(u8 taskId) switch (gBattleAnimArgs[0]) { case 4: - side = GetBankByPlayerAI(0); + side = GetBankByIdentity(0); break; case 5: - side = GetBankByPlayerAI(2); + side = GetBankByIdentity(2); break; case 6: - side = GetBankByPlayerAI(1); + side = GetBankByIdentity(1); break; case 7: default: - side = GetBankByPlayerAI(3); + side = GetBankByIdentity(3); break; } if (IsAnimBankSpriteVisible(side) == FALSE) diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index 54bb9d7f9..477b600ac 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -98,7 +98,7 @@ extern void sub_80324BC(); extern void BufferStringBattle(); extern void sub_80331D0(void); extern void sub_8036B0C(void); -extern u8 GetBankByPlayerAI(u8); +extern u8 GetBankByIdentity(u8); extern u8 sub_8036CD4(void); extern void sub_80330C8(void); extern void sub_8043D84(); @@ -1451,9 +1451,9 @@ void OpponentHandlecmd20(void) gBankTarget = gActiveBank; if (gBattleMoves[r5->moves[r4]].target & 8) { - gBankTarget = GetBankByPlayerAI(0); + gBankTarget = GetBankByIdentity(0); if (gAbsentBankFlags & gBitTable[gBankTarget]) - gBankTarget = GetBankByPlayerAI(2); + gBankTarget = GetBankByIdentity(2); } r4 |= gBankTarget << 8; Emitcmd33(1, 10, r4); @@ -1479,13 +1479,13 @@ void OpponentHandlecmd20(void) } else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - u16 r2 = GetBankByPlayerAI(Random() & 2) << 8; + u16 r2 = GetBankByIdentity(Random() & 2) << 8; Emitcmd33(1, 10, r4 | r2); } else { - u16 r2 = GetBankByPlayerAI(0) << 8; + u16 r2 = GetBankByIdentity(0) << 8; Emitcmd33(1, 10, r4 | r2); } @@ -1561,7 +1561,7 @@ _08035494:\n\ cmp r0, 0\n\ beq _080354CE\n\ movs r0, 0\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ ldr r5, _080354EC @ =gBankTarget\n\ strb r0, [r5]\n\ ldr r0, _080354F0 @ =gAbsentBankFlags\n\ @@ -1575,7 +1575,7 @@ _08035494:\n\ cmp r1, 0\n\ beq _080354CE\n\ movs r0, 0x2\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ strb r0, [r5]\n\ _080354CE:\n\ ldr r0, _080354EC @ =gBankTarget\n\ @@ -1640,7 +1640,7 @@ _0803553C:\n\ lsls r1, 24\n\ lsrs r1, 24\n\ adds r0, r1, 0\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ adds r2, r0, 0\n\ lsls r2, 24\n\ lsrs r2, 16\n\ @@ -1653,7 +1653,7 @@ _0803553C:\n\ _0803556C: .4byte gBattleTypeFlags\n\ _08035570:\n\ movs r0, 0\n\ - bl GetBankByPlayerAI\n\ + bl GetBankByIdentity\n\ adds r2, r0, 0\n\ lsls r2, 24\n\ lsrs r2, 16\n\ @@ -1692,13 +1692,13 @@ void OpponentHandlecmd22(void) { if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - r5 = GetBankByPlayerAI(1); + r5 = GetBankByIdentity(1); r6 = r5; } else { - r6 = GetBankByPlayerAI(1); - r5 = GetBankByPlayerAI(3); + r6 = GetBankByIdentity(1); + r5 = GetBankByIdentity(3); } for (r4 = 0; r4 < 6; r4++) { diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 70773473d..62a38311a 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -118,7 +118,7 @@ extern void sub_8031F24(void); extern void sub_80324BC(); extern u8 sub_8031720(); extern void bx_wait_t1(void); -extern u8 GetBankByPlayerAI(u8); +extern u8 GetBankByIdentity(u8); extern void sub_802DE10(void); extern void sub_80105EC(struct Sprite *); extern void sub_802D274(void); @@ -167,7 +167,7 @@ extern const u8 BattleText_LinkStandby[]; extern void dp11b_obj_instanciate(u8, u8, s8, s8); extern u8 GetBankIdentity(u8); -extern u8 GetBankByPlayerAI(u8); +extern u8 GetBankByIdentity(u8); extern void dp11b_obj_free(u8, u8); extern void sub_8010520(struct Sprite *); extern void sub_8010574(struct Sprite *); @@ -445,7 +445,7 @@ void sub_802C098(void) { if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && GetBankIdentity(gActiveBank) == 2 - && !(gAbsentBankFlags & gBitTable[GetBankByPlayerAI(0)]) + && !(gAbsentBankFlags & gBitTable[GetBankByIdentity(0)]) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) { if (gBattleBufferA[gActiveBank][1] == 1) @@ -529,7 +529,7 @@ void sub_802C2EC(void) i--; if (i < 0) i = 3; - gUnknown_03004344 = GetBankByPlayerAI(arr[i]); + gUnknown_03004344 = GetBankByIdentity(arr[i]); } while(gUnknown_03004344 == gNoOfAllBanks); i = 0; switch (GetBankIdentity(gUnknown_03004344)) @@ -576,7 +576,7 @@ void sub_802C2EC(void) i++; if (i > 3) i = 0; - gUnknown_03004344 = GetBankByPlayerAI(arr[i]); + gUnknown_03004344 = GetBankByIdentity(arr[i]); } while (gUnknown_03004344 == gNoOfAllBanks); i = 0; switch (GetBankIdentity(gUnknown_03004344)) @@ -636,7 +636,7 @@ void sub_802C68C(void) if (r4 & 0x10) gUnknown_03004344 = gActiveBank; else - gUnknown_03004344 = GetBankByPlayerAI((GetBankIdentity(gActiveBank) & 1) ^ 1); + gUnknown_03004344 = GetBankByIdentity((GetBankIdentity(gActiveBank) & 1) ^ 1); if (gBattleBufferA[gActiveBank][1] == 0) { @@ -668,10 +668,10 @@ void sub_802C68C(void) gBattleBankFunc[gActiveBank] = sub_802C2EC; if (r4 & 0x12) gUnknown_03004344 = gActiveBank; - else if (gAbsentBankFlags & gBitTable[GetBankByPlayerAI(1)]) - gUnknown_03004344 = GetBankByPlayerAI(3); + else if (gAbsentBankFlags & gBitTable[GetBankByIdentity(1)]) + gUnknown_03004344 = GetBankByIdentity(3); else - gUnknown_03004344 = GetBankByPlayerAI(1); + gUnknown_03004344 = GetBankByIdentity(1); gSprites[gObjectBankIDs[gUnknown_03004344]].callback = sub_8010520; } } @@ -2458,7 +2458,7 @@ void PlayerHandlecmd12(void) { ewram17840.unk8 = 4; gDoingBattleAnim = 1; - move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 3); + move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 3); gBattleBankFunc[gActiveBank] = bx_wait_t1; } @@ -2468,7 +2468,7 @@ void PlayerHandleBallThrow(void) ewram17840.unk8 = var; gDoingBattleAnim = 1; - move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 3); + move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 3); gBattleBankFunc[gActiveBank] = bx_wait_t1; } diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 6f6286945..37c58f951 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -40,7 +40,7 @@ extern u16 gUnknown_02024DE8; extern u8 gBattleOutcome; extern u8 GetBankSide(u8); -extern u8 GetBankByPlayerAI(u8); +extern u8 GetBankByIdentity(u8); extern u8 GetBankIdentity(u8); extern void LoadPlayerTrainerBankSprite(); extern u8 sub_8079E90(); @@ -423,7 +423,7 @@ void SafariHandlecmd12(void) { ewram17840.unk8 = 4; gDoingBattleAnim = 1; - move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4); + move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4); gBattleBankFunc[gActiveBank] = bx_wait_t6; } @@ -433,7 +433,7 @@ void SafariHandleBallThrow(void) ewram17840.unk8 = var; gDoingBattleAnim = 1; - move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4); + move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4); gBattleBankFunc[gActiveBank] = bx_wait_t6; } diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 8ace11fc1..be40f968c 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -75,7 +75,7 @@ extern void PlayerHandlecmd1(void); extern void LoadPlayerTrainerBankSprite(); extern u8 GetBankIdentity(u8); extern void sub_80313A0(struct Sprite *); -extern u8 GetBankByPlayerAI(u8); +extern u8 GetBankByIdentity(u8); extern u8 sub_8031720(); extern void DoMoveAnim(); extern void sub_80326EC(); @@ -1149,7 +1149,7 @@ void WallyHandlecmd12(void) { ewram17840.unk8 = 4; gDoingBattleAnim = TRUE; - move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4); + move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4); gBattleBankFunc[gActiveBank] = bx_wait_t5; } @@ -1159,7 +1159,7 @@ void WallyHandleBallThrow(void) ewram17840.unk8 = val; gDoingBattleAnim = TRUE; - move_anim_start_t4(gActiveBank, gActiveBank, GetBankByPlayerAI(1), 4); + move_anim_start_t4(gActiveBank, gActiveBank, GetBankByIdentity(1), 4); gBattleBankFunc[gActiveBank] = bx_wait_t5; } diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index 4ac8c7a6f..d8efc09c5 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -199,7 +199,7 @@ s32 sub_803FC34(u16); void get_trainer_name(u8* dst); u8 get_trainer_class_name_index(void); u8 GetMultiplayerId(void); -u8 GetBankByPlayerAI(u8 ID); +u8 GetBankByIdentity(u8 ID); u8 GetBankSide(u8 bank); u8 GetBankIdentity(u8 bank); #ifdef GERMAN @@ -572,22 +572,22 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) toCpy = gBattleTextBuff3; break; case 2: // first player poke name - GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPlayerAI(0)]], MON_DATA_NICKNAME, text); + GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(0)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case 3: // first enemy poke name - GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPlayerAI(1)]], MON_DATA_NICKNAME, text); + GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(1)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case 4: // second player poke name - GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPlayerAI(2)]], MON_DATA_NICKNAME, text); + GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(2)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; case 5: // second enemy poke name - GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPlayerAI(3)]], MON_DATA_NICKNAME, text); + GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(3)]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; break; @@ -612,13 +612,13 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) toCpy = text; break; case 10: // attacker name with prefix, only bank 0/1 - HANDLE_NICKNAME_STRING_CASE(gBankAttacker, gBattlePartyID[GetBankByPlayerAI(GetBankIdentity(gBankAttacker) & 1)]) + HANDLE_NICKNAME_STRING_CASE(gBankAttacker, gBattlePartyID[GetBankByIdentity(GetBankIdentity(gBankAttacker) & 1)]) break; case 11: // attacker partner name, only bank 0/1 if (GetBankSide(gBankAttacker) == 0) - GetMonData(&gPlayerParty[gBattlePartyID[GetBankByPlayerAI(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text); + GetMonData(&gPlayerParty[gBattlePartyID[GetBankByIdentity(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text); else - GetMonData(&gEnemyParty[gBattlePartyID[GetBankByPlayerAI(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text); + GetMonData(&gEnemyParty[gBattlePartyID[GetBankByIdentity(GetBankIdentity(gBankAttacker) & 1) + 2]], MON_DATA_NICKNAME, text); StringGetEnd10(text); toCpy = text; diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index d4dcae0ca..7bce00d82 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -122,7 +122,7 @@ static void sub_8094998(u8 arg[3], u8 player_number) if (!IsDoubleBattle()) { pos = 1; - *temp = gBattlePartyID[GetBankByPlayerAI(0)]; + *temp = gBattlePartyID[GetBankByIdentity(0)]; for (i = 0; i <= 5; i++) if (i != *temp) temp[pos++] = i; @@ -130,8 +130,8 @@ static void sub_8094998(u8 arg[3], u8 player_number) else { pos = 2; - *temp = gBattlePartyID[GetBankByPlayerAI(0)]; - temp[1] = gBattlePartyID[GetBankByPlayerAI(2)]; + *temp = gBattlePartyID[GetBankByIdentity(0)]; + temp[1] = gBattlePartyID[GetBankByIdentity(2)]; for (i = 0; i <= 5; i++) if ((i != *temp) && (i != temp[1])) temp[pos++] = i; @@ -147,13 +147,13 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3) u8 temp[6]; if (!GetBankSide(arg3)) { - i = GetBankByPlayerAI(0); - j = GetBankByPlayerAI(2); + i = GetBankByIdentity(0); + j = GetBankByIdentity(2); } else { - i = GetBankByPlayerAI(1); - j = GetBankByPlayerAI(3); + i = GetBankByIdentity(1); + j = GetBankByIdentity(3); } if (IsLinkDoubleBattle() == TRUE) { diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c index bcaaebcda..6f27469ce 100644 --- a/src/battle/pokeball.c +++ b/src/battle/pokeball.c @@ -383,7 +383,7 @@ static void sub_8046464(u8 taskId) gSprites[spriteId].callback = sub_8047254; break; default: - gBankTarget = GetBankByPlayerAI(1); + gBankTarget = GetBankByIdentity(1); sp0 = TRUE; break; } @@ -722,7 +722,7 @@ static void sub_8046C78(struct Sprite *sprite) r8 = -25; } species = GetMonData(pkmn, MON_DATA_SPECIES); - if ((r5 == GetBankByPlayerAI(0) || r5 == GetBankByPlayerAI(1)) + if ((r5 == GetBankByIdentity(0) || r5 == GetBankByIdentity(1)) && IsDoubleBattle() && ewram17840.unk9_0) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) @@ -737,7 +737,7 @@ static void sub_8046C78(struct Sprite *sprite) } if (!IsDoubleBattle() || !ewram17840.unk9_0) r4_2 = 0; - else if (r5 == GetBankByPlayerAI(0) || r5 == GetBankByPlayerAI(1)) + else if (r5 == GetBankByIdentity(0) || r5 == GetBankByIdentity(1)) r4_2 = 1; else r4_2 = 2; @@ -885,7 +885,7 @@ static void sub_80470C4(struct Sprite *sprite) sprite->data[6] = sprite->oam.affineParam & 0xFF; sprite->data[0] = 0; if (IsDoubleBattle() && ewram17840.unk9_0 - && sprite->data[6] == GetBankByPlayerAI(2)) + && sprite->data[6] == GetBankByIdentity(2)) sprite->callback = sub_8047230; else sprite->callback = sub_8046C78; @@ -910,7 +910,7 @@ static void sub_8047254(struct Sprite *sprite) { sprite->data[0] = 0; if (IsDoubleBattle() && ewram17840.unk9_0 - && sprite->data[6] == GetBankByPlayerAI(3)) + && sprite->data[6] == GetBankByIdentity(3)) sprite->callback = sub_8047230; else sprite->callback = sub_8046C78; diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 49b0854cc..a7646e78b 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -171,13 +171,13 @@ static void CB2_ReshowBattleScreenAfterMenu(void) sub_80327CC(); - opponentBank = GetBankByPlayerAI(1); + opponentBank = GetBankByIdentity(1); species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES); sub_8032984(opponentBank, species); if (IsDoubleBattle()) { - opponentBank = GetBankByPlayerAI(3); + opponentBank = GetBankByIdentity(3); species = GetMonData(&gEnemyParty[gBattlePartyID[opponentBank]], MON_DATA_SPECIES); sub_8032984(opponentBank, species); } diff --git a/src/data/battle_tower/trainers.h b/src/data/battle_tower/trainers.h index b5eb3da7a..ae204f8ea 100644 --- a/src/data/battle_tower/trainers.h +++ b/src/data/battle_tower/trainers.h @@ -1,7 +1,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = { { - .trainerClass = TRAINER_CLASS_YOUNGSTER, + .trainerClass = FACILITY_CLASS_YOUNGSTER, .name = _("ALVIN"), .teamFlags = 0x01, .greeting = { @@ -16,7 +16,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .trainerClass = FACILITY_CLASS_BIRD_KEEPER, .name = _("DIRK"), .teamFlags = 0x01, .greeting = { @@ -31,7 +31,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LADY, + .trainerClass = FACILITY_CLASS_LADY, .name = _("CYBIL"), .teamFlags = 0x02, .greeting = { @@ -46,7 +46,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BLACK_BELT, + .trainerClass = FACILITY_CLASS_BLACK_BELT, .name = _("CHEN"), .teamFlags = 0x05, .greeting = { @@ -61,7 +61,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_NINJA_BOY, + .trainerClass = FACILITY_CLASS_NINJA_BOY, .name = _("YOSHI"), .teamFlags = 0x05, .greeting = { @@ -76,7 +76,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SCHOOL_KID_F, + .trainerClass = FACILITY_CLASS_SCHOOL_KID_F, .name = _("TINA"), .teamFlags = 0x0A, .greeting = { @@ -91,7 +91,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .trainerClass = FACILITY_CLASS_BUG_MANIAC, .name = _("COREY"), .teamFlags = 0x41, .greeting = { @@ -106,7 +106,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_FISHERMAN, + .trainerClass = FACILITY_CLASS_FISHERMAN, .name = _("GORDON"), .teamFlags = 0x01, .greeting = { @@ -121,7 +121,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_TUBER_F, + .trainerClass = FACILITY_CLASS_TUBER_F, .name = _("ANN"), .teamFlags = 0x02, .greeting = { @@ -136,7 +136,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_F, + .trainerClass = FACILITY_CLASS_POKEFAN_F, .name = _("JULIA"), .teamFlags = 0x42, .greeting = { @@ -151,7 +151,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GENTLEMAN, + .trainerClass = FACILITY_CLASS_GENTLEMAN, .name = _("GREGORY"), .teamFlags = 0x01, .greeting = { @@ -166,7 +166,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CAMPER, + .trainerClass = FACILITY_CLASS_CAMPER, .name = _("KEITH"), .teamFlags = 0x01, .greeting = { @@ -181,7 +181,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, .name = _("KENDRA"), .teamFlags = 0x0A, .greeting = { @@ -196,7 +196,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HIKER, + .trainerClass = FACILITY_CLASS_HIKER, .name = _("DEV"), .teamFlags = 0x01, .greeting = { @@ -211,7 +211,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .trainerClass = FACILITY_CLASS_BATTLE_GIRL, .name = _("CASSIE"), .teamFlags = 0x0A, .greeting = { @@ -226,7 +226,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_M, + .trainerClass = FACILITY_CLASS_PSYCHIC_M, .name = _("JULIAN"), .teamFlags = 0x05, .greeting = { @@ -241,7 +241,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LASS, + .trainerClass = FACILITY_CLASS_LASS, .name = _("JOYCE"), .teamFlags = 0x02, .greeting = { @@ -256,7 +256,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GUITARIST, + .trainerClass = FACILITY_CLASS_GUITARIST, .name = _("LES"), .teamFlags = 0x01, .greeting = { @@ -271,7 +271,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RICH_BOY, + .trainerClass = FACILITY_CLASS_RICH_BOY, .name = _("CLINTON"), .teamFlags = 0x01, .greeting = { @@ -286,7 +286,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .trainerClass = FACILITY_CLASS_BUG_CATCHER, .name = _("LEWIS"), .teamFlags = 0x01, .greeting = { @@ -301,7 +301,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PICNICKER, + .trainerClass = FACILITY_CLASS_PICNICKER, .name = _("RACHAEL"), .teamFlags = 0x02, .greeting = { @@ -316,7 +316,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COLLECTOR, + .trainerClass = FACILITY_CLASS_COLLECTOR, .name = _("HAROLD"), .teamFlags = 0x09, .greeting = { @@ -331,7 +331,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_TUBER_M, + .trainerClass = FACILITY_CLASS_TUBER_M, .name = _("KIPP"), .teamFlags = 0x01, .greeting = { @@ -346,7 +346,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_KINDLER, + .trainerClass = FACILITY_CLASS_KINDLER, .name = _("IRWIN"), .teamFlags = 0x05, .greeting = { @@ -361,7 +361,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_F, + .trainerClass = FACILITY_CLASS_PSYCHIC_F, .name = _("EILEEN"), .teamFlags = 0x0A, .greeting = { @@ -376,7 +376,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_F, + .trainerClass = FACILITY_CLASS_SWIMMER_F, .name = _("ANNE"), .teamFlags = 0x02, .greeting = { @@ -391,7 +391,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, .name = _("RUTH"), .teamFlags = 0x06, .greeting = { @@ -406,7 +406,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMANIAC, + .trainerClass = FACILITY_CLASS_POKEMANIAC, .name = _("JEREMY"), .teamFlags = 0x40, .greeting = { @@ -421,7 +421,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SAILOR, + .trainerClass = FACILITY_CLASS_SAILOR, .name = _("TREVOR"), .teamFlags = 0x09, .greeting = { @@ -436,7 +436,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F, .name = _("COLETTE"), .teamFlags = 0x06, .greeting = { @@ -451,7 +451,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .trainerClass = FACILITY_CLASS_HEX_MANIAC, .name = _("PAULA"), .teamFlags = 0x42, .greeting = { @@ -466,7 +466,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .trainerClass = FACILITY_CLASS_RUIN_MANIAC, .name = _("STANLY"), .teamFlags = 0x41, .greeting = { @@ -481,7 +481,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, .name = _("TROY"), .teamFlags = 0x09, .greeting = { @@ -496,7 +496,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SCHOOL_KID_M, + .trainerClass = FACILITY_CLASS_SCHOOL_KID_M, .name = _("ED"), .teamFlags = 0x08, .greeting = { @@ -511,7 +511,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_F, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_F, .name = _("ELLEN"), .teamFlags = 0x04, .greeting = { @@ -526,7 +526,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_M, + .trainerClass = FACILITY_CLASS_SWIMMER_M, .name = _("ARNIE"), .teamFlags = 0x09, .greeting = { @@ -541,7 +541,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, .name = _("HAL"), .teamFlags = 0x09, .greeting = { @@ -556,7 +556,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BEAUTY, + .trainerClass = FACILITY_CLASS_BEAUTY, .name = _("LAUREN"), .teamFlags = 0x06, .greeting = { @@ -571,7 +571,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_AROMA_LADY, + .trainerClass = FACILITY_CLASS_AROMA_LADY, .name = _("STACY"), .teamFlags = 0x06, .greeting = { @@ -586,7 +586,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COLLECTOR, + .trainerClass = FACILITY_CLASS_COLLECTOR, .name = _("DARYL"), .teamFlags = 0x81, .greeting = { @@ -601,7 +601,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, .name = _("KATHY"), .teamFlags = 0x04, .greeting = { @@ -616,7 +616,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_M, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_M, .name = _("HARRIS"), .teamFlags = 0x0C, .greeting = { @@ -631,7 +631,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_M, + .trainerClass = FACILITY_CLASS_POKEFAN_M, .name = _("GLENN"), .teamFlags = 0x80, .greeting = { @@ -646,7 +646,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, .name = _("NICO"), .teamFlags = 0x04, .greeting = { @@ -661,7 +661,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M, .name = _("BAILEY"), .teamFlags = 0x41, .greeting = { @@ -676,7 +676,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .trainerClass = FACILITY_CLASS_PARASOL_LADY, .name = _("ABBIE"), .teamFlags = 0x08, .greeting = { @@ -691,7 +691,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CAMPER, + .trainerClass = FACILITY_CLASS_CAMPER, .name = _("AL"), .teamFlags = 0x0C, .greeting = { @@ -706,7 +706,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SCHOOL_KID_F, + .trainerClass = FACILITY_CLASS_SCHOOL_KID_F, .name = _("PEGGY"), .teamFlags = 0x42, .greeting = { @@ -721,7 +721,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BEAUTY, + .trainerClass = FACILITY_CLASS_BEAUTY, .name = _("NAOMI"), .teamFlags = 0x04, .greeting = { @@ -736,7 +736,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_NINJA_BOY, + .trainerClass = FACILITY_CLASS_NINJA_BOY, .name = _("KENJI"), .teamFlags = 0x0C, .greeting = { @@ -751,7 +751,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, .name = _("ROSS"), .teamFlags = 0x01, .greeting = { @@ -766,7 +766,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_F, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_F, .name = _("EDNA"), .teamFlags = 0x02, .greeting = { @@ -781,7 +781,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .trainerClass = FACILITY_CLASS_RUIN_MANIAC, .name = _("ANTON"), .teamFlags = 0x41, .greeting = { @@ -796,7 +796,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_M, + .trainerClass = FACILITY_CLASS_SWIMMER_M, .name = _("MITCH"), .teamFlags = 0x81, .greeting = { @@ -811,7 +811,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .trainerClass = FACILITY_CLASS_HEX_MANIAC, .name = _("ROD"), .teamFlags = 0x42, .greeting = { @@ -826,7 +826,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, .name = _("RICH"), .teamFlags = 0x01, .greeting = { @@ -841,7 +841,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_M, + .trainerClass = FACILITY_CLASS_POKEFAN_M, .name = _("DANIEL"), .teamFlags = 0x80, .greeting = { @@ -856,7 +856,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_F, + .trainerClass = FACILITY_CLASS_PSYCHIC_F, .name = _("GLORIA"), .teamFlags = 0x82, .greeting = { @@ -871,7 +871,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GUITARIST, + .trainerClass = FACILITY_CLASS_GUITARIST, .name = _("NELSON"), .teamFlags = 0x01, .greeting = { @@ -886,7 +886,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_KINDLER, + .trainerClass = FACILITY_CLASS_KINDLER, .name = _("FERRIS"), .teamFlags = 0x41, .greeting = { @@ -901,7 +901,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_AROMA_LADY, + .trainerClass = FACILITY_CLASS_AROMA_LADY, .name = _("AMANDA"), .teamFlags = 0x82, .greeting = { @@ -916,7 +916,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, .name = _("MASON"), .teamFlags = 0x10, .greeting = { @@ -931,7 +931,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .trainerClass = FACILITY_CLASS_DRAGON_TAMER, .name = _("NATE"), .teamFlags = 0x10, .greeting = { @@ -946,7 +946,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LASS, + .trainerClass = FACILITY_CLASS_LASS, .name = _("MIRIAM"), .teamFlags = 0x82, .greeting = { @@ -961,7 +961,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMANIAC, + .trainerClass = FACILITY_CLASS_POKEMANIAC, .name = _("THEO"), .teamFlags = 0x40, .greeting = { @@ -976,7 +976,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, .name = _("PAMELA"), .teamFlags = 0x10, .greeting = { @@ -991,7 +991,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_F, + .trainerClass = FACILITY_CLASS_POKEFAN_F, .name = _("ALISSA"), .teamFlags = 0x20, .greeting = { @@ -1006,7 +1006,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GENTLEMAN, + .trainerClass = FACILITY_CLASS_GENTLEMAN, .name = _("ARTHUR"), .teamFlags = 0x20, .greeting = { @@ -1021,7 +1021,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_F, + .trainerClass = FACILITY_CLASS_SWIMMER_F, .name = _("MARCY"), .teamFlags = 0x82, .greeting = { @@ -1036,7 +1036,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_M, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_M, .name = _("MILLER"), .teamFlags = 0x10, .greeting = { @@ -1051,7 +1051,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .trainerClass = FACILITY_CLASS_BIRD_KEEPER, .name = _("OLIVER"), .teamFlags = 0x11, .greeting = { @@ -1066,7 +1066,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, .name = _("MOLLY"), .teamFlags = 0x12, .greeting = { @@ -1081,7 +1081,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .trainerClass = FACILITY_CLASS_BUG_MANIAC, .name = _("JASON"), .teamFlags = 0x40, .greeting = { @@ -1096,7 +1096,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .trainerClass = FACILITY_CLASS_BATTLE_GIRL, .name = _("AVA"), .teamFlags = 0x20, .greeting = { @@ -1111,7 +1111,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_FISHERMAN, + .trainerClass = FACILITY_CLASS_FISHERMAN, .name = _("HANK"), .teamFlags = 0x10, .greeting = { @@ -1126,7 +1126,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SAILOR, + .trainerClass = FACILITY_CLASS_SAILOR, .name = _("PETER"), .teamFlags = 0x20, .greeting = { @@ -1141,7 +1141,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_F, + .trainerClass = FACILITY_CLASS_EXPERT_F, .name = _("MINDY"), .teamFlags = 0x20, .greeting = { @@ -1156,7 +1156,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .trainerClass = FACILITY_CLASS_BUG_MANIAC, .name = _("DWIGHT"), .teamFlags = 0x11, .greeting = { @@ -1171,7 +1171,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F, .name = _("REENA"), .teamFlags = 0x12, .greeting = { @@ -1186,7 +1186,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .trainerClass = FACILITY_CLASS_PARASOL_LADY, .name = _("MEGAN"), .teamFlags = 0x10, .greeting = { @@ -1201,7 +1201,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, .name = _("SIERRA"), .teamFlags = 0x04, .greeting = { @@ -1216,7 +1216,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_M, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_M, .name = _("ARNOLD"), .teamFlags = 0x08, .greeting = { @@ -1231,7 +1231,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BLACK_BELT, + .trainerClass = FACILITY_CLASS_BLACK_BELT, .name = _("XIN"), .teamFlags = 0x04, .greeting = { @@ -1246,7 +1246,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_F, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_F, .name = _("KELLY"), .teamFlags = 0x02, .greeting = { @@ -1261,7 +1261,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COLLECTOR, + .trainerClass = FACILITY_CLASS_COLLECTOR, .name = _("VANCE"), .teamFlags = 0x80, .greeting = { @@ -1276,7 +1276,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, .name = _("TOBY"), .teamFlags = 0x01, .greeting = { @@ -1291,7 +1291,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GENTLEMAN, + .trainerClass = FACILITY_CLASS_GENTLEMAN, .name = _("NORTON"), .teamFlags = 0x20, .greeting = { @@ -1306,7 +1306,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .trainerClass = FACILITY_CLASS_BATTLE_GIRL, .name = _("ZOE"), .teamFlags = 0x02, .greeting = { @@ -1321,7 +1321,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BEAUTY, + .trainerClass = FACILITY_CLASS_BEAUTY, .name = _("EMMA"), .teamFlags = 0x20, .greeting = { @@ -1336,7 +1336,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HIKER, + .trainerClass = FACILITY_CLASS_HIKER, .name = _("VINCE"), .teamFlags = 0x04, .greeting = { @@ -1351,7 +1351,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_M, + .trainerClass = FACILITY_CLASS_EXPERT_M, .name = _("MARV"), .teamFlags = 0x10, .greeting = { @@ -1366,7 +1366,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M, .name = _("TODD"), .teamFlags = 0x40, .greeting = { @@ -1381,7 +1381,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GUITARIST, + .trainerClass = FACILITY_CLASS_GUITARIST, .name = _("GAVIN"), .teamFlags = 0x01, .greeting = { @@ -1396,7 +1396,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_M, + .trainerClass = FACILITY_CLASS_PSYCHIC_M, .name = _("QUINN"), .teamFlags = 0x08, .greeting = { @@ -1411,7 +1411,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_F, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_F, .name = _("JENN"), .teamFlags = 0x02, .greeting = { @@ -1426,7 +1426,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_M, + .trainerClass = FACILITY_CLASS_EXPERT_M, .name = _("JOEL"), .teamFlags = 0x10, .greeting = { @@ -1441,7 +1441,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .trainerClass = FACILITY_CLASS_DRAGON_TAMER, .name = _("KYLE"), .teamFlags = 0x0C, .greeting = { @@ -1456,7 +1456,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_M, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_M, .name = _("BRET"), .teamFlags = 0x01, .greeting = { @@ -1471,7 +1471,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_F, + .trainerClass = FACILITY_CLASS_EXPERT_F, .name = _("CARRIE"), .teamFlags = 0x10, .greeting = { @@ -1486,7 +1486,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LADY, + .trainerClass = FACILITY_CLASS_LADY, .name = _("GILLIAN"), .teamFlags = 0x02, .greeting = { diff --git a/src/data/battle_tower/trainers_de.h b/src/data/battle_tower/trainers_de.h index 86182da9d..db226c6a6 100644 --- a/src/data/battle_tower/trainers_de.h +++ b/src/data/battle_tower/trainers_de.h @@ -1,7 +1,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = { { - .trainerClass = TRAINER_CLASS_YOUNGSTER, + .trainerClass = FACILITY_CLASS_YOUNGSTER, .name = _("ALWIN"), .teamFlags = 0x01, .greeting = { @@ -16,7 +16,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .trainerClass = FACILITY_CLASS_BIRD_KEEPER, .name = _("DIRK"), .teamFlags = 0x01, .greeting = { @@ -31,7 +31,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LADY, + .trainerClass = FACILITY_CLASS_LADY, .name = _("SIBILLE"), .teamFlags = 0x02, .greeting = { @@ -46,7 +46,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BLACK_BELT, + .trainerClass = FACILITY_CLASS_BLACK_BELT, .name = _("OLAF"), .teamFlags = 0x05, .greeting = { @@ -61,7 +61,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_NINJA_BOY, + .trainerClass = FACILITY_CLASS_NINJA_BOY, .name = _("JOST"), .teamFlags = 0x05, .greeting = { @@ -76,7 +76,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SCHOOL_KID_F, + .trainerClass = FACILITY_CLASS_SCHOOL_KID_F, .name = _("TINA"), .teamFlags = 0x0A, .greeting = { @@ -91,7 +91,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .trainerClass = FACILITY_CLASS_BUG_MANIAC, .name = _("HAJO"), .teamFlags = 0x41, .greeting = { @@ -106,7 +106,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_FISHERMAN, + .trainerClass = FACILITY_CLASS_FISHERMAN, .name = _("GEORG"), .teamFlags = 0x01, .greeting = { @@ -121,7 +121,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_TUBER_F, + .trainerClass = FACILITY_CLASS_TUBER_F, .name = _("ANNE"), .teamFlags = 0x02, .greeting = { @@ -136,7 +136,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_F, + .trainerClass = FACILITY_CLASS_POKEFAN_F, .name = _("JULIA"), .teamFlags = 0x42, .greeting = { @@ -151,7 +151,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GENTLEMAN, + .trainerClass = FACILITY_CLASS_GENTLEMAN, .name = _("JOHANN"), .teamFlags = 0x01, .greeting = { @@ -166,7 +166,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CAMPER, + .trainerClass = FACILITY_CLASS_CAMPER, .name = _("KARL"), .teamFlags = 0x01, .greeting = { @@ -181,7 +181,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, .name = _("KENDRA"), .teamFlags = 0x0A, .greeting = { @@ -196,7 +196,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HIKER, + .trainerClass = FACILITY_CLASS_HIKER, .name = _("DAVID"), .teamFlags = 0x01, .greeting = { @@ -211,7 +211,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .trainerClass = FACILITY_CLASS_BATTLE_GIRL, .name = _("KEA"), .teamFlags = 0x0A, .greeting = { @@ -226,7 +226,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_M, + .trainerClass = FACILITY_CLASS_PSYCHIC_M, .name = _("JULIAN"), .teamFlags = 0x05, .greeting = { @@ -241,7 +241,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LASS, + .trainerClass = FACILITY_CLASS_LASS, .name = _("JOSI"), .teamFlags = 0x02, .greeting = { @@ -256,7 +256,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GUITARIST, + .trainerClass = FACILITY_CLASS_GUITARIST, .name = _("LEIF"), .teamFlags = 0x01, .greeting = { @@ -271,7 +271,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RICH_BOY, + .trainerClass = FACILITY_CLASS_RICH_BOY, .name = _("INGO"), .teamFlags = 0x01, .greeting = { @@ -286,7 +286,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_CATCHER, + .trainerClass = FACILITY_CLASS_BUG_CATCHER, .name = _("LUDWIG"), .teamFlags = 0x01, .greeting = { @@ -301,7 +301,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PICNICKER, + .trainerClass = FACILITY_CLASS_PICNICKER, .name = _("RAJA"), .teamFlags = 0x02, .greeting = { @@ -316,7 +316,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COLLECTOR, + .trainerClass = FACILITY_CLASS_COLLECTOR, .name = _("HARALD"), .teamFlags = 0x09, .greeting = { @@ -331,7 +331,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_TUBER_M, + .trainerClass = FACILITY_CLASS_TUBER_M, .name = _("KIM"), .teamFlags = 0x01, .greeting = { @@ -346,7 +346,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_KINDLER, + .trainerClass = FACILITY_CLASS_KINDLER, .name = _("ERWIN"), .teamFlags = 0x05, .greeting = { @@ -361,7 +361,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_F, + .trainerClass = FACILITY_CLASS_PSYCHIC_F, .name = _("EIKA"), .teamFlags = 0x0A, .greeting = { @@ -376,7 +376,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_F, + .trainerClass = FACILITY_CLASS_SWIMMER_F, .name = _("ANNINA"), .teamFlags = 0x02, .greeting = { @@ -391,7 +391,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, .name = _("RUTH"), .teamFlags = 0x06, .greeting = { @@ -406,7 +406,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMANIAC, + .trainerClass = FACILITY_CLASS_POKEMANIAC, .name = _("JENS"), .teamFlags = 0x40, .greeting = { @@ -421,7 +421,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SAILOR, + .trainerClass = FACILITY_CLASS_SAILOR, .name = _("TITUS"), .teamFlags = 0x09, .greeting = { @@ -436,7 +436,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F, .name = _("NICOLA"), .teamFlags = 0x06, .greeting = { @@ -451,7 +451,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .trainerClass = FACILITY_CLASS_HEX_MANIAC, .name = _("PAULA"), .teamFlags = 0x42, .greeting = { @@ -466,7 +466,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .trainerClass = FACILITY_CLASS_RUIN_MANIAC, .name = _("SÖREN"), .teamFlags = 0x41, .greeting = { @@ -481,7 +481,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, .name = _("RAINER"), .teamFlags = 0x09, .greeting = { @@ -496,7 +496,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SCHOOL_KID_M, + .trainerClass = FACILITY_CLASS_SCHOOL_KID_M, .name = _("FABIAN"), .teamFlags = 0x08, .greeting = { @@ -511,7 +511,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_F, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_F, .name = _("ELLEN"), .teamFlags = 0x04, .greeting = { @@ -526,7 +526,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_M, + .trainerClass = FACILITY_CLASS_SWIMMER_M, .name = _("ARNIE"), .teamFlags = 0x09, .greeting = { @@ -541,7 +541,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, .name = _("HARDI"), .teamFlags = 0x09, .greeting = { @@ -556,7 +556,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BEAUTY, + .trainerClass = FACILITY_CLASS_BEAUTY, .name = _("LINA"), .teamFlags = 0x06, .greeting = { @@ -571,7 +571,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_AROMA_LADY, + .trainerClass = FACILITY_CLASS_AROMA_LADY, .name = _("SELINA"), .teamFlags = 0x06, .greeting = { @@ -586,7 +586,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COLLECTOR, + .trainerClass = FACILITY_CLASS_COLLECTOR, .name = _("DANTE"), .teamFlags = 0x81, .greeting = { @@ -601,7 +601,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, .name = _("KATJA"), .teamFlags = 0x04, .greeting = { @@ -616,7 +616,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_M, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_M, .name = _("HORST"), .teamFlags = 0x0C, .greeting = { @@ -631,7 +631,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_M, + .trainerClass = FACILITY_CLASS_POKEFAN_M, .name = _("GERRIT"), .teamFlags = 0x80, .greeting = { @@ -646,7 +646,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, .name = _("NIKO"), .teamFlags = 0x04, .greeting = { @@ -661,7 +661,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M, .name = _("BALDO"), .teamFlags = 0x41, .greeting = { @@ -676,7 +676,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .trainerClass = FACILITY_CLASS_PARASOL_LADY, .name = _("ALMA"), .teamFlags = 0x08, .greeting = { @@ -691,7 +691,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CAMPER, + .trainerClass = FACILITY_CLASS_CAMPER, .name = _("ADAM"), .teamFlags = 0x0C, .greeting = { @@ -706,7 +706,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SCHOOL_KID_F, + .trainerClass = FACILITY_CLASS_SCHOOL_KID_F, .name = _("GRETE"), .teamFlags = 0x42, .greeting = { @@ -721,7 +721,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BEAUTY, + .trainerClass = FACILITY_CLASS_BEAUTY, .name = _("NAOMI"), .teamFlags = 0x04, .greeting = { @@ -736,7 +736,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_NINJA_BOY, + .trainerClass = FACILITY_CLASS_NINJA_BOY, .name = _("KENO"), .teamFlags = 0x0C, .greeting = { @@ -751,7 +751,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, .name = _("REMUS"), .teamFlags = 0x01, .greeting = { @@ -766,7 +766,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_F, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_F, .name = _("EDITH"), .teamFlags = 0x02, .greeting = { @@ -781,7 +781,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUIN_MANIAC, + .trainerClass = FACILITY_CLASS_RUIN_MANIAC, .name = _("ANTON"), .teamFlags = 0x41, .greeting = { @@ -796,7 +796,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_M, + .trainerClass = FACILITY_CLASS_SWIMMER_M, .name = _("MALTE"), .teamFlags = 0x81, .greeting = { @@ -811,7 +811,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HEX_MANIAC, + .trainerClass = FACILITY_CLASS_HEX_MANIAC, .name = _("RAOUL"), .teamFlags = 0x42, .greeting = { @@ -826,7 +826,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_M, .name = _("RICK"), .teamFlags = 0x01, .greeting = { @@ -841,7 +841,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_M, + .trainerClass = FACILITY_CLASS_POKEFAN_M, .name = _("DENNIS"), .teamFlags = 0x80, .greeting = { @@ -856,7 +856,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_F, + .trainerClass = FACILITY_CLASS_PSYCHIC_F, .name = _("GLORIA"), .teamFlags = 0x82, .greeting = { @@ -871,7 +871,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GUITARIST, + .trainerClass = FACILITY_CLASS_GUITARIST, .name = _("NINO"), .teamFlags = 0x01, .greeting = { @@ -886,7 +886,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_KINDLER, + .trainerClass = FACILITY_CLASS_KINDLER, .name = _("FIETE"), .teamFlags = 0x41, .greeting = { @@ -901,7 +901,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_AROMA_LADY, + .trainerClass = FACILITY_CLASS_AROMA_LADY, .name = _("AMANDA"), .teamFlags = 0x82, .greeting = { @@ -916,7 +916,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, .name = _("MAREK"), .teamFlags = 0x10, .greeting = { @@ -931,7 +931,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .trainerClass = FACILITY_CLASS_DRAGON_TAMER, .name = _("NATHAN"), .teamFlags = 0x10, .greeting = { @@ -946,7 +946,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LASS, + .trainerClass = FACILITY_CLASS_LASS, .name = _("MIRIAM"), .teamFlags = 0x82, .greeting = { @@ -961,7 +961,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMANIAC, + .trainerClass = FACILITY_CLASS_POKEMANIAC, .name = _("THEO"), .teamFlags = 0x40, .greeting = { @@ -976,7 +976,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, .name = _("PIA"), .teamFlags = 0x10, .greeting = { @@ -991,7 +991,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEFAN_F, + .trainerClass = FACILITY_CLASS_POKEFAN_F, .name = _("ALISSA"), .teamFlags = 0x20, .greeting = { @@ -1006,7 +1006,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GENTLEMAN, + .trainerClass = FACILITY_CLASS_GENTLEMAN, .name = _("ARTUR"), .teamFlags = 0x20, .greeting = { @@ -1021,7 +1021,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMER_F, + .trainerClass = FACILITY_CLASS_SWIMMER_F, .name = _("MAJA"), .teamFlags = 0x82, .greeting = { @@ -1036,7 +1036,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_M, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_M, .name = _("MARIUS"), .teamFlags = 0x10, .greeting = { @@ -1051,7 +1051,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BIRD_KEEPER, + .trainerClass = FACILITY_CLASS_BIRD_KEEPER, .name = _("OLIVER"), .teamFlags = 0x11, .greeting = { @@ -1066,7 +1066,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_CYCLING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_CYCLING_TRIATHLETE_F, .name = _("MOLLY"), .teamFlags = 0x12, .greeting = { @@ -1081,7 +1081,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .trainerClass = FACILITY_CLASS_BUG_MANIAC, .name = _("JÖRG"), .teamFlags = 0x40, .greeting = { @@ -1096,7 +1096,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .trainerClass = FACILITY_CLASS_BATTLE_GIRL, .name = _("ANKE"), .teamFlags = 0x20, .greeting = { @@ -1111,7 +1111,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_FISHERMAN, + .trainerClass = FACILITY_CLASS_FISHERMAN, .name = _("HANS"), .teamFlags = 0x10, .greeting = { @@ -1126,7 +1126,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SAILOR, + .trainerClass = FACILITY_CLASS_SAILOR, .name = _("PETER"), .teamFlags = 0x20, .greeting = { @@ -1141,7 +1141,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_F, + .trainerClass = FACILITY_CLASS_EXPERT_F, .name = _("MARA"), .teamFlags = 0x20, .greeting = { @@ -1156,7 +1156,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BUG_MANIAC, + .trainerClass = FACILITY_CLASS_BUG_MANIAC, .name = _("DARIUS"), .teamFlags = 0x11, .greeting = { @@ -1171,7 +1171,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_F, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_F, .name = _("REGINA"), .teamFlags = 0x12, .greeting = { @@ -1186,7 +1186,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PARASOL_LADY, + .trainerClass = FACILITY_CLASS_PARASOL_LADY, .name = _("MAIKE"), .teamFlags = 0x10, .greeting = { @@ -1201,7 +1201,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_RUNNING_TRIATHLETE_F, + .trainerClass = FACILITY_CLASS_RUNNING_TRIATHLETE_F, .name = _("SANDRA"), .teamFlags = 0x04, .greeting = { @@ -1216,7 +1216,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_RANGER_M, + .trainerClass = FACILITY_CLASS_POKEMON_RANGER_M, .name = _("ARNOLD"), .teamFlags = 0x08, .greeting = { @@ -1231,7 +1231,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BLACK_BELT, + .trainerClass = FACILITY_CLASS_BLACK_BELT, .name = _("XENO"), .teamFlags = 0x04, .greeting = { @@ -1246,7 +1246,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_F, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_F, .name = _("KARLA"), .teamFlags = 0x02, .greeting = { @@ -1261,7 +1261,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COLLECTOR, + .trainerClass = FACILITY_CLASS_COLLECTOR, .name = _("VOLKER"), .teamFlags = 0x80, .greeting = { @@ -1276,7 +1276,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_SWIMMING_TRIATHLETE_M, + .trainerClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_M, .name = _("TOBIAS"), .teamFlags = 0x01, .greeting = { @@ -1291,7 +1291,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GENTLEMAN, + .trainerClass = FACILITY_CLASS_GENTLEMAN, .name = _("NORBERT"), .teamFlags = 0x20, .greeting = { @@ -1306,7 +1306,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BATTLE_GIRL, + .trainerClass = FACILITY_CLASS_BATTLE_GIRL, .name = _("ZITA"), .teamFlags = 0x02, .greeting = { @@ -1321,7 +1321,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_BEAUTY, + .trainerClass = FACILITY_CLASS_BEAUTY, .name = _("ELKE"), .teamFlags = 0x20, .greeting = { @@ -1336,7 +1336,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_HIKER, + .trainerClass = FACILITY_CLASS_HIKER, .name = _("VITUS"), .teamFlags = 0x04, .greeting = { @@ -1351,7 +1351,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_M, + .trainerClass = FACILITY_CLASS_EXPERT_M, .name = _("MALTE"), .teamFlags = 0x10, .greeting = { @@ -1366,7 +1366,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_POKEMON_BREEDER_M, + .trainerClass = FACILITY_CLASS_POKEMON_BREEDER_M, .name = _("TIM"), .teamFlags = 0x40, .greeting = { @@ -1381,7 +1381,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_GUITARIST, + .trainerClass = FACILITY_CLASS_GUITARIST, .name = _("GAVIN"), .teamFlags = 0x01, .greeting = { @@ -1396,7 +1396,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_PSYCHIC_M, + .trainerClass = FACILITY_CLASS_PSYCHIC_M, .name = _("RALF"), .teamFlags = 0x08, .greeting = { @@ -1411,7 +1411,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_F, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_F, .name = _("JENNY"), .teamFlags = 0x02, .greeting = { @@ -1426,7 +1426,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_M, + .trainerClass = FACILITY_CLASS_EXPERT_M, .name = _("JOEL"), .teamFlags = 0x10, .greeting = { @@ -1441,7 +1441,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_DRAGON_TAMER, + .trainerClass = FACILITY_CLASS_DRAGON_TAMER, .name = _("KOLJA"), .teamFlags = 0x0C, .greeting = { @@ -1456,7 +1456,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_COOL_TRAINER_M, + .trainerClass = FACILITY_CLASS_COOL_TRAINER_M, .name = _("BILL"), .teamFlags = 0x01, .greeting = { @@ -1471,7 +1471,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_EXPERT_F, + .trainerClass = FACILITY_CLASS_EXPERT_F, .name = _("CALLA"), .teamFlags = 0x10, .greeting = { @@ -1486,7 +1486,7 @@ const struct BattleTowerTrainer gBattleTowerTrainers[] = }, }, { - .trainerClass = TRAINER_CLASS_LADY, + .trainerClass = FACILITY_CLASS_LADY, .name = _("GESA"), .teamFlags = 0x02, .greeting = { diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index c86e795c4..d03038674 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -2,8 +2,8 @@ // -#ifndef POKERUBY_TRAINER_CLASS_LOOKUPS_H -#define POKERUBY_TRAINER_CLASS_LOOKUPS_H +#ifndef POKERUBY_FACILITY_CLASS_LOOKUPS_H +#define POKERUBY_FACILITY_CLASS_LOOKUPS_H const u8 gTrainerClassToPicIndex[] = { TRAINER_PIC_ARCHIE, // AQUA_LEADER @@ -86,83 +86,83 @@ const u8 gTrainerClassToPicIndex[] = { }; const u8 gTrainerClassToNameIndex[] = { - TRAINER_CLASS_NAME_AQUA_LEADER, // AQUA_LEADER - TRAINER_CLASS_NAME_TEAM_AQUA, // TEAM_AQUA_M - TRAINER_CLASS_NAME_TEAM_AQUA, // TEAM_AQUA_F - TRAINER_CLASS_NAME_AROMA_LADY, // AROMA_LADY - TRAINER_CLASS_NAME_RUIN_MANIAC, // RUIN_MANIAC - TRAINER_CLASS_NAME_INTERVIEWER, // INTERVIEWER - TRAINER_CLASS_NAME_TUBER_F, // TUBER_F - TRAINER_CLASS_NAME_TUBER_M, // TUBER_M - TRAINER_CLASS_NAME_COOL_TRAINER, // COOL_TRAINER_M - TRAINER_CLASS_NAME_COOL_TRAINER, // COOL_TRAINER_F - TRAINER_CLASS_NAME_HEX_MANIAC, // HEX_MANIAC - TRAINER_CLASS_NAME_LADY, // LADY - TRAINER_CLASS_NAME_BEAUTY, // BEAUTY - TRAINER_CLASS_NAME_RICH_BOY, // RICH_BOY - TRAINER_CLASS_NAME_POKEMANIAC, // POKEMANIAC - TRAINER_CLASS_NAME_SWIMMER_M, // SWIMMER_M - TRAINER_CLASS_NAME_BLACK_BELT, // BLACK_BELT - TRAINER_CLASS_NAME_GUITARIST, // GUITARIST - TRAINER_CLASS_NAME_KINDLER, // KINDLER - TRAINER_CLASS_NAME_CAMPER, // CAMPER - TRAINER_CLASS_NAME_BUG_MANIAC, // BUG_MANIAC - TRAINER_CLASS_NAME_PSYCHIC, // PSYCHIC_M - TRAINER_CLASS_NAME_PSYCHIC, // PSYCHIC_F - TRAINER_CLASS_NAME_GENTLEMAN, // GENTLEMAN - TRAINER_CLASS_NAME_ELITE_FOUR, // ELITE_FOUR_M - TRAINER_CLASS_NAME_ELITE_FOUR, // ELITE_FOUR_F - TRAINER_CLASS_NAME_LEADER, // LEADER_F - TRAINER_CLASS_NAME_LEADER, // LEADER_M - TRAINER_CLASS_NAME_LEADER, // LEADER_MF - TRAINER_CLASS_NAME_SCHOOL_KID, // SCHOOL_KID_M - TRAINER_CLASS_NAME_SCHOOL_KID, // SCHOOL_KID_F - TRAINER_CLASS_NAME_SR_AND_JR, // SR_AND_JR - TRAINER_CLASS_NAME_POKEFAN, // POKEFAN_M - TRAINER_CLASS_NAME_POKEFAN, // POKEFAN_F - TRAINER_CLASS_NAME_EXPERT, // EXPERT_M - TRAINER_CLASS_NAME_EXPERT, // EXPERT_F - TRAINER_CLASS_NAME_YOUNGSTER, // YOUNGSTER - TRAINER_CLASS_NAME_CHAMPION, // CHAMPION - TRAINER_CLASS_NAME_FISHERMAN, // FISHERMAN - TRAINER_CLASS_NAME_TRIATHLETE, // CYCLING_TRIATHLETE_M - TRAINER_CLASS_NAME_TRIATHLETE, // CYCLING_TRIATHLETE_F - TRAINER_CLASS_NAME_TRIATHLETE, // RUNNING_TRIATHLETE_M - TRAINER_CLASS_NAME_TRIATHLETE, // RUNNING_TRIATHLETE_F - TRAINER_CLASS_NAME_TRIATHLETE, // SWIMMING_TRIATHLETE_M - TRAINER_CLASS_NAME_TRIATHLETE, // SWIMMING_TRIATHLETE_F - TRAINER_CLASS_NAME_DRAGON_TAMER, // DRAGON_TAMER - TRAINER_CLASS_NAME_BIRD_KEEPER, // BIRD_KEEPER - TRAINER_CLASS_NAME_NINJA_BOY, // NINJA_BOY - TRAINER_CLASS_NAME_BATTLE_GIRL, // BATTLE_GIRL - TRAINER_CLASS_NAME_PARASOL_LADY, // PARASOL_LADY - TRAINER_CLASS_NAME_SWIMMER_F, // SWIMMER_F - TRAINER_CLASS_NAME_PICNICKER, // PICNICKER - TRAINER_CLASS_NAME_TWINS, // TWINS - TRAINER_CLASS_NAME_SAILOR, // SAILOR - TRAINER_CLASS_NAME_BOARDER, // BOARDER_1 - TRAINER_CLASS_NAME_BOARDER, // BOARDER_2 - TRAINER_CLASS_NAME_COLLECTOR, // COLLECTOR - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // WALLY - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // BRENDAN_1 - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // BRENDAN_2 - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // BRENDAN_3 - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // MAY_1 - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // MAY_2 - TRAINER_CLASS_NAME_POKEMON_TRAINER_3, // MAY_3 - TRAINER_CLASS_NAME_POKEMON_BREEDER, // POKEMON_BREEDER_M - TRAINER_CLASS_NAME_POKEMON_BREEDER, // POKEMON_BREEDER_F - TRAINER_CLASS_NAME_POKEMON_RANGER, // POKEMON_RANGER_M - TRAINER_CLASS_NAME_POKEMON_RANGER, // POKEMON_RANGER_F - TRAINER_CLASS_NAME_MAGMA_LEADER, // MAGMA_LEADER - TRAINER_CLASS_NAME_TEAM_MAGMA, // TEAM_MAGMA_M - TRAINER_CLASS_NAME_TEAM_MAGMA, // TEAM_MAGMA_F - TRAINER_CLASS_NAME_LASS, // LASS - TRAINER_CLASS_NAME_BUG_CATCHER, // BUG_CATCHER - TRAINER_CLASS_NAME_HIKER, // HIKER - TRAINER_CLASS_NAME_YOUNG_COUPLE, // YOUNG_COUPLE - TRAINER_CLASS_NAME_OLD_COUPLE, // OLD_COUPLE - TRAINER_CLASS_NAME_SIS_AND_BRO // SIS_AND_BRO + TRAINER_CLASS_AQUA_LEADER, // AQUA_LEADER + TRAINER_CLASS_TEAM_AQUA, // TEAM_AQUA_M + TRAINER_CLASS_TEAM_AQUA, // TEAM_AQUA_F + TRAINER_CLASS_AROMA_LADY, // AROMA_LADY + TRAINER_CLASS_RUIN_MANIAC, // RUIN_MANIAC + TRAINER_CLASS_INTERVIEWER, // INTERVIEWER + TRAINER_CLASS_TUBER_F, // TUBER_F + TRAINER_CLASS_TUBER_M, // TUBER_M + TRAINER_CLASS_COOL_TRAINER, // COOL_TRAINER_M + TRAINER_CLASS_COOL_TRAINER, // COOL_TRAINER_F + TRAINER_CLASS_HEX_MANIAC, // HEX_MANIAC + TRAINER_CLASS_LADY, // LADY + TRAINER_CLASS_BEAUTY, // BEAUTY + TRAINER_CLASS_RICH_BOY, // RICH_BOY + TRAINER_CLASS_POKEMANIAC, // POKEMANIAC + TRAINER_CLASS_SWIMMER_M, // SWIMMER_M + TRAINER_CLASS_BLACK_BELT, // BLACK_BELT + TRAINER_CLASS_GUITARIST, // GUITARIST + TRAINER_CLASS_KINDLER, // KINDLER + TRAINER_CLASS_CAMPER, // CAMPER + TRAINER_CLASS_BUG_MANIAC, // BUG_MANIAC + TRAINER_CLASS_PSYCHIC, // PSYCHIC_M + TRAINER_CLASS_PSYCHIC, // PSYCHIC_F + TRAINER_CLASS_GENTLEMAN, // GENTLEMAN + TRAINER_CLASS_ELITE_FOUR, // ELITE_FOUR_M + TRAINER_CLASS_ELITE_FOUR, // ELITE_FOUR_F + TRAINER_CLASS_LEADER, // LEADER_F + TRAINER_CLASS_LEADER, // LEADER_M + TRAINER_CLASS_LEADER, // LEADER_MF + TRAINER_CLASS_SCHOOL_KID, // SCHOOL_KID_M + TRAINER_CLASS_SCHOOL_KID, // SCHOOL_KID_F + TRAINER_CLASS_SR_AND_JR, // SR_AND_JR + TRAINER_CLASS_POKEFAN, // POKEFAN_M + TRAINER_CLASS_POKEFAN, // POKEFAN_F + TRAINER_CLASS_EXPERT, // EXPERT_M + TRAINER_CLASS_EXPERT, // EXPERT_F + TRAINER_CLASS_YOUNGSTER, // YOUNGSTER + TRAINER_CLASS_CHAMPION, // CHAMPION + TRAINER_CLASS_FISHERMAN, // FISHERMAN + TRAINER_CLASS_TRIATHLETE, // CYCLING_TRIATHLETE_M + TRAINER_CLASS_TRIATHLETE, // CYCLING_TRIATHLETE_F + TRAINER_CLASS_TRIATHLETE, // RUNNING_TRIATHLETE_M + TRAINER_CLASS_TRIATHLETE, // RUNNING_TRIATHLETE_F + TRAINER_CLASS_TRIATHLETE, // SWIMMING_TRIATHLETE_M + TRAINER_CLASS_TRIATHLETE, // SWIMMING_TRIATHLETE_F + TRAINER_CLASS_DRAGON_TAMER, // DRAGON_TAMER + TRAINER_CLASS_BIRD_KEEPER, // BIRD_KEEPER + TRAINER_CLASS_NINJA_BOY, // NINJA_BOY + TRAINER_CLASS_BATTLE_GIRL, // BATTLE_GIRL + TRAINER_CLASS_PARASOL_LADY, // PARASOL_LADY + TRAINER_CLASS_SWIMMER_F, // SWIMMER_F + TRAINER_CLASS_PICNICKER, // PICNICKER + TRAINER_CLASS_TWINS, // TWINS + TRAINER_CLASS_SAILOR, // SAILOR + TRAINER_CLASS_BOARDER, // BOARDER_1 + TRAINER_CLASS_BOARDER, // BOARDER_2 + TRAINER_CLASS_COLLECTOR, // COLLECTOR + TRAINER_CLASS_POKEMON_TRAINER_3, // WALLY + TRAINER_CLASS_POKEMON_TRAINER_3, // BRENDAN_1 + TRAINER_CLASS_POKEMON_TRAINER_3, // BRENDAN_2 + TRAINER_CLASS_POKEMON_TRAINER_3, // BRENDAN_3 + TRAINER_CLASS_POKEMON_TRAINER_3, // MAY_1 + TRAINER_CLASS_POKEMON_TRAINER_3, // MAY_2 + TRAINER_CLASS_POKEMON_TRAINER_3, // MAY_3 + TRAINER_CLASS_POKEMON_BREEDER, // POKEMON_BREEDER_M + TRAINER_CLASS_POKEMON_BREEDER, // POKEMON_BREEDER_F + TRAINER_CLASS_POKEMON_RANGER, // POKEMON_RANGER_M + TRAINER_CLASS_POKEMON_RANGER, // POKEMON_RANGER_F + TRAINER_CLASS_MAGMA_LEADER, // MAGMA_LEADER + TRAINER_CLASS_TEAM_MAGMA, // TEAM_MAGMA_M + TRAINER_CLASS_TEAM_MAGMA, // TEAM_MAGMA_F + TRAINER_CLASS_LASS, // LASS + TRAINER_CLASS_BUG_CATCHER, // BUG_CATCHER + TRAINER_CLASS_HIKER, // HIKER + TRAINER_CLASS_YOUNG_COUPLE, // YOUNG_COUPLE + TRAINER_CLASS_OLD_COUPLE, // OLD_COUPLE + TRAINER_CLASS_SIS_AND_BRO // SIS_AND_BRO }; -#endif //POKERUBY_TRAINER_CLASS_LOOKUPS_H +#endif //POKERUBY_FACILITY_CLASS_LOOKUPS_H diff --git a/src/de_rom_8040FE0.c b/src/de_rom_8040FE0.c index ad1cbf473..c93ef74cd 100644 --- a/src/de_rom_8040FE0.c +++ b/src/de_rom_8040FE0.c @@ -13,7 +13,7 @@ u8 *de_sub_8040FE0(u8 gender) { if (gender) gender++; - gender = TRAINER_CLASS_NAME_SCHOOL_KID; + gender = TRAINER_CLASS_SCHOOL_KID; return gTrainerClassNames[gender]; } @@ -21,7 +21,7 @@ u8 *de_sub_8040FF4(u8 gender) { if (gender) gender++; - gender = TRAINER_CLASS_NAME_POKEMON_TRAINER_3; + gender = TRAINER_CLASS_POKEMON_TRAINER_3; return gTrainerClassNames[gender]; } @@ -29,7 +29,7 @@ u8 *de_sub_804100C(u8 gender) { if (gender) gender++; - gender = TRAINER_CLASS_NAME_LEADER; + gender = TRAINER_CLASS_LEADER; return gTrainerClassNames[gender]; } @@ -50,34 +50,34 @@ u8 *de_sub_8041024(s32 arg0, u32 arg1) case 0x400: nameIndex = GetSecretBaseTrainerNameIndex(); gender = eSecretBaseRecord.gender; - if (nameIndex == TRAINER_CLASS_NAME_SCHOOL_KID) + if (nameIndex == TRAINER_CLASS_SCHOOL_KID) return de_sub_8040FE0(gender); return gTrainerClassNames[nameIndex]; case 0x100: trainerClass = de_sub_81364AC(); nameIndex = get_trainer_class_name_index(); - if (trainerClass == TRAINER_CLASS_SCHOOL_KID_F) + if (trainerClass == FACILITY_CLASS_SCHOOL_KID_F) return de_sub_8040FE0(FEMALE); - if (trainerClass == TRAINER_CLASS_MAY_1 || trainerClass == TRAINER_CLASS_MAY_2 || trainerClass == TRAINER_CLASS_MAY_3) + if (trainerClass == FACILITY_CLASS_MAY_1 || trainerClass == FACILITY_CLASS_MAY_2 || trainerClass == FACILITY_CLASS_MAY_3) return de_sub_8040FF4(FEMALE); return gTrainerClassNames[nameIndex]; case 0x800: trainerClass = de_sub_81364F8(); nameIndex = GetEReaderTrainerClassNameIndex(); - if (trainerClass == TRAINER_CLASS_SCHOOL_KID_F) + if (trainerClass == FACILITY_CLASS_SCHOOL_KID_F) return de_sub_8040FE0(FEMALE); - if (trainerClass == TRAINER_CLASS_MAY_1 || trainerClass == TRAINER_CLASS_MAY_2 || trainerClass == TRAINER_CLASS_MAY_3) + if (trainerClass == FACILITY_CLASS_MAY_1 || trainerClass == FACILITY_CLASS_MAY_2 || trainerClass == FACILITY_CLASS_MAY_3) return de_sub_8040FF4(FEMALE); return gTrainerClassNames[nameIndex]; default: trainer = &gTrainers[arg1]; trainerClass = trainer->trainerClass; local2 = sub_803FC58(arg1); - if (trainerClass == TRAINER_CLASS_LEADER_F) + if (trainerClass == FACILITY_CLASS_LEADER_F) return de_sub_8040FE0(local2); - if (trainerClass == TRAINER_CLASS_BIRD_KEEPER && local2 == FEMALE) + if (trainerClass == FACILITY_CLASS_BIRD_KEEPER && local2 == FEMALE) return de_sub_8040FF4(FEMALE); - if (trainerClass == TRAINER_CLASS_ELITE_FOUR_F) + if (trainerClass == FACILITY_CLASS_ELITE_FOUR_F) { if (gTrainers[arg1].doubleBattle == TRUE) return de_sub_804100C(FEMALE); diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 88115d28a..11c05e478 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -103,59 +103,59 @@ static const u16 sBattleTowerHeldItems[] = { #include "../data/battle_tower/level_100_mons.h" static const u8 sMaleTrainerClasses[] = { - TRAINER_CLASS_RUIN_MANIAC, - TRAINER_CLASS_TUBER_M, - TRAINER_CLASS_COOL_TRAINER_M, - TRAINER_CLASS_RICH_BOY, - TRAINER_CLASS_POKEMANIAC, - TRAINER_CLASS_SWIMMER_M, - TRAINER_CLASS_BLACK_BELT, - TRAINER_CLASS_GUITARIST, - TRAINER_CLASS_KINDLER, - TRAINER_CLASS_CAMPER, - TRAINER_CLASS_BUG_MANIAC, - TRAINER_CLASS_PSYCHIC_M, - TRAINER_CLASS_GENTLEMAN, - TRAINER_CLASS_SCHOOL_KID_M, - TRAINER_CLASS_POKEFAN_M, - TRAINER_CLASS_EXPERT_M, - TRAINER_CLASS_YOUNGSTER, - TRAINER_CLASS_FISHERMAN, - TRAINER_CLASS_CYCLING_TRIATHLETE_M, - TRAINER_CLASS_RUNNING_TRIATHLETE_M, - TRAINER_CLASS_SWIMMING_TRIATHLETE_M, - TRAINER_CLASS_DRAGON_TAMER, - TRAINER_CLASS_BIRD_KEEPER, - TRAINER_CLASS_NINJA_BOY, - TRAINER_CLASS_SAILOR, - TRAINER_CLASS_COLLECTOR, - TRAINER_CLASS_POKEMON_BREEDER_M, - TRAINER_CLASS_POKEMON_RANGER_M, - TRAINER_CLASS_BUG_CATCHER, - TRAINER_CLASS_HIKER, + FACILITY_CLASS_RUIN_MANIAC, + FACILITY_CLASS_TUBER_M, + FACILITY_CLASS_COOL_TRAINER_M, + FACILITY_CLASS_RICH_BOY, + FACILITY_CLASS_POKEMANIAC, + FACILITY_CLASS_SWIMMER_M, + FACILITY_CLASS_BLACK_BELT, + FACILITY_CLASS_GUITARIST, + FACILITY_CLASS_KINDLER, + FACILITY_CLASS_CAMPER, + FACILITY_CLASS_BUG_MANIAC, + FACILITY_CLASS_PSYCHIC_M, + FACILITY_CLASS_GENTLEMAN, + FACILITY_CLASS_SCHOOL_KID_M, + FACILITY_CLASS_POKEFAN_M, + FACILITY_CLASS_EXPERT_M, + FACILITY_CLASS_YOUNGSTER, + FACILITY_CLASS_FISHERMAN, + FACILITY_CLASS_CYCLING_TRIATHLETE_M, + FACILITY_CLASS_RUNNING_TRIATHLETE_M, + FACILITY_CLASS_SWIMMING_TRIATHLETE_M, + FACILITY_CLASS_DRAGON_TAMER, + FACILITY_CLASS_BIRD_KEEPER, + FACILITY_CLASS_NINJA_BOY, + FACILITY_CLASS_SAILOR, + FACILITY_CLASS_COLLECTOR, + FACILITY_CLASS_POKEMON_BREEDER_M, + FACILITY_CLASS_POKEMON_RANGER_M, + FACILITY_CLASS_BUG_CATCHER, + FACILITY_CLASS_HIKER, }; static const u8 sFemaleTrainerClasses[] = { - TRAINER_CLASS_AROMA_LADY, - TRAINER_CLASS_TUBER_F, - TRAINER_CLASS_COOL_TRAINER_F, - TRAINER_CLASS_HEX_MANIAC, - TRAINER_CLASS_LADY, - TRAINER_CLASS_BEAUTY, - TRAINER_CLASS_PSYCHIC_F, - TRAINER_CLASS_SCHOOL_KID_F, - TRAINER_CLASS_POKEFAN_F, - TRAINER_CLASS_EXPERT_F, - TRAINER_CLASS_CYCLING_TRIATHLETE_F, - TRAINER_CLASS_RUNNING_TRIATHLETE_F, - TRAINER_CLASS_SWIMMING_TRIATHLETE_F, - TRAINER_CLASS_BATTLE_GIRL, - TRAINER_CLASS_PARASOL_LADY, - TRAINER_CLASS_SWIMMER_F, - TRAINER_CLASS_PICNICKER, - TRAINER_CLASS_POKEMON_BREEDER_F, - TRAINER_CLASS_POKEMON_RANGER_F, - TRAINER_CLASS_LASS, + FACILITY_CLASS_AROMA_LADY, + FACILITY_CLASS_TUBER_F, + FACILITY_CLASS_COOL_TRAINER_F, + FACILITY_CLASS_HEX_MANIAC, + FACILITY_CLASS_LADY, + FACILITY_CLASS_BEAUTY, + FACILITY_CLASS_PSYCHIC_F, + FACILITY_CLASS_SCHOOL_KID_F, + FACILITY_CLASS_POKEFAN_F, + FACILITY_CLASS_EXPERT_F, + FACILITY_CLASS_CYCLING_TRIATHLETE_F, + FACILITY_CLASS_RUNNING_TRIATHLETE_F, + FACILITY_CLASS_SWIMMING_TRIATHLETE_F, + FACILITY_CLASS_BATTLE_GIRL, + FACILITY_CLASS_PARASOL_LADY, + FACILITY_CLASS_SWIMMER_F, + FACILITY_CLASS_PICNICKER, + FACILITY_CLASS_POKEMON_BREEDER_F, + FACILITY_CLASS_POKEMON_RANGER_F, + FACILITY_CLASS_LASS, }; static const u8 sMaleTrainerGfxIds[] = { diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c index 37bc2e0ad..1b00ad96e 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon/pokemon_2.c @@ -84,7 +84,7 @@ u8 sub_803C434(u8 a1) status ^= 1; if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) - return GetBankByPlayerAI(status); + return GetBankByIdentity(status); if (CountAliveMons(0) > 1) { u8 val; @@ -93,14 +93,14 @@ u8 sub_803C434(u8 a1) val = status ^ 2; else val = status; - return GetBankByPlayerAI(val); + return GetBankByIdentity(val); } else { if ((gAbsentBankFlags & gBitTable[status])) - return GetBankByPlayerAI(status ^ 2); + return GetBankByIdentity(status ^ 2); else - return GetBankByPlayerAI(status); + return GetBankByIdentity(status); } } diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c index 82e452158..031f2ea24 100644 --- a/src/pokemon/pokemon_data.c +++ b/src/pokemon/pokemon_data.c @@ -84,9 +84,9 @@ const struct SpriteTemplate gSpriteTemplate_8208288[] = { const u8 gSecretBaseTrainerClasses[][5] = { // male - {TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER, TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER, TRAINER_CLASS_COOL_TRAINER_M}, + {FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_RICH_BOY, FACILITY_CLASS_CAMPER, FACILITY_CLASS_COOL_TRAINER_M}, // female - {TRAINER_CLASS_LASS, TRAINER_CLASS_SCHOOL_KID_F, TRAINER_CLASS_LADY, TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOL_TRAINER_F} + {FACILITY_CLASS_LASS, FACILITY_CLASS_SCHOOL_KID_F, FACILITY_CLASS_LADY, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_COOL_TRAINER_F} }; const u8 gUnknown_082082F2[] = { diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 001cd85f6..2691da859 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -823,7 +823,7 @@ u8 GetBankIdentity(u8 slot) return gBanksBySide[slot]; } -u8 GetBankByPlayerAI(u8 slot) +u8 GetBankByIdentity(u8 slot) { u8 i; @@ -1329,35 +1329,27 @@ u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) var |= 1 << 18; return var; } - } - else - { - if (a1) - { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(0))) - var |= 1 << (GetBankByPlayerAI(0) + 16); + } else { + if (a1) { + if (IsAnimBankSpriteVisible(GetBankByIdentity(0))) { + var |= 1 << (GetBankByIdentity(0) + 16); + } } - if (a2) - { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(2))) - { - shift = GetBankByPlayerAI(2) + 16; + if (a2) { + if (IsAnimBankSpriteVisible(GetBankByIdentity(2))) { + shift = GetBankByIdentity(2) + 16; var |= 1 << shift; } } - if (a3) - { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(1))) - { - shift = GetBankByPlayerAI(1) + 16; + if (a3) { + if (IsAnimBankSpriteVisible(GetBankByIdentity(1))) { + shift = GetBankByIdentity(1) + 16; var |= 1 << shift; } } - if (a4) - { - if (IsAnimBankSpriteVisible(GetBankByPlayerAI(3))) - { - shift = GetBankByPlayerAI(3) + 16; + if (a4) { + if (IsAnimBankSpriteVisible(GetBankByIdentity(3))) { + shift = GetBankByIdentity(3) + 16; var |= 1 << shift; } } @@ -1372,7 +1364,7 @@ u8 sub_80793A8(u8 a1) u8 unref_sub_80793B0(u8 a1) { - return GetBankByPlayerAI(a1); + return GetBankByIdentity(a1); } void sub_80793C4(struct Sprite *sprite) diff --git a/sym_ewram.txt b/sym_ewram.txt index cffa8396d..bb5d56686 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -71,10 +71,10 @@ gUnknown_02024A76: @ 2024A76 gTurnOrder: @ 2024A7A .space 0x4 -gCurrentMoveTurn: @ 2024A7E +gCurrentTurnActionNumber: @ 2024A7E .space 0x1 -gFightStateTracker: @ 2024A7F +gCurrentActionFuncId: @ 2024A7F .space 0x1 gBattleMons: @ 2024A80 @@ -206,7 +206,7 @@ gUnknown_02024C78: @ 2024C78 gSideAffecting: @ 2024C7A .space 0x6 -gSideTimer: @ 2024C80 +gSideTimers: @ 2024C80 .space 0x18 gStatuses3: @ 2024C98 -- cgit v1.2.3 From 82ab732d673946af609f896dc51639030eb1bd19 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 7 Jan 2018 14:59:16 -0800 Subject: Finish decompiling battle_2 --- asm/battle_2.s | 2619 --------------------------- asm/contest_link_80C2020.s | 16 +- data/battle_scripts_1.s | 4 +- data/data2a.s | 40 +- include/battle.h | 15 +- include/battle_ai.h | 1 + include/battle_message.h | 137 ++ include/constants/battle_constants.h | 37 + include/ewram.h | 5 + include/pokemon.h | 12 + include/roamer.h | 2 + include/tv.h | 1 + src/battle/battle_2.c | 1214 ++++++++++++- src/battle/battle_3.c | 24 +- src/battle/battle_4.c | 69 +- src/battle/battle_controller_linkopponent.c | 8 +- src/battle/battle_controller_linkpartner.c | 8 +- src/battle/battle_controller_opponent.c | 8 +- src/battle/battle_controller_player.c | 34 +- src/battle/battle_controller_safari.c | 14 +- src/battle/battle_controller_wally.c | 14 +- src/battle/reshow_battle_screen.c | 10 +- src/contest.c | 24 +- src/debug/matsuda_debug_menu.c | 12 +- src/field/tv.c | 2 +- src/scene/evolution_scene.c | 24 +- src/unknown_task.c | 8 +- sym_common.txt | 4 +- sym_ewram.txt | 6 +- 29 files changed, 1534 insertions(+), 2838 deletions(-) diff --git a/asm/battle_2.s b/asm/battle_2.s index f985f570b..8a1bd902f 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -5,2625 +5,6 @@ .text - thumb_func_start sub_8013B64 -sub_8013B64: @ 8013B64 - push {r4,lr} - ldr r1, _08013B9C @ =gCurrentActionFuncId - movs r0, 0 - strb r0, [r1] - ldr r0, _08013BA0 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08013BB8 - ldr r1, _08013BA4 @ =gBattleTextBuff1 - ldr r4, _08013BA8 @ =gBattleOutcome - ldrb r0, [r4] - strb r0, [r1] - movs r0, 0 - bl GetBankByIdentity - ldr r1, _08013BAC @ =gBankAttacker - strb r0, [r1] - ldr r1, _08013BB0 @ =gBattlescriptCurrInstr - ldr r0, _08013BB4 @ =gUnknown_081D8E02 - str r0, [r1] - ldrb r1, [r4] - movs r0, 0x7F - ands r0, r1 - strb r0, [r4] - b _08013BBE - .align 2, 0 -_08013B9C: .4byte gCurrentActionFuncId -_08013BA0: .4byte gBattleTypeFlags -_08013BA4: .4byte gBattleTextBuff1 -_08013BA8: .4byte gBattleOutcome -_08013BAC: .4byte gBankAttacker -_08013BB0: .4byte gBattlescriptCurrInstr -_08013BB4: .4byte gUnknown_081D8E02 -_08013BB8: - ldr r1, _08013BCC @ =gBattlescriptCurrInstr - ldr r0, _08013BD0 @ =BattleScript_LocalBattleLost - str r0, [r1] -_08013BBE: - ldr r1, _08013BD4 @ =gBattleMainFunc - ldr r0, _08013BD8 @ =sub_8013C9C - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08013BCC: .4byte gBattlescriptCurrInstr -_08013BD0: .4byte BattleScript_LocalBattleLost -_08013BD4: .4byte gBattleMainFunc -_08013BD8: .4byte sub_8013C9C - thumb_func_end sub_8013B64 - - thumb_func_start sub_8013BDC -sub_8013BDC: @ 8013BDC - push {lr} - ldr r1, _08013C04 @ =gCurrentActionFuncId - movs r0, 0 - strb r0, [r1] - ldr r1, _08013C08 @ =gProtectStructs - ldr r0, _08013C0C @ =gBankAttacker - ldrb r0, [r0] - lsls r0, 4 - adds r0, r1 - ldrb r0, [r0, 0x1] - lsls r0, 27 - lsrs r0, 30 - cmp r0, 0x1 - beq _08013C18 - cmp r0, 0x2 - beq _08013C28 - ldr r1, _08013C10 @ =gBattlescriptCurrInstr - ldr r0, _08013C14 @ =BattleScript_GotAwaySafely - b _08013C2C - .align 2, 0 -_08013C04: .4byte gCurrentActionFuncId -_08013C08: .4byte gProtectStructs -_08013C0C: .4byte gBankAttacker -_08013C10: .4byte gBattlescriptCurrInstr -_08013C14: .4byte BattleScript_GotAwaySafely -_08013C18: - ldr r1, _08013C20 @ =gBattlescriptCurrInstr - ldr r0, _08013C24 @ =BattleScript_SmokeBallEscape - b _08013C2C - .align 2, 0 -_08013C20: .4byte gBattlescriptCurrInstr -_08013C24: .4byte BattleScript_SmokeBallEscape -_08013C28: - ldr r1, _08013C38 @ =gBattlescriptCurrInstr - ldr r0, _08013C3C @ =BattleScript_RanAwayUsingMonAbility -_08013C2C: - str r0, [r1] - ldr r1, _08013C40 @ =gBattleMainFunc - ldr r0, _08013C44 @ =sub_8013C9C - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_08013C38: .4byte gBattlescriptCurrInstr -_08013C3C: .4byte BattleScript_RanAwayUsingMonAbility -_08013C40: .4byte gBattleMainFunc -_08013C44: .4byte sub_8013C9C - thumb_func_end sub_8013BDC - - thumb_func_start sub_8013C48 -sub_8013C48: @ 8013C48 - ldr r1, _08013C7C @ =gCurrentActionFuncId - movs r0, 0 - strb r0, [r1] - ldr r1, _08013C80 @ =gBattleTextBuff1 - movs r0, 0xFD - strb r0, [r1] - movs r0, 0x7 - strb r0, [r1, 0x1] - ldr r2, _08013C84 @ =gBankAttacker - ldrb r0, [r2] - strb r0, [r1, 0x2] - ldr r3, _08013C88 @ =gBattlePartyID - ldrb r0, [r2] - lsls r0, 1 - adds r0, r3 - ldrh r0, [r0] - strb r0, [r1, 0x3] - movs r0, 0xFF - strb r0, [r1, 0x4] - ldr r1, _08013C8C @ =gBattlescriptCurrInstr - ldr r0, _08013C90 @ =BattleScript_WildMonFled - str r0, [r1] - ldr r1, _08013C94 @ =gBattleMainFunc - ldr r0, _08013C98 @ =sub_8013C9C - str r0, [r1] - bx lr - .align 2, 0 -_08013C7C: .4byte gCurrentActionFuncId -_08013C80: .4byte gBattleTextBuff1 -_08013C84: .4byte gBankAttacker -_08013C88: .4byte gBattlePartyID -_08013C8C: .4byte gBattlescriptCurrInstr -_08013C90: .4byte BattleScript_WildMonFled -_08013C94: .4byte gBattleMainFunc -_08013C98: .4byte sub_8013C9C - thumb_func_end sub_8013C48 - - thumb_func_start sub_8013C9C -sub_8013C9C: @ 8013C9C - push {r4-r7,lr} - ldr r0, _08013D00 @ =gCurrentActionFuncId - ldrb r0, [r0] - subs r0, 0xB - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _08013D7C - ldr r0, _08013D04 @ =gBattleTypeFlags - ldrh r0, [r0] - ldr r1, _08013D08 @ =0x00000b92 - ands r1, r0 - cmp r1, 0 - bne _08013D4C - ldr r2, _08013D0C @ =gActiveBank - strb r1, [r2] - ldr r0, _08013D10 @ =gNoOfAllBanks - ldrb r0, [r0] - cmp r1, r0 - bcs _08013D48 - adds r4, r2, 0 - ldr r6, _08013D14 @ =gBattleMons - movs r5, 0x58 - adds r7, r6, 0 - adds r7, 0x30 -_08013CCE: - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _08013D36 - ldr r2, _08013D18 @ =gBattleResults - ldrh r0, [r2, 0x6] - cmp r0, 0 - bne _08013D1C - ldrb r0, [r4] - muls r0, r5 - adds r0, r6 - ldrh r0, [r0] - strh r0, [r2, 0x6] - ldrb r0, [r4] - adds r1, r0, 0 - muls r1, r5 - adds r1, r7 - adds r0, r2, 0 - adds r0, 0x8 - bl StringCopy - b _08013D36 - .align 2, 0 -_08013D00: .4byte gCurrentActionFuncId -_08013D04: .4byte gBattleTypeFlags -_08013D08: .4byte 0x00000b92 -_08013D0C: .4byte gActiveBank -_08013D10: .4byte gNoOfAllBanks -_08013D14: .4byte gBattleMons -_08013D18: .4byte gBattleResults -_08013D1C: - ldrb r0, [r4] - muls r0, r5 - adds r0, r6 - ldrh r0, [r0] - strh r0, [r2, 0x26] - ldrb r0, [r4] - adds r1, r0, 0 - muls r1, r5 - adds r1, r7 - adds r0, r2, 0 - adds r0, 0x14 - bl StringCopy -_08013D36: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - ldr r1, _08013D68 @ =gNoOfAllBanks - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r1] - cmp r0, r1 - bcc _08013CCE -_08013D48: - bl sub_80BDEC8 -_08013D4C: - movs r0, 0x3 - bl BeginFastPaletteFade - movs r0, 0x5 - bl FadeOutMapMusic - ldr r1, _08013D6C @ =gBattleMainFunc - ldr r0, _08013D70 @ =sub_8013DA8 - str r0, [r1] - ldr r1, _08013D74 @ =gCB2_AfterEvolution - ldr r0, _08013D78 @ =sub_800F808 - str r0, [r1] - b _08013D96 - .align 2, 0 -_08013D68: .4byte gNoOfAllBanks -_08013D6C: .4byte gBattleMainFunc -_08013D70: .4byte sub_8013DA8 -_08013D74: .4byte gCB2_AfterEvolution -_08013D78: .4byte sub_800F808 -_08013D7C: - ldr r0, _08013D9C @ =gBattleExecBuffer - ldr r0, [r0] - cmp r0, 0 - bne _08013D96 - ldr r1, _08013DA0 @ =gBattleScriptingCommandsTable - ldr r0, _08013DA4 @ =gBattlescriptCurrInstr - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 -_08013D96: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08013D9C: .4byte gBattleExecBuffer -_08013DA0: .4byte gBattleScriptingCommandsTable -_08013DA4: .4byte gBattlescriptCurrInstr - thumb_func_end sub_8013C9C - - thumb_func_start sub_8013DA8 -sub_8013DA8: @ 8013DA8 - push {lr} - ldr r0, _08013DD0 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08013DEA - bl ResetSpriteData - ldr r0, _08013DD4 @ =gLeveledUpInBattle - ldrb r0, [r0] - cmp r0, 0 - beq _08013DCA - ldr r0, _08013DD8 @ =gBattleOutcome - ldrb r0, [r0] - cmp r0, 0x1 - beq _08013DE4 -_08013DCA: - ldr r1, _08013DDC @ =gBattleMainFunc - ldr r0, _08013DE0 @ =c4_overworld - b _08013DE8 - .align 2, 0 -_08013DD0: .4byte gPaletteFade -_08013DD4: .4byte gLeveledUpInBattle -_08013DD8: .4byte gBattleOutcome -_08013DDC: .4byte gBattleMainFunc -_08013DE0: .4byte c4_overworld -_08013DE4: - ldr r1, _08013DF0 @ =gBattleMainFunc - ldr r0, _08013DF4 @ =bc_evolution_cutscene -_08013DE8: - str r0, [r1] -_08013DEA: - pop {r0} - bx r0 - .align 2, 0 -_08013DF0: .4byte gBattleMainFunc -_08013DF4: .4byte bc_evolution_cutscene - thumb_func_end sub_8013DA8 - - thumb_func_start bc_evolution_cutscene -bc_evolution_cutscene: @ 8013DF8 - push {r4,r5,lr} - ldr r0, _08013E4C @ =gLeveledUpInBattle - ldrb r1, [r0] - adds r3, r0, 0 - cmp r1, 0 - beq _08013E6E -_08013E04: - movs r5, 0 -_08013E06: - ldrb r2, [r3] - ldr r0, _08013E50 @ =gBitTable - lsls r1, r5, 2 - adds r1, r0 - ldr r1, [r1] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - beq _08013E60 - bics r2, r1 - strb r2, [r3] - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, _08013E54 @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0 - bl GetEvolutionTargetSpecies - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0 - beq _08013E60 - ldr r0, _08013E58 @ =gBattleMainFunc - ldr r1, _08013E5C @ =sub_8013E88 - str r1, [r0] - lsls r3, r5, 24 - lsrs r3, 24 - adds r0, r4, 0 - adds r1, r2, 0 - movs r2, 0x81 - bl EvolutionScene - b _08013E74 - .align 2, 0 -_08013E4C: .4byte gLeveledUpInBattle -_08013E50: .4byte gBitTable -_08013E54: .4byte gPlayerParty -_08013E58: .4byte gBattleMainFunc -_08013E5C: .4byte sub_8013E88 -_08013E60: - adds r5, 0x1 - ldr r3, _08013E7C @ =gLeveledUpInBattle - cmp r5, 0x5 - ble _08013E06 - ldrb r0, [r3] - cmp r0, 0 - bne _08013E04 -_08013E6E: - ldr r1, _08013E80 @ =gBattleMainFunc - ldr r0, _08013E84 @ =c4_overworld - str r0, [r1] -_08013E74: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08013E7C: .4byte gLeveledUpInBattle -_08013E80: .4byte gBattleMainFunc -_08013E84: .4byte c4_overworld - thumb_func_end bc_evolution_cutscene - - thumb_func_start sub_8013E88 -sub_8013E88: @ 8013E88 - push {lr} - ldr r0, _08013EA0 @ =gMain - ldr r1, [r0, 0x4] - ldr r0, _08013EA4 @ =sub_800F808 - cmp r1, r0 - bne _08013E9A - ldr r1, _08013EA8 @ =gBattleMainFunc - ldr r0, _08013EAC @ =bc_evolution_cutscene - str r0, [r1] -_08013E9A: - pop {r0} - bx r0 - .align 2, 0 -_08013EA0: .4byte gMain -_08013EA4: .4byte sub_800F808 -_08013EA8: .4byte gBattleMainFunc -_08013EAC: .4byte bc_evolution_cutscene - thumb_func_end sub_8013E88 - - thumb_func_start c4_overworld -c4_overworld: @ 8013EB0 - push {r4-r6,lr} - ldr r5, _08013F30 @ =gBattleTypeFlags - ldrh r1, [r5] - movs r6, 0x2 - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0 - bne _08013ECE - ldr r4, _08013F34 @ =gPlayerParty - adds r0, r4, 0 - bl RandomlyGivePartyPokerus - adds r0, r4, 0 - bl PartySpreadPokerus -_08013ECE: - ldrh r4, [r5] - adds r0, r6, 0 - ands r0, r4 - cmp r0, 0 - beq _08013EE0 - ldr r0, _08013F38 @ =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _08013F2A -_08013EE0: - ldr r1, _08013F3C @ =gSpecialVar_Result - ldr r5, _08013F40 @ =gBattleOutcome - ldrb r0, [r5] - strh r0, [r1] - ldr r3, _08013F44 @ =gMain - ldr r0, _08013F48 @ =0x0000043d - adds r2, r3, r0 - ldrb r1, [r2] - movs r0, 0x3 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, _08013F4C @ =gPreBattleCallback1 - ldr r0, [r0] - str r0, [r3] - movs r0, 0x80 - lsls r0, 3 - ands r0, r4 - cmp r0, 0 - beq _08013F1C - ldr r0, _08013F50 @ =gEnemyParty - bl UpdateRoamerHPStatus - ldrb r0, [r5] - cmp r0, 0x1 - beq _08013F18 - cmp r0, 0x7 - bne _08013F1C -_08013F18: - bl SetRoamerInactive -_08013F1C: - movs r0, 0x5A - bl m4aSongNumStop - ldr r0, _08013F44 @ =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_08013F2A: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08013F30: .4byte gBattleTypeFlags -_08013F34: .4byte gPlayerParty -_08013F38: .4byte gReceivedRemoteLinkPlayers -_08013F3C: .4byte gSpecialVar_Result -_08013F40: .4byte gBattleOutcome -_08013F44: .4byte gMain -_08013F48: .4byte 0x0000043d -_08013F4C: .4byte gPreBattleCallback1 -_08013F50: .4byte gEnemyParty - thumb_func_end c4_overworld - - thumb_func_start sub_8013F54 -sub_8013F54: @ 8013F54 - push {lr} - ldr r0, _08013F84 @ =gCurrentActionFuncId - ldrb r0, [r0] - subs r0, 0xB - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _08013F90 - ldr r2, _08013F88 @ =gSharedMem + 0x17140 - adds r1, r2, 0 - adds r1, 0x20 - ldrb r0, [r1] - cmp r0, 0 - beq _08013F74 - subs r0, 0x1 - strb r0, [r1] -_08013F74: - ldr r0, _08013F8C @ =gBattleMainFunc - ldrb r1, [r1] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - str r1, [r0] - b _08013FAA - .align 2, 0 -_08013F84: .4byte gCurrentActionFuncId -_08013F88: .4byte gSharedMem + 0x17140 -_08013F8C: .4byte gBattleMainFunc -_08013F90: - ldr r0, _08013FB0 @ =gBattleExecBuffer - ldr r0, [r0] - cmp r0, 0 - bne _08013FAA - ldr r1, _08013FB4 @ =gBattleScriptingCommandsTable - ldr r0, _08013FB8 @ =gBattlescriptCurrInstr - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 -_08013FAA: - pop {r0} - bx r0 - .align 2, 0 -_08013FB0: .4byte gBattleExecBuffer -_08013FB4: .4byte gBattleScriptingCommandsTable -_08013FB8: .4byte gBattlescriptCurrInstr - thumb_func_end sub_8013F54 - - thumb_func_start sub_8013FBC -sub_8013FBC: @ 8013FBC - push {lr} - ldr r0, _08013FDC @ =gBattleExecBuffer - ldr r0, [r0] - cmp r0, 0 - bne _08013FD8 - ldr r1, _08013FE0 @ =gBattleScriptingCommandsTable - ldr r0, _08013FE4 @ =gBattlescriptCurrInstr - ldr r0, [r0] - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 -_08013FD8: - pop {r0} - bx r0 - .align 2, 0 -_08013FDC: .4byte gBattleExecBuffer -_08013FE0: .4byte gBattleScriptingCommandsTable -_08013FE4: .4byte gBattlescriptCurrInstr - thumb_func_end sub_8013FBC - - thumb_func_start sub_8013FE8 -sub_8013FE8: @ 8013FE8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - movs r0, 0x4 - str r0, [sp] - ldr r7, _08014028 @ =gBankAttacker - ldr r1, _0801402C @ =gTurnOrder - ldr r0, _08014030 @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r7] - ldr r1, _08014034 @ =gSharedMem - mov r10, r1 - ldr r0, _08014038 @ =0x000160a6 - add r0, r10 - ldrb r2, [r0] - ldr r1, _0801403C @ =gBitTable - ldrb r0, [r7] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - ands r2, r0 - cmp r2, 0 - beq _08014044 - ldr r1, _08014040 @ =gCurrentActionFuncId - movs r0, 0xC - b _080146CC - .align 2, 0 -_08014028: .4byte gBankAttacker -_0801402C: .4byte gTurnOrder -_08014030: .4byte gCurrentTurnActionNumber -_08014034: .4byte gSharedMem -_08014038: .4byte 0x000160a6 -_0801403C: .4byte gBitTable -_08014040: .4byte gCurrentActionFuncId -_08014044: - ldr r1, _080140B8 @ =gCritMultiplier - movs r0, 0x1 - strb r0, [r1] - ldr r1, _080140BC @ =0x0001601f - add r1, r10 - movs r0, 0x1 - strb r0, [r1] - ldr r0, _080140C0 @ =0x000160e7 - add r0, r10 - strb r2, [r0] - ldr r0, _080140C4 @ =gBattleMoveFlags - strb r2, [r0] - ldr r0, _080140C8 @ =gMultiHitCounter - strb r2, [r0] - ldr r0, _080140CC @ =gBattleCommunication - strb r2, [r0, 0x6] - ldr r3, _080140D0 @ =gCurrMovePos - ldrb r0, [r7] - ldr r2, _080140D4 @ =0x0001608c - adds r0, r2 - add r0, r10 - ldrb r0, [r0] - ldr r4, _080140D8 @ =gUnknown_02024BE5 - strb r0, [r4] - strb r0, [r3] - ldr r1, _080140DC @ =gProtectStructs - ldrb r2, [r7] - lsls r0, r2, 4 - adds r5, r0, r1 - ldrb r1, [r5] - lsls r0, r1, 29 - adds r4, r2, 0 - mov r8, r3 - cmp r0, 0 - bge _080140F0 - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r5] - ldr r2, _080140E0 @ =gCurrentMove - ldr r1, _080140E4 @ =gChosenMove - movs r0, 0xA5 - strh r0, [r1] - strh r0, [r2] - ldr r2, _080140E8 @ =gHitMarker - ldr r0, [r2] - movs r1, 0x80 - lsls r1, 4 - orrs r0, r1 - str r0, [r2] - movs r0, 0xA5 - movs r1, 0 - bl GetMoveTarget - ldrb r1, [r7] - ldr r2, _080140EC @ =0x00016010 - adds r1, r2 - b _08014200 - .align 2, 0 -_080140B8: .4byte gCritMultiplier -_080140BC: .4byte 0x0001601f -_080140C0: .4byte 0x000160e7 -_080140C4: .4byte gBattleMoveFlags -_080140C8: .4byte gMultiHitCounter -_080140CC: .4byte gBattleCommunication -_080140D0: .4byte gCurrMovePos -_080140D4: .4byte 0x0001608c -_080140D8: .4byte gUnknown_02024BE5 -_080140DC: .4byte gProtectStructs -_080140E0: .4byte gCurrentMove -_080140E4: .4byte gChosenMove -_080140E8: .4byte gHitMarker -_080140EC: .4byte 0x00016010 -_080140F0: - ldr r1, _08014128 @ =gBattleMons - movs r0, 0x58 - adds r5, r4, 0 - muls r5, r0 - adds r0, r1, 0 - adds r0, 0x50 - adds r0, r5, r0 - ldr r2, [r0] - movs r0, 0x80 - lsls r0, 5 - ands r0, r2 - cmp r0, 0 - bne _08014114 - movs r6, 0x80 - lsls r6, 15 - ands r6, r2 - cmp r6, 0 - beq _08014138 -_08014114: - ldr r3, _0801412C @ =gCurrentMove - ldr r2, _08014130 @ =gChosenMove - ldr r1, _08014134 @ =gLockedMove - lsls r0, r4, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - strh r0, [r3] - b _08014280 - .align 2, 0 -_08014128: .4byte gBattleMons -_0801412C: .4byte gCurrentMove -_08014130: .4byte gChosenMove -_08014134: .4byte gLockedMove -_08014138: - ldr r3, _08014188 @ =gDisableStructs - mov r12, r3 - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - adds r2, r0, r3 - ldrh r4, [r2, 0x6] - adds r1, r4, 0 - cmp r1, 0 - beq _08014218 - ldrb r3, [r2, 0xC] - lsls r0, r3, 1 - adds r0, r5 - str r0, [sp, 0x8] - ldr r0, _0801418C @ =gBattleMons - adds r0, 0xC - mov r9, r0 - ldr r0, [sp, 0x8] - add r0, r9 - ldrh r0, [r0] - cmp r1, r0 - bne _080141A0 - ldr r1, _08014190 @ =gCurrentMove - ldr r0, _08014194 @ =gChosenMove - strh r4, [r0] - strh r4, [r1] - ldrb r0, [r2, 0xC] - ldr r2, _08014198 @ =gUnknown_02024BE5 - strb r0, [r2] - mov r3, r8 - strb r0, [r3] - ldrh r0, [r1] - movs r1, 0 - bl GetMoveTarget - ldrb r1, [r7] - ldr r4, _0801419C @ =0x00016010 - adds r1, r4 - b _08014200 - .align 2, 0 -_08014188: .4byte gDisableStructs -_0801418C: .4byte gBattleMons -_08014190: .4byte gCurrentMove -_08014194: .4byte gChosenMove -_08014198: .4byte gUnknown_02024BE5 -_0801419C: .4byte 0x00016010 -_080141A0: - cmp r1, 0 - beq _08014218 - cmp r1, r0 - beq _08014218 - ldr r0, _08014208 @ =gUnknown_02024BE5 - strb r3, [r0] - mov r1, r8 - strb r3, [r1] - ldr r3, _0801420C @ =gCurrentMove - ldr r1, _08014210 @ =gChosenMove - mov r2, r8 - ldrb r0, [r2] - lsls r0, 1 - adds r0, r5 - add r0, r9 - ldrh r0, [r0] - strh r0, [r1] - strh r0, [r3] - ldrb r1, [r7] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - add r0, r12 - movs r2, 0 - strh r6, [r0, 0x6] - ldrb r1, [r7] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - add r0, r12 - strb r2, [r0, 0xC] - ldrb r0, [r7] - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - add r1, r12 - ldrb r2, [r1, 0xE] - movs r0, 0x10 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0xE] - ldrh r0, [r3] - movs r1, 0 - bl GetMoveTarget - ldrb r1, [r7] - ldr r3, _08014214 @ =0x00016010 - adds r1, r3 -_08014200: - add r1, r10 - strb r0, [r1] - b _08014280 - .align 2, 0 -_08014208: .4byte gUnknown_02024BE5 -_0801420C: .4byte gCurrentMove -_08014210: .4byte gChosenMove -_08014214: .4byte 0x00016010 -_08014218: - mov r4, r8 - ldrb r0, [r4] - lsls r0, 1 - ldr r4, _0801425C @ =gBankAttacker - ldrb r2, [r4] - movs r1, 0x58 - muls r1, r2 - adds r0, r1 - ldr r1, _08014260 @ =gBattleMons - adds r1, 0xC - adds r0, r1 - ldr r1, _08014264 @ =gChosenMovesByBanks - lsls r2, 1 - adds r2, r1 - ldrh r3, [r0] - ldrh r2, [r2] - cmp r3, r2 - beq _08014278 - ldr r1, _08014268 @ =gCurrentMove - ldr r0, _0801426C @ =gChosenMove - strh r3, [r0] - strh r3, [r1] - ldrh r0, [r1] - movs r1, 0 - bl GetMoveTarget - ldr r2, _08014270 @ =gSharedMem - ldrb r1, [r4] - ldr r3, _08014274 @ =0x00016010 - adds r1, r3 - adds r1, r2 - strb r0, [r1] - b _08014280 - .align 2, 0 -_0801425C: .4byte gBankAttacker -_08014260: .4byte gBattleMons -_08014264: .4byte gChosenMovesByBanks -_08014268: .4byte gCurrentMove -_0801426C: .4byte gChosenMove -_08014270: .4byte gSharedMem -_08014274: .4byte 0x00016010 -_08014278: - ldr r1, _08014298 @ =gCurrentMove - ldr r0, _0801429C @ =gChosenMove - strh r3, [r0] - strh r3, [r1] -_08014280: - ldr r0, _080142A0 @ =gBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080142A8 - ldr r0, _080142A4 @ =gBattleResults - ldr r1, _08014298 @ =gCurrentMove - ldrh r1, [r1] - strh r1, [r0, 0x22] - b _080142B0 - .align 2, 0 -_08014298: .4byte gCurrentMove -_0801429C: .4byte gChosenMove -_080142A0: .4byte gBankAttacker -_080142A4: .4byte gBattleResults -_080142A8: - ldr r0, _08014314 @ =gBattleResults - ldr r1, _08014318 @ =gCurrentMove - ldrh r1, [r1] - strh r1, [r0, 0x24] -_080142B0: - ldr r4, _0801431C @ =gBankAttacker - ldrb r0, [r4] - bl GetBankSide - movs r1, 0x1 - eors r0, r1 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, _08014320 @ =gSideTimers - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 2 - adds r5, r0, r1 - ldrb r0, [r5, 0x8] - adds r3, r4, 0 - cmp r0, 0 - beq _08014330 - ldr r2, _08014324 @ =gBattleMoves - ldr r0, _08014318 @ =gCurrentMove - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x6] - cmp r0, 0 - bne _08014330 - ldrb r0, [r3] - bl GetBankSide - adds r4, r0, 0 - ldrb r0, [r5, 0x9] - bl GetBankSide - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - beq _08014330 - ldr r1, _08014328 @ =gBattleMons - ldrb r2, [r5, 0x9] - movs r0, 0x58 - muls r0, r2 - adds r0, r1 - ldrh r0, [r0, 0x28] - cmp r0, 0 - beq _08014330 - ldr r0, _0801432C @ =gBankTarget - strb r2, [r0] - b _080146AC - .align 2, 0 -_08014314: .4byte gBattleResults -_08014318: .4byte gCurrentMove -_0801431C: .4byte gBankAttacker -_08014320: .4byte gSideTimers -_08014324: .4byte gBattleMoves -_08014328: .4byte gBattleMons -_0801432C: .4byte gBankTarget -_08014330: - ldr r2, _08014454 @ =gBattleTypeFlags - ldrh r1, [r2] - movs r0, 0x1 - ands r0, r1 - ldr r3, _08014458 @ =gBankAttacker - mov r9, r2 - cmp r0, 0 - bne _08014342 - b _0801461C -_08014342: - ldr r1, _0801445C @ =gSideTimers - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 2 - adds r0, r1 - ldrb r7, [r0, 0x8] - cmp r7, 0 - beq _08014354 - b _08014570 -_08014354: - ldr r2, _08014460 @ =gBattleMoves - ldr r0, _08014464 @ =gCurrentMove - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r4, r0, r2 - ldrb r0, [r4, 0x1] - cmp r0, 0 - bne _08014370 - ldrb r0, [r4, 0x6] - cmp r0, 0x10 - bne _08014370 - b _08014570 -_08014370: - ldr r3, _08014468 @ =gBattleMons - ldr r0, _0801446C @ =gSharedMem - mov r8, r0 - ldr r2, _08014458 @ =gBankAttacker - ldrb r5, [r2] - ldr r1, _08014470 @ =0x00016010 - adds r0, r5, r1 - add r0, r8 - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r3 - adds r0, 0x20 - ldrb r0, [r0] - adds r3, r2, 0 - cmp r0, 0x1F - bne _08014394 - b _08014570 -_08014394: - ldrb r0, [r4, 0x2] - cmp r0, 0xD - beq _0801439C - b _08014570 -_0801439C: - adds r0, r5, 0 - bl GetBankSide - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, _08014474 @ =gActiveBank - strb r7, [r1] - ldr r0, _08014478 @ =gNoOfAllBanks - ldrb r0, [r0] - cmp r7, r0 - bcs _08014416 - adds r4, r1, 0 - mov r5, r8 -_080143B6: - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - cmp r6, r0 - beq _08014404 - ldr r0, _08014458 @ =gBankAttacker - ldrb r0, [r0] - ldr r2, _08014470 @ =0x00016010 - adds r0, r2 - adds r0, r5 - ldrb r0, [r0] - ldrb r3, [r4] - cmp r0, r3 - beq _08014404 - ldr r1, _08014468 @ =gBattleMons - ldrb r2, [r4] - movs r0, 0x58 - muls r0, r2 - adds r0, r1 - adds r0, 0x20 - ldrb r0, [r0] - cmp r0, 0x1F - bne _08014404 - adds r0, r2, 0 - bl BankGetTurnOrder - lsls r0, 24 - lsrs r0, 24 - ldr r1, [sp] - cmp r0, r1 - bcs _08014404 - ldrb r0, [r4] - bl BankGetTurnOrder - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] -_08014404: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - ldr r1, _08014478 @ =gNoOfAllBanks - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r1] - cmp r0, r1 - bcc _080143B6 -_08014416: - ldr r2, [sp] - cmp r2, 0x4 - beq _0801441E - b _08014522 -_0801441E: - ldr r2, _08014460 @ =gBattleMoves - ldr r0, _0801447C @ =gChosenMove - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x6] - ldr r3, [sp] - ands r3, r0 - cmp r3, 0 - beq _080144A4 - ldr r0, _08014458 @ =gBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _08014484 - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _08014480 - movs r0, 0x1 - b _08014496 - .align 2, 0 -_08014454: .4byte gBattleTypeFlags -_08014458: .4byte gBankAttacker -_0801445C: .4byte gSideTimers -_08014460: .4byte gBattleMoves -_08014464: .4byte gCurrentMove -_08014468: .4byte gBattleMons -_0801446C: .4byte gSharedMem -_08014470: .4byte 0x00016010 -_08014474: .4byte gActiveBank -_08014478: .4byte gNoOfAllBanks -_0801447C: .4byte gChosenMove -_08014480: - movs r0, 0x3 - b _08014496 -_08014484: - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _08014494 - movs r0, 0 - b _08014496 -_08014494: - movs r0, 0x2 -_08014496: - bl GetBankByIdentity - ldr r1, _080144A0 @ =gBankTarget - strb r0, [r1] - b _080144B6 - .align 2, 0 -_080144A0: .4byte gBankTarget -_080144A4: - ldr r2, _080144EC @ =gBankTarget - ldr r1, _080144F0 @ =gSharedMem - ldr r0, _080144F4 @ =gBankAttacker - ldrb r0, [r0] - ldr r4, _080144F8 @ =0x00016010 - adds r0, r4 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] -_080144B6: - ldr r7, _080144FC @ =gAbsentBankFlags - ldrb r0, [r7] - ldr r1, _08014500 @ =gBitTable - mov r8, r1 - ldr r5, _080144EC @ =gBankTarget - ldrb r1, [r5] - lsls r1, 2 - add r1, r8 - ldr r1, [r1] - ands r0, r1 - cmp r0, 0 - bne _080144D0 - b _080146AC -_080144D0: - ldr r6, _080144F4 @ =gBankAttacker - ldrb r0, [r6] - bl GetBankSide - adds r4, r0, 0 - ldrb r0, [r5] - bl GetBankSide - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - beq _08014504 - ldrb r0, [r5] - b _0801469A - .align 2, 0 -_080144EC: .4byte gBankTarget -_080144F0: .4byte gSharedMem -_080144F4: .4byte gBankAttacker -_080144F8: .4byte 0x00016010 -_080144FC: .4byte gAbsentBankFlags -_08014500: .4byte gBitTable -_08014504: - ldrb r0, [r6] - bl GetBankIdentity - movs r1, 0x1 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - strb r0, [r5] - ldrb r1, [r7] - ldrb r2, [r5] - lsls r0, r2, 2 - add r0, r8 - b _08014690 -_08014522: - ldr r4, _0801455C @ =gActiveBank - ldr r0, _08014560 @ =gTurnOrder - ldr r2, [sp] - adds r0, r2, r0 - ldrb r0, [r0] - strb r0, [r4] - ldrb r0, [r4] - ldr r2, _08014564 @ =gBattleMons - movs r1, 0x58 - muls r1, r0 - adds r1, r2 - adds r1, 0x20 - ldrb r1, [r1] - bl RecordAbilityBattle - ldr r2, _08014568 @ =gSpecialStatuses - ldrb r1, [r4] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r0] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] - ldr r1, _0801456C @ =gBankTarget - ldrb r0, [r4] - strb r0, [r1] - b _080146AC - .align 2, 0 -_0801455C: .4byte gActiveBank -_08014560: .4byte gTurnOrder -_08014564: .4byte gBattleMons -_08014568: .4byte gSpecialStatuses -_0801456C: .4byte gBankTarget -_08014570: - mov r4, r9 - ldrh r1, [r4] - movs r4, 0x1 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - beq _0801461C - ldr r2, _080145B4 @ =gBattleMoves - ldr r0, _080145B8 @ =gChosenMove - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r0, 0x6] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0801461C - ldrb r0, [r3] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080145C0 - bl Random - adds r1, r4, 0 - ands r1, r0 - cmp r1, 0 - beq _080145BC - movs r0, 0x1 - b _080145D2 - .align 2, 0 -_080145B4: .4byte gBattleMoves -_080145B8: .4byte gChosenMove -_080145BC: - movs r0, 0x3 - b _080145D2 -_080145C0: - bl Random - adds r1, r4, 0 - ands r1, r0 - cmp r1, 0 - beq _080145D0 - movs r0, 0 - b _080145D2 -_080145D0: - movs r0, 0x2 -_080145D2: - bl GetBankByIdentity - ldr r1, _0801460C @ =gBankTarget - strb r0, [r1] - ldr r0, _08014610 @ =gAbsentBankFlags - ldrb r1, [r0] - ldr r2, _08014614 @ =gBitTable - ldr r5, _0801460C @ =gBankTarget - ldrb r0, [r5] - lsls r0, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _080146AC - ldr r0, _08014618 @ =gBankAttacker - ldrb r0, [r0] - bl GetBankSide - adds r4, r0, 0 - ldrb r0, [r5] - bl GetBankSide - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - beq _080146AC - ldrb r0, [r5] - b _0801469A - .align 2, 0 -_0801460C: .4byte gBankTarget -_08014610: .4byte gAbsentBankFlags -_08014614: .4byte gBitTable -_08014618: .4byte gBankAttacker -_0801461C: - ldr r5, _08014660 @ =gBankTarget - ldr r1, _08014664 @ =gSharedMem - adds r2, r3, 0 - ldrb r0, [r2] - ldr r4, _08014668 @ =0x00016010 - adds r0, r4 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r5] - ldr r6, _0801466C @ =gAbsentBankFlags - ldrb r1, [r6] - ldr r7, _08014670 @ =gBitTable - ldrb r0, [r5] - lsls r0, 2 - adds r0, r7 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _080146AC - ldrb r0, [r2] - str r3, [sp, 0x4] - bl GetBankSide - adds r4, r0, 0 - ldrb r0, [r5] - bl GetBankSide - lsls r4, 24 - lsls r0, 24 - ldr r3, [sp, 0x4] - cmp r4, r0 - beq _08014674 - ldrb r0, [r5] - b _0801469A - .align 2, 0 -_08014660: .4byte gBankTarget -_08014664: .4byte gSharedMem -_08014668: .4byte 0x00016010 -_0801466C: .4byte gAbsentBankFlags -_08014670: .4byte gBitTable -_08014674: - ldrb r0, [r3] - bl GetBankIdentity - movs r1, 0x1 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - strb r0, [r5] - ldrb r1, [r6] - ldrb r2, [r5] - lsls r0, r2, 2 - adds r0, r7 -_08014690: - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _080146AC - adds r0, r2, 0 -_0801469A: - bl GetBankIdentity - movs r1, 0x2 - eors r0, r1 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - strb r0, [r5] -_080146AC: - ldr r4, _080146E0 @ =gBattlescriptCurrInstr - ldr r3, _080146E4 @ =gBattleScriptsForMoveEffects - ldr r2, _080146E8 @ =gBattleMoves - ldr r0, _080146EC @ =gCurrentMove - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r3 - ldr r0, [r0] - str r0, [r4] - ldr r1, _080146F0 @ =gCurrentActionFuncId - movs r0, 0xA -_080146CC: - strb r0, [r1] - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080146E0: .4byte gBattlescriptCurrInstr -_080146E4: .4byte gBattleScriptsForMoveEffects -_080146E8: .4byte gBattleMoves -_080146EC: .4byte gCurrentMove -_080146F0: .4byte gCurrentActionFuncId - thumb_func_end sub_8013FE8 - - thumb_func_start sub_80146F4 -sub_80146F4: @ 80146F4 - push {r4,lr} - ldr r3, _08014764 @ =gBankAttacker - ldr r1, _08014768 @ =gTurnOrder - ldr r0, _0801476C @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r3] - ldr r0, _08014770 @ =gUnknown_030042A4 - movs r2, 0 - strh r2, [r0] - ldr r0, _08014774 @ =gUnknown_030042A0 - strh r2, [r0] - ldr r1, _08014778 @ =gActionSelectionCursor - ldrb r0, [r3] - adds r0, r1 - strb r2, [r0] - ldr r1, _0801477C @ =gMoveSelectionCursor - ldrb r0, [r3] - adds r0, r1 - strb r2, [r0] - ldr r2, _08014780 @ =gBattleTextBuff1 - movs r0, 0xFD - strb r0, [r2] - movs r0, 0x7 - strb r0, [r2, 0x1] - ldrb r4, [r3] - strb r4, [r2, 0x2] - ldr r1, _08014784 @ =gSharedMem - ldrb r0, [r3] - ldr r3, _08014788 @ =0x00016064 - adds r0, r3 - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2, 0x3] - movs r0, 0xFF - strb r0, [r2, 0x4] - ldr r0, _0801478C @ =0x00016003 - adds r1, r0 - strb r4, [r1] - ldr r1, _08014790 @ =gBattlescriptCurrInstr - ldr r0, _08014794 @ =BattleScript_ActionSwitch - str r0, [r1] - ldr r1, _08014798 @ =gCurrentActionFuncId - movs r0, 0xA - strb r0, [r1] - ldr r1, _0801479C @ =gBattleResults - ldrb r0, [r1, 0x2] - cmp r0, 0xFE - bhi _0801475C - adds r0, 0x1 - strb r0, [r1, 0x2] -_0801475C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08014764: .4byte gBankAttacker -_08014768: .4byte gTurnOrder -_0801476C: .4byte gCurrentTurnActionNumber -_08014770: .4byte gUnknown_030042A4 -_08014774: .4byte gUnknown_030042A0 -_08014778: .4byte gActionSelectionCursor -_0801477C: .4byte gMoveSelectionCursor -_08014780: .4byte gBattleTextBuff1 -_08014784: .4byte gSharedMem -_08014788: .4byte 0x00016064 -_0801478C: .4byte 0x00016003 -_08014790: .4byte gBattlescriptCurrInstr -_08014794: .4byte BattleScript_ActionSwitch -_08014798: .4byte gCurrentActionFuncId -_0801479C: .4byte gBattleResults - thumb_func_end sub_80146F4 - - thumb_func_start sub_80147A0 -sub_80147A0: @ 80147A0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, _08014804 @ =gBankAttacker - ldr r2, _08014808 @ =gBankTarget - ldr r1, _0801480C @ =gTurnOrder - ldr r0, _08014810 @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - strb r0, [r4] - ldr r0, _08014814 @ =gUnknown_030042A4 - movs r2, 0 - strh r2, [r0] - ldr r0, _08014818 @ =gUnknown_030042A0 - strh r2, [r0] - ldr r3, _0801481C @ =gDisableStructs - ldrb r1, [r4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r3 - strb r2, [r0, 0x10] - ldr r5, _08014820 @ =gLastUsedItem - ldr r2, _08014824 @ =gBattleBufferB - ldrb r1, [r4] - lsls r1, 9 - adds r0, r2, 0x1 - adds r0, r1, r0 - ldrb r3, [r0] - adds r2, 0x2 - adds r1, r2 - ldrb r0, [r1] - lsls r0, 8 - orrs r3, r0 - strh r3, [r5] - cmp r3, 0xC - bhi _08014830 - ldr r2, _08014828 @ =gBattlescriptCurrInstr - ldr r1, _0801482C @ =gBattlescriptsForBallThrow - ldrh r0, [r5] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - str r0, [r2] - b _08014A8C - .align 2, 0 -_08014804: .4byte gBankAttacker -_08014808: .4byte gBankTarget -_0801480C: .4byte gTurnOrder -_08014810: .4byte gCurrentTurnActionNumber -_08014814: .4byte gUnknown_030042A4 -_08014818: .4byte gUnknown_030042A0 -_0801481C: .4byte gDisableStructs -_08014820: .4byte gLastUsedItem -_08014824: .4byte gBattleBufferB -_08014828: .4byte gBattlescriptCurrInstr -_0801482C: .4byte gBattlescriptsForBallThrow -_08014830: - adds r0, r3, 0 - subs r0, 0x50 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _0801484C - ldr r0, _08014844 @ =gBattlescriptCurrInstr - ldr r1, _08014848 @ =gBattlescriptsForRunningByItem - b _0801485C - .align 2, 0 -_08014844: .4byte gBattlescriptCurrInstr -_08014848: .4byte gBattlescriptsForRunningByItem -_0801484C: - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _0801486C - ldr r0, _08014864 @ =gBattlescriptCurrInstr - ldr r1, _08014868 @ =gBattlescriptsForUsingItem -_0801485C: - ldr r1, [r1] - str r1, [r0] - b _08014A8C - .align 2, 0 -_08014864: .4byte gBattlescriptCurrInstr -_08014868: .4byte gBattlescriptsForUsingItem -_0801486C: - ldr r2, _080148A0 @ =gSharedMem - ldrb r0, [r4] - ldr r3, _080148A4 @ =0x00016003 - adds r1, r2, r3 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 25 - ldr r1, _080148A8 @ =0x000160d8 - adds r0, r1 - adds r0, r2 - ldrb r0, [r0] - subs r0, 0x1 - mov r8, r4 - ldr r3, _080148AC @ =gBattlescriptCurrInstr - mov r9, r3 - ldr r1, _080148B0 @ =gBattlescriptsForUsingItem - mov r10, r1 - adds r7, r2, 0 - cmp r0, 0x4 - bls _08014896 - b _08014A74 -_08014896: - lsls r0, 2 - ldr r1, _080148B4 @ =_080148B8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080148A0: .4byte gSharedMem -_080148A4: .4byte 0x00016003 -_080148A8: .4byte 0x000160d8 -_080148AC: .4byte gBattlescriptCurrInstr -_080148B0: .4byte gBattlescriptsForUsingItem -_080148B4: .4byte _080148B8 - .align 2, 0 -_080148B8: - .4byte _08014A74 - .4byte _08014A74 - .4byte _080148CC - .4byte _08014958 - .4byte _08014A30 -_080148CC: - ldr r2, _08014904 @ =gBattleCommunication - movs r0, 0 - strb r0, [r2, 0x5] - ldr r1, _08014908 @ =gBankAttacker - ldrb r0, [r1] - lsrs r0, 1 - ldr r6, _0801490C @ =0x000160da - adds r0, r6 - adds r0, r7 - ldrb r3, [r0] - movs r0, 0x1 - ands r0, r3 - mov r8, r1 - cmp r0, 0 - beq _08014918 - movs r0, 0x3E - ands r0, r3 - ldr r3, _08014910 @ =gBattlescriptCurrInstr - mov r9, r3 - ldr r1, _08014914 @ =gBattlescriptsForUsingItem - mov r10, r1 - cmp r0, 0 - bne _080148FC - b _08014A74 -_080148FC: - movs r0, 0x5 - strb r0, [r2, 0x5] - b _08014A74 - .align 2, 0 -_08014904: .4byte gBattleCommunication -_08014908: .4byte gBankAttacker -_0801490C: .4byte 0x000160da -_08014910: .4byte gBattlescriptCurrInstr -_08014914: .4byte gBattlescriptsForUsingItem -_08014918: - ldr r3, _08014950 @ =gBattlescriptCurrInstr - mov r9, r3 - ldr r0, _08014954 @ =gBattlescriptsForUsingItem - mov r10, r0 - adds r5, r7, 0 - mov r4, r8 - adds r3, r6, 0 -_08014926: - ldrb r0, [r4] - lsrs r0, 1 - adds r0, r3 - adds r0, r5 - ldrb r1, [r0] - lsrs r1, 1 - strb r1, [r0] - ldrb r0, [r2, 0x5] - adds r0, 0x1 - strb r0, [r2, 0x5] - ldrb r0, [r4] - lsrs r0, 1 - adds r0, r3 - adds r0, r5 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08014926 - b _08014A74 - .align 2, 0 -_08014950: .4byte gBattlescriptCurrInstr -_08014954: .4byte gBattlescriptsForUsingItem -_08014958: - ldr r3, _0801498C @ =gBattleCommunication - movs r0, 0x4 - strb r0, [r3, 0x5] - ldr r2, _08014990 @ =gBankAttacker - ldrb r0, [r2] - lsrs r0, 1 - ldr r1, _08014994 @ =0x000160da - mov r12, r1 - add r0, r12 - adds r6, r0, r7 - ldrb r1, [r6] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r5, r0, 24 - mov r8, r2 - cmp r5, 0 - beq _080149A0 - movs r0, 0x5 - strb r0, [r3, 0x5] - ldr r2, _08014998 @ =gBattlescriptCurrInstr - mov r9, r2 - ldr r3, _0801499C @ =gBattlescriptsForUsingItem - mov r10, r3 - b _08014A74 - .align 2, 0 -_0801498C: .4byte gBattleCommunication -_08014990: .4byte gBankAttacker -_08014994: .4byte 0x000160da -_08014998: .4byte gBattlescriptCurrInstr -_0801499C: .4byte gBattlescriptsForUsingItem -_080149A0: - ldr r3, _08014A18 @ =gBattleTextBuff1 - movs r4, 0xFD - strb r4, [r3] - movs r0, 0x5 - strb r0, [r3, 0x1] - movs r2, 0x1 - strb r2, [r3, 0x2] - movs r0, 0xFF - strb r0, [r3, 0x3] - ldr r1, _08014A1C @ =gBattleTextBuff2 - strb r4, [r1] - strb r5, [r1, 0x1] - movs r0, 0xD2 - strb r0, [r1, 0x2] - strb r5, [r1, 0x3] - subs r0, 0xD3 - strb r0, [r1, 0x4] - ldrb r0, [r6] - ands r2, r0 - ldr r0, _08014A20 @ =gBattlescriptCurrInstr - mov r9, r0 - ldr r1, _08014A24 @ =gBattlescriptsForUsingItem - mov r10, r1 - adds r6, r3, 0 - cmp r2, 0 - bne _08014A02 - adds r3, r7, 0 - mov r5, r8 - mov r4, r12 - adds r2, r6, 0 -_080149DC: - ldrb r0, [r5] - lsrs r0, 1 - adds r0, r4 - adds r0, r3 - ldrb r1, [r0] - lsrs r1, 1 - strb r1, [r0] - ldrb r0, [r2, 0x2] - adds r0, 0x1 - strb r0, [r2, 0x2] - ldrb r0, [r5] - lsrs r0, 1 - adds r0, r4 - adds r0, r3 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080149DC -_08014A02: - ldrb r0, [r6, 0x2] - adds r0, 0xE - ldr r2, _08014A28 @ =0x000160a4 - adds r1, r7, r2 - movs r2, 0 - strb r0, [r1] - ldr r3, _08014A2C @ =0x000160a5 - adds r0, r7, r3 - strb r2, [r0] - b _08014A74 - .align 2, 0 -_08014A18: .4byte gBattleTextBuff1 -_08014A1C: .4byte gBattleTextBuff2 -_08014A20: .4byte gBattlescriptCurrInstr -_08014A24: .4byte gBattlescriptsForUsingItem -_08014A28: .4byte 0x000160a4 -_08014A2C: .4byte 0x000160a5 -_08014A30: - ldr r0, _08014A50 @ =gBattleTypeFlags - ldrh r0, [r0] - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _08014A64 - ldr r1, _08014A54 @ =gBattleCommunication - movs r0, 0x2 - strb r0, [r1, 0x5] - ldr r0, _08014A58 @ =gBankAttacker - mov r8, r0 - ldr r1, _08014A5C @ =gBattlescriptCurrInstr - mov r9, r1 - ldr r2, _08014A60 @ =gBattlescriptsForUsingItem - mov r10, r2 - b _08014A74 - .align 2, 0 -_08014A50: .4byte gBattleTypeFlags -_08014A54: .4byte gBattleCommunication -_08014A58: .4byte gBankAttacker -_08014A5C: .4byte gBattlescriptCurrInstr -_08014A60: .4byte gBattlescriptsForUsingItem -_08014A64: - ldr r0, _08014AA0 @ =gBattleCommunication - strb r1, [r0, 0x5] - ldr r3, _08014AA4 @ =gBankAttacker - mov r8, r3 - ldr r0, _08014AA8 @ =gBattlescriptCurrInstr - mov r9, r0 - ldr r1, _08014AAC @ =gBattlescriptsForUsingItem - mov r10, r1 -_08014A74: - mov r2, r8 - ldrb r0, [r2] - lsrs r0, 1 - ldr r3, _08014AB0 @ =0x000160d8 - adds r0, r3 - adds r0, r7 - ldrb r0, [r0] - lsls r0, 2 - add r0, r10 - ldr r0, [r0] - mov r1, r9 - str r0, [r1] -_08014A8C: - movs r0, 0xA - ldr r2, _08014AB4 @ =gCurrentActionFuncId - strb r0, [r2] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08014AA0: .4byte gBattleCommunication -_08014AA4: .4byte gBankAttacker -_08014AA8: .4byte gBattlescriptCurrInstr -_08014AAC: .4byte gBattlescriptsForUsingItem -_08014AB0: .4byte 0x000160d8 -_08014AB4: .4byte gCurrentActionFuncId - thumb_func_end sub_80147A0 - - thumb_func_start sub_8014AB8 -sub_8014AB8: @ 8014AB8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r5, 0 - ldr r1, _08014ADC @ =gBattleMons - movs r0, 0x58 - muls r0, r4 - adds r1, r0, r1 - ldrh r0, [r1, 0x2E] - cmp r0, 0xAF - bne _08014AE4 - ldr r1, _08014AE0 @ =gEnigmaBerries - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x7] - b _08014AEE - .align 2, 0 -_08014ADC: .4byte gBattleMons -_08014AE0: .4byte gEnigmaBerries -_08014AE4: - ldrh r0, [r1, 0x2E] - bl ItemId_GetHoldEffect - lsls r0, 24 - lsrs r1, r0, 24 -_08014AEE: - ldr r0, _08014B18 @ =gStringBank - strb r4, [r0] - cmp r1, 0x25 - bne _08014B28 - ldr r2, _08014B1C @ =gLastUsedItem - ldr r1, _08014B20 @ =gBattleMons - movs r0, 0x58 - muls r0, r4 - adds r0, r1 - ldrh r0, [r0, 0x2E] - strh r0, [r2] - ldr r0, _08014B24 @ =gProtectStructs - lsls r2, r4, 4 - adds r2, r0 - ldrb r1, [r2, 0x1] - movs r0, 0x19 - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - b _08014B50 - .align 2, 0 -_08014B18: .4byte gStringBank -_08014B1C: .4byte gLastUsedItem -_08014B20: .4byte gBattleMons -_08014B24: .4byte gProtectStructs -_08014B28: - ldr r6, _08014B5C @ =gBattleMons - movs r2, 0x58 - adds r0, r4, 0 - muls r0, r2 - adds r3, r0, r6 - adds r0, r3, 0 - adds r0, 0x20 - ldrb r1, [r0] - cmp r1, 0x32 - bne _08014B68 - ldr r0, _08014B60 @ =gLastUsedAbility - strb r1, [r0] - ldr r0, _08014B64 @ =gProtectStructs - lsls r2, r4, 4 - adds r2, r0 - ldrb r1, [r2, 0x1] - movs r0, 0x19 - negs r0, r0 - ands r0, r1 - movs r1, 0x10 -_08014B50: - orrs r0, r1 - strb r0, [r2, 0x1] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - b _08014BC2 - .align 2, 0 -_08014B5C: .4byte gBattleMons -_08014B60: .4byte gLastUsedAbility -_08014B64: .4byte gProtectStructs -_08014B68: - ldr r0, _08014BDC @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08014BB6 - movs r1, 0x1 - adds r0, r4, 0 - eors r0, r1 - muls r0, r2 - adds r2, r0, r6 - ldrh r0, [r3, 0x6] - ldrh r1, [r2, 0x6] - cmp r0, r1 - bcs _08014BB0 - lsls r0, 7 - ldrh r1, [r2, 0x6] - bl __divsi3 - adds r4, r0, 0 - ldr r0, _08014BE0 @ =gSharedMem - ldr r1, _08014BE4 @ =0x00016078 - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 1 - adds r4, r0 - lsls r4, 24 - lsrs r4, 24 - bl Random - movs r1, 0xFF - ands r1, r0 - cmp r4, r1 - bls _08014BB6 -_08014BB0: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_08014BB6: - ldr r1, _08014BE0 @ =gSharedMem - ldr r0, _08014BE4 @ =0x00016078 - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08014BC2: - cmp r5, 0 - beq _08014BD4 - ldr r1, _08014BE8 @ =gCurrentTurnActionNumber - ldr r0, _08014BEC @ =gNoOfAllBanks - ldrb r0, [r0] - strb r0, [r1] - ldr r1, _08014BF0 @ =gBattleOutcome - movs r0, 0x4 - strb r0, [r1] -_08014BD4: - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08014BDC: .4byte gBattleTypeFlags -_08014BE0: .4byte gSharedMem -_08014BE4: .4byte 0x00016078 -_08014BE8: .4byte gCurrentTurnActionNumber -_08014BEC: .4byte gNoOfAllBanks -_08014BF0: .4byte gBattleOutcome - thumb_func_end sub_8014AB8 - - thumb_func_start sub_8014BF4 -sub_8014BF4: @ 8014BF4 - push {r4-r6,lr} - ldr r4, _08014C44 @ =gBankAttacker - ldr r1, _08014C48 @ =gTurnOrder - ldr r5, _08014C4C @ =gCurrentTurnActionNumber - ldrb r0, [r5] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r4] - ldr r0, _08014C50 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08014C9C - ldr r0, _08014C54 @ =gNoOfAllBanks - ldrb r1, [r0] - strb r1, [r5] - ldr r2, _08014C58 @ =gActiveBank - movs r0, 0 - strb r0, [r2] - lsls r1, 24 - cmp r1, 0 - beq _08014C88 - adds r4, r2, 0 - ldr r6, _08014C5C @ =gActionForBanks - ldr r5, _08014C60 @ =gBattleOutcome -_08014C28: - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _08014C64 - ldrb r0, [r4] - adds r0, r6 - ldrb r0, [r0] - cmp r0, 0x3 - bne _08014C76 - ldrb r0, [r5] - movs r1, 0x2 - b _08014C72 - .align 2, 0 -_08014C44: .4byte gBankAttacker -_08014C48: .4byte gTurnOrder -_08014C4C: .4byte gCurrentTurnActionNumber -_08014C50: .4byte gBattleTypeFlags -_08014C54: .4byte gNoOfAllBanks -_08014C58: .4byte gActiveBank -_08014C5C: .4byte gActionForBanks -_08014C60: .4byte gBattleOutcome -_08014C64: - ldrb r0, [r4] - adds r0, r6 - ldrb r0, [r0] - cmp r0, 0x3 - bne _08014C76 - ldrb r0, [r5] - movs r1, 0x1 -_08014C72: - orrs r0, r1 - strb r0, [r5] -_08014C76: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - ldr r1, _08014C94 @ =gNoOfAllBanks - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r1] - cmp r0, r1 - bcc _08014C28 -_08014C88: - ldr r0, _08014C98 @ =gBattleOutcome - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - b _08014D40 - .align 2, 0 -_08014C94: .4byte gNoOfAllBanks -_08014C98: .4byte gBattleOutcome -_08014C9C: - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _08014CF4 - ldrb r0, [r4] - bl sub_8014AB8 - lsls r0, 24 - cmp r0, 0 - bne _08014D40 - ldr r1, _08014CDC @ =gBattleMons - ldrb r2, [r4] - movs r0, 0x58 - muls r2, r0 - adds r1, 0x50 - adds r2, r1 - ldr r0, [r2] - ldr r1, _08014CE0 @ =0xfdffffff - ands r0, r1 - str r0, [r2] - ldr r1, _08014CE4 @ =gBattleCommunication - movs r0, 0x3 - strb r0, [r1, 0x5] - ldr r1, _08014CE8 @ =gBattlescriptCurrInstr - ldr r0, _08014CEC @ =BattleScript_PrintFailedToRunString - str r0, [r1] - ldr r1, _08014CF0 @ =gCurrentActionFuncId - movs r0, 0xA - b _08014D3E - .align 2, 0 -_08014CDC: .4byte gBattleMons -_08014CE0: .4byte 0xfdffffff -_08014CE4: .4byte gBattleCommunication -_08014CE8: .4byte gBattlescriptCurrInstr -_08014CEC: .4byte BattleScript_PrintFailedToRunString -_08014CF0: .4byte gCurrentActionFuncId -_08014CF4: - ldr r1, _08014D1C @ =gBattleMons - ldrb r2, [r4] - movs r0, 0x58 - muls r0, r2 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - ldr r1, _08014D20 @ =0x0400e000 - ands r0, r1 - cmp r0, 0 - beq _08014D34 - ldr r1, _08014D24 @ =gBattleCommunication - movs r0, 0x4 - strb r0, [r1, 0x5] - ldr r1, _08014D28 @ =gBattlescriptCurrInstr - ldr r0, _08014D2C @ =BattleScript_PrintFailedToRunString - str r0, [r1] - ldr r1, _08014D30 @ =gCurrentActionFuncId - movs r0, 0xA - b _08014D3E - .align 2, 0 -_08014D1C: .4byte gBattleMons -_08014D20: .4byte 0x0400e000 -_08014D24: .4byte gBattleCommunication -_08014D28: .4byte gBattlescriptCurrInstr -_08014D2C: .4byte BattleScript_PrintFailedToRunString -_08014D30: .4byte gCurrentActionFuncId -_08014D34: - ldr r0, _08014D48 @ =gNoOfAllBanks - ldrb r0, [r0] - strb r0, [r5] - ldr r1, _08014D4C @ =gBattleOutcome - movs r0, 0x6 -_08014D3E: - strb r0, [r1] -_08014D40: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08014D48: .4byte gNoOfAllBanks -_08014D4C: .4byte gBattleOutcome - thumb_func_end sub_8014BF4 - - thumb_func_start sub_8014D50 -sub_8014D50: @ 8014D50 - ldr r2, _08014D78 @ =gBankAttacker - ldr r1, _08014D7C @ =gTurnOrder - ldr r0, _08014D80 @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - ldr r0, _08014D84 @ =gUnknown_030042A4 - movs r1, 0 - strh r1, [r0] - ldr r0, _08014D88 @ =gUnknown_030042A0 - strh r1, [r0] - ldr r1, _08014D8C @ =gBattlescriptCurrInstr - ldr r0, _08014D90 @ =gBattlescriptsForSafariActions - ldr r0, [r0] - str r0, [r1] - ldr r1, _08014D94 @ =gCurrentActionFuncId - movs r0, 0xA - strb r0, [r1] - bx lr - .align 2, 0 -_08014D78: .4byte gBankAttacker -_08014D7C: .4byte gTurnOrder -_08014D80: .4byte gCurrentTurnActionNumber -_08014D84: .4byte gUnknown_030042A4 -_08014D88: .4byte gUnknown_030042A0 -_08014D8C: .4byte gBattlescriptCurrInstr -_08014D90: .4byte gBattlescriptsForSafariActions -_08014D94: .4byte gCurrentActionFuncId - thumb_func_end sub_8014D50 - - thumb_func_start sub_8014D98 -sub_8014D98: @ 8014D98 - ldr r2, _08014DD0 @ =gBankAttacker - ldr r1, _08014DD4 @ =gTurnOrder - ldr r0, _08014DD8 @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - ldr r0, _08014DDC @ =gUnknown_030042A4 - movs r1, 0 - strh r1, [r0] - ldr r0, _08014DE0 @ =gUnknown_030042A0 - strh r1, [r0] - ldr r1, _08014DE4 @ =gNumSafariBalls - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - ldr r1, _08014DE8 @ =gLastUsedItem - movs r0, 0x5 - strh r0, [r1] - ldr r1, _08014DEC @ =gBattlescriptCurrInstr - ldr r0, _08014DF0 @ =gBattlescriptsForBallThrow - ldr r0, [r0, 0x14] - str r0, [r1] - ldr r1, _08014DF4 @ =gCurrentActionFuncId - movs r0, 0xA - strb r0, [r1] - bx lr - .align 2, 0 -_08014DD0: .4byte gBankAttacker -_08014DD4: .4byte gTurnOrder -_08014DD8: .4byte gCurrentTurnActionNumber -_08014DDC: .4byte gUnknown_030042A4 -_08014DE0: .4byte gUnknown_030042A0 -_08014DE4: .4byte gNumSafariBalls -_08014DE8: .4byte gLastUsedItem -_08014DEC: .4byte gBattlescriptCurrInstr -_08014DF0: .4byte gBattlescriptsForBallThrow -_08014DF4: .4byte gCurrentActionFuncId - thumb_func_end sub_8014D98 - - thumb_func_start sub_8014DF8 -sub_8014DF8: @ 8014DF8 - push {r4-r6,lr} - ldr r3, _08014E68 @ =gBankAttacker - ldr r1, _08014E6C @ =gTurnOrder - ldr r0, _08014E70 @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r3] - ldr r0, _08014E74 @ =gUnknown_030042A4 - movs r1, 0 - strh r1, [r0] - ldr r0, _08014E78 @ =gUnknown_030042A0 - strh r1, [r0] - ldr r6, _08014E7C @ =gBattleCommunication - ldr r2, _08014E80 @ =gBattleBufferB - ldrb r0, [r3] - lsls r0, 9 - adds r1, r2, 0x1 - adds r0, r1 - ldrb r0, [r0] - subs r0, 0x1 - strb r0, [r6, 0x5] - ldr r1, _08014E84 @ =gLastUsedItem - ldrb r0, [r3] - lsls r0, 9 - adds r2, 0x2 - adds r0, r2 - ldrb r0, [r0] - strh r0, [r1] - ldr r2, _08014E88 @ =gSharedMem - ldr r0, _08014E8C @ =0x00016087 - adds r1, r2, r0 - ldrb r0, [r1] - cmp r0, 0x2 - bhi _08014E42 - adds r0, 0x1 - strb r0, [r1] -_08014E42: - ldr r0, _08014E90 @ =0x00016088 - adds r4, r2, r0 - ldrb r5, [r4] - adds r3, r5, 0 - cmp r3, 0x1 - bls _08014E9C - ldr r2, _08014E94 @ =gUnknown_081FA70C - ldrb r1, [r1] - lsls r0, r1, 1 - adds r0, r1 - ldrb r6, [r6, 0x5] - adds r0, r6 - adds r0, r2 - ldrb r0, [r0] - cmp r3, r0 - bcs _08014E98 - movs r0, 0x1 - b _08014E9A - .align 2, 0 -_08014E68: .4byte gBankAttacker -_08014E6C: .4byte gTurnOrder -_08014E70: .4byte gCurrentTurnActionNumber -_08014E74: .4byte gUnknown_030042A4 -_08014E78: .4byte gUnknown_030042A0 -_08014E7C: .4byte gBattleCommunication -_08014E80: .4byte gBattleBufferB -_08014E84: .4byte gLastUsedItem -_08014E88: .4byte gSharedMem -_08014E8C: .4byte 0x00016087 -_08014E90: .4byte 0x00016088 -_08014E94: .4byte gUnknown_081FA70C -_08014E98: - subs r0, r5, r0 -_08014E9A: - strb r0, [r4] -_08014E9C: - ldr r1, _08014EB0 @ =gBattlescriptCurrInstr - ldr r0, _08014EB4 @ =gBattlescriptsForSafariActions - ldr r0, [r0, 0x8] - str r0, [r1] - ldr r1, _08014EB8 @ =gCurrentActionFuncId - movs r0, 0xA - strb r0, [r1] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08014EB0: .4byte gBattlescriptCurrInstr -_08014EB4: .4byte gBattlescriptsForSafariActions -_08014EB8: .4byte gCurrentActionFuncId - thumb_func_end sub_8014DF8 - - thumb_func_start sub_8014EBC -sub_8014EBC: @ 8014EBC - push {r4,r5,lr} - ldr r2, _08014F28 @ =gBankAttacker - ldr r1, _08014F2C @ =gTurnOrder - ldr r0, _08014F30 @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - ldr r0, _08014F34 @ =gUnknown_030042A4 - movs r5, 0 - strh r5, [r0] - ldr r0, _08014F38 @ =gUnknown_030042A0 - strh r5, [r0] - ldr r3, _08014F3C @ =gSharedMem - ldr r0, _08014F40 @ =0x00016089 - adds r2, r3, r0 - ldr r1, _08014F44 @ =gUnknown_081FA71B - subs r0, 0x3 - adds r4, r3, r0 - ldrb r0, [r4] - adds r0, r1 - ldrb r0, [r0] - ldrb r1, [r2] - adds r0, r1 - strb r0, [r2] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x14 - bls _08014EFA - movs r0, 0x14 - strb r0, [r2] -_08014EFA: - ldr r0, _08014F48 @ =0x00016088 - adds r2, r3, r0 - ldr r1, _08014F4C @ =gUnknown_081FA71F - ldrb r0, [r4] - adds r0, r1 - ldrb r0, [r0] - ldrb r1, [r2] - adds r0, r1 - strb r0, [r2] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x14 - bls _08014F18 - movs r0, 0x14 - strb r0, [r2] -_08014F18: - ldrb r0, [r4] - cmp r0, 0x2 - bhi _08014F54 - adds r0, 0x1 - strb r0, [r4] - ldr r0, _08014F50 @ =gBattleCommunication - strb r5, [r0, 0x5] - b _08014F5A - .align 2, 0 -_08014F28: .4byte gBankAttacker -_08014F2C: .4byte gTurnOrder -_08014F30: .4byte gCurrentTurnActionNumber -_08014F34: .4byte gUnknown_030042A4 -_08014F38: .4byte gUnknown_030042A0 -_08014F3C: .4byte gSharedMem -_08014F40: .4byte 0x00016089 -_08014F44: .4byte gUnknown_081FA71B -_08014F48: .4byte 0x00016088 -_08014F4C: .4byte gUnknown_081FA71F -_08014F50: .4byte gBattleCommunication -_08014F54: - ldr r1, _08014F70 @ =gBattleCommunication - movs r0, 0x1 - strb r0, [r1, 0x5] -_08014F5A: - ldr r1, _08014F74 @ =gBattlescriptCurrInstr - ldr r0, _08014F78 @ =gBattlescriptsForSafariActions - ldr r0, [r0, 0x4] - str r0, [r1] - ldr r1, _08014F7C @ =gCurrentActionFuncId - movs r0, 0xA - strb r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08014F70: .4byte gBattleCommunication -_08014F74: .4byte gBattlescriptCurrInstr -_08014F78: .4byte gBattlescriptsForSafariActions -_08014F7C: .4byte gCurrentActionFuncId - thumb_func_end sub_8014EBC - - thumb_func_start bs8_exit_by_flight -bs8_exit_by_flight: @ 8014F80 - push {r4,lr} - ldr r2, _08014FA8 @ =gBankAttacker - ldr r1, _08014FAC @ =gTurnOrder - ldr r4, _08014FB0 @ =gCurrentTurnActionNumber - ldrb r0, [r4] - adds r0, r1 - ldrb r0, [r0] - strb r0, [r2] - movs r0, 0x11 - bl PlaySE - ldr r0, _08014FB4 @ =gNoOfAllBanks - ldrb r0, [r0] - strb r0, [r4] - ldr r1, _08014FB8 @ =gBattleOutcome - movs r0, 0x4 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08014FA8: .4byte gBankAttacker -_08014FAC: .4byte gTurnOrder -_08014FB0: .4byte gCurrentTurnActionNumber -_08014FB4: .4byte gNoOfAllBanks -_08014FB8: .4byte gBattleOutcome - thumb_func_end bs8_exit_by_flight - - thumb_func_start sub_8014FBC -sub_8014FBC: @ 8014FBC - ldr r3, _08015008 @ =gBankAttacker - ldr r1, _0801500C @ =gTurnOrder - ldr r0, _08015010 @ =gCurrentTurnActionNumber - ldrb r0, [r0] - adds r0, r1 - ldrb r2, [r0] - strb r2, [r3] - ldr r0, _08015014 @ =gUnknown_030042A4 - movs r1, 0 - strh r1, [r0] - ldr r0, _08015018 @ =gUnknown_030042A0 - strh r1, [r0] - ldr r1, _0801501C @ =gBattleTextBuff1 - movs r0, 0xFD - strb r0, [r1] - movs r0, 0x7 - strb r0, [r1, 0x1] - strb r2, [r1, 0x2] - ldr r2, _08015020 @ =gBattlePartyID - ldrb r0, [r3] - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - strb r0, [r1, 0x3] - movs r0, 0xFF - strb r0, [r1, 0x4] - ldr r1, _08015024 @ =gBattlescriptCurrInstr - ldr r0, _08015028 @ =gBattlescriptsForSafariActions - ldr r0, [r0, 0xC] - str r0, [r1] - ldr r1, _0801502C @ =gCurrentActionFuncId - movs r0, 0xA - strb r0, [r1] - ldr r1, _08015030 @ =gUnknown_02024A76 - movs r0, 0xC - strb r0, [r1, 0x1] - bx lr - .align 2, 0 -_08015008: .4byte gBankAttacker -_0801500C: .4byte gTurnOrder -_08015010: .4byte gCurrentTurnActionNumber -_08015014: .4byte gUnknown_030042A4 -_08015018: .4byte gUnknown_030042A0 -_0801501C: .4byte gBattleTextBuff1 -_08015020: .4byte gBattlePartyID -_08015024: .4byte gBattlescriptCurrInstr -_08015028: .4byte gBattlescriptsForSafariActions -_0801502C: .4byte gCurrentActionFuncId -_08015030: .4byte gUnknown_02024A76 - thumb_func_end sub_8014FBC - - thumb_func_start bsB_exit_by_move -bsB_exit_by_move: @ 8015034 - push {lr} - bl sub_80173A4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _08015050 - ldr r0, _08015054 @ =gSharedMem - ldr r2, _08015058 @ =0x00016059 - adds r0, r2 - strb r1, [r0] - ldr r1, _0801505C @ =gCurrentActionFuncId - movs r0, 0xC - strb r0, [r1] -_08015050: - pop {r0} - bx r0 - .align 2, 0 -_08015054: .4byte gSharedMem -_08015058: .4byte 0x00016059 -_0801505C: .4byte gCurrentActionFuncId - thumb_func_end bsB_exit_by_move - - thumb_func_start sub_8015060 -sub_8015060: @ 8015060 - ldr r1, _08015080 @ =gCurrentTurnActionNumber - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r3, _08015084 @ =gCurrentActionFuncId - ldr r2, _08015088 @ =gUnknown_02024A76 - ldrb r0, [r1] - adds r0, r2 - ldrb r0, [r0] - strb r0, [r3] - ldr r2, _0801508C @ =gHitMarker - ldr r0, [r2] - ldr r1, _08015090 @ =0xf1e892af - ands r0, r1 - str r0, [r2] - bx lr - .align 2, 0 -_08015080: .4byte gCurrentTurnActionNumber -_08015084: .4byte gCurrentActionFuncId -_08015088: .4byte gUnknown_02024A76 -_0801508C: .4byte gHitMarker -_08015090: .4byte 0xf1e892af - thumb_func_end sub_8015060 - - thumb_func_start bsC_8016D70 -bsC_8016D70: @ 8015094 - push {r4,r5,lr} - ldr r1, _0801510C @ =gCurrentTurnActionNumber - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r3, _08015110 @ =gCurrentActionFuncId - ldr r2, _08015114 @ =gUnknown_02024A76 - ldrb r0, [r1] - adds r0, r2 - ldrb r0, [r0] - strb r0, [r3] - bl SpecialStatusesClear - ldr r2, _08015118 @ =gHitMarker - ldr r0, [r2] - ldr r1, _0801511C @ =0xf1e892af - ands r0, r1 - str r0, [r2] - ldr r0, _08015120 @ =gBattleMoveDamage - movs r4, 0 - str r4, [r0] - ldr r1, _08015124 @ =gSharedMem - ldr r2, _08015128 @ =0x00016002 - adds r0, r1, r2 - strb r4, [r0] - ldr r3, _0801512C @ =0x000160a1 - adds r0, r1, r3 - strb r4, [r0] - ldr r2, _08015130 @ =gMoveHitWith - ldr r5, _08015134 @ =gBankAttacker - ldrb r0, [r5] - lsls r0, 1 - adds r0, r2 - movs r2, 0 - strh r4, [r0] - ldr r3, _08015138 @ =gUnknown_02024C44 - ldrb r0, [r5] - lsls r0, 1 - adds r0, r3 - strh r4, [r0] - ldr r3, _0801513C @ =0x0001601c - adds r0, r1, r3 - strb r2, [r0] - ldr r0, _08015140 @ =gDynamicBasePower - strh r4, [r0] - subs r3, 0x10 - adds r0, r1, r3 - strb r2, [r0] - ldr r0, _08015144 @ =gBattleCommunication - strb r2, [r0, 0x3] - strb r2, [r0, 0x4] - ldr r3, _08015148 @ =0x00016112 - adds r0, r1, r3 - strb r2, [r0] - ldr r0, _0801514C @ =0x00017130 - adds r1, r0 - strb r2, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0801510C: .4byte gCurrentTurnActionNumber -_08015110: .4byte gCurrentActionFuncId -_08015114: .4byte gUnknown_02024A76 -_08015118: .4byte gHitMarker -_0801511C: .4byte 0xf1e892af -_08015120: .4byte gBattleMoveDamage -_08015124: .4byte gSharedMem -_08015128: .4byte 0x00016002 -_0801512C: .4byte 0x000160a1 -_08015130: .4byte gMoveHitWith -_08015134: .4byte gBankAttacker -_08015138: .4byte gUnknown_02024C44 -_0801513C: .4byte 0x0001601c -_08015140: .4byte gDynamicBasePower -_08015144: .4byte gBattleCommunication -_08015148: .4byte 0x00016112 -_0801514C: .4byte 0x00017130 - thumb_func_end bsC_8016D70 - thumb_func_start GetBattleBank GetBattleBank: @ 8015150 push {lr} diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 6bd98cc8a..608daba87 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -82,9 +82,9 @@ sub_80C2020: @ 80C2020 adds r1, r3, 0 orrs r0, r1 strh r0, [r5] - ldr r0, _080C2114 @ =gUnknown_030042A4 + ldr r0, _080C2114 @ =gBattle_BG0_X strh r2, [r0] - ldr r0, _080C2118 @ =gUnknown_030042A0 + ldr r0, _080C2118 @ =gBattle_BG0_Y strh r2, [r0] ldr r0, _080C211C @ =gBattle_BG1_X strh r2, [r0] @@ -119,8 +119,8 @@ _080C2104: .4byte 0x00003a03 _080C2108: .4byte REG_MOSAIC _080C210C: .4byte 0x00003f3f _080C2110: .4byte REG_WIN0H -_080C2114: .4byte gUnknown_030042A4 -_080C2118: .4byte gUnknown_030042A0 +_080C2114: .4byte gBattle_BG0_X +_080C2118: .4byte gBattle_BG0_Y _080C211C: .4byte gBattle_BG1_X _080C2120: .4byte gBattle_BG1_Y _080C2124: .4byte gBattle_BG2_X @@ -482,11 +482,11 @@ sub_80C2430: @ 80C2430 sub_80C2448: @ 80C2448 push {lr} ldr r1, _080C24C0 @ =REG_BG0HOFS - ldr r0, _080C24C4 @ =gUnknown_030042A4 + ldr r0, _080C24C4 @ =gBattle_BG0_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24C8 @ =gUnknown_030042A0 + ldr r0, _080C24C8 @ =gBattle_BG0_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 @@ -537,8 +537,8 @@ sub_80C2448: @ 80C2448 bx r0 .align 2, 0 _080C24C0: .4byte REG_BG0HOFS -_080C24C4: .4byte gUnknown_030042A4 -_080C24C8: .4byte gUnknown_030042A0 +_080C24C4: .4byte gBattle_BG0_X +_080C24C8: .4byte gBattle_BG0_Y _080C24CC: .4byte gBattle_BG1_X _080C24D0: .4byte gBattle_BG1_Y _080C24D4: .4byte gBattle_BG2_X diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3c255b461..41edcb514 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3065,7 +3065,7 @@ BattleScript_LocalBattleLost:: @ 81D8DD1 BattleScript_LocalBattleLostEnd: @ 81D8E01 end2 -gUnknown_081D8E02:: @ 81D8E02 +BattleScript_LinkBattleWonOrLost:: @ 81D8E02 printstring 5 waitmessage 64 atk57 @@ -3248,7 +3248,7 @@ BattleScript_DamagingWeatherContinues:: @ 81D8F7D setbyte gBattleCommunication, 0 BattleScript_DamagingWeatherLoop: @ 81D8F95 - copyarraywithindex gBankAttacker, gTurnOrder, gBattleCommunication, 1 + copyarraywithindex gBankAttacker, gBanksByTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement printfromtable gSandStormHailDmgStringIds diff --git a/data/data2a.s b/data/data2a.s index 3bd3f6ebd..bd455ce29 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -946,32 +946,32 @@ gSpriteAffineAnimTable_81F971C:: @ 81F971C .align 2 gUnknown_081FA640:: @ 81FA640 - .4byte sub_8013FE8 - .4byte sub_80147A0 - .4byte sub_80146F4 - .4byte sub_8014BF4 - .4byte sub_8014D50 - .4byte sub_8014D98 - .4byte sub_8014DF8 - .4byte sub_8014EBC - .4byte bs8_exit_by_flight - .4byte sub_8014FBC + .4byte HandleAction_UseMove + .4byte HandleAction_UseItem + .4byte HandleAction_Switch + .4byte HandleAction_Run + .4byte HandleAction_WatchesCarefully + .4byte HandleAction_SafariZoneBallThrow + .4byte HandleAction_ThrowPokeblock + .4byte HandleAction_GoNear + .4byte HandleAction_SafriZoneRun + .4byte HandleAction_Action9 .4byte sub_801B594 - .4byte bsB_exit_by_move - .4byte bsC_8016D70 - .4byte sub_8015060 + .4byte HandleAction_Action11 + .4byte HandleAction_ActionFinished + .4byte HandleAction_NothingIsFainted .align 2 gUnknown_081FA678:: @ 81FA678 .4byte bc_8013B1C .4byte HandleEndTurn_BattleWon - .4byte sub_8013B64 - .4byte sub_8013B64 - .4byte sub_8013BDC - .4byte sub_8013C9C - .4byte sub_8013C48 - .4byte sub_8013C9C - .4byte sub_8013C9C + .4byte HandleEndTurn_BattleLost + .4byte HandleEndTurn_BattleLost + .4byte HandleEndTurn_RanFromBattle + .4byte HandleEndTurn_FinishBattle + .4byte HandleEndTurn_MonFled + .4byte HandleEndTurn_FinishBattle + .4byte HandleEndTurn_FinishBattle gStatusConditionString_PoisonJpn:: @ 81FA69C .string "どく$$$$$$" diff --git a/include/battle.h b/include/battle.h index dd35cc303..4bcdfa6a9 100644 --- a/include/battle.h +++ b/include/battle.h @@ -227,10 +227,8 @@ struct BattleStruct /* 0x2000000 */ /*0x160D5*/ u8 unk160D5; /*0x160D6*/ u8 unk160D6; /*0x160D7*/ u8 unk160D7; - /*0x160D8*/ u8 unk160D8; - /*0x160D9*/ u8 unk160D9; - /*0x160DA*/ u8 unk160DA; - /*0x160DB*/ u8 unk160DB; + /*0x160D8*/ u8 unk160D8[2]; + /*0x160DA*/ u8 unk160DA[2]; /*0x160DC*/ u8 unk160DC; /*0x160DD*/ u8 intimidateBank; /*0x160DE*/ u8 unk160DE; @@ -606,7 +604,7 @@ void InitBattle(void); void sub_800EC9C(void); void sub_800F104(void); void sub_800F298(void); -void sub_800F808(void); +void BattleMainCB2(void); void sub_800F838(struct Sprite *); u8 CreateNPCTrainerParty(struct Pokemon *, u16); void sub_800FCFC(void); @@ -638,6 +636,9 @@ void sub_8011970(void); void sub_80119B4(void); void BattleBeginFirstTurn(void); void BattleTurnPassed(void); +void RunBattleScriptCommands_PopCallbacksStack(void); +void RunBattleScriptCommands(void); +bool8 TryRunFromBattle(u8 bank); // asm/battle_2.o void sub_8012324(void); @@ -654,14 +655,16 @@ u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check); u8 UpdateTurnCounters(void); u8 TurnBasedEffects(void); u8 sub_80170DC(); -u8 sub_80173A4(); +u8 HandleFaintedMonActions(); u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 move); u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn); void b_clear_atk_up_if_hit_flag_unless_enraged(void); +u8 GetMoveTarget(u16 move, u8 useMoveTarget); // asm/battle_4.o void AI_CalcDmg(u8, u8); u8 TypeCalc(u16 move, u8 bank_atk, u8 bank_def); +u8 BankGetTurnOrder(u8 bank); // asm/battle_5.o void nullsub_91(void); diff --git a/include/battle_ai.h b/include/battle_ai.h index 60ca5d000..c22ca8633 100644 --- a/include/battle_ai.h +++ b/include/battle_ai.h @@ -24,5 +24,6 @@ void sub_810745C(void); void AIStackPushVar(u8 *); u8 AIStackPop(void); void BattleAI_HandleItemUseBeforeAISetup(void); +void RecordAbilityBattle(u8 a, u8 b); #endif diff --git a/include/battle_message.h b/include/battle_message.h index 3e37a1ccd..9c27994ee 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -16,6 +16,143 @@ struct StringInfoBattle u8 textBuffs[3][0x10]; }; +// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3 + +#define B_BUFF_STRING 0 +#define B_BUFF_NUMBER 1 +#define B_BUFF_MOVE 2 +#define B_BUFF_TYPE 3 +#define B_BUFF_MON_NICK_WITH_PREFIX 4 +#define B_BUFF_STAT 5 +#define B_BUFF_SPECIES 6 +#define B_BUFF_MON_NICK 7 +#define B_BUFF_NEGATIVE_FLAVOR 8 +#define B_BUFF_ABILITY 9 +#define B_BUFF_ITEM 10 + +#define B_BUFF_PLACEHOLDER_BEGIN 0xFD +#define B_BUFF_EOS 0xFF + +#define PREPARE_FLAVOR_BUFFER(textVar, flavorId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_NEGATIVE_FLAVOR; \ + textVar[2] = flavorId; \ + textVar[3] = B_BUFF_EOS; \ +} + +#define PREPARE_STAT_BUFFER(textVar, statId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_STAT; \ + textVar[2] = statId; \ + textVar[3] = B_BUFF_EOS; \ +} + +#define PREPARE_ABILITY_BUFFER(textVar, abilityId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_ABILITY; \ + textVar[2] = abilityId; \ + textVar[3] = B_BUFF_EOS; \ +} + +#define PREPARE_TYPE_BUFFER(textVar, typeId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_TYPE; \ + textVar[2] = typeId; \ + textVar[3] = B_BUFF_EOS; \ +} + +#define PREPARE_BYTE_NUMBER_BUFFER(textVar, maxDigits, number) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_NUMBER; \ + textVar[2] = 1; \ + textVar[3] = maxDigits; \ + textVar[4] = (number); \ + textVar[5] = B_BUFF_EOS; \ +} + +#define PREPARE_HWORD_NUMBER_BUFFER(textVar, maxDigits, number) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_NUMBER; \ + textVar[2] = 2; \ + textVar[3] = maxDigits; \ + textVar[4] = (number); \ + textVar[5] = (number & 0x0000FF00) >> 8; \ + textVar[6] = B_BUFF_EOS; \ +} + +#define PREPARE_WORD_NUMBER_BUFFER(textVar, maxDigits, number) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_NUMBER; \ + textVar[2] = 4; \ + textVar[3] = maxDigits; \ + textVar[4] = (number); \ + textVar[5] = (number & 0x0000FF00) >> 8; \ + textVar[6] = (number & 0x00FF0000) >> 16; \ + textVar[7] = (number & 0xFF000000) >> 24; \ + textVar[8] = B_BUFF_EOS; \ +} + +#define PREPARE_STRING_BUFFER(textVar, stringId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_STRING; \ + textVar[2] = stringId; \ + textVar[3] = (stringId & 0xFF00) >> 8; \ + textVar[4] = B_BUFF_EOS; \ +} + +#define PREPARE_MOVE_BUFFER(textVar, move) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_MOVE; \ + textVar[2] = move; \ + textVar[3] = (move & 0xFF00) >> 8; \ + textVar[4] = B_BUFF_EOS; \ +} + +#define PREPARE_ITEM_BUFFER(textVar, item) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_ITEM; \ + textVar[2] = item; \ + textVar[3] = (item & 0xFF00) >> 8; \ + textVar[4] = B_BUFF_EOS; \ +} + +#define PREPARE_SPECIES_BUFFER(textVar, species) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_SPECIES; \ + textVar[2] = species; \ + textVar[3] = (species & 0xFF00) >> 8; \ + textVar[4] = B_BUFF_EOS; \ +} + +#define PREPARE_MON_NICK_WITH_PREFIX_BUFFER(textVar, bank, partyId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_MON_NICK_WITH_PREFIX; \ + textVar[2] = bank; \ + textVar[3] = partyId; \ + textVar[4] = B_BUFF_EOS; \ +} + +#define PREPARE_MON_NICK_BUFFER(textVar, bank, partyId) \ +{ \ + textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ + textVar[1] = B_BUFF_MON_NICK; \ + textVar[2] = bank; \ + textVar[3] = partyId; \ + textVar[4] = B_BUFF_EOS; \ +} + void BufferStringBattle(u16 stringID); u32 StrCpyDecodeToDisplayedStringBattle(const u8* src); u32 StrCpyDecodeBattle(const u8* src, u8* dst); diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h index 892b3e7f6..2b973b4d9 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle_constants.h @@ -1,6 +1,13 @@ #ifndef GUARD_CONSTANTS_BATTLE_CONSTANTS_H #define GUARD_CONSTANTS_BATTLE_CONSTANTS_H +// Bank sides +#define SIDE_PLAYER 0x0 +#define SIDE_OPPONENT 0x1 + +#define BIT_SIDE 0x1 +#define BIT_MON 0x2 + #define STATUS_SLEEP 0x7 #define STATUS_POISON 0x8 #define STATUS_BURN 0x10 @@ -76,6 +83,7 @@ #define HITMARKER_x800000 0x00800000 #define HITMARKER_GRUDGE 0x01000000 #define HITMARKER_OBEYS 0x02000000 +#define HITMARKER_x4000000 0x04000000 #define HITMARKER_x8000000 0x08000000 #define HITMARKER_FAINTED(bank) ((gBitTable[bank] << 0x1C)) #define HITMARKER_UNK(bank) ((0x10000000 << bank)) @@ -216,6 +224,27 @@ #define WEATHER_SUN_ANY ((WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)) #define WEATHER_HAIL (1 << 7) +#define MOVE_TARGET_SELECTED 0x0 +#define MOVE_TARGET_DEPENDS 0x1 +#define MOVE_TARGET_USER 0x2 +#define MOVE_TARGET_RANDOM 0x4 +#define MOVE_TARGET_x10 0x10 +#define MOVE_TARGET_BOTH 0x8 +#define MOVE_TARGET_FOES_AND_ALLY 0x20 +#define MOVE_TARGET_OPPONENTS_FIELD 0x40 + +// array entries for battle communication +#define MULTIUSE_STATE 0x0 +#define CURSOR_POSITION 0x1 +#define TASK_ID 0x1 // task Id and cursor position share the same field +#define SPRITES_INIT_STATE1 0x1 // shares the Id as well +#define SPRITES_INIT_STATE2 0x2 +#define MOVE_EFFECT_BYTE 0x3 +#define ACTIONS_CONFIRMED_COUNT 0x4 +#define MULTISTRING_CHOOSER 0x5 +#define MSG_DISPLAY 0x7 +#define BATTLE_COMMUNICATION_ENTRIES_COUNT 0x8 + // status animation table #define B_ANIM_STATUS_PSN 0x0 #define B_ANIM_STATUS_CONFUSION 0x1 @@ -262,4 +291,12 @@ #define B_ANIM_SUBSTITUTE_TO_MON 0x5 #define B_ANIM_MON_TO_SUBSTITUTE 0x6 +// AI switch items +#define AI_ITEM_FULL_RESTORE 1 +#define AI_ITEM_HEAL_HP 2 +#define AI_ITEM_CURE_CONDITION 3 +#define AI_ITEM_X_STAT 4 +#define AI_ITEM_GUARD_SPECS 5 +#define AI_ITEM_NOT_RECOGNIZABLE 6 + #endif // GUARD_CONSTANTS_BATTLE_CONSTANTS_H diff --git a/include/ewram.h b/include/ewram.h index d5e53393b..17ca3508a 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -134,6 +134,8 @@ extern u8 gSharedMem[]; #define ewram1608Carr(bank) (gSharedMem[0x1608C + bank]) #define EWRAM_1609D (gSharedMem[0x1609D]) #define ewram160A1 (gSharedMem[0x160A1]) +#define ewram160A4 (gSharedMem[0x160A4]) +#define ewram160A5 (gSharedMem[0x160A5]) #define ewram160A6 (gSharedMem[0x160A6]) #define ewram160A8 (gSharedMem[0x160A8]) #define ewram160A9 (gSharedMem[0x160A9]) @@ -156,9 +158,12 @@ extern u8 gSharedMem[]; #define USED_HELD_ITEM(bank) ((((u16*)(&gSharedMem[0x160CC + bank * 2])))) #define USED_HELD_ITEMS(bank) (*(u16 *)&gSharedMem[0x160CC + 2 * (bank)]) #define ewram160D4(bank) (gSharedMem[0x160D4 + (bank / 2) * 2]) +#define ewram160D8(bank) (gSharedMem[0x160D8 + (bank / 2)]) +#define ewram160DA(bank) (gSharedMem[0x160DA + (bank / 2)]) #define ewram160DD (gSharedMem[0x160DD]) #define ewram160E0(i) (gSharedMem[0x160E0 + i]) #define ewram160E6 (gSharedMem[0x160E6]) +#define ewram160E7 (gSharedMem[0x160E7]) #define CHOICED_MOVE(bank) (((u16*)(&gSharedMem[0x160E8 + bank * 2]))) #define ewram160E8 ((u8 *)(gSharedMem + 0x160E8)) #define ewram160E8arr(i) (gSharedMem[0x160E8 + i]) diff --git a/include/pokemon.h b/include/pokemon.h index b6c6e0030..71b35e65c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -363,6 +363,16 @@ enum STAT_STAGE_EVASION, // 7 }; +enum +{ + STAT_HP, // 0 + STAT_ATK, // 1 + STAT_DEF, // 2 + STAT_SPD, // 3 + STAT_SPATK, // 4 + STAT_SPDEF, // 5 +}; + struct BaseStats { /*0x00*/ u8 baseHP; @@ -613,6 +623,8 @@ bool8 IsPokeSpriteNotFlipped(u16); u8 GetLevelUpMovesBySpecies(u16, u16 *); u8 TryIncrementMonLevel(struct Pokemon *); bool8 IsShiny(struct Pokemon *mon); +void RandomlyGivePartyPokerus(struct Pokemon *party); +void PartySpreadPokerus(struct Pokemon *party); struct Sprite *sub_80F7920(u16, u16, const u16 *); diff --git a/include/roamer.h b/include/roamer.h index 9d5f3c4ed..86908bd00 100644 --- a/include/roamer.h +++ b/include/roamer.h @@ -7,5 +7,7 @@ void UpdateLocationHistoryForRoamer(void); void RoamerMoveToOtherLocationSet(void); void RoamerMove(); u8 TryStartRoamerEncounter(void); +void UpdateRoamerHPStatus(struct Pokemon *mon); +void SetRoamerInactive(void); #endif diff --git a/include/tv.h b/include/tv.h index 91b871f71..2edccb365 100644 --- a/include/tv.h +++ b/include/tv.h @@ -107,5 +107,6 @@ void UpdateTVShowsPerDay(u16); void sub_80C045C(); void sub_80BF088(u8, s32); void sub_80BFD20(void); +void PutPokemonTodayCaughtOnAir(void); #endif // GUARD_TV_H diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 92e9e3e1d..a30245081 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1,13 +1,17 @@ #include "global.h" #include "constants/abilities.h" #include "battle.h" +#include "battle_ai.h" #include "battle_interface.h" +#include "battle_message.h" #include "battle_setup.h" #include "data2.h" #include "event_data.h" +#include "evolution_scene.h" #include "item.h" #include "link.h" #include "main.h" +#include "m4a.h" #include "name_string_util.h" #include "palette.h" #include "party_menu.h" @@ -15,6 +19,7 @@ #include "pokedex.h" #include "pokemon.h" #include "random.h" +#include "roamer.h" #include "rom3.h" #include "rom_8077ABC.h" #include "rom_8094928.h" @@ -22,10 +27,12 @@ #include "sound.h" #include "constants/species.h" #include "sprite.h" +#include "string_util.h" #include "task.h" #include "text.h" #include "trainer.h" #include "trig.h" +#include "tv.h" #include "unknown_task.h" #include "util.h" #include "constants/battle_move_effects.h" @@ -60,7 +67,7 @@ extern const u16 gUnknown_08D004E0[]; extern const struct MonCoords gCastformFrontSpriteCoords[]; extern u8 gStatStageRatios[][2]; -extern u8 gUnknown_02024A76[4]; +extern u8 gActionsByTurnOrder[4]; extern struct UnknownPokemonStruct2 gUnknown_02023A00[]; extern u8 gBattleBufferB[][0x200]; extern u8 gActiveBank; @@ -68,7 +75,7 @@ extern u32 gBattleExecBuffer; extern u8 gNoOfAllBanks; extern u16 gBattlePartyID[]; extern u8 gCurrentActionFuncId; -extern u8 gTurnOrder[]; +extern u8 gBanksByTurnOrder[]; extern struct UnknownStruct12 gUnknown_02024AD0[]; extern u8 gObjectBankIDs[]; extern u16 gCurrentMove; @@ -82,7 +89,7 @@ extern u16 gLastUsedMove[]; extern u16 gMoveHitWith[]; extern u16 gUnknown_02024C44[]; extern u16 gUnknown_02024C4C[]; -extern u16 gLockedMove[]; +extern u16 gLockedMoves[]; extern u8 gUnknown_02024C5C[]; extern u16 gChosenMovesByBanks[]; extern u32 gHitMarker; @@ -112,8 +119,8 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_BG2_Y; extern u32 gUnknown_03004284; extern u16 gBattle_BG2_X; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u16 gBattle_WIN0H; extern MainCallback gPreBattleCallback1; @@ -140,10 +147,33 @@ extern u8 gCurrentTurnActionNumber; extern void (* const gUnknown_081FA640[])(void); extern void (* const gUnknown_081FA678[])(void); extern u8* gBattlescriptCurrInstr; -extern u8 gUnknown_081D8E02[]; +extern u8 BattleScript_LinkBattleWonOrLost[]; extern u8 BattleScript_PayDayMoneyAndPickUpItems[]; extern u8 gUnknown_081D8E0D[]; extern u8 BattleScript_LocalTrainerBattleWon[]; +extern u8 BattleScript_LocalBattleLost[]; +extern u8 BattleScript_GotAwaySafely[]; +extern u8 BattleScript_SmokeBallEscape[]; +extern u8 BattleScript_RanAwayUsingMonAbility[]; +extern u8 BattleScript_WildMonFled[]; +extern u8 BattleScript_ActionSwitch[]; +extern u8 BattleScript_PrintFailedToRunString[]; +extern const BattleCmdFunc gBattleScriptingCommandsTable[]; +extern u8 gCritMultiplier; +extern u8 gCurrMovePos; +extern u8 gUnknown_02024BE5; +extern u16 gChosenMove; +extern u8* gBattleScriptsForMoveEffects[]; +extern u16 gLastUsedItem; +extern u8 * const gBattlescriptsForBallThrow[]; +extern u8 * const gBattlescriptsForRunningByItem[]; +extern u8 * const gBattlescriptsForUsingItem[]; +extern u8 * const gBattlescriptsForSafariActions[]; +extern u8 gBattleTextBuff2[]; +extern u8 gNumSafariBalls; +extern u8 gUnknown_081FA70C[][3]; +extern u8 gUnknown_081FA71B[]; +extern u8 gUnknown_081FA71F[]; void b_call_bc_move_exec(const u8* BS_ptr); @@ -153,7 +183,11 @@ void SetActionsAndBanksTurnOrder(void); static void TurnValuesCleanUp(u8); void SpecialStatusesClear(void); static void RunTurnActionsFunctions(void); -void sub_8013C9C(); +void HandleEndTurn_FinishBattle(); +static void FreeResetData_ReturnToOvOrDoEvolutions(void); +void TryEvolvePokemon(void); +static void ReturnFromBattleToOverworld(void); +static void WaitForEvoSceneToFinish(void); void sub_800E7C4(void) { @@ -202,8 +236,8 @@ void InitBattle(void) sub_80895F8(gUnknown_081F9674); SetUpWindowConfig(&gWindowConfig_81E6C58); ResetPaletteFade(); - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -491,7 +525,7 @@ void sub_800EC9C(void) { gPreBattleCallback1 = gMain.callback1; gMain.callback1 = sub_8010824; - SetMainCallback2(sub_800F808); + SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { gTrainerBattleOpponent = 0x800; @@ -849,7 +883,7 @@ void sub_800F298(void) { gPreBattleCallback1 = gMain.callback1; gMain.callback1 = sub_8010824; - SetMainCallback2(sub_800F808); + SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { gTrainerBattleOpponent = 0x800; @@ -860,7 +894,7 @@ void sub_800F298(void) } } -void sub_800F808(void) +void BattleMainCB2(void) { AnimateSprites(); BuildOamBuffer(); @@ -1024,8 +1058,8 @@ void sub_800FCD4(void) void sub_800FCFC(void) { Random(); // unused return value - REG_BG0HOFS = gUnknown_030042A4; - REG_BG0VOFS = gUnknown_030042A0; + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; REG_BG1HOFS = gBattle_BG1_X; REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; @@ -1178,8 +1212,8 @@ void c2_8011A1C(void) } SetUpWindowConfig(&gWindowConfig_81E6C58); ResetPaletteFade(); - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -1549,7 +1583,7 @@ void sub_8010874(void) gUnknown_02024C44[i] = 0; gUnknown_02024C4C[i] = 0; gUnknown_02024C5C[i] = 0xFF; - gLockedMove[i] = 0; + gLockedMoves[i] = 0; gUnknown_02024C2C[i] = 0; eFlashFireArr.arr[i] = 0; } @@ -2098,12 +2132,12 @@ void BattleBeginFirstTurn(void) if (ewram16058 == 0) { for (i = 0; i < gNoOfAllBanks; i++) - gTurnOrder[i] = i; + gBanksByTurnOrder[i] = i; for (i = 0; i < gNoOfAllBanks - 1; i++) { for (j = i + 1; j < gNoOfAllBanks; j++) { - if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 1) != 0) + if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 1) != 0) SwapTurnOrder(i, j); } } @@ -2115,7 +2149,7 @@ void BattleBeginFirstTurn(void) } while (ewram16058 < gNoOfAllBanks) { - if (AbilityBattleEffects(0, gTurnOrder[ewram16058], 0, 0, 0) != 0) + if (AbilityBattleEffects(0, gBanksByTurnOrder[ewram16058], 0, 0, 0) != 0) r9++; ewram16058++; if (r9 != 0) @@ -2127,7 +2161,7 @@ void BattleBeginFirstTurn(void) return; while (ewram160F9 < gNoOfAllBanks) { - if (ItemBattleEffects(0, gTurnOrder[ewram160F9], 0) != 0) + if (ItemBattleEffects(0, gBanksByTurnOrder[ewram160F9], 0) != 0) r9++; ewram160F9++; if (r9 != 0) @@ -2199,7 +2233,7 @@ void BattleTurnPassed(void) if (TurnBasedEffects() != 0) return; } - if (sub_80173A4() != 0) + if (HandleFaintedMonActions() != 0) return; ewram16059 = 0; if (sub_80170DC() != 0) @@ -3861,13 +3895,13 @@ void SwapTurnOrder(u8 a, u8 b) { int temp; - temp = gUnknown_02024A76[a]; - gUnknown_02024A76[a] = gUnknown_02024A76[b]; - gUnknown_02024A76[b] = temp; + temp = gActionsByTurnOrder[a]; + gActionsByTurnOrder[a] = gActionsByTurnOrder[b]; + gActionsByTurnOrder[b] = temp; - temp = gTurnOrder[a]; - gTurnOrder[a] = gTurnOrder[b]; - gTurnOrder[b] = temp; + temp = gBanksByTurnOrder[a]; + gBanksByTurnOrder[a] = gBanksByTurnOrder[b]; + gBanksByTurnOrder[b] = temp; } // Determines which of the two given mons will strike first in a battle. @@ -4024,8 +4058,8 @@ void SetActionsAndBanksTurnOrder(void) { for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) { - gUnknown_02024A76[var] = gActionForBanks[gActiveBank]; - gTurnOrder[var] = gActiveBank; + gActionsByTurnOrder[var] = gActionForBanks[gActiveBank]; + gBanksByTurnOrder[var] = gActiveBank; var++; } } @@ -4053,15 +4087,15 @@ void SetActionsAndBanksTurnOrder(void) if (var == 5) { - gUnknown_02024A76[0] = gActionForBanks[gActiveBank]; - gTurnOrder[0] = gActiveBank; + gActionsByTurnOrder[0] = gActionForBanks[gActiveBank]; + gBanksByTurnOrder[0] = gActiveBank; var = 1; for (i = 0; i < gNoOfAllBanks; i++) { if (i != gActiveBank) { - gUnknown_02024A76[var] = gActionForBanks[i]; - gTurnOrder[var] = i; + gActionsByTurnOrder[var] = gActionForBanks[i]; + gBanksByTurnOrder[var] = i; var++; } } @@ -4075,8 +4109,8 @@ void SetActionsAndBanksTurnOrder(void) { if (gActionForBanks[gActiveBank] == ACTION_USE_ITEM || gActionForBanks[gActiveBank] == ACTION_SWITCH) { - gUnknown_02024A76[var] = gActionForBanks[gActiveBank]; - gTurnOrder[var] = gActiveBank; + gActionsByTurnOrder[var] = gActionForBanks[gActiveBank]; + gBanksByTurnOrder[var] = gActiveBank; var++; } } @@ -4084,8 +4118,8 @@ void SetActionsAndBanksTurnOrder(void) { if (gActionForBanks[gActiveBank] != ACTION_USE_ITEM && gActionForBanks[gActiveBank] != ACTION_SWITCH) { - gUnknown_02024A76[var] = gActionForBanks[gActiveBank]; - gTurnOrder[var] = gActiveBank; + gActionsByTurnOrder[var] = gActionForBanks[gActiveBank]; + gBanksByTurnOrder[var] = gActiveBank; var++; } } @@ -4093,12 +4127,12 @@ void SetActionsAndBanksTurnOrder(void) { for (j = i + 1; j < gNoOfAllBanks; j++) { - u8 bank1 = gTurnOrder[i]; - u8 bank2 = gTurnOrder[j]; - if (gUnknown_02024A76[i] != ACTION_USE_ITEM - && gUnknown_02024A76[j] != ACTION_USE_ITEM - && gUnknown_02024A76[i] != ACTION_SWITCH - && gUnknown_02024A76[j] != ACTION_SWITCH) + u8 bank1 = gBanksByTurnOrder[i]; + u8 bank2 = gBanksByTurnOrder[j]; + if (gActionsByTurnOrder[i] != ACTION_USE_ITEM + && gActionsByTurnOrder[j] != ACTION_USE_ITEM + && gActionsByTurnOrder[i] != ACTION_SWITCH + && gActionsByTurnOrder[j] != ACTION_SWITCH) { if (GetWhoStrikesFirst(bank1, bank2, FALSE)) SwapTurnOrder(i, j); @@ -4184,7 +4218,7 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) { // something stupid needed to match u8 zero; - gCurrentActionFuncId = gUnknown_02024A76[(zero = 0)]; + gCurrentActionFuncId = gActionsByTurnOrder[(zero = 0)]; } gDynamicBasePower = 0; @@ -4227,7 +4261,7 @@ void HandleEndTurn_BattleWon(void) { gBattleTextBuff1[0] = gBattleOutcome; gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1); - gBattlescriptCurrInstr = gUnknown_081D8E02; + gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost; gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN); } else if (gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)) @@ -4266,5 +4300,1091 @@ void HandleEndTurn_BattleWon(void) gBattlescriptCurrInstr = BattleScript_PayDayMoneyAndPickUpItems; } - gBattleMainFunc = sub_8013C9C; + gBattleMainFunc = HandleEndTurn_FinishBattle; +} + +void HandleEndTurn_BattleLost(void) +{ + gCurrentActionFuncId = 0; + + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gBattleTextBuff1[0] = gBattleOutcome; + gBankAttacker = GetBankByIdentity(IDENTITY_PLAYER_MON1); + gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost; + gBattleOutcome &= ~(OUTCOME_LINK_BATTLE_RUN); + } + else + { + gBattlescriptCurrInstr = BattleScript_LocalBattleLost; + } + + gBattleMainFunc = HandleEndTurn_FinishBattle; +} + +void HandleEndTurn_RanFromBattle(void) +{ + gCurrentActionFuncId = 0; + + switch (gProtectStructs[gBankAttacker].fleeFlag) + { + default: + gBattlescriptCurrInstr = BattleScript_GotAwaySafely; + break; + case 1: + gBattlescriptCurrInstr = BattleScript_SmokeBallEscape; + break; + case 2: + gBattlescriptCurrInstr = BattleScript_RanAwayUsingMonAbility; + break; + } + + gBattleMainFunc = HandleEndTurn_FinishBattle; +} + +void HandleEndTurn_MonFled(void) +{ + gCurrentActionFuncId = 0; + + PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker]); + gBattlescriptCurrInstr = BattleScript_WildMonFled; + + gBattleMainFunc = HandleEndTurn_FinishBattle; +} + +void HandleEndTurn_FinishBattle(void) +{ + if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC) + { + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK + | BATTLE_TYPE_FIRST_BATTLE + | BATTLE_TYPE_SAFARI + | BATTLE_TYPE_EREADER_TRAINER + | BATTLE_TYPE_WALLY_TUTORIAL + | BATTLE_TYPE_BATTLE_TOWER))) + { + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + if (GetBankSide(gActiveBank) == SIDE_PLAYER) + { + if (gBattleResults.poke1Species == SPECIES_NONE) + { + gBattleResults.poke1Species = gBattleMons[gActiveBank].species; + StringCopy(gBattleResults.pokeString1, gBattleMons[gActiveBank].nickname); + } + else + { + gBattleResults.opponentSpecies = gBattleMons[gActiveBank].species; + StringCopy(gBattleResults.pokeString2, gBattleMons[gActiveBank].nickname); + } + } + } + PutPokemonTodayCaughtOnAir(); + } + + BeginFastPaletteFade(3); + FadeOutMapMusic(5); + gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions; + gCB2_AfterEvolution = BattleMainCB2; + } + else + { + if (gBattleExecBuffer == 0) + gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]](); + } +} + +static void FreeResetData_ReturnToOvOrDoEvolutions(void) +{ + if (!gPaletteFade.active) + { + ResetSpriteData(); + if (gLeveledUpInBattle == 0 || gBattleOutcome != BATTLE_WON) + { + gBattleMainFunc = ReturnFromBattleToOverworld; + return; + } + else + { + gBattleMainFunc = TryEvolvePokemon; + } + } +} + +void TryEvolvePokemon(void) +{ + s32 i; + + while (gLeveledUpInBattle != 0) + { + for (i = 0; i < 6; i++) + { + if (gLeveledUpInBattle & gBitTable[i]) + { + u16 species; + u8 levelUpBits = gLeveledUpInBattle; + + levelUpBits &= ~(gBitTable[i]); + gLeveledUpInBattle = levelUpBits; + + species = GetEvolutionTargetSpecies(&gPlayerParty[i], 0, levelUpBits); + if (species != SPECIES_NONE) + { + gBattleMainFunc = WaitForEvoSceneToFinish; + EvolutionScene(&gPlayerParty[i], species, 0x81, i); + return; + } + } + } + } + + gBattleMainFunc = ReturnFromBattleToOverworld; +} + +static void WaitForEvoSceneToFinish(void) +{ + if (gMain.callback2 == BattleMainCB2) + gBattleMainFunc = TryEvolvePokemon; +} + +static void ReturnFromBattleToOverworld(void) +{ + if (!(gBattleTypeFlags & BATTLE_TYPE_LINK)) + { + RandomlyGivePartyPokerus(gPlayerParty); + PartySpreadPokerus(gPlayerParty); + } + + if (gBattleTypeFlags & BATTLE_TYPE_LINK && gReceivedRemoteLinkPlayers != 0) + return; + + gSpecialVar_Result = gBattleOutcome; + gMain.inBattle = 0; + gMain.callback1 = gPreBattleCallback1; + + if (gBattleTypeFlags & BATTLE_TYPE_ROAMER) + { + UpdateRoamerHPStatus(&gEnemyParty[0]); + if (gBattleOutcome == BATTLE_WON || gBattleOutcome == BATTLE_CAUGHT) + SetRoamerInactive(); + } + + m4aSongNumStop(0x5A); + SetMainCallback2(gMain.savedCallback); +} + +void RunBattleScriptCommands_PopCallbacksStack(void) +{ + if (gCurrentActionFuncId == 0xB || gCurrentActionFuncId == 0xC) + { + if (B_FUNCTION_STACK->size != 0) + B_FUNCTION_STACK->size--; + gBattleMainFunc = B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size]; + } + else + { + if (gBattleExecBuffer == 0) + gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]](); + } +} + +void RunBattleScriptCommands(void) +{ + if (gBattleExecBuffer == 0) + gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]](); +} + +void HandleAction_UseMove(void) +{ + u8 side; + u8 var = 4; + + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + + if (ewram160A6 & gBitTable[gBankAttacker]) + { + gCurrentActionFuncId = ACTION_FINISHED; + return; + } + + gCritMultiplier = 1; + eDmgMultiplier = 1; + ewram160E7 = 0; + gBattleMoveFlags = 0; + gMultiHitCounter = 0; + gBattleCommunication[6] = 0; + gCurrMovePos = gUnknown_02024BE5 = ewram1608Carr(gBankAttacker); + + // choose move + if (gProtectStructs[gBankAttacker].onlyStruggle) + { + gProtectStructs[gBankAttacker].onlyStruggle = 0; + gCurrentMove = gChosenMove = MOVE_STRUGGLE; + gHitMarker |= HITMARKER_NO_PPDEDUCT; + ewram16010arr(gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0); + } + else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE) + { + gCurrentMove = gChosenMove = gLockedMoves[gBankAttacker]; + } + // encore forces you to use the same move + else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE + && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos]) + { + gCurrentMove = gChosenMove = gDisableStructs[gBankAttacker].encoredMove; + gCurrMovePos = gUnknown_02024BE5 = gDisableStructs[gBankAttacker].encoredMovePos; + ewram16010arr(gBankAttacker) = GetMoveTarget(gCurrentMove, 0); + } + // check if the encored move wasn't overwritten + else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE + && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos]) + { + gCurrMovePos = gUnknown_02024BE5 = gDisableStructs[gBankAttacker].encoredMovePos; + gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos]; + gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE; + gDisableStructs[gBankAttacker].encoredMovePos = 0; + gDisableStructs[gBankAttacker].encoreTimer1 = 0; + ewram16010arr(gBankAttacker) = GetMoveTarget(gCurrentMove, 0); + } + else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker]) + { + gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos]; + ewram16010arr(gBankAttacker) = GetMoveTarget(gCurrentMove, 0); + } + else + { + gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos]; + } + + if (GetBankSide(gBankAttacker) == SIDE_PLAYER) + gBattleResults.lastUsedMove = gCurrentMove; + else + gBattleResults.opponentMove = gCurrentMove; + + // choose target + side = GetBankSide(gBankAttacker) ^ BIT_SIDE; + if (gSideTimers[side].followmeTimer != 0 + && gBattleMoves[gCurrentMove].target == MOVE_TARGET_SELECTED + && GetBankSide(gBankAttacker) != GetBankSide(gSideTimers[side].followmeTarget) + && gBattleMons[gSideTimers[side].followmeTarget].hp != 0) + { + gBankTarget = gSideTimers[side].followmeTarget; + } + else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + && gSideTimers[side].followmeTimer == 0 + && (gBattleMoves[gCurrentMove].power != 0 + || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10) + && gBattleMons[ewram16010arr(gBankAttacker)].ability != ABILITY_LIGHTNING_ROD + && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) + { + side = GetBankSide(gBankAttacker); + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + if (side != GetBankSide(gActiveBank) + && ewram16010arr(gBankAttacker) != gActiveBank + && gBattleMons[gActiveBank].ability == ABILITY_LIGHTNING_ROD + && BankGetTurnOrder(gActiveBank) < var) + { + var = BankGetTurnOrder(gActiveBank); + } + } + if (var == 4) + { + if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM) + { + if (GetBankSide(gBankAttacker) == SIDE_PLAYER) + { + if (Random() & 1) + gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1); + else + gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2); + } + else + { + if (Random() & 1) + gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1); + else + gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2); + } + } + else + { + gBankTarget = ewram16010arr(gBankAttacker); + } + + if (gAbsentBankFlags & gBitTable[gBankTarget]) + { + if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget)) + { + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON); + } + else + { + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE); + if (gAbsentBankFlags & gBitTable[gBankTarget]) + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON); + } + } + } + else + { + gActiveBank = gBanksByTurnOrder[var]; + RecordAbilityBattle(gActiveBank, gBattleMons[gActiveBank].ability); + gSpecialStatuses[gActiveBank].lightningRodRedirected = 1; + gBankTarget = gActiveBank; + } + } + else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE + && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM) + { + if (GetBankSide(gBankAttacker) == SIDE_PLAYER) + { + if (Random() & 1) + gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON1); + else + gBankTarget = GetBankByIdentity(IDENTITY_OPPONENT_MON2); + } + else + { + if (Random() & 1) + gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON1); + else + gBankTarget = GetBankByIdentity(IDENTITY_PLAYER_MON2); + } + + if (gAbsentBankFlags & gBitTable[gBankTarget] + && GetBankSide(gBankAttacker) != GetBankSide(gBankTarget)) + { + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON); + } + } + else + { + gBankTarget = ewram16010arr(gBankAttacker); + if (gAbsentBankFlags & gBitTable[gBankTarget]) + { + if (GetBankSide(gBankAttacker) != GetBankSide(gBankTarget)) + { + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON); + } + else + { + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ BIT_SIDE); + if (gAbsentBankFlags & gBitTable[gBankTarget]) + gBankTarget = GetBankByIdentity(GetBankIdentity(gBankTarget) ^ BIT_MON); + } + } + } + + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; +} + +void HandleAction_Switch(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + gActionSelectionCursor[gBankAttacker] = 0; + gMoveSelectionCursor[gBankAttacker] = 0; + + PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, ewram16064arr(gBankAttacker)) + + ewram16003 = gBankAttacker; + gBattlescriptCurrInstr = BattleScript_ActionSwitch; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; + + if (gBattleResults.unk2 < 255) + gBattleResults.unk2++; +} + +#ifdef NONMATCHING +void HandleAction_UseItem(void) +{ + gBankAttacker = gBankTarget = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + gDisableStructs[gBankAttacker].furyCutterCounter = 0; + gLastUsedItem = gBattleBufferB[gBankAttacker][1] | (gBattleBufferB[gBankAttacker][2] << 8); + + if (gLastUsedItem <= ITEM_PREMIER_BALL) // is ball + { + gBattlescriptCurrInstr = gBattlescriptsForBallThrow[gLastUsedItem]; + } + else if (gLastUsedItem == ITEM_POKE_DOLL || gLastUsedItem == ITEM_FLUFFY_TAIL) + { + gBattlescriptCurrInstr = gBattlescriptsForRunningByItem[0]; + } + else if (GetBankSide(gBankAttacker) == SIDE_PLAYER) + { + gBattlescriptCurrInstr = gBattlescriptsForUsingItem[0]; + } + else + { + ewram16003 = gBankAttacker; + + switch (ewram160D8(gBankAttacker)) + { + case AI_ITEM_FULL_RESTORE: + case AI_ITEM_HEAL_HP: + break; + case AI_ITEM_CURE_CONDITION: + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + if (ewram160DA(gBankAttacker) & 1) + { + if (ewram160DA(gBankAttacker) & 0x3E) + gBattleCommunication[MULTISTRING_CHOOSER] = 5; + } + else + { + while (!(ewram160DA(gBankAttacker) & 1)) + { + ewram160DA(gBankAttacker) /= 2; + gBattleCommunication[MULTISTRING_CHOOSER]++; + } + } + break; + case AI_ITEM_X_STAT: + gBattleCommunication[MULTISTRING_CHOOSER] = 4; + if (ewram160DA(gBankAttacker) & 0x80) + { + gBattleCommunication[MULTISTRING_CHOOSER] = 5; + } + else + { + PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK) + PREPARE_STRING_BUFFER(gBattleTextBuff2, 0xD2) + + while (!(ewram160DA(gBankAttacker) & 1)) + { + ewram160DA(gBankAttacker) /= 2; + gBattleTextBuff1[2]++; + } + + ewram160A4 = gBattleTextBuff1[2] + 14; + ewram160A5 = 0; + } + break; + case AI_ITEM_GUARD_SPECS: + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + gBattleCommunication[MULTISTRING_CHOOSER] = 2; + else + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + break; + } + + gBattlescriptCurrInstr = gBattlescriptsForUsingItem[ewram160D8(gBankAttacker)]; + } + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; +} +#else +__attribute__((naked)) +void HandleAction_UseItem(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + ldr r4, _08014804 @ =gBankAttacker\n\ + ldr r2, _08014808 @ =gBankTarget\n\ + ldr r1, _0801480C @ =gBanksByTurnOrder\n\ + ldr r0, _08014810 @ =gCurrentTurnActionNumber\n\ + ldrb r0, [r0]\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + strb r0, [r2]\n\ + strb r0, [r4]\n\ + ldr r0, _08014814 @ =gBattle_BG0_X\n\ + movs r2, 0\n\ + strh r2, [r0]\n\ + ldr r0, _08014818 @ =gBattle_BG0_Y\n\ + strh r2, [r0]\n\ + ldr r3, _0801481C @ =gDisableStructs\n\ + ldrb r1, [r4]\n\ + lsls r0, r1, 3\n\ + subs r0, r1\n\ + lsls r0, 2\n\ + adds r0, r3\n\ + strb r2, [r0, 0x10]\n\ + ldr r5, _08014820 @ =gLastUsedItem\n\ + ldr r2, _08014824 @ =gBattleBufferB\n\ + ldrb r1, [r4]\n\ + lsls r1, 9\n\ + adds r0, r2, 0x1\n\ + adds r0, r1, r0\n\ + ldrb r3, [r0]\n\ + adds r2, 0x2\n\ + adds r1, r2\n\ + ldrb r0, [r1]\n\ + lsls r0, 8\n\ + orrs r3, r0\n\ + strh r3, [r5]\n\ + cmp r3, 0xC\n\ + bhi _08014830\n\ + ldr r2, _08014828 @ =gBattlescriptCurrInstr\n\ + ldr r1, _0801482C @ =gBattlescriptsForBallThrow\n\ + ldrh r0, [r5]\n\ + lsls r0, 2\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + str r0, [r2]\n\ + b _08014A8C\n\ + .align 2, 0\n\ +_08014804: .4byte gBankAttacker\n\ +_08014808: .4byte gBankTarget\n\ +_0801480C: .4byte gBanksByTurnOrder\n\ +_08014810: .4byte gCurrentTurnActionNumber\n\ +_08014814: .4byte gBattle_BG0_X\n\ +_08014818: .4byte gBattle_BG0_Y\n\ +_0801481C: .4byte gDisableStructs\n\ +_08014820: .4byte gLastUsedItem\n\ +_08014824: .4byte gBattleBufferB\n\ +_08014828: .4byte gBattlescriptCurrInstr\n\ +_0801482C: .4byte gBattlescriptsForBallThrow\n\ +_08014830:\n\ + adds r0, r3, 0\n\ + subs r0, 0x50\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + cmp r0, 0x1\n\ + bhi _0801484C\n\ + ldr r0, _08014844 @ =gBattlescriptCurrInstr\n\ + ldr r1, _08014848 @ =gBattlescriptsForRunningByItem\n\ + b _0801485C\n\ + .align 2, 0\n\ +_08014844: .4byte gBattlescriptCurrInstr\n\ +_08014848: .4byte gBattlescriptsForRunningByItem\n\ +_0801484C:\n\ + ldrb r0, [r4]\n\ + bl GetBankSide\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _0801486C\n\ + ldr r0, _08014864 @ =gBattlescriptCurrInstr\n\ + ldr r1, _08014868 @ =gBattlescriptsForUsingItem\n\ +_0801485C:\n\ + ldr r1, [r1]\n\ + str r1, [r0]\n\ + b _08014A8C\n\ + .align 2, 0\n\ +_08014864: .4byte gBattlescriptCurrInstr\n\ +_08014868: .4byte gBattlescriptsForUsingItem\n\ +_0801486C:\n\ + ldr r2, _080148A0 @ =gSharedMem\n\ + ldrb r0, [r4]\n\ + ldr r3, _080148A4 @ =0x00016003\n\ + adds r1, r2, r3\n\ + strb r0, [r1]\n\ + lsls r0, 24\n\ + lsrs r0, 25\n\ + ldr r1, _080148A8 @ =0x000160d8\n\ + adds r0, r1\n\ + adds r0, r2\n\ + ldrb r0, [r0]\n\ + subs r0, 0x1\n\ + mov r8, r4\n\ + ldr r3, _080148AC @ =gBattlescriptCurrInstr\n\ + mov r9, r3\n\ + ldr r1, _080148B0 @ =gBattlescriptsForUsingItem\n\ + mov r10, r1\n\ + adds r7, r2, 0\n\ + cmp r0, 0x4\n\ + bls _08014896\n\ + b _08014A74\n\ +_08014896:\n\ + lsls r0, 2\n\ + ldr r1, _080148B4 @ =_080148B8\n\ + adds r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ + .align 2, 0\n\ +_080148A0: .4byte gSharedMem\n\ +_080148A4: .4byte 0x00016003\n\ +_080148A8: .4byte 0x000160d8\n\ +_080148AC: .4byte gBattlescriptCurrInstr\n\ +_080148B0: .4byte gBattlescriptsForUsingItem\n\ +_080148B4: .4byte _080148B8\n\ + .align 2, 0\n\ +_080148B8:\n\ + .4byte _08014A74\n\ + .4byte _08014A74\n\ + .4byte _080148CC\n\ + .4byte _08014958\n\ + .4byte _08014A30\n\ +_080148CC:\n\ + ldr r2, _08014904 @ =gBattleCommunication\n\ + movs r0, 0\n\ + strb r0, [r2, 0x5]\n\ + ldr r1, _08014908 @ =gBankAttacker\n\ + ldrb r0, [r1]\n\ + lsrs r0, 1\n\ + ldr r6, _0801490C @ =0x000160da\n\ + adds r0, r6\n\ + adds r0, r7\n\ + ldrb r3, [r0]\n\ + movs r0, 0x1\n\ + ands r0, r3\n\ + mov r8, r1\n\ + cmp r0, 0\n\ + beq _08014918\n\ + movs r0, 0x3E\n\ + ands r0, r3\n\ + ldr r3, _08014910 @ =gBattlescriptCurrInstr\n\ + mov r9, r3\n\ + ldr r1, _08014914 @ =gBattlescriptsForUsingItem\n\ + mov r10, r1\n\ + cmp r0, 0\n\ + bne _080148FC\n\ + b _08014A74\n\ +_080148FC:\n\ + movs r0, 0x5\n\ + strb r0, [r2, 0x5]\n\ + b _08014A74\n\ + .align 2, 0\n\ +_08014904: .4byte gBattleCommunication\n\ +_08014908: .4byte gBankAttacker\n\ +_0801490C: .4byte 0x000160da\n\ +_08014910: .4byte gBattlescriptCurrInstr\n\ +_08014914: .4byte gBattlescriptsForUsingItem\n\ +_08014918:\n\ + ldr r3, _08014950 @ =gBattlescriptCurrInstr\n\ + mov r9, r3\n\ + ldr r0, _08014954 @ =gBattlescriptsForUsingItem\n\ + mov r10, r0\n\ + adds r5, r7, 0\n\ + mov r4, r8\n\ + adds r3, r6, 0\n\ +_08014926:\n\ + ldrb r0, [r4]\n\ + lsrs r0, 1\n\ + adds r0, r3\n\ + adds r0, r5\n\ + ldrb r1, [r0]\n\ + lsrs r1, 1\n\ + strb r1, [r0]\n\ + ldrb r0, [r2, 0x5]\n\ + adds r0, 0x1\n\ + strb r0, [r2, 0x5]\n\ + ldrb r0, [r4]\n\ + lsrs r0, 1\n\ + adds r0, r3\n\ + adds r0, r5\n\ + ldrb r1, [r0]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _08014926\n\ + b _08014A74\n\ + .align 2, 0\n\ +_08014950: .4byte gBattlescriptCurrInstr\n\ +_08014954: .4byte gBattlescriptsForUsingItem\n\ +_08014958:\n\ + ldr r3, _0801498C @ =gBattleCommunication\n\ + movs r0, 0x4\n\ + strb r0, [r3, 0x5]\n\ + ldr r2, _08014990 @ =gBankAttacker\n\ + ldrb r0, [r2]\n\ + lsrs r0, 1\n\ + ldr r1, _08014994 @ =0x000160da\n\ + mov r12, r1\n\ + add r0, r12\n\ + adds r6, r0, r7\n\ + ldrb r1, [r6]\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + mov r8, r2\n\ + cmp r5, 0\n\ + beq _080149A0\n\ + movs r0, 0x5\n\ + strb r0, [r3, 0x5]\n\ + ldr r2, _08014998 @ =gBattlescriptCurrInstr\n\ + mov r9, r2\n\ + ldr r3, _0801499C @ =gBattlescriptsForUsingItem\n\ + mov r10, r3\n\ + b _08014A74\n\ + .align 2, 0\n\ +_0801498C: .4byte gBattleCommunication\n\ +_08014990: .4byte gBankAttacker\n\ +_08014994: .4byte 0x000160da\n\ +_08014998: .4byte gBattlescriptCurrInstr\n\ +_0801499C: .4byte gBattlescriptsForUsingItem\n\ +_080149A0:\n\ + ldr r3, _08014A18 @ =gBattleTextBuff1\n\ + movs r4, 0xFD\n\ + strb r4, [r3]\n\ + movs r0, 0x5\n\ + strb r0, [r3, 0x1]\n\ + movs r2, 0x1\n\ + strb r2, [r3, 0x2]\n\ + movs r0, 0xFF\n\ + strb r0, [r3, 0x3]\n\ + ldr r1, _08014A1C @ =gBattleTextBuff2\n\ + strb r4, [r1]\n\ + strb r5, [r1, 0x1]\n\ + movs r0, 0xD2\n\ + strb r0, [r1, 0x2]\n\ + strb r5, [r1, 0x3]\n\ + subs r0, 0xD3\n\ + strb r0, [r1, 0x4]\n\ + ldrb r0, [r6]\n\ + ands r2, r0\n\ + ldr r0, _08014A20 @ =gBattlescriptCurrInstr\n\ + mov r9, r0\n\ + ldr r1, _08014A24 @ =gBattlescriptsForUsingItem\n\ + mov r10, r1\n\ + adds r6, r3, 0\n\ + cmp r2, 0\n\ + bne _08014A02\n\ + adds r3, r7, 0\n\ + mov r5, r8\n\ + mov r4, r12\n\ + adds r2, r6, 0\n\ +_080149DC:\n\ + ldrb r0, [r5]\n\ + lsrs r0, 1\n\ + adds r0, r4\n\ + adds r0, r3\n\ + ldrb r1, [r0]\n\ + lsrs r1, 1\n\ + strb r1, [r0]\n\ + ldrb r0, [r2, 0x2]\n\ + adds r0, 0x1\n\ + strb r0, [r2, 0x2]\n\ + ldrb r0, [r5]\n\ + lsrs r0, 1\n\ + adds r0, r4\n\ + adds r0, r3\n\ + ldrb r1, [r0]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _080149DC\n\ +_08014A02:\n\ + ldrb r0, [r6, 0x2]\n\ + adds r0, 0xE\n\ + ldr r2, _08014A28 @ =0x000160a4\n\ + adds r1, r7, r2\n\ + movs r2, 0\n\ + strb r0, [r1]\n\ + ldr r3, _08014A2C @ =0x000160a5\n\ + adds r0, r7, r3\n\ + strb r2, [r0]\n\ + b _08014A74\n\ + .align 2, 0\n\ +_08014A18: .4byte gBattleTextBuff1\n\ +_08014A1C: .4byte gBattleTextBuff2\n\ +_08014A20: .4byte gBattlescriptCurrInstr\n\ +_08014A24: .4byte gBattlescriptsForUsingItem\n\ +_08014A28: .4byte 0x000160a4\n\ +_08014A2C: .4byte 0x000160a5\n\ +_08014A30:\n\ + ldr r0, _08014A50 @ =gBattleTypeFlags\n\ + ldrh r0, [r0]\n\ + movs r1, 0x1\n\ + ands r1, r0\n\ + cmp r1, 0\n\ + beq _08014A64\n\ + ldr r1, _08014A54 @ =gBattleCommunication\n\ + movs r0, 0x2\n\ + strb r0, [r1, 0x5]\n\ + ldr r0, _08014A58 @ =gBankAttacker\n\ + mov r8, r0\n\ + ldr r1, _08014A5C @ =gBattlescriptCurrInstr\n\ + mov r9, r1\n\ + ldr r2, _08014A60 @ =gBattlescriptsForUsingItem\n\ + mov r10, r2\n\ + b _08014A74\n\ + .align 2, 0\n\ +_08014A50: .4byte gBattleTypeFlags\n\ +_08014A54: .4byte gBattleCommunication\n\ +_08014A58: .4byte gBankAttacker\n\ +_08014A5C: .4byte gBattlescriptCurrInstr\n\ +_08014A60: .4byte gBattlescriptsForUsingItem\n\ +_08014A64:\n\ + ldr r0, _08014AA0 @ =gBattleCommunication\n\ + strb r1, [r0, 0x5]\n\ + ldr r3, _08014AA4 @ =gBankAttacker\n\ + mov r8, r3\n\ + ldr r0, _08014AA8 @ =gBattlescriptCurrInstr\n\ + mov r9, r0\n\ + ldr r1, _08014AAC @ =gBattlescriptsForUsingItem\n\ + mov r10, r1\n\ +_08014A74:\n\ + mov r2, r8\n\ + ldrb r0, [r2]\n\ + lsrs r0, 1\n\ + ldr r3, _08014AB0 @ =0x000160d8\n\ + adds r0, r3\n\ + adds r0, r7\n\ + ldrb r0, [r0]\n\ + lsls r0, 2\n\ + add r0, r10\n\ + ldr r0, [r0]\n\ + mov r1, r9\n\ + str r0, [r1]\n\ +_08014A8C:\n\ + movs r0, 0xA\n\ + ldr r2, _08014AB4 @ =gCurrentActionFuncId\n\ + strb r0, [r2]\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_08014AA0: .4byte gBattleCommunication\n\ +_08014AA4: .4byte gBankAttacker\n\ +_08014AA8: .4byte gBattlescriptCurrInstr\n\ +_08014AAC: .4byte gBattlescriptsForUsingItem\n\ +_08014AB0: .4byte 0x000160d8\n\ +_08014AB4: .4byte gCurrentActionFuncId\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +bool8 TryRunFromBattle(u8 bank) +{ + bool8 effect = FALSE; + u8 holdEffect; + u8 speedVar; + + if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY) + holdEffect = gEnigmaBerries[bank].holdEffect; + else + holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item); + + gStringBank = bank; + + if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN) + { + gLastUsedItem = gBattleMons[bank].item ; + gProtectStructs[bank].fleeFlag = 1; + effect++; + } + else if (gBattleMons[bank].ability == ABILITY_RUN_AWAY) + { + gLastUsedAbility = ABILITY_RUN_AWAY; + gProtectStructs[bank].fleeFlag = 2; + effect++; + } + else + { + if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) + { + if (gBattleMons[bank].speed < gBattleMons[bank ^ BIT_SIDE].speed) + { + speedVar = (gBattleMons[bank].speed * 128) / (gBattleMons[bank ^ BIT_SIDE].speed) + (ewram16078 * 30); + if (speedVar > (Random() & 0xFF)) + effect++; + } + else // same speed or faster + { + effect++; + } + } + + ewram16078++; + } + + if (effect) + { + gCurrentTurnActionNumber = gNoOfAllBanks; + gBattleOutcome = BATTLE_RAN; + } + + return effect; +} + +void HandleAction_Run(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gCurrentTurnActionNumber = gNoOfAllBanks; + + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + { + if (GetBankSide(gActiveBank) == SIDE_PLAYER) + { + if (gActionForBanks[gActiveBank] == ACTION_RUN) + gBattleOutcome |= BATTLE_LOST; + } + else + { + if (gActionForBanks[gActiveBank] == ACTION_RUN) + gBattleOutcome |= BATTLE_WON; + } + } + + gBattleOutcome |= OUTCOME_LINK_BATTLE_RUN; + } + else + { + if (GetBankSide(gBankAttacker) == SIDE_PLAYER) + { + if (!TryRunFromBattle(gBankAttacker)) // failed to run away + { + gBattleMons[gBankAttacker].status2 &= ~STATUS2_DESTINY_BOND; + gBattleCommunication[MULTISTRING_CHOOSER] = 3; + gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; + } + } + else + { + if (gBattleMons[gBankAttacker].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) + { + gBattleCommunication[MULTISTRING_CHOOSER] = 4; + gBattlescriptCurrInstr = BattleScript_PrintFailedToRunString; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; + } + else + { + gCurrentTurnActionNumber = gNoOfAllBanks; + gBattleOutcome = BATTLE_POKE_FLED; + } + } + } +} + +void HandleAction_WatchesCarefully(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + gBattlescriptCurrInstr = gBattlescriptsForSafariActions[0]; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; +} + +void HandleAction_SafariZoneBallThrow(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + gNumSafariBalls--; + gLastUsedItem = ITEM_SAFARI_BALL; + gBattlescriptCurrInstr = gBattlescriptsForBallThrow[ITEM_SAFARI_BALL]; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; +} + +void HandleAction_ThrowPokeblock(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBankAttacker][1] - 1; + gLastUsedItem = gBattleBufferB[gBankAttacker][2]; + + if (ewram16087 < 3) + ewram16087++; + if (ewram16088 > 1) + { + if (ewram16088 < gUnknown_081FA70C[ewram16087][gBattleCommunication[MULTISTRING_CHOOSER]]) + ewram16088 = 1; + else + ewram16088 -= gUnknown_081FA70C[ewram16087][gBattleCommunication[MULTISTRING_CHOOSER]]; + } + + gBattlescriptCurrInstr = gBattlescriptsForSafariActions[2]; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; +} + +void HandleAction_GoNear(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + + ewram16089 += gUnknown_081FA71B[ewram16086]; + if (ewram16089 > 20) + ewram16089 = 20; + + ewram16088 += gUnknown_081FA71F[ewram16086]; + if (ewram16088 > 20) + ewram16088 = 20; + + if (ewram16086 < 3) + { + ewram16086++; + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + } + else + { + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + } + gBattlescriptCurrInstr = gBattlescriptsForSafariActions[1]; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; +} + +void HandleAction_SafriZoneRun(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + PlaySE(SE_NIGERU); + gCurrentTurnActionNumber = gNoOfAllBanks; + gBattleOutcome = BATTLE_RAN; +} + +void HandleAction_Action9(void) +{ + gBankAttacker = gBanksByTurnOrder[gCurrentTurnActionNumber]; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + + PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBankAttacker, gBattlePartyID[gBankAttacker]) + + gBattlescriptCurrInstr = gBattlescriptsForSafariActions[3]; + gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT; + gActionsByTurnOrder[1] = ACTION_FINISHED; +} + +void HandleAction_Action11(void) +{ + if (!HandleFaintedMonActions()) + { + ewram16059 = 0; + gCurrentActionFuncId = ACTION_FINISHED; + } +} + +void HandleAction_NothingIsFainted(void) +{ + gCurrentTurnActionNumber++; + gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; + gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED + | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR + | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000 + | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT + | HITMARKER_x8000000 | HITMARKER_x4000000); +} + +void HandleAction_ActionFinished(void) +{ + gCurrentTurnActionNumber++; + gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; + SpecialStatusesClear(); + gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED + | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR + | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000 + | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT + | HITMARKER_x8000000 | HITMARKER_x4000000); + + gBattleMoveDamage = 0; + ewram16002 = 0; + ewram160A1 = 0; + gMoveHitWith[gBankAttacker] = 0; + gUnknown_02024C44[gBankAttacker] = 0; + eDynamicMoveType = 0; + gDynamicBasePower = 0; + ewram1600C = 0; + gBattleCommunication[3] = 0; + gBattleCommunication[4] = 0; + eMultihitMoveEffect = 0; + ewram17130 = 0; } diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index cfa188fa4..92e0404cc 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -33,7 +33,7 @@ extern u8 gNoOfAllBanks; extern u32 gStatuses3[4]; extern u8 gBankAttacker; extern u8 gBankTarget; -extern u8 gTurnOrder[4]; +extern u8 gBanksByTurnOrder[4]; extern u16 gSideAffecting[2]; extern u16 gBattleWeather; extern void (*gBattleMainFunc)(void); @@ -87,8 +87,6 @@ u8 weather_get_current(void); void b_push_move_exec(u8* BS_ptr); void RecordAbilityBattle(u8 bank, u8 ability); void RecordItemBattle(u8 bank, u8 holdEffect); -void sub_8013F54(void); -void sub_8013FBC(void); s8 GetPokeFlavourRelation(u32 pid, u8 flavor); extern u8 BattleScript_MoveSelectionDisabledMove[]; @@ -372,14 +370,14 @@ u8 UpdateTurnCounters(void) case 0: for (i = 0; i < gNoOfAllBanks; i++) { - gTurnOrder[i] = i; + gBanksByTurnOrder[i] = i; } for (i = 0; i < gNoOfAllBanks - 1; i++) { s32 j; for (j = i + 1; j < gNoOfAllBanks; j++) { - if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 0)) + if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0)) SwapTurnOrder(i, j); } } @@ -496,7 +494,7 @@ u8 UpdateTurnCounters(void) case 5: while (BATTLE_STRUCT->turnSideTracker < gNoOfAllBanks) { - gActiveBank = gTurnOrder[BATTLE_STRUCT->turnSideTracker]; + gActiveBank = gBanksByTurnOrder[BATTLE_STRUCT->turnSideTracker]; if (gWishFutureKnock.wishCounter[gActiveBank] && --gWishFutureKnock.wishCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp) { gBankTarget = gActiveBank; @@ -606,7 +604,7 @@ u8 TurnBasedEffects(void) gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); while (BATTLE_STRUCT->turnEffectsBank < gNoOfAllBanks && BATTLE_STRUCT->turnEffectsTracker <= TURNBASED_MAX_CASE) { - gActiveBank = gBankAttacker = gTurnOrder[BATTLE_STRUCT->turnEffectsBank]; + gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->turnEffectsBank]; if (gAbsentBankFlags & gBitTable[gActiveBank]) { BATTLE_STRUCT->turnEffectsBank++; @@ -948,7 +946,7 @@ bool8 sub_80170DC(void) // handle future sight and perish song case 1: // perish song while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks) { - gActiveBank = gBankAttacker = gTurnOrder[BATTLE_STRUCT->sub80170DC_Bank]; + gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->sub80170DC_Bank]; if (gAbsentBankFlags & gBitTable[gActiveBank]) BATTLE_STRUCT->sub80170DC_Bank++; else @@ -984,9 +982,9 @@ bool8 sub_80170DC(void) // handle future sight and perish song return 0; } -#define sub_80173A4_MAX_CASE 7 +#define HandleFaintedMonActions_MAX_CASE 7 -bool8 sub_80173A4(void) +bool8 HandleFaintedMonActions(void) { if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) return 0; @@ -1053,7 +1051,7 @@ bool8 sub_80173A4(void) case 7: break; } - } while (BATTLE_STRUCT->sub80173A4_Tracker != sub_80173A4_MAX_CASE); + } while (BATTLE_STRUCT->sub80173A4_Tracker != HandleFaintedMonActions_MAX_CASE); return 0; } @@ -2255,7 +2253,7 @@ void b_call_bc_move_exec(u8* BS_ptr) { gBattlescriptCurrInstr = BS_ptr; B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; - gBattleMainFunc = sub_8013F54; + gBattleMainFunc = RunBattleScriptCommands_PopCallbacksStack; gCurrentActionFuncId = 0; } @@ -2264,7 +2262,7 @@ void b_push_move_exec(u8* BS_ptr) b_movescr_stack_push_cursor(); gBattlescriptCurrInstr = BS_ptr; B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; - gBattleMainFunc = sub_8013FBC; + gBattleMainFunc = RunBattleScriptCommands; } enum diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index d9789f76d..3b1092e45 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -35,8 +35,8 @@ extern u8 gActiveBank; extern u32 gBattleExecBuffer; extern u8 gNoOfAllBanks; extern u16 gBattlePartyID[4]; -extern u8 gTurnOrder[4]; -extern u8 gUnknown_02024A76[4]; +extern u8 gBanksByTurnOrder[4]; +extern u8 gActionsByTurnOrder[4]; extern u16 gCurrentMove; extern u8 gLastUsedAbility; extern u16 gBattleWeather; @@ -45,7 +45,7 @@ extern u8 gEffectBank; extern u8 gAbsentBankFlags; extern u8 gMultiHitCounter; extern u16 gLastUsedMove[4]; -extern u16 gLockedMove[4]; +extern u16 gLockedMoves[4]; extern u16 gChosenMovesByBanks[4]; extern u16 gSideAffecting[2]; extern u16 gPauseCounterBattle; @@ -145,10 +145,9 @@ bool32 IsHMMove2(u16 move); void sub_802BBD4(u8 r0, u8 r1, u8 r2, u8 r3, u8 sp0); void nullsub_6(void); void ReshowBattleScreenAfterMenu(void); -void sub_800F808(void); +void BattleMainCB2(void); void AddMoney(u32* moneySaveblock, u32 to_give); void sub_80156DC(void); //set sentpokes value -bool8 sub_8014AB8(u8 bank); //can run from battle u8 CountAliveMons(u8 caseID); void sub_803E1B0(struct Pokemon*, u16 item, u8 partyID, u8 r3, u8 sp); u8 CanRunFromBattle(void); @@ -1074,11 +1073,11 @@ static void atk00_attackcanceler(void) } for (i = 0; i < gNoOfAllBanks; i++) { - if ((gProtectStructs[gTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) + if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) { - PressurePPLose(gBankAttacker, gTurnOrder[i], MOVE_SNATCH); - gProtectStructs[gTurnOrder[i]].stealMove = 0; - BATTLE_STRUCT->scriptingActive = gTurnOrder[i]; + PressurePPLose(gBankAttacker, gBanksByTurnOrder[i], MOVE_SNATCH); + gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0; + BATTLE_STRUCT->scriptingActive = gBanksByTurnOrder[i]; b_movescr_stack_push_cursor(); gBattlescriptCurrInstr = BattleScript_SnatchedMove; return; @@ -2253,7 +2252,7 @@ u8 BankGetTurnOrder(u8 bank) int i; for (i = 0; i < gNoOfAllBanks; i++) { - if (gTurnOrder[i] == bank) + if (gBanksByTurnOrder[i] == bank) break; } return i; @@ -2527,7 +2526,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (gBattleMons[gEffectBank].status2 & STATUS2_UPROAR) {gBattlescriptCurrInstr++; return;} gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS; - gLockedMove[gEffectBank] = gCurrentMove; + gLockedMoves[gEffectBank] = gCurrentMove; gBattleMons[gEffectBank].status2 |= ((Random() & 3) + 2) << 4; b_movescr_stack_push(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; @@ -2551,7 +2550,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) break; case 12: //charging move gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS; - gLockedMove[gEffectBank] = gCurrentMove; + gLockedMoves[gEffectBank] = gCurrentMove; gProtectStructs[gEffectBank].chargingTurn = 1; gBattlescriptCurrInstr++; break; @@ -2619,7 +2618,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) case 29: //recharge gBattleMons[gEffectBank].status2 |= STATUS2_RECHARGE; gDisableStructs[gEffectBank].rechargeCounter = 2; - gLockedMove[gEffectBank] = gCurrentMove; + gLockedMoves[gEffectBank] = gCurrentMove; gBattlescriptCurrInstr++; break; case 30: //rage @@ -2711,7 +2710,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (!(gBattleMons[gEffectBank].status2 & STATUS2_LOCK_CONFUSE)) { gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS; - gLockedMove[gEffectBank] = gCurrentMove; + gLockedMoves[gEffectBank] = gCurrentMove; gBattleMons[gEffectBank].status2 |= (((Random() & 1) + 2) << 0xA); } else @@ -3909,7 +3908,7 @@ _0801ED7C:\n\ lsls r0, 5\n\ orrs r1, r0\n\ str r1, [r2]\n\ - ldr r1, _0801EDC8 @ =gLockedMove\n\ + ldr r1, _0801EDC8 @ =gLockedMoves\n\ ldrb r0, [r3]\n\ lsls r0, 1\n\ adds r0, r1\n\ @@ -3941,7 +3940,7 @@ _0801ED7C:\n\ ldr r0, [r0]\n\ bl _0801F5F8\n\ .align 2, 0\n\ -_0801EDC8: .4byte gLockedMove\n\ +_0801EDC8: .4byte gLockedMoves\n\ _0801EDCC: .4byte gCurrentMove\n\ _0801EDD0: .4byte gBattlescriptCurrInstr\n\ _0801EDD4: .4byte gMoveEffectBS_Ptrs\n\ @@ -4035,7 +4034,7 @@ _0801EE84:\n\ lsls r1, 5\n\ orrs r0, r1\n\ str r0, [r2]\n\ - ldr r1, _0801EEC0 @ =gLockedMove\n\ + ldr r1, _0801EEC0 @ =gLockedMoves\n\ mov r2, r8\n\ ldrb r0, [r2]\n\ lsls r0, 1\n\ @@ -4053,7 +4052,7 @@ _0801EE84:\n\ strb r0, [r1, 0x1]\n\ b _0801F5DC\n\ .align 2, 0\n\ -_0801EEC0: .4byte gLockedMove\n\ +_0801EEC0: .4byte gLockedMoves\n\ _0801EEC4: .4byte gCurrentMove\n\ _0801EEC8: .4byte gProtectStructs\n\ _0801EECC:\n\ @@ -4365,7 +4364,7 @@ _0801F13C:\n\ adds r0, r2\n\ movs r1, 0x2\n\ strb r1, [r0, 0x19]\n\ - ldr r1, _0801F17C @ =gLockedMove\n\ + ldr r1, _0801F17C @ =gLockedMoves\n\ ldrb r0, [r3]\n\ lsls r0, 1\n\ adds r0, r1\n\ @@ -4375,7 +4374,7 @@ _0801F13C:\n\ b _0801F5DC\n\ .align 2, 0\n\ _0801F178: .4byte gDisableStructs\n\ -_0801F17C: .4byte gLockedMove\n\ +_0801F17C: .4byte gLockedMoves\n\ _0801F180: .4byte gCurrentMove\n\ _0801F184:\n\ ldr r0, _0801F1A0 @ =gBankAttacker\n\ @@ -4764,7 +4763,7 @@ _0801F4C4:\n\ lsls r0, 5\n\ orrs r1, r0\n\ str r1, [r2]\n\ - ldr r1, _0801F4F8 @ =gLockedMove\n\ + ldr r1, _0801F4F8 @ =gLockedMoves\n\ ldrb r0, [r3]\n\ lsls r0, 1\n\ adds r0, r1\n\ @@ -4787,7 +4786,7 @@ _0801F4F2:\n\ str r0, [r2]\n\ b _0801F5FA\n\ .align 2, 0\n\ -_0801F4F8: .4byte gLockedMove\n\ +_0801F4F8: .4byte gLockedMoves\n\ _0801F4FC: .4byte gCurrentMove\n\ _0801F500:\n\ mov r5, r8\n\ @@ -10660,8 +10659,8 @@ static void atk52_switchineffects(void) for (i = 0; i < gNoOfAllBanks; i++) { - if (gTurnOrder[i] == gActiveBank) - gUnknown_02024A76[i] = 0xC; + if (gBanksByTurnOrder[i] == gActiveBank) + gActionsByTurnOrder[i] = 0xC; } for (i = 0; i < gNoOfAllBanks; i++) @@ -10838,7 +10837,7 @@ static void atk5A_yesnoboxlearnmove(void) } break; case 3: - if (!gPaletteFade.active && gMain.callback2 == sub_800F808) + if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2) { u8 move_pos = sub_809FA30(); if (move_pos == 4) @@ -11404,7 +11403,7 @@ static void atk68_cancelallactions(void) int i; for (i = 0; i < gNoOfAllBanks; i++) { - gUnknown_02024A76[i] = 0xC; + gActionsByTurnOrder[i] = 0xC; } gBattlescriptCurrInstr++; } @@ -11943,7 +11942,7 @@ static void atk71_buffermovetolearn(void) static void atk72_jumpifplayerran(void) { - if (sub_8014AB8(gBank1)) + if (TryRunFromBattle(gBank1)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else gBattlescriptCurrInstr += 5; @@ -13251,7 +13250,7 @@ static void atk8A_normalisebuffs(void) //haze static void atk8B_setbide(void) { gBattleMons[gBankAttacker].status2 |= STATUS2_MULTIPLETURNS; - gLockedMove[gBankAttacker] = gCurrentMove; + gLockedMoves[gBankAttacker] = gCurrentMove; gTakenDmg[gBankAttacker] = 0; gBattleMons[gBankAttacker].status2 |= (STATUS2_BIDE - 0x100); //2 turns gBattlescriptCurrInstr++; @@ -15075,7 +15074,7 @@ static void atkB3_rolloutdamagecalculation(void) gDisableStructs[gBankAttacker].rolloutTimer1 = 5; gDisableStructs[gBankAttacker].rolloutTimer2 = 5; gBattleMons[gBankAttacker].status2 |= STATUS2_MULTIPLETURNS; - gLockedMove[gBankAttacker] = gCurrentMove; + gLockedMoves[gBankAttacker] = gCurrentMove; } if (--gDisableStructs[gBankAttacker].rolloutTimer1 == 0) gBattleMons[gBankAttacker].status2 &= ~(STATUS2_MULTIPLETURNS); @@ -15252,8 +15251,8 @@ static void atkBA_jumpifnopursuitswitchdmg(void) int i; for (i = 0; i < gNoOfAllBanks; i++) { - if (gTurnOrder[i] == gBankTarget) - gUnknown_02024A76[i] = 11; + if (gBanksByTurnOrder[i] == gBankTarget) + gActionsByTurnOrder[i] = 11; } gCurrentMove = MOVE_PURSUIT; gBattlescriptCurrInstr += 5; @@ -17014,7 +17013,7 @@ static void atkEC_pursuitrelated(void) gActiveBank = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]) && gActionForBanks[gActiveBank] == 0 && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT) { - gUnknown_02024A76[gActiveBank] = 11; + gActionsByTurnOrder[gActiveBank] = 11; gCurrentMove = MOVE_PURSUIT; gBattlescriptCurrInstr += 5; BATTLE_STRUCT->animTurn = 1; @@ -17230,7 +17229,7 @@ static void atkF2_displaydexinfo(void) } break; case 2: - if (!gPaletteFade.active && gMain.callback2 == sub_800F808 && !gTasks[gBattleCommunication[1]].isActive) + if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2 && !gTasks[gBattleCommunication[1]].isActive) { LZDecompressVram(gBattleTerrainTiles_Building, (void*)(0x06008000)); LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(0x0600d000)); @@ -17394,12 +17393,12 @@ static void atkF3_trygivecaughtmonnick(void) if (!gPaletteFade.active) { GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, BATTLE_STRUCT->caughtNick); - DoNamingScreen(2, BATTLE_STRUCT->caughtNick, GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_SPECIES), GetMonGender(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]), GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_PERSONALITY, 0), sub_800F808); + DoNamingScreen(2, BATTLE_STRUCT->caughtNick, GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_SPECIES), GetMonGender(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]), GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_PERSONALITY, 0), BattleMainCB2); gBattleCommunication[0]++; } break; case 3: - if (gMain.callback2 == sub_800F808 && !gPaletteFade.active ) + if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active ) { SetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, BATTLE_STRUCT->caughtNick); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 35d8f33c8..54181bc21 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -48,8 +48,8 @@ extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u8 gUnknown_0300434C[]; extern u32 gBattleExecBuffer; extern MainCallback gPreBattleCallback1; @@ -1410,8 +1410,8 @@ void sub_8039B64(void) void LinkOpponentHandlePrintString(void) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_8037C2C; diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index adc3c1c85..2c78d4a82 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -48,8 +48,8 @@ extern u8 gAnimFriendship; extern u16 gWeatherMoveAnim; extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern MainCallback gPreBattleCallback1; extern void (*gBattleBankFunc[])(void); extern u8 gHealthboxIDs[]; @@ -1355,8 +1355,8 @@ void sub_811FF30(void) void LinkPartnerHandlePrintString(void) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_811DFA0; diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index 477b600ac..ab7b6944b 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -50,8 +50,8 @@ extern u8 gAnimMoveTurn; extern u8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern struct Window gUnknown_03004210; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u8 gDisplayedStringBattle[]; extern u8 gBankTarget; extern u8 gAbsentBankFlags; @@ -1404,8 +1404,8 @@ void sub_8035238(void) void OpponentHandlePrintString(void) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_80331D0; diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 62a38311a..f992e3e51 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -35,8 +35,8 @@ struct MovePpInfo #define SUB_803037C_TILE_DATA_OFFSET 444 #endif -extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042A0; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; extern struct Window gUnknown_03004210; @@ -72,7 +72,7 @@ extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u8 gUnknown_03004344; extern u8 gUnknown_0300434C[]; @@ -148,8 +148,8 @@ extern u8 gAbsentBankFlags; extern u8 gUnknown_03004344; extern u8 gNoOfAllBanks; extern u16 gBattlePartyID[]; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern struct Window gUnknown_03004210; extern const u8 BattleText_SwitchWhich[]; extern u8 gUnknown_03004348; @@ -679,8 +679,8 @@ void sub_802C68C(void) { DestroyMenuCursor(); PlaySE(SE_SELECT); - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 320; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 320; Emitcmd33(1, 10, 0xFFFF); PlayerBufferExecCompleted(); } @@ -1495,7 +1495,7 @@ void sub_802DF30(void) void sub_802DF88(void) { - if (gMain.callback2 == sub_800F808 && !gPaletteFade.active) + if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { if (gUnknown_0202E8F4 == 1) Emitcmd34(1, gUnknown_0202E8F5, gUnknown_02038470); @@ -1519,7 +1519,7 @@ void sub_802E004(void) void sub_802E03C(void) { - if (gMain.callback2 == sub_800F808 && !gPaletteFade.active) + if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { Emitcmd35(1, gSpecialVar_ItemId); PlayerBufferExecCompleted(); @@ -1695,8 +1695,8 @@ void b_link_standby_message(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; sub_8002EB0(&gUnknown_03004210, BattleText_LinkStandby, 0x90, 2, 15); } } @@ -2559,8 +2559,8 @@ void sub_8030190(void) void PlayerHandlePrintString(void) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15); gBattleBankFunc[gActiveBank] = sub_802DF18; @@ -2578,8 +2578,8 @@ void PlayerHandlecmd18(void) { int r4; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 160; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 160; FillWindowRect(&gUnknown_03004210, 10, 2, 15, 27, 18); FillWindowRect(&gUnknown_03004210, 10, 2, 35, 16, 38); @@ -2612,8 +2612,8 @@ void PlayerHandlecmd20(void) void sub_80304A8(void) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 320; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 320; sub_802E1B0(); gUnknown_03004344 = 0xFF; sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0); diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 37c58f951..0a629ba4d 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -23,8 +23,8 @@ extern u8 gActiveBank; extern const u8 BattleText_MenuOptionsSafari[]; extern void *gBattleBankFunc[]; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u8 gBattleBufferA[][0x200]; extern bool8 gDoingBattleAnim; extern u8 gObjectBankIDs[]; @@ -313,7 +313,7 @@ void sub_812B724(void) void sub_812B758(void) { - if (gMain.callback2 == sub_800F808 && !gPaletteFade.active) + if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { Emitcmd35(1, gSpecialVar_ItemId); SafariBufferExecCompleted(); @@ -450,8 +450,8 @@ void SafariHandleMoveAnimation(void) void SafariHandlePrintString(void) { - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_812B694; @@ -469,8 +469,8 @@ void SafariHandlecmd18(void) { int i; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 160; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 160; gUnknown_03004210.paletteNum = 0; FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index be40f968c..bd2b4a45b 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -53,8 +53,8 @@ extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; extern u8 gAnimMoveTurn; extern struct Window gUnknown_03004210; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u8 gUnknown_0300434C[]; extern const u8 BattleText_WallyMenu[]; extern const u8 BattleText_MenuOptions[]; @@ -363,7 +363,7 @@ void sub_81374C4(void) void sub_81374FC(void) { - if (gMain.callback2 == sub_800F808 + if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { Emitcmd35(1, gSpecialVar_ItemId); @@ -1240,8 +1240,8 @@ void WallyHandlePrintString(void) { u16 *ptr; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; ptr = (u16 *)&gBattleBufferA[gActiveBank][2]; if (*ptr == 2) DestroyMenuCursor(); @@ -1262,8 +1262,8 @@ void WallyHandlecmd18(void) { s32 i; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 160; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 160; gUnknown_03004210.paletteNum = 0; FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index a7646e78b..6a6d7a137 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -13,12 +13,12 @@ extern struct SpriteTemplate gUnknown_02024E8C; extern struct Window gUnknown_03004210; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u16 gUnknown_030041B0; extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_030042A0; +extern u16 gBattle_BG0_Y; extern u8 gReservedSpritePaletteCount; extern u8 gActionSelectionCursor[4]; extern u8 gBankInMenu; @@ -81,8 +81,8 @@ static void CB2_ReshowBattleScreenAfterMenu(void) SetUpWindowConfig(&gWindowConfig_81E6C58); ResetPaletteFade(); InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -190,7 +190,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) sub_807B06C(); BeginHardwarePaletteFade(0xFF, 0, 0x10, 0, 1); gPaletteFade.bufferTransferDisabled = 0; - SetMainCallback2(sub_800F808); + SetMainCallback2(BattleMainCB2); break; } gReshowState++; diff --git a/src/contest.c b/src/contest.c index 365f92538..c32719648 100644 --- a/src/contest.c +++ b/src/contest.c @@ -60,8 +60,8 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_WIN1V; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u16 gBattle_WIN0H; extern u32 gUnknown_03005D28; // saved RNG value @@ -324,8 +324,8 @@ void ResetContestGpuRegs(void) REG_WINOUT = 0x3F3F; REG_DISPCNT |= 0x7F00; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -620,8 +620,8 @@ void ContestMainCallback2(void) void ContestVBlankCallback(void) { - REG_BG0HOFS = gUnknown_030042A4; - REG_BG0VOFS = gUnknown_030042A0; + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; REG_BG1HOFS = gBattle_BG1_X; REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; @@ -640,7 +640,7 @@ void ContestVBlankCallback(void) void sub_80ABB70(u8 taskId) { - gUnknown_030042A0 = 0; + gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; sub_80B0D7C(); DmaCopy32Defvars(3, gPlttBufferUnfaded, shared18000.unk18204, 0x400); @@ -684,7 +684,7 @@ void sub_80ABCDC(u8 taskId) u8 i; u8 sp8[32]; - gUnknown_030042A0 = 0xA0; + gBattle_BG0_Y = 0xA0; gBattle_BG2_Y = 0xA0; FillWindowRect_DefaultPalette( &gUnknown_03004210, @@ -772,7 +772,7 @@ void sub_80ABEA0(u8 taskId) sub_80AF138(); StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); sub_8003460(&gMenuWindow, gStringVar4, 776, 1, 15); - gUnknown_030042A0 = 0; + gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; gTasks[taskId].func = sub_80ABC70; break; @@ -846,7 +846,7 @@ void sub_80AC15C(u8 taskId) void sub_80AC188(u8 taskId) { sub_80AF138(); - gUnknown_030042A0 = 0; + gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; sub_80AFFE0(FALSE); DmaCopy32Defvars(3, gPlttBufferFaded, shared18000.unk18604, 0x400); @@ -1804,7 +1804,7 @@ void sub_80ADDA4(u8 taskId) { s32 i; - gUnknown_030042A0 = 0; + gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; for (i = 0; i < 4; i++) gUnknown_02038680[i] = sContestantStatus[i].unk4; @@ -2950,7 +2950,7 @@ bool8 sub_80AF828(s32 a, s32 b, struct UnknownContestStruct6 *c) void sub_80AF860(void) { - gUnknown_030042A0 = 0; + gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; sub_80AF138(); sub_8003460(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15); diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index bb80de6fe..49fe6864b 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -29,8 +29,8 @@ extern u8 gContestPlayerMonIndex; extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; -extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042A0; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; @@ -457,8 +457,8 @@ static void sub_80A9F50(void) REG_BLDY = 0; REG_BG0HOFS = 0; REG_BG0VOFS = 0; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -505,8 +505,8 @@ static void sub_80AA064(void) static void sub_80AA090(void) { - REG_BG0HOFS = gUnknown_030042A4; - REG_BG0VOFS = gUnknown_030042A0; + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; REG_BG1HOFS = gBattle_BG1_X; REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; diff --git a/src/field/tv.c b/src/field/tv.c index d7a75a709..e88e3c72b 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -811,7 +811,7 @@ u8 sub_80BDEAC(u8 *a0) return lang; } -void sub_80BDEC8(void) +void PutPokemonTodayCaughtOnAir(void) { u8 i; u16 total; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index f307f5979..4ee601360 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -65,8 +65,8 @@ void nullsub_6(void); bool32 IsHMMove2(u16 move); extern struct Window gUnknown_03004210; -extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042A0; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; @@ -200,8 +200,8 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, SetUpWindowConfig(&gWindowConfig_81E6C58); ResetPaletteFade(); - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -308,8 +308,8 @@ static void CB2_EvolutionSceneLoadGraphics(void) REG_WINOUT = 0; SetUpWindowConfig(&gWindowConfig_81E6C58); ResetPaletteFade(); - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -362,8 +362,8 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) ResetSpriteData(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -3923,8 +3923,8 @@ static void EvoDummyFunc(void) static void VBlankCB_EvolutionScene(void) { REG_BG0CNT = BGCNT_SCREENBASE(24) | BGCNT_16COLOR | BGCNT_TXT256x256 | BGCNT_AFF512x512 | BGCNT_PRIORITY(3); // 0x9803 - REG_BG0HOFS = gUnknown_030042A4; - REG_BG0VOFS = gUnknown_030042A0; + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; REG_BG1HOFS = gBattle_BG1_X; REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; @@ -3939,8 +3939,8 @@ static void VBlankCB_EvolutionScene(void) static void VBlankCB_TradeEvolutionScene(void) { - REG_BG0HOFS = gUnknown_030042A4; - REG_BG0VOFS = gUnknown_030042A0; + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; REG_BG1HOFS = gBattle_BG1_X; REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; diff --git a/src/unknown_task.c b/src/unknown_task.c index 62245502a..2c71bfb08 100644 --- a/src/unknown_task.c +++ b/src/unknown_task.c @@ -12,8 +12,8 @@ extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u8 gUnknown_0202FFA4; @@ -120,10 +120,10 @@ static void task00_for_dp12(u8 taskId) switch (gTasks[taskId].data[6]) { case 0x0: - value = gUnknown_030042A4; + value = gBattle_BG0_X; break; case 0x2: - value = gUnknown_030042A0; + value = gBattle_BG0_Y; break; case 0x4: value = gBattle_BG1_X; diff --git a/sym_common.txt b/sym_common.txt index 87b411ff4..f620e9e49 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -53,10 +53,10 @@ gBattleTerrain: @ 300428C gBattleTextBuff2: @ 3004290 .space 0x10 -gUnknown_030042A0: @ 30042A0 +gBattle_BG0_Y: @ 30042A0 .space 0x4 -gUnknown_030042A4: @ 30042A4 +gBattle_BG0_X: @ 30042A4 .space 0xC gBattleTextBuff3: @ 30042B0 diff --git a/sym_ewram.txt b/sym_ewram.txt index bb5d56686..fc4ea94ef 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -65,10 +65,10 @@ gBattlePartyID: @ 2024A6A gBanksBySide: @ 2024A72 .space 0x4 -gUnknown_02024A76: @ 2024A76 +gActionsByTurnOrder: @ 2024A76 .space 0x4 -gTurnOrder: @ 2024A7A +gBanksByTurnOrder: @ 2024A7A .space 0x4 gCurrentTurnActionNumber: @ 2024A7E @@ -179,7 +179,7 @@ gUnknown_02024C44: @ 2024C44 gUnknown_02024C4C: @ 2024C4C .space 0x8 -gLockedMove: @ 2024C54 +gLockedMoves: @ 2024C54 .space 0x8 gUnknown_02024C5C: @ 2024C5C -- cgit v1.2.3 From be36c506387648a11afe51b0f4209386947feb37 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 7 Jan 2018 17:57:46 -0800 Subject: Finish battle_2.c and battle_util.c decompilation --- asm/battle_2.s | 912 -------- include/battle.h | 9 +- include/battle_util.h | 29 + include/constants/battle_constants.h | 13 + ld_script.txt | 5 +- src/battle/battle_2.c | 16 +- src/battle/battle_3.c | 3229 --------------------------- src/battle/battle_4.c | 258 ++- src/battle/battle_util.c | 3479 ++++++++++++++++++++++++++++++ src/data/pokemon/trainer_class_lookups.h | 10 +- src/pokemon/pokemon_2.c | 1 + src/rom3.c | 3 +- 12 files changed, 3664 insertions(+), 4300 deletions(-) delete mode 100644 asm/battle_2.s create mode 100644 include/battle_util.h delete mode 100644 src/battle/battle_3.c create mode 100644 src/battle/battle_util.c diff --git a/asm/battle_2.s b/asm/battle_2.s deleted file mode 100644 index 8a1bd902f..000000000 --- a/asm/battle_2.s +++ /dev/null @@ -1,912 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start GetBattleBank -GetBattleBank: @ 8015150 - push {lr} - lsls r0, 24 - lsrs r0, 24 - movs r2, 0 - cmp r0, 0xA - bhi _080151C8 - lsls r0, 2 - ldr r1, _08015168 @ =_0801516C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08015168: .4byte _0801516C - .align 2, 0 -_0801516C: - .4byte _08015198 - .4byte _080151A0 - .4byte _080151A8 - .4byte _080151C4 - .4byte _080151C8 - .4byte _080151C4 - .4byte _080151C8 - .4byte _080151B0 - .4byte _080151C8 - .4byte _080151C8 - .4byte _080151B4 -_08015198: - ldr r0, _0801519C @ =gBankTarget - b _080151C6 - .align 2, 0 -_0801519C: .4byte gBankTarget -_080151A0: - ldr r0, _080151A4 @ =gBankAttacker - b _080151C6 - .align 2, 0 -_080151A4: .4byte gBankAttacker -_080151A8: - ldr r0, _080151AC @ =gEffectBank - b _080151C6 - .align 2, 0 -_080151AC: .4byte gEffectBank -_080151B0: - movs r2, 0 - b _080151C8 -_080151B4: - ldr r0, _080151BC @ =gSharedMem - ldr r1, _080151C0 @ =0x00016003 - adds r0, r1 - b _080151C6 - .align 2, 0 -_080151BC: .4byte gSharedMem -_080151C0: .4byte 0x00016003 -_080151C4: - ldr r0, _080151D0 @ =gBank1 -_080151C6: - ldrb r2, [r0] -_080151C8: - adds r0, r2, 0 - pop {r1} - bx r1 - .align 2, 0 -_080151D0: .4byte gBank1 - thumb_func_end GetBattleBank - - thumb_func_start PressurePPLose -PressurePPLose: @ 80151D4 - push {r4-r7,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - lsls r2, 16 - lsrs r2, 16 - ldr r1, _08015204 @ =gBattleMons - movs r4, 0x58 - muls r0, r4 - adds r0, r1 - adds r0, 0x20 - ldrb r0, [r0] - mov r12, r1 - cmp r0, 0x2E - bne _08015286 - movs r3, 0 - adds r0, r5, 0 - muls r0, r4 - adds r1, 0xC - adds r1, r0, r1 - b _08015210 - .align 2, 0 -_08015204: .4byte gBattleMons -_08015208: - adds r1, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - bgt _08015216 -_08015210: - ldrh r0, [r1] - cmp r0, r2 - bne _08015208 -_08015216: - cmp r3, 0x4 - beq _08015286 - movs r7, 0x58 - adds r2, r5, 0 - muls r2, r7 - adds r0, r3, r2 - mov r6, r12 - adds r6, 0x24 - adds r1, r0, r6 - ldrb r0, [r1] - cmp r0, 0 - beq _08015232 - subs r0, 0x1 - strb r0, [r1] -_08015232: - mov r0, r12 - adds r0, 0x50 - adds r0, r2, r0 - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 14 - ands r0, r1 - cmp r0, 0 - bne _08015286 - ldr r1, _08015290 @ =gDisableStructs - lsls r0, r5, 3 - subs r0, r5 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x18] - lsrs r1, 4 - ldr r2, _08015294 @ =gBitTable - lsls r0, r3, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _08015286 - ldr r4, _08015298 @ =gActiveBank - strb r5, [r4] - adds r1, r3, 0 - adds r1, 0x9 - lsls r1, 24 - lsrs r1, 24 - ldrb r0, [r4] - muls r0, r7 - adds r0, r6 - adds r0, r3 - str r0, [sp] - movs r0, 0 - movs r2, 0 - movs r3, 0x1 - bl EmitSetAttributes - ldrb r0, [r4] - bl MarkBufferBankForExecution -_08015286: - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08015290: .4byte gDisableStructs -_08015294: .4byte gBitTable -_08015298: .4byte gActiveBank - thumb_func_end PressurePPLose - - thumb_func_start sub_801529C -sub_801529C: @ 801529C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x4 - mov r8, r0 - adds r0, r5, 0 - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - movs r4, 0 - ldr r0, _080153BC @ =gNoOfAllBanks - ldrb r0, [r0] - cmp r4, r0 - bge _08015344 - ldr r1, _080153C0 @ =gBattleMons - movs r0, 0x58 - adds r7, r5, 0 - muls r7, r0 - adds r1, 0xC - mov r10, r1 -_080152D2: - lsls r0, r4, 24 - lsrs r0, 24 - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - adds r6, r4, 0x1 - cmp r9, r0 - beq _0801533A - ldr r0, _080153C0 @ =gBattleMons - movs r3, 0x58 - adds r1, r4, 0 - muls r1, r3 - adds r1, r0 - adds r1, 0x20 - ldrb r1, [r1] - adds r4, r0, 0 - cmp r1, 0x2E - bne _0801533A - movs r2, 0 - adds r0, r5, 0 - muls r0, r3 - adds r1, r4, 0 - adds r1, 0xC - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x8F - lsls r1, 1 - cmp r0, r1 - beq _08015322 - adds r3, r1, 0 - mov r0, r10 - adds r1, r7, r0 -_08015314: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, 0x3 - bgt _08015322 - ldrh r0, [r1] - cmp r0, r3 - bne _08015314 -_08015322: - cmp r2, 0x4 - beq _0801533A - mov r8, r2 - adds r1, r2, r7 - adds r0, r4, 0 - adds r0, 0x24 - adds r1, r0 - ldrb r0, [r1] - cmp r0, 0 - beq _0801533A - subs r0, 0x1 - strb r0, [r1] -_0801533A: - adds r4, r6, 0 - ldr r0, _080153BC @ =gNoOfAllBanks - ldrb r0, [r0] - cmp r4, r0 - blt _080152D2 -_08015344: - mov r1, r8 - cmp r1, 0x4 - beq _080153AC - ldr r6, _080153C0 @ =gBattleMons - movs r3, 0x58 - adds r0, r5, 0 - muls r0, r3 - adds r1, r6, 0 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 14 - ands r0, r1 - cmp r0, 0 - bne _080153AC - ldr r1, _080153C4 @ =gDisableStructs - lsls r0, r5, 3 - subs r0, r5 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x18] - lsrs r1, 4 - ldr r2, _080153C8 @ =gBitTable - mov r4, r8 - lsls r0, r4, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _080153AC - ldr r4, _080153CC @ =gActiveBank - strb r5, [r4] - mov r1, r8 - adds r1, 0x9 - lsls r1, 24 - lsrs r1, 24 - ldrb r0, [r4] - muls r0, r3 - adds r2, r6, 0 - adds r2, 0x24 - adds r0, r2 - add r0, r8 - str r0, [sp] - movs r0, 0 - movs r2, 0 - movs r3, 0x1 - bl EmitSetAttributes - ldrb r0, [r4] - bl MarkBufferBankForExecution -_080153AC: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080153BC: .4byte gNoOfAllBanks -_080153C0: .4byte gBattleMons -_080153C4: .4byte gDisableStructs -_080153C8: .4byte gBitTable -_080153CC: .4byte gActiveBank - thumb_func_end sub_801529C - - thumb_func_start sub_80153D0 -sub_80153D0: @ 80153D0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r3, r0, 24 - movs r6, 0x4 - movs r1, 0 - ldr r0, _080154C8 @ =gNoOfAllBanks - mov r8, r0 - ldrb r0, [r0] - cmp r1, r0 - bge _08015452 - ldr r7, _080154CC @ =gBattleMons - movs r2, 0x58 - mov r12, r2 - mov r5, r12 - muls r5, r3 - adds r0, r7, 0 - adds r0, 0xC - adds r2, r5, r0 - mov r10, r2 - mov r9, r5 -_08015402: - mov r0, r12 - muls r0, r1 - adds r0, r7 - adds r0, 0x20 - ldrb r0, [r0] - adds r4, r1, 0x1 - cmp r0, 0x2E - bne _08015448 - cmp r1, r3 - beq _08015448 - movs r2, 0 - mov r1, r10 - ldrh r0, [r1] - cmp r0, 0xC3 - beq _08015432 - ldr r1, _080154D0 @ =gUnknown_02024A8C - add r1, r9 -_08015424: - adds r1, 0x2 - adds r2, 0x1 - cmp r2, 0x3 - bgt _08015432 - ldrh r0, [r1] - cmp r0, 0xC3 - bne _08015424 -_08015432: - cmp r2, 0x4 - beq _08015448 - adds r6, r2, 0 - adds r0, r6, r5 - ldr r2, _080154D4 @ =gUnknown_02024AA4 - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0 - beq _08015448 - subs r0, 0x1 - strb r0, [r1] -_08015448: - adds r1, r4, 0 - mov r0, r8 - ldrb r0, [r0] - cmp r1, r0 - blt _08015402 -_08015452: - cmp r6, 0x4 - beq _080154B6 - ldr r7, _080154CC @ =gBattleMons - movs r5, 0x58 - adds r0, r3, 0 - muls r0, r5 - adds r1, r7, 0 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 14 - ands r0, r1 - cmp r0, 0 - bne _080154B6 - ldr r1, _080154D8 @ =gDisableStructs - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x18] - lsrs r1, 4 - ldr r2, _080154DC @ =gBitTable - lsls r0, r6, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _080154B6 - ldr r4, _080154E0 @ =gActiveBank - strb r3, [r4] - adds r1, r6, 0 - adds r1, 0x9 - lsls r1, 24 - lsrs r1, 24 - ldrb r0, [r4] - muls r0, r5 - adds r2, r7, 0 - adds r2, 0x24 - adds r0, r2 - adds r0, r6 - str r0, [sp] - movs r0, 0 - movs r2, 0 - movs r3, 0x1 - bl EmitSetAttributes - ldrb r0, [r4] - bl MarkBufferBankForExecution -_080154B6: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080154C8: .4byte gNoOfAllBanks -_080154CC: .4byte gBattleMons -_080154D0: .4byte gUnknown_02024A8C -_080154D4: .4byte gUnknown_02024AA4 -_080154D8: .4byte gDisableStructs -_080154DC: .4byte gBitTable -_080154E0: .4byte gActiveBank - thumb_func_end sub_80153D0 - - thumb_func_start unref_sub_80154E4 -unref_sub_80154E4: @ 80154E4 - push {r4,r5,lr} - ldr r0, _08015514 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08015524 - movs r2, 0 - ldr r4, _08015518 @ =gNoOfAllBanks - ldrb r0, [r4] - cmp r2, r0 - bge _08015542 - ldr r3, _0801551C @ =gBattleExecBuffer - ldr r5, _08015520 @ =gBitTable -_08015500: - ldm r5!, {r1} - lsls r1, 28 - ldr r0, [r3] - orrs r0, r1 - str r0, [r3] - adds r2, 0x1 - ldrb r0, [r4] - cmp r2, r0 - blt _08015500 - b _08015542 - .align 2, 0 -_08015514: .4byte gBattleTypeFlags -_08015518: .4byte gNoOfAllBanks -_0801551C: .4byte gBattleExecBuffer -_08015520: .4byte gBitTable -_08015524: - movs r2, 0 - ldr r4, _08015548 @ =gNoOfAllBanks - ldrb r0, [r4] - cmp r2, r0 - bge _08015542 - ldr r3, _0801554C @ =gBattleExecBuffer - ldr r5, _08015550 @ =gBitTable -_08015532: - ldr r0, [r3] - ldm r5!, {r1} - orrs r0, r1 - str r0, [r3] - adds r2, 0x1 - ldrb r0, [r4] - cmp r2, r0 - blt _08015532 -_08015542: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08015548: .4byte gNoOfAllBanks -_0801554C: .4byte gBattleExecBuffer -_08015550: .4byte gBitTable - thumb_func_end unref_sub_80154E4 - - thumb_func_start MarkBufferBankForExecution -MarkBufferBankForExecution: @ 8015554 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _0801557C @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08015588 - ldr r2, _08015580 @ =gBattleExecBuffer - ldr r1, _08015584 @ =gBitTable - lsls r0, r3, 2 - adds r0, r1 - ldr r1, [r0] - lsls r1, 28 - ldr r0, [r2] - orrs r0, r1 - str r0, [r2] - b _08015598 - .align 2, 0 -_0801557C: .4byte gBattleTypeFlags -_08015580: .4byte gBattleExecBuffer -_08015584: .4byte gBitTable -_08015588: - ldr r2, _0801559C @ =gBattleExecBuffer - ldr r1, _080155A0 @ =gBitTable - lsls r0, r3, 2 - adds r0, r1 - ldr r1, [r2] - ldr r0, [r0] - orrs r1, r0 - str r1, [r2] -_08015598: - pop {r0} - bx r0 - .align 2, 0 -_0801559C: .4byte gBattleExecBuffer -_080155A0: .4byte gBitTable - thumb_func_end MarkBufferBankForExecution - - thumb_func_start sub_80155A4 -sub_80155A4: @ 80155A4 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - movs r4, 0 - ldr r5, _080155B8 @ =gBattleExecBuffer - ldr r1, _080155BC @ =gBitTable - lsls r0, r7, 2 - adds r6, r0, r1 - b _080155CE - .align 2, 0 -_080155B8: .4byte gBattleExecBuffer -_080155BC: .4byte gBitTable -_080155C0: - lsls r0, r4, 2 - ldr r1, [r6] - lsls r1, r0 - ldr r0, [r5] - orrs r0, r1 - str r0, [r5] - adds r4, 0x1 -_080155CE: - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - blt _080155C0 - ldr r2, _080155F0 @ =gBattleExecBuffer - movs r1, 0x80 - lsls r1, 21 - lsls r1, r7 - ldr r0, [r2] - bics r0, r1 - str r0, [r2] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080155F0: .4byte gBattleExecBuffer - thumb_func_end sub_80155A4 - - thumb_func_start CancelMultiTurnMoves -CancelMultiTurnMoves: @ 80155F4 - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08015644 @ =gBattleMons - movs r2, 0x58 - adds r3, r0, 0 - muls r3, r2 - adds r1, 0x50 - adds r3, r1 - ldr r1, [r3] - ldr r2, _08015648 @ =0xffffefff - ands r1, r2 - ldr r2, _0801564C @ =0xfffff3ff - ands r1, r2 - movs r2, 0x71 - negs r2, r2 - ands r1, r2 - ldr r2, _08015650 @ =0xfffffcff - ands r1, r2 - str r1, [r3] - ldr r1, _08015654 @ =gStatuses3 - lsls r2, r0, 2 - adds r2, r1 - ldr r1, [r2] - ldr r3, _08015658 @ =0xfffbff3f - ands r1, r3 - str r1, [r2] - ldr r2, _0801565C @ =gDisableStructs - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r2, [r1, 0x11] - movs r0, 0x10 - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x11] - movs r0, 0 - strb r0, [r1, 0x10] - bx lr - .align 2, 0 -_08015644: .4byte gBattleMons -_08015648: .4byte 0xffffefff -_0801564C: .4byte 0xfffff3ff -_08015650: .4byte 0xfffffcff -_08015654: .4byte gStatuses3 -_08015658: .4byte 0xfffbff3f -_0801565C: .4byte gDisableStructs - thumb_func_end CancelMultiTurnMoves - - thumb_func_start sub_8015660 -sub_8015660: @ 8015660 - push {lr} - lsls r0, 24 - ldr r1, _080156AC @ =gProtectStructs - lsrs r0, 20 - adds r1, r0, r1 - ldrb r0, [r1] - lsrs r0, 7 - cmp r0, 0 - bne _080156A6 - ldrb r2, [r1, 0x1] - lsls r0, r2, 30 - cmp r0, 0 - blt _080156A6 - lsls r0, r2, 26 - cmp r0, 0 - blt _080156A6 - lsls r0, r2, 25 - cmp r0, 0 - blt _080156A6 - lsrs r0, r2, 7 - cmp r0, 0 - bne _080156A6 - ldrb r1, [r1, 0x2] - lsls r0, r1, 31 - cmp r0, 0 - bne _080156A6 - lsls r0, r1, 30 - cmp r0, 0 - blt _080156A6 - lsls r0, r1, 29 - cmp r0, 0 - blt _080156A6 - lsls r0, r2, 31 - cmp r0, 0 - beq _080156B0 -_080156A6: - movs r0, 0x1 - b _080156B2 - .align 2, 0 -_080156AC: .4byte gProtectStructs -_080156B0: - movs r0, 0 -_080156B2: - pop {r1} - bx r1 - thumb_func_end sub_8015660 - - thumb_func_start PrepareStringBattle -PrepareStringBattle: @ 80156B8 - push {r4,lr} - adds r2, r0, 0 - lsls r2, 16 - lsrs r2, 16 - ldr r4, _080156D8 @ =gActiveBank - strb r1, [r4] - movs r0, 0 - adds r1, r2, 0 - bl EmitPrintString - ldrb r0, [r4] - bl MarkBufferBankForExecution - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080156D8: .4byte gActiveBank - thumb_func_end PrepareStringBattle - - thumb_func_start sub_80156DC -sub_80156DC: @ 80156DC - push {r4-r6,lr} - movs r3, 0 - ldr r0, _08015730 @ =gSentPokesToOpponent - strb r3, [r0] - strb r3, [r0, 0x1] - movs r1, 0 - ldr r0, _08015734 @ =gNoOfAllBanks - ldrb r2, [r0] - adds r6, r0, 0 - cmp r1, r2 - bge _0801570A - ldr r5, _08015738 @ =gBitTable - adds r4, r2, 0 - ldr r2, _0801573C @ =gBattlePartyID -_080156F8: - ldrh r0, [r2] - lsls r0, 2 - adds r0, r5 - ldr r0, [r0] - orrs r3, r0 - adds r2, 0x4 - adds r1, 0x2 - cmp r1, r4 - blt _080156F8 -_0801570A: - movs r1, 0x1 - adds r2, r6, 0 - ldrb r0, [r2] - cmp r1, r0 - bge _0801572A - ldr r5, _08015730 @ =gSentPokesToOpponent - movs r4, 0x2 -_08015718: - adds r0, r1, 0 - ands r0, r4 - asrs r0, 1 - adds r0, r5 - strb r3, [r0] - adds r1, 0x2 - ldrb r0, [r2] - cmp r1, r0 - blt _08015718 -_0801572A: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08015730: .4byte gSentPokesToOpponent -_08015734: .4byte gNoOfAllBanks -_08015738: .4byte gBitTable -_0801573C: .4byte gBattlePartyID - thumb_func_end sub_80156DC - - thumb_func_start sub_8015740 -sub_8015740: @ 8015740 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - adds r0, r5, 0 - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080157A4 - movs r0, 0x2 - ands r0, r5 - lsls r0, 24 - lsrs r0, 25 - mov r12, r0 - ldr r1, _080157B0 @ =gSentPokesToOpponent - adds r0, r1 - strb r4, [r0] - adds r5, r4, 0 - ldr r0, _080157B4 @ =gNoOfAllBanks - ldrb r2, [r0] - mov r8, r1 - cmp r4, r2 - bge _0801579E - ldr r0, _080157B8 @ =gAbsentBankFlags - ldrb r7, [r0] - ldr r1, _080157BC @ =gBitTable - adds r6, r2, 0 - ldr r3, _080157C0 @ =gBattlePartyID - adds r2, r1, 0 -_08015782: - ldr r0, [r2] - ands r0, r7 - cmp r0, 0 - bne _08015794 - ldrh r0, [r3] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - orrs r4, r0 -_08015794: - adds r3, 0x4 - adds r2, 0x8 - adds r5, 0x2 - cmp r5, r6 - blt _08015782 -_0801579E: - mov r0, r12 - add r0, r8 - strb r4, [r0] -_080157A4: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080157B0: .4byte gSentPokesToOpponent -_080157B4: .4byte gNoOfAllBanks -_080157B8: .4byte gAbsentBankFlags -_080157BC: .4byte gBitTable -_080157C0: .4byte gBattlePartyID - thumb_func_end sub_8015740 - - thumb_func_start sub_80157C4 -sub_80157C4: @ 80157C4 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080157E0 - adds r0, r4, 0 - bl sub_8015740 - b _08015816 -_080157E0: - movs r3, 0x1 - ldr r5, _0801581C @ =gNoOfAllBanks - ldrb r0, [r5] - cmp r3, r0 - bge _08015816 - ldr r0, _08015820 @ =gSentPokesToOpponent - mov r12, r0 - movs r7, 0x2 - ldr r6, _08015824 @ =gBitTable - ldr r1, _08015828 @ =gBattlePartyID - lsls r0, r4, 1 - adds r4, r0, r1 -_080157F8: - adds r2, r3, 0 - ands r2, r7 - asrs r2, 1 - add r2, r12 - ldrh r0, [r4] - lsls r0, 2 - adds r0, r6 - ldr r0, [r0] - ldrb r1, [r2] - orrs r0, r1 - strb r0, [r2] - adds r3, 0x1 - ldrb r0, [r5] - cmp r3, r0 - blt _080157F8 -_08015816: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0801581C: .4byte gNoOfAllBanks -_08015820: .4byte gSentPokesToOpponent -_08015824: .4byte gBitTable -_08015828: .4byte gBattlePartyID - thumb_func_end sub_80157C4 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/battle.h b/include/battle.h index 4bcdfa6a9..27ed57045 100644 --- a/include/battle.h +++ b/include/battle.h @@ -549,7 +549,7 @@ extern u8 gBattleTextBuff1[]; //function declarations of buffer emits void EmitGetAttributes(u8 buffID, u8 request, u8 c); //0x0 void Emitcmd1(u8 a, u8 b, u8 c); //0x1 -void EmitSetAttributes(u8 a, u8 request, u8 c, u8 bytes, void *data); //0x2 +void EmitSetMonData(u8 a, u8 request, u8 c, u8 bytes, void *data); //0x2 void EmitSendOutPoke(u8 a, u8 b, u8 c); //0x5 void EmitReturnPokeToBall(u8 a, u8 b); //0x6 void EmitTrainerSlide(u8 a); //0x8 @@ -644,21 +644,14 @@ bool8 TryRunFromBattle(u8 bank); void sub_8012324(void); void SwapTurnOrder(u8, u8); u8 GetWhoStrikesFirst(u8, u8, u8); -void sub_80155A4(); -void CancelMultiTurnMoves(u8 bank); -void PrepareStringBattle(); -void sub_80156DC(); -void sub_80157C4(u8 index); // asm/battle_3.o u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check); u8 UpdateTurnCounters(void); u8 TurnBasedEffects(void); -u8 sub_80170DC(); u8 HandleFaintedMonActions(); u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 move); u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn); -void b_clear_atk_up_if_hit_flag_unless_enraged(void); u8 GetMoveTarget(u16 move, u8 useMoveTarget); // asm/battle_4.o diff --git a/include/battle_util.h b/include/battle_util.h new file mode 100644 index 000000000..f47b00b2c --- /dev/null +++ b/include/battle_util.h @@ -0,0 +1,29 @@ +#ifndef GUARD_BATTLE_UTIL_H +#define GUARD_BATTLE_UTIL_H + +#define BS_GET_TARGET 0 +#define BS_GET_ATTACKER 1 +#define BS_GET_EFFECT_BANK 2 +#define BS_GET_SCRIPTING_BANK 10 +#define BS_GET_PLAYER1 11 +#define BS_GET_OPPONENT1 12 +#define BS_GET_PLAYER2 13 +#define BS_GET_OPPONENT2 14 + +void TryClearRageStatuses(void); +void BattleScriptPush(u8* BS_ptr); +void PressurePPLoseOnUsingImprision(u8 bankAtk); +void PressurePPLoseOnUsingPerishSong(u8 bankAtk); +void sub_80155A4(u8); +void CancelMultiTurnMoves(u8 bank); +bool8 WasUnableToUseMove(u8 bank); +void PrepareStringBattle(u16 stringId, u8 bank); +void ResetSentPokesToOpponentValue(void); +void sub_8015740(u8 bank); +void sub_80157C4(u8 bank); +bool8 HandleWishPerishSongOnTurnEnd(void); +void BattleScriptExecute(u8* BS_ptr); +void BattleScriptPushCursorAndCallback(u8* BS_ptr); +u8 IsMonDisobedient(void); + +#endif // GUARD_BATTLE_UTIL_H diff --git a/include/constants/battle_constants.h b/include/constants/battle_constants.h index 2b973b4d9..49768f33e 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle_constants.h @@ -245,6 +245,19 @@ #define MSG_DISPLAY 0x7 #define BATTLE_COMMUNICATION_ENTRIES_COUNT 0x8 +#define BS_GET_TARGET 0 +#define BS_GET_ATTACKER 1 +#define BS_GET_EFFECT_BANK 2 +#define BS_GET_gBank1 3 +#define BS_GET_BANK_0 7 +#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update +#define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability +#define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability +#define BS_GET_SCRIPTING_BANK 10 +#define BS_GET_OPPONENT1 12 +#define BS_GET_PLAYER2 13 +#define BS_GET_OPPONENT2 14 + // status animation table #define B_ANIM_STATUS_PSN 0x0 #define B_ANIM_STATUS_CONFUSION 0x1 diff --git a/ld_script.txt b/ld_script.txt index 9a2cbe4e5..68466c1a0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -50,8 +50,7 @@ SECTIONS { src/rom_800D42C.o(.text); asm/battle_1.o(.text_800DC24); src/battle/battle_2.o(.text); - asm/battle_2.o(.text); - src/battle/battle_3.o(.text); + src/battle/battle_util.o(.text); src/battle/battle_4.o(.text); src/battle/battle_controller_player.o(.text); src/battle/battle_7.o(.text); @@ -453,7 +452,7 @@ SECTIONS { src/battle/battle_controller_opponent.o(.rodata); src/battle/battle_controller_linkopponent.o(.rodata); data/battle_moves.o(.rodata); - src/battle/battle_3.o(.rodata); + src/battle/battle_util.o(.rodata); src/pokemon/pokemon_data.o(.rodata); . = ALIGN(4); src/engine/trig.o(.rodata); diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index a30245081..ae84e5585 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -5,6 +5,7 @@ #include "battle_interface.h" #include "battle_message.h" #include "battle_setup.h" +#include "battle_util.h" #include "data2.h" #include "event_data.h" #include "evolution_scene.h" @@ -141,7 +142,7 @@ extern u16 gBattleWeather; extern u32 gBattleMoveDamage; extern struct BattlePokemon gBattleMons[]; extern u8 gBattleMoveFlags; -extern const u8 BattleScript_FocusPunchSetUp[]; +extern u8 BattleScript_FocusPunchSetUp[]; extern u16 gDynamicBasePower; extern u8 gCurrentTurnActionNumber; extern void (* const gUnknown_081FA640[])(void); @@ -175,7 +176,6 @@ extern u8 gUnknown_081FA70C[][3]; extern u8 gUnknown_081FA71B[]; extern u8 gUnknown_081FA71F[]; -void b_call_bc_move_exec(const u8* BS_ptr); static void BattlePrepIntroSlide(void); void CheckFocusPunch_ClearVarsBeforeTurnStarts(void); @@ -2180,7 +2180,7 @@ void BattleBeginFirstTurn(void) SpecialStatusesClear(); ewram160A6 = gAbsentBankFlags; gBattleMainFunc = sub_8012324; - sub_80156DC(); + ResetSentPokesToOpponentValue(); for (i = 0; i < 8; i++) gBattleCommunication[i] = 0; for (i = 0; i < gNoOfAllBanks; i++) @@ -2236,7 +2236,7 @@ void BattleTurnPassed(void) if (HandleFaintedMonActions() != 0) return; ewram16059 = 0; - if (sub_80170DC() != 0) + if (HandleWishPerishSongOnTurnEnd() != 0) return; TurnValuesCleanUp(0); gHitMarker &= ~HITMARKER_NO_ATTACKSTRING; @@ -3154,7 +3154,7 @@ _08012968:\n\ cmp r0, 0x3\n\ bne _080129A8\n\ ldr r0, _080129A0 @ =BattleScript_PrintCantRunFromTrainer\n\ - bl b_call_bc_move_exec\n\ + bl BattleScriptExecute\n\ ldr r1, _080129A4 @ =gBattleCommunication\n\ ldrb r0, [r4]\n\ adds r0, r1\n\ @@ -3318,7 +3318,7 @@ _08012ACC:\n\ _08012AF4: .4byte 0x0000ffff\n\ _08012AF8: .4byte gBattleCommunication\n\ _08012AFC:\n\ - bl sub_8015894\n\ + bl TrySetCantSelectMoveBattleScript\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _08012B48\n\ @@ -4207,13 +4207,13 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) && !(gDisableStructs[gBankAttacker].truantCounter) && !(gProtectStructs[gActiveBank].onlyStruggle)) { - b_call_bc_move_exec(BattleScript_FocusPunchSetUp); + BattleScriptExecute(BattleScript_FocusPunchSetUp); return; } } } - b_clear_atk_up_if_hit_flag_unless_enraged(); + TryClearRageStatuses(); gCurrentTurnActionNumber = 0; { // something stupid needed to match diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c deleted file mode 100644 index 92e0404cc..000000000 --- a/src/battle/battle_3.c +++ /dev/null @@ -1,3229 +0,0 @@ -#include "global.h" -#include "constants/abilities.h" -#include "battle.h" -#include "constants/moves.h" -#include "item.h" -#include "constants/items.h" -#include "event_data.h" -#include "constants/hold_effects.h" -#include "constants/species.h" -#include "constants/weather.h" -#include "pokemon.h" -#include "data2.h" -#include "random.h" -#include "text.h" -#include "constants/battle_move_effects.h" -#include "string_util.h" -#include "constants/flags.h" -#include "ewram.h" - -extern u8* gBattlescriptCurrInstr; -extern u8 gActiveBank; -extern u8 gBattleBufferB[4][0x200]; -extern u8* gUnknown_02024C1C[4]; //battlescript location when you try to choose a move you're not allowed to -extern u16 gLastUsedMove[4]; -extern struct BattlePokemon gBattleMons[4]; -extern struct BattleEnigmaBerry gEnigmaBerries[4]; -extern u8 gStringBank; -extern u16 gLastUsedItem; -extern u16 gCurrentMove; -extern const u32 gBitTable[]; -extern u16 gBattleTypeFlags; -extern u8 gNoOfAllBanks; -extern u32 gStatuses3[4]; -extern u8 gBankAttacker; -extern u8 gBankTarget; -extern u8 gBanksByTurnOrder[4]; -extern u16 gSideAffecting[2]; -extern u16 gBattleWeather; -extern void (*gBattleMainFunc)(void); -extern u8 gAbsentBankFlags; -extern u8 gBattleCommunication[]; -extern u32 gHitMarker; -extern u8 gEffectBank; -extern u8 gBank1; -extern s32 gBattleMoveDamage; -extern u16 gBattlePartyID[4]; -extern u16 gChosenMovesByBanks[4]; -extern s32 gTakenDmg[4]; -extern u8 gTakenDmgBanks[4]; -extern u8 gBattleMoveFlags; -extern u8 gLastUsedAbility; -extern u8 gBattleTextBuff2[]; -extern u8 gCurrentActionFuncId; -extern struct BattleEnigmaBerry gEnigmaBerries[4]; -extern u8 gUnknown_02024BE5; -extern u8 gCurrMovePos; -extern u16 gRandomMove; -extern s32 gBattleMoveDamage; -extern u16 gDynamicBasePower; -extern u32 gBattleExecBuffer; -extern const u16 gSoundMovesTable[]; -extern const u8 gStatusConditionString_PoisonJpn[]; -extern const u8 gStatusConditionString_SleepJpn[]; -extern const u8 gStatusConditionString_ParalysisJpn[]; -extern const u8 gStatusConditionString_BurnJpn[]; -extern const u8 gStatusConditionString_IceJpn[]; -extern const u8 gStatusConditionString_ConfusionJpn[]; -extern const u8 gStatusConditionString_LoveJpn[]; -extern const BattleCmdFunc gBattleScriptingCommandsTable[]; - -u8 IsImprisoned(u8 bank, u16 move); -u8 GetBankByIdentity(u8 ID); -u8 GetBankIdentity(u8 bank); -u8 GetBankSide(u8 bank); -void b_call_bc_move_exec(u8* BS_ptr); -bool8 sub_8015660(u8 bank); //check if a move failed -void SetMoveEffect(bool8 primary, u8 certainArg); -bool8 UproarWakeUpCheck(u8 bank); -bool8 sub_8018018(u8 bank, u8, u8); -void sub_8015740(u8 bank); -s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 a4, u16 powerOverride, u8 typeOverride, u8 bank_atk, u8 bank_def); -u8 CountTrailingZeroBits(u32 a); -u8 GetMoveTarget(u16 move, u8 useMoveTarget); -u8 sub_803FC34(u8 bank); -u16 sub_803FBFC(u8 a); -u8 weather_get_current(void); -void b_push_move_exec(u8* BS_ptr); -void RecordAbilityBattle(u8 bank, u8 ability); -void RecordItemBattle(u8 bank, u8 holdEffect); -s8 GetPokeFlavourRelation(u32 pid, u8 flavor); - -extern u8 BattleScript_MoveSelectionDisabledMove[]; -extern u8 BattleScript_MoveSelectionTormented[]; -extern u8 BattleScript_MoveSelectionTaunted[]; -extern u8 BattleScript_MoveSelectionImprisoned[]; -extern u8 BattleScript_MoveSelectionChoiceBanded[]; -extern u8 BattleScript_MoveSelectionNoPP[]; -extern u8 BattleScript_NoMovesLeft[]; -extern u8 BattleScript_WishComesTrue[]; -extern u8 BattleScript_IngrainTurnHeal[]; -extern u8 BattleScript_LeechSeedTurnDrain[]; -extern u8 BattleScript_PoisonTurnDmg[]; -extern u8 BattleScript_BurnTurnDmg[]; -extern u8 BattleScript_NightmareTurnDmg[]; -extern u8 BattleScript_CurseTurnDmg[]; -extern u8 BattleScript_WrapTurnDmg[]; -extern u8 BattleScript_WrapEnds[]; -extern u8 BattleScript_DisabledNoMore[]; -extern u8 BattleScript_EncoredNoMore[]; - -extern u8 BattleScript_SideStatusWoreOff[]; -extern u8 BattleScript_RainContinuesOrEnds[]; -extern u8 BattleScript_SandStormHailEnds[]; -extern u8 BattleScript_DamagingWeatherContinues[]; -extern u8 BattleScript_SunlightFaded[]; -extern u8 BattleScript_SunlightContinues[]; -extern u8 BattleScript_SafeguardEnds[]; -extern u8 BattleScript_MonWokeUpInUproar[]; //uproar wakeup BS -extern u8 BattleScript_PrintUproarOverTurns[]; //uproar BS -extern u8 BattleScript_ThrashConfuses[]; -extern u8 BattleScript_YawnMakesAsleep[]; -extern u8 BattleScript_MonTookFutureAttack[]; -extern u8 BattleScript_PerishSongHits[]; -extern u8 BattleScript_PerishSongTimerGoesDown[]; -extern u8 BattleScript_GiveExp[]; -extern u8 BattleScript_HandleFaintedMon[]; - -extern u8 BattleScript_MoveUsedIsAsleep[]; -extern u8 BattleScript_MoveUsedWokeUp[]; -extern u8 BattleScript_MoveUsedIsFrozen[]; -extern u8 BattleScript_MoveUsedUnfroze[]; -extern u8 BattleScript_MoveUsedLoafingAround[]; -extern u8 BattleScript_MoveUsedMustRecharge[]; -extern u8 BattleScript_MoveUsedFlinched[]; -extern u8 BattleScript_MoveUsedIsDisabled[]; -extern u8 BattleScript_MoveUsedIsTaunted[]; -extern u8 BattleScript_MoveUsedIsImprisoned[]; -extern u8 BattleScript_MoveUsedIsConfused[]; -extern u8 BattleScript_MoveUsedIsConfusedNoMore[]; -extern u8 BattleScript_MoveUsedIsParalyzed[]; -extern u8 BattleScript_MoveUsedIsParalyzedCantAttack[]; -extern u8 BattleScript_MoveUsedIsInLove[]; -extern u8 BattleScript_BideStoringEnergy[]; -extern u8 BattleScript_BideAttack[]; -extern u8 BattleScript_BideNoEnergyToAttack[]; - -extern u8 BattleScript_OverworldWeatherStarts[]; //load weather from overworld -extern u8 BattleScript_DrizzleActivates[]; -extern u8 BattleScript_SandstreamActivates[]; -extern u8 BattleScript_DroughtActivates[]; -extern u8 BattleScript_CastformChange[]; -extern u8 BattleScript_RainDishActivates[]; -extern u8 BattleScript_ShedSkinActivates[]; -extern u8 BattleScript_SpeedBoostActivates[]; -extern u8 BattleScript_SoundproofProtected[]; -extern u8 BattleScript_MoveHPDrain[]; -extern u8 BattleScript_MoveHPDrain_PPLoss[]; -extern u8 BattleScript_FlashFireBoost[]; -extern u8 BattleScript_FlashFireBoost_PPLoss[]; -extern u8 BattleScript_MoveHPDrain_FullHP[]; -extern u8 BattleScript_MoveHPDrain_FullHP_PPLoss[]; -extern u8 BattleScript_ColorChangeActivates[]; -extern u8 BattleScript_RoughSkinActivates[]; -extern u8 BattleScript_ApplySecondaryEffect[]; -extern u8 BattleScript_CuteCharmActivates[]; -extern u8 BattleScript_AbilityCuredStatus[]; //ability status clear -extern u8 BattleScript_SynchronizeActivates[]; -extern u8 gUnknown_081D978C[]; //intimidate1 -extern u8 gUnknown_081D9795[]; //intimidate2 -extern u8 BattleScript_TraceActivates[]; - -extern u8 BattleScript_WhiteHerbEnd2[]; -extern u8 BattleScript_WhiteHerbRet[]; -extern u8 BattleScript_ItemHealHP_RemoveItem[]; -extern u8 BattleScript_BerryPPHealEnd2[]; -extern u8 BattleScript_ItemHealHP_End2[]; -extern u8 BattleScript_BerryConfuseHealEnd2[]; -extern u8 BattleScript_BerryStatRaiseEnd2[]; -extern u8 BattleScript_BerryFocusEnergyEnd2[]; -extern u8 BattleScript_BerryCurePrlzEnd2[]; -extern u8 BattleScript_BerryCurePsnEnd2[]; -extern u8 BattleScript_BerryCureBrnEnd2[]; -extern u8 BattleScript_BerryCureFrzEnd2[]; -extern u8 BattleScript_BerryCureSlpEnd2[]; -extern u8 BattleScript_BerryCureConfusionEnd2[]; -extern u8 BattleScript_BerryCureChosenStatusEnd2[]; //berry cure any status end2 -extern u8 BattleScript_BerryCureParRet[]; -extern u8 BattleScript_BerryCurePsnRet[]; -extern u8 BattleScript_BerryCureBrnRet[]; -extern u8 BattleScript_BerryCureFrzRet[]; -extern u8 BattleScript_BerryCureSlpRet[]; -extern u8 BattleScript_BerryCureConfusionRet[]; -extern u8 BattleScript_BerryCureChosenStatusRet[]; //berry cure any status return - -extern u8 BattleScript_ItemHealHP_Ret[]; - -extern u8 gUnknown_081D995F[]; //disobedient while asleep -extern u8 BattleScript_IgnoresAndUsesRandomMove[]; //disobedient, uses a random move -extern u8 BattleScript_IgnoresAndFallsAsleep[]; //disobedient, went to sleep -extern u8 gUnknown_081D99A0[]; //disobedient, hits itself - -//array entries for battle communication -#define MOVE_EFFECT_BYTE 0x3 -#define MULTISTRING_CHOOSER 0x5 -#define MSG_DISPLAY 0x7 - -void b_movescr_stack_push(u8* BS_ptr) -{ - B_BATTLESCRIPTS_STACK->ptr[B_BATTLESCRIPTS_STACK->size++] = BS_ptr; -} - -void b_movescr_stack_push_cursor(void) -{ - B_BATTLESCRIPTS_STACK->ptr[B_BATTLESCRIPTS_STACK->size++] = gBattlescriptCurrInstr; -} - -void b_movescr_stack_pop_cursor(void) -{ - gBattlescriptCurrInstr = B_BATTLESCRIPTS_STACK->ptr[--B_BATTLESCRIPTS_STACK->size]; -} - -u8 sub_8015894(void) //msg can't select a move -{ - u8 limitations = 0; - u16 move = gBattleMons[gActiveBank].moves[gBattleBufferB[gActiveBank][2]]; - u8 holdEffect; - u16* choicedMove = CHOICED_MOVE(gActiveBank); - if (gDisableStructs[gActiveBank].disabledMove == move && move) - { - BATTLE_STRUCT->scriptingActive = gActiveBank; - gCurrentMove = move; - gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionDisabledMove; - limitations++; - } - if (move == gLastUsedMove[gActiveBank] && move != MOVE_STRUGGLE && gBattleMons[gActiveBank].status2 & STATUS2_TORMENT) - { - CancelMultiTurnMoves(gActiveBank); - gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionTormented; - limitations++; - } - if (gDisableStructs[gActiveBank].tauntTimer1 && gBattleMoves[move].power == 0) - { - gCurrentMove = move; - gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionTaunted; - limitations++; - } - if (IsImprisoned(gActiveBank, move)) - { - gCurrentMove = move; - gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionImprisoned; - limitations++; - } - if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY) - holdEffect = gEnigmaBerries[gActiveBank].holdEffect; - else - holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item); - gStringBank = gActiveBank; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move) - { - gCurrentMove = *choicedMove; - gLastUsedItem = gBattleMons[gActiveBank].item; - gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionChoiceBanded; - limitations++; - } - if (gBattleMons[gActiveBank].pp[gBattleBufferB[gActiveBank][2]] == 0) - { - gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionNoPP; - limitations++; - } - return limitations; -} - -#define MOVE_LIMITATION_ZEROMOVE (1 << 0) -#define MOVE_LIMITATION_PP (1 << 1) -#define MOVE_LIMITATION_DISABLED (1 << 2) -#define MOVE_LIMITATION_TORMENTED (1 << 3) -#define MOVE_LIMITATION_TAUNT (1 << 4) -#define MOVE_LIMITATION_IMPRISION (1 << 5) - -u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check) -{ - u8 holdEffect; - u16* choicedMove = CHOICED_MOVE(bank); - s32 i; - if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY) - holdEffect = gEnigmaBerries[bank].holdEffect; - else - holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item); - gStringBank = bank; - for (i = 0; i < 4; i++) - { - if (gBattleMons[bank].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE) - unusableMoves |= gBitTable[i]; - if (gBattleMons[bank].pp[i] == 0 && check & MOVE_LIMITATION_PP) - unusableMoves |= gBitTable[i]; - if (gBattleMons[bank].moves[i] == gDisableStructs[bank].disabledMove && check & MOVE_LIMITATION_DISABLED) - unusableMoves |= gBitTable[i]; - if (gBattleMons[bank].moves[i] == gLastUsedMove[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT) - unusableMoves |= gBitTable[i]; - if (gDisableStructs[bank].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[bank].moves[i]].power == 0) - unusableMoves |= gBitTable[i]; - if (IsImprisoned(bank, gBattleMons[bank].moves[i]) && check & MOVE_LIMITATION_IMPRISION) - unusableMoves |= gBitTable[i]; - if (gDisableStructs[bank].encoreTimer1 && gDisableStructs[bank].encoredMove != gBattleMons[bank].moves[i]) - unusableMoves |= gBitTable[i]; - if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[bank].moves[i]) - unusableMoves |= gBitTable[i]; - } - return unusableMoves; -} - -bool8 AreAllMovesUnusable(void) -{ - u8 unusable; - unusable = CheckMoveLimitations(gActiveBank, 0, 0xFF); - if (unusable == 0xF) //all moves are unusable - { - gProtectStructs[gActiveBank].onlyStruggle = 1; - gUnknown_02024C1C[gActiveBank] = BattleScript_NoMovesLeft; - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - gBattleBufferB[gActiveBank][3] = GetBankByIdentity((GetBankIdentity(gActiveBank) ^ 1) | (Random() & 2)); - else - gBattleBufferB[gActiveBank][3] = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ 1); - } - else - gProtectStructs[gActiveBank].onlyStruggle = 0; - return (unusable == 0xF); -} - -u8 IsImprisoned(u8 bank, u16 move) -{ - u8 imprisionedMoves = 0; - u8 bankSide = GetBankSide(bank); - s32 i; - for (i = 0; i < gNoOfAllBanks; i++) - { - if (bankSide != GetBankSide(i) && gStatuses3[i] & STATUS3_IMPRISIONED) - { - s32 j; - for (j = 0; j < 4; j++) - { - if (move == gBattleMons[i].moves[j]) - break; - } - if (j < 4) - imprisionedMoves++; - } - } - return imprisionedMoves; -} - -u8 UpdateTurnCounters(void) -{ - u8 effect = 0; - s32 i; - - for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks && gAbsentBankFlags & gBitTable[gBankAttacker]; gBankAttacker++) - { - } - for (gBankTarget = 0; gBankTarget < gNoOfAllBanks && gAbsentBankFlags & gBitTable[gBankTarget]; gBankTarget++) - { - } - - do - { - u8 sideBank; - - switch (BATTLE_STRUCT->turncountersTracker) - { - case 0: - for (i = 0; i < gNoOfAllBanks; i++) - { - gBanksByTurnOrder[i] = i; - } - for (i = 0; i < gNoOfAllBanks - 1; i++) - { - s32 j; - for (j = i + 1; j < gNoOfAllBanks; j++) - { - if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0)) - SwapTurnOrder(i, j); - } - } - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; - case 1: - while (BATTLE_STRUCT->turnSideTracker < 2) - { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; - - if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT) - { - if (--gSideTimers[sideBank].reflectTimer == 0) - { - - gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT; - b_call_bc_move_exec(BattleScript_SideStatusWoreOff); - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = MOVE_REFLECT; - gBattleTextBuff1[3] = MOVE_REFLECT >> 8; - gBattleTextBuff1[4] = EOS; - effect++; - } - } - BATTLE_STRUCT->turnSideTracker++; - if (effect) - break; - } - if (!effect) - { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; - } - break; - case 2: - while (BATTLE_STRUCT->turnSideTracker < 2) - { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; - if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN) - { - if (--gSideTimers[sideBank].lightscreenTimer == 0) - { - gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN; - b_call_bc_move_exec(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = MOVE_LIGHT_SCREEN; - gBattleTextBuff1[3] = MOVE_LIGHT_SCREEN >> 8; - gBattleTextBuff1[4] = EOS; - effect++; - } - } - BATTLE_STRUCT->turnSideTracker++; - if (effect) - break; - } - if (!effect) - { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; - } - break; - case 3: - while (BATTLE_STRUCT->turnSideTracker < 2) - { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; - if (gSideTimers[sideBank].mistTimer && --gSideTimers[sideBank].mistTimer == 0) - { - gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST; - b_call_bc_move_exec(BattleScript_SideStatusWoreOff); - gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = MOVE_MIST; - gBattleTextBuff1[3] = MOVE_MIST >> 8; - gBattleTextBuff1[4] = EOS; - effect++; - } - BATTLE_STRUCT->turnSideTracker++; - if (effect) - break; - } - if (!effect) - { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; - } - break; - case 4: - while (BATTLE_STRUCT->turnSideTracker < 2) - { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; - if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD) - { - if (--gSideTimers[sideBank].safeguardTimer == 0) - { - gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD; - b_call_bc_move_exec(BattleScript_SafeguardEnds); - effect++; - } - } - BATTLE_STRUCT->turnSideTracker++; - if (effect) - break; - } - if (!effect) - { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; - } - break; - case 5: - while (BATTLE_STRUCT->turnSideTracker < gNoOfAllBanks) - { - gActiveBank = gBanksByTurnOrder[BATTLE_STRUCT->turnSideTracker]; - if (gWishFutureKnock.wishCounter[gActiveBank] && --gWishFutureKnock.wishCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp) - { - gBankTarget = gActiveBank; - b_call_bc_move_exec(BattleScript_WishComesTrue); - effect++; - } - BATTLE_STRUCT->turnSideTracker++; - if (effect) - break; - } - if (!effect) - { - BATTLE_STRUCT->turncountersTracker++; - } - break; - case 6: - if (gBattleWeather & WEATHER_RAIN_ANY) - { - if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) - { - if (--gWishFutureKnock.weatherDuration == 0) - { - gBattleWeather &= ~WEATHER_RAIN_TEMPORARY; - gBattleWeather &= ~WEATHER_RAIN_DOWNPOUR; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; - } - else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR) - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - else - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - } - else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR) - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - else - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - b_call_bc_move_exec(BattleScript_RainContinuesOrEnds); - effect++; - } - BATTLE_STRUCT->turncountersTracker++; - break; - case 7: - if (gBattleWeather & WEATHER_SANDSTORM_ANY) - { - if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) - { - gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY; - gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; - } - else - gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; - - BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - b_call_bc_move_exec(gBattlescriptCurrInstr); - effect++; - } - BATTLE_STRUCT->turncountersTracker++; - break; - case 8: - if (gBattleWeather & WEATHER_SUN_ANY) - { - if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) - { - gBattleWeather &= ~WEATHER_SUN_TEMPORARY; - gBattlescriptCurrInstr = BattleScript_SunlightFaded; - } - else - gBattlescriptCurrInstr = BattleScript_SunlightContinues; - - b_call_bc_move_exec(gBattlescriptCurrInstr); - effect++; - } - BATTLE_STRUCT->turncountersTracker++; - break; - case 9: - if (gBattleWeather & WEATHER_HAIL) - { - if (--gWishFutureKnock.weatherDuration == 0) - { - gBattleWeather &= ~WEATHER_HAIL; - gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; - } - else - gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; - - BATTLE_STRUCT->animArg1 = B_ANIM_HAIL_CONTINUES; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - b_call_bc_move_exec(gBattlescriptCurrInstr); - effect++; - } - BATTLE_STRUCT->turncountersTracker++; - break; - case 10: - effect++; - break; - } - } while (effect == 0); - return (gBattleMainFunc != BattleTurnPassed); -} - -#define TURNBASED_MAX_CASE 19 - -u8 TurnBasedEffects(void) -{ - u8 effect = 0; - - gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); - while (BATTLE_STRUCT->turnEffectsBank < gNoOfAllBanks && BATTLE_STRUCT->turnEffectsTracker <= TURNBASED_MAX_CASE) - { - gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->turnEffectsBank]; - if (gAbsentBankFlags & gBitTable[gActiveBank]) - { - BATTLE_STRUCT->turnEffectsBank++; - } - else - { - switch (BATTLE_STRUCT->turnEffectsTracker) - { - case 0: // ingrain - if ((gStatuses3[gActiveBank] & STATUS3_ROOTED) - && gBattleMons[gActiveBank].hp != gBattleMons[gActiveBank].maxHP - && gBattleMons[gActiveBank].hp != 0) - { - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - gBattleMoveDamage *= -1; - b_call_bc_move_exec(BattleScript_IngrainTurnHeal); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 1: // end turn abilities - if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBank, 0, 0, 0)) - effect++; - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 2: // item effects - if (ItemBattleEffects(1, gActiveBank, 0)) - effect++; - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 18: // item effects again - if (ItemBattleEffects(1, gActiveBank, 1)) - effect++; - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 3: // leech seed - if (gStatuses3[gActiveBank] & STATUS3_LEECHSEED && gBattleMons[gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK].hp != 0 && gBattleMons[gActiveBank].hp != 0) - { - gBankTarget = gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - BATTLE_STRUCT->animArg1 = gBankTarget; - BATTLE_STRUCT->animArg2 = gBankAttacker; - b_call_bc_move_exec(BattleScript_LeechSeedTurnDrain); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 4: // poison - if ((gBattleMons[gActiveBank].status1 & STATUS_POISON) && gBattleMons[gActiveBank].hp != 0) - { - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - b_call_bc_move_exec(BattleScript_PoisonTurnDmg); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 5: // toxic poison - if ((gBattleMons[gActiveBank].status1 & STATUS_TOXIC_POISON) && gBattleMons[gActiveBank].hp != 0) - { - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - if ((gBattleMons[gActiveBank].status1 & 0xF00) != 0xF00) //not 16 turns - gBattleMons[gActiveBank].status1 += 0x100; - gBattleMoveDamage *= (gBattleMons[gActiveBank].status1 & 0xF00) >> 8; - b_call_bc_move_exec(BattleScript_PoisonTurnDmg); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 6: // burn - if ((gBattleMons[gActiveBank].status1 & STATUS_BURN) && gBattleMons[gActiveBank].hp != 0) - { - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - b_call_bc_move_exec(BattleScript_BurnTurnDmg); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 7: // spooky nightmares - if ((gBattleMons[gActiveBank].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBank].hp != 0) - { - // missing sleep check - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - b_call_bc_move_exec(BattleScript_NightmareTurnDmg); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 8: // curse - if ((gBattleMons[gActiveBank].status2 & STATUS2_CURSED) && gBattleMons[gActiveBank].hp != 0) - { - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - b_call_bc_move_exec(BattleScript_CurseTurnDmg); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 9: // wrap - if ((gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBank].hp != 0) - { - gBattleMons[gActiveBank].status2 -= 0x2000; - if (gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) // damaged by wrap - { - BATTLE_STRUCT->animArg1 = ewram16004arr(0, gActiveBank); - BATTLE_STRUCT->animArg2 = ewram16004arr(1, gActiveBank); - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank); - gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank); - gBattleTextBuff1[4] = EOS; - gBattlescriptCurrInstr = BattleScript_WrapTurnDmg; - gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - } - else // broke free - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank); - gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank); - gBattleTextBuff1[4] = EOS; - gBattlescriptCurrInstr = BattleScript_WrapEnds; - } - b_call_bc_move_exec(gBattlescriptCurrInstr); - effect++; - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 10: // uproar - if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR) - { - for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks; gBankAttacker++) - { - if ((gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) - && gBattleMons[gBankAttacker].ability != ABILITY_SOUNDPROOF) - { - gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP); - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE); - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - b_call_bc_move_exec(BattleScript_MonWokeUpInUproar); - gActiveBank = gBankAttacker; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); - MarkBufferBankForExecution(gActiveBank); - break; - } - } - if (gBankAttacker != gNoOfAllBanks) - { - effect = 2; // a pokemon was awaken - break; - } - else - { - gBankAttacker = gActiveBank; - gBattleMons[gActiveBank].status2 -= 0x10; // uproar timer goes down - if (sub_8015660(gActiveBank)) - { - CancelMultiTurnMoves(gActiveBank); - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - } - else if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR) - { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattleMons[gActiveBank].status2 |= STATUS2_MULTIPLETURNS; - } - else - { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - CancelMultiTurnMoves(gActiveBank); - } - b_call_bc_move_exec(BattleScript_PrintUproarOverTurns); - effect = 1; - } - } - if (effect != 2) - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 11: // thrash - if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE) - { - gBattleMons[gActiveBank].status2 -= 0x400; - if (sub_8015660(gActiveBank)) - CancelMultiTurnMoves(gActiveBank); - else if (!(gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE) - && (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS)) - { - gBattleMons[gActiveBank].status2 &= ~(STATUS2_MULTIPLETURNS); - if (!(gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION)) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 0x47; - SetMoveEffect(1, 0); - if (gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION) - b_call_bc_move_exec(BattleScript_ThrashConfuses); - effect++; - } - } - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 12: // disable - if (gDisableStructs[gActiveBank].disableTimer1 != 0) - { - int i; - for (i = 0; i < 4; i++) - { - if (gDisableStructs[gActiveBank].disabledMove == gBattleMons[gActiveBank].moves[i]) - break; - } - if (i == 4) // pokemon does not have the disabled move anymore - { - gDisableStructs[gActiveBank].disabledMove = 0; - gDisableStructs[gActiveBank].disableTimer1 = 0; - } - else if (--gDisableStructs[gActiveBank].disableTimer1 == 0) // disable ends - { - gDisableStructs[gActiveBank].disabledMove = 0; - b_call_bc_move_exec(BattleScript_DisabledNoMore); - effect++; - } - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 13: // encore - if (gDisableStructs[gActiveBank].encoreTimer1 != 0) - { - if (gBattleMons[gActiveBank].moves[gDisableStructs[gActiveBank].encoredMovePos] != gDisableStructs[gActiveBank].encoredMove) // pokemon does not have the encored move anymore - { - gDisableStructs[gActiveBank].encoredMove = 0; - gDisableStructs[gActiveBank].encoreTimer1 = 0; - } - else if (--gDisableStructs[gActiveBank].encoreTimer1 == 0 - || gBattleMons[gActiveBank].pp[gDisableStructs[gActiveBank].encoredMovePos] == 0) - { - gDisableStructs[gActiveBank].encoredMove = 0; - gDisableStructs[gActiveBank].encoreTimer1 = 0; - b_call_bc_move_exec(BattleScript_EncoredNoMore); - effect++; - } - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 14: // lock-on decrement - if (gStatuses3[gActiveBank] & STATUS3_ALWAYS_HITS) - gStatuses3[gActiveBank] -= 0x8; - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 15: // charge - if (gDisableStructs[gActiveBank].chargeTimer1 && --gDisableStructs[gActiveBank].chargeTimer1 == 0) - gStatuses3[gActiveBank] &= ~STATUS3_CHARGED_UP; - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 16: // taunt - if (gDisableStructs[gActiveBank].tauntTimer1) - gDisableStructs[gActiveBank].tauntTimer1--; - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 17: // yawn - if (gStatuses3[gActiveBank] & STATUS3_YAWN) - { - gStatuses3[gActiveBank] -= 0x800; - if (!(gStatuses3[gActiveBank] & STATUS3_YAWN) && !(gBattleMons[gActiveBank].status1 & STATUS_ANY) - && gBattleMons[gActiveBank].ability != ABILITY_VITAL_SPIRIT - && gBattleMons[gActiveBank].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBank)) - { - CancelMultiTurnMoves(gActiveBank); - gBattleMons[gActiveBank].status1 |= (Random() & 3) + 2; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); - MarkBufferBankForExecution(gActiveBank); - gEffectBank = gActiveBank; - b_call_bc_move_exec(BattleScript_YawnMakesAsleep); - effect++; - } - } - BATTLE_STRUCT->turnEffectsTracker++; - break; - case 19: // done - BATTLE_STRUCT->turnEffectsTracker = 0; - BATTLE_STRUCT->turnEffectsBank++; - break; - } - if (effect != 0) - return effect; - } - } - gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20); - return 0; -} - -bool8 sub_80170DC(void) // handle future sight and perish song -{ - gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); - switch (BATTLE_STRUCT->sub80170DC_Tracker) - { - case 0: // future sight - while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks) - { - gActiveBank = BATTLE_STRUCT->sub80170DC_Bank; - if (gAbsentBankFlags & gBitTable[gActiveBank]) - BATTLE_STRUCT->sub80170DC_Bank++; - else - { - BATTLE_STRUCT->sub80170DC_Bank++; - if (gWishFutureKnock.futureSightCounter[gActiveBank] && --gWishFutureKnock.futureSightCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp) - { - if (gWishFutureKnock.futureSightMove[gActiveBank] == MOVE_FUTURE_SIGHT) - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - else //Doom Desire - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = gWishFutureKnock.futureSightMove[gActiveBank]; - gBattleTextBuff1[3] = gWishFutureKnock.futureSightMove[gActiveBank] >> 8; - gBattleTextBuff1[4] = 0xFF; - gBankTarget = gActiveBank; - gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank]; - gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank]; - gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF; - b_call_bc_move_exec(BattleScript_MonTookFutureAttack); - return 1; - } - } - } - BATTLE_STRUCT->sub80170DC_Tracker = 1; - BATTLE_STRUCT->sub80170DC_Bank = 0; - case 1: // perish song - while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks) - { - gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->sub80170DC_Bank]; - if (gAbsentBankFlags & gBitTable[gActiveBank]) - BATTLE_STRUCT->sub80170DC_Bank++; - else - { - BATTLE_STRUCT->sub80170DC_Bank++; - if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 1; - gBattleTextBuff1[2] = 1; - gBattleTextBuff1[3] = 1; - gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSong1; - gBattleTextBuff1[5] = 0xFF; - if (gDisableStructs[gActiveBank].perishSong1 == 0) - { - gStatuses3[gActiveBank] &= ~(STATUS3_PERISH_SONG); - gBattleMoveDamage = gBattleMons[gActiveBank].hp; - gBattlescriptCurrInstr = BattleScript_PerishSongHits; - } - else - { - gDisableStructs[gActiveBank].perishSong1--; - gBattlescriptCurrInstr = BattleScript_PerishSongTimerGoesDown; - } - b_call_bc_move_exec(gBattlescriptCurrInstr); - return 1; - } - } - } - break; - } - gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20); - return 0; -} - -#define HandleFaintedMonActions_MAX_CASE 7 - -bool8 HandleFaintedMonActions(void) -{ - if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) - return 0; - do - { - int i; - switch (BATTLE_STRUCT->sub80173A4_Tracker) - { - case 0: - BATTLE_STRUCT->unk1605A = 0; - BATTLE_STRUCT->sub80173A4_Tracker++; - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gAbsentBankFlags & gBitTable[i] && !sub_8018018(i, 6, 6)) - gAbsentBankFlags &= ~(gBitTable[i]); - } - case 1: - do - { - gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; - if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(BATTLE_STRUCT->unk16113 & gBitTable[gBattlePartyID[BATTLE_STRUCT->unk1605A]]) && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) - { - b_call_bc_move_exec(BattleScript_GiveExp); - BATTLE_STRUCT->sub80173A4_Tracker = 2; - return 1; - } - } while (++BATTLE_STRUCT->unk1605A != gNoOfAllBanks); - BATTLE_STRUCT->sub80173A4_Tracker = 3; - break; - case 2: - sub_8015740(gBank1); - if (++BATTLE_STRUCT->unk1605A == gNoOfAllBanks) - BATTLE_STRUCT->sub80173A4_Tracker = 3; - else - BATTLE_STRUCT->sub80173A4_Tracker = 1; - break; - case 3: - BATTLE_STRUCT->unk1605A = 0; - BATTLE_STRUCT->sub80173A4_Tracker++; - case 4: - do - { - gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; //or should banks be switched? - if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) - { - b_call_bc_move_exec(BattleScript_HandleFaintedMon); - BATTLE_STRUCT->sub80173A4_Tracker = 5; - return 1; - } - } while (++BATTLE_STRUCT->unk1605A != gNoOfAllBanks); - BATTLE_STRUCT->sub80173A4_Tracker = 6; - break; - case 5: - if (++BATTLE_STRUCT->unk1605A == gNoOfAllBanks) - BATTLE_STRUCT->sub80173A4_Tracker = 6; - else - BATTLE_STRUCT->sub80173A4_Tracker = 4; - break; - case 6: - if (AbilityBattleEffects(9, 0, 0, 0, 0) || AbilityBattleEffects(0xB, 0, 0, 0, 0) || ItemBattleEffects(1, 0, 1) || AbilityBattleEffects(6, 0, 0, 0, 0)) - return 1; - BATTLE_STRUCT->sub80173A4_Tracker++; - break; - case 7: - break; - } - } while (BATTLE_STRUCT->sub80173A4_Tracker != HandleFaintedMonActions_MAX_CASE); - return 0; -} - -void b_clear_atk_up_if_hit_flag_unless_enraged(void) -{ - int i; - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].status2 & STATUS2_RAGE && gChosenMovesByBanks[i] != MOVE_RAGE) - gBattleMons[i].status2 &= ~(STATUS2_RAGE); - } -} - -#define ATKCANCELLER_MAX_CASE 14 - -u8 AtkCanceller_UnableToUseMove(void) -{ - u8 effect = 0; - s32* bideDmg = &BATTLE_STRUCT->bideDmg; - do - { - switch (BATTLE_STRUCT->atkCancellerTracker) - { - case 0: // flags clear - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_DESTINY_BOND); - gStatuses3[gBankAttacker] &= ~(STATUS3_GRUDGE); - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 1: // check being asleep - if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) - { - if (UproarWakeUpCheck(gBankAttacker)) - { - gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP); - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE); - b_movescr_stack_push_cursor(); - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp; - effect = 2; - } - else - { - u8 toSub; - if (gBattleMons[gBankAttacker].ability == ABILITY_EARLY_BIRD) - toSub = 2; - else - toSub = 1; - if ((gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) < toSub) - gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP); - else - gBattleMons[gBankAttacker].status1 -= toSub; - if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) - { - if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK) - { - gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - effect = 2; - } - } - else - { - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE); - b_movescr_stack_push_cursor(); - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp; - effect = 2; - } - } - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 2: // check being frozen - if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE) - { - if (Random() % 5) - { - if (gBattleMoves[gCurrentMove].effect != EFFECT_THAW_HIT) // unfreezing via a move effect happens in case 13 - { - gBattlescriptCurrInstr = BattleScript_MoveUsedIsFrozen; - gHitMarker |= HITMARKER_NO_ATTACKSTRING; - } - else - { - BATTLE_STRUCT->atkCancellerTracker++; - break; - } - } - else // unfreeze - { - gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - } - effect = 2; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 3: // truant - if (gBattleMons[gBankAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBankAttacker].truantCounter) - { - CancelMultiTurnMoves(gBankAttacker); - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround; - gBattleMoveFlags |= MOVESTATUS_MISSED; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 4: // recharge - if (gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE) - { - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RECHARGE); - gDisableStructs[gBankAttacker].rechargeCounter = 0; - CancelMultiTurnMoves(gBankAttacker); - gBattlescriptCurrInstr = BattleScript_MoveUsedMustRecharge; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 5: // flinch - if (gBattleMons[gBankAttacker].status2 & STATUS2_FLINCHED) - { - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_FLINCHED); - gProtectStructs[gBankAttacker].flinchImmobility = 1; - CancelMultiTurnMoves(gBankAttacker); - gBattlescriptCurrInstr = BattleScript_MoveUsedFlinched; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 6: // disabled move - if (gDisableStructs[gBankAttacker].disabledMove == gCurrentMove && gDisableStructs[gBankAttacker].disabledMove != 0) - { - gProtectStructs[gBankAttacker].usedDisabledMove = 1; - BATTLE_STRUCT->scriptingActive = gBankAttacker; - CancelMultiTurnMoves(gBankAttacker); - gBattlescriptCurrInstr = BattleScript_MoveUsedIsDisabled; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 7: // taunt - if (gDisableStructs[gBankAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0) - { - gProtectStructs[gBankAttacker].usedTauntedMove = 1; - CancelMultiTurnMoves(gBankAttacker); - gBattlescriptCurrInstr = BattleScript_MoveUsedIsTaunted; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 8: // imprisoned - if (IsImprisoned(gBankAttacker, gCurrentMove)) - { - gProtectStructs[gBankAttacker].usedImprisionedMove = 1; - CancelMultiTurnMoves(gBankAttacker); - gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 9: // confusion - if (gBattleMons[gBankAttacker].status2 & STATUS2_CONFUSION) - { - gBattleMons[gBankAttacker].status2--; - if (gBattleMons[gBankAttacker].status2 & STATUS2_CONFUSION) - { - if (Random() & 1) - { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - b_movescr_stack_push_cursor(); - } - else // confusion dmg - { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gBankTarget = gBankAttacker; - gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker); - gProtectStructs[gBankAttacker].confusionSelfDmg = 1; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - } - gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused; - } - else // snapped out of confusion - { - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfusedNoMore; - } - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 10: // paralysis - if (gBattleMons[gBankAttacker].status1 & STATUS_PARALYSIS && (Random() % 4) == 0) - { - gProtectStructs[gBankAttacker].prlzImmobility = 1; - CancelMultiTurnMoves(gBankAttacker); - gBattlescriptCurrInstr = BattleScript_MoveUsedIsParalyzed; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 11: // infatuation - if (gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) - { - BATTLE_STRUCT->scriptingActive = CountTrailingZeroBits((gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) >> 0x10); - if (Random() & 1) - b_movescr_stack_push_cursor(); - else - { - b_movescr_stack_push(BattleScript_MoveUsedIsParalyzedCantAttack); - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - gProtectStructs[gBankAttacker].loveImmobility = 1; - CancelMultiTurnMoves(gBankAttacker); - } - gBattlescriptCurrInstr = BattleScript_MoveUsedIsInLove; - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 12: // bide - if (gBattleMons[gBankAttacker].status2 & STATUS2_BIDE) - { - gBattleMons[gBankAttacker].status2 -= 0x100; - if (gBattleMons[gBankAttacker].status2 & STATUS2_BIDE) - gBattlescriptCurrInstr = BattleScript_BideStoringEnergy; - else - { - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_MULTIPLETURNS); - if (gTakenDmg[gBankAttacker]) - { - gCurrentMove = MOVE_BIDE; - *bideDmg = gTakenDmg[gBankAttacker] * 2; - gBankTarget = gTakenDmgBanks[gBankAttacker]; - if (gAbsentBankFlags & gBitTable[gBankTarget]) - gBankTarget = GetMoveTarget(MOVE_BIDE, 1); - gBattlescriptCurrInstr = BattleScript_BideAttack; - } - else - gBattlescriptCurrInstr = BattleScript_BideNoEnergyToAttack; - } - effect = 1; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 13: // move thawing - if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE) - { - if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT) - { - gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - } - effect = 2; - } - BATTLE_STRUCT->atkCancellerTracker++; - break; - case 14: // last case - break; - } - - } while (BATTLE_STRUCT->atkCancellerTracker != ATKCANCELLER_MAX_CASE && effect == 0); - - if (effect == 2) - { - gActiveBank = gBankAttacker; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); - MarkBufferBankForExecution(gActiveBank); - } - return effect; -} - -bool8 sub_8018018(u8 bank, u8 r1, u8 r2) -{ - struct Pokemon* party; - u8 r7; - u8 r6; - s32 i; - if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) - return 0; - if (gBattleTypeFlags & BATTLE_TYPE_MULTI) - { - r7 = sub_803FC34(bank); - if (GetBankSide(bank) == 0) - party = gPlayerParty; - else - party = gEnemyParty; - r6 = sub_803FBFC(r7); - for (i = r6 * 3; i < r6 * 3 + 3; i++) - { - if (GetMonData(&party[i], MON_DATA_HP) && GetMonData(&party[i], MON_DATA_SPECIES2) && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) - break; - } - return (i == r6 * 3 + 3); - } - else - { - if (GetBankSide(bank) == 1) - { - r7 = GetBankByIdentity(1); - r6 = GetBankByIdentity(3); - party = gEnemyParty; - } - else - { - r7 = GetBankByIdentity(0); - r6 = GetBankByIdentity(2); - party = gPlayerParty; - } - if (r1 == 6) - r1 = gBattlePartyID[r7]; - if (r2 == 6) - r2 = gBattlePartyID[r6]; - for (i = 0; i < 6; i++) - { - if (GetMonData(&party[i], MON_DATA_HP) && GetMonData(&party[i], MON_DATA_SPECIES2) && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG && i != r1 && i != r2 && i != ewram16068arr(r7) && i != ewram16068arr(r6)) - break; - } - return (i == 6); - } -} - -enum -{ - CASTFORM_NO_CHANGE, //0 - CASTFORM_TO_NORMAL, //1 - CASTFORM_TO_FIRE, //2 - CASTFORM_TO_WATER, //3 - CASTFORM_TO_ICE, //4 -}; - -u8 CastformDataTypeChange(u8 bank) -{ - u8 formChange = 0; - if (gBattleMons[bank].species != SPECIES_CASTFORM || gBattleMons[bank].ability != ABILITY_FORECAST || gBattleMons[bank].hp == 0) - return CASTFORM_NO_CHANGE; - if (!WEATHER_HAS_EFFECT && gBattleMons[bank].type1 != TYPE_NORMAL && gBattleMons[bank].type2 != TYPE_NORMAL) - { - gBattleMons[bank].type1 = TYPE_NORMAL; - gBattleMons[bank].type2 = TYPE_NORMAL; - return CASTFORM_TO_NORMAL; - } - if (!WEATHER_HAS_EFFECT) - return CASTFORM_NO_CHANGE; - if (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL)) && gBattleMons[bank].type1 != TYPE_NORMAL && gBattleMons[bank].type2 != TYPE_NORMAL) - { - gBattleMons[bank].type1 = TYPE_NORMAL; - gBattleMons[bank].type2 = TYPE_NORMAL; - formChange = CASTFORM_TO_NORMAL; - } - if (gBattleWeather & WEATHER_SUN_ANY && gBattleMons[bank].type1 != TYPE_FIRE && gBattleMons[bank].type2 != TYPE_FIRE) - { - gBattleMons[bank].type1 = TYPE_FIRE; - gBattleMons[bank].type2 = TYPE_FIRE; - formChange = CASTFORM_TO_FIRE; - } - if (gBattleWeather & WEATHER_RAIN_ANY && gBattleMons[bank].type1 != TYPE_WATER && gBattleMons[bank].type2 != TYPE_WATER) - { - gBattleMons[bank].type1 = TYPE_WATER; - gBattleMons[bank].type2 = TYPE_WATER; - formChange = CASTFORM_TO_WATER; - } - if (gBattleWeather & WEATHER_HAIL && gBattleMons[bank].type1 != TYPE_ICE && gBattleMons[bank].type2 != TYPE_ICE) - { - gBattleMons[bank].type1 = TYPE_ICE; - gBattleMons[bank].type2 = TYPE_ICE; - formChange = CASTFORM_TO_ICE; - } - return formChange; -} - -u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) -{ - u8 effect = 0; - struct Pokemon* pokeAtk; - struct Pokemon* pokeDef; - u16 speciesAtk; - u16 speciesDef; - u32 pidAtk; - u32 pidDef; - - if (gBankAttacker >= gNoOfAllBanks) - gBankAttacker = bank; - if (GetBankSide(gBankAttacker) == 0) - pokeAtk = &gPlayerParty[gBattlePartyID[gBankAttacker]]; - else - pokeAtk = &gEnemyParty[gBattlePartyID[gBankAttacker]]; - - if (gBankTarget >= gNoOfAllBanks) - gBankTarget = bank; - if (GetBankSide(gBankTarget) == 0) - pokeDef = &gPlayerParty[gBattlePartyID[gBankTarget]]; - else - pokeDef = &gEnemyParty[gBattlePartyID[gBankTarget]]; - - speciesAtk = GetMonData(pokeAtk, MON_DATA_SPECIES); - pidAtk = GetMonData(pokeAtk, MON_DATA_PERSONALITY); - - speciesDef = GetMonData(pokeDef, MON_DATA_SPECIES); - pidDef = GetMonData(pokeDef, MON_DATA_PERSONALITY); - - if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) // why isn't that check done at the beginning? - { - u8 moveType; - s32 i; - u16 move; - u8 side; - u8 target1; - - if (special) - gLastUsedAbility = special; - else - gLastUsedAbility = gBattleMons[bank].ability; - - if (moveArg) - move = moveArg; - else - move = gCurrentMove; - - if (BATTLE_STRUCT->dynamicMoveType) - moveType = BATTLE_STRUCT->dynamicMoveType & 0x3F; - else - moveType = gBattleMoves[move].type; - - //_080184AC - switch (caseID) - { - case ABILITYEFFECT_ON_SWITCHIN: // 0 - //_08018518 - if (gBankAttacker >= gNoOfAllBanks) - gBankAttacker = bank; - switch (gLastUsedAbility) - { - case 0xFF: //weather from overworld - //_08018586 - switch (weather_get_current()) - { - case WEATHER_RAIN_LIGHT: - case WEATHER_RAIN_MED: - case WEATHER_RAIN_HEAVY: - if (!(gBattleWeather & WEATHER_RAIN_ANY)) - { - gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); - BATTLE_STRUCT->animArg1 = B_ANIM_RAIN_CONTINUES; - BATTLE_STRUCT->scriptingActive = bank; - effect++; - } - break; - case WEATHER_SANDSTORM: - if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) - { - gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); - BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; - BATTLE_STRUCT->scriptingActive = bank; - effect++; - } - break; - case WEATHER_DROUGHT: - if (!(gBattleWeather & WEATHER_SUN_ANY)) - { - gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); - BATTLE_STRUCT->animArg1 = B_ANIM_SUN_CONTINUES; - BATTLE_STRUCT->scriptingActive = bank; - effect++; - } - break; - } - if (effect) - { - gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current(); - b_push_move_exec(BattleScript_OverworldWeatherStarts); - } - break; - case ABILITY_DRIZZLE: - //_08018680 - if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) - { - gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY); - b_push_move_exec(BattleScript_DrizzleActivates); - BATTLE_STRUCT->scriptingActive = bank; - effect++; - } - break; - case ABILITY_SAND_STREAM: - //_080186B8 - if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT)) - { - gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); - b_push_move_exec(BattleScript_SandstreamActivates); - BATTLE_STRUCT->scriptingActive = bank; - effect++; - } - break; - case ABILITY_DROUGHT: - //_080186F0 - if (!(gBattleWeather & WEATHER_SUN_PERMANENT)) - { - gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); - b_push_move_exec(BattleScript_DroughtActivates); - BATTLE_STRUCT->scriptingActive = bank; - effect++; - } - break; - case ABILITY_INTIMIDATE: - //_08018728 - if (!(gSpecialStatuses[bank].intimidatedPoke)) - { - gStatuses3[bank] |= STATUS3_INTIMIDATE_POKES; - gSpecialStatuses[bank].intimidatedPoke = 1; - } - break; - case ABILITY_FORECAST: - //_0801875C - effect = CastformDataTypeChange(bank); - if (effect != 0) - { - b_push_move_exec(BattleScript_CastformChange); - BATTLE_STRUCT->scriptingActive = bank; - BATTLE_STRUCT->castformToChangeInto = effect - 1; - } - break; - case ABILITY_TRACE: - //_080187A0 - if (!(gSpecialStatuses[bank].traced)) - { - gStatuses3[bank] |= STATUS3_TRACE; - gSpecialStatuses[bank].traced = 1; - } - break; - case ABILITY_CLOUD_NINE: - case ABILITY_AIR_LOCK: - //_080187DC - { - // that's a weird choice for a variable, why not use i or bank? - for (target1 = 0; target1 < gNoOfAllBanks; target1++) - { - effect = CastformDataTypeChange(target1); - if (effect != 0) - { - b_push_move_exec(BattleScript_CastformChange); - BATTLE_STRUCT->scriptingActive = target1; - BATTLE_STRUCT->castformToChangeInto = effect - 1; - break; - } - } - } - break; - } - break; - case ABILITYEFFECT_ENDTURN: // 1 - //_08018814 - if (gBattleMons[bank].hp != 0) - { - gBankAttacker = bank; - switch (gLastUsedAbility) - { - case ABILITY_RAIN_DISH: - if (WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY) - && gBattleMons[bank].maxHP > gBattleMons[bank].hp) - { - gLastUsedAbility = ABILITY_RAIN_DISH; // why - b_push_move_exec(BattleScript_RainDishActivates); - gBattleMoveDamage = gBattleMons[bank].maxHP / 16; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - gBattleMoveDamage *= -1; - effect++; - } - break; - case ABILITY_SHED_SKIN: - if ((gBattleMons[bank].status1 & STATUS_ANY) && (Random() % 3) == 0) - { - if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON)) - StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); - if (gBattleMons[bank].status1 & STATUS_SLEEP) - StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) - StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); - if (gBattleMons[bank].status1 & STATUS_BURN) - StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); - if (gBattleMons[bank].status1 & STATUS_FREEZE) - StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); - gBattleMons[bank].status1 = 0; - // BUG: The nightmare status does not get cleared here. This was fixed in Emerald. - //gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); - BATTLE_STRUCT->scriptingActive = gActiveBank = bank; - b_push_move_exec(BattleScript_ShedSkinActivates); - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1); - MarkBufferBankForExecution(gActiveBank); - effect++; - } - break; - case ABILITY_SPEED_BOOST: - if (gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC && gDisableStructs[bank].isFirstTurn != 2) - { - gBattleMons[bank].statStages[STAT_STAGE_SPEED]++; - BATTLE_STRUCT->animArg1 = 0x11; - BATTLE_STRUCT->animArg2 = 0; - b_push_move_exec(BattleScript_SpeedBoostActivates); - BATTLE_STRUCT->scriptingActive = bank; - effect++; - } - break; - case ABILITY_TRUANT: - gDisableStructs[gBankAttacker].truantCounter ^= 1; - break; - } - } - break; - case ABILITYEFFECT_MOVES_BLOCK: // 2 - //_08018A40 - if (gLastUsedAbility == ABILITY_SOUNDPROOF) - { - for (i = 0; gSoundMovesTable[i] != 0xFFFF; i++) - { - if (gSoundMovesTable[i] == move) - break; - } - if (gSoundMovesTable[i] != 0xFFFF) - { - if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS) - gHitMarker |= HITMARKER_NO_PPDEDUCT; - gBattlescriptCurrInstr = BattleScript_SoundproofProtected; - effect = 1; - } - } - break; - case ABILITYEFFECT_ABSORBING: // 3 - //_08018AD8 - if (move) - { - switch (gLastUsedAbility) - { - case ABILITY_VOLT_ABSORB: - if (moveType == TYPE_ELECTRIC && gBattleMoves[move].power != 0) - { - if (gProtectStructs[gBankAttacker].notFirstStrike) - gBattlescriptCurrInstr = BattleScript_MoveHPDrain; - else - gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss; - effect = 1; - } - break; - case ABILITY_WATER_ABSORB: - if (moveType == TYPE_WATER && gBattleMoves[move].power != 0) - { - if (gProtectStructs[gBankAttacker].notFirstStrike) - gBattlescriptCurrInstr = BattleScript_MoveHPDrain; - else - gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss; - effect = 1; - } - break; - case ABILITY_FLASH_FIRE: - if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS_FREEZE)) - { - if (!(eFlashFireArr.arr[bank] & 1)) - { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - if (gProtectStructs[gBankAttacker].notFirstStrike) - gBattlescriptCurrInstr = BattleScript_FlashFireBoost; - else - gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss; - eFlashFireArr.arr[bank] |= 1; - effect = 2; - } - else - { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - if (gProtectStructs[gBankAttacker].notFirstStrike) - gBattlescriptCurrInstr = BattleScript_FlashFireBoost; - else - gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss; - effect = 2; - } - } - break; - } - if (effect == 1) - { - if (gBattleMons[bank].maxHP == gBattleMons[bank].hp) - { - if ((gProtectStructs[gBankAttacker].notFirstStrike)) - gBattlescriptCurrInstr = BattleScript_MoveHPDrain_FullHP; - else - gBattlescriptCurrInstr = BattleScript_MoveHPDrain_FullHP_PPLoss; - } - else - { - gBattleMoveDamage = gBattleMons[bank].maxHP / 4; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - gBattleMoveDamage *= -1; - } - } - } - break; - case ABILITYEFFECT_CONTACT: // 4 - //_08018CF0 - switch (gLastUsedAbility) - { - case ABILITY_COLOR_CHANGE: - //_08018DCC - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && move != MOVE_STRUGGLE - && gBattleMoves[move].power != 0 - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && gBattleMons[bank].type1 != moveType - && gBattleMons[bank].type2 != moveType - && gBattleMons[bank].hp != 0) - { - gBattleMons[bank].type1 = moveType; - gBattleMons[bank].type2 = moveType; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 3; - gBattleTextBuff1[2] = moveType; - gBattleTextBuff1[3] = 0xFF; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_ColorChangeActivates; - effect++; - } - break; - case ABILITY_ROUGH_SKIN: - //_08018E94 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)) - { - gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 16; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_RoughSkinActivates; - effect++; - } - break; - case ABILITY_EFFECT_SPORE: - //_08018F54 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (Random() % 10) == 0) - { - do - { - gBattleCommunication[MOVE_EFFECT_BYTE] = Random() & 3; - } while (gBattleCommunication[MOVE_EFFECT_BYTE] == 0); - if (gBattleCommunication[MOVE_EFFECT_BYTE] == 3) - gBattleCommunication[MOVE_EFFECT_BYTE] += 2; - gBattleCommunication[MOVE_EFFECT_BYTE] += 0x40; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } - break; - case ABILITY_POISON_POINT: - //_0801904C - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (Random() % 3) == 0) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 0x42; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } - break; - case ABILITY_STATIC: - //_08019128 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (Random() % 3) == 0) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 0x45; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } - break; - case ABILITY_FLAME_BODY: - //_08019204 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (Random() % 3) == 0) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 0x43; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } - break; - case ABILITY_CUTE_CHARM: - //_080192E0 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && gBattleMons[gBankTarget].hp != 0 - && (Random() % 3) == 0 - && gBattleMons[gBankAttacker].ability != ABILITY_OBLIVIOUS - && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) - && !(gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) - && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != 0xFF - && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != 0xFF) - { - gBattleMons[gBankAttacker].status2 |= (gBitTable[gBankTarget] << 0x10); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_CuteCharmActivates; - effect++; - } - break; - } - break; - case ABILITYEFFECT_IMMUNITY: // 5 - //_08019448 - { - for (bank = 0; bank < gNoOfAllBanks; bank++) - { - switch (gBattleMons[bank].ability) - { - case ABILITY_IMMUNITY: - if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON | 0xF00)) // TODO: what is 0xF00? - { - StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); - effect = 1; - } - break; - case ABILITY_OWN_TEMPO: - if (gBattleMons[bank].status2 & STATUS2_CONFUSION) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); - effect = 2; - } - break; - case ABILITY_LIMBER: - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); - effect = 1; - } - break; - case ABILITY_INSOMNIA: - case ABILITY_VITAL_SPIRIT: - if (gBattleMons[bank].status1 & STATUS_SLEEP) - { - gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); - StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); - effect = 1; - } - break; - case ABILITY_WATER_VEIL: - if (gBattleMons[bank].status1 & STATUS_BURN) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); - effect = 1; - } - break; - case ABILITY_MAGMA_ARMOR: - if (gBattleMons[bank].status1 & STATUS_FREEZE) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); - effect = 1; - } - break; - case ABILITY_OBLIVIOUS: - if (gBattleMons[bank].status2 & STATUS2_INFATUATION) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); - effect = 3; - } - break; - } - if (effect) - { - switch (effect) - { - case 1: // status cleared - gBattleMons[bank].status1 = 0; - break; - case 2: // get rid of confusion - gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); - break; - case 3: // get rid of infatuation - gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION); - break; - } - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus; - BATTLE_STRUCT->scriptingActive = bank; - gActiveBank = bank; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); - MarkBufferBankForExecution(gActiveBank); - return effect; - } - } - } - break; - case ABILITYEFFECT_FORECAST: // 6 - //_080197B4 - { - for (bank = 0; bank < gNoOfAllBanks; bank++) - { - if (gBattleMons[bank].ability == ABILITY_FORECAST) - { - effect = CastformDataTypeChange(bank); - if (effect) - { - b_push_move_exec(BattleScript_CastformChange); - BATTLE_STRUCT->scriptingActive = bank; - BATTLE_STRUCT->castformToChangeInto = effect - 1; - return effect; - } - } - } - } - break; - case ABILITYEFFECT_SYNCHRONIZE: // 7 - //_08019804 - if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) - { - gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); - BATTLE_STRUCT->synchroniseEffect &= 0x3F; - if (BATTLE_STRUCT->synchroniseEffect == 6) - BATTLE_STRUCT->synchroniseEffect = 2; - gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect + 0x40; - BATTLE_STRUCT->scriptingActive = gBankTarget; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_SynchronizeActivates; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } - break; - case ABILITYEFFECT_ATK_SYNCHRONIZE: // 8 - //_08019880 - if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) - { - gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); - BATTLE_STRUCT->synchroniseEffect &= 0x3F; - if (BATTLE_STRUCT->synchroniseEffect == 6) - BATTLE_STRUCT->synchroniseEffect = 2; - gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect; - BATTLE_STRUCT->scriptingActive = gBankAttacker; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_SynchronizeActivates; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } - break; - case ABILITYEFFECT_INTIMIDATE1: // 9 - //_080198FC - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].ability == ABILITY_INTIMIDATE && gStatuses3[i] & STATUS3_INTIMIDATE_POKES) - { - gLastUsedAbility = ABILITY_INTIMIDATE; - gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); - b_push_move_exec(gUnknown_081D978C); - BATTLE_STRUCT->intimidateBank = i; - effect++; - break; - } - } - break; - case ABILITYEFFECT_TRACE: // 11 - //_08019940 - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE)) - { - u8 target2; - side = (GetBankIdentity(i) ^ 1) & 1; - target1 = GetBankByIdentity(side); - target2 = GetBankByIdentity(side + 2); - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - { - if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0 - && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0) - { - //_080199AE - gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | side); - gBattleMons[i].ability = gBattleMons[gActiveBank].ability; - gLastUsedAbility = gBattleMons[gActiveBank].ability; - effect++; - } - else if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0) - { - //_08019A34 - gActiveBank = target1; - gBattleMons[i].ability = gBattleMons[gActiveBank].ability; - gLastUsedAbility = gBattleMons[gActiveBank].ability; - effect++; - } - else if (gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0) - { - //_08019A78 - gActiveBank = target2; - gBattleMons[i].ability = gBattleMons[gActiveBank].ability; - gLastUsedAbility = gBattleMons[gActiveBank].ability; - effect++; - } - } - else - //_08019ABC - { - gActiveBank = target1; - if (gBattleMons[target1].ability && gBattleMons[target1].hp) - { - gBattleMons[i].ability = gBattleMons[target1].ability; - gLastUsedAbility = gBattleMons[target1].ability; - effect++; - } - } - if (effect) - { - b_push_move_exec(BattleScript_TraceActivates); - gStatuses3[i] &= ~(STATUS3_TRACE); - BATTLE_STRUCT->scriptingActive = i; - - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 4; - gBattleTextBuff1[2] = gActiveBank; - gBattleTextBuff1[3] = gBattlePartyID[gActiveBank]; - gBattleTextBuff1[4] = EOS; - - gBattleTextBuff2[0] = 0xFD; - gBattleTextBuff2[1] = 9; - gBattleTextBuff2[2] = gLastUsedAbility; - gBattleTextBuff2[3] = EOS; - break; - } - } - } - break; - case ABILITYEFFECT_INTIMIDATE2: // 10 - //_08019B1C - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].ability == ABILITY_INTIMIDATE && (gStatuses3[i] & STATUS3_INTIMIDATE_POKES)) - { - gLastUsedAbility = ABILITY_INTIMIDATE; - gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = gUnknown_081D9795; - BATTLE_STRUCT->intimidateBank = i; - effect++; - break; - } - } - break; - case ABILITYEFFECT_CHECK_OTHER_SIDE: // 12 - //_08019B60 - side = GetBankSide(bank); - for (i = 0; i < gNoOfAllBanks; i++) - { - if (GetBankSide(i) != side && gBattleMons[i].ability == ability) - { - gLastUsedAbility = ability; - effect = i + 1; - } - } - break; - case ABILITYEFFECT_CHECK_BANK_SIDE: // 13 - //_08019BBC - side = GetBankSide(bank); - for (i = 0; i < gNoOfAllBanks; i++) - { - if (GetBankSide(i) == side && gBattleMons[i].ability == ability) - { - gLastUsedAbility = ability; - effect = i + 1; - } - } - break; - case ABILITYEFFECT_FIELD_SPORT: // 14 - //_08019C18 - switch (gLastUsedAbility) - { - case 0xFD: - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gStatuses3[i] & STATUS3_MUDSPORT) - effect = i + 1; - } - break; - case 0xFE: - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gStatuses3[i] & STATUS3_WATERSPORT) - effect = i + 1; - } - break; - default: - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].ability == ability) - { - gLastUsedAbility = ability; - effect = i + 1; - } - } - break; - } - break; - case ABILITYEFFECT_CHECK_ON_FIELD: // 19 - //_08019CD4 - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].ability == ability && gBattleMons[i].hp != 0) - { - gLastUsedAbility = ability; - effect = i + 1; - } - } - break; - case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15 - //_08019D18 - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].ability == ability && i != bank) - { - gLastUsedAbility = ability; - effect = i + 1; - } - } - break; - case ABILITYEFFECT_COUNT_OTHER_SIZE: // 16 - //_08019D5C - side = GetBankSide(bank); - for (i = 0; i < gNoOfAllBanks; i++) - { - if (GetBankSide(i) != side && gBattleMons[i].ability == ability) - { - gLastUsedAbility = ability; - effect++; - } - } - break; - case ABILITYEFFECT_COUNT_BANK_SIDE: // 17 - //_08019DB8 - side = GetBankSide(bank); - for (i = 0; i < gNoOfAllBanks; i++) - { - if (GetBankSide(i) == side && gBattleMons[i].ability == ability) - { - gLastUsedAbility = ability; - effect++; - } - } - break; - case ABILITYEFFECT_COUNT_ON_FIELD: // 18 - //_08019F44 - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].ability == ability && i != bank) - { - gLastUsedAbility = ability; - effect++; - } - } - break; - } - //_08019F76 - if (effect && caseID < 0xC && gLastUsedAbility != 0xFF) - RecordAbilityBattle(bank, gLastUsedAbility); - } - - return effect; -} - -void b_call_bc_move_exec(u8* BS_ptr) -{ - gBattlescriptCurrInstr = BS_ptr; - B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; - gBattleMainFunc = RunBattleScriptCommands_PopCallbacksStack; - gCurrentActionFuncId = 0; -} - -void b_push_move_exec(u8* BS_ptr) -{ - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BS_ptr; - B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; - gBattleMainFunc = RunBattleScriptCommands; -} - -enum -{ - ITEM_NO_EFFECT, // 0 - ITEM_STATUS_CHANGE, // 1 - ITEM_EFFECT_OTHER, // 2 - ITEM_PP_CHANGE, // 3 - ITEM_HP_CHANGE, // 4 - ITEM_STATS_CHANGE, // 5 -}; - -enum -{ - FLAVOR_SPICY, // 0 - FLAVOR_DRY, // 1 - FLAVOR_SWEET, // 2 - FLAVOR_BITTER, // 3 - FLAVOR_SOUR, // 4 -}; - -u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) -{ - int i = 0; - u8 effect = ITEM_NO_EFFECT; - u8 changedPP = 0; - u8 bankHoldEffect, atkHoldEffect, defHoldEffect; - u8 bankQuality, atkQuality, defQuality; - u16 atkItem, defItem; - - gLastUsedItem = gBattleMons[bank].item; - if (gLastUsedItem == ITEM_ENIGMA_BERRY) - { - bankHoldEffect = gEnigmaBerries[bank].holdEffect; - bankQuality = gEnigmaBerries[bank].holdEffectParam; - } - else - { - bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); - } - - atkItem = gBattleMons[gBankAttacker].item; - if (atkItem == ITEM_ENIGMA_BERRY) - { - atkHoldEffect = gEnigmaBerries[gBankAttacker].holdEffect; - atkQuality = gEnigmaBerries[gBankAttacker].holdEffectParam; - } - else - { - atkHoldEffect = ItemId_GetHoldEffect(atkItem); - atkQuality = ItemId_GetHoldEffectParam(atkItem); - } - - // def variables are unused - defItem = gBattleMons[gBankTarget].item; - if (defItem == ITEM_ENIGMA_BERRY) - { - defHoldEffect = gEnigmaBerries[gBankTarget].holdEffect; - defQuality = gEnigmaBerries[gBankTarget].holdEffectParam; - } - else - { - defHoldEffect = ItemId_GetHoldEffect(defItem); - defQuality = ItemId_GetHoldEffectParam(defItem); - } - - switch (caseID) - { - case 0: - switch (bankHoldEffect) - { - case HOLD_EFFECT_DOUBLE_PRIZE: - BATTLE_STRUCT->moneyMultiplier = 2; - break; - case HOLD_EFFECT_RESTORE_STATS: - for (i = 0; i < 8; i++) - { - if (gBattleMons[bank].statStages[i] < 6) - { - gBattleMons[bank].statStages[i] = 6; - effect = ITEM_STATS_CHANGE; - } - } - if (effect) - { - BATTLE_STRUCT->scriptingActive = bank; - gStringBank = bank; - gActiveBank = gBankAttacker = bank; - b_call_bc_move_exec(BattleScript_WhiteHerbEnd2); - } - break; - } - break; - case 1: - if (gBattleMons[bank].hp) - { - switch (bankHoldEffect) - { - case HOLD_EFFECT_RESTORE_HP: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) - { - gBattleMoveDamage = bankQuality; - if (gBattleMons[bank].hp + bankQuality > gBattleMons[bank].maxHP) - gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; - gBattleMoveDamage *= -1; - b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem); - effect = 4; - } - break; - case HOLD_EFFECT_RESTORE_PP: - if (!moveTurn) - { - struct Pokemon* poke; - u8 ppBonuses; - u16 move; - - if (GetBankSide(bank) == 0) - poke = &gPlayerParty[gBattlePartyID[bank]]; - else - poke = &gEnemyParty[gBattlePartyID[bank]]; - for (i = 0; i < 4; i++) - { - move = GetMonData(poke, MON_DATA_MOVE1 + i); - changedPP = GetMonData(poke, MON_DATA_PP1 + i); - ppBonuses = GetMonData(poke, MON_DATA_PP_BONUSES); - if (move && changedPP == 0) - break; - } - if (i != 4) - { - u8 maxPP = CalculatePPWithBonus(move, ppBonuses, i); - if (changedPP + bankQuality > maxPP) - changedPP = maxPP; - else - changedPP = changedPP + bankQuality; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 2; - gBattleTextBuff1[2] = move; - gBattleTextBuff1[3] = move >> 8; - gBattleTextBuff1[4] = 0xFF; - b_call_bc_move_exec(BattleScript_BerryPPHealEnd2); - EmitSetAttributes(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP); - MarkBufferBankForExecution(gActiveBank); - effect = ITEM_PP_CHANGE; - } - } - break; - case HOLD_EFFECT_RESTORE_STATS: - for (i = 0; i < 8; i++) - { - if (gBattleMons[bank].statStages[i] < 6) - { - gBattleMons[bank].statStages[i] = 6; - effect = ITEM_STATS_CHANGE; - } - } - if (effect) - { - BATTLE_STRUCT->scriptingActive = bank; - gStringBank = bank; - gActiveBank = gBankAttacker = bank; - b_call_bc_move_exec(BattleScript_WhiteHerbEnd2); - } - break; - case HOLD_EFFECT_LEFTOVERS: - if (gBattleMons[bank].hp < gBattleMons[bank].maxHP && !moveTurn) - { - gBattleMoveDamage = gBattleMons[bank].maxHP / 16; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) - gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; - gBattleMoveDamage *= -1; - b_call_bc_move_exec(BattleScript_ItemHealHP_End2); - effect = ITEM_HP_CHANGE; - RecordItemBattle(bank, bankHoldEffect); - } - break; - // nice copy/paste there gamefreak, making a function for confuse berries was too much eh? - case HOLD_EFFECT_CONFUSE_SPICY: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 8; - gBattleTextBuff1[2] = FLAVOR_SPICY; - gBattleTextBuff1[3] = EOS; - gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) - gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; - gBattleMoveDamage *= -1; - if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SPICY) < 0) - b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2); - else - b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem); - effect = ITEM_HP_CHANGE; - } - break; - case HOLD_EFFECT_CONFUSE_DRY: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 8; - gBattleTextBuff1[2] = FLAVOR_DRY; - gBattleTextBuff1[3] = EOS; - gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) - gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; - gBattleMoveDamage *= -1; - if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_DRY) < 0) - b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2); - else - b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem); - effect = ITEM_HP_CHANGE; - } - break; - case HOLD_EFFECT_CONFUSE_SWEET: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 8; - gBattleTextBuff1[2] = FLAVOR_SWEET; - gBattleTextBuff1[3] = EOS; - gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) - gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; - gBattleMoveDamage *= -1; - if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SWEET) < 0) - b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2); - else - b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem); - effect = ITEM_HP_CHANGE; - } - break; - case HOLD_EFFECT_CONFUSE_BITTER: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 8; - gBattleTextBuff1[2] = FLAVOR_BITTER; - gBattleTextBuff1[3] = EOS; - gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) - gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; - gBattleMoveDamage *= -1; - if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_BITTER) < 0) - b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2); - else - b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem); - effect = ITEM_HP_CHANGE; - } - break; - case HOLD_EFFECT_CONFUSE_SOUR: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 8; - gBattleTextBuff1[2] = FLAVOR_SOUR; - gBattleTextBuff1[3] = EOS; - gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = 1; - if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) - gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; - gBattleMoveDamage *= -1; - if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SOUR) < 0) - b_call_bc_move_exec(BattleScript_BerryConfuseHealEnd2); - else - b_call_bc_move_exec(BattleScript_ItemHealHP_RemoveItem); - effect = ITEM_HP_CHANGE; - } - break; - // copy/paste again, smh - case HOLD_EFFECT_ATTACK_UP: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_ATK] < 0xC) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 5; - gBattleTextBuff1[2] = STAT_STAGE_ATK; - gBattleTextBuff1[3] = EOS; - - gBattleTextBuff2[0] = 0xFD; - gBattleTextBuff2[1] = 0; - gBattleTextBuff2[2] = 0xD2; - gBattleTextBuff2[3] = 0xD2 >> 8; - gBattleTextBuff2[4] = EOS; - - gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_ATK; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_ATK; - BATTLE_STRUCT->animArg2 = 0; - b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2); - effect = ITEM_STATS_CHANGE; - } - break; - case HOLD_EFFECT_DEFENSE_UP: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_DEF] < 0xC) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 5; - gBattleTextBuff1[2] = STAT_STAGE_DEF; - gBattleTextBuff1[3] = EOS; - - gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_DEF; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_DEF; - BATTLE_STRUCT->animArg2 = 0; - b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2); - effect = ITEM_STATS_CHANGE; - } - break; - case HOLD_EFFECT_SPEED_UP: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 5; - gBattleTextBuff1[2] = STAT_STAGE_SPEED; - gBattleTextBuff1[3] = EOS; - - gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPEED; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPEED; - BATTLE_STRUCT->animArg2 = 0; - b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2); - effect = ITEM_STATS_CHANGE; - } - break; - case HOLD_EFFECT_SP_ATTACK_UP: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPATK] < 0xC) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 5; - gBattleTextBuff1[2] = STAT_STAGE_SPATK; - gBattleTextBuff1[3] = EOS; - - gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPATK; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPATK; - BATTLE_STRUCT->animArg2 = 0; - b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2); - effect = ITEM_STATS_CHANGE; - } - break; - case HOLD_EFFECT_SP_DEFENSE_UP: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPDEF] < 0xC) - { - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 5; - gBattleTextBuff1[2] = STAT_STAGE_SPDEF; - gBattleTextBuff1[3] = EOS; - - gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPDEF; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPDEF; - BATTLE_STRUCT->animArg2 = 0; - b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2); - effect = ITEM_STATS_CHANGE; - } - break; - case HOLD_EFFECT_CRITICAL_UP: - if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && !(gBattleMons[bank].status2 & STATUS2_FOCUS_ENERGY)) - { - gBattleMons[bank].status2 |= STATUS2_FOCUS_ENERGY; - b_call_bc_move_exec(BattleScript_BerryFocusEnergyEnd2); - effect = ITEM_EFFECT_OTHER; - } - break; - case HOLD_EFFECT_RANDOM_STAT_UP: - if (!moveTurn && gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality) - { - for (i = 0; i < 5; i++) - { - if (gBattleMons[bank].statStages[STAT_STAGE_ATK + i] < 0xC) - break; - } - if (i != 5) - { - do - { - i = Random() % 5; - } while (gBattleMons[bank].statStages[STAT_STAGE_ATK + i] == 0xC); - - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 5; - gBattleTextBuff1[2] = i + 1; - gBattleTextBuff1[3] = EOS; - - gBattleTextBuff2[0] = 0xFD; - gBattleTextBuff2[1] = 0; - gBattleTextBuff2[2] = 0xD1; - gBattleTextBuff2[3] = 0xD1 >> 8; - gBattleTextBuff2[4] = 0; - gBattleTextBuff2[5] = 0xD2; - gBattleTextBuff2[6] = 0xD2 >> 8; - gBattleTextBuff2[7] = EOS; - - gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x21 + i; - BATTLE_STRUCT->animArg1 = 0x21 + i + 6; - BATTLE_STRUCT->animArg2 = 0; - b_call_bc_move_exec(BattleScript_BerryStatRaiseEnd2); - effect = ITEM_STATS_CHANGE; - } - } - break; - case HOLD_EFFECT_CURE_PAR: - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) - { - gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS); - b_call_bc_move_exec(BattleScript_BerryCurePrlzEnd2); - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_PSN: - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) - { - gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER); - b_call_bc_move_exec(BattleScript_BerryCurePsnEnd2); - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_BRN: - if (gBattleMons[bank].status1 & STATUS_BURN) - { - gBattleMons[bank].status1 &= ~(STATUS_BURN); - b_call_bc_move_exec(BattleScript_BerryCureBrnEnd2); - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_FRZ: - if (gBattleMons[bank].status1 & STATUS_FREEZE) - { - gBattleMons[bank].status1 &= ~(STATUS_FREEZE); - b_call_bc_move_exec(BattleScript_BerryCureFrzEnd2); - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_SLP: - if (gBattleMons[bank].status1 & STATUS_SLEEP) - { - gBattleMons[bank].status1 &= ~(STATUS_SLEEP); - gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); - b_call_bc_move_exec(BattleScript_BerryCureSlpEnd2); - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_CONFUSION: - if (gBattleMons[bank].status2 & STATUS2_CONFUSION) - { - gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); - b_call_bc_move_exec(BattleScript_BerryCureConfusionEnd2); - effect = ITEM_EFFECT_OTHER; - } - break; - case HOLD_EFFECT_CURE_STATUS: - if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) - { - i = 0; - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); - i++; - } - if (gBattleMons[bank].status1 & STATUS_SLEEP) - { - gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); - StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); - i++; - } - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); - i++; - } - if (gBattleMons[bank].status1 & STATUS_BURN) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); - i++; - } - if (gBattleMons[bank].status1 & STATUS_FREEZE) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); - i++; - } - if (gBattleMons[bank].status2 & STATUS2_CONFUSION) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); - i++; - } - if (!(i > 1)) - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - else - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gBattleMons[bank].status1 = 0; - gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); - b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2); - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_ATTRACT: - if (gBattleMons[bank].status2 & STATUS2_INFATUATION) - { - gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION); - StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); - b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2); - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - effect = ITEM_EFFECT_OTHER; - } - break; - } - if (effect) - { - BATTLE_STRUCT->scriptingActive = bank; - gStringBank = bank; - gActiveBank = gBankAttacker = bank; - switch (effect) - { - case ITEM_STATUS_CHANGE: - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1); - MarkBufferBankForExecution(gActiveBank); - break; - case ITEM_PP_CHANGE: - if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].unk18_b & gBitTable[i])) - gBattleMons[bank].pp[i] = changedPP; - break; - } - } - } - break; - case 2: - break; - case 3: - for (bank = 0; bank < gNoOfAllBanks; bank++) - { - gLastUsedItem = gBattleMons[bank].item; - if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY) - { - bankHoldEffect = gEnigmaBerries[bank].holdEffect; - bankQuality = gEnigmaBerries[bank].holdEffectParam; - } - else - { - bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); - bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); - } - switch (bankHoldEffect) - { - case HOLD_EFFECT_CURE_PAR: - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) - { - gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_BerryCureParRet; - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_PSN: - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) - { - gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_BerryCurePsnRet; - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_BRN: - if (gBattleMons[bank].status1 & STATUS_BURN) - { - gBattleMons[bank].status1 &= ~(STATUS_BURN); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_BerryCureBrnRet; - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_FRZ: - if (gBattleMons[bank].status1 & STATUS_FREEZE) - { - gBattleMons[bank].status1 &= ~(STATUS_FREEZE); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_BerryCureFrzRet; - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_SLP: - if (gBattleMons[bank].status1 & STATUS_SLEEP) - { - gBattleMons[bank].status1 &= ~(STATUS_SLEEP); - gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_BerryCureSlpRet; - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_CURE_CONFUSION: - if (gBattleMons[bank].status2 & STATUS2_CONFUSION) - { - gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_BerryCureConfusionRet; - effect = ITEM_EFFECT_OTHER; - } - break; - case HOLD_EFFECT_CURE_ATTRACT: - if (gBattleMons[bank].status2 & STATUS2_INFATUATION) - { - gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION); - StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); - b_movescr_stack_push_cursor(); - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet; - effect = ITEM_EFFECT_OTHER; - } - break; - case HOLD_EFFECT_CURE_STATUS: - if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) - { - if (gBattleMons[bank].status1 & STATUS_PSN_ANY) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); - } - if (gBattleMons[bank].status1 & STATUS_SLEEP) - { - gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); - StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); - } - if (gBattleMons[bank].status1 & STATUS_PARALYSIS) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); - } - if (gBattleMons[bank].status1 & STATUS_BURN) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); - } - if (gBattleMons[bank].status1 & STATUS_FREEZE) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); - } - if (gBattleMons[bank].status2 & STATUS2_CONFUSION) - { - StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); - } - gBattleMons[bank].status1 = 0; - gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); - b_movescr_stack_push_cursor(); - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet; - effect = ITEM_STATUS_CHANGE; - } - break; - case HOLD_EFFECT_RESTORE_STATS: - for (i = 0; i < 8; i++) - { - if (gBattleMons[bank].statStages[i] < 6) - { - gBattleMons[bank].statStages[i] = 6; - effect = ITEM_STATS_CHANGE; - } - } - if (effect) - { - BATTLE_STRUCT->scriptingActive = bank; - gStringBank = bank; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_WhiteHerbRet; - return effect; // unnecessary return - } - break; - } - if (effect) - { - BATTLE_STRUCT->scriptingActive = bank; - gStringBank = bank; - gActiveBank = bank; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); - MarkBufferBankForExecution(gActiveBank); - break; - } - } - break; - case 4: - if (gBattleMoveDamage) - { - switch (atkHoldEffect) - { - case HOLD_EFFECT_FLINCH: - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (Random() % 100) < bankQuality - && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED - && gBattleMons[gBankTarget].hp) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 8; - b_movescr_stack_push_cursor(); - SetMoveEffect(0, 0); - b_movescr_stack_pop_cursor(); - } - break; - case HOLD_EFFECT_SHELL_BELL: - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gSpecialStatuses[gBankTarget].moveturnLostHP != 0 - && gSpecialStatuses[gBankTarget].moveturnLostHP != 0xFFFF - && gBankAttacker != gBankTarget - && gBattleMons[gBankAttacker].hp != gBattleMons[gBankAttacker].maxHP - && gBattleMons[gBankAttacker].hp != 0) - { - gLastUsedItem = atkItem; - gStringBank = gBankAttacker; - BATTLE_STRUCT->scriptingActive = gBankAttacker; - gBattleMoveDamage = (gSpecialStatuses[gBankTarget].moveturnLostHP / atkQuality) * -1; - if (gBattleMoveDamage == 0) - gBattleMoveDamage = -1; - gSpecialStatuses[gBankTarget].moveturnLostHP = 0; - b_movescr_stack_push_cursor(); - gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret; - effect++; - } - break; - } - } - break; - } - - return effect; -} - -struct CombinedMove -{ - u16 move1; - u16 move2; - u16 newMove; -}; - -static const struct CombinedMove sCombinedMoves[2] = -{ - {MOVE_EMBER, MOVE_GUST, MOVE_HEAT_WAVE}, - {0xFFFF, 0xFFFF, 0xFFFF} -}; - -void unref_sub_801B40C(void) -{ - int i = 0; - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - { - do - { - u8 bank = 0; - do - { - u8 absent = gAbsentBankFlags; - if (gBitTable[bank] & absent || absent & gBitTable[bank + 2]) - bank++; - else - { - if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank + 2]) - { - gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank) | ((bank + 2) << 4); - gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; - gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4; - } - if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank + 2] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank]) - { - gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank + 2) | ((bank) << 4); - gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; - gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4; - } - bank++; - } - } while (bank < 2); - i++; - } while (sCombinedMoves[i].move1 != 0xFFFF); - } -} - -void sub_801B594(void) -{ - if (gBattleExecBuffer == 0) - gBattleScriptingCommandsTable[*gBattlescriptCurrInstr](); -} - -u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target -{ - u8 targetBank = 0; - u8 moveTarget; - u8 side; - - if (useMoveTarget) - moveTarget = useMoveTarget - 1; - else - moveTarget = gBattleMoves[move].target; - - switch (moveTarget) - { - case 0: - side = GetBankSide(gBankAttacker) ^ 1; - if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) - targetBank = gSideTimers[side].followmeTarget; - else - { - side = GetBankSide(gBankAttacker); - do - { - targetBank = Random() % gNoOfAllBanks; - } while (targetBank == gBankAttacker || side == GetBankSide(targetBank) || gAbsentBankFlags & gBitTable[targetBank]); - if (gBattleMoves[move].type == TYPE_ELECTRIC - && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBankAttacker, ABILITY_LIGHTNING_ROD, 0, 0) - && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD) - { - targetBank ^= 2; - RecordAbilityBattle(targetBank, gBattleMons[targetBank].ability); - gSpecialStatuses[targetBank].lightningRodRedirected = 1; - } - } - break; - case 1: - case 8: - case 32: - case 64: - targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1); - if (gAbsentBankFlags & gBitTable[targetBank]) - targetBank ^= 2; - break; - case 4: - side = GetBankSide(gBankAttacker) ^ 1; - if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) - targetBank = gSideTimers[side].followmeTarget; - else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & 4) - { - if (GetBankSide(gBankAttacker) == 0) - { - if (Random() & 1) - targetBank = GetBankByIdentity(1); - else - targetBank = GetBankByIdentity(3); - } - else - { - if (Random() & 1) - targetBank = GetBankByIdentity(0); - else - targetBank = GetBankByIdentity(2); - } - if (gAbsentBankFlags & gBitTable[targetBank]) - targetBank ^= 2; - } - else - targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1); - break; - case 2: - case 16: - targetBank = gBankAttacker; - break; - } - ewram16010arr(gBankAttacker) = targetBank; - return targetBank; -} - -u8 IsPokeDisobedient(void) -{ - u8 obedienceLevel; - s32 rnd; - s32 calc; - - if (gBattleTypeFlags & BATTLE_TYPE_LINK - || GetBankSide(gBankAttacker) == 1 - || !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName) - || FlagGet(FLAG_BADGE08_GET)) - return 0; - - obedienceLevel = 10; - if (FlagGet(FLAG_BADGE02_GET)) - obedienceLevel = 30; - if (FlagGet(FLAG_BADGE04_GET)) - obedienceLevel = 50; - if (FlagGet(FLAG_BADGE06_GET)) - obedienceLevel = 70; - - if (gBattleMons[gBankAttacker].level <= obedienceLevel) - return 0; - rnd = (Random() & 255); - calc = (gBattleMons[gBankAttacker].level + obedienceLevel) * rnd >> 8; - if (calc < obedienceLevel) - return 0; - - // is not obedient - if (gCurrentMove == MOVE_RAGE) - gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RAGE); - if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK)) - { - gBattlescriptCurrInstr = gUnknown_081D995F; - return 1; - } - - rnd = (Random() & 255); - calc = (gBattleMons[gBankAttacker].level + obedienceLevel) * rnd >> 8; - if (calc < obedienceLevel) - { - calc = CheckMoveLimitations(gBankAttacker, gBitTable[gCurrMovePos], 0xFF); - if (calc == 0xF) // all moves cannot be used - { - gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; - gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround; - return 1; - } - else // use a random move - { - do - { - gCurrMovePos = gUnknown_02024BE5 = Random() & 3; - } while (gBitTable[gCurrMovePos] & calc); - gRandomMove = gBattleMons[gBankAttacker].moves[gCurrMovePos]; - gBattleCommunication[3] = 0; - gDynamicBasePower = 0; - BATTLE_STRUCT->dynamicMoveType = 0; - gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove; - gBankTarget = GetMoveTarget(gRandomMove, 0); - gHitMarker |= HITMARKER_x200000; - return 2; - } - } - else - { - obedienceLevel = gBattleMons[gBankAttacker].level - obedienceLevel; - - calc = (Random() & 255); - if (calc < obedienceLevel && !(gBattleMons[gBankAttacker].status1 & STATUS_ANY) && gBattleMons[gBankAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBankAttacker].ability != ABILITY_INSOMNIA) - { - // try putting asleep - int i; - for (i = 0; i < gNoOfAllBanks; i++) - { - if (gBattleMons[i].status2 & STATUS2_UPROAR) - break; - } - if (i == gNoOfAllBanks) - { - gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep; - return 1; - } - } - calc -= obedienceLevel; - if (calc < obedienceLevel) - { - gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker); - gBankTarget = gBankAttacker; - gBattlescriptCurrInstr = gUnknown_081D99A0; - gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; - return 2; - } - else - { - gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; - gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround; - return 1; - } - } -} diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 3b1092e45..5a20a8324 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "battle_util.h" #include "constants/battle_move_effects.h" #include "constants/moves.h" #include "constants/abilities.h" @@ -101,11 +102,10 @@ extern u16 gTrappingMoves[]; u8 AtkCanceller_UnableToUseMove(void); void PressurePPLose(u8 bank_atk, u8 bank_def, u16 move); void CancelMultiTurnMoves(u8 bank); -void b_movescr_stack_push(u8* BS_ptr); -void b_movescr_stack_push_cursor(void); +void BattleScriptPush(u8* BS_ptr); +void BattleScriptPushCursor(void); void RecordAbilityBattle(u8 bank, u8 ability); void RecordItemBattle(u8 bank, u8 holdEffect); -int IsPokeDisobedient(void); static bool8 IsTwoTurnsMove(u16 move); static void DestinyBondFlagUpdate(void); static void b_wonderguard_and_levitate(void); @@ -122,7 +122,7 @@ extern u8 gBattleBufferB[4][0x200]; void sub_80324F8(struct Pokemon*, u8 bank); void AdjustFriendship(struct Pokemon*, u8 value); bool8 IsTradedMon(struct Pokemon*); -void b_movescr_stack_pop_cursor(void); +void BattleScriptPop(void); void SwitchInClearStructs(void); u8* ConvertIntToDecimalStringN(u8*, s32, u8, u8); u8 GetSetPokedexFlag(u16 nationalNum, u8 caseID); @@ -131,7 +131,6 @@ u8 sub_803FC34(u8 bank); u16 sub_803FBFC(u8 a); u8 GetBankByIdentity(u8 ID); void sub_8012258(u8); -void sub_80157C4(u8 bank); //update sent pokes in battle //MonTryLearningNewMove teach poke a move u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move); void IncrementGameStat(u8 index); @@ -147,21 +146,17 @@ void nullsub_6(void); void ReshowBattleScreenAfterMenu(void); void BattleMainCB2(void); void AddMoney(u32* moneySaveblock, u32 to_give); -void sub_80156DC(void); //set sentpokes value u8 CountAliveMons(u8 caseID); void sub_803E1B0(struct Pokemon*, u16 item, u8 partyID, u8 r3, u8 sp); u8 CanRunFromBattle(void); u8 GetMoveTarget(u16 move, u8 targetbyte); //get target of move -void sub_80153D0(u8 atk); //pressure perish song pp decrement u8 CastformDataTypeChange(u8 bank); -void b_push_move_exec(u8* bs_ptr); u8 Overworld_GetMapTypeOfSaveblockLocation(void); u8 CalculatePlayerPartyCount(void); u16 Sqrt(u32 num); u8 sub_809070C(u16 nationalNum, u32 TiD, u32 PiD); //task prepare poke dex display void sub_814A880(u8 a1, u8 a2); u8 CheckMoveLimitations(u8 bank, u8 unusable_moves, u8 flags); -void sub_801529C(u8 bank); bool8 IsLinkDoubleBattle(void); void sub_8094B6C(u8 bank, u8 partyID, u8 r2); @@ -1050,7 +1045,7 @@ static void atk00_attackcanceler(void) gHitMarker &= ~(HITMARKER_x800000); if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)) { - u8 disobedient = IsPokeDisobedient(); + u8 disobedient = IsMonDisobedient(); asm("":::"r0"); //It's impossible to match asm("":::"r1"); if ((disobedient)) @@ -1067,7 +1062,7 @@ static void atk00_attackcanceler(void) { PressurePPLose(gBankAttacker, gBankTarget, MOVE_MAGIC_COAT); gProtectStructs[gBankTarget].bounceMove = 0; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_MagicCoatBounce; return; } @@ -1078,7 +1073,7 @@ static void atk00_attackcanceler(void) PressurePPLose(gBankAttacker, gBanksByTurnOrder[i], MOVE_SNATCH); gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0; BATTLE_STRUCT->scriptingActive = gBanksByTurnOrder[i]; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SnatchedMove; return; } @@ -1087,7 +1082,7 @@ static void atk00_attackcanceler(void) { gSpecialStatuses[gBankTarget].lightningRodRedirected = 0; gLastUsedAbility = ABILITY_LIGHTNING_ROD; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_TookAttack; RecordAbilityBattle(gBankTarget, gLastUsedAbility); } @@ -1325,7 +1320,7 @@ static void atk03_ppreduce(void) && !((gDisableStructs[gBankAttacker].unk18_b) & gBitTable[gCurrMovePos])) { gActiveBank = gBankAttacker; - EmitSetAttributes(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBankAttacker].pp[gCurrMovePos]); + EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBankAttacker].pp[gCurrMovePos]); MarkBufferBankForExecution(gBankAttacker); } } @@ -1844,7 +1839,7 @@ static void atk09_attackanimation(void) if ((gHitMarker & HITMARKER_NO_ANIMATIONS) && (gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE)) { - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_Pausex20; BATTLE_STRUCT->animTurn += 1; BATTLE_STRUCT->animTargetsHit += 1; @@ -1868,7 +1863,7 @@ static void atk09_attackanimation(void) } else { - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_Pausex20; } } @@ -1947,7 +1942,7 @@ static void atk0C_datahpupdate(void) if (gDisableStructs[gActiveBank].substituteHP == 0) { gBattlescriptCurrInstr += 2; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SubstituteFade; return; } @@ -2023,7 +2018,7 @@ static void atk0C_datahpupdate(void) } } gHitMarker &= ~(HITMARKER_x100000); - EmitSetAttributes(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp); + EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp); MarkBufferBankForExecution(gActiveBank); } } @@ -2132,7 +2127,7 @@ static void atk0F_resultmessage(void) gLastUsedItem = gBattleMons[gBankTarget].item; gStringBank = gBankTarget; gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON); - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_HangedOnMsg; return; default: @@ -2144,14 +2139,14 @@ static void atk0F_resultmessage(void) gBattleMoveFlags &= ~(MOVESTATUS_ONEHITKO); gBattleMoveFlags &= ~(MOVESTATUS_SUPEREFFECTIVE); gBattleMoveFlags &= ~(MOVESTATUS_NOTVERYEFFECTIVE); - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_OneHitKOMsg; return; } else if (gBattleMoveFlags & MOVESTATUS_ENDURED) { gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON); - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_EnduredMsg; return; } @@ -2160,7 +2155,7 @@ static void atk0F_resultmessage(void) gLastUsedItem = gBattleMons[gBankTarget].item; gStringBank = gBankTarget; gBattleMoveFlags &= ~(MOVESTATUS_ENDURED | MOVESTATUS_HUNGON); - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_HangedOnMsg; return; } @@ -2321,7 +2316,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { gLastUsedAbility = ABILITY_IMMUNITY; RecordAbilityBattle(gEffectBank, ABILITY_IMMUNITY); - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); //_0801E664: gBattlescriptCurrInstr = BattleScript_PSNPrevention; if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) @@ -2336,7 +2331,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if ((gBattleMons[gEffectBank].type1 == TYPE_POISON || gBattleMons[gEffectBank].type2 == TYPE_POISON || gBattleMons[gEffectBank].type1 == TYPE_STEEL || gBattleMons[gEffectBank].type2 == TYPE_STEEL) && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && (primary == 1 || certain == 0x80)) { - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PSNPrevention; gBattleCommunication[MULTISTRING_CHOOSER] = 2; return; @@ -2355,7 +2350,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { gLastUsedAbility = ABILITY_WATER_VEIL; RecordAbilityBattle(gEffectBank, ABILITY_WATER_VEIL); - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); //_0801E664: gBattlescriptCurrInstr = BattleScript_BRNPrevention; if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) @@ -2370,7 +2365,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if ((gBattleMons[gEffectBank].type1 == TYPE_FIRE || gBattleMons[gEffectBank].type2 == TYPE_FIRE) && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && (primary == 1 || certain == 0x80)) { - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_BRNPrevention; gBattleCommunication[MULTISTRING_CHOOSER] = 2; return; @@ -2399,7 +2394,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { gLastUsedAbility = ABILITY_LIMBER; RecordAbilityBattle(gEffectBank, ABILITY_LIMBER); - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); //_0801E664: gBattlescriptCurrInstr = BattleScript_PRLZPrevention; if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) @@ -2421,7 +2416,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { gLastUsedAbility = ABILITY_IMMUNITY; RecordAbilityBattle(gEffectBank, ABILITY_IMMUNITY); - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); //_0801E664: gBattlescriptCurrInstr = BattleScript_PSNPrevention; if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) @@ -2436,7 +2431,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if ((gBattleMons[gEffectBank].type1 == TYPE_POISON || gBattleMons[gEffectBank].type2 == TYPE_POISON || gBattleMons[gEffectBank].type1 == TYPE_STEEL || gBattleMons[gEffectBank].type2 == TYPE_STEEL) && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && (primary == 1 || certain == 0x80)) { - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PSNPrevention; gBattleCommunication[MULTISTRING_CHOOSER] = 2; return; @@ -2458,14 +2453,14 @@ void SetMoveEffect(bool8 primary, u8 certainArg) } if (StatusChanged == 1) { - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); if (gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS_SLEEP) gBattleMons[gEffectBank].status1 |= ((Random() & 3) + 2); else gBattleMons[gEffectBank].status1 |= gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; gActiveBank = gEffectBank; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1); MarkBufferBankForExecution(gActiveBank); if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) { @@ -2499,7 +2494,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (gBattleMons[gEffectBank].status2 & STATUS2_CONFUSION) {gBattlescriptCurrInstr++; return;} gBattleMons[gEffectBank].status2 |= (((Random()) % 0x4)) + 2; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; break; case 8: //flinch @@ -2528,7 +2523,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattleMons[gEffectBank].status2 |= STATUS2_MULTIPLETURNS; gLockedMoves[gEffectBank] = gCurrentMove; gBattleMons[gEffectBank].status2 |= ((Random() & 3) + 2) << 4; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; break; case 11: //pay day @@ -2539,7 +2534,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (PayDay > gPaydayMoney) gPaydayMoney = 0xFFFF; } - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; break; case 9: //tri attack @@ -2561,7 +2556,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) BATTLE_STRUCT->wrappedMove[gEffectBank*2] = (u8)gCurrentMove; (1 + BATTLE_STRUCT->wrappedMove)[gEffectBank*2] = gCurrentMove >> 8; //don't ask. BATTLE_STRUCT->wrappedBy[gEffectBank] = gBankAttacker; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattleCommunication[MULTISTRING_CHOOSER] = 0; while (gBattleCommunication[MULTISTRING_CHOOSER] <= 4 @@ -2572,7 +2567,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattleMoveDamage = (gHP_dealt) / 4; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; break; case 15 ... 21: //stat + 1 @@ -2581,7 +2576,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; //TODO: the arg ptr is wrong by one BATTLE_STRUCT->animArg2 = 0; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatUp; } break; @@ -2591,7 +2586,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; BATTLE_STRUCT->animArg2 = 0; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatDown; } break; @@ -2601,7 +2596,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; BATTLE_STRUCT->animArg2 = 0; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatUp; } break; @@ -2611,7 +2606,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; BATTLE_STRUCT->animArg2 = 0; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatDown; } break; @@ -2634,7 +2629,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) {gBattlescriptCurrInstr++; return;} if (gBattleMons[gBankTarget].item && gBattleMons[gBankTarget].ability == ABILITY_STICKY_HOLD) { - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_NoItemSteal; gLastUsedAbility = gBattleMons[gBankTarget].ability; RecordAbilityBattle(gBankTarget, gLastUsedAbility); @@ -2652,14 +2647,14 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattleMons[gBankTarget].item = 0; gActiveBank = gBankAttacker; - EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem); + EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem); MarkBufferBankForExecution(gBankAttacker); gActiveBank = gBankTarget; - EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankTarget].item); + EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBankTarget].item); MarkBufferBankForExecution(gBankTarget); - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_ItemSteal; CHOICED_MOVE(gBankTarget) = 0; @@ -2675,11 +2670,11 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattlescriptCurrInstr++; break; case 34: //ancientpower - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_AllStatsUp; return; case 35: //break free rapidspin - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_RapidSpinAway; return; case 36: //paralysis removal @@ -2687,23 +2682,23 @@ void SetMoveEffect(bool8 primary, u8 certainArg) { gBattleMons[gBankTarget].status1 &= ~(STATUS_PARALYSIS); gActiveBank = gBankTarget; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1); MarkBufferBankForExecution(gActiveBank); - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal; } else {gBattlescriptCurrInstr++; return;} break; case 37: //superpower - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_AtkDefDown; return; case 38: //33% recoil gBattleMoveDamage = gHP_dealt / 3; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; break; case 53: //thrash @@ -2734,14 +2729,14 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gLastUsedItem = gBattleMons[gEffectBank].item; gBattleMons[gEffectBank].item = 0; gWishFutureKnock.knockedOffPokes[side] |= gBitTable[gBattlePartyID[gEffectBank]]; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_KnockedOff; CHOICED_MOVE(gEffectBank) = 0; } break; case 59: //overheat - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_SAtkDown2; return; } @@ -3065,7 +3060,7 @@ _0801E64A:\n\ ldr r4, _0801E67C @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801E680 @ =BattleScript_PSNPrevention\n\ _0801E664:\n\ str r0, [r4]\n\ @@ -3188,7 +3183,7 @@ _0801E72E:\n\ ldr r4, _0801E750 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801E754 @ =BattleScript_BRNPrevention\n\ b _0801E664\n\ .align 2, 0\n\ @@ -3228,7 +3223,7 @@ _0801E78E:\n\ ldr r4, _0801E7A0 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801E7A4 @ =BattleScript_BRNPrevention\n\ b _0801E998\n\ .align 2, 0\n\ @@ -3379,7 +3374,7 @@ _0801E8A6:\n\ ldr r4, _0801E8C8 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801E8CC @ =BattleScript_PRLZPrevention\n\ b _0801E664\n\ .align 2, 0\n\ @@ -3422,7 +3417,7 @@ _0801E8FE:\n\ ldr r4, _0801E93C @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801E940 @ =BattleScript_PSNPrevention\n\ str r0, [r4]\n\ ldr r2, _0801E944 @ =gHitMarker\n\ @@ -3483,7 +3478,7 @@ _0801E98C:\n\ ldr r4, _0801E9A8 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801E9AC @ =BattleScript_PSNPrevention\n\ _0801E998:\n\ str r0, [r4]\n\ @@ -3556,7 +3551,7 @@ _0801EA1C:\n\ ldr r0, _0801EA5C @ =gBattlescriptCurrInstr\n\ ldr r0, [r0]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _0801EA60 @ =gStatusFlagsForMoveEffects\n\ ldr r0, _0801EA64 @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ @@ -3621,7 +3616,7 @@ _0801EA84:\n\ movs r1, 0x28\n\ movs r2, 0\n\ movs r3, 0x4\n\ - bl EmitSetAttributes\n\ + bl EmitSetMonData\n\ ldrb r0, [r4]\n\ bl MarkBufferBankForExecution\n\ ldr r2, _0801EAF0 @ =gHitMarker\n\ @@ -3814,7 +3809,7 @@ _0801EC8E:\n\ ldr r4, _0801ECC8 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _0801ECCC @ =gMoveEffectBS_Ptrs\n\ ldr r0, _0801ECD0 @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ @@ -3931,7 +3926,7 @@ _0801ED7C:\n\ ldr r4, _0801EDD0 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _0801EDD4 @ =gMoveEffectBS_Ptrs\n\ ldr r0, _0801EDD8 @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ @@ -3977,7 +3972,7 @@ _0801EE14:\n\ ldr r4, _0801EE40 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _0801EE44 @ =gMoveEffectBS_Ptrs\n\ ldr r0, _0801EE48 @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ @@ -4112,7 +4107,7 @@ _0801EEE8:\n\ ldr r4, _0801EF98 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _0801EF9C @ =gMoveEffectBS_Ptrs\n\ ldr r2, _0801EFA0 @ =gBattleCommunication\n\ ldrb r0, [r2, 0x3]\n\ @@ -4177,7 +4172,7 @@ _0801EFC0:\n\ ldr r4, _0801EFE0 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _0801EFE4 @ =gMoveEffectBS_Ptrs\n\ ldr r0, _0801EFE8 @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ @@ -4219,7 +4214,7 @@ _0801F008:\n\ ldr r4, _0801F038 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F03C @ =BattleScript_StatUp\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4257,7 +4252,7 @@ _0801F05E:\n\ ldr r4, _0801F08C @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F090 @ =BattleScript_StatDown\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4294,7 +4289,7 @@ _0801F0B0:\n\ ldr r4, _0801F0E0 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F0E4 @ =BattleScript_StatUp\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4332,7 +4327,7 @@ _0801F106:\n\ ldr r4, _0801F134 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F138 @ =BattleScript_StatDown\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4545,7 +4540,7 @@ _0801F2B6:\n\ movs r1, 0x2\n\ movs r2, 0\n\ movs r3, 0x2\n\ - bl EmitSetAttributes\n\ + bl EmitSetMonData\n\ mov r3, r10\n\ ldrb r0, [r3]\n\ bl MarkBufferBankForExecution\n\ @@ -4563,13 +4558,13 @@ _0801F2B6:\n\ movs r1, 0x2\n\ movs r2, 0\n\ movs r3, 0x2\n\ - bl EmitSetAttributes\n\ + bl EmitSetMonData\n\ ldrb r0, [r7]\n\ bl MarkBufferBankForExecution\n\ ldr r4, _0801F350 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F354 @ =BattleScript_ItemSteal\n\ str r0, [r4]\n\ ldr r0, _0801F358 @ =0xfffe9f10\n\ @@ -4644,7 +4639,7 @@ _0801F3BC:\n\ ldr r4, _0801F3CC @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F3D0 @ =BattleScript_AllStatsUp\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4654,7 +4649,7 @@ _0801F3D4:\n\ ldr r4, _0801F3E4 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F3E8 @ =BattleScript_RapidSpinAway\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4690,13 +4685,13 @@ _0801F406:\n\ movs r1, 0x28\n\ movs r2, 0\n\ movs r3, 0x4\n\ - bl EmitSetAttributes\n\ + bl EmitSetMonData\n\ ldrb r0, [r4]\n\ bl MarkBufferBankForExecution\n\ ldr r4, _0801F444 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F448 @ =BattleScript_TargetPRLZHeal\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4708,7 +4703,7 @@ _0801F44C:\n\ ldr r4, _0801F45C @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F460 @ =BattleScript_AtkDefDown\n\ b _0801F5F8\n\ .align 2, 0\n\ @@ -4729,7 +4724,7 @@ _0801F47A:\n\ ldr r4, _0801F49C @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _0801F4A0 @ =gMoveEffectBS_Ptrs\n\ ldr r0, _0801F4A4 @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ @@ -4857,7 +4852,7 @@ _0801F540:\n\ ldr r4, _0801F5C8 @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F5CC @ =BattleScript_KnockedOff\n\ str r0, [r4]\n\ ldr r1, _0801F5D0 @ =gSharedMem\n\ @@ -4897,7 +4892,7 @@ _0801F5EC:\n\ ldr r4, _0801F60C @ =gBattlescriptCurrInstr\n\ ldr r0, [r4]\n\ adds r0, 0x1\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _0801F610 @ =BattleScript_SAtkDown2\n\ _0801F5F8:\n\ str r0, [r4]\n\ @@ -4977,7 +4972,7 @@ static void atk19_tryfaintmon(void) { r4 = T1_READ_PTR(gBattlescriptCurrInstr + 3); - b_movescr_stack_pop_cursor(); + BattleScriptPop(); gBattlescriptCurrInstr = r4; gSideAffecting[GetBankSide(gActiveBank)] &= ~SIDE_STATUS_SPIKES_DAMAGED; } @@ -5013,7 +5008,7 @@ static void atk19_tryfaintmon(void) ewram16100arr2(3, bank) = 0; gHitMarker |= HITMARKER_FAINTED(gActiveBank); - b_movescr_stack_push(gBattlescriptCurrInstr + 7); + BattleScriptPush(gBattlescriptCurrInstr + 7); gBattlescriptCurrInstr = r4; if (GetBankSide(gActiveBank) == 0) { @@ -5036,7 +5031,7 @@ static void atk19_tryfaintmon(void) } if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBankAttacker].hp != 0) { - b_movescr_stack_push(gBattlescriptCurrInstr); + BattleScriptPush(gBattlescriptCurrInstr); gBattleMoveDamage = gBattleMons[bank].hp; gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife; } @@ -5049,10 +5044,10 @@ static void atk19_tryfaintmon(void) u8 moveIndex = ewram1608Carr(gBankAttacker); gBattleMons[gBankAttacker].pp[moveIndex] = 0; - b_movescr_stack_push(gBattlescriptCurrInstr); + BattleScriptPush(gBattlescriptCurrInstr); gBattlescriptCurrInstr = BattleScript_SelectingImprisionedMoveInPalace; gActiveBank = gBankAttacker; - EmitSetAttributes(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]); + EmitSetMonData(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]); MarkBufferBankForExecution(gActiveBank); gBattleTextBuff1[0] = 0xFD; @@ -5087,7 +5082,7 @@ static void atk1B_cleareffectsonfaint(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); gBattleMons[gActiveBank].status1 = 0; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBank].status1); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBank].status1); MarkBufferBankForExecution(gActiveBank); UndoEffectsAfterFainting(); gBattlescriptCurrInstr += 2; @@ -5476,7 +5471,7 @@ static void atk23_getexp(void) gBattleTextBuff2[4] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL); gBattleTextBuff2[5] = 0xFF; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gLeveledUpInBattle |= gBitTable[BATTLE_STRUCT->expGetterID]; gBattlescriptCurrInstr = BattleScript_LevelUp; gBattleMoveDamage = (gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8)); @@ -6353,7 +6348,7 @@ _080206A8:\n\ movs r0, 0x1\n\ negs r0, r0\n\ strb r0, [r4, 0x5]\n\ - bl b_movescr_stack_push_cursor\n\ + bl BattleScriptPushCursor\n\ ldr r2, _080208D8 @ =gLeveledUpInBattle\n\ ldr r1, _080208DC @ =gBitTable\n\ ldrb r0, [r6]\n\ @@ -7282,7 +7277,7 @@ static void atk3B_healthbar_update(void) static void atk3C_return(void) { - b_movescr_stack_pop_cursor(); + BattleScriptPop(); } static void atk3D_end(void) @@ -7301,7 +7296,7 @@ static void atk3E_end2(void) static void atk3F_end3(void) //pops the main function stack { - b_movescr_stack_pop_cursor(); + BattleScriptPop(); if (B_FUNCTION_STACK->size) B_FUNCTION_STACK->size--; gBattleMainFunc = B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size]; @@ -7309,7 +7304,7 @@ static void atk3F_end3(void) //pops the main function stack static void atk41_call(void) { - b_movescr_stack_push(gBattlescriptCurrInstr + 5); + BattleScriptPush(gBattlescriptCurrInstr + 5); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -7353,7 +7348,7 @@ static void atk45_playanimation(void) } else if (gHitMarker & HITMARKER_NO_ANIMATIONS) { - b_movescr_stack_push(gBattlescriptCurrInstr + 7); + BattleScriptPush(gBattlescriptCurrInstr + 7); gBattlescriptCurrInstr = BattleScript_Pausex20; } else if (gBattlescriptCurrInstr[2] == B_ANIM_RAIN_CONTINUES @@ -7829,7 +7824,7 @@ static void atk49_moveend(void) && gBattleMoves[gCurrentMove].power && gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK] <= 0xB) { gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK]++; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_RageIsBuilding; effect = 1; } @@ -7843,9 +7838,9 @@ static void atk49_moveend(void) { gBattleMons[gBankTarget].status1 &= ~(STATUS_FREEZE); gActiveBank = gBankTarget; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1); MarkBufferBankForExecution(gActiveBank); - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove; effect = 1; } @@ -7903,10 +7898,9 @@ static void atk49_moveend(void) } BATTLE_STRUCT->cmd49StateTracker++; break; - //sub_8015660 CheckIfMoveFailed case 9: //semi-invlurneable attacker make visible if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankAttacker] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER)) - || sub_8015660(gBankAttacker)) + || WasUnableToUseMove(gBankAttacker)) { gActiveBank = gBankAttacker; EmitSpriteInvisibility(0, 0); @@ -7918,7 +7912,7 @@ static void atk49_moveend(void) break; case 10: //semi-invlurneable target make visible if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER)) - || sub_8015660(gBankTarget)) + || WasUnableToUseMove(gBankTarget)) { gActiveBank = gBankTarget; EmitSpriteInvisibility(0, 0); @@ -8018,7 +8012,7 @@ _08021874:\n\ lsls r0, 2\n\ adds r0, r2\n\ ldr r0, [r0]\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r1, _080218B8 @ =gBattlescriptCurrInstr\n\ ldr r0, _080218BC @ =gUnknown_081D9B2D\n\ bl _0802229C\n\ @@ -8163,7 +8157,7 @@ _080219C8:\n\ bgt _080219FE\n\ adds r0, r2, 0x1\n\ strb r0, [r1, 0x19]\n\ - bl b_movescr_stack_push_cursor\n\ + bl BattleScriptPushCursor\n\ ldr r1, _08021A24 @ =gBattlescriptCurrInstr\n\ ldr r0, _08021A28 @ =BattleScript_RageIsBuilding\n\ str r0, [r1]\n\ @@ -8258,10 +8252,10 @@ _08021A92:\n\ movs r1, 0x28\n\ movs r2, 0\n\ movs r3, 0x4\n\ - bl EmitSetAttributes\n\ + bl EmitSetMonData\n\ ldrb r0, [r4]\n\ bl MarkBufferBankForExecution\n\ - bl b_movescr_stack_push_cursor\n\ + bl BattleScriptPushCursor\n\ ldr r1, _08021AE8 @ =gBattlescriptCurrInstr\n\ ldr r0, _08021AEC @ =BattleScript_DefrostedViaFireMove\n\ str r0, [r1]\n\ @@ -8571,7 +8565,7 @@ _08021D18:\n\ cmp r0, 0\n\ beq _08021D44\n\ adds r0, r2, 0\n\ - bl sub_8015660\n\ + bl WasUnableToUseMove\n\ lsls r0, 24\n\ cmp r0, 0\n\ beq _08021D7E\n\ @@ -10637,7 +10631,7 @@ static void atk52_switchineffects(void) gBattleMoveDamage = 1; BATTLE_STRUCT->scriptingActive = gActiveBank; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0) gBattlescriptCurrInstr = BattleScript_SpikesOnTarget; @@ -11457,7 +11451,7 @@ void atk6A_removeitem(void) USED_HELD_ITEMS(gActiveBank) = gBattleMons[gActiveBank].item; gBattleMons[gActiveBank].item = 0; - EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item); + EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item); MarkBufferBankForExecution(gActiveBank); gBattlescriptCurrInstr += 2; } @@ -11900,7 +11894,7 @@ _08024C48: .4byte gBattlescriptCurrInstr\n\ static void atk6D_resetsentmonsvalue(void) { - sub_80156DC(); + ResetSentPokesToOpponentValue(); gBattlescriptCurrInstr++; } @@ -12148,7 +12142,7 @@ static void atk79_setatkhptozero(void) gActiveBank = gBankAttacker; gBattleMons[gActiveBank].hp = 0; - EmitSetAttributes(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp); + EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBank].hp); MarkBufferBankForExecution(gActiveBank); gBattlescriptCurrInstr++; @@ -12333,7 +12327,7 @@ static void atk81_trysetrest(void) gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleMons[gBankTarget].status1 = 3; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); MarkBufferBankForExecution(gActiveBank); gBattlescriptCurrInstr += 5; } @@ -12509,7 +12503,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) gBattlescriptCurrInstr = bs_ptr; else { - b_movescr_stack_push(bs_ptr); + BattleScriptPush(bs_ptr); BATTLE_STRUCT->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_MistProtected; gSpecialStatuses[gActiveBank].statloweringflag = 1; @@ -12530,7 +12524,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) gBattlescriptCurrInstr = bs_ptr; else { - b_movescr_stack_push(bs_ptr); + BattleScriptPush(bs_ptr); BATTLE_STRUCT->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; @@ -12544,7 +12538,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) { if (flags == 1) { - b_movescr_stack_push(bs_ptr); + BattleScriptPush(bs_ptr); BATTLE_STRUCT->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; @@ -12556,7 +12550,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) { if (flags == 1) { - b_movescr_stack_push(bs_ptr); + BattleScriptPush(bs_ptr); BATTLE_STRUCT->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; @@ -12774,7 +12768,7 @@ _08025F0C: .4byte gSpecialStatuses\n\ _08025F10: .4byte gBattlescriptCurrInstr\n\ _08025F14:\n\ mov r0, r8\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _08025F40 @ =gSharedMem\n\ ldr r6, _08025F44 @ =gActiveBank\n\ ldrb r1, [r6]\n\ @@ -12869,7 +12863,7 @@ _08025FD8: .4byte gSpecialStatuses\n\ _08025FDC: .4byte gBattlescriptCurrInstr\n\ _08025FE0:\n\ mov r0, r8\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _08026028 @ =gSharedMem\n\ ldr r2, _0802602C @ =gActiveBank\n\ ldrb r1, [r2]\n\ @@ -12926,7 +12920,7 @@ _08026040:\n\ cmp r5, 0x1\n\ bne _08025F74\n\ mov r0, r8\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _08026094 @ =gSharedMem\n\ ldr r3, _08026090 @ =gActiveBank\n\ ldrb r1, [r3]\n\ @@ -12974,7 +12968,7 @@ _080260A8:\n\ b _08025F74\n\ _080260CA:\n\ mov r0, r8\n\ - bl b_movescr_stack_push\n\ + bl BattleScriptPush\n\ ldr r0, _08026100 @ =gSharedMem\n\ ldr r3, _080260FC @ =gActiveBank\n\ ldrb r1, [r3]\n\ @@ -13470,7 +13464,7 @@ static void atk91_givepaydaymoney(void) gBattleTextBuff1[4] = gPaydayMoney; gBattleTextBuff1[5] = uBYTE1_16(gPaydayMoney); gBattleTextBuff1[6] = 0xFF; - b_movescr_stack_push(gBattlescriptCurrInstr + 1); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PrintPayDayMoneyString; } else @@ -14766,7 +14760,7 @@ static void atkA8_copymovepermanently(void) moves_data.pp[i] = gBattleMons[gBankAttacker].pp[i]; } moves_data.ppBonuses = gBattleMons[gBankAttacker].ppBonuses; - EmitSetAttributes(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct move_pp), &moves_data); + EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct move_pp), &moves_data); MarkBufferBankForExecution(gActiveBank); gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 2; @@ -14909,7 +14903,7 @@ static void atkAD_tryspiteppreduce(void) if (!(gDisableStructs[gActiveBank].unk18_b & gBitTable[i]) && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED)) { - EmitSetAttributes(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]); + EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]); MarkBufferBankForExecution(gActiveBank); } gBattlescriptCurrInstr += 5; @@ -14992,7 +14986,7 @@ static void atkAE_healpartystatus(void) } //missing check? gActiveBank = gBankAttacker; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, to_heal, 4, &zero); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, to_heal, 4, &zero); MarkBufferBankForExecution(gActiveBank); gBattlescriptCurrInstr++; @@ -15052,7 +15046,7 @@ static void atkB2_trysetperishsong(void) } } - sub_80153D0(gBankAttacker); + PressurePPLoseOnUsingPerishSong(gBankAttacker); if (not_affected_pokes == gNoOfAllBanks) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else @@ -15320,21 +15314,21 @@ static void atkBE_rapidspinfree(void) //rapid spin gBattleTextBuff1[2] = ewram16004arr(0, gBankAttacker); gBattleTextBuff1[3] = ewram16004arr(1, gBankAttacker); gBattleTextBuff1[4] = 0xFF; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_WrapFree; } else if (gStatuses3[gBankAttacker] & STATUS3_LEECHSEED) { gStatuses3[gBankAttacker] &= ~(STATUS3_LEECHSEED); gStatuses3[gBankAttacker] &= ~(STATUS3_LEECHSEED_BANK); - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_LeechSeedFree; } else if (gSideAffecting[GetBankSide(gBankAttacker)] & SIDE_STATUS_SPIKES) { gSideAffecting[GetBankSide(gBankAttacker)] &= ~(SIDE_STATUS_SPIKES); gSideTimers[GetBankSide(gBankAttacker)].spikesAmount = 0; - b_movescr_stack_push_cursor(); + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SpikesFree; } else @@ -15952,7 +15946,7 @@ static void atkCC_callterrainattack(void) //nature power gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = sNaturePowerMoves[gBattleTerrain]; gBankTarget = GetMoveTarget(gCurrentMove, 0); - b_movescr_stack_push(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); + BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); gBattlescriptCurrInstr++; } @@ -15963,7 +15957,7 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) //refresh gBattleMons[gBankAttacker].status1 = 0; gBattlescriptCurrInstr += 5; gActiveBank = gBankAttacker; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); MarkBufferBankForExecution(gActiveBank); } else @@ -16222,7 +16216,7 @@ _0802A36C:\n\ movs r1, 0x2\n\ movs r2, 0\n\ movs r3, 0x2\n\ - bl EmitSetAttributes\n\ + bl EmitSetMonData\n\ ldr r2, _0802A45C @ =gBankAttacker\n\ ldrb r0, [r2]\n\ bl MarkBufferBankForExecution\n\ @@ -16240,7 +16234,7 @@ _0802A36C:\n\ movs r1, 0x2\n\ movs r2, 0\n\ movs r3, 0x2\n\ - bl EmitSetAttributes\n\ + bl EmitSetMonData\n\ ldrb r0, [r7]\n\ bl MarkBufferBankForExecution\n\ ldr r0, _0802A464 @ =0xfffe9f10\n\ @@ -16471,7 +16465,7 @@ static void atkDB_tryimprision(void) else { u8 bank; - sub_801529C(gBankAttacker); + PressurePPLoseOnUsingImprision(gBankAttacker); for (bank = 0; bank < gNoOfAllBanks; bank++) { if (r8 != GetBankSide(bank)) @@ -16826,7 +16820,7 @@ static void atkE2_switchoutabilities(void) { case ABILITY_NATURAL_CURE: gBattleMons[gActiveBank].status1 = 0; - EmitSetAttributes(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBank)], 4, &gBattleMons[gActiveBank].status1); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[ewram16064arr(gActiveBank)], 4, &gBattleMons[gActiveBank].status1); MarkBufferBankForExecution(gActiveBank); break; } @@ -16922,7 +16916,7 @@ static void atkE7_trycastformdatachange(void) form = CastformDataTypeChange(BATTLE_STRUCT->scriptingActive); if (form) { - b_push_move_exec(BattleScript_CastformChange); + BattleScriptPushCursorAndCallback(BattleScript_CastformChange); BATTLE_STRUCT->castformToChangeInto = form - 1; } } @@ -16984,7 +16978,7 @@ static void atkEA_tryrecycleitem(void) gLastUsedItem = *used_item; *used_item = 0; gBattleMons[gActiveBank].item = gLastUsedItem; - EmitSetAttributes(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item); + EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBank].item); MarkBufferBankForExecution(gActiveBank); gBattlescriptCurrInstr += 5; } diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c new file mode 100644 index 000000000..9dc030a1a --- /dev/null +++ b/src/battle/battle_util.c @@ -0,0 +1,3479 @@ +#include "global.h" +#include "battle.h" +#include "battle_util.h" +#include "data2.h" +#include "event_data.h" +#include "ewram.h" +#include "item.h" +#include "link.h" +#include "pokemon.h" +#include "random.h" +#include "rom_8077ABC.h" +#include "string_util.h" +#include "text.h" +#include "util.h" +#include "constants/abilities.h" +#include "constants/battle_move_effects.h" +#include "constants/flags.h" +#include "constants/hold_effects.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" +#include "constants/weather.h" + +extern u8* gBattlescriptCurrInstr; +extern u8 gActiveBank; +extern u8 gBattleBufferB[4][0x200]; +extern u8* gUnknown_02024C1C[4]; //battlescript location when you try to choose a move you're not allowed to +extern u16 gLastUsedMove[4]; +extern struct BattlePokemon gBattleMons[4]; +extern struct BattleEnigmaBerry gEnigmaBerries[4]; +extern u8 gStringBank; +extern u16 gLastUsedItem; +extern u16 gCurrentMove; +extern const u32 gBitTable[]; +extern u16 gBattleTypeFlags; +extern u8 gNoOfAllBanks; +extern u32 gStatuses3[4]; +extern u8 gBankAttacker; +extern u8 gBankTarget; +extern u8 gBanksByTurnOrder[4]; +extern u16 gSideAffecting[2]; +extern u16 gBattleWeather; +extern void (*gBattleMainFunc)(void); +extern u8 gAbsentBankFlags; +extern u8 gBattleCommunication[]; +extern u32 gHitMarker; +extern u8 gEffectBank; +extern u8 gBank1; +extern s32 gBattleMoveDamage; +extern u16 gBattlePartyID[4]; +extern u16 gChosenMovesByBanks[4]; +extern s32 gTakenDmg[4]; +extern u8 gTakenDmgBanks[4]; +extern u8 gBattleMoveFlags; +extern u8 gLastUsedAbility; +extern u8 gBattleTextBuff2[]; +extern u8 gCurrentActionFuncId; +extern struct BattleEnigmaBerry gEnigmaBerries[4]; +extern u8 gUnknown_02024BE5; +extern u8 gCurrMovePos; +extern u16 gRandomMove; +extern s32 gBattleMoveDamage; +extern u16 gDynamicBasePower; +extern u32 gBattleExecBuffer; +extern u8 gSentPokesToOpponent[2]; +extern const u16 gSoundMovesTable[]; +extern const u8 gStatusConditionString_PoisonJpn[]; +extern const u8 gStatusConditionString_SleepJpn[]; +extern const u8 gStatusConditionString_ParalysisJpn[]; +extern const u8 gStatusConditionString_BurnJpn[]; +extern const u8 gStatusConditionString_IceJpn[]; +extern const u8 gStatusConditionString_ConfusionJpn[]; +extern const u8 gStatusConditionString_LoveJpn[]; +extern const BattleCmdFunc gBattleScriptingCommandsTable[]; + +u8 IsImprisoned(u8 bank, u16 move); +u8 GetBankByIdentity(u8 ID); +u8 GetBankIdentity(u8 bank); +u8 GetBankSide(u8 bank); +void SetMoveEffect(bool8 primary, u8 certainArg); +bool8 UproarWakeUpCheck(u8 bank); +bool8 sub_8018018(u8 bank, u8, u8); +s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 a4, u16 powerOverride, u8 typeOverride, u8 bank_atk, u8 bank_def); +u8 CountTrailingZeroBits(u32 a); +u8 GetMoveTarget(u16 move, u8 useMoveTarget); +u8 sub_803FC34(u8 bank); +u16 sub_803FBFC(u8 a); +u8 weather_get_current(void); +void RecordAbilityBattle(u8 bank, u8 ability); +void RecordItemBattle(u8 bank, u8 holdEffect); +s8 GetPokeFlavourRelation(u32 pid, u8 flavor); + +extern u8 BattleScript_MoveSelectionDisabledMove[]; +extern u8 BattleScript_MoveSelectionTormented[]; +extern u8 BattleScript_MoveSelectionTaunted[]; +extern u8 BattleScript_MoveSelectionImprisoned[]; +extern u8 BattleScript_MoveSelectionChoiceBanded[]; +extern u8 BattleScript_MoveSelectionNoPP[]; +extern u8 BattleScript_NoMovesLeft[]; +extern u8 BattleScript_WishComesTrue[]; +extern u8 BattleScript_IngrainTurnHeal[]; +extern u8 BattleScript_LeechSeedTurnDrain[]; +extern u8 BattleScript_PoisonTurnDmg[]; +extern u8 BattleScript_BurnTurnDmg[]; +extern u8 BattleScript_NightmareTurnDmg[]; +extern u8 BattleScript_CurseTurnDmg[]; +extern u8 BattleScript_WrapTurnDmg[]; +extern u8 BattleScript_WrapEnds[]; +extern u8 BattleScript_DisabledNoMore[]; +extern u8 BattleScript_EncoredNoMore[]; + +extern u8 BattleScript_SideStatusWoreOff[]; +extern u8 BattleScript_RainContinuesOrEnds[]; +extern u8 BattleScript_SandStormHailEnds[]; +extern u8 BattleScript_DamagingWeatherContinues[]; +extern u8 BattleScript_SunlightFaded[]; +extern u8 BattleScript_SunlightContinues[]; +extern u8 BattleScript_SafeguardEnds[]; +extern u8 BattleScript_MonWokeUpInUproar[]; //uproar wakeup BS +extern u8 BattleScript_PrintUproarOverTurns[]; //uproar BS +extern u8 BattleScript_ThrashConfuses[]; +extern u8 BattleScript_YawnMakesAsleep[]; +extern u8 BattleScript_MonTookFutureAttack[]; +extern u8 BattleScript_PerishSongHits[]; +extern u8 BattleScript_PerishSongTimerGoesDown[]; +extern u8 BattleScript_GiveExp[]; +extern u8 BattleScript_HandleFaintedMon[]; + +extern u8 BattleScript_MoveUsedIsAsleep[]; +extern u8 BattleScript_MoveUsedWokeUp[]; +extern u8 BattleScript_MoveUsedIsFrozen[]; +extern u8 BattleScript_MoveUsedUnfroze[]; +extern u8 BattleScript_MoveUsedLoafingAround[]; +extern u8 BattleScript_MoveUsedMustRecharge[]; +extern u8 BattleScript_MoveUsedFlinched[]; +extern u8 BattleScript_MoveUsedIsDisabled[]; +extern u8 BattleScript_MoveUsedIsTaunted[]; +extern u8 BattleScript_MoveUsedIsImprisoned[]; +extern u8 BattleScript_MoveUsedIsConfused[]; +extern u8 BattleScript_MoveUsedIsConfusedNoMore[]; +extern u8 BattleScript_MoveUsedIsParalyzed[]; +extern u8 BattleScript_MoveUsedIsParalyzedCantAttack[]; +extern u8 BattleScript_MoveUsedIsInLove[]; +extern u8 BattleScript_BideStoringEnergy[]; +extern u8 BattleScript_BideAttack[]; +extern u8 BattleScript_BideNoEnergyToAttack[]; + +extern u8 BattleScript_OverworldWeatherStarts[]; //load weather from overworld +extern u8 BattleScript_DrizzleActivates[]; +extern u8 BattleScript_SandstreamActivates[]; +extern u8 BattleScript_DroughtActivates[]; +extern u8 BattleScript_CastformChange[]; +extern u8 BattleScript_RainDishActivates[]; +extern u8 BattleScript_ShedSkinActivates[]; +extern u8 BattleScript_SpeedBoostActivates[]; +extern u8 BattleScript_SoundproofProtected[]; +extern u8 BattleScript_MoveHPDrain[]; +extern u8 BattleScript_MoveHPDrain_PPLoss[]; +extern u8 BattleScript_FlashFireBoost[]; +extern u8 BattleScript_FlashFireBoost_PPLoss[]; +extern u8 BattleScript_MoveHPDrain_FullHP[]; +extern u8 BattleScript_MoveHPDrain_FullHP_PPLoss[]; +extern u8 BattleScript_ColorChangeActivates[]; +extern u8 BattleScript_RoughSkinActivates[]; +extern u8 BattleScript_ApplySecondaryEffect[]; +extern u8 BattleScript_CuteCharmActivates[]; +extern u8 BattleScript_AbilityCuredStatus[]; //ability status clear +extern u8 BattleScript_SynchronizeActivates[]; +extern u8 gUnknown_081D978C[]; //intimidate1 +extern u8 gUnknown_081D9795[]; //intimidate2 +extern u8 BattleScript_TraceActivates[]; + +extern u8 BattleScript_WhiteHerbEnd2[]; +extern u8 BattleScript_WhiteHerbRet[]; +extern u8 BattleScript_ItemHealHP_RemoveItem[]; +extern u8 BattleScript_BerryPPHealEnd2[]; +extern u8 BattleScript_ItemHealHP_End2[]; +extern u8 BattleScript_BerryConfuseHealEnd2[]; +extern u8 BattleScript_BerryStatRaiseEnd2[]; +extern u8 BattleScript_BerryFocusEnergyEnd2[]; +extern u8 BattleScript_BerryCurePrlzEnd2[]; +extern u8 BattleScript_BerryCurePsnEnd2[]; +extern u8 BattleScript_BerryCureBrnEnd2[]; +extern u8 BattleScript_BerryCureFrzEnd2[]; +extern u8 BattleScript_BerryCureSlpEnd2[]; +extern u8 BattleScript_BerryCureConfusionEnd2[]; +extern u8 BattleScript_BerryCureChosenStatusEnd2[]; //berry cure any status end2 +extern u8 BattleScript_BerryCureParRet[]; +extern u8 BattleScript_BerryCurePsnRet[]; +extern u8 BattleScript_BerryCureBrnRet[]; +extern u8 BattleScript_BerryCureFrzRet[]; +extern u8 BattleScript_BerryCureSlpRet[]; +extern u8 BattleScript_BerryCureConfusionRet[]; +extern u8 BattleScript_BerryCureChosenStatusRet[]; //berry cure any status return + +extern u8 BattleScript_ItemHealHP_Ret[]; + +extern u8 gUnknown_081D995F[]; //disobedient while asleep +extern u8 BattleScript_IgnoresAndUsesRandomMove[]; //disobedient, uses a random move +extern u8 BattleScript_IgnoresAndFallsAsleep[]; //disobedient, went to sleep +extern u8 gUnknown_081D99A0[]; //disobedient, hits itself + +//array entries for battle communication +#define MOVE_EFFECT_BYTE 0x3 +#define MULTISTRING_CHOOSER 0x5 +#define MSG_DISPLAY 0x7 + +u8 GetBattleBank(u8 caseId) +{ + u8 ret = 0; + switch (caseId) + { + case BS_GET_TARGET: + ret = gBankTarget; + break; + case BS_GET_ATTACKER: + ret = gBankAttacker; + break; + case BS_GET_EFFECT_BANK: + ret = gEffectBank; + break; + case BS_GET_BANK_0: + ret = 0; + break; + case BS_GET_SCRIPTING_BANK: + ret = ewram16003; + break; + case BS_GET_gBank1: + ret = gBank1; + break; + case 5: + ret = gBank1; + break; + } + return ret; +} + +void PressurePPLose(u8 bankDef, u8 bankAtk, u16 move) +{ + s32 i; + + if (gBattleMons[bankDef].ability != ABILITY_PRESSURE) + return; + + for (i = 0; i < 4; i++) + { + if (gBattleMons[bankAtk].moves[i] == move) + break; + } + + if (i == 4) // mons don't share any moves + return; + + if (gBattleMons[bankAtk].pp[i] != 0) + gBattleMons[bankAtk].pp[i]--; + + if (!(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED) + && !(gDisableStructs[bankAtk].unk18_b & gBitTable[i])) + { + gActiveBank = bankAtk; + EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBank].pp[i]); + MarkBufferBankForExecution(gActiveBank); + } +} + +void PressurePPLoseOnUsingImprision(u8 bankAtk) +{ + s32 i, j; + s32 imprisionPos = 4; + u8 atkSide = GetBankSide(bankAtk); + + for (i = 0; i < gNoOfAllBanks; i++) + { + if (atkSide != GetBankSide(i) && gBattleMons[i].ability == ABILITY_PRESSURE) + { + for (j = 0; j < 4; j++) + { + if (gBattleMons[bankAtk].moves[j] == MOVE_IMPRISON) + break; + } + if (j != 4) + { + imprisionPos = j; + if (gBattleMons[bankAtk].pp[j] != 0) + gBattleMons[bankAtk].pp[j]--; + } + } + } + + if (imprisionPos != 4 + && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED) + && !(gDisableStructs[bankAtk].unk18_b & gBitTable[imprisionPos])) + { + gActiveBank = bankAtk; + EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBank].pp[imprisionPos]); + MarkBufferBankForExecution(gActiveBank); + } +} + +void PressurePPLoseOnUsingPerishSong(u8 bankAtk) +{ + s32 i, j; + s32 perishSongPos = 4; + + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ABILITY_PRESSURE && i != bankAtk) + { + for (j = 0; j < 4; j++) + { + if (gBattleMons[bankAtk].moves[j] == MOVE_PERISH_SONG) + break; + } + if (j != 4) + { + perishSongPos = j; + if (gBattleMons[bankAtk].pp[j] != 0) + gBattleMons[bankAtk].pp[j]--; + } + } + } + + if (perishSongPos != 4 + && !(gBattleMons[bankAtk].status2 & STATUS2_TRANSFORMED) + && !(gDisableStructs[bankAtk].unk18_b & gBitTable[perishSongPos])) + { + gActiveBank = bankAtk; + EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + perishSongPos, 0, 1, &gBattleMons[gActiveBank].pp[perishSongPos]); + MarkBufferBankForExecution(gActiveBank); + } +} + + +void MarkAllBufferBanksForExecution(void) // unused +{ + s32 i; + + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + for (i = 0; i < gNoOfAllBanks; i++) + gBattleExecBuffer |= gBitTable[i] << 0x1C; + } + else + { + for (i = 0; i < gNoOfAllBanks; i++) + gBattleExecBuffer |= gBitTable[i]; + } +} + +void MarkBufferBankForExecution(u8 bank) +{ + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gBattleExecBuffer |= gBitTable[bank] << 0x1C; + } + else + { + gBattleExecBuffer |= gBitTable[bank]; + } +} + +void sub_80155A4(u8 arg0) +{ + s32 i; + + for (i = 0; i < GetLinkPlayerCount(); i++) + gBattleExecBuffer |= gBitTable[arg0] << (i << 2); + + gBattleExecBuffer &= ~(0x10000000 << arg0); +} + +void CancelMultiTurnMoves(u8 bank) +{ + gBattleMons[bank].status2 &= ~(STATUS2_MULTIPLETURNS); + gBattleMons[bank].status2 &= ~(STATUS2_LOCK_CONFUSE); + gBattleMons[bank].status2 &= ~(STATUS2_UPROAR); + gBattleMons[bank].status2 &= ~(STATUS2_BIDE); + + gStatuses3[bank] &= ~(STATUS3_SEMI_INVULNERABLE); + + gDisableStructs[bank].rolloutTimer1 = 0; + gDisableStructs[bank].furyCutterCounter = 0; +} + +bool8 WasUnableToUseMove(u8 bank) +{ + if (gProtectStructs[bank].prlzImmobility + || gProtectStructs[bank].notEffective + || gProtectStructs[bank].usedImprisionedMove + || gProtectStructs[bank].loveImmobility + || gProtectStructs[bank].usedDisabledMove + || gProtectStructs[bank].usedTauntedMove + || gProtectStructs[bank].flag2Unknown + || gProtectStructs[bank].flinchImmobility + || gProtectStructs[bank].confusionSelfDmg) + return TRUE; + else + return FALSE; +} + +void PrepareStringBattle(u16 stringId, u8 bank) +{ + gActiveBank = bank; + EmitPrintString(0, stringId); + MarkBufferBankForExecution(gActiveBank); +} + +void ResetSentPokesToOpponentValue(void) +{ + s32 i; + u32 bits = 0; + + gSentPokesToOpponent[0] = 0; + gSentPokesToOpponent[1] = 0; + + for (i = 0; i < gNoOfAllBanks; i += 2) + bits |= gBitTable[gBattlePartyID[i]]; + + for (i = 1; i < gNoOfAllBanks; i += 2) + gSentPokesToOpponent[(i & BIT_MON) >> 1] = bits; +} + +void sub_8015740(u8 bank) +{ + s32 i = 0; + u32 bits = 0; + + if (GetBankSide(bank) == SIDE_OPPONENT) + { + u8 id = ((bank & BIT_MON) >> 1); + gSentPokesToOpponent[id] = 0; + + for (i = 0; i < gNoOfAllBanks; i += 2) + { + if (!(gAbsentBankFlags & gBitTable[i])) + bits |= gBitTable[gBattlePartyID[i]]; + } + + gSentPokesToOpponent[id] = bits; + } +} + +void sub_80157C4(u8 bank) +{ + if (GetBankSide(bank) == SIDE_OPPONENT) + { + sub_8015740(bank); + } + else + { + s32 i; + for (i = 1; i < gNoOfAllBanks; i++) + gSentPokesToOpponent[(i & BIT_MON) >> 1] |= gBitTable[gBattlePartyID[bank]]; + } +} + +void BattleScriptPush(u8* BS_ptr) +{ + B_BATTLESCRIPTS_STACK->ptr[B_BATTLESCRIPTS_STACK->size++] = BS_ptr; +} + +void BattleScriptPushCursor(void) +{ + B_BATTLESCRIPTS_STACK->ptr[B_BATTLESCRIPTS_STACK->size++] = gBattlescriptCurrInstr; +} + +void BattleScriptPop(void) +{ + gBattlescriptCurrInstr = B_BATTLESCRIPTS_STACK->ptr[--B_BATTLESCRIPTS_STACK->size]; +} + +u8 TrySetCantSelectMoveBattleScript(void) //msg can't select a move +{ + u8 limitations = 0; + u16 move = gBattleMons[gActiveBank].moves[gBattleBufferB[gActiveBank][2]]; + u8 holdEffect; + u16* choicedMove = CHOICED_MOVE(gActiveBank); + if (gDisableStructs[gActiveBank].disabledMove == move && move) + { + BATTLE_STRUCT->scriptingActive = gActiveBank; + gCurrentMove = move; + gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionDisabledMove; + limitations++; + } + if (move == gLastUsedMove[gActiveBank] && move != MOVE_STRUGGLE && gBattleMons[gActiveBank].status2 & STATUS2_TORMENT) + { + CancelMultiTurnMoves(gActiveBank); + gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionTormented; + limitations++; + } + if (gDisableStructs[gActiveBank].tauntTimer1 && gBattleMoves[move].power == 0) + { + gCurrentMove = move; + gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionTaunted; + limitations++; + } + if (IsImprisoned(gActiveBank, move)) + { + gCurrentMove = move; + gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionImprisoned; + limitations++; + } + if (gBattleMons[gActiveBank].item == ITEM_ENIGMA_BERRY) + holdEffect = gEnigmaBerries[gActiveBank].holdEffect; + else + holdEffect = ItemId_GetHoldEffect(gBattleMons[gActiveBank].item); + gStringBank = gActiveBank; + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move) + { + gCurrentMove = *choicedMove; + gLastUsedItem = gBattleMons[gActiveBank].item; + gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionChoiceBanded; + limitations++; + } + if (gBattleMons[gActiveBank].pp[gBattleBufferB[gActiveBank][2]] == 0) + { + gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionNoPP; + limitations++; + } + return limitations; +} + +#define MOVE_LIMITATION_ZEROMOVE (1 << 0) +#define MOVE_LIMITATION_PP (1 << 1) +#define MOVE_LIMITATION_DISABLED (1 << 2) +#define MOVE_LIMITATION_TORMENTED (1 << 3) +#define MOVE_LIMITATION_TAUNT (1 << 4) +#define MOVE_LIMITATION_IMPRISION (1 << 5) + +u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check) +{ + u8 holdEffect; + u16* choicedMove = CHOICED_MOVE(bank); + s32 i; + if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY) + holdEffect = gEnigmaBerries[bank].holdEffect; + else + holdEffect = ItemId_GetHoldEffect(gBattleMons[bank].item); + gStringBank = bank; + for (i = 0; i < 4; i++) + { + if (gBattleMons[bank].moves[i] == 0 && check & MOVE_LIMITATION_ZEROMOVE) + unusableMoves |= gBitTable[i]; + if (gBattleMons[bank].pp[i] == 0 && check & MOVE_LIMITATION_PP) + unusableMoves |= gBitTable[i]; + if (gBattleMons[bank].moves[i] == gDisableStructs[bank].disabledMove && check & MOVE_LIMITATION_DISABLED) + unusableMoves |= gBitTable[i]; + if (gBattleMons[bank].moves[i] == gLastUsedMove[bank] && check & MOVE_LIMITATION_TORMENTED && gBattleMons[bank].status2 & STATUS2_TORMENT) + unusableMoves |= gBitTable[i]; + if (gDisableStructs[bank].tauntTimer1 && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[bank].moves[i]].power == 0) + unusableMoves |= gBitTable[i]; + if (IsImprisoned(bank, gBattleMons[bank].moves[i]) && check & MOVE_LIMITATION_IMPRISION) + unusableMoves |= gBitTable[i]; + if (gDisableStructs[bank].encoreTimer1 && gDisableStructs[bank].encoredMove != gBattleMons[bank].moves[i]) + unusableMoves |= gBitTable[i]; + if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[bank].moves[i]) + unusableMoves |= gBitTable[i]; + } + return unusableMoves; +} + +bool8 AreAllMovesUnusable(void) +{ + u8 unusable; + unusable = CheckMoveLimitations(gActiveBank, 0, 0xFF); + if (unusable == 0xF) //all moves are unusable + { + gProtectStructs[gActiveBank].onlyStruggle = 1; + gUnknown_02024C1C[gActiveBank] = BattleScript_NoMovesLeft; + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + gBattleBufferB[gActiveBank][3] = GetBankByIdentity((GetBankIdentity(gActiveBank) ^ 1) | (Random() & 2)); + else + gBattleBufferB[gActiveBank][3] = GetBankByIdentity(GetBankIdentity(gActiveBank) ^ 1); + } + else + gProtectStructs[gActiveBank].onlyStruggle = 0; + return (unusable == 0xF); +} + +u8 IsImprisoned(u8 bank, u16 move) +{ + u8 imprisionedMoves = 0; + u8 bankSide = GetBankSide(bank); + s32 i; + for (i = 0; i < gNoOfAllBanks; i++) + { + if (bankSide != GetBankSide(i) && gStatuses3[i] & STATUS3_IMPRISIONED) + { + s32 j; + for (j = 0; j < 4; j++) + { + if (move == gBattleMons[i].moves[j]) + break; + } + if (j < 4) + imprisionedMoves++; + } + } + return imprisionedMoves; +} + +u8 UpdateTurnCounters(void) +{ + u8 effect = 0; + s32 i; + + for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks && gAbsentBankFlags & gBitTable[gBankAttacker]; gBankAttacker++) + { + } + for (gBankTarget = 0; gBankTarget < gNoOfAllBanks && gAbsentBankFlags & gBitTable[gBankTarget]; gBankTarget++) + { + } + + do + { + u8 sideBank; + + switch (BATTLE_STRUCT->turncountersTracker) + { + case 0: + for (i = 0; i < gNoOfAllBanks; i++) + { + gBanksByTurnOrder[i] = i; + } + for (i = 0; i < gNoOfAllBanks - 1; i++) + { + s32 j; + for (j = i + 1; j < gNoOfAllBanks; j++) + { + if (GetWhoStrikesFirst(gBanksByTurnOrder[i], gBanksByTurnOrder[j], 0)) + SwapTurnOrder(i, j); + } + } + BATTLE_STRUCT->turncountersTracker++; + BATTLE_STRUCT->turnSideTracker = 0; + case 1: + while (BATTLE_STRUCT->turnSideTracker < 2) + { + gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + + if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT) + { + if (--gSideTimers[sideBank].reflectTimer == 0) + { + + gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT; + BattleScriptExecute(BattleScript_SideStatusWoreOff); + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 2; + gBattleTextBuff1[2] = MOVE_REFLECT; + gBattleTextBuff1[3] = MOVE_REFLECT >> 8; + gBattleTextBuff1[4] = EOS; + effect++; + } + } + BATTLE_STRUCT->turnSideTracker++; + if (effect) + break; + } + if (!effect) + { + BATTLE_STRUCT->turncountersTracker++; + BATTLE_STRUCT->turnSideTracker = 0; + } + break; + case 2: + while (BATTLE_STRUCT->turnSideTracker < 2) + { + gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN) + { + if (--gSideTimers[sideBank].lightscreenTimer == 0) + { + gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN; + BattleScriptExecute(BattleScript_SideStatusWoreOff); + gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 2; + gBattleTextBuff1[2] = MOVE_LIGHT_SCREEN; + gBattleTextBuff1[3] = MOVE_LIGHT_SCREEN >> 8; + gBattleTextBuff1[4] = EOS; + effect++; + } + } + BATTLE_STRUCT->turnSideTracker++; + if (effect) + break; + } + if (!effect) + { + BATTLE_STRUCT->turncountersTracker++; + BATTLE_STRUCT->turnSideTracker = 0; + } + break; + case 3: + while (BATTLE_STRUCT->turnSideTracker < 2) + { + gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + if (gSideTimers[sideBank].mistTimer && --gSideTimers[sideBank].mistTimer == 0) + { + gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST; + BattleScriptExecute(BattleScript_SideStatusWoreOff); + gBattleCommunication[MULTISTRING_CHOOSER] = sideBank; + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 2; + gBattleTextBuff1[2] = MOVE_MIST; + gBattleTextBuff1[3] = MOVE_MIST >> 8; + gBattleTextBuff1[4] = EOS; + effect++; + } + BATTLE_STRUCT->turnSideTracker++; + if (effect) + break; + } + if (!effect) + { + BATTLE_STRUCT->turncountersTracker++; + BATTLE_STRUCT->turnSideTracker = 0; + } + break; + case 4: + while (BATTLE_STRUCT->turnSideTracker < 2) + { + gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD) + { + if (--gSideTimers[sideBank].safeguardTimer == 0) + { + gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD; + BattleScriptExecute(BattleScript_SafeguardEnds); + effect++; + } + } + BATTLE_STRUCT->turnSideTracker++; + if (effect) + break; + } + if (!effect) + { + BATTLE_STRUCT->turncountersTracker++; + BATTLE_STRUCT->turnSideTracker = 0; + } + break; + case 5: + while (BATTLE_STRUCT->turnSideTracker < gNoOfAllBanks) + { + gActiveBank = gBanksByTurnOrder[BATTLE_STRUCT->turnSideTracker]; + if (gWishFutureKnock.wishCounter[gActiveBank] && --gWishFutureKnock.wishCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp) + { + gBankTarget = gActiveBank; + BattleScriptExecute(BattleScript_WishComesTrue); + effect++; + } + BATTLE_STRUCT->turnSideTracker++; + if (effect) + break; + } + if (!effect) + { + BATTLE_STRUCT->turncountersTracker++; + } + break; + case 6: + if (gBattleWeather & WEATHER_RAIN_ANY) + { + if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) + { + if (--gWishFutureKnock.weatherDuration == 0) + { + gBattleWeather &= ~WEATHER_RAIN_TEMPORARY; + gBattleWeather &= ~WEATHER_RAIN_DOWNPOUR; + gBattleCommunication[MULTISTRING_CHOOSER] = 2; + } + else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR) + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + else + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + } + else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR) + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + else + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + BattleScriptExecute(BattleScript_RainContinuesOrEnds); + effect++; + } + BATTLE_STRUCT->turncountersTracker++; + break; + case 7: + if (gBattleWeather & WEATHER_SANDSTORM_ANY) + { + if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) + { + gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY; + gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; + } + else + gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; + + BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + BattleScriptExecute(gBattlescriptCurrInstr); + effect++; + } + BATTLE_STRUCT->turncountersTracker++; + break; + case 8: + if (gBattleWeather & WEATHER_SUN_ANY) + { + if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) + { + gBattleWeather &= ~WEATHER_SUN_TEMPORARY; + gBattlescriptCurrInstr = BattleScript_SunlightFaded; + } + else + gBattlescriptCurrInstr = BattleScript_SunlightContinues; + + BattleScriptExecute(gBattlescriptCurrInstr); + effect++; + } + BATTLE_STRUCT->turncountersTracker++; + break; + case 9: + if (gBattleWeather & WEATHER_HAIL) + { + if (--gWishFutureKnock.weatherDuration == 0) + { + gBattleWeather &= ~WEATHER_HAIL; + gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; + } + else + gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; + + BATTLE_STRUCT->animArg1 = B_ANIM_HAIL_CONTINUES; + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + BattleScriptExecute(gBattlescriptCurrInstr); + effect++; + } + BATTLE_STRUCT->turncountersTracker++; + break; + case 10: + effect++; + break; + } + } while (effect == 0); + return (gBattleMainFunc != BattleTurnPassed); +} + +#define TURNBASED_MAX_CASE 19 + +u8 TurnBasedEffects(void) +{ + u8 effect = 0; + + gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); + while (BATTLE_STRUCT->turnEffectsBank < gNoOfAllBanks && BATTLE_STRUCT->turnEffectsTracker <= TURNBASED_MAX_CASE) + { + gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->turnEffectsBank]; + if (gAbsentBankFlags & gBitTable[gActiveBank]) + { + BATTLE_STRUCT->turnEffectsBank++; + } + else + { + switch (BATTLE_STRUCT->turnEffectsTracker) + { + case 0: // ingrain + if ((gStatuses3[gActiveBank] & STATUS3_ROOTED) + && gBattleMons[gActiveBank].hp != gBattleMons[gActiveBank].maxHP + && gBattleMons[gActiveBank].hp != 0) + { + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + gBattleMoveDamage *= -1; + BattleScriptExecute(BattleScript_IngrainTurnHeal); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 1: // end turn abilities + if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBank, 0, 0, 0)) + effect++; + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 2: // item effects + if (ItemBattleEffects(1, gActiveBank, 0)) + effect++; + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 18: // item effects again + if (ItemBattleEffects(1, gActiveBank, 1)) + effect++; + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 3: // leech seed + if (gStatuses3[gActiveBank] & STATUS3_LEECHSEED && gBattleMons[gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK].hp != 0 && gBattleMons[gActiveBank].hp != 0) + { + gBankTarget = gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK; //funny how the 'target' is actually the bank that receives HP + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + BATTLE_STRUCT->animArg1 = gBankTarget; + BATTLE_STRUCT->animArg2 = gBankAttacker; + BattleScriptExecute(BattleScript_LeechSeedTurnDrain); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 4: // poison + if ((gBattleMons[gActiveBank].status1 & STATUS_POISON) && gBattleMons[gActiveBank].hp != 0) + { + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + BattleScriptExecute(BattleScript_PoisonTurnDmg); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 5: // toxic poison + if ((gBattleMons[gActiveBank].status1 & STATUS_TOXIC_POISON) && gBattleMons[gActiveBank].hp != 0) + { + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + if ((gBattleMons[gActiveBank].status1 & 0xF00) != 0xF00) //not 16 turns + gBattleMons[gActiveBank].status1 += 0x100; + gBattleMoveDamage *= (gBattleMons[gActiveBank].status1 & 0xF00) >> 8; + BattleScriptExecute(BattleScript_PoisonTurnDmg); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 6: // burn + if ((gBattleMons[gActiveBank].status1 & STATUS_BURN) && gBattleMons[gActiveBank].hp != 0) + { + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + BattleScriptExecute(BattleScript_BurnTurnDmg); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 7: // spooky nightmares + if ((gBattleMons[gActiveBank].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBank].hp != 0) + { + // missing sleep check + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + BattleScriptExecute(BattleScript_NightmareTurnDmg); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 8: // curse + if ((gBattleMons[gActiveBank].status2 & STATUS2_CURSED) && gBattleMons[gActiveBank].hp != 0) + { + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 4; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + BattleScriptExecute(BattleScript_CurseTurnDmg); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 9: // wrap + if ((gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBank].hp != 0) + { + gBattleMons[gActiveBank].status2 -= 0x2000; + if (gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) // damaged by wrap + { + BATTLE_STRUCT->animArg1 = ewram16004arr(0, gActiveBank); + BATTLE_STRUCT->animArg2 = ewram16004arr(1, gActiveBank); + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 2; + gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank); + gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank); + gBattleTextBuff1[4] = EOS; + gBattlescriptCurrInstr = BattleScript_WrapTurnDmg; + gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 16; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + } + else // broke free + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 2; + gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank); + gBattleTextBuff1[3] = ewram16004arr(1, gActiveBank); + gBattleTextBuff1[4] = EOS; + gBattlescriptCurrInstr = BattleScript_WrapEnds; + } + BattleScriptExecute(gBattlescriptCurrInstr); + effect++; + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 10: // uproar + if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR) + { + for (gBankAttacker = 0; gBankAttacker < gNoOfAllBanks; gBankAttacker++) + { + if ((gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) + && gBattleMons[gBankAttacker].ability != ABILITY_SOUNDPROOF) + { + gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP); + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE); + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + BattleScriptExecute(BattleScript_MonWokeUpInUproar); + gActiveBank = gBankAttacker; + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); + MarkBufferBankForExecution(gActiveBank); + break; + } + } + if (gBankAttacker != gNoOfAllBanks) + { + effect = 2; // a pokemon was awaken + break; + } + else + { + gBankAttacker = gActiveBank; + gBattleMons[gActiveBank].status2 -= 0x10; // uproar timer goes down + if (WasUnableToUseMove(gActiveBank)) + { + CancelMultiTurnMoves(gActiveBank); + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + } + else if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR) + { + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleMons[gActiveBank].status2 |= STATUS2_MULTIPLETURNS; + } + else + { + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + CancelMultiTurnMoves(gActiveBank); + } + BattleScriptExecute(BattleScript_PrintUproarOverTurns); + effect = 1; + } + } + if (effect != 2) + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 11: // thrash + if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE) + { + gBattleMons[gActiveBank].status2 -= 0x400; + if (WasUnableToUseMove(gActiveBank)) + CancelMultiTurnMoves(gActiveBank); + else if (!(gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE) + && (gBattleMons[gActiveBank].status2 & STATUS2_MULTIPLETURNS)) + { + gBattleMons[gActiveBank].status2 &= ~(STATUS2_MULTIPLETURNS); + if (!(gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION)) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x47; + SetMoveEffect(1, 0); + if (gBattleMons[gActiveBank].status2 & STATUS2_CONFUSION) + BattleScriptExecute(BattleScript_ThrashConfuses); + effect++; + } + } + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 12: // disable + if (gDisableStructs[gActiveBank].disableTimer1 != 0) + { + int i; + for (i = 0; i < 4; i++) + { + if (gDisableStructs[gActiveBank].disabledMove == gBattleMons[gActiveBank].moves[i]) + break; + } + if (i == 4) // pokemon does not have the disabled move anymore + { + gDisableStructs[gActiveBank].disabledMove = 0; + gDisableStructs[gActiveBank].disableTimer1 = 0; + } + else if (--gDisableStructs[gActiveBank].disableTimer1 == 0) // disable ends + { + gDisableStructs[gActiveBank].disabledMove = 0; + BattleScriptExecute(BattleScript_DisabledNoMore); + effect++; + } + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 13: // encore + if (gDisableStructs[gActiveBank].encoreTimer1 != 0) + { + if (gBattleMons[gActiveBank].moves[gDisableStructs[gActiveBank].encoredMovePos] != gDisableStructs[gActiveBank].encoredMove) // pokemon does not have the encored move anymore + { + gDisableStructs[gActiveBank].encoredMove = 0; + gDisableStructs[gActiveBank].encoreTimer1 = 0; + } + else if (--gDisableStructs[gActiveBank].encoreTimer1 == 0 + || gBattleMons[gActiveBank].pp[gDisableStructs[gActiveBank].encoredMovePos] == 0) + { + gDisableStructs[gActiveBank].encoredMove = 0; + gDisableStructs[gActiveBank].encoreTimer1 = 0; + BattleScriptExecute(BattleScript_EncoredNoMore); + effect++; + } + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 14: // lock-on decrement + if (gStatuses3[gActiveBank] & STATUS3_ALWAYS_HITS) + gStatuses3[gActiveBank] -= 0x8; + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 15: // charge + if (gDisableStructs[gActiveBank].chargeTimer1 && --gDisableStructs[gActiveBank].chargeTimer1 == 0) + gStatuses3[gActiveBank] &= ~STATUS3_CHARGED_UP; + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 16: // taunt + if (gDisableStructs[gActiveBank].tauntTimer1) + gDisableStructs[gActiveBank].tauntTimer1--; + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 17: // yawn + if (gStatuses3[gActiveBank] & STATUS3_YAWN) + { + gStatuses3[gActiveBank] -= 0x800; + if (!(gStatuses3[gActiveBank] & STATUS3_YAWN) && !(gBattleMons[gActiveBank].status1 & STATUS_ANY) + && gBattleMons[gActiveBank].ability != ABILITY_VITAL_SPIRIT + && gBattleMons[gActiveBank].ability != ABILITY_INSOMNIA && !UproarWakeUpCheck(gActiveBank)) + { + CancelMultiTurnMoves(gActiveBank); + gBattleMons[gActiveBank].status1 |= (Random() & 3) + 2; + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); + MarkBufferBankForExecution(gActiveBank); + gEffectBank = gActiveBank; + BattleScriptExecute(BattleScript_YawnMakesAsleep); + effect++; + } + } + BATTLE_STRUCT->turnEffectsTracker++; + break; + case 19: // done + BATTLE_STRUCT->turnEffectsTracker = 0; + BATTLE_STRUCT->turnEffectsBank++; + break; + } + if (effect != 0) + return effect; + } + } + gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20); + return 0; +} + +bool8 HandleWishPerishSongOnTurnEnd(void) +{ + gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); + switch (BATTLE_STRUCT->sub80170DC_Tracker) + { + case 0: // future sight + while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks) + { + gActiveBank = BATTLE_STRUCT->sub80170DC_Bank; + if (gAbsentBankFlags & gBitTable[gActiveBank]) + BATTLE_STRUCT->sub80170DC_Bank++; + else + { + BATTLE_STRUCT->sub80170DC_Bank++; + if (gWishFutureKnock.futureSightCounter[gActiveBank] && --gWishFutureKnock.futureSightCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp) + { + if (gWishFutureKnock.futureSightMove[gActiveBank] == MOVE_FUTURE_SIGHT) + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + else //Doom Desire + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 2; + gBattleTextBuff1[2] = gWishFutureKnock.futureSightMove[gActiveBank]; + gBattleTextBuff1[3] = gWishFutureKnock.futureSightMove[gActiveBank] >> 8; + gBattleTextBuff1[4] = 0xFF; + gBankTarget = gActiveBank; + gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank]; + gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank]; + gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF; + BattleScriptExecute(BattleScript_MonTookFutureAttack); + return 1; + } + } + } + BATTLE_STRUCT->sub80170DC_Tracker = 1; + BATTLE_STRUCT->sub80170DC_Bank = 0; + case 1: // perish song + while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks) + { + gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->sub80170DC_Bank]; + if (gAbsentBankFlags & gBitTable[gActiveBank]) + BATTLE_STRUCT->sub80170DC_Bank++; + else + { + BATTLE_STRUCT->sub80170DC_Bank++; + if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 1; + gBattleTextBuff1[2] = 1; + gBattleTextBuff1[3] = 1; + gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSong1; + gBattleTextBuff1[5] = 0xFF; + if (gDisableStructs[gActiveBank].perishSong1 == 0) + { + gStatuses3[gActiveBank] &= ~(STATUS3_PERISH_SONG); + gBattleMoveDamage = gBattleMons[gActiveBank].hp; + gBattlescriptCurrInstr = BattleScript_PerishSongHits; + } + else + { + gDisableStructs[gActiveBank].perishSong1--; + gBattlescriptCurrInstr = BattleScript_PerishSongTimerGoesDown; + } + BattleScriptExecute(gBattlescriptCurrInstr); + return 1; + } + } + } + break; + } + gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20); + return 0; +} + +#define HandleFaintedMonActions_MAX_CASE 7 + +bool8 HandleFaintedMonActions(void) +{ + if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) + return 0; + do + { + int i; + switch (BATTLE_STRUCT->sub80173A4_Tracker) + { + case 0: + BATTLE_STRUCT->unk1605A = 0; + BATTLE_STRUCT->sub80173A4_Tracker++; + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gAbsentBankFlags & gBitTable[i] && !sub_8018018(i, 6, 6)) + gAbsentBankFlags &= ~(gBitTable[i]); + } + case 1: + do + { + gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; + if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(BATTLE_STRUCT->unk16113 & gBitTable[gBattlePartyID[BATTLE_STRUCT->unk1605A]]) && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) + { + BattleScriptExecute(BattleScript_GiveExp); + BATTLE_STRUCT->sub80173A4_Tracker = 2; + return 1; + } + } while (++BATTLE_STRUCT->unk1605A != gNoOfAllBanks); + BATTLE_STRUCT->sub80173A4_Tracker = 3; + break; + case 2: + sub_8015740(gBank1); + if (++BATTLE_STRUCT->unk1605A == gNoOfAllBanks) + BATTLE_STRUCT->sub80173A4_Tracker = 3; + else + BATTLE_STRUCT->sub80173A4_Tracker = 1; + break; + case 3: + BATTLE_STRUCT->unk1605A = 0; + BATTLE_STRUCT->sub80173A4_Tracker++; + case 4: + do + { + gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; //or should banks be switched? + if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) + { + BattleScriptExecute(BattleScript_HandleFaintedMon); + BATTLE_STRUCT->sub80173A4_Tracker = 5; + return 1; + } + } while (++BATTLE_STRUCT->unk1605A != gNoOfAllBanks); + BATTLE_STRUCT->sub80173A4_Tracker = 6; + break; + case 5: + if (++BATTLE_STRUCT->unk1605A == gNoOfAllBanks) + BATTLE_STRUCT->sub80173A4_Tracker = 6; + else + BATTLE_STRUCT->sub80173A4_Tracker = 4; + break; + case 6: + if (AbilityBattleEffects(9, 0, 0, 0, 0) || AbilityBattleEffects(0xB, 0, 0, 0, 0) || ItemBattleEffects(1, 0, 1) || AbilityBattleEffects(6, 0, 0, 0, 0)) + return 1; + BATTLE_STRUCT->sub80173A4_Tracker++; + break; + case 7: + break; + } + } while (BATTLE_STRUCT->sub80173A4_Tracker != HandleFaintedMonActions_MAX_CASE); + return 0; +} + +void TryClearRageStatuses(void) +{ + int i; + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].status2 & STATUS2_RAGE && gChosenMovesByBanks[i] != MOVE_RAGE) + gBattleMons[i].status2 &= ~(STATUS2_RAGE); + } +} + +#define ATKCANCELLER_MAX_CASE 14 + +u8 AtkCanceller_UnableToUseMove(void) +{ + u8 effect = 0; + s32* bideDmg = &BATTLE_STRUCT->bideDmg; + do + { + switch (BATTLE_STRUCT->atkCancellerTracker) + { + case 0: // flags clear + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_DESTINY_BOND); + gStatuses3[gBankAttacker] &= ~(STATUS3_GRUDGE); + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 1: // check being asleep + if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) + { + if (UproarWakeUpCheck(gBankAttacker)) + { + gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP); + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE); + BattleScriptPushCursor(); + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp; + effect = 2; + } + else + { + u8 toSub; + if (gBattleMons[gBankAttacker].ability == ABILITY_EARLY_BIRD) + toSub = 2; + else + toSub = 1; + if ((gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) < toSub) + gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP); + else + gBattleMons[gBankAttacker].status1 -= toSub; + if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) + { + if (gCurrentMove != MOVE_SNORE && gCurrentMove != MOVE_SLEEP_TALK) + { + gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + effect = 2; + } + } + else + { + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE); + BattleScriptPushCursor(); + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattlescriptCurrInstr = BattleScript_MoveUsedWokeUp; + effect = 2; + } + } + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 2: // check being frozen + if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE) + { + if (Random() % 5) + { + if (gBattleMoves[gCurrentMove].effect != EFFECT_THAW_HIT) // unfreezing via a move effect happens in case 13 + { + gBattlescriptCurrInstr = BattleScript_MoveUsedIsFrozen; + gHitMarker |= HITMARKER_NO_ATTACKSTRING; + } + else + { + BATTLE_STRUCT->atkCancellerTracker++; + break; + } + } + else // unfreeze + { + gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze; + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + } + effect = 2; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 3: // truant + if (gBattleMons[gBankAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBankAttacker].truantCounter) + { + CancelMultiTurnMoves(gBankAttacker); + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround; + gBattleMoveFlags |= MOVESTATUS_MISSED; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 4: // recharge + if (gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE) + { + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RECHARGE); + gDisableStructs[gBankAttacker].rechargeCounter = 0; + CancelMultiTurnMoves(gBankAttacker); + gBattlescriptCurrInstr = BattleScript_MoveUsedMustRecharge; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 5: // flinch + if (gBattleMons[gBankAttacker].status2 & STATUS2_FLINCHED) + { + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_FLINCHED); + gProtectStructs[gBankAttacker].flinchImmobility = 1; + CancelMultiTurnMoves(gBankAttacker); + gBattlescriptCurrInstr = BattleScript_MoveUsedFlinched; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 6: // disabled move + if (gDisableStructs[gBankAttacker].disabledMove == gCurrentMove && gDisableStructs[gBankAttacker].disabledMove != 0) + { + gProtectStructs[gBankAttacker].usedDisabledMove = 1; + BATTLE_STRUCT->scriptingActive = gBankAttacker; + CancelMultiTurnMoves(gBankAttacker); + gBattlescriptCurrInstr = BattleScript_MoveUsedIsDisabled; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 7: // taunt + if (gDisableStructs[gBankAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0) + { + gProtectStructs[gBankAttacker].usedTauntedMove = 1; + CancelMultiTurnMoves(gBankAttacker); + gBattlescriptCurrInstr = BattleScript_MoveUsedIsTaunted; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 8: // imprisoned + if (IsImprisoned(gBankAttacker, gCurrentMove)) + { + gProtectStructs[gBankAttacker].usedImprisionedMove = 1; + CancelMultiTurnMoves(gBankAttacker); + gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 9: // confusion + if (gBattleMons[gBankAttacker].status2 & STATUS2_CONFUSION) + { + gBattleMons[gBankAttacker].status2--; + if (gBattleMons[gBankAttacker].status2 & STATUS2_CONFUSION) + { + if (Random() & 1) + { + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + BattleScriptPushCursor(); + } + else // confusion dmg + { + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBankTarget = gBankAttacker; + gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker); + gProtectStructs[gBankAttacker].confusionSelfDmg = 1; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + } + gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfused; + } + else // snapped out of confusion + { + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_MoveUsedIsConfusedNoMore; + } + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 10: // paralysis + if (gBattleMons[gBankAttacker].status1 & STATUS_PARALYSIS && (Random() % 4) == 0) + { + gProtectStructs[gBankAttacker].prlzImmobility = 1; + CancelMultiTurnMoves(gBankAttacker); + gBattlescriptCurrInstr = BattleScript_MoveUsedIsParalyzed; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 11: // infatuation + if (gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) + { + BATTLE_STRUCT->scriptingActive = CountTrailingZeroBits((gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) >> 0x10); + if (Random() & 1) + BattleScriptPushCursor(); + else + { + BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack); + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + gProtectStructs[gBankAttacker].loveImmobility = 1; + CancelMultiTurnMoves(gBankAttacker); + } + gBattlescriptCurrInstr = BattleScript_MoveUsedIsInLove; + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 12: // bide + if (gBattleMons[gBankAttacker].status2 & STATUS2_BIDE) + { + gBattleMons[gBankAttacker].status2 -= 0x100; + if (gBattleMons[gBankAttacker].status2 & STATUS2_BIDE) + gBattlescriptCurrInstr = BattleScript_BideStoringEnergy; + else + { + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_MULTIPLETURNS); + if (gTakenDmg[gBankAttacker]) + { + gCurrentMove = MOVE_BIDE; + *bideDmg = gTakenDmg[gBankAttacker] * 2; + gBankTarget = gTakenDmgBanks[gBankAttacker]; + if (gAbsentBankFlags & gBitTable[gBankTarget]) + gBankTarget = GetMoveTarget(MOVE_BIDE, 1); + gBattlescriptCurrInstr = BattleScript_BideAttack; + } + else + gBattlescriptCurrInstr = BattleScript_BideNoEnergyToAttack; + } + effect = 1; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 13: // move thawing + if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE) + { + if (gBattleMoves[gCurrentMove].effect == EFFECT_THAW_HIT) + { + gBattleMons[gBankAttacker].status1 &= ~(STATUS_FREEZE); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze; + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + } + effect = 2; + } + BATTLE_STRUCT->atkCancellerTracker++; + break; + case 14: // last case + break; + } + + } while (BATTLE_STRUCT->atkCancellerTracker != ATKCANCELLER_MAX_CASE && effect == 0); + + if (effect == 2) + { + gActiveBank = gBankAttacker; + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); + MarkBufferBankForExecution(gActiveBank); + } + return effect; +} + +bool8 sub_8018018(u8 bank, u8 r1, u8 r2) +{ + struct Pokemon* party; + u8 r7; + u8 r6; + s32 i; + if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) + return 0; + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + { + r7 = sub_803FC34(bank); + if (GetBankSide(bank) == 0) + party = gPlayerParty; + else + party = gEnemyParty; + r6 = sub_803FBFC(r7); + for (i = r6 * 3; i < r6 * 3 + 3; i++) + { + if (GetMonData(&party[i], MON_DATA_HP) && GetMonData(&party[i], MON_DATA_SPECIES2) && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG) + break; + } + return (i == r6 * 3 + 3); + } + else + { + if (GetBankSide(bank) == 1) + { + r7 = GetBankByIdentity(1); + r6 = GetBankByIdentity(3); + party = gEnemyParty; + } + else + { + r7 = GetBankByIdentity(0); + r6 = GetBankByIdentity(2); + party = gPlayerParty; + } + if (r1 == 6) + r1 = gBattlePartyID[r7]; + if (r2 == 6) + r2 = gBattlePartyID[r6]; + for (i = 0; i < 6; i++) + { + if (GetMonData(&party[i], MON_DATA_HP) && GetMonData(&party[i], MON_DATA_SPECIES2) && GetMonData(&party[i], MON_DATA_SPECIES2) != SPECIES_EGG && i != r1 && i != r2 && i != ewram16068arr(r7) && i != ewram16068arr(r6)) + break; + } + return (i == 6); + } +} + +enum +{ + CASTFORM_NO_CHANGE, //0 + CASTFORM_TO_NORMAL, //1 + CASTFORM_TO_FIRE, //2 + CASTFORM_TO_WATER, //3 + CASTFORM_TO_ICE, //4 +}; + +u8 CastformDataTypeChange(u8 bank) +{ + u8 formChange = 0; + if (gBattleMons[bank].species != SPECIES_CASTFORM || gBattleMons[bank].ability != ABILITY_FORECAST || gBattleMons[bank].hp == 0) + return CASTFORM_NO_CHANGE; + if (!WEATHER_HAS_EFFECT && gBattleMons[bank].type1 != TYPE_NORMAL && gBattleMons[bank].type2 != TYPE_NORMAL) + { + gBattleMons[bank].type1 = TYPE_NORMAL; + gBattleMons[bank].type2 = TYPE_NORMAL; + return CASTFORM_TO_NORMAL; + } + if (!WEATHER_HAS_EFFECT) + return CASTFORM_NO_CHANGE; + if (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL)) && gBattleMons[bank].type1 != TYPE_NORMAL && gBattleMons[bank].type2 != TYPE_NORMAL) + { + gBattleMons[bank].type1 = TYPE_NORMAL; + gBattleMons[bank].type2 = TYPE_NORMAL; + formChange = CASTFORM_TO_NORMAL; + } + if (gBattleWeather & WEATHER_SUN_ANY && gBattleMons[bank].type1 != TYPE_FIRE && gBattleMons[bank].type2 != TYPE_FIRE) + { + gBattleMons[bank].type1 = TYPE_FIRE; + gBattleMons[bank].type2 = TYPE_FIRE; + formChange = CASTFORM_TO_FIRE; + } + if (gBattleWeather & WEATHER_RAIN_ANY && gBattleMons[bank].type1 != TYPE_WATER && gBattleMons[bank].type2 != TYPE_WATER) + { + gBattleMons[bank].type1 = TYPE_WATER; + gBattleMons[bank].type2 = TYPE_WATER; + formChange = CASTFORM_TO_WATER; + } + if (gBattleWeather & WEATHER_HAIL && gBattleMons[bank].type1 != TYPE_ICE && gBattleMons[bank].type2 != TYPE_ICE) + { + gBattleMons[bank].type1 = TYPE_ICE; + gBattleMons[bank].type2 = TYPE_ICE; + formChange = CASTFORM_TO_ICE; + } + return formChange; +} + +u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) +{ + u8 effect = 0; + struct Pokemon* pokeAtk; + struct Pokemon* pokeDef; + u16 speciesAtk; + u16 speciesDef; + u32 pidAtk; + u32 pidDef; + + if (gBankAttacker >= gNoOfAllBanks) + gBankAttacker = bank; + if (GetBankSide(gBankAttacker) == 0) + pokeAtk = &gPlayerParty[gBattlePartyID[gBankAttacker]]; + else + pokeAtk = &gEnemyParty[gBattlePartyID[gBankAttacker]]; + + if (gBankTarget >= gNoOfAllBanks) + gBankTarget = bank; + if (GetBankSide(gBankTarget) == 0) + pokeDef = &gPlayerParty[gBattlePartyID[gBankTarget]]; + else + pokeDef = &gEnemyParty[gBattlePartyID[gBankTarget]]; + + speciesAtk = GetMonData(pokeAtk, MON_DATA_SPECIES); + pidAtk = GetMonData(pokeAtk, MON_DATA_PERSONALITY); + + speciesDef = GetMonData(pokeDef, MON_DATA_SPECIES); + pidDef = GetMonData(pokeDef, MON_DATA_PERSONALITY); + + if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) // why isn't that check done at the beginning? + { + u8 moveType; + s32 i; + u16 move; + u8 side; + u8 target1; + + if (special) + gLastUsedAbility = special; + else + gLastUsedAbility = gBattleMons[bank].ability; + + if (moveArg) + move = moveArg; + else + move = gCurrentMove; + + if (BATTLE_STRUCT->dynamicMoveType) + moveType = BATTLE_STRUCT->dynamicMoveType & 0x3F; + else + moveType = gBattleMoves[move].type; + + //_080184AC + switch (caseID) + { + case ABILITYEFFECT_ON_SWITCHIN: // 0 + //_08018518 + if (gBankAttacker >= gNoOfAllBanks) + gBankAttacker = bank; + switch (gLastUsedAbility) + { + case 0xFF: //weather from overworld + //_08018586 + switch (weather_get_current()) + { + case WEATHER_RAIN_LIGHT: + case WEATHER_RAIN_MED: + case WEATHER_RAIN_HEAVY: + if (!(gBattleWeather & WEATHER_RAIN_ANY)) + { + gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); + BATTLE_STRUCT->animArg1 = B_ANIM_RAIN_CONTINUES; + BATTLE_STRUCT->scriptingActive = bank; + effect++; + } + break; + case WEATHER_SANDSTORM: + if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) + { + gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); + BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; + BATTLE_STRUCT->scriptingActive = bank; + effect++; + } + break; + case WEATHER_DROUGHT: + if (!(gBattleWeather & WEATHER_SUN_ANY)) + { + gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); + BATTLE_STRUCT->animArg1 = B_ANIM_SUN_CONTINUES; + BATTLE_STRUCT->scriptingActive = bank; + effect++; + } + break; + } + if (effect) + { + gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current(); + BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts); + } + break; + case ABILITY_DRIZZLE: + //_08018680 + if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) + { + gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY); + BattleScriptPushCursorAndCallback(BattleScript_DrizzleActivates); + BATTLE_STRUCT->scriptingActive = bank; + effect++; + } + break; + case ABILITY_SAND_STREAM: + //_080186B8 + if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT)) + { + gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); + BattleScriptPushCursorAndCallback(BattleScript_SandstreamActivates); + BATTLE_STRUCT->scriptingActive = bank; + effect++; + } + break; + case ABILITY_DROUGHT: + //_080186F0 + if (!(gBattleWeather & WEATHER_SUN_PERMANENT)) + { + gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); + BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates); + BATTLE_STRUCT->scriptingActive = bank; + effect++; + } + break; + case ABILITY_INTIMIDATE: + //_08018728 + if (!(gSpecialStatuses[bank].intimidatedPoke)) + { + gStatuses3[bank] |= STATUS3_INTIMIDATE_POKES; + gSpecialStatuses[bank].intimidatedPoke = 1; + } + break; + case ABILITY_FORECAST: + //_0801875C + effect = CastformDataTypeChange(bank); + if (effect != 0) + { + BattleScriptPushCursorAndCallback(BattleScript_CastformChange); + BATTLE_STRUCT->scriptingActive = bank; + BATTLE_STRUCT->castformToChangeInto = effect - 1; + } + break; + case ABILITY_TRACE: + //_080187A0 + if (!(gSpecialStatuses[bank].traced)) + { + gStatuses3[bank] |= STATUS3_TRACE; + gSpecialStatuses[bank].traced = 1; + } + break; + case ABILITY_CLOUD_NINE: + case ABILITY_AIR_LOCK: + //_080187DC + { + // that's a weird choice for a variable, why not use i or bank? + for (target1 = 0; target1 < gNoOfAllBanks; target1++) + { + effect = CastformDataTypeChange(target1); + if (effect != 0) + { + BattleScriptPushCursorAndCallback(BattleScript_CastformChange); + BATTLE_STRUCT->scriptingActive = target1; + BATTLE_STRUCT->castformToChangeInto = effect - 1; + break; + } + } + } + break; + } + break; + case ABILITYEFFECT_ENDTURN: // 1 + //_08018814 + if (gBattleMons[bank].hp != 0) + { + gBankAttacker = bank; + switch (gLastUsedAbility) + { + case ABILITY_RAIN_DISH: + if (WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY) + && gBattleMons[bank].maxHP > gBattleMons[bank].hp) + { + gLastUsedAbility = ABILITY_RAIN_DISH; // why + BattleScriptPushCursorAndCallback(BattleScript_RainDishActivates); + gBattleMoveDamage = gBattleMons[bank].maxHP / 16; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + gBattleMoveDamage *= -1; + effect++; + } + break; + case ABILITY_SHED_SKIN: + if ((gBattleMons[bank].status1 & STATUS_ANY) && (Random() % 3) == 0) + { + if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON)) + StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); + if (gBattleMons[bank].status1 & STATUS_SLEEP) + StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); + if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); + if (gBattleMons[bank].status1 & STATUS_BURN) + StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); + if (gBattleMons[bank].status1 & STATUS_FREEZE) + StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); + gBattleMons[bank].status1 = 0; + // BUG: The nightmare status does not get cleared here. This was fixed in Emerald. + //gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); + BATTLE_STRUCT->scriptingActive = gActiveBank = bank; + BattleScriptPushCursorAndCallback(BattleScript_ShedSkinActivates); + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1); + MarkBufferBankForExecution(gActiveBank); + effect++; + } + break; + case ABILITY_SPEED_BOOST: + if (gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC && gDisableStructs[bank].isFirstTurn != 2) + { + gBattleMons[bank].statStages[STAT_STAGE_SPEED]++; + BATTLE_STRUCT->animArg1 = 0x11; + BATTLE_STRUCT->animArg2 = 0; + BattleScriptPushCursorAndCallback(BattleScript_SpeedBoostActivates); + BATTLE_STRUCT->scriptingActive = bank; + effect++; + } + break; + case ABILITY_TRUANT: + gDisableStructs[gBankAttacker].truantCounter ^= 1; + break; + } + } + break; + case ABILITYEFFECT_MOVES_BLOCK: // 2 + //_08018A40 + if (gLastUsedAbility == ABILITY_SOUNDPROOF) + { + for (i = 0; gSoundMovesTable[i] != 0xFFFF; i++) + { + if (gSoundMovesTable[i] == move) + break; + } + if (gSoundMovesTable[i] != 0xFFFF) + { + if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS) + gHitMarker |= HITMARKER_NO_PPDEDUCT; + gBattlescriptCurrInstr = BattleScript_SoundproofProtected; + effect = 1; + } + } + break; + case ABILITYEFFECT_ABSORBING: // 3 + //_08018AD8 + if (move) + { + switch (gLastUsedAbility) + { + case ABILITY_VOLT_ABSORB: + if (moveType == TYPE_ELECTRIC && gBattleMoves[move].power != 0) + { + if (gProtectStructs[gBankAttacker].notFirstStrike) + gBattlescriptCurrInstr = BattleScript_MoveHPDrain; + else + gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss; + effect = 1; + } + break; + case ABILITY_WATER_ABSORB: + if (moveType == TYPE_WATER && gBattleMoves[move].power != 0) + { + if (gProtectStructs[gBankAttacker].notFirstStrike) + gBattlescriptCurrInstr = BattleScript_MoveHPDrain; + else + gBattlescriptCurrInstr = BattleScript_MoveHPDrain_PPLoss; + effect = 1; + } + break; + case ABILITY_FLASH_FIRE: + if (moveType == TYPE_FIRE && !(gBattleMons[bank].status1 & STATUS_FREEZE)) + { + if (!(eFlashFireArr.arr[bank] & 1)) + { + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + if (gProtectStructs[gBankAttacker].notFirstStrike) + gBattlescriptCurrInstr = BattleScript_FlashFireBoost; + else + gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss; + eFlashFireArr.arr[bank] |= 1; + effect = 2; + } + else + { + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + if (gProtectStructs[gBankAttacker].notFirstStrike) + gBattlescriptCurrInstr = BattleScript_FlashFireBoost; + else + gBattlescriptCurrInstr = BattleScript_FlashFireBoost_PPLoss; + effect = 2; + } + } + break; + } + if (effect == 1) + { + if (gBattleMons[bank].maxHP == gBattleMons[bank].hp) + { + if ((gProtectStructs[gBankAttacker].notFirstStrike)) + gBattlescriptCurrInstr = BattleScript_MoveHPDrain_FullHP; + else + gBattlescriptCurrInstr = BattleScript_MoveHPDrain_FullHP_PPLoss; + } + else + { + gBattleMoveDamage = gBattleMons[bank].maxHP / 4; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + gBattleMoveDamage *= -1; + } + } + } + break; + case ABILITYEFFECT_CONTACT: // 4 + //_08018CF0 + switch (gLastUsedAbility) + { + case ABILITY_COLOR_CHANGE: + //_08018DCC + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && move != MOVE_STRUGGLE + && gBattleMoves[move].power != 0 + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && gBattleMons[bank].type1 != moveType + && gBattleMons[bank].type2 != moveType + && gBattleMons[bank].hp != 0) + { + gBattleMons[bank].type1 = moveType; + gBattleMons[bank].type2 = moveType; + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 3; + gBattleTextBuff1[2] = moveType; + gBattleTextBuff1[3] = 0xFF; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ColorChangeActivates; + effect++; + } + break; + case ABILITY_ROUGH_SKIN: + //_08018E94 + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)) + { + gBattleMoveDamage = gBattleMons[gBankAttacker].maxHP / 16; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_RoughSkinActivates; + effect++; + } + break; + case ABILITY_EFFECT_SPORE: + //_08018F54 + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (Random() % 10) == 0) + { + do + { + gBattleCommunication[MOVE_EFFECT_BYTE] = Random() & 3; + } while (gBattleCommunication[MOVE_EFFECT_BYTE] == 0); + if (gBattleCommunication[MOVE_EFFECT_BYTE] == 3) + gBattleCommunication[MOVE_EFFECT_BYTE] += 2; + gBattleCommunication[MOVE_EFFECT_BYTE] += 0x40; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + break; + case ABILITY_POISON_POINT: + //_0801904C + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (Random() % 3) == 0) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x42; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + break; + case ABILITY_STATIC: + //_08019128 + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (Random() % 3) == 0) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x45; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + break; + case ABILITY_FLAME_BODY: + //_08019204 + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (Random() % 3) == 0) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x43; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + break; + case ABILITY_CUTE_CHARM: + //_080192E0 + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && gBattleMons[gBankTarget].hp != 0 + && (Random() % 3) == 0 + && gBattleMons[gBankAttacker].ability != ABILITY_OBLIVIOUS + && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) + && !(gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) + && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != 0xFF + && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != 0xFF) + { + gBattleMons[gBankAttacker].status2 |= (gBitTable[gBankTarget] << 0x10); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_CuteCharmActivates; + effect++; + } + break; + } + break; + case ABILITYEFFECT_IMMUNITY: // 5 + //_08019448 + { + for (bank = 0; bank < gNoOfAllBanks; bank++) + { + switch (gBattleMons[bank].ability) + { + case ABILITY_IMMUNITY: + if (gBattleMons[bank].status1 & (STATUS_POISON | STATUS_TOXIC_POISON | 0xF00)) // TODO: what is 0xF00? + { + StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); + effect = 1; + } + break; + case ABILITY_OWN_TEMPO: + if (gBattleMons[bank].status2 & STATUS2_CONFUSION) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); + effect = 2; + } + break; + case ABILITY_LIMBER: + if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); + effect = 1; + } + break; + case ABILITY_INSOMNIA: + case ABILITY_VITAL_SPIRIT: + if (gBattleMons[bank].status1 & STATUS_SLEEP) + { + gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); + StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); + effect = 1; + } + break; + case ABILITY_WATER_VEIL: + if (gBattleMons[bank].status1 & STATUS_BURN) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); + effect = 1; + } + break; + case ABILITY_MAGMA_ARMOR: + if (gBattleMons[bank].status1 & STATUS_FREEZE) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); + effect = 1; + } + break; + case ABILITY_OBLIVIOUS: + if (gBattleMons[bank].status2 & STATUS2_INFATUATION) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); + effect = 3; + } + break; + } + if (effect) + { + switch (effect) + { + case 1: // status cleared + gBattleMons[bank].status1 = 0; + break; + case 2: // get rid of confusion + gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); + break; + case 3: // get rid of infatuation + gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION); + break; + } + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus; + BATTLE_STRUCT->scriptingActive = bank; + gActiveBank = bank; + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); + MarkBufferBankForExecution(gActiveBank); + return effect; + } + } + } + break; + case ABILITYEFFECT_FORECAST: // 6 + //_080197B4 + { + for (bank = 0; bank < gNoOfAllBanks; bank++) + { + if (gBattleMons[bank].ability == ABILITY_FORECAST) + { + effect = CastformDataTypeChange(bank); + if (effect) + { + BattleScriptPushCursorAndCallback(BattleScript_CastformChange); + BATTLE_STRUCT->scriptingActive = bank; + BATTLE_STRUCT->castformToChangeInto = effect - 1; + return effect; + } + } + } + } + break; + case ABILITYEFFECT_SYNCHRONIZE: // 7 + //_08019804 + if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) + { + gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); + BATTLE_STRUCT->synchroniseEffect &= 0x3F; + if (BATTLE_STRUCT->synchroniseEffect == 6) + BATTLE_STRUCT->synchroniseEffect = 2; + gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect + 0x40; + BATTLE_STRUCT->scriptingActive = gBankTarget; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_SynchronizeActivates; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + break; + case ABILITYEFFECT_ATK_SYNCHRONIZE: // 8 + //_08019880 + if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) + { + gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); + BATTLE_STRUCT->synchroniseEffect &= 0x3F; + if (BATTLE_STRUCT->synchroniseEffect == 6) + BATTLE_STRUCT->synchroniseEffect = 2; + gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect; + BATTLE_STRUCT->scriptingActive = gBankAttacker; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_SynchronizeActivates; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + break; + case ABILITYEFFECT_INTIMIDATE1: // 9 + //_080198FC + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ABILITY_INTIMIDATE && gStatuses3[i] & STATUS3_INTIMIDATE_POKES) + { + gLastUsedAbility = ABILITY_INTIMIDATE; + gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); + BattleScriptPushCursorAndCallback(gUnknown_081D978C); + BATTLE_STRUCT->intimidateBank = i; + effect++; + break; + } + } + break; + case ABILITYEFFECT_TRACE: // 11 + //_08019940 + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE)) + { + u8 target2; + side = (GetBankIdentity(i) ^ 1) & 1; + target1 = GetBankByIdentity(side); + target2 = GetBankByIdentity(side + 2); + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + { + if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0 + && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0) + { + //_080199AE + gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | side); + gBattleMons[i].ability = gBattleMons[gActiveBank].ability; + gLastUsedAbility = gBattleMons[gActiveBank].ability; + effect++; + } + else if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0) + { + //_08019A34 + gActiveBank = target1; + gBattleMons[i].ability = gBattleMons[gActiveBank].ability; + gLastUsedAbility = gBattleMons[gActiveBank].ability; + effect++; + } + else if (gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0) + { + //_08019A78 + gActiveBank = target2; + gBattleMons[i].ability = gBattleMons[gActiveBank].ability; + gLastUsedAbility = gBattleMons[gActiveBank].ability; + effect++; + } + } + else + //_08019ABC + { + gActiveBank = target1; + if (gBattleMons[target1].ability && gBattleMons[target1].hp) + { + gBattleMons[i].ability = gBattleMons[target1].ability; + gLastUsedAbility = gBattleMons[target1].ability; + effect++; + } + } + if (effect) + { + BattleScriptPushCursorAndCallback(BattleScript_TraceActivates); + gStatuses3[i] &= ~(STATUS3_TRACE); + BATTLE_STRUCT->scriptingActive = i; + + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 4; + gBattleTextBuff1[2] = gActiveBank; + gBattleTextBuff1[3] = gBattlePartyID[gActiveBank]; + gBattleTextBuff1[4] = EOS; + + gBattleTextBuff2[0] = 0xFD; + gBattleTextBuff2[1] = 9; + gBattleTextBuff2[2] = gLastUsedAbility; + gBattleTextBuff2[3] = EOS; + break; + } + } + } + break; + case ABILITYEFFECT_INTIMIDATE2: // 10 + //_08019B1C + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ABILITY_INTIMIDATE && (gStatuses3[i] & STATUS3_INTIMIDATE_POKES)) + { + gLastUsedAbility = ABILITY_INTIMIDATE; + gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = gUnknown_081D9795; + BATTLE_STRUCT->intimidateBank = i; + effect++; + break; + } + } + break; + case ABILITYEFFECT_CHECK_OTHER_SIDE: // 12 + //_08019B60 + side = GetBankSide(bank); + for (i = 0; i < gNoOfAllBanks; i++) + { + if (GetBankSide(i) != side && gBattleMons[i].ability == ability) + { + gLastUsedAbility = ability; + effect = i + 1; + } + } + break; + case ABILITYEFFECT_CHECK_BANK_SIDE: // 13 + //_08019BBC + side = GetBankSide(bank); + for (i = 0; i < gNoOfAllBanks; i++) + { + if (GetBankSide(i) == side && gBattleMons[i].ability == ability) + { + gLastUsedAbility = ability; + effect = i + 1; + } + } + break; + case ABILITYEFFECT_FIELD_SPORT: // 14 + //_08019C18 + switch (gLastUsedAbility) + { + case 0xFD: + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gStatuses3[i] & STATUS3_MUDSPORT) + effect = i + 1; + } + break; + case 0xFE: + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gStatuses3[i] & STATUS3_WATERSPORT) + effect = i + 1; + } + break; + default: + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ability) + { + gLastUsedAbility = ability; + effect = i + 1; + } + } + break; + } + break; + case ABILITYEFFECT_CHECK_ON_FIELD: // 19 + //_08019CD4 + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ability && gBattleMons[i].hp != 0) + { + gLastUsedAbility = ability; + effect = i + 1; + } + } + break; + case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15 + //_08019D18 + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ability && i != bank) + { + gLastUsedAbility = ability; + effect = i + 1; + } + } + break; + case ABILITYEFFECT_COUNT_OTHER_SIZE: // 16 + //_08019D5C + side = GetBankSide(bank); + for (i = 0; i < gNoOfAllBanks; i++) + { + if (GetBankSide(i) != side && gBattleMons[i].ability == ability) + { + gLastUsedAbility = ability; + effect++; + } + } + break; + case ABILITYEFFECT_COUNT_BANK_SIDE: // 17 + //_08019DB8 + side = GetBankSide(bank); + for (i = 0; i < gNoOfAllBanks; i++) + { + if (GetBankSide(i) == side && gBattleMons[i].ability == ability) + { + gLastUsedAbility = ability; + effect++; + } + } + break; + case ABILITYEFFECT_COUNT_ON_FIELD: // 18 + //_08019F44 + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].ability == ability && i != bank) + { + gLastUsedAbility = ability; + effect++; + } + } + break; + } + //_08019F76 + if (effect && caseID < 0xC && gLastUsedAbility != 0xFF) + RecordAbilityBattle(bank, gLastUsedAbility); + } + + return effect; +} + +void BattleScriptExecute(u8* BS_ptr) +{ + gBattlescriptCurrInstr = BS_ptr; + B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; + gBattleMainFunc = RunBattleScriptCommands_PopCallbacksStack; + gCurrentActionFuncId = 0; +} + +void BattleScriptPushCursorAndCallback(u8* BS_ptr) +{ + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BS_ptr; + B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; + gBattleMainFunc = RunBattleScriptCommands; +} + +enum +{ + ITEM_NO_EFFECT, // 0 + ITEM_STATUS_CHANGE, // 1 + ITEM_EFFECT_OTHER, // 2 + ITEM_PP_CHANGE, // 3 + ITEM_HP_CHANGE, // 4 + ITEM_STATS_CHANGE, // 5 +}; + +enum +{ + FLAVOR_SPICY, // 0 + FLAVOR_DRY, // 1 + FLAVOR_SWEET, // 2 + FLAVOR_BITTER, // 3 + FLAVOR_SOUR, // 4 +}; + +u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) +{ + int i = 0; + u8 effect = ITEM_NO_EFFECT; + u8 changedPP = 0; + u8 bankHoldEffect, atkHoldEffect, defHoldEffect; + u8 bankQuality, atkQuality, defQuality; + u16 atkItem, defItem; + + gLastUsedItem = gBattleMons[bank].item; + if (gLastUsedItem == ITEM_ENIGMA_BERRY) + { + bankHoldEffect = gEnigmaBerries[bank].holdEffect; + bankQuality = gEnigmaBerries[bank].holdEffectParam; + } + else + { + bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + } + + atkItem = gBattleMons[gBankAttacker].item; + if (atkItem == ITEM_ENIGMA_BERRY) + { + atkHoldEffect = gEnigmaBerries[gBankAttacker].holdEffect; + atkQuality = gEnigmaBerries[gBankAttacker].holdEffectParam; + } + else + { + atkHoldEffect = ItemId_GetHoldEffect(atkItem); + atkQuality = ItemId_GetHoldEffectParam(atkItem); + } + + // def variables are unused + defItem = gBattleMons[gBankTarget].item; + if (defItem == ITEM_ENIGMA_BERRY) + { + defHoldEffect = gEnigmaBerries[gBankTarget].holdEffect; + defQuality = gEnigmaBerries[gBankTarget].holdEffectParam; + } + else + { + defHoldEffect = ItemId_GetHoldEffect(defItem); + defQuality = ItemId_GetHoldEffectParam(defItem); + } + + switch (caseID) + { + case 0: + switch (bankHoldEffect) + { + case HOLD_EFFECT_DOUBLE_PRIZE: + BATTLE_STRUCT->moneyMultiplier = 2; + break; + case HOLD_EFFECT_RESTORE_STATS: + for (i = 0; i < 8; i++) + { + if (gBattleMons[bank].statStages[i] < 6) + { + gBattleMons[bank].statStages[i] = 6; + effect = ITEM_STATS_CHANGE; + } + } + if (effect) + { + BATTLE_STRUCT->scriptingActive = bank; + gStringBank = bank; + gActiveBank = gBankAttacker = bank; + BattleScriptExecute(BattleScript_WhiteHerbEnd2); + } + break; + } + break; + case 1: + if (gBattleMons[bank].hp) + { + switch (bankHoldEffect) + { + case HOLD_EFFECT_RESTORE_HP: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) + { + gBattleMoveDamage = bankQuality; + if (gBattleMons[bank].hp + bankQuality > gBattleMons[bank].maxHP) + gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; + gBattleMoveDamage *= -1; + BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); + effect = 4; + } + break; + case HOLD_EFFECT_RESTORE_PP: + if (!moveTurn) + { + struct Pokemon* poke; + u8 ppBonuses; + u16 move; + + if (GetBankSide(bank) == 0) + poke = &gPlayerParty[gBattlePartyID[bank]]; + else + poke = &gEnemyParty[gBattlePartyID[bank]]; + for (i = 0; i < 4; i++) + { + move = GetMonData(poke, MON_DATA_MOVE1 + i); + changedPP = GetMonData(poke, MON_DATA_PP1 + i); + ppBonuses = GetMonData(poke, MON_DATA_PP_BONUSES); + if (move && changedPP == 0) + break; + } + if (i != 4) + { + u8 maxPP = CalculatePPWithBonus(move, ppBonuses, i); + if (changedPP + bankQuality > maxPP) + changedPP = maxPP; + else + changedPP = changedPP + bankQuality; + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 2; + gBattleTextBuff1[2] = move; + gBattleTextBuff1[3] = move >> 8; + gBattleTextBuff1[4] = 0xFF; + BattleScriptExecute(BattleScript_BerryPPHealEnd2); + EmitSetMonData(0, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP); + MarkBufferBankForExecution(gActiveBank); + effect = ITEM_PP_CHANGE; + } + } + break; + case HOLD_EFFECT_RESTORE_STATS: + for (i = 0; i < 8; i++) + { + if (gBattleMons[bank].statStages[i] < 6) + { + gBattleMons[bank].statStages[i] = 6; + effect = ITEM_STATS_CHANGE; + } + } + if (effect) + { + BATTLE_STRUCT->scriptingActive = bank; + gStringBank = bank; + gActiveBank = gBankAttacker = bank; + BattleScriptExecute(BattleScript_WhiteHerbEnd2); + } + break; + case HOLD_EFFECT_LEFTOVERS: + if (gBattleMons[bank].hp < gBattleMons[bank].maxHP && !moveTurn) + { + gBattleMoveDamage = gBattleMons[bank].maxHP / 16; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) + gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; + gBattleMoveDamage *= -1; + BattleScriptExecute(BattleScript_ItemHealHP_End2); + effect = ITEM_HP_CHANGE; + RecordItemBattle(bank, bankHoldEffect); + } + break; + // nice copy/paste there gamefreak, making a function for confuse berries was too much eh? + case HOLD_EFFECT_CONFUSE_SPICY: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 8; + gBattleTextBuff1[2] = FLAVOR_SPICY; + gBattleTextBuff1[3] = EOS; + gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) + gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; + gBattleMoveDamage *= -1; + if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SPICY) < 0) + BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); + else + BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); + effect = ITEM_HP_CHANGE; + } + break; + case HOLD_EFFECT_CONFUSE_DRY: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 8; + gBattleTextBuff1[2] = FLAVOR_DRY; + gBattleTextBuff1[3] = EOS; + gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) + gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; + gBattleMoveDamage *= -1; + if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_DRY) < 0) + BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); + else + BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); + effect = ITEM_HP_CHANGE; + } + break; + case HOLD_EFFECT_CONFUSE_SWEET: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 8; + gBattleTextBuff1[2] = FLAVOR_SWEET; + gBattleTextBuff1[3] = EOS; + gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) + gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; + gBattleMoveDamage *= -1; + if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SWEET) < 0) + BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); + else + BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); + effect = ITEM_HP_CHANGE; + } + break; + case HOLD_EFFECT_CONFUSE_BITTER: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 8; + gBattleTextBuff1[2] = FLAVOR_BITTER; + gBattleTextBuff1[3] = EOS; + gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) + gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; + gBattleMoveDamage *= -1; + if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_BITTER) < 0) + BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); + else + BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); + effect = ITEM_HP_CHANGE; + } + break; + case HOLD_EFFECT_CONFUSE_SOUR: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / 2 && !moveTurn) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 8; + gBattleTextBuff1[2] = FLAVOR_SOUR; + gBattleTextBuff1[3] = EOS; + gBattleMoveDamage = gBattleMons[bank].maxHP / bankQuality; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = 1; + if (gBattleMons[bank].hp + gBattleMoveDamage > gBattleMons[bank].maxHP) + gBattleMoveDamage = gBattleMons[bank].maxHP - gBattleMons[bank].hp; + gBattleMoveDamage *= -1; + if (GetPokeFlavourRelation(gBattleMons[bank].personality, FLAVOR_SOUR) < 0) + BattleScriptExecute(BattleScript_BerryConfuseHealEnd2); + else + BattleScriptExecute(BattleScript_ItemHealHP_RemoveItem); + effect = ITEM_HP_CHANGE; + } + break; + // copy/paste again, smh + case HOLD_EFFECT_ATTACK_UP: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_ATK] < 0xC) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 5; + gBattleTextBuff1[2] = STAT_STAGE_ATK; + gBattleTextBuff1[3] = EOS; + + gBattleTextBuff2[0] = 0xFD; + gBattleTextBuff2[1] = 0; + gBattleTextBuff2[2] = 0xD2; + gBattleTextBuff2[3] = 0xD2 >> 8; + gBattleTextBuff2[4] = EOS; + + gEffectBank = bank; + BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_ATK; + BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_ATK; + BATTLE_STRUCT->animArg2 = 0; + BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); + effect = ITEM_STATS_CHANGE; + } + break; + case HOLD_EFFECT_DEFENSE_UP: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_DEF] < 0xC) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 5; + gBattleTextBuff1[2] = STAT_STAGE_DEF; + gBattleTextBuff1[3] = EOS; + + gEffectBank = bank; + BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_DEF; + BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_DEF; + BATTLE_STRUCT->animArg2 = 0; + BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); + effect = ITEM_STATS_CHANGE; + } + break; + case HOLD_EFFECT_SPEED_UP: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 5; + gBattleTextBuff1[2] = STAT_STAGE_SPEED; + gBattleTextBuff1[3] = EOS; + + gEffectBank = bank; + BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPEED; + BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPEED; + BATTLE_STRUCT->animArg2 = 0; + BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); + effect = ITEM_STATS_CHANGE; + } + break; + case HOLD_EFFECT_SP_ATTACK_UP: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPATK] < 0xC) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 5; + gBattleTextBuff1[2] = STAT_STAGE_SPATK; + gBattleTextBuff1[3] = EOS; + + gEffectBank = bank; + BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPATK; + BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPATK; + BATTLE_STRUCT->animArg2 = 0; + BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); + effect = ITEM_STATS_CHANGE; + } + break; + case HOLD_EFFECT_SP_DEFENSE_UP: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && gBattleMons[bank].statStages[STAT_STAGE_SPDEF] < 0xC) + { + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 5; + gBattleTextBuff1[2] = STAT_STAGE_SPDEF; + gBattleTextBuff1[3] = EOS; + + gEffectBank = bank; + BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPDEF; + BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPDEF; + BATTLE_STRUCT->animArg2 = 0; + BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); + effect = ITEM_STATS_CHANGE; + } + break; + case HOLD_EFFECT_CRITICAL_UP: + if (gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality && !moveTurn && !(gBattleMons[bank].status2 & STATUS2_FOCUS_ENERGY)) + { + gBattleMons[bank].status2 |= STATUS2_FOCUS_ENERGY; + BattleScriptExecute(BattleScript_BerryFocusEnergyEnd2); + effect = ITEM_EFFECT_OTHER; + } + break; + case HOLD_EFFECT_RANDOM_STAT_UP: + if (!moveTurn && gBattleMons[bank].hp <= gBattleMons[bank].maxHP / bankQuality) + { + for (i = 0; i < 5; i++) + { + if (gBattleMons[bank].statStages[STAT_STAGE_ATK + i] < 0xC) + break; + } + if (i != 5) + { + do + { + i = Random() % 5; + } while (gBattleMons[bank].statStages[STAT_STAGE_ATK + i] == 0xC); + + gBattleTextBuff1[0] = 0xFD; + gBattleTextBuff1[1] = 5; + gBattleTextBuff1[2] = i + 1; + gBattleTextBuff1[3] = EOS; + + gBattleTextBuff2[0] = 0xFD; + gBattleTextBuff2[1] = 0; + gBattleTextBuff2[2] = 0xD1; + gBattleTextBuff2[3] = 0xD1 >> 8; + gBattleTextBuff2[4] = 0; + gBattleTextBuff2[5] = 0xD2; + gBattleTextBuff2[6] = 0xD2 >> 8; + gBattleTextBuff2[7] = EOS; + + gEffectBank = bank; + BATTLE_STRUCT->statChanger = 0x21 + i; + BATTLE_STRUCT->animArg1 = 0x21 + i + 6; + BATTLE_STRUCT->animArg2 = 0; + BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); + effect = ITEM_STATS_CHANGE; + } + } + break; + case HOLD_EFFECT_CURE_PAR: + if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + { + gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS); + BattleScriptExecute(BattleScript_BerryCurePrlzEnd2); + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_PSN: + if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + { + gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER); + BattleScriptExecute(BattleScript_BerryCurePsnEnd2); + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_BRN: + if (gBattleMons[bank].status1 & STATUS_BURN) + { + gBattleMons[bank].status1 &= ~(STATUS_BURN); + BattleScriptExecute(BattleScript_BerryCureBrnEnd2); + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_FRZ: + if (gBattleMons[bank].status1 & STATUS_FREEZE) + { + gBattleMons[bank].status1 &= ~(STATUS_FREEZE); + BattleScriptExecute(BattleScript_BerryCureFrzEnd2); + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_SLP: + if (gBattleMons[bank].status1 & STATUS_SLEEP) + { + gBattleMons[bank].status1 &= ~(STATUS_SLEEP); + gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); + BattleScriptExecute(BattleScript_BerryCureSlpEnd2); + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_CONFUSION: + if (gBattleMons[bank].status2 & STATUS2_CONFUSION) + { + gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); + BattleScriptExecute(BattleScript_BerryCureConfusionEnd2); + effect = ITEM_EFFECT_OTHER; + } + break; + case HOLD_EFFECT_CURE_STATUS: + if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) + { + i = 0; + if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); + i++; + } + if (gBattleMons[bank].status1 & STATUS_SLEEP) + { + gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); + StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); + i++; + } + if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); + i++; + } + if (gBattleMons[bank].status1 & STATUS_BURN) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); + i++; + } + if (gBattleMons[bank].status1 & STATUS_FREEZE) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); + i++; + } + if (gBattleMons[bank].status2 & STATUS2_CONFUSION) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); + i++; + } + if (!(i > 1)) + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + else + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleMons[bank].status1 = 0; + gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); + BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2); + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_ATTRACT: + if (gBattleMons[bank].status2 & STATUS2_INFATUATION) + { + gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION); + StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); + BattleScriptExecute(BattleScript_BerryCureChosenStatusEnd2); + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + effect = ITEM_EFFECT_OTHER; + } + break; + } + if (effect) + { + BATTLE_STRUCT->scriptingActive = bank; + gStringBank = bank; + gActiveBank = gBankAttacker = bank; + switch (effect) + { + case ITEM_STATUS_CHANGE: + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1); + MarkBufferBankForExecution(gActiveBank); + break; + case ITEM_PP_CHANGE: + if (!(gBattleMons[bank].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[bank].unk18_b & gBitTable[i])) + gBattleMons[bank].pp[i] = changedPP; + break; + } + } + } + break; + case 2: + break; + case 3: + for (bank = 0; bank < gNoOfAllBanks; bank++) + { + gLastUsedItem = gBattleMons[bank].item; + if (gBattleMons[bank].item == ITEM_ENIGMA_BERRY) + { + bankHoldEffect = gEnigmaBerries[bank].holdEffect; + bankQuality = gEnigmaBerries[bank].holdEffectParam; + } + else + { + bankHoldEffect = ItemId_GetHoldEffect(gLastUsedItem); + bankQuality = ItemId_GetHoldEffectParam(gLastUsedItem); + } + switch (bankHoldEffect) + { + case HOLD_EFFECT_CURE_PAR: + if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + { + gBattleMons[bank].status1 &= ~(STATUS_PARALYSIS); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BerryCureParRet; + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_PSN: + if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + { + gBattleMons[bank].status1 &= ~(STATUS_PSN_ANY | STATUS_TOXIC_COUNTER); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BerryCurePsnRet; + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_BRN: + if (gBattleMons[bank].status1 & STATUS_BURN) + { + gBattleMons[bank].status1 &= ~(STATUS_BURN); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BerryCureBrnRet; + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_FRZ: + if (gBattleMons[bank].status1 & STATUS_FREEZE) + { + gBattleMons[bank].status1 &= ~(STATUS_FREEZE); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BerryCureFrzRet; + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_SLP: + if (gBattleMons[bank].status1 & STATUS_SLEEP) + { + gBattleMons[bank].status1 &= ~(STATUS_SLEEP); + gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BerryCureSlpRet; + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_CURE_CONFUSION: + if (gBattleMons[bank].status2 & STATUS2_CONFUSION) + { + gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_BerryCureConfusionRet; + effect = ITEM_EFFECT_OTHER; + } + break; + case HOLD_EFFECT_CURE_ATTRACT: + if (gBattleMons[bank].status2 & STATUS2_INFATUATION) + { + gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION); + StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); + BattleScriptPushCursor(); + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet; + effect = ITEM_EFFECT_OTHER; + } + break; + case HOLD_EFFECT_CURE_STATUS: + if (gBattleMons[bank].status1 & STATUS_ANY || gBattleMons[bank].status2 & STATUS2_CONFUSION) + { + if (gBattleMons[bank].status1 & STATUS_PSN_ANY) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_PoisonJpn); + } + if (gBattleMons[bank].status1 & STATUS_SLEEP) + { + gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); + StringCopy(gBattleTextBuff1, gStatusConditionString_SleepJpn); + } + if (gBattleMons[bank].status1 & STATUS_PARALYSIS) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ParalysisJpn); + } + if (gBattleMons[bank].status1 & STATUS_BURN) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_BurnJpn); + } + if (gBattleMons[bank].status1 & STATUS_FREEZE) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_IceJpn); + } + if (gBattleMons[bank].status2 & STATUS2_CONFUSION) + { + StringCopy(gBattleTextBuff1, gStatusConditionString_ConfusionJpn); + } + gBattleMons[bank].status1 = 0; + gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION); + BattleScriptPushCursor(); + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet; + effect = ITEM_STATUS_CHANGE; + } + break; + case HOLD_EFFECT_RESTORE_STATS: + for (i = 0; i < 8; i++) + { + if (gBattleMons[bank].statStages[i] < 6) + { + gBattleMons[bank].statStages[i] = 6; + effect = ITEM_STATS_CHANGE; + } + } + if (effect) + { + BATTLE_STRUCT->scriptingActive = bank; + gStringBank = bank; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_WhiteHerbRet; + return effect; // unnecessary return + } + break; + } + if (effect) + { + BATTLE_STRUCT->scriptingActive = bank; + gStringBank = bank; + gActiveBank = bank; + EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); + MarkBufferBankForExecution(gActiveBank); + break; + } + } + break; + case 4: + if (gBattleMoveDamage) + { + switch (atkHoldEffect) + { + case HOLD_EFFECT_FLINCH: + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (Random() % 100) < bankQuality + && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED + && gBattleMons[gBankTarget].hp) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 8; + BattleScriptPushCursor(); + SetMoveEffect(0, 0); + BattleScriptPop(); + } + break; + case HOLD_EFFECT_SHELL_BELL: + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gSpecialStatuses[gBankTarget].moveturnLostHP != 0 + && gSpecialStatuses[gBankTarget].moveturnLostHP != 0xFFFF + && gBankAttacker != gBankTarget + && gBattleMons[gBankAttacker].hp != gBattleMons[gBankAttacker].maxHP + && gBattleMons[gBankAttacker].hp != 0) + { + gLastUsedItem = atkItem; + gStringBank = gBankAttacker; + BATTLE_STRUCT->scriptingActive = gBankAttacker; + gBattleMoveDamage = (gSpecialStatuses[gBankTarget].moveturnLostHP / atkQuality) * -1; + if (gBattleMoveDamage == 0) + gBattleMoveDamage = -1; + gSpecialStatuses[gBankTarget].moveturnLostHP = 0; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret; + effect++; + } + break; + } + } + break; + } + + return effect; +} + +struct CombinedMove +{ + u16 move1; + u16 move2; + u16 newMove; +}; + +static const struct CombinedMove sCombinedMoves[2] = +{ + {MOVE_EMBER, MOVE_GUST, MOVE_HEAT_WAVE}, + {0xFFFF, 0xFFFF, 0xFFFF} +}; + +void unref_sub_801B40C(void) +{ + int i = 0; + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + { + do + { + u8 bank = 0; + do + { + u8 absent = gAbsentBankFlags; + if (gBitTable[bank] & absent || absent & gBitTable[bank + 2]) + bank++; + else + { + if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank + 2]) + { + gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank) | ((bank + 2) << 4); + gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; + gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4; + } + if (sCombinedMoves[i].move1 == gChosenMovesByBanks[bank + 2] && sCombinedMoves[i].move2 == gChosenMovesByBanks[bank]) + { + gSideTimers[GetBankIdentity(bank) & 1].field3 = (bank + 2) | ((bank) << 4); + gSideTimers[GetBankIdentity(bank) & 1].field4 = sCombinedMoves[i].newMove; + gSideAffecting[GetBankIdentity(bank) & 1] |= SIDE_STATUS_X4; + } + bank++; + } + } while (bank < 2); + i++; + } while (sCombinedMoves[i].move1 != 0xFFFF); + } +} + +void sub_801B594(void) +{ + if (gBattleExecBuffer == 0) + gBattleScriptingCommandsTable[*gBattlescriptCurrInstr](); +} + +u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target +{ + u8 targetBank = 0; + u8 moveTarget; + u8 side; + + if (useMoveTarget) + moveTarget = useMoveTarget - 1; + else + moveTarget = gBattleMoves[move].target; + + switch (moveTarget) + { + case 0: + side = GetBankSide(gBankAttacker) ^ 1; + if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) + targetBank = gSideTimers[side].followmeTarget; + else + { + side = GetBankSide(gBankAttacker); + do + { + targetBank = Random() % gNoOfAllBanks; + } while (targetBank == gBankAttacker || side == GetBankSide(targetBank) || gAbsentBankFlags & gBitTable[targetBank]); + if (gBattleMoves[move].type == TYPE_ELECTRIC + && AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBankAttacker, ABILITY_LIGHTNING_ROD, 0, 0) + && gBattleMons[targetBank].ability != ABILITY_LIGHTNING_ROD) + { + targetBank ^= 2; + RecordAbilityBattle(targetBank, gBattleMons[targetBank].ability); + gSpecialStatuses[targetBank].lightningRodRedirected = 1; + } + } + break; + case 1: + case 8: + case 32: + case 64: + targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1); + if (gAbsentBankFlags & gBitTable[targetBank]) + targetBank ^= 2; + break; + case 4: + side = GetBankSide(gBankAttacker) ^ 1; + if (gSideTimers[side].followmeTimer && gBattleMons[gSideTimers[side].followmeTarget].hp) + targetBank = gSideTimers[side].followmeTarget; + else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && moveTarget & 4) + { + if (GetBankSide(gBankAttacker) == 0) + { + if (Random() & 1) + targetBank = GetBankByIdentity(1); + else + targetBank = GetBankByIdentity(3); + } + else + { + if (Random() & 1) + targetBank = GetBankByIdentity(0); + else + targetBank = GetBankByIdentity(2); + } + if (gAbsentBankFlags & gBitTable[targetBank]) + targetBank ^= 2; + } + else + targetBank = GetBankByIdentity((GetBankIdentity(gBankAttacker) & 1) ^ 1); + break; + case 2: + case 16: + targetBank = gBankAttacker; + break; + } + ewram16010arr(gBankAttacker) = targetBank; + return targetBank; +} + +u8 IsMonDisobedient(void) +{ + u8 obedienceLevel; + s32 rnd; + s32 calc; + + if (gBattleTypeFlags & BATTLE_TYPE_LINK + || GetBankSide(gBankAttacker) == 1 + || !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName) + || FlagGet(FLAG_BADGE08_GET)) + return 0; + + obedienceLevel = 10; + if (FlagGet(FLAG_BADGE02_GET)) + obedienceLevel = 30; + if (FlagGet(FLAG_BADGE04_GET)) + obedienceLevel = 50; + if (FlagGet(FLAG_BADGE06_GET)) + obedienceLevel = 70; + + if (gBattleMons[gBankAttacker].level <= obedienceLevel) + return 0; + rnd = (Random() & 255); + calc = (gBattleMons[gBankAttacker].level + obedienceLevel) * rnd >> 8; + if (calc < obedienceLevel) + return 0; + + // is not obedient + if (gCurrentMove == MOVE_RAGE) + gBattleMons[gBankAttacker].status2 &= ~(STATUS2_RAGE); + if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP && (gCurrentMove == MOVE_SNORE || gCurrentMove == MOVE_SLEEP_TALK)) + { + gBattlescriptCurrInstr = gUnknown_081D995F; + return 1; + } + + rnd = (Random() & 255); + calc = (gBattleMons[gBankAttacker].level + obedienceLevel) * rnd >> 8; + if (calc < obedienceLevel) + { + calc = CheckMoveLimitations(gBankAttacker, gBitTable[gCurrMovePos], 0xFF); + if (calc == 0xF) // all moves cannot be used + { + gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; + gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround; + return 1; + } + else // use a random move + { + do + { + gCurrMovePos = gUnknown_02024BE5 = Random() & 3; + } while (gBitTable[gCurrMovePos] & calc); + gRandomMove = gBattleMons[gBankAttacker].moves[gCurrMovePos]; + gBattleCommunication[3] = 0; + gDynamicBasePower = 0; + BATTLE_STRUCT->dynamicMoveType = 0; + gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove; + gBankTarget = GetMoveTarget(gRandomMove, 0); + gHitMarker |= HITMARKER_x200000; + return 2; + } + } + else + { + obedienceLevel = gBattleMons[gBankAttacker].level - obedienceLevel; + + calc = (Random() & 255); + if (calc < obedienceLevel && !(gBattleMons[gBankAttacker].status1 & STATUS_ANY) && gBattleMons[gBankAttacker].ability != ABILITY_VITAL_SPIRIT && gBattleMons[gBankAttacker].ability != ABILITY_INSOMNIA) + { + // try putting asleep + int i; + for (i = 0; i < gNoOfAllBanks; i++) + { + if (gBattleMons[i].status2 & STATUS2_UPROAR) + break; + } + if (i == gNoOfAllBanks) + { + gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep; + return 1; + } + } + calc -= obedienceLevel; + if (calc < obedienceLevel) + { + gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankAttacker], MOVE_POUND, 0, 40, 0, gBankAttacker, gBankAttacker); + gBankTarget = gBankAttacker; + gBattlescriptCurrInstr = gUnknown_081D99A0; + gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; + return 2; + } + else + { + gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3; + gBattlescriptCurrInstr = BattleScript_MoveUsedLoafingAround; + return 1; + } + } +} diff --git a/src/data/pokemon/trainer_class_lookups.h b/src/data/pokemon/trainer_class_lookups.h index d03038674..9cffca632 100644 --- a/src/data/pokemon/trainer_class_lookups.h +++ b/src/data/pokemon/trainer_class_lookups.h @@ -1,9 +1,5 @@ -// - -// - -#ifndef POKERUBY_FACILITY_CLASS_LOOKUPS_H -#define POKERUBY_FACILITY_CLASS_LOOKUPS_H +#ifndef POKERUBY_TRAINER_CLASS_LOOKUPS_H +#define POKERUBY_TRAINER_CLASS_LOOKUPS_H const u8 gTrainerClassToPicIndex[] = { TRAINER_PIC_ARCHIE, // AQUA_LEADER @@ -165,4 +161,4 @@ const u8 gTrainerClassToNameIndex[] = { TRAINER_CLASS_SIS_AND_BRO // SIS_AND_BRO }; -#endif //POKERUBY_FACILITY_CLASS_LOOKUPS_H +#endif //POKERUBY_TRAINER_CLASS_LOOKUPS_H diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c index 1b00ad96e..eb56974cd 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon/pokemon_2.c @@ -1,5 +1,6 @@ #include "global.h" #include "battle.h" +#include "battle_util.h" #include "data2.h" #include "event_data.h" #include "main.h" diff --git a/src/rom3.c b/src/rom3.c index cdc66989c..11239a681 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -5,6 +5,7 @@ #include "battle_anim.h" #include "battle_anim_81258BC.h" #include "battle_anim_8137220.h" +#include "battle_util.h" #include "cable_club.h" #include "constants/items.h" #include "link.h" @@ -582,7 +583,7 @@ void Emitcmd1(u8 a, u8 b, u8 c) PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); } -void EmitSetAttributes(u8 a, u8 b, u8 c, u8 d, void *e) +void EmitSetMonData(u8 a, u8 b, u8 c, u8 d, void *e) { int i; -- cgit v1.2.3 From 897107d1eae649e71213539aba7146fe2b2e2e70 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 7 Jan 2018 23:45:53 -0500 Subject: NDEBUG which is supposed to be NDEBUG... --- include/config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/config.h b/include/config.h index 7661324db..6d9e15a15 100644 --- a/include/config.h +++ b/include/config.h @@ -4,9 +4,8 @@ // In the Generation 3 games, Asserts were used in various debug builds. // Ruby/Sapphire and Emerald do not have these asserts while Fire Red // still has them in the ROM. This is because the developers forgot -// to define NDEBUG before release, which is actually supposed to be -// NDEBUG, however this has been changed as Ruby's actual debug build -// does not use the AGBPrint features. +// to define NDEBUG before release, however this has been changed as +// Ruby's actual debug build does not use the AGBPrint features. // To note, Ruby/Sapphire likely did not use AGBPrint. This is because // the german debug ROM of Ruby did not have any uses of AGBPrint and -- cgit v1.2.3 From fd42bcc78ce229d13afc26af4c6d2dd0187b871d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 7 Jan 2018 23:46:05 -0500 Subject: sub_8096C84 --- asm/pokemon_storage_system.s | 964 +++++++++++------------------------ data/pokemon_storage_system.s | 2 +- src/pokemon/pokemon_storage_system.c | 220 +++++++- 3 files changed, 508 insertions(+), 678 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 49bb3995e..8dab0b2fd 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,374 +5,6 @@ .text - thumb_func_start sub_8096C84 -sub_8096C84: @ 8096C84 - push {r4,lr} - ldr r0, _08096C9C @ =gSharedMem - ldrb r0, [r0, 0x4] - cmp r0, 0x6 - bls _08096C90 - b _08096FBA -_08096C90: - lsls r0, 2 - ldr r1, _08096CA0 @ =_08096CA4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08096C9C: .4byte gSharedMem -_08096CA0: .4byte _08096CA4 - .align 2, 0 -_08096CA4: - .4byte _08096CC0 - .4byte _08096EE0 - .4byte _08096F1C - .4byte _08096F60 - .4byte _08096F80 - .4byte _08096F8A - .4byte _08096FA4 -_08096CC0: - bl sub_809CA40 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - cmp r0, 0xF - bls _08096CD0 - b _08096FBA -_08096CD0: - lsls r0, 2 - ldr r1, _08096CDC @ =_08096CE0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08096CDC: .4byte _08096CE0 - .align 2, 0 -_08096CE0: - .4byte _08096D20 - .4byte _08096FBA - .4byte _08096FBA - .4byte _08096D94 - .4byte _08096D34 - .4byte _08096D5C - .4byte _08096DAC - .4byte _08096DC0 - .4byte _08096DD4 - .4byte _08096DFC - .4byte _08096E30 - .4byte _08096EB8 - .4byte _08096E70 - .4byte _08096E8C - .4byte _08096ECC - .4byte _08096DA0 -_08096D20: - movs r0, 0x5 - bl PlaySE - ldr r1, _08096D30 @ =gSharedMem - movs r0, 0x1 - strb r0, [r1, 0x4] - b _08096FBA - .align 2, 0 -_08096D30: .4byte gSharedMem -_08096D34: - ldr r4, _08096D48 @ =gSharedMem - ldrb r0, [r4, 0x5] - cmp r0, 0x2 - beq _08096D4C - movs r0, 0x10 - bl sub_8098898 - movs r0, 0x3 - strb r0, [r4, 0x4] - b _08096FBA - .align 2, 0 -_08096D48: .4byte gSharedMem -_08096D4C: - bl sub_809B0D4 - ldr r0, _08096D58 @ =sub_8096FC8 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096D58: .4byte sub_8096FC8 -_08096D5C: - ldr r4, _08096D88 @ =gSharedMem - ldrb r0, [r4, 0x5] - cmp r0, 0x2 - beq _08096D66 - b _08096FBA -_08096D66: - bl sub_809BF20 - lsls r0, 24 - cmp r0, 0 - beq _08096D80 - ldr r1, _08096D8C @ =0x000011f2 - adds r0, r4, r1 - ldrh r0, [r0] - bl ItemIsMail - lsls r0, 24 - cmp r0, 0 - bne _08096E4C -_08096D80: - ldr r0, _08096D90 @ =sub_8097004 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096D88: .4byte gSharedMem -_08096D8C: .4byte 0x000011f2 -_08096D90: .4byte sub_8097004 -_08096D94: - ldr r0, _08096D9C @ =sub_8097BA0 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096D9C: .4byte sub_8097BA0 -_08096DA0: - ldr r0, _08096DA8 @ =sub_8097CC0 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096DA8: .4byte sub_8097CC0 -_08096DAC: - movs r0, 0x5 - bl PlaySE - ldr r0, _08096DBC @ =sub_809789C - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096DBC: .4byte sub_809789C -_08096DC0: - movs r0, 0x5 - bl PlaySE - ldr r0, _08096DD0 @ =sub_8097078 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096DD0: .4byte sub_8097078 -_08096DD4: - movs r0, 0x5 - bl PlaySE - ldr r4, _08096DF0 @ =gSharedMem - ldr r0, _08096DF4 @ =gPokemonStorage - ldrb r0, [r0] - adds r0, 0x1 - ldr r2, _08096DF8 @ =0x000008b2 - adds r1, r4, r2 - strh r0, [r1] - cmp r0, 0xD - ble _08096E18 - movs r0, 0 - b _08096E16 - .align 2, 0 -_08096DF0: .4byte gSharedMem -_08096DF4: .4byte gPokemonStorage -_08096DF8: .4byte 0x000008b2 -_08096DFC: - movs r0, 0x5 - bl PlaySE - ldr r4, _08096E24 @ =gSharedMem - ldr r0, _08096E28 @ =gPokemonStorage - ldrb r0, [r0] - subs r0, 0x1 - ldr r2, _08096E2C @ =0x000008b2 - adds r1, r4, r2 - strh r0, [r1] - cmp r0, 0 - bge _08096E18 - movs r0, 0xD -_08096E16: - strh r0, [r1] -_08096E18: - ldrb r0, [r1] - bl sub_8099C70 - movs r0, 0x2 - strb r0, [r4, 0x4] - b _08096FBA - .align 2, 0 -_08096E24: .4byte gSharedMem -_08096E28: .4byte gPokemonStorage -_08096E2C: .4byte 0x000008b2 -_08096E30: - bl sub_809BE80 - lsls r0, 24 - cmp r0, 0 - bne _08096E96 - ldr r4, _08096E54 @ =gSharedMem - ldr r1, _08096E58 @ =0x000011f2 - adds r0, r4, r1 - ldrh r0, [r0] - bl ItemIsMail - lsls r0, 24 - cmp r0, 0 - beq _08096E5C -_08096E4C: - movs r0, 0x5 - strb r0, [r4, 0x4] - b _08096FBA - .align 2, 0 -_08096E54: .4byte gSharedMem -_08096E58: .4byte 0x000011f2 -_08096E5C: - movs r0, 0x5 - bl PlaySE - ldr r0, _08096E6C @ =sub_809746C - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096E6C: .4byte sub_809746C -_08096E70: - bl sub_809BE80 - lsls r0, 24 - cmp r0, 0 - bne _08096E96 - movs r0, 0x5 - bl PlaySE - ldr r0, _08096E88 @ =sub_80972A8 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096E88: .4byte sub_80972A8 -_08096E8C: - bl sub_809BEBC - lsls r0, 24 - cmp r0, 0 - bne _08096EA4 -_08096E96: - ldr r1, _08096EA0 @ =gSharedMem - movs r0, 0x4 - strb r0, [r1, 0x4] - b _08096FBA - .align 2, 0 -_08096EA0: .4byte gSharedMem -_08096EA4: - movs r0, 0x5 - bl PlaySE - ldr r0, _08096EB4 @ =c3_0808DC50 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096EB4: .4byte c3_0808DC50 -_08096EB8: - movs r0, 0x5 - bl PlaySE - ldr r0, _08096EC8 @ =sub_8097390 - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096EC8: .4byte sub_8097390 -_08096ECC: - movs r0, 0x5 - bl PlaySE - ldr r0, _08096EDC @ =sub_80972FC - bl sub_8096BE0 - b _08096FBA - .align 2, 0 -_08096EDC: .4byte sub_80972FC -_08096EE0: - bl sub_809AC00 - lsls r0, 24 - cmp r0, 0 - bne _08096FBA - bl sub_809BF48 - lsls r0, 24 - cmp r0, 0 - beq _08096EFA - bl sub_80986E8 - b _08096EFE -_08096EFA: - bl sub_8098710 -_08096EFE: - ldr r4, _08096F14 @ =gSharedMem - ldr r2, _08096F18 @ =0x000011f6 - adds r0, r4, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _08096F0E - bl BoxSetMosaic -_08096F0E: - movs r0, 0 - strb r0, [r4, 0x4] - b _08096FBA - .align 2, 0 -_08096F14: .4byte gSharedMem -_08096F18: .4byte 0x000011f6 -_08096F1C: - bl sub_8099D34 - lsls r0, 24 - cmp r0, 0 - bne _08096FBA - ldr r1, _08096F50 @ =gPokemonStorage - ldr r0, _08096F54 @ =gSharedMem - ldr r2, _08096F58 @ =0x000008b2 - adds r0, r2 - ldrh r0, [r0] - strb r0, [r1] - ldr r0, _08096F5C @ =gUnknown_0203847C - ldrb r0, [r0] - cmp r0, 0 - bne _08096F70 - bl sub_809BF20 - lsls r0, 24 - cmp r0, 0 - bne _08096F70 - bl sub_809B440 - bl BoxSetMosaic - b _08096F70 - .align 2, 0 -_08096F50: .4byte gPokemonStorage -_08096F54: .4byte gSharedMem -_08096F58: .4byte 0x000008b2 -_08096F5C: .4byte gUnknown_0203847C -_08096F60: - ldr r0, _08096F78 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0xF3 - ands r0, r1 - cmp r0, 0 - beq _08096FBA - bl sub_8098A5C -_08096F70: - ldr r1, _08096F7C @ =gSharedMem - movs r0, 0 - strb r0, [r1, 0x4] - b _08096FBA - .align 2, 0 -_08096F78: .4byte gMain -_08096F7C: .4byte gSharedMem -_08096F80: - movs r0, 0x20 - bl PlaySE - movs r0, 0xD - b _08096F92 -_08096F8A: - movs r0, 0x20 - bl PlaySE - movs r0, 0x16 -_08096F92: - bl sub_8098898 - ldr r1, _08096FA0 @ =gSharedMem - movs r0, 0x6 - strb r0, [r1, 0x4] - b _08096FBA - .align 2, 0 -_08096FA0: .4byte gSharedMem -_08096FA4: - ldr r0, _08096FC0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0xF3 - ands r0, r1 - cmp r0, 0 - beq _08096FBA - bl sub_8098A5C - ldr r0, _08096FC4 @ =sub_8096C84 - bl sub_8096BE0 -_08096FBA: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08096FC0: .4byte gMain -_08096FC4: .4byte sub_8096C84 - thumb_func_end sub_8096C84 - thumb_func_start sub_8096FC8 sub_8096FC8: @ 8096FC8 push {r4,lr} @@ -397,7 +29,7 @@ _08096FE8: cmp r0, 0 bne _08096FF8 ldr r0, _08097000 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _08096FF8: pop {r4} pop {r0} @@ -456,7 +88,7 @@ _0809704C: bl BoxSetMosaic _08097064: ldr r0, _08097074 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _0809706A: pop {r4} pop {r0} @@ -532,7 +164,7 @@ _080970E8: _08097110: bl sub_8098A5C ldr r0, _0809711C @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _0809711C: .4byte sub_8096C84 @@ -545,7 +177,7 @@ _08097120: bl PlaySE bl sub_8098A5C ldr r0, _0809713C @ =sub_80972A8 - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _0809713C: .4byte sub_80972A8 @@ -554,7 +186,7 @@ _08097140: bl PlaySE bl sub_8098A5C ldr r0, _08097154 @ =sub_80972FC - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _08097154: .4byte sub_80972FC @@ -567,7 +199,7 @@ _08097158: bl PlaySE bl sub_8098A5C ldr r0, _08097174 @ =c3_0808DC50 - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _08097174: .4byte c3_0808DC50 @@ -576,7 +208,7 @@ _08097178: bl PlaySE bl sub_8098A5C ldr r0, _0809718C @ =sub_8097390 - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _0809718C: .4byte sub_8097390 @@ -597,7 +229,7 @@ _08097190: bl PlaySE bl sub_8098A5C ldr r0, _080971C8 @ =sub_809746C - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _080971C0: .4byte gSharedMem @@ -646,7 +278,7 @@ _0809721C: movs r0, 0x5 bl PlaySE ldr r0, _0809722C @ =sub_8097594 - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _0809722C: .4byte sub_8097594 @@ -654,7 +286,7 @@ _08097230: movs r0, 0x5 bl PlaySE ldr r0, _08097240 @ =sub_8097788 - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _08097240: .4byte sub_8097788 @@ -662,7 +294,7 @@ _08097244: movs r0, 0x5 bl PlaySE ldr r0, _08097254 @ =sub_80977E4 - bl sub_8096BE0 + bl SetPSSCallback b _0809729A .align 2, 0 _08097254: .4byte sub_80977E4 @@ -697,7 +329,7 @@ _08097284: beq _0809729A bl sub_8098A5C ldr r0, _080972A4 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _0809729A: pop {r4} pop {r0} @@ -736,14 +368,14 @@ _080972CA: cmp r0, 0 beq _080972EC ldr r0, _080972E8 @ =sub_8097858 - bl sub_8096BE0 + bl SetPSSCallback b _080972F2 .align 2, 0 _080972E4: .4byte gUnknown_0203847C _080972E8: .4byte sub_8097858 _080972EC: ldr r0, _080972F8 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _080972F2: pop {r4} pop {r0} @@ -781,14 +413,14 @@ _0809731E: cmp r0, 0 beq _08097340 ldr r0, _0809733C @ =sub_8097858 - bl sub_8096BE0 + bl SetPSSCallback b _08097346 .align 2, 0 _08097338: .4byte gUnknown_0203847C _0809733C: .4byte sub_8097858 _08097340: ldr r0, _0809734C @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _08097346: pop {r4} pop {r0} @@ -823,7 +455,7 @@ _08097372: bne _08097386 bl BoxSetMosaic ldr r0, _0809738C @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _08097386: pop {r4} pop {r0} @@ -888,7 +520,7 @@ _080973FC: beq _08097462 bl sub_8098A5C ldr r0, _08097418 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _08097462 .align 2, 0 _08097414: .4byte gMain @@ -924,7 +556,7 @@ _0809744C: _08097458: .4byte gSharedMem _0809745C: ldr r0, _08097468 @ =sub_8097004 - bl sub_8096BE0 + bl SetPSSCallback _08097462: pop {r0} bx r0 @@ -1037,7 +669,7 @@ _08097548: bl sub_80987DC _0809755E: ldr r0, _08097568 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _08097584 .align 2, 0 _08097568: .4byte sub_8096C84 @@ -1212,7 +844,7 @@ _080976C8: b _08097744 _080976E0: ldr r0, _080976E8 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _0809777A .align 2, 0 _080976E8: .4byte sub_8096C84 @@ -1285,7 +917,7 @@ _08097764: beq _0809777A bl sub_8098A5C ldr r0, _08097784 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _0809777A: pop {r4} pop {r0} @@ -1388,7 +1020,7 @@ _08097824: bl sub_809BDD8 bl sub_809801C ldr r0, _08097854 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _0809784C: pop {r4} pop {r0} @@ -1423,7 +1055,7 @@ _0809787C: bne _08097890 bl sub_80987DC ldr r0, _08097898 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _08097890: pop {r4} pop {r0} @@ -1486,7 +1118,7 @@ _08097914: bl sub_809A860 bl sub_8098A5C ldr r0, _08097928 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _08097968 .align 2, 0 _08097928: .4byte sub_8096C84 @@ -1494,7 +1126,7 @@ _0809792C: movs r0, 0x5 bl PlaySE ldr r0, _0809793C @ =sub_8097B44 - bl sub_8096BE0 + bl SetPSSCallback b _08097968 .align 2, 0 _0809793C: .4byte sub_8097B44 @@ -1503,7 +1135,7 @@ _08097940: bl PlaySE bl sub_8098A5C ldr r0, _08097954 @ =sub_8097974 - bl sub_8096BE0 + bl SetPSSCallback b _08097968 .align 2, 0 _08097954: .4byte sub_8097974 @@ -1512,7 +1144,7 @@ _08097958: bl PlaySE bl sub_8098A5C ldr r0, _08097970 @ =sub_8097A64 - bl sub_8096BE0 + bl SetPSSCallback _08097968: pop {r4} pop {r0} @@ -1561,7 +1193,7 @@ _080979A2: bl sub_809A860 bl sub_8098A5C ldr r0, _080979D0 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _08097A5A .align 2, 0 _080979CC: .4byte 0x00000d5e @@ -1626,7 +1258,7 @@ _08097A44: movs r0, 0x1 bl sub_809A860 ldr r0, _08097A60 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _08097A5A: pop {r4,r5} pop {r0} @@ -1699,7 +1331,7 @@ _08097AE4: movs r0, 0x1 bl sub_809A860 ldr r0, _08097AFC @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _08097B32 .align 2, 0 _08097AF4: .4byte 0x000008b2 @@ -1728,7 +1360,7 @@ _08097B18: ldrh r0, [r0] strb r0, [r1] ldr r0, _08097B40 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback _08097B32: pop {r4,r5} pop {r0} @@ -1867,7 +1499,7 @@ _08097C46: _08097C4A: bl sub_8098A5C ldr r0, _08097C58 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _08097CB0 .align 2, 0 _08097C58: .4byte sub_8096C84 @@ -2002,7 +1634,7 @@ _08097D66: _08097D6C: bl sub_8098A5C ldr r0, _08097D78 @ =sub_8096C84 - bl sub_8096BE0 + bl SetPSSCallback b _08097DD0 .align 2, 0 _08097D78: .4byte sub_8096C84 @@ -3514,7 +3146,7 @@ sub_8098B48: @ 8098B48 push {r4,r5,lr} bl sub_809D51C movs r2, 0 - ldr r1, _08098BD8 @ =gUnknown_083B6DB4 + ldr r1, _08098BD8 @ =gPokemonStorageSystemPtr ldr r0, [r1] ldr r4, _08098BDC @ =0x000010d0 adds r3, r0, r4 @@ -3530,7 +3162,7 @@ _08098B5C: cmp r2, 0x27 bls _08098B5C movs r2, 0 - ldr r0, _08098BD8 @ =gUnknown_083B6DB4 + ldr r0, _08098BD8 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x89 lsls r1, 5 @@ -3546,7 +3178,7 @@ _08098B7A: cmp r2, 0x27 bls _08098B7A movs r2, 0 - ldr r0, _08098BD8 @ =gUnknown_083B6DB4 + ldr r0, _08098BD8 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r4, _08098BE0 @ =0x00001038 adds r3, r0, r4 @@ -3561,7 +3193,7 @@ _08098B96: cmp r2, 0x5 bls _08098B96 movs r2, 0 - ldr r0, _08098BD8 @ =gUnknown_083B6DB4 + ldr r0, _08098BD8 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08098BE4 @ =0x00001050 adds r3, r0, r1 @@ -3587,7 +3219,7 @@ _08098BB2: pop {r0} bx r0 .align 2, 0 -_08098BD8: .4byte gUnknown_083B6DB4 +_08098BD8: .4byte gPokemonStorageSystemPtr _08098BDC: .4byte 0x000010d0 _08098BE0: .4byte 0x00001038 _08098BE4: .4byte 0x00001050 @@ -3599,7 +3231,7 @@ _08098BEC: .4byte 0x00000d5c sub_8098BF0: @ 8098BF0 push {r4-r6,lr} sub sp, 0x8 - ldr r0, _08098C38 @ =gUnknown_083B6DB4 + ldr r0, _08098C38 @ =gPokemonStorageSystemPtr ldr r5, [r0] ldr r0, _08098C3C @ =0x000025b4 adds r4, r5, r0 @@ -3630,7 +3262,7 @@ sub_8098BF0: @ 8098BF0 pop {r0} bx r0 .align 2, 0 -_08098C38: .4byte gUnknown_083B6DB4 +_08098C38: .4byte gPokemonStorageSystemPtr _08098C3C: .4byte 0x000025b4 _08098C40: .4byte 0x00001034 _08098C44: .4byte sub_80999C4 @@ -3694,7 +3326,7 @@ _08098C70: adds r0, r4, 0 asrs r3, 16 bl sub_8099AFC - ldr r1, _08098CD0 @ =gUnknown_083B6DB4 + ldr r1, _08098CD0 @ =gPokemonStorageSystemPtr ldr r1, [r1] mov r3, r8 lsls r2, r3, 2 @@ -3705,10 +3337,10 @@ _08098C70: b _08098CE8 .align 2, 0 _08098CCC: .4byte gPokemonStorage + 0x4 -_08098CD0: .4byte gUnknown_083B6DB4 +_08098CD0: .4byte gPokemonStorageSystemPtr _08098CD4: .4byte 0x00001050 _08098CD8: - ldr r0, _08098D18 @ =gUnknown_083B6DB4 + ldr r0, _08098D18 @ =gPokemonStorageSystemPtr ldr r0, [r0] mov r2, r8 lsls r1, r2, 2 @@ -3741,7 +3373,7 @@ _08098CE8: pop {r0} bx r0 .align 2, 0 -_08098D18: .4byte gUnknown_083B6DB4 +_08098D18: .4byte gPokemonStorageSystemPtr _08098D1C: .4byte 0x00001050 thumb_func_end sub_8098C48 @@ -3817,7 +3449,7 @@ sub_8098D20: @ 8098D20 adds r2, r5, 0 adds r3, r4, 0 bl sub_8099AFC - ldr r1, _08098DD8 @ =gUnknown_083B6DB4 + ldr r1, _08098DD8 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _08098DDC @ =0x00001050 adds r1, r2 @@ -3833,7 +3465,7 @@ _08098DC4: bx r0 .align 2, 0 _08098DD4: .4byte gPokemonStorage + 0x4 -_08098DD8: .4byte gUnknown_083B6DB4 +_08098DD8: .4byte gPokemonStorageSystemPtr _08098DDC: .4byte 0x00001050 thumb_func_end sub_8098D20 @@ -3843,7 +3475,7 @@ sub_8098DE0: @ 8098DE0 lsls r0, 16 lsrs r4, r0, 16 movs r2, 0 - ldr r0, _08098E18 @ =gUnknown_083B6DB4 + ldr r0, _08098E18 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08098E1C @ =0x00001050 adds r3, r0, r1 @@ -3870,7 +3502,7 @@ _08098E08: pop {r0} bx r0 .align 2, 0 -_08098E18: .4byte gUnknown_083B6DB4 +_08098E18: .4byte gPokemonStorageSystemPtr _08098E1C: .4byte 0x00001050 _08098E20: .4byte sub_8098E68 thumb_func_end sub_8098DE0 @@ -3892,7 +3524,7 @@ sub_8098E24: @ 8098E24 strh r0, [r2, 0x20] b _08098E56 _08098E40: - ldr r0, _08098E5C @ =gUnknown_083B6DB4 + ldr r0, _08098E5C @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r3, _08098E60 @ =0x00001178 adds r1, r3 @@ -3907,7 +3539,7 @@ _08098E56: pop {r0} bx r0 .align 2, 0 -_08098E5C: .4byte gUnknown_083B6DB4 +_08098E5C: .4byte gPokemonStorageSystemPtr _08098E60: .4byte 0x00001178 _08098E64: .4byte SpriteCallbackDummy thumb_func_end sub_8098E24 @@ -3952,7 +3584,7 @@ sub_8098EA0: @ 8098EA0 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r0, _08098ED8 @ =gUnknown_083B6DB4 + ldr r0, _08098ED8 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08098EDC @ =0x00001050 adds r7, r0, r1 @@ -3978,7 +3610,7 @@ _08098EC2: pop {r0} bx r0 .align 2, 0 -_08098ED8: .4byte gUnknown_083B6DB4 +_08098ED8: .4byte gPokemonStorageSystemPtr _08098EDC: .4byte 0x00001050 thumb_func_end sub_8098EA0 @@ -4023,7 +3655,7 @@ sub_8098EE0: @ 8098EE0 movs r0, 0 str r0, [sp, 0x14] mov r9, r0 - ldr r0, _08098FF8 @ =gUnknown_083B6DB4 + ldr r0, _08098FF8 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r2, _08098FFC @ =0x0000117d adds r2, r0 @@ -4124,7 +3756,7 @@ _08098FC8: pop {r1} bx r1 .align 2, 0 -_08098FF8: .4byte gUnknown_083B6DB4 +_08098FF8: .4byte gPokemonStorageSystemPtr _08098FFC: .4byte 0x0000117d _08099000: .4byte 0x00001050 _08099004: .4byte gPokemonStorage + 0x4 @@ -4136,7 +3768,7 @@ sub_809900C: @ 809900C push {r4-r6,lr} lsls r1, 24 lsrs r1, 24 - ldr r4, _08099058 @ =gUnknown_083B6DB4 + ldr r4, _08099058 @ =gPokemonStorageSystemPtr ldr r5, [r4] ldr r3, _0809905C @ =0x0000117c adds r2, r5, r3 @@ -4171,7 +3803,7 @@ sub_809900C: @ 809900C movs r0, 0 b _08099076 .align 2, 0 -_08099058: .4byte gUnknown_083B6DB4 +_08099058: .4byte gPokemonStorageSystemPtr _0809905C: .4byte 0x0000117c _08099060: .4byte 0x0000117d _08099064: .4byte 0x0000117b @@ -4211,7 +3843,7 @@ _080990A8: .4byte 0x00001176 thumb_func_start sub_80990AC sub_80990AC: @ 80990AC push {r4-r6,lr} - ldr r0, _080990D4 @ =gUnknown_083B6DB4 + ldr r0, _080990D4 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r0, _080990D8 @ =0x00001172 adds r3, r4, r0 @@ -4232,7 +3864,7 @@ _080990C0: beq _080990E8 b _080991F0 .align 2, 0 -_080990D4: .4byte gUnknown_083B6DB4 +_080990D4: .4byte gPokemonStorageSystemPtr _080990D8: .4byte 0x00001172 _080990DC: .4byte 0x0000117c _080990E0: @@ -4318,7 +3950,7 @@ _08099178: cmp r0, 0 bne _080991B0 _08099182: - ldr r0, _080991A8 @ =gUnknown_083B6DB4 + ldr r0, _080991A8 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r2, _080991AC @ =0x0000117c adds r1, r2 @@ -4332,10 +3964,10 @@ _08099198: .4byte 0x00001176 _0809919C: .4byte 0x0000117a _080991A0: .4byte 0x00001178 _080991A4: .4byte 0x0000117b -_080991A8: .4byte gUnknown_083B6DB4 +_080991A8: .4byte gPokemonStorageSystemPtr _080991AC: .4byte 0x0000117c _080991B0: - ldr r0, _080991D0 @ =gUnknown_083B6DB4 + ldr r0, _080991D0 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r5, _080991D4 @ =0x0000117a adds r3, r1, r5 @@ -4351,7 +3983,7 @@ _080991B0: strb r2, [r1] b _080991F8 .align 2, 0 -_080991D0: .4byte gUnknown_083B6DB4 +_080991D0: .4byte gPokemonStorageSystemPtr _080991D4: .4byte 0x0000117a _080991D8: .4byte 0x0000117b _080991DC: .4byte 0x0000117c @@ -4404,7 +4036,7 @@ sub_8099200: @ 8099200 movs r2, 0x68 movs r3, 0x40 bl sub_8099AFC - ldr r1, _080992A4 @ =gUnknown_083B6DB4 + ldr r1, _080992A4 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _080992A8 @ =0x00001038 adds r1, r2 @@ -4443,7 +4075,7 @@ _08099246: adds r0, r5, 0 movs r2, 0x98 bl sub_8099AFC - ldr r1, _080992A4 @ =gUnknown_083B6DB4 + ldr r1, _080992A4 @ =gPokemonStorageSystemPtr ldr r1, [r1] lsls r2, r6, 2 ldr r3, _080992A8 @ =0x00001038 @@ -4456,10 +4088,10 @@ _08099246: b _080992BA .align 2, 0 _080992A0: .4byte gPlayerParty -_080992A4: .4byte gUnknown_083B6DB4 +_080992A4: .4byte gPokemonStorageSystemPtr _080992A8: .4byte 0x00001038 _080992AC: - ldr r0, _08099308 @ =gUnknown_083B6DB4 + ldr r0, _08099308 @ =gPokemonStorageSystemPtr ldr r0, [r0] lsls r1, r6, 2 ldr r2, _0809930C @ =0x00001038 @@ -4478,7 +4110,7 @@ _080992BA: movs r6, 0 cmp r6, r7 bcs _080992FA - ldr r0, _08099308 @ =gUnknown_083B6DB4 + ldr r0, _08099308 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809930C @ =0x00001038 adds r3, r0, r1 @@ -4508,7 +4140,7 @@ _080992FA: pop {r0} bx r0 .align 2, 0 -_08099308: .4byte gUnknown_083B6DB4 +_08099308: .4byte gPokemonStorageSystemPtr _0809930C: .4byte 0x00001038 thumb_func_end sub_8099200 @@ -4517,7 +4149,7 @@ sub_8099310: @ 8099310 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08099368 @ =gUnknown_083B6DB4 + ldr r0, _08099368 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r0, _0809936C @ =0x00001171 adds r1, r2, r0 @@ -4561,21 +4193,21 @@ _08099354: pop {r0} bx r0 .align 2, 0 -_08099368: .4byte gUnknown_083B6DB4 +_08099368: .4byte gPokemonStorageSystemPtr _0809936C: .4byte 0x00001171 _08099370: .4byte 0x00001038 thumb_func_end sub_8099310 thumb_func_start sub_8099374 sub_8099374: @ 8099374 - ldr r0, _08099380 @ =gUnknown_083B6DB4 + ldr r0, _08099380 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08099384 @ =0x00001171 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08099380: .4byte gUnknown_083B6DB4 +_08099380: .4byte gPokemonStorageSystemPtr _08099384: .4byte 0x00001171 thumb_func_end sub_8099374 @@ -4689,7 +4321,7 @@ _08099446: strh r0, [r3, 0x22] ldr r0, _08099470 @ =SpriteCallbackDummy str r0, [r3, 0x1C] - ldr r0, _08099474 @ =gUnknown_083B6DB4 + ldr r0, _08099474 @ =gPokemonStorageSystemPtr ldr r2, [r0] movs r0, 0x30 ldrsh r1, [r3, r0] @@ -4709,7 +4341,7 @@ _08099468: bx r0 .align 2, 0 _08099470: .4byte SpriteCallbackDummy -_08099474: .4byte gUnknown_083B6DB4 +_08099474: .4byte gPokemonStorageSystemPtr _08099478: .4byte 0x00001038 _0809947C: .4byte 0x00001171 thumb_func_end sub_80993F4 @@ -4717,7 +4349,7 @@ _0809947C: .4byte 0x00001171 thumb_func_start sub_8099480 sub_8099480: @ 8099480 push {r4,lr} - ldr r0, _080994A0 @ =gUnknown_083B6DB4 + ldr r0, _080994A0 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _080994A4 @ =0x00001034 adds r4, r0, r1 @@ -4732,7 +4364,7 @@ _08099498: pop {r0} bx r0 .align 2, 0 -_080994A0: .4byte gUnknown_083B6DB4 +_080994A0: .4byte gPokemonStorageSystemPtr _080994A4: .4byte 0x00001034 thumb_func_end sub_8099480 @@ -4740,7 +4372,7 @@ _080994A4: .4byte 0x00001034 sub_80994A8: @ 80994A8 push {r4-r6,lr} movs r3, 0 - ldr r1, _080994FC @ =gUnknown_083B6DB4 + ldr r1, _080994FC @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _08099500 @ =0x00001038 adds r5, r1, r2 @@ -4782,7 +4414,7 @@ _080994BC: strb r1, [r0] b _0809950E .align 2, 0 -_080994FC: .4byte gUnknown_083B6DB4 +_080994FC: .4byte gPokemonStorageSystemPtr _08099500: .4byte 0x00001038 _08099504: adds r2, 0x3E @@ -4805,7 +4437,7 @@ _0809950E: sub_8099520: @ 8099520 push {r4,lr} lsls r0, 24 - ldr r1, _08099544 @ =gUnknown_083B6DB4 + ldr r1, _08099544 @ =gPokemonStorageSystemPtr ldr r1, [r1] lsrs r0, 22 ldr r2, _08099548 @ =0x00001038 @@ -4822,7 +4454,7 @@ _0809953E: pop {r0} bx r0 .align 2, 0 -_08099544: .4byte gUnknown_083B6DB4 +_08099544: .4byte gPokemonStorageSystemPtr _08099548: .4byte 0x00001038 thumb_func_end sub_8099520 @@ -4830,7 +4462,7 @@ _08099548: .4byte 0x00001038 sub_809954C: @ 809954C push {r4-r6,lr} movs r5, 0 - ldr r0, _0809957C @ =gUnknown_083B6DB4 + ldr r0, _0809957C @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08099580 @ =0x00001038 adds r6, r0, r1 @@ -4853,7 +4485,7 @@ _0809956A: pop {r0} bx r0 .align 2, 0 -_0809957C: .4byte gUnknown_083B6DB4 +_0809957C: .4byte gPokemonStorageSystemPtr _08099580: .4byte 0x00001038 thumb_func_end sub_809954C @@ -4867,7 +4499,7 @@ sub_8099584: @ 8099584 adds r5, r1, 0 cmp r4, 0 bne _080995B4 - ldr r3, _080995AC @ =gUnknown_083B6DB4 + ldr r3, _080995AC @ =gPokemonStorageSystemPtr ldr r0, [r3] ldr r5, _080995B0 @ =0x00001034 adds r2, r0, r5 @@ -4880,12 +4512,12 @@ sub_8099584: @ 8099584 str r4, [r0] b _080995D0 .align 2, 0 -_080995AC: .4byte gUnknown_083B6DB4 +_080995AC: .4byte gPokemonStorageSystemPtr _080995B0: .4byte 0x00001034 _080995B4: cmp r4, 0x1 bne _080995F4 - ldr r3, _080995FC @ =gUnknown_083B6DB4 + ldr r3, _080995FC @ =gPokemonStorageSystemPtr ldr r0, [r3] ldr r1, _08099600 @ =0x00001034 adds r2, r0, r1 @@ -4921,7 +4553,7 @@ _080995F4: pop {r0} bx r0 .align 2, 0 -_080995FC: .4byte gUnknown_083B6DB4 +_080995FC: .4byte gPokemonStorageSystemPtr _08099600: .4byte 0x00001034 _08099604: .4byte 0x00001050 _08099608: .4byte sub_80999C4 @@ -4936,7 +4568,7 @@ sub_809960C: @ 809960C lsrs r6, r1, 24 cmp r0, 0xE bne _08099654 - ldr r4, _08099648 @ =gUnknown_083B6DB4 + ldr r4, _08099648 @ =gPokemonStorageSystemPtr ldr r0, [r4] lsls r1, r6, 2 ldr r2, _0809964C @ =0x00001038 @@ -4959,11 +4591,11 @@ sub_809960C: @ 809960C strb r1, [r0] b _0809968A .align 2, 0 -_08099648: .4byte gUnknown_083B6DB4 +_08099648: .4byte gPokemonStorageSystemPtr _0809964C: .4byte 0x00001038 _08099650: .4byte 0x00001034 _08099654: - ldr r5, _080996A0 @ =gUnknown_083B6DB4 + ldr r5, _080996A0 @ =gPokemonStorageSystemPtr ldr r0, [r5] lsls r1, r6, 2 ldr r2, _080996A4 @ =0x00001050 @@ -5002,7 +4634,7 @@ _0809968A: pop {r0} bx r0 .align 2, 0 -_080996A0: .4byte gUnknown_083B6DB4 +_080996A0: .4byte gPokemonStorageSystemPtr _080996A4: .4byte 0x00001050 _080996A8: .4byte 0x00001034 _080996AC: .4byte SpriteCallbackDummy @@ -5017,7 +4649,7 @@ sub_80996B0: @ 80996B0 lsrs r4, r1, 24 cmp r0, 0xE bne _080996D8 - ldr r3, _080996CC @ =gUnknown_083B6DB4 + ldr r3, _080996CC @ =gPokemonStorageSystemPtr ldr r1, [r3] ldr r0, _080996D0 @ =0x000010c8 adds r2, r1, r0 @@ -5025,11 +4657,11 @@ sub_80996B0: @ 80996B0 ldr r4, _080996D4 @ =0x00001038 b _080996E4 .align 2, 0 -_080996CC: .4byte gUnknown_083B6DB4 +_080996CC: .4byte gPokemonStorageSystemPtr _080996D0: .4byte 0x000010c8 _080996D4: .4byte 0x00001038 _080996D8: - ldr r3, _08099704 @ =gUnknown_083B6DB4 + ldr r3, _08099704 @ =gPokemonStorageSystemPtr ldr r1, [r3] ldr r0, _08099708 @ =0x000010c8 adds r2, r1, r0 @@ -5053,7 +4685,7 @@ _080996E4: pop {r0} bx r0 .align 2, 0 -_08099704: .4byte gUnknown_083B6DB4 +_08099704: .4byte gPokemonStorageSystemPtr _08099708: .4byte 0x000010c8 _0809970C: .4byte 0x00001050 _08099710: .4byte 0x00001034 @@ -5064,7 +4696,7 @@ _08099718: .4byte 0x00001170 thumb_func_start sub_809971C sub_809971C: @ 809971C push {r4-r7,lr} - ldr r0, _08099730 @ =gUnknown_083B6DB4 + ldr r0, _08099730 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r0, _08099734 @ =0x00001170 adds r7, r2, r0 @@ -5074,7 +4706,7 @@ sub_809971C: @ 809971C movs r0, 0 b _08099800 .align 2, 0 -_08099730: .4byte gUnknown_083B6DB4 +_08099730: .4byte gPokemonStorageSystemPtr _08099734: .4byte 0x00001170 _08099738: adds r0, 0x1 @@ -5214,7 +4846,7 @@ _08099836: beq _0809987C b _080998C0 _0809983C: - ldr r3, _0809984C @ =gUnknown_083B6DB4 + ldr r3, _0809984C @ =gPokemonStorageSystemPtr ldr r1, [r3] ldr r0, _08099850 @ =0x000010cc adds r2, r1, r0 @@ -5222,11 +4854,11 @@ _0809983C: ldr r4, _08099854 @ =0x00001038 b _08099864 .align 2, 0 -_0809984C: .4byte gUnknown_083B6DB4 +_0809984C: .4byte gPokemonStorageSystemPtr _08099850: .4byte 0x000010cc _08099854: .4byte 0x00001038 _08099858: - ldr r3, _08099870 @ =gUnknown_083B6DB4 + ldr r3, _08099870 @ =gPokemonStorageSystemPtr ldr r1, [r3] ldr r0, _08099874 @ =0x000010cc adds r2, r1, r0 @@ -5239,11 +4871,11 @@ _08099864: adds r0, r3, 0 b _0809988A .align 2, 0 -_08099870: .4byte gUnknown_083B6DB4 +_08099870: .4byte gPokemonStorageSystemPtr _08099874: .4byte 0x000010cc _08099878: .4byte 0x00001050 _0809987C: - ldr r0, _080998C8 @ =gUnknown_083B6DB4 + ldr r0, _080998C8 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r3, _080998CC @ =0x000010cc adds r2, r1, r3 @@ -5281,7 +4913,7 @@ _080998C0: pop {r0} bx r0 .align 2, 0 -_080998C8: .4byte gUnknown_083B6DB4 +_080998C8: .4byte gPokemonStorageSystemPtr _080998CC: .4byte 0x000010cc _080998D0: .4byte 0x00001034 _080998D4: .4byte gSpriteAffineAnimTable_83B6F5C @@ -5290,7 +4922,7 @@ _080998D4: .4byte gSpriteAffineAnimTable_83B6F5C thumb_func_start sub_80998D8 sub_80998D8: @ 80998D8 push {lr} - ldr r0, _080998FC @ =gUnknown_083B6DB4 + ldr r0, _080998FC @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08099900 @ =0x000010cc adds r0, r1 @@ -5309,7 +4941,7 @@ _080998F8: movs r0, 0 b _0809991A .align 2, 0 -_080998FC: .4byte gUnknown_083B6DB4 +_080998FC: .4byte gPokemonStorageSystemPtr _08099900: .4byte 0x000010cc _08099904: adds r0, r1, 0 @@ -5332,7 +4964,7 @@ _0809991A: thumb_func_start sub_8099920 sub_8099920: @ 8099920 push {r4,lr} - ldr r0, _08099950 @ =gUnknown_083B6DB4 + ldr r0, _08099950 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08099954 @ =0x000010cc adds r4, r0, r1 @@ -5355,14 +4987,14 @@ _0809994A: pop {r0} bx r0 .align 2, 0 -_08099950: .4byte gUnknown_083B6DB4 +_08099950: .4byte gPokemonStorageSystemPtr _08099954: .4byte 0x000010cc thumb_func_end sub_8099920 thumb_func_start sub_8099958 sub_8099958: @ 8099958 push {lr} - ldr r0, _08099988 @ =gUnknown_083B6DB4 + ldr r0, _08099988 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809998C @ =0x000010cc adds r3, r0, r1 @@ -5385,14 +5017,14 @@ _08099982: pop {r0} bx r0 .align 2, 0 -_08099988: .4byte gUnknown_083B6DB4 +_08099988: .4byte gPokemonStorageSystemPtr _0809998C: .4byte 0x000010cc thumb_func_end sub_8099958 thumb_func_start sub_8099990 sub_8099990: @ 8099990 push {lr} - ldr r0, _080999A4 @ =gUnknown_083B6DB4 + ldr r0, _080999A4 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _080999A8 @ =0x000010cc adds r2, r0, r1 @@ -5402,7 +5034,7 @@ sub_8099990: @ 8099990 movs r0, 0 b _080999C0 .align 2, 0 -_080999A4: .4byte gUnknown_083B6DB4 +_080999A4: .4byte gPokemonStorageSystemPtr _080999A8: .4byte 0x000010cc _080999AC: ldr r0, [r0] @@ -5423,7 +5055,7 @@ _080999C0: thumb_func_start sub_80999C4 sub_80999C4: @ 80999C4 - ldr r1, _080999E4 @ =gUnknown_083B6DB4 + ldr r1, _080999E4 @ =gPokemonStorageSystemPtr ldr r1, [r1] movs r2, 0x8E lsls r2, 5 @@ -5439,7 +5071,7 @@ sub_80999C4: @ 80999C4 strh r1, [r0, 0x22] bx lr .align 2, 0 -_080999E4: .4byte gUnknown_083B6DB4 +_080999E4: .4byte gPokemonStorageSystemPtr thumb_func_end sub_80999C4 thumb_func_start sub_80999E8 @@ -5448,7 +5080,7 @@ sub_80999E8: @ 80999E8 lsls r0, 16 lsrs r3, r0, 16 movs r4, 0 - ldr r1, _08099A58 @ =gUnknown_083B6DB4 + ldr r1, _08099A58 @ =gPokemonStorageSystemPtr ldr r0, [r1] movs r2, 0x89 lsls r2, 5 @@ -5504,7 +5136,7 @@ _08099A4E: ldr r0, _08099A5C @ =0x0000ffff b _08099A94 .align 2, 0 -_08099A58: .4byte gUnknown_083B6DB4 +_08099A58: .4byte gPokemonStorageSystemPtr _08099A5C: .4byte 0x0000ffff _08099A60: ldr r1, [r2] @@ -5549,7 +5181,7 @@ sub_8099AAC: @ 8099AAC lsls r0, 16 lsrs r6, r0, 16 movs r3, 0 - ldr r0, _08099AE4 @ =gUnknown_083B6DB4 + ldr r0, _08099AE4 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x89 lsls r1, 5 @@ -5574,7 +5206,7 @@ _08099AC6: strh r0, [r2] b _08099AF6 .align 2, 0 -_08099AE4: .4byte gUnknown_083B6DB4 +_08099AE4: .4byte gPokemonStorageSystemPtr _08099AE8: .4byte 0x0000ffff _08099AEC: adds r0, r3, 0x1 @@ -5718,7 +5350,7 @@ sub_8099BF8: @ 8099BF8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08099C50 @ =gUnknown_083B6DB4 + ldr r0, _08099C50 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08099C54 @ =0x000008ba adds r2, r0, r1 @@ -5753,7 +5385,7 @@ sub_8099BF8: @ 8099BF8 pop {r0} bx r0 .align 2, 0 -_08099C50: .4byte gUnknown_083B6DB4 +_08099C50: .4byte gPokemonStorageSystemPtr _08099C54: .4byte 0x000008ba _08099C58: .4byte 0x000008b4 _08099C5C: .4byte 0x040000d4 @@ -5775,7 +5407,7 @@ sub_8099C70: @ 8099C70 adds r0, r5, 0 adds r1, r4, 0 bl sub_8099EB0 - ldr r0, _08099D10 @ =gUnknown_083B6DB4 + ldr r0, _08099D10 @ =gPokemonStorageSystemPtr ldr r2, [r0] lsls r0, r4, 1 adds r0, r4 @@ -5843,7 +5475,7 @@ _08099CD6: pop {r0} bx r0 .align 2, 0 -_08099D10: .4byte gUnknown_083B6DB4 +_08099D10: .4byte gPokemonStorageSystemPtr _08099D14: .4byte 0x000008b6 _08099D18: .4byte 0x000008b8 _08099D1C: .4byte 0x000008bb @@ -5860,7 +5492,7 @@ sub_8099D34: @ 8099D34 bl sub_80990AC lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08099D78 @ =gUnknown_083B6DB4 + ldr r0, _08099D78 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r0, _08099D7C @ =0x000008b8 adds r3, r1, r0 @@ -5889,7 +5521,7 @@ _08099D74: movs r0, 0x1 b _08099D8A .align 2, 0 -_08099D78: .4byte gUnknown_083B6DB4 +_08099D78: .4byte gPokemonStorageSystemPtr _08099D7C: .4byte 0x000008b8 _08099D80: .4byte 0x000008b4 _08099D84: .4byte 0x000001ff @@ -5952,7 +5584,7 @@ sub_8099DCC: @ 8099DCC adds r0, r1 movs r1, 0 strb r4, [r0] - ldr r0, _08099E00 @ =gUnknown_083B6DB4 + ldr r0, _08099E00 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r2, _08099E04 @ =0x00001032 adds r0, r2 @@ -5963,7 +5595,7 @@ sub_8099DCC: @ 8099DCC .align 2, 0 _08099DF8: .4byte gPokemonStorage _08099DFC: .4byte 0x000083c2 -_08099E00: .4byte gUnknown_083B6DB4 +_08099E00: .4byte gPokemonStorageSystemPtr _08099E04: .4byte 0x00001032 thumb_func_end sub_8099DCC @@ -5971,7 +5603,7 @@ _08099E04: .4byte 0x00001032 sub_8099E08: @ 8099E08 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _08099E24 @ =gUnknown_083B6DB4 + ldr r0, _08099E24 @ =gPokemonStorageSystemPtr ldr r5, [r0] ldr r0, _08099E28 @ =0x00001032 adds r4, r5, r0 @@ -5984,7 +5616,7 @@ sub_8099E08: @ 8099E08 beq _08099E36 b _08099EA6 .align 2, 0 -_08099E24: .4byte gUnknown_083B6DB4 +_08099E24: .4byte gPokemonStorageSystemPtr _08099E28: .4byte 0x00001032 _08099E2C: cmp r0, 0x2 @@ -6061,7 +5693,7 @@ sub_8099EB0: @ 8099EB0 lsrs r7, r1, 24 cmp r1, 0 beq _08099ED8 - ldr r0, _08099F38 @ =gUnknown_083B6DB4 + ldr r0, _08099F38 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r2, 0 ldr r3, _08099F3C @ =0x000008ba @@ -6084,7 +5716,7 @@ _08099ED8: ldr r0, _08099F4C @ =gWallpaperTable adds r4, r0 ldr r0, [r4, 0xC] - ldr r1, _08099F38 @ =gUnknown_083B6DB4 + ldr r1, _08099F38 @ =gPokemonStorageSystemPtr ldr r5, [r1] ldr r2, _08099F3C @ =0x000008ba adds r6, r5, r2 @@ -6119,7 +5751,7 @@ _08099ED8: pop {r0} bx r0 .align 2, 0 -_08099F38: .4byte gUnknown_083B6DB4 +_08099F38: .4byte gPokemonStorageSystemPtr _08099F3C: .4byte 0x000008ba _08099F40: .4byte 0x0600d000 _08099F44: .4byte gPokemonStorage @@ -6150,7 +5782,7 @@ sub_8099F58: @ 8099F58 lsls r0, 28 lsrs r0, 16 str r0, [sp, 0x4] - ldr r0, _08099FB8 @ =gUnknown_083B6DB4 + ldr r0, _08099FB8 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _08099FBC @ =0x000008b4 adds r0, r1 @@ -6179,7 +5811,7 @@ sub_8099F58: @ 8099F58 movs r7, 0 b _0809A020 .align 2, 0 -_08099FB8: .4byte gUnknown_083B6DB4 +_08099FB8: .4byte gPokemonStorageSystemPtr _08099FBC: .4byte 0x000008b4 _08099FC0: cmp r2, 0x1F @@ -6402,7 +6034,7 @@ _0809A13A: sub_809A14C: @ 809A14C push {r4-r6,lr} adds r2, r0, 0 - ldr r0, _0809A174 @ =gUnknown_083B6DB4 + ldr r0, _0809A174 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809A178 @ =0x000008b4 adds r0, r1 @@ -6421,7 +6053,7 @@ sub_809A14C: @ 809A14C adds r0, r6 b _0809A184 .align 2, 0 -_0809A174: .4byte gUnknown_083B6DB4 +_0809A174: .4byte gPokemonStorageSystemPtr _0809A178: .4byte 0x000008b4 _0809A17C: lsls r0, 1 @@ -6537,7 +6169,7 @@ sub_809A23C: @ 809A23C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0809A384 @ =gUnknown_083B6DB4 + ldr r0, _0809A384 @ =gPokemonStorageSystemPtr ldr r5, [r0] ldr r1, _0809A388 @ =0x000008ca adds r7, r5, r1 @@ -6649,7 +6281,7 @@ _0809A328: adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0809A384 @ =gUnknown_083B6DB4 + ldr r0, _0809A384 @ =gPokemonStorageSystemPtr ldr r5, [r0] lsls r0, r4, 2 movs r3, 0xCF @@ -6683,7 +6315,7 @@ _0809A328: pop {r0} bx r0 .align 2, 0 -_0809A384: .4byte gUnknown_083B6DB4 +_0809A384: .4byte gPokemonStorageSystemPtr _0809A388: .4byte 0x000008ca _0809A38C: .4byte 0x00030200 _0809A390: .4byte 0x00000ccc @@ -6718,7 +6350,7 @@ sub_809A3D0: @ 809A3D0 lsls r1, 24 lsrs r1, 24 mov r10, r1 - ldr r3, _0809A43C @ =gUnknown_083B6DB4 + ldr r3, _0809A43C @ =gPokemonStorageSystemPtr ldr r5, [r3] ldr r1, _0809A440 @ =0x000008ca adds r0, r5, r1 @@ -6761,7 +6393,7 @@ _0809A41E: mov r8, r0 b _0809A478 .align 2, 0 -_0809A43C: .4byte gUnknown_083B6DB4 +_0809A43C: .4byte gPokemonStorageSystemPtr _0809A440: .4byte 0x000008ca _0809A444: .4byte 0x0000ffff _0809A448: .4byte 0x00030200 @@ -6847,7 +6479,7 @@ _0809A4DE: bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r1, _0809A584 @ =gUnknown_083B6DB4 + ldr r1, _0809A584 @ =gPokemonStorageSystemPtr ldr r4, [r1] lsls r6, r7, 2 ldr r1, _0809A588 @ =0x00000cf8 @@ -6910,7 +6542,7 @@ _0809A574: .4byte 0x0000dac9 _0809A578: .4byte 0x000008ca _0809A57C: .4byte gPokemonStorage + 0x8344 _0809A580: .4byte gUnknown_083BB0A8 -_0809A584: .4byte gUnknown_083B6DB4 +_0809A584: .4byte gPokemonStorageSystemPtr _0809A588: .4byte 0x00000cf8 _0809A58C: .4byte gSprites _0809A590: .4byte sub_809A5E8 @@ -6920,7 +6552,7 @@ _0809A594: .4byte sub_809A61C thumb_func_start sub_809A598 sub_809A598: @ 809A598 push {lr} - ldr r0, _0809A5B0 @ =gUnknown_083B6DB4 + ldr r0, _0809A5B0 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809A5B4 @ =0x00000cca adds r0, r1 @@ -6931,13 +6563,13 @@ sub_809A598: @ 809A598 bl FreeSpriteTilesByTag b _0809A5BE .align 2, 0 -_0809A5B0: .4byte gUnknown_083B6DB4 +_0809A5B0: .4byte gPokemonStorageSystemPtr _0809A5B4: .4byte 0x00000cca _0809A5B8: movs r0, 0x3 bl FreeSpriteTilesByTag _0809A5BE: - ldr r0, _0809A5E0 @ =gUnknown_083B6DB4 + ldr r0, _0809A5E0 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r3, 0xCF lsls r3, 4 @@ -6955,7 +6587,7 @@ _0809A5BE: pop {r0} bx r0 .align 2, 0 -_0809A5E0: .4byte gUnknown_083B6DB4 +_0809A5E0: .4byte gPokemonStorageSystemPtr _0809A5E4: .4byte 0x00000cf4 thumb_func_end sub_809A598 @@ -7034,7 +6666,7 @@ sub_809A654: @ 809A654 adds r1, r2 adds r0, r1 ldrb r1, [r0] - ldr r0, _0809A698 @ =gUnknown_083B6DB4 + ldr r0, _0809A698 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r3, _0809A69C @ =0x00000cca adds r0, r2, r3 @@ -7056,7 +6688,7 @@ sub_809A654: @ 809A654 .align 2, 0 _0809A690: .4byte gPokemonStorage _0809A694: .4byte 0x000083c2 -_0809A698: .4byte gUnknown_083B6DB4 +_0809A698: .4byte gPokemonStorageSystemPtr _0809A69C: .4byte 0x00000cca _0809A6A0: .4byte gUnknown_083BB0A8 _0809A6A4: .4byte gPlttBufferUnfaded @@ -7132,7 +6764,7 @@ _0809A6EC: adds r0, r1, 0 _0809A72C: strh r0, [r4, 0x34] - ldr r0, _0809A770 @ =gUnknown_083B6DB4 + ldr r0, _0809A770 @ =gPokemonStorageSystemPtr ldr r0, [r0] lsls r1, r5, 2 movs r2, 0xD0 @@ -7161,7 +6793,7 @@ _0809A760: .4byte gUnknown_083BB288 _0809A764: .4byte gUnknown_083BB290 _0809A768: .4byte gSpriteTemplate_83BB2F0 _0809A76C: .4byte gSprites -_0809A770: .4byte gUnknown_083B6DB4 +_0809A770: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809A6DC thumb_func_start sub_809A774 @@ -7170,7 +6802,7 @@ sub_809A774: @ 809A774 lsls r0, 24 lsrs r6, r0, 24 movs r2, 0 - ldr r7, _0809A7C4 @ =gUnknown_083B6DB4 + ldr r7, _0809A7C4 @ =gPokemonStorageSystemPtr ldr r0, [r7] movs r1, 0xD0 lsls r1, 4 @@ -7208,7 +6840,7 @@ _0809A78A: movs r2, 0x48 b _0809A7E8 .align 2, 0 -_0809A7C4: .4byte gUnknown_083B6DB4 +_0809A7C4: .4byte gPokemonStorageSystemPtr _0809A7C8: .4byte 0x00000d04 _0809A7CC: ldr r1, [r7] @@ -7252,7 +6884,7 @@ _0809A80C: .4byte 0x00000d04 sub_809A810: @ 809A810 push {r4-r6,lr} movs r3, 0 - ldr r0, _0809A85C @ =gUnknown_083B6DB4 + ldr r0, _0809A85C @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0xD0 lsls r1, 4 @@ -7288,7 +6920,7 @@ _0809A824: pop {r0} bx r0 .align 2, 0 -_0809A85C: .4byte gUnknown_083B6DB4 +_0809A85C: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809A810 thumb_func_start sub_809A860 @@ -7298,7 +6930,7 @@ sub_809A860: @ 809A860 cmp r0, 0 beq _0809A89C movs r2, 0 - ldr r0, _0809A898 @ =gUnknown_083B6DB4 + ldr r0, _0809A898 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0xD0 lsls r1, 4 @@ -7323,10 +6955,10 @@ _0809A878: bls _0809A878 b _0809A8BC .align 2, 0 -_0809A898: .4byte gUnknown_083B6DB4 +_0809A898: .4byte gPokemonStorageSystemPtr _0809A89C: movs r2, 0 - ldr r0, _0809A8C4 @ =gUnknown_083B6DB4 + ldr r0, _0809A8C4 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r3, 0xD0 lsls r3, 4 @@ -7347,7 +6979,7 @@ _0809A8BC: pop {r0} bx r0 .align 2, 0 -_0809A8C4: .4byte gUnknown_083B6DB4 +_0809A8C4: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809A860 thumb_func_start sub_809A8C8 @@ -7405,7 +7037,7 @@ _0809A92C: strh r0, [r2, 0x2E] b _0809A994 _0809A932: - ldr r0, _0809A97C @ =gUnknown_083B6DB4 + ldr r0, _0809A97C @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r0, _0809A980 @ =0x000008b6 adds r1, r0 @@ -7444,10 +7076,10 @@ _0809A958: strh r0, [r2, 0x2E] b _0809A994 .align 2, 0 -_0809A97C: .4byte gUnknown_083B6DB4 +_0809A97C: .4byte gPokemonStorageSystemPtr _0809A980: .4byte 0x000008b6 _0809A984: - ldr r0, _0809A998 @ =gUnknown_083B6DB4 + ldr r0, _0809A998 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809A99C @ =0x000008b6 adds r0, r1 @@ -7459,7 +7091,7 @@ _0809A994: pop {r0} bx r0 .align 2, 0 -_0809A998: .4byte gUnknown_083B6DB4 +_0809A998: .4byte gPokemonStorageSystemPtr _0809A99C: .4byte 0x000008b6 thumb_func_end sub_809A8C8 @@ -7533,7 +7165,7 @@ _0809AA1A: thumb_func_start sub_809AA24 sub_809AA24: @ 809AA24 push {lr} - ldr r0, _0809AA38 @ =gUnknown_083B6DB4 + ldr r0, _0809AA38 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldrb r1, [r0, 0x5] cmp r1, 0x1 @@ -7543,7 +7175,7 @@ sub_809AA24: @ 809AA24 strb r0, [r1] b _0809AA44 .align 2, 0 -_0809AA38: .4byte gUnknown_083B6DB4 +_0809AA38: .4byte gPokemonStorageSystemPtr _0809AA3C: .4byte gUnknown_020384E4 _0809AA40: ldr r0, _0809AA78 @ =gUnknown_020384E4 @@ -7562,7 +7194,7 @@ _0809AA44: strb r1, [r0] bl sub_809B0D4 bl sub_809CC04 - ldr r0, _0809AA90 @ =gUnknown_083B6DB4 + ldr r0, _0809AA90 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809AA94 @ =0x000011e2 adds r0, r1 @@ -7578,7 +7210,7 @@ _0809AA80: .4byte gUnknown_020384E6 _0809AA84: .4byte gUnknown_020384E7 _0809AA88: .4byte gUnknown_020384E8 _0809AA8C: .4byte gUnknown_020384E9 -_0809AA90: .4byte gUnknown_083B6DB4 +_0809AA90: .4byte gPokemonStorageSystemPtr _0809AA94: .4byte 0x000011e2 thumb_func_end sub_809AA24 @@ -7587,7 +7219,7 @@ sub_809AA98: @ 809AA98 push {lr} bl sub_809CC04 bl sub_809C028 - ldr r0, _0809AAC0 @ =gUnknown_083B6DB4 + ldr r0, _0809AAC0 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809AAC4 @ =0x000011e2 adds r0, r1 @@ -7602,7 +7234,7 @@ _0809AABA: pop {r0} bx r0 .align 2, 0 -_0809AAC0: .4byte gUnknown_083B6DB4 +_0809AAC0: .4byte gPokemonStorageSystemPtr _0809AAC4: .4byte 0x000011e2 _0809AAC8: .4byte gUnknown_020384E6 thumb_func_end sub_809AA98 @@ -7772,7 +7404,7 @@ _0809ABFA: thumb_func_start sub_809AC00 sub_809AC00: @ 809AC00 push {r4-r6,lr} - ldr r0, _0809AC14 @ =gUnknown_083B6DB4 + ldr r0, _0809AC14 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r0, _0809AC18 @ =0x000011dc adds r1, r4, r0 @@ -7782,7 +7414,7 @@ sub_809AC00: @ 809AC00 movs r0, 0 b _0809AD2C .align 2, 0 -_0809AC14: .4byte gUnknown_083B6DB4 +_0809AC14: .4byte gPokemonStorageSystemPtr _0809AC18: .4byte 0x000011dc _0809AC1C: subs r0, 0x1 @@ -7947,7 +7579,7 @@ sub_809AD3C: @ 809AD3C mov r2, sp adds r3, r6, 0 bl sub_809AACC - ldr r0, _0809AD88 @ =gUnknown_083B6DB4 + ldr r0, _0809AD88 @ =gPokemonStorageSystemPtr ldr r1, [r0] movs r2, 0x8F lsls r2, 5 @@ -7970,7 +7602,7 @@ sub_809AD3C: @ 809AD3C pop {r0} bx r0 .align 2, 0 -_0809AD88: .4byte gUnknown_083B6DB4 +_0809AD88: .4byte gPokemonStorageSystemPtr _0809AD8C: .4byte 0x000011e1 _0809AD90: .4byte 0x000011da thumb_func_end sub_809AD3C @@ -7978,7 +7610,7 @@ _0809AD90: .4byte 0x000011da thumb_func_start sub_809AD94 sub_809AD94: @ 809AD94 push {r4-r7,lr} - ldr r0, _0809ADB0 @ =gUnknown_083B6DB4 + ldr r0, _0809ADB0 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r3, _0809ADB4 @ =0x000011de adds r1, r2, r3 @@ -7991,7 +7623,7 @@ sub_809AD94: @ 809AD94 movs r0, 0xC b _0809ADC2 .align 2, 0 -_0809ADB0: .4byte gUnknown_083B6DB4 +_0809ADB0: .4byte gPokemonStorageSystemPtr _0809ADB4: .4byte 0x000011de _0809ADB8: .4byte 0x000011dc _0809ADBC: @@ -8181,7 +7813,7 @@ sub_809AF18: @ 809AF18 ldrb r0, [r0] cmp r0, 0 bne _0809AF46 - ldr r0, _0809AFA8 @ =gUnknown_083B6DB4 + ldr r0, _0809AFA8 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x8E lsls r1, 5 @@ -8198,7 +7830,7 @@ _0809AF46: asrs r0, 24 cmp r0, 0x1 beq _0809AF70 - ldr r0, _0809AFA8 @ =gUnknown_083B6DB4 + ldr r0, _0809AFA8 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r2, _0809AFB0 @ =0x000011e2 adds r1, r0, r2 @@ -8218,7 +7850,7 @@ _0809AF70: blt _0809AF9E cmp r4, 0x3 bgt _0809AF9E - ldr r0, _0809AFA8 @ =gUnknown_083B6DB4 + ldr r0, _0809AFA8 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r0, _0809AFB4 @ =0x000011c4 adds r2, r0 @@ -8241,7 +7873,7 @@ _0809AF9E: bx r0 .align 2, 0 _0809AFA4: .4byte gUnknown_020384E6 -_0809AFA8: .4byte gUnknown_083B6DB4 +_0809AFA8: .4byte gPokemonStorageSystemPtr _0809AFAC: .4byte gUnknown_020384E4 _0809AFB0: .4byte 0x000011e2 _0809AFB4: .4byte 0x000011c4 @@ -8251,7 +7883,7 @@ _0809AFB4: .4byte 0x000011c4 sub_809AFB8: @ 809AFB8 push {r4,r5,lr} ldr r5, _0809B000 @ =gUnknown_020384E4 - ldr r0, _0809B004 @ =gUnknown_083B6DB4 + ldr r0, _0809B004 @ =gPokemonStorageSystemPtr ldr r4, [r0] movs r1, 0x8F lsls r1, 5 @@ -8286,7 +7918,7 @@ _0809AFEA: b _0809B05E .align 2, 0 _0809B000: .4byte gUnknown_020384E4 -_0809B004: .4byte gUnknown_083B6DB4 +_0809B004: .4byte gPokemonStorageSystemPtr _0809B008: .4byte gUnknown_020384E5 _0809B00C: .4byte 0x000011e1 _0809B010: .4byte gUnknown_020384E6 @@ -8355,7 +7987,7 @@ _0809B07C: bls _0809B08A movs r3, 0x5 _0809B08A: - ldr r0, _0809B0B8 @ =gUnknown_083B6DB4 + ldr r0, _0809B0B8 @ =gPokemonStorageSystemPtr ldr r2, [r0] movs r1, 0x8E lsls r1, 5 @@ -8378,7 +8010,7 @@ _0809B0AA: pop {r0} bx r0 .align 2, 0 -_0809B0B8: .4byte gUnknown_083B6DB4 +_0809B0B8: .4byte gPokemonStorageSystemPtr _0809B0BC: .4byte 0x000011e3 thumb_func_end sub_809B068 @@ -8428,7 +8060,7 @@ _0809B0FC: .4byte gUnknown_020384EA thumb_func_start sub_809B100 sub_809B100: @ 809B100 lsls r0, 24 - ldr r1, _0809B120 @ =gUnknown_083B6DB4 + ldr r1, _0809B120 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _0809B124 @ =0x000012a4 adds r3, r1, r2 @@ -8443,7 +8075,7 @@ sub_809B100: @ 809B100 strb r0, [r1] bx lr .align 2, 0 -_0809B120: .4byte gUnknown_083B6DB4 +_0809B120: .4byte gPokemonStorageSystemPtr _0809B124: .4byte 0x000012a4 _0809B128: .4byte gUnknown_083BBBC8 _0809B12C: .4byte 0x000012a8 @@ -8452,7 +8084,7 @@ _0809B12C: .4byte 0x000012a8 thumb_func_start sub_809B130 sub_809B130: @ 809B130 push {lr} - ldr r0, _0809B148 @ =gUnknown_083B6DB4 + ldr r0, _0809B148 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809B14C @ =0x000012a4 adds r0, r1 @@ -8463,14 +8095,14 @@ sub_809B130: @ 809B130 pop {r1} bx r1 .align 2, 0 -_0809B148: .4byte gUnknown_083B6DB4 +_0809B148: .4byte gPokemonStorageSystemPtr _0809B14C: .4byte 0x000012a4 thumb_func_end sub_809B130 thumb_func_start sub_809B150 sub_809B150: @ 809B150 push {r4,r5,lr} - ldr r0, _0809B16C @ =gUnknown_083B6DB4 + ldr r0, _0809B16C @ =gPokemonStorageSystemPtr ldr r5, [r0] ldr r0, _0809B170 @ =0x000012a8 adds r4, r5, r0 @@ -8483,7 +8115,7 @@ sub_809B150: @ 809B150 beq _0809B17E b _0809B1CE .align 2, 0 -_0809B16C: .4byte gUnknown_083B6DB4 +_0809B16C: .4byte gPokemonStorageSystemPtr _0809B170: .4byte 0x000012a8 _0809B174: cmp r0, 0x2 @@ -8542,7 +8174,7 @@ _0809B1D0: thumb_func_start sub_809B1D8 sub_809B1D8: @ 809B1D8 push {r4,r5,lr} - ldr r0, _0809B1F4 @ =gUnknown_083B6DB4 + ldr r0, _0809B1F4 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r0, _0809B1F8 @ =0x000012a8 adds r5, r4, r0 @@ -8555,7 +8187,7 @@ sub_809B1D8: @ 809B1D8 beq _0809B202 b _0809B244 .align 2, 0 -_0809B1F4: .4byte gUnknown_083B6DB4 +_0809B1F4: .4byte gPokemonStorageSystemPtr _0809B1F8: .4byte 0x000012a8 _0809B1FC: cmp r0, 0x2 @@ -8604,7 +8236,7 @@ _0809B246: thumb_func_start sub_809B24C sub_809B24C: @ 809B24C push {r4,r5,lr} - ldr r0, _0809B268 @ =gUnknown_083B6DB4 + ldr r0, _0809B268 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r0, _0809B26C @ =0x000012a8 adds r5, r4, r0 @@ -8617,7 +8249,7 @@ sub_809B24C: @ 809B24C beq _0809B276 b _0809B31C .align 2, 0 -_0809B268: .4byte gUnknown_083B6DB4 +_0809B268: .4byte gPokemonStorageSystemPtr _0809B26C: .4byte 0x000012a8 _0809B270: cmp r0, 0x2 @@ -8645,7 +8277,7 @@ _0809B298: adds r1, r4, r2 _0809B2A0: strb r0, [r1] - ldr r0, _0809B2D4 @ =gUnknown_083B6DB4 + ldr r0, _0809B2D4 @ =gPokemonStorageSystemPtr ldr r4, [r0] movs r1, 0x8E lsls r1, 5 @@ -8667,7 +8299,7 @@ _0809B2A0: b _0809B31C .align 2, 0 _0809B2D0: .4byte 0x000012a9 -_0809B2D4: .4byte gUnknown_083B6DB4 +_0809B2D4: .4byte gPokemonStorageSystemPtr _0809B2D8: .4byte gUnknown_020384E5 _0809B2DC: .4byte 0x000012a8 _0809B2E0: @@ -8708,7 +8340,7 @@ _0809B31E: thumb_func_start sub_809B324 sub_809B324: @ 809B324 push {lr} - ldr r0, _0809B348 @ =gUnknown_083B6DB4 + ldr r0, _0809B348 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x8E lsls r1, 5 @@ -8726,7 +8358,7 @@ _0809B33E: strh r0, [r1, 0x26] b _0809B350 .align 2, 0 -_0809B348: .4byte gUnknown_083B6DB4 +_0809B348: .4byte gPokemonStorageSystemPtr _0809B34C: movs r0, 0 b _0809B352 @@ -8740,7 +8372,7 @@ _0809B352: thumb_func_start sub_809B358 sub_809B358: @ 809B358 push {lr} - ldr r0, _0809B378 @ =gUnknown_083B6DB4 + ldr r0, _0809B378 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x8E lsls r1, 5 @@ -8756,7 +8388,7 @@ sub_809B358: @ 809B358 movs r0, 0x1 b _0809B37E .align 2, 0 -_0809B378: .4byte gUnknown_083B6DB4 +_0809B378: .4byte gPokemonStorageSystemPtr _0809B37C: movs r0, 0 _0809B37E: @@ -8873,7 +8505,7 @@ sub_809B44C: @ 809B44C lsrs r5, r1, 24 cmp r4, 0xE bne _0809B488 - ldr r0, _0809B478 @ =gUnknown_083B6DB4 + ldr r0, _0809B478 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809B47C @ =0x000025b4 adds r0, r1 @@ -8888,7 +8520,7 @@ sub_809B44C: @ 809B44C bl memcpy b _0809B4AA .align 2, 0 -_0809B478: .4byte gUnknown_083B6DB4 +_0809B478: .4byte gPokemonStorageSystemPtr _0809B47C: .4byte 0x000025b4 _0809B480: .4byte gPlayerParty _0809B484: .4byte gUnknown_020384E5 @@ -8904,7 +8536,7 @@ _0809B488: ldr r2, _0809B4C0 @ =gPokemonStorage + 0x4 adds r1, r2 adds r0, r1 - ldr r1, _0809B4C4 @ =gUnknown_083B6DB4 + ldr r1, _0809B4C4 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _0809B4C8 @ =0x000025b4 adds r1, r2 @@ -8922,7 +8554,7 @@ _0809B4AA: bx r0 .align 2, 0 _0809B4C0: .4byte gPokemonStorage + 0x4 -_0809B4C4: .4byte gUnknown_083B6DB4 +_0809B4C4: .4byte gPokemonStorageSystemPtr _0809B4C8: .4byte 0x000025b4 _0809B4CC: .4byte gUnknown_020384E7 _0809B4D0: .4byte gUnknown_020384E8 @@ -8941,7 +8573,7 @@ diegohint2: @ 809B4D4 movs r0, 0x64 muls r0, r5 adds r0, r1 - ldr r1, _0809B500 @ =gUnknown_083B6DB4 + ldr r1, _0809B500 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _0809B504 @ =0x000025b4 adds r1, r2 @@ -8950,10 +8582,10 @@ diegohint2: @ 809B4D4 b _0809B536 .align 2, 0 _0809B4FC: .4byte gPlayerParty -_0809B500: .4byte gUnknown_083B6DB4 +_0809B500: .4byte gPokemonStorageSystemPtr _0809B504: .4byte 0x000025b4 _0809B508: - ldr r0, _0809B53C @ =gUnknown_083B6DB4 + ldr r0, _0809B53C @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r0, _0809B540 @ =0x000025b4 adds r4, r0 @@ -8979,7 +8611,7 @@ _0809B536: pop {r0} bx r0 .align 2, 0 -_0809B53C: .4byte gUnknown_083B6DB4 +_0809B53C: .4byte gPokemonStorageSystemPtr _0809B540: .4byte 0x000025b4 _0809B544: .4byte gPokemonStorage thumb_func_end diegohint2 @@ -9030,7 +8662,7 @@ diegohint1: @ 809B58C lsrs r6, r1, 24 cmp r5, 0xE bne _0809B5C0 - ldr r0, _0809B5B4 @ =gUnknown_083B6DB4 + ldr r0, _0809B5B4 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809B5B8 @ =0x00002618 adds r0, r1 @@ -9042,7 +8674,7 @@ diegohint1: @ 809B58C bl memcpy b _0809B5E2 .align 2, 0 -_0809B5B4: .4byte gUnknown_083B6DB4 +_0809B5B4: .4byte gPokemonStorageSystemPtr _0809B5B8: .4byte 0x00002618 _0809B5BC: .4byte gPlayerParty _0809B5C0: @@ -9057,7 +8689,7 @@ _0809B5C0: ldr r2, _0809B614 @ =gPokemonStorage + 0x4 adds r1, r2 adds r0, r1 - ldr r1, _0809B618 @ =gUnknown_083B6DB4 + ldr r1, _0809B618 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _0809B61C @ =0x00002618 adds r1, r2 @@ -9066,7 +8698,7 @@ _0809B5E2: adds r0, r5, 0 adds r1, r6, 0 bl diegohint2 - ldr r0, _0809B618 @ =gUnknown_083B6DB4 + ldr r0, _0809B618 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r0, _0809B620 @ =0x000025b4 adds r4, r1, r0 @@ -9087,7 +8719,7 @@ _0809B5E2: bx r0 .align 2, 0 _0809B614: .4byte gPokemonStorage + 0x4 -_0809B618: .4byte gUnknown_083B6DB4 +_0809B618: .4byte gPokemonStorageSystemPtr _0809B61C: .4byte 0x00002618 _0809B620: .4byte 0x000025b4 _0809B624: .4byte gUnknown_020384E7 @@ -9145,7 +8777,7 @@ _0809B686: lsrs r0, r4, 24 bl sub_8098D20 _0809B698: - ldr r0, _0809B6B8 @ =gUnknown_083B6DB4 + ldr r0, _0809B6B8 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x8E lsls r1, 5 @@ -9160,13 +8792,13 @@ _0809B6AC: bx r1 .align 2, 0 _0809B6B4: .4byte gUnknown_020384E5 -_0809B6B8: .4byte gUnknown_083B6DB4 +_0809B6B8: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809B62C thumb_func_start sub_809B6BC sub_809B6BC: @ 809B6BC push {lr} - ldr r0, _0809B6D8 @ =gUnknown_083B6DB4 + ldr r0, _0809B6D8 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x8E lsls r1, 5 @@ -9178,7 +8810,7 @@ sub_809B6BC: @ 809B6BC pop {r0} bx r0 .align 2, 0 -_0809B6D8: .4byte gUnknown_083B6DB4 +_0809B6D8: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809B6BC thumb_func_start sub_809B6DC @@ -9206,7 +8838,7 @@ _0809B700: ldrb r1, [r0] adds r0, r2, 0 bl sub_809981C - ldr r0, _0809B728 @ =gUnknown_083B6DB4 + ldr r0, _0809B728 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r2, _0809B72C @ =0x000026e4 adds r0, r1, r2 @@ -9218,7 +8850,7 @@ _0809B700: .align 2, 0 _0809B720: .4byte gUnknown_020384E4 _0809B724: .4byte gUnknown_020384E5 -_0809B728: .4byte gUnknown_083B6DB4 +_0809B728: .4byte gPokemonStorageSystemPtr _0809B72C: .4byte 0x000026e4 _0809B730: .4byte 0x000011fa thumb_func_end sub_809B6DC @@ -9233,7 +8865,7 @@ sub_809B734: @ 809B734 movs r0, 0x1 b _0809B758 _0809B744: - ldr r0, _0809B75C @ =gUnknown_083B6DB4 + ldr r0, _0809B75C @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x8E lsls r1, 5 @@ -9246,7 +8878,7 @@ _0809B758: pop {r1} bx r1 .align 2, 0 -_0809B75C: .4byte gUnknown_083B6DB4 +_0809B75C: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809B734 thumb_func_start sub_809B760 @@ -9297,7 +8929,7 @@ sub_809B7AC: @ 809B7AC ldrb r0, [r0] cmp r0, 0 beq _0809B7C8 - ldr r0, _0809B7D0 @ =gUnknown_083B6DB4 + ldr r0, _0809B7D0 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r1, 0x8E lsls r1, 5 @@ -9310,7 +8942,7 @@ _0809B7C8: bx r0 .align 2, 0 _0809B7CC: .4byte gUnknown_020384E6 -_0809B7D0: .4byte gUnknown_083B6DB4 +_0809B7D0: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809B7AC thumb_func_start sub_809B7D4 @@ -9320,7 +8952,7 @@ sub_809B7D4: @ 809B7D4 ldrb r0, [r0] cmp r0, 0 beq _0809B81C - ldr r0, _0809B808 @ =gUnknown_083B6DB4 + ldr r0, _0809B808 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r1, _0809B80C @ =0x00002618 adds r0, r4, r1 @@ -9340,7 +8972,7 @@ sub_809B7D4: @ 809B7D4 b _0809B8A6 .align 2, 0 _0809B804: .4byte gUnknown_020384E6 -_0809B808: .4byte gUnknown_083B6DB4 +_0809B808: .4byte gPokemonStorageSystemPtr _0809B80C: .4byte 0x00002618 _0809B810: .4byte 0x000025b4 _0809B814: .4byte 0x00002682 @@ -9352,7 +8984,7 @@ _0809B81C: asrs r0, 24 cmp r0, 0x1 bne _0809B864 - ldr r0, _0809B850 @ =gUnknown_083B6DB4 + ldr r0, _0809B850 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r2, _0809B854 @ =0x00002618 adds r0, r4, r2 @@ -9371,7 +9003,7 @@ _0809B81C: b _0809B896 .align 2, 0 _0809B84C: .4byte gUnknown_020384E4 -_0809B850: .4byte gUnknown_083B6DB4 +_0809B850: .4byte gPokemonStorageSystemPtr _0809B854: .4byte 0x00002618 _0809B858: .4byte gPlayerParty _0809B85C: .4byte gUnknown_020384E5 @@ -9393,7 +9025,7 @@ _0809B864: adds r2, r5, 0x4 adds r1, r2 adds r0, r1 - ldr r1, _0809B904 @ =gUnknown_083B6DB4 + ldr r1, _0809B904 @ =gPokemonStorageSystemPtr ldr r4, [r1] ldr r2, _0809B908 @ =0x00002618 adds r1, r4, r2 @@ -9403,7 +9035,7 @@ _0809B864: adds r4, r1 _0809B896: strb r0, [r4] - ldr r0, _0809B904 @ =gUnknown_083B6DB4 + ldr r0, _0809B904 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809B900 @ =gUnknown_020384E5 ldrb r1, [r1] @@ -9411,7 +9043,7 @@ _0809B896: adds r0, r2 strb r1, [r0] _0809B8A6: - ldr r0, _0809B904 @ =gUnknown_083B6DB4 + ldr r0, _0809B904 @ =gPokemonStorageSystemPtr ldr r6, [r0] ldr r0, _0809B914 @ =0x0000267e adds r4, r6, r0 @@ -9456,7 +9088,7 @@ _0809B8A6: .align 2, 0 _0809B8FC: .4byte gPokemonStorage _0809B900: .4byte gUnknown_020384E5 -_0809B904: .4byte gUnknown_083B6DB4 +_0809B904: .4byte gPokemonStorageSystemPtr _0809B908: .4byte 0x00002618 _0809B90C: .4byte 0x00002682 _0809B910: .4byte 0x00002683 @@ -9476,7 +9108,7 @@ _0809B934: adds r0, r6, r2 strb r1, [r0] _0809B940: - ldr r0, _0809B958 @ =gUnknown_083B6DB4 + ldr r0, _0809B958 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809B95C @ =0x00002684 adds r0, r1 @@ -9487,7 +9119,7 @@ _0809B940: bx r0 .align 2, 0 _0809B954: .4byte 0x0000267d -_0809B958: .4byte gUnknown_083B6DB4 +_0809B958: .4byte gPokemonStorageSystemPtr _0809B95C: .4byte 0x00002684 thumb_func_end sub_809B7D4 @@ -9498,7 +9130,7 @@ sub_809B960: @ 809B960 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0809B988 @ =gUnknown_083B6DB4 + ldr r0, _0809B988 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r3, _0809B98C @ =0x0000267d adds r1, r2, r3 @@ -9513,7 +9145,7 @@ sub_809B960: @ 809B960 asrs r0, 24 b _0809BB5C .align 2, 0 -_0809B988: .4byte gUnknown_083B6DB4 +_0809B988: .4byte gPokemonStorageSystemPtr _0809B98C: .4byte 0x0000267d _0809B990: .4byte 0x0000267c _0809B994: @@ -9568,7 +9200,7 @@ _0809B9CC: _0809B9F0: movs r0, 0x2 ands r3, r0 - ldr r7, _0809BA3C @ =gUnknown_083B6DB4 + ldr r7, _0809BA3C @ =gPokemonStorageSystemPtr mov r12, r7 cmp r3, 0 beq _0809BA02 @@ -9600,7 +9232,7 @@ _0809BA2C: .4byte 0x00002683 _0809BA30: .4byte gPlayerParty _0809BA34: .4byte 0x00002686 _0809BA38: .4byte 0x0000267e -_0809BA3C: .4byte gUnknown_083B6DB4 +_0809BA3C: .4byte gPokemonStorageSystemPtr _0809BA40: .4byte 0x0000267f _0809BA44: .4byte 0x0000267d _0809BA48: .4byte 0x0000267c @@ -9708,7 +9340,7 @@ _0809BB00: strb r0, [r1] lsls r0, 24 asrs r0, 24 - ldr r7, _0809BB88 @ =gUnknown_083B6DB4 + ldr r7, _0809BB88 @ =gPokemonStorageSystemPtr mov r12, r7 cmp r0, 0x1D ble _0809BB32 @@ -9764,7 +9396,7 @@ _0809BB78: .4byte gPokemonStorage + 0x4 _0809BB7C: .4byte 0x00002686 _0809BB80: .4byte 0x00002682 _0809BB84: .4byte 0x0000267e -_0809BB88: .4byte gUnknown_083B6DB4 +_0809BB88: .4byte gPokemonStorageSystemPtr _0809BB8C: .4byte 0x0000267d thumb_func_end sub_809B960 @@ -9776,7 +9408,7 @@ sub_809BB90: @ 809BB90 cmp r0, 0 beq _0809BBAA ldr r0, _0809BBB4 @ =gUnknown_02038480 - ldr r1, _0809BBB8 @ =gUnknown_083B6DB4 + ldr r1, _0809BBB8 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _0809BBBC @ =0x000025b4 adds r1, r2 @@ -9788,7 +9420,7 @@ _0809BBAA: .align 2, 0 _0809BBB0: .4byte gUnknown_020384E6 _0809BBB4: .4byte gUnknown_02038480 -_0809BBB8: .4byte gUnknown_083B6DB4 +_0809BBB8: .4byte gPokemonStorageSystemPtr _0809BBBC: .4byte 0x000025b4 thumb_func_end sub_809BB90 @@ -9803,7 +9435,7 @@ sub_809BBC0: @ 809BBC0 ldrb r0, [r0] cmp r0, 0xE bne _0809BBF8 - ldr r0, _0809BBEC @ =gUnknown_083B6DB4 + ldr r0, _0809BBEC @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809BBF0 @ =0x000025b4 adds r0, r1 @@ -9814,11 +9446,11 @@ sub_809BBC0: @ 809BBC0 .align 2, 0 _0809BBE4: .4byte gUnknown_020384E6 _0809BBE8: .4byte gUnknown_020384E7 -_0809BBEC: .4byte gUnknown_083B6DB4 +_0809BBEC: .4byte gPokemonStorageSystemPtr _0809BBF0: .4byte 0x000025b4 _0809BBF4: .4byte gUnknown_02038480 _0809BBF8: - ldr r0, _0809BC0C @ =gUnknown_083B6DB4 + ldr r0, _0809BC0C @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809BC10 @ =0x000025b4 adds r0, r1 @@ -9829,7 +9461,7 @@ _0809BC08: pop {r0} bx r0 .align 2, 0 -_0809BC0C: .4byte gUnknown_083B6DB4 +_0809BC0C: .4byte gPokemonStorageSystemPtr _0809BC10: .4byte 0x000025b4 _0809BC14: .4byte gUnknown_02038480 thumb_func_end sub_809BBC0 @@ -9842,7 +9474,7 @@ sub_809BC18: @ 809BC18 cmp r5, 0 beq _0809BC64 bl sub_809BB90 - ldr r0, _0809BC4C @ =gUnknown_083B6DB4 + ldr r0, _0809BC4C @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r0, _0809BC50 @ =0x00002690 adds r1, r2, r0 @@ -9861,7 +9493,7 @@ sub_809BC18: @ 809BC18 b _0809BCF2 .align 2, 0 _0809BC48: .4byte gUnknown_020384E6 -_0809BC4C: .4byte gUnknown_083B6DB4 +_0809BC4C: .4byte gPokemonStorageSystemPtr _0809BC50: .4byte 0x00002690 _0809BC54: .4byte gUnknown_02038480 _0809BC58: .4byte 0x0000268d @@ -9874,7 +9506,7 @@ _0809BC64: asrs r0, 24 cmp r0, 0x1 bne _0809BCBC - ldr r0, _0809BCA0 @ =gUnknown_083B6DB4 + ldr r0, _0809BCA0 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r2, _0809BCA4 @ =0x00002690 adds r1, r4, r2 @@ -9896,7 +9528,7 @@ _0809BC64: b _0809BCF2 .align 2, 0 _0809BC9C: .4byte gUnknown_020384E4 -_0809BCA0: .4byte gUnknown_083B6DB4 +_0809BCA0: .4byte gPokemonStorageSystemPtr _0809BCA4: .4byte 0x00002690 _0809BCA8: .4byte gPlayerParty _0809BCAC: .4byte gUnknown_020384E5 @@ -9904,7 +9536,7 @@ _0809BCB0: .4byte 0x0000268d _0809BCB4: .4byte 0x0000268c _0809BCB8: .4byte 0x0000268e _0809BCBC: - ldr r0, _0809BCF8 @ =gUnknown_083B6DB4 + ldr r0, _0809BCF8 @ =gPokemonStorageSystemPtr ldr r3, [r0] ldr r0, _0809BCFC @ =0x00002690 adds r4, r3, r0 @@ -9936,7 +9568,7 @@ _0809BCF2: pop {r0} bx r0 .align 2, 0 -_0809BCF8: .4byte gUnknown_083B6DB4 +_0809BCF8: .4byte gPokemonStorageSystemPtr _0809BCFC: .4byte 0x00002690 _0809BD00: .4byte gPokemonStorage _0809BD04: .4byte gUnknown_020384E5 @@ -10060,7 +9692,7 @@ sub_809BDD8: @ 809BDD8 lsrs r0, 24 mov r1, sp strb r0, [r1] - ldr r1, _0809BE04 @ =gUnknown_083B6DB4 + ldr r1, _0809BE04 @ =gPokemonStorageSystemPtr ldr r2, [r1] ldr r3, _0809BE08 @ =0x000011f7 adds r1, r2, r3 @@ -10076,7 +9708,7 @@ sub_809BDD8: @ 809BDD8 bl SetMonData b _0809BE68 .align 2, 0 -_0809BE04: .4byte gUnknown_083B6DB4 +_0809BE04: .4byte gPokemonStorageSystemPtr _0809BE08: .4byte 0x000011f7 _0809BE0C: .4byte gUnknown_020384E6 _0809BE10: .4byte 0x000025b4 @@ -10184,7 +9816,7 @@ sub_809BEBC: @ 809BEBC lsls r0, 24 cmp r0, 0 bne _0809BEFC - ldr r0, _0809BF0C @ =gUnknown_083B6DB4 + ldr r0, _0809BF0C @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r2, _0809BF10 @ =0x000011f9 adds r0, r1, r2 @@ -10204,7 +9836,7 @@ _0809BEFC: _0809BF00: .4byte gUnknown_020384E6 _0809BF04: .4byte gUnknown_020384E4 _0809BF08: .4byte gUnknown_020384E5 -_0809BF0C: .4byte gUnknown_083B6DB4 +_0809BF0C: .4byte gPokemonStorageSystemPtr _0809BF10: .4byte 0x000011f9 _0809BF14: .4byte 0x000025b4 _0809BF18: @@ -10271,7 +9903,7 @@ _0809BF70: .4byte gUnknown_020384E5 thumb_func_start sub_809BF74 sub_809BF74: @ 809BF74 push {r4,lr} - ldr r0, _0809BFA8 @ =gUnknown_083B6DB4 + ldr r0, _0809BFA8 @ =gPokemonStorageSystemPtr ldr r1, [r0] movs r2, 0 ldr r3, _0809BFAC @ =gUnknown_020384E6 @@ -10298,7 +9930,7 @@ _0809BF86: beq _0809BFEE b _0809C018 .align 2, 0 -_0809BFA8: .4byte gUnknown_083B6DB4 +_0809BFA8: .4byte gPokemonStorageSystemPtr _0809BFAC: .4byte gUnknown_020384E6 _0809BFB0: .4byte 0x000011f6 _0809BFB4: .4byte gUnknown_020384E4 @@ -10391,7 +10023,7 @@ sub_809C04C: @ 809C04C lsrs r1, 24 movs r0, 0 str r0, [sp] - ldr r0, _0809C0FC @ =gUnknown_083B6DB4 + ldr r0, _0809C0FC @ =gPokemonStorageSystemPtr ldr r6, [r0] ldr r2, _0809C100 @ =0x000011f2 adds r2, r6 @@ -10459,7 +10091,7 @@ _0809C08C: bl GetMonData b _0809C1B2 .align 2, 0 -_0809C0FC: .4byte gUnknown_083B6DB4 +_0809C0FC: .4byte gPokemonStorageSystemPtr _0809C100: .4byte 0x000011f2 _0809C104: .4byte 0x000011f0 _0809C108: .4byte 0x000011f9 @@ -10550,7 +10182,7 @@ _0809C1D4: ldrh r1, [r1] strh r1, [r0] _0809C1DE: - ldr r0, _0809C224 @ =gUnknown_083B6DB4 + ldr r0, _0809C224 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r2, _0809C220 @ =0x000011f0 adds r0, r4, r2 @@ -10558,7 +10190,7 @@ _0809C1DE: cmp r1, 0 bne _0809C23C _0809C1EC: - ldr r0, _0809C224 @ =gUnknown_083B6DB4 + ldr r0, _0809C224 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r0, _0809C228 @ =0x000011fa adds r2, r1, r0 @@ -10585,7 +10217,7 @@ _0809C1EC: b _0809C43E .align 2, 0 _0809C220: .4byte 0x000011f0 -_0809C224: .4byte gUnknown_083B6DB4 +_0809C224: .4byte gPokemonStorageSystemPtr _0809C228: .4byte 0x000011fa _0809C22C: .4byte 0x0000120f _0809C230: .4byte 0x00001234 @@ -10646,7 +10278,7 @@ _0809C2AC: movs r1, 0xFF str r1, [sp] _0809C2B0: - ldr r0, _0809C388 @ =gUnknown_083B6DB4 + ldr r0, _0809C388 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r2, _0809C38C @ =0x0000120f adds r7, r4, r2 @@ -10751,7 +10383,7 @@ _0809C2B0: beq _0809C3D0 b _0809C3EA .align 2, 0 -_0809C388: .4byte gUnknown_083B6DB4 +_0809C388: .4byte gPokemonStorageSystemPtr _0809C38C: .4byte 0x0000120f _0809C390: .4byte 0x00001214 _0809C394: .4byte 0x000011fa @@ -10794,7 +10426,7 @@ _0809C3E6: _0809C3EA: movs r5, 0xFF strb r5, [r7] - ldr r0, _0809C450 @ =gUnknown_083B6DB4 + ldr r0, _0809C450 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r1, _0809C454 @ =0x0000127a adds r7, r2, r1 @@ -10843,7 +10475,7 @@ _0809C43E: pop {r0} bx r0 .align 2, 0 -_0809C450: .4byte gUnknown_083B6DB4 +_0809C450: .4byte gPokemonStorageSystemPtr _0809C454: .4byte 0x0000127a _0809C458: .4byte 0x000011f2 _0809C45C: .4byte 0x0000127f @@ -10861,7 +10493,7 @@ sub_809C464: @ 809C464 mov r8, r0 ldr r2, _0809C4DC @ =gUnknown_020384E5 ldrb r4, [r2] - ldr r0, _0809C4E0 @ =gUnknown_083B6DB4 + ldr r0, _0809C4E0 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r0, _0809C4E4 @ =0x000011de adds r7, r1, r0 @@ -10914,7 +10546,7 @@ _0809C4BE: .align 2, 0 _0809C4D8: .4byte gUnknown_020384E4 _0809C4DC: .4byte gUnknown_020384E5 -_0809C4E0: .4byte gUnknown_083B6DB4 +_0809C4E0: .4byte gPokemonStorageSystemPtr _0809C4E4: .4byte 0x000011de _0809C4E8: .4byte 0x000011df _0809C4EC: .4byte gMain @@ -11132,7 +10764,7 @@ sub_809C664: @ 809C664 mov r10, r0 ldr r7, _0809C6DC @ =gUnknown_020384E5 ldrb r4, [r7] - ldr r2, _0809C6E0 @ =gUnknown_083B6DB4 + ldr r2, _0809C6E0 @ =gPokemonStorageSystemPtr ldr r5, [r2] ldr r1, _0809C6E4 @ =0x000011df adds r0, r5, r1 @@ -11185,7 +10817,7 @@ _0809C6D0: .align 2, 0 _0809C6D8: .4byte gUnknown_020384E4 _0809C6DC: .4byte gUnknown_020384E5 -_0809C6E0: .4byte gUnknown_083B6DB4 +_0809C6E0: .4byte gPokemonStorageSystemPtr _0809C6E4: .4byte 0x000011df _0809C6E8: .4byte 0x000011de _0809C6EC: .4byte gMain @@ -11313,7 +10945,7 @@ _0809C7D0: ands r0, r1 cmp r0, 0 beq _0809C7F8 - ldr r0, _0809C7F0 @ =gUnknown_083B6DB4 + ldr r0, _0809C7F0 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x1 @@ -11322,7 +10954,7 @@ _0809C7D0: b _0809C84C .align 2, 0 _0809C7EC: .4byte gMain -_0809C7F0: .4byte gUnknown_083B6DB4 +_0809C7F0: .4byte gPokemonStorageSystemPtr _0809C7F4: movs r3, 0x1 mov r9, r3 @@ -11386,7 +11018,7 @@ _0809C84C: thumb_func_start sub_809C85C sub_809C85C: @ 809C85C push {r4-r6,lr} - ldr r0, _0809C894 @ =gUnknown_083B6DB4 + ldr r0, _0809C894 @ =gPokemonStorageSystemPtr ldr r2, [r0] ldr r1, _0809C898 @ =0x000011df adds r0, r2, r1 @@ -11413,7 +11045,7 @@ sub_809C85C: @ 809C85C movs r5, 0x2 b _0809C922 .align 2, 0 -_0809C894: .4byte gUnknown_083B6DB4 +_0809C894: .4byte gPokemonStorageSystemPtr _0809C898: .4byte 0x000011df _0809C89C: .4byte 0x000011de _0809C8A0: .4byte 0x000011e3 @@ -11514,7 +11146,7 @@ sub_809C944: @ 809C944 mov r12, r0 ldr r7, _0809C98C @ =gUnknown_020384E5 ldrb r3, [r7] - ldr r0, _0809C990 @ =gUnknown_083B6DB4 + ldr r0, _0809C990 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r0, _0809C994 @ =0x000011df adds r5, r1, r0 @@ -11544,7 +11176,7 @@ sub_809C944: @ 809C944 .align 2, 0 _0809C988: .4byte gUnknown_020384E4 _0809C98C: .4byte gUnknown_020384E5 -_0809C990: .4byte gUnknown_083B6DB4 +_0809C990: .4byte gPokemonStorageSystemPtr _0809C994: .4byte 0x000011df _0809C998: .4byte 0x000011de _0809C99C: .4byte gMain @@ -11706,7 +11338,7 @@ sub_809CAB0: @ 809CAB0 bl sub_809AB8C lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _0809CAD4 @ =gUnknown_083B6DB4 + ldr r0, _0809CAD4 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x1 @@ -11717,7 +11349,7 @@ sub_809CAB0: @ 809CAB0 beq _0809CAEA b _0809CB24 .align 2, 0 -_0809CAD4: .4byte gUnknown_083B6DB4 +_0809CAD4: .4byte gPokemonStorageSystemPtr _0809CAD8: cmp r0, 0x2 beq _0809CAF6 @@ -11762,7 +11394,7 @@ _0809CB24: _0809CB28: movs r0, 0x6 bl sub_809CDEC - ldr r0, _0809CB4C @ =gUnknown_083B6DB4 + ldr r0, _0809CB4C @ =gPokemonStorageSystemPtr ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x2 @@ -11777,7 +11409,7 @@ _0809CB28: bl sub_809CDEC b _0809CB5A .align 2, 0 -_0809CB4C: .4byte gUnknown_083B6DB4 +_0809CB4C: .4byte gPokemonStorageSystemPtr _0809CB50: .4byte gUnknown_020384E4 _0809CB54: movs r0, 0x1 @@ -11797,7 +11429,7 @@ _0809CB6E: thumb_func_start sub_809CB74 sub_809CB74: @ 809CB74 - ldr r1, _0809CB90 @ =gUnknown_083B6DB4 + ldr r1, _0809CB90 @ =gPokemonStorageSystemPtr ldr r1, [r1] movs r2, 0x8E lsls r2, 5 @@ -11811,7 +11443,7 @@ sub_809CB74: @ 809CB74 strh r1, [r0, 0x22] bx lr .align 2, 0 -_0809CB90: .4byte gUnknown_083B6DB4 +_0809CB90: .4byte gPokemonStorageSystemPtr thumb_func_end sub_809CB74 thumb_func_start unref_sub_809CB94 @@ -11893,7 +11525,7 @@ sub_809CC04: @ 809CC04 bl LoadSpritePalettes ldr r0, _0809CCB8 @ =0x0000dac6 bl IndexOfSpritePaletteTag - ldr r1, _0809CCBC @ =gUnknown_083B6DB4 + ldr r1, _0809CCBC @ =gPokemonStorageSystemPtr ldr r6, [r1] ldr r4, _0809CCC0 @ =0x000011e4 adds r7, r6, r4 @@ -11955,7 +11587,7 @@ sub_809CC04: @ 809CC04 _0809CCB0: .4byte gHandCursorSpriteSheets _0809CCB4: .4byte gHandCursorSpritePalettes _0809CCB8: .4byte 0x0000dac6 -_0809CCBC: .4byte gUnknown_083B6DB4 +_0809CCBC: .4byte gPokemonStorageSystemPtr _0809CCC0: .4byte 0x000011e4 _0809CCC4: .4byte 0x0000dad1 _0809CCC8: .4byte 0x000011e5 @@ -11995,7 +11627,7 @@ _0809CD08: lsrs r2, r0, 24 cmp r2, 0x40 beq _0809CD6C - ldr r0, _0809CD5C @ =gUnknown_083B6DB4 + ldr r0, _0809CD5C @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r1, _0809CD60 @ =0x000011c4 adds r4, r0, r1 @@ -12027,12 +11659,12 @@ _0809CD08: b _0809CD78 .align 2, 0 _0809CD58: .4byte gSpriteTemplate_83BBC88 -_0809CD5C: .4byte gUnknown_083B6DB4 +_0809CD5C: .4byte gPokemonStorageSystemPtr _0809CD60: .4byte 0x000011c4 _0809CD64: .4byte gSprites _0809CD68: .4byte gUnknown_020384E4 _0809CD6C: - ldr r0, _0809CD80 @ =gUnknown_083B6DB4 + ldr r0, _0809CD80 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r2, _0809CD84 @ =0x000011c4 adds r0, r2 @@ -12044,7 +11676,7 @@ _0809CD78: pop {r0} bx r0 .align 2, 0 -_0809CD80: .4byte gUnknown_083B6DB4 +_0809CD80: .4byte gPokemonStorageSystemPtr _0809CD84: .4byte 0x000011c4 thumb_func_end sub_809CC04 @@ -12059,7 +11691,7 @@ sub_809CD88: @ 809CD88 movs r1, 0x1 _0809CD96: strb r1, [r2] - ldr r0, _0809CDC4 @ =gUnknown_083B6DB4 + ldr r0, _0809CDC4 @ =gPokemonStorageSystemPtr ldr r0, [r0] movs r3, 0x8E lsls r3, 5 @@ -12080,13 +11712,13 @@ _0809CD96: bx r0 .align 2, 0 _0809CDC0: .4byte gUnknown_020384E9 -_0809CDC4: .4byte gUnknown_083B6DB4 +_0809CDC4: .4byte gPokemonStorageSystemPtr _0809CDC8: .4byte 0x000011e4 thumb_func_end sub_809CD88 thumb_func_start sub_809CDCC sub_809CDCC: @ 809CDCC - ldr r0, _0809CDE0 @ =gUnknown_083B6DB4 + ldr r0, _0809CDE0 @ =gPokemonStorageSystemPtr ldr r0, [r0] ldr r2, _0809CDE4 @ =0x000011b8 adds r1, r0, r2 @@ -12097,7 +11729,7 @@ sub_809CDCC: @ 809CDCC strb r2, [r0] bx lr .align 2, 0 -_0809CDE0: .4byte gUnknown_083B6DB4 +_0809CDE0: .4byte gPokemonStorageSystemPtr _0809CDE4: .4byte 0x000011b8 _0809CDE8: .4byte 0x000011b9 thumb_func_end sub_809CDCC @@ -12107,7 +11739,7 @@ sub_809CDEC: @ 809CDEC push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0809CE3C @ =gUnknown_083B6DB4 + ldr r0, _0809CE3C @ =gPokemonStorageSystemPtr ldr r5, [r0] ldr r0, _0809CE40 @ =0x000011b8 adds r4, r5, r0 @@ -12146,7 +11778,7 @@ _0809CE36: pop {r0} bx r0 .align 2, 0 -_0809CE3C: .4byte gUnknown_083B6DB4 +_0809CE3C: .4byte gPokemonStorageSystemPtr _0809CE40: .4byte 0x000011b8 _0809CE44: .4byte gUnknown_083BBCA0 _0809CE48: .4byte 0x000011b9 @@ -12157,7 +11789,7 @@ sub_809CE4C: @ 809CE4C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0809CE70 @ =gUnknown_083B6DB4 + ldr r0, _0809CE70 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r3, _0809CE74 @ =0x000011b8 adds r0, r1, r3 @@ -12172,7 +11804,7 @@ sub_809CE4C: @ 809CE4C ldrsb r0, [r1, r0] b _0809CE80 .align 2, 0 -_0809CE70: .4byte gUnknown_083B6DB4 +_0809CE70: .4byte gPokemonStorageSystemPtr _0809CE74: .4byte 0x000011b8 _0809CE78: .4byte 0x00001184 _0809CE7C: @@ -12191,7 +11823,7 @@ sub_809CE84: @ 809CE84 mov r4, r8 push {r4-r6} sub sp, 0x8 - ldr r0, _0809CF20 @ =gUnknown_083B6DB4 + ldr r0, _0809CF20 @ =gPokemonStorageSystemPtr ldr r4, [r0] ldr r0, _0809CF24 @ =0x000011b8 adds r0, r4 @@ -12261,7 +11893,7 @@ sub_809CE84: @ 809CE84 pop {r0} bx r0 .align 2, 0 -_0809CF20: .4byte gUnknown_083B6DB4 +_0809CF20: .4byte gPokemonStorageSystemPtr _0809CF24: .4byte 0x000011b8 _0809CF28: .4byte 0x000011bc _0809CF2C: .4byte 0x000011b9 @@ -12319,7 +11951,7 @@ _0809CF8E: cmp r5, r0 beq _0809CFB2 bl HandleDestroyMenuCursors - ldr r0, _0809CFD0 @ =gUnknown_083B6DB4 + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr ldr r1, [r0] ldr r2, _0809CFD4 @ =0x000011ba adds r0, r1, r2 @@ -12333,7 +11965,7 @@ _0809CF8E: _0809CFB2: cmp r5, 0 blt _0809CFC4 - ldr r0, _0809CFD0 @ =gUnknown_083B6DB4 + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr ldr r0, [r0] lsls r1, r5, 3 ldr r2, _0809CFD8 @ =0x00001184 @@ -12347,7 +11979,7 @@ _0809CFC4: pop {r1} bx r1 .align 2, 0 -_0809CFD0: .4byte gUnknown_083B6DB4 +_0809CFD0: .4byte gPokemonStorageSystemPtr _0809CFD4: .4byte 0x000011ba _0809CFD8: .4byte 0x00001184 thumb_func_end sub_809CF30 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 6bdb0edd0..b9b18e707 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -70,7 +70,7 @@ gUnknown_083B6D94:: @ 83B6D94 .incbin "graphics/pokemon_storage/83B6D94.gbapal" .align 2 -gUnknown_083B6DB4:: @ 83B6DB4 +gPokemonStorageSystemPtr:: @ 83B6DB4 .4byte gSharedMem .align 2 diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index d6119476c..b0a317cd9 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -5,6 +5,7 @@ #include "field_weather.h" #include "mon_markings.h" #include "overworld.h" +#include "mail_data.h" #include "field_fadetransition.h" #include "menu.h" #include "main.h" @@ -56,9 +57,14 @@ struct PokemonStorageSystemData { u16 unk_000a; struct PCScreenEffectStruct unk_000c; struct UnkStruct_2000020 unk_0020[274]; // refine size later - u8 filler_08b0[4]; + u8 filler_08b0[2]; + s16 unk_08b2; u16 unk_08b4; - u8 filler_08b6[0xa06]; + u8 filler_08b6[0x93c]; + u16 unk_11f2; + u8 filler_11f4[2]; + u8 unk_11f6; + u8 filler_11f7[0xc5]; struct PokemonMarkMenu unk_12bc; struct UnkPSSStruct_2002370 unk_2370; u8 filler_25b4[0xd8]; @@ -80,23 +86,48 @@ void task_intro_29(u8 whichMenu); void sub_8096884(void); void sub_8096AFC(void); void sub_8096B38(void); -void sub_8096BE0(void (*func)(void)); +void SetPSSCallback(void (*func)(void)); void sub_8096BF0(void); void sub_8096C68(void); void sub_8096C84(void); +void sub_8097004(void); +void sub_8097078(void); +void sub_80972A8(void); +void sub_80972FC(void); +void c3_0808DC50(void); +void sub_8097390(void); +void sub_809746C(void); +void sub_809789C(void); +void sub_8097BA0(void); +void sub_8097CC0(void); +void BoxSetMosaic(void); +void sub_80986E8(void); +void sub_8098710(void); +void sub_8098A5C(void); +void sub_809B440(void); +void sub_8096FC8(void); void sub_8097DE0(void); void sub_8097E44(void); void sub_8097E70(void); void sub_8098400(void); void sub_8098734(void); -void sub_8099BF8(u8 a0); +void sub_8098898(u8 index); void sub_8098B48(void); +void sub_8099BF8(u8 a0); +void sub_8099C70(u8 whichBox); +bool8 sub_8099D34(void); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); void sub_809AA24(void); void sub_809AA98(void); +bool8 sub_809AC00(void); void sub_809B0D4(void); void sub_809BBC0(void); void sub_809BD14(void); +bool8 sub_809BE80(void); +bool8 sub_809BEBC(void); +bool8 sub_809BF20(void); +bool8 sub_809BF48(void); +u8 sub_809CA40(void); void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); void sub_809CFF0(void); @@ -150,7 +181,7 @@ const u8 gBoxSelectionPopupCenterTiles[] = INCBIN_U8("graphics/pokemon_storage/b const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp"); extern const struct StorageAction gUnknown_083B6DF4[]; -extern const struct PokemonStorageSystemData *gUnknown_083B6DB4; +extern const struct PokemonStorageSystemData *gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; @@ -571,7 +602,7 @@ void StorageSystemCreatePrimaryMenu(u8 whichMenu) void sub_80961A8(void) { - gUnknown_02038474 = gUnknown_083B6DB4->unk_0005; + gUnknown_02038474 = gPokemonStorageSystemPtr->unk_0005; gFieldCallback = sub_8096130; SetMainCallback2(c2_exit_to_overworld_2_switch); } @@ -899,7 +930,7 @@ void sub_8096884(void) break; case 9: sub_8096874(); - sub_8096BE0(sub_8096BF0); + SetPSSCallback(sub_8096BF0); SetMainCallback2(sub_8096B38); SetVBlankCallback(sub_8096AFC); gMain.state++; @@ -967,7 +998,7 @@ void sub_80969A0(void) break; case 10: sub_8096874(); - sub_8096BE0(sub_8096C68); + SetPSSCallback(sub_8096C68); SetMainCallback2(sub_8096B38); gMain.state++; break; @@ -1007,7 +1038,7 @@ void sub_8096B5C(void) } } -void sub_8096BE0(void (*func)(void)) +void SetPSSCallback(void (*func)(void)) { ePokemonStorageSystem.unk_0000 = func; ePokemonStorageSystem.unk_0004 = 0; @@ -1033,7 +1064,7 @@ void sub_8096BF0(void) break; case 2: if (sub_80C5DCC()) - sub_8096BE0(sub_8096C84); + SetPSSCallback(sub_8096C84); break; } } @@ -1041,7 +1072,174 @@ void sub_8096BF0(void) void sub_8096C68(void) { if (!UpdatePaletteFade()) - sub_8096BE0(sub_8096C84); + SetPSSCallback(sub_8096C84); +} + +void sub_8096C84(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + switch (sub_809CA40()) + { + case 1: + PlaySE(SE_SELECT); + ePokemonStorageSystem.unk_0004 = 1; + break; + case 5: + if (ePokemonStorageSystem.unk_0005 != 2) + { + sub_8098898(16); + ePokemonStorageSystem.unk_0004 = 3; + } + else + { + sub_809B0D4(); + SetPSSCallback(sub_8096FC8); + } + break; + case 6: + if (ePokemonStorageSystem.unk_0005 == 2) + { + if (sub_809BF20() && ItemIsMail(ePokemonStorageSystem.unk_11f2)) + { + ePokemonStorageSystem.unk_0004 = 5; + } + else + { + SetPSSCallback(sub_8097004); + } + } + break; + case 4: + SetPSSCallback(sub_8097BA0); + break; + case 16: + SetPSSCallback(sub_8097CC0); + break; + case 7: + PlaySE(SE_SELECT); + SetPSSCallback(sub_809789C); + break; + case 8: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097078); + break; + case 9: + PlaySE(SE_SELECT); + ePokemonStorageSystem.unk_08b2 = gPokemonStorage.currentBox + 1; + if (ePokemonStorageSystem.unk_08b2 > 13) + ePokemonStorageSystem.unk_08b2 = 0; + sub_8099C70(ePokemonStorageSystem.unk_08b2); + ePokemonStorageSystem.unk_0004 = 2; + break; + case 10: + PlaySE(SE_SELECT); + ePokemonStorageSystem.unk_08b2 = gPokemonStorage.currentBox - 1; + if (ePokemonStorageSystem.unk_08b2 < 0) + ePokemonStorageSystem.unk_08b2 = 13; + sub_8099C70(ePokemonStorageSystem.unk_08b2); + ePokemonStorageSystem.unk_0004 = 2; + break; + case 11: + if (!sub_809BE80()) + { + if (ItemIsMail(ePokemonStorageSystem.unk_11f2)) + { + ePokemonStorageSystem.unk_0004 = 5; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(sub_809746C); + } + } + else + { + ePokemonStorageSystem.unk_0004 = 4; + } + break; + case 13: + if (sub_809BE80()) + { + ePokemonStorageSystem.unk_0004 = 4; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(sub_80972A8); + } + break; + case 14: + if (!sub_809BEBC()) + { + ePokemonStorageSystem.unk_0004 = 4; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(c3_0808DC50); + } + break; + case 12: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097390); + break; + case 15: + PlaySE(SE_SELECT); + SetPSSCallback(sub_80972FC); + break; + } + break; + case 1: + if (!sub_809AC00()) + { + if (sub_809BF48()) + sub_80986E8(); + else + sub_8098710(); + if (ePokemonStorageSystem.unk_11f6) + BoxSetMosaic(); + ePokemonStorageSystem.unk_0004 = 0; + } + break; + case 2: + if (!sub_8099D34()) + { + gPokemonStorage.currentBox = ePokemonStorageSystem.unk_08b2; + if (!gUnknown_0203847C && !sub_809BF20()) + { + sub_809B440(); + BoxSetMosaic(); + } + ePokemonStorageSystem.unk_0004 = 0; + } + break; + case 3: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + ePokemonStorageSystem.unk_0004 = 0; + } + break; + case 4: + PlaySE(SE_HAZURE); + sub_8098898(13); + ePokemonStorageSystem.unk_0004 = 6; + break; + case 5: + PlaySE(SE_HAZURE); + sub_8098898(22); + ePokemonStorageSystem.unk_0004 = 6; + break; + case 6: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + } } asm(".section .text.8098898"); -- cgit v1.2.3 From 961d82002d7d073123f55427219f14335b8bac9c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 7 Jan 2018 22:58:03 -0600 Subject: fix Mailbox_DrawMailList --- src/field/player_pc.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/src/field/player_pc.c b/src/field/player_pc.c index 4fef09386..78235590a 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -1039,25 +1039,16 @@ static void Mailbox_UpdateMailList(void) } } -// WWHHHHHYYYYYYYY SOMEBODY PLEASE FIX THIS -static void Mailbox_DrawMailList(u8 taskId) // taskId is unused +void Mailbox_DrawMailList(u8 taskId) // taskId is unused { u16 yCoord = 0; - u16 i = eMailboxInfo.itemsAbove; - register struct MailboxStruct *tempMailbox asm("r1") = &eMailboxInfo; - register struct MailboxStruct *mailbox asm("r6"); + u16 i; - if(i < i + tempMailbox->pageItems) - { - mailbox = tempMailbox; - goto forJump; - for(; i < mailbox->itemsAbove + mailbox->pageItems; i++) + for (i = eMailboxInfo.itemsAbove; i < eMailboxInfo.itemsAbove + eMailboxInfo.pageItems; i++) { - forJump: - yCoord = (i - mailbox->itemsAbove) * 2; + yCoord = (i - eMailboxInfo.itemsAbove) * 2; MenuFillWindowRectWithBlankTile(0x15, yCoord + 2, 0x1C, yCoord + 3); - - if(i != mailbox->count) + if (i != eMailboxInfo.count) { StringCopy(gStringVar1, gSaveBlock1.mail[i + 6].playerName); SanitizeNameString(gStringVar1); @@ -1065,29 +1056,20 @@ static void Mailbox_DrawMailList(u8 taskId) // taskId is unused } else { - goto weirdCase; // again, what??? + MenuPrint(gOtherText_CancelNoTerminator, 0x15, yCoord + 2); + break; } } - } -beforeLabel: - if(i - eMailboxInfo.itemsAbove != 8) + if (i - eMailboxInfo.itemsAbove != 8) MenuFillWindowRectWithBlankTile(0x15, yCoord + 4, 0x1C, 0x12); - switch(eMailboxInfo.itemsAbove) - { - default: + if (eMailboxInfo.itemsAbove != 0) CreateVerticalScrollIndicators(0, 0xC8, 8); - break; -weirdCase: - MenuPrint(gOtherText_CancelNoTerminator, 0x15, yCoord + 2); - goto beforeLabel; - case 0: + else DestroyVerticalScrollIndicator(0); - break; - } - if(eMailboxInfo.itemsAbove + eMailboxInfo.pageItems <= eMailboxInfo.count) + if (eMailboxInfo.itemsAbove + eMailboxInfo.pageItems <= eMailboxInfo.count) CreateVerticalScrollIndicators(1, 0xC8, 0x98); else DestroyVerticalScrollIndicator(1); -- cgit v1.2.3 From 0e371dcb1a76859f93b3d4cc1dc5ef48696b98b7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 7 Jan 2018 23:12:24 -0600 Subject: fix ItemStorage_DrawItemList --- src/field/player_pc.c | 72 ++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/src/field/player_pc.c b/src/field/player_pc.c index 78235590a..928cb9689 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -866,58 +866,48 @@ static void ItemStorage_DrawItemList(u8 taskId) u16 i; u16 yCoord = 0; - // r5 is i and is unsigned 16-bit. - - for(i = ITEMS_ABOVE_TOP; i < ITEMS_ABOVE_TOP + NUM_PAGE_ITEMS; i++) + for (i = ITEMS_ABOVE_TOP; i < ITEMS_ABOVE_TOP + NUM_PAGE_ITEMS; i++) { yCoord = (i - ITEMS_ABOVE_TOP) * 2; - if(i != NUM_ITEMS) + if (i == NUM_ITEMS) + { + sub_8072A18(gOtherText_CancelNoTerminator, 0x80, (yCoord + 2) * 8, 0x68, 1); + break; + } + else { tempArg = 0; - if(SWITCH_MODE_ACTIVE != FALSE && i == SWAP_ITEM_INDEX) + if (SWITCH_MODE_ACTIVE != FALSE && i == SWAP_ITEM_INDEX) tempArg = 1; - switch(GetPocketByItemId(gSaveBlock1.pcItems[i].itemId) - 1) + switch (GetPocketByItemId(gSaveBlock1.pcItems[i].itemId) - 1) { - case 0: - case 1: - case 3: - ItemStorage_DrawNormalItemEntry((struct ItemSlot *)&gSaveBlock1.pcItems[i], yCoord + 2, tempArg); - break; - case 4: - ItemStorage_DrawKeyItemEntry((struct ItemSlot *)&gSaveBlock1.pcItems[i], yCoord + 2, tempArg); - break; - case 2: - ItemStorage_DrawTMHMEntry((struct ItemSlot *)&gSaveBlock1.pcItems[i], yCoord + 2, tempArg); - break; + case 0: + case 1: + case 3: + ItemStorage_DrawNormalItemEntry((struct ItemSlot *)&gSaveBlock1.pcItems[i], yCoord + 2, tempArg); + break; + case 4: + ItemStorage_DrawKeyItemEntry((struct ItemSlot *)&gSaveBlock1.pcItems[i], yCoord + 2, tempArg); + break; + case 2: + ItemStorage_DrawTMHMEntry((struct ItemSlot *)&gSaveBlock1.pcItems[i], yCoord + 2, tempArg); + break; } } - else - { - goto weirdCase; // what??? - } } -beforeLabel: - if(i - ITEMS_ABOVE_TOP < 8) + if (i - ITEMS_ABOVE_TOP < 8) MenuFillWindowRectWithBlankTile(16, yCoord + 4, 0x1C, 0x12); - switch(ITEMS_ABOVE_TOP) - { - default: + if (ITEMS_ABOVE_TOP != 0) CreateVerticalScrollIndicators(0, 0xB8, 8); - break; -weirdCase: - sub_8072A18(gOtherText_CancelNoTerminator, 0x80, (yCoord + 2) * 8, 0x68, 1); - goto beforeLabel; - case 0: + else DestroyVerticalScrollIndicator(0); - break; - } - if(ITEMS_ABOVE_TOP + NUM_PAGE_ITEMS <= NUM_ITEMS) + if (ITEMS_ABOVE_TOP + NUM_PAGE_ITEMS <= NUM_ITEMS) CreateVerticalScrollIndicators(1, 0xB8, 0x98); else DestroyVerticalScrollIndicator(1); @@ -1039,7 +1029,7 @@ static void Mailbox_UpdateMailList(void) } } -void Mailbox_DrawMailList(u8 taskId) // taskId is unused +static void Mailbox_DrawMailList(u8 taskId) // taskId is unused { u16 yCoord = 0; u16 i; @@ -1048,16 +1038,16 @@ void Mailbox_DrawMailList(u8 taskId) // taskId is unused { yCoord = (i - eMailboxInfo.itemsAbove) * 2; MenuFillWindowRectWithBlankTile(0x15, yCoord + 2, 0x1C, yCoord + 3); - if (i != eMailboxInfo.count) + if (i == eMailboxInfo.count) { - StringCopy(gStringVar1, gSaveBlock1.mail[i + 6].playerName); - SanitizeNameString(gStringVar1); - MenuPrint(gStringVar1, 0x15, yCoord + 2); + MenuPrint(gOtherText_CancelNoTerminator, 0x15, yCoord + 2); + break; } else { - MenuPrint(gOtherText_CancelNoTerminator, 0x15, yCoord + 2); - break; + StringCopy(gStringVar1, gSaveBlock1.mail[i + 6].playerName); + SanitizeNameString(gStringVar1); + MenuPrint(gStringVar1, 0x15, yCoord + 2); } } -- cgit v1.2.3 From 7f3eb30bcb9da4a3a651f1aca7a8fd6b7980491a Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 8 Jan 2018 16:03:33 +0100 Subject: Matched sub_812B058 --- src/battle/anim/sfx.c | 95 ++------------------------------------------------- 1 file changed, 3 insertions(+), 92 deletions(-) diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index 99f050dcb..484548d4d 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -70,16 +70,16 @@ void sub_812B004(u8 taskId) } } -#ifdef NONMATCHING void sub_812B058(u8 taskId) { - s16 sp, r10, r7, r9; + s16 sp; + u8 r10, r7, r9; s8 r5, r6, r4, r0; sp = gBattleAnimArgs[0]; r5 = gBattleAnimArgs[2]; r6 = gBattleAnimArgs[3]; - r10 = gBattleAnimArgs[4]; + r10 = gBattleAnimArgs[4]; r7 = gBattleAnimArgs[5]; r9 = gBattleAnimArgs[6]; r4 = BattleAnimAdjustPanning(gBattleAnimArgs[1]); @@ -100,95 +100,6 @@ void sub_812B058(u8 taskId) TASK.func = sub_812B108; sub_812B108(taskId); } -#else -__attribute__((naked)) -void sub_812B058(u8 taskId) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0x4\n\ - mov r8, r0\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r8, r0\n\ - ldr r0, _0812B0FC @ =gBattleAnimArgs\n\ - ldrh r1, [r0]\n\ - str r1, [sp]\n\ - ldrb r5, [r0, 0x4]\n\ - ldrb r6, [r0, 0x6]\n\ - ldrb r3, [r0, 0x8]\n\ - mov r10, r3\n\ - ldrb r7, [r0, 0xA]\n\ - ldrb r1, [r0, 0xC]\n\ - mov r9, r1\n\ - ldrb r0, [r0, 0x2]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - bl BattleAnimAdjustPanning\n\ - adds r4, r0, 0\n\ - lsls r4, 24\n\ - lsrs r4, 24\n\ - lsls r5, 24\n\ - asrs r5, 24\n\ - adds r0, r5, 0\n\ - bl BattleAnimAdjustPanning\n\ - adds r5, r0, 0\n\ - lsls r4, 24\n\ - asrs r4, 24\n\ - lsls r5, 24\n\ - asrs r5, 24\n\ - lsls r6, 24\n\ - asrs r6, 24\n\ - adds r0, r4, 0\n\ - adds r1, r5, 0\n\ - adds r2, r6, 0\n\ - bl CalculatePanIncrement\n\ - ldr r2, _0812B100 @ =gTasks\n\ - mov r3, r8\n\ - lsls r1, r3, 2\n\ - add r1, r8\n\ - lsls r1, 3\n\ - adds r1, r2\n\ - movs r2, 0\n\ - mov r6, sp\n\ - ldrh r6, [r6]\n\ - strh r6, [r1, 0x8]\n\ - strh r4, [r1, 0xA]\n\ - strh r5, [r1, 0xC]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - strh r0, [r1, 0xE]\n\ - mov r0, r10\n\ - strh r0, [r1, 0x10]\n\ - strh r7, [r1, 0x12]\n\ - mov r3, r9\n\ - strh r3, [r1, 0x14]\n\ - strh r2, [r1, 0x1C]\n\ - strh r4, [r1, 0x1E]\n\ - strh r3, [r1, 0x20]\n\ - ldr r2, _0812B104 @ =sub_812B108\n\ - str r2, [r1]\n\ - mov r0, r8\n\ - bl _call_via_r2\n\ - add sp, 0x4\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_0812B0FC: .4byte gBattleAnimArgs\n\ -_0812B100: .4byte gTasks\n\ -_0812B104: .4byte sub_812B108\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void sub_812B108(u8 taskId) { -- cgit v1.2.3 From 4bdab579016705c6dc914e3d2af2d608eb256a9b Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Mon, 8 Jan 2018 18:40:57 +0100 Subject: Decompiled sub_812B18C --- asm/battle_anim_sfx.s | 148 -------------------------------------------------- src/battle/anim/sfx.c | 60 ++++++++++++++++++++ 2 files changed, 60 insertions(+), 148 deletions(-) diff --git a/asm/battle_anim_sfx.s b/asm/battle_anim_sfx.s index 1d0358bee..7d196ce97 100644 --- a/asm/battle_anim_sfx.s +++ b/asm/battle_anim_sfx.s @@ -5,154 +5,6 @@ .text - thumb_func_start sub_812B18C -sub_812B18C: @ 812B18C - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - lsls r0, 24 - lsrs r6, r0, 24 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _0812B1CC - ldr r0, _0812B1BC @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812B1C4 - ldr r0, _0812B1C0 @ =gSharedMem + 0x19348 - ldrh r4, [r0] - b _0812B272 - .align 2, 0 -_0812B1BC: .4byte gBattleAnimArgs -_0812B1C0: .4byte gSharedMem + 0x19348 -_0812B1C4: - adds r0, r5, 0 - bl DestroyAnimVisualTask - b _0812B272 -_0812B1CC: - ldr r0, _0812B1E0 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r1, [r0, r2] - adds r2, r0, 0 - cmp r1, 0 - bne _0812B1E8 - ldr r0, _0812B1E4 @ =gAnimBankAttacker - ldrb r4, [r0] - b _0812B20E - .align 2, 0 -_0812B1E0: .4byte gBattleAnimArgs -_0812B1E4: .4byte gAnimBankAttacker -_0812B1E8: - cmp r1, 0x1 - bne _0812B1F8 - ldr r0, _0812B1F4 @ =gAnimBankTarget - ldrb r4, [r0] - b _0812B20E - .align 2, 0 -_0812B1F4: .4byte gAnimBankTarget -_0812B1F8: - cmp r1, 0x2 - bne _0812B204 - ldr r0, _0812B200 @ =gAnimBankAttacker - b _0812B206 - .align 2, 0 -_0812B200: .4byte gAnimBankAttacker -_0812B204: - ldr r0, _0812B230 @ =gAnimBankTarget -_0812B206: - ldrb r1, [r0] - movs r0, 0x2 - adds r4, r0, 0 - eors r4, r1 -_0812B20E: - movs r1, 0 - ldrsh r0, [r2, r1] - cmp r0, 0x1 - beq _0812B21A - cmp r0, 0x3 - bne _0812B234 -_0812B21A: - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - bne _0812B234 - adds r0, r5, 0 - bl DestroyAnimVisualTask - b _0812B2B0 - .align 2, 0 -_0812B230: .4byte gAnimBankTarget -_0812B234: - adds r0, r4, 0 - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _0812B258 - ldr r1, _0812B250 @ =gBattlePartyID - lsls r0, r4, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _0812B254 @ =gEnemyParty - b _0812B266 - .align 2, 0 -_0812B250: .4byte gBattlePartyID -_0812B254: .4byte gEnemyParty -_0812B258: - ldr r1, _0812B290 @ =gBattlePartyID - lsls r0, r4, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _0812B294 @ =gPlayerParty -_0812B266: - adds r0, r1 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 -_0812B272: - cmp r4, 0 - beq _0812B2AA - ldr r0, _0812B298 @ =gBattleAnimArgs - ldrh r2, [r0, 0x2] - movs r1, 0x2 - ldrsh r0, [r0, r1] - cmp r0, 0xFF - bne _0812B29C - lsls r1, r6, 24 - asrs r1, 24 - adds r0, r4, 0 - bl PlayCry1 - b _0812B2AA - .align 2, 0 -_0812B290: .4byte gBattlePartyID -_0812B294: .4byte gPlayerParty -_0812B298: .4byte gBattleAnimArgs -_0812B29C: - lsls r1, r6, 24 - asrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - adds r0, r4, 0 - bl PlayCry3 -_0812B2AA: - adds r0, r5, 0 - bl DestroyAnimVisualTask -_0812B2B0: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_812B18C - thumb_func_start sub_812B2B8 sub_812B2B8: @ 812B2B8 push {r4,r5,lr} diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index 484548d4d..cb61a566f 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -1,9 +1,15 @@ #include "global.h" #include "battle_anim.h" +#include "contest.h" +#include "ewram.h" +#include "rom_8077ABC.h" #include "sound.h" #include "task.h" extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; +extern u16 gBattlePartyID[]; void sub_812AF98(u8 taskId); void sub_812B004(u8 taskId); @@ -122,3 +128,57 @@ void sub_812B108(u8 taskId) TASK.data[11] = sub_8077104(TASK.data[11]); } } + +// #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348)) +// #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) + +void sub_812B18C(u8 taskId) +{ + u16 species = 0; + s8 pan = BattleAnimAdjustPanning(-64); + + if (IsContest()) + { + if (!gBattleAnimArgs[0]) + species = shared19348.unk0; + else + DestroyAnimVisualTask(taskId); + } + else + { + u8 bank; + if (gBattleAnimArgs[0] == 0) + bank = gAnimBankAttacker; + else if (gBattleAnimArgs[0] == 1) + bank = gAnimBankTarget; + else if (gBattleAnimArgs[0] == 2) + bank = gAnimBankAttacker ^ 0x2; + else + bank = gAnimBankTarget ^ 0x2; + + if (gBattleAnimArgs[0] == 1 || gBattleAnimArgs[0] == 3) + { + if (!IsAnimBankSpriteVisible(bank)) + { + DestroyAnimVisualTask(taskId); + return; + } + } + + if (GetBankSide(bank)) + species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], 0xB); + else + species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], 0xB); + } + + if (species != 0) + { + s16 mode = gBattleAnimArgs[1]; + if (mode == 0xFF) + PlayCry1(species, pan); + else + PlayCry3(species, pan, mode); + } + + DestroyAnimVisualTask(taskId); +} \ No newline at end of file -- cgit v1.2.3 From 56c2c7ef00396c53a8bc859141b46fa488bb42fa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 13:39:22 -0700 Subject: through sub_8097078 --- asm/pokemon_storage_system.s | 334 ----------------------------------- src/pokemon/pokemon_storage_system.c | 190 +++++++++++++++++++- 2 files changed, 183 insertions(+), 341 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8dab0b2fd..46d6b8502 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,340 +5,6 @@ .text - thumb_func_start sub_8096FC8 -sub_8096FC8: @ 8096FC8 - push {r4,lr} - ldr r4, _08096FD8 @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _08096FDC - cmp r0, 0x1 - beq _08096FE8 - b _08096FF8 - .align 2, 0 -_08096FD8: .4byte gSharedMem -_08096FDC: - bl sub_809880C - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08096FF8 -_08096FE8: - bl sub_8098830 - lsls r0, 24 - cmp r0, 0 - bne _08096FF8 - ldr r0, _08097000 @ =sub_8096C84 - bl SetPSSCallback -_08096FF8: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097000: .4byte sub_8096C84 - thumb_func_end sub_8096FC8 - - thumb_func_start sub_8097004 -sub_8097004: @ 8097004 - push {r4,lr} - ldr r4, _08097018 @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0x1 - beq _0809702E - cmp r0, 0x1 - bgt _0809701C - cmp r0, 0 - beq _08097022 - b _0809706A - .align 2, 0 -_08097018: .4byte gSharedMem -_0809701C: - cmp r0, 0x2 - beq _0809704C - b _0809706A -_08097022: - movs r0, 0x5 - bl PlaySE - bl add_to_c3_somehow - b _08097044 -_0809702E: - bl sub_80985CC - lsls r0, 24 - cmp r0, 0 - bne _0809706A - bl sub_809B0F4 - lsls r0, 24 - lsrs r0, 24 - bl sub_809B0C0 -_08097044: - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _0809706A -_0809704C: - bl sub_809AC00 - lsls r0, 24 - cmp r0, 0 - bne _0809706A - ldr r1, _08097070 @ =0x000011f6 - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08097064 - bl BoxSetMosaic -_08097064: - ldr r0, _08097074 @ =sub_8096C84 - bl SetPSSCallback -_0809706A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097070: .4byte 0x000011f6 -_08097074: .4byte sub_8096C84 - thumb_func_end sub_8097004 - - thumb_func_start sub_8097078 -sub_8097078: @ 8097078 - push {r4,lr} - ldr r0, _08097090 @ =gSharedMem - ldrb r0, [r0, 0x4] - cmp r0, 0x5 - bls _08097084 - b _0809729A -_08097084: - lsls r0, 2 - ldr r1, _08097094 @ =_08097098 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08097090: .4byte gSharedMem -_08097094: .4byte _08097098 - .align 2, 0 -_08097098: - .4byte _080970B0 - .4byte _080970C8 - .4byte _08097258 - .4byte _0809726C - .4byte _08097262 - .4byte _08097284 -_080970B0: - movs r0, 0x4 - bl sub_8098898 - bl sub_809CE84 - ldr r1, _080970C4 @ =gSharedMem - movs r0, 0x1 - strb r0, [r1, 0x4] - b _0809729A - .align 2, 0 -_080970C4: .4byte gSharedMem -_080970C8: - bl sub_809CF30 - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x9 - bls _080970D8 - b _0809729A -_080970D8: - lsls r0, 2 - ldr r1, _080970E4 @ =_080970E8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080970E4: .4byte _080970E8 - .align 2, 0 -_080970E8: - .4byte _08097110 - .4byte _08097110 - .4byte _08097190 - .4byte _08097178 - .4byte _08097120 - .4byte _08097158 - .4byte _08097140 - .4byte _08097230 - .4byte _080971CC - .4byte _08097244 -_08097110: - bl sub_8098A5C - ldr r0, _0809711C @ =sub_8096C84 - bl SetPSSCallback - b _0809729A - .align 2, 0 -_0809711C: .4byte sub_8096C84 -_08097120: - bl sub_809BE80 - lsls r0, 24 - cmp r0, 0 - bne _080971D6 - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldr r0, _0809713C @ =sub_80972A8 - bl SetPSSCallback - b _0809729A - .align 2, 0 -_0809713C: .4byte sub_80972A8 -_08097140: - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldr r0, _08097154 @ =sub_80972FC - bl SetPSSCallback - b _0809729A - .align 2, 0 -_08097154: .4byte sub_80972FC -_08097158: - bl sub_809BEBC - lsls r0, 24 - cmp r0, 0 - beq _080971D6 - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldr r0, _08097174 @ =c3_0808DC50 - bl SetPSSCallback - b _0809729A - .align 2, 0 -_08097174: .4byte c3_0808DC50 -_08097178: - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldr r0, _0809718C @ =sub_8097390 - bl SetPSSCallback - b _0809729A - .align 2, 0 -_0809718C: .4byte sub_8097390 -_08097190: - bl sub_809BE80 - lsls r0, 24 - cmp r0, 0 - bne _080971D6 - ldr r4, _080971C0 @ =gSharedMem - ldr r1, _080971C4 @ =0x000011f2 - adds r0, r4, r1 - ldrh r0, [r0] - bl ItemIsMail - lsls r0, 24 - cmp r0, 0 - bne _08097210 - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldr r0, _080971C8 @ =sub_809746C - bl SetPSSCallback - b _0809729A - .align 2, 0 -_080971C0: .4byte gSharedMem -_080971C4: .4byte 0x000011f2 -_080971C8: .4byte sub_809746C -_080971CC: - bl sub_809BE80 - lsls r0, 24 - cmp r0, 0 - beq _080971E4 -_080971D6: - ldr r1, _080971E0 @ =gSharedMem - movs r0, 0x2 - strb r0, [r1, 0x4] - b _0809729A - .align 2, 0 -_080971E0: .4byte gSharedMem -_080971E4: - ldr r4, _080971F8 @ =gSharedMem - ldr r1, _080971FC @ =0x000011f9 - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08097200 - movs r0, 0x4 - strb r0, [r4, 0x4] - b _0809729A - .align 2, 0 -_080971F8: .4byte gSharedMem -_080971FC: .4byte 0x000011f9 -_08097200: - ldr r1, _08097218 @ =0x000011f2 - adds r0, r4, r1 - ldrh r0, [r0] - bl ItemIsMail - lsls r0, 24 - cmp r0, 0 - beq _0809721C -_08097210: - movs r0, 0x3 - strb r0, [r4, 0x4] - b _0809729A - .align 2, 0 -_08097218: .4byte 0x000011f2 -_0809721C: - movs r0, 0x5 - bl PlaySE - ldr r0, _0809722C @ =sub_8097594 - bl SetPSSCallback - b _0809729A - .align 2, 0 -_0809722C: .4byte sub_8097594 -_08097230: - movs r0, 0x5 - bl PlaySE - ldr r0, _08097240 @ =sub_8097788 - bl SetPSSCallback - b _0809729A - .align 2, 0 -_08097240: .4byte sub_8097788 -_08097244: - movs r0, 0x5 - bl PlaySE - ldr r0, _08097254 @ =sub_80977E4 - bl SetPSSCallback - b _0809729A - .align 2, 0 -_08097254: .4byte sub_80977E4 -_08097258: - movs r0, 0x20 - bl PlaySE - movs r0, 0xD - b _08097274 -_08097262: - movs r0, 0x20 - bl PlaySE - movs r0, 0x11 - b _08097274 -_0809726C: - movs r0, 0x20 - bl PlaySE - movs r0, 0x16 -_08097274: - bl sub_8098898 - ldr r1, _08097280 @ =gSharedMem - movs r0, 0x5 - strb r0, [r1, 0x4] - b _0809729A - .align 2, 0 -_08097280: .4byte gSharedMem -_08097284: - ldr r0, _080972A0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0xF3 - ands r0, r1 - cmp r0, 0 - beq _0809729A - bl sub_8098A5C - ldr r0, _080972A4 @ =sub_8096C84 - bl SetPSSCallback -_0809729A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080972A0: .4byte gMain -_080972A4: .4byte sub_8096C84 - thumb_func_end sub_8097078 - thumb_func_start sub_80972A8 sub_80972A8: @ 80972A8 push {r4,lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index b0a317cd9..feed68e50 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -64,7 +64,9 @@ struct PokemonStorageSystemData { u16 unk_11f2; u8 filler_11f4[2]; u8 unk_11f6; - u8 filler_11f7[0xc5]; + u8 filler_11f7[2]; + u8 unk_11f9; + u8 filler_11fa[0xc2]; struct PokemonMarkMenu unk_12bc; struct UnkPSSStruct_2002370 unk_2370; u8 filler_25b4[0xd8]; @@ -90,6 +92,7 @@ void SetPSSCallback(void (*func)(void)); void sub_8096BF0(void); void sub_8096C68(void); void sub_8096C84(void); +void sub_8096FC8(void); void sub_8097004(void); void sub_8097078(void); void sub_80972A8(void); @@ -97,21 +100,26 @@ void sub_80972FC(void); void c3_0808DC50(void); void sub_8097390(void); void sub_809746C(void); +void sub_8097594(void); +void sub_8097788(void); +void sub_80977E4(void); void sub_809789C(void); void sub_8097BA0(void); void sub_8097CC0(void); -void BoxSetMosaic(void); -void sub_80986E8(void); -void sub_8098710(void); -void sub_8098A5C(void); -void sub_809B440(void); -void sub_8096FC8(void); void sub_8097DE0(void); void sub_8097E44(void); void sub_8097E70(void); +void BoxSetMosaic(void); void sub_8098400(void); +void add_to_c3_somehow(void); +bool8 sub_80985CC(void); +void sub_80986E8(void); +void sub_8098710(void); void sub_8098734(void); +void sub_809880C(void); +bool8 sub_8098830(void); void sub_8098898(u8 index); +void sub_8098A5C(void); void sub_8098B48(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); @@ -120,7 +128,10 @@ struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); void sub_809AA24(void); void sub_809AA98(void); bool8 sub_809AC00(void); +void sub_809B0C0(u8 a0); void sub_809B0D4(void); +u8 sub_809B0F4(void); +void sub_809B440(void); void sub_809BBC0(void); void sub_809BD14(void); bool8 sub_809BE80(void); @@ -128,6 +139,8 @@ bool8 sub_809BEBC(void); bool8 sub_809BF20(void); bool8 sub_809BF48(void); u8 sub_809CA40(void); +void sub_809CE84(void); +s16 sub_809CF30(void); void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); void sub_809CFF0(void); @@ -1242,6 +1255,169 @@ void sub_8096C84(void) } } +void sub_8096FC8(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_809880C(); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!sub_8098830()) + SetPSSCallback(sub_8096C84); + break; + } +} + +void sub_8097004(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + PlaySE(SE_SELECT); + add_to_c3_somehow(); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!sub_80985CC()) + { + sub_809B0C0(sub_809B0F4()); + ePokemonStorageSystem.unk_0004++; + } + break; + case 2: + if (!sub_809AC00()) + { + if (ePokemonStorageSystem.unk_11f6) + BoxSetMosaic(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097078(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_8098898(4); + sub_809CE84(); + ePokemonStorageSystem.unk_0004 = 1; + break; + case 1: + switch (sub_809CF30()) + { + case -1: + case 0: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 3: + if (sub_809BE80()) + { + ePokemonStorageSystem.unk_0004 = 2; + } + else + { + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_80972A8); + } + break; + case 5: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_80972FC); + break; + case 4: + if (!sub_809BEBC()) + { + ePokemonStorageSystem.unk_0004 = 2; + } + else + { + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(c3_0808DC50); + } + break; + case 2: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_8097390); + break; + case 1: + if (sub_809BE80()) + { + ePokemonStorageSystem.unk_0004 = 2; + } + else if (ItemIsMail(ePokemonStorageSystem.unk_11f2)) + { + ePokemonStorageSystem.unk_0004 = 3; + } + else + { + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_809746C); + } + break; + case 7: + if (sub_809BE80()) + { + ePokemonStorageSystem.unk_0004 = 2; + } + else if (ePokemonStorageSystem.unk_11f9) + { + ePokemonStorageSystem.unk_0004 = 4; + } + else if (ItemIsMail(ePokemonStorageSystem.unk_11f2)) + { + ePokemonStorageSystem.unk_0004 = 3; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097594); + } + break; + case 6: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097788); + break; + case 8: + PlaySE(SE_SELECT); + SetPSSCallback(sub_80977E4); + break; + } + break; + case 2: + PlaySE(SE_HAZURE); + sub_8098898(13); + ePokemonStorageSystem.unk_0004 = 5; + break; + case 4: + PlaySE(SE_HAZURE); + sub_8098898(17); + ePokemonStorageSystem.unk_0004 = 5; + break; + case 3: + PlaySE(SE_HAZURE); + sub_8098898(22); + ePokemonStorageSystem.unk_0004 = 5; + break; + case 5: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From 673d64c35b21ebb8f3c6fc8b547c7f736fa4f593 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 13:53:24 -0700 Subject: through sub_8097390 --- asm/pokemon_storage_system.s | 225 ----------------------------------- src/pokemon/pokemon_storage_system.c | 114 ++++++++++++++++++ 2 files changed, 114 insertions(+), 225 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 46d6b8502..245a69131 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,231 +5,6 @@ .text - thumb_func_start sub_80972A8 -sub_80972A8: @ 80972A8 - push {r4,lr} - ldr r4, _080972B8 @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _080972BC - cmp r0, 0x1 - beq _080972CA - b _080972F2 - .align 2, 0 -_080972B8: .4byte gSharedMem -_080972BC: - movs r0, 0 - bl sub_809B100 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _080972F2 -_080972CA: - bl sub_809B130 - lsls r0, 24 - cmp r0, 0 - bne _080972F2 - ldr r0, _080972E4 @ =gUnknown_0203847C - ldrb r0, [r0] - cmp r0, 0 - beq _080972EC - ldr r0, _080972E8 @ =sub_8097858 - bl SetPSSCallback - b _080972F2 - .align 2, 0 -_080972E4: .4byte gUnknown_0203847C -_080972E8: .4byte sub_8097858 -_080972EC: - ldr r0, _080972F8 @ =sub_8096C84 - bl SetPSSCallback -_080972F2: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080972F8: .4byte sub_8096C84 - thumb_func_end sub_80972A8 - - thumb_func_start sub_80972FC -sub_80972FC: @ 80972FC - push {r4,lr} - ldr r4, _0809730C @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _08097310 - cmp r0, 0x1 - beq _0809731E - b _08097346 - .align 2, 0 -_0809730C: .4byte gSharedMem -_08097310: - movs r0, 0x1 - bl sub_809B100 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08097346 -_0809731E: - bl sub_809B130 - lsls r0, 24 - cmp r0, 0 - bne _08097346 - ldr r0, _08097338 @ =gUnknown_0203847C - ldrb r0, [r0] - cmp r0, 0 - beq _08097340 - ldr r0, _0809733C @ =sub_8097858 - bl SetPSSCallback - b _08097346 - .align 2, 0 -_08097338: .4byte gUnknown_0203847C -_0809733C: .4byte sub_8097858 -_08097340: - ldr r0, _0809734C @ =sub_8096C84 - bl SetPSSCallback -_08097346: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809734C: .4byte sub_8096C84 - thumb_func_end sub_80972FC - - thumb_func_start c3_0808DC50 -c3_0808DC50: @ 8097350 - push {r4,lr} - ldr r4, _08097360 @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _08097364 - cmp r0, 0x1 - beq _08097372 - b _08097386 - .align 2, 0 -_08097360: .4byte gSharedMem -_08097364: - movs r0, 0x2 - bl sub_809B100 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08097386 -_08097372: - bl sub_809B130 - lsls r0, 24 - cmp r0, 0 - bne _08097386 - bl BoxSetMosaic - ldr r0, _0809738C @ =sub_8096C84 - bl SetPSSCallback -_08097386: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809738C: .4byte sub_8096C84 - thumb_func_end c3_0808DC50 - - thumb_func_start sub_8097390 -sub_8097390: @ 8097390 - push {lr} - ldr r0, _080973A4 @ =gSharedMem - ldrb r0, [r0, 0x4] - cmp r0, 0x5 - bhi _08097462 - lsls r0, 2 - ldr r1, _080973A8 @ =_080973AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080973A4: .4byte gSharedMem -_080973A8: .4byte _080973AC - .align 2, 0 -_080973AC: - .4byte _080973C4 - .4byte _080973FC - .4byte _0809741C - .4byte _0809742C - .4byte _0809743E - .4byte _0809745C -_080973C4: - bl CalculatePlayerPartyCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x6 - bne _080973E4 - movs r0, 0xE - bl sub_8098898 - ldr r1, _080973E0 @ =gSharedMem - movs r0, 0x1 - strb r0, [r1, 0x4] - b _08097462 - .align 2, 0 -_080973E0: .4byte gSharedMem -_080973E4: - bl sub_809B0E0 - movs r0, 0 - bl sub_809B100 - ldr r1, _080973F8 @ =gSharedMem - movs r0, 0x2 - strb r0, [r1, 0x4] - b _08097462 - .align 2, 0 -_080973F8: .4byte gSharedMem -_080973FC: - ldr r0, _08097414 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0xF3 - ands r0, r1 - cmp r0, 0 - beq _08097462 - bl sub_8098A5C - ldr r0, _08097418 @ =sub_8096C84 - bl SetPSSCallback - b _08097462 - .align 2, 0 -_08097414: .4byte gMain -_08097418: .4byte sub_8096C84 -_0809741C: - bl sub_809B130 - lsls r0, 24 - cmp r0, 0 - bne _08097462 - bl sub_809880C - b _0809744C -_0809742C: - bl sub_8098830 - lsls r0, 24 - cmp r0, 0 - bne _08097462 - movs r0, 0x1 - bl sub_809B100 - b _0809744C -_0809743E: - bl sub_809B130 - lsls r0, 24 - cmp r0, 0 - bne _08097462 - bl sub_80987DC -_0809744C: - ldr r1, _08097458 @ =gSharedMem - ldrb r0, [r1, 0x4] - adds r0, 0x1 - strb r0, [r1, 0x4] - b _08097462 - .align 2, 0 -_08097458: .4byte gSharedMem -_0809745C: - ldr r0, _08097468 @ =sub_8097004 - bl SetPSSCallback -_08097462: - pop {r0} - bx r0 - .align 2, 0 -_08097468: .4byte sub_8097004 - thumb_func_end sub_8097390 - thumb_func_start sub_809746C sub_809746C: @ 809746C push {r4,lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index feed68e50..6f51b823e 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -103,6 +103,7 @@ void sub_809746C(void); void sub_8097594(void); void sub_8097788(void); void sub_80977E4(void); +void sub_8097858(void); void sub_809789C(void); void sub_8097BA0(void); void sub_8097CC0(void); @@ -116,10 +117,13 @@ bool8 sub_80985CC(void); void sub_80986E8(void); void sub_8098710(void); void sub_8098734(void); +void sub_80987DC(void); void sub_809880C(void); bool8 sub_8098830(void); void sub_8098898(u8 index); void sub_8098A5C(void); +void sub_809B100(u8 a0); +bool8 sub_809B130(void); void sub_8098B48(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); @@ -130,6 +134,7 @@ void sub_809AA98(void); bool8 sub_809AC00(void); void sub_809B0C0(u8 a0); void sub_809B0D4(void); +void sub_809B0E0(void); u8 sub_809B0F4(void); void sub_809B440(void); void sub_809BBC0(void); @@ -1418,6 +1423,115 @@ void sub_8097078(void) } } +void sub_80972A8(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_809B100(0); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!sub_809B130()) + { + if (gUnknown_0203847C) + SetPSSCallback(sub_8097858); + else + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_80972FC(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_809B100(1); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!sub_809B130()) + { + if (gUnknown_0203847C) + SetPSSCallback(sub_8097858); + else + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void c3_0808DC50(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_809B100(2); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!sub_809B130()) + { + BoxSetMosaic(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097390(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + if (CalculatePlayerPartyCount() == 6) + { + sub_8098898(14); + ePokemonStorageSystem.unk_0004 = 1; + } + else + { + sub_809B0E0(); + sub_809B100(0); + ePokemonStorageSystem.unk_0004 = 2; + } + break; + case 1: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + case 2: + if (!sub_809B130()) + { + sub_809880C(); + ePokemonStorageSystem.unk_0004++; + } + break; + case 3: + if (!sub_8098830()) + { + sub_809B100(1); + ePokemonStorageSystem.unk_0004++; + } + break; + case 4: + if (!sub_809B130()) + { + sub_80987DC(); + ePokemonStorageSystem.unk_0004++; + } + break; + case 5: + SetPSSCallback(sub_8097004); + break; + } +} + asm(".section .text.8098898"); void sub_8098898(u8 index) { -- cgit v1.2.3 From c4c885504729b56c00aa245aea6e284a1b6a1719 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 8 Jan 2018 15:53:35 -0600 Subject: make gUnknown_03000740 static --- include/easy_chat.h | 1 - src/easy_chat_2.c | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/include/easy_chat.h b/include/easy_chat.h index a70d7ad0c..c68a3fa02 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -115,7 +115,6 @@ struct Shared1000 }; extern u8 gUnknown_020388AC; -extern u8 gUnknown_03000740; // const pointer to shared1000. easy_chat might be two separate files. extern struct Shared1000 *const gEasyChatStruct; diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 8a3bb9ab9..fe3aa7cc9 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -70,8 +70,7 @@ static u16 sub_80EB960(void); u8 sub_80EB9C8(void); static u16 sub_80EB9D8(void); -// put this in .bss, damnit! -__attribute__((section(".bss"))) u8 gUnknown_03000740 = 0; +static u8 gUnknown_03000740; const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); const u16 InterviewPalette_1[] = INCBIN_U16("graphics/misc/interview_pal1.gbapal"); @@ -328,19 +327,6 @@ const union AnimCmd *const gSpriteAnimTable_83DBC9C[] = gSpriteAnim_83DBC74, }; -/* -const struct SpriteTemplate gSpriteTemplate_83DBCAC = -{ - .tileTag = 1, - .paletteTag = 1, - .oam = &gOamData_83DBC14, - .anims = gSpriteAnimTable_83DBC7C, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80E85F8, -}; -*/ - void sub_80E8420(void) { struct SpriteTemplate spriteTemplate_83DBCAC = -- cgit v1.2.3 From 78df16e7989be5142ed0d1fd01c4ece6483f0571 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 14:57:26 -0700 Subject: Through sub_809746C; enums for PC storage actions --- asm/pokemon_storage_system.s | 153 +++-------------------------- data/pokemon_storage_system.s | 2 +- include/ewram.h | 4 - src/pokemon/pokemon_storage_system.c | 182 +++++++++++++++++++++++++++-------- 4 files changed, 156 insertions(+), 185 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 245a69131..2622e7d84 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,137 +5,6 @@ .text - thumb_func_start sub_809746C -sub_809746C: @ 809746C - push {r4,lr} - ldr r0, _08097484 @ =gSharedMem - ldrb r0, [r0, 0x4] - cmp r0, 0x4 - bls _08097478 - b _08097584 -_08097478: - lsls r0, 2 - ldr r1, _08097488 @ =_0809748C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08097484: .4byte gSharedMem -_08097488: .4byte _0809748C - .align 2, 0 -_0809748C: - .4byte _080974A0 - .4byte _080974D8 - .4byte _08097534 - .4byte _08097548 - .4byte _0809756C -_080974A0: - movs r0, 0x6 - bl sub_8098898 - ldr r4, _080974C8 @ =gSharedMem + 0x2370 - ldr r2, _080974CC @ =0x0000daca - adds r0, r4, 0 - movs r1, 0x7 - movs r3, 0x3 - bl sub_8096264 - ldr r0, _080974D0 @ =gUnknown_0203847E - ldrb r0, [r0] - bl sub_809634C - ldr r0, _080974D4 @ =0xffffdc90 - adds r4, r0 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08097584 - .align 2, 0 -_080974C8: .4byte gSharedMem + 0x2370 -_080974CC: .4byte 0x0000daca -_080974D0: .4byte gUnknown_0203847E -_080974D4: .4byte 0xffffdc90 -_080974D8: - bl sub_8096368 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xC8 - beq _08097584 - cmp r4, 0xC9 - bne _080974F6 - bl sub_8098A5C - bl sub_809635C - bl sub_8096310 - b _0809755E -_080974F6: - adds r0, r4, 0 - bl sub_809B62C - lsls r0, 24 - cmp r0, 0 - beq _08097518 - bl sub_8098A5C - bl sub_809635C - bl sub_8096310 - ldr r1, _08097514 @ =gSharedMem - movs r0, 0x2 - b _08097522 - .align 2, 0 -_08097514: .4byte gSharedMem -_08097518: - movs r0, 0x8 - bl sub_8098898 - ldr r1, _0809752C @ =gSharedMem - movs r0, 0x4 -_08097522: - strb r0, [r1, 0x4] - ldr r0, _08097530 @ =gUnknown_0203847E - strb r4, [r0] - b _08097584 - .align 2, 0 -_0809752C: .4byte gSharedMem -_08097530: .4byte gUnknown_0203847E -_08097534: - bl party_compaction - bl sub_8099310 - ldr r1, _08097544 @ =gSharedMem - ldrb r0, [r1, 0x4] - adds r0, 0x1 - b _08097582 - .align 2, 0 -_08097544: .4byte gSharedMem -_08097548: - bl sub_8099374 - lsls r0, 24 - cmp r0, 0 - bne _08097584 - bl sub_809B6BC - bl BoxSetMosaic - bl sub_80987DC -_0809755E: - ldr r0, _08097568 @ =sub_8096C84 - bl SetPSSCallback - b _08097584 - .align 2, 0 -_08097568: .4byte sub_8096C84 -_0809756C: - ldr r0, _0809758C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _08097584 - movs r0, 0x6 - bl sub_8098898 - ldr r1, _08097590 @ =gSharedMem - movs r0, 0x1 -_08097582: - strb r0, [r1, 0x4] -_08097584: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809758C: .4byte gMain -_08097590: .4byte gSharedMem - thumb_func_end sub_809746C - thumb_func_start sub_8097594 sub_8097594: @ 8097594 push {r4,lr} @@ -171,7 +40,7 @@ _080975B4: .4byte _08097764 _080975EC: movs r0, 0x9 - bl sub_8098898 + bl PrintStorageActionText movs r0, 0x1 bl sub_8098A38 ldr r1, _0809761C @ =gSharedMem @@ -332,7 +201,7 @@ _08097732: beq _0809777A movs r0, 0x14 _08097740: - bl sub_8098898 + bl PrintStorageActionText _08097744: ldr r1, _08097754 @ =gSharedMem ldrb r0, [r1, 0x4] @@ -429,7 +298,7 @@ sub_80977E4: @ 80977E4 _080977F4: .4byte gSharedMem _080977F8: movs r0, 0xC - bl sub_8098898 + bl PrintStorageActionText ldr r0, _08097820 @ =0x000011f7 adds r2, r4, r0 ldrb r1, [r2] @@ -519,7 +388,7 @@ sub_809789C: @ 809789C _080978AC: .4byte gSharedMem _080978B0: movs r0, 0x1 - bl sub_8098898 + bl PrintStorageActionText bl sub_809CE84 ldrb r0, [r4, 0x4] adds r0, 0x1 @@ -617,7 +486,7 @@ _0809798C: _08097996: bl sub_8098A80 movs r0, 0x2 - bl sub_8098898 + bl PrintStorageActionText b _08097A3C _080979A2: bl sub_809CF30 @@ -655,7 +524,7 @@ _080979D4: lsrs r0, 24 bl sub_8098AA8 movs r0, 0x3 - bl sub_8098898 + bl PrintStorageActionText b _08097A3C _080979FC: bl sub_809CF30 @@ -730,7 +599,7 @@ _08097A7C: b _08097B32 _08097A86: movs r0, 0x5 - bl sub_8098898 + bl PrintStorageActionText ldr r1, _08097AA4 @ =0x00002370 adds r0, r5, r1 ldr r2, _08097AA8 @ =0x0000daca @@ -891,7 +760,7 @@ _08097BD4: movs r0, 0x20 bl PlaySE movs r0, 0xF - bl sub_8098898 + bl PrintStorageActionText ldr r1, _08097BF4 @ =gSharedMem movs r0, 0x1 strb r0, [r1, 0x4] @@ -902,7 +771,7 @@ _08097BF8: movs r0, 0x5 bl PlaySE movs r0, 0 - bl sub_8098898 + bl PrintStorageActionText movs r0, 0 bl sub_8098A38 ldr r1, _08097C14 @ =gSharedMem @@ -1025,7 +894,7 @@ _08097CF4: movs r0, 0x20 bl PlaySE movs r0, 0xF - bl sub_8098898 + bl PrintStorageActionText ldr r1, _08097D14 @ =gSharedMem movs r0, 0x1 strb r0, [r1, 0x4] @@ -1036,7 +905,7 @@ _08097D18: movs r0, 0x5 bl PlaySE movs r0, 0x12 - bl sub_8098898 + bl PrintStorageActionText movs r0, 0 bl sub_8098A38 ldr r1, _08097D34 @ =gSharedMem diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index b9b18e707..4340301ba 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -98,7 +98,7 @@ gSpriteTemplate_83B6DDC:: @ 83B6DDC spr_template 2, 56007, gOamData_83B6EAC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -gUnknown_083B6DF4:: @ 83B6DF4 +gPCStorageActionTexts:: @ 83B6DF4 .4byte PCText_ExitBox, 0 .4byte PCText_WhatYouDo, 0 .4byte PCText_PickATheme, 0 diff --git a/include/ewram.h b/include/ewram.h index 19e05134f..d8ebd71ec 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -39,10 +39,6 @@ extern u8 gSharedMem[]; #define ewram01000 (*(struct Unk2001000 *)(gSharedMem + 0x1000)) #define ewramBerryPicTemp (gSharedMem + 0x1000) #define EWRAM_1000 (*(struct Struct2001000 *)(gSharedMem + 0x1000)) -#define gUnk20011fa (u8 *)(&gSharedMem[0x11FA]) -#define gUnk2002694 (u8 *)(&gSharedMem[0x2694]) -#define gUnk20026A6 (u8 *)(&gSharedMem[0x26A6]) -#define gUnk20026e4 (u8 *)(&gSharedMem[0x26E4]) #define ewram4000 (gSharedMem + 0x4000) #define gUnknown_02007000 (*(ewramStruct_02007000 *)(gSharedMem + 0x7000)) #define ARRAY_2007800 ((struct EasyChatPair *)(gSharedMem + 0x7800)) diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 6f51b823e..916dc411a 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -19,6 +19,42 @@ #include "naming_screen.h" #include "pokemon_storage_system.h" +enum { + PC_TEXT_EXIT_BOX, + PC_TEXT_WHAT_YOU_DO, + PC_TEXT_PICK_A_THEME, + PC_TEXT_PICK_A_WALLPAPER, + PC_TEXT_IS_SELECTED, + PC_TEXT_JUMP_TO_WHICH_BOX, + PC_TEXT_DEPOSIT_IN_WHICH_BOX, + PC_TEXT_WAS_DEPOSITED, + PC_TEXT_BOX_IS_FULL, + PC_TEXT_RELEASE_POKE, + PC_TEXT_WAS_RELEASED, + PC_TEXT_BYE_BYE, + PC_TEXT_MARK_POKE, + PC_TEXT_LAST_POKE, + PC_TEXT_PARTY_FULL, + PC_TEXT_HOLDING_POKE, + PC_TEXT_WHICH_ONE_WILL_TAKE, + PC_TEXT_CANT_RELEASE_EGG, + PC_TEXT_CONTINUE_BOX, + PC_TEXT_CAME_BACK, + PC_TEXT_WORRIED, + PC_TEXT_SURPRISE, + PC_TEXT_PLEASE_REMOVE_MAIL +}; + +enum { + PC_TEXT_FMT_NORMAL, + PC_TEXT_FMT_MON_NAME, + PC_TEXT_FMT_UNK_02, + PC_TEXT_FMT_UNK_03, + PC_TEXT_FMT_MON_NAME_2, + PC_TEXT_FMT_UNK_05, + PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK +}; + struct StorageAction { u8 *text; u8 format; @@ -66,7 +102,7 @@ struct PokemonStorageSystemData { u8 unk_11f6; u8 filler_11f7[2]; u8 unk_11f9; - u8 filler_11fa[0xc2]; + u8 unk_11fa[0xc2]; struct PokemonMarkMenu unk_12bc; struct UnkPSSStruct_2002370 unk_2370; u8 filler_25b4[0xd8]; @@ -74,6 +110,9 @@ struct PokemonStorageSystemData { u8 unk_268d; u8 unk_268e; struct Pokemon *unk_2690; + u8 unk_2694[18]; + u8 unk_26a6[62]; + u8 unk_26e4[80]; }; void StorageSystemCreatePrimaryMenu(u8 whichMenu); @@ -120,11 +159,13 @@ void sub_8098734(void); void sub_80987DC(void); void sub_809880C(void); bool8 sub_8098830(void); -void sub_8098898(u8 index); +void PrintStorageActionText(u8 index); void sub_8098A5C(void); void sub_809B100(u8 a0); bool8 sub_809B130(void); void sub_8098B48(void); +void sub_8099310(void); +bool8 sub_8099374(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); bool8 sub_8099D34(void); @@ -137,6 +178,8 @@ void sub_809B0D4(void); void sub_809B0E0(void); u8 sub_809B0F4(void); void sub_809B440(void); +bool8 sub_809B62C(u8); +void sub_809B6BC(void); void sub_809BBC0(void); void sub_809BD14(void); bool8 sub_809BE80(void); @@ -198,7 +241,7 @@ const u8 gBoxSelectionPopupCenterTiles[] = INCBIN_U8("graphics/pokemon_storage/b const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp"); -extern const struct StorageAction gUnknown_083B6DF4[]; +extern const struct StorageAction gPCStorageActionTexts[]; extern const struct PokemonStorageSystemData *gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; @@ -1107,7 +1150,7 @@ void sub_8096C84(void) case 5: if (ePokemonStorageSystem.unk_0005 != 2) { - sub_8098898(16); + PrintStorageActionText(PC_TEXT_WHICH_ONE_WILL_TAKE); ePokemonStorageSystem.unk_0004 = 3; } else @@ -1242,12 +1285,12 @@ void sub_8096C84(void) break; case 4: PlaySE(SE_HAZURE); - sub_8098898(13); + PrintStorageActionText(PC_TEXT_LAST_POKE); ePokemonStorageSystem.unk_0004 = 6; break; case 5: PlaySE(SE_HAZURE); - sub_8098898(22); + PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); ePokemonStorageSystem.unk_0004 = 6; break; case 6: @@ -1307,7 +1350,7 @@ void sub_8097078(void) switch (ePokemonStorageSystem.unk_0004) { case 0: - sub_8098898(4); + PrintStorageActionText(PC_TEXT_IS_SELECTED); sub_809CE84(); ePokemonStorageSystem.unk_0004 = 1; break; @@ -1400,17 +1443,17 @@ void sub_8097078(void) break; case 2: PlaySE(SE_HAZURE); - sub_8098898(13); + PrintStorageActionText(PC_TEXT_LAST_POKE); ePokemonStorageSystem.unk_0004 = 5; break; case 4: PlaySE(SE_HAZURE); - sub_8098898(17); + PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG); ePokemonStorageSystem.unk_0004 = 5; break; case 3: PlaySE(SE_HAZURE); - sub_8098898(22); + PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); ePokemonStorageSystem.unk_0004 = 5; break; case 5: @@ -1488,7 +1531,7 @@ void sub_8097390(void) case 0: if (CalculatePlayerPartyCount() == 6) { - sub_8098898(14); + PrintStorageActionText(PC_TEXT_PARTY_FULL); ePokemonStorageSystem.unk_0004 = 1; } else @@ -1532,83 +1575,146 @@ void sub_8097390(void) } } +void sub_809746C(void) +{ + u8 r4; + + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); + sub_8096264(&ePokemonStorageSystem.unk_2370, 0x0007, 0xdaca, 3); + sub_809634C(gUnknown_0203847E); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + r4 = sub_8096368(); + if (r4 == 200); + else if (r4 == 201) + { + sub_8098A5C(); + sub_809635C(); + sub_8096310(); + SetPSSCallback(sub_8096C84); + } + else + { + if (sub_809B62C(r4)) + { + sub_8098A5C(); + sub_809635C(); + sub_8096310(); + ePokemonStorageSystem.unk_0004 = 2; + } + else + { + PrintStorageActionText(PC_TEXT_BOX_IS_FULL); + ePokemonStorageSystem.unk_0004 = 4; + } + gUnknown_0203847E = r4; + } + break; + case 2: + party_compaction(); + sub_8099310(); + ePokemonStorageSystem.unk_0004++; + break; + case 3: + if (!sub_8099374()) + { + sub_809B6BC(); + BoxSetMosaic(); + sub_80987DC(); + SetPSSCallback(sub_8096C84); + } + break; + case 4: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); + ePokemonStorageSystem.unk_0004 = 1; + } + break; + } +} + asm(".section .text.8098898"); -void sub_8098898(u8 index) { +void PrintStorageActionText(u8 index) { u8 *ptr; MenuDrawTextWindow(10, 16, 29, 19); - switch (gUnknown_083B6DF4[index].format) + switch (gPCStorageActionTexts[index].format) { - case 2: - ptr = StringCopy(gUnk2002694, gUnknown_083B6DF4[index].text); - ptr = StringCopy(ptr, gUnk20011fa); + case PC_TEXT_FMT_UNK_02: + ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr, ePokemonStorageSystem.unk_11fa); break; - case 5: - ptr = StringCopy(gUnk2002694, gUnknown_083B6DF4[index].text); - ptr = StringCopy(ptr, gUnk20026e4); + case PC_TEXT_FMT_UNK_05: + ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr, ePokemonStorageSystem.unk_26e4); break; - case 1: + case PC_TEXT_FMT_MON_NAME: // {var} + " is selected." - ptr = StringCopy(gUnk2002694, gUnk20011fa); - ptr = StringCopy(ptr, gUnknown_083B6DF4[index].text); + ptr = StringCopy(ePokemonStorageSystem.unk_2694, ePokemonStorageSystem.unk_11fa); + ptr = StringCopy(ptr, gPCStorageActionTexts[index].text); break; - case 4: + case PC_TEXT_FMT_MON_NAME_2: // {var} + " was released." - ptr = StringCopy(gUnk2002694, gUnk20026e4); + ptr = StringCopy(ePokemonStorageSystem.unk_2694, ePokemonStorageSystem.unk_26e4); #if ENGLISH - ptr = StringCopy(ptr, gUnknown_083B6DF4[index].text); + ptr = StringCopy(ptr, gPCStorageActionTexts[index].text); #elif GERMAN - ptr = de_sub_8073174(gUnk2002694, gUnknown_083B6DF4[index].text); + ptr = de_sub_8073174(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); #endif break; - case 3: + case PC_TEXT_FMT_UNK_03: { u8 *stringLength; u8 *text; - text = gUnknown_083B6DF4[index].text; + text = gPCStorageActionTexts[index].text; stringLength = &text[StringLength(text)] + 1; - ptr = StringCopy(gUnk2002694, gUnknown_083B6DF4[index].text); - ptr = StringCopy(ptr, gUnk20011fa); + ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr, ePokemonStorageSystem.unk_11fa); ptr = StringCopy(ptr, stringLength); } break; - case 6: + case PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK: // "Bye-bye, ".substr(0, -1) + {var} + "Bye-bye, !".substr(-1, 1) { u8 *stringLength; u8 *text; - text = gUnknown_083B6DF4[index].text; + text = gPCStorageActionTexts[index].text; stringLength = &text[StringLength(text)] - 1; - ptr = StringCopy(gUnk2002694, gUnknown_083B6DF4[index].text); - ptr = StringCopy(ptr - 1, gUnk20026e4); + ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr - 1, ePokemonStorageSystem.unk_26e4); ptr = StringCopy(ptr, stringLength); } break; - case 0: + case PC_TEXT_FMT_NORMAL: default: - ptr = StringCopy(gUnk2002694, gUnknown_083B6DF4[index].text); + ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); break; } - while (ptr < gUnk20026A6) + while (ptr < ePokemonStorageSystem.unk_26a6) { ptr[0] = CHAR_SPACE; ptr++; } ptr[0] = EOS; - MenuPrint(gUnk2002694, 11, 17); + MenuPrint(ePokemonStorageSystem.unk_2694, 11, 17); } -- cgit v1.2.3 From a289caaf97cddbf212fc860013b8815323a84921 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 8 Jan 2018 17:03:06 -0500 Subject: let the user deal with nogbaprint, forget this --- src/libs/libisagbprn.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index eccc31f48..c066a41a0 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -2,16 +2,14 @@ #include #include "gba/gba.h" #include "config.h" -#include "assert.h" #define AGB_PRINT_FLUSH_ADDR 0x9FE209D #define AGB_PRINT_STRUCT_ADDR 0x9FE20F8 #define AGB_PRINT_PROTECT_ADDR 0x9FE2FFE #define WSCNT_DATA (WAITCNT_PHI_OUT_16MHZ | WAITCNT_WS0_S_2 | WAITCNT_WS0_N_4) -// TODO: make no$gba support not shit - // for auto no$gba support, the string "no$gba" should be at this address. +// except it's not, blame Martin, hence I'm letting the user deal with this nonsense. #define NOGBAIDADDR 0x4FFFA00 #define NOGBAPRINTADDR 0x4FFFA14 @@ -26,6 +24,7 @@ struct AGBPrintStruct typedef void (*LPFN_PRINT_FLUSH)(void); #ifndef NDEBUG + void AGBPrintFlush1Block(void); void AGBPrintInit(void) @@ -156,12 +155,12 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP } } -// TODO: Find a way to seamlessly support no$gba without shit hack defines -// nogba print function +// nogba print function, uncomment to use /* void NOGBAPrint(const char *pBuf) { *(volatile u32*)NOGBAPRINTADDR = (u32)pBuf; -}*/ +} +*/ #endif -- cgit v1.2.3 From 882bf5c3cf945927b3049eb8675bf1964d8706e8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 15:22:37 -0700 Subject: sub_8097594 --- asm/pokemon_storage_system.s | 232 ----------------------------------- src/pokemon/pokemon_storage_system.c | 144 +++++++++++++++++++++- 2 files changed, 142 insertions(+), 234 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 2622e7d84..8d31aedb4 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,238 +5,6 @@ .text - thumb_func_start sub_8097594 -sub_8097594: @ 8097594 - push {r4,lr} - ldr r0, _080975AC @ =gSharedMem - ldrb r0, [r0, 0x4] - cmp r0, 0xD - bls _080975A0 - b _0809777A -_080975A0: - lsls r0, 2 - ldr r1, _080975B0 @ =_080975B4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080975AC: .4byte gSharedMem -_080975B0: .4byte _080975B4 - .align 2, 0 -_080975B4: - .4byte _080975EC - .4byte _08097600 - .4byte _0809763A - .4byte _0809766E - .4byte _0809767A - .4byte _08097690 - .4byte _080976C8 - .4byte _080976E0 - .4byte _080976EC - .4byte _080976F0 - .4byte _08097704 - .4byte _08097720 - .4byte _08097732 - .4byte _08097764 -_080975EC: - movs r0, 0x9 - bl PrintStorageActionText - movs r0, 0x1 - bl sub_8098A38 - ldr r1, _0809761C @ =gSharedMem - ldrb r0, [r1, 0x4] - adds r0, 0x1 - strb r0, [r1, 0x4] -_08097600: - bl ProcessMenuInputNoWrap - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _0809762C - cmp r1, 0 - bgt _08097620 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08097626 - b _0809777A - .align 2, 0 -_0809761C: .4byte gSharedMem -_08097620: - cmp r1, 0x1 - beq _08097626 - b _0809777A -_08097626: - bl sub_8098A5C - b _080976E0 -_0809762C: - bl sub_8098A5C - bl sub_809B7D4 - bl sub_809B6DC - b _08097744 -_0809763A: - bl sub_809B960 - bl sub_809B734 - lsls r0, 24 - cmp r0, 0 - beq _0809764A - b _0809777A -_0809764A: - ldr r4, _08097650 @ =gSharedMem - b _0809765A - .align 2, 0 -_08097650: .4byte gSharedMem -_08097654: - cmp r0, 0 - bne _0809765A - b _08097758 -_0809765A: - bl sub_809B960 - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _08097654 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _0809777A -_0809766E: - bl sub_809B760 - bl sub_809801C - movs r0, 0xA - b _08097740 -_0809767A: - ldr r0, _0809768C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08097688 - b _0809777A -_08097688: - movs r0, 0xB - b _08097740 - .align 2, 0 -_0809768C: .4byte gMain -_08097690: - ldr r0, _080976B4 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _0809777A - bl sub_8098A5C - ldr r0, _080976B8 @ =gUnknown_0203847C - ldrb r0, [r0] - cmp r0, 0 - beq _080976BC - bl party_compaction - bl sub_8099310 - b _08097744 - .align 2, 0 -_080976B4: .4byte gMain -_080976B8: .4byte gUnknown_0203847C -_080976BC: - ldr r1, _080976C4 @ =gSharedMem - movs r0, 0x7 - strb r0, [r1, 0x4] - b _0809777A - .align 2, 0 -_080976C4: .4byte gSharedMem -_080976C8: - bl sub_8099374 - lsls r0, 24 - cmp r0, 0 - bne _0809777A - bl sub_809B440 - bl BoxSetMosaic - bl sub_80987DC - b _08097744 -_080976E0: - ldr r0, _080976E8 @ =sub_8096C84 - bl SetPSSCallback - b _0809777A - .align 2, 0 -_080976E8: .4byte sub_8096C84 -_080976EC: - movs r0, 0xA - b _08097740 -_080976F0: - ldr r0, _08097700 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _0809777A - movs r0, 0x15 - b _08097740 - .align 2, 0 -_08097700: .4byte gMain -_08097704: - ldr r0, _0809771C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _0809777A - bl sub_8098A5C - bl sub_8099958 - b _08097744 - .align 2, 0 -_0809771C: .4byte gMain -_08097720: - bl sub_8099990 - lsls r0, 24 - cmp r0, 0 - bne _0809777A - bl sub_809B7AC - movs r0, 0x13 - b _08097740 -_08097732: - ldr r0, _08097750 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _0809777A - movs r0, 0x14 -_08097740: - bl PrintStorageActionText -_08097744: - ldr r1, _08097754 @ =gSharedMem - ldrb r0, [r1, 0x4] - adds r0, 0x1 - strb r0, [r1, 0x4] - b _0809777A - .align 2, 0 -_08097750: .4byte gMain -_08097754: .4byte gSharedMem -_08097758: - ldr r1, _08097760 @ =gSharedMem - movs r0, 0x8 - strb r0, [r1, 0x4] - b _0809777A - .align 2, 0 -_08097760: .4byte gSharedMem -_08097764: - ldr r0, _08097780 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _0809777A - bl sub_8098A5C - ldr r0, _08097784 @ =sub_8096C84 - bl SetPSSCallback -_0809777A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097780: .4byte gMain -_08097784: .4byte sub_8096C84 - thumb_func_end sub_8097594 - thumb_func_start sub_8097788 sub_8097788: @ 8097788 push {r4,r5,lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 916dc411a..9e18dadb5 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -158,14 +158,16 @@ void sub_8098710(void); void sub_8098734(void); void sub_80987DC(void); void sub_809880C(void); +void sub_809801C(void); bool8 sub_8098830(void); void PrintStorageActionText(u8 index); +void sub_8098A38(u8); void sub_8098A5C(void); -void sub_809B100(u8 a0); -bool8 sub_809B130(void); void sub_8098B48(void); void sub_8099310(void); bool8 sub_8099374(void); +void sub_8099958(void); +bool8 sub_8099990(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); bool8 sub_8099D34(void); @@ -177,9 +179,17 @@ void sub_809B0C0(u8 a0); void sub_809B0D4(void); void sub_809B0E0(void); u8 sub_809B0F4(void); +void sub_809B100(u8 a0); +bool8 sub_809B130(void); void sub_809B440(void); bool8 sub_809B62C(u8); void sub_809B6BC(void); +void sub_809B6DC(void); +bool8 sub_809B734(void); +void sub_809B760(void); +void sub_809B7AC(void); +void sub_809B7D4(void); +s8 sub_809B960(void); void sub_809BBC0(void); void sub_809BD14(void); bool8 sub_809BE80(void); @@ -1638,6 +1648,136 @@ void sub_809746C(void) } } +void sub_8097594(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_RELEASE_POKE); + sub_8098A38(1); + ePokemonStorageSystem.unk_0004++; + // fallthrough + case 1: + switch (ProcessMenuInputNoWrap()) + { + case -1: + case 1: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 0: + sub_8098A5C(); + sub_809B7D4(); + sub_809B6DC(); + ePokemonStorageSystem.unk_0004++; + break; + } + break; + case 2: + sub_809B960(); + if (!sub_809B734()) + { + while (1) + { + s8 r0 = sub_809B960(); + if (r0 == 1) + { + ePokemonStorageSystem.unk_0004++; + break; + } + if (r0 == 0) + { + ePokemonStorageSystem.unk_0004 = 8; + break; + } + } + } + break; + case 3: + sub_809B760(); + sub_809801C(); + PrintStorageActionText(PC_TEXT_WAS_RELEASED); + ePokemonStorageSystem.unk_0004++; + break; + case 4: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_BYE_BYE); + ePokemonStorageSystem.unk_0004++; + } + break; + case 5: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + sub_8098A5C(); + if (gUnknown_0203847C) + { + party_compaction(); + sub_8099310(); + ePokemonStorageSystem.unk_0004++; + } + else + { + ePokemonStorageSystem.unk_0004 = 7; + } + } + break; + case 6: + if (!sub_8099374()) + { + sub_809B440(); + BoxSetMosaic(); + sub_80987DC(); + ePokemonStorageSystem.unk_0004++; + } + break; + case 7: + SetPSSCallback(sub_8096C84); + break; + case 8: + PrintStorageActionText(PC_TEXT_WAS_RELEASED); + ePokemonStorageSystem.unk_0004++; + break; + case 9: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_SURPRISE); + ePokemonStorageSystem.unk_0004++; + } + break; + case 10: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + sub_8098A5C(); + sub_8099958(); + ePokemonStorageSystem.unk_0004++; + } + break; + case 11: + if (!sub_8099990()) + { + sub_809B7AC(); + PrintStorageActionText(PC_TEXT_CAME_BACK); + ePokemonStorageSystem.unk_0004++; + } + break; + case 12: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_WORRIED); + ePokemonStorageSystem.unk_0004++; + } + break; + case 13: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + asm(".section .text.8098898"); void PrintStorageActionText(u8 index) { -- cgit v1.2.3 From 660fa0c0f38a684eda6c117958447deacac88820 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 15:37:05 -0700 Subject: through sub_8097858 --- asm/pokemon_storage_system.s | 137 ----------------------------------- include/mon_markings.h | 5 +- src/pokemon/pokemon_storage_system.c | 67 ++++++++++++++++- 3 files changed, 70 insertions(+), 139 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8d31aedb4..311b3552a 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,143 +5,6 @@ .text - thumb_func_start sub_8097788 -sub_8097788: @ 8097788 - push {r4,r5,lr} - sub sp, 0x4 - ldr r5, _0809779C @ =gSharedMem - ldrb r4, [r5, 0x4] - cmp r4, 0 - beq _080977A0 - cmp r4, 0x1 - beq _080977BC - b _080977D4 - .align 2, 0 -_0809779C: .4byte gSharedMem -_080977A0: - bl sub_809BC18 - movs r0, 0x1 - negs r0, r0 - str r4, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrb r0, [r5, 0x4] - adds r0, 0x1 - strb r0, [r5, 0x4] - b _080977D4 -_080977BC: - bl UpdatePaletteFade - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - bne _080977D4 - ldr r0, _080977DC @ =gUnknown_0203847F - strb r1, [r0] - strb r1, [r5, 0x6] - ldr r0, _080977E0 @ =sub_8096B5C - bl SetMainCallback2 -_080977D4: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080977DC: .4byte gUnknown_0203847F -_080977E0: .4byte sub_8096B5C - thumb_func_end sub_8097788 - - thumb_func_start sub_80977E4 -sub_80977E4: @ 80977E4 - push {r4,lr} - ldr r4, _080977F4 @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _080977F8 - cmp r0, 0x1 - beq _08097824 - b _0809784C - .align 2, 0 -_080977F4: .4byte gSharedMem -_080977F8: - movs r0, 0xC - bl PrintStorageActionText - ldr r0, _08097820 @ =0x000011f7 - adds r2, r4, r0 - ldrb r1, [r2] - movs r3, 0x96 - lsls r3, 5 - adds r0, r4, r3 - strb r1, [r0] - ldrb r0, [r2] - movs r1, 0xB0 - movs r2, 0x10 - bl sub_80F7418 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _0809784C - .align 2, 0 -_08097820: .4byte 0x000011f7 -_08097824: - bl sub_80F7500 - lsls r0, 24 - cmp r0, 0 - bne _0809784C - bl sub_80F7470 - bl sub_8098A5C - movs r1, 0x96 - lsls r1, 5 - adds r0, r4, r1 - ldrb r0, [r0] - bl sub_809BDD8 - bl sub_809801C - ldr r0, _08097854 @ =sub_8096C84 - bl SetPSSCallback -_0809784C: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097854: .4byte sub_8096C84 - thumb_func_end sub_80977E4 - - thumb_func_start sub_8097858 -sub_8097858: @ 8097858 - push {r4,lr} - ldr r4, _08097868 @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _0809786C - cmp r0, 0x1 - beq _0809787C - b _08097890 - .align 2, 0 -_08097868: .4byte gSharedMem -_0809786C: - bl party_compaction - bl sub_8099310 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08097890 -_0809787C: - bl sub_8099374 - lsls r0, 24 - cmp r0, 0 - bne _08097890 - bl sub_80987DC - ldr r0, _08097898 @ =sub_8096C84 - bl SetPSSCallback -_08097890: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097898: .4byte sub_8096C84 - thumb_func_end sub_8097858 - thumb_func_start sub_809789C sub_809789C: @ 809789C push {r4,lr} diff --git a/include/mon_markings.h b/include/mon_markings.h index eae80861a..3b4aa333c 100644 --- a/include/mon_markings.h +++ b/include/mon_markings.h @@ -20,7 +20,10 @@ struct PokemonMarkMenu /*0x10B0*/ u8 tileLoadState; }; // 10b4 -void sub_80F7404(void); void sub_80F727C(struct PokemonMarkMenu *ptr); +void sub_80F7404(void); +void sub_80F7418(u8 markings, s16 x, s16 y); +void sub_80F7470(void); +bool8 sub_80F7500(void); #endif //POKERUBY_MON_MARKINGS_H diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 9e18dadb5..8b0893c73 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -100,7 +100,8 @@ struct PokemonStorageSystemData { u16 unk_11f2; u8 filler_11f4[2]; u8 unk_11f6; - u8 filler_11f7[2]; + u8 unk_11f7; + u8 unk_11f8; u8 unk_11f9; u8 unk_11fa[0xc2]; struct PokemonMarkMenu unk_12bc; @@ -191,7 +192,9 @@ void sub_809B7AC(void); void sub_809B7D4(void); s8 sub_809B960(void); void sub_809BBC0(void); +void sub_809BC18(void); void sub_809BD14(void); +void sub_809BDD8(u8 markings); bool8 sub_809BE80(void); bool8 sub_809BEBC(void); bool8 sub_809BF20(void); @@ -1778,6 +1781,68 @@ void sub_8097594(void) } } +void sub_8097788(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_809BC18(); + BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!UpdatePaletteFade()) + { + gUnknown_0203847F = 0; + ePokemonStorageSystem.unk_0006 = 0; + SetMainCallback2(sub_8096B5C); + } + break; + } +} + +void sub_80977E4(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_MARK_POKE); + ePokemonStorageSystem.unk_12bc.markings = ePokemonStorageSystem.unk_11f7; + sub_80F7418(ePokemonStorageSystem.unk_11f7, 0xb0, 0x10); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!sub_80F7500()) + { + sub_80F7470(); + sub_8098A5C(); + sub_809BDD8(ePokemonStorageSystem.unk_12bc.markings); + sub_809801C(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097858(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + party_compaction(); + sub_8099310(); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!sub_8099374()) + { + sub_80987DC(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + asm(".section .text.8098898"); void PrintStorageActionText(u8 index) { -- cgit v1.2.3 From 353a083d97be81cbc612ecb8de46b62a0e523362 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Tue, 9 Jan 2018 02:38:57 +0100 Subject: Finished decompiling battle_anim_sfx --- asm/battle_anim_sfx.s | 224 ----------------------------------------------- include/battle_anim.h | 2 +- ld_script.txt | 1 - src/battle/anim/sfx.c | 149 +++++++++++++++++++++++++------ src/battle/battle_anim.c | 6 +- 5 files changed, 127 insertions(+), 255 deletions(-) delete mode 100644 asm/battle_anim_sfx.s diff --git a/asm/battle_anim_sfx.s b/asm/battle_anim_sfx.s deleted file mode 100644 index 7d196ce97..000000000 --- a/asm/battle_anim_sfx.s +++ /dev/null @@ -1,224 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_812B2B8 -sub_812B2B8: @ 812B2B8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - lsls r0, 24 - lsrs r4, r0, 24 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _0812B2DC - ldr r0, _0812B2D8 @ =gSharedMem + 0x19348 - b _0812B2E6 - .align 2, 0 -_0812B2D8: .4byte gSharedMem + 0x19348 -_0812B2DC: - ldr r1, _0812B304 @ =gAnimSpeciesByBanks - ldr r0, _0812B308 @ =gAnimBankAttacker - ldrb r0, [r0] - lsls r0, 1 - adds r0, r1 -_0812B2E6: - ldrh r0, [r0] - cmp r0, 0 - beq _0812B2F6 - lsls r1, r4, 24 - asrs r1, 24 - movs r2, 0x4 - bl PlayCry3 -_0812B2F6: - adds r0, r5, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B304: .4byte gAnimSpeciesByBanks -_0812B308: .4byte gAnimBankAttacker - thumb_func_end sub_812B2B8 - - thumb_func_start sub_812B30C -sub_812B30C: @ 812B30C - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0812B33C @ =gBattleAnimArgs - ldrh r5, [r0] - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - adds r0, r5, 0 - bl PlaySE1WithPanning - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B33C: .4byte gBattleAnimArgs - thumb_func_end sub_812B30C - - thumb_func_start sub_812B340 -sub_812B340: @ 812B340 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0812B370 @ =gBattleAnimArgs - ldrh r5, [r0] - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - adds r0, r5, 0 - bl PlaySE2WithPanning - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B370: .4byte gBattleAnimArgs - thumb_func_end sub_812B340 - - thumb_func_start sub_812B374 -sub_812B374: @ 812B374 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - mov r8, r0 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, _0812B3F8 @ =gBattleAnimArgs - ldrb r5, [r0, 0x2] - ldrb r6, [r0, 0x4] - ldrh r1, [r0, 0x6] - mov r9, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - bl BattleAnimAdjustPanning - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - asrs r5, 24 - adds r0, r5, 0 - bl BattleAnimAdjustPanning - adds r5, r0, 0 - lsls r4, 24 - asrs r4, 24 - lsls r5, 24 - asrs r5, 24 - lsls r6, 24 - asrs r6, 24 - adds r0, r4, 0 - adds r1, r5, 0 - adds r2, r6, 0 - bl CalculatePanIncrement - ldr r2, _0812B3FC @ =gTasks - mov r3, r8 - lsls r1, r3, 2 - add r1, r8 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r4, [r1, 0xA] - strh r5, [r1, 0xC] - lsls r0, 24 - asrs r0, 24 - strh r0, [r1, 0xE] - mov r0, r9 - strh r0, [r1, 0x12] - strh r2, [r1, 0x1C] - strh r4, [r1, 0x1E] - ldr r2, _0812B400 @ =sub_812B404 - str r2, [r1] - mov r0, r8 - bl _call_via_r2 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0812B3F8: .4byte gBattleAnimArgs -_0812B3FC: .4byte gTasks -_0812B400: .4byte sub_812B404 - thumb_func_end sub_812B374 - - thumb_func_start sub_812B404 -sub_812B404: @ 812B404 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - ldr r1, _0812B45C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r2, [r4, 0xE] - ldrh r0, [r4, 0x1C] - adds r1, r0, 0x1 - strh r1, [r4, 0x1C] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x12 - ldrsh r1, [r4, r3] - cmp r0, r1 - bne _0812B43E - movs r0, 0 - strh r0, [r4, 0x1C] - ldrh r1, [r4, 0x1E] - adds r0, r2, r1 - strh r0, [r4, 0x1E] - movs r2, 0x1E - ldrsh r0, [r4, r2] - bl sub_8077104 - strh r0, [r4, 0x1E] -_0812B43E: - ldr r1, _0812B460 @ =gUnknown_0202F7D2 - ldrh r0, [r4, 0x1E] - strb r0, [r1] - movs r3, 0x1E - ldrsh r1, [r4, r3] - movs r2, 0xC - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _0812B456 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_0812B456: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812B45C: .4byte gTasks -_0812B460: .4byte gUnknown_0202F7D2 - thumb_func_end sub_812B404 - - .align 2, 0 @ Don't pad with nop. - \ No newline at end of file diff --git a/include/battle_anim.h b/include/battle_anim.h index 7b966cf4c..a94e6d13c 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -61,7 +61,7 @@ bool8 IsAnimBankSpriteVisible(u8); s8 BattleAnimAdjustPanning(s8 a); void sub_80763FC(u16 a, u16 *b, u32 c, u8 d); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); -s16 sub_8077104(s16 a); +s16 sub_8077104(s16 newPan, int oldPan); void DestroyAnimSoundTask(u8 taskId); #endif diff --git a/ld_script.txt b/ld_script.txt index b2d17b5ec..4f99cff99 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -357,7 +357,6 @@ SECTIONS { asm/contest_ai.o(.text); src/unused/unused_81258BC.o(.text); src/battle/anim/sfx.o(.text); - asm/battle_anim_sfx.o(.text); src/battle/battle_controller_safari.o(.text); src/field/fldeff_sweetscent.o(.text); asm/battle_anim_812C144.o(.text); diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index cb61a566f..470fea3cc 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -10,26 +10,31 @@ extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; extern u16 gBattlePartyID[]; +extern u16 gAnimSpeciesByBanks[]; +extern u8 gUnknown_0202F7D2; void sub_812AF98(u8 taskId); void sub_812B004(u8 taskId); void sub_812B004(u8 taskId); void sub_812B108(u8 taskId); +void sub_812B404(u8 taskId); +// used in 1 move: +// Move_FIRE_BLAST void sub_812AF30(u8 taskId) { - s8 sourcePan, targetPan, incrementPan; + s8 sourcePan, targetPan, panIncrement; TASK.data[0] = gBattleAnimArgs[0]; TASK.data[1] = gBattleAnimArgs[1]; sourcePan = BattleAnimAdjustPanning(-64); targetPan = BattleAnimAdjustPanning(63); - incrementPan = CalculatePanIncrement(sourcePan, targetPan, 2); + panIncrement = CalculatePanIncrement(sourcePan, targetPan, 2); TASK.data[2] = sourcePan; TASK.data[3] = targetPan; - TASK.data[4] = incrementPan; + TASK.data[4] = panIncrement; TASK.data[10] = 10; TASK.func = sub_812AF98; @@ -38,7 +43,7 @@ void sub_812AF30(u8 taskId) void sub_812AF98(u8 taskId) { s16 pan = TASK.data[2]; - s8 var0 = TASK.data[4]; + s8 dPan = TASK.data[4]; if (++TASK.data[11] == 111) { @@ -53,8 +58,8 @@ void sub_812AF98(u8 taskId) TASK.data[10] = 0; PlaySE12WithPanning(TASK.data[0], pan); } - pan += var0; - TASK.data[2] = sub_8077104(pan); + pan += dPan; + TASK.data[2] = sub_8077104(pan, dPan); } } @@ -66,7 +71,7 @@ void sub_812B004(u8 taskId) { TASK.data[10] = 0; - pan = BattleAnimAdjustPanning(0x3f); + pan = BattleAnimAdjustPanning(63); PlaySE12WithPanning(TASK.data[1], pan); if (++TASK.data[11] == 2) @@ -76,31 +81,32 @@ void sub_812B004(u8 taskId) } } +// used in 7 moves: +// Move_ICE_BEAM, Move_AURORA_BEAM, Move_PSYBEAM, +// Move_PSYWAVE, Move_SHADOW_BALL, Move_TRI_ATTACK, +// Move_HYPER_BEAM void sub_812B058(u8 taskId) { - s16 sp; - u8 r10, r7, r9; - s8 r5, r6, r4, r0; - - sp = gBattleAnimArgs[0]; - r5 = gBattleAnimArgs[2]; - r6 = gBattleAnimArgs[3]; - r10 = gBattleAnimArgs[4]; - r7 = gBattleAnimArgs[5]; - r9 = gBattleAnimArgs[6]; - r4 = BattleAnimAdjustPanning(gBattleAnimArgs[1]); - r5 = BattleAnimAdjustPanning(r5); - r0 = CalculatePanIncrement(r4, r5, r6); + s16 sp = gBattleAnimArgs[0]; + s8 r5 = gBattleAnimArgs[2]; + s8 panIncrement = gBattleAnimArgs[3]; + u8 r10 = gBattleAnimArgs[4]; // number of times the sound must be played + u8 r7 = gBattleAnimArgs[5]; + u8 r9 = gBattleAnimArgs[6]; + + s8 pan1 = BattleAnimAdjustPanning(gBattleAnimArgs[1]); + s8 pan2 = BattleAnimAdjustPanning(r5); + panIncrement = CalculatePanIncrement(pan1, pan2, panIncrement); TASK.data[0] = sp; - TASK.data[1] = r4; - TASK.data[2] = r5; - TASK.data[3] = r0; + TASK.data[1] = pan1; + TASK.data[2] = pan2; + TASK.data[3] = panIncrement; TASK.data[4] = r10; TASK.data[5] = r7; TASK.data[6] = r9; TASK.data[10] = 0; - TASK.data[11] = r4; + TASK.data[11] = pan1; TASK.data[12] = r9; TASK.func = sub_812B108; @@ -123,15 +129,20 @@ void sub_812B108(u8 taskId) if (TASK.data[10]++ == TASK.data[5]) { + u16 dPan, oldPan; TASK.data[10] = 0; - TASK.data[11] += TASK.data[3]; - TASK.data[11] = sub_8077104(TASK.data[11]); + dPan = TASK.data[3]; + oldPan = TASK.data[11]; + TASK.data[11] = dPan + oldPan; + TASK.data[11] = sub_8077104(TASK.data[11], oldPan); } } // #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348)) // #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) +// used in 3 moves: +// Move_HOWL, Move_ROAR, Move_GROWL void sub_812B18C(u8 taskId) { u16 species = 0; @@ -181,4 +192,90 @@ void sub_812B18C(u8 taskId) } DestroyAnimVisualTask(taskId); +} + +// used in Move_HYPER_VOICE +void sub_812B2B8(u8 taskId) +{ + u16 species; + s8 pan = BattleAnimAdjustPanning(-64); + + if (IsContest()) + species = shared19348.unk0; + else + species = gAnimSpeciesByBanks[gAnimBankAttacker]; + + if (species != 0) + PlayCry3(species, pan, 4); + + DestroyAnimVisualTask(taskId); +} + +// used in 6 moves: +// Move_SKY_ATTACK, Move_LUSTER_PURGE, Move_FLATTER, +// Move_DRAGON_CLAW, Move_RETURN, Move_COSMIC_POWER, +void sub_812B30C(u8 taskId) +{ + u16 songNum = gBattleAnimArgs[0]; + s8 pan = BattleAnimAdjustPanning(gBattleAnimArgs[1]); + PlaySE1WithPanning(songNum, pan); + + DestroyAnimVisualTask(taskId); +} + +// used in 6 moves: +// Move_SKY_ATTACK, Move_SUPERPOWER, Move_ENCORE, +// Move_FLATTER, Move_RETURN, Move_COSMIC_POWER +void sub_812B340(u8 taskId) +{ + u16 songNum = gBattleAnimArgs[0]; + s8 pan = BattleAnimAdjustPanning(gBattleAnimArgs[1]); + PlaySE2WithPanning(songNum, pan); + + DestroyAnimVisualTask(taskId); +} + +// used in 2 moves: +// Move_CONFUSE_RAY, Move_WILL_O_WISP +void sub_812B374(u8 taskId) +{ + u8 r5 = gBattleAnimArgs[1]; + s8 panIncrement = gBattleAnimArgs[2]; + s16 r9 = gBattleAnimArgs[3]; + s8 r1 = gBattleAnimArgs[0]; + + s8 sourcePan = BattleAnimAdjustPanning(r1); + s8 targetPan = BattleAnimAdjustPanning(r5); + panIncrement = CalculatePanIncrement(sourcePan, targetPan, panIncrement); + + TASK.data[1] = sourcePan; + TASK.data[2] = targetPan; + TASK.data[3] = panIncrement; + TASK.data[5] = r9; + TASK.data[10] = 0; + TASK.data[11] = sourcePan; + + TASK.func = sub_812B404; + sub_812B404(taskId); +} + +void sub_812B404(u8 taskId) +{ + u16 dPan = TASK.data[3]; + + if (TASK.data[10]++ == TASK.data[5]) + { + u16 oldPan; + TASK.data[10] = 0; + oldPan = TASK.data[11]; + TASK.data[11] = dPan + oldPan; + TASK.data[11] = sub_8077104(TASK.data[11], oldPan); + } + + gUnknown_0202F7D2 = TASK.data[11]; + + if (TASK.data[11] == TASK.data[2]) + { + DestroyAnimVisualTask(taskId); + } } \ No newline at end of file diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 8242a1ddd..a0c74be1d 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -43,7 +43,7 @@ EWRAM_DATA u16 sAnimMoveIndex = 0; // set but unused. EWRAM_DATA u8 gAnimBankAttacker = 0; EWRAM_DATA u8 gAnimBankTarget = 0; EWRAM_DATA u16 gAnimSpeciesByBanks[4] = {0}; -EWRAM_DATA u8 gUnknown_0202F7D2 = 0; +EWRAM_DATA u8 gUnknown_0202F7D2 = 0; // some global pan variable extern u16 gBattle_BG1_Y; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN0V; @@ -1489,9 +1489,9 @@ s8 BattleAnimAdjustPanning2(s8 pan) return pan; } -s16 sub_8077104(s16 a) +s16 sub_8077104(s16 newPan, int oldPan) { - s16 var = a; + s16 var = newPan; if (var > 63) var = 63; -- cgit v1.2.3 From 2fe1da46d9dda22fbe2184a53f71d5e2b8f03aba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 21:33:51 -0500 Subject: through sub_8097974 --- asm/pokemon_storage_system.s | 203 ----------------------------------- src/pokemon/pokemon_storage_system.c | 108 ++++++++++++++++++- 2 files changed, 106 insertions(+), 205 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 311b3552a..c282ebecd 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,209 +5,6 @@ .text - thumb_func_start sub_809789C -sub_809789C: @ 809789C - push {r4,lr} - ldr r4, _080978AC @ =gSharedMem - ldrb r0, [r4, 0x4] - cmp r0, 0 - beq _080978B0 - cmp r0, 0x1 - beq _080978C2 - b _08097968 - .align 2, 0 -_080978AC: .4byte gSharedMem -_080978B0: - movs r0, 0x1 - bl PrintStorageActionText - bl sub_809CE84 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08097968 -_080978C2: - bl sub_809CF30 - adds r0, 0x1 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xC - bhi _08097968 - lsls r0, 2 - ldr r1, _080978DC @ =_080978E0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080978DC: .4byte _080978E0 - .align 2, 0 -_080978E0: - .4byte _08097914 - .4byte _08097914 - .4byte _08097968 - .4byte _08097968 - .4byte _08097968 - .4byte _08097968 - .4byte _08097968 - .4byte _08097968 - .4byte _08097968 - .4byte _08097968 - .4byte _08097958 - .4byte _08097940 - .4byte _0809792C -_08097914: - movs r0, 0x1 - bl sub_809A860 - bl sub_8098A5C - ldr r0, _08097928 @ =sub_8096C84 - bl SetPSSCallback - b _08097968 - .align 2, 0 -_08097928: .4byte sub_8096C84 -_0809792C: - movs r0, 0x5 - bl PlaySE - ldr r0, _0809793C @ =sub_8097B44 - bl SetPSSCallback - b _08097968 - .align 2, 0 -_0809793C: .4byte sub_8097B44 -_08097940: - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldr r0, _08097954 @ =sub_8097974 - bl SetPSSCallback - b _08097968 - .align 2, 0 -_08097954: .4byte sub_8097974 -_08097958: - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldr r0, _08097970 @ =sub_8097A64 - bl SetPSSCallback -_08097968: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097970: .4byte sub_8097A64 - thumb_func_end sub_809789C - - thumb_func_start sub_8097974 -sub_8097974: @ 8097974 - push {r4,r5,lr} - ldr r5, _08097988 @ =gSharedMem - ldrb r0, [r5, 0x4] - cmp r0, 0x1 - beq _080979A2 - cmp r0, 0x1 - bgt _0809798C - cmp r0, 0 - beq _08097996 - b _08097A5A - .align 2, 0 -_08097988: .4byte gSharedMem -_0809798C: - cmp r0, 0x2 - beq _080979FC - cmp r0, 0x3 - beq _08097A44 - b _08097A5A -_08097996: - bl sub_8098A80 - movs r0, 0x2 - bl PrintStorageActionText - b _08097A3C -_080979A2: - bl sub_809CF30 - ldr r1, _080979CC @ =0x00000d5e - adds r4, r5, r1 - strh r0, [r4] - movs r1, 0 - ldrsh r0, [r4, r1] - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080979D4 - movs r0, 0x1 - bl sub_809A860 - bl sub_8098A5C - ldr r0, _080979D0 @ =sub_8096C84 - bl SetPSSCallback - b _08097A5A - .align 2, 0 -_080979CC: .4byte 0x00000d5e -_080979D0: .4byte sub_8096C84 -_080979D4: - cmp r0, r1 - blt _08097A5A - cmp r0, 0xF - bgt _08097A5A - cmp r0, 0xC - blt _08097A5A - movs r0, 0x5 - bl PlaySE - ldrh r0, [r4] - subs r0, 0xC - strh r0, [r4] - lsls r0, 24 - lsrs r0, 24 - bl sub_8098AA8 - movs r0, 0x3 - bl PrintStorageActionText - b _08097A3C -_080979FC: - bl sub_809CF30 - movs r1, 0xD6 - lsls r1, 4 - adds r4, r5, r1 - strh r0, [r4] - movs r0, 0 - ldrsh r1, [r4, r0] - movs r0, 0x2 - negs r0, r0 - cmp r1, r0 - beq _08097A5A - adds r0, 0x1 - cmp r1, r0 - bne _08097A24 - bl sub_8098A5C - movs r0, 0 - strb r0, [r5, 0x4] - b _08097A5A -_08097A24: - movs r0, 0x5 - bl PlaySE - bl sub_8098A5C - ldrh r0, [r4] - subs r0, 0x10 - strh r0, [r4] - lsls r0, 24 - lsrs r0, 24 - bl sub_8099DCC -_08097A3C: - ldrb r0, [r5, 0x4] - adds r0, 0x1 - strb r0, [r5, 0x4] - b _08097A5A -_08097A44: - bl sub_8099E08 - lsls r0, 24 - cmp r0, 0 - bne _08097A5A - movs r0, 0x1 - bl sub_809A860 - ldr r0, _08097A60 @ =sub_8096C84 - bl SetPSSCallback -_08097A5A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08097A60: .4byte sub_8096C84 - thumb_func_end sub_8097974 - thumb_func_start sub_8097A64 sub_8097A64: @ 8097A64 push {r4,r5,lr} diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 8b0893c73..0f2350df2 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -96,7 +96,10 @@ struct PokemonStorageSystemData { u8 filler_08b0[2]; s16 unk_08b2; u16 unk_08b4; - u8 filler_08b6[0x93c]; + u8 filler_08b6[0x4a8]; + s16 unk_0d5e; + s16 unk_0d60; + u8 filler_0d62[0x490]; u16 unk_11f2; u8 filler_11f4[2]; u8 unk_11f6; @@ -145,12 +148,16 @@ void sub_8097788(void); void sub_80977E4(void); void sub_8097858(void); void sub_809789C(void); +void sub_8097974(void); +void sub_8097A64(void); +void sub_8097B44(void); void sub_8097BA0(void); void sub_8097CC0(void); void sub_8097DE0(void); void sub_8097E44(void); void sub_8097E70(void); void BoxSetMosaic(void); +void sub_809801C(void); void sub_8098400(void); void add_to_c3_somehow(void); bool8 sub_80985CC(void); @@ -159,11 +166,12 @@ void sub_8098710(void); void sub_8098734(void); void sub_80987DC(void); void sub_809880C(void); -void sub_809801C(void); bool8 sub_8098830(void); void PrintStorageActionText(u8 index); void sub_8098A38(u8); void sub_8098A5C(void); +void sub_8098A80(void); +void sub_8098AA8(u8 a0); void sub_8098B48(void); void sub_8099310(void); bool8 sub_8099374(void); @@ -172,6 +180,9 @@ bool8 sub_8099990(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); bool8 sub_8099D34(void); +void sub_8099DCC(u8 a0); +bool8 sub_8099E08(void); +void sub_809A860(u8 a0); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); void sub_809AA24(void); void sub_809AA98(void); @@ -1843,6 +1854,99 @@ void sub_8097858(void) } } +void sub_809789C(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_WHAT_YOU_DO); + sub_809CE84(); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + switch (sub_809CF30()) + { + case -1: + case 0: + sub_809A860(1); + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 11: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097B44); + break; + case 10: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_8097974); + break; + case 9: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_8097A64); + break; + } + break; + } +} + +void sub_8097974(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_8098A80(); + PrintStorageActionText(PC_TEXT_PICK_A_THEME); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + ePokemonStorageSystem.unk_0d5e = sub_809CF30(); + switch (ePokemonStorageSystem.unk_0d5e) + { + case -1: + sub_809A860(1); + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 12 ... 15: + PlaySE(SE_SELECT); + ePokemonStorageSystem.unk_0d5e -= 12; + sub_8098AA8(ePokemonStorageSystem.unk_0d5e); + PrintStorageActionText(PC_TEXT_PICK_A_WALLPAPER); + ePokemonStorageSystem.unk_0004++; + break; + } + break; + case 2: + ePokemonStorageSystem.unk_0d60 = sub_809CF30(); + switch (ePokemonStorageSystem.unk_0d60) + { + case -1: + sub_8098A5C(); + ePokemonStorageSystem.unk_0004 = 0; + break; + case -2: + break; + default: + PlaySE(SE_SELECT); + sub_8098A5C(); + ePokemonStorageSystem.unk_0d60 -= 16; + sub_8099DCC(ePokemonStorageSystem.unk_0d60); + ePokemonStorageSystem.unk_0004++; + break; + } + break; + case 3: + if (!sub_8099E08()) + { + sub_809A860(1); + SetPSSCallback(sub_8096C84); + } + break; + } +} + asm(".section .text.8098898"); void PrintStorageActionText(u8 index) { -- cgit v1.2.3 From 1c6c7da6fba8903d8eff02ac12465a4098ebca47 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 8 Jan 2018 21:40:37 -0500 Subject: nogba to nocashgba --- Makefile | 2 -- src/libs/libisagbprn.c | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8ca249dc7..9aff29fc4 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,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 diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index c066a41a0..007f90bb7 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -10,8 +10,8 @@ // for auto no$gba support, the string "no$gba" should be at this address. // except it's not, blame Martin, hence I'm letting the user deal with this nonsense. -#define NOGBAIDADDR 0x4FFFA00 -#define NOGBAPRINTADDR 0x4FFFA14 +#define NOCASHGBAIDADDR 0x4FFFA00 +#define NOCASHGBAPRINTADDR 0x4FFFA14 struct AGBPrintStruct { @@ -155,11 +155,11 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP } } -// nogba print function, uncomment to use +// no$gba print function, uncomment to use /* -void NOGBAPrint(const char *pBuf) +void NoCashGBAPrint(const char *pBuf) { - *(volatile u32*)NOGBAPRINTADDR = (u32)pBuf; + *(volatile u32*)NOCASHGBAPRINTADDR = (u32)pBuf; } */ -- cgit v1.2.3 From dcf12f9ecdbaab26afb8899eaa05f4cab09a5f82 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 8 Jan 2018 22:01:47 -0500 Subject: nocashgba printf --- include/config.h | 7 +++++++ src/libs/libisagbprn.c | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index 6d9e15a15..796da359c 100644 --- a/include/config.h +++ b/include/config.h @@ -16,6 +16,13 @@ // still in part authoritative. #define NDEBUG +// To enable print debugging, comment out "#define NDEBUG". This allows +// the various AGBPrint functions to be used. (See include/gba/isagbprint.h). +// Some emulators support a debug console window: uncomment NoCashGBAPrint() +// and NoCashGBAPrintf() in libisagbprn.c to use no$gba's own proprietary +// printing system. Use NoCashGBAPrint() and NoCashGBAPrintf() like you +// would normally use AGBPrint() and AGBPrintf(). + #ifndef REVISION #define REVISION 0 #endif diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index 007f90bb7..a9656f3c5 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -155,12 +155,22 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP } } -// no$gba print function, uncomment to use +// no$gba print functions, uncomment to use /* void NoCashGBAPrint(const char *pBuf) { *(volatile u32*)NOCASHGBAPRINTADDR = (u32)pBuf; } + +void NoCashGBAPrintf(const char *pBuf, ...) +{ + char bufPrint[0x100]; + va_list vArgv; + va_start(vArgv, pBuf); + vsprintf(bufPrint, pBuf, vArgv); + va_end(vArgv); + NoCashGBAPrint(bufPrint); +} */ #endif -- cgit v1.2.3 From e2ff8b73c7e17777be8c4065a93e8727768bb914 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 22:05:43 -0500 Subject: through sub_8097BA0; fix calls to pc_screen_effect from scene/hall_of_fame --- asm/pokemon_storage_system.s | 284 ----------------------------------- include/ewram.h | 1 + include/pc_screen_effect.h | 2 + src/pokemon/pokemon_storage_system.c | 130 +++++++++++++++- src/scene/hall_of_fame.c | 35 ++--- 5 files changed, 143 insertions(+), 309 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index c282ebecd..85e29b183 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,290 +5,6 @@ .text - thumb_func_start sub_8097A64 -sub_8097A64: @ 8097A64 - push {r4,r5,lr} - ldr r5, _08097A78 @ =gSharedMem - ldrb r0, [r5, 0x4] - cmp r0, 0x1 - beq _08097AB0 - cmp r0, 0x1 - bgt _08097A7C - cmp r0, 0 - beq _08097A86 - b _08097B32 - .align 2, 0 -_08097A78: .4byte gSharedMem -_08097A7C: - cmp r0, 0x2 - beq _08097B00 - cmp r0, 0x3 - beq _08097B18 - b _08097B32 -_08097A86: - movs r0, 0x5 - bl PrintStorageActionText - ldr r1, _08097AA4 @ =0x00002370 - adds r0, r5, r1 - ldr r2, _08097AA8 @ =0x0000daca - movs r1, 0x7 - movs r3, 0x3 - bl sub_8096264 - ldr r0, _08097AAC @ =gPokemonStorage - ldrb r0, [r0] - bl sub_809634C - b _08097B0A - .align 2, 0 -_08097AA4: .4byte 0x00002370 -_08097AA8: .4byte 0x0000daca -_08097AAC: .4byte gPokemonStorage -_08097AB0: - bl sub_8096368 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08097AF4 @ =0x000008b2 - adds r4, r5, r2 - strh r0, [r4] - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0xC8 - beq _08097B32 - bl sub_8098A5C - bl sub_809635C - bl sub_8096310 - movs r2, 0 - ldrsh r0, [r4, r2] - cmp r0, 0xC9 - beq _08097AE4 - adds r1, r0, 0 - ldr r0, _08097AF8 @ =gPokemonStorage - ldrb r0, [r0] - cmp r1, r0 - bne _08097B0A -_08097AE4: - movs r0, 0x1 - bl sub_809A860 - ldr r0, _08097AFC @ =sub_8096C84 - bl SetPSSCallback - b _08097B32 - .align 2, 0 -_08097AF4: .4byte 0x000008b2 -_08097AF8: .4byte gPokemonStorage -_08097AFC: .4byte sub_8096C84 -_08097B00: - ldr r1, _08097B14 @ =0x000008b2 - adds r0, r5, r1 - ldrb r0, [r0] - bl sub_8099C70 -_08097B0A: - ldrb r0, [r5, 0x4] - adds r0, 0x1 - strb r0, [r5, 0x4] - b _08097B32 - .align 2, 0 -_08097B14: .4byte 0x000008b2 -_08097B18: - bl sub_8099D34 - lsls r0, 24 - cmp r0, 0 - bne _08097B32 - ldr r1, _08097B38 @ =gPokemonStorage - ldr r2, _08097B3C @ =0x000008b2 - adds r0, r5, r2 - ldrh r0, [r0] - strb r0, [r1] - ldr r0, _08097B40 @ =sub_8096C84 - bl SetPSSCallback -_08097B32: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08097B38: .4byte gPokemonStorage -_08097B3C: .4byte 0x000008b2 -_08097B40: .4byte sub_8096C84 - thumb_func_end sub_8097A64 - - thumb_func_start sub_8097B44 -sub_8097B44: @ 8097B44 - push {r4,r5,lr} - sub sp, 0x4 - ldr r5, _08097B58 @ =gSharedMem - ldrb r4, [r5, 0x4] - cmp r4, 0 - beq _08097B5C - cmp r4, 0x1 - beq _08097B78 - b _08097B8E - .align 2, 0 -_08097B58: .4byte gSharedMem -_08097B5C: - bl sub_809BB90 - movs r0, 0x1 - negs r0, r0 - str r4, [sp] - movs r1, 0 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldrb r0, [r5, 0x4] - adds r0, 0x1 - strb r0, [r5, 0x4] - b _08097B8E -_08097B78: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _08097B8E - ldr r0, _08097B98 @ =gUnknown_0203847F - strb r4, [r0] - strb r4, [r5, 0x6] - ldr r0, _08097B9C @ =sub_8096B5C - bl SetMainCallback2 -_08097B8E: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08097B98: .4byte gUnknown_0203847F -_08097B9C: .4byte sub_8096B5C - thumb_func_end sub_8097B44 - - thumb_func_start sub_8097BA0 -sub_8097BA0: @ 8097BA0 - push {r4,lr} - ldr r0, _08097BB8 @ =gSharedMem - ldrb r1, [r0, 0x4] - adds r4, r0, 0 - cmp r1, 0x4 - bls _08097BAE - b _08097CB0 -_08097BAE: - lsls r0, r1, 2 - ldr r1, _08097BBC @ =_08097BC0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08097BB8: .4byte gSharedMem -_08097BBC: .4byte _08097BC0 - .align 2, 0 -_08097BC0: - .4byte _08097BD4 - .4byte _08097C18 - .4byte _08097C2C - .4byte _08097C74 - .4byte _08097C98 -_08097BD4: - bl sub_809BF20 - lsls r0, 24 - cmp r0, 0 - beq _08097BF8 - movs r0, 0x20 - bl PlaySE - movs r0, 0xF - bl PrintStorageActionText - ldr r1, _08097BF4 @ =gSharedMem - movs r0, 0x1 - strb r0, [r1, 0x4] - b _08097CB0 - .align 2, 0 -_08097BF4: .4byte gSharedMem -_08097BF8: - movs r0, 0x5 - bl PlaySE - movs r0, 0 - bl PrintStorageActionText - movs r0, 0 - bl sub_8098A38 - ldr r1, _08097C14 @ =gSharedMem - movs r0, 0x2 - strb r0, [r1, 0x4] - b _08097CB0 - .align 2, 0 -_08097C14: .4byte gSharedMem -_08097C18: - ldr r0, _08097C28 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0xF3 - ands r0, r1 - cmp r0, 0 - beq _08097CB0 - b _08097C4A - .align 2, 0 -_08097C28: .4byte gMain -_08097C2C: - bl ProcessMenuInputNoWrap - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _08097C5C - cmp r1, 0 - bgt _08097C46 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08097C4A - b _08097CB0 -_08097C46: - cmp r1, 0x1 - bne _08097CB0 -_08097C4A: - bl sub_8098A5C - ldr r0, _08097C58 @ =sub_8096C84 - bl SetPSSCallback - b _08097CB0 - .align 2, 0 -_08097C58: .4byte sub_8096C84 -_08097C5C: - movs r0, 0x3 - bl PlaySE - bl sub_8098A5C - ldr r1, _08097C70 @ =gSharedMem - ldrb r0, [r1, 0x4] - adds r0, 0x1 - strb r0, [r1, 0x4] - b _08097CB0 - .align 2, 0 -_08097C70: .4byte gSharedMem -_08097C74: - movs r1, 0 - movs r0, 0xE - strh r0, [r4, 0xC] - ldr r0, _08097C94 @ =0x0000dad0 - strh r0, [r4, 0xE] - movs r0, 0x14 - strh r0, [r4, 0x10] - strh r1, [r4, 0x12] - adds r0, r4, 0 - adds r0, 0xC - bl sub_80C5E38 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08097CB0 - .align 2, 0 -_08097C94: .4byte 0x0000dad0 -_08097C98: - bl sub_80C5F98 - lsls r0, 24 - cmp r0, 0 - beq _08097CB0 - bl CalculatePlayerPartyCount - ldr r1, _08097CB8 @ =gPlayerPartyCount - strb r0, [r1] - ldr r0, _08097CBC @ =sub_80961A8 - bl SetMainCallback2 -_08097CB0: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097CB8: .4byte gPlayerPartyCount -_08097CBC: .4byte sub_80961A8 - thumb_func_end sub_8097BA0 - thumb_func_start sub_8097CC0 sub_8097CC0: @ 8097CC0 push {r4,lr} diff --git a/include/ewram.h b/include/ewram.h index f24f089f6..3f627878f 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -241,6 +241,7 @@ extern u8 gSharedMem[]; #define ewram1C000 (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) #define ewram1c000 (*(struct Unk201C000 *)(gSharedMem + 0x1C000)) // FIXME, names too similar #define eHallOfFameMons1 (struct HallofFameMons*)(&gSharedMem[0x1C000]) +#define eHOFPCScreenEffect (*(struct PCScreenEffectStruct *)(gSharedMem + 0x1c000)) #define EWRAM_1C800 (*(struct Unk201C800 *)(gSharedMem + 0x1C800)) #define ewram1D000 ((struct Pokemon *)(gSharedMem + 0x1D000)) #define ewram1D000_2 ((u16 *)(gSharedMem + 0x1D000)) diff --git a/include/pc_screen_effect.h b/include/pc_screen_effect.h index a791fc66f..36661bc3b 100644 --- a/include/pc_screen_effect.h +++ b/include/pc_screen_effect.h @@ -15,5 +15,7 @@ struct PCScreenEffectStruct void sub_80C5CD4(struct PCScreenEffectStruct *unkStruct); bool8 sub_80C5DCC(void); +void sub_80C5E38(struct PCScreenEffectStruct *unkStruct); +bool8 sub_80C5F98(void); #endif //POKERUBY_PC_SCREEN_EFFECT_H diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 0f2350df2..daae82df6 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -177,6 +177,7 @@ void sub_8099310(void); bool8 sub_8099374(void); void sub_8099958(void); bool8 sub_8099990(void); +void sub_809BB90(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); bool8 sub_8099D34(void); @@ -670,7 +671,7 @@ void ShowPokemonStorageSystem(void) ScriptContext2_Enable(); } -void sub_8096130(void) +void FieldCB_ReturnToOverworld(void) { u8 taskId = CreateTask(Task_PokemonStorageSystem, 80); gTasks[taskId].data[0] = 0; @@ -688,7 +689,7 @@ void StorageSystemCreatePrimaryMenu(u8 whichMenu) void sub_80961A8(void) { gUnknown_02038474 = gPokemonStorageSystemPtr->unk_0005; - gFieldCallback = sub_8096130; + gFieldCallback = FieldCB_ReturnToOverworld; SetMainCallback2(c2_exit_to_overworld_2_switch); } @@ -1947,6 +1948,131 @@ void sub_8097974(void) } } +void sub_8097A64(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_JUMP_TO_WHICH_BOX); + sub_8096264(&ePokemonStorageSystem.unk_2370, 0x0007, 0xdaca, 3); + sub_809634C(gPokemonStorage.currentBox); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + ePokemonStorageSystem.unk_08b2 = sub_8096368(); + switch (ePokemonStorageSystem.unk_08b2) + { + case 200: + break; + default: + sub_8098A5C(); + sub_809635C(); + sub_8096310(); + if (ePokemonStorageSystem.unk_08b2 == 201 || ePokemonStorageSystem.unk_08b2 == gPokemonStorage.currentBox) + { + sub_809A860(1); + SetPSSCallback(sub_8096C84); + } + else + { + ePokemonStorageSystem.unk_0004++; + } + break; + } + break; + case 2: + sub_8099C70(ePokemonStorageSystem.unk_08b2); + ePokemonStorageSystem.unk_0004++; + break; + case 3: + if (!sub_8099D34()) + { + gPokemonStorage.currentBox = ePokemonStorageSystem.unk_08b2; + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097B44(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + sub_809BB90(); + BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + ePokemonStorageSystem.unk_0004++; + break; + case 1: + if (!UpdatePaletteFade()) + { + gUnknown_0203847F = 1; + ePokemonStorageSystem.unk_0006 = 1; + SetMainCallback2(sub_8096B5C); + } + break; + } +} + +void sub_8097BA0(void) +{ + switch (ePokemonStorageSystem.unk_0004) + { + case 0: + if (sub_809BF20()) + { + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_HOLDING_POKE); + ePokemonStorageSystem.unk_0004 = 1; + } + else + { + PlaySE(SE_SELECT); + PrintStorageActionText(PC_TEXT_EXIT_BOX); + sub_8098A38(0); + ePokemonStorageSystem.unk_0004 = 2; + } + break; + case 1: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + case 2: + switch (ProcessMenuInputNoWrap()) + { + case 1: + case -1: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 0: + PlaySE(SE_PC_OFF); + sub_8098A5C(); + ePokemonStorageSystem.unk_0004++; + break; + } + break; + case 3: + ePokemonStorageSystem.unk_000c.tileTag = 0x000e; + ePokemonStorageSystem.unk_000c.paletteTag = 0xdad0; + ePokemonStorageSystem.unk_000c.unk04 = 20; + ePokemonStorageSystem.unk_000c.unk06 = 0; + sub_80C5E38(&ePokemonStorageSystem.unk_000c); + ePokemonStorageSystem.unk_0004++; + break; + case 4: + if (sub_80C5F98()) + { + gPlayerPartyCount = CalculatePlayerPartyCount(); + SetMainCallback2(sub_80961A8); + } + break; + } +} + asm(".section .text.8098898"); void PrintStorageActionText(u8 index) { diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 812c28137..ef5e6f873 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -90,11 +90,7 @@ static bool8 sub_81438C4(void); // functions from different files void sub_81439D0(void); -void sub_80C5E38(void*); // ? -bool8 sub_80C5DCC(void); -bool8 sub_80C5F98(void); void ReturnFromHallOfFamePC(void); -u16 SpeciesToPokedexNum(u16 species); void remove_some_task(void); // data and gfx @@ -130,9 +126,10 @@ static const s16 sHallOfFame_MonsHalfTeamPositions[3][4] = {-41, 214, 184, 64} }; -static const struct HallofFameMon sDummyFameMon = +static const struct PCScreenEffectStruct sDummyFameMon = { - 0x3EA03EA, 0, 0, 0, {0} + .tileTag = 0x3ea, + .paletteTag = 0x3ea }; static const u8 sUnused2[6] = {2, 1, 3, 6, 4, 5}; @@ -800,20 +797,15 @@ void sub_81428CC(void) } break; case 3: - { - struct HallofFameMons* fameMons; - - REG_BLDCNT = 0; - REG_BLDALPHA = 0; - REG_BLDY = 0; - sub_81435B8(); + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + REG_BLDY = 0; + sub_81435B8(); - fameMons = eHallOfFameMons1; - fameMons->mons[0] = sDummyFameMon; + eHOFPCScreenEffect = sDummyFameMon; - sub_80C5CD4((struct PCScreenEffectStruct *)fameMons); - gMain.state++; - } + sub_80C5CD4(&eHOFPCScreenEffect); + gMain.state++; break; case 4: AnimateSprites(); @@ -1022,12 +1014,9 @@ static void sub_8142DF4(u8 taskID) static void sub_8142F78(u8 taskID) { - struct HallofFameMons* fameMons; - CpuSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x200); - fameMons = eHallOfFameMons1; - fameMons->mons[0] = sDummyFameMon; - sub_80C5E38(fameMons); + eHOFPCScreenEffect = sDummyFameMon; + sub_80C5E38(&eHOFPCScreenEffect); gTasks[taskID].func = sub_8142FCC; } -- cgit v1.2.3 From ca2fbbad15daa12858d01eb87ab17a8d41eeffa5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 8 Jan 2018 22:25:48 -0500 Subject: sDummyPCScreenEffect --> sPCScreenEffectTemplate --- src/scene/hall_of_fame.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index ef5e6f873..4740c086d 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -126,8 +126,7 @@ static const s16 sHallOfFame_MonsHalfTeamPositions[3][4] = {-41, 214, 184, 64} }; -static const struct PCScreenEffectStruct sDummyFameMon = -{ +static const struct PCScreenEffectStruct sPCScreenEffectTemplate = { .tileTag = 0x3ea, .paletteTag = 0x3ea }; @@ -802,7 +801,7 @@ void sub_81428CC(void) REG_BLDY = 0; sub_81435B8(); - eHOFPCScreenEffect = sDummyFameMon; + eHOFPCScreenEffect = sPCScreenEffectTemplate; sub_80C5CD4(&eHOFPCScreenEffect); gMain.state++; @@ -1015,7 +1014,7 @@ static void sub_8142DF4(u8 taskID) static void sub_8142F78(u8 taskID) { CpuSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x200); - eHOFPCScreenEffect = sDummyFameMon; + eHOFPCScreenEffect = sPCScreenEffectTemplate; sub_80C5E38(&eHOFPCScreenEffect); gTasks[taskID].func = sub_8142FCC; } -- cgit v1.2.3 From 84118e6fed04b1533458b891bcd0317683fe38c2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 8 Jan 2018 19:23:43 -0800 Subject: Move unused files back to src/ level --- Makefile | 2 +- ld_script.txt | 4 +- src/battle/anim/sfx.c | 21 ++++---- src/unused/unused_8124F94.c | 126 -------------------------------------------- src/unused/unused_81258BC.c | 36 ------------- src/unused_8124F94.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ src/unused_81258BC.c | 36 +++++++++++++ 7 files changed, 175 insertions(+), 176 deletions(-) delete mode 100644 src/unused/unused_8124F94.c delete mode 100644 src/unused/unused_81258BC.c create mode 100644 src/unused_8124F94.c create mode 100644 src/unused_81258BC.c diff --git a/Makefile b/Makefile index 275df021e..c1f6a6b4f 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d $(VERSIONS) $(VERSIONS:%=compare_%) -$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs,/unused}})) +$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs}})) C_SRCS := $(shell find src -iname "*.c") ASM_SRCS := $(wildcard asm/*.s) diff --git a/ld_script.txt b/ld_script.txt index 894a70d4d..11a430764 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -349,12 +349,12 @@ SECTIONS { src/scene/cable_car.o(.text); src/roulette_util.o(.text); src/engine/cable_car_util.o(.text); - src/unused/unused_8124F94.o(.text); + src/unused_8124F94.o(.text); src/engine/save.o(.text); src/engine/mystery_event_script.o(.text); src/field/field_effect_helpers.o(.text); asm/contest_ai.o(.text); - src/unused/unused_81258BC.o(.text); + src/unused_81258BC.o(.text); src/battle/anim/sfx.o(.text); src/battle/battle_controller_safari.o(.text); src/field/fldeff_sweetscent.o(.text); diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c index 470fea3cc..10ef1681e 100644 --- a/src/battle/anim/sfx.c +++ b/src/battle/anim/sfx.c @@ -13,11 +13,10 @@ extern u16 gBattlePartyID[]; extern u16 gAnimSpeciesByBanks[]; extern u8 gUnknown_0202F7D2; -void sub_812AF98(u8 taskId); -void sub_812B004(u8 taskId); -void sub_812B004(u8 taskId); -void sub_812B108(u8 taskId); -void sub_812B404(u8 taskId); +static void sub_812AF98(u8 taskId); +static void sub_812B004(u8 taskId); +static void sub_812B108(u8 taskId); +static void sub_812B404(u8 taskId); // used in 1 move: // Move_FIRE_BLAST @@ -40,7 +39,7 @@ void sub_812AF30(u8 taskId) TASK.func = sub_812AF98; } -void sub_812AF98(u8 taskId) +static void sub_812AF98(u8 taskId) { s16 pan = TASK.data[2]; s8 dPan = TASK.data[4]; @@ -63,7 +62,7 @@ void sub_812AF98(u8 taskId) } } -void sub_812B004(u8 taskId) +static void sub_812B004(u8 taskId) { s8 pan; @@ -110,10 +109,10 @@ void sub_812B058(u8 taskId) TASK.data[12] = r9; TASK.func = sub_812B108; - sub_812B108(taskId); + TASK.func(taskId); } -void sub_812B108(u8 taskId) +static void sub_812B108(u8 taskId) { if (TASK.data[12]++ == TASK.data[6]) { @@ -256,10 +255,10 @@ void sub_812B374(u8 taskId) TASK.data[11] = sourcePan; TASK.func = sub_812B404; - sub_812B404(taskId); + TASK.func(taskId); } -void sub_812B404(u8 taskId) +static void sub_812B404(u8 taskId) { u16 dPan = TASK.data[3]; diff --git a/src/unused/unused_8124F94.c b/src/unused/unused_8124F94.c deleted file mode 100644 index 5f76fa92e..000000000 --- a/src/unused/unused_8124F94.c +++ /dev/null @@ -1,126 +0,0 @@ -#include "global.h" -#include "decompress.h" -#include "palette.h" - -struct UnknownStruct2 -{ - void *src; - u8 unk4; - u8 unk5; - u8 unk6; - u16 unk8; -}; - -struct UnknownStruct3 -{ - u16 *paletteSrc; - u8 unk4; - u8 paletteCount; -}; - -struct UnknownStruct1 -{ - u8 paletteNum; - u8 unk1; - u16 unk2; - u8 *dest; - struct UnknownStruct3 unk8[16]; - struct UnknownStruct2 unk88[32]; -}; - -void unref_sub_8124F94(struct UnknownStruct1 *a) -{ - a->unk1 = 0; - a->paletteNum = 0; - a->unk2 = 0; - a->dest = (void *)VRAM; - DmaFill16(3, 0, a->unk8, sizeof(a->unk8)); - DmaFill16(3, 0, a->unk88, sizeof(a->unk88)); -} - -u8 unref_sub_8124FD8(struct UnknownStruct1 *a, const struct UnknownStruct2 *b) -{ - while (1) - { - s32 r6; - s32 temp; - - // Couldn't get it to match any other way - if (a->unk1 < 32 && b->src == NULL) - return 0; - if (a->unk1 >= 32) - break; - - a->unk88[a->unk1].src = b->src; - a->unk88[a->unk1].unk6 = b->unk6; - a->unk88[a->unk1].unk4 = b->unk4; - a->unk88[a->unk1].unk5 = b->unk5; - r6 = b->unk4 * b->unk5; - if (a->unk2 + r6 > 0x400) - return 2; - if (b->unk8 == 0) - { - DmaCopy16(3, b->src, a->dest + a->unk2 * 64, r6 * 32); - } - else - { - LZDecompressWram(b->src, a->dest + a->unk2 * 64); - } - a->unk88[a->unk1].unk8 = a->unk2; - temp = r6 + a->unk2; - a->unk2 = temp; - a->unk1++; - b++; - } - return 1; -} - -u8 unref_sub_81250A4(struct UnknownStruct1 *a, struct UnknownStruct3 *b) -{ - while (1) - { - // Couldn't get it to match any other way - if (a->paletteNum < 16 && b->paletteSrc == NULL) - return 0; - if (a->paletteNum >= 16) - break; - - a->unk8[a->paletteNum].paletteSrc = b->paletteSrc; - a->unk8[a->paletteNum].unk4 = b->unk4; - if (b->paletteCount == 0) - { - LoadPalette(b->paletteSrc, a->paletteNum * 16, 32); - } - else - { - u16 palette[16]; - - LZDecompressWram(b->paletteSrc, palette); - LoadPalette(palette, a->paletteNum * 16, 32); - } - a->unk8[a->paletteNum].paletteCount = a->paletteNum; - a->paletteNum = a->paletteNum + 1; - b++; - } - return 1; -} - -u8 unref_sub_8125118(struct UnknownStruct1 *a, struct UnknownStruct3 *b) -{ - u16 palettes[16][16] = {0}; - u8 r7 = b->paletteCount; - u8 i; - - LZDecompressWram(b->paletteSrc, palettes); - for (i = a->paletteNum; i < r7; i++) - { - if (a->paletteNum + i >= 16) - return 1; - a->unk8[i].paletteSrc = b->paletteSrc; - a->unk8[i].unk4 = b->unk4 + i; - a->unk8[i].paletteCount = a->paletteNum; - LoadPalette(palettes[i], a->paletteNum * 16, sizeof(palettes[i])); - a->paletteNum++; - } - return 0; -} diff --git a/src/unused/unused_81258BC.c b/src/unused/unused_81258BC.c deleted file mode 100644 index c509ea4c9..000000000 --- a/src/unused/unused_81258BC.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "constants/songs.h" -#include "global.h" -#include "menu.h" -#include "mystery_event_script.h" -#include "sound.h" -#include "text.h" - -void sub_812AF10(void); - -bool8 unref_sub_812AECC(u8 *script) -{ - u8 result = RunMysteryEventScript(script); - switch (result) - { - case 0: - return FALSE; - case 1: - PlaySE(SE_BOO); - return TRUE; - case 2: - sub_812AF10(); - return FALSE; - case 3: - PlaySE(SE_BOO); - sub_812AF10(); - return TRUE; - default: - return FALSE; - } -} - -void sub_812AF10(void) -{ - MenuDrawTextWindow(2, 14, 27, 19); - MenuPrint(gStringVar4, 3, 15); -} \ No newline at end of file diff --git a/src/unused_8124F94.c b/src/unused_8124F94.c new file mode 100644 index 000000000..5f76fa92e --- /dev/null +++ b/src/unused_8124F94.c @@ -0,0 +1,126 @@ +#include "global.h" +#include "decompress.h" +#include "palette.h" + +struct UnknownStruct2 +{ + void *src; + u8 unk4; + u8 unk5; + u8 unk6; + u16 unk8; +}; + +struct UnknownStruct3 +{ + u16 *paletteSrc; + u8 unk4; + u8 paletteCount; +}; + +struct UnknownStruct1 +{ + u8 paletteNum; + u8 unk1; + u16 unk2; + u8 *dest; + struct UnknownStruct3 unk8[16]; + struct UnknownStruct2 unk88[32]; +}; + +void unref_sub_8124F94(struct UnknownStruct1 *a) +{ + a->unk1 = 0; + a->paletteNum = 0; + a->unk2 = 0; + a->dest = (void *)VRAM; + DmaFill16(3, 0, a->unk8, sizeof(a->unk8)); + DmaFill16(3, 0, a->unk88, sizeof(a->unk88)); +} + +u8 unref_sub_8124FD8(struct UnknownStruct1 *a, const struct UnknownStruct2 *b) +{ + while (1) + { + s32 r6; + s32 temp; + + // Couldn't get it to match any other way + if (a->unk1 < 32 && b->src == NULL) + return 0; + if (a->unk1 >= 32) + break; + + a->unk88[a->unk1].src = b->src; + a->unk88[a->unk1].unk6 = b->unk6; + a->unk88[a->unk1].unk4 = b->unk4; + a->unk88[a->unk1].unk5 = b->unk5; + r6 = b->unk4 * b->unk5; + if (a->unk2 + r6 > 0x400) + return 2; + if (b->unk8 == 0) + { + DmaCopy16(3, b->src, a->dest + a->unk2 * 64, r6 * 32); + } + else + { + LZDecompressWram(b->src, a->dest + a->unk2 * 64); + } + a->unk88[a->unk1].unk8 = a->unk2; + temp = r6 + a->unk2; + a->unk2 = temp; + a->unk1++; + b++; + } + return 1; +} + +u8 unref_sub_81250A4(struct UnknownStruct1 *a, struct UnknownStruct3 *b) +{ + while (1) + { + // Couldn't get it to match any other way + if (a->paletteNum < 16 && b->paletteSrc == NULL) + return 0; + if (a->paletteNum >= 16) + break; + + a->unk8[a->paletteNum].paletteSrc = b->paletteSrc; + a->unk8[a->paletteNum].unk4 = b->unk4; + if (b->paletteCount == 0) + { + LoadPalette(b->paletteSrc, a->paletteNum * 16, 32); + } + else + { + u16 palette[16]; + + LZDecompressWram(b->paletteSrc, palette); + LoadPalette(palette, a->paletteNum * 16, 32); + } + a->unk8[a->paletteNum].paletteCount = a->paletteNum; + a->paletteNum = a->paletteNum + 1; + b++; + } + return 1; +} + +u8 unref_sub_8125118(struct UnknownStruct1 *a, struct UnknownStruct3 *b) +{ + u16 palettes[16][16] = {0}; + u8 r7 = b->paletteCount; + u8 i; + + LZDecompressWram(b->paletteSrc, palettes); + for (i = a->paletteNum; i < r7; i++) + { + if (a->paletteNum + i >= 16) + return 1; + a->unk8[i].paletteSrc = b->paletteSrc; + a->unk8[i].unk4 = b->unk4 + i; + a->unk8[i].paletteCount = a->paletteNum; + LoadPalette(palettes[i], a->paletteNum * 16, sizeof(palettes[i])); + a->paletteNum++; + } + return 0; +} diff --git a/src/unused_81258BC.c b/src/unused_81258BC.c new file mode 100644 index 000000000..c509ea4c9 --- /dev/null +++ b/src/unused_81258BC.c @@ -0,0 +1,36 @@ +#include "constants/songs.h" +#include "global.h" +#include "menu.h" +#include "mystery_event_script.h" +#include "sound.h" +#include "text.h" + +void sub_812AF10(void); + +bool8 unref_sub_812AECC(u8 *script) +{ + u8 result = RunMysteryEventScript(script); + switch (result) + { + case 0: + return FALSE; + case 1: + PlaySE(SE_BOO); + return TRUE; + case 2: + sub_812AF10(); + return FALSE; + case 3: + PlaySE(SE_BOO); + sub_812AF10(); + return TRUE; + default: + return FALSE; + } +} + +void sub_812AF10(void) +{ + MenuDrawTextWindow(2, 14, 27, 19); + MenuPrint(gStringVar4, 3, 15); +} \ No newline at end of file -- cgit v1.2.3 From 7b7f11119ac386e51910b957f855eade7e40381b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 00:15:28 -0500 Subject: through sub_8097DE0 --- asm/pokemon_storage_system.s | 177 ----------------------------------- data/pokemon_storage_system.s | 50 ---------- src/pokemon/pokemon_storage_system.c | 109 +++++++++++++++++++++ 3 files changed, 109 insertions(+), 227 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 85e29b183..6b4ccbc06 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,183 +5,6 @@ .text - thumb_func_start sub_8097CC0 -sub_8097CC0: @ 8097CC0 - push {r4,lr} - ldr r0, _08097CD8 @ =gSharedMem - ldrb r1, [r0, 0x4] - adds r4, r0, 0 - cmp r1, 0x4 - bls _08097CCE - b _08097DD0 -_08097CCE: - lsls r0, r1, 2 - ldr r1, _08097CDC @ =_08097CE0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08097CD8: .4byte gSharedMem -_08097CDC: .4byte _08097CE0 - .align 2, 0 -_08097CE0: - .4byte _08097CF4 - .4byte _08097D38 - .4byte _08097D4C - .4byte _08097D94 - .4byte _08097DB8 -_08097CF4: - bl sub_809BF20 - lsls r0, 24 - cmp r0, 0 - beq _08097D18 - movs r0, 0x20 - bl PlaySE - movs r0, 0xF - bl PrintStorageActionText - ldr r1, _08097D14 @ =gSharedMem - movs r0, 0x1 - strb r0, [r1, 0x4] - b _08097DD0 - .align 2, 0 -_08097D14: .4byte gSharedMem -_08097D18: - movs r0, 0x5 - bl PlaySE - movs r0, 0x12 - bl PrintStorageActionText - movs r0, 0 - bl sub_8098A38 - ldr r1, _08097D34 @ =gSharedMem - movs r0, 0x2 - strb r0, [r1, 0x4] - b _08097DD0 - .align 2, 0 -_08097D34: .4byte gSharedMem -_08097D38: - ldr r0, _08097D48 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0xF3 - ands r0, r1 - cmp r0, 0 - beq _08097DD0 - b _08097D6C - .align 2, 0 -_08097D48: .4byte gMain -_08097D4C: - bl ProcessMenuInputNoWrap - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _08097D6C - cmp r1, 0 - bgt _08097D66 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08097D7C - b _08097DD0 -_08097D66: - cmp r1, 0x1 - beq _08097D7C - b _08097DD0 -_08097D6C: - bl sub_8098A5C - ldr r0, _08097D78 @ =sub_8096C84 - bl SetPSSCallback - b _08097DD0 - .align 2, 0 -_08097D78: .4byte sub_8096C84 -_08097D7C: - movs r0, 0x3 - bl PlaySE - bl sub_8098A5C - ldr r1, _08097D90 @ =gSharedMem - ldrb r0, [r1, 0x4] - adds r0, 0x1 - strb r0, [r1, 0x4] - b _08097DD0 - .align 2, 0 -_08097D90: .4byte gSharedMem -_08097D94: - movs r1, 0 - movs r0, 0xE - strh r0, [r4, 0xC] - ldr r0, _08097DB4 @ =0x0000dad0 - strh r0, [r4, 0xE] - movs r0, 0x14 - strh r0, [r4, 0x10] - strh r1, [r4, 0x12] - adds r0, r4, 0 - adds r0, 0xC - bl sub_80C5E38 - ldrb r0, [r4, 0x4] - adds r0, 0x1 - strb r0, [r4, 0x4] - b _08097DD0 - .align 2, 0 -_08097DB4: .4byte 0x0000dad0 -_08097DB8: - bl sub_80C5F98 - lsls r0, 24 - cmp r0, 0 - beq _08097DD0 - bl CalculatePlayerPartyCount - ldr r1, _08097DD8 @ =gPlayerPartyCount - strb r0, [r1] - ldr r0, _08097DDC @ =sub_80961A8 - bl SetMainCallback2 -_08097DD0: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097DD8: .4byte gPlayerPartyCount -_08097DDC: .4byte sub_80961A8 - thumb_func_end sub_8097CC0 - - thumb_func_start sub_8097DE0 -sub_8097DE0: @ 8097DE0 - push {lr} - ldr r1, _08097E1C @ =gSharedMem - movs r0, 0 - strb r0, [r1, 0x7] - strh r0, [r1, 0x8] - strh r0, [r1, 0xA] - ldr r1, _08097E20 @ =REG_BG3CNT - ldr r2, _08097E24 @ =0x00001e0f - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _08097E28 @ =gPokemonStorageScrollingBGTile - ldr r2, _08097E2C @ =0x0600e000 - ldr r0, _08097E30 @ =0x040000d4 - str r1, [r0] - str r2, [r0, 0x4] - ldr r1, _08097E34 @ =0x80000010 - str r1, [r0, 0x8] - ldr r0, [r0, 0x8] - ldr r0, _08097E38 @ =gPokemonStorageScrollingBGTilemap - ldr r1, _08097E3C @ =0x0600f000 - bl LZ77UnCompVram - ldr r0, _08097E40 @ =gPokemonStorageScrollingBGPalette - movs r1, 0xD0 - movs r2, 0x10 - bl LoadPalette - pop {r0} - bx r0 - .align 2, 0 -_08097E1C: .4byte gSharedMem -_08097E20: .4byte REG_BG3CNT -_08097E24: .4byte 0x00001e0f -_08097E28: .4byte gPokemonStorageScrollingBGTile -_08097E2C: .4byte 0x0600e000 -_08097E30: .4byte 0x040000d4 -_08097E34: .4byte 0x80000010 -_08097E38: .4byte gPokemonStorageScrollingBGTilemap -_08097E3C: .4byte 0x0600f000 -_08097E40: .4byte gPokemonStorageScrollingBGPalette - thumb_func_end sub_8097DE0 - thumb_func_start sub_8097E44 sub_8097E44: @ 8097E44 push {lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 4340301ba..4a59bb504 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,56 +3,6 @@ .section .rodata - .align 2 -gPokemonStorageScrollingBGPalette:: @ 83B6A10 - .incbin "graphics/pokemon_storage/scrolling_bg.gbapal" - - .align 2 -gPokemonStorageScrollingBGTile:: @ 83B6A30 - .incbin "graphics/pokemon_storage/scrolling_bg.4bpp" - - .align 2 -gPokemonStorageScrollingBGTilemap:: @ 83B6A50 - .incbin "graphics/pokemon_storage/scrolling_bg_map.bin.lz" - -@ unused tilemap? - .2byte 0x1281 - .2byte 0x1282 - .2byte 0x1283 - .2byte 0x1284 - .2byte 0x1285 - .2byte 0x1286 - .2byte 0x1287 - .2byte 0x1288 - .2byte 0x128C - .2byte 0x128D - .2byte 0x128E - .2byte 0x128F - .2byte 0x1290 - .2byte 0x1291 - .2byte 0x1292 - .2byte 0x1293 - .2byte 0x0281 - .2byte 0x0282 - .2byte 0x0283 - .2byte 0x0284 - .2byte 0x0285 - .2byte 0x0286 - .2byte 0x0287 - .2byte 0x0288 - .2byte 0x028C - .2byte 0x028D - .2byte 0x028E - .2byte 0x028F - .2byte 0x0290 - .2byte 0x0291 - .2byte 0x0292 - .2byte 0x0293 - .2byte 0x12AD - .2byte 0x12AE - .2byte 0x12A8 - .2byte 0x12A8 - .align 2 WaveformPalette: @ 83B6B94 .incbin "graphics/pokemon_storage/waveform.gbapal" diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index daae82df6..5fd43cfb8 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -89,6 +89,7 @@ struct PokemonStorageSystemData { u8 unk_0004; u8 unk_0005; u8 unk_0006; + u8 unk_0007; u16 unk_0008; u16 unk_000a; struct PCScreenEffectStruct unk_000c; @@ -266,6 +267,51 @@ const u8 gBoxSelectionPopupCenterTiles[] = INCBIN_U8("graphics/pokemon_storage/b const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp"); +const u16 gPokemonStorageScrollingBGPalette[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.gbapal"); + +const u16 gPokemonStorageScrollingBGTile[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.4bpp"); + +const u8 gPokemonStorageScrollingBGTilemap[] = INCBIN_U8("graphics/pokemon_storage/scrolling_bg_map.bin.lz"); + +const u16 sUnknownTilemap[] = { + 0x1281, + 0x1282, + 0x1283, + 0x1284, + 0x1285, + 0x1286, + 0x1287, + 0x1288, + 0x128C, + 0x128D, + 0x128E, + 0x128F, + 0x1290, + 0x1291, + 0x1292, + 0x1293, + 0x0281, + 0x0282, + 0x0283, + 0x0284, + 0x0285, + 0x0286, + 0x0287, + 0x0288, + 0x028C, + 0x028D, + 0x028E, + 0x028F, + 0x0290, + 0x0291, + 0x0292, + 0x0293, + 0x12AD, + 0x12AE, + 0x12A8, + 0x12A8 +}; + extern const struct StorageAction gPCStorageActionTexts[]; extern const struct PokemonStorageSystemData *gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; @@ -2073,6 +2119,69 @@ void sub_8097BA0(void) } } +void sub_8097CC0(void) { + switch (ePokemonStorageSystem.unk_0004) { + case 0: + if (sub_809BF20()) { + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_HOLDING_POKE); + ePokemonStorageSystem.unk_0004 = 1; + } + else { + PlaySE(SE_SELECT); + PrintStorageActionText(PC_TEXT_CONTINUE_BOX); + sub_8098A38(0); + ePokemonStorageSystem.unk_0004 = 2; + } + break; + case 1: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + case 2: + switch (ProcessMenuInputNoWrap()) { + case 0: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case -1: + case 1: + PlaySE(SE_PC_OFF); + sub_8098A5C(); + ePokemonStorageSystem.unk_0004++; + break; + } + break; + case 3: + ePokemonStorageSystem.unk_000c.tileTag = 0x000e; + ePokemonStorageSystem.unk_000c.paletteTag = 0xdad0; + ePokemonStorageSystem.unk_000c.unk04 = 20; + ePokemonStorageSystem.unk_000c.unk06 = 0; + sub_80C5E38(&ePokemonStorageSystem.unk_000c); + ePokemonStorageSystem.unk_0004++; + break; + case 4: + if (sub_80C5F98()) { + gPlayerPartyCount = CalculatePlayerPartyCount(); + SetMainCallback2(sub_80961A8); + } + break; + } +} + +void sub_8097DE0(void) +{ + ePokemonStorageSystem.unk_0007 = 0; + ePokemonStorageSystem.unk_0008 = 0; + ePokemonStorageSystem.unk_000a = 0; + REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(30); + DmaCopy16Defvars(3, gPokemonStorageScrollingBGTile, BG_SCREEN_ADDR(28), sizeof gPokemonStorageScrollingBGTile); + LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, BG_SCREEN_ADDR(30)); + LoadPalette(gPokemonStorageScrollingBGPalette, 0xd0, 0x10); +} + asm(".section .text.8098898"); void PrintStorageActionText(u8 index) { -- cgit v1.2.3 From 6d16dba22e9ea2b40bf684f7549b73a583d143f6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 8 Jan 2018 23:16:13 -0600 Subject: re-label some window and text code --- asm/battle_1.s | 20 +- asm/battle_anim_81258BC.s | 4 +- asm/contest_link_80C2020.s | 6 +- asm/pokemon_storage_system.s | 62 +-- asm/pokenav.s | 34 +- data/graphics.s | 2 +- include/menu.h | 42 +- include/text.h | 164 +++---- include/text_window.h | 22 +- src/battle/battle_2.c | 14 +- src/battle/battle_4.c | 12 +- src/battle/battle_controller_linkopponent.c | 2 +- src/battle/battle_controller_linkpartner.c | 2 +- src/battle/battle_controller_opponent.c | 2 +- src/battle/battle_controller_player.c | 42 +- src/battle/battle_controller_safari.c | 10 +- src/battle/battle_controller_wally.c | 12 +- src/battle/battle_party_menu.c | 6 +- src/battle/battle_records.c | 32 +- src/battle/reshow_battle_screen.c | 2 +- src/contest.c | 88 ++-- src/debug/matsuda_debug_menu.c | 44 +- src/debug/mori_debug_menu.c | 12 +- src/debug/sound_check_menu.c | 80 ++-- src/debug/unknown_debug_menu.c | 6 +- src/easy_chat_1.c | 16 +- src/easy_chat_2.c | 24 +- src/engine/cable_club.c | 6 +- src/engine/clear_save_data_menu.c | 6 +- src/engine/link.c | 6 +- src/engine/main_menu.c | 94 ++-- src/engine/menu.c | 150 +++--- src/engine/mystery_event_menu.c | 32 +- src/engine/naming_screen.c | 14 +- src/engine/option_menu.c | 34 +- src/engine/record_mixing.c | 10 +- src/engine/reset_rtc_screen.c | 22 +- src/engine/save_failed_screen.c | 32 +- src/engine/save_menu_util.c | 18 +- src/engine/text.c | 707 +++++++++++++++------------- src/engine/text_window.c | 157 +++--- src/engine/trade.c | 118 ++--- src/engine/trainer_card.c | 28 +- src/field/berry_tag_screen.c | 24 +- src/field/braille_puzzles.c | 4 +- src/field/choose_party.c | 28 +- src/field/coins.c | 6 +- src/field/daycare.c | 12 +- src/field/decoration.c | 76 +-- src/field/diploma.c | 2 +- src/field/field_message_box.c | 20 +- src/field/field_player_avatar.c | 18 +- src/field/field_region_map.c | 10 +- src/field/field_screen_effect.c | 4 +- src/field/field_specials.c | 54 +-- src/field/fldeff_softboiled.c | 4 +- src/field/item_menu.c | 96 ++-- src/field/item_use.c | 18 +- src/field/map_name_popup.c | 8 +- src/field/mauville_man.c | 22 +- src/field/menu_helpers.c | 8 +- src/field/money.c | 6 +- src/field/party_menu.c | 74 +-- src/field/player_pc.c | 130 ++--- src/field/pokeblock.c | 42 +- src/field/region_map.c | 18 +- src/field/scrcmd.c | 8 +- src/field/script_menu.c | 58 +-- src/field/secret_base.c | 44 +- src/field/shop.c | 36 +- src/field/slot_machine.c | 16 +- src/field/start_menu.c | 32 +- src/field/starter_choose.c | 24 +- src/field/trader.c | 20 +- src/field/use_pokeblock.c | 22 +- src/field/wallclock.c | 10 +- src/pokemon/learn_move.c | 62 +-- src/pokemon/mail.c | 6 +- src/pokemon/mon_markings.c | 2 +- src/pokemon/pokeblock_feed.c | 4 +- src/pokemon/pokedex.c | 56 +-- src/pokemon/pokemon_menu.c | 44 +- src/pokemon/pokemon_storage_system.c | 4 +- src/pokemon/pokemon_summary_screen.c | 142 +++--- src/pokenav_before.c | 24 +- src/rom_800D42C.c | 4 +- src/roulette.c | 68 +-- src/scene/berry_blender.c | 92 ++-- src/scene/credits.c | 2 +- src/scene/egg_hatch.c | 14 +- src/scene/evolution_scene.c | 84 ++-- src/scene/hall_of_fame.c | 40 +- src/script_pokemon_util_80C4BF0.c | 4 +- 93 files changed, 1940 insertions(+), 1862 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index f0a883ec4..da604c6b6 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -448,16 +448,16 @@ _0800D748: .4byte 0x0000bf40 sub_800D74C: @ 800D74C push {r4,lr} movs r0, 0x12 - bl SetTextWindowBaseTileNum + bl TextWindow_SetBaseTileNum ldr r4, _0800D79C @ =gUnknown_03004210 adds r0, r4, 0 movs r1, 0x1 - bl LoadTextWindowGraphics_OverridePalSlot + bl TextWindow_LoadStdFrameGraphicsOverridePal movs r0, 0x22 - bl SetTextWindowBaseTileNum + bl TextWindow_SetBaseTileNum adds r0, r4, 0 movs r1, 0x1 - bl LoadTextWindowGraphics_OverridePalSlot + bl TextWindow_LoadStdFrameGraphicsOverridePal ldr r3, _0800D7A0 @ =gPlttBufferUnfaded adds r0, r3, 0 adds r0, 0xB8 @@ -1055,9 +1055,9 @@ _0800DE88: str r0, [sp, 0x4] adds r0, r1, 0 adds r1, r7, 0 - bl sub_8002E4C + bl Text_InitWindow8002E4C ldr r0, [sp, 0xC] - bl sub_8002F44 + bl Text_PrintWindow8002F44 ldr r2, _0800DEDC @ =gUnknown_081F9680 + 0x8 adds r4, r2 ldr r2, [r4] @@ -1111,9 +1111,9 @@ _0800DF04: movs r5, 0x1 str r5, [sp, 0x4] adds r0, r4, 0 - bl sub_8002E4C + bl Text_InitWindow8002E4C adds r0, r4, 0 - bl sub_8002F44 + bl Text_PrintWindow8002F44 mov r0, r8 ldr r2, [r0, 0x38] mov r0, r9 @@ -1134,9 +1134,9 @@ _0800DF04: str r0, [sp] str r5, [sp, 0x4] adds r0, r4, 0 - bl sub_8002E4C + bl Text_InitWindow8002E4C adds r0, r4, 0 - bl sub_8002F44 + bl Text_PrintWindow8002F44 mov r5, r8 ldr r2, [r5, 0x44] mov r0, r9 diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s index 2c19ad731..c13faaa77 100644 --- a/asm/battle_anim_81258BC.s +++ b/asm/battle_anim_81258BC.s @@ -49,11 +49,11 @@ sub_812AF10: @ 812AF10 movs r1, 0xE movs r2, 0x1B movs r3, 0x13 - bl MenuDrawTextWindow + bl Menu_DrawStdWindowFrame ldr r0, _0812AF2C @ =gStringVar4 movs r1, 0x3 movs r2, 0xF - bl MenuPrint + bl Menu_PrintText pop {r0} bx r0 .align 2, 0 diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 608daba87..096ce91e7 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -17,7 +17,7 @@ sub_80C2020: @ 80C2020 bl SetUpWindowConfig ldr r0, _080C20F4 @ =gMenuWindow adds r1, r4, 0 - bl InitWindowFromConfig + bl Text_InitWindowWithTemplate ldr r1, _080C20F8 @ =REG_BG0CNT movs r2, 0xF8 lsls r2, 6 @@ -357,7 +357,7 @@ _080C230A: lsrs r3, 24 str r3, [sp] movs r3, 0x7 - bl sub_8003460 + bl Text_InitWindowAndPrintText add sp, 0x4 pop {r4-r7} pop {r0} @@ -2194,7 +2194,7 @@ _080C31CE: bge _080C31CE mov r0, r8 mov r1, r9 - bl GetStringWidthGivenWindowConfig + bl Text_GetStringWidthFromWindowTemplate lsls r0, 24 lsrs r5, r0, 24 ldr r2, _080C32D4 @ =gDisplayedStringBattle diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 69c6d9e4f..2954c0b09 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -539,7 +539,7 @@ StorageSystemClearMessageWindow: @ 8095EA0 movs r1, 0xF movs r2, 0x1B movs r3, 0x12 - bl MenuFillWindowRectWithBlankTile + bl Menu_BlankWindowRect pop {r0} bx r0 thumb_func_end StorageSystemClearMessageWindow @@ -578,7 +578,7 @@ _08095EE0: _08095EF4: ldrb r0, [r4, 0xA] bl StorageSystemCreatePrimaryMenu - bl MenuDisplayMessageBox + bl Menu_DisplayDialogueFrame ldr r1, _08095F18 @ =gUnknown_083B600C movs r2, 0xA ldrsh r0, [r4, r2] @@ -588,7 +588,7 @@ _08095EF4: ldr r0, [r0] movs r1, 0x2 movs r2, 0xF - bl MenuPrint + bl Menu_PrintText b _08095F28 .align 2, 0 _08095F18: .4byte gUnknown_083B600C @@ -604,7 +604,7 @@ _08095F28: strh r0, [r4, 0x8] b _080960F4 _08095F30: - bl ProcessMenuInput + bl Menu_ProcessInput lsls r0, 24 asrs r0, 24 strh r0, [r4, 0xC] @@ -676,7 +676,7 @@ _08095FA2: ldr r0, [r1] movs r1, 0x2 movs r2, 0xF - bl MenuPrint + bl Menu_PrintText b _080960F4 .align 2, 0 _08095FC0: .4byte gMain @@ -687,7 +687,7 @@ _08095FC8: movs r1, 0 movs r2, 0xD movs r3, 0x9 - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect bl ScriptContext2_Disable bl EnableBothScriptContexts adds r0, r5, 0 @@ -723,7 +723,7 @@ _08096008: _08096022: movs r1, 0x2 movs r2, 0xF - bl MenuPrint + bl Menu_PrintText movs r0, 0x3 strh r0, [r4, 0x8] b _080960F4 @@ -760,8 +760,8 @@ _08096042: _0809606A: movs r0, 0x1 negs r0, r0 - bl MoveMenuCursor - bl GetMenuCursorPos + bl Menu_MoveCursor + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] @@ -788,8 +788,8 @@ _08096090: strh r2, [r4, 0xA] _080960A8: movs r0, 0x1 - bl MoveMenuCursor - bl GetMenuCursorPos + bl Menu_MoveCursor + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] @@ -805,7 +805,7 @@ _080960C2: ldr r0, [r0] movs r1, 0x2 movs r2, 0xF - bl MenuPrint + bl Menu_PrintText movs r0, 0x2 strh r0, [r4, 0x8] b _080960F4 @@ -892,7 +892,7 @@ StorageSystemCreatePrimaryMenu: @ 8096168 movs r1, 0 movs r2, 0xD movs r3, 0x9 - bl MenuDrawTextWindow + bl Menu_DrawStdWindowFrame ldr r3, _080961A4 @ =gUnknown_083B600C movs r0, 0x1 movs r1, 0x1 @@ -1854,7 +1854,7 @@ _080968F0: .4byte gWindowConfig_81E6D00 _080968F4: ldr r0, _08096900 @ =gWindowConfig_81E6D00 bl InitMenuWindow - bl MenuZeroFillScreen + bl Menu_EraseScreen b _0809697A .align 2, 0 _08096900: .4byte gWindowConfig_81E6D00 @@ -1993,7 +1993,7 @@ _08096A3C: .4byte gWindowConfig_81E6D00 _08096A40: ldr r0, _08096A4C @ =gWindowConfig_81E6D00 bl InitMenuWindow - bl MenuZeroFillScreen + bl Menu_EraseScreen b _08096AD8 .align 2, 0 _08096A4C: .4byte gWindowConfig_81E6D00 @@ -3370,7 +3370,7 @@ _080975EC: adds r0, 0x1 strb r0, [r1, 0x4] _08097600: - bl ProcessMenuInputNoWrap + bl Menu_ProcessInputNoWrap lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4113,7 +4113,7 @@ _08097C18: .align 2, 0 _08097C28: .4byte gMain _08097C2C: - bl ProcessMenuInputNoWrap + bl Menu_ProcessInputNoWrap lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4247,7 +4247,7 @@ _08097D38: .align 2, 0 _08097D48: .4byte gMain _08097D4C: - bl ProcessMenuInputNoWrap + bl Menu_ProcessInputNoWrap lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4940,27 +4940,27 @@ _08098302: movs r1, 0xB movs r2, 0x9 movs r3, 0x11 - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect ldr r4, _0809834C @ =gSharedMem + 0x127A adds r0, r4, 0 movs r1, 0x1 movs r2, 0x10 - bl MenuPrint + bl Menu_PrintText adds r0, r4, 0 subs r0, 0x6B movs r1, 0x1 movs r2, 0xB - bl MenuPrint + bl Menu_PrintText adds r0, r4, 0 subs r0, 0x46 movs r1, 0 movs r2, 0xD - bl MenuPrint + bl Menu_PrintText subs r4, 0x21 adds r0, r4, 0 movs r1, 0x1 movs r2, 0xF - bl MenuPrint + bl Menu_PrintText pop {r4} pop {r0} bx r0 @@ -5657,7 +5657,7 @@ sub_8098A38: @ 8098A38 lsls r4, 24 asrs r4, 24 adds r0, r4, 0 - bl MoveMenuCursor + bl Menu_MoveCursor pop {r4} pop {r0} bx r0 @@ -5671,12 +5671,12 @@ sub_8098A5C: @ 8098A5C movs r1, 0x10 movs r2, 0x1D movs r3, 0x13 - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect movs r0, 0x17 movs r1, 0xA movs r2, 0x1D movs r3, 0xF - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect pop {r0} bx r0 thumb_func_end sub_8098A5C @@ -14483,7 +14483,7 @@ sub_809CE84: @ 809CE84 ldrb r1, [r6] movs r2, 0x1D movs r3, 0xF - bl MenuDrawTextWindow + bl Menu_DrawStdWindowFrame ldrb r0, [r5] adds r0, 0x1 lsls r0, 24 @@ -14559,7 +14559,7 @@ _0809CF52: bl PlaySE movs r0, 0x1 negs r0, r0 - bl MoveMenuCursor + bl Menu_MoveCursor b _0809CF8E .align 2, 0 _0809CF6C: .4byte gMain @@ -14571,10 +14571,10 @@ _0809CF70: movs r0, 0x5 bl PlaySE movs r0, 0x1 - bl MoveMenuCursor + bl Menu_MoveCursor b _0809CF8E _0809CF86: - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r5, r0, 24 _0809CF8E: @@ -14593,7 +14593,7 @@ _0809CF8E: ldrb r1, [r1] movs r2, 0x1D movs r3, 0xF - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect _0809CFB2: cmp r5, 0 blt _0809CFC4 diff --git a/asm/pokenav.s b/asm/pokenav.s index 83ceed00f..7db96ed0f 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -237,7 +237,7 @@ _080F07F4: adds r0, r1 movs r1, 0x1 movs r2, 0x6 - bl MenuPrint + bl Menu_PrintText _080F080A: pop {r0} bx r0 @@ -348,7 +348,7 @@ sub_80F08E4: @ 80F08E4 movs r1, 0x9 movs r2, 0xB movs r3, 0x10 - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect pop {r0} bx r0 .align 2, 0 @@ -376,7 +376,7 @@ sub_80F0900: @ 80F0900 movs r1, 0x1 movs r2, 0x1F movs r3, 0xF - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect _080F092A: ldrh r0, [r5] lsrs r2, r4, 16 @@ -533,7 +533,7 @@ _080F0A40: lsrs r2, 24 adds r0, r4, 0 movs r1, 0xD - bl MenuPrint + bl Menu_PrintText pop {r4,r5} pop {r0} bx r0 @@ -694,7 +694,7 @@ _080F0B60: adds r3, r1, 0x1 movs r0, 0xC movs r2, 0x1F - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect _080F0BAA: ldrh r0, [r6] cmp r0, 0 @@ -726,7 +726,7 @@ _080F0BE2: movs r0, 0xC adds r1, r4, 0 movs r2, 0x1F - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect adds r4, 0x2 movs r0, 0x1F ands r4, r0 @@ -1147,7 +1147,7 @@ _080F0F10: movs r0, 0xC adds r1, r4, 0 movs r2, 0x1F - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] @@ -1274,7 +1274,7 @@ sub_80F0FFC: @ 80F0FFC adds r0, r4, 0 movs r1, 0 movs r2, 0x5 - bl MenuPrint + bl Menu_PrintText pop {r4,r5} pop {r0} bx r0 @@ -1376,7 +1376,7 @@ _080F111C: _080F1126: b _080F1226 _080F1128: - bl MenuZeroFillScreen + bl Menu_EraseScreen b _080F1218 _080F112E: bl sub_80F1614 @@ -1761,7 +1761,7 @@ sub_80F1438: @ 80F1438 adds r0, r4, r1 movs r1, 0xD movs r2, 0x1 - bl MenuPrint + bl Menu_PrintText ldr r0, _080F1478 @ =0x00008788 adds r5, r4, r0 ldr r1, _080F147C @ =0x0000876e @@ -1775,7 +1775,7 @@ sub_80F1438: @ 80F1438 adds r0, r5, 0 movs r1, 0x1 movs r2, 0x5 - bl MenuPrint + bl Menu_PrintText pop {r4,r5} pop {r0} bx r0 @@ -1793,7 +1793,7 @@ sub_80F1480: @ 80F1480 movs r1, 0xD movs r2, 0x1B movs r3, 0x10 - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect pop {r0} bx r0 thumb_func_end sub_80F1480 @@ -1914,11 +1914,11 @@ _080F158A: adds r0, r6, 0 movs r1, 0xC movs r2, 0xD - bl MenuPrint + bl Menu_PrintText adds r0, r7, 0 movs r1, 0xC movs r2, 0xF - bl MenuPrint + bl Menu_PrintText pop {r4-r7} pop {r0} bx r0 @@ -1933,7 +1933,7 @@ sub_80F15A8: @ 80F15A8 movs r1, 0xD movs r2, 0x1B movs r3, 0x10 - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect ldr r0, _080F1600 @ =gUnknown_083DFEC4 ldr r4, [r0] ldr r0, _080F1604 @ =0x00008788 @@ -1964,7 +1964,7 @@ sub_80F15A8: @ 80F15A8 adds r0, r5, 0 movs r1, 0xC movs r2, 0xD - bl MenuPrint + bl Menu_PrintText pop {r4,r5} pop {r0} bx r0 @@ -2502,7 +2502,7 @@ _080F1A46: movs r0, 0xE movs r2, 0x1C movs r3, 0xF - bl MenuFillWindowRectWithBlankTile + bl Menu_BlankWindowRect movs r0, 0 strb r0, [r5] _080F1A60: diff --git a/data/graphics.s b/data/graphics.s index 7792e8a9e..6cc1c2db7 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4522,7 +4522,7 @@ gPokenavRibbonPokeView_Gfx:: @ 8EA0028 .incbin "graphics/pokenav/ribbon_pokeview.4bpp" .align 2 -gMessageBox_Gfx:: @ 8EA0108 +gDialogueFrame_Gfx:: @ 8EA0108 .incbin "graphics/text_window/message_box.4bpp" .align 2 diff --git a/include/menu.h b/include/menu.h index 9a5ca62a0..3339ff644 100644 --- a/include/menu.h +++ b/include/menu.h @@ -26,38 +26,38 @@ extern u16 gMenuMessageBoxContentTileOffset; void CloseMenu(void); void AppendToList(u8 *list, u8 *pindex, u32 value); -void InitMenuWindow(const struct WindowConfig *); -void MultistepInitMenuWindowBegin(const struct WindowConfig *); +void InitMenuWindow(const struct WindowTemplate *); +void MultistepInitMenuWindowBegin(const struct WindowTemplate *); bool32 MultistepInitMenuWindowContinue(void); -void unref_sub_8071DA4(struct WindowConfig *, u16); -void MenuLoadTextWindowGraphics_OverrideFrameType(u8); -void MenuLoadTextWindowGraphics(void); -void BasicInitMenuWindow(const struct WindowConfig *); -void MenuPrint(const u8 *, u8, u8); -void MenuZeroFillWindowRect(u8, u8, u8, u8); -void MenuFillWindowRectWithBlankTile(u8, u8, u8, u8); -void MenuZeroFillScreen(void); -void MenuDrawTextWindow(u8, u8, u8, u8); +void unref_sub_8071DA4(struct WindowTemplate *, u16); +void Menu_LoadStdFrameGraphicsOverrideStyle(u8); +void Menu_LoadStdFrameGraphics(void); +void BasicInitMenuWindow(const struct WindowTemplate *); +void Menu_PrintText(const u8 *, u8, u8); +void Menu_EraseWindowRect(u8, u8, u8, u8); +void Menu_BlankWindowRect(u8, u8, u8, u8); +void Menu_EraseScreen(void); +void Menu_DrawStdWindowFrame(u8, u8, u8, u8); void sub_8071F40(const u8 *); void sub_8071F60(u8, u8, u8); u16 unref_sub_8071F98(u8, u8); void unref_sub_8071FBC(u16, u8, u8, u8, u8); -void MenuDisplayMessageBox(void); +void Menu_DisplayDialogueFrame(void); void MenuPrintMessage(const u8 *, u8, u8); void MenuPrintMessageDefaultCoords(const u8 *); void MenuSetText(const u8 *); -u8 MenuUpdateWindowText(void); +u8 Menu_UpdateWindowText(void); u8 unref_sub_8072098(void); -void sub_80720B0(void); -u8 MoveMenuCursor(s8); -u8 MoveMenuCursorNoWrap(s8); -u8 GetMenuCursorPos(void); -s8 ProcessMenuInput(void); -s8 ProcessMenuInputNoWrap(void); +void Menu_ClearWindowText(void); +u8 Menu_MoveCursor(s8); +u8 Menu_MoveCursorNoWrap(s8); +u8 Menu_GetCursorPos(void); +s8 Menu_ProcessInput(void); +s8 Menu_ProcessInputNoWrap(void); u8 MoveMenuCursor3(s8); u8 MoveMenuCursor4(s8); void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32); -s8 sub_80727CC(void); +s8 Menu_ProcessInputGridLayout(void); u8 sub_807288C(u8); void PrintMenuItems(u8, u8, u8, const struct MenuAction[]); void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order); @@ -76,7 +76,7 @@ u8 *sub_8072C44(u8 *, s32, u8, u8); u8 *sub_8072C74(u8 *, const u8 *, u8, u8); u8 sub_8072CA4(const u8 *s); u8 sub_8072CBC(void); -void sub_8072CD4(u8 *, u8 *, u8 *); +void Menu_GetTextColors(u8 *, u8 *, u8 *); u32 MenuUpdateWindowText_OverrideLineLength(u8); struct Window * unref_sub_8072D0C(void); u8 InitMenu(u8, u8, u8, u8, u8, u8); diff --git a/include/text.h b/include/text.h index ebc4ebe7e..edda0c2ca 100644 --- a/include/text.h +++ b/include/text.h @@ -74,7 +74,7 @@ #define CHAR_NEWLINE 0xFE #define EOS 0xFF // end of string -struct WindowConfig +struct WindowTemplate { u8 bgNum; u8 charBaseBlock; @@ -126,7 +126,7 @@ struct Window /*0x20*/ const u8 *text; /*0x24*/ u8 *tileData; /*0x28*/ u16 *tilemap; - /*0x2C*/ const struct WindowConfig *config; + /*0x2C*/ const struct WindowTemplate *template; }; extern vu16 *const gBGControlRegs[]; @@ -137,65 +137,65 @@ extern const u16 gUnknown_081E29D8[]; extern const u16 gUnknown_081E29E0[]; extern const u16 gUnknown_081E29E8[]; -extern const struct WindowConfig gWindowConfig_81E6C3C; -extern const struct WindowConfig gWindowConfig_81E6C58; -extern const struct WindowConfig gWindowConfig_81E6C74; -extern const struct WindowConfig gWindowConfig_81E6C90; -extern const struct WindowConfig gWindowConfig_81E6CAC; -extern const struct WindowConfig gWindowConfig_81E6CC8; -extern const struct WindowConfig gWindowConfig_81E6CE4; -extern const struct WindowConfig gWindowConfig_81E6D00; -extern const struct WindowConfig gWindowConfig_81E6D1C; -extern const struct WindowConfig gWindowConfig_81E6D38; -extern const struct WindowConfig gWindowConfig_81E6D54; -extern const struct WindowConfig gWindowConfig_81E6D70; -extern const struct WindowConfig gWindowConfig_81E6D8C; -extern const struct WindowConfig gWindowConfig_81E6DA8; -extern const struct WindowConfig WindowConfig_TrainerCard_Back_Values; -extern const struct WindowConfig WindowConfig_TrainerCard_Back_Labels; -extern const struct WindowConfig gWindowConfig_81E6DFC; -extern const struct WindowConfig gWindowConfig_81E6E18; -extern const struct WindowConfig gWindowConfig_81E6E34; -extern const struct WindowConfig gWindowConfig_81E6E50; -extern const struct WindowConfig gWindowConfig_81E6E6C; -extern const struct WindowConfig gWindowConfig_81E6E88; -extern const struct WindowConfig gWindowConfig_81E6EA4; -extern const struct WindowConfig gWindowConfig_81E6EC0; -extern const struct WindowConfig gWindowConfig_81E6EDC; -extern const struct WindowConfig gWindowConfig_81E6EF8; -extern const struct WindowConfig gWindowConfig_81E6F14; -extern const struct WindowConfig gWindowConfig_81E6F30; -extern const struct WindowConfig gWindowConfig_81E6F4C; -extern const struct WindowConfig gWindowConfig_81E6F68; -extern const struct WindowConfig gWindowConfig_81E6F84; -extern const struct WindowConfig gWindowConfig_81E6FA0; -extern const struct WindowConfig gWindowConfig_81E6FBC; -extern const struct WindowConfig gWindowConfig_81E6FD8; -extern const struct WindowConfig gWindowConfig_81E6FF4; -extern const struct WindowConfig gWindowConfig_81E7010; -extern const struct WindowConfig gWindowConfig_81E702C; -extern const struct WindowConfig gWindowConfig_81E7048; -extern const struct WindowConfig gWindowConfig_81E7064; -extern const struct WindowConfig gWindowConfig_81E7080; -extern const struct WindowConfig gWindowConfig_81E709C; -extern const struct WindowConfig gWindowConfig_81E70B8; -extern const struct WindowConfig gWindowConfig_81E70D4; -extern const struct WindowConfig gWindowConfig_81E70F0; -extern const struct WindowConfig gWindowConfig_81E710C; -extern const struct WindowConfig gWindowConfig_81E7128; -extern const struct WindowConfig gWindowConfig_81E7144; -extern const struct WindowConfig gWindowConfig_81E7160; -extern const struct WindowConfig gWindowConfig_81E717C; -extern const struct WindowConfig gWindowConfig_81E7198; -extern const struct WindowConfig gWindowConfig_81E71B4; -extern const struct WindowConfig gWindowConfig_81E71D0; -extern const struct WindowConfig gWindowConfig_81E71EC; -extern const struct WindowConfig gWindowConfig_81E7208; -extern const struct WindowConfig gWindowConfig_81E7224; -extern const struct WindowConfig gWindowConfig_81E7240; -extern const struct WindowConfig gWindowConfig_81E725C; -extern const struct WindowConfig gWindowConfig_81E7278; -extern const struct WindowConfig gWindowConfig_81E7294; +extern const struct WindowTemplate gWindowConfig_81E6C3C; +extern const struct WindowTemplate gWindowConfig_81E6C58; +extern const struct WindowTemplate gWindowConfig_81E6C74; +extern const struct WindowTemplate gWindowConfig_81E6C90; +extern const struct WindowTemplate gWindowConfig_81E6CAC; +extern const struct WindowTemplate gWindowConfig_81E6CC8; +extern const struct WindowTemplate gWindowConfig_81E6CE4; +extern const struct WindowTemplate gWindowConfig_81E6D00; +extern const struct WindowTemplate gWindowConfig_81E6D1C; +extern const struct WindowTemplate gWindowConfig_81E6D38; +extern const struct WindowTemplate gWindowConfig_81E6D54; +extern const struct WindowTemplate gWindowConfig_81E6D70; +extern const struct WindowTemplate gWindowConfig_81E6D8C; +extern const struct WindowTemplate gWindowConfig_81E6DA8; +extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Values; +extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels; +extern const struct WindowTemplate gWindowConfig_81E6DFC; +extern const struct WindowTemplate gWindowConfig_81E6E18; +extern const struct WindowTemplate gWindowConfig_81E6E34; +extern const struct WindowTemplate gWindowConfig_81E6E50; +extern const struct WindowTemplate gWindowConfig_81E6E6C; +extern const struct WindowTemplate gWindowConfig_81E6E88; +extern const struct WindowTemplate gWindowConfig_81E6EA4; +extern const struct WindowTemplate gWindowConfig_81E6EC0; +extern const struct WindowTemplate gWindowConfig_81E6EDC; +extern const struct WindowTemplate gWindowConfig_81E6EF8; +extern const struct WindowTemplate gWindowConfig_81E6F14; +extern const struct WindowTemplate gWindowConfig_81E6F30; +extern const struct WindowTemplate gWindowConfig_81E6F4C; +extern const struct WindowTemplate gWindowConfig_81E6F68; +extern const struct WindowTemplate gWindowConfig_81E6F84; +extern const struct WindowTemplate gWindowConfig_81E6FA0; +extern const struct WindowTemplate gWindowConfig_81E6FBC; +extern const struct WindowTemplate gWindowConfig_81E6FD8; +extern const struct WindowTemplate gWindowConfig_81E6FF4; +extern const struct WindowTemplate gWindowConfig_81E7010; +extern const struct WindowTemplate gWindowConfig_81E702C; +extern const struct WindowTemplate gWindowConfig_81E7048; +extern const struct WindowTemplate gWindowConfig_81E7064; +extern const struct WindowTemplate gWindowConfig_81E7080; +extern const struct WindowTemplate gWindowConfig_81E709C; +extern const struct WindowTemplate gWindowConfig_81E70B8; +extern const struct WindowTemplate gWindowConfig_81E70D4; +extern const struct WindowTemplate gWindowConfig_81E70F0; +extern const struct WindowTemplate gWindowConfig_81E710C; +extern const struct WindowTemplate gWindowConfig_81E7128; +extern const struct WindowTemplate gWindowConfig_81E7144; +extern const struct WindowTemplate gWindowConfig_81E7160; +extern const struct WindowTemplate gWindowConfig_81E717C; +extern const struct WindowTemplate gWindowConfig_81E7198; +extern const struct WindowTemplate gWindowConfig_81E71B4; +extern const struct WindowTemplate gWindowConfig_81E71D0; +extern const struct WindowTemplate gWindowConfig_81E71EC; +extern const struct WindowTemplate gWindowConfig_81E7208; +extern const struct WindowTemplate gWindowConfig_81E7224; +extern const struct WindowTemplate gWindowConfig_81E7240; +extern const struct WindowTemplate gWindowConfig_81E725C; +extern const struct WindowTemplate gWindowConfig_81E7278; +extern const struct WindowTemplate gWindowConfig_81E7294; extern u16 gBGTilemapBuffers[4][0x400]; @@ -205,37 +205,37 @@ extern u8 gStringVar3[]; extern u8 gStringVar4[]; extern u8 gTileBuffer[]; -void LoadFontDefaultPalette(const struct WindowConfig *winConfig); -void SetUpWindowConfig(const struct WindowConfig *winConfig); +void LoadFontDefaultPalette(const struct WindowTemplate *winConfig); +void SetUpWindowConfig(const struct WindowTemplate *winConfig); u16 InitWindowTileData(struct Window *win, u16 startOffset); u32 MultistepInitWindowTileData(struct Window *win, u16 startOffset); bool32 MultistepLoadFont(void); -void InitWindowFromConfig(struct Window *win, const struct WindowConfig *winConfig); -void InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); -void sub_8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6); +void Text_InitWindowWithTemplate(struct Window *win, const struct WindowTemplate *winConfig); +void Text_InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); +void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6); void sub_8002E90(struct Window *win, const u8 *text); -void sub_8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); -u8 sub_8002F44(struct Window *win); -u8 sub_8003418(struct Window *win); -u8 sub_8003460(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); +void Text_InitWindow8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); +u8 Text_PrintWindow8002F44(struct Window *win); +u8 Text_PrintWindowSimple(struct Window *win); +u8 Text_InitWindowAndPrintText(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 top); void sub_80034D4(u8 *tileData, const u8 *text); u8 sub_80034EC(u8 *str); u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType); u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType); -u8 sub_80035AC(struct Window *win); -u8 sub_800374C(struct Window *win); -u8 sub_8003778(struct Window *win); -u8 sub_80037A0(struct Window *win); -u32 sub_80037C8(struct Window *win, u8 lineLength); -void ClearWindowTextLines(struct Window *win); -u16 GetWindowTilemapEntry(struct Window *win, u8 x, u8 y); -void DrawWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom); +u8 Text_UpdateWindow(struct Window *win); +u8 Text_UpdateWindowInBattle(struct Window *win); +u8 Text_UpdateWindowAutoscroll(struct Window *win); +u8 Text_UpdateWindowInContest(struct Window *win); +u32 Text_UpdateWindowOverrideLineLength(struct Window *win, u8 lineLength); +void Text_ClearWindow(struct Window *win); +u16 Text_GetWindowTilemapEntry(struct Window *win, u8 x, u8 y); +void Text_FillWindowBorder(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom); void DrawWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom); void FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom); void FillWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom); void ZeroFillWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); -void FillWindowRectWithBlankTile(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); +void Text_BlankWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); u8 GetExtCtrlCodeLength(u8 code); u8 *AlignInt1(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignType); u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignType); @@ -245,9 +245,9 @@ u8 sub_8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6); u8 sub_8004E24(struct Window *win); -void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow); -void sub_8004E3C(const struct WindowConfig *winConfig, u8 *tileData, const u8 *text); -u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s); +void Text_GetTextColors(struct Window *win, u8 *foreground, u8 *background, u8 *shadow); +void sub_8004E3C(const struct WindowTemplate *winConfig, u8 *tileData, const u8 *text); +u8 Text_GetStringWidthFromWindowTemplate(const struct WindowTemplate *winConfig, const u8 *s); void ConvertInternationalString(u8 *s, u8 language); void StripExtCtrlCodes(u8 *str); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); diff --git a/include/text_window.h b/include/text_window.h index 7df1453ca..21e05ece0 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -9,17 +9,17 @@ struct FrameGraphics const u16 *palette; }; -u16 SetTextWindowBaseTileNum(u16 baseTileNum); -void LoadTextWindowGraphics(struct Window *win); -void LoadTextWindowGraphics_OverridePalSlot(struct Window *win, u8 palSlot); -void LoadTextWindowGraphics_OverrideFrameType(struct Window *win, u8 frameType); -void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); -const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType); -u16 SetMessageBoxBaseTileNum(u16 baseTileNum); +u16 TextWindow_SetBaseTileNum(u16 baseTileNum); +void TextWindow_LoadStdFrameGraphics(struct Window *win); +void TextWindow_LoadStdFrameGraphicsOverridePal(struct Window *win, u8 palSlot); +void TextWindow_LoadStdFrameGraphicsOverrideStyle(struct Window *win, u8 frameType); +void TextWindow_DrawStdFrame(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); +const struct FrameGraphics *TextWindow_GetFrameGraphics(u8 frameType); +u16 TextWindow_SetDlgFrameBaseTileNum(u16 baseTileNum); void unref_sub_80651DC(struct Window *, u8 *); -void DisplayMessageBox(struct Window *); -void DrawStandardMessageBox(struct Window *win); -void LoadMessageBoxTiles(struct Window *win); -void ClearStandardMessageBox(struct Window *win); +void TextWindow_DisplayDialogueFrame(struct Window *); +void TextWindow_DrawDialogueFrame(struct Window *win); +void TextWindow_LoadDialogueFrameTiles(struct Window *win); +void TextWindow_EraseDialogueFrame(struct Window *win); #endif // GUARD_TEXT_WINDOW_H diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index ae84e5585..dccf73fa8 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -245,9 +245,9 @@ void InitBattle(void) gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; gBattleTerrain = BattleSetup_GetTerrain(); - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); - InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0); - InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0); + Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC); sub_800D6D4(); sub_800DAB8(); ResetSpriteData(); @@ -898,7 +898,7 @@ void BattleMainCB2(void) { AnimateSprites(); BuildOamBuffer(); - sub_800374C(&gUnknown_03004210); + Text_UpdateWindowInBattle(&gUnknown_03004210); UpdatePaletteFade(); RunTasks(); } @@ -1221,9 +1221,9 @@ void c2_8011A1C(void) gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); - InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0); - InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0); + Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC); sub_800D6D4(); LoadCompressedPalette(gUnknown_08D004E0, 0, 64); sub_800D74C(); diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 5a20a8324..4be9b7d1c 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -10767,8 +10767,8 @@ void atk59_handlelearnnewmove(void) void sub_8023A80(void) { sub_802BBD4(0x18, 8, 0x1D, 0xD, 0); - InitWindow(&gUnknown_03004210, BattleText_YesNo, 0x100, 0x19, 0x9); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_YesNo, 0x100, 0x19, 0x9); + Text_PrintWindow8002F44(&gUnknown_03004210); sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20); } @@ -11714,9 +11714,9 @@ _08024AC4:\n\ str r0, [sp]\n\ adds r0, r4, 0\n\ movs r3, 0xC\n\ - bl InitWindow\n\ + bl Text_InitWindow\n\ adds r0, r4, 0\n\ - bl sub_8002F44\n\ + bl Text_PrintWindow8002F44\n\ ldr r1, _08024AEC @ =gSharedMem\n\ ldr r2, _08024AF0 @ =0x0001609c\n\ adds r1, r2\n\ @@ -11835,9 +11835,9 @@ _08024BC0:\n\ str r0, [sp]\n\ adds r0, r4, 0\n\ movs r3, 0xC\n\ - bl InitWindow\n\ + bl Text_InitWindow\n\ adds r0, r4, 0\n\ - bl sub_8002F44\n\ + bl Text_PrintWindow8002F44\n\ ldr r1, _08024BFC @ =gSharedMem\n\ ldr r0, _08024C00 @ =0x0001609c\n\ adds r1, r0\n\ diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 54181bc21..69306b725 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -1413,7 +1413,7 @@ void LinkOpponentHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_8037C2C; } diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index 2c78d4a82..c86c337d9 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -1358,7 +1358,7 @@ void LinkPartnerHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_811DFA0; } diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index ab7b6944b..622e3e9f9 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -1407,7 +1407,7 @@ void OpponentHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_80331D0; } diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index f992e3e51..4bbda2afd 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -745,8 +745,8 @@ void sub_802C68C(void) gUnknown_03004344 = gMoveSelectionCursor[gActiveBank] + 1; sub_802E3B4(gUnknown_03004344, 27); FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); - InitWindow(&gUnknown_03004210, BattleText_SwitchWhich, 0x290, 0x17, 0x37); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_SwitchWhich, 0x290, 0x17, 0x37); + Text_PrintWindow8002F44(&gUnknown_03004210); gBattleBankFunc[gActiveBank] = sub_802CA60; } } @@ -854,8 +854,8 @@ void sub_802CA60(void) gMoveSelectionCursor[gActiveBank] = gUnknown_03004344; sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0); FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); - InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37); + Text_PrintWindow8002F44(&gUnknown_03004210); sub_802E220(); sub_802E2D4(); } @@ -867,8 +867,8 @@ void sub_802CA60(void) sub_802E12C(gMoveSelectionCursor[gActiveBank], BattleText_Format); gBattleBankFunc[gActiveBank] = sub_802C68C; FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); - InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37); + Text_PrintWindow8002F44(&gUnknown_03004210); sub_802E220(); sub_802E2D4(); } @@ -1557,13 +1557,13 @@ void sub_802E12C(s32 a, const u8 *b) StringCopy(gDisplayedStringBattle, b); StringAppend(gDisplayedStringBattle, gMoveNames[r4->moves[a]]); - InitWindow( + Text_InitWindow( &gUnknown_03004210, gDisplayedStringBattle, 0x300 + a * 20, (a & 1) ? 11 : 1, (a < 2) ? 0x37 : 0x39); - sub_8002F44(&gUnknown_03004210); + Text_PrintWindow8002F44(&gUnknown_03004210); } void sub_802E1B0(void) @@ -1601,8 +1601,8 @@ void sub_802E220(void) str = ConvertIntToDecimalStringN(str, r4->pp[gMoveSelectionCursor[gActiveBank]], 1, 2); *str++ = CHAR_SLASH; ConvertIntToDecimalStringN(str, r4->unkC[gMoveSelectionCursor[gActiveBank]], 1, 2); - InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2A2, 0x19, 0x37); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2A2, 0x19, 0x37); + Text_PrintWindow8002F44(&gUnknown_03004210); } } @@ -1614,7 +1614,7 @@ void sub_802E2D4(void) if (gBattleBufferA[gActiveBank][2] == 1) { FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); - InitWindow(&gUnknown_03004210, BattleText_ForgetMove, 0x290, 0x13, 0x37); + Text_InitWindow(&gUnknown_03004210, BattleText_ForgetMove, 0x290, 0x13, 0x37); } else { @@ -1624,9 +1624,9 @@ void sub_802E2D4(void) str = StringCopy(str, BattleText_Format); StringCopy(str, gTypeNames[gBattleMoves[r4->moves[gMoveSelectionCursor[gActiveBank]]].type]); FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x39, 0x1C, 0x3A); - InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2C0, 0x17, 0x39); + Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2C0, 0x17, 0x39); } - sub_8002F44(&gUnknown_03004210); + Text_PrintWindow8002F44(&gUnknown_03004210); } const u8 gUnknown_081FAE89[][2] = @@ -1697,7 +1697,7 @@ void b_link_standby_message(void) { gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - sub_8002EB0(&gUnknown_03004210, BattleText_LinkStandby, 0x90, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, BattleText_LinkStandby, 0x90, 2, 15); } } @@ -2562,7 +2562,7 @@ void PlayerHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15); gBattleBankFunc[gActiveBank] = sub_802DF18; } @@ -2585,8 +2585,8 @@ void PlayerHandlecmd18(void) gBattleBankFunc[gActiveBank] = sub_802C098; - InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); sub_814A5C0(0, 0xFFFF, 12, 11679, 0); for (r4 = 0; r4 < 4; r4++) @@ -2595,8 +2595,8 @@ void PlayerHandlecmd18(void) sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); StrCpyDecodeToDisplayedStringBattle(BattleText_OtherMenu); - InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_803037C_TILE_DATA_OFFSET, 2, 35); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_803037C_TILE_DATA_OFFSET, 2, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); } void PlayerHandlecmd19() @@ -2619,8 +2619,8 @@ void sub_80304A8(void) sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0); if (gBattleBufferA[gActiveBank][2] != 1) { - InitWindow(&gUnknown_03004210, BattleText_PP, 656, 23, 55); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_PP, 656, 23, 55); + Text_PrintWindow8002F44(&gUnknown_03004210); } sub_802E220(); sub_802E2D4(); diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 0a629ba4d..72a0cc32c 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -453,7 +453,7 @@ void SafariHandlePrintString(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 0; BufferStringBattle(*(u16 *)&gBattleBufferA[gActiveBank][2]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gBattleBankFunc[gActiveBank] = sub_812B694; } @@ -476,8 +476,8 @@ void SafariHandlecmd18(void) FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); gBattleBankFunc[gActiveBank] = bx_battle_menu_t6_2; - InitWindow(&gUnknown_03004210, BattleText_MenuOptionsSafari, 400, 18, 35); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptionsSafari, 400, 18, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); sub_814A5C0(0, 0xFFFF, 12, 11679, 0); for (i = 0; i < 4; i++) @@ -486,8 +486,8 @@ void SafariHandlecmd18(void) sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); StrCpyDecodeToDisplayedStringBattle(BattleText_PlayerMenu); - InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, SUB_812BB10_TILE_DATA_OFFSET, 2, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); } void SafariHandlecmd19(void) diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index bd2b4a45b..6a9e8071e 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -1246,7 +1246,7 @@ void WallyHandlePrintString(void) if (*ptr == 2) DestroyMenuCursor(); BufferStringBattle(*ptr); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 0x90, 2, 15); gBattleBankFunc[gActiveBank] = sub_8137454; } @@ -1268,19 +1268,19 @@ void WallyHandlecmd18(void) FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); gBattleBankFunc[gActiveBank] = sub_81372BC; - InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35); - sub_8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); sub_814A5C0(0, 0xFFFF, 12, 0x2D9F, 0); for (i = 0; i < 4; i++) nullsub_8(i); sub_802E3E4(0, 0); StrCpyDecodeToDisplayedStringBattle(BattleText_WallyMenu); #ifdef ENGLISH - InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 440, 2, 35); + Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 440, 2, 35); #else - InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 444, 2, 35); + Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 444, 2, 35); #endif - sub_8002F44(&gUnknown_03004210); + Text_PrintWindow8002F44(&gUnknown_03004210); } void WallyHandlecmd19(void) diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index 7bce00d82..67f6e24ef 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -583,13 +583,13 @@ static void Task_HandlePopupMenuInput(u8 taskId) if (gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); return; } if (gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); return; } if (gMain.newKeys & A_BUTTON) @@ -598,7 +598,7 @@ static void Task_HandlePopupMenuInput(u8 taskId) func = PartyMenuGetPopupMenuFunc(gTasks[taskId].data[4], sBattlePartyPopupMenus, sBattlePartyMenuActions, - GetMenuCursorPos()); + Menu_GetCursorPos()); func(taskId); return; } diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index 97740e3da..fb7392f33 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -202,7 +202,7 @@ static void PrintLinkBattleWinsLossesDraws(struct LinkBattleRecord *records) ConvertIntToDecimalStringN_DigitWidth6(gStringVar1, GetGameStat(GAME_STAT_LINK_BATTLE_WINS), STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN_DigitWidth6(gStringVar2, GetGameStat(GAME_STAT_LINK_BATTLE_LOSSES), STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN_DigitWidth6(gStringVar3, GetGameStat(GAME_STAT_LINK_BATTLE_DRAWS), STR_CONV_MODE_RIGHT_ALIGN, 4); - MenuPrint(gOtherText_WinRecord, 3, 3); + Menu_PrintText(gOtherText_WinRecord, 3, 3); } static void PrintLinkBattleRecord(struct LinkBattleRecord *record, u8 y) @@ -217,37 +217,37 @@ static void PrintLinkBattleRecord(struct LinkBattleRecord *record, u8 y) buffer[4] = 0x11; buffer[5] = 1; StringCopy(buffer + 6, gOtherText_SevenDashes); - MenuPrint(buffer, 3, y); + Menu_PrintText(buffer, 3, y); StringCopy(buffer + 6, gOtherText_FourDashes); - MenuPrint(buffer, 11, y); - MenuPrint(buffer, 17, y); - MenuPrint(buffer, 23, y); + Menu_PrintText(buffer, 11, y); + Menu_PrintText(buffer, 17, y); + Menu_PrintText(buffer, 23, y); } else { StringFillWithTerminator(gStringVar1, 8); StringCopyN(gStringVar1, record->name, 7); - MenuPrint(gStringVar1, 3, y); + Menu_PrintText(gStringVar1, 3, y); gStringVar1[0] = EXT_CTRL_CODE_BEGIN; gStringVar1[1] = 0x14; gStringVar1[2] = 6; ConvertIntToDecimalStringN(gStringVar1 + 3, record->wins, STR_CONV_MODE_RIGHT_ALIGN, 4); - MenuPrint(gStringVar1, 11, y); + Menu_PrintText(gStringVar1, 11, y); ConvertIntToDecimalStringN(gStringVar1 + 3, record->losses, STR_CONV_MODE_RIGHT_ALIGN, 4); - MenuPrint(gStringVar1, 17, y); + Menu_PrintText(gStringVar1, 17, y); ConvertIntToDecimalStringN(gStringVar1 + 3, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4); - MenuPrint(gStringVar1, 23, y); + Menu_PrintText(gStringVar1, 23, y); } } void ShowLinkBattleRecords(void) { s32 i; - MenuDrawTextWindow(1, 0, 28, 18); + Menu_DrawStdWindowFrame(1, 0, 28, 18); sub_8072BD8(gOtherText_BattleResults, 0, 1, 240); PrintLinkBattleWinsLossesDraws(gSaveBlock1.linkBattleRecords); #if ENGLISH - MenuPrint(gOtherText_WinLoseDraw, 12, 6); + Menu_PrintText(gOtherText_WinLoseDraw, 12, 6); #elif GERMAN MenuPrint_PixelCoords(gOtherText_WinLoseDraw, 88, 48, 1); #endif @@ -285,11 +285,11 @@ static bool32 sub_8110494(u8 level) static void PrintWinStreak(const u8 *str, u16 streak, u8 left, u8 top) { - MenuPrint(str, left, top); + Menu_PrintText(str, left, top); if (streak > 9999) streak = 9999; sub_8072C14(gStringVar1, streak, 24, 1); - MenuPrint(gOtherText_WinStreak, left + 7, top); + Menu_PrintText(gOtherText_WinStreak, left + 7, top); } static void PrintRecordWinStreak(u8 level, u8 left, u8 top) @@ -320,10 +320,10 @@ static void PrintLastWinStreak(u8 level, u8 left, u8 top) void ShowBattleTowerRecords(void) { u16 i; - MenuDrawTextWindow(3, 1, 27, 17); + Menu_DrawStdWindowFrame(3, 1, 27, 17); sub_8072BD8(gOtherText_BattleTowerResults, 3, 2, 0xC8); - MenuPrint(gOtherText_Lv50, 5, 6); - MenuPrint(gOtherText_Lv100, 5, 12); + Menu_PrintText(gOtherText_Lv50, 5, 6); + Menu_PrintText(gOtherText_Lv100, 5, 12); for (i = 5; i < 26; i++) { sub_8071F60(CHAR_HYPHEN, i, 10); diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 6a6d7a137..fded87090 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -80,7 +80,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) dp12_8087EA4(); SetUpWindowConfig(&gWindowConfig_81E6C58); ResetPaletteFade(); - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattle_BG1_X = 0; diff --git a/src/contest.c b/src/contest.c index c32719648..c935f0ecb 100644 --- a/src/contest.c +++ b/src/contest.c @@ -358,8 +358,8 @@ void LoadContestBgAfterMoveAnim(void) void SetUpContestWindow(void) { SetUpWindowConfig(&gWindowConfig_81E6FD8); - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6FD8); - InitWindowFromConfig(&gMenuWindow, &gWindowConfig_81E6FF4); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8); + Text_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6FF4); } void sub_80AB350(void) @@ -651,13 +651,13 @@ void sub_80ABB70(u8 taskId) InsertStringDigit(gDisplayedStringBattle, sContest.turnNumber + 1); sub_80AF138(); StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].func = sub_80ABC3C; } void sub_80ABC3C(u8 taskId) { - if (sub_80037A0(&gMenuWindow) == 1) + if (Text_UpdateWindowInContest(&gMenuWindow) == 1) gTasks[taskId].func = sub_80ABC70; } @@ -715,14 +715,14 @@ void sub_80ABCDC(u8 taskId) } r5 = StringCopy(r5, gMoveNames[move]); - sub_8002E4C( + Text_InitWindow8002E4C( &gUnknown_03004210, sp8, 776 + i * 20, gUnknown_083CA340[i][0] * 8 + 4, gUnknown_083CA340[i][1] * 8, 1); - sub_8002F44(&gUnknown_03004210); + Text_PrintWindow8002F44(&gUnknown_03004210); } sub_814A5C0(0, 0xFFFF, 12, 0x2D9F, 72); @@ -771,7 +771,7 @@ void sub_80ABEA0(u8 taskId) InsertStringDigit(gDisplayedStringBattle, sContest.turnNumber + 1); sub_80AF138(); StringExpandPlaceholders(gStringVar4, gDisplayedStringBattle); - sub_8003460(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindowAndPrintText(&gMenuWindow, gStringVar4, 776, 1, 15); gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; gTasks[taskId].func = sub_80ABC70; @@ -976,12 +976,12 @@ void sub_80AC2CC(u8 taskId) else StringCopy(gStringVar2, gUnknown_083CC330[sContestantStatus[r7].moveCategory]); StringExpandPlaceholders(gStringVar4, gUnknown_083CAFD7); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 6; } return; case 6: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) { sContest.unk1925E = 0; gTasks[taskId].data[0] = 7; @@ -1059,7 +1059,7 @@ void sub_80AC2CC(u8 taskId) } return; case 24: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) gTasks[taskId].data[0] = 23; return; case 48: @@ -1171,7 +1171,7 @@ void sub_80AC2CC(u8 taskId) } return; case 27: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) gTasks[taskId].data[0] = 28; return; case 28: @@ -1234,13 +1234,13 @@ void sub_80AC2CC(u8 taskId) sub_80AF138(); StringCopy(gStringVar1, gContestMons[r7].nickname); StringExpandPlaceholders(gStringVar4, ContestString_CantAppealNextTurn); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); } gTasks[taskId].data[0] = 52; } return; case 52: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) { if (!sContestantStatus[r7].unk15_6) gTasks[taskId].data[0] = 17; @@ -1254,11 +1254,11 @@ void sub_80AC2CC(u8 taskId) { sub_80AF138(); if (r4 == 1) - sub_8002EB0(&gMenuWindow, ContestString_WentOverWell, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, ContestString_WentOverWell, 776, 1, 15); else if (r4 == 2) - sub_8002EB0(&gMenuWindow, ContestString_WentOverVeryWell, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, ContestString_WentOverVeryWell, 776, 1, 15); else - sub_8002EB0(&gMenuWindow, ContestString_AppealComboExcellently, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, ContestString_AppealComboExcellently, 776, 1, 15); sub_80B1710(3); gTasks[taskId].data[10] = 0; gTasks[taskId].data[0] = 45; @@ -1268,7 +1268,7 @@ void sub_80AC2CC(u8 taskId) sub_80AF138(); StringCopy(gStringVar1, gContestMons[r7].nickname); StringExpandPlaceholders(gStringVar4, ContestString_JudgeExpectantly2); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); sub_80B1710(2); gTasks[taskId].data[10] = 0; gTasks[taskId].data[0] = 45; @@ -1282,7 +1282,7 @@ void sub_80AC2CC(u8 taskId) } return; case 15: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) { if (++gTasks[taskId].data[10] > 50) { @@ -1311,7 +1311,7 @@ void sub_80AC2CC(u8 taskId) sub_80AF138(); StringCopy(gStringVar1, gContestMons[r7].nickname); StringExpandPlaceholders(gStringVar4, ContestString_DissapointedRepeat); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[10] = 0; sub_80B1710(0); gTasks[taskId].data[0] = 46; @@ -1326,7 +1326,7 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[0] = 19; return; case 19: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) { sub_80AFBA0(sContestantStatus[r7].appeal2, -sContestantStatus[r7].unk18, r7); sContestantStatus[r7].appeal2 -= sContestantStatus[r7].unk18; @@ -1381,7 +1381,7 @@ void sub_80AC2CC(u8 taskId) StringExpandPlaceholders(gStringVar4, ContestString_WentOverGreat); else StringExpandPlaceholders(gStringVar4, ContestString_GotCrowdGoing); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[10] = 0; gTasks[taskId].data[11] = 0; if (r4 < 0) @@ -1400,7 +1400,7 @@ void sub_80AC2CC(u8 taskId) gTasks[taskId].data[10]++; break; case 1: - if (!sContest.unk1920B_0 && sub_80037A0(&gMenuWindow) != 0) + if (!sContest.unk1920B_0 && Text_UpdateWindowInContest(&gMenuWindow) != 0) { sub_80B1CBC(-1); gTasks[taskId].data[10]++; @@ -1431,7 +1431,7 @@ void sub_80AC2CC(u8 taskId) switch (gTasks[taskId].data[10]) { case 0: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) { sub_80B1EA8(1, 1); gTasks[taskId].data[10]++; @@ -1491,20 +1491,20 @@ void sub_80AC2CC(u8 taskId) StringCopy(gStringVar1, gContestMons[r7].nickname); StringCopy(gStringVar2, gMoveNames[sContestantStatus[r7].currMove]); StringExpandPlaceholders(gStringVar4, ContestString_CrowdWatches); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 58; return; case 58: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) { sub_80AF138(); StringExpandPlaceholders(gStringVar4, ContestString_Ignored2); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 59; } return; case 59: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) { sub_80AF138(); gTasks[taskId].data[0] = 55; @@ -1517,11 +1517,11 @@ void sub_80AC2CC(u8 taskId) StringCopy(gStringVar1, gContestMons[r7].nickname); StringCopy(gStringVar2, gMoveNames[sContestantStatus[r7].currMove]); StringExpandPlaceholders(gStringVar4, gUnknown_083CBF60); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 34; return; case 34: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) gTasks[taskId].data[0] = 55; return; case 55: @@ -1563,11 +1563,11 @@ void sub_80AC2CC(u8 taskId) sub_80AF138(); StringCopy(gStringVar1, gContestMons[r7].nickname); StringExpandPlaceholders(gStringVar4, gUnknown_083CB00D); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[0] = 32; return; case 32: - if (sub_80037A0(&gMenuWindow) != 0) + if (Text_UpdateWindowInContest(&gMenuWindow) != 0) gTasks[taskId].data[0] = 21; return; case 21: @@ -1734,13 +1734,13 @@ void sub_80ADB88(u8 taskId) sub_80AF138(); StringCopy(gStringVar1, gContestMons[gContestPlayerMonIndex].nickname); StringExpandPlaceholders(gStringVar4, gContestStandOutStrings[r4]); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].func = sub_80ADC10; } void sub_80ADC10(u8 taskId) { - if (sub_80037A0(&gMenuWindow) == 1) + if (Text_UpdateWindowInContest(&gMenuWindow) == 1) { gTasks[taskId].data[0] = 0; gTasks[taskId].func = sub_80ADC4C; @@ -1813,14 +1813,14 @@ void sub_80ADDA4(u8 taskId) sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove); gUnknown_03005D28 = gRngValue; StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[2] = 0; gTasks[taskId].func = sub_80ADE54; } void sub_80ADE54(u8 taskId) { - if (sub_80037A0(&gMenuWindow) == 1) + if (Text_UpdateWindowInContest(&gMenuWindow) == 1) { sub_80B2184(); gBattle_BG1_X = 0; @@ -2172,7 +2172,7 @@ void sub_80AE5D4(u8 p, u8 b) else { StringCopy(str, gContestMons[p].trainerName); - sub_8003460( + Text_InitWindowAndPrintText( &gUnknown_03004210, gDisplayedStringBattle, 592 + gUnknown_02038696[p] * 22, @@ -2432,8 +2432,8 @@ void sub_80AEBEC(u16 a) *(u16 *)(VRAM + 0xC82A + i * 2) = 0x5036; } - sub_8003460(&gUnknown_03004210, gContestEffectStrings[gContestMoves[a].effect], 868, 11, 35); - sub_8003460(&gUnknown_03004210, gUnknown_083CC5A2, 866, 16, 31); + Text_InitWindowAndPrintText(&gUnknown_03004210, gContestEffectStrings[gContestMoves[a].effect], 868, 11, 35); + Text_InitWindowAndPrintText(&gUnknown_03004210, gUnknown_083CC5A2, 866, 16, 31); } void sub_80AED58(void) @@ -2656,7 +2656,7 @@ void sub_80AF1E4(u8 a, u8 b) else sub_80AE598(gDisplayedStringBattle, gMoveNames[sContestantStatus[a].currMove], r3); sub_80AF2A0(a); - sub_8003460( + Text_InitWindowAndPrintText( &gUnknown_03004210, gDisplayedStringBattle, 696 + a * 20, @@ -2953,7 +2953,7 @@ void sub_80AF860(void) gBattle_BG0_Y = 0; gBattle_BG2_Y = 0; sub_80AF138(); - sub_8003460(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15); + Text_InitWindowAndPrintText(&gMenuWindow, gUnknownText_LinkStandbyAndWinner, 776, 1, 15); } u8 unref_sub_80AF89C(s16 a, s16 b, u8 c, u8 d) @@ -4193,7 +4193,7 @@ void sub_80B0D7C(void) r5++; } ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4); - sub_8003460( + Text_InitWindowAndPrintText( &gUnknown_03004210, sp8, 592 + gUnknown_02038696[i] * 22, @@ -4211,7 +4211,7 @@ void sub_80B0D7C(void) r5++; } ConvertIntToDecimalStringN(sp8 + r5, r2, 0, 4); - sub_8003460( + Text_InitWindowAndPrintText( &gUnknown_03004210, sp8, 512 + gUnknown_02038696[i] * 20, @@ -4484,7 +4484,7 @@ void sub_80B146C(u8 a, u8 b) StringCopy(gStringVar3, gText_Contest_Fear); StringExpandPlaceholders(gStringVar4, gUnknown_083CC188[b]); sub_80AF138(); - sub_8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); + Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); } void sub_80B157C(u8 p) @@ -4631,7 +4631,7 @@ void unref_sub_80B19D0(void) { u8 str[20]; StringCopy(str, gUnknown_083CC2EC); - sub_8003460(&gUnknown_03004210, str, 680, 0, 0); + Text_InitWindowAndPrintText(&gUnknown_03004210, str, 680, 0, 0); } s8 Contest_GetMoveExcitement(u16 move) diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 49fe6864b..2c20ba72b 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -247,8 +247,8 @@ static const struct OamData gUnknown_083C9400 = u8 unref_sub_80A9B28(void) { - MenuZeroFillScreen(); - MenuDrawTextWindow(0, 0, 17, 18); + Menu_EraseScreen(); + Menu_DrawStdWindowFrame(0, 0, 17, 18); PrintMenuItems(1, 1, 7, gMatsudaDebugMenuActions); InitMenu(0, 1, 1, 7, 0, 16); gCallback_03004AE8 = sub_80A9B78; @@ -257,7 +257,7 @@ u8 unref_sub_80A9B28(void) static bool8 sub_80A9B78(void) { - s8 choice = ProcessMenuInput(); + s8 choice = Menu_ProcessInput(); switch (choice) { @@ -450,7 +450,7 @@ static void sub_80A9F50(void) REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP; REG_DISPCNT |= DISPCNT_OBJ_ON | DISPCNT_BG0_ON; SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitWindowFromConfig(&gMenuWindow, &gWindowConfig_81E6C3C); + Text_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6C3C); REG_MOSAIC = 0; REG_BLDCNT = 0; REG_BLDALPHA = 0; @@ -546,7 +546,7 @@ static void sub_80AA10C(void) for (i = 0; i < 6; i++) { - sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList1[i], + Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenuTextList1[i], (0xA * i + 0x2A), gMatsudaDebugMenuContestTopLeft[i][0], gMatsudaDebugMenuContestTopLeft[i][1]); } @@ -555,8 +555,8 @@ static void sub_80AA10C(void) zero = 0; // it's possible this was some assignment that matsuda used to quickly edit and test things without changing whats passed to the later functions. sub_80AA5BC(zero); sub_80AA5E8(gSpecialVar_ContestRank); - sub_8003460(&gMenuWindow, gMatsudaDebugMenu_GoBackText, 0xD6, 0x12, 0x12); - sub_8003460(&gMenuWindow, gMatsudaDebugMenu_BattlePointsText, 0xDC, zero, 0xC); + Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenu_GoBackText, 0xD6, 0x12, 0x12); + Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenu_BattlePointsText, 0xDC, zero, 0xC); LoadSpriteSheet(gUnknown_083C92B4); LoadSpritePalette(gUnknown_083C92BC); sub_80AA280(3); @@ -580,64 +580,64 @@ void sub_80AA280(u8 var) // no? for (i = 0; i < 4; i++) { if (var == i) - sub_8003460(&gMenuWindow, gSharedMem, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]); else - sub_8003460(&gMenuWindow, gContestMons[i].trainerName, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]); + Text_InitWindowAndPrintText(&gMenuWindow, gContestMons[i].trainerName, 10 * i + 2, gUnknown_083C926E[i][0], gUnknown_083C926E[i][1]); } } static void sub_80AA340(u8 var) { ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].cool, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, gSharedMem, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]); } static void sub_80AA388(u8 var) { ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].cute, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, gSharedMem, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]); } static void sub_80AA3D0(u8 var) { ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].beauty, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, gSharedMem, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]); } static void sub_80AA418(u8 var) { ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].smart, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, gSharedMem, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]); } static void sub_80AA460(u8 var) { ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].tough, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, gSharedMem, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]); } static void sub_80AA4A8(u8 var) { ConvertIntToDecimalStringN(gSharedMem, gContestMons[var].sheen, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, gSharedMem, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]); } static void sub_80AA4F0(u8 var1, u8 var2) { FillWindowRect_DefaultPalette(&gMenuWindow, 0, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1], gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1] + 1); - sub_8003460(&gMenuWindow, gMoveNames[gContestMons[var1].moves[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]); + Text_InitWindowAndPrintText(&gMenuWindow, gMoveNames[gContestMons[var1].moves[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]); ConvertIntToDecimalStringN(gStringVar1, gContestMons[var1].moves[var2], STR_CONV_MODE_LEADING_ZEROS, 3); - sub_8003460(&gMenuWindow, gStringVar1, 0xFA + var2 * 6, gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1]); + Text_InitWindowAndPrintText(&gMenuWindow, gStringVar1, 0xFA + var2 * 6, gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1]); } static void sub_80AA5BC(u8 var) { - sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12); + Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12); } void sub_80AA5E8(u8 var) { - sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4); + Text_InitWindowAndPrintText(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4); } static void sub_80AA614(u8 var1, u8 var2) @@ -645,7 +645,7 @@ static void sub_80AA614(u8 var1, u8 var2) u16 var = sub_80AE770(var1, var2); ConvertIntToDecimalStringN(gSharedMem, var, STR_CONV_MODE_RIGHT_ALIGN, 3); - sub_8003460(&gMenuWindow, gSharedMem, 0xE2, 3, 0xC); + Text_InitWindowAndPrintText(&gMenuWindow, gSharedMem, 0xE2, 3, 0xC); } void sub_80AA658(u8 var) @@ -1076,9 +1076,9 @@ void unref_sub_80AB084(u8 *text) } } SetUpWindowConfig(&gWindowConfig_81E6FD8); - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6FD8); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8); LoadFontDefaultPalette(&gWindowConfig_81E6FD8); - sub_8003460(&gUnknown_03004210, text, 1, 9, 7); + Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7); } void sub_80AB184(void) diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 83dba8b73..31f232d82 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -95,9 +95,9 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr) StringAppend(localPtr, gUnknown_0839B24D); StringAppend(localPtr, gSpeciesNames[eggSpecies]); StringAppend(localPtr, gUnknown_0839B255); - MenuZeroFillScreen(); - MenuDrawTextWindow(0, 14, 30, 19); - MenuPrint(localPtr, 1, 15); + Menu_EraseScreen(); + Menu_DrawStdWindowFrame(0, 14, 30, 19); + Menu_PrintText(localPtr, 1, 15); gCallback_03004AE8 = sub_8083D4C; return 0; } @@ -179,7 +179,7 @@ u8 MoriDebugMenu_PokeblockCase(void) bool8 MoriDebugMenuProcessInput(void) { - s8 choice = ProcessMenuInput(); + s8 choice = Menu_ProcessInput(); switch (choice) { @@ -196,8 +196,8 @@ bool8 MoriDebugMenuProcessInput(void) s8 InitMoriDebugMenu(void) { - MenuZeroFillScreen(); - MenuDrawTextWindow(0, 0, 10, 19); + Menu_EraseScreen(); + Menu_DrawStdWindowFrame(0, 0, 10, 19); PrintMenuItems(1, 1, 9, gMoriDebugMenuActions); InitMenu(0, 1, 1, 9, 0, 9); gCallback_03004AE8 = MoriDebugMenuProcessInput; diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 968b047d9..4f4a7bd06 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -171,16 +171,16 @@ void Task_InitSoundCheckMenu(u8 taskId) if (!gPaletteFade.active) { - MenuDrawTextWindow(2, 0, 27, 3); - MenuDrawTextWindow(2, 5, 27, 10); - MenuDrawTextWindow(2, 12, 27, 17); - MenuPrint(soundcheckStr, 4, 1); - MenuPrint(abDescStr, 14, 1); - MenuPrint(bgmStr, 4, 6); - MenuPrint(upDownStr, 14, 6); - MenuPrint(seStr, 4, 13); - MenuPrint(upDownStr, 14, 13); - MenuPrint(driverStr, 14, 18); + Menu_DrawStdWindowFrame(2, 0, 27, 3); + Menu_DrawStdWindowFrame(2, 5, 27, 10); + Menu_DrawStdWindowFrame(2, 12, 27, 17); + Menu_PrintText(soundcheckStr, 4, 1); + Menu_PrintText(abDescStr, 14, 1); + Menu_PrintText(bgmStr, 4, 6); + Menu_PrintText(upDownStr, 14, 6); + Menu_PrintText(seStr, 4, 13); + Menu_PrintText(upDownStr, 14, 13); + Menu_PrintText(driverStr, 14, 18); gTasks[taskId].func = sub_80BA384; REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(1, 31); @@ -384,7 +384,7 @@ void PrintSoundNumber(u16 soundIndex, u16 x, u16 y) // PrintSoundNumber ? str[1] = divisorValue + CHAR_0; str[2] = ((soundIndex % 100) % 10) + CHAR_0; - MenuPrint(str, x, y); + Menu_PrintText(str, x, y); } void sub_80BA79C(const u8 *const string, u16 x, u16 y) @@ -400,7 +400,7 @@ void sub_80BA79C(const u8 *const string, u16 x, u16 y) for (i = 0; string[i] != EOS && i < 10; i++) str[i] = string[i]; - MenuPrint(str, x, y); + Menu_PrintText(str, x, y); } void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu @@ -421,21 +421,21 @@ void Task_DrawDriverTestMenu(u8 taskId) // Task_DrawDriverTestMenu u8 stereoStr[] = _("すてれお‥‥‥‥"); // stereo REG_DISPCNT = 0x3140; - MenuDrawTextWindow(0, 0, 29, 19); - MenuPrint(bbackStr, 19, 4); - MenuPrint(aplayStr, 19, 2); - MenuPrint(voiceStr, 2, 1); - MenuPrint(volumeStr, 2, 3); - MenuPrint(panpotStr, 2, 5); - MenuPrint(pitchStr, 2, 7); - MenuPrint(lengthStr, 2, 9); - MenuPrint(releaseStr, 2, 11); - MenuPrint(progressStr, 2, 13); - MenuPrint(chorusStr, 2, 15); - MenuPrint(priorityStr, 2, 17); - MenuPrint(playingStr, 19, 16); - MenuPrint(reverseStr, 19, 14); - MenuPrint(stereoStr, 19, 12); + Menu_DrawStdWindowFrame(0, 0, 29, 19); + Menu_PrintText(bbackStr, 19, 4); + Menu_PrintText(aplayStr, 19, 2); + Menu_PrintText(voiceStr, 2, 1); + Menu_PrintText(volumeStr, 2, 3); + Menu_PrintText(panpotStr, 2, 5); + Menu_PrintText(pitchStr, 2, 7); + Menu_PrintText(lengthStr, 2, 9); + Menu_PrintText(releaseStr, 2, 11); + Menu_PrintText(progressStr, 2, 13); + Menu_PrintText(chorusStr, 2, 15); + Menu_PrintText(priorityStr, 2, 17); + Menu_PrintText(playingStr, 19, 16); + Menu_PrintText(reverseStr, 19, 14); + Menu_PrintText(stereoStr, 19, 12); REG_WIN0H = WIN_RANGE(0, DISPLAY_WIDTH); REG_WIN0V = WIN_RANGE(0, DISPLAY_HEIGHT); sDriverTestSelection = 0; @@ -465,7 +465,7 @@ void Task_ProcessDriverTestInput(u8 taskId) REG_DISPCNT = 0x7140; REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(1, 31); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gTasks[taskId].func = Task_InitSoundCheckMenu; return; } @@ -627,8 +627,8 @@ void sub_80BAE10(u8 var1, u8 var2) u8 str1[] = _("▶"); u8 str2[] = _(" "); - MenuPrint(str2, gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 1)]); - MenuPrint(str1, gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 1)]); + Menu_PrintText(str2, gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var1, B_16, 1)]); + Menu_PrintText(str1, gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 0)], gUnknown_083D0300[MULTI_DIM_ARR(var2, B_16, 1)]); } void PrintSignedNumber(int n, u16 x, u16 y, u8 digits) @@ -677,7 +677,7 @@ void PrintSignedNumber(int n, u16 x, u16 y, u8 digits) n %= powersOfTen[i]; } - MenuPrint(str, x, y); + Menu_PrintText(str, x, y); } static const s8 gUnknown_083D03F8[5] = { 0x3F, 0x00, 0xC0, 0x7F, 0x80 }; @@ -689,10 +689,10 @@ void sub_80BAF84(u8 taskId) u8 playingStr[] = _("さいせいちゆう‥"); REG_DISPCNT = 0x3140; - MenuDrawTextWindow(0, 0, 29, 19); - MenuPrint(seStr, 3, 2); - MenuPrint(panStr, 3, 4); - MenuPrint(playingStr, 3, 8); + Menu_DrawStdWindowFrame(0, 0, 29, 19); + Menu_PrintText(seStr, 3, 2); + Menu_PrintText(panStr, 3, 4); + Menu_PrintText(playingStr, 3, 8); REG_WIN0H = WIN_RANGE(0, DISPLAY_WIDTH); REG_WIN0V = WIN_RANGE(0, DISPLAY_HEIGHT); sSoundTestParams[CRY_TEST_VOICE] = 1; @@ -739,7 +739,7 @@ void sub_80BB038(u8 taskId) REG_DISPCNT = 0x7140; REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(1, 31); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gTasks[taskId].func = Task_InitSoundCheckMenu; return; } @@ -806,10 +806,10 @@ void sub_80BB1D4(void) switch (gUnknown_083D03F8[sSoundTestParams[CRY_TEST_PANPOT]]) { case 127: - MenuPrint(lrStr, 7, 4); + Menu_PrintText(lrStr, 7, 4); break; case -128: - MenuPrint(rlStr, 7, 4); + Menu_PrintText(rlStr, 7, 4); break; default: PrintSignedNumber(gUnknown_083D03F8[sSoundTestParams[CRY_TEST_PANPOT]], 7, 4, 3); @@ -1247,7 +1247,7 @@ void Task_InitCryTest(u8 taskId) while (ShowPokedexCryScreen(&cryStruct2, 2) == FALSE) ; - MenuDrawTextWindow(0, 16, 5, 19); + Menu_DrawStdWindowFrame(0, 16, 5, 19); PrintCryNumber(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); REG_BG2HOFS = 0; @@ -1288,7 +1288,7 @@ void Task_ProcessCryTestInput(u8 taskId) REG_DISPCNT = 0x7140; REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(1, 31); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gTasks[taskId].func = Task_InitSoundCheckMenu; DestroyCryMeterNeedleSprite(); } diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c index a8c3ad16b..e95806c74 100644 --- a/src/debug/unknown_debug_menu.c +++ b/src/debug/unknown_debug_menu.c @@ -32,8 +32,8 @@ const struct MenuAction gUnknown_0842C29C[] = { int unref_sub_814A414(void) { - MenuZeroFillScreen(); - MenuDrawTextWindow(0, 0, 16, 18); + Menu_EraseScreen(); + Menu_DrawStdWindowFrame(0, 0, 16, 18); PrintMenuItems(2, 1, 8, gUnknown_0842C29C); InitMenu(0, 1, 1, 8, 0, 15); gCallback_03004AE8 = sub_814A464; @@ -42,7 +42,7 @@ int unref_sub_814A414(void) static u8 sub_814A464(void) { - s8 result = ProcessMenuInput(); + s8 result = Menu_ProcessInput(); if (result == -2) { return 0; diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index e5b6cf7c3..908e4b9d6 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -16,8 +16,8 @@ #include "strings.h" #include "unknown_task.h" -extern const struct WindowConfig gWindowConfig_81E6D54; -extern const struct WindowConfig gWindowConfig_81E6DA8; +extern const struct WindowTemplate gWindowConfig_81E6D54; +extern const struct WindowTemplate gWindowConfig_81E6DA8; extern void sub_80546B8(void); @@ -310,7 +310,7 @@ void sub_80E62F8(void) case 2: InitMenuWindow(&gWindowConfig_81E6D54); InitMenuWindow(&gWindowConfig_81E6DA8); - MenuZeroFillScreen(); + Menu_EraseScreen(); break; case 3: sub_80E6424(); @@ -732,7 +732,7 @@ void sub_80E6BC0(void) { sub_80E91D4(2); DisplayYesNoMenu(23, 8, 1); - MoveMenuCursor(1); + Menu_MoveCursor(1); gEasyChatStruct->unk24++; } break; @@ -770,7 +770,7 @@ void sub_80E6C84(void) sub_80E8398(2); sub_80E91D4(3); DisplayYesNoMenu(23, 8, 0); - MoveMenuCursor(1); + Menu_MoveCursor(1); if (gEasyChatStruct->unk8 == 9 || gEasyChatStruct->unk8 == 4 || gEasyChatStruct->unk8 == 7 @@ -790,7 +790,7 @@ void sub_80E6C84(void) case 0: sub_80E91D4(4); DisplayYesNoMenu(23, 8, 0); - MoveMenuCursor(1); + Menu_MoveCursor(1); gEasyChatStruct->unk24++; break; case -1: @@ -856,7 +856,7 @@ void sub_80E6D7C(void) sub_80E91D4(1); sub_80E9744(); DisplayYesNoMenu(23, 8, 0); - MoveMenuCursor(0); + Menu_MoveCursor(0); gEasyChatStruct->unk24++; } break; @@ -1738,5 +1738,5 @@ void sub_80E81FC(void) { PlaySE(SE_SELECT); sub_80E95A4(); - MenuZeroFillWindowRect(0, 0, 29, 13); + Menu_EraseWindowRect(0, 0, 29, 13); } diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index fe3aa7cc9..5acdba04e 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1068,13 +1068,13 @@ void sub_80E91D4(u8 a) if (a == 10) { - MenuZeroFillWindowRect(3, 14, 26, 19); + Menu_EraseWindowRect(3, 14, 26, 19); sub_80E9198(10); return; } if (sub_80E91A4() == 10) - MenuDrawTextWindow(3, 14, 26, 19); + Menu_DrawStdWindowFrame(3, 14, 26, 19); sub_80E9198(a); switch (a) @@ -1175,7 +1175,7 @@ void sub_80E9368(u8 a) if (r4 != NULL) { sub_8072C74(gEasyChatStruct->unk9F8E + 3, r4, 240, 2); - MenuPrint(gEasyChatStruct->unk9F8E, 0, 0); + Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0); } else { @@ -1186,8 +1186,8 @@ void sub_80E9368(u8 a) str[2] = 0x10; str[3] = EOS; - MenuPrint(gEasyChatStruct->unk9F8E, 0, 0); - MenuPrint(gEasyChatStruct->unk9F8E, 28, 0); + Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0); + Menu_PrintText(gEasyChatStruct->unk9F8E, 28, 0); } BasicInitMenuWindow(&gWindowConfig_81E6DA8); } @@ -1259,7 +1259,7 @@ void sub_80E9620(u16 a, u16 b) { if (r10 >= gEasyChatStruct->unkA) { - MenuPrint(gUnknown_083DBEA8, r6, r7); + Menu_PrintText(gUnknown_083DBEA8, r6, r7); break; } if (gEasyChatStruct->unkC[r10] == 0xFFFF) @@ -1270,7 +1270,7 @@ void sub_80E9620(u16 a, u16 b) else { sub_80EB218(gEasyChatStruct->unk9E14, gEasyChatStruct->unkC[r10], 11); - MenuPrint(gEasyChatStruct->unk9E14, r6, r7); + Menu_PrintText(gEasyChatStruct->unk9E14, r6, r7); r6 += gEasyChatStruct->unk8C[i][j] + 11; } r10++; @@ -1337,7 +1337,7 @@ void sub_80E97C0(u16 a, u16 b) r2[2] = r1 * 8; r2[3] = EOS; - MenuPrint(gEasyChatStruct->unk9E6E, b, a); + Menu_PrintText(gEasyChatStruct->unk9E6E, b, a); a += 2; } @@ -1378,7 +1378,7 @@ void sub_80E98C4(void) default: return; } - MenuFillWindowRectWithBlankTile(2, r1, 27, r3 * 2 + r1 - 1); + Menu_BlankWindowRect(2, r1, 27, r3 * 2 + r1 - 1); BasicInitMenuWindow(&gWindowConfig_81E6DA8); } @@ -1386,7 +1386,7 @@ void sub_80E9940(u8 *a, u8 b) { u8 r4 = (b & 7); - MenuFillWindowRectWithBlankTile(2, r4 * 2, 31, r4 * 2 + 1); + Menu_BlankWindowRect(2, r4 * 2, 31, r4 * 2 + 1); sub_80E9A7C(a, b); sub_80E9A60(a, 2, r4 * 2); } @@ -1453,7 +1453,7 @@ void sub_80E9A4C(void) void sub_80E9A60(const u8 *a, u16 b, u16 c) { c &= 0xF; - MenuPrint(a, b, c); + Menu_PrintText(a, b, c); } void sub_80E9A7C(u8 *dest, u16 b) @@ -1523,7 +1523,7 @@ void sub_80E9AF8(u16 a) void sub_80E9C74(u16 a) { a &= 7; - MenuFillWindowRectWithBlankTile(0, a * 2, 29, a * 2 + 1); + Menu_BlankWindowRect(0, a * 2, 29, a * 2 + 1); } void sub_80E9C94(void) diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 3187de7ed..b12ee38ce 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -109,13 +109,13 @@ static void sub_8082CD4(u8 arg0, u8 arg1) static void sub_8082D18(u32 value) { ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEFT_ALIGN, 1); - MenuDrawTextWindow(18, 10, 28, 13); + Menu_DrawStdWindowFrame(18, 10, 28, 13); sub_8072BD8(gOtherText_PLink, 19, 11, 72); } static void sub_8082D4C() { - MenuZeroFillWindowRect(18, 10, 28, 13); + Menu_EraseWindowRect(18, 10, 28, 13); } static void sub_8082D60(u8 taskId, u8 arg1) @@ -790,7 +790,7 @@ static void sub_80839DC(u8 taskId) case 3: sub_8055588(); HideFieldMessageBox(); - MenuZeroFillScreen(); + Menu_EraseScreen(); DestroyTask(taskId); EnableBothScriptContexts(); break; diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c index 12cde22a7..ae6c85180 100644 --- a/src/engine/clear_save_data_menu.c +++ b/src/engine/clear_save_data_menu.c @@ -41,10 +41,10 @@ static void Task_InitMenu(u8 taskId) REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON; SetVBlankCallback(VBlankCB_ClearSaveDataScreen); - MenuDrawTextWindow(2, 14, 27, 19); - MenuPrint(gSystemText_ClearAllSaveDataPrompt, 3, 15); + Menu_DrawStdWindowFrame(2, 14, 27, 19); + Menu_PrintText(gSystemText_ClearAllSaveDataPrompt, 3, 15); - MenuDrawTextWindow(2, 1, 8, 6); + Menu_DrawStdWindowFrame(2, 1, 8, 6); PrintMenuItems(3, 2, 2, gMenuYesNoItems); InitMenu(0, 3, 2, 2, 1, 5); diff --git a/src/engine/link.c b/src/engine/link.c index 28323207c..a2df02b5f 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -239,7 +239,7 @@ void LinkTestScreen(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E6CE4); + InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; OpenLink(); @@ -1237,8 +1237,8 @@ void CB2_LinkError(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E7198); - InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E7198); - MenuZeroFillScreen(); + InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E7198); + Menu_EraseScreen(); REG_BLDALPHA = 0; REG_BG0VOFS = 0; REG_BG0HOFS = 0; diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 909b5676b..623969802 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -234,7 +234,7 @@ u32 InitMainMenu(u8 a1) ResetSpriteData(); FreeAllSpritePalettes(); SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E6CE4); + InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); if (a1) BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black @@ -293,7 +293,7 @@ void Task_MainMenuCheckSave(u8 taskId) gTasks[taskId].func = Task_MainMenuCheckRtc; break; case 2: - MenuDrawTextWindow(2, 14, 27, 19); + Menu_DrawStdWindowFrame(2, 14, 27, 19); MenuPrintMessage(gSaveFileDeletedMessage, 3, 15); REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(113, 159); @@ -301,7 +301,7 @@ void Task_MainMenuCheckSave(u8 taskId) gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck; break; case 255: - MenuDrawTextWindow(2, 14, 27, 19); + Menu_DrawStdWindowFrame(2, 14, 27, 19); MenuPrintMessage(gSaveFileCorruptMessage, 3, 15); REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(113, 159); @@ -319,7 +319,7 @@ void Task_MainMenuCheckSave(u8 taskId) gTasks[taskId].func = Task_MainMenuCheckRtc; break; case 4: - MenuDrawTextWindow(2, 14, 27, 19); + Menu_DrawStdWindowFrame(2, 14, 27, 19); MenuPrintMessage(gBoardNotInstalledMessage, 3, 15); REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(113, 159); @@ -331,11 +331,11 @@ void Task_MainMenuCheckSave(u8 taskId) void Task_MainMenuWaitForSaveErrorAck(u8 taskId) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { if (gMain.newKeys & A_BUTTON) { - MenuZeroFillWindowRect(2, 14, 27, 19); + Menu_EraseWindowRect(2, 14, 27, 19); gTasks[taskId].func = Task_MainMenuCheckRtc; } } @@ -359,7 +359,7 @@ void Task_MainMenuCheckRtc(u8 taskId) } else { - MenuDrawTextWindow(2, 14, 27, 19); + Menu_DrawStdWindowFrame(2, 14, 27, 19); MenuPrintMessage(gBatteryDryMessage, 3, 15); REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(113, 159); @@ -370,11 +370,11 @@ void Task_MainMenuCheckRtc(u8 taskId) void Task_MainMenuWaitForRtcErrorAck(u8 taskId) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { if ( gMain.newKeys & 1 ) { - MenuZeroFillWindowRect(2, 14, 27, 19); + Menu_EraseWindowRect(2, 14, 27, 19); gTasks[taskId].func = Task_MainMenuDraw; } } @@ -412,28 +412,28 @@ void Task_MainMenuDraw(u8 taskId) { case HAS_NO_SAVED_GAME: default: - MenuDrawTextWindow(1, 0, 28, 3); + Menu_DrawStdWindowFrame(1, 0, 28, 3); PrintMainMenuItem(gMainMenuString_NewGame, 2, 1); - MenuDrawTextWindow(1, 4, 28, 7); + Menu_DrawStdWindowFrame(1, 4, 28, 7); PrintMainMenuItem(gMainMenuString_Option, 2, 5); break; case HAS_SAVED_GAME: - MenuDrawTextWindow(1, 0, 28, 7); + Menu_DrawStdWindowFrame(1, 0, 28, 7); PrintMainMenuItem(gMainMenuString_Continue, 2, 1); - MenuDrawTextWindow(1, 8, 28, 11); + Menu_DrawStdWindowFrame(1, 8, 28, 11); PrintMainMenuItem(gMainMenuString_NewGame, 2, 9); - MenuDrawTextWindow(1, 12, 28, 15); + Menu_DrawStdWindowFrame(1, 12, 28, 15); PrintMainMenuItem(gMainMenuString_Option, 2, 13); PrintSaveFileInfo(); break; case HAS_MYSTERY_GIFT: - MenuDrawTextWindow(1, 0, 28, 7); + Menu_DrawStdWindowFrame(1, 0, 28, 7); PrintMainMenuItem(gMainMenuString_Continue, 2, 1); - MenuDrawTextWindow(1, 8, 28, 11); + Menu_DrawStdWindowFrame(1, 8, 28, 11); PrintMainMenuItem(gMainMenuString_NewGame, 2, 9); - MenuDrawTextWindow(1, 12, 28, 15); + Menu_DrawStdWindowFrame(1, 12, 28, 15); PrintMainMenuItem(gMainMenuString_MysteryEvents, 2, 13); - MenuDrawTextWindow(1, 16, 28, 19); + Menu_DrawStdWindowFrame(1, 16, 28, 19); PrintMainMenuItem(gMainMenuString_Option, 2, 0x11); PrintSaveFileInfo(); break; @@ -681,7 +681,7 @@ void PrintMainMenuItem(const u8 *text, u8 left, u8 top) buffer[29] = EOS; - MenuPrint(buffer, left, top); + Menu_PrintText(buffer, left, top); } void PrintSaveFileInfo(void) @@ -694,8 +694,8 @@ void PrintSaveFileInfo(void) void PrintPlayerName(void) { - MenuPrint(gMainMenuString_Player, 2, 3); - MenuPrint(gSaveBlock2.playerName, 9, 3); + Menu_PrintText(gMainMenuString_Player, 2, 3); + Menu_PrintText(gSaveBlock2.playerName, 9, 3); } void PrintPlayTime(void) @@ -704,15 +704,15 @@ void PrintPlayTime(void) u8 alignedPlayTime[32]; #if defined(ENGLISH) - MenuPrint(gMainMenuString_Time, 16, 3); + Menu_PrintText(gMainMenuString_Time, 16, 3); FormatPlayTime(playTime, gSaveBlock2.playTimeHours, gSaveBlock2.playTimeMinutes, 1); sub_8072C74(alignedPlayTime, playTime, 48, 1); - MenuPrint(alignedPlayTime, 22, 3); + Menu_PrintText(alignedPlayTime, 22, 3); #elif defined(GERMAN) MenuPrint_PixelCoords(gMainMenuString_Time, 124, 24, TRUE); FormatPlayTime(playTime, gSaveBlock2.playTimeHours, gSaveBlock2.playTimeMinutes, 1); sub_8072C74(alignedPlayTime, playTime, 40, 1); - MenuPrint(alignedPlayTime, 23, 3); + Menu_PrintText(alignedPlayTime, 23, 3); #endif } @@ -720,9 +720,9 @@ void PrintPokedexCount(void) { u8 buffer[16]; - MenuPrint(gMainMenuString_Pokedex, 2, 5); + Menu_PrintText(gMainMenuString_Pokedex, 2, 5); sub_8072C14(buffer, GetPokedexSeenCount(), 18, 0); - MenuPrint(buffer, 9, 5); + Menu_PrintText(buffer, 9, 5); } void PrintBadgeCount(void) @@ -730,7 +730,7 @@ void PrintBadgeCount(void) u8 buffer[16]; #if defined(ENGLISH) - MenuPrint(gMainMenuString_Badges, 16, 5); + Menu_PrintText(gMainMenuString_Badges, 16, 5); #elif defined(GERMAN) MenuPrint_PixelCoords(gMainMenuString_Badges, 124, 40, TRUE); #endif @@ -751,7 +751,7 @@ void PrintBadgeCount(void) static void Task_NewGameSpeech1(u8 taskId) { SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E6CE4); + InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); REG_WIN0H = 0; REG_WIN0V = 0; REG_WININ = 0; @@ -812,7 +812,7 @@ static void Task_NewGameSpeech3(u8 taskId) } else { - MenuDrawTextWindow(2, 13, 27, 18); + Menu_DrawStdWindowFrame(2, 13, 27, 18); //"Hi! Sorry to keep you waiting... //...But everyone calls me the POKEMON PROFESSOR." MenuPrintMessage(gBirchSpeech_Welcome, 3, 14); @@ -886,7 +886,7 @@ static void Task_NewGameSpeech9(u8 taskId) { if (BirchSpeechUpdateWindowText()) { - MenuDrawTextWindow(2, 13, 27, 18); + Menu_DrawStdWindowFrame(2, 13, 27, 18); //"And you are?" MenuPrintMessage(gBirchSpeech_AndYouAre, 3, 14); gTasks[taskId].func = Task_NewGameSpeech10; @@ -962,7 +962,7 @@ static void Task_NewGameSpeech13(u8 taskId) static void Task_NewGameSpeech14(u8 taskId) { - MenuDrawTextWindow(2, 13, 27, 18); + Menu_DrawStdWindowFrame(2, 13, 27, 18); //"Are you a boy? Or are you a girl?" MenuPrintMessage(gBirchSpeech_AreYouBoyOrGirl, 3, 14); gTasks[taskId].func = Task_NewGameSpeech15; @@ -988,19 +988,19 @@ static void Task_NewGameSpeech16(u8 taskId) HandleDestroyMenuCursors(); PlaySE(SE_SELECT); gSaveBlock2.playerGender = MALE; - MenuZeroFillWindowRect(2, 4, 8, 9); + Menu_EraseWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; break; case FEMALE: HandleDestroyMenuCursors(); PlaySE(SE_SELECT); gSaveBlock2.playerGender = FEMALE; - MenuZeroFillWindowRect(2, 4, 8, 9); + Menu_EraseWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; break; } - cursorPos = GetMenuCursorPos(); + cursorPos = Menu_GetCursorPos(); if (cursorPos != gTasks[taskId].tGenderSelection) { @@ -1062,7 +1062,7 @@ static void Task_NewGameSpeech18(u8 taskId) static void Task_NewGameSpeech19(u8 taskId) { - MenuDrawTextWindow(2, 13, 27, 18); + Menu_DrawStdWindowFrame(2, 13, 27, 18); //"All right. What's your name?" MenuPrintMessage(gBirchSpeech_WhatsYourName, 3, 14); gTasks[taskId].func = Task_NewGameSpeech20; @@ -1090,7 +1090,7 @@ static void Task_NewGameSpeech21(u8 taskId) case 4: HandleDestroyMenuCursors(); PlaySE(SE_SELECT); - MenuZeroFillWindowRect(2, 1, 22, 12); + Menu_EraseWindowRect(2, 1, 22, 12); SetPresetPlayerName(selection); gTasks[taskId].func = Task_NewGameSpeech23; break; @@ -1102,7 +1102,7 @@ static void Task_NewGameSpeech21(u8 taskId) case -1: //B button HandleDestroyMenuCursors(); PlaySE(SE_SELECT); - MenuZeroFillWindowRect(2, 1, 22, 12); + Menu_EraseWindowRect(2, 1, 22, 12); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; } @@ -1120,7 +1120,7 @@ static void Task_NewGameSpeech22(u8 taskId) static void Task_NewGameSpeech23(u8 taskId) { - MenuDrawTextWindow(2, 13, 27, 18); + Menu_DrawStdWindowFrame(2, 13, 27, 18); //"So it's (PLAYER)?" StringExpandPlaceholders(gStringVar4, gBirchSpeech_SoItsPlayer); MenuPrintMessage(gStringVar4, 3, 14); @@ -1143,7 +1143,7 @@ static void Task_NewGameSpeech25(u8 taskId) { case 0: //YES PlaySE(SE_SELECT); - MenuZeroFillWindowRect(2, 1, 8, 7); + Menu_EraseWindowRect(2, 1, 8, 7); gSprites[gTasks[taskId].tTrainerSpriteId].oam.objMode = ST_OAM_OBJ_BLEND; StartSpriteFadeOut(taskId, 2); StartBackgroundFadeOut(taskId, 1); @@ -1152,7 +1152,7 @@ static void Task_NewGameSpeech25(u8 taskId) case -1: //B button case 1: //NO PlaySE(SE_SELECT); - MenuZeroFillWindowRect(2, 1, 8, 7); + Menu_EraseWindowRect(2, 1, 8, 7); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu break; } @@ -1197,7 +1197,7 @@ static void Task_NewGameSpeech27(u8 taskId) StartSpriteFadeIn(taskId, 2); StartBackgroundFadeIn(taskId, 1); - MenuDrawTextWindow(2, 13, 27, 18); + Menu_DrawStdWindowFrame(2, 13, 27, 18); StringExpandPlaceholders(gStringVar4, gBirchSpeech_AhOkayYouArePlayer); //"Ah, okay! You're (PLAYER) who's moving... //...I get it now!" @@ -1267,7 +1267,7 @@ static void Task_NewGameSpeech29(u8 taskId) StartSpriteFadeIn(taskId, 2); StartBackgroundFadeIn(taskId, 1); - MenuDrawTextWindow(2, 13, 27, 18); + Menu_DrawStdWindowFrame(2, 13, 27, 18); MenuPrintMessage(gBirchSpeech_AreYouReady, 3, 14); gTasks[taskId].func = Task_NewGameSpeech30; } @@ -1374,7 +1374,7 @@ void CB_ContinueNewGameSpeechPart2() AddBirchSpeechObjects(taskId); SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E6CE4); + InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); if (gSaveBlock2.playerGender != MALE) { @@ -1661,7 +1661,7 @@ static void StartBackgroundFadeIn(u8 taskId, u8 interval) static void CreateGenderMenu(u8 left, u8 top) { u8 menuLeft, menuTop; - MenuDrawTextWindow(left, top, left + 6, top + 5); + Menu_DrawStdWindowFrame(left, top, left + 6, top + 5); menuLeft = left + 1; menuTop = top + 1; PrintMenuItems(menuLeft, menuTop, 2, gUnknown_081E79B0); @@ -1670,12 +1670,12 @@ static void CreateGenderMenu(u8 left, u8 top) static s8 GenderMenuProcessInput(void) { - return ProcessMenuInputNoWrap(); + return Menu_ProcessInputNoWrap(); } static void CreateNameMenu(u8 left, u8 top) { - MenuDrawTextWindow(left, top, left + 10, top + 11); + Menu_DrawStdWindowFrame(left, top, left + 10, top + 11); if (gSaveBlock2.playerGender == MALE) PrintMenuItems(left + 1, top + 1, 5, gMalePresetNames); @@ -1687,7 +1687,7 @@ static void CreateNameMenu(u8 left, u8 top) static s8 NameMenuProcessInput(void) { - return ProcessMenuInput(); + return Menu_ProcessInput(); } static void SetPresetPlayerName(u8 index) diff --git a/src/engine/menu.c b/src/engine/menu.c index 10988c1d7..fe88bf4e4 100644 --- a/src/engine/menu.c +++ b/src/engine/menu.c @@ -24,8 +24,8 @@ struct Menu u8 columnXCoords[8]; }; -static void MultistepInitMenuWindowInternal(const struct WindowConfig *, u16); -static void InitMenuWindowInternal(const struct WindowConfig *, u16); +static void MultistepInitMenuWindowInternal(const struct WindowTemplate *, u16); +static void InitMenuWindowInternal(const struct WindowTemplate *, u16); static bool8 sub_80723D4(void); static u8 sub_8072484(u8, u8, u8, u8, u8, u8, u32); static u8 sub_80724F4(u8, u8, u8, const struct MenuAction[], u8); @@ -52,7 +52,7 @@ const struct MenuAction gMenuYesNoItems[] = void CloseMenu(void) { PlaySE(SE_SELECT); - MenuZeroFillScreen(); + Menu_EraseScreen(); sub_8064E2C(); ScriptContext2_Disable(); HandleDestroyMenuCursors(); @@ -64,22 +64,22 @@ void AppendToList(u8 *list, u8 *pindex, u32 value) (*pindex)++; } -void InitMenuWindow(const struct WindowConfig *winConfig) +void InitMenuWindow(const struct WindowTemplate *winTemplate) { - InitMenuWindowInternal(winConfig, 1); + InitMenuWindowInternal(winTemplate, 1); } -void MultistepInitMenuWindowBegin(const struct WindowConfig *winConfig) +void MultistepInitMenuWindowBegin(const struct WindowTemplate *winTemplate) { - MultistepInitMenuWindowInternal(winConfig, 1); + MultistepInitMenuWindowInternal(winTemplate, 1); } -static void MultistepInitMenuWindowInternal(const struct WindowConfig *winConfig, u16 tileOffset) +static void MultistepInitMenuWindowInternal(const struct WindowTemplate *winTemplate, u16 tileOffset) { gMenuMultistepInitState = 0; gMenuTextTileOffset = tileOffset; gMenuWindowPtr = &gMenuWindow; - InitWindowFromConfig(&gMenuWindow, winConfig); + Text_InitWindowWithTemplate(&gMenuWindow, winTemplate); } bool32 MultistepInitMenuWindowContinue(void) @@ -97,13 +97,13 @@ bool32 MultistepInitMenuWindowContinue(void) goto fail; goto next; case 3: - gMenuTextWindowContentTileOffset = SetTextWindowBaseTileNum(gMenuTextWindowTileOffset); + gMenuTextWindowContentTileOffset = TextWindow_SetBaseTileNum(gMenuTextWindowTileOffset); next: gMenuMultistepInitState++; return 0; case 4: - LoadTextWindowGraphics(gMenuWindowPtr); - gMenuMessageBoxContentTileOffset = SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset); + TextWindow_LoadStdFrameGraphics(gMenuWindowPtr); + gMenuMessageBoxContentTileOffset = TextWindow_SetDlgFrameBaseTileNum(gMenuTextWindowContentTileOffset); return 1; default: fail: @@ -111,73 +111,73 @@ bool32 MultistepInitMenuWindowContinue(void) } } -static void InitMenuWindowInternal(const struct WindowConfig *winConfig, u16 tileOffset) +static void InitMenuWindowInternal(const struct WindowTemplate *winTemplate, u16 tileOffset) { gMenuWindowPtr = &gMenuWindow; - InitWindowFromConfig(&gMenuWindow, winConfig); + Text_InitWindowWithTemplate(&gMenuWindow, winTemplate); gMenuTextTileOffset = tileOffset; gMenuTextWindowTileOffset = InitWindowTileData(gMenuWindowPtr, gMenuTextTileOffset); - gMenuTextWindowContentTileOffset = SetTextWindowBaseTileNum(gMenuTextWindowTileOffset); - LoadTextWindowGraphics(gMenuWindowPtr); - gMenuMessageBoxContentTileOffset = SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset); + gMenuTextWindowContentTileOffset = TextWindow_SetBaseTileNum(gMenuTextWindowTileOffset); + TextWindow_LoadStdFrameGraphics(gMenuWindowPtr); + gMenuMessageBoxContentTileOffset = TextWindow_SetDlgFrameBaseTileNum(gMenuTextWindowContentTileOffset); } -void unref_sub_8071DA4(struct WindowConfig *winConfig, u16 tileOffset) +void unref_sub_8071DA4(struct WindowTemplate *winTemplate, u16 tileOffset) { gMenuWindowPtr = &gMenuWindow; - InitWindowFromConfig(&gMenuWindow, winConfig); + Text_InitWindowWithTemplate(&gMenuWindow, winTemplate); gMenuTextWindowTileOffset = tileOffset; - gMenuTextWindowContentTileOffset = SetTextWindowBaseTileNum(gMenuTextWindowTileOffset); - LoadTextWindowGraphics(gMenuWindowPtr); - gMenuTextTileOffset = SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset); + gMenuTextWindowContentTileOffset = TextWindow_SetBaseTileNum(gMenuTextWindowTileOffset); + TextWindow_LoadStdFrameGraphics(gMenuWindowPtr); + gMenuTextTileOffset = TextWindow_SetDlgFrameBaseTileNum(gMenuTextWindowContentTileOffset); gMenuMessageBoxContentTileOffset = InitWindowTileData(gMenuWindowPtr, gMenuTextTileOffset); } -void MenuLoadTextWindowGraphics_OverrideFrameType(u8 frameType) +void Menu_LoadStdFrameGraphicsOverrideStyle(u8 frameType) { - LoadTextWindowGraphics_OverrideFrameType(gMenuWindowPtr, frameType); + TextWindow_LoadStdFrameGraphicsOverrideStyle(gMenuWindowPtr, frameType); } -void MenuLoadTextWindowGraphics(void) +void Menu_LoadStdFrameGraphics(void) { - LoadTextWindowGraphics(gMenuWindowPtr); + TextWindow_LoadStdFrameGraphics(gMenuWindowPtr); } -void BasicInitMenuWindow(const struct WindowConfig *winConfig) +void BasicInitMenuWindow(const struct WindowTemplate *winTemplate) { - InitWindowFromConfig(gMenuWindowPtr, winConfig); + Text_InitWindowWithTemplate(gMenuWindowPtr, winTemplate); gMenuWindowPtr->tileDataStartOffset = gMenuTextTileOffset; } -void MenuPrint(const u8 *str, u8 left, u8 top) +void Menu_PrintText(const u8 *str, u8 left, u8 top) { - sub_8003460(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); + Text_InitWindowAndPrintText(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); } -void MenuZeroFillWindowRect(u8 left, u8 top, u8 right, u8 bottom) +void Menu_EraseWindowRect(u8 left, u8 top, u8 right, u8 bottom) { ZeroFillWindowRect(gMenuWindowPtr, left, top, right, bottom); } -void MenuFillWindowRectWithBlankTile(u8 left, u8 top, u8 right, u8 bottom) +void Menu_BlankWindowRect(u8 left, u8 top, u8 right, u8 bottom) { - FillWindowRectWithBlankTile(gMenuWindowPtr, left, top, right, bottom); + Text_BlankWindowRect(gMenuWindowPtr, left, top, right, bottom); } -void MenuZeroFillScreen(void) +void Menu_EraseScreen(void) { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); } -void MenuDrawTextWindow(u8 left, u8 top, u8 right, u8 bottom) +void Menu_DrawStdWindowFrame(u8 left, u8 top, u8 right, u8 bottom) { - DrawTextWindow(gMenuWindowPtr, left, top, right, bottom); + TextWindow_DrawStdFrame(gMenuWindowPtr, left, top, right, bottom); } void sub_8071F40(const u8 *str) { - MenuDrawTextWindow(2, 14, 28, 19); - MenuPrint(str, 3, 15); + Menu_DrawStdWindowFrame(2, 14, 28, 19); + Menu_PrintText(str, 3, 15); } void sub_8071F60(u8 a1, u8 a2, u8 a3) @@ -187,27 +187,27 @@ void sub_8071F60(u8 a1, u8 a2, u8 a3) u16 unref_sub_8071F98(u8 x, u8 y) { - return GetWindowTilemapEntry(gMenuWindowPtr, x, y); + return Text_GetWindowTilemapEntry(gMenuWindowPtr, x, y); } void unref_sub_8071FBC(u16 a1, u8 a2, u8 a3, u8 a4, u8 a5) { - DrawWindowRect(gMenuWindowPtr, a1, a2, a3, a4, a5); + Text_FillWindowBorder(gMenuWindowPtr, a1, a2, a3, a4, a5); } -void MenuDisplayMessageBox(void) +void Menu_DisplayDialogueFrame(void) { - DisplayMessageBox(gMenuWindowPtr); + TextWindow_DisplayDialogueFrame(gMenuWindowPtr); } void MenuPrintMessage(const u8 *str, u8 left, u8 top) { - sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); + Text_InitWindow8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); } void MenuPrintMessageDefaultCoords(const u8 *str) { - sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15); + Text_InitWindow8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15); } void MenuSetText(const u8 *str) @@ -215,22 +215,22 @@ void MenuSetText(const u8 *str) sub_8002E90(gMenuWindowPtr, str); } -u8 MenuUpdateWindowText(void) +u8 Menu_UpdateWindowText(void) { - return sub_80035AC(gMenuWindowPtr); + return Text_UpdateWindow(gMenuWindowPtr); } u8 unref_sub_8072098(void) { - return sub_8003418(gMenuWindowPtr); + return Text_PrintWindowSimple(gMenuWindowPtr); } -void sub_80720B0(void) +void Menu_ClearWindowText(void) { - ClearWindowTextLines(gMenuWindowPtr); + Text_ClearWindow(gMenuWindowPtr); } -u8 MoveMenuCursor(s8 delta) +u8 Menu_MoveCursor(s8 delta) { s32 newPos = gMenu.cursorPos + delta; @@ -245,7 +245,7 @@ u8 MoveMenuCursor(s8 delta) return gMenu.cursorPos; } -u8 MoveMenuCursorNoWrap(s8 delta) +u8 Menu_MoveCursorNoWrap(s8 delta) { s32 newPos = gMenu.cursorPos + delta; @@ -260,12 +260,12 @@ u8 MoveMenuCursorNoWrap(s8 delta) return gMenu.cursorPos; } -u8 GetMenuCursorPos(void) +u8 Menu_GetCursorPos(void) { return gMenu.cursorPos; } -s8 ProcessMenuInput(void) +s8 Menu_ProcessInput(void) { if (gMain.newKeys & A_BUTTON) { @@ -285,20 +285,20 @@ s8 ProcessMenuInput(void) if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); return -2; } else if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); return -2; } return -2; } -s8 ProcessMenuInputNoWrap(void) +s8 Menu_ProcessInputNoWrap(void) { u8 cursorPos = gMenu.cursorPos; @@ -319,18 +319,18 @@ s8 ProcessMenuInputNoWrap(void) if (gMain.newKeys & DPAD_UP) { - if (cursorPos != MoveMenuCursorNoWrap(-1)) + if (cursorPos != Menu_MoveCursorNoWrap(-1)) PlaySE(SE_SELECT); return -2; } else if (gMain.newKeys & DPAD_DOWN) { - if (cursorPos != MoveMenuCursorNoWrap(1)) + if (cursorPos != Menu_MoveCursorNoWrap(1)) PlaySE(SE_SELECT); return -2; } - MoveMenuCursorNoWrap(0); + Menu_MoveCursorNoWrap(0); return -2; } @@ -465,7 +465,7 @@ static u8 sub_80724F4(u8 left, u8 top, u8 menuItemCount, const struct MenuAction totalWidth = (gMenu.columnXCoords[columnCount] + 1); right = left + totalWidth; - MenuDrawTextWindow(left, top, right, bottom); + Menu_DrawStdWindowFrame(left, top, right, bottom); } return maxWidth; @@ -501,7 +501,7 @@ static void sub_8072620(u8 left, u8 top, u8 menuItemCount, const struct MenuActi u8 row = 0; u8 j; for (j = 0; i + j < menuItemCount; j += columnCount, row++) - MenuPrint(menuItems[i + j].text, left + gMenu.columnXCoords[i % columnCount], top + 2 * row); + Menu_PrintText(menuItems[i + j].text, left + gMenu.columnXCoords[i % columnCount], top + 2 * row); } } @@ -513,14 +513,14 @@ void sub_807274C(u8 left, u8 top, u8 menuItemCount, u8 a4, const struct MenuActi sub_8072620(left + 1, top + 1, menuItemCount, menuItems, columnCount); } -s8 sub_80727CC(void) +s8 Menu_ProcessInputGridLayout(void) { if (gMain.newKeys & A_BUTTON) { if (gMenu.menu_field_7) HandleDestroyMenuCursors(); PlaySE(SE_SELECT); - return GetMenuCursorPos(); + return Menu_GetCursorPos(); } if (gMain.newKeys & B_BUTTON) @@ -568,7 +568,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m u8 i; for (i = 0; i < menuItemCount; i++) - MenuPrint(menuItems[i].text, left, top + 2 * i); + Menu_PrintText(menuItems[i].text, left, top + 2 * i); } void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order) @@ -576,7 +576,7 @@ void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct Men u8 i; for (i = 0; i < menuItemCount; i++) - MenuPrint(menuItems[order[i]].text, left, top + 2 * i); + Menu_PrintText(menuItems[order[i]].text, left, top + 2 * i); } void InitYesNoMenu(u8 left, u8 top, u8 a3) @@ -587,14 +587,14 @@ void InitYesNoMenu(u8 left, u8 top, u8 a3) void DisplayYesNoMenu(u8 left, u8 top, u32 a3) { - MenuDrawTextWindow(left, top, left + 6, top + 5); + Menu_DrawStdWindowFrame(left, top, left + 6, top + 5); InitYesNoMenu(left, top, 5); gMenu.menu_field_7 = a3 ? -1 : 0; } s8 ProcessMenuInputNoWrap_(void) { - return ProcessMenuInputNoWrap(); + return Menu_ProcessInputNoWrap(); } u8 MenuPrint_PixelCoords(const u8 *text, u8 left, u16 top, u8 a4) @@ -623,7 +623,7 @@ int sub_8072AB0(const u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6) height = (height + 7) / 8; if (newlineCount < height) - MenuFillWindowRectWithBlankTile(left, top + 2 * newlineCount, left + width - 1, height + top - 1); + Menu_BlankWindowRect(left, top + 2 * newlineCount, left + width - 1, height + top - 1); } #elif GERMAN __attribute__((naked)) @@ -700,7 +700,7 @@ _08072B0C:\n\ lsls r3, 24\n\ lsrs r3, 24\n\ adds r0, r5, 0\n\ - bl MenuFillWindowRectWithBlankTile\n\ + bl Menu_BlankWindowRect\n\ _08072B3E:\n\ add sp, 0x10\n\ pop {r4-r7}\n\ @@ -720,7 +720,7 @@ void sub_8072B80(const u8 *a1, u8 a2, u8 a3, const u8 *a4) u8 buffer[64]; u8 width = GetStringWidth(gMenuWindowPtr, a4); AlignString(gMenuWindowPtr, buffer, a1, width, 1); - sub_8003460(gMenuWindowPtr, buffer, gMenuTextTileOffset, a2, a3); + Text_InitWindowAndPrintText(gMenuWindowPtr, buffer, gMenuTextTileOffset, a2, a3); } void sub_8072BD8(const u8 *a1, u8 a2, u8 a3, u16 a4) @@ -753,14 +753,14 @@ u8 sub_8072CBC() return sub_8004E24(gMenuWindowPtr); } -void sub_8072CD4(u8 *a1, u8 *a2, u8 *a3) +void Menu_GetTextColors(u8 *a1, u8 *a2, u8 *a3) { - sub_8004E28(gMenuWindowPtr, a1, a2, a3); + Text_GetTextColors(gMenuWindowPtr, a1, a2, a3); } u32 MenuUpdateWindowText_OverrideLineLength(u8 lineLength) { - return sub_80037C8(gMenuWindowPtr, lineLength); + return Text_UpdateWindowOverrideLineLength(gMenuWindowPtr, lineLength); } struct Window *unref_sub_8072D0C(void) @@ -792,7 +792,7 @@ u8 InitMenu(u8 cursorSubpriority, u8 left, u8 top, u8 numChoices, u8 cursorPos, pos = 0; gMenu.cursorPos = pos; - MoveMenuCursor(0); + Menu_MoveCursor(0); return pos; } diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index b9c3d5ad8..abb912938 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -47,7 +47,7 @@ void CB2_InitMysteryEventMenu(void) SetVBlankCallback(VBlankCB); SetUpWindowConfig(&gWindowConfig_81E6CE4); InitMenuWindow(&gWindowConfig_81E6CE4); - MenuZeroFillScreen(); + Menu_EraseScreen(); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON; REG_BLDCNT = 0; CreateTask(Task_DestroySelf, 0); @@ -86,7 +86,7 @@ static void CB2_MysteryEventMenu(void) switch (gMain.state) { case 0: - MenuDrawTextWindow(0, 14, 29, 19); + Menu_DrawStdWindowFrame(0, 14, 29, 19); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gMain.state++; break; @@ -97,7 +97,7 @@ static void CB2_MysteryEventMenu(void) gMain.state++; break; case 2: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { gMain.state++; gLinkType = 21761; @@ -119,7 +119,7 @@ static void CB2_MysteryEventMenu(void) } break; case 4: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) gMain.state++; break; #ifdef NONMATCHING @@ -135,8 +135,8 @@ static void CB2_MysteryEventMenu(void) { PlaySE(SE_SELECT); sub_8007F4C(); - MenuDrawTextWindow(6, 5, 23, 8); - MenuPrint(gSystemText_LoadingEvent, 7, 6); + Menu_DrawStdWindowFrame(6, 5, 23, 8); + Menu_PrintText(gSystemText_LoadingEvent, 7, 6); gMain.state++; } else if (gMain.newKeys & B_BUTTON) @@ -155,7 +155,7 @@ static void CB2_MysteryEventMenu(void) if (GetLinkPlayerDataExchangeStatusTimed() == 3) { sub_800832C(); - MenuZeroFillWindowRect(6, 5, 23, 8); + Menu_EraseWindowRect(6, 5, 23, 8); GetEventLoadMessage(gStringVar4, 1); MenuPrintMessageDefaultCoords(gStringVar4); gMain.state = 13; @@ -170,7 +170,7 @@ static void CB2_MysteryEventMenu(void) else { CloseLink(); - MenuZeroFillWindowRect(6, 5, 23, 8); + Menu_EraseWindowRect(6, 5, 23, 8); GetEventLoadMessage(gStringVar4, 1); MenuPrintMessageDefaultCoords(gStringVar4); gMain.state = 13; @@ -195,8 +195,8 @@ static void CB2_MysteryEventMenu(void) { PlaySE(SE_SELECT); sub_8007F4C(); - MenuDrawTextWindow(6, 5, 23, 8); - MenuPrint(gSystemText_LoadingEvent, 7, 6); + Menu_DrawStdWindowFrame(6, 5, 23, 8); + Menu_PrintText(gSystemText_LoadingEvent, 7, 6); gMain.state++; } else if (gMain.newKeys & B_BUTTON) @@ -219,7 +219,7 @@ static void CB2_MysteryEventMenu(void) if (GetLinkPlayerDataExchangeStatusTimed() == 3) { sub_800832C(); - MenuZeroFillWindowRect(6, 5, 23, 8); + Menu_EraseWindowRect(6, 5, 23, 8); GetEventLoadMessage(gStringVar4, 1); MenuPrintMessageDefaultCoords(gStringVar4); ptr = (u8 *)&gMain; @@ -245,7 +245,7 @@ static void CB2_MysteryEventMenu(void) else { CloseLink(); - MenuZeroFillWindowRect(6, 5, 23, 8); + Menu_EraseWindowRect(6, 5, 23, 8); label: GetEventLoadMessage(gStringVar4, 1); MenuPrintMessageDefaultCoords(gStringVar4); @@ -266,7 +266,7 @@ static void CB2_MysteryEventMenu(void) break; #endif case 7: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) gMain.state++; break; case 8: @@ -297,8 +297,8 @@ static void CB2_MysteryEventMenu(void) gMain.state++; break; case 13: - MenuZeroFillWindowRect(6, 5, 23, 8); - if (MenuUpdateWindowText()) + Menu_EraseWindowRect(6, 5, 23, 8); + if (Menu_UpdateWindowText()) { gMain.state++; gUnknown_02039338 = 0; @@ -326,7 +326,7 @@ static void CB2_MysteryEventMenu(void) if (!IsLinkMaster()) { CloseLink(); - MenuZeroFillWindowRect(6, 5, 23, 8); + Menu_EraseWindowRect(6, 5, 23, 8); GetEventLoadMessage(gStringVar4, 1); MenuPrintMessageDefaultCoords(gStringVar4); gMain.state = 13; diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index 440504d5a..5685584f5 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -503,7 +503,7 @@ static bool8 MainState_6(struct Task *task) static bool8 MainState_UpdateSentToPCMessage(struct Task *task) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) namingScreenDataPtr->state++; return FALSE; } @@ -1611,7 +1611,7 @@ static void DisplaySentToPCMessage(void) StringCopy(gStringVar1, namingScreenDataPtr->destBuffer); StringExpandPlaceholders(gStringVar4, gOtherText_SentToPC); BasicInitMenuWindow(&gWindowConfig_81E6E88); - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); MenuPrintMessageDefaultCoords(gStringVar4); } @@ -1757,7 +1757,7 @@ static void (*const gUnknown_083CE310[][2])(void) = sub_80B7844, }; -static const struct WindowConfig *const gUnknown_083CE328[][2][2] = +static const struct WindowTemplate *const gUnknown_083CE328[][2][2] = { { {&gWindowConfig_81E6EDC, &gWindowConfig_81E6EF8}, @@ -1838,7 +1838,7 @@ static void PrintKeyboardCharacters(u8 page) //print letters on page s16 r5; for (i = 0, r5 = 9; i < 4; i++, r5 += 2) - MenuPrint(sKeyboardCharacters[page][i], 3, r5); + Menu_PrintText(sKeyboardCharacters[page][i], 3, r5); } static void sub_80B78A8(void) @@ -1846,7 +1846,7 @@ static void sub_80B78A8(void) BasicInitMenuWindow(&gWindowConfig_81E6F4C); gUnknown_083CE358[namingScreenDataPtr->templateNum](); gUnknown_083CE368[namingScreenDataPtr->template->unk3](); - MenuPrint(namingScreenDataPtr->template->title, 9, 2); + Menu_PrintText(namingScreenDataPtr->template->title, 9, 2); } static void nullsub_61(void) @@ -1870,7 +1870,7 @@ static void sub_80B7924(void) { if ((s16)namingScreenDataPtr->unk40 == MON_FEMALE) genderSymbol[0] = 0xB6; //female symbol - MenuPrint(genderSymbol, 0x14, 4); + Menu_PrintText(genderSymbol, 0x14, 4); } } @@ -1887,7 +1887,7 @@ static void sub_80B7960(void) string += 6; StringCopy(string, namingScreenDataPtr->textBuffer); BasicInitMenuWindow(&gWindowConfig_81E6F4C); - MenuPrint(gStringVar1, namingScreenDataPtr->unk2, 4); + Menu_PrintText(gStringVar1, namingScreenDataPtr->unk2, 4); } //-------------------------------------------------- diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c index dfc49b035..f35ed5b5a 100644 --- a/src/engine/option_menu.c +++ b/src/engine/option_menu.c @@ -173,17 +173,17 @@ void CB2_InitOptionMenu(void) gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2.optionsButtonMode; gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2.optionsWindowFrameType; - MenuDrawTextWindow(2, 0, 27, 3); - MenuDrawTextWindow(2, 4, 27, 19); - - MenuPrint(gSystemText_OptionMenu, 4, 1); - MenuPrint(gSystemText_TextSpeed, 4, 5); - MenuPrint(gSystemText_BattleScene, 4, 7); - MenuPrint(gSystemText_BattleStyle, 4, 9); - MenuPrint(gSystemText_Sound, 4, 11); - MenuPrint(gSystemText_ButtonMode, 4, 13); - MenuPrint(gSystemText_Frame, 4, 15); - MenuPrint(gSystemText_Cancel, 4, 17); + Menu_DrawStdWindowFrame(2, 0, 27, 3); + Menu_DrawStdWindowFrame(2, 4, 27, 19); + + Menu_PrintText(gSystemText_OptionMenu, 4, 1); + Menu_PrintText(gSystemText_TextSpeed, 4, 5); + Menu_PrintText(gSystemText_BattleScene, 4, 7); + Menu_PrintText(gSystemText_BattleStyle, 4, 9); + Menu_PrintText(gSystemText_Sound, 4, 11); + Menu_PrintText(gSystemText_ButtonMode, 4, 13); + Menu_PrintText(gSystemText_Frame, 4, 15); + Menu_PrintText(gSystemText_Cancel, 4, 17); TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]); BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]); @@ -432,11 +432,11 @@ static u8 FrameType_ProcessInput(u8 selection) { if (gMain.newKeys & DPAD_RIGHT) { - if (selection <= 18) + if (selection < 19) selection++; else selection = 0; - MenuLoadTextWindowGraphics_OverrideFrameType(selection); + Menu_LoadStdFrameGraphicsOverrideStyle(selection); } if (gMain.newKeys & DPAD_LEFT) { @@ -444,7 +444,7 @@ static u8 FrameType_ProcessInput(u8 selection) selection--; else selection = 19; - MenuLoadTextWindowGraphics_OverrideFrameType(selection); + Menu_LoadStdFrameGraphicsOverrideStyle(selection); } return selection; } @@ -478,8 +478,8 @@ static void FrameType_DrawChoices(u8 selection) } text[i] = EOS; - MenuPrint(gSystemText_Type, 15, 15); - MenuPrint(text, 18, 15); + Menu_PrintText(gSystemText_Type, 15, 15); + Menu_PrintText(text, 18, 15); } #elif GERMAN __attribute__((naked)) @@ -536,7 +536,7 @@ _0808C380:\n\ mov r0, sp\n\ movs r1, 0xF\n\ movs r2, 0xF\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ add sp, 0x10\n\ pop {r4-r6}\n\ pop {r0}\n\ diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index c8e2e34d5..75ca92e6a 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -146,8 +146,8 @@ void Task_RecordMixing_Main(u8 taskId) { tState = 4; data[10] = sub_8083664(); - sub_80720B0(); - MenuPrint(gOtherText_MixingComplete, 2, 15); + Menu_ClearWindowText(); + Menu_PrintText(gOtherText_MixingComplete, 2, 15); data[8] = 0; } break; @@ -160,7 +160,7 @@ void Task_RecordMixing_Main(u8 taskId) if (!gTasks[data[10]].isActive) { sub_8055588(); - MenuZeroFillScreen(); + Menu_EraseScreen(); DestroyTask(taskId); EnableBothScriptContexts(); } @@ -176,8 +176,8 @@ void sub_80B95F0(u8 taskId) { case 0: sub_80B9A78(); - MenuDisplayMessageBox(); - MenuPrint(gOtherText_MixingRecordsWithFriend, 2, 15); + Menu_DisplayDialogueFrame(); + Menu_PrintText(gOtherText_MixingRecordsWithFriend, 2, 15); task->data[8] = 0x708; task->tState = 400; ClearLinkCallback_2(); diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 67e146899..eb823b84b 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -267,7 +267,7 @@ void ResetRtcScreen_FreeCursorPalette(void) void ResetRtcScreen_HideChooseTimeWindow(void) { - MenuZeroFillWindowRect(3, 8, 25, 11); + Menu_EraseWindowRect(3, 8, 25, 11); } void ResetRtcScreen_PrintTime(u8 x, u8 y, u16 days, u8 hours, u8 minutes, u8 seconds) @@ -286,13 +286,13 @@ void ResetRtcScreen_PrintTime(u8 x, u8 y, u16 days, u8 hours, u8 minutes, u8 sec dest = ConvertIntToDecimalStringN(dest, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); dest = StringCopy(dest, gUnknown_08376500); ConvertIntToDecimalStringN(dest, seconds, STR_CONV_MODE_LEADING_ZEROS, 2); - MenuPrint(gStringVar4, x, y); + Menu_PrintText(gStringVar4, x, y); } void ResetRtcScreen_ShowChooseTimeWindow(u16 days, u8 hours, u8 minutes, u8 seconds) { - MenuDrawTextWindow(3, 8, 25, 11); - MenuPrint(gOtherText_OK, 20, 9); + Menu_DrawStdWindowFrame(3, 8, 25, 11); + Menu_PrintText(gOtherText_OK, 20, 9); ResetRtcScreen_PrintTime(4, 9, days, hours, minutes, seconds); } @@ -468,8 +468,8 @@ void VBlankCB_ResetRtcScreen(void) void ResetRtcScreen_ShowMessage(const u8 *str) { - MenuDisplayMessageBox(); - MenuPrint(str, 2, 15); + Menu_DisplayDialogueFrame(); + Menu_PrintText(str, 2, 15); } void Task_ShowResetRtcPrompt(u8 taskId) @@ -479,9 +479,9 @@ void Task_ShowResetRtcPrompt(u8 taskId) switch (data[0]) { case 0: - MenuZeroFillScreen(); - MenuDrawTextWindow(0, 0, 20, 10); - MenuPrint(gSystemText_PresentTime, 1, 1); + Menu_EraseScreen(); + Menu_DrawStdWindowFrame(0, 0, 20, 10); + Menu_PrintText(gSystemText_PresentTime, 1, 1); ResetRtcScreen_PrintTime( 1, 3, @@ -489,7 +489,7 @@ void Task_ShowResetRtcPrompt(u8 taskId) gLocalTime.hours, gLocalTime.minutes, gLocalTime.seconds); - MenuPrint(gSystemText_PreviousTime, 1, 5); + Menu_PrintText(gSystemText_PreviousTime, 1, 5); ResetRtcScreen_PrintTime( 1, 7, @@ -543,7 +543,7 @@ void Task_ResetRtcScreen(u8 taskId) case 2: if (gTasks[data[1]].isActive != TRUE) { - MenuZeroFillScreen(); + Menu_EraseScreen(); ResetRtcScreen_ShowMessage(gSystemText_PleaseResetTime); gLocalTime = gSaveBlock2.lastBerryTreeUpdate; data[1] = CreateTask(Task_ResetRtc_0, 80); diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index ba2d46546..a4642d241 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -122,9 +122,9 @@ static void CB2_SaveFailedScreen(void) LoadPalette(&gSaveFailedClockPal, 0x100, sizeof(gSaveFailedClockPal)); SetUpWindowConfig(&gWindowConfig_81E6C3C); InitMenuWindow(&gWindowConfig_81E6CE4); - MenuDrawTextWindow(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window - MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); // message window - MenuPrint(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1); + Menu_DrawStdWindowFrame(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window + Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // message window + Menu_PrintText(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); ime = REG_IME; REG_IME = 0; @@ -158,22 +158,22 @@ static void CB2_WipeSave(void) { if (WipeSectors(gDamagedSaveSectors) != FALSE) { - MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); - MenuPrint(gSystemText_BackupDamagedGameContinue, 2, MSG_WIN_TOP + 1); + Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); + Menu_PrintText(gSystemText_BackupDamagedGameContinue, 2, MSG_WIN_TOP + 1); SetMainCallback2(CB2_GameplayCannotBeContinued); return; } - MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); - MenuPrint(gSystemText_CheckCompleteSaveAttempt, 2, MSG_WIN_TOP + 1); + Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); + Menu_PrintText(gSystemText_CheckCompleteSaveAttempt, 2, MSG_WIN_TOP + 1); HandleSavingData(gSaveFailedType); if (gDamagedSaveSectors != 0) { #ifdef BUGFIX_SAVEFAILEDSCREEN2 - MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); + Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); #endif - MenuPrint(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1); + Menu_PrintText(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1); } wipeTries++; @@ -181,19 +181,19 @@ static void CB2_WipeSave(void) if (wipeTries == 3) { - MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); - MenuPrint(gSystemText_BackupDamagedGameContinue, 2, MSG_WIN_TOP + 1); + Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); + Menu_PrintText(gSystemText_BackupDamagedGameContinue, 2, MSG_WIN_TOP + 1); SetMainCallback2(CB2_FadeAndReturnToTitleScreen); // called again below } else { - MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); + Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // no callback exists, so the game cannot continue. if (gGameContinueCallback == 0) - MenuPrint(gSystemText_SaveCompletedGameEnd, 2, MSG_WIN_TOP + 1); + Menu_PrintText(gSystemText_SaveCompletedGameEnd, 2, MSG_WIN_TOP + 1); else // callback exists, so continue - MenuPrint(gSystemText_SaveCompletedPressA, 2, MSG_WIN_TOP + 1); + Menu_PrintText(gSystemText_SaveCompletedPressA, 2, MSG_WIN_TOP + 1); } SetMainCallback2(CB2_FadeAndReturnToTitleScreen); @@ -205,8 +205,8 @@ static void CB2_GameplayCannotBeContinued(void) if (gMain.newKeys & A_BUTTON) { - MenuDrawTextWindow(1, MSG_WIN_TOP, 28, 19); - MenuPrint(gSystemText_GameplayEnded, 2, MSG_WIN_TOP + 1); + Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); + Menu_PrintText(gSystemText_GameplayEnded, 2, MSG_WIN_TOP + 1); SetVBlankCallback(VBlankCB); SetMainCallback2(CB2_FadeAndReturnToTitleScreen); } diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c index 771cb72c7..2c5eb6afe 100644 --- a/src/engine/save_menu_util.c +++ b/src/engine/save_menu_util.c @@ -18,7 +18,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top) if (FlagGet(FLAG_SYS_POKEDEX_GET)) { // print info + dex information. - MenuDrawTextWindow(left, top, left + width, top + 11); + Menu_DrawStdWindowFrame(left, top, left + width, top + 11); PrintSaveMapName(++left, ++top); // MAP NAME PrintSavePlayerName(left, top + 2); // PLAYER PrintSaveBadges(left, top + 4); // BADGES @@ -28,7 +28,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top) else { // print everything besides dex. - MenuDrawTextWindow(left, top, left + width, top + 9); + Menu_DrawStdWindowFrame(left, top, left + width, top + 9); PrintSaveMapName(++left, ++top); // MAP NAME PrintSavePlayerName(left, top + 2); // PLAYER PrintSaveBadges(left, top + 4); // BADGES @@ -45,9 +45,9 @@ void HandleCloseSaveWindow(u16 left, u16 top) width = 13; if (FlagGet(FLAG_SYS_POKEDEX_GET)) - MenuZeroFillWindowRect(left, top, left + width, top + 11); + Menu_EraseWindowRect(left, top, left + width, top + 11); else - MenuZeroFillWindowRect(left, top, left + width, top + 9); + Menu_EraseWindowRect(left, top, left + width, top + 9); } /* @@ -62,7 +62,7 @@ u8 IsResizeSaveWindowEnabled(void) // i don't know what else to name it.. void PrintSavePlayerName(s16 x, s16 y) { - MenuPrint(gOtherText_Player, x, y); + Menu_PrintText(gOtherText_Player, x, y); MenuPrint_RightAligned(gSaveBlock2.playerName, x + 12, y); } @@ -71,14 +71,14 @@ void PrintSaveMapName(s16 x, s16 y) char name[32]; CopyMapName(name, gMapHeader.regionMapSectionId); - MenuPrint(name, x, y); + Menu_PrintText(name, x, y); } void PrintSaveBadges(s16 x, s16 y) { char badges[16]; - MenuPrint(gOtherText_Badges, x, y); + Menu_PrintText(gOtherText_Badges, x, y); ConvertIntToDecimalString(badges, GetBadgeCount()); MenuPrint_RightAligned(badges, x + 12, y); } @@ -87,7 +87,7 @@ void PrintSavePokedexCount(s16 x, s16 y) { char pokedex[16]; - MenuPrint(gOtherText_Pokedex, x, y); + Menu_PrintText(gOtherText_Pokedex, x, y); ConvertIntToDecimalStringN(pokedex, GetPokedexSeenCount(), 1, 3); MenuPrint_RightAligned(pokedex, x + 12, y); } @@ -96,7 +96,7 @@ void PrintSavePlayTime(s16 x, s16 y) { char playtime[16]; - MenuPrint(gOtherText_PlayTime, x, y); + Menu_PrintText(gOtherText_PlayTime, x, y); FormatPlayTime(playtime, gSaveBlock2.playTimeHours, gSaveBlock2.playTimeMinutes, 1); MenuPrint_RightAligned(playtime, x + 12, y); } diff --git a/src/engine/text.c b/src/engine/text.c index 1b158d979..2d6d95877 100644 --- a/src/engine/text.c +++ b/src/engine/text.c @@ -12,16 +12,31 @@ enum WIN_STATE_END, WIN_STATE_BEGIN, WIN_STATE_NORMAL, - WIN_STATE_INTERRUPTIBLE_PAUSE, + WIN_STATE_CHAR_DELAY, WIN_STATE_PAUSE, WIN_STATE_WAIT_BUTTON, WIN_STATE_NEWLINE, WIN_STATE_PLACEHOLDER, - WIN_STATE_PARAGRAPH, - WIN_STATE_NEWLINE_WAIT, + WIN_STATE_WAIT_CLEAR, + WIN_STATE_WAIT_SCROLL, WIN_STATE_WAIT_SOUND, }; +enum +{ + TEXT_MODE_UNKNOWN0, + TEXT_MODE_MONOSPACE, + TEXT_MODE_UNKNOWN2, // variable width? +}; + +enum +{ + WAIT_TYPE_NORMAL, // allows the player to interrupt the text delay with A or B + WAIT_TYPE_BATTLE, // disables interrupting the text delay if in a link battle + WAIT_TYPE_AUTOSCROLL, // disables interrupting the text delay + WAIT_TYPE_CONTEST, // disables interrupting the text delay if in a link contest +}; + struct Font { u32 type; @@ -66,7 +81,7 @@ static u16 LoadFixedWidthFont_Font4Latin(struct Window *, u16); static u16 LoadFixedWidthFont_Braille(struct Window *, u16); static void MultistepLoadFont_LoadGlyph(struct Window *, u16, u8); static u8 sub_8002FA0(struct Window *, const u8 *); -static u8 InterpretText(struct Window *); +static u8 PrintNextChar(struct Window *); static u8 HandleExtCtrlCode(struct Window *); static u8 UpdateWindowText(struct Window *); static u8 DrawGlyph_TextMode0(struct Window *, u32); @@ -83,26 +98,26 @@ static void AddToCursorY(struct Window *, u8); static void ClipLeft(struct Window *); static void ClipRight(struct Window *); static void InitColors(struct Window *); -static void SetBackgroundColor(struct Window *, u8); -static void SetShadowColor(struct Window *, u8); -static void SetForegroundColor(struct Window *, u8); +static void SetWindowBackgroundColor(struct Window *, u8); +static void SetWindowShadowColor(struct Window *, u8); +static void SetWindowForegroundColor(struct Window *, u8); static u8 GetTextDelay(struct Window *); -static bool8 PlayerCanInterruptWait(struct Window *); +static bool8 PlayerCanInterruptDelay(struct Window *); static void ScrollWindowTextLines(struct Window *); static void ScrollWindowTextLines_TextMode0(struct Window *); static void DoScroll_TextMode0(struct Window *, u16); -static void ScrollWindowTextLines_TextMode1(struct Window *); -static void DoScroll_TextMode1(struct Window *, u16); +static void ScrollWindowTextLines_TextModeMonospace(struct Window *); +static void DoScroll_TextModeMonospace(struct Window *, u16); static void ScrollWindowTextLines_TextMode2(struct Window *); static void DoScroll_TextMode2(struct Window *, u8); -void ClearWindowTextLines(struct Window *); +void Text_ClearWindow(struct Window *); static void ClearWindowTextLines_TextMode0_TextMode1(struct Window *, u8); static void ClearWindowTextLines_TextMode2(struct Window *, u8); static void TryEraseDownArrow(struct Window *); static u16 GetBlankTileNum(struct Window *); static u8 WaitWithDownArrow(struct Window *); static void DrawInitialDownArrow(struct Window *); -static void DrawMovingDownArrow(struct Window *); +static void UpdateDownArrowAnimation(struct Window *); static u16 GetCursorTileNum(struct Window *, u32, u32); static s32 DrawGlyphTiles(struct Window *, u32, u32); static void UpdateTilemap(struct Window *, u32); @@ -477,7 +492,7 @@ static const ShiftGlyphTileShadowedFunc sShiftGlyphTileShadowedFuncs[] = ShiftGlyphTile_ShadowedFont_Width8, }; -const struct WindowConfig gWindowConfig_81E6C3C = +const struct WindowTemplate gWindowConfig_81E6C3C = { 0, // BG number 2, // BG character base block @@ -498,7 +513,7 @@ const struct WindowConfig gWindowConfig_81E6C3C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6C58 = +const struct WindowTemplate gWindowConfig_81E6C58 = { 0, // BG number 0, // BG character base block @@ -519,7 +534,7 @@ const struct WindowConfig gWindowConfig_81E6C58 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowConfig gWindowConfig_81E6C74 = +const struct WindowTemplate gWindowConfig_81E6C74 = { 0, // BG number 0, // BG character base block @@ -540,7 +555,7 @@ const struct WindowConfig gWindowConfig_81E6C74 = NULL, // tilemap }; -const struct WindowConfig gWindowConfig_81E6C90 = +const struct WindowTemplate gWindowConfig_81E6C90 = { 0, // BG number 1, // BG character base block @@ -561,7 +576,7 @@ const struct WindowConfig gWindowConfig_81E6C90 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E6CAC = +const struct WindowTemplate gWindowConfig_81E6CAC = { 0, // BG number 0, // BG character base block @@ -582,7 +597,7 @@ const struct WindowConfig gWindowConfig_81E6CAC = NULL, // tilemap }; -const struct WindowConfig gWindowConfig_81E6CC8 = +const struct WindowTemplate gWindowConfig_81E6CC8 = { 2, // BG number 2, // BG character base block @@ -603,7 +618,7 @@ const struct WindowConfig gWindowConfig_81E6CC8 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowConfig gWindowConfig_81E6CE4 = +const struct WindowTemplate gWindowConfig_81E6CE4 = { 0, // BG number 2, // BG character base block @@ -624,7 +639,7 @@ const struct WindowConfig gWindowConfig_81E6CE4 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6D00 = +const struct WindowTemplate gWindowConfig_81E6D00 = { 0, // BG number 0, // BG character base block @@ -645,7 +660,7 @@ const struct WindowConfig gWindowConfig_81E6D00 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6D1C = +const struct WindowTemplate gWindowConfig_81E6D1C = { 1, // BG number 0, // BG character base block @@ -666,7 +681,7 @@ const struct WindowConfig gWindowConfig_81E6D1C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6D38 = +const struct WindowTemplate gWindowConfig_81E6D38 = { 0, // BG number 0, // BG character base block @@ -687,7 +702,7 @@ const struct WindowConfig gWindowConfig_81E6D38 = NULL, // tilemap }; -const struct WindowConfig gWindowConfig_81E6D54 = +const struct WindowTemplate gWindowConfig_81E6D54 = { 3, // BG number 3, // BG character base block @@ -708,7 +723,7 @@ const struct WindowConfig gWindowConfig_81E6D54 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowConfig gWindowConfig_81E6D70 = +const struct WindowTemplate gWindowConfig_81E6D70 = { 3, // BG number 3, // BG character base block @@ -729,7 +744,7 @@ const struct WindowConfig gWindowConfig_81E6D70 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowConfig gWindowConfig_81E6D8C = +const struct WindowTemplate gWindowConfig_81E6D8C = { 1, // BG number 0, // BG character base block @@ -750,7 +765,7 @@ const struct WindowConfig gWindowConfig_81E6D8C = BG_SCREEN_ADDR(14), // tilemap }; -const struct WindowConfig gWindowConfig_81E6DA8 = +const struct WindowTemplate gWindowConfig_81E6DA8 = { 0, // BG number 0, // BG character base block @@ -771,7 +786,7 @@ const struct WindowConfig gWindowConfig_81E6DA8 = BG_SCREEN_ADDR(11), // tilemap }; -const struct WindowConfig WindowConfig_TrainerCard_Back_Values = +const struct WindowTemplate WindowConfig_TrainerCard_Back_Values = { 0, // BG number 2, // BG character base block @@ -792,7 +807,7 @@ const struct WindowConfig WindowConfig_TrainerCard_Back_Values = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig WindowConfig_TrainerCard_Back_Labels = +const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels = { 0, // BG number 2, // BG character base block @@ -813,7 +828,7 @@ const struct WindowConfig WindowConfig_TrainerCard_Back_Labels = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E6DFC = +const struct WindowTemplate gWindowConfig_81E6DFC = { 0, // BG number 2, // BG character base block @@ -834,7 +849,7 @@ const struct WindowConfig gWindowConfig_81E6DFC = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6E18 = +const struct WindowTemplate gWindowConfig_81E6E18 = { 0, // BG number 2, // BG character base block @@ -855,7 +870,7 @@ const struct WindowConfig gWindowConfig_81E6E18 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6E34 = +const struct WindowTemplate gWindowConfig_81E6E34 = { 1, // BG number 0, // BG character base block @@ -876,7 +891,7 @@ const struct WindowConfig gWindowConfig_81E6E34 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6E50 = +const struct WindowTemplate gWindowConfig_81E6E50 = { 0, // BG number 2, // BG character base block @@ -897,7 +912,7 @@ const struct WindowConfig gWindowConfig_81E6E50 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowConfig gWindowConfig_81E6E6C = +const struct WindowTemplate gWindowConfig_81E6E6C = { 0, // BG number 2, // BG character base block @@ -918,7 +933,7 @@ const struct WindowConfig gWindowConfig_81E6E6C = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E6E88 = +const struct WindowTemplate gWindowConfig_81E6E88 = { 0, // BG number 0, // BG character base block @@ -939,7 +954,7 @@ const struct WindowConfig gWindowConfig_81E6E88 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6EA4 = +const struct WindowTemplate gWindowConfig_81E6EA4 = { 1, // BG number 0, // BG character base block @@ -960,7 +975,7 @@ const struct WindowConfig gWindowConfig_81E6EA4 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowConfig gWindowConfig_81E6EC0 = +const struct WindowTemplate gWindowConfig_81E6EC0 = { 2, // BG number 2, // BG character base block @@ -981,7 +996,7 @@ const struct WindowConfig gWindowConfig_81E6EC0 = BG_SCREEN_ADDR(29), // tilemap }; -const struct WindowConfig gWindowConfig_81E6EDC = +const struct WindowTemplate gWindowConfig_81E6EDC = { 1, // BG number 0, // BG character base block @@ -1002,7 +1017,7 @@ const struct WindowConfig gWindowConfig_81E6EDC = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowConfig gWindowConfig_81E6EF8 = +const struct WindowTemplate gWindowConfig_81E6EF8 = { 2, // BG number 2, // BG character base block @@ -1023,7 +1038,7 @@ const struct WindowConfig gWindowConfig_81E6EF8 = BG_SCREEN_ADDR(29), // tilemap }; -const struct WindowConfig gWindowConfig_81E6F14 = +const struct WindowTemplate gWindowConfig_81E6F14 = { 1, // BG number 0, // BG character base block @@ -1044,7 +1059,7 @@ const struct WindowConfig gWindowConfig_81E6F14 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowConfig gWindowConfig_81E6F30 = +const struct WindowTemplate gWindowConfig_81E6F30 = { 2, // BG number 2, // BG character base block @@ -1065,7 +1080,7 @@ const struct WindowConfig gWindowConfig_81E6F30 = BG_SCREEN_ADDR(29), // tilemap }; -const struct WindowConfig gWindowConfig_81E6F4C = +const struct WindowTemplate gWindowConfig_81E6F4C = { 3, // BG number 0, // BG character base block @@ -1086,7 +1101,7 @@ const struct WindowConfig gWindowConfig_81E6F4C = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E6F68 = +const struct WindowTemplate gWindowConfig_81E6F68 = { 0, // BG number 2, // BG character base block @@ -1107,7 +1122,7 @@ const struct WindowConfig gWindowConfig_81E6F68 = BG_SCREEN_ADDR(13), // tilemap }; -const struct WindowConfig gWindowConfig_81E6F84 = +const struct WindowTemplate gWindowConfig_81E6F84 = { 0, // BG number 2, // BG character base block @@ -1128,7 +1143,7 @@ const struct WindowConfig gWindowConfig_81E6F84 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E6FA0 = +const struct WindowTemplate gWindowConfig_81E6FA0 = { 1, // BG number 0, // BG character base block @@ -1149,7 +1164,7 @@ const struct WindowConfig gWindowConfig_81E6FA0 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowConfig gWindowConfig_81E6FBC = +const struct WindowTemplate gWindowConfig_81E6FBC = { 0, // BG number 0, // BG character base block @@ -1170,7 +1185,7 @@ const struct WindowConfig gWindowConfig_81E6FBC = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E6FD8 = +const struct WindowTemplate gWindowConfig_81E6FD8 = { 0, // BG number 0, // BG character base block @@ -1191,7 +1206,7 @@ const struct WindowConfig gWindowConfig_81E6FD8 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowConfig gWindowConfig_81E6FF4 = +const struct WindowTemplate gWindowConfig_81E6FF4 = { 0, // BG number 0, // BG character base block @@ -1212,7 +1227,7 @@ const struct WindowConfig gWindowConfig_81E6FF4 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowConfig gWindowConfig_81E7010 = +const struct WindowTemplate gWindowConfig_81E7010 = { 0, // BG number 0, // BG character base block @@ -1233,7 +1248,7 @@ const struct WindowConfig gWindowConfig_81E7010 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E702C = +const struct WindowTemplate gWindowConfig_81E702C = { 3, // BG number 2, // BG character base block @@ -1254,7 +1269,7 @@ const struct WindowConfig gWindowConfig_81E702C = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowConfig gWindowConfig_81E7048 = +const struct WindowTemplate gWindowConfig_81E7048 = { 2, // BG number 2, // BG character base block @@ -1275,7 +1290,7 @@ const struct WindowConfig gWindowConfig_81E7048 = BG_SCREEN_ADDR(14), // tilemap }; -const struct WindowConfig gWindowConfig_81E7064 = +const struct WindowTemplate gWindowConfig_81E7064 = { 2, // BG number 2, // BG character base block @@ -1296,7 +1311,7 @@ const struct WindowConfig gWindowConfig_81E7064 = BG_SCREEN_ADDR(14), // tilemap }; -const struct WindowConfig gWindowConfig_81E7080 = +const struct WindowTemplate gWindowConfig_81E7080 = { 3, // BG number 0, // BG character base block @@ -1317,7 +1332,7 @@ const struct WindowConfig gWindowConfig_81E7080 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E709C = +const struct WindowTemplate gWindowConfig_81E709C = { 0, // BG number 0, // BG character base block @@ -1338,7 +1353,7 @@ const struct WindowConfig gWindowConfig_81E709C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E70B8 = +const struct WindowTemplate gWindowConfig_81E70B8 = { 2, // BG number 0, // BG character base block @@ -1359,7 +1374,7 @@ const struct WindowConfig gWindowConfig_81E70B8 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E70D4 = +const struct WindowTemplate gWindowConfig_81E70D4 = { 3, // BG number 0, // BG character base block @@ -1380,7 +1395,7 @@ const struct WindowConfig gWindowConfig_81E70D4 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E70F0 = +const struct WindowTemplate gWindowConfig_81E70F0 = { 0, // BG number 0, // BG character base block @@ -1401,7 +1416,7 @@ const struct WindowConfig gWindowConfig_81E70F0 = NULL, // tilemap }; -const struct WindowConfig gWindowConfig_81E710C = +const struct WindowTemplate gWindowConfig_81E710C = { 0, // BG number 0, // BG character base block @@ -1422,7 +1437,7 @@ const struct WindowConfig gWindowConfig_81E710C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E7128 = +const struct WindowTemplate gWindowConfig_81E7128 = { 0, // BG number 2, // BG character base block @@ -1443,7 +1458,7 @@ const struct WindowConfig gWindowConfig_81E7128 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E7144 = +const struct WindowTemplate gWindowConfig_81E7144 = { 0, // BG number 2, // BG character base block @@ -1464,7 +1479,7 @@ const struct WindowConfig gWindowConfig_81E7144 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E7160 = +const struct WindowTemplate gWindowConfig_81E7160 = { 1, // BG number 1, // BG character base block @@ -1485,7 +1500,7 @@ const struct WindowConfig gWindowConfig_81E7160 = BG_SCREEN_ADDR(10), // tilemap }; -const struct WindowConfig gWindowConfig_81E717C = +const struct WindowTemplate gWindowConfig_81E717C = { 0, // BG number 3, // BG character base block @@ -1506,7 +1521,7 @@ const struct WindowConfig gWindowConfig_81E717C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E7198 = +const struct WindowTemplate gWindowConfig_81E7198 = { 0, // BG number 2, // BG character base block @@ -1527,7 +1542,7 @@ const struct WindowConfig gWindowConfig_81E7198 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowConfig gWindowConfig_81E71B4 = +const struct WindowTemplate gWindowConfig_81E71B4 = { 0, // BG number 2, // BG character base block @@ -1548,7 +1563,7 @@ const struct WindowConfig gWindowConfig_81E71B4 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowConfig gWindowConfig_81E71D0 = +const struct WindowTemplate gWindowConfig_81E71D0 = { 1, // BG number 1, // BG character base block @@ -1569,7 +1584,7 @@ const struct WindowConfig gWindowConfig_81E71D0 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowConfig gWindowConfig_81E71EC = +const struct WindowTemplate gWindowConfig_81E71EC = { 2, // BG number 1, // BG character base block @@ -1590,7 +1605,7 @@ const struct WindowConfig gWindowConfig_81E71EC = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E7208 = +const struct WindowTemplate gWindowConfig_81E7208 = { 0, // BG number 2, // BG character base block @@ -1611,7 +1626,7 @@ const struct WindowConfig gWindowConfig_81E7208 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowConfig gWindowConfig_81E7224 = +const struct WindowTemplate gWindowConfig_81E7224 = { 0, // BG number 0, // BG character base block @@ -1632,7 +1647,7 @@ const struct WindowConfig gWindowConfig_81E7224 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowConfig gWindowConfig_81E7240 = +const struct WindowTemplate gWindowConfig_81E7240 = { 1, // BG number 2, // BG character base block @@ -1653,7 +1668,7 @@ const struct WindowConfig gWindowConfig_81E7240 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowConfig gWindowConfig_81E725C = +const struct WindowTemplate gWindowConfig_81E725C = { 0, // BG number 0, // BG character base block @@ -1674,7 +1689,7 @@ const struct WindowConfig gWindowConfig_81E725C = NULL, // tilemap }; -const struct WindowConfig gWindowConfig_81E7278 = +const struct WindowTemplate gWindowConfig_81E7278 = { 0, // BG number 0, // BG character base block @@ -1695,7 +1710,7 @@ const struct WindowConfig gWindowConfig_81E7278 = NULL, // tilemap }; -const struct WindowConfig gWindowConfig_81E7294 = +const struct WindowTemplate gWindowConfig_81E7294 = { 0, // BG number 0, // BG character base block @@ -1716,32 +1731,32 @@ const struct WindowConfig gWindowConfig_81E7294 = NULL, // tilemap }; -static void UpdateBGRegs(const struct WindowConfig *winConfig) +static void UpdateBGRegs(const struct WindowTemplate *winTemplate) { - u8 bgNum = winConfig->bgNum; + u8 bgNum = winTemplate->bgNum; *gBGHOffsetRegs[bgNum] = 0; *gBGVOffsetRegs[bgNum] = 0; - *gBGControlRegs[bgNum] = winConfig->priority | (winConfig->screenBaseBlock << 8) | (winConfig->charBaseBlock << 2); + *gBGControlRegs[bgNum] = winTemplate->priority | (winTemplate->screenBaseBlock << 8) | (winTemplate->charBaseBlock << 2); } -static void ClearBGMem(const struct WindowConfig *winConfig) +static void ClearBGMem(const struct WindowTemplate *winTemplate) { - CpuFastFill(0, winConfig->tileData, 32); + CpuFastFill(0, winTemplate->tileData, 32); - if (winConfig->tilemap) - CpuFastFill(0, winConfig->tilemap, 0x800); + if (winTemplate->tilemap) + CpuFastFill(0, winTemplate->tilemap, 0x800); } -void LoadFontDefaultPalette(const struct WindowConfig *winConfig) +void LoadFontDefaultPalette(const struct WindowTemplate *winTemplate) { - LoadPalette(gFontDefaultPalette, 16 * winConfig->paletteNum, 32); + LoadPalette(gFontDefaultPalette, 16 * winTemplate->paletteNum, 32); } -void SetUpWindowConfig(const struct WindowConfig *winConfig) +void SetUpWindowConfig(const struct WindowTemplate *winTemplate) { - UpdateBGRegs(winConfig); - ClearBGMem(winConfig); - LoadFontDefaultPalette(winConfig); + UpdateBGRegs(winTemplate); + ClearBGMem(winTemplate); + LoadFontDefaultPalette(winTemplate); } u16 InitWindowTileData(struct Window *win, u16 startOffset) @@ -1751,13 +1766,13 @@ u16 InitWindowTileData(struct Window *win, u16 startOffset) win->tileDataStartOffset = startOffset; retVal = 0; - switch (win->config->textMode) + switch (win->template->textMode) { - case 2: + case TEXT_MODE_UNKNOWN2: retVal = InitVariableWidthFontTileData(win, startOffset); break; - case 1: - switch (win->config->fontNum) + case TEXT_MODE_MONOSPACE: + switch (win->template->fontNum) { case 0: case 3: @@ -1789,7 +1804,7 @@ static u16 InitVariableWidthFontTileData(struct Window *win, u16 startOffset) win->tileDataOffset = 2; buffer = win->tileData + 32 * win->tileDataStartOffset; CpuFastFill(0, buffer, 32); - ApplyColors_UnshadowedFont(sBlankTile, (u32 *)(buffer + 32), win->config->foregroundColor, win->config->backgroundColor); + ApplyColors_UnshadowedFont(sBlankTile, (u32 *)(buffer + 32), win->template->foregroundColor, win->template->backgroundColor); return win->tileDataStartOffset + win->tileDataOffset + win->width * win->height; } @@ -1850,15 +1865,15 @@ u32 MultistepInitWindowTileData(struct Window *win, u16 startOffset) win->tileDataStartOffset = startOffset; retVal = 0; - switch (win->config->textMode) + switch (win->template->textMode) { - case 2: + case TEXT_MODE_UNKNOWN2: retVal = InitVariableWidthFontTileData(win, startOffset); break; - case 1: + case TEXT_MODE_MONOSPACE: retVal = 256; - if (win->config->fontNum == 0 - || win->config->fontNum == 3) + if (win->template->fontNum == 0 + || win->template->fontNum == 3) retVal *= 2; break; } @@ -1870,7 +1885,7 @@ bool32 MultistepLoadFont(void) { bool32 retVal = TRUE; - if (sMultistepLoadFont_Window->config->textMode == 1) + if (sMultistepLoadFont_Window->template->textMode == TEXT_MODE_MONOSPACE) { s32 i; @@ -1890,7 +1905,7 @@ static void MultistepLoadFont_LoadGlyph(struct Window *win, u16 startOffset, u8 { u8 *buffer; - switch (win->config->fontNum) + switch (win->template->fontNum) { case 0: case 3: @@ -1923,42 +1938,42 @@ void EmptyFunc(void) { } -void InitWindowFromConfig(struct Window *win, const struct WindowConfig *winConfig) +void Text_InitWindowWithTemplate(struct Window *win, const struct WindowTemplate *winTemplate) { *win = sDefaultWindow; - win->config = (struct WindowConfig *)winConfig; - win->textMode = winConfig->textMode; - win->spacing = winConfig->spacing; - win->fontNum = winConfig->fontNum; - win->paletteNum = winConfig->paletteNum; - win->tilemapLeft = winConfig->tilemapLeft; - win->tilemapTop = winConfig->tilemapTop; - win->width = winConfig->width; - win->height = winConfig->height; - win->tileData = winConfig->tileData; - win->tilemap = winConfig->tilemap; + win->template = (struct WindowTemplate *)winTemplate; + win->textMode = winTemplate->textMode; + win->spacing = winTemplate->spacing; + win->fontNum = winTemplate->fontNum; + win->paletteNum = winTemplate->paletteNum; + win->tilemapLeft = winTemplate->tilemapLeft; + win->tilemapTop = winTemplate->tilemapTop; + win->width = winTemplate->width; + win->height = winTemplate->height; + win->tileData = winTemplate->tileData; + win->tilemap = winTemplate->tilemap; InitColors(win); - SetBackgroundColor(win, winConfig->backgroundColor); - SetShadowColor(win, winConfig->shadowColor); - SetForegroundColor(win, winConfig->foregroundColor); + SetWindowBackgroundColor(win, winTemplate->backgroundColor); + SetWindowShadowColor(win, winTemplate->shadowColor); + SetWindowForegroundColor(win, winTemplate->foregroundColor); } -void InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) +void Text_InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) { - const struct WindowConfig *winConfig = win->config; - win->textMode = winConfig->textMode; - win->fontNum = winConfig->fontNum; + const struct WindowTemplate *winTemplate = win->template; + win->textMode = winTemplate->textMode; + win->fontNum = winTemplate->fontNum; win->language = GAME_LANGUAGE; - win->paletteNum = winConfig->paletteNum; + win->paletteNum = winTemplate->paletteNum; win->win_field_B = 0; win->win_field_C = 0; win->delayCounter = 0; - win->spacing = winConfig->spacing; + win->spacing = winTemplate->spacing; win->win_field_F = 0; - win->tilemapLeft = winConfig->tilemapLeft; - win->tilemapTop = winConfig->tilemapTop; - win->width = winConfig->width; - win->height = winConfig->height; + win->tilemapLeft = winTemplate->tilemapLeft; + win->tilemapTop = winTemplate->tilemapTop; + win->width = winTemplate->width; + win->height = winTemplate->height; win->text = text; win->textIndex = 0; win->tileDataStartOffset = tileDataStartOffset; @@ -1969,19 +1984,19 @@ void InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 win->cursorY = 0; win->state = WIN_STATE_BEGIN; win->downArrowCounter = 0; - win->tileData = winConfig->tileData; - win->tilemap = winConfig->tilemap; + win->tileData = winTemplate->tileData; + win->tilemap = winTemplate->tilemap; InitColors(win); - SetBackgroundColor(win, winConfig->backgroundColor); - SetShadowColor(win, winConfig->shadowColor); - SetForegroundColor(win, winConfig->foregroundColor); + SetWindowBackgroundColor(win, winTemplate->backgroundColor); + SetWindowShadowColor(win, winTemplate->shadowColor); + SetWindowForegroundColor(win, winTemplate->foregroundColor); } -void sub_8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6) +void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6) { u8 val; - InitWindow(win, text, tileDataStartOffset, 0, 0); + Text_InitWindow(win, text, tileDataStartOffset, 0, 0); win->left = left; win->top = top; val = 0; @@ -2003,15 +2018,15 @@ void sub_8002E90(struct Window *win, const u8 *text) win->delayCounter = 0; } -void sub_8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) +void Text_InitWindow8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) { gMain.watchedKeysMask = A_BUTTON | B_BUTTON; gMain.watchedKeysPressed = 0; - sWaitType = 0; + sWaitType = WAIT_TYPE_NORMAL; sLineLength = 26; - InitWindow(win, text, tileDataStartOffset, left, top); + Text_InitWindow(win, text, tileDataStartOffset, left, top); win->win_field_B = -1; - if (win->textMode == 0) + if (win->textMode == TEXT_MODE_UNKNOWN0) { u16 val = GetCursorTileNum(win, 0, 0); u8 *buffer = win->tileData + 32 * val; @@ -2021,9 +2036,9 @@ void sub_8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 } } -u8 sub_8002F44(struct Window *win) +u8 Text_PrintWindow8002F44(struct Window *win) { - while (win->state) + while (win->state != WIN_STATE_END) { if (win->state == WIN_STATE_NEWLINE) { @@ -2038,7 +2053,7 @@ u8 sub_8002F44(struct Window *win) sub_8002FA0(win, GetExpandedPlaceholder(win->text[win->textIndex++])); } - InterpretText(win); + PrintNextChar(win); } return 1; } @@ -2048,11 +2063,12 @@ static u8 sub_8002FA0(struct Window *win, const u8 *text) u8 retVal; u8 savedLanguage = win->language; const u8 *savedText = win->text; + u16 savedTextIndex = win->textIndex; win->text = text; win->textIndex = 0; win->state = WIN_STATE_NORMAL; - retVal = sub_8002F44(win); + retVal = Text_PrintWindow8002F44(win); win->text = savedText; win->textIndex = savedTextIndex; win->state = WIN_STATE_NORMAL; @@ -2060,32 +2076,33 @@ static u8 sub_8002FA0(struct Window *win, const u8 *text) return retVal; } -static u8 InterpretText(struct Window *win) +static u8 PrintNextChar(struct Window *win) { u8 c = win->text[win->textIndex++]; + // Handle special control characters switch (c) { - case 0xFF: + case EOS: ClipRight(win); win->state = WIN_STATE_END; return 0; - case 0xFD: + case PLACEHOLDER_BEGIN: win->state = WIN_STATE_PLACEHOLDER; return 2; - case 0xFE: + case CHAR_NEWLINE: ClipRight(win); win->state = WIN_STATE_NEWLINE; return 2; - case 0xFB: + case CHAR_PROMPT_CLEAR: DrawInitialDownArrow(win); - win->state = WIN_STATE_PARAGRAPH; + win->state = WIN_STATE_WAIT_CLEAR; return 2; - case 0xFA: + case CHAR_PROMPT_SCROLL: DrawInitialDownArrow(win); - win->state = WIN_STATE_NEWLINE_WAIT; + win->state = WIN_STATE_WAIT_SCROLL; return 2; - case 0xFC: + case EXT_CTRL_CODE_BEGIN: return HandleExtCtrlCode(win); } @@ -2093,6 +2110,8 @@ static u8 InterpretText(struct Window *win) return 1; } +// Extended 0xFC control functions + static u8 HandleExtCtrlCode(struct Window *win) { return sExtCtrlCodeFuncs[win->text[win->textIndex++]](win); @@ -2105,27 +2124,27 @@ static u8 ExtCtrlCode_Nop(struct Window *win) static u8 ExtCtrlCode_ForegroundColor(struct Window *win) { - SetForegroundColor(win, win->text[win->textIndex++]); + SetWindowForegroundColor(win, win->text[win->textIndex++]); return 2; } static u8 ExtCtrlCode_BackgroundColor(struct Window *win) { - SetBackgroundColor(win, win->text[win->textIndex++]); + SetWindowBackgroundColor(win, win->text[win->textIndex++]); return 2; } static u8 ExtCtrlCode_ShadowColor(struct Window *win) { - SetShadowColor(win, win->text[win->textIndex++]); + SetWindowShadowColor(win, win->text[win->textIndex++]); return 2; } static u8 ExtCtrlCode_AllColors(struct Window *win) { - SetForegroundColor(win, win->text[win->textIndex++]); - SetBackgroundColor(win, win->text[win->textIndex++]); - SetShadowColor(win, win->text[win->textIndex++]); + SetWindowForegroundColor(win, win->text[win->textIndex++]); + SetWindowBackgroundColor(win, win->text[win->textIndex++]); + SetWindowShadowColor(win, win->text[win->textIndex++]); return 2; } @@ -2143,7 +2162,7 @@ static u8 ExtCtrlCode_Font(struct Window *win) static u8 ExtCtrlCode_DefaultFont(struct Window *win) { - win->fontNum = win->config->fontNum; + win->fontNum = win->template->fontNum; return 2; } @@ -2197,7 +2216,7 @@ static u8 ExtCtrlCode_SetCursorY(struct Window *win) static u8 ExtCtrlCode_ClearWindowTextLines(struct Window *win) { - ClearWindowTextLines(win); + Text_ClearWindow(win); return 2; } @@ -2211,7 +2230,7 @@ static u8 ExtCtrlCode_PlaySE(struct Window *win) static void DrawSpace(struct Window *win) { - if (win->textMode == 1 || (win->left + win->cursorX) & 7 || win->spacing <= 7) + if (win->textMode == TEXT_MODE_MONOSPACE || (win->left + win->cursorX) & 7 || win->spacing <= 7) { sPrintGlyphFuncs[win->textMode](win, 0); } @@ -2302,10 +2321,11 @@ static u8 ExtCtrlCode_Latin(struct Window *win) return 2; } -u8 sub_8003418(struct Window *win) +// Prints the window text without expanding any placeholders +u8 Text_PrintWindowSimple(struct Window *win) { u8 retVal = 1; - while (win->state) + while (win->state != WIN_STATE_END) { if (win->state == WIN_STATE_NEWLINE) { @@ -2315,7 +2335,7 @@ u8 sub_8003418(struct Window *win) ClipLeft(win); win->state = WIN_STATE_NORMAL; } - if (InterpretText(win) == 1) + if (PrintNextChar(win) == 1) { retVal = 0; break; @@ -2324,10 +2344,10 @@ u8 sub_8003418(struct Window *win) return retVal; } -u8 sub_8003460(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) +u8 Text_InitWindowAndPrintText(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) { - InitWindow(win, text, tileDataStartOffset, left, top); - return sub_8002F44(win); + Text_InitWindow(win, text, tileDataStartOffset, left, top); + return Text_PrintWindow8002F44(win); } u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 top) @@ -2336,8 +2356,8 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to u8 text[2]; text[0] = c; text[1] = EOS; - InitWindow(win, text, tileDataStartOffset, left, top); - retVal = InterpretText(win); + Text_InitWindow(win, text, tileDataStartOffset, left, top); + retVal = PrintNextChar(win); ClipRight(win); return retVal; } @@ -2349,35 +2369,38 @@ void sub_80034D4(u8 *tileData, const u8 *text) u8 sub_80034EC(u8 *str) { - return GetStringWidthGivenWindowConfig((struct WindowConfig *)&gWindowConfig_81E6C74, str); + return Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6C74, str); } u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType) { - sTempWindow.config = (struct WindowConfig *)&gWindowConfig_81E6C74; - InitWindow(&sTempWindow, 0, 0, 0, 0); + sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74; + Text_InitWindow(&sTempWindow, 0, 0, 0, 0); return AlignInt2(&sTempWindow, dest, value, alignAmount, alignType); } u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType) { - sTempWindow.config = (struct WindowConfig *)&gWindowConfig_81E6C74; - InitWindow(&sTempWindow, src, 0, 0, 0); + sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74; + Text_InitWindow(&sTempWindow, src, 0, 0, 0); return AlignString(&sTempWindow, dest, src, alignAmount, alignType); } -u8 sub_80035AC(struct Window *win) +// Updates the window text +// The text delay can be accelerated by holding the A button +u8 Text_UpdateWindow(struct Window *win) { - sWaitType = 0; + sWaitType = WAIT_TYPE_NORMAL; return UpdateWindowText(win); } +// Returns TRUE when all of the text has been printed. static u8 UpdateWindowText(struct Window *win) { switch (win->state) { case WIN_STATE_WAIT_BUTTON: - if (PlayerCanInterruptWait(win)) + if (PlayerCanInterruptDelay(win)) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { @@ -2385,48 +2408,56 @@ static u8 UpdateWindowText(struct Window *win) } else { - return 0; + return FALSE; } } else { win->delayCounter--; if (win->delayCounter) - return 0; + return FALSE; } win->state = WIN_STATE_NORMAL; - return 0; - case WIN_STATE_INTERRUPTIBLE_PAUSE: - if (PlayerCanInterruptWait(win) && (gMain.heldKeys & (A_BUTTON | B_BUTTON)) && gMain.watchedKeysPressed == TRUE) + return FALSE; + case WIN_STATE_CHAR_DELAY: + // Allow the player to speed up text by holding a button + if (PlayerCanInterruptDelay(win) + && (gMain.heldKeys & (A_BUTTON | B_BUTTON)) + && gMain.watchedKeysPressed == TRUE) { win->delayCounter = 0; win->state = WIN_STATE_NORMAL; break; } + // fall through case WIN_STATE_PAUSE: + // Wait for timer to expire, then continue printing if (win->delayCounter) { win->delayCounter--; if (win->delayCounter) - return 0; + return FALSE; } - win->state = WIN_STATE_NORMAL; break; - case WIN_STATE_PARAGRAPH: - if (!WaitWithDownArrow(win)) - return 0; - ClearWindowTextLines(win); - win->state = WIN_STATE_NORMAL; - BLOCK_CROSS_JUMP - return 0; - case WIN_STATE_NEWLINE_WAIT: - if (!WaitWithDownArrow(win)) - return 0; - ScrollWindowTextLines(win); - win->state = WIN_STATE_NORMAL; - BLOCK_CROSS_JUMP - return 0; + case WIN_STATE_WAIT_CLEAR: + // Erase the text once a button is pressed + if (WaitWithDownArrow(win)) + { + Text_ClearWindow(win); + win->state = WIN_STATE_NORMAL; + asm(""); + } + return FALSE; + case WIN_STATE_WAIT_SCROLL: + // Scroll the text once a button is pressed + if (WaitWithDownArrow(win)) + { + ScrollWindowTextLines(win); + win->state = WIN_STATE_NORMAL; + asm(""); + } + return FALSE; case WIN_STATE_PLACEHOLDER: win->textIndex++; win->state = WIN_STATE_NORMAL; @@ -2434,35 +2465,35 @@ static u8 UpdateWindowText(struct Window *win) case WIN_STATE_NEWLINE: ScrollWindowTextLines(win); win->state = WIN_STATE_NORMAL; - BLOCK_CROSS_JUMP - return 0; + asm(""); + return FALSE; case WIN_STATE_BEGIN: - ClearWindowTextLines(win); + Text_ClearWindow(win); break; case WIN_STATE_WAIT_SOUND: if (IsSEPlaying()) - return 0; + return FALSE; win->state = WIN_STATE_NORMAL; break; case WIN_STATE_END: - return 1; + return TRUE; // done printing text case WIN_STATE_NORMAL: break; default: win->state = WIN_STATE_END; - return 1; + return TRUE; } - InterpretText(win); + PrintNextChar(win); switch (win->state) { case WIN_STATE_END: - return 1; + return TRUE; // done printing text case WIN_STATE_WAIT_BUTTON: - case WIN_STATE_PARAGRAPH: - case WIN_STATE_NEWLINE_WAIT: - if (PlayerCanInterruptWait(win)) + case WIN_STATE_WAIT_CLEAR: + case WIN_STATE_WAIT_SCROLL: + if (PlayerCanInterruptDelay(win)) return 0; win->delayCounter = 60; break; @@ -2471,8 +2502,9 @@ static u8 UpdateWindowText(struct Window *win) case WIN_STATE_WAIT_SOUND: break; default: - win->state = WIN_STATE_INTERRUPTIBLE_PAUSE; + win->state = WIN_STATE_CHAR_DELAY; win->delayCounter = GetTextDelay(win); + break; } return 0; @@ -2484,45 +2516,45 @@ static u8 UpdateWindowText(struct Window *win) #define SUB_800374C_LINE_LENGTH 27 #endif -u8 sub_800374C(struct Window *win) +u8 Text_UpdateWindowInBattle(struct Window *win) { u8 retVal; - sWaitType = 1; + sWaitType = WAIT_TYPE_BATTLE; sLineLength = SUB_800374C_LINE_LENGTH; retVal = UpdateWindowText(win); sLineLength = 26; - sWaitType = 0; + sWaitType = WAIT_TYPE_NORMAL; return retVal; } -u8 sub_8003778(struct Window *win) +u8 Text_UpdateWindowAutoscroll(struct Window *win) { u8 retVal; - sWaitType = 2; + sWaitType = WAIT_TYPE_AUTOSCROLL; sLineLength = 26; retVal = UpdateWindowText(win); - sWaitType = 0; + sWaitType = WAIT_TYPE_NORMAL; return retVal; } -u8 sub_80037A0(struct Window *win) +u8 Text_UpdateWindowInContest(struct Window *win) { u8 retVal; - sWaitType = 3; + sWaitType = WAIT_TYPE_CONTEST; sLineLength = 17; retVal = UpdateWindowText(win); sLineLength = 26; return retVal; } -u32 sub_80037C8(struct Window *win, u8 lineLength) +u32 Text_UpdateWindowOverrideLineLength(struct Window *win, u8 lineLength) { u8 retVal; - sWaitType = 0; + sWaitType = WAIT_TYPE_NORMAL; sLineLength = lineLength; retVal = UpdateWindowText(win); sLineLength = 26; @@ -2757,14 +2789,14 @@ static void ApplyColors_ShadowedFont(const void *src, void *dest, u8 foreground, static void SetCursorX(struct Window *win, u8 x) { - if (win->textMode == 0 && ((win->left + win->cursorX) & 7)) + if (win->textMode == TEXT_MODE_UNKNOWN0 && ((win->left + win->cursorX) & 7)) win->tileDataOffset += 2; win->cursorX = x; } static void AddToCursorX(struct Window *win, u8 deltaX) { - if (win->textMode == 0) + if (win->textMode == TEXT_MODE_UNKNOWN0) { u8 x = win->cursorX; win->cursorX += deltaX; @@ -2779,7 +2811,7 @@ static void AddToCursorX(struct Window *win, u8 deltaX) static void AddToCursorY(struct Window *win, u8 deltaY) { - if (win->textMode == 0 && ((win->left + win->cursorX) & 7)) + if (win->textMode == TEXT_MODE_UNKNOWN0 && ((win->left + win->cursorX) & 7)) win->tileDataOffset += 2; win->cursorY += deltaY; } @@ -2788,11 +2820,11 @@ static void EraseAtCursor(struct Window *win) { switch (win->textMode) { - case 0: - case 2: + case TEXT_MODE_UNKNOWN0: + case TEXT_MODE_UNKNOWN2: DrawGlyphTiles(win, 0, 8); break; - case 1: + case TEXT_MODE_MONOSPACE: sWriteGlyphTilemapFuncs[win->fontNum](win, 0); break; } @@ -2801,7 +2833,8 @@ static void EraseAtCursor(struct Window *win) static void ClipLeft(struct Window *win) { u32 pixel = win->left & 7; - if (win->textMode != 1 && pixel) + + if (win->textMode != TEXT_MODE_MONOSPACE && pixel) { const u32 *masks = sGlyphMasks[8][pixel]; u32 outsideMask = masks[0]; @@ -2834,32 +2867,40 @@ static void ClipRight(struct Window *win) { register u8 cursorX asm("r0") = win->cursorX; u8 left = win->left; - u32 pixel = (cursorX + left) & 7; - if (win->textMode != 1 && pixel) + u32 pixelX = (cursorX + left) & 7; + + if (win->textMode != TEXT_MODE_MONOSPACE && pixelX != 0) { - const u32 *masks = sGlyphMasks[8 - pixel][pixel]; + const u32 *masks = sGlyphMasks[8 - pixelX][pixelX]; u32 insideMask = masks[0]; u32 outside = (sGlyphBuffer.background & ~insideMask); - u16 tileNum = GetCursorTileNum(win, 0, 0); - u32 *buffer = (u32 *)(win->tileData + 32 * tileNum); - buffer[0] = (buffer[0] & insideMask) | outside; - buffer[1] = (buffer[1] & insideMask) | outside; - buffer[2] = (buffer[2] & insideMask) | outside; - buffer[3] = (buffer[3] & insideMask) | outside; - buffer[4] = (buffer[4] & insideMask) | outside; - buffer[5] = (buffer[5] & insideMask) | outside; - buffer[6] = (buffer[6] & insideMask) | outside; - buffer[7] = (buffer[7] & insideMask) | outside; + u16 tileNum; + u32 *tileData; + + tileNum = GetCursorTileNum(win, 0, 0); + tileData = (u32 *)(win->tileData + 32 * tileNum); + + tileData[0] = (tileData[0] & insideMask) | outside; + tileData[1] = (tileData[1] & insideMask) | outside; + tileData[2] = (tileData[2] & insideMask) | outside; + tileData[3] = (tileData[3] & insideMask) | outside; + tileData[4] = (tileData[4] & insideMask) | outside; + tileData[5] = (tileData[5] & insideMask) | outside; + tileData[6] = (tileData[6] & insideMask) | outside; + tileData[7] = (tileData[7] & insideMask) | outside; + tileNum = GetCursorTileNum(win, 0, 1); - buffer = (u32 *)(win->tileData + 32 * tileNum); - buffer[0] = (buffer[0] & insideMask) | outside; - buffer[1] = (buffer[1] & insideMask) | outside; - buffer[2] = (buffer[2] & insideMask) | outside; - buffer[3] = (buffer[3] & insideMask) | outside; - buffer[4] = (buffer[4] & insideMask) | outside; - buffer[5] = (buffer[5] & insideMask) | outside; - buffer[6] = (buffer[6] & insideMask) | outside; - buffer[7] = (buffer[7] & insideMask) | outside; + tileData = (u32 *)(win->tileData + 32 * tileNum); + + tileData[0] = (tileData[0] & insideMask) | outside; + tileData[1] = (tileData[1] & insideMask) | outside; + tileData[2] = (tileData[2] & insideMask) | outside; + tileData[3] = (tileData[3] & insideMask) | outside; + tileData[4] = (tileData[4] & insideMask) | outside; + tileData[5] = (tileData[5] & insideMask) | outside; + tileData[6] = (tileData[6] & insideMask) | outside; + tileData[7] = (tileData[7] & insideMask) | outside; + UpdateTilemap(win, 1); } } @@ -2876,7 +2917,7 @@ static void InitColors(struct Window *win) sGlyphBuffer.colors[i] = i; } -static void SetBackgroundColor(struct Window *win, u8 color) +static void SetWindowBackgroundColor(struct Window *win, u8 color) { u32 val1; u32 val2; @@ -2889,13 +2930,13 @@ static void SetBackgroundColor(struct Window *win, u8 color) sGlyphBuffer.background = val3; } -static void SetShadowColor(struct Window *win, u8 color) +static void SetWindowShadowColor(struct Window *win, u8 color) { win->shadowColor = color; sGlyphBuffer.colors[14] = color; } -static void SetForegroundColor(struct Window *win, u8 color) +static void SetWindowForegroundColor(struct Window *win, u8 color) { win->foregroundColor = color; sGlyphBuffer.colors[15] = color; @@ -2903,25 +2944,25 @@ static void SetForegroundColor(struct Window *win, u8 color) static u8 GetTextDelay(struct Window *win) { - if (!PlayerCanInterruptWait(win)) + if (!PlayerCanInterruptDelay(win)) return 3; return sTextSpeedDelays[gSaveBlock2.optionsTextSpeed]; } -static bool8 PlayerCanInterruptWait(struct Window *win) +static bool8 PlayerCanInterruptDelay(struct Window *win) { bool8 retVal = TRUE; switch (sWaitType) { - case 2: + case WAIT_TYPE_AUTOSCROLL: retVal = FALSE; break; - case 3: + case WAIT_TYPE_CONTEST: retVal = gIsLinkContest ? FALSE : TRUE; break; - case 1: + case WAIT_TYPE_BATTLE: retVal = (gBattleTypeFlags & BATTLE_TYPE_LINK) ? FALSE : TRUE; break; } @@ -2933,13 +2974,13 @@ static void ScrollWindowTextLines(struct Window *win) { switch (win->textMode) { - case 0: + case TEXT_MODE_UNKNOWN0: ScrollWindowTextLines_TextMode0(win); break; - case 1: - ScrollWindowTextLines_TextMode1(win); + case TEXT_MODE_MONOSPACE: + ScrollWindowTextLines_TextModeMonospace(win); break; - case 2: + case TEXT_MODE_UNKNOWN2: ScrollWindowTextLines_TextMode2(win); break; } @@ -2949,6 +2990,7 @@ static void ScrollWindowTextLines_TextMode0(struct Window *win) { if (win->cursorY == 0) { + // Advance to the next line win->tileDataOffset = 2 * sLineLength + 2; win->cursorX = 0; win->cursorY += 16; @@ -2959,7 +3001,7 @@ static void ScrollWindowTextLines_TextMode0(struct Window *win) win->tileDataOffset = 2 * sLineLength + 2; else win->tileDataOffset = 2; - win->win_field_C = win->win_field_C ^ 2; + win->win_field_C ^= 2; win->cursorX = 0; DoScroll_TextMode0(win, sLineLength); } @@ -2973,16 +3015,21 @@ static void DoScroll_TextMode0(struct Window *win, u16 lineLength) u16 fill; buffer += val1 + val2; fill = (win->paletteNum << 12) | GetBlankTileNum(win); + + // Move the bottom line up CpuCopy16(buffer + 64, buffer, lineLength * 2); CpuCopy16(buffer + 96, buffer + 32, lineLength * 2); + + // Clear the bottom line CpuFill16(fill, buffer + 64, lineLength * 2); CpuFill16(fill, buffer + 96, lineLength * 2); } -static void ScrollWindowTextLines_TextMode1(struct Window *win) +static void ScrollWindowTextLines_TextModeMonospace(struct Window *win) { if (win->cursorY == 0) { + // Advance to the next line win->cursorX = 0; win->cursorY += 16; } @@ -2990,17 +3037,21 @@ static void ScrollWindowTextLines_TextMode1(struct Window *win) { win->win_field_C ^= 2; win->cursorX = 0; - DoScroll_TextMode1(win, sLineLength); + DoScroll_TextModeMonospace(win, sLineLength); } } -static void DoScroll_TextMode1(struct Window *win, u16 lineLength) +static void DoScroll_TextModeMonospace(struct Window *win, u16 lineLength) { u16 *buffer = GetCursorTilemapPointer(win); u16 *dest = buffer - 32; u16 fill = (win->paletteNum << 12) | GetBlankTileNum(win); + + // Move the bottom line up CpuCopy16(buffer + 32, dest, lineLength * 2); CpuCopy16(buffer + 64, buffer, lineLength * 2); + + // Clear the bottom line CpuFill16(fill, buffer + 32, lineLength * 2); CpuFill16(fill, buffer + 64, lineLength * 2); } @@ -3009,6 +3060,7 @@ static void ScrollWindowTextLines_TextMode2(struct Window *win) { if (win->cursorY == 0) { + // Advance to the next line win->cursorX = 0; win->cursorY += 16; } @@ -3055,18 +3107,18 @@ static void DoScroll_TextMode2(struct Window *win, u8 lineLength) } } -void ClearWindowTextLines(struct Window *win) +void Text_ClearWindow(struct Window *win) { switch (win->textMode) { - case 0: + case TEXT_MODE_UNKNOWN0: ClearWindowTextLines_TextMode0_TextMode1(win, sLineLength); win->tileDataOffset = 2; break; - case 1: + case TEXT_MODE_MONOSPACE: ClearWindowTextLines_TextMode0_TextMode1(win, sLineLength); break; - case 2: + case TEXT_MODE_UNKNOWN2: ClearWindowTextLines_TextMode2(win, sLineLength); break; } @@ -3074,7 +3126,7 @@ void ClearWindowTextLines(struct Window *win) static void ClearWindowTextLines_TextMode0_TextMode1(struct Window *win, u8 lineLength) { - u8 i; + u8 x, y; u16 *buffer; u16 fill; @@ -3085,11 +3137,10 @@ static void ClearWindowTextLines_TextMode0_TextMode1(struct Window *win, u8 line buffer = GetCursorTilemapPointer(win); fill = GetBlankTileNum(win) | (win->paletteNum << 12); - for (i = 0; i < 4; i++) + for (y = 0; y < 4; y++) { - u8 j; - for (j = 0; j < lineLength; j++) - buffer[j] = fill; + for (x = 0; x < lineLength; x++) + buffer[x] = fill; buffer += 32; } } @@ -3114,13 +3165,13 @@ static void ClearWindowTextLines_TextMode2(struct Window *win, u8 lineLength) static void DrawDownArrow(struct Window *win) { - if (PlayerCanInterruptWait(win)) + if (PlayerCanInterruptDelay(win)) { const u32 *downArrowTiles = &sDownArrowTiles[((win->downArrowCounter & 0x0F00) >> 8) * 16]; switch (win->textMode) { - case 1: + case TEXT_MODE_MONOSPACE: { u8 *buffer; u16 tileNum = win->tileDataStartOffset + 254; @@ -3132,8 +3183,8 @@ static void DrawDownArrow(struct Window *win) WriteGlyphTilemap(win, tileNum, tileNum + 1); break; } - case 0: - case 2: + case TEXT_MODE_UNKNOWN0: + case TEXT_MODE_UNKNOWN2: { struct GlyphTileInfo glyphTileInfo; glyphTileInfo.textMode = win->textMode; @@ -3172,9 +3223,9 @@ static void DrawDownArrow(struct Window *win) static u8 WaitWithDownArrow(struct Window *win) { - u8 retVal = 1; + u8 retVal = TRUE; - if (!PlayerCanInterruptWait(win)) + if (!PlayerCanInterruptDelay(win)) { win->delayCounter--; if (!win->delayCounter) @@ -3183,8 +3234,8 @@ static u8 WaitWithDownArrow(struct Window *win) } else { - DrawMovingDownArrow(win); - retVal = 0; + UpdateDownArrowAnimation(win); + retVal = FALSE; } } else @@ -3196,8 +3247,8 @@ static u8 WaitWithDownArrow(struct Window *win) } else { - DrawMovingDownArrow(win); - retVal = 0; + UpdateDownArrowAnimation(win); + retVal = FALSE; } } @@ -3210,7 +3261,7 @@ static void DrawInitialDownArrow(struct Window *win) DrawDownArrow(win); } -static void DrawMovingDownArrow(struct Window *win) +static void UpdateDownArrowAnimation(struct Window *win) { u16 downArrowPos = (win->downArrowCounter & 0x0F00) >> 8; u16 wait = win->downArrowCounter & 0x000F; @@ -3237,31 +3288,37 @@ static void DrawMovingDownArrow(struct Window *win) static void TryEraseDownArrow(struct Window *win) { win->downArrowCounter = 0; - if (PlayerCanInterruptWait(win) == TRUE) + if (PlayerCanInterruptDelay(win) == TRUE) EraseAtCursor(win); } -u16 GetWindowTilemapEntry(struct Window *win, u8 x, u8 y) +// unused +u16 Text_GetWindowTilemapEntry(struct Window *win, u8 x, u8 y) { u16 *tilemap = win->tilemap; return tilemap[32 * y + x]; } -void DrawWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom) +// unused +void Text_FillWindowBorder(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom) { u8 i; u16 *buffer = &win->tilemap[top * 32]; + // Fill top border for (i = left; i <= right; i++) buffer[i] = tilemapEntry; for (i = top + 1; i < bottom - 1; i++) { buffer += 32; + // left border buffer[left] = tilemapEntry; + // right border buffer[right] = tilemapEntry; } + // Fill bottom border if (top != bottom) { buffer += 32; @@ -3270,19 +3327,21 @@ void DrawWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 ri } } +// unused void DrawWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom) { - DrawWindowRect(win, (win->paletteNum << 12) | tileNum, left, top, right, bottom); + Text_FillWindowBorder(win, (win->paletteNum << 12) | tileNum, left, top, right, bottom); } +// Fills the whole window area with tilemapEntry void FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom) { u16 *buffer = &win->tilemap[top * 32]; while (top++ <= bottom) { - u8 j; - for (j = left; j <= right; j++) - buffer[j] = tilemapEntry; + u8 x; + for (x = left; x <= right; x++) + buffer[x] = tilemapEntry; buffer += 32; } } @@ -3297,7 +3356,7 @@ void ZeroFillWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom FillWindowRect_DefaultPalette(win, 0, left, top, right, bottom); } -void FillWindowRectWithBlankTile(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) +void Text_BlankWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) { u16 tileNum = GetBlankTileNum(win); FillWindowRect_DefaultPalette(win, tileNum, left, top, right, bottom); @@ -3309,12 +3368,12 @@ static u16 GetBlankTileNum(struct Window *win) switch (win->textMode) { - case 0: + case TEXT_MODE_UNKNOWN0: break; - case 2: + case TEXT_MODE_UNKNOWN2: retVal++; break; - case 1: + case TEXT_MODE_MONOSPACE: switch (win->fontNum) { case 1: @@ -3451,7 +3510,7 @@ u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignT ConvertIntToDecimalString(temp, value); width = GetStringWidth(win, temp); dest = StringCopy(dest, temp); - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 17; dest[2] = alignAmount - width; dest += 3; @@ -3462,7 +3521,7 @@ u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignT width = GetStringWidth(win, temp); if (alignAmount > width) { - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 17; dest[2] = alignAmount - width; dest += 3; @@ -3474,7 +3533,7 @@ u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignT width = GetStringWidth(win, temp); if (alignAmount > width) { - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 17; dest[2] = (alignAmount - width) / 2; dest += 3; @@ -3482,7 +3541,7 @@ u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignT dest = StringCopy(dest, temp); if (alignAmount > width) { - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 17; dest[2] = (alignAmount - width) / 2; dest += 3; @@ -3500,7 +3559,7 @@ u8 *AlignString(struct Window *win, u8 *dest, const u8 *src, u8 alignAmount, u8 { case 0: dest = StringCopy(dest, src); - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 19; dest[2] = alignAmount; dest += 3; @@ -3510,7 +3569,7 @@ u8 *AlignString(struct Window *win, u8 *dest, const u8 *src, u8 alignAmount, u8 width = GetStringWidth(win, src); if (alignAmount > width) { - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 19; dest[2] = alignAmount - width; dest += 3; @@ -3521,7 +3580,7 @@ u8 *AlignString(struct Window *win, u8 *dest, const u8 *src, u8 alignAmount, u8 width = GetStringWidth(win, src); if (alignAmount > width) { - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 19; dest[2] = (alignAmount - width) / 2; dest += 3; @@ -3529,7 +3588,7 @@ u8 *AlignString(struct Window *win, u8 *dest, const u8 *src, u8 alignAmount, u8 dest = StringCopy(dest, src); if (alignAmount > width) { - dest[0] = 0xFC; + dest[0] = EXT_CTRL_CODE_BEGIN; dest[1] = 19; dest[2] = alignAmount; dest += 3; @@ -3544,16 +3603,16 @@ u8 GetStringWidth(struct Window *win, const u8 *s) { u8 width = 0; u8 savedFontNum = win->fontNum; - u8 savedCharset = win->language; + u8 savedLanguage = win->language; u8 savedSpacing = win->spacing; s32 i = 0; - while (s[i] != 0xFF) + while (s[i] != EOS) { u8 c = s[i]; switch (c) { - case 0xFD: + case PLACEHOLDER_BEGIN: { u8 temp; i++; @@ -3563,7 +3622,7 @@ u8 GetStringWidth(struct Window *win, const u8 *s) i++; break; } - case 0xFC: + case EXT_CTRL_CODE_BEGIN: i++; switch (s[i]) { @@ -3571,7 +3630,7 @@ u8 GetStringWidth(struct Window *win, const u8 *s) win->fontNum = s[i + 1]; break; case 7: - win->fontNum = win->config->fontNum; + win->fontNum = win->template->fontNum; break; case 0x11: width += s[i + 1]; @@ -3601,7 +3660,7 @@ u8 GetStringWidth(struct Window *win, const u8 *s) } win->spacing = savedSpacing; - win->language = savedCharset; + win->language = savedLanguage; win->fontNum = savedFontNum; return width; @@ -3609,30 +3668,30 @@ u8 GetStringWidth(struct Window *win, const u8 *s) u8 sub_8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6) { - sub_8002E4C(win, text, tileDataStartOffset, left, top, a6); - return sub_8002F44(win); + Text_InitWindow8002E4C(win, text, tileDataStartOffset, left, top, a6); + return Text_PrintWindow8002F44(win); } u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) { u8 width = GetStringWidth(win, text); - InitWindow(win, text, tileDataStartOffset, left - ((u32)(width + 7) >> 3), top); + Text_InitWindow(win, text, tileDataStartOffset, left - ((u32)(width + 7) >> 3), top); EraseAtCursor(win); width &= 7; if (width) width = 8 - width; sub_80048D8(win, width, 0); - return sub_8002F44(win); + return Text_PrintWindow8002F44(win); } u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6) { register u32 val asm("r5") = (u8)((a6 >> 1) - (GetStringWidth(win, text) >> 1)); left += (val >> 3); - InitWindow(win, text, tileDataStartOffset, left, top); + Text_InitWindow(win, text, tileDataStartOffset, left, top); EraseAtCursor(win); sub_80048D8(win, val & 7, 0); - return sub_8002F44(win); + return Text_PrintWindow8002F44(win); } u8 sub_8004E24(struct Window *win) @@ -3640,25 +3699,25 @@ u8 sub_8004E24(struct Window *win) return win->paletteNum; } -void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow) +void Text_GetTextColors(struct Window *win, u8 *foreground, u8 *background, u8 *shadow) { *foreground = win->foregroundColor; *background = win->backgroundColor; *shadow = win->shadowColor; } -void sub_8004E3C(const struct WindowConfig *winConfig, u8 *tileData, const u8 *text) +void sub_8004E3C(const struct WindowTemplate *winTemplate, u8 *tileData, const u8 *text) { - sTempWindow.config = winConfig; - InitWindow(&sTempWindow, text, 0, 0, 0); + sTempWindow.template = winTemplate; + Text_InitWindow(&sTempWindow, text, 0, 0, 0); sTempWindow.tileData = tileData; - sub_8002F44(&sTempWindow); + Text_PrintWindow8002F44(&sTempWindow); } -u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s) +u8 Text_GetStringWidthFromWindowTemplate(const struct WindowTemplate *winTemplate, const u8 *s) { - sTempWindow.config = winConfig; - InitWindow(&sTempWindow, s, 0, 0, 0); + sTempWindow.template = winTemplate; + Text_InitWindow(&sTempWindow, s, 0, 0, 0); return GetStringWidth(&sTempWindow, s); } @@ -3801,8 +3860,8 @@ u8 sub_8004FD0(struct Window *win, u8 *dest, const u8 *src, u16 tileDataStartOff if (endsWithoutNewline) newlineCount++; - sub_8002E4C(win, start, tileDataStartOffset, left, top, a8); - sub_8002F44(win); + Text_InitWindow8002E4C(win, start, tileDataStartOffset, left, top, a8); + Text_PrintWindow8002F44(win); return newlineCount; } @@ -3827,7 +3886,7 @@ static s32 DrawGlyphTile_UnshadowedFont(struct GlyphTileInfo *glyphTileInfo) if (glyphTileInfo->startPixel + glyphTileInfo->width > 8) { u32 mask2 = masks[1]; - if (glyphTileInfo->textMode == 2) + if (glyphTileInfo->textMode == TEXT_MODE_UNKNOWN2) { glyphBuffer->pixelRows[8] = buffer[8] & mask2; glyphBuffer->pixelRows[9] = buffer[9] & mask2; @@ -3867,7 +3926,7 @@ static s32 DrawGlyphTile_UnshadowedFont(struct GlyphTileInfo *glyphTileInfo) if (glyphTileInfo->startPixel + glyphTileInfo->width > 8) { - if (glyphTileInfo->textMode != 2) + if (glyphTileInfo->textMode != TEXT_MODE_UNKNOWN2) buffer += 8; buffer[8] = glyphBuffer->pixelRows[8]; buffer[9] = glyphBuffer->pixelRows[9]; @@ -4039,7 +4098,7 @@ static s32 DrawGlyphTile_ShadowedFont(struct GlyphTileInfo *glyphTileInfo) if (glyphTileInfo->startPixel + glyphTileInfo->width > 8) { u32 mask2 = masks[1]; - if (glyphTileInfo->textMode == 2) + if (glyphTileInfo->textMode == TEXT_MODE_UNKNOWN2) { glyphBuffer->pixelRows[8] = buffer[8] & mask2; glyphBuffer->pixelRows[9] = buffer[9] & mask2; @@ -4076,7 +4135,7 @@ static s32 DrawGlyphTile_ShadowedFont(struct GlyphTileInfo *glyphTileInfo) if (glyphTileInfo->startPixel + glyphTileInfo->width > 8) { - if (glyphTileInfo->textMode != 2) + if (glyphTileInfo->textMode != TEXT_MODE_UNKNOWN2) buffer += 8; buffer[8] = glyphBuffer->pixelRows[8]; buffer[9] = glyphBuffer->pixelRows[9]; @@ -4314,7 +4373,7 @@ static u16 GetCursorTileNum(struct Window *win, u32 xOffset, u32 yOffset) { u16 index; - if (win->textMode == 2) + if (win->textMode == TEXT_MODE_UNKNOWN2) index = win->tileDataStartOffset + win->tileDataOffset + (((win->top + win->cursorY) >> 3) + yOffset) * win->width diff --git a/src/engine/text_window.c b/src/engine/text_window.c index c001ddefc..ade349f4e 100644 --- a/src/engine/text_window.c +++ b/src/engine/text_window.c @@ -4,19 +4,22 @@ #include "palette.h" #include "text.h" -#define STD_MSG_BOX_LEFT 0 -#define STD_MSG_BOX_TOP 14 -#define STD_MSG_BOX_WIDTH 26 -#define STD_MSG_BOX_HEIGHT 4 +#define STD_WINDOW_PALETTE_NUM 14 + +// Dimensions (in tiles) of a field dialogue frame +#define STD_DLG_FRAME_LEFT 0 +#define STD_DLG_FRAME_TOP 14 +#define STD_DLG_FRAME_WIDTH 26 +#define STD_DLG_FRAME_HEIGHT 4 static void LoadTextWindowTiles(u8, void *); static void LoadTextWindowPalette(u8, u8); -static void DrawTextWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom); -static u16 GetMessageBoxTilemapEntry(u16 tilemapEntry, u8 x, u8 y, u8 width, u8 height); -static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 height); +static void DrawStandardFrame(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom); +static u16 GetDialogueFrameTilemapEntry(u16 tilemapEntry, u8 x, u8 y, u8 width, u8 height); +static void DrawDialogueFrame(struct Window *win, u8 left, u8 top, u8 width, u8 height); static u16 sTextWindowBaseTileNum; -static u16 sMessageBoxBaseTileNum; +static u16 sDialogueFrameBaseTileNum; extern const u8 gTextWindowFrame1_Gfx[]; extern const u8 gTextWindowFrame2_Gfx[]; @@ -60,9 +63,9 @@ extern const u16 gTextWindowFrame18_Pal[]; extern const u16 gTextWindowFrame19_Pal[]; extern const u16 gTextWindowFrame20_Pal[]; -extern const u8 gMessageBox_Gfx[]; +extern const u8 gDialogueFrame_Gfx[]; -static const struct FrameGraphics gUnknown_083761F0[20] = +static const struct FrameGraphics sTextWindowFrameGraphics[20] = { {gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal}, {gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal}, @@ -86,7 +89,7 @@ static const struct FrameGraphics gUnknown_083761F0[20] = {gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal}, }; -static const u16 gMessageBoxTilemap[5][7] = +static const u16 sDialogueFrameTilemap[5][7] = { {1, 3, 4, 4, 5, 6, 9}, {11, 9, 9, 9, 9, 0x040B, 9}, @@ -95,113 +98,124 @@ static const u16 gMessageBoxTilemap[5][7] = {0x0801, 0x0803, 0x0804, 0x0804, 0x0805, 0x0806, 9}, }; -u16 SetTextWindowBaseTileNum(u16 baseTileNum) +u16 TextWindow_SetBaseTileNum(u16 baseTileNum) { sTextWindowBaseTileNum = baseTileNum; return baseTileNum + 9; } -void LoadTextWindowGraphics(struct Window *win) +// Loads the tiles and palette of the window frame into VRAM using the selected frame type +void TextWindow_LoadStdFrameGraphics(struct Window *win) { - u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; + u8 *tileData = win->template->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; LoadTextWindowTiles(gSaveBlock2.optionsWindowFrameType, tileData); - LoadTextWindowPalette(gSaveBlock2.optionsWindowFrameType, 0xE); + LoadTextWindowPalette(gSaveBlock2.optionsWindowFrameType, STD_WINDOW_PALETTE_NUM); } -void LoadTextWindowGraphics_OverridePalSlot(struct Window *win, u8 palSlot) +// Loads the tiles and palette of the window frame into VRAM with an alternate palette +void TextWindow_LoadStdFrameGraphicsOverridePal(struct Window *win, u8 palSlot) { - u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; + u8 *tileData = win->template->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; LoadTextWindowTiles(gSaveBlock2.optionsWindowFrameType, tileData); LoadTextWindowPalette(gSaveBlock2.optionsWindowFrameType, palSlot); } -void LoadTextWindowGraphics_OverrideFrameType(struct Window *win, u8 frameType) +// Loads the tiles and palette of the window frame into VRAM with an alternate frame type +void TextWindow_LoadStdFrameGraphicsOverrideStyle(struct Window *win, u8 frameType) { - u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; + u8 *tileData = win->template->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum; LoadTextWindowTiles(frameType, tileData); - LoadTextWindowPalette(frameType, 0xE); + LoadTextWindowPalette(frameType, STD_WINDOW_PALETTE_NUM); } -void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) +void TextWindow_DrawStdFrame(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) { - DrawTextWindowInternal(win->config->tilemap, sTextWindowBaseTileNum, left, top, right, bottom); + DrawStandardFrame(win->template->tilemap, sTextWindowBaseTileNum, left, top, right, bottom); } -const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType) +// Returns the tile data and palette for the specified frame type +const struct FrameGraphics *TextWindow_GetFrameGraphics(u8 frameType) { if (frameType > 19) - return &gUnknown_083761F0[0]; + return &sTextWindowFrameGraphics[0]; else - return &gUnknown_083761F0[frameType]; + return &sTextWindowFrameGraphics[frameType]; } static void LoadTextWindowTiles(u8 frameType, void *dest) { - const struct FrameGraphics *frameGraphics = GetTextWindowFrameGraphics(frameType); + const struct FrameGraphics *frameGraphics = TextWindow_GetFrameGraphics(frameType); CpuFastCopy(frameGraphics->tiles, dest, 9 * TILE_SIZE_4BPP); } static void LoadTextWindowPalette(u8 frameType, u8 palSlot) { - const struct FrameGraphics *frameGraphics = GetTextWindowFrameGraphics(frameType); + const struct FrameGraphics *frameGraphics = TextWindow_GetFrameGraphics(frameType); LoadPalette(frameGraphics->palette, 16 * palSlot, 0x20); } -static void DrawTextWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom) +// Draws a standard window frame +static void DrawStandardFrame(u16 *tilemap, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom) { + u8 startX = min(left, right); + u8 endX = max(left, right); + u8 startY = min(top, bottom); + u8 endY = max(top, bottom); u8 x, y; - u8 startX, endX; - u8 startY, endY; - - startX = (left < right) ? left : right; - endX = (right > left) ? right : left; - - startY = (top < bottom) ? top : bottom; - endY = (bottom > top) ? bottom : top; - dest[32 * startY + startX] = baseTileNum | 0xE000; + // top left corner + tilemap[32 * startY + startX] = baseTileNum | (STD_WINDOW_PALETTE_NUM << 12); + // top border for (x = startX + 1; x < endX; x++) - dest[32 * startY + x] = (baseTileNum + 1) | 0xE000; + tilemap[32 * startY + x] = (baseTileNum + 1) | (STD_WINDOW_PALETTE_NUM << 12); - dest[32 * startY + endX] = (baseTileNum + 2) | 0xE000; + // top right corner + tilemap[32 * startY + endX] = (baseTileNum + 2) | (STD_WINDOW_PALETTE_NUM << 12); for (y = startY + 1; y < endY; y++) { - dest[32 * y + startX] = (baseTileNum + 3) | 0xE000; + // left border + tilemap[32 * y + startX] = (baseTileNum + 3) | (STD_WINDOW_PALETTE_NUM << 12); + // middle for (x = startX + 1; x < endX; x++) - dest[32 * y + x] = (baseTileNum + 4) | 0xE000; + tilemap[32 * y + x] = (baseTileNum + 4) | (STD_WINDOW_PALETTE_NUM << 12); - dest[32 * y + endX] = (baseTileNum + 5) | 0xE000; + // right border + tilemap[32 * y + endX] = (baseTileNum + 5) | (STD_WINDOW_PALETTE_NUM << 12); } - dest[32 * endY + startX] = (baseTileNum + 6) | 0xE000; + // bottom left corner + tilemap[32 * endY + startX] = (baseTileNum + 6) | (STD_WINDOW_PALETTE_NUM << 12); + // bottom border for (x = startX + 1; x < endX; x++) - dest[32 * endY + x] = (baseTileNum + 7) | 0xE000; + tilemap[32 * endY + x] = (baseTileNum + 7) | (STD_WINDOW_PALETTE_NUM << 12); - dest[32 * endY + endX] = (baseTileNum + 8) | 0xE000; + // bottom right corner + tilemap[32 * endY + endX] = (baseTileNum + 8) | (STD_WINDOW_PALETTE_NUM << 12); } -u16 SetMessageBoxBaseTileNum(u16 baseTileNum) +u16 TextWindow_SetDlgFrameBaseTileNum(u16 baseTileNum) { - sMessageBoxBaseTileNum = baseTileNum; + sDialogueFrameBaseTileNum = baseTileNum; return baseTileNum + 14; } void unref_sub_80651DC(struct Window *win, u8 *text) { - sub_8002EB0(win, text, sMessageBoxBaseTileNum + 14, 2, 15); + Text_InitWindow8002EB0(win, text, sDialogueFrameBaseTileNum + 14, 2, 15); } -void DisplayMessageBox(struct Window *win) +// Loads and draws a dialogue window frame +void TextWindow_DisplayDialogueFrame(struct Window *win) { - LoadMessageBoxTiles(win); - DrawStandardMessageBox(win); + TextWindow_LoadDialogueFrameTiles(win); + TextWindow_DrawDialogueFrame(win); } -static u16 GetMessageBoxTilemapEntry(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height) +static u16 GetDialogueFrameTilemapEntry(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height) { u16 tilemapEntry = 9; @@ -215,42 +229,47 @@ static u16 GetMessageBoxTilemapEntry(u16 baseTilemapEntry, u8 x, u8 y, u8 width, else if (x > 2) x = 3; - if (x <= 6 && y <= 4) - tilemapEntry = gMessageBoxTilemap[y][x]; + if (x < 7 && y < 5) + tilemapEntry = sDialogueFrameTilemap[y][x]; tilemapEntry += baseTilemapEntry; return tilemapEntry; } -static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 height) +static void DrawDialogueFrame(struct Window *win, u8 left, u8 top, u8 width, u8 height) { - u8 i, j; - u16 tilemapEntry = (win->paletteNum << 12) | sMessageBoxBaseTileNum; - u16 *tilemap = win->config->tilemap; + u8 x, y; + u16 baseTilemapEntry = (win->paletteNum << 12) | sDialogueFrameBaseTileNum; + u16 *tilemap = win->template->tilemap; - for (i = 0; i < height + 2; i++) - for (j = 0; j < width + 6; j++) - tilemap[(left + j) + 32 * (top + i)] = (win->paletteNum << 12) | GetMessageBoxTilemapEntry(tilemapEntry, j, i, width, height); + for (y = 0; y < height + 2; y++) + { + for (x = 0; x < width + 6; x++) + tilemap[(left + x) + 32 * (top + y)] = (win->paletteNum << 12) | GetDialogueFrameTilemapEntry(baseTilemapEntry, x, y, width, height); + } } -void DrawStandardMessageBox(struct Window *win) +// Draws an alternate styled frame used for dialogue windows that appear on the overworld +void TextWindow_DrawDialogueFrame(struct Window *win) { - DrawMessageBox(win, STD_MSG_BOX_LEFT, STD_MSG_BOX_TOP, STD_MSG_BOX_WIDTH, STD_MSG_BOX_HEIGHT); + DrawDialogueFrame(win, STD_DLG_FRAME_LEFT, STD_DLG_FRAME_TOP, STD_DLG_FRAME_WIDTH, STD_DLG_FRAME_HEIGHT); } -void LoadMessageBoxTiles(struct Window *win) +// Loads the dialogue window frame tiles into VRAM +void TextWindow_LoadDialogueFrameTiles(struct Window *win) { - u8 *tileData = win->config->tileData; - CpuFastCopy(gMessageBox_Gfx, tileData + 32 * sMessageBoxBaseTileNum, 14 * TILE_SIZE_4BPP); + u8 *tileData = win->template->tileData; + CpuFastCopy(gDialogueFrame_Gfx, tileData + 32 * sDialogueFrameBaseTileNum, 14 * TILE_SIZE_4BPP); } -void ClearStandardMessageBox(struct Window *win) +// Erases a dialogue window frame +void TextWindow_EraseDialogueFrame(struct Window *win) { u8 i; - u16 *tilemap = win->config->tilemap + (STD_MSG_BOX_TOP * 32); + u16 *tilemap = win->template->tilemap + (STD_DLG_FRAME_TOP * 32); u16 tilemapEntry = win->paletteNum << 12; - for (i = 0; i < ((STD_MSG_BOX_HEIGHT + 2) * 32); i++) + for (i = 0; i < ((STD_DLG_FRAME_HEIGHT + 2) * 32); i++) tilemap[i] = tilemapEntry; } diff --git a/src/engine/trade.c b/src/engine/trade.c index 0bc589ff4..d37b36f72 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -141,7 +141,7 @@ struct TradeEwramStruct { }; static void sub_8047EC0(void); -static void sub_804AFB8(const struct WindowConfig *, u8 *, const u8 *, u8); +static void sub_804AFB8(const struct WindowTemplate *, u8 *, const u8 *, u8); static void sub_804ACD8(const u8 *, u8 *, u8); static void nullsub_5(u8, u8); static void sub_804AA88(void); @@ -1089,10 +1089,10 @@ static void sub_8047EC0(void) SetVBlankCallback(sub_80489F4); InitMenuWindow(&gWindowConfig_81E6CE4); SetUpWindowConfig(&gWindowConfig_81E6F84); - InitWindowFromConfig(&gUnknown_03004824->window, &gWindowConfig_81E6F84); - gUnknown_03004824->unk_007a = SetTextWindowBaseTileNum(20); - LoadTextWindowGraphics(&gUnknown_03004824->window); - MenuZeroFillScreen(); + Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84); + gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20); + TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window); + Menu_EraseScreen(); sub_809D51C(); gUnknown_03004824->unk_0075 = 0; gUnknown_03004824->unk_007b = 0; @@ -1269,10 +1269,10 @@ static void sub_80484F4(void) SetVBlankCallback(sub_80489F4); InitMenuWindow(&gWindowConfig_81E6CE4); SetUpWindowConfig(&gWindowConfig_81E6F84); - InitWindowFromConfig(&gUnknown_03004824->window, &gWindowConfig_81E6F84); - gUnknown_03004824->unk_007a = SetTextWindowBaseTileNum(20); - LoadTextWindowGraphics(&gUnknown_03004824->window); - MenuZeroFillScreen(); + Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84); + gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20); + TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window); + Menu_EraseScreen(); sub_809D51C(); gUnknown_03004824->unk_0075 = 0; gUnknown_03004824->unk_007b = 0; @@ -2096,7 +2096,7 @@ static void sub_8049680(void) PlaySE(SE_SELECT); if (gUnknown_03004824->tradeMenuCursorPosition < PARTY_SIZE) { - DrawTextWindow(&gUnknown_03004824->window, 18, 14, 28, 19); + TextWindow_DrawStdFrame(&gUnknown_03004824->window, 18, 14, 28, 19); PrintMenuItems(19, 15, 2, (const struct MenuAction *)gUnknown_0820C320); InitMenu(0, 19, 15, 2, 0, 9); gUnknown_03004824->unk_007b = 1; @@ -2108,7 +2108,7 @@ static void sub_8049680(void) } else if (gUnknown_03004824->tradeMenuCursorPosition == 2 * PARTY_SIZE) { - DrawTextWindow(&gUnknown_03004824->window, 24, 14, 29, 19); + TextWindow_DrawStdFrame(&gUnknown_03004824->window, 24, 14, 29, 19); InitYesNoMenu(24, 14, 4); gUnknown_03004824->unk_007b = 4; sub_804ACD8(gUnknown_0820C14C[4], BG_CHAR_ADDR(4) + 32 * gUnknown_03004824->unk_007e, 20); @@ -2138,17 +2138,17 @@ static void sub_8049860(void) if (gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - gUnknown_03004824->unk_007c = MoveMenuCursor(-1); + gUnknown_03004824->unk_007c = Menu_MoveCursor(-1); } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - gUnknown_03004824->unk_007c = MoveMenuCursor(+1); + gUnknown_03004824->unk_007c = Menu_MoveCursor(+1); } if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if (GetMenuCursorPos() == 0) + if (Menu_GetCursorPos() == 0) { BeginNormalPaletteFade(-1, 0, 0, 16, 0); gUnknown_03004824->unk_007b = 2; @@ -2239,17 +2239,17 @@ static void sub_8049AC0(void) if (gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - gUnknown_03004824->unk_007c = MoveMenuCursor(-1); + gUnknown_03004824->unk_007c = Menu_MoveCursor(-1); } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - gUnknown_03004824->unk_007c = MoveMenuCursor(+1); + gUnknown_03004824->unk_007c = Menu_MoveCursor(+1); } if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if (GetMenuCursorPos() == 0) + if (Menu_GetCursorPos() == 0) { sub_8049A20(); } @@ -2267,9 +2267,9 @@ static void sub_8049AC0(void) else if (gMain.newKeys & B_BUTTON) { sub_804AADC(3, 1); - if (GetMenuCursorPos() == 0) + if (Menu_GetCursorPos() == 0) { - gUnknown_03004824->unk_007c = MoveMenuCursor(+1); + gUnknown_03004824->unk_007c = Menu_MoveCursor(+1); } gUnknown_03004824->linkData[0] = 0xbbcc; Trade_SendData(gUnknown_03004824); @@ -2282,17 +2282,17 @@ static void sub_8049BC0(void) if (gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - gUnknown_03004824->unk_007c = MoveMenuCursor(-1); + gUnknown_03004824->unk_007c = Menu_MoveCursor(-1); } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - gUnknown_03004824->unk_007c = MoveMenuCursor(+1); + gUnknown_03004824->unk_007c = Menu_MoveCursor(+1); } if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - if (GetMenuCursorPos() == 0) + if (Menu_GetCursorPos() == 0) { sub_804AA0C(4); gUnknown_03004824->linkData[0] = 0xeeaa; @@ -2337,7 +2337,7 @@ static void DisplayMessageAndContinueTask(void) gUnknown_03004824->unk_00b4++; if (gUnknown_03004824->unk_00b4 > 120) { - DrawTextWindow(&gUnknown_03004824->window, 24, 14, 29, 19); + TextWindow_DrawStdFrame(&gUnknown_03004824->window, 24, 14, 29, 19); InitYesNoMenu(24, 14, 4); gUnknown_03004824->unk_00b4 = 0; gUnknown_03004824->unk_007b = 3; @@ -2491,10 +2491,10 @@ static void sub_8049ED4(u8 a0) string1[3] = 0xFC; string1[4] = 0x11; string1[5] = (64 - stringLength) / 2; - sub_8003460(&gUnknown_03004824->window, string1, gUnknown_03004824->unk_007a + whichParty * 6 * 32, gUnknown_0820C334[whichParty][0], gUnknown_0820C334[whichParty][1]); + Text_InitWindowAndPrintText(&gUnknown_03004824->window, string1, gUnknown_03004824->unk_007a + whichParty * 6 * 32, gUnknown_0820C334[whichParty][0], gUnknown_0820C334[whichParty][1]); sub_804A33C(string2, whichParty, whichPokemon); - sub_8003460(&gUnknown_03004824->window, gOtherText_Terminator2, gUnknown_03004824->unk_007a + whichParty * 6 * 32 + 32, gUnknown_0820C334[whichParty + 1][0], gUnknown_0820C334[whichParty + 1][1] + 1); - sub_8003460(&gUnknown_03004824->window, string2, gUnknown_03004824->unk_007a + whichParty * 6 * 32 + 38, gUnknown_0820C334[whichParty + 1][0], gUnknown_0820C334[whichParty + 1][1] + 1); + Text_InitWindowAndPrintText(&gUnknown_03004824->window, gOtherText_Terminator2, gUnknown_03004824->unk_007a + whichParty * 6 * 32 + 32, gUnknown_0820C334[whichParty + 1][0], gUnknown_0820C334[whichParty + 1][1] + 1); + Text_InitWindowAndPrintText(&gUnknown_03004824->window, string2, gUnknown_03004824->unk_007a + whichParty * 6 * 32 + 38, gUnknown_0820C334[whichParty + 1][0], gUnknown_0820C334[whichParty + 1][1] + 1); gUnknown_03004824->unk_0080[a0] ++; break; case 4: @@ -2884,7 +2884,7 @@ static void sub_8049ED4(u8 a0) "\tldrb r1, [r1]\n" "\tstr r1, [sp]\n" "\tadd r1, sp, 0xC\n" - "\tbl sub_8003460\n" + "\tbl Text_InitWindowAndPrintText\n" "\tadd r7, sp, 0x34\n" "\tadds r0, r7, 0\n" "\tldr r1, [sp, 0x6C]\n" @@ -2910,7 +2910,7 @@ static void sub_8049ED4(u8 a0) "\tlsrs r4, 24\n" "\tstr r4, [sp]\n" "\tadds r3, r5, 0\n" - "\tbl sub_8003460\n" + "\tbl Text_InitWindowAndPrintText\n" "\tldr r0, _0804A22C @ =gUnknown_03004824\n" "\tldr r1, [r0]\n" "\tadds r0, r1, 0x4\n" @@ -2921,7 +2921,7 @@ static void sub_8049ED4(u8 a0) "\tstr r4, [sp]\n" "\tadds r1, r7, 0\n" "\tadds r3, r5, 0\n" - "\tbl sub_8003460\n" + "\tbl Text_InitWindowAndPrintText\n" "\tldr r2, _0804A22C @ =gUnknown_03004824\n" "\tldr r1, [r2]\n" "\tb _0804A28A\n" @@ -3010,7 +3010,7 @@ u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon) GetMonGender(&gEnemyParty[whichPokemon]); GetMonData(&gEnemyParty[whichPokemon], MON_DATA_LEVEL); } - return GetStringWidthGivenWindowConfig(&gWindowConfig_81E7294, a0); + return Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, a0); } #ifdef NONMATCHING @@ -3067,8 +3067,8 @@ static void sub_804A41C(u8 whichParty) GetMonData(pokemon, MON_DATA_NICKNAME, nickname); StringCopy10(string + 6, nickname); GetMonGender(pokemon); - string[5] = (50 - GetStringWidthGivenWindowConfig(&gWindowConfig_81E7294, string + 6)) / 2; - sub_8003460(&gUnknown_03004824->window, string, gUnknown_03004824->unk_007a + 22 * 6 * whichParty + 22 * i, gTradeMonSpriteCoords[i + 6 * whichParty][0], gTradeMonSpriteCoords[i + 6 * whichParty][1]); + string[5] = (50 - Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, string + 6)) / 2; + Text_InitWindowAndPrintText(&gUnknown_03004824->window, string, gUnknown_03004824->unk_007a + 22 * 6 * whichParty + 22 * i, gTradeMonSpriteCoords[i + 6 * whichParty][0], gTradeMonSpriteCoords[i + 6 * whichParty][1]); } } #else @@ -3142,7 +3142,7 @@ static void sub_804A41C(u8 whichParty) "\tmov r1, sp\n" "\tadds r1, 0x22\n" "\tldr r0, _0804A518 @ =gWindowConfig_81E7294\n" - "\tbl GetStringWidthGivenWindowConfig\n" + "\tbl Text_GetStringWidthFromWindowTemplate\n" "\tlsls r0, 24\n" "\tlsrs r0, 24\n" "\tmovs r1, 0x32\n" @@ -3177,7 +3177,7 @@ static void sub_804A41C(u8 whichParty) "\tldrb r1, [r1]\n" "\tstr r1, [sp]\n" "\tmov r1, r8\n" - "\tbl sub_8003460\n" + "\tbl Text_InitWindowAndPrintText\n" "\tadds r0, r6, 0x1\n" "\tlsls r0, 24\n" "\tlsrs r6, r0, 24\n" @@ -3413,18 +3413,18 @@ static void sub_804A96C_alt(struct UnkStructD *arg0, u8 left, u8 top, const u16 static void sub_804A9F4(u8 unused) { - MenuZeroFillScreen(); + Menu_EraseScreen(); } static void sub_804AA00(u8 unused) { - MenuZeroFillScreen(); + Menu_EraseScreen(); } static void sub_804AA0C(u8 a0) { - DrawTextWindow(&gUnknown_03004824->window, gTradeMessageWindowRects[a0][0], gTradeMessageWindowRects[a0][1], gTradeMessageWindowRects[a0][2], gTradeMessageWindowRects[a0][3]); - sub_8003460(&gUnknown_03004824->window, gUnknown_0820C2F0[a0], 0x180 + gUnknown_03004824->unk_007a, gTradeMessageWindowRects[a0][0] + 1, gTradeMessageWindowRects[a0][1] + 1); + TextWindow_DrawStdFrame(&gUnknown_03004824->window, gTradeMessageWindowRects[a0][0], gTradeMessageWindowRects[a0][1], gTradeMessageWindowRects[a0][2], gTradeMessageWindowRects[a0][3]); + Text_InitWindowAndPrintText(&gUnknown_03004824->window, gUnknown_0820C2F0[a0], 0x180 + gUnknown_03004824->unk_007a, gTradeMessageWindowRects[a0][0] + 1, gTradeMessageWindowRects[a0][1] + 1); } static void sub_804AA88(void) @@ -3798,7 +3798,7 @@ static void sub_804AF84(void) gSaveBlock1.giftRibbons[i] = gUnknown_03004824->unk_00b5[i]; } -static void sub_804AFB8(const struct WindowConfig *windowConfig, u8 *dest, const u8 *src, u8 size) +static void sub_804AFB8(const struct WindowTemplate *windowConfig, u8 *dest, const u8 *src, u8 size) { u8 i; u8 *tileBuffer; @@ -4029,10 +4029,10 @@ static void sub_804B41C(void) SetVBlankCallback(sub_804B210); sub_804B228(); SetUpWindowConfig(&gWindowConfig_81E6F84); - InitWindowFromConfig(&gUnknown_03004828->window, &gWindowConfig_81E6F84); - gUnknown_03004828->textWindowBaseTileNum = SetTextWindowBaseTileNum(2); - LoadTextWindowGraphics(&gUnknown_03004828->window); - MenuZeroFillScreen(); + Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E6F84); + gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2); + TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); + Menu_EraseScreen(); gLinkType = 0x1144; gMain.state ++; LZDecompressVram(gUnknown_08D00000, (void *)VRAM); @@ -4188,16 +4188,16 @@ static __attribute__((naked)) void sub_804B41C(void) "\tldr r0, [r6]\n" "\tadds r0, 0x4\n" "\tadds r1, r4, 0\n" - "\tbl InitWindowFromConfig\n" + "\tbl Text_InitWindowWithTemplate\n" "\tmovs r0, 0x2\n" - "\tbl SetTextWindowBaseTileNum\n" + "\tbl TextWindow_SetBaseTileNum\n" "\tldr r1, [r6]\n" "\tadds r1, 0x34\n" "\tstrb r0, [r1]\n" "\tldr r0, [r6]\n" "\tadds r0, 0x4\n" - "\tbl LoadTextWindowGraphics\n" - "\tbl MenuZeroFillScreen\n" + "\tbl TextWindow_LoadStdFrameGraphics\n" + "\tbl Menu_EraseScreen\n" "\tldr r1, _0804B580 @ =gLinkType\n" "\tldr r4, _0804B584 @ =0x00001144\n" "\tadds r0, r4, 0\n" @@ -4532,10 +4532,10 @@ static void sub_804B790(void) SetVBlankCallback(sub_804B210); sub_804B228(); SetUpWindowConfig(&gWindowConfig_81E717C); - InitWindowFromConfig(&gUnknown_03004828->window, &gWindowConfig_81E717C); - gUnknown_03004828->textWindowBaseTileNum = SetTextWindowBaseTileNum(2); - LoadTextWindowGraphics(&gUnknown_03004828->window); - MenuZeroFillScreen(); + Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E717C); + gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2); + TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); + Menu_EraseScreen(); gLinkType = 0x1144; gUnknown_03004828->isLinkTrade = FALSE; gUnknown_03004828->unk_00b6 = 0; @@ -4733,7 +4733,7 @@ static void sub_804BBE8(u8 a0) for (i = 0; i < 0x280; i ++) buffer[i] |= 0x7000; DmaCopy16Defvars(3, gSharedMem, BG_SCREEN_ADDR(5), 0x500); - MenuZeroFillWindowRect(2, 15, 27, 18); + Menu_EraseWindowRect(2, 15, 27, 18); break; case 6: REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; @@ -4843,7 +4843,7 @@ static bool8 sub_804C29C(void) case 10: StringExpandPlaceholders(gStringVar4, gTradeText_WillBeSent); - sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gUnknown_03004828->unk_00c4 = 11; gUnknown_03004828->unk_00c0 = 0; break; @@ -4854,11 +4854,11 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_00c4 ++; ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gTradeText_ByeBye); - sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); } break; case 12: - if (gSprites[gUnknown_03004828->unk_0102].callback == SpriteCallbackDummy && sub_80035AC(&gUnknown_03004828->window) == TRUE) + if (gSprites[gUnknown_03004828->unk_0102].callback == SpriteCallbackDummy && Text_UpdateWindow(&gUnknown_03004828->window) == TRUE) { gUnknown_03004828->unk_0103 = CreateSprite(&gSpriteTemplate_821595C, 0x78, 0x20, 0); gSprites[gUnknown_03004828->unk_0103].callback = sub_804D738; @@ -5201,7 +5201,7 @@ static bool8 sub_804C29C(void) REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gTradeText_SentOverPoke); - sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gUnknown_03004828->unk_00c4 ++; gUnknown_03004828->unk_00c0 = 0; break; @@ -5215,7 +5215,7 @@ static bool8 sub_804C29C(void) gUnknown_03004828->unk_00c4 ++; ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gTradeText_TakeGoodCare); - sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gUnknown_03004828->unk_00c0 = 0; } break; @@ -5538,7 +5538,7 @@ static void sub_804DC88(void) gMain.state ++; ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gOtherText_LinkStandby2); - sub_8003460(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); break; case 1: sub_80084A4(); @@ -5565,7 +5565,7 @@ static void sub_804DC88(void) case 2: gMain.state = 50; ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); - sub_8003460(&gUnknown_03004828->window, gSystemText_Saving, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindowAndPrintText(&gUnknown_03004828->window, gSystemText_Saving, gUnknown_03004828->textWindowBaseTileNum, 2, 15); break; case 50: SetSecretBase2Field_9_AndHideBG(); diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index ffa4cbd08..da9dd7179 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -700,7 +700,7 @@ static void sub_80939DC(u8 taskId) task->data[TD_0] ^= TRUE; } TrainerCard_Front_PrintPlayTime(buffer, task->data[TD_0]); - MenuPrint(buffer, 10, 12); + Menu_PrintText(buffer, 10, 12); } static void sub_8093A28(void) @@ -1130,7 +1130,7 @@ static void sub_8093DAC(void) static void sub_8093DC8(void) { - MenuZeroFillScreen(); + Menu_EraseScreen(); sub_80940E4(); sub_8093F14(); sub_8093F80(); @@ -1141,7 +1141,7 @@ static void sub_8093DC8(void) static void sub_8093DEC(void) { - MenuZeroFillScreen(); + Menu_EraseScreen(); sub_80940E4(); sub_8093F48(); sub_8094188(); @@ -1322,7 +1322,7 @@ static void sub_8094140(void) buffer = gStringVar1; StringCopy(buffer, ewram0_2.var_64.playerName); ConvertInternationalString(buffer, ewram0_2.language); - MenuPrint(buffer, 7, 5); + Menu_PrintText(buffer, 7, 5); TrainerCard_Front_PrintTrainerID(); TrainerCard_Front_PrintMoney(); @@ -1355,7 +1355,7 @@ static void TrainerCard_Front_PrintTrainerID(void) u8 buffer[8]; ConvertIntToDecimalStringN(buffer, ewram0_2.var_64.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5); - MenuPrint(buffer, 20, 2); + Menu_PrintText(buffer, 20, 2); } static void TrainerCard_Front_PrintMoney(void) @@ -1406,14 +1406,14 @@ static void sub_809429C(void) str[0] = 00; str++; str = StringCopy(str, ewram0_2.var_20[1]); - MenuPrint(gStringVar1, 2, 14); + Menu_PrintText(gStringVar1, 2, 14); str = gStringVar1; str = StringCopy(str, ewram0_2.var_20[2]); str[0] = 00; str++; str = StringCopy(str, ewram0_2.var_20[3]); - MenuPrint(gStringVar1, 2, 16); + Menu_PrintText(gStringVar1, 2, 16); } } @@ -1437,7 +1437,7 @@ static void TrainerCard_Back_PrintName(void) static void TrainerCard_Back_PrintHallOfFameTime_Label(void) { if (ewram0_2.var_8 != 0) - MenuPrint(gOtherText_FirstHOF, 3, 5); + Menu_PrintText(gOtherText_FirstHOF, 3, 5); } static void TrainerCard_Back_PrintHallOfFameTime(void) @@ -1459,7 +1459,7 @@ static void TrainerCard_Back_PrintHallOfFameTime(void) static void TrainerCard_Back_PrintLinkBattlesLabel(void) { if (ewram0_2.var_9 != 0) - MenuPrint(gOtherText_LinkCableBattles, 3, 7); + Menu_PrintText(gOtherText_LinkCableBattles, 3, 7); } static void TrainerCard_Back_PrintLinkBattles(void) @@ -1479,7 +1479,7 @@ static void TrainerCard_Back_PrintLinkBattles(void) static void TrainerCard_Back_PrintBattleTower_Label(void) { if (ewram0_2.var_a != 0) - MenuPrint(gOtherText_BattleTowerWinRecord, 3, 15); + Menu_PrintText(gOtherText_BattleTowerWinRecord, 3, 15); } static void TrainerCard_Back_PrintBattleTower(void) @@ -1499,7 +1499,7 @@ static void TrainerCard_Back_PrintBattleTower(void) static void TrainerCard_Back_PrintLinkContests_Label(void) { if (ewram0_2.var_b != 0) - MenuPrint(gOtherText_ContestRecord, 3, 13); + Menu_PrintText(gOtherText_ContestRecord, 3, 13); } static void TrainerCard_Back_PrintLinkContests(void) @@ -1516,7 +1516,7 @@ static void TrainerCard_Back_PrintLinkContests(void) static void TrainerCard_Back_PrintLinkPokeblocks_Label(void) { if (ewram0_2.var_c != 0) - MenuPrint(gOtherText_MixingRecord, 3, 11); + Menu_PrintText(gOtherText_MixingRecord, 3, 11); } static void TrainerCard_Back_PrintLinkPokeblocks(void) @@ -1533,7 +1533,7 @@ static void TrainerCard_Back_PrintLinkPokeblocks(void) static void TrainerCard_Back_PrintPokemonTrades_Label(void) { if (ewram0_2.var_d != 0) - MenuPrint(gOtherText_TradeRecord, 3, 9); + Menu_PrintText(gOtherText_TradeRecord, 3, 9); } static void TrainerCard_Back_PrintPokemonTrades(void) @@ -1553,5 +1553,5 @@ void unref_sub_8094588(u16 left, u16 top) if (gSaveBlock2.playerGender == FEMALE) text = gOtherText_Girl; - MenuPrint(text, left, top); + Menu_PrintText(text, left, top); } diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index 960a163c1..f57face11 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -280,18 +280,18 @@ static void sub_81464E4(void) berryInfo = GetBerryInfo(gSpecialVar_ItemId + OFFSET_7B + 1); ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_ItemId - FIRST_BERRY + 1, STR_CONV_MODE_LEADING_ZEROS, 2); - MenuPrint(gStringVar1, 12, 4); + Menu_PrintText(gStringVar1, 12, 4); #if ENGLISH - MenuPrint(berryInfo->name, 14, 4); + Menu_PrintText(berryInfo->name, 14, 4); #elif GERMAN StringCopy(buffer, berryInfo->name); StringAppend(buffer, gOtherText_Berry2); - MenuPrint(buffer, 14, 4); + Menu_PrintText(buffer, 14, 4); #endif - MenuPrint(berryInfo->description1, 4, 14); - MenuPrint(berryInfo->description2, 4, 16); + Menu_PrintText(berryInfo->description1, 4, 14); + Menu_PrintText(berryInfo->description2, 4, 16); #ifdef UNITS_IMPERIAL size = (berryInfo->size * 1000) / 254; @@ -301,7 +301,7 @@ static void sub_81464E4(void) sizeMajor = size / 100; #endif - MenuPrint(gOtherText_Size, 11, 7); + Menu_PrintText(gOtherText_Size, 11, 7); if (berryInfo->size != 0) { #ifdef UNITS_IMPERIAL @@ -311,18 +311,18 @@ static void sub_81464E4(void) ConvertIntToDecimalStringN(gStringVar1, berryInfo->size / 10, STR_CONV_MODE_LEFT_ALIGN, 2); ConvertIntToDecimalStringN(gStringVar2, berryInfo->size % 10, STR_CONV_MODE_LEFT_ALIGN, 2); #endif - MenuPrint(gContestStatsText_Unknown1, 16, 7); + Menu_PrintText(gContestStatsText_Unknown1, 16, 7); } else { - MenuPrint(gOtherText_ThreeQuestions2, 16, 7); + Menu_PrintText(gOtherText_ThreeQuestions2, 16, 7); } - MenuPrint(gOtherText_Firm, 11, 9); + Menu_PrintText(gOtherText_Firm, 11, 9); if (berryInfo->firmness != 0) - MenuPrint(gUnknown_0841192C[berryInfo->firmness - 1], 16, 9); + Menu_PrintText(gUnknown_0841192C[berryInfo->firmness - 1], 16, 9); else - MenuPrint(gOtherText_ThreeQuestions2, 16, 9); + Menu_PrintText(gOtherText_ThreeQuestions2, 16, 9); } static void sub_8146600(u8 berry) @@ -445,7 +445,7 @@ static void sub_8146810(s8 berry) static void sub_81468BC(void) { - MenuZeroFillWindowRect(0, 4, 29, 19); + Menu_EraseWindowRect(0, 4, 29, 19); sub_81464E4(); // center of berry sprite diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c index 0d304714d..f11fb5fb3 100644 --- a/src/field/braille_puzzles.c +++ b/src/field/braille_puzzles.c @@ -161,7 +161,7 @@ void Task_BrailleWait(u8 taskId) case 1: if (BrailleWait_CheckButtonPress() != FALSE) { - MenuZeroFillScreen(); + Menu_EraseScreen(); PlaySE(SE_SELECT); data[0] = 2; } @@ -170,7 +170,7 @@ void Task_BrailleWait(u8 taskId) data[1] = data[1] - 1; if (data[1] == 0) { - MenuZeroFillScreen(); + Menu_EraseScreen(); data[0] = 3; data[1] = 30; } diff --git a/src/field/choose_party.c b/src/field/choose_party.c index d278eda4a..6a9c23c66 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -318,19 +318,19 @@ static void sub_812238C(u8 taskId) { if (gMain.newAndRepeatedKeys & 0x40) { - if (GetMenuCursorPos() != 0) + if (Menu_GetCursorPos() != 0) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } return; } if (gMain.newAndRepeatedKeys & 0x80) { - if (GetMenuCursorPos() != 3) + if (Menu_GetCursorPos() != 3) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); } return; } @@ -343,7 +343,7 @@ static void sub_812238C(u8 taskId) gTasks[taskId].data[4], sBattleTowerEntryMenu, sBattleTowerEntryMenuItems, - GetMenuCursorPos()); + Menu_GetCursorPos()); popupMenuFunc(taskId); return; } @@ -461,7 +461,7 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId) } } PlaySE(SE_HAZURE); - MenuZeroFillWindowRect(20, 10, 29, 19); + Menu_EraseWindowRect(20, 10, 29, 19); HandleDestroyMenuCursors(); sub_806D5A4(); sub_806E834(gOtherText_NoMoreThreePoke, 1); @@ -475,7 +475,7 @@ static void sub_8122728(u8 taskId) if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) { - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); HandleDestroyMenuCursors(); BattleTowerEntryMenuCallback_Exit(taskId); } @@ -515,7 +515,7 @@ static void BattleTowerEntryMenuCallback_NoEntry(u8 taskId) static void sub_81227FC(u8 taskId) { - MenuZeroFillWindowRect(20, 10, 29, 19); + Menu_EraseWindowRect(20, 10, 29, 19); HandleDestroyMenuCursors(); PrintPartyMenuPromptText(0, 0); gTasks[taskId].func = HandleBattleTowerPartyMenu; @@ -806,19 +806,19 @@ static void Task_DaycareStorageMenu8122EAC(u8 taskId) { if (gMain.newAndRepeatedKeys & 0x40) { - if (GetMenuCursorPos() != 0) + if (Menu_GetCursorPos() != 0) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } return; } if (gMain.newAndRepeatedKeys & 0x80) { - if (GetMenuCursorPos() != 3) + if (Menu_GetCursorPos() != 3) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); } return; } @@ -831,7 +831,7 @@ static void Task_DaycareStorageMenu8122EAC(u8 taskId) gTasks[taskId].data[4], sDaycareStorageMenus, sDaycareStorageMenuItems, - GetMenuCursorPos()); + Menu_GetCursorPos()); popupMenuFunc(taskId); return; } @@ -896,7 +896,7 @@ static void DaycareStorageMenuCallback_Summary(u8 taskId) static void DaycareStorageMenuCallback_Exit(u8 taskId) { PlaySE(SE_SELECT); - MenuZeroFillWindowRect(20, 10, 29, 19); + Menu_EraseWindowRect(20, 10, 29, 19); HandleDestroyMenuCursors(); PrintPartyMenuPromptText(15, 0); gTasks[taskId].func = HandleDaycarePartyMenu; diff --git a/src/field/coins.c b/src/field/coins.c index 91a4b508d..2c217e635 100644 --- a/src/field/coins.c +++ b/src/field/coins.c @@ -13,13 +13,13 @@ void UpdateCoinsWindow(s32 coins, u8 x, u8 y) void ShowCoinsWindow(u32 coins, u8 x, u8 y) { - MenuDrawTextWindow(x, y, x + 9, y + 3); + Menu_DrawStdWindowFrame(x, y, x + 9, y + 3); UpdateCoinsWindow(coins, x, y); } void HideCoinsWindow(u8 x, u8 y) { - MenuZeroFillWindowRect(x, y, x + 9, y + 3); + Menu_EraseWindowRect(x, y, x + 9, y + 3); } void PrintCoins(s32 coins, u8 b, u8 x, u8 y) @@ -46,7 +46,7 @@ void PrintCoins(s32 coins, u8 b, u8 x, u8 y) ptr[2] = (b - StringLength(string)) * 6; ptr += 3; StringCopy(ptr, string); - MenuPrint(gOtherText_Coins2, x, y); + Menu_PrintText(gOtherText_Coins2, x, y); } u16 GetCoins(void) diff --git a/src/field/daycare.c b/src/field/daycare.c index c28bc65ca..7814a3b24 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -1741,7 +1741,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) if (gTasks[taskId].data[0] != 0) { gTasks[taskId].data[0] --; - MoveMenuCursor(-1); + Menu_MoveCursor(-1); PlaySE(SE_SELECT); } } @@ -1750,7 +1750,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) if (gTasks[taskId].data[0] != 2) { gTasks[taskId].data[0]++; - MoveMenuCursor(+1); + Menu_MoveCursor(+1); PlaySE(SE_SELECT); } } @@ -1760,7 +1760,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) PlaySE(SE_SELECT); gLastFieldPokeMenuOpened = gSpecialVar_Result = gTasks[taskId].data[0]; DestroyTask(taskId); - MenuZeroFillWindowRect(15, 6, 29, 13); + Menu_EraseWindowRect(15, 6, 29, 13); EnableBothScriptContexts(); } else if (gMain.newKeys & B_BUTTON) @@ -1768,7 +1768,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) HandleDestroyMenuCursors(); gLastFieldPokeMenuOpened = gSpecialVar_Result = 2; DestroyTask(taskId); - MenuZeroFillWindowRect(15, 6, 29, 13); + Menu_EraseWindowRect(15, 6, 29, 13); EnableBothScriptContexts(); } } @@ -1776,9 +1776,9 @@ static void HandleDaycareLevelMenuInput(u8 taskId) void ShowDaycareLevelMenu(void) { u8 buffer[100]; - MenuDrawTextWindow(15, 6, 29, 13); + Menu_DrawStdWindowFrame(15, 6, 29, 13); GetDaycareLevelMenuText(&gSaveBlock1.daycare, buffer); - MenuPrint(buffer, 16, 7); + Menu_PrintText(buffer, 16, 7); GetDaycareLevelMenuLevelText(&gSaveBlock1.daycare, buffer); MenuPrint_PixelCoords(buffer, 0xce, 0x38, TRUE); InitMenu(0, 16, 7, 3, 0, 13); diff --git a/src/field/decoration.c b/src/field/decoration.c index 87a9d8028..a91b2e37b 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -1433,7 +1433,7 @@ extern u8 gUnknown_0815F399[]; void sub_80FE1DC(void) { sub_80FE2B4(); - MenuDrawTextWindow(0, 0, 10, 9); + Menu_DrawStdWindowFrame(0, 0, 10, 9); PrintMenuItems(1, 1, 4, (const struct MenuAction *)gUnknown_083EC604); InitMenu(0, 1, 1, 4, gUnknown_020388D4, 9); } @@ -1487,13 +1487,13 @@ void Task_DecorationPCProcessMenuInput(u8 taskId) if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); - gUnknown_020388D4 = MoveMenuCursor(-1); + gUnknown_020388D4 = Menu_MoveCursor(-1); sub_80FE394(); } if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - gUnknown_020388D4 = MoveMenuCursor(1); + gUnknown_020388D4 = Menu_MoveCursor(1); sub_80FE394(); } if (gMain.newKeys & A_BUTTON) @@ -1510,15 +1510,15 @@ void Task_DecorationPCProcessMenuInput(u8 taskId) void sub_80FE394(void) { - MenuFillWindowRectWithBlankTile(2, 15, 27, 18); - MenuPrint(gUnknown_083EC624[gUnknown_020388D4], 2, 15); + Menu_BlankWindowRect(2, 15, 27, 18); + Menu_PrintText(gUnknown_083EC624[gUnknown_020388D4], 2, 15); } void gpu_pal_decompress_alloc_tag_and_upload(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 10, 9); - MenuFillWindowRectWithBlankTile(2, 15, 27, 18); + Menu_EraseWindowRect(0, 0, 10, 9); + Menu_BlankWindowRect(2, 15, 27, 18); FreeSpritePaletteByTag(6); if (ewram_1f000.isPlayerRoom == 0) { @@ -1561,13 +1561,13 @@ void sub_80FE470(u8 decoCat, u8 left, u8 top, u8 palIdx) // PrintDecorationCateg strptr[1] = 5; strptr[2] = v0; strptr[3] = EOS; - MenuPrint(gStringVar4, left, top); + Menu_PrintText(gStringVar4, left, top); } void sub_80FE528(u8 taskId) // PrintDecorationCategorySelectionMenuStrings { u8 decoCat; - MenuDrawTextWindow(0, 0, 14, 19); + Menu_DrawStdWindowFrame(0, 0, 14, 19); for (decoCat=0; decoCat<8; decoCat++) { if (ewram_1f000.isPlayerRoom == 1 && gTasks[taskId].data[11] == 0 && decoCat != DECORCAT_DOLL && decoCat != DECORCAT_CUSHION) @@ -1578,13 +1578,13 @@ void sub_80FE528(u8 taskId) // PrintDecorationCategorySelectionMenuStrings sub_80FE470(decoCat, 1, 2 * decoCat + 1, 255); // Unselectable } } - MenuPrint(gUnknownText_Exit, 1, 17); + Menu_PrintText(gUnknownText_Exit, 1, 17); } void sub_80FE5AC(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_80FE528(taskId); InitMenu(0, 1, 1, 9, gUnknown_020388F6, 13); gTasks[taskId].func = sub_80FE604; @@ -1597,15 +1597,15 @@ void sub_80FE604(u8 taskId) if (gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - gUnknown_020388F6 = GetMenuCursorPos(); + gUnknown_020388F6 = Menu_GetCursorPos(); if (gUnknown_020388F6 != 8) { gUnknown_020388D5 = sub_8134194(gUnknown_020388F6); @@ -1621,7 +1621,7 @@ void sub_80FE604(u8 taskId) } else { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 14, 19); + Menu_EraseWindowRect(0, 0, 14, 19); DisplayItemMessageOnField(taskId, gSecretBaseText_NoDecors, sub_80FE418, 0); } } else @@ -1650,11 +1650,11 @@ void sub_80FE728(u8 taskId) void sub_80FE758(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 14, 19); + Menu_EraseWindowRect(0, 0, 14, 19); if (gTasks[taskId].data[11] != 2) { sub_80FE1DC(); - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); sub_80FE394(); gTasks[taskId].func = Task_DecorationPCProcessMenuInput; } else @@ -1678,17 +1678,17 @@ void sub_80FE7D4(u8 *dest, u8 decClass) void sub_80FE7EC(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_80FEC94(taskId); sub_80FECB8(gUnknown_020388F6); #if ENGLISH - MenuDrawTextWindow(15, 12, 29, 19); + Menu_DrawStdWindowFrame(15, 12, 29, 19); #elif GERMAN if ((gUnknown_020388F2 + gUnknown_020388F4) != gUnknown_020388D5) { - MenuDrawTextWindow(15, 12, 29, 19); + Menu_DrawStdWindowFrame(15, 12, 29, 19); } #endif @@ -1710,7 +1710,7 @@ void sub_80FE894(u8 taskId /*r8*/, s8 cursorVector /*r5*/, s8 bgVector /*r7*/) PlaySE(SE_SELECT); if (cursorVector != 0) { - gUnknown_020388F2 = MoveMenuCursor(cursorVector); + gUnknown_020388F2 = Menu_MoveCursor(cursorVector); } if (bgVector != 0) { @@ -1722,12 +1722,12 @@ void sub_80FE894(u8 taskId /*r8*/, s8 cursorVector /*r5*/, s8 bgVector /*r7*/) { if (v0) { - MenuDrawTextWindow(15, 12, 29, 19); + Menu_DrawStdWindowFrame(15, 12, 29, 19); } sub_80FECE0(gUnknown_020388F2 + gUnknown_020388F4); } else { - MenuZeroFillWindowRect(15, 12, 29, 19); + Menu_EraseWindowRect(15, 12, 29, 19); } } @@ -1839,13 +1839,13 @@ void sub_80FEABC(u8 taskId, u8 dummy1) void sub_80FEC94(u8 taskId) { - MenuDrawTextWindow(0, 0, 14, 19); + Menu_DrawStdWindowFrame(0, 0, 14, 19); sub_80FEABC(taskId, 0); } void sub_80FECB8(u8 decoCat) { - MenuDrawTextWindow(15, 0, 29, 3); + Menu_DrawStdWindowFrame(15, 0, 29, 3); sub_80FE470(decoCat, 16, 1, 0xff); } @@ -1902,8 +1902,8 @@ _080FED26:\n\ void sub_80FED1C(void) { - MenuZeroFillWindowRect(15, 0, 29, 3); - MenuZeroFillWindowRect(15, 12, 29, 19); + Menu_EraseWindowRect(15, 0, 29, 3); + Menu_EraseWindowRect(15, 12, 29, 19); } void sub_80FED3C(u8 taskId) @@ -2006,7 +2006,7 @@ void sub_80FEF74(void) DestroyVerticalScrollIndicator(0); DestroyVerticalScrollIndicator(1); HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 14, 19); + Menu_EraseWindowRect(0, 0, 14, 19); } bool8 sub_80FEFA4(void) @@ -2036,7 +2036,7 @@ void sub_80FEFF4(u8 taskId) void sub_80FF034(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 14, 19); + Menu_EraseWindowRect(0, 0, 14, 19); sub_80FE5AC(taskId); } @@ -3128,7 +3128,7 @@ void sub_81000A0(u8 taskId) void sub_81000C4(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_8100174(taskId); if (gDecorations[gUnknown_020388D0[gUnknown_020388F5]].permission != DECORPERM_SOLID_MAT) { @@ -3186,7 +3186,7 @@ void sub_8100248(u8 taskId) void sub_810026C(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_810028C(taskId); } @@ -3341,7 +3341,7 @@ void sub_8100494(u8 taskId) void sub_810065C(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gSprites[gUnknown_020391A8].data[7] = 0; gTasks[taskId].data[10] = 0; gTasks[taskId].func = sub_8100494; @@ -3723,7 +3723,7 @@ void sub_8100C88(u8 taskId) { DrawWholeMapView(); ScriptContext1_SetupScript(gUnknown_081A2F8A); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gTasks[taskId].data[2] = 2; } break; @@ -3760,7 +3760,7 @@ bool8 sub_8100D38(u8 taskId) void SetUpPuttingAwayDecorationPlayerAvatar(void) { player_get_direction_lower_nybble(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0]; sub_81016C8(); gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0); @@ -3810,7 +3810,7 @@ void sub_8100E70(u8 taskId) void sub_8100EEC(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gSprites[gUnknown_020391A8].data[7] = 0; gSprites[gUnknown_020391A8].invisible = 0; gSprites[gUnknown_020391A8].callback = sub_8101698; @@ -4150,7 +4150,7 @@ void sub_810156C(u8 taskId) void sub_8101590(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_81015B0(taskId); } @@ -4192,7 +4192,7 @@ void sub_8101648(u8 taskId) void sub_8101678(void) { pal_fill_black(); - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); sub_80FE220(); CreateTask(sub_8101648, 8); } @@ -4274,7 +4274,7 @@ void sub_8101824(u8 taskId) void sub_8101848(u8 taskId) { - MenuZeroFillWindowRect(20, 8, 26, 14); + Menu_EraseWindowRect(20, 8, 26, 14); sub_8109A30(gUnknown_020388D0[gUnknown_020388F5]); gUnknown_020388D0[gUnknown_020388F5] = DECOR_NONE; sub_80FF098(taskId); diff --git a/src/field/diploma.c b/src/field/diploma.c index 27601404c..b9cdb65df 100644 --- a/src/field/diploma.c +++ b/src/field/diploma.c @@ -135,5 +135,5 @@ static void DisplayDiplomaText(void) REG_BG3HOFS = 0; StringCopy(gStringVar1, gOtherText_HoennDex); } - MenuPrint(gOtherText_DiplomaCertificationGameFreak, 6, 2); + Menu_PrintText(gOtherText_DiplomaCertificationGameFreak, 6, 2); } \ No newline at end of file diff --git a/src/field/field_message_box.c b/src/field/field_message_box.c index 35aac7ac9..284fdb3f0 100644 --- a/src/field/field_message_box.c +++ b/src/field/field_message_box.c @@ -19,8 +19,8 @@ static void PrintFieldMessageFromStringVar4(void); void InitFieldMessageBox(void) { sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN; - SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset); - InitWindowFromConfig(&gFieldMessageBoxWindow, &gWindowConfig_81E6CE4); + TextWindow_SetDlgFrameBaseTileNum(gMenuTextWindowContentTileOffset); + Text_InitWindowWithTemplate(&gFieldMessageBoxWindow, &gWindowConfig_81E6CE4); } static void Task_FieldMessageBox(u8 taskId) @@ -29,22 +29,22 @@ static void Task_FieldMessageBox(u8 taskId) switch (task->data[0]) { case 0: - LoadMessageBoxTiles(&gFieldMessageBoxWindow); + TextWindow_LoadDialogueFrameTiles(&gFieldMessageBoxWindow); task->data[0]++; break; case 1: - DrawStandardMessageBox(&gFieldMessageBoxWindow); + TextWindow_DrawDialogueFrame(&gFieldMessageBoxWindow); task->data[0]++; break; case 2: switch (sMessageBoxMode) { case FIELD_MESSAGE_BOX_NORMAL: - if (!sub_80035AC(&gFieldMessageBoxWindow)) + if (!Text_UpdateWindow(&gFieldMessageBoxWindow)) return; break; case FIELD_MESSAGE_BOX_AUTO_SCROLL: - if (!sub_8003778(&gFieldMessageBoxWindow)) + if (!Text_UpdateWindowAutoscroll(&gFieldMessageBoxWindow)) return; break; } @@ -117,20 +117,20 @@ bool8 unref_sub_8064BD0(const u8 *message) static void PrintFieldMessage(const u8 *message) { StringExpandPlaceholders(gStringVar4, message); - sub_8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); + Text_InitWindow8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); CreateFieldMessageBoxTask(); } static void PrintFieldMessageFromStringVar4(void) { - sub_8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); + Text_InitWindow8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15); CreateFieldMessageBoxTask(); } void HideFieldMessageBox(void) { DestroyFieldMessageBoxTask(); - ClearStandardMessageBox(&gFieldMessageBoxWindow); + TextWindow_EraseDialogueFrame(&gFieldMessageBoxWindow); sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN; } @@ -150,6 +150,6 @@ bool8 IsFieldMessageBoxHidden(void) void unref_sub_8064CA0(void) { DestroyFieldMessageBoxTask(); - DrawStandardMessageBox(&gFieldMessageBoxWindow); + TextWindow_DrawDialogueFrame(&gFieldMessageBoxWindow); sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN; } diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index d80076be4..9a29e2e92 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -1507,7 +1507,7 @@ u8 Fishing4(struct Task *task) { u32 randVal; - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); task->tStep++; task->tFrameCounter = 0; task->tNumDots = 0; @@ -1549,7 +1549,7 @@ u8 Fishing5(struct Task *task) } else { - MenuPrint(dot, task->tNumDots + 4, 15); + Menu_PrintText(dot, task->tNumDots + 4, 15); task->tNumDots++; } } @@ -1573,7 +1573,7 @@ u8 Fishing6(struct Task *task) u8 Fishing7(struct Task *task) { sub_805A954(); - MenuPrint(gOtherText_OhABite, 4, 17); + Menu_PrintText(gOtherText_OhABite, 4, 17); task->tStep++; task->tFrameCounter = 0; return 0; @@ -1624,7 +1624,7 @@ u8 Fishing10(struct Task *task) { sub_805A954(); MenuPrintMessageDefaultCoords(gOtherText_PokeOnHook); - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); task->tStep++; task->tFrameCounter = 0; return 0; @@ -1637,7 +1637,7 @@ u8 Fishing11(struct Task *task) if (task->tFrameCounter == 0) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; @@ -1647,7 +1647,7 @@ u8 Fishing11(struct Task *task) sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; - MenuZeroFillScreen(); + Menu_EraseScreen(); task->tFrameCounter++; return 0; } @@ -1688,7 +1688,7 @@ u8 Fishing13(struct Task *task) u8 Fishing14(struct Task *task) { sub_805A954(); - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); task->tStep++; return 0; } @@ -1713,12 +1713,12 @@ u8 Fishing15(struct Task *task) u8 Fishing16(struct Task *task) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); UnfreezeMapObjects(); - MenuZeroFillScreen(); + Menu_EraseScreen(); sub_80BE97C(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); } diff --git a/src/field/field_region_map.c b/src/field/field_region_map.c index 73e101d8f..af8e4ec8a 100644 --- a/src/field/field_region_map.c +++ b/src/field/field_region_map.c @@ -52,11 +52,11 @@ void CB2_FieldInitRegionMap(void) CreateRegionMapCursor(1, 1); SetUpWindowConfig(&gWindowConfig_81E709C); InitMenuWindow(&gWindowConfig_81E709C); - MenuZeroFillScreen(); + Menu_EraseScreen(); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256; - MenuDrawTextWindow(21, 0, 29, 3); + Menu_DrawStdWindowFrame(21, 0, 29, 3); sub_8072BD8(gOtherText_Hoenn, 0x16, 1, 0x38); - MenuDrawTextWindow(16, 16, 29, 19); + Menu_DrawStdWindowFrame(16, 16, 29, 19); sub_813F0C8(); SetMainCallback2(CB2_FieldRegionMap); SetVBlankCallback(VBlankCB_FieldRegionMap); @@ -117,7 +117,7 @@ void sub_813EFDC(void) void sub_813F0C8(void) { - MenuFillWindowRectWithBlankTile(17, 17, 28, 18); + Menu_BlankWindowRect(17, 17, 28, 18); if (ewram0_5.unk8.unk16) - MenuPrint(ewram0_5.unk8.str, 17, 17); + Menu_PrintText(ewram0_5.unk8.str, 17, 17); } diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c index a472d5a9c..f123768e5 100644 --- a/src/field/field_screen_effect.c +++ b/src/field/field_screen_effect.c @@ -215,7 +215,7 @@ static void sub_80816A8(u8 taskId) data[0] = 1; break; case 1: - MenuFillWindowRectWithBlankTile(0, 0, 29, 19); + Menu_BlankWindowRect(0, 0, 29, 19); sub_808161C(data[1]); sub_8081534(data[2], data[3], 1, 160, 1, 2); data[0] = 2; @@ -264,7 +264,7 @@ static void sub_80816A8(u8 taskId) } break; case 5: - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); LoadFontDefaultPalette(&gWindowConfig_81E6CE4); REG_WIN0H = 255; REG_DISPCNT = data[6]; diff --git a/src/field/field_specials.c b/src/field/field_specials.c index fc6f690a3..589f96844 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -1058,7 +1058,7 @@ static void sub_810E874(void) ScriptContext2_Enable(); if (gUnknown_0203925A > 5) { - MenuDrawTextWindow(0, 0, 8, 11); + Menu_DrawStdWindowFrame(0, 0, 8, 11); InitMenu(0, 1, 1, 5, 0, 7); gUnknown_0203925C = 0; sub_80F944C(); @@ -1067,12 +1067,12 @@ static void sub_810E874(void) } else { - MenuDrawTextWindow(0, 0, 8, 2 * gUnknown_0203925A + 1); + Menu_DrawStdWindowFrame(0, 0, 8, 2 * gUnknown_0203925A + 1); InitMenu(0, 1, 1, gUnknown_0203925A, 0, 7); } for (i = 0; i < 5 && gUnknown_03000760[i].var0 != 16; i ++) { - MenuPrint(gUnknown_083F8380[gUnknown_03000760[i].var0], 1, 2 * i + 1); + Menu_PrintText(gUnknown_083F8380[gUnknown_03000760[i].var0], 1, 2 * i + 1); } DisplayCurrentElevatorFloor(); CreateTask(sub_810E984, 8); @@ -1080,7 +1080,7 @@ static void sub_810E874(void) void DisplayCurrentElevatorFloor(void) { - MenuDrawTextWindow(20, 0, 29, 5); + Menu_DrawStdWindowFrame(20, 0, 29, 5); sub_8072BD8(gOtherText_NowOn, 21, 1, 64); sub_8072BD8(gUnknown_083F8380[gSpecialVar_0x8005], 21, 3, 64); } @@ -1091,15 +1091,15 @@ void sub_810E984(u8 taskId) if (gMain.newKeys == DPAD_UP && gUnknown_0203925B != 0) { gUnknown_0203925B--; - curMenuPos = GetMenuCursorPos(); - MoveMenuCursorNoWrap(-1); + curMenuPos = Menu_GetCursorPos(); + Menu_MoveCursorNoWrap(-1); sub_810EAC8(curMenuPos, DPAD_UP); } if (gMain.newKeys == DPAD_DOWN && gUnknown_0203925B != gUnknown_0203925A - 1) { gUnknown_0203925B++; - curMenuPos = GetMenuCursorPos(); - MoveMenuCursorNoWrap(+1); + curMenuPos = Menu_GetCursorPos(); + Menu_MoveCursorNoWrap(+1); sub_810EAC8(curMenuPos, DPAD_DOWN); } if (gMain.newKeys & A_BUTTON) @@ -1109,7 +1109,7 @@ void sub_810E984(u8 taskId) { gSpecialVar_Result = 0; PlaySE(SE_SELECT); - MenuZeroFillWindowRect(0, 0, 29, 12); + Menu_EraseWindowRect(0, 0, 29, 12); sub_810EC9C(taskId); } else @@ -1119,7 +1119,7 @@ void sub_810E984(u8 taskId) ShakeScreenInElevator(); FieldObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); sub_810EEDC(); - MenuZeroFillScreen(); + Menu_EraseScreen(); DestroyTask(taskId); } } @@ -1128,7 +1128,7 @@ void sub_810E984(u8 taskId) gSpecialVar_Result = 0; PlaySE(SE_SELECT); sub_810EEDC(); - MenuZeroFillWindowRect(0, 0, 29, 12); + Menu_EraseWindowRect(0, 0, 29, 12); sub_810EC9C(taskId); } } @@ -1163,10 +1163,10 @@ bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput) if (flag) { sub_810EB90(newPos, 5); - MenuFillWindowRectWithBlankTile(2, 1, 7, 10); + Menu_BlankWindowRect(2, 1, 7, 10); for (i=0; i<5 && gUnknown_03000760[newPos].var0 != 16; newPos++, i++) { - MenuPrint(gUnknown_083F8380[gUnknown_03000760[newPos].var0], 1, i * 2 + 1); + Menu_PrintText(gUnknown_083F8380[gUnknown_03000760[newPos].var0], 1, i * 2 + 1); } } return flag; @@ -1227,7 +1227,7 @@ bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput) "\tmovs r1, 0x1\n" "\tmovs r2, 0x7\n" "\tmovs r3, 0xA\n" - "\tbl MenuFillWindowRectWithBlankTile\n" + "\tbl Menu_BlankWindowRect\n" "\tmovs r5, 0\n" "\tldr r2, _0810EB88 @ =gUnknown_03000760\n" "\tlsls r1, r4, 2\n" @@ -1249,7 +1249,7 @@ bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput) "\tlsls r2, 24\n" "\tlsrs r2, 24\n" "\tmovs r1, 0x1\n" - "\tbl MenuPrint\n" + "\tbl Menu_PrintText\n" "\tadds r0, r4, 0x1\n" "\tlsls r0, 24\n" "\tlsrs r4, r0, 24\n" @@ -1539,7 +1539,7 @@ void ShowGlassWorkshopMenu(void) { u8 i; ScriptContext2_Enable(); - MenuDrawTextWindow(0, 0, 10, 11); + Menu_DrawStdWindowFrame(0, 0, 10, 11); InitMenu(0, 1, 1, 5, 0, 9); gUnknown_0203925C = 0; sub_80F944C(); @@ -1547,7 +1547,7 @@ void ShowGlassWorkshopMenu(void) sub_810F2B4(); for (i=0; i<5; i++) { - MenuPrint(gUnknown_083F83C0[i], 1, 2 * i + 1); + Menu_PrintText(gUnknown_083F83C0[i], 1, 2 * i + 1); } gUnknown_0203925B = 0; gUnknown_0203925A = ARRAY_COUNT(gUnknown_083F83C0); @@ -1560,15 +1560,15 @@ void sub_810F118(u8 taskId) if (gMain.newKeys == DPAD_UP && gUnknown_0203925B != 0) { gUnknown_0203925B--; - prevCursorPos = GetMenuCursorPos(); - MoveMenuCursorNoWrap(-1); + prevCursorPos = Menu_GetCursorPos(); + Menu_MoveCursorNoWrap(-1); sub_810F1F4(prevCursorPos, DPAD_UP); } if (gMain.newKeys == DPAD_DOWN && gUnknown_0203925B != gUnknown_0203925A - 1) { gUnknown_0203925B++; - prevCursorPos = GetMenuCursorPos(); - MoveMenuCursorNoWrap(1); + prevCursorPos = Menu_GetCursorPos(); + Menu_MoveCursorNoWrap(1); sub_810F1F4(prevCursorPos, DPAD_DOWN); } if (gMain.newKeys & A_BUTTON) @@ -1577,7 +1577,7 @@ void sub_810F118(u8 taskId) gSpecialVar_Result = gUnknown_0203925B; PlaySE(SE_SELECT); sub_810EEDC(); - MenuZeroFillWindowRect(0, 0, 29, 12); + Menu_EraseWindowRect(0, 0, 29, 12); sub_810EC9C(taskId); } if (gMain.newKeys & B_BUTTON) @@ -1586,7 +1586,7 @@ void sub_810F118(u8 taskId) gSpecialVar_Result = 0x7f; PlaySE(SE_SELECT); sub_810EEDC(); - MenuZeroFillWindowRect(0, 0, 29, 12); + Menu_EraseWindowRect(0, 0, 29, 12); sub_810EC9C(taskId); } } @@ -1621,10 +1621,10 @@ bool8 sub_810F1F4(u8 prevCursorPos, u8 dpadInput) if (flag) { GlassWorkshopUpdateScrollIndicators(newPos, 5); - MenuFillWindowRectWithBlankTile(2, 1, 9, 10); + Menu_BlankWindowRect(2, 1, 9, 10); for (i=0; i<5; newPos++, i++) { - MenuPrint(gUnknown_083F83C0[newPos], 1, 2 * i + 1); + Menu_PrintText(gUnknown_083F83C0[newPos], 1, 2 * i + 1); } } return flag; @@ -1683,7 +1683,7 @@ bool8 sub_810F1F4(u8 prevCursorPos, u8 dpadInput) "\tmovs r1, 0x1\n" "\tmovs r2, 0x9\n" "\tmovs r3, 0xA\n" - "\tbl MenuFillWindowRectWithBlankTile\n" + "\tbl Menu_BlankWindowRect\n" "\tmovs r5, 0\n" "\tldr r7, _0810F28C @ =gUnknown_083F83C0\n" "_0810F25C:\n" @@ -1695,7 +1695,7 @@ bool8 sub_810F1F4(u8 prevCursorPos, u8 dpadInput) "\tlsls r2, 24\n" "\tlsrs r2, 24\n" "\tmovs r1, 0x1\n" - "\tbl MenuPrint\n" + "\tbl Menu_PrintText\n" "\tadds r0, r4, 0x1\n" "\tlsls r0, 24\n" "\tlsrs r4, r0, 24\n" diff --git a/src/field/fldeff_softboiled.c b/src/field/fldeff_softboiled.c index a574232a8..3c64ec520 100644 --- a/src/field/fldeff_softboiled.c +++ b/src/field/fldeff_softboiled.c @@ -126,7 +126,7 @@ static void sub_8133E74(u8 taskId) { return; } - MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); + Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); PrintPartyMenuPromptText(3, 0); gTasks[taskId].func = HandlePartyMenuSwitchPokemonInput; } @@ -142,7 +142,7 @@ static void sub_8133EF8(void) { sub_806CCE4(); EWRAM_1B000_2.unk261 = 2; DestroySprite(&gSprites[EWRAM_1000.unk1]); - MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); + Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); PrintPartyMenuPromptText(0, 0); SwitchTaskToFollowupFunc(EWRAM_1000.unk0); } diff --git a/src/field/item_menu.c b/src/field/item_menu.c index e9b8b24d3..0db48f55d 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -1062,7 +1062,7 @@ void sub_80A4164(u8 *dest, u16 value, enum StringConvertMode mode, u8 digits) void sub_80A418C(u16 value, enum StringConvertMode mode, u8 c, u8 d, u8 digits) { sub_80A4164(gStringVar1, value, mode, digits); - MenuPrint(gStringVar1, c, d); + Menu_PrintText(gStringVar1, c, d); } static void sub_80A41D4(u8 taskId) @@ -1112,7 +1112,7 @@ static bool8 sub_80A42B0(u8 itemPos, int b) return TRUE; r5 = itemPos * 2 + 2; sub_8072C74(gStringVar1, gOtherText_CloseBag, 0x78, 0); - MenuPrint(gStringVar1, 14, r5); + Menu_PrintText(gStringVar1, 14, r5); ptr = gBGTilemapBuffers[2] + 14 + r5 * 32; ptr[0] = 0x4F; ptr[1] = 0x4F; @@ -1121,9 +1121,9 @@ static bool8 sub_80A42B0(u8 itemPos, int b) if (itemPos == 7) return TRUE; if ((b == 1 && r8->unk2 != 0) || b == 2) - MenuFillWindowRectWithBlankTile(14, r5 + 2, 29, 13); + Menu_BlankWindowRect(14, r5 + 2, 29, 13); else - MenuFillWindowRectWithBlankTile(14, r5 + 2, 29, 17); + Menu_BlankWindowRect(14, r5 + 2, 29, 17); return TRUE; } return FALSE; @@ -1148,7 +1148,7 @@ static void sub_80A4380(u16 a, int b, int c, int d) text = sub_8072C74(text, ItemId_GetItem(gCurrentBagPocketItemSlots[r4].itemId)->name, 0x66, 0); *text++ = CHAR_MULT_SIGN; sub_8072C14(text, gCurrentBagPocketItemSlots[r4].quantity, 0x78, 1); - MenuPrint(gStringVar1, 14, r5); + Menu_PrintText(gStringVar1, 14, r5); } } @@ -1173,7 +1173,7 @@ static void sub_80A444C(u16 a, int b, int c, int d) #else sub_8072C74(text, ItemId_GetItem(gCurrentBagPocketItemSlots[r4].itemId)->name, 0x63, 0); #endif - MenuPrint(gStringVar1, 14, r5); + Menu_PrintText(gStringVar1, 14, r5); if (gUnknown_02038558 != 0) { if (gCurrentBagPocketItemSlots[r4].itemId == gSaveBlock1.registeredItem) @@ -1240,7 +1240,7 @@ static void sub_80A4548(u16 a, int b, int c, int d) moveName = gMoveNames[ItemIdToBattleMoveId(gCurrentBagPocketItemSlots[r4].itemId)]; sub_8072C74(text, moveName, 0x78, 0); } - MenuPrint(gStringVar1, 14, sp10); + Menu_PrintText(gStringVar1, 14, sp10); } } #else @@ -1421,7 +1421,7 @@ _080A46AE:\n\ ldr r0, _080A46F8 @ =gStringVar1\n\ movs r1, 0xE\n\ ldr r2, [sp, 0x10]\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ mov r0, r8\n\ adds r0, 0x1\n\ lsls r0, 24\n\ @@ -1482,7 +1482,7 @@ static void sub_80A46FC(u16 a, int b, int c, int d) text = sub_80A425C(a, text, i); CopyItemName(gCurrentBagPocketItemSlots[r4].itemId, gStringVar2); sub_80A41E0(text, gCurrentBagPocketItemSlots[r4].itemId - 0x84, gStringVar2, gCurrentBagPocketItemSlots[r4].quantity, 3); - MenuPrint(gStringVar1, 14, r5); + Menu_PrintText(gStringVar1, 14, r5); } } @@ -1540,7 +1540,7 @@ static void ItemListMenu_InitDescription(s16 itemId) } if (r5 < 3) - MenuZeroFillWindowRect(0, 13 + r5 * 2, 13, 20); + Menu_EraseWindowRect(0, 13 + r5 * 2, 13, 20); } static void ItemListMenu_ChangeDescription(s16 itemId, int b) @@ -1551,7 +1551,7 @@ static void ItemListMenu_ChangeDescription(s16 itemId, int b) { if (b == 0) { - MenuZeroFillWindowRect(0, 13, 13, 20); + Menu_EraseWindowRect(0, 13, 13, 20); MenuPrint_PixelCoords(gOtherText_ReturnTo, 4, 0x68, 0); } else if (b == 1) @@ -1562,7 +1562,7 @@ static void ItemListMenu_ChangeDescription(s16 itemId, int b) else { if (b == 0) - MenuZeroFillWindowRect(0, 13, 13, 20); + Menu_EraseWindowRect(0, 13, 13, 20); if (ItemId_CopyDescription(description, itemId, b)) MenuPrint_PixelCoords(description, 4, 104 + b * 16, 0); } @@ -1602,7 +1602,7 @@ static void sub_80A4A98(const u8 *text, u32 line) u8 buffer[100]; if (line == 0) - MenuZeroFillWindowRect(0, 13, 13, 20); + Menu_EraseWindowRect(0, 13, 13, 20); if (CopyTextLine(buffer, text, line)) MenuPrint_PixelCoords(buffer, 4, 104 + line * 16, 0); } @@ -1618,7 +1618,7 @@ static void sub_80A4ADC(u8 taskId) static void sub_80A4B14(s8 a, u8 b) { gBagPocketScrollStates[sCurrentBagPocket].scrollTop += a; - MoveMenuCursor(0); + Menu_MoveCursor(0); sub_80A73C0(); sub_80A763C(); sub_80A4ADC(b); @@ -1626,7 +1626,7 @@ static void sub_80A4B14(s8 a, u8 b) static void sub_80A4B58(s8 delta, u8 b) { - gBagPocketScrollStates[sCurrentBagPocket].cursorPos = MoveMenuCursor(delta); + gBagPocketScrollStates[sCurrentBagPocket].cursorPos = Menu_MoveCursor(delta); sub_80A73C0(); sub_80A4ADC(b); } @@ -1649,7 +1649,7 @@ static void sub_80A4BF0(u16 *a) if (gUnknown_02038564 == 4) { - MenuDrawTextWindow(0, 7, 13, 12); + Menu_DrawStdWindowFrame(0, 7, 13, 12); sub_80A4008(a, 1, 8, 12, 4); if (sub_80F9344() == TRUE && sReturnLocation == RETURN_TO_FIELD_5) { @@ -1665,7 +1665,7 @@ static void sub_80A4BF0(u16 *a) text = sub_80A4B90(gSpecialVar_ItemId); else text = sItemPopupMenuActions[sPopupMenuActionList[i]].text; - MenuPrint(text, 1 + (i / 2) * 6, 8 + (i % 2) * 2); + Menu_PrintText(text, 1 + (i / 2) * 6, 8 + (i % 2) * 2); } } if (sReturnLocation == RETURN_TO_FIELD_5) @@ -1676,10 +1676,10 @@ static void sub_80A4BF0(u16 *a) } else { - MenuDrawTextWindow(0, 5, 13, 12); + Menu_DrawStdWindowFrame(0, 5, 13, 12); sub_80A4008(a, 1, 6, 12, 6); for (i = 0; i < gUnknown_02038564; i++) - MenuPrint(sItemPopupMenuActions[sPopupMenuActionList[i]].text, 1 + (i / 3) * 6, 6 + (i % 3) * 2); + Menu_PrintText(sItemPopupMenuActions[sPopupMenuActionList[i]].text, 1 + (i / 3) * 6, 6 + (i % 3) * 2); InitMenu(0, 1, 6, gUnknown_02038564, 0, 1); sub_8072DCC(0x2F); } @@ -1690,7 +1690,7 @@ static void sub_80A4DA4(u16 *a) { sub_80A73FC(); sub_80A36B8(a, 0, 6, 13, 6); - MenuZeroFillWindowRect(0, 5, 13, 12); + Menu_EraseWindowRect(0, 5, 13, 12); sub_80A7590(); } @@ -1699,7 +1699,7 @@ static void sub_80A4DD8(u8 taskId, u8 b, u8 c, u8 d, u8 e, u8 digits) gTasks[taskId].data[1] = 1; gTasks[taskId].data[2] = b + 2; gTasks[taskId].data[3] = c + 1; - MenuDrawTextWindow(b, c, b + d, c + e); + Menu_DrawStdWindowFrame(b, c, b + d, c + e); sub_80A4008(gBGTilemapBuffers[1], b + 1, c + 1, d - 1, e - 1); sub_80A418C(1, 1, b + 2, c + 1, digits); } @@ -2539,7 +2539,7 @@ static void sub_80A57C4(void) r5 = 7; } sub_80A4008(gBGTilemapBuffers[1], 7, r5 + 1, 6, gUnknown_02038564 * 2); - MenuDrawTextWindow(6, r5, 13, gUnknown_02038564 * 2 + 1 + r5); + Menu_DrawStdWindowFrame(6, r5, 13, gUnknown_02038564 * 2 + 1 + r5); sub_80A7834(0, r5); InitMenu(0, 7, r5 + 1, gUnknown_02038564, 0, 6); } @@ -2553,7 +2553,7 @@ static void sub_80A5888(u8 taskId) if (sPopupMenuSelection != 0) { PlaySE(SE_SELECT); - sPopupMenuSelection = MoveMenuCursor(-1); + sPopupMenuSelection = Menu_MoveCursor(-1); } } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) @@ -2561,7 +2561,7 @@ static void sub_80A5888(u8 taskId) if (sPopupMenuSelection != gUnknown_02038564 - 1) { PlaySE(SE_SELECT); - sPopupMenuSelection = MoveMenuCursor(1); + sPopupMenuSelection = Menu_MoveCursor(1); } } else if (gMain.newKeys & A_BUTTON) @@ -2690,14 +2690,14 @@ static void sub_80A5C24(u8 taskId) void CleanUpItemMenuMessage(u8 taskId) { sub_80A36B8(gBGTilemapBuffers[1], 0, 0, 31, 31); - MenuZeroFillWindowRect(7, 7, 13, 12); - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(7, 7, 13, 12); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskId].func = sub_80A5C24; } void CleanUpOverworldMessage(u8 taskId) { - MenuZeroFillWindowRect(0, 13, 29, 19); + Menu_EraseWindowRect(0, 13, 29, 19); DestroyTask(taskId); sub_8064E2C(); ScriptContext2_Disable(); @@ -2760,7 +2760,7 @@ static void sub_80A5DA0(u16 itemId, u16 quantity) static void sub_80A5DF8(void) { sub_80A4DA4(gBGTilemapBuffers[1]); - MenuZeroFillWindowRect(7, 6, 11, 13); + Menu_EraseWindowRect(7, 6, 11, 13); sub_80A7528(4); } @@ -2857,7 +2857,7 @@ static void sub_80A6024(u8 taskId) if (gMain.newKeys & A_BUTTON) { sub_80A36B8(gBGTilemapBuffers[1], 0, 0, 31, 31); - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskId].func = sub_80A6000; } } @@ -3008,7 +3008,7 @@ static void sub_80A640C(u8 taskId) static void sub_80A6444(u8 taskId) { sub_80A36B8(gBGTilemapBuffers[1], 0, 0, 31, 31); - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskId].func = sub_80A640C; } @@ -3016,7 +3016,7 @@ static void sub_80A648C(u8 taskId) { gTasks[taskId].func = Task_BuyHowManyDialogueHandleInput; sub_80A4008(gBGTilemapBuffers[1], 1, 11, 12, 2); - MenuDrawTextWindow(0, 10, 13, 13); + Menu_DrawStdWindowFrame(0, 10, 13, 13); gTasks[taskId].data[1] = 1; gTasks[taskId].data[2] = 1; gTasks[taskId].data[3] = 11; @@ -3053,7 +3053,7 @@ static void sub_80A6574(u8 taskId) static void sub_80A65AC(u8 taskId) { - MenuZeroFillWindowRect(7, 6, 13, 12); + Menu_EraseWindowRect(7, 6, 13, 12); sub_80A36B8(gBGTilemapBuffers[1], 7, 6, 6, 6); CopyItemName(gSpecialVar_ItemId, gStringVar2); StringExpandPlaceholders(gStringVar4, gOtherText_SoldItem); @@ -3063,7 +3063,7 @@ static void sub_80A65AC(u8 taskId) static void sub_80A6618(u8 taskId) { - MenuZeroFillWindowRect(7, 6, 13, 12); + Menu_EraseWindowRect(7, 6, 13, 12); sub_80A36B8(gBGTilemapBuffers[1], 7, 6, 6, 6); BuyMenuPrintItemQuantityAndPrice(taskId); } @@ -3078,13 +3078,13 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId) { if (sub_80A5350(taskId) == TRUE) { - MenuZeroFillWindowRect(6, 11, 12, 11); + Menu_EraseWindowRect(6, 11, 12, 11); BuyMenuDisplayMessage(gSpecialVar_ItemId, gTasks[taskId].data[1]); } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - MenuZeroFillWindowRect(0, 10, 13, 13); + Menu_EraseWindowRect(0, 10, 13, 13); sub_80A36B8(gBGTilemapBuffers[1], 0, 10, 13, 3); ConvertIntToDecimalStringN(gStringVar1, ItemId_GetPrice(gSpecialVar_ItemId) / 2 * gTasks[taskId].data[1], STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gOtherText_CanPay); @@ -3110,8 +3110,8 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId) { sub_80A36B8(gBGTilemapBuffers[1], 0, 0, 31, 31); CloseMoneyWindow(0, 0); - MenuZeroFillWindowRect(0, 4, 13, 13); - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 4, 13, 13); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskId].func = sub_80A6760; } @@ -3229,7 +3229,7 @@ static void sub_80A6A84(u8 taskId) sub_80A4DA4(gBGTilemapBuffers[1]); CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, taskData[1], STR_CONV_MODE_LEFT_ALIGN, 3); - MenuZeroFillWindowRect(7, 6, 11, 13); + Menu_EraseWindowRect(7, 6, 11, 13); sub_80A7528(7); sub_80A3D5C(taskId); gTasks[taskId].func = sub_80A5E1C; @@ -3361,16 +3361,16 @@ static void sub_80A6DF0(u16 *a) { u8 r6 = (gUnknown_02038564 - 1) * 2; - MenuDrawTextWindow(7, 9 - r6, 13, 12); + Menu_DrawStdWindowFrame(7, 9 - r6, 13, 12); sub_80A4008(a, 8, 10 - r6, 5, r6 + 2); if (gUnknown_02038564 == 1) { - MenuPrint(sItemPopupMenuActions[sPopupMenuActionList[0]].text, 8, 10); + Menu_PrintText(sItemPopupMenuActions[sPopupMenuActionList[0]].text, 8, 10); } else { - MenuPrint(sItemPopupMenuActions[sPopupMenuActionList[0]].text, 8, 8); - MenuPrint(sItemPopupMenuActions[sPopupMenuActionList[1]].text, 8, 10); + Menu_PrintText(sItemPopupMenuActions[sPopupMenuActionList[0]].text, 8, 8); + Menu_PrintText(sItemPopupMenuActions[sPopupMenuActionList[1]].text, 8, 10); } InitMenu(0, 8, 10 - r6, gUnknown_02038564, 0, 5); sub_80A7528(2); @@ -3383,7 +3383,7 @@ static void sub_80A6EB8(u8 taskId) if (sPopupMenuSelection == 1) { PlaySE(SE_SELECT); - sPopupMenuSelection = MoveMenuCursor(-1); + sPopupMenuSelection = Menu_MoveCursor(-1); } } else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) @@ -3391,7 +3391,7 @@ static void sub_80A6EB8(u8 taskId) if (sPopupMenuSelection + 1 < gUnknown_02038564) { PlaySE(SE_SELECT); - sPopupMenuSelection = MoveMenuCursor(1); + sPopupMenuSelection = Menu_MoveCursor(1); } } else if (gMain.newKeys & A_BUTTON) @@ -3669,7 +3669,7 @@ static void sub_80A756C(void) static void sub_80A7590(void) { - MenuZeroFillWindowRect(0, 13, 13, 20); + Menu_EraseWindowRect(0, 13, 13, 20); sub_80A756C(); } @@ -3748,7 +3748,7 @@ static void sub_80A7694(void) static void sub_80A76A0(void) { - MenuZeroFillWindowRect(14, 2, 29, 18); + Menu_EraseWindowRect(14, 2, 29, 18); sub_80A7678(); } @@ -3816,7 +3816,7 @@ static void sub_80A7768(void) const u8 *text = sItemPopupMenuActions[sPopupMenuActionList[r4->unk1 - 1]].text; int var = r4->unk1 - 1; - MenuPrint(text, 7, var * 2 + 1 + r4->unk3); + Menu_PrintText(text, 7, var * 2 + 1 + r4->unk3); } else { @@ -3828,7 +3828,7 @@ static void sub_80A7768(void) else text = sItemPopupMenuActions[sPopupMenuActionList[r4->unk1 - 1]].text; var = r4->unk1 - 1; - MenuPrint(text, (var >> 1) * 6 + 1, (var & 1) * 2 + 8); + Menu_PrintText(text, (var >> 1) * 6 + 1, (var & 1) * 2 + 8); } if (r4->unk1 == gUnknown_02038564) { diff --git a/src/field/item_use.c b/src/field/item_use.c index e1fdddce0..bd76db77e 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -123,7 +123,7 @@ void HandleDeniedItemUseMessage(u8 var1, u8 playerMenuStatus, const u8 *text) switch (playerMenuStatus) { case 0: // Item Menu - MenuZeroFillWindowRect(0, 13, 13, 20); + Menu_EraseWindowRect(0, 13, 13, 20); DisplayItemMessageOnField(var1, gStringVar4, CleanUpItemMenuMessage, 1); break; default: // Field @@ -312,7 +312,7 @@ void RunItemfinderResults(u8 taskId) void ExitItemfinder(u8 taskId) { - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); sub_8064E2C(); ScriptContext2_Disable(); DestroyTask(taskId); @@ -744,7 +744,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId) if (!gTasks[taskId].data[2]) { - MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); + Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1); } else @@ -770,7 +770,7 @@ void ItemUseOutOfBattle_SSTicket(u8 taskId) { if (gTasks[taskId].data[2] == 0) { - MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); + Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); DisplayItemMessageOnField(taskId, gUnknown_083D61DC[ItemId_GetSecondaryId(gSpecialVar_ItemId)], sub_80C9BB8, 1); } else @@ -875,7 +875,7 @@ void ItemUseOutOfBattle_RareCandy(u8 taskId) void ItemUseOutOfBattle_TMHM(u8 taskId) { - MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); + Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); if (gSpecialVar_ItemId >= ITEM_HM01) DisplayItemMessageOnField(taskId, gOtherText_BootedHM, sub_80C9EE4, 1); // HM @@ -1022,7 +1022,7 @@ void ItemUseInBattle_PokeBall(u8 var) } else { - MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); + Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); DisplayItemMessageOnField(var, gOtherText_BoxIsFull, CleanUpItemMenuMessage, 1); } } @@ -1047,7 +1047,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId) { u16 partyId = gBattlePartyID[gBankInMenu]; - MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); + Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE) { @@ -1096,7 +1096,7 @@ void ItemUseInBattle_PPRecovery(u8 var) void unref_sub_80CA448(u8 var) { - MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); + Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); if (ExecuteTableBasedItemEffect__(0, gSpecialVar_ItemId, 0) == FALSE) { @@ -1113,7 +1113,7 @@ void unref_sub_80CA448(u8 var) void ItemUseInBattle_Escape(u8 taskId) { - MenuZeroFillWindowRect(0, 0xD, 0xD, 0x14); + Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); if((gBattleTypeFlags & BATTLE_TYPE_TRAINER) == FALSE) { diff --git a/src/field/map_name_popup.c b/src/field/map_name_popup.c index 2e2dfc72e..49a470cc1 100644 --- a/src/field/map_name_popup.c +++ b/src/field/map_name_popup.c @@ -89,8 +89,8 @@ void HideMapNamePopup(void) { if (FuncIsActiveTask(Task_MapNamePopup)) { - MenuLoadTextWindowGraphics(); - MenuZeroFillWindowRect(0, 0, 13, 3); + Menu_LoadStdFrameGraphics(); + Menu_EraseWindowRect(0, 0, 13, 3); REG_BG0VOFS = 0; DestroyTask(sTaskId); } @@ -100,8 +100,8 @@ void DrawMapNamePopup(void) { u8 name[20]; - MenuLoadTextWindowGraphics_OverrideFrameType(0); + Menu_LoadStdFrameGraphicsOverrideStyle(0); GetMapSectionName(name, gMapHeader.regionMapSectionId, 0); - MenuDrawTextWindow(0, 0, 13, 3); + Menu_DrawStdWindowFrame(0, 0, 13, 3); sub_8072BD8(name, 1, 1, 0x60); } diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 4db513f65..82c6dffe3 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -345,7 +345,7 @@ void PrepareSongText(void) void ScrSpecial_PlayBardSong(void) { StartBardSong(gSpecialVar_0x8004); - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); ScriptContext1_Stop(); } @@ -858,8 +858,8 @@ static void Task_BardSong(u8 taskId) { case 0: // Initialize song PrepareSongText(); - InitWindowFromConfig(gMenuWindowPtr, &gWindowConfig_81E6CE4); - sub_8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15); + Text_InitWindowWithTemplate(gMenuWindowPtr, &gWindowConfig_81E6CE4); + Text_InitWindow8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15); task->data[1] = 0; task->data[2] = 0; task->tCharIndex = 0; @@ -921,7 +921,7 @@ static void Task_BardSong(u8 taskId) } else if (gStringVar4[task->tCharIndex] == CHAR_SPACE) { - sub_8003418(gMenuWindowPtr); + Text_PrintWindowSimple(gMenuWindowPtr); task->tCharIndex++; task->tState = 2; task->data[2] = 0; @@ -941,7 +941,7 @@ static void Task_BardSong(u8 taskId) else if (gStringVar4[task->tCharIndex] == CHAR_SONG_WORD_SEPARATOR) { gStringVar4[task->tCharIndex] = CHAR_SPACE; // restore it back to a space - sub_8003418(gMenuWindowPtr); + Text_PrintWindowSimple(gMenuWindowPtr); task->tCharIndex++; task->data[2] = 0; } @@ -950,7 +950,7 @@ static void Task_BardSong(u8 taskId) switch (task->data[1]) { case 0: - sub_8003418(gMenuWindowPtr); + Text_PrintWindowSimple(gMenuWindowPtr); task->data[1]++; break; case 1: @@ -1219,7 +1219,7 @@ static void PrintStoryList(void) { s32 i; - MenuDrawTextWindow(0, 0, 25, 4 + GetFreeStorySlot() * 2); + Menu_DrawStdWindowFrame(0, 0, 25, 4 + GetFreeStorySlot() * 2); for (i = 0; i < 4; i++) { struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller; @@ -1227,9 +1227,9 @@ static void PrintStoryList(void) if (stat == 0) break; - MenuPrint(GetStoryTitleByStat(stat), 1, 2 + i * 2); + Menu_PrintText(GetStoryTitleByStat(stat), 1, 2 + i * 2); } - MenuPrint(gPCText_Cancel, 1, 2 + i * 2); + Menu_PrintText(gPCText_Cancel, 1, 2 + i * 2); } static u8 gUnknown_03000748; @@ -1247,7 +1247,7 @@ static void Task_StoryListMenu(u8 taskId) task->data[0]++; break; case 1: - selection = ProcessMenuInput(); + selection = Menu_ProcessInput(); if (selection == -2) break; if (selection == -1 || selection == GetFreeStorySlot()) @@ -1260,7 +1260,7 @@ static void Task_StoryListMenu(u8 taskId) gUnknown_03000748 = selection; } HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 25, 12); + Menu_EraseWindowRect(0, 0, 25, 12); DestroyTask(taskId); EnableBothScriptContexts(); break; diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c index e3ef0c790..44b24eed6 100644 --- a/src/field/menu_helpers.c +++ b/src/field/menu_helpers.c @@ -135,7 +135,7 @@ void sub_80F9020(void) // display message box, fill box with tile if tile is not zero, print string static void PrintMessage(const u8 *str, u16 tile) { - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); if (tile) { sub_80A3FA0(&gBGTilemapBuffers[1][0], 2, 15, 26, 4, tile); @@ -145,7 +145,7 @@ static void PrintMessage(const u8 *str, u16 tile) static void sub_80F9090(u8 taskId) { - if (MenuUpdateWindowText() == TRUE) + if (Menu_UpdateWindowText() == TRUE) { gUnknown_0300074C(taskId); } @@ -196,7 +196,7 @@ static void PrintStringWithPalette(const u8 *str, u8 paletteNum, u8 left, u8 top StringCopy(gStringVar4, str); } - MenuPrint(gStringVar4, left, top); + Menu_PrintText(gStringVar4, left, top); } // unused @@ -209,7 +209,7 @@ void PrintNumberWithPalette(s32 value, u8 paletteNum, u8 n, u8 mode, u8 left, u8 } else { - MenuPrint(gStringVar1, left, top); + Menu_PrintText(gStringVar1, left, top); } } diff --git a/src/field/money.c b/src/field/money.c index d0f0ab1f6..4ab4de51c 100644 --- a/src/field/money.c +++ b/src/field/money.c @@ -143,7 +143,7 @@ void PrintMoneyAmount(u32 amount, u8 size, u8 x, u8 y) if (stringWidth >= (size + 1) * 8) { - MenuPrint(buffer, x, y); + Menu_PrintText(buffer, x, y); } else { @@ -275,7 +275,7 @@ void UpdateMoneyWindow(u32 amount, u8 x, u8 y) void OpenMoneyWindow(u32 amount, u8 x, u8 y) { - MenuDrawTextWindow(x, y, x + 13, y + 3); + Menu_DrawStdWindowFrame(x, y, x + 13, y + 3); UpdateMoneyWindow(amount, x, y); LoadCompressedObjectPic(gUnknown_083CF584); @@ -288,7 +288,7 @@ void CloseMoneyWindow(u8 x, u8 y) { DestroySpriteAndFreeResources(&gSprites[gUnknown_02038734]); FreeSpritePaletteByTag(SPRITE_TAG_MONEY); - MenuZeroFillWindowRect(x, y, x + 13, y + 3); + Menu_EraseWindowRect(x, y, x + 13, y + 3); } bool8 HasEnoughMoneyFor(void) diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 790aede60..f589494f4 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -683,7 +683,7 @@ bool8 InitPartyMenu(void) gMain.state++; break; case 8: - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C90); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C90); MultistepInitWindowTileData(&gUnknown_03004210, 1); gMain.state++; break; @@ -2676,26 +2676,26 @@ void PrintPartyMenuPromptText(u8 textId, u8 b) switch (b) { case 0: - MenuDrawTextWindow(0, 16, 23, 19); + Menu_DrawStdWindowFrame(0, 16, 23, 19); break; case 1: - MenuDrawTextWindow(0, 16, 19, 19); + Menu_DrawStdWindowFrame(0, 16, 19, 19); break; case 2: - MenuDrawTextWindow(0, 16, 22, 19); + Menu_DrawStdWindowFrame(0, 16, 22, 19); break; case 3: - MenuDrawTextWindow(0, 16, 18, 19); + Menu_DrawStdWindowFrame(0, 16, 18, 19); break; } - MenuPrint(PartyMenuPromptTexts[textId], 1, 17); + Menu_PrintText(PartyMenuPromptTexts[textId], 1, 17); } } void sub_806D5A4(void) { - MenuZeroFillWindowRect(0, 16, 29, 19); + Menu_EraseWindowRect(0, 16, 29, 19); } void sub_806D5B8(u8 monIndex) @@ -3313,7 +3313,7 @@ void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer) { u32 var1 = 0; CpuFastSet(&var1, gTileBuffer, 0x1000100); - sub_8004E3C((struct WindowConfig *)&gWindowConfig_81E6CAC, gTileBuffer, nameBuffer); + sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gTileBuffer, nameBuffer); CpuFastSet(gTileBuffer, OBJ_VRAM1 + (monIndex * 0x400), 128); } @@ -3423,7 +3423,7 @@ void PartyMenuDoPrintLevel(u8 monIndex, u8 menuLayout, u8 level) var1 = 0; CpuFastSet(&var1, gUnknown_02039460, 0x1000020); - sub_8004E3C((struct WindowConfig *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); + sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x200 + (monIndex * 0x400), 32); } @@ -3517,7 +3517,7 @@ void PartyMenuDoPrintHP(u8 monIndex, u8 b, u16 currentHP, u16 maxHP) var = 0; CpuFastSet(&var, gUnknown_02039460, 0x1000040); - sub_8004E3C((struct WindowConfig *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); + sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x300 + (monIndex * 0x400), 64); } @@ -3667,7 +3667,7 @@ void ClosePartyPopupMenu(u8 index, const struct PartyPopupMenu *menu) SetPartyPopupMenuOffsets(index, &left, &top, menu); - MenuZeroFillWindowRect(left, top, left + menu[index].width, menu[index].numChoices * 2 + top + 1); + Menu_EraseWindowRect(left, top, left + menu[index].width, menu[index].numChoices * 2 + top + 1); HandleDestroyMenuCursors(); } @@ -3683,7 +3683,7 @@ u8 sub_806E834(const u8 *message, u8 arg1) gUnknown_0202E8F6 = 1; - MenuDrawTextWindow(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); + Menu_DrawStdWindowFrame(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); MenuPrintMessage(message, WINDOW_LEFT + 1, 15); taskId = CreateTask(sub_806E884, 1); @@ -3694,11 +3694,11 @@ u8 sub_806E834(const u8 *message, u8 arg1) static void sub_806E884(u8 taskId) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { gUnknown_0202E8F6 = 0; if (gTasks[taskId].data[0] == 0) - MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); + Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); DestroyTask(taskId); } } @@ -3794,7 +3794,7 @@ void PartyMenuTryGiveMonHeldItem_806EACC(u8 taskId) { u16 currentItem; - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); currentItem = GetMonData(ewram1C000.pokemon, MON_DATA_HELD_ITEM); RemoveBagItem(ewram1C000.unk6, 1); if (AddBagItem(currentItem, 1) == TRUE) @@ -3823,7 +3823,7 @@ void PartyMenuTryGiveMonHeldItem_806EACC(u8 taskId) return; if (selection == -1) PlaySE(SE_SELECT); - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); } gTasks[taskId].func = party_menu_link_mon_held_item_object; } @@ -3938,7 +3938,7 @@ void Task_LoseMailMessage(u8 taskId) { sub_806E834(gOtherText_BagFullCannotRemoveItem, 0); } - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); gTasks[taskId].func = party_menu_link_mon_held_item_object; } else @@ -3947,8 +3947,8 @@ void Task_LoseMailMessage(u8 taskId) return; if (selection == -1) PlaySE(SE_SELECT); - MenuZeroFillWindowRect(23, 8, 29, 13); - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskId].func = party_menu_link_mon_held_item_object; } } @@ -3968,7 +3968,7 @@ void Task_TakeHeldMail(u8 taskId) if (selection == 0) { - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); if (TakeMailFromMon2(ewram1C000.pokemon) != 0xFF) sub_806E834(gOtherText_MailWasSent, 0); else @@ -3981,7 +3981,7 @@ void Task_TakeHeldMail(u8 taskId) return; if (selection == -1) PlaySE(SE_SELECT); - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); sub_806E834(gOtherText_MailRemovedMessageLost, 1); gTasks[taskId].func = Task_ConfirmLoseMailMessage; } @@ -4130,7 +4130,7 @@ void sub_806F390(u8 taskId) if (selection == 0) { - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); sub_806E834(gOtherText_WhichMoveToForget2, 1); gTasks[taskId].func = sub_806F44C; } @@ -4206,7 +4206,7 @@ void StopTryingToTeachMove_806F588(u8 taskId) void StopTryingToTeachMove_806F614(u8 taskId) { - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]); StringExpandPlaceholders(gStringVar4, gOtherText_StopTryingTo); sub_806E834(gStringVar4, 1); @@ -4228,7 +4228,7 @@ void StopTryingToTeachMove_806F6B4(u8 taskId) if (selection == 0) { - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); GetMonNickname(ewram1C000.pokemon, gStringVar1); StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]); StringExpandPlaceholders(gStringVar4, gOtherText_DidNotLearnMove2); @@ -4241,7 +4241,7 @@ void StopTryingToTeachMove_806F6B4(u8 taskId) return; if (selection == -1) PlaySE(SE_SELECT); - MenuZeroFillWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(23, 8, 29, 13); GetMonNickname(ewram1C000.pokemon, gStringVar1); StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]); StringExpandPlaceholders(gStringVar4, gOtherText_WantsToLearn); @@ -4592,7 +4592,7 @@ void sub_8070088(u8 taskId) else { gUnknown_0202E8F4 = 1; - MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); + Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19); PlaySE(SE_KAIFUKU); PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.unk5); task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + ewram1C000.unk5 * 2], 9); @@ -4649,12 +4649,12 @@ void CreateItemUseMoveMenu(u8 partyMonIndex) u8 i; r6 = 0; - MenuDrawTextWindow(19, 10, 29, 19); + Menu_DrawStdWindowFrame(19, 10, 29, 19); for (i = 0; i < 4; i++) { u16 move = GetMonData(&gPlayerParty[partyMonIndex], MON_DATA_MOVE1 + i); - MenuPrint(gMoveNames[move], 20, i * 2 + 11); + Menu_PrintText(gMoveNames[move], 20, i * 2 + 11); if (move != 0) r6++; } @@ -4666,12 +4666,12 @@ void Task_HandleItemUseMoveMenuInput(u8 taskId) if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } else if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); } else if (gMain.newKeys & A_BUTTON) { @@ -4714,16 +4714,16 @@ void DoPPRecoveryItemEffect(u8 taskId, u16 item, TaskFunc c) void ItemUseMoveMenu_HandleMoveSelection(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(19, 10, 29, 19); + Menu_EraseWindowRect(19, 10, 29, 19); sub_806D5A4(); - gTasks[taskId].data[11] = GetMenuCursorPos(); + gTasks[taskId].data[11] = Menu_GetCursorPos(); DoRecoverPP(taskId); } void ItemUseMoveMenu_HandleCancel(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(19, 10, 29, 19); + Menu_EraseWindowRect(19, 10, 29, 19); if (gMain.inBattle) gTasks[ewram1C000.unk4].func = HandleBattlePartyMenu; else @@ -4852,7 +4852,7 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId) { u8 i; - MenuDrawTextWindow(11, 0, 29, 7); + Menu_DrawStdWindowFrame(11, 0, 29, 7); for (i = 0; i < NUM_STATS; i++) { @@ -4897,7 +4897,7 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId) { movs r1, 0\n\ movs r2, 0x1D\n\ movs r3, 0x7\n\ - bl MenuDrawTextWindow\n\ + bl Menu_DrawStdWindowFrame\n\ movs r7, 0\n\ ldr r0, _0807092C @ =gStringVar1\n\ mov r10, r0\n\ @@ -4981,7 +4981,7 @@ _0807086C:\n\ mov r0, r10\n\ adds r1, r4, 0\n\ adds r2, r5, 0\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ adds r0, r7, 0x1\n\ lsls r0, 24\n\ lsrs r7, r0, 24\n\ @@ -5070,7 +5070,7 @@ void Task_RareCandy3(u8 taskId) u16 learnedMove; u16 evolutionSpecies; - MenuZeroFillWindowRect(11, 0, 29, 7); + Menu_EraseWindowRect(11, 0, 29, 7); learnedMove = MonTryLearningNewMove(ewram1C000.pokemon, TRUE); ewram1B000.unk282 = 1; diff --git a/src/field/player_pc.c b/src/field/player_pc.c index 928cb9689..7cbb20bad 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -217,7 +217,7 @@ void PlayerPC(void) static void InitPlayerPCMenu(u8 taskId) { - MenuDrawTextWindow(0, 0, 10, gPcItemMenuOptionsNum * 2 + 1); + Menu_DrawStdWindowFrame(0, 0, 10, gPcItemMenuOptionsNum * 2 + 1); PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, sPlayerPCMenuActions, gPcItemMenuOptionOrder); InitMenu(0, 1, 1, gPcItemMenuOptionsNum, 0, 9); TASK.FUNC = PlayerPCProcessMenuInput; @@ -228,18 +228,18 @@ static void PlayerPCProcessMenuInput(u8 taskId) if (gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); } else if (gMain.newKeys & A_BUTTON) { HandleDestroyMenuCursors(); PlaySE(SE_SELECT); - sPlayerPCMenuActions[gPcItemMenuOptionOrder[GetMenuCursorPos()]].func(taskId); + sPlayerPCMenuActions[gPcItemMenuOptionOrder[Menu_GetCursorPos()]].func(taskId); } else if (gMain.newKeys & B_BUTTON) { @@ -262,7 +262,7 @@ static void PlayerPC_ItemStorage(u8 taskId) static void PlayerPC_Mailbox(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 10, 9); + Menu_EraseWindowRect(0, 0, 10, 9); eMailboxInfo.count = GetMailboxMailCount(); if (eMailboxInfo.count == 0) @@ -280,7 +280,7 @@ static void PlayerPC_Mailbox(u8 taskId) static void PlayerPC_Decoration(u8 var) { - MenuZeroFillWindowRect(0, 0, 10, 9); + Menu_EraseWindowRect(0, 0, 10, 9); DoPlayerPCDecoration(var); } @@ -288,7 +288,7 @@ static void PlayerPC_TurnOff(u8 taskId) { if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC and not player PC, so do gender specific handling. { - MenuZeroFillWindowRect(0, 0, 0x1D, 0x13); + Menu_EraseWindowRect(0, 0, 0x1D, 0x13); if (gSaveBlock2.playerGender == MALE) ScriptContext1_SetupScript(gBrendanHouse_TurnPCOff); @@ -297,7 +297,7 @@ static void PlayerPC_TurnOff(u8 taskId) } else { - MenuZeroFillWindowRect(0, 0, 10, 9); + Menu_EraseWindowRect(0, 0, 10, 9); EnableBothScriptContexts(); } DestroyTask(taskId); @@ -305,8 +305,8 @@ static void PlayerPC_TurnOff(u8 taskId) static void InitItemStorageMenu(u8 var) { - MenuZeroFillWindowRect(0, 0, 10, 9); - MenuDrawTextWindow(0, 0, 11, 9); + Menu_EraseWindowRect(0, 0, 10, 9); + Menu_DrawStdWindowFrame(0, 0, 11, 9); PrintMenuItems(1, 1, 4, (struct MenuAction *)gPCText_ItemPCOptionsText); InitMenu(0, 1, 1, 4, var, 10); ItemStorageMenuPrint(gPCText_OptionDescList[var]); @@ -314,8 +314,8 @@ static void InitItemStorageMenu(u8 var) static void ItemStorageMenuPrint(const u8 *textPtr) { - MenuFillWindowRectWithBlankTile(2, 15, 27, 18); - MenuPrint(textPtr, 2, 15); + Menu_BlankWindowRect(2, 15, 27, 18); + Menu_PrintText(textPtr, 2, 15); } static void ItemStorageMenuProcessInput(u8 var) @@ -323,19 +323,19 @@ static void ItemStorageMenuProcessInput(u8 var) if (gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); - ItemStorageMenuPrint(gPCText_OptionDescList[GetMenuCursorPos()]); + Menu_MoveCursor(-1); + ItemStorageMenuPrint(gPCText_OptionDescList[Menu_GetCursorPos()]); } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); - ItemStorageMenuPrint(gPCText_OptionDescList[GetMenuCursorPos()]); + Menu_MoveCursor(1); + ItemStorageMenuPrint(gPCText_OptionDescList[Menu_GetCursorPos()]); } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - gPCText_ItemPCOptionsText[GetMenuCursorPos()].func(var); + gPCText_ItemPCOptionsText[Menu_GetCursorPos()].func(var); } else if (gMain.newKeys & B_BUTTON) { @@ -368,7 +368,7 @@ static void ItemStorage_HandleReturnToProcessInput(u8 taskId) void ItemStorage_ReturnToMenuAfterDeposit(void) { - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); InitItemStorageMenu(ITEMPC_MENU_DEPOSIT); CreateTask(ItemStorage_HandleReturnToProcessInput, 0); pal_fill_black(); @@ -379,12 +379,12 @@ static void ItemStorage_Withdraw(u8 taskId) s16 *data = TASK.data; HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 11, 9); + Menu_EraseWindowRect(0, 0, 11, 9); NUM_ITEMS = CountUsedPCItemSlots(); if (NUM_ITEMS != 0) { - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); CURRENT_ITEM_STORAGE_MENU = ITEMPC_MENU_WITHDRAW; PAGE_INDEX = 0; ITEMS_ABOVE_TOP = 0; @@ -401,12 +401,12 @@ static void ItemStorage_Toss(u8 taskId) s16 *data = TASK.data; HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 11, 9); + Menu_EraseWindowRect(0, 0, 11, 9); NUM_ITEMS = CountUsedPCItemSlots(); if (NUM_ITEMS) { - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); CURRENT_ITEM_STORAGE_MENU = ITEMPC_MENU_TOSS; PAGE_INDEX = 0; ITEMS_ABOVE_TOP = 0; @@ -421,7 +421,7 @@ static void ItemStorage_Toss(u8 taskId) static void ItemStorage_Exit(u8 var) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 11, 9); + Menu_EraseWindowRect(0, 0, 11, 9); ReshowPlayerPC(var); } @@ -450,7 +450,7 @@ static void ItemStorage_ProcessInput(u8 taskId) if(PAGE_INDEX != 0) // did the cursor move physically upwards? { PlaySE(SE_SELECT); - PAGE_INDEX = MoveMenuCursor(-1); + PAGE_INDEX = Menu_MoveCursor(-1); trueIndex = ITEMS_ABOVE_TOP + PAGE_INDEX; if (SWITCH_MODE_ACTIVE == FALSE) // are we not currently switching items? { @@ -474,7 +474,7 @@ static void ItemStorage_ProcessInput(u8 taskId) ItemStorage_DrawBothListAndDescription(taskId); if (SWITCH_MODE_ACTIVE != FALSE) - MoveMenuCursor(0); // don't move the cursor. it's at the top of the page index, but not the true index. + Menu_MoveCursor(0); // don't move the cursor. it's at the top of the page index, but not the true index. } } else if(gMain.newAndRepeatedKeys & DPAD_DOWN) // _0813A306 @@ -482,7 +482,7 @@ static void ItemStorage_ProcessInput(u8 taskId) if(PAGE_INDEX != NUM_PAGE_ITEMS - 1) { PlaySE(SE_SELECT); - PAGE_INDEX = MoveMenuCursor(1); + PAGE_INDEX = Menu_MoveCursor(1); trueIndex = ITEMS_ABOVE_TOP + PAGE_INDEX; if(SWITCH_MODE_ACTIVE != FALSE) @@ -500,7 +500,7 @@ static void ItemStorage_ProcessInput(u8 taskId) ItemStorage_DrawBothListAndDescription(taskId); if (SWITCH_MODE_ACTIVE != FALSE) - MoveMenuCursor(0); + Menu_MoveCursor(0); } } else if(gMain.newKeys & SELECT_BUTTON) // _0813A3A0 @@ -565,8 +565,8 @@ static void ItemStorage_GoBackToPlayerPCMenu(u8 taskId) BuyMenuFreeMemory(); DestroyVerticalScrollIndicator(0); DestroyVerticalScrollIndicator(1); - MenuZeroFillWindowRect(0, 0, 29, 19); - MenuDisplayMessageBox(); + Menu_EraseWindowRect(0, 0, 29, 19); + Menu_DisplayDialogueFrame(); InitItemStorageMenu(TASK.CURRENT_ITEM_STORAGE_MENU); TASK.FUNC = ItemStorageMenuProcessInput; } @@ -603,7 +603,7 @@ static void ItemStorage_DoItemAction(u8 taskId) ItemStorage_PrintItemPcResponse(ITEMPC_HOW_MANY_TO_TOSS); } NUM_QUANTITY_ROLLER = 1; - MenuDrawTextWindow(6, 8, 13, 11); + Menu_DrawStdWindowFrame(6, 8, 13, 11); sub_80A418C(NUM_QUANTITY_ROLLER, STR_CONV_MODE_RIGHT_ALIGN, 8, 9, 3); TASK.FUNC = ItemStorage_HandleQuantityRolling; } @@ -652,7 +652,7 @@ static void ItemStorage_HandleQuantityRolling(u8 taskId) else if(gMain.newKeys & A_BUTTON) // confirm quantity. { PlaySE(SE_SELECT); - MenuZeroFillWindowRect(6, 6, 0xD, 0xB); + Menu_EraseWindowRect(6, 6, 0xD, 0xB); if(CURRENT_ITEM_STORAGE_MENU == ITEMPC_MENU_WITHDRAW) ItemStorage_DoItemWithdraw(taskId); @@ -662,7 +662,7 @@ static void ItemStorage_HandleQuantityRolling(u8 taskId) else if(gMain.newKeys & B_BUTTON) // cancel quantity. { PlaySE(SE_SELECT); - MenuZeroFillWindowRect(6, 6, 0xD, 0xB); + Menu_EraseWindowRect(6, 6, 0xD, 0xB); StartVerticalScrollIndicators(0); StartVerticalScrollIndicators(1); ItemStorage_PrintItemPcResponse(gSaveBlock1.pcItems[ITEMS_ABOVE_TOP + PAGE_INDEX].itemId); // why not use trueIndex? @@ -713,7 +713,7 @@ static void ItemStorage_DoItemToss(u8 taskId) static void ItemStorage_ResumeInputFromYesToss(u8 taskId) { - MenuZeroFillWindowRect(0x6, 0x6, 0xD, 0xB); + Menu_EraseWindowRect(0x6, 0x6, 0xD, 0xB); ItemStorage_PrintItemPcResponse(ITEMPC_THREW_AWAY_ITEM); TASK.FUNC = ItemStorage_HandleRemoveItem; } @@ -722,7 +722,7 @@ static void ItemStorage_ResumeInputFromNoToss(u8 taskId) { s16 *data = TASK.data; - MenuZeroFillWindowRect(0x6, 0x6, 0xD, 0xB); + Menu_EraseWindowRect(0x6, 0x6, 0xD, 0xB); InitMenu(0, 16, 2, NUM_PAGE_ITEMS, PAGE_INDEX, 0xD); StartVerticalScrollIndicators(0); StartVerticalScrollIndicators(1); @@ -765,7 +765,7 @@ static void ItemStorage_WaitPressHandleResumeProcessInput(u8 taskId) static void ItemStorage_HandleResumeProcessInput(u8 taskId) { - MenuZeroFillWindowRect(0x6, 0x6, 0xD, 0xB); + Menu_EraseWindowRect(0x6, 0x6, 0xD, 0xB); StartVerticalScrollIndicators(0); StartVerticalScrollIndicators(1); ItemStorage_DrawBothListAndDescription(taskId); @@ -817,14 +817,14 @@ static void ItemStorage_DrawItemQuantity(u16 arg1, enum StringConvertMode arg2, sub_80A4164(gStringVar1, arg1, arg2, arg4); if(isSwapSelected != FALSE) - MenuPrint(gSelectedItemQuantityFormatText, 0x1A, arg3); + Menu_PrintText(gSelectedItemQuantityFormatText, 0x1A, arg3); else - MenuPrint(gNonSelectedItemQuantityFormatText, 0x1A, arg3); + Menu_PrintText(gNonSelectedItemQuantityFormatText, 0x1A, arg3); } static void ItemStorage_DrawItemVoidQuantity(u8 var) { - MenuPrint(gUnknown_08406330, 0x19, var); + Menu_PrintText(gUnknown_08406330, 0x19, var); } static void ItemStorage_DrawItemName(struct ItemSlot *itemSlot, u8 var, int isSwapSelected) @@ -832,9 +832,9 @@ static void ItemStorage_DrawItemName(struct ItemSlot *itemSlot, u8 var, int isSw CopyItemName(itemSlot->itemId, gStringVar1); if(isSwapSelected != FALSE) - MenuPrint(gSelectedItemFormattedText, 16, var); + Menu_PrintText(gSelectedItemFormattedText, 16, var); else - MenuPrint(gNonSelectedItemFormattedText, 16, var); + Menu_PrintText(gNonSelectedItemFormattedText, 16, var); } static void ItemStorage_DrawNormalItemEntry(struct ItemSlot *itemSlot, u8 var, int var2) @@ -900,7 +900,7 @@ static void ItemStorage_DrawItemList(u8 taskId) } if (i - ITEMS_ABOVE_TOP < 8) - MenuFillWindowRectWithBlankTile(16, yCoord + 4, 0x1C, 0x12); + Menu_BlankWindowRect(16, yCoord + 4, 0x1C, 0x12); if (ITEMS_ABOVE_TOP != 0) CreateVerticalScrollIndicators(0, 0xB8, 8); @@ -977,11 +977,11 @@ static void ItemStorage_GoBackToItemPCMenu(u8 taskId, u8 var) sub_80F944C(); LoadScrollIndicatorPalette(); ItemStorage_LoadPalette(); - MenuDrawTextWindow(0xF, 0, 0x1D, 0x13); - MenuDrawTextWindow(0, 0xC, 0xE, 0x13); - MenuDrawTextWindow(0, 0, 0xB, 3); + Menu_DrawStdWindowFrame(0xF, 0, 0x1D, 0x13); + Menu_DrawStdWindowFrame(0, 0xC, 0xE, 0x13); + Menu_DrawStdWindowFrame(0, 0, 0xB, 3); ItemStorage_PrintItemPcResponse(gSaveBlock1.pcItems[0].itemId); - MenuPrint(gPCText_ItemPCOptionsText[var].text, 1, 1); + Menu_PrintText(gPCText_ItemPCOptionsText[var].text, 1, 1); ItemStorage_DrawItemList(taskId); InitMenu(0, 0x10, 2, NUM_PAGE_ITEMS, PAGE_INDEX, 0xD); } @@ -1037,22 +1037,22 @@ static void Mailbox_DrawMailList(u8 taskId) // taskId is unused for (i = eMailboxInfo.itemsAbove; i < eMailboxInfo.itemsAbove + eMailboxInfo.pageItems; i++) { yCoord = (i - eMailboxInfo.itemsAbove) * 2; - MenuFillWindowRectWithBlankTile(0x15, yCoord + 2, 0x1C, yCoord + 3); + Menu_BlankWindowRect(0x15, yCoord + 2, 0x1C, yCoord + 3); if (i == eMailboxInfo.count) { - MenuPrint(gOtherText_CancelNoTerminator, 0x15, yCoord + 2); + Menu_PrintText(gOtherText_CancelNoTerminator, 0x15, yCoord + 2); break; } else { StringCopy(gStringVar1, gSaveBlock1.mail[i + 6].playerName); SanitizeNameString(gStringVar1); - MenuPrint(gStringVar1, 0x15, yCoord + 2); + Menu_PrintText(gStringVar1, 0x15, yCoord + 2); } } if (i - eMailboxInfo.itemsAbove != 8) - MenuFillWindowRectWithBlankTile(0x15, yCoord + 4, 0x1C, 0x12); + Menu_BlankWindowRect(0x15, yCoord + 4, 0x1C, 0x12); if (eMailboxInfo.itemsAbove != 0) CreateVerticalScrollIndicators(0, 0xC8, 8); @@ -1069,10 +1069,10 @@ static void Mailbox_DrawMailboxMenu(u8 taskId) { sub_80F944C(); LoadScrollIndicatorPalette(); - MenuZeroFillWindowRect(0, 0, 0x1D, 0x13); - MenuDrawTextWindow(0, 0, 0x8, 0x3); - MenuPrint(gPCText_Mailbox, 1, 1); - MenuDrawTextWindow(0x14, 0, 0x1D, 0x13); + Menu_EraseWindowRect(0, 0, 0x1D, 0x13); + Menu_DrawStdWindowFrame(0, 0, 0x8, 0x3); + Menu_PrintText(gPCText_Mailbox, 1, 1); + Menu_DrawStdWindowFrame(0x14, 0, 0x1D, 0x13); Mailbox_DrawMailList(taskId); InitMenu(0, 0x15, 2, eMailboxInfo.pageItems, eMailboxInfo.cursorPos, 8); } @@ -1087,7 +1087,7 @@ static void Mailbox_ProcessInput(u8 taskId) if(eMailboxInfo.cursorPos != 0) { PlaySE(SE_SELECT); - eMailboxInfo.cursorPos = MoveMenuCursor(-1); + eMailboxInfo.cursorPos = Menu_MoveCursor(-1); } else if(eMailboxInfo.itemsAbove != 0) { @@ -1101,7 +1101,7 @@ static void Mailbox_ProcessInput(u8 taskId) if(eMailboxInfo.cursorPos != eMailboxInfo.pageItems - 1) { PlaySE(SE_SELECT); - eMailboxInfo.cursorPos = MoveMenuCursor(1); + eMailboxInfo.cursorPos = Menu_MoveCursor(1); } else if(eMailboxInfo.itemsAbove + eMailboxInfo.cursorPos != eMailboxInfo.count) { @@ -1143,7 +1143,7 @@ static void Mailbox_CloseScrollIndicators(void) static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 0x1D, 0x13); + Menu_EraseWindowRect(0, 0, 0x1D, 0x13); StringCopy(gStringVar1, gSaveBlock1.mail[eMailboxInfo.itemsAbove + 6 + eMailboxInfo.cursorPos].playerName); SanitizeNameString(gStringVar1); StringExpandPlaceholders(gStringVar4, gOtherText_WhatWillYouDoMail); @@ -1152,7 +1152,7 @@ static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId) static void Mailbox_ReturnToPlayerPC(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 0x1D, 0x13); + Menu_EraseWindowRect(0, 0, 0x1D, 0x13); ReshowPlayerPC(taskId); } @@ -1164,7 +1164,7 @@ static void Mailbox_TurnOff(u8 taskId) static void Mailbox_PrintMailOptions(u8 taskId) // Mailbox_PrintMailOptions { - MenuDrawTextWindow(0, 0, 0xC, 0x9); + Menu_DrawStdWindowFrame(0, 0, 0xC, 0x9); PrintMenuItems(1, 1, 4, (struct MenuAction *)gMailboxMailOptions); InitMenu(0, 1, 1, 4, 0, 0xB); TASK.FUNC = Mailbox_MailOptionsProcessInput; @@ -1175,17 +1175,17 @@ static void Mailbox_MailOptionsProcessInput(u8 taskId) if(gMain.newAndRepeatedKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } else if(gMain.newAndRepeatedKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); } else if(gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - gMailboxMailOptions[GetMenuCursorPos()].func(taskId); + gMailboxMailOptions[Menu_GetCursorPos()].func(taskId); } else if(gMain.newKeys & B_BUTTON) { @@ -1233,7 +1233,7 @@ static void Mailbox_MoveToBag(u8 taskId) { HandleDestroyMenuCursors(); StringCopy(gStringVar1, gOtherText_MoveToBag); - MenuPrint(gHighlightedMoveToBagFormatText, 1, 3); // gHighlightedMoveToBagFormatText + Menu_PrintText(gHighlightedMoveToBagFormatText, 1, 3); // gHighlightedMoveToBagFormatText DisplayItemMessageOnField(taskId, gOtherText_MessageWillBeLost, Mailbox_DrawYesNoBeforeMove, 0); } @@ -1247,7 +1247,7 @@ static void Mailbox_DoMailMoveToBag(u8 taskId) { struct MailStruct *mail = &gSaveBlock1.mail[eMailboxInfo.itemsAbove + 6 + eMailboxInfo.cursorPos]; - MenuZeroFillWindowRect(0x14, 8, 0x1A, 0xD); + Menu_EraseWindowRect(0x14, 8, 0x1A, 0xD); if(AddBagItem(mail->itemId, 1) == FALSE) { @@ -1270,7 +1270,7 @@ static void Mailbox_DoMailMoveToBag(u8 taskId) static void Mailbox_ReturnToInputAfterNo(u8 taskId) // Mailbox_ReturnToInputAfterNo { - MenuZeroFillWindowRect(0x14, 0x8, 0x1A, 0xD); + Menu_EraseWindowRect(0x14, 0x8, 0x1A, 0xD); Mailbox_DrawMailMenuAndDoProcessInput(taskId); } @@ -1326,7 +1326,7 @@ static void Mailbox_NoPokemonForMail(u8 taskId) static void Mailbox_Cancel(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 0xC, 0x9); + Menu_EraseWindowRect(0, 0, 0xC, 0x9); Mailbox_DrawMailMenuAndDoProcessInput(taskId); } diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 640d4731f..3ca359ef7 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -452,11 +452,11 @@ static void sub_810BB0C(void) static void sub_810BB30(void) { BasicInitMenuWindow(&gWindowConfig_81E6E34); - MenuPrint(gContestStatsText_Spicy, 2, 13); - MenuPrint(gContestStatsText_Dry, 2, 15); - MenuPrint(gContestStatsText_Sweet, 2, 17); - MenuPrint(gContestStatsText_Bitter, 8, 13); - MenuPrint(gContestStatsText_Sour, 8, 15); + Menu_PrintText(gContestStatsText_Spicy, 2, 13); + Menu_PrintText(gContestStatsText_Dry, 2, 15); + Menu_PrintText(gContestStatsText_Sweet, 2, 17); + Menu_PrintText(gContestStatsText_Bitter, 8, 13); + Menu_PrintText(gContestStatsText_Sour, 8, 15); } static void sub_810BB88(u8 a0) @@ -471,10 +471,10 @@ static void sub_810BB88(u8 a0) if (i == gUnknown_02039248.unk2) { buf = sub_8072C74(gStringVar1, gContestStatsText_StowCase, 0x78, 0); - MenuPrint(gStringVar1, 15, y + 1); + Menu_PrintText(gStringVar1, 15, y + 1); if (i != a0 + 8) { - MenuZeroFillWindowRect(15, y + 3, 29, 18); + Menu_EraseWindowRect(15, y + 3, 29, 18); } break; } @@ -484,7 +484,7 @@ static void sub_810BB88(u8 a0) buf[2] = 0x06; buf += 3; ConvertIntToDecimalStringN(buf, sub_810C9B0(&gSaveBlock1.pokeblocks[i]), STR_CONV_MODE_RIGHT_ALIGN, 3); - MenuPrint(gStringVar1, 15, y + 1); + Menu_PrintText(gStringVar1, 15, y + 1); } } @@ -600,11 +600,11 @@ static void sub_810BDAC(bool8 flag) if (gUnknown_02039248.unk0 + gUnknown_02039248.unk1 != gUnknown_02039248.unk2) { sub_8072C14(gStringVar1, sub_810C9E8(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1]), 16, 1); - MenuPrint(gStringVar1, 11, 17); + Menu_PrintText(gStringVar1, 11, 17); } else { - MenuZeroFillWindowRect(11, 17, 12, 18); + Menu_EraseWindowRect(11, 17, 12, 18); } } @@ -813,7 +813,7 @@ static void sub_810C368(u8 taskId) sub_80F98A4(0); sub_80F98A4(1); BasicInitMenuWindow(&gWindowConfig_81E6E50); - MenuDrawTextWindow(7, v0 + 4, 13, 11); + Menu_DrawStdWindowFrame(7, v0 + 4, 13, 11); PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758); InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5); gSpecialVar_ItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1; @@ -824,24 +824,24 @@ static void sub_810C40C(u8 taskId) { if (gMain.newAndRepeatedKeys & DPAD_UP) { - if (GetMenuCursorPos()) + if (Menu_GetCursorPos()) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - if (GetMenuCursorPos() != gUnknown_0203924C - 1) + if (Menu_GetCursorPos() != gUnknown_0203924C - 1) { PlaySE(SE_SELECT); - MoveMenuCursor(+1); + Menu_MoveCursor(+1); } } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - gUnknown_083F7EF4[gUnknown_03000758[GetMenuCursorPos()]].func(taskId); + gUnknown_083F7EF4[gUnknown_03000758[Menu_GetCursorPos()]].func(taskId); } else if (gMain.newKeys & B_BUTTON) { @@ -870,7 +870,7 @@ static void sub_810C540(u8 taskId) { BasicInitMenuWindow(&gWindowConfig_81E6E50); HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(7, 4, 13, 11); + Menu_EraseWindowRect(7, 4, 13, 11); StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1].color]); StringExpandPlaceholders(gStringVar4, gContestStatsText_ThrowAwayPrompt); DisplayItemMessageOnField(taskId, gStringVar4, sub_810C5EC, 0); @@ -890,7 +890,7 @@ static void sub_810C5EC(u8 taskId) static void sub_810C610(u8 taskId) { - MenuZeroFillWindowRect(7, 6, 13, 11); + Menu_EraseWindowRect(7, 6, 13, 11); PokeblockClearIfExists((gUnknown_02039248.unk0 + gUnknown_02039248.unk1)); StringExpandPlaceholders(gStringVar4, gContestStatsText_WasThrownAway); DisplayItemMessageOnField(taskId, gStringVar4, sub_810C704, 0); @@ -907,8 +907,8 @@ static void sub_810C668(u8 taskId) sub_80F979C(1, 0); } BasicInitMenuWindow(&gWindowConfig_81E6E50); - MenuZeroFillWindowRect(7, 6, 13, 11); - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(7, 6, 13, 11); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskId].func = sub_810BF7C; } @@ -933,7 +933,7 @@ static void sub_810C748(u8 taskId) StartVerticalScrollIndicators(0); StartVerticalScrollIndicators(1); HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(7, 4, 13, 11); + Menu_EraseWindowRect(7, 4, 13, 11); gTasks[taskId].func = sub_810BF7C; } diff --git a/src/field/region_map.c b/src/field/region_map.c index 07e77e389..1eb57b803 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -1544,7 +1544,7 @@ void CB2_InitFlyRegionMap(void) break; case 2: InitMenuWindow(&gWindowConfig_81E7224); - MenuZeroFillScreen(); + Menu_EraseScreen(); break; case 3: InitRegionMap(&ewram0_3.regionMap, 0); @@ -1619,8 +1619,8 @@ static void PrintFlyTargetName(void) { if (FlagGet(r4->flag)) { - MenuDrawTextWindow(16, 14, 29, 19); - MenuPrint(ewram0_3.regionMap.mapSectionName, 17, 15); + Menu_DrawStdWindowFrame(16, 14, 29, 19); + Menu_PrintText(ewram0_3.regionMap.mapSectionName, 17, 15); MenuPrint_RightAligned(r4->unk0[ewram0_3.regionMap.everGrandeCityArea], 29, 17); return; } @@ -1631,16 +1631,16 @@ static void PrintFlyTargetName(void) asm("mov %0, #0\n":"=r"(zero)); // zero = 0 if (zero == 0) { - MenuDrawTextWindow(16, 16, 29, 19); - MenuPrint(ewram0_3.regionMap.mapSectionName, 17, 17); - MenuZeroFillWindowRect(16, 14, 29, 15); + Menu_DrawStdWindowFrame(16, 16, 29, 19); + Menu_PrintText(ewram0_3.regionMap.mapSectionName, 17, 17); + Menu_EraseWindowRect(16, 14, 29, 15); } } else { - MenuDrawTextWindow(16, 16, 29, 19); - MenuPrint(ewramBlankMapName, 17, 17); - MenuZeroFillWindowRect(16, 14, 29, 15); + Menu_DrawStdWindowFrame(16, 16, 29, 19); + Menu_PrintText(ewramBlankMapName, 17, 17); + Menu_EraseWindowRect(16, 14, 29, 15); } } diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c index 05a909e81..e795fd8ed 100644 --- a/src/field/scrcmd.c +++ b/src/field/scrcmd.c @@ -1333,7 +1333,7 @@ bool8 ScrCmd_drawbox(struct ScriptContext *ctx) u8 right = ScriptReadByte(ctx); u8 bottom = ScriptReadByte(ctx); - MenuDrawTextWindow(left, top, right, bottom); + Menu_DrawStdWindowFrame(left, top, right, bottom); return FALSE; } @@ -1363,7 +1363,7 @@ bool8 ScrCmd_erasebox(struct ScriptContext *ctx) u8 right = ScriptReadByte(ctx); u8 bottom = ScriptReadByte(ctx); - MenuZeroFillWindowRect(left, top, right, bottom); + Menu_EraseWindowRect(left, top, right, bottom); return FALSE; } @@ -1428,8 +1428,8 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) u8 v6 = ptr[4]; u8 v7 = ptr[5]; StringBraille(gStringVar4, ptr + 6); - MenuDrawTextWindow(v2, v3, v4, v5); - MenuPrint(gStringVar4, v6, v7); + Menu_DrawStdWindowFrame(v2, v3, v4, v5); + Menu_PrintText(gStringVar4, v6, v7); return FALSE; } diff --git a/src/field/script_menu.c b/src/field/script_menu.c index 9f3ab75cc..bf6e93e41 100644 --- a/src/field/script_menu.c +++ b/src/field/script_menu.c @@ -622,7 +622,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ig static u16 GetStringWidthInTilesForScriptMenu(const u8 *str) { // each tile on screen is 8x8, so it needs the number of tiles and not pixels, hence the division by 8. - return (GetStringWidthGivenWindowConfig((struct WindowConfig *)&gWindowConfig_81E6CE4, str) + 7) / 8; + return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6CE4, str) + 7) / 8; } static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress, u8 cursorPos) @@ -651,7 +651,7 @@ static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuActi bottom = top + (2 * count + 1); - MenuDrawTextWindow(left, top, right, bottom); + Menu_DrawStdWindowFrame(left, top, right, bottom); PrintMenuItems(left + 1, top + 1, count, list); InitMenu(0, left + 1, top + 1, count, cursorPos, right - left - 1); StartScriptMenuTask(left, top, right, bottom, ignoreBPress, count); @@ -687,9 +687,9 @@ static void Task_HandleMultichoiceInput(u8 taskId) if (!gPaletteFade.active) { if (!gTasks[taskId].tDoWrap) - selection = ProcessMenuInputNoWrap(); + selection = Menu_ProcessInputNoWrap(); else - selection = ProcessMenuInput(); + selection = Menu_ProcessInput(); if (selection != -2) { @@ -705,7 +705,7 @@ static void Task_HandleMultichoiceInput(u8 taskId) gSpecialVar_Result = selection; } HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); + Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); DestroyTask(taskId); EnableBothScriptContexts(); } @@ -788,7 +788,7 @@ static void Task_HandleYesNoInput(u8 taskId) return; } - switch (ProcessMenuInputNoWrap()) + switch (Menu_ProcessInputNoWrap()) { case -2: return; @@ -805,7 +805,7 @@ static void Task_HandleYesNoInput(u8 taskId) left = gTasks[taskId].tLeft; top = gTasks[taskId].tTop; - MenuZeroFillWindowRect(left, top, left + 6, top + 5); + Menu_EraseWindowRect(left, top, left + 6, top + 5); DestroyTask(taskId); EnableBothScriptContexts(); } @@ -851,7 +851,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr static void Task_HandleMultichoiceGridInput(u8 taskId) { - s8 selection = sub_80727CC(); + s8 selection = Menu_ProcessInputGridLayout(); if (selection != -2) { @@ -867,7 +867,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId) gSpecialVar_Result = selection; } HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); + Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); DestroyTask(taskId); EnableBothScriptContexts(); } @@ -909,23 +909,23 @@ void ScriptMenu_CreatePCMenu(void) if (FlagGet(FLAG_SYS_GAME_CLEAR)) // player has cleared game? { numChoices = 4; - MenuDrawTextWindow(0, 0, width + 2, 9); - MenuPrint(gPCText_HallOfFame, 1, 5); - MenuPrint(gPCText_LogOff, 1, 7); + Menu_DrawStdWindowFrame(0, 0, width + 2, 9); + Menu_PrintText(gPCText_HallOfFame, 1, 5); + Menu_PrintText(gPCText_LogOff, 1, 7); } else { numChoices = 3; - MenuDrawTextWindow(0, 0, width + 2, 7); - MenuPrint(gPCText_LogOff, 1, 5); + Menu_DrawStdWindowFrame(0, 0, width + 2, 7); + Menu_PrintText(gPCText_LogOff, 1, 5); } if (FlagGet(FLAG_SYS_PC_LANETTE)) // player met lanette? - MenuPrint(gPCText_LanettesPC, 1, 1); + Menu_PrintText(gPCText_LanettesPC, 1, 1); else - MenuPrint(gPCText_SomeonesPC, 1, 1); + Menu_PrintText(gPCText_SomeonesPC, 1, 1); - MenuPrint(gPCText_PlayersPC, 1, 3); + Menu_PrintText(gPCText_PlayersPC, 1, 3); InitMenu(0, 1, 1, numChoices, 0, width + 1); StartScriptMenuTask(0, 0, width + 2, 2 * numChoices + 1, 0, numChoices); } @@ -1008,15 +1008,15 @@ _080B57B4:\n\ movs r0, 0\n\ movs r1, 0\n\ movs r3, 0x9\n\ - bl MenuDrawTextWindow\n\ + bl Menu_DrawStdWindowFrame\n\ ldr r0, _080B57F8 @ =gPCText_HallOfFame\n\ movs r1, 0x1\n\ movs r2, 0x5\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ldr r0, _080B57F0 @ =gPCText_LogOff\n\ movs r1, 0x1\n\ movs r2, 0x7\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ b _080B5818\n\ .align 2, 0\n\ _080B57E8: .4byte gPCText_SomeonesPC\n\ @@ -1032,11 +1032,11 @@ _080B57FC:\n\ movs r0, 0\n\ movs r1, 0\n\ movs r3, 0x7\n\ - bl MenuDrawTextWindow\n\ + bl Menu_DrawStdWindowFrame\n\ ldr r0, _080B5834 @ =gPCText_LogOff\n\ movs r1, 0x1\n\ movs r2, 0x5\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ _080B5818:\n\ adds r6, r4, 0\n\ ldr r0, _080B5838 @ =0x0000084b\n\ @@ -1047,7 +1047,7 @@ _080B5818:\n\ ldr r0, _080B583C @ =gPCText_LanettesPC\n\ movs r1, 0x1\n\ movs r2, 0x1\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ b _080B584A\n\ .align 2, 0\n\ _080B5834: .4byte gPCText_LogOff\n\ @@ -1057,12 +1057,12 @@ _080B5840:\n\ ldr r0, _080B5888 @ =gPCText_SomeonesPC\n\ movs r1, 0x1\n\ movs r2, 0x1\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ _080B584A:\n\ ldr r0, _080B588C @ =gPCText_PlayersPC\n\ movs r1, 0x1\n\ movs r2, 0x3\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ movs r4, 0\n\ str r4, [sp]\n\ adds r0, r5, 0x1\n\ @@ -1096,8 +1096,8 @@ _080B588C: .4byte gPCText_PlayersPC\n\ void ScriptMenu_DisplayPCStartupPrompt(void) { - MenuDisplayMessageBox(); - MenuPrint(gPCText_WhichPCShouldBeAccessed, 2, 15); + Menu_DisplayDialogueFrame(); + Menu_PrintText(gPCText_WhichPCShouldBeAccessed, 2, 15); } #define tState data[0] @@ -1122,7 +1122,7 @@ static void Task_PokemonPicWindow(u8 taskId) task->tState++; break; case 3: - MenuZeroFillWindowRect(task->tWindowX, task->tWindowY, task->tWindowX + 9, task->tWindowY + 10); + Menu_EraseWindowRect(task->tWindowX, task->tWindowY, task->tWindowX + 9, task->tWindowY + 10); DestroyTask(taskId); break; } @@ -1139,7 +1139,7 @@ bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y) } else { - MenuDrawTextWindow(x, y, x + 9, y + 10); + Menu_DrawStdWindowFrame(x, y, x + 9, y + 10); taskId = CreateTask(Task_PokemonPicWindow, 0x50); gTasks[taskId].tState = 0; gTasks[taskId].tMonSpecies = species; diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 2e4138a3b..16c2f57c2 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -913,7 +913,7 @@ void Task_SecretBasePC_Registry(u8 taskId) taskData[1] = 0; taskData[2] = 0; - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_80BC7D8(taskId); gTasks[taskId].func = sub_80BC824; @@ -948,8 +948,8 @@ void sub_80BC6B0(u8 taskId) if (sub_80BC268(i) == TRUE) { sub_80BC190(gStringVar1, i); - MenuFillWindowRectWithBlankTile(18, 2 * n + 2, 28, 2 * n + 3); - MenuPrint(gStringVar1, 18, 2 * n + 2); + Menu_BlankWindowRect(18, 2 * n + 2, 28, 2 * n + 3); + Menu_PrintText(gStringVar1, 18, 2 * n + 2); if (++n == 8) break; } @@ -957,11 +957,11 @@ void sub_80BC6B0(u8 taskId) if (n < 8) { - MenuFillWindowRectWithBlankTile(18, 2 * n + 2, 28, 2 * n + 3); - MenuPrint(gUnknownText_Exit, 18, 2 * n + 2); + Menu_BlankWindowRect(18, 2 * n + 2, 28, 2 * n + 3); + Menu_PrintText(gUnknownText_Exit, 18, 2 * n + 2); DestroyVerticalScrollIndicator(1); if (n != 7) - MenuFillWindowRectWithBlankTile(18, ((n << 25) + (1 << 26)) >> 24, 28, 18); // the shifts are needed to match + Menu_BlankWindowRect(18, ((n << 25) + (1 << 26)) >> 24, 28, 18); // the shifts are needed to match } else CreateVerticalScrollIndicators(1, 0xbc, 0x98); @@ -975,7 +975,7 @@ void sub_80BC6B0(u8 taskId) void sub_80BC7D8(u8 taskId) { u16 *taskData = gTasks[taskId].data; - MenuDrawTextWindow(17, 0, 29, 19); + Menu_DrawStdWindowFrame(17, 0, 29, 19); InitMenu(0, 18, 2, taskData[3] + 1, taskData[1], 11); sub_80BC6B0(taskId); @@ -990,7 +990,7 @@ void sub_80BC824(u8 taskId) if (taskData[1]) { PlaySE(5); - taskData[1] = MoveMenuCursor(-1); + taskData[1] = Menu_MoveCursor(-1); } else if (taskData[2]) { @@ -1013,7 +1013,7 @@ void sub_80BC824(u8 taskId) else { PlaySE(5); - taskData[1] = MoveMenuCursor(1); + taskData[1] = Menu_MoveCursor(1); } } else if (gMain.newKeys & A_BUTTON) @@ -1022,7 +1022,7 @@ void sub_80BC824(u8 taskId) if (taskData[1] + taskData[2] == taskData[0]) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_80BCC54(taskId); } else @@ -1036,7 +1036,7 @@ void sub_80BC824(u8 taskId) { PlaySE(5); HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_80BCC54(taskId); } } @@ -1066,7 +1066,7 @@ void sub_80BC980(u8 taskId) { PauseVerticalScrollIndicator(0); PauseVerticalScrollIndicator(1); - MenuDrawTextWindow(1, 0, 12, 5); + Menu_DrawStdWindowFrame(1, 0, 12, 5); PrintMenuItems(2, 1, 2, (const struct MenuAction *)gUnknown_083D13D4); InitMenu(0, 2, 1, 2, 0, 10); gTasks[taskId].func = sub_80BC9E4; @@ -1076,24 +1076,24 @@ void sub_80BC9E4(u8 taskId) { if (gMain.newAndRepeatedKeys & DPAD_UP) { - if (GetMenuCursorPos()) + if (Menu_GetCursorPos()) { PlaySE(5); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) { - if (GetMenuCursorPos() != 1) + if (Menu_GetCursorPos() != 1) { PlaySE(5); - MoveMenuCursor(1); + Menu_MoveCursor(1); } } else if (gMain.newKeys & A_BUTTON) { PlaySE(5); - gUnknown_083D13D4[GetMenuCursorPos()].func(taskId); + gUnknown_083D13D4[Menu_GetCursorPos()].func(taskId); } else if (gMain.newKeys & B_BUTTON) { @@ -1109,7 +1109,7 @@ void sub_80BCA84(u8 taskId) DestroyVerticalScrollIndicator(0); DestroyVerticalScrollIndicator(1); HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_80BC190(gStringVar1, taskData[4]); StringExpandPlaceholders(gStringVar4, gOtherText_OkayToDeleteFromRegistry); @@ -1126,7 +1126,7 @@ void sub_80BCB10(u8 taskId) { s16 *taskData = gTasks[taskId].data; - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gSaveBlock1.secretBases[taskData[4]].sbr_field_1_6 = 0; taskData[0]--; @@ -1147,13 +1147,13 @@ void sub_80BCB10(u8 taskId) void sub_80BCB90(u8 taskId) { - MenuZeroFillWindowRect(20, 8, 26, 13); + Menu_EraseWindowRect(20, 8, 26, 13); DisplayItemMessageOnField(taskId, gOtherText_RegisteredDataDeleted, sub_80BCB10, 0); } void sub_80BCBC0(u8 taskId) { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); sub_80BC7D8(taskId); gTasks[taskId].func = sub_80BC824; @@ -1164,7 +1164,7 @@ void sub_80BCBF8(u8 taskId) s16 *taskData = gTasks[taskId].data; InitMenu(0, 18, 2, taskData[3] + 1, taskData[1], 11); - MenuZeroFillWindowRect(1, 0, 12, 5); + Menu_EraseWindowRect(1, 0, 12, 5); StartVerticalScrollIndicators(0); StartVerticalScrollIndicators(1); diff --git a/src/field/shop.c b/src/field/shop.c index 23d668fc7..0d8bc83d1 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -84,13 +84,13 @@ u8 CreateShopMenu(u8 martType) if (martType == MART_TYPE_0) { gMartInfo.numChoices = 2; - MenuDrawTextWindow(0, 0, 10, 7); + Menu_DrawStdWindowFrame(0, 0, 10, 7); PrintMenuItemsReordered(1, 1, 3, sBuySellQuitMenuActions, gUnknown_083CC6E8); } else { gMartInfo.numChoices = 1; - MenuDrawTextWindow(0, 0, 10, 5); + Menu_DrawStdWindowFrame(0, 0, 10, 5); PrintMenuItemsReordered(1, 1, 2, sBuySellQuitMenuActions, gUnknown_083CC6EB); } InitMenu(0, 1, 1, gMartInfo.numChoices + 1, 0, 9); // add 1 for cancel @@ -126,7 +126,7 @@ void sub_80B2E38(u8 var) if (gMartInfo.cursor) // can move cursor up? { PlaySE(SE_SELECT); - gMartInfo.cursor = MoveMenuCursor(-1); + gMartInfo.cursor = Menu_MoveCursor(-1); } } else if (gMain.newAndRepeatedKeys & DPAD_DOWN) @@ -134,7 +134,7 @@ void sub_80B2E38(u8 var) if (gMartInfo.cursor != gMartInfo.numChoices) // can move cursor down? { PlaySE(SE_SELECT); - gMartInfo.cursor = MoveMenuCursor(1); + gMartInfo.cursor = Menu_MoveCursor(1); } } else if (gMain.newKeys & A_BUTTON) @@ -175,7 +175,7 @@ void sub_80B2F30(u8 taskId) void HandleShopMenuQuit(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 11, 8); + Menu_EraseWindowRect(0, 0, 11, 8); sub_80BE3BC(); ScriptContext2_Disable(); DestroyTask(taskId); @@ -290,7 +290,7 @@ void BuyMenuDrawGraphics(void) BuyMenuDrawMapGraphics(); gMartInfo.cursor = zero; gMartInfo.choicesAbove = zero2; - MenuZeroFillWindowRect(0, 0, 0x20, 0x20); + Menu_EraseWindowRect(0, 0, 0x20, 0x20); OpenMoneyWindow(gSaveBlock1.money, 0, 0); sub_80B3764(0, 7); sub_80B37EC(); @@ -532,7 +532,7 @@ void sub_80B37F8(u8 taskId) gStringVar1[1] = 0x14; gStringVar1[2] = 0x6; ConvertIntToDecimalStringN(&gStringVar1[3], gTasks[taskId].data[1], 1, 2); - MenuPrint(gOtherText_xString1, 1, 11); + Menu_PrintText(gOtherText_xString1, 1, 11); sub_80A3FA0(gBGTilemapBuffers[1], 1, 11, 12, 2, 0xC3E1); } @@ -604,8 +604,8 @@ void sub_80B39D0(int var1, int var2, bool32 hasControlCode) if (i != 8 && gMartInfo.choicesAbove + i == gMartInfo.itemCount) { - MenuFillWindowRectWithBlankTile(0xE, (i << 1) + 2, 0x1C, (i << 1) + 3); - MenuPrint(gOtherText_CancelNoTerminator, 0xE, (i << 1) + 2); + Menu_BlankWindowRect(0xE, (i << 1) + 2, 0x1C, (i << 1) + 3); + Menu_PrintText(gOtherText_CancelNoTerminator, 0xE, (i << 1) + 2); } } @@ -659,7 +659,7 @@ void sub_80B3BD0(u8 taskId) void sub_80B3BF4(u8 taskId) { - MenuZeroFillWindowRect(0x7, 0x8, 0xD, 0xD); + Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0); sub_80B379C(); sub_80B3420(); @@ -706,7 +706,7 @@ void sub_80B3D38(u8 taskId) void sub_80B3D7C(u8 taskId) { sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0); - MenuZeroFillWindowRect(0x7, 0x8, 0xD, 0xD); + Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x8, 0x9, 0x4, 0x4, 0); sub_80B4378(taskId); } @@ -719,7 +719,7 @@ void sub_80B3DC8(u8 taskId) if (gMain.newKeys & A_BUTTON) { gMartTotalCost = (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)) * gTasks[taskId].data[1]; // set total cost of your purchase. - MenuZeroFillWindowRect(0, 0xA, 0xD, 0xD); + Menu_EraseWindowRect(0, 0xA, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0); sub_80B379C(); sub_80B3420(); @@ -741,7 +741,7 @@ void sub_80B3EFC(u8 taskId) u16 var; gTasks[taskId].data[1] = 1; - MenuDrawTextWindow(0, 0xA, 0xD, 0xD); + Menu_DrawStdWindowFrame(0, 0xA, 0xD, 0xD); sub_80B37F8(taskId); var = gSaveBlock1.money / (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)); @@ -1049,7 +1049,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction else // if the cursor is not 0, choicesAbove cannot be updated yet since the cursor is at the top of the menu, so update cursor. { PlaySE(SE_SELECT); - gMartInfo.cursor = MoveMenuCursor(-1); // move cursor up + gMartInfo.cursor = Menu_MoveCursor(-1); // move cursor up sub_80B3A70(); } } @@ -1070,7 +1070,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction else if (gMartInfo.cursor != gMartInfo.itemCount) { PlaySE(SE_SELECT); - gMartInfo.cursor = MoveMenuCursor(1); + gMartInfo.cursor = Menu_MoveCursor(1); sub_80B3A70(); } } @@ -1085,7 +1085,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction sub_80F979C(1, 1); sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 1); HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0xC, 0xD, 0x13); + Menu_EraseWindowRect(0, 0xC, 0xD, 0x13); if (gMartInfo.martType == MART_TYPE_0) { @@ -1139,8 +1139,8 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction void sub_80B4378(u8 taskId) { - MenuZeroFillWindowRect(0, 0xE, 0x1D, 0x13); - MenuZeroFillWindowRect(0, 0xA, 0xD, 0xD); + Menu_EraseWindowRect(0, 0xE, 0x1D, 0x13); + Menu_EraseWindowRect(0, 0xA, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0); sub_80B3420(); sub_80B3764(6, 7); diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index a524790b4..3c13e004c 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -584,8 +584,8 @@ static bool8 sub_8101E3C(struct Task *task) static void sub_8101F2C(const u8 *str) { - MenuDisplayMessageBox(); - MenuPrint(str, 2, 15); + Menu_DisplayDialogueFrame(); + Menu_PrintText(str, 2, 15); } static bool8 sub_8101F44(struct Task *task) @@ -599,7 +599,7 @@ static bool8 sub_8101F60(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - MenuZeroFillScreen(); + Menu_EraseScreen(); eSlotMachine->state = 5; } return FALSE; @@ -853,7 +853,7 @@ static bool8 sub_8102344(struct Task *task) s8 input = ProcessMenuInputNoWrap_(); if (input == 0) { - MenuZeroFillScreen(); + Menu_EraseScreen(); sub_8103D8C(0); sub_8103D8C(1); sub_8103D8C(2); @@ -862,7 +862,7 @@ static bool8 sub_8102344(struct Task *task) } else if (input == 1 || input == -1) { - MenuZeroFillScreen(); + Menu_EraseScreen(); eSlotMachine->state = 5; } return FALSE; @@ -879,7 +879,7 @@ static bool8 sub_81023B8(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - MenuZeroFillScreen(); + Menu_EraseScreen(); eSlotMachine->state = 5; } return FALSE; @@ -896,7 +896,7 @@ static bool8 sub_81023FC(struct Task *task) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { - MenuZeroFillScreen(); + Menu_EraseScreen(); eSlotMachine->state = 27; } return FALSE; @@ -2824,7 +2824,7 @@ static void sub_8104BC8(struct Task *task) static void sub_8104BFC(struct Task *task) { - MenuZeroFillScreen(); + Menu_EraseScreen(); BasicInitMenuWindow(&gWindowConfig_81E7128); sub_81064B8(); sub_8104CAC(task->data[1]); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index dccf1714e..6c2812039 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -193,8 +193,8 @@ static void BuildStartMenuActions_Link(void) static void DisplaySafariBallsWindow(void) { sub_8072C44(gStringVar1, gNumSafariBalls, 12, 1); - MenuDrawTextWindow(0, 0, 10, 5); - MenuPrint(gOtherText_SafariStock, 1, 1); + Menu_DrawStdWindowFrame(0, 0, 10, 5); + Menu_PrintText(gOtherText_SafariStock, 1, 1); } //Prints n menu items starting at *index @@ -204,7 +204,7 @@ static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n) do { - MenuPrint(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2); + Menu_PrintText(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2); _index++; if (_index >= sNumStartMenuActions) { @@ -226,7 +226,7 @@ static bool32 InitStartMenuMultistep(s16 *step, s16 *index) (*step)++; break; case 2: - MenuDrawTextWindow(22, 0, 29, sNumStartMenuActions * 2 + 3); + Menu_DrawStdWindowFrame(22, 0, 29, sNumStartMenuActions * 2 + 3); *index = 0; (*step)++; break; @@ -310,12 +310,12 @@ static u8 StartMenu_InputProcessCallback(void) if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); - sStartMenuCursorPos = MoveMenuCursor(-1); + sStartMenuCursorPos = Menu_MoveCursor(-1); } if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - sStartMenuCursorPos = MoveMenuCursor(1); + sStartMenuCursorPos = Menu_MoveCursor(1); } if (gMain.newKeys & A_BUTTON) { @@ -473,13 +473,13 @@ static u8 SaveCallback2(void) return FALSE; case SAVE_CANCELED: //Go back to start menu - MenuZeroFillScreen(); + Menu_EraseScreen(); InitStartMenu(); gCallback_03004AE8 = StartMenu_InputProcessCallback; return FALSE; case SAVE_SUCCESS: case SAVE_ERROR: - MenuZeroFillScreen(); + Menu_EraseScreen(); sub_8064E2C(); ScriptContext2_Disable(); return TRUE; @@ -498,7 +498,7 @@ static u8 RunSaveDialogCallback(void) { if (savingComplete) { - if (!MenuUpdateWindowText()) + if (!Menu_UpdateWindowText()) return 0; } savingComplete = FALSE; @@ -514,7 +514,7 @@ void ScrSpecial_DoSaveDialog(void) static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void)) { StringExpandPlaceholders(gStringVar4, ptr); - MenuDisplayMessageBox(); + Menu_DisplayDialogueFrame(); MenuPrintMessageDefaultCoords(gStringVar4); savingComplete = TRUE; saveDialogCallback = func; @@ -547,7 +547,7 @@ static void sub_8071700(void) static void HideSaveDialog(void) { - MenuZeroFillWindowRect(20, 8, 26, 13); + Menu_EraseWindowRect(20, 8, 26, 13); } static void SaveDialogStartTimeout(void) @@ -579,7 +579,7 @@ static bool8 SaveDialogCheckForTimeoutAndKeypress(void) static u8 SaveDialogCB_DisplayConfirmMessage(void) { - MenuZeroFillScreen(); + Menu_EraseScreen(); HandleDrawSaveWindowInfo(0, 0); DisplaySaveMessageWithCallback(gSaveText_WouldYouLikeToSave, SaveDialogCB_DisplayConfirmYesNoMenu); return SAVE_IN_PROGRESS; @@ -694,7 +694,7 @@ static u8 SaveDialogCB_DoSave(void) static u8 SaveDialogCB_SaveSuccess(void) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { PlaySE(SE_SAVE); saveDialogCallback = SaveDialogCB_ReturnSuccess; @@ -715,7 +715,7 @@ static u8 SaveDialogCB_ReturnSuccess(void) static u8 SaveDialogCB_SaveError(void) { - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { PlaySE(SE_BOO); saveDialogCallback = SaveDialogCB_ReturnError; @@ -821,8 +821,8 @@ static void Task_8071B64(u8 taskId) switch (*step) { case 0: - MenuDisplayMessageBox(); - MenuPrint(gSystemText_Saving, 2, 15); + Menu_DisplayDialogueFrame(); + Menu_PrintText(gSystemText_Saving, 2, 15); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); (*step)++; break; diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index 701d4087a..d4994d701 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -355,8 +355,8 @@ static void MainCallback2(void) static void Task_StarterChoose1(u8 taskId) { CreateStarterPokemonLabel(0xFF, gTasks[taskId].tStarterSelection); - MenuDrawTextWindow(2, 14, 27, 19); - MenuPrint(gOtherText_BirchInTrouble, 3, 15); + Menu_DrawStdWindowFrame(2, 14, 27, 19); + Menu_PrintText(gOtherText_BirchInTrouble, 3, 15); gTasks[taskId].func = Task_StarterChoose2; } @@ -368,7 +368,7 @@ static void Task_StarterChoose2(u8 taskId) { u8 spriteId; - MenuZeroFillWindowRect( + Menu_EraseWindowRect( gStarterChoose_LabelCoords[selection][0], gStarterChoose_LabelCoords[selection][1], gStarterChoose_LabelCoords[selection][0] + 13, @@ -424,9 +424,9 @@ static void Task_StarterChoose3(u8 taskId) static void Task_StarterChoose4(u8 taskId) { PlayCry1(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0); - MenuDrawTextWindow(2, 14, 27, 19); + Menu_DrawStdWindowFrame(2, 14, 27, 19); //"Do you choose this POKEMON?" - MenuPrint(gOtherText_DoYouChoosePoke, 3, 15); + Menu_PrintText(gOtherText_DoYouChoosePoke, 3, 15); DisplayYesNoMenu(21, 7, 1); gTasks[taskId].func = Task_StarterChoose5; } @@ -445,7 +445,7 @@ static void Task_StarterChoose5(u8 taskId) case 1: // NO case -1: // B button PlaySE(SE_SELECT); - MenuZeroFillWindowRect(21, 7, 27, 12); + Menu_EraseWindowRect(21, 7, 27, 12); spriteId = gTasks[taskId].tPkmnSpriteId; FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum)); @@ -498,7 +498,7 @@ static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection) if (prevSelection != 0xFF) { //Remove the old Pokemon label - MenuZeroFillWindowRect( + Menu_EraseWindowRect( gStarterChoose_LabelCoords[prevSelection][0], gStarterChoose_LabelCoords[prevSelection][1], gStarterChoose_LabelCoords[prevSelection][0] + 13, @@ -527,7 +527,7 @@ static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection) //Copy POKEMON string to label StringCopy(labelText + dstIndex, gOtherText_Poke); - MenuPrint( + Menu_PrintText( labelText, gStarterChoose_LabelCoords[selection][0], gStarterChoose_LabelCoords[selection][1]); @@ -535,7 +535,7 @@ static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection) //Copy Pokemon name to label sub_8072C74(labelText + 5, gSpeciesNames[species], 0x6B, 1); - MenuPrint( + Menu_PrintText( labelText, gStarterChoose_LabelCoords[selection][0], gStarterChoose_LabelCoords[selection][1] + 2); @@ -574,7 +574,7 @@ static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection) adds r3, r1, 0x3\n\ lsls r3, 24\n\ lsrs r3, 24\n\ - bl MenuZeroFillWindowRect\n\ + bl Menu_EraseWindowRect\n\ ldr r0, _0810A964 @ =0x04000040\n\ movs r1, 0\n\ strh r1, [r0]\n\ @@ -649,7 +649,7 @@ _0810A8CA:\n\ mov r0, sp\n\ adds r1, r4, 0\n\ adds r2, r5, 0\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ mov r0, sp\n\ movs r1, 0\n\ movs r2, 0xF\n\ @@ -669,7 +669,7 @@ _0810A8CA:\n\ lsrs r2, 24\n\ mov r0, sp\n\ adds r1, r4, 0\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ lsls r0, r4, 3\n\ adds r0, 0x4\n\ lsls r0, 24\n\ diff --git a/src/field/trader.c b/src/field/trader.c index 61cb0b4a2..eb0c8a934 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -100,7 +100,7 @@ void CreateAvailableDecorationsMenu(u8 taskId) } } - MenuDrawTextWindow(0, 1, 12, numChoices * 2 + 2); + Menu_DrawStdWindowFrame(0, 1, 12, numChoices * 2 + 2); for (i = 0; i < 4; i++) { @@ -108,18 +108,18 @@ void CreateAvailableDecorationsMenu(u8 taskId) { if (trader->unk1[i] > DECOR_REGISTEEL_DOLL) { - MenuPrint(gOtherText_FiveQuestionsAndSlash, 1, numDecorations * 2 + 2); + Menu_PrintText(gOtherText_FiveQuestionsAndSlash, 1, numDecorations * 2 + 2); } else { - MenuPrint(gDecorations[trader->unk1[i]].name, 1, numDecorations * 2 + 2); + Menu_PrintText(gDecorations[trader->unk1[i]].name, 1, numDecorations * 2 + 2); } numDecorations++; } } - MenuPrint(gOtherText_CancelNoTerminator, 1, numDecorations * 2 + 2); + Menu_PrintText(gOtherText_CancelNoTerminator, 1, numDecorations * 2 + 2); InitMenu(0, 1, 2, numChoices, 0, 11); gTasks[taskId].data[1] = numDecorations; } @@ -136,7 +136,7 @@ void sub_8109B34(u8 taskId, u8 decorationId) } HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 1, 12, 12); + Menu_EraseWindowRect(0, 1, 12, 12); DestroyTask(taskId); EnableBothScriptContexts(); } @@ -148,17 +148,17 @@ void Task_HandleGetDecorationMenuInput(u8 taskId) if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor(-1); + Menu_MoveCursor(-1); } else if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor(1); + Menu_MoveCursor(1); } else if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); - gSpecialVar_0x8005 = GetMenuCursorPos(); + gSpecialVar_0x8005 = Menu_GetCursorPos(); if (gTasks[taskId].data[1] == gSpecialVar_0x8005) { sub_8109B34(taskId, 0); @@ -216,7 +216,7 @@ void ScrSpecial_TraderMenuGiveDecoration(void) void sub_8109D04(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); DestroyVerticalScrollIndicator(0); DestroyVerticalScrollIndicator(1); sub_80F9520(gUnknown_020388F7, 8); @@ -238,7 +238,7 @@ void sub_8109D04(u8 taskId) void sub_8109DAC(u8 taskId) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); gSpecialVar_0x8006 = 0; DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 7253ac901..6e71011b9 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -611,18 +611,18 @@ static void sub_8136BB8(void) StringGetEnd10(gUnknown_02039304->stringBuffer); StringAppend(gUnknown_02039304->stringBuffer, gOtherText_GetsAPokeBlock); BasicInitMenuWindow(&gWindowConfig_81E709C); - MenuDrawTextWindow(0, 16, 29, 19); - MenuPrint(gUnknown_02039304->stringBuffer, 1, 17); + Menu_DrawStdWindowFrame(0, 16, 29, 19); + Menu_PrintText(gUnknown_02039304->stringBuffer, 1, 17); DisplayYesNoMenu(23, 10, 1); - MoveMenuCursor(0); + Menu_MoveCursor(0); } static s8 sub_8136C40(void) { - s8 retval = ProcessMenuInputNoWrap(); + s8 retval = Menu_ProcessInputNoWrap(); if ((u8)(retval + 1) < 3) { - MenuZeroFillScreen(); + Menu_EraseScreen(); BasicInitMenuWindow(&gWindowConfig_81E7080); } return retval; @@ -631,7 +631,7 @@ static s8 sub_8136C40(void) static void sub_8136C6C(void) { BasicInitMenuWindow(&gWindowConfig_81E709C); - MenuDrawTextWindow(0, 16, 29, 19); + Menu_DrawStdWindowFrame(0, 16, 29, 19); for (gUnknown_02039304->unk53 = 0; gUnknown_02039304->unk53 < 5 && gUnknown_02039304->unk61[gUnknown_02039304->unk53] == 0; gUnknown_02039304->unk53++); if (gUnknown_02039304->unk53 < 5) { @@ -668,20 +668,20 @@ static bool8 sub_8136D00(void) static void sub_8136D60(void) { BasicInitMenuWindow(&gWindowConfig_81E709C); - MenuDrawTextWindow(0, 16, 29, 19); - MenuPrint(gOtherText_WontEat, 1, 17); + Menu_DrawStdWindowFrame(0, 16, 29, 19); + Menu_PrintText(gOtherText_WontEat, 1, 17); } static void sub_8136D8C(void) { - MenuZeroFillScreen(); + Menu_EraseScreen(); BasicInitMenuWindow(&gWindowConfig_81E7080); } static void Pokeblock_MenuWindowTextPrint(const u8 *message) { - MenuDrawTextWindow(0, 16, 29, 19); - MenuPrint(message, 1, 17); + Menu_DrawStdWindowFrame(0, 16, 29, 19); + Menu_PrintText(message, 1, 17); } #ifdef NONMATCHING diff --git a/src/field/wallclock.c b/src/field/wallclock.c index 2892d09f9..6d102715a 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -414,9 +414,9 @@ static void Task_SetClock2(u8 taskId) //Ask player "Is this the correct time?" static void Task_SetClock3(u8 taskId) { - MenuDrawTextWindow(2, 16, 27, 19); - MenuPrint(gOtherText_CorrectTimePrompt, 3, 17); - MenuDrawTextWindow(23, 8, 29, 13); + Menu_DrawStdWindowFrame(2, 16, 27, 19); + Menu_PrintText(gOtherText_CorrectTimePrompt, 3, 17); + Menu_DrawStdWindowFrame(23, 8, 29, 13); PrintMenuItems(24, 9, 2, gMenuYesNoItems); InitMenu(0, 24, 9, 2, 1, 5); gTasks[taskId].func = Task_SetClock4; @@ -435,8 +435,8 @@ static void Task_SetClock4(u8 taskId) case 1: //NO HandleDestroyMenuCursors(); PlaySE(SE_SELECT); - MenuZeroFillWindowRect(23, 8, 29, 13); - MenuZeroFillWindowRect(2, 16, 27, 19); + Menu_EraseWindowRect(23, 8, 29, 13); + Menu_EraseWindowRect(2, 16, 27, 19); gTasks[taskId].func = Task_SetClock2; //Go back and let player adjust clock } } diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index ef1d66349..83953186b 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -25,8 +25,8 @@ extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u8 gTileBuffer[]; -extern const struct WindowConfig gWindowConfig_81E6CE4; -extern const struct WindowConfig gWindowConfig_81E7240; +extern const struct WindowTemplate gWindowConfig_81E6CE4; +extern const struct WindowTemplate gWindowConfig_81E7240; extern const u8 *const gContestEffectStrings[]; extern const u8 *const gMoveDescriptions[]; extern const u8 gTypeNames[][7]; @@ -270,11 +270,11 @@ void CB2_InitLearnMove(void) SetUpWindowConfig(&gWindowConfig_81E7240); InitMenuWindow(&gWindowConfig_81E7240); - MenuZeroFillScreen(); + Menu_EraseScreen(); SetUpWindowConfig(&gWindowConfig_81E6CE4); InitMenuWindow(&gWindowConfig_81E6CE4); - MenuZeroFillScreen(); + Menu_EraseScreen(); REG_BG0VOFS = 0; REG_BG0VOFS = 0; // huh? @@ -304,11 +304,11 @@ void sub_81327A4(void) SetUpWindowConfig(&gWindowConfig_81E7240); InitMenuWindow(&gWindowConfig_81E7240); - MenuZeroFillScreen(); + Menu_EraseScreen(); SetUpWindowConfig(&gWindowConfig_81E6CE4); InitMenuWindow(&gWindowConfig_81E6CE4); - MenuZeroFillScreen(); + Menu_EraseScreen(); REG_DISPCNT = 0x1340; REG_BG0VOFS = 0; @@ -401,7 +401,7 @@ void LearnMoveMain(void) sub_813362C(); break; case 8: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { DisplayYesNoMenu(21, 7, 1); sLearnMoveStruct->state++; @@ -436,7 +436,7 @@ void LearnMoveMain(void) } break; case 12: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { DisplayYesNoMenu(21, 7, 1); sLearnMoveStruct->state++; @@ -467,7 +467,7 @@ void LearnMoveMain(void) sLearnMoveStruct->state++; break; case 17: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { DisplayYesNoMenu(21, 7, 1); sLearnMoveStruct->state = 18; @@ -495,7 +495,7 @@ void LearnMoveMain(void) sLearnMoveStruct->state++; break; case 25: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { sLearnMoveStruct->state = 26; DisplayYesNoMenu(21, 7, 1); @@ -524,7 +524,7 @@ void LearnMoveMain(void) } break; case 27: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { if (sLearnMoveStruct->showContestInfo == FALSE) sLearnMoveStruct->state = 3; @@ -533,7 +533,7 @@ void LearnMoveMain(void) } break; case 19: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { sLearnMoveStruct->state = 20; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); @@ -547,7 +547,7 @@ void LearnMoveMain(void) } break; case 21: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) sLearnMoveStruct->state = 14; break; case 22: @@ -597,7 +597,7 @@ void LearnMoveMain(void) } break; case 30: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { #ifdef ENGLISH sub_81328E8(gOtherText_ForgotOrDidNotLearnMove); @@ -609,7 +609,7 @@ void LearnMoveMain(void) } break; case 31: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { PlayFanfare(BGM_FANFA1); sLearnMoveStruct->state = 32; @@ -636,7 +636,7 @@ void DrawLearnMoveMenuWindow(void) BasicInitMenuWindow(&gWindowConfig_81E7240); for (i = 0; i < 4; i++) { - MenuDrawTextWindow( + Menu_DrawStdWindowFrame( gUnknown_08402CF8[i][0], gUnknown_08402CF8[i][1], gUnknown_08402CF8[i][2], @@ -658,7 +658,7 @@ void sub_8133030(bool8 a) for (i = 0; gUnknown_08402D08[0][i].unk0 != NULL; i++) { sub_8072C74(gTileBuffer, gUnknown_08402D08[0][i].unk0, 64, 2); - MenuPrint(gTileBuffer, gUnknown_08402D08[0][i].unk4, gUnknown_08402D08[0][i].unk5); + Menu_PrintText(gTileBuffer, gUnknown_08402D08[0][i].unk4, gUnknown_08402D08[0][i].unk5); } if (!a) @@ -696,10 +696,10 @@ void sub_8133140(bool8 a) for (i = 0; gUnknown_08402D08[0][i].unk0 != NULL; i++) { sub_8072C74(gTileBuffer, gUnknown_08402D08[1][i].unk0, 64, 2); - MenuPrint(gTileBuffer, gUnknown_08402D08[1][i].unk4, gUnknown_08402D08[1][i].unk5); + Menu_PrintText(gTileBuffer, gUnknown_08402D08[1][i].unk4, gUnknown_08402D08[1][i].unk5); if (i != 0) { - MenuZeroFillWindowRect( + Menu_EraseWindowRect( gUnknown_08402D08[1][i].unk4, gUnknown_08402D08[1][i].unk5 + 2, gUnknown_08402D08[1][i].unk4 + 7, @@ -938,7 +938,7 @@ void sub_8133800(void) r6++; } *str = EOS; - MenuPrint(gTileBuffer, 11, 1); + Menu_PrintText(gTileBuffer, 11, 1); sub_813360C(0); } @@ -972,17 +972,17 @@ void PrintMoveInfo(u16 moveId, const u8 *b) sub_8072C74(str, gOtherText_ThreeDashes2, 32, 2); else sub_8072C14(str, gBattleMoves[moveId].power, 32, 2); - MenuPrint(str, b[0], b[1]); + Menu_PrintText(str, b[0], b[1]); break; case 4: if (gBattleMoves[moveId].accuracy == 0) sub_8072C74(str, gOtherText_ThreeDashes2, 32, 2); else sub_8072C14(str, gBattleMoves[moveId].accuracy, 32, 2); - MenuPrint(str, b[0], b[1]); + Menu_PrintText(str, b[0], b[1]); break; case 6: - MenuZeroFillWindowRect(b[0], b[1], b[0], b[1] + 1); + Menu_EraseWindowRect(b[0], b[1], b[0], b[1] + 1); numHearts = gContestEffects[gContestMoves[moveId].effect].appeal / 10; if (numHearts == 255) numHearts = 0; @@ -995,7 +995,7 @@ void PrintMoveInfo(u16 moveId, const u8 *b) } break; case 7: - MenuZeroFillWindowRect(b[0], b[1], b[0], b[1] + 1); + Menu_EraseWindowRect(b[0], b[1], b[0], b[1] + 1); numHearts = gContestEffects[gContestMoves[moveId].effect].jam / 10; if (numHearts == 255) numHearts = 0; @@ -1037,7 +1037,7 @@ void sub_8133AEC(bool8 contestInfo, int unused) { u8 r1 = var * 2 + 9; - MenuFillWindowRectWithBlankTile(11, r1, 28, 12); + Menu_BlankWindowRect(11, r1, 28, 12); } } } @@ -1045,22 +1045,22 @@ void sub_8133AEC(bool8 contestInfo, int unused) { if (contestInfo) { - MenuZeroFillWindowRect(gUnknown_08402E24[5][0], gUnknown_08402E24[5][1], gUnknown_08402E24[5][0], gUnknown_08402E24[5][1] + 1); - MenuZeroFillWindowRect(gUnknown_08402E24[6][0], gUnknown_08402E24[6][1], gUnknown_08402E24[6][0], gUnknown_08402E24[6][1] + 1); + Menu_EraseWindowRect(gUnknown_08402E24[5][0], gUnknown_08402E24[5][1], gUnknown_08402E24[5][0], gUnknown_08402E24[5][1] + 1); + Menu_EraseWindowRect(gUnknown_08402E24[6][0], gUnknown_08402E24[6][1], gUnknown_08402E24[6][0], gUnknown_08402E24[6][1] + 1); for (i = 0; i < 16; i++) gSprites[sLearnMoveStruct->spriteIDs[i + 4]].invisible = TRUE; } else { - MenuZeroFillWindowRect(gUnknown_08402E24[1][0], gUnknown_08402E24[1][1], gUnknown_08402E24[1][0] + 3, gUnknown_08402E24[1][1] + 1); - MenuZeroFillWindowRect(gUnknown_08402E24[3][0], gUnknown_08402E24[3][1], gUnknown_08402E24[3][0] + 3, gUnknown_08402E24[3][1] + 1); + Menu_EraseWindowRect(gUnknown_08402E24[1][0], gUnknown_08402E24[1][1], gUnknown_08402E24[1][0] + 3, gUnknown_08402E24[1][1] + 1); + Menu_EraseWindowRect(gUnknown_08402E24[3][0], gUnknown_08402E24[3][1], gUnknown_08402E24[3][0] + 3, gUnknown_08402E24[3][1] + 1); } - MenuZeroFillWindowRect(11, 9, 28, 12); + Menu_EraseWindowRect(11, 9, 28, 12); } } void sub_8133CA4(void) { - MenuZeroFillWindowRect(21, 7, 27, 12); + Menu_EraseWindowRect(21, 7, 27, 12); sub_8133AEC(sLearnMoveStruct->showContestInfo, 0); } diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 2ab05ca2b..c49c6d350 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -369,7 +369,7 @@ static u8 sub_80F8A28(void) RETURN_UP_STATE; case 9: - MenuZeroFillScreen(); + Menu_EraseScreen(); RETURN_UP_STATE; case 10: CpuFill16(1, (void *)(VRAM + 0x4800), 0x800); @@ -528,11 +528,11 @@ static void sub_80F8E80(void) x = ewram0_4.var10C->var4[pos].unk_0_4; y += ewram0_4.var10C->var4[pos].unk_0_0; - MenuPrint(ewram0_4.words[pos], ewram0_4.var10C->var3_4 + x, ewram0_4.var10C->var3_0 + y); + Menu_PrintText(ewram0_4.words[pos], ewram0_4.var10C->var3_4 + x, ewram0_4.var10C->var3_0 + y); y += 2; } - MenuPrint(ewram0_4.varD8, ewram0_4.varF9, ewram0_4.var10C->var1); + Menu_PrintText(ewram0_4.varD8, ewram0_4.varF9, ewram0_4.var10C->var1); } static void sub_80F8F18(void) diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c index b4144ea34..eeefa8431 100644 --- a/src/pokemon/mon_markings.c +++ b/src/pokemon/mon_markings.c @@ -312,7 +312,7 @@ void sub_80F727C(struct PokemonMarkMenu *ptr) void sub_80F728C(void) { - const struct FrameGraphics *frame = GetTextWindowFrameGraphics(gSaveBlock2.optionsWindowFrameType); + const struct FrameGraphics *frame = TextWindow_GetFrameGraphics(gSaveBlock2.optionsWindowFrameType); sMenu->frameTiles = frame->tiles; sMenu->framePalette = frame->palette; sMenu->tileLoadState = 0; diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c index 8e3adda12..028ae71a0 100644 --- a/src/pokemon/pokeblock_feed.c +++ b/src/pokemon/pokeblock_feed.c @@ -559,7 +559,7 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; break; case 10: - MenuDrawTextWindow(0, 14, 29, 19); + Menu_DrawStdWindowFrame(0, 14, 29, 19); gMain.state++; break; case 11: @@ -715,7 +715,7 @@ static void LaunchPokeblockFeedTask(u8 a0) static void Task_WaitForAtePokeblockText(u8 taskID) { - if (MenuUpdateWindowText() == 1) + if (Menu_UpdateWindowText() == 1) gTasks[taskID].func = Task_PaletteFadeToReturn; } diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 1c1c71454..83820f4cc 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -2241,7 +2241,7 @@ static void sub_808DEB0(u16 a, u8 b, u8 c, u16 d) text[3] = EOS; *(u16 *)(VRAM + d * 0x800 + c * 0x40 + b * 2) = unk[0]; *(u16 *)(VRAM + d * 0x800 + (c + 1) * 0x40 + b * 2) = unk[1]; - MenuPrint(text, b - 15, c); + Menu_PrintText(text, b - 15, c); } static void sub_808DF88(u16 a, u8 b, u8 c, u16 d) @@ -2961,20 +2961,20 @@ static void Task_InitPageScreenMultistep(u8 taskId) else sub_8091154(gUnknown_0202FFBC->dexNum, 0xD, 3); sub_80911C8(gUnknown_0202FFBC->dexNum, 0x10, 3); - MenuPrint(gDexText_UnknownPoke, CATEGORY_LEFT, 5); - MenuPrint(gDexText_UnknownHeight, 16, 7); - MenuPrint(gDexText_UnknownWeight, 16, 9); + Menu_PrintText(gDexText_UnknownPoke, CATEGORY_LEFT, 5); + Menu_PrintText(gDexText_UnknownHeight, 16, 7); + Menu_PrintText(gDexText_UnknownWeight, 16, 9); if (gUnknown_0202FFBC->owned) { sub_8091304(gPokedexEntries[gUnknown_0202FFBC->dexNum].categoryName, CATEGORY_LEFT, 5); sub_8091458(gPokedexEntries[gUnknown_0202FFBC->dexNum].height, 16, 7); sub_8091564(gPokedexEntries[gUnknown_0202FFBC->dexNum].weight, 16, 9); - MenuPrint(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage1, 2, 13); + Menu_PrintText(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage1, 2, 13); sub_80917CC(14, 0x3FC); } else { - MenuPrint(gUnknown_083A05F8, 2, 13); + Menu_PrintText(gUnknown_083A05F8, 2, 13); LoadPalette(gPlttBufferUnfaded + 1, 0x31, 0x1E); } gMain.state++; @@ -3211,7 +3211,7 @@ static void Task_InitCryScreenMultistep(u8 taskId) gMain.state++; break; case 4: - MenuPrint(gDexText_CryOf, 10, 4); + Menu_PrintText(gDexText_CryOf, 10, 4); sub_8091260(gUnknown_0202FFBC->dexNum, 10, 6, 2); gMain.state++; break; @@ -3853,13 +3853,13 @@ static void sub_8090750(u8 taskId) else sub_8091154(dexNum, 13, 3); sub_80911C8(dexNum, 16, 3); - MenuPrint(gDexText_UnknownPoke, CATEGORY_LEFT, 5); - MenuPrint(gDexText_UnknownHeight, 16, 7); - MenuPrint(gDexText_UnknownWeight, 16, 9); + Menu_PrintText(gDexText_UnknownPoke, CATEGORY_LEFT, 5); + Menu_PrintText(gDexText_UnknownHeight, 16, 7); + Menu_PrintText(gDexText_UnknownWeight, 16, 9); sub_8091304(gPokedexEntries[dexNum].categoryName, CATEGORY_LEFT, 5); sub_8091458(gPokedexEntries[dexNum].height, 16, 7); sub_8091564(gPokedexEntries[dexNum].weight, 16, 9); - MenuPrint(gPokedexEntries[dexNum].descriptionPage1, 2, 13); + Menu_PrintText(gPokedexEntries[dexNum].descriptionPage1, 2, 13); sub_80917CC(14, 0x3FC); gTasks[taskId].data[0]++; break; @@ -3906,8 +3906,8 @@ static void sub_8090A3C(u8 taskId) { u16 r4 = gTasks[taskId].data[1]; - MenuZeroFillWindowRect(2, 13, 27, 19); - MenuPrint(gPokedexEntries[r4].descriptionPage2, 2, 13); + Menu_EraseWindowRect(2, 13, 27, 19); + Menu_PrintText(gPokedexEntries[r4].descriptionPage2, 2, 13); (*(u16 *)(VRAM + 0x7ACA))++; (*(u16 *)(VRAM + 0x7B0A))++; gTasks[taskId].data[4] = 1; @@ -3970,8 +3970,8 @@ static void sub_8090C68(void) { if (gPokedexView->descriptionPageNum == 0) { - MenuZeroFillWindowRect(2, 13, 27, 19); - MenuPrint(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage2, 2, 13); + Menu_EraseWindowRect(2, 13, 27, 19); + Menu_PrintText(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage2, 2, 13); gPokedexView->descriptionPageNum = 1; (*(u16 *)(VRAM + 0x7ACA))++; (*(u16 *)(VRAM + 0x7B0A))++; @@ -3979,8 +3979,8 @@ static void sub_8090C68(void) } else { - MenuZeroFillWindowRect(2, 13, 27, 19); - MenuPrint(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage1, 2, 13); + Menu_EraseWindowRect(2, 13, 27, 19); + Menu_PrintText(gPokedexEntries[gUnknown_0202FFBC->dexNum].descriptionPage1, 2, 13); gPokedexView->descriptionPageNum = 0; (*(u16 *)(VRAM + 0x7ACA))--; (*(u16 *)(VRAM + 0x7B0A))--; @@ -4190,7 +4190,7 @@ static void sub_8091154(u16 order, u8 b, u8 c) str[1] = CHAR_0 + (order % 100) / 10; str[2] = CHAR_0 + (order % 100) % 10; str[3] = EOS; - MenuPrint(str, b, c); + Menu_PrintText(str, b, c); } static u8 sub_80911C8(u16 num, u8 b, u8 c) @@ -4212,7 +4212,7 @@ static u8 sub_80911C8(u16 num, u8 b, u8 c) str[i] = 0xAE; break; } - MenuPrint(str, b, c); + Menu_PrintText(str, b, c); return i; } @@ -4237,7 +4237,7 @@ static u8 sub_8091260(u16 num, u8 b, u8 c, u8 d) break; } end[i] = EOS; - MenuPrint(str, b, c); + Menu_PrintText(str, b, c); return i; } @@ -4297,7 +4297,7 @@ void unref_sub_80913A4(u16 a, u8 left, u8 top) str[3] = CHAR_PERIOD; str[4] = CHAR_0 + ((a % 1000) % 100) % 10; str[5] = EOS; - MenuPrint(str, left, top); + Menu_PrintText(str, left, top); } #elif GERMAN void unref_sub_80913A4(u16 arg0, u8 left, u8 top) { @@ -4341,7 +4341,7 @@ void unref_sub_80913A4(u16 arg0, u8 left, u8 top) { buffer[r6++] = EOS; buffer[2] = offset; - MenuPrint(buffer, left, top); + Menu_PrintText(buffer, left, top); } #endif @@ -4378,7 +4378,7 @@ static void sub_8091458(u16 height, u8 left, u8 top) buffer[i++] = (inches % 10) + CHAR_0; buffer[i++] = CHAR_DOUBLE_PRIME; buffer[i++] = EOS; - MenuPrint(buffer, left, top); + Menu_PrintText(buffer, left, top); } #else static void sub_8091458(u16 height, u8 left, u8 top) @@ -4448,7 +4448,7 @@ static void sub_8091564(u16 weight, u8 left, u8 top) buffer[i++] = CHAR_s; buffer[i++] = CHAR_PERIOD; buffer[i++] = EOS; - MenuPrint(buffer, left, top); + Menu_PrintText(buffer, left, top); } #else static void sub_8091564(u16 arg0, u8 left, u8 top) @@ -5036,7 +5036,7 @@ static void sub_8092644(u8 taskId) { sub_814ADC8(); PlaySE(SE_PIN); - MenuZeroFillWindowRect(18, 1, 28, 12); + Menu_EraseWindowRect(18, 1, 28, 12); sub_8092C8C(1); gTasks[taskId].func = sub_809217C; return; @@ -5045,7 +5045,7 @@ static void sub_8092644(u8 taskId) { sub_814ADC8(); PlaySE(SE_BOWA); - MenuZeroFillWindowRect(18, 1, 28, 12); + Menu_EraseWindowRect(18, 1, 28, 12); sub_8092C8C(1); *p1 = gTasks[taskId].data[14]; *p2 = gTasks[taskId].data[15]; @@ -5374,13 +5374,13 @@ static void sub_8092D78(u8 taskId) u16 i; u16 j; - MenuZeroFillWindowRect(18, 1, 28, 12); + Menu_EraseWindowRect(18, 1, 28, 12); for (i = 0, j = *r7; i < 6 && r6[j].text2 != NULL; i++, j++) { #ifndef NONMATCHING j += 0; // Useless statement needed to match #endif - MenuPrint(r6[j].text2, 18, i * 2 + 1); + Menu_PrintText(r6[j].text2, 18, i * 2 + 1); } sub_8091E20(r6[*r8 + *r7].text1); } diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index 6c3c6c2b8..da9a18148 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -229,7 +229,7 @@ static void sub_8089A8C(void) static void sub_8089BDC(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order, u8 arg6) { PrintPartyMenuPromptText(5, arg6); - MenuDrawTextWindow(arg0, arg1, arg0 + arg2, (noOfOptions * 2) + arg1 + 1); + Menu_DrawStdWindowFrame(arg0, arg1, arg0 + arg2, (noOfOptions * 2) + arg1 + 1); PrintMenuItemsReordered(arg0 + 1, arg1 + 1, noOfOptions, menuActions, order); } @@ -279,13 +279,13 @@ static void sub_8089D94(u8 taskID) if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP) { PlaySE(SE_SELECT); - sPokeMenuCursorPos = MoveMenuCursor(-1); + sPokeMenuCursorPos = Menu_MoveCursor(-1); sub_808B5B4(taskID); } else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) { PlaySE(SE_SELECT); - sPokeMenuCursorPos = MoveMenuCursor(1); + sPokeMenuCursorPos = Menu_MoveCursor(1); sub_808B5B4(taskID); } else if (gMain.newKeys & A_BUTTON) @@ -363,7 +363,7 @@ static void PokemonMenu_Summary(u8 taskID) void DoPokemonMenu_Switch(u8 taskID) { SetTaskFuncWithFollowupFunc(taskID, SetupDefaultPartyMenuSwitchPokemon, HandleDefaultPartyMenu); - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); } static void PokemonMenu_Switch(u8 taskID) @@ -378,12 +378,12 @@ static void sub_808A060(u8 taskID) { if (gMain.newKeys == DPAD_UP && sPokeMenuCursorPos != 0) { - sPokeMenuCursorPos = MoveMenuCursor(-1); + sPokeMenuCursorPos = Menu_MoveCursor(-1); PlaySE(SE_SELECT); } if (gMain.newKeys == DPAD_DOWN && sPokeMenuCursorPos != 2) { - sPokeMenuCursorPos = MoveMenuCursor(1); + sPokeMenuCursorPos = Menu_MoveCursor(1); PlaySE(SE_SELECT); } if (gMain.newKeys & A_BUTTON) @@ -409,7 +409,7 @@ static void PokemonMenu_Item(u8 taskID) { HandleDestroyMenuCursors(); sPokeMenuCursorPos = 0; - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); gTasks[taskID].func = sub_808A100; } @@ -442,7 +442,7 @@ static void sub_808A228(u8 taskID) } else { - MenuZeroFillWindowRect(0, 0, 29, 19); + Menu_EraseWindowRect(0, 0, 29, 19); PrintPartyMenuPromptText(0, 0); gTasks[taskID].func = HandleDefaultPartyMenu; } @@ -601,7 +601,7 @@ static void sub_808A678(u8 taskID) static void PokemonMenu_TakeItem(u8 taskID) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); sub_806D5A4(); PartyMenuTryGiveMonHeldItem_806ECE8(taskID, sub_808A678); } @@ -609,7 +609,7 @@ static void PokemonMenu_TakeItem(u8 taskID) static void PokemonMenu_TakeMail(u8 taskID) { HandleDestroyMenuCursors(); - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); sub_806D5A4(); DoTakeMail(taskID, sub_808A678); } @@ -618,7 +618,7 @@ static void PokemonMenu_Mail(u8 taskID) { HandleDestroyMenuCursors(); sPokeMenuCursorPos = 0; - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); ShowPartyPopupMenu(0, &sUnknown_0839F584, (void*) sPokemonMenuActions, 0); gTasks[taskID].func = sub_808A73C; } @@ -629,17 +629,17 @@ static void sub_808A73C(u8 taskID) { PlaySE(SE_SELECT); if (sPokeMenuCursorPos == 0) - sPokeMenuCursorPos = MoveMenuCursor(sUnknown_0839F584.numChoices - 1); + sPokeMenuCursorPos = Menu_MoveCursor(sUnknown_0839F584.numChoices - 1); else - sPokeMenuCursorPos = MoveMenuCursor(-1); + sPokeMenuCursorPos = Menu_MoveCursor(-1); } if (gMain.newAndRepeatedKeys == DPAD_DOWN) { PlaySE(SE_SELECT); if (sPokeMenuCursorPos == sUnknown_0839F584.numChoices - 1) - sPokeMenuCursorPos = MoveMenuCursor(1 - sUnknown_0839F584.numChoices); + sPokeMenuCursorPos = Menu_MoveCursor(1 - sUnknown_0839F584.numChoices); else - sPokeMenuCursorPos = MoveMenuCursor(1); + sPokeMenuCursorPos = Menu_MoveCursor(1); } if (gMain.newKeys & A_BUTTON) { @@ -679,7 +679,7 @@ static void sub_808A8A8(void) static void sub_808A8D4(u8 taskID) { sPokeMenuCursorPos = 0; - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); PrintPartyMenuPromptText(0, 0); gTasks[taskID].func = HandleDefaultPartyMenu; } @@ -695,7 +695,7 @@ static void PokemonMenu_CancelSubmenu(u8 taskID) { HandleDestroyMenuCursors(); PlaySE(SE_SELECT); - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); sub_806D5A4(); sub_8089C7C(sPokeMenuCursorPos); gTasks[taskID].func = sub_8089D94; @@ -715,7 +715,7 @@ static void PokemonMenu_FieldMove(u8 taskID) tFieldMoveId = sPokeMenuOptionsOrder[sPokeMenuCursorPos] - POKEMENU_FIRST_FIELD_MOVE_ID; if (sub_80F9344() == TRUE) { - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); if (IS_SOFTBOILED_MILKDRINK(tFieldMoveId)) PrintPartyMenuPromptText(9, 0); else @@ -725,7 +725,7 @@ static void PokemonMenu_FieldMove(u8 taskID) else if (tFieldMoveId <= 7 && FlagGet(FLAG_BADGE01_GET + tFieldMoveId) != TRUE) { // can't use a field HM move without a proper badge - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); sub_806D5A4(); sub_806E834(gOtherText_CantBeUsedBadge, 1); gTasks[taskID].func = sub_808AAF0; @@ -745,7 +745,7 @@ static void PokemonMenu_FieldMove(u8 taskID) } else { - MenuZeroFillWindowRect(19, 0, 29, 19); + Menu_EraseWindowRect(19, 0, 29, 19); if (IS_SURF(tFieldMoveId) && TestPlayerAvatarFlags(8)) PrintPartyMenuPromptText(8, 0); else @@ -759,7 +759,7 @@ static void sub_808AAF0(u8 taskID) { if (gUnknown_0202E8F6 != 1 && (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)) { - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); PokemonMenu_Cancel(taskID); } } @@ -798,7 +798,7 @@ static void sub_808ABF4(u8 taskID) { if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) { - MenuZeroFillWindowRect(1, 17, 28, 18); + Menu_EraseWindowRect(1, 17, 28, 18); PokemonMenu_Cancel(taskID); } } diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 4a68b846a..001cebe45 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -16,7 +16,7 @@ EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; void sub_8098898(u8 index) { u8 *ptr; - MenuDrawTextWindow(10, 16, 29, 19); + Menu_DrawStdWindowFrame(10, 16, 29, 19); switch (gUnknown_083B6DF4[index].format) { @@ -89,5 +89,5 @@ void sub_8098898(u8 index) { } ptr[0] = EOS; - MenuPrint(gUnk2002694, 11, 17); + Menu_PrintText(gUnk2002694, 11, 17); } diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index 9563bc08f..0887c6648 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -1037,7 +1037,7 @@ static void sub_809E260(u8 taskId) { if (pssData.page == PSS_PAGE_CONTEST_MOVES && (pssData.selectedMoveIndex != 4 || pssData.moveToLearn != 0)) { - MenuZeroFillWindowRect(0, 14, 9, 18); + Menu_EraseWindowRect(0, 14, 9, 18); } SummaryScreenHandleLeftRightInput(taskId, -1); @@ -1048,7 +1048,7 @@ static void sub_809E260(u8 taskId) { if (pssData.page == PSS_PAGE_BATTLE_MOVES && (pssData.selectedMoveIndex != 4 || pssData.moveToLearn != 0)) { - MenuZeroFillWindowRect(0, 14, 9, 18); + Menu_EraseWindowRect(0, 14, 9, 18); } SummaryScreenHandleLeftRightInput(taskId, 1); @@ -1482,8 +1482,8 @@ static void sub_809EAC8(u8 taskId) sub_80A1B1C(9); sub_80A16CC(1); - MenuZeroFillWindowRect(15, 12, 28, 13); - MenuZeroFillWindowRect(11, 15, 28, 18); + Menu_EraseWindowRect(15, 12, 28, 13); + Menu_EraseWindowRect(11, 15, 28, 18); pssData.headerActionTextId = 6; PrintSummaryWindowHeaderText(); @@ -2371,7 +2371,7 @@ void sub_809F814(u8 taskId) { if (pssData.page == PSS_PAGE_CONTEST_MOVES && (pssData.selectedMoveIndex != 4 || pssData.moveToLearn != 0)) { - MenuZeroFillWindowRect(0, 14, 9, 18); + Menu_EraseWindowRect(0, 14, 9, 18); } gTasks[taskId].func = sub_809E260; @@ -2387,7 +2387,7 @@ void sub_809F814(u8 taskId) { if (pssData.page == PSS_PAGE_BATTLE_MOVES && (pssData.selectedMoveIndex != 4 || pssData.moveToLearn != 0)) { - MenuZeroFillWindowRect(0, 14, 9, 18); + Menu_EraseWindowRect(0, 14, 9, 18); } gTasks[taskId].func = sub_809E260; @@ -2414,8 +2414,8 @@ static void sub_809F9D0(u8 taskId, u8 b) sub_80A1488(-2, 4); sub_80A1654(-2, 4); - MenuZeroFillWindowRect(11, 15, 28, 18); - MenuPrint(gOtherText_CantForgetHMs, 11, 15); + Menu_EraseWindowRect(11, 15, 28, 18); + Menu_PrintText(gOtherText_CantForgetHMs, 11, 15); gTasks[taskId].func = sub_809F814; } @@ -2494,9 +2494,9 @@ static void sub_809FAC8(struct Pokemon *mon) if (GetMonData(mon, MON_DATA_IS_EGG)) { - MenuZeroFillWindowRect(1, 2, 4, 3); - MenuZeroFillWindowRect(3, 16, 9, 17); - MenuZeroFillWindowRect(0, 12, 11, 15); + Menu_EraseWindowRect(1, 2, 4, 3); + Menu_EraseWindowRect(3, 16, 9, 17); + Menu_EraseWindowRect(0, 12, 11, 15); GetMonNickname(mon, gStringVar1); sub_80A1FF8(gStringVar1, 13, 3, 16); LoadPalette(sUnknown_083C157C, 4, 2); @@ -2520,7 +2520,7 @@ static void sub_809FAC8(struct Pokemon *mon) } else { - MenuZeroFillWindowRect(1, 2, 4, 3); + Menu_EraseWindowRect(1, 2, 4, 3); } buffer = gStringVar1; @@ -2530,7 +2530,7 @@ static void sub_809FAC8(struct Pokemon *mon) buffer[1] = 0x13; buffer[2] = 0x3C; buffer[3] = EOS; - MenuPrint(gStringVar1, 1, 12); + Menu_PrintText(gStringVar1, 1, 12); sub_80A0958(mon); } @@ -2545,12 +2545,12 @@ static void sub_809FBE4(void) sub_80A1918(i, 1); } - MenuZeroFillWindowRect(11, 4, 29, 18); + Menu_EraseWindowRect(11, 4, 29, 18); } static void sub_809FC0C(void) { - MenuPrint(gOtherText_Type2, 11, 6); + Menu_PrintText(gOtherText_Type2, 11, 6); GetStringCenterAlignXOffset(0, 22, 4); GetStringCenterAlignXOffset(2, 23, 4); } @@ -2569,7 +2569,7 @@ static void sub_809FC34(struct Pokemon *mon) sub_80A1918(i, 1); } - MenuZeroFillWindowRect(11, 9, 28, 12); + Menu_EraseWindowRect(11, 9, 28, 12); if (GetMonData(mon, MON_DATA_IS_EGG)) { buffer = gStringVar1; @@ -2580,7 +2580,7 @@ static void sub_809FC34(struct Pokemon *mon) buffer[1] = 0x13; buffer[2] = 0x4E; buffer[3] = EOS; - MenuPrint(gStringVar1, 11, 4); + Menu_PrintText(gStringVar1, 11, 4); sub_80A1EF8(gOtherText_FiveQuestionsAndSlash, 13, 193, 32, 1); sub_80A198C(9, 120, 48, 0); @@ -2588,19 +2588,19 @@ static void sub_809FC34(struct Pokemon *mon) friendship = GetMonData(mon, MON_DATA_FRIENDSHIP); if (friendship < 6) { - MenuPrint(gOtherText_EggAbout, 11, 9); + Menu_PrintText(gOtherText_EggAbout, 11, 9); } else if (friendship < 11) { - MenuPrint(gOtherText_EggSoon, 11, 9); + Menu_PrintText(gOtherText_EggSoon, 11, 9); } else if (friendship < 41) { - MenuPrint(gOtherText_EggSomeTime, 11, 9); + Menu_PrintText(gOtherText_EggSomeTime, 11, 9); } else { - MenuPrint(gOtherText_EggLongTime, 11, 9); + Menu_PrintText(gOtherText_EggLongTime, 11, 9); } PokemonSummaryScreen_PrintEggTrainerMemo(mon, 11, 14); @@ -2629,7 +2629,7 @@ static void sub_809FC34(struct Pokemon *mon) buffer[1] = 0x13; buffer[2] = 0x4E; buffer[3] = EOS; - MenuPrint(gStringVar1, 11, 4); + Menu_PrintText(gStringVar1, 11, 4); sub_80A1F98(GetMonData(mon, MON_DATA_OT_ID) & 0xFFFF, 13, 5, 2, 193, 32, 1); @@ -2642,7 +2642,7 @@ static void sub_809FC34(struct Pokemon *mon) ability = GetAbilityBySpecies(GetMonData(mon, MON_DATA_SPECIES), GetMonData(mon, MON_DATA_ALT_ABILITY)); sub_80A1FF8(gAbilityNames[ability], 13, 11, 9); - MenuPrint(gAbilityDescriptions[ability], 11, 11); + Menu_PrintText(gAbilityDescriptions[ability], 11, 11); PokemonSummaryScreen_PrintTrainerMemo(mon, 11, 14); } @@ -2656,17 +2656,17 @@ static void sub_809FE6C(struct Pokemon *mon) static void sub_809FE80(void) { - MenuZeroFillWindowRect(14, 4, 18, 5); - MenuZeroFillWindowRect(25, 4, 30, 5); - MenuZeroFillWindowRect(11, 9, 28, 12); - MenuZeroFillWindowRect(11, 14, 28, 17); + Menu_EraseWindowRect(14, 4, 18, 5); + Menu_EraseWindowRect(25, 4, 30, 5); + Menu_EraseWindowRect(11, 9, 28, 12); + Menu_EraseWindowRect(11, 14, 28, 17); } static void sub_809FEB8(void) { sub_80A1FF8(gOtherText_ExpPoints, 13, 11, 14); sub_80A1FF8(gOtherText_NextLv, 13, 11, 16); - MenuPrint(gOtherText_Terminator18, 21, 16); + Menu_PrintText(gOtherText_Terminator18, 21, 16); sub_80A1F48(gOtherText_HP, 13, 11, 7, 42); sub_80A1F48(gOtherText_Attack, 13, 11, 9, 42); @@ -2727,12 +2727,12 @@ static void sub_80A0090(struct Pokemon *mon) static void sub_80A00A4(void) { - MenuZeroFillWindowRect(11, 4, 19, 5); - MenuZeroFillWindowRect(16, 7, 21, 8); - MenuZeroFillWindowRect(17, 9, 21, 12); - MenuZeroFillWindowRect(27, 7, 29, 12); - MenuZeroFillWindowRect(22, 14, 28, 15); - MenuZeroFillWindowRect(23, 16, 28, 17); + Menu_EraseWindowRect(11, 4, 19, 5); + Menu_EraseWindowRect(16, 7, 21, 8); + Menu_EraseWindowRect(17, 9, 21, 12); + Menu_EraseWindowRect(27, 7, 29, 12); + Menu_EraseWindowRect(22, 14, 28, 15); + Menu_EraseWindowRect(23, 16, 28, 17); } static void sub_80A00F4(u8 a) @@ -2770,7 +2770,7 @@ static void sub_80A015C(struct Pokemon *mon) { sub_80A1918(i, 1); sub_80A1FF8(gOtherText_OneDash, 13, 15, (2 * i) + 4); - MenuPrint(gOtherText_TwoDashes, 26, (2 * i) + 4); + Menu_PrintText(gOtherText_TwoDashes, 26, (2 * i) + 4); } else { @@ -2793,7 +2793,7 @@ static void sub_80A015C(struct Pokemon *mon) buffer = sub_8072C14(buffer, curPP, 14, 1); *buffer++ = CHAR_SLASH; sub_8072C14(buffer, maxPP, 32, 1); - MenuPrint(gStringVar1, 25, (2 * i) + 4); + Menu_PrintText(gStringVar1, 25, (2 * i) + 4); } } } @@ -2829,7 +2829,7 @@ static void sub_80A029C(struct Pokemon *mon) buffer = sub_8072C14(buffer, pp, 14, 1); *buffer++ = CHAR_SLASH; buffer = sub_8072C14(buffer, pp, 32, 1); - MenuPrint(gStringVar1, 25, 12); + Menu_PrintText(gStringVar1, 25, 12); } static void sub_80A0390(void) @@ -2838,7 +2838,7 @@ static void sub_80A0390(void) for (i = 0; i < MAX_MON_MOVES; i++) { - MenuZeroFillWindowRect(15, (i * 2) + 4, 28, (i * 2) + 5); + Menu_EraseWindowRect(15, (i * 2) + 4, 28, (i * 2) + 5); } } @@ -2883,7 +2883,7 @@ void sub_80A03F0(struct Pokemon *mon, u8 *selectedMoveIndex) static void sub_80A0428(struct Pokemon *mon, u8 *selectedMoveIndex) { u16 move = sub_80A03BC(mon, *selectedMoveIndex); - MenuZeroFillWindowRect(11, 15, 28, 18); + Menu_EraseWindowRect(11, 15, 28, 18); if (pssData.page == PSS_PAGE_BATTLE_MOVES) { @@ -2901,14 +2901,14 @@ static void sub_80A046C(u16 move) { if (move == 0xFFFF) return; - MenuPrint(gMoveDescriptions[move - 1], 11, 15); + Menu_PrintText(gMoveDescriptions[move - 1], 11, 15); } static void sub_80A0498(u16 move) { if (move == 0xFFFF) return; - MenuPrint(gContestEffectStrings[gContestMoves[move].effect], 11, 15); + Menu_PrintText(gContestEffectStrings[gContestMoves[move].effect], 11, 15); } static void sub_80A04CC(u16 move) @@ -2921,26 +2921,26 @@ static void sub_80A04CC(u16 move) { buffer = gStringVar1; buffer = sub_8072C74(buffer, gOtherText_ThreeDashes2, 21, 1); - MenuPrint(gStringVar1, 7, 15); + Menu_PrintText(gStringVar1, 7, 15); } else { buffer = gStringVar1; buffer = sub_8072C14(buffer, gBattleMoves[move].power, 21, 1); - MenuPrint(gStringVar1, 7, 15); + Menu_PrintText(gStringVar1, 7, 15); } if (gBattleMoves[move].accuracy == 0) { buffer = gStringVar1; buffer = sub_8072C74(buffer, gOtherText_ThreeDashes2, 21, 1); - MenuPrint(gStringVar1, 7, 17); + Menu_PrintText(gStringVar1, 7, 17); } else { buffer = gStringVar1; buffer = sub_8072C14(buffer, gBattleMoves[move].accuracy, 21, 1); - MenuPrint(gStringVar1, 7, 17); + Menu_PrintText(gStringVar1, 7, 17); } } @@ -3153,7 +3153,7 @@ static void PokemonSummaryScreen_PrintEggTrainerMemo(struct Pokemon *mon, u8 lef if (!(gameMet == VERSION_RUBY || gameMet == VERSION_SAPPHIRE || gameMet == VERSION_EMERALD)) { - MenuPrint(gOtherText_EggObtainedInTrade, left, top); + Menu_PrintText(gOtherText_EggObtainedInTrade, left, top); return; } @@ -3162,13 +3162,13 @@ static void PokemonSummaryScreen_PrintEggTrainerMemo(struct Pokemon *mon, u8 lef if (locationMet == 255) { // Eggs received from Pokemon Box. - MenuPrint(gOtherText_EggNicePlace, left, top); + Menu_PrintText(gOtherText_EggNicePlace, left, top); return; } if (!PokemonSummaryScreen_CheckOT(mon)) { - MenuPrint(gOtherText_EggObtainedInTrade, left, top); + Menu_PrintText(gOtherText_EggObtainedInTrade, left, top); return; } @@ -3176,11 +3176,11 @@ static void PokemonSummaryScreen_PrintEggTrainerMemo(struct Pokemon *mon, u8 lef if (locationMet == 253) { - MenuPrint(gOtherText_EggHotSprings, left, top); + Menu_PrintText(gOtherText_EggHotSprings, left, top); return; } - MenuPrint(gOtherText_EggDayCare, left, top); + Menu_PrintText(gOtherText_EggDayCare, left, top); } static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *mon, u8 left, u8 top) @@ -3285,7 +3285,7 @@ static void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *mon, u8 left, } } - MenuPrint(gStringVar4, left++, top++); + Menu_PrintText(gStringVar4, left++, top++); } static void sub_80A0958(struct Pokemon *mon) @@ -3310,8 +3310,8 @@ static void sub_80A0958(struct Pokemon *mon) buffer[2] = 0x50; buffer[3] = EOS; - MenuPrint(gStringVar1, 0, 14); - MenuZeroFillWindowRect(3, 16, 9, 17); + Menu_PrintText(gStringVar1, 0, 14); + Menu_EraseWindowRect(3, 16, 9, 17); level = GetMonData(mon, MON_DATA_LEVEL); @@ -3325,7 +3325,7 @@ static void sub_80A0958(struct Pokemon *mon) buffer[2] = 0x20; buffer[3] = EOS; - MenuPrint(gStringVar1, 3, 16); + Menu_PrintText(gStringVar1, 3, 16); sub_80A0A2C(mon, 7, 16); } @@ -3343,7 +3343,7 @@ static void sub_80A0A2C(struct Pokemon *mon, u8 left, u8 top) { default: bottom = top + 1; - MenuZeroFillWindowRect(left, top, left, bottom); + Menu_EraseWindowRect(left, top, left, bottom); return; case MON_MALE: genderSymbol = gOtherText_MaleSymbol2; @@ -3406,7 +3406,7 @@ static void PrintNumRibbons(struct Pokemon *mon) ConvertIntToDecimalStringN(&text[3], numRibbons, 1, 2); } - MenuPrint(sUnknown_083C15AE, 21, 4); + Menu_PrintText(sUnknown_083C15AE, 21, 4); } static void PrintHeldItemName(u16 itemId, u8 left, u8 top) @@ -3427,7 +3427,7 @@ static void PrintHeldItemName(u16 itemId, u8 left, u8 top) CopyItemName(itemId, gStringVar1); } - MenuPrint(sUnknown_083C15B4, left, top); + Menu_PrintText(sUnknown_083C15B4, left, top); } static void DrawExperienceProgressBar(struct Pokemon *mon, u8 left, u8 top) @@ -3518,7 +3518,7 @@ static void PrintSummaryWindowHeaderText(void) buffer[2] = 0x58; buffer[3] = EOS; - MenuPrint(gStringVar1, 0, 0); + Menu_PrintText(gStringVar1, 0, 0); if (pssData.headerActionTextId != 0) { @@ -3527,7 +3527,7 @@ static void PrintSummaryWindowHeaderText(void) } else { - MenuZeroFillWindowRect(23, 0, 24, 1); + Menu_EraseWindowRect(23, 0, 24, 1); } buffer = gStringVar1; @@ -3539,7 +3539,7 @@ static void PrintSummaryWindowHeaderText(void) buffer[2] = 0x28; buffer[3] = EOS; - MenuPrint(gStringVar1, 25, 0); + Menu_PrintText(gStringVar1, 25, 0); } // If the given pokemon previously had the pokerus virus, a small @@ -4138,7 +4138,7 @@ static void sub_80A12D0(s8 a) { u8 newTaskId; - MenuZeroFillWindowRect(1, 18, 5, 19); + Menu_EraseWindowRect(1, 18, 5, 19); sub_80A18E4(29); newTaskId = CreateTask(sub_80A1048, 0); @@ -4194,14 +4194,14 @@ static void sub_80A12D0(s8 a) // } // else // { -// MenuZeroFillWindowRect(0, 19, 9, 19); +// Menu_EraseWindowRect(0, 19, 9, 19); // } // if (gTasks[taskId].data[0] == 0 || gTasks[taskId].data[1] < 0) // { // if (pssData.page == PSS_PAGE_BATTLE_MOVES) // { -// MenuZeroFillWindowRect(0, 14, 9, 18); +// Menu_EraseWindowRect(0, 14, 9, 18); // sub_80A0958(pssData.loadedMon); // if (GetMonStatusAndPokerus(pssData.loadedMon)) @@ -4327,7 +4327,7 @@ _080A13F4:\n\ movs r1, 0x13\n\ movs r2, 0x9\n\ movs r3, 0x13\n\ - bl MenuZeroFillWindowRect\n\ + bl Menu_EraseWindowRect\n\ _080A1400:\n\ movs r1, 0\n\ ldrsh r0, [r7, r1]\n\ @@ -4346,7 +4346,7 @@ _080A1410:\n\ movs r1, 0xE\n\ movs r2, 0x9\n\ movs r3, 0x12\n\ - bl MenuZeroFillWindowRect\n\ + bl Menu_EraseWindowRect\n\ adds r4, 0x10\n\ adds r0, r4, 0\n\ bl sub_80A0958\n\ @@ -4404,7 +4404,7 @@ static void sub_80A1488(s8 a, u8 b) if (pssData.page == PSS_PAGE_BATTLE_MOVES) { - MenuZeroFillWindowRect(0, 14, 9, 19); + Menu_EraseWindowRect(0, 14, 9, 19); } taskId = FindTaskIdByFunc(sub_80A1334); @@ -4531,7 +4531,7 @@ _080A15C0:\n\ movs r1, 0x13\n\ movs r2, 0x9\n\ movs r3, 0x13\n\ - bl MenuZeroFillWindowRect\n\ + bl Menu_EraseWindowRect\n\ _080A15CC:\n\ movs r1, 0\n\ ldrsh r0, [r7, r1]\n\ @@ -4550,7 +4550,7 @@ _080A15DC:\n\ movs r1, 0xE\n\ movs r2, 0x9\n\ movs r3, 0x12\n\ - bl MenuZeroFillWindowRect\n\ + bl Menu_EraseWindowRect\n\ adds r4, 0x10\n\ adds r0, r4, 0\n\ bl sub_80A0958\n\ @@ -4606,7 +4606,7 @@ static void sub_80A1654(s8 a, u8 b) if (pssData.page == PSS_PAGE_CONTEST_MOVES) { - MenuZeroFillWindowRect(0, 14, 9, 19); + Menu_EraseWindowRect(0, 14, 9, 19); } taskId = FindTaskIdByFunc(sub_80A1500); @@ -5272,7 +5272,7 @@ u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8 id) { u8 arr[3]; - sub_8072CD4(&arr[0], &arr[1], &arr[2]); + Menu_GetTextColors(&arr[0], &arr[1], &arr[2]); dest = sub_80A1E58(dest, id); dest = StringCopy(dest, src); @@ -5313,7 +5313,7 @@ static void sub_80A1F98(s32 value, u8 id, u8 n, u8 mode, u8 left, u16 top, s32 e static void sub_80A1FF8(const u8 *text, u8 id, u8 left, u8 top) { sub_80A1E9C(gStringVar4, text, id); - MenuPrint(gStringVar4, left, top); + Menu_PrintText(gStringVar4, left, top); } u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level) diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 8a67390ad..411a20f79 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -3337,7 +3337,7 @@ void sub_80EF428(u8 a, u8 b) tileBuffer = gUnknown_083DFEC8; sub_8072C74(&tileBuffer[0x800], pcText, 0xC0, 2); - MenuPrint(&tileBuffer[0x800], 3, 17); + Menu_PrintText(&tileBuffer[0x800], 3, 17); } void sub_80EF490(u8 a) @@ -3670,7 +3670,7 @@ bool8 sub_80EF874(void) return TRUE; break; case 4: - MenuZeroFillScreen(); + Menu_EraseScreen(); break; case 5: sub_80FA904(&gUnknown_083DFEC4->regionMap, gSaveBlock2.regionMapZoom ? TRUE : FALSE); @@ -3691,7 +3691,7 @@ bool8 sub_80EF874(void) return TRUE; break; case 10: - MenuDrawTextWindow(13, 3, 29, 17); + Menu_DrawStdWindowFrame(13, 3, 29, 17); sub_80EF9F8(); break; case 11: @@ -3765,8 +3765,8 @@ void sub_80EF9F8(void) b = gUnknown_083DFEC4->regionMap.everGrandeCityArea; if (gUnknown_083DFEC4->unkCDCC[mapSectionId][b] != NULL) { - MenuFillWindowRectWithBlankTile(14, top, 15, 15); - MenuFillWindowRectWithBlankTile(26, top, 28, 15); + Menu_BlankWindowRect(14, top, 15, 15); + Menu_BlankWindowRect(26, top, 28, 15); sub_8095C8C((void *)(VRAM + 0xF800), 16, 6, gUnknown_083DFEC4->unkCDCC[mapSectionId][b], 0, 0, 10, 10, 10); top += 11; } @@ -3779,7 +3779,7 @@ void sub_80EF9F8(void) // Epic fail by the compiler at optimizing this. if (!someBool && top < 16) - MenuFillWindowRectWithBlankTile(14, top, 28, 15); + Menu_BlankWindowRect(14, top, 28, 15); if (gUnknown_083DFEC4->regionMap.unk16 == 2) sub_80EFD74(); @@ -3982,7 +3982,7 @@ bool8 sub_80EFF68(void) return TRUE; break; case 4: - MenuZeroFillScreen(); + Menu_EraseScreen(); break; case 5: sub_80F1614(); @@ -4050,13 +4050,13 @@ void sub_80F01A4(void) void sub_80F01E0(u16 a) { - MenuPrint(gUnknown_083DFEC4->unk8829[a], 13, 1); + Menu_PrintText(gUnknown_083DFEC4->unk8829[a], 13, 1); if (gUnknown_083DFEC4->unk76AA == 1) { - MenuPrint(gUnknown_083DFEC4->unk88E9[a], 13, 3); + Menu_PrintText(gUnknown_083DFEC4->unk88E9[a], 13, 3); sub_80F443C(gUnknown_083DFEC4->unk8788, gUnknown_083DFEC4->unk893c[gUnknown_083DFEC4->unk87DC].unk2); - MenuPrint(gUnknown_083DFEC4->unk8788, 1, 6); + Menu_PrintText(gUnknown_083DFEC4->unk8788, 1, 6); } } @@ -4098,7 +4098,7 @@ bool8 sub_80F02A0(void) } break; case 4: - MenuZeroFillScreen(); + Menu_EraseScreen(); break; case 5: LZ77UnCompVram(gUnknown_08E9FC64, (void *)VRAM + 0xE800); @@ -4287,7 +4287,7 @@ _080F035C:\n\ _080F0366:\n\ b _080F0626\n\ _080F0368:\n\ - bl MenuZeroFillScreen\n\ + bl Menu_EraseScreen\n\ b _080F0618\n\ _080F036E:\n\ ldr r0, _080F0378 @ =gUnknown_08E9FC64\n\ diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c index bf6d03fb7..9449ca0d1 100644 --- a/src/rom_800D42C.c +++ b/src/rom_800D42C.c @@ -28,8 +28,8 @@ extern u8 BattleText_Tie[]; #define PRINT_MESSAGE(text, tileDataStartOffset, x) \ { \ - InitWindow(&gUnknown_03004210, text, tileDataStartOffset, x, MESSAGE_Y); \ - sub_8002F44(&gUnknown_03004210); \ + Text_InitWindow(&gUnknown_03004210, text, tileDataStartOffset, x, MESSAGE_Y); \ + Text_PrintWindow8002F44(&gUnknown_03004210); \ } #define PRINT_MESSAGE_LEFT(text, tileDataStartOffset) PRINT_MESSAGE(text, tileDataStartOffset, LEFT_MESSAGE_X) diff --git a/src/roulette.c b/src/roulette.c index 1d612d071..0253a6bb8 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -625,8 +625,8 @@ void sub_8115384(void) sub_81182F8(0x6); sub_811829C(0x0); sub_8117158(0x0); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C4157[0], 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C4157[0], 0x1, 0xF); gSpriteCoordOffsetX = -0x3C; gSpriteCoordOffsetY = 0x0; gMain.state++; @@ -693,14 +693,14 @@ void sub_8115734(u8 taskid) { DisplayYesNoMenu(0x14, 0x8, 0x1); sub_814AAF8(0x2D9E); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C41E3, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C41E3, 0x1, 0xF); DoYesNoFuncWithChoice(taskid, &gUnknown_083F8EBC); } void sub_811577C(u8 taskid) { - MenuZeroFillWindowRect(0x14, 0x8, 0x1A, 0xD); + Menu_EraseWindowRect(0x14, 0x8, 0x1A, 0xD); gTasks[taskid].func = &sub_81159BC; } @@ -1446,21 +1446,21 @@ void sub_8116638(u8 taskid) if (gTasks[taskid].data[0x2] == 0xC) { PlayFanfare(BGM_ME_B_BIG); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C41A5, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C41A5, 0x1, 0xF); } else { PlayFanfare(BGM_ME_B_SMALL); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C4199, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C4199, 0x1, 0xF); } break; case 0: default: m4aSongNumStart(SE_HAZURE); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C41AE, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C41AE, 0x1, 0xF); } gTasks[taskid].data[0x1] = 0x0; gTasks[taskid].func = &sub_811659C; @@ -1500,8 +1500,8 @@ void sub_811677C(u8 taskid) { ConvertIntToDecimalStringN((u8 *)&gStringVar1, (eRoulette->var19 * gTasks[taskid].data[0x2]), STR_CONV_MODE_LEFT_ALIGN, 0x2); StringExpandPlaceholders((u8 *)&gStringVar4, &gUnknown_081C41BD); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint((u8 *)&gStringVar4, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText((u8 *)&gStringVar4, 0x1, 0xF); gTasks[taskid].data[0x1] = (eRoulette->var19 * gTasks[taskid].data[0x2]); gTasks[taskid].data[0x7] = 0x0; gTasks[taskid].func = &sub_81166E8; @@ -1534,14 +1534,14 @@ void sub_8116880(u8 taskid) { if (gTasks[taskid].data[0x6] == 0x6) { - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C41F1, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C41F1, 0x1, 0xF); sub_8116C34(taskid, &dp01t_12_3_battle_menu, 0xFFFF, 0x3); } else if (gTasks[taskid].data[0xD] == 0x270F) { - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C4231, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C4231, 0x1, 0xF); sub_8116C34(taskid, &sub_8115734, 0xFFFF, 0x3); } else @@ -1551,8 +1551,8 @@ void sub_8116880(u8 taskid) } else { - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C41D2, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C41D2, 0x1, 0xF); sub_8116C34(taskid, &sub_81157AC, 0x3C, 0x3); } } @@ -1570,8 +1570,8 @@ void dp01t_12_3_battle_menu(u8 taskid) gSprites[eRoulette->var3C[i + 0x7]].invisible = FALSE; if (gTasks[taskid].data[0xD] == 0x270F) { - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C4231, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C4231, 0x1, 0xF); sub_8116C34(taskid, &sub_8115734, 0xFFFF, 0x3); } else @@ -2619,8 +2619,8 @@ void sub_8117528(u8 taskid) void sub_811755C(u8 taskid) { - MenuZeroFillWindowRect(0x14, 0x8, 0x1A, 0xD); - MenuZeroFillScreen(); + Menu_EraseWindowRect(0x14, 0x8, 0x1A, 0xD); + Menu_EraseScreen(); BeginNormalPaletteFade(-0x1, 0x0, 0x0, 0x10, 0x0); gPaletteFade.delayCounter = gPaletteFade.multipurpose2; UpdatePaletteFade(); @@ -2629,7 +2629,7 @@ void sub_811755C(u8 taskid) void sub_81175C0(u8 taskid) { - MenuZeroFillScreen(); + Menu_EraseScreen(); ScriptContext2_Disable(); DestroyTask(taskid); } @@ -2640,7 +2640,7 @@ void sub_81175DC(u8 taskid) if (!(gMain.newKeys & (A_BUTTON | B_BUTTON)) && gTasks[taskid].data[0] < 0x3D) return; gSpecialVar_0x8004 = 0x1; - MenuZeroFillScreen(); + Menu_EraseScreen(); ScriptContext2_Disable(); DestroyTask(taskid); } @@ -2650,8 +2650,8 @@ void sub_8117630(u8 taskid) u32 temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 0x1) + (gSpecialVar_0x8004 >> 0x7 << 0x1)]; ConvertIntToDecimalStringN(gStringVar1, temp, 0x2, 0x1); StringExpandPlaceholders(gStringVar4, &gUnknown_081C40DF); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(gStringVar4, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(gStringVar4, 0x1, 0xF); gTasks[taskid].func = &sub_81174F8; } @@ -2660,7 +2660,7 @@ void Task_Roulette_0(u8 taskid) s32 temp; ConvertIntToDecimalStringN(gStringVar1, gTasks[taskid].data[0xD], 0x1, 0x4); StringExpandPlaceholders(gStringVar4, gOtherText_Coins); - MenuDrawTextWindow(0x0, 0x0, 0x9, 0x3); + Menu_DrawStdWindowFrame(0x0, 0x0, 0x9, 0x3); MenuPrint_RightAligned(gStringVar4, 0x9, 0x1); temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 0x1) + (gSpecialVar_0x8004 >> 0x7 << 0x1)]; ConvertIntToDecimalStringN(gStringVar1, temp, 0x2, 0x1); @@ -2668,23 +2668,23 @@ void Task_Roulette_0(u8 taskid) { if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 0x1)) { - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(&gUnknown_081C4139, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(&gUnknown_081C4139, 0x1, 0xF); sub_8116C34(taskid , &sub_8117630, 0xFFFF, 0x3); } else { StringExpandPlaceholders(gStringVar4, &gUnknown_081C40DF); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(gStringVar4, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(gStringVar4, 0x1, 0xF); gTasks[taskid].func = &sub_81174F8; } } else { StringExpandPlaceholders(gStringVar4, &gUnknown_081C411C); - MenuDrawTextWindow(0x0, 0xE, 0x1D, 0x13); - MenuPrint(gStringVar4, 0x1, 0xF); + Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); + Menu_PrintText(gStringVar4, 0x1, 0xF); gTasks[taskid].func = &sub_81175DC; gTasks[taskid].data[0xD] = 0x0; gTasks[taskid].data[0x0] = 0x0; diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 53308e856..d1ab2d512 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -215,7 +215,7 @@ extern u8 byte_3002A68; extern const u8 gUnknown_08E6C100[]; extern const u8 gUnknown_08E6C920[]; extern const u8 gUnknown_08E6D354[]; -extern const struct WindowConfig gWindowConfig_81E6F68; +extern const struct WindowTemplate gWindowConfig_81E6F68; extern const u8 *const gPokeblockNames[]; extern const struct Berry gBerries[]; @@ -993,12 +993,12 @@ static void sub_804E56C(void) } break; case 4: - MenuDrawTextWindow(0, 14, 29, 19); + Menu_DrawStdWindowFrame(0, 14, 29, 19); MenuPrintMessage(gOtherText_BlenderChooseBerry, 1, 15); gBerryBlenderData->field_0++; break; case 5: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { gBerryBlenderData->field_0++; BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); @@ -1184,8 +1184,8 @@ static void sub_804E9F8(void) } break; case 5: - MenuDrawTextWindow(0, 13, 29, 19); - MenuPrint(gOtherText_LinkStandby3, 1, 14); + Menu_DrawStdWindowFrame(0, 13, 29, 19); + Menu_PrintText(gOtherText_LinkStandby3, 1, 14); gBerryBlenderData->field_0 = 8; gBerryBlenderData->framesToWait = 0; break; @@ -1209,7 +1209,7 @@ static void sub_804E9F8(void) case 10: if (++gBerryBlenderData->framesToWait > 20) { - MenuZeroFillScreen(); + Menu_EraseScreen(); if (GetBlockReceivedStatus() == sub_8008198()) { for (i = 0; i < GetLinkPlayerCount(); i++) @@ -1309,12 +1309,12 @@ static void sub_804E9F8(void) PlayBGM(BGM_CYCLING); break; case 100: - MenuDrawTextWindow(0, 13, 29, 19); + Menu_DrawStdWindowFrame(0, 13, 29, 19); MenuPrintMessage(gOtherText_LinkNotFound, 1, 15); gBerryBlenderData->field_0++; break; case 101: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) gBerryBlenderData->field_0++; break; case 102: @@ -2500,9 +2500,9 @@ static void sub_80508D4(u8 value) static void sub_80508FC(void) { gBerryBlenderData->field_AA = 0; - MenuDrawTextWindow(23, 8, 28, 13); + Menu_DrawStdWindowFrame(23, 8, 28, 13); sub_814A5C0(0, -1, 12, 0x2D9F, 32); - MenuPrint(gOtherText_YesNoTerminating, 24, 9); + Menu_PrintText(gOtherText_YesNoTerminating, 24, 9); sub_80508D4(gBerryBlenderData->field_AA); } @@ -2575,11 +2575,11 @@ static void sub_8050954(void) break; case 7: gBerryBlenderData->field_6F++; - MenuDrawTextWindow(0, 14, 29, 19); + Menu_DrawStdWindowFrame(0, 14, 29, 19); MenuPrintMessage(gOtherText_BlendAnotherBerryPrompt, 1, 15); break; case 8: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) gBerryBlenderData->field_6F++; break; case 9: @@ -2654,7 +2654,7 @@ static void sub_8050954(void) } break; case 13: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { SetMainCallback2(sub_8050E30); gBerryBlenderData->field_6F = 0; @@ -2746,7 +2746,7 @@ static void sub_8050E30(void) case 1: gBerryBlenderData->field_6F = 3; DestroyMenuCursor(); - MenuZeroFillWindowRect(23, 8, 28, 13); + Menu_EraseWindowRect(23, 8, 28, 13); #ifdef ENGLISH StringCopy(gStringVar4, gLinkPlayers[gBerryBlenderData->field_7A].name); StringAppend(gStringVar4, gOtherText_OtherCaseIsFull); @@ -2759,7 +2759,7 @@ static void sub_8050E30(void) case 2: gBerryBlenderData->field_6F++; DestroyMenuCursor(); - MenuZeroFillWindowRect(23, 8, 28, 13); + Menu_EraseWindowRect(23, 8, 28, 13); #ifdef ENGLISH StringCopy(gStringVar4, gLinkPlayers[gBerryBlenderData->field_7A].name); StringAppend(gStringVar4, gOtherText_NoBerriesForBlend); @@ -2770,7 +2770,7 @@ static void sub_8050E30(void) MenuPrintMessage(gStringVar4, 1, 15); break; case 3: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { gBerryBlenderData->framesToWait = 0; gBerryBlenderData->field_6F++; @@ -2781,8 +2781,8 @@ static void sub_8050E30(void) gBerryBlenderData->field_6F = 5; break; case 5: - MenuDrawTextWindow(0, 14, 29, 19); - MenuPrint(gMultiText_Saving, 2, 15); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(gMultiText_Saving, 2, 15); sub_80084A4(); gBerryBlenderData->field_6F++; break; @@ -2859,17 +2859,17 @@ static void sub_80510E8(void) case 1: gBerryBlenderData->field_6F = 3; DestroyMenuCursor(); - MenuZeroFillWindowRect(23, 8, 28, 13); + Menu_EraseWindowRect(23, 8, 28, 13); MenuPrintMessage(gOtherText_CaseIsFull, 1, 15); break; case 2: gBerryBlenderData->field_6F++; DestroyMenuCursor(); - MenuZeroFillWindowRect(23, 8, 28, 13); + Menu_EraseWindowRect(23, 8, 28, 13); MenuPrintMessage(gOtherText_OutOfBerries, 1, 15); break; case 3: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) gBerryBlenderData->field_6F = 9; break; case 9: @@ -3081,13 +3081,13 @@ void unref_sub_80516F8(u8 taskID) if (task->data[0] == 100) { ZeroFillWindowRect(&gBerryBlenderData->field_4, 0, 0, 16, 20); - MenuDrawTextWindow(4, 4, 10, 12); + Menu_DrawStdWindowFrame(4, 4, 10, 12); for (i = 0; i < 3; i++) { if (gLinkPlayers[i + 1].trainerId != 0) - MenuPrint(gUnknown_08216284[i], 5, (2 * i) + 5); - MenuDrawTextWindow(0, 13, 29, 19); - MenuPrint(gOtherText_PressAToStart, 1, 15); + Menu_PrintText(gUnknown_08216284[i], 5, (2 * i) + 5); + Menu_DrawStdWindowFrame(0, 13, 29, 19); + Menu_PrintText(gOtherText_PressAToStart, 1, 15); } } if (gMain.newKeys & A_BUTTON) @@ -3099,7 +3099,7 @@ void unref_sub_80516F8(u8 taskID) else { if (task->data[0] == 10) - MenuPrint(gOtherText_PleaseWait, 3, 10); + Menu_PrintText(gOtherText_PleaseWait, 3, 10); if (++task->data[0] > 120) task->data[0] = 0; if (byte_3002A68 > 4 && gReceivedRemoteLinkPlayers == 1) @@ -3348,7 +3348,7 @@ static bool8 Blender_PrintBlendingResults(void) u8* textPtr; u16 secondsPassed, minutes, seconds; - MenuDrawTextWindow(4, 2, 25, 17); + Menu_DrawStdWindowFrame(4, 2, 25, 17); sub_8072BD8(gOtherText_ResultsOfBlending, 5, 3, 160); for (i = 0; i < gBerryBlenderData->playersNo; i++) { @@ -3370,7 +3370,7 @@ static bool8 Blender_PrintBlendingResults(void) textPtr += 3; textPtr = sub_8072C74(textPtr, gLinkPlayers[place].name, 88, 0); sub_8072C74(textPtr, text[0], 157, 0); - MenuPrint(gBerryBlenderData->stringVar, 5, gUnknown_082165E9[gBerryBlenderData->playersNo] + (i * gUnknown_082165EE[gBerryBlenderData->playersNo])); + Menu_PrintText(gBerryBlenderData->stringVar, 5, gUnknown_082165E9[gBerryBlenderData->playersNo] + (i * gUnknown_082165EE[gBerryBlenderData->playersNo])); } ConvertIntToDecimalStringN(text[0], gBerryBlenderData->max_RPM % 100, 2, 2); textPtr = gBerryBlenderData->stringVar; @@ -3388,7 +3388,7 @@ static bool8 Blender_PrintBlendingResults(void) textPtr = sub_8072C74(textPtr, text[0], 136, 1); #endif StringCopy(textPtr, gOtherText_RPM); - MenuPrint(gBerryBlenderData->stringVar, 5, 13); + Menu_PrintText(gBerryBlenderData->stringVar, 5, 13); secondsPassed = gBerryBlenderData->gameFrameTime / 60; seconds = secondsPassed % 60; @@ -3408,7 +3408,7 @@ static bool8 Blender_PrintBlendingResults(void) textPtr = sub_8072C74(textPtr, text[1], 136, 1); StringCopy(textPtr, gOtherText_Sec); - MenuPrint(gBerryBlenderData->stringVar, 5, 15); + Menu_PrintText(gBerryBlenderData->stringVar, 5, 15); gBerryBlenderData->framesToWait = 0; gBerryBlenderData->field_0++; @@ -3419,8 +3419,8 @@ static bool8 Blender_PrintBlendingResults(void) gBerryBlenderData->field_0++; break; case 5: - MenuZeroFillScreen(); - MenuDrawTextWindow(0, 14, 29, 19); + Menu_EraseScreen(); + Menu_DrawStdWindowFrame(0, 14, 29, 19); for (i = 0; i < BLENDER_MAX_PLAYERS; i++) { if (gBerryBlenderData->chosenItemID[i] != 0) @@ -3436,7 +3436,7 @@ static bool8 Blender_PrintBlendingResults(void) gBerryBlenderData->field_0++; break; case 6: - if (MenuUpdateWindowText()) + if (Menu_UpdateWindowText()) { Blender_TrySettingRecord(); return TRUE; @@ -3536,7 +3536,7 @@ static bool8 Blender_PrintBlendingRanking(void) } break; case 3: - MenuDrawTextWindow(4, 2, 25, 17); + Menu_DrawStdWindowFrame(4, 2, 25, 17); sub_8072BD8(gOtherText_Ranking, 5, 3, 160); gBerryBlenderData->scoreIconIDs[BLENDER_SCORE_BEST] = CreateSprite(&sSpriteTemplate_821645C, 140, 52, 0); @@ -3575,7 +3575,7 @@ static bool8 Blender_PrintBlendingRanking(void) txtPtr = sub_8072C14(txtPtr, gBerryBlenderData->scores[place][BLENDER_SCORE_GOOD], 132, 1); txtPtr = sub_8072C14(txtPtr, gBerryBlenderData->scores[place][BLENDER_SCORE_MISS], 156, 1); - MenuPrint(gBerryBlenderData->stringVar, 5, i * gUnknown_082165F3[gBerryBlenderData->playersNo] + 8); + Menu_PrintText(gBerryBlenderData->stringVar, 5, i * gUnknown_082165F3[gBerryBlenderData->playersNo] + 8); } gBerryBlenderData->framesToWait = 0; gBerryBlenderData->field_0++; @@ -3625,10 +3625,10 @@ static void BlenderDebug_PrintBerryData(void) u8 i; StringCopy(text, sText_BPM); - MenuPrint(text, 2, 0); + Menu_PrintText(text, 2, 0); ConvertIntToDecimalStringN(text, sBlenderDebug.BPM / 100, 2, 3); - MenuPrint(text, 6, 0); + Menu_PrintText(text, 6, 0); for (i = 0; i < 4; i++) { @@ -3646,7 +3646,7 @@ static void BlenderDebug_PrintBerryData(void) text[7] = EOS; } var = (i * 3) + 3; - MenuPrint(text, 2, var); + Menu_PrintText(text, 2, var); ConvertIntToDecimalStringN(&text[0], gBerries[sBlenderDebug.berries[i]].spicy, 2, 2); StringAppend(text, sText_Space); @@ -3666,12 +3666,12 @@ static void BlenderDebug_PrintBerryData(void) ConvertIntToDecimalStringN(&text[15], gBerries[sBlenderDebug.berries[i]].smoothness, 2, 2); text[17] = EOS; - MenuPrint(text, 7, var); + Menu_PrintText(text, 7, var); } if (sBlenderDebug.pokeblock.color != 0) { StringCopy(text, gPokeblockNames[sBlenderDebug.pokeblock.color]); - MenuPrint(text, 2, 15); + Menu_PrintText(text, 2, 15); ConvertIntToHexStringN(&text[0], sBlenderDebug.spicy, 2, 2); StringAppend(text, sText_Space); @@ -3691,7 +3691,7 @@ static void BlenderDebug_PrintBerryData(void) ConvertIntToHexStringN(&text[15], sBlenderDebug.feel, 2, 2); text[17] = EOS; - MenuPrint(text, 7, 17); + Menu_PrintText(text, 7, 17); } } @@ -3743,7 +3743,7 @@ static void sub_80527BC(void) gUnknown_020297DC = 0; } - MenuPrint(text, 2, 15); + Menu_PrintText(text, 2, 15); } static void sub_8052918(void) @@ -3845,9 +3845,9 @@ void ShowBerryBlenderRecordWindow(void) u8 text[30]; s32 i; - MenuDrawTextWindow(6, 3, 23, 16); - MenuPrint(gMultiText_BerryBlenderMaxSpeedRecord, 8, 4); - MenuPrint(gMultiText_2P3P4P, 8, 9); + Menu_DrawStdWindowFrame(6, 3, 23, 16); + Menu_PrintText(gMultiText_BerryBlenderMaxSpeedRecord, 8, 4); + Menu_PrintText(gMultiText_2P3P4P, 8, 9); for (i = 0; i < 3; i++) { @@ -3865,7 +3865,7 @@ void ShowBerryBlenderRecordWindow(void) txtPtr = ConvertIntToDecimalStringN(txtPtr, record % 100, 2, 2); StringAppend(txtPtr, gOtherText_RPM); - MenuPrint(text, 15, i * 2 + 9); + Menu_PrintText(text, 15, i * 2 + 9); } } diff --git a/src/scene/credits.c b/src/scene/credits.c index 17c1bf263..54b517a91 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -857,7 +857,7 @@ static void task_b_81441B8(u8 taskIdB) case 5: if (!gPaletteFade.active) { - MenuZeroFillWindowRect(0, 9, 29, 19); + Menu_EraseWindowRect(0, 9, 29, 19); gTasks[taskIdB].data[TDB_0] = 2; } return; diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index c0111de7d..8d961ad1f 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -472,9 +472,9 @@ static void CB2_EggHatch_0(void) break; case 1: SetUpWindowConfig(&gWindowConfig_81E6F84); - InitWindowFromConfig(&gEggHatchData->window, &gWindowConfig_81E6F84); - gEggHatchData->tileDataStartOffset = SetTextWindowBaseTileNum(20); - LoadTextWindowGraphics(&gEggHatchData->window); + Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowConfig_81E6F84); + gEggHatchData->tileDataStartOffset = TextWindow_SetBaseTileNum(20); + TextWindow_LoadStdFrameGraphics(&gEggHatchData->window); gMain.state++; break; case 2: @@ -625,7 +625,7 @@ static void CB2_EggHatch_1(void) case 8: if (EggHatchUpdateWindowText()) { - MenuDrawTextWindow(22, 8, 27, 13); + Menu_DrawStdWindowFrame(22, 8, 27, 13); InitYesNoMenu(22, 8, 4); gEggHatchData->CB2_state++; } @@ -848,15 +848,15 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 static void EggHatchPrintMessage1(u8* src) { - sub_8002EB0(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15); + Text_InitWindow8002EB0(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15); } static void EggHatchPrintMessage2(u8* src) { - sub_8003460(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15); + Text_InitWindowAndPrintText(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15); } static bool8 EggHatchUpdateWindowText(void) { - return sub_80035AC(&gEggHatchData->window); + return Text_UpdateWindow(&gEggHatchData->window); } diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 4ee601360..323313fc2 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -209,7 +209,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); @@ -317,7 +317,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; - InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); @@ -374,14 +374,14 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) break; case 1: SetUpWindowConfig(&gWindowConfig_81E6F84); - InitWindowFromConfig(&gUnknown_03004828->window, &gWindowConfig_81E6F84); + Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E6F84); gMain.state++; break; case 2: - LoadTextWindowGraphics(&gUnknown_03004828->window); - gUnknown_03004828->textWindowBaseTileNum = SetTextWindowBaseTileNum(2); - LoadTextWindowGraphics(&gUnknown_03004828->window); - MenuZeroFillScreen(); + TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); + gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2); + TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); + Menu_EraseScreen(); ResetPaletteFade(); gMain.state++; SetHBlankCallback(EvoDummyFunc); @@ -481,7 +481,7 @@ static void CB2_EvolutionSceneUpdate(void) { AnimateSprites(); BuildOamBuffer(); - sub_800374C(&gUnknown_03004210); + Text_UpdateWindowInBattle(&gUnknown_03004210); UpdatePaletteFade(); RunTasks(); } @@ -490,7 +490,7 @@ static void CB2_TradeEvolutionSceneUpdate(void) { AnimateSprites(); BuildOamBuffer(); - sub_80035AC(&gUnknown_03004828->window); + Text_UpdateWindow(&gUnknown_03004828->window); UpdatePaletteFade(); RunTasks(); } @@ -558,7 +558,7 @@ static void Task_EvolutionScene(u8 taskID) if (!gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, BattleText_StartEvo); - sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); gTasks[taskID].tState++; } break; @@ -646,7 +646,7 @@ static void Task_EvolutionScene(u8 taskID) if (IsCryFinished() && !gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); - sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); PlayBGM(BGM_FANFA5); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); @@ -715,7 +715,7 @@ static void Task_EvolutionScene(u8 taskID) if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, BattleText_StopEvo); - sub_8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15); gTasks[taskID].tEvoWasStopped = TRUE; gTasks[taskID].tState = 14; } @@ -726,7 +726,7 @@ static void Task_EvolutionScene(u8 taskID) sub_8024CEC(); PlayFanfare(BGM_FANFA1); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskID].tState++; } @@ -743,7 +743,7 @@ static void Task_EvolutionScene(u8 taskID) { sub_8024CEC(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -751,7 +751,7 @@ static void Task_EvolutionScene(u8 taskID) if (gUnknown_03004210.state == 0 && !IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -761,7 +761,7 @@ static void Task_EvolutionScene(u8 taskID) if (!IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 5; gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; @@ -794,7 +794,7 @@ static void Task_EvolutionScene(u8 taskID) { sub_8023AD8(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; @@ -809,7 +809,7 @@ static void Task_EvolutionScene(u8 taskID) { sub_8023AD8(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); PlaySE(SE_SELECT); gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } @@ -835,7 +835,7 @@ static void Task_EvolutionScene(u8 taskID) if (IsHMMove2(move)) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState = 11; } else @@ -848,7 +848,7 @@ static void Task_EvolutionScene(u8 taskID) RemoveMonPPBonus(mon, var); SetMonMoveSlot(mon, gMoveToLearn, var); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState++; } } @@ -858,7 +858,7 @@ static void Task_EvolutionScene(u8 taskID) if (gUnknown_03004210.state == 0 && !IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -866,20 +866,20 @@ static void Task_EvolutionScene(u8 taskID) if (gUnknown_03004210.state == 0 && !IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tState = 19; } break; case 9: StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tData9 = 10; gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]); - sub_8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15); gTasks[taskID].tState = 14; break; case 11: @@ -900,7 +900,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { case 0: StringExpandPlaceholders(gStringVar4, BattleText_StartEvo); - sub_8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tState++; break; case 1: @@ -988,7 +988,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (IsCryFinished() && !gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo); - sub_8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); PlayFanfare(BGM_FANFA5); gTasks[taskID].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies)); @@ -1022,7 +1022,7 @@ static void Task_TradeEvolutionScene(u8 taskID) else { PlayBGM(BGM_SHINKA); - sub_8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tState++; } } @@ -1040,7 +1040,7 @@ static void Task_TradeEvolutionScene(u8 taskID) sub_8024CEC(); PlayFanfare(BGM_FANFA1); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[3]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskID].tState++; } @@ -1057,7 +1057,7 @@ static void Task_TradeEvolutionScene(u8 taskID) { sub_8024CEC(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[4]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -1065,7 +1065,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[5]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -1075,7 +1075,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (!IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[6]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tData9 = 5; gTasks[taskID].tdata10 = 9; gTasks[taskID].tLearnMoveState++; @@ -1083,10 +1083,10 @@ static void Task_TradeEvolutionScene(u8 taskID) case 3: if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { - DrawTextWindow(&gUnknown_03004828->window, 24, 8, 29, 13); + TextWindow_DrawStdFrame(&gUnknown_03004828->window, 24, 8, 29, 13); sEvoCursorPos = 0; - InitWindow(&gUnknown_03004828->window, gOtherText_YesNoAndPlayer, gUnknown_03004828->textWindowBaseTileNum + 128, 25, 9); - sub_8002F44(&gUnknown_03004828->window); + Text_InitWindow(&gUnknown_03004828->window, gOtherText_YesNoAndPlayer, gUnknown_03004828->textWindowBaseTileNum + 128, 25, 9); + Text_PrintWindow8002F44(&gUnknown_03004828->window); sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20); sub_81150D8(); gTasks[taskID].tLearnMoveState++; @@ -1113,7 +1113,7 @@ static void Task_TradeEvolutionScene(u8 taskID) ZeroFillWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); DestroyMenuCursor(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); PlaySE(SE_SELECT); if (sEvoCursorPos != 0) gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; @@ -1129,7 +1129,7 @@ static void Task_TradeEvolutionScene(u8 taskID) ZeroFillWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); DestroyMenuCursor(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); PlaySE(SE_SELECT); gTasks[taskID].tLearnMoveState = gTasks[taskID].tdata10; } @@ -1155,7 +1155,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (IsHMMove2(move)) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[307]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnMoveState = 11; } else @@ -1168,7 +1168,7 @@ static void Task_TradeEvolutionScene(u8 taskID) RemoveMonPPBonus(mon, var); SetMonMoveSlot(mon, gMoveToLearn, var); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[207]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnMoveState++; } } @@ -1178,7 +1178,7 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[7]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tLearnMoveState++; } break; @@ -1186,20 +1186,20 @@ static void Task_TradeEvolutionScene(u8 taskID) if (gUnknown_03004828->window.state == 0 && !IsSEPlaying()) { StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[208]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tState = 15; } break; case 9: StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[8]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tData9 = 10; gTasks[taskID].tdata10 = 0; gTasks[taskID].tLearnMoveState = 3; break; case 10: StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[9]); - sub_8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); + Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gTasks[taskID].tState = 13; break; case 11: diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 1751ee99c..ae2ff5f87 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -558,8 +558,8 @@ static void sub_814217C(u8 taskID) lastSavedTeam--; } *lastSavedTeam = *fameMons; - MenuDrawTextWindow(2, 14, 27, 19); - MenuPrint(gMenuText_HOFSaving, 3, 15); + Menu_DrawStdWindowFrame(2, 14, 27, 19); + Menu_PrintText(gMenuText_HOFSaving, 3, 15); gTasks[taskID].func = sub_8142274; } @@ -617,7 +617,7 @@ static void sub_8142320(u8 taskID) gSprites[spriteID].data[0] = 0; gSprites[spriteID].callback = sub_81435DC; gTasks[taskID].tMonSpriteID(currPokeID) = spriteID; - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskID].func = sub_8142404; } @@ -670,7 +670,7 @@ static void sub_8142570(u8 taskID) if (gTasks[taskID].tMonSpriteID(i) != 0xFF) gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 0; } - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); sub_8143068(0, 15); PlaySE(SE_DENDOU); gTasks[taskID].tFrameCount = 400; @@ -694,7 +694,7 @@ static void sub_8142618(u8 taskID) gSprites[gTasks[taskID].tMonSpriteID(i)].oam.priority = 1; } BeginNormalPaletteFade(sUnknown_0203931C, 0, 12, 12, 0x735F); - MenuZeroFillWindowRect(0, 14, 29, 19); + Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskID].tFrameCount = 7; gTasks[taskID].func = sub_81426F8; } @@ -732,10 +732,10 @@ static void sub_8142794(u8 taskID) gSprites[gTasks[taskID].tPlayerSpriteID].pos1.x++; else { - MenuDrawTextWindow(1, 2, 15, 9); + Menu_DrawStdWindowFrame(1, 2, 15, 9); HallOfFame_PrintPlayerInfo(1, 2); - MenuDrawTextWindow(2, 14, 27, 19); - MenuPrint(gMenuText_HOFCongratulations, 4, 15); + Menu_DrawStdWindowFrame(2, 14, 27, 19); + Menu_PrintText(gMenuText_HOFCongratulations, 4, 15); gTasks[taskID].func = sub_8142818; } } @@ -930,7 +930,7 @@ static void sub_8142B04(u8 taskID) stringPtr[1] = 0x13; stringPtr[2] = 0xF0; stringPtr[3] = EOS; - MenuPrint(gStringVar1, 0, 0); + Menu_PrintText(gStringVar1, 0, 0); gTasks[taskID].func = sub_8142CC8; } @@ -1042,14 +1042,14 @@ static void sub_8142FCC(u8 taskID) static void sub_8142FEC(u8 taskID) { - MenuDrawTextWindow(2, 14, 27, 19); + Menu_DrawStdWindowFrame(2, 14, 27, 19); MenuPrintMessage(gMenuText_HOFCorrupt, 3, 15); gTasks[taskID].func = sub_814302C; } static void sub_814302C(u8 taskID) { - if (MenuUpdateWindowText() && gMain.newKeys & A_BUTTON) + if (Menu_UpdateWindowText() && gMain.newKeys & A_BUTTON) gTasks[taskID].func = sub_8142F78; } @@ -1086,7 +1086,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 a1, u8 a2) } } - MenuPrint(gStringVar1, a1 + 4, a2 + 1); + Menu_PrintText(gStringVar1, a1 + 4, a2 + 1); stringPtr = gStringVar1; for (i = 0; i < 10 && currMon->nick[i] != EOS; stringPtr[i] = currMon->nick[i], i++) {} @@ -1099,8 +1099,8 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 a1, u8 a2) stringPtr[1] = 0x13; stringPtr[2] = 0xA0; stringPtr[3] = EOS; - MenuPrint(gStringVar1, a1 + 9, a2 + 1); - MenuZeroFillWindowRect(0, a2 + 3, 29, a2 + 4); + Menu_PrintText(gStringVar1, a1 + 9, a2 + 1); + Menu_EraseWindowRect(0, a2 + 3, 29, a2 + 4); } else { @@ -1139,7 +1139,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 a1, u8 a2) stringPtr[2] = 0xA0; stringPtr[3] = EOS; - MenuPrint(gStringVar1, a1 + 9, a2 + 1); + Menu_PrintText(gStringVar1, a1 + 9, a2 + 1); monData = currMon->lvl; @@ -1157,14 +1157,14 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 a1, u8 a2) stringPtr[2] = 0x30; stringPtr[3] = EOS; - MenuPrint(gStringVar1, a1 + 7, a2 + 3); + Menu_PrintText(gStringVar1, a1 + 7, a2 + 3); monData = currMon->tid; stringPtr = StringCopy(gStringVar1, gOtherText_IDNumber); ConvertIntToDecimalStringN(stringPtr, monData, 2, 5); - MenuPrint(gStringVar1, a1 + 13, a2 + 3); + Menu_PrintText(gStringVar1, a1 + 13, a2 + 3); } } @@ -1175,15 +1175,15 @@ static void HallOfFame_PrintPlayerInfo(u8 a0, u8 a1) u8* stringPtr; u16 visibleTid; - MenuPrint(gOtherText_Name, a0 + 1, a1 + 1); + Menu_PrintText(gOtherText_Name, a0 + 1, a1 + 1); MenuPrint_RightAligned(gSaveBlock2.playerName, a0 + 14, a1 + 1); - MenuPrint(gOtherText_IDNumber2, a0 + 1, a1 + 3); + Menu_PrintText(gOtherText_IDNumber2, a0 + 1, a1 + 3); visibleTid = ByteRead16(gSaveBlock2.playerTrainerId); ConvertIntToDecimalStringN(gStringVar1, visibleTid, 2, 5); MenuPrint_RightAligned(gStringVar1, a0 + 14, a1 + 3); - MenuPrint(gMainMenuString_Time, a0 + 1, a1 + 5); + Menu_PrintText(gMainMenuString_Time, a0 + 1, a1 + 5); stringPtr = ConvertIntToDecimalString(gStringVar1, gSaveBlock2.playTimeHours); stringPtr[0] = CHAR_SPACE; diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index f397e5ebb..b13006c13 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -292,7 +292,7 @@ void ShowContestEntryMonPic(void) u8 left = CONTEST_ENTRY_PIC_LEFT; u8 top = CONTEST_ENTRY_PIC_TOP; - MenuDrawTextWindow(left, top, 19, 13); + Menu_DrawStdWindowFrame(left, top, 19, 13); species = gContestMons[gSpecialVar_0x8006].species; var1 = gContestMons[gSpecialVar_0x8006].personality; var2 = gContestMons[gSpecialVar_0x8006].otId; @@ -349,7 +349,7 @@ void sub_80C5190(u8 taskId) task->data[0]++; break; case 3: - MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10); + Menu_EraseWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10); DestroyTask(taskId); break; case 1: -- cgit v1.2.3 From 8869cbc98e2f8e761e9ff89182933643992e2bd7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 00:16:15 -0600 Subject: s/gWindowConfig/gWindowTemplate/g --- asm/contest_link_80C2020.s | 12 ++-- asm/pokemon_storage_system.s | 24 +++---- asm/pokenav.s | 56 ++++++++-------- include/text.h | 114 ++++++++++++++++---------------- src/battle/battle_2.c | 16 ++--- src/battle/reshow_battle_screen.c | 4 +- src/contest.c | 8 +-- src/debug/matsuda_debug_menu.c | 12 ++-- src/debug/sound_check_menu.c | 8 +-- src/easy_chat_1.c | 10 +-- src/easy_chat_2.c | 30 ++++----- src/engine/clear_save_data_menu.c | 4 +- src/engine/link.c | 8 +-- src/engine/main_menu.c | 12 ++-- src/engine/mystery_event_menu.c | 4 +- src/engine/naming_screen.c | 22 +++---- src/engine/option_menu.c | 4 +- src/engine/reset_rtc_screen.c | 4 +- src/engine/save_failed_screen.c | 4 +- src/engine/text.c | 122 +++++++++++++++++------------------ src/engine/trade.c | 40 ++++++------ src/field/berry_tag_screen.c | 4 +- src/field/diploma.c | 4 +- src/field/field_effect.c | 8 +-- src/field/field_message_box.c | 2 +- src/field/field_region_map.c | 4 +- src/field/field_screen_effect.c | 2 +- src/field/item_menu.c | 4 +- src/field/mauville_man.c | 2 +- src/field/overworld.c | 16 ++--- src/field/party_menu.c | 12 ++-- src/field/pokeblock.c | 24 +++---- src/field/region_map.c | 4 +- src/field/script_menu.c | 2 +- src/field/shop.c | 4 +- src/field/slot_machine.c | 8 +-- src/field/start_menu.c | 6 +- src/field/starter_choose.c | 4 +- src/field/use_pokeblock.c | 14 ++-- src/field/wallclock.c | 4 +- src/pokemon/learn_move.c | 24 +++---- src/pokemon/mail.c | 4 +- src/pokemon/pokeblock_feed.c | 4 +- src/pokemon/pokedex.c | 28 ++++---- src/pokemon/pokemon_summary_screen.c | 4 +- src/pokenav_before.c | 24 +++---- src/roulette.c | 4 +- src/scene/berry_blender.c | 18 +++--- src/scene/contest_painting.c | 4 +- src/scene/credits.c | 4 +- src/scene/egg_hatch.c | 4 +- src/scene/evolution_scene.c | 12 ++-- src/scene/hall_of_fame.c | 16 ++--- 53 files changed, 398 insertions(+), 398 deletions(-) diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 096ce91e7..5e1265f6b 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -12,7 +12,7 @@ sub_80C2020: @ 80C2020 lsls r5, 19 movs r0, 0x40 strh r0, [r5] - ldr r4, _080C20F0 @ =gWindowConfig_81E6FA0 + ldr r4, _080C20F0 @ =gWindowTemplate_81E6FA0 adds r0, r4, 0 bl SetUpWindowConfig ldr r0, _080C20F4 @ =gMenuWindow @@ -110,7 +110,7 @@ sub_80C2020: @ 80C2020 pop {r0} bx r0 .align 2, 0 -_080C20F0: .4byte gWindowConfig_81E6FA0 +_080C20F0: .4byte gWindowTemplate_81E6FA0 _080C20F4: .4byte gMenuWindow _080C20F8: .4byte REG_BG0CNT _080C20FC: .4byte 0x00001803 @@ -188,7 +188,7 @@ _080C2162: lsls r2, 2 movs r1, 0 bl LoadCompressedPalette - ldr r0, _080C2234 @ =gWindowConfig_81E6FA0 + ldr r0, _080C2234 @ =gWindowTemplate_81E6FA0 bl LoadFontDefaultPalette movs r6, 0 _080C21C0: @@ -242,7 +242,7 @@ _080C2224: .4byte 0x0600e000 _080C2228: .4byte gUnknown_08D1A250 _080C222C: .4byte 0x0600f000 _080C2230: .4byte gUnknown_08D1A618 -_080C2234: .4byte gWindowConfig_81E6FA0 +_080C2234: .4byte gWindowTemplate_81E6FA0 _080C2238: .4byte 0x000060b2 _080C223C: .4byte 0x000060a4 _080C2240: @@ -2170,7 +2170,7 @@ sub_80C3158: @ 80C3158 lsls r0, 22 lsrs r0, 22 strh r0, [r4, 0x6] - ldr r1, _080C32C4 @ =gWindowConfig_81E7278 + ldr r1, _080C32C4 @ =gWindowTemplate_81E7278 mov r8, r1 ldr r7, _080C32C8 @ =0x06010000 ldr r2, _080C32CC @ =0x040000d4 @@ -2296,7 +2296,7 @@ _080C32B2: b _080C3322 .align 2, 0 _080C32C0: .4byte gSprites -_080C32C4: .4byte gWindowConfig_81E7278 +_080C32C4: .4byte gWindowTemplate_81E7278 _080C32C8: .4byte 0x06010000 _080C32CC: .4byte 0x040000d4 _080C32D0: .4byte 0x85000100 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 2954c0b09..fd49e1520 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1640,7 +1640,7 @@ sub_80966F4: @ 80966F4 ldr r0, _08096778 @ =0x81000200 str r0, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, _0809677C @ =gWindowConfig_81E6D38 + ldr r0, _0809677C @ =gWindowTemplate_81E6D38 adds r1, r5, 0 mov r2, r8 bl sub_8004E3C @@ -1662,7 +1662,7 @@ _0809676C: .4byte gUnknown_083B6DB8 _08096770: .4byte 0x00001111 _08096774: .4byte 0x040000d4 _08096778: .4byte 0x81000200 -_0809677C: .4byte gWindowConfig_81E6D38 +_0809677C: .4byte gWindowTemplate_81E6D38 _08096780: .4byte 0x80000200 thumb_func_end sub_80966F4 @@ -1846,18 +1846,18 @@ _080968D4: bl sub_8096804 b _0809697A _080968E8: - ldr r0, _080968F0 @ =gWindowConfig_81E6D00 + ldr r0, _080968F0 @ =gWindowTemplate_81E6D00 bl SetUpWindowConfig b _0809697A .align 2, 0 -_080968F0: .4byte gWindowConfig_81E6D00 +_080968F0: .4byte gWindowTemplate_81E6D00 _080968F4: - ldr r0, _08096900 @ =gWindowConfig_81E6D00 + ldr r0, _08096900 @ =gWindowTemplate_81E6D00 bl InitMenuWindow bl Menu_EraseScreen b _0809697A .align 2, 0 -_08096900: .4byte gWindowConfig_81E6D00 +_08096900: .4byte gWindowTemplate_81E6D00 _08096904: bl sub_80967DC bl sub_8096848 @@ -1985,18 +1985,18 @@ _08096A28: .4byte gSharedMem _08096A2C: .4byte gUnknown_0203847D _08096A30: .4byte gUnknown_0203847F _08096A34: - ldr r0, _08096A3C @ =gWindowConfig_81E6D00 + ldr r0, _08096A3C @ =gWindowTemplate_81E6D00 bl SetUpWindowConfig b _08096AD8 .align 2, 0 -_08096A3C: .4byte gWindowConfig_81E6D00 +_08096A3C: .4byte gWindowTemplate_81E6D00 _08096A40: - ldr r0, _08096A4C @ =gWindowConfig_81E6D00 + ldr r0, _08096A4C @ =gWindowTemplate_81E6D00 bl InitMenuWindow bl Menu_EraseScreen b _08096AD8 .align 2, 0 -_08096A4C: .4byte gWindowConfig_81E6D00 +_08096A4C: .4byte gWindowTemplate_81E6D00 _08096A50: bl sub_80967DC b _08096AD8 @@ -8745,7 +8745,7 @@ sub_809A1BC: @ 809A1BC ldr r0, _0809A230 @ =0x81000100 str r0, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, _0809A234 @ =gWindowConfig_81E6D38 + ldr r0, _0809A234 @ =gWindowTemplate_81E6D38 adds r1, r5, 0 str r3, [sp, 0x4] bl sub_8004E3C @@ -8785,7 +8785,7 @@ sub_809A1BC: @ 809A1BC _0809A228: .4byte gUnknown_083B6DB8 _0809A22C: .4byte 0x040000d4 _0809A230: .4byte 0x81000100 -_0809A234: .4byte gWindowConfig_81E6D38 +_0809A234: .4byte gWindowTemplate_81E6D38 _0809A238: .4byte 0x80000040 thumb_func_end sub_809A1BC diff --git a/asm/pokenav.s b/asm/pokenav.s index 7db96ed0f..34d8aba2e 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -229,7 +229,7 @@ _080F07E0: lsrs r1, 16 bl sub_80F445C _080F07F4: - ldr r0, _080F0814 @ =gWindowConfig_81E710C + ldr r0, _080F0814 @ =gWindowTemplate_81E710C bl BasicInitMenuWindow ldr r0, _080F0818 @ =gUnknown_083DFEC4 ldr r0, [r0] @@ -243,7 +243,7 @@ _080F080A: bx r0 .align 2, 0 _080F0810: .4byte 0x00008788 -_080F0814: .4byte gWindowConfig_81E710C +_080F0814: .4byte gWindowTemplate_81E710C _080F0818: .4byte gUnknown_083DFEC4 thumb_func_end ShowMapNamePopUpWindow @@ -252,7 +252,7 @@ sub_80F081C: @ 80F081C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080F0838 @ =gWindowConfig_81E710C + ldr r0, _080F0838 @ =gWindowTemplate_81E710C bl BasicInitMenuWindow cmp r5, 0x4 bhi _080F08C6 @@ -262,7 +262,7 @@ sub_80F081C: @ 80F081C ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F0838: .4byte gWindowConfig_81E710C +_080F0838: .4byte gWindowTemplate_81E710C _080F083C: .4byte _080F0840 .align 2, 0 _080F0840: @@ -342,7 +342,7 @@ _080F08E0: .4byte 0x0001869f thumb_func_start sub_80F08E4 sub_80F08E4: @ 80F08E4 push {lr} - ldr r0, _080F08FC @ =gWindowConfig_81E710C + ldr r0, _080F08FC @ =gWindowTemplate_81E710C bl BasicInitMenuWindow movs r0, 0 movs r1, 0x9 @@ -352,7 +352,7 @@ sub_80F08E4: @ 80F08E4 pop {r0} bx r0 .align 2, 0 -_080F08FC: .4byte gWindowConfig_81E710C +_080F08FC: .4byte gWindowTemplate_81E710C thumb_func_end sub_80F08E4 thumb_func_start sub_80F0900 @@ -527,7 +527,7 @@ _080F0A40: adds r0, r4, 0 adds r1, r3, 0 bl sub_80F4428 - ldr r0, _080F0A70 @ =gWindowConfig_81E70D4 + ldr r0, _080F0A70 @ =gWindowTemplate_81E70D4 bl BasicInitMenuWindow lsls r2, r5, 24 lsrs r2, 24 @@ -541,7 +541,7 @@ _080F0A40: _080F0A64: .4byte gUnknown_083DFEC4 _080F0A68: .4byte 0x000087c8 _080F0A6C: .4byte 0x00008788 -_080F0A70: .4byte gWindowConfig_81E70D4 +_080F0A70: .4byte gWindowTemplate_81E70D4 thumb_func_end sub_80F0A24 thumb_func_start sub_80F0A74 @@ -561,7 +561,7 @@ sub_80F0A74: @ 80F0A74 bl sub_80F700C movs r0, 0x1F ands r7, r0 - ldr r0, _080F0AE4 @ =gWindowConfig_81E70D4 + ldr r0, _080F0AE4 @ =gWindowTemplate_81E70D4 bl BasicInitMenuWindow lsls r2, r7, 3 adds r0, r4, 0 @@ -597,7 +597,7 @@ sub_80F0A74: @ 80F0A74 .align 2, 0 _080F0ADC: .4byte gUnknown_083DFEC4 _080F0AE0: .4byte 0x00008788 -_080F0AE4: .4byte gWindowConfig_81E70D4 +_080F0AE4: .4byte gWindowTemplate_81E70D4 _080F0AE8: .4byte 0x0000d158 _080F0AEC: .4byte 0x0000ceed _080F0AF0: .4byte 0x0600f000 @@ -688,7 +688,7 @@ _080F0B60: ldrsh r0, [r0, r1] cmp r2, r0 beq _080F0BAA - ldr r0, _080F0BC8 @ =gWindowConfig_81E70D4 + ldr r0, _080F0BC8 @ =gWindowTemplate_81E70D4 bl BasicInitMenuWindow adds r1, r4, 0 adds r3, r1, 0x1 @@ -709,9 +709,9 @@ _080F0BB4: _080F0BBC: .4byte 0x00000306 _080F0BC0: .4byte 0x00008778 _080F0BC4: .4byte 0x0000876c -_080F0BC8: .4byte gWindowConfig_81E70D4 +_080F0BC8: .4byte gWindowTemplate_81E70D4 _080F0BCC: - ldr r0, _080F0C10 @ =gWindowConfig_81E70D4 + ldr r0, _080F0C10 @ =gWindowTemplate_81E70D4 bl BasicInitMenuWindow ldr r1, _080F0C14 @ =0x00008778 adds r0, r5, r1 @@ -745,7 +745,7 @@ _080F0BE2: movs r0, 0 b _080F0C22 .align 2, 0 -_080F0C10: .4byte gWindowConfig_81E70D4 +_080F0C10: .4byte gWindowTemplate_81E70D4 _080F0C14: .4byte 0x00008778 _080F0C18: .4byte gUnknown_083DFEC4 _080F0C1C: .4byte 0x0000d15c @@ -804,7 +804,7 @@ _080F0C64: bls _080F0CD0 movs r0, 0 strh r0, [r1] - ldr r0, _080F0CC4 @ =gWindowConfig_81E70D4 + ldr r0, _080F0CC4 @ =gWindowTemplate_81E70D4 bl BasicInitMenuWindow ldr r0, _080F0CC8 @ =0x00008770 adds r1, r4, r0 @@ -835,7 +835,7 @@ _080F0C64: .align 2, 0 _080F0CBC: .4byte 0x00000306 _080F0CC0: .4byte 0x0000ffff -_080F0CC4: .4byte gWindowConfig_81E70D4 +_080F0CC4: .4byte gWindowTemplate_81E70D4 _080F0CC8: .4byte 0x00008770 _080F0CCC: .4byte 0x00008778 _080F0CD0: @@ -942,7 +942,7 @@ _080F0D78: _080F0D8C: movs r0, 0 strh r0, [r1] - ldr r0, _080F0DBC @ =gWindowConfig_81E70D4 + ldr r0, _080F0DBC @ =gWindowTemplate_81E70D4 bl BasicInitMenuWindow ldr r0, _080F0DC0 @ =0x00008778 adds r1, r4, r0 @@ -962,7 +962,7 @@ _080F0D8C: mov pc, r0 .align 2, 0 _080F0DB8: .4byte 0x00000306 -_080F0DBC: .4byte gWindowConfig_81E70D4 +_080F0DBC: .4byte gWindowTemplate_81E70D4 _080F0DC0: .4byte 0x00008778 _080F0DC4: .4byte _080F0DC8 .align 2, 0 @@ -1141,7 +1141,7 @@ _080F0F10: adds r4, r0 movs r0, 0x1F ands r4, r0 - ldr r0, _080F0F60 @ =gWindowConfig_81E70D4 + ldr r0, _080F0F60 @ =gWindowTemplate_81E70D4 bl BasicInitMenuWindow adds r3, r4, 0x1 movs r0, 0xC @@ -1160,7 +1160,7 @@ _080F0F52: .align 2, 0 _080F0F58: .4byte 0x00000306 _080F0F5C: .4byte 0x00008778 -_080F0F60: .4byte gWindowConfig_81E70D4 +_080F0F60: .4byte gWindowTemplate_81E70D4 thumb_func_end sub_80F0EF4 thumb_func_start sub_80F0F64 @@ -1260,7 +1260,7 @@ sub_80F0FFC: @ 80F0FFC adds r0, r5, 0 movs r2, 0 bl GetMapSectionName - ldr r0, _080F1054 @ =gWindowConfig_81E710C + ldr r0, _080F1054 @ =gWindowTemplate_81E710C bl BasicInitMenuWindow adds r0, r5, 0 bl sub_80F19DC @@ -1282,7 +1282,7 @@ sub_80F0FFC: @ 80F0FFC _080F1048: .4byte gUnknown_083DFEC4 _080F104C: .4byte 0x00008788 _080F1050: .4byte 0x0000ceea -_080F1054: .4byte gWindowConfig_81E710C +_080F1054: .4byte gWindowTemplate_81E710C _080F1058: .4byte 0x0000d138 thumb_func_end sub_80F0FFC @@ -1357,17 +1357,17 @@ _080F10E8: _080F10FC: .4byte gUnknown_083DFEC4 _080F1100: .4byte 0x0000d162 _080F1104: - ldr r0, _080F110C @ =gWindowConfig_81E70B8 + ldr r0, _080F110C @ =gWindowTemplate_81E70B8 bl SetUpWindowConfig b _080F1218 .align 2, 0 -_080F110C: .4byte gWindowConfig_81E70B8 +_080F110C: .4byte gWindowTemplate_81E70B8 _080F1110: - ldr r0, _080F1118 @ =gWindowConfig_81E70B8 + ldr r0, _080F1118 @ =gWindowTemplate_81E70B8 bl MultistepInitMenuWindowBegin b _080F1218 .align 2, 0 -_080F1118: .4byte gWindowConfig_81E70B8 +_080F1118: .4byte gWindowTemplate_81E70B8 _080F111C: bl MultistepInitMenuWindowContinue cmp r0, 0 @@ -7663,7 +7663,7 @@ sub_80F4194: @ 80F4194 str r1, [r4, 0x4] str r3, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, _080F42B4 @ =gWindowConfig_81E70F0 + ldr r0, _080F42B4 @ =gWindowTemplate_81E70F0 adds r1, r6, 0 bl sub_8004E3C movs r3, 0x88 @@ -7779,7 +7779,7 @@ _080F42A4: .4byte gUnknown_083DFEC8 _080F42A8: .4byte 0x00001111 _080F42AC: .4byte 0x040000d4 _080F42B0: .4byte 0x81000140 -_080F42B4: .4byte gWindowConfig_81E70F0 +_080F42B4: .4byte gWindowTemplate_81E70F0 _080F42B8: .4byte 0x81000030 _080F42BC: .4byte 0x0fffffff _080F42C0: .4byte 0x80000040 diff --git a/include/text.h b/include/text.h index edda0c2ca..c34f222d5 100644 --- a/include/text.h +++ b/include/text.h @@ -137,65 +137,65 @@ extern const u16 gUnknown_081E29D8[]; extern const u16 gUnknown_081E29E0[]; extern const u16 gUnknown_081E29E8[]; -extern const struct WindowTemplate gWindowConfig_81E6C3C; -extern const struct WindowTemplate gWindowConfig_81E6C58; -extern const struct WindowTemplate gWindowConfig_81E6C74; -extern const struct WindowTemplate gWindowConfig_81E6C90; -extern const struct WindowTemplate gWindowConfig_81E6CAC; -extern const struct WindowTemplate gWindowConfig_81E6CC8; -extern const struct WindowTemplate gWindowConfig_81E6CE4; -extern const struct WindowTemplate gWindowConfig_81E6D00; -extern const struct WindowTemplate gWindowConfig_81E6D1C; -extern const struct WindowTemplate gWindowConfig_81E6D38; -extern const struct WindowTemplate gWindowConfig_81E6D54; -extern const struct WindowTemplate gWindowConfig_81E6D70; -extern const struct WindowTemplate gWindowConfig_81E6D8C; -extern const struct WindowTemplate gWindowConfig_81E6DA8; +extern const struct WindowTemplate gWindowTemplate_81E6C3C; +extern const struct WindowTemplate gWindowTemplate_81E6C58; +extern const struct WindowTemplate gWindowTemplate_81E6C74; +extern const struct WindowTemplate gWindowTemplate_81E6C90; +extern const struct WindowTemplate gWindowTemplate_81E6CAC; +extern const struct WindowTemplate gWindowTemplate_81E6CC8; +extern const struct WindowTemplate gWindowTemplate_81E6CE4; +extern const struct WindowTemplate gWindowTemplate_81E6D00; +extern const struct WindowTemplate gWindowTemplate_81E6D1C; +extern const struct WindowTemplate gWindowTemplate_81E6D38; +extern const struct WindowTemplate gWindowTemplate_81E6D54; +extern const struct WindowTemplate gWindowTemplate_81E6D70; +extern const struct WindowTemplate gWindowTemplate_81E6D8C; +extern const struct WindowTemplate gWindowTemplate_81E6DA8; extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Values; extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels; -extern const struct WindowTemplate gWindowConfig_81E6DFC; -extern const struct WindowTemplate gWindowConfig_81E6E18; -extern const struct WindowTemplate gWindowConfig_81E6E34; -extern const struct WindowTemplate gWindowConfig_81E6E50; -extern const struct WindowTemplate gWindowConfig_81E6E6C; -extern const struct WindowTemplate gWindowConfig_81E6E88; -extern const struct WindowTemplate gWindowConfig_81E6EA4; -extern const struct WindowTemplate gWindowConfig_81E6EC0; -extern const struct WindowTemplate gWindowConfig_81E6EDC; -extern const struct WindowTemplate gWindowConfig_81E6EF8; -extern const struct WindowTemplate gWindowConfig_81E6F14; -extern const struct WindowTemplate gWindowConfig_81E6F30; -extern const struct WindowTemplate gWindowConfig_81E6F4C; -extern const struct WindowTemplate gWindowConfig_81E6F68; -extern const struct WindowTemplate gWindowConfig_81E6F84; -extern const struct WindowTemplate gWindowConfig_81E6FA0; -extern const struct WindowTemplate gWindowConfig_81E6FBC; -extern const struct WindowTemplate gWindowConfig_81E6FD8; -extern const struct WindowTemplate gWindowConfig_81E6FF4; -extern const struct WindowTemplate gWindowConfig_81E7010; -extern const struct WindowTemplate gWindowConfig_81E702C; -extern const struct WindowTemplate gWindowConfig_81E7048; -extern const struct WindowTemplate gWindowConfig_81E7064; -extern const struct WindowTemplate gWindowConfig_81E7080; -extern const struct WindowTemplate gWindowConfig_81E709C; -extern const struct WindowTemplate gWindowConfig_81E70B8; -extern const struct WindowTemplate gWindowConfig_81E70D4; -extern const struct WindowTemplate gWindowConfig_81E70F0; -extern const struct WindowTemplate gWindowConfig_81E710C; -extern const struct WindowTemplate gWindowConfig_81E7128; -extern const struct WindowTemplate gWindowConfig_81E7144; -extern const struct WindowTemplate gWindowConfig_81E7160; -extern const struct WindowTemplate gWindowConfig_81E717C; -extern const struct WindowTemplate gWindowConfig_81E7198; -extern const struct WindowTemplate gWindowConfig_81E71B4; -extern const struct WindowTemplate gWindowConfig_81E71D0; -extern const struct WindowTemplate gWindowConfig_81E71EC; -extern const struct WindowTemplate gWindowConfig_81E7208; -extern const struct WindowTemplate gWindowConfig_81E7224; -extern const struct WindowTemplate gWindowConfig_81E7240; -extern const struct WindowTemplate gWindowConfig_81E725C; -extern const struct WindowTemplate gWindowConfig_81E7278; -extern const struct WindowTemplate gWindowConfig_81E7294; +extern const struct WindowTemplate gWindowTemplate_81E6DFC; +extern const struct WindowTemplate gWindowTemplate_81E6E18; +extern const struct WindowTemplate gWindowTemplate_81E6E34; +extern const struct WindowTemplate gWindowTemplate_81E6E50; +extern const struct WindowTemplate gWindowTemplate_81E6E6C; +extern const struct WindowTemplate gWindowTemplate_81E6E88; +extern const struct WindowTemplate gWindowTemplate_81E6EA4; +extern const struct WindowTemplate gWindowTemplate_81E6EC0; +extern const struct WindowTemplate gWindowTemplate_81E6EDC; +extern const struct WindowTemplate gWindowTemplate_81E6EF8; +extern const struct WindowTemplate gWindowTemplate_81E6F14; +extern const struct WindowTemplate gWindowTemplate_81E6F30; +extern const struct WindowTemplate gWindowTemplate_81E6F4C; +extern const struct WindowTemplate gWindowTemplate_81E6F68; +extern const struct WindowTemplate gWindowTemplate_81E6F84; +extern const struct WindowTemplate gWindowTemplate_81E6FA0; +extern const struct WindowTemplate gWindowTemplate_81E6FBC; +extern const struct WindowTemplate gWindowTemplate_81E6FD8; +extern const struct WindowTemplate gWindowTemplate_81E6FF4; +extern const struct WindowTemplate gWindowTemplate_81E7010; +extern const struct WindowTemplate gWindowTemplate_81E702C; +extern const struct WindowTemplate gWindowTemplate_81E7048; +extern const struct WindowTemplate gWindowTemplate_81E7064; +extern const struct WindowTemplate gWindowTemplate_81E7080; +extern const struct WindowTemplate gWindowTemplate_81E709C; +extern const struct WindowTemplate gWindowTemplate_81E70B8; +extern const struct WindowTemplate gWindowTemplate_81E70D4; +extern const struct WindowTemplate gWindowTemplate_81E70F0; +extern const struct WindowTemplate gWindowTemplate_81E710C; +extern const struct WindowTemplate gWindowTemplate_81E7128; +extern const struct WindowTemplate gWindowTemplate_81E7144; +extern const struct WindowTemplate gWindowTemplate_81E7160; +extern const struct WindowTemplate gWindowTemplate_81E717C; +extern const struct WindowTemplate gWindowTemplate_81E7198; +extern const struct WindowTemplate gWindowTemplate_81E71B4; +extern const struct WindowTemplate gWindowTemplate_81E71D0; +extern const struct WindowTemplate gWindowTemplate_81E71EC; +extern const struct WindowTemplate gWindowTemplate_81E7208; +extern const struct WindowTemplate gWindowTemplate_81E7224; +extern const struct WindowTemplate gWindowTemplate_81E7240; +extern const struct WindowTemplate gWindowTemplate_81E725C; +extern const struct WindowTemplate gWindowTemplate_81E7278; +extern const struct WindowTemplate gWindowTemplate_81E7294; extern u16 gBGTilemapBuffers[4][0x400]; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index dccf73fa8..42cc0b538 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -234,7 +234,7 @@ void InitBattle(void) } //sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8); sub_80895F8(gUnknown_081F9674); - SetUpWindowConfig(&gWindowConfig_81E6C58); + SetUpWindowConfig(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -245,9 +245,9 @@ void InitBattle(void) gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; gBattleTerrain = BattleSetup_GetTerrain(); - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); - Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0); - Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0); + Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC); sub_800D6D4(); sub_800DAB8(); ResetSpriteData(); @@ -1210,7 +1210,7 @@ void c2_8011A1C(void) gUnknown_03004DE0[0][i] = 0xFF10; gUnknown_03004DE0[1][i] = 0xFF10; } - SetUpWindowConfig(&gWindowConfig_81E6C58); + SetUpWindowConfig(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -1221,9 +1221,9 @@ void c2_8011A1C(void) gUnknown_030041B0 = 0; gUnknown_030041B8 = 0; - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); - Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowConfig_81E71D0); - Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowConfig_81E71EC); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0); + Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC); sub_800D6D4(); LoadCompressedPalette(gUnknown_08D004E0, 0, 64); sub_800D74C(); diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index fded87090..bf77e5c07 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -78,9 +78,9 @@ static void CB2_ReshowBattleScreenAfterMenu(void) { case 0: dp12_8087EA4(); - SetUpWindowConfig(&gWindowConfig_81E6C58); + SetUpWindowConfig(&gWindowTemplate_81E6C58); ResetPaletteFade(); - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; gBattle_BG1_X = 0; diff --git a/src/contest.c b/src/contest.c index c935f0ecb..3677a1d25 100644 --- a/src/contest.c +++ b/src/contest.c @@ -357,16 +357,16 @@ void LoadContestBgAfterMoveAnim(void) void SetUpContestWindow(void) { - SetUpWindowConfig(&gWindowConfig_81E6FD8); - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8); - Text_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6FF4); + SetUpWindowConfig(&gWindowTemplate_81E6FD8); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8); + Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6FF4); } void sub_80AB350(void) { u8 i; - LoadFontDefaultPalette(&gWindowConfig_81E6FD8); + LoadFontDefaultPalette(&gWindowTemplate_81E6FD8); FillPalette(0, 0, 2); for (i = 10; i < 14; i++) LoadPalette(gPlttBufferUnfaded + 241, 240 + i, 2); diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 2c20ba72b..52b83d4b1 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -449,8 +449,8 @@ static void sub_80A9F50(void) { REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP; REG_DISPCNT |= DISPCNT_OBJ_ON | DISPCNT_BG0_ON; - SetUpWindowConfig(&gWindowConfig_81E6C3C); - Text_InitWindowWithTemplate(&gMenuWindow, &gWindowConfig_81E6C3C); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6C3C); REG_MOSAIC = 0; REG_BLDCNT = 0; REG_BLDALPHA = 0; @@ -490,7 +490,7 @@ static void sub_80A9FE4(void) } } sub_80034D4((void *)VRAM, ptr); - LoadFontDefaultPalette(&gWindowConfig_81E6C3C); + LoadFontDefaultPalette(&gWindowTemplate_81E6C3C); } static void sub_80AA064(void) @@ -1075,9 +1075,9 @@ void unref_sub_80AB084(u8 *text) break; } } - SetUpWindowConfig(&gWindowConfig_81E6FD8); - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6FD8); - LoadFontDefaultPalette(&gWindowConfig_81E6FD8); + SetUpWindowConfig(&gWindowTemplate_81E6FD8); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8); + LoadFontDefaultPalette(&gWindowTemplate_81E6FD8); Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7); } diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 4f4a7bd06..411ff6f54 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -132,8 +132,8 @@ void CB2_StartSoundCheckMenu(void) ResetPaletteFade(); ResetTasks(); ResetSpriteData(); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); REG_WIN0H = WIN_RANGE(0, 0); REG_WIN0V = WIN_RANGE(0, 0); @@ -1217,8 +1217,8 @@ void Task_InitCryTest(u8 taskId) struct CryRelatedStruct cryStruct, cryStruct2; u8 zero; - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); gSoundTestCryNum = 1; ResetSpriteData(); FreeAllSpritePalettes(); diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 908e4b9d6..8d68adfe9 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -16,8 +16,8 @@ #include "strings.h" #include "unknown_task.h" -extern const struct WindowTemplate gWindowConfig_81E6D54; -extern const struct WindowTemplate gWindowConfig_81E6DA8; +extern const struct WindowTemplate gWindowTemplate_81E6D54; +extern const struct WindowTemplate gWindowTemplate_81E6DA8; extern void sub_80546B8(void); @@ -305,11 +305,11 @@ void sub_80E62F8(void) FreeAllSpritePalettes(); break; case 1: - SetUpWindowConfig(&gWindowConfig_81E6DA8); + SetUpWindowConfig(&gWindowTemplate_81E6DA8); break; case 2: - InitMenuWindow(&gWindowConfig_81E6D54); - InitMenuWindow(&gWindowConfig_81E6DA8); + InitMenuWindow(&gWindowTemplate_81E6D54); + InitMenuWindow(&gWindowTemplate_81E6DA8); Menu_EraseScreen(); break; case 3: diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 5acdba04e..66af7fc04 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1064,7 +1064,7 @@ void sub_80E91B0(const u8 *a, u8 b, u8 c, u8 d) void sub_80E91D4(u8 a) { - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); if (a == 10) { @@ -1168,7 +1168,7 @@ void sub_80E9368(u8 a) break; } - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); gEasyChatStruct->unk9F8E[0] = EXT_CTRL_CODE_BEGIN; gEasyChatStruct->unk9F8E[1] = 5; gEasyChatStruct->unk9F8E[2] = 1; @@ -1189,7 +1189,7 @@ void sub_80E9368(u8 a) Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0); Menu_PrintText(gEasyChatStruct->unk9F8E, 28, 0); } - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E948C(void) @@ -1219,7 +1219,7 @@ void sub_80E948C(void) void sub_80E95A4(void) { - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); switch (gEasyChatStruct->unk9) { case 4: @@ -1241,7 +1241,7 @@ void sub_80E95A4(void) sub_80E9620(3, 6); break; } - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E9620(u16 a, u16 b) @@ -1281,7 +1281,7 @@ void sub_80E9620(u16 a, u16 b) void sub_80E9744(void) { - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); switch (gEasyChatStruct->unk9) { case 4: @@ -1303,7 +1303,7 @@ void sub_80E9744(void) sub_80E97C0(3, 6); break; } - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E97C0(u16 a, u16 b) @@ -1348,7 +1348,7 @@ void sub_80E98C4(void) u8 r1; u8 r3; - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); switch (gEasyChatStruct->unk9) { case 4: @@ -1379,7 +1379,7 @@ void sub_80E98C4(void) return; } Menu_BlankWindowRect(2, r1, 27, r3 * 2 + r1 - 1); - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E9940(u8 *a, u8 b) @@ -1420,7 +1420,7 @@ const u8 *const gUnknown_083DBEAC[] = void sub_80E9974(void) { - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); if (gEasyChatStruct->unk26 == 0) { u16 i; @@ -1479,7 +1479,7 @@ void sub_80E9AD4(void) { u16 i; - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); for (i = 0; i < 16; i++) sub_80E9C74(i); } @@ -1502,16 +1502,16 @@ void sub_80E9AF8(u16 a) for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++) { if (sub_80EB2D4(gEasyChatStruct->unk9A2A[a][i]) == 7) - BasicInitMenuWindow(&gWindowConfig_81E6D70); + BasicInitMenuWindow(&gWindowTemplate_81E6D70); else - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9); sub_80E9A60(gEasyChatStruct->unk9E14, i * 11 + 4, a * 2); } } else { - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++) { sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9); @@ -1562,7 +1562,7 @@ void sub_80E9D7C(void) u16 r4; u16 i; - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); if (gEasyChatStruct->unk1C0 < 0) { r6 = -gEasyChatStruct->unk1C0; diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c index ae6c85180..6a597690a 100644 --- a/src/engine/clear_save_data_menu.c +++ b/src/engine/clear_save_data_menu.c @@ -133,8 +133,8 @@ static u8 InitClearSaveDataScreen(void) ResetTasks(); ResetSpriteData(); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff); ime = REG_IME; diff --git a/src/engine/link.c b/src/engine/link.c index a2df02b5f..d52d0bb7a 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -238,8 +238,8 @@ void LinkTestScreen(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; OpenLink(); @@ -1236,8 +1236,8 @@ void CB2_LinkError(void) FillPalette(0, 0, 2); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowConfig_81E7198); - InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E7198); + SetUpWindowConfig(&gWindowTemplate_81E7198); + InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E7198); Menu_EraseScreen(); REG_BLDALPHA = 0; REG_BG0VOFS = 0; diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 623969802..723886664 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -233,8 +233,8 @@ u32 InitMainMenu(u8 a1) ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); if (a1) BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black @@ -750,8 +750,8 @@ void PrintBadgeCount(void) static void Task_NewGameSpeech1(u8 taskId) { - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); REG_WIN0H = 0; REG_WIN0V = 0; REG_WININ = 0; @@ -1373,8 +1373,8 @@ void CB_ContinueNewGameSpeechPart2() FreeAllSpritePalettes(); AddBirchSpeechObjects(taskId); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow((struct WindowTemplate *)&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); if (gSaveBlock2.playerGender != MALE) { diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index abb912938..278760233 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -45,8 +45,8 @@ void CB2_InitMysteryEventMenu(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_EraseScreen(); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON; REG_BLDCNT = 0; diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index 5685584f5..880187dc0 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -325,8 +325,8 @@ static void NamingScreen_Init(void) static void NamingScreen_SetUpWindow(void) { - SetUpWindowConfig(&gWindowConfig_81E6E88); - InitMenuWindow(&gWindowConfig_81E6E88); + SetUpWindowConfig(&gWindowTemplate_81E6E88); + InitMenuWindow(&gWindowTemplate_81E6E88); } static void NamingScreen_ResetObjects(void) @@ -1610,7 +1610,7 @@ static void DisplaySentToPCMessage(void) { StringCopy(gStringVar1, namingScreenDataPtr->destBuffer); StringExpandPlaceholders(gStringVar4, gOtherText_SentToPC); - BasicInitMenuWindow(&gWindowConfig_81E6E88); + BasicInitMenuWindow(&gWindowTemplate_81E6E88); Menu_DisplayDialogueFrame(); MenuPrintMessageDefaultCoords(gStringVar4); } @@ -1760,16 +1760,16 @@ static void (*const gUnknown_083CE310[][2])(void) = static const struct WindowTemplate *const gUnknown_083CE328[][2][2] = { { - {&gWindowConfig_81E6EDC, &gWindowConfig_81E6EF8}, - {&gWindowConfig_81E6EA4, &gWindowConfig_81E6EC0}, + {&gWindowTemplate_81E6EDC, &gWindowTemplate_81E6EF8}, + {&gWindowTemplate_81E6EA4, &gWindowTemplate_81E6EC0}, }, { - {&gWindowConfig_81E6EA4, &gWindowConfig_81E6EC0}, - {&gWindowConfig_81E6F14, &gWindowConfig_81E6F30}, + {&gWindowTemplate_81E6EA4, &gWindowTemplate_81E6EC0}, + {&gWindowTemplate_81E6F14, &gWindowTemplate_81E6F30}, }, { - {&gWindowConfig_81E6F14, &gWindowConfig_81E6F30}, - {&gWindowConfig_81E6EDC, &gWindowConfig_81E6EF8}, + {&gWindowTemplate_81E6F14, &gWindowTemplate_81E6F30}, + {&gWindowTemplate_81E6EDC, &gWindowTemplate_81E6EF8}, }, }; @@ -1843,7 +1843,7 @@ static void PrintKeyboardCharacters(u8 page) //print letters on page static void sub_80B78A8(void) { - BasicInitMenuWindow(&gWindowConfig_81E6F4C); + BasicInitMenuWindow(&gWindowTemplate_81E6F4C); gUnknown_083CE358[namingScreenDataPtr->templateNum](); gUnknown_083CE368[namingScreenDataPtr->template->unk3](); Menu_PrintText(namingScreenDataPtr->template->title, 9, 2); @@ -1886,7 +1886,7 @@ static void sub_80B7960(void) string[5] = 1; string += 6; StringCopy(string, namingScreenDataPtr->textBuffer); - BasicInitMenuWindow(&gWindowConfig_81E6F4C); + BasicInitMenuWindow(&gWindowTemplate_81E6F4C); Menu_PrintText(gStringVar1, namingScreenDataPtr->unk2, 4); } diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c index f35ed5b5a..2b9412e45 100644 --- a/src/engine/option_menu.c +++ b/src/engine/option_menu.c @@ -116,11 +116,11 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 2: - SetUpWindowConfig(&gWindowConfig_81E71B4); + SetUpWindowConfig(&gWindowTemplate_81E71B4); gMain.state++; break; case 3: - MultistepInitMenuWindowBegin(&gWindowConfig_81E71B4); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E71B4); gMain.state++; break; case 4: diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index eb823b84b..37b1c767e 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -443,8 +443,8 @@ void CB2_InitResetRtcScreen(void) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); REG_DISPCNT = 4352; SetVBlankCallback(VBlankCB_ResetRtcScreen); SetMainCallback2(CB2_ResetRtcScreen); diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index a4642d241..4609f3fd8 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -120,8 +120,8 @@ static void CB2_SaveFailedScreen(void) ResetPaletteFade(); LoadPalette(&gBirchBagGrassPal, 0, sizeof(gBirchBagGrassPal)); LoadPalette(&gSaveFailedClockPal, 0x100, sizeof(gSaveFailedClockPal)); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_DrawStdWindowFrame(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // message window Menu_PrintText(gSystemText_SaveFailedBackupCheck, 2, MSG_WIN_TOP + 1); diff --git a/src/engine/text.c b/src/engine/text.c index 2d6d95877..15a535ff0 100644 --- a/src/engine/text.c +++ b/src/engine/text.c @@ -492,7 +492,7 @@ static const ShiftGlyphTileShadowedFunc sShiftGlyphTileShadowedFuncs[] = ShiftGlyphTile_ShadowedFont_Width8, }; -const struct WindowTemplate gWindowConfig_81E6C3C = +const struct WindowTemplate gWindowTemplate_81E6C3C = { 0, // BG number 2, // BG character base block @@ -513,7 +513,7 @@ const struct WindowTemplate gWindowConfig_81E6C3C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6C58 = +const struct WindowTemplate gWindowTemplate_81E6C58 = { 0, // BG number 0, // BG character base block @@ -534,7 +534,7 @@ const struct WindowTemplate gWindowConfig_81E6C58 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6C74 = +const struct WindowTemplate gWindowTemplate_81E6C74 = { 0, // BG number 0, // BG character base block @@ -555,7 +555,7 @@ const struct WindowTemplate gWindowConfig_81E6C74 = NULL, // tilemap }; -const struct WindowTemplate gWindowConfig_81E6C90 = +const struct WindowTemplate gWindowTemplate_81E6C90 = { 0, // BG number 1, // BG character base block @@ -576,7 +576,7 @@ const struct WindowTemplate gWindowConfig_81E6C90 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6CAC = +const struct WindowTemplate gWindowTemplate_81E6CAC = { 0, // BG number 0, // BG character base block @@ -597,7 +597,7 @@ const struct WindowTemplate gWindowConfig_81E6CAC = NULL, // tilemap }; -const struct WindowTemplate gWindowConfig_81E6CC8 = +const struct WindowTemplate gWindowTemplate_81E6CC8 = { 2, // BG number 2, // BG character base block @@ -618,7 +618,7 @@ const struct WindowTemplate gWindowConfig_81E6CC8 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6CE4 = +const struct WindowTemplate gWindowTemplate_81E6CE4 = { 0, // BG number 2, // BG character base block @@ -639,7 +639,7 @@ const struct WindowTemplate gWindowConfig_81E6CE4 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6D00 = +const struct WindowTemplate gWindowTemplate_81E6D00 = { 0, // BG number 0, // BG character base block @@ -660,7 +660,7 @@ const struct WindowTemplate gWindowConfig_81E6D00 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6D1C = +const struct WindowTemplate gWindowTemplate_81E6D1C = { 1, // BG number 0, // BG character base block @@ -681,7 +681,7 @@ const struct WindowTemplate gWindowConfig_81E6D1C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6D38 = +const struct WindowTemplate gWindowTemplate_81E6D38 = { 0, // BG number 0, // BG character base block @@ -702,7 +702,7 @@ const struct WindowTemplate gWindowConfig_81E6D38 = NULL, // tilemap }; -const struct WindowTemplate gWindowConfig_81E6D54 = +const struct WindowTemplate gWindowTemplate_81E6D54 = { 3, // BG number 3, // BG character base block @@ -723,7 +723,7 @@ const struct WindowTemplate gWindowConfig_81E6D54 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6D70 = +const struct WindowTemplate gWindowTemplate_81E6D70 = { 3, // BG number 3, // BG character base block @@ -744,7 +744,7 @@ const struct WindowTemplate gWindowConfig_81E6D70 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6D8C = +const struct WindowTemplate gWindowTemplate_81E6D8C = { 1, // BG number 0, // BG character base block @@ -765,7 +765,7 @@ const struct WindowTemplate gWindowConfig_81E6D8C = BG_SCREEN_ADDR(14), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6DA8 = +const struct WindowTemplate gWindowTemplate_81E6DA8 = { 0, // BG number 0, // BG character base block @@ -828,7 +828,7 @@ const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6DFC = +const struct WindowTemplate gWindowTemplate_81E6DFC = { 0, // BG number 2, // BG character base block @@ -849,7 +849,7 @@ const struct WindowTemplate gWindowConfig_81E6DFC = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6E18 = +const struct WindowTemplate gWindowTemplate_81E6E18 = { 0, // BG number 2, // BG character base block @@ -870,7 +870,7 @@ const struct WindowTemplate gWindowConfig_81E6E18 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6E34 = +const struct WindowTemplate gWindowTemplate_81E6E34 = { 1, // BG number 0, // BG character base block @@ -891,7 +891,7 @@ const struct WindowTemplate gWindowConfig_81E6E34 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6E50 = +const struct WindowTemplate gWindowTemplate_81E6E50 = { 0, // BG number 2, // BG character base block @@ -912,7 +912,7 @@ const struct WindowTemplate gWindowConfig_81E6E50 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6E6C = +const struct WindowTemplate gWindowTemplate_81E6E6C = { 0, // BG number 2, // BG character base block @@ -933,7 +933,7 @@ const struct WindowTemplate gWindowConfig_81E6E6C = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6E88 = +const struct WindowTemplate gWindowTemplate_81E6E88 = { 0, // BG number 0, // BG character base block @@ -954,7 +954,7 @@ const struct WindowTemplate gWindowConfig_81E6E88 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6EA4 = +const struct WindowTemplate gWindowTemplate_81E6EA4 = { 1, // BG number 0, // BG character base block @@ -975,7 +975,7 @@ const struct WindowTemplate gWindowConfig_81E6EA4 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6EC0 = +const struct WindowTemplate gWindowTemplate_81E6EC0 = { 2, // BG number 2, // BG character base block @@ -996,7 +996,7 @@ const struct WindowTemplate gWindowConfig_81E6EC0 = BG_SCREEN_ADDR(29), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6EDC = +const struct WindowTemplate gWindowTemplate_81E6EDC = { 1, // BG number 0, // BG character base block @@ -1017,7 +1017,7 @@ const struct WindowTemplate gWindowConfig_81E6EDC = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6EF8 = +const struct WindowTemplate gWindowTemplate_81E6EF8 = { 2, // BG number 2, // BG character base block @@ -1038,7 +1038,7 @@ const struct WindowTemplate gWindowConfig_81E6EF8 = BG_SCREEN_ADDR(29), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6F14 = +const struct WindowTemplate gWindowTemplate_81E6F14 = { 1, // BG number 0, // BG character base block @@ -1059,7 +1059,7 @@ const struct WindowTemplate gWindowConfig_81E6F14 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6F30 = +const struct WindowTemplate gWindowTemplate_81E6F30 = { 2, // BG number 2, // BG character base block @@ -1080,7 +1080,7 @@ const struct WindowTemplate gWindowConfig_81E6F30 = BG_SCREEN_ADDR(29), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6F4C = +const struct WindowTemplate gWindowTemplate_81E6F4C = { 3, // BG number 0, // BG character base block @@ -1101,7 +1101,7 @@ const struct WindowTemplate gWindowConfig_81E6F4C = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6F68 = +const struct WindowTemplate gWindowTemplate_81E6F68 = { 0, // BG number 2, // BG character base block @@ -1122,7 +1122,7 @@ const struct WindowTemplate gWindowConfig_81E6F68 = BG_SCREEN_ADDR(13), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6F84 = +const struct WindowTemplate gWindowTemplate_81E6F84 = { 0, // BG number 2, // BG character base block @@ -1143,7 +1143,7 @@ const struct WindowTemplate gWindowConfig_81E6F84 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6FA0 = +const struct WindowTemplate gWindowTemplate_81E6FA0 = { 1, // BG number 0, // BG character base block @@ -1164,7 +1164,7 @@ const struct WindowTemplate gWindowConfig_81E6FA0 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6FBC = +const struct WindowTemplate gWindowTemplate_81E6FBC = { 0, // BG number 0, // BG character base block @@ -1185,7 +1185,7 @@ const struct WindowTemplate gWindowConfig_81E6FBC = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6FD8 = +const struct WindowTemplate gWindowTemplate_81E6FD8 = { 0, // BG number 0, // BG character base block @@ -1206,7 +1206,7 @@ const struct WindowTemplate gWindowConfig_81E6FD8 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowTemplate gWindowConfig_81E6FF4 = +const struct WindowTemplate gWindowTemplate_81E6FF4 = { 0, // BG number 0, // BG character base block @@ -1227,7 +1227,7 @@ const struct WindowTemplate gWindowConfig_81E6FF4 = BG_SCREEN_ADDR(24), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7010 = +const struct WindowTemplate gWindowTemplate_81E7010 = { 0, // BG number 0, // BG character base block @@ -1248,7 +1248,7 @@ const struct WindowTemplate gWindowConfig_81E7010 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E702C = +const struct WindowTemplate gWindowTemplate_81E702C = { 3, // BG number 2, // BG character base block @@ -1269,7 +1269,7 @@ const struct WindowTemplate gWindowConfig_81E702C = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7048 = +const struct WindowTemplate gWindowTemplate_81E7048 = { 2, // BG number 2, // BG character base block @@ -1290,7 +1290,7 @@ const struct WindowTemplate gWindowConfig_81E7048 = BG_SCREEN_ADDR(14), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7064 = +const struct WindowTemplate gWindowTemplate_81E7064 = { 2, // BG number 2, // BG character base block @@ -1311,7 +1311,7 @@ const struct WindowTemplate gWindowConfig_81E7064 = BG_SCREEN_ADDR(14), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7080 = +const struct WindowTemplate gWindowTemplate_81E7080 = { 3, // BG number 0, // BG character base block @@ -1332,7 +1332,7 @@ const struct WindowTemplate gWindowConfig_81E7080 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E709C = +const struct WindowTemplate gWindowTemplate_81E709C = { 0, // BG number 0, // BG character base block @@ -1353,7 +1353,7 @@ const struct WindowTemplate gWindowConfig_81E709C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E70B8 = +const struct WindowTemplate gWindowTemplate_81E70B8 = { 2, // BG number 0, // BG character base block @@ -1374,7 +1374,7 @@ const struct WindowTemplate gWindowConfig_81E70B8 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E70D4 = +const struct WindowTemplate gWindowTemplate_81E70D4 = { 3, // BG number 0, // BG character base block @@ -1395,7 +1395,7 @@ const struct WindowTemplate gWindowConfig_81E70D4 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E70F0 = +const struct WindowTemplate gWindowTemplate_81E70F0 = { 0, // BG number 0, // BG character base block @@ -1416,7 +1416,7 @@ const struct WindowTemplate gWindowConfig_81E70F0 = NULL, // tilemap }; -const struct WindowTemplate gWindowConfig_81E710C = +const struct WindowTemplate gWindowTemplate_81E710C = { 0, // BG number 0, // BG character base block @@ -1437,7 +1437,7 @@ const struct WindowTemplate gWindowConfig_81E710C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7128 = +const struct WindowTemplate gWindowTemplate_81E7128 = { 0, // BG number 2, // BG character base block @@ -1458,7 +1458,7 @@ const struct WindowTemplate gWindowConfig_81E7128 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7144 = +const struct WindowTemplate gWindowTemplate_81E7144 = { 0, // BG number 2, // BG character base block @@ -1479,7 +1479,7 @@ const struct WindowTemplate gWindowConfig_81E7144 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7160 = +const struct WindowTemplate gWindowTemplate_81E7160 = { 1, // BG number 1, // BG character base block @@ -1500,7 +1500,7 @@ const struct WindowTemplate gWindowConfig_81E7160 = BG_SCREEN_ADDR(10), // tilemap }; -const struct WindowTemplate gWindowConfig_81E717C = +const struct WindowTemplate gWindowTemplate_81E717C = { 0, // BG number 3, // BG character base block @@ -1521,7 +1521,7 @@ const struct WindowTemplate gWindowConfig_81E717C = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7198 = +const struct WindowTemplate gWindowTemplate_81E7198 = { 0, // BG number 2, // BG character base block @@ -1542,7 +1542,7 @@ const struct WindowTemplate gWindowConfig_81E7198 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowTemplate gWindowConfig_81E71B4 = +const struct WindowTemplate gWindowTemplate_81E71B4 = { 0, // BG number 2, // BG character base block @@ -1563,7 +1563,7 @@ const struct WindowTemplate gWindowConfig_81E71B4 = BG_SCREEN_ADDR(15), // tilemap }; -const struct WindowTemplate gWindowConfig_81E71D0 = +const struct WindowTemplate gWindowTemplate_81E71D0 = { 1, // BG number 1, // BG character base block @@ -1584,7 +1584,7 @@ const struct WindowTemplate gWindowConfig_81E71D0 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowTemplate gWindowConfig_81E71EC = +const struct WindowTemplate gWindowTemplate_81E71EC = { 2, // BG number 1, // BG character base block @@ -1605,7 +1605,7 @@ const struct WindowTemplate gWindowConfig_81E71EC = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7208 = +const struct WindowTemplate gWindowTemplate_81E7208 = { 0, // BG number 2, // BG character base block @@ -1626,7 +1626,7 @@ const struct WindowTemplate gWindowConfig_81E7208 = BG_SCREEN_ADDR(28), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7224 = +const struct WindowTemplate gWindowTemplate_81E7224 = { 0, // BG number 0, // BG character base block @@ -1647,7 +1647,7 @@ const struct WindowTemplate gWindowConfig_81E7224 = BG_SCREEN_ADDR(31), // tilemap }; -const struct WindowTemplate gWindowConfig_81E7240 = +const struct WindowTemplate gWindowTemplate_81E7240 = { 1, // BG number 2, // BG character base block @@ -1668,7 +1668,7 @@ const struct WindowTemplate gWindowConfig_81E7240 = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate gWindowConfig_81E725C = +const struct WindowTemplate gWindowTemplate_81E725C = { 0, // BG number 0, // BG character base block @@ -1689,7 +1689,7 @@ const struct WindowTemplate gWindowConfig_81E725C = NULL, // tilemap }; -const struct WindowTemplate gWindowConfig_81E7278 = +const struct WindowTemplate gWindowTemplate_81E7278 = { 0, // BG number 0, // BG character base block @@ -1710,7 +1710,7 @@ const struct WindowTemplate gWindowConfig_81E7278 = NULL, // tilemap }; -const struct WindowTemplate gWindowConfig_81E7294 = +const struct WindowTemplate gWindowTemplate_81E7294 = { 0, // BG number 0, // BG character base block @@ -2364,24 +2364,24 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to void sub_80034D4(u8 *tileData, const u8 *text) { - sub_8004E3C(&gWindowConfig_81E6C74, tileData, text); + sub_8004E3C(&gWindowTemplate_81E6C74, tileData, text); } u8 sub_80034EC(u8 *str) { - return Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6C74, str); + return Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowTemplate_81E6C74, str); } u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType) { - sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74; + sTempWindow.template = (struct WindowTemplate *)&gWindowTemplate_81E6C74; Text_InitWindow(&sTempWindow, 0, 0, 0, 0); return AlignInt2(&sTempWindow, dest, value, alignAmount, alignType); } u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType) { - sTempWindow.template = (struct WindowTemplate *)&gWindowConfig_81E6C74; + sTempWindow.template = (struct WindowTemplate *)&gWindowTemplate_81E6C74; Text_InitWindow(&sTempWindow, src, 0, 0, 0); return AlignString(&sTempWindow, dest, src, alignAmount, alignType); } diff --git a/src/engine/trade.c b/src/engine/trade.c index d37b36f72..30e22b8d5 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -1016,10 +1016,10 @@ void sub_8047CD8(void) static void sub_8047CE8(void) { u8 mpId; - sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC); + sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[0], gSaveBlock2.playerName, 0xC); mpId = GetMultiplayerId(); - sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[3], gLinkPlayers[mpId ^ 1].name, 0xC); - sub_804AFB8(&gWindowConfig_81E725C, gUnknown_020296CC[6], gUnknown_0820C14C[0], 0x8); + sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[3], gLinkPlayers[mpId ^ 1].name, 0xC); + sub_804AFB8(&gWindowTemplate_81E725C, gUnknown_020296CC[6], gUnknown_0820C14C[0], 0x8); sub_804ACD8(gUnknown_0820C14C[1], gUnknown_020296CC[8], 0x14); nullsub_5(3, 0); } @@ -1087,9 +1087,9 @@ static void sub_8047EC0(void) ResetTasks(); sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5)); SetVBlankCallback(sub_80489F4); - InitMenuWindow(&gWindowConfig_81E6CE4); - SetUpWindowConfig(&gWindowConfig_81E6F84); - Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84); + InitMenuWindow(&gWindowTemplate_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84); gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20); TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window); Menu_EraseScreen(); @@ -1267,9 +1267,9 @@ static void sub_80484F4(void) ResetTasks(); sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5)); SetVBlankCallback(sub_80489F4); - InitMenuWindow(&gWindowConfig_81E6CE4); - SetUpWindowConfig(&gWindowConfig_81E6F84); - Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowConfig_81E6F84); + InitMenuWindow(&gWindowTemplate_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84); gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20); TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window); Menu_EraseScreen(); @@ -3010,7 +3010,7 @@ u8 sub_804A2B4(u8 *a0, u8 whichParty, u8 whichPokemon) GetMonGender(&gEnemyParty[whichPokemon]); GetMonData(&gEnemyParty[whichPokemon], MON_DATA_LEVEL); } - return Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, a0); + return Text_GetStringWidthFromWindowTemplate(&gWindowTemplate_81E7294, a0); } #ifdef NONMATCHING @@ -3067,7 +3067,7 @@ static void sub_804A41C(u8 whichParty) GetMonData(pokemon, MON_DATA_NICKNAME, nickname); StringCopy10(string + 6, nickname); GetMonGender(pokemon); - string[5] = (50 - Text_GetStringWidthFromWindowTemplate(&gWindowConfig_81E7294, string + 6)) / 2; + string[5] = (50 - Text_GetStringWidthFromWindowTemplate(&gWindowTemplate_81E7294, string + 6)) / 2; Text_InitWindowAndPrintText(&gUnknown_03004824->window, string, gUnknown_03004824->unk_007a + 22 * 6 * whichParty + 22 * i, gTradeMonSpriteCoords[i + 6 * whichParty][0], gTradeMonSpriteCoords[i + 6 * whichParty][1]); } } @@ -3141,7 +3141,7 @@ static void sub_804A41C(u8 whichParty) "\tbl GetMonGender\n" "\tmov r1, sp\n" "\tadds r1, 0x22\n" - "\tldr r0, _0804A518 @ =gWindowConfig_81E7294\n" + "\tldr r0, _0804A518 @ =gWindowTemplate_81E7294\n" "\tbl Text_GetStringWidthFromWindowTemplate\n" "\tlsls r0, 24\n" "\tlsrs r0, 24\n" @@ -3198,7 +3198,7 @@ static void sub_804A41C(u8 whichParty) "\tbx r0\n" "\t.align 2, 0\n" "_0804A514: .4byte gEnemyParty\n" - "_0804A518: .4byte gWindowConfig_81E7294"); + "_0804A518: .4byte gWindowTemplate_81E7294"); } #endif @@ -3523,7 +3523,7 @@ static bool8 sub_804ABF8(void) static void sub_804ACD8(const u8 *src, u8 *dest, u8 a2) { - sub_804AFB8(&gWindowConfig_81E725C, dest, src, a2); + sub_804AFB8(&gWindowTemplate_81E725C, dest, src, a2); } #ifdef NONMATCHING @@ -4028,8 +4028,8 @@ static void sub_804B41C(void) FreeAllSpritePalettes(); SetVBlankCallback(sub_804B210); sub_804B228(); - SetUpWindowConfig(&gWindowConfig_81E6F84); - Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E6F84); + SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84); gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2); TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); Menu_EraseScreen(); @@ -4182,7 +4182,7 @@ static __attribute__((naked)) void sub_804B41C(void) "\tldr r0, _0804B578 @ =sub_804B210\n" "\tbl SetVBlankCallback\n" "\tbl sub_804B228\n" - "\tldr r4, _0804B57C @ =gWindowConfig_81E6F84\n" + "\tldr r4, _0804B57C @ =gWindowTemplate_81E6F84\n" "\tadds r0, r4, 0\n" "\tbl SetUpWindowConfig\n" "\tldr r0, [r6]\n" @@ -4279,7 +4279,7 @@ static __attribute__((naked)) void sub_804B41C(void) "_0804B570: .4byte gUnknown_03004828\n" "_0804B574: .4byte gSharedMem + 0x1F000\n" "_0804B578: .4byte sub_804B210\n" - "_0804B57C: .4byte gWindowConfig_81E6F84\n" + "_0804B57C: .4byte gWindowTemplate_81E6F84\n" "_0804B580: .4byte gLinkType\n" "_0804B584: .4byte 0x00001144\n" "_0804B588: .4byte gMain\n" @@ -4531,8 +4531,8 @@ static void sub_804B790(void) FreeAllSpritePalettes(); SetVBlankCallback(sub_804B210); sub_804B228(); - SetUpWindowConfig(&gWindowConfig_81E717C); - Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E717C); + SetUpWindowConfig(&gWindowTemplate_81E717C); + Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E717C); gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2); TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); Menu_EraseScreen(); diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index f57face11..75e481f84 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -109,11 +109,11 @@ static bool8 sub_8146058(void) gMain.state += 1; break; case 3: - SetUpWindowConfig(&gWindowConfig_81E6E18); + SetUpWindowConfig(&gWindowTemplate_81E6E18); gMain.state += 1; break; case 4: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6E18); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E18); gMain.state += 1; break; case 5: diff --git a/src/field/diploma.c b/src/field/diploma.c index b9cdb65df..8481589cb 100644 --- a/src/field/diploma.c +++ b/src/field/diploma.c @@ -68,8 +68,8 @@ void CB2_ShowDiploma(void) ResetPaletteFade(); FreeAllSpritePalettes(); LoadPalette(gDiplomaPalettes, 0, 64); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); DisplayDiplomaText(); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); diff --git a/src/field/field_effect.c b/src/field/field_effect.c index 1e2aaa4ed..57d9072b1 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -2434,8 +2434,8 @@ void sub_8088380(struct Task *task) IntrCallback callback; LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback); SetVBlankCallback(callback); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); FreeResourcesAndDestroySprite(&gSprites[task->data[15]]); FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON); DestroyTask(FindTaskIdByFunc(sub_8088120)); @@ -2557,8 +2557,8 @@ void sub_808862C(struct Task *task) CpuFill32(0, (void *)VRAM + bg0cnt, 0x800); LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback); SetVBlankCallback(intrCallback); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); FreeResourcesAndDestroySprite(&gSprites[task->data[15]]); FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON); DestroyTask(FindTaskIdByFunc(sub_808847C)); diff --git a/src/field/field_message_box.c b/src/field/field_message_box.c index 284fdb3f0..5eec7a14b 100644 --- a/src/field/field_message_box.c +++ b/src/field/field_message_box.c @@ -20,7 +20,7 @@ void InitFieldMessageBox(void) { sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN; TextWindow_SetDlgFrameBaseTileNum(gMenuTextWindowContentTileOffset); - Text_InitWindowWithTemplate(&gFieldMessageBoxWindow, &gWindowConfig_81E6CE4); + Text_InitWindowWithTemplate(&gFieldMessageBoxWindow, &gWindowTemplate_81E6CE4); } static void Task_FieldMessageBox(u8 taskId) diff --git a/src/field/field_region_map.c b/src/field/field_region_map.c index af8e4ec8a..afbc25226 100644 --- a/src/field/field_region_map.c +++ b/src/field/field_region_map.c @@ -50,8 +50,8 @@ void CB2_FieldInitRegionMap(void) InitRegionMap((void *)&ewram0_5.unk8, 0); CreateRegionMapPlayerIcon(0, 0); CreateRegionMapCursor(1, 1); - SetUpWindowConfig(&gWindowConfig_81E709C); - InitMenuWindow(&gWindowConfig_81E709C); + SetUpWindowConfig(&gWindowTemplate_81E709C); + InitMenuWindow(&gWindowTemplate_81E709C); Menu_EraseScreen(); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256; Menu_DrawStdWindowFrame(21, 0, 29, 3); diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c index f123768e5..6e818ce68 100644 --- a/src/field/field_screen_effect.c +++ b/src/field/field_screen_effect.c @@ -265,7 +265,7 @@ static void sub_80816A8(u8 taskId) break; case 5: Menu_EraseWindowRect(0, 0, 29, 19); - LoadFontDefaultPalette(&gWindowConfig_81E6CE4); + LoadFontDefaultPalette(&gWindowTemplate_81E6CE4); REG_WIN0H = 255; REG_DISPCNT = data[6]; REG_BLDCNT = data[7]; diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 0db48f55d..f58f42fb9 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -424,11 +424,11 @@ static bool8 SetupBagMultistep(void) gMain.state++; break; case 7: - SetUpWindowConfig(&gWindowConfig_81E6DFC); + SetUpWindowConfig(&gWindowTemplate_81E6DFC); gMain.state++; break; case 8: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6DFC); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6DFC); gMain.state++; break; case 9: diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 82c6dffe3..c3a73e18b 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -858,7 +858,7 @@ static void Task_BardSong(u8 taskId) { case 0: // Initialize song PrepareSongText(); - Text_InitWindowWithTemplate(gMenuWindowPtr, &gWindowConfig_81E6CE4); + Text_InitWindowWithTemplate(gMenuWindowPtr, &gWindowTemplate_81E6CE4); Text_InitWindow8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15); task->data[1] = 0; task->data[2] = 0; diff --git a/src/field/overworld.c b/src/field/overworld.c index e239daec7..e91c8ae56 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -1456,8 +1456,8 @@ bool32 sub_805483C(u8 *a1) case 4: sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); (*a1)++; break; case 5: @@ -1522,8 +1522,8 @@ bool32 sub_805493C(u8 *a1, u32 a2) case 4: sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); (*a1)++; break; case 5: @@ -1612,8 +1612,8 @@ bool32 sub_8054A9C(u8 *a1) case 3: sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); (*a1)++; break; case 4: @@ -1695,8 +1695,8 @@ void sub_8054C2C(void) { sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); mapdata_load_assets_to_gpu_and_full_redraw(); } diff --git a/src/field/party_menu.c b/src/field/party_menu.c index f589494f4..73a32d070 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -679,11 +679,11 @@ bool8 InitPartyMenu(void) gMain.state++; break; case 7: - SetUpWindowConfig(&gWindowConfig_81E6C90); + SetUpWindowConfig(&gWindowTemplate_81E6C90); gMain.state++; break; case 8: - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C90); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C90); MultistepInitWindowTileData(&gUnknown_03004210, 1); gMain.state++; break; @@ -716,7 +716,7 @@ bool8 InitPartyMenu(void) } break; case 13: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6CC8); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6CC8); gMain.state++; break; case 14: @@ -3313,7 +3313,7 @@ void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer) { u32 var1 = 0; CpuFastSet(&var1, gTileBuffer, 0x1000100); - sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gTileBuffer, nameBuffer); + sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gTileBuffer, nameBuffer); CpuFastSet(gTileBuffer, OBJ_VRAM1 + (monIndex * 0x400), 128); } @@ -3423,7 +3423,7 @@ void PartyMenuDoPrintLevel(u8 monIndex, u8 menuLayout, u8 level) var1 = 0; CpuFastSet(&var1, gUnknown_02039460, 0x1000020); - sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); + sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x200 + (monIndex * 0x400), 32); } @@ -3517,7 +3517,7 @@ void PartyMenuDoPrintHP(u8 monIndex, u8 b, u16 currentHP, u16 maxHP) var = 0; CpuFastSet(&var, gUnknown_02039460, 0x1000040); - sub_8004E3C((struct WindowTemplate *)&gWindowConfig_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); + sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x300 + (monIndex * 0x400), 64); } diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 3ca359ef7..b238857fa 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -275,15 +275,15 @@ static bool8 sub_810B6C0(void) gMain.state++; break; case 5: - SetUpWindowConfig(&gWindowConfig_81E6E34); + SetUpWindowConfig(&gWindowTemplate_81E6E34); gMain.state++; break; case 6: - SetUpWindowConfig(&gWindowConfig_81E6E50); + SetUpWindowConfig(&gWindowTemplate_81E6E50); gMain.state++; break; case 7: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6E34); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E34); gMain.state++; break; case 8: @@ -293,7 +293,7 @@ static bool8 sub_810B6C0(void) } break; case 9: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6E50); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E50); gMain.state++; break; case 10: @@ -445,13 +445,13 @@ void debug_sub_8120F98(void) static void sub_810BB0C(void) { - BasicInitMenuWindow(&gWindowConfig_81E6E34); + BasicInitMenuWindow(&gWindowTemplate_81E6E34); sub_8072BD8(ItemId_GetItem(ITEM_POKEBLOCK_CASE)->name, 2, 1, 0x48); } static void sub_810BB30(void) { - BasicInitMenuWindow(&gWindowConfig_81E6E34); + BasicInitMenuWindow(&gWindowTemplate_81E6E34); Menu_PrintText(gContestStatsText_Spicy, 2, 13); Menu_PrintText(gContestStatsText_Dry, 2, 15); Menu_PrintText(gContestStatsText_Sweet, 2, 17); @@ -464,7 +464,7 @@ static void sub_810BB88(u8 a0) u8 i; u8 y; u8 *buf; - BasicInitMenuWindow(&gWindowConfig_81E6E34); + BasicInitMenuWindow(&gWindowTemplate_81E6E34); for (i=a0; i<=a0+8; i++) { y = (i - a0) << 1; @@ -596,7 +596,7 @@ static void sub_810BDAC(bool8 flag) gBGTilemapBuffers[2][v0 + 32] = 15; } } - BasicInitMenuWindow(&gWindowConfig_81E6E34); + BasicInitMenuWindow(&gWindowTemplate_81E6E34); if (gUnknown_02039248.unk0 + gUnknown_02039248.unk1 != gUnknown_02039248.unk2) { sub_8072C14(gStringVar1, sub_810C9E8(&gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1]), 16, 1); @@ -812,7 +812,7 @@ static void sub_810C368(u8 taskId) v0 = 2; sub_80F98A4(0); sub_80F98A4(1); - BasicInitMenuWindow(&gWindowConfig_81E6E50); + BasicInitMenuWindow(&gWindowTemplate_81E6E50); Menu_DrawStdWindowFrame(7, v0 + 4, 13, 11); PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758); InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5); @@ -868,7 +868,7 @@ static void sub_810C508(u8 taskId) static void sub_810C540(u8 taskId) { - BasicInitMenuWindow(&gWindowConfig_81E6E50); + BasicInitMenuWindow(&gWindowTemplate_81E6E50); HandleDestroyMenuCursors(); Menu_EraseWindowRect(7, 4, 13, 11); StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1].color]); @@ -906,7 +906,7 @@ static void sub_810C668(u8 taskId) { sub_80F979C(1, 0); } - BasicInitMenuWindow(&gWindowConfig_81E6E50); + BasicInitMenuWindow(&gWindowTemplate_81E6E50); Menu_EraseWindowRect(7, 6, 13, 11); Menu_EraseWindowRect(0, 14, 29, 19); gTasks[taskId].func = sub_810BF7C; @@ -922,7 +922,7 @@ static void sub_810C6DC(u8 taskId) static void sub_810C704(u8 taskId) { - BasicInitMenuWindow(&gWindowConfig_81E6E34); + BasicInitMenuWindow(&gWindowTemplate_81E6E34); sub_810BC84(gUnknown_02039248.unk1); sub_80F979C(1, 1); gTasks[taskId].func = sub_810C6DC; diff --git a/src/field/region_map.c b/src/field/region_map.c index 1eb57b803..f7db0a61e 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -1540,10 +1540,10 @@ void CB2_InitFlyRegionMap(void) FreeAllSpritePalettes(); break; case 1: - SetUpWindowConfig(&gWindowConfig_81E7224); + SetUpWindowConfig(&gWindowTemplate_81E7224); break; case 2: - InitMenuWindow(&gWindowConfig_81E7224); + InitMenuWindow(&gWindowTemplate_81E7224); Menu_EraseScreen(); break; case 3: diff --git a/src/field/script_menu.c b/src/field/script_menu.c index bf6e93e41..ee5843049 100644 --- a/src/field/script_menu.c +++ b/src/field/script_menu.c @@ -622,7 +622,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ig static u16 GetStringWidthInTilesForScriptMenu(const u8 *str) { // each tile on screen is 8x8, so it needs the number of tiles and not pixels, hence the division by 8. - return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowConfig_81E6CE4, str) + 7) / 8; + return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowTemplate_81E6CE4, str) + 7) / 8; } static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress, u8 cursorPos) diff --git a/src/field/shop.c b/src/field/shop.c index 0d8bc83d1..cfd4818dc 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -285,8 +285,8 @@ void BuyMenuDrawGraphics(void) ResetPaletteFade(); ResetSpriteData(); ResetTasks(); - SetUpWindowConfig(&gWindowConfig_81E6DFC); - InitMenuWindow(&gWindowConfig_81E6DFC); + SetUpWindowConfig(&gWindowTemplate_81E6DFC); + InitMenuWindow(&gWindowTemplate_81E6DFC); BuyMenuDrawMapGraphics(); gMartInfo.cursor = zero; gMartInfo.choicesAbove = zero2; diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 3c13e004c..abf837daa 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -400,8 +400,8 @@ static void SlotMachineSetup_0_1(void) static void SlotMachineSetup_3_0(void) { - SetUpWindowConfig(&gWindowConfig_81E7128); - InitMenuWindow(&gWindowConfig_81E7128); + SetUpWindowConfig(&gWindowTemplate_81E7128); + InitMenuWindow(&gWindowTemplate_81E7128); } static void SlotMachineSetup_4_0(void) @@ -2807,7 +2807,7 @@ static void sub_8104B80(struct Task *task) { sub_8104DA4(); sub_81065DC(); - BasicInitMenuWindow(&gWindowConfig_81E7144); + BasicInitMenuWindow(&gWindowTemplate_81E7144); MenuPrint_PixelCoords(gOtherText_ReelTime, 10, 32, 1); BeginNormalPaletteFade(-1, 0, 16, 0, 0); task->data[0]++; @@ -2825,7 +2825,7 @@ static void sub_8104BC8(struct Task *task) static void sub_8104BFC(struct Task *task) { Menu_EraseScreen(); - BasicInitMenuWindow(&gWindowConfig_81E7128); + BasicInitMenuWindow(&gWindowTemplate_81E7128); sub_81064B8(); sub_8104CAC(task->data[1]); sub_810423C(eSlotMachine->pikaPower); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 6c2812039..8131e2511 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -271,7 +271,7 @@ void CreateStartMenuTask(void (*func)(u8)) { u8 taskId; - InitMenuWindow(&gWindowConfig_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); taskId = CreateTask(Task_StartMenu, 0x50); SetTaskFuncWithFollowupFunc(taskId, Task_StartMenu, func); } @@ -774,8 +774,8 @@ static bool32 sub_80719FC(u8 *step) dp12_8087EA4(); break; case 2: - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON; break; case 3: diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index d4994d701..9b644c6cb 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -294,8 +294,8 @@ void CB2_ChooseStarter(void) LoadCompressedObjectPic(&gUnknown_083F7794[0]); LoadCompressedObjectPic(&gUnknown_083F77A4[0]); LoadSpritePalettes(gUnknown_083F77B4); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); savedIme = REG_IME; diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 6e71011b9..a4a36e40a 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -228,11 +228,11 @@ static void sub_8136294(void) gUnknown_02039304->unk50++; break; case 3: - SetUpWindowConfig(&gWindowConfig_81E7080); + SetUpWindowConfig(&gWindowTemplate_81E7080); gUnknown_02039304->unk50++; break; case 4: - MultistepInitMenuWindowBegin(&gWindowConfig_81E7080); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E7080); gUnknown_02039304->unk50++; break; case 5: @@ -610,7 +610,7 @@ static void sub_8136BB8(void) GetMonData(&gPlayerParty[sub_81370A4(gUnknown_083DFEC4->unk87DC)], MON_DATA_NICKNAME, gUnknown_02039304->stringBuffer); StringGetEnd10(gUnknown_02039304->stringBuffer); StringAppend(gUnknown_02039304->stringBuffer, gOtherText_GetsAPokeBlock); - BasicInitMenuWindow(&gWindowConfig_81E709C); + BasicInitMenuWindow(&gWindowTemplate_81E709C); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(gUnknown_02039304->stringBuffer, 1, 17); DisplayYesNoMenu(23, 10, 1); @@ -623,14 +623,14 @@ static s8 sub_8136C40(void) if ((u8)(retval + 1) < 3) { Menu_EraseScreen(); - BasicInitMenuWindow(&gWindowConfig_81E7080); + BasicInitMenuWindow(&gWindowTemplate_81E7080); } return retval; } static void sub_8136C6C(void) { - BasicInitMenuWindow(&gWindowConfig_81E709C); + BasicInitMenuWindow(&gWindowTemplate_81E709C); Menu_DrawStdWindowFrame(0, 16, 29, 19); for (gUnknown_02039304->unk53 = 0; gUnknown_02039304->unk53 < 5 && gUnknown_02039304->unk61[gUnknown_02039304->unk53] == 0; gUnknown_02039304->unk53++); if (gUnknown_02039304->unk53 < 5) @@ -667,7 +667,7 @@ static bool8 sub_8136D00(void) static void sub_8136D60(void) { - BasicInitMenuWindow(&gWindowConfig_81E709C); + BasicInitMenuWindow(&gWindowTemplate_81E709C); Menu_DrawStdWindowFrame(0, 16, 29, 19); Menu_PrintText(gOtherText_WontEat, 1, 17); } @@ -675,7 +675,7 @@ static void sub_8136D60(void) static void sub_8136D8C(void) { Menu_EraseScreen(); - BasicInitMenuWindow(&gWindowConfig_81E7080); + BasicInitMenuWindow(&gWindowTemplate_81E7080); } static void Pokeblock_MenuWindowTextPrint(const u8 *message) diff --git a/src/field/wallclock.c b/src/field/wallclock.c index 6d102715a..8620ad9f0 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -236,8 +236,8 @@ static void LoadWallClockGraphics(void) FreeAllSpritePalettes(); LoadCompressedObjectPic(&gUnknown_083F7A90[0]); LoadSpritePalettes(gUnknown_083F7AA0); - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); } static void WallClockInit(void) diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index 83953186b..eae1c0b4e 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -25,8 +25,8 @@ extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u8 gTileBuffer[]; -extern const struct WindowTemplate gWindowConfig_81E6CE4; -extern const struct WindowTemplate gWindowConfig_81E7240; +extern const struct WindowTemplate gWindowTemplate_81E6CE4; +extern const struct WindowTemplate gWindowTemplate_81E7240; extern const u8 *const gContestEffectStrings[]; extern const u8 *const gMoveDescriptions[]; extern const u8 gTypeNames[][7]; @@ -268,12 +268,12 @@ void CB2_InitLearnMove(void) sub_8133558(); SetVBlankCallback(VBlankCB_LearnMove); - SetUpWindowConfig(&gWindowConfig_81E7240); - InitMenuWindow(&gWindowConfig_81E7240); + SetUpWindowConfig(&gWindowTemplate_81E7240); + InitMenuWindow(&gWindowTemplate_81E7240); Menu_EraseScreen(); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_EraseScreen(); REG_BG0VOFS = 0; @@ -302,12 +302,12 @@ void sub_81327A4(void) sLearnMoveStruct->unk2C6 = gSpecialVar_0x8005; SetVBlankCallback(VBlankCB_LearnMove); - SetUpWindowConfig(&gWindowConfig_81E7240); - InitMenuWindow(&gWindowConfig_81E7240); + SetUpWindowConfig(&gWindowTemplate_81E7240); + InitMenuWindow(&gWindowTemplate_81E7240); Menu_EraseScreen(); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_EraseScreen(); REG_DISPCNT = 0x1340; @@ -633,7 +633,7 @@ void DrawLearnMoveMenuWindow(void) { u32 i; - BasicInitMenuWindow(&gWindowConfig_81E7240); + BasicInitMenuWindow(&gWindowTemplate_81E7240); for (i = 0; i < 4; i++) { Menu_DrawStdWindowFrame( @@ -642,7 +642,7 @@ void DrawLearnMoveMenuWindow(void) gUnknown_08402CF8[i][2], gUnknown_08402CF8[i][3]); } - BasicInitMenuWindow(&gWindowConfig_81E6CE4); + BasicInitMenuWindow(&gWindowTemplate_81E6CE4); } void sub_8133030(bool8 a) diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index c49c6d350..cd1083790 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -354,11 +354,11 @@ static u8 sub_80F8A28(void) RETURN_UP_STATE; case 6: - SetUpWindowConfig(&gWindowConfig_81E6DFC); + SetUpWindowConfig(&gWindowTemplate_81E6DFC); RETURN_UP_STATE; case 7: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6DFC); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6DFC); RETURN_UP_STATE; case 8: diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c index 028ae71a0..2ed404327 100644 --- a/src/pokemon/pokeblock_feed.c +++ b/src/pokemon/pokeblock_feed.c @@ -530,11 +530,11 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; break; case 4: - SetUpWindowConfig(&gWindowConfig_81E6E50); + SetUpWindowConfig(&gWindowTemplate_81E6E50); gMain.state++; break; case 5: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6E50); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E50); gMain.state++; break; case 6: diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 83820f4cc..b7081f35d 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -1425,8 +1425,8 @@ void CB2_InitPokedex(void) ResetPaletteFade(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - SetUpWindowConfig(&gWindowConfig_81E7048); - InitMenuWindow(&gWindowConfig_81E7048); + SetUpWindowConfig(&gWindowTemplate_81E7048); + InitMenuWindow(&gWindowTemplate_81E7048); gMain.state++; break; case 2: @@ -1937,8 +1937,8 @@ static bool8 sub_808D344(u8 a) gMain.state++; break; case 2: - SetUpWindowConfig(&gWindowConfig_81E7048); - InitMenuWindow(&gWindowConfig_81E7048); + SetUpWindowConfig(&gWindowTemplate_81E7048); + InitMenuWindow(&gWindowTemplate_81E7048); LZ77UnCompVram(gUnknown_0839FA7C, (void *)(VRAM + 0xFF80)); gMain.state++; break; @@ -2951,8 +2951,8 @@ static void Task_InitPageScreenMultistep(u8 taskId) gMain.state++; break; case 3: - SetUpWindowConfig(&gWindowConfig_81E7064); - InitMenuWindow(&gWindowConfig_81E7064); + SetUpWindowConfig(&gWindowTemplate_81E7064); + InitMenuWindow(&gWindowTemplate_81E7064); gMain.state++; break; case 4: @@ -3205,8 +3205,8 @@ static void Task_InitCryScreenMultistep(u8 taskId) gMain.state++; break; case 3: - SetUpWindowConfig(&gWindowConfig_81E702C); - InitMenuWindow(&gWindowConfig_81E702C); + SetUpWindowConfig(&gWindowTemplate_81E702C); + InitMenuWindow(&gWindowTemplate_81E702C); ResetPaletteFade(); gMain.state++; break; @@ -3394,8 +3394,8 @@ static void Task_InitSizeScreenMultistep(u8 taskId) { u8 string[40]; //I hope this is the correct size - SetUpWindowConfig(&gWindowConfig_81E702C); - InitMenuWindow(&gWindowConfig_81E702C); + SetUpWindowConfig(&gWindowTemplate_81E702C); + InitMenuWindow(&gWindowTemplate_81E702C); string[0] = EOS; StringAppend(string, gDexText_SizeComparedTo); StringAppend(string, gSaveBlock2.playerName); @@ -3841,8 +3841,8 @@ static void sub_8090750(u8 taskId) gTasks[taskId].data[0]++; break; case 2: - SetUpWindowConfig(&gWindowConfig_81E7064); - InitMenuWindow(&gWindowConfig_81E7064); + SetUpWindowConfig(&gWindowTemplate_81E7064); + InitMenuWindow(&gWindowTemplate_81E7064); DmaClear16(3, (void *)(VRAM + 0xC000), 0x200); gTasks[taskId].data[0]++; break; @@ -4770,8 +4770,8 @@ static void sub_8091E54(u8 taskId) } break; case 1: - SetUpWindowConfig(&gWindowConfig_81E7064); - InitMenuWindow(&gWindowConfig_81E7064); + SetUpWindowConfig(&gWindowTemplate_81E7064); + InitMenuWindow(&gWindowTemplate_81E7064); LoadCompressedObjectPic(&gUnknown_083A05CC[0]); LoadSpritePalettes(gUnknown_083A05DC); sub_809308C(taskId); diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index 0887c6648..e448c9ed3 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -718,11 +718,11 @@ bool8 sub_809DA84(void) gMain.state++; break; case 5: - SetUpWindowConfig(&gWindowConfig_81E6E6C); + SetUpWindowConfig(&gWindowTemplate_81E6E6C); gMain.state++; break; case 6: - MultistepInitMenuWindowBegin(&gWindowConfig_81E6E6C); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E6E6C); gMain.state++; break; case 7: diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 411a20f79..43c9475ca 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -3268,10 +3268,10 @@ bool8 sub_80EF284(u8 a) sub_80EEDE8(); break; case 1: - SetUpWindowConfig(&gWindowConfig_81E7224); + SetUpWindowConfig(&gWindowTemplate_81E7224); break; case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E7224); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E7224); break; case 3: if (!MultistepInitMenuWindowContinue()) @@ -3660,10 +3660,10 @@ bool8 sub_80EF874(void) sub_80EEDE8(); break; case 1: - SetUpWindowConfig(&gWindowConfig_81E7224); + SetUpWindowConfig(&gWindowTemplate_81E7224); break; case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E7224); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E7224); break; case 3: if (!MultistepInitMenuWindowContinue()) @@ -3972,10 +3972,10 @@ bool8 sub_80EFF68(void) gUnknown_083DFEC4->unkD162[0] = 11; break; case 1: - SetUpWindowConfig(&gWindowConfig_81E7080); + SetUpWindowConfig(&gWindowTemplate_81E7080); break; case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E7080); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E7080); break; case 3: if (!MultistepInitMenuWindowContinue()) @@ -4086,10 +4086,10 @@ bool8 sub_80F02A0(void) gUnknown_083DFEC4->unkD162[0] = 11; break; case 1: - SetUpWindowConfig(&gWindowConfig_81E70D4); + SetUpWindowConfig(&gWindowTemplate_81E70D4); break; case 2: - MultistepInitMenuWindowBegin(&gWindowConfig_81E70D4); + MultistepInitMenuWindowBegin(&gWindowTemplate_81E70D4); break; case 3: if (!MultistepInitMenuWindowContinue()) @@ -4268,17 +4268,17 @@ _080F0338: .4byte 0x000087ca\n\ _080F033C: .4byte 0x000087c8\n\ _080F0340: .4byte 0x0000d162\n\ _080F0344:\n\ - ldr r0, _080F034C @ =gWindowConfig_81E70D4\n\ + ldr r0, _080F034C @ =gWindowTemplate_81E70D4\n\ bl SetUpWindowConfig\n\ b _080F0618\n\ .align 2, 0\n\ -_080F034C: .4byte gWindowConfig_81E70D4\n\ +_080F034C: .4byte gWindowTemplate_81E70D4\n\ _080F0350:\n\ - ldr r0, _080F0358 @ =gWindowConfig_81E70D4\n\ + ldr r0, _080F0358 @ =gWindowTemplate_81E70D4\n\ bl MultistepInitMenuWindowBegin\n\ b _080F0618\n\ .align 2, 0\n\ -_080F0358: .4byte gWindowConfig_81E70D4\n\ +_080F0358: .4byte gWindowTemplate_81E70D4\n\ _080F035C:\n\ bl MultistepInitMenuWindowContinue\n\ cmp r0, 0\n\ diff --git a/src/roulette.c b/src/roulette.c index 0253a6bb8..950cbdbb1 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -596,8 +596,8 @@ void sub_8115384(void) gMain.state++; break; case 0x2: - SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6C3C); + InitMenuWindow(&gWindowTemplate_81E6CE4); LoadPalette(&gUnknown_083F86BC, 0x0, 0x1C0); gMain.state++; break; diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index d1ab2d512..32a48fd36 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -215,7 +215,7 @@ extern u8 byte_3002A68; extern const u8 gUnknown_08E6C100[]; extern const u8 gUnknown_08E6C920[]; extern const u8 gUnknown_08E6D354[]; -extern const struct WindowTemplate gWindowConfig_81E6F68; +extern const struct WindowTemplate gWindowTemplate_81E6F68; extern const u8 *const gPokeblockNames[]; extern const struct Berry gBerries[]; @@ -957,8 +957,8 @@ static void sub_804E56C(void) ResetSpriteData(); FreeAllSpritePalettes(); SetVBlankCallback(NULL); - SetUpWindowConfig(&gWindowConfig_81E6F68); - InitMenuWindow(&gWindowConfig_81E6F68); + SetUpWindowConfig(&gWindowTemplate_81E6F68); + InitMenuWindow(&gWindowTemplate_81E6F68); gBerryBlenderData->field_0++; gBerryBlenderData->field_140 = 0; gBerryBlenderData->field_13E = 0; @@ -1135,8 +1135,8 @@ static void sub_804E9F8(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB0_BerryBlender); - SetUpWindowConfig(&gWindowConfig_81E6F68); - InitMenuWindow(&gWindowConfig_81E6F68); + SetUpWindowConfig(&gWindowTemplate_81E6F68); + InitMenuWindow(&gWindowTemplate_81E6F68); gLinkType = 0x4422; gBerryBlenderData->field_0++; gBerryBlenderData->field_4E = 0; @@ -1338,8 +1338,8 @@ static void sub_804F0F4(void) SetVBlankCallback(VBlankCB0_BerryBlender); - SetUpWindowConfig(&gWindowConfig_81E6F68); - InitMenuWindow(&gWindowConfig_81E6F68); + SetUpWindowConfig(&gWindowTemplate_81E6F68); + InitMenuWindow(&gWindowTemplate_81E6F68); gLinkType = 0x4422; @@ -3606,8 +3606,8 @@ void unref_sub_80524BC(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB1_BerryBlender); - SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindow(&gWindowConfig_81E6CE4); + SetUpWindowConfig(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); SeedRng(gMain.vblankCounter1); REG_DISPCNT = 0x1540; RunTasks(); diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c index 442d8ec26..de9063823 100644 --- a/src/scene/contest_painting.c +++ b/src/scene/contest_painting.c @@ -243,8 +243,8 @@ static void HoldContestPainting(void) static void ContestPaintingInitWindow(u8 arg0) { - InitMenuWindow(&gWindowConfig_81E7160); - SetUpWindowConfig(&gWindowConfig_81E7160); + InitMenuWindow(&gWindowTemplate_81E7160); + SetUpWindowConfig(&gWindowTemplate_81E7160); } static void ContestPaintingPrintCaption(u8 contestType, u8 arg1) diff --git a/src/scene/credits.c b/src/scene/credits.c index 54b517a91..f113fe965 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -474,8 +474,8 @@ void sub_81439D0(void) taskIdC = gTasks[taskIdA].data[TDA_TASK_C_ID]; gTasks[taskIdC].data[TDC_0] = 40; - SetUpWindowConfig(&gWindowConfig_81E7208); - InitMenuWindow(&gWindowConfig_81E7208); + SetUpWindowConfig(&gWindowTemplate_81E7208); + InitMenuWindow(&gWindowTemplate_81E7208); LoadPalette(&gUnknown_0840B7BC, 0x80, sizeof(gUnknown_0840B7BC)); CpuCopy16(&gUnknown_0840B7FC, (void *)(VRAM + 0xBEE0), sizeof(gUnknown_0840B7FC)); diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index 8d961ad1f..e76f5b47c 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -471,8 +471,8 @@ static void CB2_EggHatch_0(void) gSpecialVar_0x8005 = GetCurrentMapMusic(); break; case 1: - SetUpWindowConfig(&gWindowConfig_81E6F84); - Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowConfig_81E6F84); + SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowTemplate_81E6F84); gEggHatchData->tileDataStartOffset = TextWindow_SetBaseTileNum(20); TextWindow_LoadStdFrameGraphics(&gEggHatchData->window); gMain.state++; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 323313fc2..571b8ab8d 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -197,7 +197,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, REG_WININ = 0; REG_WINOUT = 0; - SetUpWindowConfig(&gWindowConfig_81E6C58); + SetUpWindowConfig(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; @@ -209,7 +209,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); @@ -306,7 +306,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) REG_WIN1V = 0; REG_WININ = 0; REG_WINOUT = 0; - SetUpWindowConfig(&gWindowConfig_81E6C58); + SetUpWindowConfig(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -317,7 +317,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gUnknown_030041B0 = 256; gUnknown_030041B8 = 0; - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowConfig_81E6C58); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); gBattleTerrain = BATTLE_TERRAIN_PLAIN; sub_800D6D4(); @@ -373,8 +373,8 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMain.state++; break; case 1: - SetUpWindowConfig(&gWindowConfig_81E6F84); - Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowConfig_81E6F84); + SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84); gMain.state++; break; case 2: diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index ae2ff5f87..4f8124ace 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -582,8 +582,8 @@ static void sub_81422B8(u8 taskID) static void sub_81422E8(u8 taskID) { - SetUpWindowConfig(&gWindowConfig_81E7198); - InitMenuWindow(&gWindowConfig_81E7198); + SetUpWindowConfig(&gWindowTemplate_81E7198); + InitMenuWindow(&gWindowTemplate_81E7198); gTasks[taskID].func = sub_8142320; } @@ -714,8 +714,8 @@ static void sub_81426F8(u8 taskID) static void sub_8142738(u8 taskID) { REG_DISPCNT = 0x1940; - SetUpWindowConfig(&gWindowConfig_81E71B4); - InitMenuWindow(&gWindowConfig_81E71B4); + SetUpWindowConfig(&gWindowTemplate_81E71B4); + InitMenuWindow(&gWindowTemplate_81E71B4); gTasks[taskID].tPlayerSpriteID = HallOfFame_LoadTrainerPic(gSaveBlock2.playerGender, 120, 72, 6); gTasks[taskID].tFrameCount = 120; @@ -864,8 +864,8 @@ static void sub_8142A28(u8 taskID) *(vram1 + i) = i + 3; *(vram2 + i) = i + 20; } - SetUpWindowConfig(&gWindowConfig_81E7198); - InitMenuWindow(&gWindowConfig_81E7198); + SetUpWindowConfig(&gWindowTemplate_81E7198); + InitMenuWindow(&gWindowTemplate_81E7198); gTasks[taskID].func = sub_8142B04; } } @@ -1285,8 +1285,8 @@ static void sub_8143570(void) gReservedSpritePaletteCount = 8; LoadCompressedObjectPic(&sHallOfFame_ConfettiSpriteSheet); LoadCompressedObjectPalette(&sHallOfFame_ConfettiSpritePalette); - SetUpWindowConfig(&gWindowConfig_81E71B4); - InitMenuWindow(&gWindowConfig_81E71B4); + SetUpWindowConfig(&gWindowTemplate_81E71B4); + InitMenuWindow(&gWindowTemplate_81E71B4); } static void sub_81435B8(void) -- cgit v1.2.3 From 2dd85b9f853f7d6774faaf52d908961695b3b112 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 9 Jan 2018 01:22:35 -0500 Subject: scrub ld_script for bloat --- include/config.h | 2 +- ld_script.txt | 40 ---------------------------------------- sym_bss.txt | 36 ------------------------------------ 3 files changed, 1 insertion(+), 77 deletions(-) diff --git a/include/config.h b/include/config.h index 796da359c..bd2ad3356 100644 --- a/include/config.h +++ b/include/config.h @@ -14,7 +14,7 @@ // authoritative. These additions are for user convenience based on // officially recommended SDK practices for debugging and is therefore // still in part authoritative. -#define NDEBUG +// #define NDEBUG // To enable print debugging, comment out "#define NDEBUG". This allows // the various AGBPrint functions to be used. (See include/gba/isagbprint.h). diff --git a/ld_script.txt b/ld_script.txt index 1e858cd69..6ae35f8df 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -11,44 +11,6 @@ SECTIONS { { - tools/agbcc/lib/libc.a:memcpy.o(.data); - tools/agbcc/lib/libc.a:memset.o(.data); - tools/agbcc/lib/libc.a:strcmp.o(.data); - tools/agbcc/lib/libc.a:strcpy.o(.data); - tools/agbcc/lib/libc.a:impure.o(.data); - tools/agbcc/lib/libc.a:vsprintf.o(.data); - tools/agbcc/lib/libc.a:vfprintf.o(.data); - tools/agbcc/lib/libc.a:wsetup.o(.data); - tools/agbcc/lib/libc.a:dtoa.o(.data); - tools/agbcc/lib/libc.a:fflush.o(.data); - tools/agbcc/lib/libc.a:findfp.o(.data); - tools/agbcc/lib/libc.a:freer.o(.data); - tools/agbcc/lib/libc.a:mtrim.o(.data); - tools/agbcc/lib/libc.a:fvwrite.o(.data); - tools/agbcc/lib/libc.a:fwalk.o(.data); - tools/agbcc/lib/libc.a:locale.o(.data); - tools/agbcc/lib/libc.a:makebuf.o(.data); - tools/agbcc/lib/libc.a:mallocr.o(.data); - tools/agbcc/lib/libc.a:mbtowc_r.o(.data); - tools/agbcc/lib/libc.a:memchr.o(.data); - tools/agbcc/lib/libc.a:memmove.o(.data); - tools/agbcc/lib/libc.a:mlock.o(.data); - tools/agbcc/lib/libc.a:mprec.o(.data); - tools/agbcc/lib/libc.a:s_isinf.o(.data); - tools/agbcc/lib/libc.a:s_isnan.o(.data); - tools/agbcc/lib/libc.a:sbrkr.o(.data); - tools/agbcc/lib/libc.a:stdio.o(.data); - tools/agbcc/lib/libc.a:strlen.o(.data); - tools/agbcc/lib/libc.a:syscalls.o(.data); - tools/agbcc/lib/libc.a:writer.o(.data); - tools/agbcc/lib/libc.a:callocr.o(.data); - tools/agbcc/lib/libc.a:closer.o(.data); - tools/agbcc/lib/libc.a:errno.o(.data); - tools/agbcc/lib/libc.a:fstatr.o(.data); - tools/agbcc/lib/libc.a:libcfunc.o(.data); - tools/agbcc/lib/libc.a:lseekr.o(.data); - tools/agbcc/lib/libc.a:readr.o(.data); - . = 0x40000; } @@ -62,7 +24,6 @@ SECTIONS { /* .bss.code starts at 0x3000F60 */ src/libs/m4a_2.o(.bss.code); - tools/agbcc/lib/libc.a:syscalls.o(.bss); /* COMMON starts at 0x3001760 */ @@ -1111,7 +1072,6 @@ SECTIONS { tools/agbcc/lib/libgcc.a:_udivdi3.o(.rodata); tools/agbcc/lib/libc.a(.rodata); tools/agbcc/lib/libc.a(.data); - tools/agbcc/lib/libc.a:syscalls.o(.rodata); src/libs/libisagbprn.o(.rodata); } =0 diff --git a/sym_bss.txt b/sym_bss.txt index 6e96a604c..16df5cef2 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -39,40 +39,4 @@ .include "src/libs/siirtc.o" .include "tools/agbcc/lib/libgcc.a:dp-bit.o" .include "tools/agbcc/lib/libgcc.a:fp-bit.o" - .include "tools/agbcc/lib/libc.a:memcpy.o" - .include "tools/agbcc/lib/libc.a:memset.o" - .include "tools/agbcc/lib/libc.a:strcmp.o" - .include "tools/agbcc/lib/libc.a:strcpy.o" - .include "tools/agbcc/lib/libc.a:impure.o" - .include "tools/agbcc/lib/libc.a:vsprintf.o" - .include "tools/agbcc/lib/libc.a:vfprintf.o" - .include "tools/agbcc/lib/libc.a:wsetup.o" - .include "tools/agbcc/lib/libc.a:dtoa.o" - .include "tools/agbcc/lib/libc.a:fflush.o" - .include "tools/agbcc/lib/libc.a:findfp.o" - .include "tools/agbcc/lib/libc.a:freer.o" - .include "tools/agbcc/lib/libc.a:mtrim.o" - .include "tools/agbcc/lib/libc.a:fvwrite.o" - .include "tools/agbcc/lib/libc.a:fwalk.o" - .include "tools/agbcc/lib/libc.a:locale.o" - .include "tools/agbcc/lib/libc.a:makebuf.o" - .include "tools/agbcc/lib/libc.a:mallocr.o" - .include "tools/agbcc/lib/libc.a:mbtowc_r.o" - .include "tools/agbcc/lib/libc.a:memchr.o" - .include "tools/agbcc/lib/libc.a:memmove.o" - .include "tools/agbcc/lib/libc.a:mlock.o" - .include "tools/agbcc/lib/libc.a:mprec.o" - .include "tools/agbcc/lib/libc.a:s_isinf.o" - .include "tools/agbcc/lib/libc.a:s_isnan.o" - .include "tools/agbcc/lib/libc.a:sbrkr.o" - .include "tools/agbcc/lib/libc.a:stdio.o" - .include "tools/agbcc/lib/libc.a:strlen.o" .include "tools/agbcc/lib/libc.a:syscalls.o" - .include "tools/agbcc/lib/libc.a:writer.o" - .include "tools/agbcc/lib/libc.a:callocr.o" - .include "tools/agbcc/lib/libc.a:closer.o" - .include "tools/agbcc/lib/libc.a:errno.o" - .include "tools/agbcc/lib/libc.a:fstatr.o" - .include "tools/agbcc/lib/libc.a:libcfunc.o" - .include "tools/agbcc/lib/libc.a:lseekr.o" - .include "tools/agbcc/lib/libc.a:readr.o" -- cgit v1.2.3 From fc66800520a28a6940cee922b60074da1d624157 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 9 Jan 2018 01:23:11 -0500 Subject: you idiot, leave NDEBUG defined --- include/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index bd2ad3356..796da359c 100644 --- a/include/config.h +++ b/include/config.h @@ -14,7 +14,7 @@ // authoritative. These additions are for user convenience based on // officially recommended SDK practices for debugging and is therefore // still in part authoritative. -// #define NDEBUG +#define NDEBUG // To enable print debugging, comment out "#define NDEBUG". This allows // the various AGBPrint functions to be used. (See include/gba/isagbprint.h). -- cgit v1.2.3 From 6503d0fee3d9423640f563745692af35f7298c8b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 10:09:55 -0500 Subject: through sub_8097E70; split PSS in 3 --- asm/pokemon_storage_system.s | 118 --- data/pokemon_storage_system.s | 70 -- include/graphics.h | 5 + include/pokemon_storage_system.h | 120 +++ include/text.h | 2 + ld_script.txt | 6 +- src/pokemon/pokemon_storage_system.c | 1553 ------------------------------- src/pokemon/pokemon_storage_system_2.c | 1566 ++++++++++++++++++++++++++++++++ src/pokemon/pokemon_storage_system_3.c | 16 + src/pokemon/pokemon_summary_screen.c | 29 +- src/pokenav_before.c | 1 - sym_ewram.txt | 5 +- 12 files changed, 1730 insertions(+), 1761 deletions(-) create mode 100644 src/pokemon/pokemon_storage_system_2.c create mode 100644 src/pokemon/pokemon_storage_system_3.c diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 6b4ccbc06..bd1007f5d 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,124 +5,6 @@ .text - thumb_func_start sub_8097E44 -sub_8097E44: @ 8097E44 - push {lr} - ldr r1, _08097E6C @ =gSharedMem - ldrb r0, [r1, 0x7] - adds r0, 0x1 - strb r0, [r1, 0x7] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _08097E66 - movs r0, 0 - strb r0, [r1, 0x7] - ldrh r0, [r1, 0x8] - subs r0, 0x1 - strh r0, [r1, 0x8] - ldrh r0, [r1, 0xA] - adds r0, 0x1 - strh r0, [r1, 0xA] -_08097E66: - pop {r0} - bx r0 - .align 2, 0 -_08097E6C: .4byte gSharedMem - thumb_func_end sub_8097E44 - - thumb_func_start sub_8097E70 -sub_8097E70: @ 8097E70 - push {r4,lr} - sub sp, 0x10 - ldr r0, _08097F2C @ =gPSSMenuHeader_Gfx - ldr r1, _08097F30 @ =0x06005000 - bl LZ77UnCompVram - ldr r0, _08097F34 @ =gPSSMenuHeader_Tilemap - ldr r4, _08097F38 @ =gUnknown_02039760 - adds r1, r4, 0 - bl LZ77UnCompWram - ldr r0, _08097F3C @ =0x06007800 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r1, 0xA - str r1, [sp, 0x8] - movs r1, 0x14 - str r1, [sp, 0xC] - movs r1, 0 - movs r2, 0 - adds r3, r4, 0 - bl sub_809D034 - ldr r0, _08097F40 @ =gPSSMenu1_Pal - movs r1, 0x10 - movs r2, 0x20 - bl LoadPalette - ldr r0, _08097F44 @ =gPSSMenu2_Pal - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, _08097F48 @ =gUnknown_083B6D74 - movs r1, 0xB0 - movs r2, 0x20 - bl LoadPalette - ldr r0, _08097F4C @ =gUnknown_083B6D94 - movs r1, 0xC0 - movs r2, 0x20 - bl LoadPalette - ldr r4, _08097F50 @ =gUnknownPalette_81E6692+0x2 - adds r0, r4, 0 - movs r1, 0xF1 - movs r2, 0x2 - bl LoadPalette - adds r0, r4, 0 - movs r1, 0xF2 - movs r2, 0x2 - bl LoadPalette - adds r0, r4, 0 - adds r0, 0x8 - movs r1, 0xF3 - movs r2, 0x2 - bl LoadPalette - adds r0, r4, 0 - adds r0, 0x16 - movs r1, 0xF4 - movs r2, 0x4 - bl LoadPalette - adds r0, r4, 0 - adds r0, 0x12 - movs r1, 0xF6 - movs r2, 0x4 - bl LoadPalette - adds r4, 0x2 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x2 - bl LoadPalette - ldr r0, _08097F54 @ =gWaveformSpritePalette - bl LoadSpritePalette - bl sub_80980D4 - bl sub_8097F58 - bl sub_8097FB8 - bl sub_809801C - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097F2C: .4byte gPSSMenuHeader_Gfx -_08097F30: .4byte 0x06005000 -_08097F34: .4byte gPSSMenuHeader_Tilemap -_08097F38: .4byte gUnknown_02039760 -_08097F3C: .4byte 0x06007800 -_08097F40: .4byte gPSSMenu1_Pal -_08097F44: .4byte gPSSMenu2_Pal -_08097F48: .4byte gUnknown_083B6D74 -_08097F4C: .4byte gUnknown_083B6D94 -_08097F50: .4byte gUnknownPalette_81E6692+0x2 -_08097F54: .4byte gWaveformSpritePalette - thumb_func_end sub_8097E70 - thumb_func_start sub_8097F58 sub_8097F58: @ 8097F58 push {r4,lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 4a59bb504..d21bc324f 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,76 +3,6 @@ .section .rodata - .align 2 -WaveformPalette: @ 83B6B94 - .incbin "graphics/pokemon_storage/waveform.gbapal" - - .align 2 -WaveformTiles: @ 83B6BB4 - .incbin "graphics/pokemon_storage/waveform.4bpp" - - .align 2 -gUnknown_083B6D74:: @ 83B6D74 - .incbin "graphics/pokemon_storage/83B6D74.gbapal" - - .align 2 -gUnknown_083B6D94:: @ 83B6D94 - .incbin "graphics/pokemon_storage/83B6D94.gbapal" - - .align 2 -gPokemonStorageSystemPtr:: @ 83B6DB4 - .4byte gSharedMem - - .align 2 -gUnknown_083B6DB8:: @ 83B6DB8 - .4byte gTileBuffer - - .align 2 -gWaveformSpritePalette:: @ 83B6DBC - obj_pal WaveformPalette, 56013 - - .align 2 -gWaveformSpriteSheet:: @ 83B6DC4 - obj_tiles WaveformTiles, 0x1C0, 5 - - .align 2 -gUnknown_083B6DCC:: @ 83B6DCC - obj_tiles gSharedMem + 0x2784, 0x800, 2 - - .align 2 -gUnknown_083B6DD4:: @ 83B6DD4 - obj_pal gSharedMem + 0x2704, 56007 - - .align 2 -gSpriteTemplate_83B6DDC:: @ 83B6DDC - spr_template 2, 56007, gOamData_83B6EAC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gPCStorageActionTexts:: @ 83B6DF4 - .4byte PCText_ExitBox, 0 - .4byte PCText_WhatYouDo, 0 - .4byte PCText_PickATheme, 0 - .4byte PCText_PickAWallpaper, 0 - .4byte PCText_IsSelected, 1 - .4byte PCText_JumpToWhichBox, 0 - .4byte PCText_DepositInWhichBox, 0 - .4byte PCText_WasDeposited, 1 - .4byte PCText_BoxIsFull, 0 - .4byte PCText_ReleasePoke, 0 - .4byte PCText_WasReleased, 4 - .4byte PCText_ByeBye, 6 - .4byte PCText_MarkPoke, 0 - .4byte PCText_LastPoke, 0 - .4byte PCText_PartyFull, 0 - .4byte PCText_HoldingPoke, 0 - .4byte PCText_WhichOneWillTake, 0 - .4byte PCText_CantReleaseEgg, 0 - .4byte PCText_ContinueBox, 0 - .4byte PCText_CameBack, 1 - .4byte PCText_Worried, 0 - .4byte PCText_Surprise, 0 - .4byte PCText_PleaseRemoveMail, 0 - .align 2 gOamData_83B6EAC:: @ 83B6EAC .2byte 0x0000 diff --git a/include/graphics.h b/include/graphics.h index 00a210350..91ba45acd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2743,4 +2743,9 @@ extern const u16 gCableCar_Pal[]; extern const u16 gCableCarBG_Pal[]; extern const u8 gCableCarBG_Gfx[]; +extern const u8 gPSSMenuHeader_Gfx[]; +extern const u8 gPSSMenuHeader_Tilemap[]; +extern const u16 gPSSMenu1_Pal[]; +extern const u16 gPSSMenu2_Pal[]; + #endif // GUARD_GRAPHICS_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9fe3436ef..51ebda88f 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -1,8 +1,128 @@ #ifndef GUARD_POKEMON_STORAGE_SYSTEM_H #define GUARD_POKEMON_STORAGE_SYSTEM_H +#include "pc_screen_effect.h" +#include "mon_markings.h" + +enum { + PC_TEXT_EXIT_BOX, + PC_TEXT_WHAT_YOU_DO, + PC_TEXT_PICK_A_THEME, + PC_TEXT_PICK_A_WALLPAPER, + PC_TEXT_IS_SELECTED, + PC_TEXT_JUMP_TO_WHICH_BOX, + PC_TEXT_DEPOSIT_IN_WHICH_BOX, + PC_TEXT_WAS_DEPOSITED, + PC_TEXT_BOX_IS_FULL, + PC_TEXT_RELEASE_POKE, + PC_TEXT_WAS_RELEASED, + PC_TEXT_BYE_BYE, + PC_TEXT_MARK_POKE, + PC_TEXT_LAST_POKE, + PC_TEXT_PARTY_FULL, + PC_TEXT_HOLDING_POKE, + PC_TEXT_WHICH_ONE_WILL_TAKE, + PC_TEXT_CANT_RELEASE_EGG, + PC_TEXT_CONTINUE_BOX, + PC_TEXT_CAME_BACK, + PC_TEXT_WORRIED, + PC_TEXT_SURPRISE, + PC_TEXT_PLEASE_REMOVE_MAIL +}; + +enum { + PC_TEXT_FMT_NORMAL, + PC_TEXT_FMT_MON_NAME, + PC_TEXT_FMT_UNK_02, + PC_TEXT_FMT_UNK_03, + PC_TEXT_FMT_MON_NAME_2, + PC_TEXT_FMT_UNK_05, + PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK +}; + +struct StorageAction { + const u8 *text; + u8 format; +}; + +struct PSS_MenuStringPtrs { + const u8 *text; + const u8 *desc; +}; + +struct UnkStruct_2000020 { + struct UnkStruct_2000020 *unk_00; + u8 unk_04; + u8 unk_05; +}; + +struct UnkPSSStruct_2002370 { + struct Sprite *unk_0000; + struct Sprite *unk_0004[4]; + u32 unk_0014[3]; + struct Sprite *unk_0020[2]; + u8 filler_0028[0x214]; + u8 curBox; + u8 unk_023d; + u8 unk_023e; + u16 unk_0240; + u16 unk_0242; +}; // 0244 + +struct PokemonStorageSystemData { + void (*unk_0000)(void); + u8 unk_0004; + u8 unk_0005; + u8 unk_0006; + u8 unk_0007; + u16 unk_0008; + u16 unk_000a; + struct PCScreenEffectStruct unk_000c; + struct UnkStruct_2000020 unk_0020[274]; // refine size later + u8 filler_08b0[2]; + s16 unk_08b2; + u16 unk_08b4; + u8 filler_08b6[0x4a8]; + s16 unk_0d5e; + s16 unk_0d60; + u8 filler_0d62[0x490]; + u16 unk_11f2; + u8 filler_11f4[2]; + u8 unk_11f6; + u8 unk_11f7; + u8 unk_11f8; + u8 unk_11f9; + u8 unk_11fa[0xc2]; + struct PokemonMarkMenu unk_12bc; + struct UnkPSSStruct_2002370 unk_2370; + u8 filler_25b4[0xd8]; + u8 unk_268c; + u8 unk_268d; + u8 unk_268e; + struct Pokemon *unk_2690; + u8 unk_2694[18]; + u8 unk_26a6[62]; + u8 unk_26e4[0x20]; + u16 unk_2704[0x40]; + u8 unk_2784[0x800]; +}; + +extern EWRAM_DATA u16 gUnknown_02039760[0x600]; + +extern struct PokemonStorageSystemData *const gPokemonStorageSystemPtr; +extern u8 *const gUnknown_083B6DB8; + +void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3); +void sub_809634C(u8 curBox); +u8 sub_8096368(void); +void sub_809635C(void); +void sub_8096310(void); +void sub_80961A8(void); + +void task_intro_29(u8 whichMenu); void ResetPokemonStorageSystem(void); void BoxMonRestorePP(struct BoxPokemon *); void party_compaction(void); +struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/include/text.h b/include/text.h index ebc4ebe7e..281a0535a 100644 --- a/include/text.h +++ b/include/text.h @@ -253,4 +253,6 @@ void StripExtCtrlCodes(u8 *str); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); u8 sub_8004FD0(struct Window *win, u8 *dest, const u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 width, u32 a8); +extern const u16 gUnknownPalette_81E6692[]; + #endif // GUARD_TEXT_H diff --git a/ld_script.txt b/ld_script.txt index 898c5ae88..2157e6da5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -128,8 +128,10 @@ SECTIONS { src/battle/battle_party_menu.o(.text); asm/unk_text_8095904.o(.text); src/pokemon/pokemon_storage_system.o(.text); + src/pokemon/pokemon_storage_system_2.o(.text); asm/pokemon_storage_system.o(.text); - src/pokemon/pokemon_storage_system.o(.text.8098898); + src/pokemon/pokemon_storage_system_2.o(.text.8098898); + src/pokemon/pokemon_storage_system_3.o(.text); asm/pokemon_storage_system.o(.text_8098A38); src/pokemon/pokemon_icon.o(.text); src/pokemon/pokemon_summary_screen.o(.text); @@ -511,6 +513,8 @@ SECTIONS { src/engine/trainer_card.o(.rodata); src/battle/battle_party_menu.o(.rodata); src/pokemon/pokemon_storage_system.o(.rodata); + src/pokemon/pokemon_storage_system_2.o(.rodata); + src/pokemon/pokemon_storage_system_3.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon/pokemon_icon.o(.rodata); src/pokemon/pokemon_summary_screen.o(.rodata); diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 5fd43cfb8..c91e45d7a 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -3,123 +3,16 @@ #include "constants/songs.h" #include "sound.h" #include "field_weather.h" -#include "mon_markings.h" #include "overworld.h" -#include "mail_data.h" #include "field_fadetransition.h" #include "menu.h" #include "main.h" #include "strings.h" #include "string_util.h" #include "event_data.h" -#include "ewram.h" #include "script.h" -#include "pokemon_summary_screen.h" -#include "pc_screen_effect.h" -#include "naming_screen.h" #include "pokemon_storage_system.h" -enum { - PC_TEXT_EXIT_BOX, - PC_TEXT_WHAT_YOU_DO, - PC_TEXT_PICK_A_THEME, - PC_TEXT_PICK_A_WALLPAPER, - PC_TEXT_IS_SELECTED, - PC_TEXT_JUMP_TO_WHICH_BOX, - PC_TEXT_DEPOSIT_IN_WHICH_BOX, - PC_TEXT_WAS_DEPOSITED, - PC_TEXT_BOX_IS_FULL, - PC_TEXT_RELEASE_POKE, - PC_TEXT_WAS_RELEASED, - PC_TEXT_BYE_BYE, - PC_TEXT_MARK_POKE, - PC_TEXT_LAST_POKE, - PC_TEXT_PARTY_FULL, - PC_TEXT_HOLDING_POKE, - PC_TEXT_WHICH_ONE_WILL_TAKE, - PC_TEXT_CANT_RELEASE_EGG, - PC_TEXT_CONTINUE_BOX, - PC_TEXT_CAME_BACK, - PC_TEXT_WORRIED, - PC_TEXT_SURPRISE, - PC_TEXT_PLEASE_REMOVE_MAIL -}; - -enum { - PC_TEXT_FMT_NORMAL, - PC_TEXT_FMT_MON_NAME, - PC_TEXT_FMT_UNK_02, - PC_TEXT_FMT_UNK_03, - PC_TEXT_FMT_MON_NAME_2, - PC_TEXT_FMT_UNK_05, - PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK -}; - -struct StorageAction { - u8 *text; - u8 format; -}; - -struct PSS_MenuStringPtrs { - const u8 *text; - const u8 *desc; -}; - -struct UnkStruct_2000020 { - struct UnkStruct_2000020 *unk_00; - u8 unk_04; - u8 unk_05; -}; - -struct UnkPSSStruct_2002370 { - struct Sprite *unk_0000; - struct Sprite *unk_0004[4]; - u32 unk_0014[3]; - struct Sprite *unk_0020[2]; - u8 filler_0028[0x214]; - u8 curBox; - u8 unk_023d; - u8 unk_023e; - u16 unk_0240; - u16 unk_0242; -}; // 0244 - -struct PokemonStorageSystemData { - void (*unk_0000)(void); - u8 unk_0004; - u8 unk_0005; - u8 unk_0006; - u8 unk_0007; - u16 unk_0008; - u16 unk_000a; - struct PCScreenEffectStruct unk_000c; - struct UnkStruct_2000020 unk_0020[274]; // refine size later - u8 filler_08b0[2]; - s16 unk_08b2; - u16 unk_08b4; - u8 filler_08b6[0x4a8]; - s16 unk_0d5e; - s16 unk_0d60; - u8 filler_0d62[0x490]; - u16 unk_11f2; - u8 filler_11f4[2]; - u8 unk_11f6; - u8 unk_11f7; - u8 unk_11f8; - u8 unk_11f9; - u8 unk_11fa[0xc2]; - struct PokemonMarkMenu unk_12bc; - struct UnkPSSStruct_2002370 unk_2370; - u8 filler_25b4[0xd8]; - u8 unk_268c; - u8 unk_268d; - u8 unk_268e; - struct Pokemon *unk_2690; - u8 unk_2694[18]; - u8 unk_26a6[62]; - u8 unk_26e4[80]; -}; - void StorageSystemCreatePrimaryMenu(u8 whichMenu); void sub_80963D0(u8 curBox); void sub_809658C(void); @@ -128,95 +21,6 @@ void sub_809662C(void); void sub_809665C(void); void sub_80966F4(const u8 *sourceString, u16 x, u16 y); void sub_8096784(struct Sprite *sprite); -void task_intro_29(u8 whichMenu); -void sub_8096884(void); -void sub_8096AFC(void); -void sub_8096B38(void); -void SetPSSCallback(void (*func)(void)); -void sub_8096BF0(void); -void sub_8096C68(void); -void sub_8096C84(void); -void sub_8096FC8(void); -void sub_8097004(void); -void sub_8097078(void); -void sub_80972A8(void); -void sub_80972FC(void); -void c3_0808DC50(void); -void sub_8097390(void); -void sub_809746C(void); -void sub_8097594(void); -void sub_8097788(void); -void sub_80977E4(void); -void sub_8097858(void); -void sub_809789C(void); -void sub_8097974(void); -void sub_8097A64(void); -void sub_8097B44(void); -void sub_8097BA0(void); -void sub_8097CC0(void); -void sub_8097DE0(void); -void sub_8097E44(void); -void sub_8097E70(void); -void BoxSetMosaic(void); -void sub_809801C(void); -void sub_8098400(void); -void add_to_c3_somehow(void); -bool8 sub_80985CC(void); -void sub_80986E8(void); -void sub_8098710(void); -void sub_8098734(void); -void sub_80987DC(void); -void sub_809880C(void); -bool8 sub_8098830(void); -void PrintStorageActionText(u8 index); -void sub_8098A38(u8); -void sub_8098A5C(void); -void sub_8098A80(void); -void sub_8098AA8(u8 a0); -void sub_8098B48(void); -void sub_8099310(void); -bool8 sub_8099374(void); -void sub_8099958(void); -bool8 sub_8099990(void); -void sub_809BB90(void); -void sub_8099BF8(u8 a0); -void sub_8099C70(u8 whichBox); -bool8 sub_8099D34(void); -void sub_8099DCC(u8 a0); -bool8 sub_8099E08(void); -void sub_809A860(u8 a0); -struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); -void sub_809AA24(void); -void sub_809AA98(void); -bool8 sub_809AC00(void); -void sub_809B0C0(u8 a0); -void sub_809B0D4(void); -void sub_809B0E0(void); -u8 sub_809B0F4(void); -void sub_809B100(u8 a0); -bool8 sub_809B130(void); -void sub_809B440(void); -bool8 sub_809B62C(u8); -void sub_809B6BC(void); -void sub_809B6DC(void); -bool8 sub_809B734(void); -void sub_809B760(void); -void sub_809B7AC(void); -void sub_809B7D4(void); -s8 sub_809B960(void); -void sub_809BBC0(void); -void sub_809BC18(void); -void sub_809BD14(void); -void sub_809BDD8(u8 markings); -bool8 sub_809BE80(void); -bool8 sub_809BEBC(void); -bool8 sub_809BF20(void); -bool8 sub_809BF48(void); -u8 sub_809CA40(void); -void sub_809CE84(void); -s16 sub_809CF30(void); -void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); -void sub_809CFF0(void); const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { {PCText_WithdrawPoke, PCText_MovePokeToParty}, @@ -267,73 +71,11 @@ const u8 gBoxSelectionPopupCenterTiles[] = INCBIN_U8("graphics/pokemon_storage/b const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp"); -const u16 gPokemonStorageScrollingBGPalette[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.gbapal"); - -const u16 gPokemonStorageScrollingBGTile[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.4bpp"); - -const u8 gPokemonStorageScrollingBGTilemap[] = INCBIN_U8("graphics/pokemon_storage/scrolling_bg_map.bin.lz"); - -const u16 sUnknownTilemap[] = { - 0x1281, - 0x1282, - 0x1283, - 0x1284, - 0x1285, - 0x1286, - 0x1287, - 0x1288, - 0x128C, - 0x128D, - 0x128E, - 0x128F, - 0x1290, - 0x1291, - 0x1292, - 0x1293, - 0x0281, - 0x0282, - 0x0283, - 0x0284, - 0x0285, - 0x0286, - 0x0287, - 0x0288, - 0x028C, - 0x028D, - 0x028E, - 0x028F, - 0x0290, - 0x0291, - 0x0292, - 0x0293, - 0x12AD, - 0x12AE, - 0x12A8, - 0x12A8 -}; - -extern const struct StorageAction gPCStorageActionTexts[]; -extern const struct PokemonStorageSystemData *gPokemonStorageSystemPtr; -extern u8 *const gUnknown_083B6DB8; - EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; EWRAM_DATA u8 gUnknown_02038470[3] = {}; EWRAM_DATA u8 gUnknown_02038473 = 0; EWRAM_DATA u8 gUnknown_02038474 = 0; EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478 = NULL; -EWRAM_DATA u8 gUnknown_0203847C = 0; -EWRAM_DATA u8 gUnknown_0203847D = 0; -EWRAM_DATA u8 gUnknown_0203847E = 0; -EWRAM_DATA u8 gUnknown_0203847F = 0; -EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; -EWRAM_DATA u8 gUnknown_020384E4 = 0; -EWRAM_DATA u8 gUnknown_020384E5 = 0; -EWRAM_DATA u8 gUnknown_020384E6 = 0; -EWRAM_DATA u8 gUnknown_020384E7 = 0; -EWRAM_DATA u8 gUnknown_020384E8 = 0; -EWRAM_DATA u8 gUnknown_020384E9 = 0; -EWRAM_DATA u16 gUnknown_020384EA = 0; -EWRAM_DATA u32 gUnknown_020384EC = 0; static u8 CountPokemonInBoxN(u8 boxId) { @@ -967,1298 +709,3 @@ void sub_8096784(struct Sprite *sprite) } } } - -void task_intro_29(u8 whichMenu) -{ - gUnknown_0203847D = whichMenu; - ePokemonStorageSystem.unk_0005 = whichMenu; - SetMainCallback2(sub_8096884); -} - -void sub_80967DC(void) -{ - REG_BG0HOFS = 0; - REG_BG0VOFS = 0; - REG_BG1HOFS = 0; - REG_BG1VOFS = 0; - REG_BG2VOFS = 0; - REG_BG2HOFS = 0; - REG_BG3HOFS = 0; - REG_BG3VOFS = 0; -} - -void sub_8096804(void) -{ - ResetPaletteFade(); - ResetSpriteData(); - FreeSpriteTileRanges(); - FreeAllSpritePalettes(); - ResetTasks(); - gReservedSpriteTileCount = 0x280; - sub_809CFDC(ePokemonStorageSystem.unk_0020, ePokemonStorageSystem.unk_0020 + 1, 8); - gKeyRepeatStartDelay = 20; -} - -void sub_8096848(void) -{ - sub_809B0D4(); - gUnknown_0203847C = (ePokemonStorageSystem.unk_0005 == 1 ? 1 : 0); - gUnknown_0203847E = 0; -} - -void sub_8096874(void) -{ - REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; -} - -void sub_8096884(void) -{ - switch (gMain.state) - { - case 0: - SetVBlankCallback(NULL); - REG_DISPCNT = 0; - sub_8096804(); - gMain.state++; - break; - case 1: - SetUpWindowConfig(&gWindowConfig_81E6D00); - gMain.state++; - break; - case 2: - InitMenuWindow(&gWindowConfig_81E6D00); - MenuZeroFillScreen(); - gMain.state++; - break; - case 3: - sub_80967DC(); - sub_8096848(); - gMain.state++; - break; - case 4: - sub_8098B48(); - sub_809AA24(); - gMain.state++; - break; - case 5: - sub_8097DE0(); - gMain.state++; - break; - case 6: - sub_8097E70(); - gMain.state++; - break; - case 7: - sub_8098400(); - gMain.state++; - break; - case 8: - sub_8099BF8(gPokemonStorage.currentBox); - ePokemonStorageSystem.unk_12bc.baseTileTag = 0x000a; - ePokemonStorageSystem.unk_12bc.basePaletteTag = 0xdacb; - sub_80F727C(&ePokemonStorageSystem.unk_12bc); - sub_80F7404(); - gMain.state++; - break; - case 9: - sub_8096874(); - SetPSSCallback(sub_8096BF0); - SetMainCallback2(sub_8096B38); - SetVBlankCallback(sub_8096AFC); - gMain.state++; - break; - } -} - -void sub_80969A0(void) -{ - switch (gMain.state) - { - case 0: - SetVBlankCallback(NULL); - REG_DISPCNT = 0x0000; - ePokemonStorageSystem.unk_0005 = gUnknown_0203847D; - sub_8096804(); - if (gUnknown_0203847F == 1) - sub_809BBC0(); - if (gUnknown_0203847F == 0) - sub_809BD14(); - gMain.state++; - break; - case 1: - SetUpWindowConfig(&gWindowConfig_81E6D00); - gMain.state++; - break; - case 2: - InitMenuWindow(&gWindowConfig_81E6D00); - MenuZeroFillScreen(); - gMain.state++; - break; - case 3: - sub_80967DC(); - gMain.state++; - break; - case 4: - sub_8098B48(); - sub_809AA98(); - gMain.state++; - break; - case 5: - sub_8097DE0(); - gMain.state++; - break; - case 6: - sub_8097E70(); - gMain.state++; - break; - case 7: - sub_8098400(); - gMain.state++; - break; - case 8: - sub_8099BF8(gPokemonStorage.currentBox); - ePokemonStorageSystem.unk_12bc.baseTileTag = 0x000a; - ePokemonStorageSystem.unk_12bc.basePaletteTag = 0xdacb; - sub_80F727C(&ePokemonStorageSystem.unk_12bc); - sub_80F7404(); - gMain.state++; - break; - case 9: - BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); - SetVBlankCallback(sub_8096AFC); - gMain.state++; - break; - case 10: - sub_8096874(); - SetPSSCallback(sub_8096C68); - SetMainCallback2(sub_8096B38); - gMain.state++; - break; - } -} - -void sub_8096AFC(void) -{ - REG_BG2HOFS = ePokemonStorageSystem.unk_08b4; - REG_BG3HOFS = ePokemonStorageSystem.unk_000a; - REG_BG3VOFS = ePokemonStorageSystem.unk_0008; - LoadOam(); - ProcessSpriteCopyRequests(); - sub_809CFF0(); - TransferPlttBuffer(); -} - -void sub_8096B38(void) -{ - ePokemonStorageSystem.unk_0000(); - sub_8097E44(); - sub_8098734(); - AnimateSprites(); - BuildOamBuffer(); -} - -void sub_8096B5C(void) -{ - switch (ePokemonStorageSystem.unk_0006) - { - case 0: - ShowPokemonSummaryScreen(ePokemonStorageSystem.unk_2690, ePokemonStorageSystem.unk_268d, ePokemonStorageSystem.unk_268c, sub_80969A0, ePokemonStorageSystem.unk_268e); - break; - case 1: - DoNamingScreen(1, gPokemonStorage.boxNames[gPokemonStorage.currentBox], 0, 0, 0, sub_80969A0); - break; - } -} - -void SetPSSCallback(void (*func)(void)) -{ - ePokemonStorageSystem.unk_0000 = func; - ePokemonStorageSystem.unk_0004 = 0; -} - -void sub_8096BF0(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - BlendPalettes(0xffffffff, 16, 0); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - PlaySE(SE_PC_LOGON); - ePokemonStorageSystem.unk_000c.tileTag = 14; - ePokemonStorageSystem.unk_000c.paletteTag = 0xdad0; - ePokemonStorageSystem.unk_000c.unk04 = 0; - ePokemonStorageSystem.unk_000c.unk06 = 0; - sub_80C5CD4(&ePokemonStorageSystem.unk_000c); - BlendPalettes(0xffffffff, 0, 0); - ePokemonStorageSystem.unk_0004++; - break; - case 2: - if (sub_80C5DCC()) - SetPSSCallback(sub_8096C84); - break; - } -} - -void sub_8096C68(void) -{ - if (!UpdatePaletteFade()) - SetPSSCallback(sub_8096C84); -} - -void sub_8096C84(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - switch (sub_809CA40()) - { - case 1: - PlaySE(SE_SELECT); - ePokemonStorageSystem.unk_0004 = 1; - break; - case 5: - if (ePokemonStorageSystem.unk_0005 != 2) - { - PrintStorageActionText(PC_TEXT_WHICH_ONE_WILL_TAKE); - ePokemonStorageSystem.unk_0004 = 3; - } - else - { - sub_809B0D4(); - SetPSSCallback(sub_8096FC8); - } - break; - case 6: - if (ePokemonStorageSystem.unk_0005 == 2) - { - if (sub_809BF20() && ItemIsMail(ePokemonStorageSystem.unk_11f2)) - { - ePokemonStorageSystem.unk_0004 = 5; - } - else - { - SetPSSCallback(sub_8097004); - } - } - break; - case 4: - SetPSSCallback(sub_8097BA0); - break; - case 16: - SetPSSCallback(sub_8097CC0); - break; - case 7: - PlaySE(SE_SELECT); - SetPSSCallback(sub_809789C); - break; - case 8: - PlaySE(SE_SELECT); - SetPSSCallback(sub_8097078); - break; - case 9: - PlaySE(SE_SELECT); - ePokemonStorageSystem.unk_08b2 = gPokemonStorage.currentBox + 1; - if (ePokemonStorageSystem.unk_08b2 > 13) - ePokemonStorageSystem.unk_08b2 = 0; - sub_8099C70(ePokemonStorageSystem.unk_08b2); - ePokemonStorageSystem.unk_0004 = 2; - break; - case 10: - PlaySE(SE_SELECT); - ePokemonStorageSystem.unk_08b2 = gPokemonStorage.currentBox - 1; - if (ePokemonStorageSystem.unk_08b2 < 0) - ePokemonStorageSystem.unk_08b2 = 13; - sub_8099C70(ePokemonStorageSystem.unk_08b2); - ePokemonStorageSystem.unk_0004 = 2; - break; - case 11: - if (!sub_809BE80()) - { - if (ItemIsMail(ePokemonStorageSystem.unk_11f2)) - { - ePokemonStorageSystem.unk_0004 = 5; - } - else - { - PlaySE(SE_SELECT); - SetPSSCallback(sub_809746C); - } - } - else - { - ePokemonStorageSystem.unk_0004 = 4; - } - break; - case 13: - if (sub_809BE80()) - { - ePokemonStorageSystem.unk_0004 = 4; - } - else - { - PlaySE(SE_SELECT); - SetPSSCallback(sub_80972A8); - } - break; - case 14: - if (!sub_809BEBC()) - { - ePokemonStorageSystem.unk_0004 = 4; - } - else - { - PlaySE(SE_SELECT); - SetPSSCallback(c3_0808DC50); - } - break; - case 12: - PlaySE(SE_SELECT); - SetPSSCallback(sub_8097390); - break; - case 15: - PlaySE(SE_SELECT); - SetPSSCallback(sub_80972FC); - break; - } - break; - case 1: - if (!sub_809AC00()) - { - if (sub_809BF48()) - sub_80986E8(); - else - sub_8098710(); - if (ePokemonStorageSystem.unk_11f6) - BoxSetMosaic(); - ePokemonStorageSystem.unk_0004 = 0; - } - break; - case 2: - if (!sub_8099D34()) - { - gPokemonStorage.currentBox = ePokemonStorageSystem.unk_08b2; - if (!gUnknown_0203847C && !sub_809BF20()) - { - sub_809B440(); - BoxSetMosaic(); - } - ePokemonStorageSystem.unk_0004 = 0; - } - break; - case 3: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) - { - sub_8098A5C(); - ePokemonStorageSystem.unk_0004 = 0; - } - break; - case 4: - PlaySE(SE_HAZURE); - PrintStorageActionText(PC_TEXT_LAST_POKE); - ePokemonStorageSystem.unk_0004 = 6; - break; - case 5: - PlaySE(SE_HAZURE); - PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); - ePokemonStorageSystem.unk_0004 = 6; - break; - case 6: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) - { - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_8096FC8(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - sub_809880C(); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!sub_8098830()) - SetPSSCallback(sub_8096C84); - break; - } -} - -void sub_8097004(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - PlaySE(SE_SELECT); - add_to_c3_somehow(); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!sub_80985CC()) - { - sub_809B0C0(sub_809B0F4()); - ePokemonStorageSystem.unk_0004++; - } - break; - case 2: - if (!sub_809AC00()) - { - if (ePokemonStorageSystem.unk_11f6) - BoxSetMosaic(); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_8097078(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - PrintStorageActionText(PC_TEXT_IS_SELECTED); - sub_809CE84(); - ePokemonStorageSystem.unk_0004 = 1; - break; - case 1: - switch (sub_809CF30()) - { - case -1: - case 0: - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - break; - case 3: - if (sub_809BE80()) - { - ePokemonStorageSystem.unk_0004 = 2; - } - else - { - PlaySE(SE_SELECT); - sub_8098A5C(); - SetPSSCallback(sub_80972A8); - } - break; - case 5: - PlaySE(SE_SELECT); - sub_8098A5C(); - SetPSSCallback(sub_80972FC); - break; - case 4: - if (!sub_809BEBC()) - { - ePokemonStorageSystem.unk_0004 = 2; - } - else - { - PlaySE(SE_SELECT); - sub_8098A5C(); - SetPSSCallback(c3_0808DC50); - } - break; - case 2: - PlaySE(SE_SELECT); - sub_8098A5C(); - SetPSSCallback(sub_8097390); - break; - case 1: - if (sub_809BE80()) - { - ePokemonStorageSystem.unk_0004 = 2; - } - else if (ItemIsMail(ePokemonStorageSystem.unk_11f2)) - { - ePokemonStorageSystem.unk_0004 = 3; - } - else - { - PlaySE(SE_SELECT); - sub_8098A5C(); - SetPSSCallback(sub_809746C); - } - break; - case 7: - if (sub_809BE80()) - { - ePokemonStorageSystem.unk_0004 = 2; - } - else if (ePokemonStorageSystem.unk_11f9) - { - ePokemonStorageSystem.unk_0004 = 4; - } - else if (ItemIsMail(ePokemonStorageSystem.unk_11f2)) - { - ePokemonStorageSystem.unk_0004 = 3; - } - else - { - PlaySE(SE_SELECT); - SetPSSCallback(sub_8097594); - } - break; - case 6: - PlaySE(SE_SELECT); - SetPSSCallback(sub_8097788); - break; - case 8: - PlaySE(SE_SELECT); - SetPSSCallback(sub_80977E4); - break; - } - break; - case 2: - PlaySE(SE_HAZURE); - PrintStorageActionText(PC_TEXT_LAST_POKE); - ePokemonStorageSystem.unk_0004 = 5; - break; - case 4: - PlaySE(SE_HAZURE); - PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG); - ePokemonStorageSystem.unk_0004 = 5; - break; - case 3: - PlaySE(SE_HAZURE); - PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); - ePokemonStorageSystem.unk_0004 = 5; - break; - case 5: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) - { - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_80972A8(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - sub_809B100(0); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!sub_809B130()) - { - if (gUnknown_0203847C) - SetPSSCallback(sub_8097858); - else - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_80972FC(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - sub_809B100(1); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!sub_809B130()) - { - if (gUnknown_0203847C) - SetPSSCallback(sub_8097858); - else - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void c3_0808DC50(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - sub_809B100(2); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!sub_809B130()) - { - BoxSetMosaic(); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_8097390(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - if (CalculatePlayerPartyCount() == 6) - { - PrintStorageActionText(PC_TEXT_PARTY_FULL); - ePokemonStorageSystem.unk_0004 = 1; - } - else - { - sub_809B0E0(); - sub_809B100(0); - ePokemonStorageSystem.unk_0004 = 2; - } - break; - case 1: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) - { - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - } - break; - case 2: - if (!sub_809B130()) - { - sub_809880C(); - ePokemonStorageSystem.unk_0004++; - } - break; - case 3: - if (!sub_8098830()) - { - sub_809B100(1); - ePokemonStorageSystem.unk_0004++; - } - break; - case 4: - if (!sub_809B130()) - { - sub_80987DC(); - ePokemonStorageSystem.unk_0004++; - } - break; - case 5: - SetPSSCallback(sub_8097004); - break; - } -} - -void sub_809746C(void) -{ - u8 r4; - - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); - sub_8096264(&ePokemonStorageSystem.unk_2370, 0x0007, 0xdaca, 3); - sub_809634C(gUnknown_0203847E); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - r4 = sub_8096368(); - if (r4 == 200); - else if (r4 == 201) - { - sub_8098A5C(); - sub_809635C(); - sub_8096310(); - SetPSSCallback(sub_8096C84); - } - else - { - if (sub_809B62C(r4)) - { - sub_8098A5C(); - sub_809635C(); - sub_8096310(); - ePokemonStorageSystem.unk_0004 = 2; - } - else - { - PrintStorageActionText(PC_TEXT_BOX_IS_FULL); - ePokemonStorageSystem.unk_0004 = 4; - } - gUnknown_0203847E = r4; - } - break; - case 2: - party_compaction(); - sub_8099310(); - ePokemonStorageSystem.unk_0004++; - break; - case 3: - if (!sub_8099374()) - { - sub_809B6BC(); - BoxSetMosaic(); - sub_80987DC(); - SetPSSCallback(sub_8096C84); - } - break; - case 4: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); - ePokemonStorageSystem.unk_0004 = 1; - } - break; - } -} - -void sub_8097594(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - PrintStorageActionText(PC_TEXT_RELEASE_POKE); - sub_8098A38(1); - ePokemonStorageSystem.unk_0004++; - // fallthrough - case 1: - switch (ProcessMenuInputNoWrap()) - { - case -1: - case 1: - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - break; - case 0: - sub_8098A5C(); - sub_809B7D4(); - sub_809B6DC(); - ePokemonStorageSystem.unk_0004++; - break; - } - break; - case 2: - sub_809B960(); - if (!sub_809B734()) - { - while (1) - { - s8 r0 = sub_809B960(); - if (r0 == 1) - { - ePokemonStorageSystem.unk_0004++; - break; - } - if (r0 == 0) - { - ePokemonStorageSystem.unk_0004 = 8; - break; - } - } - } - break; - case 3: - sub_809B760(); - sub_809801C(); - PrintStorageActionText(PC_TEXT_WAS_RELEASED); - ePokemonStorageSystem.unk_0004++; - break; - case 4: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - PrintStorageActionText(PC_TEXT_BYE_BYE); - ePokemonStorageSystem.unk_0004++; - } - break; - case 5: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - sub_8098A5C(); - if (gUnknown_0203847C) - { - party_compaction(); - sub_8099310(); - ePokemonStorageSystem.unk_0004++; - } - else - { - ePokemonStorageSystem.unk_0004 = 7; - } - } - break; - case 6: - if (!sub_8099374()) - { - sub_809B440(); - BoxSetMosaic(); - sub_80987DC(); - ePokemonStorageSystem.unk_0004++; - } - break; - case 7: - SetPSSCallback(sub_8096C84); - break; - case 8: - PrintStorageActionText(PC_TEXT_WAS_RELEASED); - ePokemonStorageSystem.unk_0004++; - break; - case 9: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - PrintStorageActionText(PC_TEXT_SURPRISE); - ePokemonStorageSystem.unk_0004++; - } - break; - case 10: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - sub_8098A5C(); - sub_8099958(); - ePokemonStorageSystem.unk_0004++; - } - break; - case 11: - if (!sub_8099990()) - { - sub_809B7AC(); - PrintStorageActionText(PC_TEXT_CAME_BACK); - ePokemonStorageSystem.unk_0004++; - } - break; - case 12: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - PrintStorageActionText(PC_TEXT_WORRIED); - ePokemonStorageSystem.unk_0004++; - } - break; - case 13: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) - { - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_8097788(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - sub_809BC18(); - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!UpdatePaletteFade()) - { - gUnknown_0203847F = 0; - ePokemonStorageSystem.unk_0006 = 0; - SetMainCallback2(sub_8096B5C); - } - break; - } -} - -void sub_80977E4(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - PrintStorageActionText(PC_TEXT_MARK_POKE); - ePokemonStorageSystem.unk_12bc.markings = ePokemonStorageSystem.unk_11f7; - sub_80F7418(ePokemonStorageSystem.unk_11f7, 0xb0, 0x10); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!sub_80F7500()) - { - sub_80F7470(); - sub_8098A5C(); - sub_809BDD8(ePokemonStorageSystem.unk_12bc.markings); - sub_809801C(); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_8097858(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - party_compaction(); - sub_8099310(); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!sub_8099374()) - { - sub_80987DC(); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_809789C(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - PrintStorageActionText(PC_TEXT_WHAT_YOU_DO); - sub_809CE84(); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - switch (sub_809CF30()) - { - case -1: - case 0: - sub_809A860(1); - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - break; - case 11: - PlaySE(SE_SELECT); - SetPSSCallback(sub_8097B44); - break; - case 10: - PlaySE(SE_SELECT); - sub_8098A5C(); - SetPSSCallback(sub_8097974); - break; - case 9: - PlaySE(SE_SELECT); - sub_8098A5C(); - SetPSSCallback(sub_8097A64); - break; - } - break; - } -} - -void sub_8097974(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - sub_8098A80(); - PrintStorageActionText(PC_TEXT_PICK_A_THEME); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - ePokemonStorageSystem.unk_0d5e = sub_809CF30(); - switch (ePokemonStorageSystem.unk_0d5e) - { - case -1: - sub_809A860(1); - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - break; - case 12 ... 15: - PlaySE(SE_SELECT); - ePokemonStorageSystem.unk_0d5e -= 12; - sub_8098AA8(ePokemonStorageSystem.unk_0d5e); - PrintStorageActionText(PC_TEXT_PICK_A_WALLPAPER); - ePokemonStorageSystem.unk_0004++; - break; - } - break; - case 2: - ePokemonStorageSystem.unk_0d60 = sub_809CF30(); - switch (ePokemonStorageSystem.unk_0d60) - { - case -1: - sub_8098A5C(); - ePokemonStorageSystem.unk_0004 = 0; - break; - case -2: - break; - default: - PlaySE(SE_SELECT); - sub_8098A5C(); - ePokemonStorageSystem.unk_0d60 -= 16; - sub_8099DCC(ePokemonStorageSystem.unk_0d60); - ePokemonStorageSystem.unk_0004++; - break; - } - break; - case 3: - if (!sub_8099E08()) - { - sub_809A860(1); - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_8097A64(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - PrintStorageActionText(PC_TEXT_JUMP_TO_WHICH_BOX); - sub_8096264(&ePokemonStorageSystem.unk_2370, 0x0007, 0xdaca, 3); - sub_809634C(gPokemonStorage.currentBox); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - ePokemonStorageSystem.unk_08b2 = sub_8096368(); - switch (ePokemonStorageSystem.unk_08b2) - { - case 200: - break; - default: - sub_8098A5C(); - sub_809635C(); - sub_8096310(); - if (ePokemonStorageSystem.unk_08b2 == 201 || ePokemonStorageSystem.unk_08b2 == gPokemonStorage.currentBox) - { - sub_809A860(1); - SetPSSCallback(sub_8096C84); - } - else - { - ePokemonStorageSystem.unk_0004++; - } - break; - } - break; - case 2: - sub_8099C70(ePokemonStorageSystem.unk_08b2); - ePokemonStorageSystem.unk_0004++; - break; - case 3: - if (!sub_8099D34()) - { - gPokemonStorage.currentBox = ePokemonStorageSystem.unk_08b2; - SetPSSCallback(sub_8096C84); - } - break; - } -} - -void sub_8097B44(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - sub_809BB90(); - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); - ePokemonStorageSystem.unk_0004++; - break; - case 1: - if (!UpdatePaletteFade()) - { - gUnknown_0203847F = 1; - ePokemonStorageSystem.unk_0006 = 1; - SetMainCallback2(sub_8096B5C); - } - break; - } -} - -void sub_8097BA0(void) -{ - switch (ePokemonStorageSystem.unk_0004) - { - case 0: - if (sub_809BF20()) - { - PlaySE(SE_HAZURE); - PrintStorageActionText(PC_TEXT_HOLDING_POKE); - ePokemonStorageSystem.unk_0004 = 1; - } - else - { - PlaySE(SE_SELECT); - PrintStorageActionText(PC_TEXT_EXIT_BOX); - sub_8098A38(0); - ePokemonStorageSystem.unk_0004 = 2; - } - break; - case 1: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) - { - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - } - break; - case 2: - switch (ProcessMenuInputNoWrap()) - { - case 1: - case -1: - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - break; - case 0: - PlaySE(SE_PC_OFF); - sub_8098A5C(); - ePokemonStorageSystem.unk_0004++; - break; - } - break; - case 3: - ePokemonStorageSystem.unk_000c.tileTag = 0x000e; - ePokemonStorageSystem.unk_000c.paletteTag = 0xdad0; - ePokemonStorageSystem.unk_000c.unk04 = 20; - ePokemonStorageSystem.unk_000c.unk06 = 0; - sub_80C5E38(&ePokemonStorageSystem.unk_000c); - ePokemonStorageSystem.unk_0004++; - break; - case 4: - if (sub_80C5F98()) - { - gPlayerPartyCount = CalculatePlayerPartyCount(); - SetMainCallback2(sub_80961A8); - } - break; - } -} - -void sub_8097CC0(void) { - switch (ePokemonStorageSystem.unk_0004) { - case 0: - if (sub_809BF20()) { - PlaySE(SE_HAZURE); - PrintStorageActionText(PC_TEXT_HOLDING_POKE); - ePokemonStorageSystem.unk_0004 = 1; - } - else { - PlaySE(SE_SELECT); - PrintStorageActionText(PC_TEXT_CONTINUE_BOX); - sub_8098A38(0); - ePokemonStorageSystem.unk_0004 = 2; - } - break; - case 1: - if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) { - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - } - break; - case 2: - switch (ProcessMenuInputNoWrap()) { - case 0: - sub_8098A5C(); - SetPSSCallback(sub_8096C84); - break; - case -1: - case 1: - PlaySE(SE_PC_OFF); - sub_8098A5C(); - ePokemonStorageSystem.unk_0004++; - break; - } - break; - case 3: - ePokemonStorageSystem.unk_000c.tileTag = 0x000e; - ePokemonStorageSystem.unk_000c.paletteTag = 0xdad0; - ePokemonStorageSystem.unk_000c.unk04 = 20; - ePokemonStorageSystem.unk_000c.unk06 = 0; - sub_80C5E38(&ePokemonStorageSystem.unk_000c); - ePokemonStorageSystem.unk_0004++; - break; - case 4: - if (sub_80C5F98()) { - gPlayerPartyCount = CalculatePlayerPartyCount(); - SetMainCallback2(sub_80961A8); - } - break; - } -} - -void sub_8097DE0(void) -{ - ePokemonStorageSystem.unk_0007 = 0; - ePokemonStorageSystem.unk_0008 = 0; - ePokemonStorageSystem.unk_000a = 0; - REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(30); - DmaCopy16Defvars(3, gPokemonStorageScrollingBGTile, BG_SCREEN_ADDR(28), sizeof gPokemonStorageScrollingBGTile); - LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, BG_SCREEN_ADDR(30)); - LoadPalette(gPokemonStorageScrollingBGPalette, 0xd0, 0x10); -} - -asm(".section .text.8098898"); - -void PrintStorageActionText(u8 index) { - u8 *ptr; - - MenuDrawTextWindow(10, 16, 29, 19); - - switch (gPCStorageActionTexts[index].format) - { - - case PC_TEXT_FMT_UNK_02: - ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); - ptr = StringCopy(ptr, ePokemonStorageSystem.unk_11fa); - break; - - case PC_TEXT_FMT_UNK_05: - ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); - ptr = StringCopy(ptr, ePokemonStorageSystem.unk_26e4); - break; - - case PC_TEXT_FMT_MON_NAME: - // {var} + " is selected." - ptr = StringCopy(ePokemonStorageSystem.unk_2694, ePokemonStorageSystem.unk_11fa); - ptr = StringCopy(ptr, gPCStorageActionTexts[index].text); - break; - - case PC_TEXT_FMT_MON_NAME_2: - // {var} + " was released." - ptr = StringCopy(ePokemonStorageSystem.unk_2694, ePokemonStorageSystem.unk_26e4); -#if ENGLISH - ptr = StringCopy(ptr, gPCStorageActionTexts[index].text); -#elif GERMAN - ptr = de_sub_8073174(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); -#endif - break; - - case PC_TEXT_FMT_UNK_03: - { - u8 *stringLength; - u8 *text; - - text = gPCStorageActionTexts[index].text; - stringLength = &text[StringLength(text)] + 1; - - ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); - ptr = StringCopy(ptr, ePokemonStorageSystem.unk_11fa); - ptr = StringCopy(ptr, stringLength); - } - break; - - case PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK: - // "Bye-bye, ".substr(0, -1) + {var} + "Bye-bye, !".substr(-1, 1) - { - u8 *stringLength; - u8 *text; - - text = gPCStorageActionTexts[index].text; - stringLength = &text[StringLength(text)] - 1; - - ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); - ptr = StringCopy(ptr - 1, ePokemonStorageSystem.unk_26e4); - ptr = StringCopy(ptr, stringLength); - } - break; - - case PC_TEXT_FMT_NORMAL: - default: - ptr = StringCopy(ePokemonStorageSystem.unk_2694, gPCStorageActionTexts[index].text); - break; - } - - while (ptr < ePokemonStorageSystem.unk_26a6) - { - ptr[0] = CHAR_SPACE; - ptr++; - } - - ptr[0] = EOS; - MenuPrint(ePokemonStorageSystem.unk_2694, 11, 17); -} diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c new file mode 100644 index 000000000..5c72d02e9 --- /dev/null +++ b/src/pokemon/pokemon_storage_system_2.c @@ -0,0 +1,1566 @@ + +// Includes +#include "global.h" +#include "constants/songs.h" +#include "sound.h" +#include "ewram.h" +#include "task.h" +#include "main.h" +#include "palette.h" +#include "menu.h" +#include "graphics.h" +#include "strings.h" +#include "string_util.h" +#include "pokemon_summary_screen.h" +#include "mail_data.h" +#include "naming_screen.h" +#include "pokemon_storage_system.h" + +// Static type declarations + +// Static RAM declarations + +EWRAM_DATA u8 gUnknown_0203847C = 0; +EWRAM_DATA u8 gUnknown_0203847D = 0; +EWRAM_DATA u8 gUnknown_0203847E = 0; +EWRAM_DATA u8 gUnknown_0203847F = 0; +EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; +EWRAM_DATA u8 gUnknown_020384E4 = 0; +EWRAM_DATA u8 gUnknown_020384E5 = 0; +EWRAM_DATA u8 gUnknown_020384E6 = 0; +EWRAM_DATA u8 gUnknown_020384E7 = 0; +EWRAM_DATA u8 gUnknown_020384E8 = 0; +EWRAM_DATA u8 gUnknown_020384E9 = 0; +EWRAM_DATA u16 gUnknown_020384EA = 0; +EWRAM_DATA u32 gUnknown_020384EC = 0; + +// Static ROM declarations + +void sub_8096884(void); +void sub_8096AFC(void); +void sub_8096B38(void); +void SetPSSCallback(void (*func)(void)); +void sub_8096BF0(void); +void sub_8096C68(void); +void sub_8096C84(void); +void sub_8096FC8(void); +void sub_8097004(void); +void sub_8097078(void); +void sub_80972A8(void); +void sub_80972FC(void); +void c3_0808DC50(void); +void sub_8097390(void); +void sub_809746C(void); +void sub_8097594(void); +void sub_8097788(void); +void sub_80977E4(void); +void sub_8097858(void); +void sub_809789C(void); +void sub_8097974(void); +void sub_8097A64(void); +void sub_8097B44(void); +void sub_8097BA0(void); +void sub_8097CC0(void); +void sub_8097DE0(void); +void sub_8097E44(void); +void sub_8097E70(void); +void sub_8097F58(void); +void sub_8097FB8(void); +void BoxSetMosaic(void); +void sub_809801C(void); +void sub_80980D4(void); +void sub_8098400(void); +void add_to_c3_somehow(void); +bool8 sub_80985CC(void); +void sub_80986E8(void); +void sub_8098710(void); +void sub_8098734(void); +void sub_80987DC(void); +void sub_809880C(void); +bool8 sub_8098830(void); +void PrintStorageActionText(u8 index); +void sub_8098A38(u8); +void sub_8098A5C(void); +void sub_8098A80(void); +void sub_8098AA8(u8 a0); +void sub_8098B48(void); +void sub_8099310(void); +bool8 sub_8099374(void); +void sub_8099958(void); +bool8 sub_8099990(void); +void sub_809BB90(void); +void sub_8099BF8(u8 a0); +void sub_8099C70(u8 whichBox); +bool8 sub_8099D34(void); +void sub_8099DCC(u8 a0); +bool8 sub_8099E08(void); +void sub_809A860(u8 a0); +void sub_809AA24(void); +void sub_809AA98(void); +bool8 sub_809AC00(void); +void sub_809B0C0(u8 a0); +void sub_809B0D4(void); +void sub_809B0E0(void); +u8 sub_809B0F4(void); +void sub_809B100(u8 a0); +bool8 sub_809B130(void); +void sub_809B440(void); +bool8 sub_809B62C(u8); +void sub_809B6BC(void); +void sub_809B6DC(void); +bool8 sub_809B734(void); +void sub_809B760(void); +void sub_809B7AC(void); +void sub_809B7D4(void); +s8 sub_809B960(void); +void sub_809BBC0(void); +void sub_809BC18(void); +void sub_809BD14(void); +void sub_809BDD8(u8 markings); +bool8 sub_809BE80(void); +bool8 sub_809BEBC(void); +bool8 sub_809BF20(void); +bool8 sub_809BF48(void); +u8 sub_809CA40(void); +void sub_809CE84(void); +s16 sub_809CF30(void); +void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); +void sub_809CFF0(void); +void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); + +// .rodata + +const u16 gPokemonStorageScrollingBGPalette[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.gbapal"); + +const u16 gPokemonStorageScrollingBGTile[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.4bpp"); + +const u8 gPokemonStorageScrollingBGTilemap[] = INCBIN_U8("graphics/pokemon_storage/scrolling_bg_map.bin.lz"); + +const u16 sUnknownTilemap[] = { + 0x1281, + 0x1282, + 0x1283, + 0x1284, + 0x1285, + 0x1286, + 0x1287, + 0x1288, + 0x128C, + 0x128D, + 0x128E, + 0x128F, + 0x1290, + 0x1291, + 0x1292, + 0x1293, + 0x0281, + 0x0282, + 0x0283, + 0x0284, + 0x0285, + 0x0286, + 0x0287, + 0x0288, + 0x028C, + 0x028D, + 0x028E, + 0x028F, + 0x0290, + 0x0291, + 0x0292, + 0x0293, + 0x12AD, + 0x12AE, + 0x12A8, + 0x12A8 +}; + +const u16 WaveformPalette[] = INCBIN_U16("graphics/pokemon_storage/waveform.gbapal"); + +const u8 WaveformTiles[] = INCBIN_U8("graphics/pokemon_storage/waveform.4bpp"); + +const u16 gUnknown_083B6D74[] = INCBIN_U16("graphics/pokemon_storage/83B6D74.gbapal"); + +const u16 gUnknown_083B6D94[] = INCBIN_U16("graphics/pokemon_storage/83B6D94.gbapal"); + +struct PokemonStorageSystemData *const gPokemonStorageSystemPtr = &ePokemonStorageSystem; + +u8 *const gUnknown_083B6DB8 = gTileBuffer; + +const struct SpritePalette gWaveformSpritePalette = { + WaveformPalette, 0xdacd +}; + +const struct SpriteSheet gWaveformSpriteSheet = { + WaveformTiles, 0x1c0, 0x0005 +}; + +const struct SpriteSheet gUnknown_083B6DCC = { + ePokemonStorageSystem.unk_2784, 0x800, 0x0002 +}; + +const struct SpritePalette gUnknown_083B6DD4 = { + ePokemonStorageSystem.unk_2704, 0xdac7 +}; + +const struct OamData gOamData_83B6EAC; + +const struct SpriteTemplate gSpriteTemplate_83B6DDC = { + 0x0002, 0xdac7, &gOamData_83B6EAC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +const struct StorageAction gPCStorageActionTexts[] = { + {PCText_ExitBox, 0}, + {PCText_WhatYouDo, 0}, + {PCText_PickATheme, 0}, + {PCText_PickAWallpaper, 0}, + {PCText_IsSelected, 1}, + {PCText_JumpToWhichBox, 0}, + {PCText_DepositInWhichBox, 0}, + {PCText_WasDeposited, 1}, + {PCText_BoxIsFull, 0}, + {PCText_ReleasePoke, 0}, + {PCText_WasReleased, 4}, + {PCText_ByeBye, 6}, + {PCText_MarkPoke, 0}, + {PCText_LastPoke, 0}, + {PCText_PartyFull, 0}, + {PCText_HoldingPoke, 0}, + {PCText_WhichOneWillTake, 0}, + {PCText_CantReleaseEgg, 0}, + {PCText_ContinueBox, 0}, + {PCText_CameBack, 1}, + {PCText_Worried, 0}, + {PCText_Surprise, 0}, + {PCText_PleaseRemoveMail, 0} +}; + +// .text + + +void task_intro_29(u8 whichMenu) +{ + gUnknown_0203847D = whichMenu; + gPokemonStorageSystemPtr->unk_0005 = whichMenu; + SetMainCallback2(sub_8096884); +} + +void sub_80967DC(void) +{ + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2VOFS = 0; + REG_BG2HOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; +} + +void sub_8096804(void) +{ + ResetPaletteFade(); + ResetSpriteData(); + FreeSpriteTileRanges(); + FreeAllSpritePalettes(); + ResetTasks(); + gReservedSpriteTileCount = 0x280; + sub_809CFDC(gPokemonStorageSystemPtr->unk_0020, gPokemonStorageSystemPtr->unk_0020 + 1, 8); + gKeyRepeatStartDelay = 20; +} + +void sub_8096848(void) +{ + sub_809B0D4(); + gUnknown_0203847C = (gPokemonStorageSystemPtr->unk_0005 == 1 ? 1 : 0); + gUnknown_0203847E = 0; +} + +void sub_8096874(void) +{ + REG_DISPCNT = DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; +} + +void sub_8096884(void) +{ + switch (gMain.state) + { + case 0: + SetVBlankCallback(NULL); + REG_DISPCNT = 0; + sub_8096804(); + gMain.state++; + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E6D00); + gMain.state++; + break; + case 2: + InitMenuWindow(&gWindowConfig_81E6D00); + MenuZeroFillScreen(); + gMain.state++; + break; + case 3: + sub_80967DC(); + sub_8096848(); + gMain.state++; + break; + case 4: + sub_8098B48(); + sub_809AA24(); + gMain.state++; + break; + case 5: + sub_8097DE0(); + gMain.state++; + break; + case 6: + sub_8097E70(); + gMain.state++; + break; + case 7: + sub_8098400(); + gMain.state++; + break; + case 8: + sub_8099BF8(gPokemonStorage.currentBox); + gPokemonStorageSystemPtr->unk_12bc.baseTileTag = 0x000a; + gPokemonStorageSystemPtr->unk_12bc.basePaletteTag = 0xdacb; + sub_80F727C(&gPokemonStorageSystemPtr->unk_12bc); + sub_80F7404(); + gMain.state++; + break; + case 9: + sub_8096874(); + SetPSSCallback(sub_8096BF0); + SetMainCallback2(sub_8096B38); + SetVBlankCallback(sub_8096AFC); + gMain.state++; + break; + } +} + +void sub_80969A0(void) +{ + switch (gMain.state) + { + case 0: + SetVBlankCallback(NULL); + REG_DISPCNT = 0x0000; + gPokemonStorageSystemPtr->unk_0005 = gUnknown_0203847D; + sub_8096804(); + if (gUnknown_0203847F == 1) + sub_809BBC0(); + if (gUnknown_0203847F == 0) + sub_809BD14(); + gMain.state++; + break; + case 1: + SetUpWindowConfig(&gWindowConfig_81E6D00); + gMain.state++; + break; + case 2: + InitMenuWindow(&gWindowConfig_81E6D00); + MenuZeroFillScreen(); + gMain.state++; + break; + case 3: + sub_80967DC(); + gMain.state++; + break; + case 4: + sub_8098B48(); + sub_809AA98(); + gMain.state++; + break; + case 5: + sub_8097DE0(); + gMain.state++; + break; + case 6: + sub_8097E70(); + gMain.state++; + break; + case 7: + sub_8098400(); + gMain.state++; + break; + case 8: + sub_8099BF8(gPokemonStorage.currentBox); + gPokemonStorageSystemPtr->unk_12bc.baseTileTag = 0x000a; + gPokemonStorageSystemPtr->unk_12bc.basePaletteTag = 0xdacb; + sub_80F727C(&gPokemonStorageSystemPtr->unk_12bc); + sub_80F7404(); + gMain.state++; + break; + case 9: + BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); + SetVBlankCallback(sub_8096AFC); + gMain.state++; + break; + case 10: + sub_8096874(); + SetPSSCallback(sub_8096C68); + SetMainCallback2(sub_8096B38); + gMain.state++; + break; + } +} + +void sub_8096AFC(void) +{ + REG_BG2HOFS = gPokemonStorageSystemPtr->unk_08b4; + REG_BG3HOFS = gPokemonStorageSystemPtr->unk_000a; + REG_BG3VOFS = gPokemonStorageSystemPtr->unk_0008; + LoadOam(); + ProcessSpriteCopyRequests(); + sub_809CFF0(); + TransferPlttBuffer(); +} + +void sub_8096B38(void) +{ + gPokemonStorageSystemPtr->unk_0000(); + sub_8097E44(); + sub_8098734(); + AnimateSprites(); + BuildOamBuffer(); +} + +void sub_8096B5C(void) +{ + switch (gPokemonStorageSystemPtr->unk_0006) + { + case 0: + ShowPokemonSummaryScreen(gPokemonStorageSystemPtr->unk_2690, gPokemonStorageSystemPtr->unk_268d, gPokemonStorageSystemPtr->unk_268c, sub_80969A0, gPokemonStorageSystemPtr->unk_268e); + break; + case 1: + DoNamingScreen(1, gPokemonStorage.boxNames[gPokemonStorage.currentBox], 0, 0, 0, sub_80969A0); + break; + } +} + +void SetPSSCallback(void (*func)(void)) +{ + gPokemonStorageSystemPtr->unk_0000 = func; + gPokemonStorageSystemPtr->unk_0004 = 0; +} + +void sub_8096BF0(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + BlendPalettes(0xffffffff, 16, 0); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + PlaySE(SE_PC_LOGON); + gPokemonStorageSystemPtr->unk_000c.tileTag = 14; + gPokemonStorageSystemPtr->unk_000c.paletteTag = 0xdad0; + gPokemonStorageSystemPtr->unk_000c.unk04 = 0; + gPokemonStorageSystemPtr->unk_000c.unk06 = 0; + sub_80C5CD4(&gPokemonStorageSystemPtr->unk_000c); + BlendPalettes(0xffffffff, 0, 0); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 2: + if (sub_80C5DCC()) + SetPSSCallback(sub_8096C84); + break; + } +} + +void sub_8096C68(void) +{ + if (!UpdatePaletteFade()) + SetPSSCallback(sub_8096C84); +} + +void sub_8096C84(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + switch (sub_809CA40()) + { + case 1: + PlaySE(SE_SELECT); + gPokemonStorageSystemPtr->unk_0004 = 1; + break; + case 5: + if (gPokemonStorageSystemPtr->unk_0005 != 2) + { + PrintStorageActionText(PC_TEXT_WHICH_ONE_WILL_TAKE); + gPokemonStorageSystemPtr->unk_0004 = 3; + } + else + { + sub_809B0D4(); + SetPSSCallback(sub_8096FC8); + } + break; + case 6: + if (gPokemonStorageSystemPtr->unk_0005 == 2) + { + if (sub_809BF20() && ItemIsMail(gPokemonStorageSystemPtr->unk_11f2)) + { + gPokemonStorageSystemPtr->unk_0004 = 5; + } + else + { + SetPSSCallback(sub_8097004); + } + } + break; + case 4: + SetPSSCallback(sub_8097BA0); + break; + case 16: + SetPSSCallback(sub_8097CC0); + break; + case 7: + PlaySE(SE_SELECT); + SetPSSCallback(sub_809789C); + break; + case 8: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097078); + break; + case 9: + PlaySE(SE_SELECT); + gPokemonStorageSystemPtr->unk_08b2 = gPokemonStorage.currentBox + 1; + if (gPokemonStorageSystemPtr->unk_08b2 > 13) + gPokemonStorageSystemPtr->unk_08b2 = 0; + sub_8099C70(gPokemonStorageSystemPtr->unk_08b2); + gPokemonStorageSystemPtr->unk_0004 = 2; + break; + case 10: + PlaySE(SE_SELECT); + gPokemonStorageSystemPtr->unk_08b2 = gPokemonStorage.currentBox - 1; + if (gPokemonStorageSystemPtr->unk_08b2 < 0) + gPokemonStorageSystemPtr->unk_08b2 = 13; + sub_8099C70(gPokemonStorageSystemPtr->unk_08b2); + gPokemonStorageSystemPtr->unk_0004 = 2; + break; + case 11: + if (!sub_809BE80()) + { + if (ItemIsMail(gPokemonStorageSystemPtr->unk_11f2)) + { + gPokemonStorageSystemPtr->unk_0004 = 5; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(sub_809746C); + } + } + else + { + gPokemonStorageSystemPtr->unk_0004 = 4; + } + break; + case 13: + if (sub_809BE80()) + { + gPokemonStorageSystemPtr->unk_0004 = 4; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(sub_80972A8); + } + break; + case 14: + if (!sub_809BEBC()) + { + gPokemonStorageSystemPtr->unk_0004 = 4; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(c3_0808DC50); + } + break; + case 12: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097390); + break; + case 15: + PlaySE(SE_SELECT); + SetPSSCallback(sub_80972FC); + break; + } + break; + case 1: + if (!sub_809AC00()) + { + if (sub_809BF48()) + sub_80986E8(); + else + sub_8098710(); + if (gPokemonStorageSystemPtr->unk_11f6) + BoxSetMosaic(); + gPokemonStorageSystemPtr->unk_0004 = 0; + } + break; + case 2: + if (!sub_8099D34()) + { + gPokemonStorage.currentBox = gPokemonStorageSystemPtr->unk_08b2; + if (!gUnknown_0203847C && !sub_809BF20()) + { + sub_809B440(); + BoxSetMosaic(); + } + gPokemonStorageSystemPtr->unk_0004 = 0; + } + break; + case 3: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + gPokemonStorageSystemPtr->unk_0004 = 0; + } + break; + case 4: + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_LAST_POKE); + gPokemonStorageSystemPtr->unk_0004 = 6; + break; + case 5: + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); + gPokemonStorageSystemPtr->unk_0004 = 6; + break; + case 6: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8096FC8(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + sub_809880C(); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!sub_8098830()) + SetPSSCallback(sub_8096C84); + break; + } +} + +void sub_8097004(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + PlaySE(SE_SELECT); + add_to_c3_somehow(); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!sub_80985CC()) + { + sub_809B0C0(sub_809B0F4()); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 2: + if (!sub_809AC00()) + { + if (gPokemonStorageSystemPtr->unk_11f6) + BoxSetMosaic(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097078(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_IS_SELECTED); + sub_809CE84(); + gPokemonStorageSystemPtr->unk_0004 = 1; + break; + case 1: + switch (sub_809CF30()) + { + case -1: + case 0: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 3: + if (sub_809BE80()) + { + gPokemonStorageSystemPtr->unk_0004 = 2; + } + else + { + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_80972A8); + } + break; + case 5: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_80972FC); + break; + case 4: + if (!sub_809BEBC()) + { + gPokemonStorageSystemPtr->unk_0004 = 2; + } + else + { + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(c3_0808DC50); + } + break; + case 2: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_8097390); + break; + case 1: + if (sub_809BE80()) + { + gPokemonStorageSystemPtr->unk_0004 = 2; + } + else if (ItemIsMail(gPokemonStorageSystemPtr->unk_11f2)) + { + gPokemonStorageSystemPtr->unk_0004 = 3; + } + else + { + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_809746C); + } + break; + case 7: + if (sub_809BE80()) + { + gPokemonStorageSystemPtr->unk_0004 = 2; + } + else if (gPokemonStorageSystemPtr->unk_11f9) + { + gPokemonStorageSystemPtr->unk_0004 = 4; + } + else if (ItemIsMail(gPokemonStorageSystemPtr->unk_11f2)) + { + gPokemonStorageSystemPtr->unk_0004 = 3; + } + else + { + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097594); + } + break; + case 6: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097788); + break; + case 8: + PlaySE(SE_SELECT); + SetPSSCallback(sub_80977E4); + break; + } + break; + case 2: + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_LAST_POKE); + gPokemonStorageSystemPtr->unk_0004 = 5; + break; + case 4: + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG); + gPokemonStorageSystemPtr->unk_0004 = 5; + break; + case 3: + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); + gPokemonStorageSystemPtr->unk_0004 = 5; + break; + case 5: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_80972A8(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + sub_809B100(0); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!sub_809B130()) + { + if (gUnknown_0203847C) + SetPSSCallback(sub_8097858); + else + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_80972FC(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + sub_809B100(1); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!sub_809B130()) + { + if (gUnknown_0203847C) + SetPSSCallback(sub_8097858); + else + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void c3_0808DC50(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + sub_809B100(2); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!sub_809B130()) + { + BoxSetMosaic(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097390(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + if (CalculatePlayerPartyCount() == 6) + { + PrintStorageActionText(PC_TEXT_PARTY_FULL); + gPokemonStorageSystemPtr->unk_0004 = 1; + } + else + { + sub_809B0E0(); + sub_809B100(0); + gPokemonStorageSystemPtr->unk_0004 = 2; + } + break; + case 1: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + case 2: + if (!sub_809B130()) + { + sub_809880C(); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 3: + if (!sub_8098830()) + { + sub_809B100(1); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 4: + if (!sub_809B130()) + { + sub_80987DC(); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 5: + SetPSSCallback(sub_8097004); + break; + } +} + +void sub_809746C(void) +{ + u8 r4; + + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); + sub_8096264(&gPokemonStorageSystemPtr->unk_2370, 0x0007, 0xdaca, 3); + sub_809634C(gUnknown_0203847E); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + r4 = sub_8096368(); + if (r4 == 200); + else if (r4 == 201) + { + sub_8098A5C(); + sub_809635C(); + sub_8096310(); + SetPSSCallback(sub_8096C84); + } + else + { + if (sub_809B62C(r4)) + { + sub_8098A5C(); + sub_809635C(); + sub_8096310(); + gPokemonStorageSystemPtr->unk_0004 = 2; + } + else + { + PrintStorageActionText(PC_TEXT_BOX_IS_FULL); + gPokemonStorageSystemPtr->unk_0004 = 4; + } + gUnknown_0203847E = r4; + } + break; + case 2: + party_compaction(); + sub_8099310(); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 3: + if (!sub_8099374()) + { + sub_809B6BC(); + BoxSetMosaic(); + sub_80987DC(); + SetPSSCallback(sub_8096C84); + } + break; + case 4: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); + gPokemonStorageSystemPtr->unk_0004 = 1; + } + break; + } +} + +void sub_8097594(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_RELEASE_POKE); + sub_8098A38(1); + gPokemonStorageSystemPtr->unk_0004++; + // fallthrough + case 1: + switch (ProcessMenuInputNoWrap()) + { + case -1: + case 1: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 0: + sub_8098A5C(); + sub_809B7D4(); + sub_809B6DC(); + gPokemonStorageSystemPtr->unk_0004++; + break; + } + break; + case 2: + sub_809B960(); + if (!sub_809B734()) + { + while (1) + { + s8 r0 = sub_809B960(); + if (r0 == 1) + { + gPokemonStorageSystemPtr->unk_0004++; + break; + } + if (r0 == 0) + { + gPokemonStorageSystemPtr->unk_0004 = 8; + break; + } + } + } + break; + case 3: + sub_809B760(); + sub_809801C(); + PrintStorageActionText(PC_TEXT_WAS_RELEASED); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 4: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_BYE_BYE); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 5: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + sub_8098A5C(); + if (gUnknown_0203847C) + { + party_compaction(); + sub_8099310(); + gPokemonStorageSystemPtr->unk_0004++; + } + else + { + gPokemonStorageSystemPtr->unk_0004 = 7; + } + } + break; + case 6: + if (!sub_8099374()) + { + sub_809B440(); + BoxSetMosaic(); + sub_80987DC(); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 7: + SetPSSCallback(sub_8096C84); + break; + case 8: + PrintStorageActionText(PC_TEXT_WAS_RELEASED); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 9: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_SURPRISE); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 10: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + sub_8098A5C(); + sub_8099958(); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 11: + if (!sub_8099990()) + { + sub_809B7AC(); + PrintStorageActionText(PC_TEXT_CAME_BACK); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 12: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + PrintStorageActionText(PC_TEXT_WORRIED); + gPokemonStorageSystemPtr->unk_0004++; + } + break; + case 13: + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097788(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + sub_809BC18(); + BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!UpdatePaletteFade()) + { + gUnknown_0203847F = 0; + gPokemonStorageSystemPtr->unk_0006 = 0; + SetMainCallback2(sub_8096B5C); + } + break; + } +} + +void sub_80977E4(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_MARK_POKE); + gPokemonStorageSystemPtr->unk_12bc.markings = gPokemonStorageSystemPtr->unk_11f7; + sub_80F7418(gPokemonStorageSystemPtr->unk_11f7, 0xb0, 0x10); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!sub_80F7500()) + { + sub_80F7470(); + sub_8098A5C(); + sub_809BDD8(gPokemonStorageSystemPtr->unk_12bc.markings); + sub_809801C(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097858(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + party_compaction(); + sub_8099310(); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!sub_8099374()) + { + sub_80987DC(); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_809789C(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_WHAT_YOU_DO); + sub_809CE84(); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + switch (sub_809CF30()) + { + case -1: + case 0: + sub_809A860(1); + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 11: + PlaySE(SE_SELECT); + SetPSSCallback(sub_8097B44); + break; + case 10: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_8097974); + break; + case 9: + PlaySE(SE_SELECT); + sub_8098A5C(); + SetPSSCallback(sub_8097A64); + break; + } + break; + } +} + +void sub_8097974(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + sub_8098A80(); + PrintStorageActionText(PC_TEXT_PICK_A_THEME); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + gPokemonStorageSystemPtr->unk_0d5e = sub_809CF30(); + switch (gPokemonStorageSystemPtr->unk_0d5e) + { + case -1: + sub_809A860(1); + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 12 ... 15: + PlaySE(SE_SELECT); + gPokemonStorageSystemPtr->unk_0d5e -= 12; + sub_8098AA8(gPokemonStorageSystemPtr->unk_0d5e); + PrintStorageActionText(PC_TEXT_PICK_A_WALLPAPER); + gPokemonStorageSystemPtr->unk_0004++; + break; + } + break; + case 2: + gPokemonStorageSystemPtr->unk_0d60 = sub_809CF30(); + switch (gPokemonStorageSystemPtr->unk_0d60) + { + case -1: + sub_8098A5C(); + gPokemonStorageSystemPtr->unk_0004 = 0; + break; + case -2: + break; + default: + PlaySE(SE_SELECT); + sub_8098A5C(); + gPokemonStorageSystemPtr->unk_0d60 -= 16; + sub_8099DCC(gPokemonStorageSystemPtr->unk_0d60); + gPokemonStorageSystemPtr->unk_0004++; + break; + } + break; + case 3: + if (!sub_8099E08()) + { + sub_809A860(1); + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097A64(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + PrintStorageActionText(PC_TEXT_JUMP_TO_WHICH_BOX); + sub_8096264(&gPokemonStorageSystemPtr->unk_2370, 0x0007, 0xdaca, 3); + sub_809634C(gPokemonStorage.currentBox); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + gPokemonStorageSystemPtr->unk_08b2 = sub_8096368(); + switch (gPokemonStorageSystemPtr->unk_08b2) + { + case 200: + break; + default: + sub_8098A5C(); + sub_809635C(); + sub_8096310(); + if (gPokemonStorageSystemPtr->unk_08b2 == 201 || gPokemonStorageSystemPtr->unk_08b2 == gPokemonStorage.currentBox) + { + sub_809A860(1); + SetPSSCallback(sub_8096C84); + } + else + { + gPokemonStorageSystemPtr->unk_0004++; + } + break; + } + break; + case 2: + sub_8099C70(gPokemonStorageSystemPtr->unk_08b2); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 3: + if (!sub_8099D34()) + { + gPokemonStorage.currentBox = gPokemonStorageSystemPtr->unk_08b2; + SetPSSCallback(sub_8096C84); + } + break; + } +} + +void sub_8097B44(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + sub_809BB90(); + BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 1: + if (!UpdatePaletteFade()) + { + gUnknown_0203847F = 1; + gPokemonStorageSystemPtr->unk_0006 = 1; + SetMainCallback2(sub_8096B5C); + } + break; + } +} + +void sub_8097BA0(void) +{ + switch (gPokemonStorageSystemPtr->unk_0004) + { + case 0: + if (sub_809BF20()) + { + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_HOLDING_POKE); + gPokemonStorageSystemPtr->unk_0004 = 1; + } + else + { + PlaySE(SE_SELECT); + PrintStorageActionText(PC_TEXT_EXIT_BOX); + sub_8098A38(0); + gPokemonStorageSystemPtr->unk_0004 = 2; + } + break; + case 1: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) + { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + case 2: + switch (ProcessMenuInputNoWrap()) + { + case 1: + case -1: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case 0: + PlaySE(SE_PC_OFF); + sub_8098A5C(); + gPokemonStorageSystemPtr->unk_0004++; + break; + } + break; + case 3: + gPokemonStorageSystemPtr->unk_000c.tileTag = 0x000e; + gPokemonStorageSystemPtr->unk_000c.paletteTag = 0xdad0; + gPokemonStorageSystemPtr->unk_000c.unk04 = 20; + gPokemonStorageSystemPtr->unk_000c.unk06 = 0; + sub_80C5E38(&gPokemonStorageSystemPtr->unk_000c); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 4: + if (sub_80C5F98()) + { + gPlayerPartyCount = CalculatePlayerPartyCount(); + SetMainCallback2(sub_80961A8); + } + break; + } +} + +void sub_8097CC0(void) { + switch (gPokemonStorageSystemPtr->unk_0004) { + case 0: + if (sub_809BF20()) { + PlaySE(SE_HAZURE); + PrintStorageActionText(PC_TEXT_HOLDING_POKE); + gPokemonStorageSystemPtr->unk_0004 = 1; + } + else { + PlaySE(SE_SELECT); + PrintStorageActionText(PC_TEXT_CONTINUE_BOX); + sub_8098A38(0); + gPokemonStorageSystemPtr->unk_0004 = 2; + } + break; + case 1: + if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY)) { + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + } + break; + case 2: + switch (ProcessMenuInputNoWrap()) { + case 0: + sub_8098A5C(); + SetPSSCallback(sub_8096C84); + break; + case -1: + case 1: + PlaySE(SE_PC_OFF); + sub_8098A5C(); + gPokemonStorageSystemPtr->unk_0004++; + break; + } + break; + case 3: + gPokemonStorageSystemPtr->unk_000c.tileTag = 0x000e; + gPokemonStorageSystemPtr->unk_000c.paletteTag = 0xdad0; + gPokemonStorageSystemPtr->unk_000c.unk04 = 20; + gPokemonStorageSystemPtr->unk_000c.unk06 = 0; + sub_80C5E38(&gPokemonStorageSystemPtr->unk_000c); + gPokemonStorageSystemPtr->unk_0004++; + break; + case 4: + if (sub_80C5F98()) { + gPlayerPartyCount = CalculatePlayerPartyCount(); + SetMainCallback2(sub_80961A8); + } + break; + } +} + +void sub_8097DE0(void) +{ + gPokemonStorageSystemPtr->unk_0007 = 0; + gPokemonStorageSystemPtr->unk_0008 = 0; + gPokemonStorageSystemPtr->unk_000a = 0; + REG_BG3CNT = BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(30); + DmaCopy16Defvars(3, gPokemonStorageScrollingBGTile, BG_SCREEN_ADDR(28), sizeof gPokemonStorageScrollingBGTile); + LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, BG_SCREEN_ADDR(30)); + LoadPalette(gPokemonStorageScrollingBGPalette, 0xd0, 0x10); +} + +void sub_8097E44(void) +{ + if (++gPokemonStorageSystemPtr->unk_0007 >= 2) + { + gPokemonStorageSystemPtr->unk_0007 = 0; + gPokemonStorageSystemPtr->unk_0008--; + gPokemonStorageSystemPtr->unk_000a++; + } +} + +void sub_8097E70(void) +{ + LZ77UnCompVram(gPSSMenuHeader_Gfx, BG_SCREEN_ADDR(10)); + LZ77UnCompWram(gPSSMenuHeader_Tilemap, gUnknown_02039760); + sub_809D034(BG_SCREEN_ADDR(15), 0, 0, gUnknown_02039760, 0, 0, 10, 20); + LoadPalette(gPSSMenu1_Pal, 0x10, 0x20); + LoadPalette(gPSSMenu2_Pal, 0x00, 0x20); + LoadPalette(gUnknown_083B6D74, 0xB0, 0x20); + LoadPalette(gUnknown_083B6D94, 0xC0, 0x20); + LoadPalette(gUnknownPalette_81E6692 + 1, 0xF1, 0x02); + LoadPalette(gUnknownPalette_81E6692 + 1, 0xF2, 0x02); + LoadPalette(gUnknownPalette_81E6692 + 5, 0xF3, 0x02); + LoadPalette(gUnknownPalette_81E6692 + 12, 0xF4, 0x04); + LoadPalette(gUnknownPalette_81E6692 + 10, 0xF6, 0x04); + LoadPalette(gUnknownPalette_81E6692 + 2, 0xFF, 0x02); + LoadSpritePalette(&gWaveformSpritePalette); + sub_80980D4(); + sub_8097F58(); + sub_8097FB8(); + sub_809801C(); +} + +asm(".section .text.8098898"); + +void PrintStorageActionText(u8 index) { + u8 *ptr; + + MenuDrawTextWindow(10, 16, 29, 19); + + switch (gPCStorageActionTexts[index].format) + { + + case PC_TEXT_FMT_UNK_02: + ptr = StringCopy(gPokemonStorageSystemPtr->unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr, gPokemonStorageSystemPtr->unk_11fa); + break; + + case PC_TEXT_FMT_UNK_05: + ptr = StringCopy(gPokemonStorageSystemPtr->unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr, gPokemonStorageSystemPtr->unk_26e4); + break; + + case PC_TEXT_FMT_MON_NAME: + // {var} + " is selected." + ptr = StringCopy(gPokemonStorageSystemPtr->unk_2694, gPokemonStorageSystemPtr->unk_11fa); + ptr = StringCopy(ptr, gPCStorageActionTexts[index].text); + break; + + case PC_TEXT_FMT_MON_NAME_2: + // {var} + " was released." + ptr = StringCopy(gPokemonStorageSystemPtr->unk_2694, gPokemonStorageSystemPtr->unk_26e4); +#if ENGLISH + ptr = StringCopy(ptr, gPCStorageActionTexts[index].text); +#elif GERMAN + ptr = de_sub_8073174(gPokemonStorageSystemPtr->unk_2694, gPCStorageActionTexts[index].text); +#endif + break; + + case PC_TEXT_FMT_UNK_03: + { + const u8 *stringLength; + const u8 *text; + + text = gPCStorageActionTexts[index].text; + stringLength = &text[StringLength(text)] + 1; + + ptr = StringCopy(gPokemonStorageSystemPtr->unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr, gPokemonStorageSystemPtr->unk_11fa); + ptr = StringCopy(ptr, stringLength); + } + break; + + case PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK: + // "Bye-bye, ".substr(0, -1) + {var} + "Bye-bye, !".substr(-1, 1) + { + const u8 *stringLength; + const u8 *text; + + text = gPCStorageActionTexts[index].text; + stringLength = &text[StringLength(text)] - 1; + + ptr = StringCopy(gPokemonStorageSystemPtr->unk_2694, gPCStorageActionTexts[index].text); + ptr = StringCopy(ptr - 1, gPokemonStorageSystemPtr->unk_26e4); + ptr = StringCopy(ptr, stringLength); + } + break; + + case PC_TEXT_FMT_NORMAL: + default: + ptr = StringCopy(gPokemonStorageSystemPtr->unk_2694, gPCStorageActionTexts[index].text); + break; + } + + while (ptr < gPokemonStorageSystemPtr->unk_26a6) + { + ptr[0] = CHAR_SPACE; + ptr++; + } + + ptr[0] = EOS; + MenuPrint(gPokemonStorageSystemPtr->unk_2694, 11, 17); +} diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c new file mode 100644 index 000000000..9e0052b89 --- /dev/null +++ b/src/pokemon/pokemon_storage_system_3.c @@ -0,0 +1,16 @@ + +// Includes +#include "global.h" +#include "pokemon_storage_system.h" + +// Static type declarations + +// Static RAM declarations + +EWRAM_DATA u16 gUnknown_02039760[0x600] = {}; + +// Static ROM declarations + +// .rodata + +// .text diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index 9563bc08f..fb8363569 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -146,7 +146,6 @@ extern const u8 gUnknown_08E74E88[]; extern const u8 gUnknown_08E73508[]; extern const u8 gStatusScreen_Gfx[]; extern const u8 gFontDefaultPalette[]; -extern const u8 gUnknownPalette_81E6692[]; extern const u8 gAbilityNames[][13]; extern const u8 * const gAbilityDescriptions[]; extern const u8 * const gContestEffectStrings[]; @@ -940,21 +939,21 @@ static bool8 LoadPokemonSummaryScreenGraphics(void) static void sub_809E044(void) { - LoadPalette(&gUnknownPalette_81E6692[28], 129, 2); - LoadPalette(&gUnknownPalette_81E6692[30], 136, 2); - LoadPalette(&gUnknownPalette_81E6692[28], 143, 2); - LoadPalette(&gUnknownPalette_81E6692[30], 137, 2); - LoadPalette(&gUnknownPalette_81E6692[12], 209, 4); - LoadPalette(&gUnknownPalette_81E6692[20], 211, 4); - LoadPalette(&gUnknownPalette_81E6692[28], 213, 4); - LoadPalette(&gUnknownPalette_81E6692[12], 215, 4); - LoadPalette(&gUnknownPalette_81E6692[8], 217, 4); - LoadPalette(&gUnknownPalette_81E6692[16], 219, 4); - LoadPalette(&gUnknownPalette_81E6692[4], 221, 2); - LoadPalette(&gUnknownPalette_81E6692[6], 222, 2); - LoadPalette(&gUnknownPalette_81E6692[2], 223, 2); + LoadPalette(gUnknownPalette_81E6692 + 14, 129, 2); + LoadPalette(gUnknownPalette_81E6692 + 15, 136, 2); + LoadPalette(gUnknownPalette_81E6692 + 14, 143, 2); + LoadPalette(gUnknownPalette_81E6692 + 15, 137, 2); + LoadPalette(gUnknownPalette_81E6692 + 6, 209, 4); + LoadPalette(gUnknownPalette_81E6692 + 10, 211, 4); + LoadPalette(gUnknownPalette_81E6692 + 14, 213, 4); + LoadPalette(gUnknownPalette_81E6692 + 6, 215, 4); + LoadPalette(gUnknownPalette_81E6692 + 4, 217, 4); + LoadPalette(gUnknownPalette_81E6692 + 8, 219, 4); + LoadPalette(gUnknownPalette_81E6692 + 2, 221, 2); + LoadPalette(gUnknownPalette_81E6692 + 3, 222, 2); + LoadPalette(gUnknownPalette_81E6692 + 1, 223, 2); LoadPalette(gFontDefaultPalette, 240, 32); - LoadPalette(&gUnknownPalette_81E6692[6], 249, 2); + LoadPalette(gUnknownPalette_81E6692 + 3, 249, 2); } static void SummaryScreenExit(u8 taskId) diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 8a67390ad..ee5bdb1cb 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -102,7 +102,6 @@ extern const u16 gPokenavConditionSearch2_Pal[]; extern const u8 gUnknown_083E0334[]; extern const u16 gUnknown_083E02B4[]; extern const u8 gPokenavConditionSearch2_Gfx[]; -extern const u8 gUnknownPalette_81E6692[]; extern const u8 gUnknown_083E0254[]; extern const u8 gUnknown_08E9FEB4[]; extern const u8 gUnknown_083E01AC[]; diff --git a/sym_ewram.txt b/sym_ewram.txt index 62758ab78..ac9805f3e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -378,6 +378,7 @@ gUnknown_0202FFA4: @ 202FFA4 .include "src/pokemon/pokedex.o" .include "src/engine/trainer_card.o" .include "src/pokemon/pokemon_storage_system.o" + .include "src/pokemon/pokemon_storage_system_2.o" @ pokemon_summary_screen @@ -560,7 +561,5 @@ gTileBuffer: @ 2039360 gUnknown_02039460: @ 2039460 .space 0x300 -gUnknown_02039760: @ 2039760 - .space 0xC00 - + .include "src/pokemon/pokemon_storage_system_3.o" .include "src/engine/menu_cursor.o" -- cgit v1.2.3 From 66bf3cc2bbe16dd2b51bb76b2cae9e15272a6a34 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Tue, 9 Jan 2018 18:43:52 +0100 Subject: Started decompiling bug.s --- asm/bug.s | 552 +++++++++++++++++++++++++------------------------- ld_script.txt | 1 + src/battle/anim/bug.c | 105 ++++++++++ 3 files changed, 382 insertions(+), 276 deletions(-) create mode 100644 src/battle/anim/bug.c diff --git a/asm/bug.s b/asm/bug.s index 83170e9a7..ddd8726db 100755 --- a/asm/bug.s +++ b/asm/bug.s @@ -7,285 +7,285 @@ @ bug - thumb_func_start sub_80DC824 -sub_80DC824: @ 80DC824 - push {r4-r6,lr} - adds r6, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DC850 - adds r0, r6, 0 - movs r1, 0x2 - bl StartSpriteAffineAnim - ldr r0, _080DC84C @ =gBattleAnimArgs - ldrh r1, [r0, 0x4] - negs r1, r1 - strh r1, [r0, 0x4] - ldrh r1, [r0] - negs r1, r1 - strh r1, [r0] - b _080DC880 - .align 2, 0 -_080DC84C: .4byte gBattleAnimArgs -_080DC850: - ldr r0, _080DC8E4 @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080DC880 - adds r0, r6, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - ldr r1, _080DC8E8 @ =gBattleAnimArgs - ldrh r0, [r1, 0x2] - negs r0, r0 - strh r0, [r1, 0x2] - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] - ldrh r0, [r1, 0x6] - negs r0, r0 - strh r0, [r1, 0x6] - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] -_080DC880: - ldr r5, _080DC8E4 @ =gAnimBankTarget - ldrb r0, [r5] - movs r1, 0x2 - bl sub_8077EE4 - lsls r0, 24 - ldr r4, _080DC8E8 @ =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r6, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl sub_8077EE4 - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x2] - adds r0, r1 - strh r0, [r6, 0x22] - ldrh r0, [r4, 0x8] - strh r0, [r6, 0x2E] - ldrb r0, [r5] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x4] - adds r0, r1 - strh r0, [r6, 0x32] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r4, [r4, 0x6] - adds r0, r4 - strh r0, [r6, 0x36] - ldr r0, _080DC8EC @ =sub_8078B34 - str r0, [r6, 0x1C] - ldr r1, _080DC8F0 @ =DestroyAnimSprite - adds r0, r6, 0 - bl StoreSpriteCallbackInData - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DC8E4: .4byte gAnimBankTarget -_080DC8E8: .4byte gBattleAnimArgs -_080DC8EC: .4byte sub_8078B34 -_080DC8F0: .4byte DestroyAnimSprite - thumb_func_end sub_80DC824 +# thumb_func_start sub_80DC824 +# sub_80DC824: @ 80DC824 +# push {r4-r6,lr} +# adds r6, r0, 0 +# bl IsContest +# lsls r0, 24 +# cmp r0, 0 +# beq _080DC850 +# adds r0, r6, 0 +# movs r1, 0x2 +# bl StartSpriteAffineAnim +# ldr r0, _080DC84C @ =gBattleAnimArgs +# ldrh r1, [r0, 0x4] +# negs r1, r1 +# strh r1, [r0, 0x4] +# ldrh r1, [r0] +# negs r1, r1 +# strh r1, [r0] +# b _080DC880 +# .align 2, 0 +# _080DC84C: .4byte gBattleAnimArgs +# _080DC850: +# ldr r0, _080DC8E4 @ =gAnimBankTarget +# ldrb r0, [r0] +# bl GetBankSide +# lsls r0, 24 +# cmp r0, 0 +# bne _080DC880 +# adds r0, r6, 0 +# movs r1, 0x1 +# bl StartSpriteAffineAnim +# ldr r1, _080DC8E8 @ =gBattleAnimArgs +# ldrh r0, [r1, 0x2] +# negs r0, r0 +# strh r0, [r1, 0x2] +# ldrh r0, [r1, 0x4] +# negs r0, r0 +# strh r0, [r1, 0x4] +# ldrh r0, [r1, 0x6] +# negs r0, r0 +# strh r0, [r1, 0x6] +# ldrh r0, [r1] +# negs r0, r0 +# strh r0, [r1] +# _080DC880: +# ldr r5, _080DC8E4 @ =gAnimBankTarget +# ldrb r0, [r5] +# movs r1, 0x2 +# bl sub_8077EE4 +# lsls r0, 24 +# ldr r4, _080DC8E8 @ =gBattleAnimArgs +# lsrs r0, 24 +# ldrh r1, [r4] +# adds r0, r1 +# strh r0, [r6, 0x20] +# ldrb r0, [r5] +# movs r1, 0x3 +# bl sub_8077EE4 +# lsls r0, 24 +# lsrs r0, 24 +# ldrh r1, [r4, 0x2] +# adds r0, r1 +# strh r0, [r6, 0x22] +# ldrh r0, [r4, 0x8] +# strh r0, [r6, 0x2E] +# ldrb r0, [r5] +# movs r1, 0x2 +# bl GetBankPosition +# lsls r0, 24 +# lsrs r0, 24 +# ldrh r1, [r4, 0x4] +# adds r0, r1 +# strh r0, [r6, 0x32] +# ldrb r0, [r5] +# movs r1, 0x3 +# bl GetBankPosition +# lsls r0, 24 +# lsrs r0, 24 +# ldrh r4, [r4, 0x6] +# adds r0, r4 +# strh r0, [r6, 0x36] +# ldr r0, _080DC8EC @ =sub_8078B34 +# str r0, [r6, 0x1C] +# ldr r1, _080DC8F0 @ =DestroyAnimSprite +# adds r0, r6, 0 +# bl StoreSpriteCallbackInData +# pop {r4-r6} +# pop {r0} +# bx r0 +# .align 2, 0 +# _080DC8E4: .4byte gAnimBankTarget +# _080DC8E8: .4byte gBattleAnimArgs +# _080DC8EC: .4byte sub_8078B34 +# _080DC8F0: .4byte DestroyAnimSprite +# thumb_func_end sub_80DC824 - thumb_func_start sub_80DC8F4 -sub_80DC8F4: @ 80DC8F4 - push {r4-r6,lr} - adds r6, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DC918 - ldr r1, _080DC914 @ =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] - adds r0, r6, 0 - movs r1, 0x2 - bl StartSpriteAffineAnim - b _080DC934 - .align 2, 0 -_080DC914: .4byte gBattleAnimArgs -_080DC918: - ldr r0, _080DC990 @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080DC934 - ldr r0, _080DC994 @ =gBattleAnimArgs - ldrh r1, [r0, 0x2] - negs r1, r1 - strh r1, [r0, 0x2] - ldrh r1, [r0] - negs r1, r1 - strh r1, [r0] -_080DC934: - ldr r5, _080DC990 @ =gAnimBankTarget - ldrb r0, [r5] - movs r1, 0x2 - bl sub_8077EE4 - lsls r0, 24 - ldr r4, _080DC994 @ =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r6, 0x20] - ldrb r0, [r5] - movs r1, 0x3 - bl sub_8077EE4 - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x2] - adds r0, r1 - strh r0, [r6, 0x22] - ldrh r0, [r4, 0x4] - strh r0, [r6, 0x2E] - ldrb r0, [r5] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x32] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x36] - ldr r0, _080DC998 @ =sub_8078B34 - str r0, [r6, 0x1C] - ldr r1, _080DC99C @ =DestroyAnimSprite - adds r0, r6, 0 - bl StoreSpriteCallbackInData - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DC990: .4byte gAnimBankTarget -_080DC994: .4byte gBattleAnimArgs -_080DC998: .4byte sub_8078B34 -_080DC99C: .4byte DestroyAnimSprite - thumb_func_end sub_80DC8F4 +# thumb_func_start sub_80DC8F4 +# sub_80DC8F4: @ 80DC8F4 +# push {r4-r6,lr} +# adds r6, r0, 0 +# bl IsContest +# lsls r0, 24 +# cmp r0, 0 +# beq _080DC918 +# ldr r1, _080DC914 @ =gBattleAnimArgs +# ldrh r0, [r1] +# negs r0, r0 +# strh r0, [r1] +# adds r0, r6, 0 +# movs r1, 0x2 +# bl StartSpriteAffineAnim +# b _080DC934 +# .align 2, 0 +# _080DC914: .4byte gBattleAnimArgs +# _080DC918: +# ldr r0, _080DC990 @ =gAnimBankTarget +# ldrb r0, [r0] +# bl GetBankSide +# lsls r0, 24 +# cmp r0, 0 +# bne _080DC934 +# ldr r0, _080DC994 @ =gBattleAnimArgs +# ldrh r1, [r0, 0x2] +# negs r1, r1 +# strh r1, [r0, 0x2] +# ldrh r1, [r0] +# negs r1, r1 +# strh r1, [r0] +# _080DC934: +# ldr r5, _080DC990 @ =gAnimBankTarget +# ldrb r0, [r5] +# movs r1, 0x2 +# bl sub_8077EE4 +# lsls r0, 24 +# ldr r4, _080DC994 @ =gBattleAnimArgs +# lsrs r0, 24 +# ldrh r1, [r4] +# adds r0, r1 +# strh r0, [r6, 0x20] +# ldrb r0, [r5] +# movs r1, 0x3 +# bl sub_8077EE4 +# lsls r0, 24 +# lsrs r0, 24 +# ldrh r1, [r4, 0x2] +# adds r0, r1 +# strh r0, [r6, 0x22] +# ldrh r0, [r4, 0x4] +# strh r0, [r6, 0x2E] +# ldrb r0, [r5] +# movs r1, 0x2 +# bl GetBankPosition +# lsls r0, 24 +# lsrs r0, 24 +# strh r0, [r6, 0x32] +# ldrb r0, [r5] +# movs r1, 0x3 +# bl GetBankPosition +# lsls r0, 24 +# lsrs r0, 24 +# strh r0, [r6, 0x36] +# ldr r0, _080DC998 @ =sub_8078B34 +# str r0, [r6, 0x1C] +# ldr r1, _080DC99C @ =DestroyAnimSprite +# adds r0, r6, 0 +# bl StoreSpriteCallbackInData +# pop {r4-r6} +# pop {r0} +# bx r0 +# .align 2, 0 +# _080DC990: .4byte gAnimBankTarget +# _080DC994: .4byte gBattleAnimArgs +# _080DC998: .4byte sub_8078B34 +# _080DC99C: .4byte DestroyAnimSprite +# thumb_func_end sub_80DC8F4 - thumb_func_start sub_80DC9A0 -sub_80DC9A0: @ 80DC9A0 - push {r4,r5,lr} - adds r5, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DC9BC - ldr r0, _080DC9FC @ =gBattleAnimArgs - movs r2, 0x4 - ldrsh r1, [r0, r2] - lsrs r2, r1, 31 - adds r1, r2 - asrs r1, 1 - strh r1, [r0, 0x4] -_080DC9BC: - adds r0, r5, 0 - movs r1, 0x1 - bl sub_80787B0 - ldr r1, _080DC9FC @ =gBattleAnimArgs - ldrh r0, [r1, 0x4] - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x20] - strh r0, [r5, 0x30] - ldrh r0, [r5, 0x22] - strh r0, [r5, 0x34] - movs r2, 0x8 - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _080DCA04 - ldr r4, _080DCA00 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - b _080DCA16 - .align 2, 0 -_080DC9FC: .4byte gBattleAnimArgs -_080DCA00: .4byte gAnimBankTarget -_080DCA04: - ldr r0, _080DCA2C @ =gAnimBankTarget - ldrb r0, [r0] - adds r2, r5, 0 - adds r2, 0x32 - adds r3, r5, 0 - adds r3, 0x36 - movs r1, 0x1 - bl sub_807A3FC -_080DCA16: - adds r0, r5, 0 - bl sub_8078BD4 - ldr r0, _080DCA30 @ =gBattleAnimArgs - ldrh r0, [r0, 0x6] - strh r0, [r5, 0x38] - ldr r0, _080DCA34 @ =sub_80DCA38 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DCA2C: .4byte gAnimBankTarget -_080DCA30: .4byte gBattleAnimArgs -_080DCA34: .4byte sub_80DCA38 - thumb_func_end sub_80DC9A0 +# thumb_func_start sub_80DC9A0 +# sub_80DC9A0: @ 80DC9A0 +# push {r4,r5,lr} +# adds r5, r0, 0 +# bl IsContest +# lsls r0, 24 +# cmp r0, 0 +# beq _080DC9BC +# ldr r0, _080DC9FC @ =gBattleAnimArgs +# movs r2, 0x4 +# ldrsh r1, [r0, r2] +# lsrs r2, r1, 31 +# adds r1, r2 +# asrs r1, 1 +# strh r1, [r0, 0x4] +# _080DC9BC: +# adds r0, r5, 0 +# movs r1, 0x1 +# bl sub_80787B0 +# ldr r1, _080DC9FC @ =gBattleAnimArgs +# ldrh r0, [r1, 0x4] +# strh r0, [r5, 0x2E] +# ldrh r0, [r5, 0x20] +# strh r0, [r5, 0x30] +# ldrh r0, [r5, 0x22] +# strh r0, [r5, 0x34] +# movs r2, 0x8 +# ldrsh r0, [r1, r2] +# cmp r0, 0 +# bne _080DCA04 +# ldr r4, _080DCA00 @ =gAnimBankTarget +# ldrb r0, [r4] +# movs r1, 0x2 +# bl GetBankPosition +# lsls r0, 24 +# lsrs r0, 24 +# strh r0, [r5, 0x32] +# ldrb r0, [r4] +# movs r1, 0x3 +# bl GetBankPosition +# lsls r0, 24 +# lsrs r0, 24 +# strh r0, [r5, 0x36] +# b _080DCA16 +# .align 2, 0 +# _080DC9FC: .4byte gBattleAnimArgs +# _080DCA00: .4byte gAnimBankTarget +# _080DCA04: +# ldr r0, _080DCA2C @ =gAnimBankTarget +# ldrb r0, [r0] +# adds r2, r5, 0 +# adds r2, 0x32 +# adds r3, r5, 0 +# adds r3, 0x36 +# movs r1, 0x1 +# bl sub_807A3FC +# _080DCA16: +# adds r0, r5, 0 +# bl sub_8078BD4 +# ldr r0, _080DCA30 @ =gBattleAnimArgs +# ldrh r0, [r0, 0x6] +# strh r0, [r5, 0x38] +# ldr r0, _080DCA34 @ =sub_80DCA38 +# str r0, [r5, 0x1C] +# pop {r4,r5} +# pop {r0} +# bx r0 +# .align 2, 0 +# _080DCA2C: .4byte gAnimBankTarget +# _080DCA30: .4byte gBattleAnimArgs +# _080DCA34: .4byte sub_80DCA38 +# thumb_func_end sub_80DC9A0 - thumb_func_start sub_80DCA38 -sub_80DCA38: @ 80DCA38 - push {r4,lr} - adds r4, r0, 0 - bl sub_8078B5C - lsls r0, 24 - cmp r0, 0 - beq _080DCA4E - adds r0, r4, 0 - bl DestroyAnimSprite - b _080DCA6A -_080DCA4E: - movs r1, 0x3A - ldrsh r0, [r4, r1] - movs r2, 0x38 - ldrsh r1, [r4, r2] - bl Sin - ldrh r1, [r4, 0x24] - adds r0, r1 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x3A] - adds r0, 0xD - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x3A] -_080DCA6A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DCA38 +# thumb_func_start sub_80DCA38 +# sub_80DCA38: @ 80DCA38 +# push {r4,lr} +# adds r4, r0, 0 +# bl sub_8078B5C +# lsls r0, 24 +# cmp r0, 0 +# beq _080DCA4E +# adds r0, r4, 0 +# bl DestroyAnimSprite +# b _080DCA6A +# _080DCA4E: +# movs r1, 0x3A +# ldrsh r0, [r4, r1] +# movs r2, 0x38 +# ldrsh r1, [r4, r2] +# bl Sin +# ldrh r1, [r4, 0x24] +# adds r0, r1 +# strh r0, [r4, 0x24] +# ldrh r0, [r4, 0x3A] +# adds r0, 0xD +# movs r1, 0xFF +# ands r0, r1 +# strh r0, [r4, 0x3A] +# _080DCA6A: +# pop {r4} +# pop {r0} +# bx r0 +# thumb_func_end sub_80DCA38 thumb_func_start sub_80DCA70 sub_80DCA70: @ 80DCA70 diff --git a/ld_script.txt b/ld_script.txt index 47e8297b2..ba0705659 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -292,6 +292,7 @@ SECTIONS { src/battle/anim/poison.o(.text); asm/flying.o(.text); asm/psychic.o(.text); + src/battle/anim/bug.o(.text); asm/bug.o(.text); asm/rock.o(.text); asm/ghost.o(.text); diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c new file mode 100644 index 000000000..e9372ed9e --- /dev/null +++ b/src/battle/anim/bug.c @@ -0,0 +1,105 @@ +#include "global.h" +#include "battle_anim.h" +#include "contest.h" +#include "rom_8077ABC.h" +#include "trig.h" +// #include "util.h" + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; + +static void sub_80DCA38(struct Sprite *sprite); + +// used in Move_MEGAHORN +void sub_80DC824(struct Sprite *sprite) +{ + if (IsContest()) + { + StartSpriteAffineAnim(sprite, 2); + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + } + else if (!GetBankSide(gAnimBankTarget)) + { + StartSpriteAffineAnim(sprite, 1); + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + gBattleAnimArgs[3] = -gBattleAnimArgs[3]; + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + } + + sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[4]; + + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + + sprite->callback = sub_8078B34; + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); +} + +// used in Move_LEECH_LIFE +void sub_80DC8F4(struct Sprite *sprite) +{ + if (IsContest()) + { + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + StartSpriteAffineAnim(sprite, 2); + } + else if (!GetBankSide(gAnimBankTarget)) + { + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + } + + sprite->pos1.x = sub_8077EE4(gAnimBankTarget, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gAnimBankTarget, 3) + gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); + + sprite->callback = sub_8078B34; + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); +} + +// used in 2 moves: +// Move_STRING_SHOT, Move_SPIDER_WEB +void sub_80DC9A0(struct Sprite *sprite) +{ + if (IsContest()) + gBattleAnimArgs[2] /= 2; + + sub_80787B0(sprite, 1); + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = sprite->pos1.x; + sprite->data[3] = sprite->pos1.y; + + if (!gBattleAnimArgs[4]) + { + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); + } + else + { + sub_807A3FC(gAnimBankTarget, 1, &sprite->data[2], &sprite->data[4]); + } + + sub_8078BD4(sprite); + sprite->data[5] = gBattleAnimArgs[3]; + sprite->callback = sub_80DCA38; +} + +static void sub_80DCA38(struct Sprite *sprite) +{ + if (sub_8078B5C(sprite)) + { + DestroyAnimSprite(sprite); + return; + } + + sprite->pos2.x += Sin(sprite->data[6], sprite->data[5]); + sprite->data[6] = (sprite->data[6] + 13) & 0xFF; +} \ No newline at end of file -- cgit v1.2.3 From 730fe36c1b001f5d0e2b6b67780aab61ca1bc6c6 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Tue, 9 Jan 2018 18:45:57 +0100 Subject: deleted decompiled asm --- asm/bug.s | 280 -------------------------------------------------------------- 1 file changed, 280 deletions(-) diff --git a/asm/bug.s b/asm/bug.s index ddd8726db..3d1fb8669 100755 --- a/asm/bug.s +++ b/asm/bug.s @@ -7,286 +7,6 @@ @ bug -# thumb_func_start sub_80DC824 -# sub_80DC824: @ 80DC824 -# push {r4-r6,lr} -# adds r6, r0, 0 -# bl IsContest -# lsls r0, 24 -# cmp r0, 0 -# beq _080DC850 -# adds r0, r6, 0 -# movs r1, 0x2 -# bl StartSpriteAffineAnim -# ldr r0, _080DC84C @ =gBattleAnimArgs -# ldrh r1, [r0, 0x4] -# negs r1, r1 -# strh r1, [r0, 0x4] -# ldrh r1, [r0] -# negs r1, r1 -# strh r1, [r0] -# b _080DC880 -# .align 2, 0 -# _080DC84C: .4byte gBattleAnimArgs -# _080DC850: -# ldr r0, _080DC8E4 @ =gAnimBankTarget -# ldrb r0, [r0] -# bl GetBankSide -# lsls r0, 24 -# cmp r0, 0 -# bne _080DC880 -# adds r0, r6, 0 -# movs r1, 0x1 -# bl StartSpriteAffineAnim -# ldr r1, _080DC8E8 @ =gBattleAnimArgs -# ldrh r0, [r1, 0x2] -# negs r0, r0 -# strh r0, [r1, 0x2] -# ldrh r0, [r1, 0x4] -# negs r0, r0 -# strh r0, [r1, 0x4] -# ldrh r0, [r1, 0x6] -# negs r0, r0 -# strh r0, [r1, 0x6] -# ldrh r0, [r1] -# negs r0, r0 -# strh r0, [r1] -# _080DC880: -# ldr r5, _080DC8E4 @ =gAnimBankTarget -# ldrb r0, [r5] -# movs r1, 0x2 -# bl sub_8077EE4 -# lsls r0, 24 -# ldr r4, _080DC8E8 @ =gBattleAnimArgs -# lsrs r0, 24 -# ldrh r1, [r4] -# adds r0, r1 -# strh r0, [r6, 0x20] -# ldrb r0, [r5] -# movs r1, 0x3 -# bl sub_8077EE4 -# lsls r0, 24 -# lsrs r0, 24 -# ldrh r1, [r4, 0x2] -# adds r0, r1 -# strh r0, [r6, 0x22] -# ldrh r0, [r4, 0x8] -# strh r0, [r6, 0x2E] -# ldrb r0, [r5] -# movs r1, 0x2 -# bl GetBankPosition -# lsls r0, 24 -# lsrs r0, 24 -# ldrh r1, [r4, 0x4] -# adds r0, r1 -# strh r0, [r6, 0x32] -# ldrb r0, [r5] -# movs r1, 0x3 -# bl GetBankPosition -# lsls r0, 24 -# lsrs r0, 24 -# ldrh r4, [r4, 0x6] -# adds r0, r4 -# strh r0, [r6, 0x36] -# ldr r0, _080DC8EC @ =sub_8078B34 -# str r0, [r6, 0x1C] -# ldr r1, _080DC8F0 @ =DestroyAnimSprite -# adds r0, r6, 0 -# bl StoreSpriteCallbackInData -# pop {r4-r6} -# pop {r0} -# bx r0 -# .align 2, 0 -# _080DC8E4: .4byte gAnimBankTarget -# _080DC8E8: .4byte gBattleAnimArgs -# _080DC8EC: .4byte sub_8078B34 -# _080DC8F0: .4byte DestroyAnimSprite -# thumb_func_end sub_80DC824 - -# thumb_func_start sub_80DC8F4 -# sub_80DC8F4: @ 80DC8F4 -# push {r4-r6,lr} -# adds r6, r0, 0 -# bl IsContest -# lsls r0, 24 -# cmp r0, 0 -# beq _080DC918 -# ldr r1, _080DC914 @ =gBattleAnimArgs -# ldrh r0, [r1] -# negs r0, r0 -# strh r0, [r1] -# adds r0, r6, 0 -# movs r1, 0x2 -# bl StartSpriteAffineAnim -# b _080DC934 -# .align 2, 0 -# _080DC914: .4byte gBattleAnimArgs -# _080DC918: -# ldr r0, _080DC990 @ =gAnimBankTarget -# ldrb r0, [r0] -# bl GetBankSide -# lsls r0, 24 -# cmp r0, 0 -# bne _080DC934 -# ldr r0, _080DC994 @ =gBattleAnimArgs -# ldrh r1, [r0, 0x2] -# negs r1, r1 -# strh r1, [r0, 0x2] -# ldrh r1, [r0] -# negs r1, r1 -# strh r1, [r0] -# _080DC934: -# ldr r5, _080DC990 @ =gAnimBankTarget -# ldrb r0, [r5] -# movs r1, 0x2 -# bl sub_8077EE4 -# lsls r0, 24 -# ldr r4, _080DC994 @ =gBattleAnimArgs -# lsrs r0, 24 -# ldrh r1, [r4] -# adds r0, r1 -# strh r0, [r6, 0x20] -# ldrb r0, [r5] -# movs r1, 0x3 -# bl sub_8077EE4 -# lsls r0, 24 -# lsrs r0, 24 -# ldrh r1, [r4, 0x2] -# adds r0, r1 -# strh r0, [r6, 0x22] -# ldrh r0, [r4, 0x4] -# strh r0, [r6, 0x2E] -# ldrb r0, [r5] -# movs r1, 0x2 -# bl GetBankPosition -# lsls r0, 24 -# lsrs r0, 24 -# strh r0, [r6, 0x32] -# ldrb r0, [r5] -# movs r1, 0x3 -# bl GetBankPosition -# lsls r0, 24 -# lsrs r0, 24 -# strh r0, [r6, 0x36] -# ldr r0, _080DC998 @ =sub_8078B34 -# str r0, [r6, 0x1C] -# ldr r1, _080DC99C @ =DestroyAnimSprite -# adds r0, r6, 0 -# bl StoreSpriteCallbackInData -# pop {r4-r6} -# pop {r0} -# bx r0 -# .align 2, 0 -# _080DC990: .4byte gAnimBankTarget -# _080DC994: .4byte gBattleAnimArgs -# _080DC998: .4byte sub_8078B34 -# _080DC99C: .4byte DestroyAnimSprite -# thumb_func_end sub_80DC8F4 - -# thumb_func_start sub_80DC9A0 -# sub_80DC9A0: @ 80DC9A0 -# push {r4,r5,lr} -# adds r5, r0, 0 -# bl IsContest -# lsls r0, 24 -# cmp r0, 0 -# beq _080DC9BC -# ldr r0, _080DC9FC @ =gBattleAnimArgs -# movs r2, 0x4 -# ldrsh r1, [r0, r2] -# lsrs r2, r1, 31 -# adds r1, r2 -# asrs r1, 1 -# strh r1, [r0, 0x4] -# _080DC9BC: -# adds r0, r5, 0 -# movs r1, 0x1 -# bl sub_80787B0 -# ldr r1, _080DC9FC @ =gBattleAnimArgs -# ldrh r0, [r1, 0x4] -# strh r0, [r5, 0x2E] -# ldrh r0, [r5, 0x20] -# strh r0, [r5, 0x30] -# ldrh r0, [r5, 0x22] -# strh r0, [r5, 0x34] -# movs r2, 0x8 -# ldrsh r0, [r1, r2] -# cmp r0, 0 -# bne _080DCA04 -# ldr r4, _080DCA00 @ =gAnimBankTarget -# ldrb r0, [r4] -# movs r1, 0x2 -# bl GetBankPosition -# lsls r0, 24 -# lsrs r0, 24 -# strh r0, [r5, 0x32] -# ldrb r0, [r4] -# movs r1, 0x3 -# bl GetBankPosition -# lsls r0, 24 -# lsrs r0, 24 -# strh r0, [r5, 0x36] -# b _080DCA16 -# .align 2, 0 -# _080DC9FC: .4byte gBattleAnimArgs -# _080DCA00: .4byte gAnimBankTarget -# _080DCA04: -# ldr r0, _080DCA2C @ =gAnimBankTarget -# ldrb r0, [r0] -# adds r2, r5, 0 -# adds r2, 0x32 -# adds r3, r5, 0 -# adds r3, 0x36 -# movs r1, 0x1 -# bl sub_807A3FC -# _080DCA16: -# adds r0, r5, 0 -# bl sub_8078BD4 -# ldr r0, _080DCA30 @ =gBattleAnimArgs -# ldrh r0, [r0, 0x6] -# strh r0, [r5, 0x38] -# ldr r0, _080DCA34 @ =sub_80DCA38 -# str r0, [r5, 0x1C] -# pop {r4,r5} -# pop {r0} -# bx r0 -# .align 2, 0 -# _080DCA2C: .4byte gAnimBankTarget -# _080DCA30: .4byte gBattleAnimArgs -# _080DCA34: .4byte sub_80DCA38 -# thumb_func_end sub_80DC9A0 - -# thumb_func_start sub_80DCA38 -# sub_80DCA38: @ 80DCA38 -# push {r4,lr} -# adds r4, r0, 0 -# bl sub_8078B5C -# lsls r0, 24 -# cmp r0, 0 -# beq _080DCA4E -# adds r0, r4, 0 -# bl DestroyAnimSprite -# b _080DCA6A -# _080DCA4E: -# movs r1, 0x3A -# ldrsh r0, [r4, r1] -# movs r2, 0x38 -# ldrsh r1, [r4, r2] -# bl Sin -# ldrh r1, [r4, 0x24] -# adds r0, r1 -# strh r0, [r4, 0x24] -# ldrh r0, [r4, 0x3A] -# adds r0, 0xD -# movs r1, 0xFF -# ands r0, r1 -# strh r0, [r4, 0x3A] -# _080DCA6A: -# pop {r4} -# pop {r0} -# bx r0 -# thumb_func_end sub_80DCA38 - thumb_func_start sub_80DCA70 sub_80DCA70: @ 80DCA70 push {r4,lr} -- cgit v1.2.3 From 4facfe910285787778666eeee747b4c1c7201d98 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 14:43:24 -0500 Subject: through sub_80980D4 (nonmatching) --- asm/pokemon_storage_system.s | 331 +-------------------------------- include/mon_markings.h | 1 + include/pokemon_storage_system.h | 17 +- src/pokemon/pokemon_storage_system_2.c | 321 +++++++++++++++++++++++++++----- 4 files changed, 292 insertions(+), 378 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index bd1007f5d..eaed44102 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,335 +5,6 @@ .text - thumb_func_start sub_8097F58 -sub_8097F58: @ 8097F58 - push {r4,lr} - ldr r1, _08097FA4 @ =0x0000dace - movs r0, 0xD - movs r2, 0 - bl sub_80F7940 - ldr r4, _08097FA8 @ =gSharedMem - ldr r1, _08097FAC @ =0x000012ac - adds r3, r4, r1 - str r0, [r3] - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - strb r1, [r0, 0x5] - ldr r0, [r3] - adds r0, 0x43 - movs r1, 0x1 - strb r1, [r0] - ldr r1, [r3] - movs r0, 0x28 - strh r0, [r1, 0x20] - ldr r1, [r3] - movs r0, 0x95 - strh r0, [r1, 0x22] - movs r0, 0xD - bl GetSpriteTileStartByTag - ldr r1, _08097FB0 @ =0x000012b8 - adds r4, r1 - lsls r0, 16 - lsrs r0, 11 - ldr r1, _08097FB4 @ =0x06010000 - adds r0, r1 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08097FA4: .4byte 0x0000dace -_08097FA8: .4byte gSharedMem -_08097FAC: .4byte 0x000012ac -_08097FB0: .4byte 0x000012b8 -_08097FB4: .4byte 0x06010000 - thumb_func_end sub_8097F58 - - thumb_func_start sub_8097FB8 -sub_8097FB8: @ 8097FB8 - push {r4,r5,lr} - sub sp, 0x8 - ldr r0, _0809800C @ =gWaveformSpriteSheet - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp] - str r1, [sp, 0x4] - mov r0, sp - bl LoadSpriteSheet - movs r4, 0 - ldr r5, _08098010 @ =gSharedMem + 0x12B0 -_08097FD0: - lsls r1, r4, 6 - subs r1, r4 - adds r1, 0x8 - lsls r1, 16 - asrs r1, 16 - ldr r0, _08098014 @ =gSpriteTemplate_83B6EFC - movs r2, 0x9 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r2, r4, 2 - adds r2, r5 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, _08098018 @ =gSprites - adds r1, r0 - str r1, [r2] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _08097FD0 - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809800C: .4byte gWaveformSpriteSheet -_08098010: .4byte gSharedMem + 0x12B0 -_08098014: .4byte gSpriteTemplate_83B6EFC -_08098018: .4byte gSprites - thumb_func_end sub_8097FB8 - - thumb_func_start sub_809801C -sub_809801C: @ 809801C - push {lr} - ldr r1, _0809803C @ =gSharedMem - ldr r2, _08098040 @ =0x000011f0 - adds r0, r1, r2 - ldrh r0, [r0] - subs r2, 0x4 - adds r1, r2 - ldr r1, [r1] - bl sub_80981F0 - bl sub_80982B4 - bl sub_8098350 - pop {r0} - bx r0 - .align 2, 0 -_0809803C: .4byte gSharedMem -_08098040: .4byte 0x000011f0 - thumb_func_end sub_809801C - - thumb_func_start BoxSetMosaic -BoxSetMosaic: @ 8098044 - push {lr} - bl sub_809801C - ldr r0, _08098084 @ =gSharedMem - movs r1, 0x9C - lsls r1, 6 - adds r3, r0, r1 - ldr r2, [r3] - cmp r2, 0 - beq _08098080 - ldrb r0, [r2, 0x1] - movs r1, 0x10 - orrs r0, r1 - strb r0, [r2, 0x1] - ldr r1, [r3] - movs r0, 0xA - strh r0, [r1, 0x2E] - ldr r1, [r3] - movs r0, 0x1 - strh r0, [r1, 0x30] - ldr r1, [r3] - ldr r0, _08098088 @ =sub_8098090 - str r0, [r1, 0x1C] - ldr r2, _0809808C @ =REG_MOSAIC - ldr r0, [r3] - ldrh r0, [r0, 0x2E] - lsls r1, r0, 12 - lsls r0, 8 - orrs r1, r0 - strh r1, [r2] -_08098080: - pop {r0} - bx r0 - .align 2, 0 -_08098084: .4byte gSharedMem -_08098088: .4byte sub_8098090 -_0809808C: .4byte REG_MOSAIC - thumb_func_end BoxSetMosaic - - thumb_func_start sub_8098090 -sub_8098090: @ 8098090 - push {lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x2E] - ldrh r1, [r3, 0x30] - subs r0, r1 - strh r0, [r3, 0x2E] - lsls r0, 16 - cmp r0, 0 - bge _080980A6 - movs r0, 0 - strh r0, [r3, 0x2E] -_080980A6: - ldr r2, _080980CC @ =REG_MOSAIC - ldrh r0, [r3, 0x2E] - lsls r1, r0, 12 - lsls r0, 8 - orrs r1, r0 - strh r1, [r2] - movs r1, 0x2E - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _080980C8 - ldrb r0, [r3, 0x1] - movs r1, 0x11 - negs r1, r1 - ands r1, r0 - strb r1, [r3, 0x1] - ldr r0, _080980D0 @ =SpriteCallbackDummy - str r0, [r3, 0x1C] -_080980C8: - pop {r0} - bx r0 - .align 2, 0 -_080980CC: .4byte REG_MOSAIC -_080980D0: .4byte SpriteCallbackDummy - thumb_func_end sub_8098090 - - thumb_func_start sub_80980D4 -sub_80980D4: @ 80980D4 - push {r4,r5,lr} - sub sp, 0x28 - ldr r0, _08098150 @ =gUnknown_083B6DCC - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x18] - str r1, [sp, 0x1C] - ldr r0, _08098154 @ =gUnknown_083B6DD4 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x20] - str r1, [sp, 0x24] - mov r1, sp - ldr r0, _08098158 @ =gSpriteTemplate_83B6DDC - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - movs r1, 0 - add r5, sp, 0x18 - ldr r4, _0809815C @ =gSharedMem + 0x2784 - movs r3, 0 - ldr r2, _08098160 @ =0x000007ff -_08098102: - adds r0, r1, r4 - strb r3, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, r2 - bls _08098102 - movs r1, 0 - ldr r3, _08098164 @ =gSharedMem + 0x2704 - movs r2, 0 -_08098116: - lsls r0, r1, 1 - adds r0, r3 - strh r2, [r0] - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0xF - bls _08098116 - ldr r0, _08098168 @ =gSharedMem - movs r1, 0x9C - lsls r1, 6 - adds r0, r1 - movs r1, 0 - str r1, [r0] - adds r0, r5, 0 - bl LoadSpriteSheet - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - beq _080981C4 - add r0, sp, 0x20 - bl LoadSpritePalette - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - beq _080981C4 - b _080981B0 - .align 2, 0 -_08098150: .4byte gUnknown_083B6DCC -_08098154: .4byte gUnknown_083B6DD4 -_08098158: .4byte gSpriteTemplate_83B6DDC -_0809815C: .4byte gSharedMem + 0x2784 -_08098160: .4byte 0x000007ff -_08098164: .4byte gSharedMem + 0x2704 -_08098168: .4byte gSharedMem -_0809816C: - ldr r2, _0809819C @ =gSharedMem - movs r0, 0x9C - lsls r0, 6 - adds r3, r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080981A0 @ =gSprites - adds r0, r1 - str r0, [r3] - lsls r0, r4, 4 - movs r1, 0x80 - lsls r1, 1 - adds r0, r1 - ldr r3, _080981A4 @ =0x000026fa - adds r1, r2, r3 - strh r0, [r1] - ldr r4, _080981A8 @ =0x000026fc - adds r2, r4 - lsls r0, r5, 5 - ldr r1, _080981AC @ =0x06010000 - adds r0, r1 - str r0, [r2] - b _080981C4 - .align 2, 0 -_0809819C: .4byte gSharedMem -_080981A0: .4byte gSprites -_080981A4: .4byte 0x000026fa -_080981A8: .4byte 0x000026fc -_080981AC: .4byte 0x06010000 -_080981B0: - mov r0, sp - movs r1, 0x28 - movs r2, 0x30 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - bne _0809816C -_080981C4: - ldr r0, _080981E8 @ =gSharedMem - movs r2, 0x9C - lsls r2, 6 - adds r0, r2 - ldr r0, [r0] - cmp r0, 0 - bne _080981DE - movs r0, 0x2 - bl FreeSpriteTilesByTag - ldr r0, _080981EC @ =0x0000dac7 - bl FreeSpritePaletteByTag -_080981DE: - add sp, 0x28 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080981E8: .4byte gSharedMem -_080981EC: .4byte 0x0000dac7 - thumb_func_end sub_80980D4 - thumb_func_start sub_80981F0 sub_80981F0: @ 80981F0 push {r4-r7,lr} @@ -1291,6 +962,8 @@ _08098B32: bx r0 thumb_func_end sub_8098AA8 +// File boundary + thumb_func_start get_preferred_box get_preferred_box: @ 8098B3C ldr r0, _08098B44 @ =gPokemonStorage diff --git a/include/mon_markings.h b/include/mon_markings.h index 3b4aa333c..5b6abf356 100644 --- a/include/mon_markings.h +++ b/include/mon_markings.h @@ -25,5 +25,6 @@ void sub_80F7404(void); void sub_80F7418(u8 markings, s16 x, s16 y); void sub_80F7470(void); bool8 sub_80F7500(void); +struct Sprite *sub_80F7940(u16 tileTag, u16 paletteTag, const u16 *palette); #endif //POKERUBY_MON_MARKINGS_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 51ebda88f..cbdec8999 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -85,14 +85,19 @@ struct PokemonStorageSystemData { u8 filler_08b6[0x4a8]; s16 unk_0d5e; s16 unk_0d60; - u8 filler_0d62[0x490]; + u8 filler_0d62[0x48a]; + u32 unk_11ec; + u16 unk_11f0; u16 unk_11f2; u8 filler_11f4[2]; u8 unk_11f6; u8 unk_11f7; u8 unk_11f8; u8 unk_11f9; - u8 unk_11fa[0xc2]; + u8 unk_11fa[0xb2]; + struct Sprite *unk_12ac; + struct Sprite *unk_12b0[2]; + u16 *unk_12b8; struct PokemonMarkMenu unk_12bc; struct UnkPSSStruct_2002370 unk_2370; u8 filler_25b4[0xd8]; @@ -102,8 +107,12 @@ struct PokemonStorageSystemData { struct Pokemon *unk_2690; u8 unk_2694[18]; u8 unk_26a6[62]; - u8 unk_26e4[0x20]; - u16 unk_2704[0x40]; + u8 unk_26e4[0x16]; + u16 unk_26fa; + u16 *unk_26fc; + struct Sprite *unk_2700; + u16 unk_2704[0x10]; + u8 filler_2724[0x60]; u8 unk_2784[0x800]; }; diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index 5c72d02e9..f8ae1c013 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -66,9 +66,13 @@ void sub_8097E44(void); void sub_8097E70(void); void sub_8097F58(void); void sub_8097FB8(void); -void BoxSetMosaic(void); void sub_809801C(void); +void BoxSetMosaic(void); +void sub_8098090(struct Sprite *sprite); void sub_80980D4(void); +void sub_80981F0(u16 species, u32 pid); +void sub_80982B4(void); +void sub_8098350(void); void sub_8098400(void); void add_to_c3_somehow(void); bool8 sub_80985CC(void); @@ -191,50 +195,6 @@ const struct SpritePalette gWaveformSpritePalette = { WaveformPalette, 0xdacd }; -const struct SpriteSheet gWaveformSpriteSheet = { - WaveformTiles, 0x1c0, 0x0005 -}; - -const struct SpriteSheet gUnknown_083B6DCC = { - ePokemonStorageSystem.unk_2784, 0x800, 0x0002 -}; - -const struct SpritePalette gUnknown_083B6DD4 = { - ePokemonStorageSystem.unk_2704, 0xdac7 -}; - -const struct OamData gOamData_83B6EAC; - -const struct SpriteTemplate gSpriteTemplate_83B6DDC = { - 0x0002, 0xdac7, &gOamData_83B6EAC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -}; - -const struct StorageAction gPCStorageActionTexts[] = { - {PCText_ExitBox, 0}, - {PCText_WhatYouDo, 0}, - {PCText_PickATheme, 0}, - {PCText_PickAWallpaper, 0}, - {PCText_IsSelected, 1}, - {PCText_JumpToWhichBox, 0}, - {PCText_DepositInWhichBox, 0}, - {PCText_WasDeposited, 1}, - {PCText_BoxIsFull, 0}, - {PCText_ReleasePoke, 0}, - {PCText_WasReleased, 4}, - {PCText_ByeBye, 6}, - {PCText_MarkPoke, 0}, - {PCText_LastPoke, 0}, - {PCText_PartyFull, 0}, - {PCText_HoldingPoke, 0}, - {PCText_WhichOneWillTake, 0}, - {PCText_CantReleaseEgg, 0}, - {PCText_ContinueBox, 0}, - {PCText_CameBack, 1}, - {PCText_Worried, 0}, - {PCText_Surprise, 0}, - {PCText_PleaseRemoveMail, 0} -}; - // .text @@ -1484,6 +1444,249 @@ void sub_8097E70(void) sub_809801C(); } +void sub_8097F58(void) +{ + gPokemonStorageSystemPtr->unk_12ac = sub_80F7940(0x000d, 0xdace, 0); + gPokemonStorageSystemPtr->unk_12ac->oam.priority = 0; + gPokemonStorageSystemPtr->unk_12ac->subpriority = 1; + gPokemonStorageSystemPtr->unk_12ac->pos1.x = 0x28; + gPokemonStorageSystemPtr->unk_12ac->pos1.y = 0x95; + gPokemonStorageSystemPtr->unk_12b8 = BG_CHAR_ADDR(4) + 32 * GetSpriteTileStartByTag(0x000d); +} + +const struct SpriteTemplate gSpriteTemplate_83B6EFC; + +void sub_8097FB8(void) +{ + u16 i; + struct SpriteSheet sheet = {WaveformTiles, 0x1c0, 0x0005}; + + LoadSpriteSheet(&sheet); + for (i = 0; i < 2; i++) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_83B6EFC, i * 63 + 8, 9, 2); + gPokemonStorageSystemPtr->unk_12b0[i] = gSprites + spriteId; + } +} + +void sub_809801C(void) +{ + sub_80981F0(gPokemonStorageSystemPtr->unk_11f0, gPokemonStorageSystemPtr->unk_11ec); + sub_80982B4(); + sub_8098350(); +} + +void BoxSetMosaic(void) +{ + sub_809801C(); + if (gPokemonStorageSystemPtr->unk_2700) + { + gPokemonStorageSystemPtr->unk_2700->oam.mosaic = TRUE; + gPokemonStorageSystemPtr->unk_2700->data[0] = 10; + gPokemonStorageSystemPtr->unk_2700->data[1] = 1; + gPokemonStorageSystemPtr->unk_2700->callback = sub_8098090; + REG_MOSAIC = (gPokemonStorageSystemPtr->unk_2700->data[0] << 12) | (gPokemonStorageSystemPtr->unk_2700->data[0] << 8); + } +} + +void sub_8098090(struct Sprite *sprite) +{ + sprite->data[0] -= sprite->data[1]; + if (sprite->data[0] < 0) + sprite->data[0] = 0; + REG_MOSAIC = (sprite->data[0] << 12) | (sprite->data[0] << 8); + if (sprite->data[0] == 0) + { + sprite->oam.mosaic = FALSE; + sprite->callback = SpriteCallbackDummy; + } +} + +// sub_80980D4 + +const struct OamData gOamData_83B6EAC; + +#ifdef NONMATCHING +void sub_80980D4(void) +{ + u16 i; + u16 tileStart; + u8 palSlot; + u8 spriteId; + struct SpriteSheet sheet = {gPokemonStorageSystemPtr->unk_2784, 0x800, 0x0002}; + struct SpritePalette palette = {gPokemonStorageSystemPtr->unk_2704, 0xdac7}; + struct SpriteTemplate template = { + 0x0002, 0xdac7, &gOamData_83B6EAC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + }; + + for (i = 0; i < 0x800; i++) + gPokemonStorageSystemPtr->unk_2784[i] = 0; + for (i = 0; i < 0x10; i++) + gPokemonStorageSystemPtr->unk_2704[i] = 0; + + gPokemonStorageSystemPtr->unk_2700 = NULL; + if ((tileStart = LoadSpriteSheet(&sheet)) != 0 + && (palSlot = LoadSpritePalette(&palette)) != 0xff + && (spriteId = CreateSprite(&template, 0x28, 0x30, 0)) != MAX_SPRITES) + { + // FIXME this gets compiled as a separate block between the palSlot check and the spriteId check + gPokemonStorageSystemPtr->unk_2700 = gSprites + spriteId; + gPokemonStorageSystemPtr->unk_26fa = palSlot * 16 + 0x100; + gPokemonStorageSystemPtr->unk_26fc = BG_CHAR_ADDR(4) + tileStart * 32; + } + + if (gPokemonStorageSystemPtr->unk_2700 == NULL) + { + FreeSpriteTilesByTag(0x0002); + FreeSpritePaletteByTag(0xdac7); + } +} +#else + +const struct SpriteSheet gUnknown_083B6DCC = {ePokemonStorageSystem.unk_2784, 0x800, 0x0002}; +const struct SpritePalette gUnknown_083B6DD4 = {ePokemonStorageSystem.unk_2704, 0xdac7}; +const struct SpriteTemplate gSpriteTemplate_83B6DDC = { + 0x0002, 0xdac7, &gOamData_83B6EAC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +}; + +__attribute__((naked)) void sub_80980D4(void) +{ + asm_unified("\tpush {r4,r5,lr}\n" + "\tsub sp, 0x28\n" + "\tldr r0, _08098150 @ =gUnknown_083B6DCC\n" + "\tldr r1, [r0, 0x4]\n" + "\tldr r0, [r0]\n" + "\tstr r0, [sp, 0x18]\n" + "\tstr r1, [sp, 0x1C]\n" + "\tldr r0, _08098154 @ =gUnknown_083B6DD4\n" + "\tldr r1, [r0, 0x4]\n" + "\tldr r0, [r0]\n" + "\tstr r0, [sp, 0x20]\n" + "\tstr r1, [sp, 0x24]\n" + "\tmov r1, sp\n" + "\tldr r0, _08098158 @ =gSpriteTemplate_83B6DDC\n" + "\tldm r0!, {r2-r4}\n" + "\tstm r1!, {r2-r4}\n" + "\tldm r0!, {r2-r4}\n" + "\tstm r1!, {r2-r4}\n" + "\tmovs r1, 0\n" + "\tadd r5, sp, 0x18\n" + "\tldr r4, _0809815C @ =gSharedMem + 0x2784\n" + "\tmovs r3, 0\n" + "\tldr r2, _08098160 @ =0x000007ff\n" + "_08098102:\n" + "\tadds r0, r1, r4\n" + "\tstrb r3, [r0]\n" + "\tadds r0, r1, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r1, r0, 16\n" + "\tcmp r1, r2\n" + "\tbls _08098102\n" + "\tmovs r1, 0\n" + "\tldr r3, _08098164 @ =gSharedMem + 0x2704\n" + "\tmovs r2, 0\n" + "_08098116:\n" + "\tlsls r0, r1, 1\n" + "\tadds r0, r3\n" + "\tstrh r2, [r0]\n" + "\tadds r0, r1, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r1, r0, 16\n" + "\tcmp r1, 0xF\n" + "\tbls _08098116\n" + "\tldr r0, _08098168 @ =gSharedMem\n" + "\tmovs r1, 0x9C\n" + "\tlsls r1, 6\n" + "\tadds r0, r1\n" + "\tmovs r1, 0\n" + "\tstr r1, [r0]\n" + "\tadds r0, r5, 0\n" + "\tbl LoadSpriteSheet\n" + "\tlsls r0, 16\n" + "\tlsrs r5, r0, 16\n" + "\tcmp r5, 0\n" + "\tbeq _080981C4\n" + "\tadd r0, sp, 0x20\n" + "\tbl LoadSpritePalette\n" + "\tlsls r0, 24\n" + "\tlsrs r4, r0, 24\n" + "\tcmp r4, 0xFF\n" + "\tbeq _080981C4\n" + "\tb _080981B0\n" + "\t.align 2, 0\n" + "_08098150: .4byte gUnknown_083B6DCC\n" + "_08098154: .4byte gUnknown_083B6DD4\n" + "_08098158: .4byte gSpriteTemplate_83B6DDC\n" + "_0809815C: .4byte gSharedMem + 0x2784\n" + "_08098160: .4byte 0x000007ff\n" + "_08098164: .4byte gSharedMem + 0x2704\n" + "_08098168: .4byte gSharedMem\n" + "_0809816C:\n" + "\tldr r2, _0809819C @ =gSharedMem\n" + "\tmovs r0, 0x9C\n" + "\tlsls r0, 6\n" + "\tadds r3, r2, r0\n" + "\tlsls r0, r1, 4\n" + "\tadds r0, r1\n" + "\tlsls r0, 2\n" + "\tldr r1, _080981A0 @ =gSprites\n" + "\tadds r0, r1\n" + "\tstr r0, [r3]\n" + "\tlsls r0, r4, 4\n" + "\tmovs r1, 0x80\n" + "\tlsls r1, 1\n" + "\tadds r0, r1\n" + "\tldr r3, _080981A4 @ =0x000026fa\n" + "\tadds r1, r2, r3\n" + "\tstrh r0, [r1]\n" + "\tldr r4, _080981A8 @ =0x000026fc\n" + "\tadds r2, r4\n" + "\tlsls r0, r5, 5\n" + "\tldr r1, _080981AC @ =0x06010000\n" + "\tadds r0, r1\n" + "\tstr r0, [r2]\n" + "\tb _080981C4\n" + "\t.align 2, 0\n" + "_0809819C: .4byte gSharedMem\n" + "_080981A0: .4byte gSprites\n" + "_080981A4: .4byte 0x000026fa\n" + "_080981A8: .4byte 0x000026fc\n" + "_080981AC: .4byte 0x06010000\n" + "_080981B0:\n" + "\tmov r0, sp\n" + "\tmovs r1, 0x28\n" + "\tmovs r2, 0x30\n" + "\tmovs r3, 0\n" + "\tbl CreateSprite\n" + "\tlsls r0, 24\n" + "\tlsrs r1, r0, 24\n" + "\tcmp r1, 0x40\n" + "\tbne _0809816C\n" + "_080981C4:\n" + "\tldr r0, _080981E8 @ =gSharedMem\n" + "\tmovs r2, 0x9C\n" + "\tlsls r2, 6\n" + "\tadds r0, r2\n" + "\tldr r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbne _080981DE\n" + "\tmovs r0, 0x2\n" + "\tbl FreeSpriteTilesByTag\n" + "\tldr r0, _080981EC @ =0x0000dac7\n" + "\tbl FreeSpritePaletteByTag\n" + "_080981DE:\n" + "\tadd sp, 0x28\n" + "\tpop {r4,r5}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" + "_080981E8: .4byte gSharedMem\n" + "_080981EC: .4byte 0x0000dac7"); +} +#endif + +extern const struct StorageAction gPCStorageActionTexts[]; + asm(".section .text.8098898"); void PrintStorageActionText(u8 index) { @@ -1564,3 +1767,31 @@ void PrintStorageActionText(u8 index) { ptr[0] = EOS; MenuPrint(gPokemonStorageSystemPtr->unk_2694, 11, 17); } + +// FIXME: move this back + +const struct StorageAction gPCStorageActionTexts[] = { + {PCText_ExitBox, 0}, + {PCText_WhatYouDo, 0}, + {PCText_PickATheme, 0}, + {PCText_PickAWallpaper, 0}, + {PCText_IsSelected, 1}, + {PCText_JumpToWhichBox, 0}, + {PCText_DepositInWhichBox, 0}, + {PCText_WasDeposited, 1}, + {PCText_BoxIsFull, 0}, + {PCText_ReleasePoke, 0}, + {PCText_WasReleased, 4}, + {PCText_ByeBye, 6}, + {PCText_MarkPoke, 0}, + {PCText_LastPoke, 0}, + {PCText_PartyFull, 0}, + {PCText_HoldingPoke, 0}, + {PCText_WhichOneWillTake, 0}, + {PCText_CantReleaseEgg, 0}, + {PCText_ContinueBox, 0}, + {PCText_CameBack, 1}, + {PCText_Worried, 0}, + {PCText_Surprise, 0}, + {PCText_PleaseRemoveMail, 0} +}; -- cgit v1.2.3 From 03b167a73e2f18fa79bbf0e6ffe11e0c35c12ad8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 14:26:15 -0600 Subject: more text/menu renaming --- asm/contest_link_80C2020.s | 2 +- asm/pokemon_storage_system.s | 18 +++--- asm/pokenav.s | 12 ++-- include/menu.h | 21 +++---- include/menu_cursor.h | 8 +-- include/text.h | 26 ++++---- src/battle/battle_2.c | 6 +- src/battle/battle_4.c | 8 +-- src/battle/battle_controller_player.c | 24 +++---- src/battle/battle_controller_safari.c | 6 +- src/battle/battle_controller_wally.c | 6 +- src/battle/battle_party_menu.c | 2 +- src/battle/battle_records.c | 2 +- src/battle/reshow_battle_screen.c | 2 +- src/contest.c | 32 +++++----- src/debug/matsuda_debug_menu.c | 10 +-- src/debug/mori_debug_menu.c | 2 +- src/debug/sound_check_menu.c | 4 +- src/debug/unknown_debug_menu.c | 2 +- src/easy_chat_1.c | 14 ++--- src/engine/clear_save_data_menu.c | 6 +- src/engine/link.c | 6 +- src/engine/main_menu.c | 32 +++++----- src/engine/menu.c | 114 ++++++++++++++++++++-------------- src/engine/menu_cursor.c | 62 +++++++++--------- src/engine/mystery_event_menu.c | 2 +- src/engine/name_string_util.c | 4 +- src/engine/naming_screen.c | 2 +- src/engine/option_menu.c | 4 +- src/engine/reset_rtc_screen.c | 2 +- src/engine/save_failed_screen.c | 2 +- src/engine/text.c | 58 ++++++++--------- src/engine/trade.c | 44 ++++++------- src/engine/trainer_card.c | 16 ++--- src/field/berry_tag_screen.c | 2 +- src/field/choose_party.c | 8 +-- src/field/daycare.c | 6 +- src/field/decoration.c | 24 +++---- src/field/diploma.c | 2 +- src/field/field_effect.c | 4 +- src/field/field_region_map.c | 2 +- src/field/field_specials.c | 4 +- src/field/item_menu.c | 16 ++--- src/field/mauville_man.c | 2 +- src/field/menu_helpers.c | 2 +- src/field/money.c | 2 +- src/field/overworld.c | 8 +-- src/field/party_menu.c | 38 ++++++------ src/field/player_pc.c | 28 ++++----- src/field/pokeblock.c | 10 +-- src/field/region_map.c | 4 +- src/field/script_menu.c | 10 +-- src/field/secret_base.c | 10 +-- src/field/shop.c | 14 ++--- src/field/slot_machine.c | 6 +- src/field/start_menu.c | 8 +-- src/field/starter_choose.c | 4 +- src/field/trader.c | 6 +- src/field/tv.c | 8 +-- src/field/use_pokeblock.c | 2 +- src/field/wallclock.c | 8 +-- src/pokemon/learn_move.c | 18 +++--- src/pokemon/mail.c | 2 +- src/pokemon/mon_markings.c | 4 +- src/pokemon/pokeblock_feed.c | 2 +- src/pokemon/pokedex.c | 30 ++++----- src/pokemon/pokemon_1.c | 2 +- src/pokemon/pokemon_menu.c | 18 +++--- src/pokemon/pokemon_summary_screen.c | 8 +-- src/pokenav_before.c | 10 +-- src/roulette.c | 2 +- src/scene/berry_blender.c | 20 +++--- src/scene/contest_painting.c | 4 +- src/scene/credits.c | 2 +- src/scene/egg_hatch.c | 4 +- src/scene/evolution_scene.c | 14 ++--- src/scene/hall_of_fame.c | 8 +-- 77 files changed, 481 insertions(+), 466 deletions(-) diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 5e1265f6b..71788c918 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -14,7 +14,7 @@ sub_80C2020: @ 80C2020 strh r0, [r5] ldr r4, _080C20F0 @ =gWindowTemplate_81E6FA0 adds r0, r4, 0 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate ldr r0, _080C20F4 @ =gMenuWindow adds r1, r4, 0 bl Text_InitWindowWithTemplate diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index fd49e1520..d878821cb 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -682,7 +682,7 @@ _08095FA2: _08095FC0: .4byte gMain _08095FC4: .4byte gUnknown_083B600C _08095FC8: - bl HandleDestroyMenuCursors + bl Menu_DestroyCursor movs r0, 0 movs r1, 0 movs r2, 0xD @@ -897,7 +897,7 @@ StorageSystemCreatePrimaryMenu: @ 8096168 movs r0, 0x1 movs r1, 0x1 movs r2, 0x4 - bl PrintMenuItems + bl Menu_PrintItems str r4, [sp] movs r0, 0xC str r0, [sp, 0x4] @@ -1643,7 +1643,7 @@ sub_80966F4: @ 80966F4 ldr r0, _0809677C @ =gWindowTemplate_81E6D38 adds r1, r5, 0 mov r2, r8 - bl sub_8004E3C + bl Text_InitWindow8004E3C str r5, [r4] str r6, [r4, 0x4] ldr r0, _08096780 @ =0x80000200 @@ -1847,7 +1847,7 @@ _080968D4: b _0809697A _080968E8: ldr r0, _080968F0 @ =gWindowTemplate_81E6D00 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate b _0809697A .align 2, 0 _080968F0: .4byte gWindowTemplate_81E6D00 @@ -1986,7 +1986,7 @@ _08096A2C: .4byte gUnknown_0203847D _08096A30: .4byte gUnknown_0203847F _08096A34: ldr r0, _08096A3C @ =gWindowTemplate_81E6D00 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate b _08096AD8 .align 2, 0 _08096A3C: .4byte gWindowTemplate_81E6D00 @@ -5666,7 +5666,7 @@ sub_8098A38: @ 8098A38 thumb_func_start sub_8098A5C sub_8098A5C: @ 8098A5C push {lr} - bl HandleDestroyMenuCursors + bl Menu_DestroyCursor movs r0, 0xA movs r1, 0x10 movs r2, 0x1D @@ -8748,7 +8748,7 @@ sub_809A1BC: @ 809A1BC ldr r0, _0809A234 @ =gWindowTemplate_81E6D38 adds r1, r5, 0 str r3, [sp, 0x4] - bl sub_8004E3C + bl Text_InitWindow8004E3C str r5, [r4] ldr r3, [sp, 0x4] str r3, [r4, 0x4] @@ -14498,7 +14498,7 @@ sub_809CE84: @ 809CE84 lsls r3, 5 adds r4, r3 adds r3, r4, 0 - bl PrintMenuItems + bl Menu_PrintItems ldrb r1, [r5] adds r1, 0x1 lsls r1, 24 @@ -14582,7 +14582,7 @@ _0809CF8E: negs r0, r0 cmp r5, r0 beq _0809CFB2 - bl HandleDestroyMenuCursors + bl Menu_DestroyCursor ldr r0, _0809CFD0 @ =gUnknown_083B6DB4 ldr r1, [r0] ldr r2, _0809CFD4 @ =0x000011ba diff --git a/asm/pokenav.s b/asm/pokenav.s index 34d8aba2e..7c766addc 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -567,7 +567,7 @@ sub_80F0A74: @ 80F0A74 adds r0, r4, 0 movs r1, 0x61 movs r3, 0 - bl MenuPrint_PixelCoords + bl Menu_PrintTextPixelCoords ldr r1, _080F0AE8 @ =0x0000d158 adds r0, r5, r1 ldrh r0, [r0] @@ -1032,7 +1032,7 @@ _080F0E42: _080F0E54: movs r1, 0x61 movs r3, 0 - bl MenuPrint_PixelCoords + bl Menu_PrintTextPixelCoords b _080F0EA0 .align 2, 0 _080F0E60: .4byte gUnknown_083DFEC4 @@ -1054,7 +1054,7 @@ _080F0E6C: adds r0, r4, 0 movs r1, 0x61 movs r3, 0 - bl MenuPrint_PixelCoords + bl Menu_PrintTextPixelCoords b _080F0D6C .align 2, 0 _080F0E94: .4byte gUnknown_083DFEC4 @@ -1358,7 +1358,7 @@ _080F10FC: .4byte gUnknown_083DFEC4 _080F1100: .4byte 0x0000d162 _080F1104: ldr r0, _080F110C @ =gWindowTemplate_81E70B8 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate b _080F1218 .align 2, 0 _080F110C: .4byte gWindowTemplate_81E70B8 @@ -2422,7 +2422,7 @@ _080F19B8: movs r1, 0x1 movs r2, 0x70 movs r3, 0x1 - bl MenuPrint_PixelCoords + bl Menu_PrintTextPixelCoords pop {r4,r5} pop {r0} bx r0 @@ -7665,7 +7665,7 @@ sub_80F4194: @ 80F4194 ldr r0, [r4, 0x8] ldr r0, _080F42B4 @ =gWindowTemplate_81E70F0 adds r1, r6, 0 - bl sub_8004E3C + bl Text_InitWindow8004E3C movs r3, 0x88 lsls r3, 2 adds r1, r6, r3 diff --git a/include/menu.h b/include/menu.h index 3339ff644..3295cd5c5 100644 --- a/include/menu.h +++ b/include/menu.h @@ -45,7 +45,7 @@ void unref_sub_8071FBC(u16, u8, u8, u8, u8); void Menu_DisplayDialogueFrame(void); void MenuPrintMessage(const u8 *, u8, u8); void MenuPrintMessageDefaultCoords(const u8 *); -void MenuSetText(const u8 *); +void Menu_SetText(const u8 *); u8 Menu_UpdateWindowText(void); u8 unref_sub_8072098(void); void Menu_ClearWindowText(void); @@ -54,17 +54,15 @@ u8 Menu_MoveCursorNoWrap(s8); u8 Menu_GetCursorPos(void); s8 Menu_ProcessInput(void); s8 Menu_ProcessInputNoWrap(void); -u8 MoveMenuCursor3(s8); -u8 MoveMenuCursor4(s8); void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32); s8 Menu_ProcessInputGridLayout(void); -u8 sub_807288C(u8); -void PrintMenuItems(u8, u8, u8, const struct MenuAction[]); -void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order); +u8 Menu_GetColumnXCoord(u8); +void Menu_PrintItems(u8, u8, u8, const struct MenuAction[]); +void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order); void InitYesNoMenu(u8, u8, u8); void DisplayYesNoMenu(u8, u8, u32); -s8 ProcessMenuInputNoWrap_(void); -u8 MenuPrint_PixelCoords(const u8 *, u8, u16, u8); +s8 Menu_ProcessInputNoWrap_(void); +u8 Menu_PrintTextPixelCoords(const u8 *, u8, u16, u8); u8 sub_8072A18(const u8 *, u8, u16, u8, u32); u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32); int sub_8072AB0(const u8 *, u8, u16, u8, u8, u32); @@ -75,16 +73,15 @@ u8 *sub_8072C14(u8 *, s32, u8, u8); u8 *sub_8072C44(u8 *, s32, u8, u8); u8 *sub_8072C74(u8 *, const u8 *, u8, u8); u8 sub_8072CA4(const u8 *s); -u8 sub_8072CBC(void); +u8 Menu_GetTextWindowPaletteNum(void); void Menu_GetTextColors(u8 *, u8 *, u8 *); -u32 MenuUpdateWindowText_OverrideLineLength(u8); +u32 Menu_UpdateWindowTextOverrideLineLength(u8); struct Window * unref_sub_8072D0C(void); u8 InitMenu(u8, u8, u8, u8, u8, u8); -void RedrawMenuCursor(u8, u8); void unref_sub_8072DC0(void); void sub_8072DCC(u8); void sub_8072DDC(u8); -void HandleDestroyMenuCursors(void); +void Menu_DestroyCursor(void); #if GERMAN u8 *de_sub_8073174(u8 *name, const u8 *format); diff --git a/include/menu_cursor.h b/include/menu_cursor.h index ca82ef244..8d9a4f23c 100644 --- a/include/menu_cursor.h +++ b/include/menu_cursor.h @@ -4,11 +4,11 @@ #include "sprite.h" void sub_814A590(void); -u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); +u8 MenuCursor_Create814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); u8 sub_814A758(u8 a1, u8 a2, u8 a3, u8 a4); u8 unref_sub_814A7AC(u8 a1, u16 a2, u8 a3); void DestroyMenuCursor(void); -void sub_814A880(u8 a1, u8 a2); +void MenuCursor_SetPos814A880(u8 a1, u8 a2); void sub_814A904(void); void sub_814A958(u8 a1); void sub_814AABC(void (*callback)(struct Sprite *)); @@ -16,8 +16,8 @@ void sub_814AAF8(u16 a1); void sub_814AB84(void); void unref_sub_814ABE4(int a1); u8 CreateBlendedOutlineCursor(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); -void sub_814AD44(void); -void sub_814AD7C(u8 a1, u8 a2); +void MenuCursor_Destroy814AD44(void); +void MenuCursor_SetPos814AD7C(u8 a1, u8 a2); void sub_814ADC8(void); void sub_814ADF4(u8 a1); diff --git a/include/text.h b/include/text.h index c34f222d5..f0d039d45 100644 --- a/include/text.h +++ b/include/text.h @@ -151,8 +151,8 @@ extern const struct WindowTemplate gWindowTemplate_81E6D54; extern const struct WindowTemplate gWindowTemplate_81E6D70; extern const struct WindowTemplate gWindowTemplate_81E6D8C; extern const struct WindowTemplate gWindowTemplate_81E6DA8; -extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Values; -extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels; +extern const struct WindowTemplate gWindowTemplate_TrainerCard_Back_Values; +extern const struct WindowTemplate gWindowTemplate_TrainerCard_Back_Labels; extern const struct WindowTemplate gWindowTemplate_81E6DFC; extern const struct WindowTemplate gWindowTemplate_81E6E18; extern const struct WindowTemplate gWindowTemplate_81E6E34; @@ -206,14 +206,14 @@ extern u8 gStringVar4[]; extern u8 gTileBuffer[]; void LoadFontDefaultPalette(const struct WindowTemplate *winConfig); -void SetUpWindowConfig(const struct WindowTemplate *winConfig); +void Text_LoadWindowTemplate(const struct WindowTemplate *winConfig); u16 InitWindowTileData(struct Window *win, u16 startOffset); u32 MultistepInitWindowTileData(struct Window *win, u16 startOffset); bool32 MultistepLoadFont(void); void Text_InitWindowWithTemplate(struct Window *win, const struct WindowTemplate *winConfig); void Text_InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6); -void sub_8002E90(struct Window *win, const u8 *text); +void Text_SetWindowText(struct Window *win, const u8 *text); void Text_InitWindow8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); u8 Text_PrintWindow8002F44(struct Window *win); u8 Text_PrintWindowSimple(struct Window *win); @@ -232,24 +232,24 @@ void Text_ClearWindow(struct Window *win); u16 Text_GetWindowTilemapEntry(struct Window *win, u8 x, u8 y); void Text_FillWindowBorder(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom); void DrawWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom); -void FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom); -void FillWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom); -void ZeroFillWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); +void Text_FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom); +void Text_FillWindowRectDefPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom); +void Text_EraseWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); void Text_BlankWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom); u8 GetExtCtrlCodeLength(u8 code); u8 *AlignInt1(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignType); u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignType); u8 *AlignString(struct Window *win, u8 *dest, const u8 *src, u8 alignAmount, u8 alignType); u8 GetStringWidth(struct Window *win, const u8 *s); -u8 sub_8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6); -u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); -u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6); -u8 sub_8004E24(struct Window *win); +u8 Text_InitWindow8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6); +u8 Text_InitWindow8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top); +u8 Text_InitWindow8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6); +u8 Text_GetWindowPaletteNum(struct Window *win); void Text_GetTextColors(struct Window *win, u8 *foreground, u8 *background, u8 *shadow); -void sub_8004E3C(const struct WindowTemplate *winConfig, u8 *tileData, const u8 *text); +void Text_InitWindow8004E3C(const struct WindowTemplate *winConfig, u8 *tileData, const u8 *text); u8 Text_GetStringWidthFromWindowTemplate(const struct WindowTemplate *winConfig, const u8 *s); void ConvertInternationalString(u8 *s, u8 language); -void StripExtCtrlCodes(u8 *str); +void Text_StripExtCtrlCodes(u8 *str); s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2); u8 sub_8004FD0(struct Window *win, u8 *dest, const u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 width, u32 a8); diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 42cc0b538..249b67e0d 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -234,7 +234,7 @@ void InitBattle(void) } //sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8); sub_80895F8(gUnknown_081F9674); - SetUpWindowConfig(&gWindowTemplate_81E6C58); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -553,7 +553,7 @@ void sub_800F02C(void) gUnknown_02023A00[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS); gUnknown_02023A00[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY); gUnknown_02023A00[i].gender = GetMonGender(&gPlayerParty[i]); - StripExtCtrlCodes(nickname); + Text_StripExtCtrlCodes(nickname); gUnknown_02023A00[i].language = GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE); if (gUnknown_02023A00[i].language != 1) PadNameString(nickname, 0); @@ -1210,7 +1210,7 @@ void c2_8011A1C(void) gUnknown_03004DE0[0][i] = 0xFF10; gUnknown_03004DE0[1][i] = 0xFF10; } - SetUpWindowConfig(&gWindowTemplate_81E6C58); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 4be9b7d1c..164329c1b 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -136,7 +136,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move); void IncrementGameStat(u8 index); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); u16 GetPokedexHeightWeight(u16 national_num, u8 heightweight); -u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); +u8 MenuCursor_Create814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); void DestroyMenuCursor(void); void sub_802BC6C(void); u8 sub_809FA30(void); @@ -155,7 +155,7 @@ u8 Overworld_GetMapTypeOfSaveblockLocation(void); u8 CalculatePlayerPartyCount(void); u16 Sqrt(u32 num); u8 sub_809070C(u16 nationalNum, u32 TiD, u32 PiD); //task prepare poke dex display -void sub_814A880(u8 a1, u8 a2); +void MenuCursor_SetPos814A880(u8 a1, u8 a2); u8 CheckMoveLimitations(u8 bank, u8 unusable_moves, u8 flags); bool8 IsLinkDoubleBattle(void); void sub_8094B6C(u8 bank, u8 partyID, u8 r2); @@ -10769,7 +10769,7 @@ void sub_8023A80(void) sub_802BBD4(0x18, 8, 0x1D, 0xD, 0); Text_InitWindow(&gUnknown_03004210, BattleText_YesNo, 0x100, 0x19, 0x9); Text_PrintWindow8002F44(&gUnknown_03004210); - sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20); + MenuCursor_Create814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20); } void sub_8023AD8(void) @@ -17333,7 +17333,7 @@ _0802BC68: .4byte 0x00001025\n\ void sub_802BC6C(void) { - sub_814A880(0xC8, ((gBattleCommunication[1] << 28) + 1207959552) >> 24); //what could that be? + MenuCursor_SetPos814A880(0xC8, ((gBattleCommunication[1] << 28) + 1207959552) >> 24); //what could that be? } void nullsub_6(void) diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 4bbda2afd..489581132 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -744,7 +744,7 @@ void sub_802C68C(void) else gUnknown_03004344 = gMoveSelectionCursor[gActiveBank] + 1; sub_802E3B4(gUnknown_03004344, 27); - FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); + Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); Text_InitWindow(&gUnknown_03004210, BattleText_SwitchWhich, 0x290, 0x17, 0x37); Text_PrintWindow8002F44(&gUnknown_03004210); gBattleBankFunc[gActiveBank] = sub_802CA60; @@ -853,7 +853,7 @@ void sub_802CA60(void) gBattleBankFunc[gActiveBank] = sub_802C68C; gMoveSelectionCursor[gActiveBank] = gUnknown_03004344; sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0); - FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); + Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); Text_InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37); Text_PrintWindow8002F44(&gUnknown_03004210); sub_802E220(); @@ -866,7 +866,7 @@ void sub_802CA60(void) sub_802E3B4(gMoveSelectionCursor[gActiveBank], 0); sub_802E12C(gMoveSelectionCursor[gActiveBank], BattleText_Format); gBattleBankFunc[gActiveBank] = sub_802C68C; - FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); + Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); Text_InitWindow(&gUnknown_03004210, BattleText_PP, 0x290, 0x17, 0x37); Text_PrintWindow8002F44(&gUnknown_03004210); sub_802E220(); @@ -1572,7 +1572,7 @@ void sub_802E1B0(void) s32 i; gUnknown_03004348 = 0; - FillWindowRect(&gUnknown_03004210, 0x1016, 1, 0x37, 0x14, 0x3A); + Text_FillWindowRect(&gUnknown_03004210, 0x1016, 1, 0x37, 0x14, 0x3A); for (i = 0; i < 4; i++) { nullsub_7(i); @@ -1613,7 +1613,7 @@ void sub_802E2D4(void) { if (gBattleBufferA[gActiveBank][2] == 1) { - FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); + Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x37, 0x1C, 0x3A); Text_InitWindow(&gUnknown_03004210, BattleText_ForgetMove, 0x290, 0x13, 0x37); } else @@ -1623,7 +1623,7 @@ void sub_802E2D4(void) str = StringCopy(str, BattleText_Format); StringCopy(str, gTypeNames[gBattleMoves[r4->moves[gMoveSelectionCursor[gActiveBank]]].type]); - FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x39, 0x1C, 0x3A); + Text_FillWindowRect(&gUnknown_03004210, 0x1016, 0x17, 0x39, 0x1C, 0x3A); Text_InitWindow(&gUnknown_03004210, gDisplayedStringBattle, 0x2C0, 0x17, 0x39); } Text_PrintWindow8002F44(&gUnknown_03004210); @@ -1652,7 +1652,7 @@ const u8 gUnknown_081FAE91[][2] = void sub_802E3B4(u8 a, int unused) { sub_814A958(0x48); - sub_814A880(gUnknown_081FAE89[a][0], gUnknown_081FAE89[a][1]); + MenuCursor_SetPos814A880(gUnknown_081FAE89[a][0], gUnknown_081FAE89[a][1]); } void nullsub_7(u8 a) @@ -1662,7 +1662,7 @@ void nullsub_7(u8 a) void sub_802E3E4(u8 a, int unused) { sub_814A958(0x2A); - sub_814A880(gUnknown_081FAE91[a][0], gUnknown_081FAE91[a][1]); + MenuCursor_SetPos814A880(gUnknown_081FAE91[a][0], gUnknown_081FAE91[a][1]); } void nullsub_8(u8 a) @@ -2580,14 +2580,14 @@ void PlayerHandlecmd18(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 160; - FillWindowRect(&gUnknown_03004210, 10, 2, 15, 27, 18); - FillWindowRect(&gUnknown_03004210, 10, 2, 35, 16, 38); + Text_FillWindowRect(&gUnknown_03004210, 10, 2, 15, 27, 18); + Text_FillWindowRect(&gUnknown_03004210, 10, 2, 35, 16, 38); gBattleBankFunc[gActiveBank] = sub_802C098; Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35); Text_PrintWindow8002F44(&gUnknown_03004210); - sub_814A5C0(0, 0xFFFF, 12, 11679, 0); + MenuCursor_Create814A5C0(0, 0xFFFF, 12, 11679, 0); for (r4 = 0; r4 < 4; r4++) nullsub_8(r4); @@ -2605,7 +2605,7 @@ void PlayerHandlecmd19() void PlayerHandlecmd20(void) { - sub_814A5C0(0, 0xFFFF, 12, 0x2D9F, 0); + MenuCursor_Create814A5C0(0, 0xFFFF, 12, 0x2D9F, 0); sub_80304A8(); gBattleBankFunc[gActiveBank] = sub_802C68C; } diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 72a0cc32c..a4b610752 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -472,13 +472,13 @@ void SafariHandlecmd18(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 160; gUnknown_03004210.paletteNum = 0; - FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); - FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); + Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); + Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); gBattleBankFunc[gActiveBank] = bx_battle_menu_t6_2; Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptionsSafari, 400, 18, 35); Text_PrintWindow8002F44(&gUnknown_03004210); - sub_814A5C0(0, 0xFFFF, 12, 11679, 0); + MenuCursor_Create814A5C0(0, 0xFFFF, 12, 11679, 0); for (i = 0; i < 4; i++) nullsub_8(i); diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 6a9e8071e..6266d955c 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -1265,12 +1265,12 @@ void WallyHandlecmd18(void) gBattle_BG0_X = 0; gBattle_BG0_Y = 160; gUnknown_03004210.paletteNum = 0; - FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); - FillWindowRect_DefaultPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); + Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 15, 27, 18); + Text_FillWindowRectDefPalette(&gUnknown_03004210, 10, 2, 35, 16, 36); gBattleBankFunc[gActiveBank] = sub_81372BC; Text_InitWindow(&gUnknown_03004210, BattleText_MenuOptions, 400, 18, 35); Text_PrintWindow8002F44(&gUnknown_03004210); - sub_814A5C0(0, 0xFFFF, 12, 0x2D9F, 0); + MenuCursor_Create814A5C0(0, 0xFFFF, 12, 0x2D9F, 0); for (i = 0; i < 4; i++) nullsub_8(i); sub_802E3E4(0, 0); diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index 67f6e24ef..68a97c536 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -723,7 +723,7 @@ static void Task_BattlePartyMenuShift(u8 taskId) static void Task_BattlePartyMenuCancel(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); ClosePartyPopupMenu(gTasks[taskId].data[4], sBattlePartyPopupMenus); gTasks[taskId].data[4] = gTasks[taskId].data[5]; PrintPartyMenuPromptText(0, 0); diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index fb7392f33..4979760d7 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -249,7 +249,7 @@ void ShowLinkBattleRecords(void) { #if ENGLISH Menu_PrintText(gOtherText_WinLoseDraw, 12, 6); #elif GERMAN - MenuPrint_PixelCoords(gOtherText_WinLoseDraw, 88, 48, 1); + Menu_PrintTextPixelCoords(gOtherText_WinLoseDraw, 88, 48, 1); #endif for (i = 0; i < 5; i++) diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index bf77e5c07..42bb3ba7f 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -78,7 +78,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) { case 0: dp12_8087EA4(); - SetUpWindowConfig(&gWindowTemplate_81E6C58); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); gBattle_BG0_X = 0; diff --git a/src/contest.c b/src/contest.c index 3677a1d25..8985d6490 100644 --- a/src/contest.c +++ b/src/contest.c @@ -357,7 +357,7 @@ void LoadContestBgAfterMoveAnim(void) void SetUpContestWindow(void) { - SetUpWindowConfig(&gWindowTemplate_81E6FD8); + Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8); Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8); Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6FF4); } @@ -686,7 +686,7 @@ void sub_80ABCDC(u8 taskId) gBattle_BG0_Y = 0xA0; gBattle_BG2_Y = 0xA0; - FillWindowRect_DefaultPalette( + Text_FillWindowRectDefPalette( &gUnknown_03004210, 0, gUnknown_083CA340[0][0], @@ -725,7 +725,7 @@ void sub_80ABCDC(u8 taskId) Text_PrintWindow8002F44(&gUnknown_03004210); } - sub_814A5C0(0, 0xFFFF, 12, 0x2D9F, 72); + MenuCursor_Create814A5C0(0, 0xFFFF, 12, 0x2D9F, 72); sub_80AC0AC(sContest.playerMoveChoice); sub_80AEBEC(gContestMons[gContestPlayerMonIndex].moves[sContest.playerMoveChoice]); gTasks[taskId].func = sub_80ABEA0; @@ -757,7 +757,7 @@ void sub_80ABEA0(u8 taskId) sub_814A904(); PlaySE(SE_SELECT); sub_80AFFE0(FALSE); - FillWindowRect_DefaultPalette( + Text_FillWindowRectDefPalette( &gUnknown_03004210, 0, gUnknown_083CA340[0][0], @@ -809,7 +809,7 @@ void sub_80ABEA0(u8 taskId) void sub_80AC0AC(s8 a) { - sub_814A880(4, 88 + a * 16); + MenuCursor_SetPos814A880(4, 88 + a * 16); } void nullsub_17(s8 a) @@ -1940,7 +1940,7 @@ void Contest_CreatePlayerMon(u8 partyIndex) s16 tough; StringCopy(name, gSaveBlock2.playerName); - StripExtCtrlCodes(name); + Text_StripExtCtrlCodes(name); if (gIsLinkContest & 1) { u8 temp = name[5]; @@ -1960,7 +1960,7 @@ void Contest_CreatePlayerMon(u8 partyIndex) StringGetEnd10(name); if (gIsLinkContest & 1) { - StripExtCtrlCodes(name); + Text_StripExtCtrlCodes(name); if (GetMonData(&gPlayerParty[partyIndex], MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE) { name[5] = EOS; @@ -2121,7 +2121,7 @@ void sub_80AE514(void) for (i = 0; i < 4; i++) { - FillWindowRect_DefaultPalette( + Text_FillWindowRectDefPalette( &gUnknown_03004210, 0, gUnknown_083CA308[gUnknown_02038696[i]][0], @@ -2161,7 +2161,7 @@ void sub_80AE5D4(u8 p, u8 b) if ((gIsLinkContest & 1) && gLinkPlayers[p].language == LANGUAGE_JAPANESE) { StringCopy(str, gLinkPlayers[p].name); - sub_8004D04( + Text_InitWindow8004D04( &gUnknown_03004210, gDisplayedStringBattle, 592 + gUnknown_02038696[p] * 22, @@ -2198,7 +2198,7 @@ void sub_80AE6E4(u8 a, u8 b) str = sub_80AE598(str, gContestMons[a].nickname, b); *str = EOS; - sub_8004D04( + Text_InitWindow8004D04( &gUnknown_03004210, gDisplayedStringBattle, 512 + gUnknown_02038696[a] * 20, @@ -2383,7 +2383,7 @@ void sub_80AEBEC(u16 a) s32 i; u8 numHearts; - FillWindowRect_DefaultPalette(&gUnknown_03004210, 0, 11, 31, 16, 34); + Text_FillWindowRectDefPalette(&gUnknown_03004210, 0, 11, 31, 16, 34); category = gContestMoves[a].contestCategory; if (category == CONTEST_CATEGORY_COOL) @@ -2438,7 +2438,7 @@ void sub_80AEBEC(u16 a) void sub_80AED58(void) { - FillWindowRect_DefaultPalette(&gUnknown_03004210, 0, 11, 35, 28, 40); + Text_FillWindowRectDefPalette(&gUnknown_03004210, 0, 11, 35, 28, 40); } // unused @@ -2614,7 +2614,7 @@ void sub_80AF120(void) void sub_80AF138(void) { - FillWindowRect_DefaultPalette(&gUnknown_03004210, 0, 1, 15, 17, 18); + Text_FillWindowRectDefPalette(&gUnknown_03004210, 0, 1, 15, 17, 18); } u16 GetChosenMove(u8 a) @@ -2674,7 +2674,7 @@ void unref_sub_80AF280(u8 a) void sub_80AF2A0(u8 a) { - FillWindowRect_DefaultPalette( + Text_FillWindowRectDefPalette( &gUnknown_03004210, 0, gUnknown_083CA318[a][0], @@ -4146,7 +4146,7 @@ void unref_sub_80B0CF4(void) for (i = 0; i < 4; i++) { - FillWindowRect_DefaultPalette( + Text_FillWindowRectDefPalette( &gUnknown_03004210, 0, gUnknown_083CA308[i][0], @@ -4175,7 +4175,7 @@ void sub_80B0D7C(void) for (i = 0; i < 4; i++) { - FillWindowRect_DefaultPalette( + Text_FillWindowRectDefPalette( &gUnknown_03004210, 0, gUnknown_083CA308[i][0], diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 52b83d4b1..0585c4e00 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -249,7 +249,7 @@ u8 unref_sub_80A9B28(void) { Menu_EraseScreen(); Menu_DrawStdWindowFrame(0, 0, 17, 18); - PrintMenuItems(1, 1, 7, gMatsudaDebugMenuActions); + Menu_PrintItems(1, 1, 7, gMatsudaDebugMenuActions); InitMenu(0, 1, 1, 7, 0, 16); gCallback_03004AE8 = sub_80A9B78; return 0; @@ -449,7 +449,7 @@ static void sub_80A9F50(void) { REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP; REG_DISPCNT |= DISPCNT_OBJ_ON | DISPCNT_BG0_ON; - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); Text_InitWindowWithTemplate(&gMenuWindow, &gWindowTemplate_81E6C3C); REG_MOSAIC = 0; REG_BLDCNT = 0; @@ -573,7 +573,7 @@ void sub_80AA280(u8 var) // no? { u8 i; - FillWindowRect_DefaultPalette(&gMenuWindow, 0, 0, 0, 0x1E, 3); + Text_FillWindowRectDefPalette(&gMenuWindow, 0, 0, 0, 0x1E, 3); StringCopy(gSharedMem, gMatsudaDebugMenu_StartText); StringAppend(gSharedMem, gContestMons[var].trainerName); @@ -624,7 +624,7 @@ static void sub_80AA4A8(u8 var) static void sub_80AA4F0(u8 var1, u8 var2) { - FillWindowRect_DefaultPalette(&gMenuWindow, 0, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1], gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1] + 1); + Text_FillWindowRectDefPalette(&gMenuWindow, 0, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1], gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1] + 1); Text_InitWindowAndPrintText(&gMenuWindow, gMoveNames[gContestMons[var1].moves[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]); ConvertIntToDecimalStringN(gStringVar1, gContestMons[var1].moves[var2], STR_CONV_MODE_LEADING_ZEROS, 3); Text_InitWindowAndPrintText(&gMenuWindow, gStringVar1, 0xFA + var2 * 6, gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1]); @@ -1075,7 +1075,7 @@ void unref_sub_80AB084(u8 *text) break; } } - SetUpWindowConfig(&gWindowTemplate_81E6FD8); + Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8); Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8); LoadFontDefaultPalette(&gWindowTemplate_81E6FD8); Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7); diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 31f232d82..7b9a579a7 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -198,7 +198,7 @@ s8 InitMoriDebugMenu(void) { Menu_EraseScreen(); Menu_DrawStdWindowFrame(0, 0, 10, 19); - PrintMenuItems(1, 1, 9, gMoriDebugMenuActions); + Menu_PrintItems(1, 1, 9, gMoriDebugMenuActions); InitMenu(0, 1, 1, 9, 0, 9); gCallback_03004AE8 = MoriDebugMenuProcessInput; return 0; diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 411ff6f54..05cbfc8f7 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -132,7 +132,7 @@ void CB2_StartSoundCheckMenu(void) ResetPaletteFade(); ResetTasks(); ResetSpriteData(); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); REG_WIN0H = WIN_RANGE(0, 0); @@ -1217,7 +1217,7 @@ void Task_InitCryTest(u8 taskId) struct CryRelatedStruct cryStruct, cryStruct2; u8 zero; - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); gSoundTestCryNum = 1; ResetSpriteData(); diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c index e95806c74..9cece924d 100644 --- a/src/debug/unknown_debug_menu.c +++ b/src/debug/unknown_debug_menu.c @@ -34,7 +34,7 @@ int unref_sub_814A414(void) { Menu_EraseScreen(); Menu_DrawStdWindowFrame(0, 0, 16, 18); - PrintMenuItems(2, 1, 8, gUnknown_0842C29C); + Menu_PrintItems(2, 1, 8, gUnknown_0842C29C); InitMenu(0, 1, 1, 8, 0, 15); gCallback_03004AE8 = sub_814A464; return 0; diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 8d68adfe9..cb0e98b71 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -305,7 +305,7 @@ void sub_80E62F8(void) FreeAllSpritePalettes(); break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E6DA8); + Text_LoadWindowTemplate(&gWindowTemplate_81E6DA8); break; case 2: InitMenuWindow(&gWindowTemplate_81E6D54); @@ -737,7 +737,7 @@ void sub_80E6BC0(void) } break; case 1: - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: sub_80E7D6C(); @@ -785,7 +785,7 @@ void sub_80E6C84(void) gEasyChatStruct->unk24++; break; case 1: - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: sub_80E91D4(4); @@ -800,7 +800,7 @@ void sub_80E6C84(void) } break; case 2: - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: gSpecialVar_Result = 0; @@ -813,7 +813,7 @@ void sub_80E6C84(void) } break; case 0xFF: - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); sub_80E81FC(); sub_80E682C(sub_80E6AC4); break; @@ -861,7 +861,7 @@ void sub_80E6D7C(void) } break; case 1: - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: gSpecialVar_Result = (sub_80E7FA8() != 0); @@ -883,7 +883,7 @@ void sub_80E6D7C(void) break; case -1: case 1: - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); sub_80E81FC(); if (gEasyChatStruct->unk8 == 6 && sub_80E7FA8() != 0) { diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c index 6a597690a..08fd5cd18 100644 --- a/src/engine/clear_save_data_menu.c +++ b/src/engine/clear_save_data_menu.c @@ -45,7 +45,7 @@ static void Task_InitMenu(u8 taskId) Menu_PrintText(gSystemText_ClearAllSaveDataPrompt, 3, 15); Menu_DrawStdWindowFrame(2, 1, 8, 6); - PrintMenuItems(3, 2, 2, gMenuYesNoItems); + Menu_PrintItems(3, 2, 2, gMenuYesNoItems); InitMenu(0, 3, 2, 2, 1, 5); gTasks[taskId].func = Task_ProcessMenuInput; @@ -53,7 +53,7 @@ static void Task_InitMenu(u8 taskId) static void Task_ProcessMenuInput(u8 taskId) { - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: PlaySE(SE_SELECT); @@ -133,7 +133,7 @@ static u8 InitClearSaveDataScreen(void) ResetTasks(); ResetSpriteData(); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0xffff); diff --git a/src/engine/link.c b/src/engine/link.c index d52d0bb7a..34016d607 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -238,7 +238,7 @@ void LinkTestScreen(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; @@ -1236,7 +1236,7 @@ void CB2_LinkError(void) FillPalette(0, 0, 2); ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); - SetUpWindowConfig(&gWindowTemplate_81E7198); + Text_LoadWindowTemplate(&gWindowTemplate_81E7198); InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E7198); Menu_EraseScreen(); REG_BLDALPHA = 0; @@ -1260,7 +1260,7 @@ static void CB2_PrintErrorMessage(void) switch (gMain.state) { case 0: - MenuPrint_PixelCoords(gMultiText_LinkError, 20, 56, 1); + Menu_PrintTextPixelCoords(gMultiText_LinkError, 20, 56, 1); break; case 30: case 60: diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 723886664..715570fe0 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -24,7 +24,7 @@ #include "unknown_task.h" #include "ewram.h" -#define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24)) +#define BirchSpeechUpdateWindowText() ((u8)Menu_UpdateWindowTextOverrideLineLength(24)) extern struct PaletteFadeControl gPaletteFade; @@ -233,7 +233,7 @@ u32 InitMainMenu(u8 a1) ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); if (a1) @@ -709,7 +709,7 @@ void PrintPlayTime(void) sub_8072C74(alignedPlayTime, playTime, 48, 1); Menu_PrintText(alignedPlayTime, 22, 3); #elif defined(GERMAN) - MenuPrint_PixelCoords(gMainMenuString_Time, 124, 24, TRUE); + Menu_PrintTextPixelCoords(gMainMenuString_Time, 124, 24, TRUE); FormatPlayTime(playTime, gSaveBlock2.playTimeHours, gSaveBlock2.playTimeMinutes, 1); sub_8072C74(alignedPlayTime, playTime, 40, 1); Menu_PrintText(alignedPlayTime, 23, 3); @@ -732,10 +732,10 @@ void PrintBadgeCount(void) #if defined(ENGLISH) Menu_PrintText(gMainMenuString_Badges, 16, 5); #elif defined(GERMAN) - MenuPrint_PixelCoords(gMainMenuString_Badges, 124, 40, TRUE); + Menu_PrintTextPixelCoords(gMainMenuString_Badges, 124, 40, TRUE); #endif ConvertIntToDecimalString(buffer, GetBadgeCount()); - MenuPrint_PixelCoords(buffer, 205, 40, 1); + Menu_PrintTextPixelCoords(buffer, 205, 40, 1); } #define tTrainerSpriteId data[2] @@ -750,7 +750,7 @@ void PrintBadgeCount(void) static void Task_NewGameSpeech1(u8 taskId) { - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); REG_WIN0H = 0; REG_WIN0V = 0; @@ -857,7 +857,7 @@ static void Task_NewGameSpeech7(u8 taskId) //Go on to next sentence after frame 95 if (gTasks[taskId].tFrameCounter > 95) { - MenuSetText(gSystemText_NewPara); + Menu_SetText(gSystemText_NewPara); gTasks[taskId].func = Task_NewGameSpeech8; } } @@ -985,14 +985,14 @@ static void Task_NewGameSpeech16(u8 taskId) switch (GenderMenuProcessInput()) { case MALE: - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); gSaveBlock2.playerGender = MALE; Menu_EraseWindowRect(2, 4, 8, 9); gTasks[taskId].func = Task_NewGameSpeech19; break; case FEMALE: - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); gSaveBlock2.playerGender = FEMALE; Menu_EraseWindowRect(2, 4, 8, 9); @@ -1088,7 +1088,7 @@ static void Task_NewGameSpeech21(u8 taskId) case 2: case 3: case 4: - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); Menu_EraseWindowRect(2, 1, 22, 12); SetPresetPlayerName(selection); @@ -1100,7 +1100,7 @@ static void Task_NewGameSpeech21(u8 taskId) gTasks[taskId].func = Task_NewGameSpeech22; break; case -1: //B button - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); Menu_EraseWindowRect(2, 1, 22, 12); gTasks[taskId].func = Task_NewGameSpeech14; //Go back to gender menu @@ -1139,7 +1139,7 @@ static void Task_NewGameSpeech24(u8 taskId) //Handle yes/no menu selection static void Task_NewGameSpeech25(u8 taskId) { - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: //YES PlaySE(SE_SELECT); @@ -1373,7 +1373,7 @@ void CB_ContinueNewGameSpeechPart2() FreeAllSpritePalettes(); AddBirchSpeechObjects(taskId); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow((struct WindowTemplate *)&gWindowTemplate_81E6CE4); if (gSaveBlock2.playerGender != MALE) @@ -1664,7 +1664,7 @@ static void CreateGenderMenu(u8 left, u8 top) Menu_DrawStdWindowFrame(left, top, left + 6, top + 5); menuLeft = left + 1; menuTop = top + 1; - PrintMenuItems(menuLeft, menuTop, 2, gUnknown_081E79B0); + Menu_PrintItems(menuLeft, menuTop, 2, gUnknown_081E79B0); InitMenu(0, menuLeft, menuTop, 2, 0, 5); } @@ -1678,9 +1678,9 @@ static void CreateNameMenu(u8 left, u8 top) Menu_DrawStdWindowFrame(left, top, left + 10, top + 11); if (gSaveBlock2.playerGender == MALE) - PrintMenuItems(left + 1, top + 1, 5, gMalePresetNames); + Menu_PrintItems(left + 1, top + 1, 5, gMalePresetNames); else - PrintMenuItems(left + 1, top + 1, 5, gFemalePresetNames); + Menu_PrintItems(left + 1, top + 1, 5, gFemalePresetNames); InitMenu(0, left + 1, top + 1, 5, 0, 9); } diff --git a/src/engine/menu.c b/src/engine/menu.c index fe88bf4e4..86e20d0eb 100644 --- a/src/engine/menu.c +++ b/src/engine/menu.c @@ -26,11 +26,12 @@ struct Menu static void MultistepInitMenuWindowInternal(const struct WindowTemplate *, u16); static void InitMenuWindowInternal(const struct WindowTemplate *, u16); -static bool8 sub_80723D4(void); +static bool8 IsGridCursorMovementClamped(void); static u8 sub_8072484(u8, u8, u8, u8, u8, u8, u32); static u8 sub_80724F4(u8, u8, u8, const struct MenuAction[], u8); static void sub_8072620(u8, u8, u8, const struct MenuAction[], u8); static void sub_8072D18(u8, u8); +static void RedrawMenuCursor(u8, u8); static struct Menu gMenu; @@ -55,7 +56,7 @@ void CloseMenu(void) Menu_EraseScreen(); sub_8064E2C(); ScriptContext2_Disable(); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); } void AppendToList(u8 *list, u8 *pindex, u32 value) @@ -149,6 +150,7 @@ void BasicInitMenuWindow(const struct WindowTemplate *winTemplate) gMenuWindowPtr->tileDataStartOffset = gMenuTextTileOffset; } +// Prints void Menu_PrintText(const u8 *str, u8 left, u8 top) { Text_InitWindowAndPrintText(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); @@ -156,7 +158,7 @@ void Menu_PrintText(const u8 *str, u8 left, u8 top) void Menu_EraseWindowRect(u8 left, u8 top, u8 right, u8 bottom) { - ZeroFillWindowRect(gMenuWindowPtr, left, top, right, bottom); + Text_EraseWindowRect(gMenuWindowPtr, left, top, right, bottom); } void Menu_BlankWindowRect(u8 left, u8 top, u8 right, u8 bottom) @@ -210,9 +212,9 @@ void MenuPrintMessageDefaultCoords(const u8 *str) Text_InitWindow8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15); } -void MenuSetText(const u8 *str) +void Menu_SetText(const u8 *str) { - sub_8002E90(gMenuWindowPtr, str); + Text_SetWindowText(gMenuWindowPtr, str); } u8 Menu_UpdateWindowText(void) @@ -271,14 +273,14 @@ s8 Menu_ProcessInput(void) { PlaySE(SE_SELECT); if (gMenu.menu_field_7) - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); return gMenu.cursorPos; } if (gMain.newKeys & B_BUTTON) { if (gMenu.menu_field_7) - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); return -1; } @@ -306,14 +308,14 @@ s8 Menu_ProcessInputNoWrap(void) { PlaySE(SE_SELECT); if (gMenu.menu_field_7) - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); return gMenu.cursorPos; } if (gMain.newKeys & B_BUTTON) { if (gMenu.menu_field_7) - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); return -1; } @@ -353,11 +355,12 @@ u8 MoveMenuCursor3(s8 delta) return gMenu.cursorPos; } -u8 MoveMenuCursor4(s8 delta) +static u8 MoveMenuCursorGridLayout(s8 delta) { + // Don't move cursor if it is clamped if (gMenu.cursorPos + delta <= gMenu.maxCursorPos) { - if (sub_80723D4() == TRUE) + if (IsGridCursorMovementClamped() == TRUE) return gMenu.cursorPos; } else @@ -379,22 +382,35 @@ u8 MoveMenuCursor4(s8 delta) return gMenu.cursorPos; } -static bool8 sub_80723D4(void) +// Returns TRUE if the cursor is on an edge and cannot move in the pressed direction +static bool8 IsGridCursorMovementClamped(void) { - if ((gMain.newKeys & DPAD_UP) && gMenu.cursorPos < gMenu.width) - return TRUE; - - if ((gMain.newKeys & DPAD_DOWN) && gMenu.cursorPos >= (gMenu.maxCursorPos + 1) - gMenu.width) - return TRUE; - - if ((gMain.newKeys & DPAD_LEFT) - && ((gMenu.cursorPos - (gMenu.cursorPos % gMenu.width)) % gMenu.width == 1 // always false - || gMenu.cursorPos == 0 - || gMenu.cursorPos % gMenu.width == 0)) - return TRUE; - - if ((gMain.newKeys & DPAD_RIGHT) && gMenu.cursorPos % gMenu.width == gMenu.width - 1) - return TRUE; + if (gMain.newKeys & DPAD_UP) + { + // is cursor on first row? + if (gMenu.cursorPos < gMenu.width) + return TRUE; + } + if (gMain.newKeys & DPAD_DOWN) + { + // is cursor on last row? + if (gMenu.cursorPos >= gMenu.maxCursorPos + 1 - gMenu.width) + return TRUE; + } + if (gMain.newKeys & DPAD_LEFT) + { + // is cursor on first column? + if ((gMenu.cursorPos - gMenu.cursorPos % gMenu.width) % gMenu.width == 1 // always false + || gMenu.cursorPos == 0 // redundant + || gMenu.cursorPos % gMenu.width == 0) + return TRUE; + } + if (gMain.newKeys & DPAD_RIGHT) + { + // is cursor on last column? + if (gMenu.cursorPos % gMenu.width == gMenu.width - 1) + return TRUE; + } return FALSE; } @@ -518,7 +534,7 @@ s8 Menu_ProcessInputGridLayout(void) if (gMain.newKeys & A_BUTTON) { if (gMenu.menu_field_7) - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); return Menu_GetCursorPos(); } @@ -526,44 +542,46 @@ s8 Menu_ProcessInputGridLayout(void) if (gMain.newKeys & B_BUTTON) { if (gMenu.menu_field_7) - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); return -1; } if (gMain.newKeys & DPAD_UP) { PlaySE(SE_SELECT); - MoveMenuCursor4(-gMenu.width); + // Move up one whole row + MoveMenuCursorGridLayout(-gMenu.width); return -2; } else if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); - MoveMenuCursor4(gMenu.width); + // Move down one whole column + MoveMenuCursorGridLayout(gMenu.width); return -2; } else if (gMain.newKeys & DPAD_LEFT) { PlaySE(SE_SELECT); - MoveMenuCursor4(-1); + MoveMenuCursorGridLayout(-1); return -2; } else if (gMain.newKeys & DPAD_RIGHT) { PlaySE(SE_SELECT); - MoveMenuCursor4(1); + MoveMenuCursorGridLayout(1); return -2; } return -2; } -u8 sub_807288C(u8 column) +u8 Menu_GetColumnXCoord(u8 column) { return gMenu.columnXCoords[column]; } -void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[]) +void Menu_PrintItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[]) { u8 i; @@ -571,7 +589,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m Menu_PrintText(menuItems[i].text, left, top + 2 * i); } -void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order) +void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order) { u8 i; @@ -581,7 +599,7 @@ void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct Men void InitYesNoMenu(u8 left, u8 top, u8 a3) { - PrintMenuItems(left + 1, top + 1, 2, gMenuYesNoItems); + Menu_PrintItems(left + 1, top + 1, 2, gMenuYesNoItems); InitMenu(0, left + 1, top + 1, 2, 0, a3); } @@ -592,14 +610,14 @@ void DisplayYesNoMenu(u8 left, u8 top, u32 a3) gMenu.menu_field_7 = a3 ? -1 : 0; } -s8 ProcessMenuInputNoWrap_(void) +s8 Menu_ProcessInputNoWrap_(void) { return Menu_ProcessInputNoWrap(); } -u8 MenuPrint_PixelCoords(const u8 *text, u8 left, u16 top, u8 a4) +u8 Menu_PrintTextPixelCoords(const u8 *text, u8 left, u16 top, u8 a4) { - return sub_8004D04(gMenuWindowPtr, text, gMenuTextTileOffset, left, top, a4); + return Text_InitWindow8004D04(gMenuWindowPtr, text, gMenuTextTileOffset, left, top, a4); } u8 sub_8072A18(const u8 *text, u8 left, u16 top, u8 width, u32 a5) @@ -712,7 +730,7 @@ _08072B3E:\n\ void MenuPrint_RightAligned(const u8 *str, u8 left, u8 top) { - sub_8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); + Text_InitWindow8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top); } void sub_8072B80(const u8 *a1, u8 a2, u8 a3, const u8 *a4) @@ -725,7 +743,7 @@ void sub_8072B80(const u8 *a1, u8 a2, u8 a3, const u8 *a4) void sub_8072BD8(const u8 *a1, u8 a2, u8 a3, u16 a4) { - sub_8004DB0(gMenuWindowPtr, a1, gMenuTextTileOffset, a2, a3, a4); + Text_InitWindow8004DB0(gMenuWindowPtr, a1, gMenuTextTileOffset, a2, a3, a4); } u8 *sub_8072C14(u8 *a1, s32 a2, u8 a3, u8 a4) @@ -748,9 +766,9 @@ u8 sub_8072CA4(const u8 *str) return GetStringWidth(gMenuWindowPtr, str); } -u8 sub_8072CBC() +u8 Menu_GetTextWindowPaletteNum(void) { - return sub_8004E24(gMenuWindowPtr); + return Text_GetWindowPaletteNum(gMenuWindowPtr); } void Menu_GetTextColors(u8 *a1, u8 *a2, u8 *a3) @@ -758,7 +776,7 @@ void Menu_GetTextColors(u8 *a1, u8 *a2, u8 *a3) Text_GetTextColors(gMenuWindowPtr, a1, a2, a3); } -u32 MenuUpdateWindowText_OverrideLineLength(u8 lineLength) +u32 Menu_UpdateWindowTextOverrideLineLength(u8 lineLength) { return Text_UpdateWindowOverrideLineLength(gMenuWindowPtr, lineLength); } @@ -770,7 +788,7 @@ struct Window *unref_sub_8072D0C(void) static void sub_8072D18(u8 a1, u8 a2) { - sub_814A5C0(a1, 0xFFFF, 12, 11679, 8 * a2); + MenuCursor_Create814A5C0(a1, 0xFFFF, 12, 11679, 8 * a2); } u8 InitMenu(u8 cursorSubpriority, u8 left, u8 top, u8 numChoices, u8 cursorPos, u8 cursorWidth) @@ -797,9 +815,9 @@ u8 InitMenu(u8 cursorSubpriority, u8 left, u8 top, u8 numChoices, u8 cursorPos, return pos; } -void RedrawMenuCursor(u8 a1, u8 a2) +static void RedrawMenuCursor(u8 x, u8 y) { - sub_814A880((a1 + 1) * 8, 8 * a2); + MenuCursor_SetPos814A880((x + 1) * 8, 8 * y); } void unref_sub_8072DC0() @@ -817,7 +835,7 @@ void sub_8072DDC(u8 a1) sub_8072DCC(8 * a1); } -void HandleDestroyMenuCursors(void) +void Menu_DestroyCursor(void) { DestroyMenuCursor(); } diff --git a/src/engine/menu_cursor.c b/src/engine/menu_cursor.c index 960d3cc87..35116d40b 100644 --- a/src/engine/menu_cursor.c +++ b/src/engine/menu_cursor.c @@ -3,13 +3,13 @@ #include "palette.h" #include "sprite.h" -EWRAM_DATA u16 gUnknown_0203A360[0x10] = {}; -EWRAM_DATA struct Subsprite gMenuCursorSubsprites[10] = {0}; -EWRAM_DATA u8 gUnknown_0203A3D0 = 0; -EWRAM_DATA u8 gUnknown_0203A3D1 = 0; -EWRAM_DATA u8 gUnknown_0203A3D2 = 0; -EWRAM_DATA u8 gUnknown_0203A3D3 = 0; -EWRAM_DATA u8 gUnknown_0203A3D4 = 0; +EWRAM_DATA static u16 gUnknown_0203A360[0x10] = {}; +EWRAM_DATA static struct Subsprite gMenuCursorSubsprites[10] = {0}; +EWRAM_DATA static u8 gUnknown_0203A3D0 = 0; +EWRAM_DATA static u8 gUnknown_0203A3D1 = 0; +EWRAM_DATA static u8 gUnknown_0203A3D2 = 0; +EWRAM_DATA static u8 gUnknown_0203A3D3 = 0; +EWRAM_DATA static u8 gUnknown_0203A3D4 = 0; #if ENGLISH #include "../src/data/menu_cursor_en.h" @@ -26,7 +26,7 @@ void sub_814A590(void) gUnknown_0203A3D4 = 0; } -u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5) +u8 MenuCursor_Create814A5C0(u8 subpriority, u16 paletteTag, u8 a3, u16 a4, u8 a5) { int v9; struct Sprite *v10; @@ -35,34 +35,34 @@ u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5) DestroyMenuCursor(); v9 = 1; - if (a2 == 0xFFFF) + if (paletteTag == 0xFFFF) { gUnknown_0203A360[a3 & 0xF] = a4; if (LoadSpritePalette(&gUnknown_0842F240) != 0xFF) { - a2 = 0xFFF0; + paletteTag = 0xFFF0; v9 = 0; } } LoadSpriteSheetDeferred(&gUnknown_0842F140[a3 & 0xF]); - gUnknown_0203A3D0 = CreateSprite(&gSpriteTemplate_842F250[v9], 0, 0xA0, a1); - gUnknown_0203A3D1 = CreateSprite(&gSpriteTemplate_842F250[2], 0, 0xA0, a1); + gUnknown_0203A3D0 = CreateSprite(&gSpriteTemplate_842F250[v9], 0, 160, subpriority); + gUnknown_0203A3D1 = CreateSprite(&gSpriteTemplate_842F250[2], 0, 160, subpriority); if (gUnknown_0203A3D0 != 0x40) { v10 = &gSprites[gUnknown_0203A3D0]; - if (a2 == 0xFFFF) + if (paletteTag == 0xFFFF) v10->oam.paletteNum = 0; else - v10->oam.paletteNum = IndexOfSpritePaletteTag(a2); + v10->oam.paletteNum = IndexOfSpritePaletteTag(paletteTag); } if (gUnknown_0203A3D1 != 0x40) { v10 = &gSprites[gUnknown_0203A3D1]; - if (a2 == 0xFFFF) + if (paletteTag == 0xFFFF) v10->oam.paletteNum = 0; else - v10->oam.paletteNum = IndexOfSpritePaletteTag(a2); + v10->oam.paletteNum = IndexOfSpritePaletteTag(paletteTag); if (!(REG_DISPCNT & (DISPCNT_WIN0_ON | DISPCNT_WIN1_ON))) *(u8 *)(REG_ADDR_WINOUT) |= 0x1F; @@ -75,12 +75,13 @@ u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5) return gUnknown_0203A3D0; } -u8 sub_814A758(u8 a1, u8 a2, u8 a3, u8 a4) +// unused +u8 sub_814A758(u8 subpriority, u8 a2, u8 a3, u8 a4) { u8 result; struct Sprite *spr; - result = sub_814A5C0(a1, 0, a3, 0, a4); + result = MenuCursor_Create814A5C0(subpriority, 0, a3, 0, a4); if (result != 0x40) { spr = &gSprites[gUnknown_0203A3D0]; @@ -128,7 +129,7 @@ void DestroyMenuCursor(void) return; } -void sub_814A880(u8 a1, u8 a2) +void MenuCursor_SetPos814A880(u8 a1, u8 a2) { struct Sprite *spr; @@ -685,49 +686,48 @@ void unref_sub_814ABE4(int a1) return; } -u8 CreateBlendedOutlineCursor(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5) +u8 CreateBlendedOutlineCursor(u8 subpriority, u16 paletteTag, u8 a3, u16 a4, u8 a5) { int v8; struct Sprite *spr; - u8 var1 = gUnknown_0203A3D2; - if (var1 != 0x40) - sub_814AD44(); + if (gUnknown_0203A3D2 != 0x40) + MenuCursor_Destroy814AD44(); v8 = 1; - if (a2 == 0xFFFF) + if (paletteTag == 0xFFFF) { gUnknown_0203A360[a3 & 0xF] = a4; if (LoadSpritePalette(&gUnknown_0842F248) != 0xFF ) { - a2 = 0xFFF1; + paletteTag = 0xFFF1; v8 = 0; } } LoadSpriteSheetDeferred(&gUnknown_0842F1C0[a3 & 0xF]); #if ENGLISH - gUnknown_0203A3D2 = CreateSprite(&gSpriteTemplate_842F298[v8], 0, 160, a1); + gUnknown_0203A3D2 = CreateSprite(&gSpriteTemplate_842F298[v8], 0, 160, subpriority); #elif GERMAN - gUnknown_0203A3D2 = CreateSprite(&gSpriteTemplate_842F298[v8], 0, 161, a1); + gUnknown_0203A3D2 = CreateSprite(&gSpriteTemplate_842F298[v8], 0, 161, subpriority); #endif if (gUnknown_0203A3D2 != 0x40) { spr = &gSprites[gUnknown_0203A3D2]; - if (a2 == 0xFFFF) + if (paletteTag == 0xFFFF) spr->oam.paletteNum = 0; else - spr->oam.paletteNum = IndexOfSpritePaletteTag(a2); + spr->oam.paletteNum = IndexOfSpritePaletteTag(paletteTag); } sub_814ADF4(a5); return gUnknown_0203A3D2; } -void sub_814AD44(void) +void MenuCursor_Destroy814AD44(void) { if (gUnknown_0203A3D2 != 0x40) { @@ -738,7 +738,7 @@ void sub_814AD44(void) return; } -void sub_814AD7C(u8 a1, u8 a2) +void MenuCursor_SetPos814AD7C(u8 a1, u8 a2) { struct Sprite *spr; if (gUnknown_0203A3D2 != 0x40) diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 278760233..b7b7c047e 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -45,7 +45,7 @@ void CB2_InitMysteryEventMenu(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_EraseScreen(); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON; diff --git a/src/engine/name_string_util.c b/src/engine/name_string_util.c index f1a935453..32e9358e1 100644 --- a/src/engine/name_string_util.c +++ b/src/engine/name_string_util.c @@ -7,7 +7,7 @@ void PadNameString(u8 *a1, u8 a2) { u8 i; - StripExtCtrlCodes(a1); + Text_StripExtCtrlCodes(a1); i = StringLength(a1); if (a2 == 0xFC) @@ -36,5 +36,5 @@ void SanitizeNameString(u8 *a1) if (StringLength(a1) < 6) ConvertInternationalString(a1, 1); else - StripExtCtrlCodes(a1); + Text_StripExtCtrlCodes(a1); } diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index 880187dc0..eddfdeda5 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -325,7 +325,7 @@ static void NamingScreen_Init(void) static void NamingScreen_SetUpWindow(void) { - SetUpWindowConfig(&gWindowTemplate_81E6E88); + Text_LoadWindowTemplate(&gWindowTemplate_81E6E88); InitMenuWindow(&gWindowTemplate_81E6E88); } diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c index 2b9412e45..868830880 100644 --- a/src/engine/option_menu.c +++ b/src/engine/option_menu.c @@ -116,7 +116,7 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 2: - SetUpWindowConfig(&gWindowTemplate_81E71B4); + Text_LoadWindowTemplate(&gWindowTemplate_81E71B4); gMain.state++; break; case 3: @@ -313,7 +313,7 @@ static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style) dst[2] = style; dst[i] = EOS; - MenuPrint_PixelCoords(dst, x, y, 1); + Menu_PrintTextPixelCoords(dst, x, y, 1); } static u8 TextSpeed_ProcessInput(u8 selection) diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 37b1c767e..6e9efd342 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -443,7 +443,7 @@ void CB2_InitResetRtcScreen(void) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); REG_DISPCNT = 4352; SetVBlankCallback(VBlankCB_ResetRtcScreen); diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index 4609f3fd8..64b84a2f7 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -120,7 +120,7 @@ static void CB2_SaveFailedScreen(void) ResetPaletteFade(); LoadPalette(&gBirchBagGrassPal, 0, sizeof(gBirchBagGrassPal)); LoadPalette(&gSaveFailedClockPal, 0x100, sizeof(gSaveFailedClockPal)); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_DrawStdWindowFrame(13, CLOCK_WIN_TOP, 16, CLOCK_WIN_TOP + 3); // clock window Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); // message window diff --git a/src/engine/text.c b/src/engine/text.c index 15a535ff0..fe18a6d79 100644 --- a/src/engine/text.c +++ b/src/engine/text.c @@ -97,7 +97,7 @@ static void AddToCursorX(struct Window *, u8); static void AddToCursorY(struct Window *, u8); static void ClipLeft(struct Window *); static void ClipRight(struct Window *); -static void InitColors(struct Window *); +static void SetWindowDefaultColors(struct Window *); static void SetWindowBackgroundColor(struct Window *, u8); static void SetWindowShadowColor(struct Window *, u8); static void SetWindowForegroundColor(struct Window *, u8); @@ -786,7 +786,7 @@ const struct WindowTemplate gWindowTemplate_81E6DA8 = BG_SCREEN_ADDR(11), // tilemap }; -const struct WindowTemplate WindowConfig_TrainerCard_Back_Values = +const struct WindowTemplate gWindowTemplate_TrainerCard_Back_Values = { 0, // BG number 2, // BG character base block @@ -807,7 +807,7 @@ const struct WindowTemplate WindowConfig_TrainerCard_Back_Values = BG_SCREEN_ADDR(30), // tilemap }; -const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels = +const struct WindowTemplate gWindowTemplate_TrainerCard_Back_Labels = { 0, // BG number 2, // BG character base block @@ -1752,7 +1752,7 @@ void LoadFontDefaultPalette(const struct WindowTemplate *winTemplate) LoadPalette(gFontDefaultPalette, 16 * winTemplate->paletteNum, 32); } -void SetUpWindowConfig(const struct WindowTemplate *winTemplate) +void Text_LoadWindowTemplate(const struct WindowTemplate *winTemplate) { UpdateBGRegs(winTemplate); ClearBGMem(winTemplate); @@ -1952,7 +1952,7 @@ void Text_InitWindowWithTemplate(struct Window *win, const struct WindowTemplate win->height = winTemplate->height; win->tileData = winTemplate->tileData; win->tilemap = winTemplate->tilemap; - InitColors(win); + SetWindowDefaultColors(win); SetWindowBackgroundColor(win, winTemplate->backgroundColor); SetWindowShadowColor(win, winTemplate->shadowColor); SetWindowForegroundColor(win, winTemplate->foregroundColor); @@ -1986,7 +1986,7 @@ void Text_InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset win->downArrowCounter = 0; win->tileData = winTemplate->tileData; win->tilemap = winTemplate->tilemap; - InitColors(win); + SetWindowDefaultColors(win); SetWindowBackgroundColor(win, winTemplate->backgroundColor); SetWindowShadowColor(win, winTemplate->shadowColor); SetWindowForegroundColor(win, winTemplate->foregroundColor); @@ -2007,7 +2007,7 @@ void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStar ClipLeft(win); } -void sub_8002E90(struct Window *win, const u8 *text) +void Text_SetWindowText(struct Window *win, const u8 *text) { win->state = WIN_STATE_NORMAL; win->text = text; @@ -2364,7 +2364,7 @@ u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 to void sub_80034D4(u8 *tileData, const u8 *text) { - sub_8004E3C(&gWindowTemplate_81E6C74, tileData, text); + Text_InitWindow8004E3C(&gWindowTemplate_81E6C74, tileData, text); } u8 sub_80034EC(u8 *str) @@ -2905,7 +2905,7 @@ static void ClipRight(struct Window *win) } } -static void InitColors(struct Window *win) +static void SetWindowDefaultColors(struct Window *win) { u32 i; @@ -3334,7 +3334,7 @@ void DrawWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 } // Fills the whole window area with tilemapEntry -void FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom) +void Text_FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom) { u16 *buffer = &win->tilemap[top * 32]; while (top++ <= bottom) @@ -3346,20 +3346,20 @@ void FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 ri } } -void FillWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom) +void Text_FillWindowRectDefPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom) { - FillWindowRect(win, (win->paletteNum << 12) | tileNum, left, top, right, bottom); + Text_FillWindowRect(win, (win->paletteNum << 12) | tileNum, left, top, right, bottom); } -void ZeroFillWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) +void Text_EraseWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) { - FillWindowRect_DefaultPalette(win, 0, left, top, right, bottom); + Text_FillWindowRectDefPalette(win, 0, left, top, right, bottom); } void Text_BlankWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom) { u16 tileNum = GetBlankTileNum(win); - FillWindowRect_DefaultPalette(win, tileNum, left, top, right, bottom); + Text_FillWindowRectDefPalette(win, tileNum, left, top, right, bottom); } static u16 GetBlankTileNum(struct Window *win) @@ -3666,13 +3666,13 @@ u8 GetStringWidth(struct Window *win, const u8 *s) return width; } -u8 sub_8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6) +u8 Text_InitWindow8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6) { Text_InitWindow8002E4C(win, text, tileDataStartOffset, left, top, a6); return Text_PrintWindow8002F44(win); } -u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) +u8 Text_InitWindow8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top) { u8 width = GetStringWidth(win, text); Text_InitWindow(win, text, tileDataStartOffset, left - ((u32)(width + 7) >> 3), top); @@ -3684,7 +3684,7 @@ u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l return Text_PrintWindow8002F44(win); } -u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6) +u8 Text_InitWindow8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6) { register u32 val asm("r5") = (u8)((a6 >> 1) - (GetStringWidth(win, text) >> 1)); left += (val >> 3); @@ -3694,7 +3694,7 @@ u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l return Text_PrintWindow8002F44(win); } -u8 sub_8004E24(struct Window *win) +u8 Text_GetWindowPaletteNum(struct Window *win) { return win->paletteNum; } @@ -3706,7 +3706,7 @@ void Text_GetTextColors(struct Window *win, u8 *foreground, u8 *background, u8 * *shadow = win->shadowColor; } -void sub_8004E3C(const struct WindowTemplate *winTemplate, u8 *tileData, const u8 *text) +void Text_InitWindow8004E3C(const struct WindowTemplate *winTemplate, u8 *tileData, const u8 *text) { sTempWindow.template = winTemplate; Text_InitWindow(&sTempWindow, text, 0, 0, 0); @@ -3727,11 +3727,11 @@ void ConvertInternationalString(u8 *s, u8 language) { u8 i; - StripExtCtrlCodes(s); + Text_StripExtCtrlCodes(s); i = StringLength(s); - s[i++] = 0xFC; + s[i++] = EXT_CTRL_CODE_BEGIN; s[i++] = 22; - s[i++] = 0xFF; + s[i++] = EOS; i--; @@ -3741,18 +3741,18 @@ void ConvertInternationalString(u8 *s, u8 language) i--; } - s[0] = 0xFC; + s[0] = EXT_CTRL_CODE_BEGIN; s[1] = 21; } } -void StripExtCtrlCodes(u8 *str) +void Text_StripExtCtrlCodes(u8 *str) { u16 srcIndex = 0; u16 destIndex = 0; - while (str[srcIndex] != 0xFF) + while (str[srcIndex] != EOS) { - if (str[srcIndex] == 0xFC) + if (str[srcIndex] == EXT_CTRL_CODE_BEGIN) { srcIndex++; srcIndex += GetExtCtrlCodeLength(str[srcIndex]); @@ -3762,12 +3762,12 @@ void StripExtCtrlCodes(u8 *str) str[destIndex++] = str[srcIndex++]; } } - str[destIndex] = 0xFF; + str[destIndex] = EOS; } static const u8 *SkipExtCtrlCode(const u8 *s) { - while (*s == 0xFC) + while (*s == EXT_CTRL_CODE_BEGIN) { s++; s += GetExtCtrlCodeLength(*s); diff --git a/src/engine/trade.c b/src/engine/trade.c index 30e22b8d5..3a14adaca 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -1088,7 +1088,7 @@ static void sub_8047EC0(void) sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5)); SetVBlankCallback(sub_80489F4); InitMenuWindow(&gWindowTemplate_81E6CE4); - SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F84); Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84); gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20); TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window); @@ -1157,7 +1157,7 @@ static void sub_8047EC0(void) break; case 6: CalculateEnemyPartyCount(); - FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, 0, 0, 29, 19); + Text_FillWindowRectDefPalette(&gUnknown_03004824->window, 0, 0, 0, 29, 19); REG_DISPCNT = 0; gUnknown_03004824->partyCounts[0] = gPlayerPartyCount; gUnknown_03004824->partyCounts[1] = gEnemyPartyCount; @@ -1268,7 +1268,7 @@ static void sub_80484F4(void) sub_804A964(&gUnknown_03004824->unk_00c8, BG_SCREEN_ADDR(5)); SetVBlankCallback(sub_80489F4); InitMenuWindow(&gWindowTemplate_81E6CE4); - SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F84); Text_InitWindowWithTemplate(&gUnknown_03004824->window, &gWindowTemplate_81E6F84); gUnknown_03004824->unk_007a = TextWindow_SetBaseTileNum(20); TextWindow_LoadStdFrameGraphics(&gUnknown_03004824->window); @@ -2097,7 +2097,7 @@ static void sub_8049680(void) if (gUnknown_03004824->tradeMenuCursorPosition < PARTY_SIZE) { TextWindow_DrawStdFrame(&gUnknown_03004824->window, 18, 14, 28, 19); - PrintMenuItems(19, 15, 2, (const struct MenuAction *)gUnknown_0820C320); + Menu_PrintItems(19, 15, 2, (const struct MenuAction *)gUnknown_0820C320); InitMenu(0, 19, 15, 2, 0, 9); gUnknown_03004824->unk_007b = 1; } @@ -2126,7 +2126,7 @@ static void sub_8049680(void) static void sub_8049804(void) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); sub_804A80C(); gUnknown_03004824->unk_007b = 0; gSprites[gUnknown_03004824->tradeMenuCursorSpriteIdx].invisible = FALSE; @@ -2464,8 +2464,8 @@ static void sub_8049ED4(u8 a0) StoreSpriteCallbackInData(&gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]], sub_809D62C); gUnknown_03004824->unk_0080[a0] ++; sub_8078A34(&gSprites[gUnknown_03004824->partyIcons[whichParty][whichPokemon]]); - HandleDestroyMenuCursors(); - FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[whichParty][0], 0, gUnknown_0820C330[whichParty][1], 19); + Menu_DestroyCursor(); + Text_FillWindowRectDefPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[whichParty][0], 0, gUnknown_0820C330[whichParty][1], 19); sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15 * a0, 0, gTradePartyBoxTilemap, 15, 17, 0); if (whichParty == 0) { @@ -2692,7 +2692,7 @@ static void sub_8049ED4(u8 a0) "\tlsls r0, 2\n" "\tadds r0, r7\n" "\tbl sub_8078A34\n" - "\tbl HandleDestroyMenuCursors\n" + "\tbl Menu_DestroyCursor\n" "\tldr r3, _0804A09C @ =gUnknown_03004824\n" "\tldr r0, [r3]\n" "\tadds r0, 0x4\n" @@ -2708,7 +2708,7 @@ static void sub_8049ED4(u8 a0) "\tstr r1, [sp, 0x4]\n" "\tmovs r1, 0\n" "\tmovs r3, 0\n" - "\tbl FillWindowRect_DefaultPalette\n" + "\tbl Text_FillWindowRectDefPalette\n" "\tldr r1, _0804A09C @ =gUnknown_03004824\n" "\tldr r0, [r1]\n" "\tadds r0, 0xC8\n" @@ -3337,7 +3337,7 @@ static void sub_804A740(u8 whichParty) static void sub_804A80C(void) { - FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[1][0], 0, gUnknown_0820C330[1][1], 19); + Text_FillWindowRectDefPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[1][0], 0, gUnknown_0820C330[1][1], 19); sub_804A41C(1); } @@ -3345,7 +3345,7 @@ static void sub_804A840(u8 whichParty) { if (whichParty == 0) { - FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[0][0], 0, gUnknown_0820C330[0][1], 19); + Text_FillWindowRectDefPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[0][0], 0, gUnknown_0820C330[0][1], 19); sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 0, 0, gTradePartyBoxTilemap, 15, 17, 0); sub_804A6DC(0); sub_804A41C(0); @@ -3354,8 +3354,8 @@ static void sub_804A840(u8 whichParty) } else { - HandleDestroyMenuCursors(); - FillWindowRect_DefaultPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[1][0], 0, gUnknown_0820C330[1][1], 19); + Menu_DestroyCursor(); + Text_FillWindowRectDefPalette(&gUnknown_03004824->window, 0, gUnknown_0820C330[1][0], 0, gUnknown_0820C330[1][1], 19); sub_804A96C_alt(&gUnknown_03004824->unk_00c8, 15, 0, gTradePartyBoxTilemap, 15, 17, 0); sub_804A6DC(1); sub_804A41C(1); @@ -3806,7 +3806,7 @@ static void sub_804AFB8(const struct WindowTemplate *windowConfig, u8 *dest, con tileBuffer = gTileBuffer; CpuFill16(0, tileBuffer, size * 0x80); CpuFill16(0, tileBuffer + windowConfig->width * 0x20, size * 0x80); - sub_8004E3C(windowConfig, tileBuffer, src); + Text_InitWindow8004E3C(windowConfig, tileBuffer, src); for (i = 0; i < size; i ++) { CpuCopy16(&tileBuffer[32 * (i * 4)], &dest[32 * (i * 8)], 0x80); @@ -4028,7 +4028,7 @@ static void sub_804B41C(void) FreeAllSpritePalettes(); SetVBlankCallback(sub_804B210); sub_804B228(); - SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F84); Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84); gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2); TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); @@ -4184,7 +4184,7 @@ static __attribute__((naked)) void sub_804B41C(void) "\tbl sub_804B228\n" "\tldr r4, _0804B57C @ =gWindowTemplate_81E6F84\n" "\tadds r0, r4, 0\n" - "\tbl SetUpWindowConfig\n" + "\tbl Text_LoadWindowTemplate\n" "\tldr r0, [r6]\n" "\tadds r0, 0x4\n" "\tadds r1, r4, 0\n" @@ -4531,7 +4531,7 @@ static void sub_804B790(void) FreeAllSpritePalettes(); SetVBlankCallback(sub_804B210); sub_804B228(); - SetUpWindowConfig(&gWindowTemplate_81E717C); + Text_LoadWindowTemplate(&gWindowTemplate_81E717C); Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E717C); gUnknown_03004828->textWindowBaseTileNum = TextWindow_SetBaseTileNum(2); TextWindow_LoadStdFrameGraphics(&gUnknown_03004828->window); @@ -4852,7 +4852,7 @@ static bool8 sub_804C29C(void) { gUnknown_03004828->unk_0102 = sub_8047580(gUnknown_03004828->pokePicSpriteIdxs[0], gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].oam.paletteNum, 0x78, 0x20, 0x2, 0x1, 0x14, 0xfffff); gUnknown_03004828->unk_00c4 ++; - ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); + Text_EraseWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gTradeText_ByeBye); Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); } @@ -5199,7 +5199,7 @@ static bool8 sub_804C29C(void) break; case 67: REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; - ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); + Text_EraseWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gTradeText_SentOverPoke); Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gUnknown_03004828->unk_00c4 ++; @@ -5213,7 +5213,7 @@ static bool8 sub_804C29C(void) if (gUnknown_03004828->unk_00c0 == 0xf0) { gUnknown_03004828->unk_00c4 ++; - ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); + Text_EraseWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gTradeText_TakeGoodCare); Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); gUnknown_03004828->unk_00c0 = 0; @@ -5536,7 +5536,7 @@ static void sub_804DC88(void) case 0: gUnknown_03004828 = &ewram_2010000.unk_0f000; gMain.state ++; - ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); + Text_EraseWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); StringExpandPlaceholders(gStringVar4, gOtherText_LinkStandby2); Text_InitWindowAndPrintText(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15); break; @@ -5564,7 +5564,7 @@ static void sub_804DC88(void) break; case 2: gMain.state = 50; - ZeroFillWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); + Text_EraseWindowRect(&gUnknown_03004828->window, 0, 0, 29, 19); Text_InitWindowAndPrintText(&gUnknown_03004828->window, gSystemText_Saving, gUnknown_03004828->textWindowBaseTileNum, 2, 15); break; case 50: diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index da9dd7179..70942fc29 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -565,8 +565,8 @@ void sub_80937A4() void sub_80937BC() { - SetUpWindowConfig(&WindowConfig_TrainerCard_Back_Values); - MultistepInitMenuWindowBegin(&WindowConfig_TrainerCard_Back_Values); + Text_LoadWindowTemplate(&gWindowTemplate_TrainerCard_Back_Values); + MultistepInitMenuWindowBegin(&gWindowTemplate_TrainerCard_Back_Values); } static void sub_80937D8() @@ -678,7 +678,7 @@ bool8 sub_8093980(struct Task *task) static void sub_80939A4(void) { CreateTask(sub_80939DC, 0); - BasicInitMenuWindow(&WindowConfig_TrainerCard_Back_Values); + BasicInitMenuWindow(&gWindowTemplate_TrainerCard_Back_Values); } static void sub_80939C0(void) @@ -1317,7 +1317,7 @@ static void sub_8094140(void) { u8 *buffer; - BasicInitMenuWindow(&WindowConfig_TrainerCard_Back_Values); + BasicInitMenuWindow(&gWindowTemplate_TrainerCard_Back_Values); buffer = gStringVar1; StringCopy(buffer, ewram0_2.var_64.playerName); @@ -1332,7 +1332,7 @@ static void sub_8094140(void) static void sub_8094188(void) { - BasicInitMenuWindow(&WindowConfig_TrainerCard_Back_Values); + BasicInitMenuWindow(&gWindowTemplate_TrainerCard_Back_Values); TrainerCard_Back_PrintName(); TrainerCard_Back_PrintHallOfFameTime_Label(); TrainerCard_Back_PrintLinkBattlesLabel(); @@ -1341,7 +1341,7 @@ static void sub_8094188(void) TrainerCard_Back_PrintLinkPokeblocks_Label(); TrainerCard_Back_PrintPokemonTrades_Label(); - BasicInitMenuWindow(&WindowConfig_TrainerCard_Back_Labels); + BasicInitMenuWindow(&gWindowTemplate_TrainerCard_Back_Labels); TrainerCard_Back_PrintHallOfFameTime(); TrainerCard_Back_PrintLinkBattles(); TrainerCard_Back_PrintBattleTower(); @@ -1489,10 +1489,10 @@ static void TrainerCard_Back_PrintBattleTower(void) if (ewram0_2.var_a != 0) { sub_8072C44(buffer, ewram0_2.var_64.battleTowerWins, 24, 1); - MenuPrint_PixelCoords(buffer, 112, 120, 0); + Menu_PrintTextPixelCoords(buffer, 112, 120, 0); sub_8072C44(buffer, ewram0_2.var_64.battleTowerLosses, 24, 1); - MenuPrint_PixelCoords(buffer, 149, 120, 0); + Menu_PrintTextPixelCoords(buffer, 149, 120, 0); } } diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index 75e481f84..a05d9bf87 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -109,7 +109,7 @@ static bool8 sub_8146058(void) gMain.state += 1; break; case 3: - SetUpWindowConfig(&gWindowTemplate_81E6E18); + Text_LoadWindowTemplate(&gWindowTemplate_81E6E18); gMain.state += 1; break; case 4: diff --git a/src/field/choose_party.c b/src/field/choose_party.c index 6a9c23c66..3ba04e489 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -462,7 +462,7 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId) } PlaySE(SE_HAZURE); Menu_EraseWindowRect(20, 10, 29, 19); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); sub_806D5A4(); sub_806E834(gOtherText_NoMoreThreePoke, 1); gTasks[taskId].func = sub_8122728; @@ -476,7 +476,7 @@ static void sub_8122728(u8 taskId) if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON)) { Menu_EraseWindowRect(0, 14, 29, 19); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); BattleTowerEntryMenuCallback_Exit(taskId); } } @@ -516,7 +516,7 @@ static void BattleTowerEntryMenuCallback_NoEntry(u8 taskId) static void sub_81227FC(u8 taskId) { Menu_EraseWindowRect(20, 10, 29, 19); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PrintPartyMenuPromptText(0, 0); gTasks[taskId].func = HandleBattleTowerPartyMenu; } @@ -897,7 +897,7 @@ static void DaycareStorageMenuCallback_Exit(u8 taskId) { PlaySE(SE_SELECT); Menu_EraseWindowRect(20, 10, 29, 19); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PrintPartyMenuPromptText(15, 0); gTasks[taskId].func = HandleDaycarePartyMenu; } diff --git a/src/field/daycare.c b/src/field/daycare.c index 7814a3b24..5811461ae 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -1756,7 +1756,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); gLastFieldPokeMenuOpened = gSpecialVar_Result = gTasks[taskId].data[0]; DestroyTask(taskId); @@ -1765,7 +1765,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) } else if (gMain.newKeys & B_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); gLastFieldPokeMenuOpened = gSpecialVar_Result = 2; DestroyTask(taskId); Menu_EraseWindowRect(15, 6, 29, 13); @@ -1780,7 +1780,7 @@ void ShowDaycareLevelMenu(void) GetDaycareLevelMenuText(&gSaveBlock1.daycare, buffer); Menu_PrintText(buffer, 16, 7); GetDaycareLevelMenuLevelText(&gSaveBlock1.daycare, buffer); - MenuPrint_PixelCoords(buffer, 0xce, 0x38, TRUE); + Menu_PrintTextPixelCoords(buffer, 0xce, 0x38, TRUE); InitMenu(0, 16, 7, 3, 0, 13); CreateTask(HandleDaycareLevelMenuInput, 3); } diff --git a/src/field/decoration.c b/src/field/decoration.c index a91b2e37b..a6c0bd21f 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -1434,7 +1434,7 @@ void sub_80FE1DC(void) { sub_80FE2B4(); Menu_DrawStdWindowFrame(0, 0, 10, 9); - PrintMenuItems(1, 1, 4, (const struct MenuAction *)gUnknown_083EC604); + Menu_PrintItems(1, 1, 4, (const struct MenuAction *)gUnknown_083EC604); InitMenu(0, 1, 1, 4, gUnknown_020388D4, 9); } @@ -1516,7 +1516,7 @@ void sub_80FE394(void) void gpu_pal_decompress_alloc_tag_and_upload(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 10, 9); Menu_BlankWindowRect(2, 15, 27, 18); FreeSpritePaletteByTag(6); @@ -1546,7 +1546,7 @@ void sub_80FE470(u8 decoCat, u8 left, u8 top, u8 palIdx) // PrintDecorationCateg { u8 *strptr; u8 v0; - v0 = sub_8072CBC(); + v0 = Menu_GetTextWindowPaletteNum(); // PALETTE {palIdx} strptr = gStringVar4; strptr[0] = EXT_CTRL_CODE_BEGIN; @@ -1583,7 +1583,7 @@ void sub_80FE528(u8 taskId) // PrintDecorationCategorySelectionMenuStrings void sub_80FE5AC(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); sub_80FE528(taskId); InitMenu(0, 1, 1, 9, gUnknown_020388F6, 13); @@ -1620,7 +1620,7 @@ void sub_80FE604(u8 taskId) gTasks[taskId].func = sub_80FE868; } else { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 14, 19); DisplayItemMessageOnField(taskId, gSecretBaseText_NoDecors, sub_80FE418, 0); } @@ -1649,7 +1649,7 @@ void sub_80FE728(u8 taskId) void sub_80FE758(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 14, 19); if (gTasks[taskId].data[11] != 2) { @@ -1677,7 +1677,7 @@ void sub_80FE7D4(u8 *dest, u8 decClass) void sub_80FE7EC(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); sub_80FEC94(taskId); @@ -1757,7 +1757,7 @@ void sub_80FE948(u8 taskId) } if (gMain.newKeys & A_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); gUnknown_020388F5 = gUnknown_020388F2 + gUnknown_020388F4; if (gUnknown_020388F5 == gUnknown_020388D5) @@ -1769,7 +1769,7 @@ void sub_80FE948(u8 taskId) } } else if (gMain.newKeys & B_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); gUnknown_083EC634[gTasks[taskId].data[11]].noFunc(taskId); } @@ -2005,7 +2005,7 @@ void sub_80FEF74(void) sub_80F9520(gUnknown_020388F7, 8); DestroyVerticalScrollIndicator(0); DestroyVerticalScrollIndicator(1); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 14, 19); } @@ -2035,7 +2035,7 @@ void sub_80FEFF4(u8 taskId) void sub_80FF034(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 14, 19); sub_80FE5AC(taskId); } @@ -3790,7 +3790,7 @@ void sub_8100E70(u8 taskId) data[2] = 1; data[6] = 1; data[5] = 1; - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); } break; case 1: diff --git a/src/field/diploma.c b/src/field/diploma.c index 8481589cb..7028eec02 100644 --- a/src/field/diploma.c +++ b/src/field/diploma.c @@ -68,7 +68,7 @@ void CB2_ShowDiploma(void) ResetPaletteFade(); FreeAllSpritePalettes(); LoadPalette(gDiplomaPalettes, 0, 64); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); DisplayDiplomaText(); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); diff --git a/src/field/field_effect.c b/src/field/field_effect.c index 57d9072b1..5ff89574b 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -2434,7 +2434,7 @@ void sub_8088380(struct Task *task) IntrCallback callback; LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback); SetVBlankCallback(callback); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); FreeResourcesAndDestroySprite(&gSprites[task->data[15]]); FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON); @@ -2557,7 +2557,7 @@ void sub_808862C(struct Task *task) CpuFill32(0, (void *)VRAM + bg0cnt, 0x800); LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback); SetVBlankCallback(intrCallback); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); FreeResourcesAndDestroySprite(&gSprites[task->data[15]]); FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON); diff --git a/src/field/field_region_map.c b/src/field/field_region_map.c index afbc25226..54091459f 100644 --- a/src/field/field_region_map.c +++ b/src/field/field_region_map.c @@ -50,7 +50,7 @@ void CB2_FieldInitRegionMap(void) InitRegionMap((void *)&ewram0_5.unk8, 0); CreateRegionMapPlayerIcon(0, 0); CreateRegionMapCursor(1, 1); - SetUpWindowConfig(&gWindowTemplate_81E709C); + Text_LoadWindowTemplate(&gWindowTemplate_81E709C); InitMenuWindow(&gWindowTemplate_81E709C); Menu_EraseScreen(); REG_BG0CNT = BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_TXT256x256; diff --git a/src/field/field_specials.c b/src/field/field_specials.c index 589f96844..aade7cffd 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -1573,7 +1573,7 @@ void sub_810F118(u8 taskId) } if (gMain.newKeys & A_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); gSpecialVar_Result = gUnknown_0203925B; PlaySE(SE_SELECT); sub_810EEDC(); @@ -1582,7 +1582,7 @@ void sub_810F118(u8 taskId) } if (gMain.newKeys & B_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); gSpecialVar_Result = 0x7f; PlaySE(SE_SELECT); sub_810EEDC(); diff --git a/src/field/item_menu.c b/src/field/item_menu.c index f58f42fb9..2be5f1e1d 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -424,7 +424,7 @@ static bool8 SetupBagMultistep(void) gMain.state++; break; case 7: - SetUpWindowConfig(&gWindowTemplate_81E6DFC); + Text_LoadWindowTemplate(&gWindowTemplate_81E6DFC); gMain.state++; break; case 8: @@ -1552,11 +1552,11 @@ static void ItemListMenu_ChangeDescription(s16 itemId, int b) if (b == 0) { Menu_EraseWindowRect(0, 13, 13, 20); - MenuPrint_PixelCoords(gOtherText_ReturnTo, 4, 0x68, 0); + Menu_PrintTextPixelCoords(gOtherText_ReturnTo, 4, 0x68, 0); } else if (b == 1) { - MenuPrint_PixelCoords(gUnknown_0840E740[sReturnLocation], 4, 0x78, 0); + Menu_PrintTextPixelCoords(gUnknown_0840E740[sReturnLocation], 4, 0x78, 0); } } else @@ -1564,7 +1564,7 @@ static void ItemListMenu_ChangeDescription(s16 itemId, int b) if (b == 0) Menu_EraseWindowRect(0, 13, 13, 20); if (ItemId_CopyDescription(description, itemId, b)) - MenuPrint_PixelCoords(description, 4, 104 + b * 16, 0); + Menu_PrintTextPixelCoords(description, 4, 104 + b * 16, 0); } } @@ -1604,7 +1604,7 @@ static void sub_80A4A98(const u8 *text, u32 line) if (line == 0) Menu_EraseWindowRect(0, 13, 13, 20); if (CopyTextLine(buffer, text, line)) - MenuPrint_PixelCoords(buffer, 4, 104 + line * 16, 0); + Menu_PrintTextPixelCoords(buffer, 4, 104 + line * 16, 0); } static void sub_80A4ADC(u8 taskId) @@ -3559,7 +3559,7 @@ static void ItemListMenu_InitMenu(void) static void sub_80A73C0(void) { - sub_814AD7C(0x70, gBagPocketScrollStates[sCurrentBagPocket].cursorPos * 16 + 16); + MenuCursor_SetPos814AD7C(0x70, gBagPocketScrollStates[sCurrentBagPocket].cursorPos * 16 + 16); } static void sub_80A73F0(void) @@ -3569,8 +3569,8 @@ static void sub_80A73F0(void) static void sub_80A73FC(void) { - HandleDestroyMenuCursors(); - sub_814AD44(); + Menu_DestroyCursor(); + MenuCursor_Destroy814AD44(); } static void sub_80A740C(void) diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index c3a73e18b..0a841eed1 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -1259,7 +1259,7 @@ static void Task_StoryListMenu(u8 taskId) gSpecialVar_Result = 1; gUnknown_03000748 = selection; } - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 25, 12); DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c index 44b24eed6..76f0d367e 100644 --- a/src/field/menu_helpers.c +++ b/src/field/menu_helpers.c @@ -160,7 +160,7 @@ void DisplayItemMessageOnField(u8 taskId, const u8 *str, TaskFunc callback, u16 static void Task_CallYesOrNoCallback(u8 taskId) { - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: PlaySE(SE_SELECT); diff --git a/src/field/money.c b/src/field/money.c index 4ab4de51c..b85ed8009 100644 --- a/src/field/money.c +++ b/src/field/money.c @@ -148,7 +148,7 @@ void PrintMoneyAmount(u32 amount, u8 size, u8 x, u8 y) else { int xPlusOne = x + 1; - MenuPrint_PixelCoords(buffer, (xPlusOne + size) * 8 - stringWidth, y * 8, 1); + Menu_PrintTextPixelCoords(buffer, (xPlusOne + size) * 8 - stringWidth, y * 8, 1); } } diff --git a/src/field/overworld.c b/src/field/overworld.c index e91c8ae56..9fab20876 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -1456,7 +1456,7 @@ bool32 sub_805483C(u8 *a1) case 4: sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); (*a1)++; break; @@ -1522,7 +1522,7 @@ bool32 sub_805493C(u8 *a1, u32 a2) case 4: sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); (*a1)++; break; @@ -1612,7 +1612,7 @@ bool32 sub_8054A9C(u8 *a1) case 3: sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); (*a1)++; break; @@ -1695,7 +1695,7 @@ void sub_8054C2C(void) { sub_8054814(); sub_8054C54(); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); mapdata_load_assets_to_gpu_and_full_redraw(); } diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 73a32d070..9cad5bd73 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -679,7 +679,7 @@ bool8 InitPartyMenu(void) gMain.state++; break; case 7: - SetUpWindowConfig(&gWindowTemplate_81E6C90); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C90); gMain.state++; break; case 8: @@ -2706,7 +2706,7 @@ void sub_806D5B8(u8 monIndex) u8 right = gUnknown_08376948[IsDoubleBattle()][monIndex].right; u8 bottom = gUnknown_08376948[IsDoubleBattle()][monIndex].bottom; - ZeroFillWindowRect(&gUnknown_03004210, left, top, right, bottom); + Text_EraseWindowRect(&gUnknown_03004210, left, top, right, bottom); var1 = 0; CpuFastSet(&var1, OBJ_VRAM1 + monIndex * 0x400, 0x1000100); @@ -2720,7 +2720,7 @@ void sub_806D668(u8 monIndex) u8 right = gUnknown_08376978[IsDoubleBattle()][monIndex].right; u8 bottom = gUnknown_08376978[IsDoubleBattle()][monIndex].bottom; - ZeroFillWindowRect(&gUnknown_03004210, left, top, right, bottom); + Text_EraseWindowRect(&gUnknown_03004210, left, top, right, bottom); var1 = 0; CpuFastSet(&var1, OBJ_VRAM1 + 0x300 + monIndex * 0x400, 0x1000040); @@ -3313,7 +3313,7 @@ void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer) { u32 var1 = 0; CpuFastSet(&var1, gTileBuffer, 0x1000100); - sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gTileBuffer, nameBuffer); + Text_InitWindow8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gTileBuffer, nameBuffer); CpuFastSet(gTileBuffer, OBJ_VRAM1 + (monIndex * 0x400), 128); } @@ -3423,7 +3423,7 @@ void PartyMenuDoPrintLevel(u8 monIndex, u8 menuLayout, u8 level) var1 = 0; CpuFastSet(&var1, gUnknown_02039460, 0x1000020); - sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); + Text_InitWindow8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x200 + (monIndex * 0x400), 32); } @@ -3517,7 +3517,7 @@ void PartyMenuDoPrintHP(u8 monIndex, u8 b, u16 currentHP, u16 maxHP) var = 0; CpuFastSet(&var, gUnknown_02039460, 0x1000040); - sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); + Text_InitWindow8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1); CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x300 + (monIndex * 0x400), 64); } @@ -3668,7 +3668,7 @@ void ClosePartyPopupMenu(u8 index, const struct PartyPopupMenu *menu) SetPartyPopupMenuOffsets(index, &left, &top, menu); Menu_EraseWindowRect(left, top, left + menu[index].width, menu[index].numChoices * 2 + top + 1); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); } TaskFunc PartyMenuGetPopupMenuFunc(u8 menuIndex, const struct PartyPopupMenu *menus, const struct MenuAction2 *menuActions, u8 itemIndex) @@ -3788,7 +3788,7 @@ void party_menu_link_mon_held_item_object(u8 taskId) void PartyMenuTryGiveMonHeldItem_806EACC(u8 taskId) { - s8 selection = ProcessMenuInputNoWrap_(); + s8 selection = Menu_ProcessInputNoWrap_(); if (selection == 0) { @@ -3925,7 +3925,7 @@ void DoTakeMail(u8 taskId, TaskFunc func) void Task_LoseMailMessage(u8 taskId) { - s8 selection = ProcessMenuInputNoWrap_(); + s8 selection = Menu_ProcessInputNoWrap_(); if (selection == 0) { @@ -3964,7 +3964,7 @@ void Task_ConfirmLoseMailMessage(u8 taskId) void Task_TakeHeldMail(u8 taskId) { - s8 selection = ProcessMenuInputNoWrap_(); + s8 selection = Menu_ProcessInputNoWrap_(); if (selection == 0) { @@ -4126,7 +4126,7 @@ void sub_806F358(u8 taskId) void sub_806F390(u8 taskId) { - s8 selection = ProcessMenuInputNoWrap_(); + s8 selection = Menu_ProcessInputNoWrap_(); if (selection == 0) { @@ -4224,7 +4224,7 @@ void StopTryingToTeachMove_806F67C(u8 taskId) void StopTryingToTeachMove_806F6B4(u8 taskId) { - s8 selection = ProcessMenuInputNoWrap_(); + s8 selection = Menu_ProcessInputNoWrap_(); if (selection == 0) { @@ -4713,7 +4713,7 @@ void DoPPRecoveryItemEffect(u8 taskId, u16 item, TaskFunc c) void ItemUseMoveMenu_HandleMoveSelection(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(19, 10, 29, 19); sub_806D5A4(); gTasks[taskId].data[11] = Menu_GetCursorPos(); @@ -4722,7 +4722,7 @@ void ItemUseMoveMenu_HandleMoveSelection(u8 taskId) void ItemUseMoveMenu_HandleCancel(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(19, 10, 29, 19); if (gMain.inBattle) gTasks[ewram1C000.unk4].func = HandleBattlePartyMenu; @@ -4868,12 +4868,12 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId) x = (i / 3) * 9 + 11; y = ((i % 3) << 1) + 1; - MenuPrint_PixelCoords(StatNames[i], (x + 1) * 8, y * 8, 1); + Menu_PrintTextPixelCoords(StatNames[i], (x + 1) * 8, y * 8, 1); if (i == 2) - MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 0); + Menu_PrintTextPixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 0); else - MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 1); + Menu_PrintTextPixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 1); gStringVar1[0] = EXT_CTRL_CODE_BEGIN; gStringVar1[1] = 0x14; @@ -4881,7 +4881,7 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId) ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.statGrowths[i], 1, 2); - MenuPrint_PixelCoords(gStringVar1, (x + 6) * 8 + 12, y * 8, 0); + Menu_PrintTextPixelCoords(gStringVar1, (x + 6) * 8 + 12, y * 8, 0); } } #elif GERMAN @@ -5028,7 +5028,7 @@ void PrintNewStatsInLevelUpWindow(u8 taskId) gStringVar1[2] = 0x06; ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.statGrowths[newStatIndex], 1, 3); - MenuPrint_PixelCoords(gStringVar1, (x + 6) * 8 + 6, y * 8, 0); + Menu_PrintTextPixelCoords(gStringVar1, (x + 6) * 8 + 6, y * 8, 0); } } diff --git a/src/field/player_pc.c b/src/field/player_pc.c index 7cbb20bad..0d5c5234b 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -218,7 +218,7 @@ void PlayerPC(void) static void InitPlayerPCMenu(u8 taskId) { Menu_DrawStdWindowFrame(0, 0, 10, gPcItemMenuOptionsNum * 2 + 1); - PrintMenuItemsReordered(1, 1, gPcItemMenuOptionsNum, sPlayerPCMenuActions, gPcItemMenuOptionOrder); + Menu_PrintItemsReordered(1, 1, gPcItemMenuOptionsNum, sPlayerPCMenuActions, gPcItemMenuOptionOrder); InitMenu(0, 1, 1, gPcItemMenuOptionsNum, 0, 9); TASK.FUNC = PlayerPCProcessMenuInput; } @@ -237,13 +237,13 @@ static void PlayerPCProcessMenuInput(u8 taskId) } else if (gMain.newKeys & A_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); sPlayerPCMenuActions[gPcItemMenuOptionOrder[Menu_GetCursorPos()]].func(taskId); } else if (gMain.newKeys & B_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); sPlayerPCMenuActions[gPcItemMenuOptionsNum[gPcItemMenuOptionOrder - 1]].func(taskId); // run EXIT. } @@ -307,7 +307,7 @@ static void InitItemStorageMenu(u8 var) { Menu_EraseWindowRect(0, 0, 10, 9); Menu_DrawStdWindowFrame(0, 0, 11, 9); - PrintMenuItems(1, 1, 4, (struct MenuAction *)gPCText_ItemPCOptionsText); + Menu_PrintItems(1, 1, 4, (struct MenuAction *)gPCText_ItemPCOptionsText); InitMenu(0, 1, 1, 4, var, 10); ItemStorageMenuPrint(gPCText_OptionDescList[var]); } @@ -339,7 +339,7 @@ static void ItemStorageMenuProcessInput(u8 var) } else if (gMain.newKeys & B_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); gPCText_ItemPCOptionsText[ITEMPC_MENU_EXIT].func(var); } @@ -378,7 +378,7 @@ static void ItemStorage_Withdraw(u8 taskId) { s16 *data = TASK.data; - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 11, 9); NUM_ITEMS = CountUsedPCItemSlots(); @@ -400,7 +400,7 @@ static void ItemStorage_Toss(u8 taskId) { s16 *data = TASK.data; - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 11, 9); NUM_ITEMS = CountUsedPCItemSlots(); @@ -420,7 +420,7 @@ static void ItemStorage_Toss(u8 taskId) static void ItemStorage_Exit(u8 var) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 11, 9); ReshowPlayerPC(var); } @@ -549,7 +549,7 @@ static void ItemStorage_ProcessInput(u8 taskId) PlaySE(SE_SELECT); if(SWITCH_MODE_ACTIVE == FALSE) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); ItemStorage_GoBackToPlayerPCMenu(taskId); } else @@ -1112,7 +1112,7 @@ static void Mailbox_ProcessInput(u8 taskId) } else if(gMain.newKeys & A_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); if(eMailboxInfo.itemsAbove + eMailboxInfo.cursorPos == eMailboxInfo.count) @@ -1127,7 +1127,7 @@ static void Mailbox_ProcessInput(u8 taskId) } else if(gMain.newKeys & B_BUTTON) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); Mailbox_TurnOff(taskId); } @@ -1165,7 +1165,7 @@ static void Mailbox_TurnOff(u8 taskId) static void Mailbox_PrintMailOptions(u8 taskId) // Mailbox_PrintMailOptions { Menu_DrawStdWindowFrame(0, 0, 0xC, 0x9); - PrintMenuItems(1, 1, 4, (struct MenuAction *)gMailboxMailOptions); + Menu_PrintItems(1, 1, 4, (struct MenuAction *)gMailboxMailOptions); InitMenu(0, 1, 1, 4, 0, 0xB); TASK.FUNC = Mailbox_MailOptionsProcessInput; } @@ -1231,7 +1231,7 @@ static const u8 gHighlightedMoveToBagFormatText[] = _("{COLOR RED}{STR_VAR_1}"); static void Mailbox_MoveToBag(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); StringCopy(gStringVar1, gOtherText_MoveToBag); Menu_PrintText(gHighlightedMoveToBagFormatText, 1, 3); // gHighlightedMoveToBagFormatText DisplayItemMessageOnField(taskId, gOtherText_MessageWillBeLost, Mailbox_DrawYesNoBeforeMove, 0); @@ -1325,7 +1325,7 @@ static void Mailbox_NoPokemonForMail(u8 taskId) static void Mailbox_Cancel(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 0xC, 0x9); Mailbox_DrawMailMenuAndDoProcessInput(taskId); } diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index b238857fa..dd94e1755 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -275,11 +275,11 @@ static bool8 sub_810B6C0(void) gMain.state++; break; case 5: - SetUpWindowConfig(&gWindowTemplate_81E6E34); + Text_LoadWindowTemplate(&gWindowTemplate_81E6E34); gMain.state++; break; case 6: - SetUpWindowConfig(&gWindowTemplate_81E6E50); + Text_LoadWindowTemplate(&gWindowTemplate_81E6E50); gMain.state++; break; case 7: @@ -814,7 +814,7 @@ static void sub_810C368(u8 taskId) sub_80F98A4(1); BasicInitMenuWindow(&gWindowTemplate_81E6E50); Menu_DrawStdWindowFrame(7, v0 + 4, 13, 11); - PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758); + Menu_PrintItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758); InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5); gSpecialVar_ItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1; gTasks[taskId].func = sub_810C40C; @@ -869,7 +869,7 @@ static void sub_810C508(u8 taskId) static void sub_810C540(u8 taskId) { BasicInitMenuWindow(&gWindowTemplate_81E6E50); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(7, 4, 13, 11); StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1.pokeblocks[gUnknown_02039248.unk0 + gUnknown_02039248.unk1].color]); StringExpandPlaceholders(gStringVar4, gContestStatsText_ThrowAwayPrompt); @@ -932,7 +932,7 @@ static void sub_810C748(u8 taskId) { StartVerticalScrollIndicators(0); StartVerticalScrollIndicators(1); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(7, 4, 13, 11); gTasks[taskId].func = sub_810BF7C; } diff --git a/src/field/region_map.c b/src/field/region_map.c index f7db0a61e..a098eb73d 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -1540,7 +1540,7 @@ void CB2_InitFlyRegionMap(void) FreeAllSpritePalettes(); break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E7224); + Text_LoadWindowTemplate(&gWindowTemplate_81E7224); break; case 2: InitMenuWindow(&gWindowTemplate_81E7224); @@ -1562,7 +1562,7 @@ void CB2_InitFlyRegionMap(void) break; case 6: LoadPalette(sFlyRegionMapFrame_Pal, 16, 32); - MenuPrint_PixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1); + Menu_PrintTextPixelCoords(gOtherText_FlyToWhere, 1, 0x90, 1); break; case 7: CreateFlyTargetGraphics(); diff --git a/src/field/script_menu.c b/src/field/script_menu.c index ee5843049..9d901a03c 100644 --- a/src/field/script_menu.c +++ b/src/field/script_menu.c @@ -652,7 +652,7 @@ static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuActi bottom = top + (2 * count + 1); Menu_DrawStdWindowFrame(left, top, right, bottom); - PrintMenuItems(left + 1, top + 1, count, list); + Menu_PrintItems(left + 1, top + 1, count, list); InitMenu(0, left + 1, top + 1, count, cursorPos, right - left - 1); StartScriptMenuTask(left, top, right, bottom, ignoreBPress, count); } @@ -704,7 +704,7 @@ static void Task_HandleMultichoiceInput(u8 taskId) { gSpecialVar_Result = selection; } - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); DestroyTask(taskId); EnableBothScriptContexts(); @@ -745,7 +745,7 @@ static void sub_80B53B4(u8 left, u8 top, u8 count, const struct MenuAction *list right = (right + left) + 2; bottom = top + (2 * count + 1); - PrintMenuItems(left, top, count, list); + Menu_PrintItems(left, top, count, list); InitMenu(0, left, top, count, 0, right - left - 1); StartScriptMenuTask(left, top, right, bottom, ignoreBPress, count); } @@ -839,7 +839,7 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 ignoreBPr bottom = (2 * (gMultichoiceLists[multichoiceId].count / columnCount)) + 3 + top; } - width = sub_807288C(columnCount); + width = Menu_GetColumnXCoord(columnCount); gTasks[taskId].tLeft = left; gTasks[taskId].tTop = top; gTasks[taskId].tRight = width + left + 2; @@ -866,7 +866,7 @@ static void Task_HandleMultichoiceGridInput(u8 taskId) { gSpecialVar_Result = selection; } - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(gTasks[taskId].tLeft, gTasks[taskId].tTop, gTasks[taskId].tRight, gTasks[taskId].tBottom); DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 16c2f57c2..203b57867 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -1021,13 +1021,13 @@ void sub_80BC824(u8 taskId) PlaySE(5); if (taskData[1] + taskData[2] == taskData[0]) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); sub_80BCC54(taskId); } else { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); taskData[4] = sub_80BC948(taskData[1] + taskData[2]); sub_80BC980(taskId); } @@ -1035,7 +1035,7 @@ void sub_80BC824(u8 taskId) else if (gMain.newKeys & B_BUTTON) { PlaySE(5); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); sub_80BCC54(taskId); } @@ -1067,7 +1067,7 @@ void sub_80BC980(u8 taskId) PauseVerticalScrollIndicator(0); PauseVerticalScrollIndicator(1); Menu_DrawStdWindowFrame(1, 0, 12, 5); - PrintMenuItems(2, 1, 2, (const struct MenuAction *)gUnknown_083D13D4); + Menu_PrintItems(2, 1, 2, (const struct MenuAction *)gUnknown_083D13D4); InitMenu(0, 2, 1, 2, 0, 10); gTasks[taskId].func = sub_80BC9E4; } @@ -1108,7 +1108,7 @@ void sub_80BCA84(u8 taskId) DestroyVerticalScrollIndicator(0); DestroyVerticalScrollIndicator(1); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); sub_80BC190(gStringVar1, taskData[4]); diff --git a/src/field/shop.c b/src/field/shop.c index cfd4818dc..d56d65c3f 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -85,13 +85,13 @@ u8 CreateShopMenu(u8 martType) { gMartInfo.numChoices = 2; Menu_DrawStdWindowFrame(0, 0, 10, 7); - PrintMenuItemsReordered(1, 1, 3, sBuySellQuitMenuActions, gUnknown_083CC6E8); + Menu_PrintItemsReordered(1, 1, 3, sBuySellQuitMenuActions, gUnknown_083CC6E8); } else { gMartInfo.numChoices = 1; Menu_DrawStdWindowFrame(0, 0, 10, 5); - PrintMenuItemsReordered(1, 1, 2, sBuySellQuitMenuActions, gUnknown_083CC6EB); + Menu_PrintItemsReordered(1, 1, 2, sBuySellQuitMenuActions, gUnknown_083CC6EB); } InitMenu(0, 1, 1, gMartInfo.numChoices + 1, 0, 9); // add 1 for cancel @@ -174,7 +174,7 @@ void sub_80B2F30(u8 taskId) void HandleShopMenuQuit(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 11, 8); sub_80BE3BC(); ScriptContext2_Disable(); @@ -285,7 +285,7 @@ void BuyMenuDrawGraphics(void) ResetPaletteFade(); ResetSpriteData(); ResetTasks(); - SetUpWindowConfig(&gWindowTemplate_81E6DFC); + Text_LoadWindowTemplate(&gWindowTemplate_81E6DFC); InitMenuWindow(&gWindowTemplate_81E6DFC); BuyMenuDrawMapGraphics(); gMartInfo.cursor = zero; @@ -557,7 +557,7 @@ void sub_80B389C(u16 itemId, u8 var2, bool32 hasControlCode) stringPtr = &gStringVar1[3]; GetMoneyAmountText(stringPtr, (ItemId_GetPrice(itemId) >> GetPriceReduction(1)), 0x4); - MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 1); + Menu_PrintTextPixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 1); } void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode) @@ -586,7 +586,7 @@ void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode) else { GetMoneyAmountText(stringPtr, gDecorations[itemId].price, 0x4); - MenuPrint_PixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 0x1); + Menu_PrintTextPixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 0x1); } } @@ -1084,7 +1084,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction PauseVerticalScrollIndicator(1); sub_80F979C(1, 1); sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 1); - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0xC, 0xD, 0x13); if (gMartInfo.martType == MART_TYPE_0) diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index abf837daa..9ff3a037c 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -400,7 +400,7 @@ static void SlotMachineSetup_0_1(void) static void SlotMachineSetup_3_0(void) { - SetUpWindowConfig(&gWindowTemplate_81E7128); + Text_LoadWindowTemplate(&gWindowTemplate_81E7128); InitMenuWindow(&gWindowTemplate_81E7128); } @@ -850,7 +850,7 @@ static bool8 sub_8102318(struct Task *task) static bool8 sub_8102344(struct Task *task) { - s8 input = ProcessMenuInputNoWrap_(); + s8 input = Menu_ProcessInputNoWrap_(); if (input == 0) { Menu_EraseScreen(); @@ -2808,7 +2808,7 @@ static void sub_8104B80(struct Task *task) sub_8104DA4(); sub_81065DC(); BasicInitMenuWindow(&gWindowTemplate_81E7144); - MenuPrint_PixelCoords(gOtherText_ReelTime, 10, 32, 1); + Menu_PrintTextPixelCoords(gOtherText_ReelTime, 10, 32, 1); BeginNormalPaletteFade(-1, 0, 16, 0, 0); task->data[0]++; } diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 8131e2511..5b2276d1b 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -404,7 +404,7 @@ static u8 StartMenu_PlayerCallback(void) //When player selects SAVE static u8 StartMenu_SaveCallback(void) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); gCallback_03004AE8 = SaveCallback1; return 0; } @@ -594,7 +594,7 @@ static u8 SaveDialogCB_DisplayConfirmYesNoMenu(void) static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void) { - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: //YES HideSaveDialog(); @@ -640,7 +640,7 @@ static u8 SaveDialogCB_DisplayOverwriteYesNoMenu(void) static u8 SaveDialogCB_ProcessOverwriteYesNoMenu(void) { - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: //YES HideSaveDialog(); @@ -774,7 +774,7 @@ static bool32 sub_80719FC(u8 *step) dp12_8087EA4(); break; case 2: - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON; break; diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index 9b644c6cb..91b706e78 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -294,7 +294,7 @@ void CB2_ChooseStarter(void) LoadCompressedObjectPic(&gUnknown_083F7794[0]); LoadCompressedObjectPic(&gUnknown_083F77A4[0]); LoadSpritePalettes(gUnknown_083F77B4); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); @@ -435,7 +435,7 @@ static void Task_StarterChoose5(u8 taskId) { u8 spriteId; - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: // YES //Return the starter choice and exit. diff --git a/src/field/trader.c b/src/field/trader.c index eb0c8a934..b4732ab15 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -135,7 +135,7 @@ void sub_8109B34(u8 taskId, u8 decorationId) gSpecialVar_0x8004 = decorationId; } - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 1, 12, 12); DestroyTask(taskId); EnableBothScriptContexts(); @@ -215,7 +215,7 @@ void ScrSpecial_TraderMenuGiveDecoration(void) void sub_8109D04(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); DestroyVerticalScrollIndicator(0); DestroyVerticalScrollIndicator(1); @@ -237,7 +237,7 @@ void sub_8109D04(u8 taskId) void sub_8109DAC(u8 taskId) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); gSpecialVar_0x8006 = 0; DestroyTask(taskId); diff --git a/src/field/tv.c b/src/field/tv.c index e88e3c72b..e1eade130 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -864,7 +864,7 @@ void PutPokemonTodayCaughtOnAir(void) sub_80BE138((TVShow *)pokemonToday); pokemonToday->language = GAME_LANGUAGE; pokemonToday->language2 = sub_80BDEAC(pokemonToday->nickname); - StripExtCtrlCodes(pokemonToday->nickname); + Text_StripExtCtrlCodes(pokemonToday->nickname); } } } @@ -966,7 +966,7 @@ void InterviewAfter_BravoTrainerPokemonProfile(void) sub_80BE160((TVShow *)bravoTrainerNew); bravoTrainerNew->language = GAME_LANGUAGE; bravoTrainerNew->var1f = sub_80BDEAC(bravoTrainerNew->pokemonNickname); - StripExtCtrlCodes(bravoTrainerNew->pokemonNickname); + Text_StripExtCtrlCodes(bravoTrainerNew->pokemonNickname); } } @@ -1075,7 +1075,7 @@ void sub_80BE478(void) sub_80BE160((TVShow *)nameRaterShow); nameRaterShow->language = GAME_LANGUAGE; nameRaterShow->pokemonNameLanguage = sub_80BDEAC(nameRaterShow->pokemonName); - StripExtCtrlCodes(nameRaterShow->pokemonName); + Text_StripExtCtrlCodes(nameRaterShow->pokemonName); } } @@ -1138,7 +1138,7 @@ void InterviewAfter_PkmnFanClubOpinions(void) sub_80BE160((TVShow *)fanclubOpinions); fanclubOpinions->language = GAME_LANGUAGE; fanclubOpinions->var0E = sub_80BDEAC(fanclubOpinions->var10); - StripExtCtrlCodes(fanclubOpinions->var10); + Text_StripExtCtrlCodes(fanclubOpinions->var10); } void InterviewAfter_DummyShow4(void) diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index a4a36e40a..9363498ba 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -228,7 +228,7 @@ static void sub_8136294(void) gUnknown_02039304->unk50++; break; case 3: - SetUpWindowConfig(&gWindowTemplate_81E7080); + Text_LoadWindowTemplate(&gWindowTemplate_81E7080); gUnknown_02039304->unk50++; break; case 4: diff --git a/src/field/wallclock.c b/src/field/wallclock.c index 8620ad9f0..4f2a6dccd 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -236,7 +236,7 @@ static void LoadWallClockGraphics(void) FreeAllSpritePalettes(); LoadCompressedObjectPic(&gUnknown_083F7A90[0]); LoadSpritePalettes(gUnknown_083F7AA0); - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); } @@ -417,7 +417,7 @@ static void Task_SetClock3(u8 taskId) Menu_DrawStdWindowFrame(2, 16, 27, 19); Menu_PrintText(gOtherText_CorrectTimePrompt, 3, 17); Menu_DrawStdWindowFrame(23, 8, 29, 13); - PrintMenuItems(24, 9, 2, gMenuYesNoItems); + Menu_PrintItems(24, 9, 2, gMenuYesNoItems); InitMenu(0, 24, 9, 2, 1, 5); gTasks[taskId].func = Task_SetClock4; } @@ -425,7 +425,7 @@ static void Task_SetClock3(u8 taskId) //Get menu selection static void Task_SetClock4(u8 taskId) { - switch (ProcessMenuInputNoWrap_()) + switch (Menu_ProcessInputNoWrap_()) { case 0: //YES PlaySE(SE_SELECT); @@ -433,7 +433,7 @@ static void Task_SetClock4(u8 taskId) return; case -1: //B button case 1: //NO - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); Menu_EraseWindowRect(23, 8, 29, 13); Menu_EraseWindowRect(2, 16, 27, 19); diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index eae1c0b4e..356a31b00 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -268,11 +268,11 @@ void CB2_InitLearnMove(void) sub_8133558(); SetVBlankCallback(VBlankCB_LearnMove); - SetUpWindowConfig(&gWindowTemplate_81E7240); + Text_LoadWindowTemplate(&gWindowTemplate_81E7240); InitMenuWindow(&gWindowTemplate_81E7240); Menu_EraseScreen(); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_EraseScreen(); @@ -302,11 +302,11 @@ void sub_81327A4(void) sLearnMoveStruct->unk2C6 = gSpecialVar_0x8005; SetVBlankCallback(VBlankCB_LearnMove); - SetUpWindowConfig(&gWindowTemplate_81E7240); + Text_LoadWindowTemplate(&gWindowTemplate_81E7240); InitMenuWindow(&gWindowTemplate_81E7240); Menu_EraseScreen(); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); Menu_EraseScreen(); @@ -333,7 +333,7 @@ void CB2_LearnMove(void) if (sLearnMoveStruct->unk1D) { sLearnMoveStruct->unk1D = FALSE; - sub_814AD7C(0x58, (sLearnMoveStruct->unk18 * 2 + 1) * 8); + MenuCursor_SetPos814AD7C(0x58, (sLearnMoveStruct->unk18 * 2 + 1) * 8); } if (sLearnMoveStruct->unk1E != 0) { @@ -409,7 +409,7 @@ void LearnMoveMain(void) break; case 9: { - s8 selection = ProcessMenuInputNoWrap_(); + s8 selection = Menu_ProcessInputNoWrap_(); if (selection == 0) { @@ -444,7 +444,7 @@ void LearnMoveMain(void) break; case 13: { - s8 selection = ProcessMenuInputNoWrap_(); + s8 selection = Menu_ProcessInputNoWrap_(); if (selection == 0) { @@ -475,7 +475,7 @@ void LearnMoveMain(void) break; case 18: { - s8 var = ProcessMenuInputNoWrap_(); + s8 var = Menu_ProcessInputNoWrap_(); if (var == 0) { @@ -503,7 +503,7 @@ void LearnMoveMain(void) break; case 26: { - s8 var = ProcessMenuInputNoWrap_(); + s8 var = Menu_ProcessInputNoWrap_(); if (var == 0) { diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index cd1083790..ab43c033a 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -354,7 +354,7 @@ static u8 sub_80F8A28(void) RETURN_UP_STATE; case 6: - SetUpWindowConfig(&gWindowTemplate_81E6DFC); + Text_LoadWindowTemplate(&gWindowTemplate_81E6DFC); RETURN_UP_STATE; case 7: diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c index eeefa8431..3734856b8 100644 --- a/src/pokemon/mon_markings.c +++ b/src/pokemon/mon_markings.c @@ -566,8 +566,8 @@ void sub_80F761C(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) } sMenu->cursorBaseY = y + 8; - sub_814A5C0(0, basePaletteTag + 1, 15, 0, 0x30); - sub_814A880(x + 8, sMenu->cursorBaseY); + MenuCursor_Create814A5C0(0, basePaletteTag + 1, 15, 0, 0x30); + MenuCursor_SetPos814A880(x + 8, sMenu->cursorBaseY); sub_814AABC(sub_80F7908); } diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c index 2ed404327..194636e4d 100644 --- a/src/pokemon/pokeblock_feed.c +++ b/src/pokemon/pokeblock_feed.c @@ -530,7 +530,7 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; break; case 4: - SetUpWindowConfig(&gWindowTemplate_81E6E50); + Text_LoadWindowTemplate(&gWindowTemplate_81E6E50); gMain.state++; break; case 5: diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index b7081f35d..48ce26bb8 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -1425,7 +1425,7 @@ void CB2_InitPokedex(void) ResetPaletteFade(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - SetUpWindowConfig(&gWindowTemplate_81E7048); + Text_LoadWindowTemplate(&gWindowTemplate_81E7048); InitMenuWindow(&gWindowTemplate_81E7048); gMain.state++; break; @@ -1937,7 +1937,7 @@ static bool8 sub_808D344(u8 a) gMain.state++; break; case 2: - SetUpWindowConfig(&gWindowTemplate_81E7048); + Text_LoadWindowTemplate(&gWindowTemplate_81E7048); InitMenuWindow(&gWindowTemplate_81E7048); LZ77UnCompVram(gUnknown_0839FA7C, (void *)(VRAM + 0xFF80)); gMain.state++; @@ -2283,7 +2283,7 @@ static u8 sub_808DFE4(u16 num, u8 b, u8 c) text[i] = CHAR_HYPHEN; break; } - MenuPrint_PixelCoords(text, (b - 0x11) * 8 + 0xFC, c * 8, 0); + Menu_PrintTextPixelCoords(text, (b - 0x11) * 8 + 0xFC, c * 8, 0); return i; } @@ -2951,7 +2951,7 @@ static void Task_InitPageScreenMultistep(u8 taskId) gMain.state++; break; case 3: - SetUpWindowConfig(&gWindowTemplate_81E7064); + Text_LoadWindowTemplate(&gWindowTemplate_81E7064); InitMenuWindow(&gWindowTemplate_81E7064); gMain.state++; break; @@ -3205,7 +3205,7 @@ static void Task_InitCryScreenMultistep(u8 taskId) gMain.state++; break; case 3: - SetUpWindowConfig(&gWindowTemplate_81E702C); + Text_LoadWindowTemplate(&gWindowTemplate_81E702C); InitMenuWindow(&gWindowTemplate_81E702C); ResetPaletteFade(); gMain.state++; @@ -3394,7 +3394,7 @@ static void Task_InitSizeScreenMultistep(u8 taskId) { u8 string[40]; //I hope this is the correct size - SetUpWindowConfig(&gWindowTemplate_81E702C); + Text_LoadWindowTemplate(&gWindowTemplate_81E702C); InitMenuWindow(&gWindowTemplate_81E702C); string[0] = EOS; StringAppend(string, gDexText_SizeComparedTo); @@ -3841,7 +3841,7 @@ static void sub_8090750(u8 taskId) gTasks[taskId].data[0]++; break; case 2: - SetUpWindowConfig(&gWindowTemplate_81E7064); + Text_LoadWindowTemplate(&gWindowTemplate_81E7064); InitMenuWindow(&gWindowTemplate_81E7064); DmaClear16(3, (void *)(VRAM + 0xC000), 0x200); gTasks[taskId].data[0]++; @@ -4770,7 +4770,7 @@ static void sub_8091E54(u8 taskId) } break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E7064); + Text_LoadWindowTemplate(&gWindowTemplate_81E7064); InitMenuWindow(&gWindowTemplate_81E7064); LoadCompressedObjectPic(&gUnknown_083A05CC[0]); LoadSpritePalettes(gUnknown_083A05DC); @@ -4997,7 +4997,7 @@ static void sub_8092508(u8 taskId) static void sub_80925B4(u16 a, int unused) { - sub_814AD7C(0x90, (a * 2 + 1) * 8); + MenuCursor_SetPos814AD7C(0x90, (a * 2 + 1) * 8); } static void sub_80925CC(u8 taskId) @@ -5305,29 +5305,29 @@ static void sub_8092B68(u8 taskId) var = gTasks[taskId].data[6] + gTasks[taskId].data[7]; StringCopy(gStringVar1, gUnknown_083B5910[var].text2); - MenuPrint_PixelCoords(gUnknown_083B5AB2, 45, 16, 1); + Menu_PrintTextPixelCoords(gUnknown_083B5AB2, 45, 16, 1); var = gTasks[taskId].data[8] + gTasks[taskId].data[9]; StringCopy(gStringVar1, gUnknown_083B5968[var].text2); - MenuPrint_PixelCoords(gUnknown_083B5AB2, 45, 32, 1); + Menu_PrintTextPixelCoords(gUnknown_083B5AB2, 45, 32, 1); var = gTasks[taskId].data[10] + gTasks[taskId].data[11]; StringCopy(gStringVar1, gUnknown_083B59C8[var].text2); - MenuPrint_PixelCoords(gUnknown_083B5AAC, 45, 48, 1); + Menu_PrintTextPixelCoords(gUnknown_083B5AAC, 45, 48, 1); var = gTasks[taskId].data[12] + gTasks[taskId].data[13]; StringCopy(gStringVar1, gUnknown_083B59C8[var].text2); - MenuPrint_PixelCoords(gUnknown_083B5AAC, 93, 48, 1); + Menu_PrintTextPixelCoords(gUnknown_083B5AAC, 93, 48, 1); var = gTasks[taskId].data[4] + gTasks[taskId].data[5]; StringCopy(gStringVar1, gUnknown_083B58D8[var].text2); - MenuPrint_PixelCoords(gUnknown_083B5AB2, 45, 64, 1); + Menu_PrintTextPixelCoords(gUnknown_083B5AB2, 45, 64, 1); if (IsNationalPokedexEnabled()) { var = gTasks[taskId].data[2] + gTasks[taskId].data[3]; StringCopy(gStringVar1, gUnknown_083B58C0[var].text2); - MenuPrint_PixelCoords(gUnknown_083B5AB2, 45, 80, 1); + Menu_PrintTextPixelCoords(gUnknown_083B5AB2, 45, 80, 1); } } diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index f4d227f7f..bfd0bc972 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -308,7 +308,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src) language = GAME_LANGUAGE; SetMonData(mon, MON_DATA_LANGUAGE, &language); - StripExtCtrlCodes(nickname); + Text_StripExtCtrlCodes(nickname); SetMonData(mon, MON_DATA_NICKNAME, nickname); SetMonData(mon, MON_DATA_FRIENDSHIP, &src->friendship); SetMonData(mon, MON_DATA_HP_EV, &src->hpEV); diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index da9a18148..70234ac48 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -230,7 +230,7 @@ static void sub_8089BDC(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct { PrintPartyMenuPromptText(5, arg6); Menu_DrawStdWindowFrame(arg0, arg1, arg0 + arg2, (noOfOptions * 2) + arg1 + 1); - PrintMenuItemsReordered(arg0 + 1, arg1 + 1, noOfOptions, menuActions, order); + Menu_PrintItemsReordered(arg0 + 1, arg1 + 1, noOfOptions, menuActions, order); } void sub_8089C50(u8 arg0, u8 arg1, u8 arg2, u8 noOfOptions, const struct MenuAction2 *menuActions, const u8 *order) @@ -368,7 +368,7 @@ void DoPokemonMenu_Switch(u8 taskID) static void PokemonMenu_Switch(u8 taskID) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); ewram01000.unkC = sub_806CD5C; ewram01000.array[53553] = 1; DoPokemonMenu_Switch(taskID); @@ -407,7 +407,7 @@ static void sub_808A100(u8 taskID) static void PokemonMenu_Item(u8 taskID) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); sPokeMenuCursorPos = 0; Menu_EraseWindowRect(19, 0, 29, 19); gTasks[taskID].func = sub_808A100; @@ -600,7 +600,7 @@ static void sub_808A678(u8 taskID) static void PokemonMenu_TakeItem(u8 taskID) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(19, 0, 29, 19); sub_806D5A4(); PartyMenuTryGiveMonHeldItem_806ECE8(taskID, sub_808A678); @@ -608,7 +608,7 @@ static void PokemonMenu_TakeItem(u8 taskID) static void PokemonMenu_TakeMail(u8 taskID) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); Menu_EraseWindowRect(19, 0, 29, 19); sub_806D5A4(); DoTakeMail(taskID, sub_808A678); @@ -616,7 +616,7 @@ static void PokemonMenu_TakeMail(u8 taskID) static void PokemonMenu_Mail(u8 taskID) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); sPokeMenuCursorPos = 0; Menu_EraseWindowRect(19, 0, 29, 19); ShowPartyPopupMenu(0, &sUnknown_0839F584, (void*) sPokemonMenuActions, 0); @@ -686,14 +686,14 @@ static void sub_808A8D4(u8 taskID) static void PokemonMenu_Cancel(u8 taskID) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); sub_808A8D4(taskID); } static void PokemonMenu_CancelSubmenu(u8 taskID) { - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); PlaySE(SE_SELECT); Menu_EraseWindowRect(19, 0, 29, 19); sub_806D5A4(); @@ -711,7 +711,7 @@ static void PokemonMenu_FieldMove(u8 taskID) { s16* data = gTasks[taskID].data; - HandleDestroyMenuCursors(); + Menu_DestroyCursor(); tFieldMoveId = sPokeMenuOptionsOrder[sPokeMenuCursorPos] - POKEMENU_FIRST_FIELD_MOVE_ID; if (sub_80F9344() == TRUE) { diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index e448c9ed3..d98383c6d 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -718,7 +718,7 @@ bool8 sub_809DA84(void) gMain.state++; break; case 5: - SetUpWindowConfig(&gWindowTemplate_81E6E6C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6E6C); gMain.state++; break; case 6: @@ -2716,7 +2716,7 @@ static void sub_809FF64(struct Pokemon *mon) *buffer++ = CHAR_SLASH; buffer = sub_8072C14(buffer, GetMonData(mon, MON_DATA_MAX_HP), 48, 1); - MenuPrint_PixelCoords(gStringVar1, 126, 56, 1); + Menu_PrintTextPixelCoords(gStringVar1, 126, 56, 1); } static void sub_80A0090(struct Pokemon *mon) @@ -3127,7 +3127,7 @@ bool8 PokemonSummaryScreen_CheckOT(struct Pokemon *mon) u8 enemyId = GetMultiplayerId() ^ 1; trainerId = gLinkPlayers[enemyId].trainerId & 0xFFFF; StringCopy(gStringVar1, gLinkPlayers[enemyId].name); - StripExtCtrlCodes(gStringVar1); + Text_StripExtCtrlCodes(gStringVar1); } else { @@ -5295,7 +5295,7 @@ u8 *sub_80A1E9C(u8 *dest, const u8 *src, u8 id) static void sub_80A1EF8(const u8 *text, u8 id, u8 left, u16 top, s32 e) { sub_80A1E9C(gStringVar4, text, id); - MenuPrint_PixelCoords(gStringVar4, left, top, (bool8)e); + Menu_PrintTextPixelCoords(gStringVar4, left, top, (bool8)e); } static void sub_80A1F48(const u8 *text, u8 id, u8 c, u8 d, u16 e) diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 43c9475ca..3b534c96c 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -3268,7 +3268,7 @@ bool8 sub_80EF284(u8 a) sub_80EEDE8(); break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E7224); + Text_LoadWindowTemplate(&gWindowTemplate_81E7224); break; case 2: MultistepInitMenuWindowBegin(&gWindowTemplate_81E7224); @@ -3660,7 +3660,7 @@ bool8 sub_80EF874(void) sub_80EEDE8(); break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E7224); + Text_LoadWindowTemplate(&gWindowTemplate_81E7224); break; case 2: MultistepInitMenuWindowBegin(&gWindowTemplate_81E7224); @@ -3972,7 +3972,7 @@ bool8 sub_80EFF68(void) gUnknown_083DFEC4->unkD162[0] = 11; break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E7080); + Text_LoadWindowTemplate(&gWindowTemplate_81E7080); break; case 2: MultistepInitMenuWindowBegin(&gWindowTemplate_81E7080); @@ -4086,7 +4086,7 @@ bool8 sub_80F02A0(void) gUnknown_083DFEC4->unkD162[0] = 11; break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E70D4); + Text_LoadWindowTemplate(&gWindowTemplate_81E70D4); break; case 2: MultistepInitMenuWindowBegin(&gWindowTemplate_81E70D4); @@ -4269,7 +4269,7 @@ _080F033C: .4byte 0x000087c8\n\ _080F0340: .4byte 0x0000d162\n\ _080F0344:\n\ ldr r0, _080F034C @ =gWindowTemplate_81E70D4\n\ - bl SetUpWindowConfig\n\ + bl Text_LoadWindowTemplate\n\ b _080F0618\n\ .align 2, 0\n\ _080F034C: .4byte gWindowTemplate_81E70D4\n\ diff --git a/src/roulette.c b/src/roulette.c index 950cbdbb1..e88c36c01 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -596,7 +596,7 @@ void sub_8115384(void) gMain.state++; break; case 0x2: - SetUpWindowConfig(&gWindowTemplate_81E6C3C); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gWindowTemplate_81E6CE4); LoadPalette(&gUnknown_083F86BC, 0x0, 0x1C0); gMain.state++; diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 32a48fd36..b59d02939 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -198,8 +198,8 @@ void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo); void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo); void sub_80A6978(void); u8 sub_80A7DEC(u8 berryId, u8 x, u8 y, bool8 animate); -void sub_814A880(u8 a1, u8 a2); -u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); +void MenuCursor_SetPos814A880(u8 a1, u8 a2); +u8 MenuCursor_Create814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); s8 GetFirstFreePokeblockSlot(void); bool8 sub_810CA34(struct Pokeblock *pokeblock); #ifdef GERMAN @@ -957,7 +957,7 @@ static void sub_804E56C(void) ResetSpriteData(); FreeAllSpritePalettes(); SetVBlankCallback(NULL); - SetUpWindowConfig(&gWindowTemplate_81E6F68); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F68); InitMenuWindow(&gWindowTemplate_81E6F68); gBerryBlenderData->field_0++; gBerryBlenderData->field_140 = 0; @@ -1135,7 +1135,7 @@ static void sub_804E9F8(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB0_BerryBlender); - SetUpWindowConfig(&gWindowTemplate_81E6F68); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F68); InitMenuWindow(&gWindowTemplate_81E6F68); gLinkType = 0x4422; gBerryBlenderData->field_0++; @@ -1338,7 +1338,7 @@ static void sub_804F0F4(void) SetVBlankCallback(VBlankCB0_BerryBlender); - SetUpWindowConfig(&gWindowTemplate_81E6F68); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F68); InitMenuWindow(&gWindowTemplate_81E6F68); gLinkType = 0x4422; @@ -1426,7 +1426,7 @@ static void sub_804F2A8(void) if (GetMultiplayerId() == gBerryBlenderData->field_9A[i]) stringPtr = StringCopy(stringPtr, sRedColorString); StringCopy(stringPtr, gLinkPlayers[gBerryBlenderData->field_9A[i]].name); - MenuPrint_PixelCoords(gStringVar1, gUnknown_082162D4[i][0] * 8 + 1, gUnknown_082162D4[i][1] * 8, 1); + Menu_PrintTextPixelCoords(gStringVar1, gUnknown_082162D4[i][0] * 8 + 1, gUnknown_082162D4[i][1] * 8, 1); } } } @@ -2494,14 +2494,14 @@ static void sub_8050760(void) static void sub_80508D4(u8 value) { gBerryBlenderData->field_AA = value; - sub_814A880(192, (gBerryBlenderData->field_AA * 16) + 72); + MenuCursor_SetPos814A880(192, (gBerryBlenderData->field_AA * 16) + 72); } static void sub_80508FC(void) { gBerryBlenderData->field_AA = 0; Menu_DrawStdWindowFrame(23, 8, 28, 13); - sub_814A5C0(0, -1, 12, 0x2D9F, 32); + MenuCursor_Create814A5C0(0, -1, 12, 0x2D9F, 32); Menu_PrintText(gOtherText_YesNoTerminating, 24, 9); sub_80508D4(gBerryBlenderData->field_AA); } @@ -3080,7 +3080,7 @@ void unref_sub_80516F8(u8 taskID) task->data[0] = 0; if (task->data[0] == 100) { - ZeroFillWindowRect(&gBerryBlenderData->field_4, 0, 0, 16, 20); + Text_EraseWindowRect(&gBerryBlenderData->field_4, 0, 0, 16, 20); Menu_DrawStdWindowFrame(4, 4, 10, 12); for (i = 0; i < 3; i++) { @@ -3606,7 +3606,7 @@ void unref_sub_80524BC(void) FreeAllSpritePalettes(); ResetTasks(); SetVBlankCallback(VBlankCB1_BerryBlender); - SetUpWindowConfig(&gWindowTemplate_81E6CE4); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); InitMenuWindow(&gWindowTemplate_81E6CE4); SeedRng(gMain.vblankCounter1); REG_DISPCNT = 0x1540; diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c index de9063823..401872644 100644 --- a/src/scene/contest_painting.c +++ b/src/scene/contest_painting.c @@ -244,7 +244,7 @@ static void HoldContestPainting(void) static void ContestPaintingInitWindow(u8 arg0) { InitMenuWindow(&gWindowTemplate_81E7160); - SetUpWindowConfig(&gWindowTemplate_81E7160); + Text_LoadWindowTemplate(&gWindowTemplate_81E7160); } static void ContestPaintingPrintCaption(u8 contestType, u8 arg1) @@ -291,7 +291,7 @@ static void ContestPaintingPrintCaption(u8 contestType, u8 arg1) xPos = 3; yPos = 14; } - MenuPrint_PixelCoords(gUnknown_03005E40, xPos * 8 + 1, yPos * 8, 1); + Menu_PrintTextPixelCoords(gUnknown_03005E40, xPos * 8 + 1, yPos * 8, 1); } static void ContestPaintingInitBG(void) diff --git a/src/scene/credits.c b/src/scene/credits.c index f113fe965..e31e2c797 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -474,7 +474,7 @@ void sub_81439D0(void) taskIdC = gTasks[taskIdA].data[TDA_TASK_C_ID]; gTasks[taskIdC].data[TDC_0] = 40; - SetUpWindowConfig(&gWindowTemplate_81E7208); + Text_LoadWindowTemplate(&gWindowTemplate_81E7208); InitMenuWindow(&gWindowTemplate_81E7208); LoadPalette(&gUnknown_0840B7BC, 0x80, sizeof(gUnknown_0840B7BC)); diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index e76f5b47c..e0b798aea 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -471,7 +471,7 @@ static void CB2_EggHatch_0(void) gSpecialVar_0x8005 = GetCurrentMapMusic(); break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F84); Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowTemplate_81E6F84); gEggHatchData->tileDataStartOffset = TextWindow_SetBaseTileNum(20); TextWindow_LoadStdFrameGraphics(&gEggHatchData->window); @@ -633,7 +633,7 @@ static void CB2_EggHatch_1(void) case 9: { s8 menuInput; - if ((menuInput = ProcessMenuInputNoWrap_()) != -2) + if ((menuInput = Menu_ProcessInputNoWrap_()) != -2) { if (menuInput != -1 && menuInput != 1) { diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 571b8ab8d..167130aa5 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -197,7 +197,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, REG_WININ = 0; REG_WINOUT = 0; - SetUpWindowConfig(&gWindowTemplate_81E6C58); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; @@ -306,7 +306,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) REG_WIN1V = 0; REG_WININ = 0; REG_WINOUT = 0; - SetUpWindowConfig(&gWindowTemplate_81E6C58); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; gBattle_BG0_Y = 0; @@ -373,7 +373,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMain.state++; break; case 1: - SetUpWindowConfig(&gWindowTemplate_81E6F84); + Text_LoadWindowTemplate(&gWindowTemplate_81E6F84); Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84); gMain.state++; break; @@ -1087,7 +1087,7 @@ static void Task_TradeEvolutionScene(u8 taskID) sEvoCursorPos = 0; Text_InitWindow(&gUnknown_03004828->window, gOtherText_YesNoAndPlayer, gUnknown_03004828->textWindowBaseTileNum + 128, 25, 9); Text_PrintWindow8002F44(&gUnknown_03004828->window); - sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20); + MenuCursor_Create814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20); sub_81150D8(); gTasks[taskID].tLearnMoveState++; sEvoCursorPos = 0; @@ -1110,7 +1110,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } if (gMain.newKeys & A_BUTTON) { - ZeroFillWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); + Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); DestroyMenuCursor(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); @@ -1126,7 +1126,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } if (gMain.newKeys & B_BUTTON) { - ZeroFillWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); + Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD); DestroyMenuCursor(); StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]); Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15); @@ -3955,7 +3955,7 @@ static void VBlankCB_TradeEvolutionScene(void) static void sub_81150D8(void) { - sub_814A880(200, 72 + (sEvoCursorPos * 16)); + MenuCursor_SetPos814A880(200, 72 + (sEvoCursorPos * 16)); } static void EvoDummyFunc2(void) diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 4f8124ace..948c288ff 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -582,7 +582,7 @@ static void sub_81422B8(u8 taskID) static void sub_81422E8(u8 taskID) { - SetUpWindowConfig(&gWindowTemplate_81E7198); + Text_LoadWindowTemplate(&gWindowTemplate_81E7198); InitMenuWindow(&gWindowTemplate_81E7198); gTasks[taskID].func = sub_8142320; } @@ -714,7 +714,7 @@ static void sub_81426F8(u8 taskID) static void sub_8142738(u8 taskID) { REG_DISPCNT = 0x1940; - SetUpWindowConfig(&gWindowTemplate_81E71B4); + Text_LoadWindowTemplate(&gWindowTemplate_81E71B4); InitMenuWindow(&gWindowTemplate_81E71B4); gTasks[taskID].tPlayerSpriteID = HallOfFame_LoadTrainerPic(gSaveBlock2.playerGender, 120, 72, 6); @@ -864,7 +864,7 @@ static void sub_8142A28(u8 taskID) *(vram1 + i) = i + 3; *(vram2 + i) = i + 20; } - SetUpWindowConfig(&gWindowTemplate_81E7198); + Text_LoadWindowTemplate(&gWindowTemplate_81E7198); InitMenuWindow(&gWindowTemplate_81E7198); gTasks[taskID].func = sub_8142B04; } @@ -1285,7 +1285,7 @@ static void sub_8143570(void) gReservedSpritePaletteCount = 8; LoadCompressedObjectPic(&sHallOfFame_ConfettiSpriteSheet); LoadCompressedObjectPalette(&sHallOfFame_ConfettiSpritePalette); - SetUpWindowConfig(&gWindowTemplate_81E71B4); + Text_LoadWindowTemplate(&gWindowTemplate_81E71B4); InitMenuWindow(&gWindowTemplate_81E71B4); } -- cgit v1.2.3 From ebae5167939d1a10a2a37324063bb4f70c43a4ea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 17:29:50 -0500 Subject: through sub_8098350 --- asm/pokemon_storage_system.s | 248 --------------------------------- include/mon_markings.h | 1 + include/pokemon_storage_system.h | 11 +- src/pokemon/pokemon_storage_system_2.c | 58 ++++++++ 4 files changed, 68 insertions(+), 250 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index eaed44102..a96857b35 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,254 +5,6 @@ .text - thumb_func_start sub_80981F0 -sub_80981F0: @ 80981F0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - adds r7, r1, 0 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r6, _08098274 @ =gSharedMem - movs r0, 0x9C - lsls r0, 6 - adds r0, r6 - mov r8, r0 - ldr r0, [r0] - cmp r0, 0 - beq _080982A6 - cmp r4, 0 - beq _0809829C - lsls r0, r4, 3 - ldr r1, _08098278 @ =gMonFrontPicTable - adds r0, r1 - ldr r2, _0809827C @ =gMonFrontPicCoords - lsls r1, r4, 2 - adds r1, r2 - ldrb r1, [r1] - ldr r2, _08098280 @ =0x00004784 - adds r3, r6, r2 - ldr r2, _08098284 @ =0x00002784 - adds r5, r6, r2 - str r5, [sp] - str r4, [sp, 0x4] - str r7, [sp, 0x8] - movs r2, 0x1 - bl HandleLoadSpecialPokePic - ldr r1, _08098288 @ =0x000011e8 - adds r0, r6, r1 - ldr r0, [r0] - ldr r2, _0809828C @ =0x00002704 - adds r4, r6, r2 - adds r1, r4, 0 - bl LZ77UnCompWram - ldr r1, _08098290 @ =0x000026fc - adds r0, r6, r1 - ldr r1, [r0] - ldr r2, _08098294 @ =0x04000200 - adds r0, r5, 0 - bl CpuSet - ldr r2, _08098298 @ =0x000026fa - adds r0, r6, r2 - ldrh r1, [r0] - adds r0, r4, 0 - movs r2, 0x20 - bl LoadPalette - mov r0, r8 - ldr r1, [r0] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - b _080982A6 - .align 2, 0 -_08098274: .4byte gSharedMem -_08098278: .4byte gMonFrontPicTable -_0809827C: .4byte gMonFrontPicCoords -_08098280: .4byte 0x00004784 -_08098284: .4byte 0x00002784 -_08098288: .4byte 0x000011e8 -_0809828C: .4byte 0x00002704 -_08098290: .4byte 0x000026fc -_08098294: .4byte 0x04000200 -_08098298: .4byte 0x000026fa -_0809829C: - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] -_080982A6: - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80981F0 - - thumb_func_start sub_80982B4 -sub_80982B4: @ 80982B4 - push {r4,lr} - ldr r4, _080982E4 @ =gSharedMem - ldr r1, _080982E8 @ =0x000011f0 - adds r0, r4, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _080982F4 - ldr r2, _080982EC @ =0x000011f7 - adds r0, r4, r2 - ldrb r0, [r0] - adds r2, 0xC1 - adds r1, r4, r2 - ldr r1, [r1] - bl sub_80F7A10 - ldr r1, _080982F0 @ =0x000012ac - adds r0, r4, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - b _08098302 - .align 2, 0 -_080982E4: .4byte gSharedMem -_080982E8: .4byte 0x000011f0 -_080982EC: .4byte 0x000011f7 -_080982F0: .4byte 0x000012ac -_080982F4: - ldr r2, _08098348 @ =0x000012ac - adds r0, r4, r2 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 -_08098302: - strb r0, [r1] - movs r0, 0 - movs r1, 0xB - movs r2, 0x9 - movs r3, 0x11 - bl MenuZeroFillWindowRect - ldr r4, _0809834C @ =gSharedMem + 0x127A - adds r0, r4, 0 - movs r1, 0x1 - movs r2, 0x10 - bl MenuPrint - adds r0, r4, 0 - subs r0, 0x6B - movs r1, 0x1 - movs r2, 0xB - bl MenuPrint - adds r0, r4, 0 - subs r0, 0x46 - movs r1, 0 - movs r2, 0xD - bl MenuPrint - subs r4, 0x21 - adds r0, r4, 0 - movs r1, 0x1 - movs r2, 0xF - bl MenuPrint - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08098348: .4byte 0x000012ac -_0809834C: .4byte gSharedMem + 0x127A - thumb_func_end sub_80982B4 - - thumb_func_start sub_8098350 -sub_8098350: @ 8098350 - push {r4,r5,lr} - sub sp, 0x10 - ldr r5, _080983A0 @ =gSharedMem - ldr r1, _080983A4 @ =0x000011f0 - adds r0, r5, r1 - ldrh r2, [r0] - cmp r2, 0 - beq _080983B4 - ldr r0, _080983A8 @ =0x06007800 - ldr r3, _080983AC @ =gUnknown_02039760 - movs r1, 0x1 - str r1, [sp] - movs r1, 0 - str r1, [sp, 0x4] - movs r1, 0x8 - str r1, [sp, 0x8] - movs r1, 0x2 - str r1, [sp, 0xC] - movs r1, 0x1 - movs r2, 0 - bl sub_809D034 - movs r4, 0 - ldr r0, _080983B0 @ =0x000012b0 - adds r5, r0 -_08098382: - lsls r0, r4, 2 - adds r0, r5 - ldr r0, [r0] - lsls r1, r4, 1 - adds r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - bl StartSpriteAnimIfDifferent - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _08098382 - b _080983EC - .align 2, 0 -_080983A0: .4byte gSharedMem -_080983A4: .4byte 0x000011f0 -_080983A8: .4byte 0x06007800 -_080983AC: .4byte gUnknown_02039760 -_080983B0: .4byte 0x000012b0 -_080983B4: - ldr r0, _080983F4 @ =0x06007800 - ldr r3, _080983F8 @ =gUnknown_02039760 - movs r1, 0xA - str r1, [sp] - str r2, [sp, 0x4] - movs r1, 0x8 - str r1, [sp, 0x8] - movs r1, 0x2 - str r1, [sp, 0xC] - movs r1, 0x1 - movs r2, 0 - bl sub_809D034 - movs r4, 0 - ldr r1, _080983FC @ =0x000012b0 - adds r5, r1 -_080983D4: - lsls r0, r4, 2 - adds r0, r5 - ldr r0, [r0] - lsls r1, r4, 25 - lsrs r1, 24 - bl StartSpriteAnim - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _080983D4 -_080983EC: - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080983F4: .4byte 0x06007800 -_080983F8: .4byte gUnknown_02039760 -_080983FC: .4byte 0x000012b0 - thumb_func_end sub_8098350 - thumb_func_start sub_8098400 sub_8098400: @ 8098400 push {r4,r5,lr} diff --git a/include/mon_markings.h b/include/mon_markings.h index 5b6abf356..d06264865 100644 --- a/include/mon_markings.h +++ b/include/mon_markings.h @@ -26,5 +26,6 @@ void sub_80F7418(u8 markings, s16 x, s16 y); void sub_80F7470(void); bool8 sub_80F7500(void); struct Sprite *sub_80F7940(u16 tileTag, u16 paletteTag, const u16 *palette); +void sub_80F7A10(u8 markings, void *dest); #endif //POKERUBY_MON_MARKINGS_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index cbdec8999..f91a5f08e 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -85,7 +85,8 @@ struct PokemonStorageSystemData { u8 filler_08b6[0x4a8]; s16 unk_0d5e; s16 unk_0d60; - u8 filler_0d62[0x48a]; + u8 filler_0d62[0x486]; + u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; u16 unk_11f2; @@ -94,7 +95,11 @@ struct PokemonStorageSystemData { u8 unk_11f7; u8 unk_11f8; u8 unk_11f9; - u8 unk_11fa[0xb2]; + u8 unk_11fa[0x15]; + u8 unk_120f[0x25]; + u8 unk_1234[0x25]; + u8 unk_1259[0x21]; + u8 unk_127a[0x32]; struct Sprite *unk_12ac; struct Sprite *unk_12b0[2]; u16 *unk_12b8; @@ -114,6 +119,8 @@ struct PokemonStorageSystemData { u16 unk_2704[0x10]; u8 filler_2724[0x60]; u8 unk_2784[0x800]; + u8 filler_2f84[0x1800]; + u8 unk_4784[0x800]; }; extern EWRAM_DATA u16 gUnknown_02039760[0x600]; diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index f8ae1c013..7f97d7681 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -1,7 +1,10 @@ // Includes #include "global.h" +#include "decompress.h" #include "constants/songs.h" +#include "constants/species.h" +#include "data2.h" #include "sound.h" #include "ewram.h" #include "task.h" @@ -1685,6 +1688,61 @@ __attribute__((naked)) void sub_80980D4(void) } #endif +void sub_80981F0(u16 species, u32 pid) +{ + if (gPokemonStorageSystemPtr->unk_2700) + { + if (species != SPECIES_NONE) + { + HandleLoadSpecialPokePic(gMonFrontPicTable + species, gMonFrontPicCoords[species].coords, 1, (intptr_t)gPokemonStorageSystemPtr->unk_4784, gPokemonStorageSystemPtr->unk_2784, species, pid); + LZ77UnCompWram(gPokemonStorageSystemPtr->unk_11e8, gPokemonStorageSystemPtr->unk_2704); + CpuCopy32(gPokemonStorageSystemPtr->unk_2784, gPokemonStorageSystemPtr->unk_26fc, 0x800); + LoadPalette(gPokemonStorageSystemPtr->unk_2704, gPokemonStorageSystemPtr->unk_26fa, 0x20); + gPokemonStorageSystemPtr->unk_2700->invisible = FALSE; + } + else + { + gPokemonStorageSystemPtr->unk_2700->invisible = TRUE; + } + } +} + +void sub_80982B4(void) +{ + if (gPokemonStorageSystemPtr->unk_11f0) + { + sub_80F7A10(gPokemonStorageSystemPtr->unk_11f7, gPokemonStorageSystemPtr->unk_12b8); + gPokemonStorageSystemPtr->unk_12ac->invisible = FALSE; + } + else + { + gPokemonStorageSystemPtr->unk_12ac->invisible = TRUE; + } + MenuZeroFillWindowRect(0, 11, 9, 17); + MenuPrint(gPokemonStorageSystemPtr->unk_127a, 1, 16); + MenuPrint(gPokemonStorageSystemPtr->unk_120f, 1, 11); + MenuPrint(gPokemonStorageSystemPtr->unk_1234, 0, 13); + MenuPrint(gPokemonStorageSystemPtr->unk_1259, 1, 15); +} + +void sub_8098350(void) +{ + u16 i; + + if (gPokemonStorageSystemPtr->unk_11f0) + { + sub_809D034(BG_SCREEN_ADDR(15), 1, 0, gUnknown_02039760, 1, 0, 8, 2); + for (i = 0; i < 2; i++) + StartSpriteAnimIfDifferent(gPokemonStorageSystemPtr->unk_12b0[i], i * 2 + 1); + } + else + { + sub_809D034(BG_SCREEN_ADDR(15), 1, 0, gUnknown_02039760, 10, 0, 8, 2); + for (i = 0; i < 2; i++) + StartSpriteAnim(gPokemonStorageSystemPtr->unk_12b0[i], i * 2); + } +} + extern const struct StorageAction gPCStorageActionTexts[]; asm(".section .text.8098898"); -- cgit v1.2.3 From 8d7f3f65635bba4f9550e9206564c0724b88dd2e Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Wed, 10 Jan 2018 01:15:15 +0100 Subject: finished decompiling bug.s with nonmatching --- asm/bug.s | 545 -------------------------------------------------- ld_script.txt | 1 - src/battle/anim/bug.c | 314 ++++++++++++++++++++++++++++- 3 files changed, 313 insertions(+), 547 deletions(-) delete mode 100755 asm/bug.s diff --git a/asm/bug.s b/asm/bug.s deleted file mode 100755 index 3d1fb8669..000000000 --- a/asm/bug.s +++ /dev/null @@ -1,545 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - @ bug - - thumb_func_start sub_80DCA70 -sub_80DCA70: @ 80DCA70 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080DCAA0 @ =gAnimBankTarget - ldrb r0, [r0] - adds r2, r4, 0 - adds r2, 0x20 - adds r3, r4, 0 - adds r3, 0x22 - movs r1, 0 - bl sub_807A3FC - ldr r0, _080DCAA4 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DCAAC - ldr r0, _080DCAA8 @ =gBattleAnimArgs - ldrh r1, [r4, 0x20] - ldrh r2, [r0] - subs r1, r2 - strh r1, [r4, 0x20] - b _080DCAB8 - .align 2, 0 -_080DCAA0: .4byte gAnimBankTarget -_080DCAA4: .4byte gAnimBankAttacker -_080DCAA8: .4byte gBattleAnimArgs -_080DCAAC: - ldr r1, _080DCAE0 @ =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - adds r0, r1, 0 -_080DCAB8: - ldrh r0, [r0, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldr r0, _080DCAE4 @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080DCAD4 - ldrh r0, [r4, 0x22] - adds r0, 0x8 - strh r0, [r4, 0x22] -_080DCAD4: - ldr r0, _080DCAE8 @ =sub_80DCAEC - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DCAE0: .4byte gBattleAnimArgs -_080DCAE4: .4byte gAnimBankTarget -_080DCAE8: .4byte sub_80DCAEC - thumb_func_end sub_80DCA70 - - thumb_func_start sub_80DCAEC -sub_80DCAEC: @ 80DCAEC - push {lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x2E] - adds r0, 0x1 - strh r0, [r3, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - bne _080DCB20 - movs r0, 0 - strh r0, [r3, 0x2E] - movs r0, 0x3E - adds r0, r3 - mov r12, r0 - ldrb r2, [r0] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] -_080DCB20: - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x33 - bne _080DCB34 - adds r0, r3, 0 - bl DestroyAnimSprite -_080DCB34: - pop {r0} - bx r0 - thumb_func_end sub_80DCAEC - - thumb_func_start sub_80DCB38 -sub_80DCB38: @ 80DCB38 - ldr r2, _080DCB54 @ =REG_BLDCNT - movs r3, 0xFD - lsls r3, 6 - adds r1, r3, 0 - strh r1, [r2] - adds r2, 0x2 - movs r1, 0x10 - strh r1, [r2] - movs r1, 0x10 - strh r1, [r0, 0x2E] - ldr r1, _080DCB58 @ =sub_80DCB5C - str r1, [r0, 0x1C] - bx lr - .align 2, 0 -_080DCB54: .4byte REG_BLDCNT -_080DCB58: .4byte sub_80DCB5C - thumb_func_end sub_80DCB38 - - thumb_func_start sub_80DCB5C -sub_80DCB5C: @ 80DCB5C - push {lr} - adds r3, r0, 0 - ldrh r1, [r3, 0x32] - movs r2, 0x32 - ldrsh r0, [r3, r2] - cmp r0, 0x13 - bgt _080DCB70 - adds r0, r1, 0x1 - strh r0, [r3, 0x32] - b _080DCBA8 -_080DCB70: - ldrh r1, [r3, 0x30] - adds r0, r1, 0x1 - strh r0, [r3, 0x30] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080DCBA8 - ldrh r1, [r3, 0x2E] - subs r1, 0x1 - strh r1, [r3, 0x2E] - ldr r2, _080DCBAC @ =REG_BLDALPHA - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - strh r1, [r2] - movs r1, 0x2E - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _080DCBA8 - adds r2, r3, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, _080DCBB0 @ =sub_80DCBB4 - str r0, [r3, 0x1C] -_080DCBA8: - pop {r0} - bx r0 - .align 2, 0 -_080DCBAC: .4byte REG_BLDALPHA -_080DCBB0: .4byte sub_80DCBB4 - thumb_func_end sub_80DCB5C - - thumb_func_start sub_80DCBB4 -sub_80DCBB4: @ 80DCBB4 - push {lr} - ldr r1, _080DCBC8 @ =REG_BLDCNT - movs r2, 0 - strh r2, [r1] - adds r1, 0x2 - strh r2, [r1] - bl DestroyAnimSprite - pop {r0} - bx r0 - .align 2, 0 -_080DCBC8: .4byte REG_BLDCNT - thumb_func_end sub_80DCBB4 - - thumb_func_start sub_80DCBCC -sub_80DCBCC: @ 80DCBCC - push {r4-r7,lr} - sub sp, 0x4 - adds r7, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DCBEC - ldr r1, _080DCBE8 @ =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] - b _080DCC0E - .align 2, 0 -_080DCBE8: .4byte gBattleAnimArgs -_080DCBEC: - ldr r0, _080DCCE8 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DCC0E - ldr r1, _080DCCEC @ =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] - ldrh r0, [r1, 0x2] - negs r0, r0 - strh r0, [r1, 0x2] - ldrh r0, [r1, 0x6] - negs r0, r0 - strh r0, [r1, 0x6] -_080DCC0E: - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DCC5E - ldr r0, _080DCCE8 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - adds r4, r0, 0 - ldr r5, _080DCCF0 @ =gAnimBankTarget - ldrb r0, [r5] - bl GetBankSide - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - bne _080DCC5E - ldrb r0, [r5] - bl GetBankIdentity - lsls r0, 24 - cmp r0, 0 - beq _080DCC4C - ldrb r0, [r5] - bl GetBankIdentity - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080DCC5E -_080DCC4C: - ldr r0, _080DCCEC @ =gBattleAnimArgs - movs r2, 0x4 - ldrsh r1, [r0, r2] - negs r1, r1 - strh r1, [r0, 0x4] - movs r2, 0 - ldrsh r1, [r0, r2] - negs r1, r1 - strh r1, [r0] -_080DCC5E: - adds r0, r7, 0 - movs r1, 0x1 - bl sub_80787B0 - ldr r5, _080DCCF0 @ =gAnimBankTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBankPosition - adds r4, r0, 0 - lsls r4, 24 - ldr r6, _080DCCEC @ =gBattleAnimArgs - lsrs r4, 24 - ldrh r0, [r6, 0x4] - adds r4, r0 - lsls r4, 16 - lsrs r4, 16 - ldrb r0, [r5] - movs r1, 0x3 - bl GetBankPosition - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldrh r2, [r6, 0x6] - adds r1, r2 - lsls r1, 16 - ldrh r2, [r7, 0x20] - lsls r0, r4, 16 - asrs r0, 16 - subs r0, r2 - lsls r0, 16 - asrs r0, 16 - ldrh r2, [r7, 0x22] - lsrs r5, r1, 16 - asrs r1, 16 - subs r1, r2 - lsls r1, 16 - asrs r1, 16 - bl sub_80790F0 - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 24 - adds r0, r1 - lsrs r0, 16 - movs r3, 0x80 - lsls r3, 1 - str r0, [sp] - adds r0, r7, 0 - movs r1, 0 - adds r2, r3, 0 - bl sub_8078FDC - ldrh r0, [r6, 0x8] - strh r0, [r7, 0x2E] - strh r4, [r7, 0x32] - strh r5, [r7, 0x36] - ldr r0, _080DCCF4 @ =sub_8078B34 - str r0, [r7, 0x1C] - ldr r1, _080DCCF8 @ =DestroyAnimSprite - adds r0, r7, 0 - bl StoreSpriteCallbackInData - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DCCE8: .4byte gAnimBankAttacker -_080DCCEC: .4byte gBattleAnimArgs -_080DCCF0: .4byte gAnimBankTarget -_080DCCF4: .4byte sub_8078B34 -_080DCCF8: .4byte DestroyAnimSprite - thumb_func_end sub_80DCBCC - - thumb_func_start sub_80DCCFC -sub_80DCCFC: @ 80DCCFC - push {r4-r6,lr} - adds r6, r0, 0 - movs r1, 0x1 - bl sub_80787B0 - ldr r0, _080DCD68 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DCD1C - ldr r1, _080DCD6C @ =gBattleAnimArgs - ldrh r0, [r1, 0x4] - negs r0, r0 - strh r0, [r1, 0x4] -_080DCD1C: - ldr r4, _080DCD6C @ =gBattleAnimArgs - ldrh r0, [r4, 0x8] - strh r0, [r6, 0x2E] - ldr r5, _080DCD70 @ =gAnimBankTarget - ldrb r0, [r5] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x4] - adds r0, r1 - strh r0, [r6, 0x32] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x6] - adds r0, r1 - strh r0, [r6, 0x36] - ldrh r0, [r4, 0xA] - strh r0, [r6, 0x38] - adds r0, r6, 0 - bl sub_80786EC - ldr r0, _080DCD74 @ =sub_80DCD78 - str r0, [r6, 0x1C] - adds r2, r6, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DCD68: .4byte gAnimBankAttacker -_080DCD6C: .4byte gBattleAnimArgs -_080DCD70: .4byte gAnimBankTarget -_080DCD74: .4byte sub_80DCD78 - thumb_func_end sub_80DCCFC - - thumb_func_start sub_80DCD78 -sub_80DCD78: @ 80DCD78 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - adds r4, r0, 0 - adds r2, r4, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x5 - negs r1, r1 - ands r1, r0 - strb r1, [r2] - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080DCDA4 - adds r0, r4, 0 - bl DestroyAnimSprite - b _080DCE34 -_080DCDA4: - movs r0, 0x2E - adds r0, r4 - mov r8, r0 - ldrh r7, [r4, 0x20] - ldrh r5, [r4, 0x24] - ldrh r1, [r4, 0x22] - mov r12, r1 - ldrh r6, [r4, 0x26] - mov r2, r8 - add r1, sp, 0x4 - movs r3, 0x7 -_080DCDBA: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080DCDBA - adds r0, r7, r5 - lsls r0, 16 - lsrs r5, r0, 16 - mov r2, r12 - adds r0, r2, r6 - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - bne _080DCE34 - ldrh r0, [r4, 0x24] - ldrh r1, [r4, 0x20] - adds r0, r1 - lsls r1, r5, 16 - asrs r1, 16 - subs r0, r1 - lsls r0, 16 - asrs r0, 16 - ldrh r1, [r4, 0x26] - ldrh r2, [r4, 0x22] - adds r1, r2 - lsls r2, r6, 16 - asrs r2, 16 - subs r1, r2 - lsls r1, 16 - asrs r1, 16 - bl sub_80790F0 - lsls r0, 16 - movs r1, 0xC0 - lsls r1, 24 - adds r0, r1 - lsrs r0, 16 - movs r3, 0x80 - lsls r3, 1 - str r0, [sp] - adds r0, r4, 0 - movs r1, 0 - adds r2, r3, 0 - bl sub_8078FDC - add r2, sp, 0x4 - mov r1, r8 - movs r3, 0x7 -_080DCE26: - ldrh r0, [r2] - strh r0, [r1] - adds r2, 0x2 - adds r1, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080DCE26 -_080DCE34: - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80DCD78 - - thumb_func_start sub_80DCE40 -sub_80DCE40: @ 80DCE40 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _080DCE54 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080DCE5C - ldr r4, _080DCE58 @ =gAnimBankAttacker - b _080DCE5E - .align 2, 0 -_080DCE54: .4byte gBattleAnimArgs -_080DCE58: .4byte gAnimBankAttacker -_080DCE5C: - ldr r4, _080DCE90 @ =gAnimBankTarget -_080DCE5E: - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x12 - strh r0, [r5, 0x22] - ldr r1, _080DCE94 @ =move_anim_8074EE0 - adds r0, r5, 0 - bl StoreSpriteCallbackInData - ldr r0, _080DCE98 @ =sub_80785E4 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DCE90: .4byte gAnimBankTarget -_080DCE94: .4byte move_anim_8074EE0 -_080DCE98: .4byte sub_80785E4 - thumb_func_end sub_80DCE40 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index ba0705659..c8ede2726 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -293,7 +293,6 @@ SECTIONS { asm/flying.o(.text); asm/psychic.o(.text); src/battle/anim/bug.o(.text); - asm/bug.o(.text); asm/rock.o(.text); asm/ghost.o(.text); asm/dragon.o(.text); diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index e9372ed9e..3736a86a8 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -10,6 +10,10 @@ extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; static void sub_80DCA38(struct Sprite *sprite); +static void sub_80DCAEC(struct Sprite *sprite); +static void sub_80DCB5C(struct Sprite *sprite); +static void sub_80DCBB4(struct Sprite *sprite); +void sub_80DCD78(struct Sprite *sprite); // used in Move_MEGAHORN void sub_80DC824(struct Sprite *sprite) @@ -102,4 +106,312 @@ static void sub_80DCA38(struct Sprite *sprite) sprite->pos2.x += Sin(sprite->data[6], sprite->data[5]); sprite->data[6] = (sprite->data[6] + 13) & 0xFF; -} \ No newline at end of file +} + +// used in Move_STRING_SHOT +void sub_80DCA70(struct Sprite *sprite) +{ + sub_807A3FC(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + if (GetBankSide(gAnimBankAttacker)) + sprite->pos1.x -= gBattleAnimArgs[0]; + else + sprite->pos1.x += gBattleAnimArgs[0]; + + sprite->pos1.y += gBattleAnimArgs[1]; + if (!GetBankSide(gAnimBankTarget)) + sprite->pos1.y += 8; + + sprite->callback = sub_80DCAEC; +} + +static void sub_80DCAEC(struct Sprite *sprite) +{ + if (++sprite->data[0] == 3) + { + sprite->data[0] = 0; + sprite->invisible ^= 1; + } + + if (++sprite->data[1] == 51) + { + DestroyAnimSprite(sprite); + } +} + +// used in Move_SPIDER_WEB +void sub_80DCB38(struct Sprite *sprite) +{ + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 16; + + sprite->data[0] = 16; + sprite->callback = sub_80DCB5C; +} + +static void sub_80DCB5C(struct Sprite *sprite) +{ + if (sprite->data[2] < 20) + { + sprite->data[2]++; + } + else if (sprite->data[1]++ & 1) + { + sprite->data[0]--; + REG_BLDALPHA = sprite->data[0] | ((16 - sprite->data[0]) << 8); + + if (sprite->data[0] == 0) + { + sprite->invisible = TRUE; + sprite->callback = sub_80DCBB4; + } + } +} + +static void sub_80DCBB4(struct Sprite *sprite) +{ + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimSprite(sprite); +} + +// used in 3 moves: +// Move_POISON_STING, Move_TWINEEDLE, Move_SPIKE_CANNON +void sub_80DCBCC(struct Sprite *sprite) +{ + s16 lVarX, lVarY; + u16 rot; + + if (IsContest()) + { + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } + else + { + if (GetBankSide(gAnimBankAttacker)) + { + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + gBattleAnimArgs[3] = -gBattleAnimArgs[3]; + } + } + + if (!IsContest()) + { + if (GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) + { + if (GetBankIdentity(gAnimBankTarget) == 0 || GetBankIdentity(gAnimBankTarget) == 1) + { + s16 temp1, temp2; + + temp1 = gBattleAnimArgs[2]; + gBattleAnimArgs[2] = -temp1; + + temp2 = gBattleAnimArgs[0]; + gBattleAnimArgs[0] = -temp2; + } + } + } + + sub_80787B0(sprite, 1); + + lVarX = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + lVarY = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + rot = sub_80790F0(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y); + rot += 0xC000; + sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot); + + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = lVarX; + sprite->data[4] = lVarY; + + sprite->callback = sub_8078B34; + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); +} + +// used in 2 moves: +// Move_PIN_MISSILE, Move_ICICLE_SPEAR +void sub_80DCCFC(struct Sprite *sprite) +{ + sub_80787B0(sprite, 1); + + if (GetBankSide(gAnimBankAttacker)) + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + sprite->data[5] = gBattleAnimArgs[5]; + sub_80786EC(sprite); + + sprite->callback = sub_80DCD78; + sprite->invisible = TRUE; +} + +#ifdef NONMATCHING +void sub_80DCD78(struct Sprite *sprite) +{ + int i; + s16 x1, x2, y1, y2; + // s16 scale; + // u16 *data; + u16 tempData[8]; + s16 rot; + + sprite->invisible = FALSE; + + if (sub_8078718(sprite)) + { + DestroyAnimSprite(sprite); + return; + } + + // data = &sprite->data[7]; + x1 = sprite->pos1.x; + x2 = sprite->pos2.x; + y1 = sprite->pos1.y; + y2 = sprite->pos2.y; + for (i = 0; i < 8; i++) + { + tempData[i] = sprite->data[i]; + } + x2 += x1; + y2 += y1; + + if (!sub_8078718(sprite)) + { + rot = sub_80790F0(sprite->pos1.x + sprite->pos2.x - x2, + sprite->pos1.y + sprite->pos2.y - y2); + rot += 0xC000; + // scale = 0x100 + sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot); + + for (i = 0; i < 8; i++) + { + sprite->data[i] = tempData[1]; + } + } +} +#else +__attribute__((naked)) +void sub_80DCD78(struct Sprite *sprite) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + sub sp, 0x14\n\ + adds r4, r0, 0\n\ + adds r2, r4, 0\n\ + adds r2, 0x3E\n\ + ldrb r0, [r2]\n\ + movs r1, 0x5\n\ + negs r1, r1\n\ + ands r1, r0\n\ + strb r1, [r2]\n\ + adds r0, r4, 0\n\ + bl sub_8078718\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + beq _080DCDA4\n\ + adds r0, r4, 0\n\ + bl DestroyAnimSprite\n\ + b _080DCE34\n\ +_080DCDA4:\n\ + movs r0, 0x2E\n\ + adds r0, r4\n\ + mov r8, r0\n\ + ldrh r7, [r4, 0x20]\n\ + ldrh r5, [r4, 0x24]\n\ + ldrh r1, [r4, 0x22]\n\ + mov r12, r1\n\ + ldrh r6, [r4, 0x26]\n\ + mov r2, r8\n\ + add r1, sp, 0x4\n\ + movs r3, 0x7\n\ +_080DCDBA:\n\ + ldrh r0, [r2]\n\ + strh r0, [r1]\n\ + adds r2, 0x2\n\ + adds r1, 0x2\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _080DCDBA\n\ + adds r0, r7, r5\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + mov r2, r12\n\ + adds r0, r2, r6\n\ + lsls r0, 16\n\ + lsrs r6, r0, 16\n\ + adds r0, r4, 0\n\ + bl sub_8078718\n\ + lsls r0, 24\n\ + cmp r0, 0\n\ + bne _080DCE34\n\ + ldrh r0, [r4, 0x24]\n\ + ldrh r1, [r4, 0x20]\n\ + adds r0, r1\n\ + lsls r1, r5, 16\n\ + asrs r1, 16\n\ + subs r0, r1\n\ + lsls r0, 16\n\ + asrs r0, 16\n\ + ldrh r1, [r4, 0x26]\n\ + ldrh r2, [r4, 0x22]\n\ + adds r1, r2\n\ + lsls r2, r6, 16\n\ + asrs r2, 16\n\ + subs r1, r2\n\ + lsls r1, 16\n\ + asrs r1, 16\n\ + bl sub_80790F0\n\ + lsls r0, 16\n\ + movs r1, 0xC0\n\ + lsls r1, 24\n\ + adds r0, r1\n\ + lsrs r0, 16\n\ + movs r3, 0x80\n\ + lsls r3, 1\n\ + str r0, [sp]\n\ + adds r0, r4, 0\n\ + movs r1, 0\n\ + adds r2, r3, 0\n\ + bl sub_8078FDC\n\ + add r2, sp, 0x4\n\ + mov r1, r8\n\ + movs r3, 0x7\n\ +_080DCE26:\n\ + ldrh r0, [r2]\n\ + strh r0, [r1]\n\ + adds r2, 0x2\n\ + adds r1, 0x2\n\ + subs r3, 0x1\n\ + cmp r3, 0\n\ + bge _080DCE26\n\ +_080DCE34:\n\ + add sp, 0x14\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_80DCE40(struct Sprite *sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + 18; + } + else + { + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 2); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 3) + 18; + } + + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); + sprite->callback = sub_80785E4; +} -- cgit v1.2.3 From f6d7abc83482cd56b7051784ec5420dc34a2ffe2 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Wed, 10 Jan 2018 01:26:38 +0100 Subject: oops --- src/battle/anim/bug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index 3736a86a8..501d544b1 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -287,7 +287,7 @@ void sub_80DCD78(struct Sprite *sprite) for (i = 0; i < 8; i++) { - sprite->data[i] = tempData[1]; + sprite->data[i] = tempData[i]; } } } -- cgit v1.2.3 From 3c375850d12d774cb75803093ad80aa2783e4566 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 9 Jan 2018 19:28:01 -0500 Subject: comment --- src/libs/libisagbprn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index a9656f3c5..98231dcf5 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -8,8 +8,8 @@ #define AGB_PRINT_PROTECT_ADDR 0x9FE2FFE #define WSCNT_DATA (WAITCNT_PHI_OUT_16MHZ | WAITCNT_WS0_S_2 | WAITCNT_WS0_N_4) -// for auto no$gba support, the string "no$gba" should be at this address. -// except it's not, blame Martin, hence I'm letting the user deal with this nonsense. +// originally for auto no$gba support, the string "no$gba" should be at this address, +// the user needs to read this string out as the memory viewer won't show it. #define NOCASHGBAIDADDR 0x4FFFA00 #define NOCASHGBAPRINTADDR 0x4FFFA14 -- cgit v1.2.3 From a51b95150ba86a3982f613886471626f742aeacd Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 9 Jan 2018 19:40:14 -0500 Subject: both print defines for nocashgba --- src/libs/libisagbprn.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c index 98231dcf5..e0e979e95 100755 --- a/src/libs/libisagbprn.c +++ b/src/libs/libisagbprn.c @@ -11,7 +11,8 @@ // originally for auto no$gba support, the string "no$gba" should be at this address, // the user needs to read this string out as the memory viewer won't show it. #define NOCASHGBAIDADDR 0x4FFFA00 -#define NOCASHGBAPRINTADDR 0x4FFFA14 +#define NOCASHGBAPRINTADDR1 0x4FFFA10 // automatically adds a newline after the string has finished +#define NOCASHGBAPRINTADDR2 0x4FFFA14 // does not automatically add the newline. by default, NOCASHGBAPRINTADDR2 is used. this is used to keep strings consistent between no$gba and VBA-RR, but a user can choose to forgo this. struct AGBPrintStruct { @@ -159,7 +160,7 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP /* void NoCashGBAPrint(const char *pBuf) { - *(volatile u32*)NOCASHGBAPRINTADDR = (u32)pBuf; + *(volatile u32*)NOCASHGBAPRINTADDR2 = (u32)pBuf; } void NoCashGBAPrintf(const char *pBuf, ...) -- cgit v1.2.3 From 2eb10c6f2d16729dde12b0fd26cac3f45b85a557 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 20:18:46 -0500 Subject: close swiss cheese in pokemon_storage_system_2.c --- asm/pokemon_storage_system.s | 589 --------------------------------- data/pokemon_storage_system.s | 57 ---- include/graphics.h | 4 + include/pokemon_storage_system.h | 12 +- ld_script.txt | 4 +- src/pokemon/pokemon_storage_system_2.c | 282 ++++++++++++++-- 6 files changed, 270 insertions(+), 678 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index a96857b35..bf3d49532 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,595 +5,6 @@ .text - thumb_func_start sub_8098400 -sub_8098400: @ 8098400 - push {r4,r5,lr} - sub sp, 0x14 - ldr r1, _0809847C @ =REG_BG1CNT - ldr r2, _08098480 @ =0x00000f01 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _08098484 @ =gPSSMenuMisc_Gfx - ldr r1, _08098488 @ =0x06006800 - bl LZ77UnCompVram - ldr r0, _0809848C @ =gPSSMenuMisc_Tilemap - ldr r5, _08098490 @ =gSharedMem + 0xA8 - adds r1, r5, 0 - bl LZ77UnCompWram - ldr r0, _08098494 @ =gPSSMenu3_Pal - movs r1, 0x20 - movs r2, 0x20 - bl LoadPalette - ldr r0, _08098498 @ =gPSSMenu4_Pal - movs r1, 0x30 - movs r2, 0x20 - bl LoadPalette - ldr r4, _0809849C @ =0x06007800 - add r1, sp, 0x10 - movs r0, 0 - strh r0, [r1] - ldr r0, _080984A0 @ =0x040000d4 - str r1, [r0] - str r4, [r0, 0x4] - ldr r1, _080984A4 @ =0x81000400 - str r1, [r0, 0x8] - ldr r0, [r0, 0x8] - bl sub_8098780 - ldr r0, _080984A8 @ =gUnknown_0203847C - ldrb r0, [r0] - cmp r0, 0 - beq _080984AC - movs r0, 0x1 - bl sub_8098690 - movs r0, 0x1 - bl sub_8099200 - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0xC - str r0, [sp, 0x8] - movs r0, 0x16 - str r0, [sp, 0xC] - adds r0, r4, 0 - movs r1, 0xA - movs r2, 0 - adds r3, r5, 0 - bl sub_809D034 - b _080984CC - .align 2, 0 -_0809847C: .4byte REG_BG1CNT -_08098480: .4byte 0x00000f01 -_08098484: .4byte gPSSMenuMisc_Gfx -_08098488: .4byte 0x06006800 -_0809848C: .4byte gPSSMenuMisc_Tilemap -_08098490: .4byte gSharedMem + 0xA8 -_08098494: .4byte gPSSMenu3_Pal -_08098498: .4byte gPSSMenu4_Pal -_0809849C: .4byte 0x06007800 -_080984A0: .4byte 0x040000d4 -_080984A4: .4byte 0x81000400 -_080984A8: .4byte gUnknown_0203847C -_080984AC: - str r0, [sp] - movs r0, 0x14 - str r0, [sp, 0x4] - movs r0, 0xC - str r0, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - adds r0, r4, 0 - movs r1, 0xA - movs r2, 0 - adds r3, r5, 0 - bl sub_809D034 - movs r0, 0x1 - bl sub_8098690 -_080984CC: - ldr r0, _080984E0 @ =gSharedMem - ldr r1, _080984E4 @ =0x000008af - adds r0, r1 - movs r1, 0 - strb r1, [r0] - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080984E0: .4byte gSharedMem -_080984E4: .4byte 0x000008af - thumb_func_end sub_8098400 - - thumb_func_start sub_80984E8 -sub_80984E8: @ 80984E8 - push {lr} - ldr r1, _08098510 @ =gSharedMem - ldr r0, _08098514 @ =0x000008a8 - adds r2, r1, r0 - movs r3, 0 - movs r0, 0x14 - strh r0, [r2] - ldr r0, _08098518 @ =0x000008aa - adds r2, r1, r0 - movs r0, 0x2 - strh r0, [r2] - ldr r0, _0809851C @ =0x000008ad - adds r1, r0 - strb r3, [r1] - movs r0, 0 - bl sub_8099200 - pop {r0} - bx r0 - .align 2, 0 -_08098510: .4byte gSharedMem -_08098514: .4byte 0x000008a8 -_08098518: .4byte 0x000008aa -_0809851C: .4byte 0x000008ad - thumb_func_end sub_80984E8 - - thumb_func_start sub_8098520 -sub_8098520: @ 8098520 - push {r4,r5,lr} - sub sp, 0x10 - ldr r3, _08098578 @ =gSharedMem - ldr r0, _0809857C @ =0x000008ad - adds r5, r3, r0 - ldrb r0, [r5] - cmp r0, 0x14 - beq _08098592 - ldr r0, _08098580 @ =0x000008a8 - adds r1, r3, r0 - ldrh r0, [r1] - subs r0, 0x1 - movs r4, 0 - strh r0, [r1] - ldr r0, _08098584 @ =0x000008aa - adds r2, r3, r0 - ldrh r0, [r2] - adds r0, 0x1 - strh r0, [r2] - ldr r0, _08098588 @ =0x06007800 - adds r3, 0xA8 - str r4, [sp] - ldrh r1, [r1] - str r1, [sp, 0x4] - movs r1, 0xC - str r1, [sp, 0x8] - ldrh r1, [r2] - str r1, [sp, 0xC] - movs r1, 0xA - movs r2, 0 - bl sub_809D034 - movs r0, 0x8 - bl sub_80994A8 - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x14 - beq _0809858C - movs r0, 0x1 - b _08098594 - .align 2, 0 -_08098578: .4byte gSharedMem -_0809857C: .4byte 0x000008ad -_08098580: .4byte 0x000008a8 -_08098584: .4byte 0x000008aa -_08098588: .4byte 0x06007800 -_0809858C: - ldr r1, _0809859C @ =gUnknown_0203847C - movs r0, 0x1 - strb r0, [r1] -_08098592: - movs r0, 0 -_08098594: - add sp, 0x10 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0809859C: .4byte gUnknown_0203847C - thumb_func_end sub_8098520 - - thumb_func_start add_to_c3_somehow -add_to_c3_somehow: @ 80985A0 - ldr r1, _080985BC @ =gSharedMem - ldr r0, _080985C0 @ =0x000008a8 - adds r2, r1, r0 - movs r3, 0 - movs r0, 0 - strh r0, [r2] - ldr r0, _080985C4 @ =0x000008aa - adds r2, r1, r0 - movs r0, 0x16 - strh r0, [r2] - ldr r0, _080985C8 @ =0x000008ad - adds r1, r0 - strb r3, [r1] - bx lr - .align 2, 0 -_080985BC: .4byte gSharedMem -_080985C0: .4byte 0x000008a8 -_080985C4: .4byte 0x000008aa -_080985C8: .4byte 0x000008ad - thumb_func_end add_to_c3_somehow - - thumb_func_start sub_80985CC -sub_80985CC: @ 80985CC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x10 - ldr r3, _08098640 @ =gSharedMem - ldr r0, _08098644 @ =0x000008ad - adds r6, r3, r0 - ldrb r0, [r6] - cmp r0, 0x14 - beq _0809867A - ldr r2, _08098648 @ =0x000008a8 - adds r1, r3, r2 - ldrh r0, [r1] - adds r0, 0x1 - movs r2, 0 - mov r9, r2 - strh r0, [r1] - ldr r0, _0809864C @ =0x000008aa - adds r4, r3, r0 - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r4] - ldr r5, _08098650 @ =0x06007800 - adds r3, 0xA8 - mov r8, r3 - str r2, [sp] - ldrh r0, [r1] - str r0, [sp, 0x4] - movs r7, 0xC - str r7, [sp, 0x8] - ldrh r0, [r4] - str r0, [sp, 0xC] - adds r0, r5, 0 - movs r1, 0xA - bl sub_809D034 - ldrh r2, [r4] - movs r4, 0x1 - str r4, [sp] - adds r0, r5, 0 - movs r1, 0xA - movs r3, 0xC - bl sub_809D16C - movs r0, 0x8 - negs r0, r0 - bl sub_80994A8 - ldrb r0, [r6] - adds r0, 0x1 - strb r0, [r6] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x14 - beq _08098654 - movs r0, 0x1 - b _0809867C - .align 2, 0 -_08098640: .4byte gSharedMem -_08098644: .4byte 0x000008ad -_08098648: .4byte 0x000008a8 -_0809864C: .4byte 0x000008aa -_08098650: .4byte 0x06007800 -_08098654: - ldr r0, _0809868C @ =gUnknown_0203847C - movs r1, 0 - strb r1, [r0] - bl sub_809954C - bl party_compaction - str r7, [sp] - mov r2, r9 - str r2, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0x2 - str r0, [sp, 0xC] - adds r0, r5, 0 - movs r1, 0x15 - movs r2, 0 - mov r3, r8 - bl sub_809D034 -_0809867A: - movs r0, 0 -_0809867C: - add sp, 0x10 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0809868C: .4byte gUnknown_0203847C - thumb_func_end sub_80985CC - - thumb_func_start sub_8098690 -sub_8098690: @ 8098690 - push {lr} - sub sp, 0x10 - lsls r0, 24 - cmp r0, 0 - beq _080986C0 - ldr r0, _080986B8 @ =0x06007800 - ldr r3, _080986BC @ =gSharedMem + 0xA8 - movs r1, 0xC - str r1, [sp] - movs r1, 0 - str r1, [sp, 0x4] - movs r1, 0x9 - str r1, [sp, 0x8] - movs r1, 0x2 - str r1, [sp, 0xC] - movs r1, 0x15 - movs r2, 0 - bl sub_809D034 - b _080986DA - .align 2, 0 -_080986B8: .4byte 0x06007800 -_080986BC: .4byte gSharedMem + 0xA8 -_080986C0: - ldr r0, _080986E0 @ =0x06007800 - ldr r3, _080986E4 @ =gSharedMem + 0xA8 - movs r1, 0xC - str r1, [sp] - movs r2, 0x2 - str r2, [sp, 0x4] - movs r1, 0x9 - str r1, [sp, 0x8] - str r2, [sp, 0xC] - movs r1, 0x15 - movs r2, 0 - bl sub_809D034 -_080986DA: - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_080986E0: .4byte 0x06007800 -_080986E4: .4byte gSharedMem + 0xA8 - thumb_func_end sub_8098690 - - thumb_func_start sub_80986E8 -sub_80986E8: @ 80986E8 - ldr r1, _08098704 @ =gSharedMem - ldr r2, _08098708 @ =0x000008af - adds r0, r1, r2 - movs r3, 0x1 - strb r3, [r0] - movs r0, 0x8B - lsls r0, 4 - adds r2, r1, r0 - movs r0, 0x1E - strb r0, [r2] - ldr r2, _0809870C @ =0x000008b1 - adds r1, r2 - strb r3, [r1] - bx lr - .align 2, 0 -_08098704: .4byte gSharedMem -_08098708: .4byte 0x000008af -_0809870C: .4byte 0x000008b1 - thumb_func_end sub_80986E8 - - thumb_func_start sub_8098710 -sub_8098710: @ 8098710 - push {lr} - ldr r0, _0809872C @ =gSharedMem - ldr r2, _08098730 @ =0x000008af - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0 - beq _08098728 - movs r0, 0 - strb r0, [r1] - movs r0, 0x1 - bl sub_8098690 -_08098728: - pop {r0} - bx r0 - .align 2, 0 -_0809872C: .4byte gSharedMem -_08098730: .4byte 0x000008af - thumb_func_end sub_8098710 - - thumb_func_start sub_8098734 -sub_8098734: @ 8098734 - push {lr} - ldr r2, _08098774 @ =gSharedMem - ldr r1, _08098778 @ =0x000008af - adds r0, r2, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08098770 - movs r0, 0x8B - lsls r0, 4 - adds r1, r2, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1E - bls _08098770 - movs r0, 0 - strb r0, [r1] - movs r3, 0 - ldr r0, _0809877C @ =0x000008b1 - adds r1, r2, r0 - ldrb r0, [r1] - cmp r0, 0 - bne _08098768 - movs r3, 0x1 -_08098768: - strb r3, [r1] - ldrb r0, [r1] - bl sub_8098690 -_08098770: - pop {r0} - bx r0 - .align 2, 0 -_08098774: .4byte gSharedMem -_08098778: .4byte 0x000008af -_0809877C: .4byte 0x000008b1 - thumb_func_end sub_8098734 - - thumb_func_start sub_8098780 -sub_8098780: @ 8098780 - push {r4-r6,lr} - sub sp, 0x10 - movs r4, 0x1 - ldr r6, _080987D4 @ =gSharedMem + 0xA8 - movs r5, 0x80 - lsls r5, 9 -_0809878C: - movs r0, 0x64 - muls r0, r4 - ldr r1, _080987D8 @ =gPlayerParty - adds r0, r1 - movs r1, 0xB - bl GetMonData - cmp r0, 0 - beq _080987A0 - movs r0, 0x1 -_080987A0: - movs r1, 0x10 - cmp r0, 0 - beq _080987A8 - movs r1, 0xC -_080987A8: - lsrs r2, r5, 16 - str r1, [sp] - movs r0, 0x4 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - adds r0, r6, 0 - movs r1, 0x7 - adds r3, r6, 0 - bl sub_809D104 - movs r0, 0xC0 - lsls r0, 10 - adds r5, r0 - adds r4, 0x1 - cmp r4, 0x5 - ble _0809878C - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080987D4: .4byte gSharedMem + 0xA8 -_080987D8: .4byte gPlayerParty - thumb_func_end sub_8098780 - - thumb_func_start sub_80987DC -sub_80987DC: @ 80987DC - push {lr} - sub sp, 0x10 - bl sub_8098780 - ldr r0, _08098804 @ =0x06007800 - ldr r3, _08098808 @ =gSharedMem + 0xA8 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r1, 0xC - str r1, [sp, 0x8] - movs r1, 0x16 - str r1, [sp, 0xC] - movs r1, 0xA - movs r2, 0 - bl sub_809D034 - add sp, 0x10 - pop {r0} - bx r0 - .align 2, 0 -_08098804: .4byte 0x06007800 -_08098808: .4byte gSharedMem + 0xA8 - thumb_func_end sub_80987DC - - thumb_func_start sub_809880C -sub_809880C: @ 809880C - push {lr} - ldr r0, _08098828 @ =gSharedMem - ldr r1, _0809882C @ =0x000008ae - adds r0, r1 - movs r1, 0 - strb r1, [r0] - movs r0, 0x6 - bl PlaySE - bl sub_80984E8 - pop {r0} - bx r0 - .align 2, 0 -_08098828: .4byte gSharedMem -_0809882C: .4byte 0x000008ae - thumb_func_end sub_809880C - - thumb_func_start sub_8098830 -sub_8098830: @ 8098830 - push {r4,r5,lr} - ldr r5, _08098848 @ =gSharedMem - ldr r0, _0809884C @ =0x000008ae - adds r4, r5, r0 - ldrb r0, [r4] - cmp r0, 0x1 - beq _08098866 - cmp r0, 0x1 - bgt _08098850 - cmp r0, 0 - beq _08098856 - b _08098890 - .align 2, 0 -_08098848: .4byte gSharedMem -_0809884C: .4byte 0x000008ae -_08098850: - cmp r0, 0x2 - beq _0809888C - b _08098890 -_08098856: - bl sub_8098520 - lsls r0, 24 - cmp r0, 0 - bne _08098890 - bl sub_809B068 - b _0809887E -_08098866: - bl sub_809AC00 - lsls r0, 24 - cmp r0, 0 - bne _08098890 - ldr r1, _08098888 @ =0x000011f6 - adds r0, r5, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _0809887E - bl BoxSetMosaic -_0809887E: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _08098890 - .align 2, 0 -_08098888: .4byte 0x000011f6 -_0809888C: - movs r0, 0 - b _08098892 -_08098890: - movs r0, 0x1 -_08098892: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8098830 - -.section .text_8098A38 - thumb_func_start sub_8098A38 sub_8098A38: @ 8098A38 push {r4,lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index d21bc324f..66cc84000 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,63 +3,6 @@ .section .rodata - .align 2 -gOamData_83B6EAC:: @ 83B6EAC - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_83B6EB4:: @ 83B6EB4 - .2byte 0x4000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83B6EBC:: @ 83B6EBC - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83B6EC4:: @ 83B6EC4 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83B6ED4:: @ 83B6ED4 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83B6EDC:: @ 83B6EDC - obj_image_anim_frame 10, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 12, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83B6EEC:: @ 83B6EEC - .4byte gSpriteAnim_83B6EBC - .4byte gSpriteAnim_83B6EC4 - .4byte gSpriteAnim_83B6ED4 - .4byte gSpriteAnim_83B6EDC - - .align 2 -gSpriteTemplate_83B6EFC:: @ 83B6EFC - spr_template 5, 56013, gOamData_83B6EB4, gSpriteAnimTable_83B6EEC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83B6F14:: @ 83B6F14 - spr_template 15, 56000, gOamData_83B6F2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_83B6F2C:: @ 83B6F2C - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0000 - .align 2 gSpriteAffineAnim_83B6F34:: @ 83B6F34 obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120 diff --git a/include/graphics.h b/include/graphics.h index 91ba45acd..a8ac2783d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2747,5 +2747,9 @@ extern const u8 gPSSMenuHeader_Gfx[]; extern const u8 gPSSMenuHeader_Tilemap[]; extern const u16 gPSSMenu1_Pal[]; extern const u16 gPSSMenu2_Pal[]; +extern const u8 gPSSMenuMisc_Gfx[]; +extern const u8 gPSSMenuMisc_Tilemap[]; +extern const u16 gPSSMenu3_Pal[]; +extern const u16 gPSSMenu4_Pal[]; #endif // GUARD_GRAPHICS_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index f91a5f08e..b82213bb2 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -78,8 +78,16 @@ struct PokemonStorageSystemData { u16 unk_0008; u16 unk_000a; struct PCScreenEffectStruct unk_000c; - struct UnkStruct_2000020 unk_0020[274]; // refine size later - u8 filler_08b0[2]; + struct UnkStruct_2000020 unk_0020[17]; // refine size later + u16 unk_00a8[0x400]; + u16 unk_08a8; + u16 unk_08aa; + u8 unk_08ac; + u8 unk_08ad; + u8 unk_08ae; + u8 unk_08af; + u8 unk_08b0; + bool8 unk_08b1; s16 unk_08b2; u16 unk_08b4; u8 filler_08b6[0x4a8]; diff --git a/ld_script.txt b/ld_script.txt index 2157e6da5..f81caa5bf 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -129,10 +129,8 @@ SECTIONS { asm/unk_text_8095904.o(.text); src/pokemon/pokemon_storage_system.o(.text); src/pokemon/pokemon_storage_system_2.o(.text); - asm/pokemon_storage_system.o(.text); - src/pokemon/pokemon_storage_system_2.o(.text.8098898); src/pokemon/pokemon_storage_system_3.o(.text); - asm/pokemon_storage_system.o(.text_8098A38); + asm/pokemon_storage_system.o(.text); src/pokemon/pokemon_icon.o(.text); src/pokemon/pokemon_summary_screen.o(.text); src/field/script_movement.o(.text); diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index 7f97d7681..ff6f1f587 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -78,6 +78,9 @@ void sub_80982B4(void); void sub_8098350(void); void sub_8098400(void); void add_to_c3_somehow(void); +void sub_8098780(void); +void sub_8098690(bool8 flag); +void sub_8099200(u8 a0); bool8 sub_80985CC(void); void sub_80986E8(void); void sub_8098710(void); @@ -93,6 +96,8 @@ void sub_8098AA8(u8 a0); void sub_8098B48(void); void sub_8099310(void); bool8 sub_8099374(void); +void sub_80994A8(s16 a0); +void sub_809954C(void); void sub_8099958(void); bool8 sub_8099990(void); void sub_809BB90(void); @@ -109,6 +114,7 @@ void sub_809B0C0(u8 a0); void sub_809B0D4(void); void sub_809B0E0(void); u8 sub_809B0F4(void); +void sub_809B068(void); void sub_809B100(u8 a0); bool8 sub_809B130(void); void sub_809B440(void); @@ -134,6 +140,8 @@ s16 sub_809CF30(void); void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); void sub_809CFF0(void); void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); +void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); +void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); // .rodata @@ -1743,9 +1751,192 @@ void sub_8098350(void) } } -extern const struct StorageAction gPCStorageActionTexts[]; +void sub_8098400(void) +{ + REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(15); + LZ77UnCompVram(gPSSMenuMisc_Gfx, BG_SCREEN_ADDR(13)); + LZ77UnCompWram(gPSSMenuMisc_Tilemap, gPokemonStorageSystemPtr->unk_00a8); + LoadPalette(gPSSMenu3_Pal, 0x20, 0x20); + LoadPalette(gPSSMenu4_Pal, 0x30, 0x20); + DmaClear16(3, BG_SCREEN_ADDR(15), 0x800); + sub_8098780(); + if (gUnknown_0203847C) + { + sub_8098690(TRUE); + sub_8099200(1); + sub_809D034(BG_SCREEN_ADDR(15), 10, 0, gPokemonStorageSystemPtr->unk_00a8, 0, 0, 12, 22); + } + else + { + sub_809D034(BG_SCREEN_ADDR(15), 10, 0, gPokemonStorageSystemPtr->unk_00a8, 0, 20, 12, 2); + sub_8098690(TRUE); + } + gPokemonStorageSystemPtr->unk_08af = 0; +} + +void sub_80984E8(void) +{ + gPokemonStorageSystemPtr->unk_08a8 = 20; + gPokemonStorageSystemPtr->unk_08aa = 2; + gPokemonStorageSystemPtr->unk_08ad = 0; + sub_8099200(0); +} + +bool8 sub_8098520(void) +{ + if (gPokemonStorageSystemPtr->unk_08ad == 20) + return FALSE; + gPokemonStorageSystemPtr->unk_08a8--; + gPokemonStorageSystemPtr->unk_08aa++; + sub_809D034(BG_SCREEN_ADDR(15), 10, 0, gPokemonStorageSystemPtr->unk_00a8, 0, gPokemonStorageSystemPtr->unk_08a8, 12, gPokemonStorageSystemPtr->unk_08aa); + sub_80994A8(8); + if (++gPokemonStorageSystemPtr->unk_08ad == 20) + { + gUnknown_0203847C = 1; + return FALSE; + } + return TRUE; +} + +void add_to_c3_somehow(void) +{ + gPokemonStorageSystemPtr->unk_08a8 = 0; + gPokemonStorageSystemPtr->unk_08aa = 22; + gPokemonStorageSystemPtr->unk_08ad = 0; +} + +bool8 sub_80985CC(void) +{ + if (gPokemonStorageSystemPtr->unk_08ad == 20) + return FALSE; + gPokemonStorageSystemPtr->unk_08a8++; + gPokemonStorageSystemPtr->unk_08aa--; + sub_809D034(BG_SCREEN_ADDR(15), 10, 0, gPokemonStorageSystemPtr->unk_00a8, 0, gPokemonStorageSystemPtr->unk_08a8, 12, gPokemonStorageSystemPtr->unk_08aa); + sub_809D16C(BG_SCREEN_ADDR(15), 10, gPokemonStorageSystemPtr->unk_08aa, 12, 1); + sub_80994A8(-8); + if (++gPokemonStorageSystemPtr->unk_08ad == 20) + { + gUnknown_0203847C = 0; + sub_809954C(); + party_compaction(); + sub_809D034(BG_SCREEN_ADDR(15), 21, 0, gPokemonStorageSystemPtr->unk_00a8, 12, 0, 1, 2); + return FALSE; + } + return TRUE; +} + +void sub_8098690(bool8 flag) +{ + if (flag) + sub_809D034(BG_SCREEN_ADDR(15), 21, 0, gPokemonStorageSystemPtr->unk_00a8, 12, 0, 9, 2); + else + sub_809D034(BG_SCREEN_ADDR(15), 21, 0, gPokemonStorageSystemPtr->unk_00a8, 12, 2, 9, 2); +} + +void sub_80986E8(void) +{ + gPokemonStorageSystemPtr->unk_08af = 1; + gPokemonStorageSystemPtr->unk_08b0 = 30; + gPokemonStorageSystemPtr->unk_08b1 = 1; +} + +void sub_8098710(void) +{ + if (gPokemonStorageSystemPtr->unk_08af) + { + gPokemonStorageSystemPtr->unk_08af = 0; + sub_8098690(TRUE); + } +} + +void sub_8098734(void) +{ + if (gPokemonStorageSystemPtr->unk_08af && ++gPokemonStorageSystemPtr->unk_08b0 > 30) + { + gPokemonStorageSystemPtr->unk_08b0 = 0; + gPokemonStorageSystemPtr->unk_08b1 = gPokemonStorageSystemPtr->unk_08b1 ? FALSE : TRUE; + sub_8098690(gPokemonStorageSystemPtr->unk_08b1); + } +} + +void sub_8098780(void) +{ + int i; + + for (i = 1; i < PARTY_SIZE; i++) + { + u16 r1; + bool32 r0 = GetMonData(gPlayerParty + i, MON_DATA_SPECIES); + if (r0) + r0 = TRUE; + r1 = r0 ? 12 : 16; + sub_809D104(gPokemonStorageSystemPtr->unk_00a8, 7, (i - 1) * 3 + 1, gPokemonStorageSystemPtr->unk_00a8, r1, 4, 4, 3); + } +} + +void sub_80987DC(void) +{ + sub_8098780(); + sub_809D034(BG_SCREEN_ADDR(15), 10, 0, gPokemonStorageSystemPtr->unk_00a8, 0, 0, 12, 22); +} + +void sub_809880C(void) +{ + gPokemonStorageSystemPtr->unk_08ae = 0; + PlaySE(SE_WIN_OPEN); + sub_80984E8(); +} + +bool8 sub_8098830(void) +{ + switch (gPokemonStorageSystemPtr->unk_08ae) + { + case 0: + if (!sub_8098520()) + { + sub_809B068(); + gPokemonStorageSystemPtr->unk_08ae++; + } + break; + case 1: + if (!sub_809AC00()) + { + if (gPokemonStorageSystemPtr->unk_11f6) + BoxSetMosaic(); + gPokemonStorageSystemPtr->unk_08ae++; + } + break; + case 2: + return FALSE; + } + return TRUE; +} -asm(".section .text.8098898"); +const struct StorageAction gPCStorageActionTexts[] = { + {PCText_ExitBox, 0}, + {PCText_WhatYouDo, 0}, + {PCText_PickATheme, 0}, + {PCText_PickAWallpaper, 0}, + {PCText_IsSelected, 1}, + {PCText_JumpToWhichBox, 0}, + {PCText_DepositInWhichBox, 0}, + {PCText_WasDeposited, 1}, + {PCText_BoxIsFull, 0}, + {PCText_ReleasePoke, 0}, + {PCText_WasReleased, 4}, + {PCText_ByeBye, 6}, + {PCText_MarkPoke, 0}, + {PCText_LastPoke, 0}, + {PCText_PartyFull, 0}, + {PCText_HoldingPoke, 0}, + {PCText_WhichOneWillTake, 0}, + {PCText_CantReleaseEgg, 0}, + {PCText_ContinueBox, 0}, + {PCText_CameBack, 1}, + {PCText_Worried, 0}, + {PCText_Surprise, 0}, + {PCText_PleaseRemoveMail, 0} +}; void PrintStorageActionText(u8 index) { u8 *ptr; @@ -1826,30 +2017,67 @@ void PrintStorageActionText(u8 index) { MenuPrint(gPokemonStorageSystemPtr->unk_2694, 11, 17); } -// FIXME: move this back +const struct OamData gOamData_83B6EAC = { + .size = 3 +}; -const struct StorageAction gPCStorageActionTexts[] = { - {PCText_ExitBox, 0}, - {PCText_WhatYouDo, 0}, - {PCText_PickATheme, 0}, - {PCText_PickAWallpaper, 0}, - {PCText_IsSelected, 1}, - {PCText_JumpToWhichBox, 0}, - {PCText_DepositInWhichBox, 0}, - {PCText_WasDeposited, 1}, - {PCText_BoxIsFull, 0}, - {PCText_ReleasePoke, 0}, - {PCText_WasReleased, 4}, - {PCText_ByeBye, 6}, - {PCText_MarkPoke, 0}, - {PCText_LastPoke, 0}, - {PCText_PartyFull, 0}, - {PCText_HoldingPoke, 0}, - {PCText_WhichOneWillTake, 0}, - {PCText_CantReleaseEgg, 0}, - {PCText_ContinueBox, 0}, - {PCText_CameBack, 1}, - {PCText_Worried, 0}, - {PCText_Surprise, 0}, - {PCText_PleaseRemoveMail, 0} +const struct OamData gOamData_83B6EB4 = { + .shape = ST_OAM_H_RECTANGLE +}; + +const union AnimCmd gSpriteAnim_83B6EBC[] = { + ANIMCMD_FRAME(0, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83B6EC4[] = { + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gSpriteAnim_83B6ED4[] = { + ANIMCMD_FRAME(8, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83B6EDC[] = { + ANIMCMD_FRAME(10, 8), + ANIMCMD_FRAME( 4, 8), + ANIMCMD_FRAME(12, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd *const gSpriteAnimTable_83B6EEC[] = { + gSpriteAnim_83B6EBC, + gSpriteAnim_83B6EC4, + gSpriteAnim_83B6ED4, + gSpriteAnim_83B6EDC +}; + +const struct SpriteTemplate gSpriteTemplate_83B6EFC = { + 0x0005, + 0xdacd, + &gOamData_83B6EB4, + gSpriteAnimTable_83B6EEC, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +const struct OamData gOamData_83B6F2C; + +const struct SpriteTemplate gSpriteTemplate_83B6F14 = { + 0x000f, + 0xdac0, + &gOamData_83B6F2C, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +const struct OamData gOamData_83B6F2C = { + .size = 2 }; -- cgit v1.2.3 From f361bbd3e63a0b342ddfbd4c4c8d9e5a7536d2cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 20:30:32 -0500 Subject: finish pokemon_storage_system_2.c --- asm/pokemon_storage_system.s | 122 --------------------------------- include/pokemon.h | 2 +- include/pokemon_storage_system.h | 55 ++++++++++++++- src/pokemon/pokemon_storage_system_2.c | 107 +++++++++++++++-------------- 4 files changed, 110 insertions(+), 176 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index bf3d49532..a4cf34a2b 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,128 +5,6 @@ .text - thumb_func_start sub_8098A38 -sub_8098A38: @ 8098A38 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x17 - movs r1, 0xA - movs r2, 0 - bl DisplayYesNoMenu - lsls r4, 24 - asrs r4, 24 - adds r0, r4, 0 - bl MoveMenuCursor - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8098A38 - - thumb_func_start sub_8098A5C -sub_8098A5C: @ 8098A5C - push {lr} - bl HandleDestroyMenuCursors - movs r0, 0xA - movs r1, 0x10 - movs r2, 0x1D - movs r3, 0x13 - bl MenuZeroFillWindowRect - movs r0, 0x17 - movs r1, 0xA - movs r2, 0x1D - movs r3, 0xF - bl MenuZeroFillWindowRect - pop {r0} - bx r0 - thumb_func_end sub_8098A5C - - thumb_func_start sub_8098A80 -sub_8098A80: @ 8098A80 - push {lr} - bl sub_809CDCC - movs r0, 0xC - bl sub_809CDEC - movs r0, 0xD - bl sub_809CDEC - movs r0, 0xE - bl sub_809CDEC - movs r0, 0xF - bl sub_809CDEC - bl sub_809CE84 - pop {r0} - bx r0 - thumb_func_end sub_8098A80 - - thumb_func_start sub_8098AA8 -sub_8098AA8: @ 8098AA8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r5, r4, 0 - bl sub_809CDCC - cmp r4, 0x1 - beq _08098AE6 - cmp r4, 0x1 - bgt _08098AC2 - cmp r4, 0 - beq _08098ACC - b _08098B32 -_08098AC2: - cmp r5, 0x2 - beq _08098B00 - cmp r5, 0x3 - beq _08098B1A - b _08098B32 -_08098ACC: - movs r0, 0x10 - bl sub_809CDEC - movs r0, 0x11 - bl sub_809CDEC - movs r0, 0x12 - bl sub_809CDEC - movs r0, 0x13 - bl sub_809CDEC - b _08098B32 -_08098AE6: - movs r0, 0x14 - bl sub_809CDEC - movs r0, 0x15 - bl sub_809CDEC - movs r0, 0x16 - bl sub_809CDEC - movs r0, 0x17 - bl sub_809CDEC - b _08098B32 -_08098B00: - movs r0, 0x18 - bl sub_809CDEC - movs r0, 0x19 - bl sub_809CDEC - movs r0, 0x1A - bl sub_809CDEC - movs r0, 0x1B - bl sub_809CDEC - b _08098B32 -_08098B1A: - movs r0, 0x1C - bl sub_809CDEC - movs r0, 0x1D - bl sub_809CDEC - movs r0, 0x1E - bl sub_809CDEC - movs r0, 0x1F - bl sub_809CDEC -_08098B32: - bl sub_809CE84 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8098AA8 - -// File boundary - thumb_func_start get_preferred_box get_preferred_box: @ 8098B3C ldr r0, _08098B44 @ =gPokemonStorage diff --git a/include/pokemon.h b/include/pokemon.h index fd1709320..af65599f8 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -627,6 +627,6 @@ void RandomlyGivePartyPokerus(struct Pokemon *party); void PartySpreadPokerus(struct Pokemon *party); struct Sprite *sub_80F7920(u16, u16, const u16 *); - +void BoxMonRestorePP(struct BoxPokemon *); #endif // GUARD_POKEMON_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index b82213bb2..ab2a14362 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -142,11 +142,60 @@ u8 sub_8096368(void); void sub_809635C(void); void sub_8096310(void); void sub_80961A8(void); - void task_intro_29(u8 whichMenu); void ResetPokemonStorageSystem(void); -void BoxMonRestorePP(struct BoxPokemon *); -void party_compaction(void); +void sub_8098B48(void); +void sub_8099310(void); +bool8 sub_8099374(void); +void sub_80994A8(s16 a0); +void sub_809954C(void); +void sub_8099958(void); +bool8 sub_8099990(void); struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); +void sub_809BB90(void); +void sub_8099BF8(u8 a0); +void sub_8099C70(u8 whichBox); +bool8 sub_8099D34(void); +void sub_8099DCC(u8 a0); +bool8 sub_8099E08(void); +void sub_809A860(u8 a0); +void sub_809AA24(void); +void sub_809AA98(void); +bool8 sub_809AC00(void); +void sub_809B0C0(u8 a0); +void sub_809B0D4(void); +void sub_809B0E0(void); +u8 sub_809B0F4(void); +void sub_809B068(void); +void sub_809B100(u8 a0); +bool8 sub_809B130(void); +void sub_809B440(void); +bool8 sub_809B62C(u8); +void sub_809B6BC(void); +void sub_809B6DC(void); +bool8 sub_809B734(void); +void sub_809B760(void); +void sub_809B7AC(void); +void sub_809B7D4(void); +s8 sub_809B960(void); +void sub_809BBC0(void); +void sub_809BC18(void); +void sub_809BD14(void); +void party_compaction(void); +void sub_809BDD8(u8 markings); +bool8 sub_809BE80(void); +bool8 sub_809BEBC(void); +bool8 sub_809BF20(void); +bool8 sub_809BF48(void); +u8 sub_809CA40(void); +void sub_809CDCC(void); +void sub_809CDEC(u8 a0); +void sub_809CE84(void); +s16 sub_809CF30(void); +void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); +void sub_809CFF0(void); +void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); +void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); +void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index ff6f1f587..474f16323 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -89,59 +89,10 @@ void sub_80987DC(void); void sub_809880C(void); bool8 sub_8098830(void); void PrintStorageActionText(u8 index); -void sub_8098A38(u8); +void sub_8098A38(s8); void sub_8098A5C(void); void sub_8098A80(void); void sub_8098AA8(u8 a0); -void sub_8098B48(void); -void sub_8099310(void); -bool8 sub_8099374(void); -void sub_80994A8(s16 a0); -void sub_809954C(void); -void sub_8099958(void); -bool8 sub_8099990(void); -void sub_809BB90(void); -void sub_8099BF8(u8 a0); -void sub_8099C70(u8 whichBox); -bool8 sub_8099D34(void); -void sub_8099DCC(u8 a0); -bool8 sub_8099E08(void); -void sub_809A860(u8 a0); -void sub_809AA24(void); -void sub_809AA98(void); -bool8 sub_809AC00(void); -void sub_809B0C0(u8 a0); -void sub_809B0D4(void); -void sub_809B0E0(void); -u8 sub_809B0F4(void); -void sub_809B068(void); -void sub_809B100(u8 a0); -bool8 sub_809B130(void); -void sub_809B440(void); -bool8 sub_809B62C(u8); -void sub_809B6BC(void); -void sub_809B6DC(void); -bool8 sub_809B734(void); -void sub_809B760(void); -void sub_809B7AC(void); -void sub_809B7D4(void); -s8 sub_809B960(void); -void sub_809BBC0(void); -void sub_809BC18(void); -void sub_809BD14(void); -void sub_809BDD8(u8 markings); -bool8 sub_809BE80(void); -bool8 sub_809BEBC(void); -bool8 sub_809BF20(void); -bool8 sub_809BF48(void); -u8 sub_809CA40(void); -void sub_809CE84(void); -s16 sub_809CF30(void); -void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); -void sub_809CFF0(void); -void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); -void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); -void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); // .rodata @@ -2081,3 +2032,59 @@ const struct SpriteTemplate gSpriteTemplate_83B6F14 = { const struct OamData gOamData_83B6F2C = { .size = 2 }; + +void sub_8098A38(s8 a0) +{ + DisplayYesNoMenu(23, 10, 0); + MoveMenuCursor(a0); +} + +void sub_8098A5C(void) +{ + HandleDestroyMenuCursors(); + MenuZeroFillWindowRect(10, 16, 29, 19); + MenuZeroFillWindowRect(23, 10, 29, 15); +} + +void sub_8098A80(void) +{ + sub_809CDCC(); + sub_809CDEC(12); + sub_809CDEC(13); + sub_809CDEC(14); + sub_809CDEC(15); + sub_809CE84(); +} + +void sub_8098AA8(u8 a0) +{ + sub_809CDCC(); + switch (a0) + { + case 0: + sub_809CDEC(16); + sub_809CDEC(17); + sub_809CDEC(18); + sub_809CDEC(19); + break; + case 1: + sub_809CDEC(20); + sub_809CDEC(21); + sub_809CDEC(22); + sub_809CDEC(23); + break; + case 2: + sub_809CDEC(24); + sub_809CDEC(25); + sub_809CDEC(26); + sub_809CDEC(27); + break; + case 3: + sub_809CDEC(28); + sub_809CDEC(29); + sub_809CDEC(30); + sub_809CDEC(31); + break; + } + sub_809CE84(); +} -- cgit v1.2.3 From 0be27e16d2bea0fb4a9145849706779501ae3450 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 19:54:56 -0600 Subject: match sub_80DCD78 --- src/battle/anim/bug.c | 161 ++++++++------------------------------------------ 1 file changed, 23 insertions(+), 138 deletions(-) diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index 501d544b1..dbc0f75a5 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -39,7 +39,7 @@ void sub_80DC824(struct Sprite *sprite) sprite->data[2] = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; sprite->data[4] = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; - + sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -64,7 +64,7 @@ void sub_80DC8F4(struct Sprite *sprite) sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); - + sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } @@ -247,157 +247,42 @@ void sub_80DCCFC(struct Sprite *sprite) sprite->invisible = TRUE; } -#ifdef NONMATCHING void sub_80DCD78(struct Sprite *sprite) { - int i; - s16 x1, x2, y1, y2; - // s16 scale; - // u16 *data; - u16 tempData[8]; - s16 rot; - sprite->invisible = FALSE; if (sub_8078718(sprite)) { DestroyAnimSprite(sprite); - return; } - - // data = &sprite->data[7]; - x1 = sprite->pos1.x; - x2 = sprite->pos2.x; - y1 = sprite->pos1.y; - y2 = sprite->pos2.y; - for (i = 0; i < 8; i++) - { - tempData[i] = sprite->data[i]; - } - x2 += x1; - y2 += y1; - - if (!sub_8078718(sprite)) + else { - rot = sub_80790F0(sprite->pos1.x + sprite->pos2.x - x2, - sprite->pos1.y + sprite->pos2.y - y2); - rot += 0xC000; - // scale = 0x100 - sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot); + s16 tempData[8]; + u16 *data = sprite->data; + u16 x1 = sprite->pos1.x; + s16 x2 = sprite->pos2.x; + u16 y1 = sprite->pos1.y; + s16 y2 = sprite->pos2.y; + int i; for (i = 0; i < 8; i++) + tempData[i] = data[i]; + + x2 += x1; + y2 += y1; + + if (!sub_8078718(sprite)) { - sprite->data[i] = tempData[i]; + u16 rot = sub_80790F0(sprite->pos1.x + sprite->pos2.x - x2, + sprite->pos1.y + sprite->pos2.y - y2); + rot += 0xC000; + sub_8078FDC(sprite, FALSE, 0x100, 0x100, rot); + + for (i = 0; i < 8; i++) + data[i] = tempData[i]; } } } -#else -__attribute__((naked)) -void sub_80DCD78(struct Sprite *sprite) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - sub sp, 0x14\n\ - adds r4, r0, 0\n\ - adds r2, r4, 0\n\ - adds r2, 0x3E\n\ - ldrb r0, [r2]\n\ - movs r1, 0x5\n\ - negs r1, r1\n\ - ands r1, r0\n\ - strb r1, [r2]\n\ - adds r0, r4, 0\n\ - bl sub_8078718\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _080DCDA4\n\ - adds r0, r4, 0\n\ - bl DestroyAnimSprite\n\ - b _080DCE34\n\ -_080DCDA4:\n\ - movs r0, 0x2E\n\ - adds r0, r4\n\ - mov r8, r0\n\ - ldrh r7, [r4, 0x20]\n\ - ldrh r5, [r4, 0x24]\n\ - ldrh r1, [r4, 0x22]\n\ - mov r12, r1\n\ - ldrh r6, [r4, 0x26]\n\ - mov r2, r8\n\ - add r1, sp, 0x4\n\ - movs r3, 0x7\n\ -_080DCDBA:\n\ - ldrh r0, [r2]\n\ - strh r0, [r1]\n\ - adds r2, 0x2\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _080DCDBA\n\ - adds r0, r7, r5\n\ - lsls r0, 16\n\ - lsrs r5, r0, 16\n\ - mov r2, r12\n\ - adds r0, r2, r6\n\ - lsls r0, 16\n\ - lsrs r6, r0, 16\n\ - adds r0, r4, 0\n\ - bl sub_8078718\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - bne _080DCE34\n\ - ldrh r0, [r4, 0x24]\n\ - ldrh r1, [r4, 0x20]\n\ - adds r0, r1\n\ - lsls r1, r5, 16\n\ - asrs r1, 16\n\ - subs r0, r1\n\ - lsls r0, 16\n\ - asrs r0, 16\n\ - ldrh r1, [r4, 0x26]\n\ - ldrh r2, [r4, 0x22]\n\ - adds r1, r2\n\ - lsls r2, r6, 16\n\ - asrs r2, 16\n\ - subs r1, r2\n\ - lsls r1, 16\n\ - asrs r1, 16\n\ - bl sub_80790F0\n\ - lsls r0, 16\n\ - movs r1, 0xC0\n\ - lsls r1, 24\n\ - adds r0, r1\n\ - lsrs r0, 16\n\ - movs r3, 0x80\n\ - lsls r3, 1\n\ - str r0, [sp]\n\ - adds r0, r4, 0\n\ - movs r1, 0\n\ - adds r2, r3, 0\n\ - bl sub_8078FDC\n\ - add r2, sp, 0x4\n\ - mov r1, r8\n\ - movs r3, 0x7\n\ -_080DCE26:\n\ - ldrh r0, [r2]\n\ - strh r0, [r1]\n\ - adds r2, 0x2\n\ - adds r1, 0x2\n\ - subs r3, 0x1\n\ - cmp r3, 0\n\ - bge _080DCE26\n\ -_080DCE34:\n\ - add sp, 0x14\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .syntax divided\n"); -} -#endif // NONMATCHING void sub_80DCE40(struct Sprite *sprite) { -- cgit v1.2.3 From c4244f5bec27741c18a12611f245df5572b11d8b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 21:18:42 -0500 Subject: through sub_8098BF0 --- asm/pokemon_storage_system.s | 142 ++------------------------------- include/pokemon_storage_system.h | 21 +++-- ld_script.txt | 2 + src/pokemon/pokemon_storage_system.c | 14 ++-- src/pokemon/pokemon_storage_system_2.c | 27 ------- src/pokemon/pokemon_storage_system_3.c | 52 +++++++++++- src/pokemon/pokemon_storage_system_4.c | 23 ++++++ src/pokemon/pokemon_storage_system_5.c | 16 ++++ sym_ewram.txt | 7 +- 9 files changed, 126 insertions(+), 178 deletions(-) create mode 100644 src/pokemon/pokemon_storage_system_4.c create mode 100644 src/pokemon/pokemon_storage_system_5.c diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index a4cf34a2b..7e6f34d53 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,142 +5,6 @@ .text - thumb_func_start get_preferred_box -get_preferred_box: @ 8098B3C - ldr r0, _08098B44 @ =gPokemonStorage - ldrb r0, [r0] - bx lr - .align 2, 0 -_08098B44: .4byte gPokemonStorage - thumb_func_end get_preferred_box - - thumb_func_start sub_8098B48 -sub_8098B48: @ 8098B48 - push {r4,r5,lr} - bl sub_809D51C - movs r2, 0 - ldr r1, _08098BD8 @ =gPokemonStorageSystemPtr - ldr r0, [r1] - ldr r4, _08098BDC @ =0x000010d0 - adds r3, r0, r4 - movs r4, 0 - adds r5, r1, 0 -_08098B5C: - lsls r0, r2, 1 - adds r0, r3, r0 - strh r4, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x27 - bls _08098B5C - movs r2, 0 - ldr r0, _08098BD8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x89 - lsls r1, 5 - adds r3, r0, r1 - movs r1, 0 -_08098B7A: - lsls r0, r2, 1 - adds r0, r3, r0 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x27 - bls _08098B7A - movs r2, 0 - ldr r0, _08098BD8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r4, _08098BE0 @ =0x00001038 - adds r3, r0, r4 - movs r1, 0 -_08098B96: - lsls r0, r2, 2 - adds r0, r3, r0 - str r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x5 - bls _08098B96 - movs r2, 0 - ldr r0, _08098BD8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08098BE4 @ =0x00001050 - adds r3, r0, r1 - movs r1, 0 -_08098BB2: - lsls r0, r2, 2 - adds r0, r3, r0 - str r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x1D - bls _08098BB2 - ldr r0, [r5] - ldr r2, _08098BE8 @ =0x00001034 - adds r1, r0, r2 - movs r2, 0 - str r2, [r1] - ldr r4, _08098BEC @ =0x00000d5c - adds r0, r4 - strh r2, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08098BD8: .4byte gPokemonStorageSystemPtr -_08098BDC: .4byte 0x000010d0 -_08098BE0: .4byte 0x00001038 -_08098BE4: .4byte 0x00001050 -_08098BE8: .4byte 0x00001034 -_08098BEC: .4byte 0x00000d5c - thumb_func_end sub_8098B48 - - thumb_func_start sub_8098BF0 -sub_8098BF0: @ 8098BF0 - push {r4-r6,lr} - sub sp, 0x8 - ldr r0, _08098C38 @ =gPokemonStorageSystemPtr - ldr r5, [r0] - ldr r0, _08098C3C @ =0x000025b4 - adds r4, r5, r0 - adds r0, r4, 0 - movs r1, 0 - bl GetMonData - adds r6, r0, 0 - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - str r1, [sp] - movs r1, 0x7 - str r1, [sp, 0x4] - adds r1, r6, 0 - movs r2, 0 - movs r3, 0 - bl sub_8099AFC - ldr r1, _08098C40 @ =0x00001034 - adds r5, r1 - str r0, [r5] - ldr r1, _08098C44 @ =sub_80999C4 - str r1, [r0, 0x1C] - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08098C38: .4byte gPokemonStorageSystemPtr -_08098C3C: .4byte 0x000025b4 -_08098C40: .4byte 0x00001034 -_08098C44: .4byte sub_80999C4 - thumb_func_end sub_8098BF0 - thumb_func_start sub_8098C48 sub_8098C48: @ 8098C48 push {r4-r7,lr} @@ -2216,6 +2080,8 @@ sub_8099BE0: @ 8099BE0 bx r0 thumb_func_end sub_8099BE0 +// file boundary? + thumb_func_start sub_8099BF8 sub_8099BF8: @ 8099BF8 push {r4,lr} @@ -6273,6 +6139,8 @@ _0809BB88: .4byte gPokemonStorageSystemPtr _0809BB8C: .4byte 0x0000267d thumb_func_end sub_809B960 +// file boundary at or before here + thumb_func_start sub_809BB90 sub_809BB90: @ 809BB90 push {lr} @@ -8589,6 +8457,8 @@ _0809CDC4: .4byte gPokemonStorageSystemPtr _0809CDC8: .4byte 0x000011e4 thumb_func_end sub_809CD88 +// file boundary here + thumb_func_start sub_809CDCC sub_809CDCC: @ 809CDCC ldr r0, _0809CDE0 @ =gPokemonStorageSystemPtr diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index ab2a14362..7f16b5d4f 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -90,10 +90,18 @@ struct PokemonStorageSystemData { bool8 unk_08b1; s16 unk_08b2; u16 unk_08b4; - u8 filler_08b6[0x4a8]; + u8 filler_08b6[0x4a6]; + u16 unk_0d5c; s16 unk_0d5e; s16 unk_0d60; - u8 filler_0d62[0x486]; + u8 filler_0d62[0x2d2]; + struct Sprite *unk_1034; + u32 unk_1038[6]; + u32 unk_1050[30]; + u8 filler_10c8[8]; + u16 unk_10d0[40]; + u16 unk_1120[40]; + u8 filler_1170[0x78]; u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; @@ -113,7 +121,8 @@ struct PokemonStorageSystemData { u16 *unk_12b8; struct PokemonMarkMenu unk_12bc; struct UnkPSSStruct_2002370 unk_2370; - u8 filler_25b4[0xd8]; + struct Pokemon unk_25b4; + u8 filler_2618[0x74]; u8 unk_268c; u8 unk_268d; u8 unk_268e; @@ -131,11 +140,12 @@ struct PokemonStorageSystemData { u8 unk_4784[0x800]; }; -extern EWRAM_DATA u16 gUnknown_02039760[0x600]; - +extern u16 gUnknown_02039760[0x600]; +extern struct UnkPSSStruct_2002370 *gUnknown_02038478; extern struct PokemonStorageSystemData *const gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; +u8 CountPokemonInBoxN(u8 boxId); void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3); void sub_809634C(u8 curBox); u8 sub_8096368(void); @@ -145,6 +155,7 @@ void sub_80961A8(void); void task_intro_29(u8 whichMenu); void ResetPokemonStorageSystem(void); void sub_8098B48(void); +void sub_8099200(u8 a0); void sub_8099310(void); bool8 sub_8099374(void); void sub_80994A8(s16 a0); diff --git a/ld_script.txt b/ld_script.txt index f81caa5bf..76f3ce9f9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -130,6 +130,8 @@ SECTIONS { src/pokemon/pokemon_storage_system.o(.text); src/pokemon/pokemon_storage_system_2.o(.text); src/pokemon/pokemon_storage_system_3.o(.text); + src/pokemon/pokemon_storage_system_4.o(.text); + src/pokemon/pokemon_storage_system_5.o(.text); asm/pokemon_storage_system.o(.text); src/pokemon/pokemon_icon.o(.text); src/pokemon/pokemon_summary_screen.o(.text); diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index c91e45d7a..aebd13498 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -22,6 +22,12 @@ void sub_809665C(void); void sub_80966F4(const u8 *sourceString, u16 x, u16 y); void sub_8096784(struct Sprite *sprite); +EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; +EWRAM_DATA u8 gUnknown_02038470[3] = {}; +EWRAM_DATA u8 gUnknown_02038473 = 0; +EWRAM_DATA u8 gUnknown_02038474 = 0; +EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478 = NULL; + const struct PSS_MenuStringPtrs gUnknown_083B600C[] = { {PCText_WithdrawPoke, PCText_MovePokeToParty}, {PCText_DepositPoke, PCText_StorePokeInBox}, @@ -71,13 +77,7 @@ const u8 gBoxSelectionPopupCenterTiles[] = INCBIN_U8("graphics/pokemon_storage/b const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp"); -EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; -EWRAM_DATA u8 gUnknown_02038470[3] = {}; -EWRAM_DATA u8 gUnknown_02038473 = 0; -EWRAM_DATA u8 gUnknown_02038474 = 0; -EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478 = NULL; - -static u8 CountPokemonInBoxN(u8 boxId) +u8 CountPokemonInBoxN(u8 boxId) { u16 i; u16 count; diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index 474f16323..2947562d0 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -27,15 +27,6 @@ EWRAM_DATA u8 gUnknown_0203847C = 0; EWRAM_DATA u8 gUnknown_0203847D = 0; EWRAM_DATA u8 gUnknown_0203847E = 0; EWRAM_DATA u8 gUnknown_0203847F = 0; -EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; -EWRAM_DATA u8 gUnknown_020384E4 = 0; -EWRAM_DATA u8 gUnknown_020384E5 = 0; -EWRAM_DATA u8 gUnknown_020384E6 = 0; -EWRAM_DATA u8 gUnknown_020384E7 = 0; -EWRAM_DATA u8 gUnknown_020384E8 = 0; -EWRAM_DATA u8 gUnknown_020384E9 = 0; -EWRAM_DATA u16 gUnknown_020384EA = 0; -EWRAM_DATA u32 gUnknown_020384EC = 0; // Static ROM declarations @@ -80,7 +71,6 @@ void sub_8098400(void); void add_to_c3_somehow(void); void sub_8098780(void); void sub_8098690(bool8 flag); -void sub_8099200(u8 a0); bool8 sub_80985CC(void); void sub_80986E8(void); void sub_8098710(void); @@ -159,7 +149,6 @@ const struct SpritePalette gWaveformSpritePalette = { // .text - void task_intro_29(u8 whichMenu) { gUnknown_0203847D = whichMenu; @@ -2017,22 +2006,6 @@ const struct SpriteTemplate gSpriteTemplate_83B6EFC = { SpriteCallbackDummy }; -const struct OamData gOamData_83B6F2C; - -const struct SpriteTemplate gSpriteTemplate_83B6F14 = { - 0x000f, - 0xdac0, - &gOamData_83B6F2C, - gDummySpriteAnimTable, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallbackDummy -}; - -const struct OamData gOamData_83B6F2C = { - .size = 2 -}; - void sub_8098A38(s8 a0) { DisplayYesNoMenu(23, 10, 0); diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index 9e0052b89..eff542756 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -1,16 +1,64 @@ // Includes #include "global.h" +#include "sprite.h" +#include "pokemon_icon.h" #include "pokemon_storage_system.h" // Static type declarations // Static RAM declarations -EWRAM_DATA u16 gUnknown_02039760[0x600] = {}; - // Static ROM declarations +void sub_80999C4(struct Sprite *sprite); +struct Sprite *sub_8099AFC(u16 species, u32 personality, u16 a2, u16 a3, u8 a4, u8 a5); + // .rodata +const struct OamData gOamData_83B6F2C; + +const struct SpriteTemplate gSpriteTemplate_83B6F14 = { + 0x000f, + 0xdac0, + &gOamData_83B6F2C, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +const struct OamData gOamData_83B6F2C = { + .size = 2 +}; + // .text + +u8 get_preferred_box(void) +{ + return gPokemonStorage.currentBox; +} + +void sub_8098B48(void) +{ + u16 i; + + sub_809D51C(); + for (i = 0; i < 40; i++) + gPokemonStorageSystemPtr->unk_10d0[i] = 0; + for (i = 0; i < 40; i++) + gPokemonStorageSystemPtr->unk_1120[i] = 0; + for (i = 0; i < 6; i++) + gPokemonStorageSystemPtr->unk_1038[i] = 0; + for (i = 0; i < 30; i++) + gPokemonStorageSystemPtr->unk_1050[i] = 0; + gPokemonStorageSystemPtr->unk_1034 = NULL; + gPokemonStorageSystemPtr->unk_0d5c = 0; +} + +void sub_8098BF0(void) +{ + u32 personality = GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_PERSONALITY); + gPokemonStorageSystemPtr->unk_1034 = sub_8099AFC(GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_SPECIES2), personality, 0, 0, 1, 7); + gPokemonStorageSystemPtr->unk_1034->callback = sub_80999C4; +} diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c new file mode 100644 index 000000000..f7a008db2 --- /dev/null +++ b/src/pokemon/pokemon_storage_system_4.c @@ -0,0 +1,23 @@ + +// Includes +#include "global.h" +#include "pokemon_storage_system.h" + +// Static type declarations + +// Static RAM declarations + +EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; +EWRAM_DATA u8 gUnknown_020384E4 = 0; +EWRAM_DATA u8 gUnknown_020384E5 = 0; +EWRAM_DATA u8 gUnknown_020384E6 = 0; +EWRAM_DATA u8 gUnknown_020384E7 = 0; +EWRAM_DATA u8 gUnknown_020384E8 = 0; +EWRAM_DATA u8 gUnknown_020384E9 = 0; +EWRAM_DATA u16 gUnknown_020384EA = 0; + +// Static ROM declarations + +// .rodata + +// .text diff --git a/src/pokemon/pokemon_storage_system_5.c b/src/pokemon/pokemon_storage_system_5.c new file mode 100644 index 000000000..f809439ff --- /dev/null +++ b/src/pokemon/pokemon_storage_system_5.c @@ -0,0 +1,16 @@ + +// Includes +#include "global.h" +#include "pokemon_storage_system.h" + +// Static type declarations + +// Static RAM declarations + +EWRAM_DATA u32 gUnknown_020384EC = 0; + +// Static ROM declarations + +// .rodata + +// .text diff --git a/sym_ewram.txt b/sym_ewram.txt index ac9805f3e..4b5de3e85 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -379,6 +379,9 @@ gUnknown_0202FFA4: @ 202FFA4 .include "src/engine/trainer_card.o" .include "src/pokemon/pokemon_storage_system.o" .include "src/pokemon/pokemon_storage_system_2.o" + .include "src/pokemon/pokemon_storage_system_3.o" + .include "src/pokemon/pokemon_storage_system_4.o" + .include "src/pokemon/pokemon_storage_system_5.o" @ pokemon_summary_screen @@ -561,5 +564,7 @@ gTileBuffer: @ 2039360 gUnknown_02039460: @ 2039460 .space 0x300 - .include "src/pokemon/pokemon_storage_system_3.o" +gUnknown_02039760: @ 2039760 + .space 0xc00 + .include "src/engine/menu_cursor.o" -- cgit v1.2.3 From 7cdd2b2a42a96135949e399d1fa3a00c5f56ae67 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 22:08:11 -0500 Subject: through sub_8098E68 --- asm/pokemon_storage_system.s | 324 +-------------------------------- include/pokemon_storage_system.h | 10 +- src/pokemon/pokemon_storage_system_2.c | 4 +- src/pokemon/pokemon_storage_system_3.c | 89 ++++++++- 4 files changed, 99 insertions(+), 328 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 7e6f34d53..90b8caa5c 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,316 +5,6 @@ .text - thumb_func_start sub_8098C48 -sub_8098C48: @ 8098C48 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldr r1, _08098CCC @ =gPokemonStorage + 0x4 - adds r6, r0, r1 - movs r0, 0 - mov r8, r0 - movs r7, 0 -_08098C6A: - movs r5, 0 - adds r1, r7, 0x1 - mov r9, r1 -_08098C70: - adds r0, r6, 0 - movs r1, 0x41 - bl GetBoxMonData - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - beq _08098CD8 - adds r0, r6, 0 - movs r1, 0 - bl GetBoxMonData - adds r1, r0, 0 - lsls r2, r5, 1 - adds r2, r5 - lsls r2, 19 - movs r3, 0xC8 - lsls r3, 15 - adds r2, r3 - asrs r2, 16 - lsls r3, r7, 1 - adds r3, r7 - lsls r3, 19 - movs r0, 0xB0 - lsls r0, 14 - adds r3, r0 - movs r0, 0x2 - str r0, [sp] - movs r0, 0x12 - subs r0, r5 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x4] - adds r0, r4, 0 - asrs r3, 16 - bl sub_8099AFC - ldr r1, _08098CD0 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - mov r3, r8 - lsls r2, r3, 2 - ldr r3, _08098CD4 @ =0x00001050 - adds r1, r3 - adds r1, r2 - str r0, [r1] - b _08098CE8 - .align 2, 0 -_08098CCC: .4byte gPokemonStorage + 0x4 -_08098CD0: .4byte gPokemonStorageSystemPtr -_08098CD4: .4byte 0x00001050 -_08098CD8: - ldr r0, _08098D18 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - mov r2, r8 - lsls r1, r2, 2 - ldr r3, _08098D1C @ =0x00001050 - adds r0, r3 - adds r0, r1 - str r4, [r0] -_08098CE8: - adds r6, 0x50 - mov r0, r8 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x5 - bls _08098C70 - mov r1, r9 - lsls r0, r1, 16 - lsrs r7, r0, 16 - cmp r7, 0x4 - bls _08098C6A - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08098D18: .4byte gPokemonStorageSystemPtr -_08098D1C: .4byte 0x00001050 - thumb_func_end sub_8098C48 - - thumb_func_start sub_8098D20 -sub_8098D20: @ 8098D20 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r4, r0, 24 - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r2, r1, 4 - subs r2, r1 - lsls r2, 5 - lsls r0, r4, 2 - mov r9, r0 - adds r0, r4 - lsls r0, 4 - ldr r1, _08098DD4 @ =gPokemonStorage + 0x4 - adds r0, r1 - adds r7, r2, r0 - adds r0, r7, 0 - movs r1, 0x41 - bl GetBoxMonData - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - cmp r0, 0 - beq _08098DC4 - adds r0, r4, 0 - movs r1, 0x6 - bl __umodsi3 - adds r6, r0, 0 - lsls r0, r6, 24 - lsrs r0, 24 - lsls r5, r0, 1 - adds r5, r0 - lsls r5, 19 - movs r1, 0xC8 - lsls r1, 15 - adds r5, r1 - lsrs r5, 16 - adds r0, r4, 0 - movs r1, 0x6 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 19 - movs r2, 0xB0 - lsls r2, 14 - adds r4, r2 - lsrs r4, 16 - adds r0, r7, 0 - movs r1, 0 - bl GetBoxMonData - adds r1, r0, 0 - movs r0, 0x2 - str r0, [sp] - movs r0, 0x12 - subs r0, r6 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x4] - mov r0, r8 - adds r2, r5, 0 - adds r3, r4, 0 - bl sub_8099AFC - ldr r1, _08098DD8 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _08098DDC @ =0x00001050 - adds r1, r2 - add r1, r9 - str r0, [r1] -_08098DC4: - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08098DD4: .4byte gPokemonStorage + 0x4 -_08098DD8: .4byte gPokemonStorageSystemPtr -_08098DDC: .4byte 0x00001050 - thumb_func_end sub_8098D20 - - thumb_func_start sub_8098DE0 -sub_8098DE0: @ 8098DE0 - push {r4-r6,lr} - lsls r0, 16 - lsrs r4, r0, 16 - movs r2, 0 - ldr r0, _08098E18 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08098E1C @ =0x00001050 - adds r3, r0, r1 - movs r6, 0x1 - ldr r5, _08098E20 @ =sub_8098E68 -_08098DF4: - lsls r0, r2, 2 - adds r1, r3, r0 - ldr r0, [r1] - cmp r0, 0 - beq _08098E08 - strh r4, [r0, 0x32] - ldr r0, [r1] - strh r6, [r0, 0x36] - ldr r0, [r1] - str r5, [r0, 0x1C] -_08098E08: - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x1D - bls _08098DF4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08098E18: .4byte gPokemonStorageSystemPtr -_08098E1C: .4byte 0x00001050 -_08098E20: .4byte sub_8098E68 - thumb_func_end sub_8098DE0 - - thumb_func_start sub_8098E24 -sub_8098E24: @ 8098E24 - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x30] - movs r3, 0x30 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _08098E40 - subs r0, r1, 0x1 - strh r0, [r2, 0x30] - ldrh r0, [r2, 0x32] - ldrh r1, [r2, 0x20] - adds r0, r1 - strh r0, [r2, 0x20] - b _08098E56 -_08098E40: - ldr r0, _08098E5C @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r3, _08098E60 @ =0x00001178 - adds r1, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - ldrh r0, [r2, 0x34] - strh r0, [r2, 0x20] - ldr r0, _08098E64 @ =SpriteCallbackDummy - str r0, [r2, 0x1C] -_08098E56: - pop {r0} - bx r0 - .align 2, 0 -_08098E5C: .4byte gPokemonStorageSystemPtr -_08098E60: .4byte 0x00001178 -_08098E64: .4byte SpriteCallbackDummy - thumb_func_end sub_8098E24 - - thumb_func_start sub_8098E68 -sub_8098E68: @ 8098E68 - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x36] - movs r3, 0x36 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _08098E7C - subs r0, r1, 0x1 - strh r0, [r2, 0x36] - b _08098E98 -_08098E7C: - ldrh r0, [r2, 0x32] - ldrh r1, [r2, 0x20] - adds r0, r1 - strh r0, [r2, 0x20] - ldrh r1, [r2, 0x24] - adds r0, r1 - strh r0, [r2, 0x38] - subs r0, 0x45 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xB6 - bls _08098E98 - ldr r0, _08098E9C @ =SpriteCallbackDummy - str r0, [r2, 0x1C] -_08098E98: - pop {r0} - bx r0 - .align 2, 0 -_08098E9C: .4byte SpriteCallbackDummy - thumb_func_end sub_8098E68 - thumb_func_start sub_8098EA0 sub_8098EA0: @ 8098EA0 push {r4-r7,lr} @@ -443,7 +133,7 @@ _08098F42: adds r0, r5, 0 ldr r4, [sp, 0x1C] asrs r2, r4, 16 - bl sub_8099AFC + bl PSS_SpawnMonIconSprite ldr r2, [sp, 0x20] adds r1, r2, r7 str r0, [r1] @@ -772,7 +462,7 @@ sub_8099200: @ 8099200 adds r0, r5, 0 movs r2, 0x68 movs r3, 0x40 - bl sub_8099AFC + bl PSS_SpawnMonIconSprite ldr r1, _080992A4 @ =gPokemonStorageSystemPtr ldr r1, [r1] ldr r2, _080992A8 @ =0x00001038 @@ -811,7 +501,7 @@ _08099246: str r0, [sp, 0x4] adds r0, r5, 0 movs r2, 0x98 - bl sub_8099AFC + bl PSS_SpawnMonIconSprite ldr r1, _080992A4 @ =gPokemonStorageSystemPtr ldr r1, [r1] lsls r2, r6, 2 @@ -1957,8 +1647,8 @@ _08099AF6: bx r0 thumb_func_end sub_8099AAC - thumb_func_start sub_8099AFC -sub_8099AFC: @ 8099AFC + thumb_func_start PSS_SpawnMonIconSprite +PSS_SpawnMonIconSprite: @ 8099AFC push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -2065,7 +1755,7 @@ _08099BD0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8099AFC + thumb_func_end PSS_SpawnMonIconSprite thumb_func_start sub_8099BE0 sub_8099BE0: @ 8099BE0 @@ -2114,7 +1804,7 @@ sub_8099BF8: @ 8099BF8 bl sub_809A23C bl sub_809A6DC adds r0, r4, 0 - bl sub_8098C48 + bl SpawnBoxIconSprites ldr r1, _08099C68 @ =REG_BG2CNT ldr r2, _08099C6C @ =0x00005a0a adds r0, r2, 0 diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 7f16b5d4f..26c1b140d 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -96,12 +96,14 @@ struct PokemonStorageSystemData { s16 unk_0d60; u8 filler_0d62[0x2d2]; struct Sprite *unk_1034; - u32 unk_1038[6]; - u32 unk_1050[30]; + struct Sprite *unk_1038[6]; + struct Sprite *unk_1050[30]; u8 filler_10c8[8]; u16 unk_10d0[40]; u16 unk_1120[40]; - u8 filler_1170[0x78]; + u8 filler_1170[8]; + u16 unk_1178; + u8 filler_117a[0x6e]; u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; @@ -154,7 +156,7 @@ void sub_8096310(void); void sub_80961A8(void); void task_intro_29(u8 whichMenu); void ResetPokemonStorageSystem(void); -void sub_8098B48(void); +void ResetPSSMonIconSprites(void); void sub_8099200(u8 a0); void sub_8099310(void); bool8 sub_8099374(void); diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index 2947562d0..dbb1cf992 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -217,7 +217,7 @@ void sub_8096884(void) gMain.state++; break; case 4: - sub_8098B48(); + ResetPSSMonIconSprites(); sub_809AA24(); gMain.state++; break; @@ -280,7 +280,7 @@ void sub_80969A0(void) gMain.state++; break; case 4: - sub_8098B48(); + ResetPSSMonIconSprites(); sub_809AA98(); gMain.state++; break; diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index eff542756..e1ccd107f 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -1,6 +1,7 @@ // Includes #include "global.h" +#include "constants/species.h" #include "sprite.h" #include "pokemon_icon.h" #include "pokemon_storage_system.h" @@ -11,8 +12,9 @@ // Static ROM declarations +void sub_8098E68(struct Sprite *sprite); void sub_80999C4(struct Sprite *sprite); -struct Sprite *sub_8099AFC(u16 species, u32 personality, u16 a2, u16 a3, u8 a4, u8 a5); +struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 a2, s16 a3, u8 a4, u8 a5); // .rodata @@ -39,7 +41,7 @@ u8 get_preferred_box(void) return gPokemonStorage.currentBox; } -void sub_8098B48(void) +void ResetPSSMonIconSprites(void) { u16 i; @@ -49,9 +51,9 @@ void sub_8098B48(void) for (i = 0; i < 40; i++) gPokemonStorageSystemPtr->unk_1120[i] = 0; for (i = 0; i < 6; i++) - gPokemonStorageSystemPtr->unk_1038[i] = 0; + gPokemonStorageSystemPtr->unk_1038[i] = NULL; for (i = 0; i < 30; i++) - gPokemonStorageSystemPtr->unk_1050[i] = 0; + gPokemonStorageSystemPtr->unk_1050[i] = NULL; gPokemonStorageSystemPtr->unk_1034 = NULL; gPokemonStorageSystemPtr->unk_0d5c = 0; } @@ -59,6 +61,83 @@ void sub_8098B48(void) void sub_8098BF0(void) { u32 personality = GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_PERSONALITY); - gPokemonStorageSystemPtr->unk_1034 = sub_8099AFC(GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_SPECIES2), personality, 0, 0, 1, 7); + gPokemonStorageSystemPtr->unk_1034 = PSS_SpawnMonIconSprite(GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_SPECIES2), personality, 0, 0, 1, 7); gPokemonStorageSystemPtr->unk_1034->callback = sub_80999C4; } + +void SpawnBoxIconSprites(u8 boxId) +{ + struct BoxPokemon *box = gPokemonStorage.boxes[boxId]; + u16 i; + u16 k = 0; + for (i = 0; i < 5; i++) + { + u16 j; + for (j = 0; j < 6; j++) + { + u16 species = GetBoxMonData(box, MON_DATA_SPECIES2); + if (species != SPECIES_NONE) + gPokemonStorageSystemPtr->unk_1050[k] = PSS_SpawnMonIconSprite(species, GetBoxMonData(box, MON_DATA_PERSONALITY), 24 * j + 0x64, 24 * i + 0x2c, 2, 18 - j); + else + gPokemonStorageSystemPtr->unk_1050[k] = NULL; + box++; + k++; + } + } +} + +void sub_8098D20(u8 monId) +{ + struct BoxPokemon *mon = gPokemonStorage.boxes[get_preferred_box()] + monId; + u16 species = GetBoxMonData(mon, MON_DATA_SPECIES2); + if (species != SPECIES_NONE) + { + s16 x = 24 * (monId % 6) + 0x64; + s16 y = 24 * (monId / 6) + 0x2c; + gPokemonStorageSystemPtr->unk_1050[monId] = PSS_SpawnMonIconSprite(species, GetBoxMonData(mon, MON_DATA_PERSONALITY), x, y, 2, 18 - (monId % 6)); + } +} + +void sub_8098DE0(s16 a0) +{ + u16 monId; + for (monId = 0; monId < 30; monId++) + { + if (gPokemonStorageSystemPtr->unk_1050[monId]) + { + gPokemonStorageSystemPtr->unk_1050[monId]->data[2] = a0; + gPokemonStorageSystemPtr->unk_1050[monId]->data[4] = 1; + gPokemonStorageSystemPtr->unk_1050[monId]->callback = sub_8098E68; + } + } +} + +void sub_8098E24(struct Sprite *sprite) +{ + if (sprite->data[1] != 0) + { + sprite->data[1]--; + sprite->pos1.x += sprite->data[2]; + } + else + { + gPokemonStorageSystemPtr->unk_1178--; + sprite->pos1.x = sprite->data[3]; + sprite->callback = SpriteCallbackDummy; + } +} + +void sub_8098E68(struct Sprite *sprite) +{ + if (sprite->data[4] != 0) + { + sprite->data[4]--; + } + else + { + sprite->pos1.x += sprite->data[2]; + sprite->data[5] = sprite->pos1.x + sprite->pos2.x; + if (sprite->data[5] < 0x45 || sprite->data[5] > 0xfb) + sprite->callback = SpriteCallbackDummy; + } +} -- cgit v1.2.3 From 4ae149b93441ffce560f3b7018842bc4c5d39326 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 22:52:37 -0500 Subject: through sub_8098EE0 --- asm/pokemon_storage_system.s | 185 --------------------------------- include/pokemon_storage_system.h | 4 +- src/pokemon/pokemon_storage_system_3.c | 52 +++++++++ 3 files changed, 55 insertions(+), 186 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 90b8caa5c..3f9795384 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,191 +5,6 @@ .text - thumb_func_start sub_8098EA0 -sub_8098EA0: @ 8098EA0 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r6, 0 - ldr r0, _08098ED8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08098EDC @ =0x00001050 - adds r7, r0, r1 -_08098EB0: - lsls r0, r5, 2 - adds r4, r7, r0 - ldr r0, [r4] - cmp r0, 0 - beq _08098EC2 - bl sub_8099BE0 - movs r0, 0 - str r0, [r4] -_08098EC2: - adds r0, r5, 0x6 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x4 - bls _08098EB0 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08098ED8: .4byte gPokemonStorageSystemPtr -_08098EDC: .4byte 0x00001050 - thumb_func_end sub_8098EA0 - - thumb_func_start sub_8098EE0 -sub_8098EE0: @ 8098EE0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x24 - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp, 0x8] - lsls r2, 16 - movs r0, 0x2C - str r0, [sp, 0x10] - lsls r0, r6, 1 - adds r0, r6 - lsls r0, 19 - movs r1, 0xC8 - lsls r1, 15 - adds r0, r1 - lsrs r0, 16 - mov r10, r0 - ldr r0, [sp, 0x8] - adds r0, 0x1 - lsrs r3, r2, 16 - str r3, [sp, 0xC] - asrs r2, 16 - adds r1, r0, 0 - muls r1, r2 - mov r4, r10 - subs r1, r4, r1 - movs r0, 0x12 - subs r0, r6 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x18] - movs r0, 0 - str r0, [sp, 0x14] - mov r9, r0 - ldr r0, _08098FF8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r2, _08098FFC @ =0x0000117d - adds r2, r0 - mov r8, r2 - ldr r3, _08099000 @ =0x00001050 - adds r3, r0, r3 - str r3, [sp, 0x20] - lsls r1, 16 - str r1, [sp, 0x1C] -_08098F42: - mov r4, r8 - ldrb r0, [r4] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - lsls r7, r6, 2 - adds r1, r7, r6 - lsls r1, 4 - ldr r2, _08099004 @ =gPokemonStorage + 0x4 - adds r4, r1, r2 - adds r0, r4 - movs r1, 0x41 - bl GetBoxMonData - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - beq _08098FC8 - mov r1, r8 - ldrb r0, [r1] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - adds r0, r4 - movs r1, 0 - bl GetBoxMonData - adds r1, r0, 0 - ldr r2, [sp, 0x10] - lsls r3, r2, 16 - asrs r3, 16 - movs r0, 0x2 - str r0, [sp] - ldr r4, [sp, 0x18] - str r4, [sp, 0x4] - adds r0, r5, 0 - ldr r4, [sp, 0x1C] - asrs r2, r4, 16 - bl PSS_SpawnMonIconSprite - ldr r2, [sp, 0x20] - adds r1, r2, r7 - str r0, [r1] - cmp r0, 0 - beq _08098FC8 - mov r3, sp - ldrh r3, [r3, 0x8] - strh r3, [r0, 0x30] - ldr r0, [r1] - mov r4, sp - ldrh r4, [r4, 0xC] - strh r4, [r0, 0x32] - ldr r0, [r1] - mov r2, r10 - strh r2, [r0, 0x34] - ldr r1, [r1] - ldr r0, _08099008 @ =sub_8098E24 - str r0, [r1, 0x1C] - ldr r0, [sp, 0x14] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x14] -_08098FC8: - adds r0, r6, 0x6 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, [sp, 0x10] - adds r0, 0x18 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x10] - mov r0, r9 - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - cmp r0, 0x4 - bls _08098F42 - ldr r0, [sp, 0x14] - add sp, 0x24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08098FF8: .4byte gPokemonStorageSystemPtr -_08098FFC: .4byte 0x0000117d -_08099000: .4byte 0x00001050 -_08099004: .4byte gPokemonStorage + 0x4 -_08099008: .4byte sub_8098E24 - thumb_func_end sub_8098EE0 - thumb_func_start sub_809900C sub_809900C: @ 809900C push {r4-r6,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 26c1b140d..295084eea 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -103,7 +103,9 @@ struct PokemonStorageSystemData { u16 unk_1120[40]; u8 filler_1170[8]; u16 unk_1178; - u8 filler_117a[0x6e]; + u8 filler_117a[3]; + u8 unk_117d; + u8 filler_117e[0x6a]; u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index e1ccd107f..77d85de65 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -15,6 +15,7 @@ void sub_8098E68(struct Sprite *sprite); void sub_80999C4(struct Sprite *sprite); struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 a2, s16 a3, u8 a4, u8 a5); +void sub_8099BE0(struct Sprite *sprite); // .rodata @@ -141,3 +142,54 @@ void sub_8098E68(struct Sprite *sprite) sprite->callback = SpriteCallbackDummy; } } + +void sub_8098EA0(u8 col) +{ + u16 i; + + for (i = 0; i < 5; i++) + { + if (gPokemonStorageSystemPtr->unk_1050[col]) + { + sub_8099BE0(gPokemonStorageSystemPtr->unk_1050[col]); + gPokemonStorageSystemPtr->unk_1050[col] = NULL; + } + col += 6; + } +} + +u8 sub_8098EE0(u8 a0, u16 a1, s16 a2) +{ + u16 i; + u16 x; + u16 y; + u8 count; + u8 x1; + u16 sp1c; + + y = 0x2c; + x = 24 * a0 + 0x64; + sp1c = x - (a1 + 1) * a2; + x1 = 18 - a0; + count = 0; + + for (i = 0; i < 5; i++) + { + u16 species = GetBoxMonData(gPokemonStorage.boxes[gPokemonStorageSystemPtr->unk_117d] + a0, MON_DATA_SPECIES2); + if (species != SPECIES_NONE) + { + gPokemonStorageSystemPtr->unk_1050[a0] = PSS_SpawnMonIconSprite(species, GetBoxMonData(gPokemonStorage.boxes[gPokemonStorageSystemPtr->unk_117d] + a0, MON_DATA_PERSONALITY), sp1c, y, 2, x1); + if (gPokemonStorageSystemPtr->unk_1050[a0]) + { + gPokemonStorageSystemPtr->unk_1050[a0]->data[1] = a1; + gPokemonStorageSystemPtr->unk_1050[a0]->data[2] = a2; + gPokemonStorageSystemPtr->unk_1050[a0]->data[3] = x; + gPokemonStorageSystemPtr->unk_1050[a0]->callback = sub_8098E24; + count++; + } + } + a0 += 6; + y += 24; + } + return count; +} -- cgit v1.2.3 From cb28e3a679841c01191f19cb7e7f0da28f0bf160 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 9 Jan 2018 23:05:21 -0500 Subject: sub_809900C --- asm/pokemon_storage_system.s | 77 ---------------------------------- include/pokemon_storage_system.h | 9 +++- src/pokemon/pokemon_storage_system_3.c | 16 +++++++ 3 files changed, 23 insertions(+), 79 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 3f9795384..3c4a03ad5 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,83 +5,6 @@ .text - thumb_func_start sub_809900C -sub_809900C: @ 809900C - push {r4-r6,lr} - lsls r1, 24 - lsrs r1, 24 - ldr r4, _08099058 @ =gPokemonStorageSystemPtr - ldr r5, [r4] - ldr r3, _0809905C @ =0x0000117c - adds r2, r5, r3 - movs r3, 0 - strb r3, [r2] - ldr r6, _08099060 @ =0x0000117d - adds r2, r5, r6 - strb r0, [r2] - ldr r2, _08099064 @ =0x0000117b - adds r0, r5, r2 - strb r1, [r0] - subs r6, 0xB - adds r2, r5, r6 - movs r0, 0x20 - strh r0, [r2] - lsls r1, 24 - asrs r1, 24 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - negs r0, r0 - adds r6, 0x4 - adds r2, r5, r6 - strh r0, [r2] - ldr r2, _08099068 @ =0x00001178 - adds r0, r5, r2 - strh r3, [r0] - cmp r1, 0 - ble _08099070 - ldr r3, _0809906C @ =0x0000117a - adds r1, r5, r3 - movs r0, 0 - b _08099076 - .align 2, 0 -_08099058: .4byte gPokemonStorageSystemPtr -_0809905C: .4byte 0x0000117c -_08099060: .4byte 0x0000117d -_08099064: .4byte 0x0000117b -_08099068: .4byte 0x00001178 -_0809906C: .4byte 0x0000117a -_08099070: - ldr r6, _080990A0 @ =0x0000117a - adds r1, r5, r6 - movs r0, 0x5 -_08099076: - strb r0, [r1] - ldr r2, [r4] - ldr r1, _080990A0 @ =0x0000117a - adds r0, r2, r1 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - adds r0, 0x64 - ldr r3, _080990A4 @ =0x00001174 - adds r1, r2, r3 - strh r0, [r1] - ldr r6, _080990A8 @ =0x00001176 - adds r2, r6 - movs r1, 0 - ldrsh r0, [r2, r1] - bl sub_8098DE0 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080990A0: .4byte 0x0000117a -_080990A4: .4byte 0x00001174 -_080990A8: .4byte 0x00001176 - thumb_func_end sub_809900C - thumb_func_start sub_80990AC sub_80990AC: @ 80990AC push {r4-r6,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 295084eea..0f20bfa16 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -101,9 +101,14 @@ struct PokemonStorageSystemData { u8 filler_10c8[8]; u16 unk_10d0[40]; u16 unk_1120[40]; - u8 filler_1170[8]; + u8 filler_1170[2]; + u16 unk_1172; + u16 unk_1174; + s16 unk_1176; u16 unk_1178; - u8 filler_117a[3]; + u8 unk_117a; + u8 unk_117b; + u8 unk_117c; u8 unk_117d; u8 filler_117e[0x6a]; u8 *unk_11e8; diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index 77d85de65..af050d324 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -193,3 +193,19 @@ u8 sub_8098EE0(u8 a0, u16 a1, s16 a2) } return count; } + +void sub_809900C(u8 a0, s8 a1) +{ + gPokemonStorageSystemPtr->unk_117c = 0; + gPokemonStorageSystemPtr->unk_117d = a0; + gPokemonStorageSystemPtr->unk_117b = a1; + gPokemonStorageSystemPtr->unk_1172 = 32; + gPokemonStorageSystemPtr->unk_1176 = -6 * a1; + gPokemonStorageSystemPtr->unk_1178 = 0; + if (a1 > 0) + gPokemonStorageSystemPtr->unk_117a = 0; + else + gPokemonStorageSystemPtr->unk_117a = 5; + gPokemonStorageSystemPtr->unk_1174 = 24 * gPokemonStorageSystemPtr->unk_117a + 0x64; + sub_8098DE0(gPokemonStorageSystemPtr->unk_1176); +} -- cgit v1.2.3 From cf7ffa568a2a09c761bae6aa4c70b8d8913c3e81 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 23:37:26 -0600 Subject: rename unknown_task to scanline_effect --- include/scanline_effect.h | 42 +++++++ include/unknown_task.h | 42 ------- ld_script.txt | 2 +- src/battle/anim/draw.c | 2 +- src/battle/battle_2.c | 2 +- src/battle/battle_transition.c | 2 +- src/battle/reshow_battle_screen.c | 2 +- src/contest.c | 2 +- src/debug/matsuda_debug_menu.c | 2 +- src/easy_chat_1.c | 2 +- src/easy_chat_2.c | 2 +- src/engine/main.c | 2 +- src/engine/main_menu.c | 2 +- src/engine/reset_rtc_screen.c | 2 +- src/engine/trainer_card.c | 2 +- src/field/diploma.c | 2 +- src/field/field_screen_effect.c | 2 +- src/field/item_menu.c | 2 +- src/field/overworld.c | 2 +- src/field/party_menu.c | 2 +- src/field/pokeblock.c | 2 +- src/field/shop.c | 2 +- src/field/start_menu.c | 2 +- src/field/starter_choose.c | 2 +- src/field/wallclock.c | 2 +- src/pokemon/mail.c | 2 +- src/pokemon/pokedex.c | 2 +- src/pokemon/pokemon_summary_screen.c | 2 +- src/pokenav_before.c | 2 +- src/roulette.c | 2 +- src/scanline_effect.c | 235 +++++++++++++++++++++++++++++++++++ src/scene/cable_car.c | 2 +- src/scene/contest_painting.c | 2 +- src/scene/evolution_scene.c | 2 +- src/scene/intro.c | 2 +- src/scene/intro_credits_graphics.c | 2 +- src/scene/title_screen.c | 2 +- src/unknown_task.c | 235 ----------------------------------- 38 files changed, 311 insertions(+), 311 deletions(-) create mode 100644 include/scanline_effect.h delete mode 100644 include/unknown_task.h create mode 100644 src/scanline_effect.c delete mode 100644 src/unknown_task.c diff --git a/include/scanline_effect.h b/include/scanline_effect.h new file mode 100644 index 000000000..011e5f5b5 --- /dev/null +++ b/include/scanline_effect.h @@ -0,0 +1,42 @@ +#ifndef GUARD_UNKNOWN_TASK_H +#define GUARD_UNKNOWN_TASK_H + +struct UnknownTaskStruct +{ + volatile void *dest; + u32 control; + u8 unk8; + u8 unk9; +}; + +struct UnknownTaskStruct2 +{ + void *src[2]; + volatile void *dest; + u32 unkC; + void (*unk10)(void); + u8 srcBank; + u8 unk15; + u8 unk16; + u8 unk17; + u8 taskId; + u8 filler19[0x7]; +}; + +extern struct UnknownTaskStruct2 gUnknown_03004DC0; + +extern u16 gUnknown_03004DE0[][0x3C0]; + +void remove_some_task(void); +void remove_some_task(void); +void dp12_8087EA4(void); +void dp12_8087EA4(void); +//void sub_80895F8(u32 i, u32 i1, u32 i2); +//void sub_80895F8(); +void sub_80895F8(struct UnknownTaskStruct unk); +void sub_8089668(void); +void sub_8089668(); +//void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6); +u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); + +#endif // GUARD_UNKNOWN_TASK_H diff --git a/include/unknown_task.h b/include/unknown_task.h deleted file mode 100644 index 011e5f5b5..000000000 --- a/include/unknown_task.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef GUARD_UNKNOWN_TASK_H -#define GUARD_UNKNOWN_TASK_H - -struct UnknownTaskStruct -{ - volatile void *dest; - u32 control; - u8 unk8; - u8 unk9; -}; - -struct UnknownTaskStruct2 -{ - void *src[2]; - volatile void *dest; - u32 unkC; - void (*unk10)(void); - u8 srcBank; - u8 unk15; - u8 unk16; - u8 unk17; - u8 taskId; - u8 filler19[0x7]; -}; - -extern struct UnknownTaskStruct2 gUnknown_03004DC0; - -extern u16 gUnknown_03004DE0[][0x3C0]; - -void remove_some_task(void); -void remove_some_task(void); -void dp12_8087EA4(void); -void dp12_8087EA4(void); -//void sub_80895F8(u32 i, u32 i1, u32 i2); -//void sub_80895F8(); -void sub_80895F8(struct UnknownTaskStruct unk); -void sub_8089668(void); -void sub_8089668(); -//void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6); -u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); - -#endif // GUARD_UNKNOWN_TASK_H diff --git a/ld_script.txt b/ld_script.txt index c8ede2726..9b385d3b8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -119,7 +119,7 @@ SECTIONS { src/field/trainer_see.o(.text); src/field/wild_encounter.o(.text); src/field/field_effect.o(.text); - src/unknown_task.o(.text); + src/scanline_effect.o(.text); src/pokemon/pokemon_menu.o(.text); src/engine/option_menu.o(.text); src/pokemon/pokedex.o(.text); diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index 3adb62e06..0508eed8c 100755 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -3,7 +3,7 @@ #include "trig.h" #include "battle_anim.h" #include "sound.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 249b67e0d..20daf4052 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -34,7 +34,7 @@ #include "trainer.h" #include "trig.h" #include "tv.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "util.h" #include "constants/battle_move_effects.h" #include "constants/items.h" diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index 985f43945..48ef86fa2 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -13,7 +13,7 @@ #include "trainer.h" #include "field_camera.h" #include "ewram.h" -#include "unknown_task.h" +#include "scanline_effect.h" void sub_807DE10(void); void dp12_8087EA4(void); diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 42bb3ba7f..83dad5f60 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -3,7 +3,7 @@ #include "battle_anim.h" #include "palette.h" #include "main.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "text.h" #include "rom_8077ABC.h" #include "data2.h" diff --git a/src/contest.c b/src/contest.c index 8985d6490..9f8fe976a 100644 --- a/src/contest.c +++ b/src/contest.c @@ -29,7 +29,7 @@ #include "task.h" #include "text.h" #include "tv.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "util.h" extern u8 AreMovesContestCombo(u16, u16); // I don't think this is a bool diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 0585c4e00..25890e3ea 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -14,7 +14,7 @@ #include "string_util.h" #include "task.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" extern u8 gUnknown_0203856C; diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index cb0e98b71..a5fc1dee9 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -14,7 +14,7 @@ #include "sprite.h" #include "string_util.h" #include "strings.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern const struct WindowTemplate gWindowTemplate_81E6D54; extern const struct WindowTemplate gWindowTemplate_81E6DA8; diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 66af7fc04..48e005cab 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -17,7 +17,7 @@ #include "strings.h" #include "strings2.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern void sub_8095C8C(); extern void sub_809D104(void *, u16, u16, const void *, u16, u16, u16, u16); diff --git a/src/engine/main.c b/src/engine/main.c index 82a5fffb4..d1ccffea0 100644 --- a/src/engine/main.c +++ b/src/engine/main.c @@ -13,7 +13,7 @@ #include "rtc.h" #include "siirtc.h" #include "sound.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern struct SoundInfo gSoundInfo; extern u32 IntrMain[]; diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 715570fe0..3402d93bc 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -21,7 +21,7 @@ #include "task.h" #include "text.h" #include "title_screen.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" #define BirchSpeechUpdateWindowText() ((u8)Menu_UpdateWindowTextOverrideLineLength(24)) diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 6e9efd342..5297b3378 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -13,7 +13,7 @@ #include "strings2.h" #include "task.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" struct ResetRtcStruct { diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index 70942fc29..f1b115610 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -18,7 +18,7 @@ #include "string_util.h" #include "strings2.h" #include "task.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "util.h" #include "ewram.h" diff --git a/src/field/diploma.c b/src/field/diploma.c index 7028eec02..70e4e4349 100644 --- a/src/field/diploma.c +++ b/src/field/diploma.c @@ -10,7 +10,7 @@ #include "strings2.h" #include "task.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" static void VBlankCB(void); static void MainCB2(void); diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c index 6e818ce68..5f5113a2f 100644 --- a/src/field/field_screen_effect.c +++ b/src/field/field_screen_effect.c @@ -7,7 +7,7 @@ #include "script.h" #include "task.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 }; diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 2be5f1e1d..fe896ac51 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -33,7 +33,7 @@ #include "string_util.h" #include "task.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" // External stuff diff --git a/src/field/overworld.c b/src/field/overworld.c index 9fab20876..75e3aa6d5 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -47,7 +47,7 @@ #include "tileset_anim.h" #include "time_events.h" #include "tv.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "wild_encounter.h" #ifdef SAPPHIRE diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 9cad5bd73..7e443a116 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -32,7 +32,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "util.h" #include "script_pokemon_80F9.h" #include "ewram.h" diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index dd94e1755..ea96a4efd 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -8,7 +8,7 @@ #include "script.h" #include "strings.h" #include "task.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "text.h" #include "main.h" #include "menu.h" diff --git a/src/field/shop.c b/src/field/shop.c index d56d65c3f..a3e361733 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -15,7 +15,7 @@ #include "strings.h" #include "task.h" #include "tv.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "field_map_obj.h" #include "field_player_avatar.h" #include "fieldmap.h" diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 5b2276d1b..d7d0282c6 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -28,7 +28,7 @@ #include "strings2.h" #include "task.h" #include "trainer_card.h" -#include "unknown_task.h" +#include "scanline_effect.h" //Menu actions enum { diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index 91b706e78..d3cfba1e3 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -14,7 +14,7 @@ #include "strings.h" #include "task.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern u16 gSpecialVar_Result; extern struct SpriteTemplate gUnknown_02024E8C; diff --git a/src/field/wallclock.c b/src/field/wallclock.c index 4f2a6dccd..bc12db819 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -10,7 +10,7 @@ #include "strings2.h" #include "task.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern u16 gSpecialVar_0x8004; extern u8 gMiscClock_Gfx[]; diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index ab43c033a..95424e890 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -15,7 +15,7 @@ #include "strings2.h" #include "task.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" struct UnkMailStruct diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 48ce26bb8..306cac3c9 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -23,7 +23,7 @@ #include "strings.h" #include "task.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" #define NATIONAL_DEX_COUNT 386 diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index d98383c6d..4e2be1418 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -29,7 +29,7 @@ #include "strings2.h" #include "task.h" #include "tv.h" -#include "unknown_task.h" +#include "scanline_effect.h" static void sub_809FC0C(void); static void sub_809FEB8(void); diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 3b534c96c..fb197cee2 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -18,7 +18,7 @@ #include "sound.h" #include "task.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern u8 ewram[]; diff --git a/src/roulette.c b/src/roulette.c index e88c36c01..ae16b1460 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -23,7 +23,7 @@ #include "task.h" #include "text.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" asm(".include \"constants/gba_constants.inc\""); diff --git a/src/scanline_effect.c b/src/scanline_effect.c new file mode 100644 index 000000000..670f2d9b3 --- /dev/null +++ b/src/scanline_effect.c @@ -0,0 +1,235 @@ +#include "global.h" +#include "data2.h" +#include "task.h" +#include "trig.h" +#include "scanline_effect.h" + +static void sub_80896F4(void); +static void sub_8089714(void); + +extern u16 gUnknown_030041B0; +extern u16 gBattle_BG1_Y; +extern u16 gUnknown_030041B8; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG1_X; + +extern u8 gUnknown_0202FFA4; + +extern struct UnknownTaskStruct2 gUnknown_03004DC0; + +// Is this a struct? +extern u16 gUnknown_03004DE0[][0x3C0]; + +void remove_some_task(void) +{ + gUnknown_03004DC0.unk15 = 0; + DmaStop(0); + if (gUnknown_03004DC0.taskId != 0xFF) + { + DestroyTask(gUnknown_03004DC0.taskId); + gUnknown_03004DC0.taskId = 0xFF; + } +} + +void dp12_8087EA4(void) +{ + CpuFill16(0, gUnknown_03004DE0, 0x780 * 2); + gUnknown_03004DC0.src[0] = 0; + gUnknown_03004DC0.src[1] = 0; + gUnknown_03004DC0.dest = 0; + gUnknown_03004DC0.unkC = 0; + gUnknown_03004DC0.srcBank = 0; + gUnknown_03004DC0.unk15 = 0; + gUnknown_03004DC0.unk16 = 0; + gUnknown_03004DC0.unk17 = 0; + gUnknown_03004DC0.taskId = 0xFF; +} + +void sub_80895F8(struct UnknownTaskStruct unk) +{ + if (unk.control == (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1)) + { + gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][1]; + gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][1]; + gUnknown_03004DC0.unk10 = sub_80896F4; + } + else + { + gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][2]; + gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][2]; + gUnknown_03004DC0.unk10 = sub_8089714; + } + + gUnknown_03004DC0.unkC = unk.control; + gUnknown_03004DC0.dest = unk.dest; + gUnknown_03004DC0.unk15 = unk.unk8; + gUnknown_03004DC0.unk16 = unk.unk9; + gUnknown_03004DC0.unk17 = unk.unk9; +} + +void sub_8089668(void) +{ + if (gUnknown_03004DC0.unk15) + { + if (gUnknown_03004DC0.unk15 == 3) + { + gUnknown_03004DC0.unk15 = 0; + DmaStop(0); + gUnknown_0202FFA4 = 1; + } + else + { + DmaStop(0); + DmaSet(0, gUnknown_03004DC0.src[gUnknown_03004DC0.srcBank], gUnknown_03004DC0.dest, gUnknown_03004DC0.unkC); + gUnknown_03004DC0.unk10(); + gUnknown_03004DC0.srcBank ^= 1; + } + } +} + +static void sub_80896F4(void) +{ + u16 *dest = (u16 *)gUnknown_03004DC0.dest; + u16 *src = (u16 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; + *dest = *src; +} + +static void sub_8089714(void) +{ + u32 *dest = (u32 *)gUnknown_03004DC0.dest; + u32 *src = (u32 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; + *dest = *src; +} + +static void task00_for_dp12(u8 taskId) +{ + int value = 0; + + if (gUnknown_0202FFA4) + { + DestroyTask(taskId); + gUnknown_03004DC0.taskId = 0xFF; + } + else + { + if (gTasks[taskId].data[7]) + { + switch (gTasks[taskId].data[6]) + { + case 0x0: + value = gBattle_BG0_X; + break; + case 0x2: + value = gBattle_BG0_Y; + break; + case 0x4: + value = gBattle_BG1_X; + break; + case 0x6: + value = gBattle_BG1_Y; + break; + case 0x8: + value = gBattle_BG2_X; + break; + case 0xA: + value = gBattle_BG2_Y; + break; + case 0xC: + value = gUnknown_030041B0; + break; + case 0xE: + value = gUnknown_030041B8; + break; + } + } + if (gTasks[taskId].data[4]) + { + int i; + int offset; + gTasks[taskId].data[4]--; + offset = gTasks[taskId].data[3] + 320; + for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) + { + gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value; + offset++; + } + } + else + { + int i; + int offset; + gTasks[taskId].data[4] = gTasks[taskId].data[5]; + offset = gTasks[taskId].data[3] + 320; + for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) + { + gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value; + offset++; + } + gTasks[taskId].data[3]++; + if (gTasks[taskId].data[3] == gTasks[taskId].data[2]) + { + gTasks[taskId].data[3] = 0; + } + } + } +} + +static void sub_80898FC(u16 *a1, u8 a2, u8 a3, u8 a4) +{ + u16 i = 0; + u8 offset = 0; + + while (i < 0x100) + { + a1[i] = (gSineTable[offset] * a3) / 256; + offset += a2; + i++; + } +} + +u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) +{ + int i; + int offset; + struct UnknownTaskStruct unk; + u8 taskId; + + dp12_8087EA4(); + + unk.dest = (void *)(REG_ADDR_BG0HOFS + a6); + unk.control = ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1; + unk.unk8 = 1; + unk.unk9 = 0; + + sub_80895F8(unk); + + taskId = CreateTask(task00_for_dp12, 0); + + gTasks[taskId].data[0] = a1; + gTasks[taskId].data[1] = a2; + gTasks[taskId].data[2] = 256 / a3; + gTasks[taskId].data[3] = 0; + gTasks[taskId].data[4] = a5; + gTasks[taskId].data[5] = a5; + gTasks[taskId].data[6] = a6; + gTasks[taskId].data[7] = a7; + + gUnknown_03004DC0.taskId = taskId; + gUnknown_0202FFA4 = 0; + + sub_80898FC(&gUnknown_03004DE0[0][320], a3, a4, a2 - a1); + + offset = 320; + + for (i = a1; i < a2; i++) + { + gUnknown_03004DE0[0][i] = gUnknown_03004DE0[0][offset]; + gUnknown_03004DE0[1][i] = gUnknown_03004DE0[0][offset]; + offset++; + } + + return taskId; +} diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 52a0aeebf..bae037ff7 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -14,7 +14,7 @@ #include "decompress.h" #include "field_weather.h" #include "field_map_obj.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "event_data.h" #include "cable_car_util.h" #include "constants/map_objects.h" diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c index 401872644..3b68f0143 100644 --- a/src/scene/contest_painting.c +++ b/src/scene/contest_painting.c @@ -11,7 +11,7 @@ #include "string_util.h" #include "strings.h" #include "text.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" static u8 gUnknown_03000750; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 167130aa5..dcca1fddb 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -9,7 +9,7 @@ #include "pokemon.h" #include "string_util.h" #include "battle.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "data2.h" #include "decompress.h" #include "m4a.h" diff --git a/src/scene/intro.c b/src/scene/intro.c index 4dc6cc91c..beceb6e90 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -19,7 +19,7 @@ #include "task.h" #include "title_screen.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" extern struct SpriteTemplate gUnknown_02024E8C; diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c index 6cee74cce..f0f1264a0 100755 --- a/src/scene/intro_credits_graphics.c +++ b/src/scene/intro_credits_graphics.c @@ -19,7 +19,7 @@ #include "task.h" #include "title_screen.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" // define register constants for the inline asm asm(".include \"constants/gba_constants.inc\"\n"); diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index 26fe088d5..bd41ac641 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -13,7 +13,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" -#include "unknown_task.h" +#include "scanline_effect.h" #if ENGLISH #define VERSION_BANNER_SHAPE 1 diff --git a/src/unknown_task.c b/src/unknown_task.c deleted file mode 100644 index 2c71bfb08..000000000 --- a/src/unknown_task.c +++ /dev/null @@ -1,235 +0,0 @@ -#include "global.h" -#include "data2.h" -#include "task.h" -#include "trig.h" -#include "unknown_task.h" - -static void sub_80896F4(void); -static void sub_8089714(void); - -extern u16 gUnknown_030041B0; -extern u16 gBattle_BG1_Y; -extern u16 gUnknown_030041B8; -extern u16 gBattle_BG2_Y; -extern u16 gBattle_BG2_X; -extern u16 gBattle_BG0_Y; -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG1_X; - -extern u8 gUnknown_0202FFA4; - -extern struct UnknownTaskStruct2 gUnknown_03004DC0; - -// Is this a struct? -extern u16 gUnknown_03004DE0[][0x3C0]; - -void remove_some_task(void) -{ - gUnknown_03004DC0.unk15 = 0; - DmaStop(0); - if (gUnknown_03004DC0.taskId != 0xFF) - { - DestroyTask(gUnknown_03004DC0.taskId); - gUnknown_03004DC0.taskId = 0xFF; - } -} - -void dp12_8087EA4(void) -{ - CpuFill16(0, gUnknown_03004DE0, 0x780 * 2); - gUnknown_03004DC0.src[0] = 0; - gUnknown_03004DC0.src[1] = 0; - gUnknown_03004DC0.dest = 0; - gUnknown_03004DC0.unkC = 0; - gUnknown_03004DC0.srcBank = 0; - gUnknown_03004DC0.unk15 = 0; - gUnknown_03004DC0.unk16 = 0; - gUnknown_03004DC0.unk17 = 0; - gUnknown_03004DC0.taskId = 0xFF; -} - -void sub_80895F8(struct UnknownTaskStruct unk) -{ - if (unk.control == (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1)) - { - gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][1]; - gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][1]; - gUnknown_03004DC0.unk10 = sub_80896F4; - } - else - { - gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][2]; - gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][2]; - gUnknown_03004DC0.unk10 = sub_8089714; - } - - gUnknown_03004DC0.unkC = unk.control; - gUnknown_03004DC0.dest = unk.dest; - gUnknown_03004DC0.unk15 = unk.unk8; - gUnknown_03004DC0.unk16 = unk.unk9; - gUnknown_03004DC0.unk17 = unk.unk9; -} - -void sub_8089668(void) -{ - if (gUnknown_03004DC0.unk15) - { - if (gUnknown_03004DC0.unk15 == 3) - { - gUnknown_03004DC0.unk15 = 0; - DmaStop(0); - gUnknown_0202FFA4 = 1; - } - else - { - DmaStop(0); - DmaSet(0, gUnknown_03004DC0.src[gUnknown_03004DC0.srcBank], gUnknown_03004DC0.dest, gUnknown_03004DC0.unkC); - gUnknown_03004DC0.unk10(); - gUnknown_03004DC0.srcBank ^= 1; - } - } -} - -static void sub_80896F4(void) -{ - u16 *dest = (u16 *)gUnknown_03004DC0.dest; - u16 *src = (u16 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; - *dest = *src; -} - -static void sub_8089714(void) -{ - u32 *dest = (u32 *)gUnknown_03004DC0.dest; - u32 *src = (u32 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; - *dest = *src; -} - -static void task00_for_dp12(u8 taskId) -{ - int value = 0; - - if (gUnknown_0202FFA4) - { - DestroyTask(taskId); - gUnknown_03004DC0.taskId = 0xFF; - } - else - { - if (gTasks[taskId].data[7]) - { - switch (gTasks[taskId].data[6]) - { - case 0x0: - value = gBattle_BG0_X; - break; - case 0x2: - value = gBattle_BG0_Y; - break; - case 0x4: - value = gBattle_BG1_X; - break; - case 0x6: - value = gBattle_BG1_Y; - break; - case 0x8: - value = gBattle_BG2_X; - break; - case 0xA: - value = gBattle_BG2_Y; - break; - case 0xC: - value = gUnknown_030041B0; - break; - case 0xE: - value = gUnknown_030041B8; - break; - } - } - if (gTasks[taskId].data[4]) - { - int i; - int offset; - gTasks[taskId].data[4]--; - offset = gTasks[taskId].data[3] + 320; - for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) - { - gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value; - offset++; - } - } - else - { - int i; - int offset; - gTasks[taskId].data[4] = gTasks[taskId].data[5]; - offset = gTasks[taskId].data[3] + 320; - for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) - { - gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value; - offset++; - } - gTasks[taskId].data[3]++; - if (gTasks[taskId].data[3] == gTasks[taskId].data[2]) - { - gTasks[taskId].data[3] = 0; - } - } - } -} - -static void sub_80898FC(u16 *a1, u8 a2, u8 a3, u8 a4) -{ - u16 i = 0; - u8 offset = 0; - - while (i < 0x100) - { - a1[i] = (gSineTable[offset] * a3) / 256; - offset += a2; - i++; - } -} - -u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) -{ - int i; - int offset; - struct UnknownTaskStruct unk; - u8 taskId; - - dp12_8087EA4(); - - unk.dest = (void *)(REG_ADDR_BG0HOFS + a6); - unk.control = ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1; - unk.unk8 = 1; - unk.unk9 = 0; - - sub_80895F8(unk); - - taskId = CreateTask(task00_for_dp12, 0); - - gTasks[taskId].data[0] = a1; - gTasks[taskId].data[1] = a2; - gTasks[taskId].data[2] = 256 / a3; - gTasks[taskId].data[3] = 0; - gTasks[taskId].data[4] = a5; - gTasks[taskId].data[5] = a5; - gTasks[taskId].data[6] = a6; - gTasks[taskId].data[7] = a7; - - gUnknown_03004DC0.taskId = taskId; - gUnknown_0202FFA4 = 0; - - sub_80898FC(&gUnknown_03004DE0[0][320], a3, a4, a2 - a1); - - offset = 320; - - for (i = a1; i < a2; i++) - { - gUnknown_03004DE0[0][i] = gUnknown_03004DE0[0][offset]; - gUnknown_03004DE0[1][i] = gUnknown_03004DE0[0][offset]; - offset++; - } - - return taskId; -} -- cgit v1.2.3 From f9f0e84b70f1b313200acd6f0d180413e34517da Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 23:55:03 -0600 Subject: label some scanline_effect functions --- asm/battle_anim_812C144.s | 12 ++-- asm/battle_intro.s | 24 ++++---- asm/contest_link_80C2020.s | 2 +- asm/dark.s | 16 +++--- asm/dragon.s | 8 +-- asm/ghost.s | 6 +- asm/ground.s | 8 +-- asm/pokenav.s | 6 +- asm/psychic.s | 4 +- asm/water.s | 18 +++--- include/scanline_effect.h | 22 +++---- src/battle/anim/draw.c | 6 +- src/battle/battle_2.c | 2 +- src/contest.c | 2 +- src/debug/matsuda_debug_menu.c | 2 +- src/easy_chat_1.c | 4 +- src/easy_chat_2.c | 2 +- src/engine/main.c | 2 +- src/engine/main_menu.c | 6 +- src/engine/option_menu.c | 4 +- src/engine/reset_rtc_screen.c | 2 +- src/field/diploma.c | 2 +- src/field/field_screen_effect.c | 6 +- src/field/item_menu.c | 2 +- src/field/overworld.c | 4 +- src/field/party_menu.c | 2 +- src/field/pokeblock.c | 2 +- src/field/shop.c | 2 +- src/field/start_menu.c | 2 +- src/field/starter_choose.c | 2 +- src/field/use_pokeblock.c | 4 +- src/field/wallclock.c | 2 +- src/pokemon/mail.c | 2 +- src/pokemon/pokedex.c | 4 +- src/pokemon/pokemon_summary_screen.c | 2 +- src/pokenav_before.c | 4 +- src/roulette.c | 2 +- src/scanline_effect.c | 107 ++++++++++++++++++----------------- src/scene/cable_car.c | 2 +- src/scene/contest_painting.c | 2 +- src/scene/evolution_scene.c | 6 +- src/scene/hall_of_fame.c | 4 +- src/scene/intro.c | 2 +- src/scene/title_screen.c | 6 +- sym_common.txt | 2 +- 45 files changed, 168 insertions(+), 165 deletions(-) diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 02eec98ec..5fc9199eb 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -1946,7 +1946,7 @@ _0812CFDC: ldrsh r0, [r4, r1] cmp r0, 0 beq _0812CFF2 - ldr r1, _0812D004 @ =gUnknown_03004DC0 + ldr r1, _0812D004 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _0812CFF2: @@ -1958,7 +1958,7 @@ _0812CFF8: bx r0 .align 2, 0 _0812D000: .4byte gUnknown_03004DE0 -_0812D004: .4byte gUnknown_03004DC0 +_0812D004: .4byte gScanlineEffect thumb_func_end sub_812CEF0 thumb_func_start sub_812D008 @@ -6711,7 +6711,7 @@ _0812F4EA: ldrsh r0, [r6, r3] cmp r1, r0 ble _0812F60A - ldr r0, _0812F660 @ =gUnknown_03004DC0 + ldr r0, _0812F660 @ =gScanlineEffect mov r10, r0 ldr r1, [sp, 0x4] lsls r0, r1, 16 @@ -6856,7 +6856,7 @@ _0812F636: strh r0, [r6, 0xE] b _0812F676 .align 2, 0 -_0812F660: .4byte gUnknown_03004DC0 +_0812F660: .4byte gScanlineEffect _0812F664: .4byte gUnknown_03004DE0 _0812F668: .4byte gSineTable _0812F66C: .4byte 0xffff0000 @@ -6898,14 +6898,14 @@ _0812F6A6: asrs r0, 16 cmp r0, 0xC ble _0812F712 - ldr r1, _0812F6C0 @ =gUnknown_03004DC0 + ldr r1, _0812F6C0 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0 strh r0, [r6, 0xC] b _0812F700 .align 2, 0 -_0812F6C0: .4byte gUnknown_03004DC0 +_0812F6C0: .4byte gScanlineEffect _0812F6C4: ldrh r0, [r6, 0xC] adds r0, 0x1 diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 4bfcf42fb..16689a911 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -299,7 +299,7 @@ _080E45E6: strh r0, [r1, 0xC] _080E45FE: movs r3, 0 - ldr r5, _080E46A0 @ =gUnknown_03004DC0 + ldr r5, _080E46A0 @ =gScanlineEffect mov r9, r5 ldr r7, _080E46A4 @ =gUnknown_03004DE0 mov r6, r9 @@ -320,7 +320,7 @@ _080E460A: cmp r3, 0x9F bgt _080E464E ldr r7, _080E46A4 @ =gUnknown_03004DE0 - ldr r6, _080E46A0 @ =gUnknown_03004DC0 + ldr r6, _080E46A0 @ =gScanlineEffect ldr r1, _080E46A8 @ =gTasks mov r2, r12 adds r0, r2, r4 @@ -377,7 +377,7 @@ _080E4690: .4byte gBattle_BG1_Y _080E4694: .4byte 0x0000ffc8 _080E4698: .4byte gBattle_WIN0V _080E469C: .4byte 0xfffffc04 -_080E46A0: .4byte gUnknown_03004DC0 +_080E46A0: .4byte gScanlineEffect _080E46A4: .4byte gUnknown_03004DE0 _080E46A8: .4byte gTasks _080E46AC: .4byte 0x0600e000 @@ -669,7 +669,7 @@ _080E48CC: strh r0, [r1, 0xC] _080E48E0: movs r3, 0 - ldr r4, _080E4978 @ =gUnknown_03004DC0 + ldr r4, _080E4978 @ =gScanlineEffect mov r8, r4 ldr r0, _080E497C @ =gUnknown_03004DE0 mov r12, r0 @@ -692,7 +692,7 @@ _080E48EE: bgt _080E4932 ldr r1, _080E497C @ =gUnknown_03004DE0 mov r12, r1 - ldr r7, _080E4978 @ =gUnknown_03004DC0 + ldr r7, _080E4978 @ =gScanlineEffect ldr r1, _080E4980 @ =gTasks adds r0, r6, r5 lsls r0, 3 @@ -745,7 +745,7 @@ _080E4932: .align 2, 0 _080E4970: .4byte gBattle_WIN0V _080E4974: .4byte 0xfffffc04 -_080E4978: .4byte gUnknown_03004DC0 +_080E4978: .4byte gScanlineEffect _080E497C: .4byte gUnknown_03004DE0 _080E4980: .4byte gTasks _080E4984: .4byte 0x0600e000 @@ -978,7 +978,7 @@ _080E4B3A: strh r0, [r1, 0xC] _080E4B50: movs r3, 0 - ldr r6, _080E4BE8 @ =gUnknown_03004DC0 + ldr r6, _080E4BE8 @ =gScanlineEffect mov r8, r6 ldr r7, _080E4BEC @ =gUnknown_03004DE0 adds r5, r1, 0 @@ -998,7 +998,7 @@ _080E4B5A: cmp r3, 0x9F bgt _080E4B9E ldr r7, _080E4BEC @ =gUnknown_03004DE0 - ldr r6, _080E4BE8 @ =gUnknown_03004DC0 + ldr r6, _080E4BE8 @ =gScanlineEffect ldr r1, _080E4BF0 @ =gTasks mov r2, r12 adds r0, r2, r4 @@ -1053,7 +1053,7 @@ _080E4B9E: .align 2, 0 _080E4BE0: .4byte gBattle_WIN0V _080E4BE4: .4byte 0xfffffc04 -_080E4BE8: .4byte gUnknown_03004DC0 +_080E4BE8: .4byte gScanlineEffect _080E4BEC: .4byte gUnknown_03004DE0 _080E4BF0: .4byte gTasks _080E4BF4: .4byte 0x0600e000 @@ -1323,7 +1323,7 @@ _080E4E00: strh r0, [r1, 0xC] _080E4E16: movs r3, 0 - ldr r0, _080E4EA4 @ =gUnknown_03004DC0 + ldr r0, _080E4EA4 @ =gScanlineEffect mov r9, r0 ldr r2, _080E4EA8 @ =gUnknown_03004DE0 mov r8, r2 @@ -1346,7 +1346,7 @@ _080E4E24: bgt _080E4E68 ldr r0, _080E4EA8 @ =gUnknown_03004DE0 mov r8, r0 - ldr r7, _080E4EA4 @ =gUnknown_03004DC0 + ldr r7, _080E4EA4 @ =gScanlineEffect ldr r1, _080E4EAC @ =gTasks adds r0, r5, r6 lsls r0, 3 @@ -1395,7 +1395,7 @@ _080E4E94: .align 2, 0 _080E4E9C: .4byte gBattle_WIN0V _080E4EA0: .4byte 0xfffffc04 -_080E4EA4: .4byte gUnknown_03004DC0 +_080E4EA4: .4byte gScanlineEffect _080E4EA8: .4byte gUnknown_03004DE0 _080E4EAC: .4byte gTasks _080E4EB0: .4byte REG_BG1CNT diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 71788c918..9d9ead35b 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -532,7 +532,7 @@ sub_80C2448: @ 80C2448 bl LoadOam bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl sub_8089668 + bl ScanlineEffect_TransferDma pop {r0} bx r0 .align 2, 0 diff --git a/asm/dark.s b/asm/dark.s index f3274861c..37fdace81 100755 --- a/asm/dark.s +++ b/asm/dark.s @@ -575,7 +575,7 @@ _080E0380: .align 2, 0 _080E0398: .4byte gBattle_WIN0H _080E039C: - ldr r1, _080E03AC @ =gUnknown_03004DC0 + ldr r1, _080E03AC @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E03A2: @@ -584,7 +584,7 @@ _080E03A2: strh r0, [r4, 0x8] b _080E03B6 .align 2, 0 -_080E03AC: .4byte gUnknown_03004DC0 +_080E03AC: .4byte gScanlineEffect _080E03B0: adds r0, r2, 0 bl DestroyAnimVisualTask @@ -1043,7 +1043,7 @@ _080E0732: .align 2, 0 _080E0750: .4byte REG_BLDALPHA _080E0754: - ldr r1, _080E0764 @ =gUnknown_03004DC0 + ldr r1, _080E0764 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E075A: @@ -1052,7 +1052,7 @@ _080E075A: strh r0, [r4, 0x8] b _080E0784 .align 2, 0 -_080E0764: .4byte gUnknown_03004DC0 +_080E0764: .4byte gScanlineEffect _080E0768: ldr r0, _080E078C @ =gBattle_WIN0H movs r1, 0 @@ -1104,7 +1104,7 @@ sub_80E079C: @ 80E079C ble _080E07FC ldr r0, _080E0888 @ =gUnknown_03004DE0 mov r12, r0 - ldr r7, _080E088C @ =gUnknown_03004DC0 + ldr r7, _080E088C @ =gScanlineEffect _080E07D0: lsls r2, r4, 16 asrs r2, 16 @@ -1138,7 +1138,7 @@ _080E07FC: bgt _080E0846 ldr r0, _080E0888 @ =gUnknown_03004DE0 mov r12, r0 - ldr r7, _080E088C @ =gUnknown_03004DC0 + ldr r7, _080E088C @ =gScanlineEffect _080E0810: asrs r4, r3, 16 cmp r4, 0 @@ -1180,7 +1180,7 @@ _080E0846: cmp r1, r0 bge _080E08BE ldr r7, _080E0888 @ =gUnknown_03004DE0 - ldr r4, _080E088C @ =gUnknown_03004DC0 + ldr r4, _080E088C @ =gScanlineEffect _080E085E: asrs r3, r2, 16 cmp r3, 0 @@ -1205,7 +1205,7 @@ _080E0876: b _080E08BE .align 2, 0 _080E0888: .4byte gUnknown_03004DE0 -_080E088C: .4byte gUnknown_03004DC0 +_080E088C: .4byte gScanlineEffect _080E0890: movs r1, 0x1C ldrsh r0, [r6, r1] diff --git a/asm/dragon.s b/asm/dragon.s index 7c4ea0547..c9a2d490a 100755 --- a/asm/dragon.s +++ b/asm/dragon.s @@ -630,7 +630,7 @@ _080DFA8A: bl sub_80DFAB0 b _080DFAAA _080DFA92: - ldr r1, _080DFAA0 @ =gUnknown_03004DC0 + ldr r1, _080DFAA0 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] ldrh r0, [r2, 0x8] @@ -638,7 +638,7 @@ _080DFA92: strh r0, [r2, 0x8] b _080DFAAA .align 2, 0 -_080DFAA0: .4byte gUnknown_03004DC0 +_080DFAA0: .4byte gScanlineEffect _080DFAA4: adds r0, r3, 0 bl DestroyAnimVisualTask @@ -663,7 +663,7 @@ sub_80DFAB0: @ 80DFAB0 mov r12, r7 ldr r0, _080DFB20 @ =gSineTable mov r8, r0 - ldr r6, _080DFB24 @ =gUnknown_03004DC0 + ldr r6, _080DFB24 @ =gScanlineEffect _080DFACE: lsls r2, r4, 1 ldrb r1, [r6, 0x14] @@ -707,7 +707,7 @@ _080DFB06: .align 2, 0 _080DFB1C: .4byte gUnknown_03004DE0 _080DFB20: .4byte gSineTable -_080DFB24: .4byte gUnknown_03004DC0 +_080DFB24: .4byte gScanlineEffect thumb_func_end sub_80DFAB0 thumb_func_start sub_80DFB28 diff --git a/asm/ghost.s b/asm/ghost.s index 0db176d08..daf7cd9a5 100755 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -1334,7 +1334,7 @@ _080DE584: _080DE59C: movs r2, 0x2 movs r3, 0x6 - bl sub_8089944 + bl ScanlineEffect_InitWave lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1C] @@ -1507,7 +1507,7 @@ _080DE6E8: beq _080DE740 b _080DE7AA _080DE6EE: - ldr r1, _080DE710 @ =gUnknown_03004DC0 + ldr r1, _080DE710 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0x1 @@ -1523,7 +1523,7 @@ _080DE6EE: ldr r0, _080DE714 @ =0x0000fdff b _080DE720 .align 2, 0 -_080DE710: .4byte gUnknown_03004DC0 +_080DE710: .4byte gScanlineEffect _080DE714: .4byte 0x0000fdff _080DE718: movs r2, 0x80 diff --git a/asm/ground.s b/asm/ground.s index fd4cecbfd..00abfd4f3 100755 --- a/asm/ground.s +++ b/asm/ground.s @@ -631,7 +631,7 @@ _080E13D6: _080E13F8: .4byte gBattle_BG2_Y _080E13FC: .4byte gSprites _080E1400: - ldr r1, _080E1410 @ =gUnknown_03004DC0 + ldr r1, _080E1410 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E1406: @@ -640,7 +640,7 @@ _080E1406: strh r0, [r4, 0x8] b _080E1432 .align 2, 0 -_080E1410: .4byte gUnknown_03004DC0 +_080E1410: .4byte gScanlineEffect _080E1414: adds r0, r2, 0 bl DestroyAnimVisualTask @@ -925,7 +925,7 @@ _080E161C: ldrsh r0, [r0, r1] cmp r0, 0 bne _080E1662 - ldr r1, _080E1658 @ =gUnknown_03004DC0 + ldr r1, _080E1658 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E164A: @@ -935,7 +935,7 @@ _080E164A: b _080E1662 .align 2, 0 _080E1654: .4byte gSprites -_080E1658: .4byte gUnknown_03004DC0 +_080E1658: .4byte gScanlineEffect _080E165C: adds r0, r2, 0 bl DestroyAnimVisualTask diff --git a/asm/pokenav.s b/asm/pokenav.s index 7c766addc..3e410872e 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -11013,14 +11013,14 @@ _080F5BD8: .4byte gUnknown_083E4990 thumb_func_start sub_80F5BDC sub_80F5BDC: @ 80F5BDC push {lr} - ldr r1, _080F5BEC @ =gUnknown_03004DC0 + ldr r1, _080F5BEC @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] - bl sub_8089668 + bl ScanlineEffect_TransferDma pop {r0} bx r0 .align 2, 0 -_080F5BEC: .4byte gUnknown_03004DC0 +_080F5BEC: .4byte gScanlineEffect thumb_func_end sub_80F5BDC thumb_func_start sub_80F5BF0 diff --git a/asm/psychic.s b/asm/psychic.s index 20e558bf6..bdc230dcb 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -1753,7 +1753,7 @@ _080DC4BE: ble _080DC4E6 b _080DC4D4 _080DC4CE: - ldr r1, _080DC4DC @ =gUnknown_03004DC0 + ldr r1, _080DC4DC @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080DC4D4: @@ -1762,7 +1762,7 @@ _080DC4D4: strh r0, [r5, 0x8] b _080DC4E6 .align 2, 0 -_080DC4DC: .4byte gUnknown_03004DC0 +_080DC4DC: .4byte gScanlineEffect _080DC4E0: adds r0, r2, 0 bl DestroyAnimVisualTask diff --git a/asm/water.s b/asm/water.s index d72f9438c..4336374aa 100755 --- a/asm/water.s +++ b/asm/water.s @@ -476,7 +476,7 @@ _080D3EE8: cmp r3, r0 bge _080D3F1C ldr r6, _080D3F80 @ =gUnknown_03004DE0 - ldr r5, _080D3F84 @ =gUnknown_03004DC0 + ldr r5, _080D3F84 @ =gScanlineEffect _080D3EF6: lsls r1, r3, 16 asrs r1, 16 @@ -506,7 +506,7 @@ _080D3F1C: cmp r1, r0 bge _080D3F50 ldr r6, _080D3F80 @ =gUnknown_03004DE0 - ldr r5, _080D3F84 @ =gUnknown_03004DC0 + ldr r5, _080D3F84 @ =gScanlineEffect _080D3F2E: asrs r3, r2, 16 lsls r2, r3, 1 @@ -532,7 +532,7 @@ _080D3F50: cmp r0, 0x9F bgt _080D4032 ldr r6, _080D3F80 @ =gUnknown_03004DE0 - ldr r5, _080D3F84 @ =gUnknown_03004DC0 + ldr r5, _080D3F84 @ =gScanlineEffect _080D3F5E: asrs r3, r1, 16 lsls r2, r3, 1 @@ -552,7 +552,7 @@ _080D3F5E: b _080D4032 .align 2, 0 _080D3F80: .4byte gUnknown_03004DE0 -_080D3F84: .4byte gUnknown_03004DC0 +_080D3F84: .4byte gScanlineEffect _080D3F88: movs r3, 0 movs r1, 0x10 @@ -560,7 +560,7 @@ _080D3F88: cmp r3, r0 bge _080D3FBC ldr r6, _080D403C @ =gUnknown_03004DE0 - ldr r5, _080D4040 @ =gUnknown_03004DC0 + ldr r5, _080D4040 @ =gScanlineEffect _080D3F96: lsls r1, r3, 16 asrs r1, 16 @@ -590,7 +590,7 @@ _080D3FBC: cmp r1, r0 bge _080D3FF0 ldr r6, _080D403C @ =gUnknown_03004DE0 - ldr r5, _080D4040 @ =gUnknown_03004DC0 + ldr r5, _080D4040 @ =gScanlineEffect _080D3FCE: asrs r3, r2, 16 lsls r2, r3, 1 @@ -616,7 +616,7 @@ _080D3FF0: cmp r0, 0x9F bgt _080D401C ldr r6, _080D403C @ =gUnknown_03004DE0 - ldr r5, _080D4040 @ =gUnknown_03004DC0 + ldr r5, _080D4040 @ =gScanlineEffect _080D3FFE: asrs r3, r1, 16 lsls r2, r3, 1 @@ -640,7 +640,7 @@ _080D401C: negs r0, r0 cmp r1, r0 bne _080D4032 - bl remove_some_task + bl ScanlineEffect_Stop adds r0, r7, 0 bl DestroyTask _080D4032: @@ -650,7 +650,7 @@ _080D4032: bx r0 .align 2, 0 _080D403C: .4byte gUnknown_03004DE0 -_080D4040: .4byte gUnknown_03004DC0 +_080D4040: .4byte gScanlineEffect thumb_func_end sub_80D3D68 thumb_func_start sub_80D4044 diff --git a/include/scanline_effect.h b/include/scanline_effect.h index 011e5f5b5..b28973eb3 100644 --- a/include/scanline_effect.h +++ b/include/scanline_effect.h @@ -1,5 +1,5 @@ -#ifndef GUARD_UNKNOWN_TASK_H -#define GUARD_UNKNOWN_TASK_H +#ifndef GUARD_SCANLINE_EFFECT_H +#define GUARD_SCANLINE_EFFECT_H struct UnknownTaskStruct { @@ -9,7 +9,7 @@ struct UnknownTaskStruct u8 unk9; }; -struct UnknownTaskStruct2 +struct ScanlineEffect { void *src[2]; volatile void *dest; @@ -23,20 +23,20 @@ struct UnknownTaskStruct2 u8 filler19[0x7]; }; -extern struct UnknownTaskStruct2 gUnknown_03004DC0; +extern struct ScanlineEffect gScanlineEffect; extern u16 gUnknown_03004DE0[][0x3C0]; -void remove_some_task(void); -void remove_some_task(void); +void ScanlineEffect_Stop(void); +void ScanlineEffect_Stop(void); void dp12_8087EA4(void); void dp12_8087EA4(void); //void sub_80895F8(u32 i, u32 i1, u32 i2); //void sub_80895F8(); void sub_80895F8(struct UnknownTaskStruct unk); -void sub_8089668(void); -void sub_8089668(); -//void sub_8089944(int i, int i1, int i2, int i3, int i4, int i5, int i6); -u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); +void ScanlineEffect_TransferDma(void); +void ScanlineEffect_TransferDma(); +//void ScanlineEffect_InitWave(int i, int i1, int i2, int i3, int i4, int i5, int i6); +u8 ScanlineEffect_InitWave(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); -#endif // GUARD_UNKNOWN_TASK_H +#endif // GUARD_SCANLINE_EFFECT_H diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index 0508eed8c..ac1ae08cb 100755 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -97,7 +97,7 @@ void sub_80D0D68(u8 taskId) if (++task->data[3] >= task->data[15]) { - gUnknown_03004DC0.unk15 = 3; + gScanlineEffect.unk15 = 3; DestroyAnimVisualTask(taskId); } } @@ -202,7 +202,7 @@ _080D0E04:\n\ ldrsh r1, [r3, r2]\n\ cmp r0, r1\n\ blt _080D0E22\n\ - ldr r1, _080D0E2C @ =gUnknown_03004DC0\n\ + ldr r1, _080D0E2C @ =gScanlineEffect\n\ movs r0, 0x3\n\ strb r0, [r1, 0x15]\n\ adds r0, r4, 0\n\ @@ -213,7 +213,7 @@ _080D0E22:\n\ bx r0\n\ .align 2, 0\n\ _080D0E28: .4byte gUnknown_03004DE0\n\ -_080D0E2C: .4byte gUnknown_03004DC0\n\ +_080D0E2C: .4byte gScanlineEffect\n\ .syntax divided\n"); } #endif diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 20daf4052..da6c9a2b4 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1073,7 +1073,7 @@ void sub_800FCFC(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - sub_8089668(); + ScanlineEffect_TransferDma(); } void nullsub_36(struct Sprite *sprite) diff --git a/src/contest.c b/src/contest.c index 9f8fe976a..e39ce3daa 100644 --- a/src/contest.c +++ b/src/contest.c @@ -635,7 +635,7 @@ void ContestVBlankCallback(void) TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); - sub_8089668(); + ScanlineEffect_TransferDma(); } void sub_80ABB70(u8 taskId) diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 25890e3ea..85a8800e7 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -516,7 +516,7 @@ static void sub_80AA090(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - sub_8089668(); + ScanlineEffect_TransferDma(); } static void sub_80AA10C(void) diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index a5fc1dee9..7ca647b93 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -298,7 +298,7 @@ void sub_80E62F8(void) ResetPaletteFade(); ResetSpriteData(); dp12_8087EA4(); - remove_some_task(); + ScanlineEffect_Stop(); sub_80EAD08(); sub_80895F8(gUnknown_083DB698); FreeSpriteTileRanges(); @@ -655,7 +655,7 @@ void sub_80E6A6C(void) ProcessSpriteCopyRequests(); sub_80EAC5C(); TransferPlttBuffer(); - sub_8089668(); + ScanlineEffect_TransferDma(); } void sub_80E6A88(void) diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 48e005cab..0f12b978d 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -2053,7 +2053,7 @@ void sub_80EAD08(void) u16 r2; u16 i; - r4 = gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; + r4 = gUnknown_03004DE0[gScanlineEffect.srcBank]; r4 += 88; r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF; diff --git a/src/engine/main.c b/src/engine/main.c index d1ccffea0..1bed4080b 100644 --- a/src/engine/main.c +++ b/src/engine/main.c @@ -350,7 +350,7 @@ void DoSoftReset(void) { REG_IME = 0; m4aSoundVSyncOff(); - remove_some_task(); + ScanlineEffect_Stop(); DmaStop(1); DmaStop(2); DmaStop(3); diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index 3402d93bc..a0b8b7020 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -229,7 +229,7 @@ u32 InitMainMenu(u8 a1) ResetPaletteFade(); LoadPalette(gMainMenuPalette, 0, 32); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -763,7 +763,7 @@ static void Task_NewGameSpeech1(u8 taskId) LZ77UnCompVram(gUnknown_081E7834, (void *)(BG_VRAM + 0x3800)); LoadPalette(gUnknown_081E764C, 0, 0x40); LoadPalette(gUnknown_081E796C, 1, 0x10); - remove_some_task(); + ScanlineEffect_Stop(); ResetSpriteData(); FreeAllSpritePalettes(); AddBirchSpeechObjects(taskId); @@ -1368,7 +1368,7 @@ void CB_ContinueNewGameSpeechPart2() gTasks[taskId].tBGhofs = -60; - remove_some_task(); + ScanlineEffect_Stop(); ResetSpriteData(); FreeAllSpritePalettes(); AddBirchSpeechObjects(taskId); diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c index 868830880..cb5f66649 100644 --- a/src/engine/option_menu.c +++ b/src/engine/option_menu.c @@ -8,7 +8,7 @@ #include "task.h" extern void SetPokemonCryStereo(u32 val); -extern void remove_some_task(void); +extern void ScanlineEffect_Stop(void); //Task data enum { @@ -110,7 +110,7 @@ void CB2_InitOptionMenu(void) } case 1: ResetPaletteFade(); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); gMain.state++; diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 5297b3378..d077bc670 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -438,7 +438,7 @@ void CB2_InitResetRtcScreen(void) ResetOamRange(0, 128); LoadOam(); - remove_some_task(); + ScanlineEffect_Stop(); dp12_8087EA4(); ResetSpriteData(); ResetTasks(); diff --git a/src/field/diploma.c b/src/field/diploma.c index 70e4e4349..978eca7eb 100644 --- a/src/field/diploma.c +++ b/src/field/diploma.c @@ -62,7 +62,7 @@ void CB2_ShowDiploma(void) LZ77UnCompVram(gDiplomaTiles, (void *)VRAM); LZ77UnCompVram(gDiplomaTilemap, (void *)(VRAM + 0x3000)); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); ResetPaletteFade(); diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c index 5f5113a2f..b5141e7ea 100644 --- a/src/field/field_screen_effect.c +++ b/src/field/field_screen_effect.c @@ -64,18 +64,18 @@ static void sub_8081424(u8 taskId) switch (data[0]) { case 0: - sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.srcBank][0], data[1], data[2], data[3]); + sub_8081398(&gUnknown_03004DE0[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); data[0] = 1; break; case 1: - sub_8081398(&gUnknown_03004DE0[gUnknown_03004DC0.srcBank][0], data[1], data[2], data[3]); + sub_8081398(&gUnknown_03004DE0[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); data[0] = 0; data[3] += data[5]; if (data[3] > data[4]) { if (data[6] == 1) { - remove_some_task(); + ScanlineEffect_Stop(); data[0] = 2; } else diff --git a/src/field/item_menu.c b/src/field/item_menu.c index fe896ac51..e0575af4c 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -397,7 +397,7 @@ static bool8 SetupBagMultistep(void) gMain.state++; break; case 1: - remove_some_task(); + ScanlineEffect_Stop(); gMain.state++; break; case 2: diff --git a/src/field/overworld.c b/src/field/overworld.c index 75e3aa6d5..e90fc6396 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -1410,7 +1410,7 @@ void VBlankCB_Field(void) { LoadOam(); ProcessSpriteCopyRequests(); - sub_8089668(); + ScanlineEffect_TransferDma(); sub_8057A58(); TransferPlttBuffer(); sub_8072E74(); @@ -1669,7 +1669,7 @@ void sub_8054BA8(void) REG_DISPCNT = 0; - remove_some_task(); + ScanlineEffect_Stop(); DmaClear16(3, PLTT + 2, PLTT_SIZE - 2); diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 7e443a116..7d243f569 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -648,7 +648,7 @@ bool8 InitPartyMenu(void) gMain.state++; break; case 1: - remove_some_task(); + ScanlineEffect_Stop(); gMain.state++; break; case 2: diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index ea96a4efd..7e8bdc2ce 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -255,7 +255,7 @@ static bool8 sub_810B6C0(void) gMain.state++; break; case 1: - remove_some_task(); + ScanlineEffect_Stop(); gMain.state++; break; case 2: diff --git a/src/field/shop.c b/src/field/shop.c index a3e361733..1dc6ba0cd 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -266,7 +266,7 @@ void BuyMenuDrawGraphics(void) register u16 zero2 asm("r5"); sub_80F9438(); - remove_some_task(); + ScanlineEffect_Stop(); REG_BG1HOFS = (zero2 = 0); REG_BG1VOFS = zero2; REG_BG2HOFS = zero2; diff --git a/src/field/start_menu.c b/src/field/start_menu.c index d7d0282c6..6017f56bf 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -750,7 +750,7 @@ static bool32 sub_80719FC(u8 *step) REG_DISPCNT = 0; SetVBlankCallback(NULL); - remove_some_task(); + ScanlineEffect_Stop(); DmaClear16(3, PLTT, PLTT_SIZE); addr = (void *)VRAM; size = 0x18000; diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index d3cfba1e3..418488774 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -285,7 +285,7 @@ void CB2_ChooseStarter(void) LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM); LZ77UnCompVram(&gBirchBagTilemap, (void *)(VRAM + 0x3000)); LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800)); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); ResetPaletteFade(); diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 9363498ba..4af7be386 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -117,7 +117,7 @@ static void sub_81365A0(void); static void sub_81365C8(void); static void sub_8136638(void); static void sub_81368A4(void); -void sub_8089668(void); +void ScanlineEffect_TransferDma(void); static void sub_8136B44(void); static u8 sub_81370E4(u8); static void sub_8136BB8(void); @@ -194,7 +194,7 @@ static void sub_8136264(void) ProcessSpriteCopyRequests(); TransferPlttBuffer(); sub_80F5CDC(6); - sub_8089668(); + ScanlineEffect_TransferDma(); } static void launch_c3_walk_stairs_and_run_once(void (*const func)(void)) diff --git a/src/field/wallclock.c b/src/field/wallclock.c index bc12db819..aaa7f9ae8 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -229,7 +229,7 @@ static void LoadWallClockGraphics(void) LoadPalette(gMiscClockMale_Pal, 0, 32); else LoadPalette(gMiscClockFemale_Pal, 0, 32); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); ResetPaletteFade(); diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 95424e890..921a3ad93 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -320,7 +320,7 @@ static u8 sub_80F8A28(void) { case 0: SetVBlankCallback(NULL); - remove_some_task(); + ScanlineEffect_Stop(); REG_DISPCNT = 0; RETURN_UP_STATE; diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 306cac3c9..4fb6a4920 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -1419,7 +1419,7 @@ void CB2_InitPokedex(void) } break; case 1: - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); ResetPaletteFade(); @@ -1494,7 +1494,7 @@ u8 unref_sub_808C540(void (*func)(u8)) SetVBlankCallback(NULL); sub_8091060(0x200); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetPaletteFade(); savedIme = REG_IME; diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index 4e2be1418..ec327796a 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -701,7 +701,7 @@ bool8 sub_809DA84(void) gMain.state++; break; case 1: - remove_some_task(); + ScanlineEffect_Stop(); gMain.state++; break; case 2: diff --git a/src/pokenav_before.c b/src/pokenav_before.c index fb197cee2..7439fc077 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -329,7 +329,7 @@ void sub_80EBA5C() ResetTasks(); break; case 6: - remove_some_task(); + ScanlineEffect_Stop(); break; case 7: sub_80F1A90(); @@ -436,7 +436,7 @@ void sub_80EBD4C() ProcessSpriteCopyRequests(); TransferPlttBuffer(); sub_80F5BF0(); - sub_8089668(); + ScanlineEffect_TransferDma(); } void sub_80EBD68() diff --git a/src/roulette.c b/src/roulette.c index ae16b1460..6d79f9d38 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -578,7 +578,7 @@ void sub_8115384(void) { case 0x0: SetVBlankCallback(NULL); - remove_some_task(); + ScanlineEffect_Stop(); sub_80F9438(); sub_80F9368(); REG_BG2CNT = 0x4686; diff --git a/src/scanline_effect.c b/src/scanline_effect.c index 670f2d9b3..e9cf0d02a 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -4,6 +4,9 @@ #include "trig.h" #include "scanline_effect.h" +// Control value to ransfer a single 16-bit value at HBlank +#define HBLANK_DMA_CONTROL_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1) + static void sub_80896F4(void); static void sub_8089714(void); @@ -18,89 +21,89 @@ extern u16 gBattle_BG1_X; extern u8 gUnknown_0202FFA4; -extern struct UnknownTaskStruct2 gUnknown_03004DC0; +extern struct ScanlineEffect gScanlineEffect; // Is this a struct? extern u16 gUnknown_03004DE0[][0x3C0]; -void remove_some_task(void) +void ScanlineEffect_Stop(void) { - gUnknown_03004DC0.unk15 = 0; + gScanlineEffect.unk15 = 0; DmaStop(0); - if (gUnknown_03004DC0.taskId != 0xFF) + if (gScanlineEffect.taskId != 0xFF) { - DestroyTask(gUnknown_03004DC0.taskId); - gUnknown_03004DC0.taskId = 0xFF; + DestroyTask(gScanlineEffect.taskId); + gScanlineEffect.taskId = 0xFF; } } void dp12_8087EA4(void) { CpuFill16(0, gUnknown_03004DE0, 0x780 * 2); - gUnknown_03004DC0.src[0] = 0; - gUnknown_03004DC0.src[1] = 0; - gUnknown_03004DC0.dest = 0; - gUnknown_03004DC0.unkC = 0; - gUnknown_03004DC0.srcBank = 0; - gUnknown_03004DC0.unk15 = 0; - gUnknown_03004DC0.unk16 = 0; - gUnknown_03004DC0.unk17 = 0; - gUnknown_03004DC0.taskId = 0xFF; + gScanlineEffect.src[0] = 0; + gScanlineEffect.src[1] = 0; + gScanlineEffect.dest = 0; + gScanlineEffect.unkC = 0; + gScanlineEffect.srcBank = 0; + gScanlineEffect.unk15 = 0; + gScanlineEffect.unk16 = 0; + gScanlineEffect.unk17 = 0; + gScanlineEffect.taskId = 0xFF; } void sub_80895F8(struct UnknownTaskStruct unk) { - if (unk.control == (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1)) + if (unk.control == HBLANK_DMA_CONTROL_16BIT) // 16 bit { - gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][1]; - gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][1]; - gUnknown_03004DC0.unk10 = sub_80896F4; + gScanlineEffect.src[0] = &gUnknown_03004DE0[0][1]; + gScanlineEffect.src[1] = &gUnknown_03004DE0[1][1]; + gScanlineEffect.unk10 = sub_80896F4; } - else + else // assume 32-bit { - gUnknown_03004DC0.src[0] = &gUnknown_03004DE0[0][2]; - gUnknown_03004DC0.src[1] = &gUnknown_03004DE0[1][2]; - gUnknown_03004DC0.unk10 = sub_8089714; + gScanlineEffect.src[0] = &gUnknown_03004DE0[0][2]; + gScanlineEffect.src[1] = &gUnknown_03004DE0[1][2]; + gScanlineEffect.unk10 = sub_8089714; } - gUnknown_03004DC0.unkC = unk.control; - gUnknown_03004DC0.dest = unk.dest; - gUnknown_03004DC0.unk15 = unk.unk8; - gUnknown_03004DC0.unk16 = unk.unk9; - gUnknown_03004DC0.unk17 = unk.unk9; + gScanlineEffect.unkC = unk.control; + gScanlineEffect.dest = unk.dest; + gScanlineEffect.unk15 = unk.unk8; + gScanlineEffect.unk16 = unk.unk9; + gScanlineEffect.unk17 = unk.unk9; } -void sub_8089668(void) +void ScanlineEffect_TransferDma(void) { - if (gUnknown_03004DC0.unk15) + if (gScanlineEffect.unk15) { - if (gUnknown_03004DC0.unk15 == 3) + if (gScanlineEffect.unk15 == 3) { - gUnknown_03004DC0.unk15 = 0; + gScanlineEffect.unk15 = 0; DmaStop(0); gUnknown_0202FFA4 = 1; } else { DmaStop(0); - DmaSet(0, gUnknown_03004DC0.src[gUnknown_03004DC0.srcBank], gUnknown_03004DC0.dest, gUnknown_03004DC0.unkC); - gUnknown_03004DC0.unk10(); - gUnknown_03004DC0.srcBank ^= 1; + DmaSet(0, gScanlineEffect.src[gScanlineEffect.srcBank], gScanlineEffect.dest, gScanlineEffect.unkC); + gScanlineEffect.unk10(); + gScanlineEffect.srcBank ^= 1; } } } static void sub_80896F4(void) { - u16 *dest = (u16 *)gUnknown_03004DC0.dest; - u16 *src = (u16 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; + u16 *dest = (u16 *)gScanlineEffect.dest; + u16 *src = (u16 *)&gUnknown_03004DE0[gScanlineEffect.srcBank]; *dest = *src; } static void sub_8089714(void) { - u32 *dest = (u32 *)gUnknown_03004DC0.dest; - u32 *src = (u32 *)&gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; + u32 *dest = (u32 *)gScanlineEffect.dest; + u32 *src = (u32 *)&gUnknown_03004DE0[gScanlineEffect.srcBank]; *dest = *src; } @@ -111,7 +114,7 @@ static void task00_for_dp12(u8 taskId) if (gUnknown_0202FFA4) { DestroyTask(taskId); - gUnknown_03004DC0.taskId = 0xFF; + gScanlineEffect.taskId = 0xFF; } else { @@ -153,7 +156,7 @@ static void task00_for_dp12(u8 taskId) offset = gTasks[taskId].data[3] + 320; for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) { - gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value; + gUnknown_03004DE0[gScanlineEffect.srcBank][i] = gUnknown_03004DE0[0][offset] + value; offset++; } } @@ -165,7 +168,7 @@ static void task00_for_dp12(u8 taskId) offset = gTasks[taskId].data[3] + 320; for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) { - gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = gUnknown_03004DE0[0][offset] + value; + gUnknown_03004DE0[gScanlineEffect.srcBank][i] = gUnknown_03004DE0[0][offset] + value; offset++; } gTasks[taskId].data[3]++; @@ -177,20 +180,20 @@ static void task00_for_dp12(u8 taskId) } } -static void sub_80898FC(u16 *a1, u8 a2, u8 a3, u8 a4) +static void GenerateWave(u16 *buffer, u8 frequency, u8 amplitude, u8 unused) { u16 i = 0; - u8 offset = 0; + u8 theta = 0; - while (i < 0x100) + while (i < 256) { - a1[i] = (gSineTable[offset] * a3) / 256; - offset += a2; + buffer[i] = (gSineTable[theta] * amplitude) / 256; + theta += frequency; i++; } } -u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) +u8 ScanlineEffect_InitWave(u8 a1, u8 a2, u8 frequency, u8 amplitude, u8 a5, u8 a6, u8 a7) { int i; int offset; @@ -200,7 +203,7 @@ u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) dp12_8087EA4(); unk.dest = (void *)(REG_ADDR_BG0HOFS + a6); - unk.control = ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1; + unk.control = HBLANK_DMA_CONTROL_16BIT; unk.unk8 = 1; unk.unk9 = 0; @@ -210,17 +213,17 @@ u8 sub_8089944(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) gTasks[taskId].data[0] = a1; gTasks[taskId].data[1] = a2; - gTasks[taskId].data[2] = 256 / a3; + gTasks[taskId].data[2] = 256 / frequency; gTasks[taskId].data[3] = 0; gTasks[taskId].data[4] = a5; gTasks[taskId].data[5] = a5; gTasks[taskId].data[6] = a6; gTasks[taskId].data[7] = a7; - gUnknown_03004DC0.taskId = taskId; + gScanlineEffect.taskId = taskId; gUnknown_0202FFA4 = 0; - sub_80898FC(&gUnknown_03004DE0[0][320], a3, a4, a2 - a1); + GenerateWave(&gUnknown_03004DE0[0][320], frequency, amplitude, a2 - a1); offset = 320; diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index bae037ff7..d8e099130 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -208,7 +208,7 @@ static void CableCarMainCallback_Setup(void) case 0: default: SetVBlankCallback(NULL); - remove_some_task(); + ScanlineEffect_Stop(); DmaFill16Large(3, 0, VRAM, VRAM_SIZE, 0x1000); DmaFill32Defvars(3, 0, OAM, OAM_SIZE); DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE); diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c index 3b68f0143..3aa898b03 100644 --- a/src/scene/contest_painting.c +++ b/src/scene/contest_painting.c @@ -147,7 +147,7 @@ static void ShowContestPainting(void) switch (gMain.state) { case 0: - remove_some_task(); + ScanlineEffect_Stop(); SetVBlankCallback(NULL); gUnknown_03005E8C = &ewram15DE0; ContestPaintingInitVars(TRUE); diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index dcca1fddb..54af6013f 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -215,7 +215,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, sub_800D6D4(); sub_800DAB8(); ResetSpriteData(); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); FreeAllSpritePalettes(); @@ -3934,7 +3934,7 @@ static void VBlankCB_EvolutionScene(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - sub_8089668(); + ScanlineEffect_TransferDma(); } static void VBlankCB_TradeEvolutionScene(void) @@ -3950,7 +3950,7 @@ static void VBlankCB_TradeEvolutionScene(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - sub_8089668(); + ScanlineEffect_TransferDma(); } static void sub_81150D8(void) diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 948c288ff..f39745c02 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -95,7 +95,7 @@ bool8 sub_80C5DCC(void); bool8 sub_80C5F98(void); void ReturnFromHallOfFamePC(void); u16 SpeciesToPokedexNum(u16 species); -void remove_some_task(void); +void ScanlineEffect_Stop(void); // data and gfx @@ -1278,7 +1278,7 @@ static void sub_81433E0(void) static void sub_8143570(void) { - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); diff --git a/src/scene/intro.c b/src/scene/intro.c index beceb6e90..d7d772a40 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -873,7 +873,7 @@ static u8 SetUpCopyrightScreen(void) DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2); ResetPaletteFade(); LoadCopyrightGraphics(0, 0x3800, 0); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index bd41ac641..ca4194800 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -598,7 +598,7 @@ static void StartPokemonLogoShine(bool8 flashBackground) static void VBlankCB(void) { - sub_8089668(); + ScanlineEffect_TransferDma(); LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -644,7 +644,7 @@ void CB2_InitTitleScreen(void) LZ77UnCompVram(sLegendaryMonTilemap, (void *)(VRAM + 0xC000)); LZ77UnCompVram(sBackdropTilemap, (void *)(VRAM + 0xC800)); LoadPalette(sLegendaryMonPalettes, 0xE0, sizeof(sLegendaryMonPalettes)); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); @@ -711,7 +711,7 @@ void CB2_InitTitleScreen(void) if (!UpdatePaletteFade()) { StartPokemonLogoShine(FALSE); - sub_8089944(0, 0xA0, 4, 4, 0, 4, 1); + ScanlineEffect_InitWave(0, 0xA0, 4, 4, 0, 4, 1); SetMainCallback2(MainCB2); } break; diff --git a/sym_common.txt b/sym_common.txt index f620e9e49..8defbe866 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -139,7 +139,7 @@ gUnknown_03004AE4: @ 3004AE4 @ unknown_task .align 4 -gUnknown_03004DC0: @ 3004DC0 +gScanlineEffect: @ 3004DC0 .space 0x20 gUnknown_03004DE0: @ 3004DE0 -- cgit v1.2.3 From beac14a9a0ab072186fa99afcfcc0d844b77a68d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 Jan 2018 12:12:55 -0600 Subject: label more of scanline_effect.c --- asm/battle_anim_812C144.s | 26 +++--- asm/battle_intro.s | 24 +++--- asm/contest_link_80C2020.s | 2 +- asm/dark.s | 24 +++--- asm/dragon.s | 10 +-- asm/ground.s | 8 +- asm/pokenav.s | 16 ++-- asm/psychic.s | 10 +-- asm/water.s | 26 +++--- common_syms/scanline_effect.txt | 2 + include/data2.h | 4 +- include/scanline_effect.h | 27 ++++--- src/battle/anim/draw.c | 28 ++++--- src/battle/battle_2.c | 22 +++--- src/battle/battle_transition.c | 148 +++++++++++++++++----------------- src/contest.c | 2 +- src/debug/matsuda_debug_menu.c | 2 +- src/easy_chat_1.c | 6 +- src/easy_chat_2.c | 2 +- src/engine/trainer_card.c | 28 +++---- src/field/field_screen_effect.c | 18 ++--- src/field/overworld.c | 6 +- src/field/use_pokeblock.c | 4 +- src/pokenav_before.c | 2 +- src/scanline_effect.c | 170 +++++++++++++++++++++++----------------- src/scene/evolution_scene.c | 4 +- src/scene/title_screen.c | 4 +- sym_common.txt | 24 +----- sym_ewram.txt | 7 +- 29 files changed, 328 insertions(+), 328 deletions(-) create mode 100644 common_syms/scanline_effect.txt diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 5fc9199eb..8a6a8fffa 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -1752,7 +1752,7 @@ _0812CE70: ldrsh r0, [r5, r6] cmp r1, r0 bgt _0812CEA6 - ldr r4, _0812CEB0 @ =gUnknown_03004DE0 + ldr r4, _0812CEB0 @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r0, r4 @@ -1777,7 +1777,7 @@ _0812CEA6: ldr r0, _0812CEB4 @ =REG_BG1HOFS b _0812CEBA .align 2, 0 -_0812CEB0: .4byte gUnknown_03004DE0 +_0812CEB0: .4byte gScanlineEffectRegBuffers _0812CEB4: .4byte REG_BG1HOFS _0812CEB8: ldr r0, _0812CEE4 @ =REG_BG2HOFS @@ -1794,7 +1794,7 @@ _0812CEBA: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams ldr r0, _0812CEEC @ =sub_812CEF0 str r0, [r5] add sp, 0xC @@ -1889,7 +1889,7 @@ _0812CF74: ldrsh r0, [r4, r2] cmp r1, r0 bge _0812CFA8 - ldr r5, _0812D000 @ =gUnknown_03004DE0 + ldr r5, _0812D000 @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -1917,7 +1917,7 @@ _0812CFA8: ldrsh r0, [r4, r2] cmp r1, r0 bgt _0812CFDC - ldr r5, _0812D000 @ =gUnknown_03004DE0 + ldr r5, _0812D000 @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -1957,7 +1957,7 @@ _0812CFF8: pop {r0} bx r0 .align 2, 0 -_0812D000: .4byte gUnknown_03004DE0 +_0812D000: .4byte gScanlineEffectRegBuffers _0812D004: .4byte gScanlineEffect thumb_func_end sub_812CEF0 @@ -6545,7 +6545,7 @@ _0812F3EE: ldrh r3, [r0] movs r7, 0 movs r2, 0 - ldr r6, _0812F468 @ =gUnknown_03004DE0 + ldr r6, _0812F468 @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r0, r6 @@ -6586,7 +6586,7 @@ _0812F3FE: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams ldr r0, _0812F470 @ =sub_812F474 str r0, [r4] add sp, 0xC @@ -6599,7 +6599,7 @@ _0812F458: .4byte REG_BLDCNT _0812F45C: .4byte 0x00003f44 _0812F460: .4byte gBattle_BG2_X _0812F464: .4byte gBattle_BG2_Y -_0812F468: .4byte gUnknown_03004DE0 +_0812F468: .4byte gScanlineEffectRegBuffers _0812F46C: .4byte 0xa6600001 _0812F470: .4byte sub_812F474 thumb_func_end sub_812F314 @@ -6732,7 +6732,7 @@ _0812F55A: subs r0, r1 lsls r0, 7 adds r2, r0 - ldr r0, _0812F664 @ =gUnknown_03004DE0 + ldr r0, _0812F664 @ =gScanlineEffectRegBuffers adds r2, r0 lsls r4, 16 asrs r4, 16 @@ -6750,7 +6750,7 @@ _0812F55A: subs r0, r1 lsls r0, 7 adds r3, r0 - ldr r1, _0812F664 @ =gUnknown_03004DE0 + ldr r1, _0812F664 @ =gScanlineEffectRegBuffers adds r3, r1 lsls r1, r7, 16 asrs r1, 16 @@ -6814,7 +6814,7 @@ _0812F60A: lsls r1, r2, 17 cmp r1, 0 blt _0812F636 - ldr r4, _0812F664 @ =gUnknown_03004DE0 + ldr r4, _0812F664 @ =gScanlineEffectRegBuffers ldr r7, [sp, 0x4] lsls r0, r7, 16 asrs r0, 16 @@ -6857,7 +6857,7 @@ _0812F636: b _0812F676 .align 2, 0 _0812F660: .4byte gScanlineEffect -_0812F664: .4byte gUnknown_03004DE0 +_0812F664: .4byte gScanlineEffectRegBuffers _0812F668: .4byte gSineTable _0812F66C: .4byte 0xffff0000 _0812F670: diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 16689a911..3f3c58a65 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -301,7 +301,7 @@ _080E45FE: movs r3, 0 ldr r5, _080E46A0 @ =gScanlineEffect mov r9, r5 - ldr r7, _080E46A4 @ =gUnknown_03004DE0 + ldr r7, _080E46A4 @ =gScanlineEffectRegBuffers mov r6, r9 adds r5, r1, 0 _080E460A: @@ -319,7 +319,7 @@ _080E460A: ble _080E460A cmp r3, 0x9F bgt _080E464E - ldr r7, _080E46A4 @ =gUnknown_03004DE0 + ldr r7, _080E46A4 @ =gScanlineEffectRegBuffers ldr r6, _080E46A0 @ =gScanlineEffect ldr r1, _080E46A8 @ =gTasks mov r2, r12 @@ -378,7 +378,7 @@ _080E4694: .4byte 0x0000ffc8 _080E4698: .4byte gBattle_WIN0V _080E469C: .4byte 0xfffffc04 _080E46A0: .4byte gScanlineEffect -_080E46A4: .4byte gUnknown_03004DE0 +_080E46A4: .4byte gScanlineEffectRegBuffers _080E46A8: .4byte gTasks _080E46AC: .4byte 0x0600e000 _080E46B0: .4byte 0x05000200 @@ -671,7 +671,7 @@ _080E48E0: movs r3, 0 ldr r4, _080E4978 @ =gScanlineEffect mov r8, r4 - ldr r0, _080E497C @ =gUnknown_03004DE0 + ldr r0, _080E497C @ =gScanlineEffectRegBuffers mov r12, r0 mov r7, r8 adds r4, r1, 0 @@ -690,7 +690,7 @@ _080E48EE: ble _080E48EE cmp r3, 0x9F bgt _080E4932 - ldr r1, _080E497C @ =gUnknown_03004DE0 + ldr r1, _080E497C @ =gScanlineEffectRegBuffers mov r12, r1 ldr r7, _080E4978 @ =gScanlineEffect ldr r1, _080E4980 @ =gTasks @@ -746,7 +746,7 @@ _080E4932: _080E4970: .4byte gBattle_WIN0V _080E4974: .4byte 0xfffffc04 _080E4978: .4byte gScanlineEffect -_080E497C: .4byte gUnknown_03004DE0 +_080E497C: .4byte gScanlineEffectRegBuffers _080E4980: .4byte gTasks _080E4984: .4byte 0x0600e000 _080E4988: .4byte 0x05000200 @@ -980,7 +980,7 @@ _080E4B50: movs r3, 0 ldr r6, _080E4BE8 @ =gScanlineEffect mov r8, r6 - ldr r7, _080E4BEC @ =gUnknown_03004DE0 + ldr r7, _080E4BEC @ =gScanlineEffectRegBuffers adds r5, r1, 0 _080E4B5A: lsls r2, r3, 1 @@ -997,7 +997,7 @@ _080E4B5A: ble _080E4B5A cmp r3, 0x9F bgt _080E4B9E - ldr r7, _080E4BEC @ =gUnknown_03004DE0 + ldr r7, _080E4BEC @ =gScanlineEffectRegBuffers ldr r6, _080E4BE8 @ =gScanlineEffect ldr r1, _080E4BF0 @ =gTasks mov r2, r12 @@ -1054,7 +1054,7 @@ _080E4B9E: _080E4BE0: .4byte gBattle_WIN0V _080E4BE4: .4byte 0xfffffc04 _080E4BE8: .4byte gScanlineEffect -_080E4BEC: .4byte gUnknown_03004DE0 +_080E4BEC: .4byte gScanlineEffectRegBuffers _080E4BF0: .4byte gTasks _080E4BF4: .4byte 0x0600e000 _080E4BF8: .4byte 0x05000200 @@ -1325,7 +1325,7 @@ _080E4E16: movs r3, 0 ldr r0, _080E4EA4 @ =gScanlineEffect mov r9, r0 - ldr r2, _080E4EA8 @ =gUnknown_03004DE0 + ldr r2, _080E4EA8 @ =gScanlineEffectRegBuffers mov r8, r2 mov r7, r9 adds r4, r1, 0 @@ -1344,7 +1344,7 @@ _080E4E24: ble _080E4E24 cmp r3, 0x9F bgt _080E4E68 - ldr r0, _080E4EA8 @ =gUnknown_03004DE0 + ldr r0, _080E4EA8 @ =gScanlineEffectRegBuffers mov r8, r0 ldr r7, _080E4EA4 @ =gScanlineEffect ldr r1, _080E4EAC @ =gTasks @@ -1396,7 +1396,7 @@ _080E4E94: _080E4E9C: .4byte gBattle_WIN0V _080E4EA0: .4byte 0xfffffc04 _080E4EA4: .4byte gScanlineEffect -_080E4EA8: .4byte gUnknown_03004DE0 +_080E4EA8: .4byte gScanlineEffectRegBuffers _080E4EAC: .4byte gTasks _080E4EB0: .4byte REG_BG1CNT _080E4EB4: diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 9d9ead35b..9cf156f07 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -532,7 +532,7 @@ sub_80C2448: @ 80C2448 bl LoadOam bl ProcessSpriteCopyRequests bl TransferPlttBuffer - bl ScanlineEffect_TransferDma + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 diff --git a/asm/dark.s b/asm/dark.s index 37fdace81..9e09d8fbe 100755 --- a/asm/dark.s +++ b/asm/dark.s @@ -386,7 +386,7 @@ _080E01F4: movs r0, 0x3 bl sub_80E08CC movs r3, 0 - ldr r4, _080E0290 @ =gUnknown_03004DE0 + ldr r4, _080E0290 @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r4, r0 @@ -406,7 +406,7 @@ _080E0220: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams ldr r1, _080E0294 @ =REG_WINOUT movs r0, 0x3F eors r7, r0 @@ -441,7 +441,7 @@ _080E0280: .4byte 0x00003f44 _080E0284: .4byte REG_BG2VOFS _080E0288: .4byte gBattle_BG1_X _080E028C: .4byte 0xa2600001 -_080E0290: .4byte gUnknown_03004DE0 +_080E0290: .4byte gScanlineEffectRegBuffers _080E0294: .4byte REG_WINOUT _080E0298: .4byte gBattle_WIN0H _080E029C: .4byte gBattle_WIN0V @@ -786,7 +786,7 @@ _080E054E: str r0, [sp, 0xC] movs r3, 0 add r4, sp, 0xC - ldr r6, _080E059C @ =gUnknown_03004DE0 + ldr r6, _080E059C @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r7, r6, r0 @@ -815,7 +815,7 @@ _080E055C: strb r2, [r4, 0x9] ldr r0, [sp, 0xC] ldr r2, [r4, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams _080E0590: ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -823,7 +823,7 @@ _080E0590: b _080E05F2 .align 2, 0 _080E0598: .4byte REG_BG2VOFS -_080E059C: .4byte gUnknown_03004DE0 +_080E059C: .4byte gScanlineEffectRegBuffers _080E05A0: .4byte 0xa2600001 _080E05A4: movs r1, 0xE @@ -1102,7 +1102,7 @@ sub_80E079C: @ 80E079C movs r4, 0 cmp r0, 0 ble _080E07FC - ldr r0, _080E0888 @ =gUnknown_03004DE0 + ldr r0, _080E0888 @ =gScanlineEffectRegBuffers mov r12, r0 ldr r7, _080E088C @ =gScanlineEffect _080E07D0: @@ -1136,7 +1136,7 @@ _080E07FC: ldrsh r0, [r6, r2] cmp r1, r0 bgt _080E0846 - ldr r0, _080E0888 @ =gUnknown_03004DE0 + ldr r0, _080E0888 @ =gScanlineEffectRegBuffers mov r12, r0 ldr r7, _080E088C @ =gScanlineEffect _080E0810: @@ -1179,7 +1179,7 @@ _080E0846: ldrsh r0, [r6, r3] cmp r1, r0 bge _080E08BE - ldr r7, _080E0888 @ =gUnknown_03004DE0 + ldr r7, _080E0888 @ =gScanlineEffectRegBuffers ldr r4, _080E088C @ =gScanlineEffect _080E085E: asrs r3, r2, 16 @@ -1204,7 +1204,7 @@ _080E0876: blt _080E085E b _080E08BE .align 2, 0 -_080E0888: .4byte gUnknown_03004DE0 +_080E0888: .4byte gScanlineEffectRegBuffers _080E088C: .4byte gScanlineEffect _080E0890: movs r1, 0x1C @@ -1212,7 +1212,7 @@ _080E0890: adds r5, r0, 0 adds r5, 0x9F movs r4, 0 - ldr r3, _080E08C8 @ =gUnknown_03004DE0 + ldr r3, _080E08C8 @ =gScanlineEffectRegBuffers movs r2, 0xF0 lsls r2, 3 adds r6, r3, r2 @@ -1238,7 +1238,7 @@ _080E08BE: pop {r0} bx r0 .align 2, 0 -_080E08C8: .4byte gUnknown_03004DE0 +_080E08C8: .4byte gScanlineEffectRegBuffers thumb_func_end sub_80E079C thumb_func_start sub_80E08CC diff --git a/asm/dragon.s b/asm/dragon.s index c9a2d490a..59fdc4b68 100755 --- a/asm/dragon.s +++ b/asm/dragon.s @@ -510,7 +510,7 @@ _080DF996: ldrsh r0, [r4, r1] cmp r3, r0 bgt _080DF9C4 - ldr r5, _080DF9EC @ =gUnknown_03004DE0 + ldr r5, _080DF9EC @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -533,7 +533,7 @@ _080DF9C4: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams ldr r0, _080DF9F0 @ =sub_80DF9F4 str r0, [r4] add sp, 0xC @@ -545,7 +545,7 @@ _080DF9DC: .4byte REG_BG2HOFS _080DF9E0: .4byte gBattle_BG2_X _080DF9E4: .4byte 0xa2600001 _080DF9E8: .4byte gAnimBankAttacker -_080DF9EC: .4byte gUnknown_03004DE0 +_080DF9EC: .4byte gScanlineEffectRegBuffers _080DF9F0: .4byte sub_80DF9F4 thumb_func_end sub_80DF924 @@ -659,7 +659,7 @@ sub_80DFAB0: @ 80DFAB0 ldrsh r0, [r5, r1] cmp r4, r0 bgt _080DFB06 - ldr r7, _080DFB1C @ =gUnknown_03004DE0 + ldr r7, _080DFB1C @ =gScanlineEffectRegBuffers mov r12, r7 ldr r0, _080DFB20 @ =gSineTable mov r8, r0 @@ -705,7 +705,7 @@ _080DFB06: pop {r0} bx r0 .align 2, 0 -_080DFB1C: .4byte gUnknown_03004DE0 +_080DFB1C: .4byte gScanlineEffectRegBuffers _080DFB20: .4byte gSineTable _080DFB24: .4byte gScanlineEffect thumb_func_end sub_80DFAB0 diff --git a/asm/ground.s b/asm/ground.s index 00abfd4f3..0ba721042 100755 --- a/asm/ground.s +++ b/asm/ground.s @@ -980,7 +980,7 @@ _080E169C: asrs r4, r0, 16 cmp r2, r0 bge _080E16C8 - ldr r5, _080E1720 @ =gUnknown_03004DE0 + ldr r5, _080E1720 @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -1003,7 +1003,7 @@ _080E16C8: asrs r0, r1, 16 cmp r0, 0x9F bgt _080E16F6 - ldr r4, _080E1720 @ =gUnknown_03004DE0 + ldr r4, _080E1720 @ =gScanlineEffectRegBuffers lsls r0, r3, 16 asrs r0, 16 adds r3, r0, 0 @@ -1035,7 +1035,7 @@ _080E16F6: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams add sp, 0xC pop {r4-r6} pop {r0} @@ -1043,7 +1043,7 @@ _080E16F6: .align 2, 0 _080E1718: .4byte gBattle_BG2_X _080E171C: .4byte REG_BG2HOFS -_080E1720: .4byte gUnknown_03004DE0 +_080E1720: .4byte gScanlineEffectRegBuffers _080E1724: .4byte 0xa2600001 thumb_func_end sub_80E1668 diff --git a/asm/pokenav.s b/asm/pokenav.s index 3e410872e..e1b30bdf7 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -10957,7 +10957,7 @@ _080F5B68: .4byte gUnknown_083DFEC4 _080F5B6C: .4byte 0x00009345 _080F5B70: bl dp12_8087EA4 - ldr r0, _080F5BA8 @ =gUnknown_03004DE0 + ldr r0, _080F5BA8 @ =gScanlineEffectRegBuffers movs r2, 0xEF movs r3, 0xF4 lsls r3, 3 @@ -10984,7 +10984,7 @@ _080F5B82: movs r0, 0x1 b _080F5BCE .align 2, 0 -_080F5BA8: .4byte gUnknown_03004DE0 +_080F5BA8: .4byte gScanlineEffectRegBuffers _080F5BAC: .4byte gUnknown_083DFEC4 _080F5BB0: .4byte 0x00009345 _080F5BB4: @@ -10995,7 +10995,7 @@ _080F5BB4: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -11016,7 +11016,7 @@ sub_80F5BDC: @ 80F5BDC ldr r1, _080F5BEC @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] - bl ScanlineEffect_TransferDma + bl ScanlineEffect_InitHBlankDmaTransfer pop {r0} bx r0 .align 2, 0 @@ -11045,7 +11045,7 @@ sub_80F5BF0: @ 80F5BF0 adds r0, r4, 0 bl sub_80F5A1C movs r6, 0 - ldr r1, _080F5CC4 @ =gUnknown_03004DE0 + ldr r1, _080F5CC4 @ =gScanlineEffectRegBuffers mov r12, r1 movs r0, 0xF0 lsls r0, 3 @@ -11128,7 +11128,7 @@ _080F5CA6: _080F5CB8: .4byte gUnknown_083DFEC4 _080F5CBC: .4byte 0x00009344 _080F5CC0: .4byte 0x0000911c -_080F5CC4: .4byte gUnknown_03004DE0 +_080F5CC4: .4byte gScanlineEffectRegBuffers _080F5CC8: .4byte 0x0000ffff _080F5CCC: .4byte 0x00009130 _080F5CD0: .4byte 0x00009132 @@ -11164,7 +11164,7 @@ sub_80F5CDC: @ 80F5CDC lsls r0, 17 lsrs r5, r0, 16 movs r7, 0 - ldr r1, _080F5DBC @ =gUnknown_03004DE0 + ldr r1, _080F5DBC @ =gScanlineEffectRegBuffers mov r12, r1 movs r4, 0xF0 lsls r4, 3 @@ -11248,7 +11248,7 @@ _080F5DA0: _080F5DB0: .4byte gUnknown_083DFEC4 _080F5DB4: .4byte 0x00009344 _080F5DB8: .4byte 0x0000911c -_080F5DBC: .4byte gUnknown_03004DE0 +_080F5DBC: .4byte gScanlineEffectRegBuffers _080F5DC0: .4byte 0x0000ffff _080F5DC4: .4byte 0x00009130 _080F5DC8: .4byte 0x00009132 diff --git a/asm/psychic.s b/asm/psychic.s index bdc230dcb..7dbedd08f 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -1588,7 +1588,7 @@ _080DC380: adds r0, 0x40 cmp r1, r0 bgt _080DC3BA - ldr r5, _080DC3E8 @ =gUnknown_03004DE0 + ldr r5, _080DC3E8 @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -1621,7 +1621,7 @@ _080DC3BA: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams ldr r0, _080DC3F0 @ =sub_80DC3F4 str r0, [r4] add sp, 0xC @@ -1631,7 +1631,7 @@ _080DC3BA: .align 2, 0 _080DC3E0: .4byte gBattle_BG2_X _080DC3E4: .4byte REG_BG2HOFS -_080DC3E8: .4byte gUnknown_03004DE0 +_080DC3E8: .4byte gScanlineEffectRegBuffers _080DC3EC: .4byte 0xa2600001 _080DC3F0: .4byte sub_80DC3F4 thumb_func_end sub_80DC2D4 @@ -1676,7 +1676,7 @@ _080DC426: ldr r0, _080DC470 @ =gSineTable mov r9, r0 movs r7, 0x3 - ldr r1, _080DC474 @ =gUnknown_03004DE0 + ldr r1, _080DC474 @ =gScanlineEffectRegBuffers mov r12, r1 movs r2, 0xF0 lsls r2, 3 @@ -1704,7 +1704,7 @@ _080DC448: b _080DC484 .align 2, 0 _080DC470: .4byte gSineTable -_080DC474: .4byte gUnknown_03004DE0 +_080DC474: .4byte gScanlineEffectRegBuffers _080DC478: cmp r3, 0 bge _080DC488 diff --git a/asm/water.s b/asm/water.s index 4336374aa..56e552241 100755 --- a/asm/water.s +++ b/asm/water.s @@ -300,7 +300,7 @@ _080D3D9C: movs r3, 0 movs r2, 0x10 ldrsh r0, [r4, r2] - ldr r1, _080D3E6C @ =gUnknown_03004DE0 + ldr r1, _080D3E6C @ =gScanlineEffectRegBuffers mov r12, r1 cmp r3, r0 bge _080D3DDA @@ -337,7 +337,7 @@ _080D3DDA: ldrsh r0, [r4, r3] cmp r1, r0 bge _080D3E14 - ldr r5, _080D3E6C @ =gUnknown_03004DE0 + ldr r5, _080D3E6C @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -366,7 +366,7 @@ _080D3E14: asrs r0, r2, 16 cmp r0, 0x9F bgt _080D3E4A - ldr r5, _080D3E6C @ =gUnknown_03004DE0 + ldr r5, _080D3E6C @ =gScanlineEffectRegBuffers movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -407,7 +407,7 @@ _080D3E4A: ldrh r0, [r4, 0xA] b _080D3E8A .align 2, 0 -_080D3E6C: .4byte gUnknown_03004DE0 +_080D3E6C: .4byte gScanlineEffectRegBuffers _080D3E70: .4byte 0x0000ffff _080D3E74: lsls r0, r3, 16 @@ -436,7 +436,7 @@ _080D3E8A: ldr r0, [sp] ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] - bl sub_80895F8 + bl ScanlineEffect_SetParams ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -475,7 +475,7 @@ _080D3EE8: ldrsh r0, [r4, r1] cmp r3, r0 bge _080D3F1C - ldr r6, _080D3F80 @ =gUnknown_03004DE0 + ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers ldr r5, _080D3F84 @ =gScanlineEffect _080D3EF6: lsls r1, r3, 16 @@ -505,7 +505,7 @@ _080D3F1C: ldrsh r0, [r4, r3] cmp r1, r0 bge _080D3F50 - ldr r6, _080D3F80 @ =gUnknown_03004DE0 + ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers ldr r5, _080D3F84 @ =gScanlineEffect _080D3F2E: asrs r3, r2, 16 @@ -531,7 +531,7 @@ _080D3F50: asrs r0, r1, 16 cmp r0, 0x9F bgt _080D4032 - ldr r6, _080D3F80 @ =gUnknown_03004DE0 + ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers ldr r5, _080D3F84 @ =gScanlineEffect _080D3F5E: asrs r3, r1, 16 @@ -551,7 +551,7 @@ _080D3F5E: ble _080D3F5E b _080D4032 .align 2, 0 -_080D3F80: .4byte gUnknown_03004DE0 +_080D3F80: .4byte gScanlineEffectRegBuffers _080D3F84: .4byte gScanlineEffect _080D3F88: movs r3, 0 @@ -559,7 +559,7 @@ _080D3F88: ldrsh r0, [r4, r1] cmp r3, r0 bge _080D3FBC - ldr r6, _080D403C @ =gUnknown_03004DE0 + ldr r6, _080D403C @ =gScanlineEffectRegBuffers ldr r5, _080D4040 @ =gScanlineEffect _080D3F96: lsls r1, r3, 16 @@ -589,7 +589,7 @@ _080D3FBC: ldrsh r0, [r4, r3] cmp r1, r0 bge _080D3FF0 - ldr r6, _080D403C @ =gUnknown_03004DE0 + ldr r6, _080D403C @ =gScanlineEffectRegBuffers ldr r5, _080D4040 @ =gScanlineEffect _080D3FCE: asrs r3, r2, 16 @@ -615,7 +615,7 @@ _080D3FF0: asrs r0, r1, 16 cmp r0, 0x9F bgt _080D401C - ldr r6, _080D403C @ =gUnknown_03004DE0 + ldr r6, _080D403C @ =gScanlineEffectRegBuffers ldr r5, _080D4040 @ =gScanlineEffect _080D3FFE: asrs r3, r1, 16 @@ -649,7 +649,7 @@ _080D4032: pop {r0} bx r0 .align 2, 0 -_080D403C: .4byte gUnknown_03004DE0 +_080D403C: .4byte gScanlineEffectRegBuffers _080D4040: .4byte gScanlineEffect thumb_func_end sub_80D3D68 diff --git a/common_syms/scanline_effect.txt b/common_syms/scanline_effect.txt new file mode 100644 index 000000000..280e7f891 --- /dev/null +++ b/common_syms/scanline_effect.txt @@ -0,0 +1,2 @@ +gScanlineEffect +gScanlineEffectRegBuffers diff --git a/include/data2.h b/include/data2.h index 97cb4fd7a..9f6644714 100644 --- a/include/data2.h +++ b/include/data2.h @@ -3,7 +3,7 @@ #include "sprite.h" -struct UnknownTaskStruct; +struct ScanlineEffectParams; struct MonCoords { @@ -42,7 +42,7 @@ extern u8 gSpeciesNames[][11]; extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; -extern const struct UnknownTaskStruct gUnknown_081F9674; +extern const struct ScanlineEffectParams gUnknown_081F9674; extern const u8 gUnknown_081F96C8[]; extern struct CompressedSpriteSheet gUnknown_081FAEA4; extern struct CompressedSpritePalette gUnknown_081FAEAC; diff --git a/include/scanline_effect.h b/include/scanline_effect.h index b28973eb3..242b35448 100644 --- a/include/scanline_effect.h +++ b/include/scanline_effect.h @@ -1,10 +1,13 @@ #ifndef GUARD_SCANLINE_EFFECT_H #define GUARD_SCANLINE_EFFECT_H -struct UnknownTaskStruct +// DMA control value to ransfer a single 16-bit value at HBlank +#define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1) + +struct ScanlineEffectParams { - volatile void *dest; - u32 control; + volatile void *dmaDest; + u32 dmaControl; u8 unk8; u8 unk9; }; @@ -12,9 +15,9 @@ struct UnknownTaskStruct struct ScanlineEffect { void *src[2]; - volatile void *dest; - u32 unkC; - void (*unk10)(void); + volatile void *dmaDest; + u32 dmaControl; + void (*setFirstScanlineReg)(void); u8 srcBank; u8 unk15; u8 unk16; @@ -25,17 +28,17 @@ struct ScanlineEffect extern struct ScanlineEffect gScanlineEffect; -extern u16 gUnknown_03004DE0[][0x3C0]; +extern u16 gScanlineEffectRegBuffers[][0x3C0]; void ScanlineEffect_Stop(void); void ScanlineEffect_Stop(void); void dp12_8087EA4(void); void dp12_8087EA4(void); -//void sub_80895F8(u32 i, u32 i1, u32 i2); -//void sub_80895F8(); -void sub_80895F8(struct UnknownTaskStruct unk); -void ScanlineEffect_TransferDma(void); -void ScanlineEffect_TransferDma(); +//void ScanlineEffect_SetParams(u32 i, u32 i1, u32 i2); +//void ScanlineEffect_SetParams(); +void ScanlineEffect_SetParams(struct ScanlineEffectParams unk); +void ScanlineEffect_InitHBlankDmaTransfer(void); +void ScanlineEffect_InitHBlankDmaTransfer(); //void ScanlineEffect_InitWave(int i, int i1, int i2, int i3, int i4, int i5, int i6); u8 ScanlineEffect_InitWave(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index ac1ae08cb..fc74e3f46 100755 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -21,7 +21,8 @@ static void sub_80D0E8C(struct Sprite* sprite); void sub_80D0C88(u8 taskId) { struct Task* task = &gTasks[taskId]; - struct UnknownTaskStruct sp; + struct ScanlineEffectParams params; + s16 i; task->data[0] = sub_8077FC0(gAnimBankTarget) + 32; task->data[1] = 4; @@ -30,30 +31,31 @@ void sub_80D0C88(u8 taskId) task->data[4] = 0; task->data[5] = 0; task->data[15] = sub_807A100(gAnimBankTarget, 0); + if (GetBankIdentity_permutated(gAnimBankTarget) == 1) { task->data[6] = gBattle_BG1_X; - sp.dest = (u16 *)REG_ADDR_BG1HOFS; + params.dmaDest = (u16 *)REG_ADDR_BG1HOFS; } else { task->data[6] = gBattle_BG2_X; - sp.dest = (u16 *)REG_ADDR_BG2HOFS; + params.dmaDest = (u16 *)REG_ADDR_BG2HOFS; } for (i = task->data[0] - 0x40; i <= task->data[0];i++) { if (i >= 0) { - gUnknown_03004DE0[0][i] = task->data[6] + 0xF0; - gUnknown_03004DE0[1][i] = task->data[6] + 0xF0; + gScanlineEffectRegBuffers[0][i] = task->data[6] + 0xF0; + gScanlineEffectRegBuffers[1][i] = task->data[6] + 0xF0; } } - sp.control = 0xa2600001; - sp.unk8 = 1; - sp.unk9 = 0; - sub_80895F8(sp); + params.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT; + params.unk8 = 1; + params.unk9 = 0; + ScanlineEffect_SetParams(params); task->func = sub_80D0D68; } @@ -91,8 +93,8 @@ void sub_80D0D68(u8 taskId) if (task->data[5] >= 0) { - gUnknown_03004DE0[0][task->data[5]] = task->data[6]; - gUnknown_03004DE0[1][task->data[5]] = task->data[6]; + gScanlineEffectRegBuffers[0][task->data[5]] = task->data[6]; + gScanlineEffectRegBuffers[1][task->data[5]] = task->data[6]; } if (++task->data[3] >= task->data[15]) @@ -178,7 +180,7 @@ _080D0DE0:\n\ ldrsh r0, [r3, r1]\n\ cmp r0, 0\n\ blt _080D0E04\n\ - ldr r2, _080D0E28 @ =gUnknown_03004DE0\n\ + ldr r2, _080D0E28 @ =gScanlineEffectRegBuffers\n\ lsls r0, 1\n\ adds r0, r2\n\ ldrh r1, [r3, 0x14]\n\ @@ -212,7 +214,7 @@ _080D0E22:\n\ pop {r0}\n\ bx r0\n\ .align 2, 0\n\ -_080D0E28: .4byte gUnknown_03004DE0\n\ +_080D0E28: .4byte gScanlineEffectRegBuffers\n\ _080D0E2C: .4byte gScanlineEffect\n\ .syntax divided\n"); } diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index da6c9a2b4..f4fff742c 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -223,17 +223,17 @@ void InitBattle(void) for (i = 0; i < 80; i++) { - gUnknown_03004DE0[0][i] = 0xF0; - gUnknown_03004DE0[1][i] = 0xF0; + gScanlineEffectRegBuffers[0][i] = 0xF0; + gScanlineEffectRegBuffers[1][i] = 0xF0; } for (i = 80; i < 160; i++) { asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter - gUnknown_03004DE0[0][i] = 0xFF10; - gUnknown_03004DE0[1][i] = 0xFF10; + gScanlineEffectRegBuffers[0][i] = 0xFF10; + gScanlineEffectRegBuffers[1][i] = 0xFF10; } - //sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8); - sub_80895F8(gUnknown_081F9674); + //ScanlineEffect_SetParams(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8); + ScanlineEffect_SetParams(gUnknown_081F9674); Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); gBattle_BG0_X = 0; @@ -1073,7 +1073,7 @@ void sub_800FCFC(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } void nullsub_36(struct Sprite *sprite) @@ -1201,14 +1201,14 @@ void c2_8011A1C(void) for (i = 0; i < 80; i++) { - gUnknown_03004DE0[0][i] = 0xF0; - gUnknown_03004DE0[1][i] = 0xF0; + gScanlineEffectRegBuffers[0][i] = 0xF0; + gScanlineEffectRegBuffers[1][i] = 0xF0; } for (i = 80; i < 160; i++) { asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter - gUnknown_03004DE0[0][i] = 0xFF10; - gUnknown_03004DE0[1][i] = 0xFF10; + gScanlineEffectRegBuffers[0][i] = 0xFF10; + gScanlineEffectRegBuffers[1][i] = 0xFF10; } Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index 48ef86fa2..843203a1e 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -18,8 +18,6 @@ void sub_807DE10(void); void dp12_8087EA4(void); -extern u16 gUnknown_03005560[]; - extern const struct OamData gFieldOamData_32x32; struct TransitionData @@ -674,7 +672,7 @@ static bool8 Phase2_Transition_Swirl_Func1(struct Task* task) sub_811D658(); dp12_8087EA4(); BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); - sub_811D6E8(gUnknown_03005560, TRANSITION_STRUCT.field_14, 0, 2, 0, 160); + sub_811D6E8(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_14, 0, 2, 0, 160); SetVBlankCallback(VBlankCB_Phase2_Transition_Swirl); SetHBlankCallback(HBlankCB_Phase2_Transition_Swirl); @@ -695,7 +693,7 @@ static bool8 Phase2_Transition_Swirl_Func2(struct Task* task) task->data[1] += 4; task->data[2] += 8; - sub_811D6E8(gUnknown_03004DE0[0], TRANSITION_STRUCT.field_14, task->data[1], 2, task->data[2], 160); + sub_811D6E8(gScanlineEffectRegBuffers[0], TRANSITION_STRUCT.field_14, task->data[1], 2, task->data[2], 160); if (!gPaletteFade.active) { @@ -711,12 +709,12 @@ static void VBlankCB_Phase2_Transition_Swirl(void) { VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); } static void HBlankCB_Phase2_Transition_Swirl(void) { - u16 var = gUnknown_03004DE0[1][REG_VCOUNT]; + u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT]; REG_BG1HOFS = var; REG_BG2HOFS = var; REG_BG3HOFS = var; @@ -735,7 +733,7 @@ static bool8 Phase2_Transition_Shuffle_Func1(struct Task* task) dp12_8087EA4(); BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); - memset(gUnknown_03005560, TRANSITION_STRUCT.field_16, 0x140); + memset(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_16, 0x140); SetVBlankCallback(VBlankCB_Phase2_Transition_Shuffle); SetHBlankCallback(HBlankCB_Phase2_Transition_Shuffle); @@ -764,7 +762,7 @@ static bool8 Phase2_Transition_Shuffle_Func2(struct Task* task) for (i = 0; i < 160; i++, r4 += 4224) { u16 var = r4 / 256; - gUnknown_03004DE0[0][i] = TRANSITION_STRUCT.field_16 + Sin(var, r3); + gScanlineEffectRegBuffers[0][i] = TRANSITION_STRUCT.field_16 + Sin(var, r3); } if (!gPaletteFade.active) @@ -778,12 +776,12 @@ static void VBlankCB_Phase2_Transition_Shuffle(void) { VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); } static void HBlankCB_Phase2_Transition_Shuffle(void) { - u16 var = gUnknown_03004DE0[1][REG_VCOUNT]; + u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT]; REG_BG1VOFS = var; REG_BG2VOFS = var; REG_BG3VOFS = var; @@ -815,7 +813,7 @@ static bool8 Phase2_Transition_BigPokeball_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03005560[i] = 240; + gScanlineEffectRegBuffers[1][i] = 240; } SetVBlankCallback(VBlankCB0_Phase2_Transition_BigPokeball); @@ -844,7 +842,7 @@ static bool8 Phase2_Transition_BigPokeball_Func2(struct Task* task) dst1[i * 32 + j] = *BigPokeballMap | 0xF000; } } - sub_811D6E8(gUnknown_03004DE0[0], 0, task->data[4], 132, task->data[5], 160); + sub_811D6E8(gScanlineEffectRegBuffers[0], 0, task->data[4], 132, task->data[5], 160); task->tState++; return TRUE; @@ -864,7 +862,7 @@ static bool8 Phase2_Transition_BigPokeball_Func3(struct Task* task) task->data[4] += 8; task->data[5] -= 256; - sub_811D6E8(gUnknown_03004DE0[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + sub_811D6E8(gScanlineEffectRegBuffers[0], 0, task->data[4], 132, task->data[5] >> 8, 160); TRANSITION_STRUCT.VBlank_DMA++; return FALSE; @@ -884,7 +882,7 @@ static bool8 Phase2_Transition_BigPokeball_Func4(struct Task* task) task->data[4] += 8; task->data[5] -= 256; - sub_811D6E8(gUnknown_03004DE0[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + sub_811D6E8(gScanlineEffectRegBuffers[0], 0, task->data[4], 132, task->data[5] >> 8, 160); TRANSITION_STRUCT.VBlank_DMA++; return FALSE; @@ -896,7 +894,7 @@ static bool8 Phase2_Transition_BigPokeball_Func5(struct Task* task) task->data[4] += 8; task->data[5] -= 256; - sub_811D6E8(gUnknown_03004DE0[0], 0, task->data[4], 132, task->data[5] >> 8, 160); + sub_811D6E8(gScanlineEffectRegBuffers[0], 0, task->data[4], 132, task->data[5] >> 8, 160); if (task->data[5] <= 0) { @@ -921,7 +919,7 @@ static bool8 Phase2_Transition_BigPokeball_Func6(struct Task* task) if (task->data[1] < 0) task->data[1] = 0; } - sub_811D764(gUnknown_03004DE0[0], 120, 80, task->data[1]); + sub_811D764(gScanlineEffectRegBuffers[0], 120, 80, task->data[1]); if (task->data[1] == 0) { DmaStop(0); @@ -943,7 +941,7 @@ static void Transition_BigPokeball_Vblank(void) DmaStop(0); VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); REG_WININ = TRANSITION_STRUCT.WININ; REG_WINOUT = TRANSITION_STRUCT.WINOUT; REG_WIN0V = TRANSITION_STRUCT.WIN0V; @@ -954,13 +952,13 @@ static void Transition_BigPokeball_Vblank(void) static void VBlankCB0_Phase2_Transition_BigPokeball(void) { Transition_BigPokeball_Vblank(); - DmaSet(0, gUnknown_03005560, ®_BG0HOFS, 0xA2400001); + DmaSet(0, gScanlineEffectRegBuffers[1], ®_BG0HOFS, 0xA2400001); } static void VBlankCB1_Phase2_Transition_BigPokeball(void) { Transition_BigPokeball_Vblank(); - DmaSet(0, gUnknown_03005560, ®_WIN0H, 0xA2400001); + DmaSet(0, gScanlineEffectRegBuffers[1], ®_WIN0H, 0xA2400001); } static void Phase2Task_Transition_PokeballsTrail(u8 taskID) @@ -1087,7 +1085,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03005560[i] = 0xF3F4; + gScanlineEffectRegBuffers[1][i] = 0xF3F4; } SetVBlankCallback(VBlankCB_Phase2_Transition_Clockwise_BlackFade); @@ -1104,7 +1102,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func2(struct Task* task) sub_811D8FC(TRANSITION_STRUCT.data, 120, 80, TRANSITION_STRUCT.data[4], -1, 1, 1); do { - gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] = (TRANSITION_STRUCT.data[2] + 1) | 0x7800; + gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] = (TRANSITION_STRUCT.data[2] + 1) | 0x7800; } while (!sub_811D978(TRANSITION_STRUCT.data, 1, 1)); TRANSITION_STRUCT.data[4] += 16; @@ -1132,7 +1130,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func3(struct Task* task) r1 = 120, r3 = TRANSITION_STRUCT.data[2] + 1; if (TRANSITION_STRUCT.data[5] >= 80) r1 = TRANSITION_STRUCT.data[2], r3 = 240; - gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] = (r3) | (r1 << 8); + gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] = (r3) | (r1 << 8); if (var != 0) break; var = sub_811D978(TRANSITION_STRUCT.data, 1, 1); @@ -1148,7 +1146,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func3(struct Task* task) { while (TRANSITION_STRUCT.data[3] < TRANSITION_STRUCT.data[5]) { - gUnknown_03004DE0[0][++TRANSITION_STRUCT.data[3]] = (r3) | (r1 << 8); + gScanlineEffectRegBuffers[0][++TRANSITION_STRUCT.data[3]] = (r3) | (r1 << 8); } } @@ -1163,7 +1161,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func4(struct Task* task) sub_811D8FC(TRANSITION_STRUCT.data, 120, 80, TRANSITION_STRUCT.data[4], 160, 1, 1); do { - gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] = (TRANSITION_STRUCT.data[2] << 8) | 0xF0; + gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] = (TRANSITION_STRUCT.data[2] << 8) | 0xF0; } while (!sub_811D978(TRANSITION_STRUCT.data, 1, 1)); TRANSITION_STRUCT.data[4] -= 16; @@ -1188,10 +1186,10 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func5(struct Task* task) while (1) { - r1 = gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] & 0xFF, r2 = TRANSITION_STRUCT.data[2]; + r1 = gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] & 0xFF, r2 = TRANSITION_STRUCT.data[2]; if (TRANSITION_STRUCT.data[5] <= 80) r2 = 120, r1 = TRANSITION_STRUCT.data[2]; - gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] = (r1) | (r2 << 8); + gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] = (r1) | (r2 << 8); r3 = 0; if (var != 0) break; @@ -1208,7 +1206,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func5(struct Task* task) { while (TRANSITION_STRUCT.data[3] > TRANSITION_STRUCT.data[5]) { - gUnknown_03004DE0[0][--TRANSITION_STRUCT.data[3]] = (r1) | (r2 << 8); + gScanlineEffectRegBuffers[0][--TRANSITION_STRUCT.data[3]] = (r1) | (r2 << 8); } } @@ -1228,7 +1226,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func6(struct Task* task) r2 = 120, r3 = TRANSITION_STRUCT.data[2]; if (TRANSITION_STRUCT.data[2] >= 120) r2 = 0, r3 = 240; - gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] = (r3) | (r2 << 8); + gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] = (r3) | (r2 << 8); } while (!sub_811D978(TRANSITION_STRUCT.data, 1, 1)); @@ -1253,12 +1251,12 @@ static void VBlankCB_Phase2_Transition_Clockwise_BlackFade(void) DmaStop(0); VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA != 0) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); REG_WININ = TRANSITION_STRUCT.WININ; REG_WINOUT = TRANSITION_STRUCT.WINOUT; REG_WIN0V = TRANSITION_STRUCT.WIN0V; - REG_WIN0H = gUnknown_03004DE0[1][0]; - DmaSet(0, gUnknown_03004DE0[1], ®_WIN0H, 0xA2400001); + REG_WIN0H = gScanlineEffectRegBuffers[1][0]; + DmaSet(0, gScanlineEffectRegBuffers[1], ®_WIN0H, 0xA2400001); } static void Phase2Task_Transition_Ripple(u8 taskID) @@ -1275,7 +1273,7 @@ static bool8 Phase2_Transition_Ripple_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03005560[i] = TRANSITION_STRUCT.field_16; + gScanlineEffectRegBuffers[1][i] = TRANSITION_STRUCT.field_16; } SetVBlankCallback(VBlankCB_Phase2_Transition_Ripple); @@ -1308,7 +1306,7 @@ static bool8 Phase2_Transition_Ripple_Func2(struct Task* task) // todo: fix the asm s16 var = r4 >> 8; asm(""); - gUnknown_03004DE0[0][i] = TRANSITION_STRUCT.field_16 + Sin(var, r3); + gScanlineEffectRegBuffers[0][i] = TRANSITION_STRUCT.field_16 + Sin(var, r3); asm(""); } @@ -1329,12 +1327,12 @@ static void VBlankCB_Phase2_Transition_Ripple(void) { VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); } static void HBlankCB_Phase2_Transition_Ripple(void) { - u16 var = gUnknown_03004DE0[1][REG_VCOUNT]; + u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT]; REG_BG1VOFS = var; REG_BG2VOFS = var; REG_BG3VOFS = var; @@ -1359,7 +1357,7 @@ static bool8 Phase2_Transition_Wave_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03004DE0[1][i] = 242; + gScanlineEffectRegBuffers[1][i] = 242; } SetVBlankCallback(VBlankCB_Phase2_Transition_Wave); @@ -1375,7 +1373,7 @@ static bool8 Phase2_Transition_Wave_Func2(struct Task* task) bool8 nextFunc; TRANSITION_STRUCT.VBlank_DMA = 0; - toStore = gUnknown_03004DE0[0]; + toStore = gScanlineEffectRegBuffers[0]; r5 = task->data[2]; task->data[2] += 16; task->data[1] += 8; @@ -1411,11 +1409,11 @@ static void VBlankCB_Phase2_Transition_Wave(void) DmaStop(0); VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA != 0) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); REG_WININ = TRANSITION_STRUCT.WININ; REG_WINOUT = TRANSITION_STRUCT.WINOUT; REG_WIN0V = TRANSITION_STRUCT.WIN0V; - DmaSet(0, gUnknown_03004DE0[1], ®_WIN0H, 0xA2400001); + DmaSet(0, gScanlineEffectRegBuffers[1], ®_WIN0H, 0xA2400001); } #define tMugshotOpponentID data[13] @@ -1474,7 +1472,7 @@ static bool8 Phase2_Mugshot_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03004DE0[1][i] = 0xF0F1; + gScanlineEffectRegBuffers[1][i] = 0xF0F1; } SetVBlankCallback(VBlankCB0_Phase2_Mugshots); @@ -1519,7 +1517,7 @@ static bool8 Phase2_Mugshot_Func3(struct Task* task) TRANSITION_STRUCT.VBlank_DMA = 0; - toStore = gUnknown_03004DE0[0]; + toStore = gScanlineEffectRegBuffers[0]; r5 = task->data[1]; task->data[1] += 0x10; @@ -1565,7 +1563,7 @@ static bool8 Phase2_Mugshot_Func4(struct Task* task) TRANSITION_STRUCT.VBlank_DMA = 0; - for (i = 0, toStore = gUnknown_03004DE0[0]; i < 160; i++, toStore++) + for (i = 0, toStore = gScanlineEffectRegBuffers[0]; i < 160; i++, toStore++) { *toStore = 0xF0; } @@ -1608,8 +1606,8 @@ static bool8 Phase2_Mugshot_Func6(struct Task* task) TRANSITION_STRUCT.VBlank_DMA = 0; SetVBlankCallback(NULL); DmaStop(0); - memset(gUnknown_03004DE0[0], 0, 0x140); - memset(gUnknown_03004DE0[1], 0, 0x140); + memset(gScanlineEffectRegBuffers[0], 0, 0x140); + memset(gScanlineEffectRegBuffers[1], 0, 0x140); REG_WIN0H = 0xF0; REG_BLDY = 0; task->tState++; @@ -1642,15 +1640,15 @@ static bool8 Phase2_Mugshot_Func7(struct Task* task) { s16 index1 = 0x50 - i; s16 index2 = 0x50 + i; - if (gUnknown_03004DE0[0][index1] <= 15) + if (gScanlineEffectRegBuffers[0][index1] <= 15) { r6 = TRUE; - gUnknown_03004DE0[0][index1]++; + gScanlineEffectRegBuffers[0][index1]++; } - if (gUnknown_03004DE0[0][index2] <= 15) + if (gScanlineEffectRegBuffers[0][index2] <= 15) { r6 = TRUE; - gUnknown_03004DE0[0][index2]++; + gScanlineEffectRegBuffers[0][index2]++; } } } @@ -1678,7 +1676,7 @@ static bool8 Phase2_Mugshot_Func9(struct Task* task) TRANSITION_STRUCT.VBlank_DMA = 0; task->data[3]++; - memset(gUnknown_03004DE0[0], task->data[3], 0x140); + memset(gScanlineEffectRegBuffers[0], task->data[3], 0x140); if (task->data[3] > 15) task->tState++; @@ -1699,12 +1697,12 @@ static void VBlankCB0_Phase2_Mugshots(void) DmaStop(0); VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA != 0) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); REG_BG0VOFS = TRANSITION_STRUCT.field_1C; REG_WININ = TRANSITION_STRUCT.WININ; REG_WINOUT = TRANSITION_STRUCT.WINOUT; REG_WIN0V = TRANSITION_STRUCT.WIN0V; - DmaSet(0, gUnknown_03004DE0[1], ®_WIN0H, 0xA2400001); + DmaSet(0, gScanlineEffectRegBuffers[1], ®_WIN0H, 0xA2400001); } static void VBlankCB1_Phase2_Mugshots(void) @@ -1712,9 +1710,9 @@ static void VBlankCB1_Phase2_Mugshots(void) DmaStop(0); VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA != 0) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); REG_BLDCNT = TRANSITION_STRUCT.BLDCNT; - DmaSet(0, gUnknown_03004DE0[1], ®_BLDY, 0xA2400001); + DmaSet(0, gScanlineEffectRegBuffers[1], ®_BLDY, 0xA2400001); } static void HBlankCB_Phase2_Mugshots(void) @@ -1856,8 +1854,8 @@ static bool8 Phase2_Transition_Slice_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03004DE0[1][i] = TRANSITION_STRUCT.field_14; - gUnknown_03004DE0[1][160 + i] = 0xF0; + gScanlineEffectRegBuffers[1][i] = TRANSITION_STRUCT.field_14; + gScanlineEffectRegBuffers[1][160 + i] = 0xF0; } REG_IE |= INTR_FLAG_HBLANK; @@ -1886,8 +1884,8 @@ static bool8 Phase2_Transition_Slice_Func2(struct Task* task) for (i = 0; i < 160; i++) { - u16* storeLoc1 = &gUnknown_03004DE0[0][i]; - u16* storeLoc2 = &gUnknown_03004DE0[0][i + 160]; + u16* storeLoc1 = &gScanlineEffectRegBuffers[0][i]; + u16* storeLoc2 = &gScanlineEffectRegBuffers[0][i + 160]; if (1 & i) { *storeLoc1 = TRANSITION_STRUCT.field_14 + task->data[1]; @@ -1923,13 +1921,13 @@ static void VBlankCB_Phase2_Transition_Slice(void) REG_WINOUT = TRANSITION_STRUCT.WINOUT; REG_WIN0V = TRANSITION_STRUCT.WIN0V; if (TRANSITION_STRUCT.VBlank_DMA) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 640); - DmaSet(0, &gUnknown_03004DE0[1][160], ®_WIN0H, 0xA2400001); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 640); + DmaSet(0, &gScanlineEffectRegBuffers[1][160], ®_WIN0H, 0xA2400001); } static void HBlankCB_Phase2_Transition_Slice(void) { - u16 var = gUnknown_03004DE0[1][REG_VCOUNT]; + u16 var = gScanlineEffectRegBuffers[1][REG_VCOUNT]; REG_BG1HOFS = var; REG_BG2HOFS = var; REG_BG3HOFS = var; @@ -1955,8 +1953,8 @@ static bool8 Phase2_Transition_WhiteFade_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03004DE0[1][i] = 0; - gUnknown_03004DE0[1][i + 160] = 0xF0; + gScanlineEffectRegBuffers[1][i] = 0; + gScanlineEffectRegBuffers[1][i + 160] = 0xF0; } REG_IE |= INTR_FLAG_HBLANK; @@ -2038,8 +2036,8 @@ static void VBlankCB0_Phase2_Transition_WhiteFade(void) REG_WINOUT = TRANSITION_STRUCT.WINOUT; REG_WIN0V = TRANSITION_STRUCT.field_6; if (TRANSITION_STRUCT.VBlank_DMA) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 640); - DmaSet(0, &gUnknown_03004DE0[1][160], ®_WIN0H, 0xA2400001); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 640); + DmaSet(0, &gScanlineEffectRegBuffers[1][160], ®_WIN0H, 0xA2400001); } static void VBlankCB1_Phase2_Transition_WhiteFade(void) @@ -2055,7 +2053,7 @@ static void VBlankCB1_Phase2_Transition_WhiteFade(void) static void HBlankCB_Phase2_Transition_WhiteFade(void) { - REG_BLDY = gUnknown_03004DE0[1][REG_VCOUNT]; + REG_BLDY = gScanlineEffectRegBuffers[1][REG_VCOUNT]; } static void sub_811CFD0(struct Sprite* sprite) @@ -2069,8 +2067,8 @@ static void sub_811CFD0(struct Sprite* sprite) else { u16 i; - u16* ptr1 = &gUnknown_03004DE0[0][sprite->pos1.y]; - u16* ptr2 = &gUnknown_03004DE0[0][sprite->pos1.y + 160]; + u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->pos1.y]; + u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->pos1.y + 160]; for (i = 0; i < 20; i++) { ptr1[i] = sprite->data[0] >> 8; @@ -2168,10 +2166,10 @@ static bool8 Phase2_Transition_Shards_Func1(struct Task* task) for (i = 0; i < 160; i++) { - gUnknown_03004DE0[0][i] = 0xF0; + gScanlineEffectRegBuffers[0][i] = 0xF0; } - CpuSet(gUnknown_03004DE0[0], gUnknown_03004DE0[1], 0xA0); + CpuSet(gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 0xA0); SetVBlankCallback(VBlankCB_Phase2_Transition_Shards); task->tState++; @@ -2200,8 +2198,8 @@ static bool8 Phase2_Transition_Shards_Func3(struct Task* task) for (i = 0, nextFunc = FALSE; i < 16; i++) { - s16 r3 = gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] >> 8; - s16 r4 = gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] & 0xFF; + s16 r3 = gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] >> 8; + s16 r4 = gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] & 0xFF; if (task->data[2] == 0) { if (r3 < TRANSITION_STRUCT.data[2]) @@ -2216,7 +2214,7 @@ static bool8 Phase2_Transition_Shards_Func3(struct Task* task) if (r4 <= r3) r4 = r3; } - gUnknown_03004DE0[0][TRANSITION_STRUCT.data[3]] = (r4) | (r3 << 8); + gScanlineEffectRegBuffers[0][TRANSITION_STRUCT.data[3]] = (r4) | (r3 << 8); if (nextFunc) { task->tState++; @@ -2263,12 +2261,12 @@ static void VBlankCB_Phase2_Transition_Shards(void) DmaStop(0); VBlankCB_BattleTransition(); if (TRANSITION_STRUCT.VBlank_DMA) - DmaCopy16(3, gUnknown_03004DE0[0], gUnknown_03004DE0[1], 320); + DmaCopy16(3, gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 320); REG_WININ = TRANSITION_STRUCT.WININ; REG_WINOUT = TRANSITION_STRUCT.WINOUT; REG_WIN0V = TRANSITION_STRUCT.WIN0V; - REG_WIN0H = gUnknown_03004DE0[1][0]; - DmaSet(0, gUnknown_03004DE0[1], ®_WIN0H, 0xA2400001); + REG_WIN0H = gScanlineEffectRegBuffers[1][0]; + DmaSet(0, gScanlineEffectRegBuffers[1], ®_WIN0H, 0xA2400001); } static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) diff --git a/src/contest.c b/src/contest.c index e39ce3daa..e41838cb1 100644 --- a/src/contest.c +++ b/src/contest.c @@ -635,7 +635,7 @@ void ContestVBlankCallback(void) TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } void sub_80ABB70(u8 taskId) diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 85a8800e7..7c250b584 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -516,7 +516,7 @@ static void sub_80AA090(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } static void sub_80AA10C(void) diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 7ca647b93..3bed951d6 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -43,7 +43,7 @@ const u16 gBerryMasterWifePhrases[][2] = // const pointer to gEasyChatStruct-> easy_chat might be two separate files. struct Shared1000 *const gEasyChatStruct = (struct Shared1000 *)(gSharedMem + 0x1000); -const struct UnknownTaskStruct gUnknown_083DB698 = +const struct ScanlineEffectParams gUnknown_083DB698 = { ®_BG3VOFS, ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, @@ -300,7 +300,7 @@ void sub_80E62F8(void) dp12_8087EA4(); ScanlineEffect_Stop(); sub_80EAD08(); - sub_80895F8(gUnknown_083DB698); + ScanlineEffect_SetParams(gUnknown_083DB698); FreeSpriteTileRanges(); FreeAllSpritePalettes(); break; @@ -655,7 +655,7 @@ void sub_80E6A6C(void) ProcessSpriteCopyRequests(); sub_80EAC5C(); TransferPlttBuffer(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } void sub_80E6A88(void) diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 0f12b978d..e7b65bef0 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -2053,7 +2053,7 @@ void sub_80EAD08(void) u16 r2; u16 i; - r4 = gUnknown_03004DE0[gScanlineEffect.srcBank]; + r4 = gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; r4 += 88; r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF; diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index f1b115610..be22b24c4 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -256,7 +256,7 @@ static void sub_8093254(void) ewram0_2.var_5 ^= 1; } if (ewram0_2.var_4) - DmaCopy16(3, &gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 0x140); + DmaCopy16(3, &gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 0x140); } static void sub_80932AC(Callback callBack) @@ -732,7 +732,7 @@ bool8 sub_8093AA0(struct Task *task) ewram0_2.var_4 = FALSE; dp12_8087EA4(); for (i = 0; i < 0xA0; i++) - gUnknown_03004DE0[1][i] = -4; + gScanlineEffectRegBuffers[1][i] = -4; SetHBlankCallback(sub_8093D7C); ewram0_2.var_4 = TRUE; task->data[0]++; @@ -768,7 +768,7 @@ bool8 sub_8093AF0(struct Task *task) for (i = 0; i < r7; i++) { - gUnknown_03004DE0.filler0[i] = -4 - (u32)i; + gScanlineEffectRegBuffers.filler0[i] = -4 - (u32)i; } //_08093B74 for (; i < r9; i++) @@ -776,10 +776,10 @@ bool8 sub_8093AF0(struct Task *task) u16 var = r6 >> 16; r6 += r5; r5 -= sp0; - gUnknown_03004DE0.filler0[i] = -4 + var; + gScanlineEffectRegBuffers.filler0[i] = -4 + var; } for (; i < 160; i++) - gUnknown_03004DE0.filler0[i] = -4 + (u16)(r10 >> 16); + gScanlineEffectRegBuffers.filler0[i] = -4 + (u16)(r10 >> 16); ewram0_2.var_4 = 1; if (task->data[1] > 0x4A) task->data[0]++; @@ -840,7 +840,7 @@ _08093B18:\n\ movs r3, 0\n\ cmp r3, r7\n\ bcs _08093B74\n\ - ldr r2, _08093C04 @ =gUnknown_03004DE0\n\ + ldr r2, _08093C04 @ =gScanlineEffectRegBuffers\n\ mov r12, r2\n\ ldr r0, _08093C08 @ =0x0000fffc\n\ adds r4, r0, 0\n\ @@ -866,7 +866,7 @@ _08093B74:\n\ lsrs r7, r4, 16\n\ cmp r2, r0\n\ bge _08093BAE\n\ - ldr r0, _08093C04 @ =gUnknown_03004DE0\n\ + ldr r0, _08093C04 @ =gScanlineEffectRegBuffers\n\ mov r9, r0\n\ ldr r4, _08093C08 @ =0x0000fffc\n\ mov r12, r4\n\ @@ -894,7 +894,7 @@ _08093BAE:\n\ asrs r0, 16\n\ cmp r0, 0x9F\n\ bgt _08093BD4\n\ - ldr r4, _08093C04 @ =gUnknown_03004DE0\n\ + ldr r4, _08093C04 @ =gScanlineEffectRegBuffers\n\ ldr r0, _08093C08 @ =0x0000fffc\n\ adds r2, r1, r0\n\ _08093BBE:\n\ @@ -934,7 +934,7 @@ _08093BEA:\n\ .align 2, 0\n\ _08093BFC: .4byte gSharedMem\n\ _08093C00: .4byte 0xffff0000\n\ -_08093C04: .4byte gUnknown_03004DE0\n\ +_08093C04: .4byte gScanlineEffectRegBuffers\n\ _08093C08: .4byte 0x0000fffc\n\ .syntax divided\n"); } @@ -1000,7 +1000,7 @@ _08093C5C:\n\ movs r3, 0\n\ cmp r3, r7\n\ bcs _08093CB8\n\ - ldr r2, _08093D48 @ =gUnknown_03004DE0\n\ + ldr r2, _08093D48 @ =gScanlineEffectRegBuffers\n\ mov r12, r2\n\ ldr r0, _08093D4C @ =0x0000fffc\n\ adds r4, r0, 0\n\ @@ -1026,7 +1026,7 @@ _08093CB8:\n\ lsrs r7, r4, 16\n\ cmp r2, r0\n\ bge _08093CF2\n\ - ldr r0, _08093D48 @ =gUnknown_03004DE0\n\ + ldr r0, _08093D48 @ =gScanlineEffectRegBuffers\n\ mov r9, r0\n\ ldr r3, _08093D4C @ =0x0000fffc\n\ mov r12, r3\n\ @@ -1054,7 +1054,7 @@ _08093CF2:\n\ asrs r0, 16\n\ cmp r0, 0x9F\n\ bgt _08093D18\n\ - ldr r4, _08093D48 @ =gUnknown_03004DE0\n\ + ldr r4, _08093D48 @ =gScanlineEffectRegBuffers\n\ ldr r0, _08093D4C @ =0x0000fffc\n\ adds r2, r1, r0\n\ _08093D02:\n\ @@ -1094,7 +1094,7 @@ _08093D2E:\n\ .align 2, 0\n\ _08093D40: .4byte gSharedMem\n\ _08093D44: .4byte 0xffff0000\n\ -_08093D48: .4byte gUnknown_03004DE0\n\ +_08093D48: .4byte gScanlineEffectRegBuffers\n\ _08093D4C: .4byte 0x0000fffc\n\ .syntax divided\n"); } @@ -1113,7 +1113,7 @@ bool8 sub_8093D50(struct Task *task) void sub_8093D7C(void) { - u16 bgVOffset = gUnknown_03004DE0[1][REG_VCOUNT & 0xFF]; + u16 bgVOffset = gScanlineEffectRegBuffers[1][REG_VCOUNT & 0xFF]; REG_BG0VOFS = bgVOffset; REG_BG1VOFS = bgVOffset; diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c index b5141e7ea..bc70e1a63 100644 --- a/src/field/field_screen_effect.c +++ b/src/field/field_screen_effect.c @@ -13,7 +13,7 @@ const static u16 gUnknown_0839ACDC[] = { 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 }; const s32 gMaxFlashLevel = 4; -const static struct UnknownTaskStruct gUnknown_0839ACEC = +const static struct ScanlineEffectParams gUnknown_0839ACEC = { (void *)REG_ADDR_WIN0H, ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, @@ -64,11 +64,11 @@ static void sub_8081424(u8 taskId) switch (data[0]) { case 0: - sub_8081398(&gUnknown_03004DE0[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); + sub_8081398(&gScanlineEffectRegBuffers[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); data[0] = 1; break; case 1: - sub_8081398(&gUnknown_03004DE0[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); + sub_8081398(&gScanlineEffectRegBuffers[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); data[0] = 0; data[3] += data[5]; if (data[3] > data[4]) @@ -140,8 +140,8 @@ void sub_80815E0(u8 a1) { if (a1) { - sub_8081398(&gUnknown_03004DE0[0][0], 120, 80, gUnknown_0839ACDC[a1]); - CpuFastSet(&gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 480); + sub_8081398(&gScanlineEffectRegBuffers[0][0], 120, 80, gUnknown_0839ACDC[a1]); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); } } @@ -208,10 +208,10 @@ static void sub_80816A8(u8 taskId) REG_BLDALPHA = 1804; REG_WININ = 63; REG_WINOUT = 30; - sub_8081398(&gUnknown_03004DE0[0][0], data[2], data[3], 1); - CpuFastSet(&gUnknown_03004DE0[0], &gUnknown_03004DE0[1], 480); - //sub_80895F8(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]); - sub_80895F8(gUnknown_0839ACEC); + sub_8081398(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); + CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); + //ScanlineEffect_SetParams(gUnknown_0839ACEC[0], gUnknown_0839ACEC[1], gUnknown_0839ACEC[2]); + ScanlineEffect_SetParams(gUnknown_0839ACEC); data[0] = 1; break; case 1: diff --git a/src/field/overworld.c b/src/field/overworld.c index e90fc6396..2590852af 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -142,7 +142,7 @@ const struct UCoords32 gUnknown_0821664C[] = { 1, -1}, }; -const struct UnknownTaskStruct gUnknown_08216694 = +const struct ScanlineEffectParams gUnknown_08216694 = { (void *)REG_ADDR_WIN0H, ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, @@ -1410,7 +1410,7 @@ void VBlankCB_Field(void) { LoadOam(); ProcessSpriteCopyRequests(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); sub_8057A58(); TransferPlttBuffer(); sub_8072E74(); @@ -1422,7 +1422,7 @@ void sub_8054814(void) if (val) { sub_80815E0(val); - sub_80895F8(gUnknown_08216694); + ScanlineEffect_SetParams(gUnknown_08216694); } } diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index 4af7be386..42020c49a 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -117,7 +117,7 @@ static void sub_81365A0(void); static void sub_81365C8(void); static void sub_8136638(void); static void sub_81368A4(void); -void ScanlineEffect_TransferDma(void); +void ScanlineEffect_InitHBlankDmaTransfer(void); static void sub_8136B44(void); static u8 sub_81370E4(u8); static void sub_8136BB8(void); @@ -194,7 +194,7 @@ static void sub_8136264(void) ProcessSpriteCopyRequests(); TransferPlttBuffer(); sub_80F5CDC(6); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } static void launch_c3_walk_stairs_and_run_once(void (*const func)(void)) diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 7439fc077..b31be2ce1 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -436,7 +436,7 @@ void sub_80EBD4C() ProcessSpriteCopyRequests(); TransferPlttBuffer(); sub_80F5BF0(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } void sub_80EBD68() diff --git a/src/scanline_effect.c b/src/scanline_effect.c index e9cf0d02a..0fa5b024d 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -4,27 +4,26 @@ #include "trig.h" #include "scanline_effect.h" -// Control value to ransfer a single 16-bit value at HBlank -#define HBLANK_DMA_CONTROL_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1) +static void CopyValue16Bit(void); +static void CopyValue32Bit(void); -static void sub_80896F4(void); -static void sub_8089714(void); - -extern u16 gUnknown_030041B0; -extern u16 gBattle_BG1_Y; -extern u16 gUnknown_030041B8; -extern u16 gBattle_BG2_Y; -extern u16 gBattle_BG2_X; extern u16 gBattle_BG0_Y; extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gUnknown_030041B0; +extern u16 gUnknown_030041B8; -extern u8 gUnknown_0202FFA4; +EWRAM_DATA static u8 gUnknown_0202FFA4 = 0; -extern struct ScanlineEffect gScanlineEffect; +struct ScanlineEffect gScanlineEffect; -// Is this a struct? -extern u16 gUnknown_03004DE0[][0x3C0]; +// Per-scanline register values. +// This is double buffered so that it can be safely written to at any time +// without overwriting the buffer that the DMA is currently reading +u16 gScanlineEffectRegBuffers[2][0x3C0]; void ScanlineEffect_Stop(void) { @@ -39,11 +38,11 @@ void ScanlineEffect_Stop(void) void dp12_8087EA4(void) { - CpuFill16(0, gUnknown_03004DE0, 0x780 * 2); - gScanlineEffect.src[0] = 0; - gScanlineEffect.src[1] = 0; - gScanlineEffect.dest = 0; - gScanlineEffect.unkC = 0; + CpuFill16(0, gScanlineEffectRegBuffers, sizeof(gScanlineEffectRegBuffers)); + gScanlineEffect.src[0] = NULL; + gScanlineEffect.src[1] = NULL; + gScanlineEffect.dmaDest = NULL; + gScanlineEffect.dmaControl = 0; gScanlineEffect.srcBank = 0; gScanlineEffect.unk15 = 0; gScanlineEffect.unk16 = 0; @@ -51,31 +50,35 @@ void dp12_8087EA4(void) gScanlineEffect.taskId = 0xFF; } -void sub_80895F8(struct UnknownTaskStruct unk) +void ScanlineEffect_SetParams(struct ScanlineEffectParams params) { - if (unk.control == HBLANK_DMA_CONTROL_16BIT) // 16 bit + if (params.dmaControl == SCANLINE_EFFECT_DMACNT_16BIT) // 16-bit { - gScanlineEffect.src[0] = &gUnknown_03004DE0[0][1]; - gScanlineEffect.src[1] = &gUnknown_03004DE0[1][1]; - gScanlineEffect.unk10 = sub_80896F4; + // Set the DMA src to the value for the second scanline because the + // first DMA transfer occurs in HBlank *after* the first scanline is drawn + gScanlineEffect.src[0] = (u16 *)gScanlineEffectRegBuffers[0] + 1; + gScanlineEffect.src[1] = (u16 *)gScanlineEffectRegBuffers[1] + 1; + gScanlineEffect.setFirstScanlineReg = CopyValue16Bit; } else // assume 32-bit { - gScanlineEffect.src[0] = &gUnknown_03004DE0[0][2]; - gScanlineEffect.src[1] = &gUnknown_03004DE0[1][2]; - gScanlineEffect.unk10 = sub_8089714; + // Set the DMA src to the value for the second scanline because the + // first DMA transfer occurs in HBlank *after* the first scanline is drawn + gScanlineEffect.src[0] = (u32 *)gScanlineEffectRegBuffers[0] + 1; + gScanlineEffect.src[1] = (u32 *)gScanlineEffectRegBuffers[1] + 1; + gScanlineEffect.setFirstScanlineReg = CopyValue32Bit; } - gScanlineEffect.unkC = unk.control; - gScanlineEffect.dest = unk.dest; - gScanlineEffect.unk15 = unk.unk8; - gScanlineEffect.unk16 = unk.unk9; - gScanlineEffect.unk17 = unk.unk9; + gScanlineEffect.dmaControl = params.dmaControl; + gScanlineEffect.dmaDest = params.dmaDest; + gScanlineEffect.unk15 = params.unk8; + gScanlineEffect.unk16 = params.unk9; + gScanlineEffect.unk17 = params.unk9; } -void ScanlineEffect_TransferDma(void) +void ScanlineEffect_InitHBlankDmaTransfer(void) { - if (gScanlineEffect.unk15) + if (gScanlineEffect.unk15 != 0) { if (gScanlineEffect.unk15 == 3) { @@ -86,28 +89,44 @@ void ScanlineEffect_TransferDma(void) else { DmaStop(0); - DmaSet(0, gScanlineEffect.src[gScanlineEffect.srcBank], gScanlineEffect.dest, gScanlineEffect.unkC); - gScanlineEffect.unk10(); + // Set DMA to copy to dest register on each HBlank for the next frame. + // The HBlank DMA transfers do not occurr during VBlank, so the transfer + // will begin on the HBlank after the first scanline + DmaSet(0, gScanlineEffect.src[gScanlineEffect.srcBank], gScanlineEffect.dmaDest, gScanlineEffect.dmaControl); + // Manually set the reg for the first scanline + gScanlineEffect.setFirstScanlineReg(); + // Swap current buffer gScanlineEffect.srcBank ^= 1; } } } -static void sub_80896F4(void) +// These two functions are used to copy the register for the first scanline, +// depending whether it is a 16-bit register or a 32-bit register. + +static void CopyValue16Bit(void) { - u16 *dest = (u16 *)gScanlineEffect.dest; - u16 *src = (u16 *)&gUnknown_03004DE0[gScanlineEffect.srcBank]; + u16 *dest = (u16 *)gScanlineEffect.dmaDest; + u16 *src = (u16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; + *dest = *src; } -static void sub_8089714(void) +static void CopyValue32Bit(void) { - u32 *dest = (u32 *)gScanlineEffect.dest; - u32 *src = (u32 *)&gUnknown_03004DE0[gScanlineEffect.srcBank]; + u32 *dest = (u32 *)gScanlineEffect.dmaDest; + u32 *src = (u32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; + *dest = *src; } -static void task00_for_dp12(u8 taskId) +#define tStartLine data[0] +#define tEndLine data[1] +#define framesUntilMove data[4] +#define tDelayInterval data[5] +#define tRegOffset data[6] + +static void TaskFunc_UpdateWavePerFrame(u8 taskId) { int value = 0; @@ -120,7 +139,7 @@ static void task00_for_dp12(u8 taskId) { if (gTasks[taskId].data[7]) { - switch (gTasks[taskId].data[6]) + switch (gTasks[taskId].tRegOffset) { case 0x0: value = gBattle_BG0_X; @@ -148,15 +167,16 @@ static void task00_for_dp12(u8 taskId) break; } } - if (gTasks[taskId].data[4]) + if (gTasks[taskId].framesUntilMove != 0) { int i; int offset; - gTasks[taskId].data[4]--; + + gTasks[taskId].framesUntilMove--; offset = gTasks[taskId].data[3] + 320; - for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) + for (i = gTasks[taskId].tStartLine; i < gTasks[taskId].tEndLine; i++) { - gUnknown_03004DE0[gScanlineEffect.srcBank][i] = gUnknown_03004DE0[0][offset] + value; + gScanlineEffectRegBuffers[gScanlineEffect.srcBank][i] = gScanlineEffectRegBuffers[0][offset] + value; offset++; } } @@ -164,18 +184,17 @@ static void task00_for_dp12(u8 taskId) { int i; int offset; - gTasks[taskId].data[4] = gTasks[taskId].data[5]; + + gTasks[taskId].framesUntilMove = gTasks[taskId].tDelayInterval; offset = gTasks[taskId].data[3] + 320; - for (i = gTasks[taskId].data[0]; i < gTasks[taskId].data[1]; i++) + for (i = gTasks[taskId].tStartLine; i < gTasks[taskId].tEndLine; i++) { - gUnknown_03004DE0[gScanlineEffect.srcBank][i] = gUnknown_03004DE0[0][offset] + value; + gScanlineEffectRegBuffers[gScanlineEffect.srcBank][i] = gScanlineEffectRegBuffers[0][offset] + value; offset++; } gTasks[taskId].data[3]++; if (gTasks[taskId].data[3] == gTasks[taskId].data[2]) - { gTasks[taskId].data[3] = 0; - } } } } @@ -193,44 +212,47 @@ static void GenerateWave(u16 *buffer, u8 frequency, u8 amplitude, u8 unused) } } -u8 ScanlineEffect_InitWave(u8 a1, u8 a2, u8 frequency, u8 amplitude, u8 a5, u8 a6, u8 a7) +// Initializes a background "wave" effect that affects scanlines startLine (inclusive) to endLine (exclusive). +// 'frequency' and 'amplitude' control the frequency and amplitude of the wave. +// 'delayInterval' controls how fast the wave travels up the screen. The wave will shift upwards one scanline every 'delayInterval'+1 frames. +// 'regOffset' is the offset of the video register to modify. +u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 a7) { int i; int offset; - struct UnknownTaskStruct unk; + struct ScanlineEffectParams params; u8 taskId; dp12_8087EA4(); - unk.dest = (void *)(REG_ADDR_BG0HOFS + a6); - unk.control = HBLANK_DMA_CONTROL_16BIT; - unk.unk8 = 1; - unk.unk9 = 0; - - sub_80895F8(unk); + params.dmaDest = (void *)(REG_ADDR_BG0HOFS + regOffset); + params.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT; + params.unk8 = 1; + params.unk9 = 0; + ScanlineEffect_SetParams(params); - taskId = CreateTask(task00_for_dp12, 0); + taskId = CreateTask(TaskFunc_UpdateWavePerFrame, 0); - gTasks[taskId].data[0] = a1; - gTasks[taskId].data[1] = a2; - gTasks[taskId].data[2] = 256 / frequency; - gTasks[taskId].data[3] = 0; - gTasks[taskId].data[4] = a5; - gTasks[taskId].data[5] = a5; - gTasks[taskId].data[6] = a6; - gTasks[taskId].data[7] = a7; + gTasks[taskId].tStartLine = startLine; + gTasks[taskId].tEndLine = endLine; + gTasks[taskId].data[2] = 256 / frequency; + gTasks[taskId].data[3] = 0; + gTasks[taskId].framesUntilMove = delayInterval; + gTasks[taskId].tDelayInterval = delayInterval; + gTasks[taskId].tRegOffset = regOffset; + gTasks[taskId].data[7] = a7; gScanlineEffect.taskId = taskId; gUnknown_0202FFA4 = 0; - GenerateWave(&gUnknown_03004DE0[0][320], frequency, amplitude, a2 - a1); + GenerateWave(&gScanlineEffectRegBuffers[0][320], frequency, amplitude, endLine - startLine); offset = 320; - for (i = a1; i < a2; i++) + for (i = startLine; i < endLine; i++) { - gUnknown_03004DE0[0][i] = gUnknown_03004DE0[0][offset]; - gUnknown_03004DE0[1][i] = gUnknown_03004DE0[0][offset]; + gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[0][offset]; + gScanlineEffectRegBuffers[1][i] = gScanlineEffectRegBuffers[0][offset]; offset++; } diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 54af6013f..aeea3e292 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -3934,7 +3934,7 @@ static void VBlankCB_EvolutionScene(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } static void VBlankCB_TradeEvolutionScene(void) @@ -3950,7 +3950,7 @@ static void VBlankCB_TradeEvolutionScene(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); } static void sub_81150D8(void) diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index ca4194800..2de3554fe 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -598,7 +598,7 @@ static void StartPokemonLogoShine(bool8 flashBackground) static void VBlankCB(void) { - ScanlineEffect_TransferDma(); + ScanlineEffect_InitHBlankDmaTransfer(); LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -711,7 +711,7 @@ void CB2_InitTitleScreen(void) if (!UpdatePaletteFade()) { StartPokemonLogoShine(FALSE); - ScanlineEffect_InitWave(0, 0xA0, 4, 4, 0, 4, 1); + ScanlineEffect_InitWave(0, DISPLAY_HEIGHT, 4, 4, 0, 4, 1); SetMainCallback2(MainCB2); } break; diff --git a/sym_common.txt b/sym_common.txt index 8defbe866..85a5ad6e3 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -137,29 +137,7 @@ gUnknown_03004AE4: @ 3004AE4 .include "debug/mori_debug_menu.o" @ unknown_task - - .align 4 -gScanlineEffect: @ 3004DC0 - .space 0x20 - -gUnknown_03004DE0: @ 3004DE0 - .space 0x2 - -gUnknown_03004DE2: @ 3004DE2 - .space 0x2 - -gUnknown_03004DE4: @ 3004DE4 - .space 0x27C - -gUnknown_03005060: @ 3005060 - .space 0x500 - -gUnknown_03005560: @ 3005560 - .space 0x140 - -gUnknown_030056A0: @ 30056A0 - .space 0x640 - + .include "scanline_effect.o" .include "pokemon/pokemon_menu.o" .include "pokemon/pokedex.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index fc4ea94ef..dcbadf96e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -368,12 +368,7 @@ gUnknown_0202FF58: @ 202FF58 .include "src/battle/battle_setup.o" .include "src/field/wild_encounter.o" .include "src/field/field_effect.o" - -@ unknown_task - -gUnknown_0202FFA4: @ 202FFA4 - .space 0x4 - + .include "src/scanline_effect.o" .include "src/pokemon/pokemon_menu.o" .include "src/pokemon/pokedex.o" .include "src/engine/trainer_card.o" -- cgit v1.2.3 From bb2c758e8fa730b2bd19b92119a2bd7e37af57f8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 Jan 2018 13:18:31 -0600 Subject: finish labeling scanline_effect.c --- asm/contest_link_80C2020.s | 26 ++--- asm/fight.s | 12 +-- asm/ground.s | 48 ++++----- asm/normal.s | 32 +++--- asm/pokenav.s | 2 +- asm/rock.s | 10 +- include/scanline_effect.h | 37 +++---- src/battle/anim/draw.c | 4 +- src/battle/battle_2.c | 20 ++-- src/battle/battle_4.c | 4 +- src/battle/battle_controller_player.c | 4 +- src/battle/battle_transition.c | 22 ++-- src/battle/reshow_battle_screen.c | 10 +- src/contest.c | 14 +-- src/debug/matsuda_debug_menu.c | 14 +-- src/easy_chat_1.c | 2 +- src/easy_chat_2.c | 2 +- src/engine/option_menu.c | 2 +- src/engine/reset_rtc_screen.c | 2 +- src/engine/trainer_card.c | 2 +- src/field/field_screen_effect.c | 6 +- src/field/overworld.c | 2 +- src/field/start_menu.c | 2 +- src/pokemon/pokemon_summary_screen.c | 20 ++-- src/scanline_effect.c | 187 +++++++++++++++++----------------- src/scene/evolution_scene.c | 24 ++--- src/scene/hall_of_fame.c | 2 +- src/scene/title_screen.c | 2 +- sym_common.txt | 4 +- 29 files changed, 261 insertions(+), 257 deletions(-) diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 9cf156f07..6eac528df 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -94,9 +94,9 @@ sub_80C2020: @ 80C2020 strh r2, [r0] ldr r0, _080C2128 @ =gBattle_BG2_Y strh r2, [r0] - ldr r0, _080C212C @ =gUnknown_030041B0 + ldr r0, _080C212C @ =gBattle_BG3_X strh r2, [r0] - ldr r0, _080C2130 @ =gUnknown_030041B8 + ldr r0, _080C2130 @ =gBattle_BG3_Y strh r2, [r0] ldr r0, _080C2134 @ =gBattle_WIN0H strh r2, [r0] @@ -125,8 +125,8 @@ _080C211C: .4byte gBattle_BG1_X _080C2120: .4byte gBattle_BG1_Y _080C2124: .4byte gBattle_BG2_X _080C2128: .4byte gBattle_BG2_Y -_080C212C: .4byte gUnknown_030041B0 -_080C2130: .4byte gUnknown_030041B8 +_080C212C: .4byte gBattle_BG3_X +_080C2130: .4byte gBattle_BG3_Y _080C2134: .4byte gBattle_WIN0H _080C2138: .4byte gBattle_WIN0V _080C213C: .4byte gBattle_WIN1H @@ -396,7 +396,7 @@ sub_80C2358: @ 80C2358 movs r0, 0 bl SetVBlankCallback bl sub_80C2020 - bl dp12_8087EA4 + bl ScanlineEffect_Clear bl ResetPaletteFade bl ResetSpriteData bl ResetTasks @@ -506,11 +506,11 @@ sub_80C2448: @ 80C2448 ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24DC @ =gUnknown_030041B0 + ldr r0, _080C24DC @ =gBattle_BG3_X ldrh r0, [r0] strh r0, [r1] adds r1, 0x2 - ldr r0, _080C24E0 @ =gUnknown_030041B8 + ldr r0, _080C24E0 @ =gBattle_BG3_Y ldrh r0, [r0] strh r0, [r1] adds r1, 0x22 @@ -543,8 +543,8 @@ _080C24CC: .4byte gBattle_BG1_X _080C24D0: .4byte gBattle_BG1_Y _080C24D4: .4byte gBattle_BG2_X _080C24D8: .4byte gBattle_BG2_Y -_080C24DC: .4byte gUnknown_030041B0 -_080C24E0: .4byte gUnknown_030041B8 +_080C24DC: .4byte gBattle_BG3_X +_080C24E0: .4byte gBattle_BG3_Y _080C24E4: .4byte gBattle_WIN0H _080C24E8: .4byte gBattle_WIN0V _080C24EC: .4byte gBattle_WIN1H @@ -1826,11 +1826,11 @@ _080C2F24: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_start sub_80C2F28 sub_80C2F28: @ 80C2F28 push {r4,r5,lr} - ldr r2, _080C2F5C @ =gUnknown_030041B0 + ldr r2, _080C2F5C @ =gBattle_BG3_X ldrh r3, [r2] adds r0, r3, 0x2 strh r0, [r2] - ldr r4, _080C2F60 @ =gUnknown_030041B8 + ldr r4, _080C2F60 @ =gBattle_BG3_Y ldrh r5, [r4] adds r1, r5, 0x1 strh r1, [r4] @@ -1854,8 +1854,8 @@ _080C2F56: pop {r0} bx r0 .align 2, 0 -_080C2F5C: .4byte gUnknown_030041B0 -_080C2F60: .4byte gUnknown_030041B8 +_080C2F5C: .4byte gBattle_BG3_X +_080C2F60: .4byte gBattle_BG3_Y thumb_func_end sub_80C2F28 thumb_func_start sub_80C2F64 diff --git a/asm/fight.s b/asm/fight.s index d0d042113..1969aee14 100755 --- a/asm/fight.s +++ b/asm/fight.s @@ -1688,7 +1688,7 @@ _080D9CDE: lsls r0, 24 cmp r0, 0 bne _080D9D14 - ldr r1, _080D9D10 @ =gUnknown_030041B0 + ldr r1, _080D9D10 @ =gBattle_BG3_X ldrh r0, [r4, 0x1A] lsls r0, 16 asrs r0, 24 @@ -1699,9 +1699,9 @@ _080D9CDE: b _080D9D24 .align 2, 0 _080D9D0C: .4byte gAnimBankTarget -_080D9D10: .4byte gUnknown_030041B0 +_080D9D10: .4byte gBattle_BG3_X _080D9D14: - ldr r2, _080D9D64 @ =gUnknown_030041B0 + ldr r2, _080D9D64 @ =gBattle_BG3_X ldrh r1, [r4, 0x1A] lsls r1, 16 asrs r1, 24 @@ -1710,7 +1710,7 @@ _080D9D14: strh r0, [r2] adds r7, r2, 0 _080D9D24: - ldr r3, _080D9D68 @ =gUnknown_030041B8 + ldr r3, _080D9D68 @ =gBattle_BG3_Y ldrh r2, [r4, 0x1C] lsls r0, r2, 16 asrs r0, 24 @@ -1741,8 +1741,8 @@ _080D9D5C: pop {r0} bx r0 .align 2, 0 -_080D9D64: .4byte gUnknown_030041B0 -_080D9D68: .4byte gUnknown_030041B8 +_080D9D64: .4byte gBattle_BG3_X +_080D9D68: .4byte gBattle_BG3_Y _080D9D6C: .4byte gBattleAnimArgs thumb_func_end sub_80D9C80 diff --git a/asm/ground.s b/asm/ground.s index 0ba721042..e846d1c70 100755 --- a/asm/ground.s +++ b/asm/ground.s @@ -1243,14 +1243,14 @@ _080E189C: beq _080E18C8 cmp r0, 0x5 bne _080E1908 - ldr r0, _080E18C0 @ =gUnknown_030041B0 + ldr r0, _080E18C0 @ =gBattle_BG3_X ldrh r0, [r0] strh r0, [r4, 0x22] ldr r0, _080E18C4 @ =sub_80E1934 b _080E1926 .align 2, 0 _080E18BC: .4byte gAnimMovePower -_080E18C0: .4byte gUnknown_030041B0 +_080E18C0: .4byte gBattle_BG3_X _080E18C4: .4byte sub_80E1934 _080E18C8: movs r0, 0 @@ -1351,16 +1351,16 @@ _080E1962: ands r0, r1 cmp r0, 0 bne _080E198C - ldr r1, _080E1988 @ =gUnknown_030041B0 + ldr r1, _080E1988 @ =gBattle_BG3_X ldrh r0, [r3, 0x26] ldrh r2, [r3, 0x22] adds r0, r2 strh r0, [r1] b _080E1996 .align 2, 0 -_080E1988: .4byte gUnknown_030041B0 +_080E1988: .4byte gBattle_BG3_X _080E198C: - ldr r0, _080E19B4 @ =gUnknown_030041B0 + ldr r0, _080E19B4 @ =gBattle_BG3_X ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x26] subs r1, r2 @@ -1382,7 +1382,7 @@ _080E1996: strh r0, [r3, 0x24] b _080E1A0C .align 2, 0 -_080E19B4: .4byte gUnknown_030041B0 +_080E19B4: .4byte gBattle_BG3_X _080E19B8: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -1397,16 +1397,16 @@ _080E19B8: ands r1, r0 cmp r1, 0 bne _080E19E4 - ldr r1, _080E19E0 @ =gUnknown_030041B0 + ldr r1, _080E19E0 @ =gBattle_BG3_X ldrh r0, [r3, 0x24] ldrh r2, [r3, 0x22] adds r0, r2 strh r0, [r1] b _080E19EE .align 2, 0 -_080E19E0: .4byte gUnknown_030041B0 +_080E19E0: .4byte gBattle_BG3_X _080E19E4: - ldr r0, _080E1A14 @ =gUnknown_030041B0 + ldr r0, _080E1A14 @ =gBattle_BG3_X ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x24] subs r1, r2 @@ -1433,9 +1433,9 @@ _080E1A0C: strh r0, [r3, 0x8] b _080E1A24 .align 2, 0 -_080E1A14: .4byte gUnknown_030041B0 +_080E1A14: .4byte gBattle_BG3_X _080E1A18: - ldr r1, _080E1A28 @ =gUnknown_030041B0 + ldr r1, _080E1A28 @ =gBattle_BG3_X ldrh r0, [r3, 0x22] strh r0, [r1] adds r0, r2, 0 @@ -1444,7 +1444,7 @@ _080E1A24: pop {r0} bx r0 .align 2, 0 -_080E1A28: .4byte gUnknown_030041B0 +_080E1A28: .4byte gBattle_BG3_X thumb_func_end sub_80E1934 thumb_func_start sub_80E1A2C @@ -1719,10 +1719,10 @@ _080E1BE2: movs r0, 0xFF ands r1, r0 strh r1, [r4, 0xC] - ldr r2, _080E1C50 @ =gUnknown_030041B0 + ldr r2, _080E1C50 @ =gBattle_BG3_X ldrh r0, [r4, 0xA] strh r0, [r2] - ldr r0, _080E1C54 @ =gUnknown_030041B8 + ldr r0, _080E1C54 @ =gBattle_BG3_Y strh r1, [r0] ldrh r0, [r6, 0x4] strh r0, [r4, 0xE] @@ -1736,8 +1736,8 @@ _080E1C40: .4byte gAnimBankAttacker _080E1C44: .4byte sub_80E1C58 _080E1C48: .4byte gTasks _080E1C4C: .4byte 0x000001ff -_080E1C50: .4byte gUnknown_030041B0 -_080E1C54: .4byte gUnknown_030041B8 +_080E1C50: .4byte gBattle_BG3_X +_080E1C54: .4byte gBattle_BG3_Y thumb_func_end sub_80E1BB0 thumb_func_start sub_80E1C58 @@ -1757,10 +1757,10 @@ sub_80E1C58: @ 80E1C58 ldrsh r0, [r2, r4] cmp r1, r0 bne _080E1C98 - ldr r0, _080E1C90 @ =gUnknown_030041B0 + ldr r0, _080E1C90 @ =gBattle_BG3_X movs r1, 0 strh r1, [r0] - ldr r0, _080E1C94 @ =gUnknown_030041B8 + ldr r0, _080E1C94 @ =gBattle_BG3_Y strh r1, [r0] adds r0, r3, 0 bl DestroyTask @@ -1768,13 +1768,13 @@ sub_80E1C58: @ 80E1C58 .align 2, 0 _080E1C88: .4byte gTasks _080E1C8C: .4byte gBattleAnimArgs -_080E1C90: .4byte gUnknown_030041B0 -_080E1C94: .4byte gUnknown_030041B8 +_080E1C90: .4byte gBattle_BG3_X +_080E1C94: .4byte gBattle_BG3_Y _080E1C98: - ldr r1, _080E1CAC @ =gUnknown_030041B0 + ldr r1, _080E1CAC @ =gBattle_BG3_X ldrh r0, [r2, 0xA] strh r0, [r1] - ldr r1, _080E1CB0 @ =gUnknown_030041B8 + ldr r1, _080E1CB0 @ =gBattle_BG3_Y ldrh r0, [r2, 0xC] strh r0, [r1] _080E1CA4: @@ -1782,8 +1782,8 @@ _080E1CA4: pop {r0} bx r0 .align 2, 0 -_080E1CAC: .4byte gUnknown_030041B0 -_080E1CB0: .4byte gUnknown_030041B8 +_080E1CAC: .4byte gBattle_BG3_X +_080E1CB0: .4byte gBattle_BG3_Y thumb_func_end sub_80E1C58 .align 2, 0 @ Don't pad with nop. diff --git a/asm/normal.s b/asm/normal.s index a800b348a..8465e2c2b 100755 --- a/asm/normal.s +++ b/asm/normal.s @@ -1103,15 +1103,15 @@ _080E24F0: beq _080E2508 b _080E2518 _080E24F6: - ldr r1, _080E24FC @ =gUnknown_030041B0 + ldr r1, _080E24FC @ =gBattle_BG3_X b _080E250A .align 2, 0 -_080E24FC: .4byte gUnknown_030041B0 +_080E24FC: .4byte gBattle_BG3_X _080E2500: - ldr r1, _080E2504 @ =gUnknown_030041B8 + ldr r1, _080E2504 @ =gBattle_BG3_Y b _080E250A .align 2, 0 -_080E2504: .4byte gUnknown_030041B8 +_080E2504: .4byte gBattle_BG3_Y _080E2508: ldr r1, _080E2514 @ =gSpriteCoordOffsetX _080E250A: @@ -1359,10 +1359,10 @@ sub_80E26BC: @ 80E26BC strh r1, [r2, 0xE] ldrh r1, [r3, 0x6] strh r1, [r2, 0x18] - ldr r4, _080E2704 @ =gUnknown_030041B0 + ldr r4, _080E2704 @ =gBattle_BG3_X ldrh r1, [r3] strh r1, [r4] - ldr r4, _080E2708 @ =gUnknown_030041B8 + ldr r4, _080E2708 @ =gBattle_BG3_Y ldrh r1, [r3, 0x2] strh r1, [r4] ldr r1, _080E270C @ =sub_80E2710 @@ -1374,8 +1374,8 @@ sub_80E26BC: @ 80E26BC .align 2, 0 _080E26FC: .4byte gTasks _080E2700: .4byte gBattleAnimArgs -_080E2704: .4byte gUnknown_030041B0 -_080E2708: .4byte gUnknown_030041B8 +_080E2704: .4byte gBattle_BG3_X +_080E2708: .4byte gBattle_BG3_Y _080E270C: .4byte sub_80E2710 thumb_func_end sub_80E26BC @@ -1395,7 +1395,7 @@ sub_80E2710: @ 80E2710 mov r12, r1 cmp r0, 0 bne _080E2796 - ldr r0, _080E2744 @ =gUnknown_030041B0 + ldr r0, _080E2744 @ =gBattle_BG3_X ldrh r2, [r0] movs r7, 0x8 ldrsh r1, [r3, r7] @@ -1407,12 +1407,12 @@ sub_80E2710: @ 80E2710 b _080E274A .align 2, 0 _080E2740: .4byte gTasks -_080E2744: .4byte gUnknown_030041B0 +_080E2744: .4byte gBattle_BG3_X _080E2748: ldrh r0, [r3, 0x8] _080E274A: strh r0, [r6] - ldr r2, _080E2768 @ =gUnknown_030041B8 + ldr r2, _080E2768 @ =gBattle_BG3_Y ldrh r3, [r2] lsls r1, r5, 2 adds r0, r1, r5 @@ -1426,7 +1426,7 @@ _080E274A: movs r0, 0 b _080E2770 .align 2, 0 -_080E2768: .4byte gUnknown_030041B8 +_080E2768: .4byte gBattle_BG3_Y _080E276C: ldrh r0, [r4, 0xA] negs r0, r0 @@ -3905,13 +3905,13 @@ sub_80E3AD0: @ 80E3AD0 ldrh r7, [r1, 0x1E] adds r2, r7 strh r2, [r1, 0x1E] - ldr r6, _080E3B40 @ =gUnknown_030041B0 + ldr r6, _080E3B40 @ =gBattle_BG3_X lsls r0, r3, 16 asrs r0, 24 ldrh r4, [r6] adds r0, r4 strh r0, [r6] - ldr r4, _080E3B44 @ =gUnknown_030041B8 + ldr r4, _080E3B44 @ =gBattle_BG3_Y lsls r0, r2, 16 asrs r0, 24 ldrh r7, [r4] @@ -3942,8 +3942,8 @@ _080E3B36: bx r0 .align 2, 0 _080E3B3C: .4byte gTasks -_080E3B40: .4byte gUnknown_030041B0 -_080E3B44: .4byte gUnknown_030041B8 +_080E3B40: .4byte gBattle_BG3_X +_080E3B44: .4byte gBattle_BG3_Y _080E3B48: .4byte gBattleAnimArgs thumb_func_end sub_80E3AD0 diff --git a/asm/pokenav.s b/asm/pokenav.s index e1b30bdf7..67b4ece33 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -10956,7 +10956,7 @@ sub_80F5B50: @ 80F5B50 _080F5B68: .4byte gUnknown_083DFEC4 _080F5B6C: .4byte 0x00009345 _080F5B70: - bl dp12_8087EA4 + bl ScanlineEffect_Clear ldr r0, _080F5BA8 @ =gScanlineEffectRegBuffers movs r2, 0xEF movs r3, 0xF4 diff --git a/asm/rock.s b/asm/rock.s index 923c842be..2f878db2c 100755 --- a/asm/rock.s +++ b/asm/rock.s @@ -1549,7 +1549,7 @@ sub_80DDA8C: @ 80DDA8C movs r0, 0xC8 strh r0, [r5, 0xA] _080DDAAE: - ldr r4, _080DDAEC @ =gUnknown_030041B8 + ldr r4, _080DDAEC @ =gBattle_BG3_Y movs r1, 0xA ldrsh r0, [r5, r1] movs r1, 0xA @@ -1577,7 +1577,7 @@ _080DDADA: bx r0 .align 2, 0 _080DDAE8: .4byte gTasks -_080DDAEC: .4byte gUnknown_030041B8 +_080DDAEC: .4byte gBattle_BG3_Y thumb_func_end sub_80DDA8C thumb_func_start sub_80DDAF0 @@ -1600,7 +1600,7 @@ sub_80DDAF0: @ 80DDAF0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _080DDB60 @ =gUnknown_030041B8 + ldr r0, _080DDB60 @ =gBattle_BG3_Y ldrh r0, [r0] strh r0, [r4, 0xC] _080DDB1C: @@ -1609,7 +1609,7 @@ _080DDB1C: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0xA] - ldr r6, _080DDB60 @ =gUnknown_030041B8 + ldr r6, _080DDB60 @ =gBattle_BG3_Y movs r2, 0xA ldrsh r1, [r4, r2] movs r0, 0x4 @@ -1635,7 +1635,7 @@ _080DDB54: bx r0 .align 2, 0 _080DDB5C: .4byte gTasks -_080DDB60: .4byte gUnknown_030041B8 +_080DDB60: .4byte gBattle_BG3_Y _080DDB64: .4byte gBattleAnimArgs _080DDB68: .4byte 0x00000fff thumb_func_end sub_80DDAF0 diff --git a/include/scanline_effect.h b/include/scanline_effect.h index 242b35448..314a856fa 100644 --- a/include/scanline_effect.h +++ b/include/scanline_effect.h @@ -4,25 +4,34 @@ // DMA control value to ransfer a single 16-bit value at HBlank #define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1) +#define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS) +#define SCANLINE_EFFECT_REG_BG0VOFS (REG_ADDR_BG0VOFS - REG_ADDR_BG0HOFS) +#define SCANLINE_EFFECT_REG_BG1HOFS (REG_ADDR_BG1HOFS - REG_ADDR_BG0HOFS) +#define SCANLINE_EFFECT_REG_BG1VOFS (REG_ADDR_BG1VOFS - REG_ADDR_BG0HOFS) +#define SCANLINE_EFFECT_REG_BG2HOFS (REG_ADDR_BG2HOFS - REG_ADDR_BG0HOFS) +#define SCANLINE_EFFECT_REG_BG2VOFS (REG_ADDR_BG2VOFS - REG_ADDR_BG0HOFS) +#define SCANLINE_EFFECT_REG_BG3HOFS (REG_ADDR_BG3HOFS - REG_ADDR_BG0HOFS) +#define SCANLINE_EFFECT_REG_BG3VOFS (REG_ADDR_BG3VOFS - REG_ADDR_BG0HOFS) + struct ScanlineEffectParams { volatile void *dmaDest; u32 dmaControl; - u8 unk8; - u8 unk9; + u8 initState; + u8 unused9; }; struct ScanlineEffect { - void *src[2]; + void *dmaSrcBuffers[2]; volatile void *dmaDest; u32 dmaControl; void (*setFirstScanlineReg)(void); - u8 srcBank; - u8 unk15; - u8 unk16; - u8 unk17; - u8 taskId; + u8 srcBuffer; + u8 state; + u8 unused16; + u8 unused17; + u8 waveTaskId; u8 filler19[0x7]; }; @@ -31,15 +40,9 @@ extern struct ScanlineEffect gScanlineEffect; extern u16 gScanlineEffectRegBuffers[][0x3C0]; void ScanlineEffect_Stop(void); -void ScanlineEffect_Stop(void); -void dp12_8087EA4(void); -void dp12_8087EA4(void); -//void ScanlineEffect_SetParams(u32 i, u32 i1, u32 i2); -//void ScanlineEffect_SetParams(); -void ScanlineEffect_SetParams(struct ScanlineEffectParams unk); +void ScanlineEffect_Clear(void); +void ScanlineEffect_SetParams(struct ScanlineEffectParams); void ScanlineEffect_InitHBlankDmaTransfer(void); -void ScanlineEffect_InitHBlankDmaTransfer(); -//void ScanlineEffect_InitWave(int i, int i1, int i2, int i3, int i4, int i5, int i6); -u8 ScanlineEffect_InitWave(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); +u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 a7); #endif // GUARD_SCANLINE_EFFECT_H diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index fc74e3f46..f9e505bf2 100755 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -53,8 +53,8 @@ void sub_80D0C88(u8 taskId) } params.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT; - params.unk8 = 1; - params.unk9 = 0; + params.initState = 1; + params.unused9 = 0; ScanlineEffect_SetParams(params); task->func = sub_80D0D68; } diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index f4fff742c..990535b4e 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -108,9 +108,9 @@ extern u16 gUnknown_02024DE8; extern u8 gActionSelectionCursor[]; extern u8 gMoveSelectionCursor[]; extern u8 gUnknown_02038470[]; -extern u16 gUnknown_030041B0; +extern u16 gBattle_BG3_X; extern u16 gBattle_BG1_Y; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_Y; extern struct Window gUnknown_030041D0; extern u16 gBattle_WIN1H; extern struct Window gUnknown_03004210; @@ -219,7 +219,7 @@ void InitBattle(void) REG_WINOUT = 0; gBattle_WIN0H = 0xF0; gBattle_WIN0V = 0x5051; - dp12_8087EA4(); + ScanlineEffect_Clear(); for (i = 0; i < 80; i++) { @@ -242,8 +242,8 @@ void InitBattle(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 0; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; gBattleTerrain = BattleSetup_GetTerrain(); Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0); @@ -1064,8 +1064,8 @@ void sub_800FCFC(void) REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; REG_BG2VOFS = gBattle_BG2_Y; - REG_BG3HOFS = gUnknown_030041B0; - REG_BG3VOFS = gUnknown_030041B8; + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; REG_WIN0H = gBattle_WIN0H; REG_WIN0V = gBattle_WIN0V; REG_WIN1H = gBattle_WIN1H; @@ -1197,7 +1197,7 @@ void c2_8011A1C(void) REG_WINOUT = 0; gBattle_WIN0H = 0xF0; gBattle_WIN0V = 0x5051; - dp12_8087EA4(); + ScanlineEffect_Clear(); for (i = 0; i < 80; i++) { @@ -1218,8 +1218,8 @@ void c2_8011A1C(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 0; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0); diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 164329c1b..ae8f94130 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -93,7 +93,7 @@ extern u16 gChosenMove; //last used move in battle extern u8 gBankInMenu; extern u8 gActionForBanks[4]; extern u16 gUnknown_02024C2C[4]; //last used moves 2, used by sketch -extern u16 gUnknown_030041B0; +extern u16 gBattle_BG3_X; extern u16 gUnknown_02024C4C[4]; //last used moves by banks, another one extern u8 gCurrentTurnActionNumber; extern u16 gTrappingMoves[]; @@ -17229,7 +17229,7 @@ static void atkF2_displaydexinfo(void) LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(0x0600d000)); LoadCompressedPalette(gBattleTerrainPalette_BattleTower, 0x20, 0x60); REG_BG3CNT = 0x5a0b; - gUnknown_030041B0 = 0x100; + gBattle_BG3_X = 0x100; BeginNormalPaletteFade(0xfffc, 0, 0x10, 0, 0); gBattleCommunication[0]++; } diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 489581132..a5f833b6c 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -67,9 +67,9 @@ extern u8 gUnknown_02024E68[]; extern struct SpriteTemplate gUnknown_02024E8C; extern u8 gAnimMoveTurn; extern u8 gUnknown_02038470[]; -extern u16 gUnknown_030041B0; +extern u16 gBattle_BG3_X; extern u16 gBattle_BG1_Y; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_Y; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; extern u16 gBattle_BG0_X; diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index 843203a1e..f7cdc0694 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -16,7 +16,7 @@ #include "scanline_effect.h" void sub_807DE10(void); -void dp12_8087EA4(void); +void ScanlineEffect_Clear(void); extern const struct OamData gFieldOamData_32x32; @@ -670,7 +670,7 @@ static bool8 Phase2_Transition_Swirl_Func1(struct Task* task) u16 savedIME; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); sub_811D6E8(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_14, 0, 2, 0, 160); @@ -730,7 +730,7 @@ static bool8 Phase2_Transition_Shuffle_Func1(struct Task* task) u16 savedIME; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); BeginNormalPaletteFade(-1, 4, 0, 0x10, 0); memset(gScanlineEffectRegBuffers[1], TRANSITION_STRUCT.field_16, 0x140); @@ -798,7 +798,7 @@ static bool8 Phase2_Transition_BigPokeball_Func1(struct Task* task) u16 *dst1, *dst2; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); task->data[1] = 16; task->data[2] = 0; @@ -1076,7 +1076,7 @@ static bool8 Phase2_Transition_Clockwise_BlackFade_Func1(struct Task* task) u16 i; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); TRANSITION_STRUCT.WININ = 0; TRANSITION_STRUCT.WINOUT = 63; @@ -1269,7 +1269,7 @@ static bool8 Phase2_Transition_Ripple_Func1(struct Task* task) u8 i; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); for (i = 0; i < 160; i++) { @@ -1348,7 +1348,7 @@ static bool8 Phase2_Transition_Wave_Func1(struct Task* task) u8 i; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); TRANSITION_STRUCT.WININ = 63; TRANSITION_STRUCT.WINOUT = 0; @@ -1460,7 +1460,7 @@ static bool8 Phase2_Mugshot_Func1(struct Task* task) u8 i; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); Mugshots_CreateOpponentPlayerSprites(task); task->data[1] = 0; @@ -1844,7 +1844,7 @@ static bool8 Phase2_Transition_Slice_Func1(struct Task* task) u16 i; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); task->data[2] = 256; task->data[3] = 1; @@ -1943,7 +1943,7 @@ static bool8 Phase2_Transition_WhiteFade_Func1(struct Task* task) u16 i; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); TRANSITION_STRUCT.BLDCNT = 0xBF; TRANSITION_STRUCT.BLDY = 0; @@ -2158,7 +2158,7 @@ static bool8 Phase2_Transition_Shards_Func1(struct Task* task) u16 i; sub_811D658(); - dp12_8087EA4(); + ScanlineEffect_Clear(); TRANSITION_STRUCT.WININ = 0x3F; TRANSITION_STRUCT.WINOUT = 0; diff --git a/src/battle/reshow_battle_screen.c b/src/battle/reshow_battle_screen.c index 83dad5f60..a78cb20df 100644 --- a/src/battle/reshow_battle_screen.c +++ b/src/battle/reshow_battle_screen.c @@ -15,9 +15,9 @@ extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; -extern u16 gUnknown_030041B0; +extern u16 gBattle_BG3_X; extern u16 gBattle_BG1_Y; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_Y; extern u16 gBattle_BG0_Y; extern u8 gReservedSpritePaletteCount; extern u8 gActionSelectionCursor[4]; @@ -77,7 +77,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) switch (gReshowState) { case 0: - dp12_8087EA4(); + ScanlineEffect_Clear(); Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); ResetPaletteFade(); Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); @@ -87,8 +87,8 @@ static void CB2_ReshowBattleScreenAfterMenu(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 0; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; break; case 1: { diff --git a/src/contest.c b/src/contest.c index e41838cb1..875fe4502 100644 --- a/src/contest.c +++ b/src/contest.c @@ -51,9 +51,9 @@ extern u8 gBanksBySide[]; extern u8 gObjectBankIDs[]; extern u8 gIsLinkContest; extern u8 gContestPlayerMonIndex; -extern u16 gUnknown_030041B0; +extern u16 gBattle_BG3_X; extern s16 gBattle_BG1_Y; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_Y; extern u16 gBattle_WIN1H; extern struct Window gUnknown_03004210; extern u16 gBattle_WIN0V; @@ -330,8 +330,8 @@ void ResetContestGpuRegs(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 0; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; gBattle_WIN0H = 0; gBattle_WIN0V = 0; gBattle_WIN1H = 0; @@ -412,7 +412,7 @@ void CB2_StartContest(void) SetVBlankCallback(NULL); SetUpContestWindow(); ResetContestGpuRegs(); - dp12_8087EA4(); + ScanlineEffect_Clear(); ResetPaletteFade(); gPaletteFade.bufferTransferDisabled = TRUE; DmaClearLarge32(3, (void *)VRAM, VRAM_SIZE, 0x1000); @@ -626,8 +626,8 @@ void ContestVBlankCallback(void) REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; REG_BG2VOFS = gBattle_BG2_Y; - REG_BG3HOFS = gUnknown_030041B0; - REG_BG3VOFS = gUnknown_030041B8; + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; REG_WIN0H = gBattle_WIN0H; REG_WIN0V = gBattle_WIN0V; REG_WIN1H = gBattle_WIN1H; diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 7c250b584..1da337b04 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -35,8 +35,8 @@ extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; -extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; extern struct Window gUnknown_03004210; extern u8 (*gCallback_03004AE8)(void); @@ -463,8 +463,8 @@ static void sub_80A9F50(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 0; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; } static void sub_80A9FE4(void) @@ -511,8 +511,8 @@ static void sub_80AA090(void) REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; REG_BG2VOFS = gBattle_BG2_Y; - REG_BG3HOFS = gUnknown_030041B0; - REG_BG3VOFS = gUnknown_030041B8; + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -528,7 +528,7 @@ static void sub_80AA10C(void) gPaletteFade.bufferTransferDisabled = 1; SetVBlankCallback(0); sub_80A9F50(); - dp12_8087EA4(); + ScanlineEffect_Clear(); ResetPaletteFade(); ResetSpriteData(); ResetTasks(); diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 3bed951d6..4b64846f9 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -297,7 +297,7 @@ void sub_80E62F8(void) SetVBlankCallback(0); ResetPaletteFade(); ResetSpriteData(); - dp12_8087EA4(); + ScanlineEffect_Clear(); ScanlineEffect_Stop(); sub_80EAD08(); ScanlineEffect_SetParams(gUnknown_083DB698); diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index e7b65bef0..dc8bddd5a 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -2053,7 +2053,7 @@ void sub_80EAD08(void) u16 r2; u16 i; - r4 = gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; + r4 = gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; r4 += 88; r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF; diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c index cb5f66649..1fc78efaa 100644 --- a/src/engine/option_menu.c +++ b/src/engine/option_menu.c @@ -3,12 +3,12 @@ #include "main.h" #include "menu.h" #include "palette.h" +#include "scanline_effect.h" #include "sprite.h" #include "strings2.h" #include "task.h" extern void SetPokemonCryStereo(u32 val); -extern void ScanlineEffect_Stop(void); //Task data enum { diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index d077bc670..a8b49a8eb 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -439,7 +439,7 @@ void CB2_InitResetRtcScreen(void) ResetOamRange(0, 128); LoadOam(); ScanlineEffect_Stop(); - dp12_8087EA4(); + ScanlineEffect_Clear(); ResetSpriteData(); ResetTasks(); ResetPaletteFade(); diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index be22b24c4..ab43ac716 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -730,7 +730,7 @@ bool8 sub_8093AA0(struct Task *task) u32 i; ewram0_2.var_4 = FALSE; - dp12_8087EA4(); + ScanlineEffect_Clear(); for (i = 0; i < 0xA0; i++) gScanlineEffectRegBuffers[1][i] = -4; SetHBlankCallback(sub_8093D7C); diff --git a/src/field/field_screen_effect.c b/src/field/field_screen_effect.c index bc70e1a63..61301c5a9 100644 --- a/src/field/field_screen_effect.c +++ b/src/field/field_screen_effect.c @@ -64,11 +64,11 @@ static void sub_8081424(u8 taskId) switch (data[0]) { case 0: - sub_8081398(&gScanlineEffectRegBuffers[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); + sub_8081398(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], data[1], data[2], data[3]); data[0] = 1; break; case 1: - sub_8081398(&gScanlineEffectRegBuffers[gScanlineEffect.srcBank][0], data[1], data[2], data[3]); + sub_8081398(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], data[1], data[2], data[3]); data[0] = 0; data[3] += data[5]; if (data[3] > data[4]) @@ -85,7 +85,7 @@ static void sub_8081424(u8 taskId) } break; case 2: - dp12_8087EA4(); + ScanlineEffect_Clear(); DestroyTask(taskId); break; } diff --git a/src/field/overworld.c b/src/field/overworld.c index 2590852af..86b0a5dac 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -1731,7 +1731,7 @@ void sub_8054D4C(u32 a1) ResetTasks(); ResetSpriteData(); ResetPaletteFade(); - dp12_8087EA4(); + ScanlineEffect_Clear(); ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); sub_805C7C4(0); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 6017f56bf..d6881cb01 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -771,7 +771,7 @@ static bool32 sub_80719FC(u8 *step) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - dp12_8087EA4(); + ScanlineEffect_Clear(); break; case 2: Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index ec327796a..bf8306fc0 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -123,12 +123,12 @@ extern u8 StorageSystemGetNextMonIndex(struct BoxPokemon *, u8, u8, u8); extern struct MusicPlayerInfo gMPlay_BGM; extern u8 gUnknown_020384F0; extern u8 gUnknown_08208238[]; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_Y; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; -extern u16 gUnknown_030041B0; +extern u16 gBattle_BG3_X; extern TaskFunc gUnknown_03005CF0; extern struct Sprite *gUnknown_020384F4; extern struct SpriteTemplate gUnknown_02024E8C; @@ -586,8 +586,8 @@ void sub_809D85C(void) REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; REG_BG2VOFS = gBattle_BG2_Y; - REG_BG3HOFS = gUnknown_030041B0; - REG_BG3VOFS = gUnknown_030041B8; + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; LoadOam(); ProcessSpriteCopyRequests(); @@ -813,11 +813,11 @@ bool8 sub_809DA84(void) case 20: if (GetMonData(&pssData.loadedMon, MON_DATA_IS_EGG)) { - gUnknown_030041B0 = 256; + gBattle_BG3_X = 256; } else { - gUnknown_030041B0 = 0; + gBattle_BG3_X = 0; } gMain.state++; @@ -872,8 +872,8 @@ static void sub_809DE64(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 0; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; REG_BG0HOFS = 0; REG_BG0VOFS = 0; @@ -2176,11 +2176,11 @@ void sub_809F43C(u8 taskId) pssData.loadGfxState = 0; if (GetMonData(&pssData.loadedMon, MON_DATA_IS_EGG)) { - gUnknown_030041B0 = 256; + gBattle_BG3_X = 256; } else { - gUnknown_030041B0 = 0; + gBattle_BG3_X = 0; } gMain.state++; diff --git a/src/scanline_effect.c b/src/scanline_effect.c index 0fa5b024d..b4de0689f 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -13,10 +13,10 @@ extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; -extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; -EWRAM_DATA static u8 gUnknown_0202FFA4 = 0; +EWRAM_DATA static u8 sShouldStopWaveTask = FALSE; struct ScanlineEffect gScanlineEffect; @@ -27,27 +27,27 @@ u16 gScanlineEffectRegBuffers[2][0x3C0]; void ScanlineEffect_Stop(void) { - gScanlineEffect.unk15 = 0; + gScanlineEffect.state = 0; DmaStop(0); - if (gScanlineEffect.taskId != 0xFF) + if (gScanlineEffect.waveTaskId != 0xFF) { - DestroyTask(gScanlineEffect.taskId); - gScanlineEffect.taskId = 0xFF; + DestroyTask(gScanlineEffect.waveTaskId); + gScanlineEffect.waveTaskId = 0xFF; } } -void dp12_8087EA4(void) +void ScanlineEffect_Clear(void) { CpuFill16(0, gScanlineEffectRegBuffers, sizeof(gScanlineEffectRegBuffers)); - gScanlineEffect.src[0] = NULL; - gScanlineEffect.src[1] = NULL; + gScanlineEffect.dmaSrcBuffers[0] = NULL; + gScanlineEffect.dmaSrcBuffers[1] = NULL; gScanlineEffect.dmaDest = NULL; gScanlineEffect.dmaControl = 0; - gScanlineEffect.srcBank = 0; - gScanlineEffect.unk15 = 0; - gScanlineEffect.unk16 = 0; - gScanlineEffect.unk17 = 0; - gScanlineEffect.taskId = 0xFF; + gScanlineEffect.srcBuffer = 0; + gScanlineEffect.state = 0; + gScanlineEffect.unused16 = 0; + gScanlineEffect.unused17 = 0; + gScanlineEffect.waveTaskId = 0xFF; } void ScanlineEffect_SetParams(struct ScanlineEffectParams params) @@ -56,48 +56,49 @@ void ScanlineEffect_SetParams(struct ScanlineEffectParams params) { // Set the DMA src to the value for the second scanline because the // first DMA transfer occurs in HBlank *after* the first scanline is drawn - gScanlineEffect.src[0] = (u16 *)gScanlineEffectRegBuffers[0] + 1; - gScanlineEffect.src[1] = (u16 *)gScanlineEffectRegBuffers[1] + 1; + gScanlineEffect.dmaSrcBuffers[0] = (u16 *)gScanlineEffectRegBuffers[0] + 1; + gScanlineEffect.dmaSrcBuffers[1] = (u16 *)gScanlineEffectRegBuffers[1] + 1; gScanlineEffect.setFirstScanlineReg = CopyValue16Bit; } else // assume 32-bit { // Set the DMA src to the value for the second scanline because the // first DMA transfer occurs in HBlank *after* the first scanline is drawn - gScanlineEffect.src[0] = (u32 *)gScanlineEffectRegBuffers[0] + 1; - gScanlineEffect.src[1] = (u32 *)gScanlineEffectRegBuffers[1] + 1; + gScanlineEffect.dmaSrcBuffers[0] = (u32 *)gScanlineEffectRegBuffers[0] + 1; + gScanlineEffect.dmaSrcBuffers[1] = (u32 *)gScanlineEffectRegBuffers[1] + 1; gScanlineEffect.setFirstScanlineReg = CopyValue32Bit; } gScanlineEffect.dmaControl = params.dmaControl; - gScanlineEffect.dmaDest = params.dmaDest; - gScanlineEffect.unk15 = params.unk8; - gScanlineEffect.unk16 = params.unk9; - gScanlineEffect.unk17 = params.unk9; + gScanlineEffect.dmaDest = params.dmaDest; + gScanlineEffect.state = params.initState; + gScanlineEffect.unused16 = params.unused9; + gScanlineEffect.unused17 = params.unused9; } void ScanlineEffect_InitHBlankDmaTransfer(void) { - if (gScanlineEffect.unk15 != 0) + if (gScanlineEffect.state == 0) { - if (gScanlineEffect.unk15 == 3) - { - gScanlineEffect.unk15 = 0; - DmaStop(0); - gUnknown_0202FFA4 = 1; - } - else - { - DmaStop(0); - // Set DMA to copy to dest register on each HBlank for the next frame. - // The HBlank DMA transfers do not occurr during VBlank, so the transfer - // will begin on the HBlank after the first scanline - DmaSet(0, gScanlineEffect.src[gScanlineEffect.srcBank], gScanlineEffect.dmaDest, gScanlineEffect.dmaControl); - // Manually set the reg for the first scanline - gScanlineEffect.setFirstScanlineReg(); - // Swap current buffer - gScanlineEffect.srcBank ^= 1; - } + return; + } + else if (gScanlineEffect.state == 3) + { + gScanlineEffect.state = 0; + DmaStop(0); + sShouldStopWaveTask = TRUE; + } + else + { + DmaStop(0); + // Set DMA to copy to dest register on each HBlank for the next frame. + // The HBlank DMA transfers do not occurr during VBlank, so the transfer + // will begin on the HBlank after the first scanline + DmaSet(0, gScanlineEffect.dmaSrcBuffers[gScanlineEffect.srcBuffer], gScanlineEffect.dmaDest, gScanlineEffect.dmaControl); + // Manually set the reg for the first scanline + gScanlineEffect.setFirstScanlineReg(); + // Swap current buffer + gScanlineEffect.srcBuffer ^= 1; } } @@ -107,7 +108,7 @@ void ScanlineEffect_InitHBlankDmaTransfer(void) static void CopyValue16Bit(void) { u16 *dest = (u16 *)gScanlineEffect.dmaDest; - u16 *src = (u16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; + u16 *src = (u16 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; *dest = *src; } @@ -115,86 +116,87 @@ static void CopyValue16Bit(void) static void CopyValue32Bit(void) { u32 *dest = (u32 *)gScanlineEffect.dmaDest; - u32 *src = (u32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; + u32 *src = (u32 *)&gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; *dest = *src; } -#define tStartLine data[0] -#define tEndLine data[1] -#define framesUntilMove data[4] -#define tDelayInterval data[5] -#define tRegOffset data[6] +#define tStartLine data[0] +#define tEndLine data[1] +#define tWaveLength data[2] +#define tSrcBufferOffset data[3] +#define tFramesUntilMove data[4] +#define tDelayInterval data[5] +#define tRegOffset data[6] +#define tApplyBattleBgOffsets data[7] static void TaskFunc_UpdateWavePerFrame(u8 taskId) { int value = 0; + int i; + int offset; - if (gUnknown_0202FFA4) + if (sShouldStopWaveTask) { DestroyTask(taskId); - gScanlineEffect.taskId = 0xFF; + gScanlineEffect.waveTaskId = 0xFF; } else { - if (gTasks[taskId].data[7]) + if (gTasks[taskId].tApplyBattleBgOffsets) { switch (gTasks[taskId].tRegOffset) { - case 0x0: + case SCANLINE_EFFECT_REG_BG0HOFS: value = gBattle_BG0_X; break; - case 0x2: + case SCANLINE_EFFECT_REG_BG0VOFS: value = gBattle_BG0_Y; break; - case 0x4: + case SCANLINE_EFFECT_REG_BG1HOFS: value = gBattle_BG1_X; break; - case 0x6: + case SCANLINE_EFFECT_REG_BG1VOFS: value = gBattle_BG1_Y; break; - case 0x8: + case SCANLINE_EFFECT_REG_BG2HOFS: value = gBattle_BG2_X; break; - case 0xA: + case SCANLINE_EFFECT_REG_BG2VOFS: value = gBattle_BG2_Y; break; - case 0xC: - value = gUnknown_030041B0; + case SCANLINE_EFFECT_REG_BG3HOFS: + value = gBattle_BG3_X; break; - case 0xE: - value = gUnknown_030041B8; + case SCANLINE_EFFECT_REG_BG3VOFS: + value = gBattle_BG3_Y; break; } } - if (gTasks[taskId].framesUntilMove != 0) + if (gTasks[taskId].tFramesUntilMove != 0) { - int i; - int offset; - - gTasks[taskId].framesUntilMove--; - offset = gTasks[taskId].data[3] + 320; + gTasks[taskId].tFramesUntilMove--; + offset = gTasks[taskId].tSrcBufferOffset + 320; for (i = gTasks[taskId].tStartLine; i < gTasks[taskId].tEndLine; i++) { - gScanlineEffectRegBuffers[gScanlineEffect.srcBank][i] = gScanlineEffectRegBuffers[0][offset] + value; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gScanlineEffectRegBuffers[0][offset] + value; offset++; } } else { - int i; - int offset; - - gTasks[taskId].framesUntilMove = gTasks[taskId].tDelayInterval; - offset = gTasks[taskId].data[3] + 320; + gTasks[taskId].tFramesUntilMove = gTasks[taskId].tDelayInterval; + offset = gTasks[taskId].tSrcBufferOffset + 320; for (i = gTasks[taskId].tStartLine; i < gTasks[taskId].tEndLine; i++) { - gScanlineEffectRegBuffers[gScanlineEffect.srcBank][i] = gScanlineEffectRegBuffers[0][offset] + value; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gScanlineEffectRegBuffers[0][offset] + value; offset++; } - gTasks[taskId].data[3]++; - if (gTasks[taskId].data[3] == gTasks[taskId].data[2]) - gTasks[taskId].data[3] = 0; + + // increment src buffer offset + gTasks[taskId].tSrcBufferOffset++; + if (gTasks[taskId].tSrcBufferOffset == gTasks[taskId].tWaveLength) + gTasks[taskId].tSrcBufferOffset = 0; } } } @@ -216,39 +218,38 @@ static void GenerateWave(u16 *buffer, u8 frequency, u8 amplitude, u8 unused) // 'frequency' and 'amplitude' control the frequency and amplitude of the wave. // 'delayInterval' controls how fast the wave travels up the screen. The wave will shift upwards one scanline every 'delayInterval'+1 frames. // 'regOffset' is the offset of the video register to modify. -u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 a7) +u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 applyBattleBgOffsets) { int i; int offset; struct ScanlineEffectParams params; u8 taskId; - dp12_8087EA4(); + ScanlineEffect_Clear(); params.dmaDest = (void *)(REG_ADDR_BG0HOFS + regOffset); params.dmaControl = SCANLINE_EFFECT_DMACNT_16BIT; - params.unk8 = 1; - params.unk9 = 0; + params.initState = 1; + params.unused9 = 0; ScanlineEffect_SetParams(params); taskId = CreateTask(TaskFunc_UpdateWavePerFrame, 0); - gTasks[taskId].tStartLine = startLine; - gTasks[taskId].tEndLine = endLine; - gTasks[taskId].data[2] = 256 / frequency; - gTasks[taskId].data[3] = 0; - gTasks[taskId].framesUntilMove = delayInterval; - gTasks[taskId].tDelayInterval = delayInterval; - gTasks[taskId].tRegOffset = regOffset; - gTasks[taskId].data[7] = a7; + gTasks[taskId].tStartLine = startLine; + gTasks[taskId].tEndLine = endLine; + gTasks[taskId].tWaveLength = 256 / frequency; + gTasks[taskId].tSrcBufferOffset = 0; + gTasks[taskId].tFramesUntilMove = delayInterval; + gTasks[taskId].tDelayInterval = delayInterval; + gTasks[taskId].tRegOffset = regOffset; + gTasks[taskId].tApplyBattleBgOffsets = applyBattleBgOffsets; - gScanlineEffect.taskId = taskId; - gUnknown_0202FFA4 = 0; + gScanlineEffect.waveTaskId = taskId; + sShouldStopWaveTask = FALSE; GenerateWave(&gScanlineEffectRegBuffers[0][320], frequency, amplitude, endLine - startLine); offset = 320; - for (i = startLine; i < endLine; i++) { gScanlineEffectRegBuffers[0][i] = gScanlineEffectRegBuffers[0][offset]; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index aeea3e292..53eb2f1e8 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -71,8 +71,8 @@ extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; -extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B8; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; extern u8 gBattleTerrain; extern u8 gReservedSpritePaletteCount; extern u16 gMoveToLearn; @@ -206,8 +206,8 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 256; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 256; + gBattle_BG3_Y = 0; Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); gBattleTerrain = BATTLE_TERRAIN_PLAIN; @@ -314,8 +314,8 @@ static void CB2_EvolutionSceneLoadGraphics(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 256; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 256; + gBattle_BG3_Y = 0; Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); gBattleTerrain = BATTLE_TERRAIN_PLAIN; @@ -368,8 +368,8 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gBattle_BG1_Y = 0; gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - gUnknown_030041B0 = 256; - gUnknown_030041B8 = 0; + gBattle_BG3_X = 256; + gBattle_BG3_Y = 0; gMain.state++; break; case 1: @@ -3929,8 +3929,8 @@ static void VBlankCB_EvolutionScene(void) REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; REG_BG2VOFS = gBattle_BG2_Y; - REG_BG3HOFS = gUnknown_030041B0; - REG_BG3VOFS = gUnknown_030041B8; + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -3945,8 +3945,8 @@ static void VBlankCB_TradeEvolutionScene(void) REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; REG_BG2VOFS = gBattle_BG2_Y; - REG_BG3HOFS = gUnknown_030041B0; - REG_BG3VOFS = gUnknown_030041B8; + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index f39745c02..303dcf3e0 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -16,6 +16,7 @@ #include "data2.h" #include "decompress.h" #include "random.h" +#include "scanline_effect.h" #include "trig.h" #include "ewram.h" @@ -95,7 +96,6 @@ bool8 sub_80C5DCC(void); bool8 sub_80C5F98(void); void ReturnFromHallOfFamePC(void); u16 SpeciesToPokedexNum(u16 species); -void ScanlineEffect_Stop(void); // data and gfx diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index 2de3554fe..202b752a6 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -711,7 +711,7 @@ void CB2_InitTitleScreen(void) if (!UpdatePaletteFade()) { StartPokemonLogoShine(FALSE); - ScanlineEffect_InitWave(0, DISPLAY_HEIGHT, 4, 4, 0, 4, 1); + ScanlineEffect_InitWave(0, DISPLAY_HEIGHT, 4, 4, 0, SCANLINE_EFFECT_REG_BG1HOFS, TRUE); SetMainCallback2(MainCB2); } break; diff --git a/sym_common.txt b/sym_common.txt index 85a5ad6e3..cfb1b6b13 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -8,13 +8,13 @@ @ battle .align 2 -gUnknown_030041B0: @ 30041B0 +gBattle_BG3_X: @ 30041B0 .space 0x4 gBattle_BG1_Y: @ 30041B4 .space 0x4 -gUnknown_030041B8: @ 30041B8 +gBattle_BG3_Y: @ 30041B8 .space 0x8 gBattleTextBuff1: @ 30041C0 -- cgit v1.2.3 From 8d658666a14f8364df32d3f14c6923ebe194153e Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 10 Jan 2018 17:03:17 -0500 Subject: decompiled up to sub_80DFBD8 --- asm/dragon.s | 827 ----------------------------------------------- ld_script.txt | 1 + src/battle/anim/dragon.c | 262 +++++++++++++++ 3 files changed, 263 insertions(+), 827 deletions(-) create mode 100755 src/battle/anim/dragon.c diff --git a/asm/dragon.s b/asm/dragon.s index 7c4ea0547..bb7ba83d9 100755 --- a/asm/dragon.s +++ b/asm/dragon.s @@ -7,833 +7,6 @@ @ dragon - thumb_func_start sub_80DF5A0 -sub_80DF5A0: @ 80DF5A0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080DF5E8 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DF5F0 - ldr r2, _080DF5EC @ =gBattleAnimArgs - ldrh r0, [r5, 0x20] - ldrh r1, [r2] - subs r0, r1 - strh r0, [r5, 0x20] - ldrh r0, [r2, 0x6] - negs r0, r0 - strh r0, [r2, 0x6] - ldrh r0, [r2, 0x8] - negs r0, r0 - strh r0, [r2, 0x8] - adds r1, r2, 0 - b _080DF5FA - .align 2, 0 -_080DF5E8: .4byte gAnimBankAttacker -_080DF5EC: .4byte gBattleAnimArgs -_080DF5F0: - ldr r1, _080DF630 @ =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r5, 0x20] - adds r0, r2 - strh r0, [r5, 0x20] -_080DF5FA: - ldrh r0, [r1, 0x2] - ldrh r2, [r5, 0x22] - adds r0, r2 - strh r0, [r5, 0x22] - ldrh r0, [r1, 0x4] - strh r0, [r5, 0x2E] - ldrh r0, [r1, 0x6] - strh r0, [r5, 0x30] - ldrh r0, [r1, 0x8] - strh r0, [r5, 0x34] - ldrh r0, [r1, 0xA] - strh r0, [r5, 0x38] - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r1, _080DF634 @ =move_anim_8074EE0 - adds r0, r5, 0 - bl StoreSpriteCallbackInData - ldr r0, _080DF638 @ =sub_8078504 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DF630: .4byte gBattleAnimArgs -_080DF634: .4byte move_anim_8074EE0 -_080DF638: .4byte sub_8078504 - thumb_func_end sub_80DF5A0 - - thumb_func_start sub_80DF63C -sub_80DF63C: @ 80DF63C - push {r4,r5,lr} - adds r5, r0, 0 - bl sub_8078650 - ldr r4, _080DF694 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x32] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x36] - ldr r0, _080DF698 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DF6A0 - ldr r2, _080DF69C @ =gBattleAnimArgs - ldrh r0, [r5, 0x20] - ldrh r1, [r2, 0x2] - subs r0, r1 - strh r0, [r5, 0x20] - ldrh r0, [r5, 0x22] - adds r1, r0 - strh r1, [r5, 0x22] - ldrh r0, [r5, 0x32] - ldrh r1, [r2, 0x4] - subs r0, r1 - strh r0, [r5, 0x32] - ldrh r0, [r2, 0x6] - ldrh r1, [r5, 0x36] - adds r0, r1 - strh r0, [r5, 0x36] - b _080DF6CA - .align 2, 0 -_080DF694: .4byte gAnimBankTarget -_080DF698: .4byte gAnimBankAttacker -_080DF69C: .4byte gBattleAnimArgs -_080DF6A0: - ldr r1, _080DF6E4 @ =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r5, 0x20] - adds r0, r2 - strh r0, [r5, 0x20] - ldrh r0, [r1, 0x2] - ldrh r2, [r5, 0x22] - adds r0, r2 - strh r0, [r5, 0x22] - ldrh r0, [r1, 0x4] - ldrh r2, [r5, 0x32] - adds r0, r2 - strh r0, [r5, 0x32] - ldrh r0, [r1, 0x6] - ldrh r1, [r5, 0x36] - adds r0, r1 - strh r0, [r5, 0x36] - adds r0, r5, 0 - movs r1, 0x1 - bl StartSpriteAnim -_080DF6CA: - ldr r0, _080DF6E4 @ =gBattleAnimArgs - ldrh r0, [r0, 0x8] - strh r0, [r5, 0x2E] - ldr r0, _080DF6E8 @ =sub_8078B34 - str r0, [r5, 0x1C] - ldr r1, _080DF6EC @ =move_anim_8074EE0 - adds r0, r5, 0 - bl StoreSpriteCallbackInData - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DF6E4: .4byte gBattleAnimArgs -_080DF6E8: .4byte sub_8078B34 -_080DF6EC: .4byte move_anim_8074EE0 - thumb_func_end sub_80DF63C - - thumb_func_start sub_80DF6F0 -sub_80DF6F0: @ 80DF6F0 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, _080DF704 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080DF70C - ldr r4, _080DF708 @ =gAnimBankAttacker - b _080DF70E - .align 2, 0 -_080DF704: .4byte gBattleAnimArgs -_080DF708: .4byte gAnimBankAttacker -_080DF70C: - ldr r4, _080DF750 @ =gAnimBankTarget -_080DF70E: - ldrb r0, [r4] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldr r4, _080DF754 @ =gBattleAnimArgs - movs r0, 0x2 - ldrsh r1, [r4, r0] - adds r0, r5, 0 - bl sub_807867C - ldrh r0, [r4, 0x4] - ldrh r1, [r5, 0x22] - adds r0, r1 - strh r0, [r5, 0x22] - ldr r0, _080DF758 @ =sub_8078600 - str r0, [r5, 0x1C] - ldr r1, _080DF75C @ =move_anim_8074EE0 - adds r0, r5, 0 - bl StoreSpriteCallbackInData - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DF750: .4byte gAnimBankTarget -_080DF754: .4byte gBattleAnimArgs -_080DF758: .4byte sub_8078600 -_080DF75C: .4byte move_anim_8074EE0 - thumb_func_end sub_80DF6F0 - - thumb_func_start sub_80DF760 -sub_80DF760: @ 80DF760 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080DF788 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DF77A - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim -_080DF77A: - adds r0, r4, 0 - bl sub_80DF63C - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DF788: .4byte gAnimBankAttacker - thumb_func_end sub_80DF760 - - thumb_func_start sub_80DF78C -sub_80DF78C: @ 80DF78C - push {r4-r7,lr} - adds r6, r0, 0 - ldr r4, _080DF7E0 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - movs r5, 0 - strh r0, [r6, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x22] - strh r5, [r6, 0x36] - movs r0, 0x1 - strh r0, [r6, 0x38] - ldr r0, _080DF7E4 @ =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r6, 0x3A] - ldr r4, _080DF7E8 @ =gBankAttacker - ldrb r0, [r4] - movs r1, 0 - bl sub_807A100 - lsls r7, r0, 16 - lsrs r5, r7, 16 - ldrb r0, [r4] - movs r1, 0x1 - bl sub_807A100 - lsls r1, r0, 16 - lsrs r0, r1, 16 - cmp r5, r0 - bls _080DF7EC - lsrs r0, r7, 17 - b _080DF7EE - .align 2, 0 -_080DF7E0: .4byte gAnimBankAttacker -_080DF7E4: .4byte gBattleAnimArgs -_080DF7E8: .4byte gBankAttacker -_080DF7EC: - lsrs r0, r1, 17 -_080DF7EE: - strh r0, [r6, 0x3C] - movs r1, 0x3A - ldrsh r0, [r6, r1] - movs r2, 0x3C - ldrsh r1, [r6, r2] - bl Cos - strh r0, [r6, 0x24] - movs r1, 0x3A - ldrsh r0, [r6, r1] - movs r2, 0x3C - ldrsh r1, [r6, r2] - bl Sin - strh r0, [r6, 0x26] - ldr r0, _080DF818 @ =sub_80DF81C - str r0, [r6, 0x1C] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DF818: .4byte sub_80DF81C - thumb_func_end sub_80DF78C - - thumb_func_start sub_80DF81C -sub_80DF81C: @ 80DF81C - push {r4,r5,lr} - adds r4, r0, 0 - movs r0, 0x2E - ldrsh r5, [r4, r0] - cmp r5, 0 - beq _080DF82E - cmp r5, 0x1 - beq _080DF89A - b _080DF91E -_080DF82E: - ldrh r0, [r4, 0x3A] - ldrh r1, [r4, 0x38] - subs r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x3A] - movs r1, 0x3A - ldrsh r0, [r4, r1] - movs r2, 0x3C - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x24] - movs r1, 0x3A - ldrsh r0, [r4, r1] - movs r2, 0x3C - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x36] - adds r0, 0x1 - strh r0, [r4, 0x36] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080DF880 - strh r5, [r4, 0x36] - ldrh r1, [r4, 0x38] - movs r2, 0x38 - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _080DF880 - adds r0, r1, 0x1 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - ble _080DF880 - movs r0, 0x10 - strh r0, [r4, 0x38] -_080DF880: - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - ble _080DF91E - movs r0, 0 - strh r0, [r4, 0x34] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080DF91E -_080DF89A: - ldrh r0, [r4, 0x3A] - ldrh r1, [r4, 0x38] - subs r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x3A] - ldrh r1, [r4, 0x3C] - movs r2, 0x3C - ldrsh r0, [r4, r2] - cmp r0, 0x95 - bgt _080DF8C2 - adds r0, r1, 0 - adds r0, 0x8 - strh r0, [r4, 0x3C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x95 - ble _080DF8C2 - movs r0, 0x96 - strh r0, [r4, 0x3C] -_080DF8C2: - movs r1, 0x3A - ldrsh r0, [r4, r1] - movs r2, 0x3C - ldrsh r1, [r4, r2] - bl Cos - strh r0, [r4, 0x24] - movs r1, 0x3A - ldrsh r0, [r4, r1] - movs r2, 0x3C - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x36] - adds r0, 0x1 - strh r0, [r4, 0x36] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080DF90A - movs r0, 0 - strh r0, [r4, 0x36] - ldrh r1, [r4, 0x38] - movs r2, 0x38 - ldrsh r0, [r4, r2] - cmp r0, 0xF - bgt _080DF90A - adds r0, r1, 0x1 - strh r0, [r4, 0x38] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - ble _080DF90A - movs r0, 0x10 - strh r0, [r4, 0x38] -_080DF90A: - ldrh r0, [r4, 0x34] - adds r0, 0x1 - strh r0, [r4, 0x34] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x14 - ble _080DF91E - adds r0, r4, 0 - bl DestroyAnimSprite -_080DF91E: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DF81C - - thumb_func_start sub_80DF924 -sub_80DF924: @ 80DF924 - push {r4-r6,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080DF950 @ =gTasks - adds r4, r1, r0 - ldr r0, _080DF954 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080DF960 - ldr r0, _080DF958 @ =REG_BG1HOFS - str r0, [sp] - ldr r0, _080DF95C @ =gBattle_BG1_X - b _080DF966 - .align 2, 0 -_080DF950: .4byte gTasks -_080DF954: .4byte gAnimBankAttacker -_080DF958: .4byte REG_BG1HOFS -_080DF95C: .4byte gBattle_BG1_X -_080DF960: - ldr r0, _080DF9DC @ =REG_BG2HOFS - str r0, [sp] - ldr r0, _080DF9E0 @ =gBattle_BG2_X -_080DF966: - ldrh r0, [r0] - strh r0, [r4, 0xC] - ldr r0, _080DF9E4 @ =0xa2600001 - str r0, [sp, 0x4] - mov r1, sp - movs r5, 0 - movs r0, 0x1 - strb r0, [r1, 0x8] - mov r0, sp - strb r5, [r0, 0x9] - ldr r0, _080DF9E8 @ =gAnimBankAttacker - ldrb r0, [r0] - bl sub_8077FC0 - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - subs r1, 0x20 - strh r1, [r4, 0xE] - adds r0, 0x20 - strh r0, [r4, 0x10] - cmp r1, 0 - bge _080DF996 - strh r5, [r4, 0xE] -_080DF996: - ldrh r3, [r4, 0xE] - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r3, r0 - bgt _080DF9C4 - ldr r5, _080DF9EC @ =gUnknown_03004DE0 - movs r0, 0xF0 - lsls r0, 3 - adds r6, r5, r0 -_080DF9A8: - lsls r1, r3, 1 - adds r2, r1, r5 - ldrh r0, [r4, 0xC] - strh r0, [r2] - adds r1, r6 - ldrh r0, [r4, 0xC] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r3, r0 - ble _080DF9A8 -_080DF9C4: - ldr r0, [sp] - ldr r1, [sp, 0x4] - ldr r2, [sp, 0x8] - bl sub_80895F8 - ldr r0, _080DF9F0 @ =sub_80DF9F4 - str r0, [r4] - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DF9DC: .4byte REG_BG2HOFS -_080DF9E0: .4byte gBattle_BG2_X -_080DF9E4: .4byte 0xa2600001 -_080DF9E8: .4byte gAnimBankAttacker -_080DF9EC: .4byte gUnknown_03004DE0 -_080DF9F0: .4byte sub_80DF9F4 - thumb_func_end sub_80DF924 - - thumb_func_start sub_80DF9F4 -sub_80DF9F4: @ 80DF9F4 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r3, 2 - adds r0, r3 - lsls r0, 3 - ldr r1, _080DFA18 @ =gTasks - adds r2, r0, r1 - movs r1, 0x8 - ldrsh r0, [r2, r1] - cmp r0, 0x4 - bhi _080DFAAA - lsls r0, 2 - ldr r1, _080DFA1C @ =_080DFA20 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080DFA18: .4byte gTasks -_080DFA1C: .4byte _080DFA20 - .align 2, 0 -_080DFA20: - .4byte _080DFA34 - .4byte _080DFA56 - .4byte _080DFA66 - .4byte _080DFA92 - .4byte _080DFAA4 -_080DFA34: - ldrh r0, [r2, 0x16] - adds r0, 0x1 - strh r0, [r2, 0x16] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080DFA8A - movs r0, 0 - strh r0, [r2, 0x16] - ldrh r0, [r2, 0x14] - adds r0, 0x1 - strh r0, [r2, 0x14] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - bne _080DFA8A - b _080DFA84 -_080DFA56: - ldrh r0, [r2, 0xA] - adds r0, 0x1 - strh r0, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3C - ble _080DFA8A - b _080DFA84 -_080DFA66: - ldrh r0, [r2, 0x16] - adds r0, 0x1 - strh r0, [r2, 0x16] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080DFA8A - movs r0, 0 - strh r0, [r2, 0x16] - ldrh r0, [r2, 0x14] - subs r0, 0x1 - strh r0, [r2, 0x14] - lsls r0, 16 - cmp r0, 0 - bne _080DFA8A -_080DFA84: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] -_080DFA8A: - adds r0, r2, 0 - bl sub_80DFAB0 - b _080DFAAA -_080DFA92: - ldr r1, _080DFAA0 @ =gUnknown_03004DC0 - movs r0, 0x3 - strb r0, [r1, 0x15] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _080DFAAA - .align 2, 0 -_080DFAA0: .4byte gUnknown_03004DC0 -_080DFAA4: - adds r0, r3, 0 - bl DestroyAnimVisualTask -_080DFAAA: - pop {r0} - bx r0 - thumb_func_end sub_80DF9F4 - - thumb_func_start sub_80DFAB0 -sub_80DFAB0: @ 80DFAB0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - ldrh r3, [r5, 0x12] - ldrh r4, [r5, 0xE] - movs r1, 0x10 - ldrsh r0, [r5, r1] - cmp r4, r0 - bgt _080DFB06 - ldr r7, _080DFB1C @ =gUnknown_03004DE0 - mov r12, r7 - ldr r0, _080DFB20 @ =gSineTable - mov r8, r0 - ldr r6, _080DFB24 @ =gUnknown_03004DC0 -_080DFACE: - lsls r2, r4, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r12 - lsls r0, r3, 1 - add r0, r8 - movs r7, 0 - ldrsh r1, [r0, r7] - movs r7, 0x14 - ldrsh r0, [r5, r7] - muls r0, r1 - asrs r0, 7 - ldrh r1, [r5, 0xC] - adds r0, r1 - strh r0, [r2] - adds r3, 0x8 - movs r0, 0xFF - ands r3, r0 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - movs r7, 0x10 - ldrsh r0, [r5, r7] - cmp r4, r0 - ble _080DFACE -_080DFB06: - ldrh r0, [r5, 0x12] - adds r0, 0x9 - movs r1, 0xFF - ands r0, r1 - strh r0, [r5, 0x12] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DFB1C: .4byte gUnknown_03004DE0 -_080DFB20: .4byte gSineTable -_080DFB24: .4byte gUnknown_03004DC0 - thumb_func_end sub_80DFAB0 - - thumb_func_start sub_80DFB28 -sub_80DFB28: @ 80DFB28 - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r4, r0, 0 - ldr r5, _080DFBC8 @ =gBattleAnimArgs - movs r0, 0x4 - ldrsh r1, [r5, r0] - lsls r0, r1, 1 - adds r0, r1 - movs r1, 0x5 - bl __divsi3 - adds r6, r0, 0 - ldr r1, _080DFBCC @ =gAnimBankAttacker - mov r8, r1 - ldrb r0, [r1] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x20] - mov r2, r8 - ldrb r0, [r2] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r3, [r5, 0x8] - adds r0, r3 - strh r0, [r4, 0x22] - movs r1, 0x2 - ldrsh r0, [r5, r1] - movs r2, 0x4 - ldrsh r1, [r5, r2] - bl Cos - strh r0, [r4, 0x30] - movs r3, 0x2 - ldrsh r0, [r5, r3] - lsls r6, 16 - asrs r6, 16 - adds r1, r6, 0 - bl Sin - strh r0, [r4, 0x32] - ldrh r1, [r4, 0x30] - ldrh r2, [r5] - adds r3, r2, 0 - muls r3, r1 - adds r1, r3, 0 - ldrh r3, [r4, 0x20] - adds r1, r3 - strh r1, [r4, 0x20] - adds r1, r2, 0 - muls r1, r0 - adds r0, r1, 0 - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x34] - ldr r0, _080DFBD0 @ =sub_80DFBD8 - str r0, [r4, 0x1C] - adds r4, 0x2E - ldr r2, _080DFBD4 @ =gUnknown_03000730 - movs r1, 0x6 -_080DFBB0: - ldrh r0, [r4] - strh r0, [r2] - adds r4, 0x2 - adds r2, 0x2 - subs r1, 0x1 - cmp r1, 0 - bge _080DFBB0 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DFBC8: .4byte gBattleAnimArgs -_080DFBCC: .4byte gAnimBankAttacker -_080DFBD0: .4byte sub_80DFBD8 -_080DFBD4: .4byte gUnknown_03000730 - thumb_func_end sub_80DFB28 - - thumb_func_start sub_80DFBD8 -sub_80DFBD8: @ 80DFBD8 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - ldrh r1, [r4, 0x36] - adds r0, r1 - strh r0, [r4, 0x36] - ldrh r0, [r4, 0x32] - ldrh r2, [r4, 0x38] - adds r0, r2 - strh r0, [r4, 0x38] - movs r1, 0x36 - ldrsh r0, [r4, r1] - movs r1, 0xA - bl __divsi3 - strh r0, [r4, 0x24] - movs r2, 0x38 - ldrsh r0, [r4, r2] - movs r1, 0xA - bl __divsi3 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x34 - ldrsh r1, [r4, r2] - cmp r0, r1 - ble _080DFC1C - adds r0, r4, 0 - bl DestroyAnimSprite -_080DFC1C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DFBD8 - thumb_func_start sub_80DFC24 sub_80DFC24: @ 80DFC24 push {r4,lr} diff --git a/ld_script.txt b/ld_script.txt index 11a430764..acc368cc8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -295,6 +295,7 @@ SECTIONS { asm/bug.o(.text); asm/rock.o(.text); asm/ghost.o(.text); + src/battle/anim/dragon.o(.text); asm/dragon.o(.text); asm/dark.o(.text); asm/ground.o(.text); diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c new file mode 100755 index 000000000..04859e39f --- /dev/null +++ b/src/battle/anim/dragon.c @@ -0,0 +1,262 @@ +#include "global.h" +#include "rom_8077ABC.h" +#include "trig.h" +#include "battle_anim.h" +#include "sound.h" +#include "unknown_task.h" + +void sub_80DF81C(struct Sprite *sprite); +void sub_80DFBD8(struct Sprite *sprite); + +void sub_80DF9F4(u8 taskId); + +void sub_80DFAB0(struct Task *task); + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; +extern u8 gBankAttacker; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG2_X; +extern u16 gUnknown_03000730[]; + + +// Outrage +void sub_80DF5A0(struct Sprite *sprite) +{ + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + if (GetBankSide(gAnimBankAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[0]; + gBattleAnimArgs[3] = -gBattleAnimArgs[3]; + gBattleAnimArgs[4] = -gBattleAnimArgs[4]; + } + else + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[0] = gBattleAnimArgs[2]; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->data[3] = gBattleAnimArgs[4]; + sprite->data[5] = gBattleAnimArgs[5]; + sprite->invisible = 1; + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); + sprite->callback = sub_8078504; +} + +void sub_80DF63C(struct Sprite *sprite) +{ + sub_8078650(sprite); + sprite->data[2] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[4] = GetBankPosition(gAnimBankTarget, 3); + if (GetBankSide(gAnimBankAttacker)) + { + sprite->pos1.x -= gBattleAnimArgs[1]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] -= gBattleAnimArgs[2]; + sprite->data[4] += gBattleAnimArgs[3]; + } + else + { + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data[2] += gBattleAnimArgs[2]; + sprite->data[4] += gBattleAnimArgs[3]; + StartSpriteAnim(sprite, 1); + } + sprite->data[0] = gBattleAnimArgs[4]; + sprite->callback = sub_8078B34; + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); +} + +void sub_80DF6F0(struct Sprite *sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1); + } + else + { + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1); + } + sub_807867C(sprite, gBattleAnimArgs[1]); + sprite->pos1.y += gBattleAnimArgs[2]; + sprite->callback = sub_8078600; + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); +} + +void sub_80DF760(struct Sprite *sprite) +{ + if (GetBankSide(gAnimBankAttacker)) + StartSpriteAffineAnim(sprite, 1); + sub_80DF63C(sprite); +} + +void sub_80DF78C(struct Sprite *sprite) +{ + u16 r5; + u16 r0; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + sprite->data[4] = 0; + sprite->data[5] = 1; + sprite->data[6] = gBattleAnimArgs[0]; + r5 = sub_807A100(gBankAttacker, 0); + r0 = sub_807A100(gBankAttacker, 1); + if (r5 > r0) + sprite->data[7] = r5 / 2; + else + sprite->data[7] = r0 / 2; + sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]); + sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]); + sprite->callback = sub_80DF81C; +} + +void sub_80DF81C(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF; + sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]); + sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]); + if (++sprite->data[4] > 5) + { + sprite->data[4] = 0; + if (sprite->data[5] <= 15 && ++sprite->data[5] > 15) + sprite->data[5] = 16; + } + if (++sprite->data[3] > 0x3C) + { + sprite->data[3] = 0; + sprite->data[0]++; + } + break; + case 1: + sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF; + if (sprite->data[7] <= 0x95 && (sprite->data[7] += 8) > 0x95) + sprite->data[7] = 0x96; + sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]); + sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]); + if (++sprite->data[4] > 5) + { + sprite->data[4] = 0; + if (sprite->data[5] <= 15 && ++sprite->data[5] > 15) + sprite->data[5] = 16; + } + if (++sprite->data[3] > 20) + DestroyAnimSprite(sprite); + break; + } +} + +void sub_80DF924(u8 taskId) +{ + struct UnknownTaskStruct sp; + struct Task *task = &gTasks[taskId]; + u16 i; + u8 r1; + if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) + { + sp.dest = ®_BG1HOFS; + task->data[2] = gBattle_BG1_X; + } + else + { + sp.dest = ®_BG2HOFS; + task->data[2] = gBattle_BG2_X; + } + sp.control = 0xA2600001; + sp.unk8 = 1; + sp.unk9 = 0; + r1 = sub_8077FC0(gAnimBankAttacker); + task->data[3] = r1 - 32; + task->data[4] = r1 + 32; + if (task->data[3] < 0) + task->data[3] = 0; + for(i = task->data[3];i <= task->data[4];i++) + { + gUnknown_03004DE0[0][i] = task->data[2]; + gUnknown_03004DE0[1][i] = task->data[2]; + } + sub_80895F8(sp); + task->func = sub_80DF9F4; +} + +void sub_80DF9F4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + switch (task->data[0]) + { + case 0: + if (++task->data[7] > 1) + { + task->data[7] = 0; + if (++task->data[6] == 3) + task->data[0]++; + } + sub_80DFAB0(task); + break; + case 1: + if (++task->data[1] > 0x3C) + task->data[0]++; + sub_80DFAB0(task); + break; + case 2: + if (++task->data[7] > 1) + { + task->data[7] = 0; + if (--task->data[6] == 0) + task->data[0]++; + } + sub_80DFAB0(task); + break; + case 3: + gUnknown_03004DC0.unk15 = 3; + task->data[0]++; + break; + case 4: + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80DFAB0(struct Task *task) +{ + u16 r3 = task->data[5]; + u16 i; + for (i = task->data[3]; i <= task->data[4]; i++) + { + gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = ((gSineTable[r3] * task->data[6]) >> 7) + task->data[2]; + r3 = (r3 + 8) & 0xFF; + } + task->data[5] = (task->data[5] + 9) & 0xFF; +} + +void sub_80DFB28(struct Sprite *sprite) +{ + int r6 = (gBattleAnimArgs[2] * 3) / 5; + int i; + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + gBattleAnimArgs[4]; + sprite->data[1] = Cos(gBattleAnimArgs[1], gBattleAnimArgs[2]); + sprite->data[2] = Sin(gBattleAnimArgs[1], r6); + sprite->pos1.x += sprite->data[1] * gBattleAnimArgs[0]; + sprite->pos1.y += sprite->data[2] * gBattleAnimArgs[0]; + sprite->data[3] = gBattleAnimArgs[3]; + sprite->callback = sub_80DFBD8; + for (i = 0; i <= 6; i++) + gUnknown_03000730[i] = sprite->data[i]; +} + +void sub_80DFBD8(struct Sprite *sprite) +{ + sprite->data[4] += sprite->data[1]; + sprite->data[5] += sprite->data[2]; + sprite->pos2.x = sprite->data[4] / 10; + sprite->pos2.y = sprite->data[5] / 10; + if (++sprite->data[0] > sprite->data[3]) + DestroyAnimSprite(sprite); +} \ No newline at end of file -- cgit v1.2.3 From e0726bf8d6af39f287c65ad22ce192988e8468bb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Jan 2018 20:20:16 -0500 Subject: through sub_8099374 --- asm/pokemon_storage_system.s | 371 --------------------------------- include/pokemon_storage_system.h | 13 +- src/pokemon/pokemon_storage_system_2.c | 4 +- src/pokemon/pokemon_storage_system_3.c | 101 +++++++++ 4 files changed, 110 insertions(+), 379 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 3c4a03ad5..a794269eb 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,377 +5,6 @@ .text - thumb_func_start sub_80990AC -sub_80990AC: @ 80990AC - push {r4-r6,lr} - ldr r0, _080990D4 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r0, _080990D8 @ =0x00001172 - adds r3, r4, r0 - ldrh r0, [r3] - cmp r0, 0 - beq _080990C0 - subs r0, 0x1 - strh r0, [r3] -_080990C0: - ldr r1, _080990DC @ =0x0000117c - adds r6, r4, r1 - ldrb r0, [r6] - cmp r0, 0x1 - beq _08099138 - cmp r0, 0x1 - bgt _080990E0 - cmp r0, 0 - beq _080990E8 - b _080991F0 - .align 2, 0 -_080990D4: .4byte gPokemonStorageSystemPtr -_080990D8: .4byte 0x00001172 -_080990DC: .4byte 0x0000117c -_080990E0: - cmp r0, 0x2 - bne _080990E6 - b _080991E0 -_080990E6: - b _080991F0 -_080990E8: - ldr r2, _0809912C @ =0x00001174 - adds r5, r4, r2 - ldr r3, _08099130 @ =0x00001176 - adds r0, r4, r3 - ldrh r0, [r0] - ldrh r1, [r5] - adds r0, r1 - strh r0, [r5] - subs r0, 0x41 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xBA - bhi _08099104 - b _080991F8 -_08099104: - adds r2, 0x6 - adds r0, r4, r2 - ldrb r0, [r0] - bl sub_8098EA0 - ldr r3, _08099134 @ =0x0000117b - adds r0, r4, r3 - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - ldrh r1, [r5] - adds r0, r1 - strh r0, [r5] - ldrb r0, [r6] - adds r0, 0x1 - strb r0, [r6] - b _080991F8 - .align 2, 0 -_0809912C: .4byte 0x00001174 -_08099130: .4byte 0x00001176 -_08099134: .4byte 0x0000117b -_08099138: - ldr r2, _08099194 @ =0x00001174 - adds r1, r4, r2 - ldr r5, _08099198 @ =0x00001176 - adds r2, r4, r5 - ldrh r0, [r2] - ldrh r5, [r1] - adds r0, r5 - strh r0, [r1] - ldr r0, _0809919C @ =0x0000117a - adds r5, r4, r0 - ldrb r0, [r5] - ldrh r1, [r3] - movs r3, 0 - ldrsh r2, [r2, r3] - bl sub_8098EE0 - ldr r2, _080991A0 @ =0x00001178 - adds r1, r4, r2 - lsls r0, 24 - lsrs r0, 24 - ldrh r3, [r1] - adds r0, r3 - strh r0, [r1] - ldr r1, _080991A4 @ =0x0000117b - adds r0, r4, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - cmp r1, 0 - ble _08099178 - ldrb r0, [r5] - cmp r0, 0x5 - beq _08099182 -_08099178: - cmp r1, 0 - bge _080991B0 - ldrb r0, [r5] - cmp r0, 0 - bne _080991B0 -_08099182: - ldr r0, _080991A8 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r2, _080991AC @ =0x0000117c - adds r1, r2 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _080991F8 - .align 2, 0 -_08099194: .4byte 0x00001174 -_08099198: .4byte 0x00001176 -_0809919C: .4byte 0x0000117a -_080991A0: .4byte 0x00001178 -_080991A4: .4byte 0x0000117b -_080991A8: .4byte gPokemonStorageSystemPtr -_080991AC: .4byte 0x0000117c -_080991B0: - ldr r0, _080991D0 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r5, _080991D4 @ =0x0000117a - adds r3, r1, r5 - ldr r2, _080991D8 @ =0x0000117b - adds r0, r1, r2 - ldrb r0, [r0] - ldrb r5, [r3] - adds r0, r5 - movs r2, 0 - strb r0, [r3] - ldr r0, _080991DC @ =0x0000117c - adds r1, r0 - strb r2, [r1] - b _080991F8 - .align 2, 0 -_080991D0: .4byte gPokemonStorageSystemPtr -_080991D4: .4byte 0x0000117a -_080991D8: .4byte 0x0000117b -_080991DC: .4byte 0x0000117c -_080991E0: - ldr r1, _080991F4 @ =0x00001178 - adds r0, r4, r1 - ldrh r0, [r0] - cmp r0, 0 - bne _080991F8 - ldrh r0, [r3] - adds r0, 0x1 - strh r0, [r3] -_080991F0: - movs r0, 0 - b _080991FA - .align 2, 0 -_080991F4: .4byte 0x00001178 -_080991F8: - movs r0, 0x1 -_080991FA: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80990AC - - thumb_func_start sub_8099200 -sub_8099200: @ 8099200 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r4, _080992A0 @ =gPlayerParty - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r4, 0 - movs r1, 0 - bl GetMonData - adds r1, r0, 0 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xB - str r0, [sp, 0x4] - adds r0, r5, 0 - movs r2, 0x68 - movs r3, 0x40 - bl PSS_SpawnMonIconSprite - ldr r1, _080992A4 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _080992A8 @ =0x00001038 - adds r1, r2 - str r0, [r1] - movs r7, 0x1 - movs r6, 0x1 -_08099246: - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - ldr r0, _080992A0 @ =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - beq _080992AC - adds r0, r4, 0 - movs r1, 0 - bl GetMonData - adds r1, r0, 0 - subs r0, r6, 0x1 - lsls r3, r0, 1 - adds r3, r0 - lsls r3, 19 - movs r0, 0x80 - lsls r0, 13 - adds r3, r0 - asrs r3, 16 - movs r0, 0x1 - str r0, [sp] - movs r0, 0xB - str r0, [sp, 0x4] - adds r0, r5, 0 - movs r2, 0x98 - bl PSS_SpawnMonIconSprite - ldr r1, _080992A4 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - lsls r2, r6, 2 - ldr r3, _080992A8 @ =0x00001038 - adds r1, r3 - adds r1, r2 - str r0, [r1] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - b _080992BA - .align 2, 0 -_080992A0: .4byte gPlayerParty -_080992A4: .4byte gPokemonStorageSystemPtr -_080992A8: .4byte 0x00001038 -_080992AC: - ldr r0, _08099308 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - lsls r1, r6, 2 - ldr r2, _0809930C @ =0x00001038 - adds r0, r2 - adds r0, r1 - str r5, [r0] -_080992BA: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x5 - bls _08099246 - mov r3, r8 - cmp r3, 0 - bne _080992FA - movs r6, 0 - cmp r6, r7 - bcs _080992FA - ldr r0, _08099308 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809930C @ =0x00001038 - adds r3, r0, r1 - movs r4, 0x4 -_080992DA: - lsls r1, r6, 2 - adds r1, r3, r1 - ldr r2, [r1] - ldrh r0, [r2, 0x22] - subs r0, 0xA0 - strh r0, [r2, 0x22] - ldr r1, [r1] - adds r1, 0x3E - ldrb r0, [r1] - orrs r0, r4 - strb r0, [r1] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, r7 - bcc _080992DA -_080992FA: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08099308: .4byte gPokemonStorageSystemPtr -_0809930C: .4byte 0x00001038 - thumb_func_end sub_8099200 - - thumb_func_start sub_8099310 -sub_8099310: @ 8099310 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r0, _08099368 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r0, _0809936C @ =0x00001171 - adds r1, r2, r0 - movs r0, 0 - strb r0, [r1] - movs r5, 0 - movs r6, 0 - mov r8, r2 - ldr r7, _0809936C @ =0x00001171 - add r7, r8 -_0809932C: - lsls r1, r5, 2 - ldr r0, _08099370 @ =0x00001038 - add r0, r8 - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _08099354 - cmp r5, r6 - beq _0809934E - adds r1, r6, 0 - bl sub_8099388 - movs r0, 0 - str r0, [r4] - ldrb r0, [r7] - adds r0, 0x1 - strb r0, [r7] -_0809934E: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 -_08099354: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x5 - bls _0809932C - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08099368: .4byte gPokemonStorageSystemPtr -_0809936C: .4byte 0x00001171 -_08099370: .4byte 0x00001038 - thumb_func_end sub_8099310 - - thumb_func_start sub_8099374 -sub_8099374: @ 8099374 - ldr r0, _08099380 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08099384 @ =0x00001171 - adds r0, r1 - ldrb r0, [r0] - bx lr - .align 2, 0 -_08099380: .4byte gPokemonStorageSystemPtr -_08099384: .4byte 0x00001171 - thumb_func_end sub_8099374 - thumb_func_start sub_8099388 sub_8099388: @ 8099388 push {r4,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 0f20bfa16..6040e31be 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -96,18 +96,19 @@ struct PokemonStorageSystemData { s16 unk_0d60; u8 filler_0d62[0x2d2]; struct Sprite *unk_1034; - struct Sprite *unk_1038[6]; - struct Sprite *unk_1050[30]; + struct Sprite *unk_1038[6]; // party + struct Sprite *unk_1050[30]; // box u8 filler_10c8[8]; u16 unk_10d0[40]; u16 unk_1120[40]; - u8 filler_1170[2]; + u8 unk_1170; + u8 unk_1171; u16 unk_1172; - u16 unk_1174; + s16 unk_1174; s16 unk_1176; u16 unk_1178; u8 unk_117a; - u8 unk_117b; + s8 unk_117b; u8 unk_117c; u8 unk_117d; u8 filler_117e[0x6a]; @@ -164,7 +165,7 @@ void sub_80961A8(void); void task_intro_29(u8 whichMenu); void ResetPokemonStorageSystem(void); void ResetPSSMonIconSprites(void); -void sub_8099200(u8 a0); +void sub_8099200(bool8 a0); void sub_8099310(void); bool8 sub_8099374(void); void sub_80994A8(s16 a0); diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index dbb1cf992..a158b29a9 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -1703,7 +1703,7 @@ void sub_8098400(void) if (gUnknown_0203847C) { sub_8098690(TRUE); - sub_8099200(1); + sub_8099200(TRUE); sub_809D034(BG_SCREEN_ADDR(15), 10, 0, gPokemonStorageSystemPtr->unk_00a8, 0, 0, 12, 22); } else @@ -1719,7 +1719,7 @@ void sub_80984E8(void) gPokemonStorageSystemPtr->unk_08a8 = 20; gPokemonStorageSystemPtr->unk_08aa = 2; gPokemonStorageSystemPtr->unk_08ad = 0; - sub_8099200(0); + sub_8099200(FALSE); } bool8 sub_8098520(void) diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index af050d324..230e9445b 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -13,6 +13,7 @@ // Static ROM declarations void sub_8098E68(struct Sprite *sprite); +void sub_8099388(struct Sprite *sprite, u16 a0); void sub_80999C4(struct Sprite *sprite); struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 a2, s16 a3, u8 a4, u8 a5); void sub_8099BE0(struct Sprite *sprite); @@ -209,3 +210,103 @@ void sub_809900C(u8 a0, s8 a1) gPokemonStorageSystemPtr->unk_1174 = 24 * gPokemonStorageSystemPtr->unk_117a + 0x64; sub_8098DE0(gPokemonStorageSystemPtr->unk_1176); } + +bool8 sub_80990AC(void) +{ + if (gPokemonStorageSystemPtr->unk_1172) + gPokemonStorageSystemPtr->unk_1172--; + switch (gPokemonStorageSystemPtr->unk_117c) + { + case 0: + gPokemonStorageSystemPtr->unk_1174 += gPokemonStorageSystemPtr->unk_1176; + if (gPokemonStorageSystemPtr->unk_1174 < 0x41 || gPokemonStorageSystemPtr->unk_1174 > 0xfb) + { + sub_8098EA0(gPokemonStorageSystemPtr->unk_117a); + gPokemonStorageSystemPtr->unk_1174 += 24 * gPokemonStorageSystemPtr->unk_117b; + gPokemonStorageSystemPtr->unk_117c++; + } + break; + case 1: + gPokemonStorageSystemPtr->unk_1174 += gPokemonStorageSystemPtr->unk_1176; + gPokemonStorageSystemPtr->unk_1178 += sub_8098EE0(gPokemonStorageSystemPtr->unk_117a, gPokemonStorageSystemPtr->unk_1172, gPokemonStorageSystemPtr->unk_1176); + if ((gPokemonStorageSystemPtr->unk_117b > 0 && gPokemonStorageSystemPtr->unk_117a == 5) || (gPokemonStorageSystemPtr->unk_117b < 0 && gPokemonStorageSystemPtr->unk_117a == 0)) + { + gPokemonStorageSystemPtr->unk_117c++; + } + else + { + gPokemonStorageSystemPtr->unk_117a += gPokemonStorageSystemPtr->unk_117b; + gPokemonStorageSystemPtr->unk_117c = 0; + } + break; + case 2: + if (gPokemonStorageSystemPtr->unk_1178 == 0) + { + gPokemonStorageSystemPtr->unk_1172++; + return FALSE; + } + break; + default: + return FALSE; + } + return TRUE; +} + +void sub_8099200(bool8 a0) +{ + u16 count; + u16 i; + u16 species = GetMonData(gPlayerParty + 0, MON_DATA_SPECIES2); + u32 personality = GetMonData(gPlayerParty + 0, MON_DATA_PERSONALITY); + gPokemonStorageSystemPtr->unk_1038[0] = PSS_SpawnMonIconSprite(species, personality, 0x68, 0x40, 1, 11); + count = 1; + for (i = 1; i < PARTY_SIZE; i++) + { + species = GetMonData(gPlayerParty + i, MON_DATA_SPECIES2); + if (species != SPECIES_NONE) + { + personality = GetMonData(gPlayerParty + i, MON_DATA_PERSONALITY); + gPokemonStorageSystemPtr->unk_1038[i] = PSS_SpawnMonIconSprite(species, personality, 0x98, (i - 1) * 24 + 0x10, 1, 11); + count++; + } + else + { + gPokemonStorageSystemPtr->unk_1038[i] = NULL; + } + } + if (!a0) + { + for (i = 0; i < count; i++) + { + // this routine assumes party_compaction has been called + gPokemonStorageSystemPtr->unk_1038[i]->pos1.y -= 0xa0; + gPokemonStorageSystemPtr->unk_1038[i]->invisible = TRUE; + } + } +} + +void sub_8099310(void) +{ + u16 i; + u16 count; + + gPokemonStorageSystemPtr->unk_1171 = 0; + for (i = 0, count = 0; i < PARTY_SIZE; i++) + { + if (gPokemonStorageSystemPtr->unk_1038[i]) + { + if (i != count) + { + sub_8099388(gPokemonStorageSystemPtr->unk_1038[i], count); + gPokemonStorageSystemPtr->unk_1038[i] = NULL; + gPokemonStorageSystemPtr->unk_1171++; + } + count++; + } + } +} + +u8 sub_8099374(void) +{ + return gPokemonStorageSystemPtr->unk_1171; +} -- cgit v1.2.3 From e44c0f897d2d02f153d5adf139be3bac25e1ee93 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Jan 2018 21:33:54 -0500 Subject: through sub_809960C --- asm/pokemon_storage_system.s | 429 --------------------------------- src/pokemon/pokemon_storage_system_3.c | 145 ++++++++++- 2 files changed, 144 insertions(+), 430 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index a794269eb..2f7caa703 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,435 +5,6 @@ .text - thumb_func_start sub_8099388 -sub_8099388: @ 8099388 - push {r4,lr} - adds r2, r0, 0 - lsls r1, 16 - lsrs r1, 16 - strh r1, [r2, 0x30] - cmp r1, 0 - bne _0809939C - movs r3, 0x68 - movs r4, 0x40 - b _080993AE -_0809939C: - movs r3, 0x98 - subs r1, 0x1 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 19 - movs r1, 0x80 - lsls r1, 13 - adds r0, r1 - lsrs r4, r0, 16 -_080993AE: - ldrh r0, [r2, 0x20] - lsls r0, 3 - strh r0, [r2, 0x32] - ldrh r0, [r2, 0x22] - lsls r0, 3 - strh r0, [r2, 0x34] - lsls r1, r3, 3 - movs r3, 0x32 - ldrsh r0, [r2, r3] - subs r0, r1, r0 - cmp r0, 0 - bge _080993C8 - adds r0, 0x7 -_080993C8: - asrs r0, 3 - strh r0, [r2, 0x36] - lsls r0, r4, 16 - asrs r0, 13 - movs r3, 0x34 - ldrsh r1, [r2, r3] - subs r0, r1 - cmp r0, 0 - bge _080993DC - adds r0, 0x7 -_080993DC: - asrs r0, 3 - strh r0, [r2, 0x38] - movs r0, 0x8 - strh r0, [r2, 0x3A] - ldr r0, _080993F0 @ =sub_80993F4 - str r0, [r2, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080993F0: .4byte sub_80993F4 - thumb_func_end sub_8099388 - - thumb_func_start sub_80993F4 -sub_80993F4: @ 80993F4 - push {r4,lr} - adds r3, r0, 0 - ldrh r2, [r3, 0x3A] - movs r1, 0x3A - ldrsh r0, [r3, r1] - cmp r0, 0 - beq _08099424 - ldrh r0, [r3, 0x36] - ldrh r4, [r3, 0x32] - adds r0, r4 - strh r0, [r3, 0x32] - ldrh r1, [r3, 0x38] - ldrh r4, [r3, 0x34] - adds r1, r4 - strh r1, [r3, 0x34] - lsls r0, 16 - asrs r0, 19 - strh r0, [r3, 0x20] - lsls r1, 16 - asrs r1, 19 - strh r1, [r3, 0x22] - subs r0, r2, 0x1 - strh r0, [r3, 0x3A] - b _08099468 -_08099424: - movs r1, 0x30 - ldrsh r0, [r3, r1] - cmp r0, 0 - bne _08099434 - movs r0, 0x68 - strh r0, [r3, 0x20] - movs r0, 0x40 - b _08099446 -_08099434: - movs r0, 0x98 - strh r0, [r3, 0x20] - movs r4, 0x30 - ldrsh r1, [r3, r4] - subs r1, 0x1 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - adds r0, 0x10 -_08099446: - strh r0, [r3, 0x22] - ldr r0, _08099470 @ =SpriteCallbackDummy - str r0, [r3, 0x1C] - ldr r0, _08099474 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - movs r0, 0x30 - ldrsh r1, [r3, r0] - lsls r1, 2 - ldr r4, _08099478 @ =0x00001038 - adds r0, r2, r4 - adds r0, r1 - str r3, [r0] - ldr r0, _0809947C @ =0x00001171 - adds r2, r0 - ldrb r0, [r2] - subs r0, 0x1 - strb r0, [r2] -_08099468: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08099470: .4byte SpriteCallbackDummy -_08099474: .4byte gPokemonStorageSystemPtr -_08099478: .4byte 0x00001038 -_0809947C: .4byte 0x00001171 - thumb_func_end sub_80993F4 - - thumb_func_start sub_8099480 -sub_8099480: @ 8099480 - push {r4,lr} - ldr r0, _080994A0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _080994A4 @ =0x00001034 - adds r4, r0, r1 - ldr r0, [r4] - cmp r0, 0 - beq _08099498 - bl sub_8099BE0 - movs r0, 0 - str r0, [r4] -_08099498: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080994A0: .4byte gPokemonStorageSystemPtr -_080994A4: .4byte 0x00001034 - thumb_func_end sub_8099480 - - thumb_func_start sub_80994A8 -sub_80994A8: @ 80994A8 - push {r4-r6,lr} - movs r3, 0 - ldr r1, _080994FC @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _08099500 @ =0x00001038 - adds r5, r1, r2 - lsls r0, 16 - asrs r4, r0, 16 - movs r6, 0x5 - negs r6, r6 -_080994BC: - lsls r0, r3, 2 - adds r2, r5, r0 - ldr r1, [r2] - cmp r1, 0 - beq _0809950E - ldrh r0, [r1, 0x22] - adds r0, r4, r0 - strh r0, [r1, 0x22] - ldr r2, [r2] - ldrh r1, [r2, 0x26] - ldrh r0, [r2, 0x22] - adds r1, r0 - adds r0, r2, 0 - adds r0, 0x29 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - lsls r0, 16 - movs r1, 0x80 - lsls r1, 13 - adds r0, r1 - lsrs r0, 16 - cmp r0, 0xC0 - bls _08099504 - adds r0, r2, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _0809950E - .align 2, 0 -_080994FC: .4byte gPokemonStorageSystemPtr -_08099500: .4byte 0x00001038 -_08099504: - adds r2, 0x3E - ldrb r1, [r2] - adds r0, r6, 0 - ands r0, r1 - strb r0, [r2] -_0809950E: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x5 - bls _080994BC - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80994A8 - - thumb_func_start sub_8099520 -sub_8099520: @ 8099520 - push {r4,lr} - lsls r0, 24 - ldr r1, _08099544 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - lsrs r0, 22 - ldr r2, _08099548 @ =0x00001038 - adds r1, r2 - adds r4, r1, r0 - ldr r0, [r4] - cmp r0, 0 - beq _0809953E - bl sub_8099BE0 - movs r0, 0 - str r0, [r4] -_0809953E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08099544: .4byte gPokemonStorageSystemPtr -_08099548: .4byte 0x00001038 - thumb_func_end sub_8099520 - - thumb_func_start sub_809954C -sub_809954C: @ 809954C - push {r4-r6,lr} - movs r5, 0 - ldr r0, _0809957C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08099580 @ =0x00001038 - adds r6, r0, r1 -_08099558: - lsls r0, r5, 2 - adds r4, r6, r0 - ldr r0, [r4] - cmp r0, 0 - beq _0809956A - bl sub_8099BE0 - movs r0, 0 - str r0, [r4] -_0809956A: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x5 - bls _08099558 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809957C: .4byte gPokemonStorageSystemPtr -_08099580: .4byte 0x00001038 - thumb_func_end sub_809954C - - thumb_func_start sub_8099584 -sub_8099584: @ 8099584 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r1, 24 - adds r5, r1, 0 - cmp r4, 0 - bne _080995B4 - ldr r3, _080995AC @ =gPokemonStorageSystemPtr - ldr r0, [r3] - ldr r5, _080995B0 @ =0x00001034 - adds r2, r0, r5 - lsls r1, 2 - adds r5, 0x4 - adds r0, r5 - adds r0, r1 - ldr r1, [r0] - str r1, [r2] - str r4, [r0] - b _080995D0 - .align 2, 0 -_080995AC: .4byte gPokemonStorageSystemPtr -_080995B0: .4byte 0x00001034 -_080995B4: - cmp r4, 0x1 - bne _080995F4 - ldr r3, _080995FC @ =gPokemonStorageSystemPtr - ldr r0, [r3] - ldr r1, _08099600 @ =0x00001034 - adds r2, r0, r1 - lsls r1, r5, 2 - ldr r4, _08099604 @ =0x00001050 - adds r0, r4 - adds r0, r1 - ldr r1, [r0] - str r1, [r2] - movs r1, 0 - str r1, [r0] -_080995D0: - ldr r2, [r3] - ldr r5, _08099600 @ =0x00001034 - adds r2, r5 - ldr r1, [r2] - ldr r0, _08099608 @ =sub_80999C4 - str r0, [r1, 0x1C] - ldr r3, [r2] - ldrb r1, [r3, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3, 0x5] - ldr r0, [r2] - adds r0, 0x43 - movs r1, 0x7 - strb r1, [r0] -_080995F4: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080995FC: .4byte gPokemonStorageSystemPtr -_08099600: .4byte 0x00001034 -_08099604: .4byte 0x00001050 -_08099608: .4byte sub_80999C4 - thumb_func_end sub_8099584 - - thumb_func_start sub_809960C -sub_809960C: @ 809960C - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - cmp r0, 0xE - bne _08099654 - ldr r4, _08099648 @ =gPokemonStorageSystemPtr - ldr r0, [r4] - lsls r1, r6, 2 - ldr r2, _0809964C @ =0x00001038 - adds r3, r0, r2 - adds r3, r1 - ldr r1, _08099650 @ =0x00001034 - adds r0, r1 - ldr r2, [r0] - str r2, [r3] - ldrb r1, [r2, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2, 0x5] - ldr r0, [r3] - adds r0, 0x43 - movs r1, 0xB - strb r1, [r0] - b _0809968A - .align 2, 0 -_08099648: .4byte gPokemonStorageSystemPtr -_0809964C: .4byte 0x00001038 -_08099650: .4byte 0x00001034 -_08099654: - ldr r5, _080996A0 @ =gPokemonStorageSystemPtr - ldr r0, [r5] - lsls r1, r6, 2 - ldr r2, _080996A4 @ =0x00001050 - adds r3, r0, r2 - adds r3, r1 - ldr r1, _080996A8 @ =0x00001034 - adds r0, r1 - ldr r2, [r0] - str r2, [r3] - ldrb r1, [r2, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r2, 0x5] - ldr r4, [r3] - adds r0, r6, 0 - movs r1, 0x6 - bl __umodsi3 - movs r1, 0x12 - subs r1, r0 - adds r4, 0x43 - strb r1, [r4] - adds r4, r5, 0 -_0809968A: - ldr r1, [r4] - ldr r2, _080996A8 @ =0x00001034 - adds r1, r2 - ldr r2, [r1] - ldr r0, _080996AC @ =SpriteCallbackDummy - str r0, [r2, 0x1C] - movs r0, 0 - str r0, [r1] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080996A0: .4byte gPokemonStorageSystemPtr -_080996A4: .4byte 0x00001050 -_080996A8: .4byte 0x00001034 -_080996AC: .4byte SpriteCallbackDummy - thumb_func_end sub_809960C - thumb_func_start sub_80996B0 sub_80996B0: @ 80996B0 push {r4,lr} diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index 230e9445b..28b9e2655 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -13,7 +13,8 @@ // Static ROM declarations void sub_8098E68(struct Sprite *sprite); -void sub_8099388(struct Sprite *sprite, u16 a0); +void sub_8099388(struct Sprite *sprite, u16 a1); +void sub_80993F4(struct Sprite *sprite); void sub_80999C4(struct Sprite *sprite); struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 a2, s16 a3, u8 a4, u8 a5); void sub_8099BE0(struct Sprite *sprite); @@ -310,3 +311,145 @@ u8 sub_8099374(void) { return gPokemonStorageSystemPtr->unk_1171; } + +void sub_8099388(struct Sprite *sprite, u16 a1) +{ + s16 r3; + s16 r4; + + sprite->data[1] = a1; + if (a1 == 0) + { + r3 = 0x68; + r4 = 0x40; + } + else + { + r3 = 0x98; + r4 = 24 * (a1 - 1) + 0x10; + } + sprite->data[2] = sprite->pos1.x << 3; + sprite->data[3] = sprite->pos1.y << 3; + sprite->data[4] = (r3 * 8 - sprite->data[2]) / 8; + sprite->data[5] = (r4 * 8 - sprite->data[3]) / 8; + sprite->data[6] = 8; + sprite->callback = sub_80993F4; +} + +void sub_80993F4(struct Sprite *sprite) +{ + if (sprite->data[6]) + { + sprite->data[2] += sprite->data[4]; + sprite->data[3] += sprite->data[5]; + sprite->pos1.x = sprite->data[2] >> 3; + sprite->pos1.y = sprite->data[3] >> 3; + sprite->data[6]--; + } + else + { + if (sprite->data[1] == 0) + { + sprite->pos1.x = 0x68; + sprite->pos1.y = 0x40; + } + else + { + sprite->pos1.x = 0x98; + sprite->pos1.y = (sprite->data[1] - 1) * 24 + 0x10; + } + sprite->callback = SpriteCallbackDummy; + gPokemonStorageSystemPtr->unk_1038[sprite->data[1]] = sprite; + gPokemonStorageSystemPtr->unk_1171--; + } +} + +void sub_8099480(void) +{ + if (gPokemonStorageSystemPtr->unk_1034) + { + sub_8099BE0(gPokemonStorageSystemPtr->unk_1034); + gPokemonStorageSystemPtr->unk_1034 = NULL; + } +} + +void sub_80994A8(s16 y) +{ + u16 i; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (gPokemonStorageSystemPtr->unk_1038[i]) + { + s16 yy; + gPokemonStorageSystemPtr->unk_1038[i]->pos1.y += y; + yy = gPokemonStorageSystemPtr->unk_1038[i]->pos1.y + gPokemonStorageSystemPtr->unk_1038[i]->pos2.y + gPokemonStorageSystemPtr->unk_1038[i]->centerToCornerVecY; + if (yy < -0x10 || yy > 0xb0) + gPokemonStorageSystemPtr->unk_1038[i]->invisible = TRUE; + else + gPokemonStorageSystemPtr->unk_1038[i]->invisible = FALSE; + } + } +} + +void sub_8099520(u8 a0) +{ + if (gPokemonStorageSystemPtr->unk_1038[a0]) + { + sub_8099BE0(gPokemonStorageSystemPtr->unk_1038[a0]); + gPokemonStorageSystemPtr->unk_1038[a0] = NULL; + } +} + +void sub_809954C(void) +{ + u16 i; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (gPokemonStorageSystemPtr->unk_1038[i]) + { + sub_8099BE0(gPokemonStorageSystemPtr->unk_1038[i]); + gPokemonStorageSystemPtr->unk_1038[i] = NULL; + } + } +} + +void sub_8099584(u8 a0, u8 a1) +{ + if (a0 == 0) + { + gPokemonStorageSystemPtr->unk_1034 = gPokemonStorageSystemPtr->unk_1038[a1]; + gPokemonStorageSystemPtr->unk_1038[a1] = NULL; + } + else if (a0 == 1) + { + gPokemonStorageSystemPtr->unk_1034 = gPokemonStorageSystemPtr->unk_1050[a1]; + gPokemonStorageSystemPtr->unk_1050[a1] = NULL; + } + else + { + return; + } + gPokemonStorageSystemPtr->unk_1034->callback = sub_80999C4; + gPokemonStorageSystemPtr->unk_1034->oam.priority = 1; + gPokemonStorageSystemPtr->unk_1034->subpriority = 7; +} + +void sub_809960C(u8 a0, u8 a1) +{ + if (a0 == 14) + { + gPokemonStorageSystemPtr->unk_1038[a1] = gPokemonStorageSystemPtr->unk_1034; + gPokemonStorageSystemPtr->unk_1038[a1]->oam.priority = 1; + gPokemonStorageSystemPtr->unk_1038[a1]->subpriority = 11; + } + else + { + gPokemonStorageSystemPtr->unk_1050[a1] = gPokemonStorageSystemPtr->unk_1034; + gPokemonStorageSystemPtr->unk_1050[a1]->oam.priority = 2; + gPokemonStorageSystemPtr->unk_1050[a1]->subpriority = 18 - (a1 % 6); + } + gPokemonStorageSystemPtr->unk_1034->callback = SpriteCallbackDummy; + gPokemonStorageSystemPtr->unk_1034 = NULL; +} -- cgit v1.2.3 From d6464c7c40f5ac1b9da557d5990e2b7e83997720 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Jan 2018 21:53:25 -0500 Subject: through sub_809971C --- asm/pokemon_storage_system.s | 186 --------------------------------- include/pokemon_storage_system.h | 3 +- src/pokemon/pokemon_storage_system_3.c | 41 ++++++++ 3 files changed, 43 insertions(+), 187 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 2f7caa703..8767808fc 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,192 +5,6 @@ .text - thumb_func_start sub_80996B0 -sub_80996B0: @ 80996B0 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - cmp r0, 0xE - bne _080996D8 - ldr r3, _080996CC @ =gPokemonStorageSystemPtr - ldr r1, [r3] - ldr r0, _080996D0 @ =0x000010c8 - adds r2, r1, r0 - lsls r0, r4, 2 - ldr r4, _080996D4 @ =0x00001038 - b _080996E4 - .align 2, 0 -_080996CC: .4byte gPokemonStorageSystemPtr -_080996D0: .4byte 0x000010c8 -_080996D4: .4byte 0x00001038 -_080996D8: - ldr r3, _08099704 @ =gPokemonStorageSystemPtr - ldr r1, [r3] - ldr r0, _08099708 @ =0x000010c8 - adds r2, r1, r0 - lsls r0, r4, 2 - ldr r4, _0809970C @ =0x00001050 -_080996E4: - adds r0, r4 - adds r1, r0 - str r1, [r2] - ldr r1, [r3] - ldr r2, _08099710 @ =0x00001034 - adds r0, r1, r2 - ldr r2, [r0] - ldr r0, _08099714 @ =SpriteCallbackDummy - str r0, [r2, 0x1C] - ldr r4, _08099718 @ =0x00001170 - adds r1, r4 - movs r0, 0 - strb r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08099704: .4byte gPokemonStorageSystemPtr -_08099708: .4byte 0x000010c8 -_0809970C: .4byte 0x00001050 -_08099710: .4byte 0x00001034 -_08099714: .4byte SpriteCallbackDummy -_08099718: .4byte 0x00001170 - thumb_func_end sub_80996B0 - - thumb_func_start sub_809971C -sub_809971C: @ 809971C - push {r4-r7,lr} - ldr r0, _08099730 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r0, _08099734 @ =0x00001170 - adds r7, r2, r0 - ldrb r0, [r7] - cmp r0, 0x10 - bne _08099738 - movs r0, 0 - b _08099800 - .align 2, 0 -_08099730: .4byte gPokemonStorageSystemPtr -_08099734: .4byte 0x00001170 -_08099738: - adds r0, 0x1 - strb r0, [r7] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0809975E - ldr r1, _08099808 @ =0x000010c8 - adds r0, r2, r1 - ldr r0, [r0] - ldr r1, [r0] - ldrh r0, [r1, 0x22] - subs r0, 0x1 - strh r0, [r1, 0x22] - ldr r4, _0809980C @ =0x00001034 - adds r0, r2, r4 - ldr r1, [r0] - ldrh r0, [r1, 0x22] - adds r0, 0x1 - strh r0, [r1, 0x22] -_0809975E: - ldr r0, _08099808 @ =0x000010c8 - adds r5, r2, r0 - ldr r0, [r5] - ldr r1, [r0] - ldr r3, _08099810 @ =gSineTable - ldrb r0, [r7] - lsls r0, 4 - adds r0, r3 - movs r4, 0 - ldrsh r0, [r0, r4] - cmp r0, 0 - bge _08099778 - adds r0, 0xF -_08099778: - asrs r0, 4 - strh r0, [r1, 0x24] - ldr r0, _0809980C @ =0x00001034 - adds r6, r2, r0 - ldr r1, [r6] - ldrb r0, [r7] - lsls r0, 4 - adds r0, r3 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bge _08099792 - adds r0, 0xF -_08099792: - asrs r0, 4 - negs r0, r0 - strh r0, [r1, 0x24] - ldrb r0, [r7] - cmp r0, 0x8 - bne _080997DE - ldr r4, [r6] - ldr r0, [r5] - ldr r0, [r0] - ldrb r0, [r0, 0x5] - movs r2, 0xC - ands r2, r0 - ldrb r3, [r4, 0x5] - movs r1, 0xD - negs r1, r1 - adds r0, r1, 0 - ands r0, r3 - orrs r0, r2 - strb r0, [r4, 0x5] - ldr r2, [r6] - ldr r0, [r5] - ldr r0, [r0] - adds r0, 0x43 - ldrb r0, [r0] - adds r2, 0x43 - strb r0, [r2] - ldr r0, [r5] - ldr r2, [r0] - ldrb r0, [r2, 0x5] - ands r1, r0 - movs r0, 0x4 - orrs r1, r0 - strb r1, [r2, 0x5] - ldr r0, [r5] - ldr r0, [r0] - adds r0, 0x43 - movs r1, 0x7 - strb r1, [r0] -_080997DE: - ldrb r0, [r7] - cmp r0, 0x10 - bne _080997FE - ldr r1, [r6] - ldr r0, [r5] - ldr r0, [r0] - str r0, [r6] - ldr r0, [r5] - str r1, [r0] - ldr r1, [r6] - ldr r0, _08099814 @ =sub_80999C4 - str r0, [r1, 0x1C] - ldr r0, [r5] - ldr r1, [r0] - ldr r0, _08099818 @ =SpriteCallbackDummy - str r0, [r1, 0x1C] -_080997FE: - movs r0, 0x1 -_08099800: - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08099808: .4byte 0x000010c8 -_0809980C: .4byte 0x00001034 -_08099810: .4byte gSineTable -_08099814: .4byte sub_80999C4 -_08099818: .4byte SpriteCallbackDummy - thumb_func_end sub_809971C - thumb_func_start sub_809981C sub_809981C: @ 809981C push {r4,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 6040e31be..38a81c2a9 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -98,7 +98,8 @@ struct PokemonStorageSystemData { struct Sprite *unk_1034; struct Sprite *unk_1038[6]; // party struct Sprite *unk_1050[30]; // box - u8 filler_10c8[8]; + struct Sprite **unk_10c8; + u8 filler_10cc[4]; u16 unk_10d0[40]; u16 unk_1120[40]; u8 unk_1170; diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index 28b9e2655..7f5c84b49 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -3,6 +3,7 @@ #include "global.h" #include "constants/species.h" #include "sprite.h" +#include "trig.h" #include "pokemon_icon.h" #include "pokemon_storage_system.h" @@ -453,3 +454,43 @@ void sub_809960C(u8 a0, u8 a1) gPokemonStorageSystemPtr->unk_1034->callback = SpriteCallbackDummy; gPokemonStorageSystemPtr->unk_1034 = NULL; } + +void sub_80996B0(u8 a0, u8 a1) +{ + if (a0 == 14) + gPokemonStorageSystemPtr->unk_10c8 = gPokemonStorageSystemPtr->unk_1038 + a1; + else + gPokemonStorageSystemPtr->unk_10c8 = gPokemonStorageSystemPtr->unk_1050 + a1; + gPokemonStorageSystemPtr->unk_1034->callback = SpriteCallbackDummy; + gPokemonStorageSystemPtr->unk_1170 = 0; +} + +bool8 sub_809971C(void) +{ + if (gPokemonStorageSystemPtr->unk_1170 == 16) + return FALSE; + gPokemonStorageSystemPtr->unk_1170++; + if (gPokemonStorageSystemPtr->unk_1170 & 1) + { + (*gPokemonStorageSystemPtr->unk_10c8)->pos1.y--; + gPokemonStorageSystemPtr->unk_1034->pos1.y++; + } + (*gPokemonStorageSystemPtr->unk_10c8)->pos2.x = gSineTable[gPokemonStorageSystemPtr->unk_1170 * 8] / 16; + gPokemonStorageSystemPtr->unk_1034->pos2.x = -(gSineTable[gPokemonStorageSystemPtr->unk_1170 * 8] / 16); + if (gPokemonStorageSystemPtr->unk_1170 == 8) + { + gPokemonStorageSystemPtr->unk_1034->oam.priority = (*gPokemonStorageSystemPtr->unk_10c8)->oam.priority; + gPokemonStorageSystemPtr->unk_1034->subpriority = (*gPokemonStorageSystemPtr->unk_10c8)->subpriority; + (*gPokemonStorageSystemPtr->unk_10c8)->oam.priority = 1; + (*gPokemonStorageSystemPtr->unk_10c8)->subpriority = 7; + } + if (gPokemonStorageSystemPtr->unk_1170 == 16) + { + struct Sprite *sprite = gPokemonStorageSystemPtr->unk_1034; + gPokemonStorageSystemPtr->unk_1034 = *(gPokemonStorageSystemPtr->unk_10c8); + (*gPokemonStorageSystemPtr->unk_10c8) = sprite; + gPokemonStorageSystemPtr->unk_1034->callback = sub_80999C4; + (*gPokemonStorageSystemPtr->unk_10c8)->callback = SpriteCallbackDummy; + } + return TRUE; +} -- cgit v1.2.3 From a1ccd03edd90601759a04f223c9558181a657728 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 10 Jan 2018 22:08:58 -0500 Subject: Refine struct at 02000028 --- include/pokemon_storage_system.h | 17 +++++++++++++---- src/pokemon/pokemon_storage_system_2.c | 2 +- src/pokemon/pokemon_storage_system_5.c | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 38a81c2a9..438af769b 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -50,8 +50,16 @@ struct PSS_MenuStringPtrs { const u8 *desc; }; +struct UnkStruct_2000028 { + void *unk_00; + void *unk_04; + u16 unk_08; + u16 unk_0a; + void (*unk_0c)(struct UnkStruct_2000028 *data); +}; + struct UnkStruct_2000020 { - struct UnkStruct_2000020 *unk_00; + struct UnkStruct_2000028 *unk_00; u8 unk_04; u8 unk_05; }; @@ -78,7 +86,8 @@ struct PokemonStorageSystemData { u16 unk_0008; u16 unk_000a; struct PCScreenEffectStruct unk_000c; - struct UnkStruct_2000020 unk_0020[17]; // refine size later + struct UnkStruct_2000020 unk_0020; + struct UnkStruct_2000028 unk_0028[8]; u16 unk_00a8[0x400]; u16 unk_08a8; u16 unk_08aa; @@ -99,7 +108,7 @@ struct PokemonStorageSystemData { struct Sprite *unk_1038[6]; // party struct Sprite *unk_1050[30]; // box struct Sprite **unk_10c8; - u8 filler_10cc[4]; + struct Sprite **unk_10cc; u16 unk_10d0[40]; u16 unk_1120[40]; u8 unk_1170; @@ -214,7 +223,7 @@ void sub_809CDCC(void); void sub_809CDEC(u8 a0); void sub_809CE84(void); s16 sub_809CF30(void); -void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2); +void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000028 *a1, u8 a2); void sub_809CFF0(void); void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index a158b29a9..e5466ea70 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -176,7 +176,7 @@ void sub_8096804(void) FreeAllSpritePalettes(); ResetTasks(); gReservedSpriteTileCount = 0x280; - sub_809CFDC(gPokemonStorageSystemPtr->unk_0020, gPokemonStorageSystemPtr->unk_0020 + 1, 8); + sub_809CFDC(&gPokemonStorageSystemPtr->unk_0020, gPokemonStorageSystemPtr->unk_0028, 8); gKeyRepeatStartDelay = 20; } diff --git a/src/pokemon/pokemon_storage_system_5.c b/src/pokemon/pokemon_storage_system_5.c index f809439ff..b7c3d42f5 100644 --- a/src/pokemon/pokemon_storage_system_5.c +++ b/src/pokemon/pokemon_storage_system_5.c @@ -7,7 +7,7 @@ // Static RAM declarations -EWRAM_DATA u32 gUnknown_020384EC = 0; +EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL; // Static ROM declarations -- cgit v1.2.3 From b5667bd097347c1d3958fa8f9eb6d39788c0ff50 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 Jan 2018 23:20:32 -0600 Subject: refactor build system --- .travis.yml | 16 +- Makefile | 275 +++-- asm/battle_1.s | 2 +- asm/battle_9.s | 2 +- asm/battle_anim_812C144.s | 2 +- asm/battle_anim_813F0F4.s | 2 +- asm/battle_intro.s | 2 +- asm/contest_ai.s | 2 +- asm/contest_effect.s | 2 +- asm/contest_link_80C2020.s | 2 +- asm/contest_link_80C857C.s | 2 +- asm/crt0.s | 227 ---- asm/current.s | 2 +- asm/cute_sketch.s | 2 +- asm/dark.s | 2 +- asm/dragon.s | 2 +- asm/fight.s | 2 +- asm/flying.s | 2 +- asm/ghost.s | 2 +- asm/ground.s | 2 +- asm/ice.s | 2 +- asm/libagbsyscall.s | 91 -- asm/libgcnmultiboot.s | 641 ----------- asm/m4a_1.s | 1911 -------------------------------- asm/m4a_3.s | 2 +- asm/macros.inc | 149 --- asm/macros/asm.inc | 17 - asm/macros/battle_ai_script.inc | 554 --------- asm/macros/battle_anim.inc | 266 ----- asm/macros/battle_script.inc | 1414 ----------------------- asm/macros/contest_ai_script.inc | 506 --------- asm/macros/ec.inc | 8 - asm/macros/event.inc | 1481 ------------------------- asm/macros/field_effect_script.inc | 42 - asm/macros/function.inc | 29 - asm/macros/m4a.inc | 13 - asm/macros/map.inc | 96 -- asm/macros/movement.inc | 116 -- asm/macros/music_voice.inc | 125 --- asm/macros/pokemon_data.inc | 57 - asm/normal.s | 2 +- asm/pc_screen_effect.s | 2 +- asm/pokedex_area_screen.s | 2 +- asm/pokedex_cry_screen.s | 2 +- asm/pokemon_item_effect.s | 2 +- asm/pokemon_storage_system.s | 2 +- asm/pokenav.s | 2 +- asm/psychic.s | 2 +- asm/rock.s | 2 +- asm/unk_text_8095904.s | 2 +- asm/water.s | 2 +- config.mk | 44 + data-de/event_scripts.s | 4 +- data-de/strings2.s | 2 +- data/battle_ai_scripts.s | 4 +- data/battle_anim.s | 2 +- data/battle_anim_80A7E7C.s | 2 +- data/battle_anim_80CA710.s | 2 +- data/battle_anim_812C144.s | 2 +- data/battle_anim_813F0F4.s | 2 +- data/battle_anim_scripts.s | 4 +- data/battle_interface.s | 2 +- data/battle_moves.s | 2 +- data/battle_scripts_1.s | 4 +- data/battle_scripts_2.s | 4 +- data/contest.s | 2 +- data/contest_ai.s | 2 +- data/contest_ai_scripts.s | 4 +- data/contest_effect.s | 2 +- data/contest_link_80C2020.s | 2 +- data/cute_sketch.s | 2 +- data/data2a.s | 2 +- data/data2b.s | 2 +- data/data_8393054.s | 2 +- data/easy_chat.s | 2 +- data/event_scripts.s | 4 +- data/field_effect_scripts.s | 4 +- data/map_events.s | 2 +- data/maps.s | 2 +- data/pc_screen_effect.s | 2 +- data/pokedex_area_screen.s | 2 +- data/pokedex_cry_screen.s | 2 +- data/pokemon_storage_system.s | 2 +- data/pokenav.s | 2 +- data/roulette.s | 2 +- data/sound_data.s | 4 +- data/strings2.s | 2 +- data/tilesets.s | 2 +- fonts.mk | 2 - include/MPlayDef.s | 430 +++++++ include/macros.inc | 149 +++ include/macros/asm.inc | 17 + include/macros/battle_ai_script.inc | 554 +++++++++ include/macros/battle_anim.inc | 266 +++++ include/macros/battle_script.inc | 1414 +++++++++++++++++++++++ include/macros/contest_ai_script.inc | 506 +++++++++ include/macros/ec.inc | 8 + include/macros/event.inc | 1481 +++++++++++++++++++++++++ include/macros/field_effect_script.inc | 42 + include/macros/function.inc | 29 + include/macros/m4a.inc | 13 + include/macros/map.inc | 96 ++ include/macros/movement.inc | 116 ++ include/macros/music_voice.inc | 125 +++ include/macros/pokemon_data.inc | 57 + ld_script.txt | 8 +- misc.mk | 284 ++--- sound/MPlayDef.s | 430 ------- src/crt0.s | 227 ++++ src/libs/libagbsyscall.s | 91 ++ src/libs/libgcnmultiboot.s | 641 +++++++++++ src/libs/m4a_1.s | 1911 ++++++++++++++++++++++++++++++++ sym_bss.txt | 2 +- tilesets.mk | 216 +--- 114 files changed, 8641 insertions(+), 8702 deletions(-) delete mode 100644 asm/crt0.s delete mode 100644 asm/libagbsyscall.s delete mode 100644 asm/libgcnmultiboot.s delete mode 100644 asm/m4a_1.s delete mode 100644 asm/macros.inc delete mode 100644 asm/macros/asm.inc delete mode 100644 asm/macros/battle_ai_script.inc delete mode 100644 asm/macros/battle_anim.inc delete mode 100644 asm/macros/battle_script.inc delete mode 100644 asm/macros/contest_ai_script.inc delete mode 100644 asm/macros/ec.inc delete mode 100644 asm/macros/event.inc delete mode 100644 asm/macros/field_effect_script.inc delete mode 100644 asm/macros/function.inc delete mode 100644 asm/macros/m4a.inc delete mode 100644 asm/macros/map.inc delete mode 100644 asm/macros/movement.inc delete mode 100644 asm/macros/music_voice.inc delete mode 100644 asm/macros/pokemon_data.inc create mode 100644 config.mk create mode 100644 include/MPlayDef.s create mode 100644 include/macros.inc create mode 100644 include/macros/asm.inc create mode 100644 include/macros/battle_ai_script.inc create mode 100644 include/macros/battle_anim.inc create mode 100644 include/macros/battle_script.inc create mode 100644 include/macros/contest_ai_script.inc create mode 100644 include/macros/ec.inc create mode 100644 include/macros/event.inc create mode 100644 include/macros/field_effect_script.inc create mode 100644 include/macros/function.inc create mode 100644 include/macros/m4a.inc create mode 100644 include/macros/map.inc create mode 100644 include/macros/movement.inc create mode 100644 include/macros/music_voice.inc create mode 100644 include/macros/pokemon_data.inc delete mode 100644 sound/MPlayDef.s create mode 100644 src/crt0.s create mode 100644 src/libs/libagbsyscall.s create mode 100644 src/libs/libgcnmultiboot.s create mode 100644 src/libs/m4a_1.s diff --git a/.travis.yml b/.travis.yml index 04b2597b6..9a196819b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,12 +25,12 @@ matrix: env: _="Build" script: - ./build_tools.sh - - make -j2 compare_ruby - - make -j2 compare_ruby_rev1 - - make -j2 compare_ruby_rev2 - - make -j2 compare_sapphire - - make -j2 compare_sapphire_rev1 - - make -j2 compare_sapphire_rev2 + - make -j2 ruby + - make -j2 ruby_rev1 + - make -j2 ruby_rev2 + - make -j2 sapphire + - make -j2 sapphire_rev1 + - make -j2 sapphire_rev2 - os: linux env: _="Formatting" addons: @@ -53,7 +53,7 @@ matrix: - rsync -avhI graphics-de/ graphics/ script: - ./build_tools.sh - - make -j2 compare_ruby_de - - make -j2 compare_sapphire_de + - make -j2 ruby_de + - make -j2 sapphire_de allow_failures: - env: _="Formatting" diff --git a/Makefile b/Makefile index c1f6a6b4f..1fb17dc02 100644 --- a/Makefile +++ b/Makefile @@ -1,73 +1,149 @@ -SHELL := /bin/bash -o pipefail -AS := $(DEVKITARM)/bin/arm-none-eabi-as -ASFLAGS := -mcpu=arm7tdmi +include config.mk -CC1 := tools/agbcc/bin/agbcc -override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm -CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp -CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs +#### Tools #### -LD := $(DEVKITARM)/bin/arm-none-eabi-ld +SHELL := /bin/bash -o pipefail +AS := $(DEVKITARM)/bin/arm-none-eabi-as +CC1 := tools/agbcc/bin/agbcc +CPP := $(DEVKITARM)/bin/arm-none-eabi-cpp +LD := $(DEVKITARM)/bin/arm-none-eabi-ld +OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy +SHA1SUM := sha1sum -c +GBAGFX := tools/gbagfx/gbagfx +RSFONT := tools/rsfont/rsfont +AIF2PCM := tools/aif2pcm/aif2pcm +MID2AGB := tools/mid2agb/mid2agb +PREPROC := tools/preproc/preproc +SCANINC := tools/scaninc/scaninc +RAMSCRGEN := tools/ramscrgen/ramscrgen -OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy +ASFLAGS := -mcpu=arm7tdmi -I include --defsym $(VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(LANGUAGE)=1 +CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm +CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -D $(VERSION) -D REVISION=$(REVISION) -D $(LANGUAGE) + + +#### Files #### + +ROM := poke$(BUILD_NAME).gba +MAP := $(ROM:%.gba=%.map) + +SUBDIRS := \ + sound \ + sound/songs \ + asm \ + data \ + src \ + src/battle \ + src/battle/anim \ + src/field \ + src/debug \ + src/scene \ + src/pokemon \ + src/engine \ + src/libs +BUILD_DIR := build/$(BUILD_NAME) + +C_SOURCES := $(foreach dir, $(SUBDIRS), $(wildcard $(dir)/*.c)) +ASM_SOURCES := $(foreach dir, $(SUBDIRS), $(wildcard $(dir)/*.s)) + +C_OBECTS := $(addprefix $(BUILD_DIR)/, $(C_SOURCES:%.c=%.o)) +ASM_OBJECTS := $(addprefix $(BUILD_DIR)/, $(ASM_SOURCES:%.s=%.o)) +ALL_OBJECTS := $(C_OBJECTS) $(ASM_OBJECTS) -LIBGCC := tools/agbcc/lib/libgcc.a LIBC := tools/agbcc/lib/libc.a +LIBGCC := tools/agbcc/lib/libgcc.a -SHA1 := sha1sum -c +LD_SCRIPT := $(BUILD_DIR)/ld_script.ld -GFX := tools/gbagfx/gbagfx -AIF := tools/aif2pcm/aif2pcm -MID := tools/mid2agb/mid2agb -SCANINC := tools/scaninc/scaninc -PREPROC := tools/preproc/preproc -RAMSCRGEN := tools/ramscrgen/ramscrgen +# Special configurations required for lib files +%src/libs/siirtc.o: CC1FLAGS := -mthumb-interwork +%src/libs/agb_flash.o: CC1FLAGS := -O1 -mthumb-interwork +%src/libs/agb_flash_1m.o: CC1FLAGS := -O1 -mthumb-interwork +%src/libs/agb_flash_mx.o: CC1FLAGS := -O1 -mthumb-interwork +%src/libs/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc +%src/libs/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc -REVISION := 0 -VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_de sapphire_de +#### Main Rules #### -# Clear the default suffixes. -.SUFFIXES: +# Disable dependency scanning when NODEP is used for quick building +ifeq ($(NODEP),) + $(BUILD_DIR)/src/%.o: C_FILE = $(*D)/$(*F).c + $(BUILD_DIR)/src/%.o: C_DEP = $(shell $(SCANINC) -I include $(wildcard $(C_FILE:$(BUILD_DIR)/=))) + $(BUILD_DIR)/asm/%.o: ASM_DEP = $(shell $(SCANINC) asm/$(*F).s) + $(BUILD_DIR)/data/%.o: ASM_DEP = $(shell $(SCANINC) data/$(*F).s) +endif # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: +# Clear the default suffixes +.SUFFIXES: + +# Don't delete intermediate files .PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin -.PHONY: all clean tidy all_versions compare compare_all \ -$(VERSIONS) $(VERSIONS:%=compare_%) +# Create build subdirectories +$(shell mkdir -p $(addprefix $(BUILD_DIR)/, $(SUBDIRS))) + +all: $(ROM) +ifeq ($(COMPARE),1) + @$(SHA1SUM) $(BUILD_NAME).sha1 +endif + +clean: tidy + $(RM) sound/direct_sound_samples/*.bin + $(RM) $(ALL_OBJECTS) + find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + +tidy: + $(RM) poke$(BUILD_NAME){.gba,.elf,.map} + $(RM) -r build -$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,asm,data,src{,/battle{,/anim},/field,/debug,/scene,/pokemon,/engine,/libs}})) +%.gba: %.elf + $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ -C_SRCS := $(shell find src -iname "*.c") -ASM_SRCS := $(wildcard asm/*.s) -DATA_ASM_SRCS := $(wildcard data/*.s) +%.elf: $(LD_SCRIPT) $(ALL_OBJECTS) + cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) -o ../../$@ ../../$(LIBGCC) ../../$(LIBC) -SONG_SRCS := $(wildcard sound/songs/*.s) -SONG_OBJS := $(SONG_SRCS:%.s=%.o) +$(LD_SCRIPT): $(BUILD_DIR)/sym_bss.ld $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld + cd $(BUILD_DIR) && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" >ld_script.ld +$(BUILD_DIR)/sym_bss.ld: sym_bss.txt + cd $(BUILD_DIR) && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt $(LANGUAGE) >sym_bss.ld +$(BUILD_DIR)/sym_common.ld: sym_common.txt $(C_OBECTS) $(wildcard common_syms/*.txt) + cd $(BUILD_DIR) && ../../$(RAMSCRGEN) COMMON ../../sym_common.txt $(LANGUAGE) -c src,../../common_syms >sym_common.ld +$(BUILD_DIR)/sym_ewram.ld: sym_ewram.txt + cd $(BUILD_DIR) && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $(LANGUAGE) >sym_ewram.ld -all: ruby - @: +$(BUILD_DIR)/%.o: %.c $$(C_DEP) + $(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i + $(PREPROC) $(BUILD_DIR)/$*.i charmap.txt | $(CC1) $(CC1FLAGS) -o $(BUILD_DIR)/$*.s + @printf ".text\n\t.align\t2, 0\n" >> $(BUILD_DIR)/$*.s + @$(AS) $(ASFLAGS) -o $@ $(BUILD_DIR)/$*.s -all_versions: $(VERSIONS) - @: +# Only .s files in data need preproc +$(BUILD_DIR)/data/%.o: data/%.s $$(ASM_DEP) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ -# For contributors to make sure a change didn't affect the contents of the ROM. -compare: compare_ruby -compare_all: $(VERSIONS:%=compare_%) +$(BUILD_DIR)/%.o: %.s $$(ASM_DEP) + $(AS) $(ASFLAGS) $< -o $@ -clean: tidy - rm -f sound/direct_sound_samples/*.bin - rm -f $(SONG_OBJS) - find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + +# "friendly" target names for convenience sake +ruby: ; @$(MAKE) --no-print-directory VERSION=RUBY +ruby_rev1: ; @$(MAKE) --no-print-directory VERSION=RUBY REVISION=1 +ruby_rev2: ; @$(MAKE) --no-print-directory VERSION=RUBY REVISION=2 +sapphire: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE +sapphire_rev1: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE REVISION=1 +sapphire_rev2: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE REVISION=1 +ruby_de: ; @$(MAKE) --no-print-directory VERSION=RUBY LANGUAGE=GERMAN +sapphire_de: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE LANGUAGE=GERMAN -tidy: - rm -f $(VERSIONS:%=poke%{.gba,.elf,.map}) - rm -r build/* + +#### Graphics Rules #### + +GFX_OPTS := include castform.mk include tilesets.mk @@ -75,107 +151,22 @@ include fonts.mk include misc.mk include override.mk -%.s: ; -%.png: ; -%.pal: ; -%.aif: ; - -%.1bpp: %.png ; $(GFX) $< $@ -%.4bpp: %.png ; $(GFX) $< $@ -%.8bpp: %.png ; $(GFX) $< $@ -%.gbapal: %.pal ; $(GFX) $< $@ -%.gbapal: %.png ; $(GFX) $< $@ -%.lz: % ; $(GFX) $< $@ -%.rl: % ; $(GFX) $< $@ -sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress -%.bin: %.aif ; $(AIF) $< $@ -sound/songs/%.s: sound/songs/%.mid - cd $(@D) && ../../$(MID) $(> build/$1/$$*.s - $$(AS) $$(ASFLAGS) -o $$@ build/$1/$$*.s - -$$($1_ASM_OBJS): VERSION := $2 -$$($1_ASM_OBJS): REVISION := $3 -$$($1_ASM_OBJS): LANGUAGE := $4 -build/$1/asm/%.o: asm/%.s $$$$(asm_dep) - $$(AS) $$(ASFLAGS) --defsym $$(VERSION)=1 --defsym REVISION=$$(REVISION) --defsym $$(LANGUAGE)=1 -o $$@ $$< - -$$($1_DATA_ASM_OBJS): VERSION := $2 -$$($1_DATA_ASM_OBJS): REVISION := $3 -$$($1_DATA_ASM_OBJS): LANGUAGE := $4 -build/$1/data/%.o: data/%.s $$$$(asm_dep) - $$(PREPROC) $$< charmap.txt | $$(CPP) -I include | $$(AS) $$(ASFLAGS) --defsym $$(VERSION)=1 --defsym REVISION=$$(REVISION) --defsym $$(LANGUAGE)=1 -o $$@ - -build/$1/sym_bss.ld: LANGUAGE := $4 -build/$1/sym_bss.ld: sym_bss.txt - cd build/$1 && ../../$$(RAMSCRGEN) .bss ../../sym_bss.txt $$(LANGUAGE) >sym_bss.ld - -build/$1/sym_common.ld: LANGUAGE := $4 -build/$1/sym_common.ld: sym_common.txt $$($1_C_OBJS) $$(wildcard common_syms/*.txt) - cd build/$1 && ../../$$(RAMSCRGEN) COMMON ../../sym_common.txt $$(LANGUAGE) -c src,../../common_syms >sym_common.ld - -build/$1/sym_ewram.ld: LANGUAGE := $4 -build/$1/sym_ewram.ld: sym_ewram.txt - cd build/$1 && ../../$$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $$(LANGUAGE) >sym_ewram.ld - -build/$1/ld_script.ld: ld_script.txt build/$1/sym_bss.ld build/$1/sym_common.ld build/$1/sym_ewram.ld - cd build/$1 && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" >ld_script.ld - -poke$1.elf: build/$1/ld_script.ld $$($1_OBJS) - cd build/$1 && $$(LD) -T ld_script.ld -Map ../../poke$1.map -o ../../$$@ $$($1_OBJS_REL) ../../$$(LIBGCC) ../../$$(LIBC) - -poke$1.gba: %.gba: %.elf - $$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $$< $$@ - -compare_$1: poke$1.gba - @$$(SHA1) $1.sha1 - -$1: poke$1.gba - @: -endef - -$(eval $(call VERSION_RULES,ruby,RUBY,0,ENGLISH)) -$(eval $(call VERSION_RULES,ruby_rev1,RUBY,1,ENGLISH)) -$(eval $(call VERSION_RULES,ruby_rev2,RUBY,2,ENGLISH)) -$(eval $(call VERSION_RULES,sapphire,SAPPHIRE,0,ENGLISH)) -$(eval $(call VERSION_RULES,sapphire_rev1,SAPPHIRE,1,ENGLISH)) -$(eval $(call VERSION_RULES,sapphire_rev2,SAPPHIRE,2,ENGLISH)) -$(eval $(call VERSION_RULES,ruby_de,RUBY,0,GERMAN)) -$(eval $(call VERSION_RULES,sapphire_de,SAPPHIRE,0,GERMAN)) +sound/songs/%.s: sound/songs/%.mid + cd $(@D) && ../../$(MID2AGB) $(= 0x2000000 (i.e. not in BIOS ROM), accept it - ldr r0, lt_MPlayJumpTableTemplate - cmp r2, r0 - blo chk_adr_r2_reject @ if adr < gMPlayJumpTableTemplate, reject it - lsrs r0, r2, 14 - beq chk_adr_r2_done @ if adr < 0x40000 (i.e. in BIOS ROM), accept it -chk_adr_r2_reject: - movs r3, 0 -chk_adr_r2_done: - pop {r0} - bx lr - - .align 2, 0 -lt_MPlayJumpTableTemplate: .word gMPlayJumpTableTemplate - - thumb_func_start ld_r3_tp_adr_i -ld_r3_tp_adr_i: - ldr r2, [r1, 0x40] -_081DD64A: - adds r3, r2, 0x1 - str r3, [r1, 0x40] - ldrb r3, [r2] - b chk_adr_r2 - thumb_func_end ld_r3_tp_adr_i - - thumb_func_start ply_goto -ply_goto: - push {lr} -ply_goto_1: - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] - ldrb r0, [r2, 0x3] - lsls r0, 8 - ldrb r3, [r2, 0x2] - orrs r0, r3 - lsls r0, 8 - ldrb r3, [r2, 0x1] - orrs r0, r3 - lsls r0, 8 - bl ldrb_r3_r2 - orrs r0, r3 - str r0, [r1, o_MusicPlayerTrack_cmdPtr] - pop {r0} - bx r0 - thumb_func_end ply_goto - - thumb_func_start ply_patt -ply_patt: - ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] - cmp r2, 3 - bhs ply_patt_done - lsls r2, 2 - adds r3, r1, r2 - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] - adds r2, 0x4 - str r2, [r3, o_MusicPlayerTrack_patternStack] - ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] - adds r2, 1 - strb r2, [r1, o_MusicPlayerTrack_patternLevel] - b ply_goto -ply_patt_done: - b ply_fine - thumb_func_end ply_patt - - thumb_func_start ply_pend -ply_pend: - ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] - cmp r2, 0 - beq ply_pend_done - subs r2, 1 - strb r2, [r1, o_MusicPlayerTrack_patternLevel] - lsls r2, 2 - adds r3, r1, r2 - ldr r2, [r3, o_MusicPlayerTrack_patternStack] - str r2, [r1, o_MusicPlayerTrack_cmdPtr] -ply_pend_done: - bx lr - thumb_func_end ply_pend - - thumb_func_start ply_rept -ply_rept: - push {lr} - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] - ldrb r3, [r2] - cmp r3, 0 - bne ply_rept_1 - adds r2, 1 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] - b ply_goto_1 -ply_rept_1: - ldrb r3, [r1, o_MusicPlayerTrack_repN] - adds r3, 1 - strb r3, [r1, o_MusicPlayerTrack_repN] - mov r12, r3 - bl ld_r3_tp_adr_i - cmp r12, r3 - bhs ply_rept_2 - b ply_goto_1 -ply_rept_2: - movs r3, 0 - strb r3, [r1, o_MusicPlayerTrack_repN] - adds r2, 5 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] - pop {r0} - bx r0 - thumb_func_end ply_rept - - thumb_func_start ply_prio -ply_prio: - mov r12, lr - bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_priority] - bx r12 - thumb_func_end ply_prio - - thumb_func_start ply_tempo -ply_tempo: - mov r12, lr - bl ld_r3_tp_adr_i - lsls r3, 1 - strh r3, [r0, o_MusicPlayerInfo_tempoD] - ldrh r2, [r0, o_MusicPlayerInfo_tempoU] - muls r3, r2 - lsrs r3, 8 - strh r3, [r0, o_MusicPlayerInfo_tempoI] - bx r12 - thumb_func_end ply_tempo - - thumb_func_start ply_keysh -ply_keysh: - mov r12, lr - bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_keyShift] - ldrb r3, [r1, o_MusicPlayerTrack_flags] - movs r2, 0xC - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] - bx r12 - thumb_func_end ply_keysh - - thumb_func_start ply_voice -ply_voice: - mov r12, lr - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] - ldrb r3, [r2] - adds r2, 1 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] - lsls r2, r3, 1 - adds r2, r3 - lsls r2, 2 - ldr r3, [r0, o_MusicPlayerInfo_tone] - adds r2, r3 - ldr r3, [r2] - bl chk_adr_r2 - str r3, [r1, o_MusicPlayerTrack_ToneData_type] - ldr r3, [r2, 0x4] - bl chk_adr_r2 - str r3, [r1, o_MusicPlayerTrack_ToneData_wav] - ldr r3, [r2, 0x8] - bl chk_adr_r2 - str r3, [r1, o_MusicPlayerTrack_ToneData_attack] - bx r12 - thumb_func_end ply_voice - - thumb_func_start ply_vol -ply_vol: - mov r12, lr - bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_vol] - ldrb r3, [r1, o_MusicPlayerTrack_flags] - movs r2, 0x3 - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] - bx r12 - thumb_func_end ply_vol - - thumb_func_start ply_pan -ply_pan: - mov r12, lr - bl ld_r3_tp_adr_i - subs r3, 0x40 - strb r3, [r1, o_MusicPlayerTrack_pan] - ldrb r3, [r1, o_MusicPlayerTrack_flags] - movs r2, 0x3 - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] - bx r12 - thumb_func_end ply_pan - - thumb_func_start ply_bend -ply_bend: - mov r12, lr - bl ld_r3_tp_adr_i - subs r3, 0x40 - strb r3, [r1, o_MusicPlayerTrack_bend] - ldrb r3, [r1, o_MusicPlayerTrack_flags] - movs r2, 0xC - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] - bx r12 - thumb_func_end ply_bend - - thumb_func_start ply_bendr -ply_bendr: - mov r12, lr - bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_bendRange] - ldrb r3, [r1, o_MusicPlayerTrack_flags] - movs r2, 0xC - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] - bx r12 - thumb_func_end ply_bendr - - thumb_func_start ply_lfodl -ply_lfodl: - mov r12, lr - bl ld_r3_tp_adr_i - strb r3, [r1, o_MusicPlayerTrack_lfoDelay] - bx r12 - thumb_func_end ply_lfodl - - thumb_func_start ply_modt -ply_modt: - mov r12, lr - bl ld_r3_tp_adr_i - ldrb r0, [r1, o_MusicPlayerTrack_modT] - cmp r0, r3 - beq _081DD7AA - strb r3, [r1, o_MusicPlayerTrack_modT] - ldrb r3, [r1, o_MusicPlayerTrack_flags] - movs r2, 0xF - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] -_081DD7AA: - bx r12 - thumb_func_end ply_modt - - thumb_func_start ply_tune -ply_tune: - mov r12, lr - bl ld_r3_tp_adr_i - subs r3, 0x40 - strb r3, [r1, o_MusicPlayerTrack_tune] - ldrb r3, [r1, o_MusicPlayerTrack_flags] - movs r2, 0xC - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] - bx r12 - thumb_func_end ply_tune - - thumb_func_start ply_port -ply_port: - mov r12, lr - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] - ldrb r3, [r2] - adds r2, 1 - ldr r0, =REG_SOUND1CNT_L @ sound register base address - adds r0, r3 - bl _081DD64A - strb r3, [r0] - bx r12 - .pool - thumb_func_end ply_port - - thumb_func_start m4aSoundVSync -m4aSoundVSync: - ldr r0, lt2_SOUND_INFO_PTR - ldr r0, [r0] - - @ Exit the function if ident is not ID_NUMBER or ID_NUMBER+1. - ldr r2, lt2_ID_NUMBER - ldr r3, [r0, o_SoundInfo_ident] - subs r3, r2 - cmp r3, 1 - bhi m4aSoundVSync_Done - - @ Decrement the PCM DMA counter. If it reaches 0, we need to do a DMA. - ldrb r1, [r0, o_SoundInfo_pcmDmaCounter] - subs r1, 1 - strb r1, [r0, o_SoundInfo_pcmDmaCounter] - bgt m4aSoundVSync_Done - - @ Reload the PCM DMA counter. - ldrb r1, [r0, o_SoundInfo_pcmDmaPeriod] - strb r1, [r0, o_SoundInfo_pcmDmaCounter] - - ldr r2, =REG_DMA1 - - ldr r1, [r2, 0x8] @ DMA1CNT - lsls r1, 7 - bcc m4aSoundVSync_SkipDMA1 @ branch if repeat bit isn't set - - ldr r1, =((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4 - str r1, [r2, 0x8] @ DMA1CNT - -m4aSoundVSync_SkipDMA1: - ldr r1, [r2, 0xC + 0x8] @ DMA2CNT - lsls r1, 7 - bcc m4aSoundVSync_SkipDMA2 @ branch if repeat bit isn't set - - ldr r1, =((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4 - str r1, [r2, 0xC + 0x8] @ DMA2CNT - -m4aSoundVSync_SkipDMA2: - - @ turn off DMA1/DMA2 - movs r1, DMA_32BIT >> 8 - lsls r1, 8 - strh r1, [r2, 0xA] @ DMA1CNT_H - strh r1, [r2, 0xC + 0xA] @ DMA2CNT_H - - @ turn on DMA1/DMA2 direct-sound FIFO mode - movs r1, (DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT) >> 8 - lsls r1, 8 @ LSB is 0, so DMA_SRC_INC is used (destination is always fixed in FIFO mode) - strh r1, [r2, 0xA] @ DMA1CNT_H - strh r1, [r2, 0xC + 0xA] @ DMA2CNT_H - -m4aSoundVSync_Done: - bx lr - - .pool - thumb_func_end m4aSoundVSync - - thumb_func_start MPlayMain -MPlayMain: - ldr r2, lt2_ID_NUMBER - ldr r3, [r0, o_MusicPlayerInfo_ident] - cmp r2, r3 - beq _081DD82E - bx lr -_081DD82E: - adds r3, 0x1 - str r3, [r0, o_MusicPlayerInfo_ident] - push {r0,lr} - ldr r3, [r0, o_MusicPlayerInfo_func] - cmp r3, 0 - beq _081DD840 - ldr r0, [r0, o_MusicPlayerInfo_intp] - bl call_r3 -_081DD840: - pop {r0} - push {r4-r7} - mov r4, r8 - mov r5, r9 - mov r6, r10 - mov r7, r11 - push {r4-r7} - adds r7, r0, 0 - ldr r0, [r7, o_MusicPlayerInfo_status] - cmp r0, 0 - bge _081DD858 - b _081DDA6C -_081DD858: - ldr r0, lt2_SOUND_INFO_PTR - ldr r0, [r0] - mov r8, r0 - adds r0, r7, 0 - bl FadeOutBody - ldr r0, [r7, o_MusicPlayerInfo_status] - cmp r0, 0 - bge _081DD86C - b _081DDA6C -_081DD86C: - ldrh r0, [r7, o_MusicPlayerInfo_tempoC] - ldrh r1, [r7, o_MusicPlayerInfo_tempoI] - adds r0, r1 - b _081DD9BC -_081DD874: - ldrb r6, [r7, o_MusicPlayerInfo_trackCount] - ldr r5, [r7, o_MusicPlayerInfo_tracks] - movs r3, 0x1 - movs r4, 0 -_081DD87C: - ldrb r0, [r5] - movs r1, 0x80 - tst r1, r0 - bne _081DD886 - b _081DD998 -_081DD886: - mov r10, r3 - orrs r4, r3 - mov r11, r4 - ldr r4, [r5, o_MusicPlayerTrack_chan] - cmp r4, 0 - beq _081DD8BA -_081DD892: - ldrb r1, [r4] - movs r0, 0xC7 - tst r0, r1 - beq _081DD8AE - ldrb r0, [r4, 0x10] - cmp r0, 0 - beq _081DD8B4 - subs r0, 0x1 - strb r0, [r4, 0x10] - bne _081DD8B4 - movs r0, 0x40 - orrs r1, r0 - strb r1, [r4] - b _081DD8B4 -_081DD8AE: - adds r0, r4, 0 - bl ClearChain -_081DD8B4: - ldr r4, [r4, 0x34] - cmp r4, 0 - bne _081DD892 -_081DD8BA: - ldrb r3, [r5, o_MusicPlayerTrack_flags] - movs r0, 0x40 - tst r0, r3 - beq _081DD938 - adds r0, r5, 0 - bl Clear64byte - movs r0, 0x80 - strb r0, [r5] - movs r0, 0x2 - strb r0, [r5, o_MusicPlayerTrack_bendRange] - movs r0, 0x40 - strb r0, [r5, o_MusicPlayerTrack_volX] - movs r0, 0x16 - strb r0, [r5, o_MusicPlayerTrack_lfoSpeed] - movs r0, 0x1 - adds r1, r5, 0x6 - strb r0, [r1, o_MusicPlayerTrack_ToneData_type - 0x6] - b _081DD938 -_081DD8E0: - ldr r2, [r5, o_MusicPlayerTrack_cmdPtr] - ldrb r1, [r2] - cmp r1, 0x80 - bhs _081DD8EC - ldrb r1, [r5, o_MusicPlayerTrack_runningStatus] - b _081DD8F6 -_081DD8EC: - adds r2, 0x1 - str r2, [r5, o_MusicPlayerTrack_cmdPtr] - cmp r1, 0xBD - bcc _081DD8F6 - strb r1, [r5, o_MusicPlayerTrack_runningStatus] -_081DD8F6: - cmp r1, 0xCF - bcc _081DD90C - mov r0, r8 - ldr r3, [r0, o_SoundInfo_plynote] - adds r0, r1, 0 - subs r0, 0xCF - adds r1, r7, 0 - adds r2, r5, 0 - bl call_r3 - b _081DD938 -_081DD90C: - cmp r1, 0xB0 - bls _081DD92E - adds r0, r1, 0 - subs r0, 0xB1 - strb r0, [r7, o_MusicPlayerInfo_cmd] - mov r3, r8 - ldr r3, [r3, o_SoundInfo_MPlayJumpTable] - lsls r0, 2 - ldr r3, [r3, r0] - adds r0, r7, 0 - adds r1, r5, 0 - bl call_r3 - ldrb r0, [r5, o_MusicPlayerTrack_flags] - cmp r0, 0 - beq _081DD994 - b _081DD938 -_081DD92E: - ldr r0, lt_gClockTable - subs r1, 0x80 - adds r1, r0 - ldrb r0, [r1] - strb r0, [r5, o_MusicPlayerTrack_wait] -_081DD938: - ldrb r0, [r5, o_MusicPlayerTrack_wait] - cmp r0, 0 - beq _081DD8E0 - subs r0, 0x1 - strb r0, [r5, o_MusicPlayerTrack_wait] - ldrb r1, [r5, o_MusicPlayerTrack_lfoSpeed] - cmp r1, 0 - beq _081DD994 - ldrb r0, [r5, o_MusicPlayerTrack_mod] - cmp r0, 0 - beq _081DD994 - ldrb r0, [r5, o_MusicPlayerTrack_lfoDelayC] - cmp r0, 0 - beq _081DD95A - subs r0, 0x1 - strb r0, [r5, o_MusicPlayerTrack_lfoDelayC] - b _081DD994 -_081DD95A: - ldrb r0, [r5, o_MusicPlayerTrack_lfoSpeedC] - adds r0, r1 - strb r0, [r5, o_MusicPlayerTrack_lfoSpeedC] - adds r1, r0, 0 - subs r0, 0x40 - lsls r0, 24 - bpl _081DD96E - lsls r2, r1, 24 - asrs r2, 24 - b _081DD972 -_081DD96E: - movs r0, 0x80 - subs r2, r0, r1 -_081DD972: - ldrb r0, [r5, o_MusicPlayerTrack_mod] - muls r0, r2 - asrs r2, r0, 6 - ldrb r0, [r5, o_MusicPlayerTrack_modM] - eors r0, r2 - lsls r0, 24 - beq _081DD994 - strb r2, [r5, o_MusicPlayerTrack_modM] - ldrb r0, [r5] - ldrb r1, [r5, o_MusicPlayerTrack_modT] - cmp r1, 0 - bne _081DD98E - movs r1, 0xC - b _081DD990 -_081DD98E: - movs r1, 0x3 -_081DD990: - orrs r0, r1 - strb r0, [r5, o_MusicPlayerTrack_flags] -_081DD994: - mov r3, r10 - mov r4, r11 -_081DD998: - subs r6, 0x1 - ble _081DD9A4 - movs r0, 0x50 - adds r5, r0 - lsls r3, 1 - b _081DD87C -_081DD9A4: - ldr r0, [r7, o_MusicPlayerInfo_clock] - adds r0, 0x1 - str r0, [r7, o_MusicPlayerInfo_clock] - cmp r4, 0 - bne _081DD9B6 - movs r0, 0x80 - lsls r0, 24 - str r0, [r7, o_MusicPlayerInfo_status] - b _081DDA6C -_081DD9B6: - str r4, [r7, o_MusicPlayerInfo_status] - ldrh r0, [r7, o_MusicPlayerInfo_tempoC] - subs r0, 0x96 -_081DD9BC: - strh r0, [r7, o_MusicPlayerInfo_tempoC] - cmp r0, 0x96 - bcc _081DD9C4 - b _081DD874 -_081DD9C4: - ldrb r2, [r7, o_MusicPlayerInfo_trackCount] - ldr r5, [r7, o_MusicPlayerInfo_tracks] -_081DD9C8: - ldrb r0, [r5, o_MusicPlayerTrack_flags] - movs r1, 0x80 - tst r1, r0 - beq _081DDA62 - movs r1, 0xF - tst r1, r0 - beq _081DDA62 - mov r9, r2 - adds r0, r7, 0 - adds r1, r5, 0 - bl TrkVolPitSet - ldr r4, [r5, o_MusicPlayerTrack_chan] - cmp r4, 0 - beq _081DDA58 -_081DD9E6: - ldrb r1, [r4, o_SoundChannel_status] - movs r0, 0xC7 - tst r0, r1 - bne _081DD9F6 - adds r0, r4, 0 - bl ClearChain - b _081DDA52 -_081DD9F6: - ldrb r0, [r4, o_SoundChannel_type] - movs r6, 0x7 - ands r6, r0 - ldrb r3, [r5, o_MusicPlayerTrack_flags] - movs r0, 0x3 - tst r0, r3 - beq _081DDA14 - bl ChnVolSetAsm - cmp r6, 0 - beq _081DDA14 - ldrb r0, [r4, o_CgbChannel_mo] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r4, o_CgbChannel_mo] -_081DDA14: - ldrb r3, [r5, o_MusicPlayerTrack_flags] - movs r0, 0xC - tst r0, r3 - beq _081DDA52 - ldrb r1, [r4, o_SoundChannel_ky] - movs r0, 0x8 - ldrsb r0, [r5, r0] - adds r2, r1, r0 - bpl _081DDA28 - movs r2, 0 -_081DDA28: - cmp r6, 0 - beq _081DDA46 - mov r0, r8 - ldr r3, [r0, o_SoundInfo_MidiKeyToCgbFreq] - adds r1, r2, 0 - ldrb r2, [r5, o_MusicPlayerTrack_pitM] - adds r0, r6, 0 - bl call_r3 - str r0, [r4, o_CgbChannel_fr] - ldrb r0, [r4, o_CgbChannel_mo] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r4, o_CgbChannel_mo] - b _081DDA52 -_081DDA46: - adds r1, r2, 0 - ldrb r2, [r5, o_MusicPlayerTrack_pitM] - ldr r0, [r4, o_SoundChannel_wav] - bl MidiKeyToFreq - str r0, [r4, o_SoundChannel_freq] -_081DDA52: - ldr r4, [r4, o_SoundChannel_np] - cmp r4, 0 - bne _081DD9E6 -_081DDA58: - ldrb r0, [r5, o_MusicPlayerTrack_flags] - movs r1, 0xF0 - ands r0, r1 - strb r0, [r5, o_MusicPlayerTrack_flags] - mov r2, r9 -_081DDA62: - subs r2, 0x1 - ble _081DDA6C - movs r0, 0x50 - adds r5, r0 - bgt _081DD9C8 -_081DDA6C: - ldr r0, lt2_ID_NUMBER - str r0, [r7, o_MusicPlayerInfo_ident] - pop {r0-r7} - mov r8, r0 - mov r9, r1 - mov r10, r2 - mov r11, r3 - pop {r3} - -call_r3: - bx r3 - - .align 2, 0 -lt_gClockTable: .word gClockTable -lt2_SOUND_INFO_PTR: .word SOUND_INFO_PTR -lt2_ID_NUMBER: .word ID_NUMBER - thumb_func_end MPlayMain - - thumb_func_start TrackStop -TrackStop: - push {r4-r6,lr} - adds r5, r1, 0 - ldrb r1, [r5, o_MusicPlayerTrack_flags] - movs r0, 0x80 - tst r0, r1 - beq TrackStop_Done - ldr r4, [r5, o_MusicPlayerTrack_chan] - cmp r4, 0 - beq TrackStop_3 - movs r6, 0 -TrackStop_Loop: - ldrb r0, [r4, o_SoundChannel_status] - cmp r0, 0 - beq TrackStop_2 - ldrb r0, [r4, o_SoundChannel_type] - movs r3, 0x7 - ands r0, r3 - beq TrackStop_1 - ldr r3, =SOUND_INFO_PTR - ldr r3, [r3] - ldr r3, [r3, o_SoundInfo_CgbOscOff] - bl call_r3 -TrackStop_1: - strb r6, [r4, o_SoundChannel_status] -TrackStop_2: - str r6, [r4, o_SoundChannel_track] - ldr r4, [r4, o_SoundChannel_np] - cmp r4, 0 - bne TrackStop_Loop -TrackStop_3: - str r4, [r5, o_MusicPlayerTrack_chan] -TrackStop_Done: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end TrackStop - - thumb_func_start ChnVolSetAsm -ChnVolSetAsm: - ldrb r1, [r4, 0x12] - movs r0, 0x14 - ldrsb r2, [r4, r0] - movs r3, 0x80 - adds r3, r2 - muls r3, r1 - ldrb r0, [r5, 0x10] - muls r0, r3 - asrs r0, 14 - cmp r0, 0xFF - bls _081DDAE8 - movs r0, 0xFF -_081DDAE8: - strb r0, [r4, 0x2] - movs r3, 0x7F - subs r3, r2 - muls r3, r1 - ldrb r0, [r5, 0x11] - muls r0, r3 - asrs r0, 14 - cmp r0, 0xFF - bls _081DDAFC - movs r0, 0xFF -_081DDAFC: - strb r0, [r4, 0x3] - bx lr - thumb_func_end ChnVolSetAsm - - thumb_func_start ply_note -ply_note: - push {r4-r7,lr} - mov r4, r8 - mov r5, r9 - mov r6, r10 - mov r7, r11 - push {r4-r7} - sub sp, 0x18 - str r1, [sp] - adds r5, r2, 0 - ldr r1, =SOUND_INFO_PTR - ldr r1, [r1] - str r1, [sp, 0x4] - ldr r1, =gClockTable - adds r0, r1 - ldrb r0, [r0] - strb r0, [r5, o_MusicPlayerTrack_gateTime] - ldr r3, [r5, o_MusicPlayerTrack_cmdPtr] - ldrb r0, [r3] - cmp r0, 0x80 - bhs _081DDB46 - strb r0, [r5, o_MusicPlayerTrack_key] - adds r3, 0x1 - ldrb r0, [r3] - cmp r0, 0x80 - bhs _081DDB44 - strb r0, [r5, o_MusicPlayerTrack_velocity] - adds r3, 0x1 - ldrb r0, [r3] - cmp r0, 0x80 - bhs _081DDB44 - ldrb r1, [r5, o_MusicPlayerTrack_gateTime] - adds r1, r0 - strb r1, [r5, o_MusicPlayerTrack_gateTime] - adds r3, 0x1 -_081DDB44: - str r3, [r5, o_MusicPlayerTrack_cmdPtr] -_081DDB46: - movs r0, 0 - str r0, [sp, 0x14] - adds r4, r5, 0 - adds r4, o_MusicPlayerTrack_ToneData_type - ldrb r2, [r4] - movs r0, TONEDATA_TYPE_RHY | TONEDATA_TYPE_SPL - tst r0, r2 - beq _081DDB98 - ldrb r3, [r5, o_MusicPlayerTrack_key] - movs r0, TONEDATA_TYPE_SPL - tst r0, r2 - beq _081DDB66 - ldr r1, [r5, o_MusicPlayerTrack_ToneData_keySplitTable] - adds r1, r3 - ldrb r0, [r1] - b _081DDB68 -_081DDB66: - adds r0, r3, 0 -_081DDB68: - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - ldr r0, [r5, o_MusicPlayerTrack_ToneData_wav] - adds r1, r0 - mov r9, r1 - mov r6, r9 - ldrb r1, [r6] - movs r0, 0xC0 - tst r0, r1 - beq _081DDB80 - b _081DDCEA -_081DDB80: - movs r0, 0x80 - tst r0, r2 - beq _081DDB9C - ldrb r1, [r6, 0x3] - movs r0, 0x80 - tst r0, r1 - beq _081DDB94 - subs r1, 0xC0 - lsls r1, 1 - str r1, [sp, 0x14] -_081DDB94: - ldrb r3, [r6, 0x1] - b _081DDB9C -_081DDB98: - mov r9, r4 - ldrb r3, [r5, 0x5] -_081DDB9C: - str r3, [sp, 0x8] - ldr r6, [sp] - ldrb r1, [r6, 0x9] - ldrb r0, [r5, 0x1D] - adds r0, r1 - cmp r0, 0xFF - bls _081DDBAC - movs r0, 0xFF -_081DDBAC: - str r0, [sp, 0x10] - mov r6, r9 - ldrb r0, [r6] - movs r6, 0x7 - ands r6, r0 - str r6, [sp, 0xC] - beq _081DDBEC - ldr r0, [sp, 0x4] - ldr r4, [r0, 0x1C] - cmp r4, 0 - bne _081DDBC4 - b _081DDCEA -_081DDBC4: - subs r6, 0x1 - lsls r0, r6, 6 - adds r4, r0 - ldrb r1, [r4] - movs r0, 0xC7 - tst r0, r1 - beq _081DDC40 - movs r0, 0x40 - tst r0, r1 - bne _081DDC40 - ldrb r1, [r4, 0x13] - ldr r0, [sp, 0x10] - cmp r1, r0 - bcc _081DDC40 - beq _081DDBE4 - b _081DDCEA -_081DDBE4: - ldr r0, [r4, 0x2C] - cmp r0, r5 - bcs _081DDC40 - b _081DDCEA -_081DDBEC: - ldr r6, [sp, 0x10] - adds r7, r5, 0 - movs r2, 0 - mov r8, r2 - ldr r4, [sp, 0x4] - ldrb r3, [r4, 0x6] - adds r4, 0x50 -_081DDBFA: - ldrb r1, [r4] - movs r0, 0xC7 - tst r0, r1 - beq _081DDC40 - movs r0, 0x40 - tst r0, r1 - beq _081DDC14 - cmp r2, 0 - bne _081DDC18 - adds r2, 0x1 - ldrb r6, [r4, 0x13] - ldr r7, [r4, 0x2C] - b _081DDC32 -_081DDC14: - cmp r2, 0 - bne _081DDC34 -_081DDC18: - ldrb r0, [r4, 0x13] - cmp r0, r6 - bcs _081DDC24 - adds r6, r0, 0 - ldr r7, [r4, 0x2C] - b _081DDC32 -_081DDC24: - bhi _081DDC34 - ldr r0, [r4, 0x2C] - cmp r0, r7 - bls _081DDC30 - adds r7, r0, 0 - b _081DDC32 -_081DDC30: - bcc _081DDC34 -_081DDC32: - mov r8, r4 -_081DDC34: - adds r4, 0x40 - subs r3, 0x1 - bgt _081DDBFA - mov r4, r8 - cmp r4, 0 - beq _081DDCEA -_081DDC40: - adds r0, r4, 0 - bl ClearChain - movs r1, 0 - str r1, [r4, 0x30] - ldr r3, [r5, 0x20] - str r3, [r4, 0x34] - cmp r3, 0 - beq _081DDC54 - str r4, [r3, 0x30] -_081DDC54: - str r4, [r5, 0x20] - str r5, [r4, 0x2C] - ldrb r0, [r5, 0x1B] - strb r0, [r5, 0x1C] - cmp r0, r1 - beq _081DDC66 - adds r1, r5, 0 - bl clear_modM -_081DDC66: - ldr r0, [sp] - adds r1, r5, 0 - bl TrkVolPitSet - ldr r0, [r5, 0x4] - str r0, [r4, 0x10] - ldr r0, [sp, 0x10] - strb r0, [r4, 0x13] - ldr r0, [sp, 0x8] - strb r0, [r4, 0x8] - ldr r0, [sp, 0x14] - strb r0, [r4, 0x14] - mov r6, r9 - ldrb r0, [r6] - strb r0, [r4, 0x1] - ldr r7, [r6, 0x4] - str r7, [r4, 0x24] - ldr r0, [r6, 0x8] - str r0, [r4, 0x4] - ldrh r0, [r5, 0x1E] - strh r0, [r4, 0xC] - bl ChnVolSetAsm - ldrb r1, [r4, 0x8] - movs r0, 0x8 - ldrsb r0, [r5, r0] - adds r3, r1, r0 - bpl _081DDCA0 - movs r3, 0 -_081DDCA0: - ldr r6, [sp, 0xC] - cmp r6, 0 - beq _081DDCCE - mov r6, r9 - ldrb r0, [r6, 0x2] - strb r0, [r4, 0x1E] - ldrb r1, [r6, 0x3] - movs r0, 0x80 - tst r0, r1 - bne _081DDCBA - movs r0, 0x70 - tst r0, r1 - bne _081DDCBC -_081DDCBA: - movs r1, 0x8 -_081DDCBC: - strb r1, [r4, 0x1F] - ldrb r2, [r5, 0x9] - adds r1, r3, 0 - ldr r0, [sp, 0xC] - ldr r3, [sp, 0x4] - ldr r3, [r3, 0x30] - bl call_r3 - b _081DDCDC -_081DDCCE: - ldr r0, [r5, o_MusicPlayerTrack_unk_3C] - str r0, [r4, 0x18] - ldrb r2, [r5, 0x9] - adds r1, r3, 0 - adds r0, r7, 0 - bl MidiKeyToFreq -_081DDCDC: - str r0, [r4, 0x20] - movs r0, 0x80 - strb r0, [r4] - ldrb r1, [r5] - movs r0, 0xF0 - ands r0, r1 - strb r0, [r5] -_081DDCEA: - add sp, 0x18 - pop {r0-r7} - mov r8, r0 - mov r9, r1 - mov r10, r2 - mov r11, r3 - pop {r0} - bx r0 - .pool - thumb_func_end ply_note - - thumb_func_start ply_endtie -ply_endtie: - push {r4,r5} - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] - ldrb r3, [r2] - cmp r3, 0x80 - bhs _081DDD16 - strb r3, [r1, o_MusicPlayerTrack_key] - adds r2, 0x1 - str r2, [r1, o_MusicPlayerTrack_cmdPtr] - b _081DDD18 -_081DDD16: - ldrb r3, [r1, o_MusicPlayerTrack_key] -_081DDD18: - ldr r1, [r1, o_MusicPlayerTrack_chan] - cmp r1, 0 - beq _081DDD40 - movs r4, 0x83 - movs r5, 0x40 -_081DDD22: - ldrb r2, [r1, o_SoundChannel_status] - tst r2, r4 - beq _081DDD3A - tst r2, r5 - bne _081DDD3A - ldrb r0, [r1, o_SoundChannel_mk] - cmp r0, r3 - bne _081DDD3A - movs r0, 0x40 - orrs r2, r0 - strb r2, [r1, o_SoundChannel_status] - b _081DDD40 -_081DDD3A: - ldr r1, [r1, o_SoundChannel_np] - cmp r1, 0 - bne _081DDD22 -_081DDD40: - pop {r4,r5} - bx lr - thumb_func_end ply_endtie - - thumb_func_start clear_modM -clear_modM: - movs r2, 0 - strb r2, [r1, o_MusicPlayerTrack_modM] - strb r2, [r1, o_MusicPlayerTrack_lfoSpeedC] - ldrb r2, [r1, o_MusicPlayerTrack_modT] - cmp r2, 0 - bne _081DDD54 - movs r2, 0xC - b _081DDD56 -_081DDD54: - movs r2, 0x3 -_081DDD56: - ldrb r3, [r1, o_MusicPlayerTrack_flags] - orrs r3, r2 - strb r3, [r1, o_MusicPlayerTrack_flags] - bx lr - thumb_func_end clear_modM - - thumb_func_start ld_r3_tp_adr_i -ld_r3_tp_adr_i_unchecked: - ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] - adds r3, r2, 1 - str r3, [r1, o_MusicPlayerTrack_cmdPtr] - ldrb r3, [r2] - bx lr - thumb_func_end ld_r3_tp_adr_i - - thumb_func_start ply_lfos -ply_lfos: - mov r12, lr - bl ld_r3_tp_adr_i_unchecked - strb r3, [r1, o_MusicPlayerTrack_lfoSpeed] - cmp r3, 0 - bne _081DDD7C - bl clear_modM -_081DDD7C: - bx r12 - thumb_func_end ply_lfos - - thumb_func_start ply_mod -ply_mod: - mov r12, lr - bl ld_r3_tp_adr_i_unchecked - strb r3, [r1, o_MusicPlayerTrack_mod] - cmp r3, 0 - bne _081DDD90 - bl clear_modM -_081DDD90: - bx r12 - thumb_func_end ply_mod - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/m4a_3.s b/asm/m4a_3.s index a842ae925..82b6a2467 100644 --- a/asm/m4a_3.s +++ b/asm/m4a_3.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/gba_constants.inc" .include "constants/m4a_constants.inc" diff --git a/asm/macros.inc b/asm/macros.inc deleted file mode 100644 index 6d8657892..000000000 --- a/asm/macros.inc +++ /dev/null @@ -1,149 +0,0 @@ - .include "asm/macros/asm.inc" - .include "asm/macros/function.inc" - .include "asm/macros/movement.inc" - .include "asm/macros/pokemon_data.inc" - .include "asm/macros/ec.inc" - .include "asm/macros/map.inc" - - .macro region_map_location x, y, width, height, name - .byte \x - .byte \y - .byte \width - .byte \height - .4byte gMapName_\name - .endm - - .macro obj_tiles address, uncompressed_size, tag - .4byte \address - .2byte \uncompressed_size - .2byte \tag - .endm - - .macro null_obj_tiles - obj_tiles 0, 0, 0 - .endm - - .macro obj_pal address, tag - .4byte \address - .2byte \tag - .2byte 0 @ padding - .endm - - .macro null_obj_pal - obj_pal 0, 0 - .endm - - .macro paired_pals tag, address - .2byte \tag - .2byte 0 @ padding - .4byte \address - .endm - -@ For object animation frames. - .macro obj_frame_tiles address, uncompressed_size - .4byte \address - .2byte \uncompressed_size - .2byte 0 @ padding - .endm - - .macro spr_template tile_tag, pal_tag, oam, anims, images, affine_anims, callback - .2byte \tile_tag - .2byte \pal_tag - .4byte \oam - .4byte \anims - .4byte \images - .4byte \affine_anims - .4byte \callback - .endm - -@ Berry trees have a table defining the palette slot used for each of their 5 -@ stages. However, the first 2 stages always use the same slots regardless of -@ the type of tree and the slots of the last 3 stages always equal each other. - .macro berry_tree_palette_slot_table slot - .byte 3, 4, \slot, \slot, \slot - .endm - - .macro subsprite x, y, priority, tile_num_offset, size - .2byte \x - .2byte \y - .2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size - .2byte 0 @ padding - .endm - - .macro obj_image_anim_frame pic_id, duration, flags = 0 - .2byte \pic_id - .byte (\flags) | (\duration) - .byte 0 @ padding - .endm - - .macro obj_image_anim_loop count - .2byte 0xfffd - .byte \count - .byte 0 @ padding - .endm - - .macro obj_image_anim_jump target_index - .2byte 0xfffe - .byte \target_index - .byte 0 @ padding - .endm - - .macro obj_image_anim_end - .2byte 0xffff - .2byte 0 @ padding - .endm - - .macro obj_rot_scal_anim_frame delta_x_scale, delta_y_scale, delta_angle, duration - .2byte \delta_x_scale - .2byte \delta_y_scale - .byte \delta_angle - .byte \duration - .2byte 0 @ padding - .endm - - .macro obj_rot_scal_anim_loop count - .2byte 0x7ffd - .2byte \count - .4byte 0 @ padding - .endm - - .macro obj_rot_scal_anim_jump target_index - .2byte 0x7ffe - .2byte \target_index - .4byte 0 @ padding - .endm - - .macro obj_rot_scal_anim_end unknown=0 - .2byte 0x7fff - .2byte \unknown - .fill 4 @ padding - .endm - - .macro credits_entry number, text - .4byte \number - .4byte \text - .endm - - .macro door_anim_frame unknown, offset - .byte \unknown - .byte 0 @ padding - .2byte \offset - .endm - - .macro door_anim_gfx metatile_num, unknown, tile_addr, palette_addr - .2byte \metatile_num - .2byte \unknown - .4byte \tile_addr - .4byte \palette_addr - .endm - - .macro trainer_eye_trainer opp_1, opp_2, opp_3, opp_4, opp_5, map_name - .2byte OPPONENT_\opp_1 - .2byte OPPONENT_\opp_2 - .2byte OPPONENT_\opp_3 - .2byte OPPONENT_\opp_4 - .2byte OPPONENT_\opp_5 - .2byte GROUP_\map_name - .2byte MAP_\map_name - .space 2 - .endm diff --git a/asm/macros/asm.inc b/asm/macros/asm.inc deleted file mode 100644 index 26b2707ca..000000000 --- a/asm/macros/asm.inc +++ /dev/null @@ -1,17 +0,0 @@ - .ifndef GUARD_ASM_MACROS_ASM_INC - .set GUARD_ASM_MACROS_ASM_INC, 1 - - .macro inc x - .set \x, \x + 1 - .endm - - .macro enum_start x=0 - .set __enum__, \x - .endm - - .macro enum constant - .equiv \constant, __enum__ - inc __enum__ - .endm - - .endif @ GUARD_ASM_MACROS_ASM_INC diff --git a/asm/macros/battle_ai_script.inc b/asm/macros/battle_ai_script.inc deleted file mode 100644 index 679e30340..000000000 --- a/asm/macros/battle_ai_script.inc +++ /dev/null @@ -1,554 +0,0 @@ - .macro if_random_less_than percent, address - .byte 0x00 - .byte \percent - .4byte \address - .endm - - @ unused - .macro if_random_greater_than percent, address - .byte 0x01 - .byte \percent - .4byte \address - .endm - - @ unused - .macro if_random_equal address - .byte 0x02 - .4byte \address - .endm - - @ unused - .macro if_random_not_equal address - .byte 0x03 - .4byte \address - .endm - - .macro score score - .byte 0x04 - .byte \score - .endm - - .macro if_hp_less_than target, percent, address - .byte 0x05 - .byte \target - .byte \percent - .4byte \address - .endm - - .macro if_hp_more_than target, percent, address - .byte 0x06 - .byte \target - .byte \percent - .4byte \address - .endm - - .macro if_hp_equal target, percent, address - .byte 0x07 - .byte \target - .byte \percent - .4byte \address - .endm - - .macro if_hp_not_equal target, percent, address - .byte 0x08 - .byte \target - .byte \percent - .4byte \address - .endm - - .macro if_status target, status, address - .byte 0x09 - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_not_status target, status, address - .byte 0x0a - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_status2 target, status, address - .byte 0x0b - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_not_status2 target, status, address - .byte 0x0c - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_status3 target, status, address - .byte 0x0d - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_not_status3 target, status, address - .byte 0x0e - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_status4 target, status, address - .byte 0x0f - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_not_status4 target, status, address - .byte 0x10 - .byte \target - .4byte \status - .4byte \address - .endm - - .macro if_less_than value, address - .byte 0x11 - .byte \value - .4byte \address - .endm - - .macro if_more_than value, address - .byte 0x12 - .byte \value - .4byte \address - .endm - - .macro if_equal value, address - .byte 0x13 - .byte \value - .4byte \address - .endm - - .macro if_not_equal value, address - .byte 0x14 - .byte \value - .4byte \address - .endm - - .macro if_less_than_32 value, address - .byte 0x15 - .4byte \value - .4byte \address - .endm - - .macro if_more_than_32 value, address - .byte 0x16 - .4byte \value - .4byte \address - .endm - - .macro if_equal_32 value, address - .byte 0x17 - .4byte \value - .4byte \address - .endm - - .macro if_not_equal_32 value, address - .byte 0x18 - .4byte \value - .4byte \address - .endm - - .macro if_move move, address - .byte 0x19 - .2byte \move - .4byte \address - .endm - - .macro if_not_move move, address - .byte 0x1a - .2byte \move - .4byte \address - .endm - - .macro if_in_bytes list, address - .byte 0x1b - .4byte \list - .4byte \address - .endm - - .macro if_not_in_bytes list, address - .byte 0x1c - .4byte \list - .4byte \address - .endm - - .macro if_in_words list, address - .byte 0x1d - .4byte \list - .4byte \address - .endm - - .macro if_not_in_words list, address - .byte 0x1e - .4byte \list - .4byte \address - .endm - - .macro if_user_can_damage address - .byte 0x1f - .4byte \address - .endm - - .macro if_user_cant_damage address - .byte 0x20 - .4byte \address - .endm - - .macro get_turn_count - .byte 0x21 - .endm - - .macro get_type byte - .byte 0x22 - .byte \byte - .endm - - @ unused - .macro get_move_power - .byte 0x23 - .endm - - .macro is_most_powerful_move - .byte 0x24 - .endm - - .macro get_move target - .byte 0x25 - .byte \target - .endm - - .macro if_arg_equal type, address - .byte 0x26 - .byte \type - .4byte \address - .endm - - @ unused - .macro if_arg_not_equal type, address - .byte 0x27 - .byte \type - .4byte \address - .endm - - .macro if_would_go_first target, address - .byte 0x28 - .byte \target - .4byte \address - .endm - - .macro if_would_not_go_first target, address - .byte 0x29 - .byte \target - .4byte \address - .endm - - @ nullsub - .macro ai_2a - .byte 0x2a - .endm - - @ nullsub - .macro ai_2b - .byte 0x2b - .endm - - .macro count_alive_pokemon target - .byte 0x2c - .byte \target - .endm - - @ unused - .macro get_considered_move - .byte 0x2d - .endm - - .macro get_effect - .byte 0x2e - .endm - - .macro get_ability target - .byte 0x2f - .byte \target - .endm - - @ unused - .macro get_highest_possible_damage - .byte 0x30 - .endm - - .macro if_damage_bonus value, address - .byte 0x31 - .byte \value - .4byte \address - .endm - - @ nullsub - .macro ai_32 - .byte 0x32 - .endm - - @ nullsub - .macro ai_33 - .byte 0x33 - .endm - - .macro if_status_in_party target, status, address - .byte 0x34 - .byte \target - .4byte \status - .4byte \address - .endm - - @ bugged - .macro if_status_not_in_party target, status, address - .byte 0x35 - .byte \target - .4byte \status - .4byte \address - .endm - - .macro get_weather - .byte 0x36 - .endm - - .macro if_effect byte, address - .byte 0x37 - .byte \byte - .4byte \address - .endm - - .macro if_not_effect byte, address - .byte 0x38 - .byte \byte - .4byte \address - .endm - - .macro if_stat_level_less_than target, stat, level, address - .byte 0x39 - .byte \target - .byte \stat - .byte \level - .4byte \address - .endm - - .macro if_stat_level_more_than target, stat, level, address - .byte 0x3a - .byte \target - .byte \stat - .byte \level - .4byte \address - .endm - - .macro if_stat_level_equal target, stat, level, address - .byte 0x3b - .byte \target - .byte \stat - .byte \level - .4byte \address - .endm - - .macro if_stat_level_not_equal target, stat, level, address - .byte 0x3c - .byte \target - .byte \stat - .byte \level - .4byte \address - .endm - - .macro if_can_faint address - .byte 0x3d - .4byte \address - .endm - - .macro if_cant_faint address - .byte 0x3e - .4byte \address - .endm - - @ unused - .macro if_has_move, target, move, address - .byte 0x3f - .byte \target - .2byte \move - .4byte \address - .endm - - @ unused - .macro if_dont_have_move, target, move, address - .byte 0x40 - .byte \target - .2byte \move - .4byte \address - .endm - - .macro if_move_effect target, effect, address - .byte 0x41 - .byte \target - .byte \effect - .4byte \address - .endm - - .macro if_not_move_effect target, effect, address - .byte 0x42 - .byte \target - .byte \effect - .4byte \address - .endm - - .macro if_last_move_did_damage target, byte, address - .byte 0x43 - .byte \target - .byte \byte - .4byte \address - .endm - - .macro if_encored target, address - .byte 0x44 - .byte \target - .4byte \address - .endm - - .macro flee - .byte 0x45 - .endm - - .macro if_random_100 address - .byte 0x46 - .4byte \address - .endm - - .macro watch - .byte 0x47 - .endm - - .macro get_hold_effect target - .byte 0x48 - .byte \target - .endm - - .macro get_gender target - .byte 0x49 - .byte \target - .endm - - .macro is_first_turn target - .byte 0x4a - .byte \target - .endm - - .macro get_stockpile_count target - .byte 0x4b - .byte \target - .endm - - .macro is_double_battle - .byte 0x4c - .endm - - .macro get_item target - .byte 0x4d - .byte \target - .endm - - .macro get_move_type_from_result - .byte 0x4e - .endm - - .macro get_move_power_from_result - .byte 0x4f - .endm - - .macro get_move_effect_from_result - .byte 0x50 - .endm - - .macro get_protect_count target - .byte 0x51 - .byte \target - .endm - - @ nullsub - .macro ai_52 - .byte 0x52 - .endm - - @ nullsub - .macro ai_53 - .byte 0x53 - .endm - - @ nullsub - .macro ai_54 - .byte 0x54 - .endm - - @ nullsub - .macro ai_55 - .byte 0x55 - .endm - - @ nullsub - .macro ai_56 - .byte 0x56 - .endm - - @ nullsub - .macro ai_57 - .byte 0x57 - .endm - - @ unused - .macro call address - .byte 0x58 - .4byte \address - .endm - - .macro jump address - .byte 0x59 - .4byte \address - .endm - - .macro end - .byte 0x5a - .endm - - .macro if_level_cond cond, address - .byte 0x5b - .byte \cond - .4byte \address - .endm - - .macro if_user_higher_level address - if_level_cond 0, \address - .endm - - .macro if_target_higher_level address - if_level_cond 1, \address - .endm - - .macro if_equal_levels address - if_level_cond 2, \address - .endm - - @ unused - .macro if_taunted address - .byte 0x5c - .4byte \address - .endm - - .macro if_not_taunted address - .byte 0x5d - .4byte \address - .endm diff --git a/asm/macros/battle_anim.inc b/asm/macros/battle_anim.inc deleted file mode 100644 index 4ff845032..000000000 --- a/asm/macros/battle_anim.inc +++ /dev/null @@ -1,266 +0,0 @@ - .macro loadsprite id - .byte 0x00 - .2byte \id - .endm - - .macro unloadsprite id - .byte 0x01 - .2byte \id - .endm - - .macro sprite template, priority, argv:vararg - .byte 0x02 - .4byte \template - .byte \priority - .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 -.Lsprite_\@_1: - .2byte \argv -.Lsprite_\@_2: - .endm - - .macro createtask addr, priority, argv:vararg - .byte 0x03 - .4byte \addr - .byte \priority - .byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2 -.Lcreatetask_\@_1: - .2byte \argv -.Lcreatetask_\@_2: - .endm - - .macro pause delay - .byte 0x04 - .byte \delay - .endm - - .macro wait - .byte 0x05 - .endm - - .macro hang1 - .byte 0x06 - .endm - - .macro hang2 - .byte 0x07 - .endm - - .macro end - .byte 0x08 - .endm - - .macro playse id - .byte 0x09 - .2byte \id - .endm - - .macro monbg which - .byte 0x0A - .byte \which - .endm - - .macro clearmonbg which - .byte 0x0B - .byte \which - .endm - - .macro setalpha eva, evb - .byte 0x0C - .2byte ((\evb) << 8) | (\eva) - .endm - - .macro blendoff - .byte 0x0D - .endm - - .macro call addr - .byte 0x0E - .4byte \addr - .endm - - .macro ret - .byte 0x0F - .endm - - .macro setvar var_num, value - .byte 0x10 - .byte \var_num - .2byte \value - .endm - - .macro ifelse addr1, addr2 - .byte 0x11 - .4byte \addr1 - .4byte \addr2 - .endm - - .macro jumpif cond, addr - .byte 0x12 - .byte \cond - .4byte \addr - .endm - - .macro jump addr - .byte 0x13 - .4byte \addr - .endm - - .macro fadetobg id - .byte 0x14 - .byte \id - .endm - - .macro restorebg - .byte 0x15 - .endm - - .macro waitbgfadeout - .byte 0x16 - .endm - - .macro waitbgfadein - .byte 0x17 - .endm - - .macro changebg id - .byte 0x18 - .byte \id - .endm - - .macro panse_19 id, pan - .byte 0x19 - .2byte \id - .byte \pan - .endm - - .macro setpan pan - .byte 0x1A - .byte \pan - .endm - - .macro panse_1B id, pan_start, pan_end, step, delay - .byte 0x1B - .2byte \id - .byte \pan_start - .byte \pan_end - .byte \step - .byte \delay - .endm - - .macro panse_1C id, pan, delay, count - .byte 0x1C - .2byte \id - .byte \pan - .byte \delay - .byte \count - .endm - - .macro panse_1D id, pan, count - .byte 0x1D - .2byte \id - .byte \pan - .byte \count - .endm - - .macro setbldcnt bldcnt - .byte 0x1E - .2byte \bldcnt - .endm - - .macro createtask_1F addr, argv:vararg - .byte 0x1F - .4byte \addr - .byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2 -.Lcreatetask_1F_\@_1: - .2byte \argv -.Lcreatetask_1F_\@_2: - .endm - - .macro waitsound - .byte 0x20 - .endm - - .macro jumpvareq var_num, value, addr - .byte 0x21 - .byte \var_num - .2byte \value - .4byte \addr - .endm - - .macro monbg_22 unk - .byte 0x22 - .byte \unk - .endm - - .macro clearmonbg_23 unk - .byte 0x23 - .byte \unk - .endm - - .macro jumpunkcond addr - .byte 0x24 - .4byte \addr - .endm - - .macro fadetobg_25 a, b, c - .byte 0x25 - .byte \a - .byte \b - .byte \c - .endm - - .macro panse_26 id, pan_start, pan_end, step, delay - .byte 0x26 - .2byte \id - .byte \pan_start - .byte \pan_end - .byte \step - .byte \delay - .endm - - .macro panse_27 id, pan_start, pan_end, step, delay - .byte 0x27 - .2byte \id - .byte \pan_start - .byte \pan_end - .byte \step - .byte \delay - .endm - - .macro monbgprio_28 unk - .byte 0x28 - .byte \unk - .endm - - .macro monbgprio_29 - .byte 0x29 - .endm - - .macro monbgprio_2A unk - .byte 0x2A - .byte \unk - .endm - - .macro invisible side - .byte 0x2B - .byte \side - .endm - - .macro visible side - .byte 0x2C - .byte \side - .endm - - .macro doublebattle_2D unk - .byte 0x2D - .byte \unk - .endm - - .macro doublebattle_2E unk - .byte 0x2E - .byte \unk - .endm - - .macro stopsound - .byte 0x2F - .endm diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc deleted file mode 100644 index e4fa0c454..000000000 --- a/asm/macros/battle_script.inc +++ /dev/null @@ -1,1414 +0,0 @@ -@ 0 == -@ 1 != -@ 2 < -@ 3 > -@ 4 &= - - .macro calculatedamage - critical - atk5 - atk6 - atk7 - .endm - - - .macro attackcanceler - .byte 0x00 - .endm - - .macro accuracycheck address, param1 - .byte 0x01 - .4byte \address - .2byte \param1 - .endm - - .macro attackstring - .byte 0x02 - .endm - - .macro ppreduce - .byte 0x03 - .endm - - .macro critcalc - .byte 0x04 - .endm - - .macro damagecalc - .byte 0x05 - .endm - - .macro typecalc - .byte 0x06 - .endm - - .macro adjustnormaldamage - .byte 0x07 - .endm - - .macro adjustnormaldamage2 - .byte 0x08 - .endm - - .macro attackanimation - .byte 0x09 - .endm - - .macro waitanimation - .byte 0x0a - .endm - - .macro healthbarupdate bank - .byte 0x0b - .byte \bank - .endm - - .macro datahpupdate bank - .byte 0x0c - .byte \bank - .endm - - .macro critmessage - .byte 0x0d - .endm - - .macro effectivenesssound - .byte 0x0e - .endm - - .macro resultmessage - .byte 0x0f - .endm - - .macro printstring string - .byte 0x10 - .2byte \string - .endm - - .macro printselectionstring string - .byte 0x11 - .2byte \string - .endm - - .macro waitmessage delay - .byte 0x12 - .2byte \delay - .endm - - .macro printfromtable table - .byte 0x13 - .4byte \table - .endm - - .macro printselectionstringfromtable table - .byte 0x14 - .4byte \table - .endm - - .macro seteffectwithchance - .byte 0x15 - .endm - - .macro seteffectprimary - .byte 0x16 - .endm - - .macro seteffectsecondary - .byte 0x17 - .endm - - .macro clearstatusfromeffect bank - .byte 0x18 - .byte \bank - .endm - - .macro tryfaintmon bank, param2, param3 - .byte 0x19 - .byte \bank - .byte \param2 - .4byte \param3 - .endm - - .macro dofaintanimation param1 - .byte 0x1a - .byte \param1 - .endm - - .macro cleareffectsonfaint bank - .byte 0x1b - .byte \bank - .endm - - .macro jumpifstatus bank, status, address - .byte 0x1c - .byte \bank - .4byte \status - .4byte \address - .endm - - .macro jumpifstatus2 bank, status, address - .byte 0x1d - .byte \bank - .4byte \status - .4byte \address - .endm - - .macro jumpifability bank, ability, address - .byte 0x1e - .byte \bank - .byte \ability - .4byte \address - .endm - - .macro jumpifsideaffecting bank, status, address - .byte 0x1f - .byte \bank - .2byte \status - .4byte \address - .endm - - .macro jumpifstat bank, flag, quantity, statid, address - .byte 0x20 - .byte \bank - .byte \flag - .byte \quantity - .byte \statid - .4byte \address - .endm - - .macro jumpifstatus3condition bank, mask, status, address - .byte 0x21 - .byte \bank - .4byte \mask - .byte \status - .4byte \address - .endm - - .macro jumpiftype bank, type, address - .byte 0x22 - .byte \bank - .byte \type - .4byte \address - .endm - - .macro getexp bank - .byte 0x23 - .byte \bank - .endm - - .macro atk24 address - .byte 0x24 - .4byte \address - .endm - - .macro movevaluescleanup - .byte 0x25 - .endm - - .macro setmultihit param1 - .byte 0x26 - .byte \param1 - .endm - - .macro decrementmultihit address - .byte 0x27 - .4byte \address - .endm - - .macro goto address - .byte 0x28 - .4byte \address - .endm - - .macro jumpifbyte ifflag, checkaddr, compare, address - .byte 0x29 - .byte \ifflag - .4byte \checkaddr - .byte \compare - .4byte \address - .endm - - .macro jumpifhalfword ifflag, checkaddr, compare, address - .byte 0x2a - .byte \ifflag - .4byte \checkaddr - .2byte \compare - .4byte \address - .endm - - .macro jumpifword ifflag, checkaddr, compare, address - .byte 0x2b - .byte \ifflag - .4byte \checkaddr - .4byte \compare - .4byte \address - .endm - - .macro jumpifarrayequal mem1, mem2, size, address - .byte 0x2c - .4byte \mem1 - .4byte \mem2 - .byte \size - .4byte \address - .endm - - .macro jumpifarraynotequal mem1, mem2, size, address - .byte 0x2d - .4byte \mem1 - .4byte \mem2 - .byte \size - .4byte \address - .endm - - .macro setbyte pointer, value - .byte 0x2e - .4byte \pointer - .byte \value - .endm - - .macro addbyte pointer, value - .byte 0x2f - .4byte \pointer - .byte \value - .endm - - .macro subbyte pointer, value - .byte 0x30 - .4byte \pointer - .byte \value - .endm - - .macro copyarray destination, source, size - .byte 0x31 - .4byte \destination - .4byte \source - .byte \size - .endm - - .macro copyarraywithindex param1, param2, param3, byte - .byte 0x32 - .4byte \param1 - .4byte \param2 - .4byte \param3 - .byte \byte - .endm - - .macro orbyte pointer, value - .byte 0x33 - .4byte \pointer - .byte \value - .endm - - .macro orhalfword pointer, value - .byte 0x34 - .4byte \pointer - .2byte \value - .endm - - .macro orword pointer, value - .byte 0x35 - .4byte \pointer - .4byte \value - .endm - - .macro bicbyte pointer, value - .byte 0x36 - .4byte \pointer - .byte \value - .endm - - .macro bichalfword pointer, value - .byte 0x37 - .4byte \pointer - .2byte \value - .endm - - .macro bicword pointer, value - .byte 0x38 - .4byte \pointer - .4byte \value - .endm - - .macro pause pause_duration - .byte 0x39 - .2byte \pause_duration - .endm - - .macro waitstate - .byte 0x3a - .endm - - .macro healthbar_update bank - .byte 0x3b - .byte \bank - .endm - - .macro return - .byte 0x3c - .endm - - .macro end - .byte 0x3d - .endm - - .macro end2 - .byte 0x3e - .endm - - .macro end3 - .byte 0x3f - .endm - - .macro jumpifaffectedbyprotect address - .byte 0x40 - .4byte \address - .endm - - .macro call address - .byte 0x41 - .4byte \address - .endm - - .macro jumpiftype2 bank, type, address - .byte 0x42 - .byte \bank - .byte \type - .4byte \address - .endm - - .macro jumpifabilitypresent ability, address - .byte 0x43 - .byte \ability - .4byte \address - .endm - - .macro endselectionscript - .byte 0x44 - .endm - - .macro playanimation bank, animation, var_address - .byte 0x45 - .byte \bank - .byte \animation - .4byte \var_address - .endm - - .macro playanimation2 bank, address, int - .byte 0x46 - .byte \bank - .4byte \address - .4byte \int - .endm - - .macro setgraphicalstatchangevalues - .byte 0x47 - .endm - - .macro playstatchangeanimation bank, color, byte - .byte 0x48 - .byte \bank - .byte \color - .byte \byte - .endm - - .macro moveend byte1, byte2 - .byte 0x49 - .byte \byte1 - .byte \byte2 - .endm - - .macro typecalc2 - .byte 0x4a - .endm - - .macro returnatktoball - .byte 0x4b - .endm - - .macro getswitchedmondata bank - .byte 0x4c - .byte \bank - .endm - - .macro switchindataupdate bank - .byte 0x4d - .byte \bank - .endm - - .macro switchinanim bank, byte - .byte 0x4e - .byte \bank - .byte \byte - .endm - - .macro jumpifcantswitch bank, address - .byte 0x4f - .byte \bank - .4byte \address - .endm - - .macro openpartyscreen bank, address - .byte 0x50 - .byte \bank - .4byte \address - .endm - - .macro switchhandleorder bank, param2 - .byte 0x51 - .byte \bank - .byte \param2 - .endm - - .macro switchineffects bank - .byte 0x52 - .byte \bank - .endm - - .macro trainerslidein bank - .byte 0x53 - .byte \bank - .endm - - .macro playse word - .byte 0x54 - .2byte \word - .endm - - .macro fanfare int - .byte 0x55 - .2byte \int - .endm - - .macro playfaintcry bank_or_side - .byte 0x56 - .byte \bank_or_side - .endm - - .macro atk57 - .byte 0x57 - .endm - - .macro returntoball bank - .byte 0x58 - .byte \bank - .endm - - .macro handlelearnnewmove param1, param2, bank_maybe - .byte 0x59 - .4byte \param1 - .4byte \param2 - .byte \bank_maybe - .endm - - .macro yesnoboxlearnmove address - .byte 0x5a - .4byte \address - .endm - - .macro yesnoboxstoplearningmove address - .byte 0x5b - .4byte \address - .endm - - .macro hitanimation bank - .byte 0x5c - .byte \bank - .endm - - .macro getmoneyreward - .byte 0x5d - .endm - - .macro atk5e bank - .byte 0x5e - .byte \bank - .endm - - .macro atk5f - .byte 0x5f - .endm - - .macro incrementgamestat byte - .byte 0x60 - .byte \byte - .endm - - .macro drawpartystatussummary bank_or_side - .byte 0x61 - .byte \bank_or_side - .endm - - .macro atk62 bank_or_side - .byte 0x62 - .byte \bank_or_side - .endm - - .macro jumptorandomattack bank - .byte 0x63 - .byte \bank - .endm - - .macro statusanimation bank - .byte 0x64 - .byte \bank - .endm - - .macro status2animation bank_or_side, address - .byte 0x65 - .byte \bank_or_side - .4byte \address - .endm - - .macro chosenstatusanimation bank_or_side, bank_or_side2, address - .byte 0x66 - .byte \bank_or_side - .byte \bank_or_side2 - .4byte \address - .endm - - .macro yesnobox - .byte 0x67 - .endm - - .macro cancelallactions - .byte 0x68 - .endm - - .macro adjustsetdamage - .byte 0x69 - .endm - - .macro removeitem bank - .byte 0x6a - .byte \bank - .endm - - .macro atknameinbuff1 - .byte 0x6b - .endm - - .macro drawlvlupbox - .byte 0x6c - .endm - - .macro resetsentmonsvalue - .byte 0x6d - .endm - - .macro setatktoplayer0 - .byte 0x6e - .endm - - .macro makevisible bank - .byte 0x6f - .byte \bank - .endm - - .macro recordlastability bank - .byte 0x70 - .byte \bank - .endm - - .macro buffermovetolearn - .byte 0x71 - .endm - - .macro jumpifplayerran address - .byte 0x72 - .4byte \address - .endm - - .macro hpthresholds bank - .byte 0x73 - .byte \bank - .endm - - .macro hpthresholds2 bank - .byte 0x74 - .byte \bank - .endm - - .macro useitemonopponent - .byte 0x75 - .endm - - .macro various bank, byte - .byte 0x76 - .byte \bank - .byte \byte - .endm - - .macro setprotectlike - .byte 0x77 - .endm - - .macro faintifabilitynotdamp - .byte 0x78 - .endm - - .macro setatkhptozero - .byte 0x79 - .endm - - .macro jumpifnexttargetvalid address - .byte 0x7a - .4byte \address - .endm - - .macro tryhealhalfhealth address, byte - .byte 0x7b - .4byte \address - .byte \byte - .endm - - .macro trymirrormove - .byte 0x7c - .endm - - .macro setrain - .byte 0x7d - .endm - - .macro setreflect - .byte 0x7e - .endm - - .macro setseeded - .byte 0x7f - .endm - - .macro manipulatedamage id - .byte 0x80 - .byte \id - .endm - - .macro trysetrest address - .byte 0x81 - .4byte \address - .endm - - .macro jumpifnotfirstturn address - .byte 0x82 - .4byte \address - .endm - - .macro nop - .byte 0x83 - .endm - - .macro jumpifcantmakeasleep address - .byte 0x84 - .4byte \address - .endm - - .macro stockpile - .byte 0x85 - .endm - - .macro stockpiletobasedamage address - .byte 0x86 - .4byte \address - .endm - - .macro stockpiletohpheal address - .byte 0x87 - .4byte \address - .endm - - .macro negativedamage - .byte 0x88 - .endm - - .macro statbuffchange target, address - .byte 0x89 - .byte \target - .4byte \address - .endm - - .macro normalisebuffs - .byte 0x8a - .endm - - .macro setbide - .byte 0x8b - .endm - - .macro confuseifrepeatingattackends - .byte 0x8c - .endm - - .macro setmultihitcounter count - .byte 0x8d - .byte \count - .endm - - .macro initmultihitstring - .byte 0x8e - .endm - - .macro forcerandomswitch address - .byte 0x8f - .4byte \address - .endm - - .macro tryconversiontypechange address - .byte 0x90 - .4byte \address - .endm - - .macro givepaydaymoney - .byte 0x91 - .endm - - .macro setlightscreen - .byte 0x92 - .endm - - .macro tryKO address - .byte 0x93 - .4byte \address - .endm - - .macro damagetohalftargethp - .byte 0x94 - .endm - - .macro setsandstorm - .byte 0x95 - .endm - - .macro weatherdamage - .byte 0x96 - .endm - - .macro tryinfatuating address - .byte 0x97 - .4byte \address - .endm - - .macro updatestatusicon byte - .byte 0x98 - .byte \byte - .endm - - .macro setmist - .byte 0x99 - .endm - - .macro setfocusenergy - .byte 0x9a - .endm - - .macro transformdataexecution - .byte 0x9b - .endm - - .macro setsubstitute - .byte 0x9c - .endm - - .macro mimicattackcopy address - .byte 0x9d - .4byte \address - .endm - - .macro metronome - .byte 0x9e - .endm - - .macro dmgtolevel - .byte 0x9f - .endm - - .macro psywavedamageeffect - .byte 0xa0 - .endm - - .macro counterdamagecalculator address - .byte 0xa1 - .4byte \address - .endm - - .macro mirrorcoatdamagecalculator address - .byte 0xa2 - .4byte \address - .endm - - .macro disablelastusedattack address - .byte 0xa3 - .4byte \address - .endm - - .macro trysetencore address - .byte 0xa4 - .4byte \address - .endm - - .macro painsplitdmgcalc address - .byte 0xa5 - .4byte \address - .endm - - .macro settypetorandomresistance address - .byte 0xa6 - .4byte \address - .endm - - .macro setalwayshitflag - .byte 0xa7 - .endm - - .macro copymovepermanently address - .byte 0xa8 - .4byte \address - .endm - - .macro trychoosesleeptalkmove address - .byte 0xa9 - .4byte \address - .endm - - .macro setdestinybond - .byte 0xaa - .endm - - .macro trysetdestinybondtohappen - .byte 0xab - .endm - - .macro remaininghptopower - .byte 0xac - .endm - - .macro tryspiteppreduce address - .byte 0xad - .4byte \address - .endm - - .macro healpartystatus - .byte 0xae - .endm - - .macro cursetarget address - .byte 0xaf - .4byte \address - .endm - - .macro trysetspikes address - .byte 0xb0 - .4byte \address - .endm - - .macro setforesight - .byte 0xb1 - .endm - - .macro trysetperishsong address - .byte 0xb2 - .4byte \address - .endm - - .macro rolloutdamagecalculation - .byte 0xb3 - .endm - - .macro jumpifconfusedandstatmaxed bank, address - .byte 0xb4 - .byte \bank - .4byte \address - .endm - - .macro furycuttercalc - .byte 0xb5 - .endm - - .macro happinesstodamagecalculation - .byte 0xb6 - .endm - - .macro presentdamagecalculation - .byte 0xb7 - .endm - - .macro setsafeguard - .byte 0xb8 - .endm - - .macro magnitudedamagecalculation - .byte 0xb9 - .endm - - .macro jumpifnopursuitswitchdmg address - .byte 0xba - .4byte \address - .endm - - .macro setsunny - .byte 0xbb - .endm - - .macro maxattackhalvehp address - .byte 0xbc - .4byte \address - .endm - - .macro copyfoestats address - .byte 0xbd - .4byte \address - .endm - - .macro rapidspinfree - .byte 0xbe - .endm - - .macro setdefensecurlbit - .byte 0xbf - .endm - - .macro recoverbasedonsunlight address - .byte 0xc0 - .4byte \address - .endm - - .macro hiddenpowercalc - .byte 0xc1 - .endm - - .macro selectfirstvalidtarget - .byte 0xc2 - .endm - - .macro trysetfutureattack address - .byte 0xc3 - .4byte \address - .endm - - .macro trydobeatup address1, address2 - .byte 0xc4 - .4byte \address1 - .4byte \address2 - .endm - - .macro setsemiinvulnerablebit - .byte 0xc5 - .endm - - .macro clearsemiinvulnerablebit - .byte 0xc6 - .endm - - .macro setminimize - .byte 0xc7 - .endm - - .macro sethail - .byte 0xc8 - .endm - - .macro jumpifattackandspecialattackcannotfall address - .byte 0xc9 - .4byte \address - .endm - - .macro setforcedtarget - .byte 0xca - .endm - - .macro setcharge - .byte 0xcb - .endm - - .macro callterrainattack - .byte 0xcc - .endm - - .macro cureifburnedparalysedorpoisoned address - .byte 0xcd - .4byte \address - .endm - - .macro settorment address - .byte 0xce - .4byte \address - .endm - - .macro jumpifnodamage address - .byte 0xcf - .4byte \address - .endm - - .macro settaunt address - .byte 0xd0 - .4byte \address - .endm - - .macro trysethelpinghand address - .byte 0xd1 - .4byte \address - .endm - - .macro tryswapitems address - .byte 0xd2 - .4byte \address - .endm - - .macro trycopyability address - .byte 0xd3 - .4byte \address - .endm - - .macro trywish byte, address - .byte 0xd4 - .byte \byte - .4byte \address - .endm - - .macro trysetroots address - .byte 0xd5 - .4byte \address - .endm - - .macro doubledamagedealtifdamaged - .byte 0xd6 - .endm - - .macro setyawn address - .byte 0xd7 - .4byte \address - .endm - - .macro setdamagetohealthdifference address - .byte 0xd8 - .4byte \address - .endm - - .macro scaledamagebyhealthratio - .byte 0xd9 - .endm - - .macro tryswapabilities address - .byte 0xda - .4byte \address - .endm - - .macro tryimprision address - .byte 0xdb - .4byte \address - .endm - - .macro trysetgrudge address - .byte 0xdc - .4byte \address - .endm - - .macro weightdamagecalculation - .byte 0xdd - .endm - - .macro assistattackselect address - .byte 0xde - .4byte \address - .endm - - .macro trysetmagiccoat address - .byte 0xdf - .4byte \address - .endm - - .macro trysetsnatch address - .byte 0xe0 - .4byte \address - .endm - - .macro trygetintimidatetarget address - .byte 0xe1 - .4byte \address - .endm - - .macro switchoutabilities bank - .byte 0xe2 - .byte \bank - .endm - - .macro jumpifhasnohp bank, address - .byte 0xe3 - .byte \bank - .4byte \address - .endm - - .macro getsecretpowereffect - .byte 0xe4 - .endm - - .macro pickup - .byte 0xe5 - .endm - - .macro docastformchangeanimation - .byte 0xe6 - .endm - - .macro trycastformdatachange - .byte 0xe7 - .endm - - .macro settypebasedhalvers address - .byte 0xe8 - .4byte \address - .endm - - .macro setweatherballtype - .byte 0xe9 - .endm - - .macro tryrecycleitem address - .byte 0xea - .4byte \address - .endm - - .macro settypetoterrain address - .byte 0xeb - .4byte \address - .endm - - .macro pursuitrelated address - .byte 0xec - .4byte \address - .endm - - .macro snatchsetbanks - .byte 0xed - .endm - - .macro removelightscreenreflect - .byte 0xee - .endm - - .macro handleballthrow - .byte 0xef - .endm - - .macro givecaughtmon - .byte 0xf0 - .endm - - .macro trysetcaughtmondexflags address - .byte 0xf1 - .4byte \address - .endm - - .macro displaydexinfo - .byte 0xf2 - .endm - - .macro trygivecaughtmonnick address - .byte 0xf3 - .4byte \address - .endm - - .macro subattackerhpbydmg - .byte 0xf4 - .endm - - .macro removeattackerstatus1 - .byte 0xf5 - .endm - - .macro finishaction - .byte 0xf6 - .endm - - .macro finishturn - .byte 0xf7 - .endm - - .macro trainerslideout bank - .byte 0xf8 - .byte \bank - .endm - -@ various command changed to more readable macros - .macro cancelmultiturnmoves bank - various \bank, VARIOUS_CANCEL_MULTI_TURN_MOVES - .endm - - .macro setmagiccoattarget bank - various \bank, VARIOUS_SET_MAGIC_COAT_TARGET - .endm - - .macro getifcantrunfrombattle bank - various \bank, VARIOUS_IS_RUNNING_IMPOSSIBLE - .endm - - .macro getmovetarget bank - various \bank, VARIOUS_GET_MOVE_TARGET - .endm - - .macro various4 bank - various \bank, 4 - .endm - - .macro resetintrimidatetracebits bank - various \bank, VARIOUS_RESET_INTIMIDATE_TRACE_BITS - .endm - - .macro updatechoicemoveonlvlup bank - various \bank, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP - .endm - - .macro various7 bank - various \bank, 7 - .endm - - .macro various8 bank - various \bank, 8 - .endm - - .macro various9 bank - various \bank, 9 - .endm - - .macro various10 bank - various \bank, 10 - .endm - - .macro various11 bank - various \bank, 11 - .endm - - .macro various12 bank - various \bank, 12 - .endm - - .macro forfeityesnobox bank - various \bank, VARIOUS_EMIT_YESNOBOX - .endm - - .macro various14 bank - various \bank, 14 - .endm - - .macro various15 bank - various \bank, 15 - .endm - - .macro various16 bank - various \bank, 16 - .endm - - .macro various17 bank - various \bank, 17 - .endm - - .macro waitcry bank - various \bank, VARIOUS_WAIT_CRY - .endm - - .macro returnopponentmon1toball bank - various \bank, VARIOUS_RETURN_OPPONENT_MON1 - .endm - - .macro returnopponentmon2toball bank - various \bank, VARIOUS_RETURN_OPPONENT_MON2 - .endm - - .macro various21 bank - various \bank, 21 - .endm - - .macro various22 bank - various \bank, 22 - .endm - - .macro various23 bank - various \bank, 23 - .endm - - .macro various24 bank - various \bank, 24 - .endm - - .macro setoutcomeonteleport bank - various \bank, VARIOUS_SET_TELEPORT_OUTCOME - .endm - - .macro playtrainerdefeatbgm bank - various \bank, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC - .endm - -@ helpful macros - .macro setstatchanger stat, stages, down - setbyte sSTATCHANGER \stat | \stages << 4 | \down << 7 - .endm - - .macro setmoveeffect effect - setbyte cEFFECT_CHOOSER \effect - .endm - - .macro chosenstatus1animation bank, status - chosenstatusanimation \bank 0x0 \status - .endm - - .macro chosenstatus2animation bank, status - chosenstatusanimation \bank 0x1 \status - .endm - - .macro sethword dst, value - setbyte \dst, \value & 0xFF - setbyte \dst + 1, (\value >> 8) & 0xFF - .endm - - .macro setword dst, value - setbyte \dst, \value & 0xFF - setbyte \dst + 1, (\value >> 8) & 0xFF - setbyte \dst + 2, (\value >> 16) & 0xFF - setbyte \dst + 3, (\value >> 24) & 0xFF - .endm - - .macro copybyte dst, src - copyarray \dst, \src, 0x1 - .endm - - .macro copyhword dst, src - copyarray \dst, \src, 0x2 - .endm - - .macro copyword dst, src - copyarray \dst, \src, 0x4 - .endm - - .macro jumpifbytenotequal byte1, byte2, jumpptr - jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr - .endm - - .macro jumpifbyteequal byte1, byte2, jumpptr - jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr - .endm - - .macro jumpifmove move, jumpptr - jumpifhalfword EQUAL, gCurrentMove, \move, \jumpptr - .endm - - .macro jumpifnotmove move, jumpptr - jumpifhalfword NOT_EQUAL, gCurrentMove, \move, \jumpptr - .endm - - .macro jumpifstatus3 bank, status, jumpptr - jumpifstatus3condition \bank, \status, 0x0, \jumpptr - .endm - - .macro jumpifnostatus3 bank, status, jumpptr - jumpifstatus3condition \bank, \status, 0x1, \jumpptr - .endm - - .macro jumpifmovehadnoeffect jumpptr - jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr - .endm - - .macro jumpifbattletype flags, jumpptr - jumpifhalfword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr - .endm - - .macro jumpifnotbattletype flags, jumpptr - jumpifhalfword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr - .endm diff --git a/asm/macros/contest_ai_script.inc b/asm/macros/contest_ai_script.inc deleted file mode 100644 index 05d70e351..000000000 --- a/asm/macros/contest_ai_script.inc +++ /dev/null @@ -1,506 +0,0 @@ -@ Add a positive/negative value to the score of the move being evaluated. - - .macro score score - .byte 0x00 - .byte \score - .endm - -@ turn (AKA "Appeal No.") - - .macro get_turn - .byte 0x01 - .endm - - .macro if_turn_less_than param, addr - .byte 0x02 - .byte \param - .4byte \addr - .endm - - .macro if_turn_more_than param, addr - .byte 0x03 - .byte \param - .4byte \addr - .endm - - .macro if_turn_eq param, addr - .byte 0x04 - .byte \param - .4byte \addr - .endm - - .macro if_turn_not_eq param, addr - .byte 0x05 - .byte \param - .4byte \addr - .endm - -@ audience excitement - - .macro get_excitement - .byte 0x06 - .endm - - .macro if_excitement_less_than param, addr - .byte 0x07 - .byte \param - .4byte \addr - .endm - - .macro if_excitement_more_than param, addr - .byte 0x08 - .byte \param - .4byte \addr - .endm - - .macro if_excitement_eq param, addr - .byte 0x09 - .byte \param - .4byte \addr - .endm - - .macro if_excitement_not_eq param, addr - .byte 0x0A - .byte \param - .4byte \addr - .endm - -@ the order that the user goes in the current turn - - .macro get_user_order - .byte 0x0B - .endm - - .macro if_user_order_less_than param addr - .byte 0x0C - .byte \param - .4byte \addr - .endm - - .macro if_user_order_more_than param addr - .byte 0x0D - .byte \param - .4byte \addr - .endm - - .macro if_user_order_eq param addr - .byte 0x0E - .byte \param - .4byte \addr - .endm - - .macro if_user_order_not_eq param addr - .byte 0x0F - .byte \param - .4byte \addr - .endm - -@ user condition - - .macro get_user_condition - .byte 0x10 - .endm - - .macro if_user_condition_less_than param, addr - .byte 0x11 - .byte \param - .4byte \addr - .endm - - .macro if_user_condition_more_than param, addr - .byte 0x12 - .byte \param - .4byte \addr - .endm - - .macro if_user_condition_eq param, addr - .byte 0x13 - .byte \param - .4byte \addr - .endm - - .macro if_user_condition_not_eq param, addr - .byte 0x14 - .byte \param - .4byte \addr - .endm - -@ 15 -@ 16 -@ 17 -@ 18 -@ 19 -@ 1A -@ 1B -@ 1C -@ 1D -@ 1E - -@ contest type - - .macro get_contest_type - .byte 0x1F - .endm - - .macro if_contest_type_eq param, addr - .byte 0x20 - .byte \param - .4byte \addr - .endm - - .macro if_contest_type_not_eq param, addr - .byte 0x21 - .byte \param - .4byte \addr - .endm - -@ move excitement (change in excitement due to move) - - .macro get_move_excitement - .byte 0x22 - .endm - - .macro if_move_excitement_less_than param, addr - .byte 0x23 - .byte \param - .4byte \addr - .endm - - .macro if_move_excitement_more_than param, addr - .byte 0x24 - .byte \param - .4byte \addr - .endm - - .macro if_move_excitement_eq param, addr - .byte 0x25 - .byte \param - .4byte \addr - .endm - - .macro if_move_excitement_not_eq param, addr - .byte 0x26 - .byte \param - .4byte \addr - .endm - -@ move effect - - .macro get_effect - .byte 0x27 - .endm - - .macro if_effect_eq param, addr - .byte 0x28 - .byte \param - .4byte \addr - .endm - - .macro if_effect_not_eq param, addr - .byte 0x29 - .byte \param - .4byte \addr - .endm - -@ move effect type - - .macro get_effect_type - .byte 0x2A - .endm - - .macro if_effect_type_eq param, addr - .byte 0x2B - .byte \param - .4byte \addr - .endm - - .macro if_effect_type_not_eq param, addr - .byte 0x2C - .byte \param - .4byte \addr - .endm - -@ whether the current move is the most appealing in the user's moveset - - .macro check_most_appealing_move - .byte 0x2D - .endm - - .macro if_most_appealing_move addr - .byte 0x2E - .4byte \addr - .endm - -@ 2F -@ 30 -@ 31 -@ 32 -@ 33 -@ 34 -@ 35 -@ 36 -@ 37 -@ 38 -@ 39 -@ 3A - -@ number of times current move has been used - - .macro get_move_used_count - .byte 0x3B - .endm - - .macro if_move_used_count_less_than param, addr - .byte 0x3C - .byte \param - .4byte \addr - .endm - - .macro if_move_used_count_more_than param, addr - .byte 0x3D - .byte \param - .4byte \addr - .endm - - .macro if_move_used_count_eq param, addr - .byte 0x3E - .byte \param - .4byte \addr - .endm - - .macro if_move_used_count_not_eq param, addr - .byte 0x3F - .byte \param - .4byte \addr - .endm - -@ whether the current move is a combo starter (with another move in the moveset) - - .macro check_combo_starter - .byte 0x40 - .endm - - .macro if_combo_starter addr - .byte 0x41 - .4byte \addr - .endm - - .macro if_not_combo_starter addr - .byte 0x42 - .4byte \addr - .endm - -@ whether the current move is a combo finisher (with another move in the moveset) - - .macro check_combo_finisher - .byte 0x43 - .endm - - .macro if_combo_finisher addr - .byte 0x44 - .4byte \addr - .endm - - .macro if_not_combo_finisher addr - .byte 0x45 - .4byte \addr - .endm - -@ whether the current move would finish a combo - - .macro check_would_finish_combo - .byte 0x46 - .endm - - .macro if_would_finish_combo addr - .byte 0x47 - .4byte \addr - .endm - - .macro if_would_not_finish_combo addr - .byte 0x48 - .4byte \addr - .endm - -@ condition of mon (indexed by order) - - .macro get_condition mon - .byte 0x49 - .byte \mon - .endm - - .macro if_condition_less_than mon, value, addr - .byte 0x4A - .byte \mon - .byte \value - .4byte \addr - .endm - - .macro if_condition_more_than mon, value, addr - .byte 0x4B - .byte \mon - .byte \value - .4byte \addr - .endm - - .macro if_condition_eq mon, value, addr - .byte 0x4C - .byte \mon - .byte \value - .4byte \addr - .endm - - .macro if_condition_not_eq mon, value, addr - .byte 0x4D - .byte \mon - .byte \value - .4byte \addr - .endm - -@ whether the mon used a combo starter move -@ Even though this value is always 1 or 0 (i.e. TRUE/FALSE), -@ there are less-than and greater-than comparison operations for some reason. - - .macro get_used_combo_starter mon - .byte 0x4E - .byte \mon - .endm - - .macro if_used_combo_starter_less_than mon, value, addr - .byte 0x4F - .byte \mon - .byte \value - .4byte \addr - .endm - - .macro if_used_combo_starter_more_than mon, value, addr - .byte 0x50 - .byte \mon - .byte \value - .4byte \addr - .endm - - - .macro if_used_combo_starter_eq mon, value, addr - .byte 0x51 - .byte \mon - .byte \value - .4byte \addr - .endm - - .macro if_used_combo_starter_not_eq mon, value, addr - .byte 0x52 - .byte \mon - .byte \value - .4byte \addr - .endm - -@ whether the mon can make an appeal - - .macro check_can_participate mon - .byte 0x53 - .byte \mon - .endm - - .macro if_can_participate mon, addr - .byte 0x54 - .byte \mon - .4byte \addr - .endm - - .macro if_cannot_participate mon, addr - .byte 0x55 - .byte \mon - .4byte \addr - .endm - -@ 56 -@ 57 - - .macro contest_58 param addr - .byte 0x58 - .byte \param - .4byte \addr - .endm - -@ 59 -@ 5A -@ 5B -@ 5C -@ 5D -@ 5E -@ 5F -@ 60 -@ 61 -@ 62 -@ 63 -@ 64 -@ 65 -@ 66 -@ 67 -@ 68 -@ 69 -@ 6A -@ 6B -@ 6C -@ 6D -@ 6E -@ 6F -@ 70 -@ 71 -@ 72 -@ 73 -@ 74 -@ 75 -@ 76 -@ 77 -@ 78 -@ 79 -@ 7A -@ 7B -@ 7C - - .macro if_random param addr - .byte 0x7D - .byte \param - .4byte \addr - .endm - -@ 7E - - .macro jump addr - .byte 0x7F - .4byte \addr - .endm - - .macro call addr - .byte 0x80 - .4byte \addr - .endm - - .macro end - .byte 0x81 - .endm - - .macro check_user_has_exciting_move - .byte 0x82 - .endm - - .macro if_user_has_exciting_move addr - .byte 0x83 - .4byte \addr - .endm - - .macro if_user_doesnt_have_exciting_move addr - .byte 0x84 - .4byte \addr - .endm - -@ 85 -@ 86 - - .macro if_effect_in_user_moveset param addr - .byte 0x87 - .2byte \param - .4byte \addr - .endm diff --git a/asm/macros/ec.inc b/asm/macros/ec.inc deleted file mode 100644 index d3fd45c2f..000000000 --- a/asm/macros/ec.inc +++ /dev/null @@ -1,8 +0,0 @@ - - .macro ec_duplicates count - .2byte 0xff00 + \count - .endm - - .macro ec_words_by_letter label - .2byte (gEasyChatWordsByLetter_\label - gEasyChatWordsAlphabetized) / 2 - .endm diff --git a/asm/macros/event.inc b/asm/macros/event.inc deleted file mode 100644 index fcbd3a055..000000000 --- a/asm/macros/event.inc +++ /dev/null @@ -1,1481 +0,0 @@ - @ Does nothing. - .macro nop - .byte 0x00 - .endm - - @ Does nothing. - .macro nop1 - .byte 0x01 - .endm - - @ Terminates script execution. - .macro end - .byte 0x02 - .endm - - @ Jumps back to after the last-executed call statement, and continues script execution from there. - .macro return - .byte 0x03 - .endm - - @ Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later. - .macro call destination - .byte 0x04 - .4byte \destination - .endm - - @ Jumps to destination and continues script execution from there. - .macro goto destination - .byte 0x05 - .4byte \destination - .endm - - @ If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there. - .macro goto_if condition, destination - .byte 0x06 - .byte \condition - .4byte \destination - .endm - - @ If the result of the last comparison matches condition (see Comparison operators), calls destination. - .macro call_if condition, destination - .byte 0x07 - .byte \condition - .4byte \destination - .endm - - @ Jumps to the standard function at index function. - .macro gotostd function - .byte 0x08 - .byte \function - .endm - - @ Calls the standard function at index function. - .macro callstd function - .byte 0x09 - .byte \function - .endm - - @ If the result of the last comparison matches condition (see Comparison operators), jumps to the standard function at index function. - .macro gotostd_if condition, function - .byte 0x0a - .byte \condition - .byte \function - .endm - - @ If the result of the last comparison matches condition (see Comparison operators), calls the standard function at index function. - .macro callstd_if condition, function - .byte 0x0b - .byte \condition - .byte \function - .endm - - @ Executes a script stored in a default RAM location. - .macro gotoram - .byte 0x0c - .endm - - @ Terminates script execution and "resets the script RAM". - .macro killscript - .byte 0x0d - .endm - - @ Sets some status related to Mystery Event. - .macro setmysteryeventstatus value - .byte 0x0e - .byte \value - .endm - - @ Sets the specified script bank to value. - .macro loadword destination, value - .byte 0x0f - .byte \destination - .4byte \value - .endm - - @ Sets the specified script bank to value. - .macro loadbyte destination, value - .byte 0x10 - .byte \destination - .byte \value - .endm - - @ Sets the byte at offset to value. - .macro writebytetoaddr value, offset - .byte 0x11 - .byte \value - .4byte \offset - .endm - - @ Copies the byte value at source into the specified script bank. - .macro loadbytefromaddr destination, source - .byte 0x12 - .byte \destination - .4byte \source - .endm - - @ Not sure. Judging from XSE's description I think it takes the least-significant byte in bank source and writes it to destination. - .macro setptrbyte source, destination - .byte 0x13 - .byte \source - .4byte \destination - .endm - - @ Copies the contents of bank source into bank destination. - .macro copylocal destination, source - .byte 0x14 - .byte \destination - .byte \source - .endm - - @ Copies the byte at source to destination, replacing whatever byte was previously there. - .macro copybyte destination, source - .byte 0x15 - .4byte \destination - .4byte \source - .endm - - @ Changes the value of destination to value. - .macro setvar destination, value - .byte 0x16 - .2byte \destination - .2byte \value - .endm - - @ Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000). - .macro addvar destination, value - .byte 0x17 - .2byte \destination - .2byte \value - .endm - - @ Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF). - .macro subvar destination, value - .byte 0x18 - .2byte \destination - .2byte \value - .endm - - @ Copies the value of source into destination. - .macro copyvar destination, source - .byte 0x19 - .2byte \destination - .2byte \source - .endm - - @ If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar. - .macro setorcopyvar destination, source - .byte 0x1a - .2byte \destination - .2byte \source - .endm - - @ Compares the values of script banks a and b, after forcing the values to bytes. - .macro compare_local_to_local byte1, byte2 - .byte 0x1b - .byte \byte1 - .byte \byte2 - .endm - - @ Compares the least-significant byte of the value of script bank a to a fixed byte value (b). - .macro compare_local_to_value a, b - .byte 0x1c - .byte \a - .byte \b - .endm - - @ Compares the least-significant byte of the value of script bank a to the byte located at offset b. - .macro compare_local_to_addr a, b - .byte 0x1d - .byte \a - .4byte \b - .endm - - @ Compares the byte located at offset a to the least-significant byte of the value of script bank b. - .macro compare_addr_to_local a, b - .byte 0x1e - .4byte \a - .byte \b - .endm - - @ Compares the byte located at offset a to a fixed byte value (b). - .macro compare_addr_to_value a, b - .byte 0x1f - .4byte \a - .byte \b - .endm - - @ Compares the byte located at offset a to the byte located at offset b. - .macro compare_addr_to_addr a, b - .byte 0x20 - .4byte \a - .4byte \b - .endm - - @ Compares the value of `var` to a fixed word value (b). - .macro compare_var_to_value var, value - .byte 0x21 - .2byte \var - .2byte \value - .endm - - @ Compares the value of `var1` to the value of `var2`. - .macro compare_var_to_var var1, var2 - .byte 0x22 - .2byte \var1 - .2byte \var2 - .endm - - @ Generic compare macro which attempts to deduce argument types based on their values - @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers - .macro compare arg1, arg2 - .if (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && (((\arg2) >> 12) == 4 || ((\arg2) >> 12) == 8) - compare_var_to_var (\arg1), (\arg2) - .elseif (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && ((\arg2) >= -0xFFFF && (\arg2) <= 0xFFFF) - compare_var_to_value (\arg1), ((\arg2) & 0xFFFF) - .else - .error "Invalid arguments for 'compare'" - .endif - .endm - - @ Calls the native C function stored at `func`. - .macro callnative func - .byte 0x23 - .4byte \func - .endm - - @ Replaces the script with the function stored at `func`. Execution returns to the bytecode script when func returns TRUE. - .macro gotonative func - .byte 0x24 - .4byte \func - .endm - - @ Calls a special function; that is, a function designed for use by scripts and listed in a table of pointers. - .macro special function - .byte 0x25 - .2byte SPECIAL_\function - .endm - - @ Calls a special function. That function's output (if any) will be written to the variable you specify. - .macro specialvar output, function - .byte 0x26 - .2byte \output - .2byte SPECIAL_\function - .endm - - @ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang). - .macro waitstate - .byte 0x27 - .endm - - @ Blocks script execution for time (frames? milliseconds?). - .macro delay time - .byte 0x28 - .2byte \time - .endm - - @ Sets a to 1. - .macro setflag a - .byte 0x29 - .2byte \a - .endm - - @ Sets a to 0. - .macro clearflag a - .byte 0x2a - .2byte \a - .endm - - @ Compares a to 1. - .macro checkflag a - .byte 0x2b - .2byte \a - .endm - - @ Initializes the RTC`s local time offset to the given hour and minute. In FireRed, this command is a nop. - .macro initclock hour, minute - .byte 0x2c - .2byte \hour - .2byte \minute - .endm - - @ Runs time based events. In FireRed, this command is a nop. - .macro dodailyevents - .byte 0x2d - .endm - - @ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG, this command sets those variables to zero. - .macro gettime - .byte 0x2e - .endm - - @ Plays the specified (sound_number) sound. Only one sound may play at a time, with newer ones interrupting older ones. - .macro playse sound_number - .byte 0x2f - .2byte \sound_number - .endm - - @ Blocks script execution until the currently-playing sound (triggered by playse) finishes playing. - .macro waitse - .byte 0x30 - .endm - - @ Plays the specified (fanfare_number) fanfare. - .macro playfanfare fanfare_number - .byte 0x31 - .2byte \fanfare_number - .endm - - @ Blocks script execution until all currently-playing fanfares finish. - .macro waitfanfare - .byte 0x32 - .endm - - @ Plays the specified (song_number) song. The byte is apparently supposed to be 0x00. - .macro playbgm song_number, unknown - .byte 0x33 - .2byte \song_number - .byte \unknown - .endm - - @ Saves the specified (song_number) song to be played later. - .macro savebgm song_number - .byte 0x34 - .2byte \song_number - .endm - - @ Crossfades the currently-playing song into the map's default song. - .macro fadedefaultbgm - .byte 0x35 - .endm - - @ Crossfades the currently-playng song into the specified (song_number) song. - .macro fadenewbgm song_number - .byte 0x36 - .2byte \song_number - .endm - - @ Fades out the currently-playing song. - .macro fadeoutbgm speed - .byte 0x37 - .byte \speed - .endm - - @ Fades the previously-playing song back in. - .macro fadeinbgm speed - .byte 0x38 - .byte \speed - .endm - - @ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (X, Y) on the map. - .macro warp map, warp, X, Y - .byte 0x39 - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Clone of warp that does not play a sound effect. - .macro warpsilent map, warp, X, Y - .byte 0x3a - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Clone of warp that plays a door opening animation before stepping upwards into it. - .macro warpdoor map, warp, X, Y - .byte 0x3b - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Warps the player to another map using a hole animation. - .macro warphole map - .byte 0x3c - map \map - .endm - - @ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E. - .macro warpteleport map, warp, X, Y - .byte 0x3d - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Sets the warp destination to be used later. - .macro setwarp map, warp, X, Y - .byte 0x3e - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators). - .macro setdynamicwarp map, warp, X, Y - .byte 0x3f - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Sets the destination that diving or emerging from a dive will take the player to. - .macro setdivewarp map, warp, X, Y - .byte 0x40 - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Sets the destination that falling into a hole will take the player to. - .macro setholewarp map, warp, X, Y - .byte 0x41 - map \map - .byte \warp - .2byte \X - .2byte \Y - .endm - - @ Retrieves the player's zero-indexed X- and Y-coordinates in the map, and stores them in the specified variables. - .macro getplayerxy X, Y - .byte 0x42 - .2byte \X - .2byte \Y - .endm - - @ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT). - .macro getpartysize - .byte 0x43 - .endm - - @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000. - .macro giveitem index, quantity - .byte 0x44 - .2byte \index - .2byte \quantity - .endm - - @ Removes quantity of item index from the player's Bag. - .macro takeitem index, quantity - .byte 0x45 - .2byte \index - .2byte \quantity - .endm - - @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. - .macro checkitemspace index, quantity - .byte 0x46 - .2byte \index - .2byte \quantity - .endm - - @ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item. - .macro checkitem index, quantity - .byte 0x47 - .2byte \index - .2byte \quantity - .endm - - @ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). - .macro checkitemtype index - .byte 0x48 - .2byte \index - .endm - - @ Adds a quantity amount of item index to the player's PC. Both arguments can be variables. - .macro givepcitem index, quantity - .byte 0x49 - .2byte \index - .2byte \quantity - .endm - - @ Checks for quantity amount of item index in the player's PC. Both arguments can be variables. - .macro checkpcitem index, quantity - .byte 0x4a - .2byte \index - .2byte \quantity - .endm - - @ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro givedecoration decoration - .byte 0x4b - .2byte \decoration - .endm - - @ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro takedecoration decoration - .byte 0x4c - .2byte \decoration - .endm - - @ Checks for decoration in the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro checkdecor decoration - .byte 0x4d - .2byte \decoration - .endm - - @ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.) - .macro checkdecorspace decoration - .byte 0x4e - .2byte \decoration - .endm - - @ Applies the movement data at movements to the specified (index) Object event. Also closes any standard message boxes that are still open. - @ This command in fact uses variables to access the Object event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Object event 3 will have the movements at @move1 applied to them. - .macro applymovement index, movements, mapGroup, mapNum - .ifb \mapGroup - .byte 0x4f - .2byte \index - .4byte \movements - .else - .byte 0x50 - .2byte \index - .4byte \movements - .byte \mapGroup - .byte \mapNum - .endif - .endm - - @ Blocks script execution until the movements being applied to the specified (index) Object event finish. If the specified Object event is 0x0000, then the command will block script execution until all Object events affected by applymovement finish their movements. If the specified Object event is not currently being manipulated with applymovement, then this command does nothing. - .macro waitmovement index, mapBank, mapNum - .ifb \mapBank - .byte 0x51 - .2byte \index - .else - .byte 0x52 - .2byte \index - .byte \mapBank - .byte \mapNum - .endif - .endm - - @ Attempts to hide the specified (local_ID, a local ID) Object event on the specified map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. - @ If no map is specified, then the current map is used - .macro removeobject localId, mapGroup, mapNum - .ifb \mapGroup - .byte 0x53 - .2byte \localId - .else - .byte 0x54 - .2byte \localId - .byte \mapGroup - .byte \mapNum - .endif - .endm - - .macro addobject localId, mapGroup, mapNum - .ifb \mapGroup - .byte 0x55 - .2byte \localId - .else - .byte 0x56 - .2byte \localId - .byte \mapGroup - .byte \mapNum - .endif - .endm - - @ Sets the specified (index) Object's position on the current map. - .macro setobjectxy index, x, y - .byte 0x57 - .2byte \index - .2byte \x - .2byte \y - .endm - - .macro showobjectat index, map - .byte 0x58 - .2byte \index - map \map - .endm - - .macro hideobjectat index, map - .byte 0x59 - .2byte \index - map \map - .endm - - @ If the script was called by a Object event, then that Object will turn to face toward the tile that the player is stepping off of. - .macro faceplayer - .byte 0x5a - .endm - - .macro turnobject index, direction - .byte 0x5b - .2byte \index - .byte \direction - .endm - - @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. - .macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4 - .byte 0x5c - .byte \type - .2byte \trainer - .2byte \word - .if \type == 0 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .elseif \type == 1 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .4byte \pointer3 @ event script - .elseif \type == 2 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .4byte \pointer3 @ event script - .elseif \type == 3 - .4byte \pointer1 @ text - .elseif \type == 4 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .4byte \pointer3 @ text - .elseif \type == 5 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .elseif \type == 6 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .4byte \pointer3 @ text - .4byte \pointer4 @ event script - .elseif \type == 7 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .4byte \pointer3 @ text - .elseif \type == 8 - .4byte \pointer1 @ text - .4byte \pointer2 @ text - .4byte \pointer3 @ text - .4byte \pointer4 @ event script - .endif - .endm - - @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes. - .macro trainerbattlebegin - .byte 0x5d - .endm - - @ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) - .macro gotopostbattlescript - .byte 0x5e - .endm - - @ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c) - .macro gotobeatenscript - .byte 0x5f - .endm - - @ Compares Flag (trainer + 0x500) to 1. (If the flag is set, then the trainer has been defeated by the player.) - .macro checktrainerflag trainer - .byte 0x60 - .2byte \trainer - .endm - - @ Sets Flag (trainer + 0x500). - .macro settrainerflag trainer - .byte 0x61 - .2byte \trainer - .endm - - @ Clears Flag (trainer + 0x500). - .macro cleartrainerflag trainer - .byte 0x62 - .2byte \trainer - .endm - - .macro setobjectxyperm index, x, y - .byte 0x63 - .2byte \index - .2byte \x - .2byte \y - .endm - - .macro moveobjectoffscreen index - .byte 0x64 - .2byte \index - .endm - - .macro setobjectmovementtype word, byte - .byte 0x65 - .2byte \word - .byte \byte - .endm - - @ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the box and its text have been fully drawn. - .macro waitmessage - .byte 0x66 - .endm - - @ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.) - .macro message text - .byte 0x67 - .4byte \text - .endm - - @ Closes the current message box. - .macro closemessage - .byte 0x68 - .endm - - @ Ceases movement for all Objects on-screen. - .macro lockall - .byte 0x69 - .endm - - @ If the script was called by an Object, then that Object's movement will cease. - .macro lock - .byte 0x6a - .endm - - @ Resumes normal movement for all Objects on-screen, and closes any standard message boxes that are still open. - .macro releaseall - .byte 0x6b - .endm - - @ If the script was called by an Object, then that Object's movement will resume. This command also closes any standard message boxes that are still open. - .macro release - .byte 0x6c - .endm - - @ Blocks script execution until the player presses any key. - .macro waitbuttonpress - .byte 0x6d - .endm - - @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES". - .macro yesnobox x, y - .byte 0x6e - .byte \x - .byte \y - .endm - - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoice x, y, list, b - .byte 0x6f - .byte \x - .byte \y - .byte \list - .byte \b - .endm - - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. - .macro multichoicedefault x, y, list, default, b - .byte 0x70 - .byte \x - .byte \y - .byte \list - .byte \default - .byte \b - .endm - - @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. - .macro multichoicegrid x, y, list, per_row, B - .byte 0x71 - .byte \x - .byte \y - .byte \list - .byte \per_row - .byte \B - .endm - - .macro drawbox byte1, byte2, byte3, byte4 - .byte 0x72 - .byte \byte1 - .byte \byte2 - .byte \byte3 - .byte \byte4 - .endm - - .macro erasebox byte1, byte2, byte3, byte4 - .byte 0x73 - .byte \byte1 - .byte \byte2 - .byte \byte3 - .byte \byte4 - .endm - - .macro drawboxtext byte1, byte2, byte3, byte4 - .byte 0x74 - .byte \byte1 - .byte \byte2 - .byte \byte3 - .byte \byte4 - .endm - - @ Displays a box containing the front sprite for the specified (species) Pokemon species. - .macro drawmonpic species, x, y - .byte 0x75 - .2byte \species - .byte \x - .byte \y - .endm - - @ Hides all boxes displayed with drawmonpic. - .macro erasemonpic - .byte 0x76 - .endm - - @ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.) - .macro drawcontestwinner a - .byte 0x77 - .byte \a - .endm - - @ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille characters. - .macro braillemessage text - .byte 0x78 - .4byte \text - .endm - - @ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes. - .macro givemon species, level, item, unknown1, unknown2, unknown3 - .byte 0x79 - .2byte \species - .byte \level - .2byte \item - .4byte \unknown1 - .4byte \unknown2 - .byte \unknown3 - .endm - - .macro giveegg species - .byte 0x7a - .2byte \species - .endm - - .macro setmonmove index, slot, move - .byte 0x7b - .byte \index - .byte \slot - .2byte \move - .endm - - @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species. - .macro checkpartymove index - .byte 0x7c - .2byte \index - .endm - - @ Writes the name of the Pokemon at index species to the specified buffer. - .macro bufferspeciesname out, species - .byte 0x7d - .byte \out - .2byte \species - .endm - - @ Writes the name of the species of the first Pokemon in the player's party to the specified buffer. - .macro bufferleadmonspeciesname out - .byte 0x7e - .byte \out - .endm - - @ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer. - .macro bufferpartymonnick out, slot - .byte 0x7f - .byte \out - .2byte \slot - .endm - - @ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead. - .macro bufferitemname out, item - .byte 0x80 - .byte \out - .2byte \item - .endm - - @ Writes the name of the decoration at index decoration to the specified buffer. In FireRed, this command is a nop. - .macro bufferdecorationname out, decoration - .byte 0x81 - .byte \out - .2byte \decoration - .endm - - @ Writes the name of the move at index move to the specified buffer. - .macro buffermovename out, move - .byte 0x82 - .byte \out - .2byte \move - .endm - - @ Converts the value of input to a decimal string, and writes that string to the specified buffer. - .macro buffernumberstring out, input - .byte 0x83 - .byte \out - .2byte \input - .endm - - @ Writes the standard string identified by index to the specified buffer. This command has no protections in place at all, so specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption. - .macro bufferstdstring out, index - .byte 0x84 - .byte \out - .2byte \index - .endm - - @ Copies the string at offset to the specified buffer. - .macro bufferstring out, offset - .byte 0x85 - .byte \out - .4byte \offset - .endm - - @ Opens the Pokemart system, offering the specified products for sale. - .macro pokemart products - .byte 0x86 - .4byte \products - .endm - - @ Opens the Pokemart system and treats the list of items as decorations. - .macro pokemartdecoration products - .byte 0x87 - .4byte \products - .endm - - @ Apparent clone of pokemartdecoration. - .macro pokemartdecoration2 products - .byte 0x88 - .4byte \products - .endm - - @ Starts up the slot machine minigame. - .macro playslotmachine word - .byte 0x89 - .2byte \word - .endm - - @ Sets a berry tree's specific berry and growth stage. In FireRed, this command is a nop. - .macro setberrytree tree_id, berry, growth_stage - .byte 0x8a - .byte \tree_id - .byte \berry - .byte \growth_stage - .endm - - @ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01. - .macro choosecontestmon - .byte 0x8b - .endm - - @ Starts a contest. In FireRed, this command is a nop. - .macro startcontest - .byte 0x8c - .endm - - @ Shows the results of a contest. In FireRed, this command is a nop. - .macro showcontestresults - .byte 0x8d - .endm - - @ Starts a contest over a link connection. In FireRed, this command is a nop. - .macro contestlinktransfer - .byte 0x8e - .endm - - @ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT). - .macro random limit - .byte 0x8f - .2byte \limit - .endm - - @ If check is 0x00, this command adds value to the player's money. - .macro givemoney value, check - .byte 0x90 - .4byte \value - .byte \check - .endm - - @ If check is 0x00, this command subtracts value from the player's money. - .macro takemoney value, check - .byte 0x91 - .4byte \value - .byte \check - .endm - - @ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not. - .macro checkmoney value, check - .byte 0x92 - .4byte \value - .byte \check - .endm - - @ Spawns a secondary box showing how much money the player has. - .macro showmoneybox x, y - .byte 0x93 - .byte \x - .byte \y - .endm - - @ Hides the secondary box spawned by showmoney. - .macro hidemoneybox x, y - .byte 0x94 - .byte \x - .byte \y - .endm - - @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. - .macro updatemoneybox x, y - .byte 0x95 - .byte \x - .byte \y - .endm - - @ Gets the price reduction for the index given. In FireRed, this command is a nop. - .macro getpricereduction index - .byte 0x96 - .2byte \index - .endm - - @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. - .macro fadescreen effect - .byte 0x97 - .byte \effect - .endm - - @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist. - .macro fadescreenspeed effect, speed - .byte 0x98 - .byte \effect - .byte \speed - .endm - - .macro setflashradius word - .byte 0x99 - .2byte \word - .endm - - .macro animateflash byte - .byte 0x9a - .byte \byte - .endm - - .macro messageautoscroll pointer - .byte 0x9b - .4byte \pointer - .endm - - @ Executes the specified field move animation. - .macro dofieldeffect animation - .byte 0x9c - .2byte \animation - .endm - - @ Sets up the field effect argument argument with the value value. - .macro setfieldeffectargument argument, param - .byte 0x9d - .byte \argument - .2byte \param - .endm - - @ Blocks script execution until all playing field move animations complete. - .macro waitfieldeffect animation - .byte 0x9e - .2byte \animation - .endm - - @ Sets which healing place the player will return to if all of the Pokemon in their party faint. - .macro setrespawn heallocation - .byte 0x9f - .2byte \heallocation - .endm - - @ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT. - .macro checkplayergender - .byte 0xa0 - .endm - - @ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes. - .macro playmoncry species, effect - .byte 0xa1 - .2byte \species - .2byte \effect - .endm - - @ Changes the metatile at (x, y) on the current map. - .macro setmetatile x, y, metatile_number, tile_attrib - .byte 0xa2 - .2byte \x - .2byte \y - .2byte \metatile_number - .2byte \tile_attrib - .endm - - @ Queues a weather change to the default weather for the map. - .macro resetweather - .byte 0xa3 - .endm - - @ Queues a weather change to type weather. - .macro setweather type - .byte 0xa4 - .2byte \type - .endm - - @ Executes the weather change queued with resetweather or setweather. The current weather will smoothly fade into the queued weather. - .macro doweather - .byte 0xa5 - .endm - - @ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors). - .macro setstepcallback subroutine - .byte 0xa6 - .byte \subroutine - .endm - - .macro setmaplayoutindex index - .byte 0xa7 - .2byte \index - .endm - - .macro setobjectpriority index, map, priority - .byte 0xa8 - .2byte \index - map \map - .byte \priority - .endm - - .macro resetobjectpriority index, map - .byte 0xa9 - .2byte \index - map \map - .endm - - .macro createvobject sprite, byte2, x, y, elevation, direction - .byte 0xaa - .byte \sprite - .byte \byte2 - .2byte \x - .2byte \y - .byte \elevation - .byte \direction - .endm - - .macro turnvobject index, direction - .byte 0xab - .byte \index - .byte \direction - .endm - - @ Opens the door metatile at (X, Y) with an animation. - .macro opendoor x, y - .byte 0xac - .2byte \x - .2byte \y - .endm - - @ Closes the door metatile at (X, Y) with an animation. - .macro closedoor x, y - .byte 0xad - .2byte \x - .2byte \y - .endm - - @ Waits for the door animation started with opendoor or closedoor to finish. - .macro waitdooranim - .byte 0xae - .endm - - @ Sets the door tile at (x, y) to be open without an animation. - .macro setdooropen x, y - .byte 0xaf - .2byte \x - .2byte \y - .endm - - @ Sets the door tile at (x, y) to be closed without an animation. - .macro setdoorclosed x, y - .byte 0xb0 - .2byte \x - .2byte \y - .endm - - @ In FireRed, this command is a nop. - .macro addelevmenuitem - .byte 0xb1 - .endm - - @ In FireRed and Emerald, this command is a nop. - .macro showelevmenu - .byte 0xb2 - .endm - - .macro checkcoins out - .byte 0xb3 - .2byte \out - .endm - - .macro givecoins count - .byte 0xb4 - .2byte \count - .endm - - .macro takecoins count - .byte 0xb5 - .2byte \count - .endm - - @ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. - .macro setwildbattle species, level, item - .byte 0xb6 - .2byte \species - .byte \level - .2byte \item - .endm - - @ Starts a wild battle against the Pokemon generated by setwildbattle. Blocks script execution until the battle finishes. - .macro dowildbattle - .byte 0xb7 - .endm - - .macro setvaddress long, word - .byte 0xb8 - .4byte \long - .2byte \word - .endm - - .macro vgoto pointer - .byte 0xb9 - .4byte \pointer - .endm - - .macro vcall pointer - .byte 0xba - .4byte \pointer - .endm - - .macro vgoto_if byte, pointer - .byte 0xbb - .byte \byte - .4byte \pointer - .endm - - .macro vcall_if byte, pointer - .byte 0xbc - .byte \byte - .4byte \pointer - .endm - - .macro vmessage pointer - .byte 0xbd - .4byte \pointer - .endm - - .macro vloadptr pointer - .byte 0xbe - .4byte \pointer - .endm - - .macro vbufferstring byte, pointer - .byte 0xbf - .byte \byte - .4byte \pointer - .endm - - @ Spawns a secondary box showing how many Coins the player has. - .macro showcoinsbox x, y - .byte 0xc0 - .byte \x - .byte \y - .endm - - @ Hides the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro hidecoinsbox x, y - .byte 0xc1 - .byte \x - .byte \y - .endm - - @ Updates the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. - .macro updatecoinsbox x, y - .byte 0xc2 - .byte \x - .byte \y - .endm - - @ Increases the value of the specified game stat by 1. The stat's value will not be allowed to exceed 0x00FFFFFF. - .macro incrementgamestat stat - .byte 0xc3 - .byte \stat - .endm - - @ Sets the destination that using an Escape Rope or Dig will take the player to. - .macro setescapewarp map, warp, x, y - .byte 0xc4 - map \map - .byte \warp - .2byte \x - .2byte \y - .endm - - @ Blocks script execution until cry finishes. - .macro waitmoncry - .byte 0xc5 - .endm - - @ Writes the name of the specified (box) PC box to the specified buffer. - .macro bufferboxname out, box - .byte 0xc6 - .byte \out - .2byte \box - .endm - - @ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text. - .macro textcolor color - .byte 0xc7 - .byte \color - .endm - - @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened. - .macro loadhelp pointer - .byte 0xc8 - .4byte \pointer - .endm - - @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened. - .macro unloadhelp - .byte 0xc9 - .endm - - @ After using this command, all standard message boxes will use the signpost frame. - .macro signmsg - .byte 0xca - .endm - - @ Ends the effects of signmsg, returning message box frames to normal. - .macro normalmsg - .byte 0xcb - .endm - - @ Compares the value of a hidden variable to a dword. - .macro comparehiddenvar a, value - .byte 0xcc - .byte \a - .4byte \value - .endm - -@ Supplementary - - .macro goto_if_trainer_not_defeated opponent, dest - checktrainerflag \opponent - goto_if 0, \dest - .endm - - .macro goto_if_trainer_defeated opponent, dest - checktrainerflag \opponent - goto_if 1, \dest - .endm - - .macro call_if_trainer_not_defeated opponent, dest - checktrainerflag \opponent - call_if 0, \dest - .endm - - .macro call_if_trainer_defeated opponent, dest - checktrainerflag \opponent - call_if 1, \dest - .endm - - .macro goto_if_unset flag, dest - checkflag \flag - goto_if 0, \dest - .endm - - .macro goto_if_set flag, dest - checkflag \flag - goto_if 1, \dest - .endm - - .macro goto_if_lt dest @ LESS THAN - goto_if 0, \dest - .endm - - .macro goto_if_eq dest @ EQUAL - goto_if 1, \dest - .endm - - .macro goto_if_gt dest @ GREATER THAN - goto_if 2, \dest - .endm - - .macro goto_if_le dest @ LESS THAN OR EQUAL - goto_if 3, \dest - .endm - - .macro goto_if_ge dest @ GREATER THAN OR EQUAL - goto_if 4, \dest - .endm - - .macro goto_if_ne dest @ NOT EQUAL - goto_if 5, \dest - .endm - - .macro call_if_unset flag, dest - checkflag \flag - call_if 0, \dest - .endm - - .macro call_if_set flag, dest - checkflag \flag - call_if 1, \dest - .endm - - .macro call_if_lt dest @ LESS THAN - call_if 0, \dest - .endm - - .macro call_if_eq dest @ EQUAL - call_if 1, \dest - .endm - - .macro call_if_gt dest @ GREATER THAN - call_if 2, \dest - .endm - - .macro call_if_le dest @ LESS THAN OR EQUAL - call_if 3, \dest - .endm - - .macro call_if_ge dest @ GREATER THAN OR EQUAL - call_if 4, \dest - .endm - - .macro call_if_ne dest @ NOT EQUAL - call_if 5, \dest - .endm - - .macro switch var - copyvar VAR_SPECIAL_0, \var - .endm - - .macro case condition, dest - compare_var_to_value VAR_SPECIAL_0, \condition - goto_if_eq \dest - .endm - - .macro msgbox text, type=4 - loadword 0, \text - callstd \type - .endm - - @ Message box types - MSGBOX_YESNO = 5 - - YES = 1 - NO = 0 - - .macro giveitem_std item, amount=1, function=0 - setorcopyvar VAR_SPECIAL_0, \item - setorcopyvar VAR_SPECIAL_1, \amount - callstd \function - .endm - - .macro givedecoration_std decoration - setorcopyvar VAR_SPECIAL_0, \decoration - callstd 7 - .endm diff --git a/asm/macros/field_effect_script.inc b/asm/macros/field_effect_script.inc deleted file mode 100644 index d5895b0ef..000000000 --- a/asm/macros/field_effect_script.inc +++ /dev/null @@ -1,42 +0,0 @@ - .macro loadtiles address - .byte 0 - .4byte \address - .endm - - .macro loadfadedpal address - .byte 1 - .4byte \address - .endm - - .macro loadpal address - .byte 2 - .4byte \address - .endm - - .macro callnative address - .byte 3 - .4byte \address - .endm - - .macro end - .byte 4 - .endm - - .macro loadgfx_callnative tiles_address, palette_address, function_address - .byte 5 - .4byte \tiles_address - .4byte \palette_address - .4byte \function_address - .endm - - .macro loadtiles_callnative tiles_address, function_address - .byte 6 - .4byte \tiles_address - .4byte \function_address - .endm - - .macro loadfadedpal_callnative palette_address, function_address - .byte 7 - .4byte \palette_address - .4byte \function_address - .endm diff --git a/asm/macros/function.inc b/asm/macros/function.inc deleted file mode 100644 index 67fb373a8..000000000 --- a/asm/macros/function.inc +++ /dev/null @@ -1,29 +0,0 @@ - .macro arm_func_start name - .align 2, 0 - .global \name - .arm - .type \name, function - .endm - - .macro arm_func_end name - .size \name, .-\name - .endm - - .macro thumb_func_start name - .align 2, 0 - .global \name - .thumb - .thumb_func - .type \name, function - .endm - - .macro non_word_aligned_thumb_func_start name - .global \name - .thumb - .thumb_func - .type \name, function - .endm - - .macro thumb_func_end name - .size \name, .-\name - .endm diff --git a/asm/macros/m4a.inc b/asm/macros/m4a.inc deleted file mode 100644 index 6c5abc09b..000000000 --- a/asm/macros/m4a.inc +++ /dev/null @@ -1,13 +0,0 @@ - .macro song label, music_player, unknown - .4byte \label - .2byte \music_player - .2byte \unknown - .endm - - .macro music_player info_struct, track_struct, unknown_1, unknown_2 - .4byte \info_struct - .4byte \track_struct - .byte \unknown_1 - .space 1 - .2byte \unknown_2 - .endm diff --git a/asm/macros/map.inc b/asm/macros/map.inc deleted file mode 100644 index db37d9346..000000000 --- a/asm/macros/map.inc +++ /dev/null @@ -1,96 +0,0 @@ - .macro map map_id - .byte \map_id >> 8 @ map group - .byte \map_id & 0xFF @ map num - .endm - - .macro map_script type, address - .byte \type - .4byte \address - .endm - - .macro map_script_2 word1, word2, address - .2byte \word1 - .2byte \word2 - .4byte \address - .endm - - .macro object_event byte1, word1, byte2, byte3, byte4, byte5, byte6, byte7, byte8, byte9, byte10, byte11, byte12, byte13, byte14, script, word2, byte15, byte16 - .byte \byte1 - .2byte \word1 - .byte \byte2, \byte3, \byte4, \byte5, \byte6, \byte7, \byte8, \byte9, \byte10, \byte11, \byte12, \byte13, \byte14 - .4byte \script - .2byte \word2 - .byte \byte15, \byte16 - inc _num_npcs - .endm - - .macro warp_def x, y, byte, warp, map_id - .2byte \x, \y - .byte \byte, \warp - .byte \map_id & 0xFF @ map num - .byte \map_id >> 8 @ map group - inc _num_warps - .endm - - .macro coord_event x, y, byte1, byte2, word1, word2, word3, script - .2byte \x, \y - .byte \byte1, \byte2 - .2byte \word1, \word2, \word3 - .4byte \script - inc _num_traps - .endm - - .macro coord_weather_event x, y, height, weather - coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 - .endm - - .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 - .2byte \x, \y - .byte \byte, \kind - .2byte \word - .if \kind < 5 - .4byte \arg6 - .else - .2byte \arg6 - .byte \arg7, \arg8 - .endif - inc _num_signs - .endm - - .macro bg_hidden_item_event x, y, height, item, flag - bg_event \x, \y, \height, 7, 0, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 - .endm - - .macro bg_secret_base_event x, y, height, secret_base_id - bg_event \x, \y, \height, 8, 0, \secret_base_id, 0, 0 - .endm - - .macro map_events npcs, warps, traps, signs - .byte _num_npcs, _num_warps, _num_traps, _num_signs - .4byte \npcs, \warps, \traps, \signs - reset_map_events - .endm - - .macro reset_map_events - .set _num_npcs, 0 - .set _num_warps, 0 - .set _num_traps, 0 - .set _num_signs, 0 - .endm - - reset_map_events - - - .equiv connection_down, 1 - .equiv connection_up, 2 - .equiv connection_left, 3 - .equiv connection_right, 4 - .equiv connection_dive, 5 - .equiv connection_emerge, 6 - - .macro connection direction, offset, map, filler - .4byte connection_\direction - .4byte \offset - map \map - .space 2 - .endm diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc deleted file mode 100644 index 674ce7169..000000000 --- a/asm/macros/movement.inc +++ /dev/null @@ -1,116 +0,0 @@ - .macro create_movement name - enum _\name - .macro \name - .byte _\name - .endm - .endm - - enum_start - create_movement step_00 - create_movement step_01 - create_movement step_02 - create_movement step_03 - create_movement slow_step_down - create_movement slow_step_up - create_movement slow_step_left - create_movement slow_step_right - create_movement step_down - create_movement step_up - create_movement step_left - create_movement step_right - create_movement fast_step_down - create_movement fast_step_up - create_movement fast_step_left - create_movement fast_step_right - create_movement step_10 - create_movement step_11 - create_movement step_12 - create_movement step_13 - create_movement step_14 - create_movement step_15 - create_movement step_16 - create_movement step_17 - create_movement step_18 - create_movement step_19 - create_movement step_1a - create_movement step_1b - create_movement step_1c - create_movement step_1d - create_movement step_1e - create_movement step_1f - create_movement step_20 - create_movement step_21 - create_movement step_22 - create_movement step_23 - create_movement step_24 - create_movement step_25 - create_movement step_26 - create_movement step_27 - create_movement step_28 - create_movement step_29 - create_movement step_2a - create_movement step_2b - create_movement step_2c - create_movement step_2d - create_movement step_2e - create_movement step_2f - create_movement step_30 - create_movement step_31 - create_movement step_32 - create_movement step_33 - create_movement step_34 - create_movement step_35 - create_movement step_36 - create_movement step_37 - create_movement step_38 - create_movement step_39 - create_movement step_3a - create_movement step_3b - create_movement step_3c - create_movement step_3d - create_movement step_3e - create_movement step_3f - create_movement step_40 - create_movement step_41 - create_movement step_42 - create_movement step_43 - create_movement step_44 - create_movement step_45 - create_movement step_46 - create_movement step_47 - create_movement step_48 - create_movement step_49 - create_movement step_4a - create_movement step_4b - create_movement step_4c - create_movement step_4d - create_movement step_4e - create_movement step_4f - create_movement step_50 - create_movement step_51 - create_movement step_52 - create_movement step_53 - create_movement step_54 - create_movement step_55 - create_movement step_56 - create_movement step_57 - create_movement step_58 - create_movement step_59 - create_movement step_5a - create_movement step_5b - create_movement step_5c - create_movement step_5d - create_movement step_5e - create_movement step_5f - create_movement step_60 - create_movement step_61 - - enum_start 0x91 - create_movement step_91 - create_movement step_92 - - enum_start 0x96 - create_movement step_96 - - enum_start 0xfe - create_movement step_end diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc deleted file mode 100644 index b7a9e7f8d..000000000 --- a/asm/macros/music_voice.inc +++ /dev/null @@ -1,125 +0,0 @@ - .macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release - .byte 0 - _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release - .endm - - .macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release - .byte 8 - _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release - .endm - - .macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release - .byte 16 - _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release - .endm - - .macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release - .byte \base_midi_key - .byte 0 - .if \pan != 0 - .byte (0x80 | \pan) - .else - .byte 0 - .endif - .4byte \sample_data_pointer - .byte \attack - .byte \decay - .byte \sustain - .byte \release - .endm - - .macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release - _voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release - _voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release - .byte \type, 60, 0 - .byte \sweep - .byte (\duty_cycle & 0x3) - .byte 0, 0, 0 - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_square_2 duty_cycle, attack, decay, sustain, release - _voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro voice_square_2_alt duty_cycle, attack, decay, sustain, release - _voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release - .endm - - .macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release - .byte \type, 60, 0, 0 - .byte (\duty_cycle & 0x3) - .byte 0, 0, 0 - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release - _voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release - .endm - - .macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release - _voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release - .endm - - .macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release - .byte \type, 60, 0, 0 - .4byte \wave_samples_pointer - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_noise period, attack, decay, sustain, release - _voice_noise 4, \period, \attack, \decay, \sustain, \release - .endm - - .macro voice_noise_alt period, attack, decay, sustain, release - _voice_noise 12, \period, \attack, \decay, \sustain, \release - .endm - - .macro _voice_noise type, period, attack, decay, sustain, release - .byte \type, 60, 0, 0 - .byte (\period & 0x1) - .byte 0, 0, 0 - .byte (\attack & 0x7) - .byte (\decay & 0x7) - .byte (\sustain & 0xF) - .byte (\release & 0x7) - .endm - - .macro voice_keysplit voice_group_pointer, keysplit_table_pointer - .byte 0x40, 0, 0, 0 - .4byte \voice_group_pointer - .4byte \keysplit_table_pointer - .endm - - .macro voice_keysplit_all voice_group_pointer - .byte 0x80, 0, 0, 0 - .4byte \voice_group_pointer - .4byte 0 - .endm - - .macro cry sample - .byte 0x20, 60, 0, 0 - .4byte \sample - .byte 0xff, 0, 0xff, 0 - .endm - - .macro cry2 sample - .byte 0x30, 60, 0, 0 - .4byte \sample - .byte 0xff, 0, 0xff, 0 - .endm diff --git a/asm/macros/pokemon_data.inc b/asm/macros/pokemon_data.inc deleted file mode 100644 index b0a5f22e3..000000000 --- a/asm/macros/pokemon_data.inc +++ /dev/null @@ -1,57 +0,0 @@ - .macro pokedex_entry pokemon_name, height, weight, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset - .2byte \height @ in decimeters - .2byte \weight @ in hectograms - .4byte DexDescription_\pokemon_name\()_1 - .4byte DexDescription_\pokemon_name\()_2 - .2byte 0 @ unused - .2byte \pokemon_scale - .2byte \pokemon_offset - .2byte \trainer_scale - .2byte \trainer_offset - .2byte 0 @ padding - .endm - - .macro base_stats hp, attack, defense, speed, sp_attack, sp_defense - .byte \hp - .byte \attack - .byte \defense - .byte \speed - .byte \sp_attack - .byte \sp_defense - .endm - - .macro ev_yield hp, attack, defense, speed, sp_attack, sp_defense - .2byte (\sp_defense << 10) | (\sp_attack << 8) | (\speed << 6) | (\defense << 4) | (\attack << 2) | \hp - .endm - - .macro level_up_move level, move - .2byte (\level << 9) | \move - .endm - - .macro evo_entry method, parameter, target_species - .2byte \method - .2byte \parameter - .2byte \target_species - .2byte 0 @ padding - .endm - - .macro empty_evo_entries count - .fill 8 * \count, 1, 0 - .endm - - .macro egg_moves_begin species - .2byte 20000 + \species - .endm - -@ If the min level equals the max level, only one level argument is needed. - .macro wild_mon species, min_level, max_level - .byte \min_level - - .ifb \max_level - .byte \min_level - .else - .byte \max_level - .endif - - .2byte SPECIES_\species - .endm diff --git a/asm/normal.s b/asm/normal.s index 8465e2c2b..fffbc3870 100755 --- a/asm/normal.s +++ b/asm/normal.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s index 665978d19..9d36df66c 100755 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index fd5555524..779a5a0ed 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index 5eea28b99..00f8cfe14 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index a8b8fa401..6995dc62b 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index d878821cb..2ac873fcd 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/pokenav.s b/asm/pokenav.s index 67b4ece33..ca65b2e06 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/psychic.s b/asm/psychic.s index 7dbedd08f..f91ce950e 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/rock.s b/asm/rock.s index 2f878db2c..98afb53e6 100755 --- a/asm/rock.s +++ b/asm/rock.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/unk_text_8095904.s b/asm/unk_text_8095904.s index f144eab26..00c81faca 100755 --- a/asm/unk_text_8095904.s +++ b/asm/unk_text_8095904.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/asm/water.s b/asm/water.s index 56e552241..45fb7f82a 100755 --- a/asm/water.s +++ b/asm/water.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "asm/macros.inc" + .include "include/macros.inc" .syntax unified diff --git a/config.mk b/config.mk new file mode 100644 index 000000000..f0ad39f5b --- /dev/null +++ b/config.mk @@ -0,0 +1,44 @@ +### Build Configuration ### + +# Default variables +VERSION ?= RUBY +REVISION ?= 0 +LANGUAGE ?= ENGLISH +COMPARE ?= 1 + +# Version +ifeq ($(VERSION), RUBY) + BUILD_NAME := ruby +else +ifeq ($(VERSION), SAPPHIRE) + BUILD_NAME := sapphire +else + $(error unknown version $(VERSION)) +endif +endif + +# Revision +ifeq ($(REVISION), 0) + BUILD_NAME := $(BUILD_NAME) +else +ifeq ($(REVISION), 1) + BUILD_NAME := $(BUILD_NAME)_rev1 +else +ifeq ($(REVISION), 2) + BUILD_NAME := $(BUILD_NAME)_rev2 +else + $(error unknown revision $(REVISION)) +endif +endif +endif + +# Language +ifeq ($(LANGUAGE), ENGLISH) + BUILD_NAME := $(BUILD_NAME) +else +ifeq ($(LANGUAGE), GERMAN) + BUILD_NAME := $(BUILD_NAME)_de +else + $(error unknown language $(LANGUAGE)) +endif +endif diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 18fb0a64d..1569e87c6 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -10,8 +10,8 @@ #include "constants/species.h" #include "constants/weather.h" #include "constants/vars.h" - .include "asm/macros.inc" - .include "asm/macros/event.inc" + .include "include/macros.inc" + .include "include/macros/event.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data-de/strings2.s b/data-de/strings2.s index f15c039aa..52e964938 100644 --- a/data-de/strings2.s +++ b/data-de/strings2.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 270386359..17b27fae5 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -3,9 +3,9 @@ #include "constants/hold_effects.h" #include "constants/items.h" #include "constants/moves.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" - .include "asm/macros/battle_ai_script.inc" + .include "include/macros/battle_ai_script.inc" .section script_data, "aw", %progbits diff --git a/data/battle_anim.s b/data/battle_anim.s index ed880ba77..270ba818a 100644 --- a/data/battle_anim.s +++ b/data/battle_anim.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_80A7E7C.s b/data/battle_anim_80A7E7C.s index d7da20315..395b2e0ab 100644 --- a/data/battle_anim_80A7E7C.s +++ b/data/battle_anim_80A7E7C.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 4430cd372..8f62d92f6 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_812C144.s b/data/battle_anim_812C144.s index 188173252..dc0ebf9e3 100644 --- a/data/battle_anim_812C144.s +++ b/data/battle_anim_812C144.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_813F0F4.s b/data/battle_anim_813F0F4.s index de29622ad..fd24d95b6 100644 --- a/data/battle_anim_813F0F4.s +++ b/data/battle_anim_813F0F4.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index e0d11637d..2068db4ff 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,6 +1,6 @@ #include "constants/songs.h" - .include "asm/macros.inc" - .include "asm/macros/battle_anim.inc" + .include "include/macros.inc" + .include "include/macros/battle_anim.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/battle_interface.s b/data/battle_interface.s index 040b1b9d3..3c79b9f4b 100644 --- a/data/battle_interface.s +++ b/data/battle_interface.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_moves.s b/data/battle_moves.s index 2c65bd3a5..b56457a96 100644 --- a/data/battle_moves.s +++ b/data/battle_moves.s @@ -1,6 +1,6 @@ #include "constants/battle_constants.h" #include "constants/battle_move_effects.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 41edcb514..b04ebefe5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2,8 +2,8 @@ #include "constants/battle_constants.h" #include "constants/moves.h" #include "constants/songs.h" - .include "asm/macros.inc" - .include "asm/macros/battle_script.inc" + .include "include/macros.inc" + .include "include/macros/battle_script.inc" .include "constants/constants.inc" .include "constants/battle_script_constants.inc" diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index e113513d6..2c5c391ad 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,8 +1,8 @@ #include "constants/battle_constants.h" #include "constants/items.h" #include "constants/songs.h" - .include "asm/macros.inc" - .include "asm/macros/battle_script.inc" + .include "include/macros.inc" + .include "include/macros/battle_script.inc" .include "constants/constants.inc" .include "constants/battle_script_constants.inc" diff --git a/data/contest.s b/data/contest.s index 0ffcfc636..63988987d 100644 --- a/data/contest.s +++ b/data/contest.s @@ -1,6 +1,6 @@ #include "constants/moves.h" #include "constants/species.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/contest_ai.s b/data/contest_ai.s index 78f926df3..af13f50f8 100644 --- a/data/contest_ai.s +++ b/data/contest_ai.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 2c709ba09..b0b74c584 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -1,5 +1,5 @@ - .include "asm/macros.inc" - .include "asm/macros/contest_ai_script.inc" + .include "include/macros.inc" + .include "include/macros/contest_ai_script.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/contest_effect.s b/data/contest_effect.s index 7bcb36bf1..cd960fb52 100644 --- a/data/contest_effect.s +++ b/data/contest_effect.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/contest_link_80C2020.s b/data/contest_link_80C2020.s index 0b74e5908..f0ad06a32 100644 --- a/data/contest_link_80C2020.s +++ b/data/contest_link_80C2020.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/cute_sketch.s b/data/cute_sketch.s index b59a4b804..e3e75753d 100644 --- a/data/cute_sketch.s +++ b/data/cute_sketch.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/data2a.s b/data/data2a.s index bd455ce29..c4d6343d8 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -3,7 +3,7 @@ #include "constants/items.h" #include "constants/moves.h" #include "constants/species.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/data2b.s b/data/data2b.s index e82e221c1..c7cd4dfcf 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/data_8393054.s b/data/data_8393054.s index 5d2f79e07..38ba47b63 100644 --- a/data/data_8393054.s +++ b/data/data_8393054.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/easy_chat.s b/data/easy_chat.s index d41ffccce..bece4a499 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -1,7 +1,7 @@ #include "constants/easy_chat.h" #include "constants/moves.h" #include "constants/species.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" #define EC_DUPLICATES(count) (0xFF00 + (count)) diff --git a/data/event_scripts.s b/data/event_scripts.s index 1c8cff8d6..3b25ceab4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10,8 +10,8 @@ #include "constants/species.h" #include "constants/weather.h" #include "constants/vars.h" - .include "asm/macros.inc" - .include "asm/macros/event.inc" + .include "include/macros.inc" + .include "include/macros/event.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 900cc7009..45f8ce648 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,5 +1,5 @@ - .include "asm/macros.inc" - .include "asm/macros/field_effect_script.inc" + .include "include/macros.inc" + .include "include/macros/field_effect_script.inc" .include "constants/constants.inc" .section script_data, "aw", %progbits diff --git a/data/map_events.s b/data/map_events.s index a06eb36d0..1531ec30e 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -5,7 +5,7 @@ #include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/maps.s b/data/maps.s index 92f5544a1..727a48d0f 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,6 +1,6 @@ #include "constants/maps.h" #include "constants/songs.h" - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s index c33957945..1d6571149 100755 --- a/data/pc_screen_effect.s +++ b/data/pc_screen_effect.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 0d15169d0..410f0d4c5 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s index 0908ddacb..14ea1cfb8 100644 --- a/data/pokedex_cry_screen.s +++ b/data/pokedex_cry_screen.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index b765656f7..a3b7494dc 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/pokenav.s b/data/pokenav.s index f84e45596..cb0e98472 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/roulette.s b/data/roulette.s index 64b7b82e2..d19508fc3 100644 --- a/data/roulette.s +++ b/data/roulette.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/sound_data.s b/data/sound_data.s index cd33950e1..fff724e68 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,7 +1,7 @@ .section .rodata - .include "asm/macros/m4a.inc" - .include "asm/macros/music_voice.inc" + .include "include/macros/m4a.inc" + .include "include/macros/music_voice.inc" .include "sound/voice_groups.inc" .include "sound/keysplit_tables.inc" diff --git a/data/strings2.s b/data/strings2.s index cece71645..f73aba76f 100644 --- a/data/strings2.s +++ b/data/strings2.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/data/tilesets.s b/data/tilesets.s index 443686234..d9933dbf9 100644 --- a/data/tilesets.s +++ b/data/tilesets.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata diff --git a/fonts.mk b/fonts.mk index 86b7f4591..687c4ae2e 100644 --- a/fonts.mk +++ b/fonts.mk @@ -1,5 +1,3 @@ -RSFONT := tools/rsfont/rsfont - graphics/fonts/font0_jpn.1bpp: graphics/fonts/font0_jpn.png $(RSFONT) $< $@ 240 1 diff --git a/include/MPlayDef.s b/include/MPlayDef.s new file mode 100644 index 000000000..f5dd6484d --- /dev/null +++ b/include/MPlayDef.s @@ -0,0 +1,430 @@ + .equ W00, 0x80 @ WAIT + .equ W01, W00+1 @ + .equ W02, W00+2 @ + .equ W03, W00+3 @ + .equ W04, W00+4 @ + .equ W05, W00+5 @ + .equ W06, W00+6 @ + .equ W07, W00+7 @ + .equ W08, W00+8 @ + .equ W09, W00+9 @ + .equ W10, W00+10 @ + .equ W11, W00+11 @ + .equ W12, W00+12 @ + .equ W13, W00+13 @ + .equ W14, W00+14 @ + .equ W15, W00+15 @ + .equ W16, W00+16 @ + .equ W17, W00+17 @ + .equ W18, W00+18 @ + .equ W19, W00+19 @ + .equ W20, W00+20 @ + .equ W21, W00+21 @ + .equ W22, W00+22 @ + .equ W23, W00+23 @ + .equ W24, W00+24 @ + .equ W28, W00+25 @ + .equ W30, W00+26 @ + .equ W32, W00+27 @ + .equ W36, W00+28 @ + .equ W40, W00+29 @ + .equ W42, W00+30 @ + .equ W44, W00+31 @ + .equ W48, W00+32 @ + .equ W52, W00+33 @ + .equ W54, W00+34 @ + .equ W56, W00+35 @ + .equ W60, W00+36 @ + .equ W64, W00+37 @ + .equ W66, W00+38 @ + .equ W68, W00+39 @ + .equ W72, W00+40 @ + .equ W76, W00+41 @ + .equ W78, W00+42 @ + .equ W80, W00+43 @ + .equ W84, W00+44 @ + .equ W88, W00+45 @ + .equ W90, W00+46 @ + .equ W92, W00+47 @ + .equ W96, W00+48 @ + + .equ FINE, 0xb1 @ fine + .equ GOTO, 0xb2 @ goto + .equ PATT, 0xb3 @ pattern play + .equ PEND, 0xb4 @ pattern end + .equ REPT, 0xb5 @ repeat + .equ MEMACC, 0xb9 @ memacc op adr dat ***lib + .equ PRIO, 0xba @ priority + .equ TEMPO, 0xbb @ tempo (BPM/2) + .equ KEYSH, 0xbc @ key shift + .equ VOICE, 0xbd @ voice # + .equ VOL, 0xbe @ volume + .equ PAN, 0xbf @ panpot (c_v+??) + .equ BEND, 0xc0 @ pitch bend (c_v+??) + .equ BENDR, 0xc1 @ bend range + .equ LFOS, 0xc2 @ LFO speed + .equ LFODL, 0xc3 @ LFO delay + .equ MOD, 0xc4 @ modulation depth + .equ MODT, 0xc5 @ modulation type + .equ TUNE, 0xc8 @ micro tuning (c_v+??) + + .equ XCMD, 0xcd @ extend command ***lib + .equ xIECV, 0x08 @ imi.echo vol ***lib + .equ xIECL, 0x09 @ imi.echo len ***lib + + .equ EOT, 0xce @ End of Tie + .equ TIE, 0xcf @ + .equ N01, TIE+1 @ NOTE + .equ N02, N01+1 @ + .equ N03, N01+2 @ + .equ N04, N01+3 @ + .equ N05, N01+4 @ + .equ N06, N01+5 @ + .equ N07, N01+6 @ + .equ N08, N01+7 @ + .equ N09, N01+8 @ + .equ N10, N01+9 @ + .equ N11, N01+10 @ + .equ N12, N01+11 @ + .equ N13, N01+12 @ + .equ N14, N01+13 @ + .equ N15, N01+14 @ + .equ N16, N01+15 @ + .equ N17, N01+16 @ + .equ N18, N01+17 @ + .equ N19, N01+18 @ + .equ N20, N01+19 @ + .equ N21, N01+20 @ + .equ N22, N01+21 @ + .equ N23, N01+22 @ + .equ N24, N01+23 @ + .equ N28, N01+24 @ + .equ N30, N01+25 @ + .equ N32, N01+26 @ + .equ N36, N01+27 @ + .equ N40, N01+28 @ + .equ N42, N01+29 @ + .equ N44, N01+30 @ + .equ N48, N01+31 @ + .equ N52, N01+32 @ + .equ N54, N01+33 @ + .equ N56, N01+34 @ + .equ N60, N01+35 @ + .equ N64, N01+36 @ + .equ N66, N01+37 @ + .equ N68, N01+38 @ + .equ N72, N01+39 @ + .equ N76, N01+40 @ + .equ N78, N01+41 @ + .equ N80, N01+42 @ + .equ N84, N01+43 @ + .equ N88, N01+44 @ + .equ N90, N01+45 @ + .equ N92, N01+46 @ + .equ N96, N01+47 @ + +@ maximum value for volume + + .equ mxv, 0x7F @ + +@ center value of PAN, BEND, TUNE + + .equ c_v, 0x40 @ -64 ~ +63 + +@ note for N??, TIE, EOT + + .equ CnM2, 0 @ + .equ CsM2, 1 @ + .equ DnM2, 2 @ + .equ DsM2, 3 @ + .equ EnM2, 4 @ + .equ FnM2, 5 @ + .equ FsM2, 6 @ + .equ GnM2, 7 @ + .equ GsM2, 8 @ + .equ AnM2, 9 @ + .equ AsM2, 10 @ + .equ BnM2, 11 @ + .equ CnM1, 12 @ + .equ CsM1, 13 @ + .equ DnM1, 14 @ + .equ DsM1, 15 @ + .equ EnM1, 16 @ + .equ FnM1, 17 @ + .equ FsM1, 18 @ + .equ GnM1, 19 @ + .equ GsM1, 20 @ + .equ AnM1, 21 @ + .equ AsM1, 22 @ + .equ BnM1, 23 @ + .equ Cn0, 24 @ + .equ Cs0, 25 @ + .equ Dn0, 26 @ + .equ Ds0, 27 @ + .equ En0, 28 @ + .equ Fn0, 29 @ + .equ Fs0, 30 @ + .equ Gn0, 31 @ + .equ Gs0, 32 @ + .equ An0, 33 @ + .equ As0, 34 @ + .equ Bn0, 35 @ + .equ Cn1, 36 @ + .equ Cs1, 37 @ + .equ Dn1, 38 @ + .equ Ds1, 39 @ + .equ En1, 40 @ + .equ Fn1, 41 @ + .equ Fs1, 42 @ + .equ Gn1, 43 @ + .equ Gs1, 44 @ + .equ An1, 45 @ + .equ As1, 46 @ + .equ Bn1, 47 @ + .equ Cn2, 48 @ + .equ Cs2, 49 @ + .equ Dn2, 50 @ + .equ Ds2, 51 @ + .equ En2, 52 @ + .equ Fn2, 53 @ + .equ Fs2, 54 @ + .equ Gn2, 55 @ + .equ Gs2, 56 @ + .equ An2, 57 @ + .equ As2, 58 @ + .equ Bn2, 59 @ + .equ Cn3, 60 @ + .equ Cs3, 61 @ + .equ Dn3, 62 @ + .equ Ds3, 63 @ + .equ En3, 64 @ + .equ Fn3, 65 @ + .equ Fs3, 66 @ + .equ Gn3, 67 @ + .equ Gs3, 68 @ + .equ An3, 69 @ 440Hz + .equ As3, 70 @ + .equ Bn3, 71 @ + .equ Cn4, 72 @ + .equ Cs4, 73 @ + .equ Dn4, 74 @ + .equ Ds4, 75 @ + .equ En4, 76 @ + .equ Fn4, 77 @ + .equ Fs4, 78 @ + .equ Gn4, 79 @ + .equ Gs4, 80 @ + .equ An4, 81 @ + .equ As4, 82 @ + .equ Bn4, 83 @ + .equ Cn5, 84 @ + .equ Cs5, 85 @ + .equ Dn5, 86 @ + .equ Ds5, 87 @ + .equ En5, 88 @ + .equ Fn5, 89 @ + .equ Fs5, 90 @ + .equ Gn5, 91 @ + .equ Gs5, 92 @ + .equ An5, 93 @ + .equ As5, 94 @ + .equ Bn5, 95 @ + .equ Cn6, 96 @ + .equ Cs6, 97 @ + .equ Dn6, 98 @ + .equ Ds6, 99 @ + .equ En6, 100 @ + .equ Fn6, 101 @ + .equ Fs6, 102 @ + .equ Gn6, 103 @ + .equ Gs6, 104 @ + .equ An6, 105 @ + .equ As6, 106 @ + .equ Bn6, 107 @ + .equ Cn7, 108 @ + .equ Cs7, 109 @ + .equ Dn7, 110 @ + .equ Ds7, 111 @ + .equ En7, 112 @ + .equ Fn7, 113 @ + .equ Fs7, 114 @ + .equ Gn7, 115 @ + .equ Gs7, 116 @ + .equ An7, 117 @ + .equ As7, 118 @ + .equ Bn7, 119 @ + .equ Cn8, 120 @ + .equ Cs8, 121 @ + .equ Dn8, 122 @ + .equ Ds8, 123 @ + .equ En8, 124 @ + .equ Fn8, 125 @ + .equ Fs8, 126 @ + .equ Gn8, 127 @ + +@ velocity + + .equ v000, 0 @ + .equ v001, 1 @ + .equ v002, 2 @ + .equ v003, 3 @ + .equ v004, 4 @ + .equ v005, 5 @ + .equ v006, 6 @ + .equ v007, 7 @ + .equ v008, 8 @ + .equ v009, 9 @ + .equ v010, 10 @ + .equ v011, 11 @ + .equ v012, 12 @ + .equ v013, 13 @ + .equ v014, 14 @ + .equ v015, 15 @ + .equ v016, 16 @ + .equ v017, 17 @ + .equ v018, 18 @ + .equ v019, 19 @ + .equ v020, 20 @ + .equ v021, 21 @ + .equ v022, 22 @ + .equ v023, 23 @ + .equ v024, 24 @ + .equ v025, 25 @ + .equ v026, 26 @ + .equ v027, 27 @ + .equ v028, 28 @ + .equ v029, 29 @ + .equ v030, 30 @ + .equ v031, 31 @ + .equ v032, 32 @ + .equ v033, 33 @ + .equ v034, 34 @ + .equ v035, 35 @ + .equ v036, 36 @ + .equ v037, 37 @ + .equ v038, 38 @ + .equ v039, 39 @ + .equ v040, 40 @ + .equ v041, 41 @ + .equ v042, 42 @ + .equ v043, 43 @ + .equ v044, 44 @ + .equ v045, 45 @ + .equ v046, 46 @ + .equ v047, 47 @ + .equ v048, 48 @ + .equ v049, 49 @ + .equ v050, 50 @ + .equ v051, 51 @ + .equ v052, 52 @ + .equ v053, 53 @ + .equ v054, 54 @ + .equ v055, 55 @ + .equ v056, 56 @ + .equ v057, 57 @ + .equ v058, 58 @ + .equ v059, 59 @ + .equ v060, 60 @ + .equ v061, 61 @ + .equ v062, 62 @ + .equ v063, 63 @ + .equ v064, 64 @ + .equ v065, 65 @ + .equ v066, 66 @ + .equ v067, 67 @ + .equ v068, 68 @ + .equ v069, 79 @ + .equ v070, 70 @ + .equ v071, 71 @ + .equ v072, 72 @ + .equ v073, 73 @ + .equ v074, 74 @ + .equ v075, 75 @ + .equ v076, 76 @ + .equ v077, 77 @ + .equ v078, 78 @ + .equ v079, 79 @ + .equ v080, 80 @ + .equ v081, 81 @ + .equ v082, 82 @ + .equ v083, 83 @ + .equ v084, 84 @ + .equ v085, 85 @ + .equ v086, 86 @ + .equ v087, 87 @ + .equ v088, 88 @ + .equ v089, 89 @ + .equ v090, 90 @ + .equ v091, 91 @ + .equ v092, 92 @ + .equ v093, 93 @ + .equ v094, 94 @ + .equ v095, 95 @ + .equ v096, 96 @ + .equ v097, 97 @ + .equ v098, 98 @ + .equ v099, 99 @ + .equ v100, 100 @ + .equ v101, 101 @ + .equ v102, 102 @ + .equ v103, 103 @ + .equ v104, 104 @ + .equ v105, 105 @ + .equ v106, 106 @ + .equ v107, 107 @ + .equ v108, 108 @ + .equ v109, 109 @ + .equ v110, 110 @ + .equ v111, 111 @ + .equ v112, 112 @ + .equ v113, 113 @ + .equ v114, 114 @ + .equ v115, 115 @ + .equ v116, 116 @ + .equ v117, 117 @ + .equ v118, 118 @ + .equ v119, 119 @ + .equ v120, 120 @ + .equ v121, 121 @ + .equ v122, 122 @ + .equ v123, 123 @ + .equ v124, 124 @ + .equ v125, 125 @ + .equ v126, 126 @ + .equ v127, 127 @ + +@ exact gate time parameter for N?? + + .equ gtp1, 1 @ + .equ gtp2, 2 @ + .equ gtp3, 3 @ + +@ parameter of MODT + + .equ mod_vib,0 @ vibrate + .equ mod_tre,1 @ tremolo + .equ mod_pan,2 @ auto-panpot + +@ parameter of MEMACC + + .equ mem_set,0 @ + .equ mem_add,1 @ + .equ mem_sub,2 @ + .equ mem_mem_set,3 @ + .equ mem_mem_add,4 @ + .equ mem_mem_sub,5 @ + .equ mem_beq,6 @ + .equ mem_bne,7 @ + .equ mem_bhi,8 @ + .equ mem_bhs,9 @ + .equ mem_bls,10 @ + .equ mem_blo,11 @ + .equ mem_mem_beq,12 @ + .equ mem_mem_bne,13 @ + .equ mem_mem_bhi,14 @ + .equ mem_mem_bhs,15 @ + .equ mem_mem_bls,16 @ + .equ mem_mem_blo,17 @ + + .equ reverb_set,0x80 @ SOUND_MODE_REVERB_SET + .equ PAM, PAN @ diff --git a/include/macros.inc b/include/macros.inc new file mode 100644 index 000000000..f34353079 --- /dev/null +++ b/include/macros.inc @@ -0,0 +1,149 @@ + .include "include/macros/asm.inc" + .include "include/macros/function.inc" + .include "include/macros/movement.inc" + .include "include/macros/pokemon_data.inc" + .include "include/macros/ec.inc" + .include "include/macros/map.inc" + + .macro region_map_location x, y, width, height, name + .byte \x + .byte \y + .byte \width + .byte \height + .4byte gMapName_\name + .endm + + .macro obj_tiles address, uncompressed_size, tag + .4byte \address + .2byte \uncompressed_size + .2byte \tag + .endm + + .macro null_obj_tiles + obj_tiles 0, 0, 0 + .endm + + .macro obj_pal address, tag + .4byte \address + .2byte \tag + .2byte 0 @ padding + .endm + + .macro null_obj_pal + obj_pal 0, 0 + .endm + + .macro paired_pals tag, address + .2byte \tag + .2byte 0 @ padding + .4byte \address + .endm + +@ For object animation frames. + .macro obj_frame_tiles address, uncompressed_size + .4byte \address + .2byte \uncompressed_size + .2byte 0 @ padding + .endm + + .macro spr_template tile_tag, pal_tag, oam, anims, images, affine_anims, callback + .2byte \tile_tag + .2byte \pal_tag + .4byte \oam + .4byte \anims + .4byte \images + .4byte \affine_anims + .4byte \callback + .endm + +@ Berry trees have a table defining the palette slot used for each of their 5 +@ stages. However, the first 2 stages always use the same slots regardless of +@ the type of tree and the slots of the last 3 stages always equal each other. + .macro berry_tree_palette_slot_table slot + .byte 3, 4, \slot, \slot, \slot + .endm + + .macro subsprite x, y, priority, tile_num_offset, size + .2byte \x + .2byte \y + .2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size + .2byte 0 @ padding + .endm + + .macro obj_image_anim_frame pic_id, duration, flags = 0 + .2byte \pic_id + .byte (\flags) | (\duration) + .byte 0 @ padding + .endm + + .macro obj_image_anim_loop count + .2byte 0xfffd + .byte \count + .byte 0 @ padding + .endm + + .macro obj_image_anim_jump target_index + .2byte 0xfffe + .byte \target_index + .byte 0 @ padding + .endm + + .macro obj_image_anim_end + .2byte 0xffff + .2byte 0 @ padding + .endm + + .macro obj_rot_scal_anim_frame delta_x_scale, delta_y_scale, delta_angle, duration + .2byte \delta_x_scale + .2byte \delta_y_scale + .byte \delta_angle + .byte \duration + .2byte 0 @ padding + .endm + + .macro obj_rot_scal_anim_loop count + .2byte 0x7ffd + .2byte \count + .4byte 0 @ padding + .endm + + .macro obj_rot_scal_anim_jump target_index + .2byte 0x7ffe + .2byte \target_index + .4byte 0 @ padding + .endm + + .macro obj_rot_scal_anim_end unknown=0 + .2byte 0x7fff + .2byte \unknown + .fill 4 @ padding + .endm + + .macro credits_entry number, text + .4byte \number + .4byte \text + .endm + + .macro door_anim_frame unknown, offset + .byte \unknown + .byte 0 @ padding + .2byte \offset + .endm + + .macro door_anim_gfx metatile_num, unknown, tile_addr, palette_addr + .2byte \metatile_num + .2byte \unknown + .4byte \tile_addr + .4byte \palette_addr + .endm + + .macro trainer_eye_trainer opp_1, opp_2, opp_3, opp_4, opp_5, map_name + .2byte OPPONENT_\opp_1 + .2byte OPPONENT_\opp_2 + .2byte OPPONENT_\opp_3 + .2byte OPPONENT_\opp_4 + .2byte OPPONENT_\opp_5 + .2byte GROUP_\map_name + .2byte MAP_\map_name + .space 2 + .endm diff --git a/include/macros/asm.inc b/include/macros/asm.inc new file mode 100644 index 000000000..26b2707ca --- /dev/null +++ b/include/macros/asm.inc @@ -0,0 +1,17 @@ + .ifndef GUARD_ASM_MACROS_ASM_INC + .set GUARD_ASM_MACROS_ASM_INC, 1 + + .macro inc x + .set \x, \x + 1 + .endm + + .macro enum_start x=0 + .set __enum__, \x + .endm + + .macro enum constant + .equiv \constant, __enum__ + inc __enum__ + .endm + + .endif @ GUARD_ASM_MACROS_ASM_INC diff --git a/include/macros/battle_ai_script.inc b/include/macros/battle_ai_script.inc new file mode 100644 index 000000000..679e30340 --- /dev/null +++ b/include/macros/battle_ai_script.inc @@ -0,0 +1,554 @@ + .macro if_random_less_than percent, address + .byte 0x00 + .byte \percent + .4byte \address + .endm + + @ unused + .macro if_random_greater_than percent, address + .byte 0x01 + .byte \percent + .4byte \address + .endm + + @ unused + .macro if_random_equal address + .byte 0x02 + .4byte \address + .endm + + @ unused + .macro if_random_not_equal address + .byte 0x03 + .4byte \address + .endm + + .macro score score + .byte 0x04 + .byte \score + .endm + + .macro if_hp_less_than target, percent, address + .byte 0x05 + .byte \target + .byte \percent + .4byte \address + .endm + + .macro if_hp_more_than target, percent, address + .byte 0x06 + .byte \target + .byte \percent + .4byte \address + .endm + + .macro if_hp_equal target, percent, address + .byte 0x07 + .byte \target + .byte \percent + .4byte \address + .endm + + .macro if_hp_not_equal target, percent, address + .byte 0x08 + .byte \target + .byte \percent + .4byte \address + .endm + + .macro if_status target, status, address + .byte 0x09 + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_not_status target, status, address + .byte 0x0a + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_status2 target, status, address + .byte 0x0b + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_not_status2 target, status, address + .byte 0x0c + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_status3 target, status, address + .byte 0x0d + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_not_status3 target, status, address + .byte 0x0e + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_status4 target, status, address + .byte 0x0f + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_not_status4 target, status, address + .byte 0x10 + .byte \target + .4byte \status + .4byte \address + .endm + + .macro if_less_than value, address + .byte 0x11 + .byte \value + .4byte \address + .endm + + .macro if_more_than value, address + .byte 0x12 + .byte \value + .4byte \address + .endm + + .macro if_equal value, address + .byte 0x13 + .byte \value + .4byte \address + .endm + + .macro if_not_equal value, address + .byte 0x14 + .byte \value + .4byte \address + .endm + + .macro if_less_than_32 value, address + .byte 0x15 + .4byte \value + .4byte \address + .endm + + .macro if_more_than_32 value, address + .byte 0x16 + .4byte \value + .4byte \address + .endm + + .macro if_equal_32 value, address + .byte 0x17 + .4byte \value + .4byte \address + .endm + + .macro if_not_equal_32 value, address + .byte 0x18 + .4byte \value + .4byte \address + .endm + + .macro if_move move, address + .byte 0x19 + .2byte \move + .4byte \address + .endm + + .macro if_not_move move, address + .byte 0x1a + .2byte \move + .4byte \address + .endm + + .macro if_in_bytes list, address + .byte 0x1b + .4byte \list + .4byte \address + .endm + + .macro if_not_in_bytes list, address + .byte 0x1c + .4byte \list + .4byte \address + .endm + + .macro if_in_words list, address + .byte 0x1d + .4byte \list + .4byte \address + .endm + + .macro if_not_in_words list, address + .byte 0x1e + .4byte \list + .4byte \address + .endm + + .macro if_user_can_damage address + .byte 0x1f + .4byte \address + .endm + + .macro if_user_cant_damage address + .byte 0x20 + .4byte \address + .endm + + .macro get_turn_count + .byte 0x21 + .endm + + .macro get_type byte + .byte 0x22 + .byte \byte + .endm + + @ unused + .macro get_move_power + .byte 0x23 + .endm + + .macro is_most_powerful_move + .byte 0x24 + .endm + + .macro get_move target + .byte 0x25 + .byte \target + .endm + + .macro if_arg_equal type, address + .byte 0x26 + .byte \type + .4byte \address + .endm + + @ unused + .macro if_arg_not_equal type, address + .byte 0x27 + .byte \type + .4byte \address + .endm + + .macro if_would_go_first target, address + .byte 0x28 + .byte \target + .4byte \address + .endm + + .macro if_would_not_go_first target, address + .byte 0x29 + .byte \target + .4byte \address + .endm + + @ nullsub + .macro ai_2a + .byte 0x2a + .endm + + @ nullsub + .macro ai_2b + .byte 0x2b + .endm + + .macro count_alive_pokemon target + .byte 0x2c + .byte \target + .endm + + @ unused + .macro get_considered_move + .byte 0x2d + .endm + + .macro get_effect + .byte 0x2e + .endm + + .macro get_ability target + .byte 0x2f + .byte \target + .endm + + @ unused + .macro get_highest_possible_damage + .byte 0x30 + .endm + + .macro if_damage_bonus value, address + .byte 0x31 + .byte \value + .4byte \address + .endm + + @ nullsub + .macro ai_32 + .byte 0x32 + .endm + + @ nullsub + .macro ai_33 + .byte 0x33 + .endm + + .macro if_status_in_party target, status, address + .byte 0x34 + .byte \target + .4byte \status + .4byte \address + .endm + + @ bugged + .macro if_status_not_in_party target, status, address + .byte 0x35 + .byte \target + .4byte \status + .4byte \address + .endm + + .macro get_weather + .byte 0x36 + .endm + + .macro if_effect byte, address + .byte 0x37 + .byte \byte + .4byte \address + .endm + + .macro if_not_effect byte, address + .byte 0x38 + .byte \byte + .4byte \address + .endm + + .macro if_stat_level_less_than target, stat, level, address + .byte 0x39 + .byte \target + .byte \stat + .byte \level + .4byte \address + .endm + + .macro if_stat_level_more_than target, stat, level, address + .byte 0x3a + .byte \target + .byte \stat + .byte \level + .4byte \address + .endm + + .macro if_stat_level_equal target, stat, level, address + .byte 0x3b + .byte \target + .byte \stat + .byte \level + .4byte \address + .endm + + .macro if_stat_level_not_equal target, stat, level, address + .byte 0x3c + .byte \target + .byte \stat + .byte \level + .4byte \address + .endm + + .macro if_can_faint address + .byte 0x3d + .4byte \address + .endm + + .macro if_cant_faint address + .byte 0x3e + .4byte \address + .endm + + @ unused + .macro if_has_move, target, move, address + .byte 0x3f + .byte \target + .2byte \move + .4byte \address + .endm + + @ unused + .macro if_dont_have_move, target, move, address + .byte 0x40 + .byte \target + .2byte \move + .4byte \address + .endm + + .macro if_move_effect target, effect, address + .byte 0x41 + .byte \target + .byte \effect + .4byte \address + .endm + + .macro if_not_move_effect target, effect, address + .byte 0x42 + .byte \target + .byte \effect + .4byte \address + .endm + + .macro if_last_move_did_damage target, byte, address + .byte 0x43 + .byte \target + .byte \byte + .4byte \address + .endm + + .macro if_encored target, address + .byte 0x44 + .byte \target + .4byte \address + .endm + + .macro flee + .byte 0x45 + .endm + + .macro if_random_100 address + .byte 0x46 + .4byte \address + .endm + + .macro watch + .byte 0x47 + .endm + + .macro get_hold_effect target + .byte 0x48 + .byte \target + .endm + + .macro get_gender target + .byte 0x49 + .byte \target + .endm + + .macro is_first_turn target + .byte 0x4a + .byte \target + .endm + + .macro get_stockpile_count target + .byte 0x4b + .byte \target + .endm + + .macro is_double_battle + .byte 0x4c + .endm + + .macro get_item target + .byte 0x4d + .byte \target + .endm + + .macro get_move_type_from_result + .byte 0x4e + .endm + + .macro get_move_power_from_result + .byte 0x4f + .endm + + .macro get_move_effect_from_result + .byte 0x50 + .endm + + .macro get_protect_count target + .byte 0x51 + .byte \target + .endm + + @ nullsub + .macro ai_52 + .byte 0x52 + .endm + + @ nullsub + .macro ai_53 + .byte 0x53 + .endm + + @ nullsub + .macro ai_54 + .byte 0x54 + .endm + + @ nullsub + .macro ai_55 + .byte 0x55 + .endm + + @ nullsub + .macro ai_56 + .byte 0x56 + .endm + + @ nullsub + .macro ai_57 + .byte 0x57 + .endm + + @ unused + .macro call address + .byte 0x58 + .4byte \address + .endm + + .macro jump address + .byte 0x59 + .4byte \address + .endm + + .macro end + .byte 0x5a + .endm + + .macro if_level_cond cond, address + .byte 0x5b + .byte \cond + .4byte \address + .endm + + .macro if_user_higher_level address + if_level_cond 0, \address + .endm + + .macro if_target_higher_level address + if_level_cond 1, \address + .endm + + .macro if_equal_levels address + if_level_cond 2, \address + .endm + + @ unused + .macro if_taunted address + .byte 0x5c + .4byte \address + .endm + + .macro if_not_taunted address + .byte 0x5d + .4byte \address + .endm diff --git a/include/macros/battle_anim.inc b/include/macros/battle_anim.inc new file mode 100644 index 000000000..4ff845032 --- /dev/null +++ b/include/macros/battle_anim.inc @@ -0,0 +1,266 @@ + .macro loadsprite id + .byte 0x00 + .2byte \id + .endm + + .macro unloadsprite id + .byte 0x01 + .2byte \id + .endm + + .macro sprite template, priority, argv:vararg + .byte 0x02 + .4byte \template + .byte \priority + .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 +.Lsprite_\@_1: + .2byte \argv +.Lsprite_\@_2: + .endm + + .macro createtask addr, priority, argv:vararg + .byte 0x03 + .4byte \addr + .byte \priority + .byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2 +.Lcreatetask_\@_1: + .2byte \argv +.Lcreatetask_\@_2: + .endm + + .macro pause delay + .byte 0x04 + .byte \delay + .endm + + .macro wait + .byte 0x05 + .endm + + .macro hang1 + .byte 0x06 + .endm + + .macro hang2 + .byte 0x07 + .endm + + .macro end + .byte 0x08 + .endm + + .macro playse id + .byte 0x09 + .2byte \id + .endm + + .macro monbg which + .byte 0x0A + .byte \which + .endm + + .macro clearmonbg which + .byte 0x0B + .byte \which + .endm + + .macro setalpha eva, evb + .byte 0x0C + .2byte ((\evb) << 8) | (\eva) + .endm + + .macro blendoff + .byte 0x0D + .endm + + .macro call addr + .byte 0x0E + .4byte \addr + .endm + + .macro ret + .byte 0x0F + .endm + + .macro setvar var_num, value + .byte 0x10 + .byte \var_num + .2byte \value + .endm + + .macro ifelse addr1, addr2 + .byte 0x11 + .4byte \addr1 + .4byte \addr2 + .endm + + .macro jumpif cond, addr + .byte 0x12 + .byte \cond + .4byte \addr + .endm + + .macro jump addr + .byte 0x13 + .4byte \addr + .endm + + .macro fadetobg id + .byte 0x14 + .byte \id + .endm + + .macro restorebg + .byte 0x15 + .endm + + .macro waitbgfadeout + .byte 0x16 + .endm + + .macro waitbgfadein + .byte 0x17 + .endm + + .macro changebg id + .byte 0x18 + .byte \id + .endm + + .macro panse_19 id, pan + .byte 0x19 + .2byte \id + .byte \pan + .endm + + .macro setpan pan + .byte 0x1A + .byte \pan + .endm + + .macro panse_1B id, pan_start, pan_end, step, delay + .byte 0x1B + .2byte \id + .byte \pan_start + .byte \pan_end + .byte \step + .byte \delay + .endm + + .macro panse_1C id, pan, delay, count + .byte 0x1C + .2byte \id + .byte \pan + .byte \delay + .byte \count + .endm + + .macro panse_1D id, pan, count + .byte 0x1D + .2byte \id + .byte \pan + .byte \count + .endm + + .macro setbldcnt bldcnt + .byte 0x1E + .2byte \bldcnt + .endm + + .macro createtask_1F addr, argv:vararg + .byte 0x1F + .4byte \addr + .byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2 +.Lcreatetask_1F_\@_1: + .2byte \argv +.Lcreatetask_1F_\@_2: + .endm + + .macro waitsound + .byte 0x20 + .endm + + .macro jumpvareq var_num, value, addr + .byte 0x21 + .byte \var_num + .2byte \value + .4byte \addr + .endm + + .macro monbg_22 unk + .byte 0x22 + .byte \unk + .endm + + .macro clearmonbg_23 unk + .byte 0x23 + .byte \unk + .endm + + .macro jumpunkcond addr + .byte 0x24 + .4byte \addr + .endm + + .macro fadetobg_25 a, b, c + .byte 0x25 + .byte \a + .byte \b + .byte \c + .endm + + .macro panse_26 id, pan_start, pan_end, step, delay + .byte 0x26 + .2byte \id + .byte \pan_start + .byte \pan_end + .byte \step + .byte \delay + .endm + + .macro panse_27 id, pan_start, pan_end, step, delay + .byte 0x27 + .2byte \id + .byte \pan_start + .byte \pan_end + .byte \step + .byte \delay + .endm + + .macro monbgprio_28 unk + .byte 0x28 + .byte \unk + .endm + + .macro monbgprio_29 + .byte 0x29 + .endm + + .macro monbgprio_2A unk + .byte 0x2A + .byte \unk + .endm + + .macro invisible side + .byte 0x2B + .byte \side + .endm + + .macro visible side + .byte 0x2C + .byte \side + .endm + + .macro doublebattle_2D unk + .byte 0x2D + .byte \unk + .endm + + .macro doublebattle_2E unk + .byte 0x2E + .byte \unk + .endm + + .macro stopsound + .byte 0x2F + .endm diff --git a/include/macros/battle_script.inc b/include/macros/battle_script.inc new file mode 100644 index 000000000..e4fa0c454 --- /dev/null +++ b/include/macros/battle_script.inc @@ -0,0 +1,1414 @@ +@ 0 == +@ 1 != +@ 2 < +@ 3 > +@ 4 &= + + .macro calculatedamage + critical + atk5 + atk6 + atk7 + .endm + + + .macro attackcanceler + .byte 0x00 + .endm + + .macro accuracycheck address, param1 + .byte 0x01 + .4byte \address + .2byte \param1 + .endm + + .macro attackstring + .byte 0x02 + .endm + + .macro ppreduce + .byte 0x03 + .endm + + .macro critcalc + .byte 0x04 + .endm + + .macro damagecalc + .byte 0x05 + .endm + + .macro typecalc + .byte 0x06 + .endm + + .macro adjustnormaldamage + .byte 0x07 + .endm + + .macro adjustnormaldamage2 + .byte 0x08 + .endm + + .macro attackanimation + .byte 0x09 + .endm + + .macro waitanimation + .byte 0x0a + .endm + + .macro healthbarupdate bank + .byte 0x0b + .byte \bank + .endm + + .macro datahpupdate bank + .byte 0x0c + .byte \bank + .endm + + .macro critmessage + .byte 0x0d + .endm + + .macro effectivenesssound + .byte 0x0e + .endm + + .macro resultmessage + .byte 0x0f + .endm + + .macro printstring string + .byte 0x10 + .2byte \string + .endm + + .macro printselectionstring string + .byte 0x11 + .2byte \string + .endm + + .macro waitmessage delay + .byte 0x12 + .2byte \delay + .endm + + .macro printfromtable table + .byte 0x13 + .4byte \table + .endm + + .macro printselectionstringfromtable table + .byte 0x14 + .4byte \table + .endm + + .macro seteffectwithchance + .byte 0x15 + .endm + + .macro seteffectprimary + .byte 0x16 + .endm + + .macro seteffectsecondary + .byte 0x17 + .endm + + .macro clearstatusfromeffect bank + .byte 0x18 + .byte \bank + .endm + + .macro tryfaintmon bank, param2, param3 + .byte 0x19 + .byte \bank + .byte \param2 + .4byte \param3 + .endm + + .macro dofaintanimation param1 + .byte 0x1a + .byte \param1 + .endm + + .macro cleareffectsonfaint bank + .byte 0x1b + .byte \bank + .endm + + .macro jumpifstatus bank, status, address + .byte 0x1c + .byte \bank + .4byte \status + .4byte \address + .endm + + .macro jumpifstatus2 bank, status, address + .byte 0x1d + .byte \bank + .4byte \status + .4byte \address + .endm + + .macro jumpifability bank, ability, address + .byte 0x1e + .byte \bank + .byte \ability + .4byte \address + .endm + + .macro jumpifsideaffecting bank, status, address + .byte 0x1f + .byte \bank + .2byte \status + .4byte \address + .endm + + .macro jumpifstat bank, flag, quantity, statid, address + .byte 0x20 + .byte \bank + .byte \flag + .byte \quantity + .byte \statid + .4byte \address + .endm + + .macro jumpifstatus3condition bank, mask, status, address + .byte 0x21 + .byte \bank + .4byte \mask + .byte \status + .4byte \address + .endm + + .macro jumpiftype bank, type, address + .byte 0x22 + .byte \bank + .byte \type + .4byte \address + .endm + + .macro getexp bank + .byte 0x23 + .byte \bank + .endm + + .macro atk24 address + .byte 0x24 + .4byte \address + .endm + + .macro movevaluescleanup + .byte 0x25 + .endm + + .macro setmultihit param1 + .byte 0x26 + .byte \param1 + .endm + + .macro decrementmultihit address + .byte 0x27 + .4byte \address + .endm + + .macro goto address + .byte 0x28 + .4byte \address + .endm + + .macro jumpifbyte ifflag, checkaddr, compare, address + .byte 0x29 + .byte \ifflag + .4byte \checkaddr + .byte \compare + .4byte \address + .endm + + .macro jumpifhalfword ifflag, checkaddr, compare, address + .byte 0x2a + .byte \ifflag + .4byte \checkaddr + .2byte \compare + .4byte \address + .endm + + .macro jumpifword ifflag, checkaddr, compare, address + .byte 0x2b + .byte \ifflag + .4byte \checkaddr + .4byte \compare + .4byte \address + .endm + + .macro jumpifarrayequal mem1, mem2, size, address + .byte 0x2c + .4byte \mem1 + .4byte \mem2 + .byte \size + .4byte \address + .endm + + .macro jumpifarraynotequal mem1, mem2, size, address + .byte 0x2d + .4byte \mem1 + .4byte \mem2 + .byte \size + .4byte \address + .endm + + .macro setbyte pointer, value + .byte 0x2e + .4byte \pointer + .byte \value + .endm + + .macro addbyte pointer, value + .byte 0x2f + .4byte \pointer + .byte \value + .endm + + .macro subbyte pointer, value + .byte 0x30 + .4byte \pointer + .byte \value + .endm + + .macro copyarray destination, source, size + .byte 0x31 + .4byte \destination + .4byte \source + .byte \size + .endm + + .macro copyarraywithindex param1, param2, param3, byte + .byte 0x32 + .4byte \param1 + .4byte \param2 + .4byte \param3 + .byte \byte + .endm + + .macro orbyte pointer, value + .byte 0x33 + .4byte \pointer + .byte \value + .endm + + .macro orhalfword pointer, value + .byte 0x34 + .4byte \pointer + .2byte \value + .endm + + .macro orword pointer, value + .byte 0x35 + .4byte \pointer + .4byte \value + .endm + + .macro bicbyte pointer, value + .byte 0x36 + .4byte \pointer + .byte \value + .endm + + .macro bichalfword pointer, value + .byte 0x37 + .4byte \pointer + .2byte \value + .endm + + .macro bicword pointer, value + .byte 0x38 + .4byte \pointer + .4byte \value + .endm + + .macro pause pause_duration + .byte 0x39 + .2byte \pause_duration + .endm + + .macro waitstate + .byte 0x3a + .endm + + .macro healthbar_update bank + .byte 0x3b + .byte \bank + .endm + + .macro return + .byte 0x3c + .endm + + .macro end + .byte 0x3d + .endm + + .macro end2 + .byte 0x3e + .endm + + .macro end3 + .byte 0x3f + .endm + + .macro jumpifaffectedbyprotect address + .byte 0x40 + .4byte \address + .endm + + .macro call address + .byte 0x41 + .4byte \address + .endm + + .macro jumpiftype2 bank, type, address + .byte 0x42 + .byte \bank + .byte \type + .4byte \address + .endm + + .macro jumpifabilitypresent ability, address + .byte 0x43 + .byte \ability + .4byte \address + .endm + + .macro endselectionscript + .byte 0x44 + .endm + + .macro playanimation bank, animation, var_address + .byte 0x45 + .byte \bank + .byte \animation + .4byte \var_address + .endm + + .macro playanimation2 bank, address, int + .byte 0x46 + .byte \bank + .4byte \address + .4byte \int + .endm + + .macro setgraphicalstatchangevalues + .byte 0x47 + .endm + + .macro playstatchangeanimation bank, color, byte + .byte 0x48 + .byte \bank + .byte \color + .byte \byte + .endm + + .macro moveend byte1, byte2 + .byte 0x49 + .byte \byte1 + .byte \byte2 + .endm + + .macro typecalc2 + .byte 0x4a + .endm + + .macro returnatktoball + .byte 0x4b + .endm + + .macro getswitchedmondata bank + .byte 0x4c + .byte \bank + .endm + + .macro switchindataupdate bank + .byte 0x4d + .byte \bank + .endm + + .macro switchinanim bank, byte + .byte 0x4e + .byte \bank + .byte \byte + .endm + + .macro jumpifcantswitch bank, address + .byte 0x4f + .byte \bank + .4byte \address + .endm + + .macro openpartyscreen bank, address + .byte 0x50 + .byte \bank + .4byte \address + .endm + + .macro switchhandleorder bank, param2 + .byte 0x51 + .byte \bank + .byte \param2 + .endm + + .macro switchineffects bank + .byte 0x52 + .byte \bank + .endm + + .macro trainerslidein bank + .byte 0x53 + .byte \bank + .endm + + .macro playse word + .byte 0x54 + .2byte \word + .endm + + .macro fanfare int + .byte 0x55 + .2byte \int + .endm + + .macro playfaintcry bank_or_side + .byte 0x56 + .byte \bank_or_side + .endm + + .macro atk57 + .byte 0x57 + .endm + + .macro returntoball bank + .byte 0x58 + .byte \bank + .endm + + .macro handlelearnnewmove param1, param2, bank_maybe + .byte 0x59 + .4byte \param1 + .4byte \param2 + .byte \bank_maybe + .endm + + .macro yesnoboxlearnmove address + .byte 0x5a + .4byte \address + .endm + + .macro yesnoboxstoplearningmove address + .byte 0x5b + .4byte \address + .endm + + .macro hitanimation bank + .byte 0x5c + .byte \bank + .endm + + .macro getmoneyreward + .byte 0x5d + .endm + + .macro atk5e bank + .byte 0x5e + .byte \bank + .endm + + .macro atk5f + .byte 0x5f + .endm + + .macro incrementgamestat byte + .byte 0x60 + .byte \byte + .endm + + .macro drawpartystatussummary bank_or_side + .byte 0x61 + .byte \bank_or_side + .endm + + .macro atk62 bank_or_side + .byte 0x62 + .byte \bank_or_side + .endm + + .macro jumptorandomattack bank + .byte 0x63 + .byte \bank + .endm + + .macro statusanimation bank + .byte 0x64 + .byte \bank + .endm + + .macro status2animation bank_or_side, address + .byte 0x65 + .byte \bank_or_side + .4byte \address + .endm + + .macro chosenstatusanimation bank_or_side, bank_or_side2, address + .byte 0x66 + .byte \bank_or_side + .byte \bank_or_side2 + .4byte \address + .endm + + .macro yesnobox + .byte 0x67 + .endm + + .macro cancelallactions + .byte 0x68 + .endm + + .macro adjustsetdamage + .byte 0x69 + .endm + + .macro removeitem bank + .byte 0x6a + .byte \bank + .endm + + .macro atknameinbuff1 + .byte 0x6b + .endm + + .macro drawlvlupbox + .byte 0x6c + .endm + + .macro resetsentmonsvalue + .byte 0x6d + .endm + + .macro setatktoplayer0 + .byte 0x6e + .endm + + .macro makevisible bank + .byte 0x6f + .byte \bank + .endm + + .macro recordlastability bank + .byte 0x70 + .byte \bank + .endm + + .macro buffermovetolearn + .byte 0x71 + .endm + + .macro jumpifplayerran address + .byte 0x72 + .4byte \address + .endm + + .macro hpthresholds bank + .byte 0x73 + .byte \bank + .endm + + .macro hpthresholds2 bank + .byte 0x74 + .byte \bank + .endm + + .macro useitemonopponent + .byte 0x75 + .endm + + .macro various bank, byte + .byte 0x76 + .byte \bank + .byte \byte + .endm + + .macro setprotectlike + .byte 0x77 + .endm + + .macro faintifabilitynotdamp + .byte 0x78 + .endm + + .macro setatkhptozero + .byte 0x79 + .endm + + .macro jumpifnexttargetvalid address + .byte 0x7a + .4byte \address + .endm + + .macro tryhealhalfhealth address, byte + .byte 0x7b + .4byte \address + .byte \byte + .endm + + .macro trymirrormove + .byte 0x7c + .endm + + .macro setrain + .byte 0x7d + .endm + + .macro setreflect + .byte 0x7e + .endm + + .macro setseeded + .byte 0x7f + .endm + + .macro manipulatedamage id + .byte 0x80 + .byte \id + .endm + + .macro trysetrest address + .byte 0x81 + .4byte \address + .endm + + .macro jumpifnotfirstturn address + .byte 0x82 + .4byte \address + .endm + + .macro nop + .byte 0x83 + .endm + + .macro jumpifcantmakeasleep address + .byte 0x84 + .4byte \address + .endm + + .macro stockpile + .byte 0x85 + .endm + + .macro stockpiletobasedamage address + .byte 0x86 + .4byte \address + .endm + + .macro stockpiletohpheal address + .byte 0x87 + .4byte \address + .endm + + .macro negativedamage + .byte 0x88 + .endm + + .macro statbuffchange target, address + .byte 0x89 + .byte \target + .4byte \address + .endm + + .macro normalisebuffs + .byte 0x8a + .endm + + .macro setbide + .byte 0x8b + .endm + + .macro confuseifrepeatingattackends + .byte 0x8c + .endm + + .macro setmultihitcounter count + .byte 0x8d + .byte \count + .endm + + .macro initmultihitstring + .byte 0x8e + .endm + + .macro forcerandomswitch address + .byte 0x8f + .4byte \address + .endm + + .macro tryconversiontypechange address + .byte 0x90 + .4byte \address + .endm + + .macro givepaydaymoney + .byte 0x91 + .endm + + .macro setlightscreen + .byte 0x92 + .endm + + .macro tryKO address + .byte 0x93 + .4byte \address + .endm + + .macro damagetohalftargethp + .byte 0x94 + .endm + + .macro setsandstorm + .byte 0x95 + .endm + + .macro weatherdamage + .byte 0x96 + .endm + + .macro tryinfatuating address + .byte 0x97 + .4byte \address + .endm + + .macro updatestatusicon byte + .byte 0x98 + .byte \byte + .endm + + .macro setmist + .byte 0x99 + .endm + + .macro setfocusenergy + .byte 0x9a + .endm + + .macro transformdataexecution + .byte 0x9b + .endm + + .macro setsubstitute + .byte 0x9c + .endm + + .macro mimicattackcopy address + .byte 0x9d + .4byte \address + .endm + + .macro metronome + .byte 0x9e + .endm + + .macro dmgtolevel + .byte 0x9f + .endm + + .macro psywavedamageeffect + .byte 0xa0 + .endm + + .macro counterdamagecalculator address + .byte 0xa1 + .4byte \address + .endm + + .macro mirrorcoatdamagecalculator address + .byte 0xa2 + .4byte \address + .endm + + .macro disablelastusedattack address + .byte 0xa3 + .4byte \address + .endm + + .macro trysetencore address + .byte 0xa4 + .4byte \address + .endm + + .macro painsplitdmgcalc address + .byte 0xa5 + .4byte \address + .endm + + .macro settypetorandomresistance address + .byte 0xa6 + .4byte \address + .endm + + .macro setalwayshitflag + .byte 0xa7 + .endm + + .macro copymovepermanently address + .byte 0xa8 + .4byte \address + .endm + + .macro trychoosesleeptalkmove address + .byte 0xa9 + .4byte \address + .endm + + .macro setdestinybond + .byte 0xaa + .endm + + .macro trysetdestinybondtohappen + .byte 0xab + .endm + + .macro remaininghptopower + .byte 0xac + .endm + + .macro tryspiteppreduce address + .byte 0xad + .4byte \address + .endm + + .macro healpartystatus + .byte 0xae + .endm + + .macro cursetarget address + .byte 0xaf + .4byte \address + .endm + + .macro trysetspikes address + .byte 0xb0 + .4byte \address + .endm + + .macro setforesight + .byte 0xb1 + .endm + + .macro trysetperishsong address + .byte 0xb2 + .4byte \address + .endm + + .macro rolloutdamagecalculation + .byte 0xb3 + .endm + + .macro jumpifconfusedandstatmaxed bank, address + .byte 0xb4 + .byte \bank + .4byte \address + .endm + + .macro furycuttercalc + .byte 0xb5 + .endm + + .macro happinesstodamagecalculation + .byte 0xb6 + .endm + + .macro presentdamagecalculation + .byte 0xb7 + .endm + + .macro setsafeguard + .byte 0xb8 + .endm + + .macro magnitudedamagecalculation + .byte 0xb9 + .endm + + .macro jumpifnopursuitswitchdmg address + .byte 0xba + .4byte \address + .endm + + .macro setsunny + .byte 0xbb + .endm + + .macro maxattackhalvehp address + .byte 0xbc + .4byte \address + .endm + + .macro copyfoestats address + .byte 0xbd + .4byte \address + .endm + + .macro rapidspinfree + .byte 0xbe + .endm + + .macro setdefensecurlbit + .byte 0xbf + .endm + + .macro recoverbasedonsunlight address + .byte 0xc0 + .4byte \address + .endm + + .macro hiddenpowercalc + .byte 0xc1 + .endm + + .macro selectfirstvalidtarget + .byte 0xc2 + .endm + + .macro trysetfutureattack address + .byte 0xc3 + .4byte \address + .endm + + .macro trydobeatup address1, address2 + .byte 0xc4 + .4byte \address1 + .4byte \address2 + .endm + + .macro setsemiinvulnerablebit + .byte 0xc5 + .endm + + .macro clearsemiinvulnerablebit + .byte 0xc6 + .endm + + .macro setminimize + .byte 0xc7 + .endm + + .macro sethail + .byte 0xc8 + .endm + + .macro jumpifattackandspecialattackcannotfall address + .byte 0xc9 + .4byte \address + .endm + + .macro setforcedtarget + .byte 0xca + .endm + + .macro setcharge + .byte 0xcb + .endm + + .macro callterrainattack + .byte 0xcc + .endm + + .macro cureifburnedparalysedorpoisoned address + .byte 0xcd + .4byte \address + .endm + + .macro settorment address + .byte 0xce + .4byte \address + .endm + + .macro jumpifnodamage address + .byte 0xcf + .4byte \address + .endm + + .macro settaunt address + .byte 0xd0 + .4byte \address + .endm + + .macro trysethelpinghand address + .byte 0xd1 + .4byte \address + .endm + + .macro tryswapitems address + .byte 0xd2 + .4byte \address + .endm + + .macro trycopyability address + .byte 0xd3 + .4byte \address + .endm + + .macro trywish byte, address + .byte 0xd4 + .byte \byte + .4byte \address + .endm + + .macro trysetroots address + .byte 0xd5 + .4byte \address + .endm + + .macro doubledamagedealtifdamaged + .byte 0xd6 + .endm + + .macro setyawn address + .byte 0xd7 + .4byte \address + .endm + + .macro setdamagetohealthdifference address + .byte 0xd8 + .4byte \address + .endm + + .macro scaledamagebyhealthratio + .byte 0xd9 + .endm + + .macro tryswapabilities address + .byte 0xda + .4byte \address + .endm + + .macro tryimprision address + .byte 0xdb + .4byte \address + .endm + + .macro trysetgrudge address + .byte 0xdc + .4byte \address + .endm + + .macro weightdamagecalculation + .byte 0xdd + .endm + + .macro assistattackselect address + .byte 0xde + .4byte \address + .endm + + .macro trysetmagiccoat address + .byte 0xdf + .4byte \address + .endm + + .macro trysetsnatch address + .byte 0xe0 + .4byte \address + .endm + + .macro trygetintimidatetarget address + .byte 0xe1 + .4byte \address + .endm + + .macro switchoutabilities bank + .byte 0xe2 + .byte \bank + .endm + + .macro jumpifhasnohp bank, address + .byte 0xe3 + .byte \bank + .4byte \address + .endm + + .macro getsecretpowereffect + .byte 0xe4 + .endm + + .macro pickup + .byte 0xe5 + .endm + + .macro docastformchangeanimation + .byte 0xe6 + .endm + + .macro trycastformdatachange + .byte 0xe7 + .endm + + .macro settypebasedhalvers address + .byte 0xe8 + .4byte \address + .endm + + .macro setweatherballtype + .byte 0xe9 + .endm + + .macro tryrecycleitem address + .byte 0xea + .4byte \address + .endm + + .macro settypetoterrain address + .byte 0xeb + .4byte \address + .endm + + .macro pursuitrelated address + .byte 0xec + .4byte \address + .endm + + .macro snatchsetbanks + .byte 0xed + .endm + + .macro removelightscreenreflect + .byte 0xee + .endm + + .macro handleballthrow + .byte 0xef + .endm + + .macro givecaughtmon + .byte 0xf0 + .endm + + .macro trysetcaughtmondexflags address + .byte 0xf1 + .4byte \address + .endm + + .macro displaydexinfo + .byte 0xf2 + .endm + + .macro trygivecaughtmonnick address + .byte 0xf3 + .4byte \address + .endm + + .macro subattackerhpbydmg + .byte 0xf4 + .endm + + .macro removeattackerstatus1 + .byte 0xf5 + .endm + + .macro finishaction + .byte 0xf6 + .endm + + .macro finishturn + .byte 0xf7 + .endm + + .macro trainerslideout bank + .byte 0xf8 + .byte \bank + .endm + +@ various command changed to more readable macros + .macro cancelmultiturnmoves bank + various \bank, VARIOUS_CANCEL_MULTI_TURN_MOVES + .endm + + .macro setmagiccoattarget bank + various \bank, VARIOUS_SET_MAGIC_COAT_TARGET + .endm + + .macro getifcantrunfrombattle bank + various \bank, VARIOUS_IS_RUNNING_IMPOSSIBLE + .endm + + .macro getmovetarget bank + various \bank, VARIOUS_GET_MOVE_TARGET + .endm + + .macro various4 bank + various \bank, 4 + .endm + + .macro resetintrimidatetracebits bank + various \bank, VARIOUS_RESET_INTIMIDATE_TRACE_BITS + .endm + + .macro updatechoicemoveonlvlup bank + various \bank, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP + .endm + + .macro various7 bank + various \bank, 7 + .endm + + .macro various8 bank + various \bank, 8 + .endm + + .macro various9 bank + various \bank, 9 + .endm + + .macro various10 bank + various \bank, 10 + .endm + + .macro various11 bank + various \bank, 11 + .endm + + .macro various12 bank + various \bank, 12 + .endm + + .macro forfeityesnobox bank + various \bank, VARIOUS_EMIT_YESNOBOX + .endm + + .macro various14 bank + various \bank, 14 + .endm + + .macro various15 bank + various \bank, 15 + .endm + + .macro various16 bank + various \bank, 16 + .endm + + .macro various17 bank + various \bank, 17 + .endm + + .macro waitcry bank + various \bank, VARIOUS_WAIT_CRY + .endm + + .macro returnopponentmon1toball bank + various \bank, VARIOUS_RETURN_OPPONENT_MON1 + .endm + + .macro returnopponentmon2toball bank + various \bank, VARIOUS_RETURN_OPPONENT_MON2 + .endm + + .macro various21 bank + various \bank, 21 + .endm + + .macro various22 bank + various \bank, 22 + .endm + + .macro various23 bank + various \bank, 23 + .endm + + .macro various24 bank + various \bank, 24 + .endm + + .macro setoutcomeonteleport bank + various \bank, VARIOUS_SET_TELEPORT_OUTCOME + .endm + + .macro playtrainerdefeatbgm bank + various \bank, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC + .endm + +@ helpful macros + .macro setstatchanger stat, stages, down + setbyte sSTATCHANGER \stat | \stages << 4 | \down << 7 + .endm + + .macro setmoveeffect effect + setbyte cEFFECT_CHOOSER \effect + .endm + + .macro chosenstatus1animation bank, status + chosenstatusanimation \bank 0x0 \status + .endm + + .macro chosenstatus2animation bank, status + chosenstatusanimation \bank 0x1 \status + .endm + + .macro sethword dst, value + setbyte \dst, \value & 0xFF + setbyte \dst + 1, (\value >> 8) & 0xFF + .endm + + .macro setword dst, value + setbyte \dst, \value & 0xFF + setbyte \dst + 1, (\value >> 8) & 0xFF + setbyte \dst + 2, (\value >> 16) & 0xFF + setbyte \dst + 3, (\value >> 24) & 0xFF + .endm + + .macro copybyte dst, src + copyarray \dst, \src, 0x1 + .endm + + .macro copyhword dst, src + copyarray \dst, \src, 0x2 + .endm + + .macro copyword dst, src + copyarray \dst, \src, 0x4 + .endm + + .macro jumpifbytenotequal byte1, byte2, jumpptr + jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr + .endm + + .macro jumpifbyteequal byte1, byte2, jumpptr + jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr + .endm + + .macro jumpifmove move, jumpptr + jumpifhalfword EQUAL, gCurrentMove, \move, \jumpptr + .endm + + .macro jumpifnotmove move, jumpptr + jumpifhalfword NOT_EQUAL, gCurrentMove, \move, \jumpptr + .endm + + .macro jumpifstatus3 bank, status, jumpptr + jumpifstatus3condition \bank, \status, 0x0, \jumpptr + .endm + + .macro jumpifnostatus3 bank, status, jumpptr + jumpifstatus3condition \bank, \status, 0x1, \jumpptr + .endm + + .macro jumpifmovehadnoeffect jumpptr + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr + .endm + + .macro jumpifbattletype flags, jumpptr + jumpifhalfword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr + .endm + + .macro jumpifnotbattletype flags, jumpptr + jumpifhalfword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr + .endm diff --git a/include/macros/contest_ai_script.inc b/include/macros/contest_ai_script.inc new file mode 100644 index 000000000..05d70e351 --- /dev/null +++ b/include/macros/contest_ai_script.inc @@ -0,0 +1,506 @@ +@ Add a positive/negative value to the score of the move being evaluated. + + .macro score score + .byte 0x00 + .byte \score + .endm + +@ turn (AKA "Appeal No.") + + .macro get_turn + .byte 0x01 + .endm + + .macro if_turn_less_than param, addr + .byte 0x02 + .byte \param + .4byte \addr + .endm + + .macro if_turn_more_than param, addr + .byte 0x03 + .byte \param + .4byte \addr + .endm + + .macro if_turn_eq param, addr + .byte 0x04 + .byte \param + .4byte \addr + .endm + + .macro if_turn_not_eq param, addr + .byte 0x05 + .byte \param + .4byte \addr + .endm + +@ audience excitement + + .macro get_excitement + .byte 0x06 + .endm + + .macro if_excitement_less_than param, addr + .byte 0x07 + .byte \param + .4byte \addr + .endm + + .macro if_excitement_more_than param, addr + .byte 0x08 + .byte \param + .4byte \addr + .endm + + .macro if_excitement_eq param, addr + .byte 0x09 + .byte \param + .4byte \addr + .endm + + .macro if_excitement_not_eq param, addr + .byte 0x0A + .byte \param + .4byte \addr + .endm + +@ the order that the user goes in the current turn + + .macro get_user_order + .byte 0x0B + .endm + + .macro if_user_order_less_than param addr + .byte 0x0C + .byte \param + .4byte \addr + .endm + + .macro if_user_order_more_than param addr + .byte 0x0D + .byte \param + .4byte \addr + .endm + + .macro if_user_order_eq param addr + .byte 0x0E + .byte \param + .4byte \addr + .endm + + .macro if_user_order_not_eq param addr + .byte 0x0F + .byte \param + .4byte \addr + .endm + +@ user condition + + .macro get_user_condition + .byte 0x10 + .endm + + .macro if_user_condition_less_than param, addr + .byte 0x11 + .byte \param + .4byte \addr + .endm + + .macro if_user_condition_more_than param, addr + .byte 0x12 + .byte \param + .4byte \addr + .endm + + .macro if_user_condition_eq param, addr + .byte 0x13 + .byte \param + .4byte \addr + .endm + + .macro if_user_condition_not_eq param, addr + .byte 0x14 + .byte \param + .4byte \addr + .endm + +@ 15 +@ 16 +@ 17 +@ 18 +@ 19 +@ 1A +@ 1B +@ 1C +@ 1D +@ 1E + +@ contest type + + .macro get_contest_type + .byte 0x1F + .endm + + .macro if_contest_type_eq param, addr + .byte 0x20 + .byte \param + .4byte \addr + .endm + + .macro if_contest_type_not_eq param, addr + .byte 0x21 + .byte \param + .4byte \addr + .endm + +@ move excitement (change in excitement due to move) + + .macro get_move_excitement + .byte 0x22 + .endm + + .macro if_move_excitement_less_than param, addr + .byte 0x23 + .byte \param + .4byte \addr + .endm + + .macro if_move_excitement_more_than param, addr + .byte 0x24 + .byte \param + .4byte \addr + .endm + + .macro if_move_excitement_eq param, addr + .byte 0x25 + .byte \param + .4byte \addr + .endm + + .macro if_move_excitement_not_eq param, addr + .byte 0x26 + .byte \param + .4byte \addr + .endm + +@ move effect + + .macro get_effect + .byte 0x27 + .endm + + .macro if_effect_eq param, addr + .byte 0x28 + .byte \param + .4byte \addr + .endm + + .macro if_effect_not_eq param, addr + .byte 0x29 + .byte \param + .4byte \addr + .endm + +@ move effect type + + .macro get_effect_type + .byte 0x2A + .endm + + .macro if_effect_type_eq param, addr + .byte 0x2B + .byte \param + .4byte \addr + .endm + + .macro if_effect_type_not_eq param, addr + .byte 0x2C + .byte \param + .4byte \addr + .endm + +@ whether the current move is the most appealing in the user's moveset + + .macro check_most_appealing_move + .byte 0x2D + .endm + + .macro if_most_appealing_move addr + .byte 0x2E + .4byte \addr + .endm + +@ 2F +@ 30 +@ 31 +@ 32 +@ 33 +@ 34 +@ 35 +@ 36 +@ 37 +@ 38 +@ 39 +@ 3A + +@ number of times current move has been used + + .macro get_move_used_count + .byte 0x3B + .endm + + .macro if_move_used_count_less_than param, addr + .byte 0x3C + .byte \param + .4byte \addr + .endm + + .macro if_move_used_count_more_than param, addr + .byte 0x3D + .byte \param + .4byte \addr + .endm + + .macro if_move_used_count_eq param, addr + .byte 0x3E + .byte \param + .4byte \addr + .endm + + .macro if_move_used_count_not_eq param, addr + .byte 0x3F + .byte \param + .4byte \addr + .endm + +@ whether the current move is a combo starter (with another move in the moveset) + + .macro check_combo_starter + .byte 0x40 + .endm + + .macro if_combo_starter addr + .byte 0x41 + .4byte \addr + .endm + + .macro if_not_combo_starter addr + .byte 0x42 + .4byte \addr + .endm + +@ whether the current move is a combo finisher (with another move in the moveset) + + .macro check_combo_finisher + .byte 0x43 + .endm + + .macro if_combo_finisher addr + .byte 0x44 + .4byte \addr + .endm + + .macro if_not_combo_finisher addr + .byte 0x45 + .4byte \addr + .endm + +@ whether the current move would finish a combo + + .macro check_would_finish_combo + .byte 0x46 + .endm + + .macro if_would_finish_combo addr + .byte 0x47 + .4byte \addr + .endm + + .macro if_would_not_finish_combo addr + .byte 0x48 + .4byte \addr + .endm + +@ condition of mon (indexed by order) + + .macro get_condition mon + .byte 0x49 + .byte \mon + .endm + + .macro if_condition_less_than mon, value, addr + .byte 0x4A + .byte \mon + .byte \value + .4byte \addr + .endm + + .macro if_condition_more_than mon, value, addr + .byte 0x4B + .byte \mon + .byte \value + .4byte \addr + .endm + + .macro if_condition_eq mon, value, addr + .byte 0x4C + .byte \mon + .byte \value + .4byte \addr + .endm + + .macro if_condition_not_eq mon, value, addr + .byte 0x4D + .byte \mon + .byte \value + .4byte \addr + .endm + +@ whether the mon used a combo starter move +@ Even though this value is always 1 or 0 (i.e. TRUE/FALSE), +@ there are less-than and greater-than comparison operations for some reason. + + .macro get_used_combo_starter mon + .byte 0x4E + .byte \mon + .endm + + .macro if_used_combo_starter_less_than mon, value, addr + .byte 0x4F + .byte \mon + .byte \value + .4byte \addr + .endm + + .macro if_used_combo_starter_more_than mon, value, addr + .byte 0x50 + .byte \mon + .byte \value + .4byte \addr + .endm + + + .macro if_used_combo_starter_eq mon, value, addr + .byte 0x51 + .byte \mon + .byte \value + .4byte \addr + .endm + + .macro if_used_combo_starter_not_eq mon, value, addr + .byte 0x52 + .byte \mon + .byte \value + .4byte \addr + .endm + +@ whether the mon can make an appeal + + .macro check_can_participate mon + .byte 0x53 + .byte \mon + .endm + + .macro if_can_participate mon, addr + .byte 0x54 + .byte \mon + .4byte \addr + .endm + + .macro if_cannot_participate mon, addr + .byte 0x55 + .byte \mon + .4byte \addr + .endm + +@ 56 +@ 57 + + .macro contest_58 param addr + .byte 0x58 + .byte \param + .4byte \addr + .endm + +@ 59 +@ 5A +@ 5B +@ 5C +@ 5D +@ 5E +@ 5F +@ 60 +@ 61 +@ 62 +@ 63 +@ 64 +@ 65 +@ 66 +@ 67 +@ 68 +@ 69 +@ 6A +@ 6B +@ 6C +@ 6D +@ 6E +@ 6F +@ 70 +@ 71 +@ 72 +@ 73 +@ 74 +@ 75 +@ 76 +@ 77 +@ 78 +@ 79 +@ 7A +@ 7B +@ 7C + + .macro if_random param addr + .byte 0x7D + .byte \param + .4byte \addr + .endm + +@ 7E + + .macro jump addr + .byte 0x7F + .4byte \addr + .endm + + .macro call addr + .byte 0x80 + .4byte \addr + .endm + + .macro end + .byte 0x81 + .endm + + .macro check_user_has_exciting_move + .byte 0x82 + .endm + + .macro if_user_has_exciting_move addr + .byte 0x83 + .4byte \addr + .endm + + .macro if_user_doesnt_have_exciting_move addr + .byte 0x84 + .4byte \addr + .endm + +@ 85 +@ 86 + + .macro if_effect_in_user_moveset param addr + .byte 0x87 + .2byte \param + .4byte \addr + .endm diff --git a/include/macros/ec.inc b/include/macros/ec.inc new file mode 100644 index 000000000..d3fd45c2f --- /dev/null +++ b/include/macros/ec.inc @@ -0,0 +1,8 @@ + + .macro ec_duplicates count + .2byte 0xff00 + \count + .endm + + .macro ec_words_by_letter label + .2byte (gEasyChatWordsByLetter_\label - gEasyChatWordsAlphabetized) / 2 + .endm diff --git a/include/macros/event.inc b/include/macros/event.inc new file mode 100644 index 000000000..fcbd3a055 --- /dev/null +++ b/include/macros/event.inc @@ -0,0 +1,1481 @@ + @ Does nothing. + .macro nop + .byte 0x00 + .endm + + @ Does nothing. + .macro nop1 + .byte 0x01 + .endm + + @ Terminates script execution. + .macro end + .byte 0x02 + .endm + + @ Jumps back to after the last-executed call statement, and continues script execution from there. + .macro return + .byte 0x03 + .endm + + @ Jumps to destination and continues script execution from there. The location of the calling script is remembered and can be returned to later. + .macro call destination + .byte 0x04 + .4byte \destination + .endm + + @ Jumps to destination and continues script execution from there. + .macro goto destination + .byte 0x05 + .4byte \destination + .endm + + @ If the result of the last comparison matches condition (see Comparison operators), jumps to destination and continues script execution from there. + .macro goto_if condition, destination + .byte 0x06 + .byte \condition + .4byte \destination + .endm + + @ If the result of the last comparison matches condition (see Comparison operators), calls destination. + .macro call_if condition, destination + .byte 0x07 + .byte \condition + .4byte \destination + .endm + + @ Jumps to the standard function at index function. + .macro gotostd function + .byte 0x08 + .byte \function + .endm + + @ Calls the standard function at index function. + .macro callstd function + .byte 0x09 + .byte \function + .endm + + @ If the result of the last comparison matches condition (see Comparison operators), jumps to the standard function at index function. + .macro gotostd_if condition, function + .byte 0x0a + .byte \condition + .byte \function + .endm + + @ If the result of the last comparison matches condition (see Comparison operators), calls the standard function at index function. + .macro callstd_if condition, function + .byte 0x0b + .byte \condition + .byte \function + .endm + + @ Executes a script stored in a default RAM location. + .macro gotoram + .byte 0x0c + .endm + + @ Terminates script execution and "resets the script RAM". + .macro killscript + .byte 0x0d + .endm + + @ Sets some status related to Mystery Event. + .macro setmysteryeventstatus value + .byte 0x0e + .byte \value + .endm + + @ Sets the specified script bank to value. + .macro loadword destination, value + .byte 0x0f + .byte \destination + .4byte \value + .endm + + @ Sets the specified script bank to value. + .macro loadbyte destination, value + .byte 0x10 + .byte \destination + .byte \value + .endm + + @ Sets the byte at offset to value. + .macro writebytetoaddr value, offset + .byte 0x11 + .byte \value + .4byte \offset + .endm + + @ Copies the byte value at source into the specified script bank. + .macro loadbytefromaddr destination, source + .byte 0x12 + .byte \destination + .4byte \source + .endm + + @ Not sure. Judging from XSE's description I think it takes the least-significant byte in bank source and writes it to destination. + .macro setptrbyte source, destination + .byte 0x13 + .byte \source + .4byte \destination + .endm + + @ Copies the contents of bank source into bank destination. + .macro copylocal destination, source + .byte 0x14 + .byte \destination + .byte \source + .endm + + @ Copies the byte at source to destination, replacing whatever byte was previously there. + .macro copybyte destination, source + .byte 0x15 + .4byte \destination + .4byte \source + .endm + + @ Changes the value of destination to value. + .macro setvar destination, value + .byte 0x16 + .2byte \destination + .2byte \value + .endm + + @ Changes the value of destination by adding value to it. Overflow is not prevented (0xFFFF + 1 = 0x0000). + .macro addvar destination, value + .byte 0x17 + .2byte \destination + .2byte \value + .endm + + @ Changes the value of destination by subtracting value to it. Overflow is not prevented (0x0000 - 1 = 0xFFFF). + .macro subvar destination, value + .byte 0x18 + .2byte \destination + .2byte \value + .endm + + @ Copies the value of source into destination. + .macro copyvar destination, source + .byte 0x19 + .2byte \destination + .2byte \source + .endm + + @ If source is not a variable, then this function acts like setvar. Otherwise, it acts like copyvar. + .macro setorcopyvar destination, source + .byte 0x1a + .2byte \destination + .2byte \source + .endm + + @ Compares the values of script banks a and b, after forcing the values to bytes. + .macro compare_local_to_local byte1, byte2 + .byte 0x1b + .byte \byte1 + .byte \byte2 + .endm + + @ Compares the least-significant byte of the value of script bank a to a fixed byte value (b). + .macro compare_local_to_value a, b + .byte 0x1c + .byte \a + .byte \b + .endm + + @ Compares the least-significant byte of the value of script bank a to the byte located at offset b. + .macro compare_local_to_addr a, b + .byte 0x1d + .byte \a + .4byte \b + .endm + + @ Compares the byte located at offset a to the least-significant byte of the value of script bank b. + .macro compare_addr_to_local a, b + .byte 0x1e + .4byte \a + .byte \b + .endm + + @ Compares the byte located at offset a to a fixed byte value (b). + .macro compare_addr_to_value a, b + .byte 0x1f + .4byte \a + .byte \b + .endm + + @ Compares the byte located at offset a to the byte located at offset b. + .macro compare_addr_to_addr a, b + .byte 0x20 + .4byte \a + .4byte \b + .endm + + @ Compares the value of `var` to a fixed word value (b). + .macro compare_var_to_value var, value + .byte 0x21 + .2byte \var + .2byte \value + .endm + + @ Compares the value of `var1` to the value of `var2`. + .macro compare_var_to_var var1, var2 + .byte 0x22 + .2byte \var1 + .2byte \var2 + .endm + + @ Generic compare macro which attempts to deduce argument types based on their values + @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers + .macro compare arg1, arg2 + .if (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && (((\arg2) >> 12) == 4 || ((\arg2) >> 12) == 8) + compare_var_to_var (\arg1), (\arg2) + .elseif (((\arg1) >> 12) == 4 || ((\arg1) >> 12) == 8) && ((\arg2) >= -0xFFFF && (\arg2) <= 0xFFFF) + compare_var_to_value (\arg1), ((\arg2) & 0xFFFF) + .else + .error "Invalid arguments for 'compare'" + .endif + .endm + + @ Calls the native C function stored at `func`. + .macro callnative func + .byte 0x23 + .4byte \func + .endm + + @ Replaces the script with the function stored at `func`. Execution returns to the bytecode script when func returns TRUE. + .macro gotonative func + .byte 0x24 + .4byte \func + .endm + + @ Calls a special function; that is, a function designed for use by scripts and listed in a table of pointers. + .macro special function + .byte 0x25 + .2byte SPECIAL_\function + .endm + + @ Calls a special function. That function's output (if any) will be written to the variable you specify. + .macro specialvar output, function + .byte 0x26 + .2byte \output + .2byte SPECIAL_\function + .endm + + @ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang). + .macro waitstate + .byte 0x27 + .endm + + @ Blocks script execution for time (frames? milliseconds?). + .macro delay time + .byte 0x28 + .2byte \time + .endm + + @ Sets a to 1. + .macro setflag a + .byte 0x29 + .2byte \a + .endm + + @ Sets a to 0. + .macro clearflag a + .byte 0x2a + .2byte \a + .endm + + @ Compares a to 1. + .macro checkflag a + .byte 0x2b + .2byte \a + .endm + + @ Initializes the RTC`s local time offset to the given hour and minute. In FireRed, this command is a nop. + .macro initclock hour, minute + .byte 0x2c + .2byte \hour + .2byte \minute + .endm + + @ Runs time based events. In FireRed, this command is a nop. + .macro dodailyevents + .byte 0x2d + .endm + + @ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG, this command sets those variables to zero. + .macro gettime + .byte 0x2e + .endm + + @ Plays the specified (sound_number) sound. Only one sound may play at a time, with newer ones interrupting older ones. + .macro playse sound_number + .byte 0x2f + .2byte \sound_number + .endm + + @ Blocks script execution until the currently-playing sound (triggered by playse) finishes playing. + .macro waitse + .byte 0x30 + .endm + + @ Plays the specified (fanfare_number) fanfare. + .macro playfanfare fanfare_number + .byte 0x31 + .2byte \fanfare_number + .endm + + @ Blocks script execution until all currently-playing fanfares finish. + .macro waitfanfare + .byte 0x32 + .endm + + @ Plays the specified (song_number) song. The byte is apparently supposed to be 0x00. + .macro playbgm song_number, unknown + .byte 0x33 + .2byte \song_number + .byte \unknown + .endm + + @ Saves the specified (song_number) song to be played later. + .macro savebgm song_number + .byte 0x34 + .2byte \song_number + .endm + + @ Crossfades the currently-playing song into the map's default song. + .macro fadedefaultbgm + .byte 0x35 + .endm + + @ Crossfades the currently-playng song into the specified (song_number) song. + .macro fadenewbgm song_number + .byte 0x36 + .2byte \song_number + .endm + + @ Fades out the currently-playing song. + .macro fadeoutbgm speed + .byte 0x37 + .byte \speed + .endm + + @ Fades the previously-playing song back in. + .macro fadeinbgm speed + .byte 0x38 + .byte \speed + .endm + + @ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, then the player will instead be sent to (X, Y) on the map. + .macro warp map, warp, X, Y + .byte 0x39 + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Clone of warp that does not play a sound effect. + .macro warpsilent map, warp, X, Y + .byte 0x3a + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Clone of warp that plays a door opening animation before stepping upwards into it. + .macro warpdoor map, warp, X, Y + .byte 0x3b + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Warps the player to another map using a hole animation. + .macro warphole map + .byte 0x3c + map \map + .endm + + @ Clone of warp that uses a teleport effect. It is apparently only used in R/S/E. + .macro warpteleport map, warp, X, Y + .byte 0x3d + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Sets the warp destination to be used later. + .macro setwarp map, warp, X, Y + .byte 0x3e + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. Useful when a map has warps that need to go to script-controlled locations (i.e. elevators). + .macro setdynamicwarp map, warp, X, Y + .byte 0x3f + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Sets the destination that diving or emerging from a dive will take the player to. + .macro setdivewarp map, warp, X, Y + .byte 0x40 + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Sets the destination that falling into a hole will take the player to. + .macro setholewarp map, warp, X, Y + .byte 0x41 + map \map + .byte \warp + .2byte \X + .2byte \Y + .endm + + @ Retrieves the player's zero-indexed X- and Y-coordinates in the map, and stores them in the specified variables. + .macro getplayerxy X, Y + .byte 0x42 + .2byte \X + .2byte \Y + .endm + + @ Retrieves the number of Pokemon in the player's party, and stores that number in variable 0x800D (LASTRESULT). + .macro getpartysize + .byte 0x43 + .endm + + @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and variable 0x800D (LASTRESULT) will be set to 0x0001; otherwise, LASTRESULT is set to 0x0000. + .macro giveitem index, quantity + .byte 0x44 + .2byte \index + .2byte \quantity + .endm + + @ Removes quantity of item index from the player's Bag. + .macro takeitem index, quantity + .byte 0x45 + .2byte \index + .2byte \quantity + .endm + + @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. + .macro checkitemspace index, quantity + .byte 0x46 + .2byte \index + .2byte \quantity + .endm + + @ Checks if the player has quantity or more of item index in their Bag. Sets variable 0x800D (LASTRESULT) to 0x0001 if the player has enough of the item, or 0x0000 if they have fewer than quantity of the item. + .macro checkitem index, quantity + .byte 0x47 + .2byte \index + .2byte \quantity + .endm + + @ Checks which Bag pocket the specified (index) item belongs in, and writes the value to variable 0x800D (LASTRESULT). This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). + .macro checkitemtype index + .byte 0x48 + .2byte \index + .endm + + @ Adds a quantity amount of item index to the player's PC. Both arguments can be variables. + .macro givepcitem index, quantity + .byte 0x49 + .2byte \index + .2byte \quantity + .endm + + @ Checks for quantity amount of item index in the player's PC. Both arguments can be variables. + .macro checkpcitem index, quantity + .byte 0x4a + .2byte \index + .2byte \quantity + .endm + + @ Adds decoration to the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) + .macro givedecoration decoration + .byte 0x4b + .2byte \decoration + .endm + + @ Removes a decoration from the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) + .macro takedecoration decoration + .byte 0x4c + .2byte \decoration + .endm + + @ Checks for decoration in the player's PC. In FireRed, this command is a nop. (The argument is read, but not used for anything.) + .macro checkdecor decoration + .byte 0x4d + .2byte \decoration + .endm + + @ Checks if the player has enough space in their PC to hold decoration. Sets variable 0x800D (LASTRESULT) to 0x0001 if there is room, or 0x0000 is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.) + .macro checkdecorspace decoration + .byte 0x4e + .2byte \decoration + .endm + + @ Applies the movement data at movements to the specified (index) Object event. Also closes any standard message boxes that are still open. + @ This command in fact uses variables to access the Object event ID. So, for example, if you setvar 0x8000 to 0x3, and then use applymovementpos 0x8000 @move1, Object event 3 will have the movements at @move1 applied to them. + .macro applymovement index, movements, mapGroup, mapNum + .ifb \mapGroup + .byte 0x4f + .2byte \index + .4byte \movements + .else + .byte 0x50 + .2byte \index + .4byte \movements + .byte \mapGroup + .byte \mapNum + .endif + .endm + + @ Blocks script execution until the movements being applied to the specified (index) Object event finish. If the specified Object event is 0x0000, then the command will block script execution until all Object events affected by applymovement finish their movements. If the specified Object event is not currently being manipulated with applymovement, then this command does nothing. + .macro waitmovement index, mapBank, mapNum + .ifb \mapBank + .byte 0x51 + .2byte \index + .else + .byte 0x52 + .2byte \index + .byte \mapBank + .byte \mapNum + .endif + .endm + + @ Attempts to hide the specified (local_ID, a local ID) Object event on the specified map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. + @ If no map is specified, then the current map is used + .macro removeobject localId, mapGroup, mapNum + .ifb \mapGroup + .byte 0x53 + .2byte \localId + .else + .byte 0x54 + .2byte \localId + .byte \mapGroup + .byte \mapNum + .endif + .endm + + .macro addobject localId, mapGroup, mapNum + .ifb \mapGroup + .byte 0x55 + .2byte \localId + .else + .byte 0x56 + .2byte \localId + .byte \mapGroup + .byte \mapNum + .endif + .endm + + @ Sets the specified (index) Object's position on the current map. + .macro setobjectxy index, x, y + .byte 0x57 + .2byte \index + .2byte \x + .2byte \y + .endm + + .macro showobjectat index, map + .byte 0x58 + .2byte \index + map \map + .endm + + .macro hideobjectat index, map + .byte 0x59 + .2byte \index + map \map + .endm + + @ If the script was called by a Object event, then that Object will turn to face toward the tile that the player is stepping off of. + .macro faceplayer + .byte 0x5a + .endm + + .macro turnobject index, direction + .byte 0x5b + .2byte \index + .byte \direction + .endm + + @ If the Trainer flag for Trainer index is not set, this command does absolutely nothing. + .macro trainerbattle type, trainer, word, pointer1, pointer2, pointer3, pointer4 + .byte 0x5c + .byte \type + .2byte \trainer + .2byte \word + .if \type == 0 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .elseif \type == 1 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .4byte \pointer3 @ event script + .elseif \type == 2 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .4byte \pointer3 @ event script + .elseif \type == 3 + .4byte \pointer1 @ text + .elseif \type == 4 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .4byte \pointer3 @ text + .elseif \type == 5 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .elseif \type == 6 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .4byte \pointer3 @ text + .4byte \pointer4 @ event script + .elseif \type == 7 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .4byte \pointer3 @ text + .elseif \type == 8 + .4byte \pointer1 @ text + .4byte \pointer2 @ text + .4byte \pointer3 @ text + .4byte \pointer4 @ event script + .endif + .endm + + @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this command behind-the-scenes), and blocks script execution until the battle finishes. + .macro trainerbattlebegin + .byte 0x5d + .endm + + @ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) + .macro gotopostbattlescript + .byte 0x5e + .endm + + @ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c) + .macro gotobeatenscript + .byte 0x5f + .endm + + @ Compares Flag (trainer + 0x500) to 1. (If the flag is set, then the trainer has been defeated by the player.) + .macro checktrainerflag trainer + .byte 0x60 + .2byte \trainer + .endm + + @ Sets Flag (trainer + 0x500). + .macro settrainerflag trainer + .byte 0x61 + .2byte \trainer + .endm + + @ Clears Flag (trainer + 0x500). + .macro cleartrainerflag trainer + .byte 0x62 + .2byte \trainer + .endm + + .macro setobjectxyperm index, x, y + .byte 0x63 + .2byte \index + .2byte \x + .2byte \y + .endm + + .macro moveobjectoffscreen index + .byte 0x64 + .2byte \index + .endm + + .macro setobjectmovementtype word, byte + .byte 0x65 + .2byte \word + .byte \byte + .endm + + @ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the box and its text have been fully drawn. + .macro waitmessage + .byte 0x66 + .endm + + @ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.) + .macro message text + .byte 0x67 + .4byte \text + .endm + + @ Closes the current message box. + .macro closemessage + .byte 0x68 + .endm + + @ Ceases movement for all Objects on-screen. + .macro lockall + .byte 0x69 + .endm + + @ If the script was called by an Object, then that Object's movement will cease. + .macro lock + .byte 0x6a + .endm + + @ Resumes normal movement for all Objects on-screen, and closes any standard message boxes that are still open. + .macro releaseall + .byte 0x6b + .endm + + @ If the script was called by an Object, then that Object's movement will resume. This command also closes any standard message boxes that are still open. + .macro release + .byte 0x6c + .endm + + @ Blocks script execution until the player presses any key. + .macro waitbuttonpress + .byte 0x6d + .endm + + @ Displays a YES/NO multichoice box at the specified coordinates, and blocks script execution until the user makes a selection. Their selection is stored in variable 0x800D (LASTRESULT); 0x0000 for "NO" or if the user pressed B, and 0x0001 for "YES". + .macro yesnobox x, y + .byte 0x6e + .byte \x + .byte \y + .endm + + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + .macro multichoice x, y, list, b + .byte 0x6f + .byte \x + .byte \y + .byte \list + .byte \b + .endm + + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If b is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. + .macro multichoicedefault x, y, list, default, b + .byte 0x70 + .byte \x + .byte \y + .byte \list + .byte \default + .byte \b + .endm + + @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box. + .macro multichoicegrid x, y, list, per_row, B + .byte 0x71 + .byte \x + .byte \y + .byte \list + .byte \per_row + .byte \B + .endm + + .macro drawbox byte1, byte2, byte3, byte4 + .byte 0x72 + .byte \byte1 + .byte \byte2 + .byte \byte3 + .byte \byte4 + .endm + + .macro erasebox byte1, byte2, byte3, byte4 + .byte 0x73 + .byte \byte1 + .byte \byte2 + .byte \byte3 + .byte \byte4 + .endm + + .macro drawboxtext byte1, byte2, byte3, byte4 + .byte 0x74 + .byte \byte1 + .byte \byte2 + .byte \byte3 + .byte \byte4 + .endm + + @ Displays a box containing the front sprite for the specified (species) Pokemon species. + .macro drawmonpic species, x, y + .byte 0x75 + .2byte \species + .byte \x + .byte \y + .endm + + @ Hides all boxes displayed with drawmonpic. + .macro erasemonpic + .byte 0x76 + .endm + + @ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.) + .macro drawcontestwinner a + .byte 0x77 + .byte \a + .endm + + @ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille characters. + .macro braillemessage text + .byte 0x78 + .4byte \text + .endm + + @ Gives the player one of the specified (species) Pokemon at level level holding item. The unknown arguments should all be zeroes. + .macro givemon species, level, item, unknown1, unknown2, unknown3 + .byte 0x79 + .2byte \species + .byte \level + .2byte \item + .4byte \unknown1 + .4byte \unknown2 + .byte \unknown3 + .endm + + .macro giveegg species + .byte 0x7a + .2byte \species + .endm + + .macro setmonmove index, slot, move + .byte 0x7b + .byte \index + .byte \slot + .2byte \move + .endm + + @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species. + .macro checkpartymove index + .byte 0x7c + .2byte \index + .endm + + @ Writes the name of the Pokemon at index species to the specified buffer. + .macro bufferspeciesname out, species + .byte 0x7d + .byte \out + .2byte \species + .endm + + @ Writes the name of the species of the first Pokemon in the player's party to the specified buffer. + .macro bufferleadmonspeciesname out + .byte 0x7e + .byte \out + .endm + + @ Writes the nickname of the Pokemon in slot slot (zero-indexed) of the player's party to the specified buffer. If an empty or invalid slot is specified, ten spaces ("") are written to the buffer. + .macro bufferpartymonnick out, slot + .byte 0x7f + .byte \out + .2byte \slot + .endm + + @ Writes the name of the item at index item to the specified buffer. If the specified index is larger than the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead. + .macro bufferitemname out, item + .byte 0x80 + .byte \out + .2byte \item + .endm + + @ Writes the name of the decoration at index decoration to the specified buffer. In FireRed, this command is a nop. + .macro bufferdecorationname out, decoration + .byte 0x81 + .byte \out + .2byte \decoration + .endm + + @ Writes the name of the move at index move to the specified buffer. + .macro buffermovename out, move + .byte 0x82 + .byte \out + .2byte \move + .endm + + @ Converts the value of input to a decimal string, and writes that string to the specified buffer. + .macro buffernumberstring out, input + .byte 0x83 + .byte \out + .2byte \input + .endm + + @ Writes the standard string identified by index to the specified buffer. This command has no protections in place at all, so specifying an invalid standard string (e.x. 0x2B) can and usually will cause data corruption. + .macro bufferstdstring out, index + .byte 0x84 + .byte \out + .2byte \index + .endm + + @ Copies the string at offset to the specified buffer. + .macro bufferstring out, offset + .byte 0x85 + .byte \out + .4byte \offset + .endm + + @ Opens the Pokemart system, offering the specified products for sale. + .macro pokemart products + .byte 0x86 + .4byte \products + .endm + + @ Opens the Pokemart system and treats the list of items as decorations. + .macro pokemartdecoration products + .byte 0x87 + .4byte \products + .endm + + @ Apparent clone of pokemartdecoration. + .macro pokemartdecoration2 products + .byte 0x88 + .4byte \products + .endm + + @ Starts up the slot machine minigame. + .macro playslotmachine word + .byte 0x89 + .2byte \word + .endm + + @ Sets a berry tree's specific berry and growth stage. In FireRed, this command is a nop. + .macro setberrytree tree_id, berry, growth_stage + .byte 0x8a + .byte \tree_id + .byte \berry + .byte \growth_stage + .endm + + @ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01. + .macro choosecontestmon + .byte 0x8b + .endm + + @ Starts a contest. In FireRed, this command is a nop. + .macro startcontest + .byte 0x8c + .endm + + @ Shows the results of a contest. In FireRed, this command is a nop. + .macro showcontestresults + .byte 0x8d + .endm + + @ Starts a contest over a link connection. In FireRed, this command is a nop. + .macro contestlinktransfer + .byte 0x8e + .endm + + @ Stores a random integer between 0 and limit in variable 0x800D (LASTRESULT). + .macro random limit + .byte 0x8f + .2byte \limit + .endm + + @ If check is 0x00, this command adds value to the player's money. + .macro givemoney value, check + .byte 0x90 + .4byte \value + .byte \check + .endm + + @ If check is 0x00, this command subtracts value from the player's money. + .macro takemoney value, check + .byte 0x91 + .4byte \value + .byte \check + .endm + + @ If check is 0x00, this command will check if the player has value or more money; script variable 0x800D (LASTRESULT) is set to 0x0001 if the player has enough money, or 0x0000 if the do not. + .macro checkmoney value, check + .byte 0x92 + .4byte \value + .byte \check + .endm + + @ Spawns a secondary box showing how much money the player has. + .macro showmoneybox x, y + .byte 0x93 + .byte \x + .byte \y + .endm + + @ Hides the secondary box spawned by showmoney. + .macro hidemoneybox x, y + .byte 0x94 + .byte \x + .byte \y + .endm + + @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. + .macro updatemoneybox x, y + .byte 0x95 + .byte \x + .byte \y + .endm + + @ Gets the price reduction for the index given. In FireRed, this command is a nop. + .macro getpricereduction index + .byte 0x96 + .2byte \index + .endm + + @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. + .macro fadescreen effect + .byte 0x97 + .byte \effect + .endm + + @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. Other modes may exist. + .macro fadescreenspeed effect, speed + .byte 0x98 + .byte \effect + .byte \speed + .endm + + .macro setflashradius word + .byte 0x99 + .2byte \word + .endm + + .macro animateflash byte + .byte 0x9a + .byte \byte + .endm + + .macro messageautoscroll pointer + .byte 0x9b + .4byte \pointer + .endm + + @ Executes the specified field move animation. + .macro dofieldeffect animation + .byte 0x9c + .2byte \animation + .endm + + @ Sets up the field effect argument argument with the value value. + .macro setfieldeffectargument argument, param + .byte 0x9d + .byte \argument + .2byte \param + .endm + + @ Blocks script execution until all playing field move animations complete. + .macro waitfieldeffect animation + .byte 0x9e + .2byte \animation + .endm + + @ Sets which healing place the player will return to if all of the Pokemon in their party faint. + .macro setrespawn heallocation + .byte 0x9f + .2byte \heallocation + .endm + + @ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT. + .macro checkplayergender + .byte 0xa0 + .endm + + @ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes. + .macro playmoncry species, effect + .byte 0xa1 + .2byte \species + .2byte \effect + .endm + + @ Changes the metatile at (x, y) on the current map. + .macro setmetatile x, y, metatile_number, tile_attrib + .byte 0xa2 + .2byte \x + .2byte \y + .2byte \metatile_number + .2byte \tile_attrib + .endm + + @ Queues a weather change to the default weather for the map. + .macro resetweather + .byte 0xa3 + .endm + + @ Queues a weather change to type weather. + .macro setweather type + .byte 0xa4 + .2byte \type + .endm + + @ Executes the weather change queued with resetweather or setweather. The current weather will smoothly fade into the queued weather. + .macro doweather + .byte 0xa5 + .endm + + @ This command manages cases in which maps have tiles that change state when stepped on (specifically, cracked/breakable floors). + .macro setstepcallback subroutine + .byte 0xa6 + .byte \subroutine + .endm + + .macro setmaplayoutindex index + .byte 0xa7 + .2byte \index + .endm + + .macro setobjectpriority index, map, priority + .byte 0xa8 + .2byte \index + map \map + .byte \priority + .endm + + .macro resetobjectpriority index, map + .byte 0xa9 + .2byte \index + map \map + .endm + + .macro createvobject sprite, byte2, x, y, elevation, direction + .byte 0xaa + .byte \sprite + .byte \byte2 + .2byte \x + .2byte \y + .byte \elevation + .byte \direction + .endm + + .macro turnvobject index, direction + .byte 0xab + .byte \index + .byte \direction + .endm + + @ Opens the door metatile at (X, Y) with an animation. + .macro opendoor x, y + .byte 0xac + .2byte \x + .2byte \y + .endm + + @ Closes the door metatile at (X, Y) with an animation. + .macro closedoor x, y + .byte 0xad + .2byte \x + .2byte \y + .endm + + @ Waits for the door animation started with opendoor or closedoor to finish. + .macro waitdooranim + .byte 0xae + .endm + + @ Sets the door tile at (x, y) to be open without an animation. + .macro setdooropen x, y + .byte 0xaf + .2byte \x + .2byte \y + .endm + + @ Sets the door tile at (x, y) to be closed without an animation. + .macro setdoorclosed x, y + .byte 0xb0 + .2byte \x + .2byte \y + .endm + + @ In FireRed, this command is a nop. + .macro addelevmenuitem + .byte 0xb1 + .endm + + @ In FireRed and Emerald, this command is a nop. + .macro showelevmenu + .byte 0xb2 + .endm + + .macro checkcoins out + .byte 0xb3 + .2byte \out + .endm + + .macro givecoins count + .byte 0xb4 + .2byte \count + .endm + + .macro takecoins count + .byte 0xb5 + .2byte \count + .endm + + @ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. + .macro setwildbattle species, level, item + .byte 0xb6 + .2byte \species + .byte \level + .2byte \item + .endm + + @ Starts a wild battle against the Pokemon generated by setwildbattle. Blocks script execution until the battle finishes. + .macro dowildbattle + .byte 0xb7 + .endm + + .macro setvaddress long, word + .byte 0xb8 + .4byte \long + .2byte \word + .endm + + .macro vgoto pointer + .byte 0xb9 + .4byte \pointer + .endm + + .macro vcall pointer + .byte 0xba + .4byte \pointer + .endm + + .macro vgoto_if byte, pointer + .byte 0xbb + .byte \byte + .4byte \pointer + .endm + + .macro vcall_if byte, pointer + .byte 0xbc + .byte \byte + .4byte \pointer + .endm + + .macro vmessage pointer + .byte 0xbd + .4byte \pointer + .endm + + .macro vloadptr pointer + .byte 0xbe + .4byte \pointer + .endm + + .macro vbufferstring byte, pointer + .byte 0xbf + .byte \byte + .4byte \pointer + .endm + + @ Spawns a secondary box showing how many Coins the player has. + .macro showcoinsbox x, y + .byte 0xc0 + .byte \x + .byte \y + .endm + + @ Hides the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. + .macro hidecoinsbox x, y + .byte 0xc1 + .byte \x + .byte \y + .endm + + @ Updates the secondary box spawned by showcoins. It consumes its arguments but doesn't use them. + .macro updatecoinsbox x, y + .byte 0xc2 + .byte \x + .byte \y + .endm + + @ Increases the value of the specified game stat by 1. The stat's value will not be allowed to exceed 0x00FFFFFF. + .macro incrementgamestat stat + .byte 0xc3 + .byte \stat + .endm + + @ Sets the destination that using an Escape Rope or Dig will take the player to. + .macro setescapewarp map, warp, x, y + .byte 0xc4 + map \map + .byte \warp + .2byte \x + .2byte \y + .endm + + @ Blocks script execution until cry finishes. + .macro waitmoncry + .byte 0xc5 + .endm + + @ Writes the name of the specified (box) PC box to the specified buffer. + .macro bufferboxname out, box + .byte 0xc6 + .byte \out + .2byte \box + .endm + + @ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 0xFF resets the color to the default for the current OW's gender, and all other values produce black text. + .macro textcolor color + .byte 0xc7 + .byte \color + .endm + + @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened. + .macro loadhelp pointer + .byte 0xc8 + .4byte \pointer + .endm + + @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom of the screen when the Main Menu is opened. + .macro unloadhelp + .byte 0xc9 + .endm + + @ After using this command, all standard message boxes will use the signpost frame. + .macro signmsg + .byte 0xca + .endm + + @ Ends the effects of signmsg, returning message box frames to normal. + .macro normalmsg + .byte 0xcb + .endm + + @ Compares the value of a hidden variable to a dword. + .macro comparehiddenvar a, value + .byte 0xcc + .byte \a + .4byte \value + .endm + +@ Supplementary + + .macro goto_if_trainer_not_defeated opponent, dest + checktrainerflag \opponent + goto_if 0, \dest + .endm + + .macro goto_if_trainer_defeated opponent, dest + checktrainerflag \opponent + goto_if 1, \dest + .endm + + .macro call_if_trainer_not_defeated opponent, dest + checktrainerflag \opponent + call_if 0, \dest + .endm + + .macro call_if_trainer_defeated opponent, dest + checktrainerflag \opponent + call_if 1, \dest + .endm + + .macro goto_if_unset flag, dest + checkflag \flag + goto_if 0, \dest + .endm + + .macro goto_if_set flag, dest + checkflag \flag + goto_if 1, \dest + .endm + + .macro goto_if_lt dest @ LESS THAN + goto_if 0, \dest + .endm + + .macro goto_if_eq dest @ EQUAL + goto_if 1, \dest + .endm + + .macro goto_if_gt dest @ GREATER THAN + goto_if 2, \dest + .endm + + .macro goto_if_le dest @ LESS THAN OR EQUAL + goto_if 3, \dest + .endm + + .macro goto_if_ge dest @ GREATER THAN OR EQUAL + goto_if 4, \dest + .endm + + .macro goto_if_ne dest @ NOT EQUAL + goto_if 5, \dest + .endm + + .macro call_if_unset flag, dest + checkflag \flag + call_if 0, \dest + .endm + + .macro call_if_set flag, dest + checkflag \flag + call_if 1, \dest + .endm + + .macro call_if_lt dest @ LESS THAN + call_if 0, \dest + .endm + + .macro call_if_eq dest @ EQUAL + call_if 1, \dest + .endm + + .macro call_if_gt dest @ GREATER THAN + call_if 2, \dest + .endm + + .macro call_if_le dest @ LESS THAN OR EQUAL + call_if 3, \dest + .endm + + .macro call_if_ge dest @ GREATER THAN OR EQUAL + call_if 4, \dest + .endm + + .macro call_if_ne dest @ NOT EQUAL + call_if 5, \dest + .endm + + .macro switch var + copyvar VAR_SPECIAL_0, \var + .endm + + .macro case condition, dest + compare_var_to_value VAR_SPECIAL_0, \condition + goto_if_eq \dest + .endm + + .macro msgbox text, type=4 + loadword 0, \text + callstd \type + .endm + + @ Message box types + MSGBOX_YESNO = 5 + + YES = 1 + NO = 0 + + .macro giveitem_std item, amount=1, function=0 + setorcopyvar VAR_SPECIAL_0, \item + setorcopyvar VAR_SPECIAL_1, \amount + callstd \function + .endm + + .macro givedecoration_std decoration + setorcopyvar VAR_SPECIAL_0, \decoration + callstd 7 + .endm diff --git a/include/macros/field_effect_script.inc b/include/macros/field_effect_script.inc new file mode 100644 index 000000000..d5895b0ef --- /dev/null +++ b/include/macros/field_effect_script.inc @@ -0,0 +1,42 @@ + .macro loadtiles address + .byte 0 + .4byte \address + .endm + + .macro loadfadedpal address + .byte 1 + .4byte \address + .endm + + .macro loadpal address + .byte 2 + .4byte \address + .endm + + .macro callnative address + .byte 3 + .4byte \address + .endm + + .macro end + .byte 4 + .endm + + .macro loadgfx_callnative tiles_address, palette_address, function_address + .byte 5 + .4byte \tiles_address + .4byte \palette_address + .4byte \function_address + .endm + + .macro loadtiles_callnative tiles_address, function_address + .byte 6 + .4byte \tiles_address + .4byte \function_address + .endm + + .macro loadfadedpal_callnative palette_address, function_address + .byte 7 + .4byte \palette_address + .4byte \function_address + .endm diff --git a/include/macros/function.inc b/include/macros/function.inc new file mode 100644 index 000000000..67fb373a8 --- /dev/null +++ b/include/macros/function.inc @@ -0,0 +1,29 @@ + .macro arm_func_start name + .align 2, 0 + .global \name + .arm + .type \name, function + .endm + + .macro arm_func_end name + .size \name, .-\name + .endm + + .macro thumb_func_start name + .align 2, 0 + .global \name + .thumb + .thumb_func + .type \name, function + .endm + + .macro non_word_aligned_thumb_func_start name + .global \name + .thumb + .thumb_func + .type \name, function + .endm + + .macro thumb_func_end name + .size \name, .-\name + .endm diff --git a/include/macros/m4a.inc b/include/macros/m4a.inc new file mode 100644 index 000000000..6c5abc09b --- /dev/null +++ b/include/macros/m4a.inc @@ -0,0 +1,13 @@ + .macro song label, music_player, unknown + .4byte \label + .2byte \music_player + .2byte \unknown + .endm + + .macro music_player info_struct, track_struct, unknown_1, unknown_2 + .4byte \info_struct + .4byte \track_struct + .byte \unknown_1 + .space 1 + .2byte \unknown_2 + .endm diff --git a/include/macros/map.inc b/include/macros/map.inc new file mode 100644 index 000000000..db37d9346 --- /dev/null +++ b/include/macros/map.inc @@ -0,0 +1,96 @@ + .macro map map_id + .byte \map_id >> 8 @ map group + .byte \map_id & 0xFF @ map num + .endm + + .macro map_script type, address + .byte \type + .4byte \address + .endm + + .macro map_script_2 word1, word2, address + .2byte \word1 + .2byte \word2 + .4byte \address + .endm + + .macro object_event byte1, word1, byte2, byte3, byte4, byte5, byte6, byte7, byte8, byte9, byte10, byte11, byte12, byte13, byte14, script, word2, byte15, byte16 + .byte \byte1 + .2byte \word1 + .byte \byte2, \byte3, \byte4, \byte5, \byte6, \byte7, \byte8, \byte9, \byte10, \byte11, \byte12, \byte13, \byte14 + .4byte \script + .2byte \word2 + .byte \byte15, \byte16 + inc _num_npcs + .endm + + .macro warp_def x, y, byte, warp, map_id + .2byte \x, \y + .byte \byte, \warp + .byte \map_id & 0xFF @ map num + .byte \map_id >> 8 @ map group + inc _num_warps + .endm + + .macro coord_event x, y, byte1, byte2, word1, word2, word3, script + .2byte \x, \y + .byte \byte1, \byte2 + .2byte \word1, \word2, \word3 + .4byte \script + inc _num_traps + .endm + + .macro coord_weather_event x, y, height, weather + coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 + .endm + + .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 + .2byte \x, \y + .byte \byte, \kind + .2byte \word + .if \kind < 5 + .4byte \arg6 + .else + .2byte \arg6 + .byte \arg7, \arg8 + .endif + inc _num_signs + .endm + + .macro bg_hidden_item_event x, y, height, item, flag + bg_event \x, \y, \height, 7, 0, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 + .endm + + .macro bg_secret_base_event x, y, height, secret_base_id + bg_event \x, \y, \height, 8, 0, \secret_base_id, 0, 0 + .endm + + .macro map_events npcs, warps, traps, signs + .byte _num_npcs, _num_warps, _num_traps, _num_signs + .4byte \npcs, \warps, \traps, \signs + reset_map_events + .endm + + .macro reset_map_events + .set _num_npcs, 0 + .set _num_warps, 0 + .set _num_traps, 0 + .set _num_signs, 0 + .endm + + reset_map_events + + + .equiv connection_down, 1 + .equiv connection_up, 2 + .equiv connection_left, 3 + .equiv connection_right, 4 + .equiv connection_dive, 5 + .equiv connection_emerge, 6 + + .macro connection direction, offset, map, filler + .4byte connection_\direction + .4byte \offset + map \map + .space 2 + .endm diff --git a/include/macros/movement.inc b/include/macros/movement.inc new file mode 100644 index 000000000..674ce7169 --- /dev/null +++ b/include/macros/movement.inc @@ -0,0 +1,116 @@ + .macro create_movement name + enum _\name + .macro \name + .byte _\name + .endm + .endm + + enum_start + create_movement step_00 + create_movement step_01 + create_movement step_02 + create_movement step_03 + create_movement slow_step_down + create_movement slow_step_up + create_movement slow_step_left + create_movement slow_step_right + create_movement step_down + create_movement step_up + create_movement step_left + create_movement step_right + create_movement fast_step_down + create_movement fast_step_up + create_movement fast_step_left + create_movement fast_step_right + create_movement step_10 + create_movement step_11 + create_movement step_12 + create_movement step_13 + create_movement step_14 + create_movement step_15 + create_movement step_16 + create_movement step_17 + create_movement step_18 + create_movement step_19 + create_movement step_1a + create_movement step_1b + create_movement step_1c + create_movement step_1d + create_movement step_1e + create_movement step_1f + create_movement step_20 + create_movement step_21 + create_movement step_22 + create_movement step_23 + create_movement step_24 + create_movement step_25 + create_movement step_26 + create_movement step_27 + create_movement step_28 + create_movement step_29 + create_movement step_2a + create_movement step_2b + create_movement step_2c + create_movement step_2d + create_movement step_2e + create_movement step_2f + create_movement step_30 + create_movement step_31 + create_movement step_32 + create_movement step_33 + create_movement step_34 + create_movement step_35 + create_movement step_36 + create_movement step_37 + create_movement step_38 + create_movement step_39 + create_movement step_3a + create_movement step_3b + create_movement step_3c + create_movement step_3d + create_movement step_3e + create_movement step_3f + create_movement step_40 + create_movement step_41 + create_movement step_42 + create_movement step_43 + create_movement step_44 + create_movement step_45 + create_movement step_46 + create_movement step_47 + create_movement step_48 + create_movement step_49 + create_movement step_4a + create_movement step_4b + create_movement step_4c + create_movement step_4d + create_movement step_4e + create_movement step_4f + create_movement step_50 + create_movement step_51 + create_movement step_52 + create_movement step_53 + create_movement step_54 + create_movement step_55 + create_movement step_56 + create_movement step_57 + create_movement step_58 + create_movement step_59 + create_movement step_5a + create_movement step_5b + create_movement step_5c + create_movement step_5d + create_movement step_5e + create_movement step_5f + create_movement step_60 + create_movement step_61 + + enum_start 0x91 + create_movement step_91 + create_movement step_92 + + enum_start 0x96 + create_movement step_96 + + enum_start 0xfe + create_movement step_end diff --git a/include/macros/music_voice.inc b/include/macros/music_voice.inc new file mode 100644 index 000000000..b7a9e7f8d --- /dev/null +++ b/include/macros/music_voice.inc @@ -0,0 +1,125 @@ + .macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte 0 + _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release + .endm + + .macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte 8 + _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release + .endm + + .macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte 16 + _voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release + .endm + + .macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release + .byte \base_midi_key + .byte 0 + .if \pan != 0 + .byte (0x80 | \pan) + .else + .byte 0 + .endif + .4byte \sample_data_pointer + .byte \attack + .byte \decay + .byte \sustain + .byte \release + .endm + + .macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release + _voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release + _voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release + .byte \type, 60, 0 + .byte \sweep + .byte (\duty_cycle & 0x3) + .byte 0, 0, 0 + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_square_2 duty_cycle, attack, decay, sustain, release + _voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro voice_square_2_alt duty_cycle, attack, decay, sustain, release + _voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release + .endm + + .macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release + .byte \type, 60, 0, 0 + .byte (\duty_cycle & 0x3) + .byte 0, 0, 0 + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release + _voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release + .endm + + .macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release + _voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release + .endm + + .macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release + .byte \type, 60, 0, 0 + .4byte \wave_samples_pointer + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_noise period, attack, decay, sustain, release + _voice_noise 4, \period, \attack, \decay, \sustain, \release + .endm + + .macro voice_noise_alt period, attack, decay, sustain, release + _voice_noise 12, \period, \attack, \decay, \sustain, \release + .endm + + .macro _voice_noise type, period, attack, decay, sustain, release + .byte \type, 60, 0, 0 + .byte (\period & 0x1) + .byte 0, 0, 0 + .byte (\attack & 0x7) + .byte (\decay & 0x7) + .byte (\sustain & 0xF) + .byte (\release & 0x7) + .endm + + .macro voice_keysplit voice_group_pointer, keysplit_table_pointer + .byte 0x40, 0, 0, 0 + .4byte \voice_group_pointer + .4byte \keysplit_table_pointer + .endm + + .macro voice_keysplit_all voice_group_pointer + .byte 0x80, 0, 0, 0 + .4byte \voice_group_pointer + .4byte 0 + .endm + + .macro cry sample + .byte 0x20, 60, 0, 0 + .4byte \sample + .byte 0xff, 0, 0xff, 0 + .endm + + .macro cry2 sample + .byte 0x30, 60, 0, 0 + .4byte \sample + .byte 0xff, 0, 0xff, 0 + .endm diff --git a/include/macros/pokemon_data.inc b/include/macros/pokemon_data.inc new file mode 100644 index 000000000..b0a5f22e3 --- /dev/null +++ b/include/macros/pokemon_data.inc @@ -0,0 +1,57 @@ + .macro pokedex_entry pokemon_name, height, weight, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset + .2byte \height @ in decimeters + .2byte \weight @ in hectograms + .4byte DexDescription_\pokemon_name\()_1 + .4byte DexDescription_\pokemon_name\()_2 + .2byte 0 @ unused + .2byte \pokemon_scale + .2byte \pokemon_offset + .2byte \trainer_scale + .2byte \trainer_offset + .2byte 0 @ padding + .endm + + .macro base_stats hp, attack, defense, speed, sp_attack, sp_defense + .byte \hp + .byte \attack + .byte \defense + .byte \speed + .byte \sp_attack + .byte \sp_defense + .endm + + .macro ev_yield hp, attack, defense, speed, sp_attack, sp_defense + .2byte (\sp_defense << 10) | (\sp_attack << 8) | (\speed << 6) | (\defense << 4) | (\attack << 2) | \hp + .endm + + .macro level_up_move level, move + .2byte (\level << 9) | \move + .endm + + .macro evo_entry method, parameter, target_species + .2byte \method + .2byte \parameter + .2byte \target_species + .2byte 0 @ padding + .endm + + .macro empty_evo_entries count + .fill 8 * \count, 1, 0 + .endm + + .macro egg_moves_begin species + .2byte 20000 + \species + .endm + +@ If the min level equals the max level, only one level argument is needed. + .macro wild_mon species, min_level, max_level + .byte \min_level + + .ifb \max_level + .byte \min_level + .else + .byte \max_level + .endif + + .2byte SPECIES_\species + .endm diff --git a/ld_script.txt b/ld_script.txt index 9b385d3b8..373924638 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -36,7 +36,7 @@ SECTIONS { .text : ALIGN(4) { - asm/crt0.o(.text); + src/crt0.o(.text); src/engine/main.o(.text); src/engine/sprite.o(.text); src/engine/text.o(.text); @@ -406,8 +406,8 @@ SECTIONS { lib_text : ALIGN(4) { - asm/libgcnmultiboot.o(.text); - asm/m4a_1.o(.text); + src/libs/libgcnmultiboot.o(.text); + src/libs/m4a_1.o(.text); src/libs/m4a_2.o(.text); asm/m4a_3.o(.text); src/libs/m4a_4.o(.text); @@ -415,7 +415,7 @@ SECTIONS { src/libs/agb_flash_1m.o(.text); src/libs/agb_flash_mx.o(.text); src/libs/siirtc.o(.text); - asm/libagbsyscall.o(.text); + src/libs/libagbsyscall.o(.text); tools/agbcc/lib/libgcc.a:_call_via_rX.o(.text); tools/agbcc/lib/libgcc.a:_divsi3.o(.text); tools/agbcc/lib/libgcc.a:_dvmd_tls.o(.text); diff --git a/misc.mk b/misc.mk index 1d6cb09b0..40234c81b 100644 --- a/misc.mk +++ b/misc.mk @@ -1,143 +1,149 @@ -MENUGFXDIR := graphics/interface -TRADEGFXDIR := graphics/trade -INTROGFXDIR := graphics/intro -PSSGFXDIR := graphics/pokemon_storage -MISCGFXDIR := graphics/misc -PKNAVGFXDIR := graphics/pokenav -UNKNOWNGFXDIR := graphics/unknown -UNUSEDGFXDIR := graphics/unused -REELGFXDIR := graphics/slot_machine -ROULGFXDIR := graphics/roulette -BTLANMSPRGFXDIR := graphics/battle_anims/sprites -PICFRAMEGFXDIR := graphics/picture_frame -CONTESTGFXDIR := graphics/contest -MASKSGFXDIR := graphics/battle_anims/masks -BATTRANSGFXDIR := graphics/battle_transitions -TYPESGFXDIR := graphics/types -TITLEGFXDIR := graphics/title_screen +#### Pokemon Storage System #### -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 - -$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal - @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ - -$(INTROGFXDIR)/intro.4bpp: $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp - @cat $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp >$@ - -$(INTROGFXDIR)/introgfx.4bpp: $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp - @cat $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp >$@ +PSSGFXDIR := graphics/pokemon_storage -$(PKNAVGFXDIR)/region_map.8bpp: $(PKNAVGFXDIR)/region_map.png - $(GFX) $< $@ -num_tiles 233 +$(PSSGFXDIR)/header.4bpp: GFX_OPTS := -num_tiles 47 -$(PSSGFXDIR)/forest_frame.4bpp: $(PSSGFXDIR)/forest_frame.png - $(GFX) $< $@ -num_tiles 49 +$(PSSGFXDIR)/misc1.4bpp: GFX_OPTS := -num_tiles 91 +$(PSSGFXDIR)/forest_frame.4bpp: GFX_OPTS := -num_tiles 49 $(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp @cat $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp >$@ -$(PSSGFXDIR)/city_frame.4bpp: $(PSSGFXDIR)/city_frame.png - $(GFX) $< $@ -num_tiles 37 - +$(PSSGFXDIR)/city_frame.4bpp: GFX_OPTS := -num_tiles 37 $(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp @cat $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp >$@ -$(PSSGFXDIR)/desert_frame.4bpp: $(PSSGFXDIR)/desert_frame.png - $(GFX) $< $@ -num_tiles 48 - +$(PSSGFXDIR)/desert_frame.4bpp: GFX_OPTS := -num_tiles 48 $(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp @cat $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp >$@ -$(PSSGFXDIR)/savanna_frame.4bpp: $(PSSGFXDIR)/savanna_frame.png - $(GFX) $< $@ -num_tiles 40 - +$(PSSGFXDIR)/savanna_frame.4bpp: GFX_OPTS := -num_tiles 40 $(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp @cat $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp >$@ -$(PSSGFXDIR)/crag_frame.4bpp: $(PSSGFXDIR)/crag_frame.png - $(GFX) $< $@ -num_tiles 46 - +$(PSSGFXDIR)/crag_frame.4bpp: GFX_OPTS := -num_tiles 46 $(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp @cat $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp >$@ -$(PSSGFXDIR)/volcano_frame.4bpp: $(PSSGFXDIR)/volcano_frame.png - $(GFX) $< $@ -num_tiles 49 - +$(PSSGFXDIR)/volcano_frame.4bpp: GFX_OPTS := -num_tiles 49 $(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp @cat $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp >$@ -$(PSSGFXDIR)/snow_frame.4bpp: $(PSSGFXDIR)/snow_frame.png - $(GFX) $< $@ -num_tiles 46 - +$(PSSGFXDIR)/snow_frame.4bpp: GFX_OPTS := -num_tiles 46 $(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp @cat $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp >$@ -$(PSSGFXDIR)/cave_frame.4bpp: $(PSSGFXDIR)/cave_frame.png - $(GFX) $< $@ -num_tiles 57 - +$(PSSGFXDIR)/cave_frame.4bpp: GFX_OPTS := -num_tiles 57 $(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp @cat $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp >$@ -$(PSSGFXDIR)/beach_frame.4bpp: $(PSSGFXDIR)/beach_frame.png - $(GFX) $< $@ -num_tiles 48 - +$(PSSGFXDIR)/beach_frame.4bpp: GFX_OPTS := -num_tiles 48 $(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp @cat $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp >$@ -$(PSSGFXDIR)/seafloor_frame.4bpp: $(PSSGFXDIR)/seafloor_frame.png - $(GFX) $< $@ -num_tiles 45 - +$(PSSGFXDIR)/seafloor_frame.4bpp: GFX_OPTS := -num_tiles 45 $(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp @cat $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp >$@ -$(PSSGFXDIR)/river_frame.4bpp: $(PSSGFXDIR)/river_frame.png - $(GFX) $< $@ -num_tiles 57 - +$(PSSGFXDIR)/river_frame.4bpp: GFX_OPTS := -num_tiles 57 $(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp @cat $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp >$@ -$(PSSGFXDIR)/sky_frame.4bpp: $(PSSGFXDIR)/sky_frame.png - $(GFX) $< $@ -num_tiles 45 - +$(PSSGFXDIR)/sky_frame.4bpp: GFX_OPTS := -num_tiles 45 $(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp @cat $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp >$@ -$(PSSGFXDIR)/polkadot_frame.4bpp: $(PSSGFXDIR)/polkadot_frame.png - $(GFX) $< $@ -num_tiles 34 - +$(PSSGFXDIR)/polkadot_frame.4bpp: GFX_OPTS := -num_tiles 34 $(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp @cat $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp >$@ -$(PSSGFXDIR)/pokecenter_bg.4bpp: $(PSSGFXDIR)/pokecenter_bg.png - $(GFX) $< $@ -num_tiles 38 - +$(PSSGFXDIR)/pokecenter_bg.4bpp: GFX_OPTS := -num_tiles 38 $(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp @cat $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp >$@ -$(PSSGFXDIR)/machine_frame.4bpp: $(PSSGFXDIR)/machine_frame.png - $(GFX) $< $@ -num_tiles 46 - +$(PSSGFXDIR)/machine_frame.4bpp: GFX_OPTS := -num_tiles 46 $(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp @cat $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp >$@ -$(PSSGFXDIR)/plain_frame.4bpp: $(PSSGFXDIR)/plain_frame.png - $(GFX) $< $@ -num_tiles 18 - +$(PSSGFXDIR)/plain_frame.4bpp: GFX_OPTS := -num_tiles 18 $(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp @cat $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp >$@ -$(PKNAVGFXDIR)/outline.4bpp: $(PKNAVGFXDIR)/outline.png - $(GFX) $< $@ -num_tiles 43 -$(REELGFXDIR)/reel_time.4bpp: $(REELGFXDIR)/reel_pikachu.4bpp $(REELGFXDIR)/reel_machine.4bpp - @cat $(REELGFXDIR)/reel_pikachu.4bpp $(REELGFXDIR)/reel_machine.4bpp >$@ +#### Intro #### -$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp - @cat $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp >$@ +INTROGFXDIR := graphics/intro -$(MISCGFXDIR)/clock_misc.4bpp: $(MISCGFXDIR)/clock_hands.4bpp $(MISCGFXDIR)/clock_ampm.4bpp - @cat $(MISCGFXDIR)/clock_hands.4bpp $(MISCGFXDIR)/clock_ampm.4bpp >$@ +$(INTROGFXDIR)/intro.4bpp: $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp + @cat $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp >$@ + +$(INTROGFXDIR)/introgfx.4bpp: $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp + @cat $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp >$@ + +$(INTROGFXDIR)/intro3_misc.4bpp: $(INTROGFXDIR)/intro3_star.4bpp $(INTROGFXDIR)/intro3_attackgfx.4bpp $(INTROGFXDIR)/intro3_explosion.4bpp + @cat $(INTROGFXDIR)/intro3_star.4bpp $(INTROGFXDIR)/intro3_attackgfx.4bpp $(INTROGFXDIR)/intro3_explosion.4bpp >$@ + +$(INTROGFXDIR)/copyright.4bpp: GFX_OPTS := -num_tiles 43 + + +#### Title Screen #### + +TITLEGFXDIR := graphics/title_screen + +$(TITLEGFXDIR)/press_start.4bpp: GFX_OPTS := -num_tiles 41 + + +#### Interface #### + +MENUGFXDIR := graphics/interface + +$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal + @cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@ + +$(MENUGFXDIR)/wordgroup_frame.4bpp: GFX_OPTS := -num_tiles 65 + +$(MENUGFXDIR)/party_menu_misc.4bpp: GFX_OPTS := -num_tiles 116 + +$(MENUGFXDIR)/status_screen.4bpp: GFX_OPTS := -num_tiles 217 + +$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp + @cat $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp >$@ + + +#### PokeNav #### + +PKNAVGFXDIR := graphics/pokenav + +$(PKNAVGFXDIR)/region_map.8bpp: GFX_OPTS := -num_tiles 233 + +$(PKNAVGFXDIR)/outline.4bpp: GFX_OPTS := -num_tiles 43 + +$(PKNAVGFXDIR)/menu_options.4bpp: $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp + @cat $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp >$@ + +$(PKNAVGFXDIR)/condition_menu_misc.4bpp: GFX_OPTS := -num_tiles 41 + +$(PKNAVGFXDIR)/condition_search.4bpp: $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp + @cat $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp >$@ + + +#### Trade #### + +TRADEGFXDIR := graphics/trade + +$(TRADEGFXDIR)/gba_affine.8bpp: GFX_OPTS := -num_tiles 129 + +$(TRADEGFXDIR)/menu.4bpp: GFX_OPTS := -num_tiles 148 + + +#### Casino #### + +REELGFXDIR := graphics/slot_machine +ROULGFXDIR := graphics/roulette + +$(REELGFXDIR)/reel_time.4bpp: $(REELGFXDIR)/reel_pikachu.4bpp $(REELGFXDIR)/reel_machine.4bpp + @cat $(REELGFXDIR)/reel_pikachu.4bpp $(REELGFXDIR)/reel_machine.4bpp >$@ $(ROULGFXDIR)/roulette_tilt.4bpp: $(ROULGFXDIR)/shroomish.4bpp $(ROULGFXDIR)/tailow.4bpp @cat $(ROULGFXDIR)/shroomish.4bpp $(ROULGFXDIR)/tailow.4bpp >$@ @@ -145,14 +151,11 @@ $(ROULGFXDIR)/roulette_tilt.4bpp: $(ROULGFXDIR)/shroomish.4bpp $(ROULGFXDIR)/tai $(ROULGFXDIR)/poke_icons2.4bpp: $(ROULGFXDIR)/wynaut.4bpp $(ROULGFXDIR)/azurill.4bpp $(ROULGFXDIR)/skitty.4bpp $(ROULGFXDIR)/makuhita.4bpp @cat $(ROULGFXDIR)/wynaut.4bpp $(ROULGFXDIR)/azurill.4bpp $(ROULGFXDIR)/skitty.4bpp $(ROULGFXDIR)/makuhita.4bpp >$@ -$(INTROGFXDIR)/intro3_misc.4bpp: $(INTROGFXDIR)/intro3_star.4bpp $(INTROGFXDIR)/intro3_attackgfx.4bpp $(INTROGFXDIR)/intro3_explosion.4bpp - @cat $(INTROGFXDIR)/intro3_star.4bpp $(INTROGFXDIR)/intro3_attackgfx.4bpp $(INTROGFXDIR)/intro3_explosion.4bpp >$@ -$(TRADEGFXDIR)/gba_affine.8bpp: $(TRADEGFXDIR)/gba_affine.png - $(GFX) $< $@ -num_tiles 129 +#### Battle Animations #### -$(TRADEGFXDIR)/menu.4bpp: $(TRADEGFXDIR)/menu.png - $(GFX) $< $@ -num_tiles 148 +BTLANMSPRGFXDIR := graphics/battle_anims/sprites +MASKSGFXDIR := graphics/battle_anims/masks $(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp $(BTLANMSPRGFXDIR)/001_1.4bpp @cat $(BTLANMSPRGFXDIR)/001_0.4bpp $(BTLANMSPRGFXDIR)/001_1.4bpp >$@ @@ -169,47 +172,36 @@ $(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp $(BTLANMSPRGFXDIR)/14 $(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp $(BTLANMSPRGFXDIR)/159_1.4bpp @cat $(BTLANMSPRGFXDIR)/159_0.4bpp $(BTLANMSPRGFXDIR)/159_1.4bpp >$@ -$(PICFRAMEGFXDIR)/frame5.4bpp: $(PICFRAMEGFXDIR)/frame5.png - $(GFX) $< $@ -num_tiles 86 +$(MASKSGFXDIR)/unknown_D2EDFC.4bpp: GFX_OPTS := -num_tiles 14 -$(CONTESTGFXDIR)/nextturn.4bpp: $(CONTESTGFXDIR)/nextturn.png - $(GFX) $< $@ -num_tiles 8 -$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal - @cat $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal >$@ +#### Battle Transition -$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal - @cat $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal >$@ +BATTRANSGFXDIR := graphics/battle_transitions -$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp - @cat $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp >$@ +$(BATTRANSGFXDIR)/vs_frame.4bpp: GFX_OPTS := -num_tiles 16 -$(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 $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp >$@ -$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp - @cat $(MENUGFXDIR)/hpbar_anim.4bpp $(MENUGFXDIR)/numbers1.4bpp $(MENUGFXDIR)/numbers2.4bpp >$@ +#### Contest #### -$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin - @cat $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin >$@ +CONTESTGFXDIR := graphics/contest -$(UNUSEDGFXDIR)/color_frames.4bpp: $(UNUSEDGFXDIR)/color_frames.png - $(GFX) $< $@ -num_tiles 353 +$(CONTESTGFXDIR)/nextturn.4bpp: GFX_OPTS := -num_tiles 8 -$(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_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_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp - @cat $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp >$@ +#### Picture Frame #### -$(MASKSGFXDIR)/unknown_D2EDFC.4bpp: $(MASKSGFXDIR)/unknown_D2EDFC.png - $(GFX) $< $@ -num_tiles 14 +PICFRAMEGFXDIR := graphics/picture_frame + +$(PICFRAMEGFXDIR)/frame5.4bpp: GFX_OPTS := -num_tiles 86 -$(BATTRANSGFXDIR)/vs_frame.4bpp: $(BATTRANSGFXDIR)/vs_frame.png - $(GFX) $< $@ -num_tiles 16 -$(MENUGFXDIR)/party_menu_misc.4bpp: $(MENUGFXDIR)/party_menu_misc.png - $(GFX) $< $@ -num_tiles 116 +#### Move Types #### + +TYPESGFXDIR := graphics/types + +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 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) @cat $^ >$@ @@ -217,35 +209,45 @@ $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal @cat $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal >$@ -$(MENUGFXDIR)/status_screen.4bpp: $(MENUGFXDIR)/status_screen.png - $(GFX) $< $@ -num_tiles 217 -$(PKNAVGFXDIR)/menu_options.4bpp: $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp - @cat $(PKNAVGFXDIR)/menu_hoennmap.4bpp $(PKNAVGFXDIR)/menu_condition.4bpp $(PKNAVGFXDIR)/menu_eyes.4bpp $(PKNAVGFXDIR)/menu_ribbons.4bpp $(PKNAVGFXDIR)/menu_off.4bpp >$@ +#### Miscellaneous #### -$(PKNAVGFXDIR)/condition_menu_misc.4bpp: $(PKNAVGFXDIR)/condition_menu_misc.png - $(GFX) $< $@ -num_tiles 41 +MISCGFXDIR := graphics/misc -$(PKNAVGFXDIR)/condition_search.4bpp: $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp - @cat $(PKNAVGFXDIR)/condition_search_cool.4bpp $(PKNAVGFXDIR)/condition_search_beauty.4bpp $(PKNAVGFXDIR)/condition_search_cute.4bpp $(PKNAVGFXDIR)/condition_search_smart.4bpp $(PKNAVGFXDIR)/condition_search_tough.4bpp $(PKNAVGFXDIR)/condition_search_cancel.4bpp >$@ +$(MISCGFXDIR)/hof.4bpp: GFX_OPTS := -num_tiles 37 -$(PSSGFXDIR)/header.4bpp: $(PSSGFXDIR)/header.png - $(GFX) $< $@ -num_tiles 47 +$(MISCGFXDIR)/end_copyright.4bpp: GFX_OPTS := -num_tiles 90 -$(PSSGFXDIR)/misc1.4bpp: $(PSSGFXDIR)/misc1.png - $(GFX) $< $@ -num_tiles 91 +$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp + @cat $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp >$@ -$(MISCGFXDIR)/hof.4bpp: $(MISCGFXDIR)/hof.png - $(GFX) $< $@ -num_tiles 37 +$(MISCGFXDIR)/clock_misc.4bpp: $(MISCGFXDIR)/clock_hands.4bpp $(MISCGFXDIR)/clock_ampm.4bpp + @cat $(MISCGFXDIR)/clock_hands.4bpp $(MISCGFXDIR)/clock_ampm.4bpp >$@ -$(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png - $(GFX) $< $@ -num_tiles 65 -$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png - $(GFX) $< $@ -num_tiles 43 +#### Unused #### -$(TITLEGFXDIR)/press_start.4bpp: $(TITLEGFXDIR)/press_start.png - $(GFX) $< $@ -num_tiles 41 +UNUSEDGFXDIR := graphics/unused -$(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png - $(GFX) $< $@ -num_tiles 90 +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin + @cat $(UNUSEDGFXDIR)/red_frame.bin $(UNUSEDGFXDIR)/yellow_frame.bin $(UNUSEDGFXDIR)/green_frame.bin $(UNUSEDGFXDIR)/blank_frame.bin >$@ + +$(UNUSEDGFXDIR)/color_frames.4bpp: GFX_OPTS := -num_tiles 353 + +$(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_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_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp + @cat $(UNUSEDGFXDIR)/old_contest_2_1.4bpp $(UNUSEDGFXDIR)/old_contest_2_2.4bpp >$@ + +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal + @cat $(UNUSEDGFXDIR)/old_pal1.gbapal $(UNUSEDGFXDIR)/old_pal2.gbapal $(UNUSEDGFXDIR)/old_pal3.gbapal >$@ + +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal + @cat $(UNUSEDGFXDIR)/old_pal5.gbapal $(UNUSEDGFXDIR)/old_pal6.gbapal $(UNUSEDGFXDIR)/old_pal7.gbapal >$@ + +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.4bpp + @cat $(UNUSEDGFXDIR)/old_bulbasaur.4bpp $(UNUSEDGFXDIR)/old_charizard.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 $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp >$@ diff --git a/sound/MPlayDef.s b/sound/MPlayDef.s deleted file mode 100644 index f5dd6484d..000000000 --- a/sound/MPlayDef.s +++ /dev/null @@ -1,430 +0,0 @@ - .equ W00, 0x80 @ WAIT - .equ W01, W00+1 @ - .equ W02, W00+2 @ - .equ W03, W00+3 @ - .equ W04, W00+4 @ - .equ W05, W00+5 @ - .equ W06, W00+6 @ - .equ W07, W00+7 @ - .equ W08, W00+8 @ - .equ W09, W00+9 @ - .equ W10, W00+10 @ - .equ W11, W00+11 @ - .equ W12, W00+12 @ - .equ W13, W00+13 @ - .equ W14, W00+14 @ - .equ W15, W00+15 @ - .equ W16, W00+16 @ - .equ W17, W00+17 @ - .equ W18, W00+18 @ - .equ W19, W00+19 @ - .equ W20, W00+20 @ - .equ W21, W00+21 @ - .equ W22, W00+22 @ - .equ W23, W00+23 @ - .equ W24, W00+24 @ - .equ W28, W00+25 @ - .equ W30, W00+26 @ - .equ W32, W00+27 @ - .equ W36, W00+28 @ - .equ W40, W00+29 @ - .equ W42, W00+30 @ - .equ W44, W00+31 @ - .equ W48, W00+32 @ - .equ W52, W00+33 @ - .equ W54, W00+34 @ - .equ W56, W00+35 @ - .equ W60, W00+36 @ - .equ W64, W00+37 @ - .equ W66, W00+38 @ - .equ W68, W00+39 @ - .equ W72, W00+40 @ - .equ W76, W00+41 @ - .equ W78, W00+42 @ - .equ W80, W00+43 @ - .equ W84, W00+44 @ - .equ W88, W00+45 @ - .equ W90, W00+46 @ - .equ W92, W00+47 @ - .equ W96, W00+48 @ - - .equ FINE, 0xb1 @ fine - .equ GOTO, 0xb2 @ goto - .equ PATT, 0xb3 @ pattern play - .equ PEND, 0xb4 @ pattern end - .equ REPT, 0xb5 @ repeat - .equ MEMACC, 0xb9 @ memacc op adr dat ***lib - .equ PRIO, 0xba @ priority - .equ TEMPO, 0xbb @ tempo (BPM/2) - .equ KEYSH, 0xbc @ key shift - .equ VOICE, 0xbd @ voice # - .equ VOL, 0xbe @ volume - .equ PAN, 0xbf @ panpot (c_v+??) - .equ BEND, 0xc0 @ pitch bend (c_v+??) - .equ BENDR, 0xc1 @ bend range - .equ LFOS, 0xc2 @ LFO speed - .equ LFODL, 0xc3 @ LFO delay - .equ MOD, 0xc4 @ modulation depth - .equ MODT, 0xc5 @ modulation type - .equ TUNE, 0xc8 @ micro tuning (c_v+??) - - .equ XCMD, 0xcd @ extend command ***lib - .equ xIECV, 0x08 @ imi.echo vol ***lib - .equ xIECL, 0x09 @ imi.echo len ***lib - - .equ EOT, 0xce @ End of Tie - .equ TIE, 0xcf @ - .equ N01, TIE+1 @ NOTE - .equ N02, N01+1 @ - .equ N03, N01+2 @ - .equ N04, N01+3 @ - .equ N05, N01+4 @ - .equ N06, N01+5 @ - .equ N07, N01+6 @ - .equ N08, N01+7 @ - .equ N09, N01+8 @ - .equ N10, N01+9 @ - .equ N11, N01+10 @ - .equ N12, N01+11 @ - .equ N13, N01+12 @ - .equ N14, N01+13 @ - .equ N15, N01+14 @ - .equ N16, N01+15 @ - .equ N17, N01+16 @ - .equ N18, N01+17 @ - .equ N19, N01+18 @ - .equ N20, N01+19 @ - .equ N21, N01+20 @ - .equ N22, N01+21 @ - .equ N23, N01+22 @ - .equ N24, N01+23 @ - .equ N28, N01+24 @ - .equ N30, N01+25 @ - .equ N32, N01+26 @ - .equ N36, N01+27 @ - .equ N40, N01+28 @ - .equ N42, N01+29 @ - .equ N44, N01+30 @ - .equ N48, N01+31 @ - .equ N52, N01+32 @ - .equ N54, N01+33 @ - .equ N56, N01+34 @ - .equ N60, N01+35 @ - .equ N64, N01+36 @ - .equ N66, N01+37 @ - .equ N68, N01+38 @ - .equ N72, N01+39 @ - .equ N76, N01+40 @ - .equ N78, N01+41 @ - .equ N80, N01+42 @ - .equ N84, N01+43 @ - .equ N88, N01+44 @ - .equ N90, N01+45 @ - .equ N92, N01+46 @ - .equ N96, N01+47 @ - -@ maximum value for volume - - .equ mxv, 0x7F @ - -@ center value of PAN, BEND, TUNE - - .equ c_v, 0x40 @ -64 ~ +63 - -@ note for N??, TIE, EOT - - .equ CnM2, 0 @ - .equ CsM2, 1 @ - .equ DnM2, 2 @ - .equ DsM2, 3 @ - .equ EnM2, 4 @ - .equ FnM2, 5 @ - .equ FsM2, 6 @ - .equ GnM2, 7 @ - .equ GsM2, 8 @ - .equ AnM2, 9 @ - .equ AsM2, 10 @ - .equ BnM2, 11 @ - .equ CnM1, 12 @ - .equ CsM1, 13 @ - .equ DnM1, 14 @ - .equ DsM1, 15 @ - .equ EnM1, 16 @ - .equ FnM1, 17 @ - .equ FsM1, 18 @ - .equ GnM1, 19 @ - .equ GsM1, 20 @ - .equ AnM1, 21 @ - .equ AsM1, 22 @ - .equ BnM1, 23 @ - .equ Cn0, 24 @ - .equ Cs0, 25 @ - .equ Dn0, 26 @ - .equ Ds0, 27 @ - .equ En0, 28 @ - .equ Fn0, 29 @ - .equ Fs0, 30 @ - .equ Gn0, 31 @ - .equ Gs0, 32 @ - .equ An0, 33 @ - .equ As0, 34 @ - .equ Bn0, 35 @ - .equ Cn1, 36 @ - .equ Cs1, 37 @ - .equ Dn1, 38 @ - .equ Ds1, 39 @ - .equ En1, 40 @ - .equ Fn1, 41 @ - .equ Fs1, 42 @ - .equ Gn1, 43 @ - .equ Gs1, 44 @ - .equ An1, 45 @ - .equ As1, 46 @ - .equ Bn1, 47 @ - .equ Cn2, 48 @ - .equ Cs2, 49 @ - .equ Dn2, 50 @ - .equ Ds2, 51 @ - .equ En2, 52 @ - .equ Fn2, 53 @ - .equ Fs2, 54 @ - .equ Gn2, 55 @ - .equ Gs2, 56 @ - .equ An2, 57 @ - .equ As2, 58 @ - .equ Bn2, 59 @ - .equ Cn3, 60 @ - .equ Cs3, 61 @ - .equ Dn3, 62 @ - .equ Ds3, 63 @ - .equ En3, 64 @ - .equ Fn3, 65 @ - .equ Fs3, 66 @ - .equ Gn3, 67 @ - .equ Gs3, 68 @ - .equ An3, 69 @ 440Hz - .equ As3, 70 @ - .equ Bn3, 71 @ - .equ Cn4, 72 @ - .equ Cs4, 73 @ - .equ Dn4, 74 @ - .equ Ds4, 75 @ - .equ En4, 76 @ - .equ Fn4, 77 @ - .equ Fs4, 78 @ - .equ Gn4, 79 @ - .equ Gs4, 80 @ - .equ An4, 81 @ - .equ As4, 82 @ - .equ Bn4, 83 @ - .equ Cn5, 84 @ - .equ Cs5, 85 @ - .equ Dn5, 86 @ - .equ Ds5, 87 @ - .equ En5, 88 @ - .equ Fn5, 89 @ - .equ Fs5, 90 @ - .equ Gn5, 91 @ - .equ Gs5, 92 @ - .equ An5, 93 @ - .equ As5, 94 @ - .equ Bn5, 95 @ - .equ Cn6, 96 @ - .equ Cs6, 97 @ - .equ Dn6, 98 @ - .equ Ds6, 99 @ - .equ En6, 100 @ - .equ Fn6, 101 @ - .equ Fs6, 102 @ - .equ Gn6, 103 @ - .equ Gs6, 104 @ - .equ An6, 105 @ - .equ As6, 106 @ - .equ Bn6, 107 @ - .equ Cn7, 108 @ - .equ Cs7, 109 @ - .equ Dn7, 110 @ - .equ Ds7, 111 @ - .equ En7, 112 @ - .equ Fn7, 113 @ - .equ Fs7, 114 @ - .equ Gn7, 115 @ - .equ Gs7, 116 @ - .equ An7, 117 @ - .equ As7, 118 @ - .equ Bn7, 119 @ - .equ Cn8, 120 @ - .equ Cs8, 121 @ - .equ Dn8, 122 @ - .equ Ds8, 123 @ - .equ En8, 124 @ - .equ Fn8, 125 @ - .equ Fs8, 126 @ - .equ Gn8, 127 @ - -@ velocity - - .equ v000, 0 @ - .equ v001, 1 @ - .equ v002, 2 @ - .equ v003, 3 @ - .equ v004, 4 @ - .equ v005, 5 @ - .equ v006, 6 @ - .equ v007, 7 @ - .equ v008, 8 @ - .equ v009, 9 @ - .equ v010, 10 @ - .equ v011, 11 @ - .equ v012, 12 @ - .equ v013, 13 @ - .equ v014, 14 @ - .equ v015, 15 @ - .equ v016, 16 @ - .equ v017, 17 @ - .equ v018, 18 @ - .equ v019, 19 @ - .equ v020, 20 @ - .equ v021, 21 @ - .equ v022, 22 @ - .equ v023, 23 @ - .equ v024, 24 @ - .equ v025, 25 @ - .equ v026, 26 @ - .equ v027, 27 @ - .equ v028, 28 @ - .equ v029, 29 @ - .equ v030, 30 @ - .equ v031, 31 @ - .equ v032, 32 @ - .equ v033, 33 @ - .equ v034, 34 @ - .equ v035, 35 @ - .equ v036, 36 @ - .equ v037, 37 @ - .equ v038, 38 @ - .equ v039, 39 @ - .equ v040, 40 @ - .equ v041, 41 @ - .equ v042, 42 @ - .equ v043, 43 @ - .equ v044, 44 @ - .equ v045, 45 @ - .equ v046, 46 @ - .equ v047, 47 @ - .equ v048, 48 @ - .equ v049, 49 @ - .equ v050, 50 @ - .equ v051, 51 @ - .equ v052, 52 @ - .equ v053, 53 @ - .equ v054, 54 @ - .equ v055, 55 @ - .equ v056, 56 @ - .equ v057, 57 @ - .equ v058, 58 @ - .equ v059, 59 @ - .equ v060, 60 @ - .equ v061, 61 @ - .equ v062, 62 @ - .equ v063, 63 @ - .equ v064, 64 @ - .equ v065, 65 @ - .equ v066, 66 @ - .equ v067, 67 @ - .equ v068, 68 @ - .equ v069, 79 @ - .equ v070, 70 @ - .equ v071, 71 @ - .equ v072, 72 @ - .equ v073, 73 @ - .equ v074, 74 @ - .equ v075, 75 @ - .equ v076, 76 @ - .equ v077, 77 @ - .equ v078, 78 @ - .equ v079, 79 @ - .equ v080, 80 @ - .equ v081, 81 @ - .equ v082, 82 @ - .equ v083, 83 @ - .equ v084, 84 @ - .equ v085, 85 @ - .equ v086, 86 @ - .equ v087, 87 @ - .equ v088, 88 @ - .equ v089, 89 @ - .equ v090, 90 @ - .equ v091, 91 @ - .equ v092, 92 @ - .equ v093, 93 @ - .equ v094, 94 @ - .equ v095, 95 @ - .equ v096, 96 @ - .equ v097, 97 @ - .equ v098, 98 @ - .equ v099, 99 @ - .equ v100, 100 @ - .equ v101, 101 @ - .equ v102, 102 @ - .equ v103, 103 @ - .equ v104, 104 @ - .equ v105, 105 @ - .equ v106, 106 @ - .equ v107, 107 @ - .equ v108, 108 @ - .equ v109, 109 @ - .equ v110, 110 @ - .equ v111, 111 @ - .equ v112, 112 @ - .equ v113, 113 @ - .equ v114, 114 @ - .equ v115, 115 @ - .equ v116, 116 @ - .equ v117, 117 @ - .equ v118, 118 @ - .equ v119, 119 @ - .equ v120, 120 @ - .equ v121, 121 @ - .equ v122, 122 @ - .equ v123, 123 @ - .equ v124, 124 @ - .equ v125, 125 @ - .equ v126, 126 @ - .equ v127, 127 @ - -@ exact gate time parameter for N?? - - .equ gtp1, 1 @ - .equ gtp2, 2 @ - .equ gtp3, 3 @ - -@ parameter of MODT - - .equ mod_vib,0 @ vibrate - .equ mod_tre,1 @ tremolo - .equ mod_pan,2 @ auto-panpot - -@ parameter of MEMACC - - .equ mem_set,0 @ - .equ mem_add,1 @ - .equ mem_sub,2 @ - .equ mem_mem_set,3 @ - .equ mem_mem_add,4 @ - .equ mem_mem_sub,5 @ - .equ mem_beq,6 @ - .equ mem_bne,7 @ - .equ mem_bhi,8 @ - .equ mem_bhs,9 @ - .equ mem_bls,10 @ - .equ mem_blo,11 @ - .equ mem_mem_beq,12 @ - .equ mem_mem_bne,13 @ - .equ mem_mem_bhi,14 @ - .equ mem_mem_bhs,15 @ - .equ mem_mem_bls,16 @ - .equ mem_mem_blo,17 @ - - .equ reverb_set,0x80 @ SOUND_MODE_REVERB_SET - .equ PAM, PAN @ diff --git a/src/crt0.s b/src/crt0.s new file mode 100644 index 000000000..049392be9 --- /dev/null +++ b/src/crt0.s @@ -0,0 +1,227 @@ + .include "constants/gba_constants.inc" + .include "constants/misc_constants.inc" + .include "constants/version.inc" + + .syntax unified + + .global Start + + .text + + .arm + +Start: @ 8000000 + b Init + + .include "asm/rom_header.inc" + +@ 80000C0 + .word 0 + + .global GPIOPortData +GPIOPortData: @ 80000C4 + .hword 0 + + .global GPIOPortDirection +GPIOPortDirection: @ 80000C6 + .hword 0 + + .global GPIOPortReadEnable +GPIOPortReadEnable: @ 80000C8 + .hword 0 + + .space 6 + +@ 80000D0 + +@ TODO: figure out what this data is + + .ifdef GERMAN + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte GAME_VERSION + .4byte GAME_LANGUAGE + .ifdef SAPPHIRE + .ascii "pokemon sapphire version" + .space 8 + .else + .ascii "pokemon ruby version" + .space 12 + .endif + .4byte gMonFrontPicTable + .4byte gMonBackPicTable + .4byte gMonPaletteTable + .4byte gMonShinyPaletteTable + .4byte gMonIconTable + .4byte gMonIconPaletteIndices + .4byte gMonIconPaletteTable + .4byte gSpeciesNames + .4byte gMoveNames + .4byte gDecorations + .4byte 0x1220 + .4byte 0x1340 + .4byte 0x18 + .4byte 0x938 + .4byte 0x3A8C + .4byte 0x46 + .4byte 0x836 + .4byte 0x84C + .4byte 0x182 + .4byte 0xA0A0A07 + .4byte 0xC060C0C + .4byte 0xC121006 + .4byte 0x8010B0F + .4byte 0xC + .4byte 0x890 + .4byte 0x3AC0 + .4byte 0x234 + .4byte 0x238 + .4byte 9 + .4byte 0xA + .4byte 0 + .4byte 8 + .4byte 0x556 + .4byte 0x557 + .4byte 0x312F + .4byte 0x311B + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0xFFFFFFFF + .endif + + .arm + .align 2, 0 + .global Init +Init: + mov r0, PSR_IRQ_MODE + msr cpsr_cf, r0 + ldr sp, sp_irq + mov r0, PSR_SYS_MODE + msr cpsr_cf, r0 + ldr sp, sp_sys + ldr r1, =INTR_VECTOR + adr r0, IntrMain + str r0, [r1] + ldr r1, =AgbMain + mov lr, pc + bx r1 + b Init + + .align 2, 0 +sp_sys: .word IWRAM_END - 0x1a0 +sp_irq: .word IWRAM_END - 0x60 + + .arm + .align 2, 0 + .global IntrMain +IntrMain: + mov r3, REG_BASE + add r3, r3, 0x200 + ldr r2, [r3, OFFSET_REG_IE - 0x200] + ldrh r1, [r3, OFFSET_REG_IME - 0x200] + mrs r0, spsr + stmdb sp!, {r0-r3,lr} + mov r0, 1 + strh r0, [r3, OFFSET_REG_IME - 0x200] + and r1, r2, r2, lsr 16 + mov r12, 0 + ands r0, r1, INTR_FLAG_SERIAL + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_TIMER3 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_HBLANK + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_VBLANK + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_VCOUNT + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_TIMER0 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_TIMER1 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_TIMER2 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_DMA0 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_DMA1 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_DMA2 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_DMA3 + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_KEYPAD + bne IntrMain_FoundIntr + add r12, r12, 0x4 + ands r0, r1, INTR_FLAG_GAMEPAK + strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200] +IntrMain_Loop: + bne IntrMain_Loop +IntrMain_FoundIntr: + strh r0, [r3, OFFSET_REG_IF - 0x200] + mov r1, INTR_FLAG_SERIAL | INTR_FLAG_TIMER3 | INTR_FLAG_HBLANK + bic r2, r2, r0 + and r1, r1, r2 + strh r1, [r3, OFFSET_REG_IE - 0x200] + mrs r3, cpsr + bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK + orr r3, r3, PSR_SYS_MODE + msr cpsr_cf, r3 + ldr r1, =gIntrTable + add r1, r1, r12 + ldr r0, [r1] + stmdb sp!, {lr} + adr lr, IntrMain_RetAddr + bx r0 +IntrMain_RetAddr: + ldmia sp!, {lr} + mrs r3, cpsr + bic r3, r3, PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK + orr r3, r3, PSR_I_BIT | PSR_IRQ_MODE + msr cpsr_cf, r3 + ldmia sp!, {r0-r3,lr} + strh r2, [r3, OFFSET_REG_IE - 0x200] + strh r1, [r3, OFFSET_REG_IME - 0x200] + msr spsr_cf, r0 + bx lr + + .pool + + .align 2, 0 @ Don't pad with nop. diff --git a/src/libs/libagbsyscall.s b/src/libs/libagbsyscall.s new file mode 100644 index 000000000..cdf6ca905 --- /dev/null +++ b/src/libs/libagbsyscall.s @@ -0,0 +1,91 @@ + .include "include/macros.inc" + .syntax unified + + .text + + thumb_func_start ArcTan2 +ArcTan2: @ 81E07E0 + swi 0xA + bx lr + thumb_func_end ArcTan2 + + thumb_func_start BgAffineSet +BgAffineSet: @ 81E07E4 + swi 0xE + bx lr + thumb_func_end BgAffineSet + + thumb_func_start CpuFastSet +CpuFastSet: @ 81E07E8 + swi 0xC + bx lr + thumb_func_end CpuFastSet + + thumb_func_start CpuSet +CpuSet: @ 81E07EC + swi 0xB + bx lr + thumb_func_end CpuSet + + thumb_func_start LZ77UnCompVram +LZ77UnCompVram: @ 81E07F4 + swi 0x12 + bx lr + thumb_func_end LZ77UnCompVram + + thumb_func_start LZ77UnCompWram +LZ77UnCompWram: @ 81E07F8 + swi 0x11 + bx lr + thumb_func_end LZ77UnCompWram + + thumb_func_start ObjAffineSet +ObjAffineSet: @ 81E0804 + swi 0xF + bx lr + thumb_func_end ObjAffineSet + + thumb_func_start RLUnCompVram +RLUnCompVram: @ 81E0808 + swi 0x15 + bx lr + thumb_func_end RLUnCompVram + + thumb_func_start RLUnCompWram +RLUnCompWram: @ 81E080C + swi 0x14 + bx lr + thumb_func_end RLUnCompWram + + thumb_func_start RegisterRamReset +RegisterRamReset: @ 81E0810 + swi 0x1 + bx lr + thumb_func_end RegisterRamReset + + thumb_func_start SoftReset +SoftReset: @ 81E0814 + ldr r3, =0x04000208 + movs r2, 0 + strb r2, [r3] + ldr r1, =0x03007f00 @ User Stack + mov sp, r1 + swi 0x1 + swi 0 + .pool + thumb_func_end SoftReset + + thumb_func_start Sqrt +Sqrt: @ 81E082C + swi 0x8 + bx lr + thumb_func_end Sqrt + + thumb_func_start VBlankIntrWait +VBlankIntrWait: @ 81E0830 + movs r2, 0 + swi 0x5 + bx lr + thumb_func_end VBlankIntrWait + + .align 2, 0 @ Don't pad with nop. diff --git a/src/libs/libgcnmultiboot.s b/src/libs/libgcnmultiboot.s new file mode 100644 index 000000000..8c8b94998 --- /dev/null +++ b/src/libs/libgcnmultiboot.s @@ -0,0 +1,641 @@ +@ This library can be used to download and execute a multi-boot image from +@ a GameCube using the JOY Bus protocol over the link cable. + + .include "include/macros.inc" + .include "constants/constants.inc" + + .equiv GCMB_STRUCT_COUNTER1, 0x00 + .equiv GCMB_STRUCT_COUNTER2, 0x01 + .equiv GCMB_STRUCT_MBPROGRESS, 0x02 + .equiv GCMB_STRUCT_SAVEDVCOUNT, 0x03 + .equiv GCMB_STRUCT_KEYA, 0x04 + .equiv GCMB_STRUCT_KEYB, 0x08 + .equiv GCMB_STRUCT_KEYC, 0x0C + .equiv GCMB_STRUCT_BOOT_KEY, 0x10 + .equiv GCMB_STRUCT_IMAGE_SIZE, 0x12 + .equiv GCMB_STRUCT_SESSION_KEY, 0x14 + .equiv GCMB_STRUCT_HASH_VAL, 0x18 + .equiv GCMB_STRUCT_KEYC_DERIVATION, 0x1C + .equiv GCMB_STRUCT_BASE_DEST_PTR, 0x20 + .equiv GCMB_STRUCT_CUR_DEST_PTR, 0x24 + .equiv GCMB_STRUCT_SERIAL_INTR_HANDLER, 0x28 + + .equiv ROM_HEADER_NINTENDO_LOGO_OFFSET, 0x04 + .equiv ROM_HEADER_NINTENDO_LOGO_LENGTH, 0x98 + .equiv ROM_HEADER_NINTENDO_LOGO_END, 0xA0 + + .equiv MBPROGRESS_NONE, 0x00 + .equiv MBPROGRESS_LOGO_CORRECT, 0x01 + .equiv MBPROGRESS_READY_TO_BOOT, 0x02 + + .equiv GCMB_MAGIC_BOOTKEY_HASHVAL, 0xBB + .equiv GCMB_MAGIC_BOOTKEY, 0xBB + .equiv GCMB_MAGIC_COUNTER2, 0xCC + .equiv GCMB_MAGIC_KEYA, 0xDD + .equiv GCMB_MAGIC_KEYB, 0xEE + .equiv GCMB_MAGIC_KEYCDERIVATION, 0xFF + + .syntax unified + + .text + + thumb_func_start GameCubeMultiBoot_Hash +GameCubeMultiBoot_Hash: @ 81DCB38 + push {r4,lr} + ldr r4, pool_HashVal + eors r3, r1 + movs r2, 0x20 + +GameCubeMultiBoot_Hash_Loop: + lsrs r3, 1 + bcc GameCubeMultiBoot_Hash_SkipEor + + eors r3, r4 + +GameCubeMultiBoot_Hash_SkipEor: + subs r2, 0x1 + bne GameCubeMultiBoot_Hash_Loop + + pop {r4,pc} + thumb_func_end GameCubeMultiBoot_Hash + + thumb_func_start GameCubeMultiBoot_Main +@ void GameCubeMultiBoot_Main(struct GameCubeMultiBoot *mb)@ +GameCubeMultiBoot_Main: @ 81DCB4C + @ If there is no interrupt handler, skip counter manipulation + ldr r1, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER] + cmp r1, 0 + beq GameCubeMultiBoot_Main_SkipCounters + @ Increment the second counter + ldrb r1, [r0, GCMB_STRUCT_COUNTER2] + adds r1, 0x1 + strb r1, [r0, GCMB_STRUCT_COUNTER2] + @ If there is nothing more to do, bail out + ldrb r1, [r0, GCMB_STRUCT_MBPROGRESS] + cmp r1, MBPROGRESS_READY_TO_BOOT + beq GameCubeMultiBoot_Main_Return + @ Save current interrupt master register value + ldr r3, pool_InterruptRegs + ldrh r2, [r3, OFFSET_REG_IME - 0x200] + @ Disable all interrupts + movs r1, 0 + strh r1, [r3, OFFSET_REG_IME - 0x200] + @ Increment the first counter, if it's less than or equal to 10. + ldrb r1, [r0, GCMB_STRUCT_COUNTER1] + cmp r1, 0xA + bgt GameCubeMultiBoot_Main_SkipCounter1Inc + adds r1, 0x1 + strb r1, [r0, GCMB_STRUCT_COUNTER1] +GameCubeMultiBoot_Main_SkipCounter1Inc: + @ Load the saved interrupt master register value (re-enables interrupts if they were enabled before) + strh r2, [r3, OFFSET_REG_IME - 0x200] +GameCubeMultiBoot_Main_SkipCounters: + @ Initialise multiboot structures if required + bcs GameCubeMultiBoot_Init + @ Skip this section (check Nintendo logo) if the check has already passed + ldrb r1, [r0, GCMB_STRUCT_MBPROGRESS] + cmp r1, MBPROGRESS_NONE + bne GameCubeMultiBoot_Main_SkipLogoCheck + @ Bail out if no multiboot image data has been transferred yet + ldr r1, [r0, GCMB_STRUCT_CUR_DEST_PTR] + ldr r2, [r0, GCMB_STRUCT_BASE_DEST_PTR] + subs r1, r2 + beq GameCubeMultiBoot_Main_Return2 + @ Also bail out if not enough data has been transferred + cmp r1, ROM_HEADER_NINTENDO_LOGO_END + bcc GameCubeMultiBoot_Main_Return2 + @ Compare the Nintendo logo of the transferred multiboot image header, with the one in the ROM image of the inserted cart + push {r4-r6} + movs r1, ROM_HEADER_NINTENDO_LOGO_LENGTH + adds r2, ROM_HEADER_NINTENDO_LOGO_OFFSET + ldr r4, pool_NintendoLogo +GameCubeMultiBoot_Main_LogoCmpLoop: + ldm r2!, {r5} + ldm r4!, {r6} + cmp r5, r6 + bne GameCubeMultiBoot_Main_LogoCmpEnd + subs r1, 0x4 + bne GameCubeMultiBoot_Main_LogoCmpLoop + ldm r2!, {r5} + ldm r4!, {r6} + eors r5, r6 + lsrs r5, 8 + str r2, [r0, GCMB_STRUCT_BASE_DEST_PTR] +GameCubeMultiBoot_Main_LogoCmpEnd: + pop {r4-r6} + @ Throw everything away if the logo data didn't match + bne GameCubeMultiBoot_Init + @ Logo matched, set the relevent multiboot progress bit + movs r1, MBPROGRESS_LOGO_CORRECT + strb r1, [r0, GCMB_STRUCT_MBPROGRESS] + @ XOR together KeyA and KeyB to get the initial multiboot image checksum value + ldr r1, [r0, GCMB_STRUCT_KEYA] + ldr r2, [r0, GCMB_STRUCT_KEYB] + eors r1, r2 + str r1, [r0, GCMB_STRUCT_HASH_VAL] + @ ...also use it as the initial value for the image encryption session key. Algorithm is the same as the GBA BIOS multiboot: sessionkey = (initialvalue * 0x6177614b) + 1 + ldr r2, pool_Kawa + muls r1, r2 + adds r1, 0x1 + str r1, [r0, GCMB_STRUCT_SESSION_KEY] +GameCubeMultiBoot_Main_Return: + bx lr +GameCubeMultiBoot_Main_SkipLogoCheck: + @ If this code is executed, then the logo check has passed, and the data being transferred in is encrypted. + @ Set up registers. + ldr r1, [r0, GCMB_STRUCT_CUR_DEST_PTR] + mov r12, r1 + ldr r3, [r0, GCMB_STRUCT_HASH_VAL] + push {r4-r7} + ldr r4, [r0, GCMB_STRUCT_BASE_DEST_PTR] + ldr r5, pool_Kawa + ldr r6, [r0, GCMB_STRUCT_SESSION_KEY] + ldr r7, pool_HashVal +GameCubeMultiBoot_Main_ImageDecryptHashLoop: + @ If there's no more data, break out of the loop + cmp r4, r12 + bcs GameCubeMultiBoot_Main_ImageDecryptHashEnd + @ Get the next uint32 + ldr r1, [r4] + @ Decrypt the ciphertext: plaintext = (ciphertext ^ sessionkey) + hashval + eors r1, r6 + adds r1, r3 + @ Save the current uint32 of plaintext and advance the pointer + stm r4!, {r1} + @ Advance the hashval with this uint32 of plaintext -- this is the same code as GameCubeMultiBoot_Hash. + eors r3, r1 + movs r2, 0x20 +GameCubeMultiBoot_Main_HashLoop: + lsrs r3, 1 + bcc GameCubeMultiBoot_Main_HashSkipEor + eors r3, r7 +GameCubeMultiBoot_Main_HashSkipEor: + subs r2, 0x1 + bne GameCubeMultiBoot_Main_HashLoop + @ Advance the sessionkey with the usual algorithm: sessionkey = (sessionkey * 0x6177614b) + 1 + muls r6, r5 + adds r6, 0x1 + b GameCubeMultiBoot_Main_ImageDecryptHashLoop +GameCubeMultiBoot_Main_ImageDecryptHashEnd: + @ Save the new pointer, sessionkey, hashval + str r4, [r0, GCMB_STRUCT_BASE_DEST_PTR] + str r6, [r0, GCMB_STRUCT_SESSION_KEY] + pop {r4-r7} + str r3, [r0, GCMB_STRUCT_HASH_VAL] + @ Bail out if the image size is unknown + ldrh r1, [r0, GCMB_STRUCT_IMAGE_SIZE] + cmp r1, 0 + bne GameCubeMultiBoot_Main_Return2 + @ Bail out if no image data has been transferred + ldr r1, [r0, GCMB_STRUCT_CUR_DEST_PTR] + ldr r2, [r0, GCMB_STRUCT_BASE_DEST_PTR] + cmp r1, r2 + bne GameCubeMultiBoot_Main_Return2 + @ If KeyC hasn't been generated yet, go generate it + ldr r1, [r0, GCMB_STRUCT_KEYC] + cmp r1, 0 + beq GameCubeMultiBoot_Main_GenerateKeyC + @ If the other side hasn't sent its boot key yet, bail out + ldrh r1, [r0, GCMB_STRUCT_BOOT_KEY] + cmp r1, 0 + beq GameCubeMultiBoot_Main_Return + @ Save off LR so it doesn't get clobbered by the upcoming function call + mov r12, lr + @ Generate the real boot key, which is the checksum of a hardcoded value and KeyC + movs r1, GCMB_MAGIC_BOOTKEY_HASHVAL + ldr r3, [r0, GCMB_STRUCT_KEYC] + bl GameCubeMultiBoot_Hash + ldrh r1, [r0, GCMB_STRUCT_BOOT_KEY] + @ Restore the saved LR value + mov lr, r12 + @ Compare the two boot keys (real and passed in), if they don't match then throw everything away + subs r1, r3 + bne GameCubeMultiBoot_Init + @ The two boot keys matched, tell the caller that the image is ready to boot + movs r1, MBPROGRESS_READY_TO_BOOT + strb r1, [r0, GCMB_STRUCT_MBPROGRESS] + @ Nothing more to do, return. + bx lr +GameCubeMultiBoot_Main_GenerateKeyC: + @ Save off LR so it doesn't get clobbered by the upcoming function call + mov r12, lr + @ KeyC = (SavedVCount << 24) - 1 + ldrb r1, [r0, GCMB_STRUCT_SAVEDVCOUNT] + lsls r1, 24 + subs r1, 0x1 + str r1, [r0, GCMB_STRUCT_KEYC] + @ Hash the KeyC with the multiboot image checksum to generate the KeyC derivation material to be sent to the other side of the link + bl GameCubeMultiBoot_Hash + @ Make sure the sent KeyC derivation material contains a magic value so that the other side can detect it + lsls r3, 8 + adds r3, GCMB_MAGIC_KEYCDERIVATION + @ Save off the KeyC derivation material and return to caller + str r3, [r0, GCMB_STRUCT_KEYC_DERIVATION] + bx r12 +GameCubeMultiBoot_Main_Return2: + bx lr + thumb_func_end GameCubeMultiBoot_Main + + .align 2, 0 + +pool_HashVal: .4byte 0xa1c1 + +pool_Kawa: .ascii "Kawa" @ name of BIOS developer + +pool_NintendoLogo: .4byte RomHeaderNintendoLogo + + thumb_func_start GameCubeMultiBoot_ExecuteProgram +@ void GameCubeMultiBoot_ExecuteProgram(struct GameCubeMultiBoot *mb)@ +GameCubeMultiBoot_ExecuteProgram: @ 81DCC4C + @ If there's no multiboot image ready, just return to caller + ldrb r1, [r0, GCMB_STRUCT_MBPROGRESS] + cmp r1, MBPROGRESS_READY_TO_BOOT + bne GameCubeMultiBoot_ExecuteProgram_Fail + @ Disable interrupts + ldr r3, pool_InterruptRegs + movs r1, 0 + strh r1, [r3, OFFSET_REG_IME - 0x200] + @ Jump to the real entry point of the multiboot image (past the image header), in ARM mode + ldr r1, pool_MultiBootLoadAddr + adds r1, 0xC0 + bx r1 +GameCubeMultiBoot_ExecuteProgram_Fail: + bx lr + thumb_func_end GameCubeMultiBoot_ExecuteProgram + + thumb_func_start GameCubeMultiBoot_Init +@ void GameCubeMultiBoot_Init(struct GameCubeMultiBoot *mb)@ +GameCubeMultiBoot_Init: @ 81DCC60 + ldr r3, pool_InterruptRegs + +@ Save IME register. + ldrh r2, [r3, OFFSET_REG_IME - 0x200] + +@ Disable interrupts. + movs r1, 0 + strh r1, [r3, OFFSET_REG_IME - 0x200] + +@ Set the handler to the "Stop" routine. +@ Unless the first command that is received is a device reset command, the +@ "Stop" routine will be executed and no further commands will be processed. + adr r3, GcMbIntrHandler_Stop + str r3, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER] + + ldrb r3, [r0, 0x3] + push {r3} + ldrb r3, [r0, 0x1] + push {r0,r3} + + adds r3, r0, 0 + adds r3, GCMB_STRUCT_BASE_DEST_PTR + +@ clear all but the last 3 fields of the struct +GameCubeMultiBoot_Init_ClearStructLoop: + stm r0!, {r1} + cmp r0, r3 + blo GameCubeMultiBoot_Init_ClearStructLoop + + pop {r0,r3} + lsrs r3, 1 + strb r3, [r0, 0x3] + pop {r3} + strb r3, [r0, 0x1] + + ldr r3, pool_SerialRegs + +@ Turn off JOY Bus mode. + lsls r0, r3, 10 + strh r0, [r3, OFFSET_REG_RCNT - 0x120] + +@ Turn on JOY Bus mode. + movs r0, 0xC0 + lsls r0, 8 + strh r0, [r3, OFFSET_REG_RCNT - 0x120] + +@ Init JOY Bus registers. + movs r0, 0x47 + strh r0, [r3, OFFSET_REG_JOYCNT - 0x120] + strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120] + + ldr r3, pool_InterruptRegs + +@ Acknowledge serial interrupt. + movs r0, INTR_FLAG_SERIAL + strh r0, [r3, OFFSET_REG_IF - 0x200] + +@ Enable serial interrupt. + ldrh r1, [r3, OFFSET_REG_IE - 0x200] + orrs r1, r0 + strh r1, [r3, OFFSET_REG_IE - 0x200] + +@ Restore IME register. + strh r2, [r3, OFFSET_REG_IME - 0x200] + + bx lr + thumb_func_end GameCubeMultiBoot_Init + + non_word_aligned_thumb_func_start GameCubeMultiBoot_HandleSerialInterrupt +@ void GameCubeMultiBoot_HandleSerialInterrupt(struct GameCubeMultiBoot *mb)@ +GameCubeMultiBoot_HandleSerialInterrupt: @ 81DCCAA + ldr r3, pool_SerialRegs + +@ Acknowledge reset/receive/send flags. + ldrh r1, [r3, OFFSET_REG_JOYCNT - 0x120] + strh r1, [r3, OFFSET_REG_JOYCNT - 0x120] + + movs r2, 0 + strb r2, [r0] + + ldr r2, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER] + cmp r2, 0 + beq GameCubeMultiBoot_HandleSerialInterruptDone + + lsrs r1, 1 @ was a device reset command received? + bcs GameCubeMultiBoot_BeginHandshake @ branch if so + + mov pc, r2 + + .align 2, 0 + +@ Zero the status and the interrupt handler pointer. +@ Commands from the GameCube will not be processed after this is executed +@ unless GameCubeMultiBoot_Init() is called again. +GcMbIntrHandler_Stop: + movs r2, 0 + strh r2, [r3, OFFSET_REG_JOYSTAT - 0x120] + +GameCubeMultiBoot_SetInterruptHandler: + str r2, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER] + +GameCubeMultiBoot_ReadVCount: + ldr r3, pool_RegDispstat + ldrh r1, [r3, OFFSET_REG_VCOUNT - OFFSET_REG_DISPSTAT] + strb r1, [r0, 0x3] + +GameCubeMultiBoot_HandleSerialInterruptDone: + bx lr + +GameCubeMultiBoot_BeginHandshake: + @ Throw away anything that got sent + ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] + @ Send the game code, the other side of the link must send back the same game code + ldr r1, pool_RubyUSAGameCode + str r1, [r3, OFFSET_REG_JOY_TRANS - 0x120] + movs r1, 0x10 + strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120] + @ Use the saved VCount value to provide 8 bits of entropy for KeyB + ldrb r1, [r0, GCMB_STRUCT_SAVEDVCOUNT] + strb r1, [r0, GCMB_STRUCT_KEYB + 1] + @ If a multiboot image has been transferred at least enough such that the Nintendo logo check has passed, stop everything. + ldrb r1, [r0, GCMB_STRUCT_MBPROGRESS] + cmp r1, 0 + bne GcMbIntrHandler_Stop + @ Set the image destination pointers. + ldr r1, pool_MultiBootLoadAddr + str r1, [r0, GCMB_STRUCT_BASE_DEST_PTR] + str r1, [r0, GCMB_STRUCT_CUR_DEST_PTR] + @ Set the new interrupt handler. + adr r2, GcMbIntrHandler_CheckGameCodeSent + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckGameCodeSent: @ 81DCCEC + lsls r1, 31 + bcc GcMbIntrHandler_Stop @ stop if send failed + bmi GameCubeMultiBoot_CheckHandshakeResponse @ branch if receive is complete + +@ If the response hasn't been fully received yet, +@ check again upon the next interrupt. + adr r2, GcMbIntrHandler_CheckHandshakeResponse + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckHandshakeResponse: @ 81DCCF8 + lsrs r1, 1 @ is receive complete? + bcc GcMbIntrHandler_Stop @ stop if not + +GameCubeMultiBoot_CheckHandshakeResponse: + ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] + ldr r2, pool_RubyUSAGameCode + cmp r1, r2 + bne GcMbIntrHandler_Stop @ stop if the GameCube didn't reply with the same game code + @ Use the saved VCount value to provide another 8 bits of entropy for KeyB. + ldrb r1, [r0, GCMB_STRUCT_SAVEDVCOUNT] + strb r1, [r0, GCMB_STRUCT_KEYB + 3] + adr r2, GcMbIntrHandler_ReceiveKeyA + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_ReceiveKeyA: @ 81DCD0C + lsrs r1, 1 @ is receive complete? + bcc GcMbIntrHandler_Stop @ branch if not + ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] + @ make sure top 8 bits of the received value is the KeyA magic number, stop if KeyA is invalid + lsrs r2, r1, 24 + cmp r2, GCMB_MAGIC_KEYA + bne GcMbIntrHandler_Stop + @ save received KeyA + str r1, [r0, GCMB_STRUCT_KEYA] + @ use the second GameCubeMultiBoot_Main() counter as another 8 bits of entropy for KeyB + ldrb r1, [r0, GCMB_STRUCT_COUNTER2] + strb r1, [r0, GCMB_STRUCT_KEYB + 2] + movs r2, 0 + movs r3, 0 + ldr r1, [r0, GCMB_STRUCT_KEYB] + lsrs r1, 8 + @ make sure KeyB is valid (other side of the link is supposed to check KeyB too), if it's not then change the byte that was just set so it is +GameCubeMultiBoot_KeyBCheckLoop: + lsrs r1, 1 + adcs r2, r3 + cmp r1, 0 + bne GameCubeMultiBoot_KeyBCheckLoop + cmp r2, 0xE + bgt GameCubeMultiBoot_KeyBSaveNewByte + cmp r2, 0x7 + bge GameCubeMultiBoot_KeyBCheckEnd + movs r1, 0xFF +GameCubeMultiBoot_KeyBSaveNewByte: + strb r1, [r0, GCMB_STRUCT_KEYB + 2] +GameCubeMultiBoot_KeyBCheckEnd: + @ add in the KeyB magic number and send off KeyB + ldr r1, [r0, GCMB_STRUCT_KEYB] + adds r1, GCMB_MAGIC_KEYB + ldr r3, pool_SerialRegs + str r1, [r3, OFFSET_REG_JOY_TRANS - 0x120] + movs r1, 0x30 + strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120] + @ set new interrupt handler + adr r2, GcMbIntrHandler_CheckKeyBSent + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckKeyBSent: @ 81DCD4C + lsls r1, 31 + bcc GcMbIntrHandler_Stop @ stop if send failed + bmi GameCubeMultiBoot_CheckImageSizeResponse @ branch if receive is complete + adr r2, GcMbIntrHandler_CheckImageSizeResponse + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckImageSizeResponse: @ 81DCD58 + lsrs r1, 1 @ is receive complete? + bcc GcMbIntrHandler_Stop @ branch if not +GameCubeMultiBoot_CheckImageSizeResponse: + ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] + ldr r2, GameCubeMultiBoot_MaximumImageSizeUInt32s + cmp r1, r2 + bhs GcMbIntrHandler_Stop + adds r1, 0x1 + adds r1, r1 + strh r1, [r0, GCMB_STRUCT_IMAGE_SIZE] + ldrb r1, [r0, GCMB_STRUCT_MBPROGRESS] + cmp r1, 0 +GcMbIntrHandler_StopIfNotEqual: + bne GcMbIntrHandler_Stop + ldr r1, pool_MultiBootLoadAddr + str r1, [r0, GCMB_STRUCT_BASE_DEST_PTR] + str r1, [r0, GCMB_STRUCT_CUR_DEST_PTR] + adr r2, GcMbIntrHandler_CheckImageResponse + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckImageResponse: @ 81DCD7C + lsrs r1, 1 @ is receive complete? + bcc GcMbIntrHandler_Stop @ branch if not + ldr r2, [r0, GCMB_STRUCT_CUR_DEST_PTR] + movs r1, 0x4 + ands r1, r2 + adds r1, 0x8 + lsls r1, 2 + strh r1, [r3, OFFSET_REG_JOYSTAT - 0x120] + @ get the recieved uint32 + ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] + @ put it in the current destination pointer and advance that pointer + stm r2!, {r1} + @ save off the advanced pointer + str r2, [r0, GCMB_STRUCT_CUR_DEST_PTR] + @ decrease the image size (in uint32s) + ldrh r1, [r0, GCMB_STRUCT_IMAGE_SIZE] + subs r1, 0x1 + strh r1, [r0, GCMB_STRUCT_IMAGE_SIZE] + @ branch away if the transfer is not yet complete + bne GameCubeMultiBoot_ReadVCount + +GcMbIntrHandler_SendCounter2: + @ send counter2 with magic number + ldrb r1, [r0, GCMB_STRUCT_COUNTER2] + lsls r1, 8 + adds r1, GCMB_MAGIC_COUNTER2 + str r1, [r3, OFFSET_REG_JOY_TRANS - 0x120] + adr r2, GcMbIntrHandler_CheckCounter2Sent + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckCounter2Sent: + lsls r1, 31 + +GcMbIntrHandler_StopIfSendFailed: + bcc GcMbIntrHandler_Stop @ stop if send failed + @ if KeyC derivation value has not yet been generated, send Counter2 again, otherwise, send KeyC derivation + ldr r1, [r0, GCMB_STRUCT_KEYC_DERIVATION] + cmp r1, 0 + beq GcMbIntrHandler_SendCounter2 + str r1, [r3, OFFSET_REG_JOY_TRANS - 0x120] + adr r2, GcMbIntrHandler_CheckKeyCDerivationSent + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckKeyCDerivationSent: @ 81DCDB8 + lsls r1, 31 + bcc GcMbIntrHandler_StopIfSendFailed @ branch if send failed + bmi GameCubeMultiBoot_CheckBootKeyResponse @ branch if receive is complete + adr r2, GcMbIntrHandler_CheckBootKeyResponse + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_CheckBootKeyResponse: @ 81DCDC4 + lsrs r1, 1 @ is receive complete? + bcc GcMbIntrHandler_StopIfSendFailed @ branch if not + +GameCubeMultiBoot_CheckBootKeyResponse: + ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] + @ make sure received boot key contains expected magic number, stop if not + lsrs r2, r1, 24 + cmp r2, GCMB_MAGIC_BOOTKEY + bne GcMbIntrHandler_StopIfNotEqual + @ save received bootkey to be checked in GameCubeMultiBoot_Main() + strh r1, [r0, GCMB_STRUCT_BOOT_KEY] + @ stop if anything more gets sent + adr r2, GcMbIntrHandler_StopUnconditionally + b GameCubeMultiBoot_SetInterruptHandler + + .align 2, 0 + +GcMbIntrHandler_StopUnconditionally: @ 81DCDD8 + b GcMbIntrHandler_Stop + + thumb_func_end GameCubeMultiBoot_HandleSerialInterrupt + + non_word_aligned_thumb_func_start GameCubeMultiBoot_Quit +@ void GameCubeMultiBoot_Quit()@ +GameCubeMultiBoot_Quit: @ 81DCDDA + ldr r3, pool_InterruptRegs + +@ Save IME register. + ldrh r2, [r3, OFFSET_REG_IME - 0x200] + +@ Disable interrupts. + movs r1, 0 + strh r1, [r3, OFFSET_REG_IME - 0x200] + + ldr r3, pool_SerialRegs + +@ Acknowledge all JOYCNT flags. + movs r0, 0x7 + strh r0, [r3, OFFSET_REG_JOYCNT - 0x120] + +@ Turn off JOY Bus mode. + lsls r0, r3, 10 + strh r0, [r3, OFFSET_REG_RCNT - 0x120] @ store 0x8000 + + ldr r3, pool_InterruptRegs + +@ Acknowledge serial interrupt. + movs r0, INTR_FLAG_SERIAL + strh r0, [r3, OFFSET_REG_IF - 0x200] + +@ Disable serial interrupt. + ldrh r1, [r3, OFFSET_REG_IE - 0x200] + bics r1, r0 + strh r1, [r3, OFFSET_REG_IE - 0x200] + +@ Restore IME register. + strh r2, [r3, OFFSET_REG_IME - 0x200] + + bx lr + thumb_func_end GameCubeMultiBoot_Quit + + .align 2, 0 + +GameCubeMultiBoot_MaximumImageSizeUInt32s: .4byte 0x00004000 + +pool_InterruptRegs: .4byte REG_BASE + 0x200 + +pool_SerialRegs: .4byte REG_BASE + 0x120 + +pool_RegDispstat: .4byte REG_DISPSTAT + +pool_RubyUSAGameCode: .ascii "AXVE" + +pool_MultiBootLoadAddr: .4byte EWRAM_START + + .align 2, 0 @ Don't pad with nop. diff --git a/src/libs/m4a_1.s b/src/libs/m4a_1.s new file mode 100644 index 000000000..be8b44488 --- /dev/null +++ b/src/libs/m4a_1.s @@ -0,0 +1,1911 @@ + .include "include/macros.inc" + .include "constants/gba_constants.inc" + .include "constants/m4a_constants.inc" + + .syntax unified + + .lcomm gUnknown_030007B8, 0x770 + + .text + + thumb_func_start umul3232H32 +umul3232H32: + adr r2, __umul3232H32 + bx r2 + .arm +__umul3232H32: + umull r2, r3, r0, r1 + add r0, r3, 0 + bx lr + thumb_func_end umul3232H32 + + thumb_func_start SoundMain +SoundMain: + ldr r0, lt_SOUND_INFO_PTR + ldr r0, [r0] + ldr r2, lt_ID_NUMBER + ldr r3, [r0, o_SoundInfo_ident] + cmp r2, r3 + beq SoundMain_1 + bx lr @ Exit the function if ident doesn't match ID_NUMBER. +SoundMain_1: + adds r3, 1 + str r3, [r0, o_SoundInfo_ident] + push {r4-r7,lr} + mov r1, r8 + mov r2, r9 + mov r3, r10 + mov r4, r11 + push {r0-r4} + sub sp, 0x18 + ldrb r1, [r0, o_SoundInfo_maxLines] + cmp r1, 0 @ if maxLines is 0, there is no maximum + beq SoundMain_3 + ldr r2, lt_REG_VCOUNT + ldrb r2, [r2] + cmp r2, VCOUNT_VBLANK + bhs SoundMain_2 + adds r2, TOTAL_SCANLINES +SoundMain_2: + adds r1, r2 +SoundMain_3: + str r1, [sp, 0x14] + ldr r3, [r0, o_SoundInfo_func] + cmp r3, 0 + beq SoundMain_4 + ldr r0, [r0, o_SoundInfo_intp] + bl _081DD25E + ldr r0, [sp, 0x18] +SoundMain_4: + ldr r3, [r0, o_SoundInfo_CgbSound] + bl _081DD25E + ldr r0, [sp, 0x18] + ldr r3, [r0, o_SoundInfo_pcmSamplesPerVBlank] + mov r8, r3 + ldr r5, lt_o_SoundInfo_pcmBuffer + adds r5, r0 + ldrb r4, [r0, o_SoundInfo_pcmDmaCounter] + subs r7, r4, 1 + bls SoundMain_5 + ldrb r1, [r0, o_SoundInfo_pcmDmaPeriod] + subs r1, r7 + mov r2, r8 + muls r2, r1 + adds r5, r2 +SoundMain_5: + str r5, [sp, 0x8] + ldr r6, lt_PCM_DMA_BUF_SIZE + ldr r3, lt_SoundMainRAM_Buffer + bx r3 + + .align 2, 0 +lt_SOUND_INFO_PTR: .word SOUND_INFO_PTR +lt_ID_NUMBER: .word ID_NUMBER +lt_SoundMainRAM_Buffer: .word SoundMainRAM_Buffer + 1 +lt_REG_VCOUNT: .word REG_VCOUNT +lt_o_SoundInfo_pcmBuffer: .word o_SoundInfo_pcmBuffer +lt_PCM_DMA_BUF_SIZE: .word PCM_DMA_BUF_SIZE + thumb_func_end SoundMain + + thumb_func_start SoundMainRAM +SoundMainRAM: + ldrb r3, [r0, o_SoundInfo_reverb] + cmp r3, 0 + beq SoundMainRAM_NoReverb + adr r1, SoundMainRAM_Reverb + bx r1 + .arm +SoundMainRAM_Reverb: + cmp r4, 0x2 + addeq r7, r0, o_SoundInfo_pcmBuffer + addne r7, r5, r8 + mov r4, r8 +_081DCEC4: + ldrsb r0, [r5, r6] + ldrsb r1, [r5] + add r0, r0, r1 + ldrsb r1, [r7, r6] + add r0, r0, r1 + ldrsb r1, [r7], 0x1 + add r0, r0, r1 + mul r1, r0, r3 + mov r0, r1, asr 9 + tst r0, 0x80 + addne r0, r0, 0x1 + strb r0, [r5, r6] + strb r0, [r5], 0x1 + subs r4, r4, 0x1 + bgt _081DCEC4 + adr r0, _081DCF36 + 1 @ plus 1 because THUMB + bx r0 + .thumb +SoundMainRAM_NoReverb: + movs r0, 0 + mov r1, r8 + adds r6, r5 + lsrs r1, 3 + bcc SoundMainRAM_NoReverb_Ok + stm r5!, {r0} + stm r6!, {r0} +SoundMainRAM_NoReverb_Ok: + lsrs r1, 1 + bcc SoundMainRAM_NoReverb_Loop + stm r5!, {r0} + stm r6!, {r0} + stm r5!, {r0} + stm r6!, {r0} +SoundMainRAM_NoReverb_Loop: + stm r5!, {r0} + stm r6!, {r0} + stm r5!, {r0} + stm r6!, {r0} + stm r5!, {r0} + stm r6!, {r0} + stm r5!, {r0} + stm r6!, {r0} + subs r1, 1 + bgt SoundMainRAM_NoReverb_Loop +_081DCF36: + ldr r4, [sp, 0x18] + ldr r0, [r4, o_SoundInfo_divFreq] + mov r12, r0 + ldrb r0, [r4, o_SoundInfo_maxChans] + adds r4, o_SoundInfo_chans + +SoundMainRAM_ChanLoop: + str r0, [sp, 0x4] + ldr r3, [r4, o_SoundChannel_wav] + ldr r0, [sp, 0x14] + cmp r0, 0 + beq _081DCF60 + ldr r1, =REG_VCOUNT + ldrb r1, [r1] + cmp r1, VCOUNT_VBLANK + bhs _081DCF54 + adds r1, TOTAL_SCANLINES +_081DCF54: + cmp r1, r0 + blo _081DCF60 + b _081DD24A + + .pool + +_081DCF60: + ldrb r6, [r4, o_SoundChannel_status] + movs r0, 0xC7 + tst r0, r6 + bne _081DCF6A + b _081DD240 +_081DCF6A: + movs r0, 0x80 + tst r0, r6 + beq _081DCFA0 + movs r0, 0x40 + tst r0, r6 + bne _081DCFB0 + movs r6, 0x3 + strb r6, [r4, o_SoundChannel_status] + adds r0, r3, 0 + adds r0, 0x10 + ldr r1, [r4, o_SoundChannel_ct] + adds r0, r1 + str r0, [r4, o_SoundChannel_cp] + ldr r0, [r3, 0xC] + subs r0, r1 + str r0, [r4, o_SoundChannel_ct] + movs r5, 0 + strb r5, [r4, o_SoundChannel_ev] + str r5, [r4, o_SoundChannel_fw] + ldrb r2, [r3, 0x3] + movs r0, 0xC0 + tst r0, r2 + beq _081DCFF8 + movs r0, 0x10 + orrs r6, r0 + strb r6, [r4, o_SoundChannel_status] + b _081DCFF8 +_081DCFA0: + ldrb r5, [r4, o_SoundChannel_ev] + movs r0, 0x4 + tst r0, r6 + beq _081DCFB6 + ldrb r0, [r4, o_SoundChannel_iel] + subs r0, 1 + strb r0, [r4, o_SoundChannel_iel] + bhi _081DD006 +_081DCFB0: + movs r0, 0 + strb r0, [r4, o_SoundChannel_status] + b _081DD240 +_081DCFB6: + movs r0, 0x40 + tst r0, r6 + beq _081DCFD6 + ldrb r0, [r4, o_SoundChannel_release] + muls r5, r0 + lsrs r5, 8 + ldrb r0, [r4, o_SoundChannel_iev] + cmp r5, r0 + bhi _081DD006 +_081DCFC8: + ldrb r5, [r4, o_SoundChannel_iev] + cmp r5, 0 + beq _081DCFB0 + movs r0, 0x4 + orrs r6, r0 + strb r6, [r4, o_SoundChannel_status] + b _081DD006 +_081DCFD6: + movs r2, 0x3 + ands r2, r6 + cmp r2, 0x2 + bne _081DCFF4 + ldrb r0, [r4, o_SoundChannel_decay] + muls r5, r0 + lsrs r5, 8 + ldrb r0, [r4, o_SoundChannel_sustain] + cmp r5, r0 + bhi _081DD006 + adds r5, r0, 0 + beq _081DCFC8 + subs r6, 0x1 + strb r6, [r4, o_SoundChannel_status] + b _081DD006 +_081DCFF4: + cmp r2, 0x3 + bne _081DD006 +_081DCFF8: + ldrb r0, [r4, o_SoundChannel_attack] + adds r5, r0 + cmp r5, 0xFF + bcc _081DD006 + movs r5, 0xFF + subs r6, 0x1 + strb r6, [r4, o_SoundChannel_status] +_081DD006: + strb r5, [r4, o_SoundChannel_ev] + ldr r0, [sp, 0x18] + ldrb r0, [r0, o_SoundChannel_release] + adds r0, 0x1 + muls r0, r5 + lsrs r5, r0, 4 + ldrb r0, [r4, o_SoundChannel_rightVolume] + muls r0, r5 + lsrs r0, 8 + strb r0, [r4, o_SoundChannel_er] + ldrb r0, [r4, o_SoundChannel_leftVolume] + muls r0, r5 + lsrs r0, 8 + strb r0, [r4, o_SoundChannel_el] + movs r0, 0x10 + ands r0, r6 + str r0, [sp, 0x10] + beq _081DD03A + adds r0, r3, 0 + adds r0, 0x10 + ldr r1, [r3, 0x8] + adds r0, r1 + str r0, [sp, 0xC] + ldr r0, [r3, 0xC] + subs r0, r1 + str r0, [sp, 0x10] +_081DD03A: + ldr r5, [sp, 0x8] + ldr r2, [r4, o_SoundChannel_ct] + ldr r3, [r4, o_SoundChannel_cp] + adr r0, _081DD044 + bx r0 + .arm +_081DD044: + str r8, [sp] + ldr r9, [r4, o_SoundChannel_fw] + ldrb r10, [r4, o_SoundChannel_er] + ldrb r11, [r4, o_SoundChannel_el] + ldrb r0, [r4, o_SoundChannel_type] + tst r0, 0x30 + beq _081DD068 + bl sub_81DD264 + b _081DD228 +_081DD068: + mov r10, r10, lsl 16 + mov r11, r11, lsl 16 + ldrb r0, [r4, o_SoundChannel_type] + tst r0, 0x8 + beq _081DD19C +_081DD07C: + cmp r2, 0x4 + ble _081DD0EC + subs r2, r2, r8 + movgt r9, 0 + bgt _081DD0A8 + mov r9, r8 + add r2, r2, r8 + sub r8, r2, 0x4 + sub r9, r9, r8 + ands r2, r2, 0x3 + moveq r2, 0x4 +_081DD0A8: + ldr r6, [r5] + ldr r7, [r5, 0x630] +_081DD0B0: + ldrsb r0, [r3], 0x1 + mul r1, r10, r0 + bic r1, r1, 0xFF0000 + add r6, r1, r6, ror 8 + mul r1, r11, r0 + bic r1, r1, 0xFF0000 + add r7, r1, r7, ror 8 + adds r5, r5, 0x40000000 + bcc _081DD0B0 + str r7, [r5, 0x630] + str r6, [r5], 0x4 + subs r8, r8, 0x4 + bgt _081DD0A8 + adds r8, r8, r9 + beq _081DD22C +_081DD0EC: + ldr r6, [r5] + ldr r7, [r5, 0x630] +_081DD0F4: + ldrsb r0, [r3], 0x1 + mul r1, r10, r0 + bic r1, r1, 0xFF0000 + add r6, r1, r6, ror 8 + mul r1, r11, r0 + bic r1, r1, 0xFF0000 + add r7, r1, r7, ror 8 + subs r2, r2, 0x1 + beq _081DD164 +_081DD118: + adds r5, r5, 0x40000000 + bcc _081DD0F4 + str r7, [r5, 0x630] + str r6, [r5], 0x4 + subs r8, r8, 0x4 + bgt _081DD07C + b _081DD22C +_081DD134: + ldr r0, [sp, 0x18] + cmp r0, 0 + beq _081DD158 + ldr r3, [sp, 0x14] + rsb lr, r2, 0 +_081DD148: + adds r2, r0, r2 + bgt _081DD1FC + sub lr, lr, r0 + b _081DD148 +_081DD158: + pop {r4,r12} + mov r2, 0 + b _081DD174 +_081DD164: + ldr r2, [sp, 0x10] + cmp r2, 0 + ldrne r3, [sp, 0xC] + bne _081DD118 +_081DD174: + strb r2, [r4, o_SoundChannel_status] + mov r0, r5, lsr 30 + bic r5, r5, 0xC0000000 + rsb r0, r0, 0x3 + mov r0, r0, lsl 3 + mov r6, r6, ror r0 + mov r7, r7, ror r0 + str r7, [r5, 0x630] + str r6, [r5], 0x4 + b _081DD234 +_081DD19C: + push {r4,r12} + ldr r1, [r4, o_SoundChannel_freq] + mul r4, r12, r1 + ldrsb r0, [r3] + ldrsb r1, [r3, 0x1]! + sub r1, r1, r0 +_081DD1B4: + ldr r6, [r5] + ldr r7, [r5, 0x630] +_081DD1BC: + mul lr, r9, r1 + add lr, r0, lr, asr 23 + mul r12, r10, lr + bic r12, r12, 0xFF0000 + add r6, r12, r6, ror 8 + mul r12, r11, lr + bic r12, r12, 0xFF0000 + add r7, r12, r7, ror 8 + add r9, r9, r4 + movs lr, r9, lsr 23 + beq _081DD208 + bic r9, r9, 0x3F800000 + subs r2, r2, lr + ble _081DD134 + subs lr, lr, 0x1 + addeq r0, r0, r1 +_081DD1FC: + ldrsbne r0, [r3, lr]! + ldrsb r1, [r3, 0x1]! + sub r1, r1, r0 +_081DD208: + adds r5, r5, 0x40000000 + bcc _081DD1BC + str r7, [r5, 0x630] + str r6, [r5], 0x4 + subs r8, r8, 0x4 + bgt _081DD1B4 + sub r3, r3, 0x1 + pop {r4,r12} +_081DD228: + str r9, [r4, o_SoundChannel_fw] +_081DD22C: + str r2, [r4, o_SoundChannel_ct] + str r3, [r4, o_SoundChannel_cp] +_081DD234: + ldr r8, [sp] + add r0, pc, 0x1 + bx r0 + .thumb +_081DD240: + ldr r0, [sp, 0x4] + subs r0, 1 + ble _081DD24A + adds r4, SoundChannel_size + b SoundMainRAM_ChanLoop +_081DD24A: + ldr r0, [sp, 0x18] + ldr r3, =ID_NUMBER + str r3, [r0] + add sp, 0x1C + pop {r0-r7} + mov r8, r0 + mov r9, r1 + mov r10, r2 + mov r11, r3 + pop {r3} +_081DD25E: + bx r3 + .pool + thumb_func_end SoundMainRAM + + arm_func_start sub_81DD264 +sub_81DD264: + ldr r6, [r4, o_SoundChannel_wav] + ldrb r0, [r4, o_SoundChannel_status] + tst r0, 0x20 + bne _081DD2B4 + orr r0, r0, 0x20 + strb r0, [r4, o_SoundChannel_status] + ldrb r0, [r4, o_SoundChannel_type] + tst r0, 0x10 + beq _081DD29C + ldr r1, [r6, 0xC] + add r1, r1, r6, lsl 1 + add r1, r1, 0x20 + sub r3, r1, r3 + str r3, [r4, o_SoundChannel_cp] +_081DD29C: + ldrh r0, [r6] + cmp r0, 0 + beq _081DD2B4 + sub r3, r3, r6 + sub r3, r3, 0x10 + str r3, [r4, o_SoundChannel_cp] +_081DD2B4: + push {r8,r12,lr} + mov r10, r10, lsl 16 + mov r11, r11, lsl 16 + ldr r1, [r4, o_SoundChannel_freq] + ldrb r0, [r4, o_SoundChannel_type] + tst r0, 0x8 + movne r8, 0x800000 + muleq r8, r12, r1 + ldrh r0, [r6] + cmp r0, 0 + beq _081DD468 + mov r0, 0xFF000000 + str r0, [r4, o_SoundChannel_xpi] + ldrb r0, [r4, o_SoundChannel_type] + tst r0, 0x10 + bne _081DD3C0 + bl sub_81DD520 + mov r0, r1 + add r3, r3, 0x1 + bl sub_81DD520 + sub r1, r1, r0 +_081DD308: + ldr r6, [r5] + ldr r7, [r5, 0x630] +_081DD310: + mul lr, r9, r1 + add lr, r0, lr, asr 23 + mul r12, r10, lr + bic r12, r12, 0xFF0000 + add r6, r12, r6, ror 8 + mul r12, r11, lr + bic r12, r12, 0xFF0000 + add r7, r12, r7, ror 8 + add r9, r9, r8 + movs lr, r9, lsr 23 + beq _081DD370 + bic r9, r9, 0x3F800000 + subs r2, r2, lr + ble _081DD398 + subs lr, lr, 0x1 + bne _081DD358 + add r0, r0, r1 + b _081DD364 +_081DD358: + add r3, r3, lr + bl sub_81DD520 + mov r0, r1 +_081DD364: + add r3, r3, 0x1 + bl sub_81DD520 + sub r1, r1, r0 +_081DD370: + adds r5, r5, 0x40000000 + bcc _081DD310 + str r7, [r5, 0x630] + str r6, [r5], 0x4 + ldr r6, [sp] + subs r6, r6, 0x4 + str r6, [sp] + bgt _081DD308 + sub r3, r3, 0x1 + b _081DD4F0 +_081DD398: + ldr r0, [sp, 0x1C] + cmp r0, 0 + beq _081DD4F4 + ldr r3, [r4, o_SoundChannel_wav] + ldr r3, [r3, 0x8] + rsb lr, r2, 0 +_081DD3B0: + adds r2, r2, r0 + bgt _081DD358 + sub lr, lr, r0 + b _081DD3B0 +_081DD3C0: + sub r3, r3, 0x1 + bl sub_81DD520 + mov r0, r1 + sub r3, r3, 0x1 + bl sub_81DD520 + sub r1, r1, r0 +_081DD3D8: + ldr r6, [r5] + ldr r7, [r5, 0x630] +_081DD3E0: + mul lr, r9, r1 + add lr, r0, lr, asr 23 + mul r12, r10, lr + bic r12, r12, 0xFF0000 + add r6, r12, r6, ror 8 + mul r12, r11, lr + bic r12, r12, 0xFF0000 + add r7, r12, r7, ror 8 + add r9, r9, r8 + movs lr, r9, lsr 23 + beq _081DD440 + bic r9, r9, 0x3F800000 + subs r2, r2, lr + ble _081DD4F4 + subs lr, lr, 0x1 + bne _081DD428 + add r0, r0, r1 + b _081DD434 +_081DD428: + sub r3, r3, lr + bl sub_81DD520 + mov r0, r1 +_081DD434: + sub r3, r3, 0x1 + bl sub_81DD520 + sub r1, r1, r0 +_081DD440: + adds r5, r5, 0x40000000 + bcc _081DD3E0 + str r7, [r5, 0x630] + str r6, [r5], 0x4 + ldr r6, [sp] + subs r6, r6, 0x4 + str r6, [sp] + bgt _081DD3D8 + add r3, r3, 0x2 + b _081DD4F0 +_081DD468: + ldrb r0, [r4, o_SoundChannel_type] + tst r0, 0x10 + beq _081DD4F0 + ldrsb r0, [r3, -0x1]! + ldrsb r1, [r3, -0x1] + sub r1, r1, r0 +_081DD480: + ldr r6, [r5] + ldr r7, [r5, 0x630] +_081DD488: + mul lr, r9, r1 + add lr, r0, lr, asr 23 + mul r12, r10, lr + bic r12, r12, 0xFF0000 + add r6, r12, r6, ror 8 + mul r12, r11, lr + bic r12, r12, 0xFF0000 + add r7, r12, r7, ror 8 + add r9, r9, r8 + movs lr, r9, lsr 23 + beq _081DD4CC + bic r9, r9, 0x3F800000 + subs r2, r2, lr + ble _081DD4F4 + ldrsb r0, [r3, -lr]! + ldrsb r1, [r3, -0x1] + sub r1, r1, r0 +_081DD4CC: + adds r5, r5, 0x40000000 + bcc _081DD488 + str r7, [r5, 0x630] + str r6, [r5], 0x4 + ldr r6, [sp] + subs r6, r6, 0x4 + str r6, [sp] + bgt _081DD480 + add r3, r3, 0x1 +_081DD4F0: + pop {r8,r12,pc} +_081DD4F4: + mov r2, 0 + strb r2, [r4, o_SoundChannel_status] + mov r0, r5, lsr 30 + bic r5, r5, 0xC0000000 + rsb r0, r0, 0x3 + mov r0, r0, lsl 3 + mov r6, r6, ror r0 + mov r7, r7, ror r0 + str r7, [r5, 0x630] + str r6, [r5], 0x4 + pop {r8,r12,pc} + arm_func_end sub_81DD264 + + arm_func_start sub_81DD520 +sub_81DD520: + push {r0,r2,r5-r7,lr} + mov r0, r3, lsr 6 + ldr r1, [r4, o_SoundChannel_xpi] + cmp r0, r1 + beq _081DD594 + str r0, [r4, o_SoundChannel_xpi] + mov r1, 0x21 + mul r2, r1, r0 + ldr r1, [r4, o_SoundChannel_wav] + add r2, r2, r1 + add r2, r2, 0x10 + ldr r5, =gUnknown_030007B8 + ldr r6, =gDeltaEncodingTable + mov r7, 0x40 + ldrb lr, [r2], 1 + strb lr, [r5], 1 + ldrb r1, [r2], 1 + b _081DD57C +_081DD568: + ldrb r1, [r2], 1 + mov r0, r1, lsr 4 + ldrsb r0, [r6, r0] + add lr, lr, r0 + strb lr, [r5], 1 +_081DD57C: + and r0, r1, 0xF + ldrsb r0, [r6, r0] + add lr, lr, r0 + strb lr, [r5], 1 + subs r7, r7, 2 + bgt _081DD568 +_081DD594: + ldr r5, =gUnknown_030007B8 + and r0, r3, 0x3F + ldrsb r1, [r5, r0] + pop {r0,r2,r5-r7,pc} + .pool + arm_func_end sub_81DD520 + + thumb_func_start SoundMainBTM +SoundMainBTM: + mov r12, r4 + movs r1, 0 + movs r2, 0 + movs r3, 0 + movs r4, 0 + stm r0!, {r1-r4} + stm r0!, {r1-r4} + stm r0!, {r1-r4} + stm r0!, {r1-r4} + mov r4, r12 + bx lr + thumb_func_end SoundMainBTM + + thumb_func_start RealClearChain +RealClearChain: + ldr r3, [r0, 0x2C] + cmp r3, 0 + beq _081DD5E2 + ldr r1, [r0, 0x34] + ldr r2, [r0, 0x30] + cmp r2, 0 + beq _081DD5D6 + str r1, [r2, 0x34] + b _081DD5D8 +_081DD5D6: + str r1, [r3, 0x20] +_081DD5D8: + cmp r1, 0 + beq _081DD5DE + str r2, [r1, 0x30] +_081DD5DE: + movs r1, 0 + str r1, [r0, 0x2C] +_081DD5E2: + bx lr + thumb_func_end RealClearChain + + thumb_func_start ply_fine +ply_fine: + push {r4,r5,lr} + adds r5, r1, 0 + ldr r4, [r5, o_MusicPlayerTrack_chan] + cmp r4, 0 + beq ply_fine_done +ply_fine_loop: + ldrb r1, [r4] + movs r0, 0xC7 + tst r0, r1 + beq ply_fine_ok + movs r0, 0x40 + orrs r1, r0 + strb r1, [r4] +ply_fine_ok: + adds r0, r4, 0 + bl RealClearChain + ldr r4, [r4, 0x34] + cmp r4, 0 + bne ply_fine_loop +ply_fine_done: + movs r0, 0 + strb r0, [r5] + pop {r4,r5} + pop {r0} + bx r0 + thumb_func_end ply_fine + + thumb_func_start MPlayJumpTableCopy +MPlayJumpTableCopy: + mov r12, lr + movs r1, 0x24 + ldr r2, lt_MPlayJumpTableTemplate +MPlayJumpTableCopy_Loop: + ldr r3, [r2] + bl chk_adr_r2 + stm r0!, {r3} + adds r2, 0x4 + subs r1, 0x1 + bgt MPlayJumpTableCopy_Loop + bx r12 + thumb_func_end MPlayJumpTableCopy + + .align 2, 0 + .thumb_func +ldrb_r3_r2: + ldrb r3, [r2] + +@ This attempts to protect against reading anything from the BIOS ROM +@ besides the jump table template. +@ It assumes that the jump table template is located at the end of the ROM. + .thumb_func +chk_adr_r2: + push {r0} + lsrs r0, r2, 25 + bne chk_adr_r2_done @ if adr >= 0x2000000 (i.e. not in BIOS ROM), accept it + ldr r0, lt_MPlayJumpTableTemplate + cmp r2, r0 + blo chk_adr_r2_reject @ if adr < gMPlayJumpTableTemplate, reject it + lsrs r0, r2, 14 + beq chk_adr_r2_done @ if adr < 0x40000 (i.e. in BIOS ROM), accept it +chk_adr_r2_reject: + movs r3, 0 +chk_adr_r2_done: + pop {r0} + bx lr + + .align 2, 0 +lt_MPlayJumpTableTemplate: .word gMPlayJumpTableTemplate + + thumb_func_start ld_r3_tp_adr_i +ld_r3_tp_adr_i: + ldr r2, [r1, 0x40] +_081DD64A: + adds r3, r2, 0x1 + str r3, [r1, 0x40] + ldrb r3, [r2] + b chk_adr_r2 + thumb_func_end ld_r3_tp_adr_i + + thumb_func_start ply_goto +ply_goto: + push {lr} +ply_goto_1: + ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldrb r0, [r2, 0x3] + lsls r0, 8 + ldrb r3, [r2, 0x2] + orrs r0, r3 + lsls r0, 8 + ldrb r3, [r2, 0x1] + orrs r0, r3 + lsls r0, 8 + bl ldrb_r3_r2 + orrs r0, r3 + str r0, [r1, o_MusicPlayerTrack_cmdPtr] + pop {r0} + bx r0 + thumb_func_end ply_goto + + thumb_func_start ply_patt +ply_patt: + ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] + cmp r2, 3 + bhs ply_patt_done + lsls r2, 2 + adds r3, r1, r2 + ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + adds r2, 0x4 + str r2, [r3, o_MusicPlayerTrack_patternStack] + ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] + adds r2, 1 + strb r2, [r1, o_MusicPlayerTrack_patternLevel] + b ply_goto +ply_patt_done: + b ply_fine + thumb_func_end ply_patt + + thumb_func_start ply_pend +ply_pend: + ldrb r2, [r1, o_MusicPlayerTrack_patternLevel] + cmp r2, 0 + beq ply_pend_done + subs r2, 1 + strb r2, [r1, o_MusicPlayerTrack_patternLevel] + lsls r2, 2 + adds r3, r1, r2 + ldr r2, [r3, o_MusicPlayerTrack_patternStack] + str r2, [r1, o_MusicPlayerTrack_cmdPtr] +ply_pend_done: + bx lr + thumb_func_end ply_pend + + thumb_func_start ply_rept +ply_rept: + push {lr} + ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldrb r3, [r2] + cmp r3, 0 + bne ply_rept_1 + adds r2, 1 + str r2, [r1, o_MusicPlayerTrack_cmdPtr] + b ply_goto_1 +ply_rept_1: + ldrb r3, [r1, o_MusicPlayerTrack_repN] + adds r3, 1 + strb r3, [r1, o_MusicPlayerTrack_repN] + mov r12, r3 + bl ld_r3_tp_adr_i + cmp r12, r3 + bhs ply_rept_2 + b ply_goto_1 +ply_rept_2: + movs r3, 0 + strb r3, [r1, o_MusicPlayerTrack_repN] + adds r2, 5 + str r2, [r1, o_MusicPlayerTrack_cmdPtr] + pop {r0} + bx r0 + thumb_func_end ply_rept + + thumb_func_start ply_prio +ply_prio: + mov r12, lr + bl ld_r3_tp_adr_i + strb r3, [r1, o_MusicPlayerTrack_priority] + bx r12 + thumb_func_end ply_prio + + thumb_func_start ply_tempo +ply_tempo: + mov r12, lr + bl ld_r3_tp_adr_i + lsls r3, 1 + strh r3, [r0, o_MusicPlayerInfo_tempoD] + ldrh r2, [r0, o_MusicPlayerInfo_tempoU] + muls r3, r2 + lsrs r3, 8 + strh r3, [r0, o_MusicPlayerInfo_tempoI] + bx r12 + thumb_func_end ply_tempo + + thumb_func_start ply_keysh +ply_keysh: + mov r12, lr + bl ld_r3_tp_adr_i + strb r3, [r1, o_MusicPlayerTrack_keyShift] + ldrb r3, [r1, o_MusicPlayerTrack_flags] + movs r2, 0xC + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] + bx r12 + thumb_func_end ply_keysh + + thumb_func_start ply_voice +ply_voice: + mov r12, lr + ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldrb r3, [r2] + adds r2, 1 + str r2, [r1, o_MusicPlayerTrack_cmdPtr] + lsls r2, r3, 1 + adds r2, r3 + lsls r2, 2 + ldr r3, [r0, o_MusicPlayerInfo_tone] + adds r2, r3 + ldr r3, [r2] + bl chk_adr_r2 + str r3, [r1, o_MusicPlayerTrack_ToneData_type] + ldr r3, [r2, 0x4] + bl chk_adr_r2 + str r3, [r1, o_MusicPlayerTrack_ToneData_wav] + ldr r3, [r2, 0x8] + bl chk_adr_r2 + str r3, [r1, o_MusicPlayerTrack_ToneData_attack] + bx r12 + thumb_func_end ply_voice + + thumb_func_start ply_vol +ply_vol: + mov r12, lr + bl ld_r3_tp_adr_i + strb r3, [r1, o_MusicPlayerTrack_vol] + ldrb r3, [r1, o_MusicPlayerTrack_flags] + movs r2, 0x3 + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] + bx r12 + thumb_func_end ply_vol + + thumb_func_start ply_pan +ply_pan: + mov r12, lr + bl ld_r3_tp_adr_i + subs r3, 0x40 + strb r3, [r1, o_MusicPlayerTrack_pan] + ldrb r3, [r1, o_MusicPlayerTrack_flags] + movs r2, 0x3 + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] + bx r12 + thumb_func_end ply_pan + + thumb_func_start ply_bend +ply_bend: + mov r12, lr + bl ld_r3_tp_adr_i + subs r3, 0x40 + strb r3, [r1, o_MusicPlayerTrack_bend] + ldrb r3, [r1, o_MusicPlayerTrack_flags] + movs r2, 0xC + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] + bx r12 + thumb_func_end ply_bend + + thumb_func_start ply_bendr +ply_bendr: + mov r12, lr + bl ld_r3_tp_adr_i + strb r3, [r1, o_MusicPlayerTrack_bendRange] + ldrb r3, [r1, o_MusicPlayerTrack_flags] + movs r2, 0xC + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] + bx r12 + thumb_func_end ply_bendr + + thumb_func_start ply_lfodl +ply_lfodl: + mov r12, lr + bl ld_r3_tp_adr_i + strb r3, [r1, o_MusicPlayerTrack_lfoDelay] + bx r12 + thumb_func_end ply_lfodl + + thumb_func_start ply_modt +ply_modt: + mov r12, lr + bl ld_r3_tp_adr_i + ldrb r0, [r1, o_MusicPlayerTrack_modT] + cmp r0, r3 + beq _081DD7AA + strb r3, [r1, o_MusicPlayerTrack_modT] + ldrb r3, [r1, o_MusicPlayerTrack_flags] + movs r2, 0xF + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] +_081DD7AA: + bx r12 + thumb_func_end ply_modt + + thumb_func_start ply_tune +ply_tune: + mov r12, lr + bl ld_r3_tp_adr_i + subs r3, 0x40 + strb r3, [r1, o_MusicPlayerTrack_tune] + ldrb r3, [r1, o_MusicPlayerTrack_flags] + movs r2, 0xC + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] + bx r12 + thumb_func_end ply_tune + + thumb_func_start ply_port +ply_port: + mov r12, lr + ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldrb r3, [r2] + adds r2, 1 + ldr r0, =REG_SOUND1CNT_L @ sound register base address + adds r0, r3 + bl _081DD64A + strb r3, [r0] + bx r12 + .pool + thumb_func_end ply_port + + thumb_func_start m4aSoundVSync +m4aSoundVSync: + ldr r0, lt2_SOUND_INFO_PTR + ldr r0, [r0] + + @ Exit the function if ident is not ID_NUMBER or ID_NUMBER+1. + ldr r2, lt2_ID_NUMBER + ldr r3, [r0, o_SoundInfo_ident] + subs r3, r2 + cmp r3, 1 + bhi m4aSoundVSync_Done + + @ Decrement the PCM DMA counter. If it reaches 0, we need to do a DMA. + ldrb r1, [r0, o_SoundInfo_pcmDmaCounter] + subs r1, 1 + strb r1, [r0, o_SoundInfo_pcmDmaCounter] + bgt m4aSoundVSync_Done + + @ Reload the PCM DMA counter. + ldrb r1, [r0, o_SoundInfo_pcmDmaPeriod] + strb r1, [r0, o_SoundInfo_pcmDmaCounter] + + ldr r2, =REG_DMA1 + + ldr r1, [r2, 0x8] @ DMA1CNT + lsls r1, 7 + bcc m4aSoundVSync_SkipDMA1 @ branch if repeat bit isn't set + + ldr r1, =((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4 + str r1, [r2, 0x8] @ DMA1CNT + +m4aSoundVSync_SkipDMA1: + ldr r1, [r2, 0xC + 0x8] @ DMA2CNT + lsls r1, 7 + bcc m4aSoundVSync_SkipDMA2 @ branch if repeat bit isn't set + + ldr r1, =((DMA_ENABLE | DMA_START_NOW | DMA_32BIT | DMA_SRC_INC | DMA_DEST_FIXED) << 16) | 4 + str r1, [r2, 0xC + 0x8] @ DMA2CNT + +m4aSoundVSync_SkipDMA2: + + @ turn off DMA1/DMA2 + movs r1, DMA_32BIT >> 8 + lsls r1, 8 + strh r1, [r2, 0xA] @ DMA1CNT_H + strh r1, [r2, 0xC + 0xA] @ DMA2CNT_H + + @ turn on DMA1/DMA2 direct-sound FIFO mode + movs r1, (DMA_ENABLE | DMA_START_SPECIAL | DMA_32BIT | DMA_REPEAT) >> 8 + lsls r1, 8 @ LSB is 0, so DMA_SRC_INC is used (destination is always fixed in FIFO mode) + strh r1, [r2, 0xA] @ DMA1CNT_H + strh r1, [r2, 0xC + 0xA] @ DMA2CNT_H + +m4aSoundVSync_Done: + bx lr + + .pool + thumb_func_end m4aSoundVSync + + thumb_func_start MPlayMain +MPlayMain: + ldr r2, lt2_ID_NUMBER + ldr r3, [r0, o_MusicPlayerInfo_ident] + cmp r2, r3 + beq _081DD82E + bx lr +_081DD82E: + adds r3, 0x1 + str r3, [r0, o_MusicPlayerInfo_ident] + push {r0,lr} + ldr r3, [r0, o_MusicPlayerInfo_func] + cmp r3, 0 + beq _081DD840 + ldr r0, [r0, o_MusicPlayerInfo_intp] + bl call_r3 +_081DD840: + pop {r0} + push {r4-r7} + mov r4, r8 + mov r5, r9 + mov r6, r10 + mov r7, r11 + push {r4-r7} + adds r7, r0, 0 + ldr r0, [r7, o_MusicPlayerInfo_status] + cmp r0, 0 + bge _081DD858 + b _081DDA6C +_081DD858: + ldr r0, lt2_SOUND_INFO_PTR + ldr r0, [r0] + mov r8, r0 + adds r0, r7, 0 + bl FadeOutBody + ldr r0, [r7, o_MusicPlayerInfo_status] + cmp r0, 0 + bge _081DD86C + b _081DDA6C +_081DD86C: + ldrh r0, [r7, o_MusicPlayerInfo_tempoC] + ldrh r1, [r7, o_MusicPlayerInfo_tempoI] + adds r0, r1 + b _081DD9BC +_081DD874: + ldrb r6, [r7, o_MusicPlayerInfo_trackCount] + ldr r5, [r7, o_MusicPlayerInfo_tracks] + movs r3, 0x1 + movs r4, 0 +_081DD87C: + ldrb r0, [r5] + movs r1, 0x80 + tst r1, r0 + bne _081DD886 + b _081DD998 +_081DD886: + mov r10, r3 + orrs r4, r3 + mov r11, r4 + ldr r4, [r5, o_MusicPlayerTrack_chan] + cmp r4, 0 + beq _081DD8BA +_081DD892: + ldrb r1, [r4] + movs r0, 0xC7 + tst r0, r1 + beq _081DD8AE + ldrb r0, [r4, 0x10] + cmp r0, 0 + beq _081DD8B4 + subs r0, 0x1 + strb r0, [r4, 0x10] + bne _081DD8B4 + movs r0, 0x40 + orrs r1, r0 + strb r1, [r4] + b _081DD8B4 +_081DD8AE: + adds r0, r4, 0 + bl ClearChain +_081DD8B4: + ldr r4, [r4, 0x34] + cmp r4, 0 + bne _081DD892 +_081DD8BA: + ldrb r3, [r5, o_MusicPlayerTrack_flags] + movs r0, 0x40 + tst r0, r3 + beq _081DD938 + adds r0, r5, 0 + bl Clear64byte + movs r0, 0x80 + strb r0, [r5] + movs r0, 0x2 + strb r0, [r5, o_MusicPlayerTrack_bendRange] + movs r0, 0x40 + strb r0, [r5, o_MusicPlayerTrack_volX] + movs r0, 0x16 + strb r0, [r5, o_MusicPlayerTrack_lfoSpeed] + movs r0, 0x1 + adds r1, r5, 0x6 + strb r0, [r1, o_MusicPlayerTrack_ToneData_type - 0x6] + b _081DD938 +_081DD8E0: + ldr r2, [r5, o_MusicPlayerTrack_cmdPtr] + ldrb r1, [r2] + cmp r1, 0x80 + bhs _081DD8EC + ldrb r1, [r5, o_MusicPlayerTrack_runningStatus] + b _081DD8F6 +_081DD8EC: + adds r2, 0x1 + str r2, [r5, o_MusicPlayerTrack_cmdPtr] + cmp r1, 0xBD + bcc _081DD8F6 + strb r1, [r5, o_MusicPlayerTrack_runningStatus] +_081DD8F6: + cmp r1, 0xCF + bcc _081DD90C + mov r0, r8 + ldr r3, [r0, o_SoundInfo_plynote] + adds r0, r1, 0 + subs r0, 0xCF + adds r1, r7, 0 + adds r2, r5, 0 + bl call_r3 + b _081DD938 +_081DD90C: + cmp r1, 0xB0 + bls _081DD92E + adds r0, r1, 0 + subs r0, 0xB1 + strb r0, [r7, o_MusicPlayerInfo_cmd] + mov r3, r8 + ldr r3, [r3, o_SoundInfo_MPlayJumpTable] + lsls r0, 2 + ldr r3, [r3, r0] + adds r0, r7, 0 + adds r1, r5, 0 + bl call_r3 + ldrb r0, [r5, o_MusicPlayerTrack_flags] + cmp r0, 0 + beq _081DD994 + b _081DD938 +_081DD92E: + ldr r0, lt_gClockTable + subs r1, 0x80 + adds r1, r0 + ldrb r0, [r1] + strb r0, [r5, o_MusicPlayerTrack_wait] +_081DD938: + ldrb r0, [r5, o_MusicPlayerTrack_wait] + cmp r0, 0 + beq _081DD8E0 + subs r0, 0x1 + strb r0, [r5, o_MusicPlayerTrack_wait] + ldrb r1, [r5, o_MusicPlayerTrack_lfoSpeed] + cmp r1, 0 + beq _081DD994 + ldrb r0, [r5, o_MusicPlayerTrack_mod] + cmp r0, 0 + beq _081DD994 + ldrb r0, [r5, o_MusicPlayerTrack_lfoDelayC] + cmp r0, 0 + beq _081DD95A + subs r0, 0x1 + strb r0, [r5, o_MusicPlayerTrack_lfoDelayC] + b _081DD994 +_081DD95A: + ldrb r0, [r5, o_MusicPlayerTrack_lfoSpeedC] + adds r0, r1 + strb r0, [r5, o_MusicPlayerTrack_lfoSpeedC] + adds r1, r0, 0 + subs r0, 0x40 + lsls r0, 24 + bpl _081DD96E + lsls r2, r1, 24 + asrs r2, 24 + b _081DD972 +_081DD96E: + movs r0, 0x80 + subs r2, r0, r1 +_081DD972: + ldrb r0, [r5, o_MusicPlayerTrack_mod] + muls r0, r2 + asrs r2, r0, 6 + ldrb r0, [r5, o_MusicPlayerTrack_modM] + eors r0, r2 + lsls r0, 24 + beq _081DD994 + strb r2, [r5, o_MusicPlayerTrack_modM] + ldrb r0, [r5] + ldrb r1, [r5, o_MusicPlayerTrack_modT] + cmp r1, 0 + bne _081DD98E + movs r1, 0xC + b _081DD990 +_081DD98E: + movs r1, 0x3 +_081DD990: + orrs r0, r1 + strb r0, [r5, o_MusicPlayerTrack_flags] +_081DD994: + mov r3, r10 + mov r4, r11 +_081DD998: + subs r6, 0x1 + ble _081DD9A4 + movs r0, 0x50 + adds r5, r0 + lsls r3, 1 + b _081DD87C +_081DD9A4: + ldr r0, [r7, o_MusicPlayerInfo_clock] + adds r0, 0x1 + str r0, [r7, o_MusicPlayerInfo_clock] + cmp r4, 0 + bne _081DD9B6 + movs r0, 0x80 + lsls r0, 24 + str r0, [r7, o_MusicPlayerInfo_status] + b _081DDA6C +_081DD9B6: + str r4, [r7, o_MusicPlayerInfo_status] + ldrh r0, [r7, o_MusicPlayerInfo_tempoC] + subs r0, 0x96 +_081DD9BC: + strh r0, [r7, o_MusicPlayerInfo_tempoC] + cmp r0, 0x96 + bcc _081DD9C4 + b _081DD874 +_081DD9C4: + ldrb r2, [r7, o_MusicPlayerInfo_trackCount] + ldr r5, [r7, o_MusicPlayerInfo_tracks] +_081DD9C8: + ldrb r0, [r5, o_MusicPlayerTrack_flags] + movs r1, 0x80 + tst r1, r0 + beq _081DDA62 + movs r1, 0xF + tst r1, r0 + beq _081DDA62 + mov r9, r2 + adds r0, r7, 0 + adds r1, r5, 0 + bl TrkVolPitSet + ldr r4, [r5, o_MusicPlayerTrack_chan] + cmp r4, 0 + beq _081DDA58 +_081DD9E6: + ldrb r1, [r4, o_SoundChannel_status] + movs r0, 0xC7 + tst r0, r1 + bne _081DD9F6 + adds r0, r4, 0 + bl ClearChain + b _081DDA52 +_081DD9F6: + ldrb r0, [r4, o_SoundChannel_type] + movs r6, 0x7 + ands r6, r0 + ldrb r3, [r5, o_MusicPlayerTrack_flags] + movs r0, 0x3 + tst r0, r3 + beq _081DDA14 + bl ChnVolSetAsm + cmp r6, 0 + beq _081DDA14 + ldrb r0, [r4, o_CgbChannel_mo] + movs r1, 0x1 + orrs r0, r1 + strb r0, [r4, o_CgbChannel_mo] +_081DDA14: + ldrb r3, [r5, o_MusicPlayerTrack_flags] + movs r0, 0xC + tst r0, r3 + beq _081DDA52 + ldrb r1, [r4, o_SoundChannel_ky] + movs r0, 0x8 + ldrsb r0, [r5, r0] + adds r2, r1, r0 + bpl _081DDA28 + movs r2, 0 +_081DDA28: + cmp r6, 0 + beq _081DDA46 + mov r0, r8 + ldr r3, [r0, o_SoundInfo_MidiKeyToCgbFreq] + adds r1, r2, 0 + ldrb r2, [r5, o_MusicPlayerTrack_pitM] + adds r0, r6, 0 + bl call_r3 + str r0, [r4, o_CgbChannel_fr] + ldrb r0, [r4, o_CgbChannel_mo] + movs r1, 0x2 + orrs r0, r1 + strb r0, [r4, o_CgbChannel_mo] + b _081DDA52 +_081DDA46: + adds r1, r2, 0 + ldrb r2, [r5, o_MusicPlayerTrack_pitM] + ldr r0, [r4, o_SoundChannel_wav] + bl MidiKeyToFreq + str r0, [r4, o_SoundChannel_freq] +_081DDA52: + ldr r4, [r4, o_SoundChannel_np] + cmp r4, 0 + bne _081DD9E6 +_081DDA58: + ldrb r0, [r5, o_MusicPlayerTrack_flags] + movs r1, 0xF0 + ands r0, r1 + strb r0, [r5, o_MusicPlayerTrack_flags] + mov r2, r9 +_081DDA62: + subs r2, 0x1 + ble _081DDA6C + movs r0, 0x50 + adds r5, r0 + bgt _081DD9C8 +_081DDA6C: + ldr r0, lt2_ID_NUMBER + str r0, [r7, o_MusicPlayerInfo_ident] + pop {r0-r7} + mov r8, r0 + mov r9, r1 + mov r10, r2 + mov r11, r3 + pop {r3} + +call_r3: + bx r3 + + .align 2, 0 +lt_gClockTable: .word gClockTable +lt2_SOUND_INFO_PTR: .word SOUND_INFO_PTR +lt2_ID_NUMBER: .word ID_NUMBER + thumb_func_end MPlayMain + + thumb_func_start TrackStop +TrackStop: + push {r4-r6,lr} + adds r5, r1, 0 + ldrb r1, [r5, o_MusicPlayerTrack_flags] + movs r0, 0x80 + tst r0, r1 + beq TrackStop_Done + ldr r4, [r5, o_MusicPlayerTrack_chan] + cmp r4, 0 + beq TrackStop_3 + movs r6, 0 +TrackStop_Loop: + ldrb r0, [r4, o_SoundChannel_status] + cmp r0, 0 + beq TrackStop_2 + ldrb r0, [r4, o_SoundChannel_type] + movs r3, 0x7 + ands r0, r3 + beq TrackStop_1 + ldr r3, =SOUND_INFO_PTR + ldr r3, [r3] + ldr r3, [r3, o_SoundInfo_CgbOscOff] + bl call_r3 +TrackStop_1: + strb r6, [r4, o_SoundChannel_status] +TrackStop_2: + str r6, [r4, o_SoundChannel_track] + ldr r4, [r4, o_SoundChannel_np] + cmp r4, 0 + bne TrackStop_Loop +TrackStop_3: + str r4, [r5, o_MusicPlayerTrack_chan] +TrackStop_Done: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end TrackStop + + thumb_func_start ChnVolSetAsm +ChnVolSetAsm: + ldrb r1, [r4, 0x12] + movs r0, 0x14 + ldrsb r2, [r4, r0] + movs r3, 0x80 + adds r3, r2 + muls r3, r1 + ldrb r0, [r5, 0x10] + muls r0, r3 + asrs r0, 14 + cmp r0, 0xFF + bls _081DDAE8 + movs r0, 0xFF +_081DDAE8: + strb r0, [r4, 0x2] + movs r3, 0x7F + subs r3, r2 + muls r3, r1 + ldrb r0, [r5, 0x11] + muls r0, r3 + asrs r0, 14 + cmp r0, 0xFF + bls _081DDAFC + movs r0, 0xFF +_081DDAFC: + strb r0, [r4, 0x3] + bx lr + thumb_func_end ChnVolSetAsm + + thumb_func_start ply_note +ply_note: + push {r4-r7,lr} + mov r4, r8 + mov r5, r9 + mov r6, r10 + mov r7, r11 + push {r4-r7} + sub sp, 0x18 + str r1, [sp] + adds r5, r2, 0 + ldr r1, =SOUND_INFO_PTR + ldr r1, [r1] + str r1, [sp, 0x4] + ldr r1, =gClockTable + adds r0, r1 + ldrb r0, [r0] + strb r0, [r5, o_MusicPlayerTrack_gateTime] + ldr r3, [r5, o_MusicPlayerTrack_cmdPtr] + ldrb r0, [r3] + cmp r0, 0x80 + bhs _081DDB46 + strb r0, [r5, o_MusicPlayerTrack_key] + adds r3, 0x1 + ldrb r0, [r3] + cmp r0, 0x80 + bhs _081DDB44 + strb r0, [r5, o_MusicPlayerTrack_velocity] + adds r3, 0x1 + ldrb r0, [r3] + cmp r0, 0x80 + bhs _081DDB44 + ldrb r1, [r5, o_MusicPlayerTrack_gateTime] + adds r1, r0 + strb r1, [r5, o_MusicPlayerTrack_gateTime] + adds r3, 0x1 +_081DDB44: + str r3, [r5, o_MusicPlayerTrack_cmdPtr] +_081DDB46: + movs r0, 0 + str r0, [sp, 0x14] + adds r4, r5, 0 + adds r4, o_MusicPlayerTrack_ToneData_type + ldrb r2, [r4] + movs r0, TONEDATA_TYPE_RHY | TONEDATA_TYPE_SPL + tst r0, r2 + beq _081DDB98 + ldrb r3, [r5, o_MusicPlayerTrack_key] + movs r0, TONEDATA_TYPE_SPL + tst r0, r2 + beq _081DDB66 + ldr r1, [r5, o_MusicPlayerTrack_ToneData_keySplitTable] + adds r1, r3 + ldrb r0, [r1] + b _081DDB68 +_081DDB66: + adds r0, r3, 0 +_081DDB68: + lsls r1, r0, 1 + adds r1, r0 + lsls r1, 2 + ldr r0, [r5, o_MusicPlayerTrack_ToneData_wav] + adds r1, r0 + mov r9, r1 + mov r6, r9 + ldrb r1, [r6] + movs r0, 0xC0 + tst r0, r1 + beq _081DDB80 + b _081DDCEA +_081DDB80: + movs r0, 0x80 + tst r0, r2 + beq _081DDB9C + ldrb r1, [r6, 0x3] + movs r0, 0x80 + tst r0, r1 + beq _081DDB94 + subs r1, 0xC0 + lsls r1, 1 + str r1, [sp, 0x14] +_081DDB94: + ldrb r3, [r6, 0x1] + b _081DDB9C +_081DDB98: + mov r9, r4 + ldrb r3, [r5, 0x5] +_081DDB9C: + str r3, [sp, 0x8] + ldr r6, [sp] + ldrb r1, [r6, 0x9] + ldrb r0, [r5, 0x1D] + adds r0, r1 + cmp r0, 0xFF + bls _081DDBAC + movs r0, 0xFF +_081DDBAC: + str r0, [sp, 0x10] + mov r6, r9 + ldrb r0, [r6] + movs r6, 0x7 + ands r6, r0 + str r6, [sp, 0xC] + beq _081DDBEC + ldr r0, [sp, 0x4] + ldr r4, [r0, 0x1C] + cmp r4, 0 + bne _081DDBC4 + b _081DDCEA +_081DDBC4: + subs r6, 0x1 + lsls r0, r6, 6 + adds r4, r0 + ldrb r1, [r4] + movs r0, 0xC7 + tst r0, r1 + beq _081DDC40 + movs r0, 0x40 + tst r0, r1 + bne _081DDC40 + ldrb r1, [r4, 0x13] + ldr r0, [sp, 0x10] + cmp r1, r0 + bcc _081DDC40 + beq _081DDBE4 + b _081DDCEA +_081DDBE4: + ldr r0, [r4, 0x2C] + cmp r0, r5 + bcs _081DDC40 + b _081DDCEA +_081DDBEC: + ldr r6, [sp, 0x10] + adds r7, r5, 0 + movs r2, 0 + mov r8, r2 + ldr r4, [sp, 0x4] + ldrb r3, [r4, 0x6] + adds r4, 0x50 +_081DDBFA: + ldrb r1, [r4] + movs r0, 0xC7 + tst r0, r1 + beq _081DDC40 + movs r0, 0x40 + tst r0, r1 + beq _081DDC14 + cmp r2, 0 + bne _081DDC18 + adds r2, 0x1 + ldrb r6, [r4, 0x13] + ldr r7, [r4, 0x2C] + b _081DDC32 +_081DDC14: + cmp r2, 0 + bne _081DDC34 +_081DDC18: + ldrb r0, [r4, 0x13] + cmp r0, r6 + bcs _081DDC24 + adds r6, r0, 0 + ldr r7, [r4, 0x2C] + b _081DDC32 +_081DDC24: + bhi _081DDC34 + ldr r0, [r4, 0x2C] + cmp r0, r7 + bls _081DDC30 + adds r7, r0, 0 + b _081DDC32 +_081DDC30: + bcc _081DDC34 +_081DDC32: + mov r8, r4 +_081DDC34: + adds r4, 0x40 + subs r3, 0x1 + bgt _081DDBFA + mov r4, r8 + cmp r4, 0 + beq _081DDCEA +_081DDC40: + adds r0, r4, 0 + bl ClearChain + movs r1, 0 + str r1, [r4, 0x30] + ldr r3, [r5, 0x20] + str r3, [r4, 0x34] + cmp r3, 0 + beq _081DDC54 + str r4, [r3, 0x30] +_081DDC54: + str r4, [r5, 0x20] + str r5, [r4, 0x2C] + ldrb r0, [r5, 0x1B] + strb r0, [r5, 0x1C] + cmp r0, r1 + beq _081DDC66 + adds r1, r5, 0 + bl clear_modM +_081DDC66: + ldr r0, [sp] + adds r1, r5, 0 + bl TrkVolPitSet + ldr r0, [r5, 0x4] + str r0, [r4, 0x10] + ldr r0, [sp, 0x10] + strb r0, [r4, 0x13] + ldr r0, [sp, 0x8] + strb r0, [r4, 0x8] + ldr r0, [sp, 0x14] + strb r0, [r4, 0x14] + mov r6, r9 + ldrb r0, [r6] + strb r0, [r4, 0x1] + ldr r7, [r6, 0x4] + str r7, [r4, 0x24] + ldr r0, [r6, 0x8] + str r0, [r4, 0x4] + ldrh r0, [r5, 0x1E] + strh r0, [r4, 0xC] + bl ChnVolSetAsm + ldrb r1, [r4, 0x8] + movs r0, 0x8 + ldrsb r0, [r5, r0] + adds r3, r1, r0 + bpl _081DDCA0 + movs r3, 0 +_081DDCA0: + ldr r6, [sp, 0xC] + cmp r6, 0 + beq _081DDCCE + mov r6, r9 + ldrb r0, [r6, 0x2] + strb r0, [r4, 0x1E] + ldrb r1, [r6, 0x3] + movs r0, 0x80 + tst r0, r1 + bne _081DDCBA + movs r0, 0x70 + tst r0, r1 + bne _081DDCBC +_081DDCBA: + movs r1, 0x8 +_081DDCBC: + strb r1, [r4, 0x1F] + ldrb r2, [r5, 0x9] + adds r1, r3, 0 + ldr r0, [sp, 0xC] + ldr r3, [sp, 0x4] + ldr r3, [r3, 0x30] + bl call_r3 + b _081DDCDC +_081DDCCE: + ldr r0, [r5, o_MusicPlayerTrack_unk_3C] + str r0, [r4, 0x18] + ldrb r2, [r5, 0x9] + adds r1, r3, 0 + adds r0, r7, 0 + bl MidiKeyToFreq +_081DDCDC: + str r0, [r4, 0x20] + movs r0, 0x80 + strb r0, [r4] + ldrb r1, [r5] + movs r0, 0xF0 + ands r0, r1 + strb r0, [r5] +_081DDCEA: + add sp, 0x18 + pop {r0-r7} + mov r8, r0 + mov r9, r1 + mov r10, r2 + mov r11, r3 + pop {r0} + bx r0 + .pool + thumb_func_end ply_note + + thumb_func_start ply_endtie +ply_endtie: + push {r4,r5} + ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + ldrb r3, [r2] + cmp r3, 0x80 + bhs _081DDD16 + strb r3, [r1, o_MusicPlayerTrack_key] + adds r2, 0x1 + str r2, [r1, o_MusicPlayerTrack_cmdPtr] + b _081DDD18 +_081DDD16: + ldrb r3, [r1, o_MusicPlayerTrack_key] +_081DDD18: + ldr r1, [r1, o_MusicPlayerTrack_chan] + cmp r1, 0 + beq _081DDD40 + movs r4, 0x83 + movs r5, 0x40 +_081DDD22: + ldrb r2, [r1, o_SoundChannel_status] + tst r2, r4 + beq _081DDD3A + tst r2, r5 + bne _081DDD3A + ldrb r0, [r1, o_SoundChannel_mk] + cmp r0, r3 + bne _081DDD3A + movs r0, 0x40 + orrs r2, r0 + strb r2, [r1, o_SoundChannel_status] + b _081DDD40 +_081DDD3A: + ldr r1, [r1, o_SoundChannel_np] + cmp r1, 0 + bne _081DDD22 +_081DDD40: + pop {r4,r5} + bx lr + thumb_func_end ply_endtie + + thumb_func_start clear_modM +clear_modM: + movs r2, 0 + strb r2, [r1, o_MusicPlayerTrack_modM] + strb r2, [r1, o_MusicPlayerTrack_lfoSpeedC] + ldrb r2, [r1, o_MusicPlayerTrack_modT] + cmp r2, 0 + bne _081DDD54 + movs r2, 0xC + b _081DDD56 +_081DDD54: + movs r2, 0x3 +_081DDD56: + ldrb r3, [r1, o_MusicPlayerTrack_flags] + orrs r3, r2 + strb r3, [r1, o_MusicPlayerTrack_flags] + bx lr + thumb_func_end clear_modM + + thumb_func_start ld_r3_tp_adr_i +ld_r3_tp_adr_i_unchecked: + ldr r2, [r1, o_MusicPlayerTrack_cmdPtr] + adds r3, r2, 1 + str r3, [r1, o_MusicPlayerTrack_cmdPtr] + ldrb r3, [r2] + bx lr + thumb_func_end ld_r3_tp_adr_i + + thumb_func_start ply_lfos +ply_lfos: + mov r12, lr + bl ld_r3_tp_adr_i_unchecked + strb r3, [r1, o_MusicPlayerTrack_lfoSpeed] + cmp r3, 0 + bne _081DDD7C + bl clear_modM +_081DDD7C: + bx r12 + thumb_func_end ply_lfos + + thumb_func_start ply_mod +ply_mod: + mov r12, lr + bl ld_r3_tp_adr_i_unchecked + strb r3, [r1, o_MusicPlayerTrack_mod] + cmp r3, 0 + bne _081DDD90 + bl clear_modM +_081DDD90: + bx r12 + thumb_func_end ply_mod + + .align 2, 0 @ Don't pad with nop. diff --git a/sym_bss.txt b/sym_bss.txt index d2d218ec4..531a700e9 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -34,7 +34,7 @@ .include "src/field/field_specials.o" .include "src/pokemon/learn_move.o" .include "src/field/player_pc.o" - .include "asm/m4a_1.o" + .include "src/libs/m4a_1.o" .include "src/libs/agb_flash.o" .include "src/libs/siirtc.o" .include "tools/agbcc/lib/libgcc.a:dp-bit.o" diff --git a/tilesets.mk b/tilesets.mk index 9bb9a1f3d..ae0e57c9b 100644 --- a/tilesets.mk +++ b/tilesets.mk @@ -1,185 +1,89 @@ TILESETDIR := data/tilesets -$(TILESETDIR)/secondary/petalburg/tiles.4bpp: $(TILESETDIR)/secondary/petalburg/tiles.png - $(GFX) $< $@ -num_tiles 159 - -$(TILESETDIR)/secondary/rustboro/tiles.4bpp: $(TILESETDIR)/secondary/rustboro/tiles.png - $(GFX) $< $@ -num_tiles 498 - -$(TILESETDIR)/secondary/dewford/tiles.4bpp: $(TILESETDIR)/secondary/dewford/tiles.png - $(GFX) $< $@ -num_tiles 343 - -$(TILESETDIR)/secondary/slateport/tiles.4bpp: $(TILESETDIR)/secondary/slateport/tiles.png - $(GFX) $< $@ -num_tiles 504 - -$(TILESETDIR)/secondary/mauville/tiles.4bpp: $(TILESETDIR)/secondary/mauville/tiles.png - $(GFX) $< $@ -num_tiles 450 - -$(TILESETDIR)/secondary/lavaridge/tiles.4bpp: $(TILESETDIR)/secondary/lavaridge/tiles.png - $(GFX) $< $@ -num_tiles 348 - -$(TILESETDIR)/secondary/fallarbor/tiles.4bpp: $(TILESETDIR)/secondary/fallarbor/tiles.png - $(GFX) $< $@ -num_tiles 374 - -$(TILESETDIR)/secondary/fortree/tiles.4bpp: $(TILESETDIR)/secondary/fortree/tiles.png - $(GFX) $< $@ -num_tiles 493 - -$(TILESETDIR)/secondary/mossdeep/tiles.4bpp: $(TILESETDIR)/secondary/mossdeep/tiles.png - $(GFX) $< $@ -num_tiles 499 - -$(TILESETDIR)/secondary/pacifidlog/tiles.4bpp: $(TILESETDIR)/secondary/pacifidlog/tiles.png - $(GFX) $< $@ -num_tiles 504 - -$(TILESETDIR)/secondary/sootopolis/tiles.4bpp: $(TILESETDIR)/secondary/sootopolis/tiles.png - $(GFX) $< $@ -num_tiles 180 - -$(TILESETDIR)/primary/building/tiles.4bpp: $(TILESETDIR)/primary/building/tiles.png - $(GFX) $< $@ -num_tiles 502 - -$(TILESETDIR)/secondary/shop/tiles.4bpp: $(TILESETDIR)/secondary/shop/tiles.png - $(GFX) $< $@ -num_tiles 502 - -$(TILESETDIR)/secondary/pokemon_center/tiles.4bpp: $(TILESETDIR)/secondary/pokemon_center/tiles.png - $(GFX) $< $@ -num_tiles 478 - -$(TILESETDIR)/secondary/cave/tiles.4bpp: $(TILESETDIR)/secondary/cave/tiles.png - $(GFX) $< $@ -num_tiles 420 - -$(TILESETDIR)/secondary/pokemon_school/tiles.4bpp: $(TILESETDIR)/secondary/pokemon_school/tiles.png - $(GFX) $< $@ -num_tiles 278 - -$(TILESETDIR)/secondary/pokemon_fan_club/tiles.4bpp: $(TILESETDIR)/secondary/pokemon_fan_club/tiles.png - $(GFX) $< $@ -num_tiles 319 - -$(TILESETDIR)/secondary/unused_1/tiles.4bpp: $(TILESETDIR)/secondary/unused_1/tiles.png - $(GFX) $< $@ -num_tiles 17 - -$(TILESETDIR)/secondary/meteor_falls/tiles.4bpp: $(TILESETDIR)/secondary/meteor_falls/tiles.png - $(GFX) $< $@ -num_tiles 422 - -$(TILESETDIR)/secondary/oceanic_museum/tiles.4bpp: $(TILESETDIR)/secondary/oceanic_museum/tiles.png - $(GFX) $< $@ -num_tiles 319 - -$(TILESETDIR)/secondary/cable_club/unknown_tiles.4bpp: $(TILESETDIR)/secondary/cable_club/unknown_tiles.png - $(GFX) $< $@ -num_tiles 120 - -$(TILESETDIR)/secondary/seashore_house/tiles.4bpp: $(TILESETDIR)/secondary/seashore_house/tiles.png - $(GFX) $< $@ -num_tiles 312 - -$(TILESETDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: $(TILESETDIR)/secondary/pretty_petal_flower_shop/tiles.png - $(GFX) $< $@ -num_tiles 345 - -$(TILESETDIR)/secondary/pokemon_day_care/tiles.4bpp: $(TILESETDIR)/secondary/pokemon_day_care/tiles.png - $(GFX) $< $@ -num_tiles 355 - -$(TILESETDIR)/secondary/facility/tiles.4bpp: $(TILESETDIR)/secondary/facility/tiles.png - $(GFX) $< $@ -num_tiles 503 - -$(TILESETDIR)/secondary/secret_base/brown_cave/tiles.4bpp: $(TILESETDIR)/secondary/secret_base/brown_cave/tiles.png - $(GFX) $< $@ -num_tiles 83 - -$(TILESETDIR)/secondary/secret_base/tree/tiles.4bpp: $(TILESETDIR)/secondary/secret_base/tree/tiles.png - $(GFX) $< $@ -num_tiles 83 - -$(TILESETDIR)/secondary/secret_base/shrub/tiles.4bpp: $(TILESETDIR)/secondary/secret_base/shrub/tiles.png - $(GFX) $< $@ -num_tiles 83 - -$(TILESETDIR)/secondary/secret_base/blue_cave/tiles.4bpp: $(TILESETDIR)/secondary/secret_base/blue_cave/tiles.png - $(GFX) $< $@ -num_tiles 83 - -$(TILESETDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: $(TILESETDIR)/secondary/secret_base/yellow_cave/tiles.png - $(GFX) $< $@ -num_tiles 83 - -$(TILESETDIR)/secondary/secret_base/red_cave/tiles.4bpp: $(TILESETDIR)/secondary/secret_base/red_cave/tiles.png - $(GFX) $< $@ -num_tiles 83 - -$(TILESETDIR)/secondary/inside_of_truck/tiles.4bpp: $(TILESETDIR)/secondary/inside_of_truck/tiles.png - $(GFX) $< $@ -num_tiles 62 - -$(TILESETDIR)/secondary/contest/tiles.4bpp: $(TILESETDIR)/secondary/contest/tiles.png - $(GFX) $< $@ -num_tiles 430 - -$(TILESETDIR)/secondary/lilycove_museum/tiles.4bpp: $(TILESETDIR)/secondary/lilycove_museum/tiles.png - $(GFX) $< $@ -num_tiles 431 - -$(TILESETDIR)/secondary/lab/tiles.4bpp: $(TILESETDIR)/secondary/lab/tiles.png - $(GFX) $< $@ -num_tiles 500 - -$(TILESETDIR)/secondary/underwater/tiles.4bpp: $(TILESETDIR)/secondary/underwater/tiles.png - $(GFX) $< $@ -num_tiles 500 - -$(TILESETDIR)/secondary/generic_building/tiles.4bpp: $(TILESETDIR)/secondary/generic_building/tiles.png - $(GFX) $< $@ -num_tiles 509 - -$(TILESETDIR)/secondary/mauville_game_corner/tiles.4bpp: $(TILESETDIR)/secondary/mauville_game_corner/tiles.png - $(GFX) $< $@ -num_tiles 469 - -$(TILESETDIR)/secondary/unused_2/tiles.4bpp: $(TILESETDIR)/secondary/unused_2/tiles.png - $(GFX) $< $@ -num_tiles 150 - -$(TILESETDIR)/secondary/rustboro_gym/tiles.4bpp: $(TILESETDIR)/secondary/rustboro_gym/tiles.png - $(GFX) $< $@ -num_tiles 94 - -$(TILESETDIR)/secondary/dewford_gym/tiles.4bpp: $(TILESETDIR)/secondary/dewford_gym/tiles.png - $(GFX) $< $@ -num_tiles 88 - -$(TILESETDIR)/secondary/lavaridge_gym/tiles.4bpp: $(TILESETDIR)/secondary/lavaridge_gym/tiles.png - $(GFX) $< $@ -num_tiles 70 - -$(TILESETDIR)/secondary/fortree_gym/tiles.4bpp: $(TILESETDIR)/secondary/fortree_gym/tiles.png - $(GFX) $< $@ -num_tiles 84 - -$(TILESETDIR)/secondary/mossdeep_gym/tiles.4bpp: $(TILESETDIR)/secondary/mossdeep_gym/tiles.png - $(GFX) $< $@ -num_tiles 122 - -$(TILESETDIR)/secondary/sootopolis_gym/tiles.4bpp: $(TILESETDIR)/secondary/sootopolis_gym/tiles.png - $(GFX) $< $@ -num_tiles 484 - -$(TILESETDIR)/secondary/trick_house_puzzle/tiles.4bpp: $(TILESETDIR)/secondary/trick_house_puzzle/tiles.png - $(GFX) $< $@ -num_tiles 255 - -$(TILESETDIR)/secondary/ship/tiles.4bpp: $(TILESETDIR)/secondary/ship/tiles.png - $(GFX) $< $@ -num_tiles 342 - -$(TILESETDIR)/secondary/elite_four/tiles.4bpp: $(TILESETDIR)/secondary/elite_four/tiles.png - $(GFX) $< $@ -num_tiles 505 +$(TILESETDIR)/secondary/petalburg/tiles.4bpp: GFX_OPTS := -num_tiles 159 +$(TILESETDIR)/secondary/rustboro/tiles.4bpp: GFX_OPTS := -num_tiles 498 +$(TILESETDIR)/secondary/dewford/tiles.4bpp: GFX_OPTS := -num_tiles 343 +$(TILESETDIR)/secondary/slateport/tiles.4bpp: GFX_OPTS := -num_tiles 504 +$(TILESETDIR)/secondary/mauville/tiles.4bpp: GFX_OPTS := -num_tiles 450 +$(TILESETDIR)/secondary/lavaridge/tiles.4bpp: GFX_OPTS := -num_tiles 348 +$(TILESETDIR)/secondary/fallarbor/tiles.4bpp: GFX_OPTS := -num_tiles 374 +$(TILESETDIR)/secondary/fortree/tiles.4bpp: GFX_OPTS := -num_tiles 493 +$(TILESETDIR)/secondary/mossdeep/tiles.4bpp: GFX_OPTS := -num_tiles 499 +$(TILESETDIR)/secondary/pacifidlog/tiles.4bpp: GFX_OPTS := -num_tiles 504 +$(TILESETDIR)/secondary/sootopolis/tiles.4bpp: GFX_OPTS := -num_tiles 180 +$(TILESETDIR)/primary/building/tiles.4bpp: GFX_OPTS := -num_tiles 502 +$(TILESETDIR)/secondary/shop/tiles.4bpp: GFX_OPTS := -num_tiles 502 +$(TILESETDIR)/secondary/pokemon_center/tiles.4bpp: GFX_OPTS := -num_tiles 478 +$(TILESETDIR)/secondary/cave/tiles.4bpp: GFX_OPTS := -num_tiles 420 +$(TILESETDIR)/secondary/pokemon_school/tiles.4bpp: GFX_OPTS := -num_tiles 278 +$(TILESETDIR)/secondary/pokemon_fan_club/tiles.4bpp: GFX_OPTS := -num_tiles 319 +$(TILESETDIR)/secondary/unused_1/tiles.4bpp: GFX_OPTS := -num_tiles 17 +$(TILESETDIR)/secondary/meteor_falls/tiles.4bpp: GFX_OPTS := -num_tiles 422 +$(TILESETDIR)/secondary/oceanic_museum/tiles.4bpp: GFX_OPTS := -num_tiles 319 +$(TILESETDIR)/secondary/cable_club/unknown_tiles.4bpp: GFX_OPTS := -num_tiles 120 +$(TILESETDIR)/secondary/seashore_house/tiles.4bpp: GFX_OPTS := -num_tiles 312 +$(TILESETDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: GFX_OPTS := -num_tiles 345 +$(TILESETDIR)/secondary/pokemon_day_care/tiles.4bpp: GFX_OPTS := -num_tiles 355 +$(TILESETDIR)/secondary/facility/tiles.4bpp: GFX_OPTS := -num_tiles 503 +$(TILESETDIR)/secondary/secret_base/brown_cave/tiles.4bpp: GFX_OPTS := -num_tiles 83 +$(TILESETDIR)/secondary/secret_base/tree/tiles.4bpp: GFX_OPTS := -num_tiles 83 +$(TILESETDIR)/secondary/secret_base/shrub/tiles.4bpp: GFX_OPTS := -num_tiles 83 +$(TILESETDIR)/secondary/secret_base/blue_cave/tiles.4bpp: GFX_OPTS := -num_tiles 83 +$(TILESETDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: GFX_OPTS := -num_tiles 83 +$(TILESETDIR)/secondary/secret_base/red_cave/tiles.4bpp: GFX_OPTS := -num_tiles 83 +$(TILESETDIR)/secondary/inside_of_truck/tiles.4bpp: GFX_OPTS := -num_tiles 62 +$(TILESETDIR)/secondary/contest/tiles.4bpp: GFX_OPTS := -num_tiles 430 +$(TILESETDIR)/secondary/lilycove_museum/tiles.4bpp: GFX_OPTS := -num_tiles 431 +$(TILESETDIR)/secondary/lab/tiles.4bpp: GFX_OPTS := -num_tiles 500 +$(TILESETDIR)/secondary/underwater/tiles.4bpp: GFX_OPTS := -num_tiles 500 +$(TILESETDIR)/secondary/generic_building/tiles.4bpp: GFX_OPTS := -num_tiles 509 +$(TILESETDIR)/secondary/mauville_game_corner/tiles.4bpp: GFX_OPTS := -num_tiles 469 +$(TILESETDIR)/secondary/unused_2/tiles.4bpp: GFX_OPTS := -num_tiles 150 +$(TILESETDIR)/secondary/rustboro_gym/tiles.4bpp: GFX_OPTS := -num_tiles 94 +$(TILESETDIR)/secondary/dewford_gym/tiles.4bpp: GFX_OPTS := -num_tiles 88 +$(TILESETDIR)/secondary/lavaridge_gym/tiles.4bpp: GFX_OPTS := -num_tiles 70 +$(TILESETDIR)/secondary/fortree_gym/tiles.4bpp: GFX_OPTS := -num_tiles 84 +$(TILESETDIR)/secondary/mossdeep_gym/tiles.4bpp: GFX_OPTS := -num_tiles 122 +$(TILESETDIR)/secondary/sootopolis_gym/tiles.4bpp: GFX_OPTS := -num_tiles 484 +$(TILESETDIR)/secondary/trick_house_puzzle/tiles.4bpp: GFX_OPTS := -num_tiles 255 +$(TILESETDIR)/secondary/ship/tiles.4bpp: GFX_OPTS := -num_tiles 342 +$(TILESETDIR)/secondary/elite_four/tiles.4bpp: GFX_OPTS := -num_tiles 505 # reproduce overflow quirk - $(TILESETDIR)/secondary/pokemon_school/tiles.4bpp.lz: $(TILESETDIR)/secondary/pokemon_school/tiles.4bpp - $(GFX) $< $@ -overflow 10 + $(GBAGFX) $< $@ -overflow 10 $(TILESETDIR)/secondary/pokemon_fan_club/tiles.4bpp.lz: $(TILESETDIR)/secondary/pokemon_fan_club/tiles.4bpp - $(GFX) $< $@ -overflow 12 + $(GBAGFX) $< $@ -overflow 12 $(TILESETDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp.lz: $(TILESETDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp - $(GFX) $< $@ -overflow 8 + $(GBAGFX) $< $@ -overflow 8 $(TILESETDIR)/secondary/pokemon_day_care/tiles.4bpp.lz: $(TILESETDIR)/secondary/pokemon_day_care/tiles.4bpp - $(GFX) $< $@ -overflow 14 + $(GBAGFX) $< $@ -overflow 14 $(TILESETDIR)/secondary/inside_of_truck/tiles.4bpp.lz: $(TILESETDIR)/secondary/inside_of_truck/tiles.4bpp - $(GFX) $< $@ -overflow 10 + $(GBAGFX) $< $@ -overflow 10 $(TILESETDIR)/secondary/battle_tower/tiles.4bpp.lz: $(TILESETDIR)/secondary/battle_tower/tiles.4bpp - $(GFX) $< $@ -overflow 16 + $(GBAGFX) $< $@ -overflow 16 # unused copies of secret base tiles $(TILESETDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETDIR)/secondary/secret_base/brown_cave/tiles.png - $(GFX) $< $@ -num_tiles 82 + $(GBAGFX) $< $@ -num_tiles 82 $(TILESETDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETDIR)/secondary/secret_base/tree/tiles.png - $(GFX) $< $@ -num_tiles 82 + $(GBAGFX) $< $@ -num_tiles 82 $(TILESETDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETDIR)/secondary/secret_base/shrub/tiles.png - $(GFX) $< $@ -num_tiles 82 + $(GBAGFX) $< $@ -num_tiles 82 $(TILESETDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETDIR)/secondary/secret_base/blue_cave/tiles.png - $(GFX) $< $@ -num_tiles 82 + $(GBAGFX) $< $@ -num_tiles 82 $(TILESETDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETDIR)/secondary/secret_base/yellow_cave/tiles.png - $(GFX) $< $@ -num_tiles 82 + $(GBAGFX) $< $@ -num_tiles 82 $(TILESETDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETDIR)/secondary/secret_base/red_cave/tiles.png - $(GFX) $< $@ -num_tiles 82 + $(GBAGFX) $< $@ -num_tiles 82 -- cgit v1.2.3 From 31949ea73cf2820cc180aded7b6543b618999025 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 Jan 2018 23:27:54 -0600 Subject: override-de.mk: GFX -> GBAGFX --- override-de.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/override-de.mk b/override-de.mk index 02861fc6a..64a139efb 100644 --- a/override-de.mk +++ b/override-de.mk @@ -6,15 +6,15 @@ INTROGFXDIR := graphics/intro MISCGFXDIR := graphics/misc $(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png - $(GFX) $< $@ -num_tiles 76 + $(GBAGFX) $< $@ -num_tiles 76 $(MENUGFXDIR)/check_berry.4bpp: $(MENUGFXDIR)/check_berry.png - $(GFX) $< $@ -num_tiles 97 + $(GBAGFX) $< $@ -num_tiles 97 $(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png - $(GFX) $< $@ -num_tiles 47 + $(GBAGFX) $< $@ -num_tiles 47 $(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png - $(GFX) $< $@ -num_tiles 92 + $(GBAGFX) $< $@ -num_tiles 92 # # tilesets.mk @@ -22,4 +22,4 @@ $(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png TILESETDIR := data/tilesets $(TILESETDIR)/secondary/shop/tiles.4bpp: $(TILESETDIR)/secondary/shop/tiles.png - $(GFX) $< $@ -num_tiles 503 + $(GBAGFX) $< $@ -num_tiles 503 -- cgit v1.2.3 From 5f9e2256801d56094c7b0e4b096797268f415b03 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 Jan 2018 23:57:23 -0600 Subject: use .SECONDARY to prevent intermediate files from being deleted --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1fb17dc02..cb4aeb46c 100644 --- a/Makefile +++ b/Makefile @@ -78,12 +78,10 @@ endif # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: - # Clear the default suffixes .SUFFIXES: - # Don't delete intermediate files -.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin +.SECONDARY: # Create build subdirectories $(shell mkdir -p $(addprefix $(BUILD_DIR)/, $(SUBDIRS))) -- cgit v1.2.3 From bde368e439b3a279df18efcf563ec908f3e84330 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 11 Jan 2018 11:41:33 -0500 Subject: finish splitting and decompiling dragon.s --- asm/dragon.s | 387 ----------------------------------------------- ld_script.txt | 2 +- src/battle/anim/dark.c | 138 +++++++++++++++++ src/battle/anim/dragon.c | 42 +++-- 4 files changed, 167 insertions(+), 402 deletions(-) delete mode 100755 asm/dragon.s create mode 100755 src/battle/anim/dark.c diff --git a/asm/dragon.s b/asm/dragon.s deleted file mode 100755 index eb372ec80..000000000 --- a/asm/dragon.s +++ /dev/null @@ -1,387 +0,0 @@ - .include "constants/gba_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - @ dragon - - thumb_func_start sub_80DFC24 -sub_80DFC24: @ 80DFC24 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080DFC58 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, _080DFC5C @ =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r1, 0x8] - ldr r0, _080DFC60 @ =gAnimBankAttacker - ldrb r0, [r0] - movs r2, 0x10 - strh r2, [r1, 0xA] - ldr r1, _080DFC64 @ =REG_BLDALPHA - strh r2, [r1] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080DFC70 - ldr r1, _080DFC68 @ =REG_BLDCNT - ldr r2, _080DFC6C @ =0x00003f42 - b _080DFC74 - .align 2, 0 -_080DFC58: .4byte gTasks -_080DFC5C: .4byte gBattleAnimArgs -_080DFC60: .4byte gAnimBankAttacker -_080DFC64: .4byte REG_BLDALPHA -_080DFC68: .4byte REG_BLDCNT -_080DFC6C: .4byte 0x00003f42 -_080DFC70: - ldr r1, _080DFC8C @ =REG_BLDCNT - ldr r2, _080DFC90 @ =0x00003f44 -_080DFC74: - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080DFC94 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, _080DFC98 @ =sub_80DFC9C - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DFC8C: .4byte REG_BLDCNT -_080DFC90: .4byte 0x00003f44 -_080DFC94: .4byte gTasks -_080DFC98: .4byte sub_80DFC9C - thumb_func_end sub_80DFC24 - - thumb_func_start sub_80DFC9C -sub_80DFC9C: @ 80DFC9C - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080DFD04 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0xA] - lsrs r2, r0, 8 - lsls r0, 24 - lsrs r1, r0, 24 - movs r3, 0xC - ldrsh r0, [r4, r3] - ldrb r3, [r4, 0x8] - cmp r0, r3 - bne _080DFD18 - adds r2, 0x1 - lsls r2, 24 - lsrs r2, 24 - subs r0, r1, 0x1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r2, 8 - orrs r1, r0 - movs r3, 0 - strh r1, [r4, 0xA] - ldr r0, _080DFD08 @ =REG_BLDALPHA - strh r1, [r0] - strh r3, [r4, 0xC] - cmp r2, 0x10 - bne _080DFD1E - ldr r2, _080DFD0C @ =gSprites - ldr r1, _080DFD10 @ =gObjectBankIDs - ldr r0, _080DFD14 @ =gAnimBankAttacker - ldrb r0, [r0] - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - adds r0, r5, 0 - bl DestroyAnimVisualTask - b _080DFD1E - .align 2, 0 -_080DFD04: .4byte gTasks -_080DFD08: .4byte REG_BLDALPHA -_080DFD0C: .4byte gSprites -_080DFD10: .4byte gObjectBankIDs -_080DFD14: .4byte gAnimBankAttacker -_080DFD18: - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] -_080DFD1E: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DFC9C - - thumb_func_start sub_80DFD24 -sub_80DFD24: @ 80DFD24 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080DFD48 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, _080DFD4C @ =gBattleAnimArgs - ldrh r0, [r0] - strh r0, [r1, 0x8] - movs r2, 0x80 - lsls r2, 5 - strh r2, [r1, 0xA] - ldr r0, _080DFD50 @ =sub_80DFD58 - str r0, [r1] - ldr r0, _080DFD54 @ =REG_BLDALPHA - strh r2, [r0] - bx lr - .align 2, 0 -_080DFD48: .4byte gTasks -_080DFD4C: .4byte gBattleAnimArgs -_080DFD50: .4byte sub_80DFD58 -_080DFD54: .4byte REG_BLDALPHA - thumb_func_end sub_80DFD24 - - thumb_func_start sub_80DFD58 -sub_80DFD58: @ 80DFD58 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080DFDA8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r1 - ldrh r0, [r2, 0xA] - lsrs r1, r0, 8 - lsls r0, 24 - lsrs r5, r0, 24 - movs r3, 0xC - ldrsh r0, [r2, r3] - ldrb r3, [r2, 0x8] - cmp r0, r3 - bne _080DFDB4 - subs r0, r1, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r3, 8 - orrs r1, r0 - movs r0, 0 - strh r1, [r2, 0xA] - ldr r5, _080DFDAC @ =REG_BLDALPHA - strh r1, [r5] - strh r0, [r2, 0xC] - cmp r3, 0 - bne _080DFDBA - ldr r0, _080DFDB0 @ =REG_BLDCNT - strh r3, [r0] - strh r3, [r5] - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _080DFDBA - .align 2, 0 -_080DFDA8: .4byte gTasks -_080DFDAC: .4byte REG_BLDALPHA -_080DFDB0: .4byte REG_BLDCNT -_080DFDB4: - ldrh r0, [r2, 0xC] - adds r0, 0x1 - strh r0, [r2, 0xC] -_080DFDBA: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DFD58 - - thumb_func_start sub_80DFDC0 -sub_80DFDC0: @ 80DFDC0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080DFDE8 @ =REG_BLDALPHA - movs r2, 0x80 - lsls r2, 5 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080DFDEC @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080DFDF8 - ldr r1, _080DFDF0 @ =REG_BLDCNT - ldr r2, _080DFDF4 @ =0x00003f42 - b _080DFDFC - .align 2, 0 -_080DFDE8: .4byte REG_BLDALPHA -_080DFDEC: .4byte gAnimBankAttacker -_080DFDF0: .4byte REG_BLDCNT -_080DFDF4: .4byte 0x00003f42 -_080DFDF8: - ldr r1, _080DFE0C @ =REG_BLDCNT - ldr r2, _080DFE10 @ =0x00003f44 -_080DFDFC: - adds r0, r2, 0 - strh r0, [r1] - adds r0, r4, 0 - bl DestroyAnimVisualTask - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DFE0C: .4byte REG_BLDCNT -_080DFE10: .4byte 0x00003f44 - thumb_func_end sub_80DFDC0 - - thumb_func_start sub_80DFE14 -sub_80DFE14: @ 80DFE14 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r6, _080DFE80 @ =gAnimBankTarget - ldrb r0, [r6] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x30] - ldr r5, _080DFE84 @ =gAnimBankAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x32] - ldrb r0, [r6] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x34] - ldrb r0, [r5] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x36] - movs r0, 0x7E - strh r0, [r4, 0x2E] - adds r0, r4, 0 - bl sub_8078A5C - ldrh r0, [r4, 0x30] - negs r0, r0 - strh r0, [r4, 0x34] - ldrh r0, [r4, 0x32] - negs r0, r0 - strh r0, [r4, 0x36] - ldr r0, _080DFE88 @ =0x0000ffd8 - strh r0, [r4, 0x3A] - ldr r1, _080DFE8C @ =sub_80DFE90 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DFE80: .4byte gAnimBankTarget -_080DFE84: .4byte gAnimBankAttacker -_080DFE88: .4byte 0x0000ffd8 -_080DFE8C: .4byte sub_80DFE90 - thumb_func_end sub_80DFE14 - - thumb_func_start sub_80DFE90 -sub_80DFE90: @ 80DFE90 - push {r4-r6,lr} - adds r4, r0, 0 - ldrh r5, [r4, 0x30] - ldrh r0, [r4, 0x34] - adds r2, r5, r0 - strh r2, [r4, 0x34] - ldrh r3, [r4, 0x32] - ldrh r6, [r4, 0x36] - adds r1, r3, r6 - strh r1, [r4, 0x36] - lsls r0, r2, 16 - asrs r0, 24 - strh r0, [r4, 0x24] - lsls r0, r1, 16 - asrs r0, 24 - strh r0, [r4, 0x26] - movs r6, 0x3C - ldrsh r0, [r4, r6] - cmp r0, 0 - bne _080DFED2 - adds r0, r2, r5 - strh r0, [r4, 0x34] - adds r1, r3 - strh r1, [r4, 0x36] - lsls r0, 16 - asrs r0, 24 - strh r0, [r4, 0x24] - lsls r1, 16 - asrs r1, 24 - strh r1, [r4, 0x26] - ldrh r0, [r4, 0x2E] - subs r0, 0x1 - strh r0, [r4, 0x2E] -_080DFED2: - movs r1, 0x38 - ldrsh r0, [r4, r1] - movs r2, 0x3A - ldrsh r1, [r4, r2] - bl Sin - ldrh r6, [r4, 0x26] - adds r0, r6 - strh r0, [r4, 0x26] - ldrh r0, [r4, 0x38] - adds r0, 0x3 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - cmp r0, 0x7F - ble _080DFF02 - movs r0, 0 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x3A] - adds r0, 0x14 - strh r0, [r4, 0x3A] - ldrh r0, [r4, 0x3C] - adds r0, 0x1 - strh r0, [r4, 0x3C] -_080DFF02: - ldrh r0, [r4, 0x2E] - subs r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - cmp r0, 0 - bne _080DFF14 - adds r0, r4, 0 - bl DestroyAnimSprite -_080DFF14: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80DFE90 - - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index 0fe09e652..4775e13d6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -296,7 +296,7 @@ SECTIONS { asm/rock.o(.text); asm/ghost.o(.text); src/battle/anim/dragon.o(.text); - asm/dragon.o(.text); + src/battle/anim/dark.o(.text); asm/dark.o(.text); asm/ground.o(.text); asm/normal.o(.text); diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c new file mode 100755 index 000000000..306784609 --- /dev/null +++ b/src/battle/anim/dark.c @@ -0,0 +1,138 @@ +#include "global.h" +#include "rom_8077ABC.h" +#include "trig.h" +#include "battle_anim.h" +#include "sound.h" +#include "scanline_effect.h" + +void sub_80DFE90(struct Sprite *sprite); + +void sub_80DFC9C(u8 taskId); +void sub_80DFD58(u8 taskId); + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; +extern u8 gObjectBankIDs[]; + +// used in Smoke Ball escape, Sky Attack, Feint Attack and Camouflage + +void sub_80DFC24(u8 taskId) +{ + int bank; + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + bank = gAnimBankAttacker; + gTasks[taskId].data[1] = 16; + REG_BLDALPHA = 16; + if (GetBankIdentity_permutated(bank) == 1) + REG_BLDCNT = 0x3F42; + else + REG_BLDCNT = 0x3F44; + gTasks[taskId].func = sub_80DFC9C; +} + +void sub_80DFC9C(u8 taskId) +{ + u8 r2 = gTasks[taskId].data[1] >> 8; + u8 r1 = gTasks[taskId].data[1]; + if (gTasks[taskId].data[2] == (u8)gTasks[taskId].data[0]) + { + r2++; + r1--; + gTasks[taskId].data[1] = (r2 << 8) | r1; + REG_BLDALPHA = (r2 << 8) | r1; + gTasks[taskId].data[2] = 0; + if (r2 == 16) + { + gSprites[gObjectBankIDs[gAnimBankAttacker]].invisible = 1; + DestroyAnimVisualTask(taskId); + } + } + else + gTasks[taskId].data[2]++; +} + +void sub_80DFD24(u8 taskId) +{ + gTasks[taskId].data[0] = gBattleAnimArgs[0]; + gTasks[taskId].data[1] = 0x1000; + gTasks[taskId].func = sub_80DFD58; + REG_BLDALPHA = 0x1000; +} + +void sub_80DFD58(u8 taskId) +{ + u8 r1 = gTasks[taskId].data[1] >> 8; + u8 r5 = gTasks[taskId].data[1]; + if (gTasks[taskId].data[2] == (u8)gTasks[taskId].data[0]) + { + r1--; + r5++; + gTasks[taskId].data[1] = (r1 << 8) | r5; + REG_BLDALPHA = (r1 << 8) | r5; + gTasks[taskId].data[2] = 0; + if (r1 == 0) + { + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimVisualTask(taskId); + } + } + else + gTasks[taskId].data[2]++; +} + +// unlike the above is only used in Feint Attack + +void sub_80DFDC0(u8 taskId) +{ + REG_BLDALPHA = 0x1000; + if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) + REG_BLDCNT = 0x3F42; + else + REG_BLDCNT = 0x3F44; + DestroyAnimVisualTask(taskId); +} + +// unused sprite template's callback + +void sub_80DFE14(struct Sprite *sprite) +{ + sprite->data[1] = GetBankPosition(gAnimBankTarget, 2); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[3] = GetBankPosition(gAnimBankTarget, 3); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); + sprite->data[0] = 0x7E; + sub_8078A5C(sprite); + sprite->data[3] = -sprite->data[1]; + sprite->data[4] = -sprite->data[2]; + sprite->data[6] = 0xFFD8; + sprite->callback = sub_80DFE90; + sub_80DFE90(sprite); +} + +void sub_80DFE90(struct Sprite *sprite) +{ + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + sprite->pos2.x = sprite->data[3] >> 8; + sprite->pos2.y = sprite->data[4] >> 8; + if (sprite->data[7] == 0) + { + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + sprite->pos2.x = sprite->data[3] >> 8; + sprite->pos2.y = sprite->data[4] >> 8; + sprite->data[0]--; + } + sprite->pos2.y += Sin(sprite->data[5], sprite->data[6]); + sprite->data[5] = (sprite->data[5] + 3) & 0xFF; + if (sprite->data[5] > 0x7F) + { + sprite->data[5] = 0; + sprite->data[6] += 20; + sprite->data[7]++; + } + if (--sprite->data[0] == 0) + DestroyAnimSprite(sprite); +} \ No newline at end of file diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index 04859e39f..0feb27dac 100755 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -3,7 +3,7 @@ #include "trig.h" #include "battle_anim.h" #include "sound.h" -#include "unknown_task.h" +#include "scanline_effect.h" void sub_80DF81C(struct Sprite *sprite); void sub_80DFBD8(struct Sprite *sprite); @@ -19,9 +19,10 @@ extern u8 gBankAttacker; extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; extern u16 gUnknown_03000730[]; - +extern u8 gObjectBankIDs[]; // Outrage + void sub_80DF5A0(struct Sprite *sprite) { sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); @@ -44,6 +45,8 @@ void sub_80DF5A0(struct Sprite *sprite) sprite->callback = sub_8078504; } +// part of Dragon Breath + void sub_80DF63C(struct Sprite *sprite) { sub_8078650(sprite); @@ -69,6 +72,8 @@ void sub_80DF63C(struct Sprite *sprite) StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } +// Dragon Rage + void sub_80DF6F0(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) @@ -87,6 +92,8 @@ void sub_80DF6F0(struct Sprite *sprite) StoreSpriteCallbackInData(sprite, move_anim_8074EE0); } +// Dragon Breath init + void sub_80DF760(struct Sprite *sprite) { if (GetBankSide(gAnimBankAttacker)) @@ -94,6 +101,8 @@ void sub_80DF760(struct Sprite *sprite) sub_80DF63C(sprite); } +//next 2 tasks might be Dragon Dance orbs? + void sub_80DF78C(struct Sprite *sprite) { u16 r5; @@ -152,25 +161,27 @@ void sub_80DF81C(struct Sprite *sprite) } } +// Dragon Dance scanline eff + void sub_80DF924(u8 taskId) { - struct UnknownTaskStruct sp; + struct ScanlineEffectParams sp; struct Task *task = &gTasks[taskId]; u16 i; u8 r1; if (GetBankIdentity_permutated(gAnimBankAttacker) == 1) { - sp.dest = ®_BG1HOFS; + sp.dmaDest = ®_BG1HOFS; task->data[2] = gBattle_BG1_X; } else { - sp.dest = ®_BG2HOFS; + sp.dmaDest = ®_BG2HOFS; task->data[2] = gBattle_BG2_X; } - sp.control = 0xA2600001; - sp.unk8 = 1; - sp.unk9 = 0; + sp.dmaControl = 0xA2600001; + sp.initState = 1; + sp.unused9 = 0; r1 = sub_8077FC0(gAnimBankAttacker); task->data[3] = r1 - 32; task->data[4] = r1 + 32; @@ -178,10 +189,10 @@ void sub_80DF924(u8 taskId) task->data[3] = 0; for(i = task->data[3];i <= task->data[4];i++) { - gUnknown_03004DE0[0][i] = task->data[2]; - gUnknown_03004DE0[1][i] = task->data[2]; + gScanlineEffectRegBuffers[0][i] = task->data[2]; + gScanlineEffectRegBuffers[1][i] = task->data[2]; } - sub_80895F8(sp); + ScanlineEffect_SetParams(sp); task->func = sub_80DF9F4; } @@ -214,7 +225,7 @@ void sub_80DF9F4(u8 taskId) sub_80DFAB0(task); break; case 3: - gUnknown_03004DC0.unk15 = 3; + gScanlineEffect.state = 3; task->data[0]++; break; case 4: @@ -229,12 +240,14 @@ void sub_80DFAB0(struct Task *task) u16 i; for (i = task->data[3]; i <= task->data[4]; i++) { - gUnknown_03004DE0[gUnknown_03004DC0.srcBank][i] = ((gSineTable[r3] * task->data[6]) >> 7) + task->data[2]; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = ((gSineTable[r3] * task->data[6]) >> 7) + task->data[2]; r3 = (r3 + 8) & 0xFF; } task->data[5] = (task->data[5] + 9) & 0xFF; } +// Overheat + void sub_80DFB28(struct Sprite *sprite) { int r6 = (gBattleAnimArgs[2] * 3) / 5; @@ -259,4 +272,5 @@ void sub_80DFBD8(struct Sprite *sprite) sprite->pos2.y = sprite->data[5] / 10; if (++sprite->data[0] > sprite->data[3]) DestroyAnimSprite(sprite); -} \ No newline at end of file +} + -- cgit v1.2.3 From a7fe23e3434f427995595b6747ac0f3e57b94621 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 11 Jan 2018 11:37:27 -0600 Subject: fix typo in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cb4aeb46c..d9d7c5a22 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ ruby_rev1: ; @$(MAKE) --no-print-directory VERSION=RUBY REVISION=1 ruby_rev2: ; @$(MAKE) --no-print-directory VERSION=RUBY REVISION=2 sapphire: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE sapphire_rev1: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE REVISION=1 -sapphire_rev2: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE REVISION=1 +sapphire_rev2: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE REVISION=2 ruby_de: ; @$(MAKE) --no-print-directory VERSION=RUBY LANGUAGE=GERMAN sapphire_de: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE LANGUAGE=GERMAN -- cgit v1.2.3 From bed652ee5411efbbbdf7e0920d9fd13646ec39c1 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 11 Jan 2018 13:21:20 -0500 Subject: fixing things --- src/battle/anim/dark.c | 2 +- src/battle/anim/dragon.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 306784609..8ceb00298 100755 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -135,4 +135,4 @@ void sub_80DFE90(struct Sprite *sprite) } if (--sprite->data[0] == 0) DestroyAnimSprite(sprite); -} \ No newline at end of file +} diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index 0feb27dac..bf39e01c0 100755 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -127,7 +127,7 @@ void sub_80DF81C(struct Sprite *sprite) { switch (sprite->data[0]) { - case 0: + case 0: sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF; sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]); sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]); @@ -143,7 +143,7 @@ void sub_80DF81C(struct Sprite *sprite) sprite->data[0]++; } break; - case 1: + case 1: sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF; if (sprite->data[7] <= 0x95 && (sprite->data[7] += 8) > 0x95) sprite->data[7] = 0x96; @@ -201,7 +201,7 @@ void sub_80DF9F4(u8 taskId) struct Task *task = &gTasks[taskId]; switch (task->data[0]) { - case 0: + case 0: if (++task->data[7] > 1) { task->data[7] = 0; @@ -210,12 +210,12 @@ void sub_80DF9F4(u8 taskId) } sub_80DFAB0(task); break; - case 1: + case 1: if (++task->data[1] > 0x3C) task->data[0]++; sub_80DFAB0(task); break; - case 2: + case 2: if (++task->data[7] > 1) { task->data[7] = 0; @@ -224,11 +224,11 @@ void sub_80DF9F4(u8 taskId) } sub_80DFAB0(task); break; - case 3: + case 3: gScanlineEffect.state = 3; task->data[0]++; break; - case 4: + case 4: DestroyAnimVisualTask(taskId); break; } @@ -273,4 +273,3 @@ void sub_80DFBD8(struct Sprite *sprite) if (++sprite->data[0] > sprite->data[3]) DestroyAnimSprite(sprite); } - -- cgit v1.2.3 From 4763fccf6dae7ee1bf9f40973fce5934076a9ee8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 11 Jan 2018 13:36:10 -0600 Subject: remove all built ROMs when running make tidy --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d9d7c5a22..bb5c1b563 100644 --- a/Makefile +++ b/Makefile @@ -96,8 +96,9 @@ clean: tidy $(RM) $(ALL_OBJECTS) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + +ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de tidy: - $(RM) poke$(BUILD_NAME){.gba,.elf,.map} + $(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map}) $(RM) -r build %.gba: %.elf -- cgit v1.2.3 From f658a355e5434a647153d76087b50eec0d5041b1 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 11 Jan 2018 14:59:41 -0500 Subject: idiot, remove conflicts please --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index 80f9d78df..8cbfd8245 100644 --- a/Makefile +++ b/Makefile @@ -160,12 +160,8 @@ include override.mk %.lz: % ; $(GBAGFX) $< $@ $(GFX_OPTS) %.rl: % ; $(GBAGFX) $< $@ $(GFX_OPTS) -<<<<<<< HEAD -======= - #### Sound Rules #### ->>>>>>> 62042c1cbf95b3f26fba3baa4f0a339f0b663462 sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif $(AIF2PCM) $< $@ --compress -- cgit v1.2.3 From 7a65953ccc2313db6de0ec061220b1a5f8751b36 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jan 2018 08:53:01 -0500 Subject: through sub_80999C4 --- asm/pokemon_storage_system.s | 248 --------------------------------- data/pokemon_storage_system.s | 16 --- include/pokemon_storage_system.h | 4 +- src/pokemon/pokemon_storage_system_3.c | 86 ++++++++++++ 4 files changed, 89 insertions(+), 265 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8767808fc..0a3f44372 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,254 +5,6 @@ .text - thumb_func_start sub_809981C -sub_809981C: @ 809981C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - adds r2, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - cmp r0, 0x1 - beq _08099858 - cmp r0, 0x1 - bgt _08099836 - cmp r0, 0 - beq _0809983C - b _080998C0 -_08099836: - cmp r2, 0x2 - beq _0809987C - b _080998C0 -_0809983C: - ldr r3, _0809984C @ =gPokemonStorageSystemPtr - ldr r1, [r3] - ldr r0, _08099850 @ =0x000010cc - adds r2, r1, r0 - lsls r0, r4, 2 - ldr r4, _08099854 @ =0x00001038 - b _08099864 - .align 2, 0 -_0809984C: .4byte gPokemonStorageSystemPtr -_08099850: .4byte 0x000010cc -_08099854: .4byte 0x00001038 -_08099858: - ldr r3, _08099870 @ =gPokemonStorageSystemPtr - ldr r1, [r3] - ldr r0, _08099874 @ =0x000010cc - adds r2, r1, r0 - lsls r0, r4, 2 - ldr r4, _08099878 @ =0x00001050 -_08099864: - adds r0, r4 - adds r1, r0 - str r1, [r2] - adds r0, r3, 0 - b _0809988A - .align 2, 0 -_08099870: .4byte gPokemonStorageSystemPtr -_08099874: .4byte 0x000010cc -_08099878: .4byte 0x00001050 -_0809987C: - ldr r0, _080998C8 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r3, _080998CC @ =0x000010cc - adds r2, r1, r3 - ldr r4, _080998D0 @ =0x00001034 - adds r1, r4 - str r1, [r2] -_0809988A: - ldr r0, [r0] - ldr r1, _080998CC @ =0x000010cc - adds r4, r0, r1 - ldr r0, [r4] - ldr r0, [r0] - cmp r0, 0 - beq _080998C0 - bl InitSpriteAffineAnim - ldr r0, [r4] - ldr r2, [r0] - ldrb r1, [r2, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x1] - ldr r0, [r4] - ldr r1, [r0] - ldr r0, _080998D4 @ =gSpriteAffineAnimTable_83B6F5C - str r0, [r1, 0x10] - ldr r0, [r4] - ldr r0, [r0] - movs r1, 0 - bl StartSpriteAffineAnim -_080998C0: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080998C8: .4byte gPokemonStorageSystemPtr -_080998CC: .4byte 0x000010cc -_080998D0: .4byte 0x00001034 -_080998D4: .4byte gSpriteAffineAnimTable_83B6F5C - thumb_func_end sub_809981C - - thumb_func_start sub_80998D8 -sub_80998D8: @ 80998D8 - push {lr} - ldr r0, _080998FC @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08099900 @ =0x000010cc - adds r0, r1 - ldr r0, [r0] - ldr r1, [r0] - cmp r1, 0 - beq _080998F8 - adds r3, r1, 0 - adds r3, 0x3E - ldrb r2, [r3] - movs r0, 0x4 - ands r0, r2 - cmp r0, 0 - beq _08099904 -_080998F8: - movs r0, 0 - b _0809991A - .align 2, 0 -_080998FC: .4byte gPokemonStorageSystemPtr -_08099900: .4byte 0x000010cc -_08099904: - adds r0, r1, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08099918 - movs r0, 0x4 - orrs r0, r2 - strb r0, [r3] -_08099918: - movs r0, 0x1 -_0809991A: - pop {r1} - bx r1 - thumb_func_end sub_80998D8 - - thumb_func_start sub_8099920 -sub_8099920: @ 8099920 - push {r4,lr} - ldr r0, _08099950 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08099954 @ =0x000010cc - adds r4, r0, r1 - ldr r0, [r4] - ldr r0, [r0] - cmp r0, 0 - beq _0809994A - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldr r0, [r4] - ldr r0, [r0] - bl sub_8099BE0 - ldr r1, [r4] - movs r0, 0 - str r0, [r1] -_0809994A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08099950: .4byte gPokemonStorageSystemPtr -_08099954: .4byte 0x000010cc - thumb_func_end sub_8099920 - - thumb_func_start sub_8099958 -sub_8099958: @ 8099958 - push {lr} - ldr r0, _08099988 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809998C @ =0x000010cc - adds r3, r0, r1 - ldr r0, [r3] - ldr r0, [r0] - cmp r0, 0 - beq _08099982 - adds r2, r0, 0 - adds r2, 0x3E - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r2] - ldr r0, [r3] - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAffineAnim -_08099982: - pop {r0} - bx r0 - .align 2, 0 -_08099988: .4byte gPokemonStorageSystemPtr -_0809998C: .4byte 0x000010cc - thumb_func_end sub_8099958 - - thumb_func_start sub_8099990 -sub_8099990: @ 8099990 - push {lr} - ldr r0, _080999A4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _080999A8 @ =0x000010cc - adds r2, r0, r1 - ldr r0, [r2] - cmp r0, 0 - bne _080999AC - movs r0, 0 - b _080999C0 - .align 2, 0 -_080999A4: .4byte gPokemonStorageSystemPtr -_080999A8: .4byte 0x000010cc -_080999AC: - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080999BE - movs r0, 0 - str r0, [r2] -_080999BE: - movs r0, 0x1 -_080999C0: - pop {r1} - bx r1 - thumb_func_end sub_8099990 - - thumb_func_start sub_80999C4 -sub_80999C4: @ 80999C4 - ldr r1, _080999E4 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - movs r2, 0x8E - lsls r2, 5 - adds r1, r2 - ldr r2, [r1] - ldrh r2, [r2, 0x20] - strh r2, [r0, 0x20] - ldr r2, [r1] - ldrh r1, [r2, 0x26] - ldrh r2, [r2, 0x22] - adds r1, r2 - adds r1, 0x4 - strh r1, [r0, 0x22] - bx lr - .align 2, 0 -_080999E4: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_80999C4 - thumb_func_start sub_80999E8 sub_80999E8: @ 80999E8 push {r4-r6,lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 66cc84000..b4da5c331 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,22 +3,6 @@ .section .rodata - .align 2 -gSpriteAffineAnim_83B6F34:: @ 83B6F34 - obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_83B6F44:: @ 83B6F44 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 15 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83B6F5C:: @ 83B6F5C - .4byte gSpriteAffineAnim_83B6F34 - .4byte gSpriteAffineAnim_83B6F44 - .align 2 gWallpaperPalettes_Forest: @ 83B6F64 .incbin "graphics/pokemon_storage/box_bg1.gbapal" diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 438af769b..129202934 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -121,7 +121,9 @@ struct PokemonStorageSystemData { s8 unk_117b; u8 unk_117c; u8 unk_117d; - u8 filler_117e[0x6a]; + u8 filler_117e[0x42]; + struct Sprite *unk_11c0; + u8 filler_11c4[0x24]; u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index 7f5c84b49..2af88e8cd 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -494,3 +494,89 @@ bool8 sub_809971C(void) } return TRUE; } + +const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = { + AFFINEANIMCMD_FRAME(-2, -2, 0, 120), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = { + AFFINEANIMCMD_FRAME(16, 16, 0, 0), + AFFINEANIMCMD_FRAME(16, 16, 0, 15), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = { + gSpriteAffineAnim_83B6F34, + gSpriteAffineAnim_83B6F44 +}; + +void sub_809981C(u8 mode, u8 idx) +{ + switch (mode) + { + case 0: + gPokemonStorageSystemPtr->unk_10cc = gPokemonStorageSystemPtr->unk_1038 + idx; + break; + case 1: + gPokemonStorageSystemPtr->unk_10cc = gPokemonStorageSystemPtr->unk_1050 + idx; + break; + case 2: + gPokemonStorageSystemPtr->unk_10cc = &gPokemonStorageSystemPtr->unk_1034; + break; + default: + return; + } + if (*gPokemonStorageSystemPtr->unk_10cc) + { + InitSpriteAffineAnim(*gPokemonStorageSystemPtr->unk_10cc); + (*gPokemonStorageSystemPtr->unk_10cc)->oam.affineMode = ST_OAM_AFFINE_NORMAL; + (*gPokemonStorageSystemPtr->unk_10cc)->affineAnims = gSpriteAffineAnimTable_83B6F5C; + StartSpriteAffineAnim(*gPokemonStorageSystemPtr->unk_10cc, 0); + } +} + +bool8 sub_80998D8(void) +{ + if (*gPokemonStorageSystemPtr->unk_10cc == NULL || (*gPokemonStorageSystemPtr->unk_10cc)->invisible) + return FALSE; + if ((*gPokemonStorageSystemPtr->unk_10cc)->affineAnimEnded) + { + (*gPokemonStorageSystemPtr->unk_10cc)->invisible = TRUE; + } + return TRUE; +} + +void sub_8099920(void) +{ + if (*gPokemonStorageSystemPtr->unk_10cc) + { + FreeOamMatrix((*gPokemonStorageSystemPtr->unk_10cc)->oam.matrixNum); + sub_8099BE0(*gPokemonStorageSystemPtr->unk_10cc); + *gPokemonStorageSystemPtr->unk_10cc = NULL; + } +} + +void sub_8099958(void) +{ + if (*gPokemonStorageSystemPtr->unk_10cc) + { + (*gPokemonStorageSystemPtr->unk_10cc)->invisible = FALSE; + StartSpriteAffineAnim(*gPokemonStorageSystemPtr->unk_10cc, 1); + } +} + +bool8 sub_8099990(void) +{ + if (gPokemonStorageSystemPtr->unk_10cc == NULL) + return FALSE; + if ((*gPokemonStorageSystemPtr->unk_10cc)->affineAnimEnded) + gPokemonStorageSystemPtr->unk_10cc = NULL; + return TRUE; +} + +void sub_80999C4(struct Sprite *sprite) +{ + sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; + sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + gPokemonStorageSystemPtr->unk_11c0->pos2.y + 4; +} -- cgit v1.2.3 From 12ec094b4b3641cf33fc1cf45634090e067c70b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jan 2018 09:46:31 -0500 Subject: Remaining functions and data in pss3 --- asm/pokemon_storage_system.s | 269 --------------------------------- include/pokemon_icon.h | 4 + src/pokemon/pokemon_storage_system_3.c | 131 ++++++++++++---- 3 files changed, 106 insertions(+), 298 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 0a3f44372..ce1de0d2e 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,275 +5,6 @@ .text - thumb_func_start sub_80999E8 -sub_80999E8: @ 80999E8 - push {r4-r6,lr} - lsls r0, 16 - lsrs r3, r0, 16 - movs r4, 0 - ldr r1, _08099A58 @ =gPokemonStorageSystemPtr - ldr r0, [r1] - movs r2, 0x89 - lsls r2, 5 - adds r0, r2 - ldrh r0, [r0] - adds r2, r1, 0 - cmp r0, r3 - beq _08099A20 - adds r6, r2, 0 - movs r5, 0x89 - lsls r5, 5 -_08099A08: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x27 - bhi _08099A20 - ldr r0, [r6] - lsls r1, r4, 1 - adds r0, r5 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r3 - bne _08099A08 -_08099A20: - cmp r4, 0x28 - bne _08099A60 - movs r4, 0 - ldr r0, [r2] - movs r5, 0x89 - lsls r5, 5 - adds r0, r5 - ldrh r0, [r0] - cmp r0, 0 - beq _08099A4E - adds r6, r2, 0 -_08099A36: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x27 - bhi _08099A4E - ldr r0, [r6] - lsls r1, r4, 1 - adds r0, r5 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0 - bne _08099A36 -_08099A4E: - cmp r4, 0x28 - bne _08099A60 - ldr r0, _08099A5C @ =0x0000ffff - b _08099A94 - .align 2, 0 -_08099A58: .4byte gPokemonStorageSystemPtr -_08099A5C: .4byte 0x0000ffff -_08099A60: - ldr r1, [r2] - lsls r2, r4, 1 - movs r5, 0x89 - lsls r5, 5 - adds r0, r1, r5 - adds r0, r2 - strh r3, [r0] - ldr r0, _08099A9C @ =0x000010d0 - adds r1, r0 - adds r1, r2 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - lsls r4, 20 - lsrs r4, 16 - ldr r1, _08099AA0 @ =gMonIconTable - lsls r0, r3, 2 - adds r0, r1 - ldr r0, [r0] - lsls r1, r4, 5 - ldr r2, _08099AA4 @ =0x06010000 - adds r1, r2 - ldr r2, _08099AA8 @ =0x04000080 - bl CpuSet - adds r0, r4, 0 -_08099A94: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_08099A9C: .4byte 0x000010d0 -_08099AA0: .4byte gMonIconTable -_08099AA4: .4byte 0x06010000 -_08099AA8: .4byte 0x04000080 - thumb_func_end sub_80999E8 - - thumb_func_start sub_8099AAC -sub_8099AAC: @ 8099AAC - push {r4-r7,lr} - lsls r0, 16 - lsrs r6, r0, 16 - movs r3, 0 - ldr r0, _08099AE4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x89 - lsls r1, 5 - adds r5, r0, r1 - subs r1, 0x50 - adds r4, r0, r1 - ldr r0, _08099AE8 @ =0x0000ffff - adds r7, r0, 0 -_08099AC6: - lsls r1, r3, 1 - adds r2, r5, r1 - ldrh r0, [r2] - cmp r0, r6 - bne _08099AEC - adds r1, r4, r1 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - ands r0, r7 - cmp r0, 0 - bne _08099AF6 - strh r0, [r2] - b _08099AF6 - .align 2, 0 -_08099AE4: .4byte gPokemonStorageSystemPtr -_08099AE8: .4byte 0x0000ffff -_08099AEC: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x27 - bls _08099AC6 -_08099AF6: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8099AAC - - thumb_func_start PSS_SpawnMonIconSprite -PSS_SpawnMonIconSprite: @ 8099AFC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - ldr r4, [sp, 0x3C] - ldr r5, [sp, 0x40] - lsls r0, 16 - lsrs r6, r0, 16 - lsls r2, 16 - lsrs r2, 16 - str r2, [sp, 0x18] - lsls r3, 16 - lsrs r3, 16 - mov r8, r3 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - mov r9, r5 - mov r2, sp - ldr r0, _08099BAC @ =gSpriteTemplate_83B6F14 - ldm r0!, {r3,r5,r7} - stm r2!, {r3,r5,r7} - ldm r0!, {r3,r5,r7} - stm r2!, {r3,r5,r7} - adds r0, r6, 0 - bl mon_icon_convert_unown_species_id - mov r10, r0 - mov r6, r10 - mov r2, sp - ldr r1, _08099BB0 @ =gMonIconPaletteIndices - adds r1, r6, r1 - ldr r3, _08099BB4 @ =0x0000dac0 - adds r0, r3, 0 - ldrb r1, [r1] - adds r0, r1 - strh r0, [r2, 0x2] - adds r0, r6, 0 - bl sub_80999E8 - lsls r0, 16 - lsrs r0, 16 - adds r5, r0, 0 - ldr r0, _08099BB8 @ =0x0000ffff - cmp r5, r0 - beq _08099BCE - ldr r7, [sp, 0x18] - lsls r1, r7, 16 - asrs r1, 16 - mov r0, r8 - lsls r2, r0, 16 - asrs r2, 16 - mov r0, sp - mov r3, r9 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _08099BC8 - ldr r1, _08099BBC @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldr r2, _08099BC0 @ =0x000003ff - ands r2, r5 - ldrh r3, [r0, 0x4] - ldr r1, _08099BC4 @ =0xfffffc00 - ands r1, r3 - orrs r1, r2 - strh r1, [r0, 0x4] - movs r1, 0x3 - ands r4, r1 - lsls r3, r4, 2 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - orrs r1, r3 - strb r1, [r0, 0x5] - mov r1, r10 - strh r1, [r0, 0x2E] - b _08099BD0 - .align 2, 0 -_08099BAC: .4byte gSpriteTemplate_83B6F14 -_08099BB0: .4byte gMonIconPaletteIndices -_08099BB4: .4byte 0x0000dac0 -_08099BB8: .4byte 0x0000ffff -_08099BBC: .4byte gSprites -_08099BC0: .4byte 0x000003ff -_08099BC4: .4byte 0xfffffc00 -_08099BC8: - adds r0, r6, 0 - bl sub_8099AAC -_08099BCE: - movs r0, 0 -_08099BD0: - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end PSS_SpawnMonIconSprite - - thumb_func_start sub_8099BE0 -sub_8099BE0: @ 8099BE0 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - bl sub_8099AAC - adds r0, r4, 0 - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_8099BE0 - // file boundary? thumb_func_start sub_8099BF8 diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 7e26c1c9b..a1a965d81 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -1,6 +1,9 @@ #ifndef GUARD_POKEMON_ICON_H #define GUARD_POKEMON_ICON_H +extern const u8 * const gMonIconTable[]; +extern const u8 gMonIconPaletteIndices[]; + u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality); u8 UpdateMonIconFrame(struct Sprite *sprite); u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4); @@ -12,5 +15,6 @@ void sub_809D580(u16); void sub_809D608(u16); void sub_809D62C(struct Sprite *sprite); void sub_809D824(struct Sprite *sprite, u8 animNum); +u16 mon_icon_convert_unown_species_id(u16 species, u32 personality); #endif // GUARD_POKEMON_ICON_H diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index 2af88e8cd..9d4b88b5d 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -24,20 +24,6 @@ void sub_8099BE0(struct Sprite *sprite); const struct OamData gOamData_83B6F2C; -const struct SpriteTemplate gSpriteTemplate_83B6F14 = { - 0x000f, - 0xdac0, - &gOamData_83B6F2C, - gDummySpriteAnimTable, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallbackDummy -}; - -const struct OamData gOamData_83B6F2C = { - .size = 2 -}; - // .text u8 get_preferred_box(void) @@ -495,21 +481,7 @@ bool8 sub_809971C(void) return TRUE; } -const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = { - AFFINEANIMCMD_FRAME(-2, -2, 0, 120), - AFFINEANIMCMD_END -}; - -const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = { - AFFINEANIMCMD_FRAME(16, 16, 0, 0), - AFFINEANIMCMD_FRAME(16, 16, 0, 15), - AFFINEANIMCMD_END -}; - -const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = { - gSpriteAffineAnim_83B6F34, - gSpriteAffineAnim_83B6F44 -}; +const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[]; void sub_809981C(u8 mode, u8 idx) { @@ -580,3 +552,104 @@ void sub_80999C4(struct Sprite *sprite) sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + gPokemonStorageSystemPtr->unk_11c0->pos2.y + 4; } + +u16 sub_80999E8(u16 a0) +{ + u16 i; + u16 retval; + + for (i = 0; i < 40; i++) + { + if (gPokemonStorageSystemPtr->unk_1120[i] == a0) + break; + } + if (i == 40) + { + for (i = 0; i < 40; i++) + { + if (gPokemonStorageSystemPtr->unk_1120[i] == 0) + break; + } + } + if (i != 40) + { + gPokemonStorageSystemPtr->unk_1120[i] = a0; + gPokemonStorageSystemPtr->unk_10d0[i]++; + retval = i * 16; + CpuCopy32(gMonIconTable[a0], BG_CHAR_ADDR(4) + 32 * retval, 0x200); + return retval; + } + return -1; +} + +void sub_8099AAC(u16 a0) +{ + u16 i; + + for (i = 0; i < 40; i++) + { + if (gPokemonStorageSystemPtr->unk_1120[i] == a0) + { + if (--gPokemonStorageSystemPtr->unk_10d0[i] == 0) + gPokemonStorageSystemPtr->unk_1120[i] = 0; + break; + } + } +} + +struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority) +{ + struct SpriteTemplate template = { + 0x000f, + 0xdac0, + &gOamData_83B6F2C, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy + }; + u16 tileNum; + u8 spriteId; + + species = mon_icon_convert_unown_species_id(species, personality); + template.paletteTag = 0xdac0 + gMonIconPaletteIndices[species]; + tileNum = sub_80999E8(species); + if (tileNum == 0xFFFF) + return NULL; + spriteId = CreateSprite(&template, x, y, subpriority); + if (spriteId == MAX_SPRITES) + { + sub_8099AAC(species); + return NULL; + } + gSprites[spriteId].oam.tileNum = tileNum; + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].data[0] = species; + return gSprites + spriteId; +} + +void sub_8099BE0(struct Sprite *sprite) +{ + sub_8099AAC(sprite->data[0]); + DestroySprite(sprite); +} + +const struct OamData gOamData_83B6F2C = { + .size = 2 +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = { + AFFINEANIMCMD_FRAME(-2, -2, 0, 120), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = { + AFFINEANIMCMD_FRAME(16, 16, 0, 0), + AFFINEANIMCMD_FRAME(16, 16, 0, 15), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = { + gSpriteAffineAnim_83B6F34, + gSpriteAffineAnim_83B6F44 +}; -- cgit v1.2.3 From 3b8f6133865af6ede3628f3df8dd71648b43b3bc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jan 2018 09:57:20 -0500 Subject: some renaming in pss3 --- src/pokemon/pokemon_storage_system_2.c | 6 +-- src/pokemon/pokemon_storage_system_3.c | 78 +++++++++++++++++----------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index e5466ea70..f5eaa2166 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -872,7 +872,7 @@ void sub_809746C(void) gPokemonStorageSystemPtr->unk_0004++; break; case 3: - if (!sub_8099374()) + if (sub_8099374() == 0) { sub_809B6BC(); BoxSetMosaic(); @@ -965,7 +965,7 @@ void sub_8097594(void) } break; case 6: - if (!sub_8099374()) + if (sub_8099374() == 0) { sub_809B440(); BoxSetMosaic(); @@ -1073,7 +1073,7 @@ void sub_8097858(void) gPokemonStorageSystemPtr->unk_0004++; break; case 1: - if (!sub_8099374()) + if (sub_8099374() == 0) { sub_80987DC(); SetPSSCallback(sub_8096C84); diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c index 9d4b88b5d..da26c6fc5 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon/pokemon_storage_system_3.c @@ -13,12 +13,12 @@ // Static ROM declarations -void sub_8098E68(struct Sprite *sprite); -void sub_8099388(struct Sprite *sprite, u16 a1); -void sub_80993F4(struct Sprite *sprite); -void sub_80999C4(struct Sprite *sprite); -struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 a2, s16 a3, u8 a4, u8 a5); -void sub_8099BE0(struct Sprite *sprite); +static void sub_8098E68(struct Sprite *sprite); +static void sub_8099388(struct Sprite *sprite, u16 a1); +static void sub_80993F4(struct Sprite *sprite); +static void sub_80999C4(struct Sprite *sprite); +static struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority); +static void PSS_DestroyMonIconSprite(struct Sprite *sprite); // .rodata @@ -88,7 +88,7 @@ void sub_8098D20(u8 monId) } } -void sub_8098DE0(s16 a0) +static void sub_8098DE0(s16 a0) { u16 monId; for (monId = 0; monId < 30; monId++) @@ -102,7 +102,7 @@ void sub_8098DE0(s16 a0) } } -void sub_8098E24(struct Sprite *sprite) +static void sub_8098E24(struct Sprite *sprite) { if (sprite->data[1] != 0) { @@ -117,7 +117,7 @@ void sub_8098E24(struct Sprite *sprite) } } -void sub_8098E68(struct Sprite *sprite) +static void sub_8098E68(struct Sprite *sprite) { if (sprite->data[4] != 0) { @@ -132,7 +132,7 @@ void sub_8098E68(struct Sprite *sprite) } } -void sub_8098EA0(u8 col) +static void sub_8098EA0(u8 col) { u16 i; @@ -140,44 +140,44 @@ void sub_8098EA0(u8 col) { if (gPokemonStorageSystemPtr->unk_1050[col]) { - sub_8099BE0(gPokemonStorageSystemPtr->unk_1050[col]); + PSS_DestroyMonIconSprite(gPokemonStorageSystemPtr->unk_1050[col]); gPokemonStorageSystemPtr->unk_1050[col] = NULL; } col += 6; } } -u8 sub_8098EE0(u8 a0, u16 a1, s16 a2) +static u8 sub_8098EE0(u8 col, u16 a1, s16 a2) { u16 i; u16 x; u16 y; u8 count; u8 x1; - u16 sp1c; + u16 curX; y = 0x2c; - x = 24 * a0 + 0x64; - sp1c = x - (a1 + 1) * a2; - x1 = 18 - a0; + x = 24 * col + 0x64; + curX = x - (a1 + 1) * a2; + x1 = 18 - col; count = 0; for (i = 0; i < 5; i++) { - u16 species = GetBoxMonData(gPokemonStorage.boxes[gPokemonStorageSystemPtr->unk_117d] + a0, MON_DATA_SPECIES2); + u16 species = GetBoxMonData(gPokemonStorage.boxes[gPokemonStorageSystemPtr->unk_117d] + col, MON_DATA_SPECIES2); if (species != SPECIES_NONE) { - gPokemonStorageSystemPtr->unk_1050[a0] = PSS_SpawnMonIconSprite(species, GetBoxMonData(gPokemonStorage.boxes[gPokemonStorageSystemPtr->unk_117d] + a0, MON_DATA_PERSONALITY), sp1c, y, 2, x1); - if (gPokemonStorageSystemPtr->unk_1050[a0]) + gPokemonStorageSystemPtr->unk_1050[col] = PSS_SpawnMonIconSprite(species, GetBoxMonData(gPokemonStorage.boxes[gPokemonStorageSystemPtr->unk_117d] + col, MON_DATA_PERSONALITY), curX, y, 2, x1); + if (gPokemonStorageSystemPtr->unk_1050[col]) { - gPokemonStorageSystemPtr->unk_1050[a0]->data[1] = a1; - gPokemonStorageSystemPtr->unk_1050[a0]->data[2] = a2; - gPokemonStorageSystemPtr->unk_1050[a0]->data[3] = x; - gPokemonStorageSystemPtr->unk_1050[a0]->callback = sub_8098E24; + gPokemonStorageSystemPtr->unk_1050[col]->data[1] = a1; + gPokemonStorageSystemPtr->unk_1050[col]->data[2] = a2; + gPokemonStorageSystemPtr->unk_1050[col]->data[3] = x; + gPokemonStorageSystemPtr->unk_1050[col]->callback = sub_8098E24; count++; } } - a0 += 6; + col += 6; y += 24; } return count; @@ -299,7 +299,7 @@ u8 sub_8099374(void) return gPokemonStorageSystemPtr->unk_1171; } -void sub_8099388(struct Sprite *sprite, u16 a1) +static void sub_8099388(struct Sprite *sprite, u16 a1) { s16 r3; s16 r4; @@ -323,7 +323,7 @@ void sub_8099388(struct Sprite *sprite, u16 a1) sprite->callback = sub_80993F4; } -void sub_80993F4(struct Sprite *sprite) +static void sub_80993F4(struct Sprite *sprite) { if (sprite->data[6]) { @@ -355,7 +355,7 @@ void sub_8099480(void) { if (gPokemonStorageSystemPtr->unk_1034) { - sub_8099BE0(gPokemonStorageSystemPtr->unk_1034); + PSS_DestroyMonIconSprite(gPokemonStorageSystemPtr->unk_1034); gPokemonStorageSystemPtr->unk_1034 = NULL; } } @@ -383,7 +383,7 @@ void sub_8099520(u8 a0) { if (gPokemonStorageSystemPtr->unk_1038[a0]) { - sub_8099BE0(gPokemonStorageSystemPtr->unk_1038[a0]); + PSS_DestroyMonIconSprite(gPokemonStorageSystemPtr->unk_1038[a0]); gPokemonStorageSystemPtr->unk_1038[a0] = NULL; } } @@ -396,7 +396,7 @@ void sub_809954C(void) { if (gPokemonStorageSystemPtr->unk_1038[i]) { - sub_8099BE0(gPokemonStorageSystemPtr->unk_1038[i]); + PSS_DestroyMonIconSprite(gPokemonStorageSystemPtr->unk_1038[i]); gPokemonStorageSystemPtr->unk_1038[i] = NULL; } } @@ -524,7 +524,7 @@ void sub_8099920(void) if (*gPokemonStorageSystemPtr->unk_10cc) { FreeOamMatrix((*gPokemonStorageSystemPtr->unk_10cc)->oam.matrixNum); - sub_8099BE0(*gPokemonStorageSystemPtr->unk_10cc); + PSS_DestroyMonIconSprite(*gPokemonStorageSystemPtr->unk_10cc); *gPokemonStorageSystemPtr->unk_10cc = NULL; } } @@ -547,13 +547,13 @@ bool8 sub_8099990(void) return TRUE; } -void sub_80999C4(struct Sprite *sprite) +static void sub_80999C4(struct Sprite *sprite) { sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + gPokemonStorageSystemPtr->unk_11c0->pos2.y + 4; } -u16 sub_80999E8(u16 a0) +static u16 PSS_LoadSpeciesIconGfx(u16 a0) { u16 i; u16 retval; @@ -579,10 +579,10 @@ u16 sub_80999E8(u16 a0) CpuCopy32(gMonIconTable[a0], BG_CHAR_ADDR(4) + 32 * retval, 0x200); return retval; } - return -1; + return 0xFFFF; } -void sub_8099AAC(u16 a0) +static void PSS_ForgetSpeciesIcon(u16 a0) { u16 i; @@ -597,7 +597,7 @@ void sub_8099AAC(u16 a0) } } -struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority) +static struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority) { struct SpriteTemplate template = { 0x000f, @@ -613,13 +613,13 @@ struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y species = mon_icon_convert_unown_species_id(species, personality); template.paletteTag = 0xdac0 + gMonIconPaletteIndices[species]; - tileNum = sub_80999E8(species); + tileNum = PSS_LoadSpeciesIconGfx(species); if (tileNum == 0xFFFF) return NULL; spriteId = CreateSprite(&template, x, y, subpriority); if (spriteId == MAX_SPRITES) { - sub_8099AAC(species); + PSS_ForgetSpeciesIcon(species); return NULL; } gSprites[spriteId].oam.tileNum = tileNum; @@ -628,9 +628,9 @@ struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y return gSprites + spriteId; } -void sub_8099BE0(struct Sprite *sprite) +static void PSS_DestroyMonIconSprite(struct Sprite *sprite) { - sub_8099AAC(sprite->data[0]); + PSS_ForgetSpeciesIcon(sprite->data[0]); DestroySprite(sprite); } -- cgit v1.2.3 From f37add5cfb4bb369ec096d91f62915ee4f88a1d7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jan 2018 12:13:35 -0500 Subject: through sub_8099D90 --- asm/pokemon_storage_system.s | 226 --------------------------------- include/pokemon_storage_system.h | 22 +++- ld_script.txt | 1 + src/pokemon/pokemon_storage_system_4.c | 71 +++++++++++ src/pokemon/pokemon_storage_system_6.c | 14 ++ 5 files changed, 106 insertions(+), 228 deletions(-) create mode 100644 src/pokemon/pokemon_storage_system_6.c diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 41987f841..e66901961 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,232 +5,6 @@ .text - thumb_func_start sub_8099BF8 -sub_8099BF8: @ 8099BF8 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _08099C50 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08099C54 @ =0x000008ba - adds r2, r0, r1 - movs r1, 0 - strb r1, [r2] - ldr r2, _08099C58 @ =0x000008b4 - adds r0, r2 - strh r1, [r0] - str r1, [sp] - ldr r1, _08099C5C @ =0x040000d4 - mov r0, sp - str r0, [r1] - ldr r0, _08099C60 @ =0x0600d000 - str r0, [r1, 0x4] - ldr r0, _08099C64 @ =0x85000400 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r0, r4, 0 - movs r1, 0 - bl sub_8099EB0 - adds r0, r4, 0 - bl sub_809A23C - bl sub_809A6DC - adds r0, r4, 0 - bl SpawnBoxIconSprites - ldr r1, _08099C68 @ =REG_BG2CNT - ldr r2, _08099C6C @ =0x00005a0a - adds r0, r2, 0 - strh r0, [r1] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08099C50: .4byte gPokemonStorageSystemPtr -_08099C54: .4byte 0x000008ba -_08099C58: .4byte 0x000008b4 -_08099C5C: .4byte 0x040000d4 -_08099C60: .4byte 0x0600d000 -_08099C64: .4byte 0x85000400 -_08099C68: .4byte REG_BG2CNT -_08099C6C: .4byte 0x00005a0a - thumb_func_end sub_8099BF8 - - thumb_func_start sub_8099C70 -sub_8099C70: @ 8099C70 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - bl sub_8099D90 - lsls r0, 24 - asrs r4, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_8099EB0 - ldr r0, _08099D10 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 1 - ldr r3, _08099D14 @ =0x000008b6 - adds r1, r2, r3 - strh r0, [r1] - ldr r0, _08099D18 @ =0x000008b8 - adds r1, r2, r0 - movs r0, 0x20 - strh r0, [r1] - ldr r1, _08099D1C @ =0x000008bb - adds r0, r2, r1 - strb r5, [r0] - movs r1, 0 - cmp r4, 0 - bgt _08099CAE - movs r1, 0x5 -_08099CAE: - ldr r3, _08099D20 @ =0x000008bc - adds r0, r2, r3 - strh r1, [r0] - ldr r1, _08099D24 @ =0x000008be - adds r0, r2, r1 - strh r4, [r0] - movs r1, 0x38 - cmp r4, 0 - ble _08099CC6 - movs r3, 0x84 - lsls r3, 1 - adds r1, r3, 0 -_08099CC6: - movs r3, 0x8C - lsls r3, 4 - adds r0, r2, r3 - strh r1, [r0] - movs r1, 0 - cmp r4, 0 - bgt _08099CD6 - movs r1, 0x5 -_08099CD6: - ldr r3, _08099D28 @ =0x000008c2 - adds r0, r2, r3 - strh r1, [r0] - ldr r1, _08099D2C @ =0x000008c4 - adds r0, r2, r1 - strh r4, [r0] - adds r3, 0x4 - adds r1, r2, r3 - movs r0, 0 - strh r0, [r1] - ldr r0, _08099D30 @ =0x000008c8 - adds r1, r2, r0 - movs r0, 0x2 - strh r0, [r1] - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_809900C - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_809A3D0 - adds r0, r4, 0 - bl sub_809A774 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08099D10: .4byte gPokemonStorageSystemPtr -_08099D14: .4byte 0x000008b6 -_08099D18: .4byte 0x000008b8 -_08099D1C: .4byte 0x000008bb -_08099D20: .4byte 0x000008bc -_08099D24: .4byte 0x000008be -_08099D28: .4byte 0x000008c2 -_08099D2C: .4byte 0x000008c4 -_08099D30: .4byte 0x000008c8 - thumb_func_end sub_8099C70 - - thumb_func_start sub_8099D34 -sub_8099D34: @ 8099D34 - push {r4,lr} - bl sub_80990AC - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _08099D78 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r0, _08099D7C @ =0x000008b8 - adds r3, r1, r0 - ldrh r0, [r3] - cmp r0, 0 - beq _08099D88 - ldr r4, _08099D80 @ =0x000008b4 - adds r2, r1, r4 - adds r4, 0x2 - adds r0, r1, r4 - ldrh r0, [r0] - ldrh r1, [r2] - adds r0, r1 - ldr r1, _08099D84 @ =0x000001ff - ands r0, r1 - strh r0, [r2] - ldrh r0, [r3] - subs r0, 0x1 - strh r0, [r3] - lsls r0, 16 - cmp r0, 0 - bne _08099D74 - bl sub_809A598 - bl sub_809A810 -_08099D74: - movs r0, 0x1 - b _08099D8A - .align 2, 0 -_08099D78: .4byte gPokemonStorageSystemPtr -_08099D7C: .4byte 0x000008b8 -_08099D80: .4byte 0x000008b4 -_08099D84: .4byte 0x000001ff -_08099D88: - adds r0, r2, 0 -_08099D8A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8099D34 - - thumb_func_start sub_8099D90 -sub_8099D90: @ 8099D90 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl get_preferred_box - lsls r0, 24 - lsrs r1, r0, 24 - movs r2, 0 - cmp r1, r4 - beq _08099DBA -_08099DA4: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xD - bls _08099DB0 - movs r1, 0 -_08099DB0: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r1, r4 - bne _08099DA4 -_08099DBA: - movs r0, 0x1 - negs r0, r0 - cmp r2, 0x6 - bhi _08099DC4 - movs r0, 0x1 -_08099DC4: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8099D90 - thumb_func_start sub_8099DCC sub_8099DCC: @ 8099DCC push {r4,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 129202934..09b3be60f 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -99,11 +99,26 @@ struct PokemonStorageSystemData { bool8 unk_08b1; s16 unk_08b2; u16 unk_08b4; - u8 filler_08b6[0x4a6]; + u16 unk_08b6; + u16 unk_08b8; + u8 unk_08ba; + u8 unk_08bb; + u16 unk_08bc; + u16 unk_08be; + u16 unk_08c0; + u16 unk_08c2; + u16 unk_08c4; + u16 unk_08c6; + u16 unk_08c8; + u8 unk_08ca[0x400]; + u8 unk_0cca; + u16 unk_0ccc[0x20]; + u8 filler_0d0c[0x50]; u16 unk_0d5c; s16 unk_0d5e; s16 unk_0d60; - u8 filler_0d62[0x2d2]; + u8 unk_0d62[0x2d0]; + u8 unk_1032; struct Sprite *unk_1034; struct Sprite *unk_1038[6]; // party struct Sprite *unk_1050[30]; // box @@ -177,6 +192,9 @@ void sub_80961A8(void); void task_intro_29(u8 whichMenu); void ResetPokemonStorageSystem(void); void ResetPSSMonIconSprites(void); +void SpawnBoxIconSprites(u8 boxId); +u8 get_preferred_box(void); +bool8 sub_80990AC(void); void sub_8099200(bool8 a0); void sub_8099310(void); bool8 sub_8099374(void); diff --git a/ld_script.txt b/ld_script.txt index f14352a4e..e1d28736e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -133,6 +133,7 @@ SECTIONS { src/pokemon/pokemon_storage_system_3.o(.text); src/pokemon/pokemon_storage_system_4.o(.text); src/pokemon/pokemon_storage_system_5.o(.text); + src/pokemon/pokemon_storage_system_6.o(.text); asm/pokemon_storage_system.o(.text); src/pokemon/pokemon_icon.o(.text); src/pokemon/pokemon_summary_screen.o(.text); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index f7a008db2..697292d5c 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -18,6 +18,77 @@ EWRAM_DATA u16 gUnknown_020384EA = 0; // Static ROM declarations +void sub_809900C(u8 boxId, s8 a1); +s8 sub_8099D90(u8 boxId); +void sub_8099EB0(u8 boxId, s8 a1); +void sub_809A23C(u8 boxId); +void sub_809A3D0(u8 boxId, s8 a1); +void sub_809A598(void); +void sub_809A6DC(void); +void sub_809A774(s8 a0); +void sub_809A810(void); + // .rodata // .text + +void sub_8099BF8(u8 boxId) +{ + gPokemonStorageSystemPtr->unk_08ba = 0; + gPokemonStorageSystemPtr->unk_08b4 = 0; + DmaFill32(3, 0, BG_SCREEN_ADDR(26), 0x1000); + sub_8099EB0(boxId, 0); + sub_809A23C(boxId); + sub_809A6DC(); + SpawnBoxIconSprites(boxId); + REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(26) | BGCNT_TXT512x256; +} + +void sub_8099C70(u8 whichBox) +{ + s8 r4 = sub_8099D90(whichBox); + sub_8099EB0(whichBox, r4); + gPokemonStorageSystemPtr->unk_08b6 = r4 * 6; + gPokemonStorageSystemPtr->unk_08b8 = 0x20; + gPokemonStorageSystemPtr->unk_08bb = whichBox; + gPokemonStorageSystemPtr->unk_08bc = r4 > 0 ? 0 : 5; + gPokemonStorageSystemPtr->unk_08be = r4; + gPokemonStorageSystemPtr->unk_08c0 = r4 > 0 ? 0x108 : 0x38; + gPokemonStorageSystemPtr->unk_08c2 = r4 > 0 ? 0 : 5; + gPokemonStorageSystemPtr->unk_08c4 = r4; + gPokemonStorageSystemPtr->unk_08c6 = 0; + gPokemonStorageSystemPtr->unk_08c8 = 2; + sub_809900C(whichBox, r4); + sub_809A3D0(whichBox, r4); + sub_809A774(r4); +} + +bool8 sub_8099D34(void) +{ + bool8 retVal = sub_80990AC(); + if (gPokemonStorageSystemPtr->unk_08b8 != 0) + { + gPokemonStorageSystemPtr->unk_08b4 += gPokemonStorageSystemPtr->unk_08b6; + gPokemonStorageSystemPtr->unk_08b4 &= 0x1ff; + if (--gPokemonStorageSystemPtr->unk_08b8 == 0) + { + sub_809A598(); + sub_809A810(); + } + return TRUE; + } + return retVal; +} + +s8 sub_8099D90(u8 boxId) +{ + u8 curBox = get_preferred_box(); + u8 i; + + for (i = 0; curBox != boxId; i++) + { + if (++curBox >= 14) + curBox = 0; + } + return i <= 6 ? 1 : -1; +} diff --git a/src/pokemon/pokemon_storage_system_6.c b/src/pokemon/pokemon_storage_system_6.c new file mode 100644 index 000000000..a781c1ed2 --- /dev/null +++ b/src/pokemon/pokemon_storage_system_6.c @@ -0,0 +1,14 @@ + +// Includes +#include "global.h" +#include "pokemon_storage_system.h" + +// Static type declarations + +// Static RAM declarations + +// Static ROM declarations + +// .rodata + +// .text -- cgit v1.2.3 From 8c2c8ed3a9e377382a0ac645053e4b7b4ab41c4e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jan 2018 12:50:59 -0500 Subject: match unref_sub_8095D08 --- src/pokemon/pokemon_storage_system.c | 149 ++++++----------------------------- 1 file changed, 22 insertions(+), 127 deletions(-) diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 80081c963..c02fdfb3a 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -177,7 +177,27 @@ void sub_8095C8C(u16 *dest, u16 dest_left, u16 dest_top, const u16 *src, u16 src } } -#ifdef NONMATCHING +#define MAX_DMA_BLOCK_SIZE 0x1000 +#define Dma3FillLarge_(value, dest, size, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + if (_size <= MAX_DMA_BLOCK_SIZE) \ + { \ + DmaFill##bit(3, value, _dest, _size); \ + break; \ + } \ + DmaFill##bit(3, value, _dest, MAX_DMA_BLOCK_SIZE); \ + _dest += MAX_DMA_BLOCK_SIZE; \ + _size -= MAX_DMA_BLOCK_SIZE; \ + } \ +} + +#define Dma3FillLarge16_(value, dest, size) Dma3FillLarge_(value, dest, size, 16) +#define Dma3FillLarge32_(value, dest, size) Dma3FillLarge_(value, dest, size, 32) + void unref_sub_8095D08(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height) { u16 i; @@ -185,133 +205,8 @@ void unref_sub_8095D08(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 he dest += dest_top * 0x20 + dest_left; width *= 2; for (i = 0; i < height; dest += 0x20, i++) - { - void *_dest = dest; - size_t _size = width; - if (_size <= 0x1000) - { - DmaFill16(3, 0, _dest, _size); - } - else - { - while (1) - { - DmaFill16(3, 0, _dest, 0x1000); - _dest += 0x1000; - _size -= 0x1000; - if (_size <= 0x1000) - { - DmaFill16(3, 0, _dest, _size); - break; - } - } - } - } -} -#else -__attribute__((naked)) void unref_sub_8095D08(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmov r7, r10\n" - "\tmov r6, r9\n" - "\tmov r5, r8\n" - "\tpush {r5-r7}\n" - "\tsub sp, 0x8\n" - "\tadds r4, r0, 0\n" - "\tldr r0, [sp, 0x28]\n" - "\tlsls r1, 16\n" - "\tlsrs r1, 16\n" - "\tlsls r2, 16\n" - "\tlsls r0, 16\n" - "\tlsrs r0, 16\n" - "\tmov r10, r0\n" - "\tlsrs r2, 11\n" - "\tadds r2, r1\n" - "\tlsls r2, 1\n" - "\tadds r4, r2\n" - "\tlsls r3, 17\n" - "\tlsrs r0, r3, 16\n" - "\tstr r0, [sp, 0x4]\n" - "\tmovs r0, 0\n" - "\tcmp r0, r10\n" - "\tbcs _08095DB2\n" - "\tmovs r6, 0x80\n" - "\tlsls r6, 5\n" - "\tmov r5, sp\n" - "\tldr r7, _08095D74 @ =0x040000d4\n" - "\tlsrs r3, 17\n" - "\tmov r9, r3\n" - "\tmov r1, r9\n" - "\tmovs r2, 0x81\n" - "\tlsls r2, 24\n" - "\torrs r1, r2\n" - "\tmov r9, r1\n" - "_08095D4E:\n" - "\tadds r3, r4, 0\n" - "\tldr r2, [sp, 0x4]\n" - "\tmovs r1, 0x40\n" - "\tadds r1, r4\n" - "\tmov r8, r1\n" - "\tadds r0, 0x1\n" - "\tmov r12, r0\n" - "\tcmp r2, r6\n" - "\tbhi _08095D78\n" - "\tmovs r0, 0\n" - "\tstrh r0, [r5]\n" - "\tmov r2, sp\n" - "\tstr r2, [r7]\n" - "\tstr r4, [r7, 0x4]\n" - "\tmov r0, r9\n" - "\tstr r0, [r7, 0x8]\n" - "\tldr r0, [r7, 0x8]\n" - "\tb _08095DA6\n" - "\t.align 2, 0\n" - "_08095D74: .4byte 0x040000d4\n" - "_08095D78:\n" - "\tmovs r4, 0\n" - "\tstrh r4, [r5]\n" - "\tldr r1, _08095DC4 @ =0x040000d4\n" - "\tmov r0, sp\n" - "\tstr r0, [r1]\n" - "\tstr r3, [r1, 0x4]\n" - "\tldr r0, _08095DC8 @ =0x81000800\n" - "\tstr r0, [r1, 0x8]\n" - "\tldr r0, [r1, 0x8]\n" - "\tadds r3, r6\n" - "\tsubs r2, r6\n" - "\tcmp r2, r6\n" - "\tbhi _08095D78\n" - "\tstrh r4, [r5]\n" - "\tmov r0, sp\n" - "\tstr r0, [r1]\n" - "\tstr r3, [r1, 0x4]\n" - "\tlsrs r0, r2, 1\n" - "\tmovs r2, 0x81\n" - "\tlsls r2, 24\n" - "\torrs r0, r2\n" - "\tstr r0, [r1, 0x8]\n" - "\tldr r0, [r1, 0x8]\n" - "_08095DA6:\n" - "\tmov r4, r8\n" - "\tmov r1, r12\n" - "\tlsls r0, r1, 16\n" - "\tlsrs r0, 16\n" - "\tcmp r0, r10\n" - "\tbcc _08095D4E\n" - "_08095DB2:\n" - "\tadd sp, 0x8\n" - "\tpop {r3-r5}\n" - "\tmov r8, r3\n" - "\tmov r9, r4\n" - "\tmov r10, r5\n" - "\tpop {r4-r7}\n" - "\tpop {r0}\n" - "\tbx r0\n" - "\t.align 2, 0\n" - "_08095DC4: .4byte 0x040000d4\n" - "_08095DC8: .4byte 0x81000800"); + Dma3FillLarge16_(0, dest, width); } -#endif s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx, u8 mode) { -- cgit v1.2.3 From aadd5c8ac07ef5967d8e2cf58fbdd04f79d5b82a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jan 2018 13:41:32 -0500 Subject: through sub_8099EB0 and relevant data --- asm/pokemon_storage_system.s | 192 ------------------ data/pokemon_storage_system.s | 346 --------------------------------- include/pokemon_storage_system.h | 7 +- ld_script.txt | 1 + src/pokemon/pokemon_storage_system_4.c | 233 +++++++++++++++++++++- 5 files changed, 237 insertions(+), 542 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index e66901961..55c7d448b 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,198 +5,6 @@ .text - thumb_func_start sub_8099DCC -sub_8099DCC: @ 8099DCC - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08099DF8 @ =gPokemonStorage - ldr r2, _08099DFC @ =0x000083c2 - adds r1, r2 - adds r0, r1 - movs r1, 0 - strb r4, [r0] - ldr r0, _08099E00 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r2, _08099E04 @ =0x00001032 - adds r0, r2 - strb r1, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08099DF8: .4byte gPokemonStorage -_08099DFC: .4byte 0x000083c2 -_08099E00: .4byte gPokemonStorageSystemPtr -_08099E04: .4byte 0x00001032 - thumb_func_end sub_8099DCC - - thumb_func_start sub_8099E08 -sub_8099E08: @ 8099E08 - push {r4,r5,lr} - sub sp, 0x4 - ldr r0, _08099E24 @ =gPokemonStorageSystemPtr - ldr r5, [r0] - ldr r0, _08099E28 @ =0x00001032 - adds r4, r5, r0 - ldrb r0, [r4] - cmp r0, 0x1 - beq _08099E54 - cmp r0, 0x1 - bgt _08099E2C - cmp r0, 0 - beq _08099E36 - b _08099EA6 - .align 2, 0 -_08099E24: .4byte gPokemonStorageSystemPtr -_08099E28: .4byte 0x00001032 -_08099E2C: - cmp r0, 0x2 - beq _08099E90 - cmp r0, 0x3 - beq _08099EA2 - b _08099EA6 -_08099E36: - ldr r1, _08099E4C @ =0x00000d08 - adds r0, r5, r1 - ldr r0, [r0] - ldr r1, _08099E50 @ =0x0000ffff - str r1, [sp] - movs r1, 0x1 - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - b _08099E9A - .align 2, 0 -_08099E4C: .4byte 0x00000d08 -_08099E50: .4byte 0x0000ffff -_08099E54: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _08099EA6 - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl sub_8099EB0 - bl sub_809A654 - ldr r1, _08099E88 @ =0x00000d08 - adds r0, r5, r1 - ldr r0, [r0] - ldr r1, _08099E8C @ =0x0000ffff - str r1, [sp] - movs r1, 0x1 - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _08099E9A - .align 2, 0 -_08099E88: .4byte 0x00000d08 -_08099E8C: .4byte 0x0000ffff -_08099E90: - bl UpdatePaletteFade - lsls r0, 24 - cmp r0, 0 - bne _08099EA6 -_08099E9A: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _08099EA6 -_08099EA2: - movs r0, 0 - b _08099EA8 -_08099EA6: - movs r0, 0x1 -_08099EA8: - add sp, 0x4 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8099E08 - - thumb_func_start sub_8099EB0 -sub_8099EB0: @ 8099EB0 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r7, r1, 24 - cmp r1, 0 - beq _08099ED8 - ldr r0, _08099F38 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r2, 0 - ldr r3, _08099F3C @ =0x000008ba - adds r1, r0, r3 - ldrb r0, [r1] - cmp r0, 0 - bne _08099ED0 - movs r2, 0x1 -_08099ED0: - strb r2, [r1] - ldr r0, _08099F40 @ =0x0600d000 - bl sub_809A14C -_08099ED8: - ldr r0, _08099F44 @ =gPokemonStorage - ldr r1, _08099F48 @ =0x000083c2 - adds r0, r1 - adds r0, r4, r0 - ldrb r4, [r0] - lsls r4, 4 - ldr r0, _08099F4C @ =gWallpaperTable - adds r4, r0 - ldr r0, [r4, 0xC] - ldr r1, _08099F38 @ =gPokemonStorageSystemPtr - ldr r5, [r1] - ldr r2, _08099F3C @ =0x000008ba - adds r6, r5, r2 - ldrb r2, [r6] - lsls r1, r2, 1 - adds r1, r2 - lsls r1, 20 - movs r3, 0x80 - lsls r3, 15 - adds r1, r3 - lsrs r1, 16 - movs r2, 0x60 - bl LoadPalette - ldr r0, [r4, 0x8] - ldr r1, _08099F50 @ =0x00000d62 - adds r5, r1 - adds r1, r5, 0 - bl LZ77UnCompWram - ldr r0, _08099F40 @ =0x0600d000 - lsls r2, r7, 24 - asrs r2, 24 - ldrb r3, [r6] - adds r1, r5, 0 - bl sub_8099F58 - ldr r0, [r4] - ldrb r1, [r6] - lsls r1, 13 - ldr r2, _08099F54 @ =0x06008000 - adds r1, r2 - bl LZ77UnCompVram - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08099F38: .4byte gPokemonStorageSystemPtr -_08099F3C: .4byte 0x000008ba -_08099F40: .4byte 0x0600d000 -_08099F44: .4byte gPokemonStorage -_08099F48: .4byte 0x000083c2 -_08099F4C: .4byte gWallpaperTable -_08099F50: .4byte 0x00000d62 -_08099F54: .4byte 0x06008000 - thumb_func_end sub_8099EB0 - thumb_func_start sub_8099F58 sub_8099F58: @ 8099F58 push {r4-r7,lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 883630413..8d62633d3 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,352 +3,6 @@ .section .rodata - .align 2 -gWallpaperPalettes_Forest: @ 83B6F64 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/forest_frame.gbapal" - .incbin "graphics/pokemon_storage/forest_bg.gbapal" - - .align 2 -gWallpaperTiles_Forest: @ 83B6FC4 - .incbin "graphics/pokemon_storage/forest.4bpp.lz" - - .align 2 -gWallpaperTilemap_Forest: @ 83B7394 - .incbin "graphics/pokemon_storage/forest.bin.lz" - - .align 2 -gWallpaperPalettes_City: @ 83B7470 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/city_frame.gbapal" - .incbin "graphics/pokemon_storage/city_bg.gbapal" - - .align 2 -gWallpaperTiles_City: @ 83B74D0 - .incbin "graphics/pokemon_storage/city.4bpp.lz" - - .align 2 -gWallpaperTilemap_City: @ 83B76D8 - .incbin "graphics/pokemon_storage/city.bin.lz" - - .align 2 -gWallpaperPalettes_Desert: @ 83B7788 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/desert_frame.gbapal" - .incbin "graphics/pokemon_storage/desert_bg.gbapal" - - .align 2 -gWallpaperTiles_Desert: @ 83B77E8 - .incbin "graphics/pokemon_storage/desert.4bpp.lz" - - .align 2 -gWallpaperTilemap_Desert: @ 83B7AD4 - .incbin "graphics/pokemon_storage/desert.bin.lz" - - .align 2 -gWallpaperPalettes_Savanna: @ 83B7BB8 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/savanna_frame.gbapal" - .incbin "graphics/pokemon_storage/savanna_bg.gbapal" - - .align 2 -gWallpaperTiles_Savanna: @ 83B7C18 - .incbin "graphics/pokemon_storage/savanna.4bpp.lz" - - .align 2 -gWallpaperTilemap_Savanna: @ 83B7E38 - .incbin "graphics/pokemon_storage/savanna.bin.lz" - - .align 2 -gWallpaperPalettes_Crag: @ 83B7F04 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/crag_frame.gbapal" - .incbin "graphics/pokemon_storage/crag_bg.gbapal" - - .align 2 -gWallpaperTiles_Crag: @ 83B7F64 - .incbin "graphics/pokemon_storage/crag.4bpp.lz" - - .align 2 -gWallpaperTilemap_Crag: @ 83B82B4 - .incbin "graphics/pokemon_storage/crag.bin.lz" - - .align 2 -gWallpaperPalettes_Volcano: @ 83B838C - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/volcano_frame.gbapal" - .incbin "graphics/pokemon_storage/volcano_bg.gbapal" - - .align 2 -gWallpaperTiles_Volcano: @ 83B83EC - .incbin "graphics/pokemon_storage/volcano.4bpp.lz" - - .space 4 - - .align 2 -gWallpaperTilemap_Volcano: @ 83B8720 - .incbin "graphics/pokemon_storage/volcano.bin.lz" - - .align 2 -gWallpaperPalettes_Snow: @ 83B87F8 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/snow_frame.gbapal" - .incbin "graphics/pokemon_storage/snow_bg.gbapal" - - .align 2 -gWallpaperTiles_Snow: @ 83B8858 - .incbin "graphics/pokemon_storage/snow.4bpp.lz" - - .align 2 -gWallpaperTilemap_Snow: @ 83B8B10 - .incbin "graphics/pokemon_storage/snow.bin.lz" - - .align 2 -gWallpaperPalettes_Cave: @ 83B8BDC - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/cave_frame.gbapal" - .incbin "graphics/pokemon_storage/cave_bg.gbapal" - - .align 2 -gWallpaperTiles_Cave: @ 83B8C3C - .incbin "graphics/pokemon_storage/cave.4bpp.lz" - - .align 2 -gWallpaperTilemap_Cave: @ 83B8F80 - .incbin "graphics/pokemon_storage/cave.bin.lz" - - .align 2 -gWallpaperPalettes_Beach: @ 83B905C - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/beach_frame.gbapal" - .incbin "graphics/pokemon_storage/beach_bg.gbapal" - - .align 2 -gWallpaperTiles_Beach: @ 83B90BC - .incbin "graphics/pokemon_storage/beach.4bpp.lz" - - .align 2 -gWallpaperTilemap_Beach: @ 83B9440 - .incbin "graphics/pokemon_storage/beach.bin.lz" - - .align 2 -gWallpaperPalettes_Seafloor: @ 83B9528 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/seafloor_frame.gbapal" - .incbin "graphics/pokemon_storage/seafloor_bg.gbapal" - - .align 2 -gWallpaperTiles_Seafloor: @ 83B9588 - .incbin "graphics/pokemon_storage/seafloor.4bpp.lz" - - .align 2 -gWallpaperTilemap_Seafloor: @ 83B983C - .incbin "graphics/pokemon_storage/seafloor.bin.lz" - - .align 2 -gWallpaperPalettes_River: @ 83B9918 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/river_frame.gbapal" - .incbin "graphics/pokemon_storage/river_bg.gbapal" - - .align 2 -gWallpaperTiles_River: @ 83B9978 - .incbin "graphics/pokemon_storage/river.4bpp.lz" - - .align 2 -gWallpaperTilemap_River: @ 83B9C0C - .incbin "graphics/pokemon_storage/river.bin.lz" - - .align 2 -gWallpaperPalettes_Sky: @ 83B9CF8 - .incbin "graphics/pokemon_storage/box_bg1.gbapal" - .incbin "graphics/pokemon_storage/sky_frame.gbapal" - .incbin "graphics/pokemon_storage/sky_bg.gbapal" - - .align 2 -gWallpaperTiles_Sky: @ 83B9D58 - .incbin "graphics/pokemon_storage/sky.4bpp.lz" - - .align 2 -gWallpaperTilemap_Sky: @ 83B9FF0 - .incbin "graphics/pokemon_storage/sky.bin.lz" - - .align 2 -gWallpaperPalettes_Polkadot: @ 83BA0D0 - .incbin "graphics/pokemon_storage/box_bg2.gbapal" - .incbin "graphics/pokemon_storage/polkadot_frame.gbapal" - .incbin "graphics/pokemon_storage/polkadot_bg.gbapal" - - .align 2 -gWallpaperTiles_Polkadot: @ 83BA130 - .incbin "graphics/pokemon_storage/polkadot.4bpp.lz" - - .align 2 -gWallpaperTilemap_Polkadot: @ 83BA32C - .incbin "graphics/pokemon_storage/polkadot.bin.lz" - - .align 2 -gWallpaperPalettes_Pokecenter: @ 83BA3E4 - .incbin "graphics/pokemon_storage/box_bg2.gbapal" - .incbin "graphics/pokemon_storage/pokecenter_frame.gbapal" - .incbin "graphics/pokemon_storage/pokecenter_bg.gbapal" - - .align 2 -gWallpaperTiles_Pokecenter: @ 83BA444 - .incbin "graphics/pokemon_storage/pokecenter.4bpp.lz" - - .align 2 -gWallpaperTilemap_Pokecenter: @ 83BA7E8 - .incbin "graphics/pokemon_storage/pokecenter.bin.lz" - - .align 2 -gWallpaperPalettes_Machine: @ 83BA8FC - .incbin "graphics/pokemon_storage/box_bg3.gbapal" - .incbin "graphics/pokemon_storage/machine_frame.gbapal" - .incbin "graphics/pokemon_storage/machine_bg.gbapal" - - .align 2 -gWallpaperTiles_Machine: @ 83BA95C - .incbin "graphics/pokemon_storage/machine.4bpp.lz" - - .align 2 -gWallpaperTilemap_Machine: @ 83BAC4C - .incbin "graphics/pokemon_storage/machine.bin.lz" - - .align 2 -gWallpaperPalettes_Plain: @ 83BAD18 - .incbin "graphics/pokemon_storage/box_bg4.gbapal" - .incbin "graphics/pokemon_storage/plain_frame.gbapal" - .incbin "graphics/pokemon_storage/plain_bg.gbapal" - - .align 2 -gWallpaperTiles_Plain: @ 83BAD78 - .incbin "graphics/pokemon_storage/plain.4bpp.lz" - - .align 2 -gWallpaperTilemap_Plain: @ 83BAE74 - .incbin "graphics/pokemon_storage/plain.bin.lz" - -@ 12×18 tilemap - .incbin "graphics/unused/tilemap_3BAEF8.bin" - - .align 1 -gUnknown_083BB0A8:: @ 83BB0A8 - .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 - - .align 2 -gWallpaperTable:: @ 83BB0E8 - @ Forest - .4byte gWallpaperTiles_Forest - .4byte 0x3D0 - .4byte gWallpaperTilemap_Forest - .4byte gWallpaperPalettes_Forest - - @ City - .4byte gWallpaperTiles_City - .4byte 0x208 - .4byte gWallpaperTilemap_City - .4byte gWallpaperPalettes_City - - @ Desert - .4byte gWallpaperTiles_Desert - .4byte 0x2EC - .4byte gWallpaperTilemap_Desert - .4byte gWallpaperPalettes_Desert - - @ Savanna - .4byte gWallpaperTiles_Savanna - .4byte 0x220 - .4byte gWallpaperTilemap_Savanna - .4byte gWallpaperPalettes_Savanna - - @ Crag - .4byte gWallpaperTiles_Crag - .4byte 0x350 - .4byte gWallpaperTilemap_Crag - .4byte gWallpaperPalettes_Crag - - @ Volcano - .4byte gWallpaperTiles_Volcano - .4byte 0x334 - .4byte gWallpaperTilemap_Volcano - .4byte gWallpaperPalettes_Volcano - - @ Snow - .4byte gWallpaperTiles_Snow - .4byte 0x2B8 - .4byte gWallpaperTilemap_Snow - .4byte gWallpaperPalettes_Snow - - @ Cave - .4byte gWallpaperTiles_Cave - .4byte 0x344 - .4byte gWallpaperTilemap_Cave - .4byte gWallpaperPalettes_Cave - - @ Beach - .4byte gWallpaperTiles_Beach - .4byte 0x384 - .4byte gWallpaperTilemap_Beach - .4byte gWallpaperPalettes_Beach - - @ Seafloor - .4byte gWallpaperTiles_Seafloor - .4byte 0x2B4 - .4byte gWallpaperTilemap_Seafloor - .4byte gWallpaperPalettes_Seafloor - - @ River - .4byte gWallpaperTiles_River - .4byte 0x294 - .4byte gWallpaperTilemap_River - .4byte gWallpaperPalettes_River - - @ Sky - .4byte gWallpaperTiles_Sky - .4byte 0x298 - .4byte gWallpaperTilemap_Sky - .4byte gWallpaperPalettes_Sky - - @ Polkadot - .4byte gWallpaperTiles_Polkadot - .4byte 0x1FC - .4byte gWallpaperTilemap_Polkadot - .4byte gWallpaperPalettes_Polkadot - - @ Pokecenter - .4byte gWallpaperTiles_Pokecenter - .4byte 0x3A4 - .4byte gWallpaperTilemap_Pokecenter - .4byte gWallpaperPalettes_Pokecenter - - @ Machine - .4byte gWallpaperTiles_Machine - .4byte 0x2F0 - .4byte gWallpaperTilemap_Machine - .4byte gWallpaperPalettes_Machine - - @ Plain - .4byte gWallpaperTiles_Plain - .4byte 0xFC - .4byte gWallpaperTilemap_Plain - .4byte gWallpaperPalettes_Plain - PCPal_Arrow: .incbin "graphics/pokemon_storage/arrow.gbapal" PCGfx_Arrow: diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 09b3be60f..cd4dceadf 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -101,7 +101,7 @@ struct PokemonStorageSystemData { u16 unk_08b4; u16 unk_08b6; u16 unk_08b8; - u8 unk_08ba; + bool8 unk_08ba; u8 unk_08bb; u16 unk_08bc; u16 unk_08be; @@ -112,12 +112,13 @@ struct PokemonStorageSystemData { u16 unk_08c8; u8 unk_08ca[0x400]; u8 unk_0cca; - u16 unk_0ccc[0x20]; + u16 unk_0ccc[0x1e]; + u32 unk_0d08; u8 filler_0d0c[0x50]; u16 unk_0d5c; s16 unk_0d5e; s16 unk_0d60; - u8 unk_0d62[0x2d0]; + u16 unk_0d62[360]; u8 unk_1032; struct Sprite *unk_1034; struct Sprite *unk_1038[6]; // party diff --git a/ld_script.txt b/ld_script.txt index e1d28736e..b0b5d4796 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -550,6 +550,7 @@ SECTIONS { src/pokemon/pokemon_storage_system.o(.rodata); src/pokemon/pokemon_storage_system_2.o(.rodata); src/pokemon/pokemon_storage_system_3.o(.rodata); + src/pokemon/pokemon_storage_system_4.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon/pokemon_icon.o(.rodata); src/pokemon/pokemon_summary_screen.o(.rodata); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 697292d5c..8982ce461 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -1,6 +1,7 @@ // Includes #include "global.h" +#include "palette.h" #include "pokemon_storage_system.h" // Static type declarations @@ -16,14 +17,24 @@ EWRAM_DATA u8 gUnknown_020384E8 = 0; EWRAM_DATA u8 gUnknown_020384E9 = 0; EWRAM_DATA u16 gUnknown_020384EA = 0; +struct WallpaperTable { + const u8 *tiles; + u32 size; + const u8 *tileMap; + const u16 *palettes; +}; + // Static ROM declarations void sub_809900C(u8 boxId, s8 a1); s8 sub_8099D90(u8 boxId); void sub_8099EB0(u8 boxId, s8 a1); +void sub_8099F58(u16 *vdest, const u16 *src, s8 a2, u8 a3); +void sub_809A14C(u16 *vdest); void sub_809A23C(u8 boxId); void sub_809A3D0(u8 boxId, s8 a1); void sub_809A598(void); +void sub_809A654(void); void sub_809A6DC(void); void sub_809A774(s8 a0); void sub_809A810(void); @@ -34,7 +45,7 @@ void sub_809A810(void); void sub_8099BF8(u8 boxId) { - gPokemonStorageSystemPtr->unk_08ba = 0; + gPokemonStorageSystemPtr->unk_08ba = FALSE; gPokemonStorageSystemPtr->unk_08b4 = 0; DmaFill32(3, 0, BG_SCREEN_ADDR(26), 0x1000); sub_8099EB0(boxId, 0); @@ -92,3 +103,223 @@ s8 sub_8099D90(u8 boxId) } return i <= 6 ? 1 : -1; } + +void sub_8099DCC(u8 wallpaperId) +{ + u8 curBox = get_preferred_box(); + gPokemonStorage.wallpaper[curBox] = wallpaperId; + gPokemonStorageSystemPtr->unk_1032 = 0; +} + +bool8 sub_8099E08(void) +{ + switch (gPokemonStorageSystemPtr->unk_1032) + { + case 0: + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0, 0x10, 0xffff); + gPokemonStorageSystemPtr->unk_1032++; + break; + case 1: + if (!UpdatePaletteFade()) + { + u8 curBox = get_preferred_box(); + sub_8099EB0(curBox, 0); + sub_809A654(); + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0x10, 0, 0xffff); + gPokemonStorageSystemPtr->unk_1032++; + } + break; + case 2: + if (!UpdatePaletteFade()) + gPokemonStorageSystemPtr->unk_1032++; + break; + case 3: + return FALSE; + } + return TRUE; +} + +const u16 gWallpaperPalettes_Forest[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Forest_2[] = INCBIN_U16("graphics/pokemon_storage/forest_frame.gbapal"); +const u16 gWallpaperPalettes_Forest_2_3[] = INCBIN_U16("graphics/pokemon_storage/forest_bg.gbapal"); + +const u8 gWallpaperTiles_Forest[] = INCBIN_U8("graphics/pokemon_storage/forest.4bpp.lz"); + +const u8 gWallpaperTilemap_Forest[] = INCBIN_U8("graphics/pokemon_storage/forest.bin.lz"); + +const u16 gWallpaperPalettes_City[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_City_2[] = INCBIN_U16("graphics/pokemon_storage/city_frame.gbapal"); +const u16 gWallpaperPalettes_City_2_3[] = INCBIN_U16("graphics/pokemon_storage/city_bg.gbapal"); + +const u8 gWallpaperTiles_City[] = INCBIN_U8("graphics/pokemon_storage/city.4bpp.lz"); + +const u8 gWallpaperTilemap_City[] = INCBIN_U8("graphics/pokemon_storage/city.bin.lz"); + +const u16 gWallpaperPalettes_Desert[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Desert_2[] = INCBIN_U16("graphics/pokemon_storage/desert_frame.gbapal"); +const u16 gWallpaperPalettes_Desert_2_3[] = INCBIN_U16("graphics/pokemon_storage/desert_bg.gbapal"); + +const u8 gWallpaperTiles_Desert[] = INCBIN_U8("graphics/pokemon_storage/desert.4bpp.lz"); + +const u8 gWallpaperTilemap_Desert[] = INCBIN_U8("graphics/pokemon_storage/desert.bin.lz"); + +const u16 gWallpaperPalettes_Savanna[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Savanna_2[] = INCBIN_U16("graphics/pokemon_storage/savanna_frame.gbapal"); +const u16 gWallpaperPalettes_Savanna_2_3[] = INCBIN_U16("graphics/pokemon_storage/savanna_bg.gbapal"); + +const u8 gWallpaperTiles_Savanna[] = INCBIN_U8("graphics/pokemon_storage/savanna.4bpp.lz"); + +const u8 gWallpaperTilemap_Savanna[] = INCBIN_U8("graphics/pokemon_storage/savanna.bin.lz"); + +const u16 gWallpaperPalettes_Crag[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Crag_2[] = INCBIN_U16("graphics/pokemon_storage/crag_frame.gbapal"); +const u16 gWallpaperPalettes_Crag_2_3[] = INCBIN_U16("graphics/pokemon_storage/crag_bg.gbapal"); + +const u8 gWallpaperTiles_Crag[] = INCBIN_U8("graphics/pokemon_storage/crag.4bpp.lz"); + +const u8 gWallpaperTilemap_Crag[] = INCBIN_U8("graphics/pokemon_storage/crag.bin.lz"); + +const u16 gWallpaperPalettes_Volcano[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Volcano_2[] = INCBIN_U16("graphics/pokemon_storage/volcano_frame.gbapal"); +const u16 gWallpaperPalettes_Volcano_2_3[] = INCBIN_U16("graphics/pokemon_storage/volcano_bg.gbapal"); + +const u8 gWallpaperTiles_Volcano[] = INCBIN_U8("graphics/pokemon_storage/volcano.4bpp.lz"); +const u32 filler_83b871c = 0; // needed to match but otherwise garbage + +const u8 gWallpaperTilemap_Volcano[] = INCBIN_U8("graphics/pokemon_storage/volcano.bin.lz"); + +const u16 gWallpaperPalettes_Snow[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Snow_2[] = INCBIN_U16("graphics/pokemon_storage/snow_frame.gbapal"); +const u16 gWallpaperPalettes_Snow_2_3[] = INCBIN_U16("graphics/pokemon_storage/snow_bg.gbapal"); + +const u8 gWallpaperTiles_Snow[] = INCBIN_U8("graphics/pokemon_storage/snow.4bpp.lz"); + +const u8 gWallpaperTilemap_Snow[] = INCBIN_U8("graphics/pokemon_storage/snow.bin.lz"); + +const u16 gWallpaperPalettes_Cave[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Cave_2[] = INCBIN_U16("graphics/pokemon_storage/cave_frame.gbapal"); +const u16 gWallpaperPalettes_Cave_2_3[] = INCBIN_U16("graphics/pokemon_storage/cave_bg.gbapal"); + +const u8 gWallpaperTiles_Cave[] = INCBIN_U8("graphics/pokemon_storage/cave.4bpp.lz"); + +const u8 gWallpaperTilemap_Cave[] = INCBIN_U8("graphics/pokemon_storage/cave.bin.lz"); + +const u16 gWallpaperPalettes_Beach[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Beach_2[] = INCBIN_U16("graphics/pokemon_storage/beach_frame.gbapal"); +const u16 gWallpaperPalettes_Beach_2_3[] = INCBIN_U16("graphics/pokemon_storage/beach_bg.gbapal"); + +const u8 gWallpaperTiles_Beach[] = INCBIN_U8("graphics/pokemon_storage/beach.4bpp.lz"); + +const u8 gWallpaperTilemap_Beach[] = INCBIN_U8("graphics/pokemon_storage/beach.bin.lz"); + +const u16 gWallpaperPalettes_Seafloor[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Seafloor_2[] = INCBIN_U16("graphics/pokemon_storage/seafloor_frame.gbapal"); +const u16 gWallpaperPalettes_Seafloor_2_3[] = INCBIN_U16("graphics/pokemon_storage/seafloor_bg.gbapal"); + +const u8 gWallpaperTiles_Seafloor[] = INCBIN_U8("graphics/pokemon_storage/seafloor.4bpp.lz"); + +const u8 gWallpaperTilemap_Seafloor[] = INCBIN_U8("graphics/pokemon_storage/seafloor.bin.lz"); + +const u16 gWallpaperPalettes_River[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_River_2[] = INCBIN_U16("graphics/pokemon_storage/river_frame.gbapal"); +const u16 gWallpaperPalettes_River_2_3[] = INCBIN_U16("graphics/pokemon_storage/river_bg.gbapal"); + +const u8 gWallpaperTiles_River[] = INCBIN_U8("graphics/pokemon_storage/river.4bpp.lz"); + +const u8 gWallpaperTilemap_River[] = INCBIN_U8("graphics/pokemon_storage/river.bin.lz"); + +const u16 gWallpaperPalettes_Sky[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); +const u16 gWallpaperPalettes_Sky_2[] = INCBIN_U16("graphics/pokemon_storage/sky_frame.gbapal"); +const u16 gWallpaperPalettes_Sky_2_3[] = INCBIN_U16("graphics/pokemon_storage/sky_bg.gbapal"); + +const u8 gWallpaperTiles_Sky[] = INCBIN_U8("graphics/pokemon_storage/sky.4bpp.lz"); + +const u8 gWallpaperTilemap_Sky[] = INCBIN_U8("graphics/pokemon_storage/sky.bin.lz"); + +const u16 gWallpaperPalettes_Polkadot[] = INCBIN_U16("graphics/pokemon_storage/box_bg2.gbapal"); +const u16 gWallpaperPalettes_Polkadot_2[] = INCBIN_U16("graphics/pokemon_storage/polkadot_frame.gbapal"); +const u16 gWallpaperPalettes_Polkadot_2_3[] = INCBIN_U16("graphics/pokemon_storage/polkadot_bg.gbapal"); + +const u8 gWallpaperTiles_Polkadot[] = INCBIN_U8("graphics/pokemon_storage/polkadot.4bpp.lz"); + +const u8 gWallpaperTilemap_Polkadot[] = INCBIN_U8("graphics/pokemon_storage/polkadot.bin.lz"); + +const u16 gWallpaperPalettes_Pokecenter[] = INCBIN_U16("graphics/pokemon_storage/box_bg2.gbapal"); +const u16 gWallpaperPalettes_Pokecenter_2[] = INCBIN_U16("graphics/pokemon_storage/pokecenter_frame.gbapal"); +const u16 gWallpaperPalettes_Pokecenter_2_3[] = INCBIN_U16("graphics/pokemon_storage/pokecenter_bg.gbapal"); + +const u8 gWallpaperTiles_Pokecenter[] = INCBIN_U8("graphics/pokemon_storage/pokecenter.4bpp.lz"); + +const u8 gWallpaperTilemap_Pokecenter[] = INCBIN_U8("graphics/pokemon_storage/pokecenter.bin.lz"); + +const u16 gWallpaperPalettes_Machine[] = INCBIN_U16("graphics/pokemon_storage/box_bg3.gbapal"); +const u16 gWallpaperPalettes_Machine_2[] = INCBIN_U16("graphics/pokemon_storage/machine_frame.gbapal"); +const u16 gWallpaperPalettes_Machine_2_3[] = INCBIN_U16("graphics/pokemon_storage/machine_bg.gbapal"); + +const u8 gWallpaperTiles_Machine[] = INCBIN_U8("graphics/pokemon_storage/machine.4bpp.lz"); + +const u8 gWallpaperTilemap_Machine[] = INCBIN_U8("graphics/pokemon_storage/machine.bin.lz"); + +const u16 gWallpaperPalettes_Plain[] = INCBIN_U16("graphics/pokemon_storage/box_bg4.gbapal"); +const u16 gWallpaperPalettes_Plain_2[] = INCBIN_U16("graphics/pokemon_storage/plain_frame.gbapal"); +const u16 gWallpaperPalettes_Plain_2_3[] = INCBIN_U16("graphics/pokemon_storage/plain_bg.gbapal"); + +const u8 gWallpaperTiles_Plain[] = INCBIN_U8("graphics/pokemon_storage/plain.4bpp.lz"); + +const u8 gWallpaperTilemap_Plain[] = INCBIN_U8("graphics/pokemon_storage/plain.bin.lz"); + +const u16 gUnknown_083BAEF8[] = INCBIN_U16("graphics/unused/tilemap_3BAEF8.bin"); + +const u16 gUnknown_083BB0A8[][2] = { + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF}, + {0x1CE7, 0x7FFF} +}; + +const struct WallpaperTable gWallpaperTable[] = { + {gWallpaperTiles_Forest, 0x3D0, gWallpaperTilemap_Forest, gWallpaperPalettes_Forest}, // Forest + {gWallpaperTiles_City, 0x208, gWallpaperTilemap_City, gWallpaperPalettes_City}, // City + {gWallpaperTiles_Desert, 0x2EC, gWallpaperTilemap_Desert, gWallpaperPalettes_Desert}, // Desert + {gWallpaperTiles_Savanna, 0x220, gWallpaperTilemap_Savanna, gWallpaperPalettes_Savanna}, // Savanna + {gWallpaperTiles_Crag, 0x350, gWallpaperTilemap_Crag, gWallpaperPalettes_Crag}, // Crag + {gWallpaperTiles_Volcano, 0x334, gWallpaperTilemap_Volcano, gWallpaperPalettes_Volcano}, // Volcano + {gWallpaperTiles_Snow, 0x2B8, gWallpaperTilemap_Snow, gWallpaperPalettes_Snow}, // Snow + {gWallpaperTiles_Cave, 0x344, gWallpaperTilemap_Cave, gWallpaperPalettes_Cave}, // Cave + {gWallpaperTiles_Beach, 0x384, gWallpaperTilemap_Beach, gWallpaperPalettes_Beach}, // Beach + {gWallpaperTiles_Seafloor, 0x2B4, gWallpaperTilemap_Seafloor, gWallpaperPalettes_Seafloor}, // Seafloor + {gWallpaperTiles_River, 0x294, gWallpaperTilemap_River, gWallpaperPalettes_River}, // River + {gWallpaperTiles_Sky, 0x298, gWallpaperTilemap_Sky, gWallpaperPalettes_Sky}, // Sky + {gWallpaperTiles_Polkadot, 0x1FC, gWallpaperTilemap_Polkadot, gWallpaperPalettes_Polkadot}, // Polkadot + {gWallpaperTiles_Pokecenter, 0x3A4, gWallpaperTilemap_Pokecenter, gWallpaperPalettes_Pokecenter}, // Pokecenter + {gWallpaperTiles_Machine, 0x2F0, gWallpaperTilemap_Machine, gWallpaperPalettes_Machine}, // Machine + {gWallpaperTiles_Plain, 0xFC, gWallpaperTilemap_Plain, gWallpaperPalettes_Plain} // Plain +}; + +void sub_8099EB0(u8 boxId, s8 a1) +{ + const struct WallpaperTable *wallpaperTable; + + if (a1) + { + gPokemonStorageSystemPtr->unk_08ba = gPokemonStorageSystemPtr->unk_08ba ? FALSE : TRUE; + sub_809A14C(BG_SCREEN_ADDR(26)); + } + wallpaperTable = gWallpaperTable +gPokemonStorage.wallpaper[boxId]; + LoadPalette(wallpaperTable->palettes, gPokemonStorageSystemPtr->unk_08ba * 0x30 + 0x40, 0x60); + LZ77UnCompWram(wallpaperTable->tileMap, gPokemonStorageSystemPtr->unk_0d62); + sub_8099F58(BG_SCREEN_ADDR(26), gPokemonStorageSystemPtr->unk_0d62, a1, gPokemonStorageSystemPtr->unk_08ba); + LZ77UnCompVram(wallpaperTable->tiles, BG_CHAR_ADDR(2) + (gPokemonStorageSystemPtr->unk_08ba << 13)); +} -- cgit v1.2.3 From af5da267ee02fcc5b6cdd8ef0fac880b7487cc56 Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Fri, 12 Jan 2018 22:15:01 +0200 Subject: Labeled most of trainer_card.c --- include/trainer_card.h | 6 +- src/engine/cable_club.c | 6 +- src/engine/save_menu_util.c | 6 +- src/engine/trainer_card.c | 555 ++++++++++++++++++++++---------------------- src/field/start_menu.c | 4 +- 5 files changed, 291 insertions(+), 286 deletions(-) diff --git a/include/trainer_card.h b/include/trainer_card.h index b9d3ca081..7ea1d9fc0 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -28,9 +28,9 @@ struct TrainerCard { /*0x30*/ u8 playerName[8]; }; -void sub_8093110(void (*)(void)); -void sub_8093130(u8, void (*)(void)); -void sub_8093390(struct TrainerCard *); +void TrainerCard_ShowPlayerCard(void (*)(void)); +void TrainerCard_ShowLinkCard(u8, void (*)(void)); +void TrainerCard_GenerateCardForPlayer(struct TrainerCard *); u8 sub_80934C4(u8 id); extern struct TrainerCard gTrainerCards[4]; diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index b12ee38ce..44d832e2b 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -374,7 +374,7 @@ void sub_80831F8(u8 taskId) gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gUnknown_03004860 = GetMultiplayerId(); sub_80081C8(gFieldLinkPlayerCount); - sub_8093390((struct TrainerCard *)gBlockSendBuffer); + TrainerCard_GenerateCardForPlayer((struct TrainerCard *)gBlockSendBuffer); gTasks[taskId].func = sub_8083314; } } @@ -395,7 +395,7 @@ static void sub_8083288(u8 taskId) gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gUnknown_03004860 = GetMultiplayerId(); sub_80081C8(gFieldLinkPlayerCount); - sub_8093390((struct TrainerCard *)gBlockSendBuffer); + TrainerCard_GenerateCardForPlayer((struct TrainerCard *)gBlockSendBuffer); gTasks[taskId].func = sub_8083314; sub_8007E9C(2); } @@ -874,7 +874,7 @@ void unref_sub_8083BB0(void) void sub_8083BDC(void) { - sub_8093130(gSpecialVar_0x8006, c2_exit_to_overworld_1_continue_scripts_restart_music); + TrainerCard_ShowLinkCard(gSpecialVar_0x8006, c2_exit_to_overworld_1_continue_scripts_restart_music); } bool32 sub_8083BF4(u8 linkPlayerIndex) diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c index 2c5eb6afe..ccf4d9f6f 100644 --- a/src/engine/save_menu_util.c +++ b/src/engine/save_menu_util.c @@ -125,9 +125,9 @@ u16 GetPokedexSeenCount() return pokedexSeenCount; } -void FormatPlayTime(char *playtime, u16 hours, u16 minutes, u16 unk) +void FormatPlayTime(char *playtime, u16 hours, u16 minutes, u16 colon) { - s16 colon = unk; + s16 _colon = colon; playtime = ConvertIntToDecimalString(playtime, hours); // playtime[0] is hours. @@ -136,7 +136,7 @@ void FormatPlayTime(char *playtime, u16 hours, u16 minutes, u16 unk) playtime[0] = 0; - if (colon) + if (_colon) playtime[1] = 0xF0; // set middle character to ":" else playtime[1] = 0; diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index ab43ac716..9d09575c8 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -26,25 +26,25 @@ typedef void (*Callback)(void); struct Struct2000000 { - /*0x00*/ u8 var_0; - /*0x01*/ bool8 var_1; - /*0x02*/ u8 var_2; - /*0x03*/ bool8 var_3; + /*0x00*/ u8 current_state; + /*0x01*/ bool8 isShowingLinkCard; + /*0x02*/ u8 starCount; + /*0x03*/ bool8 backSideShown; /*0x04*/ u8 var_4; - /*0x05*/ u8 var_5; - /*0x06*/ u8 var_6; - /*0x07*/ bool8 var_7; - /*0x08*/ bool8 var_8; - /*0x09*/ bool8 var_9; - /*0x0A*/ bool8 var_a; - /*0x0B*/ bool8 var_b; - /*0x0C*/ bool8 var_c; - /*0x0D*/ bool8 var_d; - /*0x0E*/ u8 var_e[8]; + /*0x05*/ bool8 showColon; + /*0x06*/ u8 frameCounter; /* Used to flash colon */ + /*0x07*/ bool8 showPokedexCount; + /*0x08*/ bool8 showHallOfFame; + /*0x09*/ bool8 showLinkBattleStatus; + /*0x0A*/ bool8 showBattleTowerStatus; + /*0x0B*/ bool8 showContestRecord; + /*0x0C*/ bool8 showMixingRecord; + /*0x0D*/ bool8 showTradingRecord; + /*0x0E*/ bool8 ownedBadges[8]; /*0x16*/ u8 filler_16[10]; - /*0x20*/ u8 var_20[4][0x10]; + /*0x20*/ u8 easyChatPhrase[4][0x10]; /*0x60*/ Callback *var_60; - /*0x64*/ struct TrainerCard var_64; + /*0x64*/ struct TrainerCard displayedCard; /*0x9C*/ u8 language; // 0x9C }; @@ -57,44 +57,44 @@ extern const u16 gUnknown_083B5F0C[]; extern const u16 gBadgesPalette[]; extern const u16 gUnknown_083B5F4C[]; extern const u16 gUnknown_083B5F6C[]; -extern const u16 gUnknown_083B5F8C[][4]; +extern const u16 gTrainerCardBadgesMap[][4]; const u8 gBadgesTiles[] = INCBIN_U8("graphics/trainer_card/badges.4bpp"); // XXX: what is this? u8 *const ewram_ = gSharedMem; -bool8 sub_8093864(struct Task *); -bool8 sub_80938A8(struct Task *); -bool8 sub_80938CC(struct Task *); -bool8 sub_8093918(struct Task *); -bool8 sub_8093938(struct Task *); -bool8 sub_8093954(struct Task *); -bool8 sub_8093980(struct Task *); - -bool8 (*const gUnknown_083B5EBC[])(struct Task *) = -{ - sub_8093864, - sub_80938A8, - sub_80938CC, - sub_8093918, - sub_8093938, - sub_8093954, - sub_8093980, +bool8 TrainerCard_Init(struct Task *); +bool8 TrainerCard_WaitForFadeInToFinish(struct Task *); +bool8 TrainerCard_WaitForKeys(struct Task *); +bool8 TrainerCard_StartFlipAntimation(struct Task *); +bool8 TrainerCard_WaitForFlipToFinish(struct Task *); +bool8 TrainerCard_FadeOut(struct Task *); +bool8 TrainerCard_WaitForFadeOutToFinishAndQuit(struct Task *); + +bool8 (*const TrainerCard_StateMachine[])(struct Task *) = +{ + TrainerCard_Init, + TrainerCard_WaitForFadeInToFinish, + TrainerCard_WaitForKeys, + TrainerCard_StartFlipAntimation, + TrainerCard_WaitForFlipToFinish, + TrainerCard_FadeOut, + TrainerCard_WaitForFadeOutToFinishAndQuit, }; -bool8 sub_8093AA0(struct Task *); -bool8 sub_8093AF0(struct Task *); -bool8 sub_8093C0C(struct Task *); -bool8 sub_8093C38(struct Task *); -bool8 sub_8093D50(struct Task *); +bool8 TrainerCard_InitFlipAnimation(struct Task *); +bool8 TrainerCard_ScaleDownFlipAnimation(struct Task *); +bool8 TrainerCard_SwitchToNewSide(struct Task *); +bool8 TrainerCard_ScaleUpFlipAnimation(struct Task *); +bool8 TrainerCard_FinishFlipAnimation(struct Task *); -bool8 (*const gUnknown_083B5ED8[])(struct Task *) = +bool8 (*const TrainerCard_FlipAnimationStateMachine[])(struct Task *) = { - sub_8093AA0, - sub_8093AF0, - sub_8093C0C, - sub_8093C38, - sub_8093D50, + TrainerCard_InitFlipAnimation, + TrainerCard_ScaleDownFlipAnimation, + TrainerCard_SwitchToNewSide, + TrainerCard_ScaleUpFlipAnimation, + TrainerCard_FinishFlipAnimation, }; // FIXME: Other signature than on save_menu_util.h @@ -103,64 +103,64 @@ u16 GetPokedexSeenCount(void); enum { - TD_0, - TD_1, + TD_SHOWING_LINK_CARD, + TD_CARD_INDEX, TD_CALLBACK, }; static void sub_8093174(void); static void sub_809323C(void); static void sub_8093254(void); -static void sub_80932AC(Callback callBack); -static void sub_80932E4(u8 arg1, Callback callBack); -void sub_8093324(void); +static void TrainerCard_InitScreenForPlayer(Callback callBack); +static void TrainerCard_InitScreenForLinkPlayer(u8 arg1, Callback callBack); +void TrainerCard_FillTrainerCardStruct(void); static void nullsub_60(u8); static u32 sav12_xor_get_clamped_above(u8 index, u32 maxVal); -static u8 sub_80934F4(struct TrainerCard *); +static u8 TrainerCard_GetStarCount(struct TrainerCard *); static void sub_8093534(void); static void sub_8093550(void); static void sub_8093598(void); static void sub_80935EC(void); static void sub_8093610(void); static void sub_8093688(void); -void sub_80936D4(void); +static void TrainerCard_FillFlags(void); static void sub_80937A4(void); static void sub_80937BC(void); static void sub_80937D8(void); static void sub_80937F0(void); static void nullsub_15(void); static void sub_8093800(void); -static void sub_809380C(); -static void sub_809382C(u8 taskId); -static void sub_80939A4(void); -static void sub_80939C0(void); -static void sub_80939DC(u8 taskId); -static void sub_8093A28(void); -static u8 sub_8093A48(void); -static void sub_8093A68(u8 taskId); -void sub_8093D7C(void); -static void sub_8093DAC(void); -static void sub_8093DC8(void); -static void sub_8093DEC(void); -static void sub_8093E04(void); -static void sub_8093E28(void); -void sub_8093EA0(void); -static void sub_8093EF8(void); +static void TrainerCard_CreateStateMachine(void); +static void TrainerCard_RunStateMachine(u8 taskId); +static void TrainerCard_CreatePrintPlayTimeTask(void); +static void TrainerCard_DestoryPlayTimeTask(void); +static void TrainerCard_Front_PrintPlayTime(u8 taskId); +static void TrainerCard_CreateFlipAnimationTask(void); +static u8 TrainerCard_HasFlipAnimationFinished(void); +static void TrainerCard_RunFlipAnimationStateMachine(u8 taskId); +static void TrainerCard_FlipAnimationHBlankCallback(void); +static void TrainerCard_DrawCard(void); +static void TrainerCard_DrawCardFront(void); +static void TrainerCard_DrawCardBack(void); +static void TrainerCard_ResetOffsetRegisters(void); +static void TrainerCard_CopyGraphics(void); +static void TrainerCard_LoadPalettes(void); +static void TrainerCard_LoadTrainerGraphics(void); static void sub_8093F14(void); static void sub_8093F48(void); static void sub_8093F64(void); -static void sub_8093F80(void); -static void sub_8093FD0(void); -static void sub_8094038(void); -static void sub_80940E4(void); -static void sub_8094110(void); -static void sub_8094140(void); -static void sub_8094188(void); +static void TrainerCard_LoadTrainerTilemap(void); +static void TrainerCard_DrawStars(void); +static void TrainerCard_DisplayBadges(void); +static void TrainerCard_ClearTrainerGraphics(void); +static void TrainerCard_ClearPokedexLabel(void); +static void TrainerCard_Front_PrintTexts(void); +static void TrainerCard_Back_PrintTexts(void); static void TrainerCard_Front_PrintTrainerID(void); static void TrainerCard_Front_PrintMoney(void); static void TrainerCard_Front_PrintPokedexCount(void); -static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon); -static void sub_809429C(void); +static void TrainerCard_Front_GetPlayTimeString(u8 *arg1, s16 colon); +static void TrainerCard_PrintEasyChatPhrase(void); static void TrainerCard_Back_PrintName(void); static void TrainerCard_Back_PrintHallOfFameTime_Label(void); static void TrainerCard_Back_PrintHallOfFameTime(void); @@ -176,16 +176,16 @@ static void TrainerCard_Back_PrintPokemonTrades_Label(void); static void TrainerCard_Back_PrintPokemonTrades(void); void unref_sub_8094588(u16 left, u16 top); -void sub_8093110(Callback arg1) +void TrainerCard_ShowPlayerCard(Callback arg1) { - sub_80932AC(arg1); + TrainerCard_InitScreenForPlayer(arg1); SetMainCallback2(sub_8093174); ewram0_2.language = GAME_LANGUAGE; } -void sub_8093130(u8 playerIndex, Callback arg2) +void TrainerCard_ShowLinkCard(u8 playerIndex, Callback arg2) { - sub_80932E4(playerIndex, arg2); + TrainerCard_InitScreenForLinkPlayer(playerIndex, arg2); SetMainCallback2(sub_8093174); ewram0_2.language = gLinkPlayers[gLinkPlayerMapObjects[playerIndex].linkPlayerId].language; } @@ -249,49 +249,49 @@ static void sub_8093254(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - ewram0_2.var_6++; - if (ewram0_2.var_6 >= 60) + ewram0_2.frameCounter++; + if (ewram0_2.frameCounter >= 60) { - ewram0_2.var_6 = 0; - ewram0_2.var_5 ^= 1; + ewram0_2.frameCounter = 0; + ewram0_2.showColon ^= 1; } if (ewram0_2.var_4) DmaCopy16(3, &gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 0x140); } -static void sub_80932AC(Callback callBack) +static void TrainerCard_InitScreenForPlayer(Callback callBack) { u8 taskId = CreateTask(nullsub_60, 0xFF); struct Task *task = &gTasks[taskId]; - task->data[TD_0] = FALSE; + task->data[TD_SHOWING_LINK_CARD] = FALSE; StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32)callBack); } -static void sub_80932E4(u8 arg1, Callback callBack) +static void TrainerCard_InitScreenForLinkPlayer(u8 arg1, Callback callBack) { u8 taskId = CreateTask(nullsub_60, 0xFF); struct Task *task = &gTasks[taskId]; - task->data[TD_0] = TRUE; - task->data[TD_1] = arg1; + task->data[TD_SHOWING_LINK_CARD] = TRUE; + task->data[TD_CARD_INDEX] = arg1; StoreWordInTwoHalfwords(&task->data[TD_CALLBACK], (u32)callBack); } -void sub_8093324(void) +void TrainerCard_FillTrainerCardStruct(void) { u8 taskId = FindTaskIdByFunc(nullsub_60); struct Task *task = &gTasks[taskId]; - ewram0_2.var_1 = task->data[TD_0]; + ewram0_2.isShowingLinkCard = task->data[TD_SHOWING_LINK_CARD]; LoadWordFromTwoHalfwords((u16 *)&task->data[TD_CALLBACK], (u32 *)&ewram0_2.var_60); - if (ewram0_2.var_1) + if (ewram0_2.isShowingLinkCard) { - ewram0_2.var_64 = gTrainerCards[task->data[TD_1]]; + ewram0_2.displayedCard = gTrainerCards[task->data[TD_CARD_INDEX]]; } else { - sub_8093390(&ewram0_2.var_64); + TrainerCard_GenerateCardForPlayer(&ewram0_2.displayedCard); } } @@ -299,7 +299,7 @@ static void nullsub_60(u8 taskid) { } -void sub_8093390(struct TrainerCard *trainerCard) +void TrainerCard_GenerateCardForPlayer(struct TrainerCard *trainerCard) { u32 playTime; bool32 enteredHallOfFame; @@ -370,7 +370,7 @@ void sub_8093390(struct TrainerCard *trainerCard) trainerCard->playerName[i] = gSaveBlock2.playerName[i]; } - trainerCard->stars = sub_80934F4(trainerCard); + trainerCard->stars = TrainerCard_GetStarCount(trainerCard); } u8 sub_80934C4(u8 id) @@ -390,7 +390,7 @@ static u32 sav12_xor_get_clamped_above(u8 index, u32 maxVal) return value; } -static u8 sub_80934F4(struct TrainerCard *trainerCard) +static u8 TrainerCard_GetStarCount(struct TrainerCard *trainerCard) { u8 value = 0; @@ -489,53 +489,53 @@ static void sub_8093688(void) { u8 i; - sub_8093324(); - ewram0_2.var_0 = 0; - ewram0_2.var_3 = 0; + TrainerCard_FillTrainerCardStruct(); + ewram0_2.current_state = 0; + ewram0_2.backSideShown = FALSE; ewram0_2.var_4 = FALSE; - ewram0_2.var_2 = ewram0_2.var_64.stars; - ewram0_2.var_5 = 0; - ewram0_2.var_6 = 0; + ewram0_2.starCount = ewram0_2.displayedCard.stars; + ewram0_2.showColon = 0; + ewram0_2.frameCounter = 0; for (i = 0; i < 4; i++) - EasyChat_GetWordText(ewram0_2.var_20[i], ewram0_2.var_64.var_28[i]); - sub_80936D4(); + EasyChat_GetWordText(ewram0_2.easyChatPhrase[i], ewram0_2.displayedCard.var_28[i]); + TrainerCard_FillFlags(); } -void sub_80936D4(void) +static void TrainerCard_FillFlags(void) { - ewram0_2.var_7 = 0; - ewram0_2.var_8 = 0; - ewram0_2.var_9 = 0; - ewram0_2.var_a = 0; - ewram0_2.var_b = 0; - ewram0_2.var_c = 0; - ewram0_2.var_d = 0; - memset(ewram0_2.var_e, 0, sizeof(ewram0_2.var_e)); + ewram0_2.showPokedexCount = 0; + ewram0_2.showHallOfFame = 0; + ewram0_2.showLinkBattleStatus = 0; + ewram0_2.showBattleTowerStatus = 0; + ewram0_2.showContestRecord = 0; + ewram0_2.showMixingRecord = 0; + ewram0_2.showTradingRecord = 0; + memset(ewram0_2.ownedBadges, 0, sizeof(ewram0_2.ownedBadges)); - if (ewram0_2.var_64.hasPokedex) - ewram0_2.var_7++; + if (ewram0_2.displayedCard.hasPokedex) + ewram0_2.showPokedexCount++; - if (ewram0_2.var_64.firstHallOfFameA != 0 - || ewram0_2.var_64.firstHallOfFameB != 0 - || ewram0_2.var_64.firstHallOfFameC != 0) - ewram0_2.var_8++; + if (ewram0_2.displayedCard.firstHallOfFameA != 0 + || ewram0_2.displayedCard.firstHallOfFameB != 0 + || ewram0_2.displayedCard.firstHallOfFameC != 0) + ewram0_2.showHallOfFame++; - if (ewram0_2.var_64.linkBattleWins != 0 || ewram0_2.var_64.linkBattleLosses != 0) - ewram0_2.var_9++; + if (ewram0_2.displayedCard.linkBattleWins != 0 || ewram0_2.displayedCard.linkBattleLosses != 0) + ewram0_2.showLinkBattleStatus++; - if (ewram0_2.var_64.battleTowerWins != 0 || ewram0_2.var_64.battleTowerLosses != 0) - ewram0_2.var_a++; + if (ewram0_2.displayedCard.battleTowerWins != 0 || ewram0_2.displayedCard.battleTowerLosses != 0) + ewram0_2.showBattleTowerStatus++; - if (ewram0_2.var_64.contestsWithFriends != 0) - ewram0_2.var_b++; + if (ewram0_2.displayedCard.contestsWithFriends != 0) + ewram0_2.showContestRecord++; - if (ewram0_2.var_64.pokeblocksWithFriends != 0) - ewram0_2.var_c++; + if (ewram0_2.displayedCard.pokeblocksWithFriends != 0) + ewram0_2.showMixingRecord++; - if (ewram0_2.var_64.pokemonTrades != 0) - ewram0_2.var_d++; + if (ewram0_2.displayedCard.pokemonTrades != 0) + ewram0_2.showTradingRecord++; - if (!ewram0_2.var_1) + if (!ewram0_2.isShowingLinkCard) { u32 badgeFlag; int i = 0; @@ -544,7 +544,7 @@ void sub_80936D4(void) while (1) { if (FlagGet(badgeFlag)) - ewram0_2.var_e[i]++; + ewram0_2.ownedBadges[i]++; badgeFlag++; i++; if (badgeFlag > FLAG_BADGE08_GET) @@ -571,15 +571,15 @@ void sub_80937BC() static void sub_80937D8() { - sub_8093E04(); - sub_8093E28(); + TrainerCard_ResetOffsetRegisters(); + TrainerCard_CopyGraphics(); sub_8093F64(); - sub_8093DAC(); + TrainerCard_DrawCard(); } static void sub_80937F0() { - sub_8093EF8(); + TrainerCard_LoadTrainerGraphics(); } static void nullsub_15(void) @@ -588,144 +588,147 @@ static void nullsub_15(void) static void sub_8093800() { - sub_809380C(); + TrainerCard_CreateStateMachine(); } -static void sub_809380C() +static void TrainerCard_CreateStateMachine(void) { u8 taskId; - taskId = CreateTask(sub_809382C, 0); - sub_809382C(taskId); + taskId = CreateTask(TrainerCard_RunStateMachine, 0); + TrainerCard_RunStateMachine(taskId); } -static void sub_809382C(u8 taskId) +static void TrainerCard_RunStateMachine(u8 taskId) { - while (gUnknown_083B5EBC[ewram0_2.var_0](&gTasks[taskId]) != 0) + while (TrainerCard_StateMachine[ewram0_2.current_state](&gTasks[taskId]) != 0) ; } -bool8 sub_8093864(struct Task *task) +bool8 TrainerCard_Init(struct Task *task) { - ewram0_2.var_5 = gSaveBlock2.playTimeSeconds & 1; - ewram0_2.var_6 = gSaveBlock2.playTimeVBlanks; - sub_80939A4(); + ewram0_2.showColon = gSaveBlock2.playTimeSeconds & 1; + ewram0_2.frameCounter = gSaveBlock2.playTimeVBlanks; + TrainerCard_CreatePrintPlayTimeTask(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); - ewram0_2.var_0++; + ewram0_2.current_state++; /* Advance state machine */ return FALSE; } -bool8 sub_80938A8(struct Task *task) +bool8 TrainerCard_WaitForFadeInToFinish(struct Task *task) { if (!gPaletteFade.active) - ewram0_2.var_0++; + ewram0_2.current_state++; /* Advance state machine */ return FALSE; } -bool8 sub_80938CC(struct Task *task) +bool8 TrainerCard_WaitForKeys(struct Task *task) { if (gMain.newKeys & B_BUTTON) { - ewram0_2.var_0 = 5; + ewram0_2.current_state = 5; /* Jump to fadeout state */ return TRUE; } else if (gMain.newKeys & A_BUTTON) { - if (ewram0_2.var_3 != 0) + /* It appears that it was previously possible to return the the front side + after viewing the back side. This was probably removed due to being + unintuitive. */ + if (ewram0_2.backSideShown) { - ewram0_2.var_0 = 5; + ewram0_2.current_state = 5; /* Jump to fadeout state */ } else { - ewram0_2.var_3 ^= 1; - ewram0_2.var_0 = 3; + ewram0_2.backSideShown ^= 1; /* Switch to back side */ + ewram0_2.current_state = 3; /* Jump to start flip animation state */ } return TRUE; } return FALSE; } -bool8 sub_8093918(struct Task *task) +bool8 TrainerCard_StartFlipAntimation(struct Task *task) { - sub_8093A28(); + TrainerCard_CreateFlipAnimationTask(); PlaySE(SE_CARD); - ewram0_2.var_0++; + ewram0_2.current_state++; /* Advance state machine */ return FALSE; } -bool8 sub_8093938(struct Task *task) +bool8 TrainerCard_WaitForFlipToFinish(struct Task *task) { - if (sub_8093A48()) - ewram0_2.var_0 = 2; + if (TrainerCard_HasFlipAnimationFinished()) + ewram0_2.current_state = 2; /* Return to wait for keys state */ return FALSE; } -bool8 sub_8093954(struct Task *task) +bool8 TrainerCard_FadeOut(struct Task *task) { - sub_80939C0(); + TrainerCard_DestoryPlayTimeTask(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); - ewram0_2.var_0++; + ewram0_2.current_state++; /* Advance state machine */ return FALSE; } -bool8 sub_8093980(struct Task *task) +bool8 TrainerCard_WaitForFadeOutToFinishAndQuit(struct Task *task) { if (!gPaletteFade.active) SetMainCallback2((MainCallback)ewram0_2.var_60); return FALSE; } -static void sub_80939A4(void) +static void TrainerCard_CreatePrintPlayTimeTask(void) { - CreateTask(sub_80939DC, 0); + CreateTask(TrainerCard_Front_PrintPlayTime, 0); BasicInitMenuWindow(&gWindowTemplate_TrainerCard_Back_Values); } -static void sub_80939C0(void) +static void TrainerCard_DestoryPlayTimeTask(void) { - u8 taskId = FindTaskIdByFunc(sub_80939DC); + u8 taskId = FindTaskIdByFunc(TrainerCard_Front_PrintPlayTime); if (taskId != 0xFF) DestroyTask(taskId); } -static void sub_80939DC(u8 taskId) +static void TrainerCard_Front_PrintPlayTime(u8 taskId) { u8 buffer[32]; struct Task *task = &gTasks[taskId]; - if (ewram0_2.var_5 != task->data[TD_1]) + if (ewram0_2.showColon != task->data[TD_CARD_INDEX]) { - task->data[TD_1] = ewram0_2.var_5; - task->data[TD_0] ^= TRUE; + task->data[TD_CARD_INDEX] = ewram0_2.showColon; + task->data[TD_SHOWING_LINK_CARD] ^= TRUE; } - TrainerCard_Front_PrintPlayTime(buffer, task->data[TD_0]); + TrainerCard_Front_GetPlayTimeString(buffer, task->data[TD_SHOWING_LINK_CARD]); Menu_PrintText(buffer, 10, 12); } -static void sub_8093A28(void) +static void TrainerCard_CreateFlipAnimationTask(void) { u8 taskId; - taskId = CreateTask(sub_8093A68, 0); - sub_8093A68(taskId); + taskId = CreateTask(TrainerCard_RunFlipAnimationStateMachine, 0); + TrainerCard_RunFlipAnimationStateMachine(taskId); } -static u8 sub_8093A48(void) +static u8 TrainerCard_HasFlipAnimationFinished(void) { - if (FindTaskIdByFunc(sub_8093A68) == 0xFF) + if (FindTaskIdByFunc(TrainerCard_RunFlipAnimationStateMachine) == 0xFF) return TRUE; else return FALSE; } -static void sub_8093A68(u8 taskId) +static void TrainerCard_RunFlipAnimationStateMachine(u8 taskId) { - while (gUnknown_083B5ED8[gTasks[taskId].data[0]](&gTasks[taskId]) != 0) + while (TrainerCard_FlipAnimationStateMachine[gTasks[taskId].data[0]](&gTasks[taskId]) != 0) ; } -bool8 sub_8093AA0(struct Task *task) +bool8 TrainerCard_InitFlipAnimation(struct Task *task) { u32 i; @@ -733,14 +736,14 @@ bool8 sub_8093AA0(struct Task *task) ScanlineEffect_Clear(); for (i = 0; i < 0xA0; i++) gScanlineEffectRegBuffers[1][i] = -4; - SetHBlankCallback(sub_8093D7C); + SetHBlankCallback(TrainerCard_FlipAnimationHBlankCallback); ewram0_2.var_4 = TRUE; task->data[0]++; return FALSE; } /* -bool8 sub_8093AF0(struct Task *task) +bool8 TrainerCard_ScaleDownFlipAnimation(struct Task *task) { u32 r7; u16 r9; @@ -788,7 +791,7 @@ bool8 sub_8093AF0(struct Task *task) */ __attribute__((naked)) -bool8 sub_8093AF0(struct Task *task) +bool8 TrainerCard_ScaleDownFlipAnimation(struct Task *task) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -939,18 +942,20 @@ _08093C08: .4byte 0x0000fffc\n\ .syntax divided\n"); } -bool8 sub_8093C0C(struct Task *task) +bool8 TrainerCard_SwitchToNewSide(struct Task *task) { - sub_80939C0(); - sub_8093DAC(); - if (!ewram0_2.var_3) - sub_80939A4(); + TrainerCard_DestoryPlayTimeTask(); + TrainerCard_DrawCard(); + if (!ewram0_2.backSideShown) { + /* This code never runs because it is impossible to flip the back side back to the front side */ + TrainerCard_CreatePrintPlayTimeTask(); + } task->data[0]++; return TRUE; } __attribute__((naked)) -bool8 sub_8093C38(struct Task *task) +bool8 TrainerCard_ScaleUpFlipAnimation(struct Task *task) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -1099,19 +1104,19 @@ _08093D4C: .4byte 0x0000fffc\n\ .syntax divided\n"); } -bool8 sub_8093D50(struct Task *task) +bool8 TrainerCard_FinishFlipAnimation(struct Task *task) { u8 taskId; ewram0_2.var_4 = FALSE; SetHBlankCallback(NULL); - sub_8093E04(); - taskId = FindTaskIdByFunc(sub_8093A68); + TrainerCard_ResetOffsetRegisters(); + taskId = FindTaskIdByFunc(TrainerCard_RunFlipAnimationStateMachine); DestroyTask(taskId); return FALSE; } -void sub_8093D7C(void) +static void TrainerCard_FlipAnimationHBlankCallback(void) { u16 bgVOffset = gScanlineEffectRegBuffers[1][REG_VCOUNT & 0xFF]; @@ -1120,34 +1125,34 @@ void sub_8093D7C(void) REG_BG2VOFS = bgVOffset; } -static void sub_8093DAC(void) +static void TrainerCard_DrawCard(void) { - if (ewram0_2.var_3) - sub_8093DEC(); + if (ewram0_2.backSideShown) + TrainerCard_DrawCardBack(); else - sub_8093DC8(); + TrainerCard_DrawCardFront(); } -static void sub_8093DC8(void) +static void TrainerCard_DrawCardFront(void) { Menu_EraseScreen(); - sub_80940E4(); + TrainerCard_ClearTrainerGraphics(); sub_8093F14(); - sub_8093F80(); - sub_8093FD0(); - sub_8094038(); - sub_8094140(); + TrainerCard_LoadTrainerTilemap(); + TrainerCard_DrawStars(); + TrainerCard_DisplayBadges(); + TrainerCard_Front_PrintTexts(); } -static void sub_8093DEC(void) +static void TrainerCard_DrawCardBack(void) { Menu_EraseScreen(); - sub_80940E4(); + TrainerCard_ClearTrainerGraphics(); sub_8093F48(); - sub_8094188(); + TrainerCard_Back_PrintTexts(); } -static void sub_8093E04(void) +static void TrainerCard_ResetOffsetRegisters(void) { REG_BG0VOFS = -4; REG_BG1HOFS = 0; @@ -1156,13 +1161,13 @@ static void sub_8093E04(void) REG_BG2VOFS = -4; } -static void sub_8093E28(void) +static void TrainerCard_CopyGraphics(void) { const u8 *src; u8 *dst; u32 size; - sub_8093EA0(); + TrainerCard_LoadPalettes(); LoadPalette(gUnknown_083B5F6C, 0xE0, 32); src = gMenuTrainerCard_Gfx; dst = (void *)VRAM; @@ -1187,34 +1192,34 @@ static void sub_8093E28(void) } } -extern const u16 *const gUnknown_083B5EF8[]; +extern const u16 *const gTrainerCardPalettes[]; -void sub_8093EA0(void) +static void TrainerCard_LoadPalettes(void) { - LoadPalette(gUnknown_083B5EF8[ewram0_2.var_2], 0, 48 * 2); + LoadPalette(gTrainerCardPalettes[ewram0_2.starCount], 0, 48 * 2); LoadPalette(gBadgesPalette, 48, 16 * 2); LoadPalette(gUnknown_083B5F4C, 64, 16 * 2); - if (ewram0_2.var_64.gender != MALE) + if (ewram0_2.displayedCard.gender != MALE) LoadPalette(gUnknown_083B5F0C, 16, 16 * 2); } -static void sub_8093EF8(void) +static void TrainerCard_LoadTrainerGraphics(void) { - LoadTrainerGfx_TrainerCard(ewram0_2.var_64.gender, 80, (void *)(VRAM + 0x1880)); + LoadTrainerGfx_TrainerCard(ewram0_2.displayedCard.gender, 80, (void *)(VRAM + 0x1880)); } static void sub_8093F14(void) { const void *arr[] = {gUnknown_08E8CAC0, gUnknown_08E8D4C0}; - CpuFastSet(arr[ewram0_2.var_1], (void *)(VRAM + 0x4800), 0x140); + CpuFastSet(arr[ewram0_2.isShowingLinkCard], (void *)(VRAM + 0x4800), 0x140); } // I don't really know where to put the data. It's in such a weird order. const u8 gUnknown_083B5EF4[] = _(" : "); -const u16 *const gUnknown_083B5EF8[] = +const u16 *const gTrainerCardPalettes[] = { gMenuTrainerCard0Star_Pal, gMenuTrainerCard1Star_Pal, @@ -1227,7 +1232,7 @@ const u16 gUnknown_083B5F0C[] = INCBIN_U16("graphics/trainer_card/83B5F0C.gbapal const u16 gBadgesPalette[] = INCBIN_U16("graphics/trainer_card/badges.gbapal"); const u16 gUnknown_083B5F4C[] = INCBIN_U16("graphics/trainer_card/83B5F4C.gbapal"); const u16 gUnknown_083B5F6C[] = INCBIN_U16("graphics/trainer_card/83B5F6C.gbapal"); -const u16 gUnknown_083B5F8C[][4] = INCBIN_U16("graphics/trainer_card/83B5F8C_map.bin"); +const u16 gTrainerCardBadgesMap[][4] = INCBIN_U16("graphics/trainer_card/83B5F8C_map.bin"); static void sub_8093F48(void) { @@ -1239,7 +1244,7 @@ static void sub_8093F64(void) CpuFastSet(gUnknown_08E8D9C0, (void *)(VRAM + 0x5000), 320); } -static void sub_8093F80(void) +static void TrainerCard_LoadTrainerTilemap(void) { u16 r5 = 0xC4; u16 *ptr = (u16 *)(VRAM + 0x4000); @@ -1253,11 +1258,11 @@ static void sub_8093F80(void) } } -static void sub_8093FD0(void) +static void TrainerCard_DrawStars(void) { u16 *ptr = (u16 *)(VRAM + 0x4000); s16 i = 15; - s16 var = 15 + ewram0_2.var_2; + s16 var = 15 + ewram0_2.starCount; while (i < var) { @@ -1271,9 +1276,9 @@ static void sub_8093FD0(void) } } -static void sub_8094038(void) +static void TrainerCard_DisplayBadges(void) { - if (ewram0_2.var_1 == 0) + if (!ewram0_2.isShowingLinkCard) { u16 *ptr = (u16 *)(VRAM + 0x4000); s16 i; @@ -1281,18 +1286,18 @@ static void sub_8094038(void) for (i = 0, r2 = 4; i < 8; i++, r2 += 3) { - if (ewram0_2.var_e[i] != 0) + if (ewram0_2.ownedBadges[i] != 0) { - ptr[15 * 32 + r2 + 0] = gUnknown_083B5F8C[i][0] | 0x3000; - ptr[15 * 32 + r2 + 1] = gUnknown_083B5F8C[i][1] | 0x3000; - ptr[16 * 32 + r2 + 0] = gUnknown_083B5F8C[i][2] | 0x3000; - ptr[16 * 32 + r2 + 1] = gUnknown_083B5F8C[i][3] | 0x3000; + ptr[15 * 32 + r2 + 0] = gTrainerCardBadgesMap[i][0] | 0x3000; + ptr[15 * 32 + r2 + 1] = gTrainerCardBadgesMap[i][1] | 0x3000; + ptr[16 * 32 + r2 + 0] = gTrainerCardBadgesMap[i][2] | 0x3000; + ptr[16 * 32 + r2 + 1] = gTrainerCardBadgesMap[i][3] | 0x3000; } } } } -static void sub_80940E4(void) +static void TrainerCard_ClearTrainerGraphics(void) { s16 i; u16 *ptr; @@ -1301,7 +1306,7 @@ static void sub_80940E4(void) *ptr = 0; } -static void sub_8094110(void) +static void TrainerCard_ClearPokedexLabel(void) { u16 *ptr = (u16 *)(VRAM + 0x4800); u16 i; @@ -1313,24 +1318,24 @@ static void sub_8094110(void) } } -static void sub_8094140(void) +static void TrainerCard_Front_PrintTexts(void) { u8 *buffer; BasicInitMenuWindow(&gWindowTemplate_TrainerCard_Back_Values); buffer = gStringVar1; - StringCopy(buffer, ewram0_2.var_64.playerName); + StringCopy(buffer, ewram0_2.displayedCard.playerName); ConvertInternationalString(buffer, ewram0_2.language); Menu_PrintText(buffer, 7, 5); TrainerCard_Front_PrintTrainerID(); TrainerCard_Front_PrintMoney(); TrainerCard_Front_PrintPokedexCount(); - sub_809429C(); + TrainerCard_PrintEasyChatPhrase(); } -static void sub_8094188(void) +static void TrainerCard_Back_PrintTexts(void) { BasicInitMenuWindow(&gWindowTemplate_TrainerCard_Back_Values); TrainerCard_Back_PrintName(); @@ -1354,31 +1359,31 @@ static void TrainerCard_Front_PrintTrainerID(void) { u8 buffer[8]; - ConvertIntToDecimalStringN(buffer, ewram0_2.var_64.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5); + ConvertIntToDecimalStringN(buffer, ewram0_2.displayedCard.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5); Menu_PrintText(buffer, 20, 2); } static void TrainerCard_Front_PrintMoney(void) { - sub_80B7AEC(ewram0_2.var_64.money, 16, 8); + sub_80B7AEC(ewram0_2.displayedCard.money, 16, 8); } static void TrainerCard_Front_PrintPokedexCount(void) { u8 buffer[16]; - if (ewram0_2.var_7 == FALSE) + if (!ewram0_2.showPokedexCount) { - sub_8094110(); + TrainerCard_ClearPokedexLabel(); } else { - ConvertIntToDecimalStringN(buffer, ewram0_2.var_64.pokedexSeen, STR_CONV_MODE_LEFT_ALIGN, 3); + ConvertIntToDecimalStringN(buffer, ewram0_2.displayedCard.pokedexSeen, STR_CONV_MODE_LEFT_ALIGN, 3); MenuPrint_RightAligned(buffer, 16, 10); } } -static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon) +static void TrainerCard_Front_GetPlayTimeString(u8 *arg1, s16 colon) { u8 buffer[16]; u16 playTimeHours; @@ -1386,33 +1391,33 @@ static void TrainerCard_Front_PrintPlayTime(u8 *arg1, s16 colon) playTimeHours = gSaveBlock2.playTimeHours; playTimeMinutes = gSaveBlock2.playTimeMinutes; - if (ewram0_2.var_1 != 0) + if (ewram0_2.isShowingLinkCard != 0) { - playTimeHours = ewram0_2.var_64.playTimeHours; - playTimeMinutes = ewram0_2.var_64.playTimeMinutes; + playTimeHours = ewram0_2.displayedCard.playTimeHours; + playTimeMinutes = ewram0_2.displayedCard.playTimeMinutes; } FormatPlayTime(buffer, playTimeHours, playTimeMinutes, colon); sub_8072C74(arg1, buffer, 48, 1); } -static void sub_809429C(void) +static void TrainerCard_PrintEasyChatPhrase(void) { u8 *str; - if (ewram0_2.var_1 != 0) + if (ewram0_2.isShowingLinkCard != 0) { str = gStringVar1; - str = StringCopy(str, ewram0_2.var_20[0]); + str = StringCopy(str, ewram0_2.easyChatPhrase[0]); str[0] = 00; str++; - str = StringCopy(str, ewram0_2.var_20[1]); + str = StringCopy(str, ewram0_2.easyChatPhrase[1]); Menu_PrintText(gStringVar1, 2, 14); str = gStringVar1; - str = StringCopy(str, ewram0_2.var_20[2]); + str = StringCopy(str, ewram0_2.easyChatPhrase[2]); str[0] = 00; str++; - str = StringCopy(str, ewram0_2.var_20[3]); + str = StringCopy(str, ewram0_2.easyChatPhrase[3]); Menu_PrintText(gStringVar1, 2, 16); } } @@ -1422,7 +1427,7 @@ static void TrainerCard_Back_PrintName(void) u8 *str; str = gStringVar1; - StringCopy(str, ewram0_2.var_64.playerName); + StringCopy(str, ewram0_2.displayedCard.playerName); ConvertInternationalString(str, ewram0_2.language); #if ENGLISH @@ -1436,7 +1441,7 @@ static void TrainerCard_Back_PrintName(void) static void TrainerCard_Back_PrintHallOfFameTime_Label(void) { - if (ewram0_2.var_8 != 0) + if (ewram0_2.showHallOfFame != 0) Menu_PrintText(gOtherText_FirstHOF, 3, 5); } @@ -1444,21 +1449,21 @@ static void TrainerCard_Back_PrintHallOfFameTime(void) { u8 *str; - if (ewram0_2.var_8 != 0) + if (ewram0_2.showHallOfFame != 0) { str = gStringVar1; - str = ConvertIntToDecimalStringN(str, ewram0_2.var_64.firstHallOfFameA, STR_CONV_MODE_RIGHT_ALIGN, 3); + str = ConvertIntToDecimalStringN(str, ewram0_2.displayedCard.firstHallOfFameA, STR_CONV_MODE_RIGHT_ALIGN, 3); str = StringCopy(str, gUnknown_083B5EF4); - str = ConvertIntToDecimalStringN(str, ewram0_2.var_64.firstHallOfFameB, STR_CONV_MODE_LEADING_ZEROS, 2); + str = ConvertIntToDecimalStringN(str, ewram0_2.displayedCard.firstHallOfFameB, STR_CONV_MODE_LEADING_ZEROS, 2); str = StringCopy(str, gUnknown_083B5EF4); - str = ConvertIntToDecimalStringN(str, ewram0_2.var_64.firstHallOfFameC, STR_CONV_MODE_LEADING_ZEROS, 2); + str = ConvertIntToDecimalStringN(str, ewram0_2.displayedCard.firstHallOfFameC, STR_CONV_MODE_LEADING_ZEROS, 2); MenuPrint_RightAligned(gStringVar1, 28, 5); } } static void TrainerCard_Back_PrintLinkBattlesLabel(void) { - if (ewram0_2.var_9 != 0) + if (ewram0_2.showLinkBattleStatus != 0) Menu_PrintText(gOtherText_LinkCableBattles, 3, 7); } @@ -1466,19 +1471,19 @@ static void TrainerCard_Back_PrintLinkBattles(void) { u8 buffer[16]; - if (ewram0_2.var_9 != 0) + if (ewram0_2.showLinkBattleStatus != 0) { - ConvertIntToDecimalString(buffer, ewram0_2.var_64.linkBattleWins); + ConvertIntToDecimalString(buffer, ewram0_2.displayedCard.linkBattleWins); MenuPrint_RightAligned(buffer, 22, 7); - ConvertIntToDecimalString(buffer, ewram0_2.var_64.linkBattleLosses); + ConvertIntToDecimalString(buffer, ewram0_2.displayedCard.linkBattleLosses); MenuPrint_RightAligned(buffer, 28, 7); } } static void TrainerCard_Back_PrintBattleTower_Label(void) { - if (ewram0_2.var_a != 0) + if (ewram0_2.showBattleTowerStatus != 0) Menu_PrintText(gOtherText_BattleTowerWinRecord, 3, 15); } @@ -1486,19 +1491,19 @@ static void TrainerCard_Back_PrintBattleTower(void) { u8 buffer[16]; - if (ewram0_2.var_a != 0) + if (ewram0_2.showBattleTowerStatus != 0) { - sub_8072C44(buffer, ewram0_2.var_64.battleTowerWins, 24, 1); + sub_8072C44(buffer, ewram0_2.displayedCard.battleTowerWins, 24, 1); Menu_PrintTextPixelCoords(buffer, 112, 120, 0); - sub_8072C44(buffer, ewram0_2.var_64.battleTowerLosses, 24, 1); + sub_8072C44(buffer, ewram0_2.displayedCard.battleTowerLosses, 24, 1); Menu_PrintTextPixelCoords(buffer, 149, 120, 0); } } static void TrainerCard_Back_PrintLinkContests_Label(void) { - if (ewram0_2.var_b != 0) + if (ewram0_2.showContestRecord != 0) Menu_PrintText(gOtherText_ContestRecord, 3, 13); } @@ -1506,16 +1511,16 @@ static void TrainerCard_Back_PrintLinkContests(void) { u8 buffer[8]; - if (ewram0_2.var_b != 0) + if (ewram0_2.showContestRecord != 0) { - ConvertIntToDecimalStringN(buffer, ewram0_2.var_64.contestsWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(buffer, ewram0_2.displayedCard.contestsWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 3); MenuPrint_RightAligned(buffer, 28, 13); } } static void TrainerCard_Back_PrintLinkPokeblocks_Label(void) { - if (ewram0_2.var_c != 0) + if (ewram0_2.showMixingRecord != 0) Menu_PrintText(gOtherText_MixingRecord, 3, 11); } @@ -1523,16 +1528,16 @@ static void TrainerCard_Back_PrintLinkPokeblocks(void) { u8 buffer[8]; - if (ewram0_2.var_c != 0) + if (ewram0_2.showMixingRecord != 0) { - ConvertIntToDecimalStringN(buffer, ewram0_2.var_64.pokeblocksWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 5); + ConvertIntToDecimalStringN(buffer, ewram0_2.displayedCard.pokeblocksWithFriends, STR_CONV_MODE_RIGHT_ALIGN, 5); MenuPrint_RightAligned(buffer, 28, 11); } } static void TrainerCard_Back_PrintPokemonTrades_Label(void) { - if (ewram0_2.var_d != 0) + if (ewram0_2.showTradingRecord != 0) Menu_PrintText(gOtherText_TradeRecord, 3, 9); } @@ -1540,9 +1545,9 @@ static void TrainerCard_Back_PrintPokemonTrades(void) { u8 buffer[8]; - if (ewram0_2.var_d != 0) + if (ewram0_2.showTradingRecord != 0) { - ConvertIntToDecimalStringN(buffer, ewram0_2.var_64.pokemonTrades, STR_CONV_MODE_RIGHT_ALIGN, 5); + ConvertIntToDecimalStringN(buffer, ewram0_2.displayedCard.pokemonTrades, STR_CONV_MODE_RIGHT_ALIGN, 5); MenuPrint_RightAligned(buffer, 28, 9); } } diff --git a/src/field/start_menu.c b/src/field/start_menu.c index d6881cb01..2f6f1e7dd 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -395,7 +395,7 @@ static u8 StartMenu_PlayerCallback(void) if (!gPaletteFade.active) { PlayRainSoundEffect(); - sub_8093110(sub_805469C); + TrainerCard_ShowPlayerCard(sub_805469C); return 1; } return 0; @@ -443,7 +443,7 @@ static u8 StartMenu_PlayerLinkCallback(void) if (!gPaletteFade.active) { PlayRainSoundEffect(); - sub_8093130(gUnknown_03004860, sub_805469C); + TrainerCard_ShowLinkCard(gUnknown_03004860, sub_805469C); return 1; } return 0; -- cgit v1.2.3 From 859dd7a5eef5bec4101e6eadaf91eb85b43ba119 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 12 Jan 2018 14:55:08 -0600 Subject: fix bogus scaninc invocations --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bb5c1b563..0c12b78b3 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ BUILD_DIR := build/$(BUILD_NAME) C_SOURCES := $(foreach dir, $(SUBDIRS), $(wildcard $(dir)/*.c)) ASM_SOURCES := $(foreach dir, $(SUBDIRS), $(wildcard $(dir)/*.s)) -C_OBECTS := $(addprefix $(BUILD_DIR)/, $(C_SOURCES:%.c=%.o)) +C_OBJECTS := $(addprefix $(BUILD_DIR)/, $(C_SOURCES:%.c=%.o)) ASM_OBJECTS := $(addprefix $(BUILD_DIR)/, $(ASM_SOURCES:%.s=%.o)) ALL_OBJECTS := $(C_OBJECTS) $(ASM_OBJECTS) @@ -71,7 +71,7 @@ LD_SCRIPT := $(BUILD_DIR)/ld_script.ld # Disable dependency scanning when NODEP is used for quick building ifeq ($(NODEP),) $(BUILD_DIR)/src/%.o: C_FILE = $(*D)/$(*F).c - $(BUILD_DIR)/src/%.o: C_DEP = $(shell $(SCANINC) -I include $(wildcard $(C_FILE:$(BUILD_DIR)/=))) + $(BUILD_DIR)/src/%.o: C_DEP = $(shell $(SCANINC) -I include $(C_FILE:$(BUILD_DIR)/=)) $(BUILD_DIR)/asm/%.o: ASM_DEP = $(shell $(SCANINC) asm/$(*F).s) $(BUILD_DIR)/data/%.o: ASM_DEP = $(shell $(SCANINC) data/$(*F).s) endif @@ -107,16 +107,16 @@ tidy: %.elf: $(LD_SCRIPT) $(ALL_OBJECTS) cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) -o ../../$@ ../../$(LIBGCC) ../../$(LIBC) -$(LD_SCRIPT): $(BUILD_DIR)/sym_bss.ld $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld +$(LD_SCRIPT): $(BUILD_DIR)/sym_bss.ld $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld ld_script.txt cd $(BUILD_DIR) && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" >ld_script.ld $(BUILD_DIR)/sym_bss.ld: sym_bss.txt cd $(BUILD_DIR) && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt $(LANGUAGE) >sym_bss.ld -$(BUILD_DIR)/sym_common.ld: sym_common.txt $(C_OBECTS) $(wildcard common_syms/*.txt) +$(BUILD_DIR)/sym_common.ld: sym_common.txt $(C_OBJECTS) $(wildcard common_syms/*.txt) cd $(BUILD_DIR) && ../../$(RAMSCRGEN) COMMON ../../sym_common.txt $(LANGUAGE) -c src,../../common_syms >sym_common.ld $(BUILD_DIR)/sym_ewram.ld: sym_ewram.txt cd $(BUILD_DIR) && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $(LANGUAGE) >sym_ewram.ld -$(BUILD_DIR)/%.o: %.c $$(C_DEP) +$(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP) $(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i $(PREPROC) $(BUILD_DIR)/$*.i charmap.txt | $(CC1) $(CC1FLAGS) -o $(BUILD_DIR)/$*.s @printf ".text\n\t.align\t2, 0\n" >> $(BUILD_DIR)/$*.s -- cgit v1.2.3 From 16c6b66bfb523aca627a15cc835b379851a7d264 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 12 Jan 2018 15:03:24 -0600 Subject: avoid clashing with existing environment variables --- Makefile | 26 +++++++++++++------------- config.mk | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 0c12b78b3..dbb874c02 100644 --- a/Makefile +++ b/Makefile @@ -19,9 +19,9 @@ PREPROC := tools/preproc/preproc SCANINC := tools/scaninc/scaninc RAMSCRGEN := tools/ramscrgen/ramscrgen -ASFLAGS := -mcpu=arm7tdmi -I include --defsym $(VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(LANGUAGE)=1 +ASFLAGS := -mcpu=arm7tdmi -I include --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym $(GAME_LANGUAGE)=1 CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm -CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -D $(VERSION) -D REVISION=$(REVISION) -D $(LANGUAGE) +CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -D $(GAME_VERSION) -D REVISION=$(GAME_REVISION) -D $(GAME_LANGUAGE) #### Files #### @@ -110,11 +110,11 @@ tidy: $(LD_SCRIPT): $(BUILD_DIR)/sym_bss.ld $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld ld_script.txt cd $(BUILD_DIR) && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" >ld_script.ld $(BUILD_DIR)/sym_bss.ld: sym_bss.txt - cd $(BUILD_DIR) && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt $(LANGUAGE) >sym_bss.ld + cd $(BUILD_DIR) && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt $(GAME_LANGUAGE) >sym_bss.ld $(BUILD_DIR)/sym_common.ld: sym_common.txt $(C_OBJECTS) $(wildcard common_syms/*.txt) - cd $(BUILD_DIR) && ../../$(RAMSCRGEN) COMMON ../../sym_common.txt $(LANGUAGE) -c src,../../common_syms >sym_common.ld + cd $(BUILD_DIR) && ../../$(RAMSCRGEN) COMMON ../../sym_common.txt $(GAME_LANGUAGE) -c src,../../common_syms >sym_common.ld $(BUILD_DIR)/sym_ewram.ld: sym_ewram.txt - cd $(BUILD_DIR) && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $(LANGUAGE) >sym_ewram.ld + cd $(BUILD_DIR) && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $(GAME_LANGUAGE) >sym_ewram.ld $(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP) $(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i @@ -130,14 +130,14 @@ $(BUILD_DIR)/%.o: %.s $$(ASM_DEP) $(AS) $(ASFLAGS) $< -o $@ # "friendly" target names for convenience sake -ruby: ; @$(MAKE) --no-print-directory VERSION=RUBY -ruby_rev1: ; @$(MAKE) --no-print-directory VERSION=RUBY REVISION=1 -ruby_rev2: ; @$(MAKE) --no-print-directory VERSION=RUBY REVISION=2 -sapphire: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE -sapphire_rev1: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE REVISION=1 -sapphire_rev2: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE REVISION=2 -ruby_de: ; @$(MAKE) --no-print-directory VERSION=RUBY LANGUAGE=GERMAN -sapphire_de: ; @$(MAKE) --no-print-directory VERSION=SAPPHIRE LANGUAGE=GERMAN +ruby: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY +ruby_rev1: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_REVISION=1 +ruby_rev2: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_REVISION=2 +sapphire: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE +sapphire_rev1: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_REVISION=1 +sapphire_rev2: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_REVISION=2 +ruby_de: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN +sapphire_de: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN #### Graphics Rules #### diff --git a/config.mk b/config.mk index f0ad39f5b..9f901658e 100644 --- a/config.mk +++ b/config.mk @@ -1,44 +1,44 @@ ### Build Configuration ### # Default variables -VERSION ?= RUBY -REVISION ?= 0 -LANGUAGE ?= ENGLISH +GAME_VERSION ?= RUBY +GAME_REVISION ?= 0 +GAME_LANGUAGE ?= ENGLISH COMPARE ?= 1 # Version -ifeq ($(VERSION), RUBY) +ifeq ($(GAME_VERSION), RUBY) BUILD_NAME := ruby else -ifeq ($(VERSION), SAPPHIRE) +ifeq ($(GAME_VERSION), SAPPHIRE) BUILD_NAME := sapphire else - $(error unknown version $(VERSION)) + $(error unknown version $(GAME_VERSION)) endif endif # Revision -ifeq ($(REVISION), 0) +ifeq ($(GAME_REVISION), 0) BUILD_NAME := $(BUILD_NAME) else -ifeq ($(REVISION), 1) +ifeq ($(GAME_REVISION), 1) BUILD_NAME := $(BUILD_NAME)_rev1 else -ifeq ($(REVISION), 2) +ifeq ($(GAME_REVISION), 2) BUILD_NAME := $(BUILD_NAME)_rev2 else - $(error unknown revision $(REVISION)) + $(error unknown revision $(GAME_REVISION)) endif endif endif # Language -ifeq ($(LANGUAGE), ENGLISH) +ifeq ($(GAME_LANGUAGE), ENGLISH) BUILD_NAME := $(BUILD_NAME) else -ifeq ($(LANGUAGE), GERMAN) +ifeq ($(GAME_LANGUAGE), GERMAN) BUILD_NAME := $(BUILD_NAME)_de else - $(error unknown language $(LANGUAGE)) + $(error unknown language $(GAME_LANGUAGE)) endif endif -- cgit v1.2.3 From 5d393adfcc1a994f9885a2720f3a0bb29afd5a6e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 12 Jan 2018 18:16:52 -0500 Subject: start decompiling contest_ai --- asm/contest_ai.s | 247 +-------------------------------------------- asm/contest_link_80C2020.s | 12 +-- asm/contest_link_80C857C.s | 8 +- include/contest.h | 18 +++- include/ewram.h | 2 + ld_script.txt | 1 + src/contest.c | 10 +- src/contest_ai.c | 113 +++++++++++++++++++++ sym_ewram.txt | 12 +-- 9 files changed, 151 insertions(+), 272 deletions(-) create mode 100755 src/contest_ai.c diff --git a/asm/contest_ai.s b/asm/contest_ai.s index 709b289c2..d1ae6425b 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -5,249 +5,6 @@ .text - thumb_func_start sub_81288F4 -sub_81288F4: @ 81288F4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r4, _0812893C @ =gSharedMem + 0x192E4 - adds r0, r4, 0 - movs r1, 0 - movs r2, 0x44 - bl memset - movs r3, 0x64 - adds r2, r4, 0 - movs r1, 0x3 - adds r0, r2, 0 - adds r0, 0x8 -_08128910: - strb r3, [r0] - subs r0, 0x1 - subs r1, 0x1 - cmp r1, 0 - bge _08128910 - adds r3, r2, 0 - adds r3, 0x41 - movs r1, 0 - strb r5, [r3] - adds r0, r2, 0 - adds r0, 0x40 - strb r1, [r0] - ldr r1, _08128940 @ =gContestMons - ldrb r0, [r3] - lsls r0, 6 - adds r1, 0x18 - adds r0, r1 - ldr r0, [r0] - str r0, [r2, 0x14] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812893C: .4byte gSharedMem + 0x192E4 -_08128940: .4byte gContestMons - thumb_func_end sub_81288F4 - - thumb_func_start sub_8128944 -sub_8128944: @ 8128944 - push {r4-r6,lr} - ldr r1, _081289A8 @ =gSharedMem + 0x192E4 - ldr r0, [r1, 0x14] - cmp r0, 0 - beq _08128974 - adds r4, r1, 0 - movs r5, 0 -_08128952: - ldr r0, [r4, 0x14] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08128962 - strb r5, [r4] - bl sub_81289AC -_08128962: - ldr r1, [r4, 0x14] - lsrs r1, 1 - str r1, [r4, 0x14] - ldrb r0, [r4, 0x10] - adds r0, 0x1 - strb r0, [r4, 0x10] - strb r5, [r4, 0x4] - cmp r1, 0 - bne _08128952 -_08128974: - movs r6, 0x3 - ldr r5, _081289A8 @ =gSharedMem + 0x192E4 -_08128978: - bl Random - adds r4, r0, 0 - ands r4, r6 - adds r3, r5, 0x5 - adds r0, r4, r3 - ldrb r2, [r0] - movs r1, 0 - ldrb r0, [r5, 0x5] - cmp r2, r0 - bcc _0812899C -_0812898E: - adds r1, 0x1 - cmp r1, 0x3 - bgt _0812899C - adds r0, r1, r3 - ldrb r0, [r0] - cmp r2, r0 - bcs _0812898E -_0812899C: - cmp r1, 0x4 - bne _08128978 - adds r0, r4, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_081289A8: .4byte gSharedMem + 0x192E4 - thumb_func_end sub_8128944 - - thumb_func_start sub_81289AC -sub_81289AC: @ 81289AC - push {r4-r6,lr} - ldr r1, _081289F4 @ =gSharedMem + 0x192E4 - ldrb r0, [r1] - adds r2, r1, 0 - cmp r0, 0x2 - beq _08128A76 - adds r4, r1, 0 - ldr r5, _081289F8 @ =gAIScriptPtr - ldr r6, _081289FC @ =gUnknown_0203858E -_081289BE: - ldrb r0, [r4] - cmp r0, 0x1 - beq _08128A0E - cmp r0, 0x1 - bgt _08128A6E - cmp r0, 0 - bne _08128A6E - ldr r1, _08128A00 @ =gContestAIs - ldrb r0, [r4, 0x10] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - str r0, [r5] - ldrb r1, [r4, 0x4] - lsls r1, 1 - adds r0, r4, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r1, r6 - ldrh r1, [r1] - adds r0, r1, 0 - cmp r0, 0 - bne _08128A04 - strh r0, [r4, 0x2] - b _08128A06 - .align 2, 0 -_081289F4: .4byte gSharedMem + 0x192E4 -_081289F8: .4byte gAIScriptPtr -_081289FC: .4byte gUnknown_0203858E -_08128A00: .4byte gContestAIs -_08128A04: - strh r1, [r4, 0x2] -_08128A06: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _08128A6E -_08128A0E: - ldrh r1, [r1, 0x2] - cmp r1, 0 - beq _08128A2C - ldr r1, _08128A28 @ =sContestAICmdTable - ldr r0, [r5] - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - b _08128A3C - .align 2, 0 -_08128A28: .4byte sContestAICmdTable -_08128A2C: - adds r0, r4, 0x5 - ldrb r2, [r4, 0x4] - adds r0, r2 - strb r1, [r0] - ldrb r1, [r4, 0x9] - movs r0, 0x1 - orrs r0, r1 - strb r0, [r4, 0x9] -_08128A3C: - ldr r2, _08128A5C @ =gSharedMem + 0x192E4 - ldrb r1, [r2, 0x9] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08128A6E - ldrb r0, [r2, 0x4] - adds r0, 0x1 - movs r1, 0 - strb r0, [r2, 0x4] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bhi _08128A60 - strb r1, [r2] - b _08128A66 - .align 2, 0 -_08128A5C: .4byte gSharedMem + 0x192E4 -_08128A60: - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] -_08128A66: - ldrb r1, [r4, 0x9] - movs r0, 0xFE - ands r0, r1 - strb r0, [r4, 0x9] -_08128A6E: - adds r1, r2, 0 - ldrb r0, [r1] - cmp r0, 0x2 - bne _081289BE -_08128A76: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_81289AC - - thumb_func_start sub_8128A7C -sub_8128A7C: @ 8128A7C - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - movs r1, 0 - ldr r3, _08128AA4 @ =gSharedMem + 0x192D0 - ldrb r0, [r3] - cmp r0, r2 - beq _08128A9A -_08128A8C: - adds r1, 0x1 - cmp r1, 0x3 - bgt _08128A9A - adds r0, r1, r3 - ldrb r0, [r0] - cmp r0, r2 - bne _08128A8C -_08128A9A: - lsls r0, r1, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_08128AA4: .4byte gSharedMem + 0x192D0 - thumb_func_end sub_8128A7C - thumb_func_start ContestAICmd_unk_00 ContestAICmd_unk_00: @ 8128AA8 push {lr} @@ -5039,7 +4796,7 @@ ContestAICmd_check_for_exciting_move: @ 812ACFC movs r5, 0 movs r4, 0 ldr r7, _0812AD28 @ =gSharedMem + 0x19325 - ldr r6, _0812AD2C @ =gUnknown_0203858E + ldr r6, _0812AD2C @ =gContestMons + 0x1E _0812AD06: lsls r0, r4, 1 ldrb r1, [r7] @@ -5058,7 +4815,7 @@ _0812AD06: b _0812AD36 .align 2, 0 _0812AD28: .4byte gSharedMem + 0x19325 -_0812AD2C: .4byte gUnknown_0203858E +_0812AD2C: .4byte gContestMons + 0x1E _0812AD30: adds r4, 0x1 cmp r4, 0x3 diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index af239f3f7..8a0f096f0 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -1202,7 +1202,7 @@ _080C29FC: .4byte gStringVar1 _080C2A00: .4byte gLinkPlayers + 0x8 _080C2A04: lsls r4, 6 - ldr r1, _080C2A54 @ =gUnknown_0203857D + ldr r1, _080C2A54 @ =gContestMons + 0xD adds r1, r4, r1 adds r0, r3, 0 bl StringCopy @@ -1238,7 +1238,7 @@ _080C2A4A: strh r0, [r1, 0x8] b _080C2A80 .align 2, 0 -_080C2A54: .4byte gUnknown_0203857D +_080C2A54: .4byte gContestMons + 0xD _080C2A58: .4byte gStringVar2 _080C2A5C: .4byte gContestMons + 0x2 _080C2A60: .4byte gContestText_PokeWon @@ -5201,7 +5201,7 @@ _080C4720: ldr r1, _080C4738 @ =gSpecialVar_0x8006 ldrh r1, [r1] lsls r1, 6 - ldr r2, _080C473C @ =gUnknown_0203857D + ldr r2, _080C473C @ =gContestMons + 0xD adds r1, r2 bl sub_80C4674 _080C4730: @@ -5210,7 +5210,7 @@ _080C4730: .align 2, 0 _080C4734: .4byte gStringVar1 _080C4738: .4byte gSpecialVar_0x8006 -_080C473C: .4byte gUnknown_0203857D +_080C473C: .4byte gContestMons + 0xD thumb_func_end sub_80C46EC thumb_func_start sub_80C4740 @@ -5352,7 +5352,7 @@ _080C4838: .4byte gStringVar3 _080C483C: .4byte gLinkPlayers + 0x8 _080C4840: lsls r1, r2, 6 - ldr r0, _080C4854 @ =gUnknown_0203857D + ldr r0, _080C4854 @ =gContestMons + 0xD adds r1, r0 adds r0, r4, 0 bl sub_80C4674 @@ -5361,7 +5361,7 @@ _080C484C: pop {r0} bx r0 .align 2, 0 -_080C4854: .4byte gUnknown_0203857D +_080C4854: .4byte gContestMons + 0xD thumb_func_end sub_80C47F0 thumb_func_start sub_80C4858 diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index b29e03583..6afcaec6d 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -402,7 +402,7 @@ _080C8838: mov r1, r8 strb r1, [r4, 0xA] _080C883E: - ldr r0, _080C886C @ =gUnknown_0203857D + ldr r0, _080C886C @ =gContestMons + 0xD adds r4, r5, r0 ldrh r0, [r6, 0x1A] cmp r0, 0x1 @@ -425,7 +425,7 @@ _080C883E: strb r0, [r4] b _080C8878 .align 2, 0 -_080C886C: .4byte gUnknown_0203857D +_080C886C: .4byte gContestMons + 0xD _080C8870: ldrb r0, [r4, 0x7] strb r0, [r4, 0x5] @@ -610,7 +610,7 @@ _080C886C: mov r2, r9 strb r2, [r4, 0xA] _080C8872: - ldr r0, _080C88A0 @ =gUnknown_0203857D + ldr r0, _080C88A0 @ =gContestMons + 0xD adds r4, r6, r0 ldrh r0, [r7, 0x1A] cmp r0, 0x1 @@ -633,7 +633,7 @@ _080C8872: strb r0, [r4] b _080C88AC .align 2, 0 -_080C88A0: .4byte gUnknown_0203857D +_080C88A0: .4byte gContestMons + 0xD _080C88A4: ldrb r0, [r4, 0x7] strb r0, [r4, 0x5] diff --git a/include/contest.h b/include/contest.h index 6e71358a2..a1d2ec9e0 100644 --- a/include/contest.h +++ b/include/contest.h @@ -67,6 +67,23 @@ struct ContestPokemon /*0x3C*/ u32 otId; // otId }; // wow +struct ContestAIInfo { + /*0x00*/ u8 aiState; + /*0x01*/ u8 filler1[1]; // padding? + /*0x02*/ u16 unk2; + /*0x04*/ u8 unk4; + /*0x05*/ u8 unk5[4]; + /*0x09*/ u8 aiAction; + /*0x0A*/ u8 fillerA[0x6]; + /*0x10*/ u8 unk10; + /*0x11*/ u8 filler11[0x3]; // padding? + /*0x14*/ u32 flags; + /*0x18*/ u8 filler18[0x28]; + /*0x40*/ u8 unk40; + /*0x41*/ u8 unk41; + /*0x42*/ u8 filler42[0x2]; // padding? +}; + extern struct ContestPokemon gContestMons[]; extern const struct ContestMove gContestMoves[]; extern const struct ContestEffect gContestEffects[]; @@ -248,7 +265,6 @@ struct UnknownContestStruct6 #define shared18004 ((u16 *)(gSharedMem + 0x18004)) #define sContest (*(struct Contest *)(gSharedMem + 0x19204)) #define sContestantStatus ((struct ContestantStatus *)(gSharedMem + 0x19260)) -#define shared192D0 (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0)) #define shared192E4 (gSharedMem + 0x192E4) #define shared19328 (*(struct UnknownContestStruct5 *)(gSharedMem + 0x19328)) #define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338)) diff --git a/include/ewram.h b/include/ewram.h index b07820090..9766ab4df 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -229,6 +229,8 @@ extern u8 gSharedMem[]; #define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) #define ePokedexView3 (struct PokedexView *)(gSharedMem + 0x19000) #define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) +#define shared192D0 (*(struct UnknownContestStruct7 *)(gSharedMem + 0x192D0)) +#define eContestAI ((struct ContestAIInfo *)(gSharedMem + 0x192E4)) #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348)) #define ewram19800 (&gSharedMem[0x19800]) #define ePokedexView4 (struct PokedexView *)(gSharedMem + 0x19800) diff --git a/ld_script.txt b/ld_script.txt index 54aca5b2b..ffc4bc676 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -355,6 +355,7 @@ SECTIONS { src/engine/save.o(.text); src/engine/mystery_event_script.o(.text); src/field/field_effect_helpers.o(.text); + src/contest_ai.o(.text); asm/contest_ai.o(.text); src/unused_81258BC.o(.text); src/battle/anim/sfx.o(.text); diff --git a/src/contest.c b/src/contest.c index 875fe4502..6a8887fb1 100644 --- a/src/contest.c +++ b/src/contest.c @@ -36,8 +36,8 @@ extern u8 AreMovesContestCombo(u16, u16); // I don't think this is a bool extern void sub_80C8A38(u8); extern void sub_80C8AD0(u8); extern void sub_80C8C80(u8); -extern void sub_81288F4(); -extern u8 sub_8128944(void); +extern void ContestAI_ResetAI(); +extern u8 ContestAI_GetActionToUse(void); extern struct MusicPlayerInfo gMPlay_SE1; extern u16 gSpecialVar_ContestCategory; @@ -391,7 +391,7 @@ void ClearContestVars(void) } memset(&shared192D0, 0, sizeof(shared192D0)); - memset(shared192E4, 0, 0x44 * sizeof(*shared192E4)); + memset(eContestAI, 0, sizeof(struct ContestAIInfo)); memset(&shared19328, 0, sizeof(shared19328)); memset(shared19338, 0, 4 * sizeof(*shared19338)); if (!(gIsLinkContest & 1)) @@ -2629,8 +2629,8 @@ u16 GetChosenMove(u8 a) { u8 moveChoice; - sub_81288F4(a); - moveChoice = sub_8128944(); + ContestAI_ResetAI(a); + moveChoice = ContestAI_GetActionToUse(); return gContestMons[a].moves[moveChoice]; } } diff --git a/src/contest_ai.c b/src/contest_ai.c new file mode 100755 index 000000000..9dfa6c2b9 --- /dev/null +++ b/src/contest_ai.c @@ -0,0 +1,113 @@ +#include "global.h" +#include "contest.h" +#include "random.h" +#include "ewram.h" + +enum +{ + ContestAI_SettingUp, + ContestAI_Processing, + ContestAI_FinishedProcessing, + ContestAI_DoNotProcess +}; + +extern u8 *gAIScriptPtr; +extern u8 *gContestAIs[]; + +typedef void (* ContestAICmdFunc)(void); + +extern const ContestAICmdFunc sContestAICmdTable[]; // TODO: Move table to C file + +void ContestAI_DoAIProcessing(void); + +void ContestAI_ResetAI(u8 var) +{ + int i; + memset(eContestAI, 0, sizeof(struct ContestAIInfo)); + + for(i = 0; i < 4; i++) + eContestAI->unk5[i] = 100; + + eContestAI->unk41 = var; + eContestAI->unk40 = 0; + eContestAI->flags = gContestMons[eContestAI->unk41].flags; +} + +u8 ContestAI_GetActionToUse(void) +{ + while(eContestAI->flags != 0) + { + if(eContestAI->flags & 1) + { + eContestAI->aiState = 0; + ContestAI_DoAIProcessing(); + } + eContestAI->flags >>= 1; + eContestAI->unk10++; + eContestAI->unk4 = 0; + } + + while (1) + { + u8 rval = Random() & 3; + u8 r2 = eContestAI->unk5[rval]; + int i; + for (i = 0; i < 4; i++) + { + if (r2 < eContestAI->unk5[i]) + break; + } + if (i == 4) + return rval; + } +} + +void ContestAI_DoAIProcessing(void) +{ + while(eContestAI->aiState != ContestAI_FinishedProcessing) + { + switch(eContestAI->aiState) + { + case ContestAI_DoNotProcess: + break; + case ContestAI_SettingUp: + gAIScriptPtr = gContestAIs[eContestAI->unk10]; + + if(gContestMons[eContestAI->unk41].moves[eContestAI->unk4] == 0) + eContestAI->unk2 = 0; // don't process a move that doesn't exist. + else + eContestAI->unk2 = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + eContestAI->aiState++; + break; + case ContestAI_Processing: + if(eContestAI->unk2 != 0) + sContestAICmdTable[*gAIScriptPtr](); // run the command. + else + { + eContestAI->unk5[eContestAI->unk4] = 0; // don't consider a move that doesn't exist. + eContestAI->aiAction |= 1; + } + if(eContestAI->aiAction & 1) + { + eContestAI->unk4++; + if(eContestAI->unk4 < 4) + eContestAI->aiState = 0; + else + eContestAI->aiState++; + eContestAI->aiAction &= 0xFE; // TODO: Define action flags + } + break; + } + } +} + +u8 sub_8128A7C(u8 var) +{ + int i; + + for(i = 0; i < 4; i++) + if(shared192D0.unk0[i] == var) + break; + + return i; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index dcbadf96e..b9c08aac6 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -447,17 +447,7 @@ gUnknown_0203856C: @ 203856C .space 0x4 gContestMons: @ 2038570 - .space 0xD - -gUnknown_0203857D: @ 203857D - .space 0x11 - - @ contest move space -gUnknown_0203858E: @ 203858E - .space 0x8 - -gUnknown_02038596: @ 2038596 - .space 0xDA + .space 0x100 gUnknown_02038670: @ 2038670 .space 0x8 -- cgit v1.2.3 From fdeee269791ba9e163f32522d44526b0e2b58f29 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 12 Jan 2018 20:44:49 -0500 Subject: up to ContestAICmd_unk_14 --- asm/contest_ai.s | 690 ------------------------------------------------------ include/contest.h | 87 +++---- src/contest_ai.c | 198 ++++++++++++++++ 3 files changed, 242 insertions(+), 733 deletions(-) diff --git a/asm/contest_ai.s b/asm/contest_ai.s index d1ae6425b..a0255dff7 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -5,696 +5,6 @@ .text - thumb_func_start ContestAICmd_unk_00 -ContestAICmd_unk_00: @ 8128AA8 - push {lr} - ldr r2, _08128AD0 @ =gSharedMem + 0x192E4 - adds r1, r2, 0x5 - ldrb r0, [r2, 0x4] - adds r1, r0 - ldr r3, _08128AD4 @ =gAIScriptPtr - ldr r0, [r3] - ldrb r0, [r0, 0x1] - lsls r0, 24 - asrs r0, 24 - ldrb r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r1, r0, 16 - asrs r0, 16 - cmp r0, 0xFF - ble _08128AD8 - movs r1, 0xFF - b _08128ADE - .align 2, 0 -_08128AD0: .4byte gSharedMem + 0x192E4 -_08128AD4: .4byte gAIScriptPtr -_08128AD8: - cmp r0, 0 - bge _08128ADE - movs r1, 0 -_08128ADE: - adds r0, r2, 0x5 - ldrb r2, [r2, 0x4] - adds r0, r2 - strb r1, [r0] - ldr r0, [r3] - adds r0, 0x2 - str r0, [r3] - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_00 - - thumb_func_start ContestAICmd_get_turn -ContestAICmd_get_turn: @ 8128AF0 - ldr r1, _08128B04 @ =gSharedMem + 0x192E4 - adds r0, r1, 0 - subs r0, 0xE0 - ldrb r0, [r0, 0x1] - strh r0, [r1, 0x18] - ldr r1, _08128B08 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08128B04: .4byte gSharedMem + 0x192E4 -_08128B08: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_turn - - thumb_func_start ContestAICmd_unk_02 -ContestAICmd_unk_02: @ 8128B0C - push {lr} - bl ContestAICmd_get_turn - ldr r0, _08128B3C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128B40 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08128B44 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128B48 - .align 2, 0 -_08128B3C: .4byte gSharedMem + 0x192E4 -_08128B40: .4byte gAIScriptPtr -_08128B44: - adds r0, r2, 0x5 - str r0, [r3] -_08128B48: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_02 - - thumb_func_start ContestAICmd_unk_03 -ContestAICmd_unk_03: @ 8128B4C - push {lr} - bl ContestAICmd_get_turn - ldr r0, _08128B7C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128B80 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08128B84 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128B88 - .align 2, 0 -_08128B7C: .4byte gSharedMem + 0x192E4 -_08128B80: .4byte gAIScriptPtr -_08128B84: - adds r0, r2, 0x5 - str r0, [r3] -_08128B88: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_03 - - thumb_func_start ContestAICmd_unk_04 -ContestAICmd_unk_04: @ 8128B8C - push {lr} - bl ContestAICmd_get_turn - ldr r0, _08128BBC @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128BC0 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08128BC4 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128BC8 - .align 2, 0 -_08128BBC: .4byte gSharedMem + 0x192E4 -_08128BC0: .4byte gAIScriptPtr -_08128BC4: - adds r0, r2, 0x5 - str r0, [r3] -_08128BC8: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_04 - - thumb_func_start ContestAICmd_unk_05 -ContestAICmd_unk_05: @ 8128BCC - push {lr} - bl ContestAICmd_get_turn - ldr r0, _08128BFC @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128C00 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _08128C04 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128C08 - .align 2, 0 -_08128BFC: .4byte gSharedMem + 0x192E4 -_08128C00: .4byte gAIScriptPtr -_08128C04: - adds r0, r2, 0x5 - str r0, [r3] -_08128C08: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_05 - - thumb_func_start ContestAICmd_get_excitement -ContestAICmd_get_excitement: @ 8128C0C - ldr r1, _08128C24 @ =gSharedMem + 0x192E4 - adds r0, r1, 0 - subs r0, 0xE0 - ldrb r0, [r0, 0x13] - lsls r0, 24 - asrs r0, 24 - strh r0, [r1, 0x18] - ldr r1, _08128C28 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08128C24: .4byte gSharedMem + 0x192E4 -_08128C28: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_excitement - - thumb_func_start ContestAICmd_unk_07 -ContestAICmd_unk_07: @ 8128C2C - push {lr} - bl ContestAICmd_get_excitement - ldr r0, _08128C5C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128C60 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08128C64 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128C68 - .align 2, 0 -_08128C5C: .4byte gSharedMem + 0x192E4 -_08128C60: .4byte gAIScriptPtr -_08128C64: - adds r0, r2, 0x5 - str r0, [r3] -_08128C68: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_07 - - thumb_func_start ContestAICmd_unk_08 -ContestAICmd_unk_08: @ 8128C6C - push {lr} - bl ContestAICmd_get_excitement - ldr r0, _08128C9C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128CA0 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08128CA4 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128CA8 - .align 2, 0 -_08128C9C: .4byte gSharedMem + 0x192E4 -_08128CA0: .4byte gAIScriptPtr -_08128CA4: - adds r0, r2, 0x5 - str r0, [r3] -_08128CA8: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_08 - - thumb_func_start ContestAICmd_unk_09 -ContestAICmd_unk_09: @ 8128CAC - push {lr} - bl ContestAICmd_get_excitement - ldr r0, _08128CDC @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128CE0 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08128CE4 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128CE8 - .align 2, 0 -_08128CDC: .4byte gSharedMem + 0x192E4 -_08128CE0: .4byte gAIScriptPtr -_08128CE4: - adds r0, r2, 0x5 - str r0, [r3] -_08128CE8: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_09 - - thumb_func_start ContestAICmd_unk_0A -ContestAICmd_unk_0A: @ 8128CEC - push {lr} - bl ContestAICmd_get_excitement - ldr r0, _08128D1C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128D20 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _08128D24 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128D28 - .align 2, 0 -_08128D1C: .4byte gSharedMem + 0x192E4 -_08128D20: .4byte gAIScriptPtr -_08128D24: - adds r0, r2, 0x5 - str r0, [r3] -_08128D28: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_0A - - thumb_func_start ContestAICmd_get_user_order -ContestAICmd_get_user_order: @ 8128D2C - ldr r1, _08128D48 @ =gSharedMem + 0x192E4 - adds r2, r1, 0 - adds r2, 0x41 - adds r0, r1, 0 - subs r0, 0x14 - ldrb r2, [r2] - adds r0, r2 - ldrb r0, [r0] - strh r0, [r1, 0x18] - ldr r1, _08128D4C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08128D48: .4byte gSharedMem + 0x192E4 -_08128D4C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_user_order - - thumb_func_start ContestAICmd_unk_0C -ContestAICmd_unk_0C: @ 8128D50 - push {lr} - bl ContestAICmd_get_user_order - ldr r0, _08128D80 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128D84 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08128D88 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128D8C - .align 2, 0 -_08128D80: .4byte gSharedMem + 0x192E4 -_08128D84: .4byte gAIScriptPtr -_08128D88: - adds r0, r2, 0x5 - str r0, [r3] -_08128D8C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_0C - - thumb_func_start ContestAICmd_unk_0D -ContestAICmd_unk_0D: @ 8128D90 - push {lr} - bl ContestAICmd_get_user_order - ldr r0, _08128DC0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128DC4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08128DC8 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128DCC - .align 2, 0 -_08128DC0: .4byte gSharedMem + 0x192E4 -_08128DC4: .4byte gAIScriptPtr -_08128DC8: - adds r0, r2, 0x5 - str r0, [r3] -_08128DCC: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_0D - - thumb_func_start ContestAICmd_unk_0E -ContestAICmd_unk_0E: @ 8128DD0 - push {lr} - bl ContestAICmd_get_user_order - ldr r0, _08128E00 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128E04 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08128E08 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128E0C - .align 2, 0 -_08128E00: .4byte gSharedMem + 0x192E4 -_08128E04: .4byte gAIScriptPtr -_08128E08: - adds r0, r2, 0x5 - str r0, [r3] -_08128E0C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_0E - - thumb_func_start ContestAICmd_unk_0F -ContestAICmd_unk_0F: @ 8128E10 - push {lr} - bl ContestAICmd_get_user_order - ldr r0, _08128E40 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128E44 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _08128E48 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128E4C - .align 2, 0 -_08128E40: .4byte gSharedMem + 0x192E4 -_08128E44: .4byte gAIScriptPtr -_08128E48: - adds r0, r2, 0x5 - str r0, [r3] -_08128E4C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_0F - - thumb_func_start ContestAICmd_get_user_condition_maybe -ContestAICmd_get_user_condition_maybe: @ 8128E50 - push {r4,lr} - ldr r4, _08128E88 @ =gSharedMem + 0x192E4 - adds r0, r4, 0 - adds r0, 0x41 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r1, r4, 0 - subs r1, 0x84 - adds r0, r1 - ldrb r0, [r0, 0xD] - lsls r0, 24 - asrs r0, 24 - movs r1, 0xA - bl __divsi3 - lsls r0, 24 - asrs r0, 24 - strh r0, [r4, 0x18] - ldr r1, _08128E8C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08128E88: .4byte gSharedMem + 0x192E4 -_08128E8C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_user_condition_maybe - - thumb_func_start ContestAICmd_unk_11 -ContestAICmd_unk_11: @ 8128E90 - push {lr} - bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128EC0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128EC4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08128EC8 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128ECC - .align 2, 0 -_08128EC0: .4byte gSharedMem + 0x192E4 -_08128EC4: .4byte gAIScriptPtr -_08128EC8: - adds r0, r2, 0x5 - str r0, [r3] -_08128ECC: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_11 - - thumb_func_start ContestAICmd_unk_12 -ContestAICmd_unk_12: @ 8128ED0 - push {lr} - bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128F00 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128F04 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08128F08 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128F0C - .align 2, 0 -_08128F00: .4byte gSharedMem + 0x192E4 -_08128F04: .4byte gAIScriptPtr -_08128F08: - adds r0, r2, 0x5 - str r0, [r3] -_08128F0C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_12 - - thumb_func_start ContestAICmd_unk_13 -ContestAICmd_unk_13: @ 8128F10 - push {lr} - bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128F40 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128F44 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08128F48 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128F4C - .align 2, 0 -_08128F40: .4byte gSharedMem + 0x192E4 -_08128F44: .4byte gAIScriptPtr -_08128F48: - adds r0, r2, 0x5 - str r0, [r3] -_08128F4C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_13 - - thumb_func_start ContestAICmd_unk_14 -ContestAICmd_unk_14: @ 8128F50 - push {lr} - bl ContestAICmd_get_user_condition_maybe - ldr r0, _08128F80 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08128F84 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _08128F88 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08128F8C - .align 2, 0 -_08128F80: .4byte gSharedMem + 0x192E4 -_08128F84: .4byte gAIScriptPtr -_08128F88: - adds r0, r2, 0x5 - str r0, [r3] -_08128F8C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_14 - thumb_func_start ContestAICmd_unk_15 ContestAICmd_unk_15: @ 8128F90 ldr r2, _08128FB4 @ =gSharedMem + 0x192E4 diff --git a/include/contest.h b/include/contest.h index a1d2ec9e0..32da9703a 100644 --- a/include/contest.h +++ b/include/contest.h @@ -78,7 +78,8 @@ struct ContestAIInfo { /*0x10*/ u8 unk10; /*0x11*/ u8 filler11[0x3]; // padding? /*0x14*/ u32 flags; - /*0x18*/ u8 filler18[0x28]; + /*0x18*/ u16 scriptResult; + /*0x1A*/ u8 filler1A[0x26]; /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; /*0x42*/ u8 filler42[0x2]; // padding? @@ -152,48 +153,48 @@ struct Contest struct ContestantStatus { - s16 appeal1; // move appeal? - s16 appeal2; // final appeal after end of turn, maybe? - s16 unk4; - u16 currMove; - u16 prevMove; - u8 moveCategory; - u8 unkB_0:2; - u8 unkB_2:2; - u8 moveRepeatCount:3; - u8 unkB_7:1; // used a one-time move? - u8 unkC_0:1; - u8 unkC_1:2; - s8 unkD; - u8 unkE; - u8 unkF; - u8 unk10_0:1; - u8 unk10_1:1; - u8 unk10_2:1; - u8 unk10_3:1; - u8 unk10_4:2; - u8 unk10_6:2; - u8 unk11_0:2; - u8 unk11_2:1; - u8 unk11_3:1; - u8 unk11_4:1; - u8 unk11_5:1; - u8 unk12; - u8 unk13; // status action? - u8 unk14; - u8 disappointedRepeat:1; - u8 unk15_1:1; - u8 unk15_2:1; - u8 unk15_3:1; - u8 unk15_4:1; - u8 unk15_5:1; - u8 unk15_6:1; - u8 unk16; - u8 unk17; - u8 unk18; - u8 unk19; // turn position - u8 attentionLevel; // How much the Pokemon "stood out" - u8 unk1B; + /*0x00*/ s16 appeal1; // move appeal? + /*0x02*/ s16 appeal2; // final appeal after end of turn, maybe? + /*0x04*/ s16 unk4; + /*0x06*/ u16 currMove; + /*0x08*/ u16 prevMove; + /*0x0A*/ u8 moveCategory; + /*0x0B*/ u8 unkB_0:2; + u8 unkB_2:2; + u8 moveRepeatCount:3; + u8 unkB_7:1; // used a one-time move? + /*0x0C*/ u8 unkC_0:1; + u8 unkC_1:2; + /*0x0D*/ s8 unkD; + /*0x0E*/ u8 unkE; + /*0x0F*/ u8 unkF; + /*0x10*/ u8 unk10_0:1; + u8 unk10_1:1; + u8 unk10_2:1; + u8 unk10_3:1; + u8 unk10_4:2; + u8 unk10_6:2; + /*0x11*/ u8 unk11_0:2; + u8 unk11_2:1; + u8 unk11_3:1; + u8 unk11_4:1; + u8 unk11_5:1; + /*0x12*/ u8 unk12; + /*0x13*/ u8 unk13; // status action? + /*0x14*/ u8 unk14; + /*0x15*/ u8 disappointedRepeat:1; + u8 unk15_1:1; + u8 unk15_2:1; + u8 unk15_3:1; + u8 unk15_4:1; + u8 unk15_5:1; + u8 unk15_6:1; + /*0x16*/ u8 unk16; + /*0x17*/ u8 unk17; + /*0x18*/ u8 unk18; + /*0x19*/ u8 unk19; // turn position + /*0x1A*/ u8 attentionLevel; // How much the Pokemon "stood out" + /*0x1B*/ u8 unk1B; }; struct UnknownContestStruct3 diff --git a/src/contest_ai.c b/src/contest_ai.c index 9dfa6c2b9..124ec6357 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -111,3 +111,201 @@ u8 sub_8128A7C(u8 var) return i; } + +void ContestAICmd_unk_00(void) +{ + s16 score = eContestAI->unk5[eContestAI->unk4] + (s8)gAIScriptPtr[1]; + + if (score > 255) + score = 255; + else if (score < 0) + score = 0; + + eContestAI->unk5[eContestAI->unk4] = score; + + gAIScriptPtr += 2; +} + +void ContestAICmd_get_turn(void) +{ + eContestAI->scriptResult = sContest.turnNumber; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_02(void) +{ + ContestAICmd_get_turn(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_03(void) +{ + ContestAICmd_get_turn(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_04(void) +{ + ContestAICmd_get_turn(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_05(void) +{ + ContestAICmd_get_turn(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_excitement(void) +{ + eContestAI->scriptResult = sContest.applauseLevel; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_07(void) +{ + ContestAICmd_get_excitement(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_08(void) +{ + ContestAICmd_get_excitement(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_09(void) +{ + ContestAICmd_get_excitement(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_0A(void) +{ + ContestAICmd_get_excitement(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_user_order(void) +{ + eContestAI->scriptResult = shared192D0.unk0[eContestAI->unk41]; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_0C(void) +{ + ContestAICmd_get_user_order(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_0D(void) +{ + ContestAICmd_get_user_order(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_0E(void) +{ + ContestAICmd_get_user_order(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_0F(void) +{ + ContestAICmd_get_user_order(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_user_condition_maybe(void) +{ + eContestAI->scriptResult = sContestantStatus[eContestAI->unk41].unkD / 10; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_11(void) +{ + ContestAICmd_get_user_condition_maybe(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_12(void) +{ + ContestAICmd_get_user_condition_maybe(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_13(void) +{ + ContestAICmd_get_user_condition_maybe(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_14(void) +{ + ContestAICmd_get_user_condition_maybe(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} -- cgit v1.2.3 From d6b0b3d62f80d97a8721cfe23b794ec068078d65 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Thu, 11 Jan 2018 18:30:41 -0500 Subject: un-hard code max item define --- src/field/item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/item.c b/src/field/item.c index 66d7d65df..6ff7a7cbe 100644 --- a/src/field/item.c +++ b/src/field/item.c @@ -571,7 +571,7 @@ void SwapRegisteredBike(void) static u16 SanitizeItemId(u16 itemId) { - if (itemId > 0x15C) + if (itemId >= ARRAY_COUNT(gItems)) return 0; else return itemId; -- cgit v1.2.3 From 2be2b22589de437ae5f53df8e380533958da9e70 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 12 Jan 2018 21:24:21 -0600 Subject: decompile battle_intro.s --- asm/battle_intro.s | 1667 ---------------------------------------- data/battle_anim_80CA710.s | 13 - include/battle_anim_80CA710.h | 2 +- include/data2.h | 3 +- include/ewram.h | 5 + ld_script.txt | 3 +- src/battle/anim/battle_intro.c | 480 ++++++++++++ src/scene/evolution_scene.c | 3 +- 8 files changed, 491 insertions(+), 1685 deletions(-) delete mode 100755 asm/battle_intro.s create mode 100644 src/battle/anim/battle_intro.c diff --git a/asm/battle_intro.s b/asm/battle_intro.s deleted file mode 100755 index 5b29f56a4..000000000 --- a/asm/battle_intro.s +++ /dev/null @@ -1,1667 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - @ intro - - thumb_func_start sub_80E43C0 -sub_80E43C0: @ 80E43C0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080E43D8 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E43E0 - ldr r0, _080E43DC @ =sub_80E4C34 - b _080E4408 - .align 2, 0 -_080E43D8: .4byte gBattleTypeFlags -_080E43DC: .4byte sub_80E4C34 -_080E43E0: - movs r0, 0x80 - lsls r0, 5 - ands r0, r1 - cmp r0, 0 - beq _080E4400 - ldr r0, _080E43F8 @ =gGameVersion - ldrb r0, [r0] - cmp r0, 0x2 - beq _080E4400 - movs r4, 0x3 - ldr r0, _080E43FC @ =task00_battle_intro_80BC6C8 - b _080E4408 - .align 2, 0 -_080E43F8: .4byte gGameVersion -_080E43FC: .4byte task00_battle_intro_80BC6C8 -_080E4400: - ldr r1, _080E4434 @ =gUnknown_083DB56C - lsls r0, r4, 2 - adds r0, r1 - ldr r0, [r0] -_080E4408: - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _080E4438 @ =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - movs r0, 0 - strh r0, [r1, 0x8] - strh r4, [r1, 0xA] - strh r0, [r1, 0xC] - strh r0, [r1, 0xE] - strh r0, [r1, 0x10] - strh r0, [r1, 0x12] - strh r0, [r1, 0x14] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E4434: .4byte gUnknown_083DB56C -_080E4438: .4byte gTasks - thumb_func_end sub_80E43C0 - - thumb_func_start sub_80E443C -sub_80E443C: @ 80E443C - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - ldr r0, _080E4474 @ =gBattle_BG1_X - movs r1, 0 - strh r1, [r0] - ldr r0, _080E4478 @ =gBattle_BG1_Y - strh r1, [r0] - ldr r0, _080E447C @ =gBattle_BG2_X - strh r1, [r0] - ldr r0, _080E4480 @ =gBattle_BG2_Y - strh r1, [r0] - ldr r0, _080E4484 @ =REG_BLDCNT - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - subs r0, 0xC - ldr r2, _080E4488 @ =0x00003f3f - adds r1, r2, 0 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - pop {r0} - bx r0 - .align 2, 0 -_080E4474: .4byte gBattle_BG1_X -_080E4478: .4byte gBattle_BG1_Y -_080E447C: .4byte gBattle_BG2_X -_080E4480: .4byte gBattle_BG2_Y -_080E4484: .4byte REG_BLDCNT -_080E4488: .4byte 0x00003f3f - thumb_func_end sub_80E443C - - thumb_func_start task_battle_intro_80BC47C -task_battle_intro_80BC47C: @ 80E448C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080E44C4 @ =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x6 - strh r0, [r1] - ldr r1, _080E44C8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - mov r8, r1 - cmp r0, 0x4 - bls _080E44B8 - b _080E46BE -_080E44B8: - lsls r0, 2 - ldr r1, _080E44CC @ =_080E44D0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E44C4: .4byte gBattle_BG1_X -_080E44C8: .4byte gTasks -_080E44CC: .4byte _080E44D0 - .align 2, 0 -_080E44D0: - .4byte _080E44E4 - .4byte _080E4514 - .4byte _080E4540 - .4byte _080E4588 - .4byte _080E46B8 -_080E44E4: - ldr r0, _080E44FC @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E4500 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - add r0, r8 - movs r1, 0x10 - b _080E450A - .align 2, 0 -_080E44FC: .4byte gBattleTypeFlags -_080E4500: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - add r0, r8 - movs r1, 0x1 -_080E450A: - strh r1, [r0, 0xC] - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080E46BE -_080E4514: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - mov r3, r8 - adds r1, r0, r3 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _080E452C - b _080E46BE -_080E452C: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - ldr r1, _080E453C @ =REG_WININ - movs r0, 0x3F - strh r0, [r1] - b _080E46BE - .align 2, 0 -_080E453C: .4byte REG_WININ -_080E4540: - ldr r1, _080E457C @ =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _080E4558 - b _080E46BE -_080E4558: - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - add r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - ldr r2, _080E4580 @ =gUnknown_02024DE8 - ldrh r1, [r2] - ldr r0, _080E4584 @ =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _080E46BE - .align 2, 0 -_080E457C: .4byte gBattle_WIN0V -_080E4580: .4byte gUnknown_02024DE8 -_080E4584: .4byte 0x0000fffe -_080E4588: - lsls r0, r4, 2 - adds r1, r0, r4 - lsls r1, 3 - mov r5, r8 - adds r2, r1, r5 - ldrh r3, [r2, 0xE] - movs r5, 0xE - ldrsh r1, [r2, r5] - mov r12, r0 - cmp r1, 0 - beq _080E45A4 - subs r0, r3, 0x1 - strh r0, [r2, 0xE] - b _080E45D2 -_080E45A4: - movs r1, 0xA - ldrsh r0, [r2, r1] - cmp r0, 0x1 - bne _080E45C4 - ldr r2, _080E45BC @ =gBattle_BG1_Y - ldrh r1, [r2] - ldr r0, _080E45C0 @ =0x0000ffb0 - cmp r1, r0 - beq _080E45D2 - subs r0, r1, 0x2 - b _080E45D0 - .align 2, 0 -_080E45BC: .4byte gBattle_BG1_Y -_080E45C0: .4byte 0x0000ffb0 -_080E45C4: - ldr r2, _080E4690 @ =gBattle_BG1_Y - ldrh r1, [r2] - ldr r0, _080E4694 @ =0x0000ffc8 - cmp r1, r0 - beq _080E45D2 - subs r0, r1, 0x1 -_080E45D0: - strh r0, [r2] -_080E45D2: - ldr r2, _080E4698 @ =gBattle_WIN0V - ldrh r1, [r2] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _080E45E6 - ldr r3, _080E469C @ =0xfffffc04 - adds r0, r1, r3 - strh r0, [r2] -_080E45E6: - mov r5, r12 - adds r0, r5, r4 - lsls r0, 3 - mov r2, r8 - adds r1, r0, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _080E45FE - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_080E45FE: - movs r3, 0 - ldr r5, _080E46A0 @ =gScanlineEffect - mov r9, r5 - ldr r7, _080E46A4 @ =gScanlineEffectRegBuffers - mov r6, r9 - adds r5, r1, 0 -_080E460A: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r5, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _080E460A - cmp r3, 0x9F - bgt _080E464E - ldr r7, _080E46A4 @ =gScanlineEffectRegBuffers - ldr r6, _080E46A0 @ =gScanlineEffect - ldr r1, _080E46A8 @ =gTasks - mov r2, r12 - adds r0, r2, r4 - lsls r0, 3 - adds r5, r0, r1 -_080E4634: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r5, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _080E4634 -_080E464E: - mov r3, r12 - adds r0, r3, r4 - lsls r0, 3 - mov r5, r8 - adds r1, r0, r5 - movs r0, 0xC - ldrsh r2, [r1, r0] - cmp r2, 0 - bne _080E46BE - movs r0, 0x3 - mov r3, r9 - strb r0, [r3, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - str r2, [sp] - ldr r1, _080E46AC @ =0x0600e000 - ldr r2, _080E46B0 @ =0x05000200 - mov r0, sp - bl CpuSet - ldr r1, _080E46B4 @ =REG_BG1CNT - movs r5, 0x9C - lsls r5, 8 - adds r0, r5, 0 - strh r0, [r1] - adds r1, 0x2 - movs r2, 0xBC - lsls r2, 7 - adds r0, r2, 0 - strh r0, [r1] - b _080E46BE - .align 2, 0 -_080E4690: .4byte gBattle_BG1_Y -_080E4694: .4byte 0x0000ffc8 -_080E4698: .4byte gBattle_WIN0V -_080E469C: .4byte 0xfffffc04 -_080E46A0: .4byte gScanlineEffect -_080E46A4: .4byte gScanlineEffectRegBuffers -_080E46A8: .4byte gTasks -_080E46AC: .4byte 0x0600e000 -_080E46B0: .4byte 0x05000200 -_080E46B4: .4byte REG_BG1CNT -_080E46B8: - adds r0, r4, 0 - bl sub_80E443C -_080E46BE: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end task_battle_intro_80BC47C - - thumb_func_start task00_battle_intro_80BC6C8 -task00_battle_intro_80BC6C8: @ 80E46CC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080E46F8 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r2, 0xA - ldrsh r0, [r0, r2] - adds r2, r1, 0 - cmp r0, 0x3 - beq _080E470C - cmp r0, 0x3 - bgt _080E46FC - cmp r0, 0x2 - beq _080E4700 - b _080E4714 - .align 2, 0 -_080E46F8: .4byte gTasks -_080E46FC: - cmp r0, 0x4 - bne _080E4714 -_080E4700: - ldr r1, _080E4708 @ =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x8 - b _080E4712 - .align 2, 0 -_080E4708: .4byte gBattle_BG1_X -_080E470C: - ldr r1, _080E4750 @ =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x6 -_080E4712: - strh r0, [r1] -_080E4714: - lsls r0, r5, 2 - adds r1, r0, r5 - lsls r1, 3 - adds r4, r1, r2 - movs r3, 0xA - ldrsh r1, [r4, r3] - adds r6, r0, 0 - cmp r1, 0x4 - bne _080E4778 - ldr r7, _080E4754 @ =gBattle_BG1_Y - ldrh r0, [r4, 0x14] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _080E473A - ldr r1, _080E4758 @ =0x000001ff - adds r0, r1 -_080E473A: - asrs r0, 9 - subs r0, 0x8 - strh r0, [r7] - ldrh r1, [r4, 0x14] - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r0, 0xB3 - bgt _080E475C - adds r0, r1, 0x4 - b _080E475E - .align 2, 0 -_080E4750: .4byte gBattle_BG1_X -_080E4754: .4byte gBattle_BG1_Y -_080E4758: .4byte 0x000001ff -_080E475C: - adds r0, r1, 0x6 -_080E475E: - strh r0, [r4, 0x14] - ldr r2, _080E4794 @ =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r3, r0, r2 - movs r4, 0x14 - ldrsh r1, [r3, r4] - movs r0, 0xB4 - lsls r0, 1 - cmp r1, r0 - bne _080E4778 - movs r0, 0 - strh r0, [r3, 0x14] -_080E4778: - adds r0, r6, r5 - lsls r0, 3 - adds r0, r2 - movs r1, 0x8 - ldrsh r0, [r0, r1] - cmp r0, 0x4 - bls _080E4788 - b _080E4996 -_080E4788: - lsls r0, 2 - ldr r1, _080E4798 @ =_080E479C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E4794: .4byte gTasks -_080E4798: .4byte _080E479C - .align 2, 0 -_080E479C: - .4byte _080E47B0 - .4byte _080E47E0 - .4byte _080E480C - .4byte _080E485C - .4byte _080E4990 -_080E47B0: - ldr r1, _080E47CC @ =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x10 - strh r3, [r2, 0x10] - ldr r0, _080E47D0 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E47D4 - strh r3, [r2, 0xC] - b _080E47D8 - .align 2, 0 -_080E47CC: .4byte gTasks -_080E47D0: .4byte gBattleTypeFlags -_080E47D4: - movs r0, 0x1 - strh r0, [r2, 0xC] -_080E47D8: - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _080E4996 -_080E47E0: - ldr r0, _080E4804 @ =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _080E47F6 - b _080E4996 -_080E47F6: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - ldr r1, _080E4808 @ =REG_WININ - movs r0, 0x3F - strh r0, [r1] - b _080E4996 - .align 2, 0 -_080E4804: .4byte gTasks -_080E4808: .4byte REG_WININ -_080E480C: - ldr r1, _080E484C @ =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _080E4824 - b _080E4996 -_080E4824: - ldr r0, _080E4850 @ =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - movs r0, 0x1 - strh r0, [r1, 0x12] - ldr r2, _080E4854 @ =gUnknown_02024DE8 - ldrh r1, [r2] - ldr r0, _080E4858 @ =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _080E4996 - .align 2, 0 -_080E484C: .4byte gBattle_WIN0V -_080E4850: .4byte gTasks -_080E4854: .4byte gUnknown_02024DE8 -_080E4858: .4byte 0x0000fffe -_080E485C: - adds r0, r6, r5 - lsls r0, 3 - adds r1, r0, r2 - ldrh r3, [r1, 0xE] - movs r4, 0xE - ldrsh r0, [r1, r4] - cmp r0, 0 - beq _080E4898 - subs r0, r3, 0x1 - strh r0, [r1, 0xE] - lsls r0, 16 - asrs r3, r0, 16 - cmp r3, 0 - bne _080E48B8 - ldr r1, _080E488C @ =REG_BLDCNT - ldr r4, _080E4890 @ =0x00001842 - adds r0, r4, 0 - strh r0, [r1] - adds r1, 0x2 - movs r0, 0xF - strh r0, [r1] - ldr r0, _080E4894 @ =REG_BLDY - strh r3, [r0] - b _080E48B8 - .align 2, 0 -_080E488C: .4byte REG_BLDCNT -_080E4890: .4byte 0x00001842 -_080E4894: .4byte REG_BLDY -_080E4898: - ldrh r3, [r1, 0x10] - movs r0, 0x1F - ands r0, r3 - cmp r0, 0 - beq _080E48B8 - ldrh r0, [r1, 0x12] - subs r0, 0x1 - strh r0, [r1, 0x12] - lsls r0, 16 - cmp r0, 0 - bne _080E48B8 - adds r0, r3, 0 - adds r0, 0xFF - strh r0, [r1, 0x10] - movs r0, 0x4 - strh r0, [r1, 0x12] -_080E48B8: - ldr r3, _080E4970 @ =gBattle_WIN0V - ldrh r1, [r3] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _080E48CC - ldr r4, _080E4974 @ =0xfffffc04 - adds r0, r1, r4 - strh r0, [r3] -_080E48CC: - adds r0, r6, r5 - lsls r0, 3 - adds r1, r0, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _080E48E0 - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_080E48E0: - movs r3, 0 - ldr r4, _080E4978 @ =gScanlineEffect - mov r8, r4 - ldr r0, _080E497C @ =gScanlineEffectRegBuffers - mov r12, r0 - mov r7, r8 - adds r4, r1, 0 -_080E48EE: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r12 - ldrh r0, [r4, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _080E48EE - cmp r3, 0x9F - bgt _080E4932 - ldr r1, _080E497C @ =gScanlineEffectRegBuffers - mov r12, r1 - ldr r7, _080E4978 @ =gScanlineEffect - ldr r1, _080E4980 @ =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r4, r0, r1 -_080E4918: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r12 - ldrh r0, [r4, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _080E4918 -_080E4932: - ldr r1, _080E4980 @ =gTasks - adds r0, r6, r5 - lsls r0, 3 - adds r1, r0, r1 - movs r3, 0xC - ldrsh r2, [r1, r3] - cmp r2, 0 - bne _080E4996 - movs r0, 0x3 - mov r4, r8 - strb r0, [r4, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - str r2, [sp] - ldr r1, _080E4984 @ =0x0600e000 - ldr r2, _080E4988 @ =0x05000200 - mov r0, sp - bl CpuSet - ldr r1, _080E498C @ =REG_BG1CNT - movs r2, 0x9C - lsls r2, 8 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - movs r3, 0xBC - lsls r3, 7 - adds r0, r3, 0 - strh r0, [r1] - b _080E4996 - .align 2, 0 -_080E4970: .4byte gBattle_WIN0V -_080E4974: .4byte 0xfffffc04 -_080E4978: .4byte gScanlineEffect -_080E497C: .4byte gScanlineEffectRegBuffers -_080E4980: .4byte gTasks -_080E4984: .4byte 0x0600e000 -_080E4988: .4byte 0x05000200 -_080E498C: .4byte REG_BG1CNT -_080E4990: - adds r0, r5, 0 - bl sub_80E443C -_080E4996: - ldr r0, _080E49B8 @ =gTasks - adds r1, r6, r5 - lsls r1, 3 - adds r2, r1, r0 - movs r4, 0x8 - ldrsh r0, [r2, r4] - cmp r0, 0x4 - beq _080E49AC - ldr r1, _080E49BC @ =REG_BLDALPHA - ldrh r0, [r2, 0x10] - strh r0, [r1] -_080E49AC: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E49B8: .4byte gTasks -_080E49BC: .4byte REG_BLDALPHA - thumb_func_end task00_battle_intro_80BC6C8 - - thumb_func_start task_battle_intro_anim -task_battle_intro_anim: @ 80E49C0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080E49F4 @ =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x8 - strh r0, [r1] - ldr r1, _080E49F8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r5, r1, 0 - cmp r0, 0x4 - bls _080E49EA - b _080E4C06 -_080E49EA: - lsls r0, 2 - ldr r1, _080E49FC @ =_080E4A00 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E49F4: .4byte gBattle_BG1_X -_080E49F8: .4byte gTasks -_080E49FC: .4byte _080E4A00 - .align 2, 0 -_080E4A00: - .4byte _080E4A14 - .4byte _080E4A6C - .4byte _080E4A9C - .4byte _080E4AEC - .4byte _080E4C00 -_080E4A14: - ldr r1, _080E4A48 @ =REG_BLDCNT - ldr r3, _080E4A4C @ =0x00001842 - adds r0, r3, 0 - strh r0, [r1] - ldr r0, _080E4A50 @ =REG_BLDALPHA - ldr r6, _080E4A54 @ =0x00000808 - adds r2, r6, 0 - strh r2, [r0] - adds r1, 0x4 - movs r0, 0 - strh r0, [r1] - ldr r1, _080E4A58 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r3, r0, r1 - strh r2, [r3, 0x10] - ldr r0, _080E4A5C @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080E4A60 - movs r0, 0x10 - b _080E4A62 - .align 2, 0 -_080E4A48: .4byte REG_BLDCNT -_080E4A4C: .4byte 0x00001842 -_080E4A50: .4byte REG_BLDALPHA -_080E4A54: .4byte 0x00000808 -_080E4A58: .4byte gTasks -_080E4A5C: .4byte gBattleTypeFlags -_080E4A60: - movs r0, 0x1 -_080E4A62: - strh r0, [r3, 0xC] - ldrh r0, [r3, 0x8] - adds r0, 0x1 - strh r0, [r3, 0x8] - b _080E4C06 -_080E4A6C: - ldr r0, _080E4A94 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _080E4A84 - b _080E4C06 -_080E4A84: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - ldr r1, _080E4A98 @ =REG_WININ - movs r0, 0x3F - strh r0, [r1] - b _080E4C06 - .align 2, 0 -_080E4A94: .4byte gTasks -_080E4A98: .4byte REG_WININ -_080E4A9C: - ldr r1, _080E4ADC @ =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _080E4AB4 - b _080E4C06 -_080E4AB4: - ldr r0, _080E4AE0 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - movs r0, 0x1 - strh r0, [r1, 0x12] - ldr r2, _080E4AE4 @ =gUnknown_02024DE8 - ldrh r1, [r2] - ldr r0, _080E4AE8 @ =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _080E4C06 - .align 2, 0 -_080E4ADC: .4byte gBattle_WIN0V -_080E4AE0: .4byte gTasks -_080E4AE4: .4byte gUnknown_02024DE8 -_080E4AE8: .4byte 0x0000fffe -_080E4AEC: - lsls r0, r4, 2 - adds r1, r0, r4 - lsls r1, 3 - adds r2, r1, r5 - ldrh r3, [r2, 0xE] - movs r6, 0xE - ldrsh r1, [r2, r6] - mov r12, r0 - cmp r1, 0 - beq _080E4B06 - subs r0, r3, 0x1 - strh r0, [r2, 0xE] - b _080E4B26 -_080E4B06: - ldrh r1, [r2, 0x10] - movs r0, 0xF - ands r0, r1 - cmp r0, 0 - beq _080E4B26 - ldrh r0, [r2, 0x12] - subs r0, 0x1 - strh r0, [r2, 0x12] - lsls r0, 16 - cmp r0, 0 - bne _080E4B26 - adds r0, r1, 0 - adds r0, 0xFF - strh r0, [r2, 0x10] - movs r0, 0x6 - strh r0, [r2, 0x12] -_080E4B26: - ldr r2, _080E4BE0 @ =gBattle_WIN0V - ldrh r1, [r2] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _080E4B3A - ldr r3, _080E4BE4 @ =0xfffffc04 - adds r0, r1, r3 - strh r0, [r2] -_080E4B3A: - mov r6, r12 - adds r0, r6, r4 - lsls r0, 3 - adds r1, r0, r5 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _080E4B50 - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_080E4B50: - movs r3, 0 - ldr r6, _080E4BE8 @ =gScanlineEffect - mov r8, r6 - ldr r7, _080E4BEC @ =gScanlineEffectRegBuffers - adds r5, r1, 0 -_080E4B5A: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r5, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _080E4B5A - cmp r3, 0x9F - bgt _080E4B9E - ldr r7, _080E4BEC @ =gScanlineEffectRegBuffers - ldr r6, _080E4BE8 @ =gScanlineEffect - ldr r1, _080E4BF0 @ =gTasks - mov r2, r12 - adds r0, r2, r4 - lsls r0, 3 - adds r5, r0, r1 -_080E4B84: - lsls r2, r3, 1 - ldrb r1, [r6, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - ldrh r0, [r5, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _080E4B84 -_080E4B9E: - ldr r1, _080E4BF0 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r1, r0, r1 - movs r3, 0xC - ldrsh r2, [r1, r3] - cmp r2, 0 - bne _080E4C06 - movs r0, 0x3 - mov r6, r8 - strb r0, [r6, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - str r2, [sp] - ldr r1, _080E4BF4 @ =0x0600e000 - ldr r2, _080E4BF8 @ =0x05000200 - mov r0, sp - bl CpuSet - ldr r1, _080E4BFC @ =REG_BG1CNT - movs r2, 0x9C - lsls r2, 8 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - movs r3, 0xBC - lsls r3, 7 - adds r0, r3, 0 - strh r0, [r1] - b _080E4C06 - .align 2, 0 -_080E4BE0: .4byte gBattle_WIN0V -_080E4BE4: .4byte 0xfffffc04 -_080E4BE8: .4byte gScanlineEffect -_080E4BEC: .4byte gScanlineEffectRegBuffers -_080E4BF0: .4byte gTasks -_080E4BF4: .4byte 0x0600e000 -_080E4BF8: .4byte 0x05000200 -_080E4BFC: .4byte REG_BG1CNT -_080E4C00: - adds r0, r4, 0 - bl sub_80E443C -_080E4C06: - ldr r0, _080E4C2C @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r2, r1, r0 - movs r6, 0x8 - ldrsh r0, [r2, r6] - cmp r0, 0x4 - beq _080E4C1E - ldr r1, _080E4C30 @ =REG_BLDALPHA - ldrh r0, [r2, 0x10] - strh r0, [r1] -_080E4C1E: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E4C2C: .4byte gTasks -_080E4C30: .4byte REG_BLDALPHA - thumb_func_end task_battle_intro_anim - - thumb_func_start sub_80E4C34 -sub_80E4C34: @ 80E4C34 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, _080E4C80 @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r7, r0, r1 - movs r1, 0x8 - ldrsh r0, [r7, r1] - cmp r0, 0x1 - ble _080E4CAA - movs r2, 0x10 - ldrsh r0, [r7, r2] - cmp r0, 0 - bne _080E4CAA - ldr r2, _080E4C84 @ =gBattle_BG1_X - ldrh r1, [r2] - movs r0, 0x80 - lsls r0, 8 - ands r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - bne _080E4C72 - cmp r1, 0x4F - bhi _080E4C8C -_080E4C72: - adds r0, r1, 0x3 - strh r0, [r2] - ldr r1, _080E4C88 @ =gBattle_BG2_X - ldrh r0, [r1] - subs r0, 0x3 - strh r0, [r1] - b _080E4CAA - .align 2, 0 -_080E4C80: .4byte gTasks -_080E4C84: .4byte gBattle_BG1_X -_080E4C88: .4byte gBattle_BG2_X -_080E4C8C: - str r5, [sp] - ldr r1, _080E4CCC @ =0x0600e000 - ldr r4, _080E4CD0 @ =0x05000200 - mov r0, sp - adds r2, r4, 0 - bl CpuSet - str r5, [sp, 0x4] - add r0, sp, 0x4 - ldr r1, _080E4CD4 @ =0x0600f000 - adds r2, r4, 0 - bl CpuSet - movs r0, 0x1 - strh r0, [r7, 0x10] -_080E4CAA: - ldr r0, _080E4CD8 @ =gTasks - lsls r2, r6, 2 - adds r1, r2, r6 - lsls r1, 3 - adds r1, r0 - movs r3, 0x8 - ldrsh r1, [r1, r3] - mov r12, r0 - adds r5, r2, 0 - cmp r1, 0x4 - bls _080E4CC2 - b _080E4EBA -_080E4CC2: - lsls r0, r1, 2 - ldr r1, _080E4CDC @ =_080E4CE0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E4CCC: .4byte 0x0600e000 -_080E4CD0: .4byte 0x05000200 -_080E4CD4: .4byte 0x0600f000 -_080E4CD8: .4byte gTasks -_080E4CDC: .4byte _080E4CE0 - .align 2, 0 -_080E4CE0: - .4byte _080E4CF4 - .4byte _080E4D06 - .4byte _080E4DA8 - .4byte _080E4DEC - .4byte _080E4EB4 -_080E4CF4: - adds r0, r5, r6 - lsls r0, 3 - add r0, r12 - movs r1, 0x10 - strh r1, [r0, 0xC] - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080E4EBA -_080E4D06: - adds r0, r5, r6 - lsls r0, 3 - mov r2, r12 - adds r1, r0, r2 - ldrh r0, [r1, 0xC] - subs r0, 0x1 - strh r0, [r1, 0xC] - lsls r0, 16 - cmp r0, 0 - beq _080E4D1C - b _080E4EBA -_080E4D1C: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - ldr r5, _080E4D8C @ =gSprites - ldr r4, _080E4D90 @ =gSharedMem - ldr r3, _080E4D94 @ =0x0001608a - adds r6, r4, r3 - ldrb r0, [r6] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - ldrb r3, [r1, 0x1] - movs r2, 0xD - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - movs r3, 0x8 - mov r8, r3 - mov r3, r8 - orrs r0, r3 - strb r0, [r1, 0x1] - ldrb r1, [r6] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r6, r5, 0 - adds r6, 0x1C - adds r0, r6 - ldr r3, _080E4D98 @ =sub_800FE20 - str r3, [r0] - ldr r0, _080E4D9C @ =0x0001608b - adds r4, r0 - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrb r1, [r0, 0x1] - ands r2, r1 - mov r1, r8 - orrs r2, r1 - strb r2, [r0, 0x1] - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - str r3, [r0] - ldr r1, _080E4DA0 @ =REG_WININ - movs r0, 0x3F - strh r0, [r1] - adds r1, 0x2 - ldr r2, _080E4DA4 @ =0x00003f06 - b _080E4E94 - .align 2, 0 -_080E4D8C: .4byte gSprites -_080E4D90: .4byte gSharedMem -_080E4D94: .4byte 0x0001608a -_080E4D98: .4byte sub_800FE20 -_080E4D9C: .4byte 0x0001608b -_080E4DA0: .4byte REG_WININ -_080E4DA4: .4byte 0x00003f06 -_080E4DA8: - ldr r1, _080E4DE0 @ =gBattle_WIN0V - ldrh r0, [r1] - subs r0, 0xFF - strh r0, [r1] - movs r1, 0xFF - lsls r1, 8 - ands r0, r1 - movs r1, 0xC0 - lsls r1, 6 - cmp r0, r1 - beq _080E4DC0 - b _080E4EBA -_080E4DC0: - adds r1, r5, r6 - lsls r1, 3 - add r1, r12 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - movs r0, 0xF0 - strh r0, [r1, 0xC] - movs r0, 0x20 - strh r0, [r1, 0xE] - ldr r2, _080E4DE4 @ =gUnknown_02024DE8 - ldrh r1, [r2] - ldr r0, _080E4DE8 @ =0x0000fffe - ands r0, r1 - strh r0, [r2] - b _080E4EBA - .align 2, 0 -_080E4DE0: .4byte gBattle_WIN0V -_080E4DE4: .4byte gUnknown_02024DE8 -_080E4DE8: .4byte 0x0000fffe -_080E4DEC: - ldr r2, _080E4E9C @ =gBattle_WIN0V - ldrh r1, [r2] - movs r0, 0xFF - lsls r0, 8 - ands r0, r1 - cmp r0, 0 - beq _080E4E00 - ldr r3, _080E4EA0 @ =0xfffffc04 - adds r0, r1, r3 - strh r0, [r2] -_080E4E00: - adds r0, r5, r6 - lsls r0, 3 - mov r2, r12 - adds r1, r0, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _080E4E16 - subs r0, r2, 0x2 - strh r0, [r1, 0xC] -_080E4E16: - movs r3, 0 - ldr r0, _080E4EA4 @ =gScanlineEffect - mov r9, r0 - ldr r2, _080E4EA8 @ =gScanlineEffectRegBuffers - mov r8, r2 - mov r7, r9 - adds r4, r1, 0 -_080E4E24: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r8 - ldrh r0, [r4, 0xC] - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x4F - ble _080E4E24 - cmp r3, 0x9F - bgt _080E4E68 - ldr r0, _080E4EA8 @ =gScanlineEffectRegBuffers - mov r8, r0 - ldr r7, _080E4EA4 @ =gScanlineEffect - ldr r1, _080E4EAC @ =gTasks - adds r0, r5, r6 - lsls r0, 3 - adds r4, r0, r1 -_080E4E4E: - lsls r2, r3, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - add r2, r8 - ldrh r0, [r4, 0xC] - negs r0, r0 - strh r0, [r2] - adds r3, 0x1 - cmp r3, 0x9F - ble _080E4E4E -_080E4E68: - adds r0, r5, r6 - lsls r0, 3 - mov r2, r12 - adds r1, r0, r2 - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - bne _080E4EBA - movs r0, 0x3 - mov r2, r9 - strb r0, [r2, 0x15] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - ldr r1, _080E4EB0 @ =REG_BG1CNT - movs r3, 0x9C - lsls r3, 8 - adds r0, r3, 0 - strh r0, [r1] - adds r1, 0x2 - movs r2, 0xBC - lsls r2, 7 -_080E4E94: - adds r0, r2, 0 - strh r0, [r1] - b _080E4EBA - .align 2, 0 -_080E4E9C: .4byte gBattle_WIN0V -_080E4EA0: .4byte 0xfffffc04 -_080E4EA4: .4byte gScanlineEffect -_080E4EA8: .4byte gScanlineEffectRegBuffers -_080E4EAC: .4byte gTasks -_080E4EB0: .4byte REG_BG1CNT -_080E4EB4: - adds r0, r6, 0 - bl sub_80E443C -_080E4EBA: - add sp, 0x8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80E4C34 - - thumb_func_start unref_sub_80E4EC8 -unref_sub_80E4EC8: @ 80E4EC8 - push {r4,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - movs r4, 0x80 - lsls r4, 7 - str r4, [sp] - movs r4, 0x1E - str r4, [sp, 0x4] - movs r4, 0x1 - str r4, [sp, 0x8] - bl sub_80E4EF8 - add sp, 0xC - pop {r4} - pop {r0} - bx r0 - thumb_func_end unref_sub_80E4EC8 - - thumb_func_start sub_80E4EF8 -sub_80E4EF8: @ 80E4EF8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r9, r1 - adds r4, r2, 0 - ldr r1, [sp, 0x24] - mov r8, r1 - ldr r1, [sp, 0x28] - ldr r5, [sp, 0x2C] - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - mov r7, r9 - lsls r7, 24 - adds r0, r7, 0 - lsrs r0, 24 - mov r9, r0 - lsls r4, 24 - lsrs r4, 24 - lsls r3, 24 - lsrs r3, 24 - str r3, [sp] - mov r3, r8 - lsls r3, 16 - mov r8, r3 - lsrs r6, r3, 16 - lsls r1, 24 - lsrs r7, r1, 24 - lsls r5, 24 - lsrs r5, 24 - adds r0, r4, 0 - bl GetBankByIdentity - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080E4FCC @ =0x040000d4 - ldr r1, _080E4FD0 @ =gUnknown_081FAF4C - lsls r4, 2 - adds r4, r1 - ldr r1, _080E4FD4 @ =gBattleMonForms - adds r0, r1 - ldrb r1, [r0] - lsls r1, 11 - ldr r0, [r4] - adds r0, r1 - str r0, [r2] - movs r0, 0xC0 - lsls r0, 19 - adds r6, r0 - str r6, [r2, 0x4] - ldr r0, _080E4FD8 @ =0x80000400 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - mov r0, r8 - lsrs r0, 21 - lsls r5, 9 - subs r5, r0, r5 - mov r0, r9 - adds r1, r0, 0 - adds r1, 0x8 - cmp r0, r1 - bge _080E4FBC - mov r9, r1 - mov r1, r10 - lsls r1, 1 - mov r8, r1 - lsls r7, 11 - mov r12, r7 -_080E4F86: - mov r2, r10 - adds r4, r2, 0 - adds r4, 0x8 - adds r1, r0, 0x1 - cmp r2, r4 - bge _080E4FB6 - ldr r3, [sp] - lsls r6, r3, 12 - lsls r0, 6 - movs r7, 0xC0 - lsls r7, 19 - adds r0, r7 - add r0, r12 - mov r7, r8 - adds r3, r7, r0 - subs r2, r4, r2 -_080E4FA6: - adds r0, r5, 0 - orrs r0, r6 - strh r0, [r3] - adds r5, 0x1 - adds r3, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _080E4FA6 -_080E4FB6: - adds r0, r1, 0 - cmp r0, r9 - blt _080E4F86 -_080E4FBC: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E4FCC: .4byte 0x040000d4 -_080E4FD0: .4byte gUnknown_081FAF4C -_080E4FD4: .4byte gBattleMonForms -_080E4FD8: .4byte 0x80000400 - thumb_func_end sub_80E4EF8 - - thumb_func_start unref_sub_80E4FDC -unref_sub_80E4FDC: @ 80E4FDC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - ldr r4, [sp, 0x24] - ldr r5, [sp, 0x28] - mov r8, r5 - ldr r5, [sp, 0x2C] - ldr r6, [sp, 0x30] - mov r9, r6 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - lsls r1, 24 - lsls r2, 24 - lsls r3, 24 - lsls r4, 24 - lsrs r4, 24 - mov r10, r4 - mov r7, r8 - lsls r7, 16 - lsrs r6, r7, 16 - lsls r5, 24 - lsrs r5, 24 - mov r0, r9 - lsls r0, 24 - mov r9, r0 - ldr r4, _080E509C @ =0x040000d4 - ldr r0, _080E50A0 @ =gUnknown_081FAF4C - lsrs r2, 22 - adds r2, r0 - lsrs r3, 13 - ldr r0, [r2] - adds r0, r3 - str r0, [r4] - movs r0, 0xC0 - lsls r0, 19 - adds r6, r0 - str r6, [r4, 0x4] - ldr r0, _080E50A4 @ =0x80000400 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - adds r2, r7, 0 - lsrs r2, 21 - mov r6, r9 - lsrs r6, 15 - subs r4, r2, r6 - lsrs r0, r1, 24 - adds r1, r0, 0 - adds r1, 0x8 - cmp r0, r1 - bge _080E508C - mov r9, r1 - mov r7, r12 - lsls r7, 1 - mov r8, r7 - lsls r5, 11 - str r5, [sp] -_080E5054: - mov r2, r12 - adds r3, r2, 0 - adds r3, 0x8 - adds r5, r0, 0x1 - cmp r2, r3 - bge _080E5086 - mov r1, r10 - lsls r6, r1, 12 - lsls r0, 6 - movs r7, 0xC0 - lsls r7, 19 - adds r0, r7 - ldr r1, [sp] - adds r0, r1, r0 - mov r7, r8 - adds r1, r7, r0 - subs r2, r3, r2 -_080E5076: - adds r0, r4, 0 - orrs r0, r6 - strh r0, [r1] - adds r4, 0x1 - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bne _080E5076 -_080E5086: - adds r0, r5, 0 - cmp r0, r9 - blt _080E5054 -_080E508C: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E509C: .4byte 0x040000d4 -_080E50A0: .4byte gUnknown_081FAF4C -_080E50A4: .4byte 0x80000400 - thumb_func_end unref_sub_80E4FDC - - .align 2, 0 @ Don't pad with nop. diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 8f62d92f6..562bd3090 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -4649,16 +4649,3 @@ gBattleAnimSpriteTemplate_83DB550:: @ 83DB550 gUnknown_083DB568:: @ 83DB568 @ seems to be a src element in a LoadPalette call. .2byte 0x7FFF - - .align 2 -gUnknown_083DB56C:: @ 83DB56C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task00_battle_intro_80BC6C8 - .4byte task00_battle_intro_80BC6C8 - .4byte task00_battle_intro_80BC6C8 - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_80BC47C - .4byte task_battle_intro_anim - .4byte task_battle_intro_anim diff --git a/include/battle_anim_80CA710.h b/include/battle_anim_80CA710.h index 14a6ca898..58521bfae 100644 --- a/include/battle_anim_80CA710.h +++ b/include/battle_anim_80CA710.h @@ -1,7 +1,7 @@ #ifndef GUARD_BATTLE_ANIM_80CA710_H #define GUARD_BATTLE_ANIM_80CA710_H -void sub_80E4EF8(int, int, int, int, u16, u8, int); +void sub_80E4EF8(u8, u8, u8, u8, u16, u8, u8); s16 sub_81174E0(s16 a); s16 sub_81174C4(s16 a, s16 b); diff --git a/include/data2.h b/include/data2.h index 9f6644714..2fe8d39f8 100644 --- a/include/data2.h +++ b/include/data2.h @@ -47,7 +47,8 @@ extern const u8 gUnknown_081F96C8[]; extern struct CompressedSpriteSheet gUnknown_081FAEA4; extern struct CompressedSpritePalette gUnknown_081FAEAC; extern const struct SpriteTemplate gSpriteTemplate_81FAF0C; -extern void *const gUnknown_081FAF4C[]; +extern u8 *const gUnknown_081FAF4C[]; +//extern u8 (*const gUnknown_081FAF4C[])[0x800]; extern struct BattleMove gBattleMoves[]; // data/graphics/trainers/front_pic_coords.inc diff --git a/include/ewram.h b/include/ewram.h index b07820090..809d4ff66 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -131,6 +131,11 @@ extern u8 gSharedMem[]; #define ewram16088_2 (*(u8 *)(gSharedMem + 0x16088)) #define ewram16089 (gSharedMem[0x16089]) #define ewram16089_2 (*(u8 *)(gSharedMem + 0x16089)) + +// src/battle/anim/battle_intro.c +#define ewram1608A gSharedMem[0x1608A] +#define ewram1608B gSharedMem[0x1608B] + #define ewram1608Carr(bank) (gSharedMem[0x1608C + bank]) #define EWRAM_1609D (gSharedMem[0x1609D]) #define ewram160A1 (gSharedMem[0x160A1]) diff --git a/ld_script.txt b/ld_script.txt index 54aca5b2b..6d4e0832f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -301,7 +301,7 @@ SECTIONS { asm/dark.o(.text); asm/ground.o(.text); asm/normal.o(.text); - asm/battle_intro.o(.text); + src/battle/anim/battle_intro.o(.text); src/field/bike.o(.text); src/easy_chat_1.o(.text); src/easy_chat_2.o(.text); @@ -574,6 +574,7 @@ SECTIONS { src/field/rotating_gate.o(.rodata); src/field/item_use.o(.rodata); data/battle_anim_80CA710.o(.rodata); + src/battle/anim/battle_intro.o(.rodata); src/field/bike.o(.rodata); src/easy_chat_1.o(.rodata); src/easy_chat_2.o(.rodata); diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c new file mode 100644 index 000000000..46ea292bd --- /dev/null +++ b/src/battle/anim/battle_intro.c @@ -0,0 +1,480 @@ +#include "global.h" +#include "constants/battle_constants.h" +#include "battle.h" +#include "battle_anim.h" +#include "battle_anim_80CA710.h" +#include "data2.h" +#include "ewram.h" +#include "main.h" +#include "rom_8077ABC.h" +#include "scanline_effect.h" +#include "task.h" +#include "trig.h" + +extern u16 gBattleTypeFlags; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_WIN0V; +extern u16 gUnknown_02024DE8; +extern u8 gBattleMonForms[]; + +extern void sub_800FE20(struct Sprite *); + +static void task_battle_intro_80BC47C(u8); +static void task00_battle_intro_80BC6C8(u8); +static void task_battle_intro_anim(u8); +static void sub_80E4C34(u8); + +static const TaskFunc gUnknown_083DB56C[] = +{ + task_battle_intro_80BC47C, + task_battle_intro_80BC47C, + task00_battle_intro_80BC6C8, + task00_battle_intro_80BC6C8, + task00_battle_intro_80BC6C8, + task_battle_intro_80BC47C, + task_battle_intro_80BC47C, + task_battle_intro_80BC47C, + task_battle_intro_anim, + task_battle_intro_anim, +}; + +void sub_80E43C0(u8 a) +{ + u8 taskId; + + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + taskId = CreateTask(sub_80E4C34, 0); + } + else if ((gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) && gGameVersion != VERSION_RUBY) + { + a = 3; + taskId = CreateTask(task00_battle_intro_80BC6C8, 0); + } + else + { + taskId = CreateTask(gUnknown_083DB56C[a], 0); + } + + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = a; + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = 0; + gTasks[taskId].data[4] = 0; + gTasks[taskId].data[5] = 0; + gTasks[taskId].data[6] = 0; +} + +static void sub_80E443C(u8 taskId) +{ + DestroyTask(taskId); + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + REG_BLDY = 0; + REG_WININ = WIN_RANGE(63, 63); + REG_WINOUT = WIN_RANGE(63, 63); +} + +static void task_battle_intro_80BC47C(u8 taskId) +{ + s32 i; + + gBattle_BG1_X += 6; + + switch (gTasks[taskId].data[0]) + { + case 0: + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + gTasks[taskId].data[2]--; + if (gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + REG_WININ = 0x3F; + } + break; + case 2: + gBattle_WIN0V -= 255; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = DISPLAY_WIDTH; + gTasks[taskId].data[3] = 32; + gUnknown_02024DE8 &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3] != 0) + { + gTasks[taskId].data[3]--; + } + else if (gTasks[taskId].data[1] == 1) + { + if (gBattle_BG1_Y != 0xFFB0) + gBattle_BG1_Y -= 2; + } + else + { + if (gBattle_BG1_Y != 0xFFC8) + gBattle_BG1_Y -= 1; + } + + if ((gBattle_WIN0V & 0xFF00) != 0) + gBattle_WIN0V -= 1020; + + if (gTasks[taskId].data[2] != 0) + gTasks[taskId].data[2] -= 2; + + // Set the x offset for the the top half of the screen. + for (i = 0; i < DISPLAY_HEIGHT / 2; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + // Set the x offset for the bottom half of the screen. + for (; i < DISPLAY_HEIGHT; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (gTasks[taskId].data[2] == 0) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)(VRAM + 0xE000), 0x800); + REG_BG1CNT = 0x9C00; + REG_BG2CNT = 0x5E00; + } + break; + case 4: + sub_80E443C(taskId); + break; + } +} + +static void task00_battle_intro_80BC6C8(u8 taskId) +{ + s32 i; + + switch (gTasks[taskId].data[1]) + { + case 2: + case 4: + gBattle_BG1_X += 8; + break; + case 3: + gBattle_BG1_X += 6; + break; + } + + if (gTasks[taskId].data[1] == 4) + { + gBattle_BG1_Y = Cos2(gTasks[taskId].data[6]) / 512 - 8; + if (gTasks[taskId].data[6] < 0xB4) + gTasks[taskId].data[6] += 4; + else + gTasks[taskId].data[6] += 6; + if (gTasks[taskId].data[6] == 0x168) + gTasks[taskId].data[6] = 0; + } + + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[4] = 16; + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + gTasks[taskId].data[2]--; + if (gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + REG_WININ = 0x3F; + } + break; + case 2: + gBattle_WIN0V -= 255; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gTasks[taskId].data[5] = 1; + gUnknown_02024DE8 &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3] != 0) + { + gTasks[taskId].data[3]--; + if (gTasks[taskId].data[3] == 0) + { + REG_BLDCNT = 0x1842; + REG_BLDALPHA = 0xF; + REG_BLDY = 0; + } + } + else + { + if ((gTasks[taskId].data[4] & 0x1F) && --gTasks[taskId].data[5] == 0) + { + gTasks[taskId].data[4] += 255; + gTasks[taskId].data[5] = 4; + } + } + + if ((gBattle_WIN0V & 0xFF00) != 0) + gBattle_WIN0V -= 1020; + + if (gTasks[taskId].data[2] != 0) + gTasks[taskId].data[2] -= 2; + + // Set the x offset for the the top half of the screen. + for (i = 0; i < DISPLAY_HEIGHT / 2; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + // Set the x offset for the bottom half of the screen. + for (; i < DISPLAY_HEIGHT; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (gTasks[taskId].data[2] == 0) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)(VRAM + 0xE000), 0x800); + REG_BG1CNT = 0x9C00; + REG_BG2CNT = 0x5E00; + } + break; + case 4: + sub_80E443C(taskId); + break; + } + + if (gTasks[taskId].data[0] != 4) + REG_BLDALPHA = gTasks[taskId].data[4]; +} + +static void task_battle_intro_anim(u8 taskId) +{ + s32 i; + + gBattle_BG1_X += 8; + + switch (gTasks[taskId].data[0]) + { + case 0: + REG_BLDCNT = 0x1842; + REG_BLDALPHA = 0x0808; + REG_BLDY = 0; + gTasks[taskId].data[4] = 0x0808; + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + } + else + { + gTasks[taskId].data[2] = 1; + gTasks[taskId].data[0]++; + } + break; + case 1: + gTasks[taskId].data[2]--; + if (gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + REG_WININ = 0x3F; + } + break; + case 2: + gBattle_WIN0V -= 255; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gTasks[taskId].data[5] = 1; + gUnknown_02024DE8 &= ~1; + } + break; + case 3: + if (gTasks[taskId].data[3] != 0) + { + gTasks[taskId].data[3]--; + } + else if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0) + { + gTasks[taskId].data[4] += 255; + gTasks[taskId].data[5] = 6; + } + + if ((gBattle_WIN0V & 0xFF00) != 0) + gBattle_WIN0V -= 1020; + + if (gTasks[taskId].data[2] != 0) + gTasks[taskId].data[2] -= 2; + + // Set the x offset for the the top half of the screen. + for (i = 0; i < DISPLAY_HEIGHT / 2; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + // Set the x offset for the bottom half of the screen. + for (; i < DISPLAY_HEIGHT; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (gTasks[taskId].data[2] == 0) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + CpuFill32(0, (void *)(VRAM + 0xE000), 0x800); + REG_BG1CNT = 0x9C00; + REG_BG2CNT = 0x5E00; + } + break; + case 4: + sub_80E443C(taskId); + break; + } + + if (gTasks[taskId].data[0] != 4) + REG_BLDALPHA = gTasks[taskId].data[4]; +} + +static void sub_80E4C34(u8 taskId) +{ + s32 i; + + if (gTasks[taskId].data[0] > 1 && gTasks[taskId].data[4] == 0) + { + if ((gBattle_BG1_X & 0x8000) || gBattle_BG1_X < 80) // hmm... + { + gBattle_BG1_X += 3; + gBattle_BG2_X -= 3; + } + else + { + CpuFill32(0, (void *)(VRAM + 0xE000), 0x800); + CpuFill32(0, (void *)(VRAM + 0xF000), 0x800); + gTasks[taskId].data[4] = 1; + } + } + + switch (gTasks[taskId].data[0]) + { + case 0: + gTasks[taskId].data[2] = 16; + gTasks[taskId].data[0]++; + break; + case 1: + gTasks[taskId].data[2]--; + if (gTasks[taskId].data[2] == 0) + { + gTasks[taskId].data[0]++; + gSprites[ewram1608A].oam.objMode = 2; + gSprites[ewram1608A].callback = sub_800FE20; + gSprites[ewram1608B].oam.objMode = 2; + gSprites[ewram1608B].callback = sub_800FE20; + REG_WININ = 0x3F; + REG_WINOUT = 0x3F06; + } + break; + case 2: + gBattle_WIN0V -= 255; + if ((gBattle_WIN0V & 0xFF00) == 0x3000) + { + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = 240; + gTasks[taskId].data[3] = 32; + gUnknown_02024DE8 &= ~1; + } + break; + case 3: + if ((gBattle_WIN0V & 0xFF00) != 0) + gBattle_WIN0V -= 1020; + + if (gTasks[taskId].data[2] != 0) + gTasks[taskId].data[2] -= 2; + + // Set the x offset for the the top half of the screen. + for (i = 0; i < DISPLAY_HEIGHT / 2; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; + // Set the x offset for the bottom half of the screen. + for (; i < DISPLAY_HEIGHT; i++) + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + + if (gTasks[taskId].data[2] == 0) + { + gScanlineEffect.state = 3; + gTasks[taskId].data[0]++; + REG_BG1CNT = 0x9C00; + REG_BG2CNT = 0x5E00; + } + break; + case 4: + sub_80E443C(taskId); + break; + } +} + +void unref_sub_80E4EC8(u8 a, u8 b, u8 c, u8 d) +{ + sub_80E4EF8(a, b, c, d, 0x4000, 30, 1); +} + +// draws some 8x8 tilemap +void sub_80E4EF8(u8 left, u8 top, u8 c, u8 paletteNum, u16 e, u8 bgMap, u8 g) +{ + u32 tileNum; + s32 x; + s32 y; + u8 bank = GetBankByIdentity(c); + + DmaCopy16(3, gUnknown_081FAF4C[c] + gBattleMonForms[bank] * 0x800, (void *)(VRAM + e), 0x800); + tileNum = e / 32 - g * 512; + for (y = top; y < top + 8; y++) + { + for (x = left; x < left + 8; x++) + { + *(u16 *)(VRAM + x * 2 + bgMap * 0x800 + y * 64) = tileNum | (paletteNum << 12); + tileNum++; + } + } +} + +void unref_sub_80E4FDC(u8 left, u8 top, u8 c, u8 form, u8 paletteNum, u16 f, u8 bgMap, u8 h) +{ + u32 tileNum; + s32 x; + s32 y; + + DmaCopy16(3, gUnknown_081FAF4C[c] + form * 0x800, (void *)(VRAM + f), 0x800); + tileNum = f / 32 - h * 512; + for (y = top; y < top + 8; y++) + { + for (x = left; x < left + 8; x++) + { + *(u16 *)(VRAM + x * 2 + bgMap * 0x800 + y * 64) = tileNum | (paletteNum << 12); + tileNum++; + } + } +} diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 53eb2f1e8..697806ee1 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -88,8 +88,7 @@ extern u8 gBattleCommunication[]; extern const u8 BattleText_StartEvo[]; extern const u8 BattleText_FinishEvo[]; extern const u8 BattleText_StopEvo[]; -extern void * const gUnknown_081FAF4C[]; -extern const u8* const gBattleStringsTable[]; +extern const u8 *const gBattleStringsTable[]; // this file's functions static void Task_EvolutionScene(u8 taskID); -- cgit v1.2.3 From e33a9b2b535b401a47455065dd4cb9364ed9c9f7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 12 Jan 2018 22:48:47 -0500 Subject: up to ContestAICmd_unk_2C --- asm/contest_ai.s | 848 ------------------------------------------------------ include/contest.h | 1 + src/contest_ai.c | 223 ++++++++++++++ 3 files changed, 224 insertions(+), 848 deletions(-) diff --git a/asm/contest_ai.s b/asm/contest_ai.s index a0255dff7..566f9c0ab 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -5,854 +5,6 @@ .text - thumb_func_start ContestAICmd_unk_15 -ContestAICmd_unk_15: @ 8128F90 - ldr r2, _08128FB4 @ =gSharedMem + 0x192E4 - adds r0, r2, 0 - adds r0, 0x41 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r1, r2, 0 - subs r1, 0x84 - adds r0, r1 - ldrh r0, [r0, 0x4] - strh r0, [r2, 0x18] - ldr r1, _08128FB8 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08128FB4: .4byte gSharedMem + 0x192E4 -_08128FB8: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_15 - - thumb_func_start ContestAICmd_unk_16 -ContestAICmd_unk_16: @ 8128FBC - push {r4,r5,lr} - bl ContestAICmd_unk_15 - ldr r2, _08128FF4 @ =gSharedMem + 0x192E4 - ldr r4, _08128FF8 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - bge _08128FFC - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _08129000 - .align 2, 0 -_08128FF4: .4byte gSharedMem + 0x192E4 -_08128FF8: .4byte gAIScriptPtr -_08128FFC: - adds r0, r3, 0x6 - str r0, [r4] -_08129000: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_16 - - thumb_func_start ContestAICmd_unk_17 -ContestAICmd_unk_17: @ 8129008 - push {r4,r5,lr} - bl ContestAICmd_unk_15 - ldr r2, _08129040 @ =gSharedMem + 0x192E4 - ldr r4, _08129044 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - ble _08129048 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812904C - .align 2, 0 -_08129040: .4byte gSharedMem + 0x192E4 -_08129044: .4byte gAIScriptPtr -_08129048: - adds r0, r3, 0x6 - str r0, [r4] -_0812904C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_17 - - thumb_func_start ContestAICmd_unk_18 -ContestAICmd_unk_18: @ 8129054 - push {r4,r5,lr} - bl ContestAICmd_unk_15 - ldr r2, _0812908C @ =gSharedMem + 0x192E4 - ldr r4, _08129090 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - bne _08129094 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _08129098 - .align 2, 0 -_0812908C: .4byte gSharedMem + 0x192E4 -_08129090: .4byte gAIScriptPtr -_08129094: - adds r0, r3, 0x6 - str r0, [r4] -_08129098: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_18 - - thumb_func_start ContestAICmd_unk_19 -ContestAICmd_unk_19: @ 81290A0 - push {r4,r5,lr} - bl ContestAICmd_unk_15 - ldr r2, _081290D8 @ =gSharedMem + 0x192E4 - ldr r4, _081290DC @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - beq _081290E0 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _081290E4 - .align 2, 0 -_081290D8: .4byte gSharedMem + 0x192E4 -_081290DC: .4byte gAIScriptPtr -_081290E0: - adds r0, r3, 0x6 - str r0, [r4] -_081290E4: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_19 - - thumb_func_start ContestAICmd_unk_1A -ContestAICmd_unk_1A: @ 81290EC - ldr r2, _08129108 @ =gSharedMem + 0x192E4 - ldr r1, _0812910C @ =gUnknown_02038670 - adds r0, r2, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2, 0x18] - ldr r1, _08129110 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08129108: .4byte gSharedMem + 0x192E4 -_0812910C: .4byte gUnknown_02038670 -_08129110: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_1A - - thumb_func_start ContestAICmd_unk_1B -ContestAICmd_unk_1B: @ 8129114 - push {r4,r5,lr} - bl ContestAICmd_unk_1A - ldr r2, _0812914C @ =gSharedMem + 0x192E4 - ldr r4, _08129150 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - bge _08129154 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _08129158 - .align 2, 0 -_0812914C: .4byte gSharedMem + 0x192E4 -_08129150: .4byte gAIScriptPtr -_08129154: - adds r0, r3, 0x6 - str r0, [r4] -_08129158: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_1B - - thumb_func_start ContestAICmd_unk_1C -ContestAICmd_unk_1C: @ 8129160 - push {r4,r5,lr} - bl ContestAICmd_unk_1A - ldr r2, _08129198 @ =gSharedMem + 0x192E4 - ldr r4, _0812919C @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - ble _081291A0 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _081291A4 - .align 2, 0 -_08129198: .4byte gSharedMem + 0x192E4 -_0812919C: .4byte gAIScriptPtr -_081291A0: - adds r0, r3, 0x6 - str r0, [r4] -_081291A4: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_1C - - thumb_func_start ContestAICmd_unk_1D -ContestAICmd_unk_1D: @ 81291AC - push {r4,r5,lr} - bl ContestAICmd_unk_1A - ldr r2, _081291E4 @ =gSharedMem + 0x192E4 - ldr r4, _081291E8 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - bne _081291EC - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _081291F0 - .align 2, 0 -_081291E4: .4byte gSharedMem + 0x192E4 -_081291E8: .4byte gAIScriptPtr -_081291EC: - adds r0, r3, 0x6 - str r0, [r4] -_081291F0: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_1D - - thumb_func_start ContestAICmd_unk_1E -ContestAICmd_unk_1E: @ 81291F8 - push {r4,r5,lr} - bl ContestAICmd_unk_1A - ldr r2, _08129230 @ =gSharedMem + 0x192E4 - ldr r4, _08129234 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3] - ldrb r0, [r3, 0x1] - lsls r0, 8 - orrs r1, r0 - movs r5, 0x18 - ldrsh r0, [r2, r5] - lsls r1, 16 - asrs r1, 16 - cmp r0, r1 - beq _08129238 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812923C - .align 2, 0 -_08129230: .4byte gSharedMem + 0x192E4 -_08129234: .4byte gAIScriptPtr -_08129238: - adds r0, r3, 0x6 - str r0, [r4] -_0812923C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_1E - - thumb_func_start ContestAICmd_get_contest_type -ContestAICmd_get_contest_type: @ 8129244 - ldr r1, _08129258 @ =gSharedMem + 0x192E4 - ldr r0, _0812925C @ =gSpecialVar_ContestCategory - ldrh r0, [r0] - strh r0, [r1, 0x18] - ldr r1, _08129260 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08129258: .4byte gSharedMem + 0x192E4 -_0812925C: .4byte gSpecialVar_ContestCategory -_08129260: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_contest_type - - thumb_func_start ContestAICmd_unk_20 -ContestAICmd_unk_20: @ 8129264 - push {lr} - bl ContestAICmd_get_contest_type - ldr r0, _08129294 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129298 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _0812929C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081292A0 - .align 2, 0 -_08129294: .4byte gSharedMem + 0x192E4 -_08129298: .4byte gAIScriptPtr -_0812929C: - adds r0, r2, 0x5 - str r0, [r3] -_081292A0: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_20 - - thumb_func_start ContestAICmd_unk_21 -ContestAICmd_unk_21: @ 81292A4 - push {lr} - bl ContestAICmd_get_contest_type - ldr r0, _081292D4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _081292D8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _081292DC - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081292E0 - .align 2, 0 -_081292D4: .4byte gSharedMem + 0x192E4 -_081292D8: .4byte gAIScriptPtr -_081292DC: - adds r0, r2, 0x5 - str r0, [r3] -_081292E0: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_21 - - thumb_func_start ContestAICmd_get_move_excitement -ContestAICmd_get_move_excitement: @ 81292E4 - push {r4,lr} - ldr r2, _08129318 @ =gContestMons - ldr r4, _0812931C @ =gSharedMem + 0x192E4 - ldrb r1, [r4, 0x4] - lsls r1, 1 - adds r0, r4, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r2, 0x1E - adds r1, r2 - ldrh r0, [r1] - bl Contest_GetMoveExcitement - lsls r0, 24 - asrs r0, 24 - strh r0, [r4, 0x18] - ldr r1, _08129320 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08129318: .4byte gContestMons -_0812931C: .4byte gSharedMem + 0x192E4 -_08129320: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_move_excitement - - thumb_func_start ContestAICmd_unk_23 -ContestAICmd_unk_23: @ 8129324 - push {r4,lr} - bl ContestAICmd_get_move_excitement - ldr r0, _08129354 @ =gSharedMem + 0x192E4 - ldr r3, _08129358 @ =gAIScriptPtr - ldr r2, [r3] - movs r4, 0x18 - ldrsh r1, [r0, r4] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - bge _0812935C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129360 - .align 2, 0 -_08129354: .4byte gSharedMem + 0x192E4 -_08129358: .4byte gAIScriptPtr -_0812935C: - adds r0, r2, 0x5 - str r0, [r3] -_08129360: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_23 - - thumb_func_start ContestAICmd_unk_24 -ContestAICmd_unk_24: @ 8129368 - push {r4,lr} - bl ContestAICmd_get_move_excitement - ldr r0, _08129398 @ =gSharedMem + 0x192E4 - ldr r3, _0812939C @ =gAIScriptPtr - ldr r2, [r3] - movs r4, 0x18 - ldrsh r1, [r0, r4] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - ble _081293A0 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081293A4 - .align 2, 0 -_08129398: .4byte gSharedMem + 0x192E4 -_0812939C: .4byte gAIScriptPtr -_081293A0: - adds r0, r2, 0x5 - str r0, [r3] -_081293A4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_24 - - thumb_func_start ContestAICmd_unk_25 -ContestAICmd_unk_25: @ 81293AC - push {r4,lr} - bl ContestAICmd_get_move_excitement - ldr r0, _081293DC @ =gSharedMem + 0x192E4 - ldr r3, _081293E0 @ =gAIScriptPtr - ldr r2, [r3] - movs r4, 0x18 - ldrsh r1, [r0, r4] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - bne _081293E4 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081293E8 - .align 2, 0 -_081293DC: .4byte gSharedMem + 0x192E4 -_081293E0: .4byte gAIScriptPtr -_081293E4: - adds r0, r2, 0x5 - str r0, [r3] -_081293E8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_25 - - thumb_func_start ContestAICmd_unk_26 -ContestAICmd_unk_26: @ 81293F0 - push {r4,lr} - bl ContestAICmd_get_move_excitement - ldr r0, _08129420 @ =gSharedMem + 0x192E4 - ldr r3, _08129424 @ =gAIScriptPtr - ldr r2, [r3] - movs r4, 0x18 - ldrsh r1, [r0, r4] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r1, r0 - beq _08129428 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812942C - .align 2, 0 -_08129420: .4byte gSharedMem + 0x192E4 -_08129424: .4byte gAIScriptPtr -_08129428: - adds r0, r2, 0x5 - str r0, [r3] -_0812942C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_26 - - thumb_func_start ContestAICmd_get_move_effect -ContestAICmd_get_move_effect: @ 8129434 - ldr r2, _08129460 @ =gContestMons - ldr r3, _08129464 @ =gSharedMem + 0x192E4 - ldrb r1, [r3, 0x4] - lsls r1, 1 - adds r0, r3, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r2, 0x1E - adds r1, r2 - ldrh r0, [r1] - ldr r1, _08129468 @ =gContestMoves - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0] - strh r0, [r3, 0x18] - ldr r1, _0812946C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08129460: .4byte gContestMons -_08129464: .4byte gSharedMem + 0x192E4 -_08129468: .4byte gContestMoves -_0812946C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_move_effect - - thumb_func_start ContestAICmd_unk_28 -ContestAICmd_unk_28: @ 8129470 - push {lr} - bl ContestAICmd_get_move_effect - ldr r0, _081294A0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _081294A4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _081294A8 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081294AC - .align 2, 0 -_081294A0: .4byte gSharedMem + 0x192E4 -_081294A4: .4byte gAIScriptPtr -_081294A8: - adds r0, r2, 0x5 - str r0, [r3] -_081294AC: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_28 - - thumb_func_start ContestAICmd_unk_29 -ContestAICmd_unk_29: @ 81294B0 - push {lr} - bl ContestAICmd_get_move_effect - ldr r0, _081294E0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _081294E4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _081294E8 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081294EC - .align 2, 0 -_081294E0: .4byte gSharedMem + 0x192E4 -_081294E4: .4byte gAIScriptPtr -_081294E8: - adds r0, r2, 0x5 - str r0, [r3] -_081294EC: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_29 - - thumb_func_start ContestAICmd_get_move_effect_type -ContestAICmd_get_move_effect_type: @ 81294F0 - ldr r2, _08129524 @ =gContestMons - ldr r3, _08129528 @ =gSharedMem + 0x192E4 - ldrb r1, [r3, 0x4] - lsls r1, 1 - adds r0, r3, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r2, 0x1E - adds r1, r2 - ldrh r0, [r1] - ldr r2, _0812952C @ =gContestEffects - ldr r1, _08129530 @ =gContestMoves - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0] - strh r0, [r3, 0x18] - ldr r1, _08129534 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - bx lr - .align 2, 0 -_08129524: .4byte gContestMons -_08129528: .4byte gSharedMem + 0x192E4 -_0812952C: .4byte gContestEffects -_08129530: .4byte gContestMoves -_08129534: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_move_effect_type - - thumb_func_start ContestAICmd_unk_2B -ContestAICmd_unk_2B: @ 8129538 - push {lr} - bl ContestAICmd_get_move_effect_type - ldr r0, _08129568 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812956C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08129570 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129574 - .align 2, 0 -_08129568: .4byte gSharedMem + 0x192E4 -_0812956C: .4byte gAIScriptPtr -_08129570: - adds r0, r2, 0x5 - str r0, [r3] -_08129574: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_2B - - thumb_func_start ContestAICmd_unk_2C -ContestAICmd_unk_2C: @ 8129578 - push {lr} - bl ContestAICmd_get_move_effect_type - ldr r0, _081295A8 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _081295AC @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _081295B0 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081295B4 - .align 2, 0 -_081295A8: .4byte gSharedMem + 0x192E4 -_081295AC: .4byte gAIScriptPtr -_081295B0: - adds r0, r2, 0x5 - str r0, [r3] -_081295B4: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_2C - thumb_func_start ContestAICmd_check_move_has_highest_appeal ContestAICmd_check_move_has_highest_appeal: @ 81295B8 push {r4-r7,lr} diff --git a/include/contest.h b/include/contest.h index 32da9703a..9a211bbf5 100644 --- a/include/contest.h +++ b/include/contest.h @@ -104,6 +104,7 @@ void sub_80B0F28(u8); bool8 Contest_SaveWinner(u8); u8 sub_80B2C4C(u8, u8); void Contest_ResetWinners(void); +s8 Contest_GetMoveExcitement(u16); // Contest Shared EWRAM diff --git a/src/contest_ai.c b/src/contest_ai.c index 124ec6357..3ddac5550 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -11,6 +11,9 @@ enum ContestAI_DoNotProcess }; +extern s16 gUnknown_02038670[]; +extern u16 gSpecialVar_ContestCategory; + extern u8 *gAIScriptPtr; extern u8 *gContestAIs[]; @@ -309,3 +312,223 @@ void ContestAICmd_unk_14(void) else gAIScriptPtr += 5; } + +void ContestAICmd_unk_15(void) +{ + eContestAI->scriptResult = sContestantStatus[eContestAI->unk41].unk4; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_16(void) +{ + ContestAICmd_unk_15(); + + if((s16)eContestAI->scriptResult < (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_17(void) +{ + ContestAICmd_unk_15(); + + if((s16)eContestAI->scriptResult > (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_18(void) +{ + ContestAICmd_unk_15(); + + if((s16)eContestAI->scriptResult == (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_19(void) +{ + ContestAICmd_unk_15(); + + if((s16)eContestAI->scriptResult != (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_1A(void) +{ + eContestAI->scriptResult = gUnknown_02038670[eContestAI->unk41]; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_1B(void) +{ + ContestAICmd_unk_1A(); + + if((s16)eContestAI->scriptResult < (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_1C(void) +{ + ContestAICmd_unk_1A(); + + if((s16)eContestAI->scriptResult > (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_1D(void) +{ + ContestAICmd_unk_1A(); + + if((s16)eContestAI->scriptResult == (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_1E(void) +{ + ContestAICmd_unk_1A(); + + if((s16)eContestAI->scriptResult != (s16)T1_READ_16(gAIScriptPtr + 0)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_get_contest_type(void) +{ + eContestAI->scriptResult = gSpecialVar_ContestCategory; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_20(void) +{ + ContestAICmd_get_contest_type(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_21(void) +{ + ContestAICmd_get_contest_type(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_move_excitement(void) +{ + eContestAI->scriptResult = Contest_GetMoveExcitement(gContestMons[eContestAI->unk41].moves[eContestAI->unk4]); + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_23(void) +{ + ContestAICmd_get_move_excitement(); + + if((s16)eContestAI->scriptResult < (s8)gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_24(void) +{ + ContestAICmd_get_move_excitement(); + + if((s16)eContestAI->scriptResult > (s8)gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_25(void) +{ + ContestAICmd_get_move_excitement(); + + if((s16)eContestAI->scriptResult == (s8)gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_26(void) +{ + ContestAICmd_get_move_excitement(); + + if((s16)eContestAI->scriptResult != (s8)gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_move_effect(void) +{ + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + eContestAI->scriptResult = gContestMoves[move].effect; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_28(void) +{ + ContestAICmd_get_move_effect(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_29(void) +{ + ContestAICmd_get_move_effect(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_move_effect_type(void) +{ + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + eContestAI->scriptResult = gContestEffects[gContestMoves[move].effect].effectType; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_2B(void) +{ + ContestAICmd_get_move_effect_type(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_2C(void) +{ + ContestAICmd_get_move_effect_type(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} -- cgit v1.2.3 From d96095eacb5fd813b06598f4f5f7b6c9eb4f4530 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 13 Jan 2018 00:31:36 -0500 Subject: Fix broken builds after running make without tools installed. The culprit is the .ld file recipes, which create the file even if the command failed. These could be fixed on their own, but this way prevents it from happening again later. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 8be7d896a..13c91f71d 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,8 @@ endif .SUFFIXES: # Don't delete intermediate files .SECONDARY: +# Delete files that weren't built properly +.DELETE_ON_ERROR: # Create build subdirectories $(shell mkdir -p $(addprefix $(BUILD_DIR)/, $(SUBDIRS))) -- cgit v1.2.3 From 39575a7e6c15bc0d69f990fe1b9c3492f684c15e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 13 Jan 2018 01:11:13 -0500 Subject: up to ContestAICmd_unk_3F --- asm/contest_ai.s | 765 ------------------------------------------------------- src/contest_ai.c | 212 +++++++++++++++ 2 files changed, 212 insertions(+), 765 deletions(-) diff --git a/asm/contest_ai.s b/asm/contest_ai.s index 566f9c0ab..e659b4776 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -5,771 +5,6 @@ .text - thumb_func_start ContestAICmd_check_move_has_highest_appeal -ContestAICmd_check_move_has_highest_appeal: @ 81295B8 - push {r4-r7,lr} - ldr r2, _08129610 @ =gContestMons - ldr r3, _08129614 @ =gSharedMem + 0x192E4 - ldrb r0, [r3, 0x4] - lsls r0, 1 - adds r1, r3, 0 - adds r1, 0x41 - ldrb r1, [r1] - lsls r1, 6 - adds r0, r1 - adds r2, 0x1E - adds r0, r2 - ldrh r0, [r0] - ldr r4, _08129618 @ =gContestEffects - ldr r5, _0812961C @ =gContestMoves - lsls r0, 3 - adds r0, r5 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r4 - ldrb r7, [r0, 0x1] - movs r6, 0 - ldr r0, _08129620 @ =gAIScriptPtr - mov r12, r0 - adds r1, r2 -_081295EA: - ldrh r0, [r1] - cmp r0, 0 - beq _08129600 - lsls r0, 3 - adds r0, r5 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x1] - cmp r7, r0 - bcc _08129608 -_08129600: - adds r1, 0x2 - adds r6, 0x1 - cmp r6, 0x3 - ble _081295EA -_08129608: - cmp r6, 0x4 - bne _08129624 - movs r0, 0x1 - b _08129626 - .align 2, 0 -_08129610: .4byte gContestMons -_08129614: .4byte gSharedMem + 0x192E4 -_08129618: .4byte gContestEffects -_0812961C: .4byte gContestMoves -_08129620: .4byte gAIScriptPtr -_08129624: - movs r0, 0 -_08129626: - strh r0, [r3, 0x18] - mov r1, r12 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_check_move_has_highest_appeal - - thumb_func_start ContestAICmd_unk_2E -ContestAICmd_unk_2E: @ 8129638 - push {lr} - bl ContestAICmd_check_move_has_highest_appeal - ldr r0, _08129664 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0812966C - ldr r3, _08129668 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129674 - .align 2, 0 -_08129664: .4byte gSharedMem + 0x192E4 -_08129668: .4byte gAIScriptPtr -_0812966C: - ldr r1, _08129678 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_08129674: - pop {r0} - bx r0 - .align 2, 0 -_08129678: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_2E - - thumb_func_start ContestAICmd_unk_2F -ContestAICmd_unk_2F: @ 812967C - push {r4-r7,lr} - ldr r2, _081296D4 @ =gContestMons - ldr r3, _081296D8 @ =gSharedMem + 0x192E4 - ldrb r0, [r3, 0x4] - lsls r0, 1 - adds r1, r3, 0 - adds r1, 0x41 - ldrb r1, [r1] - lsls r1, 6 - adds r0, r1 - adds r2, 0x1E - adds r0, r2 - ldrh r0, [r0] - ldr r4, _081296DC @ =gContestEffects - ldr r5, _081296E0 @ =gContestMoves - lsls r0, 3 - adds r0, r5 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r4 - ldrb r7, [r0, 0x2] - movs r6, 0 - ldr r0, _081296E4 @ =gAIScriptPtr - mov r12, r0 - adds r1, r2 -_081296AE: - ldrh r0, [r1] - cmp r0, 0 - beq _081296C4 - lsls r0, 3 - adds r0, r5 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x2] - cmp r7, r0 - bcc _081296CC -_081296C4: - adds r1, 0x2 - adds r6, 0x1 - cmp r6, 0x3 - ble _081296AE -_081296CC: - cmp r6, 0x4 - bne _081296E8 - movs r0, 0x1 - b _081296EA - .align 2, 0 -_081296D4: .4byte gContestMons -_081296D8: .4byte gSharedMem + 0x192E4 -_081296DC: .4byte gContestEffects -_081296E0: .4byte gContestMoves -_081296E4: .4byte gAIScriptPtr -_081296E8: - movs r0, 0 -_081296EA: - strh r0, [r3, 0x18] - mov r1, r12 - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_2F - - thumb_func_start ContestAICmd_unk_30 -ContestAICmd_unk_30: @ 81296FC - push {lr} - bl ContestAICmd_unk_2F - ldr r0, _08129728 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _08129730 - ldr r3, _0812972C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129738 - .align 2, 0 -_08129728: .4byte gSharedMem + 0x192E4 -_0812972C: .4byte gAIScriptPtr -_08129730: - ldr r1, _0812973C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x5 - str r0, [r1] -_08129738: - pop {r0} - bx r0 - .align 2, 0 -_0812973C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_30 - - thumb_func_start ContestAICmd_unk_31 -ContestAICmd_unk_31: @ 8129740 - push {r4,lr} - ldr r2, _08129784 @ =gContestMons - ldr r4, _08129788 @ =gSharedMem + 0x192E4 - ldrb r1, [r4, 0x4] - lsls r1, 1 - adds r0, r4, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r2, 0x1E - adds r1, r2 - ldrh r0, [r1] - ldr r2, _0812978C @ =gContestEffects - ldr r1, _08129790 @ =gContestMoves - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - movs r1, 0xA - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x18] - ldr r1, _08129794 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08129784: .4byte gContestMons -_08129788: .4byte gSharedMem + 0x192E4 -_0812978C: .4byte gContestEffects -_08129790: .4byte gContestMoves -_08129794: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_31 - - thumb_func_start ContestAICmd_unk_32 -ContestAICmd_unk_32: @ 8129798 - push {lr} - bl ContestAICmd_unk_31 - ldr r0, _081297C8 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _081297CC @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _081297D0 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081297D4 - .align 2, 0 -_081297C8: .4byte gSharedMem + 0x192E4 -_081297CC: .4byte gAIScriptPtr -_081297D0: - adds r0, r2, 0x5 - str r0, [r3] -_081297D4: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_32 - - thumb_func_start ContestAICmd_unk_33 -ContestAICmd_unk_33: @ 81297D8 - push {lr} - bl ContestAICmd_unk_31 - ldr r0, _08129808 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812980C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08129810 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129814 - .align 2, 0 -_08129808: .4byte gSharedMem + 0x192E4 -_0812980C: .4byte gAIScriptPtr -_08129810: - adds r0, r2, 0x5 - str r0, [r3] -_08129814: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_33 - - thumb_func_start ContestAICmd_unk_34 -ContestAICmd_unk_34: @ 8129818 - push {lr} - bl ContestAICmd_unk_31 - ldr r0, _08129848 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812984C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08129850 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129854 - .align 2, 0 -_08129848: .4byte gSharedMem + 0x192E4 -_0812984C: .4byte gAIScriptPtr -_08129850: - adds r0, r2, 0x5 - str r0, [r3] -_08129854: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_34 - - thumb_func_start ContestAICmd_unk_35 -ContestAICmd_unk_35: @ 8129858 - push {lr} - bl ContestAICmd_unk_31 - ldr r0, _08129888 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812988C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _08129890 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129894 - .align 2, 0 -_08129888: .4byte gSharedMem + 0x192E4 -_0812988C: .4byte gAIScriptPtr -_08129890: - adds r0, r2, 0x5 - str r0, [r3] -_08129894: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_35 - - thumb_func_start ContestAICmd_unk_36 -ContestAICmd_unk_36: @ 8129898 - push {r4,lr} - ldr r2, _081298DC @ =gContestMons - ldr r4, _081298E0 @ =gSharedMem + 0x192E4 - ldrb r1, [r4, 0x4] - lsls r1, 1 - adds r0, r4, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r2, 0x1E - adds r1, r2 - ldrh r0, [r1] - ldr r2, _081298E4 @ =gContestEffects - ldr r1, _081298E8 @ =gContestMoves - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x2] - movs r1, 0xA - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x18] - ldr r1, _081298EC @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_081298DC: .4byte gContestMons -_081298E0: .4byte gSharedMem + 0x192E4 -_081298E4: .4byte gContestEffects -_081298E8: .4byte gContestMoves -_081298EC: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_36 - - thumb_func_start ContestAICmd_unk_37 -ContestAICmd_unk_37: @ 81298F0 - push {lr} - bl ContestAICmd_unk_36 - ldr r0, _08129920 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129924 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08129928 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812992C - .align 2, 0 -_08129920: .4byte gSharedMem + 0x192E4 -_08129924: .4byte gAIScriptPtr -_08129928: - adds r0, r2, 0x5 - str r0, [r3] -_0812992C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_37 - - thumb_func_start ContestAICmd_unk_38 -ContestAICmd_unk_38: @ 8129930 - push {lr} - bl ContestAICmd_unk_36 - ldr r0, _08129960 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129964 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08129968 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812996C - .align 2, 0 -_08129960: .4byte gSharedMem + 0x192E4 -_08129964: .4byte gAIScriptPtr -_08129968: - adds r0, r2, 0x5 - str r0, [r3] -_0812996C: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_38 - - thumb_func_start ContestAICmd_unk_39 -ContestAICmd_unk_39: @ 8129970 - push {lr} - bl ContestAICmd_unk_36 - ldr r0, _081299A0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _081299A4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _081299A8 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081299AC - .align 2, 0 -_081299A0: .4byte gSharedMem + 0x192E4 -_081299A4: .4byte gAIScriptPtr -_081299A8: - adds r0, r2, 0x5 - str r0, [r3] -_081299AC: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_39 - - thumb_func_start ContestAICmd_unk_3A -ContestAICmd_unk_3A: @ 81299B0 - push {lr} - bl ContestAICmd_unk_36 - ldr r0, _081299E0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _081299E4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _081299E8 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _081299EC - .align 2, 0 -_081299E0: .4byte gSharedMem + 0x192E4 -_081299E4: .4byte gAIScriptPtr -_081299E8: - adds r0, r2, 0x5 - str r0, [r3] -_081299EC: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_3A - - thumb_func_start ContestAICmd_get_move_used_count -ContestAICmd_get_move_used_count: @ 81299F0 - push {r4,lr} - ldr r3, _08129A20 @ =gContestMons - ldr r4, _08129A24 @ =gSharedMem + 0x192E4 - ldrb r0, [r4, 0x4] - lsls r0, 1 - adds r1, r4, 0 - adds r1, 0x41 - ldrb r2, [r1] - lsls r1, r2, 6 - adds r0, r1 - adds r3, 0x1E - adds r0, r3 - ldrh r3, [r0] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r1, r4, 0 - subs r1, 0x84 - adds r0, r1 - ldrh r1, [r0, 0x8] - cmp r3, r1 - beq _08129A28 - movs r0, 0 - b _08129A30 - .align 2, 0 -_08129A20: .4byte gContestMons -_08129A24: .4byte gSharedMem + 0x192E4 -_08129A28: - ldrb r0, [r0, 0xB] - lsls r0, 25 - lsrs r0, 29 - adds r0, 0x1 -_08129A30: - strh r0, [r4, 0x18] - ldr r1, _08129A40 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08129A40: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_get_move_used_count - - thumb_func_start ContestAICmd_unk_3C -ContestAICmd_unk_3C: @ 8129A44 - push {lr} - bl ContestAICmd_get_move_used_count - ldr r0, _08129A74 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129A78 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08129A7C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129A80 - .align 2, 0 -_08129A74: .4byte gSharedMem + 0x192E4 -_08129A78: .4byte gAIScriptPtr -_08129A7C: - adds r0, r2, 0x5 - str r0, [r3] -_08129A80: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_3C - - thumb_func_start ContestAICmd_unk_3D -ContestAICmd_unk_3D: @ 8129A84 - push {lr} - bl ContestAICmd_get_move_used_count - ldr r0, _08129AB4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129AB8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08129ABC - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129AC0 - .align 2, 0 -_08129AB4: .4byte gSharedMem + 0x192E4 -_08129AB8: .4byte gAIScriptPtr -_08129ABC: - adds r0, r2, 0x5 - str r0, [r3] -_08129AC0: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_3D - - thumb_func_start ContestAICmd_unk_3E -ContestAICmd_unk_3E: @ 8129AC4 - push {lr} - bl ContestAICmd_get_move_used_count - ldr r0, _08129AF4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129AF8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08129AFC - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129B00 - .align 2, 0 -_08129AF4: .4byte gSharedMem + 0x192E4 -_08129AF8: .4byte gAIScriptPtr -_08129AFC: - adds r0, r2, 0x5 - str r0, [r3] -_08129B00: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_3E - - thumb_func_start ContestAICmd_unk_3F -ContestAICmd_unk_3F: @ 8129B04 - push {lr} - bl ContestAICmd_get_move_used_count - ldr r0, _08129B34 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129B38 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _08129B3C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129B40 - .align 2, 0 -_08129B34: .4byte gSharedMem + 0x192E4 -_08129B38: .4byte gAIScriptPtr -_08129B3C: - adds r0, r2, 0x5 - str r0, [r3] -_08129B40: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_3F - thumb_func_start ContestAICmd_check_combo_starter ContestAICmd_check_combo_starter: @ 8129B44 push {r4-r7,lr} diff --git a/src/contest_ai.c b/src/contest_ai.c index 3ddac5550..2fce17cbe 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -532,3 +532,215 @@ void ContestAICmd_unk_2C(void) else gAIScriptPtr += 5; } + +void ContestAICmd_check_move_has_highest_appeal(void) +{ + int i; + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + u8 appeal = gContestEffects[gContestMoves[move].effect].appeal; + + for(i = 0; i < 4; i++) + { + u16 newMove = gContestMons[eContestAI->unk41].moves[i]; + if(newMove != 0 && appeal < gContestEffects[gContestMoves[newMove].effect].appeal) + break; + } + + if(i == 4) + eContestAI->scriptResult = TRUE; + else + eContestAI->scriptResult = FALSE; + + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_2E(void) +{ + ContestAICmd_check_move_has_highest_appeal(); + + if((s16)eContestAI->scriptResult != FALSE) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_2F(void) +{ + int i; + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + u8 jam = gContestEffects[gContestMoves[move].effect].jam; + + for(i = 0; i < 4; i++) + { + u16 newMove = gContestMons[eContestAI->unk41].moves[i]; + if(newMove != 0 && jam < gContestEffects[gContestMoves[newMove].effect].jam) + break; + } + + if(i == 4) + eContestAI->scriptResult = TRUE; + else + eContestAI->scriptResult = FALSE; + + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_30(void) +{ + ContestAICmd_unk_2F(); + + if((s16)eContestAI->scriptResult != FALSE) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_31(void) +{ + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + eContestAI->scriptResult = gContestEffects[gContestMoves[move].effect].appeal / 10; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_32(void) +{ + ContestAICmd_unk_31(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_33(void) +{ + ContestAICmd_unk_31(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_34(void) +{ + ContestAICmd_unk_31(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_35(void) +{ + ContestAICmd_unk_31(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_36(void) +{ + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + eContestAI->scriptResult = gContestEffects[gContestMoves[move].effect].jam / 10; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_37(void) +{ + ContestAICmd_unk_36(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_38(void) +{ + ContestAICmd_unk_36(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_39(void) +{ + ContestAICmd_unk_36(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_3A(void) +{ + ContestAICmd_unk_36(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_move_used_count(void) +{ + s16 result; + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + if(move != sContestantStatus[eContestAI->unk41].prevMove) + result = 0; // move is unique and not reused. + else + result = sContestantStatus[eContestAI->unk41].moveRepeatCount + 1; + + eContestAI->scriptResult = result; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_3C(void) +{ + ContestAICmd_get_move_used_count(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_3D(void) +{ + ContestAICmd_get_move_used_count(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_3E(void) +{ + ContestAICmd_get_move_used_count(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_3F(void) +{ + ContestAICmd_get_move_used_count(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} -- cgit v1.2.3 From 82e7961ec47071b4259fdaea16ee2707907b1143 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 13 Jan 2018 02:39:10 -0500 Subject: up to ContestAICmd_unk_3F --- src/contest_ai.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/src/contest_ai.c b/src/contest_ai.c index 2fce17cbe..a62a69194 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -744,3 +744,97 @@ void ContestAICmd_unk_3F(void) else gAIScriptPtr += 5; } + +extern u8 AreMovesContestCombo(u16, u16); + +/* +void ContestAICmd_check_combo_starter(void) +{ + u8 result = 0; + int i; + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + for(i = 0; i < 4; i++) + { + u16 newMove = gContestMons[eContestAI->unk41].moves[i]; + u16 isCombo = AreMovesContestCombo(move, gContestMons[eContestAI->unk41].moves[i]); + if(newMove && isCombo) + { + result = 1; + break; + } + if(isCombo) // dumb double r5 check? + { + result = 1; + break; + } + } + + eContestAI->scriptResult = result; + gAIScriptPtr += 1; +}*/ + +/* + thumb_func_start ContestAICmd_check_combo_starter +ContestAICmd_check_combo_starter: @ 8129B44 + push {r4-r7,lr} + mov r7, r8 + push {r7} + movs r5, 0 + ldr r3, _08129BAC @ =gContestMons + ldr r2, _08129BB0 @ =gSharedMem + 0x192E4 + ldrb r1, [r2, 0x4] + lsls r1, 1 + adds r2, 0x41 + ldrb r0, [r2] + lsls r0, 6 + adds r1, r0 + adds r3, 0x1E + adds r1, r3 + ldrh r6, [r1] + movs r4, 0 + mov r8, r2 + adds r7, r3, 0 +_08129B68: + lsls r0, r4, 1 + mov r2, r8 + ldrb r1, [r2] + lsls r1, 6 + adds r0, r1 + adds r1, r0, r7 + ldrh r0, [r1] + cmp r0, 0 + beq _08129B8A + adds r1, r0, 0 + adds r0, r6, 0 + bl AreMovesContestCombo + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0 + bne _08129B94 +_08129B8A: + adds r4, 0x1 + cmp r4, 0x3 + ble _08129B68 + cmp r5, 0 + beq _08129B96 +_08129B94: + movs r5, 0x1 +_08129B96: + ldr r0, _08129BB0 @ =gSharedMem + 0x192E4 + strh r5, [r0, 0x18] + ldr r1, _08129BB4 @ =gAIScriptPtr + ldr r0, [r1] + adds r0, 0x1 + str r0, [r1] + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .align 2, 0 +_08129BAC: .4byte gContestMons +_08129BB0: .4byte gSharedMem + 0x192E4 +_08129BB4: .4byte gAIScriptPtr + thumb_func_end ContestAICmd_check_combo_starter +*/ -- cgit v1.2.3 From e9c74d2472bc322b9d60f1b7033268efbd0bd159 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jan 2018 13:02:57 -0500 Subject: nonmatching sub_8099F58 --- asm/pokemon_storage_system.s | 269 ------------------------- src/pokemon/pokemon_storage_system_4.c | 350 +++++++++++++++++++++++++++++++++ 2 files changed, 350 insertions(+), 269 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 55c7d448b..bf7e7a809 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,275 +5,6 @@ .text - thumb_func_start sub_8099F58 -sub_8099F58: @ 8099F58 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - mov r9, r0 - adds r5, r1, 0 - lsls r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r0, r3, 8 - str r0, [sp] - lsls r0, r3, 1 - adds r0, r3 - adds r0, 0x4 - lsls r0, 28 - lsrs r0, 16 - str r0, [sp, 0x4] - ldr r0, _08099FB8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _08099FBC @ =0x000008b4 - adds r0, r1 - ldrh r1, [r0] - lsrs r1, 3 - adds r1, 0xA - lsrs r0, r2, 24 - mov r8, r0 - asrs r2, 24 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - movs r0, 0x3F - ands r1, r0 - str r1, [sp, 0x8] - adds r2, r1, 0 - cmp r2, 0xC - bgt _08099FC0 - movs r6, 0x14 - movs r3, 0 - lsls r0, r2, 1 - adds r0, 0x80 - mov r1, r9 - adds r4, r1, r0 - movs r7, 0 - b _0809A020 - .align 2, 0 -_08099FB8: .4byte gPokemonStorageSystemPtr -_08099FBC: .4byte 0x000008b4 -_08099FC0: - cmp r2, 0x1F - bgt _08099FE6 - movs r0, 0x20 - subs r0, r2 - lsls r0, 16 - movs r1, 0x14 - lsrs r6, r0, 16 - asrs r0, 16 - subs r1, r0 - lsls r1, 16 - lsrs r3, r1, 16 - lsls r0, r2, 1 - adds r0, 0x80 - mov r2, r9 - adds r4, r2, r0 - movs r7, 0x88 - lsls r7, 4 - add r7, r9 - b _0809A020 -_08099FE6: - cmp r2, 0x2C - bgt _08099FFE - movs r6, 0x14 - movs r3, 0 - lsls r0, r2, 1 - movs r1, 0x84 - lsls r1, 4 - adds r0, r1 - mov r2, r9 - adds r4, r2, r0 - movs r7, 0 - b _0809A020 -_08099FFE: - movs r0, 0x40 - subs r0, r2 - lsls r0, 16 - movs r1, 0x14 - lsrs r6, r0, 16 - asrs r0, 16 - subs r1, r0 - lsls r1, 16 - lsrs r3, r1, 16 - lsls r0, r2, 1 - movs r1, 0x84 - lsls r1, 4 - adds r0, r1 - mov r2, r9 - adds r4, r2, r0 - mov r7, r9 - adds r7, 0x80 -_0809A020: - movs r1, 0 - mov r0, r8 - lsls r0, 24 - str r0, [sp, 0x14] - lsls r0, r6, 16 - asrs r0, 16 - mov r8, r0 - lsls r3, 16 - str r3, [sp, 0xC] - asrs r2, r3, 16 - str r2, [sp, 0x10] -_0809A036: - movs r3, 0 - adds r0, r4, 0 - adds r0, 0x40 - str r0, [sp, 0x18] - adds r2, r7, 0 - adds r2, 0x40 - str r2, [sp, 0x1C] - adds r1, 0x1 - mov r10, r1 - cmp r3, r8 - bge _0809A07A - ldr r0, _0809A0D4 @ =0x00000fff - mov r12, r0 - movs r6, 0xF0 - lsls r6, 8 -_0809A054: - ldrh r2, [r5] - mov r0, r12 - ands r0, r2 - ldr r1, [sp] - adds r0, r1, r0 - adds r1, r6, 0 - ands r1, r2 - ldr r2, [sp, 0x4] - adds r1, r2, r1 - orrs r1, r0 - lsls r0, r3, 1 - adds r0, r4 - strh r1, [r0] - adds r5, 0x2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r8 - blt _0809A054 -_0809A07A: - movs r3, 0 - ldr r0, [sp, 0x10] - cmp r3, r0 - bge _0809A0B4 - ldr r1, _0809A0D4 @ =0x00000fff - mov r12, r1 - movs r6, 0xF0 - lsls r6, 8 - ldr r2, [sp, 0xC] - asrs r4, r2, 16 -_0809A08E: - ldrh r2, [r5] - mov r0, r12 - ands r0, r2 - ldr r1, [sp] - adds r0, r1, r0 - adds r1, r6, 0 - ands r1, r2 - ldr r2, [sp, 0x4] - adds r1, r2, r1 - orrs r1, r0 - lsls r0, r3, 1 - adds r0, r7 - strh r1, [r0] - adds r5, 0x2 - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - blt _0809A08E -_0809A0B4: - ldr r4, [sp, 0x18] - ldr r7, [sp, 0x1C] - mov r1, r10 - lsls r0, r1, 16 - lsrs r1, r0, 16 - cmp r1, 0x11 - bls _0809A036 - ldr r0, [sp, 0x14] - asrs r2, r0, 24 - cmp r2, 0 - beq _0809A13A - cmp r2, 0 - ble _0809A0D8 - ldr r1, [sp, 0x8] - adds r1, 0x14 - b _0809A0DC - .align 2, 0 -_0809A0D4: .4byte 0x00000fff -_0809A0D8: - ldr r1, [sp, 0x8] - subs r1, 0x4 -_0809A0DC: - movs r0, 0x3F - ands r1, r0 - adds r4, r1, 0 - adds r0, r4, 0 - cmp r0, 0x1F - bgt _0809A0EE - lsls r0, 1 - adds r0, 0x80 - b _0809A0F6 -_0809A0EE: - lsls r0, 1 - movs r2, 0x84 - lsls r2, 4 - adds r0, r2 -_0809A0F6: - mov r1, r9 - adds r2, r1, r0 - movs r3, 0 - movs r6, 0 -_0809A0FE: - movs r1, 0 - adds r5, r3, 0x1 - lsls r3, r4, 16 -_0809A104: - strh r6, [r2] - adds r2, 0x40 - adds r0, r1, 0x1 - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0x11 - bls _0809A104 - asrs r0, r3, 16 - adds r4, r0, 0x1 - movs r0, 0x3F - ands r4, r0 - adds r0, r4, 0 - cmp r0, 0x1F - bgt _0809A126 - lsls r0, 1 - adds r0, 0x80 - b _0809A12E -_0809A126: - lsls r0, 1 - movs r2, 0x84 - lsls r2, 4 - adds r0, r2 -_0809A12E: - mov r1, r9 - adds r2, r1, r0 - lsls r0, r5, 16 - lsrs r3, r0, 16 - cmp r3, 0x3 - bls _0809A0FE -_0809A13A: - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8099F58 - thumb_func_start sub_809A14C sub_809A14C: @ 809A14C push {r4-r6,lr} diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 8982ce461..9f19814a5 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -323,3 +323,353 @@ void sub_8099EB0(u8 boxId, s8 a1) sub_8099F58(BG_SCREEN_ADDR(26), gPokemonStorageSystemPtr->unk_0d62, a1, gPokemonStorageSystemPtr->unk_08ba); LZ77UnCompVram(wallpaperTable->tiles, BG_CHAR_ADDR(2) + (gPokemonStorageSystemPtr->unk_08ba << 13)); } + +#ifdef NONMATCHING +void sub_8099F58(u16 *vdest, const u16 *src, s8 a2, u8 a3) +{ + s16 r6; + s16 r3; + u16 sp0 = a3 << 8; + u16 sp4 = (a3 * 3 + 4) << 12; + u16 *r4; + u16 *r7; + u16 i; + u16 j; + s16 sp8 = ((gPokemonStorageSystemPtr->unk_08b4 >> 3) + 10 + a2 * 24) & 0x3f; + if (sp8 < 13) + { + r6 = 20; + r3 = 0; + r4 = vdest + sp8 + 0x40; + r7 = NULL; + } + else if (sp8 < 32) + { + r6 = 32 - sp8; + r3 = 20 - r6; + r4 = vdest + sp8 + 0x40; + r7 = vdest + 0x440; + } + else if (sp8 < 45) + { + r6 = 20; + r3 = 0; + r4 = vdest + sp8 + 0x420; + r7 = NULL; + } + else + { + r6 = 64 - sp8; + r3 = 20 - r6; + r4 = vdest + sp8 + 0x420; + r7 = vdest + 0x40; + } + for (i = 0; i < 18; i++) + { + for (j = 0; j < r6; j++) + { + u16 tile = ((*src & 0xfff) + sp0) | ((*src & 0xf000) + sp4); + r4[j] = tile; + src++; + } + for (j = 0; j < r3; j++) + { + u16 tile = ((*src & 0xfff) + sp0) | ((*src & 0xf000) + sp4); + r7[j] = tile; + src++; + } + r4 += 0x20; + r7 += 0x20; + } + if (a2) + { + s16 r4_2; + u16 *r2; + if (a2 > 0) + r4_2 = (sp8 + 20) & 0x3f; + else + r4_2 = (sp8 - 4) & 0x3f; + r2 = r4_2 < 0x20 ? vdest + r4_2 + 0x40 : vdest + r4_2 + 0x420; + for (i = 0; i < 4; i++) + { + for (j = 0; j < 18; j++) + { + *r2 = 0; + r2 += 0x20; + } + r4_2++; + r4_2 &= 0x3f; + r2 = r4_2 < 0x20 ? vdest + r4_2 + 0x40 : vdest + r4_2 + 0x420; + } + } +} +#else +__attribute__((naked)) void sub_8099F58(u16 *vdest, const u16 *src, s8 a2, u8 a3) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tsub sp, 0x20\n" + "\tmov r9, r0\n" + "\tadds r5, r1, 0\n" + "\tlsls r2, 24\n" + "\tlsls r3, 24\n" + "\tlsrs r3, 24\n" + "\tlsls r0, r3, 8\n" + "\tstr r0, [sp]\n" + "\tlsls r0, r3, 1\n" + "\tadds r0, r3\n" + "\tadds r0, 0x4\n" + "\tlsls r0, 28\n" + "\tlsrs r0, 16\n" + "\tstr r0, [sp, 0x4]\n" + "\tldr r0, _08099FB8 @ =gPokemonStorageSystemPtr\n" + "\tldr r0, [r0]\n" + "\tldr r1, _08099FBC @ =0x000008b4\n" + "\tadds r0, r1\n" + "\tldrh r1, [r0]\n" + "\tlsrs r1, 3\n" + "\tadds r1, 0xA\n" + "\tlsrs r0, r2, 24\n" + "\tmov r8, r0\n" + "\tasrs r2, 24\n" + "\tlsls r0, r2, 1\n" + "\tadds r0, r2\n" + "\tlsls r0, 3\n" + "\tadds r1, r0\n" + "\tmovs r0, 0x3F\n" + "\tands r1, r0\n" + "\tstr r1, [sp, 0x8]\n" + "\tadds r2, r1, 0\n" + "\tcmp r2, 0xC\n" + "\tbgt _08099FC0\n" + "\tmovs r6, 0x14\n" + "\tmovs r3, 0\n" + "\tlsls r0, r2, 1\n" + "\tadds r0, 0x80\n" + "\tmov r1, r9\n" + "\tadds r4, r1, r0\n" + "\tmovs r7, 0\n" + "\tb _0809A020\n" + "\t.align 2, 0\n" + "_08099FB8: .4byte gPokemonStorageSystemPtr\n" + "_08099FBC: .4byte 0x000008b4\n" + "_08099FC0:\n" + "\tcmp r2, 0x1F\n" + "\tbgt _08099FE6\n" + "\tmovs r0, 0x20\n" + "\tsubs r0, r2\n" + "\tlsls r0, 16\n" + "\tmovs r1, 0x14\n" + "\tlsrs r6, r0, 16\n" + "\tasrs r0, 16\n" + "\tsubs r1, r0\n" + "\tlsls r1, 16\n" + "\tlsrs r3, r1, 16\n" + "\tlsls r0, r2, 1\n" + "\tadds r0, 0x80\n" + "\tmov r2, r9\n" + "\tadds r4, r2, r0\n" + "\tmovs r7, 0x88\n" + "\tlsls r7, 4\n" + "\tadd r7, r9\n" + "\tb _0809A020\n" + "_08099FE6:\n" + "\tcmp r2, 0x2C\n" + "\tbgt _08099FFE\n" + "\tmovs r6, 0x14\n" + "\tmovs r3, 0\n" + "\tlsls r0, r2, 1\n" + "\tmovs r1, 0x84\n" + "\tlsls r1, 4\n" + "\tadds r0, r1\n" + "\tmov r2, r9\n" + "\tadds r4, r2, r0\n" + "\tmovs r7, 0\n" + "\tb _0809A020\n" + "_08099FFE:\n" + "\tmovs r0, 0x40\n" + "\tsubs r0, r2\n" + "\tlsls r0, 16\n" + "\tmovs r1, 0x14\n" + "\tlsrs r6, r0, 16\n" + "\tasrs r0, 16\n" + "\tsubs r1, r0\n" + "\tlsls r1, 16\n" + "\tlsrs r3, r1, 16\n" + "\tlsls r0, r2, 1\n" + "\tmovs r1, 0x84\n" + "\tlsls r1, 4\n" + "\tadds r0, r1\n" + "\tmov r2, r9\n" + "\tadds r4, r2, r0\n" + "\tmov r7, r9\n" + "\tadds r7, 0x80\n" + "_0809A020:\n" + "\tmovs r1, 0\n" + "\tmov r0, r8\n" + "\tlsls r0, 24\n" + "\tstr r0, [sp, 0x14]\n" + "\tlsls r0, r6, 16\n" + "\tasrs r0, 16\n" + "\tmov r8, r0\n" + "\tlsls r3, 16\n" + "\tstr r3, [sp, 0xC]\n" + "\tasrs r2, r3, 16\n" + "\tstr r2, [sp, 0x10]\n" + "_0809A036:\n" + "\tmovs r3, 0\n" + "\tadds r0, r4, 0\n" + "\tadds r0, 0x40\n" + "\tstr r0, [sp, 0x18]\n" + "\tadds r2, r7, 0\n" + "\tadds r2, 0x40\n" + "\tstr r2, [sp, 0x1C]\n" + "\tadds r1, 0x1\n" + "\tmov r10, r1\n" + "\tcmp r3, r8\n" + "\tbge _0809A07A\n" + "\tldr r0, _0809A0D4 @ =0x00000fff\n" + "\tmov r12, r0\n" + "\tmovs r6, 0xF0\n" + "\tlsls r6, 8\n" + "_0809A054:\n" + "\tldrh r2, [r5]\n" + "\tmov r0, r12\n" + "\tands r0, r2\n" + "\tldr r1, [sp]\n" + "\tadds r0, r1, r0\n" + "\tadds r1, r6, 0\n" + "\tands r1, r2\n" + "\tldr r2, [sp, 0x4]\n" + "\tadds r1, r2, r1\n" + "\torrs r1, r0\n" + "\tlsls r0, r3, 1\n" + "\tadds r0, r4\n" + "\tstrh r1, [r0]\n" + "\tadds r5, 0x2\n" + "\tadds r0, r3, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r3, r0, 16\n" + "\tcmp r3, r8\n" + "\tblt _0809A054\n" + "_0809A07A:\n" + "\tmovs r3, 0\n" + "\tldr r0, [sp, 0x10]\n" + "\tcmp r3, r0\n" + "\tbge _0809A0B4\n" + "\tldr r1, _0809A0D4 @ =0x00000fff\n" + "\tmov r12, r1\n" + "\tmovs r6, 0xF0\n" + "\tlsls r6, 8\n" + "\tldr r2, [sp, 0xC]\n" + "\tasrs r4, r2, 16\n" + "_0809A08E:\n" + "\tldrh r2, [r5]\n" + "\tmov r0, r12\n" + "\tands r0, r2\n" + "\tldr r1, [sp]\n" + "\tadds r0, r1, r0\n" + "\tadds r1, r6, 0\n" + "\tands r1, r2\n" + "\tldr r2, [sp, 0x4]\n" + "\tadds r1, r2, r1\n" + "\torrs r1, r0\n" + "\tlsls r0, r3, 1\n" + "\tadds r0, r7\n" + "\tstrh r1, [r0]\n" + "\tadds r5, 0x2\n" + "\tadds r0, r3, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r3, r0, 16\n" + "\tcmp r3, r4\n" + "\tblt _0809A08E\n" + "_0809A0B4:\n" + "\tldr r4, [sp, 0x18]\n" + "\tldr r7, [sp, 0x1C]\n" + "\tmov r1, r10\n" + "\tlsls r0, r1, 16\n" + "\tlsrs r1, r0, 16\n" + "\tcmp r1, 0x11\n" + "\tbls _0809A036\n" + "\tldr r0, [sp, 0x14]\n" + "\tasrs r2, r0, 24\n" + "\tcmp r2, 0\n" + "\tbeq _0809A13A\n" + "\tcmp r2, 0\n" + "\tble _0809A0D8\n" + "\tldr r1, [sp, 0x8]\n" + "\tadds r1, 0x14\n" + "\tb _0809A0DC\n" + "\t.align 2, 0\n" + "_0809A0D4: .4byte 0x00000fff\n" + "_0809A0D8:\n" + "\tldr r1, [sp, 0x8]\n" + "\tsubs r1, 0x4\n" + "_0809A0DC:\n" + "\tmovs r0, 0x3F\n" + "\tands r1, r0\n" + "\tadds r4, r1, 0\n" + "\tadds r0, r4, 0\n" + "\tcmp r0, 0x1F\n" + "\tbgt _0809A0EE\n" + "\tlsls r0, 1\n" + "\tadds r0, 0x80\n" + "\tb _0809A0F6\n" + "_0809A0EE:\n" + "\tlsls r0, 1\n" + "\tmovs r2, 0x84\n" + "\tlsls r2, 4\n" + "\tadds r0, r2\n" + "_0809A0F6:\n" + "\tmov r1, r9\n" + "\tadds r2, r1, r0\n" + "\tmovs r3, 0\n" + "\tmovs r6, 0\n" + "_0809A0FE:\n" + "\tmovs r1, 0\n" + "\tadds r5, r3, 0x1\n" + "\tlsls r3, r4, 16\n" + "_0809A104:\n" + "\tstrh r6, [r2]\n" + "\tadds r2, 0x40\n" + "\tadds r0, r1, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r1, r0, 16\n" + "\tcmp r1, 0x11\n" + "\tbls _0809A104\n" + "\tasrs r0, r3, 16\n" + "\tadds r4, r0, 0x1\n" + "\tmovs r0, 0x3F\n" + "\tands r4, r0\n" + "\tadds r0, r4, 0\n" + "\tcmp r0, 0x1F\n" + "\tbgt _0809A126\n" + "\tlsls r0, 1\n" + "\tadds r0, 0x80\n" + "\tb _0809A12E\n" + "_0809A126:\n" + "\tlsls r0, 1\n" + "\tmovs r2, 0x84\n" + "\tlsls r2, 4\n" + "\tadds r0, r2\n" + "_0809A12E:\n" + "\tmov r1, r9\n" + "\tadds r2, r1, r0\n" + "\tlsls r0, r5, 16\n" + "\tlsrs r3, r0, 16\n" + "\tcmp r3, 0x3\n" + "\tbls _0809A0FE\n" + "_0809A13A:\n" + "\tadd sp, 0x20\n" + "\tpop {r3-r5}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tmov r10, r5\n" + "\tpop {r4-r7}\n" + "\tpop {r0}\n" + "\tbx r0"); +} +#endif -- cgit v1.2.3 From a5721ffd736f30d424da8aede5c52071365f3850 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jan 2018 16:40:15 -0500 Subject: nonmatching sub_809A14C --- asm/pokemon_storage_system.s | 64 -------------------------- src/pokemon/pokemon_storage_system_4.c | 84 ++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 64 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index bf7e7a809..79783e4ed 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,70 +5,6 @@ .text - thumb_func_start sub_809A14C -sub_809A14C: @ 809A14C - push {r4-r6,lr} - adds r2, r0, 0 - ldr r0, _0809A174 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809A178 @ =0x000008b4 - adds r0, r1 - ldrh r0, [r0] - lsrs r0, 3 - adds r3, r0, 0 - adds r3, 0x1E - movs r0, 0x3F - ands r3, r0 - adds r0, r3, 0 - cmp r0, 0x1F - bgt _0809A17C - lsls r0, 1 - movs r6, 0x98 - lsls r6, 3 - adds r0, r6 - b _0809A184 - .align 2, 0 -_0809A174: .4byte gPokemonStorageSystemPtr -_0809A178: .4byte 0x000008b4 -_0809A17C: - lsls r0, 1 - movs r1, 0xC8 - lsls r1, 4 - adds r0, r1 -_0809A184: - adds r2, r0 - movs r0, 0 - movs r5, 0 - movs r4, 0x3F -_0809A18C: - strh r5, [r2] - adds r2, 0x2 - adds r3, 0x1 - ands r3, r4 - adds r1, r3, 0 - cmp r1, 0 - bne _0809A19E - ldr r6, _0809A1B8 @ =0xfffff7c0 - adds r2, r6 -_0809A19E: - cmp r1, 0x20 - bne _0809A1A8 - movs r1, 0xF8 - lsls r1, 3 - adds r2, r1 -_0809A1A8: - adds r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2B - bls _0809A18C - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809A1B8: .4byte 0xfffff7c0 - thumb_func_end sub_809A14C - thumb_func_start sub_809A1BC sub_809A1BC: @ 809A1BC push {r4-r6,lr} diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 9f19814a5..1ccaa01f1 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -673,3 +673,87 @@ __attribute__((naked)) void sub_8099F58(u16 *vdest, const u16 *src, s8 a2, u8 a3 "\tbx r0"); } #endif + +#ifdef NONMATCHING +void sub_809A14C(u16 *vdest) +{ + u16 *r2; + u16 i; + int r3 = ((gPokemonStorageSystemPtr->unk_08b4 >> 3) + 30) & 0x3f; + r2 = vdest + (r3 < 0x20 ? r3 + 0x260 : r3 + 0x640); + for (i = 0; i < 0x2b; i++) + { + *r2++ = 0; + r3++; + r3 &= 0x3f; + if (r3 == 0) + r2 -= 0x420; + if (r3 == 0x20) + r2 += 0x3e0; + } +} +#else +__attribute__((naked)) void sub_809A14C(u16 *vdest) +{ + asm_unified("\tpush {r4-r6,lr}\n" + "\tadds r2, r0, 0\n" + "\tldr r0, _0809A174 @ =gPokemonStorageSystemPtr\n" + "\tldr r0, [r0]\n" + "\tldr r1, _0809A178 @ =0x000008b4\n" + "\tadds r0, r1\n" + "\tldrh r0, [r0]\n" + "\tlsrs r0, 3\n" + "\tadds r3, r0, 0\n" + "\tadds r3, 0x1E\n" + "\tmovs r0, 0x3F\n" + "\tands r3, r0\n" + "\tadds r0, r3, 0\n" + "\tcmp r0, 0x1F\n" + "\tbgt _0809A17C\n" + "\tlsls r0, 1\n" + "\tmovs r6, 0x98\n" + "\tlsls r6, 3\n" + "\tadds r0, r6\n" + "\tb _0809A184\n" + "\t.align 2, 0\n" + "_0809A174: .4byte gPokemonStorageSystemPtr\n" + "_0809A178: .4byte 0x000008b4\n" + "_0809A17C:\n" + "\tlsls r0, 1\n" + "\tmovs r1, 0xC8\n" + "\tlsls r1, 4\n" + "\tadds r0, r1\n" + "_0809A184:\n" + "\tadds r2, r0\n" + "\tmovs r0, 0\n" + "\tmovs r5, 0\n" + "\tmovs r4, 0x3F\n" + "_0809A18C:\n" + "\tstrh r5, [r2]\n" + "\tadds r2, 0x2\n" + "\tadds r3, 0x1\n" + "\tands r3, r4\n" + "\tadds r1, r3, 0\n" + "\tcmp r1, 0\n" + "\tbne _0809A19E\n" + "\tldr r6, _0809A1B8 @ =0xfffff7c0\n" + "\tadds r2, r6\n" + "_0809A19E:\n" + "\tcmp r1, 0x20\n" + "\tbne _0809A1A8\n" + "\tmovs r1, 0xF8\n" + "\tlsls r1, 3\n" + "\tadds r2, r1\n" + "_0809A1A8:\n" + "\tadds r0, 0x1\n" + "\tlsls r0, 16\n" + "\tlsrs r0, 16\n" + "\tcmp r0, 0x2B\n" + "\tbls _0809A18C\n" + "\tpop {r4-r6}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.align 2, 0\n" + "_0809A1B8: .4byte 0xfffff7c0"); +} +#endif -- cgit v1.2.3 From 2e8f0cd4b33a7a3ea92b2b42742d78d98959d1e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 13 Jan 2018 16:00:39 -0600 Subject: label battle_intro.c --- src/battle/anim/battle_intro.c | 281 +++++++++++++++------------- src/battle/battle_controller_linkopponent.c | 4 +- src/battle/battle_controller_linkpartner.c | 4 +- src/battle/battle_controller_opponent.c | 4 +- src/battle/battle_controller_player.c | 4 +- src/battle/battle_controller_safari.c | 4 +- src/battle/battle_controller_wally.c | 4 +- 7 files changed, 162 insertions(+), 143 deletions(-) diff --git a/src/battle/anim/battle_intro.c b/src/battle/anim/battle_intro.c index 46ea292bd..01f823fa7 100644 --- a/src/battle/anim/battle_intro.c +++ b/src/battle/anim/battle_intro.c @@ -22,53 +22,57 @@ extern u8 gBattleMonForms[]; extern void sub_800FE20(struct Sprite *); -static void task_battle_intro_80BC47C(u8); -static void task00_battle_intro_80BC6C8(u8); -static void task_battle_intro_anim(u8); -static void sub_80E4C34(u8); +static void BattleIntroTask_ScrollScenery(u8); +static void BattleIntroTask_FadeScenery(u8); +static void BattleIntroTask_ScrollAndFadeScenery(u8); +static void BattleIntroTask_80E4C34(u8); -static const TaskFunc gUnknown_083DB56C[] = +static const TaskFunc sBattleIntroTaskFuncs[] = { - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task00_battle_intro_80BC6C8, - task00_battle_intro_80BC6C8, - task00_battle_intro_80BC6C8, - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task_battle_intro_80BC47C, - task_battle_intro_anim, - task_battle_intro_anim, + BattleIntroTask_ScrollScenery, + BattleIntroTask_ScrollScenery, + BattleIntroTask_FadeScenery, + BattleIntroTask_FadeScenery, + BattleIntroTask_FadeScenery, + BattleIntroTask_ScrollScenery, + BattleIntroTask_ScrollScenery, + BattleIntroTask_ScrollScenery, + BattleIntroTask_ScrollAndFadeScenery, + BattleIntroTask_ScrollAndFadeScenery, }; -void sub_80E43C0(u8 a) +#define tState data[0] +#define tBgXOffset data[2] +#define tFramesUntilBg1Slide data[3] + +void StartBattleIntroAnim(u8 a) { u8 taskId; if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - taskId = CreateTask(sub_80E4C34, 0); + taskId = CreateTask(BattleIntroTask_80E4C34, 0); } else if ((gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) && gGameVersion != VERSION_RUBY) { a = 3; - taskId = CreateTask(task00_battle_intro_80BC6C8, 0); + taskId = CreateTask(BattleIntroTask_FadeScenery, 0); } else { - taskId = CreateTask(gUnknown_083DB56C[a], 0); + taskId = CreateTask(sBattleIntroTaskFuncs[a], 0); } - gTasks[taskId].data[0] = 0; + gTasks[taskId].tState = 0; gTasks[taskId].data[1] = a; - gTasks[taskId].data[2] = 0; - gTasks[taskId].data[3] = 0; + gTasks[taskId].tBgXOffset = 0; + gTasks[taskId].tFramesUntilBg1Slide = 0; gTasks[taskId].data[4] = 0; gTasks[taskId].data[5] = 0; gTasks[taskId].data[6] = 0; } -static void sub_80E443C(u8 taskId) +static void EndBattleIntroTask(u8 taskId) { DestroyTask(taskId); gBattle_BG1_X = 0; @@ -78,93 +82,98 @@ static void sub_80E443C(u8 taskId) REG_BLDCNT = 0; REG_BLDALPHA = 0; REG_BLDY = 0; - REG_WININ = WIN_RANGE(63, 63); - REG_WINOUT = WIN_RANGE(63, 63); + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3F; } -static void task_battle_intro_80BC47C(u8 taskId) +static void BattleIntroTask_ScrollScenery(u8 taskId) { s32 i; gBattle_BG1_X += 6; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gTasks[taskId].data[2] = 16; - gTasks[taskId].data[0]++; + gTasks[taskId].tBgXOffset = 16; + gTasks[taskId].tState++; } else { - gTasks[taskId].data[2] = 1; - gTasks[taskId].data[0]++; + gTasks[taskId].tBgXOffset = 1; + gTasks[taskId].tState++; } break; case 1: - gTasks[taskId].data[2]--; - if (gTasks[taskId].data[2] == 0) + gTasks[taskId].tBgXOffset--; + if (gTasks[taskId].tBgXOffset == 0) { - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; REG_WININ = 0x3F; } break; case 2: - gBattle_WIN0V -= 255; + // Open up the window + gBattle_WIN0V -= WIN_RANGE(1, 0); // decrement min Y + gBattle_WIN0V += WIN_RANGE(0, 1); // increment max Y if ((gBattle_WIN0V & 0xFF00) == 0x3000) { - gTasks[taskId].data[0]++; - gTasks[taskId].data[2] = DISPLAY_WIDTH; - gTasks[taskId].data[3] = 32; + gTasks[taskId].tState++; + gTasks[taskId].tBgXOffset = DISPLAY_WIDTH; + gTasks[taskId].tFramesUntilBg1Slide = 32; gUnknown_02024DE8 &= ~1; } break; case 3: - if (gTasks[taskId].data[3] != 0) - { - gTasks[taskId].data[3]--; - } - else if (gTasks[taskId].data[1] == 1) + if (gTasks[taskId].tFramesUntilBg1Slide != 0) { - if (gBattle_BG1_Y != 0xFFB0) - gBattle_BG1_Y -= 2; + gTasks[taskId].tFramesUntilBg1Slide--; } else { - if (gBattle_BG1_Y != 0xFFC8) - gBattle_BG1_Y -= 1; + if (gTasks[taskId].data[1] == 1) + { + if (gBattle_BG1_Y != 0xFFB0) + gBattle_BG1_Y -= 2; + } + else + { + if (gBattle_BG1_Y != 0xFFC8) + gBattle_BG1_Y -= 1; + } } if ((gBattle_WIN0V & 0xFF00) != 0) gBattle_WIN0V -= 1020; - if (gTasks[taskId].data[2] != 0) - gTasks[taskId].data[2] -= 2; + if (gTasks[taskId].tBgXOffset != 0) + gTasks[taskId].tBgXOffset -= 2; - // Set the x offset for the the top half of the screen. + // Slide in the top half of the BG from the left for (i = 0; i < DISPLAY_HEIGHT / 2; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; - // Set the x offset for the bottom half of the screen. + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset; + // Slide in the bottom half of the BG from the right for (; i < DISPLAY_HEIGHT; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset; - if (gTasks[taskId].data[2] == 0) + if (gTasks[taskId].tBgXOffset == 0) { gScanlineEffect.state = 3; - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; CpuFill32(0, (void *)(VRAM + 0xE000), 0x800); REG_BG1CNT = 0x9C00; REG_BG2CNT = 0x5E00; } break; case 4: - sub_80E443C(taskId); + EndBattleIntroTask(taskId); break; } } -static void task00_battle_intro_80BC6C8(u8 taskId) +static void BattleIntroTask_FadeScenery(u8 taskId) { s32 i; @@ -190,45 +199,47 @@ static void task00_battle_intro_80BC6C8(u8 taskId) gTasks[taskId].data[6] = 0; } - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: gTasks[taskId].data[4] = 16; if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gTasks[taskId].data[2] = 16; - gTasks[taskId].data[0]++; + gTasks[taskId].tBgXOffset = 16; + gTasks[taskId].tState++; } else { - gTasks[taskId].data[2] = 1; - gTasks[taskId].data[0]++; + gTasks[taskId].tBgXOffset = 1; + gTasks[taskId].tState++; } break; case 1: - gTasks[taskId].data[2]--; - if (gTasks[taskId].data[2] == 0) + gTasks[taskId].tBgXOffset--; + if (gTasks[taskId].tBgXOffset == 0) { - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; REG_WININ = 0x3F; } break; case 2: - gBattle_WIN0V -= 255; + // Open up window + gBattle_WIN0V -= WIN_RANGE(1, 0); // decrement min Y + gBattle_WIN0V += WIN_RANGE(0, 1); // increment max Y if ((gBattle_WIN0V & 0xFF00) == 0x3000) { - gTasks[taskId].data[0]++; - gTasks[taskId].data[2] = 240; - gTasks[taskId].data[3] = 32; + gTasks[taskId].tState++; + gTasks[taskId].tBgXOffset = DISPLAY_WIDTH; + gTasks[taskId].tFramesUntilBg1Slide = 32; gTasks[taskId].data[5] = 1; gUnknown_02024DE8 &= ~1; } break; case 3: - if (gTasks[taskId].data[3] != 0) + if (gTasks[taskId].tFramesUntilBg1Slide != 0) { - gTasks[taskId].data[3]--; - if (gTasks[taskId].data[3] == 0) + gTasks[taskId].tFramesUntilBg1Slide--; + if (gTasks[taskId].tFramesUntilBg1Slide == 0) { REG_BLDCNT = 0x1842; REG_BLDALPHA = 0xF; @@ -247,41 +258,41 @@ static void task00_battle_intro_80BC6C8(u8 taskId) if ((gBattle_WIN0V & 0xFF00) != 0) gBattle_WIN0V -= 1020; - if (gTasks[taskId].data[2] != 0) - gTasks[taskId].data[2] -= 2; + if (gTasks[taskId].tBgXOffset != 0) + gTasks[taskId].tBgXOffset -= 2; - // Set the x offset for the the top half of the screen. + // Slide in the top half of the BG from the left for (i = 0; i < DISPLAY_HEIGHT / 2; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; - // Set the x offset for the bottom half of the screen. + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset; + // Slide in the bottom half of the BG from the right for (; i < DISPLAY_HEIGHT; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset; - if (gTasks[taskId].data[2] == 0) + if (gTasks[taskId].tBgXOffset == 0) { gScanlineEffect.state = 3; - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; CpuFill32(0, (void *)(VRAM + 0xE000), 0x800); REG_BG1CNT = 0x9C00; REG_BG2CNT = 0x5E00; } break; case 4: - sub_80E443C(taskId); + EndBattleIntroTask(taskId); break; } - if (gTasks[taskId].data[0] != 4) + if (gTasks[taskId].tState != 4) REG_BLDALPHA = gTasks[taskId].data[4]; } -static void task_battle_intro_anim(u8 taskId) +static void BattleIntroTask_ScrollAndFadeScenery(u8 taskId) { s32 i; gBattle_BG1_X += 8; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: REG_BLDCNT = 0x1842; @@ -290,81 +301,87 @@ static void task_battle_intro_anim(u8 taskId) gTasks[taskId].data[4] = 0x0808; if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gTasks[taskId].data[2] = 16; - gTasks[taskId].data[0]++; + gTasks[taskId].tBgXOffset = 16; + gTasks[taskId].tState++; } else { - gTasks[taskId].data[2] = 1; - gTasks[taskId].data[0]++; + gTasks[taskId].tBgXOffset = 1; + gTasks[taskId].tState++; } break; case 1: - gTasks[taskId].data[2]--; - if (gTasks[taskId].data[2] == 0) + gTasks[taskId].tBgXOffset--; + if (gTasks[taskId].tBgXOffset == 0) { - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; REG_WININ = 0x3F; } break; case 2: - gBattle_WIN0V -= 255; + // Open up window + gBattle_WIN0V -= WIN_RANGE(1, 0); // decrement min Y + gBattle_WIN0V += WIN_RANGE(0, 1); // increment max Y if ((gBattle_WIN0V & 0xFF00) == 0x3000) { - gTasks[taskId].data[0]++; - gTasks[taskId].data[2] = 240; - gTasks[taskId].data[3] = 32; + gTasks[taskId].tState++; + gTasks[taskId].tBgXOffset = DISPLAY_WIDTH; + gTasks[taskId].tFramesUntilBg1Slide = 32; gTasks[taskId].data[5] = 1; gUnknown_02024DE8 &= ~1; } break; case 3: - if (gTasks[taskId].data[3] != 0) + if (gTasks[taskId].tFramesUntilBg1Slide != 0) { - gTasks[taskId].data[3]--; + gTasks[taskId].tFramesUntilBg1Slide--; } - else if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0) + else { - gTasks[taskId].data[4] += 255; - gTasks[taskId].data[5] = 6; + if ((gTasks[taskId].data[4] & 0xF) && --gTasks[taskId].data[5] == 0) + { + gTasks[taskId].data[4] += 255; + gTasks[taskId].data[5] = 6; + } } if ((gBattle_WIN0V & 0xFF00) != 0) gBattle_WIN0V -= 1020; - if (gTasks[taskId].data[2] != 0) - gTasks[taskId].data[2] -= 2; + if (gTasks[taskId].tBgXOffset != 0) + gTasks[taskId].tBgXOffset -= 2; - // Set the x offset for the the top half of the screen. + // Slide in the top half of the BG from the left for (i = 0; i < DISPLAY_HEIGHT / 2; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; - // Set the x offset for the bottom half of the screen. + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset; + // Slide in the bottom half of the BG from the right for (; i < DISPLAY_HEIGHT; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset; - if (gTasks[taskId].data[2] == 0) + if (gTasks[taskId].tBgXOffset == 0) { gScanlineEffect.state = 3; - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; CpuFill32(0, (void *)(VRAM + 0xE000), 0x800); REG_BG1CNT = 0x9C00; REG_BG2CNT = 0x5E00; } break; case 4: - sub_80E443C(taskId); + EndBattleIntroTask(taskId); break; } - if (gTasks[taskId].data[0] != 4) + if (gTasks[taskId].tState != 4) REG_BLDALPHA = gTasks[taskId].data[4]; } -static void sub_80E4C34(u8 taskId) +// Seems to only be used for link battles. +static void BattleIntroTask_80E4C34(u8 taskId) { s32 i; - if (gTasks[taskId].data[0] > 1 && gTasks[taskId].data[4] == 0) + if (gTasks[taskId].tState > 1 && gTasks[taskId].data[4] == 0) { if ((gBattle_BG1_X & 0x8000) || gBattle_BG1_X < 80) // hmm... { @@ -379,17 +396,17 @@ static void sub_80E4C34(u8 taskId) } } - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: - gTasks[taskId].data[2] = 16; - gTasks[taskId].data[0]++; + gTasks[taskId].tBgXOffset = 16; + gTasks[taskId].tState++; break; case 1: - gTasks[taskId].data[2]--; - if (gTasks[taskId].data[2] == 0) + gTasks[taskId].tBgXOffset--; + if (gTasks[taskId].tBgXOffset == 0) { - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; gSprites[ewram1608A].oam.objMode = 2; gSprites[ewram1608A].callback = sub_800FE20; gSprites[ewram1608B].oam.objMode = 2; @@ -399,12 +416,14 @@ static void sub_80E4C34(u8 taskId) } break; case 2: - gBattle_WIN0V -= 255; + // Open up window + gBattle_WIN0V -= WIN_RANGE(1, 0); // decrement min Y + gBattle_WIN0V += WIN_RANGE(0, 1); // increment max Y if ((gBattle_WIN0V & 0xFF00) == 0x3000) { - gTasks[taskId].data[0]++; - gTasks[taskId].data[2] = 240; - gTasks[taskId].data[3] = 32; + gTasks[taskId].tState++; + gTasks[taskId].tBgXOffset = DISPLAY_WIDTH; + gTasks[taskId].tFramesUntilBg1Slide = 32; gUnknown_02024DE8 &= ~1; } break; @@ -412,26 +431,26 @@ static void sub_80E4C34(u8 taskId) if ((gBattle_WIN0V & 0xFF00) != 0) gBattle_WIN0V -= 1020; - if (gTasks[taskId].data[2] != 0) - gTasks[taskId].data[2] -= 2; + if (gTasks[taskId].tBgXOffset != 0) + gTasks[taskId].tBgXOffset -= 2; - // Set the x offset for the the top half of the screen. + // Slide in the top half of the BG from the left for (i = 0; i < DISPLAY_HEIGHT / 2; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].data[2]; - // Set the x offset for the bottom half of the screen. + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = gTasks[taskId].tBgXOffset; + // Slide in the bottom half of the BG from the right for (; i < DISPLAY_HEIGHT; i++) - gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].data[2]; + gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = -gTasks[taskId].tBgXOffset; - if (gTasks[taskId].data[2] == 0) + if (gTasks[taskId].tBgXOffset == 0) { gScanlineEffect.state = 3; - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; REG_BG1CNT = 0x9C00; REG_BG2CNT = 0x5E00; } break; case 4: - sub_80E443C(taskId); + EndBattleIntroTask(taskId); break; } } diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c index 69306b725..40f50d7ff 100644 --- a/src/battle/battle_controller_linkopponent.c +++ b/src/battle/battle_controller_linkopponent.c @@ -93,7 +93,7 @@ extern void move_anim_start_t2_for_situation(); extern void dp01t_0F_4_move_anim(void); extern void sub_8047858(); extern u8 GetBankSide(u8); -extern void sub_80E43C0(); +extern void StartBattleIntroAnim(); extern void sub_803A3A8(struct Sprite *); extern void sub_8044CA0(u8); extern void nullsub_47(void); @@ -1620,7 +1620,7 @@ void LinkOpponentHandleFaintingCry(void) void LinkOpponentHandleIntroSlide(void) { - sub_80E43C0(gBattleBufferA[gActiveBank][1]); + StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; LinkOpponentBufferExecCompleted(); } diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index c86c337d9..e39d98997 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -62,7 +62,7 @@ extern u8 move_anim_start_t3(); extern u8 IsBankSpritePresent(); extern void sub_8044CA0(u8); extern void sub_8030E38(struct Sprite *); -extern void sub_80E43C0(); +extern void StartBattleIntroAnim(); extern void sub_8047858(); extern void move_anim_start_t2_for_situation(); extern void load_gfxc_health_bar(); @@ -1565,7 +1565,7 @@ void LinkPartnerHandleFaintingCry(void) void LinkPartnerHandleIntroSlide(void) { - sub_80E43C0(gBattleBufferA[gActiveBank][1]); + StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; LinkPartnerBufferExecCompleted(); } diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index 622e3e9f9..5947053b6 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -108,7 +108,7 @@ extern void move_anim_start_t2_for_situation(); extern void bx_blink_t7(void); extern void sub_8047858(); extern u8 GetBankSide(u8); -extern void sub_80E43C0(); +extern void StartBattleIntroAnim(); extern void sub_8044CA0(u8); extern void nullsub_45(void); extern void sub_8031B74(); @@ -1892,7 +1892,7 @@ void OpponentHandleFaintingCry(void) void OpponentHandleIntroSlide(void) { - sub_80E43C0(gBattleBufferA[gActiveBank][1]); + StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; OpponentBufferExecCompleted(); } diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index a5f833b6c..2bdf448db 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -98,7 +98,7 @@ extern void move_anim_start_t2_for_situation(); extern void bx_blink_t1(void); extern void sub_8047858(); extern u8 GetBankSide(u8); -extern void sub_80E43C0(); +extern void StartBattleIntroAnim(); extern void oamt_add_pos2_onto_pos1(); extern void sub_8078B34(struct Sprite *); extern void StoreSpriteCallbackInData(); @@ -2875,7 +2875,7 @@ void PlayerHandleFaintingCry(void) void PlayerHandleIntroSlide(void) { - sub_80E43C0(gBattleBufferA[gActiveBank][1]); + StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; PlayerBufferExecCompleted(); } diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index a4b610752..0d193d68f 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -47,7 +47,7 @@ extern u8 sub_8079E90(); extern void sub_80313A0(struct Sprite *); extern void sub_810BADC(void); extern void sub_8045A5C(); -extern void sub_80E43C0(); +extern void StartBattleIntroAnim(); extern void sub_804777C(); extern void sub_8043DFC(); extern bool8 move_anim_start_t3(); @@ -641,7 +641,7 @@ void SafariHandleFaintingCry(void) void SafariHandleIntroSlide(void) { - sub_80E43C0(gBattleBufferA[gActiveBank][1]); + StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; SafariBufferExecCompleted(); } diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 6266d955c..4c0adab5e 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -85,7 +85,7 @@ extern void BufferStringBattle(); extern u8 GetBankSide(u8); extern void sub_80304A8(void); extern void sub_8047858(); -extern void sub_80E43C0(); +extern void StartBattleIntroAnim(); extern void oamt_add_pos2_onto_pos1(); extern void sub_8078B34(struct Sprite *); extern void sub_8030E38(struct Sprite *); @@ -1470,7 +1470,7 @@ void WallyHandleFaintingCry(void) void WallyHandleIntroSlide(void) { - sub_80E43C0(gBattleBufferA[gActiveBank][1]); + StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; WallyBufferExecCompleted(); } -- cgit v1.2.3 From 71848fc5fe7185dfcd3e048dee34d9a682b9ead5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 13 Jan 2018 18:13:53 -0600 Subject: clean up save.c --- include/save.h | 81 ++----- src/engine/clear_save_data_menu.c | 2 +- src/engine/link.c | 2 +- src/engine/main_menu.c | 16 +- src/engine/mystery_event_menu.c | 2 +- src/engine/reset_rtc_screen.c | 2 +- src/engine/save.c | 462 ++++++++++++++++++++++---------------- src/engine/save_failed_screen.c | 2 +- src/field/battle_tower.c | 2 +- src/field/start_menu.c | 8 +- src/scene/hall_of_fame.c | 2 +- src/scene/intro.c | 2 +- 12 files changed, 299 insertions(+), 284 deletions(-) diff --git a/include/save.h b/include/save.h index c35ad547a..f86113036 100644 --- a/include/save.h +++ b/include/save.h @@ -1,74 +1,32 @@ #ifndef GUARD_SAVE_H #define GUARD_SAVE_H -struct SaveSectionLocation -{ - u8 *data; - u16 size; -}; - -struct SaveSection -{ - u8 data[0xFF4]; - u16 id; - u16 checksum; - u32 security; - u32 counter; -}; // size is 0x1000 - -// headless save section? -struct UnkSaveSection -{ - u8 data[0xFF4]; - u32 security; -}; // size is 0xFF8 - // Ruby/Sapphire's save data is Flash 128K, which is 32 save sectors. #define NUM_SECTORS 32 // defined in agb_flash but not in a header -#define UNKNOWN_CHECK_VALUE 0x8012025 +#define SAVE_STATUS_EMPTY 0 +#define SAVE_STATUS_OK 1 +#define SAVE_STATUS_NO_FLASH 4 +#define SAVE_STATUS_ERROR 0xFF -// SetDamagedSectorBits states -enum -{ - ENABLE, - DISABLE, - CHECK // unused -}; +extern u16 gSaveFileStatus; + +void Save_EraseAllData(void); +void Save_ResetSaveCounters(void); -// Do save types enum { - NORMAL_SAVE, - LINK_SAVE, - EREADER_SAVE, // mossdeep event - HOF_SAVE, - DIFFERENT_FILE_SAVE, - HOF_DELETE_SAVE // unused + SAVE_NORMAL, + SAVE_LINK, + SAVE_EREADER, + SAVE_HALL_OF_FAME, + SAVE_OVERWRITE_DIFFERENT_FILE, + SAVE_HALL_OF_FAME_ERASE_BEFORE, // unused }; -void ClearSaveData(void); -void ResetSaveCounters(void); -bool32 ManipulateSectorBits(u8 op, u8 bit); -u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *a2); -u8 HandleWriteSector(u16, const struct SaveSectionLocation *); -u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size); -u8 TryWriteSector(u8, u8 *); -u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectionLocation *location); -u32 RestoreSaveBackupVars(const struct SaveSectionLocation *location); -u8 sub_812550C(u16 a1, const struct SaveSectionLocation *location); -u8 sub_812556C(u16 a1, const struct SaveSectionLocation *location); -u8 sub_81255B8(u16, const struct SaveSectionLocation *location); -u8 sub_8125758(u16 a1, const struct SaveSectionLocation *location); -u8 sub_81257F0(u16 a1, const struct SaveSectionLocation *location); -u8 sub_812587C(u16 a1, const struct SaveSectionLocation *location); -u8 sub_81258BC(u16, const struct SaveSectionLocation *location); -u8 GetSaveValidStatus(const struct SaveSectionLocation *location); -u8 sub_8125B88(u8 a1, u8 *data, u16 size); -u8 DoReadFlashWholeSection(u8, struct SaveSection *); -u16 CalculateChecksum(void *, u16); -u8 HandleSavingData(u8 saveType); -u8 TrySavingData(u8 saveType); +u8 Save_WriteDataInternal(u8 saveType); +u8 Save_WriteData(u8 saveType); + u8 sub_8125D80(void); bool8 sub_8125DA8(void); u8 sub_8125DDC(void); @@ -76,10 +34,5 @@ u8 sub_8125E04(void); u8 sub_8125E2C(void); bool8 sub_8125E6C(void); u8 sub_8125EC8(u8 a1); -bool8 unref_sub_8125F4C(struct UnkSaveSection *a1); -u8 unref_sub_8125FA0(void); -u8 unref_sub_8125FF0(u8 *data, u16 size); -u8 unref_sub_8126068(u8 sector, u8 *data, u32 size); -u8 unref_sub_8126080(u8 sector, u8 *data); #endif // GUARD_SAVE_H diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c index 08fd5cd18..b6053715a 100644 --- a/src/engine/clear_save_data_menu.c +++ b/src/engine/clear_save_data_menu.c @@ -73,7 +73,7 @@ static void Task_ProcessMenuInput(u8 taskId) static void Task_ClearSaveData(u8 taskId) { - ClearSaveData(); + Save_EraseAllData(); DestroyTask(taskId); SetMainCallback2(CB2_SoftReset); } diff --git a/src/engine/link.c b/src/engine/link.c index 34016d607..ec94295d7 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -409,7 +409,7 @@ static void LinkTestProcessKeyInput(void) if (gMain.newKeys & START_BUTTON) SetSuppressLinkErrorMessage(TRUE); if (gMain.newKeys & R_BUTTON) - TrySavingData(LINK_SAVE); + Save_WriteData(SAVE_LINK); if (gMain.newKeys & SELECT_BUTTON) sub_800832C(); if (gLinkTestDebugValuesEnabled) diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index a0b8b7020..5a3f55b29 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -1,4 +1,6 @@ #include "global.h" +#include "constants/songs.h" +#include "constants/species.h" #include "main_menu.h" #include "data2.h" #include "decompress.h" @@ -13,9 +15,8 @@ #include "overworld.h" #include "rtc.h" #include "save_menu_util.h" -#include "constants/songs.h" +#include "save.h" #include "sound.h" -#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" @@ -28,8 +29,6 @@ extern struct PaletteFadeControl gPaletteFade; -extern u16 gSaveFileStatus; - extern const u8 gBirchSpeech_Welcome[]; extern const u8 gBirchSpeech_ThisIsPokemon[]; extern const u8 gBirchSpeech_WorldInhabitedByPokemon[]; @@ -284,12 +283,11 @@ void Task_MainMenuCheckSave(u8 taskId) switch (gSaveFileStatus) { - case 1: + case SAVE_STATUS_OK: if (IsMysteryGiftEnabled() == TRUE) gTasks[taskId].tMenuLayout = HAS_MYSTERY_GIFT; else gTasks[taskId].tMenuLayout = HAS_SAVED_GAME; - gTasks[taskId].func = Task_MainMenuCheckRtc; break; case 2: @@ -300,7 +298,7 @@ void Task_MainMenuCheckSave(u8 taskId) gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME; gTasks[taskId].func = Task_MainMenuWaitForSaveErrorAck; break; - case 255: + case SAVE_STATUS_ERROR: Menu_DrawStdWindowFrame(2, 14, 27, 19); MenuPrintMessage(gSaveFileCorruptMessage, 3, 15); REG_WIN0H = WIN_RANGE(17, 223); @@ -313,12 +311,12 @@ void Task_MainMenuCheckSave(u8 taskId) else gTasks[taskId].tMenuLayout = HAS_SAVED_GAME; break; - case 0: + case SAVE_STATUS_EMPTY: default: gTasks[taskId].tMenuLayout = HAS_NO_SAVED_GAME; gTasks[taskId].func = Task_MainMenuCheckRtc; break; - case 4: + case SAVE_STATUS_NO_FLASH: Menu_DrawStdWindowFrame(2, 14, 27, 19); MenuPrintMessage(gBoardNotInstalledMessage, 3, 15); REG_WIN0H = WIN_RANGE(17, 223); diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index b7b7c047e..8fad563e6 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -289,7 +289,7 @@ static void CB2_MysteryEventMenu(void) unkVal = RunMysteryEventScript(gSharedMem); CpuFill32(0, gSharedMem, 0x7D4); if (!GetEventLoadMessage(gStringVar4, unkVal)) - TrySavingData(NORMAL_SAVE); + Save_WriteData(SAVE_NORMAL); gMain.state++; break; case 12: diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index a8b49a8eb..c7d45e929 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -576,7 +576,7 @@ void Task_ResetRtcScreen(u8 taskId) } break; case 4: - if (TrySavingData(0) == TRUE) + if (Save_WriteData(0) == SAVE_STATUS_OK) { ResetRtcScreen_ShowMessage(gSystemText_SaveCompleted); PlaySE(SE_PINPON); diff --git a/src/engine/save.c b/src/engine/save.c index d5de2e408..f1010c69e 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -7,10 +7,53 @@ #include "save_failed_screen.h" #include "ewram.h" -#define GETVALIDSTATUSBITFIELD ((1 << ARRAY_COUNT(gSaveSectionLocations)) - 1) -#define GETCHUNKSIZE(chunk, n) ((sizeof(chunk) - (0xF80 * (n - 1))) >= 0xF80 ? 0xF80 : (sizeof(chunk) - (0xF80 * (n - 1)))) -#define GETBLOCKOFFSET(n) (0xF80 * (n - 1)) -#define TOTALNUMSECTORS ((ARRAY_COUNT(gSaveSectionLocations) * 2) + (ARRAY_COUNT(gHallOfFameSaveSectionLocations) * 2)) // there are 2 slots, so double each array count and get the sum. +#define FILE_SIGNATURE 0x08012025 // signature value to determine if a sector is in use + +#define TOTALNUMSECTORS ((ARRAY_COUNT(sSaveBlockChunks) * 2) + (ARRAY_COUNT(sHallOfFameChunks) * 2)) // there are 2 slots, so double each array count and get the sum. + +struct SaveBlockChunk +{ + u8 *data; + u16 size; +}; + +struct SaveSection +{ + u8 data[0xFF4]; + u16 id; + u16 checksum; + u32 signature; + u32 counter; +}; // size is 0x1000 + +// headless save section? +struct UnkSaveSection +{ + u8 data[0xFF4]; + u32 signature; +}; // size is 0xFF8 + +static u8 WriteChunk(u16, const struct SaveBlockChunk *); +static u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size); +static u8 TryWriteSector(u8, u8 *); +static u32 RestoreSaveBackupVarsAndIncrement(const struct SaveBlockChunk *location); +static u32 RestoreSaveBackupVars(const struct SaveBlockChunk *location); +static u8 sub_812550C(u16 a1, const struct SaveBlockChunk *location); +static u8 sub_812556C(u16 a1, const struct SaveBlockChunk *location); +static u8 sub_81255B8(u16, const struct SaveBlockChunk *location); +static u8 sub_8125758(u16 a1, const struct SaveBlockChunk *location); +static u8 sub_81257F0(u16 a1, const struct SaveBlockChunk *location); +static u8 sub_812587C(u16 a1, const struct SaveBlockChunk *location); +static u8 sub_81258BC(u16, const struct SaveBlockChunk *location); +static u8 GetSaveValidStatus(const struct SaveBlockChunk *location); +static u8 sub_8125B88(u8 a1, u8 *data, u16 size); +static u8 DoReadFlashWholeSection(u8, struct SaveSection *); +static u16 CalculateChecksum(void *, u16); +bool8 unref_sub_8125F4C(struct UnkSaveSection *a1); +u8 unref_sub_8125FA0(void); +u8 unref_sub_8125FF0(u8 *data, u16 size); +u8 unref_sub_8126068(u8 sector, u8 *data, u32 size); +u8 unref_sub_8126080(u8 sector, u8 *data); u16 gLastWrittenSector; u32 gLastSaveCounter; @@ -26,33 +69,47 @@ extern struct PokemonStorage gPokemonStorage; static EWRAM_DATA u32 gLastSaveSectorStatus = 0; // used but in an unferenced function, so unused -const struct SaveSectionLocation gSaveSectionLocations[] = -{ - {((u8 *) &gSaveBlock2) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gSaveBlock2, 1)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gSaveBlock1, 1)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(2), GETCHUNKSIZE(gSaveBlock1, 2)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(3), GETCHUNKSIZE(gSaveBlock1, 3)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(4), GETCHUNKSIZE(gSaveBlock1, 4)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gPokemonStorage, 1)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(2), GETCHUNKSIZE(gPokemonStorage, 2)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(3), GETCHUNKSIZE(gPokemonStorage, 3)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(4), GETCHUNKSIZE(gPokemonStorage, 4)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(5), GETCHUNKSIZE(gPokemonStorage, 5)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(6), GETCHUNKSIZE(gPokemonStorage, 6)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(7), GETCHUNKSIZE(gPokemonStorage, 7)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(8), GETCHUNKSIZE(gPokemonStorage, 8)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(9), GETCHUNKSIZE(gPokemonStorage, 9)} +// Each 4 KiB flash sector contains 3968 bytes of actual data followed by a 128 byte footer +#define SECTOR_DATA_SIZE 3968 +#define SECTOR_FOOTER_SIZE 128 + +// Divide save blocks into individual chunks to be written to flash sectors + +#define SAVEBLOCK_CHUNK(structure, chunkNum) \ +{ \ + (u8 *)&structure + chunkNum * SECTOR_DATA_SIZE, \ + min(sizeof(structure) - chunkNum * SECTOR_DATA_SIZE, SECTOR_DATA_SIZE) \ +} \ + +static const struct SaveBlockChunk sSaveBlockChunks[] = +{ + SAVEBLOCK_CHUNK(gSaveBlock2, 0), + + SAVEBLOCK_CHUNK(gSaveBlock1, 0), + SAVEBLOCK_CHUNK(gSaveBlock1, 1), + SAVEBLOCK_CHUNK(gSaveBlock1, 2), + SAVEBLOCK_CHUNK(gSaveBlock1, 3), + + SAVEBLOCK_CHUNK(gPokemonStorage, 0), + SAVEBLOCK_CHUNK(gPokemonStorage, 1), + SAVEBLOCK_CHUNK(gPokemonStorage, 2), + SAVEBLOCK_CHUNK(gPokemonStorage, 3), + SAVEBLOCK_CHUNK(gPokemonStorage, 4), + SAVEBLOCK_CHUNK(gPokemonStorage, 5), + SAVEBLOCK_CHUNK(gPokemonStorage, 6), + SAVEBLOCK_CHUNK(gPokemonStorage, 7), + SAVEBLOCK_CHUNK(gPokemonStorage, 8), }; -const struct SaveSectionLocation gHallOfFameSaveSectionLocations[] = +static const struct SaveBlockChunk sHallOfFameChunks[] = { - {((u8 *) eHallOfFame) + GETBLOCKOFFSET(1), GETCHUNKSIZE(struct HallOfFame, 1)}, // eHallOfFame is not a proper sym, so the struct must be used. - {((u8 *) eHallOfFame) + GETBLOCKOFFSET(2), GETCHUNKSIZE(struct HallOfFame, 2)} + SAVEBLOCK_CHUNK(*eHallOfFame, 0), + SAVEBLOCK_CHUNK(*eHallOfFame, 1), }; const u8 gFlashSectors[] = { 0x1E, 0x1F }; -void ClearSaveData(void) +void Save_EraseAllData(void) { u16 i; @@ -60,27 +117,34 @@ void ClearSaveData(void) EraseFlashSector(i); } -void ResetSaveCounters(void) +void Save_ResetSaveCounters(void) { gSaveCounter = 0; gLastWrittenSector = 0; gDamagedSaveSectors = 0; } -bool32 SetDamagedSectorBits(u8 op, u8 bit) +enum +{ + ENABLE, + DISABLE, + CHECK // unused +}; + +static bool32 SetSectorDamagedStatus(u8 op, u8 sectorNum) { bool32 retVal = FALSE; switch (op) { case ENABLE: - gDamagedSaveSectors |= (1 << bit); + gDamagedSaveSectors |= (1 << sectorNum); break; case DISABLE: - gDamagedSaveSectors &= ~(1 << bit); + gDamagedSaveSectors &= ~(1 << sectorNum); break; case CHECK: // unused - if (gDamagedSaveSectors & (1 << bit)) + if (gDamagedSaveSectors & (1 << sectorNum)) retVal = TRUE; break; } @@ -88,7 +152,7 @@ bool32 SetDamagedSectorBits(u8 op, u8 bit) return retVal; } -u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location) +static u8 WriteSaveBlockChunks(u16 a1, const struct SaveBlockChunk *chunks) { u32 retVal; u16 i; @@ -97,23 +161,24 @@ u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location) if (a1 != 0xFFFF) // for link { - retVal = HandleWriteSector(a1, location); + retVal = WriteChunk(a1, chunks); } else { gLastKnownGoodSector = gLastWrittenSector; // backup the current written sector before attempting to write. gLastSaveCounter = gSaveCounter; gLastWrittenSector++; - gLastWrittenSector = gLastWrittenSector % ARRAY_COUNT(gSaveSectionLocations); + gLastWrittenSector %= ARRAY_COUNT(sSaveBlockChunks); gSaveCounter++; - retVal = 1; + retVal = SAVE_STATUS_OK; - for (i = 0; i < ARRAY_COUNT(gSaveSectionLocations); i++) - HandleWriteSector(i, location); + for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) + WriteChunk(i, chunks); + // Check for any bad sectors if (gDamagedSaveSectors != 0) // skip the damaged sector. { - retVal = 0xFF; + retVal = SAVE_STATUS_ERROR; gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; } @@ -122,36 +187,35 @@ u8 save_write_to_flash(u16 a1, const struct SaveSectionLocation *location) return retVal; } -u8 HandleWriteSector(u16 a1, const struct SaveSectionLocation *location) +static u8 WriteChunk(u16 chunkId, const struct SaveBlockChunk *chunks) { u16 i; - u16 sector; + u16 sectorNum; u8 *data; u16 size; - sector = a1 + gLastWrittenSector; - sector %= ARRAY_COUNT(gSaveSectionLocations); - sector += ARRAY_COUNT(gSaveSectionLocations) * (gSaveCounter % 2); + sectorNum = chunkId + gLastWrittenSector; + sectorNum %= ARRAY_COUNT(sSaveBlockChunks); + sectorNum += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); - data = location[a1].data; - size = location[a1].size; + data = chunks[chunkId].data; + size = chunks[chunkId].size; // clear save section. for (i = 0; i < sizeof(struct SaveSection); i++) - ((char *)gFastSaveSection)[i] = 0; + ((u8 *)gFastSaveSection)[i] = 0; - gFastSaveSection->id = a1; - gFastSaveSection->security = UNKNOWN_CHECK_VALUE; + gFastSaveSection->id = chunkId; + gFastSaveSection->signature = FILE_SIGNATURE; gFastSaveSection->counter = gSaveCounter; - for (i = 0; i < size; i++) gFastSaveSection->data[i] = data[i]; - gFastSaveSection->checksum = CalculateChecksum(data, size); - return TryWriteSector(sector, gFastSaveSection->data); + + return TryWriteSector(sectorNum, gFastSaveSection->data); } -u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size) +static u8 HandleWriteSectorNBytes(u8 sectorNum, u8 *data, u16 size) { u16 i; struct SaveSection *section = eSaveSection; @@ -159,43 +223,42 @@ u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size) for (i = 0; i < sizeof(struct SaveSection); i++) ((char *)section)[i] = 0; - section->security = UNKNOWN_CHECK_VALUE; - + section->signature = FILE_SIGNATURE; for (i = 0; i < size; i++) section->data[i] = data[i]; - section->id = CalculateChecksum(data, size); // though this appears to be incorrect, it might be some sector checksum instead of a whole save checksum and only appears to be relevent to HOF data, if used. - return TryWriteSector(sector, section->data); + + return TryWriteSector(sectorNum, section->data); } -u8 TryWriteSector(u8 sector, u8 *data) +static u8 TryWriteSector(u8 sectorNum, u8 *data) { - if (ProgramFlashSectorAndVerify(sector, data) != 0) // is damaged? + if (ProgramFlashSectorAndVerify(sectorNum, data) != 0) // is damaged? { - SetDamagedSectorBits(ENABLE, sector); // set damaged sector bits. - return 0xFF; + SetSectorDamagedStatus(ENABLE, sectorNum); // set damaged sector bits. + return SAVE_STATUS_ERROR; } else { - SetDamagedSectorBits(DISABLE, sector); // unset damaged sector bits. it's safe now. - return 1; + SetSectorDamagedStatus(DISABLE, sectorNum); // unset damaged sector bits. it's safe now. + return SAVE_STATUS_OK; } } -u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectionLocation *location) // location is unused +static u32 RestoreSaveBackupVarsAndIncrement(const struct SaveBlockChunk *chunk) // chunk is unused { gFastSaveSection = eSaveSection; gLastKnownGoodSector = gLastWrittenSector; gLastSaveCounter = gSaveCounter; gLastWrittenSector++; - gLastWrittenSector = gLastWrittenSector % ARRAY_COUNT(gSaveSectionLocations); + gLastWrittenSector = gLastWrittenSector % ARRAY_COUNT(sSaveBlockChunks); gSaveCounter++; gUnknown_03005EB4 = 0; gDamagedSaveSectors = 0; return 0; } -u32 RestoreSaveBackupVars(const struct SaveSectionLocation *location) // only ever called once, and gSaveBlock2 is passed to this function. location is unused +static u32 RestoreSaveBackupVars(const struct SaveBlockChunk *chunk) // only ever called once, and gSaveBlock2 is passed to this function. chunk is unused { gFastSaveSection = eSaveSection; gLastKnownGoodSector = gLastWrittenSector; @@ -205,14 +268,14 @@ u32 RestoreSaveBackupVars(const struct SaveSectionLocation *location) // only ev return 0; } -u8 sub_812550C(u16 a1, const struct SaveSectionLocation *location) +static u8 sub_812550C(u16 a1, const struct SaveBlockChunk *chunk) { u8 retVal; if (gUnknown_03005EB4 < a1 - 1) { retVal = 1; - HandleWriteSector(gUnknown_03005EB4, location); + WriteChunk(gUnknown_03005EB4, chunk); gUnknown_03005EB4++; if (gDamagedSaveSectors) { @@ -229,11 +292,11 @@ u8 sub_812550C(u16 a1, const struct SaveSectionLocation *location) return retVal; } -u8 sub_812556C(u16 a1, const struct SaveSectionLocation *location) +static u8 sub_812556C(u16 a1, const struct SaveBlockChunk *chunk) { u8 retVal = 1; - sub_81255B8(a1 - 1, location); + sub_81255B8(a1 - 1, chunk); if (gDamagedSaveSectors) { @@ -244,7 +307,7 @@ u8 sub_812556C(u16 a1, const struct SaveSectionLocation *location) return retVal; } -u8 sub_81255B8(u16 a1, const struct SaveSectionLocation *location) +static u8 sub_81255B8(u16 chunkId, const struct SaveBlockChunk *chunks) { u16 i; u16 sector; @@ -252,19 +315,19 @@ u8 sub_81255B8(u16 a1, const struct SaveSectionLocation *location) u16 size; u8 status; - sector = a1 + gLastWrittenSector; - sector %= ARRAY_COUNT(gSaveSectionLocations); - sector += ARRAY_COUNT(gSaveSectionLocations) * (gSaveCounter % 2); + sector = chunkId + gLastWrittenSector; + sector %= ARRAY_COUNT(sSaveBlockChunks); + sector += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); - data = location[a1].data; - size = location[a1].size; + data = chunks[chunkId].data; + size = chunks[chunkId].size; // clear temp save section. for (i = 0; i < sizeof(struct SaveSection); i++) ((char *)gFastSaveSection)[i] = 0; - gFastSaveSection->id = a1; - gFastSaveSection->security = UNKNOWN_CHECK_VALUE; + gFastSaveSection->id = chunkId; + gFastSaveSection->signature = FILE_SIGNATURE; gFastSaveSection->counter = gSaveCounter; // set temp section's data. @@ -289,7 +352,7 @@ u8 sub_81255B8(u16 a1, const struct SaveSectionLocation *location) if (status == 0xFF) { - SetDamagedSectorBits(ENABLE, sector); + SetSectorDamagedStatus(ENABLE, sector); return 0xFF; } else @@ -307,224 +370,220 @@ u8 sub_81255B8(u16 a1, const struct SaveSectionLocation *location) if (status == 0xFF) { - SetDamagedSectorBits(ENABLE, sector); + SetSectorDamagedStatus(ENABLE, sector); return 0xFF; } else { - SetDamagedSectorBits(DISABLE, sector); + SetSectorDamagedStatus(DISABLE, sector); return 1; } } } -u8 sub_8125758(u16 a1, const struct SaveSectionLocation *location) +static u8 sub_8125758(u16 a1, const struct SaveBlockChunk *chunk) { u16 sector; sector = a1 + gLastWrittenSector - 1; - sector %= ARRAY_COUNT(gSaveSectionLocations); - sector += ARRAY_COUNT(gSaveSectionLocations) * (gSaveCounter % 2); + sector %= ARRAY_COUNT(sSaveBlockChunks); + sector += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), ((u8 *)gFastSaveSection)[sizeof(struct UnkSaveSection)])) { // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. - SetDamagedSectorBits(ENABLE, sector); + SetSectorDamagedStatus(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return SAVE_STATUS_ERROR; } else { - SetDamagedSectorBits(DISABLE, sector); - return 1; + SetSectorDamagedStatus(DISABLE, sector); + return SAVE_STATUS_OK; } } -u8 sub_81257F0(u16 a1, const struct SaveSectionLocation *location) +static u8 sub_81257F0(u16 a1, const struct SaveBlockChunk *chunk) { u16 sector; sector = a1 + gLastWrittenSector - 1; - sector %= ARRAY_COUNT(gSaveSectionLocations); - sector += ARRAY_COUNT(gSaveSectionLocations) * (gSaveCounter % 2); + sector %= ARRAY_COUNT(sSaveBlockChunks); + sector += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), 0x25)) { // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. - SetDamagedSectorBits(ENABLE, sector); + SetSectorDamagedStatus(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; - return 0xFF; + return SAVE_STATUS_ERROR; } else { - SetDamagedSectorBits(DISABLE, sector); - return 1; + SetSectorDamagedStatus(DISABLE, sector); + return SAVE_STATUS_OK; } } -u8 sub_812587C(u16 a1, const struct SaveSectionLocation *location) +static u8 sub_812587C(u16 a1, const struct SaveBlockChunk *chunk) { u8 retVal; gFastSaveSection = eSaveSection; if (a1 != 0xFFFF) { - retVal = 0xFF; + retVal = SAVE_STATUS_ERROR; } else { - retVal = GetSaveValidStatus(location); - sub_81258BC(0xFFFF, location); + retVal = GetSaveValidStatus(chunk); + sub_81258BC(0xFFFF, chunk); } return retVal; } -u8 sub_81258BC(u16 a1, const struct SaveSectionLocation *location) +static u8 sub_81258BC(u16 a1, const struct SaveBlockChunk *chunks) { u16 i; u16 checksum; - u16 v3 = ARRAY_COUNT(gSaveSectionLocations) * (gSaveCounter % 2); + u16 v3 = ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); u16 id; - for (i = 0; i < ARRAY_COUNT(gSaveSectionLocations); i++) + for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) { DoReadFlashWholeSection(i + v3, gFastSaveSection); id = gFastSaveSection->id; if (id == 0) gLastWrittenSector = i; - checksum = CalculateChecksum(gFastSaveSection->data, location[id].size); - if (gFastSaveSection->security == UNKNOWN_CHECK_VALUE + checksum = CalculateChecksum(gFastSaveSection->data, chunks[id].size); + if (gFastSaveSection->signature == FILE_SIGNATURE && gFastSaveSection->checksum == checksum) { u16 j; - for (j = 0; j < location[id].size; j++) - location[id].data[j] = gFastSaveSection->data[j]; + for (j = 0; j < chunks[id].size; j++) + chunks[id].data[j] = gFastSaveSection->data[j]; } } return 1; } -u8 GetSaveValidStatus(const struct SaveSectionLocation *location) +static u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) { u16 i; + bool8 signatureValid; u16 checksum; u32 saveSlot1Counter = 0; u32 saveSlot2Counter = 0; - u32 slotCheckField = 0; - bool8 securityPassed = FALSE; - u8 saveSlot1Status; - u8 saveSlot2Status; + u8 slot1Status; + u8 slot2Status; + u32 validChunks; + const u32 ALL_CHUNKS = (1 << ARRAY_COUNT(sSaveBlockChunks)) - 1; // bitmask of all saveblock chunks // check save slot 1. - for (i = 0; i < ARRAY_COUNT(gSaveSectionLocations); i++) + validChunks = 0; + signatureValid = FALSE; + for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) { DoReadFlashWholeSection(i, gFastSaveSection); - if (gFastSaveSection->security == UNKNOWN_CHECK_VALUE) + if (gFastSaveSection->signature == FILE_SIGNATURE) { - securityPassed = TRUE; - checksum = CalculateChecksum(gFastSaveSection->data, location[gFastSaveSection->id].size); + signatureValid = TRUE; + checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); if (gFastSaveSection->checksum == checksum) { saveSlot1Counter = gFastSaveSection->counter; - slotCheckField |= 1 << gFastSaveSection->id; + validChunks |= 1 << gFastSaveSection->id; } } } - if (securityPassed) + if (signatureValid) { - if (slotCheckField == GETVALIDSTATUSBITFIELD) - saveSlot1Status = 1; + if (validChunks == ALL_CHUNKS) + slot1Status = SAVE_STATUS_OK; else - saveSlot1Status = 255; + slot1Status = SAVE_STATUS_ERROR; } else { - saveSlot1Status = 0; + slot1Status = SAVE_STATUS_EMPTY; } - slotCheckField = 0; - securityPassed = FALSE; - // check save slot 2. - for (i = 0; i < ARRAY_COUNT(gSaveSectionLocations); i++) + validChunks = 0; + signatureValid = FALSE; + for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) { - DoReadFlashWholeSection(i + ARRAY_COUNT(gSaveSectionLocations), gFastSaveSection); - if (gFastSaveSection->security == UNKNOWN_CHECK_VALUE) + DoReadFlashWholeSection(i + ARRAY_COUNT(sSaveBlockChunks), gFastSaveSection); + if (gFastSaveSection->signature == FILE_SIGNATURE) { - securityPassed = TRUE; - checksum = CalculateChecksum(gFastSaveSection->data, location[gFastSaveSection->id].size); + signatureValid = TRUE; + checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); if (gFastSaveSection->checksum == checksum) { saveSlot2Counter = gFastSaveSection->counter; - slotCheckField |= 1 << gFastSaveSection->id; + validChunks |= 1 << gFastSaveSection->id; } } } - if (securityPassed) + if (signatureValid) { - if (slotCheckField == GETVALIDSTATUSBITFIELD) - saveSlot2Status = 1; + if (validChunks == ALL_CHUNKS) + slot2Status = SAVE_STATUS_OK; else - saveSlot2Status = 255; + slot2Status = SAVE_STATUS_ERROR; } else { - saveSlot2Status = 0; + slot2Status = SAVE_STATUS_EMPTY; } - if (saveSlot1Status == 1 && saveSlot2Status == 1) + if (slot1Status == SAVE_STATUS_OK && slot2Status == SAVE_STATUS_OK) { if ((saveSlot1Counter == -1 && saveSlot2Counter == 0) || (saveSlot1Counter == 0 && saveSlot2Counter == -1)) { if ((unsigned)(saveSlot1Counter + 1) < (unsigned)(saveSlot2Counter + 1)) - { gSaveCounter = saveSlot2Counter; - } else - { gSaveCounter = saveSlot1Counter; - } } else { if (saveSlot1Counter < saveSlot2Counter) - { gSaveCounter = saveSlot2Counter; - } else - { gSaveCounter = saveSlot1Counter; - } } - return 1; + return SAVE_STATUS_OK; } - if (saveSlot1Status == 1) + if (slot1Status == SAVE_STATUS_OK) { gSaveCounter = saveSlot1Counter; - if (saveSlot2Status == 255) - return 255; - return 1; + if (slot2Status == SAVE_STATUS_ERROR) + return SAVE_STATUS_ERROR; + else + return SAVE_STATUS_OK; } - if (saveSlot2Status == 1) + if (slot2Status == SAVE_STATUS_OK) { gSaveCounter = saveSlot2Counter; - if (saveSlot1Status == 255) - return 255; - return 1; + if (slot1Status == SAVE_STATUS_ERROR) + return SAVE_STATUS_ERROR; + else + return SAVE_STATUS_OK; } - if (saveSlot1Status == 0 && saveSlot2Status == 0) + if (slot1Status == SAVE_STATUS_EMPTY && slot2Status == SAVE_STATUS_EMPTY) { gSaveCounter = 0; gLastWrittenSector = 0; - return 0; + return SAVE_STATUS_EMPTY; } gSaveCounter = 0; @@ -532,12 +591,13 @@ u8 GetSaveValidStatus(const struct SaveSectionLocation *location) return 2; } -u8 sub_8125B88(u8 a1, u8 *data, u16 size) +static u8 sub_8125B88(u8 a1, u8 *data, u16 size) { u16 i; struct SaveSection *section = eSaveSection; + DoReadFlashWholeSection(a1, section); - if (section->security == UNKNOWN_CHECK_VALUE) + if (section->signature == FILE_SIGNATURE) { u16 checksum = CalculateChecksum(section->data, size); if (section->id == checksum) @@ -557,13 +617,13 @@ u8 sub_8125B88(u8 a1, u8 *data, u16 size) } } -u8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section) +static u8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section) { ReadFlash(sector, 0, section->data, sizeof(struct SaveSection)); return 1; } -u16 CalculateChecksum(void *data, u16 size) +static u16 CalculateChecksum(void *data, u16 size) { u16 i; u32 checksum = 0; @@ -574,55 +634,59 @@ u16 CalculateChecksum(void *data, u16 size) return ((checksum >> 16) + checksum); } -u8 HandleSavingData(u8 saveType) +u8 Save_WriteDataInternal(u8 saveType) { u8 i; + switch (saveType) { - case HOF_DELETE_SAVE: // deletes HOF before overwriting HOF completely. unused - for (i = (ARRAY_COUNT(gSaveSectionLocations) * 2 + 0); i < TOTALNUMSECTORS; i++) + case SAVE_HALL_OF_FAME_ERASE_BEFORE: // wipes all normal save data, then saves hall of fame, unused + for (i = (ARRAY_COUNT(sSaveBlockChunks) * 2 + 0); i < TOTALNUMSECTORS; i++) EraseFlashSector(i); - case HOF_SAVE: // hall of fame. + // fall through + case SAVE_HALL_OF_FAME: // hall of fame. if (GetGameStat(10) < 999) IncrementGameStat(10); - for (i = 0; i < ARRAY_COUNT(gHallOfFameSaveSectionLocations); i++) - HandleWriteSectorNBytes((ARRAY_COUNT(gSaveSectionLocations) * 2 + 0) + i, gHallOfFameSaveSectionLocations[i].data, gHallOfFameSaveSectionLocations[i].size); + for (i = 0; i < ARRAY_COUNT(sHallOfFameChunks); i++) + HandleWriteSectorNBytes((ARRAY_COUNT(sSaveBlockChunks) * 2 + 0) + i, sHallOfFameChunks[i].data, sHallOfFameChunks[i].size); SaveSerializedGame(); - save_write_to_flash(0xFFFF, gSaveSectionLocations); + WriteSaveBlockChunks(0xFFFF, sSaveBlockChunks); break; - case NORMAL_SAVE: // normal save. also called by overwriting your own save. + case SAVE_NORMAL: // normal save. also called by overwriting your own save. default: SaveSerializedGame(); - save_write_to_flash(0xFFFF, gSaveSectionLocations); + WriteSaveBlockChunks(0xFFFF, sSaveBlockChunks); break; - case LINK_SAVE: // link save. updates only gSaveBlock1 and gSaveBlock2. + case SAVE_LINK: // link save. updates only gSaveBlock1 and gSaveBlock2. SaveSerializedGame(); for (i = 0; i < 5; i++) - save_write_to_flash(i, gSaveSectionLocations); + WriteSaveBlockChunks(i, sSaveBlockChunks); break; - case EREADER_SAVE: // used in mossdeep "game corner" before/after battling old man e-reader trainer + case SAVE_EREADER: // used in mossdeep "game corner" before/after battling old man e-reader trainer SaveSerializedGame(); - save_write_to_flash(0, gSaveSectionLocations); + WriteSaveBlockChunks(0, sSaveBlockChunks); break; - case DIFFERENT_FILE_SAVE: // there is a different file, so erase the file and overwrite it completely. - for (i = (ARRAY_COUNT(gSaveSectionLocations) * 2 + 0); i < TOTALNUMSECTORS; i++) + case SAVE_OVERWRITE_DIFFERENT_FILE: // there is a different file, so erase the file and overwrite it completely. + for (i = (ARRAY_COUNT(sSaveBlockChunks) * 2 + 0); i < TOTALNUMSECTORS; i++) EraseFlashSector(i); // erase HOF. SaveSerializedGame(); - save_write_to_flash(0xFFFF, gSaveSectionLocations); + WriteSaveBlockChunks(0xFFFF, sSaveBlockChunks); break; } return 0; } -u8 TrySavingData(u8 saveType) // TrySave +u8 Save_WriteData(u8 saveType) // TrySave { if (gFlashMemoryPresent != TRUE) - return 0xFF; - HandleSavingData(saveType); + return SAVE_STATUS_ERROR; + + Save_WriteDataInternal(saveType); if (!gDamagedSaveSectors) - return 1; + return SAVE_STATUS_OK; + DoSaveFailedScreen(saveType); - return 0xFF; + return SAVE_STATUS_ERROR; } u8 sub_8125D80(void) // trade.s save @@ -630,16 +694,16 @@ u8 sub_8125D80(void) // trade.s save if (gFlashMemoryPresent != TRUE) return 1; SaveSerializedGame(); - RestoreSaveBackupVarsAndIncrement(gSaveSectionLocations); + RestoreSaveBackupVarsAndIncrement(sSaveBlockChunks); return 0; } bool8 sub_8125DA8(void) // trade.s save { - u8 retVal = sub_812550C(ARRAY_COUNT(gSaveSectionLocations), gSaveSectionLocations); + u8 retVal = sub_812550C(ARRAY_COUNT(sSaveBlockChunks), sSaveBlockChunks); if (gDamagedSaveSectors) DoSaveFailedScreen(0); - if (retVal == 0xFF) + if (retVal == SAVE_STATUS_ERROR) return 1; else return 0; @@ -647,7 +711,7 @@ bool8 sub_8125DA8(void) // trade.s save u8 sub_8125DDC(void) // trade.s save { - sub_812556C(ARRAY_COUNT(gSaveSectionLocations), gSaveSectionLocations); + sub_812556C(ARRAY_COUNT(sSaveBlockChunks), sSaveBlockChunks); if (gDamagedSaveSectors) DoSaveFailedScreen(0); return 0; @@ -655,7 +719,7 @@ u8 sub_8125DDC(void) // trade.s save u8 sub_8125E04(void) // trade.s save { - sub_8125758(ARRAY_COUNT(gSaveSectionLocations), gSaveSectionLocations); + sub_8125758(ARRAY_COUNT(sSaveBlockChunks), sSaveBlockChunks); if (gDamagedSaveSectors) DoSaveFailedScreen(0); return 0; @@ -667,8 +731,8 @@ u8 sub_8125E2C(void) return 1; SaveSerializedGame(); - RestoreSaveBackupVars(gSaveSectionLocations); - sub_812556C(gUnknown_03005EB4 + 1, gSaveSectionLocations); + RestoreSaveBackupVars(sSaveBlockChunks); + sub_812556C(gUnknown_03005EB4 + 1, sSaveBlockChunks); return 0; } @@ -678,12 +742,12 @@ bool8 sub_8125E6C(void) u16 val = ++gUnknown_03005EB4; if (val <= 4) { - sub_812556C(gUnknown_03005EB4 + 1, gSaveSectionLocations); - sub_81257F0(val, gSaveSectionLocations); + sub_812556C(gUnknown_03005EB4 + 1, sSaveBlockChunks); + sub_81257F0(val, sSaveBlockChunks); } else { - sub_81257F0(val, gSaveSectionLocations); + sub_81257F0(val, sSaveBlockChunks); retVal = TRUE; } if (gDamagedSaveSectors) @@ -697,23 +761,23 @@ u8 sub_8125EC8(u8 a1) if (gFlashMemoryPresent != TRUE) { - gSaveFileStatus = 4; - return 0xFF; + gSaveFileStatus = SAVE_STATUS_NO_FLASH; + return SAVE_STATUS_ERROR; } switch (a1) { case 0: default: - result = sub_812587C(0xFFFF, gSaveSectionLocations); + result = sub_812587C(0xFFFF, sSaveBlockChunks); LoadSerializedGame(); gSaveFileStatus = result; gGameContinueCallback = 0; break; case 3: - result = sub_8125B88((ARRAY_COUNT(gSaveSectionLocations) * 2 + 0), gHallOfFameSaveSectionLocations[0].data, gHallOfFameSaveSectionLocations[0].size); + result = sub_8125B88((ARRAY_COUNT(sSaveBlockChunks) * 2 + 0), sHallOfFameChunks[0].data, sHallOfFameChunks[0].size); if (result == 1) - result = sub_8125B88((ARRAY_COUNT(gSaveSectionLocations) * 2 + 1), gHallOfFameSaveSectionLocations[1].data, gHallOfFameSaveSectionLocations[1].size); + result = sub_8125B88((ARRAY_COUNT(sSaveBlockChunks) * 2 + 1), sHallOfFameChunks[1].data, sHallOfFameChunks[1].size); break; } @@ -730,7 +794,7 @@ bool8 unref_sub_8125F4C(struct UnkSaveSection *a1) ReadFlash(gFlashSectors[0], 0, a1->data, 4096); - if (a1->security != UNKNOWN_CHECK_VALUE) + if (a1->signature != FILE_SIGNATURE) return FALSE; return TRUE; @@ -739,7 +803,7 @@ bool8 unref_sub_8125F4C(struct UnkSaveSection *a1) u8 unref_sub_8125FA0(void) { u16 i; - u8 v0 = TrySavingData(0); + u8 v0 = Save_WriteData(0); for (i = 0; i < 2; i++) EraseFlashSector(gFlashSectors[i]); @@ -767,7 +831,7 @@ u8 unref_sub_8125FF0(u8 *data, u16 size) for (i = 0; i < sizeof(struct SaveSection); i++) ((char *)section)[i] = 0; - section->security = UNKNOWN_CHECK_VALUE; + section->signature = FILE_SIGNATURE; for (i = 0; i < size; i++) section->data[i] = data[i]; @@ -775,17 +839,17 @@ u8 unref_sub_8125FF0(u8 *data, u16 size) gLastSaveSectorStatus = ProgramFlashSectorAndVerifyNBytes(gFlashSectors[0], section, sizeof(struct SaveSection)); if (gLastSaveSectorStatus) - return 0xFF; + return SAVE_STATUS_ERROR; else - return 1; + return SAVE_STATUS_OK; } u8 unref_sub_8126068(u8 sector, u8 *data, u32 size) { if (ProgramFlashSectorAndVerify(sector, data)) - return 255; + return SAVE_STATUS_ERROR; else - return 1; + return SAVE_STATUS_OK; } u8 unref_sub_8126080(u8 sector, u8 *data) diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index 64b84a2f7..74a1e9612 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -166,7 +166,7 @@ static void CB2_WipeSave(void) Menu_DrawStdWindowFrame(1, MSG_WIN_TOP, 28, 19); Menu_PrintText(gSystemText_CheckCompleteSaveAttempt, 2, MSG_WIN_TOP + 1); - HandleSavingData(gSaveFailedType); + Save_WriteDataInternal(gSaveFailedType); if (gDamagedSaveSectors != 0) { diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 11c05e478..ab2a818a7 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -1895,7 +1895,7 @@ void SaveBattleTowerProgress(void) VarSet(VAR_TEMP_0, 0); gSaveBlock2.battleTower.unk_554 = 1; - TrySavingData(EREADER_SAVE); + Save_WriteData(SAVE_EREADER); } void BattleTower_SoftReset(void) diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 2f6f1e7dd..87597eb6a 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -664,20 +664,20 @@ static u8 SaveDialogCB_DisplaySavingMessage(void) static u8 SaveDialogCB_DoSave(void) { - bool8 saveSucceeded; + u8 saveStatus; IncrementGameStat(0); if (gDifferentSaveFile == TRUE) { - saveSucceeded = TrySavingData(DIFFERENT_FILE_SAVE); + saveStatus = Save_WriteData(SAVE_OVERWRITE_DIFFERENT_FILE); gDifferentSaveFile = FALSE; } else { - saveSucceeded = TrySavingData(NORMAL_SAVE); + saveStatus = Save_WriteData(SAVE_NORMAL); } - if (saveSucceeded == TRUE) + if (saveStatus == SAVE_STATUS_OK) { //"(Player) saved the game." DisplaySaveMessageWithCallback(gSaveText_PlayerSavedTheGame, SaveDialogCB_SaveSuccess); diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 303dcf3e0..9e7e50d43 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -566,7 +566,7 @@ static void sub_814217C(u8 taskID) static void sub_8142274(u8 taskID) { gGameContinueCallback = sub_8141FC4; - TrySavingData(3); + Save_WriteData(3); PlaySE(SE_SAVE); gTasks[taskID].func = sub_81422B8; gTasks[taskID].tFrameCount = 32; diff --git a/src/scene/intro.c b/src/scene/intro.c index d7d772a40..d680e4a98 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -930,7 +930,7 @@ void CB2_InitCopyrightScreenAfterBootup(void) if (!SetUpCopyrightScreen()) { sub_8052E4C(); - ResetSaveCounters(); + Save_ResetSaveCounters(); sub_8125EC8(0); if (gSaveFileStatus == 0 || gSaveFileStatus == 2) ClearSav2(); -- cgit v1.2.3 From 29d16a0af10c2de52de8ff37c13dd5aa3401c98f Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 14 Jan 2018 01:17:02 +0100 Subject: started decompiling data/battle_anim.s --- data/battle_anim.s | 322 -------------------------------------------- src/battle/battle_anim.c | 4 +- src/data/battle_anim.h | 326 +++++++++++++++++++++++++++++++++++++++++++++ src/data/graphics.h | 338 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 666 insertions(+), 324 deletions(-) create mode 100644 src/data/battle_anim.h create mode 100644 src/data/graphics.h diff --git a/data/battle_anim.s b/data/battle_anim.s index 270ba818a..2010e0dbb 100644 --- a/data/battle_anim.s +++ b/data/battle_anim.s @@ -727,325 +727,3 @@ gBattleAnimPicTable:: @ 837E164 obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 10287 obj_tiles gBattleAnimSpriteSheet_163, 0x100, 10288 - .align 2 -gBattleAnimPaletteTable:: @ 837EA6C - obj_pal gBattleAnimSpritePalette_000, 10000 - obj_pal gBattleAnimSpritePalette_001, 10001 - obj_pal gBattleAnimSpritePalette_002, 10002 - obj_pal gBattleAnimSpritePalette_003, 10003 - obj_pal gBattleAnimSpritePalette_004, 10004 - obj_pal gBattleAnimSpritePalette_005, 10005 - obj_pal gBattleAnimSpritePalette_006, 10006 - obj_pal gBattleAnimSpritePalette_007, 10007 - obj_pal gBattleAnimSpritePalette_008, 10008 - obj_pal gBattleAnimSpritePalette_009, 10009 - obj_pal gBattleAnimSpritePalette_010, 10010 - obj_pal gBattleAnimSpritePalette_011, 10011 - obj_pal gBattleAnimSpritePalette_012, 10012 - obj_pal gBattleAnimSpritePalette_013, 10013 - obj_pal gBattleAnimSpritePalette_014, 10014 - obj_pal gBattleAnimSpritePalette_015, 10015 - obj_pal gBattleAnimSpritePalette_016, 10016 - obj_pal gBattleAnimSpritePalette_016, 10017 - obj_pal gBattleAnimSpritePalette_018, 10018 - obj_pal gBattleAnimSpritePalette_019, 10019 - obj_pal gBattleAnimSpritePalette_020, 10020 - obj_pal gBattleAnimSpritePalette_021, 10021 - obj_pal gBattleAnimSpritePalette_022, 10022 - obj_pal gBattleAnimSpritePalette_023, 10023 - obj_pal gBattleAnimSpritePalette_024, 10024 - obj_pal gBattleAnimSpritePalette_025, 10025 - obj_pal gBattleAnimSpritePalette_026, 10026 - obj_pal gBattleAnimSpritePalette_027, 10027 - obj_pal gBattleAnimSpritePalette_028, 10028 - obj_pal gBattleAnimSpritePalette_029, 10029 - obj_pal gBattleAnimSpritePalette_030, 10030 - obj_pal gBattleAnimSpritePalette_031, 10031 - obj_pal gBattleAnimSpritePalette_032, 10032 - obj_pal gBattleAnimSpritePalette_033, 10033 - obj_pal gBattleAnimSpritePalette_033, 10034 - obj_pal gBattleAnimSpritePalette_033, 10035 - obj_pal gBattleAnimSpritePalette_036, 10036 - obj_pal gBattleAnimSpritePalette_036, 10037 - obj_pal gBattleAnimSpritePalette_038, 10038 - obj_pal gBattleAnimSpritePalette_039, 10039 - obj_pal gBattleAnimSpritePalette_038, 10040 - obj_pal gBattleAnimSpritePalette_038, 10041 - obj_pal gBattleAnimSpritePalette_042, 10042 - obj_pal gBattleAnimSpritePalette_043, 10043 - obj_pal gBattleAnimSpritePalette_044, 10044 - obj_pal gBattleAnimSpritePalette_045, 10045 - obj_pal gBattleAnimSpritePalette_046, 10046 - obj_pal gBattleAnimSpritePalette_047, 10046 - obj_pal gBattleAnimSpritePalette_048, 10048 - obj_pal gBattleAnimSpritePalette_049, 10049 - obj_pal gBattleAnimSpritePalette_050, 10050 - obj_pal gBattleAnimSpritePalette_050, 10051 - obj_pal gBattleAnimSpritePalette_050, 10052 - obj_pal gBattleAnimSpritePalette_026, 10053 - obj_pal gBattleAnimSpritePalette_054, 10054 - obj_pal gBattleAnimSpritePalette_050, 10055 - obj_pal gBattleAnimSpritePalette_056, 10056 - obj_pal gBattleAnimSpritePalette_057, 10057 - obj_pal gBattleAnimSpritePalette_058, 10058 - obj_pal gBattleAnimSpritePalette_059, 10059 - obj_pal gBattleAnimSpritePalette_060, 10060 - obj_pal gBattleAnimSpritePalette_061, 10061 - obj_pal gBattleAnimSpritePalette_062, 10062 - obj_pal gBattleAnimSpritePalette_063, 10063 - obj_pal gBattleAnimSpritePalette_064, 10064 - obj_pal gBattleAnimSpritePalette_065, 10065 - obj_pal gBattleAnimSpritePalette_066, 10066 - obj_pal gBattleAnimSpritePalette_067, 10067 - obj_pal gBattleAnimSpritePalette_068, 10068 - obj_pal gBattleAnimSpritePalette_065, 10069 - obj_pal gBattleAnimSpritePalette_070, 10070 - obj_pal gBattleAnimSpritePalette_070, 10071 - obj_pal gBattleAnimSpritePalette_072, 10072 - obj_pal gBattleAnimSpritePalette_073, 10073 - obj_pal gBattleAnimSpritePalette_074, 10074 - obj_pal gBattleAnimSpritePalette_075, 10075 - obj_pal gBattleAnimSpritePalette_076, 10076 - obj_pal gBattleAnimSpritePalette_076, 10077 - obj_pal gBattleAnimSpritePalette_078, 10078 - obj_pal gBattleAnimSpritePalette_078, 10079 - obj_pal gBattleAnimSpritePalette_080, 10080 - obj_pal gBattleAnimSpritePalette_081, 10081 - obj_pal gBattleAnimSpritePalette_082, 10082 - obj_pal gBattleAnimSpritePalette_083, 10083 - obj_pal gBattleAnimSpritePalette_084, 10084 - obj_pal gBattleAnimSpritePalette_085, 10085 - obj_pal gBattleAnimSpritePalette_086, 10086 - obj_pal gBattleAnimSpritePalette_087, 10087 - obj_pal gBattleAnimSpritePalette_088, 10088 - obj_pal gBattleAnimSpritePalette_089, 10089 - obj_pal gBattleAnimSpritePalette_090, 10090 - obj_pal gBattleAnimSpritePalette_091, 10091 - obj_pal gBattleAnimSpritePalette_092, 10092 - obj_pal gBattleAnimSpritePalette_093, 10093 - obj_pal gBattleAnimSpritePalette_094, 10094 - obj_pal gBattleAnimSpritePalette_095, 10095 - obj_pal gBattleAnimSpritePalette_096, 10096 - obj_pal gBattleAnimSpritePalette_097, 10097 - obj_pal gBattleAnimSpritePalette_094, 10098 - obj_pal gBattleAnimSpritePalette_099, 10099 - obj_pal gBattleAnimSpritePalette_100, 10100 - obj_pal gBattleAnimSpritePalette_101, 10101 - obj_pal gBattleAnimSpritePalette_101, 10102 - obj_pal gBattleAnimSpritePalette_103, 10103 - obj_pal gBattleAnimSpritePalette_104, 10104 - obj_pal gBattleAnimSpritePalette_105, 10105 - obj_pal gBattleAnimSpritePalette_105, 10106 - obj_pal gBattleAnimSpritePalette_107, 10107 - obj_pal gBattleAnimSpritePalette_107, 10108 - obj_pal gBattleAnimSpritePalette_109, 10109 - obj_pal gBattleAnimSpritePalette_109, 10110 - obj_pal gBattleAnimSpritePalette_111, 10111 - obj_pal gBattleAnimSpritePalette_112, 10112 - obj_pal gBattleAnimSpritePalette_113, 10113 - obj_pal gBattleAnimSpritePalette_114, 10114 - obj_pal gBattleAnimSpritePalette_115, 10115 - obj_pal gBattleAnimSpritePalette_116, 10116 - obj_pal gBattleAnimSpritePalette_117, 10117 - obj_pal gBattleAnimSpritePalette_118, 10118 - obj_pal gBattleAnimSpritePalette_119, 10119 - obj_pal gBattleAnimSpritePalette_120, 10120 - obj_pal gBattleAnimSpritePalette_121, 10121 - obj_pal gBattleAnimSpritePalette_122, 10122 - obj_pal gBattleAnimSpritePalette_122, 10123 - obj_pal gBattleAnimSpritePalette_124, 10124 - obj_pal gBattleAnimSpritePalette_125, 10125 - obj_pal gBattleAnimSpritePalette_126, 10126 - obj_pal gBattleAnimSpritePalette_127, 10127 - obj_pal gBattleAnimSpritePalette_128, 10128 - obj_pal gBattleAnimSpritePalette_128, 10129 - obj_pal gBattleAnimSpritePalette_130, 10130 - obj_pal gBattleAnimSpritePalette_130, 10131 - obj_pal gBattleAnimSpritePalette_132, 10132 - obj_pal gBattleAnimSpritePalette_133, 10133 - obj_pal gBattleAnimSpritePalette_133, 10134 - obj_pal gBattleAnimSpritePalette_135, 10135 - obj_pal gBattleAnimSpritePalette_136, 10136 - obj_pal gBattleAnimSpritePalette_135, 10137 - obj_pal gBattleAnimSpritePalette_135, 10138 - obj_pal gBattleAnimSpritePalette_139, 10139 - obj_pal gBattleAnimSpritePalette_140, 10140 - obj_pal gBattleAnimSpritePalette_141, 10141 - obj_pal gBattleAnimSpritePalette_141, 10142 - obj_pal gBattleAnimSpritePalette_143, 10143 - obj_pal gBattleAnimSpritePalette_144, 10144 - obj_pal gBattleAnimSpritePalette_139, 10145 - obj_pal gBattleAnimSpritePalette_115, 10146 - obj_pal gBattleAnimSpritePalette_147, 10147 - obj_pal gBattleAnimSpritePalette_148, 10148 - obj_pal gBattleAnimSpritePalette_148, 10149 - obj_pal gBattleAnimSpritePalette_150, 10150 - obj_pal gBattleAnimSpritePalette_150, 10151 - obj_pal gBattleAnimSpritePalette_152, 10152 - obj_pal gBattleAnimSpritePalette_153, 10153 - obj_pal gBattleAnimSpritePalette_154, 10154 - obj_pal gBattleAnimSpritePalette_155, 10155 - obj_pal gBattleAnimSpritePalette_156, 10156 - obj_pal gBattleAnimSpritePalette_157, 10157 - obj_pal gBattleAnimSpritePalette_158, 10158 - obj_pal gBattleAnimSpritePalette_159, 10159 - obj_pal gBattleAnimSpritePalette_160, 10160 - obj_pal gBattleAnimSpritePalette_161, 10161 - obj_pal gBattleAnimSpritePalette_162, 10162 - obj_pal gBattleAnimSpritePalette_163, 10163 - obj_pal gBattleAnimSpritePalette_164, 10164 - obj_pal gBattleAnimSpritePalette_165, 10165 - obj_pal gBattleAnimSpritePalette_166, 10166 - obj_pal gBattleAnimSpritePalette_167, 10167 - obj_pal gBattleAnimSpritePalette_168, 10168 - obj_pal gBattleAnimSpritePalette_169, 10169 - obj_pal gBattleAnimSpritePalette_170, 10170 - obj_pal gBattleAnimSpritePalette_171, 10171 - obj_pal gBattleAnimSpritePalette_172, 10172 - obj_pal gBattleAnimSpritePalette_001, 10173 - obj_pal gBattleAnimSpritePalette_174, 10174 - obj_pal gBattleAnimSpritePalette_175, 10175 - obj_pal gBattleAnimSpritePalette_176, 10176 - obj_pal gBattleAnimSpritePalette_177, 10177 - obj_pal gBattleAnimSpritePalette_178, 10178 - obj_pal gBattleAnimSpritePalette_179, 10179 - obj_pal gBattleAnimSpritePalette_179, 10180 - obj_pal gBattleAnimSpritePalette_179, 10181 - obj_pal gBattleAnimSpritePalette_182, 10182 - obj_pal gBattleAnimSpritePalette_183, 10183 - obj_pal gBattleAnimSpritePalette_184, 10184 - obj_pal gBattleAnimSpritePalette_185, 10185 - obj_pal gBattleAnimSpritePalette_186, 10186 - obj_pal gBattleAnimSpritePalette_187, 10187 - obj_pal gBattleAnimSpritePalette_188, 10188 - obj_pal gBattleAnimSpritePalette_189, 10189 - obj_pal gBattleAnimSpritePalette_190, 10190 - obj_pal gBattleAnimSpritePalette_191, 10191 - obj_pal gBattleAnimSpritePalette_192, 10192 - obj_pal gBattleAnimSpritePalette_193, 10193 - obj_pal gBattleAnimSpritePalette_194, 10194 - obj_pal gBattleAnimSpritePalette_195, 10195 - obj_pal gBattleAnimSpritePalette_196, 10196 - obj_pal gBattleAnimSpritePalette_197, 10197 - obj_pal gBattleAnimSpritePalette_198, 10198 - obj_pal gBattleAnimSpritePalette_199, 10199 - obj_pal gBattleAnimSpritePalette_200, 10200 - obj_pal gBattleAnimSpritePalette_201, 10201 - obj_pal gBattleAnimSpritePalette_202, 10202 - obj_pal gBattleAnimSpritePalette_203, 10203 - obj_pal gBattleAnimSpritePalette_204, 10204 - obj_pal gBattleAnimSpritePalette_205, 10205 - obj_pal gBattleAnimSpritePalette_206, 10206 - obj_pal gBattleAnimSpritePalette_207, 10207 - obj_pal gBattleAnimSpritePalette_167, 10208 - obj_pal gBattleAnimSpritePalette_209, 10209 - obj_pal gBattleAnimSpritePalette_210, 10210 - obj_pal gBattleAnimSpritePalette_211, 10211 - obj_pal gBattleAnimSpritePalette_211, 10212 - obj_pal gBattleAnimSpritePalette_211, 10213 - obj_pal gBattleAnimSpritePalette_064, 10214 - obj_pal gBattleAnimSpritePalette_215, 10215 - obj_pal gBattleAnimSpritePalette_216, 10216 - obj_pal gBattleAnimSpritePalette_217, 10217 - obj_pal gBattleAnimSpritePalette_218, 10218 - obj_pal gBattleAnimSpritePalette_219, 10219 - obj_pal gBattleAnimSpritePalette_220, 10220 - obj_pal gBattleAnimSpritePalette_221, 10221 - obj_pal gBattleAnimSpritePalette_222, 10222 - obj_pal gBattleAnimSpritePalette_223, 10223 - obj_pal gBattleAnimSpritePalette_224, 10224 - obj_pal gBattleAnimSpritePalette_225, 10225 - obj_pal gBattleAnimSpritePalette_226, 10226 - obj_pal gBattleAnimSpritePalette_226, 10227 - obj_pal gBattleAnimSpritePalette_228, 10228 - obj_pal gBattleAnimSpritePalette_229, 10229 - obj_pal gBattleAnimSpritePalette_230, 10230 - obj_pal gBattleAnimSpritePalette_231, 10231 - obj_pal gBattleAnimSpritePalette_231, 10232 - obj_pal gBattleAnimSpritePalette_233, 10233 - obj_pal gBattleAnimSpritePalette_234, 10234 - obj_pal gBattleAnimSpritePalette_235, 10235 - obj_pal gBattleAnimSpritePalette_236, 10236 - obj_pal gBattleAnimSpritePalette_237, 10237 - obj_pal gBattleAnimSpritePalette_238, 10238 - obj_pal gBattleAnimSpritePalette_239, 10239 - obj_pal gBattleAnimSpritePalette_240, 10240 - obj_pal gBattleAnimSpritePalette_241, 10241 - obj_pal gBattleAnimSpritePalette_242, 10242 - obj_pal gBattleAnimSpritePalette_243, 10243 - obj_pal gBattleAnimSpritePalette_244, 10244 - obj_pal gBattleAnimSpritePalette_245, 10245 - obj_pal gBattleAnimSpritePalette_245, 10246 - obj_pal gBattleAnimSpritePalette_064, 10247 - obj_pal gBattleAnimSpritePalette_248, 10248 - obj_pal gBattleAnimSpritePalette_249, 10249 - obj_pal gBattleAnimSpritePalette_249, 10250 - obj_pal gBattleAnimSpritePalette_251, 10251 - obj_pal gBattleAnimSpritePalette_252, 10252 - obj_pal gBattleAnimSpritePalette_253, 10253 - obj_pal gBattleAnimSpritePalette_254, 10254 - obj_pal gBattleAnimSpritePalette_255, 10255 - obj_pal gBattleAnimSpritePalette_256, 10256 - obj_pal gBattleAnimSpritePalette_257, 10257 - obj_pal gBattleAnimSpritePalette_258, 10258 - obj_pal gBattleAnimSpritePalette_259, 10259 - obj_pal gBattleAnimSpritePalette_260, 10260 - obj_pal gBattleAnimSpritePalette_261, 10261 - obj_pal gBattleAnimSpritePalette_262, 10262 - obj_pal gBattleAnimSpritePalette_263, 10263 - obj_pal gBattleAnimSpritePalette_264, 10264 - obj_pal gBattleAnimSpritePalette_265, 10265 - obj_pal gBattleAnimSpritePalette_266, 10266 - obj_pal gBattleAnimSpritePalette_267, 10267 - obj_pal gBattleAnimSpritePalette_268, 10268 - obj_pal gBattleAnimSpritePalette_269, 10269 - obj_pal gBattleAnimSpritePalette_270, 10270 - obj_pal gBattleAnimSpritePalette_271, 10271 - obj_pal gBattleAnimSpritePalette_272, 10272 - obj_pal gBattleAnimSpritePalette_272, 10273 - obj_pal gBattleAnimSpritePalette_274, 10274 - obj_pal gBattleAnimSpritePalette_274, 10275 - obj_pal gBattleAnimSpritePalette_274, 10276 - obj_pal gBattleAnimSpritePalette_277, 10277 - obj_pal gBattleAnimSpritePalette_278, 10278 - obj_pal gBattleAnimSpritePalette_279, 10279 - obj_pal gBattleAnimSpritePalette_280, 10280 - obj_pal gBattleAnimSpritePalette_281, 10281 - obj_pal gBattleAnimSpritePalette_282, 10282 - obj_pal gBattleAnimSpritePalette_283, 10283 - obj_pal gBattleAnimSpritePalette_284, 10284 - obj_pal gBattleAnimSpritePalette_285, 10285 - obj_pal gBattleAnimSpritePalette_286, 10286 - obj_pal gBattleAnimSpritePalette_287, 10287 - obj_pal gBattleAnimSpritePalette_288, 10288 - - .align 2 -gBattleAnimBackgroundTable:: @ 837F374 - .4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00 - .4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00 - .4byte gBattleAnimBackgroundImage_02, gBattleAnimBackgroundPalette_02, gBattleAnimBackgroundTilemap_02 - .4byte gBattleAnimBackgroundImage_03, gBattleAnimBackgroundPalette_03, gBattleAnimBackgroundTilemap_03 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_04 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_05 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_06 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_07 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_08 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_09 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_10 - .4byte gBattleAnimBackgroundImage_11, gBattleAnimBackgroundPalette_11, gBattleAnimBackgroundTilemap_11 - .4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_12 - .4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_13 - .4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_14 - .4byte gBattleAnimBackgroundImage_15, gBattleAnimBackgroundPalette_15, gBattleAnimBackgroundTilemap_15 - .4byte gBattleAnimBackgroundImage_16, gBattleAnimBackgroundPalette_16, gBattleAnimBackgroundTilemap_16 - .4byte gBattleAnimBackgroundImage_17, gBattleAnimBackgroundPalette_17, gBattleAnimBackgroundTilemap_17 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_07 - .4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_08 - .4byte gBattleAnimBackgroundImage_20, gBattleAnimBackgroundPalette_20, gBattleAnimBackgroundTilemap_20 - .4byte gBattleAnimBackgroundImage_21, gBattleAnimBackgroundPalette_21, gBattleAnimBackgroundTilemap_21 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_09 - .4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_10 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_04 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05 - .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06 - diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index a0c74be1d..05a2e5752 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -13,6 +13,7 @@ #include "sprite.h" #include "task.h" #include "ewram.h" +#include "../data/battle_anim.h" // sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. #define GET_TRUE_SPRITE_INDEX(i) (i - 10000) @@ -64,8 +65,7 @@ extern struct MusicPlayerInfo gMPlay_SE2; extern const u16 gUnknown_081C7160[]; extern const u8 *const gBattleAnims_Moves[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; -extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; -extern const struct BattleAnimBackground gBattleAnimBackgroundTable[]; +// extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; static void RunAnimScriptCommand(void); static void ScriptCmd_loadspritegfx(void); diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h new file mode 100644 index 000000000..fb7ed0e6c --- /dev/null +++ b/src/data/battle_anim.h @@ -0,0 +1,326 @@ +#include "global.h" +#include "../data/graphics.h" + +const struct CompressedSpritePalette gBattleAnimPaletteTable[] = +{ + { .data = (u8 *) &gBattleAnimSpritePalette_000, .tag = 10000}, + { .data = (u8 *) &gBattleAnimSpritePalette_001, .tag = 10001}, + { .data = (u8 *) &gBattleAnimSpritePalette_002, .tag = 10002}, + { .data = (u8 *) &gBattleAnimSpritePalette_003, .tag = 10003}, + { .data = (u8 *) &gBattleAnimSpritePalette_004, .tag = 10004}, + { .data = (u8 *) &gBattleAnimSpritePalette_005, .tag = 10005}, + { .data = (u8 *) &gBattleAnimSpritePalette_006, .tag = 10006}, + { .data = (u8 *) &gBattleAnimSpritePalette_007, .tag = 10007}, + { .data = (u8 *) &gBattleAnimSpritePalette_008, .tag = 10008}, + { .data = (u8 *) &gBattleAnimSpritePalette_009, .tag = 10009}, + { .data = (u8 *) &gBattleAnimSpritePalette_010, .tag = 10010}, + { .data = (u8 *) &gBattleAnimSpritePalette_011, .tag = 10011}, + { .data = (u8 *) &gBattleAnimSpritePalette_012, .tag = 10012}, + { .data = (u8 *) &gBattleAnimSpritePalette_013, .tag = 10013}, + { .data = (u8 *) &gBattleAnimSpritePalette_014, .tag = 10014}, + { .data = (u8 *) &gBattleAnimSpritePalette_015, .tag = 10015}, + { .data = (u8 *) &gBattleAnimSpritePalette_016, .tag = 10016}, + { .data = (u8 *) &gBattleAnimSpritePalette_016, .tag = 10017}, + { .data = (u8 *) &gBattleAnimSpritePalette_018, .tag = 10018}, + { .data = (u8 *) &gBattleAnimSpritePalette_019, .tag = 10019}, + { .data = (u8 *) &gBattleAnimSpritePalette_020, .tag = 10020}, + { .data = (u8 *) &gBattleAnimSpritePalette_021, .tag = 10021}, + { .data = (u8 *) &gBattleAnimSpritePalette_022, .tag = 10022}, + { .data = (u8 *) &gBattleAnimSpritePalette_023, .tag = 10023}, + { .data = (u8 *) &gBattleAnimSpritePalette_024, .tag = 10024}, + { .data = (u8 *) &gBattleAnimSpritePalette_025, .tag = 10025}, + { .data = (u8 *) &gBattleAnimSpritePalette_026, .tag = 10026}, + { .data = (u8 *) &gBattleAnimSpritePalette_027, .tag = 10027}, + { .data = (u8 *) &gBattleAnimSpritePalette_028, .tag = 10028}, + { .data = (u8 *) &gBattleAnimSpritePalette_029, .tag = 10029}, + { .data = (u8 *) &gBattleAnimSpritePalette_030, .tag = 10030}, + { .data = (u8 *) &gBattleAnimSpritePalette_031, .tag = 10031}, + { .data = (u8 *) &gBattleAnimSpritePalette_032, .tag = 10032}, + { .data = (u8 *) &gBattleAnimSpritePalette_033, .tag = 10033}, + { .data = (u8 *) &gBattleAnimSpritePalette_033, .tag = 10034}, + { .data = (u8 *) &gBattleAnimSpritePalette_033, .tag = 10035}, + { .data = (u8 *) &gBattleAnimSpritePalette_036, .tag = 10036}, + { .data = (u8 *) &gBattleAnimSpritePalette_036, .tag = 10037}, + { .data = (u8 *) &gBattleAnimSpritePalette_038, .tag = 10038}, + { .data = (u8 *) &gBattleAnimSpritePalette_039, .tag = 10039}, + { .data = (u8 *) &gBattleAnimSpritePalette_038, .tag = 10040}, + { .data = (u8 *) &gBattleAnimSpritePalette_038, .tag = 10041}, + { .data = (u8 *) &gBattleAnimSpritePalette_042, .tag = 10042}, + { .data = (u8 *) &gBattleAnimSpritePalette_043, .tag = 10043}, + { .data = (u8 *) &gBattleAnimSpritePalette_044, .tag = 10044}, + { .data = (u8 *) &gBattleAnimSpritePalette_045, .tag = 10045}, + { .data = (u8 *) &gBattleAnimSpritePalette_046, .tag = 10046}, + { .data = (u8 *) &gBattleAnimSpritePalette_047, .tag = 10046}, + { .data = (u8 *) &gBattleAnimSpritePalette_048, .tag = 10048}, + { .data = (u8 *) &gBattleAnimSpritePalette_049, .tag = 10049}, + { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10050}, + { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10051}, + { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10052}, + { .data = (u8 *) &gBattleAnimSpritePalette_026, .tag = 10053}, + { .data = (u8 *) &gBattleAnimSpritePalette_054, .tag = 10054}, + { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10055}, + { .data = (u8 *) &gBattleAnimSpritePalette_056, .tag = 10056}, + { .data = (u8 *) &gBattleAnimSpritePalette_057, .tag = 10057}, + { .data = (u8 *) &gBattleAnimSpritePalette_058, .tag = 10058}, + { .data = (u8 *) &gBattleAnimSpritePalette_059, .tag = 10059}, + { .data = (u8 *) &gBattleAnimSpritePalette_060, .tag = 10060}, + { .data = (u8 *) &gBattleAnimSpritePalette_061, .tag = 10061}, + { .data = (u8 *) &gBattleAnimSpritePalette_062, .tag = 10062}, + { .data = (u8 *) &gBattleAnimSpritePalette_063, .tag = 10063}, + { .data = (u8 *) &gBattleAnimSpritePalette_064, .tag = 10064}, + { .data = (u8 *) &gBattleAnimSpritePalette_065, .tag = 10065}, + { .data = (u8 *) &gBattleAnimSpritePalette_066, .tag = 10066}, + { .data = (u8 *) &gBattleAnimSpritePalette_067, .tag = 10067}, + { .data = (u8 *) &gBattleAnimSpritePalette_068, .tag = 10068}, + { .data = (u8 *) &gBattleAnimSpritePalette_065, .tag = 10069}, + { .data = (u8 *) &gBattleAnimSpritePalette_070, .tag = 10070}, + { .data = (u8 *) &gBattleAnimSpritePalette_070, .tag = 10071}, + { .data = (u8 *) &gBattleAnimSpritePalette_072, .tag = 10072}, + { .data = (u8 *) &gBattleAnimSpritePalette_073, .tag = 10073}, + { .data = (u8 *) &gBattleAnimSpritePalette_074, .tag = 10074}, + { .data = (u8 *) &gBattleAnimSpritePalette_075, .tag = 10075}, + { .data = (u8 *) &gBattleAnimSpritePalette_076, .tag = 10076}, + { .data = (u8 *) &gBattleAnimSpritePalette_076, .tag = 10077}, + { .data = (u8 *) &gBattleAnimSpritePalette_078, .tag = 10078}, + { .data = (u8 *) &gBattleAnimSpritePalette_078, .tag = 10079}, + { .data = (u8 *) &gBattleAnimSpritePalette_080, .tag = 10080}, + { .data = (u8 *) &gBattleAnimSpritePalette_081, .tag = 10081}, + { .data = (u8 *) &gBattleAnimSpritePalette_082, .tag = 10082}, + { .data = (u8 *) &gBattleAnimSpritePalette_083, .tag = 10083}, + { .data = (u8 *) &gBattleAnimSpritePalette_084, .tag = 10084}, + { .data = (u8 *) &gBattleAnimSpritePalette_085, .tag = 10085}, + { .data = (u8 *) &gBattleAnimSpritePalette_086, .tag = 10086}, + { .data = (u8 *) &gBattleAnimSpritePalette_087, .tag = 10087}, + { .data = (u8 *) &gBattleAnimSpritePalette_088, .tag = 10088}, + { .data = (u8 *) &gBattleAnimSpritePalette_089, .tag = 10089}, + { .data = (u8 *) &gBattleAnimSpritePalette_090, .tag = 10090}, + { .data = (u8 *) &gBattleAnimSpritePalette_091, .tag = 10091}, + { .data = (u8 *) &gBattleAnimSpritePalette_092, .tag = 10092}, + { .data = (u8 *) &gBattleAnimSpritePalette_093, .tag = 10093}, + { .data = (u8 *) &gBattleAnimSpritePalette_094, .tag = 10094}, + { .data = (u8 *) &gBattleAnimSpritePalette_095, .tag = 10095}, + { .data = (u8 *) &gBattleAnimSpritePalette_096, .tag = 10096}, + { .data = (u8 *) &gBattleAnimSpritePalette_097, .tag = 10097}, + { .data = (u8 *) &gBattleAnimSpritePalette_094, .tag = 10098}, + { .data = (u8 *) &gBattleAnimSpritePalette_099, .tag = 10099}, + { .data = (u8 *) &gBattleAnimSpritePalette_100, .tag = 10100}, + { .data = (u8 *) &gBattleAnimSpritePalette_101, .tag = 10101}, + { .data = (u8 *) &gBattleAnimSpritePalette_101, .tag = 10102}, + { .data = (u8 *) &gBattleAnimSpritePalette_103, .tag = 10103}, + { .data = (u8 *) &gBattleAnimSpritePalette_104, .tag = 10104}, + { .data = (u8 *) &gBattleAnimSpritePalette_105, .tag = 10105}, + { .data = (u8 *) &gBattleAnimSpritePalette_105, .tag = 10106}, + { .data = (u8 *) &gBattleAnimSpritePalette_107, .tag = 10107}, + { .data = (u8 *) &gBattleAnimSpritePalette_107, .tag = 10108}, + { .data = (u8 *) &gBattleAnimSpritePalette_109, .tag = 10109}, + { .data = (u8 *) &gBattleAnimSpritePalette_109, .tag = 10110}, + { .data = (u8 *) &gBattleAnimSpritePalette_111, .tag = 10111}, + { .data = (u8 *) &gBattleAnimSpritePalette_112, .tag = 10112}, + { .data = (u8 *) &gBattleAnimSpritePalette_113, .tag = 10113}, + { .data = (u8 *) &gBattleAnimSpritePalette_114, .tag = 10114}, + { .data = (u8 *) &gBattleAnimSpritePalette_115, .tag = 10115}, + { .data = (u8 *) &gBattleAnimSpritePalette_116, .tag = 10116}, + { .data = (u8 *) &gBattleAnimSpritePalette_117, .tag = 10117}, + { .data = (u8 *) &gBattleAnimSpritePalette_118, .tag = 10118}, + { .data = (u8 *) &gBattleAnimSpritePalette_119, .tag = 10119}, + { .data = (u8 *) &gBattleAnimSpritePalette_120, .tag = 10120}, + { .data = (u8 *) &gBattleAnimSpritePalette_121, .tag = 10121}, + { .data = (u8 *) &gBattleAnimSpritePalette_122, .tag = 10122}, + { .data = (u8 *) &gBattleAnimSpritePalette_122, .tag = 10123}, + { .data = (u8 *) &gBattleAnimSpritePalette_124, .tag = 10124}, + { .data = (u8 *) &gBattleAnimSpritePalette_125, .tag = 10125}, + { .data = (u8 *) &gBattleAnimSpritePalette_126, .tag = 10126}, + { .data = (u8 *) &gBattleAnimSpritePalette_127, .tag = 10127}, + { .data = (u8 *) &gBattleAnimSpritePalette_128, .tag = 10128}, + { .data = (u8 *) &gBattleAnimSpritePalette_128, .tag = 10129}, + { .data = (u8 *) &gBattleAnimSpritePalette_130, .tag = 10130}, + { .data = (u8 *) &gBattleAnimSpritePalette_130, .tag = 10131}, + { .data = (u8 *) &gBattleAnimSpritePalette_132, .tag = 10132}, + { .data = (u8 *) &gBattleAnimSpritePalette_133, .tag = 10133}, + { .data = (u8 *) &gBattleAnimSpritePalette_133, .tag = 10134}, + { .data = (u8 *) &gBattleAnimSpritePalette_135, .tag = 10135}, + { .data = (u8 *) &gBattleAnimSpritePalette_136, .tag = 10136}, + { .data = (u8 *) &gBattleAnimSpritePalette_135, .tag = 10137}, + { .data = (u8 *) &gBattleAnimSpritePalette_135, .tag = 10138}, + { .data = (u8 *) &gBattleAnimSpritePalette_139, .tag = 10139}, + { .data = (u8 *) &gBattleAnimSpritePalette_140, .tag = 10140}, + { .data = (u8 *) &gBattleAnimSpritePalette_141, .tag = 10141}, + { .data = (u8 *) &gBattleAnimSpritePalette_141, .tag = 10142}, + { .data = (u8 *) &gBattleAnimSpritePalette_143, .tag = 10143}, + { .data = (u8 *) &gBattleAnimSpritePalette_144, .tag = 10144}, + { .data = (u8 *) &gBattleAnimSpritePalette_139, .tag = 10145}, + { .data = (u8 *) &gBattleAnimSpritePalette_115, .tag = 10146}, + { .data = (u8 *) &gBattleAnimSpritePalette_147, .tag = 10147}, + { .data = (u8 *) &gBattleAnimSpritePalette_148, .tag = 10148}, + { .data = (u8 *) &gBattleAnimSpritePalette_148, .tag = 10149}, + { .data = (u8 *) &gBattleAnimSpritePalette_150, .tag = 10150}, + { .data = (u8 *) &gBattleAnimSpritePalette_150, .tag = 10151}, + { .data = (u8 *) &gBattleAnimSpritePalette_152, .tag = 10152}, + { .data = (u8 *) &gBattleAnimSpritePalette_153, .tag = 10153}, + { .data = (u8 *) &gBattleAnimSpritePalette_154, .tag = 10154}, + { .data = (u8 *) &gBattleAnimSpritePalette_155, .tag = 10155}, + { .data = (u8 *) &gBattleAnimSpritePalette_156, .tag = 10156}, + { .data = (u8 *) &gBattleAnimSpritePalette_157, .tag = 10157}, + { .data = (u8 *) &gBattleAnimSpritePalette_158, .tag = 10158}, + { .data = (u8 *) &gBattleAnimSpritePalette_159, .tag = 10159}, + { .data = (u8 *) &gBattleAnimSpritePalette_160, .tag = 10160}, + { .data = (u8 *) &gBattleAnimSpritePalette_161, .tag = 10161}, + { .data = (u8 *) &gBattleAnimSpritePalette_162, .tag = 10162}, + { .data = (u8 *) &gBattleAnimSpritePalette_163, .tag = 10163}, + { .data = (u8 *) &gBattleAnimSpritePalette_164, .tag = 10164}, + { .data = (u8 *) &gBattleAnimSpritePalette_165, .tag = 10165}, + { .data = (u8 *) &gBattleAnimSpritePalette_166, .tag = 10166}, + { .data = (u8 *) &gBattleAnimSpritePalette_167, .tag = 10167}, + { .data = (u8 *) &gBattleAnimSpritePalette_168, .tag = 10168}, + { .data = (u8 *) &gBattleAnimSpritePalette_169, .tag = 10169}, + { .data = (u8 *) &gBattleAnimSpritePalette_170, .tag = 10170}, + { .data = (u8 *) &gBattleAnimSpritePalette_171, .tag = 10171}, + { .data = (u8 *) &gBattleAnimSpritePalette_172, .tag = 10172}, + { .data = (u8 *) &gBattleAnimSpritePalette_001, .tag = 10173}, + { .data = (u8 *) &gBattleAnimSpritePalette_174, .tag = 10174}, + { .data = (u8 *) &gBattleAnimSpritePalette_175, .tag = 10175}, + { .data = (u8 *) &gBattleAnimSpritePalette_176, .tag = 10176}, + { .data = (u8 *) &gBattleAnimSpritePalette_177, .tag = 10177}, + { .data = (u8 *) &gBattleAnimSpritePalette_178, .tag = 10178}, + { .data = (u8 *) &gBattleAnimSpritePalette_179, .tag = 10179}, + { .data = (u8 *) &gBattleAnimSpritePalette_179, .tag = 10180}, + { .data = (u8 *) &gBattleAnimSpritePalette_179, .tag = 10181}, + { .data = (u8 *) &gBattleAnimSpritePalette_182, .tag = 10182}, + { .data = (u8 *) &gBattleAnimSpritePalette_183, .tag = 10183}, + { .data = (u8 *) &gBattleAnimSpritePalette_184, .tag = 10184}, + { .data = (u8 *) &gBattleAnimSpritePalette_185, .tag = 10185}, + { .data = (u8 *) &gBattleAnimSpritePalette_186, .tag = 10186}, + { .data = (u8 *) &gBattleAnimSpritePalette_187, .tag = 10187}, + { .data = (u8 *) &gBattleAnimSpritePalette_188, .tag = 10188}, + { .data = (u8 *) &gBattleAnimSpritePalette_189, .tag = 10189}, + { .data = (u8 *) &gBattleAnimSpritePalette_190, .tag = 10190}, + { .data = (u8 *) &gBattleAnimSpritePalette_191, .tag = 10191}, + { .data = (u8 *) &gBattleAnimSpritePalette_192, .tag = 10192}, + { .data = (u8 *) &gBattleAnimSpritePalette_193, .tag = 10193}, + { .data = (u8 *) &gBattleAnimSpritePalette_194, .tag = 10194}, + { .data = (u8 *) &gBattleAnimSpritePalette_195, .tag = 10195}, + { .data = (u8 *) &gBattleAnimSpritePalette_196, .tag = 10196}, + { .data = (u8 *) &gBattleAnimSpritePalette_197, .tag = 10197}, + { .data = (u8 *) &gBattleAnimSpritePalette_198, .tag = 10198}, + { .data = (u8 *) &gBattleAnimSpritePalette_199, .tag = 10199}, + { .data = (u8 *) &gBattleAnimSpritePalette_200, .tag = 10200}, + { .data = (u8 *) &gBattleAnimSpritePalette_201, .tag = 10201}, + { .data = (u8 *) &gBattleAnimSpritePalette_202, .tag = 10202}, + { .data = (u8 *) &gBattleAnimSpritePalette_203, .tag = 10203}, + { .data = (u8 *) &gBattleAnimSpritePalette_204, .tag = 10204}, + { .data = (u8 *) &gBattleAnimSpritePalette_205, .tag = 10205}, + { .data = (u8 *) &gBattleAnimSpritePalette_206, .tag = 10206}, + { .data = (u8 *) &gBattleAnimSpritePalette_207, .tag = 10207}, + { .data = (u8 *) &gBattleAnimSpritePalette_167, .tag = 10208}, + { .data = (u8 *) &gBattleAnimSpritePalette_209, .tag = 10209}, + { .data = (u8 *) &gBattleAnimSpritePalette_210, .tag = 10210}, + { .data = (u8 *) &gBattleAnimSpritePalette_211, .tag = 10211}, + { .data = (u8 *) &gBattleAnimSpritePalette_211, .tag = 10212}, + { .data = (u8 *) &gBattleAnimSpritePalette_211, .tag = 10213}, + { .data = (u8 *) &gBattleAnimSpritePalette_064, .tag = 10214}, + { .data = (u8 *) &gBattleAnimSpritePalette_215, .tag = 10215}, + { .data = (u8 *) &gBattleAnimSpritePalette_216, .tag = 10216}, + { .data = (u8 *) &gBattleAnimSpritePalette_217, .tag = 10217}, + { .data = (u8 *) &gBattleAnimSpritePalette_218, .tag = 10218}, + { .data = (u8 *) &gBattleAnimSpritePalette_219, .tag = 10219}, + { .data = (u8 *) &gBattleAnimSpritePalette_220, .tag = 10220}, + { .data = (u8 *) &gBattleAnimSpritePalette_221, .tag = 10221}, + { .data = (u8 *) &gBattleAnimSpritePalette_222, .tag = 10222}, + { .data = (u8 *) &gBattleAnimSpritePalette_223, .tag = 10223}, + { .data = (u8 *) &gBattleAnimSpritePalette_224, .tag = 10224}, + { .data = (u8 *) &gBattleAnimSpritePalette_225, .tag = 10225}, + { .data = (u8 *) &gBattleAnimSpritePalette_226, .tag = 10226}, + { .data = (u8 *) &gBattleAnimSpritePalette_226, .tag = 10227}, + { .data = (u8 *) &gBattleAnimSpritePalette_228, .tag = 10228}, + { .data = (u8 *) &gBattleAnimSpritePalette_229, .tag = 10229}, + { .data = (u8 *) &gBattleAnimSpritePalette_230, .tag = 10230}, + { .data = (u8 *) &gBattleAnimSpritePalette_231, .tag = 10231}, + { .data = (u8 *) &gBattleAnimSpritePalette_231, .tag = 10232}, + { .data = (u8 *) &gBattleAnimSpritePalette_233, .tag = 10233}, + { .data = (u8 *) &gBattleAnimSpritePalette_234, .tag = 10234}, + { .data = (u8 *) &gBattleAnimSpritePalette_235, .tag = 10235}, + { .data = (u8 *) &gBattleAnimSpritePalette_236, .tag = 10236}, + { .data = (u8 *) &gBattleAnimSpritePalette_237, .tag = 10237}, + { .data = (u8 *) &gBattleAnimSpritePalette_238, .tag = 10238}, + { .data = (u8 *) &gBattleAnimSpritePalette_239, .tag = 10239}, + { .data = (u8 *) &gBattleAnimSpritePalette_240, .tag = 10240}, + { .data = (u8 *) &gBattleAnimSpritePalette_241, .tag = 10241}, + { .data = (u8 *) &gBattleAnimSpritePalette_242, .tag = 10242}, + { .data = (u8 *) &gBattleAnimSpritePalette_243, .tag = 10243}, + { .data = (u8 *) &gBattleAnimSpritePalette_244, .tag = 10244}, + { .data = (u8 *) &gBattleAnimSpritePalette_245, .tag = 10245}, + { .data = (u8 *) &gBattleAnimSpritePalette_245, .tag = 10246}, + { .data = (u8 *) &gBattleAnimSpritePalette_064, .tag = 10247}, + { .data = (u8 *) &gBattleAnimSpritePalette_248, .tag = 10248}, + { .data = (u8 *) &gBattleAnimSpritePalette_249, .tag = 10249}, + { .data = (u8 *) &gBattleAnimSpritePalette_249, .tag = 10250}, + { .data = (u8 *) &gBattleAnimSpritePalette_251, .tag = 10251}, + { .data = (u8 *) &gBattleAnimSpritePalette_252, .tag = 10252}, + { .data = (u8 *) &gBattleAnimSpritePalette_253, .tag = 10253}, + { .data = (u8 *) &gBattleAnimSpritePalette_254, .tag = 10254}, + { .data = (u8 *) &gBattleAnimSpritePalette_255, .tag = 10255}, + { .data = (u8 *) &gBattleAnimSpritePalette_256, .tag = 10256}, + { .data = (u8 *) &gBattleAnimSpritePalette_257, .tag = 10257}, + { .data = (u8 *) &gBattleAnimSpritePalette_258, .tag = 10258}, + { .data = (u8 *) &gBattleAnimSpritePalette_259, .tag = 10259}, + { .data = (u8 *) &gBattleAnimSpritePalette_260, .tag = 10260}, + { .data = (u8 *) &gBattleAnimSpritePalette_261, .tag = 10261}, + { .data = (u8 *) &gBattleAnimSpritePalette_262, .tag = 10262}, + { .data = (u8 *) &gBattleAnimSpritePalette_263, .tag = 10263}, + { .data = (u8 *) &gBattleAnimSpritePalette_264, .tag = 10264}, + { .data = (u8 *) &gBattleAnimSpritePalette_265, .tag = 10265}, + { .data = (u8 *) &gBattleAnimSpritePalette_266, .tag = 10266}, + { .data = (u8 *) &gBattleAnimSpritePalette_267, .tag = 10267}, + { .data = (u8 *) &gBattleAnimSpritePalette_268, .tag = 10268}, + { .data = (u8 *) &gBattleAnimSpritePalette_269, .tag = 10269}, + { .data = (u8 *) &gBattleAnimSpritePalette_270, .tag = 10270}, + { .data = (u8 *) &gBattleAnimSpritePalette_271, .tag = 10271}, + { .data = (u8 *) &gBattleAnimSpritePalette_272, .tag = 10272}, + { .data = (u8 *) &gBattleAnimSpritePalette_272, .tag = 10273}, + { .data = (u8 *) &gBattleAnimSpritePalette_274, .tag = 10274}, + { .data = (u8 *) &gBattleAnimSpritePalette_274, .tag = 10275}, + { .data = (u8 *) &gBattleAnimSpritePalette_274, .tag = 10276}, + { .data = (u8 *) &gBattleAnimSpritePalette_277, .tag = 10277}, + { .data = (u8 *) &gBattleAnimSpritePalette_278, .tag = 10278}, + { .data = (u8 *) &gBattleAnimSpritePalette_279, .tag = 10279}, + { .data = (u8 *) &gBattleAnimSpritePalette_280, .tag = 10280}, + { .data = (u8 *) &gBattleAnimSpritePalette_281, .tag = 10281}, + { .data = (u8 *) &gBattleAnimSpritePalette_282, .tag = 10282}, + { .data = (u8 *) &gBattleAnimSpritePalette_283, .tag = 10283}, + { .data = (u8 *) &gBattleAnimSpritePalette_284, .tag = 10284}, + { .data = (u8 *) &gBattleAnimSpritePalette_285, .tag = 10285}, + { .data = (u8 *) &gBattleAnimSpritePalette_286, .tag = 10286}, + { .data = (u8 *) &gBattleAnimSpritePalette_287, .tag = 10287}, + { .data = (u8 *) &gBattleAnimSpritePalette_288, .tag = 10288}, +}; + +const struct BattleAnimBackground gBattleAnimBackgroundTable[] = +{ + &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, + &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, + &gBattleAnimBackgroundImage_02, &gBattleAnimBackgroundPalette_02, &gBattleAnimBackgroundTilemap_02, + &gBattleAnimBackgroundImage_03, &gBattleAnimBackgroundPalette_03, &gBattleAnimBackgroundTilemap_03, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_04, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_05, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_06, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_07, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_08, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_09, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_10, + &gBattleAnimBackgroundImage_11, &gBattleAnimBackgroundPalette_11, &gBattleAnimBackgroundTilemap_11, + &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_12, + &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_13, + &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_14, + &gBattleAnimBackgroundImage_15, &gBattleAnimBackgroundPalette_15, &gBattleAnimBackgroundTilemap_15, + &gBattleAnimBackgroundImage_16, &gBattleAnimBackgroundPalette_16, &gBattleAnimBackgroundTilemap_16, + &gBattleAnimBackgroundImage_17, &gBattleAnimBackgroundPalette_17, &gBattleAnimBackgroundTilemap_17, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_07, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_08, + &gBattleAnimBackgroundImage_20, &gBattleAnimBackgroundPalette_20, &gBattleAnimBackgroundTilemap_20, + &gBattleAnimBackgroundImage_21, &gBattleAnimBackgroundPalette_21, &gBattleAnimBackgroundTilemap_21, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_09, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_10, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_04, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_05, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_06, +}; diff --git a/src/data/graphics.h b/src/data/graphics.h new file mode 100644 index 000000000..d305c4afb --- /dev/null +++ b/src/data/graphics.h @@ -0,0 +1,338 @@ +extern struct CompressedSpritePalette gBattleAnimSpritePalette_000; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_002; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_003; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_004; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_005; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_006; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_007; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_008; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_009; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_010; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_011; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_012; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_013; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_014; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_015; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_016; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_016; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_018; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_019; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_020; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_021; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_022; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_023; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_024; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_025; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_026; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_027; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_028; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_029; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_030; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_031; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_032; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_036; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_036; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_039; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_042; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_043; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_044; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_045; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_046; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_047; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_048; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_049; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_026; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_054; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_056; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_057; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_058; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_059; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_060; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_061; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_062; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_063; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_065; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_066; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_067; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_068; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_065; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_070; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_070; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_072; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_073; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_074; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_075; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_076; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_076; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_078; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_078; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_080; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_081; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_082; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_083; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_084; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_085; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_086; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_087; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_088; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_089; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_090; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_091; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_092; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_093; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_094; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_095; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_096; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_097; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_094; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_099; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_100; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_101; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_101; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_103; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_104; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_105; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_105; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_107; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_107; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_109; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_109; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_111; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_112; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_113; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_114; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_115; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_116; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_117; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_118; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_119; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_120; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_121; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_122; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_122; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_124; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_125; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_126; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_127; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_128; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_128; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_130; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_130; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_132; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_133; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_133; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_136; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_139; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_140; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_141; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_141; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_143; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_144; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_139; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_115; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_147; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_148; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_148; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_150; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_150; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_152; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_153; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_154; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_155; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_156; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_157; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_158; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_159; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_160; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_161; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_162; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_163; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_164; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_165; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_166; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_167; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_168; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_169; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_170; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_171; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_172; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_174; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_175; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_176; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_177; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_178; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_182; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_183; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_184; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_185; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_186; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_187; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_188; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_189; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_190; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_191; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_192; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_193; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_194; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_195; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_196; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_197; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_198; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_199; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_200; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_201; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_202; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_203; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_204; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_205; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_206; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_207; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_167; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_209; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_210; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_215; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_216; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_217; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_218; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_219; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_220; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_221; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_222; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_223; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_224; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_225; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_228; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_229; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_230; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_233; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_234; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_235; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_236; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_237; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_238; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_239; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_240; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_241; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_242; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_243; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_244; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_248; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_251; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_252; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_253; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_254; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_255; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_256; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_257; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_258; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_259; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_260; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_261; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_262; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_263; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_264; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_265; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_266; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_267; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_268; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_269; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_270; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_271; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_277; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_278; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_279; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_280; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_281; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_282; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_283; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_284; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_285; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_286; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_287; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_288; + +extern struct BattleAnimBackground gBattleAnimBackgroundImage_00; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_02; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_03; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_04; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_07; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_09; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_11; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_12; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_15; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_16; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_17; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_20; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_21; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_00; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_02; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_03; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_04; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_07; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_09; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_11; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_12; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_15; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_16; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_17; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_18; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_20; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_21; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_22; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_24; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_00; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_02; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_03; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_04; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_05; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_06; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_07; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_08; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_09; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_10; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_11; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_12; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_13; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_14; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_15; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_16; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; \ No newline at end of file -- cgit v1.2.3 From bbd91594f99d0a4eacfb7b6b4e9f46d57f8e9fad Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 14 Jan 2018 01:41:54 +0100 Subject: Fixings --- include/graphics.h | 346 ++++++++++++++++++++++++++++- src/data/battle_anim.h | 580 ++++++++++++++++++++++++------------------------- src/data/graphics.h | 338 ---------------------------- 3 files changed, 632 insertions(+), 632 deletions(-) delete mode 100644 src/data/graphics.h diff --git a/include/graphics.h b/include/graphics.h index 00a210350..cbe8fff5f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -52,10 +52,6 @@ extern const u8 gContestNextTurnGfx[]; extern const u8 gContestNextTurnNumbersGfx[]; extern const u8 gContestNextTurnRandomGfx[]; extern const u8 gBattleAnimSpriteSheet_264[]; -extern const u8 gBattleAnimSpritePalette_264[]; -extern const u8 gBattleAnimSpritePalette_265[]; -extern const u8 gBattleAnimSpritePalette_067[]; -extern const u8 gBattleAnimSpritePalette_068[]; extern const u8 gContestApplauseGfx[]; extern const u8 gContestApplauseMeterGfx[]; extern const u16 gContestPal[]; @@ -2743,4 +2739,346 @@ extern const u16 gCableCar_Pal[]; extern const u16 gCableCarBG_Pal[]; extern const u8 gCableCarBG_Gfx[]; +// data/graphics.s + + +extern struct CompressedSpritePalette gBattleAnimSpritePalette_000; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_002; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_003; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_004; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_005; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_006; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_007; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_008; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_009; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_010; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_011; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_012; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_013; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_014; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_015; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_016; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_016; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_018; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_019; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_020; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_021; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_022; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_023; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_024; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_025; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_026; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_027; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_028; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_029; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_030; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_031; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_032; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_036; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_036; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_039; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_042; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_043; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_044; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_045; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_046; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_047; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_048; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_049; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_026; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_054; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_056; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_057; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_058; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_059; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_060; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_061; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_062; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_063; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_065; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_066; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_067; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_068; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_065; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_070; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_070; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_072; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_073; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_074; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_075; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_076; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_076; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_078; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_078; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_080; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_081; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_082; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_083; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_084; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_085; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_086; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_087; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_088; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_089; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_090; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_091; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_092; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_093; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_094; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_095; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_096; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_097; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_094; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_099; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_100; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_101; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_101; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_103; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_104; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_105; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_105; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_107; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_107; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_109; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_109; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_111; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_112; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_113; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_114; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_115; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_116; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_117; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_118; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_119; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_120; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_121; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_122; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_122; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_124; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_125; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_126; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_127; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_128; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_128; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_130; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_130; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_132; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_133; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_133; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_136; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_139; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_140; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_141; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_141; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_143; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_144; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_139; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_115; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_147; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_148; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_148; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_150; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_150; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_152; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_153; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_154; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_155; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_156; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_157; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_158; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_159; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_160; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_161; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_162; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_163; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_164; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_165; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_166; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_167; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_168; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_169; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_170; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_171; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_172; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_174; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_175; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_176; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_177; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_178; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_182; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_183; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_184; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_185; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_186; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_187; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_188; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_189; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_190; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_191; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_192; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_193; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_194; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_195; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_196; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_197; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_198; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_199; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_200; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_201; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_202; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_203; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_204; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_205; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_206; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_207; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_167; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_209; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_210; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_215; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_216; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_217; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_218; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_219; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_220; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_221; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_222; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_223; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_224; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_225; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_228; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_229; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_230; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_233; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_234; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_235; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_236; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_237; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_238; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_239; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_240; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_241; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_242; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_243; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_244; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_248; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_251; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_252; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_253; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_254; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_255; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_256; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_257; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_258; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_259; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_260; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_261; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_262; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_263; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_264; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_265; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_266; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_267; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_268; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_269; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_270; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_271; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_277; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_278; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_279; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_280; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_281; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_282; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_283; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_284; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_285; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_286; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_287; +extern struct CompressedSpritePalette gBattleAnimSpritePalette_288; + +extern struct BattleAnimBackground gBattleAnimBackgroundImage_00; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_02; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_03; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_04; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_07; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_09; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_11; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_12; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_15; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_16; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_17; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_20; +extern struct BattleAnimBackground gBattleAnimBackgroundImage_21; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_00; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_02; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_03; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_04; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_07; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_09; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_11; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_12; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_15; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_16; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_17; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_18; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_20; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_21; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_22; +extern struct BattleAnimBackground gBattleAnimBackgroundPalette_24; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_00; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_02; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_03; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_04; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_05; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_06; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_07; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_08; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_09; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_10; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_11; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_12; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_13; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_14; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_15; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_16; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; +extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; + #endif // GUARD_GRAPHICS_H diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h index fb7ed0e6c..1e12e2011 100644 --- a/src/data/battle_anim.h +++ b/src/data/battle_anim.h @@ -1,297 +1,297 @@ #include "global.h" -#include "../data/graphics.h" +#include "graphics.h" const struct CompressedSpritePalette gBattleAnimPaletteTable[] = { - { .data = (u8 *) &gBattleAnimSpritePalette_000, .tag = 10000}, - { .data = (u8 *) &gBattleAnimSpritePalette_001, .tag = 10001}, - { .data = (u8 *) &gBattleAnimSpritePalette_002, .tag = 10002}, - { .data = (u8 *) &gBattleAnimSpritePalette_003, .tag = 10003}, - { .data = (u8 *) &gBattleAnimSpritePalette_004, .tag = 10004}, - { .data = (u8 *) &gBattleAnimSpritePalette_005, .tag = 10005}, - { .data = (u8 *) &gBattleAnimSpritePalette_006, .tag = 10006}, - { .data = (u8 *) &gBattleAnimSpritePalette_007, .tag = 10007}, - { .data = (u8 *) &gBattleAnimSpritePalette_008, .tag = 10008}, - { .data = (u8 *) &gBattleAnimSpritePalette_009, .tag = 10009}, - { .data = (u8 *) &gBattleAnimSpritePalette_010, .tag = 10010}, - { .data = (u8 *) &gBattleAnimSpritePalette_011, .tag = 10011}, - { .data = (u8 *) &gBattleAnimSpritePalette_012, .tag = 10012}, - { .data = (u8 *) &gBattleAnimSpritePalette_013, .tag = 10013}, - { .data = (u8 *) &gBattleAnimSpritePalette_014, .tag = 10014}, - { .data = (u8 *) &gBattleAnimSpritePalette_015, .tag = 10015}, - { .data = (u8 *) &gBattleAnimSpritePalette_016, .tag = 10016}, - { .data = (u8 *) &gBattleAnimSpritePalette_016, .tag = 10017}, - { .data = (u8 *) &gBattleAnimSpritePalette_018, .tag = 10018}, - { .data = (u8 *) &gBattleAnimSpritePalette_019, .tag = 10019}, - { .data = (u8 *) &gBattleAnimSpritePalette_020, .tag = 10020}, - { .data = (u8 *) &gBattleAnimSpritePalette_021, .tag = 10021}, - { .data = (u8 *) &gBattleAnimSpritePalette_022, .tag = 10022}, - { .data = (u8 *) &gBattleAnimSpritePalette_023, .tag = 10023}, - { .data = (u8 *) &gBattleAnimSpritePalette_024, .tag = 10024}, - { .data = (u8 *) &gBattleAnimSpritePalette_025, .tag = 10025}, - { .data = (u8 *) &gBattleAnimSpritePalette_026, .tag = 10026}, - { .data = (u8 *) &gBattleAnimSpritePalette_027, .tag = 10027}, - { .data = (u8 *) &gBattleAnimSpritePalette_028, .tag = 10028}, - { .data = (u8 *) &gBattleAnimSpritePalette_029, .tag = 10029}, - { .data = (u8 *) &gBattleAnimSpritePalette_030, .tag = 10030}, - { .data = (u8 *) &gBattleAnimSpritePalette_031, .tag = 10031}, - { .data = (u8 *) &gBattleAnimSpritePalette_032, .tag = 10032}, - { .data = (u8 *) &gBattleAnimSpritePalette_033, .tag = 10033}, - { .data = (u8 *) &gBattleAnimSpritePalette_033, .tag = 10034}, - { .data = (u8 *) &gBattleAnimSpritePalette_033, .tag = 10035}, - { .data = (u8 *) &gBattleAnimSpritePalette_036, .tag = 10036}, - { .data = (u8 *) &gBattleAnimSpritePalette_036, .tag = 10037}, - { .data = (u8 *) &gBattleAnimSpritePalette_038, .tag = 10038}, - { .data = (u8 *) &gBattleAnimSpritePalette_039, .tag = 10039}, - { .data = (u8 *) &gBattleAnimSpritePalette_038, .tag = 10040}, - { .data = (u8 *) &gBattleAnimSpritePalette_038, .tag = 10041}, - { .data = (u8 *) &gBattleAnimSpritePalette_042, .tag = 10042}, - { .data = (u8 *) &gBattleAnimSpritePalette_043, .tag = 10043}, - { .data = (u8 *) &gBattleAnimSpritePalette_044, .tag = 10044}, - { .data = (u8 *) &gBattleAnimSpritePalette_045, .tag = 10045}, - { .data = (u8 *) &gBattleAnimSpritePalette_046, .tag = 10046}, - { .data = (u8 *) &gBattleAnimSpritePalette_047, .tag = 10046}, - { .data = (u8 *) &gBattleAnimSpritePalette_048, .tag = 10048}, - { .data = (u8 *) &gBattleAnimSpritePalette_049, .tag = 10049}, - { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10050}, - { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10051}, - { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10052}, - { .data = (u8 *) &gBattleAnimSpritePalette_026, .tag = 10053}, - { .data = (u8 *) &gBattleAnimSpritePalette_054, .tag = 10054}, - { .data = (u8 *) &gBattleAnimSpritePalette_050, .tag = 10055}, - { .data = (u8 *) &gBattleAnimSpritePalette_056, .tag = 10056}, - { .data = (u8 *) &gBattleAnimSpritePalette_057, .tag = 10057}, - { .data = (u8 *) &gBattleAnimSpritePalette_058, .tag = 10058}, - { .data = (u8 *) &gBattleAnimSpritePalette_059, .tag = 10059}, - { .data = (u8 *) &gBattleAnimSpritePalette_060, .tag = 10060}, - { .data = (u8 *) &gBattleAnimSpritePalette_061, .tag = 10061}, - { .data = (u8 *) &gBattleAnimSpritePalette_062, .tag = 10062}, - { .data = (u8 *) &gBattleAnimSpritePalette_063, .tag = 10063}, - { .data = (u8 *) &gBattleAnimSpritePalette_064, .tag = 10064}, - { .data = (u8 *) &gBattleAnimSpritePalette_065, .tag = 10065}, - { .data = (u8 *) &gBattleAnimSpritePalette_066, .tag = 10066}, - { .data = (u8 *) &gBattleAnimSpritePalette_067, .tag = 10067}, - { .data = (u8 *) &gBattleAnimSpritePalette_068, .tag = 10068}, - { .data = (u8 *) &gBattleAnimSpritePalette_065, .tag = 10069}, - { .data = (u8 *) &gBattleAnimSpritePalette_070, .tag = 10070}, - { .data = (u8 *) &gBattleAnimSpritePalette_070, .tag = 10071}, - { .data = (u8 *) &gBattleAnimSpritePalette_072, .tag = 10072}, - { .data = (u8 *) &gBattleAnimSpritePalette_073, .tag = 10073}, - { .data = (u8 *) &gBattleAnimSpritePalette_074, .tag = 10074}, - { .data = (u8 *) &gBattleAnimSpritePalette_075, .tag = 10075}, - { .data = (u8 *) &gBattleAnimSpritePalette_076, .tag = 10076}, - { .data = (u8 *) &gBattleAnimSpritePalette_076, .tag = 10077}, - { .data = (u8 *) &gBattleAnimSpritePalette_078, .tag = 10078}, - { .data = (u8 *) &gBattleAnimSpritePalette_078, .tag = 10079}, - { .data = (u8 *) &gBattleAnimSpritePalette_080, .tag = 10080}, - { .data = (u8 *) &gBattleAnimSpritePalette_081, .tag = 10081}, - { .data = (u8 *) &gBattleAnimSpritePalette_082, .tag = 10082}, - { .data = (u8 *) &gBattleAnimSpritePalette_083, .tag = 10083}, - { .data = (u8 *) &gBattleAnimSpritePalette_084, .tag = 10084}, - { .data = (u8 *) &gBattleAnimSpritePalette_085, .tag = 10085}, - { .data = (u8 *) &gBattleAnimSpritePalette_086, .tag = 10086}, - { .data = (u8 *) &gBattleAnimSpritePalette_087, .tag = 10087}, - { .data = (u8 *) &gBattleAnimSpritePalette_088, .tag = 10088}, - { .data = (u8 *) &gBattleAnimSpritePalette_089, .tag = 10089}, - { .data = (u8 *) &gBattleAnimSpritePalette_090, .tag = 10090}, - { .data = (u8 *) &gBattleAnimSpritePalette_091, .tag = 10091}, - { .data = (u8 *) &gBattleAnimSpritePalette_092, .tag = 10092}, - { .data = (u8 *) &gBattleAnimSpritePalette_093, .tag = 10093}, - { .data = (u8 *) &gBattleAnimSpritePalette_094, .tag = 10094}, - { .data = (u8 *) &gBattleAnimSpritePalette_095, .tag = 10095}, - { .data = (u8 *) &gBattleAnimSpritePalette_096, .tag = 10096}, - { .data = (u8 *) &gBattleAnimSpritePalette_097, .tag = 10097}, - { .data = (u8 *) &gBattleAnimSpritePalette_094, .tag = 10098}, - { .data = (u8 *) &gBattleAnimSpritePalette_099, .tag = 10099}, - { .data = (u8 *) &gBattleAnimSpritePalette_100, .tag = 10100}, - { .data = (u8 *) &gBattleAnimSpritePalette_101, .tag = 10101}, - { .data = (u8 *) &gBattleAnimSpritePalette_101, .tag = 10102}, - { .data = (u8 *) &gBattleAnimSpritePalette_103, .tag = 10103}, - { .data = (u8 *) &gBattleAnimSpritePalette_104, .tag = 10104}, - { .data = (u8 *) &gBattleAnimSpritePalette_105, .tag = 10105}, - { .data = (u8 *) &gBattleAnimSpritePalette_105, .tag = 10106}, - { .data = (u8 *) &gBattleAnimSpritePalette_107, .tag = 10107}, - { .data = (u8 *) &gBattleAnimSpritePalette_107, .tag = 10108}, - { .data = (u8 *) &gBattleAnimSpritePalette_109, .tag = 10109}, - { .data = (u8 *) &gBattleAnimSpritePalette_109, .tag = 10110}, - { .data = (u8 *) &gBattleAnimSpritePalette_111, .tag = 10111}, - { .data = (u8 *) &gBattleAnimSpritePalette_112, .tag = 10112}, - { .data = (u8 *) &gBattleAnimSpritePalette_113, .tag = 10113}, - { .data = (u8 *) &gBattleAnimSpritePalette_114, .tag = 10114}, - { .data = (u8 *) &gBattleAnimSpritePalette_115, .tag = 10115}, - { .data = (u8 *) &gBattleAnimSpritePalette_116, .tag = 10116}, - { .data = (u8 *) &gBattleAnimSpritePalette_117, .tag = 10117}, - { .data = (u8 *) &gBattleAnimSpritePalette_118, .tag = 10118}, - { .data = (u8 *) &gBattleAnimSpritePalette_119, .tag = 10119}, - { .data = (u8 *) &gBattleAnimSpritePalette_120, .tag = 10120}, - { .data = (u8 *) &gBattleAnimSpritePalette_121, .tag = 10121}, - { .data = (u8 *) &gBattleAnimSpritePalette_122, .tag = 10122}, - { .data = (u8 *) &gBattleAnimSpritePalette_122, .tag = 10123}, - { .data = (u8 *) &gBattleAnimSpritePalette_124, .tag = 10124}, - { .data = (u8 *) &gBattleAnimSpritePalette_125, .tag = 10125}, - { .data = (u8 *) &gBattleAnimSpritePalette_126, .tag = 10126}, - { .data = (u8 *) &gBattleAnimSpritePalette_127, .tag = 10127}, - { .data = (u8 *) &gBattleAnimSpritePalette_128, .tag = 10128}, - { .data = (u8 *) &gBattleAnimSpritePalette_128, .tag = 10129}, - { .data = (u8 *) &gBattleAnimSpritePalette_130, .tag = 10130}, - { .data = (u8 *) &gBattleAnimSpritePalette_130, .tag = 10131}, - { .data = (u8 *) &gBattleAnimSpritePalette_132, .tag = 10132}, - { .data = (u8 *) &gBattleAnimSpritePalette_133, .tag = 10133}, - { .data = (u8 *) &gBattleAnimSpritePalette_133, .tag = 10134}, - { .data = (u8 *) &gBattleAnimSpritePalette_135, .tag = 10135}, - { .data = (u8 *) &gBattleAnimSpritePalette_136, .tag = 10136}, - { .data = (u8 *) &gBattleAnimSpritePalette_135, .tag = 10137}, - { .data = (u8 *) &gBattleAnimSpritePalette_135, .tag = 10138}, - { .data = (u8 *) &gBattleAnimSpritePalette_139, .tag = 10139}, - { .data = (u8 *) &gBattleAnimSpritePalette_140, .tag = 10140}, - { .data = (u8 *) &gBattleAnimSpritePalette_141, .tag = 10141}, - { .data = (u8 *) &gBattleAnimSpritePalette_141, .tag = 10142}, - { .data = (u8 *) &gBattleAnimSpritePalette_143, .tag = 10143}, - { .data = (u8 *) &gBattleAnimSpritePalette_144, .tag = 10144}, - { .data = (u8 *) &gBattleAnimSpritePalette_139, .tag = 10145}, - { .data = (u8 *) &gBattleAnimSpritePalette_115, .tag = 10146}, - { .data = (u8 *) &gBattleAnimSpritePalette_147, .tag = 10147}, - { .data = (u8 *) &gBattleAnimSpritePalette_148, .tag = 10148}, - { .data = (u8 *) &gBattleAnimSpritePalette_148, .tag = 10149}, - { .data = (u8 *) &gBattleAnimSpritePalette_150, .tag = 10150}, - { .data = (u8 *) &gBattleAnimSpritePalette_150, .tag = 10151}, - { .data = (u8 *) &gBattleAnimSpritePalette_152, .tag = 10152}, - { .data = (u8 *) &gBattleAnimSpritePalette_153, .tag = 10153}, - { .data = (u8 *) &gBattleAnimSpritePalette_154, .tag = 10154}, - { .data = (u8 *) &gBattleAnimSpritePalette_155, .tag = 10155}, - { .data = (u8 *) &gBattleAnimSpritePalette_156, .tag = 10156}, - { .data = (u8 *) &gBattleAnimSpritePalette_157, .tag = 10157}, - { .data = (u8 *) &gBattleAnimSpritePalette_158, .tag = 10158}, - { .data = (u8 *) &gBattleAnimSpritePalette_159, .tag = 10159}, - { .data = (u8 *) &gBattleAnimSpritePalette_160, .tag = 10160}, - { .data = (u8 *) &gBattleAnimSpritePalette_161, .tag = 10161}, - { .data = (u8 *) &gBattleAnimSpritePalette_162, .tag = 10162}, - { .data = (u8 *) &gBattleAnimSpritePalette_163, .tag = 10163}, - { .data = (u8 *) &gBattleAnimSpritePalette_164, .tag = 10164}, - { .data = (u8 *) &gBattleAnimSpritePalette_165, .tag = 10165}, - { .data = (u8 *) &gBattleAnimSpritePalette_166, .tag = 10166}, - { .data = (u8 *) &gBattleAnimSpritePalette_167, .tag = 10167}, - { .data = (u8 *) &gBattleAnimSpritePalette_168, .tag = 10168}, - { .data = (u8 *) &gBattleAnimSpritePalette_169, .tag = 10169}, - { .data = (u8 *) &gBattleAnimSpritePalette_170, .tag = 10170}, - { .data = (u8 *) &gBattleAnimSpritePalette_171, .tag = 10171}, - { .data = (u8 *) &gBattleAnimSpritePalette_172, .tag = 10172}, - { .data = (u8 *) &gBattleAnimSpritePalette_001, .tag = 10173}, - { .data = (u8 *) &gBattleAnimSpritePalette_174, .tag = 10174}, - { .data = (u8 *) &gBattleAnimSpritePalette_175, .tag = 10175}, - { .data = (u8 *) &gBattleAnimSpritePalette_176, .tag = 10176}, - { .data = (u8 *) &gBattleAnimSpritePalette_177, .tag = 10177}, - { .data = (u8 *) &gBattleAnimSpritePalette_178, .tag = 10178}, - { .data = (u8 *) &gBattleAnimSpritePalette_179, .tag = 10179}, - { .data = (u8 *) &gBattleAnimSpritePalette_179, .tag = 10180}, - { .data = (u8 *) &gBattleAnimSpritePalette_179, .tag = 10181}, - { .data = (u8 *) &gBattleAnimSpritePalette_182, .tag = 10182}, - { .data = (u8 *) &gBattleAnimSpritePalette_183, .tag = 10183}, - { .data = (u8 *) &gBattleAnimSpritePalette_184, .tag = 10184}, - { .data = (u8 *) &gBattleAnimSpritePalette_185, .tag = 10185}, - { .data = (u8 *) &gBattleAnimSpritePalette_186, .tag = 10186}, - { .data = (u8 *) &gBattleAnimSpritePalette_187, .tag = 10187}, - { .data = (u8 *) &gBattleAnimSpritePalette_188, .tag = 10188}, - { .data = (u8 *) &gBattleAnimSpritePalette_189, .tag = 10189}, - { .data = (u8 *) &gBattleAnimSpritePalette_190, .tag = 10190}, - { .data = (u8 *) &gBattleAnimSpritePalette_191, .tag = 10191}, - { .data = (u8 *) &gBattleAnimSpritePalette_192, .tag = 10192}, - { .data = (u8 *) &gBattleAnimSpritePalette_193, .tag = 10193}, - { .data = (u8 *) &gBattleAnimSpritePalette_194, .tag = 10194}, - { .data = (u8 *) &gBattleAnimSpritePalette_195, .tag = 10195}, - { .data = (u8 *) &gBattleAnimSpritePalette_196, .tag = 10196}, - { .data = (u8 *) &gBattleAnimSpritePalette_197, .tag = 10197}, - { .data = (u8 *) &gBattleAnimSpritePalette_198, .tag = 10198}, - { .data = (u8 *) &gBattleAnimSpritePalette_199, .tag = 10199}, - { .data = (u8 *) &gBattleAnimSpritePalette_200, .tag = 10200}, - { .data = (u8 *) &gBattleAnimSpritePalette_201, .tag = 10201}, - { .data = (u8 *) &gBattleAnimSpritePalette_202, .tag = 10202}, - { .data = (u8 *) &gBattleAnimSpritePalette_203, .tag = 10203}, - { .data = (u8 *) &gBattleAnimSpritePalette_204, .tag = 10204}, - { .data = (u8 *) &gBattleAnimSpritePalette_205, .tag = 10205}, - { .data = (u8 *) &gBattleAnimSpritePalette_206, .tag = 10206}, - { .data = (u8 *) &gBattleAnimSpritePalette_207, .tag = 10207}, - { .data = (u8 *) &gBattleAnimSpritePalette_167, .tag = 10208}, - { .data = (u8 *) &gBattleAnimSpritePalette_209, .tag = 10209}, - { .data = (u8 *) &gBattleAnimSpritePalette_210, .tag = 10210}, - { .data = (u8 *) &gBattleAnimSpritePalette_211, .tag = 10211}, - { .data = (u8 *) &gBattleAnimSpritePalette_211, .tag = 10212}, - { .data = (u8 *) &gBattleAnimSpritePalette_211, .tag = 10213}, - { .data = (u8 *) &gBattleAnimSpritePalette_064, .tag = 10214}, - { .data = (u8 *) &gBattleAnimSpritePalette_215, .tag = 10215}, - { .data = (u8 *) &gBattleAnimSpritePalette_216, .tag = 10216}, - { .data = (u8 *) &gBattleAnimSpritePalette_217, .tag = 10217}, - { .data = (u8 *) &gBattleAnimSpritePalette_218, .tag = 10218}, - { .data = (u8 *) &gBattleAnimSpritePalette_219, .tag = 10219}, - { .data = (u8 *) &gBattleAnimSpritePalette_220, .tag = 10220}, - { .data = (u8 *) &gBattleAnimSpritePalette_221, .tag = 10221}, - { .data = (u8 *) &gBattleAnimSpritePalette_222, .tag = 10222}, - { .data = (u8 *) &gBattleAnimSpritePalette_223, .tag = 10223}, - { .data = (u8 *) &gBattleAnimSpritePalette_224, .tag = 10224}, - { .data = (u8 *) &gBattleAnimSpritePalette_225, .tag = 10225}, - { .data = (u8 *) &gBattleAnimSpritePalette_226, .tag = 10226}, - { .data = (u8 *) &gBattleAnimSpritePalette_226, .tag = 10227}, - { .data = (u8 *) &gBattleAnimSpritePalette_228, .tag = 10228}, - { .data = (u8 *) &gBattleAnimSpritePalette_229, .tag = 10229}, - { .data = (u8 *) &gBattleAnimSpritePalette_230, .tag = 10230}, - { .data = (u8 *) &gBattleAnimSpritePalette_231, .tag = 10231}, - { .data = (u8 *) &gBattleAnimSpritePalette_231, .tag = 10232}, - { .data = (u8 *) &gBattleAnimSpritePalette_233, .tag = 10233}, - { .data = (u8 *) &gBattleAnimSpritePalette_234, .tag = 10234}, - { .data = (u8 *) &gBattleAnimSpritePalette_235, .tag = 10235}, - { .data = (u8 *) &gBattleAnimSpritePalette_236, .tag = 10236}, - { .data = (u8 *) &gBattleAnimSpritePalette_237, .tag = 10237}, - { .data = (u8 *) &gBattleAnimSpritePalette_238, .tag = 10238}, - { .data = (u8 *) &gBattleAnimSpritePalette_239, .tag = 10239}, - { .data = (u8 *) &gBattleAnimSpritePalette_240, .tag = 10240}, - { .data = (u8 *) &gBattleAnimSpritePalette_241, .tag = 10241}, - { .data = (u8 *) &gBattleAnimSpritePalette_242, .tag = 10242}, - { .data = (u8 *) &gBattleAnimSpritePalette_243, .tag = 10243}, - { .data = (u8 *) &gBattleAnimSpritePalette_244, .tag = 10244}, - { .data = (u8 *) &gBattleAnimSpritePalette_245, .tag = 10245}, - { .data = (u8 *) &gBattleAnimSpritePalette_245, .tag = 10246}, - { .data = (u8 *) &gBattleAnimSpritePalette_064, .tag = 10247}, - { .data = (u8 *) &gBattleAnimSpritePalette_248, .tag = 10248}, - { .data = (u8 *) &gBattleAnimSpritePalette_249, .tag = 10249}, - { .data = (u8 *) &gBattleAnimSpritePalette_249, .tag = 10250}, - { .data = (u8 *) &gBattleAnimSpritePalette_251, .tag = 10251}, - { .data = (u8 *) &gBattleAnimSpritePalette_252, .tag = 10252}, - { .data = (u8 *) &gBattleAnimSpritePalette_253, .tag = 10253}, - { .data = (u8 *) &gBattleAnimSpritePalette_254, .tag = 10254}, - { .data = (u8 *) &gBattleAnimSpritePalette_255, .tag = 10255}, - { .data = (u8 *) &gBattleAnimSpritePalette_256, .tag = 10256}, - { .data = (u8 *) &gBattleAnimSpritePalette_257, .tag = 10257}, - { .data = (u8 *) &gBattleAnimSpritePalette_258, .tag = 10258}, - { .data = (u8 *) &gBattleAnimSpritePalette_259, .tag = 10259}, - { .data = (u8 *) &gBattleAnimSpritePalette_260, .tag = 10260}, - { .data = (u8 *) &gBattleAnimSpritePalette_261, .tag = 10261}, - { .data = (u8 *) &gBattleAnimSpritePalette_262, .tag = 10262}, - { .data = (u8 *) &gBattleAnimSpritePalette_263, .tag = 10263}, - { .data = (u8 *) &gBattleAnimSpritePalette_264, .tag = 10264}, - { .data = (u8 *) &gBattleAnimSpritePalette_265, .tag = 10265}, - { .data = (u8 *) &gBattleAnimSpritePalette_266, .tag = 10266}, - { .data = (u8 *) &gBattleAnimSpritePalette_267, .tag = 10267}, - { .data = (u8 *) &gBattleAnimSpritePalette_268, .tag = 10268}, - { .data = (u8 *) &gBattleAnimSpritePalette_269, .tag = 10269}, - { .data = (u8 *) &gBattleAnimSpritePalette_270, .tag = 10270}, - { .data = (u8 *) &gBattleAnimSpritePalette_271, .tag = 10271}, - { .data = (u8 *) &gBattleAnimSpritePalette_272, .tag = 10272}, - { .data = (u8 *) &gBattleAnimSpritePalette_272, .tag = 10273}, - { .data = (u8 *) &gBattleAnimSpritePalette_274, .tag = 10274}, - { .data = (u8 *) &gBattleAnimSpritePalette_274, .tag = 10275}, - { .data = (u8 *) &gBattleAnimSpritePalette_274, .tag = 10276}, - { .data = (u8 *) &gBattleAnimSpritePalette_277, .tag = 10277}, - { .data = (u8 *) &gBattleAnimSpritePalette_278, .tag = 10278}, - { .data = (u8 *) &gBattleAnimSpritePalette_279, .tag = 10279}, - { .data = (u8 *) &gBattleAnimSpritePalette_280, .tag = 10280}, - { .data = (u8 *) &gBattleAnimSpritePalette_281, .tag = 10281}, - { .data = (u8 *) &gBattleAnimSpritePalette_282, .tag = 10282}, - { .data = (u8 *) &gBattleAnimSpritePalette_283, .tag = 10283}, - { .data = (u8 *) &gBattleAnimSpritePalette_284, .tag = 10284}, - { .data = (u8 *) &gBattleAnimSpritePalette_285, .tag = 10285}, - { .data = (u8 *) &gBattleAnimSpritePalette_286, .tag = 10286}, - { .data = (u8 *) &gBattleAnimSpritePalette_287, .tag = 10287}, - { .data = (u8 *) &gBattleAnimSpritePalette_288, .tag = 10288}, + { (u8 *) &gBattleAnimSpritePalette_000, 10000}, + { (u8 *) &gBattleAnimSpritePalette_001, 10001}, + { (u8 *) &gBattleAnimSpritePalette_002, 10002}, + { (u8 *) &gBattleAnimSpritePalette_003, 10003}, + { (u8 *) &gBattleAnimSpritePalette_004, 10004}, + { (u8 *) &gBattleAnimSpritePalette_005, 10005}, + { (u8 *) &gBattleAnimSpritePalette_006, 10006}, + { (u8 *) &gBattleAnimSpritePalette_007, 10007}, + { (u8 *) &gBattleAnimSpritePalette_008, 10008}, + { (u8 *) &gBattleAnimSpritePalette_009, 10009}, + { (u8 *) &gBattleAnimSpritePalette_010, 10010}, + { (u8 *) &gBattleAnimSpritePalette_011, 10011}, + { (u8 *) &gBattleAnimSpritePalette_012, 10012}, + { (u8 *) &gBattleAnimSpritePalette_013, 10013}, + { (u8 *) &gBattleAnimSpritePalette_014, 10014}, + { (u8 *) &gBattleAnimSpritePalette_015, 10015}, + { (u8 *) &gBattleAnimSpritePalette_016, 10016}, + { (u8 *) &gBattleAnimSpritePalette_016, 10017}, + { (u8 *) &gBattleAnimSpritePalette_018, 10018}, + { (u8 *) &gBattleAnimSpritePalette_019, 10019}, + { (u8 *) &gBattleAnimSpritePalette_020, 10020}, + { (u8 *) &gBattleAnimSpritePalette_021, 10021}, + { (u8 *) &gBattleAnimSpritePalette_022, 10022}, + { (u8 *) &gBattleAnimSpritePalette_023, 10023}, + { (u8 *) &gBattleAnimSpritePalette_024, 10024}, + { (u8 *) &gBattleAnimSpritePalette_025, 10025}, + { (u8 *) &gBattleAnimSpritePalette_026, 10026}, + { (u8 *) &gBattleAnimSpritePalette_027, 10027}, + { (u8 *) &gBattleAnimSpritePalette_028, 10028}, + { (u8 *) &gBattleAnimSpritePalette_029, 10029}, + { (u8 *) &gBattleAnimSpritePalette_030, 10030}, + { (u8 *) &gBattleAnimSpritePalette_031, 10031}, + { (u8 *) &gBattleAnimSpritePalette_032, 10032}, + { (u8 *) &gBattleAnimSpritePalette_033, 10033}, + { (u8 *) &gBattleAnimSpritePalette_033, 10034}, + { (u8 *) &gBattleAnimSpritePalette_033, 10035}, + { (u8 *) &gBattleAnimSpritePalette_036, 10036}, + { (u8 *) &gBattleAnimSpritePalette_036, 10037}, + { (u8 *) &gBattleAnimSpritePalette_038, 10038}, + { (u8 *) &gBattleAnimSpritePalette_039, 10039}, + { (u8 *) &gBattleAnimSpritePalette_038, 10040}, + { (u8 *) &gBattleAnimSpritePalette_038, 10041}, + { (u8 *) &gBattleAnimSpritePalette_042, 10042}, + { (u8 *) &gBattleAnimSpritePalette_043, 10043}, + { (u8 *) &gBattleAnimSpritePalette_044, 10044}, + { (u8 *) &gBattleAnimSpritePalette_045, 10045}, + { (u8 *) &gBattleAnimSpritePalette_046, 10046}, + { (u8 *) &gBattleAnimSpritePalette_047, 10046}, + { (u8 *) &gBattleAnimSpritePalette_048, 10048}, + { (u8 *) &gBattleAnimSpritePalette_049, 10049}, + { (u8 *) &gBattleAnimSpritePalette_050, 10050}, + { (u8 *) &gBattleAnimSpritePalette_050, 10051}, + { (u8 *) &gBattleAnimSpritePalette_050, 10052}, + { (u8 *) &gBattleAnimSpritePalette_026, 10053}, + { (u8 *) &gBattleAnimSpritePalette_054, 10054}, + { (u8 *) &gBattleAnimSpritePalette_050, 10055}, + { (u8 *) &gBattleAnimSpritePalette_056, 10056}, + { (u8 *) &gBattleAnimSpritePalette_057, 10057}, + { (u8 *) &gBattleAnimSpritePalette_058, 10058}, + { (u8 *) &gBattleAnimSpritePalette_059, 10059}, + { (u8 *) &gBattleAnimSpritePalette_060, 10060}, + { (u8 *) &gBattleAnimSpritePalette_061, 10061}, + { (u8 *) &gBattleAnimSpritePalette_062, 10062}, + { (u8 *) &gBattleAnimSpritePalette_063, 10063}, + { (u8 *) &gBattleAnimSpritePalette_064, 10064}, + { (u8 *) &gBattleAnimSpritePalette_065, 10065}, + { (u8 *) &gBattleAnimSpritePalette_066, 10066}, + { (u8 *) &gBattleAnimSpritePalette_067, 10067}, + { (u8 *) &gBattleAnimSpritePalette_068, 10068}, + { (u8 *) &gBattleAnimSpritePalette_065, 10069}, + { (u8 *) &gBattleAnimSpritePalette_070, 10070}, + { (u8 *) &gBattleAnimSpritePalette_070, 10071}, + { (u8 *) &gBattleAnimSpritePalette_072, 10072}, + { (u8 *) &gBattleAnimSpritePalette_073, 10073}, + { (u8 *) &gBattleAnimSpritePalette_074, 10074}, + { (u8 *) &gBattleAnimSpritePalette_075, 10075}, + { (u8 *) &gBattleAnimSpritePalette_076, 10076}, + { (u8 *) &gBattleAnimSpritePalette_076, 10077}, + { (u8 *) &gBattleAnimSpritePalette_078, 10078}, + { (u8 *) &gBattleAnimSpritePalette_078, 10079}, + { (u8 *) &gBattleAnimSpritePalette_080, 10080}, + { (u8 *) &gBattleAnimSpritePalette_081, 10081}, + { (u8 *) &gBattleAnimSpritePalette_082, 10082}, + { (u8 *) &gBattleAnimSpritePalette_083, 10083}, + { (u8 *) &gBattleAnimSpritePalette_084, 10084}, + { (u8 *) &gBattleAnimSpritePalette_085, 10085}, + { (u8 *) &gBattleAnimSpritePalette_086, 10086}, + { (u8 *) &gBattleAnimSpritePalette_087, 10087}, + { (u8 *) &gBattleAnimSpritePalette_088, 10088}, + { (u8 *) &gBattleAnimSpritePalette_089, 10089}, + { (u8 *) &gBattleAnimSpritePalette_090, 10090}, + { (u8 *) &gBattleAnimSpritePalette_091, 10091}, + { (u8 *) &gBattleAnimSpritePalette_092, 10092}, + { (u8 *) &gBattleAnimSpritePalette_093, 10093}, + { (u8 *) &gBattleAnimSpritePalette_094, 10094}, + { (u8 *) &gBattleAnimSpritePalette_095, 10095}, + { (u8 *) &gBattleAnimSpritePalette_096, 10096}, + { (u8 *) &gBattleAnimSpritePalette_097, 10097}, + { (u8 *) &gBattleAnimSpritePalette_094, 10098}, + { (u8 *) &gBattleAnimSpritePalette_099, 10099}, + { (u8 *) &gBattleAnimSpritePalette_100, 10100}, + { (u8 *) &gBattleAnimSpritePalette_101, 10101}, + { (u8 *) &gBattleAnimSpritePalette_101, 10102}, + { (u8 *) &gBattleAnimSpritePalette_103, 10103}, + { (u8 *) &gBattleAnimSpritePalette_104, 10104}, + { (u8 *) &gBattleAnimSpritePalette_105, 10105}, + { (u8 *) &gBattleAnimSpritePalette_105, 10106}, + { (u8 *) &gBattleAnimSpritePalette_107, 10107}, + { (u8 *) &gBattleAnimSpritePalette_107, 10108}, + { (u8 *) &gBattleAnimSpritePalette_109, 10109}, + { (u8 *) &gBattleAnimSpritePalette_109, 10110}, + { (u8 *) &gBattleAnimSpritePalette_111, 10111}, + { (u8 *) &gBattleAnimSpritePalette_112, 10112}, + { (u8 *) &gBattleAnimSpritePalette_113, 10113}, + { (u8 *) &gBattleAnimSpritePalette_114, 10114}, + { (u8 *) &gBattleAnimSpritePalette_115, 10115}, + { (u8 *) &gBattleAnimSpritePalette_116, 10116}, + { (u8 *) &gBattleAnimSpritePalette_117, 10117}, + { (u8 *) &gBattleAnimSpritePalette_118, 10118}, + { (u8 *) &gBattleAnimSpritePalette_119, 10119}, + { (u8 *) &gBattleAnimSpritePalette_120, 10120}, + { (u8 *) &gBattleAnimSpritePalette_121, 10121}, + { (u8 *) &gBattleAnimSpritePalette_122, 10122}, + { (u8 *) &gBattleAnimSpritePalette_122, 10123}, + { (u8 *) &gBattleAnimSpritePalette_124, 10124}, + { (u8 *) &gBattleAnimSpritePalette_125, 10125}, + { (u8 *) &gBattleAnimSpritePalette_126, 10126}, + { (u8 *) &gBattleAnimSpritePalette_127, 10127}, + { (u8 *) &gBattleAnimSpritePalette_128, 10128}, + { (u8 *) &gBattleAnimSpritePalette_128, 10129}, + { (u8 *) &gBattleAnimSpritePalette_130, 10130}, + { (u8 *) &gBattleAnimSpritePalette_130, 10131}, + { (u8 *) &gBattleAnimSpritePalette_132, 10132}, + { (u8 *) &gBattleAnimSpritePalette_133, 10133}, + { (u8 *) &gBattleAnimSpritePalette_133, 10134}, + { (u8 *) &gBattleAnimSpritePalette_135, 10135}, + { (u8 *) &gBattleAnimSpritePalette_136, 10136}, + { (u8 *) &gBattleAnimSpritePalette_135, 10137}, + { (u8 *) &gBattleAnimSpritePalette_135, 10138}, + { (u8 *) &gBattleAnimSpritePalette_139, 10139}, + { (u8 *) &gBattleAnimSpritePalette_140, 10140}, + { (u8 *) &gBattleAnimSpritePalette_141, 10141}, + { (u8 *) &gBattleAnimSpritePalette_141, 10142}, + { (u8 *) &gBattleAnimSpritePalette_143, 10143}, + { (u8 *) &gBattleAnimSpritePalette_144, 10144}, + { (u8 *) &gBattleAnimSpritePalette_139, 10145}, + { (u8 *) &gBattleAnimSpritePalette_115, 10146}, + { (u8 *) &gBattleAnimSpritePalette_147, 10147}, + { (u8 *) &gBattleAnimSpritePalette_148, 10148}, + { (u8 *) &gBattleAnimSpritePalette_148, 10149}, + { (u8 *) &gBattleAnimSpritePalette_150, 10150}, + { (u8 *) &gBattleAnimSpritePalette_150, 10151}, + { (u8 *) &gBattleAnimSpritePalette_152, 10152}, + { (u8 *) &gBattleAnimSpritePalette_153, 10153}, + { (u8 *) &gBattleAnimSpritePalette_154, 10154}, + { (u8 *) &gBattleAnimSpritePalette_155, 10155}, + { (u8 *) &gBattleAnimSpritePalette_156, 10156}, + { (u8 *) &gBattleAnimSpritePalette_157, 10157}, + { (u8 *) &gBattleAnimSpritePalette_158, 10158}, + { (u8 *) &gBattleAnimSpritePalette_159, 10159}, + { (u8 *) &gBattleAnimSpritePalette_160, 10160}, + { (u8 *) &gBattleAnimSpritePalette_161, 10161}, + { (u8 *) &gBattleAnimSpritePalette_162, 10162}, + { (u8 *) &gBattleAnimSpritePalette_163, 10163}, + { (u8 *) &gBattleAnimSpritePalette_164, 10164}, + { (u8 *) &gBattleAnimSpritePalette_165, 10165}, + { (u8 *) &gBattleAnimSpritePalette_166, 10166}, + { (u8 *) &gBattleAnimSpritePalette_167, 10167}, + { (u8 *) &gBattleAnimSpritePalette_168, 10168}, + { (u8 *) &gBattleAnimSpritePalette_169, 10169}, + { (u8 *) &gBattleAnimSpritePalette_170, 10170}, + { (u8 *) &gBattleAnimSpritePalette_171, 10171}, + { (u8 *) &gBattleAnimSpritePalette_172, 10172}, + { (u8 *) &gBattleAnimSpritePalette_001, 10173}, + { (u8 *) &gBattleAnimSpritePalette_174, 10174}, + { (u8 *) &gBattleAnimSpritePalette_175, 10175}, + { (u8 *) &gBattleAnimSpritePalette_176, 10176}, + { (u8 *) &gBattleAnimSpritePalette_177, 10177}, + { (u8 *) &gBattleAnimSpritePalette_178, 10178}, + { (u8 *) &gBattleAnimSpritePalette_179, 10179}, + { (u8 *) &gBattleAnimSpritePalette_179, 10180}, + { (u8 *) &gBattleAnimSpritePalette_179, 10181}, + { (u8 *) &gBattleAnimSpritePalette_182, 10182}, + { (u8 *) &gBattleAnimSpritePalette_183, 10183}, + { (u8 *) &gBattleAnimSpritePalette_184, 10184}, + { (u8 *) &gBattleAnimSpritePalette_185, 10185}, + { (u8 *) &gBattleAnimSpritePalette_186, 10186}, + { (u8 *) &gBattleAnimSpritePalette_187, 10187}, + { (u8 *) &gBattleAnimSpritePalette_188, 10188}, + { (u8 *) &gBattleAnimSpritePalette_189, 10189}, + { (u8 *) &gBattleAnimSpritePalette_190, 10190}, + { (u8 *) &gBattleAnimSpritePalette_191, 10191}, + { (u8 *) &gBattleAnimSpritePalette_192, 10192}, + { (u8 *) &gBattleAnimSpritePalette_193, 10193}, + { (u8 *) &gBattleAnimSpritePalette_194, 10194}, + { (u8 *) &gBattleAnimSpritePalette_195, 10195}, + { (u8 *) &gBattleAnimSpritePalette_196, 10196}, + { (u8 *) &gBattleAnimSpritePalette_197, 10197}, + { (u8 *) &gBattleAnimSpritePalette_198, 10198}, + { (u8 *) &gBattleAnimSpritePalette_199, 10199}, + { (u8 *) &gBattleAnimSpritePalette_200, 10200}, + { (u8 *) &gBattleAnimSpritePalette_201, 10201}, + { (u8 *) &gBattleAnimSpritePalette_202, 10202}, + { (u8 *) &gBattleAnimSpritePalette_203, 10203}, + { (u8 *) &gBattleAnimSpritePalette_204, 10204}, + { (u8 *) &gBattleAnimSpritePalette_205, 10205}, + { (u8 *) &gBattleAnimSpritePalette_206, 10206}, + { (u8 *) &gBattleAnimSpritePalette_207, 10207}, + { (u8 *) &gBattleAnimSpritePalette_167, 10208}, + { (u8 *) &gBattleAnimSpritePalette_209, 10209}, + { (u8 *) &gBattleAnimSpritePalette_210, 10210}, + { (u8 *) &gBattleAnimSpritePalette_211, 10211}, + { (u8 *) &gBattleAnimSpritePalette_211, 10212}, + { (u8 *) &gBattleAnimSpritePalette_211, 10213}, + { (u8 *) &gBattleAnimSpritePalette_064, 10214}, + { (u8 *) &gBattleAnimSpritePalette_215, 10215}, + { (u8 *) &gBattleAnimSpritePalette_216, 10216}, + { (u8 *) &gBattleAnimSpritePalette_217, 10217}, + { (u8 *) &gBattleAnimSpritePalette_218, 10218}, + { (u8 *) &gBattleAnimSpritePalette_219, 10219}, + { (u8 *) &gBattleAnimSpritePalette_220, 10220}, + { (u8 *) &gBattleAnimSpritePalette_221, 10221}, + { (u8 *) &gBattleAnimSpritePalette_222, 10222}, + { (u8 *) &gBattleAnimSpritePalette_223, 10223}, + { (u8 *) &gBattleAnimSpritePalette_224, 10224}, + { (u8 *) &gBattleAnimSpritePalette_225, 10225}, + { (u8 *) &gBattleAnimSpritePalette_226, 10226}, + { (u8 *) &gBattleAnimSpritePalette_226, 10227}, + { (u8 *) &gBattleAnimSpritePalette_228, 10228}, + { (u8 *) &gBattleAnimSpritePalette_229, 10229}, + { (u8 *) &gBattleAnimSpritePalette_230, 10230}, + { (u8 *) &gBattleAnimSpritePalette_231, 10231}, + { (u8 *) &gBattleAnimSpritePalette_231, 10232}, + { (u8 *) &gBattleAnimSpritePalette_233, 10233}, + { (u8 *) &gBattleAnimSpritePalette_234, 10234}, + { (u8 *) &gBattleAnimSpritePalette_235, 10235}, + { (u8 *) &gBattleAnimSpritePalette_236, 10236}, + { (u8 *) &gBattleAnimSpritePalette_237, 10237}, + { (u8 *) &gBattleAnimSpritePalette_238, 10238}, + { (u8 *) &gBattleAnimSpritePalette_239, 10239}, + { (u8 *) &gBattleAnimSpritePalette_240, 10240}, + { (u8 *) &gBattleAnimSpritePalette_241, 10241}, + { (u8 *) &gBattleAnimSpritePalette_242, 10242}, + { (u8 *) &gBattleAnimSpritePalette_243, 10243}, + { (u8 *) &gBattleAnimSpritePalette_244, 10244}, + { (u8 *) &gBattleAnimSpritePalette_245, 10245}, + { (u8 *) &gBattleAnimSpritePalette_245, 10246}, + { (u8 *) &gBattleAnimSpritePalette_064, 10247}, + { (u8 *) &gBattleAnimSpritePalette_248, 10248}, + { (u8 *) &gBattleAnimSpritePalette_249, 10249}, + { (u8 *) &gBattleAnimSpritePalette_249, 10250}, + { (u8 *) &gBattleAnimSpritePalette_251, 10251}, + { (u8 *) &gBattleAnimSpritePalette_252, 10252}, + { (u8 *) &gBattleAnimSpritePalette_253, 10253}, + { (u8 *) &gBattleAnimSpritePalette_254, 10254}, + { (u8 *) &gBattleAnimSpritePalette_255, 10255}, + { (u8 *) &gBattleAnimSpritePalette_256, 10256}, + { (u8 *) &gBattleAnimSpritePalette_257, 10257}, + { (u8 *) &gBattleAnimSpritePalette_258, 10258}, + { (u8 *) &gBattleAnimSpritePalette_259, 10259}, + { (u8 *) &gBattleAnimSpritePalette_260, 10260}, + { (u8 *) &gBattleAnimSpritePalette_261, 10261}, + { (u8 *) &gBattleAnimSpritePalette_262, 10262}, + { (u8 *) &gBattleAnimSpritePalette_263, 10263}, + { (u8 *) &gBattleAnimSpritePalette_264, 10264}, + { (u8 *) &gBattleAnimSpritePalette_265, 10265}, + { (u8 *) &gBattleAnimSpritePalette_266, 10266}, + { (u8 *) &gBattleAnimSpritePalette_267, 10267}, + { (u8 *) &gBattleAnimSpritePalette_268, 10268}, + { (u8 *) &gBattleAnimSpritePalette_269, 10269}, + { (u8 *) &gBattleAnimSpritePalette_270, 10270}, + { (u8 *) &gBattleAnimSpritePalette_271, 10271}, + { (u8 *) &gBattleAnimSpritePalette_272, 10272}, + { (u8 *) &gBattleAnimSpritePalette_272, 10273}, + { (u8 *) &gBattleAnimSpritePalette_274, 10274}, + { (u8 *) &gBattleAnimSpritePalette_274, 10275}, + { (u8 *) &gBattleAnimSpritePalette_274, 10276}, + { (u8 *) &gBattleAnimSpritePalette_277, 10277}, + { (u8 *) &gBattleAnimSpritePalette_278, 10278}, + { (u8 *) &gBattleAnimSpritePalette_279, 10279}, + { (u8 *) &gBattleAnimSpritePalette_280, 10280}, + { (u8 *) &gBattleAnimSpritePalette_281, 10281}, + { (u8 *) &gBattleAnimSpritePalette_282, 10282}, + { (u8 *) &gBattleAnimSpritePalette_283, 10283}, + { (u8 *) &gBattleAnimSpritePalette_284, 10284}, + { (u8 *) &gBattleAnimSpritePalette_285, 10285}, + { (u8 *) &gBattleAnimSpritePalette_286, 10286}, + { (u8 *) &gBattleAnimSpritePalette_287, 10287}, + { (u8 *) &gBattleAnimSpritePalette_288, 10288}, }; const struct BattleAnimBackground gBattleAnimBackgroundTable[] = diff --git a/src/data/graphics.h b/src/data/graphics.h deleted file mode 100644 index d305c4afb..000000000 --- a/src/data/graphics.h +++ /dev/null @@ -1,338 +0,0 @@ -extern struct CompressedSpritePalette gBattleAnimSpritePalette_000; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_002; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_003; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_004; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_005; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_006; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_007; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_008; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_009; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_010; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_011; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_012; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_013; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_014; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_015; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_016; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_016; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_018; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_019; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_020; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_021; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_022; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_023; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_024; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_025; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_026; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_027; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_028; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_029; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_030; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_031; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_032; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_033; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_036; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_036; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_039; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_038; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_042; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_043; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_044; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_045; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_046; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_047; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_048; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_049; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_026; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_054; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_050; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_056; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_057; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_058; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_059; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_060; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_061; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_062; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_063; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_065; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_066; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_067; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_068; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_065; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_070; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_070; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_072; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_073; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_074; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_075; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_076; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_076; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_078; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_078; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_080; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_081; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_082; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_083; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_084; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_085; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_086; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_087; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_088; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_089; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_090; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_091; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_092; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_093; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_094; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_095; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_096; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_097; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_094; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_099; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_100; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_101; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_101; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_103; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_104; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_105; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_105; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_107; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_107; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_109; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_109; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_111; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_112; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_113; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_114; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_115; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_116; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_117; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_118; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_119; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_120; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_121; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_122; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_122; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_124; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_125; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_126; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_127; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_128; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_128; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_130; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_130; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_132; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_133; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_133; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_136; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_135; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_139; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_140; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_141; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_141; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_143; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_144; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_139; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_115; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_147; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_148; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_148; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_150; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_150; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_152; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_153; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_154; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_155; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_156; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_157; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_158; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_159; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_160; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_161; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_162; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_163; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_164; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_165; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_166; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_167; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_168; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_169; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_170; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_171; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_172; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_174; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_175; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_176; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_177; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_178; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_182; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_183; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_184; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_185; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_186; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_187; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_188; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_189; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_190; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_191; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_192; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_193; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_194; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_195; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_196; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_197; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_198; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_199; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_200; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_201; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_202; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_203; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_204; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_205; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_206; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_207; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_167; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_209; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_210; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_215; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_216; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_217; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_218; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_219; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_220; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_221; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_222; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_223; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_224; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_225; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_228; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_229; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_230; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_233; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_234; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_235; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_236; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_237; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_238; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_239; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_240; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_241; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_242; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_243; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_244; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_248; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_251; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_252; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_253; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_254; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_255; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_256; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_257; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_258; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_259; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_260; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_261; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_262; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_263; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_264; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_265; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_266; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_267; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_268; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_269; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_270; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_271; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_277; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_278; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_279; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_280; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_281; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_282; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_283; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_284; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_285; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_286; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_287; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_288; - -extern struct BattleAnimBackground gBattleAnimBackgroundImage_00; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_02; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_03; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_04; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_07; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_09; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_11; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_12; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_15; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_16; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_17; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_20; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_21; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_00; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_02; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_03; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_04; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_07; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_09; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_11; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_12; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_15; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_16; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_17; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_18; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_20; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_21; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_22; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_24; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_00; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_02; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_03; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_04; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_05; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_06; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_07; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_08; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_09; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_10; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_11; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_12; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_13; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_14; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_15; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_16; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21; \ No newline at end of file -- cgit v1.2.3 From daa0a98ee0129be1797274de318a35df30d39020 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 13 Jan 2018 20:07:32 -0500 Subject: through sub_809A23C --- asm/pokemon_storage_system.s | 242 --------------------------------- data/pokemon_storage_system.s | 38 ------ include/pokemon_storage_system.h | 6 +- src/pokemon/pokemon_storage_system_4.c | 90 ++++++++++++ 4 files changed, 95 insertions(+), 281 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 79783e4ed..81e0729a1 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,248 +5,6 @@ .text - thumb_func_start sub_809A1BC -sub_809A1BC: @ 809A1BC - push {r4-r6,lr} - sub sp, 0x8 - adds r3, r0, 0 - adds r2, r1, 0 - ldr r0, _0809A228 @ =gUnknown_083B6DB8 - ldr r5, [r0] - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r4, _0809A22C @ =0x040000d4 - str r1, [r4] - str r5, [r4, 0x4] - movs r6, 0x80 - lsls r6, 1 - ldr r0, _0809A230 @ =0x81000100 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - ldr r0, _0809A234 @ =gWindowTemplate_81E6D38 - adds r1, r5, 0 - str r3, [sp, 0x4] - bl Text_InitWindow8004E3C - str r5, [r4] - ldr r3, [sp, 0x4] - str r3, [r4, 0x4] - ldr r1, _0809A238 @ =0x80000040 - str r1, [r4, 0x8] - ldr r0, [r4, 0x8] - adds r0, r5, r6 - str r0, [r4] - adds r0, r3, 0 - adds r0, 0x80 - str r0, [r4, 0x4] - str r1, [r4, 0x8] - ldr r0, [r4, 0x8] - adds r0, r5, 0 - adds r0, 0x80 - str r0, [r4] - adds r6, r3, r6 - str r6, [r4, 0x4] - str r1, [r4, 0x8] - ldr r0, [r4, 0x8] - movs r0, 0xC0 - lsls r0, 1 - adds r5, r0 - str r5, [r4] - adds r3, r0 - str r3, [r4, 0x4] - str r1, [r4, 0x8] - ldr r0, [r4, 0x8] - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809A228: .4byte gUnknown_083B6DB8 -_0809A22C: .4byte 0x040000d4 -_0809A230: .4byte 0x81000100 -_0809A234: .4byte gWindowTemplate_81E6D38 -_0809A238: .4byte 0x80000040 - thumb_func_end sub_809A1BC - - thumb_func_start sub_809A23C -sub_809A23C: @ 809A23C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x24 - mov r8, r0 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, _0809A384 @ =gPokemonStorageSystemPtr - ldr r5, [r0] - ldr r1, _0809A388 @ =0x000008ca - adds r7, r5, r1 - str r7, [sp, 0x18] - mov r2, sp - adds r2, 0x18 - str r2, [sp, 0x20] - ldr r0, _0809A38C @ =0x00030200 - str r0, [r2, 0x4] - mov r1, sp - ldr r3, _0809A390 @ =0x00000ccc - adds r0, r5, r3 - str r0, [sp] - ldr r4, _0809A394 @ =0x0000dac8 - strh r4, [r1, 0x4] - str r0, [sp, 0x8] - ldr r6, _0809A398 @ =0xffffdac9 - strh r6, [r1, 0xC] - add r0, sp, 0x10 - movs r1, 0 - movs r2, 0x8 - bl memset - ldr r0, _0809A39C @ =gPokemonStorage - mov r9, r0 - ldr r0, _0809A3A0 @ =0x000083c2 - add r0, r9 - add r0, r8 - ldrb r1, [r0] - ldr r2, _0809A3A4 @ =gUnknown_083BB0A8 - lsls r1, 2 - adds r0, r1, r2 - ldrh r3, [r0] - ldr r6, _0809A3A8 @ =0x00000ce8 - adds r0, r5, r6 - strh r3, [r0] - adds r2, 0x2 - adds r1, r2 - ldrh r1, [r1] - ldr r2, _0809A3AC @ =0x00000cea - adds r0, r5, r2 - strh r1, [r0] - mov r0, sp - bl LoadSpritePalettes - ldr r3, _0809A3B0 @ =0x00000d08 - adds r6, r5, r3 - movs r0, 0xFC - lsls r0, 2 - str r0, [r6] - adds r0, r4, 0 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - movs r2, 0x87 - lsls r2, 1 - mov r10, r2 - add r1, r10 - ldr r3, _0809A3B4 @ =0x00000cec - adds r2, r5, r3 - strh r1, [r2] - movs r4, 0x80 - lsls r4, 9 - adds r1, r4, 0 - lsls r1, r0 - ldr r0, [r6] - orrs r0, r1 - str r0, [r6] - ldr r0, _0809A3B8 @ =0x0000dac9 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - add r1, r10 - ldr r2, _0809A3BC @ =0x00000cee - adds r5, r2 - strh r1, [r5] - lsls r4, r0 - ldr r0, [r6] - orrs r0, r4 - str r0, [r6] - mov r3, r8 - lsls r4, r3, 3 - add r4, r8 - ldr r6, _0809A3C0 @ =0x00008344 - add r9, r6 - add r4, r9 - adds r0, r7, 0 - adds r1, r4, 0 - bl sub_809A1BC - ldr r0, [sp, 0x20] - bl LoadSpriteSheet - adds r0, r4, 0 - bl sub_8072CA4 - lsls r0, 24 - lsrs r0, 24 - bl sub_809A6D0 - movs r4, 0 - lsls r0, 16 - asrs r6, r0, 16 -_0809A328: - lsls r1, r4, 5 - adds r1, r6, r1 - lsls r1, 16 - asrs r1, 16 - ldr r0, _0809A3C4 @ =gSpriteTemplate_83BB2B8 - movs r2, 0x1C - movs r3, 0x17 - bl CreateSprite - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r0, _0809A384 @ =gPokemonStorageSystemPtr - ldr r5, [r0] - lsls r0, r4, 2 - movs r3, 0xCF - lsls r3, 4 - adds r2, r5, r3 - adds r2, r0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0809A3C8 @ =gSprites - adds r0, r1 - str r0, [r2] - lsls r1, r4, 24 - lsrs r1, 24 - bl StartSpriteAnim - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x1 - bls _0809A328 - ldr r6, _0809A3CC @ =0x00000cca - adds r1, r5, r6 - movs r0, 0 - strb r0, [r1] - add sp, 0x24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809A384: .4byte gPokemonStorageSystemPtr -_0809A388: .4byte 0x000008ca -_0809A38C: .4byte 0x00030200 -_0809A390: .4byte 0x00000ccc -_0809A394: .4byte 0x0000dac8 -_0809A398: .4byte 0xffffdac9 -_0809A39C: .4byte gPokemonStorage -_0809A3A0: .4byte 0x000083c2 -_0809A3A4: .4byte gUnknown_083BB0A8 -_0809A3A8: .4byte 0x00000ce8 -_0809A3AC: .4byte 0x00000cea -_0809A3B0: .4byte 0x00000d08 -_0809A3B4: .4byte 0x00000cec -_0809A3B8: .4byte 0x0000dac9 -_0809A3BC: .4byte 0x00000cee -_0809A3C0: .4byte 0x00008344 -_0809A3C4: .4byte gSpriteTemplate_83BB2B8 -_0809A3C8: .4byte gSprites -_0809A3CC: .4byte 0x00000cca - thumb_func_end sub_809A23C - thumb_func_start sub_809A3D0 sub_809A3D0: @ 809A3D0 push {r4-r7,lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 8d62633d3..aa9767dfa 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,44 +3,6 @@ .section .rodata -PCPal_Arrow: - .incbin "graphics/pokemon_storage/arrow.gbapal" -PCGfx_Arrow: - .incbin "graphics/pokemon_storage/arrow.4bpp" - - .align 2 -gUnknown_083BB288:: @ 83BB288 - obj_tiles PCGfx_Arrow, 128, 0x0006 - - .align 2 -gUnknown_083BB290:: @ 83BB290 - obj_pal PCPal_Arrow, 0xDACF - - .align 2 -gOamData_83BB298:: @ 83BB298 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83BB2A0:: @ 83BB2A0 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83BB2A8:: @ 83BB2A8 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83BB2B0:: @ 83BB2B0 - .4byte gSpriteAnim_83BB2A0 - .4byte gSpriteAnim_83BB2A8 - - .align 2 -gSpriteTemplate_83BB2B8:: @ 83BB2B8 - spr_template 3, 56008, gOamData_83BB298, gSpriteAnimTable_83BB2B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - .align 2 gOamData_83BB2D0:: @ 83BB2D0 .2byte 0x8000 diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index cd4dceadf..62014e62c 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -112,7 +112,11 @@ struct PokemonStorageSystemData { u16 unk_08c8; u8 unk_08ca[0x400]; u8 unk_0cca; - u16 unk_0ccc[0x1e]; + u16 unk_0ccc[0x10]; + u16 unk_0cec; + u16 unk_0cee; + struct Sprite *unk_0cf0[2]; + u8 filler_0cf8[16]; u32 unk_0d08; u8 filler_0d0c[0x50]; u16 unk_0d5c; diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 1ccaa01f1..836a3433f 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -2,6 +2,8 @@ // Includes #include "global.h" #include "palette.h" +#include "text.h" +#include "menu.h" #include "pokemon_storage_system.h" // Static type declarations @@ -35,6 +37,7 @@ void sub_809A23C(u8 boxId); void sub_809A3D0(u8 boxId, s8 a1); void sub_809A598(void); void sub_809A654(void); +s16 sub_809A6D0(u8 width); void sub_809A6DC(void); void sub_809A774(s8 a0); void sub_809A810(void); @@ -757,3 +760,90 @@ __attribute__((naked)) void sub_809A14C(u16 *vdest) "_0809A1B8: .4byte 0xfffff7c0"); } #endif + +void sub_809A1BC(const u8 *a0, const u8 *text) +{ + u8 *r5 = gUnknown_083B6DB8; + DmaClear16(3, r5, 0x200); + Text_InitWindow8004E3C(&gWindowTemplate_81E6D38, r5, text); + DmaCopy16(3, r5 + 0x000, a0 + 0x000, 0x80); + DmaCopy16(3, r5 + 0x100, a0 + 0x080, 0x80); + DmaCopy16(3, r5 + 0x080, a0 + 0x100, 0x80); + DmaCopy16(3, r5 + 0x180, a0 + 0x180, 0x80); +} + +const struct SpriteTemplate gSpriteTemplate_83BB2B8; + +void sub_809A23C(u8 boxId) +{ + u8 tagIdx; + s16 r6; + u16 i; + + struct SpriteSheet spriteSheet = {gPokemonStorageSystemPtr->unk_08ca, 0x200, 3}; + struct SpritePalette palettes[] = { + {gPokemonStorageSystemPtr->unk_0ccc, 0xdac8}, + {gPokemonStorageSystemPtr->unk_0ccc, 0xdac9}, + {} + }; + + u16 wallpaper = gPokemonStorage.wallpaper[boxId]; + gPokemonStorageSystemPtr->unk_0ccc[14] = gUnknown_083BB0A8[wallpaper][0]; + gPokemonStorageSystemPtr->unk_0ccc[15] = gUnknown_083BB0A8[wallpaper][1]; + LoadSpritePalettes(palettes); + gPokemonStorageSystemPtr->unk_0d08 = 0x3f0; + tagIdx = IndexOfSpritePaletteTag(0xdac8); + gPokemonStorageSystemPtr->unk_0cec = 0x10e + 16 * tagIdx; + gPokemonStorageSystemPtr->unk_0d08 |= 0x10000 << tagIdx; + tagIdx = IndexOfSpritePaletteTag(0xdac9); + gPokemonStorageSystemPtr->unk_0cee = 0x10e + 16 * tagIdx; + gPokemonStorageSystemPtr->unk_0d08 |= 0x10000 << tagIdx; + sub_809A1BC(gPokemonStorageSystemPtr->unk_08ca, gPokemonStorage.boxNames[boxId]); + LoadSpriteSheet(&spriteSheet); + r6 = sub_809A6D0(sub_8072CA4(gPokemonStorage.boxNames[boxId])); + for (i = 0; i < 2; i++) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_83BB2B8, r6 + i * 32, 0x1c, 23); + gPokemonStorageSystemPtr->unk_0cf0[i] = gSprites + spriteId; + StartSpriteAnim(gPokemonStorageSystemPtr->unk_0cf0[i], i); + } + gPokemonStorageSystemPtr->unk_0cca = 0; +} + + +const u16 PCPal_Arrow[] = INCBIN_U16("graphics/pokemon_storage/arrow.gbapal"); +const u8 PCGfx_Arrow[] = INCBIN_U8("graphics/pokemon_storage/arrow.4bpp"); + +const struct SpriteSheet gUnknown_083BB288 = {PCGfx_Arrow, 0x80, 6}; +const struct SpritePalette gUnknown_083BB290 = {PCPal_Arrow, 0xdacf}; + +const struct OamData gOamData_83BB298 = { + .shape = ST_OAM_H_RECTANGLE, + .size = 2, + .priority = 2 +}; + +const union AnimCmd gSpriteAnim_83BB2A0[] = { + ANIMCMD_FRAME(0, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83BB2A8[] = { + ANIMCMD_FRAME(8, 5), + ANIMCMD_END +}; + +const union AnimCmd *const gSpriteAnimTable_83BB2B0[] = { + gSpriteAnim_83BB2A0, + gSpriteAnim_83BB2A8 +}; + +const struct SpriteTemplate gSpriteTemplate_83BB2B8 = { + 3, + 0xdac8, + &gOamData_83BB298, + gSpriteAnimTable_83BB2B0, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; -- cgit v1.2.3 From 94a1fbf1d90bb9d033b112c97d58f0885582578e Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 14 Jan 2018 02:42:10 +0100 Subject: finished decompiling data/battle_anim.s --- data/battle_anim.s | 729 ------------------ include/graphics.h | 290 +++++++- ld_script.txt | 1 - src/battle/battle_anim.c | 1845 +++++++++++++++++++++++++++++++++++++++++++++- src/data/battle_anim.h | 326 -------- 5 files changed, 2115 insertions(+), 1076 deletions(-) delete mode 100644 data/battle_anim.s delete mode 100644 src/data/battle_anim.h diff --git a/data/battle_anim.s b/data/battle_anim.s deleted file mode 100644 index 2010e0dbb..000000000 --- a/data/battle_anim.s +++ /dev/null @@ -1,729 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_837DF24:: @ 837DF24 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837DF2C:: @ 837DF2C - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837DF34:: @ 837DF34 - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837DF3C:: @ 837DF3C - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837DF44:: @ 837DF44 - .2byte 0x4000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837DF4C:: @ 837DF4C - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837DF54:: @ 837DF54 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837DF5C:: @ 837DF5C - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837DF64:: @ 837DF64 - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837DF6C:: @ 837DF6C - .2byte 0x8000 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837DF74:: @ 837DF74 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837DF7C:: @ 837DF7C - .2byte 0x8000 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837DF84:: @ 837DF84 - .2byte 0x0100 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837DF8C:: @ 837DF8C - .2byte 0x0100 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837DF94:: @ 837DF94 - .2byte 0x0100 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837DF9C:: @ 837DF9C - .2byte 0x0100 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837DFA4:: @ 837DFA4 - .2byte 0x4100 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837DFAC:: @ 837DFAC - .2byte 0x4100 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837DFB4:: @ 837DFB4 - .2byte 0x4100 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837DFBC:: @ 837DFBC - .2byte 0x4100 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837DFC4:: @ 837DFC4 - .2byte 0x8100 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837DFCC:: @ 837DFCC - .2byte 0x8100 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837DFD4:: @ 837DFD4 - .2byte 0x8100 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837DFDC:: @ 837DFDC - .2byte 0x8100 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837DFE4:: @ 837DFE4 - .2byte 0x0300 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837DFEC:: @ 837DFEC - .2byte 0x0300 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837DFF4:: @ 837DFF4 - .2byte 0x0300 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837DFFC:: @ 837DFFC - .2byte 0x0300 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837D004:: @ 837D004 - .2byte 0x4300 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837D00C:: @ 837D00C - .2byte 0x4300 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E014:: @ 837E014 - .2byte 0x4300 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E01C:: @ 837E01C - .2byte 0x4300 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E024:: @ 837E024 - .2byte 0x8300 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E02C:: @ 837E02C - .2byte 0x8300 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E034:: @ 837E034 - .2byte 0x8300 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E03C:: @ 837E03C - .2byte 0x8300 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E044:: @ 837E044 - .2byte 0x0400 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E04C:: @ 837E04C - .2byte 0x0400 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E054:: @ 837E054 - .2byte 0x0400 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E05C:: @ 837E05C - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E064:: @ 837E064 - .2byte 0x4400 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E06C:: @ 837E06C - .2byte 0x4400 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E074:: @ 837E074 - .2byte 0x4400 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E07C:: @ 837E07C - .2byte 0x4400 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E084:: @ 837E084 - .2byte 0x8400 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E08C:: @ 837E08C - .2byte 0x8400 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E094:: @ 837E094 - .2byte 0x8400 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E09C:: @ 837E09C - .2byte 0x8400 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E0A4:: @ 837E0A4 - .2byte 0x0500 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E0AC:: @ 837E0AC - .2byte 0x0500 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E0B4:: @ 837E0B4 - .2byte 0x0500 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E0BC:: @ 837E0BC - .2byte 0x0500 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E0C4:: @ 837E0C4 - .2byte 0x4500 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E0CC:: @ 837E0CC - .2byte 0x4500 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E0D4:: @ 837E0D4 - .2byte 0x4500 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E0DC:: @ 837E0DC - .2byte 0x4500 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E0E4:: @ 837E0E4 - .2byte 0x8500 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E0EC:: @ 837E0EC - .2byte 0x8500 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E0F4:: @ 837E0F4 - .2byte 0x8500 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E0FC:: @ 837E0FC - .2byte 0x8500 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E104:: @ 837E104 - .2byte 0x0700 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E10C:: @ 837E10C - .2byte 0x0700 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E114:: @ 837E114 - .2byte 0x0700 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E11C:: @ 837E11C - .2byte 0x0700 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E124:: @ 837E124 - .2byte 0x4700 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E12C:: @ 837E12C - .2byte 0x4700 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E134:: @ 837E134 - .2byte 0x4700 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E13C:: @ 837E13C - .2byte 0x4700 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_837E144:: @ 837E144 - .2byte 0x8700 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_837E14C:: @ 837E14C - .2byte 0x8700 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gOamData_837E154:: @ 837E154 - .2byte 0x8700 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gOamData_837E15C:: @ 837E15C - .2byte 0x8700 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gBattleAnimPicTable:: @ 837E164 - obj_tiles gBattleAnimSpriteSheet_000, 0x200, 10000 - obj_tiles gBattleAnimSpriteSheet_001, 0x300, 10001 - obj_tiles gBattleAnimSpriteSheet_002, 0x200, 10002 - obj_tiles gBattleAnimSpriteSheet_003, 0x100, 10003 - obj_tiles gBattleAnimSpriteSheet_004, 0x200, 10004 - obj_tiles gBattleAnimSpriteSheet_005, 0x400, 10005 - obj_tiles gBattleAnimSpriteSheet_006, 0x180, 10006 - obj_tiles gBattleAnimSpriteSheet_007, 0x800, 10007 - obj_tiles gBattleAnimSpriteSheet_008, 0x20, 10008 - obj_tiles gBattleAnimSpriteSheet_009, 0x400, 10009 - obj_tiles gBattleAnimSpriteSheet_010, 0x1200, 10010 - obj_tiles gBattleAnimSpriteSheet_011, 0x180, 10011 - obj_tiles gBattleAnimSpriteSheet_012, 0x80, 10012 - obj_tiles gBattleAnimSpriteSheet_013, 0x80, 10013 - obj_tiles gBattleAnimSpriteSheet_014, 0x280, 10014 - obj_tiles gBattleAnimSpriteSheet_015, 0x80, 10015 - obj_tiles gBattleAnimSpriteSheet_016, 0x100, 10016 - obj_tiles gBattleAnimSpriteSheet_017, 0x20, 10017 - obj_tiles gBattleAnimSpriteSheet_018, 0x80, 10018 - obj_tiles gBattleAnimSpriteSheet_019, 0x400, 10019 - obj_tiles gBattleAnimSpriteSheet_020, 0x200, 10020 - obj_tiles gBattleAnimSpriteSheet_021, 0xA00, 10021 - obj_tiles gBattleAnimSpriteSheet_021, 0xA00, 10022 - obj_tiles gBattleAnimSpriteSheet_023, 0x380, 10023 - obj_tiles gBattleAnimSpriteSheet_024, 0x300, 10024 - obj_tiles gBattleAnimSpriteSheet_025, 0xA00, 10025 - obj_tiles gBattleAnimSpriteSheet_026, 0xA00, 10026 - obj_tiles gBattleAnimSpriteSheet_027, 0xA00, 10027 - obj_tiles gBattleAnimSpriteSheet_028, 0xA00, 10028 - obj_tiles gBattleAnimSpriteSheet_029, 0xA00, 10029 - obj_tiles gBattleAnimSpriteSheet_030, 0xA00, 10030 - obj_tiles gBattleAnimSpriteSheet_031, 0xE00, 10031 - obj_tiles gBattleAnimSpriteSheet_032, 0x380, 10032 - obj_tiles gBattleAnimSpriteSheet_033, 0x1000, 10033 - obj_tiles gBattleAnimSpriteSheet_034, 0x800, 10034 - obj_tiles gBattleAnimSpriteSheet_035, 0xA00, 10035 - obj_tiles gBattleAnimSpriteSheet_036, 0x800, 10036 - obj_tiles gBattleAnimSpriteSheet_037, 0xA00, 10037 - obj_tiles gBattleAnimSpriteSheet_038, 0xA00, 10038 - obj_tiles gBattleAnimSpriteSheet_039, 0xA00, 10039 - obj_tiles gBattleAnimSpriteSheet_040, 0xA00, 10040 - obj_tiles gBattleAnimSpriteSheet_041, 0xA00, 10041 - obj_tiles gBattleAnimSpriteSheet_042, 0xA00, 10042 - obj_tiles gBattleAnimSpriteSheet_043, 0xA00, 10043 - obj_tiles gBattleAnimSpriteSheet_044, 0xA00, 10044 - obj_tiles gBattleAnimSpriteSheet_045, 0xA00, 10045 - obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 10046 - obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 10047 - obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 10048 - obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 10049 - obj_tiles gBattleAnimSpriteSheet_050, 0x200, 10050 - obj_tiles gBattleAnimSpriteSheet_051, 0x200, 10051 - obj_tiles gBattleAnimSpriteSheet_052, 0x200, 10052 - obj_tiles gBattleAnimSpriteSheet_053, 0x800, 10053 - obj_tiles gBattleAnimSpriteSheet_054, 0x80, 10054 - obj_tiles gBattleAnimSpriteSheet_055, 0x200, 10055 - obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 10056 - obj_tiles gBattleAnimSpriteSheet_057, 0x180, 10057 - obj_tiles gBattleAnimSpriteSheet_058, 0xC00, 10058 - obj_tiles gBattleAnimSpriteSheet_059, 0x100, 10059 - obj_tiles gBattleAnimSpriteSheet_060, 0x40, 10060 - obj_tiles gBattleAnimSpriteSheet_061, 0x180, 10061 - obj_tiles gBattleAnimSpriteSheet_062, 0x800, 10062 - obj_tiles gBattleAnimSpriteSheet_063, 0x480, 10063 - obj_tiles gBattleAnimSpriteSheet_064, 0x200, 10064 - obj_tiles gBattleAnimSpriteSheet_065, 0x200, 10065 - obj_tiles gBattleAnimSpriteSheet_066, 0x100, 10066 - obj_tiles gBattleAnimSpriteSheet_065, 0x200, 10067 - obj_tiles gBattleAnimSpriteSheet_065, 0x200, 10068 - obj_tiles gBattleAnimSpriteSheet_065, 0x200, 10069 - obj_tiles gBattleAnimSpriteSheet_070, 0x200, 10070 - obj_tiles gBattleAnimSpriteSheet_071, 0xA00, 10071 - obj_tiles gBattleAnimSpriteSheet_072, 0x300, 10072 - obj_tiles gBattleAnimSpriteSheet_073, 0x180, 10073 - obj_tiles gBattleAnimSpriteSheet_074, 0xA0, 10074 - obj_tiles gBattleAnimSpriteSheet_075, 0x700, 10075 - obj_tiles gBattleAnimSpriteSheet_076, 0x400, 10076 - obj_tiles gBattleAnimSpriteSheet_077, 0x200, 10077 - obj_tiles gBattleAnimSpriteSheet_078, 0x300, 10078 - obj_tiles gBattleAnimSpriteSheet_079, 0xC00, 10079 - obj_tiles gBattleAnimSpriteSheet_080, 0xA00, 10080 - obj_tiles gBattleAnimSpriteSheet_081, 0x80, 10081 - obj_tiles gBattleAnimSpriteSheet_082, 0x40, 10082 - obj_tiles gBattleAnimSpriteSheet_083, 0xE00, 10083 - obj_tiles gBattleAnimSpriteSheet_084, 0xE00, 10084 - obj_tiles gBattleAnimSpriteSheet_085, 0x280, 10085 - obj_tiles gBattleAnimSpriteSheet_086, 0x200, 10086 - obj_tiles gBattleAnimSpriteSheet_087, 0x80, 10087 - obj_tiles gBattleAnimSpriteSheet_088, 0xC0, 10088 - obj_tiles gBattleAnimSpriteSheet_089, 0xA00, 10089 - obj_tiles gBattleAnimSpriteSheet_090, 0x200, 10090 - obj_tiles gBattleAnimSpriteSheet_091, 0x180, 10091 - obj_tiles gBattleAnimSpriteSheet_092, 0x80, 10092 - obj_tiles gBattleAnimSpriteSheet_093, 0x1000, 10093 - obj_tiles gBattleAnimSpriteSheet_094, 0xA00, 10094 - obj_tiles gBattleAnimSpriteSheet_095, 0x180, 10095 - obj_tiles gBattleAnimSpriteSheet_096, 0x380, 10096 - obj_tiles gBattleAnimSpriteSheet_097, 0xC00, 10097 - obj_tiles gBattleAnimSpriteSheet_098, 0x200, 10098 - obj_tiles gBattleAnimSpriteSheet_099, 0x200, 10099 - obj_tiles gBattleAnimSpriteSheet_100, 0x200, 10100 - obj_tiles gBattleAnimSpriteSheet_101, 0x200, 10101 - obj_tiles gBattleAnimSpriteSheet_102, 0x400, 10102 - obj_tiles gBattleAnimSpriteSheet_103, 0x80, 10103 - obj_tiles gBattleAnimSpriteSheet_104, 0x400, 10104 - obj_tiles gBattleAnimSpriteSheet_105, 0xC00, 10105 - obj_tiles gBattleAnimSpriteSheet_106, 0x200, 10106 - obj_tiles gBattleAnimSpriteSheet_107, 0x1000, 10107 - obj_tiles gBattleAnimSpriteSheet_108, 0xA00, 10108 - obj_tiles gBattleAnimSpriteSheet_109, 0x20, 10109 - obj_tiles gBattleAnimSpriteSheet_110, 0xE00, 10110 - obj_tiles gBattleAnimSpriteSheet_111, 0x80, 10111 - obj_tiles gBattleAnimSpriteSheet_112, 0xA00, 10112 - obj_tiles gBattleAnimSpriteSheet_113, 0x400, 10113 - obj_tiles gBattleAnimSpriteSheet_114, 0x200, 10114 - obj_tiles gBattleAnimSpriteSheet_115, 0x700, 10115 - obj_tiles gBattleAnimSpriteSheet_116, 0x800, 10116 - obj_tiles gBattleAnimSpriteSheet_117, 0xA00, 10117 - obj_tiles gBattleAnimSpriteSheet_118, 0x600, 10118 - obj_tiles gBattleAnimSpriteSheet_119, 0x800, 10119 - obj_tiles gBattleAnimSpriteSheet_120, 0x200, 10120 - obj_tiles gBattleAnimSpriteSheet_121, 0x40, 10121 - obj_tiles gBattleAnimSpriteSheet_122, 0x180, 10122 - obj_tiles gBattleAnimSpriteSheet_123, 0x600, 10123 - obj_tiles gBattleAnimSpriteSheet_124, 0x600, 10124 - obj_tiles gBattleAnimSpriteSheet_125, 0x200, 10125 - obj_tiles gBattleAnimSpriteSheet_126, 0x80, 10126 - obj_tiles gBattleAnimSpriteSheet_127, 0x200, 10127 - obj_tiles gBattleAnimSpriteSheet_128, 0x800, 10128 - obj_tiles gBattleAnimSpriteSheet_129, 0x80, 10129 - obj_tiles gBattleAnimSpriteSheet_130, 0xA00, 10130 - obj_tiles gBattleAnimSpriteSheet_131, 0x280, 10131 - obj_tiles gBattleAnimSpriteSheet_132, 0x280, 10132 - obj_tiles gBattleAnimSpriteSheet_133, 0x100, 10133 - obj_tiles gBattleAnimSpriteSheet_134, 0x200, 10134 - obj_tiles gBattleAnimSpriteSheet_135, 0x200, 10135 - obj_tiles gBattleAnimSpriteSheet_136, 0x20, 10136 - obj_tiles gBattleAnimSpriteSheet_137, 0xA00, 10137 - obj_tiles gBattleAnimSpriteSheet_138, 0x800, 10138 - obj_tiles gBattleAnimSpriteSheet_139, 0x800, 10139 - obj_tiles gBattleAnimSpriteSheet_140, 0xC0, 10140 - obj_tiles gBattleAnimSpriteSheet_141, 0x1C0, 10141 - obj_tiles gBattleAnimSpriteSheet_142, 0x100, 10142 - obj_tiles gBattleAnimSpriteSheet_143, 0x800, 10143 - obj_tiles gBattleAnimSpriteSheet_144, 0x200, 10144 - obj_tiles gBattleAnimSpriteSheet_145, 0x800, 10145 - obj_tiles gBattleAnimSpriteSheet_146, 0x180, 10146 - obj_tiles gBattleAnimSpriteSheet_147, 0x180, 10147 - obj_tiles gBattleAnimSpriteSheet_148, 0x200, 10148 - obj_tiles gBattleAnimSpriteSheet_149, 0x200, 10149 - obj_tiles gBattleAnimSpriteSheet_150, 0x180, 10150 - obj_tiles gBattleAnimSpriteSheet_151, 0x400, 10151 - obj_tiles gBattleAnimSpriteSheet_152, 0x80, 10152 - obj_tiles gBattleAnimSpriteSheet_153, 0x100, 10153 - obj_tiles gBattleAnimSpriteSheet_154, 0x100, 10154 - obj_tiles gBattleAnimSpriteSheet_155, 0x140, 10155 - obj_tiles gBattleAnimSpriteSheet_156, 0x800, 10156 - obj_tiles gBattleAnimSpriteSheet_157, 0x200, 10157 - obj_tiles gBattleAnimSpriteSheet_158, 0x100, 10158 - obj_tiles gBattleAnimSpriteSheet_159, 0xA0, 10159 - obj_tiles gBattleAnimSpriteSheet_160, 0x100, 10160 - obj_tiles gBattleAnimSpriteSheet_161, 0x80, 10161 - obj_tiles gBattleAnimSpriteSheet_162, 0x300, 10162 - obj_tiles gBattleAnimSpriteSheet_163, 0x100, 10163 - obj_tiles gBattleAnimSpriteSheet_163, 0x100, 10164 - obj_tiles gBattleAnimSpriteSheet_163, 0x100, 10165 - obj_tiles gBattleAnimSpriteSheet_166, 0x800, 10166 - obj_tiles gBattleAnimSpriteSheet_166, 0x800, 10167 - obj_tiles gBattleAnimSpriteSheet_166, 0x800, 10168 - obj_tiles gBattleAnimSpriteSheet_166, 0x800, 10169 - obj_tiles gBattleAnimSpriteSheet_166, 0x800, 10170 - obj_tiles gBattleAnimSpriteSheet_171, 0x80, 10171 - obj_tiles gBattleAnimSpriteSheet_144, 0x200, 10172 - obj_tiles gBattleAnimSpriteSheet_173, 0x200, 10173 - obj_tiles gBattleAnimSpriteSheet_174, 0x200, 10174 - obj_tiles gBattleAnimSpriteSheet_175, 0x80, 10175 - obj_tiles gBattleAnimSpriteSheet_176, 0x200, 10176 - obj_tiles gBattleAnimSpriteSheet_177, 0x500, 10177 - obj_tiles gBattleAnimSpriteSheet_178, 0x800, 10178 - obj_tiles gBattleAnimSpriteSheet_179, 0x400, 10179 - obj_tiles gBattleAnimSpriteSheet_180, 0x20, 10180 - obj_tiles gBattleAnimSpriteSheet_181, 0x800, 10181 - obj_tiles gBattleAnimSpriteSheet_182, 0x100, 10182 - obj_tiles gBattleAnimSpriteSheet_183, 0x800, 10183 - obj_tiles gBattleAnimSpriteSheet_184, 0x400, 10184 - obj_tiles gBattleAnimSpriteSheet_185, 0xA00, 10185 - obj_tiles gBattleAnimSpriteSheet_186, 0x1000, 10186 - obj_tiles gBattleAnimSpriteSheet_187, 0x800, 10187 - obj_tiles gBattleAnimSpriteSheet_188, 0x400, 10188 - obj_tiles gBattleAnimSpriteSheet_189, 0x200, 10189 - obj_tiles gBattleAnimSpriteSheet_190, 0x800, 10190 - obj_tiles gBattleAnimSpriteSheet_191, 0x800, 10191 - obj_tiles gBattleAnimSpriteSheet_192, 0x800, 10192 - obj_tiles gBattleAnimSpriteSheet_193, 0x200, 10193 - obj_tiles gBattleAnimSpriteSheet_194, 0x800, 10194 - obj_tiles gBattleAnimSpriteSheet_195, 0x200, 10195 - obj_tiles gBattleAnimSpriteSheet_196, 0x800, 10196 - obj_tiles gBattleAnimSpriteSheet_197, 0x200, 10197 - obj_tiles gBattleAnimSpriteSheet_198, 0x800, 10198 - obj_tiles gBattleAnimSpriteSheet_199, 0x400, 10199 - obj_tiles gBattleAnimSpriteSheet_200, 0x200, 10200 - obj_tiles gBattleAnimSpriteSheet_201, 0xA80, 10201 - obj_tiles gBattleAnimSpriteSheet_202, 0x600, 10202 - obj_tiles gBattleAnimSpriteSheet_203, 0x800, 10203 - obj_tiles gBattleAnimSpriteSheet_204, 0x200, 10204 - obj_tiles gBattleAnimSpriteSheet_205, 0x600, 10205 - obj_tiles gBattleAnimSpriteSheet_206, 0x800, 10206 - obj_tiles gBattleAnimSpriteSheet_207, 0x180, 10207 - obj_tiles gBattleAnimSpriteSheet_208, 0x800, 10208 - obj_tiles gBattleAnimSpriteSheet_209, 0x800, 10209 - obj_tiles gBattleAnimSpriteSheet_210, 0x80, 10210 - obj_tiles gBattleAnimSpriteSheet_211, 0x80, 10211 - obj_tiles gBattleAnimSpriteSheet_212, 0x800, 10212 - obj_tiles gBattleAnimSpriteSheet_213, 0x800, 10213 - obj_tiles gBattleAnimSpriteSheet_214, 0x600, 10214 - obj_tiles gBattleAnimSpriteSheet_215, 0x600, 10215 - obj_tiles gBattleAnimSpriteSheet_210, 0x80, 10216 - obj_tiles gBattleAnimSpriteSheet_217, 0x80, 10217 - obj_tiles gBattleAnimSpriteSheet_218, 0x180, 10218 - obj_tiles gBattleAnimSpriteSheet_210, 0x80, 10219 - obj_tiles gBattleAnimSpriteSheet_220, 0x200, 10220 - obj_tiles gBattleAnimSpriteSheet_221, 0x400, 10221 - obj_tiles gBattleAnimSpriteSheet_222, 0xA00, 10222 - obj_tiles gBattleAnimSpriteSheet_223, 0x800, 10223 - obj_tiles gBattleAnimSpriteSheet_224, 0x200, 10224 - obj_tiles gBattleAnimSpriteSheet_225, 0x400, 10225 - obj_tiles gBattleAnimSpriteSheet_226, 0x80, 10226 - obj_tiles gBattleAnimSpriteSheet_227, 0x800, 10227 - obj_tiles gBattleAnimSpriteSheet_228, 0x200, 10228 - obj_tiles gBattleAnimSpriteSheet_229, 0x300, 10229 - obj_tiles gBattleAnimSpriteSheet_230, 0x800, 10230 - obj_tiles gBattleAnimSpriteSheet_231, 0x380, 10231 - obj_tiles gBattleAnimSpriteSheet_232, 0x800, 10232 - obj_tiles gBattleAnimSpriteSheet_233, 0xC0, 10233 - obj_tiles gBattleAnimSpriteSheet_234, 0x800, 10234 - obj_tiles gBattleAnimSpriteSheet_235, 0x60, 10235 - obj_tiles gBattleAnimSpriteSheet_235, 0x60, 10236 - obj_tiles gBattleAnimSpriteSheet_235, 0x60, 10237 - obj_tiles gBattleAnimSpriteSheet_238, 0x80, 10238 - obj_tiles gBattleAnimSpriteSheet_239, 0x180, 10239 - obj_tiles gBattleAnimSpriteSheet_240, 0x180, 10240 - obj_tiles gBattleAnimSpriteSheet_241, 0x200, 10241 - obj_tiles gBattleAnimSpriteSheet_242, 0x200, 10242 - obj_tiles gBattleAnimSpriteSheet_243, 0x20, 10243 - obj_tiles gBattleAnimSpriteSheet_244, 0x400, 10244 - obj_tiles gBattleAnimSpriteSheet_245, 0x600, 10245 - obj_tiles gBattleAnimSpriteSheet_246, 0x1000, 10246 - obj_tiles gBattleAnimSpriteSheet_247, 0x400, 10247 - obj_tiles gBattleAnimSpriteSheet_248, 0x20, 10248 - obj_tiles gBattleAnimSpriteSheet_249, 0x80, 10249 - obj_tiles gBattleAnimSpriteSheet_250, 0x800, 10250 - obj_tiles gBattleAnimSpriteSheet_251, 0x80, 10251 - obj_tiles gBattleAnimSpriteSheet_252, 0x200, 10252 - obj_tiles gBattleAnimSpriteSheet_253, 0x400, 10253 - obj_tiles gBattleAnimSpriteSheet_254, 0x200, 10254 - obj_tiles gBattleAnimSpriteSheet_255, 0x200, 10255 - obj_tiles gBattleAnimSpriteSheet_256, 0x800, 10256 - obj_tiles gBattleAnimSpriteSheet_257, 0x280, 10257 - obj_tiles gBattleAnimSpriteSheet_258, 0x200, 10258 - obj_tiles gBattleAnimSpriteSheet_149, 0x200, 10259 - obj_tiles gBattleAnimSpriteSheet_260, 0x400, 10260 - obj_tiles gBattleAnimSpriteSheet_261, 0x200, 10261 - obj_tiles gBattleAnimSpriteSheet_262, 0x200, 10262 - obj_tiles gBattleAnimSpriteSheet_263, 0x80, 10263 - obj_tiles gBattleAnimSpriteSheet_264, 0x20, 10264 - obj_tiles gBattleAnimSpriteSheet_264, 0x20, 10265 - obj_tiles gBattleAnimSpriteSheet_266, 0x80, 10266 - obj_tiles gBattleAnimSpriteSheet_212, 0x800, 10267 - obj_tiles gBattleAnimSpriteSheet_264, 0x20, 10268 - obj_tiles gBattleAnimSpriteSheet_269, 0x80, 10269 - obj_tiles gBattleAnimSpriteSheet_270, 0x400, 10270 - obj_tiles gBattleAnimSpriteSheet_271, 0x80, 10271 - obj_tiles gBattleAnimSpriteSheet_272, 0x800, 10272 - obj_tiles gBattleAnimSpriteSheet_273, 0x20, 10273 - obj_tiles gBattleAnimSpriteSheet_274, 0x800, 10274 - obj_tiles gBattleAnimSpriteSheet_275, 0x800, 10275 - obj_tiles gBattleAnimSpriteSheet_276, 0x800, 10276 - obj_tiles gBattleAnimSpriteSheet_277, 0x1000, 10277 - obj_tiles gBattleAnimSpriteSheet_278, 0x800, 10278 - obj_tiles gBattleAnimSpriteSheet_279, 0xA0, 10279 - obj_tiles gBattleAnimSpriteSheet_280, 0x800, 10280 - obj_tiles gBattleAnimSpriteSheet_281, 0x200, 10281 - obj_tiles gBattleAnimSpriteSheet_282, 0x600, 10282 - obj_tiles gBattleAnimSpriteSheet_283, 0x200, 10283 - obj_tiles gBattleAnimSpriteSheet_284, 0x800, 10284 - obj_tiles gBattleAnimSpriteSheet_285, 0x200, 10285 - obj_tiles gBattleAnimSpriteSheet_183, 0x800, 10286 - obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 10287 - obj_tiles gBattleAnimSpriteSheet_163, 0x100, 10288 - diff --git a/include/graphics.h b/include/graphics.h index cbe8fff5f..76a45f6f6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -51,7 +51,7 @@ extern const u8 gMonFootprint_QuestionMark[]; extern const u8 gContestNextTurnGfx[]; extern const u8 gContestNextTurnNumbersGfx[]; extern const u8 gContestNextTurnRandomGfx[]; -extern const u8 gBattleAnimSpriteSheet_264[]; +// extern const u8 gBattleAnimSpriteSheet_264[]; extern const u8 gContestApplauseGfx[]; extern const u8 gContestApplauseMeterGfx[]; extern const u16 gContestPal[]; @@ -2740,7 +2740,278 @@ extern const u16 gCableCarBG_Pal[]; extern const u8 gCableCarBG_Gfx[]; // data/graphics.s - +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_000; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_001; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_002; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_003; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_004; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_005; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_006; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_007; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_008; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_009; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_010; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_011; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_012; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_013; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_014; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_015; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_016; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_017; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_018; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_019; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_020; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_021; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_021; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_023; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_024; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_025; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_026; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_027; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_028; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_029; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_030; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_031; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_032; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_033; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_034; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_035; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_036; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_037; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_038; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_039; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_040; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_041; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_042; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_043; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_044; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_045; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_046; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_046; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_048; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_048; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_050; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_051; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_052; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_053; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_054; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_055; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_056; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_057; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_058; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_059; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_060; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_061; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_062; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_063; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_064; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_065; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_066; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_070; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_071; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_072; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_073; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_074; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_075; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_076; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_077; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_078; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_079; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_080; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_081; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_082; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_083; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_084; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_085; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_086; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_087; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_088; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_089; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_090; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_091; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_092; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_093; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_094; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_095; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_096; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_097; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_098; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_099; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_100; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_101; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_102; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_103; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_104; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_105; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_106; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_107; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_108; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_109; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_110; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_111; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_112; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_113; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_114; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_115; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_116; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_117; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_118; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_119; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_120; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_121; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_122; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_123; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_124; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_125; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_126; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_127; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_128; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_129; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_130; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_131; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_132; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_133; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_134; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_135; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_136; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_137; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_138; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_139; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_140; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_141; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_142; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_143; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_144; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_145; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_146; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_147; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_148; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_149; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_150; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_151; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_152; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_153; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_154; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_155; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_156; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_157; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_158; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_159; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_160; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_161; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_162; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_163; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_166; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_171; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_173; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_174; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_175; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_176; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_177; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_178; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_179; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_180; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_181; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_182; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_183; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_184; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_185; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_186; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_187; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_188; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_189; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_190; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_191; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_192; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_193; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_194; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_195; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_196; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_197; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_198; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_199; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_200; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_201; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_202; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_203; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_204; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_205; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_206; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_207; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_208; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_209; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_210; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_211; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_212; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_213; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_214; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_215; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_210; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_217; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_218; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_210; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_220; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_221; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_222; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_223; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_224; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_225; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_226; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_227; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_228; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_229; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_230; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_231; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_232; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_233; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_234; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_235; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_235; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_235; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_238; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_239; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_240; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_241; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_242; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_243; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_244; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_245; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_246; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_247; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_248; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_249; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_250; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_251; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_252; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_253; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_254; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_255; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_256; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_257; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_258; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_260; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_261; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_262; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_263; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_264; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_266; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_269; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_270; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_271; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_272; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_273; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_274; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_275; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_276; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_277; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_278; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_279; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_280; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_281; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_282; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_283; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_284; +extern struct CompressedSpriteSheet gBattleAnimSpriteSheet_285; extern struct CompressedSpritePalette gBattleAnimSpritePalette_000; extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; @@ -2915,15 +3186,12 @@ extern struct CompressedSpritePalette gBattleAnimSpritePalette_169; extern struct CompressedSpritePalette gBattleAnimSpritePalette_170; extern struct CompressedSpritePalette gBattleAnimSpritePalette_171; extern struct CompressedSpritePalette gBattleAnimSpritePalette_172; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_001; extern struct CompressedSpritePalette gBattleAnimSpritePalette_174; extern struct CompressedSpritePalette gBattleAnimSpritePalette_175; extern struct CompressedSpritePalette gBattleAnimSpritePalette_176; extern struct CompressedSpritePalette gBattleAnimSpritePalette_177; extern struct CompressedSpritePalette gBattleAnimSpritePalette_178; extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_179; extern struct CompressedSpritePalette gBattleAnimSpritePalette_182; extern struct CompressedSpritePalette gBattleAnimSpritePalette_183; extern struct CompressedSpritePalette gBattleAnimSpritePalette_184; @@ -2950,13 +3218,9 @@ extern struct CompressedSpritePalette gBattleAnimSpritePalette_204; extern struct CompressedSpritePalette gBattleAnimSpritePalette_205; extern struct CompressedSpritePalette gBattleAnimSpritePalette_206; extern struct CompressedSpritePalette gBattleAnimSpritePalette_207; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_167; extern struct CompressedSpritePalette gBattleAnimSpritePalette_209; extern struct CompressedSpritePalette gBattleAnimSpritePalette_210; extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_211; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; extern struct CompressedSpritePalette gBattleAnimSpritePalette_215; extern struct CompressedSpritePalette gBattleAnimSpritePalette_216; extern struct CompressedSpritePalette gBattleAnimSpritePalette_217; @@ -2969,12 +3233,10 @@ extern struct CompressedSpritePalette gBattleAnimSpritePalette_223; extern struct CompressedSpritePalette gBattleAnimSpritePalette_224; extern struct CompressedSpritePalette gBattleAnimSpritePalette_225; extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_226; extern struct CompressedSpritePalette gBattleAnimSpritePalette_228; extern struct CompressedSpritePalette gBattleAnimSpritePalette_229; extern struct CompressedSpritePalette gBattleAnimSpritePalette_230; extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_231; extern struct CompressedSpritePalette gBattleAnimSpritePalette_233; extern struct CompressedSpritePalette gBattleAnimSpritePalette_234; extern struct CompressedSpritePalette gBattleAnimSpritePalette_235; @@ -2988,11 +3250,8 @@ extern struct CompressedSpritePalette gBattleAnimSpritePalette_242; extern struct CompressedSpritePalette gBattleAnimSpritePalette_243; extern struct CompressedSpritePalette gBattleAnimSpritePalette_244; extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_245; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_064; extern struct CompressedSpritePalette gBattleAnimSpritePalette_248; extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_249; extern struct CompressedSpritePalette gBattleAnimSpritePalette_251; extern struct CompressedSpritePalette gBattleAnimSpritePalette_252; extern struct CompressedSpritePalette gBattleAnimSpritePalette_253; @@ -3015,9 +3274,6 @@ extern struct CompressedSpritePalette gBattleAnimSpritePalette_269; extern struct CompressedSpritePalette gBattleAnimSpritePalette_270; extern struct CompressedSpritePalette gBattleAnimSpritePalette_271; extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_272; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; -extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; extern struct CompressedSpritePalette gBattleAnimSpritePalette_274; extern struct CompressedSpritePalette gBattleAnimSpritePalette_277; extern struct CompressedSpritePalette gBattleAnimSpritePalette_278; diff --git a/ld_script.txt b/ld_script.txt index 6d4e0832f..e9a6e5236 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -521,7 +521,6 @@ SECTIONS { src/engine/tileset_anim.o(.rodata); src/engine/palette.o(.rodata); src/engine/sound.o(.rodata); - data/battle_anim.o(.rodata); src/battle/battle_anim.o(.rodata); src/rom_8077ABC.o(.rodata); data/map_events.o(.rodata); diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 05a2e5752..5239e239d 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -13,7 +13,7 @@ #include "sprite.h" #include "task.h" #include "ewram.h" -#include "../data/battle_anim.h" +#include "graphics.h" // sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. #define GET_TRUE_SPRITE_INDEX(i) (i - 10000) @@ -21,6 +21,1847 @@ #define ANIM_SPRITE_INDEX_COUNT 8 #define ANIM_ARGS_COUNT 8 +const struct OamData gOamData_837DF24 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF2C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF34 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF3C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF44 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF4C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF54 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF5C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF64 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF6C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF74 = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF7C = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF84 = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF8C = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF94 = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DF9C = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFA4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFAC = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFB4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFBC = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFC4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFCC = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFD4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFDC = +{ + .y = 0, + .affineMode = 1, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFE4 = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFEC = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFF4 = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837DFFC = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837D004 = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837D00C = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E014 = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E01C = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E024 = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E02C = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E034 = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E03C = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E044 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E04C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E054 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E05C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E064 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E06C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E074 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E07C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E084 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E08C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E094 = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E09C = +{ + .y = 0, + .affineMode = 0, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0A4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0AC = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0B4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0BC = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0C4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0CC = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0D4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0DC = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0E4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0EC = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0F4 = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E0FC = +{ + .y = 0, + .affineMode = 1, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E104 = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E10C = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E114 = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E11C = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E124 = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E12C = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E134 = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E13C = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 1, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E144 = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E14C = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E154 = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 2, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct OamData gOamData_837E15C = +{ + .y = 0, + .affineMode = 3, + .objMode = 1, + .mosaic = 0, + .bpp = 0, + .shape = 2, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +const struct CompressedSpriteSheet gBattleAnimPicTable[] = +{ + { (u8 *) &gBattleAnimSpriteSheet_000, 0x200, 10000 }, + { (u8 *) &gBattleAnimSpriteSheet_001, 0x300, 10001 }, + { (u8 *) &gBattleAnimSpriteSheet_002, 0x200, 10002 }, + { (u8 *) &gBattleAnimSpriteSheet_003, 0x100, 10003 }, + { (u8 *) &gBattleAnimSpriteSheet_004, 0x200, 10004 }, + { (u8 *) &gBattleAnimSpriteSheet_005, 0x400, 10005 }, + { (u8 *) &gBattleAnimSpriteSheet_006, 0x180, 10006 }, + { (u8 *) &gBattleAnimSpriteSheet_007, 0x800, 10007 }, + { (u8 *) &gBattleAnimSpriteSheet_008, 0x20, 10008 }, + { (u8 *) &gBattleAnimSpriteSheet_009, 0x400, 10009 }, + { (u8 *) &gBattleAnimSpriteSheet_010, 0x1200, 10010 }, + { (u8 *) &gBattleAnimSpriteSheet_011, 0x180, 10011 }, + { (u8 *) &gBattleAnimSpriteSheet_012, 0x80, 10012 }, + { (u8 *) &gBattleAnimSpriteSheet_013, 0x80, 10013 }, + { (u8 *) &gBattleAnimSpriteSheet_014, 0x280, 10014 }, + { (u8 *) &gBattleAnimSpriteSheet_015, 0x80, 10015 }, + { (u8 *) &gBattleAnimSpriteSheet_016, 0x100, 10016 }, + { (u8 *) &gBattleAnimSpriteSheet_017, 0x20, 10017 }, + { (u8 *) &gBattleAnimSpriteSheet_018, 0x80, 10018 }, + { (u8 *) &gBattleAnimSpriteSheet_019, 0x400, 10019 }, + { (u8 *) &gBattleAnimSpriteSheet_020, 0x200, 10020 }, + { (u8 *) &gBattleAnimSpriteSheet_021, 0xA00, 10021 }, + { (u8 *) &gBattleAnimSpriteSheet_021, 0xA00, 10022 }, + { (u8 *) &gBattleAnimSpriteSheet_023, 0x380, 10023 }, + { (u8 *) &gBattleAnimSpriteSheet_024, 0x300, 10024 }, + { (u8 *) &gBattleAnimSpriteSheet_025, 0xA00, 10025 }, + { (u8 *) &gBattleAnimSpriteSheet_026, 0xA00, 10026 }, + { (u8 *) &gBattleAnimSpriteSheet_027, 0xA00, 10027 }, + { (u8 *) &gBattleAnimSpriteSheet_028, 0xA00, 10028 }, + { (u8 *) &gBattleAnimSpriteSheet_029, 0xA00, 10029 }, + { (u8 *) &gBattleAnimSpriteSheet_030, 0xA00, 10030 }, + { (u8 *) &gBattleAnimSpriteSheet_031, 0xE00, 10031 }, + { (u8 *) &gBattleAnimSpriteSheet_032, 0x380, 10032 }, + { (u8 *) &gBattleAnimSpriteSheet_033, 0x1000, 10033 }, + { (u8 *) &gBattleAnimSpriteSheet_034, 0x800, 10034 }, + { (u8 *) &gBattleAnimSpriteSheet_035, 0xA00, 10035 }, + { (u8 *) &gBattleAnimSpriteSheet_036, 0x800, 10036 }, + { (u8 *) &gBattleAnimSpriteSheet_037, 0xA00, 10037 }, + { (u8 *) &gBattleAnimSpriteSheet_038, 0xA00, 10038 }, + { (u8 *) &gBattleAnimSpriteSheet_039, 0xA00, 10039 }, + { (u8 *) &gBattleAnimSpriteSheet_040, 0xA00, 10040 }, + { (u8 *) &gBattleAnimSpriteSheet_041, 0xA00, 10041 }, + { (u8 *) &gBattleAnimSpriteSheet_042, 0xA00, 10042 }, + { (u8 *) &gBattleAnimSpriteSheet_043, 0xA00, 10043 }, + { (u8 *) &gBattleAnimSpriteSheet_044, 0xA00, 10044 }, + { (u8 *) &gBattleAnimSpriteSheet_045, 0xA00, 10045 }, + { (u8 *) &gBattleAnimSpriteSheet_046, 0x1000, 10046 }, + { (u8 *) &gBattleAnimSpriteSheet_046, 0x1000, 10047 }, + { (u8 *) &gBattleAnimSpriteSheet_048, 0x1000, 10048 }, + { (u8 *) &gBattleAnimSpriteSheet_048, 0x1000, 10049 }, + { (u8 *) &gBattleAnimSpriteSheet_050, 0x200, 10050 }, + { (u8 *) &gBattleAnimSpriteSheet_051, 0x200, 10051 }, + { (u8 *) &gBattleAnimSpriteSheet_052, 0x200, 10052 }, + { (u8 *) &gBattleAnimSpriteSheet_053, 0x800, 10053 }, + { (u8 *) &gBattleAnimSpriteSheet_054, 0x80, 10054 }, + { (u8 *) &gBattleAnimSpriteSheet_055, 0x200, 10055 }, + { (u8 *) &gBattleAnimSpriteSheet_056, 0x1000, 10056 }, + { (u8 *) &gBattleAnimSpriteSheet_057, 0x180, 10057 }, + { (u8 *) &gBattleAnimSpriteSheet_058, 0xC00, 10058 }, + { (u8 *) &gBattleAnimSpriteSheet_059, 0x100, 10059 }, + { (u8 *) &gBattleAnimSpriteSheet_060, 0x40, 10060 }, + { (u8 *) &gBattleAnimSpriteSheet_061, 0x180, 10061 }, + { (u8 *) &gBattleAnimSpriteSheet_062, 0x800, 10062 }, + { (u8 *) &gBattleAnimSpriteSheet_063, 0x480, 10063 }, + { (u8 *) &gBattleAnimSpriteSheet_064, 0x200, 10064 }, + { (u8 *) &gBattleAnimSpriteSheet_065, 0x200, 10065 }, + { (u8 *) &gBattleAnimSpriteSheet_066, 0x100, 10066 }, + { (u8 *) &gBattleAnimSpriteSheet_065, 0x200, 10067 }, + { (u8 *) &gBattleAnimSpriteSheet_065, 0x200, 10068 }, + { (u8 *) &gBattleAnimSpriteSheet_065, 0x200, 10069 }, + { (u8 *) &gBattleAnimSpriteSheet_070, 0x200, 10070 }, + { (u8 *) &gBattleAnimSpriteSheet_071, 0xA00, 10071 }, + { (u8 *) &gBattleAnimSpriteSheet_072, 0x300, 10072 }, + { (u8 *) &gBattleAnimSpriteSheet_073, 0x180, 10073 }, + { (u8 *) &gBattleAnimSpriteSheet_074, 0xA0, 10074 }, + { (u8 *) &gBattleAnimSpriteSheet_075, 0x700, 10075 }, + { (u8 *) &gBattleAnimSpriteSheet_076, 0x400, 10076 }, + { (u8 *) &gBattleAnimSpriteSheet_077, 0x200, 10077 }, + { (u8 *) &gBattleAnimSpriteSheet_078, 0x300, 10078 }, + { (u8 *) &gBattleAnimSpriteSheet_079, 0xC00, 10079 }, + { (u8 *) &gBattleAnimSpriteSheet_080, 0xA00, 10080 }, + { (u8 *) &gBattleAnimSpriteSheet_081, 0x80, 10081 }, + { (u8 *) &gBattleAnimSpriteSheet_082, 0x40, 10082 }, + { (u8 *) &gBattleAnimSpriteSheet_083, 0xE00, 10083 }, + { (u8 *) &gBattleAnimSpriteSheet_084, 0xE00, 10084 }, + { (u8 *) &gBattleAnimSpriteSheet_085, 0x280, 10085 }, + { (u8 *) &gBattleAnimSpriteSheet_086, 0x200, 10086 }, + { (u8 *) &gBattleAnimSpriteSheet_087, 0x80, 10087 }, + { (u8 *) &gBattleAnimSpriteSheet_088, 0xC0, 10088 }, + { (u8 *) &gBattleAnimSpriteSheet_089, 0xA00, 10089 }, + { (u8 *) &gBattleAnimSpriteSheet_090, 0x200, 10090 }, + { (u8 *) &gBattleAnimSpriteSheet_091, 0x180, 10091 }, + { (u8 *) &gBattleAnimSpriteSheet_092, 0x80, 10092 }, + { (u8 *) &gBattleAnimSpriteSheet_093, 0x1000, 10093 }, + { (u8 *) &gBattleAnimSpriteSheet_094, 0xA00, 10094 }, + { (u8 *) &gBattleAnimSpriteSheet_095, 0x180, 10095 }, + { (u8 *) &gBattleAnimSpriteSheet_096, 0x380, 10096 }, + { (u8 *) &gBattleAnimSpriteSheet_097, 0xC00, 10097 }, + { (u8 *) &gBattleAnimSpriteSheet_098, 0x200, 10098 }, + { (u8 *) &gBattleAnimSpriteSheet_099, 0x200, 10099 }, + { (u8 *) &gBattleAnimSpriteSheet_100, 0x200, 10100 }, + { (u8 *) &gBattleAnimSpriteSheet_101, 0x200, 10101 }, + { (u8 *) &gBattleAnimSpriteSheet_102, 0x400, 10102 }, + { (u8 *) &gBattleAnimSpriteSheet_103, 0x80, 10103 }, + { (u8 *) &gBattleAnimSpriteSheet_104, 0x400, 10104 }, + { (u8 *) &gBattleAnimSpriteSheet_105, 0xC00, 10105 }, + { (u8 *) &gBattleAnimSpriteSheet_106, 0x200, 10106 }, + { (u8 *) &gBattleAnimSpriteSheet_107, 0x1000, 10107 }, + { (u8 *) &gBattleAnimSpriteSheet_108, 0xA00, 10108 }, + { (u8 *) &gBattleAnimSpriteSheet_109, 0x20, 10109 }, + { (u8 *) &gBattleAnimSpriteSheet_110, 0xE00, 10110 }, + { (u8 *) &gBattleAnimSpriteSheet_111, 0x80, 10111 }, + { (u8 *) &gBattleAnimSpriteSheet_112, 0xA00, 10112 }, + { (u8 *) &gBattleAnimSpriteSheet_113, 0x400, 10113 }, + { (u8 *) &gBattleAnimSpriteSheet_114, 0x200, 10114 }, + { (u8 *) &gBattleAnimSpriteSheet_115, 0x700, 10115 }, + { (u8 *) &gBattleAnimSpriteSheet_116, 0x800, 10116 }, + { (u8 *) &gBattleAnimSpriteSheet_117, 0xA00, 10117 }, + { (u8 *) &gBattleAnimSpriteSheet_118, 0x600, 10118 }, + { (u8 *) &gBattleAnimSpriteSheet_119, 0x800, 10119 }, + { (u8 *) &gBattleAnimSpriteSheet_120, 0x200, 10120 }, + { (u8 *) &gBattleAnimSpriteSheet_121, 0x40, 10121 }, + { (u8 *) &gBattleAnimSpriteSheet_122, 0x180, 10122 }, + { (u8 *) &gBattleAnimSpriteSheet_123, 0x600, 10123 }, + { (u8 *) &gBattleAnimSpriteSheet_124, 0x600, 10124 }, + { (u8 *) &gBattleAnimSpriteSheet_125, 0x200, 10125 }, + { (u8 *) &gBattleAnimSpriteSheet_126, 0x80, 10126 }, + { (u8 *) &gBattleAnimSpriteSheet_127, 0x200, 10127 }, + { (u8 *) &gBattleAnimSpriteSheet_128, 0x800, 10128 }, + { (u8 *) &gBattleAnimSpriteSheet_129, 0x80, 10129 }, + { (u8 *) &gBattleAnimSpriteSheet_130, 0xA00, 10130 }, + { (u8 *) &gBattleAnimSpriteSheet_131, 0x280, 10131 }, + { (u8 *) &gBattleAnimSpriteSheet_132, 0x280, 10132 }, + { (u8 *) &gBattleAnimSpriteSheet_133, 0x100, 10133 }, + { (u8 *) &gBattleAnimSpriteSheet_134, 0x200, 10134 }, + { (u8 *) &gBattleAnimSpriteSheet_135, 0x200, 10135 }, + { (u8 *) &gBattleAnimSpriteSheet_136, 0x20, 10136 }, + { (u8 *) &gBattleAnimSpriteSheet_137, 0xA00, 10137 }, + { (u8 *) &gBattleAnimSpriteSheet_138, 0x800, 10138 }, + { (u8 *) &gBattleAnimSpriteSheet_139, 0x800, 10139 }, + { (u8 *) &gBattleAnimSpriteSheet_140, 0xC0, 10140 }, + { (u8 *) &gBattleAnimSpriteSheet_141, 0x1C0, 10141 }, + { (u8 *) &gBattleAnimSpriteSheet_142, 0x100, 10142 }, + { (u8 *) &gBattleAnimSpriteSheet_143, 0x800, 10143 }, + { (u8 *) &gBattleAnimSpriteSheet_144, 0x200, 10144 }, + { (u8 *) &gBattleAnimSpriteSheet_145, 0x800, 10145 }, + { (u8 *) &gBattleAnimSpriteSheet_146, 0x180, 10146 }, + { (u8 *) &gBattleAnimSpriteSheet_147, 0x180, 10147 }, + { (u8 *) &gBattleAnimSpriteSheet_148, 0x200, 10148 }, + { (u8 *) &gBattleAnimSpriteSheet_149, 0x200, 10149 }, + { (u8 *) &gBattleAnimSpriteSheet_150, 0x180, 10150 }, + { (u8 *) &gBattleAnimSpriteSheet_151, 0x400, 10151 }, + { (u8 *) &gBattleAnimSpriteSheet_152, 0x80, 10152 }, + { (u8 *) &gBattleAnimSpriteSheet_153, 0x100, 10153 }, + { (u8 *) &gBattleAnimSpriteSheet_154, 0x100, 10154 }, + { (u8 *) &gBattleAnimSpriteSheet_155, 0x140, 10155 }, + { (u8 *) &gBattleAnimSpriteSheet_156, 0x800, 10156 }, + { (u8 *) &gBattleAnimSpriteSheet_157, 0x200, 10157 }, + { (u8 *) &gBattleAnimSpriteSheet_158, 0x100, 10158 }, + { (u8 *) &gBattleAnimSpriteSheet_159, 0xA0, 10159 }, + { (u8 *) &gBattleAnimSpriteSheet_160, 0x100, 10160 }, + { (u8 *) &gBattleAnimSpriteSheet_161, 0x80, 10161 }, + { (u8 *) &gBattleAnimSpriteSheet_162, 0x300, 10162 }, + { (u8 *) &gBattleAnimSpriteSheet_163, 0x100, 10163 }, + { (u8 *) &gBattleAnimSpriteSheet_163, 0x100, 10164 }, + { (u8 *) &gBattleAnimSpriteSheet_163, 0x100, 10165 }, + { (u8 *) &gBattleAnimSpriteSheet_166, 0x800, 10166 }, + { (u8 *) &gBattleAnimSpriteSheet_166, 0x800, 10167 }, + { (u8 *) &gBattleAnimSpriteSheet_166, 0x800, 10168 }, + { (u8 *) &gBattleAnimSpriteSheet_166, 0x800, 10169 }, + { (u8 *) &gBattleAnimSpriteSheet_166, 0x800, 10170 }, + { (u8 *) &gBattleAnimSpriteSheet_171, 0x80, 10171 }, + { (u8 *) &gBattleAnimSpriteSheet_144, 0x200, 10172 }, + { (u8 *) &gBattleAnimSpriteSheet_173, 0x200, 10173 }, + { (u8 *) &gBattleAnimSpriteSheet_174, 0x200, 10174 }, + { (u8 *) &gBattleAnimSpriteSheet_175, 0x80, 10175 }, + { (u8 *) &gBattleAnimSpriteSheet_176, 0x200, 10176 }, + { (u8 *) &gBattleAnimSpriteSheet_177, 0x500, 10177 }, + { (u8 *) &gBattleAnimSpriteSheet_178, 0x800, 10178 }, + { (u8 *) &gBattleAnimSpriteSheet_179, 0x400, 10179 }, + { (u8 *) &gBattleAnimSpriteSheet_180, 0x20, 10180 }, + { (u8 *) &gBattleAnimSpriteSheet_181, 0x800, 10181 }, + { (u8 *) &gBattleAnimSpriteSheet_182, 0x100, 10182 }, + { (u8 *) &gBattleAnimSpriteSheet_183, 0x800, 10183 }, + { (u8 *) &gBattleAnimSpriteSheet_184, 0x400, 10184 }, + { (u8 *) &gBattleAnimSpriteSheet_185, 0xA00, 10185 }, + { (u8 *) &gBattleAnimSpriteSheet_186, 0x1000, 10186 }, + { (u8 *) &gBattleAnimSpriteSheet_187, 0x800, 10187 }, + { (u8 *) &gBattleAnimSpriteSheet_188, 0x400, 10188 }, + { (u8 *) &gBattleAnimSpriteSheet_189, 0x200, 10189 }, + { (u8 *) &gBattleAnimSpriteSheet_190, 0x800, 10190 }, + { (u8 *) &gBattleAnimSpriteSheet_191, 0x800, 10191 }, + { (u8 *) &gBattleAnimSpriteSheet_192, 0x800, 10192 }, + { (u8 *) &gBattleAnimSpriteSheet_193, 0x200, 10193 }, + { (u8 *) &gBattleAnimSpriteSheet_194, 0x800, 10194 }, + { (u8 *) &gBattleAnimSpriteSheet_195, 0x200, 10195 }, + { (u8 *) &gBattleAnimSpriteSheet_196, 0x800, 10196 }, + { (u8 *) &gBattleAnimSpriteSheet_197, 0x200, 10197 }, + { (u8 *) &gBattleAnimSpriteSheet_198, 0x800, 10198 }, + { (u8 *) &gBattleAnimSpriteSheet_199, 0x400, 10199 }, + { (u8 *) &gBattleAnimSpriteSheet_200, 0x200, 10200 }, + { (u8 *) &gBattleAnimSpriteSheet_201, 0xA80, 10201 }, + { (u8 *) &gBattleAnimSpriteSheet_202, 0x600, 10202 }, + { (u8 *) &gBattleAnimSpriteSheet_203, 0x800, 10203 }, + { (u8 *) &gBattleAnimSpriteSheet_204, 0x200, 10204 }, + { (u8 *) &gBattleAnimSpriteSheet_205, 0x600, 10205 }, + { (u8 *) &gBattleAnimSpriteSheet_206, 0x800, 10206 }, + { (u8 *) &gBattleAnimSpriteSheet_207, 0x180, 10207 }, + { (u8 *) &gBattleAnimSpriteSheet_208, 0x800, 10208 }, + { (u8 *) &gBattleAnimSpriteSheet_209, 0x800, 10209 }, + { (u8 *) &gBattleAnimSpriteSheet_210, 0x80, 10210 }, + { (u8 *) &gBattleAnimSpriteSheet_211, 0x80, 10211 }, + { (u8 *) &gBattleAnimSpriteSheet_212, 0x800, 10212 }, + { (u8 *) &gBattleAnimSpriteSheet_213, 0x800, 10213 }, + { (u8 *) &gBattleAnimSpriteSheet_214, 0x600, 10214 }, + { (u8 *) &gBattleAnimSpriteSheet_215, 0x600, 10215 }, + { (u8 *) &gBattleAnimSpriteSheet_210, 0x80, 10216 }, + { (u8 *) &gBattleAnimSpriteSheet_217, 0x80, 10217 }, + { (u8 *) &gBattleAnimSpriteSheet_218, 0x180, 10218 }, + { (u8 *) &gBattleAnimSpriteSheet_210, 0x80, 10219 }, + { (u8 *) &gBattleAnimSpriteSheet_220, 0x200, 10220 }, + { (u8 *) &gBattleAnimSpriteSheet_221, 0x400, 10221 }, + { (u8 *) &gBattleAnimSpriteSheet_222, 0xA00, 10222 }, + { (u8 *) &gBattleAnimSpriteSheet_223, 0x800, 10223 }, + { (u8 *) &gBattleAnimSpriteSheet_224, 0x200, 10224 }, + { (u8 *) &gBattleAnimSpriteSheet_225, 0x400, 10225 }, + { (u8 *) &gBattleAnimSpriteSheet_226, 0x80, 10226 }, + { (u8 *) &gBattleAnimSpriteSheet_227, 0x800, 10227 }, + { (u8 *) &gBattleAnimSpriteSheet_228, 0x200, 10228 }, + { (u8 *) &gBattleAnimSpriteSheet_229, 0x300, 10229 }, + { (u8 *) &gBattleAnimSpriteSheet_230, 0x800, 10230 }, + { (u8 *) &gBattleAnimSpriteSheet_231, 0x380, 10231 }, + { (u8 *) &gBattleAnimSpriteSheet_232, 0x800, 10232 }, + { (u8 *) &gBattleAnimSpriteSheet_233, 0xC0, 10233 }, + { (u8 *) &gBattleAnimSpriteSheet_234, 0x800, 10234 }, + { (u8 *) &gBattleAnimSpriteSheet_235, 0x60, 10235 }, + { (u8 *) &gBattleAnimSpriteSheet_235, 0x60, 10236 }, + { (u8 *) &gBattleAnimSpriteSheet_235, 0x60, 10237 }, + { (u8 *) &gBattleAnimSpriteSheet_238, 0x80, 10238 }, + { (u8 *) &gBattleAnimSpriteSheet_239, 0x180, 10239 }, + { (u8 *) &gBattleAnimSpriteSheet_240, 0x180, 10240 }, + { (u8 *) &gBattleAnimSpriteSheet_241, 0x200, 10241 }, + { (u8 *) &gBattleAnimSpriteSheet_242, 0x200, 10242 }, + { (u8 *) &gBattleAnimSpriteSheet_243, 0x20, 10243 }, + { (u8 *) &gBattleAnimSpriteSheet_244, 0x400, 10244 }, + { (u8 *) &gBattleAnimSpriteSheet_245, 0x600, 10245 }, + { (u8 *) &gBattleAnimSpriteSheet_246, 0x1000, 10246 }, + { (u8 *) &gBattleAnimSpriteSheet_247, 0x400, 10247 }, + { (u8 *) &gBattleAnimSpriteSheet_248, 0x20, 10248 }, + { (u8 *) &gBattleAnimSpriteSheet_249, 0x80, 10249 }, + { (u8 *) &gBattleAnimSpriteSheet_250, 0x800, 10250 }, + { (u8 *) &gBattleAnimSpriteSheet_251, 0x80, 10251 }, + { (u8 *) &gBattleAnimSpriteSheet_252, 0x200, 10252 }, + { (u8 *) &gBattleAnimSpriteSheet_253, 0x400, 10253 }, + { (u8 *) &gBattleAnimSpriteSheet_254, 0x200, 10254 }, + { (u8 *) &gBattleAnimSpriteSheet_255, 0x200, 10255 }, + { (u8 *) &gBattleAnimSpriteSheet_256, 0x800, 10256 }, + { (u8 *) &gBattleAnimSpriteSheet_257, 0x280, 10257 }, + { (u8 *) &gBattleAnimSpriteSheet_258, 0x200, 10258 }, + { (u8 *) &gBattleAnimSpriteSheet_149, 0x200, 10259 }, + { (u8 *) &gBattleAnimSpriteSheet_260, 0x400, 10260 }, + { (u8 *) &gBattleAnimSpriteSheet_261, 0x200, 10261 }, + { (u8 *) &gBattleAnimSpriteSheet_262, 0x200, 10262 }, + { (u8 *) &gBattleAnimSpriteSheet_263, 0x80, 10263 }, + { (u8 *) &gBattleAnimSpriteSheet_264, 0x20, 10264 }, + { (u8 *) &gBattleAnimSpriteSheet_264, 0x20, 10265 }, + { (u8 *) &gBattleAnimSpriteSheet_266, 0x80, 10266 }, + { (u8 *) &gBattleAnimSpriteSheet_212, 0x800, 10267 }, + { (u8 *) &gBattleAnimSpriteSheet_264, 0x20, 10268 }, + { (u8 *) &gBattleAnimSpriteSheet_269, 0x80, 10269 }, + { (u8 *) &gBattleAnimSpriteSheet_270, 0x400, 10270 }, + { (u8 *) &gBattleAnimSpriteSheet_271, 0x80, 10271 }, + { (u8 *) &gBattleAnimSpriteSheet_272, 0x800, 10272 }, + { (u8 *) &gBattleAnimSpriteSheet_273, 0x20, 10273 }, + { (u8 *) &gBattleAnimSpriteSheet_274, 0x800, 10274 }, + { (u8 *) &gBattleAnimSpriteSheet_275, 0x800, 10275 }, + { (u8 *) &gBattleAnimSpriteSheet_276, 0x800, 10276 }, + { (u8 *) &gBattleAnimSpriteSheet_277, 0x1000, 10277 }, + { (u8 *) &gBattleAnimSpriteSheet_278, 0x800, 10278 }, + { (u8 *) &gBattleAnimSpriteSheet_279, 0xA0, 10279 }, + { (u8 *) &gBattleAnimSpriteSheet_280, 0x800, 10280 }, + { (u8 *) &gBattleAnimSpriteSheet_281, 0x200, 10281 }, + { (u8 *) &gBattleAnimSpriteSheet_282, 0x600, 10282 }, + { (u8 *) &gBattleAnimSpriteSheet_283, 0x200, 10283 }, + { (u8 *) &gBattleAnimSpriteSheet_284, 0x800, 10284 }, + { (u8 *) &gBattleAnimSpriteSheet_285, 0x200, 10285 }, + { (u8 *) &gBattleAnimSpriteSheet_183, 0x800, 10286 }, + { (u8 *) &gBattleAnimSpriteSheet_056, 0x1000, 10287 }, + { (u8 *) &gBattleAnimSpriteSheet_163, 0x100, 10288 }, +}; + +const struct CompressedSpritePalette gBattleAnimPaletteTable[] = +{ + { (u8 *) &gBattleAnimSpritePalette_000, 10000 }, + { (u8 *) &gBattleAnimSpritePalette_001, 10001 }, + { (u8 *) &gBattleAnimSpritePalette_002, 10002 }, + { (u8 *) &gBattleAnimSpritePalette_003, 10003 }, + { (u8 *) &gBattleAnimSpritePalette_004, 10004 }, + { (u8 *) &gBattleAnimSpritePalette_005, 10005 }, + { (u8 *) &gBattleAnimSpritePalette_006, 10006 }, + { (u8 *) &gBattleAnimSpritePalette_007, 10007 }, + { (u8 *) &gBattleAnimSpritePalette_008, 10008 }, + { (u8 *) &gBattleAnimSpritePalette_009, 10009 }, + { (u8 *) &gBattleAnimSpritePalette_010, 10010 }, + { (u8 *) &gBattleAnimSpritePalette_011, 10011 }, + { (u8 *) &gBattleAnimSpritePalette_012, 10012 }, + { (u8 *) &gBattleAnimSpritePalette_013, 10013 }, + { (u8 *) &gBattleAnimSpritePalette_014, 10014 }, + { (u8 *) &gBattleAnimSpritePalette_015, 10015 }, + { (u8 *) &gBattleAnimSpritePalette_016, 10016 }, + { (u8 *) &gBattleAnimSpritePalette_016, 10017 }, + { (u8 *) &gBattleAnimSpritePalette_018, 10018 }, + { (u8 *) &gBattleAnimSpritePalette_019, 10019 }, + { (u8 *) &gBattleAnimSpritePalette_020, 10020 }, + { (u8 *) &gBattleAnimSpritePalette_021, 10021 }, + { (u8 *) &gBattleAnimSpritePalette_022, 10022 }, + { (u8 *) &gBattleAnimSpritePalette_023, 10023 }, + { (u8 *) &gBattleAnimSpritePalette_024, 10024 }, + { (u8 *) &gBattleAnimSpritePalette_025, 10025 }, + { (u8 *) &gBattleAnimSpritePalette_026, 10026 }, + { (u8 *) &gBattleAnimSpritePalette_027, 10027 }, + { (u8 *) &gBattleAnimSpritePalette_028, 10028 }, + { (u8 *) &gBattleAnimSpritePalette_029, 10029 }, + { (u8 *) &gBattleAnimSpritePalette_030, 10030 }, + { (u8 *) &gBattleAnimSpritePalette_031, 10031 }, + { (u8 *) &gBattleAnimSpritePalette_032, 10032 }, + { (u8 *) &gBattleAnimSpritePalette_033, 10033 }, + { (u8 *) &gBattleAnimSpritePalette_033, 10034 }, + { (u8 *) &gBattleAnimSpritePalette_033, 10035 }, + { (u8 *) &gBattleAnimSpritePalette_036, 10036 }, + { (u8 *) &gBattleAnimSpritePalette_036, 10037 }, + { (u8 *) &gBattleAnimSpritePalette_038, 10038 }, + { (u8 *) &gBattleAnimSpritePalette_039, 10039 }, + { (u8 *) &gBattleAnimSpritePalette_038, 10040 }, + { (u8 *) &gBattleAnimSpritePalette_038, 10041 }, + { (u8 *) &gBattleAnimSpritePalette_042, 10042 }, + { (u8 *) &gBattleAnimSpritePalette_043, 10043 }, + { (u8 *) &gBattleAnimSpritePalette_044, 10044 }, + { (u8 *) &gBattleAnimSpritePalette_045, 10045 }, + { (u8 *) &gBattleAnimSpritePalette_046, 10046 }, + { (u8 *) &gBattleAnimSpritePalette_047, 10046 }, + { (u8 *) &gBattleAnimSpritePalette_048, 10048 }, + { (u8 *) &gBattleAnimSpritePalette_049, 10049 }, + { (u8 *) &gBattleAnimSpritePalette_050, 10050 }, + { (u8 *) &gBattleAnimSpritePalette_050, 10051 }, + { (u8 *) &gBattleAnimSpritePalette_050, 10052 }, + { (u8 *) &gBattleAnimSpritePalette_026, 10053 }, + { (u8 *) &gBattleAnimSpritePalette_054, 10054 }, + { (u8 *) &gBattleAnimSpritePalette_050, 10055 }, + { (u8 *) &gBattleAnimSpritePalette_056, 10056 }, + { (u8 *) &gBattleAnimSpritePalette_057, 10057 }, + { (u8 *) &gBattleAnimSpritePalette_058, 10058 }, + { (u8 *) &gBattleAnimSpritePalette_059, 10059 }, + { (u8 *) &gBattleAnimSpritePalette_060, 10060 }, + { (u8 *) &gBattleAnimSpritePalette_061, 10061 }, + { (u8 *) &gBattleAnimSpritePalette_062, 10062 }, + { (u8 *) &gBattleAnimSpritePalette_063, 10063 }, + { (u8 *) &gBattleAnimSpritePalette_064, 10064 }, + { (u8 *) &gBattleAnimSpritePalette_065, 10065 }, + { (u8 *) &gBattleAnimSpritePalette_066, 10066 }, + { (u8 *) &gBattleAnimSpritePalette_067, 10067 }, + { (u8 *) &gBattleAnimSpritePalette_068, 10068 }, + { (u8 *) &gBattleAnimSpritePalette_065, 10069 }, + { (u8 *) &gBattleAnimSpritePalette_070, 10070 }, + { (u8 *) &gBattleAnimSpritePalette_070, 10071 }, + { (u8 *) &gBattleAnimSpritePalette_072, 10072 }, + { (u8 *) &gBattleAnimSpritePalette_073, 10073 }, + { (u8 *) &gBattleAnimSpritePalette_074, 10074 }, + { (u8 *) &gBattleAnimSpritePalette_075, 10075 }, + { (u8 *) &gBattleAnimSpritePalette_076, 10076 }, + { (u8 *) &gBattleAnimSpritePalette_076, 10077 }, + { (u8 *) &gBattleAnimSpritePalette_078, 10078 }, + { (u8 *) &gBattleAnimSpritePalette_078, 10079 }, + { (u8 *) &gBattleAnimSpritePalette_080, 10080 }, + { (u8 *) &gBattleAnimSpritePalette_081, 10081 }, + { (u8 *) &gBattleAnimSpritePalette_082, 10082 }, + { (u8 *) &gBattleAnimSpritePalette_083, 10083 }, + { (u8 *) &gBattleAnimSpritePalette_084, 10084 }, + { (u8 *) &gBattleAnimSpritePalette_085, 10085 }, + { (u8 *) &gBattleAnimSpritePalette_086, 10086 }, + { (u8 *) &gBattleAnimSpritePalette_087, 10087 }, + { (u8 *) &gBattleAnimSpritePalette_088, 10088 }, + { (u8 *) &gBattleAnimSpritePalette_089, 10089 }, + { (u8 *) &gBattleAnimSpritePalette_090, 10090 }, + { (u8 *) &gBattleAnimSpritePalette_091, 10091 }, + { (u8 *) &gBattleAnimSpritePalette_092, 10092 }, + { (u8 *) &gBattleAnimSpritePalette_093, 10093 }, + { (u8 *) &gBattleAnimSpritePalette_094, 10094 }, + { (u8 *) &gBattleAnimSpritePalette_095, 10095 }, + { (u8 *) &gBattleAnimSpritePalette_096, 10096 }, + { (u8 *) &gBattleAnimSpritePalette_097, 10097 }, + { (u8 *) &gBattleAnimSpritePalette_094, 10098 }, + { (u8 *) &gBattleAnimSpritePalette_099, 10099 }, + { (u8 *) &gBattleAnimSpritePalette_100, 10100 }, + { (u8 *) &gBattleAnimSpritePalette_101, 10101 }, + { (u8 *) &gBattleAnimSpritePalette_101, 10102 }, + { (u8 *) &gBattleAnimSpritePalette_103, 10103 }, + { (u8 *) &gBattleAnimSpritePalette_104, 10104 }, + { (u8 *) &gBattleAnimSpritePalette_105, 10105 }, + { (u8 *) &gBattleAnimSpritePalette_105, 10106 }, + { (u8 *) &gBattleAnimSpritePalette_107, 10107 }, + { (u8 *) &gBattleAnimSpritePalette_107, 10108 }, + { (u8 *) &gBattleAnimSpritePalette_109, 10109 }, + { (u8 *) &gBattleAnimSpritePalette_109, 10110 }, + { (u8 *) &gBattleAnimSpritePalette_111, 10111 }, + { (u8 *) &gBattleAnimSpritePalette_112, 10112 }, + { (u8 *) &gBattleAnimSpritePalette_113, 10113 }, + { (u8 *) &gBattleAnimSpritePalette_114, 10114 }, + { (u8 *) &gBattleAnimSpritePalette_115, 10115 }, + { (u8 *) &gBattleAnimSpritePalette_116, 10116 }, + { (u8 *) &gBattleAnimSpritePalette_117, 10117 }, + { (u8 *) &gBattleAnimSpritePalette_118, 10118 }, + { (u8 *) &gBattleAnimSpritePalette_119, 10119 }, + { (u8 *) &gBattleAnimSpritePalette_120, 10120 }, + { (u8 *) &gBattleAnimSpritePalette_121, 10121 }, + { (u8 *) &gBattleAnimSpritePalette_122, 10122 }, + { (u8 *) &gBattleAnimSpritePalette_122, 10123 }, + { (u8 *) &gBattleAnimSpritePalette_124, 10124 }, + { (u8 *) &gBattleAnimSpritePalette_125, 10125 }, + { (u8 *) &gBattleAnimSpritePalette_126, 10126 }, + { (u8 *) &gBattleAnimSpritePalette_127, 10127 }, + { (u8 *) &gBattleAnimSpritePalette_128, 10128 }, + { (u8 *) &gBattleAnimSpritePalette_128, 10129 }, + { (u8 *) &gBattleAnimSpritePalette_130, 10130 }, + { (u8 *) &gBattleAnimSpritePalette_130, 10131 }, + { (u8 *) &gBattleAnimSpritePalette_132, 10132 }, + { (u8 *) &gBattleAnimSpritePalette_133, 10133 }, + { (u8 *) &gBattleAnimSpritePalette_133, 10134 }, + { (u8 *) &gBattleAnimSpritePalette_135, 10135 }, + { (u8 *) &gBattleAnimSpritePalette_136, 10136 }, + { (u8 *) &gBattleAnimSpritePalette_135, 10137 }, + { (u8 *) &gBattleAnimSpritePalette_135, 10138 }, + { (u8 *) &gBattleAnimSpritePalette_139, 10139 }, + { (u8 *) &gBattleAnimSpritePalette_140, 10140 }, + { (u8 *) &gBattleAnimSpritePalette_141, 10141 }, + { (u8 *) &gBattleAnimSpritePalette_141, 10142 }, + { (u8 *) &gBattleAnimSpritePalette_143, 10143 }, + { (u8 *) &gBattleAnimSpritePalette_144, 10144 }, + { (u8 *) &gBattleAnimSpritePalette_139, 10145 }, + { (u8 *) &gBattleAnimSpritePalette_115, 10146 }, + { (u8 *) &gBattleAnimSpritePalette_147, 10147 }, + { (u8 *) &gBattleAnimSpritePalette_148, 10148 }, + { (u8 *) &gBattleAnimSpritePalette_148, 10149 }, + { (u8 *) &gBattleAnimSpritePalette_150, 10150 }, + { (u8 *) &gBattleAnimSpritePalette_150, 10151 }, + { (u8 *) &gBattleAnimSpritePalette_152, 10152 }, + { (u8 *) &gBattleAnimSpritePalette_153, 10153 }, + { (u8 *) &gBattleAnimSpritePalette_154, 10154 }, + { (u8 *) &gBattleAnimSpritePalette_155, 10155 }, + { (u8 *) &gBattleAnimSpritePalette_156, 10156 }, + { (u8 *) &gBattleAnimSpritePalette_157, 10157 }, + { (u8 *) &gBattleAnimSpritePalette_158, 10158 }, + { (u8 *) &gBattleAnimSpritePalette_159, 10159 }, + { (u8 *) &gBattleAnimSpritePalette_160, 10160 }, + { (u8 *) &gBattleAnimSpritePalette_161, 10161 }, + { (u8 *) &gBattleAnimSpritePalette_162, 10162 }, + { (u8 *) &gBattleAnimSpritePalette_163, 10163 }, + { (u8 *) &gBattleAnimSpritePalette_164, 10164 }, + { (u8 *) &gBattleAnimSpritePalette_165, 10165 }, + { (u8 *) &gBattleAnimSpritePalette_166, 10166 }, + { (u8 *) &gBattleAnimSpritePalette_167, 10167 }, + { (u8 *) &gBattleAnimSpritePalette_168, 10168 }, + { (u8 *) &gBattleAnimSpritePalette_169, 10169 }, + { (u8 *) &gBattleAnimSpritePalette_170, 10170 }, + { (u8 *) &gBattleAnimSpritePalette_171, 10171 }, + { (u8 *) &gBattleAnimSpritePalette_172, 10172 }, + { (u8 *) &gBattleAnimSpritePalette_001, 10173 }, + { (u8 *) &gBattleAnimSpritePalette_174, 10174 }, + { (u8 *) &gBattleAnimSpritePalette_175, 10175 }, + { (u8 *) &gBattleAnimSpritePalette_176, 10176 }, + { (u8 *) &gBattleAnimSpritePalette_177, 10177 }, + { (u8 *) &gBattleAnimSpritePalette_178, 10178 }, + { (u8 *) &gBattleAnimSpritePalette_179, 10179 }, + { (u8 *) &gBattleAnimSpritePalette_179, 10180 }, + { (u8 *) &gBattleAnimSpritePalette_179, 10181 }, + { (u8 *) &gBattleAnimSpritePalette_182, 10182 }, + { (u8 *) &gBattleAnimSpritePalette_183, 10183 }, + { (u8 *) &gBattleAnimSpritePalette_184, 10184 }, + { (u8 *) &gBattleAnimSpritePalette_185, 10185 }, + { (u8 *) &gBattleAnimSpritePalette_186, 10186 }, + { (u8 *) &gBattleAnimSpritePalette_187, 10187 }, + { (u8 *) &gBattleAnimSpritePalette_188, 10188 }, + { (u8 *) &gBattleAnimSpritePalette_189, 10189 }, + { (u8 *) &gBattleAnimSpritePalette_190, 10190 }, + { (u8 *) &gBattleAnimSpritePalette_191, 10191 }, + { (u8 *) &gBattleAnimSpritePalette_192, 10192 }, + { (u8 *) &gBattleAnimSpritePalette_193, 10193 }, + { (u8 *) &gBattleAnimSpritePalette_194, 10194 }, + { (u8 *) &gBattleAnimSpritePalette_195, 10195 }, + { (u8 *) &gBattleAnimSpritePalette_196, 10196 }, + { (u8 *) &gBattleAnimSpritePalette_197, 10197 }, + { (u8 *) &gBattleAnimSpritePalette_198, 10198 }, + { (u8 *) &gBattleAnimSpritePalette_199, 10199 }, + { (u8 *) &gBattleAnimSpritePalette_200, 10200 }, + { (u8 *) &gBattleAnimSpritePalette_201, 10201 }, + { (u8 *) &gBattleAnimSpritePalette_202, 10202 }, + { (u8 *) &gBattleAnimSpritePalette_203, 10203 }, + { (u8 *) &gBattleAnimSpritePalette_204, 10204 }, + { (u8 *) &gBattleAnimSpritePalette_205, 10205 }, + { (u8 *) &gBattleAnimSpritePalette_206, 10206 }, + { (u8 *) &gBattleAnimSpritePalette_207, 10207 }, + { (u8 *) &gBattleAnimSpritePalette_167, 10208 }, + { (u8 *) &gBattleAnimSpritePalette_209, 10209 }, + { (u8 *) &gBattleAnimSpritePalette_210, 10210 }, + { (u8 *) &gBattleAnimSpritePalette_211, 10211 }, + { (u8 *) &gBattleAnimSpritePalette_211, 10212 }, + { (u8 *) &gBattleAnimSpritePalette_211, 10213 }, + { (u8 *) &gBattleAnimSpritePalette_064, 10214 }, + { (u8 *) &gBattleAnimSpritePalette_215, 10215 }, + { (u8 *) &gBattleAnimSpritePalette_216, 10216 }, + { (u8 *) &gBattleAnimSpritePalette_217, 10217 }, + { (u8 *) &gBattleAnimSpritePalette_218, 10218 }, + { (u8 *) &gBattleAnimSpritePalette_219, 10219 }, + { (u8 *) &gBattleAnimSpritePalette_220, 10220 }, + { (u8 *) &gBattleAnimSpritePalette_221, 10221 }, + { (u8 *) &gBattleAnimSpritePalette_222, 10222 }, + { (u8 *) &gBattleAnimSpritePalette_223, 10223 }, + { (u8 *) &gBattleAnimSpritePalette_224, 10224 }, + { (u8 *) &gBattleAnimSpritePalette_225, 10225 }, + { (u8 *) &gBattleAnimSpritePalette_226, 10226 }, + { (u8 *) &gBattleAnimSpritePalette_226, 10227 }, + { (u8 *) &gBattleAnimSpritePalette_228, 10228 }, + { (u8 *) &gBattleAnimSpritePalette_229, 10229 }, + { (u8 *) &gBattleAnimSpritePalette_230, 10230 }, + { (u8 *) &gBattleAnimSpritePalette_231, 10231 }, + { (u8 *) &gBattleAnimSpritePalette_231, 10232 }, + { (u8 *) &gBattleAnimSpritePalette_233, 10233 }, + { (u8 *) &gBattleAnimSpritePalette_234, 10234 }, + { (u8 *) &gBattleAnimSpritePalette_235, 10235 }, + { (u8 *) &gBattleAnimSpritePalette_236, 10236 }, + { (u8 *) &gBattleAnimSpritePalette_237, 10237 }, + { (u8 *) &gBattleAnimSpritePalette_238, 10238 }, + { (u8 *) &gBattleAnimSpritePalette_239, 10239 }, + { (u8 *) &gBattleAnimSpritePalette_240, 10240 }, + { (u8 *) &gBattleAnimSpritePalette_241, 10241 }, + { (u8 *) &gBattleAnimSpritePalette_242, 10242 }, + { (u8 *) &gBattleAnimSpritePalette_243, 10243 }, + { (u8 *) &gBattleAnimSpritePalette_244, 10244 }, + { (u8 *) &gBattleAnimSpritePalette_245, 10245 }, + { (u8 *) &gBattleAnimSpritePalette_245, 10246 }, + { (u8 *) &gBattleAnimSpritePalette_064, 10247 }, + { (u8 *) &gBattleAnimSpritePalette_248, 10248 }, + { (u8 *) &gBattleAnimSpritePalette_249, 10249 }, + { (u8 *) &gBattleAnimSpritePalette_249, 10250 }, + { (u8 *) &gBattleAnimSpritePalette_251, 10251 }, + { (u8 *) &gBattleAnimSpritePalette_252, 10252 }, + { (u8 *) &gBattleAnimSpritePalette_253, 10253 }, + { (u8 *) &gBattleAnimSpritePalette_254, 10254 }, + { (u8 *) &gBattleAnimSpritePalette_255, 10255 }, + { (u8 *) &gBattleAnimSpritePalette_256, 10256 }, + { (u8 *) &gBattleAnimSpritePalette_257, 10257 }, + { (u8 *) &gBattleAnimSpritePalette_258, 10258 }, + { (u8 *) &gBattleAnimSpritePalette_259, 10259 }, + { (u8 *) &gBattleAnimSpritePalette_260, 10260 }, + { (u8 *) &gBattleAnimSpritePalette_261, 10261 }, + { (u8 *) &gBattleAnimSpritePalette_262, 10262 }, + { (u8 *) &gBattleAnimSpritePalette_263, 10263 }, + { (u8 *) &gBattleAnimSpritePalette_264, 10264 }, + { (u8 *) &gBattleAnimSpritePalette_265, 10265 }, + { (u8 *) &gBattleAnimSpritePalette_266, 10266 }, + { (u8 *) &gBattleAnimSpritePalette_267, 10267 }, + { (u8 *) &gBattleAnimSpritePalette_268, 10268 }, + { (u8 *) &gBattleAnimSpritePalette_269, 10269 }, + { (u8 *) &gBattleAnimSpritePalette_270, 10270 }, + { (u8 *) &gBattleAnimSpritePalette_271, 10271 }, + { (u8 *) &gBattleAnimSpritePalette_272, 10272 }, + { (u8 *) &gBattleAnimSpritePalette_272, 10273 }, + { (u8 *) &gBattleAnimSpritePalette_274, 10274 }, + { (u8 *) &gBattleAnimSpritePalette_274, 10275 }, + { (u8 *) &gBattleAnimSpritePalette_274, 10276 }, + { (u8 *) &gBattleAnimSpritePalette_277, 10277 }, + { (u8 *) &gBattleAnimSpritePalette_278, 10278 }, + { (u8 *) &gBattleAnimSpritePalette_279, 10279 }, + { (u8 *) &gBattleAnimSpritePalette_280, 10280 }, + { (u8 *) &gBattleAnimSpritePalette_281, 10281 }, + { (u8 *) &gBattleAnimSpritePalette_282, 10282 }, + { (u8 *) &gBattleAnimSpritePalette_283, 10283 }, + { (u8 *) &gBattleAnimSpritePalette_284, 10284 }, + { (u8 *) &gBattleAnimSpritePalette_285, 10285 }, + { (u8 *) &gBattleAnimSpritePalette_286, 10286 }, + { (u8 *) &gBattleAnimSpritePalette_287, 10287 }, + { (u8 *) &gBattleAnimSpritePalette_288, 10288 }, +}; + +const struct BattleAnimBackground gBattleAnimBackgroundTable[] = +{ + &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, + &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, + &gBattleAnimBackgroundImage_02, &gBattleAnimBackgroundPalette_02, &gBattleAnimBackgroundTilemap_02, + &gBattleAnimBackgroundImage_03, &gBattleAnimBackgroundPalette_03, &gBattleAnimBackgroundTilemap_03, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_04, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_05, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_06, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_07, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_08, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_09, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_10, + &gBattleAnimBackgroundImage_11, &gBattleAnimBackgroundPalette_11, &gBattleAnimBackgroundTilemap_11, + &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_12, + &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_13, + &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_14, + &gBattleAnimBackgroundImage_15, &gBattleAnimBackgroundPalette_15, &gBattleAnimBackgroundTilemap_15, + &gBattleAnimBackgroundImage_16, &gBattleAnimBackgroundPalette_16, &gBattleAnimBackgroundTilemap_16, + &gBattleAnimBackgroundImage_17, &gBattleAnimBackgroundPalette_17, &gBattleAnimBackgroundTilemap_17, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_07, + &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_08, + &gBattleAnimBackgroundImage_20, &gBattleAnimBackgroundPalette_20, &gBattleAnimBackgroundTilemap_20, + &gBattleAnimBackgroundImage_21, &gBattleAnimBackgroundPalette_21, &gBattleAnimBackgroundTilemap_21, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_09, + &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_10, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_04, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_05, + &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_06, +}; + extern u16 gBattlePartyID[4]; extern u8 gObjectBankIDs[]; extern u8 gBankAttacker; @@ -64,8 +1905,6 @@ extern struct MusicPlayerInfo gMPlay_SE2; extern const u16 gUnknown_081C7160[]; extern const u8 *const gBattleAnims_Moves[]; -extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; -// extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; static void RunAnimScriptCommand(void); static void ScriptCmd_loadspritegfx(void); diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h deleted file mode 100644 index 1e12e2011..000000000 --- a/src/data/battle_anim.h +++ /dev/null @@ -1,326 +0,0 @@ -#include "global.h" -#include "graphics.h" - -const struct CompressedSpritePalette gBattleAnimPaletteTable[] = -{ - { (u8 *) &gBattleAnimSpritePalette_000, 10000}, - { (u8 *) &gBattleAnimSpritePalette_001, 10001}, - { (u8 *) &gBattleAnimSpritePalette_002, 10002}, - { (u8 *) &gBattleAnimSpritePalette_003, 10003}, - { (u8 *) &gBattleAnimSpritePalette_004, 10004}, - { (u8 *) &gBattleAnimSpritePalette_005, 10005}, - { (u8 *) &gBattleAnimSpritePalette_006, 10006}, - { (u8 *) &gBattleAnimSpritePalette_007, 10007}, - { (u8 *) &gBattleAnimSpritePalette_008, 10008}, - { (u8 *) &gBattleAnimSpritePalette_009, 10009}, - { (u8 *) &gBattleAnimSpritePalette_010, 10010}, - { (u8 *) &gBattleAnimSpritePalette_011, 10011}, - { (u8 *) &gBattleAnimSpritePalette_012, 10012}, - { (u8 *) &gBattleAnimSpritePalette_013, 10013}, - { (u8 *) &gBattleAnimSpritePalette_014, 10014}, - { (u8 *) &gBattleAnimSpritePalette_015, 10015}, - { (u8 *) &gBattleAnimSpritePalette_016, 10016}, - { (u8 *) &gBattleAnimSpritePalette_016, 10017}, - { (u8 *) &gBattleAnimSpritePalette_018, 10018}, - { (u8 *) &gBattleAnimSpritePalette_019, 10019}, - { (u8 *) &gBattleAnimSpritePalette_020, 10020}, - { (u8 *) &gBattleAnimSpritePalette_021, 10021}, - { (u8 *) &gBattleAnimSpritePalette_022, 10022}, - { (u8 *) &gBattleAnimSpritePalette_023, 10023}, - { (u8 *) &gBattleAnimSpritePalette_024, 10024}, - { (u8 *) &gBattleAnimSpritePalette_025, 10025}, - { (u8 *) &gBattleAnimSpritePalette_026, 10026}, - { (u8 *) &gBattleAnimSpritePalette_027, 10027}, - { (u8 *) &gBattleAnimSpritePalette_028, 10028}, - { (u8 *) &gBattleAnimSpritePalette_029, 10029}, - { (u8 *) &gBattleAnimSpritePalette_030, 10030}, - { (u8 *) &gBattleAnimSpritePalette_031, 10031}, - { (u8 *) &gBattleAnimSpritePalette_032, 10032}, - { (u8 *) &gBattleAnimSpritePalette_033, 10033}, - { (u8 *) &gBattleAnimSpritePalette_033, 10034}, - { (u8 *) &gBattleAnimSpritePalette_033, 10035}, - { (u8 *) &gBattleAnimSpritePalette_036, 10036}, - { (u8 *) &gBattleAnimSpritePalette_036, 10037}, - { (u8 *) &gBattleAnimSpritePalette_038, 10038}, - { (u8 *) &gBattleAnimSpritePalette_039, 10039}, - { (u8 *) &gBattleAnimSpritePalette_038, 10040}, - { (u8 *) &gBattleAnimSpritePalette_038, 10041}, - { (u8 *) &gBattleAnimSpritePalette_042, 10042}, - { (u8 *) &gBattleAnimSpritePalette_043, 10043}, - { (u8 *) &gBattleAnimSpritePalette_044, 10044}, - { (u8 *) &gBattleAnimSpritePalette_045, 10045}, - { (u8 *) &gBattleAnimSpritePalette_046, 10046}, - { (u8 *) &gBattleAnimSpritePalette_047, 10046}, - { (u8 *) &gBattleAnimSpritePalette_048, 10048}, - { (u8 *) &gBattleAnimSpritePalette_049, 10049}, - { (u8 *) &gBattleAnimSpritePalette_050, 10050}, - { (u8 *) &gBattleAnimSpritePalette_050, 10051}, - { (u8 *) &gBattleAnimSpritePalette_050, 10052}, - { (u8 *) &gBattleAnimSpritePalette_026, 10053}, - { (u8 *) &gBattleAnimSpritePalette_054, 10054}, - { (u8 *) &gBattleAnimSpritePalette_050, 10055}, - { (u8 *) &gBattleAnimSpritePalette_056, 10056}, - { (u8 *) &gBattleAnimSpritePalette_057, 10057}, - { (u8 *) &gBattleAnimSpritePalette_058, 10058}, - { (u8 *) &gBattleAnimSpritePalette_059, 10059}, - { (u8 *) &gBattleAnimSpritePalette_060, 10060}, - { (u8 *) &gBattleAnimSpritePalette_061, 10061}, - { (u8 *) &gBattleAnimSpritePalette_062, 10062}, - { (u8 *) &gBattleAnimSpritePalette_063, 10063}, - { (u8 *) &gBattleAnimSpritePalette_064, 10064}, - { (u8 *) &gBattleAnimSpritePalette_065, 10065}, - { (u8 *) &gBattleAnimSpritePalette_066, 10066}, - { (u8 *) &gBattleAnimSpritePalette_067, 10067}, - { (u8 *) &gBattleAnimSpritePalette_068, 10068}, - { (u8 *) &gBattleAnimSpritePalette_065, 10069}, - { (u8 *) &gBattleAnimSpritePalette_070, 10070}, - { (u8 *) &gBattleAnimSpritePalette_070, 10071}, - { (u8 *) &gBattleAnimSpritePalette_072, 10072}, - { (u8 *) &gBattleAnimSpritePalette_073, 10073}, - { (u8 *) &gBattleAnimSpritePalette_074, 10074}, - { (u8 *) &gBattleAnimSpritePalette_075, 10075}, - { (u8 *) &gBattleAnimSpritePalette_076, 10076}, - { (u8 *) &gBattleAnimSpritePalette_076, 10077}, - { (u8 *) &gBattleAnimSpritePalette_078, 10078}, - { (u8 *) &gBattleAnimSpritePalette_078, 10079}, - { (u8 *) &gBattleAnimSpritePalette_080, 10080}, - { (u8 *) &gBattleAnimSpritePalette_081, 10081}, - { (u8 *) &gBattleAnimSpritePalette_082, 10082}, - { (u8 *) &gBattleAnimSpritePalette_083, 10083}, - { (u8 *) &gBattleAnimSpritePalette_084, 10084}, - { (u8 *) &gBattleAnimSpritePalette_085, 10085}, - { (u8 *) &gBattleAnimSpritePalette_086, 10086}, - { (u8 *) &gBattleAnimSpritePalette_087, 10087}, - { (u8 *) &gBattleAnimSpritePalette_088, 10088}, - { (u8 *) &gBattleAnimSpritePalette_089, 10089}, - { (u8 *) &gBattleAnimSpritePalette_090, 10090}, - { (u8 *) &gBattleAnimSpritePalette_091, 10091}, - { (u8 *) &gBattleAnimSpritePalette_092, 10092}, - { (u8 *) &gBattleAnimSpritePalette_093, 10093}, - { (u8 *) &gBattleAnimSpritePalette_094, 10094}, - { (u8 *) &gBattleAnimSpritePalette_095, 10095}, - { (u8 *) &gBattleAnimSpritePalette_096, 10096}, - { (u8 *) &gBattleAnimSpritePalette_097, 10097}, - { (u8 *) &gBattleAnimSpritePalette_094, 10098}, - { (u8 *) &gBattleAnimSpritePalette_099, 10099}, - { (u8 *) &gBattleAnimSpritePalette_100, 10100}, - { (u8 *) &gBattleAnimSpritePalette_101, 10101}, - { (u8 *) &gBattleAnimSpritePalette_101, 10102}, - { (u8 *) &gBattleAnimSpritePalette_103, 10103}, - { (u8 *) &gBattleAnimSpritePalette_104, 10104}, - { (u8 *) &gBattleAnimSpritePalette_105, 10105}, - { (u8 *) &gBattleAnimSpritePalette_105, 10106}, - { (u8 *) &gBattleAnimSpritePalette_107, 10107}, - { (u8 *) &gBattleAnimSpritePalette_107, 10108}, - { (u8 *) &gBattleAnimSpritePalette_109, 10109}, - { (u8 *) &gBattleAnimSpritePalette_109, 10110}, - { (u8 *) &gBattleAnimSpritePalette_111, 10111}, - { (u8 *) &gBattleAnimSpritePalette_112, 10112}, - { (u8 *) &gBattleAnimSpritePalette_113, 10113}, - { (u8 *) &gBattleAnimSpritePalette_114, 10114}, - { (u8 *) &gBattleAnimSpritePalette_115, 10115}, - { (u8 *) &gBattleAnimSpritePalette_116, 10116}, - { (u8 *) &gBattleAnimSpritePalette_117, 10117}, - { (u8 *) &gBattleAnimSpritePalette_118, 10118}, - { (u8 *) &gBattleAnimSpritePalette_119, 10119}, - { (u8 *) &gBattleAnimSpritePalette_120, 10120}, - { (u8 *) &gBattleAnimSpritePalette_121, 10121}, - { (u8 *) &gBattleAnimSpritePalette_122, 10122}, - { (u8 *) &gBattleAnimSpritePalette_122, 10123}, - { (u8 *) &gBattleAnimSpritePalette_124, 10124}, - { (u8 *) &gBattleAnimSpritePalette_125, 10125}, - { (u8 *) &gBattleAnimSpritePalette_126, 10126}, - { (u8 *) &gBattleAnimSpritePalette_127, 10127}, - { (u8 *) &gBattleAnimSpritePalette_128, 10128}, - { (u8 *) &gBattleAnimSpritePalette_128, 10129}, - { (u8 *) &gBattleAnimSpritePalette_130, 10130}, - { (u8 *) &gBattleAnimSpritePalette_130, 10131}, - { (u8 *) &gBattleAnimSpritePalette_132, 10132}, - { (u8 *) &gBattleAnimSpritePalette_133, 10133}, - { (u8 *) &gBattleAnimSpritePalette_133, 10134}, - { (u8 *) &gBattleAnimSpritePalette_135, 10135}, - { (u8 *) &gBattleAnimSpritePalette_136, 10136}, - { (u8 *) &gBattleAnimSpritePalette_135, 10137}, - { (u8 *) &gBattleAnimSpritePalette_135, 10138}, - { (u8 *) &gBattleAnimSpritePalette_139, 10139}, - { (u8 *) &gBattleAnimSpritePalette_140, 10140}, - { (u8 *) &gBattleAnimSpritePalette_141, 10141}, - { (u8 *) &gBattleAnimSpritePalette_141, 10142}, - { (u8 *) &gBattleAnimSpritePalette_143, 10143}, - { (u8 *) &gBattleAnimSpritePalette_144, 10144}, - { (u8 *) &gBattleAnimSpritePalette_139, 10145}, - { (u8 *) &gBattleAnimSpritePalette_115, 10146}, - { (u8 *) &gBattleAnimSpritePalette_147, 10147}, - { (u8 *) &gBattleAnimSpritePalette_148, 10148}, - { (u8 *) &gBattleAnimSpritePalette_148, 10149}, - { (u8 *) &gBattleAnimSpritePalette_150, 10150}, - { (u8 *) &gBattleAnimSpritePalette_150, 10151}, - { (u8 *) &gBattleAnimSpritePalette_152, 10152}, - { (u8 *) &gBattleAnimSpritePalette_153, 10153}, - { (u8 *) &gBattleAnimSpritePalette_154, 10154}, - { (u8 *) &gBattleAnimSpritePalette_155, 10155}, - { (u8 *) &gBattleAnimSpritePalette_156, 10156}, - { (u8 *) &gBattleAnimSpritePalette_157, 10157}, - { (u8 *) &gBattleAnimSpritePalette_158, 10158}, - { (u8 *) &gBattleAnimSpritePalette_159, 10159}, - { (u8 *) &gBattleAnimSpritePalette_160, 10160}, - { (u8 *) &gBattleAnimSpritePalette_161, 10161}, - { (u8 *) &gBattleAnimSpritePalette_162, 10162}, - { (u8 *) &gBattleAnimSpritePalette_163, 10163}, - { (u8 *) &gBattleAnimSpritePalette_164, 10164}, - { (u8 *) &gBattleAnimSpritePalette_165, 10165}, - { (u8 *) &gBattleAnimSpritePalette_166, 10166}, - { (u8 *) &gBattleAnimSpritePalette_167, 10167}, - { (u8 *) &gBattleAnimSpritePalette_168, 10168}, - { (u8 *) &gBattleAnimSpritePalette_169, 10169}, - { (u8 *) &gBattleAnimSpritePalette_170, 10170}, - { (u8 *) &gBattleAnimSpritePalette_171, 10171}, - { (u8 *) &gBattleAnimSpritePalette_172, 10172}, - { (u8 *) &gBattleAnimSpritePalette_001, 10173}, - { (u8 *) &gBattleAnimSpritePalette_174, 10174}, - { (u8 *) &gBattleAnimSpritePalette_175, 10175}, - { (u8 *) &gBattleAnimSpritePalette_176, 10176}, - { (u8 *) &gBattleAnimSpritePalette_177, 10177}, - { (u8 *) &gBattleAnimSpritePalette_178, 10178}, - { (u8 *) &gBattleAnimSpritePalette_179, 10179}, - { (u8 *) &gBattleAnimSpritePalette_179, 10180}, - { (u8 *) &gBattleAnimSpritePalette_179, 10181}, - { (u8 *) &gBattleAnimSpritePalette_182, 10182}, - { (u8 *) &gBattleAnimSpritePalette_183, 10183}, - { (u8 *) &gBattleAnimSpritePalette_184, 10184}, - { (u8 *) &gBattleAnimSpritePalette_185, 10185}, - { (u8 *) &gBattleAnimSpritePalette_186, 10186}, - { (u8 *) &gBattleAnimSpritePalette_187, 10187}, - { (u8 *) &gBattleAnimSpritePalette_188, 10188}, - { (u8 *) &gBattleAnimSpritePalette_189, 10189}, - { (u8 *) &gBattleAnimSpritePalette_190, 10190}, - { (u8 *) &gBattleAnimSpritePalette_191, 10191}, - { (u8 *) &gBattleAnimSpritePalette_192, 10192}, - { (u8 *) &gBattleAnimSpritePalette_193, 10193}, - { (u8 *) &gBattleAnimSpritePalette_194, 10194}, - { (u8 *) &gBattleAnimSpritePalette_195, 10195}, - { (u8 *) &gBattleAnimSpritePalette_196, 10196}, - { (u8 *) &gBattleAnimSpritePalette_197, 10197}, - { (u8 *) &gBattleAnimSpritePalette_198, 10198}, - { (u8 *) &gBattleAnimSpritePalette_199, 10199}, - { (u8 *) &gBattleAnimSpritePalette_200, 10200}, - { (u8 *) &gBattleAnimSpritePalette_201, 10201}, - { (u8 *) &gBattleAnimSpritePalette_202, 10202}, - { (u8 *) &gBattleAnimSpritePalette_203, 10203}, - { (u8 *) &gBattleAnimSpritePalette_204, 10204}, - { (u8 *) &gBattleAnimSpritePalette_205, 10205}, - { (u8 *) &gBattleAnimSpritePalette_206, 10206}, - { (u8 *) &gBattleAnimSpritePalette_207, 10207}, - { (u8 *) &gBattleAnimSpritePalette_167, 10208}, - { (u8 *) &gBattleAnimSpritePalette_209, 10209}, - { (u8 *) &gBattleAnimSpritePalette_210, 10210}, - { (u8 *) &gBattleAnimSpritePalette_211, 10211}, - { (u8 *) &gBattleAnimSpritePalette_211, 10212}, - { (u8 *) &gBattleAnimSpritePalette_211, 10213}, - { (u8 *) &gBattleAnimSpritePalette_064, 10214}, - { (u8 *) &gBattleAnimSpritePalette_215, 10215}, - { (u8 *) &gBattleAnimSpritePalette_216, 10216}, - { (u8 *) &gBattleAnimSpritePalette_217, 10217}, - { (u8 *) &gBattleAnimSpritePalette_218, 10218}, - { (u8 *) &gBattleAnimSpritePalette_219, 10219}, - { (u8 *) &gBattleAnimSpritePalette_220, 10220}, - { (u8 *) &gBattleAnimSpritePalette_221, 10221}, - { (u8 *) &gBattleAnimSpritePalette_222, 10222}, - { (u8 *) &gBattleAnimSpritePalette_223, 10223}, - { (u8 *) &gBattleAnimSpritePalette_224, 10224}, - { (u8 *) &gBattleAnimSpritePalette_225, 10225}, - { (u8 *) &gBattleAnimSpritePalette_226, 10226}, - { (u8 *) &gBattleAnimSpritePalette_226, 10227}, - { (u8 *) &gBattleAnimSpritePalette_228, 10228}, - { (u8 *) &gBattleAnimSpritePalette_229, 10229}, - { (u8 *) &gBattleAnimSpritePalette_230, 10230}, - { (u8 *) &gBattleAnimSpritePalette_231, 10231}, - { (u8 *) &gBattleAnimSpritePalette_231, 10232}, - { (u8 *) &gBattleAnimSpritePalette_233, 10233}, - { (u8 *) &gBattleAnimSpritePalette_234, 10234}, - { (u8 *) &gBattleAnimSpritePalette_235, 10235}, - { (u8 *) &gBattleAnimSpritePalette_236, 10236}, - { (u8 *) &gBattleAnimSpritePalette_237, 10237}, - { (u8 *) &gBattleAnimSpritePalette_238, 10238}, - { (u8 *) &gBattleAnimSpritePalette_239, 10239}, - { (u8 *) &gBattleAnimSpritePalette_240, 10240}, - { (u8 *) &gBattleAnimSpritePalette_241, 10241}, - { (u8 *) &gBattleAnimSpritePalette_242, 10242}, - { (u8 *) &gBattleAnimSpritePalette_243, 10243}, - { (u8 *) &gBattleAnimSpritePalette_244, 10244}, - { (u8 *) &gBattleAnimSpritePalette_245, 10245}, - { (u8 *) &gBattleAnimSpritePalette_245, 10246}, - { (u8 *) &gBattleAnimSpritePalette_064, 10247}, - { (u8 *) &gBattleAnimSpritePalette_248, 10248}, - { (u8 *) &gBattleAnimSpritePalette_249, 10249}, - { (u8 *) &gBattleAnimSpritePalette_249, 10250}, - { (u8 *) &gBattleAnimSpritePalette_251, 10251}, - { (u8 *) &gBattleAnimSpritePalette_252, 10252}, - { (u8 *) &gBattleAnimSpritePalette_253, 10253}, - { (u8 *) &gBattleAnimSpritePalette_254, 10254}, - { (u8 *) &gBattleAnimSpritePalette_255, 10255}, - { (u8 *) &gBattleAnimSpritePalette_256, 10256}, - { (u8 *) &gBattleAnimSpritePalette_257, 10257}, - { (u8 *) &gBattleAnimSpritePalette_258, 10258}, - { (u8 *) &gBattleAnimSpritePalette_259, 10259}, - { (u8 *) &gBattleAnimSpritePalette_260, 10260}, - { (u8 *) &gBattleAnimSpritePalette_261, 10261}, - { (u8 *) &gBattleAnimSpritePalette_262, 10262}, - { (u8 *) &gBattleAnimSpritePalette_263, 10263}, - { (u8 *) &gBattleAnimSpritePalette_264, 10264}, - { (u8 *) &gBattleAnimSpritePalette_265, 10265}, - { (u8 *) &gBattleAnimSpritePalette_266, 10266}, - { (u8 *) &gBattleAnimSpritePalette_267, 10267}, - { (u8 *) &gBattleAnimSpritePalette_268, 10268}, - { (u8 *) &gBattleAnimSpritePalette_269, 10269}, - { (u8 *) &gBattleAnimSpritePalette_270, 10270}, - { (u8 *) &gBattleAnimSpritePalette_271, 10271}, - { (u8 *) &gBattleAnimSpritePalette_272, 10272}, - { (u8 *) &gBattleAnimSpritePalette_272, 10273}, - { (u8 *) &gBattleAnimSpritePalette_274, 10274}, - { (u8 *) &gBattleAnimSpritePalette_274, 10275}, - { (u8 *) &gBattleAnimSpritePalette_274, 10276}, - { (u8 *) &gBattleAnimSpritePalette_277, 10277}, - { (u8 *) &gBattleAnimSpritePalette_278, 10278}, - { (u8 *) &gBattleAnimSpritePalette_279, 10279}, - { (u8 *) &gBattleAnimSpritePalette_280, 10280}, - { (u8 *) &gBattleAnimSpritePalette_281, 10281}, - { (u8 *) &gBattleAnimSpritePalette_282, 10282}, - { (u8 *) &gBattleAnimSpritePalette_283, 10283}, - { (u8 *) &gBattleAnimSpritePalette_284, 10284}, - { (u8 *) &gBattleAnimSpritePalette_285, 10285}, - { (u8 *) &gBattleAnimSpritePalette_286, 10286}, - { (u8 *) &gBattleAnimSpritePalette_287, 10287}, - { (u8 *) &gBattleAnimSpritePalette_288, 10288}, -}; - -const struct BattleAnimBackground gBattleAnimBackgroundTable[] = -{ - &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, - &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, - &gBattleAnimBackgroundImage_02, &gBattleAnimBackgroundPalette_02, &gBattleAnimBackgroundTilemap_02, - &gBattleAnimBackgroundImage_03, &gBattleAnimBackgroundPalette_03, &gBattleAnimBackgroundTilemap_03, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_04, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_05, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_06, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_07, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_08, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_09, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_10, - &gBattleAnimBackgroundImage_11, &gBattleAnimBackgroundPalette_11, &gBattleAnimBackgroundTilemap_11, - &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_12, - &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_13, - &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_14, - &gBattleAnimBackgroundImage_15, &gBattleAnimBackgroundPalette_15, &gBattleAnimBackgroundTilemap_15, - &gBattleAnimBackgroundImage_16, &gBattleAnimBackgroundPalette_16, &gBattleAnimBackgroundTilemap_16, - &gBattleAnimBackgroundImage_17, &gBattleAnimBackgroundPalette_17, &gBattleAnimBackgroundTilemap_17, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_07, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_08, - &gBattleAnimBackgroundImage_20, &gBattleAnimBackgroundPalette_20, &gBattleAnimBackgroundTilemap_20, - &gBattleAnimBackgroundImage_21, &gBattleAnimBackgroundPalette_21, &gBattleAnimBackgroundTilemap_21, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_09, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_10, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_04, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_05, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_06, -}; -- cgit v1.2.3 From 378443528451875e5436814780a0420086bf5935 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 13 Jan 2018 21:02:12 -0600 Subject: refactor more of save.c --- common_syms/engine/save.txt | 4 +- include/ewram.h | 2 +- include/save.h | 2 +- src/engine/save.c | 361 ++++++++++++++++++++++++-------------------- src/scene/hall_of_fame.c | 4 +- src/scene/intro.c | 2 +- 6 files changed, 204 insertions(+), 171 deletions(-) diff --git a/common_syms/engine/save.txt b/common_syms/engine/save.txt index d09a52bcf..4824255bf 100644 --- a/common_syms/engine/save.txt +++ b/common_syms/engine/save.txt @@ -1,5 +1,5 @@ -gLastWrittenSector -gLastSaveCounter +gFirstSaveSector +gPrevSaveCounter gLastKnownGoodSector gDamagedSaveSectors gSaveCounter diff --git a/include/ewram.h b/include/ewram.h index 809d4ff66..93b323e04 100755 --- a/include/ewram.h +++ b/include/ewram.h @@ -20,7 +20,7 @@ extern u8 gSharedMem[]; #define eBrendanSprite (gSharedMem + 0x0) #define ewram0_6 (u32)(&gSharedMem[0]) #define ewram0_7 (&gSharedMem[0]) -#define eSaveSection (struct SaveSection *)(gSharedMem + 0x0) +#define eSaveSection (struct SaveSector *)(gSharedMem + 0x0) #define ewram0arr ((u8 (*)[32])gSharedMem) #define eVoidSharedArr (void *)(ewram_addr + 0x0) #define eVoidSharedArr2 (u32)(ewram_addr) // ew(ram) diff --git a/include/save.h b/include/save.h index f86113036..13e07d06a 100644 --- a/include/save.h +++ b/include/save.h @@ -33,6 +33,6 @@ u8 sub_8125DDC(void); u8 sub_8125E04(void); u8 sub_8125E2C(void); bool8 sub_8125E6C(void); -u8 sub_8125EC8(u8 a1); +u8 Save_LoadGameData(u8 a1); #endif // GUARD_SAVE_H diff --git a/src/engine/save.c b/src/engine/save.c index f1010c69e..be907edcc 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -4,12 +4,14 @@ #include "save.h" #include "load_save.h" #include "overworld.h" +#include "pokemon.h" #include "save_failed_screen.h" #include "ewram.h" #define FILE_SIGNATURE 0x08012025 // signature value to determine if a sector is in use -#define TOTALNUMSECTORS ((ARRAY_COUNT(sSaveBlockChunks) * 2) + (ARRAY_COUNT(sHallOfFameChunks) * 2)) // there are 2 slots, so double each array count and get the sum. +//#define TOTAL_FLASH_SECTORS ((ARRAY_COUNT(sSaveBlockChunks) * 2) + (ARRAY_COUNT(sHallOfFameChunks) * 2)) // there are 2 slots, so double each array count and get the sum. +#define TOTAL_FLASH_SECTORS 32 struct SaveBlockChunk { @@ -17,7 +19,7 @@ struct SaveBlockChunk u16 size; }; -struct SaveSection +struct SaveSector { u8 data[0xFF4]; u16 id; @@ -33,7 +35,7 @@ struct UnkSaveSection u32 signature; }; // size is 0xFF8 -static u8 WriteChunk(u16, const struct SaveBlockChunk *); +static u8 WriteSingleChunk(u16, const struct SaveBlockChunk *); static u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size); static u8 TryWriteSector(u8, u8 *); static u32 RestoreSaveBackupVarsAndIncrement(const struct SaveBlockChunk *location); @@ -41,13 +43,13 @@ static u32 RestoreSaveBackupVars(const struct SaveBlockChunk *location); static u8 sub_812550C(u16 a1, const struct SaveBlockChunk *location); static u8 sub_812556C(u16 a1, const struct SaveBlockChunk *location); static u8 sub_81255B8(u16, const struct SaveBlockChunk *location); -static u8 sub_8125758(u16 a1, const struct SaveBlockChunk *location); -static u8 sub_81257F0(u16 a1, const struct SaveBlockChunk *location); +static u8 WriteSomeFlashByteToPrevSector(u16 a1, const struct SaveBlockChunk *location); +static u8 WriteSomeFlashByte0x25ToPrevSector(u16 a1, const struct SaveBlockChunk *location); static u8 sub_812587C(u16 a1, const struct SaveBlockChunk *location); static u8 sub_81258BC(u16, const struct SaveBlockChunk *location); static u8 GetSaveValidStatus(const struct SaveBlockChunk *location); -static u8 sub_8125B88(u8 a1, u8 *data, u16 size); -static u8 DoReadFlashWholeSection(u8, struct SaveSection *); +static u8 ReadSomeUnknownSectorAndVerify(u8 a1, u8 *data, u16 size); +static u8 DoReadFlashWholeSection(u8, struct SaveSector *); static u16 CalculateChecksum(void *, u16); bool8 unref_sub_8125F4C(struct UnkSaveSection *a1); u8 unref_sub_8125FA0(void); @@ -55,24 +57,44 @@ u8 unref_sub_8125FF0(u8 *data, u16 size); u8 unref_sub_8126068(u8 sector, u8 *data, u32 size); u8 unref_sub_8126080(u8 sector, u8 *data); -u16 gLastWrittenSector; -u32 gLastSaveCounter; +// Sector num to begin writing save data. Sectors are rotated each time the game is saved. (possibly to avoid wear on flash memory?) +u16 gFirstSaveSector; +u32 gPrevSaveCounter; u16 gLastKnownGoodSector; u32 gDamagedSaveSectors; u32 gSaveCounter; -struct SaveSection *gFastSaveSection; // the pointer is in fast IWRAM but may sometimes point to the slower EWRAM. +struct SaveSector *gFastSaveSection; // the pointer is in fast IWRAM but may sometimes point to the slower EWRAM. u16 gUnknown_03005EB4; u16 gSaveFileStatus; u32 gGameContinueCallback; -extern struct PokemonStorage gPokemonStorage; - static EWRAM_DATA u32 gLastSaveSectorStatus = 0; // used but in an unferenced function, so unused // Each 4 KiB flash sector contains 3968 bytes of actual data followed by a 128 byte footer #define SECTOR_DATA_SIZE 3968 #define SECTOR_FOOTER_SIZE 128 +/* + * Sector Layout: + * + * Sectors 0 - 13: Save Slot 1 + * Sectors 14 - 27: Save Slot 2 + * Sectors 28 - 29: Hall of Fame + * Sectors 30 - 31: e-Reader battle tower data, maybe? + * + * There are two save slots for saving the player's game data. We alternate between + * them each time the game is saved, so that if the current save slot is corrupt, + * we can load the previous one. We also rotate the sectors in each save slot + * so that the same data is not always being written to the same sector. This + * might be done to reduce wear on the flash memory, but I'm not sure, since all + * 14 sectors get written anyway. + */ + +#define HALL_OF_FAME_SECTOR 28 + +#define NUM_SECTORS_PER_SAVE_SLOT 14 // Number of sectors occupied by a save slot +#define NUM_HALL_OF_FAME_SECTORS 2 + // Divide save blocks into individual chunks to be written to flash sectors #define SAVEBLOCK_CHUNK(structure, chunkNum) \ @@ -107,8 +129,6 @@ static const struct SaveBlockChunk sHallOfFameChunks[] = SAVEBLOCK_CHUNK(*eHallOfFame, 1), }; -const u8 gFlashSectors[] = { 0x1E, 0x1F }; - void Save_EraseAllData(void) { u16 i; @@ -120,15 +140,15 @@ void Save_EraseAllData(void) void Save_ResetSaveCounters(void) { gSaveCounter = 0; - gLastWrittenSector = 0; + gFirstSaveSector = 0; gDamagedSaveSectors = 0; } enum { - ENABLE, - DISABLE, - CHECK // unused + SECTOR_DAMAGED, + SECTOR_OK, + SECTOR_CHECK, // unused }; static bool32 SetSectorDamagedStatus(u8 op, u8 sectorNum) @@ -137,13 +157,13 @@ static bool32 SetSectorDamagedStatus(u8 op, u8 sectorNum) switch (op) { - case ENABLE: + case SECTOR_DAMAGED: gDamagedSaveSectors |= (1 << sectorNum); break; - case DISABLE: + case SECTOR_OK: gDamagedSaveSectors &= ~(1 << sectorNum); break; - case CHECK: // unused + case SECTOR_CHECK: // unused if (gDamagedSaveSectors & (1 << sectorNum)) retVal = TRUE; break; @@ -152,65 +172,69 @@ static bool32 SetSectorDamagedStatus(u8 op, u8 sectorNum) return retVal; } -static u8 WriteSaveBlockChunks(u16 a1, const struct SaveBlockChunk *chunks) +// If chunkId is 0xFFFF, this function will write all of the chunks pointed to by 'chunks'. +// Otherwise, it will write a single chunk with the given 'chunkId'. +static u8 WriteSaveBlockChunks(u16 chunkId, const struct SaveBlockChunk *chunks) { u32 retVal; u16 i; gFastSaveSection = eSaveSection; - if (a1 != 0xFFFF) // for link + if (chunkId != 0xFFFF) // write single chunk { - retVal = WriteChunk(a1, chunks); + retVal = WriteSingleChunk(chunkId, chunks); } - else + else // write all chunks { - gLastKnownGoodSector = gLastWrittenSector; // backup the current written sector before attempting to write. - gLastSaveCounter = gSaveCounter; - gLastWrittenSector++; - gLastWrittenSector %= ARRAY_COUNT(sSaveBlockChunks); + gLastKnownGoodSector = gFirstSaveSector; + gPrevSaveCounter = gSaveCounter; + gFirstSaveSector++; + gFirstSaveSector %= NUM_SECTORS_PER_SAVE_SLOT; gSaveCounter++; retVal = SAVE_STATUS_OK; - for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) - WriteChunk(i, chunks); + for (i = 0; i < NUM_SECTORS_PER_SAVE_SLOT; i++) + WriteSingleChunk(i, chunks); // Check for any bad sectors if (gDamagedSaveSectors != 0) // skip the damaged sector. { retVal = SAVE_STATUS_ERROR; - gLastWrittenSector = gLastKnownGoodSector; - gSaveCounter = gLastSaveCounter; + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; } } return retVal; } -static u8 WriteChunk(u16 chunkId, const struct SaveBlockChunk *chunks) +static u8 WriteSingleChunk(u16 chunkId, const struct SaveBlockChunk *chunks) { u16 i; u16 sectorNum; - u8 *data; - u16 size; + u8 *chunkData; + u16 chunkSize; - sectorNum = chunkId + gLastWrittenSector; - sectorNum %= ARRAY_COUNT(sSaveBlockChunks); - sectorNum += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); + // select sector number + sectorNum = chunkId + gFirstSaveSector; + sectorNum %= NUM_SECTORS_PER_SAVE_SLOT; + // select save slot + sectorNum += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); - data = chunks[chunkId].data; - size = chunks[chunkId].size; + chunkData = chunks[chunkId].data; + chunkSize = chunks[chunkId].size; // clear save section. - for (i = 0; i < sizeof(struct SaveSection); i++) + for (i = 0; i < sizeof(struct SaveSector); i++) ((u8 *)gFastSaveSection)[i] = 0; gFastSaveSection->id = chunkId; gFastSaveSection->signature = FILE_SIGNATURE; gFastSaveSection->counter = gSaveCounter; - for (i = 0; i < size; i++) - gFastSaveSection->data[i] = data[i]; - gFastSaveSection->checksum = CalculateChecksum(data, size); + for (i = 0; i < chunkSize; i++) + gFastSaveSection->data[i] = chunkData[i]; + gFastSaveSection->checksum = CalculateChecksum(chunkData, chunkSize); return TryWriteSector(sectorNum, gFastSaveSection->data); } @@ -218,9 +242,9 @@ static u8 WriteChunk(u16 chunkId, const struct SaveBlockChunk *chunks) static u8 HandleWriteSectorNBytes(u8 sectorNum, u8 *data, u16 size) { u16 i; - struct SaveSection *section = eSaveSection; + struct SaveSector *section = eSaveSection; - for (i = 0; i < sizeof(struct SaveSection); i++) + for (i = 0; i < sizeof(struct SaveSector); i++) ((char *)section)[i] = 0; section->signature = FILE_SIGNATURE; @@ -235,12 +259,12 @@ static u8 TryWriteSector(u8 sectorNum, u8 *data) { if (ProgramFlashSectorAndVerify(sectorNum, data) != 0) // is damaged? { - SetSectorDamagedStatus(ENABLE, sectorNum); // set damaged sector bits. + SetSectorDamagedStatus(SECTOR_DAMAGED, sectorNum); // set damaged sector bits. return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sectorNum); // unset damaged sector bits. it's safe now. + SetSectorDamagedStatus(SECTOR_OK, sectorNum); // unset damaged sector bits. it's safe now. return SAVE_STATUS_OK; } } @@ -248,21 +272,21 @@ static u8 TryWriteSector(u8 sectorNum, u8 *data) static u32 RestoreSaveBackupVarsAndIncrement(const struct SaveBlockChunk *chunk) // chunk is unused { gFastSaveSection = eSaveSection; - gLastKnownGoodSector = gLastWrittenSector; - gLastSaveCounter = gSaveCounter; - gLastWrittenSector++; - gLastWrittenSector = gLastWrittenSector % ARRAY_COUNT(sSaveBlockChunks); + gLastKnownGoodSector = gFirstSaveSector; + gPrevSaveCounter = gSaveCounter; + gFirstSaveSector++; + gFirstSaveSector %= NUM_SECTORS_PER_SAVE_SLOT; gSaveCounter++; gUnknown_03005EB4 = 0; gDamagedSaveSectors = 0; return 0; } -static u32 RestoreSaveBackupVars(const struct SaveBlockChunk *chunk) // only ever called once, and gSaveBlock2 is passed to this function. chunk is unused +static u32 RestoreSaveBackupVars(const struct SaveBlockChunk *chunk) // chunk is unused { gFastSaveSection = eSaveSection; - gLastKnownGoodSector = gLastWrittenSector; - gLastSaveCounter = gSaveCounter; + gLastKnownGoodSector = gFirstSaveSector; + gPrevSaveCounter = gSaveCounter; gUnknown_03005EB4 = 0; gDamagedSaveSectors = 0; return 0; @@ -274,19 +298,19 @@ static u8 sub_812550C(u16 a1, const struct SaveBlockChunk *chunk) if (gUnknown_03005EB4 < a1 - 1) { - retVal = 1; - WriteChunk(gUnknown_03005EB4, chunk); + retVal = SAVE_STATUS_OK; + WriteSingleChunk(gUnknown_03005EB4, chunk); gUnknown_03005EB4++; if (gDamagedSaveSectors) { - retVal = 0xFF; - gLastWrittenSector = gLastKnownGoodSector; - gSaveCounter = gLastSaveCounter; + retVal = SAVE_STATUS_ERROR; + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; } } else { - retVal = 0xFF; + retVal = SAVE_STATUS_ERROR; } return retVal; @@ -294,15 +318,15 @@ static u8 sub_812550C(u16 a1, const struct SaveBlockChunk *chunk) static u8 sub_812556C(u16 a1, const struct SaveBlockChunk *chunk) { - u8 retVal = 1; + u8 retVal = SAVE_STATUS_OK; sub_81255B8(a1 - 1, chunk); if (gDamagedSaveSectors) { - retVal = 0xFF; - gLastWrittenSector = gLastKnownGoodSector; - gSaveCounter = gLastSaveCounter; + retVal = SAVE_STATUS_ERROR; + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; } return retVal; } @@ -315,15 +339,17 @@ static u8 sub_81255B8(u16 chunkId, const struct SaveBlockChunk *chunks) u16 size; u8 status; - sector = chunkId + gLastWrittenSector; - sector %= ARRAY_COUNT(sSaveBlockChunks); - sector += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); + // select sector number + sector = chunkId + gFirstSaveSector; + sector %= NUM_SECTORS_PER_SAVE_SLOT; + // select save slot + sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); data = chunks[chunkId].data; size = chunks[chunkId].size; // clear temp save section. - for (i = 0; i < sizeof(struct SaveSection); i++) + for (i = 0; i < sizeof(struct SaveSector); i++) ((char *)gFastSaveSection)[i] = 0; gFastSaveSection->id = chunkId; @@ -339,90 +365,92 @@ static u8 sub_81255B8(u16 chunkId, const struct SaveBlockChunk *chunks) EraseFlashSector(sector); - status = 1; + status = SAVE_STATUS_OK; for (i = 0; i < sizeof(struct UnkSaveSection); i++) { if (ProgramFlashByte(sector, i, gFastSaveSection->data[i])) { - status = 0xFF; + status = SAVE_STATUS_ERROR; break; } } - if (status == 0xFF) + if (status == SAVE_STATUS_ERROR) { - SetSectorDamagedStatus(ENABLE, sector); - return 0xFF; + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + return SAVE_STATUS_ERROR; } else { - status = 1; + status = SAVE_STATUS_OK; for (i = 0; i < 7; i++) { if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i])) { - status = 0xFF; + status = SAVE_STATUS_ERROR; break; } } - if (status == 0xFF) + if (status == SAVE_STATUS_ERROR) { - SetSectorDamagedStatus(ENABLE, sector); - return 0xFF; + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sector); - return 1; + SetSectorDamagedStatus(SECTOR_OK, sector); + return SAVE_STATUS_OK; } } } -static u8 sub_8125758(u16 a1, const struct SaveBlockChunk *chunk) +static u8 WriteSomeFlashByteToPrevSector(u16 a1, const struct SaveBlockChunk *chunk) { u16 sector; - sector = a1 + gLastWrittenSector - 1; - sector %= ARRAY_COUNT(sSaveBlockChunks); - sector += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); + // select sector number + sector = a1 + gFirstSaveSector - 1; + sector %= NUM_SECTORS_PER_SAVE_SLOT; + // select save slot + sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), ((u8 *)gFastSaveSection)[sizeof(struct UnkSaveSection)])) { // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. - SetSectorDamagedStatus(ENABLE, sector); - gLastWrittenSector = gLastKnownGoodSector; - gSaveCounter = gLastSaveCounter; + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sector); + SetSectorDamagedStatus(SECTOR_OK, sector); return SAVE_STATUS_OK; } } -static u8 sub_81257F0(u16 a1, const struct SaveBlockChunk *chunk) +static u8 WriteSomeFlashByte0x25ToPrevSector(u16 a1, const struct SaveBlockChunk *chunk) { u16 sector; - sector = a1 + gLastWrittenSector - 1; - sector %= ARRAY_COUNT(sSaveBlockChunks); - sector += ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); + sector = a1 + gFirstSaveSector - 1; + sector %= NUM_SECTORS_PER_SAVE_SLOT; + sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), 0x25)) { // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. - SetSectorDamagedStatus(ENABLE, sector); - gLastWrittenSector = gLastKnownGoodSector; - gSaveCounter = gLastSaveCounter; + SetSectorDamagedStatus(SECTOR_DAMAGED, sector); + gFirstSaveSector = gLastKnownGoodSector; + gSaveCounter = gPrevSaveCounter; return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sector); + SetSectorDamagedStatus(SECTOR_OK, sector); return SAVE_STATUS_OK; } } @@ -448,15 +476,15 @@ static u8 sub_81258BC(u16 a1, const struct SaveBlockChunk *chunks) { u16 i; u16 checksum; - u16 v3 = ARRAY_COUNT(sSaveBlockChunks) * (gSaveCounter % 2); + u16 sector = NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); u16 id; - for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) + for (i = 0; i < NUM_SECTORS_PER_SAVE_SLOT; i++) { - DoReadFlashWholeSection(i + v3, gFastSaveSection); + DoReadFlashWholeSection(i + sector, gFastSaveSection); id = gFastSaveSection->id; if (id == 0) - gLastWrittenSector = i; + gFirstSaveSector = i; checksum = CalculateChecksum(gFastSaveSection->data, chunks[id].size); if (gFastSaveSection->signature == FILE_SIGNATURE && gFastSaveSection->checksum == checksum) @@ -472,37 +500,37 @@ static u8 sub_81258BC(u16 a1, const struct SaveBlockChunk *chunks) static u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) { - u16 i; + u16 sector; bool8 signatureValid; u16 checksum; - u32 saveSlot1Counter = 0; - u32 saveSlot2Counter = 0; + u32 slot1saveCounter = 0; + u32 slot2saveCounter = 0; u8 slot1Status; u8 slot2Status; - u32 validChunks; - const u32 ALL_CHUNKS = (1 << ARRAY_COUNT(sSaveBlockChunks)) - 1; // bitmask of all saveblock chunks + u32 validSectors; + const u32 ALL_SECTORS = (1 << NUM_SECTORS_PER_SAVE_SLOT) - 1; // bitmask of all saveblock sectors // check save slot 1. - validChunks = 0; + validSectors = 0; signatureValid = FALSE; - for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) + for (sector = 0; sector < NUM_SECTORS_PER_SAVE_SLOT; sector++) { - DoReadFlashWholeSection(i, gFastSaveSection); + DoReadFlashWholeSection(sector, gFastSaveSection); if (gFastSaveSection->signature == FILE_SIGNATURE) { signatureValid = TRUE; checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); if (gFastSaveSection->checksum == checksum) { - saveSlot1Counter = gFastSaveSection->counter; - validChunks |= 1 << gFastSaveSection->id; + slot1saveCounter = gFastSaveSection->counter; + validSectors |= 1 << gFastSaveSection->id; } } } if (signatureValid) { - if (validChunks == ALL_CHUNKS) + if (validSectors == ALL_SECTORS) slot1Status = SAVE_STATUS_OK; else slot1Status = SAVE_STATUS_ERROR; @@ -513,26 +541,26 @@ static u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) } // check save slot 2. - validChunks = 0; + validSectors = 0; signatureValid = FALSE; - for (i = 0; i < ARRAY_COUNT(sSaveBlockChunks); i++) + for (sector = 0; sector < NUM_SECTORS_PER_SAVE_SLOT; sector++) { - DoReadFlashWholeSection(i + ARRAY_COUNT(sSaveBlockChunks), gFastSaveSection); + DoReadFlashWholeSection(NUM_SECTORS_PER_SAVE_SLOT + sector, gFastSaveSection); if (gFastSaveSection->signature == FILE_SIGNATURE) { signatureValid = TRUE; checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); if (gFastSaveSection->checksum == checksum) { - saveSlot2Counter = gFastSaveSection->counter; - validChunks |= 1 << gFastSaveSection->id; + slot2saveCounter = gFastSaveSection->counter; + validSectors |= 1 << gFastSaveSection->id; } } } if (signatureValid) { - if (validChunks == ALL_CHUNKS) + if (validSectors == ALL_SECTORS) slot2Status = SAVE_STATUS_OK; else slot2Status = SAVE_STATUS_ERROR; @@ -544,26 +572,27 @@ static u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) if (slot1Status == SAVE_STATUS_OK && slot2Status == SAVE_STATUS_OK) { - if ((saveSlot1Counter == -1 && saveSlot2Counter == 0) || (saveSlot1Counter == 0 && saveSlot2Counter == -1)) + // Choose counter of the most recent save file + if ((slot1saveCounter == -1 && slot2saveCounter == 0) || (slot1saveCounter == 0 && slot2saveCounter == -1)) { - if ((unsigned)(saveSlot1Counter + 1) < (unsigned)(saveSlot2Counter + 1)) - gSaveCounter = saveSlot2Counter; + if ((unsigned)(slot1saveCounter + 1) < (unsigned)(slot2saveCounter + 1)) + gSaveCounter = slot2saveCounter; else - gSaveCounter = saveSlot1Counter; + gSaveCounter = slot1saveCounter; } else { - if (saveSlot1Counter < saveSlot2Counter) - gSaveCounter = saveSlot2Counter; + if (slot1saveCounter < slot2saveCounter) + gSaveCounter = slot2saveCounter; else - gSaveCounter = saveSlot1Counter; + gSaveCounter = slot1saveCounter; } return SAVE_STATUS_OK; } if (slot1Status == SAVE_STATUS_OK) { - gSaveCounter = saveSlot1Counter; + gSaveCounter = slot1saveCounter; if (slot2Status == SAVE_STATUS_ERROR) return SAVE_STATUS_ERROR; else @@ -572,7 +601,7 @@ static u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) if (slot2Status == SAVE_STATUS_OK) { - gSaveCounter = saveSlot2Counter; + gSaveCounter = slot2saveCounter; if (slot1Status == SAVE_STATUS_ERROR) return SAVE_STATUS_ERROR; else @@ -582,21 +611,21 @@ static u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) if (slot1Status == SAVE_STATUS_EMPTY && slot2Status == SAVE_STATUS_EMPTY) { gSaveCounter = 0; - gLastWrittenSector = 0; + gFirstSaveSector = 0; return SAVE_STATUS_EMPTY; } gSaveCounter = 0; - gLastWrittenSector = 0; + gFirstSaveSector = 0; return 2; } -static u8 sub_8125B88(u8 a1, u8 *data, u16 size) +static u8 ReadSomeUnknownSectorAndVerify(u8 sector, u8 *data, u16 size) { u16 i; - struct SaveSection *section = eSaveSection; + struct SaveSector *section = eSaveSection; - DoReadFlashWholeSection(a1, section); + DoReadFlashWholeSection(sector, section); if (section->signature == FILE_SIGNATURE) { u16 checksum = CalculateChecksum(section->data, size); @@ -604,7 +633,7 @@ static u8 sub_8125B88(u8 a1, u8 *data, u16 size) { for (i = 0; i < size; i++) data[i] = section->data[i]; - return 1; + return SAVE_STATUS_OK; } else { @@ -613,13 +642,13 @@ static u8 sub_8125B88(u8 a1, u8 *data, u16 size) } else { - return 0; + return SAVE_STATUS_EMPTY; } } -static u8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section) +static u8 DoReadFlashWholeSection(u8 sector, struct SaveSector *section) { - ReadFlash(sector, 0, section->data, sizeof(struct SaveSection)); + ReadFlash(sector, 0, section->data, sizeof(struct SaveSector)); return 1; } @@ -640,15 +669,15 @@ u8 Save_WriteDataInternal(u8 saveType) switch (saveType) { - case SAVE_HALL_OF_FAME_ERASE_BEFORE: // wipes all normal save data, then saves hall of fame, unused - for (i = (ARRAY_COUNT(sSaveBlockChunks) * 2 + 0); i < TOTALNUMSECTORS; i++) + case SAVE_HALL_OF_FAME_ERASE_BEFORE: // wipes all hall of fame data, then saves hall of fame. unused + for (i = HALL_OF_FAME_SECTOR; i < TOTAL_FLASH_SECTORS; i++) EraseFlashSector(i); // fall through case SAVE_HALL_OF_FAME: // hall of fame. if (GetGameStat(10) < 999) IncrementGameStat(10); - for (i = 0; i < ARRAY_COUNT(sHallOfFameChunks); i++) - HandleWriteSectorNBytes((ARRAY_COUNT(sSaveBlockChunks) * 2 + 0) + i, sHallOfFameChunks[i].data, sHallOfFameChunks[i].size); + for (i = 0; i < NUM_HALL_OF_FAME_SECTORS; i++) + HandleWriteSectorNBytes(HALL_OF_FAME_SECTOR + i, sHallOfFameChunks[i].data, sHallOfFameChunks[i].size); SaveSerializedGame(); WriteSaveBlockChunks(0xFFFF, sSaveBlockChunks); break; @@ -666,9 +695,10 @@ u8 Save_WriteDataInternal(u8 saveType) SaveSerializedGame(); WriteSaveBlockChunks(0, sSaveBlockChunks); break; - case SAVE_OVERWRITE_DIFFERENT_FILE: // there is a different file, so erase the file and overwrite it completely. - for (i = (ARRAY_COUNT(sSaveBlockChunks) * 2 + 0); i < TOTALNUMSECTORS; i++) - EraseFlashSector(i); // erase HOF. + case SAVE_OVERWRITE_DIFFERENT_FILE: // there is a different file, so overwrite it completely. + // Erase Hall of Fame. + for (i = HALL_OF_FAME_SECTOR; i < TOTAL_FLASH_SECTORS; i++) + EraseFlashSector(i); SaveSerializedGame(); WriteSaveBlockChunks(0xFFFF, sSaveBlockChunks); break; @@ -719,7 +749,7 @@ u8 sub_8125DDC(void) // trade.s save u8 sub_8125E04(void) // trade.s save { - sub_8125758(ARRAY_COUNT(sSaveBlockChunks), sSaveBlockChunks); + WriteSomeFlashByteToPrevSector(ARRAY_COUNT(sSaveBlockChunks), sSaveBlockChunks); if (gDamagedSaveSectors) DoSaveFailedScreen(0); return 0; @@ -736,6 +766,7 @@ u8 sub_8125E2C(void) return 0; } +// something to do with multiplayer. Possibly record mizing? bool8 sub_8125E6C(void) { u8 retVal = FALSE; @@ -743,11 +774,11 @@ bool8 sub_8125E6C(void) if (val <= 4) { sub_812556C(gUnknown_03005EB4 + 1, sSaveBlockChunks); - sub_81257F0(val, sSaveBlockChunks); + WriteSomeFlashByte0x25ToPrevSector(val, sSaveBlockChunks); } else { - sub_81257F0(val, sSaveBlockChunks); + WriteSomeFlashByte0x25ToPrevSector(val, sSaveBlockChunks); retVal = TRUE; } if (gDamagedSaveSectors) @@ -755,7 +786,7 @@ bool8 sub_8125E6C(void) return retVal; } -u8 sub_8125EC8(u8 a1) +u8 Save_LoadGameData(u8 saveType) { u8 result; @@ -765,34 +796,36 @@ u8 sub_8125EC8(u8 a1) return SAVE_STATUS_ERROR; } - switch (a1) + switch (saveType) { - case 0: + case SAVE_NORMAL: default: result = sub_812587C(0xFFFF, sSaveBlockChunks); LoadSerializedGame(); gSaveFileStatus = result; gGameContinueCallback = 0; break; - case 3: - result = sub_8125B88((ARRAY_COUNT(sSaveBlockChunks) * 2 + 0), sHallOfFameChunks[0].data, sHallOfFameChunks[0].size); - if (result == 1) - result = sub_8125B88((ARRAY_COUNT(sSaveBlockChunks) * 2 + 1), sHallOfFameChunks[1].data, sHallOfFameChunks[1].size); + case SAVE_HALL_OF_FAME: + result = ReadSomeUnknownSectorAndVerify(HALL_OF_FAME_SECTOR, sHallOfFameChunks[0].data, sHallOfFameChunks[0].size); + if (result == SAVE_STATUS_OK) + result = ReadSomeUnknownSectorAndVerify(HALL_OF_FAME_SECTOR + 1, sHallOfFameChunks[1].data, sHallOfFameChunks[1].size); break; } return result; } +static const u8 sUnusedFlashSectors[] = { 30, 31 }; + bool8 unref_sub_8125F4C(struct UnkSaveSection *a1) { u16 i; char *raw = (char *)a1; - for (i = 0; i < sizeof(struct SaveSection); i++) + for (i = 0; i < sizeof(struct SaveSector); i++) raw[i] = 0; - ReadFlash(gFlashSectors[0], 0, a1->data, 4096); + ReadFlash(sUnusedFlashSectors[0], 0, a1->data, 4096); if (a1->signature != FILE_SIGNATURE) return FALSE; @@ -803,22 +836,22 @@ bool8 unref_sub_8125F4C(struct UnkSaveSection *a1) u8 unref_sub_8125FA0(void) { u16 i; - u8 v0 = Save_WriteData(0); + u8 status = Save_WriteData(SAVE_NORMAL); for (i = 0; i < 2; i++) - EraseFlashSector(gFlashSectors[i]); + EraseFlashSector(sUnusedFlashSectors[i]); - if (v0 == 255) + if (status == SAVE_STATUS_ERROR) { return 3; } - else if (v0 == 3) + else if (status == 3) { return 2; } else { - sub_8125EC8(0); + Save_LoadGameData(SAVE_NORMAL); return 1; } } @@ -828,7 +861,7 @@ u8 unref_sub_8125FF0(u8 *data, u16 size) u16 i; struct UnkSaveSection *section = (struct UnkSaveSection *)eSaveSection; - for (i = 0; i < sizeof(struct SaveSection); i++) + for (i = 0; i < sizeof(struct SaveSector); i++) ((char *)section)[i] = 0; section->signature = FILE_SIGNATURE; @@ -836,7 +869,7 @@ u8 unref_sub_8125FF0(u8 *data, u16 size) for (i = 0; i < size; i++) section->data[i] = data[i]; - gLastSaveSectorStatus = ProgramFlashSectorAndVerifyNBytes(gFlashSectors[0], section, sizeof(struct SaveSection)); + gLastSaveSectorStatus = ProgramFlashSectorAndVerifyNBytes(sUnusedFlashSectors[0], section, sizeof(struct SaveSector)); if (gLastSaveSectorStatus) return SAVE_STATUS_ERROR; @@ -854,6 +887,6 @@ u8 unref_sub_8126068(u8 sector, u8 *data, u32 size) u8 unref_sub_8126080(u8 sector, u8 *data) { - ReadFlash(sector, 0, data, sizeof(struct SaveSection)); + ReadFlash(sector, 0, data, sizeof(struct SaveSector)); return 1; } diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 9e7e50d43..a9532fd09 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -539,7 +539,7 @@ static void sub_814217C(u8 taskID) ewram1E000(i) = 0; } else - sub_8125EC8(3); + Save_LoadGameData(SAVE_HALL_OF_FAME); for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, lastSavedTeam++) { @@ -840,7 +840,7 @@ void sub_81428CC(void) static void sub_8142A28(u8 taskID) { - if (sub_8125EC8(3) != 1) + if (Save_LoadGameData(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK) gTasks[taskID].func = sub_8142FEC; else { diff --git a/src/scene/intro.c b/src/scene/intro.c index d680e4a98..f7e196133 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -931,7 +931,7 @@ void CB2_InitCopyrightScreenAfterBootup(void) { sub_8052E4C(); Save_ResetSaveCounters(); - sub_8125EC8(0); + Save_LoadGameData(SAVE_NORMAL); if (gSaveFileStatus == 0 || gSaveFileStatus == 2) ClearSav2(); SetPokemonCryStereo(gSaveBlock2.optionsSound); -- cgit v1.2.3 From b9388f078ed95e80ac73b35eeb206e52ce376b0c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 13 Jan 2018 22:38:40 -0600 Subject: format base_stats.h --- src/data/pokemon/base_stats.h | 21389 +++++++++++++++++++++++++--------------- 1 file changed, 13569 insertions(+), 7820 deletions(-) diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 37f59e1c6..be902635e 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -1,7823 +1,13572 @@ -// - -// - -#ifndef POKERUBY_BASE_STATS_H -#define POKERUBY_BASE_STATS_H - -const struct BaseStats gBaseStats[] = { - { // ?????????? - }, { - // Bulbasaur - 45, 49, 49, 45, 65, 65, - TYPE_GRASS, - TYPE_POISON, - 45, // catch rate - 64, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_GRASS, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Ivysaur - 60, 62, 63, 60, 80, 80, - TYPE_GRASS, - TYPE_POISON, - 45, // catch rate - 141, // base exp. yield - 0, 0, 0, 0, 1, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_GRASS, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Venusaur - 80, 82, 83, 80, 100, 100, - TYPE_GRASS, - TYPE_POISON, - 45, // catch rate - 208, // base exp. yield - 0, 0, 0, 0, 2, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_GRASS, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Charmander - 39, 52, 43, 65, 60, 50, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 65, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_DRAGON, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Charmeleon - 58, 64, 58, 80, 80, 65, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 142, // base exp. yield - 0, 0, 0, 1, 1, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_DRAGON, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Charizard - 78, 84, 78, 100, 109, 85, - TYPE_FIRE, - TYPE_FLYING, - 45, // catch rate - 209, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_DRAGON, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Squirtle - 44, 48, 65, 43, 50, 64, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 66, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Wartortle - 59, 63, 80, 58, 65, 80, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 143, // base exp. yield - 0, 0, 1, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Blastoise - 79, 83, 100, 78, 85, 105, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 210, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Caterpie - 45, 30, 35, 45, 20, 20, - TYPE_BUG, - TYPE_BUG, - 255, // catch rate - 53, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHIELD_DUST, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Metapod - 50, 20, 55, 30, 25, 25, - TYPE_BUG, - TYPE_BUG, - 120, // catch rate - 72, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Butterfree - 60, 45, 50, 70, 80, 80, - TYPE_BUG, - TYPE_FLYING, - 45, // catch rate - 160, // base exp. yield - 0, 0, 0, 0, 2, 1, - ITEM_NONE, - ITEM_SILVER_POWDER, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_COMPOUND_EYES, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Weedle - 40, 35, 30, 50, 20, 20, - TYPE_BUG, - TYPE_POISON, - 255, // catch rate - 52, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHIELD_DUST, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Kakuna - 45, 25, 50, 35, 25, 25, - TYPE_BUG, - TYPE_POISON, - 120, // catch rate - 71, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Beedrill - 65, 80, 40, 75, 45, 80, - TYPE_BUG, - TYPE_POISON, - 45, // catch rate - 159, // base exp. yield - 0, 2, 0, 0, 0, 1, - ITEM_NONE, - ITEM_POISON_BARB, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Pidgey - 40, 45, 40, 56, 35, 35, - TYPE_NORMAL, - TYPE_FLYING, - 255, // catch rate - 55, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Pidgeotto - 63, 60, 55, 71, 50, 50, - TYPE_NORMAL, - TYPE_FLYING, - 120, // catch rate - 113, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Pidgeot - 83, 80, 75, 91, 70, 70, - TYPE_NORMAL, - TYPE_FLYING, - 45, // catch rate - 172, // base exp. yield - 0, 0, 0, 3, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Rattata - 30, 56, 35, 72, 25, 35, - TYPE_NORMAL, - TYPE_NORMAL, - 255, // catch rate - 57, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_GUTS, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Raticate - 55, 81, 60, 97, 50, 70, - TYPE_NORMAL, - TYPE_NORMAL, - 127, // catch rate - 116, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_GUTS, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Spearow - 40, 60, 30, 70, 31, 31, - TYPE_NORMAL, - TYPE_FLYING, - 255, // catch rate - 58, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Fearow - 65, 90, 65, 100, 61, 61, - TYPE_NORMAL, - TYPE_FLYING, - 90, // catch rate - 162, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_SHARP_BEAK, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Ekans - 35, 60, 44, 55, 40, 54, - TYPE_POISON, - TYPE_POISON, - 255, // catch rate - 62, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_DRAGON, - ABILITY_INTIMIDATE, - ABILITY_SHED_SKIN, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Arbok - 60, 85, 69, 80, 65, 79, - TYPE_POISON, - TYPE_POISON, - 90, // catch rate - 147, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_DRAGON, - ABILITY_INTIMIDATE, - ABILITY_SHED_SKIN, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Pikachu - 35, 55, 30, 90, 50, 40, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 190, // catch rate - 82, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_ORAN_BERRY, - ITEM_LIGHT_BALL, - 127, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - ABILITY_STATIC, - ABILITY_NONE, - 6, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Raichu - 60, 90, 55, 100, 90, 80, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 75, // catch rate - 122, // base exp. yield - 0, 0, 0, 3, 0, 0, - ITEM_NONE, - ITEM_ORAN_BERRY, - 127, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - ABILITY_STATIC, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Sandshrew - 50, 75, 85, 40, 20, 30, - TYPE_GROUND, - TYPE_GROUND, - 255, // catch rate - 93, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_QUICK_CLAW, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_SAND_VEIL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Sandslash - 75, 100, 110, 65, 45, 55, - TYPE_GROUND, - TYPE_GROUND, - 90, // catch rate - 163, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_QUICK_CLAW, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_SAND_VEIL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Nidoran♀ - 55, 47, 52, 41, 40, 40, - TYPE_POISON, - TYPE_POISON, - 235, // catch rate - 59, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 254, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_POISON_POINT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Nidorina - 70, 62, 67, 56, 55, 55, - TYPE_POISON, - TYPE_POISON, - 120, // catch rate - 117, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 254, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_POISON_POINT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Nidoqueen - 90, 82, 87, 76, 75, 85, - TYPE_POISON, - TYPE_GROUND, - 45, // catch rate - 194, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 254, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_POISON_POINT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Nidoran♂ - 46, 57, 40, 50, 40, 40, - TYPE_POISON, - TYPE_POISON, - 235, // catch rate - 60, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_POISON_POINT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Nidorino - 61, 72, 57, 65, 55, 55, - TYPE_POISON, - TYPE_POISON, - 120, // catch rate - 118, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_POISON_POINT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Nidoking - 81, 92, 77, 85, 85, 75, - TYPE_POISON, - TYPE_GROUND, - 45, // catch rate - 195, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_POISON_POINT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Clefairy - 70, 45, 48, 35, 60, 65, - TYPE_NORMAL, - TYPE_NORMAL, - 150, // catch rate - 68, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_LEPPA_BERRY, - ITEM_MOON_STONE, - 191, // gender - 10, // egg cycles - 140, // base friendship - GROWTH_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Clefable - 95, 70, 73, 60, 85, 90, - TYPE_NORMAL, - TYPE_NORMAL, - 25, // catch rate - 129, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_LEPPA_BERRY, - ITEM_MOON_STONE, - 191, // gender - 10, // egg cycles - 140, // base friendship - GROWTH_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Vulpix - 38, 41, 40, 65, 50, 65, - TYPE_FIRE, - TYPE_FIRE, - 190, // catch rate - 63, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 191, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_FLASH_FIRE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Ninetales - 73, 76, 75, 100, 81, 100, - TYPE_FIRE, - TYPE_FIRE, - 75, // catch rate - 178, // base exp. yield - 0, 0, 0, 1, 0, 1, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 191, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_FLASH_FIRE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Jigglypuff - 115, 45, 20, 20, 45, 25, - TYPE_NORMAL, - TYPE_NORMAL, - 170, // catch rate - 76, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 191, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Wigglytuff - 140, 70, 45, 45, 75, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 50, // catch rate - 109, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 191, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Zubat - 40, 45, 35, 55, 30, 40, - TYPE_POISON, - TYPE_FLYING, - 255, // catch rate - 54, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_INNER_FOCUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Golbat - 75, 80, 70, 90, 65, 75, - TYPE_POISON, - TYPE_FLYING, - 90, // catch rate - 171, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_INNER_FOCUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Oddish - 45, 50, 55, 30, 75, 65, - TYPE_GRASS, - TYPE_POISON, - 255, // catch rate - 78, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 4, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Gloom - 60, 65, 70, 40, 85, 75, - TYPE_GRASS, - TYPE_POISON, - 120, // catch rate - 132, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 6, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Vileplume - 75, 80, 85, 50, 100, 90, - TYPE_GRASS, - TYPE_POISON, - 45, // catch rate - 184, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Paras - 35, 70, 55, 25, 45, 55, - TYPE_BUG, - TYPE_GRASS, - 190, // catch rate - 70, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_TINY_MUSHROOM, - ITEM_BIG_MUSHROOM, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_GRASS, - ABILITY_EFFECT_SPORE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Parasect - 60, 95, 80, 30, 60, 80, - TYPE_BUG, - TYPE_GRASS, - 75, // catch rate - 128, // base exp. yield - 0, 2, 1, 0, 0, 0, - ITEM_TINY_MUSHROOM, - ITEM_BIG_MUSHROOM, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_GRASS, - ABILITY_EFFECT_SPORE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Venonat - 60, 55, 50, 45, 40, 55, - TYPE_BUG, - TYPE_POISON, - 190, // catch rate - 75, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_COMPOUND_EYES, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Venomoth - 70, 65, 60, 90, 90, 75, - TYPE_BUG, - TYPE_POISON, - 75, // catch rate - 138, // base exp. yield - 0, 0, 0, 1, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHIELD_DUST, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Diglett - 10, 55, 25, 95, 35, 45, - TYPE_GROUND, - TYPE_GROUND, - 255, // catch rate - 81, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_SAND_VEIL, - ABILITY_ARENA_TRAP, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Dugtrio - 35, 80, 50, 120, 50, 70, - TYPE_GROUND, - TYPE_GROUND, - 50, // catch rate - 153, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_SAND_VEIL, - ABILITY_ARENA_TRAP, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Meowth - 40, 45, 35, 90, 40, 40, - TYPE_NORMAL, - TYPE_NORMAL, - 255, // catch rate - 69, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_PICKUP, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Persian - 65, 70, 60, 115, 65, 65, - TYPE_NORMAL, - TYPE_NORMAL, - 90, // catch rate - 148, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_LIMBER, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Psyduck - 50, 52, 48, 55, 65, 50, - TYPE_WATER, - TYPE_WATER, - 190, // catch rate - 80, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_DAMP, - ABILITY_CLOUD_NINE, - 6, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Golduck - 80, 82, 78, 85, 95, 80, - TYPE_WATER, - TYPE_WATER, - 75, // catch rate - 174, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_DAMP, - ABILITY_CLOUD_NINE, - 8, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Mankey - 40, 80, 35, 70, 35, 45, - TYPE_FIGHTING, - TYPE_FIGHTING, - 190, // catch rate - 74, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_VITAL_SPIRIT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Primeape - 65, 105, 60, 95, 60, 70, - TYPE_FIGHTING, - TYPE_FIGHTING, - 75, // catch rate - 149, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_VITAL_SPIRIT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Growlithe - 55, 70, 45, 60, 70, 50, - TYPE_FIRE, - TYPE_FIRE, - 190, // catch rate - 91, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_INTIMIDATE, - ABILITY_FLASH_FIRE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Arcanine - 90, 110, 80, 95, 100, 80, - TYPE_FIRE, - TYPE_FIRE, - 75, // catch rate - 213, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_INTIMIDATE, - ABILITY_FLASH_FIRE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Poliwag - 40, 50, 40, 90, 40, 40, - TYPE_WATER, - TYPE_WATER, - 255, // catch rate - 77, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_WATER_ABSORB, - ABILITY_DAMP, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE, TRUE - }, { // Poliwhirl - 65, 65, 65, 90, 50, 50, - TYPE_WATER, - TYPE_WATER, - 120, // catch rate - 131, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_KINGS_ROCK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_WATER_ABSORB, - ABILITY_DAMP, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE, TRUE - }, { // Poliwrath - 90, 85, 95, 70, 70, 90, - TYPE_WATER, - TYPE_FIGHTING, - 45, // catch rate - 185, // base exp. yield - 0, 0, 3, 0, 0, 0, - ITEM_NONE, - ITEM_KINGS_ROCK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_WATER_ABSORB, - ABILITY_DAMP, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE, TRUE - }, { // Abra - 25, 20, 15, 90, 105, 55, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 200, // catch rate - 73, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_TWISTED_SPOON, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_SYNCHRONIZE, - ABILITY_INNER_FOCUS, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Kadabra - 40, 35, 30, 105, 120, 70, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 100, // catch rate - 145, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_TWISTED_SPOON, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_SYNCHRONIZE, - ABILITY_INNER_FOCUS, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Alakazam - 55, 50, 45, 120, 135, 85, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 50, // catch rate - 186, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_TWISTED_SPOON, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_SYNCHRONIZE, - ABILITY_INNER_FOCUS, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Machop - 70, 80, 50, 35, 35, 35, - TYPE_FIGHTING, - TYPE_FIGHTING, - 180, // catch rate - 88, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Machoke - 80, 100, 70, 45, 50, 60, - TYPE_FIGHTING, - TYPE_FIGHTING, - 90, // catch rate - 146, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Machamp - 90, 130, 80, 55, 65, 85, - TYPE_FIGHTING, - TYPE_FIGHTING, - 45, // catch rate - 193, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Bellsprout - 50, 75, 35, 40, 70, 30, - TYPE_GRASS, - TYPE_POISON, - 255, // catch rate - 84, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Weepinbell - 65, 90, 50, 55, 85, 45, - TYPE_GRASS, - TYPE_POISON, - 120, // catch rate - 151, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Victreebel - 80, 105, 65, 70, 100, 60, - TYPE_GRASS, - TYPE_POISON, - 45, // catch rate - 191, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Tentacool - 40, 40, 35, 70, 50, 100, - TYPE_WATER, - TYPE_POISON, - 190, // catch rate - 105, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_CLEAR_BODY, - ABILITY_LIQUID_OOZE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Tentacruel - 80, 70, 65, 100, 80, 120, - TYPE_WATER, - TYPE_POISON, - 60, // catch rate - 205, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_CLEAR_BODY, - ABILITY_LIQUID_OOZE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Geodude - 40, 80, 100, 20, 30, 30, - TYPE_ROCK, - TYPE_GROUND, - 255, // catch rate - 86, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_EVERSTONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_ROCK_HEAD, - ABILITY_STURDY, - 4, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Graveler - 55, 95, 115, 35, 45, 45, - TYPE_ROCK, - TYPE_GROUND, - 120, // catch rate - 134, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_EVERSTONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_ROCK_HEAD, - ABILITY_STURDY, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Golem - 80, 110, 130, 45, 55, 65, - TYPE_ROCK, - TYPE_GROUND, - 45, // catch rate - 177, // base exp. yield - 0, 0, 3, 0, 0, 0, - ITEM_NONE, - ITEM_EVERSTONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_ROCK_HEAD, - ABILITY_STURDY, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Ponyta - 50, 85, 55, 90, 65, 65, - TYPE_FIRE, - TYPE_FIRE, - 190, // catch rate - 152, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_FLASH_FIRE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Rapidash - 65, 100, 70, 105, 80, 80, - TYPE_FIRE, - TYPE_FIRE, - 60, // catch rate - 192, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_FLASH_FIRE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Slowpoke - 90, 65, 65, 15, 40, 40, - TYPE_WATER, - TYPE_PSYCHIC, - 190, // catch rate - 99, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_KINGS_ROCK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_OBLIVIOUS, - ABILITY_OWN_TEMPO, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Slowbro - 95, 75, 110, 30, 100, 80, - TYPE_WATER, - TYPE_PSYCHIC, - 75, // catch rate - 164, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_KINGS_ROCK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_OBLIVIOUS, - ABILITY_OWN_TEMPO, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Magnemite - 25, 35, 70, 45, 95, 55, - TYPE_ELECTRIC, - TYPE_STEEL, - 190, // catch rate - 89, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_METAL_COAT, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_MAGNET_PULL, - ABILITY_STURDY, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Magneton - 50, 60, 95, 70, 120, 70, - TYPE_ELECTRIC, - TYPE_STEEL, - 60, // catch rate - 161, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_METAL_COAT, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_MAGNET_PULL, - ABILITY_STURDY, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Farfetch'd - 52, 65, 55, 60, 58, 62, - TYPE_NORMAL, - TYPE_FLYING, - 45, // catch rate - 94, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_STICK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FIELD, - ABILITY_KEEN_EYE, - ABILITY_INNER_FOCUS, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Doduo - 35, 85, 45, 75, 35, 35, - TYPE_NORMAL, - TYPE_FLYING, - 190, // catch rate - 96, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_SHARP_BEAK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_RUN_AWAY, - ABILITY_EARLY_BIRD, - 8, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Dodrio - 60, 110, 70, 100, 60, 60, - TYPE_NORMAL, - TYPE_FLYING, - 45, // catch rate - 158, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_SHARP_BEAK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_RUN_AWAY, - ABILITY_EARLY_BIRD, - 10, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Seel - 65, 45, 55, 45, 45, 70, - TYPE_WATER, - TYPE_WATER, - 190, // catch rate - 100, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Dewgong - 90, 70, 80, 70, 70, 95, - TYPE_WATER, - TYPE_ICE, - 75, // catch rate - 176, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Grimer - 80, 80, 50, 25, 40, 50, - TYPE_POISON, - TYPE_POISON, - 190, // catch rate - 90, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NUGGET, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_STENCH, - ABILITY_STICKY_HOLD, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Muk - 105, 105, 75, 50, 65, 100, - TYPE_POISON, - TYPE_POISON, - 75, // catch rate - 157, // base exp. yield - 1, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NUGGET, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_STENCH, - ABILITY_STICKY_HOLD, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Shellder - 30, 65, 100, 40, 45, 25, - TYPE_WATER, - TYPE_WATER, - 190, // catch rate - 97, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_PEARL, - ITEM_BIG_PEARL, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_SHELL_ARMOR, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Cloyster - 50, 95, 180, 70, 85, 45, - TYPE_WATER, - TYPE_ICE, - 60, // catch rate - 203, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_PEARL, - ITEM_BIG_PEARL, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_SHELL_ARMOR, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Gastly - 30, 35, 30, 80, 100, 35, - TYPE_GHOST, - TYPE_POISON, - 190, // catch rate - 95, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Haunter - 45, 50, 45, 95, 115, 55, - TYPE_GHOST, - TYPE_POISON, - 90, // catch rate - 126, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Gengar - 60, 65, 60, 110, 130, 75, - TYPE_GHOST, - TYPE_POISON, - 45, // catch rate - 190, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Onix - 35, 45, 160, 70, 30, 45, - TYPE_ROCK, - TYPE_GROUND, - 45, // catch rate - 108, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_ROCK_HEAD, - ABILITY_STURDY, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Drowzee - 60, 48, 45, 42, 43, 90, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 190, // catch rate - 102, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_INSOMNIA, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Hypno - 85, 73, 70, 67, 73, 115, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 75, // catch rate - 165, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_INSOMNIA, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Krabby - 30, 105, 90, 50, 25, 25, - TYPE_WATER, - TYPE_WATER, - 225, // catch rate - 115, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_HYPER_CUTTER, - ABILITY_SHELL_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Kingler - 55, 130, 115, 75, 50, 50, - TYPE_WATER, - TYPE_WATER, - 60, // catch rate - 206, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_HYPER_CUTTER, - ABILITY_SHELL_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_RED, TRUE - }, { // Voltorb - 40, 30, 50, 100, 55, 55, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 190, // catch rate - 103, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_SOUNDPROOF, - ABILITY_STATIC, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Electrode - 60, 50, 70, 140, 80, 80, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 60, // catch rate - 150, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_SOUNDPROOF, - ABILITY_STATIC, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Exeggcute - 60, 40, 80, 40, 60, 45, - TYPE_GRASS, - TYPE_PSYCHIC, - 90, // catch rate - 98, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Exeggutor - 95, 95, 85, 55, 125, 65, - TYPE_GRASS, - TYPE_PSYCHIC, - 45, // catch rate - 212, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Cubone - 50, 50, 95, 35, 40, 50, - TYPE_GROUND, - TYPE_GROUND, - 190, // catch rate - 87, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_THICK_CLUB, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_ROCK_HEAD, - ABILITY_LIGHTNING_ROD, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Marowak - 60, 80, 110, 45, 50, 80, - TYPE_GROUND, - TYPE_GROUND, - 75, // catch rate - 124, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_THICK_CLUB, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_ROCK_HEAD, - ABILITY_LIGHTNING_ROD, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Hitmonlee - 50, 120, 53, 87, 35, 110, - TYPE_FIGHTING, - TYPE_FIGHTING, - 45, // catch rate - 139, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_LIMBER, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Hitmonchan - 50, 105, 79, 76, 35, 110, - TYPE_FIGHTING, - TYPE_FIGHTING, - 45, // catch rate - 140, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Lickitung - 90, 55, 75, 30, 60, 75, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 127, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_OWN_TEMPO, - ABILITY_OBLIVIOUS, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Koffing - 40, 65, 95, 35, 60, 45, - TYPE_POISON, - TYPE_POISON, - 190, // catch rate - 114, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_SMOKE_BALL, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Weezing - 65, 90, 120, 60, 85, 70, - TYPE_POISON, - TYPE_POISON, - 60, // catch rate - 173, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_SMOKE_BALL, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Rhyhorn - 80, 85, 95, 25, 30, 30, - TYPE_GROUND, - TYPE_ROCK, - 120, // catch rate - 135, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_LIGHTNING_ROD, - ABILITY_ROCK_HEAD, - 4, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Rhydon - 105, 130, 120, 40, 45, 45, - TYPE_GROUND, - TYPE_ROCK, - 60, // catch rate - 204, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_LIGHTNING_ROD, - ABILITY_ROCK_HEAD, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Chansey - 250, 5, 5, 50, 35, 105, - TYPE_NORMAL, - TYPE_NORMAL, - 30, // catch rate - 255, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_LUCKY_EGG, - 254, // gender - 40, // egg cycles - 140, // base friendship - GROWTH_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_NATURAL_CURE, - ABILITY_SERENE_GRACE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Tangela - 65, 55, 115, 60, 100, 40, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 166, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Kangaskhan - 105, 95, 80, 90, 40, 80, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 175, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 254, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_EARLY_BIRD, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Horsea - 30, 40, 70, 60, 70, 25, - TYPE_WATER, - TYPE_WATER, - 225, // catch rate - 83, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Seadra - 55, 65, 95, 85, 95, 45, - TYPE_WATER, - TYPE_WATER, - 75, // catch rate - 155, // base exp. yield - 0, 0, 1, 0, 1, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_POISON_POINT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Goldeen - 45, 67, 60, 63, 35, 50, - TYPE_WATER, - TYPE_WATER, - 225, // catch rate - 111, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_SWIFT_SWIM, - ABILITY_WATER_VEIL, - 4, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Seaking - 80, 92, 65, 68, 65, 80, - TYPE_WATER, - TYPE_WATER, - 60, // catch rate - 170, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_SWIFT_SWIM, - ABILITY_WATER_VEIL, - 6, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Staryu - 30, 45, 55, 85, 70, 55, - TYPE_WATER, - TYPE_WATER, - 225, // catch rate - 106, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_STARDUST, - ITEM_STAR_PIECE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_ILLUMINATE, - ABILITY_NATURAL_CURE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Starmie - 60, 75, 85, 115, 100, 85, - TYPE_WATER, - TYPE_PSYCHIC, - 60, // catch rate - 207, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_STARDUST, - ITEM_STAR_PIECE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_ILLUMINATE, - ABILITY_NATURAL_CURE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Mr. mime - 40, 45, 65, 90, 100, 120, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 45, // catch rate - 136, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_LEPPA_BERRY, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_SOUNDPROOF, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Scyther - 70, 110, 80, 105, 55, 80, - TYPE_BUG, - TYPE_FLYING, - 45, // catch rate - 187, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Jynx - 65, 50, 35, 95, 115, 95, - TYPE_ICE, - TYPE_PSYCHIC, - 45, // catch rate - 137, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_ASPEAR_BERRY, - ITEM_ASPEAR_BERRY, - 254, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Electabuzz - 65, 83, 57, 105, 95, 85, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 45, // catch rate - 156, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 63, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_STATIC, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW, TRUE - }, { // Magmar - 65, 95, 57, 93, 100, 85, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 167, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 63, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_FLAME_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Pinsir - 65, 125, 100, 85, 55, 70, - TYPE_BUG, - TYPE_BUG, - 45, // catch rate - 200, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_HYPER_CUTTER, - ABILITY_NONE, - 8, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Tauros - 75, 100, 95, 110, 40, 70, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 211, // base exp. yield - 0, 1, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_INTIMIDATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Magikarp - 20, 10, 55, 80, 15, 20, - TYPE_WATER, - TYPE_WATER, - 255, // catch rate - 20, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 5, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_2, - EGG_GROUP_DRAGON, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 4, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Gyarados - 95, 125, 79, 81, 60, 100, - TYPE_WATER, - TYPE_FLYING, - 45, // catch rate - 214, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 5, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_2, - EGG_GROUP_DRAGON, - ABILITY_INTIMIDATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Lapras - 130, 85, 80, 60, 85, 95, - TYPE_WATER, - TYPE_ICE, - 45, // catch rate - 219, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 40, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_WATER_ABSORB, - ABILITY_SHELL_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Ditto - 48, 48, 48, 48, 48, 48, - TYPE_NORMAL, - TYPE_NORMAL, - 35, // catch rate - 61, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_METAL_POWDER, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_DITTO, - EGG_GROUP_DITTO, - ABILITY_LIMBER, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Eevee - 55, 55, 50, 55, 45, 65, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 92, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 35, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Vaporeon - 130, 65, 60, 65, 110, 95, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 196, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 35, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_WATER_ABSORB, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Jolteon - 65, 65, 60, 130, 110, 95, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 45, // catch rate - 197, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 35, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_VOLT_ABSORB, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Flareon - 65, 130, 60, 65, 95, 110, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 198, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 35, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_FLASH_FIRE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Porygon - 65, 60, 70, 40, 85, 75, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 130, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_TRACE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Omanyte - 35, 40, 100, 35, 90, 55, - TYPE_ROCK, - TYPE_WATER, - 45, // catch rate - 120, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_3, - ABILITY_SWIFT_SWIM, - ABILITY_SHELL_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Omastar - 70, 60, 125, 55, 115, 70, - TYPE_ROCK, - TYPE_WATER, - 45, // catch rate - 199, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_3, - ABILITY_SWIFT_SWIM, - ABILITY_SHELL_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Kabuto - 30, 80, 90, 55, 55, 45, - TYPE_ROCK, - TYPE_WATER, - 45, // catch rate - 119, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_3, - ABILITY_SWIFT_SWIM, - ABILITY_BATTLE_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Kabutops - 60, 115, 105, 80, 65, 70, - TYPE_ROCK, - TYPE_WATER, - 45, // catch rate - 201, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_3, - ABILITY_SWIFT_SWIM, - ABILITY_BATTLE_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Aerodactyl - 80, 105, 65, 130, 60, 75, - TYPE_ROCK, - TYPE_FLYING, - 45, // catch rate - 202, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 35, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_ROCK_HEAD, - ABILITY_PRESSURE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Snorlax - 160, 110, 65, 30, 65, 110, - TYPE_NORMAL, - TYPE_NORMAL, - 25, // catch rate - 154, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_LEFTOVERS, - ITEM_LEFTOVERS, - 31, // gender - 40, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_IMMUNITY, - ABILITY_THICK_FAT, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Articuno - 90, 85, 100, 85, 95, 125, - TYPE_ICE, - TYPE_FLYING, - 3, // catch rate - 215, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Zapdos - 90, 90, 85, 100, 125, 90, - TYPE_ELECTRIC, - TYPE_FLYING, - 3, // catch rate - 216, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Moltres - 90, 100, 90, 90, 125, 85, - TYPE_FIRE, - TYPE_FLYING, - 3, // catch rate - 217, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Dratini - 41, 64, 45, 50, 50, 50, - TYPE_DRAGON, - TYPE_DRAGON, - 45, // catch rate - 67, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Dragonair - 61, 84, 65, 70, 70, 70, - TYPE_DRAGON, - TYPE_DRAGON, - 45, // catch rate - 144, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Dragonite - 91, 134, 95, 80, 100, 100, - TYPE_DRAGON, - TYPE_FLYING, - 45, // catch rate - 218, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_INNER_FOCUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Mewtwo - 106, 110, 90, 130, 154, 90, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 3, // catch rate - 220, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Mew - 100, 100, 100, 100, 100, 100, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 45, // catch rate - 64, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_LUM_BERRY, - ITEM_LUM_BERRY, - 255, // gender - 120, // egg cycles - 100, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_SYNCHRONIZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Chikorita - 45, 49, 65, 45, 49, 65, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 64, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_GRASS, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Bayleef - 60, 62, 80, 60, 63, 80, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 141, // base exp. yield - 0, 0, 1, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_GRASS, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Meganium - 80, 82, 100, 80, 83, 100, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 208, // base exp. yield - 0, 0, 1, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_GRASS, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Cyndaquil - 39, 52, 43, 65, 60, 50, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 65, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Quilava - 58, 64, 58, 80, 80, 65, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 142, // base exp. yield - 0, 0, 0, 1, 1, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Typhlosion - 78, 84, 78, 100, 109, 85, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 209, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Totodile - 50, 65, 64, 43, 44, 48, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 66, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Croconaw - 65, 80, 80, 58, 59, 63, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 143, // base exp. yield - 0, 1, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE, TRUE - }, { // Feraligatr - 85, 105, 100, 78, 79, 83, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 210, // base exp. yield - 0, 2, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Sentret - 35, 46, 34, 20, 35, 45, - TYPE_NORMAL, - TYPE_NORMAL, - 255, // catch rate - 57, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_ORAN_BERRY, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_KEEN_EYE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Furret - 85, 76, 64, 90, 45, 55, - TYPE_NORMAL, - TYPE_NORMAL, - 90, // catch rate - 116, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_ORAN_BERRY, - ITEM_SITRUS_BERRY, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_KEEN_EYE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Hoothoot - 60, 30, 30, 50, 36, 56, - TYPE_NORMAL, - TYPE_FLYING, - 255, // catch rate - 58, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_INSOMNIA, - ABILITY_KEEN_EYE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Noctowl - 100, 50, 50, 70, 76, 96, - TYPE_NORMAL, - TYPE_FLYING, - 90, // catch rate - 162, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_INSOMNIA, - ABILITY_KEEN_EYE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Ledyba - 40, 20, 30, 55, 40, 80, - TYPE_BUG, - TYPE_FLYING, - 255, // catch rate - 54, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_EARLY_BIRD, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Ledian - 55, 35, 50, 85, 55, 110, - TYPE_BUG, - TYPE_FLYING, - 90, // catch rate - 134, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_EARLY_BIRD, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Spinarak - 40, 60, 40, 30, 40, 40, - TYPE_BUG, - TYPE_POISON, - 255, // catch rate - 54, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_INSOMNIA, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Ariados - 70, 90, 70, 40, 60, 60, - TYPE_BUG, - TYPE_POISON, - 90, // catch rate - 134, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_INSOMNIA, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Crobat - 85, 90, 80, 130, 70, 80, - TYPE_POISON, - TYPE_FLYING, - 90, // catch rate - 204, // base exp. yield - 0, 0, 0, 3, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_INNER_FOCUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Chinchou - 75, 38, 38, 67, 56, 56, - TYPE_WATER, - TYPE_ELECTRIC, - 190, // catch rate - 90, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_YELLOW_SHARD, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_VOLT_ABSORB, - ABILITY_ILLUMINATE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Lanturn - 125, 58, 58, 67, 76, 76, - TYPE_WATER, - TYPE_ELECTRIC, - 75, // catch rate - 156, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_YELLOW_SHARD, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_VOLT_ABSORB, - ABILITY_ILLUMINATE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Pichu - 20, 40, 15, 60, 35, 35, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 190, // catch rate - 42, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_ORAN_BERRY, - 127, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_STATIC, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Cleffa - 50, 25, 28, 15, 45, 55, - TYPE_NORMAL, - TYPE_NORMAL, - 150, // catch rate - 37, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_LEPPA_BERRY, - ITEM_MOON_STONE, - 191, // gender - 10, // egg cycles - 140, // base friendship - GROWTH_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Igglybuff - 90, 30, 15, 15, 40, 20, - TYPE_NORMAL, - TYPE_NORMAL, - 170, // catch rate - 39, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 191, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK, TRUE - }, { // Togepi - 35, 20, 65, 20, 40, 65, - TYPE_NORMAL, - TYPE_NORMAL, - 190, // catch rate - 74, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_HUSTLE, - ABILITY_SERENE_GRACE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Togetic - 55, 40, 85, 40, 80, 105, - TYPE_NORMAL, - TYPE_FLYING, - 75, // catch rate - 114, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FAIRY, - ABILITY_HUSTLE, - ABILITY_SERENE_GRACE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Natu - 40, 50, 45, 70, 70, 45, - TYPE_PSYCHIC, - TYPE_FLYING, - 190, // catch rate - 73, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_SYNCHRONIZE, - ABILITY_EARLY_BIRD, - 6, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Xatu - 65, 75, 70, 95, 95, 70, - TYPE_PSYCHIC, - TYPE_FLYING, - 75, // catch rate - 171, // base exp. yield - 0, 0, 0, 1, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_SYNCHRONIZE, - ABILITY_EARLY_BIRD, - 8, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Mareep - 55, 40, 40, 35, 65, 45, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 235, // catch rate - 59, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_STATIC, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Flaaffy - 70, 55, 55, 45, 80, 60, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 120, // catch rate - 117, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_STATIC, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Ampharos - 90, 75, 75, 55, 115, 90, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 45, // catch rate - 194, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_STATIC, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Bellossom - 75, 80, 85, 50, 90, 100, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 184, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Marill - 70, 20, 50, 40, 20, 50, - TYPE_WATER, - TYPE_WATER, - 190, // catch rate - 58, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FAIRY, - ABILITY_THICK_FAT, - ABILITY_HUGE_POWER, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Azumarill - 100, 50, 80, 50, 50, 80, - TYPE_WATER, - TYPE_WATER, - 75, // catch rate - 153, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FAIRY, - ABILITY_THICK_FAT, - ABILITY_HUGE_POWER, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Sudowoodo - 70, 100, 115, 30, 30, 65, - TYPE_ROCK, - TYPE_ROCK, - 65, // catch rate - 135, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_STURDY, - ABILITY_ROCK_HEAD, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Politoed - 90, 75, 75, 70, 90, 100, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 185, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_KINGS_ROCK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_WATER_ABSORB, - ABILITY_DAMP, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN, TRUE - }, { // Hoppip - 35, 35, 40, 50, 35, 55, - TYPE_GRASS, - TYPE_FLYING, - 255, // catch rate - 74, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FAIRY, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Skiploom - 55, 45, 50, 80, 45, 65, - TYPE_GRASS, - TYPE_FLYING, - 120, // catch rate - 136, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FAIRY, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Jumpluff - 75, 55, 70, 110, 55, 85, - TYPE_GRASS, - TYPE_FLYING, - 45, // catch rate - 176, // base exp. yield - 0, 0, 0, 3, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FAIRY, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Aipom - 55, 70, 55, 85, 40, 55, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 94, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_PICKUP, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Sunkern - 30, 30, 30, 30, 30, 30, - TYPE_GRASS, - TYPE_GRASS, - 235, // catch rate - 52, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Sunflora - 75, 75, 55, 30, 105, 85, - TYPE_GRASS, - TYPE_GRASS, - 120, // catch rate - 146, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Yanma - 65, 65, 45, 95, 75, 45, - TYPE_BUG, - TYPE_FLYING, - 75, // catch rate - 147, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SPEED_BOOST, - ABILITY_COMPOUND_EYES, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Wooper - 55, 45, 45, 15, 25, 25, - TYPE_WATER, - TYPE_GROUND, - 255, // catch rate - 52, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_DAMP, - ABILITY_WATER_ABSORB, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Quagsire - 95, 85, 85, 35, 65, 65, - TYPE_WATER, - TYPE_GROUND, - 90, // catch rate - 137, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_DAMP, - ABILITY_WATER_ABSORB, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Espeon - 65, 65, 60, 110, 130, 95, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 45, // catch rate - 197, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 35, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_SYNCHRONIZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Umbreon - 95, 65, 110, 65, 60, 130, - TYPE_DARK, - TYPE_DARK, - 45, // catch rate - 197, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 35, // egg cycles - 35, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_SYNCHRONIZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Murkrow - 60, 85, 42, 91, 85, 42, - TYPE_DARK, - TYPE_FLYING, - 30, // catch rate - 107, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_INSOMNIA, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Slowking - 95, 75, 80, 30, 100, 110, - TYPE_WATER, - TYPE_PSYCHIC, - 70, // catch rate - 164, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_KINGS_ROCK, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_OBLIVIOUS, - ABILITY_OWN_TEMPO, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Misdreavus - 60, 60, 60, 85, 85, 85, - TYPE_GHOST, - TYPE_GHOST, - 45, // catch rate - 147, // base exp. yield - 0, 0, 0, 0, 1, 1, - ITEM_NONE, - ITEM_SPELL_TAG, - 127, // gender - 25, // egg cycles - 35, // base friendship - GROWTH_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Unown - 48, 72, 48, 48, 72, 48, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 225, // catch rate - 61, // base exp. yield - 0, 1, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 40, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK, TRUE - }, { // Wobbuffet - 190, 33, 58, 33, 33, 58, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 45, // catch rate - 177, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_SHADOW_TAG, - ABILITY_NONE, - 4, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Girafarig - 70, 80, 65, 85, 90, 65, - TYPE_NORMAL, - TYPE_PSYCHIC, - 60, // catch rate - 149, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_PERSIM_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_INNER_FOCUS, - ABILITY_EARLY_BIRD, - 4, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Pineco - 50, 65, 90, 15, 35, 35, - TYPE_BUG, - TYPE_BUG, - 190, // catch rate - 60, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_STURDY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Forretress - 75, 90, 140, 40, 60, 60, - TYPE_BUG, - TYPE_STEEL, - 75, // catch rate - 118, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_STURDY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Dunsparce - 100, 70, 70, 45, 65, 65, - TYPE_NORMAL, - TYPE_NORMAL, - 190, // catch rate - 75, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_SERENE_GRACE, - ABILITY_RUN_AWAY, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Gligar - 65, 75, 105, 85, 35, 65, - TYPE_GROUND, - TYPE_FLYING, - 60, // catch rate - 108, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_HYPER_CUTTER, - ABILITY_SAND_VEIL, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Steelix - 75, 85, 200, 30, 55, 65, - TYPE_STEEL, - TYPE_GROUND, - 25, // catch rate - 196, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_METAL_COAT, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_ROCK_HEAD, - ABILITY_STURDY, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Snubbull - 60, 80, 50, 30, 40, 40, - TYPE_NORMAL, - TYPE_NORMAL, - 190, // catch rate - 63, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 191, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - ABILITY_INTIMIDATE, - ABILITY_RUN_AWAY, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Granbull - 90, 120, 75, 45, 60, 60, - TYPE_NORMAL, - TYPE_NORMAL, - 75, // catch rate - 178, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 191, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - ABILITY_INTIMIDATE, - ABILITY_INTIMIDATE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Qwilfish - 65, 95, 75, 85, 55, 55, - TYPE_WATER, - TYPE_POISON, - 45, // catch rate - 100, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_POISON_POINT, - ABILITY_SWIFT_SWIM, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Scizor - 70, 130, 100, 65, 55, 80, - TYPE_BUG, - TYPE_STEEL, - 25, // catch rate - 200, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Shuckle - 20, 10, 230, 5, 10, 230, - TYPE_BUG, - TYPE_ROCK, - 190, // catch rate - 80, // base exp. yield - 0, 0, 1, 0, 0, 1, - ITEM_ORAN_BERRY, - ITEM_ORAN_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_STURDY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Heracross - 80, 125, 75, 85, 40, 95, - TYPE_BUG, - TYPE_FIGHTING, - 45, // catch rate - 200, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_GUTS, - 8, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Sneasel - 55, 95, 55, 115, 35, 75, - TYPE_DARK, - TYPE_ICE, - 60, // catch rate - 132, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_QUICK_CLAW, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_INNER_FOCUS, - ABILITY_KEEN_EYE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK, TRUE - }, { // Teddiursa - 60, 80, 50, 40, 50, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 120, // catch rate - 124, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_PICKUP, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN, TRUE - }, { // Ursaring - 90, 130, 75, 55, 75, 75, - TYPE_NORMAL, - TYPE_NORMAL, - 60, // catch rate - 189, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Slugma - 40, 40, 40, 20, 70, 40, - TYPE_FIRE, - TYPE_FIRE, - 190, // catch rate - 78, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_MAGMA_ARMOR, - ABILITY_FLAME_BODY, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Magcargo - 50, 50, 120, 30, 80, 80, - TYPE_FIRE, - TYPE_ROCK, - 75, // catch rate - 154, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_MAGMA_ARMOR, - ABILITY_FLAME_BODY, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Swinub - 50, 50, 40, 50, 30, 30, - TYPE_ICE, - TYPE_GROUND, - 225, // catch rate - 78, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Piloswine - 100, 100, 80, 50, 60, 60, - TYPE_ICE, - TYPE_GROUND, - 75, // catch rate - 160, // base exp. yield - 1, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Corsola - 55, 55, 85, 35, 65, 85, - TYPE_WATER, - TYPE_ROCK, - 60, // catch rate - 113, // base exp. yield - 0, 0, 1, 0, 0, 1, - ITEM_NONE, - ITEM_RED_SHARD, - 191, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_3, - ABILITY_HUSTLE, - ABILITY_NATURAL_CURE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Remoraid - 35, 65, 35, 65, 65, 35, - TYPE_WATER, - TYPE_WATER, - 190, // catch rate - 78, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_2, - ABILITY_HUSTLE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Octillery - 75, 105, 75, 45, 105, 75, - TYPE_WATER, - TYPE_WATER, - 75, // catch rate - 164, // base exp. yield - 0, 1, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_2, - ABILITY_SUCTION_CUPS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Delibird - 45, 55, 45, 75, 65, 45, - TYPE_ICE, - TYPE_FLYING, - 45, // catch rate - 183, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_VITAL_SPIRIT, - ABILITY_HUSTLE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Mantine - 65, 40, 70, 70, 80, 140, - TYPE_WATER, - TYPE_FLYING, - 25, // catch rate - 168, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_SWIFT_SWIM, - ABILITY_WATER_ABSORB, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Skarmory - 65, 80, 140, 70, 40, 70, - TYPE_STEEL, - TYPE_FLYING, - 25, // catch rate - 168, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_STURDY, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Houndour - 45, 60, 30, 65, 80, 50, - TYPE_DARK, - TYPE_FIRE, - 120, // catch rate - 114, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_EARLY_BIRD, - ABILITY_FLASH_FIRE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Houndoom - 75, 90, 50, 95, 110, 80, - TYPE_DARK, - TYPE_FIRE, - 45, // catch rate - 204, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_EARLY_BIRD, - ABILITY_FLASH_FIRE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Kingdra - 75, 95, 95, 85, 95, 95, - TYPE_WATER, - TYPE_DRAGON, - 45, // catch rate - 207, // base exp. yield - 0, 1, 0, 0, 1, 1, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Phanpy - 90, 60, 60, 40, 40, 40, - TYPE_GROUND, - TYPE_GROUND, - 120, // catch rate - 124, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_PICKUP, - ABILITY_NONE, - 10, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Donphan - 90, 120, 120, 50, 60, 60, - TYPE_GROUND, - TYPE_GROUND, - 60, // catch rate - 189, // base exp. yield - 0, 1, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_STURDY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Porygon2 - 85, 80, 90, 60, 105, 95, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 180, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_TRACE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Stantler - 73, 95, 62, 85, 85, 65, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 165, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_INTIMIDATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Smeargle - 55, 20, 35, 75, 20, 45, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 106, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_OWN_TEMPO, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Tyrogue - 35, 35, 35, 35, 35, 35, - TYPE_FIGHTING, - TYPE_FIGHTING, - 75, // catch rate - 91, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Hitmontop - 50, 95, 95, 70, 35, 110, - TYPE_FIGHTING, - TYPE_FIGHTING, - 45, // catch rate - 138, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_INTIMIDATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Smoochum - 45, 30, 15, 65, 85, 65, - TYPE_ICE, - TYPE_PSYCHIC, - 45, // catch rate - 87, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_ASPEAR_BERRY, - ITEM_ASPEAR_BERRY, - 254, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Elekid - 45, 63, 37, 95, 65, 55, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 45, // catch rate - 106, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 63, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_STATIC, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW, TRUE - }, { // Magby - 45, 75, 37, 83, 70, 55, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 117, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 63, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_FLAME_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Miltank - 95, 80, 105, 100, 40, 70, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 200, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_MOOMOO_MILK, - ITEM_MOOMOO_MILK, - 254, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Blissey - 255, 10, 10, 55, 75, 135, - TYPE_NORMAL, - TYPE_NORMAL, - 30, // catch rate - 255, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_LUCKY_EGG, - 254, // gender - 40, // egg cycles - 140, // base friendship - GROWTH_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_NATURAL_CURE, - ABILITY_SERENE_GRACE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Raikou - 90, 85, 75, 115, 115, 100, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 3, // catch rate - 216, // base exp. yield - 0, 0, 0, 2, 1, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Entei - 115, 115, 85, 100, 90, 75, - TYPE_FIRE, - TYPE_FIRE, - 3, // catch rate - 217, // base exp. yield - 1, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Suicune - 100, 75, 115, 85, 90, 115, - TYPE_WATER, - TYPE_WATER, - 3, // catch rate - 215, // base exp. yield - 0, 0, 1, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Larvitar - 50, 64, 50, 41, 45, 50, - TYPE_ROCK, - TYPE_GROUND, - 45, // catch rate - 67, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Pupitar - 70, 84, 70, 51, 65, 70, - TYPE_ROCK, - TYPE_GROUND, - 45, // catch rate - 144, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Tyranitar - 100, 134, 110, 61, 95, 100, - TYPE_ROCK, - TYPE_DARK, - 45, // catch rate - 218, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_SAND_STREAM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Lugia - 106, 90, 130, 110, 90, 154, - TYPE_PSYCHIC, - TYPE_FLYING, - 3, // catch rate - 220, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Ho-Oh - 106, 130, 90, 90, 110, 154, - TYPE_FIRE, - TYPE_FLYING, - 3, // catch rate - 220, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_SACRED_ASH, - ITEM_SACRED_ASH, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Celebi - 100, 100, 100, 100, 100, 100, - TYPE_PSYCHIC, - TYPE_GRASS, - 45, // catch rate - 64, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_LUM_BERRY, - ITEM_LUM_BERRY, - 255, // gender - 120, // egg cycles - 100, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NATURAL_CURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // ? - 50, 150, 50, 150, 150, 50, - TYPE_NORMAL, - TYPE_NORMAL, - 3, // catch rate - 1, // base exp. yield - 2, 2, 2, 2, 2, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_NONE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Treecko - 40, 45, 35, 70, 65, 55, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 65, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_DRAGON, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Grovyle - 50, 65, 45, 95, 85, 65, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 141, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_DRAGON, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Sceptile - 70, 85, 65, 120, 105, 85, - TYPE_GRASS, - TYPE_GRASS, - 45, // catch rate - 208, // base exp. yield - 0, 0, 0, 3, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_DRAGON, - ABILITY_OVERGROW, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Torchic - 45, 60, 40, 45, 70, 50, - TYPE_FIRE, - TYPE_FIRE, - 45, // catch rate - 65, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Combusken - 60, 85, 60, 55, 85, 60, - TYPE_FIRE, - TYPE_FIGHTING, - 45, // catch rate - 142, // base exp. yield - 0, 1, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Blaziken - 80, 120, 70, 80, 110, 70, - TYPE_FIRE, - TYPE_FIGHTING, - 45, // catch rate - 209, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_BLAZE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Mudkip - 50, 70, 50, 40, 50, 50, - TYPE_WATER, - TYPE_WATER, - 45, // catch rate - 65, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Marshtomp - 70, 85, 70, 50, 60, 70, - TYPE_WATER, - TYPE_GROUND, - 45, // catch rate - 143, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Swampert - 100, 110, 90, 60, 85, 90, - TYPE_WATER, - TYPE_GROUND, - 45, // catch rate - 210, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_WATER_1, - ABILITY_TORRENT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Poochyena - 35, 55, 35, 35, 30, 30, - TYPE_DARK, - TYPE_DARK, - 255, // catch rate - 55, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_PECHA_BERRY, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_RUN_AWAY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Mightyena - 70, 90, 70, 70, 60, 60, - TYPE_DARK, - TYPE_DARK, - 127, // catch rate - 128, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_PECHA_BERRY, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_INTIMIDATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Zigzagoon - 38, 30, 41, 60, 30, 41, - TYPE_NORMAL, - TYPE_NORMAL, - 255, // catch rate - 60, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_ORAN_BERRY, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_PICKUP, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Linoone - 78, 70, 61, 100, 50, 61, - TYPE_NORMAL, - TYPE_NORMAL, - 90, // catch rate - 128, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_ORAN_BERRY, - ITEM_SITRUS_BERRY, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_PICKUP, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Wurmple - 45, 45, 35, 20, 20, 30, - TYPE_BUG, - TYPE_BUG, - 255, // catch rate - 54, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHIELD_DUST, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Silcoon - 50, 35, 55, 15, 25, 25, - TYPE_BUG, - TYPE_BUG, - 120, // catch rate - 71, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Beautifly - 60, 70, 50, 65, 90, 50, - TYPE_BUG, - TYPE_FLYING, - 45, // catch rate - 161, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_SILVER_POWDER, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SWARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Cascoon - 50, 35, 55, 15, 25, 25, - TYPE_BUG, - TYPE_BUG, - 120, // catch rate - 72, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Dustox - 60, 50, 70, 65, 50, 90, - TYPE_BUG, - TYPE_POISON, - 45, // catch rate - 160, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_SILVER_POWDER, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SHIELD_DUST, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Lotad - 40, 30, 30, 30, 40, 50, - TYPE_WATER, - TYPE_GRASS, - 255, // catch rate - 74, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_GRASS, - ABILITY_SWIFT_SWIM, - ABILITY_RAIN_DISH, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Lombre - 60, 50, 50, 50, 60, 70, - TYPE_WATER, - TYPE_GRASS, - 120, // catch rate - 141, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_GRASS, - ABILITY_SWIFT_SWIM, - ABILITY_RAIN_DISH, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Ludicolo - 80, 70, 70, 70, 90, 100, - TYPE_WATER, - TYPE_GRASS, - 45, // catch rate - 181, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_GRASS, - ABILITY_SWIFT_SWIM, - ABILITY_RAIN_DISH, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Seedot - 40, 40, 50, 30, 30, 30, - TYPE_GRASS, - TYPE_GRASS, - 255, // catch rate - 74, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_EARLY_BIRD, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Nuzleaf - 70, 70, 40, 60, 60, 40, - TYPE_GRASS, - TYPE_DARK, - 120, // catch rate - 141, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_EARLY_BIRD, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Shiftry - 90, 100, 60, 80, 90, 60, - TYPE_GRASS, - TYPE_DARK, - 45, // catch rate - 181, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_EARLY_BIRD, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Nincada - 31, 45, 90, 40, 30, 30, - TYPE_BUG, - TYPE_GROUND, - 255, // catch rate - 65, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_COMPOUND_EYES, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Ninjask - 61, 90, 45, 160, 50, 50, - TYPE_BUG, - TYPE_FLYING, - 120, // catch rate - 155, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_SPEED_BOOST, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Shedinja - 1, 90, 45, 40, 30, 30, - TYPE_BUG, - TYPE_GHOST, - 45, // catch rate - 95, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_WONDER_GUARD, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Taillow - 40, 55, 30, 85, 30, 30, - TYPE_NORMAL, - TYPE_FLYING, - 200, // catch rate - 59, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Swellow - 60, 85, 60, 125, 50, 50, - TYPE_NORMAL, - TYPE_FLYING, - 45, // catch rate - 162, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FLYING, - EGG_GROUP_FLYING, - ABILITY_GUTS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Shroomish - 60, 40, 60, 35, 40, 60, - TYPE_GRASS, - TYPE_GRASS, - 255, // catch rate - 65, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_FAIRY, - EGG_GROUP_GRASS, - ABILITY_EFFECT_SPORE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Breloom - 60, 130, 80, 70, 60, 60, - TYPE_GRASS, - TYPE_FIGHTING, - 90, // catch rate - 165, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_FAIRY, - EGG_GROUP_GRASS, - ABILITY_EFFECT_SPORE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Spinda - 60, 60, 60, 60, 60, 60, - TYPE_NORMAL, - TYPE_NORMAL, - 255, // catch rate - 85, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_CHESTO_BERRY, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_HUMAN_LIKE, - ABILITY_OWN_TEMPO, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN, TRUE - }, { // Wingull - 40, 30, 30, 85, 55, 30, - TYPE_WATER, - TYPE_FLYING, - 190, // catch rate - 64, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Pelipper - 60, 50, 100, 65, 85, 70, - TYPE_WATER, - TYPE_FLYING, - 45, // catch rate - 164, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_FLYING, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Surskit - 40, 30, 32, 65, 50, 52, - TYPE_BUG, - TYPE_WATER, - 200, // catch rate - 63, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_BUG, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Masquerain - 70, 60, 62, 60, 80, 82, - TYPE_BUG, - TYPE_FLYING, - 75, // catch rate - 128, // base exp. yield - 0, 0, 0, 0, 1, 1, - ITEM_NONE, - ITEM_SILVER_POWDER, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_1, - EGG_GROUP_BUG, - ABILITY_INTIMIDATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Wailmer - 130, 70, 35, 60, 70, 35, - TYPE_WATER, - TYPE_WATER, - 125, // catch rate - 137, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 40, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_FIELD, - EGG_GROUP_WATER_2, - ABILITY_WATER_VEIL, - ABILITY_OBLIVIOUS, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Wailord - 170, 90, 45, 60, 90, 45, - TYPE_WATER, - TYPE_WATER, - 60, // catch rate - 206, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 40, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_FIELD, - EGG_GROUP_WATER_2, - ABILITY_WATER_VEIL, - ABILITY_OBLIVIOUS, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Skitty - 50, 45, 45, 50, 35, 35, - TYPE_NORMAL, - TYPE_NORMAL, - 255, // catch rate - 65, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_LEPPA_BERRY, - 191, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Delcatty - 70, 65, 65, 70, 55, 55, - TYPE_NORMAL, - TYPE_NORMAL, - 60, // catch rate - 138, // base exp. yield - 1, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_LEPPA_BERRY, - 191, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - ABILITY_CUTE_CHARM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Kecleon - 60, 90, 70, 40, 60, 120, - TYPE_NORMAL, - TYPE_NORMAL, - 200, // catch rate - 132, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_PERSIM_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_COLOR_CHANGE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Baltoy - 40, 40, 55, 55, 40, 70, - TYPE_GROUND, - TYPE_PSYCHIC, - 255, // catch rate - 58, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Claydol - 60, 70, 105, 75, 70, 120, - TYPE_GROUND, - TYPE_PSYCHIC, - 90, // catch rate - 189, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Nosepass - 30, 45, 135, 30, 45, 90, - TYPE_ROCK, - TYPE_ROCK, - 255, // catch rate - 108, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_STURDY, - ABILITY_MAGNET_PULL, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Torkoal - 70, 85, 140, 20, 85, 70, - TYPE_FIRE, - TYPE_FIRE, - 90, // catch rate - 161, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_WHITE_SMOKE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Sableye - 50, 75, 75, 50, 65, 65, - TYPE_DARK, - TYPE_GHOST, - 45, // catch rate - 98, // base exp. yield - 0, 1, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 35, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_KEEN_EYE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Barboach - 50, 48, 43, 60, 46, 41, - TYPE_WATER, - TYPE_GROUND, - 190, // catch rate - 92, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Whiscash - 110, 78, 73, 60, 76, 71, - TYPE_WATER, - TYPE_GROUND, - 75, // catch rate - 158, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Luvdisc - 43, 30, 55, 97, 40, 65, - TYPE_WATER, - TYPE_WATER, - 225, // catch rate - 110, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_HEART_SCALE, - ITEM_NONE, - 191, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Corphish - 43, 80, 65, 35, 50, 35, - TYPE_WATER, - TYPE_WATER, - 205, // catch rate - 111, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_3, - ABILITY_HYPER_CUTTER, - ABILITY_SHELL_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Crawdaunt - 63, 120, 85, 55, 90, 55, - TYPE_WATER, - TYPE_DARK, - 155, // catch rate - 161, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_3, - ABILITY_HYPER_CUTTER, - ABILITY_SHELL_ARMOR, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Feebas - 20, 15, 20, 80, 10, 55, - TYPE_WATER, - TYPE_WATER, - 255, // catch rate - 61, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Milotic - 95, 60, 79, 81, 100, 125, - TYPE_WATER, - TYPE_WATER, - 60, // catch rate - 213, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_1, - EGG_GROUP_DRAGON, - ABILITY_MARVEL_SCALE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Carvanha - 45, 90, 20, 65, 65, 20, - TYPE_WATER, - TYPE_DARK, - 225, // catch rate - 88, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_ROUGH_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Sharpedo - 70, 120, 40, 95, 95, 40, - TYPE_WATER, - TYPE_DARK, - 60, // catch rate - 175, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_2, - EGG_GROUP_WATER_2, - ABILITY_ROUGH_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Trapinch - 45, 100, 45, 10, 45, 45, - TYPE_GROUND, - TYPE_GROUND, - 255, // catch rate - 73, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_SOFT_SAND, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_HYPER_CUTTER, - ABILITY_ARENA_TRAP, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Vibrava - 50, 70, 50, 70, 50, 50, - TYPE_GROUND, - TYPE_DRAGON, - 120, // catch rate - 126, // base exp. yield - 0, 1, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_LEVITATE, - ABILITY_LEVITATE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Flygon - 80, 100, 80, 100, 80, 80, - TYPE_GROUND, - TYPE_DRAGON, - 45, // catch rate - 197, // base exp. yield - 0, 1, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_BUG, - EGG_GROUP_BUG, - ABILITY_LEVITATE, - ABILITY_LEVITATE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Makuhita - 72, 60, 30, 25, 20, 30, - TYPE_FIGHTING, - TYPE_FIGHTING, - 180, // catch rate - 87, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_THICK_FAT, - ABILITY_GUTS, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Hariyama - 144, 120, 60, 50, 40, 60, - TYPE_FIGHTING, - TYPE_FIGHTING, - 200, // catch rate - 184, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_KINGS_ROCK, - 63, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_THICK_FAT, - ABILITY_GUTS, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Electrike - 40, 45, 40, 65, 65, 40, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 120, // catch rate - 104, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_STATIC, - ABILITY_LIGHTNING_ROD, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Manectric - 70, 75, 60, 105, 105, 60, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 45, // catch rate - 168, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_STATIC, - ABILITY_LIGHTNING_ROD, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Numel - 60, 60, 40, 35, 65, 45, - TYPE_FIRE, - TYPE_GROUND, - 255, // catch rate - 88, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Camerupt - 70, 100, 70, 40, 105, 75, - TYPE_FIRE, - TYPE_GROUND, - 150, // catch rate - 175, // base exp. yield - 0, 1, 0, 0, 1, 0, - ITEM_RAWST_BERRY, - ITEM_RAWST_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_MAGMA_ARMOR, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Spheal - 70, 40, 50, 25, 55, 50, - TYPE_ICE, - TYPE_WATER, - 255, // catch rate - 75, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Sealeo - 90, 60, 70, 45, 75, 70, - TYPE_ICE, - TYPE_WATER, - 120, // catch rate - 128, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Walrein - 110, 80, 90, 65, 95, 90, - TYPE_ICE, - TYPE_WATER, - 45, // catch rate - 192, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Cacnea - 50, 85, 40, 35, 85, 40, - TYPE_GRASS, - TYPE_GRASS, - 190, // catch rate - 97, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_POISON_BARB, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_HUMAN_LIKE, - ABILITY_SAND_VEIL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Cacturne - 70, 115, 60, 55, 115, 60, - TYPE_GRASS, - TYPE_DARK, - 60, // catch rate - 177, // base exp. yield - 0, 1, 0, 0, 1, 0, - ITEM_NONE, - ITEM_POISON_BARB, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_GRASS, - EGG_GROUP_HUMAN_LIKE, - ABILITY_SAND_VEIL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Snorunt - 50, 50, 50, 50, 50, 50, - TYPE_ICE, - TYPE_ICE, - 190, // catch rate - 74, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_MINERAL, - ABILITY_INNER_FOCUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Glalie - 80, 80, 80, 80, 80, 80, - TYPE_ICE, - TYPE_ICE, - 75, // catch rate - 187, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NEVER_MELT_ICE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_MINERAL, - ABILITY_INNER_FOCUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Lunatone - 70, 55, 65, 70, 95, 85, - TYPE_ROCK, - TYPE_PSYCHIC, - 45, // catch rate - 150, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_MOON_STONE, - 255, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Solrock - 70, 95, 85, 70, 55, 65, - TYPE_ROCK, - TYPE_PSYCHIC, - 45, // catch rate - 150, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_SUN_STONE, - 255, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Azurill - 50, 20, 40, 20, 20, 40, - TYPE_NORMAL, - TYPE_NORMAL, - 150, // catch rate - 33, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 191, // gender - 10, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_THICK_FAT, - ABILITY_HUGE_POWER, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Spoink - 60, 25, 35, 60, 70, 80, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 255, // catch rate - 89, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_OWN_TEMPO, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Grumpig - 80, 45, 65, 80, 90, 110, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 60, // catch rate - 164, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_THICK_FAT, - ABILITY_OWN_TEMPO, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Plusle - 60, 50, 40, 95, 85, 75, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 200, // catch rate - 120, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_PLUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Minun - 60, 40, 50, 95, 75, 85, - TYPE_ELECTRIC, - TYPE_ELECTRIC, - 200, // catch rate - 120, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_FAIRY, - ABILITY_MINUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Mawile - 50, 85, 85, 50, 55, 55, - TYPE_STEEL, - TYPE_STEEL, - 45, // catch rate - 98, // base exp. yield - 0, 1, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_FIELD, - EGG_GROUP_FAIRY, - ABILITY_HYPER_CUTTER, - ABILITY_INTIMIDATE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Meditite - 30, 40, 55, 60, 40, 55, - TYPE_FIGHTING, - TYPE_PSYCHIC, - 180, // catch rate - 91, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_PURE_POWER, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Medicham - 60, 60, 75, 80, 60, 75, - TYPE_FIGHTING, - TYPE_PSYCHIC, - 90, // catch rate - 153, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_HUMAN_LIKE, - EGG_GROUP_HUMAN_LIKE, - ABILITY_PURE_POWER, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Swablu - 45, 40, 60, 50, 40, 75, - TYPE_NORMAL, - TYPE_FLYING, - 255, // catch rate - 74, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_FLYING, - EGG_GROUP_DRAGON, - ABILITY_NATURAL_CURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Altaria - 75, 70, 90, 80, 70, 105, - TYPE_DRAGON, - TYPE_FLYING, - 45, // catch rate - 188, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_FLYING, - EGG_GROUP_DRAGON, - ABILITY_NATURAL_CURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Wynaut - 95, 23, 48, 23, 23, 48, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 125, // catch rate - 44, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_SHADOW_TAG, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Duskull - 20, 40, 90, 25, 30, 90, - TYPE_GHOST, - TYPE_GHOST, - 190, // catch rate - 97, // base exp. yield - 0, 0, 1, 0, 0, 1, - ITEM_NONE, - ITEM_SPELL_TAG, - 127, // gender - 25, // egg cycles - 35, // base friendship - GROWTH_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Dusclops - 40, 70, 130, 25, 60, 130, - TYPE_GHOST, - TYPE_GHOST, - 90, // catch rate - 179, // base exp. yield - 0, 0, 1, 0, 0, 2, - ITEM_NONE, - ITEM_SPELL_TAG, - 127, // gender - 25, // egg cycles - 35, // base friendship - GROWTH_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Roselia - 50, 60, 45, 65, 100, 80, - TYPE_GRASS, - TYPE_POISON, - 150, // catch rate - 152, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_POISON_BARB, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FAIRY, - EGG_GROUP_GRASS, - ABILITY_NATURAL_CURE, - ABILITY_POISON_POINT, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN, TRUE - }, { // Slakoth - 60, 60, 60, 30, 35, 35, - TYPE_NORMAL, - TYPE_NORMAL, - 255, // catch rate - 83, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_TRUANT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Vigoroth - 80, 80, 80, 90, 55, 55, - TYPE_NORMAL, - TYPE_NORMAL, - 120, // catch rate - 126, // base exp. yield - 0, 0, 0, 2, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_VITAL_SPIRIT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Slaking - 150, 160, 100, 100, 95, 65, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 210, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_TRUANT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Gulpin - 70, 43, 53, 40, 43, 53, - TYPE_POISON, - TYPE_POISON, - 225, // catch rate - 75, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_BIG_PEARL, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LIQUID_OOZE, - ABILITY_STICKY_HOLD, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Swalot - 100, 73, 83, 55, 73, 83, - TYPE_POISON, - TYPE_POISON, - 75, // catch rate - 168, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_BIG_PEARL, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LIQUID_OOZE, - ABILITY_STICKY_HOLD, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Tropius - 99, 68, 83, 51, 72, 87, - TYPE_GRASS, - TYPE_FLYING, - 200, // catch rate - 169, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_GRASS, - ABILITY_CHLOROPHYLL, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Whismur - 64, 51, 23, 28, 51, 23, - TYPE_NORMAL, - TYPE_NORMAL, - 190, // catch rate - 68, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_CHESTO_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_SOUNDPROOF, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Loudred - 84, 71, 43, 48, 71, 43, - TYPE_NORMAL, - TYPE_NORMAL, - 120, // catch rate - 126, // base exp. yield - 2, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_CHESTO_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_SOUNDPROOF, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Exploud - 104, 91, 63, 68, 91, 63, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 184, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_NONE, - ITEM_CHESTO_BERRY, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_FIELD, - ABILITY_SOUNDPROOF, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Clamperl - 35, 64, 85, 32, 74, 55, - TYPE_WATER, - TYPE_WATER, - 255, // catch rate - 142, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_BLUE_SHARD, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_SHELL_ARMOR, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Huntail - 55, 104, 105, 52, 94, 75, - TYPE_WATER, - TYPE_WATER, - 60, // catch rate - 178, // base exp. yield - 0, 1, 1, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Gorebyss - 55, 84, 105, 52, 114, 75, - TYPE_WATER, - TYPE_WATER, - 60, // catch rate - 178, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_1, - ABILITY_SWIFT_SWIM, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PINK - }, { // Absol - 65, 130, 60, 75, 75, 60, - TYPE_DARK, - TYPE_DARK, - 30, // catch rate - 174, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 35, // base friendship - GROWTH_MEDIUM_SLOW, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE, TRUE - }, { // Shuppet - 44, 75, 35, 45, 63, 33, - TYPE_GHOST, - TYPE_GHOST, - 225, // catch rate - 97, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_SPELL_TAG, - 127, // gender - 25, // egg cycles - 35, // base friendship - GROWTH_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_INSOMNIA, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Banette - 64, 115, 65, 65, 83, 63, - TYPE_GHOST, - TYPE_GHOST, - 45, // catch rate - 179, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_SPELL_TAG, - 127, // gender - 25, // egg cycles - 35, // base friendship - GROWTH_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_INSOMNIA, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK - }, { // Seviper - 73, 100, 60, 65, 100, 60, - TYPE_POISON, - TYPE_POISON, - 90, // catch rate - 165, // base exp. yield - 0, 1, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_FIELD, - EGG_GROUP_DRAGON, - ABILITY_SHED_SKIN, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLACK, TRUE - }, { // Zangoose - 73, 115, 60, 90, 60, 60, - TYPE_NORMAL, - TYPE_NORMAL, - 90, // catch rate - 165, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_FIELD, - EGG_GROUP_FIELD, - ABILITY_IMMUNITY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE, TRUE - }, { // Relicanth - 100, 90, 130, 55, 45, 65, - TYPE_WATER, - TYPE_ROCK, - 25, // catch rate - 198, // base exp. yield - 1, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_GREEN_SHARD, - 31, // gender - 40, // egg cycles - 70, // base friendship - GROWTH_SLOW, - EGG_GROUP_WATER_1, - EGG_GROUP_WATER_2, - ABILITY_SWIFT_SWIM, - ABILITY_ROCK_HEAD, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Aron - 50, 70, 100, 30, 40, 40, - TYPE_STEEL, - TYPE_ROCK, - 180, // catch rate - 96, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_HARD_STONE, - 127, // gender - 35, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_STURDY, - ABILITY_ROCK_HEAD, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Lairon - 60, 90, 140, 40, 50, 50, - TYPE_STEEL, - TYPE_ROCK, - 90, // catch rate - 152, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_HARD_STONE, - 127, // gender - 35, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_STURDY, - ABILITY_ROCK_HEAD, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Aggron - 70, 110, 180, 50, 60, 60, - TYPE_STEEL, - TYPE_ROCK, - 45, // catch rate - 205, // base exp. yield - 0, 0, 3, 0, 0, 0, - ITEM_NONE, - ITEM_HARD_STONE, - 127, // gender - 35, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MONSTER, - EGG_GROUP_MONSTER, - ABILITY_STURDY, - ABILITY_ROCK_HEAD, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Castform - 70, 70, 70, 70, 70, 70, - TYPE_NORMAL, - TYPE_NORMAL, - 45, // catch rate - 145, // base exp. yield - 1, 0, 0, 0, 0, 0, - ITEM_MYSTIC_WATER, - ITEM_MYSTIC_WATER, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_MEDIUM_FAST, - EGG_GROUP_FAIRY, - EGG_GROUP_AMORPHOUS, - ABILITY_FORECAST, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Volbeat - 65, 73, 55, 85, 47, 75, - TYPE_BUG, - TYPE_BUG, - 150, // catch rate - 146, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_BUG, - EGG_GROUP_HUMAN_LIKE, - ABILITY_ILLUMINATE, - ABILITY_SWARM, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Illumise - 65, 47, 55, 85, 73, 75, - TYPE_BUG, - TYPE_BUG, - 150, // catch rate - 146, // base exp. yield - 0, 0, 0, 1, 0, 0, - ITEM_NONE, - ITEM_NONE, - 254, // gender - 15, // egg cycles - 70, // base friendship - GROWTH_FLUCTUATING, - EGG_GROUP_BUG, - EGG_GROUP_HUMAN_LIKE, - ABILITY_OBLIVIOUS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Lileep - 66, 41, 77, 23, 61, 87, - TYPE_ROCK, - TYPE_GRASS, - 45, // catch rate - 121, // base exp. yield - 0, 0, 0, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_SUCTION_CUPS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_PURPLE - }, { // Cradily - 86, 81, 97, 43, 81, 107, - TYPE_ROCK, - TYPE_GRASS, - 45, // catch rate - 201, // base exp. yield - 0, 0, 0, 0, 0, 2, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_SUCTION_CUPS, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Anorith - 45, 95, 50, 75, 40, 50, - TYPE_ROCK, - TYPE_BUG, - 45, // catch rate - 119, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_BATTLE_ARMOR, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Armaldo - 75, 125, 100, 45, 70, 80, - TYPE_ROCK, - TYPE_BUG, - 45, // catch rate - 200, // base exp. yield - 0, 2, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 31, // gender - 30, // egg cycles - 70, // base friendship - GROWTH_ERRATIC, - EGG_GROUP_WATER_3, - EGG_GROUP_WATER_3, - ABILITY_BATTLE_ARMOR, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Ralts - 28, 25, 25, 40, 45, 35, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 235, // catch rate - 70, // base exp. yield - 0, 0, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_SYNCHRONIZE, - ABILITY_TRACE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Kirlia - 38, 35, 35, 50, 65, 55, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 120, // catch rate - 140, // base exp. yield - 0, 0, 0, 0, 2, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_SYNCHRONIZE, - ABILITY_TRACE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Gardevoir - 68, 65, 65, 80, 125, 115, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 45, // catch rate - 208, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 20, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_SYNCHRONIZE, - ABILITY_TRACE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Bagon - 45, 75, 60, 50, 40, 30, - TYPE_DRAGON, - TYPE_DRAGON, - 45, // catch rate - 89, // base exp. yield - 0, 1, 0, 0, 0, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_DRAGON, - EGG_GROUP_DRAGON, - ABILITY_ROCK_HEAD, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Shelgon - 65, 95, 100, 50, 60, 50, - TYPE_DRAGON, - TYPE_DRAGON, - 45, // catch rate - 144, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_DRAGON, - EGG_GROUP_DRAGON, - ABILITY_ROCK_HEAD, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_WHITE - }, { // Salamence - 95, 135, 80, 100, 110, 80, - TYPE_DRAGON, - TYPE_FLYING, - 45, // catch rate - 218, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_DRAGON_SCALE, - 127, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_DRAGON, - EGG_GROUP_DRAGON, - ABILITY_INTIMIDATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Beldum - 40, 55, 80, 30, 35, 60, - TYPE_STEEL, - TYPE_PSYCHIC, - 3, // catch rate - 103, // base exp. yield - 0, 0, 1, 0, 0, 0, - ITEM_NONE, - ITEM_METAL_COAT, - 255, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_CLEAR_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Metang - 60, 75, 100, 50, 55, 80, - TYPE_STEEL, - TYPE_PSYCHIC, - 3, // catch rate - 153, // base exp. yield - 0, 0, 2, 0, 0, 0, - ITEM_NONE, - ITEM_METAL_COAT, - 255, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_CLEAR_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Metagross - 80, 135, 130, 70, 95, 90, - TYPE_STEEL, - TYPE_PSYCHIC, - 3, // catch rate - 210, // base exp. yield - 0, 0, 3, 0, 0, 0, - ITEM_NONE, - ITEM_METAL_COAT, - 255, // gender - 40, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_MINERAL, - EGG_GROUP_MINERAL, - ABILITY_CLEAR_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Regirock - 80, 100, 200, 50, 50, 100, - TYPE_ROCK, - TYPE_ROCK, - 3, // catch rate - 217, // base exp. yield - 0, 0, 3, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_CLEAR_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BROWN - }, { // Regice - 80, 50, 100, 50, 100, 200, - TYPE_ICE, - TYPE_ICE, - 3, // catch rate - 216, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_CLEAR_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Registeel - 80, 75, 150, 50, 75, 150, - TYPE_STEEL, - TYPE_STEEL, - 3, // catch rate - 215, // base exp. yield - 0, 0, 2, 0, 0, 1, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 80, // egg cycles - 35, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_CLEAR_BODY, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GRAY - }, { // Kyogre - 100, 100, 90, 90, 150, 140, - TYPE_WATER, - TYPE_WATER, - 5, // catch rate - 218, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_DRIZZLE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Groudon - 100, 150, 140, 90, 100, 90, - TYPE_GROUND, - TYPE_GROUND, - 5, // catch rate - 218, // base exp. yield - 0, 3, 0, 0, 0, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_DROUGHT, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Rayquaza - 105, 150, 90, 95, 150, 90, - TYPE_DRAGON, - TYPE_FLYING, - 3, // catch rate - 220, // base exp. yield - 0, 2, 0, 0, 1, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_AIR_LOCK, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_GREEN - }, { // Latias - 80, 80, 90, 110, 110, 130, - TYPE_DRAGON, - TYPE_PSYCHIC, - 3, // catch rate - 211, // base exp. yield - 0, 0, 0, 0, 0, 3, - ITEM_NONE, - ITEM_NONE, - 254, // gender - 120, // egg cycles - 90, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED - }, { // Latios - 80, 90, 80, 110, 130, 110, - TYPE_DRAGON, - TYPE_PSYCHIC, - 3, // catch rate - 211, // base exp. yield - 0, 0, 0, 0, 3, 0, - ITEM_NONE, - ITEM_NONE, - 0, // gender - 120, // egg cycles - 90, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE - }, { // Jirachi - 100, 100, 100, 100, 100, 100, - TYPE_STEEL, - TYPE_PSYCHIC, - 3, // catch rate - 215, // base exp. yield - 3, 0, 0, 0, 0, 0, - ITEM_STAR_PIECE, - ITEM_STAR_PIECE, - 255, // gender - 120, // egg cycles - 100, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_SERENE_GRACE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_YELLOW - }, { // Deoxys - 50, 150, 50, 150, 150, 50, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 3, // catch rate - 215, // base exp. yield - 0, 1, 0, 1, 1, 0, - ITEM_NONE, - ITEM_NONE, - 255, // gender - 120, // egg cycles - 0, // base friendship - GROWTH_SLOW, - EGG_GROUP_UNDISCOVERED, - EGG_GROUP_UNDISCOVERED, - ABILITY_PRESSURE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_RED, TRUE - }, { // Chimecho - 65, 50, 70, 65, 95, 80, - TYPE_PSYCHIC, - TYPE_PSYCHIC, - 45, // catch rate - 147, // base exp. yield - 0, 0, 0, 0, 1, 1, - ITEM_NONE, - ITEM_NONE, - 127, // gender - 25, // egg cycles - 70, // base friendship - GROWTH_FAST, - EGG_GROUP_AMORPHOUS, - EGG_GROUP_AMORPHOUS, - ABILITY_LEVITATE, - ABILITY_NONE, - 0, // Safari Zone flee rate - BODY_COLOR_BLUE +#ifndef GUARD_BASE_STATS_H +#define GUARD_BASE_STATS_H + +const struct BaseStats gBaseStats[] = +{ + [SPECIES_NONE] = {0}, + + [SPECIES_BULBASAUR] = + { + .baseHP = 45, + .baseAttack = 49, + .baseDefense = 49, + .baseSpeed = 45, + .baseSpAttack = 65, + .baseSpDefense = 65, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 64, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_IVYSAUR] = + { + .baseHP = 60, + .baseAttack = 62, + .baseDefense = 63, + .baseSpeed = 60, + .baseSpAttack = 80, + .baseSpDefense = 80, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 141, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_VENUSAUR] = + { + .baseHP = 80, + .baseAttack = 82, + .baseDefense = 83, + .baseSpeed = 80, + .baseSpAttack = 100, + .baseSpDefense = 100, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 208, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_CHARMANDER] = + { + .baseHP = 39, + .baseAttack = 52, + .baseDefense = 43, + .baseSpeed = 65, + .baseSpAttack = 60, + .baseSpDefense = 50, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 65, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_CHARMELEON] = + { + .baseHP = 58, + .baseAttack = 64, + .baseDefense = 58, + .baseSpeed = 80, + .baseSpAttack = 80, + .baseSpDefense = 65, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 142, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_CHARIZARD] = + { + .baseHP = 78, + .baseAttack = 84, + .baseDefense = 78, + .baseSpeed = 100, + .baseSpAttack = 109, + .baseSpDefense = 85, + .type1 = TYPE_FIRE, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 209, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SQUIRTLE] = + { + .baseHP = 44, + .baseAttack = 48, + .baseDefense = 65, + .baseSpeed = 43, + .baseSpAttack = 50, + .baseSpDefense = 64, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 66, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_WARTORTLE] = + { + .baseHP = 59, + .baseAttack = 63, + .baseDefense = 80, + .baseSpeed = 58, + .baseSpAttack = 65, + .baseSpDefense = 80, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 143, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_BLASTOISE] = + { + .baseHP = 79, + .baseAttack = 83, + .baseDefense = 100, + .baseSpeed = 78, + .baseSpAttack = 85, + .baseSpDefense = 105, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 210, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_CATERPIE] = + { + .baseHP = 45, + .baseAttack = 30, + .baseDefense = 35, + .baseSpeed = 45, + .baseSpAttack = 20, + .baseSpDefense = 20, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 255, + .expYield = 53, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHIELD_DUST, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_METAPOD] = + { + .baseHP = 50, + .baseAttack = 20, + .baseDefense = 55, + .baseSpeed = 30, + .baseSpAttack = 25, + .baseSpDefense = 25, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 120, + .expYield = 72, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_BUTTERFREE] = + { + .baseHP = 60, + .baseAttack = 45, + .baseDefense = 50, + .baseSpeed = 70, + .baseSpAttack = 80, + .baseSpDefense = 80, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 160, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_SILVER_POWDER, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_COMPOUND_EYES, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_WEEDLE] = + { + .baseHP = 40, + .baseAttack = 35, + .baseDefense = 30, + .baseSpeed = 50, + .baseSpAttack = 20, + .baseSpDefense = 20, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 255, + .expYield = 52, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHIELD_DUST, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_KAKUNA] = + { + .baseHP = 45, + .baseAttack = 25, + .baseDefense = 50, + .baseSpeed = 35, + .baseSpAttack = 25, + .baseSpDefense = 25, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 120, + .expYield = 71, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_BEEDRILL] = + { + .baseHP = 65, + .baseAttack = 80, + .baseDefense = 40, + .baseSpeed = 75, + .baseSpAttack = 45, + .baseSpDefense = 80, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 159, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_POISON_BARB, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_PIDGEY] = + { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 40, + .baseSpeed = 56, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 255, + .expYield = 55, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_PIDGEOTTO] = + { + .baseHP = 63, + .baseAttack = 60, + .baseDefense = 55, + .baseSpeed = 71, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 120, + .expYield = 113, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_PIDGEOT] = + { + .baseHP = 83, + .baseAttack = 80, + .baseDefense = 75, + .baseSpeed = 91, + .baseSpAttack = 70, + .baseSpDefense = 70, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 172, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 3, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_RATTATA] = + { + .baseHP = 30, + .baseAttack = 56, + .baseDefense = 35, + .baseSpeed = 72, + .baseSpAttack = 25, + .baseSpDefense = 35, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 57, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_GUTS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_RATICATE] = + { + .baseHP = 55, + .baseAttack = 81, + .baseDefense = 60, + .baseSpeed = 97, + .baseSpAttack = 50, + .baseSpDefense = 70, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 127, + .expYield = 116, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_GUTS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SPEAROW] = + { + .baseHP = 40, + .baseAttack = 60, + .baseDefense = 30, + .baseSpeed = 70, + .baseSpAttack = 31, + .baseSpDefense = 31, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 255, + .expYield = 58, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_FEAROW] = + { + .baseHP = 65, + .baseAttack = 90, + .baseDefense = 65, + .baseSpeed = 100, + .baseSpAttack = 61, + .baseSpDefense = 61, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 90, + .expYield = 162, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SHARP_BEAK, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_EKANS] = + { + .baseHP = 35, + .baseAttack = 60, + .baseDefense = 44, + .baseSpeed = 55, + .baseSpAttack = 40, + .baseSpDefense = 54, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 255, + .expYield = 62, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_SHED_SKIN, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_ARBOK] = + { + .baseHP = 60, + .baseAttack = 85, + .baseDefense = 69, + .baseSpeed = 80, + .baseSpAttack = 65, + .baseSpDefense = 79, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 90, + .expYield = 147, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_SHED_SKIN, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_PIKACHU] = + { + .baseHP = 35, + .baseAttack = 55, + .baseDefense = 30, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = 40, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 190, + .expYield = 82, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_ORAN_BERRY, + .item2 = ITEM_LIGHT_BALL, + .genderRatio = 127, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 6, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_RAICHU] = + { + .baseHP = 60, + .baseAttack = 90, + .baseDefense = 55, + .baseSpeed = 100, + .baseSpAttack = 90, + .baseSpDefense = 80, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 75, + .expYield = 122, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 3, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_ORAN_BERRY, + .genderRatio = 127, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_SANDSHREW] = + { + .baseHP = 50, + .baseAttack = 75, + .baseDefense = 85, + .baseSpeed = 40, + .baseSpAttack = 20, + .baseSpDefense = 30, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 255, + .expYield = 93, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_QUICK_CLAW, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SAND_VEIL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_SANDSLASH] = + { + .baseHP = 75, + .baseAttack = 100, + .baseDefense = 110, + .baseSpeed = 65, + .baseSpAttack = 45, + .baseSpDefense = 55, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 90, + .expYield = 163, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_QUICK_CLAW, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SAND_VEIL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_NIDORAN_F] = + { + .baseHP = 55, + .baseAttack = 47, + .baseDefense = 52, + .baseSpeed = 41, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 235, + .expYield = 59, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 254, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_NIDORINA] = + { + .baseHP = 70, + .baseAttack = 62, + .baseDefense = 67, + .baseSpeed = 56, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 120, + .expYield = 117, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 254, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_NIDOQUEEN] = + { + .baseHP = 90, + .baseAttack = 82, + .baseDefense = 87, + .baseSpeed = 76, + .baseSpAttack = 75, + .baseSpDefense = 85, + .type1 = TYPE_POISON, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 194, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 254, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_NIDORAN_M] = + { + .baseHP = 46, + .baseAttack = 57, + .baseDefense = 40, + .baseSpeed = 50, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 235, + .expYield = 60, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_NIDORINO] = + { + .baseHP = 61, + .baseAttack = 72, + .baseDefense = 57, + .baseSpeed = 65, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 120, + .expYield = 118, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_NIDOKING] = + { + .baseHP = 81, + .baseAttack = 92, + .baseDefense = 77, + .baseSpeed = 85, + .baseSpAttack = 85, + .baseSpDefense = 75, + .type1 = TYPE_POISON, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 195, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_CLEFAIRY] = + { + .baseHP = 70, + .baseAttack = 45, + .baseDefense = 48, + .baseSpeed = 35, + .baseSpAttack = 60, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 150, + .expYield = 68, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_LEPPA_BERRY, + .item2 = ITEM_MOON_STONE, + .genderRatio = 191, + .eggCycles = 10, + .friendship = 140, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_CLEFABLE] = + { + .baseHP = 95, + .baseAttack = 70, + .baseDefense = 73, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 90, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 25, + .expYield = 129, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_LEPPA_BERRY, + .item2 = ITEM_MOON_STONE, + .genderRatio = 191, + .eggCycles = 10, + .friendship = 140, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_VULPIX] = + { + .baseHP = 38, + .baseAttack = 41, + .baseDefense = 40, + .baseSpeed = 65, + .baseSpAttack = 50, + .baseSpDefense = 65, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 190, + .expYield = 63, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 191, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_FLASH_FIRE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_NINETALES] = + { + .baseHP = 73, + .baseAttack = 76, + .baseDefense = 75, + .baseSpeed = 100, + .baseSpAttack = 81, + .baseSpDefense = 100, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 75, + .expYield = 178, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 191, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_FLASH_FIRE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_JIGGLYPUFF] = + { + .baseHP = 115, + .baseAttack = 45, + .baseDefense = 20, + .baseSpeed = 20, + .baseSpAttack = 45, + .baseSpDefense = 25, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 170, + .expYield = 76, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 191, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_WIGGLYTUFF] = + { + .baseHP = 140, + .baseAttack = 70, + .baseDefense = 45, + .baseSpeed = 45, + .baseSpAttack = 75, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 50, + .expYield = 109, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 191, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_ZUBAT] = + { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 35, + .baseSpeed = 55, + .baseSpAttack = 30, + .baseSpDefense = 40, + .type1 = TYPE_POISON, + .type2 = TYPE_FLYING, + .catchRate = 255, + .expYield = 54, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_GOLBAT] = + { + .baseHP = 75, + .baseAttack = 80, + .baseDefense = 70, + .baseSpeed = 90, + .baseSpAttack = 65, + .baseSpDefense = 75, + .type1 = TYPE_POISON, + .type2 = TYPE_FLYING, + .catchRate = 90, + .expYield = 171, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_ODDISH] = + { + .baseHP = 45, + .baseAttack = 50, + .baseDefense = 55, + .baseSpeed = 30, + .baseSpAttack = 75, + .baseSpDefense = 65, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 255, + .expYield = 78, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 4, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_GLOOM] = + { + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 70, + .baseSpeed = 40, + .baseSpAttack = 85, + .baseSpDefense = 75, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 120, + .expYield = 132, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 6, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_VILEPLUME] = + { + .baseHP = 75, + .baseAttack = 80, + .baseDefense = 85, + .baseSpeed = 50, + .baseSpAttack = 100, + .baseSpDefense = 90, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 184, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_PARAS] = + { + .baseHP = 35, + .baseAttack = 70, + .baseDefense = 55, + .baseSpeed = 25, + .baseSpAttack = 45, + .baseSpDefense = 55, + .type1 = TYPE_BUG, + .type2 = TYPE_GRASS, + .catchRate = 190, + .expYield = 70, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_EFFECT_SPORE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_PARASECT] = + { + .baseHP = 60, + .baseAttack = 95, + .baseDefense = 80, + .baseSpeed = 30, + .baseSpAttack = 60, + .baseSpDefense = 80, + .type1 = TYPE_BUG, + .type2 = TYPE_GRASS, + .catchRate = 75, + .expYield = 128, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_EFFECT_SPORE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_VENONAT] = + { + .baseHP = 60, + .baseAttack = 55, + .baseDefense = 50, + .baseSpeed = 45, + .baseSpAttack = 40, + .baseSpDefense = 55, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 190, + .expYield = 75, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_COMPOUND_EYES, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_VENOMOTH] = + { + .baseHP = 70, + .baseAttack = 65, + .baseDefense = 60, + .baseSpeed = 90, + .baseSpAttack = 90, + .baseSpDefense = 75, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 75, + .expYield = 138, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHIELD_DUST, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_DIGLETT] = + { + .baseHP = 10, + .baseAttack = 55, + .baseDefense = 25, + .baseSpeed = 95, + .baseSpAttack = 35, + .baseSpDefense = 45, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 255, + .expYield = 81, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SAND_VEIL, + .ability2 = ABILITY_ARENA_TRAP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_DUGTRIO] = + { + .baseHP = 35, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 120, + .baseSpAttack = 50, + .baseSpDefense = 70, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 50, + .expYield = 153, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SAND_VEIL, + .ability2 = ABILITY_ARENA_TRAP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_MEOWTH] = + { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 35, + .baseSpeed = 90, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 69, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_PICKUP, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_PERSIAN] = + { + .baseHP = 65, + .baseAttack = 70, + .baseDefense = 60, + .baseSpeed = 115, + .baseSpAttack = 65, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 90, + .expYield = 148, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_LIMBER, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_PSYDUCK] = + { + .baseHP = 50, + .baseAttack = 52, + .baseDefense = 48, + .baseSpeed = 55, + .baseSpAttack = 65, + .baseSpDefense = 50, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 190, + .expYield = 80, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_DAMP, + .ability2 = ABILITY_CLOUD_NINE, + .safariZoneFleeRate = 6, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_GOLDUCK] = + { + .baseHP = 80, + .baseAttack = 82, + .baseDefense = 78, + .baseSpeed = 85, + .baseSpAttack = 95, + .baseSpDefense = 80, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 75, + .expYield = 174, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_DAMP, + .ability2 = ABILITY_CLOUD_NINE, + .safariZoneFleeRate = 8, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_MANKEY] = + { + .baseHP = 40, + .baseAttack = 80, + .baseDefense = 35, + .baseSpeed = 70, + .baseSpAttack = 35, + .baseSpDefense = 45, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 190, + .expYield = 74, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_VITAL_SPIRIT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_PRIMEAPE] = + { + .baseHP = 65, + .baseAttack = 105, + .baseDefense = 60, + .baseSpeed = 95, + .baseSpAttack = 60, + .baseSpDefense = 70, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 75, + .expYield = 149, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_VITAL_SPIRIT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_GROWLITHE] = + { + .baseHP = 55, + .baseAttack = 70, + .baseDefense = 45, + .baseSpeed = 60, + .baseSpAttack = 70, + .baseSpDefense = 50, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 190, + .expYield = 91, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_FLASH_FIRE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_ARCANINE] = + { + .baseHP = 90, + .baseAttack = 110, + .baseDefense = 80, + .baseSpeed = 95, + .baseSpAttack = 100, + .baseSpDefense = 80, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 75, + .expYield = 213, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_FLASH_FIRE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_POLIWAG] = + { + .baseHP = 40, + .baseAttack = 50, + .baseDefense = 40, + .baseSpeed = 90, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 255, + .expYield = 77, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_WATER_ABSORB, + .ability2 = ABILITY_DAMP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + }, + + [SPECIES_POLIWHIRL] = + { + .baseHP = 65, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 90, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 120, + .expYield = 131, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_KINGS_ROCK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_WATER_ABSORB, + .ability2 = ABILITY_DAMP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + }, + + [SPECIES_POLIWRATH] = + { + .baseHP = 90, + .baseAttack = 85, + .baseDefense = 95, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 90, + .type1 = TYPE_WATER, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 185, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 3, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_KINGS_ROCK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_WATER_ABSORB, + .ability2 = ABILITY_DAMP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + }, + + [SPECIES_ABRA] = + { + .baseHP = 25, + .baseAttack = 20, + .baseDefense = 15, + .baseSpeed = 90, + .baseSpAttack = 105, + .baseSpDefense = 55, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 200, + .expYield = 73, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_TWISTED_SPOON, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_INNER_FOCUS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_KADABRA] = + { + .baseHP = 40, + .baseAttack = 35, + .baseDefense = 30, + .baseSpeed = 105, + .baseSpAttack = 120, + .baseSpDefense = 70, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 100, + .expYield = 145, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_TWISTED_SPOON, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_INNER_FOCUS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_ALAKAZAM] = + { + .baseHP = 55, + .baseAttack = 50, + .baseDefense = 45, + .baseSpeed = 120, + .baseSpAttack = 135, + .baseSpDefense = 85, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 50, + .expYield = 186, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_TWISTED_SPOON, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_INNER_FOCUS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_MACHOP] = + { + .baseHP = 70, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 35, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 180, + .expYield = 88, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_MACHOKE] = + { + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 45, + .baseSpAttack = 50, + .baseSpDefense = 60, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 90, + .expYield = 146, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_MACHAMP] = + { + .baseHP = 90, + .baseAttack = 130, + .baseDefense = 80, + .baseSpeed = 55, + .baseSpAttack = 65, + .baseSpDefense = 85, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 193, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_BELLSPROUT] = + { + .baseHP = 50, + .baseAttack = 75, + .baseDefense = 35, + .baseSpeed = 40, + .baseSpAttack = 70, + .baseSpDefense = 30, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 255, + .expYield = 84, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_WEEPINBELL] = + { + .baseHP = 65, + .baseAttack = 90, + .baseDefense = 50, + .baseSpeed = 55, + .baseSpAttack = 85, + .baseSpDefense = 45, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 120, + .expYield = 151, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_VICTREEBEL] = + { + .baseHP = 80, + .baseAttack = 105, + .baseDefense = 65, + .baseSpeed = 70, + .baseSpAttack = 100, + .baseSpDefense = 60, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 191, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_TENTACOOL] = + { + .baseHP = 40, + .baseAttack = 40, + .baseDefense = 35, + .baseSpeed = 70, + .baseSpAttack = 50, + .baseSpDefense = 100, + .type1 = TYPE_WATER, + .type2 = TYPE_POISON, + .catchRate = 190, + .expYield = 105, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_LIQUID_OOZE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_TENTACRUEL] = + { + .baseHP = 80, + .baseAttack = 70, + .baseDefense = 65, + .baseSpeed = 100, + .baseSpAttack = 80, + .baseSpDefense = 120, + .type1 = TYPE_WATER, + .type2 = TYPE_POISON, + .catchRate = 60, + .expYield = 205, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_LIQUID_OOZE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_GEODUDE] = + { + .baseHP = 40, + .baseAttack = 80, + .baseDefense = 100, + .baseSpeed = 20, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_ROCK, + .type2 = TYPE_GROUND, + .catchRate = 255, + .expYield = 86, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_EVERSTONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 4, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_GRAVELER] = + { + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 115, + .baseSpeed = 35, + .baseSpAttack = 45, + .baseSpDefense = 45, + .type1 = TYPE_ROCK, + .type2 = TYPE_GROUND, + .catchRate = 120, + .expYield = 134, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_EVERSTONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_GOLEM] = + { + .baseHP = 80, + .baseAttack = 110, + .baseDefense = 130, + .baseSpeed = 45, + .baseSpAttack = 55, + .baseSpDefense = 65, + .type1 = TYPE_ROCK, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 177, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 3, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_EVERSTONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_PONYTA] = + { + .baseHP = 50, + .baseAttack = 85, + .baseDefense = 55, + .baseSpeed = 90, + .baseSpAttack = 65, + .baseSpDefense = 65, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 190, + .expYield = 152, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_FLASH_FIRE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_RAPIDASH] = + { + .baseHP = 65, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 105, + .baseSpAttack = 80, + .baseSpDefense = 80, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 60, + .expYield = 192, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_FLASH_FIRE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_SLOWPOKE] = + { + .baseHP = 90, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 15, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_WATER, + .type2 = TYPE_PSYCHIC, + .catchRate = 190, + .expYield = 99, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_KINGS_ROCK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_OWN_TEMPO, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_SLOWBRO] = + { + .baseHP = 95, + .baseAttack = 75, + .baseDefense = 110, + .baseSpeed = 30, + .baseSpAttack = 100, + .baseSpDefense = 80, + .type1 = TYPE_WATER, + .type2 = TYPE_PSYCHIC, + .catchRate = 75, + .expYield = 164, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_KINGS_ROCK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_OWN_TEMPO, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_MAGNEMITE] = + { + .baseHP = 25, + .baseAttack = 35, + .baseDefense = 70, + .baseSpeed = 45, + .baseSpAttack = 95, + .baseSpDefense = 55, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_STEEL, + .catchRate = 190, + .expYield = 89, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_METAL_COAT, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_MAGNET_PULL, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_MAGNETON] = + { + .baseHP = 50, + .baseAttack = 60, + .baseDefense = 95, + .baseSpeed = 70, + .baseSpAttack = 120, + .baseSpDefense = 70, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_STEEL, + .catchRate = 60, + .expYield = 161, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_METAL_COAT, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_MAGNET_PULL, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_FARFETCHD] = + { + .baseHP = 52, + .baseAttack = 65, + .baseDefense = 55, + .baseSpeed = 60, + .baseSpAttack = 58, + .baseSpDefense = 62, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 94, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_STICK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_INNER_FOCUS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_DODUO] = + { + .baseHP = 35, + .baseAttack = 85, + .baseDefense = 45, + .baseSpeed = 75, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 190, + .expYield = 96, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SHARP_BEAK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 8, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_DODRIO] = + { + .baseHP = 60, + .baseAttack = 110, + .baseDefense = 70, + .baseSpeed = 100, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 158, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SHARP_BEAK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 10, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SEEL] = + { + .baseHP = 65, + .baseAttack = 45, + .baseDefense = 55, + .baseSpeed = 45, + .baseSpAttack = 45, + .baseSpDefense = 70, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 190, + .expYield = 100, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_DEWGONG] = + { + .baseHP = 90, + .baseAttack = 70, + .baseDefense = 80, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 95, + .type1 = TYPE_WATER, + .type2 = TYPE_ICE, + .catchRate = 75, + .expYield = 176, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_GRIMER] = + { + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 25, + .baseSpAttack = 40, + .baseSpDefense = 50, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 190, + .expYield = 90, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NUGGET, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_STENCH, + .ability2 = ABILITY_STICKY_HOLD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_MUK] = + { + .baseHP = 105, + .baseAttack = 105, + .baseDefense = 75, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 100, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 75, + .expYield = 157, + .evYield_HP = 1, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NUGGET, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_STENCH, + .ability2 = ABILITY_STICKY_HOLD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_SHELLDER] = + { + .baseHP = 30, + .baseAttack = 65, + .baseDefense = 100, + .baseSpeed = 40, + .baseSpAttack = 45, + .baseSpDefense = 25, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 190, + .expYield = 97, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_PEARL, + .item2 = ITEM_BIG_PEARL, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SHELL_ARMOR, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_CLOYSTER] = + { + .baseHP = 50, + .baseAttack = 95, + .baseDefense = 180, + .baseSpeed = 70, + .baseSpAttack = 85, + .baseSpDefense = 45, + .type1 = TYPE_WATER, + .type2 = TYPE_ICE, + .catchRate = 60, + .expYield = 203, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_PEARL, + .item2 = ITEM_BIG_PEARL, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SHELL_ARMOR, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_GASTLY] = + { + .baseHP = 30, + .baseAttack = 35, + .baseDefense = 30, + .baseSpeed = 80, + .baseSpAttack = 100, + .baseSpDefense = 35, + .type1 = TYPE_GHOST, + .type2 = TYPE_POISON, + .catchRate = 190, + .expYield = 95, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_HAUNTER] = + { + .baseHP = 45, + .baseAttack = 50, + .baseDefense = 45, + .baseSpeed = 95, + .baseSpAttack = 115, + .baseSpDefense = 55, + .type1 = TYPE_GHOST, + .type2 = TYPE_POISON, + .catchRate = 90, + .expYield = 126, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_GENGAR] = + { + .baseHP = 60, + .baseAttack = 65, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 130, + .baseSpDefense = 75, + .type1 = TYPE_GHOST, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 190, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_ONIX] = + { + .baseHP = 35, + .baseAttack = 45, + .baseDefense = 160, + .baseSpeed = 70, + .baseSpAttack = 30, + .baseSpDefense = 45, + .type1 = TYPE_ROCK, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 108, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_DROWZEE] = + { + .baseHP = 60, + .baseAttack = 48, + .baseDefense = 45, + .baseSpeed = 42, + .baseSpAttack = 43, + .baseSpDefense = 90, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 190, + .expYield = 102, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_INSOMNIA, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_HYPNO] = + { + .baseHP = 85, + .baseAttack = 73, + .baseDefense = 70, + .baseSpeed = 67, + .baseSpAttack = 73, + .baseSpDefense = 115, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 75, + .expYield = 165, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_INSOMNIA, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_KRABBY] = + { + .baseHP = 30, + .baseAttack = 105, + .baseDefense = 90, + .baseSpeed = 50, + .baseSpAttack = 25, + .baseSpDefense = 25, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 225, + .expYield = 115, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_SHELL_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_KINGLER] = + { + .baseHP = 55, + .baseAttack = 130, + .baseDefense = 115, + .baseSpeed = 75, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 60, + .expYield = 206, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_SHELL_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = TRUE, + }, + + [SPECIES_VOLTORB] = + { + .baseHP = 40, + .baseAttack = 30, + .baseDefense = 50, + .baseSpeed = 100, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 190, + .expYield = 103, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_SOUNDPROOF, + .ability2 = ABILITY_STATIC, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_ELECTRODE] = + { + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 70, + .baseSpeed = 140, + .baseSpAttack = 80, + .baseSpDefense = 80, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 60, + .expYield = 150, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_SOUNDPROOF, + .ability2 = ABILITY_STATIC, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_EXEGGCUTE] = + { + .baseHP = 60, + .baseAttack = 40, + .baseDefense = 80, + .baseSpeed = 40, + .baseSpAttack = 60, + .baseSpDefense = 45, + .type1 = TYPE_GRASS, + .type2 = TYPE_PSYCHIC, + .catchRate = 90, + .expYield = 98, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_EXEGGUTOR] = + { + .baseHP = 95, + .baseAttack = 95, + .baseDefense = 85, + .baseSpeed = 55, + .baseSpAttack = 125, + .baseSpDefense = 65, + .type1 = TYPE_GRASS, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 212, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_CUBONE] = + { + .baseHP = 50, + .baseAttack = 50, + .baseDefense = 95, + .baseSpeed = 35, + .baseSpAttack = 40, + .baseSpDefense = 50, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 190, + .expYield = 87, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_THICK_CLUB, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_LIGHTNING_ROD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_MAROWAK] = + { + .baseHP = 60, + .baseAttack = 80, + .baseDefense = 110, + .baseSpeed = 45, + .baseSpAttack = 50, + .baseSpDefense = 80, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 75, + .expYield = 124, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_THICK_CLUB, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_LIGHTNING_ROD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_HITMONLEE] = + { + .baseHP = 50, + .baseAttack = 120, + .baseDefense = 53, + .baseSpeed = 87, + .baseSpAttack = 35, + .baseSpDefense = 110, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 139, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_LIMBER, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_HITMONCHAN] = + { + .baseHP = 50, + .baseAttack = 105, + .baseDefense = 79, + .baseSpeed = 76, + .baseSpAttack = 35, + .baseSpDefense = 110, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 140, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_LICKITUNG] = + { + .baseHP = 90, + .baseAttack = 55, + .baseDefense = 75, + .baseSpeed = 30, + .baseSpAttack = 60, + .baseSpDefense = 75, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 127, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_OWN_TEMPO, + .ability2 = ABILITY_OBLIVIOUS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_KOFFING] = + { + .baseHP = 40, + .baseAttack = 65, + .baseDefense = 95, + .baseSpeed = 35, + .baseSpAttack = 60, + .baseSpDefense = 45, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 190, + .expYield = 114, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SMOKE_BALL, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_WEEZING] = + { + .baseHP = 65, + .baseAttack = 90, + .baseDefense = 120, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 70, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 60, + .expYield = 173, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SMOKE_BALL, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_RHYHORN] = + { + .baseHP = 80, + .baseAttack = 85, + .baseDefense = 95, + .baseSpeed = 25, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_GROUND, + .type2 = TYPE_ROCK, + .catchRate = 120, + .expYield = 135, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_LIGHTNING_ROD, + .ability2 = ABILITY_ROCK_HEAD, + .safariZoneFleeRate = 4, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_RHYDON] = + { + .baseHP = 105, + .baseAttack = 130, + .baseDefense = 120, + .baseSpeed = 40, + .baseSpAttack = 45, + .baseSpDefense = 45, + .type1 = TYPE_GROUND, + .type2 = TYPE_ROCK, + .catchRate = 60, + .expYield = 204, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_LIGHTNING_ROD, + .ability2 = ABILITY_ROCK_HEAD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_CHANSEY] = + { + .baseHP = 250, + .baseAttack = 5, + .baseDefense = 5, + .baseSpeed = 50, + .baseSpAttack = 35, + .baseSpDefense = 105, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 30, + .expYield = 255, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_LUCKY_EGG, + .genderRatio = 254, + .eggCycles = 40, + .friendship = 140, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_NATURAL_CURE, + .ability2 = ABILITY_SERENE_GRACE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_TANGELA] = + { + .baseHP = 65, + .baseAttack = 55, + .baseDefense = 115, + .baseSpeed = 60, + .baseSpAttack = 100, + .baseSpDefense = 40, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 166, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_KANGASKHAN] = + { + .baseHP = 105, + .baseAttack = 95, + .baseDefense = 80, + .baseSpeed = 90, + .baseSpAttack = 40, + .baseSpDefense = 80, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 175, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 254, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_EARLY_BIRD, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_HORSEA] = + { + .baseHP = 30, + .baseAttack = 40, + .baseDefense = 70, + .baseSpeed = 60, + .baseSpAttack = 70, + .baseSpDefense = 25, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 225, + .expYield = 83, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SEADRA] = + { + .baseHP = 55, + .baseAttack = 65, + .baseDefense = 95, + .baseSpeed = 85, + .baseSpAttack = 95, + .baseSpDefense = 45, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 75, + .expYield = 155, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_GOLDEEN] = + { + .baseHP = 45, + .baseAttack = 67, + .baseDefense = 60, + .baseSpeed = 63, + .baseSpAttack = 35, + .baseSpDefense = 50, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 225, + .expYield = 111, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_WATER_VEIL, + .safariZoneFleeRate = 4, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SEAKING] = + { + .baseHP = 80, + .baseAttack = 92, + .baseDefense = 65, + .baseSpeed = 68, + .baseSpAttack = 65, + .baseSpDefense = 80, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 60, + .expYield = 170, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_WATER_VEIL, + .safariZoneFleeRate = 6, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_STARYU] = + { + .baseHP = 30, + .baseAttack = 45, + .baseDefense = 55, + .baseSpeed = 85, + .baseSpAttack = 70, + .baseSpDefense = 55, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 225, + .expYield = 106, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_STARDUST, + .item2 = ITEM_STAR_PIECE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_ILLUMINATE, + .ability2 = ABILITY_NATURAL_CURE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_STARMIE] = + { + .baseHP = 60, + .baseAttack = 75, + .baseDefense = 85, + .baseSpeed = 115, + .baseSpAttack = 100, + .baseSpDefense = 85, + .type1 = TYPE_WATER, + .type2 = TYPE_PSYCHIC, + .catchRate = 60, + .expYield = 207, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_STARDUST, + .item2 = ITEM_STAR_PIECE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_ILLUMINATE, + .ability2 = ABILITY_NATURAL_CURE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_MR_MIME] = + { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 65, + .baseSpeed = 90, + .baseSpAttack = 100, + .baseSpDefense = 120, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 136, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_LEPPA_BERRY, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_SOUNDPROOF, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_SCYTHER] = + { + .baseHP = 70, + .baseAttack = 110, + .baseDefense = 80, + .baseSpeed = 105, + .baseSpAttack = 55, + .baseSpDefense = 80, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 187, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_JYNX] = + { + .baseHP = 65, + .baseAttack = 50, + .baseDefense = 35, + .baseSpeed = 95, + .baseSpAttack = 115, + .baseSpDefense = 95, + .type1 = TYPE_ICE, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 137, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_ASPEAR_BERRY, + .item2 = ITEM_ASPEAR_BERRY, + .genderRatio = 254, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_ELECTABUZZ] = + { + .baseHP = 65, + .baseAttack = 83, + .baseDefense = 57, + .baseSpeed = 105, + .baseSpAttack = 95, + .baseSpDefense = 85, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 45, + .expYield = 156, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 63, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, + }, + + [SPECIES_MAGMAR] = + { + .baseHP = 65, + .baseAttack = 95, + .baseDefense = 57, + .baseSpeed = 93, + .baseSpAttack = 100, + .baseSpDefense = 85, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 167, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 63, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_FLAME_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_PINSIR] = + { + .baseHP = 65, + .baseAttack = 125, + .baseDefense = 100, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 70, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 45, + .expYield = 200, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 8, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_TAUROS] = + { + .baseHP = 75, + .baseAttack = 100, + .baseDefense = 95, + .baseSpeed = 110, + .baseSpAttack = 40, + .baseSpDefense = 70, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 211, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_MAGIKARP] = + { + .baseHP = 20, + .baseAttack = 10, + .baseDefense = 55, + .baseSpeed = 80, + .baseSpAttack = 15, + .baseSpDefense = 20, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 255, + .expYield = 20, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 5, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 4, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_GYARADOS] = + { + .baseHP = 95, + .baseAttack = 125, + .baseDefense = 79, + .baseSpeed = 81, + .baseSpAttack = 60, + .baseSpDefense = 100, + .type1 = TYPE_WATER, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 214, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 5, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_LAPRAS] = + { + .baseHP = 130, + .baseAttack = 85, + .baseDefense = 80, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 95, + .type1 = TYPE_WATER, + .type2 = TYPE_ICE, + .catchRate = 45, + .expYield = 219, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_WATER_ABSORB, + .ability2 = ABILITY_SHELL_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_DITTO] = + { + .baseHP = 48, + .baseAttack = 48, + .baseDefense = 48, + .baseSpeed = 48, + .baseSpAttack = 48, + .baseSpDefense = 48, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 35, + .expYield = 61, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_METAL_POWDER, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_DITTO, + .eggGroup2 = EGG_GROUP_DITTO, + .ability1 = ABILITY_LIMBER, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_EEVEE] = + { + .baseHP = 55, + .baseAttack = 55, + .baseDefense = 50, + .baseSpeed = 55, + .baseSpAttack = 45, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 92, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 35, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_VAPOREON] = + { + .baseHP = 130, + .baseAttack = 65, + .baseDefense = 60, + .baseSpeed = 65, + .baseSpAttack = 110, + .baseSpDefense = 95, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 196, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 35, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_WATER_ABSORB, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_JOLTEON] = + { + .baseHP = 65, + .baseAttack = 65, + .baseDefense = 60, + .baseSpeed = 130, + .baseSpAttack = 110, + .baseSpDefense = 95, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 45, + .expYield = 197, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 35, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_VOLT_ABSORB, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_FLAREON] = + { + .baseHP = 65, + .baseAttack = 130, + .baseDefense = 60, + .baseSpeed = 65, + .baseSpAttack = 95, + .baseSpDefense = 110, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 198, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 35, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_FLASH_FIRE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_PORYGON] = + { + .baseHP = 65, + .baseAttack = 60, + .baseDefense = 70, + .baseSpeed = 40, + .baseSpAttack = 85, + .baseSpDefense = 75, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 130, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_TRACE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_OMANYTE] = + { + .baseHP = 35, + .baseAttack = 40, + .baseDefense = 100, + .baseSpeed = 35, + .baseSpAttack = 90, + .baseSpDefense = 55, + .type1 = TYPE_ROCK, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 120, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_SHELL_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_OMASTAR] = + { + .baseHP = 70, + .baseAttack = 60, + .baseDefense = 125, + .baseSpeed = 55, + .baseSpAttack = 115, + .baseSpDefense = 70, + .type1 = TYPE_ROCK, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 199, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_SHELL_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_KABUTO] = + { + .baseHP = 30, + .baseAttack = 80, + .baseDefense = 90, + .baseSpeed = 55, + .baseSpAttack = 55, + .baseSpDefense = 45, + .type1 = TYPE_ROCK, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 119, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_BATTLE_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_KABUTOPS] = + { + .baseHP = 60, + .baseAttack = 115, + .baseDefense = 105, + .baseSpeed = 80, + .baseSpAttack = 65, + .baseSpDefense = 70, + .type1 = TYPE_ROCK, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 201, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_BATTLE_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_AERODACTYL] = + { + .baseHP = 80, + .baseAttack = 105, + .baseDefense = 65, + .baseSpeed = 130, + .baseSpAttack = 60, + .baseSpDefense = 75, + .type1 = TYPE_ROCK, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 202, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 35, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_PRESSURE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_SNORLAX] = + { + .baseHP = 160, + .baseAttack = 110, + .baseDefense = 65, + .baseSpeed = 30, + .baseSpAttack = 65, + .baseSpDefense = 110, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 25, + .expYield = 154, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_LEFTOVERS, + .item2 = ITEM_LEFTOVERS, + .genderRatio = 31, + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_IMMUNITY, + .ability2 = ABILITY_THICK_FAT, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_ARTICUNO] = + { + .baseHP = 90, + .baseAttack = 85, + .baseDefense = 100, + .baseSpeed = 85, + .baseSpAttack = 95, + .baseSpDefense = 125, + .type1 = TYPE_ICE, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 215, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_ZAPDOS] = + { + .baseHP = 90, + .baseAttack = 90, + .baseDefense = 85, + .baseSpeed = 100, + .baseSpAttack = 125, + .baseSpDefense = 90, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 216, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_MOLTRES] = + { + .baseHP = 90, + .baseAttack = 100, + .baseDefense = 90, + .baseSpeed = 90, + .baseSpAttack = 125, + .baseSpDefense = 85, + .type1 = TYPE_FIRE, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 217, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_DRATINI] = + { + .baseHP = 41, + .baseAttack = 64, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_DRAGON, + .type2 = TYPE_DRAGON, + .catchRate = 45, + .expYield = 67, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_DRAGONAIR] = + { + .baseHP = 61, + .baseAttack = 84, + .baseDefense = 65, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 70, + .type1 = TYPE_DRAGON, + .type2 = TYPE_DRAGON, + .catchRate = 45, + .expYield = 144, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_DRAGONITE] = + { + .baseHP = 91, + .baseAttack = 134, + .baseDefense = 95, + .baseSpeed = 80, + .baseSpAttack = 100, + .baseSpDefense = 100, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 218, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_MEWTWO] = + { + .baseHP = 106, + .baseAttack = 110, + .baseDefense = 90, + .baseSpeed = 130, + .baseSpAttack = 154, + .baseSpDefense = 90, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 220, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_MEW] = + { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 100, + .baseSpAttack = 100, + .baseSpDefense = 100, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 64, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_LUM_BERRY, + .item2 = ITEM_LUM_BERRY, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_CHIKORITA] = + { + .baseHP = 45, + .baseAttack = 49, + .baseDefense = 65, + .baseSpeed = 45, + .baseSpAttack = 49, + .baseSpDefense = 65, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 64, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_BAYLEEF] = + { + .baseHP = 60, + .baseAttack = 62, + .baseDefense = 80, + .baseSpeed = 60, + .baseSpAttack = 63, + .baseSpDefense = 80, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 141, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_MEGANIUM] = + { + .baseHP = 80, + .baseAttack = 82, + .baseDefense = 100, + .baseSpeed = 80, + .baseSpAttack = 83, + .baseSpDefense = 100, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 208, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_CYNDAQUIL] = + { + .baseHP = 39, + .baseAttack = 52, + .baseDefense = 43, + .baseSpeed = 65, + .baseSpAttack = 60, + .baseSpDefense = 50, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 65, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_QUILAVA] = + { + .baseHP = 58, + .baseAttack = 64, + .baseDefense = 58, + .baseSpeed = 80, + .baseSpAttack = 80, + .baseSpDefense = 65, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 142, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_TYPHLOSION] = + { + .baseHP = 78, + .baseAttack = 84, + .baseDefense = 78, + .baseSpeed = 100, + .baseSpAttack = 109, + .baseSpDefense = 85, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 209, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_TOTODILE] = + { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 64, + .baseSpeed = 43, + .baseSpAttack = 44, + .baseSpDefense = 48, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 66, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_CROCONAW] = + { + .baseHP = 65, + .baseAttack = 80, + .baseDefense = 80, + .baseSpeed = 58, + .baseSpAttack = 59, + .baseSpDefense = 63, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 143, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = TRUE, + }, + + [SPECIES_FERALIGATR] = + { + .baseHP = 85, + .baseAttack = 105, + .baseDefense = 100, + .baseSpeed = 78, + .baseSpAttack = 79, + .baseSpDefense = 83, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 210, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SENTRET] = + { + .baseHP = 35, + .baseAttack = 46, + .baseDefense = 34, + .baseSpeed = 20, + .baseSpAttack = 35, + .baseSpDefense = 45, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 57, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_ORAN_BERRY, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_KEEN_EYE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_FURRET] = + { + .baseHP = 85, + .baseAttack = 76, + .baseDefense = 64, + .baseSpeed = 90, + .baseSpAttack = 45, + .baseSpDefense = 55, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 90, + .expYield = 116, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_ORAN_BERRY, + .item2 = ITEM_SITRUS_BERRY, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_KEEN_EYE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_HOOTHOOT] = + { + .baseHP = 60, + .baseAttack = 30, + .baseDefense = 30, + .baseSpeed = 50, + .baseSpAttack = 36, + .baseSpDefense = 56, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 255, + .expYield = 58, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_INSOMNIA, + .ability2 = ABILITY_KEEN_EYE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_NOCTOWL] = + { + .baseHP = 100, + .baseAttack = 50, + .baseDefense = 50, + .baseSpeed = 70, + .baseSpAttack = 76, + .baseSpDefense = 96, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 90, + .expYield = 162, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_INSOMNIA, + .ability2 = ABILITY_KEEN_EYE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_LEDYBA] = + { + .baseHP = 40, + .baseAttack = 20, + .baseDefense = 30, + .baseSpeed = 55, + .baseSpAttack = 40, + .baseSpDefense = 80, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 255, + .expYield = 54, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_LEDIAN] = + { + .baseHP = 55, + .baseAttack = 35, + .baseDefense = 50, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 110, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 90, + .expYield = 134, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SPINARAK] = + { + .baseHP = 40, + .baseAttack = 60, + .baseDefense = 40, + .baseSpeed = 30, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 255, + .expYield = 54, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_INSOMNIA, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_ARIADOS] = + { + .baseHP = 70, + .baseAttack = 90, + .baseDefense = 70, + .baseSpeed = 40, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 90, + .expYield = 134, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_INSOMNIA, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_CROBAT] = + { + .baseHP = 85, + .baseAttack = 90, + .baseDefense = 80, + .baseSpeed = 130, + .baseSpAttack = 70, + .baseSpDefense = 80, + .type1 = TYPE_POISON, + .type2 = TYPE_FLYING, + .catchRate = 90, + .expYield = 204, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 3, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_CHINCHOU] = + { + .baseHP = 75, + .baseAttack = 38, + .baseDefense = 38, + .baseSpeed = 67, + .baseSpAttack = 56, + .baseSpDefense = 56, + .type1 = TYPE_WATER, + .type2 = TYPE_ELECTRIC, + .catchRate = 190, + .expYield = 90, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_YELLOW_SHARD, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_VOLT_ABSORB, + .ability2 = ABILITY_ILLUMINATE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_LANTURN] = + { + .baseHP = 125, + .baseAttack = 58, + .baseDefense = 58, + .baseSpeed = 67, + .baseSpAttack = 76, + .baseSpDefense = 76, + .type1 = TYPE_WATER, + .type2 = TYPE_ELECTRIC, + .catchRate = 75, + .expYield = 156, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_YELLOW_SHARD, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_VOLT_ABSORB, + .ability2 = ABILITY_ILLUMINATE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_PICHU] = + { + .baseHP = 20, + .baseAttack = 40, + .baseDefense = 15, + .baseSpeed = 60, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 190, + .expYield = 42, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_ORAN_BERRY, + .genderRatio = 127, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_CLEFFA] = + { + .baseHP = 50, + .baseAttack = 25, + .baseDefense = 28, + .baseSpeed = 15, + .baseSpAttack = 45, + .baseSpDefense = 55, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 150, + .expYield = 37, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_LEPPA_BERRY, + .item2 = ITEM_MOON_STONE, + .genderRatio = 191, + .eggCycles = 10, + .friendship = 140, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_IGGLYBUFF] = + { + .baseHP = 90, + .baseAttack = 30, + .baseDefense = 15, + .baseSpeed = 15, + .baseSpAttack = 40, + .baseSpDefense = 20, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 170, + .expYield = 39, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 191, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = TRUE, + }, + + [SPECIES_TOGEPI] = + { + .baseHP = 35, + .baseAttack = 20, + .baseDefense = 65, + .baseSpeed = 20, + .baseSpAttack = 40, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 190, + .expYield = 74, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_HUSTLE, + .ability2 = ABILITY_SERENE_GRACE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_TOGETIC] = + { + .baseHP = 55, + .baseAttack = 40, + .baseDefense = 85, + .baseSpeed = 40, + .baseSpAttack = 80, + .baseSpDefense = 105, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 75, + .expYield = 114, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_HUSTLE, + .ability2 = ABILITY_SERENE_GRACE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_NATU] = + { + .baseHP = 40, + .baseAttack = 50, + .baseDefense = 45, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 45, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_FLYING, + .catchRate = 190, + .expYield = 73, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 6, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_XATU] = + { + .baseHP = 65, + .baseAttack = 75, + .baseDefense = 70, + .baseSpeed = 95, + .baseSpAttack = 95, + .baseSpDefense = 70, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_FLYING, + .catchRate = 75, + .expYield = 171, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 8, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_MAREEP] = + { + .baseHP = 55, + .baseAttack = 40, + .baseDefense = 40, + .baseSpeed = 35, + .baseSpAttack = 65, + .baseSpDefense = 45, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 235, + .expYield = 59, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_FLAAFFY] = + { + .baseHP = 70, + .baseAttack = 55, + .baseDefense = 55, + .baseSpeed = 45, + .baseSpAttack = 80, + .baseSpDefense = 60, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 120, + .expYield = 117, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_AMPHAROS] = + { + .baseHP = 90, + .baseAttack = 75, + .baseDefense = 75, + .baseSpeed = 55, + .baseSpAttack = 115, + .baseSpDefense = 90, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 45, + .expYield = 194, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_BELLOSSOM] = + { + .baseHP = 75, + .baseAttack = 80, + .baseDefense = 85, + .baseSpeed = 50, + .baseSpAttack = 90, + .baseSpDefense = 100, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 184, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_MARILL] = + { + .baseHP = 70, + .baseAttack = 20, + .baseDefense = 50, + .baseSpeed = 40, + .baseSpAttack = 20, + .baseSpDefense = 50, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 190, + .expYield = 58, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_HUGE_POWER, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_AZUMARILL] = + { + .baseHP = 100, + .baseAttack = 50, + .baseDefense = 80, + .baseSpeed = 50, + .baseSpAttack = 50, + .baseSpDefense = 80, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 75, + .expYield = 153, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_HUGE_POWER, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SUDOWOODO] = + { + .baseHP = 70, + .baseAttack = 100, + .baseDefense = 115, + .baseSpeed = 30, + .baseSpAttack = 30, + .baseSpDefense = 65, + .type1 = TYPE_ROCK, + .type2 = TYPE_ROCK, + .catchRate = 65, + .expYield = 135, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_ROCK_HEAD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_POLITOED] = + { + .baseHP = 90, + .baseAttack = 75, + .baseDefense = 75, + .baseSpeed = 70, + .baseSpAttack = 90, + .baseSpDefense = 100, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 185, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_KINGS_ROCK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_WATER_ABSORB, + .ability2 = ABILITY_DAMP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + }, + + [SPECIES_HOPPIP] = + { + .baseHP = 35, + .baseAttack = 35, + .baseDefense = 40, + .baseSpeed = 50, + .baseSpAttack = 35, + .baseSpDefense = 55, + .type1 = TYPE_GRASS, + .type2 = TYPE_FLYING, + .catchRate = 255, + .expYield = 74, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_SKIPLOOM] = + { + .baseHP = 55, + .baseAttack = 45, + .baseDefense = 50, + .baseSpeed = 80, + .baseSpAttack = 45, + .baseSpDefense = 65, + .type1 = TYPE_GRASS, + .type2 = TYPE_FLYING, + .catchRate = 120, + .expYield = 136, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_JUMPLUFF] = + { + .baseHP = 75, + .baseAttack = 55, + .baseDefense = 70, + .baseSpeed = 110, + .baseSpAttack = 55, + .baseSpDefense = 85, + .type1 = TYPE_GRASS, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 176, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 3, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_AIPOM] = + { + .baseHP = 55, + .baseAttack = 70, + .baseDefense = 55, + .baseSpeed = 85, + .baseSpAttack = 40, + .baseSpDefense = 55, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 94, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_PICKUP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_SUNKERN] = + { + .baseHP = 30, + .baseAttack = 30, + .baseDefense = 30, + .baseSpeed = 30, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 235, + .expYield = 52, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_SUNFLORA] = + { + .baseHP = 75, + .baseAttack = 75, + .baseDefense = 55, + .baseSpeed = 30, + .baseSpAttack = 105, + .baseSpDefense = 85, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 120, + .expYield = 146, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_YANMA] = + { + .baseHP = 65, + .baseAttack = 65, + .baseDefense = 45, + .baseSpeed = 95, + .baseSpAttack = 75, + .baseSpDefense = 45, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 75, + .expYield = 147, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SPEED_BOOST, + .ability2 = ABILITY_COMPOUND_EYES, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_WOOPER] = + { + .baseHP = 55, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 15, + .baseSpAttack = 25, + .baseSpDefense = 25, + .type1 = TYPE_WATER, + .type2 = TYPE_GROUND, + .catchRate = 255, + .expYield = 52, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_DAMP, + .ability2 = ABILITY_WATER_ABSORB, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_QUAGSIRE] = + { + .baseHP = 95, + .baseAttack = 85, + .baseDefense = 85, + .baseSpeed = 35, + .baseSpAttack = 65, + .baseSpDefense = 65, + .type1 = TYPE_WATER, + .type2 = TYPE_GROUND, + .catchRate = 90, + .expYield = 137, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_DAMP, + .ability2 = ABILITY_WATER_ABSORB, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_ESPEON] = + { + .baseHP = 65, + .baseAttack = 65, + .baseDefense = 60, + .baseSpeed = 110, + .baseSpAttack = 130, + .baseSpDefense = 95, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 197, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 35, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_UMBREON] = + { + .baseHP = 95, + .baseAttack = 65, + .baseDefense = 110, + .baseSpeed = 65, + .baseSpAttack = 60, + .baseSpDefense = 130, + .type1 = TYPE_DARK, + .type2 = TYPE_DARK, + .catchRate = 45, + .expYield = 197, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 35, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_MURKROW] = + { + .baseHP = 60, + .baseAttack = 85, + .baseDefense = 42, + .baseSpeed = 91, + .baseSpAttack = 85, + .baseSpDefense = 42, + .type1 = TYPE_DARK, + .type2 = TYPE_FLYING, + .catchRate = 30, + .expYield = 107, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_INSOMNIA, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_SLOWKING] = + { + .baseHP = 95, + .baseAttack = 75, + .baseDefense = 80, + .baseSpeed = 30, + .baseSpAttack = 100, + .baseSpDefense = 110, + .type1 = TYPE_WATER, + .type2 = TYPE_PSYCHIC, + .catchRate = 70, + .expYield = 164, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_KINGS_ROCK, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_OWN_TEMPO, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_MISDREAVUS] = + { + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 60, + .baseSpeed = 85, + .baseSpAttack = 85, + .baseSpDefense = 85, + .type1 = TYPE_GHOST, + .type2 = TYPE_GHOST, + .catchRate = 45, + .expYield = 147, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_SPELL_TAG, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_UNOWN] = + { + .baseHP = 48, + .baseAttack = 72, + .baseDefense = 48, + .baseSpeed = 48, + .baseSpAttack = 72, + .baseSpDefense = 48, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 225, + .expYield = 61, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + }, + + [SPECIES_WOBBUFFET] = + { + .baseHP = 190, + .baseAttack = 33, + .baseDefense = 58, + .baseSpeed = 33, + .baseSpAttack = 33, + .baseSpDefense = 58, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 177, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_SHADOW_TAG, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 4, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_GIRAFARIG] = + { + .baseHP = 70, + .baseAttack = 80, + .baseDefense = 65, + .baseSpeed = 85, + .baseSpAttack = 90, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_PSYCHIC, + .catchRate = 60, + .expYield = 149, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_PERSIM_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 4, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_PINECO] = + { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 90, + .baseSpeed = 15, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 190, + .expYield = 60, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_FORRETRESS] = + { + .baseHP = 75, + .baseAttack = 90, + .baseDefense = 140, + .baseSpeed = 40, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_BUG, + .type2 = TYPE_STEEL, + .catchRate = 75, + .expYield = 118, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_DUNSPARCE] = + { + .baseHP = 100, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 45, + .baseSpAttack = 65, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 190, + .expYield = 75, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SERENE_GRACE, + .ability2 = ABILITY_RUN_AWAY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_GLIGAR] = + { + .baseHP = 65, + .baseAttack = 75, + .baseDefense = 105, + .baseSpeed = 85, + .baseSpAttack = 35, + .baseSpDefense = 65, + .type1 = TYPE_GROUND, + .type2 = TYPE_FLYING, + .catchRate = 60, + .expYield = 108, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_SAND_VEIL, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_STEELIX] = + { + .baseHP = 75, + .baseAttack = 85, + .baseDefense = 200, + .baseSpeed = 30, + .baseSpAttack = 55, + .baseSpDefense = 65, + .type1 = TYPE_STEEL, + .type2 = TYPE_GROUND, + .catchRate = 25, + .expYield = 196, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_METAL_COAT, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_SNUBBULL] = + { + .baseHP = 60, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 30, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 190, + .expYield = 63, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 191, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_RUN_AWAY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_GRANBULL] = + { + .baseHP = 90, + .baseAttack = 120, + .baseDefense = 75, + .baseSpeed = 45, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 75, + .expYield = 178, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 191, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_INTIMIDATE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_QWILFISH] = + { + .baseHP = 65, + .baseAttack = 95, + .baseDefense = 75, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_WATER, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 100, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_POISON_POINT, + .ability2 = ABILITY_SWIFT_SWIM, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_SCIZOR] = + { + .baseHP = 70, + .baseAttack = 130, + .baseDefense = 100, + .baseSpeed = 65, + .baseSpAttack = 55, + .baseSpDefense = 80, + .type1 = TYPE_BUG, + .type2 = TYPE_STEEL, + .catchRate = 25, + .expYield = 200, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SHUCKLE] = + { + .baseHP = 20, + .baseAttack = 10, + .baseDefense = 230, + .baseSpeed = 5, + .baseSpAttack = 10, + .baseSpDefense = 230, + .type1 = TYPE_BUG, + .type2 = TYPE_ROCK, + .catchRate = 190, + .expYield = 80, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_ORAN_BERRY, + .item2 = ITEM_ORAN_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_HERACROSS] = + { + .baseHP = 80, + .baseAttack = 125, + .baseDefense = 75, + .baseSpeed = 85, + .baseSpAttack = 40, + .baseSpDefense = 95, + .type1 = TYPE_BUG, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 200, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_GUTS, + .safariZoneFleeRate = 8, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SNEASEL] = + { + .baseHP = 55, + .baseAttack = 95, + .baseDefense = 55, + .baseSpeed = 115, + .baseSpAttack = 35, + .baseSpDefense = 75, + .type1 = TYPE_DARK, + .type2 = TYPE_ICE, + .catchRate = 60, + .expYield = 132, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_QUICK_CLAW, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_KEEN_EYE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + }, + + [SPECIES_TEDDIURSA] = + { + .baseHP = 60, + .baseAttack = 80, + .baseDefense = 50, + .baseSpeed = 40, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 120, + .expYield = 124, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_PICKUP, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = TRUE, + }, + + [SPECIES_URSARING] = + { + .baseHP = 90, + .baseAttack = 130, + .baseDefense = 75, + .baseSpeed = 55, + .baseSpAttack = 75, + .baseSpDefense = 75, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 60, + .expYield = 189, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SLUGMA] = + { + .baseHP = 40, + .baseAttack = 40, + .baseDefense = 40, + .baseSpeed = 20, + .baseSpAttack = 70, + .baseSpDefense = 40, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 190, + .expYield = 78, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_MAGMA_ARMOR, + .ability2 = ABILITY_FLAME_BODY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_MAGCARGO] = + { + .baseHP = 50, + .baseAttack = 50, + .baseDefense = 120, + .baseSpeed = 30, + .baseSpAttack = 80, + .baseSpDefense = 80, + .type1 = TYPE_FIRE, + .type2 = TYPE_ROCK, + .catchRate = 75, + .expYield = 154, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_MAGMA_ARMOR, + .ability2 = ABILITY_FLAME_BODY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SWINUB] = + { + .baseHP = 50, + .baseAttack = 50, + .baseDefense = 40, + .baseSpeed = 50, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_ICE, + .type2 = TYPE_GROUND, + .catchRate = 225, + .expYield = 78, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_PILOSWINE] = + { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 80, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_ICE, + .type2 = TYPE_GROUND, + .catchRate = 75, + .expYield = 160, + .evYield_HP = 1, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_CORSOLA] = + { + .baseHP = 55, + .baseAttack = 55, + .baseDefense = 85, + .baseSpeed = 35, + .baseSpAttack = 65, + .baseSpDefense = 85, + .type1 = TYPE_WATER, + .type2 = TYPE_ROCK, + .catchRate = 60, + .expYield = 113, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_RED_SHARD, + .genderRatio = 191, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_HUSTLE, + .ability2 = ABILITY_NATURAL_CURE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_REMORAID] = + { + .baseHP = 35, + .baseAttack = 65, + .baseDefense = 35, + .baseSpeed = 65, + .baseSpAttack = 65, + .baseSpDefense = 35, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 190, + .expYield = 78, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_HUSTLE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_OCTILLERY] = + { + .baseHP = 75, + .baseAttack = 105, + .baseDefense = 75, + .baseSpeed = 45, + .baseSpAttack = 105, + .baseSpDefense = 75, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 75, + .expYield = 164, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_SUCTION_CUPS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_DELIBIRD] = + { + .baseHP = 45, + .baseAttack = 55, + .baseDefense = 45, + .baseSpeed = 75, + .baseSpAttack = 65, + .baseSpDefense = 45, + .type1 = TYPE_ICE, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 183, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_VITAL_SPIRIT, + .ability2 = ABILITY_HUSTLE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_MANTINE] = + { + .baseHP = 65, + .baseAttack = 40, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 80, + .baseSpDefense = 140, + .type1 = TYPE_WATER, + .type2 = TYPE_FLYING, + .catchRate = 25, + .expYield = 168, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_WATER_ABSORB, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_SKARMORY] = + { + .baseHP = 65, + .baseAttack = 80, + .baseDefense = 140, + .baseSpeed = 70, + .baseSpAttack = 40, + .baseSpDefense = 70, + .type1 = TYPE_STEEL, + .type2 = TYPE_FLYING, + .catchRate = 25, + .expYield = 168, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_STURDY, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_HOUNDOUR] = + { + .baseHP = 45, + .baseAttack = 60, + .baseDefense = 30, + .baseSpeed = 65, + .baseSpAttack = 80, + .baseSpDefense = 50, + .type1 = TYPE_DARK, + .type2 = TYPE_FIRE, + .catchRate = 120, + .expYield = 114, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_EARLY_BIRD, + .ability2 = ABILITY_FLASH_FIRE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_HOUNDOOM] = + { + .baseHP = 75, + .baseAttack = 90, + .baseDefense = 50, + .baseSpeed = 95, + .baseSpAttack = 110, + .baseSpDefense = 80, + .type1 = TYPE_DARK, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 204, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_EARLY_BIRD, + .ability2 = ABILITY_FLASH_FIRE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_KINGDRA] = + { + .baseHP = 75, + .baseAttack = 95, + .baseDefense = 95, + .baseSpeed = 85, + .baseSpAttack = 95, + .baseSpDefense = 95, + .type1 = TYPE_WATER, + .type2 = TYPE_DRAGON, + .catchRate = 45, + .expYield = 207, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_PHANPY] = + { + .baseHP = 90, + .baseAttack = 60, + .baseDefense = 60, + .baseSpeed = 40, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 120, + .expYield = 124, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_PICKUP, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 10, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_DONPHAN] = + { + .baseHP = 90, + .baseAttack = 120, + .baseDefense = 120, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 60, + .expYield = 189, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_PORYGON2] = + { + .baseHP = 85, + .baseAttack = 80, + .baseDefense = 90, + .baseSpeed = 60, + .baseSpAttack = 105, + .baseSpDefense = 95, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 180, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_TRACE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_STANTLER] = + { + .baseHP = 73, + .baseAttack = 95, + .baseDefense = 62, + .baseSpeed = 85, + .baseSpAttack = 85, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 165, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SMEARGLE] = + { + .baseHP = 55, + .baseAttack = 20, + .baseDefense = 35, + .baseSpeed = 75, + .baseSpAttack = 20, + .baseSpDefense = 45, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 106, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_OWN_TEMPO, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_TYROGUE] = + { + .baseHP = 35, + .baseAttack = 35, + .baseDefense = 35, + .baseSpeed = 35, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 75, + .expYield = 91, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_HITMONTOP] = + { + .baseHP = 50, + .baseAttack = 95, + .baseDefense = 95, + .baseSpeed = 70, + .baseSpAttack = 35, + .baseSpDefense = 110, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 138, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SMOOCHUM] = + { + .baseHP = 45, + .baseAttack = 30, + .baseDefense = 15, + .baseSpeed = 65, + .baseSpAttack = 85, + .baseSpDefense = 65, + .type1 = TYPE_ICE, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 87, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_ASPEAR_BERRY, + .item2 = ITEM_ASPEAR_BERRY, + .genderRatio = 254, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_ELEKID] = + { + .baseHP = 45, + .baseAttack = 63, + .baseDefense = 37, + .baseSpeed = 95, + .baseSpAttack = 65, + .baseSpDefense = 55, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 45, + .expYield = 106, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 63, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = TRUE, + }, + + [SPECIES_MAGBY] = + { + .baseHP = 45, + .baseAttack = 75, + .baseDefense = 37, + .baseSpeed = 83, + .baseSpAttack = 70, + .baseSpDefense = 55, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 117, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 63, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_FLAME_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_MILTANK] = + { + .baseHP = 95, + .baseAttack = 80, + .baseDefense = 105, + .baseSpeed = 100, + .baseSpAttack = 40, + .baseSpDefense = 70, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 200, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_MOOMOO_MILK, + .item2 = ITEM_MOOMOO_MILK, + .genderRatio = 254, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_BLISSEY] = + { + .baseHP = 255, + .baseAttack = 10, + .baseDefense = 10, + .baseSpeed = 55, + .baseSpAttack = 75, + .baseSpDefense = 135, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 30, + .expYield = 255, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_LUCKY_EGG, + .genderRatio = 254, + .eggCycles = 40, + .friendship = 140, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_NATURAL_CURE, + .ability2 = ABILITY_SERENE_GRACE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_RAIKOU] = + { + .baseHP = 90, + .baseAttack = 85, + .baseDefense = 75, + .baseSpeed = 115, + .baseSpAttack = 115, + .baseSpDefense = 100, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 3, + .expYield = 216, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_ENTEI] = + { + .baseHP = 115, + .baseAttack = 115, + .baseDefense = 85, + .baseSpeed = 100, + .baseSpAttack = 90, + .baseSpDefense = 75, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 3, + .expYield = 217, + .evYield_HP = 1, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SUICUNE] = + { + .baseHP = 100, + .baseAttack = 75, + .baseDefense = 115, + .baseSpeed = 85, + .baseSpAttack = 90, + .baseSpDefense = 115, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 3, + .expYield = 215, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_LARVITAR] = + { + .baseHP = 50, + .baseAttack = 64, + .baseDefense = 50, + .baseSpeed = 41, + .baseSpAttack = 45, + .baseSpDefense = 50, + .type1 = TYPE_ROCK, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 67, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_PUPITAR] = + { + .baseHP = 70, + .baseAttack = 84, + .baseDefense = 70, + .baseSpeed = 51, + .baseSpAttack = 65, + .baseSpDefense = 70, + .type1 = TYPE_ROCK, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 144, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_TYRANITAR] = + { + .baseHP = 100, + .baseAttack = 134, + .baseDefense = 110, + .baseSpeed = 61, + .baseSpAttack = 95, + .baseSpDefense = 100, + .type1 = TYPE_ROCK, + .type2 = TYPE_DARK, + .catchRate = 45, + .expYield = 218, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_SAND_STREAM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_LUGIA] = + { + .baseHP = 106, + .baseAttack = 90, + .baseDefense = 130, + .baseSpeed = 110, + .baseSpAttack = 90, + .baseSpDefense = 154, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 220, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_HO_OH] = + { + .baseHP = 106, + .baseAttack = 130, + .baseDefense = 90, + .baseSpeed = 90, + .baseSpAttack = 110, + .baseSpDefense = 154, + .type1 = TYPE_FIRE, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 220, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_SACRED_ASH, + .item2 = ITEM_SACRED_ASH, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_CELEBI] = + { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 100, + .baseSpAttack = 100, + .baseSpDefense = 100, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 64, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_LUM_BERRY, + .item2 = ITEM_LUM_BERRY, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NATURAL_CURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_B] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_C] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_D] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_E] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_F] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_G] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_H] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_I] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_J] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_K] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_L] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_M] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_N] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_O] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_P] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_Q] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_R] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_S] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_T] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_U] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_V] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_W] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_X] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_Y] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_OLD_UNOWN_Z] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 3, + .expYield = 1, + .evYield_HP = 2, + .evYield_Attack = 2, + .evYield_Defense = 2, + .evYield_Speed = 2, + .evYield_SpAttack = 2, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_NONE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_TREECKO] = + { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 35, + .baseSpeed = 70, + .baseSpAttack = 65, + .baseSpDefense = 55, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 65, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_GROVYLE] = + { + .baseHP = 50, + .baseAttack = 65, + .baseDefense = 45, + .baseSpeed = 95, + .baseSpAttack = 85, + .baseSpDefense = 65, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 141, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_SCEPTILE] = + { + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 65, + .baseSpeed = 120, + .baseSpAttack = 105, + .baseSpDefense = 85, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 208, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 3, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_OVERGROW, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_TORCHIC] = + { + .baseHP = 45, + .baseAttack = 60, + .baseDefense = 40, + .baseSpeed = 45, + .baseSpAttack = 70, + .baseSpDefense = 50, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 45, + .expYield = 65, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_COMBUSKEN] = + { + .baseHP = 60, + .baseAttack = 85, + .baseDefense = 60, + .baseSpeed = 55, + .baseSpAttack = 85, + .baseSpDefense = 60, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 142, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_BLAZIKEN] = + { + .baseHP = 80, + .baseAttack = 120, + .baseDefense = 70, + .baseSpeed = 80, + .baseSpAttack = 110, + .baseSpDefense = 70, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIGHTING, + .catchRate = 45, + .expYield = 209, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_BLAZE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_MUDKIP] = + { + .baseHP = 50, + .baseAttack = 70, + .baseDefense = 50, + .baseSpeed = 40, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 65, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_MARSHTOMP] = + { + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 70, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 70, + .type1 = TYPE_WATER, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 143, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SWAMPERT] = + { + .baseHP = 100, + .baseAttack = 110, + .baseDefense = 90, + .baseSpeed = 60, + .baseSpAttack = 85, + .baseSpDefense = 90, + .type1 = TYPE_WATER, + .type2 = TYPE_GROUND, + .catchRate = 45, + .expYield = 210, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_TORRENT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_POOCHYENA] = + { + .baseHP = 35, + .baseAttack = 55, + .baseDefense = 35, + .baseSpeed = 35, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_DARK, + .type2 = TYPE_DARK, + .catchRate = 255, + .expYield = 55, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_PECHA_BERRY, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_RUN_AWAY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_MIGHTYENA] = + { + .baseHP = 70, + .baseAttack = 90, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_DARK, + .type2 = TYPE_DARK, + .catchRate = 127, + .expYield = 128, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_PECHA_BERRY, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_ZIGZAGOON] = + { + .baseHP = 38, + .baseAttack = 30, + .baseDefense = 41, + .baseSpeed = 60, + .baseSpAttack = 30, + .baseSpDefense = 41, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 60, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_ORAN_BERRY, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_PICKUP, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_LINOONE] = + { + .baseHP = 78, + .baseAttack = 70, + .baseDefense = 61, + .baseSpeed = 100, + .baseSpAttack = 50, + .baseSpDefense = 61, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 90, + .expYield = 128, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_ORAN_BERRY, + .item2 = ITEM_SITRUS_BERRY, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_PICKUP, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_WURMPLE] = + { + .baseHP = 45, + .baseAttack = 45, + .baseDefense = 35, + .baseSpeed = 20, + .baseSpAttack = 20, + .baseSpDefense = 30, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 255, + .expYield = 54, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHIELD_DUST, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SILCOON] = + { + .baseHP = 50, + .baseAttack = 35, + .baseDefense = 55, + .baseSpeed = 15, + .baseSpAttack = 25, + .baseSpDefense = 25, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 120, + .expYield = 71, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_BEAUTIFLY] = + { + .baseHP = 60, + .baseAttack = 70, + .baseDefense = 50, + .baseSpeed = 65, + .baseSpAttack = 90, + .baseSpDefense = 50, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 161, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SILVER_POWDER, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_CASCOON] = + { + .baseHP = 50, + .baseAttack = 35, + .baseDefense = 55, + .baseSpeed = 15, + .baseSpAttack = 25, + .baseSpDefense = 25, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 120, + .expYield = 72, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_DUSTOX] = + { + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 70, + .baseSpeed = 65, + .baseSpAttack = 50, + .baseSpDefense = 90, + .type1 = TYPE_BUG, + .type2 = TYPE_POISON, + .catchRate = 45, + .expYield = 160, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_SILVER_POWDER, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SHIELD_DUST, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_LOTAD] = + { + .baseHP = 40, + .baseAttack = 30, + .baseDefense = 30, + .baseSpeed = 30, + .baseSpAttack = 40, + .baseSpDefense = 50, + .type1 = TYPE_WATER, + .type2 = TYPE_GRASS, + .catchRate = 255, + .expYield = 74, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_RAIN_DISH, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_LOMBRE] = + { + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 50, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 70, + .type1 = TYPE_WATER, + .type2 = TYPE_GRASS, + .catchRate = 120, + .expYield = 141, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_RAIN_DISH, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_LUDICOLO] = + { + .baseHP = 80, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 90, + .baseSpDefense = 100, + .type1 = TYPE_WATER, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 181, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_RAIN_DISH, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_SEEDOT] = + { + .baseHP = 40, + .baseAttack = 40, + .baseDefense = 50, + .baseSpeed = 30, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 255, + .expYield = 74, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_NUZLEAF] = + { + .baseHP = 70, + .baseAttack = 70, + .baseDefense = 40, + .baseSpeed = 60, + .baseSpAttack = 60, + .baseSpDefense = 40, + .type1 = TYPE_GRASS, + .type2 = TYPE_DARK, + .catchRate = 120, + .expYield = 141, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SHIFTRY] = + { + .baseHP = 90, + .baseAttack = 100, + .baseDefense = 60, + .baseSpeed = 80, + .baseSpAttack = 90, + .baseSpDefense = 60, + .type1 = TYPE_GRASS, + .type2 = TYPE_DARK, + .catchRate = 45, + .expYield = 181, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_EARLY_BIRD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_NINCADA] = + { + .baseHP = 31, + .baseAttack = 45, + .baseDefense = 90, + .baseSpeed = 40, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_BUG, + .type2 = TYPE_GROUND, + .catchRate = 255, + .expYield = 65, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_COMPOUND_EYES, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_NINJASK] = + { + .baseHP = 61, + .baseAttack = 90, + .baseDefense = 45, + .baseSpeed = 160, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 120, + .expYield = 155, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SPEED_BOOST, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_SHEDINJA] = + { + .baseHP = 1, + .baseAttack = 90, + .baseDefense = 45, + .baseSpeed = 40, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_BUG, + .type2 = TYPE_GHOST, + .catchRate = 45, + .expYield = 95, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_WONDER_GUARD, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_TAILLOW] = + { + .baseHP = 40, + .baseAttack = 55, + .baseDefense = 30, + .baseSpeed = 85, + .baseSpAttack = 30, + .baseSpDefense = 30, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 200, + .expYield = 59, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SWELLOW] = + { + .baseHP = 60, + .baseAttack = 85, + .baseDefense = 60, + .baseSpeed = 125, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 162, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_GUTS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SHROOMISH] = + { + .baseHP = 60, + .baseAttack = 40, + .baseDefense = 60, + .baseSpeed = 35, + .baseSpAttack = 40, + .baseSpDefense = 60, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 255, + .expYield = 65, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_EFFECT_SPORE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_BRELOOM] = + { + .baseHP = 60, + .baseAttack = 130, + .baseDefense = 80, + .baseSpeed = 70, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_GRASS, + .type2 = TYPE_FIGHTING, + .catchRate = 90, + .expYield = 165, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_EFFECT_SPORE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_SPINDA] = + { + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 60, + .baseSpeed = 60, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 85, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_CHESTO_BERRY, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_OWN_TEMPO, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = TRUE, + }, + + [SPECIES_WINGULL] = + { + .baseHP = 40, + .baseAttack = 30, + .baseDefense = 30, + .baseSpeed = 85, + .baseSpAttack = 55, + .baseSpDefense = 30, + .type1 = TYPE_WATER, + .type2 = TYPE_FLYING, + .catchRate = 190, + .expYield = 64, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_PELIPPER] = + { + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 100, + .baseSpeed = 65, + .baseSpAttack = 85, + .baseSpDefense = 70, + .type1 = TYPE_WATER, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 164, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FLYING, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_SURSKIT] = + { + .baseHP = 40, + .baseAttack = 30, + .baseDefense = 32, + .baseSpeed = 65, + .baseSpAttack = 50, + .baseSpDefense = 52, + .type1 = TYPE_BUG, + .type2 = TYPE_WATER, + .catchRate = 200, + .expYield = 63, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_MASQUERAIN] = + { + .baseHP = 70, + .baseAttack = 60, + .baseDefense = 62, + .baseSpeed = 60, + .baseSpAttack = 80, + .baseSpDefense = 82, + .type1 = TYPE_BUG, + .type2 = TYPE_FLYING, + .catchRate = 75, + .expYield = 128, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_SILVER_POWDER, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_WAILMER] = + { + .baseHP = 130, + .baseAttack = 70, + .baseDefense = 35, + .baseSpeed = 60, + .baseSpAttack = 70, + .baseSpDefense = 35, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 125, + .expYield = 137, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_WATER_VEIL, + .ability2 = ABILITY_OBLIVIOUS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_WAILORD] = + { + .baseHP = 170, + .baseAttack = 90, + .baseDefense = 45, + .baseSpeed = 60, + .baseSpAttack = 90, + .baseSpDefense = 45, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 60, + .expYield = 206, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_WATER_VEIL, + .ability2 = ABILITY_OBLIVIOUS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SKITTY] = + { + .baseHP = 50, + .baseAttack = 45, + .baseDefense = 45, + .baseSpeed = 50, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 65, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_LEPPA_BERRY, + .genderRatio = 191, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_DELCATTY] = + { + .baseHP = 70, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 70, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 60, + .expYield = 138, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_LEPPA_BERRY, + .genderRatio = 191, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_CUTE_CHARM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_KECLEON] = + { + .baseHP = 60, + .baseAttack = 90, + .baseDefense = 70, + .baseSpeed = 40, + .baseSpAttack = 60, + .baseSpDefense = 120, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 200, + .expYield = 132, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_PERSIM_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_COLOR_CHANGE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_BALTOY] = + { + .baseHP = 40, + .baseAttack = 40, + .baseDefense = 55, + .baseSpeed = 55, + .baseSpAttack = 40, + .baseSpDefense = 70, + .type1 = TYPE_GROUND, + .type2 = TYPE_PSYCHIC, + .catchRate = 255, + .expYield = 58, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_CLAYDOL] = + { + .baseHP = 60, + .baseAttack = 70, + .baseDefense = 105, + .baseSpeed = 75, + .baseSpAttack = 70, + .baseSpDefense = 120, + .type1 = TYPE_GROUND, + .type2 = TYPE_PSYCHIC, + .catchRate = 90, + .expYield = 189, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_NOSEPASS] = + { + .baseHP = 30, + .baseAttack = 45, + .baseDefense = 135, + .baseSpeed = 30, + .baseSpAttack = 45, + .baseSpDefense = 90, + .type1 = TYPE_ROCK, + .type2 = TYPE_ROCK, + .catchRate = 255, + .expYield = 108, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_MAGNET_PULL, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_TORKOAL] = + { + .baseHP = 70, + .baseAttack = 85, + .baseDefense = 140, + .baseSpeed = 20, + .baseSpAttack = 85, + .baseSpDefense = 70, + .type1 = TYPE_FIRE, + .type2 = TYPE_FIRE, + .catchRate = 90, + .expYield = 161, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_WHITE_SMOKE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_SABLEYE] = + { + .baseHP = 50, + .baseAttack = 75, + .baseDefense = 75, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 65, + .type1 = TYPE_DARK, + .type2 = TYPE_GHOST, + .catchRate = 45, + .expYield = 98, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_KEEN_EYE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_BARBOACH] = + { + .baseHP = 50, + .baseAttack = 48, + .baseDefense = 43, + .baseSpeed = 60, + .baseSpAttack = 46, + .baseSpDefense = 41, + .type1 = TYPE_WATER, + .type2 = TYPE_GROUND, + .catchRate = 190, + .expYield = 92, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_WHISCASH] = + { + .baseHP = 110, + .baseAttack = 78, + .baseDefense = 73, + .baseSpeed = 60, + .baseSpAttack = 76, + .baseSpDefense = 71, + .type1 = TYPE_WATER, + .type2 = TYPE_GROUND, + .catchRate = 75, + .expYield = 158, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_LUVDISC] = + { + .baseHP = 43, + .baseAttack = 30, + .baseDefense = 55, + .baseSpeed = 97, + .baseSpAttack = 40, + .baseSpDefense = 65, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 225, + .expYield = 110, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_HEART_SCALE, + .item2 = ITEM_NONE, + .genderRatio = 191, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_CORPHISH] = + { + .baseHP = 43, + .baseAttack = 80, + .baseDefense = 65, + .baseSpeed = 35, + .baseSpAttack = 50, + .baseSpDefense = 35, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 205, + .expYield = 111, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_SHELL_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_CRAWDAUNT] = + { + .baseHP = 63, + .baseAttack = 120, + .baseDefense = 85, + .baseSpeed = 55, + .baseSpAttack = 90, + .baseSpDefense = 55, + .type1 = TYPE_WATER, + .type2 = TYPE_DARK, + .catchRate = 155, + .expYield = 161, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_SHELL_ARMOR, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_FEEBAS] = + { + .baseHP = 20, + .baseAttack = 15, + .baseDefense = 20, + .baseSpeed = 80, + .baseSpAttack = 10, + .baseSpDefense = 55, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 255, + .expYield = 61, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_MILOTIC] = + { + .baseHP = 95, + .baseAttack = 60, + .baseDefense = 79, + .baseSpeed = 81, + .baseSpAttack = 100, + .baseSpDefense = 125, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 60, + .expYield = 213, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_MARVEL_SCALE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_CARVANHA] = + { + .baseHP = 45, + .baseAttack = 90, + .baseDefense = 20, + .baseSpeed = 65, + .baseSpAttack = 65, + .baseSpDefense = 20, + .type1 = TYPE_WATER, + .type2 = TYPE_DARK, + .catchRate = 225, + .expYield = 88, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_ROUGH_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SHARPEDO] = + { + .baseHP = 70, + .baseAttack = 120, + .baseDefense = 40, + .baseSpeed = 95, + .baseSpAttack = 95, + .baseSpDefense = 40, + .type1 = TYPE_WATER, + .type2 = TYPE_DARK, + .catchRate = 60, + .expYield = 175, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_2, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_ROUGH_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_TRAPINCH] = + { + .baseHP = 45, + .baseAttack = 100, + .baseDefense = 45, + .baseSpeed = 10, + .baseSpAttack = 45, + .baseSpDefense = 45, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 255, + .expYield = 73, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SOFT_SAND, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_ARENA_TRAP, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_VIBRAVA] = + { + .baseHP = 50, + .baseAttack = 70, + .baseDefense = 50, + .baseSpeed = 70, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_GROUND, + .type2 = TYPE_DRAGON, + .catchRate = 120, + .expYield = 126, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_LEVITATE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_FLYGON] = + { + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 80, + .baseSpeed = 100, + .baseSpAttack = 80, + .baseSpDefense = 80, + .type1 = TYPE_GROUND, + .type2 = TYPE_DRAGON, + .catchRate = 45, + .expYield = 197, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_BUG, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_LEVITATE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_MAKUHITA] = + { + .baseHP = 72, + .baseAttack = 60, + .baseDefense = 30, + .baseSpeed = 25, + .baseSpAttack = 20, + .baseSpDefense = 30, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 180, + .expYield = 87, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_GUTS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_HARIYAMA] = + { + .baseHP = 144, + .baseAttack = 120, + .baseDefense = 60, + .baseSpeed = 50, + .baseSpAttack = 40, + .baseSpDefense = 60, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_FIGHTING, + .catchRate = 200, + .expYield = 184, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_KINGS_ROCK, + .genderRatio = 63, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_GUTS, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_ELECTRIKE] = + { + .baseHP = 40, + .baseAttack = 45, + .baseDefense = 40, + .baseSpeed = 65, + .baseSpAttack = 65, + .baseSpDefense = 40, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 120, + .expYield = 104, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_LIGHTNING_ROD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_MANECTRIC] = + { + .baseHP = 70, + .baseAttack = 75, + .baseDefense = 60, + .baseSpeed = 105, + .baseSpAttack = 105, + .baseSpDefense = 60, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 45, + .expYield = 168, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_STATIC, + .ability2 = ABILITY_LIGHTNING_ROD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_NUMEL] = + { + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 40, + .baseSpeed = 35, + .baseSpAttack = 65, + .baseSpDefense = 45, + .type1 = TYPE_FIRE, + .type2 = TYPE_GROUND, + .catchRate = 255, + .expYield = 88, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_CAMERUPT] = + { + .baseHP = 70, + .baseAttack = 100, + .baseDefense = 70, + .baseSpeed = 40, + .baseSpAttack = 105, + .baseSpDefense = 75, + .type1 = TYPE_FIRE, + .type2 = TYPE_GROUND, + .catchRate = 150, + .expYield = 175, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_MAGMA_ARMOR, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SPHEAL] = + { + .baseHP = 70, + .baseAttack = 40, + .baseDefense = 50, + .baseSpeed = 25, + .baseSpAttack = 55, + .baseSpDefense = 50, + .type1 = TYPE_ICE, + .type2 = TYPE_WATER, + .catchRate = 255, + .expYield = 75, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SEALEO] = + { + .baseHP = 90, + .baseAttack = 60, + .baseDefense = 70, + .baseSpeed = 45, + .baseSpAttack = 75, + .baseSpDefense = 70, + .type1 = TYPE_ICE, + .type2 = TYPE_WATER, + .catchRate = 120, + .expYield = 128, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_WALREIN] = + { + .baseHP = 110, + .baseAttack = 80, + .baseDefense = 90, + .baseSpeed = 65, + .baseSpAttack = 95, + .baseSpDefense = 90, + .type1 = TYPE_ICE, + .type2 = TYPE_WATER, + .catchRate = 45, + .expYield = 192, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_CACNEA] = + { + .baseHP = 50, + .baseAttack = 85, + .baseDefense = 40, + .baseSpeed = 35, + .baseSpAttack = 85, + .baseSpDefense = 40, + .type1 = TYPE_GRASS, + .type2 = TYPE_GRASS, + .catchRate = 190, + .expYield = 97, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_POISON_BARB, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_SAND_VEIL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_CACTURNE] = + { + .baseHP = 70, + .baseAttack = 115, + .baseDefense = 60, + .baseSpeed = 55, + .baseSpAttack = 115, + .baseSpDefense = 60, + .type1 = TYPE_GRASS, + .type2 = TYPE_DARK, + .catchRate = 60, + .expYield = 177, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_POISON_BARB, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_GRASS, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_SAND_VEIL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_SNORUNT] = + { + .baseHP = 50, + .baseAttack = 50, + .baseDefense = 50, + .baseSpeed = 50, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_ICE, + .type2 = TYPE_ICE, + .catchRate = 190, + .expYield = 74, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_GLALIE] = + { + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 80, + .baseSpeed = 80, + .baseSpAttack = 80, + .baseSpDefense = 80, + .type1 = TYPE_ICE, + .type2 = TYPE_ICE, + .catchRate = 75, + .expYield = 187, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NEVER_MELT_ICE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_INNER_FOCUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_LUNATONE] = + { + .baseHP = 70, + .baseAttack = 55, + .baseDefense = 65, + .baseSpeed = 70, + .baseSpAttack = 95, + .baseSpDefense = 85, + .type1 = TYPE_ROCK, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 150, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_MOON_STONE, + .genderRatio = 255, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_SOLROCK] = + { + .baseHP = 70, + .baseAttack = 95, + .baseDefense = 85, + .baseSpeed = 70, + .baseSpAttack = 55, + .baseSpDefense = 65, + .type1 = TYPE_ROCK, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 150, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SUN_STONE, + .genderRatio = 255, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_AZURILL] = + { + .baseHP = 50, + .baseAttack = 20, + .baseDefense = 40, + .baseSpeed = 20, + .baseSpAttack = 20, + .baseSpDefense = 40, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 150, + .expYield = 33, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 191, + .eggCycles = 10, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_HUGE_POWER, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SPOINK] = + { + .baseHP = 60, + .baseAttack = 25, + .baseDefense = 35, + .baseSpeed = 60, + .baseSpAttack = 70, + .baseSpDefense = 80, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 255, + .expYield = 89, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_OWN_TEMPO, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_GRUMPIG] = + { + .baseHP = 80, + .baseAttack = 45, + .baseDefense = 65, + .baseSpeed = 80, + .baseSpAttack = 90, + .baseSpDefense = 110, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 60, + .expYield = 164, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_THICK_FAT, + .ability2 = ABILITY_OWN_TEMPO, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_PLUSLE] = + { + .baseHP = 60, + .baseAttack = 50, + .baseDefense = 40, + .baseSpeed = 95, + .baseSpAttack = 85, + .baseSpDefense = 75, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 200, + .expYield = 120, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_PLUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_MINUN] = + { + .baseHP = 60, + .baseAttack = 40, + .baseDefense = 50, + .baseSpeed = 95, + .baseSpAttack = 75, + .baseSpDefense = 85, + .type1 = TYPE_ELECTRIC, + .type2 = TYPE_ELECTRIC, + .catchRate = 200, + .expYield = 120, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_MINUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_MAWILE] = + { + .baseHP = 50, + .baseAttack = 85, + .baseDefense = 85, + .baseSpeed = 50, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_STEEL, + .type2 = TYPE_STEEL, + .catchRate = 45, + .expYield = 98, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FAIRY, + .ability1 = ABILITY_HYPER_CUTTER, + .ability2 = ABILITY_INTIMIDATE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_MEDITITE] = + { + .baseHP = 30, + .baseAttack = 40, + .baseDefense = 55, + .baseSpeed = 60, + .baseSpAttack = 40, + .baseSpDefense = 55, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_PSYCHIC, + .catchRate = 180, + .expYield = 91, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_PURE_POWER, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_MEDICHAM] = + { + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 75, + .baseSpeed = 80, + .baseSpAttack = 60, + .baseSpDefense = 75, + .type1 = TYPE_FIGHTING, + .type2 = TYPE_PSYCHIC, + .catchRate = 90, + .expYield = 153, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_HUMAN_LIKE, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_PURE_POWER, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_SWABLU] = + { + .baseHP = 45, + .baseAttack = 40, + .baseDefense = 60, + .baseSpeed = 50, + .baseSpAttack = 40, + .baseSpDefense = 75, + .type1 = TYPE_NORMAL, + .type2 = TYPE_FLYING, + .catchRate = 255, + .expYield = 74, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_NATURAL_CURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_ALTARIA] = + { + .baseHP = 75, + .baseAttack = 70, + .baseDefense = 90, + .baseSpeed = 80, + .baseSpAttack = 70, + .baseSpDefense = 105, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 188, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_FLYING, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_NATURAL_CURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_WYNAUT] = + { + .baseHP = 95, + .baseAttack = 23, + .baseDefense = 48, + .baseSpeed = 23, + .baseSpAttack = 23, + .baseSpDefense = 48, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 125, + .expYield = 44, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_SHADOW_TAG, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_DUSKULL] = + { + .baseHP = 20, + .baseAttack = 40, + .baseDefense = 90, + .baseSpeed = 25, + .baseSpAttack = 30, + .baseSpDefense = 90, + .type1 = TYPE_GHOST, + .type2 = TYPE_GHOST, + .catchRate = 190, + .expYield = 97, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_SPELL_TAG, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_DUSCLOPS] = + { + .baseHP = 40, + .baseAttack = 70, + .baseDefense = 130, + .baseSpeed = 25, + .baseSpAttack = 60, + .baseSpDefense = 130, + .type1 = TYPE_GHOST, + .type2 = TYPE_GHOST, + .catchRate = 90, + .expYield = 179, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_SPELL_TAG, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_ROSELIA] = + { + .baseHP = 50, + .baseAttack = 60, + .baseDefense = 45, + .baseSpeed = 65, + .baseSpAttack = 100, + .baseSpDefense = 80, + .type1 = TYPE_GRASS, + .type2 = TYPE_POISON, + .catchRate = 150, + .expYield = 152, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_POISON_BARB, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_NATURAL_CURE, + .ability2 = ABILITY_POISON_POINT, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = TRUE, + }, + + [SPECIES_SLAKOTH] = + { + .baseHP = 60, + .baseAttack = 60, + .baseDefense = 60, + .baseSpeed = 30, + .baseSpAttack = 35, + .baseSpDefense = 35, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 255, + .expYield = 83, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_TRUANT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_VIGOROTH] = + { + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 80, + .baseSpeed = 90, + .baseSpAttack = 55, + .baseSpDefense = 55, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 120, + .expYield = 126, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 2, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_VITAL_SPIRIT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_SLAKING] = + { + .baseHP = 150, + .baseAttack = 160, + .baseDefense = 100, + .baseSpeed = 100, + .baseSpAttack = 95, + .baseSpDefense = 65, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 210, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_TRUANT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_GULPIN] = + { + .baseHP = 70, + .baseAttack = 43, + .baseDefense = 53, + .baseSpeed = 40, + .baseSpAttack = 43, + .baseSpDefense = 53, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 225, + .expYield = 75, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_BIG_PEARL, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LIQUID_OOZE, + .ability2 = ABILITY_STICKY_HOLD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_SWALOT] = + { + .baseHP = 100, + .baseAttack = 73, + .baseDefense = 83, + .baseSpeed = 55, + .baseSpAttack = 73, + .baseSpDefense = 83, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 75, + .expYield = 168, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_BIG_PEARL, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LIQUID_OOZE, + .ability2 = ABILITY_STICKY_HOLD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_TROPIUS] = + { + .baseHP = 99, + .baseAttack = 68, + .baseDefense = 83, + .baseSpeed = 51, + .baseSpAttack = 72, + .baseSpDefense = 87, + .type1 = TYPE_GRASS, + .type2 = TYPE_FLYING, + .catchRate = 200, + .expYield = 169, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_GRASS, + .ability1 = ABILITY_CHLOROPHYLL, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_WHISMUR] = + { + .baseHP = 64, + .baseAttack = 51, + .baseDefense = 23, + .baseSpeed = 28, + .baseSpAttack = 51, + .baseSpDefense = 23, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 190, + .expYield = 68, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_CHESTO_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SOUNDPROOF, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_LOUDRED] = + { + .baseHP = 84, + .baseAttack = 71, + .baseDefense = 43, + .baseSpeed = 48, + .baseSpAttack = 71, + .baseSpDefense = 43, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 120, + .expYield = 126, + .evYield_HP = 2, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_CHESTO_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SOUNDPROOF, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_EXPLOUD] = + { + .baseHP = 104, + .baseAttack = 91, + .baseDefense = 63, + .baseSpeed = 68, + .baseSpAttack = 91, + .baseSpDefense = 63, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 184, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_CHESTO_BERRY, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_SOUNDPROOF, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_CLAMPERL] = + { + .baseHP = 35, + .baseAttack = 64, + .baseDefense = 85, + .baseSpeed = 32, + .baseSpAttack = 74, + .baseSpDefense = 55, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 255, + .expYield = 142, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_BLUE_SHARD, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_SHELL_ARMOR, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_HUNTAIL] = + { + .baseHP = 55, + .baseAttack = 104, + .baseDefense = 105, + .baseSpeed = 52, + .baseSpAttack = 94, + .baseSpDefense = 75, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 60, + .expYield = 178, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_GOREBYSS] = + { + .baseHP = 55, + .baseAttack = 84, + .baseDefense = 105, + .baseSpeed = 52, + .baseSpAttack = 114, + .baseSpDefense = 75, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 60, + .expYield = 178, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_1, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PINK, + .noFlip = FALSE, + }, + + [SPECIES_ABSOL] = + { + .baseHP = 65, + .baseAttack = 130, + .baseDefense = 60, + .baseSpeed = 75, + .baseSpAttack = 75, + .baseSpDefense = 60, + .type1 = TYPE_DARK, + .type2 = TYPE_DARK, + .catchRate = 30, + .expYield = 174, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_MEDIUM_SLOW, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = TRUE, + }, + + [SPECIES_SHUPPET] = + { + .baseHP = 44, + .baseAttack = 75, + .baseDefense = 35, + .baseSpeed = 45, + .baseSpAttack = 63, + .baseSpDefense = 33, + .type1 = TYPE_GHOST, + .type2 = TYPE_GHOST, + .catchRate = 225, + .expYield = 97, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SPELL_TAG, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_INSOMNIA, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_BANETTE] = + { + .baseHP = 64, + .baseAttack = 115, + .baseDefense = 65, + .baseSpeed = 65, + .baseSpAttack = 83, + .baseSpDefense = 63, + .type1 = TYPE_GHOST, + .type2 = TYPE_GHOST, + .catchRate = 45, + .expYield = 179, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_SPELL_TAG, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 35, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_INSOMNIA, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = FALSE, + }, + + [SPECIES_SEVIPER] = + { + .baseHP = 73, + .baseAttack = 100, + .baseDefense = 60, + .baseSpeed = 65, + .baseSpAttack = 100, + .baseSpDefense = 60, + .type1 = TYPE_POISON, + .type2 = TYPE_POISON, + .catchRate = 90, + .expYield = 165, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_SHED_SKIN, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLACK, + .noFlip = TRUE, + }, + + [SPECIES_ZANGOOSE] = + { + .baseHP = 73, + .baseAttack = 115, + .baseDefense = 60, + .baseSpeed = 90, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 90, + .expYield = 165, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_FIELD, + .eggGroup2 = EGG_GROUP_FIELD, + .ability1 = ABILITY_IMMUNITY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = TRUE, + }, + + [SPECIES_RELICANTH] = + { + .baseHP = 100, + .baseAttack = 90, + .baseDefense = 130, + .baseSpeed = 55, + .baseSpAttack = 45, + .baseSpDefense = 65, + .type1 = TYPE_WATER, + .type2 = TYPE_ROCK, + .catchRate = 25, + .expYield = 198, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_GREEN_SHARD, + .genderRatio = 31, + .eggCycles = 40, + .friendship = 70, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_WATER_1, + .eggGroup2 = EGG_GROUP_WATER_2, + .ability1 = ABILITY_SWIFT_SWIM, + .ability2 = ABILITY_ROCK_HEAD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_ARON] = + { + .baseHP = 50, + .baseAttack = 70, + .baseDefense = 100, + .baseSpeed = 30, + .baseSpAttack = 40, + .baseSpDefense = 40, + .type1 = TYPE_STEEL, + .type2 = TYPE_ROCK, + .catchRate = 180, + .expYield = 96, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_HARD_STONE, + .genderRatio = 127, + .eggCycles = 35, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_ROCK_HEAD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_LAIRON] = + { + .baseHP = 60, + .baseAttack = 90, + .baseDefense = 140, + .baseSpeed = 40, + .baseSpAttack = 50, + .baseSpDefense = 50, + .type1 = TYPE_STEEL, + .type2 = TYPE_ROCK, + .catchRate = 90, + .expYield = 152, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_HARD_STONE, + .genderRatio = 127, + .eggCycles = 35, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_ROCK_HEAD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_AGGRON] = + { + .baseHP = 70, + .baseAttack = 110, + .baseDefense = 180, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 60, + .type1 = TYPE_STEEL, + .type2 = TYPE_ROCK, + .catchRate = 45, + .expYield = 205, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 3, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_HARD_STONE, + .genderRatio = 127, + .eggCycles = 35, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MONSTER, + .eggGroup2 = EGG_GROUP_MONSTER, + .ability1 = ABILITY_STURDY, + .ability2 = ABILITY_ROCK_HEAD, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_CASTFORM] = + { + .baseHP = 70, + .baseAttack = 70, + .baseDefense = 70, + .baseSpeed = 70, + .baseSpAttack = 70, + .baseSpDefense = 70, + .type1 = TYPE_NORMAL, + .type2 = TYPE_NORMAL, + .catchRate = 45, + .expYield = 145, + .evYield_HP = 1, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_MEDIUM_FAST, + .eggGroup1 = EGG_GROUP_FAIRY, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_FORECAST, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_VOLBEAT] = + { + .baseHP = 65, + .baseAttack = 73, + .baseDefense = 55, + .baseSpeed = 85, + .baseSpAttack = 47, + .baseSpDefense = 75, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 150, + .expYield = 146, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_ILLUMINATE, + .ability2 = ABILITY_SWARM, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_ILLUMISE] = + { + .baseHP = 65, + .baseAttack = 47, + .baseDefense = 55, + .baseSpeed = 85, + .baseSpAttack = 73, + .baseSpDefense = 75, + .type1 = TYPE_BUG, + .type2 = TYPE_BUG, + .catchRate = 150, + .expYield = 146, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 254, + .eggCycles = 15, + .friendship = 70, + .growthRate = GROWTH_FLUCTUATING, + .eggGroup1 = EGG_GROUP_BUG, + .eggGroup2 = EGG_GROUP_HUMAN_LIKE, + .ability1 = ABILITY_OBLIVIOUS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_LILEEP] = + { + .baseHP = 66, + .baseAttack = 41, + .baseDefense = 77, + .baseSpeed = 23, + .baseSpAttack = 61, + .baseSpDefense = 87, + .type1 = TYPE_ROCK, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 121, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SUCTION_CUPS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_PURPLE, + .noFlip = FALSE, + }, + + [SPECIES_CRADILY] = + { + .baseHP = 86, + .baseAttack = 81, + .baseDefense = 97, + .baseSpeed = 43, + .baseSpAttack = 81, + .baseSpDefense = 107, + .type1 = TYPE_ROCK, + .type2 = TYPE_GRASS, + .catchRate = 45, + .expYield = 201, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 2, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_SUCTION_CUPS, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_ANORITH] = + { + .baseHP = 45, + .baseAttack = 95, + .baseDefense = 50, + .baseSpeed = 75, + .baseSpAttack = 40, + .baseSpDefense = 50, + .type1 = TYPE_ROCK, + .type2 = TYPE_BUG, + .catchRate = 45, + .expYield = 119, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_BATTLE_ARMOR, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_ARMALDO] = + { + .baseHP = 75, + .baseAttack = 125, + .baseDefense = 100, + .baseSpeed = 45, + .baseSpAttack = 70, + .baseSpDefense = 80, + .type1 = TYPE_ROCK, + .type2 = TYPE_BUG, + .catchRate = 45, + .expYield = 200, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 31, + .eggCycles = 30, + .friendship = 70, + .growthRate = GROWTH_ERRATIC, + .eggGroup1 = EGG_GROUP_WATER_3, + .eggGroup2 = EGG_GROUP_WATER_3, + .ability1 = ABILITY_BATTLE_ARMOR, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_RALTS] = + { + .baseHP = 28, + .baseAttack = 25, + .baseDefense = 25, + .baseSpeed = 40, + .baseSpAttack = 45, + .baseSpDefense = 35, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 235, + .expYield = 70, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_TRACE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_KIRLIA] = + { + .baseHP = 38, + .baseAttack = 35, + .baseDefense = 35, + .baseSpeed = 50, + .baseSpAttack = 65, + .baseSpDefense = 55, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 120, + .expYield = 140, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 2, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_TRACE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_GARDEVOIR] = + { + .baseHP = 68, + .baseAttack = 65, + .baseDefense = 65, + .baseSpeed = 80, + .baseSpAttack = 125, + .baseSpDefense = 115, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 208, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 20, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_SYNCHRONIZE, + .ability2 = ABILITY_TRACE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_BAGON] = + { + .baseHP = 45, + .baseAttack = 75, + .baseDefense = 60, + .baseSpeed = 50, + .baseSpAttack = 40, + .baseSpDefense = 30, + .type1 = TYPE_DRAGON, + .type2 = TYPE_DRAGON, + .catchRate = 45, + .expYield = 89, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_DRAGON, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_SHELGON] = + { + .baseHP = 65, + .baseAttack = 95, + .baseDefense = 100, + .baseSpeed = 50, + .baseSpAttack = 60, + .baseSpDefense = 50, + .type1 = TYPE_DRAGON, + .type2 = TYPE_DRAGON, + .catchRate = 45, + .expYield = 144, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_DRAGON, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_ROCK_HEAD, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_WHITE, + .noFlip = FALSE, + }, + + [SPECIES_SALAMENCE] = + { + .baseHP = 95, + .baseAttack = 135, + .baseDefense = 80, + .baseSpeed = 100, + .baseSpAttack = 110, + .baseSpDefense = 80, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FLYING, + .catchRate = 45, + .expYield = 218, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_DRAGON_SCALE, + .genderRatio = 127, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_DRAGON, + .eggGroup2 = EGG_GROUP_DRAGON, + .ability1 = ABILITY_INTIMIDATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_BELDUM] = + { + .baseHP = 40, + .baseAttack = 55, + .baseDefense = 80, + .baseSpeed = 30, + .baseSpAttack = 35, + .baseSpDefense = 60, + .type1 = TYPE_STEEL, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 103, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 1, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_METAL_COAT, + .genderRatio = 255, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_METANG] = + { + .baseHP = 60, + .baseAttack = 75, + .baseDefense = 100, + .baseSpeed = 50, + .baseSpAttack = 55, + .baseSpDefense = 80, + .type1 = TYPE_STEEL, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 153, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_METAL_COAT, + .genderRatio = 255, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_METAGROSS] = + { + .baseHP = 80, + .baseAttack = 135, + .baseDefense = 130, + .baseSpeed = 70, + .baseSpAttack = 95, + .baseSpDefense = 90, + .type1 = TYPE_STEEL, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 210, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 3, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_METAL_COAT, + .genderRatio = 255, + .eggCycles = 40, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_MINERAL, + .eggGroup2 = EGG_GROUP_MINERAL, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_REGIROCK] = + { + .baseHP = 80, + .baseAttack = 100, + .baseDefense = 200, + .baseSpeed = 50, + .baseSpAttack = 50, + .baseSpDefense = 100, + .type1 = TYPE_ROCK, + .type2 = TYPE_ROCK, + .catchRate = 3, + .expYield = 217, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 3, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BROWN, + .noFlip = FALSE, + }, + + [SPECIES_REGICE] = + { + .baseHP = 80, + .baseAttack = 50, + .baseDefense = 100, + .baseSpeed = 50, + .baseSpAttack = 100, + .baseSpDefense = 200, + .type1 = TYPE_ICE, + .type2 = TYPE_ICE, + .catchRate = 3, + .expYield = 216, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_REGISTEEL] = + { + .baseHP = 80, + .baseAttack = 75, + .baseDefense = 150, + .baseSpeed = 50, + .baseSpAttack = 75, + .baseSpDefense = 150, + .type1 = TYPE_STEEL, + .type2 = TYPE_STEEL, + .catchRate = 3, + .expYield = 215, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 2, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 80, + .friendship = 35, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_CLEAR_BODY, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GRAY, + .noFlip = FALSE, + }, + + [SPECIES_KYOGRE] = + { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 90, + .baseSpeed = 90, + .baseSpAttack = 150, + .baseSpDefense = 140, + .type1 = TYPE_WATER, + .type2 = TYPE_WATER, + .catchRate = 5, + .expYield = 218, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_DRIZZLE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_GROUDON] = + { + .baseHP = 100, + .baseAttack = 150, + .baseDefense = 140, + .baseSpeed = 90, + .baseSpAttack = 100, + .baseSpDefense = 90, + .type1 = TYPE_GROUND, + .type2 = TYPE_GROUND, + .catchRate = 5, + .expYield = 218, + .evYield_HP = 0, + .evYield_Attack = 3, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_DROUGHT, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_RAYQUAZA] = + { + .baseHP = 105, + .baseAttack = 150, + .baseDefense = 90, + .baseSpeed = 95, + .baseSpAttack = 150, + .baseSpDefense = 90, + .type1 = TYPE_DRAGON, + .type2 = TYPE_FLYING, + .catchRate = 3, + .expYield = 220, + .evYield_HP = 0, + .evYield_Attack = 2, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_AIR_LOCK, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_GREEN, + .noFlip = FALSE, + }, + + [SPECIES_LATIAS] = + { + .baseHP = 80, + .baseAttack = 80, + .baseDefense = 90, + .baseSpeed = 110, + .baseSpAttack = 110, + .baseSpDefense = 130, + .type1 = TYPE_DRAGON, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 211, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 3, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 254, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_LATIOS] = + { + .baseHP = 80, + .baseAttack = 90, + .baseDefense = 80, + .baseSpeed = 110, + .baseSpAttack = 130, + .baseSpDefense = 110, + .type1 = TYPE_DRAGON, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 211, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 3, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 0, + .eggCycles = 120, + .friendship = 90, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, + }, + + [SPECIES_JIRACHI] = + { + .baseHP = 100, + .baseAttack = 100, + .baseDefense = 100, + .baseSpeed = 100, + .baseSpAttack = 100, + .baseSpDefense = 100, + .type1 = TYPE_STEEL, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 215, + .evYield_HP = 3, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 0, + .evYield_SpDefense = 0, + .item1 = ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 100, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_SERENE_GRACE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_YELLOW, + .noFlip = FALSE, + }, + + [SPECIES_DEOXYS] = + { + .baseHP = 50, + .baseAttack = 150, + .baseDefense = 50, + .baseSpeed = 150, + .baseSpAttack = 150, + .baseSpDefense = 50, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 215, + .evYield_HP = 0, + .evYield_Attack = 1, + .evYield_Defense = 0, + .evYield_Speed = 1, + .evYield_SpAttack = 1, + .evYield_SpDefense = 0, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 255, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .ability1 = ABILITY_PRESSURE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_RED, + .noFlip = TRUE, + }, + + [SPECIES_CHIMECHO] = + { + .baseHP = 65, + .baseAttack = 50, + .baseDefense = 70, + .baseSpeed = 65, + .baseSpAttack = 95, + .baseSpDefense = 80, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 45, + .expYield = 147, + .evYield_HP = 0, + .evYield_Attack = 0, + .evYield_Defense = 0, + .evYield_Speed = 0, + .evYield_SpAttack = 1, + .evYield_SpDefense = 1, + .item1 = ITEM_NONE, + .item2 = ITEM_NONE, + .genderRatio = 127, + .eggCycles = 25, + .friendship = 70, + .growthRate = GROWTH_FAST, + .eggGroup1 = EGG_GROUP_AMORPHOUS, + .eggGroup2 = EGG_GROUP_AMORPHOUS, + .ability1 = ABILITY_LEVITATE, + .ability2 = ABILITY_NONE, + .safariZoneFleeRate = 0, + .bodyColor = BODY_COLOR_BLUE, + .noFlip = FALSE, } }; -#endif //POKERUBY_BASE_STATS_H +#endif //GUARD_BASE_STATS_H -- cgit v1.2.3 From e0f8841fbd434c06bba7471566629e197b896957 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 13 Jan 2018 23:43:36 -0500 Subject: up to ContestAICmd_unk_52 --- asm/contest_ai.s | 759 ------------------------------------------------------- src/contest_ai.c | 291 +++++++++++++++------ 2 files changed, 214 insertions(+), 836 deletions(-) diff --git a/asm/contest_ai.s b/asm/contest_ai.s index e659b4776..dc102c346 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -5,765 +5,6 @@ .text - thumb_func_start ContestAICmd_check_combo_starter -ContestAICmd_check_combo_starter: @ 8129B44 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r5, 0 - ldr r3, _08129BAC @ =gContestMons - ldr r2, _08129BB0 @ =gSharedMem + 0x192E4 - ldrb r1, [r2, 0x4] - lsls r1, 1 - adds r2, 0x41 - ldrb r0, [r2] - lsls r0, 6 - adds r1, r0 - adds r3, 0x1E - adds r1, r3 - ldrh r6, [r1] - movs r4, 0 - mov r8, r2 - adds r7, r3, 0 -_08129B68: - lsls r0, r4, 1 - mov r2, r8 - ldrb r1, [r2] - lsls r1, 6 - adds r0, r1 - adds r1, r0, r7 - ldrh r0, [r1] - cmp r0, 0 - beq _08129B8A - adds r1, r0, 0 - adds r0, r6, 0 - bl AreMovesContestCombo - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _08129B94 -_08129B8A: - adds r4, 0x1 - cmp r4, 0x3 - ble _08129B68 - cmp r5, 0 - beq _08129B96 -_08129B94: - movs r5, 0x1 -_08129B96: - ldr r0, _08129BB0 @ =gSharedMem + 0x192E4 - strh r5, [r0, 0x18] - ldr r1, _08129BB4 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08129BAC: .4byte gContestMons -_08129BB0: .4byte gSharedMem + 0x192E4 -_08129BB4: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_check_combo_starter - - thumb_func_start ContestAICmd_unk_41 -ContestAICmd_unk_41: @ 8129BB8 - push {lr} - bl ContestAICmd_check_combo_starter - ldr r0, _08129BE4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _08129BEC - ldr r3, _08129BE8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129BF4 - .align 2, 0 -_08129BE4: .4byte gSharedMem + 0x192E4 -_08129BE8: .4byte gAIScriptPtr -_08129BEC: - ldr r1, _08129BF8 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_08129BF4: - pop {r0} - bx r0 - .align 2, 0 -_08129BF8: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_41 - - thumb_func_start ContestAICmd_unk_42 -ContestAICmd_unk_42: @ 8129BFC - push {lr} - bl ContestAICmd_check_combo_starter - ldr r0, _08129C28 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08129C30 - ldr r3, _08129C2C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129C38 - .align 2, 0 -_08129C28: .4byte gSharedMem + 0x192E4 -_08129C2C: .4byte gAIScriptPtr -_08129C30: - ldr r1, _08129C3C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_08129C38: - pop {r0} - bx r0 - .align 2, 0 -_08129C3C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_42 - - thumb_func_start ContestAICmd_check_combo_finisher -ContestAICmd_check_combo_finisher: @ 8129C40 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r5, 0 - ldr r3, _08129CA8 @ =gContestMons - ldr r2, _08129CAC @ =gSharedMem + 0x192E4 - ldrb r1, [r2, 0x4] - lsls r1, 1 - adds r2, 0x41 - ldrb r0, [r2] - lsls r0, 6 - adds r1, r0 - adds r3, 0x1E - adds r1, r3 - ldrh r6, [r1] - movs r4, 0 - mov r8, r2 - adds r7, r3, 0 -_08129C64: - lsls r0, r4, 1 - mov r2, r8 - ldrb r1, [r2] - lsls r1, 6 - adds r0, r1 - adds r1, r0, r7 - ldrh r0, [r1] - cmp r0, 0 - beq _08129C84 - adds r1, r6, 0 - bl AreMovesContestCombo - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _08129C8E -_08129C84: - adds r4, 0x1 - cmp r4, 0x3 - ble _08129C64 - cmp r5, 0 - beq _08129C90 -_08129C8E: - movs r5, 0x1 -_08129C90: - ldr r0, _08129CAC @ =gSharedMem + 0x192E4 - strh r5, [r0, 0x18] - ldr r1, _08129CB0 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08129CA8: .4byte gContestMons -_08129CAC: .4byte gSharedMem + 0x192E4 -_08129CB0: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_check_combo_finisher - - thumb_func_start ContestAICmd_unk_44 -ContestAICmd_unk_44: @ 8129CB4 - push {lr} - bl ContestAICmd_check_combo_finisher - ldr r0, _08129CE0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _08129CE8 - ldr r3, _08129CE4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129CF0 - .align 2, 0 -_08129CE0: .4byte gSharedMem + 0x192E4 -_08129CE4: .4byte gAIScriptPtr -_08129CE8: - ldr r1, _08129CF4 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_08129CF0: - pop {r0} - bx r0 - .align 2, 0 -_08129CF4: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_44 - - thumb_func_start ContestAICmd_unk_45 -ContestAICmd_unk_45: @ 8129CF8 - push {lr} - bl ContestAICmd_check_combo_finisher - ldr r0, _08129D24 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08129D2C - ldr r3, _08129D28 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129D34 - .align 2, 0 -_08129D24: .4byte gSharedMem + 0x192E4 -_08129D28: .4byte gAIScriptPtr -_08129D2C: - ldr r1, _08129D38 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_08129D34: - pop {r0} - bx r0 - .align 2, 0 -_08129D38: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_45 - - thumb_func_start ContestAICmd_check_would_finish_combo -ContestAICmd_check_would_finish_combo: @ 8129D3C - push {r4,r5,lr} - movs r5, 0 - ldr r3, _08129D8C @ =gContestMons - ldr r4, _08129D90 @ =gSharedMem + 0x192E4 - ldrb r0, [r4, 0x4] - lsls r0, 1 - adds r1, r4, 0 - adds r1, 0x41 - ldrb r2, [r1] - lsls r1, r2, 6 - adds r0, r1 - adds r3, 0x1E - adds r0, r3 - ldrh r3, [r0] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r1, r4, 0 - subs r1, 0x84 - adds r1, r0, r1 - ldrh r0, [r1, 0x8] - cmp r0, 0 - beq _08129D74 - adds r1, r3, 0 - bl AreMovesContestCombo - lsls r0, 24 - lsrs r5, r0, 24 -_08129D74: - cmp r5, 0 - beq _08129D7A - movs r5, 0x1 -_08129D7A: - strh r5, [r4, 0x18] - ldr r1, _08129D94 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08129D8C: .4byte gContestMons -_08129D90: .4byte gSharedMem + 0x192E4 -_08129D94: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_check_would_finish_combo - - thumb_func_start ContestAICmd_unk_47 -ContestAICmd_unk_47: @ 8129D98 - push {lr} - bl ContestAICmd_check_would_finish_combo - ldr r0, _08129DC4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _08129DCC - ldr r3, _08129DC8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129DD4 - .align 2, 0 -_08129DC4: .4byte gSharedMem + 0x192E4 -_08129DC8: .4byte gAIScriptPtr -_08129DCC: - ldr r1, _08129DD8 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_08129DD4: - pop {r0} - bx r0 - .align 2, 0 -_08129DD8: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_47 - - thumb_func_start ContestAICmd_unk_48 -ContestAICmd_unk_48: @ 8129DDC - push {lr} - bl ContestAICmd_check_would_finish_combo - ldr r0, _08129E08 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08129E10 - ldr r3, _08129E0C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129E18 - .align 2, 0 -_08129E08: .4byte gSharedMem + 0x192E4 -_08129E0C: .4byte gAIScriptPtr -_08129E10: - ldr r1, _08129E1C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_08129E18: - pop {r0} - bx r0 - .align 2, 0 -_08129E1C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_48 - - thumb_func_start ContestAICmd_get_condition -ContestAICmd_get_condition: @ 8129E20 - push {r4,r5,lr} - ldr r4, _08129E5C @ =gAIScriptPtr - ldr r0, [r4] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - lsrs r0, 24 - ldr r5, _08129E60 @ =gSharedMem + 0x192E4 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r0, r5, 0 - subs r0, 0x84 - adds r1, r0 - movs r0, 0xD - ldrsb r0, [r1, r0] - movs r1, 0xA - bl __divsi3 - lsls r0, 24 - asrs r0, 24 - strh r0, [r5, 0x18] - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08129E5C: .4byte gAIScriptPtr -_08129E60: .4byte gSharedMem + 0x192E4 - thumb_func_end ContestAICmd_get_condition - - thumb_func_start ContestAICmd_unk_4A -ContestAICmd_unk_4A: @ 8129E64 - push {lr} - bl ContestAICmd_get_condition - ldr r0, _08129E94 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129E98 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08129E9C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129EA0 - .align 2, 0 -_08129E94: .4byte gSharedMem + 0x192E4 -_08129E98: .4byte gAIScriptPtr -_08129E9C: - adds r0, r2, 0x5 - str r0, [r3] -_08129EA0: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_4A - - thumb_func_start ContestAICmd_unk_4B -ContestAICmd_unk_4B: @ 8129EA4 - push {lr} - bl ContestAICmd_get_condition - ldr r0, _08129ED4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129ED8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _08129EDC - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129EE0 - .align 2, 0 -_08129ED4: .4byte gSharedMem + 0x192E4 -_08129ED8: .4byte gAIScriptPtr -_08129EDC: - adds r0, r2, 0x5 - str r0, [r3] -_08129EE0: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_4B - - thumb_func_start ContestAICmd_unk_4C -ContestAICmd_unk_4C: @ 8129EE4 - push {lr} - bl ContestAICmd_get_condition - ldr r0, _08129F14 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129F18 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _08129F1C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129F20 - .align 2, 0 -_08129F14: .4byte gSharedMem + 0x192E4 -_08129F18: .4byte gAIScriptPtr -_08129F1C: - adds r0, r2, 0x5 - str r0, [r3] -_08129F20: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_4C - - thumb_func_start ContestAICmd_unk_4D -ContestAICmd_unk_4D: @ 8129F24 - push {lr} - bl ContestAICmd_get_condition - ldr r0, _08129F54 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129F58 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _08129F5C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129F60 - .align 2, 0 -_08129F54: .4byte gSharedMem + 0x192E4 -_08129F58: .4byte gAIScriptPtr -_08129F5C: - adds r0, r2, 0x5 - str r0, [r3] -_08129F60: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_4D - - thumb_func_start ContestAICmd_get_used_combo_starter -ContestAICmd_get_used_combo_starter: @ 8129F64 - push {r4-r6,lr} - movs r6, 0 - ldr r5, _08129FAC @ =gAIScriptPtr - ldr r0, [r5] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl sub_80B214C - lsls r0, 24 - cmp r0, 0 - beq _08129F9C - ldr r2, _08129FB0 @ =gContestMoves - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - ldr r1, _08129FB4 @ =gSharedMem + 0x19260 - adds r0, r1 - ldrh r0, [r0, 0x8] - lsls r0, 3 - adds r0, r2 - ldrb r1, [r0, 0x2] - negs r0, r1 - orrs r0, r1 - lsrs r6, r0, 31 -_08129F9C: - ldr r0, _08129FB8 @ =gSharedMem + 0x192E4 - strh r6, [r0, 0x18] - ldr r0, [r5] - adds r0, 0x2 - str r0, [r5] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08129FAC: .4byte gAIScriptPtr -_08129FB0: .4byte gContestMoves -_08129FB4: .4byte gSharedMem + 0x19260 -_08129FB8: .4byte gSharedMem + 0x192E4 - thumb_func_end ContestAICmd_get_used_combo_starter - - thumb_func_start ContestAICmd_unk_4F -ContestAICmd_unk_4F: @ 8129FBC - push {lr} - bl ContestAICmd_get_used_combo_starter - ldr r0, _08129FEC @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _08129FF0 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _08129FF4 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _08129FF8 - .align 2, 0 -_08129FEC: .4byte gSharedMem + 0x192E4 -_08129FF0: .4byte gAIScriptPtr -_08129FF4: - adds r0, r2, 0x5 - str r0, [r3] -_08129FF8: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_4F - - thumb_func_start ContestAICmd_unk_50 -ContestAICmd_unk_50: @ 8129FFC - push {lr} - bl ContestAICmd_get_used_combo_starter - ldr r0, _0812A02C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A030 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _0812A034 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A038 - .align 2, 0 -_0812A02C: .4byte gSharedMem + 0x192E4 -_0812A030: .4byte gAIScriptPtr -_0812A034: - adds r0, r2, 0x5 - str r0, [r3] -_0812A038: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_50 - - thumb_func_start ContestAICmd_unk_51 -ContestAICmd_unk_51: @ 812A03C - push {lr} - bl ContestAICmd_get_used_combo_starter - ldr r0, _0812A06C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A070 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _0812A074 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A078 - .align 2, 0 -_0812A06C: .4byte gSharedMem + 0x192E4 -_0812A070: .4byte gAIScriptPtr -_0812A074: - adds r0, r2, 0x5 - str r0, [r3] -_0812A078: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_51 - - thumb_func_start ContestAICmd_unk_52 -ContestAICmd_unk_52: @ 812A07C - push {lr} - bl ContestAICmd_get_used_combo_starter - ldr r0, _0812A0AC @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A0B0 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _0812A0B4 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A0B8 - .align 2, 0 -_0812A0AC: .4byte gSharedMem + 0x192E4 -_0812A0B0: .4byte gAIScriptPtr -_0812A0B4: - adds r0, r2, 0x5 - str r0, [r3] -_0812A0B8: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_52 - thumb_func_start ContestAICmd_check_can_participate ContestAICmd_check_can_participate: @ 812A0BC push {lr} diff --git a/src/contest_ai.c b/src/contest_ai.c index a62a69194..7c704be0a 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -3,6 +3,10 @@ #include "random.h" #include "ewram.h" +extern u8 AreMovesContestCombo(u16, u16); +extern bool8 sub_8128A7C(u8); +extern bool8 sub_80B214C(u8); + enum { ContestAI_SettingUp, @@ -745,9 +749,6 @@ void ContestAICmd_unk_3F(void) gAIScriptPtr += 5; } -extern u8 AreMovesContestCombo(u16, u16); - -/* void ContestAICmd_check_combo_starter(void) { u8 result = 0; @@ -756,85 +757,221 @@ void ContestAICmd_check_combo_starter(void) for(i = 0; i < 4; i++) { - u16 newMove = gContestMons[eContestAI->unk41].moves[i]; - u16 isCombo = AreMovesContestCombo(move, gContestMons[eContestAI->unk41].moves[i]); - if(newMove && isCombo) + if (gContestMons[eContestAI->unk41].moves[i]) { - result = 1; - break; + result = AreMovesContestCombo(move, gContestMons[eContestAI->unk41].moves[i]); + if (result) + { + result = 1; + break; + } } - if(isCombo) // dumb double r5 check? + } + + if (result) + result = 1; + + eContestAI->scriptResult = result; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_41(void) +{ + ContestAICmd_check_combo_starter(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_42(void) +{ + ContestAICmd_check_combo_starter(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_check_combo_finisher(void) +{ + u8 result = 0; + int i; + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + for(i = 0; i < 4; i++) + { + if (gContestMons[eContestAI->unk41].moves[i]) { - result = 1; - break; + result = AreMovesContestCombo(gContestMons[eContestAI->unk41].moves[i], move); + if (result) + { + result = 1; + break; + } } } + if (result) + result = 1; + eContestAI->scriptResult = result; gAIScriptPtr += 1; -}*/ - -/* - thumb_func_start ContestAICmd_check_combo_starter -ContestAICmd_check_combo_starter: @ 8129B44 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r5, 0 - ldr r3, _08129BAC @ =gContestMons - ldr r2, _08129BB0 @ =gSharedMem + 0x192E4 - ldrb r1, [r2, 0x4] - lsls r1, 1 - adds r2, 0x41 - ldrb r0, [r2] - lsls r0, 6 - adds r1, r0 - adds r3, 0x1E - adds r1, r3 - ldrh r6, [r1] - movs r4, 0 - mov r8, r2 - adds r7, r3, 0 -_08129B68: - lsls r0, r4, 1 - mov r2, r8 - ldrb r1, [r2] - lsls r1, 6 - adds r0, r1 - adds r1, r0, r7 - ldrh r0, [r1] - cmp r0, 0 - beq _08129B8A - adds r1, r0, 0 - adds r0, r6, 0 - bl AreMovesContestCombo - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _08129B94 -_08129B8A: - adds r4, 0x1 - cmp r4, 0x3 - ble _08129B68 - cmp r5, 0 - beq _08129B96 -_08129B94: - movs r5, 0x1 -_08129B96: - ldr r0, _08129BB0 @ =gSharedMem + 0x192E4 - strh r5, [r0, 0x18] - ldr r1, _08129BB4 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08129BAC: .4byte gContestMons -_08129BB0: .4byte gSharedMem + 0x192E4 -_08129BB4: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_check_combo_starter -*/ +} + +void ContestAICmd_unk_44(void) +{ + ContestAICmd_check_combo_finisher(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_45(void) +{ + ContestAICmd_check_combo_finisher(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_check_would_finish_combo(void) +{ + u8 result = 0; + u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; + + if(sContestantStatus[eContestAI->unk41].prevMove) + result = AreMovesContestCombo(sContestantStatus[eContestAI->unk41].prevMove, move); + + if(result) + result = 1; + + eContestAI->scriptResult = result; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_47(void) +{ + ContestAICmd_check_would_finish_combo(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_48(void) +{ + ContestAICmd_check_would_finish_combo(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_get_condition(void) +{ + int var = sub_8128A7C(gAIScriptPtr[1]); + + eContestAI->scriptResult = sContestantStatus[var].unkD / 10; + gAIScriptPtr += 2; +} + +void ContestAICmd_unk_4A(void) +{ + ContestAICmd_get_condition(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_4B(void) +{ + ContestAICmd_get_condition(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_4C(void) +{ + ContestAICmd_get_condition(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_4D(void) +{ + ContestAICmd_get_condition(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_get_used_combo_starter(void) +{ + u16 result = 0; + u8 var = sub_8128A7C(gAIScriptPtr[1]); + + if(sub_80B214C(var)) + result = gContestMoves[sContestantStatus[var].prevMove].comboStarterId ? 1 : 0; + + eContestAI->scriptResult = result; + gAIScriptPtr += 2; +} + +void ContestAICmd_unk_4F(void) +{ + ContestAICmd_get_used_combo_starter(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_50(void) +{ + ContestAICmd_get_used_combo_starter(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_51(void) +{ + ContestAICmd_get_used_combo_starter(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_52(void) +{ + ContestAICmd_get_used_combo_starter(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} -- cgit v1.2.3 From 74f4ece9184fc388528a775bd31f2cd4d3efe626 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 02:05:32 -0500 Subject: up to ContestAICmd_unk_67 --- asm/contest_ai.s | 768 ------------------------------------------------------- src/contest_ai.c | 205 +++++++++++++++ 2 files changed, 205 insertions(+), 768 deletions(-) diff --git a/asm/contest_ai.s b/asm/contest_ai.s index dc102c346..e0d733c90 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -5,774 +5,6 @@ .text - thumb_func_start ContestAICmd_check_can_participate -ContestAICmd_check_can_participate: @ 812A0BC - push {lr} - ldr r0, _0812A0DC @ =gAIScriptPtr - ldr r0, [r0] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - lsrs r0, 24 - bl Contest_IsMonsTurnDisabled - lsls r0, 24 - cmp r0, 0 - beq _0812A0E4 - ldr r1, _0812A0E0 @ =gSharedMem + 0x192E4 - movs r0, 0 - b _0812A0E8 - .align 2, 0 -_0812A0DC: .4byte gAIScriptPtr -_0812A0E0: .4byte gSharedMem + 0x192E4 -_0812A0E4: - ldr r1, _0812A0F8 @ =gSharedMem + 0x192E4 - movs r0, 0x1 -_0812A0E8: - strh r0, [r1, 0x18] - ldr r1, _0812A0FC @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x2 - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0812A0F8: .4byte gSharedMem + 0x192E4 -_0812A0FC: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_check_can_participate - - thumb_func_start ContestAICmd_unk_54 -ContestAICmd_unk_54: @ 812A100 - push {lr} - bl ContestAICmd_check_can_participate - ldr r0, _0812A12C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0812A134 - ldr r3, _0812A130 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A13C - .align 2, 0 -_0812A12C: .4byte gSharedMem + 0x192E4 -_0812A130: .4byte gAIScriptPtr -_0812A134: - ldr r1, _0812A140 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A13C: - pop {r0} - bx r0 - .align 2, 0 -_0812A140: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_54 - - thumb_func_start ContestAICmd_unk_55 -ContestAICmd_unk_55: @ 812A144 - push {lr} - bl ContestAICmd_check_can_participate - ldr r0, _0812A170 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812A178 - ldr r3, _0812A174 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A180 - .align 2, 0 -_0812A170: .4byte gSharedMem + 0x192E4 -_0812A174: .4byte gAIScriptPtr -_0812A178: - ldr r1, _0812A184 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A180: - pop {r0} - bx r0 - .align 2, 0 -_0812A184: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_55 - - thumb_func_start ContestAICmd_get_val_812A188 -ContestAICmd_get_val_812A188: @ 812A188 - push {r4,lr} - ldr r4, _0812A1BC @ =gAIScriptPtr - ldr r0, [r4] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - lsrs r0, 24 - ldr r2, _0812A1C0 @ =gSharedMem + 0x192E4 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r0, r2, 0 - subs r0, 0x84 - adds r1, r0 - ldrb r0, [r1, 0x15] - lsls r0, 28 - lsrs r0, 31 - strh r0, [r2, 0x18] - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A1BC: .4byte gAIScriptPtr -_0812A1C0: .4byte gSharedMem + 0x192E4 - thumb_func_end ContestAICmd_get_val_812A188 - - thumb_func_start ContestAICmd_unk_57 -ContestAICmd_unk_57: @ 812A1C4 - push {lr} - bl ContestAICmd_get_val_812A188 - ldr r0, _0812A1F0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0812A1F8 - ldr r3, _0812A1F4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A200 - .align 2, 0 -_0812A1F0: .4byte gSharedMem + 0x192E4 -_0812A1F4: .4byte gAIScriptPtr -_0812A1F8: - ldr r1, _0812A204 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A200: - pop {r0} - bx r0 - .align 2, 0 -_0812A204: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_57 - - thumb_func_start ContestAICmd_unk_58 -ContestAICmd_unk_58: @ 812A208 - push {lr} - bl ContestAICmd_get_val_812A188 - ldr r0, _0812A234 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812A23C - ldr r3, _0812A238 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A244 - .align 2, 0 -_0812A234: .4byte gSharedMem + 0x192E4 -_0812A238: .4byte gAIScriptPtr -_0812A23C: - ldr r1, _0812A248 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A244: - pop {r0} - bx r0 - .align 2, 0 -_0812A248: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_58 - - thumb_func_start ContestAICmd_unk_59 -ContestAICmd_unk_59: @ 812A24C - push {r4,r5,lr} - ldr r5, _0812A28C @ =gAIScriptPtr - ldr r0, [r5] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - lsrs r0, 24 - ldr r3, _0812A290 @ =gSharedMem + 0x192E4 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r4, r3, 0 - subs r4, 0x84 - adds r1, r4 - adds r0, r3, 0 - adds r0, 0x41 - ldrb r2, [r0] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r1, 0x4] - ldrh r0, [r0, 0x4] - subs r1, r0 - strh r1, [r3, 0x18] - ldr r0, [r5] - adds r0, 0x2 - str r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812A28C: .4byte gAIScriptPtr -_0812A290: .4byte gSharedMem + 0x192E4 - thumb_func_end ContestAICmd_unk_59 - - thumb_func_start ContestAICmd_unk_5A -ContestAICmd_unk_5A: @ 812A294 - push {lr} - bl ContestAICmd_unk_59 - ldr r0, _0812A2C0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _0812A2C8 - ldr r3, _0812A2C4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A2D0 - .align 2, 0 -_0812A2C0: .4byte gSharedMem + 0x192E4 -_0812A2C4: .4byte gAIScriptPtr -_0812A2C8: - ldr r1, _0812A2D4 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A2D0: - pop {r0} - bx r0 - .align 2, 0 -_0812A2D4: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_5A - - thumb_func_start ContestAICmd_unk_5B -ContestAICmd_unk_5B: @ 812A2D8 - push {lr} - bl ContestAICmd_unk_59 - ldr r0, _0812A304 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - ble _0812A30C - ldr r3, _0812A308 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A314 - .align 2, 0 -_0812A304: .4byte gSharedMem + 0x192E4 -_0812A308: .4byte gAIScriptPtr -_0812A30C: - ldr r1, _0812A318 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A314: - pop {r0} - bx r0 - .align 2, 0 -_0812A318: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_5B - - thumb_func_start ContestAICmd_unk_5C -ContestAICmd_unk_5C: @ 812A31C - push {lr} - bl ContestAICmd_unk_59 - ldr r0, _0812A348 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812A350 - ldr r3, _0812A34C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A358 - .align 2, 0 -_0812A348: .4byte gSharedMem + 0x192E4 -_0812A34C: .4byte gAIScriptPtr -_0812A350: - ldr r1, _0812A35C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A358: - pop {r0} - bx r0 - .align 2, 0 -_0812A35C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_5C - - thumb_func_start ContestAICmd_unk_5D -ContestAICmd_unk_5D: @ 812A360 - push {lr} - bl ContestAICmd_unk_59 - ldr r0, _0812A38C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0812A394 - ldr r3, _0812A390 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A39C - .align 2, 0 -_0812A38C: .4byte gSharedMem + 0x192E4 -_0812A390: .4byte gAIScriptPtr -_0812A394: - ldr r1, _0812A3A0 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A39C: - pop {r0} - bx r0 - .align 2, 0 -_0812A3A0: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_5D - - thumb_func_start ContestAICmd_unk_5E -ContestAICmd_unk_5E: @ 812A3A4 - push {r4,lr} - ldr r4, _0812A3D8 @ =gAIScriptPtr - ldr r0, [r4] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - ldr r3, _0812A3DC @ =gSharedMem + 0x192E4 - ldr r2, _0812A3E0 @ =gUnknown_02038670 - lsrs r0, 23 - adds r0, r2 - adds r1, r3, 0 - adds r1, 0x41 - ldrb r1, [r1] - lsls r1, 1 - adds r1, r2 - ldrh r0, [r0] - ldrh r1, [r1] - subs r0, r1 - strh r0, [r3, 0x18] - ldr r0, [r4] - adds r0, 0x2 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A3D8: .4byte gAIScriptPtr -_0812A3DC: .4byte gSharedMem + 0x192E4 -_0812A3E0: .4byte gUnknown_02038670 - thumb_func_end ContestAICmd_unk_5E - - thumb_func_start ContestAICmd_unk_5F -ContestAICmd_unk_5F: @ 812A3E4 - push {lr} - bl ContestAICmd_unk_5E - ldr r0, _0812A410 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _0812A418 - ldr r3, _0812A414 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A420 - .align 2, 0 -_0812A410: .4byte gSharedMem + 0x192E4 -_0812A414: .4byte gAIScriptPtr -_0812A418: - ldr r1, _0812A424 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A420: - pop {r0} - bx r0 - .align 2, 0 -_0812A424: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_5F - - thumb_func_start ContestAICmd_unk_60 -ContestAICmd_unk_60: @ 812A428 - push {lr} - bl ContestAICmd_unk_5E - ldr r0, _0812A454 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - ble _0812A45C - ldr r3, _0812A458 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A464 - .align 2, 0 -_0812A454: .4byte gSharedMem + 0x192E4 -_0812A458: .4byte gAIScriptPtr -_0812A45C: - ldr r1, _0812A468 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A464: - pop {r0} - bx r0 - .align 2, 0 -_0812A468: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_60 - - thumb_func_start ContestAICmd_unk_61 -ContestAICmd_unk_61: @ 812A46C - push {lr} - bl ContestAICmd_unk_5E - ldr r0, _0812A498 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812A4A0 - ldr r3, _0812A49C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A4A8 - .align 2, 0 -_0812A498: .4byte gSharedMem + 0x192E4 -_0812A49C: .4byte gAIScriptPtr -_0812A4A0: - ldr r1, _0812A4AC @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A4A8: - pop {r0} - bx r0 - .align 2, 0 -_0812A4AC: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_61 - - thumb_func_start ContestAICmd_unk_62 -ContestAICmd_unk_62: @ 812A4B0 - push {lr} - bl ContestAICmd_unk_5E - ldr r0, _0812A4DC @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0812A4E4 - ldr r3, _0812A4E0 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A4EC - .align 2, 0 -_0812A4DC: .4byte gSharedMem + 0x192E4 -_0812A4E0: .4byte gAIScriptPtr -_0812A4E4: - ldr r1, _0812A4F0 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812A4EC: - pop {r0} - bx r0 - .align 2, 0 -_0812A4F0: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_62 - - thumb_func_start ContestAICmd_unk_63 -ContestAICmd_unk_63: @ 812A4F4 - push {r4,lr} - ldr r4, _0812A52C @ =gAIScriptPtr - ldr r0, [r4] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - ldr r3, [r4] - ldrb r1, [r3, 0x2] - ldr r2, _0812A530 @ =gSharedMem + 0x19204 - lsrs r0, 23 - lsls r1, 3 - adds r0, r1 - adds r1, r2, 0 - adds r1, 0x1C - adds r0, r1 - ldrh r0, [r0] - adds r2, 0xE0 - ldr r1, _0812A534 @ =gContestMoves - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0] - strh r0, [r2, 0x18] - adds r3, 0x3 - str r3, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A52C: .4byte gAIScriptPtr -_0812A530: .4byte gSharedMem + 0x19204 -_0812A534: .4byte gContestMoves - thumb_func_end ContestAICmd_unk_63 - - thumb_func_start ContestAICmd_unk_64 -ContestAICmd_unk_64: @ 812A538 - push {lr} - bl ContestAICmd_unk_63 - ldr r0, _0812A568 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A56C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _0812A570 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A574 - .align 2, 0 -_0812A568: .4byte gSharedMem + 0x192E4 -_0812A56C: .4byte gAIScriptPtr -_0812A570: - adds r0, r2, 0x5 - str r0, [r3] -_0812A574: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_64 - - thumb_func_start ContestAICmd_unk_65 -ContestAICmd_unk_65: @ 812A578 - push {lr} - bl ContestAICmd_unk_63 - ldr r0, _0812A5A8 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A5AC @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _0812A5B0 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A5B4 - .align 2, 0 -_0812A5A8: .4byte gSharedMem + 0x192E4 -_0812A5AC: .4byte gAIScriptPtr -_0812A5B0: - adds r0, r2, 0x5 - str r0, [r3] -_0812A5B4: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_65 - - thumb_func_start ContestAICmd_unk_66 -ContestAICmd_unk_66: @ 812A5B8 - push {lr} - bl ContestAICmd_unk_63 - ldr r0, _0812A5E8 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A5EC @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _0812A5F0 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A5F4 - .align 2, 0 -_0812A5E8: .4byte gSharedMem + 0x192E4 -_0812A5EC: .4byte gAIScriptPtr -_0812A5F0: - adds r0, r2, 0x5 - str r0, [r3] -_0812A5F4: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_66 - - thumb_func_start ContestAICmd_unk_67 -ContestAICmd_unk_67: @ 812A5F8 - push {lr} - bl ContestAICmd_unk_63 - ldr r0, _0812A628 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A62C @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _0812A630 - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A634 - .align 2, 0 -_0812A628: .4byte gSharedMem + 0x192E4 -_0812A62C: .4byte gAIScriptPtr -_0812A630: - adds r0, r2, 0x5 - str r0, [r3] -_0812A634: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_67 - thumb_func_start ContestAICmd_unk_68 ContestAICmd_unk_68: @ 812A638 push {r4,lr} diff --git a/src/contest_ai.c b/src/contest_ai.c index 7c704be0a..037564a9b 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -6,6 +6,7 @@ extern u8 AreMovesContestCombo(u16, u16); extern bool8 sub_8128A7C(u8); extern bool8 sub_80B214C(u8); +extern bool8 Contest_IsMonsTurnDisabled(u8); enum { @@ -975,3 +976,207 @@ void ContestAICmd_unk_52(void) else gAIScriptPtr += 5; } + +void ContestAICmd_check_can_participate(void) +{ + if(Contest_IsMonsTurnDisabled(sub_8128A7C(gAIScriptPtr[1]))) + eContestAI->scriptResult = FALSE; + else + eContestAI->scriptResult = TRUE; + + gAIScriptPtr += 2; +} + +void ContestAICmd_unk_54(void) +{ + ContestAICmd_check_can_participate(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_55(void) +{ + ContestAICmd_check_can_participate(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_get_val_812A188(void) +{ + u8 var = sub_8128A7C(gAIScriptPtr[1]); + + eContestAI->scriptResult = sContestantStatus[var].unk15_3; + gAIScriptPtr += 2; +} + +void ContestAICmd_unk_57(void) +{ + ContestAICmd_get_val_812A188(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_58(void) +{ + ContestAICmd_get_val_812A188(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_59(void) +{ + u8 var = sub_8128A7C(gAIScriptPtr[1]); + + eContestAI->scriptResult = sContestantStatus[var].unk4 - sContestantStatus[eContestAI->unk41].unk4; + gAIScriptPtr += 2; +} + +void ContestAICmd_unk_5A(void) +{ + ContestAICmd_unk_59(); + + if((s16)eContestAI->scriptResult < 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_5B(void) +{ + ContestAICmd_unk_59(); + + if((s16)eContestAI->scriptResult > 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_5C(void) +{ + ContestAICmd_unk_59(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_5D(void) +{ + ContestAICmd_unk_59(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_5E(void) +{ + u8 var = sub_8128A7C(gAIScriptPtr[1]); + + eContestAI->scriptResult = gUnknown_02038670[var] - gUnknown_02038670[eContestAI->unk41]; + gAIScriptPtr += 2; +} + +void ContestAICmd_unk_5F(void) +{ + ContestAICmd_unk_5E(); + + if((s16)eContestAI->scriptResult < 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_60(void) +{ + ContestAICmd_unk_5E(); + + if((s16)eContestAI->scriptResult > 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_61(void) +{ + ContestAICmd_unk_5E(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_62(void) +{ + ContestAICmd_unk_5E(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_63(void) +{ + u8 var = sub_8128A7C(gAIScriptPtr[1]); + u8 var2 = gAIScriptPtr[2]; + u16 move = sContest.unk19220[var2][var]; + + eContestAI->scriptResult = gContestMoves[move].effect; + gAIScriptPtr += 3; +} + +void ContestAICmd_unk_64(void) +{ + ContestAICmd_unk_63(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_65(void) +{ + ContestAICmd_unk_63(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_66(void) +{ + ContestAICmd_unk_63(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_67(void) +{ + ContestAICmd_unk_63(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} -- cgit v1.2.3 From bc2abc39f6a8b47e844136a43fbc729eb5568833 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 04:46:09 -0500 Subject: up to ContestAICmd_unk_7E --- asm/contest_ai.s | 838 ------------------------------------------------------ include/contest.h | 2 +- src/contest_ai.c | 191 +++++++++++++ 3 files changed, 192 insertions(+), 839 deletions(-) diff --git a/asm/contest_ai.s b/asm/contest_ai.s index e0d733c90..ff8f80bd9 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -5,844 +5,6 @@ .text - thumb_func_start ContestAICmd_unk_68 -ContestAICmd_unk_68: @ 812A638 - push {r4,lr} - ldr r4, _0812A66C @ =gAIScriptPtr - ldr r0, [r4] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - lsrs r0, 24 - ldr r3, [r4] - ldrb r1, [r3, 0x2] - ldr r2, _0812A670 @ =gSharedMem + 0x19204 - lsls r1, 2 - adds r0, r1 - adds r1, r2, 0 - adds r1, 0x44 - adds r0, r1 - adds r2, 0xE0 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - strh r0, [r2, 0x18] - adds r3, 0x3 - str r3, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A66C: .4byte gAIScriptPtr -_0812A670: .4byte gSharedMem + 0x19204 - thumb_func_end ContestAICmd_unk_68 - - thumb_func_start ContestAICmd_unk_69 -ContestAICmd_unk_69: @ 812A674 - push {lr} - bl ContestAICmd_unk_68 - ldr r0, _0812A6A4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A6A8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bge _0812A6AC - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A6B0 - .align 2, 0 -_0812A6A4: .4byte gSharedMem + 0x192E4 -_0812A6A8: .4byte gAIScriptPtr -_0812A6AC: - adds r0, r2, 0x5 - str r0, [r3] -_0812A6B0: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_69 - - thumb_func_start ContestAICmd_unk_6A -ContestAICmd_unk_6A: @ 812A6B4 - push {lr} - bl ContestAICmd_unk_68 - ldr r0, _0812A6E4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A6E8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - ble _0812A6EC - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A6F0 - .align 2, 0 -_0812A6E4: .4byte gSharedMem + 0x192E4 -_0812A6E8: .4byte gAIScriptPtr -_0812A6EC: - adds r0, r2, 0x5 - str r0, [r3] -_0812A6F0: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_6A - - thumb_func_start ContestAICmd_unk_6B -ContestAICmd_unk_6B: @ 812A6F4 - push {lr} - bl ContestAICmd_unk_68 - ldr r0, _0812A724 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A728 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _0812A72C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A730 - .align 2, 0 -_0812A724: .4byte gSharedMem + 0x192E4 -_0812A728: .4byte gAIScriptPtr -_0812A72C: - adds r0, r2, 0x5 - str r0, [r3] -_0812A730: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_6B - - thumb_func_start ContestAICmd_unk_6C -ContestAICmd_unk_6C: @ 812A734 - push {lr} - bl ContestAICmd_unk_68 - ldr r0, _0812A764 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A768 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _0812A76C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A770 - .align 2, 0 -_0812A764: .4byte gSharedMem + 0x192E4 -_0812A768: .4byte gAIScriptPtr -_0812A76C: - adds r0, r2, 0x5 - str r0, [r3] -_0812A770: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_6C - - thumb_func_start ContestAICmd_unk_6D -ContestAICmd_unk_6D: @ 812A774 - push {r4,r5,lr} - ldr r5, _0812A7B4 @ =gAIScriptPtr - ldr r0, [r5] - ldrb r0, [r0, 0x1] - bl sub_8128A7C - lsls r0, 24 - ldr r3, [r5] - ldrb r1, [r3, 0x2] - ldr r2, _0812A7B8 @ =gSharedMem + 0x19204 - lsrs r0, 23 - lsls r1, 3 - adds r0, r1 - adds r1, r2, 0 - adds r1, 0x1C - adds r0, r1 - ldrh r0, [r0] - adds r2, 0xE0 - ldr r4, _0812A7BC @ =gContestEffects - ldr r1, _0812A7C0 @ =gContestMoves - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0] - strh r0, [r2, 0x18] - adds r3, 0x3 - str r3, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0812A7B4: .4byte gAIScriptPtr -_0812A7B8: .4byte gSharedMem + 0x19204 -_0812A7BC: .4byte gContestEffects -_0812A7C0: .4byte gContestMoves - thumb_func_end ContestAICmd_unk_6D - - thumb_func_start ContestAICmd_unk_6E -ContestAICmd_unk_6E: @ 812A7C4 - push {lr} - bl ContestAICmd_unk_6D - ldr r0, _0812A7F4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A7F8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - bne _0812A7FC - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A800 - .align 2, 0 -_0812A7F4: .4byte gSharedMem + 0x192E4 -_0812A7F8: .4byte gAIScriptPtr -_0812A7FC: - adds r0, r2, 0x5 - str r0, [r3] -_0812A800: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_6E - - thumb_func_start ContestAICmd_unk_6F -ContestAICmd_unk_6F: @ 812A804 - push {lr} - bl ContestAICmd_unk_6D - ldr r0, _0812A834 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - ldr r3, _0812A838 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - cmp r0, r1 - beq _0812A83C - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812A840 - .align 2, 0 -_0812A834: .4byte gSharedMem + 0x192E4 -_0812A838: .4byte gAIScriptPtr -_0812A83C: - adds r0, r2, 0x5 - str r0, [r3] -_0812A840: - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_6F - - thumb_func_start ContestAICmd_unk_70 -ContestAICmd_unk_70: @ 812A844 - push {r4,lr} - ldr r3, _0812A864 @ =gSharedMem + 0x192E4 - ldr r4, _0812A868 @ =gAIScriptPtr - ldr r2, [r4] - ldrb r0, [r2, 0x1] - lsls r0, 1 - adds r1, r3, 0 - adds r1, 0x1A - adds r0, r1 - ldrh r1, [r3, 0x18] - strh r1, [r0] - adds r2, 0x2 - str r2, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A864: .4byte gSharedMem + 0x192E4 -_0812A868: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_70 - - thumb_func_start ContestAICmd_unk_71 -ContestAICmd_unk_71: @ 812A86C - push {r4,lr} - ldr r0, _0812A890 @ =gSharedMem + 0x192E4 - ldr r4, _0812A894 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r2, [r3, 0x1] - lsls r2, 1 - adds r0, 0x1A - adds r2, r0 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - strh r1, [r2] - adds r3, 0x4 - str r3, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A890: .4byte gSharedMem + 0x192E4 -_0812A894: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_71 - - thumb_func_start ContestAICmd_unk_72 -ContestAICmd_unk_72: @ 812A898 - push {r4,lr} - ldr r0, _0812A8C4 @ =gSharedMem + 0x192E4 - ldr r4, _0812A8C8 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r2, [r3, 0x1] - lsls r2, 1 - adds r0, 0x1A - adds r2, r0 - movs r1, 0x2 - ldrsb r1, [r3, r1] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrh r0, [r2] - adds r1, r0 - strh r1, [r2] - adds r3, 0x4 - str r3, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A8C4: .4byte gSharedMem + 0x192E4 -_0812A8C8: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_72 - - thumb_func_start ContestAICmd_unk_73 -ContestAICmd_unk_73: @ 812A8CC - push {r4,lr} - ldr r2, _0812A8F4 @ =gSharedMem + 0x192E4 - ldr r4, _0812A8F8 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3, 0x1] - lsls r1, 1 - adds r2, 0x1A - adds r1, r2 - ldrb r0, [r3, 0x2] - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - ldrh r2, [r1] - adds r0, r2 - strh r0, [r1] - adds r3, 0x3 - str r3, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A8F4: .4byte gSharedMem + 0x192E4 -_0812A8F8: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_73 - - thumb_func_start ContestAICmd_unk_74 -ContestAICmd_unk_74: @ 812A8FC - push {r4,lr} - ldr r2, _0812A924 @ =gSharedMem + 0x192E4 - ldr r4, _0812A928 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3, 0x1] - lsls r1, 1 - adds r2, 0x1A - adds r1, r2 - ldrb r0, [r3, 0x2] - lsls r0, 1 - adds r0, r2 - ldrh r0, [r0] - ldrh r2, [r1] - adds r0, r2 - strh r0, [r1] - adds r3, 0x3 - str r3, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812A924: .4byte gSharedMem + 0x192E4 -_0812A928: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_74 - - thumb_func_start ContestAICmd_unk_75 -ContestAICmd_unk_75: @ 812A92C - push {r4,lr} - ldr r1, _0812A964 @ =gSharedMem + 0x192E4 - ldr r4, _0812A968 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r0, [r3, 0x1] - lsls r0, 1 - adds r1, 0x1A - adds r0, r1 - movs r1, 0 - ldrsh r2, [r0, r1] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - cmp r2, r1 - bge _0812A96C - ldrb r1, [r3, 0x4] - ldrb r0, [r3, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812A972 - .align 2, 0 -_0812A964: .4byte gSharedMem + 0x192E4 -_0812A968: .4byte gAIScriptPtr -_0812A96C: - adds r0, r3, 0 - adds r0, 0x8 - str r0, [r4] -_0812A972: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_75 - - thumb_func_start ContestAICmd_unk_76 -ContestAICmd_unk_76: @ 812A978 - push {r4,lr} - ldr r1, _0812A9B0 @ =gSharedMem + 0x192E4 - ldr r4, _0812A9B4 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r0, [r3, 0x1] - lsls r0, 1 - adds r1, 0x1A - adds r0, r1 - movs r1, 0 - ldrsh r2, [r0, r1] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - cmp r2, r1 - ble _0812A9B8 - ldrb r1, [r3, 0x4] - ldrb r0, [r3, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812A9BE - .align 2, 0 -_0812A9B0: .4byte gSharedMem + 0x192E4 -_0812A9B4: .4byte gAIScriptPtr -_0812A9B8: - adds r0, r3, 0 - adds r0, 0x8 - str r0, [r4] -_0812A9BE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_76 - - thumb_func_start ContestAICmd_unk_77 -ContestAICmd_unk_77: @ 812A9C4 - push {r4,lr} - ldr r1, _0812A9FC @ =gSharedMem + 0x192E4 - ldr r4, _0812AA00 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r0, [r3, 0x1] - lsls r0, 1 - adds r1, 0x1A - adds r0, r1 - movs r1, 0 - ldrsh r2, [r0, r1] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - cmp r2, r1 - bne _0812AA04 - ldrb r1, [r3, 0x4] - ldrb r0, [r3, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812AA0A - .align 2, 0 -_0812A9FC: .4byte gSharedMem + 0x192E4 -_0812AA00: .4byte gAIScriptPtr -_0812AA04: - adds r0, r3, 0 - adds r0, 0x8 - str r0, [r4] -_0812AA0A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_77 - - thumb_func_start ContestAICmd_unk_78 -ContestAICmd_unk_78: @ 812AA10 - push {r4,lr} - ldr r1, _0812AA48 @ =gSharedMem + 0x192E4 - ldr r4, _0812AA4C @ =gAIScriptPtr - ldr r3, [r4] - ldrb r0, [r3, 0x1] - lsls r0, 1 - adds r1, 0x1A - adds r0, r1 - movs r1, 0 - ldrsh r2, [r0, r1] - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - cmp r2, r1 - beq _0812AA50 - ldrb r1, [r3, 0x4] - ldrb r0, [r3, 0x5] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x7] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812AA56 - .align 2, 0 -_0812AA48: .4byte gSharedMem + 0x192E4 -_0812AA4C: .4byte gAIScriptPtr -_0812AA50: - adds r0, r3, 0 - adds r0, 0x8 - str r0, [r4] -_0812AA56: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_78 - - thumb_func_start ContestAICmd_unk_79 -ContestAICmd_unk_79: @ 812AA5C - push {r4,lr} - ldr r2, _0812AA98 @ =gSharedMem + 0x192E4 - ldr r4, _0812AA9C @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3, 0x1] - lsls r1, 1 - adds r2, 0x1A - adds r1, r2 - ldrb r0, [r3, 0x2] - lsls r0, 1 - adds r0, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r1, r0 - bge _0812AAA0 - ldrb r1, [r3, 0x3] - ldrb r0, [r3, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812AAA4 - .align 2, 0 -_0812AA98: .4byte gSharedMem + 0x192E4 -_0812AA9C: .4byte gAIScriptPtr -_0812AAA0: - adds r0, r3, 0x7 - str r0, [r4] -_0812AAA4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_79 - - thumb_func_start ContestAICmd_unk_7A -ContestAICmd_unk_7A: @ 812AAAC - push {r4,lr} - ldr r2, _0812AAE8 @ =gSharedMem + 0x192E4 - ldr r4, _0812AAEC @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3, 0x1] - lsls r1, 1 - adds r2, 0x1A - adds r1, r2 - ldrb r0, [r3, 0x2] - lsls r0, 1 - adds r0, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r1, r0 - ble _0812AAF0 - ldrb r1, [r3, 0x3] - ldrb r0, [r3, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812AAF4 - .align 2, 0 -_0812AAE8: .4byte gSharedMem + 0x192E4 -_0812AAEC: .4byte gAIScriptPtr -_0812AAF0: - adds r0, r3, 0x7 - str r0, [r4] -_0812AAF4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_7A - - thumb_func_start ContestAICmd_unk_7B -ContestAICmd_unk_7B: @ 812AAFC - push {r4,lr} - ldr r2, _0812AB38 @ =gSharedMem + 0x192E4 - ldr r4, _0812AB3C @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3, 0x1] - lsls r1, 1 - adds r2, 0x1A - adds r1, r2 - ldrb r0, [r3, 0x2] - lsls r0, 1 - adds r0, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r1, r0 - bne _0812AB40 - ldrb r1, [r3, 0x3] - ldrb r0, [r3, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812AB44 - .align 2, 0 -_0812AB38: .4byte gSharedMem + 0x192E4 -_0812AB3C: .4byte gAIScriptPtr -_0812AB40: - adds r0, r3, 0x7 - str r0, [r4] -_0812AB44: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_7B - - thumb_func_start ContestAICmd_unk_7C -ContestAICmd_unk_7C: @ 812AB4C - push {r4,lr} - ldr r2, _0812AB88 @ =gSharedMem + 0x192E4 - ldr r4, _0812AB8C @ =gAIScriptPtr - ldr r3, [r4] - ldrb r1, [r3, 0x1] - lsls r1, 1 - adds r2, 0x1A - adds r1, r2 - ldrb r0, [r3, 0x2] - lsls r0, 1 - adds r0, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r1, r0 - beq _0812AB90 - ldrb r1, [r3, 0x3] - ldrb r0, [r3, 0x4] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x6] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812AB94 - .align 2, 0 -_0812AB88: .4byte gSharedMem + 0x192E4 -_0812AB8C: .4byte gAIScriptPtr -_0812AB90: - adds r0, r3, 0x7 - str r0, [r4] -_0812AB94: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_7C - - thumb_func_start ContestAICmd_unk_7D -ContestAICmd_unk_7D: @ 812AB9C - push {r4,lr} - bl Random - movs r2, 0xFF - ands r2, r0 - ldr r1, _0812ABD4 @ =gSharedMem + 0x192E4 - ldr r4, _0812ABD8 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r0, [r3, 0x1] - lsls r0, 1 - adds r1, 0x1A - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r2, r0 - bge _0812ABDC - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812ABE0 - .align 2, 0 -_0812ABD4: .4byte gSharedMem + 0x192E4 -_0812ABD8: .4byte gAIScriptPtr -_0812ABDC: - adds r0, r3, 0x6 - str r0, [r4] -_0812ABE0: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_7D - - thumb_func_start ContestAICmd_unk_7E -ContestAICmd_unk_7E: @ 812ABE8 - push {r4,lr} - bl Random - movs r2, 0xFF - ands r2, r0 - ldr r1, _0812AC20 @ =gSharedMem + 0x192E4 - ldr r4, _0812AC24 @ =gAIScriptPtr - ldr r3, [r4] - ldrb r0, [r3, 0x1] - lsls r0, 1 - adds r1, 0x1A - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r2, r0 - ble _0812AC28 - ldrb r1, [r3, 0x2] - ldrb r0, [r3, 0x3] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r3, 0x4] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r3, 0x5] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - b _0812AC2C - .align 2, 0 -_0812AC20: .4byte gSharedMem + 0x192E4 -_0812AC24: .4byte gAIScriptPtr -_0812AC28: - adds r0, r3, 0x6 - str r0, [r4] -_0812AC2C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_7E - thumb_func_start ContestAICmd_unk_7F ContestAICmd_unk_7F: @ 812AC34 ldr r3, _0812AC50 @ =gAIScriptPtr diff --git a/include/contest.h b/include/contest.h index 9a211bbf5..c8c1a2901 100644 --- a/include/contest.h +++ b/include/contest.h @@ -79,7 +79,7 @@ struct ContestAIInfo { /*0x11*/ u8 filler11[0x3]; // padding? /*0x14*/ u32 flags; /*0x18*/ u16 scriptResult; - /*0x1A*/ u8 filler1A[0x26]; + /*0x1A*/ u16 scriptArr[19]; // TODO: are there more variables after the array? /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; /*0x42*/ u8 filler42[0x2]; // padding? diff --git a/src/contest_ai.c b/src/contest_ai.c index 037564a9b..3fc7cec3b 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -1180,3 +1180,194 @@ void ContestAICmd_unk_67(void) else gAIScriptPtr += 5; } + +void ContestAICmd_unk_68(void) +{ + u8 var = sub_8128A7C(gAIScriptPtr[1]); + u8 var2 = gAIScriptPtr[2]; + s8 result = sContest.unk19248[var2][var]; + + eContestAI->scriptResult = result; + gAIScriptPtr += 3; +} + +void ContestAICmd_unk_69(void) +{ + ContestAICmd_unk_68(); + + if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_6A(void) +{ + ContestAICmd_unk_68(); + + if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_6B(void) +{ + ContestAICmd_unk_68(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_6C(void) +{ + ContestAICmd_unk_68(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_6D(void) +{ + u8 var = sub_8128A7C(gAIScriptPtr[1]); + u8 var2 = gAIScriptPtr[2]; + u16 move = sContest.unk19220[var2][var]; + + eContestAI->scriptResult = gContestEffects[gContestMoves[move].effect].effectType; + gAIScriptPtr += 3; +} + +void ContestAICmd_unk_6E(void) +{ + ContestAICmd_unk_6D(); + + if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_6F(void) +{ + ContestAICmd_unk_6D(); + + if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); + else + gAIScriptPtr += 5; +} + +void ContestAICmd_unk_70(void) +{ + eContestAI->scriptArr[gAIScriptPtr[1]] = eContestAI->scriptResult; + gAIScriptPtr += 2; +} + +void ContestAICmd_unk_71(void) +{ + eContestAI->scriptArr[gAIScriptPtr[1]] = T1_READ_16(gAIScriptPtr + 2); + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_72(void) +{ + // wtf? shouldn't T1_READ_16 work here? why the signed 8 load by gAIScriptPtr[2]? + eContestAI->scriptArr[gAIScriptPtr[1]] += ((s8)gAIScriptPtr[2] | gAIScriptPtr[3] << 8); + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_73(void) +{ + eContestAI->scriptArr[gAIScriptPtr[1]] += eContestAI->scriptArr[gAIScriptPtr[2]]; + gAIScriptPtr += 3; +} + +void ContestAICmd_unk_74(void) +{ + eContestAI->scriptArr[gAIScriptPtr[1]] += eContestAI->scriptArr[gAIScriptPtr[2]]; + gAIScriptPtr += 3; +} + +void ContestAICmd_unk_75(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] < T1_READ_16(gAIScriptPtr + 2)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +void ContestAICmd_unk_76(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] > T1_READ_16(gAIScriptPtr + 2)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +void ContestAICmd_unk_77(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] == T1_READ_16(gAIScriptPtr + 2)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +void ContestAICmd_unk_78(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] != T1_READ_16(gAIScriptPtr + 2)) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); + else + gAIScriptPtr += 8; +} + +void ContestAICmd_unk_79(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] < ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +void ContestAICmd_unk_7A(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] > ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +void ContestAICmd_unk_7B(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] == ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +void ContestAICmd_unk_7C(void) +{ + if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] != ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); + else + gAIScriptPtr += 7; +} + +void ContestAICmd_unk_7D(void) +{ + if((Random() & 0xFF) < (s16)eContestAI->scriptArr[gAIScriptPtr[1]]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} + +void ContestAICmd_unk_7E(void) +{ + if((Random() & 0xFF) > (s16)eContestAI->scriptArr[gAIScriptPtr[1]]) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); + else + gAIScriptPtr += 6; +} -- cgit v1.2.3 From 72c90d9dd35b2e0cc8597cd1e10c6a767fea0f0e Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 14 Jan 2018 14:13:59 +0100 Subject: Decompiled data/battle_anim_80A7E7C.s --- data/battle_anim_80A7E7C.s | 24 ------------- ld_script.txt | 2 +- src/battle/battle_anim_80A7E7C.c | 78 +++++++++++++++++++++++++++++++++++----- temp.txt | 55 ++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+), 34 deletions(-) delete mode 100644 data/battle_anim_80A7E7C.s create mode 100644 temp.txt diff --git a/data/battle_anim_80A7E7C.s b/data/battle_anim_80A7E7C.s deleted file mode 100644 index 395b2e0ab..000000000 --- a/data/battle_anim_80A7E7C.s +++ /dev/null @@ -1,24 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gBattleAnimSpriteTemplate_83C1FB0:: @ 83C1FB0 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8530 - - .align 2 -gBattleAnimSpriteTemplate_83C1FC8:: @ 83C1FC8 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A85C8 - - .align 2 -gBattleAnimSpriteTemplate_83C1FE0:: @ 83C1FE0 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8638 - - .align 2 -gBattleAnimSpriteTemplate_83C1FF8:: @ 83C1FF8 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8764 - - .align 2 -gBattleAnimSpriteTemplate_83C2010:: @ 83C2010 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8818 diff --git a/ld_script.txt b/ld_script.txt index e9a6e5236..b15e452ac 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -547,7 +547,7 @@ SECTIONS { src/pokemon/pokemon_summary_screen.o(.rodata); src/field/fldeff_cut.o(.rodata); src/field/item_menu.o(.rodata); - data/battle_anim_80A7E7C.o(.rodata); + src/battle/battle_anim_80A7E7C.o(.rodata); src/field/item.o(.rodata); src/debug/matsuda_debug_menu.o(.rodata); data/contest.o(.rodata); diff --git a/src/battle/battle_anim_80A7E7C.c b/src/battle/battle_anim_80A7E7C.c index c35434df0..f109333e3 100644 --- a/src/battle/battle_anim_80A7E7C.c +++ b/src/battle/battle_anim_80A7E7C.c @@ -20,17 +20,77 @@ static void sub_80A808C(u8 taskId); static void sub_80A81D8(u8 taskId); static void sub_80A8374(u8 taskId); static void sub_80A8488(u8 taskId); +static void sub_80A8530(struct Sprite *sprite); static void sub_80A85A4(struct Sprite *sprite); -void sub_80A8614(struct Sprite* sprite); +static void sub_80A85C8(struct Sprite *sprite); +static void sub_80A8614(struct Sprite* sprite); +static void sub_80A8638(struct Sprite *sprite); static void sub_80A86F4(struct Sprite *sprite); +static void sub_80A8764(struct Sprite *sprite); +static void sub_80A8818(struct Sprite *sprite); static void sub_80A88F0(struct Sprite *sprite); static void sub_80A89B4(u8 taskId); static void sub_80A8A18(u8 taskId); static void sub_80A8C0C(u8 taskId); static void sub_80A8D8C(u8 taskId); -void sub_80A8FD8(u8 taskId); +static void sub_80A8FD8(u8 taskId); static void sub_80A913C(u8 taskId); +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FB0 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8530, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FC8 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A85C8, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FE0 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8638, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FF8 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8764, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C2010 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8818, +}; + void sub_80A7E7C(u8 taskId) { u8 sprite; @@ -335,7 +395,7 @@ void sub_80A8500(u8 taskId) sub_80A8408(taskId); } -void sub_80A8530(struct Sprite *sprite) +static void sub_80A8530(struct Sprite *sprite) { sprite->invisible = TRUE; if (GetBankSide(gAnimBankAttacker)) @@ -362,7 +422,7 @@ static void sub_80A85A4(struct Sprite *sprite) StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } -void sub_80A85C8(struct Sprite *sprite) +static void sub_80A85C8(struct Sprite *sprite) { u8 spriteId; sprite->invisible = TRUE; @@ -376,7 +436,7 @@ void sub_80A85C8(struct Sprite *sprite) sprite->callback = sub_8078458; } -void sub_80A8614(struct Sprite *sprite) +static void sub_80A8614(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[2] = -sprite->data[2]; @@ -384,7 +444,7 @@ void sub_80A8614(struct Sprite *sprite) StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } -void sub_80A8638(struct Sprite *sprite) +static void sub_80A8638(struct Sprite *sprite) { int something; int spriteId; @@ -451,7 +511,7 @@ static void sub_80A86F4(struct Sprite *sprite) } } -void sub_80A8764(struct Sprite *sprite) +static void sub_80A8764(struct Sprite *sprite) { u8 v1; u8 spriteId; @@ -486,7 +546,7 @@ void sub_80A8764(struct Sprite *sprite) sprite->callback = sub_80784A8; } -void sub_80A8818(struct Sprite *sprite) +static void sub_80A8818(struct Sprite *sprite) { u8 spriteId; u8 v1; @@ -833,7 +893,7 @@ void sub_80A8EFC(u8 taskId) TASK.func = sub_80A8FD8; } -void sub_80A8FD8(u8 taskId) +static void sub_80A8FD8(u8 taskId) { TASK.data[3] += TASK.data[4]; obj_id_set_rotscale(TASK.data[5], 0x100, 0x100, TASK.data[3]); diff --git a/temp.txt b/temp.txt new file mode 100644 index 000000000..67929cb00 --- /dev/null +++ b/temp.txt @@ -0,0 +1,55 @@ +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FB0 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8530, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FC8 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A85C8, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FE0 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8638, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FF8 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8764, +}; + +const struct SpriteTemplate gBattleAnimSpriteTemplate_83C2010 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_80A8818, +}; + -- cgit v1.2.3 From 95bf95649ff88810c626ce99569cdffddc06a389 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 14 Jan 2018 14:27:18 +0100 Subject: Forgot to delete this --- temp.txt | 55 ------------------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 temp.txt diff --git a/temp.txt b/temp.txt deleted file mode 100644 index 67929cb00..000000000 --- a/temp.txt +++ /dev/null @@ -1,55 +0,0 @@ -const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FB0 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A8530, -}; - -const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FC8 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A85C8, -}; - -const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FE0 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A8638, -}; - -const struct SpriteTemplate gBattleAnimSpriteTemplate_83C1FF8 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A8764, -}; - -const struct SpriteTemplate gBattleAnimSpriteTemplate_83C2010 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &gDummyOamData, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A8818, -}; - -- cgit v1.2.3 From 101f16355a222b0b58029a9ff77cf5e4f9287ca8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 10:36:07 -0600 Subject: format and arrange some Pokemon data --- include/pokemon.h | 4 +- ld_script.txt | 7 +- src/battle/calculate_base_damage.c | 60 +- src/data/pokemon/base_stats.h | 826 +++++++++++++------------- src/data/pokemon/dex_order.h | 15 - src/data/pokemon/evolution.h | 788 ++++++------------------ src/data/pokemon/item_effects.h | 729 +++-------------------- src/data/pokemon/level_up_learnset_pointers.h | 2 +- src/data/pokemon/nature_stats.h | 37 -- src/data/pokemon/spinda_spots.h | 15 - src/field/daycare.c | 2 +- src/pokemon/pokemon_1.c | 60 +- src/pokemon/pokemon_2.c | 28 +- src/pokemon/pokemon_3.c | 104 ++-- src/pokemon/pokemon_data.c | 116 ---- src/pokemon/pokemon_item_effect.c | 11 + src/scene/evolution_scene.c | 30 +- 17 files changed, 901 insertions(+), 1933 deletions(-) delete mode 100644 src/data/pokemon/dex_order.h delete mode 100644 src/data/pokemon/nature_stats.h delete mode 100644 src/data/pokemon/spinda_spots.h create mode 100644 src/pokemon/pokemon_item_effect.c diff --git a/include/pokemon.h b/include/pokemon.h index 71b35e65c..539323bdb 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -502,8 +502,8 @@ extern struct Pokemon gEnemyParty[PARTY_SIZE]; extern const u8 *const gItemEffectTable[]; extern const struct BaseStats gBaseStats[]; extern const u32 gExperienceTables[][101]; -extern const u16 *const gLevelUpLearnsets[]; -extern const struct EvolutionData gEvolutionTable[]; +extern const u16 *gLevelUpLearnsets[]; +extern struct Evolution gEvolutionTable[][5]; extern struct PokemonStorage gPokemonStorage; void ZeroBoxMonData(struct BoxPokemon *boxMon); diff --git a/ld_script.txt b/ld_script.txt index 6d4e0832f..0cb2d0262 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -488,7 +488,12 @@ SECTIONS { src/battle/battle_controller_linkopponent.o(.rodata); data/battle_moves.o(.rodata); src/battle/battle_util.o(.rodata); - src/pokemon/pokemon_data.o(.rodata); + src/pokemon/pokemon_1.o(.rodata); + src/pokemon/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */ + src/battle/calculate_base_damage.o(.rodata); + src/pokemon/pokemon_2.o(.rodata); + src/pokemon/pokemon_item_effect.o(.rodata); + src/pokemon/pokemon_3.o(.rodata); . = ALIGN(4); src/engine/trig.o(.rodata); src/engine/util.o(.rodata); diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index 5c91b3657..217ab28a3 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -1,16 +1,16 @@ #include "global.h" #include "constants/abilities.h" +#include "constants/battle_move_effects.h" +#include "constants/hold_effects.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" #include "battle.h" #include "berry.h" #include "data2.h" #include "event_data.h" -#include "constants/hold_effects.h" #include "item.h" -#include "constants/items.h" #include "pokemon.h" -#include "constants/species.h" -#include "constants/moves.h" -#include "constants/battle_move_effects.h" #include "ewram.h" extern u16 gBattleTypeFlags; @@ -22,8 +22,54 @@ extern struct BattleEnigmaBerry gEnigmaBerries[]; extern u16 gBattleMovePower; extern u16 gTrainerBattleOpponent; -extern const u8 gHoldEffectToType[][2]; -extern const u8 gStatStageRatios[][2]; +// Masks for getting PP Up count, also PP Max values +const u8 gUnknown_08208238[] = {0x03, 0x0c, 0x30, 0xc0}; + +// Masks for setting PP Up count +const u8 gUnknown_0820823C[] = {0xFC, 0xF3, 0xCF, 0x3F}; + +// Values added to PP Up count +const u8 gUnknown_08208240[] = {0x01, 0x04, 0x10, 0x40}; + +const u8 gStatStageRatios[][2] = +{ + {10, 40}, // -6 + {10, 35}, // -5 + {10, 30}, // -4 + {10, 25}, // -3 + {10, 20}, // -2 + {10, 15}, // -1 + {10, 10}, // 0 + {15, 10}, // 1 + {20, 10}, // 2 + {25, 10}, // 3 + {30, 10}, // 4 + {35, 10}, // 5 + {40, 10} // 6 +}; + +const u8 unknownGameFreakAbbrev_820825E[] = _("ゲーフリ"); + +const u8 gHoldEffectToType[][2] = +{ + {HOLD_EFFECT_BUG_POWER, TYPE_BUG}, + {HOLD_EFFECT_STEEL_POWER, TYPE_STEEL}, + {HOLD_EFFECT_GROUND_POWER, TYPE_GROUND}, + {HOLD_EFFECT_ROCK_POWER, TYPE_ROCK}, + {HOLD_EFFECT_GRASS_POWER, TYPE_GRASS}, + {HOLD_EFFECT_DARK_POWER, TYPE_DARK}, + {HOLD_EFFECT_FIGHTING_POWER, TYPE_FIGHTING}, + {HOLD_EFFECT_ELECTRIC_POWER, TYPE_ELECTRIC}, + {HOLD_EFFECT_WATER_POWER, TYPE_WATER}, + {HOLD_EFFECT_FLYING_POWER, TYPE_FLYING}, + {HOLD_EFFECT_POISON_POWER, TYPE_POISON}, + {HOLD_EFFECT_ICE_POWER, TYPE_ICE}, + {HOLD_EFFECT_GHOST_POWER, TYPE_GHOST}, + {HOLD_EFFECT_PSYCHIC_POWER, TYPE_PSYCHIC}, + {HOLD_EFFECT_FIRE_POWER, TYPE_FIRE}, + {HOLD_EFFECT_DRAGON_POWER, TYPE_DRAGON}, + {HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL} +}; u8 GetBankSide(u8 bank); diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index be902635e..bc6572b46 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -1,6 +1,10 @@ #ifndef GUARD_BASE_STATS_H #define GUARD_BASE_STATS_H +// Maximum value for a female pokemon is 254 (MON_FEMALE) which is 100% female. +// 255 (MON_GENDERLESS) is reserved for genderless pokemon. +#define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100)) + const struct BaseStats gBaseStats[] = { [SPECIES_NONE] = {0}, @@ -25,7 +29,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -58,7 +62,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -91,7 +95,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -124,7 +128,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -157,7 +161,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -190,7 +194,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -223,7 +227,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -256,7 +260,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -289,7 +293,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -322,7 +326,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -355,7 +359,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -388,7 +392,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_SILVER_POWDER, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -421,7 +425,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -454,7 +458,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -487,7 +491,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_POISON_BARB, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -520,7 +524,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -553,7 +557,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -586,7 +590,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -619,7 +623,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -652,7 +656,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -685,7 +689,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -718,7 +722,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SHARP_BEAK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -751,7 +755,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -784,7 +788,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -817,7 +821,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_ORAN_BERRY, .item2 = ITEM_LIGHT_BALL, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -850,7 +854,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_ORAN_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -883,7 +887,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_QUICK_CLAW, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -916,7 +920,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_QUICK_CLAW, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -949,7 +953,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -982,7 +986,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1015,7 +1019,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1048,7 +1052,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1081,7 +1085,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1114,7 +1118,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1147,7 +1151,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_LEPPA_BERRY, .item2 = ITEM_MOON_STONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, .growthRate = GROWTH_FAST, @@ -1180,7 +1184,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_LEPPA_BERRY, .item2 = ITEM_MOON_STONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, .growthRate = GROWTH_FAST, @@ -1213,7 +1217,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1246,7 +1250,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1279,7 +1283,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -1312,7 +1316,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -1345,7 +1349,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1378,7 +1382,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1411,7 +1415,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1444,7 +1448,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1477,7 +1481,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -1510,7 +1514,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_TINY_MUSHROOM, .item2 = ITEM_BIG_MUSHROOM, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1543,7 +1547,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_TINY_MUSHROOM, .item2 = ITEM_BIG_MUSHROOM, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1576,7 +1580,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1609,7 +1613,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1642,7 +1646,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1675,7 +1679,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1708,7 +1712,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1741,7 +1745,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1774,7 +1778,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1807,7 +1811,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1840,7 +1844,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1873,7 +1877,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -1906,7 +1910,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -1939,7 +1943,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -1972,7 +1976,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2005,7 +2009,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_KINGS_ROCK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2038,7 +2042,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_KINGS_ROCK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2071,7 +2075,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_TWISTED_SPOON, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2104,7 +2108,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_TWISTED_SPOON, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2137,7 +2141,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_TWISTED_SPOON, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2170,7 +2174,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2203,7 +2207,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2236,7 +2240,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2269,7 +2273,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2302,7 +2306,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2335,7 +2339,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2368,7 +2372,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -2401,7 +2405,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -2434,7 +2438,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_EVERSTONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2467,7 +2471,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_EVERSTONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2500,7 +2504,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_EVERSTONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -2533,7 +2537,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2566,7 +2570,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2599,7 +2603,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_KINGS_ROCK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2632,7 +2636,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_KINGS_ROCK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2665,7 +2669,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_METAL_COAT, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2698,7 +2702,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_METAL_COAT, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2731,7 +2735,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_STICK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2764,7 +2768,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SHARP_BEAK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2797,7 +2801,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SHARP_BEAK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2830,7 +2834,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2863,7 +2867,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2896,7 +2900,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NUGGET, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2929,7 +2933,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NUGGET, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -2962,7 +2966,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_PEARL, .item2 = ITEM_BIG_PEARL, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -2995,7 +2999,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_PEARL, .item2 = ITEM_BIG_PEARL, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -3028,7 +3032,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -3061,7 +3065,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -3094,7 +3098,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -3127,7 +3131,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3160,7 +3164,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3193,7 +3197,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3226,7 +3230,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3259,7 +3263,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3292,7 +3296,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3325,7 +3329,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3358,7 +3362,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -3391,7 +3395,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -3424,7 +3428,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_THICK_CLUB, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3457,7 +3461,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_THICK_CLUB, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3490,7 +3494,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3523,7 +3527,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3556,7 +3560,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3589,7 +3593,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SMOKE_BALL, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3622,7 +3626,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SMOKE_BALL, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3655,7 +3659,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -3688,7 +3692,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -3721,7 +3725,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_LUCKY_EGG, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, .growthRate = GROWTH_FAST, @@ -3754,7 +3758,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3787,7 +3791,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3820,7 +3824,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3853,7 +3857,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3886,7 +3890,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3919,7 +3923,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -3952,7 +3956,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_STARDUST, .item2 = ITEM_STAR_PIECE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -3985,7 +3989,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_STARDUST, .item2 = ITEM_STAR_PIECE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4018,7 +4022,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_LEPPA_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4051,7 +4055,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4084,7 +4088,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_ASPEAR_BERRY, .item2 = ITEM_ASPEAR_BERRY, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4117,7 +4121,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4150,7 +4154,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4183,7 +4187,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4216,7 +4220,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4249,7 +4253,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4282,7 +4286,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 5, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4315,7 +4319,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4348,7 +4352,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_METAL_POWDER, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4381,7 +4385,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4414,7 +4418,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4447,7 +4451,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4480,7 +4484,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4513,7 +4517,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4546,7 +4550,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4579,7 +4583,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4612,7 +4616,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4645,7 +4649,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -4678,7 +4682,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4711,7 +4715,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_LEFTOVERS, .item2 = ITEM_LEFTOVERS, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -4744,7 +4748,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -4777,7 +4781,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -4810,7 +4814,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -4843,7 +4847,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -4876,7 +4880,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -4909,7 +4913,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -4942,7 +4946,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, @@ -4975,7 +4979,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_LUM_BERRY, .item2 = ITEM_LUM_BERRY, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5008,7 +5012,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5041,7 +5045,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5074,7 +5078,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5107,7 +5111,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5140,7 +5144,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5173,7 +5177,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5206,7 +5210,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5239,7 +5243,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5272,7 +5276,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5305,7 +5309,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_ORAN_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5338,7 +5342,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_ORAN_BERRY, .item2 = ITEM_SITRUS_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5371,7 +5375,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5404,7 +5408,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5437,7 +5441,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FAST, @@ -5470,7 +5474,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FAST, @@ -5503,7 +5507,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FAST, @@ -5536,7 +5540,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FAST, @@ -5569,7 +5573,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5602,7 +5606,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_YELLOW_SHARD, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -5635,7 +5639,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_YELLOW_SHARD, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -5668,7 +5672,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_ORAN_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5701,7 +5705,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_LEPPA_BERRY, .item2 = ITEM_MOON_STONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, .growthRate = GROWTH_FAST, @@ -5734,7 +5738,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -5767,7 +5771,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -5800,7 +5804,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -5833,7 +5837,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5866,7 +5870,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -5899,7 +5903,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5932,7 +5936,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5965,7 +5969,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -5998,7 +6002,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6031,7 +6035,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -6064,7 +6068,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -6097,7 +6101,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6130,7 +6134,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_KINGS_ROCK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6163,7 +6167,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6196,7 +6200,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6229,7 +6233,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6262,7 +6266,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -6295,7 +6299,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6328,7 +6332,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6361,7 +6365,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6394,7 +6398,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6427,7 +6431,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6460,7 +6464,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6493,7 +6497,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 35, .friendship = 35, .growthRate = GROWTH_MEDIUM_FAST, @@ -6526,7 +6530,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6559,7 +6563,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_KINGS_ROCK, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6592,7 +6596,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_SPELL_TAG, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_FAST, @@ -6625,7 +6629,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6658,7 +6662,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6691,7 +6695,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_PERSIM_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6724,7 +6728,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6757,7 +6761,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6790,7 +6794,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6823,7 +6827,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -6856,7 +6860,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_METAL_COAT, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6889,7 +6893,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -6922,7 +6926,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -6955,7 +6959,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -6988,7 +6992,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7021,7 +7025,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_ORAN_BERRY, .item2 = ITEM_ORAN_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -7054,7 +7058,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -7087,7 +7091,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_QUICK_CLAW, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, @@ -7120,7 +7124,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7153,7 +7157,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7186,7 +7190,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7219,7 +7223,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7252,7 +7256,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -7285,7 +7289,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -7318,7 +7322,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_RED_SHARD, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -7351,7 +7355,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7384,7 +7388,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7417,7 +7421,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -7450,7 +7454,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -7483,7 +7487,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -7516,7 +7520,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -7549,7 +7553,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -7582,7 +7586,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7615,7 +7619,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7648,7 +7652,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7681,7 +7685,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7714,7 +7718,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -7747,7 +7751,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -7780,7 +7784,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7813,7 +7817,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7846,7 +7850,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_ASPEAR_BERRY, .item2 = ITEM_ASPEAR_BERRY, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7879,7 +7883,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7912,7 +7916,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -7945,7 +7949,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_MOOMOO_MILK, .item2 = ITEM_MOOMOO_MILK, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -7978,7 +7982,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_LUCKY_EGG, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, .growthRate = GROWTH_FAST, @@ -8011,7 +8015,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -8044,7 +8048,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -8077,7 +8081,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -8110,7 +8114,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -8143,7 +8147,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -8176,7 +8180,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -8209,7 +8213,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, @@ -8242,7 +8246,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_SACRED_ASH, .item2 = ITEM_SACRED_ASH, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, @@ -8275,7 +8279,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_LUM_BERRY, .item2 = ITEM_LUM_BERRY, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, .growthRate = GROWTH_MEDIUM_SLOW, @@ -8308,7 +8312,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8341,7 +8345,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8374,7 +8378,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8407,7 +8411,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8440,7 +8444,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8473,7 +8477,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8506,7 +8510,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8539,7 +8543,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8572,7 +8576,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8605,7 +8609,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8638,7 +8642,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8671,7 +8675,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8704,7 +8708,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8737,7 +8741,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8770,7 +8774,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8803,7 +8807,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8836,7 +8840,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8869,7 +8873,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8902,7 +8906,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8935,7 +8939,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -8968,7 +8972,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -9001,7 +9005,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -9034,7 +9038,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -9067,7 +9071,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -9100,7 +9104,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_MEDIUM_FAST, @@ -9133,7 +9137,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9166,7 +9170,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9199,7 +9203,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9232,7 +9236,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9265,7 +9269,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9298,7 +9302,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9331,7 +9335,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9364,7 +9368,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9397,7 +9401,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9430,7 +9434,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_PECHA_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9463,7 +9467,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_PECHA_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9496,7 +9500,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_ORAN_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9529,7 +9533,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_ORAN_BERRY, .item2 = ITEM_SITRUS_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9562,7 +9566,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9595,7 +9599,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9628,7 +9632,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SILVER_POWDER, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9661,7 +9665,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9694,7 +9698,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_SILVER_POWDER, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -9727,7 +9731,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9760,7 +9764,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9793,7 +9797,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9826,7 +9830,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9859,7 +9863,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9892,7 +9896,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -9925,7 +9929,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -9958,7 +9962,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -9991,7 +9995,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -10024,7 +10028,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -10057,7 +10061,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -10090,7 +10094,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -10123,7 +10127,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -10156,7 +10160,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_CHESTO_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FAST, @@ -10189,7 +10193,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10222,7 +10226,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10255,7 +10259,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10288,7 +10292,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_SILVER_POWDER, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10321,7 +10325,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -10354,7 +10358,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -10387,7 +10391,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_LEPPA_BERRY, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FAST, @@ -10420,7 +10424,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_LEPPA_BERRY, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FAST, @@ -10453,7 +10457,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_PERSIM_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -10486,7 +10490,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10519,7 +10523,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10552,7 +10556,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10585,7 +10589,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10618,7 +10622,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, @@ -10651,7 +10655,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10684,7 +10688,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -10717,7 +10721,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_HEART_SCALE, .item2 = ITEM_NONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -10750,7 +10754,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -10783,7 +10787,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -10816,7 +10820,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -10849,7 +10853,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -10882,7 +10886,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -10915,7 +10919,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -10948,7 +10952,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SOFT_SAND, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -10981,7 +10985,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -11014,7 +11018,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -11047,7 +11051,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -11080,7 +11084,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_KINGS_ROCK, - .genderRatio = 63, + .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -11113,7 +11117,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -11146,7 +11150,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -11179,7 +11183,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11212,7 +11216,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_RAWST_BERRY, .item2 = ITEM_RAWST_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11245,7 +11249,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -11278,7 +11282,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -11311,7 +11315,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -11344,7 +11348,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_POISON_BARB, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, @@ -11377,7 +11381,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_POISON_BARB, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, @@ -11410,7 +11414,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11443,7 +11447,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NEVER_MELT_ICE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11476,7 +11480,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_MOON_STONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_FAST, @@ -11509,7 +11513,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SUN_STONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_FAST, @@ -11542,7 +11546,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 191, + .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, .growthRate = GROWTH_FAST, @@ -11575,7 +11579,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -11608,7 +11612,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -11641,7 +11645,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11674,7 +11678,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11707,7 +11711,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FAST, @@ -11740,7 +11744,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11773,7 +11777,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11806,7 +11810,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -11839,7 +11843,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -11872,7 +11876,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -11905,7 +11909,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_SPELL_TAG, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_FAST, @@ -11938,7 +11942,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_SPELL_TAG, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_FAST, @@ -11971,7 +11975,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_POISON_BARB, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -12004,7 +12008,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -12037,7 +12041,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -12070,7 +12074,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -12103,7 +12107,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_BIG_PEARL, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -12136,7 +12140,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_BIG_PEARL, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -12169,7 +12173,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -12202,7 +12206,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_CHESTO_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -12235,7 +12239,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_CHESTO_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -12268,7 +12272,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_CHESTO_BERRY, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_MEDIUM_SLOW, @@ -12301,7 +12305,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_BLUE_SHARD, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12334,7 +12338,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12367,7 +12371,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12400,7 +12404,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_MEDIUM_SLOW, @@ -12433,7 +12437,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SPELL_TAG, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_FAST, @@ -12466,7 +12470,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_SPELL_TAG, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, .growthRate = GROWTH_FAST, @@ -12499,7 +12503,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -12532,7 +12536,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12565,7 +12569,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_GREEN_SHARD, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, .growthRate = GROWTH_SLOW, @@ -12598,7 +12602,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_HARD_STONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -12631,7 +12635,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_HARD_STONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -12664,7 +12668,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_HARD_STONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -12697,7 +12701,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_MYSTIC_WATER, .item2 = ITEM_MYSTIC_WATER, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_MEDIUM_FAST, @@ -12730,7 +12734,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12763,7 +12767,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 15, .friendship = 70, .growthRate = GROWTH_FLUCTUATING, @@ -12796,7 +12800,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12829,7 +12833,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 2, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12862,7 +12866,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12895,7 +12899,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 31, + .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, .growthRate = GROWTH_ERRATIC, @@ -12928,7 +12932,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -12961,7 +12965,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -12994,7 +12998,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13027,7 +13031,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13060,7 +13064,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13093,7 +13097,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_DRAGON_SCALE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13126,7 +13130,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_METAL_COAT, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13159,7 +13163,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_METAL_COAT, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13192,7 +13196,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_METAL_COAT, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13225,7 +13229,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13258,7 +13262,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13291,7 +13295,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 80, .friendship = 35, .growthRate = GROWTH_SLOW, @@ -13324,7 +13328,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, @@ -13357,7 +13361,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, @@ -13390,7 +13394,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, @@ -13423,7 +13427,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 3, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 254, + .genderRatio = MON_FEMALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, @@ -13456,7 +13460,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 0, + .genderRatio = MON_MALE, .eggCycles = 120, .friendship = 90, .growthRate = GROWTH_SLOW, @@ -13489,7 +13493,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_STAR_PIECE, .item2 = ITEM_STAR_PIECE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, .growthRate = GROWTH_SLOW, @@ -13522,7 +13526,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 0, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 255, + .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, .growthRate = GROWTH_SLOW, @@ -13555,7 +13559,7 @@ const struct BaseStats gBaseStats[] = .evYield_SpDefense = 1, .item1 = ITEM_NONE, .item2 = ITEM_NONE, - .genderRatio = 127, + .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, .growthRate = GROWTH_FAST, diff --git a/src/data/pokemon/dex_order.h b/src/data/pokemon/dex_order.h deleted file mode 100644 index cbb7182ed..000000000 --- a/src/data/pokemon/dex_order.h +++ /dev/null @@ -1,15 +0,0 @@ -// - -// - -#ifndef POKERUBY_DEX_ORDER_H -#define POKERUBY_DEX_ORDER_H - -const u16 gSpeciesToHoennPokedexNum[] = {203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 156, 157, 112, 113, 227, 228, 229, 230, 231, 232, 233, 234, 153, 154, 138, 139, 63, 64, 88, 89, 90, 235, 236, 237, 238, 239, 240, 241, 242, 158, 159, 243, 244, 245, 246, 247, 248, 249, 39, 40, 41, 73, 74, 75, 250, 251, 252, 66, 67, 57, 58, 59, 253, 254, 255, 256, 82, 83, 257, 92, 93, 258, 259, 106, 107, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 84, 85, 270, 271, 272, 273, 274, 275, 276, 108, 109, 169, 170, 277, 278, 279, 184, 185, 50, 51, 143, 144, 280, 281, 282, 283, 284, 167, 285, 52, 53, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 65, 181, 182, 155, 324, 137, 325, 326, 162, 163, 327, 328, 329, 91, 55, 56, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 161, 164, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 168, 357, 358, 359, 103, 104, 360, 361, 180, 362, 363, 364, 365, 115, 366, 367, 186, 165, 166, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 42, 43, 44, 25, 26, 34, 35, 114, 27, 28, 32, 33, 99, 100, 61, 62, 145, 131, 132, 60, 105, 68, 127, 128, 183, 129, 130, 140, 141, 97, 98, 116, 117, 118, 48, 49, 78, 79, 101, 102, 173, 174, 175, 119, 120, 171, 172, 125, 126, 54, 110, 111, 80, 81, 69, 76, 77, 121, 122, 160, 148, 149, 94, 36, 37, 38, 95, 96, 150, 45, 46, 47, 176, 177, 178, 152, 146, 147, 124, 123, 179, 70, 71, 72, 142, 86, 87, 133, 134, 135, 136, 29, 30, 31, 187, 188, 189, 190, 191, 192, 193, 194, 195, 198, 199, 200, 196, 197, 201, 202, 151 -}; - -const u16 gSpeciesToNationalPokedexNum[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, 291, 292, 276, 277, 285, 286, 327, 278, 279, 283, 284, 320, 321, 300, 301, 352, 343, 344, 299, 324, 302, 339, 340, 370, 341, 342, 349, 350, 318, 319, 328, 329, 330, 296, 297, 309, 310, 322, 323, 363, 364, 365, 331, 332, 361, 362, 337, 338, 298, 325, 326, 311, 312, 303, 307, 308, 333, 334, 360, 355, 356, 315, 287, 288, 289, 316, 317, 357, 293, 294, 295, 366, 367, 368, 359, 353, 354, 336, 335, 369, 304, 305, 306, 351, 313, 314, 345, 346, 347, 348, 280, 281, 282, 371, 372, 373, 374, 375, 376, 377, 378, 379, 382, 383, 384, 380, 381, 385, 386, 358}; - -const u16 gHoennToNationalOrder[] = {252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 63, 64, 65, 290, 291, 292, 293, 294, 295, 296, 297, 118, 119, 129, 130, 298, 183, 184, 74, 75, 76, 299, 300, 301, 41, 42, 169, 72, 73, 302, 303, 304, 305, 306, 66, 67, 68, 307, 308, 309, 310, 311, 312, 81, 82, 100, 101, 313, 314, 43, 44, 45, 182, 84, 85, 315, 316, 317, 318, 319, 320, 321, 322, 323, 218, 219, 324, 88, 89, 109, 110, 325, 326, 27, 28, 327, 227, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 174, 39, 40, 349, 350, 351, 120, 121, 352, 353, 354, 355, 356, 357, 358, 359, 37, 38, 172, 25, 26, 54, 55, 360, 202, 177, 178, 203, 231, 232, 127, 214, 111, 112, 361, 362, 363, 364, 365, 366, 367, 368, 369, 222, 170, 171, 370, 116, 117, 230, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 46, 47, 48, 49, 50, 51, 52, 53, 56, 57, 58, 59, 60, 61, 62, 69, 70, 71, 77, 78, 79, 80, 83, 86, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102, 103, 104, 105, 106, 107, 108, 113, 114, 115, 122, 123, 124, 125, 126, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 173, 175, 176, 179, 180, 181, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 216, 217, 220, 221, 223, 224, 225, 226, 228, 229, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411}; - -#endif //POKERUBY_DEX_ORDER_H diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 919416fee..b88e42cd2 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -1,608 +1,192 @@ -// - -// - #ifndef POKERUBY_EVOLUTION_H #define POKERUBY_EVOLUTION_H -const struct EvolutionData gEvolutionTable[] = { - {{ // ?????????? - }}, {{ // Bulbasaur - {EVO_LEVEL, 16, SPECIES_IVYSAUR}, - }}, {{ // Ivysaur - {EVO_LEVEL, 32, SPECIES_VENUSAUR}, - }}, {{ // Venusaur - }}, {{ // Charmander - {EVO_LEVEL, 16, SPECIES_CHARMELEON}, - }}, {{ // Charmeleon - {EVO_LEVEL, 36, SPECIES_CHARIZARD}, - }}, {{ // Charizard - }}, {{ // Squirtle - {EVO_LEVEL, 16, SPECIES_WARTORTLE}, - }}, {{ // Wartortle - {EVO_LEVEL, 36, SPECIES_BLASTOISE}, - }}, {{ // Blastoise - }}, {{ // Caterpie - {EVO_LEVEL, 7, SPECIES_METAPOD}, - }}, {{ // Metapod - {EVO_LEVEL, 10, SPECIES_BUTTERFREE}, - }}, {{ // Butterfree - }}, {{ // Weedle - {EVO_LEVEL, 7, SPECIES_KAKUNA}, - }}, {{ // Kakuna - {EVO_LEVEL, 10, SPECIES_BEEDRILL}, - }}, {{ // Beedrill - }}, {{ // Pidgey - {EVO_LEVEL, 18, SPECIES_PIDGEOTTO}, - }}, {{ // Pidgeotto - {EVO_LEVEL, 36, SPECIES_PIDGEOT}, - }}, {{ // Pidgeot - }}, {{ // Rattata - {EVO_LEVEL, 20, SPECIES_RATICATE}, - }}, {{ // Raticate - }}, {{ // Spearow - {EVO_LEVEL, 20, SPECIES_FEAROW}, - }}, {{ // Fearow - }}, {{ // Ekans - {EVO_LEVEL, 22, SPECIES_ARBOK}, - }}, {{ // Arbok - }}, {{ // Pikachu - {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}, - }}, {{ // Raichu - }}, {{ // Sandshrew - {EVO_LEVEL, 22, SPECIES_SANDSLASH}, - }}, {{ // Sandslash - }}, {{ // Nidoran♀ - {EVO_LEVEL, 16, SPECIES_NIDORINA}, - }}, {{ // Nidorina - {EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}, - }}, {{ // Nidoqueen - }}, {{ // Nidoran♂ - {EVO_LEVEL, 16, SPECIES_NIDORINO}, - }}, {{ // Nidorino - {EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}, - }}, {{ // Nidoking - }}, {{ // Clefairy - {EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}, - }}, {{ // Clefable - }}, {{ // Vulpix - {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}, - }}, {{ // Ninetales - }}, {{ // Jigglypuff - {EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}, - }}, {{ // Wigglytuff - }}, {{ // Zubat - {EVO_LEVEL, 22, SPECIES_GOLBAT}, - }}, {{ // Golbat - {EVO_FRIENDSHIP, 0, SPECIES_CROBAT}, - }}, {{ // Oddish - {EVO_LEVEL, 21, SPECIES_GLOOM}, - }}, {{ // Gloom - {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}, - {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}, - }}, {{ // Vileplume - }}, {{ // Paras - {EVO_LEVEL, 24, SPECIES_PARASECT}, - }}, {{ // Parasect - }}, {{ // Venonat - {EVO_LEVEL, 31, SPECIES_VENOMOTH}, - }}, {{ // Venomoth - }}, {{ // Diglett - {EVO_LEVEL, 26, SPECIES_DUGTRIO}, - }}, {{ // Dugtrio - }}, {{ // Meowth - {EVO_LEVEL, 28, SPECIES_PERSIAN}, - }}, {{ // Persian - }}, {{ // Psyduck - {EVO_LEVEL, 33, SPECIES_GOLDUCK}, - }}, {{ // Golduck - }}, {{ // Mankey - {EVO_LEVEL, 28, SPECIES_PRIMEAPE}, - }}, {{ // Primeape - }}, {{ // Growlithe - {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}, - }}, {{ // Arcanine - }}, {{ // Poliwag - {EVO_LEVEL, 25, SPECIES_POLIWHIRL}, - }}, {{ // Poliwhirl - {EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}, - {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}, - }}, {{ // Poliwrath - }}, {{ // Abra - {EVO_LEVEL, 16, SPECIES_KADABRA}, - }}, {{ // Kadabra - {EVO_TRADE, 0, SPECIES_ALAKAZAM}, - }}, {{ // Alakazam - }}, {{ // Machop - {EVO_LEVEL, 28, SPECIES_MACHOKE}, - }}, {{ // Machoke - {EVO_TRADE, 0, SPECIES_MACHAMP}, - }}, {{ // Machamp - }}, {{ // Bellsprout - {EVO_LEVEL, 21, SPECIES_WEEPINBELL}, - }}, {{ // Weepinbell - {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}, - }}, {{ // Victreebel - }}, {{ // Tentacool - {EVO_LEVEL, 30, SPECIES_TENTACRUEL}, - }}, {{ // Tentacruel - }}, {{ // Geodude - {EVO_LEVEL, 25, SPECIES_GRAVELER}, - }}, {{ // Graveler - {EVO_TRADE, 0, SPECIES_GOLEM}, - }}, {{ // Golem - }}, {{ // Ponyta - {EVO_LEVEL, 40, SPECIES_RAPIDASH}, - }}, {{ // Rapidash - }}, {{ // Slowpoke - {EVO_LEVEL, 37, SPECIES_SLOWBRO}, - {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}, - }}, {{ // Slowbro - }}, {{ // Magnemite - {EVO_LEVEL, 30, SPECIES_MAGNETON}, - }}, {{ // Magneton - }}, {{ // Farfetch'd - }}, {{ // Doduo - {EVO_LEVEL, 31, SPECIES_DODRIO}, - }}, {{ // Dodrio - }}, {{ // Seel - {EVO_LEVEL, 34, SPECIES_DEWGONG}, - }}, {{ // Dewgong - }}, {{ // Grimer - {EVO_LEVEL, 38, SPECIES_MUK}, - }}, {{ // Muk - }}, {{ // Shellder - {EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}, - }}, {{ // Cloyster - }}, {{ // Gastly - {EVO_LEVEL, 25, SPECIES_HAUNTER}, - }}, {{ // Haunter - {EVO_TRADE, 0, SPECIES_GENGAR}, - }}, {{ // Gengar - }}, {{ // Onix - {EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}, - }}, {{ // Drowzee - {EVO_LEVEL, 26, SPECIES_HYPNO}, - }}, {{ // Hypno - }}, {{ // Krabby - {EVO_LEVEL, 28, SPECIES_KINGLER}, - }}, {{ // Kingler - }}, {{ // Voltorb - {EVO_LEVEL, 30, SPECIES_ELECTRODE}, - }}, {{ // Electrode - }}, {{ // Exeggcute - {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}, - }}, {{ // Exeggutor - }}, {{ // Cubone - {EVO_LEVEL, 28, SPECIES_MAROWAK}, - }}, {{ // Marowak - }}, {{ // Hitmonlee - }}, {{ // Hitmonchan - }}, {{ // Lickitung - }}, {{ // Koffing - {EVO_LEVEL, 35, SPECIES_WEEZING}, - }}, {{ // Weezing - }}, {{ // Rhyhorn - {EVO_LEVEL, 42, SPECIES_RHYDON}, - }}, {{ // Rhydon - }}, {{ // Chansey - {EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}, - }}, {{ // Tangela - }}, {{ // Kangaskhan - }}, {{ // Horsea - {EVO_LEVEL, 32, SPECIES_SEADRA}, - }}, {{ // Seadra - {EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}, - }}, {{ // Goldeen - {EVO_LEVEL, 33, SPECIES_SEAKING}, - }}, {{ // Seaking - }}, {{ // Staryu - {EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}, - }}, {{ // Starmie - }}, {{ // Mr. mime - }}, {{ // Scyther - {EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}, - }}, {{ // Jynx - }}, {{ // Electabuzz - }}, {{ // Magmar - }}, {{ // Pinsir - }}, {{ // Tauros - }}, {{ // Magikarp - {EVO_LEVEL, 20, SPECIES_GYARADOS}, - }}, {{ // Gyarados - }}, {{ // Lapras - }}, {{ // Ditto - }}, {{ // Eevee - {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON}, - {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON}, - {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}, - {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON}, - {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON}, - }}, {{ // Vaporeon - }}, {{ // Jolteon - }}, {{ // Flareon - }}, {{ // Porygon - {EVO_TRADE_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2}, - }}, {{ // Omanyte - {EVO_LEVEL, 40, SPECIES_OMASTAR}, - }}, {{ // Omastar - }}, {{ // Kabuto - {EVO_LEVEL, 40, SPECIES_KABUTOPS}, - }}, {{ // Kabutops - }}, {{ // Aerodactyl - }}, {{ // Snorlax - }}, {{ // Articuno - }}, {{ // Zapdos - }}, {{ // Moltres - }}, {{ // Dratini - {EVO_LEVEL, 30, SPECIES_DRAGONAIR}, - }}, {{ // Dragonair - {EVO_LEVEL, 55, SPECIES_DRAGONITE}, - }}, {{ // Dragonite - }}, {{ // Mewtwo - }}, {{ // Mew - }}, {{ // Chikorita - {EVO_LEVEL, 16, SPECIES_BAYLEEF}, - }}, {{ // Bayleef - {EVO_LEVEL, 32, SPECIES_MEGANIUM}, - }}, {{ // Meganium - }}, {{ // Cyndaquil - {EVO_LEVEL, 14, SPECIES_QUILAVA}, - }}, {{ // Quilava - {EVO_LEVEL, 36, SPECIES_TYPHLOSION}, - }}, {{ // Typhlosion - }}, {{ // Totodile - {EVO_LEVEL, 18, SPECIES_CROCONAW}, - }}, {{ // Croconaw - {EVO_LEVEL, 30, SPECIES_FERALIGATR}, - }}, {{ // Feraligatr - }}, {{ // Sentret - {EVO_LEVEL, 15, SPECIES_FURRET}, - }}, {{ // Furret - }}, {{ // Hoothoot - {EVO_LEVEL, 20, SPECIES_NOCTOWL}, - }}, {{ // Noctowl - }}, {{ // Ledyba - {EVO_LEVEL, 18, SPECIES_LEDIAN}, - }}, {{ // Ledian - }}, {{ // Spinarak - {EVO_LEVEL, 22, SPECIES_ARIADOS}, - }}, {{ // Ariados - }}, {{ // Crobat - }}, {{ // Chinchou - {EVO_LEVEL, 27, SPECIES_LANTURN}, - }}, {{ // Lanturn - }}, {{ // Pichu - {EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}, - }}, {{ // Cleffa - {EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}, - }}, {{ // Igglybuff - {EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}, - }}, {{ // Togepi - {EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}, - }}, {{ // Togetic - }}, {{ // Natu - {EVO_LEVEL, 25, SPECIES_XATU}, - }}, {{ // Xatu - }}, {{ // Mareep - {EVO_LEVEL, 15, SPECIES_FLAAFFY}, - }}, {{ // Flaaffy - {EVO_LEVEL, 30, SPECIES_AMPHAROS}, - }}, {{ // Ampharos - }}, {{ // Bellossom - }}, {{ // Marill - {EVO_LEVEL, 18, SPECIES_AZUMARILL}, - }}, {{ // Azumarill - }}, {{ // Sudowoodo - }}, {{ // Politoed - }}, {{ // Hoppip - {EVO_LEVEL, 18, SPECIES_SKIPLOOM}, - }}, {{ // Skiploom - {EVO_LEVEL, 27, SPECIES_JUMPLUFF}, - }}, {{ // Jumpluff - }}, {{ // Aipom - }}, {{ // Sunkern - {EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}, - }}, {{ // Sunflora - }}, {{ // Yanma - }}, {{ // Wooper - {EVO_LEVEL, 20, SPECIES_QUAGSIRE}, - }}, {{ // Quagsire - }}, {{ // Espeon - }}, {{ // Umbreon - }}, {{ // Murkrow - }}, {{ // Slowking - }}, {{ // Misdreavus - }}, {{ // Unown - }}, {{ // Wobbuffet - }}, {{ // Girafarig - }}, {{ // Pineco - {EVO_LEVEL, 31, SPECIES_FORRETRESS}, - }}, {{ // Forretress - }}, {{ // Dunsparce - }}, {{ // Gligar - }}, {{ // Steelix - }}, {{ // Snubbull - {EVO_LEVEL, 23, SPECIES_GRANBULL}, - }}, {{ // Granbull - }}, {{ // Qwilfish - }}, {{ // Scizor - }}, {{ // Shuckle - }}, {{ // Heracross - }}, {{ // Sneasel - }}, {{ // Teddiursa - {EVO_LEVEL, 30, SPECIES_URSARING}, - }}, {{ // Ursaring - }}, {{ // Slugma - {EVO_LEVEL, 38, SPECIES_MAGCARGO}, - }}, {{ // Magcargo - }}, {{ // Swinub - {EVO_LEVEL, 33, SPECIES_PILOSWINE}, - }}, {{ // Piloswine - }}, {{ // Corsola - }}, {{ // Remoraid - {EVO_LEVEL, 25, SPECIES_OCTILLERY}, - }}, {{ // Octillery - }}, {{ // Delibird - }}, {{ // Mantine - }}, {{ // Skarmory - }}, {{ // Houndour - {EVO_LEVEL, 24, SPECIES_HOUNDOOM}, - }}, {{ // Houndoom - }}, {{ // Kingdra - }}, {{ // Phanpy - {EVO_LEVEL, 25, SPECIES_DONPHAN}, - }}, {{ // Donphan - }}, {{ // Porygon2 - }}, {{ // Stantler - }}, {{ // Smeargle - }}, {{ // Tyrogue - {EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, - {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, - {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}, - }}, {{ // Hitmontop - }}, {{ // Smoochum - {EVO_LEVEL, 30, SPECIES_JYNX}, - }}, {{ // Elekid - {EVO_LEVEL, 30, SPECIES_ELECTABUZZ}, - }}, {{ // Magby - {EVO_LEVEL, 30, SPECIES_MAGMAR}, - }}, {{ // Miltank - }}, {{ // Blissey - }}, {{ // Raikou - }}, {{ // Entei - }}, {{ // Suicune - }}, {{ // Larvitar - {EVO_LEVEL, 30, SPECIES_PUPITAR}, - }}, {{ // Pupitar - {EVO_LEVEL, 55, SPECIES_TYRANITAR}, - }}, {{ // Tyranitar - }}, {{ // Lugia - }}, {{ // Ho-Oh - }}, {{ // Celebi - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // ? - }}, {{ // Treecko - {EVO_LEVEL, 16, SPECIES_GROVYLE}, - }}, {{ // Grovyle - {EVO_LEVEL, 36, SPECIES_SCEPTILE}, - }}, {{ // Sceptile - }}, {{ // Torchic - {EVO_LEVEL, 16, SPECIES_COMBUSKEN}, - }}, {{ // Combusken - {EVO_LEVEL, 36, SPECIES_BLAZIKEN}, - }}, {{ // Blaziken - }}, {{ // Mudkip - {EVO_LEVEL, 16, SPECIES_MARSHTOMP}, - }}, {{ // Marshtomp - {EVO_LEVEL, 36, SPECIES_SWAMPERT}, - }}, {{ // Swampert - }}, {{ // Poochyena - {EVO_LEVEL, 18, SPECIES_MIGHTYENA}, - }}, {{ // Mightyena - }}, {{ // Zigzagoon - {EVO_LEVEL, 20, SPECIES_LINOONE}, - }}, {{ // Linoone - }}, {{ // Wurmple - {EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, - {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}, - }}, {{ // Silcoon - {EVO_LEVEL, 10, SPECIES_BEAUTIFLY}, - }}, {{ // Beautifly - }}, {{ // Cascoon - {EVO_LEVEL, 10, SPECIES_DUSTOX}, - }}, {{ // Dustox - }}, {{ // Lotad - {EVO_LEVEL, 14, SPECIES_LOMBRE}, - }}, {{ // Lombre - {EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}, - }}, {{ // Ludicolo - }}, {{ // Seedot - {EVO_LEVEL, 14, SPECIES_NUZLEAF}, - }}, {{ // Nuzleaf - {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}, - }}, {{ // Shiftry - }}, {{ // Nincada - {EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, - {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}, - }}, {{ // Ninjask - }}, {{ // Shedinja - }}, {{ // Taillow - {EVO_LEVEL, 22, SPECIES_SWELLOW}, - }}, {{ // Swellow - }}, {{ // Shroomish - {EVO_LEVEL, 23, SPECIES_BRELOOM}, - }}, {{ // Breloom - }}, {{ // Spinda - }}, {{ // Wingull - {EVO_LEVEL, 25, SPECIES_PELIPPER}, - }}, {{ // Pelipper - }}, {{ // Surskit - {EVO_LEVEL, 22, SPECIES_MASQUERAIN}, - }}, {{ // Masquerain - }}, {{ // Wailmer - {EVO_LEVEL, 40, SPECIES_WAILORD}, - }}, {{ // Wailord - }}, {{ // Skitty - {EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}, - }}, {{ // Delcatty - }}, {{ // Kecleon - }}, {{ // Baltoy - {EVO_LEVEL, 36, SPECIES_CLAYDOL}, - }}, {{ // Claydol - }}, {{ // Nosepass - }}, {{ // Torkoal - }}, {{ // Sableye - }}, {{ // Barboach - {EVO_LEVEL, 30, SPECIES_WHISCASH}, - }}, {{ // Whiscash - }}, {{ // Luvdisc - }}, {{ // Corphish - {EVO_LEVEL, 30, SPECIES_CRAWDAUNT}, - }}, {{ // Crawdaunt - }}, {{ // Feebas - {EVO_BEAUTY, 170, SPECIES_MILOTIC}, - }}, {{ // Milotic - }}, {{ // Carvanha - {EVO_LEVEL, 30, SPECIES_SHARPEDO}, - }}, {{ // Sharpedo - }}, {{ // Trapinch - {EVO_LEVEL, 35, SPECIES_VIBRAVA}, - }}, {{ // Vibrava - {EVO_LEVEL, 45, SPECIES_FLYGON}, - }}, {{ // Flygon - }}, {{ // Makuhita - {EVO_LEVEL, 24, SPECIES_HARIYAMA}, - }}, {{ // Hariyama - }}, {{ // Electrike - {EVO_LEVEL, 26, SPECIES_MANECTRIC}, - }}, {{ // Manectric - }}, {{ // Numel - {EVO_LEVEL, 33, SPECIES_CAMERUPT}, - }}, {{ // Camerupt - }}, {{ // Spheal - {EVO_LEVEL, 32, SPECIES_SEALEO}, - }}, {{ // Sealeo - {EVO_LEVEL, 44, SPECIES_WALREIN}, - }}, {{ // Walrein - }}, {{ // Cacnea - {EVO_LEVEL, 32, SPECIES_CACTURNE}, - }}, {{ // Cacturne - }}, {{ // Snorunt - {EVO_LEVEL, 42, SPECIES_GLALIE}, - }}, {{ // Glalie - }}, {{ // Lunatone - }}, {{ // Solrock - }}, {{ // Azurill - {EVO_FRIENDSHIP, 0, SPECIES_MARILL}, - }}, {{ // Spoink - {EVO_LEVEL, 32, SPECIES_GRUMPIG}, - }}, {{ // Grumpig - }}, {{ // Plusle - }}, {{ // Minun - }}, {{ // Mawile - }}, {{ // Meditite - {EVO_LEVEL, 37, SPECIES_MEDICHAM}, - }}, {{ // Medicham - }}, {{ // Swablu - {EVO_LEVEL, 35, SPECIES_ALTARIA}, - }}, {{ // Altaria - }}, {{ // Wynaut - {EVO_LEVEL, 15, SPECIES_WOBBUFFET}, - }}, {{ // Duskull - {EVO_LEVEL, 37, SPECIES_DUSCLOPS}, - }}, {{ // Dusclops - }}, {{ // Roselia - }}, {{ // Slakoth - {EVO_LEVEL, 18, SPECIES_VIGOROTH}, - }}, {{ // Vigoroth - {EVO_LEVEL, 36, SPECIES_SLAKING}, - }}, {{ // Slaking - }}, {{ // Gulpin - {EVO_LEVEL, 26, SPECIES_SWALOT}, - }}, {{ // Swalot - }}, {{ // Tropius - }}, {{ // Whismur - {EVO_LEVEL, 20, SPECIES_LOUDRED}, - }}, {{ // Loudred - {EVO_LEVEL, 40, SPECIES_EXPLOUD}, - }}, {{ // Exploud - }}, {{ // Clamperl - {EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, - {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}, - }}, {{ // Huntail - }}, {{ // Gorebyss - }}, {{ // Absol - }}, {{ // Shuppet - {EVO_LEVEL, 37, SPECIES_BANETTE}, - }}, {{ // Banette - }}, {{ // Seviper - }}, {{ // Zangoose - }}, {{ // Relicanth - }}, {{ // Aron - {EVO_LEVEL, 32, SPECIES_LAIRON}, - }}, {{ // Lairon - {EVO_LEVEL, 42, SPECIES_AGGRON}, - }}, {{ // Aggron - }}, {{ // Castform - }}, {{ // Volbeat - }}, {{ // Illumise - }}, {{ // Lileep - {EVO_LEVEL, 40, SPECIES_CRADILY}, - }}, {{ // Cradily - }}, {{ // Anorith - {EVO_LEVEL, 40, SPECIES_ARMALDO}, - }}, {{ // Armaldo - }}, {{ // Ralts - {EVO_LEVEL, 20, SPECIES_KIRLIA}, - }}, {{ // Kirlia - {EVO_LEVEL, 30, SPECIES_GARDEVOIR}, - }}, {{ // Gardevoir - }}, {{ // Bagon - {EVO_LEVEL, 30, SPECIES_SHELGON}, - }}, {{ // Shelgon - {EVO_LEVEL, 50, SPECIES_SALAMENCE}, - }}, {{ // Salamence - }}, {{ // Beldum - {EVO_LEVEL, 20, SPECIES_METANG}, - }}, {{ // Metang - {EVO_LEVEL, 45, SPECIES_METAGROSS}, - }}, {{ // Metagross - }}, {{ // Regirock - }}, {{ // Regice - }}, {{ // Registeel - }}, {{ // Kyogre - }}, {{ // Groudon - }}, {{ // Rayquaza - }}, {{ // Latias - }}, {{ // Latios - }}, {{ // Jirachi - }}, {{ // Deoxys - }}, {{ // Chimecho - }} +struct Evolution gEvolutionTable[NUM_SPECIES][5] = +{ + [SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR}}, + [SPECIES_IVYSAUR] = {{EVO_LEVEL, 32, SPECIES_VENUSAUR}}, + [SPECIES_CHARMANDER] = {{EVO_LEVEL, 16, SPECIES_CHARMELEON}}, + [SPECIES_CHARMELEON] = {{EVO_LEVEL, 36, SPECIES_CHARIZARD}}, + [SPECIES_SQUIRTLE] = {{EVO_LEVEL, 16, SPECIES_WARTORTLE}}, + [SPECIES_WARTORTLE] = {{EVO_LEVEL, 36, SPECIES_BLASTOISE}}, + [SPECIES_CATERPIE] = {{EVO_LEVEL, 7, SPECIES_METAPOD}}, + [SPECIES_METAPOD] = {{EVO_LEVEL, 10, SPECIES_BUTTERFREE}}, + [SPECIES_WEEDLE] = {{EVO_LEVEL, 7, SPECIES_KAKUNA}}, + [SPECIES_KAKUNA] = {{EVO_LEVEL, 10, SPECIES_BEEDRILL}}, + [SPECIES_PIDGEY] = {{EVO_LEVEL, 18, SPECIES_PIDGEOTTO}}, + [SPECIES_PIDGEOTTO] = {{EVO_LEVEL, 36, SPECIES_PIDGEOT}}, + [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}}, + [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}}, + [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}}, + [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}}, + [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}}, + [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}}, + [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}}, + [SPECIES_NIDORAN_M] = {{EVO_LEVEL, 16, SPECIES_NIDORINO}}, + [SPECIES_NIDORINO] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}}, + [SPECIES_CLEFAIRY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}}, + [SPECIES_VULPIX] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}}, + [SPECIES_JIGGLYPUFF] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}}, + [SPECIES_ZUBAT] = {{EVO_LEVEL, 22, SPECIES_GOLBAT}}, + [SPECIES_GOLBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_CROBAT}}, + [SPECIES_ODDISH] = {{EVO_LEVEL, 21, SPECIES_GLOOM}}, + [SPECIES_GLOOM] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}, + {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}}, + [SPECIES_PARAS] = {{EVO_LEVEL, 24, SPECIES_PARASECT}}, + [SPECIES_VENONAT] = {{EVO_LEVEL, 31, SPECIES_VENOMOTH}}, + [SPECIES_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO}}, + [SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN}}, + [SPECIES_PSYDUCK] = {{EVO_LEVEL, 33, SPECIES_GOLDUCK}}, + [SPECIES_MANKEY] = {{EVO_LEVEL, 28, SPECIES_PRIMEAPE}}, + [SPECIES_GROWLITHE] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}}, + [SPECIES_POLIWAG] = {{EVO_LEVEL, 25, SPECIES_POLIWHIRL}}, + [SPECIES_POLIWHIRL] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}, + {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}}, + [SPECIES_ABRA] = {{EVO_LEVEL, 16, SPECIES_KADABRA}}, + [SPECIES_KADABRA] = {{EVO_TRADE, 0, SPECIES_ALAKAZAM}}, + [SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE}}, + [SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP}}, + [SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL}}, + [SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}}, + [SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL}}, + [SPECIES_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_GRAVELER}}, + [SPECIES_GRAVELER] = {{EVO_TRADE, 0, SPECIES_GOLEM}}, + [SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}}, + [SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO}, + {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}}, + [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}}, + [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}}, + [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}}, + [SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}}, + [SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}}, + [SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER}}, + [SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR}}, + [SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}}, + [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}}, + [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER}}, + [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE}}, + [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}}, + [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}}, + [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, + [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, + [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}}, + [SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}}, + [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}}, + [SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}}, + [SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}}, + [SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}}, + [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}}, + [SPECIES_EEVEE] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON}, + {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON}, + {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}, + {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON}, + {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON}}, + [SPECIES_PORYGON] = {{EVO_TRADE_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2}}, + [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}}, + [SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS}}, + [SPECIES_DRATINI] = {{EVO_LEVEL, 30, SPECIES_DRAGONAIR}}, + [SPECIES_DRAGONAIR] = {{EVO_LEVEL, 55, SPECIES_DRAGONITE}}, + [SPECIES_CHIKORITA] = {{EVO_LEVEL, 16, SPECIES_BAYLEEF}}, + [SPECIES_BAYLEEF] = {{EVO_LEVEL, 32, SPECIES_MEGANIUM}}, + [SPECIES_CYNDAQUIL] = {{EVO_LEVEL, 14, SPECIES_QUILAVA}}, + [SPECIES_QUILAVA] = {{EVO_LEVEL, 36, SPECIES_TYPHLOSION}}, + [SPECIES_TOTODILE] = {{EVO_LEVEL, 18, SPECIES_CROCONAW}}, + [SPECIES_CROCONAW] = {{EVO_LEVEL, 30, SPECIES_FERALIGATR}}, + [SPECIES_SENTRET] = {{EVO_LEVEL, 15, SPECIES_FURRET}}, + [SPECIES_HOOTHOOT] = {{EVO_LEVEL, 20, SPECIES_NOCTOWL}}, + [SPECIES_LEDYBA] = {{EVO_LEVEL, 18, SPECIES_LEDIAN}}, + [SPECIES_SPINARAK] = {{EVO_LEVEL, 22, SPECIES_ARIADOS}}, + [SPECIES_CHINCHOU] = {{EVO_LEVEL, 27, SPECIES_LANTURN}}, + [SPECIES_PICHU] = {{EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}}, + [SPECIES_CLEFFA] = {{EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}}, + [SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}}, + [SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}}, + [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}}, + [SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}}, + [SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS}}, + [SPECIES_MARILL] = {{EVO_LEVEL, 18, SPECIES_AZUMARILL}}, + [SPECIES_HOPPIP] = {{EVO_LEVEL, 18, SPECIES_SKIPLOOM}}, + [SPECIES_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF}}, + [SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}}, + [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}}, + [SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}}, + [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}}, + [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}}, + [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}}, + [SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}}, + [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}}, + [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}}, + [SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}}, + [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, + {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, + {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}}, + [SPECIES_SMOOCHUM] = {{EVO_LEVEL, 30, SPECIES_JYNX}}, + [SPECIES_ELEKID] = {{EVO_LEVEL, 30, SPECIES_ELECTABUZZ}}, + [SPECIES_MAGBY] = {{EVO_LEVEL, 30, SPECIES_MAGMAR}}, + [SPECIES_LARVITAR] = {{EVO_LEVEL, 30, SPECIES_PUPITAR}}, + [SPECIES_PUPITAR] = {{EVO_LEVEL, 55, SPECIES_TYRANITAR}}, + [SPECIES_TREECKO] = {{EVO_LEVEL, 16, SPECIES_GROVYLE}}, + [SPECIES_GROVYLE] = {{EVO_LEVEL, 36, SPECIES_SCEPTILE}}, + [SPECIES_TORCHIC] = {{EVO_LEVEL, 16, SPECIES_COMBUSKEN}}, + [SPECIES_COMBUSKEN] = {{EVO_LEVEL, 36, SPECIES_BLAZIKEN}}, + [SPECIES_MUDKIP] = {{EVO_LEVEL, 16, SPECIES_MARSHTOMP}}, + [SPECIES_MARSHTOMP] = {{EVO_LEVEL, 36, SPECIES_SWAMPERT}}, + [SPECIES_POOCHYENA] = {{EVO_LEVEL, 18, SPECIES_MIGHTYENA}}, + [SPECIES_ZIGZAGOON] = {{EVO_LEVEL, 20, SPECIES_LINOONE}}, + [SPECIES_WURMPLE] = {{EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, + {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}}, + [SPECIES_SILCOON] = {{EVO_LEVEL, 10, SPECIES_BEAUTIFLY}}, + [SPECIES_CASCOON] = {{EVO_LEVEL, 10, SPECIES_DUSTOX}}, + [SPECIES_LOTAD] = {{EVO_LEVEL, 14, SPECIES_LOMBRE}}, + [SPECIES_LOMBRE] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}}, + [SPECIES_SEEDOT] = {{EVO_LEVEL, 14, SPECIES_NUZLEAF}}, + [SPECIES_NUZLEAF] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}}, + [SPECIES_NINCADA] = {{EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, + {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}}, + [SPECIES_TAILLOW] = {{EVO_LEVEL, 22, SPECIES_SWELLOW}}, + [SPECIES_SHROOMISH] = {{EVO_LEVEL, 23, SPECIES_BRELOOM}}, + [SPECIES_WINGULL] = {{EVO_LEVEL, 25, SPECIES_PELIPPER}}, + [SPECIES_SURSKIT] = {{EVO_LEVEL, 22, SPECIES_MASQUERAIN}}, + [SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD}}, + [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}}, + [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}}, + [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}}, + [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}}, + [SPECIES_FEEBAS] = {{EVO_BEAUTY, 170, SPECIES_MILOTIC}}, + [SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO}}, + [SPECIES_TRAPINCH] = {{EVO_LEVEL, 35, SPECIES_VIBRAVA}}, + [SPECIES_VIBRAVA] = {{EVO_LEVEL, 45, SPECIES_FLYGON}}, + [SPECIES_MAKUHITA] = {{EVO_LEVEL, 24, SPECIES_HARIYAMA}}, + [SPECIES_ELECTRIKE] = {{EVO_LEVEL, 26, SPECIES_MANECTRIC}}, + [SPECIES_NUMEL] = {{EVO_LEVEL, 33, SPECIES_CAMERUPT}}, + [SPECIES_SPHEAL] = {{EVO_LEVEL, 32, SPECIES_SEALEO}}, + [SPECIES_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN}}, + [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}}, + [SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE}}, + [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}}, + [SPECIES_SPOINK] = {{EVO_LEVEL, 32, SPECIES_GRUMPIG}}, + [SPECIES_MEDITITE] = {{EVO_LEVEL, 37, SPECIES_MEDICHAM}}, + [SPECIES_SWABLU] = {{EVO_LEVEL, 35, SPECIES_ALTARIA}}, + [SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}}, + [SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}}, + [SPECIES_SLAKOTH] = {{EVO_LEVEL, 18, SPECIES_VIGOROTH}}, + [SPECIES_VIGOROTH] = {{EVO_LEVEL, 36, SPECIES_SLAKING}}, + [SPECIES_GULPIN] = {{EVO_LEVEL, 26, SPECIES_SWALOT}}, + [SPECIES_WHISMUR] = {{EVO_LEVEL, 20, SPECIES_LOUDRED}}, + [SPECIES_LOUDRED] = {{EVO_LEVEL, 40, SPECIES_EXPLOUD}}, + [SPECIES_CLAMPERL] = {{EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, + {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}}, + [SPECIES_SHUPPET] = {{EVO_LEVEL, 37, SPECIES_BANETTE}}, + [SPECIES_ARON] = {{EVO_LEVEL, 32, SPECIES_LAIRON}}, + [SPECIES_LAIRON] = {{EVO_LEVEL, 42, SPECIES_AGGRON}}, + [SPECIES_LILEEP] = {{EVO_LEVEL, 40, SPECIES_CRADILY}}, + [SPECIES_ANORITH] = {{EVO_LEVEL, 40, SPECIES_ARMALDO}}, + [SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}}, + [SPECIES_KIRLIA] = {{EVO_LEVEL, 30, SPECIES_GARDEVOIR}}, + [SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}}, + [SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}}, + [SPECIES_BELDUM] = {{EVO_LEVEL, 20, SPECIES_METANG}}, + [SPECIES_METANG] = {{EVO_LEVEL, 45, SPECIES_METAGROSS}}, }; #endif //POKERUBY_EVOLUTION_H diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index cd06228dd..c7409f3b2 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -1,661 +1,72 @@ -// - -// - -#ifndef POKERUBY_ITEM_EFFECTS_H -#define POKERUBY_ITEM_EFFECTS_H - -const u8 gItemEffect_Potion[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 20 -}; - -const u8 gItemEffect_Antidote[] = { - 0x00, - 0x00, - 0x00, - 0x10, - 0x00, - 0x00 -}; - -const u8 gItemEffect_BurnHeal[] = { - 0x00, - 0x00, - 0x00, - 0x08, - 0x00, - 0x00 -}; - -const u8 gItemEffect_IceHeal[] = { - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00 -}; - -const u8 gItemEffect_Awakening[] = { - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00 -}; - -const u8 gItemEffect_ParalyzeHeal[] = { - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00 -}; - -const u8 gItemEffect_FullRestore[] = { - 0x00, - 0x00, - 0x00, - 0x3f, - 0x04, - 0x00, - 0xff -}; - -const u8 gItemEffect_MaxPotion[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0xff -}; - -const u8 gItemEffect_HyperPotion[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 200 -}; - -const u8 gItemEffect_SuperPotion[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 50 -}; - -const u8 gItemEffect_FullHeal[] = { - 0x00, - 0x00, - 0x00, - 0x3f, - 0x00, - 0x00 -}; - -const u8 gItemEffect_Revive[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x44, - 0x00, - 0xfe -}; - -const u8 gItemEffect_MaxRevive[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x44, - 0x00, - 0xff -}; - -const u8 gItemEffect_FreshWater[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 50 -}; - -const u8 gItemEffect_SodaPop[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 60 -}; - -const u8 gItemEffect_Lemonade[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 80 -}; - -const u8 gItemEffect_MoomooMilk[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 100 -}; - -const u8 gItemEffect_EnergyPowder[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0xe0, - 50, - 0xfb, - 0xfb, - 0xf6 -}; - -const u8 gItemEffect_EnergyRoot[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0xe0, - 200, - 0xf6, - 0xf6, - 0xf1 -}; - -const u8 gItemEffect_HealPowder[] = { - 0x00, - 0x00, - 0x00, - 0x3f, - 0x00, - 0xe0, - 0xfb, - 0xfb, - 0xf6 -}; - -const u8 gItemEffect_RevivalHerb[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x44, - 0xe0, - 0xfe, - 0xf1, - 0xf1, - 0xec -}; - -const u8 gItemEffect_Ether[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x18, - 0x00, - 0x0a -}; - -const u8 gItemEffect_MaxEther[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x18, - 0x00, - 0x7f -}; - -const u8 gItemEffect_Elixir[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x08, - 0x00, - 0x0a -}; - -const u8 gItemEffect_MaxElixir[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x08, - 0x00, - 0x7f -}; - -const u8 gItemEffect_LavaCookie[] = { - 0x00, - 0x00, - 0x00, - 0x3f, - 0x00, - 0x00 -}; - -const u8 gItemEffect_BlueFlute[] = { - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00 -}; - -const u8 gItemEffect_YellowFlute[] = { - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00 -}; - -const u8 gItemEffect_RedFlute[] = { - 0x80, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00 -}; - -const u8 gItemEffect_BerryJuice[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 20 -}; - -const u8 gItemEffect_SacredAsh[] = { - 0x40, - 0x00, - 0x00, - 0x00, - 0x44, - 0x00, - 0xff -}; - -const u8 gItemEffect_HPUp[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x01, - 0xe0, - 0x0a, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_Protein[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x02, - 0xe0, - 0x0a, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_Iron[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xe1, - 0x0a, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_Carbos[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xe2, - 0x0a, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_Calcium[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xe8, - 0x0a, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_RareCandy[] = { - 0x00, - 0x00, - 0x00, - 0x40, - 0x44, - 0xe0, - 253, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_PPUp[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x20, - 0xe0, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_Zinc[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xe4, - 0x0a, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_PPMax[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xf0, - 0x05, - 0x03, - 0x02 -}; - -const u8 gItemEffect_GuardSpec[] = { - 0x00, - 0x00, - 0x00, - 0x80, - 0x00, - 0x60, - 0x01, - 0x01 -}; - -const u8 gItemEffect_DireHit[] = { - 0x20, - 0x00, - 0x00, - 0x00, - 0x00, - 0x60, - 0x01, - 0x01 -}; - -const u8 gItemEffect_XAttack[] = { - 0x01, - 0x00, - 0x00, - 0x00, - 0x00, - 0x60, - 0x01, - 0x01 -}; - -const u8 gItemEffect_XDefend[] = { - 0x00, - 0x10, - 0x00, - 0x00, - 0x00, - 0x60, - 0x01, - 0x01 -}; - -const u8 gItemEffect_XSpeed[] = { - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x60, - 0x01, - 0x01 -}; - -const u8 gItemEffect_XAccuracy[] = { - 0x00, - 0x00, - 0x10, - 0x00, - 0x00, - 0x60, - 0x01, - 0x01 -}; - -const u8 gItemEffect_XSpecial[] = { - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x60, - 0x01, - 0x01 -}; - -const u8 gItemEffect_SunStone[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00 -}; - -const u8 gItemEffect_MoonStone[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00 -}; - -const u8 gItemEffect_FireStone[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00 -}; - -const u8 gItemEffect_ThunderStone[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00 -}; - -const u8 gItemEffect_WaterStone[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00 -}; - -const u8 gItemEffect_LeafStone[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00 -}; - -const u8 gItemEffect_CheriBerry[] = { - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00 -}; - -const u8 gItemEffect_ChestoBerry[] = { - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00 -}; - -const u8 gItemEffect_PechaBerry[] = { - 0x00, - 0x00, - 0x00, - 0x10, - 0x00, - 0x00 -}; - -const u8 gItemEffect_RawstBerry[] = { - 0x00, - 0x00, - 0x00, - 0x08, - 0x00, - 0x00 -}; - -const u8 gItemEffect_AspearBerry[] = { - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00 -}; - -const u8 gItemEffect_LeppaBerry[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x18, - 0x00, - 0x0a -}; - -const u8 gItemEffect_OranBerry[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 10 -}; - -const u8 gItemEffect_PersimBerry[] = { - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00 -}; - -const u8 gItemEffect_LumBerry[] = { - 0x00, - 0x00, - 0x00, - 0x3f, - 0x00, - 0x00 -}; - -const u8 gItemEffect_SitrusBerry[] = { - 0x00, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 30 -}; - -const u8 *const gItemEffectTable[] = { +#ifndef GUARD_ITEM_EFFECTS_H +#define GUARD_ITEM_EFFECTS_H + +const u8 gItemEffect_Potion[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20}; +const u8 gItemEffect_Antidote[] = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00}; +const u8 gItemEffect_BurnHeal[] = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00}; +const u8 gItemEffect_IceHeal[] = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00}; +const u8 gItemEffect_Awakening[] = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00}; +const u8 gItemEffect_ParalyzeHeal[] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00}; +const u8 gItemEffect_FullRestore[] = {0x00, 0x00, 0x00, 0x3f, 0x04, 0x00, 0xff}; +const u8 gItemEffect_MaxPotion[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xff}; +const u8 gItemEffect_HyperPotion[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 200}; +const u8 gItemEffect_SuperPotion[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50}; +const u8 gItemEffect_FullHeal[] = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00}; +const u8 gItemEffect_Revive[] = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xfe}; +const u8 gItemEffect_MaxRevive[] = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff}; +const u8 gItemEffect_FreshWater[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50}; +const u8 gItemEffect_SodaPop[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 60}; +const u8 gItemEffect_Lemonade[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 80}; +const u8 gItemEffect_MoomooMilk[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 100}; +const u8 gItemEffect_EnergyPowder[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 50, 0xfb, 0xfb, 0xf6}; +const u8 gItemEffect_EnergyRoot[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 200, 0xf6, 0xf6, 0xf1}; +const u8 gItemEffect_HealPowder[] = {0x00, 0x00, 0x00, 0x3f, 0x00, 0xe0, 0xfb, 0xfb, 0xf6}; +const u8 gItemEffect_RevivalHerb[] = {0x00, 0x00, 0x00, 0x00, 0x44, 0xe0, 0xfe, 0xf1, 0xf1, 0xec}; +const u8 gItemEffect_Ether[] = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a}; +const u8 gItemEffect_MaxEther[] = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7f}; +const u8 gItemEffect_Elixir[] = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a}; +const u8 gItemEffect_MaxElixir[] = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x7f}; +const u8 gItemEffect_LavaCookie[] = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00}; +const u8 gItemEffect_BlueFlute[] = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00}; +const u8 gItemEffect_YellowFlute[] = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00}; +const u8 gItemEffect_RedFlute[] = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00}; +const u8 gItemEffect_BerryJuice[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20}; +const u8 gItemEffect_SacredAsh[] = {0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff}; +const u8 gItemEffect_HPUp[] = {0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x0a, 0x05, 0x03, 0x02}; +const u8 gItemEffect_Protein[] = {0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0x0a, 0x05, 0x03, 0x02}; +const u8 gItemEffect_Iron[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x0a, 0x05, 0x03, 0x02}; +const u8 gItemEffect_Carbos[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x0a, 0x05, 0x03, 0x02}; +const u8 gItemEffect_Calcium[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x0a, 0x05, 0x03, 0x02}; +const u8 gItemEffect_RareCandy[] = {0x00, 0x00, 0x00, 0x40, 0x44, 0xe0, 253, 0x05, 0x03, 0x02}; +const u8 gItemEffect_PPUp[] = {0x00, 0x00, 0x00, 0x00, 0x20, 0xe0, 0x05, 0x03, 0x02}; +const u8 gItemEffect_Zinc[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x0a, 0x05, 0x03, 0x02}; +const u8 gItemEffect_PPMax[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x05, 0x03, 0x02}; +const u8 gItemEffect_GuardSpec[] = {0x00, 0x00, 0x00, 0x80, 0x00, 0x60, 0x01, 0x01}; +const u8 gItemEffect_DireHit[] = {0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01}; +const u8 gItemEffect_XAttack[] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01}; +const u8 gItemEffect_XDefend[] = {0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01}; +const u8 gItemEffect_XSpeed[] = {0x00, 0x01, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01}; +const u8 gItemEffect_XAccuracy[] = {0x00, 0x00, 0x10, 0x00, 0x00, 0x60, 0x01, 0x01}; +const u8 gItemEffect_XSpecial[] = {0x00, 0x00, 0x01, 0x00, 0x00, 0x60, 0x01, 0x01}; +const u8 gItemEffect_SunStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00}; +const u8 gItemEffect_MoonStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00}; +const u8 gItemEffect_FireStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00}; +const u8 gItemEffect_ThunderStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00}; +const u8 gItemEffect_WaterStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00}; +const u8 gItemEffect_LeafStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00}; +const u8 gItemEffect_CheriBerry[] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00}; +const u8 gItemEffect_ChestoBerry[] = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00}; +const u8 gItemEffect_PechaBerry[] = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00}; +const u8 gItemEffect_RawstBerry[] = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00}; +const u8 gItemEffect_AspearBerry[] = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00}; +const u8 gItemEffect_LeppaBerry[] = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a}; +const u8 gItemEffect_OranBerry[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 10}; +const u8 gItemEffect_PersimBerry[] = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00}; +const u8 gItemEffect_LumBerry[] = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00}; +const u8 gItemEffect_SitrusBerry[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 30}; + +const u8 *const gItemEffectTable[] = +{ gItemEffect_Potion, gItemEffect_Antidote, gItemEffect_BurnHeal, @@ -821,4 +232,4 @@ const u8 *const gItemEffectTable[] = { NULL }; -#endif //POKERUBY_ITEM_EFFECTS_H +#endif //GUARD_ITEM_EFFECTS_H diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 19761c996..894a2b58e 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -5,7 +5,7 @@ #ifndef POKERUBY_LEVEL_UP_LEARNSET_POINTERS_H #define POKERUBY_LEVEL_UP_LEARNSET_POINTERS_H -const u16 *const gLevelUpLearnsets[] = { +const u16 *gLevelUpLearnsets[] = { gBulbasaurLevelUpLearnset, gBulbasaurLevelUpLearnset, gIvysaurLevelUpLearnset, diff --git a/src/data/pokemon/nature_stats.h b/src/data/pokemon/nature_stats.h deleted file mode 100644 index fcef2a0ac..000000000 --- a/src/data/pokemon/nature_stats.h +++ /dev/null @@ -1,37 +0,0 @@ -// - -// - -#ifndef POKERUBY_NATURE_STATS_H -#define POKERUBY_NATURE_STATS_H - -const s8 gNatureStatTable[][5] = { - // Atk Def Spd Sp.Atk Sp.Def - { 0, 0, 0, 0, 0}, // Hardy - { 1, -1, 0, 0, 0}, // Lonely - { 1, 0, -1, 0, 0}, // Brave - { 1, 0, 0, -1, 0}, // Adamant - { 1, 0, 0, 0, -1}, // Naughty - { -1, 1, 0, 0, 0}, // Bold - { 0, 0, 0, 0, 0}, // Docile - { 0, 1, -1, 0, 0}, // Relaxed - { 0, 1, 0, -1, 0}, // Impish - { 0, 1, 0, 0, -1}, // Lax - { -1, 0, 1, 0, 0}, // Timid - { 0, -1, 1, 0, 0}, // Hasty - { 0, 0, 0, 0, 0}, // Serious - { 0, 0, 1, -1, 0}, // Jolly - { 0, 0, 1, 0, -1}, // Naive - { -1, 0, 0, 1, 0}, // Modest - { 0, -1, 0, 1, 0}, // Mild - { 0, 0, -1, 1, 0}, // Quiet - { 0, 0, 0, 0, 0}, // Bashful - { 0, 0, 0, 1, -1}, // Rash - { -1, 0, 0, 0, 1}, // Calm - { 0, -1, 0, 0, 1}, // Gentle - { 0, 0, -1, 0, 1}, // Sassy - { 0, 0, 0, -1, 1}, // Careful - { 0, 0, 0, 0, 0} // Quirky -}; - -#endif //POKERUBY_NATURE_STATS_H diff --git a/src/data/pokemon/spinda_spots.h b/src/data/pokemon/spinda_spots.h deleted file mode 100644 index d045e0734..000000000 --- a/src/data/pokemon/spinda_spots.h +++ /dev/null @@ -1,15 +0,0 @@ -// - -// - -#ifndef POKERUBY_SPINDA_SPOTS_H -#define POKERUBY_SPINDA_SPOTS_H - -const struct SpindaSpot gSpindaSpotGraphics[] = { - {16, 14, INCBIN_U16("graphics/spinda_spots/spot_0.bin")}, - {40, 15, INCBIN_U16("graphics/spinda_spots/spot_1.bin")}, - {22, 32, INCBIN_U16("graphics/spinda_spots/spot_2.bin")}, - {34, 33, INCBIN_U16("graphics/spinda_spots/spot_3.bin")} -}; - -#endif //POKERUBY_SPINDA_SPOTS_H diff --git a/src/field/daycare.c b/src/field/daycare.c index 5811461ae..7e4530906 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -341,7 +341,7 @@ u16 GetEggSpecies(u16 species) { for (k = 0; k < 5; k++) { - if (gEvolutionTable[j].evolutions[k].targetSpecies == species) + if (gEvolutionTable[j][k].targetSpecies == species) { species = j; found = TRUE; diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index bfd0bc972..0242e7444 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -1,13 +1,16 @@ #include "global.h" #include "data2.h" +#include "constants/abilities.h" #include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" #include "main.h" #include "pokemon.h" #include "random.h" #include "overworld.h" -#include "constants/species.h" #include "sprite.h" #include "string_util.h" +#include "trainer.h" #include "text.h" #include "ewram.h" @@ -26,6 +29,59 @@ struct Pokemon gPlayerParty[6]; u8 gEnemyPartyCount; struct Pokemon gEnemyParty[6]; +const u16 gSpeciesToHoennPokedexNum[] = {203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 156, 157, 112, 113, 227, 228, 229, 230, 231, 232, 233, 234, 153, 154, 138, 139, 63, 64, 88, 89, 90, 235, 236, 237, 238, 239, 240, 241, 242, 158, 159, 243, 244, 245, 246, 247, 248, 249, 39, 40, 41, 73, 74, 75, 250, 251, 252, 66, 67, 57, 58, 59, 253, 254, 255, 256, 82, 83, 257, 92, 93, 258, 259, 106, 107, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 84, 85, 270, 271, 272, 273, 274, 275, 276, 108, 109, 169, 170, 277, 278, 279, 184, 185, 50, 51, 143, 144, 280, 281, 282, 283, 284, 167, 285, 52, 53, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 65, 181, 182, 155, 324, 137, 325, 326, 162, 163, 327, 328, 329, 91, 55, 56, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 161, 164, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 168, 357, 358, 359, 103, 104, 360, 361, 180, 362, 363, 364, 365, 115, 366, 367, 186, 165, 166, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 42, 43, 44, 25, 26, 34, 35, 114, 27, 28, 32, 33, 99, 100, 61, 62, 145, 131, 132, 60, 105, 68, 127, 128, 183, 129, 130, 140, 141, 97, 98, 116, 117, 118, 48, 49, 78, 79, 101, 102, 173, 174, 175, 119, 120, 171, 172, 125, 126, 54, 110, 111, 80, 81, 69, 76, 77, 121, 122, 160, 148, 149, 94, 36, 37, 38, 95, 96, 150, 45, 46, 47, 176, 177, 178, 152, 146, 147, 124, 123, 179, 70, 71, 72, 142, 86, 87, 133, 134, 135, 136, 29, 30, 31, 187, 188, 189, 190, 191, 192, 193, 194, 195, 198, 199, 200, 196, 197, 201, 202, 151}; +const u16 gSpeciesToNationalPokedexNum[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, 291, 292, 276, 277, 285, 286, 327, 278, 279, 283, 284, 320, 321, 300, 301, 352, 343, 344, 299, 324, 302, 339, 340, 370, 341, 342, 349, 350, 318, 319, 328, 329, 330, 296, 297, 309, 310, 322, 323, 363, 364, 365, 331, 332, 361, 362, 337, 338, 298, 325, 326, 311, 312, 303, 307, 308, 333, 334, 360, 355, 356, 315, 287, 288, 289, 316, 317, 357, 293, 294, 295, 366, 367, 368, 359, 353, 354, 336, 335, 369, 304, 305, 306, 351, 313, 314, 345, 346, 347, 348, 280, 281, 282, 371, 372, 373, 374, 375, 376, 377, 378, 379, 382, 383, 384, 380, 381, 385, 386, 358}; +const u16 gHoennToNationalOrder[] = {252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 63, 64, 65, 290, 291, 292, 293, 294, 295, 296, 297, 118, 119, 129, 130, 298, 183, 184, 74, 75, 76, 299, 300, 301, 41, 42, 169, 72, 73, 302, 303, 304, 305, 306, 66, 67, 68, 307, 308, 309, 310, 311, 312, 81, 82, 100, 101, 313, 314, 43, 44, 45, 182, 84, 85, 315, 316, 317, 318, 319, 320, 321, 322, 323, 218, 219, 324, 88, 89, 109, 110, 325, 326, 27, 28, 327, 227, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 174, 39, 40, 349, 350, 351, 120, 121, 352, 353, 354, 355, 356, 357, 358, 359, 37, 38, 172, 25, 26, 54, 55, 360, 202, 177, 178, 203, 231, 232, 127, 214, 111, 112, 361, 362, 363, 364, 365, 366, 367, 368, 369, 222, 170, 171, 370, 116, 117, 230, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 46, 47, 48, 49, 50, 51, 52, 53, 56, 57, 58, 59, 60, 61, 62, 69, 70, 71, 77, 78, 79, 80, 83, 86, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102, 103, 104, 105, 106, 107, 108, 113, 114, 115, 122, 123, 124, 125, 126, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 173, 175, 176, 179, 180, 181, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 216, 217, 220, 221, 223, 224, 225, 226, 228, 229, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411}; + +const struct SpindaSpot gSpindaSpotGraphics[] = +{ + {16, 14, INCBIN_U16("graphics/spinda_spots/spot_0.bin")}, + {40, 15, INCBIN_U16("graphics/spinda_spots/spot_1.bin")}, + {22, 32, INCBIN_U16("graphics/spinda_spots/spot_2.bin")}, + {34, 33, INCBIN_U16("graphics/spinda_spots/spot_3.bin")} +}; + +#include "../data/pokemon/item_effects.h" + +const s8 gNatureStatTable[][5] = +{ + // Atk Def Spd Sp.Atk Sp.Def + { 0, 0, 0, 0, 0}, // Hardy + { +1, -1, 0, 0, 0}, // Lonely + { +1, 0, -1, 0, 0}, // Brave + { +1, 0, 0, -1, 0}, // Adamant + { +1, 0, 0, 0, -1}, // Naughty + { -1, +1, 0, 0, 0}, // Bold + { 0, 0, 0, 0, 0}, // Docile + { 0, +1, -1, 0, 0}, // Relaxed + { 0, +1, 0, -1, 0}, // Impish + { 0, +1, 0, 0, -1}, // Lax + { -1, 0, +1, 0, 0}, // Timid + { 0, -1, +1, 0, 0}, // Hasty + { 0, 0, 0, 0, 0}, // Serious + { 0, 0, +1, -1, 0}, // Jolly + { 0, 0, +1, 0, -1}, // Naive + { -1, 0, 0, +1, 0}, // Modest + { 0, -1, 0, +1, 0}, // Mild + { 0, 0, -1, +1, 0}, // Quiet + { 0, 0, 0, 0, 0}, // Bashful + { 0, 0, 0, +1, -1}, // Rash + { -1, 0, 0, 0, +1}, // Calm + { 0, -1, 0, 0, +1}, // Gentle + { 0, 0, -1, 0, +1}, // Sassy + { 0, 0, 0, -1, +1}, // Careful + { 0, 0, 0, 0, 0} // Quirky +}; + +#include "../data/pokemon/tmhm_learnsets.h" +#include "../data/pokemon/trainer_class_lookups.h" +#include "../data/pokemon/cry_ids.h" +#include "../data/pokemon/experience_tables.h" +#include "../data/pokemon/base_stats.h" +#include "../data/pokemon/level_up_learnsets.h" +#include "../data/pokemon/evolution.h" +#include "../data/pokemon/level_up_learnset_pointers.h" + void ZeroBoxMonData(struct BoxPokemon *boxMon) { u8 *raw = (u8 *)boxMon; @@ -401,7 +457,7 @@ u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon) s32 n = (((2 * baseStat + iv + ev / 4) * level) / 100) + 5; \ u8 nature = GetNature(mon); \ n = nature_stat_mod(nature, n, statIndex); \ - SetMonData(mon, field, &n); \ + SetMonData(mon, field, &n); \ } void CalculateMonStats(struct Pokemon *mon) diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c index eb56974cd..b941ed2ab 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon/pokemon_2.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/hold_effects.h" #include "battle.h" #include "battle_util.h" #include "data2.h" @@ -12,6 +13,7 @@ #include "string_util.h" #include "strings2.h" #include "text.h" +#include "trainer.h" #include "util.h" #include "ewram.h" @@ -40,11 +42,12 @@ extern const struct SpriteTemplate gSpriteTemplate_8208288[]; //array of pointers to arrays of pointers to union AnimCmd (We probably need to typedef this.) extern u8 gTrainerClassToPicIndex[]; extern u8 gTrainerClassToNameIndex[]; -extern u8 gSecretBaseTrainerClasses[][5]; -extern u8 gUnknown_08208238[]; -extern u8 gUnknown_0820823C[]; -extern u8 gStatStageRatios[][2]; -extern u8 gHoldEffectToType[][2]; + +extern const u8 gUnknown_08208238[]; +extern const u8 gUnknown_0820823C[]; + +extern void sub_80105A0(struct Sprite *); +extern void oac_poke_opponent(struct Sprite *); u8 CountAliveMons(u8 a1) { @@ -145,6 +148,14 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality) return MON_MALE; } +const struct SpriteTemplate gSpriteTemplate_8208288[] = +{ + {0xFFFF, 0, &gOamData_81F96F0, NULL, gSpriteImageTable_81E7A10, gSpriteAffineAnimTable_81E7B70, sub_80105A0}, + {0xFFFF, 0, &gOamData_81F96E8, NULL, gSpriteImageTable_81E7A30, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent}, + {0xFFFF, 0, &gOamData_81F96F0, NULL, gSpriteImageTable_81E7A50, gSpriteAffineAnimTable_81E7B70, sub_80105A0}, + {0xFFFF, 0, &gOamData_81F96E8, NULL, gSpriteImageTable_81E7A70, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent}, +}; + void GetMonSpriteTemplate_803C56C(u16 species, u8 a2) { gUnknown_02024E8C = gSpriteTemplate_8208288[a2]; @@ -1094,6 +1105,13 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord) gTrainerBattleOpponent = 1024; } +const u8 gSecretBaseTrainerClasses[][5] = { + // male + {FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_RICH_BOY, FACILITY_CLASS_CAMPER, FACILITY_CLASS_COOL_TRAINER_M}, + // female + {FACILITY_CLASS_LASS, FACILITY_CLASS_SCHOOL_KID_F, FACILITY_CLASS_LADY, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_COOL_TRAINER_F} +}; + u8 GetSecretBaseTrainerPicIndex(void) { u8 trainerClass = gSecretBaseTrainerClasses[eSecretBaseRecord->gender][eSecretBaseRecord->trainerId[0] % 5]; diff --git a/src/pokemon/pokemon_3.c b/src/pokemon/pokemon_3.c index d659ed680..221de831a 100644 --- a/src/pokemon/pokemon_3.c +++ b/src/pokemon/pokemon_3.c @@ -1,11 +1,12 @@ #include "global.h" +#include "constants/hold_effects.h" +#include "constants/items.h" +#include "constants/moves.h" #include "battle.h" #include "battle_message.h" #include "data2.h" #include "event_data.h" -#include "constants/hold_effects.h" #include "item.h" -#include "constants/items.h" #include "link.h" #include "m4a.h" #include "main.h" @@ -42,20 +43,16 @@ extern u8 gStringBank; extern u8 gBankInMenu; extern struct SpindaSpot gSpindaSpotGraphics[]; extern s8 gNatureStatTable[][5]; -extern s8 gUnknown_082082FE[][3]; extern u16 gTrainerBattleOpponent; extern u16 gBattleTypeFlags; extern u32 gTMHMLearnsets[][2]; extern u8 gBattleMonForms[]; extern const u8 BattleText_Wally[]; -extern const u16 gHMMoves[]; extern s8 gPokeblockFlavorCompatibilityTable[]; extern u8 gLastUsedAbility; extern const u8 BattleText_PreventedSwitch[]; extern u16 gBattlePartyID[]; -extern u8 gJapaneseNidoranNames[][11]; -extern u8 gUnknown_082082F8[]; extern u8 BattleText_Rose[]; extern u8 BattleText_UnknownString3[]; extern u8 BattleText_MistShroud[]; @@ -193,6 +190,8 @@ u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit) return offset; } +const u8 gUnknown_082082F8[] = {1, 1, 3, 2, 4, 6}; + void sub_803F324(int stat) { gBankTarget = gBankInMenu; @@ -290,56 +289,56 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) for (i = 0; i < 5; i++) { - switch (gEvolutionTable[species].evolutions[i].method) + switch (gEvolutionTable[species][i].method) { case EVO_FRIENDSHIP: if (friendship >= 220) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_FRIENDSHIP_DAY: RtcCalcLocalTime(); if (gLocalTime.hours >= 12 && gLocalTime.hours < 24 && friendship >= 220) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_FRIENDSHIP_NIGHT: RtcCalcLocalTime(); if (gLocalTime.hours >= 0 && gLocalTime.hours < 12 && friendship >= 220) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_LEVEL: - if (gEvolutionTable[species].evolutions[i].param <= level) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + if (gEvolutionTable[species][i].param <= level) + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_LEVEL_ATK_GT_DEF: - if (gEvolutionTable[species].evolutions[i].param <= level) + if (gEvolutionTable[species][i].param <= level) if (GetMonData(mon, MON_DATA_ATK, 0) > GetMonData(mon, MON_DATA_DEF, 0)) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_LEVEL_ATK_EQ_DEF: - if (gEvolutionTable[species].evolutions[i].param <= level) + if (gEvolutionTable[species][i].param <= level) if (GetMonData(mon, MON_DATA_ATK, 0) == GetMonData(mon, MON_DATA_DEF, 0)) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_LEVEL_ATK_LT_DEF: - if (gEvolutionTable[species].evolutions[i].param <= level) + if (gEvolutionTable[species][i].param <= level) if (GetMonData(mon, MON_DATA_ATK, 0) < GetMonData(mon, MON_DATA_DEF, 0)) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_LEVEL_SILCOON: - if (gEvolutionTable[species].evolutions[i].param <= level && (upperPersonality % 10) <= 4) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + if (gEvolutionTable[species][i].param <= level && (upperPersonality % 10) <= 4) + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_LEVEL_CASCOON: - if (gEvolutionTable[species].evolutions[i].param <= level && (upperPersonality % 10) > 4) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + if (gEvolutionTable[species][i].param <= level && (upperPersonality % 10) > 4) + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_LEVEL_NINJASK: - if (gEvolutionTable[species].evolutions[i].param <= level) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + if (gEvolutionTable[species][i].param <= level) + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_BEAUTY: - if (gEvolutionTable[species].evolutions[i].param <= beauty) - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + if (gEvolutionTable[species][i].param <= beauty) + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; } } @@ -347,17 +346,17 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) case 1: for (i = 0; i < 5; i++) { - switch (gEvolutionTable[species].evolutions[i].method) + switch (gEvolutionTable[species][i].method) { case EVO_TRADE: - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; case EVO_TRADE_ITEM: - if (gEvolutionTable[species].evolutions[i].param == heldItem) + if (gEvolutionTable[species][i].param == heldItem) { heldItem = 0; SetMonData(mon, MON_DATA_HELD_ITEM, &heldItem); - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; } break; } @@ -367,10 +366,10 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 type, u16 evolutionItem) case 3: for (i = 0; i < 5; i++) { - if (gEvolutionTable[species].evolutions[i].method == EVO_ITEM - && gEvolutionTable[species].evolutions[i].param == evolutionItem) + if (gEvolutionTable[species][i].method == EVO_ITEM + && gEvolutionTable[species][i].param == evolutionItem) { - targetSpecies = gEvolutionTable[species].evolutions[i].targetSpecies; + targetSpecies = gEvolutionTable[species][i].targetSpecies; break; } } @@ -644,6 +643,20 @@ u16 nature_stat_mod(u8 nature, u16 n, u8 statIndex) return n; } +const s8 gUnknown_082082FE[][3] = +{ + // Happiness deltas + { 5, 3, 2}, + { 5, 3, 2}, + { 1, 1, 0}, + { 3, 2, 1}, + { 1, 1, 0}, + { 1, 1, 1}, + {-1, -1, -1}, + {-5, -5, -10}, + {-5, -5, -10} +}; + void AdjustFriendship(struct Pokemon *mon, u8 event) { u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0); @@ -653,13 +666,9 @@ void AdjustFriendship(struct Pokemon *mon, u8 event) if (heldItem == ITEM_ENIGMA_BERRY) { if (gMain.inBattle) - { holdEffect = gEnigmaBerries[0].holdEffect; - } else - { holdEffect = gSaveBlock1.enigmaBerry.holdEffect; - } } else { @@ -758,13 +767,9 @@ void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies) if (heldItem == ITEM_ENIGMA_BERRY) { if (gMain.inBattle) - { holdEffect = gEnigmaBerries[0].holdEffect; - } else - { holdEffect = gSaveBlock1.enigmaBerry.holdEffect; - } } else { @@ -1198,6 +1203,19 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u return &gMonPaletteTable[species]; } +const u16 gHMMoves[] = +{ + MOVE_CUT, + MOVE_FLY, + MOVE_SURF, + MOVE_STRENGTH, + MOVE_FLASH, + MOVE_ROCK_SMASH, + MOVE_WATERFALL, + MOVE_DIVE, + 0xffff +}; + bool32 IsHMMove2(u16 move) { int i = 0; @@ -1338,12 +1356,14 @@ u8 *sub_8040D08(void) return gLinkPlayers[sub_803FC34(gLinkPlayers[id].lp_field_18 ^ 2)].name; } +const u8 gJapaneseNidoranNames[][11] = {_("ニドラン♂"), _("ニドラン♀")}; + bool32 ShouldHideGenderIconForLanguage(u16 species, u8 *name, u8 language) { bool32 retVal = FALSE; if (species == SPECIES_NIDORAN_M || species == SPECIES_NIDORAN_F) { - u8 *speciesName; + const u8 *speciesName; if (language == GAME_LANGUAGE) { speciesName = gSpeciesNames[species]; diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c index 031f2ea24..3473b58c8 100644 --- a/src/pokemon/pokemon_data.c +++ b/src/pokemon/pokemon_data.c @@ -9,120 +9,4 @@ #include "sprite.h" #include "data2.h" -#include "../data/pokemon/dex_order.h" -#include "../data/pokemon/spinda_spots.h" -#include "../data/pokemon/item_effects.h" -#include "../data/pokemon/nature_stats.h" -#include "../data/pokemon/tmhm_learnsets.h" -#include "../data/pokemon/trainer_class_lookups.h" -#include "../data/pokemon/cry_ids.h" -#include "../data/pokemon/experience_tables.h" -#include "../data/pokemon/base_stats.h" -#include "../data/pokemon/level_up_learnsets.h" -#include "../data/pokemon/evolution.h" -#include "../data/pokemon/level_up_learnset_pointers.h" -const u8 gUnknown_08208238[] = { // Masks for getting PP Up count, also PP Max values - 0x03, 0x0c, 0x30, 0xc0 -}; - -const u8 gUnknown_0820823C[] = { // Masks for setting PP Up count - 0xFC, 0xF3, 0xCF, 0x3F -}; - -const u8 gUnknown_08208240[] = { // Values added to PP Up count - 0x01, 0x04, 0x10, 0x40 -}; - -const u8 gStatStageRatios[][2] = { - {10, 40}, // -6 - {10, 35}, // -5 - {10, 30}, // -4 - {10, 25}, // -3 - {10, 20}, // -2 - {10, 15}, // -1 - {10, 10}, // 0 - {15, 10}, // 1 - {20, 10}, // 2 - {25, 10}, // 3 - {30, 10}, // 4 - {35, 10}, // 5 - {40, 10} // 6 -}; - -const u8 unknownGameFreakAbbrev_820825E[] = _("ゲーフリ"); - -const u8 gHoldEffectToType[][2] = { - {HOLD_EFFECT_BUG_POWER, TYPE_BUG}, - {HOLD_EFFECT_STEEL_POWER, TYPE_STEEL}, - {HOLD_EFFECT_GROUND_POWER, TYPE_GROUND}, - {HOLD_EFFECT_ROCK_POWER, TYPE_ROCK}, - {HOLD_EFFECT_GRASS_POWER, TYPE_GRASS}, - {HOLD_EFFECT_DARK_POWER, TYPE_DARK}, - {HOLD_EFFECT_FIGHTING_POWER, TYPE_FIGHTING}, - {HOLD_EFFECT_ELECTRIC_POWER, TYPE_ELECTRIC}, - {HOLD_EFFECT_WATER_POWER, TYPE_WATER}, - {HOLD_EFFECT_FLYING_POWER, TYPE_FLYING}, - {HOLD_EFFECT_POISON_POWER, TYPE_POISON}, - {HOLD_EFFECT_ICE_POWER, TYPE_ICE}, - {HOLD_EFFECT_GHOST_POWER, TYPE_GHOST}, - {HOLD_EFFECT_PSYCHIC_POWER, TYPE_PSYCHIC}, - {HOLD_EFFECT_FIRE_POWER, TYPE_FIRE}, - {HOLD_EFFECT_DRAGON_POWER, TYPE_DRAGON}, - {HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL} -}; - -extern void sub_80105A0(struct Sprite *); -extern void oac_poke_opponent(struct Sprite *); - -const struct SpriteTemplate gSpriteTemplate_8208288[] = { - {0xFFFF, 0, &gOamData_81F96F0, NULL, gSpriteImageTable_81E7A10, gSpriteAffineAnimTable_81E7B70, sub_80105A0}, - {0xFFFF, 0, &gOamData_81F96E8, NULL, gSpriteImageTable_81E7A30, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent}, - {0xFFFF, 0, &gOamData_81F96F0, NULL, gSpriteImageTable_81E7A50, gSpriteAffineAnimTable_81E7B70, sub_80105A0}, - {0xFFFF, 0, &gOamData_81F96E8, NULL, gSpriteImageTable_81E7A70, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent}, -}; - -const u8 gSecretBaseTrainerClasses[][5] = { - // male - {FACILITY_CLASS_YOUNGSTER, FACILITY_CLASS_BUG_CATCHER, FACILITY_CLASS_RICH_BOY, FACILITY_CLASS_CAMPER, FACILITY_CLASS_COOL_TRAINER_M}, - // female - {FACILITY_CLASS_LASS, FACILITY_CLASS_SCHOOL_KID_F, FACILITY_CLASS_LADY, FACILITY_CLASS_PICNICKER, FACILITY_CLASS_COOL_TRAINER_F} -}; - -const u8 gUnknown_082082F2[] = { - MON_DATA_HP_EV, - MON_DATA_ATK_EV, - MON_DATA_DEF_EV, - MON_DATA_SPEED_EV, - MON_DATA_SPDEF_EV, - MON_DATA_SPATK_EV -}; - -const u8 gUnknown_082082F8[] = {1, 1, 3, 2, 4, 6}; - -const s8 gUnknown_082082FE[][3] = { - // Happiness deltas - { 5, 3, 2}, - { 5, 3, 2}, - { 1, 1, 0}, - { 3, 2, 1}, - { 1, 1, 0}, - { 1, 1, 1}, - {-1, -1, -1}, - {-5, -5, -10}, - {-5, -5, -10} -}; - -const u16 gHMMoves[] = { - MOVE_CUT, - MOVE_FLY, - MOVE_SURF, - MOVE_STRENGTH, - MOVE_FLASH, - MOVE_ROCK_SMASH, - MOVE_WATERFALL, - MOVE_DIVE, - 0xffff -}; - -const u8 gJapaneseNidoranNames[][11] = {_("ニドラン♂"), _("ニドラン♀")}; diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c new file mode 100644 index 000000000..66f2ff697 --- /dev/null +++ b/src/pokemon/pokemon_item_effect.c @@ -0,0 +1,11 @@ +#include "global.h" +#include "pokemon.h" + +const u8 gUnknown_082082F2[] = { + MON_DATA_HP_EV, + MON_DATA_ATK_EV, + MON_DATA_DEF_EV, + MON_DATA_SPEED_EV, + MON_DATA_SPDEF_EV, + MON_DATA_SPATK_EV +}; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 697806ee1..931ec0d4d 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -497,35 +497,31 @@ static void CB2_TradeEvolutionSceneUpdate(void) static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) { u32 data = 0; - if (gEvolutionTable[preEvoSpecies].evolutions[0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6) + + if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6) { s32 i; struct Pokemon* Shedinja = &gPlayerParty[gPlayerPartyCount]; - const struct EvolutionData* EvoTable; - const struct EvolutionData* Evos; CopyMon(Shedinja, mon, sizeof(struct Pokemon)); - SetMonData(Shedinja, MON_DATA_SPECIES, (void*)(&gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies)); - SetMonData(Shedinja, MON_DATA_NICKNAME, (void*)(gSpeciesNames[gEvolutionTable[preEvoSpecies].evolutions[1].targetSpecies])); - SetMonData(Shedinja, MON_DATA_HELD_ITEM, (void*)(&data)); - SetMonData(Shedinja, MON_DATA_MARKINGS, (void*)(&data)); - SetMonData(Shedinja, MON_DATA_10, (void*)(&data)); + SetMonData(Shedinja, MON_DATA_SPECIES, (void*)&gEvolutionTable[preEvoSpecies][1].targetSpecies); + SetMonData(Shedinja, MON_DATA_NICKNAME, (void*)gSpeciesNames[gEvolutionTable[preEvoSpecies][1].targetSpecies]); + SetMonData(Shedinja, MON_DATA_HELD_ITEM, (void*)&data); + SetMonData(Shedinja, MON_DATA_MARKINGS, (void*)&data); + SetMonData(Shedinja, MON_DATA_10, (void*)&data); for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + 5; i++) - SetMonData(Shedinja, i, (void*)(&data)); + SetMonData(Shedinja, i, (void*)&data); for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_FATEFUL_ENCOUNTER; i++) - SetMonData(Shedinja, i, (void*)(&data)); - SetMonData(Shedinja, MON_DATA_STATUS, (void*)(&data)); + SetMonData(Shedinja, i, (void*)&data); + SetMonData(Shedinja, MON_DATA_STATUS, (void*)&data); data = 0xFF; - SetMonData(Shedinja, MON_DATA_MAIL, (void*)(&data)); + SetMonData(Shedinja, MON_DATA_MAIL, (void*)&data); CalculateMonStats(Shedinja); CalculatePlayerPartyCount(); - // can't match it otherwise, ehh - EvoTable = gEvolutionTable; - Evos = EvoTable + preEvoSpecies; - GetSetPokedexFlag(SpeciesToNationalPokedexNum(Evos->evolutions[1].targetSpecies), 2); - GetSetPokedexFlag(SpeciesToNationalPokedexNum(Evos->evolutions[1].targetSpecies), 3); + GetSetPokedexFlag(SpeciesToNationalPokedexNum(gEvolutionTable[preEvoSpecies][1].targetSpecies), 2); + GetSetPokedexFlag(SpeciesToNationalPokedexNum(gEvolutionTable[preEvoSpecies][1].targetSpecies), 3); if (GetMonData(Shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA && GetMonData(Shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE -- cgit v1.2.3 From c8ac9802a9e59d877a34321793387c188b3c2586 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Sun, 14 Jan 2018 18:19:05 +0100 Subject: truncated some data --- src/battle/battle_anim.c | 576 ----------------------------------------------- 1 file changed, 576 deletions(-) diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 5239e239d..4549d1fcb 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -23,1226 +23,650 @@ const struct OamData gOamData_837DF24 = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF2C = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF34 = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF3C = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF44 = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF4C = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF54 = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF5C = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF64 = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF6C = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF74 = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF7C = { - .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF84 = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF8C = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF94 = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DF9C = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFA4 = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFAC = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFB4 = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFBC = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFC4 = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFCC = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFD4 = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFDC = { - .y = 0, .affineMode = 1, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFE4 = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFEC = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFF4 = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837DFFC = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837D004 = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837D00C = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E014 = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E01C = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E024 = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E02C = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E034 = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E03C = { - .y = 0, .affineMode = 3, .objMode = 0, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E044 = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E04C = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E054 = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E05C = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E064 = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E06C = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E074 = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E07C = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E084 = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E08C = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E094 = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E09C = { - .y = 0, .affineMode = 0, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0A4 = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0AC = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0B4 = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0BC = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0C4 = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0CC = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0D4 = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0DC = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0E4 = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0EC = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0F4 = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E0FC = { - .y = 0, .affineMode = 1, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E104 = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E10C = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E114 = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E11C = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 0, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E124 = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E12C = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E134 = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E13C = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 1, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E144 = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 0, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E14C = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 1, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E154 = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 2, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct OamData gOamData_837E15C = { - .y = 0, .affineMode = 3, .objMode = 1, - .mosaic = 0, - .bpp = 0, .shape = 2, - .x = 0, - .matrixNum = 0, .size = 3, - .tileNum = 0, .priority = 2, - .paletteNum = 0, - .affineParam = 0, }; const struct CompressedSpriteSheet gBattleAnimPicTable[] = -- cgit v1.2.3 From 99d4f3c24a600af8dadfe921f127f68d0bd4f2c3 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 12:48:52 -0500 Subject: finish decompiling contest_ai.c --- asm/contest_ai.s | 381 ------------------------------------------------------ include/contest.h | 3 +- ld_script.txt | 1 - src/contest_ai.c | 122 +++++++++++++++++ 4 files changed, 124 insertions(+), 383 deletions(-) delete mode 100644 asm/contest_ai.s diff --git a/asm/contest_ai.s b/asm/contest_ai.s deleted file mode 100644 index ff8f80bd9..000000000 --- a/asm/contest_ai.s +++ /dev/null @@ -1,381 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - thumb_func_start ContestAICmd_unk_7F -ContestAICmd_unk_7F: @ 812AC34 - ldr r3, _0812AC50 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - bx lr - .align 2, 0 -_0812AC50: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_7F - - thumb_func_start ContestAICmd_unk_80 -ContestAICmd_unk_80: @ 812AC54 - push {r4,lr} - ldr r4, _0812AC80 @ =gAIScriptPtr - ldr r0, [r4] - adds r0, 0x5 - bl sub_812ACA4 - ldr r2, [r4] - ldrb r1, [r2, 0x1] - ldrb r0, [r2, 0x2] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x4] - lsls r0, 24 - orrs r1, r0 - str r1, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812AC80: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_80 - - thumb_func_start ContestAICmd_unk_81 -ContestAICmd_unk_81: @ 812AC84 - push {lr} - bl sub_812ACC8 - lsls r0, 24 - cmp r0, 0 - bne _0812AC9A - ldr r2, _0812ACA0 @ =gSharedMem + 0x192E4 - ldrb r1, [r2, 0x9] - movs r0, 0x1 - orrs r0, r1 - strb r0, [r2, 0x9] -_0812AC9A: - pop {r0} - bx r0 - .align 2, 0 -_0812ACA0: .4byte gSharedMem + 0x192E4 - thumb_func_end ContestAICmd_unk_81 - - thumb_func_start sub_812ACA4 -sub_812ACA4: @ 812ACA4 - push {r4,lr} - ldr r3, _0812ACC4 @ =gSharedMem + 0x192E4 - adds r4, r3, 0 - adds r4, 0x40 - ldrb r1, [r4] - adds r2, r1, 0x1 - strb r2, [r4] - lsls r1, 24 - lsrs r1, 22 - adds r3, 0x20 - adds r1, r3 - str r0, [r1] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0812ACC4: .4byte gSharedMem + 0x192E4 - thumb_func_end sub_812ACA4 - - thumb_func_start sub_812ACC8 -sub_812ACC8: @ 812ACC8 - push {lr} - ldr r1, _0812ACDC @ =gSharedMem + 0x192E4 - adds r3, r1, 0 - adds r3, 0x40 - ldrb r0, [r3] - cmp r0, 0 - bne _0812ACE0 - movs r0, 0 - b _0812ACF4 - .align 2, 0 -_0812ACDC: .4byte gSharedMem + 0x192E4 -_0812ACE0: - subs r0, 0x1 - strb r0, [r3] - ldr r2, _0812ACF8 @ =gAIScriptPtr - ldrb r0, [r3] - lsls r0, 2 - adds r1, 0x20 - adds r0, r1 - ldr r0, [r0] - str r0, [r2] - movs r0, 0x1 -_0812ACF4: - pop {r1} - bx r1 - .align 2, 0 -_0812ACF8: .4byte gAIScriptPtr - thumb_func_end sub_812ACC8 - - thumb_func_start ContestAICmd_check_for_exciting_move -ContestAICmd_check_for_exciting_move: @ 812ACFC - push {r4-r7,lr} - movs r5, 0 - movs r4, 0 - ldr r7, _0812AD28 @ =gSharedMem + 0x19325 - ldr r6, _0812AD2C @ =gContestMons + 0x1E -_0812AD06: - lsls r0, r4, 1 - ldrb r1, [r7] - lsls r1, 6 - adds r0, r1 - adds r1, r0, r6 - ldrh r0, [r1] - cmp r0, 0 - beq _0812AD30 - bl Contest_GetMoveExcitement - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0812AD30 - movs r5, 0x1 - b _0812AD36 - .align 2, 0 -_0812AD28: .4byte gSharedMem + 0x19325 -_0812AD2C: .4byte gContestMons + 0x1E -_0812AD30: - adds r4, 0x1 - cmp r4, 0x3 - ble _0812AD06 -_0812AD36: - ldr r0, _0812AD48 @ =gSharedMem + 0x192E4 - strh r5, [r0, 0x18] - ldr r1, _0812AD4C @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x1 - str r0, [r1] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0812AD48: .4byte gSharedMem + 0x192E4 -_0812AD4C: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_check_for_exciting_move - - thumb_func_start ContestAICmd_unk_83 -ContestAICmd_unk_83: @ 812AD50 - push {lr} - bl ContestAICmd_check_for_exciting_move - ldr r0, _0812AD7C @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0812AD84 - ldr r3, _0812AD80 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812AD8C - .align 2, 0 -_0812AD7C: .4byte gSharedMem + 0x192E4 -_0812AD80: .4byte gAIScriptPtr -_0812AD84: - ldr r1, _0812AD90 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812AD8C: - pop {r0} - bx r0 - .align 2, 0 -_0812AD90: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_83 - - thumb_func_start ContestAICmd_unk_84 -ContestAICmd_unk_84: @ 812AD94 - push {lr} - bl ContestAICmd_check_for_exciting_move - ldr r0, _0812ADC0 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812ADC8 - ldr r3, _0812ADC4 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812ADD0 - .align 2, 0 -_0812ADC0: .4byte gSharedMem + 0x192E4 -_0812ADC4: .4byte gAIScriptPtr -_0812ADC8: - ldr r1, _0812ADD4 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812ADD0: - pop {r0} - bx r0 - .align 2, 0 -_0812ADD4: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_84 - - thumb_func_start ContestAICmd_unk_85 -ContestAICmd_unk_85: @ 812ADD8 - push {r4-r7,lr} - movs r6, 0 - ldr r2, _0812AE08 @ =gAIScriptPtr - ldr r0, [r2] - ldrb r4, [r0, 0x1] - ldrb r0, [r0, 0x2] - lsls r0, 8 - orrs r4, r0 - movs r3, 0 - ldr r0, _0812AE0C @ =gContestMons - mov r12, r0 - ldr r5, _0812AE10 @ =gSharedMem + 0x192E4 - adds r0, r5, 0 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - mov r1, r12 - adds r1, 0x1E - adds r0, r1 - ldrh r0, [r0] - adds r7, r2, 0 - mov r2, r12 - mov r12, r5 - b _0812AE2E - .align 2, 0 -_0812AE08: .4byte gAIScriptPtr -_0812AE0C: .4byte gContestMons -_0812AE10: .4byte gSharedMem + 0x192E4 -_0812AE14: - adds r3, 0x1 - cmp r3, 0x3 - bgt _0812AE34 - lsls r1, r3, 1 - mov r0, r12 - adds r0, 0x41 - ldrb r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r0, r2, 0 - adds r0, 0x1E - adds r1, r0 - ldrh r0, [r1] -_0812AE2E: - cmp r0, r4 - bne _0812AE14 - movs r6, 0x1 -_0812AE34: - mov r0, r12 - strh r6, [r0, 0x18] - ldr r0, [r7] - adds r0, 0x3 - str r0, [r7] - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end ContestAICmd_unk_85 - - thumb_func_start ContestAICmd_unk_86 -ContestAICmd_unk_86: @ 812AE44 - push {lr} - bl ContestAICmd_unk_85 - ldr r0, _0812AE70 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0812AE78 - ldr r3, _0812AE74 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812AE80 - .align 2, 0 -_0812AE70: .4byte gSharedMem + 0x192E4 -_0812AE74: .4byte gAIScriptPtr -_0812AE78: - ldr r1, _0812AE84 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812AE80: - pop {r0} - bx r0 - .align 2, 0 -_0812AE84: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_86 - - thumb_func_start ContestAICmd_unk_87 -ContestAICmd_unk_87: @ 812AE88 - push {lr} - bl ContestAICmd_unk_85 - ldr r0, _0812AEB4 @ =gSharedMem + 0x192E4 - movs r1, 0x18 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _0812AEBC - ldr r3, _0812AEB8 @ =gAIScriptPtr - ldr r2, [r3] - ldrb r1, [r2] - ldrb r0, [r2, 0x1] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x2] - lsls r0, 16 - orrs r1, r0 - ldrb r0, [r2, 0x3] - lsls r0, 24 - orrs r1, r0 - str r1, [r3] - b _0812AEC4 - .align 2, 0 -_0812AEB4: .4byte gSharedMem + 0x192E4 -_0812AEB8: .4byte gAIScriptPtr -_0812AEBC: - ldr r1, _0812AEC8 @ =gAIScriptPtr - ldr r0, [r1] - adds r0, 0x4 - str r0, [r1] -_0812AEC4: - pop {r0} - bx r0 - .align 2, 0 -_0812AEC8: .4byte gAIScriptPtr - thumb_func_end ContestAICmd_unk_87 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/contest.h b/include/contest.h index c8c1a2901..2c53c3490 100644 --- a/include/contest.h +++ b/include/contest.h @@ -79,7 +79,8 @@ struct ContestAIInfo { /*0x11*/ u8 filler11[0x3]; // padding? /*0x14*/ u32 flags; /*0x18*/ u16 scriptResult; - /*0x1A*/ u16 scriptArr[19]; // TODO: are there more variables after the array? + /*0x1A*/ u16 scriptArr[3]; // TODO: are there more variables after the array? + /*0x20*/ u32 stack[8]; /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; /*0x42*/ u8 filler42[0x2]; // padding? diff --git a/ld_script.txt b/ld_script.txt index ffc4bc676..98f934890 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -356,7 +356,6 @@ SECTIONS { src/engine/mystery_event_script.o(.text); src/field/field_effect_helpers.o(.text); src/contest_ai.o(.text); - asm/contest_ai.o(.text); src/unused_81258BC.o(.text); src/battle/anim/sfx.o(.text); src/battle/battle_controller_safari.o(.text); diff --git a/src/contest_ai.c b/src/contest_ai.c index 3fc7cec3b..ea0435775 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -27,6 +27,8 @@ typedef void (* ContestAICmdFunc)(void); extern const ContestAICmdFunc sContestAICmdTable[]; // TODO: Move table to C file void ContestAI_DoAIProcessing(void); +void sub_812ACA4(u8 *); +u8 sub_812ACC8(void); void ContestAI_ResetAI(u8 var) { @@ -1371,3 +1373,123 @@ void ContestAICmd_unk_7E(void) else gAIScriptPtr += 6; } + +// jump +void ContestAICmd_unk_7F(void) +{ + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); +} + +void ContestAICmd_unk_80(void) +{ + sub_812ACA4(gAIScriptPtr + 5); + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); +} + +void ContestAICmd_unk_81(void) +{ + if(!sub_812ACC8()) + eContestAI->aiAction |= 1; +} + +// push stack? +void sub_812ACA4(u8 *ptr) +{ + u8 unk40 = eContestAI->unk40++; + eContestAI->stack[unk40] = (u32)ptr; +} + +// pop stack? +bool8 sub_812ACC8(void) +{ + if(eContestAI->unk40 != 0) + { + --eContestAI->unk40; + gAIScriptPtr = (u8 *)eContestAI->stack[eContestAI->unk40]; + return TRUE; + } + else + return FALSE; +} + +void ContestAICmd_check_for_exciting_move(void) +{ + int result = 0; + int i; + + for(i = 0; i < 4; i++) + { + if(gContestMons[eContestAI->unk41].moves[i]) + { + // why is it using gSharedMem + 0x19325? that does not exist... + if(Contest_GetMoveExcitement(gContestMons[eContestAI->unk41].moves[i]) == 1) + { + result = 1; + break; + } + } + } + + eContestAI->scriptResult = result; + gAIScriptPtr += 1; +} + +void ContestAICmd_unk_83(void) +{ + ContestAICmd_check_for_exciting_move(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_84(void) +{ + ContestAICmd_check_for_exciting_move(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_85(void) +{ + int result = 0; + int i; + u16 arg = T1_READ_16(gAIScriptPtr + 1); + + for(i = 0; i < 4; i++) + { + u16 move = gContestMons[eContestAI->unk41].moves[i]; + if(move == arg) + { + result = 1; + break; + } + } + + eContestAI->scriptResult = result; + gAIScriptPtr += 3; +} + +void ContestAICmd_unk_86(void) +{ + ContestAICmd_unk_85(); + + if((s16)eContestAI->scriptResult != 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} + +void ContestAICmd_unk_87(void) +{ + ContestAICmd_unk_85(); + + if((s16)eContestAI->scriptResult == 0) + gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); + else + gAIScriptPtr += 4; +} -- cgit v1.2.3 From 8990b10732827087e04a2a02632769b252baaff6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 13:19:30 -0500 Subject: move rodata to C --- data/contest_ai.s | 143 -------------- include/contest.h | 6 +- ld_script.txt | 2 +- src/contest_ai.c | 565 ++++++++++++++++++++++++++++++++++++++++-------------- 4 files changed, 423 insertions(+), 293 deletions(-) delete mode 100644 data/contest_ai.s diff --git a/data/contest_ai.s b/data/contest_ai.s deleted file mode 100644 index af13f50f8..000000000 --- a/data/contest_ai.s +++ /dev/null @@ -1,143 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -sContestAICmdTable:: @ 8401E60 - .4byte ContestAICmd_unk_00 - .4byte ContestAICmd_get_turn - .4byte ContestAICmd_unk_02 - .4byte ContestAICmd_unk_03 - .4byte ContestAICmd_unk_04 - .4byte ContestAICmd_unk_05 - .4byte ContestAICmd_get_excitement - .4byte ContestAICmd_unk_07 - .4byte ContestAICmd_unk_08 - .4byte ContestAICmd_unk_09 - .4byte ContestAICmd_unk_0A - .4byte ContestAICmd_get_user_order - .4byte ContestAICmd_unk_0C - .4byte ContestAICmd_unk_0D - .4byte ContestAICmd_unk_0E - .4byte ContestAICmd_unk_0F - .4byte ContestAICmd_get_user_condition_maybe - .4byte ContestAICmd_unk_11 - .4byte ContestAICmd_unk_12 - .4byte ContestAICmd_unk_13 - .4byte ContestAICmd_unk_14 - .4byte ContestAICmd_unk_15 - .4byte ContestAICmd_unk_16 - .4byte ContestAICmd_unk_17 - .4byte ContestAICmd_unk_18 - .4byte ContestAICmd_unk_19 - .4byte ContestAICmd_unk_1A - .4byte ContestAICmd_unk_1B - .4byte ContestAICmd_unk_1C - .4byte ContestAICmd_unk_1D - .4byte ContestAICmd_unk_1E - .4byte ContestAICmd_get_contest_type - .4byte ContestAICmd_unk_20 - .4byte ContestAICmd_unk_21 - .4byte ContestAICmd_get_move_excitement - .4byte ContestAICmd_unk_23 - .4byte ContestAICmd_unk_24 - .4byte ContestAICmd_unk_25 - .4byte ContestAICmd_unk_26 - .4byte ContestAICmd_get_move_effect - .4byte ContestAICmd_unk_28 - .4byte ContestAICmd_unk_29 - .4byte ContestAICmd_get_move_effect_type - .4byte ContestAICmd_unk_2B - .4byte ContestAICmd_unk_2C - .4byte ContestAICmd_check_move_has_highest_appeal - .4byte ContestAICmd_unk_2E - .4byte ContestAICmd_unk_2F - .4byte ContestAICmd_unk_30 - .4byte ContestAICmd_unk_31 - .4byte ContestAICmd_unk_32 - .4byte ContestAICmd_unk_33 - .4byte ContestAICmd_unk_34 - .4byte ContestAICmd_unk_35 - .4byte ContestAICmd_unk_36 - .4byte ContestAICmd_unk_37 - .4byte ContestAICmd_unk_38 - .4byte ContestAICmd_unk_39 - .4byte ContestAICmd_unk_3A - .4byte ContestAICmd_get_move_used_count - .4byte ContestAICmd_unk_3C - .4byte ContestAICmd_unk_3D - .4byte ContestAICmd_unk_3E - .4byte ContestAICmd_unk_3F - .4byte ContestAICmd_check_combo_starter - .4byte ContestAICmd_unk_41 - .4byte ContestAICmd_unk_42 - .4byte ContestAICmd_check_combo_finisher - .4byte ContestAICmd_unk_44 - .4byte ContestAICmd_unk_45 - .4byte ContestAICmd_check_would_finish_combo - .4byte ContestAICmd_unk_47 - .4byte ContestAICmd_unk_48 - .4byte ContestAICmd_get_condition - .4byte ContestAICmd_unk_4A - .4byte ContestAICmd_unk_4B - .4byte ContestAICmd_unk_4C - .4byte ContestAICmd_unk_4D - .4byte ContestAICmd_get_used_combo_starter - .4byte ContestAICmd_unk_4F - .4byte ContestAICmd_unk_50 - .4byte ContestAICmd_unk_51 - .4byte ContestAICmd_unk_52 - .4byte ContestAICmd_check_can_participate - .4byte ContestAICmd_unk_54 - .4byte ContestAICmd_unk_55 - .4byte ContestAICmd_get_val_812A188 - .4byte ContestAICmd_unk_57 - .4byte ContestAICmd_unk_58 - .4byte ContestAICmd_unk_59 - .4byte ContestAICmd_unk_5A - .4byte ContestAICmd_unk_5B - .4byte ContestAICmd_unk_5C - .4byte ContestAICmd_unk_5D - .4byte ContestAICmd_unk_5E - .4byte ContestAICmd_unk_5F - .4byte ContestAICmd_unk_60 - .4byte ContestAICmd_unk_61 - .4byte ContestAICmd_unk_62 - .4byte ContestAICmd_unk_63 - .4byte ContestAICmd_unk_64 - .4byte ContestAICmd_unk_65 - .4byte ContestAICmd_unk_66 - .4byte ContestAICmd_unk_67 - .4byte ContestAICmd_unk_68 - .4byte ContestAICmd_unk_69 - .4byte ContestAICmd_unk_6A - .4byte ContestAICmd_unk_6B - .4byte ContestAICmd_unk_6C - .4byte ContestAICmd_unk_6D - .4byte ContestAICmd_unk_6E - .4byte ContestAICmd_unk_6F - .4byte ContestAICmd_unk_70 - .4byte ContestAICmd_unk_71 - .4byte ContestAICmd_unk_72 - .4byte ContestAICmd_unk_73 - .4byte ContestAICmd_unk_74 - .4byte ContestAICmd_unk_75 - .4byte ContestAICmd_unk_76 - .4byte ContestAICmd_unk_77 - .4byte ContestAICmd_unk_78 - .4byte ContestAICmd_unk_79 - .4byte ContestAICmd_unk_7A - .4byte ContestAICmd_unk_7B - .4byte ContestAICmd_unk_7C - .4byte ContestAICmd_unk_7D - .4byte ContestAICmd_unk_7E - .4byte ContestAICmd_unk_7F - .4byte ContestAICmd_unk_80 - .4byte ContestAICmd_unk_81 - .4byte ContestAICmd_check_for_exciting_move - .4byte ContestAICmd_unk_83 - .4byte ContestAICmd_unk_84 - .4byte ContestAICmd_unk_85 - .4byte ContestAICmd_unk_86 - .4byte ContestAICmd_unk_87 diff --git a/include/contest.h b/include/contest.h index 2c53c3490..509f63758 100644 --- a/include/contest.h +++ b/include/contest.h @@ -69,21 +69,18 @@ struct ContestPokemon struct ContestAIInfo { /*0x00*/ u8 aiState; - /*0x01*/ u8 filler1[1]; // padding? /*0x02*/ u16 unk2; /*0x04*/ u8 unk4; /*0x05*/ u8 unk5[4]; /*0x09*/ u8 aiAction; - /*0x0A*/ u8 fillerA[0x6]; + /*0x0A*/ u8 fillerA[0x6]; // TODO: don't know what's here /*0x10*/ u8 unk10; - /*0x11*/ u8 filler11[0x3]; // padding? /*0x14*/ u32 flags; /*0x18*/ u16 scriptResult; /*0x1A*/ u16 scriptArr[3]; // TODO: are there more variables after the array? /*0x20*/ u32 stack[8]; /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; - /*0x42*/ u8 filler42[0x2]; // padding? }; extern struct ContestPokemon gContestMons[]; @@ -261,6 +258,7 @@ struct UnknownContestStruct6 s32 unkC; }; +// TODO: Please move these to ewram.h once the defines are settled down and figured out completely. #define shared15800 (gSharedMem + 0x15800) #define shared15DE0 (*(struct ContestWinner *)(gSharedMem + 0x15DE0)) #define shared16800 (gSharedMem + 0x16800) diff --git a/ld_script.txt b/ld_script.txt index 98f934890..a18c11e65 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -609,7 +609,7 @@ SECTIONS { src/scene/cable_car.o(.rodata); src/engine/save.o(.rodata); src/field/field_effect_helpers.o(.rodata); - data/contest_ai.o(.rodata); + src/contest_ai.o(.rodata); src/battle/battle_controller_safari.o(.rodata); data/battle_anim_812C144.o(.rodata); src/pokemon/learn_move.o(.rodata); diff --git a/src/contest_ai.c b/src/contest_ai.c index ea0435775..f8f2812fb 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -4,7 +4,6 @@ #include "ewram.h" extern u8 AreMovesContestCombo(u16, u16); -extern bool8 sub_8128A7C(u8); extern bool8 sub_80B214C(u8); extern bool8 Contest_IsMonsTurnDisabled(u8); @@ -22,13 +21,289 @@ extern u16 gSpecialVar_ContestCategory; extern u8 *gAIScriptPtr; extern u8 *gContestAIs[]; +static void ContestAICmd_unk_00(void); +static void ContestAICmd_get_turn(void); +static void ContestAICmd_unk_02(void); +static void ContestAICmd_unk_03(void); +static void ContestAICmd_unk_04(void); +static void ContestAICmd_unk_05(void); +static void ContestAICmd_get_excitement(void); +static void ContestAICmd_unk_07(void); +static void ContestAICmd_unk_08(void); +static void ContestAICmd_unk_09(void); +static void ContestAICmd_unk_0A(void); +static void ContestAICmd_get_user_order(void); +static void ContestAICmd_unk_0C(void); +static void ContestAICmd_unk_0D(void); +static void ContestAICmd_unk_0E(void); +static void ContestAICmd_unk_0F(void); +static void ContestAICmd_get_user_condition_maybe(void); +static void ContestAICmd_unk_11(void); +static void ContestAICmd_unk_12(void); +static void ContestAICmd_unk_13(void); +static void ContestAICmd_unk_14(void); +static void ContestAICmd_unk_15(void); +static void ContestAICmd_unk_16(void); +static void ContestAICmd_unk_17(void); +static void ContestAICmd_unk_18(void); +static void ContestAICmd_unk_19(void); +static void ContestAICmd_unk_1A(void); +static void ContestAICmd_unk_1B(void); +static void ContestAICmd_unk_1C(void); +static void ContestAICmd_unk_1D(void); +static void ContestAICmd_unk_1E(void); +static void ContestAICmd_get_contest_type(void); +static void ContestAICmd_unk_20(void); +static void ContestAICmd_unk_21(void); +static void ContestAICmd_get_move_excitement(void); +static void ContestAICmd_unk_23(void); +static void ContestAICmd_unk_24(void); +static void ContestAICmd_unk_25(void); +static void ContestAICmd_unk_26(void); +static void ContestAICmd_get_move_effect(void); +static void ContestAICmd_unk_28(void); +static void ContestAICmd_unk_29(void); +static void ContestAICmd_get_move_effect_type(void); +static void ContestAICmd_unk_2B(void); +static void ContestAICmd_unk_2C(void); +static void ContestAICmd_check_move_has_highest_appeal(void); +static void ContestAICmd_unk_2E(void); +static void ContestAICmd_unk_2F(void); +static void ContestAICmd_unk_30(void); +static void ContestAICmd_unk_31(void); +static void ContestAICmd_unk_32(void); +static void ContestAICmd_unk_33(void); +static void ContestAICmd_unk_34(void); +static void ContestAICmd_unk_35(void); +static void ContestAICmd_unk_36(void); +static void ContestAICmd_unk_37(void); +static void ContestAICmd_unk_38(void); +static void ContestAICmd_unk_39(void); +static void ContestAICmd_unk_3A(void); +static void ContestAICmd_get_move_used_count(void); +static void ContestAICmd_unk_3C(void); +static void ContestAICmd_unk_3D(void); +static void ContestAICmd_unk_3E(void); +static void ContestAICmd_unk_3F(void); +static void ContestAICmd_check_combo_starter(void); +static void ContestAICmd_unk_41(void); +static void ContestAICmd_unk_42(void); +static void ContestAICmd_check_combo_finisher(void); +static void ContestAICmd_unk_44(void); +static void ContestAICmd_unk_45(void); +static void ContestAICmd_check_would_finish_combo(void); +static void ContestAICmd_unk_47(void); +static void ContestAICmd_unk_48(void); +static void ContestAICmd_get_condition(void); +static void ContestAICmd_unk_4A(void); +static void ContestAICmd_unk_4B(void); +static void ContestAICmd_unk_4C(void); +static void ContestAICmd_unk_4D(void); +static void ContestAICmd_get_used_combo_starter(void); +static void ContestAICmd_unk_4F(void); +static void ContestAICmd_unk_50(void); +static void ContestAICmd_unk_51(void); +static void ContestAICmd_unk_52(void); +static void ContestAICmd_check_can_participate(void); +static void ContestAICmd_unk_54(void); +static void ContestAICmd_unk_55(void); +static void ContestAICmd_get_val_812A188(void); +static void ContestAICmd_unk_57(void); +static void ContestAICmd_unk_58(void); +static void ContestAICmd_unk_59(void); +static void ContestAICmd_unk_5A(void); +static void ContestAICmd_unk_5B(void); +static void ContestAICmd_unk_5C(void); +static void ContestAICmd_unk_5D(void); +static void ContestAICmd_unk_5E(void); +static void ContestAICmd_unk_5F(void); +static void ContestAICmd_unk_60(void); +static void ContestAICmd_unk_61(void); +static void ContestAICmd_unk_62(void); +static void ContestAICmd_unk_63(void); +static void ContestAICmd_unk_64(void); +static void ContestAICmd_unk_65(void); +static void ContestAICmd_unk_66(void); +static void ContestAICmd_unk_67(void); +static void ContestAICmd_unk_68(void); +static void ContestAICmd_unk_69(void); +static void ContestAICmd_unk_6A(void); +static void ContestAICmd_unk_6B(void); +static void ContestAICmd_unk_6C(void); +static void ContestAICmd_unk_6D(void); +static void ContestAICmd_unk_6E(void); +static void ContestAICmd_unk_6F(void); +static void ContestAICmd_unk_70(void); +static void ContestAICmd_unk_71(void); +static void ContestAICmd_unk_72(void); +static void ContestAICmd_unk_73(void); +static void ContestAICmd_unk_74(void); +static void ContestAICmd_unk_75(void); +static void ContestAICmd_unk_76(void); +static void ContestAICmd_unk_77(void); +static void ContestAICmd_unk_78(void); +static void ContestAICmd_unk_79(void); +static void ContestAICmd_unk_7A(void); +static void ContestAICmd_unk_7B(void); +static void ContestAICmd_unk_7C(void); +static void ContestAICmd_unk_7D(void); +static void ContestAICmd_unk_7E(void); +static void ContestAICmd_unk_7F(void); +static void ContestAICmd_unk_80(void); +static void ContestAICmd_unk_81(void); +static void ContestAICmd_check_for_exciting_move(void); +static void ContestAICmd_unk_83(void); +static void ContestAICmd_unk_84(void); +static void ContestAICmd_unk_85(void); +static void ContestAICmd_unk_86(void); +static void ContestAICmd_unk_87(void); + typedef void (* ContestAICmdFunc)(void); -extern const ContestAICmdFunc sContestAICmdTable[]; // TODO: Move table to C file +static const ContestAICmdFunc sContestAICmdTable[] = +{ + ContestAICmd_unk_00, + ContestAICmd_get_turn, + ContestAICmd_unk_02, + ContestAICmd_unk_03, + ContestAICmd_unk_04, + ContestAICmd_unk_05, + ContestAICmd_get_excitement, + ContestAICmd_unk_07, + ContestAICmd_unk_08, + ContestAICmd_unk_09, + ContestAICmd_unk_0A, + ContestAICmd_get_user_order, + ContestAICmd_unk_0C, + ContestAICmd_unk_0D, + ContestAICmd_unk_0E, + ContestAICmd_unk_0F, + ContestAICmd_get_user_condition_maybe, + ContestAICmd_unk_11, + ContestAICmd_unk_12, + ContestAICmd_unk_13, + ContestAICmd_unk_14, + ContestAICmd_unk_15, + ContestAICmd_unk_16, + ContestAICmd_unk_17, + ContestAICmd_unk_18, + ContestAICmd_unk_19, + ContestAICmd_unk_1A, + ContestAICmd_unk_1B, + ContestAICmd_unk_1C, + ContestAICmd_unk_1D, + ContestAICmd_unk_1E, + ContestAICmd_get_contest_type, + ContestAICmd_unk_20, + ContestAICmd_unk_21, + ContestAICmd_get_move_excitement, + ContestAICmd_unk_23, + ContestAICmd_unk_24, + ContestAICmd_unk_25, + ContestAICmd_unk_26, + ContestAICmd_get_move_effect, + ContestAICmd_unk_28, + ContestAICmd_unk_29, + ContestAICmd_get_move_effect_type, + ContestAICmd_unk_2B, + ContestAICmd_unk_2C, + ContestAICmd_check_move_has_highest_appeal, + ContestAICmd_unk_2E, + ContestAICmd_unk_2F, + ContestAICmd_unk_30, + ContestAICmd_unk_31, + ContestAICmd_unk_32, + ContestAICmd_unk_33, + ContestAICmd_unk_34, + ContestAICmd_unk_35, + ContestAICmd_unk_36, + ContestAICmd_unk_37, + ContestAICmd_unk_38, + ContestAICmd_unk_39, + ContestAICmd_unk_3A, + ContestAICmd_get_move_used_count, + ContestAICmd_unk_3C, + ContestAICmd_unk_3D, + ContestAICmd_unk_3E, + ContestAICmd_unk_3F, + ContestAICmd_check_combo_starter, + ContestAICmd_unk_41, + ContestAICmd_unk_42, + ContestAICmd_check_combo_finisher, + ContestAICmd_unk_44, + ContestAICmd_unk_45, + ContestAICmd_check_would_finish_combo, + ContestAICmd_unk_47, + ContestAICmd_unk_48, + ContestAICmd_get_condition, + ContestAICmd_unk_4A, + ContestAICmd_unk_4B, + ContestAICmd_unk_4C, + ContestAICmd_unk_4D, + ContestAICmd_get_used_combo_starter, + ContestAICmd_unk_4F, + ContestAICmd_unk_50, + ContestAICmd_unk_51, + ContestAICmd_unk_52, + ContestAICmd_check_can_participate, + ContestAICmd_unk_54, + ContestAICmd_unk_55, + ContestAICmd_get_val_812A188, + ContestAICmd_unk_57, + ContestAICmd_unk_58, + ContestAICmd_unk_59, + ContestAICmd_unk_5A, + ContestAICmd_unk_5B, + ContestAICmd_unk_5C, + ContestAICmd_unk_5D, + ContestAICmd_unk_5E, + ContestAICmd_unk_5F, + ContestAICmd_unk_60, + ContestAICmd_unk_61, + ContestAICmd_unk_62, + ContestAICmd_unk_63, + ContestAICmd_unk_64, + ContestAICmd_unk_65, + ContestAICmd_unk_66, + ContestAICmd_unk_67, + ContestAICmd_unk_68, + ContestAICmd_unk_69, + ContestAICmd_unk_6A, + ContestAICmd_unk_6B, + ContestAICmd_unk_6C, + ContestAICmd_unk_6D, + ContestAICmd_unk_6E, + ContestAICmd_unk_6F, + ContestAICmd_unk_70, + ContestAICmd_unk_71, + ContestAICmd_unk_72, + ContestAICmd_unk_73, + ContestAICmd_unk_74, + ContestAICmd_unk_75, + ContestAICmd_unk_76, + ContestAICmd_unk_77, + ContestAICmd_unk_78, + ContestAICmd_unk_79, + ContestAICmd_unk_7A, + ContestAICmd_unk_7B, + ContestAICmd_unk_7C, + ContestAICmd_unk_7D, + ContestAICmd_unk_7E, + ContestAICmd_unk_7F, + ContestAICmd_unk_80, + ContestAICmd_unk_81, + ContestAICmd_check_for_exciting_move, + ContestAICmd_unk_83, + ContestAICmd_unk_84, + ContestAICmd_unk_85, + ContestAICmd_unk_86, + ContestAICmd_unk_87, +}; -void ContestAI_DoAIProcessing(void); -void sub_812ACA4(u8 *); -u8 sub_812ACC8(void); +static void ContestAI_DoAIProcessing(void); +static bool8 sub_8128A7C(u8); +static void sub_812ACA4(u8 *); +static u8 sub_812ACC8(void); void ContestAI_ResetAI(u8 var) { @@ -72,7 +347,7 @@ u8 ContestAI_GetActionToUse(void) } } -void ContestAI_DoAIProcessing(void) +static void ContestAI_DoAIProcessing(void) { while(eContestAI->aiState != ContestAI_FinishedProcessing) { @@ -111,7 +386,7 @@ void ContestAI_DoAIProcessing(void) } } -u8 sub_8128A7C(u8 var) +static u8 sub_8128A7C(u8 var) { int i; @@ -122,7 +397,7 @@ u8 sub_8128A7C(u8 var) return i; } -void ContestAICmd_unk_00(void) +static void ContestAICmd_unk_00(void) { s16 score = eContestAI->unk5[eContestAI->unk4] + (s8)gAIScriptPtr[1]; @@ -136,13 +411,13 @@ void ContestAICmd_unk_00(void) gAIScriptPtr += 2; } -void ContestAICmd_get_turn(void) +static void ContestAICmd_get_turn(void) { eContestAI->scriptResult = sContest.turnNumber; gAIScriptPtr += 1; } -void ContestAICmd_unk_02(void) +static void ContestAICmd_unk_02(void) { ContestAICmd_get_turn(); @@ -152,7 +427,7 @@ void ContestAICmd_unk_02(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_03(void) +static void ContestAICmd_unk_03(void) { ContestAICmd_get_turn(); @@ -162,7 +437,7 @@ void ContestAICmd_unk_03(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_04(void) +static void ContestAICmd_unk_04(void) { ContestAICmd_get_turn(); @@ -172,7 +447,7 @@ void ContestAICmd_unk_04(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_05(void) +static void ContestAICmd_unk_05(void) { ContestAICmd_get_turn(); @@ -182,13 +457,13 @@ void ContestAICmd_unk_05(void) gAIScriptPtr += 5; } -void ContestAICmd_get_excitement(void) +static void ContestAICmd_get_excitement(void) { eContestAI->scriptResult = sContest.applauseLevel; gAIScriptPtr += 1; } -void ContestAICmd_unk_07(void) +static void ContestAICmd_unk_07(void) { ContestAICmd_get_excitement(); @@ -198,7 +473,7 @@ void ContestAICmd_unk_07(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_08(void) +static void ContestAICmd_unk_08(void) { ContestAICmd_get_excitement(); @@ -208,7 +483,7 @@ void ContestAICmd_unk_08(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_09(void) +static void ContestAICmd_unk_09(void) { ContestAICmd_get_excitement(); @@ -218,7 +493,7 @@ void ContestAICmd_unk_09(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_0A(void) +static void ContestAICmd_unk_0A(void) { ContestAICmd_get_excitement(); @@ -228,13 +503,13 @@ void ContestAICmd_unk_0A(void) gAIScriptPtr += 5; } -void ContestAICmd_get_user_order(void) +static void ContestAICmd_get_user_order(void) { eContestAI->scriptResult = shared192D0.unk0[eContestAI->unk41]; gAIScriptPtr += 1; } -void ContestAICmd_unk_0C(void) +static void ContestAICmd_unk_0C(void) { ContestAICmd_get_user_order(); @@ -244,7 +519,7 @@ void ContestAICmd_unk_0C(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_0D(void) +static void ContestAICmd_unk_0D(void) { ContestAICmd_get_user_order(); @@ -254,7 +529,7 @@ void ContestAICmd_unk_0D(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_0E(void) +static void ContestAICmd_unk_0E(void) { ContestAICmd_get_user_order(); @@ -264,7 +539,7 @@ void ContestAICmd_unk_0E(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_0F(void) +static void ContestAICmd_unk_0F(void) { ContestAICmd_get_user_order(); @@ -274,13 +549,13 @@ void ContestAICmd_unk_0F(void) gAIScriptPtr += 5; } -void ContestAICmd_get_user_condition_maybe(void) +static void ContestAICmd_get_user_condition_maybe(void) { eContestAI->scriptResult = sContestantStatus[eContestAI->unk41].unkD / 10; gAIScriptPtr += 1; } -void ContestAICmd_unk_11(void) +static void ContestAICmd_unk_11(void) { ContestAICmd_get_user_condition_maybe(); @@ -290,7 +565,7 @@ void ContestAICmd_unk_11(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_12(void) +static void ContestAICmd_unk_12(void) { ContestAICmd_get_user_condition_maybe(); @@ -300,7 +575,7 @@ void ContestAICmd_unk_12(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_13(void) +static void ContestAICmd_unk_13(void) { ContestAICmd_get_user_condition_maybe(); @@ -310,7 +585,7 @@ void ContestAICmd_unk_13(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_14(void) +static void ContestAICmd_unk_14(void) { ContestAICmd_get_user_condition_maybe(); @@ -320,13 +595,13 @@ void ContestAICmd_unk_14(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_15(void) +static void ContestAICmd_unk_15(void) { eContestAI->scriptResult = sContestantStatus[eContestAI->unk41].unk4; gAIScriptPtr += 1; } -void ContestAICmd_unk_16(void) +static void ContestAICmd_unk_16(void) { ContestAICmd_unk_15(); @@ -336,7 +611,7 @@ void ContestAICmd_unk_16(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_17(void) +static void ContestAICmd_unk_17(void) { ContestAICmd_unk_15(); @@ -346,7 +621,7 @@ void ContestAICmd_unk_17(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_18(void) +static void ContestAICmd_unk_18(void) { ContestAICmd_unk_15(); @@ -356,7 +631,7 @@ void ContestAICmd_unk_18(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_19(void) +static void ContestAICmd_unk_19(void) { ContestAICmd_unk_15(); @@ -366,13 +641,13 @@ void ContestAICmd_unk_19(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_1A(void) +static void ContestAICmd_unk_1A(void) { eContestAI->scriptResult = gUnknown_02038670[eContestAI->unk41]; gAIScriptPtr += 1; } -void ContestAICmd_unk_1B(void) +static void ContestAICmd_unk_1B(void) { ContestAICmd_unk_1A(); @@ -382,7 +657,7 @@ void ContestAICmd_unk_1B(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_1C(void) +static void ContestAICmd_unk_1C(void) { ContestAICmd_unk_1A(); @@ -392,7 +667,7 @@ void ContestAICmd_unk_1C(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_1D(void) +static void ContestAICmd_unk_1D(void) { ContestAICmd_unk_1A(); @@ -402,7 +677,7 @@ void ContestAICmd_unk_1D(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_1E(void) +static void ContestAICmd_unk_1E(void) { ContestAICmd_unk_1A(); @@ -412,13 +687,13 @@ void ContestAICmd_unk_1E(void) gAIScriptPtr += 6; } -void ContestAICmd_get_contest_type(void) +static void ContestAICmd_get_contest_type(void) { eContestAI->scriptResult = gSpecialVar_ContestCategory; gAIScriptPtr += 1; } -void ContestAICmd_unk_20(void) +static void ContestAICmd_unk_20(void) { ContestAICmd_get_contest_type(); @@ -428,7 +703,7 @@ void ContestAICmd_unk_20(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_21(void) +static void ContestAICmd_unk_21(void) { ContestAICmd_get_contest_type(); @@ -438,13 +713,13 @@ void ContestAICmd_unk_21(void) gAIScriptPtr += 5; } -void ContestAICmd_get_move_excitement(void) +static void ContestAICmd_get_move_excitement(void) { eContestAI->scriptResult = Contest_GetMoveExcitement(gContestMons[eContestAI->unk41].moves[eContestAI->unk4]); gAIScriptPtr += 1; } -void ContestAICmd_unk_23(void) +static void ContestAICmd_unk_23(void) { ContestAICmd_get_move_excitement(); @@ -454,7 +729,7 @@ void ContestAICmd_unk_23(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_24(void) +static void ContestAICmd_unk_24(void) { ContestAICmd_get_move_excitement(); @@ -464,7 +739,7 @@ void ContestAICmd_unk_24(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_25(void) +static void ContestAICmd_unk_25(void) { ContestAICmd_get_move_excitement(); @@ -474,7 +749,7 @@ void ContestAICmd_unk_25(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_26(void) +static void ContestAICmd_unk_26(void) { ContestAICmd_get_move_excitement(); @@ -484,7 +759,7 @@ void ContestAICmd_unk_26(void) gAIScriptPtr += 5; } -void ContestAICmd_get_move_effect(void) +static void ContestAICmd_get_move_effect(void) { u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -492,7 +767,7 @@ void ContestAICmd_get_move_effect(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_28(void) +static void ContestAICmd_unk_28(void) { ContestAICmd_get_move_effect(); @@ -502,7 +777,7 @@ void ContestAICmd_unk_28(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_29(void) +static void ContestAICmd_unk_29(void) { ContestAICmd_get_move_effect(); @@ -512,7 +787,7 @@ void ContestAICmd_unk_29(void) gAIScriptPtr += 5; } -void ContestAICmd_get_move_effect_type(void) +static void ContestAICmd_get_move_effect_type(void) { u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -520,7 +795,7 @@ void ContestAICmd_get_move_effect_type(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_2B(void) +static void ContestAICmd_unk_2B(void) { ContestAICmd_get_move_effect_type(); @@ -530,7 +805,7 @@ void ContestAICmd_unk_2B(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_2C(void) +static void ContestAICmd_unk_2C(void) { ContestAICmd_get_move_effect_type(); @@ -540,7 +815,7 @@ void ContestAICmd_unk_2C(void) gAIScriptPtr += 5; } -void ContestAICmd_check_move_has_highest_appeal(void) +static void ContestAICmd_check_move_has_highest_appeal(void) { int i; u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -561,7 +836,7 @@ void ContestAICmd_check_move_has_highest_appeal(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_2E(void) +static void ContestAICmd_unk_2E(void) { ContestAICmd_check_move_has_highest_appeal(); @@ -571,7 +846,7 @@ void ContestAICmd_unk_2E(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_2F(void) +static void ContestAICmd_unk_2F(void) { int i; u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -592,7 +867,7 @@ void ContestAICmd_unk_2F(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_30(void) +static void ContestAICmd_unk_30(void) { ContestAICmd_unk_2F(); @@ -602,7 +877,7 @@ void ContestAICmd_unk_30(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_31(void) +static void ContestAICmd_unk_31(void) { u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -610,7 +885,7 @@ void ContestAICmd_unk_31(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_32(void) +static void ContestAICmd_unk_32(void) { ContestAICmd_unk_31(); @@ -620,7 +895,7 @@ void ContestAICmd_unk_32(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_33(void) +static void ContestAICmd_unk_33(void) { ContestAICmd_unk_31(); @@ -630,7 +905,7 @@ void ContestAICmd_unk_33(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_34(void) +static void ContestAICmd_unk_34(void) { ContestAICmd_unk_31(); @@ -640,7 +915,7 @@ void ContestAICmd_unk_34(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_35(void) +static void ContestAICmd_unk_35(void) { ContestAICmd_unk_31(); @@ -650,7 +925,7 @@ void ContestAICmd_unk_35(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_36(void) +static void ContestAICmd_unk_36(void) { u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -658,7 +933,7 @@ void ContestAICmd_unk_36(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_37(void) +static void ContestAICmd_unk_37(void) { ContestAICmd_unk_36(); @@ -668,7 +943,7 @@ void ContestAICmd_unk_37(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_38(void) +static void ContestAICmd_unk_38(void) { ContestAICmd_unk_36(); @@ -678,7 +953,7 @@ void ContestAICmd_unk_38(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_39(void) +static void ContestAICmd_unk_39(void) { ContestAICmd_unk_36(); @@ -688,7 +963,7 @@ void ContestAICmd_unk_39(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_3A(void) +static void ContestAICmd_unk_3A(void) { ContestAICmd_unk_36(); @@ -698,7 +973,7 @@ void ContestAICmd_unk_3A(void) gAIScriptPtr += 5; } -void ContestAICmd_get_move_used_count(void) +static void ContestAICmd_get_move_used_count(void) { s16 result; u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -712,7 +987,7 @@ void ContestAICmd_get_move_used_count(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_3C(void) +static void ContestAICmd_unk_3C(void) { ContestAICmd_get_move_used_count(); @@ -722,7 +997,7 @@ void ContestAICmd_unk_3C(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_3D(void) +static void ContestAICmd_unk_3D(void) { ContestAICmd_get_move_used_count(); @@ -732,7 +1007,7 @@ void ContestAICmd_unk_3D(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_3E(void) +static void ContestAICmd_unk_3E(void) { ContestAICmd_get_move_used_count(); @@ -742,7 +1017,7 @@ void ContestAICmd_unk_3E(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_3F(void) +static void ContestAICmd_unk_3F(void) { ContestAICmd_get_move_used_count(); @@ -752,7 +1027,7 @@ void ContestAICmd_unk_3F(void) gAIScriptPtr += 5; } -void ContestAICmd_check_combo_starter(void) +static void ContestAICmd_check_combo_starter(void) { u8 result = 0; int i; @@ -778,7 +1053,7 @@ void ContestAICmd_check_combo_starter(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_41(void) +static void ContestAICmd_unk_41(void) { ContestAICmd_check_combo_starter(); @@ -788,7 +1063,7 @@ void ContestAICmd_unk_41(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_42(void) +static void ContestAICmd_unk_42(void) { ContestAICmd_check_combo_starter(); @@ -798,7 +1073,7 @@ void ContestAICmd_unk_42(void) gAIScriptPtr += 4; } -void ContestAICmd_check_combo_finisher(void) +static void ContestAICmd_check_combo_finisher(void) { u8 result = 0; int i; @@ -824,7 +1099,7 @@ void ContestAICmd_check_combo_finisher(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_44(void) +static void ContestAICmd_unk_44(void) { ContestAICmd_check_combo_finisher(); @@ -834,7 +1109,7 @@ void ContestAICmd_unk_44(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_45(void) +static void ContestAICmd_unk_45(void) { ContestAICmd_check_combo_finisher(); @@ -844,7 +1119,7 @@ void ContestAICmd_unk_45(void) gAIScriptPtr += 4; } -void ContestAICmd_check_would_finish_combo(void) +static void ContestAICmd_check_would_finish_combo(void) { u8 result = 0; u16 move = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; @@ -859,7 +1134,7 @@ void ContestAICmd_check_would_finish_combo(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_47(void) +static void ContestAICmd_unk_47(void) { ContestAICmd_check_would_finish_combo(); @@ -869,7 +1144,7 @@ void ContestAICmd_unk_47(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_48(void) +static void ContestAICmd_unk_48(void) { ContestAICmd_check_would_finish_combo(); @@ -879,7 +1154,7 @@ void ContestAICmd_unk_48(void) gAIScriptPtr += 4; } -void ContestAICmd_get_condition(void) +static void ContestAICmd_get_condition(void) { int var = sub_8128A7C(gAIScriptPtr[1]); @@ -887,7 +1162,7 @@ void ContestAICmd_get_condition(void) gAIScriptPtr += 2; } -void ContestAICmd_unk_4A(void) +static void ContestAICmd_unk_4A(void) { ContestAICmd_get_condition(); @@ -897,7 +1172,7 @@ void ContestAICmd_unk_4A(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_4B(void) +static void ContestAICmd_unk_4B(void) { ContestAICmd_get_condition(); @@ -907,7 +1182,7 @@ void ContestAICmd_unk_4B(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_4C(void) +static void ContestAICmd_unk_4C(void) { ContestAICmd_get_condition(); @@ -917,7 +1192,7 @@ void ContestAICmd_unk_4C(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_4D(void) +static void ContestAICmd_unk_4D(void) { ContestAICmd_get_condition(); @@ -927,7 +1202,7 @@ void ContestAICmd_unk_4D(void) gAIScriptPtr += 5; } -void ContestAICmd_get_used_combo_starter(void) +static void ContestAICmd_get_used_combo_starter(void) { u16 result = 0; u8 var = sub_8128A7C(gAIScriptPtr[1]); @@ -939,7 +1214,7 @@ void ContestAICmd_get_used_combo_starter(void) gAIScriptPtr += 2; } -void ContestAICmd_unk_4F(void) +static void ContestAICmd_unk_4F(void) { ContestAICmd_get_used_combo_starter(); @@ -949,7 +1224,7 @@ void ContestAICmd_unk_4F(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_50(void) +static void ContestAICmd_unk_50(void) { ContestAICmd_get_used_combo_starter(); @@ -959,7 +1234,7 @@ void ContestAICmd_unk_50(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_51(void) +static void ContestAICmd_unk_51(void) { ContestAICmd_get_used_combo_starter(); @@ -969,7 +1244,7 @@ void ContestAICmd_unk_51(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_52(void) +static void ContestAICmd_unk_52(void) { ContestAICmd_get_used_combo_starter(); @@ -979,7 +1254,7 @@ void ContestAICmd_unk_52(void) gAIScriptPtr += 5; } -void ContestAICmd_check_can_participate(void) +static void ContestAICmd_check_can_participate(void) { if(Contest_IsMonsTurnDisabled(sub_8128A7C(gAIScriptPtr[1]))) eContestAI->scriptResult = FALSE; @@ -989,7 +1264,7 @@ void ContestAICmd_check_can_participate(void) gAIScriptPtr += 2; } -void ContestAICmd_unk_54(void) +static void ContestAICmd_unk_54(void) { ContestAICmd_check_can_participate(); @@ -999,7 +1274,7 @@ void ContestAICmd_unk_54(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_55(void) +static void ContestAICmd_unk_55(void) { ContestAICmd_check_can_participate(); @@ -1009,7 +1284,7 @@ void ContestAICmd_unk_55(void) gAIScriptPtr += 4; } -void ContestAICmd_get_val_812A188(void) +static void ContestAICmd_get_val_812A188(void) { u8 var = sub_8128A7C(gAIScriptPtr[1]); @@ -1017,7 +1292,7 @@ void ContestAICmd_get_val_812A188(void) gAIScriptPtr += 2; } -void ContestAICmd_unk_57(void) +static void ContestAICmd_unk_57(void) { ContestAICmd_get_val_812A188(); @@ -1027,7 +1302,7 @@ void ContestAICmd_unk_57(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_58(void) +static void ContestAICmd_unk_58(void) { ContestAICmd_get_val_812A188(); @@ -1037,7 +1312,7 @@ void ContestAICmd_unk_58(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_59(void) +static void ContestAICmd_unk_59(void) { u8 var = sub_8128A7C(gAIScriptPtr[1]); @@ -1045,7 +1320,7 @@ void ContestAICmd_unk_59(void) gAIScriptPtr += 2; } -void ContestAICmd_unk_5A(void) +static void ContestAICmd_unk_5A(void) { ContestAICmd_unk_59(); @@ -1055,7 +1330,7 @@ void ContestAICmd_unk_5A(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_5B(void) +static void ContestAICmd_unk_5B(void) { ContestAICmd_unk_59(); @@ -1065,7 +1340,7 @@ void ContestAICmd_unk_5B(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_5C(void) +static void ContestAICmd_unk_5C(void) { ContestAICmd_unk_59(); @@ -1075,7 +1350,7 @@ void ContestAICmd_unk_5C(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_5D(void) +static void ContestAICmd_unk_5D(void) { ContestAICmd_unk_59(); @@ -1085,7 +1360,7 @@ void ContestAICmd_unk_5D(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_5E(void) +static void ContestAICmd_unk_5E(void) { u8 var = sub_8128A7C(gAIScriptPtr[1]); @@ -1093,7 +1368,7 @@ void ContestAICmd_unk_5E(void) gAIScriptPtr += 2; } -void ContestAICmd_unk_5F(void) +static void ContestAICmd_unk_5F(void) { ContestAICmd_unk_5E(); @@ -1103,7 +1378,7 @@ void ContestAICmd_unk_5F(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_60(void) +static void ContestAICmd_unk_60(void) { ContestAICmd_unk_5E(); @@ -1113,7 +1388,7 @@ void ContestAICmd_unk_60(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_61(void) +static void ContestAICmd_unk_61(void) { ContestAICmd_unk_5E(); @@ -1123,7 +1398,7 @@ void ContestAICmd_unk_61(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_62(void) +static void ContestAICmd_unk_62(void) { ContestAICmd_unk_5E(); @@ -1133,7 +1408,7 @@ void ContestAICmd_unk_62(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_63(void) +static void ContestAICmd_unk_63(void) { u8 var = sub_8128A7C(gAIScriptPtr[1]); u8 var2 = gAIScriptPtr[2]; @@ -1143,7 +1418,7 @@ void ContestAICmd_unk_63(void) gAIScriptPtr += 3; } -void ContestAICmd_unk_64(void) +static void ContestAICmd_unk_64(void) { ContestAICmd_unk_63(); @@ -1153,7 +1428,7 @@ void ContestAICmd_unk_64(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_65(void) +static void ContestAICmd_unk_65(void) { ContestAICmd_unk_63(); @@ -1163,7 +1438,7 @@ void ContestAICmd_unk_65(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_66(void) +static void ContestAICmd_unk_66(void) { ContestAICmd_unk_63(); @@ -1173,7 +1448,7 @@ void ContestAICmd_unk_66(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_67(void) +static void ContestAICmd_unk_67(void) { ContestAICmd_unk_63(); @@ -1183,7 +1458,7 @@ void ContestAICmd_unk_67(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_68(void) +static void ContestAICmd_unk_68(void) { u8 var = sub_8128A7C(gAIScriptPtr[1]); u8 var2 = gAIScriptPtr[2]; @@ -1193,7 +1468,7 @@ void ContestAICmd_unk_68(void) gAIScriptPtr += 3; } -void ContestAICmd_unk_69(void) +static void ContestAICmd_unk_69(void) { ContestAICmd_unk_68(); @@ -1203,7 +1478,7 @@ void ContestAICmd_unk_69(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_6A(void) +static void ContestAICmd_unk_6A(void) { ContestAICmd_unk_68(); @@ -1213,7 +1488,7 @@ void ContestAICmd_unk_6A(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_6B(void) +static void ContestAICmd_unk_6B(void) { ContestAICmd_unk_68(); @@ -1223,7 +1498,7 @@ void ContestAICmd_unk_6B(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_6C(void) +static void ContestAICmd_unk_6C(void) { ContestAICmd_unk_68(); @@ -1233,7 +1508,7 @@ void ContestAICmd_unk_6C(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_6D(void) +static void ContestAICmd_unk_6D(void) { u8 var = sub_8128A7C(gAIScriptPtr[1]); u8 var2 = gAIScriptPtr[2]; @@ -1243,7 +1518,7 @@ void ContestAICmd_unk_6D(void) gAIScriptPtr += 3; } -void ContestAICmd_unk_6E(void) +static void ContestAICmd_unk_6E(void) { ContestAICmd_unk_6D(); @@ -1253,7 +1528,7 @@ void ContestAICmd_unk_6E(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_6F(void) +static void ContestAICmd_unk_6F(void) { ContestAICmd_unk_6D(); @@ -1263,38 +1538,38 @@ void ContestAICmd_unk_6F(void) gAIScriptPtr += 5; } -void ContestAICmd_unk_70(void) +static void ContestAICmd_unk_70(void) { eContestAI->scriptArr[gAIScriptPtr[1]] = eContestAI->scriptResult; gAIScriptPtr += 2; } -void ContestAICmd_unk_71(void) +static void ContestAICmd_unk_71(void) { eContestAI->scriptArr[gAIScriptPtr[1]] = T1_READ_16(gAIScriptPtr + 2); gAIScriptPtr += 4; } -void ContestAICmd_unk_72(void) +static void ContestAICmd_unk_72(void) { // wtf? shouldn't T1_READ_16 work here? why the signed 8 load by gAIScriptPtr[2]? eContestAI->scriptArr[gAIScriptPtr[1]] += ((s8)gAIScriptPtr[2] | gAIScriptPtr[3] << 8); gAIScriptPtr += 4; } -void ContestAICmd_unk_73(void) +static void ContestAICmd_unk_73(void) { eContestAI->scriptArr[gAIScriptPtr[1]] += eContestAI->scriptArr[gAIScriptPtr[2]]; gAIScriptPtr += 3; } -void ContestAICmd_unk_74(void) +static void ContestAICmd_unk_74(void) { eContestAI->scriptArr[gAIScriptPtr[1]] += eContestAI->scriptArr[gAIScriptPtr[2]]; gAIScriptPtr += 3; } -void ContestAICmd_unk_75(void) +static void ContestAICmd_unk_75(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] < T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); @@ -1302,7 +1577,7 @@ void ContestAICmd_unk_75(void) gAIScriptPtr += 8; } -void ContestAICmd_unk_76(void) +static void ContestAICmd_unk_76(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] > T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); @@ -1310,7 +1585,7 @@ void ContestAICmd_unk_76(void) gAIScriptPtr += 8; } -void ContestAICmd_unk_77(void) +static void ContestAICmd_unk_77(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] == T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); @@ -1318,7 +1593,7 @@ void ContestAICmd_unk_77(void) gAIScriptPtr += 8; } -void ContestAICmd_unk_78(void) +static void ContestAICmd_unk_78(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] != T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); @@ -1326,7 +1601,7 @@ void ContestAICmd_unk_78(void) gAIScriptPtr += 8; } -void ContestAICmd_unk_79(void) +static void ContestAICmd_unk_79(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] < ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); @@ -1334,7 +1609,7 @@ void ContestAICmd_unk_79(void) gAIScriptPtr += 7; } -void ContestAICmd_unk_7A(void) +static void ContestAICmd_unk_7A(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] > ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); @@ -1342,7 +1617,7 @@ void ContestAICmd_unk_7A(void) gAIScriptPtr += 7; } -void ContestAICmd_unk_7B(void) +static void ContestAICmd_unk_7B(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] == ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); @@ -1350,7 +1625,7 @@ void ContestAICmd_unk_7B(void) gAIScriptPtr += 7; } -void ContestAICmd_unk_7C(void) +static void ContestAICmd_unk_7C(void) { if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] != ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); @@ -1358,7 +1633,7 @@ void ContestAICmd_unk_7C(void) gAIScriptPtr += 7; } -void ContestAICmd_unk_7D(void) +static void ContestAICmd_unk_7D(void) { if((Random() & 0xFF) < (s16)eContestAI->scriptArr[gAIScriptPtr[1]]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -1366,7 +1641,7 @@ void ContestAICmd_unk_7D(void) gAIScriptPtr += 6; } -void ContestAICmd_unk_7E(void) +static void ContestAICmd_unk_7E(void) { if((Random() & 0xFF) > (s16)eContestAI->scriptArr[gAIScriptPtr[1]]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); @@ -1375,32 +1650,32 @@ void ContestAICmd_unk_7E(void) } // jump -void ContestAICmd_unk_7F(void) +static void ContestAICmd_unk_7F(void) { gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); } -void ContestAICmd_unk_80(void) +static void ContestAICmd_unk_80(void) { sub_812ACA4(gAIScriptPtr + 5); gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); } -void ContestAICmd_unk_81(void) +static void ContestAICmd_unk_81(void) { if(!sub_812ACC8()) eContestAI->aiAction |= 1; } // push stack? -void sub_812ACA4(u8 *ptr) +static void sub_812ACA4(u8 *ptr) { u8 unk40 = eContestAI->unk40++; eContestAI->stack[unk40] = (u32)ptr; } // pop stack? -bool8 sub_812ACC8(void) +static bool8 sub_812ACC8(void) { if(eContestAI->unk40 != 0) { @@ -1412,7 +1687,7 @@ bool8 sub_812ACC8(void) return FALSE; } -void ContestAICmd_check_for_exciting_move(void) +static void ContestAICmd_check_for_exciting_move(void) { int result = 0; int i; @@ -1434,7 +1709,7 @@ void ContestAICmd_check_for_exciting_move(void) gAIScriptPtr += 1; } -void ContestAICmd_unk_83(void) +static void ContestAICmd_unk_83(void) { ContestAICmd_check_for_exciting_move(); @@ -1444,7 +1719,7 @@ void ContestAICmd_unk_83(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_84(void) +static void ContestAICmd_unk_84(void) { ContestAICmd_check_for_exciting_move(); @@ -1454,7 +1729,7 @@ void ContestAICmd_unk_84(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_85(void) +static void ContestAICmd_unk_85(void) { int result = 0; int i; @@ -1474,7 +1749,7 @@ void ContestAICmd_unk_85(void) gAIScriptPtr += 3; } -void ContestAICmd_unk_86(void) +static void ContestAICmd_unk_86(void) { ContestAICmd_unk_85(); @@ -1484,7 +1759,7 @@ void ContestAICmd_unk_86(void) gAIScriptPtr += 4; } -void ContestAICmd_unk_87(void) +static void ContestAICmd_unk_87(void) { ContestAICmd_unk_85(); -- cgit v1.2.3 From e769bb92568d732429645cfceb9c18fb49858431 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 13:21:02 -0500 Subject: comment --- include/contest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contest.h b/include/contest.h index 509f63758..956f4d02b 100644 --- a/include/contest.h +++ b/include/contest.h @@ -77,7 +77,7 @@ struct ContestAIInfo { /*0x10*/ u8 unk10; /*0x14*/ u32 flags; /*0x18*/ u16 scriptResult; - /*0x1A*/ u16 scriptArr[3]; // TODO: are there more variables after the array? + /*0x1A*/ u16 scriptArr[3]; /*0x20*/ u32 stack[8]; /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; -- cgit v1.2.3 From d7d947c6913d1a2a7a6401b8aac2041d536ad978 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 13:59:12 -0500 Subject: formatting and clean up --- include/battle_ai.h | 8 +- include/contest.h | 2 +- src/battle/battle_ai.c | 12 +- src/contest.c | 3 +- src/contest_ai.c | 465 ++++++++++++++++++++++++------------------------- 5 files changed, 241 insertions(+), 249 deletions(-) diff --git a/include/battle_ai.h b/include/battle_ai.h index c22ca8633..fdad0c7e9 100644 --- a/include/battle_ai.h +++ b/include/battle_ai.h @@ -10,10 +10,10 @@ enum // AI states enum { - AIState_SettingUp, - AIState_Processing, - AIState_FinishedProcessing, - AIState_DoNotProcess + BATTLEAI_SETTING_UP, + BATTLEAI_PROCESSING, + BATTLEAI_FINISHED, + BATTLEAI_DO_NOT_PROCESS }; // battle_ai diff --git a/include/contest.h b/include/contest.h index 956f4d02b..b7cb46810 100644 --- a/include/contest.h +++ b/include/contest.h @@ -76,7 +76,7 @@ struct ContestAIInfo { /*0x0A*/ u8 fillerA[0x6]; // TODO: don't know what's here /*0x10*/ u8 unk10; /*0x14*/ u32 flags; - /*0x18*/ u16 scriptResult; + /*0x18*/ s16 scriptResult; /*0x1A*/ u16 scriptArr[3]; /*0x20*/ u32 stack[8]; /*0x40*/ u8 unk40; diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 977e91f5c..80848d2fd 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -355,7 +355,7 @@ u8 BattleAI_GetAIActionToUse(void) { if (AI_THINKING_STRUCT->aiFlags & 1) { - AI_THINKING_STRUCT->aiState = AIState_SettingUp; + AI_THINKING_STRUCT->aiState = BATTLEAI_SETTING_UP; BattleAI_DoAIProcessing(); } AI_THINKING_STRUCT->aiFlags >>= 1; @@ -393,13 +393,13 @@ u8 BattleAI_GetAIActionToUse(void) void BattleAI_DoAIProcessing(void) { - while (AI_THINKING_STRUCT->aiState != AIState_FinishedProcessing) + while (AI_THINKING_STRUCT->aiState != BATTLEAI_FINISHED) { switch (AI_THINKING_STRUCT->aiState) { - case AIState_DoNotProcess: //Needed to match. + case BATTLEAI_DO_NOT_PROCESS: //Needed to match. break; - case AIState_SettingUp: + case BATTLEAI_SETTING_UP: gAIScriptPtr = BattleAIs[AI_THINKING_STRUCT->aiLogicId]; // set the AI ptr. if (gBattleMons[gBankAttacker].pp[AI_THINKING_STRUCT->movesetIndex] == 0) { @@ -411,7 +411,7 @@ void BattleAI_DoAIProcessing(void) } AI_THINKING_STRUCT->aiState++; break; - case AIState_Processing: + case BATTLEAI_PROCESSING: if (AI_THINKING_STRUCT->moveConsidered != MOVE_NONE) sBattleAICmdTable[*gAIScriptPtr](); // run AI command. else @@ -423,7 +423,7 @@ void BattleAI_DoAIProcessing(void) { AI_THINKING_STRUCT->movesetIndex++; if (AI_THINKING_STRUCT->movesetIndex < MAX_MON_MOVES && (AI_THINKING_STRUCT->aiAction & AI_ACTION_DO_NOT_ATTACK) == 0) - AI_THINKING_STRUCT->aiState = AIState_SettingUp; // as long as their are more moves to process, keep setting this to setup state. + AI_THINKING_STRUCT->aiState = BATTLEAI_SETTING_UP; // as long as their are more moves to process, keep setting this to setup state. else AI_THINKING_STRUCT->aiState++; // done processing. AI_THINKING_STRUCT->aiAction &= (AI_ACTION_FLEE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK | diff --git a/src/contest.c b/src/contest.c index 6a8887fb1..df4bb361d 100644 --- a/src/contest.c +++ b/src/contest.c @@ -31,13 +31,12 @@ #include "tv.h" #include "scanline_effect.h" #include "util.h" +#include "contest_ai.h" extern u8 AreMovesContestCombo(u16, u16); // I don't think this is a bool extern void sub_80C8A38(u8); extern void sub_80C8AD0(u8); extern void sub_80C8C80(u8); -extern void ContestAI_ResetAI(); -extern u8 ContestAI_GetActionToUse(void); extern struct MusicPlayerInfo gMPlay_SE1; extern u16 gSpecialVar_ContestCategory; diff --git a/src/contest_ai.c b/src/contest_ai.c index f8f2812fb..0c1126ac5 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -1,20 +1,13 @@ #include "global.h" #include "contest.h" #include "random.h" +#include "contest_ai.h" #include "ewram.h" extern u8 AreMovesContestCombo(u16, u16); extern bool8 sub_80B214C(u8); extern bool8 Contest_IsMonsTurnDisabled(u8); -enum -{ - ContestAI_SettingUp, - ContestAI_Processing, - ContestAI_FinishedProcessing, - ContestAI_DoNotProcess -}; - extern s16 gUnknown_02038670[]; extern u16 gSpecialVar_ContestCategory; @@ -162,142 +155,142 @@ typedef void (* ContestAICmdFunc)(void); static const ContestAICmdFunc sContestAICmdTable[] = { - ContestAICmd_unk_00, - ContestAICmd_get_turn, - ContestAICmd_unk_02, - ContestAICmd_unk_03, - ContestAICmd_unk_04, - ContestAICmd_unk_05, - ContestAICmd_get_excitement, - ContestAICmd_unk_07, - ContestAICmd_unk_08, - ContestAICmd_unk_09, - ContestAICmd_unk_0A, - ContestAICmd_get_user_order, - ContestAICmd_unk_0C, - ContestAICmd_unk_0D, - ContestAICmd_unk_0E, - ContestAICmd_unk_0F, - ContestAICmd_get_user_condition_maybe, - ContestAICmd_unk_11, - ContestAICmd_unk_12, - ContestAICmd_unk_13, - ContestAICmd_unk_14, - ContestAICmd_unk_15, - ContestAICmd_unk_16, - ContestAICmd_unk_17, - ContestAICmd_unk_18, - ContestAICmd_unk_19, - ContestAICmd_unk_1A, - ContestAICmd_unk_1B, - ContestAICmd_unk_1C, - ContestAICmd_unk_1D, - ContestAICmd_unk_1E, - ContestAICmd_get_contest_type, - ContestAICmd_unk_20, - ContestAICmd_unk_21, - ContestAICmd_get_move_excitement, - ContestAICmd_unk_23, - ContestAICmd_unk_24, - ContestAICmd_unk_25, - ContestAICmd_unk_26, - ContestAICmd_get_move_effect, - ContestAICmd_unk_28, - ContestAICmd_unk_29, - ContestAICmd_get_move_effect_type, - ContestAICmd_unk_2B, - ContestAICmd_unk_2C, - ContestAICmd_check_move_has_highest_appeal, - ContestAICmd_unk_2E, - ContestAICmd_unk_2F, - ContestAICmd_unk_30, - ContestAICmd_unk_31, - ContestAICmd_unk_32, - ContestAICmd_unk_33, - ContestAICmd_unk_34, - ContestAICmd_unk_35, - ContestAICmd_unk_36, - ContestAICmd_unk_37, - ContestAICmd_unk_38, - ContestAICmd_unk_39, - ContestAICmd_unk_3A, - ContestAICmd_get_move_used_count, - ContestAICmd_unk_3C, - ContestAICmd_unk_3D, - ContestAICmd_unk_3E, - ContestAICmd_unk_3F, - ContestAICmd_check_combo_starter, - ContestAICmd_unk_41, - ContestAICmd_unk_42, - ContestAICmd_check_combo_finisher, - ContestAICmd_unk_44, - ContestAICmd_unk_45, - ContestAICmd_check_would_finish_combo, - ContestAICmd_unk_47, - ContestAICmd_unk_48, - ContestAICmd_get_condition, - ContestAICmd_unk_4A, - ContestAICmd_unk_4B, - ContestAICmd_unk_4C, - ContestAICmd_unk_4D, - ContestAICmd_get_used_combo_starter, - ContestAICmd_unk_4F, - ContestAICmd_unk_50, - ContestAICmd_unk_51, - ContestAICmd_unk_52, - ContestAICmd_check_can_participate, - ContestAICmd_unk_54, - ContestAICmd_unk_55, - ContestAICmd_get_val_812A188, - ContestAICmd_unk_57, - ContestAICmd_unk_58, - ContestAICmd_unk_59, - ContestAICmd_unk_5A, - ContestAICmd_unk_5B, - ContestAICmd_unk_5C, - ContestAICmd_unk_5D, - ContestAICmd_unk_5E, - ContestAICmd_unk_5F, - ContestAICmd_unk_60, - ContestAICmd_unk_61, - ContestAICmd_unk_62, - ContestAICmd_unk_63, - ContestAICmd_unk_64, - ContestAICmd_unk_65, - ContestAICmd_unk_66, - ContestAICmd_unk_67, - ContestAICmd_unk_68, - ContestAICmd_unk_69, - ContestAICmd_unk_6A, - ContestAICmd_unk_6B, - ContestAICmd_unk_6C, - ContestAICmd_unk_6D, - ContestAICmd_unk_6E, - ContestAICmd_unk_6F, - ContestAICmd_unk_70, - ContestAICmd_unk_71, - ContestAICmd_unk_72, - ContestAICmd_unk_73, - ContestAICmd_unk_74, - ContestAICmd_unk_75, - ContestAICmd_unk_76, - ContestAICmd_unk_77, - ContestAICmd_unk_78, - ContestAICmd_unk_79, - ContestAICmd_unk_7A, - ContestAICmd_unk_7B, - ContestAICmd_unk_7C, - ContestAICmd_unk_7D, - ContestAICmd_unk_7E, - ContestAICmd_unk_7F, - ContestAICmd_unk_80, - ContestAICmd_unk_81, - ContestAICmd_check_for_exciting_move, - ContestAICmd_unk_83, - ContestAICmd_unk_84, - ContestAICmd_unk_85, - ContestAICmd_unk_86, - ContestAICmd_unk_87, + ContestAICmd_unk_00, // 0x00 + ContestAICmd_get_turn, // 0x01 + ContestAICmd_unk_02, // 0x02 + ContestAICmd_unk_03, // 0x03 + ContestAICmd_unk_04, // 0x04 + ContestAICmd_unk_05, // 0x05 + ContestAICmd_get_excitement, // 0x06 + ContestAICmd_unk_07, // 0x07 + ContestAICmd_unk_08, // 0x08 + ContestAICmd_unk_09, // 0x09 + ContestAICmd_unk_0A, // 0x0A + ContestAICmd_get_user_order, // 0x0B + ContestAICmd_unk_0C, // 0x0C + ContestAICmd_unk_0D, // 0x0D + ContestAICmd_unk_0E, // 0x0E + ContestAICmd_unk_0F, // 0x0F + ContestAICmd_get_user_condition_maybe, // 0x10 + ContestAICmd_unk_11, // 0x11 + ContestAICmd_unk_12, // 0x12 + ContestAICmd_unk_13, // 0x13 + ContestAICmd_unk_14, // 0x14 + ContestAICmd_unk_15, // 0x15 + ContestAICmd_unk_16, // 0x16 + ContestAICmd_unk_17, // 0x17 + ContestAICmd_unk_18, // 0x18 + ContestAICmd_unk_19, // 0x19 + ContestAICmd_unk_1A, // 0x1A + ContestAICmd_unk_1B, // 0x1B + ContestAICmd_unk_1C, // 0x1C + ContestAICmd_unk_1D, // 0x1D + ContestAICmd_unk_1E, // 0x1E + ContestAICmd_get_contest_type, // 0x1F + ContestAICmd_unk_20, // 0x20 + ContestAICmd_unk_21, // 0x21 + ContestAICmd_get_move_excitement, // 0x22 + ContestAICmd_unk_23, // 0x23 + ContestAICmd_unk_24, // 0x24 + ContestAICmd_unk_25, // 0x25 + ContestAICmd_unk_26, // 0x26 + ContestAICmd_get_move_effect, // 0x27 + ContestAICmd_unk_28, // 0x28 + ContestAICmd_unk_29, // 0x29 + ContestAICmd_get_move_effect_type, // 0x2A + ContestAICmd_unk_2B, // 0x2B + ContestAICmd_unk_2C, // 0x2C + ContestAICmd_check_move_has_highest_appeal, // 0x2D + ContestAICmd_unk_2E, // 0x2E + ContestAICmd_unk_2F, // 0x2F + ContestAICmd_unk_30, // 0x30 + ContestAICmd_unk_31, // 0x31 + ContestAICmd_unk_32, // 0x32 + ContestAICmd_unk_33, // 0x33 + ContestAICmd_unk_34, // 0x34 + ContestAICmd_unk_35, // 0x35 + ContestAICmd_unk_36, // 0x36 + ContestAICmd_unk_37, // 0x37 + ContestAICmd_unk_38, // 0x38 + ContestAICmd_unk_39, // 0x39 + ContestAICmd_unk_3A, // 0x3A + ContestAICmd_get_move_used_count, // 0x3B + ContestAICmd_unk_3C, // 0x3C + ContestAICmd_unk_3D, // 0x3D + ContestAICmd_unk_3E, // 0x3E + ContestAICmd_unk_3F, // 0x3F + ContestAICmd_check_combo_starter, // 0x40 + ContestAICmd_unk_41, // 0x41 + ContestAICmd_unk_42, // 0x42 + ContestAICmd_check_combo_finisher, // 0x43 + ContestAICmd_unk_44, // 0x44 + ContestAICmd_unk_45, // 0x45 + ContestAICmd_check_would_finish_combo, // 0x46 + ContestAICmd_unk_47, // 0x47 + ContestAICmd_unk_48, // 0x48 + ContestAICmd_get_condition, // 0x49 + ContestAICmd_unk_4A, // 0x4A + ContestAICmd_unk_4B, // 0x4B + ContestAICmd_unk_4C, // 0x4C + ContestAICmd_unk_4D, // 0x4D + ContestAICmd_get_used_combo_starter, // 0x4E + ContestAICmd_unk_4F, // 0x4F + ContestAICmd_unk_50, // 0x50 + ContestAICmd_unk_51, // 0x51 + ContestAICmd_unk_52, // 0x52 + ContestAICmd_check_can_participate, // 0x53 + ContestAICmd_unk_54, // 0x54 + ContestAICmd_unk_55, // 0x55 + ContestAICmd_get_val_812A188, // 0x56 + ContestAICmd_unk_57, // 0x57 + ContestAICmd_unk_58, // 0x58 + ContestAICmd_unk_59, // 0x59 + ContestAICmd_unk_5A, // 0x5A + ContestAICmd_unk_5B, // 0x5B + ContestAICmd_unk_5C, // 0x5C + ContestAICmd_unk_5D, // 0x5D + ContestAICmd_unk_5E, // 0x5E + ContestAICmd_unk_5F, // 0x5F + ContestAICmd_unk_60, // 0x60 + ContestAICmd_unk_61, // 0x61 + ContestAICmd_unk_62, // 0x62 + ContestAICmd_unk_63, // 0x63 + ContestAICmd_unk_64, // 0x64 + ContestAICmd_unk_65, // 0x65 + ContestAICmd_unk_66, // 0x66 + ContestAICmd_unk_67, // 0x67 + ContestAICmd_unk_68, // 0x68 + ContestAICmd_unk_69, // 0x69 + ContestAICmd_unk_6A, // 0x6A + ContestAICmd_unk_6B, // 0x6B + ContestAICmd_unk_6C, // 0x6C + ContestAICmd_unk_6D, // 0x6D + ContestAICmd_unk_6E, // 0x6E + ContestAICmd_unk_6F, // 0x6F + ContestAICmd_unk_70, // 0x70 + ContestAICmd_unk_71, // 0x71 + ContestAICmd_unk_72, // 0x72 + ContestAICmd_unk_73, // 0x73 + ContestAICmd_unk_74, // 0x74 + ContestAICmd_unk_75, // 0x75 + ContestAICmd_unk_76, // 0x76 + ContestAICmd_unk_77, // 0x77 + ContestAICmd_unk_78, // 0x78 + ContestAICmd_unk_79, // 0x79 + ContestAICmd_unk_7A, // 0x7A + ContestAICmd_unk_7B, // 0x7B + ContestAICmd_unk_7C, // 0x7C + ContestAICmd_unk_7D, // 0x7D + ContestAICmd_unk_7E, // 0x7E + ContestAICmd_unk_7F, // 0x7F + ContestAICmd_unk_80, // 0x80 + ContestAICmd_unk_81, // 0x81 + ContestAICmd_check_for_exciting_move, // 0x82 + ContestAICmd_unk_83, // 0x83 + ContestAICmd_unk_84, // 0x84 + ContestAICmd_unk_85, // 0x85 + ContestAICmd_unk_86, // 0x86 + ContestAICmd_unk_87, // 0x87 }; static void ContestAI_DoAIProcessing(void); @@ -349,13 +342,13 @@ u8 ContestAI_GetActionToUse(void) static void ContestAI_DoAIProcessing(void) { - while(eContestAI->aiState != ContestAI_FinishedProcessing) + while(eContestAI->aiState != CONTESTAI_FINISHED) { switch(eContestAI->aiState) { - case ContestAI_DoNotProcess: + case CONTESTAI_DO_NOT_PROCESS: break; - case ContestAI_SettingUp: + case CONTESTAI_SETTING_UP: gAIScriptPtr = gContestAIs[eContestAI->unk10]; if(gContestMons[eContestAI->unk41].moves[eContestAI->unk4] == 0) @@ -364,7 +357,7 @@ static void ContestAI_DoAIProcessing(void) eContestAI->unk2 = gContestMons[eContestAI->unk41].moves[eContestAI->unk4]; eContestAI->aiState++; break; - case ContestAI_Processing: + case CONTESTAI_PROCESSING: if(eContestAI->unk2 != 0) sContestAICmdTable[*gAIScriptPtr](); // run the command. else @@ -421,7 +414,7 @@ static void ContestAICmd_unk_02(void) { ContestAICmd_get_turn(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -431,7 +424,7 @@ static void ContestAICmd_unk_03(void) { ContestAICmd_get_turn(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -441,7 +434,7 @@ static void ContestAICmd_unk_04(void) { ContestAICmd_get_turn(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -451,7 +444,7 @@ static void ContestAICmd_unk_05(void) { ContestAICmd_get_turn(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -467,7 +460,7 @@ static void ContestAICmd_unk_07(void) { ContestAICmd_get_excitement(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -477,7 +470,7 @@ static void ContestAICmd_unk_08(void) { ContestAICmd_get_excitement(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -487,7 +480,7 @@ static void ContestAICmd_unk_09(void) { ContestAICmd_get_excitement(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -497,7 +490,7 @@ static void ContestAICmd_unk_0A(void) { ContestAICmd_get_excitement(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -513,7 +506,7 @@ static void ContestAICmd_unk_0C(void) { ContestAICmd_get_user_order(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -523,7 +516,7 @@ static void ContestAICmd_unk_0D(void) { ContestAICmd_get_user_order(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -533,7 +526,7 @@ static void ContestAICmd_unk_0E(void) { ContestAICmd_get_user_order(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -543,7 +536,7 @@ static void ContestAICmd_unk_0F(void) { ContestAICmd_get_user_order(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -559,7 +552,7 @@ static void ContestAICmd_unk_11(void) { ContestAICmd_get_user_condition_maybe(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -569,7 +562,7 @@ static void ContestAICmd_unk_12(void) { ContestAICmd_get_user_condition_maybe(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -579,7 +572,7 @@ static void ContestAICmd_unk_13(void) { ContestAICmd_get_user_condition_maybe(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -589,7 +582,7 @@ static void ContestAICmd_unk_14(void) { ContestAICmd_get_user_condition_maybe(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -605,7 +598,7 @@ static void ContestAICmd_unk_16(void) { ContestAICmd_unk_15(); - if((s16)eContestAI->scriptResult < (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult < (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -615,7 +608,7 @@ static void ContestAICmd_unk_17(void) { ContestAICmd_unk_15(); - if((s16)eContestAI->scriptResult > (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult > (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -625,7 +618,7 @@ static void ContestAICmd_unk_18(void) { ContestAICmd_unk_15(); - if((s16)eContestAI->scriptResult == (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult == (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -635,7 +628,7 @@ static void ContestAICmd_unk_19(void) { ContestAICmd_unk_15(); - if((s16)eContestAI->scriptResult != (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult != (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -651,7 +644,7 @@ static void ContestAICmd_unk_1B(void) { ContestAICmd_unk_1A(); - if((s16)eContestAI->scriptResult < (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult < (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -661,7 +654,7 @@ static void ContestAICmd_unk_1C(void) { ContestAICmd_unk_1A(); - if((s16)eContestAI->scriptResult > (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult > (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -671,7 +664,7 @@ static void ContestAICmd_unk_1D(void) { ContestAICmd_unk_1A(); - if((s16)eContestAI->scriptResult == (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult == (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -681,7 +674,7 @@ static void ContestAICmd_unk_1E(void) { ContestAICmd_unk_1A(); - if((s16)eContestAI->scriptResult != (s16)T1_READ_16(gAIScriptPtr + 0)) + if(eContestAI->scriptResult != (s16)T1_READ_16(gAIScriptPtr + 0)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -697,7 +690,7 @@ static void ContestAICmd_unk_20(void) { ContestAICmd_get_contest_type(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -707,7 +700,7 @@ static void ContestAICmd_unk_21(void) { ContestAICmd_get_contest_type(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -723,7 +716,7 @@ static void ContestAICmd_unk_23(void) { ContestAICmd_get_move_excitement(); - if((s16)eContestAI->scriptResult < (s8)gAIScriptPtr[0]) + if(eContestAI->scriptResult < (s8)gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -733,7 +726,7 @@ static void ContestAICmd_unk_24(void) { ContestAICmd_get_move_excitement(); - if((s16)eContestAI->scriptResult > (s8)gAIScriptPtr[0]) + if(eContestAI->scriptResult > (s8)gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -743,7 +736,7 @@ static void ContestAICmd_unk_25(void) { ContestAICmd_get_move_excitement(); - if((s16)eContestAI->scriptResult == (s8)gAIScriptPtr[0]) + if(eContestAI->scriptResult == (s8)gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -753,7 +746,7 @@ static void ContestAICmd_unk_26(void) { ContestAICmd_get_move_excitement(); - if((s16)eContestAI->scriptResult != (s8)gAIScriptPtr[0]) + if(eContestAI->scriptResult != (s8)gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -771,7 +764,7 @@ static void ContestAICmd_unk_28(void) { ContestAICmd_get_move_effect(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -781,7 +774,7 @@ static void ContestAICmd_unk_29(void) { ContestAICmd_get_move_effect(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -799,7 +792,7 @@ static void ContestAICmd_unk_2B(void) { ContestAICmd_get_move_effect_type(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -809,7 +802,7 @@ static void ContestAICmd_unk_2C(void) { ContestAICmd_get_move_effect_type(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -840,7 +833,7 @@ static void ContestAICmd_unk_2E(void) { ContestAICmd_check_move_has_highest_appeal(); - if((s16)eContestAI->scriptResult != FALSE) + if(eContestAI->scriptResult != FALSE) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -871,7 +864,7 @@ static void ContestAICmd_unk_30(void) { ContestAICmd_unk_2F(); - if((s16)eContestAI->scriptResult != FALSE) + if(eContestAI->scriptResult != FALSE) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -889,7 +882,7 @@ static void ContestAICmd_unk_32(void) { ContestAICmd_unk_31(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -899,7 +892,7 @@ static void ContestAICmd_unk_33(void) { ContestAICmd_unk_31(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -909,7 +902,7 @@ static void ContestAICmd_unk_34(void) { ContestAICmd_unk_31(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -919,7 +912,7 @@ static void ContestAICmd_unk_35(void) { ContestAICmd_unk_31(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -937,7 +930,7 @@ static void ContestAICmd_unk_37(void) { ContestAICmd_unk_36(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -947,7 +940,7 @@ static void ContestAICmd_unk_38(void) { ContestAICmd_unk_36(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -957,7 +950,7 @@ static void ContestAICmd_unk_39(void) { ContestAICmd_unk_36(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -967,7 +960,7 @@ static void ContestAICmd_unk_3A(void) { ContestAICmd_unk_36(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -991,7 +984,7 @@ static void ContestAICmd_unk_3C(void) { ContestAICmd_get_move_used_count(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1001,7 +994,7 @@ static void ContestAICmd_unk_3D(void) { ContestAICmd_get_move_used_count(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1011,7 +1004,7 @@ static void ContestAICmd_unk_3E(void) { ContestAICmd_get_move_used_count(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1021,7 +1014,7 @@ static void ContestAICmd_unk_3F(void) { ContestAICmd_get_move_used_count(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1057,7 +1050,7 @@ static void ContestAICmd_unk_41(void) { ContestAICmd_check_combo_starter(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1067,7 +1060,7 @@ static void ContestAICmd_unk_42(void) { ContestAICmd_check_combo_starter(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1103,7 +1096,7 @@ static void ContestAICmd_unk_44(void) { ContestAICmd_check_combo_finisher(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1113,7 +1106,7 @@ static void ContestAICmd_unk_45(void) { ContestAICmd_check_combo_finisher(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1138,7 +1131,7 @@ static void ContestAICmd_unk_47(void) { ContestAICmd_check_would_finish_combo(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1148,7 +1141,7 @@ static void ContestAICmd_unk_48(void) { ContestAICmd_check_would_finish_combo(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1166,7 +1159,7 @@ static void ContestAICmd_unk_4A(void) { ContestAICmd_get_condition(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1176,7 +1169,7 @@ static void ContestAICmd_unk_4B(void) { ContestAICmd_get_condition(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1186,7 +1179,7 @@ static void ContestAICmd_unk_4C(void) { ContestAICmd_get_condition(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1196,7 +1189,7 @@ static void ContestAICmd_unk_4D(void) { ContestAICmd_get_condition(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1218,7 +1211,7 @@ static void ContestAICmd_unk_4F(void) { ContestAICmd_get_used_combo_starter(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1228,7 +1221,7 @@ static void ContestAICmd_unk_50(void) { ContestAICmd_get_used_combo_starter(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1238,7 +1231,7 @@ static void ContestAICmd_unk_51(void) { ContestAICmd_get_used_combo_starter(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1248,7 +1241,7 @@ static void ContestAICmd_unk_52(void) { ContestAICmd_get_used_combo_starter(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1268,7 +1261,7 @@ static void ContestAICmd_unk_54(void) { ContestAICmd_check_can_participate(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1278,7 +1271,7 @@ static void ContestAICmd_unk_55(void) { ContestAICmd_check_can_participate(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1296,7 +1289,7 @@ static void ContestAICmd_unk_57(void) { ContestAICmd_get_val_812A188(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1306,7 +1299,7 @@ static void ContestAICmd_unk_58(void) { ContestAICmd_get_val_812A188(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1324,7 +1317,7 @@ static void ContestAICmd_unk_5A(void) { ContestAICmd_unk_59(); - if((s16)eContestAI->scriptResult < 0) + if(eContestAI->scriptResult < 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1334,7 +1327,7 @@ static void ContestAICmd_unk_5B(void) { ContestAICmd_unk_59(); - if((s16)eContestAI->scriptResult > 0) + if(eContestAI->scriptResult > 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1344,7 +1337,7 @@ static void ContestAICmd_unk_5C(void) { ContestAICmd_unk_59(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1354,7 +1347,7 @@ static void ContestAICmd_unk_5D(void) { ContestAICmd_unk_59(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1372,7 +1365,7 @@ static void ContestAICmd_unk_5F(void) { ContestAICmd_unk_5E(); - if((s16)eContestAI->scriptResult < 0) + if(eContestAI->scriptResult < 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1382,7 +1375,7 @@ static void ContestAICmd_unk_60(void) { ContestAICmd_unk_5E(); - if((s16)eContestAI->scriptResult > 0) + if(eContestAI->scriptResult > 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1392,7 +1385,7 @@ static void ContestAICmd_unk_61(void) { ContestAICmd_unk_5E(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1402,7 +1395,7 @@ static void ContestAICmd_unk_62(void) { ContestAICmd_unk_5E(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1422,7 +1415,7 @@ static void ContestAICmd_unk_64(void) { ContestAICmd_unk_63(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1432,7 +1425,7 @@ static void ContestAICmd_unk_65(void) { ContestAICmd_unk_63(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1442,7 +1435,7 @@ static void ContestAICmd_unk_66(void) { ContestAICmd_unk_63(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1452,7 +1445,7 @@ static void ContestAICmd_unk_67(void) { ContestAICmd_unk_63(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1472,7 +1465,7 @@ static void ContestAICmd_unk_69(void) { ContestAICmd_unk_68(); - if((s16)eContestAI->scriptResult < gAIScriptPtr[0]) + if(eContestAI->scriptResult < gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1482,7 +1475,7 @@ static void ContestAICmd_unk_6A(void) { ContestAICmd_unk_68(); - if((s16)eContestAI->scriptResult > gAIScriptPtr[0]) + if(eContestAI->scriptResult > gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1492,7 +1485,7 @@ static void ContestAICmd_unk_6B(void) { ContestAICmd_unk_68(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1502,7 +1495,7 @@ static void ContestAICmd_unk_6C(void) { ContestAICmd_unk_68(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1522,7 +1515,7 @@ static void ContestAICmd_unk_6E(void) { ContestAICmd_unk_6D(); - if((s16)eContestAI->scriptResult == gAIScriptPtr[0]) + if(eContestAI->scriptResult == gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1532,7 +1525,7 @@ static void ContestAICmd_unk_6F(void) { ContestAICmd_unk_6D(); - if((s16)eContestAI->scriptResult != gAIScriptPtr[0]) + if(eContestAI->scriptResult != gAIScriptPtr[0]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); else gAIScriptPtr += 5; @@ -1713,7 +1706,7 @@ static void ContestAICmd_unk_83(void) { ContestAICmd_check_for_exciting_move(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1723,7 +1716,7 @@ static void ContestAICmd_unk_84(void) { ContestAICmd_check_for_exciting_move(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1753,7 +1746,7 @@ static void ContestAICmd_unk_86(void) { ContestAICmd_unk_85(); - if((s16)eContestAI->scriptResult != 0) + if(eContestAI->scriptResult != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; @@ -1763,7 +1756,7 @@ static void ContestAICmd_unk_87(void) { ContestAICmd_unk_85(); - if((s16)eContestAI->scriptResult == 0) + if(eContestAI->scriptResult == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 0); else gAIScriptPtr += 4; -- cgit v1.2.3 From c0b4770984dfc7f699f60a58085c9d1ff1098c08 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 14:03:15 -0500 Subject: dont forget the header --- include/contest_ai.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 include/contest_ai.h diff --git a/include/contest_ai.h b/include/contest_ai.h new file mode 100755 index 000000000..da143b541 --- /dev/null +++ b/include/contest_ai.h @@ -0,0 +1,16 @@ +#ifndef GUARD_CONTESTAI_H +#define GUARD_CONTESTAI_H + +// AI states +enum +{ + CONTESTAI_SETTING_UP, + CONTESTAI_PROCESSING, + CONTESTAI_FINISHED, + CONTESTAI_DO_NOT_PROCESS +}; + +void ContestAI_ResetAI(u8); +u8 ContestAI_GetActionToUse(void); + +#endif -- cgit v1.2.3 From a5403f03dd49711f8c2f719e8bfa8a83f427563c Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 14:16:40 -0500 Subject: scriptArr to s16 --- include/contest.h | 2 +- src/contest_ai.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/contest.h b/include/contest.h index b7cb46810..6b1f1f520 100644 --- a/include/contest.h +++ b/include/contest.h @@ -77,7 +77,7 @@ struct ContestAIInfo { /*0x10*/ u8 unk10; /*0x14*/ u32 flags; /*0x18*/ s16 scriptResult; - /*0x1A*/ u16 scriptArr[3]; + /*0x1A*/ s16 scriptArr[3]; /*0x20*/ u32 stack[8]; /*0x40*/ u8 unk40; /*0x41*/ u8 unk41; diff --git a/src/contest_ai.c b/src/contest_ai.c index 0c1126ac5..66b387270 100755 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -1564,7 +1564,7 @@ static void ContestAICmd_unk_74(void) static void ContestAICmd_unk_75(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] < T1_READ_16(gAIScriptPtr + 2)) + if(eContestAI->scriptArr[gAIScriptPtr[1]] < T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1572,7 +1572,7 @@ static void ContestAICmd_unk_75(void) static void ContestAICmd_unk_76(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] > T1_READ_16(gAIScriptPtr + 2)) + if(eContestAI->scriptArr[gAIScriptPtr[1]] > T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1580,7 +1580,7 @@ static void ContestAICmd_unk_76(void) static void ContestAICmd_unk_77(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] == T1_READ_16(gAIScriptPtr + 2)) + if(eContestAI->scriptArr[gAIScriptPtr[1]] == T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1588,7 +1588,7 @@ static void ContestAICmd_unk_77(void) static void ContestAICmd_unk_78(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] != T1_READ_16(gAIScriptPtr + 2)) + if(eContestAI->scriptArr[gAIScriptPtr[1]] != T1_READ_16(gAIScriptPtr + 2)) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 4); else gAIScriptPtr += 8; @@ -1596,7 +1596,7 @@ static void ContestAICmd_unk_78(void) static void ContestAICmd_unk_79(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] < ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + if(eContestAI->scriptArr[gAIScriptPtr[1]] < (eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); else gAIScriptPtr += 7; @@ -1604,7 +1604,7 @@ static void ContestAICmd_unk_79(void) static void ContestAICmd_unk_7A(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] > ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + if(eContestAI->scriptArr[gAIScriptPtr[1]] > (eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); else gAIScriptPtr += 7; @@ -1612,7 +1612,7 @@ static void ContestAICmd_unk_7A(void) static void ContestAICmd_unk_7B(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] == ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + if(eContestAI->scriptArr[gAIScriptPtr[1]] == (eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); else gAIScriptPtr += 7; @@ -1620,7 +1620,7 @@ static void ContestAICmd_unk_7B(void) static void ContestAICmd_unk_7C(void) { - if((s16)eContestAI->scriptArr[gAIScriptPtr[1]] != ((s16)eContestAI->scriptArr[gAIScriptPtr[2]])) + if(eContestAI->scriptArr[gAIScriptPtr[1]] != (eContestAI->scriptArr[gAIScriptPtr[2]])) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 3); else gAIScriptPtr += 7; @@ -1628,7 +1628,7 @@ static void ContestAICmd_unk_7C(void) static void ContestAICmd_unk_7D(void) { - if((Random() & 0xFF) < (s16)eContestAI->scriptArr[gAIScriptPtr[1]]) + if((Random() & 0xFF) < eContestAI->scriptArr[gAIScriptPtr[1]]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1636,7 +1636,7 @@ static void ContestAICmd_unk_7D(void) static void ContestAICmd_unk_7E(void) { - if((Random() & 0xFF) > (s16)eContestAI->scriptArr[gAIScriptPtr[1]]) + if((Random() & 0xFF) > eContestAI->scriptArr[gAIScriptPtr[1]]) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 2); else gAIScriptPtr += 6; -- cgit v1.2.3 From 58b71865c9052d3b6cf21dae38052afa88ba44a6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 13:41:50 -0600 Subject: improve TM/HM constants and add macro for TM/HM learnsets --- data/item_ball_scripts.inc | 32 +- data/maps/events/Route113.inc | 2 +- data/scripts/maps/DewfordTown_Gym.inc | 2 +- data/scripts/maps/DewfordTown_Hall.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House2.inc | 2 +- data/scripts/maps/GraniteCave_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- .../maps/LilycoveCity_DepartmentStore_4F.inc | 16 +- data/scripts/maps/LilycoveCity_House2.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 30 +- data/scripts/maps/MauvilleCity_Gym.inc | 2 +- data/scripts/maps/MauvilleCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 4 +- data/scripts/maps/PacifidlogTown_House2.inc | 4 +- data/scripts/maps/PetalburgCity_Gym.inc | 2 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 2 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 2 +- data/scripts/maps/Route114.inc | 2 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/Route123.inc | 2 +- data/scripts/maps/RustboroCity_CuttersHouse.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 2 +- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SlateportCity.inc | 4 +- data/scripts/maps/SlateportCity_ContestHall.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House1.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/secret_power_tm.inc | 2 +- include/constants/items.h | 116 +- src/data/items_de.h | 114 +- src/data/items_en.h | 116 +- src/data/pokemon/tmhm_learnsets.h | 9821 +++++++++++++++++++- src/field/daycare.c | 2 +- src/field/item_use.c | 2 +- src/field/party_menu.c | 2 +- src/field/player_pc.c | 2 +- 47 files changed, 9645 insertions(+), 686 deletions(-) diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc index aae704ab2..02acdeca4 100644 --- a/data/item_ball_scripts.inc +++ b/data/item_ball_scripts.inc @@ -43,7 +43,7 @@ Route110_EventScript_1B14BB:: @ 81B14BB end Route111_EventScript_1B14C8:: @ 81B14C8 - giveitem_std ITEM_TM37, 1, 1 + giveitem_std ITEM_TM37_SANDSTORM, 1, 1 end Route111_EventScript_1B14D5:: @ 81B14D5 @@ -79,7 +79,7 @@ Route115_EventScript_1B1530:: @ 81B1530 end Route115_EventScript_1B153D:: @ 81B153D - giveitem_std ITEM_TM01, 1, 1 + giveitem_std ITEM_TM01_FOCUS_PUNCH, 1, 1 end Route115_EventScript_1B154A:: @ 81B154A @@ -291,11 +291,11 @@ FieryPath_EventScript_1B17E1:: @ 81B17E1 end FieryPath_EventScript_1B17EE:: @ 81B17EE - giveitem_std ITEM_TM06, 1, 1 + giveitem_std ITEM_TM06_TOXIC, 1, 1 end MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB - giveitem_std ITEM_TM23, 1, 1 + giveitem_std ITEM_TM23_IRON_TAIL, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808 @@ -311,7 +311,7 @@ MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822 end MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F - giveitem_std ITEM_TM02, 1, 1 + giveitem_std ITEM_TM02_DRAGON_CLAW, 1, 1 end NewMauville_Inside_EventScript_1B183C:: @ 81B183C @@ -347,7 +347,7 @@ AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897 end AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4 - giveitem_std ITEM_TM13, 1, 1 + giveitem_std ITEM_TM13_ICE_BEAM, 1, 1 end AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1 @@ -371,15 +371,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5 end AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2 - giveitem_std ITEM_TM18, 1, 1 + giveitem_std ITEM_TM18_RAIN_DANCE, 1, 1 end ScorchedSlab_EventScript_1B18FF:: @ 81B18FF - giveitem_std ITEM_TM11, 1, 1 + giveitem_std ITEM_TM11_SUNNY_DAY, 1, 1 end SafariZone_Northwest_EventScript_1B190C:: @ 81B190C - giveitem_std ITEM_TM22, 1, 1 + giveitem_std ITEM_TM22_SOLARBEAM, 1, 1 end SafariZone_Northeast_EventScript_1B1919:: @ 81B1919 @@ -407,7 +407,7 @@ MtPyre_5F_EventScript_1B195A:: @ 81B195A end MtPyre_6F_EventScript_1B1967:: @ 81B1967 - giveitem_std ITEM_TM30, 1, 1 + giveitem_std ITEM_TM30_SHADOW_BALL, 1, 1 end MtPyre_Exterior_EventScript_1B1974:: @ 81B1974 @@ -415,7 +415,7 @@ MtPyre_Exterior_EventScript_1B1974:: @ 81B1974 end MtPyre_Exterior_EventScript_1B1981:: @ 81B1981 - giveitem_std ITEM_TM48, 1, 1 + giveitem_std ITEM_TM48_SKILL_SWAP, 1, 1 end AquaHideout_B1F_EventScript_1B198E:: @ 81B198E @@ -463,7 +463,7 @@ ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10 end ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D - giveitem_std ITEM_TM07, 1, 1 + giveitem_std ITEM_TM07_HAIL, 1, 1 end ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A @@ -471,11 +471,11 @@ ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A end SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37 - giveitem_std ITEM_TM26, 1, 1 + giveitem_std ITEM_TM26_EARTHQUAKE, 1, 1 end CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44 - giveitem_std ITEM_HM07, 1, 1 + giveitem_std ITEM_HM07_WATERFALL, 1, 1 end Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51 @@ -523,7 +523,7 @@ VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3 end VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0 - giveitem_std ITEM_TM29, 1, 1 + giveitem_std ITEM_TM29_PSYCHIC, 1, 1 end VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED @@ -535,5 +535,5 @@ VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA end @ 81B1B07 - giveitem_std ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08_DIVE, 1, 1 end diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index dccaf6e82..1b895d571 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -42,7 +42,7 @@ Route113_MapBGEvents:: @ 8382BE0 bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3 bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 - bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_1E + bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E Route113_MapEvents:: @ 8382C34 map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 7cdf3dd6a..596f2c77f 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -118,7 +118,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem_std ITEM_TM08 + giveitem_std ITEM_TM08_BULK_UP compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 84334068e..45d389b28 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D call DewfordTown_Hall_EventScript_1A0102 goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 - giveitem_std ITEM_TM36 + giveitem_std ITEM_TM36_SLUDGE_BOMB compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag FLAG_RECEIVED_TM36 diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index f62a2da37..f16b6e828 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -22,7 +22,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 - giveitem_std ITEM_TM27 + giveitem_std ITEM_TM27_RETURN compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar VAR_SPECIAL_4, 280 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 94df378f8..c0de6bfee 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -35,7 +35,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E - giveitem_std ITEM_TM40 + giveitem_std ITEM_TM40_AERIAL_ACE compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index 107c3708c..365646d81 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -19,7 +19,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 switch RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 - giveitem_std ITEM_TM10 + giveitem_std ITEM_TM10_HIDDEN_POWER compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM10 diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 7419b5866..b9d89f93c 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -6,7 +6,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 faceplayer goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 - giveitem_std ITEM_HM05 + giveitem_std ITEM_HM05_FLASH setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9c69e649e..d33813680 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 - giveitem_std ITEM_TM47 + giveitem_std ITEM_TM47_STEEL_WING compare RESULT, 0 call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index c0604400e..27655127a 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -83,7 +83,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 - giveitem_std ITEM_TM50 + giveitem_std ITEM_TM50_OVERHEAT compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc index d922d9181..907b79847 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc @@ -25,10 +25,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019 .align 2 LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030 - .2byte ITEM_TM38 - .2byte ITEM_TM25 - .2byte ITEM_TM14 - .2byte ITEM_TM15 + .2byte ITEM_TM38_FIRE_BLAST + .2byte ITEM_TM25_THUNDER + .2byte ITEM_TM14_BLIZZARD + .2byte ITEM_TM15_HYPER_BEAM .2byte ITEM_NONE release end @@ -45,10 +45,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C .align 2 LilycoveCity_DepartmentStore_4F_Items2:: @ 815A054 - .2byte ITEM_TM17 - .2byte ITEM_TM20 - .2byte ITEM_TM33 - .2byte ITEM_TM16 + .2byte ITEM_TM17_PROTECT + .2byte ITEM_TM20_SAFEGUARD + .2byte ITEM_TM33_REFLECT + .2byte ITEM_TM16_LIGHT_SCREEN .2byte ITEM_NONE release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index 0572c23cc..797c8f203 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -6,7 +6,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 faceplayer goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 - giveitem_std ITEM_TM44 + giveitem_std ITEM_TM44_REST compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM44 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 03974ddae..852f24f2a 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -298,7 +298,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 - giveitem_std ITEM_TM24 + giveitem_std ITEM_TM24_THUNDERBOLT compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 2b784aeb9..b9f8e5ad1 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar VAR_TEMP_1, 1 - bufferitemname 0, ITEM_TM32 + bufferitemname 0, ITEM_TM32_DOUBLE_TEAM goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar VAR_TEMP_1, 2 - bufferitemname 0, ITEM_TM29 + bufferitemname 0, ITEM_TM29_PSYCHIC goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar VAR_TEMP_1, 3 - bufferitemname 0, ITEM_TM35 + bufferitemname 0, ITEM_TM35_FLAMETHROWER goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar VAR_TEMP_1, 4 - bufferitemname 0, ITEM_TM24 + bufferitemname 0, ITEM_TM24_THUNDERBOLT goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar VAR_TEMP_1, 5 - bufferitemname 0, ITEM_TM13 + bufferitemname 0, ITEM_TM13_ICE_BEAM goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -291,11 +291,11 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM32, 1 + checkitemspace ITEM_TM32_DOUBLE_TEAM, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 1500 - giveitem ITEM_TM32, 1 + giveitem ITEM_TM32_DOUBLE_TEAM, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -306,11 +306,11 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM29, 1 + checkitemspace ITEM_TM29_PSYCHIC, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 3500 - giveitem ITEM_TM29, 1 + giveitem ITEM_TM29_PSYCHIC, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -321,11 +321,11 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM35, 1 + checkitemspace ITEM_TM35_FLAMETHROWER, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - giveitem ITEM_TM35, 1 + giveitem ITEM_TM35_FLAMETHROWER, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -336,11 +336,11 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM24, 1 + checkitemspace ITEM_TM24_THUNDERBOLT, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - giveitem ITEM_TM24, 1 + giveitem ITEM_TM24_THUNDERBOLT, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -351,11 +351,11 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM13, 1 + checkitemspace ITEM_TM13_ICE_BEAM, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - giveitem ITEM_TM13, 1 + giveitem ITEM_TM13_ICE_BEAM, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 1dc7fc0c7..d9b8aced7 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -93,7 +93,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem_std ITEM_TM34 + giveitem_std ITEM_TM34_SHOCK_WAVE compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index eb21a49e9..4caaef545 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -6,7 +6,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD faceplayer goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 - giveitem_std ITEM_HM06 + giveitem_std ITEM_HM06_ROCK_SMASH setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 341962431..0ae02fba4 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -67,7 +67,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 - giveitem_std ITEM_TM04 + giveitem_std ITEM_TM04_CALM_MIND compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d9ad70f70..0f1aace1d 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -38,7 +38,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 - giveitem_std ITEM_HM08 + giveitem_std ITEM_HM08_DIVE setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 @@ -123,6 +123,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 end MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 - giveitem_std ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08_DIVE, 1, 1 setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index 8ad949bf2..110bdcbe6 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -41,7 +41,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 - giveitem_std ITEM_TM27 + giveitem_std ITEM_TM27_RETURN compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -57,7 +57,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 - giveitem_std ITEM_TM21 + giveitem_std ITEM_TM21_FRUSTRATION compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1199b3571..1dc1a77ec 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -402,7 +402,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C - giveitem_std ITEM_TM42 + giveitem_std ITEM_TM42_FACADE compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM42 diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index d642d70ed..1a1605817 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -20,7 +20,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 - giveitem_std ITEM_HM03 + giveitem_std ITEM_HM03_SURF setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a3824efcf..2d44d4dfd 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -102,7 +102,7 @@ Route104_EventScript_14EF93:: @ 814EF93 faceplayer goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem_std ITEM_TM09 + giveitem_std ITEM_TM09_BULLET_SEED compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 020c61258..2c2215a42 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_TM12 + giveitem_std ITEM_TM12_TAUNT compare RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 527f09d27..3fceeb8d1 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -401,7 +401,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 end Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E - giveitem_std ITEM_TM12 + giveitem_std ITEM_TM12_TAUNT compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 30ab8c572..54a4ee59a 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -28,7 +28,7 @@ Route114_EventScript_150782:: @ 8150782 faceplayer goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem_std ITEM_TM05 + giveitem_std ITEM_TM05_ROAR compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index b191db5f6..c93584561 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 faceplayer goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 - giveitem_std ITEM_TM28 + giveitem_std ITEM_TM28_DIG compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag FLAG_RECEIVED_TM28 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 4b9f3ce5f..30eed9cc0 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -147,7 +147,7 @@ Route119_EventScript_151337:: @ 8151337 end Route119_EventScript_151352:: @ 8151352 - giveitem_std ITEM_HM02 + giveitem_std ITEM_HM02_FLY setflag FLAG_RECEIVED_HM02 return diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 5f77ea023..d954bec1a 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -15,7 +15,7 @@ Route123_EventScript_151C5D:: @ 8151C5D compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem_std ITEM_TM19 + giveitem_std ITEM_TM19_GIGA_DRAIN compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag FLAG_RECEIVED_TM19 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index e18a1e029..b43e0aafe 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -6,7 +6,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 faceplayer goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 - giveitem_std ITEM_HM01 + giveitem_std ITEM_HM01_CUT setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index bcd597541..307617e50 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -25,7 +25,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE end RustboroCity_Gym_EventScript_15793C:: @ 815793C - giveitem_std ITEM_TM39 + giveitem_std ITEM_TM39_ROCK_TOMB compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM39 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 7c715b6c2..06f2dfa82 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -63,7 +63,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if_eq RusturfTunnel_EventScript_15C8EB compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_15C8EB - giveitem_std ITEM_HM04 + giveitem_std ITEM_HM04_STRENGTH setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 58e7c3235..89372bd84 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -6,7 +6,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 faceplayer goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem_std ITEM_TM49 + giveitem_std ITEM_TM49_SNATCH compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag FLAG_RECEIVED_TM49 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 4af912ed3..213fc3163 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -473,8 +473,8 @@ SlateportCity_EventScript_14BE9A:: @ 814BE9A .align 2 SlateportCity_Items2:: @ 814BEB4 - .2byte ITEM_TM10 - .2byte ITEM_TM43 + .2byte ITEM_TM10_HIDDEN_POWER + .2byte ITEM_TM43_SECRET_POWER .2byte ITEM_NONE release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 4151579a2..5f6a3c15d 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -14,7 +14,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E faceplayer goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 - giveitem_std ITEM_TM41 + giveitem_std ITEM_TM41_TORMENT compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag FLAG_RECEIVED_TM41 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index c8ece697d..45ca62167 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -163,7 +163,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 - giveitem_std ITEM_TM46 + giveitem_std ITEM_TM46_THIEF compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag FLAG_RECEIVED_TM46 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 44bcda12f..0ad6aa027 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -106,7 +106,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 - giveitem_std ITEM_TM03 + giveitem_std ITEM_TM03_WATER_PULSE compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 67be3738b..d1b842f7b 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -6,7 +6,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B faceplayer goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 - giveitem_std ITEM_TM31 + giveitem_std ITEM_TM31_BRICK_BREAK setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 85b524c99..3aef08e94 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -103,7 +103,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 faceplayer goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 - giveitem_std ITEM_TM45 + giveitem_std ITEM_TM45_ATTRACT compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag FLAG_RECEIVED_TM45 diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 1f5e074d9..6fe9e9a6e 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -9,7 +9,7 @@ Route111_EventScript_1A3858:: @ 81A3858 end Route111_EventScript_1A3877:: @ 81A3877 - giveitem_std ITEM_TM43 + giveitem_std ITEM_TM43_SECRET_POWER compare RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 diff --git a/include/constants/items.h b/include/constants/items.h index 48fba1427..cde5c7141 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -290,64 +290,64 @@ #define ITEM_ROOT_FOSSIL 286 #define ITEM_CLAW_FOSSIL 287 #define ITEM_DEVON_SCOPE 288 -#define ITEM_TM01 289 -#define ITEM_TM02 290 -#define ITEM_TM03 291 -#define ITEM_TM04 292 -#define ITEM_TM05 293 -#define ITEM_TM06 294 -#define ITEM_TM07 295 -#define ITEM_TM08 296 -#define ITEM_TM09 297 -#define ITEM_TM10 298 -#define ITEM_TM11 299 -#define ITEM_TM12 300 -#define ITEM_TM13 301 -#define ITEM_TM14 302 -#define ITEM_TM15 303 -#define ITEM_TM16 304 -#define ITEM_TM17 305 -#define ITEM_TM18 306 -#define ITEM_TM19 307 -#define ITEM_TM20 308 -#define ITEM_TM21 309 -#define ITEM_TM22 310 -#define ITEM_TM23 311 -#define ITEM_TM24 312 -#define ITEM_TM25 313 -#define ITEM_TM26 314 -#define ITEM_TM27 315 -#define ITEM_TM28 316 -#define ITEM_TM29 317 -#define ITEM_TM30 318 -#define ITEM_TM31 319 -#define ITEM_TM32 320 -#define ITEM_TM33 321 -#define ITEM_TM34 322 -#define ITEM_TM35 323 -#define ITEM_TM36 324 -#define ITEM_TM37 325 -#define ITEM_TM38 326 -#define ITEM_TM39 327 -#define ITEM_TM40 328 -#define ITEM_TM41 329 -#define ITEM_TM42 330 -#define ITEM_TM43 331 -#define ITEM_TM44 332 -#define ITEM_TM45 333 -#define ITEM_TM46 334 -#define ITEM_TM47 335 -#define ITEM_TM48 336 -#define ITEM_TM49 337 -#define ITEM_TM50 338 -#define ITEM_HM01 339 -#define ITEM_HM02 340 -#define ITEM_HM03 341 -#define ITEM_HM04 342 -#define ITEM_HM05 343 -#define ITEM_HM06 344 -#define ITEM_HM07 345 -#define ITEM_HM08 346 +#define ITEM_TM01_FOCUS_PUNCH 289 +#define ITEM_TM02_DRAGON_CLAW 290 +#define ITEM_TM03_WATER_PULSE 291 +#define ITEM_TM04_CALM_MIND 292 +#define ITEM_TM05_ROAR 293 +#define ITEM_TM06_TOXIC 294 +#define ITEM_TM07_HAIL 295 +#define ITEM_TM08_BULK_UP 296 +#define ITEM_TM09_BULLET_SEED 297 +#define ITEM_TM10_HIDDEN_POWER 298 +#define ITEM_TM11_SUNNY_DAY 299 +#define ITEM_TM12_TAUNT 300 +#define ITEM_TM13_ICE_BEAM 301 +#define ITEM_TM14_BLIZZARD 302 +#define ITEM_TM15_HYPER_BEAM 303 +#define ITEM_TM16_LIGHT_SCREEN 304 +#define ITEM_TM17_PROTECT 305 +#define ITEM_TM18_RAIN_DANCE 306 +#define ITEM_TM19_GIGA_DRAIN 307 +#define ITEM_TM20_SAFEGUARD 308 +#define ITEM_TM21_FRUSTRATION 309 +#define ITEM_TM22_SOLARBEAM 310 +#define ITEM_TM23_IRON_TAIL 311 +#define ITEM_TM24_THUNDERBOLT 312 +#define ITEM_TM25_THUNDER 313 +#define ITEM_TM26_EARTHQUAKE 314 +#define ITEM_TM27_RETURN 315 +#define ITEM_TM28_DIG 316 +#define ITEM_TM29_PSYCHIC 317 +#define ITEM_TM30_SHADOW_BALL 318 +#define ITEM_TM31_BRICK_BREAK 319 +#define ITEM_TM32_DOUBLE_TEAM 320 +#define ITEM_TM33_REFLECT 321 +#define ITEM_TM34_SHOCK_WAVE 322 +#define ITEM_TM35_FLAMETHROWER 323 +#define ITEM_TM36_SLUDGE_BOMB 324 +#define ITEM_TM37_SANDSTORM 325 +#define ITEM_TM38_FIRE_BLAST 326 +#define ITEM_TM39_ROCK_TOMB 327 +#define ITEM_TM40_AERIAL_ACE 328 +#define ITEM_TM41_TORMENT 329 +#define ITEM_TM42_FACADE 330 +#define ITEM_TM43_SECRET_POWER 331 +#define ITEM_TM44_REST 332 +#define ITEM_TM45_ATTRACT 333 +#define ITEM_TM46_THIEF 334 +#define ITEM_TM47_STEEL_WING 335 +#define ITEM_TM48_SKILL_SWAP 336 +#define ITEM_TM49_SNATCH 337 +#define ITEM_TM50_OVERHEAT 338 +#define ITEM_HM01_CUT 339 +#define ITEM_HM02_FLY 340 +#define ITEM_HM03_SURF 341 +#define ITEM_HM04_STRENGTH 342 +#define ITEM_HM05_FLASH 343 +#define ITEM_HM06_ROCK_SMASH 344 +#define ITEM_HM07_WATERFALL 345 +#define ITEM_HM08_DIVE 346 #define ITEM_15B 347 #define ITEM_15C 348 diff --git a/src/data/items_de.h b/src/data/items_de.h index 0453a95d0..de4438622 100644 --- a/src/data/items_de.h +++ b/src/data/items_de.h @@ -4626,7 +4626,7 @@ const struct Item gItems[] = }, { .name = _("TM01"), - .itemId = ITEM_TM01, + .itemId = ITEM_TM01_FOCUS_PUNCH, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4642,7 +4642,7 @@ const struct Item gItems[] = }, { .name = _("TM02"), - .itemId = ITEM_TM02, + .itemId = ITEM_TM02_DRAGON_CLAW, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4658,7 +4658,7 @@ const struct Item gItems[] = }, { .name = _("TM03"), - .itemId = ITEM_TM03, + .itemId = ITEM_TM03_WATER_PULSE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4674,7 +4674,7 @@ const struct Item gItems[] = }, { .name = _("TM04"), - .itemId = ITEM_TM04, + .itemId = ITEM_TM04_CALM_MIND, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4690,7 +4690,7 @@ const struct Item gItems[] = }, { .name = _("TM05"), - .itemId = ITEM_TM05, + .itemId = ITEM_TM05_ROAR, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4706,7 +4706,7 @@ const struct Item gItems[] = }, { .name = _("TM06"), - .itemId = ITEM_TM06, + .itemId = ITEM_TM06_TOXIC, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4722,7 +4722,7 @@ const struct Item gItems[] = }, { .name = _("TM07"), - .itemId = ITEM_TM07, + .itemId = ITEM_TM07_HAIL, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4738,7 +4738,7 @@ const struct Item gItems[] = }, { .name = _("TM08"), - .itemId = ITEM_TM08, + .itemId = ITEM_TM08_BULK_UP, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4754,7 +4754,7 @@ const struct Item gItems[] = }, { .name = _("TM09"), - .itemId = ITEM_TM09, + .itemId = ITEM_TM09_BULLET_SEED, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4770,7 +4770,7 @@ const struct Item gItems[] = }, { .name = _("TM10"), - .itemId = ITEM_TM10, + .itemId = ITEM_TM10_HIDDEN_POWER, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4786,7 +4786,7 @@ const struct Item gItems[] = }, { .name = _("TM11"), - .itemId = ITEM_TM11, + .itemId = ITEM_TM11_SUNNY_DAY, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4802,7 +4802,7 @@ const struct Item gItems[] = }, { .name = _("TM12"), - .itemId = ITEM_TM12, + .itemId = ITEM_TM12_TAUNT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4818,7 +4818,7 @@ const struct Item gItems[] = }, { .name = _("TM13"), - .itemId = ITEM_TM13, + .itemId = ITEM_TM13_ICE_BEAM, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4834,7 +4834,7 @@ const struct Item gItems[] = }, { .name = _("TM14"), - .itemId = ITEM_TM14, + .itemId = ITEM_TM14_BLIZZARD, .price = 5500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4850,7 +4850,7 @@ const struct Item gItems[] = }, { .name = _("TM15"), - .itemId = ITEM_TM15, + .itemId = ITEM_TM15_HYPER_BEAM, .price = 7500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4866,7 +4866,7 @@ const struct Item gItems[] = }, { .name = _("TM16"), - .itemId = ITEM_TM16, + .itemId = ITEM_TM16_LIGHT_SCREEN, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4882,7 +4882,7 @@ const struct Item gItems[] = }, { .name = _("TM17"), - .itemId = ITEM_TM17, + .itemId = ITEM_TM17_PROTECT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4898,7 +4898,7 @@ const struct Item gItems[] = }, { .name = _("TM18"), - .itemId = ITEM_TM18, + .itemId = ITEM_TM18_RAIN_DANCE, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4914,7 +4914,7 @@ const struct Item gItems[] = }, { .name = _("TM19"), - .itemId = ITEM_TM19, + .itemId = ITEM_TM19_GIGA_DRAIN, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4930,7 +4930,7 @@ const struct Item gItems[] = }, { .name = _("TM20"), - .itemId = ITEM_TM20, + .itemId = ITEM_TM20_SAFEGUARD, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4946,7 +4946,7 @@ const struct Item gItems[] = }, { .name = _("TM21"), - .itemId = ITEM_TM21, + .itemId = ITEM_TM21_FRUSTRATION, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4962,7 +4962,7 @@ const struct Item gItems[] = }, { .name = _("TM22"), - .itemId = ITEM_TM22, + .itemId = ITEM_TM22_SOLARBEAM, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4978,7 +4978,7 @@ const struct Item gItems[] = }, { .name = _("TM23"), - .itemId = ITEM_TM23, + .itemId = ITEM_TM23_IRON_TAIL, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4994,7 +4994,7 @@ const struct Item gItems[] = }, { .name = _("TM24"), - .itemId = ITEM_TM24, + .itemId = ITEM_TM24_THUNDERBOLT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5010,7 +5010,7 @@ const struct Item gItems[] = }, { .name = _("TM25"), - .itemId = ITEM_TM25, + .itemId = ITEM_TM25_THUNDER, .price = 5500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5026,7 +5026,7 @@ const struct Item gItems[] = }, { .name = _("TM26"), - .itemId = ITEM_TM26, + .itemId = ITEM_TM26_EARTHQUAKE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5042,7 +5042,7 @@ const struct Item gItems[] = }, { .name = _("TM27"), - .itemId = ITEM_TM27, + .itemId = ITEM_TM27_RETURN, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5058,7 +5058,7 @@ const struct Item gItems[] = }, { .name = _("TM28"), - .itemId = ITEM_TM28, + .itemId = ITEM_TM28_DIG, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5074,7 +5074,7 @@ const struct Item gItems[] = }, { .name = _("TM29"), - .itemId = ITEM_TM29, + .itemId = ITEM_TM29_PSYCHIC, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5090,7 +5090,7 @@ const struct Item gItems[] = }, { .name = _("TM30"), - .itemId = ITEM_TM30, + .itemId = ITEM_TM30_SHADOW_BALL, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5106,7 +5106,7 @@ const struct Item gItems[] = }, { .name = _("TM31"), - .itemId = ITEM_TM31, + .itemId = ITEM_TM31_BRICK_BREAK, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5122,7 +5122,7 @@ const struct Item gItems[] = }, { .name = _("TM32"), - .itemId = ITEM_TM32, + .itemId = ITEM_TM32_DOUBLE_TEAM, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5138,7 +5138,7 @@ const struct Item gItems[] = }, { .name = _("TM33"), - .itemId = ITEM_TM33, + .itemId = ITEM_TM33_REFLECT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5154,7 +5154,7 @@ const struct Item gItems[] = }, { .name = _("TM34"), - .itemId = ITEM_TM34, + .itemId = ITEM_TM34_SHOCK_WAVE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5170,7 +5170,7 @@ const struct Item gItems[] = }, { .name = _("TM35"), - .itemId = ITEM_TM35, + .itemId = ITEM_TM35_FLAMETHROWER, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5186,7 +5186,7 @@ const struct Item gItems[] = }, { .name = _("TM36"), - .itemId = ITEM_TM36, + .itemId = ITEM_TM36_SLUDGE_BOMB, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5202,7 +5202,7 @@ const struct Item gItems[] = }, { .name = _("TM37"), - .itemId = ITEM_TM37, + .itemId = ITEM_TM37_SANDSTORM, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5218,7 +5218,7 @@ const struct Item gItems[] = }, { .name = _("TM38"), - .itemId = ITEM_TM38, + .itemId = ITEM_TM38_FIRE_BLAST, .price = 5500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5234,7 +5234,7 @@ const struct Item gItems[] = }, { .name = _("TM39"), - .itemId = ITEM_TM39, + .itemId = ITEM_TM39_ROCK_TOMB, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5250,7 +5250,7 @@ const struct Item gItems[] = }, { .name = _("TM40"), - .itemId = ITEM_TM40, + .itemId = ITEM_TM40_AERIAL_ACE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5266,7 +5266,7 @@ const struct Item gItems[] = }, { .name = _("TM41"), - .itemId = ITEM_TM41, + .itemId = ITEM_TM41_TORMENT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5282,7 +5282,7 @@ const struct Item gItems[] = }, { .name = _("TM42"), - .itemId = ITEM_TM42, + .itemId = ITEM_TM42_FACADE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5298,7 +5298,7 @@ const struct Item gItems[] = }, { .name = _("TM43"), - .itemId = ITEM_TM43, + .itemId = ITEM_TM43_SECRET_POWER, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5314,7 +5314,7 @@ const struct Item gItems[] = }, { .name = _("TM44"), - .itemId = ITEM_TM44, + .itemId = ITEM_TM44_REST, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5330,7 +5330,7 @@ const struct Item gItems[] = }, { .name = _("TM45"), - .itemId = ITEM_TM45, + .itemId = ITEM_TM45_ATTRACT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5346,7 +5346,7 @@ const struct Item gItems[] = }, { .name = _("TM46"), - .itemId = ITEM_TM46, + .itemId = ITEM_TM46_THIEF, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5362,7 +5362,7 @@ const struct Item gItems[] = }, { .name = _("TM47"), - .itemId = ITEM_TM47, + .itemId = ITEM_TM47_STEEL_WING, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5378,7 +5378,7 @@ const struct Item gItems[] = }, { .name = _("TM48"), - .itemId = ITEM_TM48, + .itemId = ITEM_TM48_SKILL_SWAP, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5394,7 +5394,7 @@ const struct Item gItems[] = }, { .name = _("TM49"), - .itemId = ITEM_TM49, + .itemId = ITEM_TM49_SNATCH, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5410,7 +5410,7 @@ const struct Item gItems[] = }, { .name = _("TM50"), - .itemId = ITEM_TM50, + .itemId = ITEM_TM50_OVERHEAT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5442,7 +5442,7 @@ const struct Item gItems[] = }, { .name = _("VM02"), - .itemId = ITEM_HM02, + .itemId = ITEM_HM02_FLY, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5458,7 +5458,7 @@ const struct Item gItems[] = }, { .name = _("VM03"), - .itemId = ITEM_HM03, + .itemId = ITEM_HM03_SURF, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5474,7 +5474,7 @@ const struct Item gItems[] = }, { .name = _("VM04"), - .itemId = ITEM_HM04, + .itemId = ITEM_HM04_STRENGTH, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5490,7 +5490,7 @@ const struct Item gItems[] = }, { .name = _("VM05"), - .itemId = ITEM_HM05, + .itemId = ITEM_HM05_FLASH, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5506,7 +5506,7 @@ const struct Item gItems[] = }, { .name = _("VM06"), - .itemId = ITEM_HM06, + .itemId = ITEM_HM06_ROCK_SMASH, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5522,7 +5522,7 @@ const struct Item gItems[] = }, { .name = _("VM07"), - .itemId = ITEM_HM07, + .itemId = ITEM_HM07_WATERFALL, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5538,7 +5538,7 @@ const struct Item gItems[] = }, { .name = _("VM08"), - .itemId = ITEM_HM08, + .itemId = ITEM_HM08_DIVE, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, diff --git a/src/data/items_en.h b/src/data/items_en.h index a3e822370..3660f4590 100644 --- a/src/data/items_en.h +++ b/src/data/items_en.h @@ -4626,7 +4626,7 @@ const struct Item gItems[] = }, { .name = _("TM01"), - .itemId = ITEM_TM01, + .itemId = ITEM_TM01_FOCUS_PUNCH, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4642,7 +4642,7 @@ const struct Item gItems[] = }, { .name = _("TM02"), - .itemId = ITEM_TM02, + .itemId = ITEM_TM02_DRAGON_CLAW, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4658,7 +4658,7 @@ const struct Item gItems[] = }, { .name = _("TM03"), - .itemId = ITEM_TM03, + .itemId = ITEM_TM03_WATER_PULSE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4674,7 +4674,7 @@ const struct Item gItems[] = }, { .name = _("TM04"), - .itemId = ITEM_TM04, + .itemId = ITEM_TM04_CALM_MIND, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4690,7 +4690,7 @@ const struct Item gItems[] = }, { .name = _("TM05"), - .itemId = ITEM_TM05, + .itemId = ITEM_TM05_ROAR, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4706,7 +4706,7 @@ const struct Item gItems[] = }, { .name = _("TM06"), - .itemId = ITEM_TM06, + .itemId = ITEM_TM06_TOXIC, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4722,7 +4722,7 @@ const struct Item gItems[] = }, { .name = _("TM07"), - .itemId = ITEM_TM07, + .itemId = ITEM_TM07_HAIL, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4738,7 +4738,7 @@ const struct Item gItems[] = }, { .name = _("TM08"), - .itemId = ITEM_TM08, + .itemId = ITEM_TM08_BULK_UP, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4754,7 +4754,7 @@ const struct Item gItems[] = }, { .name = _("TM09"), - .itemId = ITEM_TM09, + .itemId = ITEM_TM09_BULLET_SEED, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4770,7 +4770,7 @@ const struct Item gItems[] = }, { .name = _("TM10"), - .itemId = ITEM_TM10, + .itemId = ITEM_TM10_HIDDEN_POWER, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4786,7 +4786,7 @@ const struct Item gItems[] = }, { .name = _("TM11"), - .itemId = ITEM_TM11, + .itemId = ITEM_TM11_SUNNY_DAY, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4802,7 +4802,7 @@ const struct Item gItems[] = }, { .name = _("TM12"), - .itemId = ITEM_TM12, + .itemId = ITEM_TM12_TAUNT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4818,7 +4818,7 @@ const struct Item gItems[] = }, { .name = _("TM13"), - .itemId = ITEM_TM13, + .itemId = ITEM_TM13_ICE_BEAM, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4834,7 +4834,7 @@ const struct Item gItems[] = }, { .name = _("TM14"), - .itemId = ITEM_TM14, + .itemId = ITEM_TM14_BLIZZARD, .price = 5500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4850,7 +4850,7 @@ const struct Item gItems[] = }, { .name = _("TM15"), - .itemId = ITEM_TM15, + .itemId = ITEM_TM15_HYPER_BEAM, .price = 7500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4866,7 +4866,7 @@ const struct Item gItems[] = }, { .name = _("TM16"), - .itemId = ITEM_TM16, + .itemId = ITEM_TM16_LIGHT_SCREEN, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4882,7 +4882,7 @@ const struct Item gItems[] = }, { .name = _("TM17"), - .itemId = ITEM_TM17, + .itemId = ITEM_TM17_PROTECT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4898,7 +4898,7 @@ const struct Item gItems[] = }, { .name = _("TM18"), - .itemId = ITEM_TM18, + .itemId = ITEM_TM18_RAIN_DANCE, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4914,7 +4914,7 @@ const struct Item gItems[] = }, { .name = _("TM19"), - .itemId = ITEM_TM19, + .itemId = ITEM_TM19_GIGA_DRAIN, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4930,7 +4930,7 @@ const struct Item gItems[] = }, { .name = _("TM20"), - .itemId = ITEM_TM20, + .itemId = ITEM_TM20_SAFEGUARD, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4946,7 +4946,7 @@ const struct Item gItems[] = }, { .name = _("TM21"), - .itemId = ITEM_TM21, + .itemId = ITEM_TM21_FRUSTRATION, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4962,7 +4962,7 @@ const struct Item gItems[] = }, { .name = _("TM22"), - .itemId = ITEM_TM22, + .itemId = ITEM_TM22_SOLARBEAM, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4978,7 +4978,7 @@ const struct Item gItems[] = }, { .name = _("TM23"), - .itemId = ITEM_TM23, + .itemId = ITEM_TM23_IRON_TAIL, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -4994,7 +4994,7 @@ const struct Item gItems[] = }, { .name = _("TM24"), - .itemId = ITEM_TM24, + .itemId = ITEM_TM24_THUNDERBOLT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5010,7 +5010,7 @@ const struct Item gItems[] = }, { .name = _("TM25"), - .itemId = ITEM_TM25, + .itemId = ITEM_TM25_THUNDER, .price = 5500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5026,7 +5026,7 @@ const struct Item gItems[] = }, { .name = _("TM26"), - .itemId = ITEM_TM26, + .itemId = ITEM_TM26_EARTHQUAKE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5042,7 +5042,7 @@ const struct Item gItems[] = }, { .name = _("TM27"), - .itemId = ITEM_TM27, + .itemId = ITEM_TM27_RETURN, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5058,7 +5058,7 @@ const struct Item gItems[] = }, { .name = _("TM28"), - .itemId = ITEM_TM28, + .itemId = ITEM_TM28_DIG, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5074,7 +5074,7 @@ const struct Item gItems[] = }, { .name = _("TM29"), - .itemId = ITEM_TM29, + .itemId = ITEM_TM29_PSYCHIC, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5090,7 +5090,7 @@ const struct Item gItems[] = }, { .name = _("TM30"), - .itemId = ITEM_TM30, + .itemId = ITEM_TM30_SHADOW_BALL, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5106,7 +5106,7 @@ const struct Item gItems[] = }, { .name = _("TM31"), - .itemId = ITEM_TM31, + .itemId = ITEM_TM31_BRICK_BREAK, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5122,7 +5122,7 @@ const struct Item gItems[] = }, { .name = _("TM32"), - .itemId = ITEM_TM32, + .itemId = ITEM_TM32_DOUBLE_TEAM, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5138,7 +5138,7 @@ const struct Item gItems[] = }, { .name = _("TM33"), - .itemId = ITEM_TM33, + .itemId = ITEM_TM33_REFLECT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5154,7 +5154,7 @@ const struct Item gItems[] = }, { .name = _("TM34"), - .itemId = ITEM_TM34, + .itemId = ITEM_TM34_SHOCK_WAVE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5170,7 +5170,7 @@ const struct Item gItems[] = }, { .name = _("TM35"), - .itemId = ITEM_TM35, + .itemId = ITEM_TM35_FLAMETHROWER, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5186,7 +5186,7 @@ const struct Item gItems[] = }, { .name = _("TM36"), - .itemId = ITEM_TM36, + .itemId = ITEM_TM36_SLUDGE_BOMB, .price = 1000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5202,7 +5202,7 @@ const struct Item gItems[] = }, { .name = _("TM37"), - .itemId = ITEM_TM37, + .itemId = ITEM_TM37_SANDSTORM, .price = 2000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5218,7 +5218,7 @@ const struct Item gItems[] = }, { .name = _("TM38"), - .itemId = ITEM_TM38, + .itemId = ITEM_TM38_FIRE_BLAST, .price = 5500, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5234,7 +5234,7 @@ const struct Item gItems[] = }, { .name = _("TM39"), - .itemId = ITEM_TM39, + .itemId = ITEM_TM39_ROCK_TOMB, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5250,7 +5250,7 @@ const struct Item gItems[] = }, { .name = _("TM40"), - .itemId = ITEM_TM40, + .itemId = ITEM_TM40_AERIAL_ACE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5266,7 +5266,7 @@ const struct Item gItems[] = }, { .name = _("TM41"), - .itemId = ITEM_TM41, + .itemId = ITEM_TM41_TORMENT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5282,7 +5282,7 @@ const struct Item gItems[] = }, { .name = _("TM42"), - .itemId = ITEM_TM42, + .itemId = ITEM_TM42_FACADE, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5298,7 +5298,7 @@ const struct Item gItems[] = }, { .name = _("TM43"), - .itemId = ITEM_TM43, + .itemId = ITEM_TM43_SECRET_POWER, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5314,7 +5314,7 @@ const struct Item gItems[] = }, { .name = _("TM44"), - .itemId = ITEM_TM44, + .itemId = ITEM_TM44_REST, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5330,7 +5330,7 @@ const struct Item gItems[] = }, { .name = _("TM45"), - .itemId = ITEM_TM45, + .itemId = ITEM_TM45_ATTRACT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5346,7 +5346,7 @@ const struct Item gItems[] = }, { .name = _("TM46"), - .itemId = ITEM_TM46, + .itemId = ITEM_TM46_THIEF, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5362,7 +5362,7 @@ const struct Item gItems[] = }, { .name = _("TM47"), - .itemId = ITEM_TM47, + .itemId = ITEM_TM47_STEEL_WING, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5378,7 +5378,7 @@ const struct Item gItems[] = }, { .name = _("TM48"), - .itemId = ITEM_TM48, + .itemId = ITEM_TM48_SKILL_SWAP, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5394,7 +5394,7 @@ const struct Item gItems[] = }, { .name = _("TM49"), - .itemId = ITEM_TM49, + .itemId = ITEM_TM49_SNATCH, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5410,7 +5410,7 @@ const struct Item gItems[] = }, { .name = _("TM50"), - .itemId = ITEM_TM50, + .itemId = ITEM_TM50_OVERHEAT, .price = 3000, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5426,7 +5426,7 @@ const struct Item gItems[] = }, { .name = _("HM01"), - .itemId = ITEM_HM01, + .itemId = ITEM_HM01_CUT, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5442,7 +5442,7 @@ const struct Item gItems[] = }, { .name = _("HM02"), - .itemId = ITEM_HM02, + .itemId = ITEM_HM02_FLY, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5458,7 +5458,7 @@ const struct Item gItems[] = }, { .name = _("HM03"), - .itemId = ITEM_HM03, + .itemId = ITEM_HM03_SURF, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5474,7 +5474,7 @@ const struct Item gItems[] = }, { .name = _("HM04"), - .itemId = ITEM_HM04, + .itemId = ITEM_HM04_STRENGTH, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5490,7 +5490,7 @@ const struct Item gItems[] = }, { .name = _("HM05"), - .itemId = ITEM_HM05, + .itemId = ITEM_HM05_FLASH, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5506,7 +5506,7 @@ const struct Item gItems[] = }, { .name = _("HM06"), - .itemId = ITEM_HM06, + .itemId = ITEM_HM06_ROCK_SMASH, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5522,7 +5522,7 @@ const struct Item gItems[] = }, { .name = _("HM07"), - .itemId = ITEM_HM07, + .itemId = ITEM_HM07_WATERFALL, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, @@ -5538,7 +5538,7 @@ const struct Item gItems[] = }, { .name = _("HM08"), - .itemId = ITEM_HM08, + .itemId = ITEM_HM08_DIVE, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 02cd22d56..6c7e8c1e2 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -1,431 +1,9390 @@ -// - -// - -#ifndef POKERUBY_TMHM_LEARNSETS_H -#define POKERUBY_TMHM_LEARNSETS_H - -// TO-DO: Rewrite this declaration to allow assignment of TM/HM learns by name. -// These are 58-bit numbers aligned to 64 bits. The least significant bit represents TM01, -// while the most significant bit represents HM08. - -asm( - ".align 2\n" - ".global gTMHMLearnsets\n" - "gTMHMLearnsets:\n" - - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ?????????? - ".8byte 0b0011100100000111100000100010000100001101010000011100100000\n" // Bulbasaur - ".8byte 0b0011100100000111100000100010000100001101010000011100100000\n" // Ivysaur - ".8byte 0b0011100100000111100000100010000110001101010100011100110000\n" // Venusaur - ".8byte 0b0010100110000111101010010011001100010100010000011000100011\n" // Charmander - ".8byte 0b0010100110000111101010010011001100010100010000011000100011\n" // Charmeleon - ".8byte 0b0010101110010111101010010011001110010100010100011000110011\n" // Charizard - ".8byte 0b1110110000000111100000000011001100010100110011001001100101\n" // Squirtle - ".8byte 0b1110110000000111100000000011001100010100110011001001100101\n" // Wartortle - ".8byte 0b1110110000000111100000000011001110010100110111001001110101\n" // Blastoise - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Caterpie - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Metapod - ".8byte 0b0001000000101111101000000010110100001111110100011000100000\n" // Butterfree - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Weedle - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Kakuna - ".8byte 0b0010000100001111101000100011000100001101010100011000100000\n" // Beedrill - ".8byte 0b0000001000011111101000000010000100000100110000011000100000\n" // Pidgey - ".8byte 0b0000001000011111101000000010000100000100110000011000100000\n" // Pidgeotto - ".8byte 0b0000001000011111101000000010000100000100110100011000100000\n" // Pidgeot - ".8byte 0b0010000100001111100000001010101101110100110011111000100000\n" // Rattata - ".8byte 0b0010100100001111100000001010101101110100110111111000110000\n" // Raticate - ".8byte 0b0000001000011111101000000010000100000100110000011000100000\n" // Spearow - ".8byte 0b0000001000011111101000000010000100000100110100011000100000\n" // Fearow - ".8byte 0b0000100001001111110000100010001110010101110000011000100000\n" // Ekans - ".8byte 0b0000100001001111110000100010001110010101110100011000100000\n" // Arbok - ".8byte 0b0011100000000111100000001011001101110100111000001000100001\n" // Pikachu - ".8byte 0b0011100000001111100000001011001101110100111100001000100001\n" // Raichu - ".8byte 0b0010100100001111101101000011001110010100010000011000100001\n" // Sandshrew - ".8byte 0b0010100100001111101101000011001110010100010100011000100001\n" // Sandslash - ".8byte 0b0010100100001111101000101010001101110100110011011000100100\n" // Nidoran♀ - ".8byte 0b0010100100001111101000101010001101110100110011011000100100\n" // Nidorina - ".8byte 0b0010110100001111111111111011101111110100110111111000110101\n" // Nidoqueen - ".8byte 0b0010100100001111100000101010001101110100110011011000100100\n" // Nidoran♂ - ".8byte 0b0010100100001111100000101010001101110100110011011000100100\n" // Nidorino - ".8byte 0b0010110100001111110111111011101111110100110111111000110101\n" // Nidoking - ".8byte 0b0001100001000111100010011111111101111110111011011000101101\n" // Clefairy - ".8byte 0b0001100001000111100010011111111101111110111111011000101101\n" // Clefable - ".8byte 0b0000000010000111100010010010001100010110010000011000110000\n" // Vulpix - ".8byte 0b0000000010000111100010010010001100010110010100011000110000\n" // Ninetales - ".8byte 0b0001100001000111100010011111111101101110111011011000100101\n" // Jigglypuff - ".8byte 0b0001100001000111100010011111111101101110111111011000100101\n" // Wigglytuff - ".8byte 0b0000000001011111111000100010100100000101110000111000100000\n" // Zubat - ".8byte 0b0000000001011111111000100010100100000101110100111000100000\n" // Golbat - ".8byte 0b0001000100000111100000100010000100001101010000011100100000\n" // Oddish - ".8byte 0b0001000100000111100000100010000100001101010000011100100000\n" // Gloom - ".8byte 0b0001000100000111100000100010000100001101010100011100100000\n" // Vileplume - ".8byte 0b0011000100001111101000100010001100001101010000011100100000\n" // Paras - ".8byte 0b0011000100001111101000100010001100001101010100011100100000\n" // Parasect - ".8byte 0b0001000000101111100000100010010100001101010000011000100000\n" // Venonat - ".8byte 0b0001000000101111101000100010010100001101010100011000100000\n" // Venomoth - ".8byte 0b0010000100001111101100100010001110000100010000011000100000\n" // Diglett - ".8byte 0b0010000100001111101100100010001110000100010100011000100000\n" // Dugtrio - ".8byte 0b0001000101001111111000001010101101110100110000111000100100\n" // Meowth - ".8byte 0b0001000101001111111000001010101101110100110100111000110100\n" // Persian - ".8byte 0b1111110000000111101000000011001100010100110011001001101101\n" // Psyduck - ".8byte 0b1111110000000111101000000011001100010100110111001001101101\n" // Golduck - ".8byte 0b0010100010001111101100000011001111110100110000111010100001\n" // Mankey - ".8byte 0b0010100010001111101100000011001111110100110100111010100001\n" // Primeape - ".8byte 0b0010100010001111101010010010001100010100010000011000110000\n" // Growlithe - ".8byte 0b0010100010001111101010010010001100010100010100011000110000\n" // Arcanine - ".8byte 0b1100010000001111100000000010011100000100110011001001100100\n" // Poliwag - ".8byte 0b1110110000001111100000000011011110000100110011001001100101\n" // Poliwhirl - ".8byte 0b1110110000001111100100000011011110000100110111001011100101\n" // Poliwrath - ".8byte 0b0001000001101111110000001110110100010110111000111000101001\n" // Abra - ".8byte 0b0001000001101111110000001110110100010110111000111000101001\n" // Kadabra - ".8byte 0b0001000001101111110000001110110100010110111100111000101001\n" // Alakazam - ".8byte 0b0010100000001111100110010011001110000100110000011010100001\n" // Machop - ".8byte 0b0010100000001111100110010011001110000100110000011010100001\n" // Machoke - ".8byte 0b0010100000001111100110010011001110000100110100011010100001\n" // Machamp - ".8byte 0b0001000100001111100000100010000100001101010000011100100000\n" // Bellsprout - ".8byte 0b0001000100001111100000100010000100001101010000011100100000\n" // Weepinbell - ".8byte 0b0001000100001111100000100010000100001101010100011100100000\n" // Victreebel - ".8byte 0b1100010100001111100000100010000100000101110011001001100100\n" // Tentacool - ".8byte 0b1100010100001111100000100010000100000101110111001001100100\n" // Tentacruel - ".8byte 0b0010100000000111100111010011001110000100010000011000100001\n" // Geodude - ".8byte 0b0010100000000111100111010011001110000100010000011000100001\n" // Graveler - ".8byte 0b0010100000000111100111010011001110000100010100011000110001\n" // Golem - ".8byte 0b0000100010000111100010010010000100011100010000011000100000\n" // Ponyta - ".8byte 0b0000100010000111100010010010000100011100010100011000100000\n" // Rapidash - ".8byte 0b1001110000100111100010010010111110010110110011011001101100\n" // Slowpoke - ".8byte 0b1011110000100111100010010011111110010110110111011001101101\n" // Slowbro - ".8byte 0b0001000000000011100000001110000101100100110000011000100000\n" // Magnemite - ".8byte 0b0001000000000011100000001110000101100100110100011000100000\n" // Magneton - ".8byte 0b0000001100011111101000000010000100010100010000011000100000\n" // Farfetch'd - ".8byte 0b0000001000011111101000000010000100000100010000011000100000\n" // Doduo - ".8byte 0b0000001000011111111000000010000100000100010100111000100000\n" // Dodrio - ".8byte 0b1100010000001111100000000010000100000110110011001001100100\n" // Seel - ".8byte 0b1100010000001111100000000010000100000110110111001001100100\n" // Dewgong - ".8byte 0b0000000000001111110110111010001101100101110000111000100000\n" // Grimer - ".8byte 0b0010100000001111110110111011001101100101110100111000100001\n" // Muk - ".8byte 0b1000010000000111100000000010000100000100110011001001100100\n" // Shellder - ".8byte 0b1000010000000111110000000010000100000100110111001001100100\n" // Cloyster - ".8byte 0b0000000001101111110000100010110100100101110000111000100000\n" // Gastly - ".8byte 0b0000000001101111110000100010110100100101110000111000100000\n" // Haunter - ".8byte 0b0010100001101111110000100011110101100101110100111000100001\n" // Gengar - ".8byte 0b0010100000000111110101000010001110010100010000111000110000\n" // Onix - ".8byte 0b0001000001101111110000000111110100000110111000111000101001\n" // Drowzee - ".8byte 0b0001000001101111110000000111110100000110111100111000101001\n" // Hypno - ".8byte 0b1010110100001111100100000010001100000100110011001001100100\n" // Krabby - ".8byte 0b1010110100001111100100000010001100000100110111001001100100\n" // Kingler - ".8byte 0b0001000000001011110000001010000101100100111000101000100000\n" // Voltorb - ".8byte 0b0001000000001011110000001010000101100100111100101000100000\n" // Electrode - ".8byte 0b0001100000101111100000100110010100001101011000011100100000\n" // Exeggcute - ".8byte 0b0001100000101111100000100110010100001101011100011100100000\n" // Exeggutor - ".8byte 0b0010100000001111101111010011001110010100010011011000100001\n" // Cubone - ".8byte 0b0010100000001111101111010011001110010100010111011000100001\n" // Marowak - ".8byte 0b0010100000001111100100000011000110000100110000011010100001\n" // Hitmonlee - ".8byte 0b0010100000001111100100000011000110000100110000011010100001\n" // Hitmonchan - ".8byte 0b0010110100001111100111011011101111111100110111011000100101\n" // Lickitung - ".8byte 0b0001000000001111110010111010100101100100110000111000100000\n" // Koffing - ".8byte 0b0001000000001111110010111010100101100100110100111000100000\n" // Weezing - ".8byte 0b0010100000001111100111011010001111110100110011011000110000\n" // Rhyhorn - ".8byte 0b0010110100001111100111011011001111110100110111011000110001\n" // Rhydon - ".8byte 0b0011100001100111100111011011110111111110111111011001101101\n" // Chansey - ".8byte 0b0011000100001111100000100010000100001101010100011100100000\n" // Tangela - ".8byte 0b0010110100001111101111011011101111111100110111011001110101\n" // Kangaskhan - ".8byte 0b1100010000000111100000000010000100000100110011001001100100\n" // Horsea - ".8byte 0b1100010000000111100000000010000100000100110111001001100100\n" // Seadra - ".8byte 0b1100010000000111100000000010000100000100110011001001100100\n" // Goldeen - ".8byte 0b1100010000000111100000000010000100000100110111001001100100\n" // Seaking - ".8byte 0b1101010000000011100000000110010101100100111011001001100100\n" // Staryu - ".8byte 0b1101010000100011100000000110010101100100111111001001100100\n" // Starmie - ".8byte 0b0001000001101111110000001111110101101110111100111000101001\n" // Mr. mime - ".8byte 0b0010000100011111101000000010000100000100110100011000100000\n" // Scyther - ".8byte 0b0001000000101111110000000111110100000100111111101001101101\n" // Jynx - ".8byte 0b0011100000001111100000001011010101110100111100001000100001\n" // Electabuzz - ".8byte 0b0010100000001111100010010011010100010100010100011000100001\n" // Magmar - ".8byte 0b0010100100001111100100000011001110000100110100011010100001\n" // Pinsir - ".8byte 0b0010110000000111100111011010000111111100110111011000100100\n" // Tauros - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Magikarp - ".8byte 0b1110110000000111110011010010000111100100110111101001110100\n" // Gyarados - ".8byte 0b1110110000000111100000001010010101110110110111001001110100\n" // Lapras - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Ditto - ".8byte 0b0000000000000111100000000010101100010100110000011000100000\n" // Eevee - ".8byte 0b1100010000000111100000000010101100010100110111011001110100\n" // Vaporeon - ".8byte 0b0001000000000111100000001010101101110100110100011000110000\n" // Jolteon - ".8byte 0b0000000010000111100010010010101100010100110100011000110000\n" // Flareon - ".8byte 0b0001000000001011101000001010110101111100110111011000100000\n" // Porygon - ".8byte 0b1110010000001111100101000010000100000100110011001001100100\n" // Omanyte - ".8byte 0b1110010000001111100101000010000100000100110111001001100100\n" // Omastar - ".8byte 0b0110010000001111101101000010001100000101110011001001100100\n" // Kabuto - ".8byte 0b1110010100001111101101000011001100000101110111001001100100\n" // Kabutops - ".8byte 0b0010101000011111111111010010000110010100110100111000110010\n" // Aerodactyl - ".8byte 0b0000110000000111100111011011110111101100110111011000100101\n" // Snorlax - ".8byte 0b0010001000010011101001000110000100000100110111011001110100\n" // Articuno - ".8byte 0b0011001000010011101001001010000101100100111100011000110000\n" // Zapdos - ".8byte 0b0010001010010011101011010010000100000110110100011000110000\n" // Moltres - ".8byte 0b0100010000000111100010011010000101110110110111011001100100\n" // Dratini - ".8byte 0b0100010000000111100010011010000101110110110111011001100100\n" // Dragonair - ".8byte 0b1110111100010111101111011011000111110110110111011001110111\n" // Dragonite - ".8byte 0b0011100001100011111111011111110111111110111111111011101101\n" // Mewtwo - ".8byte 0b1111111111111111111111111111111111111111111111111111111111\n" // Mew - ".8byte 0b0001000100000111100000000110000100011111011000011100100000\n" // Chikorita - ".8byte 0b0011100100000111100000000110000100011111011000011100100000\n" // Bayleef - ".8byte 0b0011100100000111100000000110000110011111011100011100100000\n" // Meganium - ".8byte 0b0000000110000111101010010010001100000100010000011000100000\n" // Cyndaquil - ".8byte 0b0010100110000111101010010011001100000100010000011000110001\n" // Quilava - ".8byte 0b0010100110000111101010010011001110000100010100011000110001\n" // Typhlosion - ".8byte 0b1100010100000111101000000011001100010100110011001001100101\n" // Totodile - ".8byte 0b1110110100000111101000000011001100010100110011001001110101\n" // Croconaw - ".8byte 0b1110110100000111101000000011001110010100110111001001110111\n" // Feraligatr - ".8byte 0b0000010100001111100000011011101100111100110001011000100101\n" // Sentret - ".8byte 0b0010110100001111100000011011101101111100110111011000100101\n" // Furret - ".8byte 0b0001001000011111101000000110110100000100110000011000100000\n" // Hoothoot - ".8byte 0b0001001000011111101000000110110100000100110100011000100000\n" // Noctowl - ".8byte 0b0001000000001111101000000111001100001111011000011000100001\n" // Ledyba - ".8byte 0b0001000000001111101000000111001100001111011100011000100001\n" // Ledian - ".8byte 0b0001000000001111100000100010011100001101010000011000100000\n" // Spinarak - ".8byte 0b0001000000001111100000100010011100001101010100011000100000\n" // Ariados - ".8byte 0b0000001001011111111000100010100100000101110100111000100000\n" // Crobat - ".8byte 0b1101010000000111100000001010000101100100110011001001100100\n" // Chinchou - ".8byte 0b1101010000000111100000001010000101100100110111001001100100\n" // Lanturn - ".8byte 0b0001000000000111100000001010000101110100111000001000100000\n" // Pichu - ".8byte 0b0001000000000111100010011110111100011110111000011000100100\n" // Cleffa - ".8byte 0b0001000000000111100010011110111100001110111000011000100100\n" // Igglybuff - ".8byte 0b0011000000000111100010011110110100001110111000011000100100\n" // Togepi - ".8byte 0b0011001000010111101010011111110100001110111100011000100101\n" // Togetic - ".8byte 0b0001000000111111101000000110110100001101111000011000101000\n" // Natu - ".8byte 0b0001001000111111101000000110110100001101111100011000101000\n" // Xatu - ".8byte 0b0001000000000111100000001010000101110100111000001000100000\n" // Mareep - ".8byte 0b0011100000000111100000001011000101110100111000001000100001\n" // Flaaffy - ".8byte 0b0011100000000111100000001011000101110100111100001000100001\n" // Ampharos - ".8byte 0b0001000100000111100000100010000100001111010100011100100000\n" // Bellossom - ".8byte 0b1110110000000111100000000011001100010100110011001001100101\n" // Marill - ".8byte 0b1110110000000111100000000011001100010100110111001001100101\n" // Azumarill - ".8byte 0b0010100000001111100101000011001110000100010000111000101001\n" // Sudowoodo - ".8byte 0b1110110000001111100000000011011110000100110111001001100101\n" // Politoed - ".8byte 0b0001000000000111101000000010000100001101010000011100100000\n" // Hoppip - ".8byte 0b0001000000000111101000000010000100001101010000011100100000\n" // Skiploom - ".8byte 0b0001000000000111101000000010000100001101010100011100100000\n" // Jumpluff - ".8byte 0b0010100101001111101000001011101101111100110000111000100101\n" // Aipom - ".8byte 0b0001000100000111100000100010000100001111011000011100100000\n" // Sunkern - ".8byte 0b0001000100000111100000100010000100001111011100011100100000\n" // Sunflora - ".8byte 0b0001000000011111101000000010110100001101010000011000100000\n" // Yanma - ".8byte 0b1111010000000111100001100010001110010100110011001001100100\n" // Wooper - ".8byte 0b1111110000000111100101100011001110010100110111001001100101\n" // Quagsire - ".8byte 0b0001000100100111100000000110111100010100111100011000101000\n" // Espeon - ".8byte 0b0001000101000111110000000010111100010100110100111000100000\n" // Umbreon - ".8byte 0b0000001001011111111000000010100100000100110000111000101000\n" // Murkrow - ".8byte 0b1011110000100111100010010011111110010110110111011001101101\n" // Slowking - ".8byte 0b0001000001101111111000001010110101100100110000111000101000\n" // Misdreavus - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Unown - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Wobbuffet - ".8byte 0b0011100000101111100000001110110111110100111000011000101000\n" // Girafarig - ".8byte 0b0010100000000111100001000110001110001101011000011000100000\n" // Pineco - ".8byte 0b0010100000000111100001000110001110001101011100011000100000\n" // Forretress - ".8byte 0b0010100000001111100110011010101111111100110011011000101100\n" // Dunsparce - ".8byte 0b0010100100011111101101100010001110010100110000011000100000\n" // Gligar - ".8byte 0b0010100100000111110101000010001110010100010100111000110000\n" // Steelix - ".8byte 0b0010100010001111110010111011101111101100110000111010110101\n" // Snubbull - ".8byte 0b0010100010001111110110111011101111111100110100111010110101\n" // Granbull - ".8byte 0b1100010000000111100000101010100100000100110011001001100100\n" // Qwilfish - ".8byte 0b0010100100011111101001000010000100000100110100011000100000\n" // Scizor - ".8byte 0b0011100000000111100101100010001110000110010000011000100000\n" // Shuckle - ".8byte 0b0010100100001111100100000011001110000100110100011010100001\n" // Heracross - ".8byte 0b0010110101001111111000000011101100010100110011111001101001\n" // Sneasel - ".8byte 0b0010100100001111111000000011001110000100110000111010110001\n" // Teddiursa - ".8byte 0b0010100100001111111100000011001110000100110100111010110001\n" // Ursaring - ".8byte 0b0010000010000111100010010110000100000100011000011000100000\n" // Slugma - ".8byte 0b0010100010000111100111010110000110000100011100011000100000\n" // Magcargo - ".8byte 0b0010100000000111100101000110001110000100111011001001110000\n" // Swinub - ".8byte 0b0010100000000111100101000110001110000100111111001001110000\n" // Piloswine - ".8byte 0b0010110000000111100101000110111110000110111011011001101100\n" // Corsola - ".8byte 0b1100010000001111100010010010010100000100110111011000100100\n" // Remoraid - ".8byte 0b1100010000001111100010110010010100000100110111011100100100\n" // Octillery - ".8byte 0b0000001000001111101000000010000100000100110011001001100101\n" // Delibird - ".8byte 0b1100010000000111101000000010000110000100110011001001100100\n" // Mantine - ".8byte 0b0010001100011111111001000010000100000100010000111000110000\n" // Skarmory - ".8byte 0b0010000011001111110010110010100100011100010000111000110000\n" // Houndour - ".8byte 0b0010100011001111110010110010100100011100010100111000110000\n" // Houndoom - ".8byte 0b1100010000000111100000000010000100000100110111001001100100\n" // Kingdra - ".8byte 0b0010100000000111100101000010000110010100010000011000110000\n" // Phanpy - ".8byte 0b0010100000000111100101000010000110010100010100011000110000\n" // Donphan - ".8byte 0b0001000000001011101000001010110101111100110111011000100000\n" // Porygon2 - ".8byte 0b0001000000101111100000001110110111111100111000011000111000\n" // Stantler - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Smeargle - ".8byte 0b0010100000001111100000000011000110000100110000011010100000\n" // Tyrogue - ".8byte 0b0010100000001111100001000011001110000100110000011010100000\n" // Hitmontop - ".8byte 0b0001000000101111100000000110110100000100111011001001101100\n" // Smoochum - ".8byte 0b0011000000001111100000001011010101100100111000001000100001\n" // Elekid - ".8byte 0b0010000000001111100010010011010100010100010000011000100001\n" // Magby - ".8byte 0b0010110000000111100101001011100111111100110111011000100101\n" // Miltank - ".8byte 0b0011100001100111100111011011110111111110111111011001101101\n" // Blissey - ".8byte 0b0011100100000011100001001110001101110100110100011000111000\n" // Raikou - ".8byte 0b0011100100000011100011010110001100011100110100011000111000\n" // Entei - ".8byte 0b1110010100000011100001000110001100010100110111011001111100\n" // Suicune - ".8byte 0b0010000000000111110001000011001110000100110100111000100000\n" // Larvitar - ".8byte 0b0010000000000111110001000011001110000100110100111000100000\n" // Pupitar - ".8byte 0b0010110100000111111111011011001111110100110111111000110111\n" // Tyranitar - ".8byte 0b1110111000110011101001001110110111110111111111011001111100\n" // Lugia - ".8byte 0b0011101010010011101011011110110111101111111100011000111000\n" // Ho-Oh - ".8byte 0b0001000100100011101001001110110100001111111100011000101100\n" // Celebi - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // ? - ".8byte 0b0011100100000111101100000011001100011111010000011100100001\n" // Treecko - ".8byte 0b0011100100000111101100000011001100011111010000011100100001\n" // Grovyle - ".8byte 0b0011100100000111101100000011001110011111010100011100110011\n" // Sceptile - ".8byte 0b0010100110000111101110010010001100000100010000011000100000\n" // Torchic - ".8byte 0b0010100110000111101110010011001100000100010000011010100001\n" // Combusken - ".8byte 0b0010100110000111101110010011001110000100010100011010110001\n" // Blaziken - ".8byte 0b1110110000000111100100000010001100010100110011001001100100\n" // Mudkip - ".8byte 0b1110110000000111100100000010001110010100110011001001100100\n" // Marshtomp - ".8byte 0b1110110000000111100100000011001110010100110111001001110101\n" // Swampert - ".8byte 0b0010000001001111110000000010101100010100110000111000110000\n" // Poochyena - ".8byte 0b0010100001001111110000000010101100010100110100111000110000\n" // Mightyena - ".8byte 0b0010010100001111100000001010101101110100110011011000100100\n" // Zigzagoon - ".8byte 0b0010110100001111100000001010101101110100110111011000110100\n" // Linoone - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Wurmple - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Silcoon - ".8byte 0b0001000000001111101000000010110100001111010100011000100000\n" // Beautifly - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Cascoon - ".8byte 0b0001000000001111101000100010110100001101011100011000100000\n" // Dustox - ".8byte 0b0001010000001111100000000010000100001101110011011101100100\n" // Lotad - ".8byte 0b1111110000001111100000000011000100001101110011011101100100\n" // Lombre - ".8byte 0b1111110000001111100000000011000100001101110111011101100101\n" // Ludicolo - ".8byte 0b0011000000000111100000000010101100001101010000011100100000\n" // Seedot - ".8byte 0b0011100100001111110100000011101100001101010100011100100000\n" // Nuzleaf - ".8byte 0b0011100100001111111100000011101100001101010100011100100000\n" // Shiftry - ".8byte 0b0001000100000011101001000010101100001101010000011000100000\n" // Nincada - ".8byte 0b0001000100001111101001000010101100001101010100011000100000\n" // Ninjask - ".8byte 0b0001000100001011101001000010101100001101010100011000100000\n" // Shedinja - ".8byte 0b0000001000011111101000000010000100000100110000011000100000\n" // Taillow - ".8byte 0b0000001000011111101000000010000100000100110100011000100000\n" // Swellow - ".8byte 0b0001000001000111100000100010000100001111010000011100100000\n" // Shroomish - ".8byte 0b0011100101000111100000100011000100011111010100011110100001\n" // Breloom - ".8byte 0b0011100001101111100100001011111100000110110000011000101101\n" // Spinda - ".8byte 0b0000001000011111101000001010000100000100110011001001100100\n" // Wingull - ".8byte 0b0000011000011111101000001010000100000100110111001001100100\n" // Pelipper - ".8byte 0b0001000000001111100000000010100100001101110011011000100100\n" // Surskit - ".8byte 0b0001000000001111101000000010100100001101110111011000100100\n" // Masquerain - ".8byte 0b1110110000000111100100000010000110000100110011001001110100\n" // Wailmer - ".8byte 0b1110110000000111100100000010000110000100110111001001110100\n" // Wailord - ".8byte 0b0001000000000111100000001010101101111110110011011000101100\n" // Skitty - ".8byte 0b0011100000000111100000001010101101111110110111011000101100\n" // Delcatty - ".8byte 0b0011100101101111101110011011101101111100110011011000100101\n" // Kecleon - ".8byte 0b0001000000100011100101000110111110001100111001011000100000\n" // Baltoy - ".8byte 0b0011100000100011100101000110111110001100111101011000100000\n" // Claydol - ".8byte 0b0010100000000111110101001010000111100100010000111000100000\n" // Nosepass - ".8byte 0b0010100010000111100010110010000100010100010000011000100000\n" // Torkoal - ".8byte 0b0011000101001111111100001011111100000100110000111000101101\n" // Sableye - ".8byte 0b1100010000000111100101000010000110000100110011001001100100\n" // Barboach - ".8byte 0b1110110000000111100101000010000110000100110111001001100100\n" // Whiscash - ".8byte 0b1100010000000111100000000010000100000110110011001001100100\n" // Luvdisc - ".8byte 0b0110110100000111101100100011001100000100110011101001100100\n" // Corphish - ".8byte 0b1110110100000111101100100011001100000100110111101001100100\n" // Crawdaunt - ".8byte 0b1100010000000111100000000010000100000100110011001001100100\n" // Feebas - ".8byte 0b1100010000000111100000000010000100010110110111001001100100\n" // Milotic - ".8byte 0b1100010000001111110000000010000100000100110011101001100100\n" // Carvanha - ".8byte 0b1110110000001111110100000010000110000100110111101001110100\n" // Sharpedo - ".8byte 0b0010100000000111100101000010001110001101010100011000100000\n" // Trapinch - ".8byte 0b0010101000010111100101000010001110001101010100011000100000\n" // Vibrava - ".8byte 0b0010101000010111100111010010001110011101010100011000100010\n" // Flygon - ".8byte 0b0010110000000111100100000011001110000100110000011010100001\n" // Makuhita - ".8byte 0b0010110000000111100100000011001110000100110100011010100001\n" // Hariyama - ".8byte 0b0001100000001111100000001010000101110100110000001000110000\n" // Electrike - ".8byte 0b0001100000001111100000001010000101110100110100001000110000\n" // Manectric - ".8byte 0b0010100010000111100111010010001110000100010000011000100000\n" // Numel - ".8byte 0b0010100010000111100111010010001110000100010100011000110000\n" // Camerupt - ".8byte 0b1110110000000111100100000010000110010100110011001001100100\n" // Spheal - ".8byte 0b1110110000000111100100000010000110010100110011001001110100\n" // Sealeo - ".8byte 0b1110110000000111100100000010000110010100110111001001110100\n" // Walrein - ".8byte 0b0001000100000111100001000010000100001101010000011100100001\n" // Cacnea - ".8byte 0b0001100100000111100001000010000100001101010100011100100001\n" // Cacturne - ".8byte 0b0001000000000111100000000010100100000110111011001001100100\n" // Snorunt - ".8byte 0b0001000000000111110000000010100110000110111111101001100100\n" // Glalie - ".8byte 0b0001000000100011100101000110110110000110111101001000101000\n" // Lunatone - ".8byte 0b0001000010100011100111010110110110001110011100011000101000\n" // Solrock - ".8byte 0b0100010000000111100000000010000100010100110011001001100100\n" // Azurill - ".8byte 0b0001000001101111110000001110110100010100111000111000101000\n" // Spoink - ".8byte 0b0001000001101111110000001110110100010100111100111000101001\n" // Grumpig - ".8byte 0b0001000000000111100000001010000101110100111000001000100000\n" // Plusle - ".8byte 0b0001000000000111100000001010000101110100111000001000100000\n" // Minun - ".8byte 0b0010100000000111110111110011000100001100110101111000100001\n" // Mawile - ".8byte 0b0011100000000111100100000111110100000100111000011010101001\n" // Meditite - ".8byte 0b0011100000000111100100000111110100000100111100011010101001\n" // Medicham - ".8byte 0b0000001000011111101000000010000100001110110001011000100000\n" // Swablu - ".8byte 0b0010001000011111101010010010000110011110110101011000110010\n" // Altaria - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Wynaut - ".8byte 0b0001000001101111110000000010110100000100110011111000101000\n" // Duskull - ".8byte 0b0011100001101111110100000010110110000100110111111000101001\n" // Dusclops - ".8byte 0b0001000100000111100000100010100100001101010000011100100000\n" // Roselia - ".8byte 0b0010100100000111101010011011100101101100110011011010100101\n" // Slakoth - ".8byte 0b0010100100000111101010011011100111101100110011111010110101\n" // Vigoroth - ".8byte 0b0010100100000111101010011011100111101100110111111010110101\n" // Slaking - ".8byte 0b0010100001000111100000101010100100001101110001011100100100\n" // Gulpin - ".8byte 0b0010100001000111100000101010100100001101110101011100100100\n" // Swalot - ".8byte 0b0011101100010111101000000010000110001111010100011100110000\n" // Tropius - ".8byte 0b0000000000000111100010011010100100001100110011011000110100\n" // Whismur - ".8byte 0b0010100010000111110010011011100110001100110011111000110100\n" // Loudred - ".8byte 0b0010100010000111110010011011100110001100110111111000110100\n" // Exploud - ".8byte 0b1100010000000111100000000010000100000100110011001001100100\n" // Clamperl - ".8byte 0b1100010001000111100100000010000100000100110111001001100100\n" // Huntail - ".8byte 0b1100010000000111100000000010110100000110110111001001100100\n" // Gorebyss - ".8byte 0b0011100101001111111011011010100101110100110111111001101100\n" // Absol - ".8byte 0b0001000001101111110000001010110101100100110000111000101000\n" // Shuppet - ".8byte 0b0001000001101111110000001010110101100100110100111000101000\n" // Banette - ".8byte 0b0010100001001111100000110010001110010101110000111000100000\n" // Seviper - ".8byte 0b0010100000001111101010011011101101111101110011111000110101\n" // Zangoose - ".8byte 0b1110010000000111100101000010000110000110110111001001101100\n" // Relicanth - ".8byte 0b0010100100000111101101001010001110010100110000011000110100\n" // Aron - ".8byte 0b0010100100000111101101001010001110010100110000011000110100\n" // Lairon - ".8byte 0b0010110100000111101111011011001111111100110111111000110111\n" // Aggron - ".8byte 0b0001000000001111100011011010100101101100110011011001100100\n" // Castform - ".8byte 0b0001000000001111101000001011100101101101111000011000100101\n" // Volbeat - ".8byte 0b0001000000001111101000001011100101101101111000011000100101\n" // Illumise - ".8byte 0b0000000000000111100001100010000100001101010000011100100000\n" // Lileep - ".8byte 0b0010100000000111100101100010000110001101010100011100100000\n" // Cradily - ".8byte 0b0010000100000111101101000011001100000100010000011000100100\n" // Anorith - ".8byte 0b0010100100000111101101000011001110010100010100011000100100\n" // Armaldo - ".8byte 0b0001000001101111110000001110110100100110111000111000101000\n" // Ralts - ".8byte 0b0001000001101111110000001110110100100110111000111000101000\n" // Kirlia - ".8byte 0b0001000001101111110000001110110100100110111100111000101000\n" // Gardevoir - ".8byte 0b0010100100000111101110010011000100000100110000011000110010\n" // Bagon - ".8byte 0b0010100100000111101110010011000100000100110000011000110010\n" // Shelgon - ".8byte 0b0010101100010111101110010011000110010100110100011000110010\n" // Salamence - ".8byte 0b0000000000000000000000000000000000000000000000000000000000\n" // Beldum - ".8byte 0b0011100100000011101101100111110110000100111100011000100000\n" // Metang - ".8byte 0b0011100100000011101101100111110110000100111100011000100000\n" // Metagross - ".8byte 0b0010100000000011100101001011001111100110010100011000100001\n" // Regirock - ".8byte 0b0010100000000011100000001011000111100110110111001001100001\n" // Regice - ".8byte 0b0010100000000011101101001011000111100110110100011000100001\n" // Registeel - ".8byte 0b1110110000000011100100001011000111100110110111001001111100\n" // Kyogre - ".8byte 0b0010100110000011101111011011001111111110010100011010110010\n" // Groudon - ".8byte 0b1110111010000011101011011011000111111100110111011010110110\n" // Rayquaza - ".8byte 0b1101011100010111101001001110110111101110111101011000111110\n" // Latias - ".8byte 0b1101011100010111101001001110110111101110111101011000111110\n" // Latios - ".8byte 0b0001000000100011101001001110110101100110111100011000101100\n" // Jirachi - ".8byte 0b0011100101100011111100001111110101101110111101111000101101\n" // Deoxys - ".8byte 0b0001000001100111110000001110110100000110111000111000101000\n" // Chimecho -); - -#endif //POKERUBY_TMHM_LEARNSETS_H +#ifndef GUARD_TMHM_LEARNSETS_H +#define GUARD_TMHM_LEARNSETS_H + +#define TMHM_LEARNSET(moves) {(u32)(moves), ((u64)(moves) >> 32)} +#define TMHM_BIT(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_TM01_FOCUS_PUNCH)) + +const u32 gTMHMLearnsets[][2] = +{ + [SPECIES_NONE] = TMHM_LEARNSET(0), + + [SPECIES_BULBASAUR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_IVYSAUR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_VENUSAUR] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CHARMANDER] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CHARMELEON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CHARIZARD] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SQUIRTLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_WARTORTLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_BLASTOISE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_CATERPIE] = TMHM_LEARNSET(0), + + [SPECIES_METAPOD] = TMHM_LEARNSET(0), + + [SPECIES_BUTTERFREE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_WEEDLE] = TMHM_LEARNSET(0), + + [SPECIES_KAKUNA] = TMHM_LEARNSET(0), + + [SPECIES_BEEDRILL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PIDGEY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_PIDGEOTTO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_PIDGEOT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_RATTATA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_RATICATE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SPEAROW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_FEAROW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_EKANS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH)), + + [SPECIES_ARBOK] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH)), + + [SPECIES_PIKACHU] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_RAICHU] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SANDSHREW] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SANDSLASH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NIDORAN_F] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NIDORINA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NIDOQUEEN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NIDORAN_M] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NIDORINO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NIDOKING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CLEFAIRY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_CLEFABLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_VULPIX] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT)), + + [SPECIES_NINETALES] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT)), + + [SPECIES_JIGGLYPUFF] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_WIGGLYTUFF] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_ZUBAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM49_SNATCH)), + + [SPECIES_GOLBAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM49_SNATCH)), + + [SPECIES_ODDISH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_GLOOM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_VILEPLUME] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_PARAS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PARASECT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_VENONAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_VENOMOTH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_DIGLETT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_DUGTRIO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MEOWTH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_PERSIAN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_PSYDUCK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_GOLDUCK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_MANKEY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PRIMEAPE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_GROWLITHE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ARCANINE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_POLIWAG] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_POLIWHIRL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_POLIWRATH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_ABRA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_KADABRA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_ALAKAZAM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MACHOP] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MACHOKE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MACHAMP] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_BELLSPROUT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_WEEPINBELL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_VICTREEBEL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_TENTACOOL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_TENTACRUEL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_GEODUDE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_GRAVELER] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_GOLEM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PONYTA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH)), + + [SPECIES_RAPIDASH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH)), + + [SPECIES_SLOWPOKE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SLOWBRO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_MAGNEMITE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MAGNETON] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_FARFETCHD] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_DODUO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_DODRIO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_SEEL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_DEWGONG] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_GRIMER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF)), + + [SPECIES_MUK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SHELLDER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_CLOYSTER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_GASTLY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH)), + + [SPECIES_HAUNTER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH)), + + [SPECIES_GENGAR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ONIX] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_DROWZEE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_HYPNO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_KRABBY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_KINGLER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_VOLTORB] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_ELECTRODE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_EXEGGCUTE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_EXEGGUTOR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_CUBONE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MAROWAK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HITMONLEE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HITMONCHAN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_LICKITUNG] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_KOFFING] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_WEEZING] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_RHYHORN] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_RHYDON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CHANSEY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TANGELA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_KANGASKHAN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HORSEA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SEADRA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_GOLDEEN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SEAKING] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_STARYU] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_STARMIE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_MR_MIME] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SCYTHER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_JYNX] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_ELECTABUZZ] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MAGMAR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PINSIR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TAUROS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MAGIKARP] = TMHM_LEARNSET(0), + + [SPECIES_GYARADOS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_LAPRAS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_DITTO] = TMHM_LEARNSET(0), + + [SPECIES_EEVEE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT)), + + [SPECIES_VAPOREON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_JOLTEON] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_FLAREON] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT)), + + [SPECIES_PORYGON] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_OMANYTE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_OMASTAR] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_KABUTO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL)), + + [SPECIES_KABUTOPS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_AERODACTYL] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SNORLAX] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH)), + + [SPECIES_ARTICUNO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ZAPDOS] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MOLTRES] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_DRATINI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL)), + + [SPECIES_DRAGONAIR] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL)), + + [SPECIES_DRAGONITE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_MEWTWO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MEW] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_CHIKORITA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_BAYLEEF] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MEGANIUM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CYNDAQUIL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT)), + + [SPECIES_QUILAVA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TYPHLOSION] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TOTODILE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_CROCONAW] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_FERALIGATR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SENTRET] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF)), + + [SPECIES_FURRET] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HOOTHOOT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_NOCTOWL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_LEDYBA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_LEDIAN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SPINARAK] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_ARIADOS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_CROBAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_CHINCHOU] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_LANTURN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_PICHU] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_CLEFFA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_IGGLYBUFF] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_TOGEPI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TOGETIC] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NATU] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_XATU] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MAREEP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_FLAAFFY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_AMPHAROS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_BELLOSSOM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MARILL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_AZUMARILL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SUDOWOODO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_POLITOED] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_HOPPIP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SKIPLOOM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_JUMPLUFF] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_AIPOM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SUNKERN] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SUNFLORA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_YANMA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_WOOPER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_QUAGSIRE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_ESPEON] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_UMBREON] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MURKROW] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_SLOWKING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_MISDREAVUS] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_UNOWN] = TMHM_LEARNSET(0), + + [SPECIES_WOBBUFFET] = TMHM_LEARNSET(0), + + [SPECIES_GIRAFARIG] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PINECO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_FORRETRESS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_DUNSPARCE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_GLIGAR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_STEELIX] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SNUBBULL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_GRANBULL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_QWILFISH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SCIZOR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SHUCKLE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HERACROSS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SNEASEL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TEDDIURSA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_URSARING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SLUGMA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MAGCARGO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SWINUB] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PILOSWINE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CORSOLA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_REMORAID] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_OCTILLERY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_DELIBIRD] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_MANTINE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SKARMORY] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HOUNDOUR] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HOUNDOOM] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_KINGDRA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_PHANPY] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_DONPHAN] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PORYGON2] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_STANTLER] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SMEARGLE] = TMHM_LEARNSET(0), + + [SPECIES_TYROGUE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HITMONTOP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SMOOCHUM] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_ELEKID] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MAGBY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MILTANK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_BLISSEY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_RAIKOU] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ENTEI] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SUICUNE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_LARVITAR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_PUPITAR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TYRANITAR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_LUGIA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_HO_OH] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CELEBI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_OLD_UNOWN_B] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_C] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_D] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_E] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_F] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_G] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_H] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_I] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_J] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_K] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_L] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_M] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_N] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_O] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_P] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_Q] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_R] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_S] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_T] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_U] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_V] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_W] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_X] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_Y] = TMHM_LEARNSET(0), + + [SPECIES_OLD_UNOWN_Z] = TMHM_LEARNSET(0), + + [SPECIES_TREECKO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_GROVYLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SCEPTILE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TORCHIC] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_COMBUSKEN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_BLAZIKEN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MUDKIP] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_MARSHTOMP] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SWAMPERT] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_POOCHYENA] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MIGHTYENA] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ZIGZAGOON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_LINOONE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_WURMPLE] = TMHM_LEARNSET(0), + + [SPECIES_SILCOON] = TMHM_LEARNSET(0), + + [SPECIES_BEAUTIFLY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_CASCOON] = TMHM_LEARNSET(0), + + [SPECIES_DUSTOX] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_LOTAD] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_LOMBRE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_LUDICOLO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SEEDOT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NUZLEAF] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SHIFTRY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NINCADA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_NINJASK] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SHEDINJA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_TAILLOW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_SWELLOW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_SHROOMISH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_BRELOOM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SPINDA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_WINGULL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_PELIPPER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM03_SURF)), + + [SPECIES_SURSKIT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MASQUERAIN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_WAILMER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_WAILORD] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SKITTY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_DELCATTY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_KECLEON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_BALTOY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_CLAYDOL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_NOSEPASS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TORKOAL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SABLEYE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_BARBOACH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_WHISCASH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_LUVDISC] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_CORPHISH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL)), + + [SPECIES_CRAWDAUNT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_FEEBAS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_MILOTIC] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_CARVANHA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SHARPEDO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_TRAPINCH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_VIBRAVA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_FLYGON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MAKUHITA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_HARIYAMA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ELECTRIKE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MANECTRIC] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_NUMEL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CAMERUPT] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SPHEAL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_SEALEO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_WALREIN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_CACNEA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_CACTURNE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SNORUNT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_GLALIE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_LUNATONE] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SOLROCK] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_AZURILL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL)), + + [SPECIES_SPOINK] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_GRUMPIG] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_PLUSLE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MINUN] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_MAWILE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MEDITITE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_MEDICHAM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SWABLU] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY)), + + [SPECIES_ALTARIA] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_WYNAUT] = TMHM_LEARNSET(0), + + [SPECIES_DUSKULL] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_DUSCLOPS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ROSELIA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SLAKOTH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_VIGOROTH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SLAKING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_GULPIN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SWALOT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_TROPIUS] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_WHISMUR] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT)), + + [SPECIES_LOUDRED] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_EXPLOUD] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CLAMPERL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_HUNTAIL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_GOREBYSS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_ABSOL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SHUPPET] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_BANETTE] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_SEVIPER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ZANGOOSE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_RELICANTH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_ARON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_LAIRON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_AGGRON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CASTFORM] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_VOLBEAT] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_ILLUMISE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_LILEEP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT)), + + [SPECIES_CRADILY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM09_BULLET_SEED) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM19_GIGA_DRAIN) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ANORITH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_ARMALDO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_RALTS] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_KIRLIA] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_GARDEVOIR] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM46_THIEF) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_BAGON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SHELGON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_SALAMENCE] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_BELDUM] = TMHM_LEARNSET(0), + + [SPECIES_METANG] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_METAGROSS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM36_SLUDGE_BOMB) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_REGIROCK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_REGICE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_REGISTEEL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_KYOGRE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM07_HAIL) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_GROUDON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM28_DIG) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_RAYQUAZA] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM08_BULK_UP) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM14_BLIZZARD) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM23_IRON_TAIL) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM35_FLAMETHROWER) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM38_FIRE_BLAST) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM50_OVERHEAT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM06_ROCK_SMASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_LATIAS] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_LATIOS] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM05_ROAR) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM26_EARTHQUAKE) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM47_STEEL_WING) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM02_FLY) + | TMHM_BIT(HM03_SURF) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM07_WATERFALL) + | TMHM_BIT(HM08_DIVE)), + + [SPECIES_JIRACHI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM37_SANDSTORM) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(HM05_FLASH)), + + [SPECIES_DEOXYS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) + | TMHM_BIT(TM03_WATER_PULSE) + | TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM13_ICE_BEAM) + | TMHM_BIT(TM15_HYPER_BEAM) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM22_SOLARBEAM) + | TMHM_BIT(TM24_THUNDERBOLT) + | TMHM_BIT(TM25_THUNDER) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM31_BRICK_BREAK) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM39_ROCK_TOMB) + | TMHM_BIT(TM40_AERIAL_ACE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM01_CUT) + | TMHM_BIT(HM04_STRENGTH) + | TMHM_BIT(HM05_FLASH) + | TMHM_BIT(HM06_ROCK_SMASH)), + + [SPECIES_CHIMECHO] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) + | TMHM_BIT(TM06_TOXIC) + | TMHM_BIT(TM10_HIDDEN_POWER) + | TMHM_BIT(TM11_SUNNY_DAY) + | TMHM_BIT(TM12_TAUNT) + | TMHM_BIT(TM16_LIGHT_SCREEN) + | TMHM_BIT(TM17_PROTECT) + | TMHM_BIT(TM18_RAIN_DANCE) + | TMHM_BIT(TM20_SAFEGUARD) + | TMHM_BIT(TM21_FRUSTRATION) + | TMHM_BIT(TM27_RETURN) + | TMHM_BIT(TM29_PSYCHIC) + | TMHM_BIT(TM30_SHADOW_BALL) + | TMHM_BIT(TM32_DOUBLE_TEAM) + | TMHM_BIT(TM33_REFLECT) + | TMHM_BIT(TM34_SHOCK_WAVE) + | TMHM_BIT(TM41_TORMENT) + | TMHM_BIT(TM42_FACADE) + | TMHM_BIT(TM43_SECRET_POWER) + | TMHM_BIT(TM44_REST) + | TMHM_BIT(TM45_ATTRACT) + | TMHM_BIT(TM48_SKILL_SWAP) + | TMHM_BIT(TM49_SNATCH) + | TMHM_BIT(HM05_FLASH)), + +}; + +#endif // GUARD_TMHM_LEARNSETS_H diff --git a/src/field/daycare.c b/src/field/daycare.c index 7e4530906..36dd7ec03 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -557,7 +557,7 @@ void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxP { for (j = 0; j < NUM_TECHNICAL_MACHINES + NUM_HIDDEN_MACHINES; j++) { - if (gHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01 + j) && CanMonLearnTMHM(egg, j)) + if (gHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { if (GiveMoveToMon(egg, gHatchedEggFatherMoves[i]) == 0xffff) DeleteFirstMoveAndGiveMoveToMon(egg, gHatchedEggFatherMoves[i]); diff --git a/src/field/item_use.c b/src/field/item_use.c index bd76db77e..55fb21814 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -877,7 +877,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId) { Menu_EraseWindowRect(0, 0xD, 0xD, 0x14); - if (gSpecialVar_ItemId >= ITEM_HM01) + if (gSpecialVar_ItemId >= ITEM_HM01_CUT) DisplayItemMessageOnField(taskId, gOtherText_BootedHM, sub_80C9EE4, 1); // HM else DisplayItemMessageOnField(taskId, gOtherText_BootedTM, sub_80C9EE4, 1); // TM diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 7d243f569..48275435e 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -3998,7 +3998,7 @@ void Task_ConfirmTakeHeldMail(u8 taskId) u16 ItemIdToBattleMoveId(u16 item) { - u16 machineNumber = item - ITEM_TM01; + u16 machineNumber = item - ITEM_TM01_FOCUS_PUNCH; return TMHMMoves[machineNumber]; } diff --git a/src/field/player_pc.c b/src/field/player_pc.c index 0d5c5234b..1d504586c 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -853,7 +853,7 @@ static void ItemStorage_DrawTMHMEntry(struct ItemSlot *itemSlot, u8 var, int var { ItemStorage_DrawItemName(itemSlot, var, var2); - if(itemSlot->itemId < ITEM_HM01) + if(itemSlot->itemId < ITEM_HM01_CUT) ItemStorage_DrawItemQuantity(itemSlot->quantity, STR_CONV_MODE_RIGHT_ALIGN, var, 3, var2); else ItemStorage_DrawItemVoidQuantity(var); // HMs do not have a quantity. -- cgit v1.2.3 From 5f92a4960c60a3d0e0f7866c656d08a1d8d6ef79 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 14:00:44 -0600 Subject: TMHM_BITSET -> TMHM --- src/data/pokemon/tmhm_learnsets.h | 18579 ++++++++++++++++++------------------ 1 file changed, 9291 insertions(+), 9288 deletions(-) diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 6c7e8c1e2..f14478863 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -2,6058 +2,6061 @@ #define GUARD_TMHM_LEARNSETS_H #define TMHM_LEARNSET(moves) {(u32)(moves), ((u64)(moves) >> 32)} -#define TMHM_BIT(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_TM01_FOCUS_PUNCH)) +#define TMHM(tmhm) ((u64)1 << (ITEM_##tmhm - ITEM_TM01_FOCUS_PUNCH)) +// This table determines which TMs and HMs a species is capable of learning. +// Each entry is a 64-bit bit array spread across two 32-bit values, with +// each bit corresponding to a . const u32 gTMHMLearnsets[][2] = { [SPECIES_NONE] = TMHM_LEARNSET(0), - [SPECIES_BULBASAUR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_IVYSAUR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_VENUSAUR] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CHARMANDER] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CHARMELEON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CHARIZARD] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SQUIRTLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_WARTORTLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_BLASTOISE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), + [SPECIES_BULBASAUR] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_IVYSAUR] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_VENUSAUR] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CHARMANDER] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CHARMELEON] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CHARIZARD] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SQUIRTLE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_WARTORTLE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_BLASTOISE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), [SPECIES_CATERPIE] = TMHM_LEARNSET(0), [SPECIES_METAPOD] = TMHM_LEARNSET(0), - [SPECIES_BUTTERFREE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), + [SPECIES_BUTTERFREE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), [SPECIES_WEEDLE] = TMHM_LEARNSET(0), [SPECIES_KAKUNA] = TMHM_LEARNSET(0), - [SPECIES_BEEDRILL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PIDGEY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_PIDGEOTTO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_PIDGEOT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_RATTATA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_RATICATE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SPEAROW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_FEAROW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_EKANS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH)), - - [SPECIES_ARBOK] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH)), - - [SPECIES_PIKACHU] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_RAICHU] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SANDSHREW] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SANDSLASH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NIDORAN_F] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NIDORINA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NIDOQUEEN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NIDORAN_M] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NIDORINO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NIDOKING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CLEFAIRY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_CLEFABLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_VULPIX] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT)), - - [SPECIES_NINETALES] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT)), - - [SPECIES_JIGGLYPUFF] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_WIGGLYTUFF] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_ZUBAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM49_SNATCH)), - - [SPECIES_GOLBAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM49_SNATCH)), - - [SPECIES_ODDISH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_GLOOM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_VILEPLUME] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_PARAS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PARASECT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_VENONAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_VENOMOTH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_DIGLETT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_DUGTRIO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MEOWTH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_PERSIAN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_PSYDUCK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_GOLDUCK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_MANKEY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PRIMEAPE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_GROWLITHE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ARCANINE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_POLIWAG] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_POLIWHIRL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_POLIWRATH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_ABRA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_KADABRA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_ALAKAZAM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MACHOP] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MACHOKE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MACHAMP] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_BELLSPROUT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_WEEPINBELL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_VICTREEBEL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_TENTACOOL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_TENTACRUEL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_GEODUDE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_GRAVELER] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_GOLEM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PONYTA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH)), - - [SPECIES_RAPIDASH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH)), - - [SPECIES_SLOWPOKE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SLOWBRO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_MAGNEMITE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MAGNETON] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_FARFETCHD] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_DODUO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_DODRIO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_SEEL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_DEWGONG] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_GRIMER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF)), - - [SPECIES_MUK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SHELLDER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_CLOYSTER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_GASTLY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH)), - - [SPECIES_HAUNTER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH)), - - [SPECIES_GENGAR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ONIX] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_DROWZEE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_HYPNO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_KRABBY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_KINGLER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_VOLTORB] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_ELECTRODE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_EXEGGCUTE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_EXEGGUTOR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_CUBONE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MAROWAK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HITMONLEE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HITMONCHAN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_LICKITUNG] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_KOFFING] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_WEEZING] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_RHYHORN] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_RHYDON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CHANSEY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TANGELA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_KANGASKHAN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HORSEA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SEADRA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_GOLDEEN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SEAKING] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_STARYU] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_STARMIE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_MR_MIME] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SCYTHER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_JYNX] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_ELECTABUZZ] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MAGMAR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PINSIR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TAUROS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), + [SPECIES_BEEDRILL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PIDGEY] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_PIDGEOTTO] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_PIDGEOT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_RATTATA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_RATICATE] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SPEAROW] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_FEAROW] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_EKANS] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH)), + + [SPECIES_ARBOK] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH)), + + [SPECIES_PIKACHU] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_RAICHU] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SANDSHREW] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SANDSLASH] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NIDORAN_F] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NIDORINA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NIDOQUEEN] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NIDORAN_M] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NIDORINO] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NIDOKING] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CLEFAIRY] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_CLEFABLE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_VULPIX] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT)), + + [SPECIES_NINETALES] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT)), + + [SPECIES_JIGGLYPUFF] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_WIGGLYTUFF] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_ZUBAT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(TM49_SNATCH)), + + [SPECIES_GOLBAT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(TM49_SNATCH)), + + [SPECIES_ODDISH] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_GLOOM] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_VILEPLUME] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_PARAS] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PARASECT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_VENONAT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_VENOMOTH] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_DIGLETT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_DUGTRIO] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MEOWTH] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_PERSIAN] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_PSYDUCK] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_GOLDUCK] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_MANKEY] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PRIMEAPE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_GROWLITHE] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ARCANINE] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_POLIWAG] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_POLIWHIRL] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_POLIWRATH] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_ABRA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_KADABRA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_ALAKAZAM] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_MACHOP] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MACHOKE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MACHAMP] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_BELLSPROUT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_WEEPINBELL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_VICTREEBEL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_TENTACOOL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_TENTACRUEL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_GEODUDE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_GRAVELER] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_GOLEM] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PONYTA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH)), + + [SPECIES_RAPIDASH] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH)), + + [SPECIES_SLOWPOKE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM08_DIVE)), + + [SPECIES_SLOWBRO] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM08_DIVE)), + + [SPECIES_MAGNEMITE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM05_FLASH)), + + [SPECIES_MAGNETON] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM05_FLASH)), + + [SPECIES_FARFETCHD] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY)), + + [SPECIES_DODUO] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_DODRIO] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_SEEL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_DEWGONG] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_GRIMER] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF)), + + [SPECIES_MUK] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SHELLDER] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM08_DIVE)), + + [SPECIES_CLOYSTER] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM08_DIVE)), + + [SPECIES_GASTLY] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH)), + + [SPECIES_HAUNTER] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH)), + + [SPECIES_GENGAR] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ONIX] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_DROWZEE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_HYPNO] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_KRABBY] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM08_DIVE)), + + [SPECIES_KINGLER] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM08_DIVE)), + + [SPECIES_VOLTORB] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_ELECTRODE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_EXEGGCUTE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_EXEGGUTOR] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_CUBONE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MAROWAK] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HITMONLEE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HITMONCHAN] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_LICKITUNG] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_KOFFING] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_WEEZING] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_RHYHORN] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_RHYDON] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CHANSEY] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TANGELA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_KANGASKHAN] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HORSEA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SEADRA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_GOLDEEN] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SEAKING] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_STARYU] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_STARMIE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_MR_MIME] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_SCYTHER] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_JYNX] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_ELECTABUZZ] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MAGMAR] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PINSIR] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TAUROS] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), [SPECIES_MAGIKARP] = TMHM_LEARNSET(0), - [SPECIES_GYARADOS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_LAPRAS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), + [SPECIES_GYARADOS] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_LAPRAS] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), [SPECIES_DITTO] = TMHM_LEARNSET(0), - [SPECIES_EEVEE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT)), - - [SPECIES_VAPOREON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_JOLTEON] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_FLAREON] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT)), - - [SPECIES_PORYGON] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_OMANYTE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_OMASTAR] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_KABUTO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL)), - - [SPECIES_KABUTOPS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_AERODACTYL] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SNORLAX] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH)), - - [SPECIES_ARTICUNO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ZAPDOS] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MOLTRES] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_DRATINI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL)), - - [SPECIES_DRAGONAIR] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL)), - - [SPECIES_DRAGONITE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_MEWTWO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MEW] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_CHIKORITA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_BAYLEEF] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MEGANIUM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CYNDAQUIL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT)), - - [SPECIES_QUILAVA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TYPHLOSION] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TOTODILE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_CROCONAW] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_FERALIGATR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SENTRET] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF)), - - [SPECIES_FURRET] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HOOTHOOT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_NOCTOWL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_LEDYBA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_LEDIAN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SPINARAK] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_ARIADOS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_CROBAT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_CHINCHOU] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_LANTURN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_PICHU] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_CLEFFA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_IGGLYBUFF] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_TOGEPI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TOGETIC] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NATU] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_XATU] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MAREEP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_FLAAFFY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_AMPHAROS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_BELLOSSOM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MARILL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_AZUMARILL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SUDOWOODO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_POLITOED] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_HOPPIP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SKIPLOOM] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_JUMPLUFF] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_AIPOM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SUNKERN] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SUNFLORA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_YANMA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_WOOPER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_QUAGSIRE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_ESPEON] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_UMBREON] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MURKROW] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_SLOWKING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_MISDREAVUS] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), + [SPECIES_EEVEE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT)), + + [SPECIES_VAPOREON] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_JOLTEON] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_FLAREON] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT)), + + [SPECIES_PORYGON] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_OMANYTE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_OMASTAR] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_KABUTO] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL)), + + [SPECIES_KABUTOPS] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_AERODACTYL] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SNORLAX] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH)), + + [SPECIES_ARTICUNO] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ZAPDOS] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MOLTRES] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM47_STEEL_WING) + | TMHM(TM50_OVERHEAT) + | TMHM(HM02_FLY) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_DRATINI] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL)), + + [SPECIES_DRAGONAIR] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL)), + + [SPECIES_DRAGONITE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_MEWTWO] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MEW] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM08_BULK_UP) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_CHIKORITA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_BAYLEEF] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MEGANIUM] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CYNDAQUIL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT)), + + [SPECIES_QUILAVA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TYPHLOSION] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TOTODILE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_CROCONAW] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_FERALIGATR] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SENTRET] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF)), + + [SPECIES_FURRET] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HOOTHOOT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM05_FLASH)), + + [SPECIES_NOCTOWL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM05_FLASH)), + + [SPECIES_LEDYBA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_LEDIAN] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_SPINARAK] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_ARIADOS] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_CROBAT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(TM49_SNATCH) + | TMHM(HM02_FLY)), + + [SPECIES_CHINCHOU] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_LANTURN] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_PICHU] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_CLEFFA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_IGGLYBUFF] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_TOGEPI] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TOGETIC] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NATU] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_XATU] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM02_FLY) + | TMHM(HM05_FLASH)), + + [SPECIES_MAREEP] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_FLAAFFY] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_AMPHAROS] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_BELLOSSOM] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_MARILL] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_AZUMARILL] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SUDOWOODO] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_POLITOED] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_HOPPIP] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_SKIPLOOM] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_JUMPLUFF] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_AIPOM] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SUNKERN] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_SUNFLORA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_YANMA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM05_FLASH)), + + [SPECIES_WOOPER] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_QUAGSIRE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_ESPEON] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_UMBREON] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_MURKROW] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(TM49_SNATCH) + | TMHM(HM02_FLY)), + + [SPECIES_SLOWKING] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM08_DIVE)), + + [SPECIES_MISDREAVUS] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), [SPECIES_UNOWN] = TMHM_LEARNSET(0), [SPECIES_WOBBUFFET] = TMHM_LEARNSET(0), - [SPECIES_GIRAFARIG] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PINECO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_FORRETRESS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_DUNSPARCE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_GLIGAR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_STEELIX] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SNUBBULL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_GRANBULL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_QWILFISH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SCIZOR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SHUCKLE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HERACROSS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SNEASEL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TEDDIURSA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_URSARING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SLUGMA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MAGCARGO] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SWINUB] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PILOSWINE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CORSOLA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_REMORAID] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_OCTILLERY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_DELIBIRD] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_MANTINE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SKARMORY] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HOUNDOUR] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HOUNDOOM] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_KINGDRA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_PHANPY] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_DONPHAN] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PORYGON2] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_STANTLER] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), + [SPECIES_GIRAFARIG] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PINECO] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_FORRETRESS] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_DUNSPARCE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_GLIGAR] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_STEELIX] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SNUBBULL] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_GRANBULL] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_QWILFISH] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SCIZOR] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SHUCKLE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HERACROSS] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SNEASEL] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TEDDIURSA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_URSARING] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SLUGMA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MAGCARGO] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SWINUB] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PILOSWINE] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CORSOLA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_REMORAID] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_OCTILLERY] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_DELIBIRD] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM02_FLY)), + + [SPECIES_MANTINE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SKARMORY] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HOUNDOUR] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(TM50_OVERHEAT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HOUNDOOM] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_KINGDRA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_PHANPY] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_DONPHAN] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PORYGON2] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_STANTLER] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), [SPECIES_SMEARGLE] = TMHM_LEARNSET(0), - [SPECIES_TYROGUE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HITMONTOP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SMOOCHUM] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_ELEKID] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MAGBY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MILTANK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_BLISSEY] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_RAIKOU] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ENTEI] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SUICUNE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_LARVITAR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_PUPITAR] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TYRANITAR] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_LUGIA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_HO_OH] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CELEBI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), + [SPECIES_TYROGUE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HITMONTOP] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SMOOCHUM] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_ELEKID] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MAGBY] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MILTANK] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_BLISSEY] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_RAIKOU] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ENTEI] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SUICUNE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_LARVITAR] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_PUPITAR] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TYRANITAR] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_LUGIA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM47_STEEL_WING) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM02_FLY) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_HO_OH] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM47_STEEL_WING) + | TMHM(TM50_OVERHEAT) + | TMHM(HM02_FLY) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CELEBI] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), [SPECIES_OLD_UNOWN_B] = TMHM_LEARNSET(0), @@ -6105,3285 +6108,3285 @@ const u32 gTMHMLearnsets[][2] = [SPECIES_OLD_UNOWN_Z] = TMHM_LEARNSET(0), - [SPECIES_TREECKO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_GROVYLE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SCEPTILE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TORCHIC] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_COMBUSKEN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_BLAZIKEN] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MUDKIP] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_MARSHTOMP] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SWAMPERT] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_POOCHYENA] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MIGHTYENA] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ZIGZAGOON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_LINOONE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), + [SPECIES_TREECKO] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_GROVYLE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SCEPTILE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TORCHIC] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_COMBUSKEN] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_BLAZIKEN] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MUDKIP] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_MARSHTOMP] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SWAMPERT] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_POOCHYENA] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MIGHTYENA] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ZIGZAGOON] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_LINOONE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), [SPECIES_WURMPLE] = TMHM_LEARNSET(0), [SPECIES_SILCOON] = TMHM_LEARNSET(0), - [SPECIES_BEAUTIFLY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), + [SPECIES_BEAUTIFLY] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), [SPECIES_CASCOON] = TMHM_LEARNSET(0), - [SPECIES_DUSTOX] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_LOTAD] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_LOMBRE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_LUDICOLO] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SEEDOT] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NUZLEAF] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SHIFTRY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NINCADA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_NINJASK] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SHEDINJA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_TAILLOW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_SWELLOW] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_SHROOMISH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_BRELOOM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SPINDA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_WINGULL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_PELIPPER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM03_SURF)), - - [SPECIES_SURSKIT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MASQUERAIN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_WAILMER] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_WAILORD] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SKITTY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_DELCATTY] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_KECLEON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_BALTOY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_CLAYDOL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_NOSEPASS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TORKOAL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SABLEYE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_BARBOACH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_WHISCASH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_LUVDISC] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_CORPHISH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL)), - - [SPECIES_CRAWDAUNT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_FEEBAS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_MILOTIC] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_CARVANHA] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SHARPEDO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_TRAPINCH] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_VIBRAVA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_FLYGON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MAKUHITA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_HARIYAMA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ELECTRIKE] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MANECTRIC] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_NUMEL] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CAMERUPT] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SPHEAL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_SEALEO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_WALREIN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_CACNEA] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_CACTURNE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SNORUNT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_GLALIE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_LUNATONE] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SOLROCK] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_AZURILL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL)), - - [SPECIES_SPOINK] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_GRUMPIG] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_PLUSLE] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MINUN] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_MAWILE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MEDITITE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_MEDICHAM] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SWABLU] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY)), - - [SPECIES_ALTARIA] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM06_ROCK_SMASH)), + [SPECIES_DUSTOX] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_LOTAD] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH)), + + [SPECIES_LOMBRE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_LUDICOLO] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SEEDOT] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NUZLEAF] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SHIFTRY] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NINCADA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_NINJASK] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_SHEDINJA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM46_THIEF) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_TAILLOW] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_SWELLOW] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_SHROOMISH] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_BRELOOM] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SPINDA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_WINGULL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_PELIPPER] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM03_SURF)), + + [SPECIES_SURSKIT] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_MASQUERAIN] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_WAILMER] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_WAILORD] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SKITTY] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_DELCATTY] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_KECLEON] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_BALTOY] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_CLAYDOL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_NOSEPASS] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TORKOAL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SABLEYE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_BARBOACH] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_WHISCASH] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_LUVDISC] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_CORPHISH] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL)), + + [SPECIES_CRAWDAUNT] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_FEEBAS] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_MILOTIC] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_CARVANHA] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SHARPEDO] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_TRAPINCH] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_VIBRAVA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_FLYGON] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MAKUHITA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_HARIYAMA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ELECTRIKE] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_MANECTRIC] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_NUMEL] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CAMERUPT] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SPHEAL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_SEALEO] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_WALREIN] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_CACNEA] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_CACTURNE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH)), + + [SPECIES_SNORUNT] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_GLALIE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_LUNATONE] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_SOLROCK] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM50_OVERHEAT) + | TMHM(HM05_FLASH)), + + [SPECIES_AZURILL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL)), + + [SPECIES_SPOINK] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_GRUMPIG] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_PLUSLE] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_MINUN] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM05_FLASH)), + + [SPECIES_MAWILE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MEDITITE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_MEDICHAM] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SWABLU] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY)), + + [SPECIES_ALTARIA] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM47_STEEL_WING) + | TMHM(HM02_FLY) + | TMHM(HM06_ROCK_SMASH)), [SPECIES_WYNAUT] = TMHM_LEARNSET(0), - [SPECIES_DUSKULL] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_DUSCLOPS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ROSELIA] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SLAKOTH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_VIGOROTH] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SLAKING] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_GULPIN] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SWALOT] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_TROPIUS] = TMHM_LEARNSET(TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_WHISMUR] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT)), - - [SPECIES_LOUDRED] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_EXPLOUD] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CLAMPERL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_HUNTAIL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_GOREBYSS] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_ABSOL] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SHUPPET] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_BANETTE] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_SEVIPER] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ZANGOOSE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_RELICANTH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_ARON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_LAIRON] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_AGGRON] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CASTFORM] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_VOLBEAT] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_ILLUMISE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_LILEEP] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT)), - - [SPECIES_CRADILY] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM09_BULLET_SEED) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM19_GIGA_DRAIN) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ANORITH] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_ARMALDO] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_RALTS] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_KIRLIA] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_GARDEVOIR] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM46_THIEF) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_BAGON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SHELGON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_SALAMENCE] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), + [SPECIES_DUSKULL] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_DUSCLOPS] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ROSELIA] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM05_FLASH)), + + [SPECIES_SLAKOTH] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_VIGOROTH] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SLAKING] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_GULPIN] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SWALOT] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_TROPIUS] = TMHM_LEARNSET(TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_WHISMUR] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT)), + + [SPECIES_LOUDRED] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_EXPLOUD] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM50_OVERHEAT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CLAMPERL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_HUNTAIL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM49_SNATCH) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_GOREBYSS] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_ABSOL] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SHUPPET] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_BANETTE] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_SEVIPER] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM49_SNATCH) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ZANGOOSE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_RELICANTH] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM03_SURF) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_ARON] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_LAIRON] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_AGGRON] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CASTFORM] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_VOLBEAT] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_ILLUMISE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(HM05_FLASH)), + + [SPECIES_LILEEP] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT)), + + [SPECIES_CRADILY] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM09_BULLET_SEED) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM19_GIGA_DRAIN) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ANORITH] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_ARMALDO] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_RALTS] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_KIRLIA] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_GARDEVOIR] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM46_THIEF) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), + + [SPECIES_BAGON] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SHELGON] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_SALAMENCE] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), [SPECIES_BELDUM] = TMHM_LEARNSET(0), - [SPECIES_METANG] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_METAGROSS] = TMHM_LEARNSET(TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM36_SLUDGE_BOMB) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_REGIROCK] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_REGICE] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_REGISTEEL] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_KYOGRE] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM07_HAIL) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_GROUDON] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM28_DIG) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_RAYQUAZA] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM08_BULK_UP) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM14_BLIZZARD) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM23_IRON_TAIL) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM35_FLAMETHROWER) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM38_FIRE_BLAST) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM50_OVERHEAT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM06_ROCK_SMASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_LATIAS] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_LATIOS] = TMHM_LEARNSET(TMHM_BIT(TM02_DRAGON_CLAW) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM05_ROAR) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM26_EARTHQUAKE) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM47_STEEL_WING) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM02_FLY) - | TMHM_BIT(HM03_SURF) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM07_WATERFALL) - | TMHM_BIT(HM08_DIVE)), - - [SPECIES_JIRACHI] = TMHM_LEARNSET(TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM37_SANDSTORM) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(HM05_FLASH)), - - [SPECIES_DEOXYS] = TMHM_LEARNSET(TMHM_BIT(TM01_FOCUS_PUNCH) - | TMHM_BIT(TM03_WATER_PULSE) - | TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM13_ICE_BEAM) - | TMHM_BIT(TM15_HYPER_BEAM) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM22_SOLARBEAM) - | TMHM_BIT(TM24_THUNDERBOLT) - | TMHM_BIT(TM25_THUNDER) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM31_BRICK_BREAK) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM39_ROCK_TOMB) - | TMHM_BIT(TM40_AERIAL_ACE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM01_CUT) - | TMHM_BIT(HM04_STRENGTH) - | TMHM_BIT(HM05_FLASH) - | TMHM_BIT(HM06_ROCK_SMASH)), - - [SPECIES_CHIMECHO] = TMHM_LEARNSET(TMHM_BIT(TM04_CALM_MIND) - | TMHM_BIT(TM06_TOXIC) - | TMHM_BIT(TM10_HIDDEN_POWER) - | TMHM_BIT(TM11_SUNNY_DAY) - | TMHM_BIT(TM12_TAUNT) - | TMHM_BIT(TM16_LIGHT_SCREEN) - | TMHM_BIT(TM17_PROTECT) - | TMHM_BIT(TM18_RAIN_DANCE) - | TMHM_BIT(TM20_SAFEGUARD) - | TMHM_BIT(TM21_FRUSTRATION) - | TMHM_BIT(TM27_RETURN) - | TMHM_BIT(TM29_PSYCHIC) - | TMHM_BIT(TM30_SHADOW_BALL) - | TMHM_BIT(TM32_DOUBLE_TEAM) - | TMHM_BIT(TM33_REFLECT) - | TMHM_BIT(TM34_SHOCK_WAVE) - | TMHM_BIT(TM41_TORMENT) - | TMHM_BIT(TM42_FACADE) - | TMHM_BIT(TM43_SECRET_POWER) - | TMHM_BIT(TM44_REST) - | TMHM_BIT(TM45_ATTRACT) - | TMHM_BIT(TM48_SKILL_SWAP) - | TMHM_BIT(TM49_SNATCH) - | TMHM_BIT(HM05_FLASH)), + [SPECIES_METANG] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_METAGROSS] = TMHM_LEARNSET(TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM36_SLUDGE_BOMB) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_REGIROCK] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_REGICE] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_REGISTEEL] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_KYOGRE] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM07_HAIL) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_GROUDON] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM28_DIG) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM50_OVERHEAT) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_RAYQUAZA] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM08_BULK_UP) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM14_BLIZZARD) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM23_IRON_TAIL) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM35_FLAMETHROWER) + | TMHM(TM37_SANDSTORM) + | TMHM(TM38_FIRE_BLAST) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM50_OVERHEAT) + | TMHM(HM02_FLY) + | TMHM(HM03_SURF) + | TMHM(HM04_STRENGTH) + | TMHM(HM06_ROCK_SMASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_LATIAS] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_LATIOS] = TMHM_LEARNSET(TMHM(TM02_DRAGON_CLAW) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM05_ROAR) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM26_EARTHQUAKE) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM47_STEEL_WING) + | TMHM(HM01_CUT) + | TMHM(HM02_FLY) + | TMHM(HM03_SURF) + | TMHM(HM05_FLASH) + | TMHM(HM07_WATERFALL) + | TMHM(HM08_DIVE)), + + [SPECIES_JIRACHI] = TMHM_LEARNSET(TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM37_SANDSTORM) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(HM05_FLASH)), + + [SPECIES_DEOXYS] = TMHM_LEARNSET(TMHM(TM01_FOCUS_PUNCH) + | TMHM(TM03_WATER_PULSE) + | TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM13_ICE_BEAM) + | TMHM(TM15_HYPER_BEAM) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM22_SOLARBEAM) + | TMHM(TM24_THUNDERBOLT) + | TMHM(TM25_THUNDER) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM31_BRICK_BREAK) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM39_ROCK_TOMB) + | TMHM(TM40_AERIAL_ACE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM01_CUT) + | TMHM(HM04_STRENGTH) + | TMHM(HM05_FLASH) + | TMHM(HM06_ROCK_SMASH)), + + [SPECIES_CHIMECHO] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + | TMHM(TM06_TOXIC) + | TMHM(TM10_HIDDEN_POWER) + | TMHM(TM11_SUNNY_DAY) + | TMHM(TM12_TAUNT) + | TMHM(TM16_LIGHT_SCREEN) + | TMHM(TM17_PROTECT) + | TMHM(TM18_RAIN_DANCE) + | TMHM(TM20_SAFEGUARD) + | TMHM(TM21_FRUSTRATION) + | TMHM(TM27_RETURN) + | TMHM(TM29_PSYCHIC) + | TMHM(TM30_SHADOW_BALL) + | TMHM(TM32_DOUBLE_TEAM) + | TMHM(TM33_REFLECT) + | TMHM(TM34_SHOCK_WAVE) + | TMHM(TM41_TORMENT) + | TMHM(TM42_FACADE) + | TMHM(TM43_SECRET_POWER) + | TMHM(TM44_REST) + | TMHM(TM45_ATTRACT) + | TMHM(TM48_SKILL_SWAP) + | TMHM(TM49_SNATCH) + | TMHM(HM05_FLASH)), }; -- cgit v1.2.3 From c1ac08ddf3d48c4db93d240f2e1518d6b4d6853b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 14:10:29 -0600 Subject: fix German build --- src/data/items_de.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items_de.h b/src/data/items_de.h index de4438622..92304e8b0 100644 --- a/src/data/items_de.h +++ b/src/data/items_de.h @@ -5426,7 +5426,7 @@ const struct Item gItems[] = }, { .name = _("VM01"), - .itemId = ITEM_HM01, + .itemId = ITEM_HM01_CUT, .price = 0, .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 0, -- cgit v1.2.3 From de9ba8e00dc91a8c98ebb6a321101d3d4fd79877 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 16:06:59 -0500 Subject: fix BuyMenuDrawGraphics --- src/field/shop.c | 65 ++++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/src/field/shop.c b/src/field/shop.c index 1dc6ba0cd..6ca515848 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -236,48 +236,41 @@ void sub_80B3094(void) void sub_80B30AC(void) { - void *addr; - void *addr2; - void *addr3; - u16 *tempArr; - u16 *tempArr2; - u16 *tempArr3; - LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - - // temp vars needed to match for some dumb reason - tempArr = gBGTilemapBuffers[1]; - addr = (void *)(VRAM + 0xE800); - DmaCopy16(3, tempArr, addr, 0x800); - tempArr2 = gBGTilemapBuffers[2]; - addr2 = (void *)(VRAM + 0xE000); - DmaCopy16(3, tempArr2, addr2, 0x800); - tempArr3 = gBGTilemapBuffers[3]; - addr3 = (void *)(VRAM + 0xF000); - DmaCopy16(3, tempArr3, addr3, 0x800); + DmaCopy16Defvars(3, gBGTilemapBuffers[1], (void *)(VRAM + 0xE800), 0x800); + DmaCopy16Defvars(3, gBGTilemapBuffers[2], (void *)(VRAM + 0xE000), 0x800); + DmaCopy16Defvars(3, gBGTilemapBuffers[3], (void *)(VRAM + 0xF000), 0x800); } -// this function is fugly. pls fix void BuyMenuDrawGraphics(void) { - void *addr; - register u16 zero2 asm("r5"); - sub_80F9438(); ScanlineEffect_Stop(); - REG_BG1HOFS = (zero2 = 0); - REG_BG1VOFS = zero2; - REG_BG2HOFS = zero2; - REG_BG2VOFS = zero2; - REG_BG3HOFS = zero2; - REG_BG3VOFS = zero2; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2HOFS = 0; + REG_BG2VOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; gPaletteFade.bufferTransferDisabled = 1; - addr = (void*)OAM; - { - register const u32 zero asm("r6") = 0; - DmaFill32(3, zero, addr, OAM_SIZE); + + /* + THEORY: This seemingly useless loop is required in order to match this + function without hacks. The reason is because it alters the 0 optimization + of a later assignment into using 2 different 0s instead of the same register. + It is speculated that at some point Game Freak insert an artificial + breakpoint here in order to look at the contents of OAM before it is cleared, + possibly because a programmer made a mistake in shop.c which corrupted its + contents. There may have been a macro here which at one point idled on the + while(1) but was changed to 0 for release due to a define somewhere. A + while(0) also matches, but it is more correct to use do {} while(0) as it + was a fix to prevent compiler warnings on older compilers. + */ + do {} while(0); + + DmaFill32Defvars(3, 0, (void*)OAM, OAM_SIZE); LZDecompressVram(gBuyMenuFrame_Gfx, (void*)(VRAM + 0x7C00)); LZDecompressWram(gBuyMenuFrame_Tilemap, ewram18000_2); LoadCompressedPalette(gMenuMoneyPal, 0xC0, sizeof(gMenuMoneyPal)); @@ -288,8 +281,8 @@ void BuyMenuDrawGraphics(void) Text_LoadWindowTemplate(&gWindowTemplate_81E6DFC); InitMenuWindow(&gWindowTemplate_81E6DFC); BuyMenuDrawMapGraphics(); - gMartInfo.cursor = zero; - gMartInfo.choicesAbove = zero2; + gMartInfo.cursor = 0; + gMartInfo.choicesAbove = 0; Menu_EraseWindowRect(0, 0, 0x20, 0x20); OpenMoneyWindow(gSaveBlock1.money, 0, 0); sub_80B3764(0, 7); @@ -297,12 +290,10 @@ void BuyMenuDrawGraphics(void) sub_80B3270(); CreateTask(sub_80B40E8, 0x8); sub_80B3240(); - asm("":::"r4"); // what?? - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, zero); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; SetVBlankCallback(sub_80B30AC); SetMainCallback2(sub_80B3094); - } } void sub_80B3240(void) -- cgit v1.2.3 From 98be8bf60937cbb7f733e0e2308619cc7168e187 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 16:09:10 -0500 Subject: fix PrintFlyTargetName --- src/field/region_map.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/field/region_map.c b/src/field/region_map.c index a098eb73d..30d0d580c 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -1608,8 +1608,8 @@ static void PrintFlyTargetName(void) { if (ewram0_3.regionMap.unk16 == 2 || ewram0_3.regionMap.unk16 == 4) { - u16 i = 0; - int zero; + u16 i; + bool32 drawFrameDisabled = FALSE; for (i = 0; i < ARRAY_COUNT(sUnknown_083E79C0); i++) { @@ -1627,9 +1627,8 @@ static void PrintFlyTargetName(void) break; } } - // This check is always true, but somehow the compiler still performed it. - asm("mov %0, #0\n":"=r"(zero)); // zero = 0 - if (zero == 0) + + if (!drawFrameDisabled) { Menu_DrawStdWindowFrame(16, 16, 29, 19); Menu_PrintText(ewram0_3.regionMap.mapSectionName, 17, 17); -- cgit v1.2.3 From b05f8f4dc492a5e60dfaf8b01220bc4e1de2a675 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 14 Jan 2018 16:12:08 -0500 Subject: tabs --- src/field/region_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/region_map.c b/src/field/region_map.c index 30d0d580c..1378820fe 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -1609,7 +1609,7 @@ static void PrintFlyTargetName(void) if (ewram0_3.regionMap.unk16 == 2 || ewram0_3.regionMap.unk16 == 4) { u16 i; - bool32 drawFrameDisabled = FALSE; + bool32 drawFrameDisabled = FALSE; for (i = 0; i < ARRAY_COUNT(sUnknown_083E79C0); i++) { -- cgit v1.2.3 From e79b3ce9ff39fa48928e8adf84dab542e78c5d64 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 17:24:28 -0500 Subject: Fix file modes --- asm/current.s | 0 asm/dark.s | 0 asm/fight.s | 0 asm/flying.s | 0 asm/ghost.s | 0 asm/ground.s | 0 asm/ice.s | 0 asm/normal.s | 0 asm/pc_screen_effect.s | 0 asm/psychic.s | 0 asm/rock.s | 0 asm/unk_text_8095904.s | 0 asm/water.s | 0 data/maps/events/Route124_DivingTreasureHuntersHouse.inc | 0 data/pc_screen_effect.s | 0 graphics/birch_speech/blank_pal.pal | 0 include/ewram.h | 0 include/gba/isagbprint.h | 0 include/region_map_sections.h | 0 src/battle/anim/alert.c | 0 src/battle/anim/angel.c | 0 src/battle/anim/angel_kiss.c | 0 src/battle/anim/anger.c | 0 src/battle/anim/blow_kiss.c | 0 src/battle/anim/bottle.c | 0 src/battle/anim/brace.c | 0 src/battle/anim/breath.c | 0 src/battle/anim/bullet.c | 0 src/battle/anim/copy_orb.c | 0 src/battle/anim/cube.c | 0 src/battle/anim/curtain.c | 0 src/battle/anim/cutter.c | 0 src/battle/anim/cyclone.c | 0 src/battle/anim/dark.c | 0 src/battle/anim/dragon.c | 0 src/battle/anim/draw.c | 0 src/battle/anim/drum.c | 0 src/battle/anim/egg.c | 0 src/battle/anim/espeed.c | 0 src/battle/anim/evasion.c | 0 src/battle/anim/fang.c | 0 src/battle/anim/flash.c | 0 src/battle/anim/flying_hearts.c | 0 src/battle/anim/flying_path.c | 0 src/battle/anim/flying_petals.c | 0 src/battle/anim/glitter.c | 0 src/battle/anim/glow.c | 0 src/battle/anim/grip.c | 0 src/battle/anim/grow.c | 0 src/battle/anim/guillotine.c | 0 src/battle/anim/heal.c | 0 src/battle/anim/heart_1.c | 0 src/battle/anim/homing.c | 0 src/battle/anim/hop.c | 0 src/battle/anim/hop_2.c | 0 src/battle/anim/kiss_fountain.c | 0 src/battle/anim/leaf.c | 0 src/battle/anim/love_bg.c | 0 src/battle/anim/lunge_1.c | 0 src/battle/anim/lunge_2.c | 0 src/battle/anim/money.c | 0 src/battle/anim/moon.c | 0 src/battle/anim/note_rain.c | 0 src/battle/anim/note_scatter.c | 0 src/battle/anim/note_scatter_2.c | 0 src/battle/anim/note_wave.c | 0 src/battle/anim/orbit.c | 0 src/battle/anim/orbit_fast.c | 0 src/battle/anim/orbit_scatter.c | 0 src/battle/anim/orbs.c | 0 src/battle/anim/osmose.c | 0 src/battle/anim/perceive.c | 0 src/battle/anim/powder.c | 0 src/battle/anim/ring.c | 0 src/battle/anim/roots.c | 0 src/battle/anim/scan.c | 0 src/battle/anim/scary_face.c | 0 src/battle/anim/seed.c | 0 src/battle/anim/shadow_enlarge.c | 0 src/battle/anim/shadow_minimize.c | 0 src/battle/anim/shield.c | 0 src/battle/anim/shimmer.c | 0 src/battle/anim/silhouette.c | 0 src/battle/anim/slash.c | 0 src/battle/anim/sleep.c | 0 src/battle/anim/slice.c | 0 src/battle/anim/smoke.c | 0 src/battle/anim/sonic.c | 0 src/battle/anim/sonic_task.c | 0 src/battle/anim/spin_finger.c | 0 src/battle/anim/spit.c | 0 src/battle/anim/splash.c | 0 src/battle/anim/startle.c | 0 src/battle/anim/strike.c | 0 src/battle/anim/switch.c | 0 src/battle/anim/sword.c | 0 src/battle/anim/taunt_finger.c | 0 src/battle/anim/tendrils.c | 0 src/battle/anim/thought.c | 0 src/battle/anim/thrashing.c | 0 src/battle/anim/tile_in.c | 0 src/battle/anim/tile_out.c | 0 src/battle/anim/twinkle.c | 0 src/battle/anim/unused_1.c | 0 src/battle/anim/unused_2.c | 0 src/battle/anim/unused_3.c | 0 src/battle/anim/unused_4.c | 0 src/battle/anim/unused_5.c | 0 src/battle/anim/unused_6.c | 0 src/battle/anim/unused_7.c | 0 src/battle/anim/unused_8.c | 0 src/battle/anim/unused_9.c | 0 src/battle/anim/wave_finger.c | 0 src/battle/anim/whip.c | 0 src/battle/anim/withdraw.c | 0 src/data/battle_strings_de.h | 0 src/data/battle_strings_en.h | 0 src/data/credits_de.h | 0 src/data/credits_en.h | 0 src/libs/libisagbprn.c | 0 src/scene/intro_credits_graphics.c | 0 121 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 asm/current.s mode change 100755 => 100644 asm/dark.s mode change 100755 => 100644 asm/fight.s mode change 100755 => 100644 asm/flying.s mode change 100755 => 100644 asm/ghost.s mode change 100755 => 100644 asm/ground.s mode change 100755 => 100644 asm/ice.s mode change 100755 => 100644 asm/normal.s mode change 100755 => 100644 asm/pc_screen_effect.s mode change 100755 => 100644 asm/psychic.s mode change 100755 => 100644 asm/rock.s mode change 100755 => 100644 asm/unk_text_8095904.s mode change 100755 => 100644 asm/water.s mode change 100755 => 100644 data/maps/events/Route124_DivingTreasureHuntersHouse.inc mode change 100755 => 100644 data/pc_screen_effect.s mode change 100755 => 100644 graphics/birch_speech/blank_pal.pal mode change 100755 => 100644 include/ewram.h mode change 100755 => 100644 include/gba/isagbprint.h mode change 100755 => 100644 include/region_map_sections.h mode change 100755 => 100644 src/battle/anim/alert.c mode change 100755 => 100644 src/battle/anim/angel.c mode change 100755 => 100644 src/battle/anim/angel_kiss.c mode change 100755 => 100644 src/battle/anim/anger.c mode change 100755 => 100644 src/battle/anim/blow_kiss.c mode change 100755 => 100644 src/battle/anim/bottle.c mode change 100755 => 100644 src/battle/anim/brace.c mode change 100755 => 100644 src/battle/anim/breath.c mode change 100755 => 100644 src/battle/anim/bullet.c mode change 100755 => 100644 src/battle/anim/copy_orb.c mode change 100755 => 100644 src/battle/anim/cube.c mode change 100755 => 100644 src/battle/anim/curtain.c mode change 100755 => 100644 src/battle/anim/cutter.c mode change 100755 => 100644 src/battle/anim/cyclone.c mode change 100755 => 100644 src/battle/anim/dark.c mode change 100755 => 100644 src/battle/anim/dragon.c mode change 100755 => 100644 src/battle/anim/draw.c mode change 100755 => 100644 src/battle/anim/drum.c mode change 100755 => 100644 src/battle/anim/egg.c mode change 100755 => 100644 src/battle/anim/espeed.c mode change 100755 => 100644 src/battle/anim/evasion.c mode change 100755 => 100644 src/battle/anim/fang.c mode change 100755 => 100644 src/battle/anim/flash.c mode change 100755 => 100644 src/battle/anim/flying_hearts.c mode change 100755 => 100644 src/battle/anim/flying_path.c mode change 100755 => 100644 src/battle/anim/flying_petals.c mode change 100755 => 100644 src/battle/anim/glitter.c mode change 100755 => 100644 src/battle/anim/glow.c mode change 100755 => 100644 src/battle/anim/grip.c mode change 100755 => 100644 src/battle/anim/grow.c mode change 100755 => 100644 src/battle/anim/guillotine.c mode change 100755 => 100644 src/battle/anim/heal.c mode change 100755 => 100644 src/battle/anim/heart_1.c mode change 100755 => 100644 src/battle/anim/homing.c mode change 100755 => 100644 src/battle/anim/hop.c mode change 100755 => 100644 src/battle/anim/hop_2.c mode change 100755 => 100644 src/battle/anim/kiss_fountain.c mode change 100755 => 100644 src/battle/anim/leaf.c mode change 100755 => 100644 src/battle/anim/love_bg.c mode change 100755 => 100644 src/battle/anim/lunge_1.c mode change 100755 => 100644 src/battle/anim/lunge_2.c mode change 100755 => 100644 src/battle/anim/money.c mode change 100755 => 100644 src/battle/anim/moon.c mode change 100755 => 100644 src/battle/anim/note_rain.c mode change 100755 => 100644 src/battle/anim/note_scatter.c mode change 100755 => 100644 src/battle/anim/note_scatter_2.c mode change 100755 => 100644 src/battle/anim/note_wave.c mode change 100755 => 100644 src/battle/anim/orbit.c mode change 100755 => 100644 src/battle/anim/orbit_fast.c mode change 100755 => 100644 src/battle/anim/orbit_scatter.c mode change 100755 => 100644 src/battle/anim/orbs.c mode change 100755 => 100644 src/battle/anim/osmose.c mode change 100755 => 100644 src/battle/anim/perceive.c mode change 100755 => 100644 src/battle/anim/powder.c mode change 100755 => 100644 src/battle/anim/ring.c mode change 100755 => 100644 src/battle/anim/roots.c mode change 100755 => 100644 src/battle/anim/scan.c mode change 100755 => 100644 src/battle/anim/scary_face.c mode change 100755 => 100644 src/battle/anim/seed.c mode change 100755 => 100644 src/battle/anim/shadow_enlarge.c mode change 100755 => 100644 src/battle/anim/shadow_minimize.c mode change 100755 => 100644 src/battle/anim/shield.c mode change 100755 => 100644 src/battle/anim/shimmer.c mode change 100755 => 100644 src/battle/anim/silhouette.c mode change 100755 => 100644 src/battle/anim/slash.c mode change 100755 => 100644 src/battle/anim/sleep.c mode change 100755 => 100644 src/battle/anim/slice.c mode change 100755 => 100644 src/battle/anim/smoke.c mode change 100755 => 100644 src/battle/anim/sonic.c mode change 100755 => 100644 src/battle/anim/sonic_task.c mode change 100755 => 100644 src/battle/anim/spin_finger.c mode change 100755 => 100644 src/battle/anim/spit.c mode change 100755 => 100644 src/battle/anim/splash.c mode change 100755 => 100644 src/battle/anim/startle.c mode change 100755 => 100644 src/battle/anim/strike.c mode change 100755 => 100644 src/battle/anim/switch.c mode change 100755 => 100644 src/battle/anim/sword.c mode change 100755 => 100644 src/battle/anim/taunt_finger.c mode change 100755 => 100644 src/battle/anim/tendrils.c mode change 100755 => 100644 src/battle/anim/thought.c mode change 100755 => 100644 src/battle/anim/thrashing.c mode change 100755 => 100644 src/battle/anim/tile_in.c mode change 100755 => 100644 src/battle/anim/tile_out.c mode change 100755 => 100644 src/battle/anim/twinkle.c mode change 100755 => 100644 src/battle/anim/unused_1.c mode change 100755 => 100644 src/battle/anim/unused_2.c mode change 100755 => 100644 src/battle/anim/unused_3.c mode change 100755 => 100644 src/battle/anim/unused_4.c mode change 100755 => 100644 src/battle/anim/unused_5.c mode change 100755 => 100644 src/battle/anim/unused_6.c mode change 100755 => 100644 src/battle/anim/unused_7.c mode change 100755 => 100644 src/battle/anim/unused_8.c mode change 100755 => 100644 src/battle/anim/unused_9.c mode change 100755 => 100644 src/battle/anim/wave_finger.c mode change 100755 => 100644 src/battle/anim/whip.c mode change 100755 => 100644 src/battle/anim/withdraw.c mode change 100755 => 100644 src/data/battle_strings_de.h mode change 100755 => 100644 src/data/battle_strings_en.h mode change 100755 => 100644 src/data/credits_de.h mode change 100755 => 100644 src/data/credits_en.h mode change 100755 => 100644 src/libs/libisagbprn.c mode change 100755 => 100644 src/scene/intro_credits_graphics.c diff --git a/asm/current.s b/asm/current.s old mode 100755 new mode 100644 diff --git a/asm/dark.s b/asm/dark.s old mode 100755 new mode 100644 diff --git a/asm/fight.s b/asm/fight.s old mode 100755 new mode 100644 diff --git a/asm/flying.s b/asm/flying.s old mode 100755 new mode 100644 diff --git a/asm/ghost.s b/asm/ghost.s old mode 100755 new mode 100644 diff --git a/asm/ground.s b/asm/ground.s old mode 100755 new mode 100644 diff --git a/asm/ice.s b/asm/ice.s old mode 100755 new mode 100644 diff --git a/asm/normal.s b/asm/normal.s old mode 100755 new mode 100644 diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s old mode 100755 new mode 100644 diff --git a/asm/psychic.s b/asm/psychic.s old mode 100755 new mode 100644 diff --git a/asm/rock.s b/asm/rock.s old mode 100755 new mode 100644 diff --git a/asm/unk_text_8095904.s b/asm/unk_text_8095904.s old mode 100755 new mode 100644 diff --git a/asm/water.s b/asm/water.s old mode 100755 new mode 100644 diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc old mode 100755 new mode 100644 diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s old mode 100755 new mode 100644 diff --git a/graphics/birch_speech/blank_pal.pal b/graphics/birch_speech/blank_pal.pal old mode 100755 new mode 100644 diff --git a/include/ewram.h b/include/ewram.h old mode 100755 new mode 100644 diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h old mode 100755 new mode 100644 diff --git a/include/region_map_sections.h b/include/region_map_sections.h old mode 100755 new mode 100644 diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/curtain.c b/src/battle/anim/curtain.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/cutter.c b/src/battle/anim/cutter.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/drum.c b/src/battle/anim/drum.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/evasion.c b/src/battle/anim/evasion.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/flash.c b/src/battle/anim/flash.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/glow.c b/src/battle/anim/glow.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/grow.c b/src/battle/anim/grow.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/lunge_1.c b/src/battle/anim/lunge_1.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/lunge_2.c b/src/battle/anim/lunge_2.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/note_rain.c b/src/battle/anim/note_rain.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/note_scatter.c b/src/battle/anim/note_scatter.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/note_scatter_2.c b/src/battle/anim/note_scatter_2.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/note_wave.c b/src/battle/anim/note_wave.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/orbit_fast.c b/src/battle/anim/orbit_fast.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/orbit_scatter.c b/src/battle/anim/orbit_scatter.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/shadow_enlarge.c b/src/battle/anim/shadow_enlarge.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/shimmer.c b/src/battle/anim/shimmer.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/silhouette.c b/src/battle/anim/silhouette.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/smoke.c b/src/battle/anim/smoke.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/sonic_task.c b/src/battle/anim/sonic_task.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/spin_finger.c b/src/battle/anim/spin_finger.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/startle.c b/src/battle/anim/startle.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/taunt_finger.c b/src/battle/anim/taunt_finger.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/thrashing.c b/src/battle/anim/thrashing.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/tile_in.c b/src/battle/anim/tile_in.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_4.c b/src/battle/anim/unused_4.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/wave_finger.c b/src/battle/anim/wave_finger.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c old mode 100755 new mode 100644 diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h old mode 100755 new mode 100644 diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h old mode 100755 new mode 100644 diff --git a/src/data/credits_de.h b/src/data/credits_de.h old mode 100755 new mode 100644 diff --git a/src/data/credits_en.h b/src/data/credits_en.h old mode 100755 new mode 100644 diff --git a/src/libs/libisagbprn.c b/src/libs/libisagbprn.c old mode 100755 new mode 100644 diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c old mode 100755 new mode 100644 -- cgit v1.2.3 From 06adc5c23a20c1bcfaa809878475b1704e8171ad Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 17:25:37 -0500 Subject: Fix file modes (revo pls) --- include/contest_ai.h | 0 src/contest_ai.c | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/contest_ai.h mode change 100755 => 100644 src/contest_ai.c diff --git a/include/contest_ai.h b/include/contest_ai.h old mode 100755 new mode 100644 diff --git a/src/contest_ai.c b/src/contest_ai.c old mode 100755 new mode 100644 -- cgit v1.2.3 From 7e3495747035d13f72ba869195b21f4e61ee283a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 16:29:27 -0600 Subject: add comment about NULL pointer dereference --- src/field/fieldmap.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/field/fieldmap.c b/src/field/fieldmap.c index 7a31ae720..7383bb174 100644 --- a/src/field/fieldmap.c +++ b/src/field/fieldmap.c @@ -86,18 +86,20 @@ void map_copy_with_padding(u16 *map, u16 width, u16 height) void sub_80560AC(struct MapHeader *mapHeader) { + // BUG: This results in a null pointer dereference when mapHeader->connections + // is NULL, causing count to be assigned a garbage value. This garbage value + // just so happens to have the most significant bit set, so it is treated as + // negative and the loop below thankfully never executes in this scenario. + int count = mapHeader->connections->count; + struct MapConnection *connection = mapHeader->connections->connections; int i; - struct MapConnection *connection; - struct MapHeader *cMap; - u32 offset; - int count; - count = mapHeader->connections->count; - connection = mapHeader->connections->connections; + gUnknown_0202E850 = sDummyConnectionFlags; for (i = 0; i < count; i++, connection++) { - cMap = mapconnection_get_mapheader(connection); - offset = connection->offset; + struct MapHeader *cMap = mapconnection_get_mapheader(connection); + u32 offset = connection->offset; + switch (connection->direction) { case CONNECTION_SOUTH: -- cgit v1.2.3 From 20de25004946139a601cd2965afc2e9645a56b96 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 16:35:27 -0600 Subject: write sub_807D770 better --- src/field/field_weather.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/field_weather.c b/src/field/field_weather.c index c954242a1..48d7da7f7 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -843,7 +843,7 @@ void fade_screen(u8 a, u8 delay) bool8 sub_807D770(void) { - return gWeatherPtr->unknown_6C6 ^ 1 ? TRUE : FALSE; + return (gWeatherPtr->unknown_6C6 != 1); } void sub_807D78C(u8 a) -- cgit v1.2.3 From e8daaa0f3ef2d97f7afe378494f33037f5bc8ee9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 18:21:22 -0500 Subject: sub_809A3D0 --- asm/pokemon_storage_system.s | 213 --------------------------------- include/pokemon_storage_system.h | 3 +- src/pokemon/pokemon_storage_system_4.c | 44 +++++++ 3 files changed, 46 insertions(+), 214 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 81e0729a1..57cacbff3 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,219 +5,6 @@ .text - thumb_func_start sub_809A3D0 -sub_809A3D0: @ 809A3D0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x28] - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - ldr r3, _0809A43C @ =gPokemonStorageSystemPtr - ldr r5, [r3] - ldr r1, _0809A440 @ =0x000008ca - adds r0, r5, r1 - str r0, [sp, 0x18] - add r2, sp, 0x18 - ldr r4, _0809A444 @ =0x0000ffff - mov r9, r4 - movs r6, 0xC0 - lsls r6, 10 - mov r8, r6 - ldr r0, _0809A448 @ =0x00030200 - str r0, [r2, 0x4] - mov r1, sp - ldr r0, _0809A44C @ =gSpriteTemplate_83BB2B8 - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - movs r1, 0 - ldr r7, _0809A450 @ =0x00000cca - adds r4, r5, r7 - ldrb r0, [r4] - adds r6, r2, 0 - cmp r0, 0 - bne _0809A41E - movs r1, 0x1 -_0809A41E: - strb r1, [r4] - cmp r1, 0 - bne _0809A458 - ldr r0, [r6, 0x4] - mov r1, r9 - ands r0, r1 - mov r4, r8 - orrs r0, r4 - str r0, [r6, 0x4] - ldr r7, _0809A454 @ =0x00000cec - adds r0, r5, r7 - ldrh r0, [r0] - mov r8, r0 - b _0809A478 - .align 2, 0 -_0809A43C: .4byte gPokemonStorageSystemPtr -_0809A440: .4byte 0x000008ca -_0809A444: .4byte 0x0000ffff -_0809A448: .4byte 0x00030200 -_0809A44C: .4byte gSpriteTemplate_83BB2B8 -_0809A450: .4byte 0x00000cca -_0809A454: .4byte 0x00000cec -_0809A458: - ldr r0, [r6, 0x4] - mov r1, r9 - ands r0, r1 - movs r1, 0x80 - lsls r1, 11 - orrs r0, r1 - str r0, [r6, 0x4] - ldr r4, _0809A570 @ =0x00000cec - adds r0, r5, r4 - ldrh r0, [r0] - mov r8, r0 - mov r1, sp - movs r0, 0x4 - strh r0, [r1] - ldr r0, _0809A574 @ =0x0000dac9 - strh r0, [r1, 0x2] -_0809A478: - ldr r0, [r3] - ldr r7, _0809A578 @ =0x000008ca - adds r0, r7 - ldr r1, [sp, 0x28] - lsls r5, r1, 3 - adds r5, r1 - ldr r4, _0809A57C @ =gPokemonStorage + 0x8344 - adds r5, r4 - adds r1, r5, 0 - bl sub_809A1BC - adds r0, r6, 0 - bl LoadSpriteSheet - adds r4, 0x7E - ldr r3, [sp, 0x28] - adds r4, r3, r4 - ldrb r0, [r4] - lsls r0, 2 - ldr r1, _0809A580 @ =gUnknown_083BB0A8 - adds r0, r1 - mov r1, r8 - movs r2, 0x4 - bl LoadPalette - adds r0, r5, 0 - bl sub_8072CA4 - lsls r0, 24 - lsrs r0, 24 - bl sub_809A6D0 - lsls r0, 16 - mov r4, r10 - lsls r2, r4, 24 - asrs r2, 24 - lsls r1, r2, 1 - adds r1, r2 - lsls r1, 6 - lsrs r6, r0, 16 - str r6, [sp, 0x20] - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x24] - movs r7, 0 - negs r2, r2 - mov r9, r2 - movs r0, 0x1 - mov r10, r0 -_0809A4DE: - lsls r1, r7, 5 - mov r8, r1 - ldr r3, [sp, 0x24] - lsls r1, r3, 16 - asrs r1, 16 - add r1, r8 - lsls r1, 16 - asrs r1, 16 - mov r0, sp - movs r2, 0x1C - movs r3, 0x17 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0809A584 @ =gPokemonStorageSystemPtr - ldr r4, [r1] - lsls r6, r7, 2 - ldr r1, _0809A588 @ =0x00000cf8 - adds r2, r4, r1 - adds r2, r6 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, _0809A58C @ =gSprites - adds r1, r0 - str r1, [r2] - mov r3, r9 - lsls r5, r3, 1 - add r5, r9 - lsls r5, 1 - strh r5, [r1, 0x2E] - ldr r1, [r2] - ldr r3, [sp, 0x20] - lsls r0, r3, 16 - asrs r0, 16 - add r0, r8 - strh r0, [r1, 0x30] - ldr r0, [r2] - mov r1, r10 - strh r1, [r0, 0x32] - ldr r0, [r2] - ldr r1, _0809A590 @ =sub_809A5E8 - str r1, [r0, 0x1C] - lsls r1, r7, 24 - lsrs r1, 24 - bl StartSpriteAnim - movs r3, 0xCF - lsls r3, 4 - adds r4, r3 - adds r4, r6 - ldr r0, [r4] - strh r5, [r0, 0x2E] - ldr r0, [r4] - mov r6, r10 - strh r6, [r0, 0x30] - ldr r1, [r4] - ldr r0, _0809A594 @ =sub_809A61C - str r0, [r1, 0x1C] - adds r0, r7, 0x1 - lsls r0, 16 - lsrs r7, r0, 16 - cmp r7, 0x1 - bls _0809A4DE - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809A570: .4byte 0x00000cec -_0809A574: .4byte 0x0000dac9 -_0809A578: .4byte 0x000008ca -_0809A57C: .4byte gPokemonStorage + 0x8344 -_0809A580: .4byte gUnknown_083BB0A8 -_0809A584: .4byte gPokemonStorageSystemPtr -_0809A588: .4byte 0x00000cf8 -_0809A58C: .4byte gSprites -_0809A590: .4byte sub_809A5E8 -_0809A594: .4byte sub_809A61C - thumb_func_end sub_809A3D0 - thumb_func_start sub_809A598 sub_809A598: @ 809A598 push {lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 62014e62c..85ffeaefe 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -116,7 +116,8 @@ struct PokemonStorageSystemData { u16 unk_0cec; u16 unk_0cee; struct Sprite *unk_0cf0[2]; - u8 filler_0cf8[16]; + struct Sprite *unk_0cf8[2]; + u8 filler_0cd0[8]; u32 unk_0d08; u8 filler_0d0c[0x50]; u16 unk_0d5c; diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 836a3433f..b0378a254 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -36,11 +36,14 @@ void sub_809A14C(u16 *vdest); void sub_809A23C(u8 boxId); void sub_809A3D0(u8 boxId, s8 a1); void sub_809A598(void); +void sub_809A5E8(struct Sprite *sprite); +void sub_809A61C(struct Sprite *sprite); void sub_809A654(void); s16 sub_809A6D0(u8 width); void sub_809A6DC(void); void sub_809A774(s8 a0); void sub_809A810(void); +void sub_809A8C8(struct Sprite *sprite); // .rodata @@ -810,6 +813,47 @@ void sub_809A23C(u8 boxId) gPokemonStorageSystemPtr->unk_0cca = 0; } +void sub_809A3D0(u8 boxId, s8 a1) +{ + u16 r8; + s16 x; + s16 x2; + u16 i; + struct SpriteSheet spriteSheet = {gPokemonStorageSystemPtr->unk_08ca, 0x200, 3}; + struct SpriteTemplate template = gSpriteTemplate_83BB2B8; + + gPokemonStorageSystemPtr->unk_0cca = gPokemonStorageSystemPtr->unk_0cca ? FALSE : TRUE; + if (gPokemonStorageSystemPtr->unk_0cca == 0) + { + spriteSheet.tag = 3; + r8 = gPokemonStorageSystemPtr->unk_0cec; + } + else + { + spriteSheet.tag = 4; + r8 = gPokemonStorageSystemPtr->unk_0cec; + template.tileTag = 4; + template.paletteTag = 0xdac9; + } + sub_809A1BC(gPokemonStorageSystemPtr->unk_08ca, gPokemonStorage.boxNames[boxId]); + LoadSpriteSheet(&spriteSheet); + LoadPalette(gUnknown_083BB0A8[gPokemonStorage.wallpaper[boxId]], r8, 0x04); + x = sub_809A6D0(sub_8072CA4(gPokemonStorage.boxNames[boxId])); + x2 = x + a1 * 192; + for (i = 0; i < 2; i++) + { + u8 spriteId = CreateSprite(&template, i * 32 + x2, 0x1c, 23); + gPokemonStorageSystemPtr->unk_0cf8[i] = gSprites + spriteId; + gPokemonStorageSystemPtr->unk_0cf8[i]->data[0] = (-a1) * 6; + gPokemonStorageSystemPtr->unk_0cf8[i]->data[1] = i * 32 + x; + gPokemonStorageSystemPtr->unk_0cf8[i]->data[2] = 1; + gPokemonStorageSystemPtr->unk_0cf8[i]->callback = sub_809A5E8; + StartSpriteAnim(gPokemonStorageSystemPtr->unk_0cf8[i], i); + gPokemonStorageSystemPtr->unk_0cf0[i]->data[0] = (-a1) * 6; + gPokemonStorageSystemPtr->unk_0cf0[i]->data[1] = 1; + gPokemonStorageSystemPtr->unk_0cf0[i]->callback = sub_809A61C; + } +} const u16 PCPal_Arrow[] = INCBIN_U16("graphics/pokemon_storage/arrow.gbapal"); const u8 PCGfx_Arrow[] = INCBIN_U8("graphics/pokemon_storage/arrow.4bpp"); -- cgit v1.2.3 From f33a73ed931885507b1a5f199044d85255078bc2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 18:37:27 -0500 Subject: through sub_809A6D0 --- asm/pokemon_storage_system.s | 174 --------------------------------- src/pokemon/pokemon_storage_system_4.c | 46 +++++++++ 2 files changed, 46 insertions(+), 174 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 57cacbff3..dafd8ce71 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,180 +5,6 @@ .text - thumb_func_start sub_809A598 -sub_809A598: @ 809A598 - push {lr} - ldr r0, _0809A5B0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809A5B4 @ =0x00000cca - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _0809A5B8 - movs r0, 0x4 - bl FreeSpriteTilesByTag - b _0809A5BE - .align 2, 0 -_0809A5B0: .4byte gPokemonStorageSystemPtr -_0809A5B4: .4byte 0x00000cca -_0809A5B8: - movs r0, 0x3 - bl FreeSpriteTilesByTag -_0809A5BE: - ldr r0, _0809A5E0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r3, 0xCF - lsls r3, 4 - adds r2, r0, r3 - adds r3, 0x8 - adds r1, r0, r3 - ldr r1, [r1] - str r1, [r2] - ldr r2, _0809A5E4 @ =0x00000cf4 - adds r1, r0, r2 - adds r3, 0x4 - adds r0, r3 - ldr r0, [r0] - str r0, [r1] - pop {r0} - bx r0 - .align 2, 0 -_0809A5E0: .4byte gPokemonStorageSystemPtr -_0809A5E4: .4byte 0x00000cf4 - thumb_func_end sub_809A598 - - thumb_func_start sub_809A5E8 -sub_809A5E8: @ 809A5E8 - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x32] - movs r3, 0x32 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _0809A5FC - subs r0, r1, 0x1 - strh r0, [r2, 0x32] - b _0809A614 -_0809A5FC: - ldrh r0, [r2, 0x2E] - ldrh r1, [r2, 0x20] - adds r0, r1 - strh r0, [r2, 0x20] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x30 - ldrsh r1, [r2, r3] - cmp r0, r1 - bne _0809A614 - ldr r0, _0809A618 @ =SpriteCallbackDummy - str r0, [r2, 0x1C] -_0809A614: - pop {r0} - bx r0 - .align 2, 0 -_0809A618: .4byte SpriteCallbackDummy - thumb_func_end sub_809A5E8 - - thumb_func_start sub_809A61C -sub_809A61C: @ 809A61C - push {lr} - adds r2, r0, 0 - ldrh r1, [r2, 0x30] - movs r3, 0x30 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _0809A630 - subs r0, r1, 0x1 - strh r0, [r2, 0x30] - b _0809A64E -_0809A630: - ldrh r0, [r2, 0x2E] - ldrh r1, [r2, 0x20] - adds r0, r1 - strh r0, [r2, 0x20] - ldrh r1, [r2, 0x24] - adds r0, r1 - strh r0, [r2, 0x32] - subs r0, 0x40 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xC0 - bls _0809A64E - adds r0, r2, 0 - bl DestroySprite -_0809A64E: - pop {r0} - bx r0 - thumb_func_end sub_809A61C - - thumb_func_start sub_809A654 -sub_809A654: @ 809A654 - push {lr} - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - ldr r1, _0809A690 @ =gPokemonStorage - ldr r2, _0809A694 @ =0x000083c2 - adds r1, r2 - adds r0, r1 - ldrb r1, [r0] - ldr r0, _0809A698 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r3, _0809A69C @ =0x00000cca - adds r0, r2, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _0809A6A8 - lsls r0, r1, 2 - ldr r1, _0809A6A0 @ =gUnknown_083BB0A8 - adds r0, r1 - adds r3, 0x22 - adds r1, r2, r3 - ldrh r1, [r1] - lsls r1, 1 - ldr r2, _0809A6A4 @ =gPlttBufferUnfaded - adds r1, r2 - movs r2, 0x2 - bl CpuSet - b _0809A6C0 - .align 2, 0 -_0809A690: .4byte gPokemonStorage -_0809A694: .4byte 0x000083c2 -_0809A698: .4byte gPokemonStorageSystemPtr -_0809A69C: .4byte 0x00000cca -_0809A6A0: .4byte gUnknown_083BB0A8 -_0809A6A4: .4byte gPlttBufferUnfaded -_0809A6A8: - lsls r0, r1, 2 - ldr r1, _0809A6C4 @ =gUnknown_083BB0A8 - adds r0, r1 - ldr r3, _0809A6C8 @ =0x00000cee - adds r1, r2, r3 - ldrh r1, [r1] - lsls r1, 1 - ldr r2, _0809A6CC @ =gPlttBufferUnfaded - adds r1, r2 - movs r2, 0x2 - bl CpuSet -_0809A6C0: - pop {r0} - bx r0 - .align 2, 0 -_0809A6C4: .4byte gUnknown_083BB0A8 -_0809A6C8: .4byte 0x00000cee -_0809A6CC: .4byte gPlttBufferUnfaded - thumb_func_end sub_809A654 - - thumb_func_start sub_809A6D0 -sub_809A6D0: @ 809A6D0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 25 - movs r0, 0xB0 - subs r0, r1 - bx lr - thumb_func_end sub_809A6D0 - thumb_func_start sub_809A6DC sub_809A6DC: @ 809A6DC push {r4,r5,lr} diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index b0378a254..b48b20d5c 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -891,3 +891,49 @@ const struct SpriteTemplate gSpriteTemplate_83BB2B8 = { gDummySpriteAffineAnimTable, SpriteCallbackDummy }; + +void sub_809A598(void) +{ + if (gPokemonStorageSystemPtr->unk_0cca == 0) + FreeSpriteTilesByTag(4); + else + FreeSpriteTilesByTag(3); + gPokemonStorageSystemPtr->unk_0cf0[0] = gPokemonStorageSystemPtr->unk_0cf8[0]; + gPokemonStorageSystemPtr->unk_0cf0[1] = gPokemonStorageSystemPtr->unk_0cf8[1]; +} + +void sub_809A5E8(struct Sprite *sprite) +{ + if (sprite->data[2]) + sprite->data[2]--; + else if ((sprite->pos1.x += sprite->data[0]) == sprite->data[1]) + sprite->callback = SpriteCallbackDummy; +} + +void sub_809A61C(struct Sprite *sprite) +{ + if (sprite->data[1]) + sprite->data[1]--; + else + { + sprite->pos1.x += sprite->data[0]; + sprite->data[2] = sprite->pos1.x + sprite->pos2.x; + if (sprite->data[2] < 0x40 || sprite->data[2] > 0x100) + DestroySprite(sprite); + } +} + +void sub_809A654(void) +{ + u8 boxId = get_preferred_box(); + u8 wallpaperId = gPokemonStorage.wallpaper[boxId]; + if (gPokemonStorageSystemPtr->unk_0cca == 0) + CpuCopy16(gUnknown_083BB0A8[wallpaperId], gPlttBufferUnfaded + gPokemonStorageSystemPtr->unk_0cec, 4); + else + CpuCopy16(gUnknown_083BB0A8[wallpaperId], gPlttBufferUnfaded + gPokemonStorageSystemPtr->unk_0cee, 4); +} + +s16 sub_809A6D0(u8 width) +{ + return 0xb0 - width / 2; +} -- cgit v1.2.3 From 5fcd1184d8a189887e44559edb12417717afca5b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 19:10:31 -0500 Subject: through sub_809A860 --- asm/pokemon_storage_system.s | 259 ---------------------- data/pokemon_storage_system.s | 25 --- include/pokemon_storage_system.h | 4 +- src/pokemon/pokemon_storage_system_2.c | 8 +- src/pokemon/pokemon_storage_system_4.c | 384 +++++++++++++++++++++------------ 5 files changed, 255 insertions(+), 425 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index dafd8ce71..136d528f8 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,265 +5,6 @@ .text - thumb_func_start sub_809A6DC -sub_809A6DC: @ 809A6DC - push {r4,r5,lr} - ldr r0, _0809A760 @ =gUnknown_083BB288 - bl LoadSpriteSheet - ldr r0, _0809A764 @ =gUnknown_083BB290 - bl LoadSpritePalette - movs r5, 0 -_0809A6EC: - lsls r1, r5, 4 - adds r1, r5 - lsls r1, 19 - movs r0, 0xB8 - lsls r0, 15 - adds r1, r0 - asrs r1, 16 - ldr r0, _0809A768 @ =gSpriteTemplate_83BB2F0 - movs r2, 0x1C - movs r3, 0x15 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _0809A73E - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _0809A76C @ =gSprites - adds r4, r0, r1 - lsls r1, r5, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl StartSpriteAnim - movs r0, 0x1 - cmp r5, 0 - bne _0809A72C - movs r1, 0x1 - negs r1, r1 - adds r0, r1, 0 -_0809A72C: - strh r0, [r4, 0x34] - ldr r0, _0809A770 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - lsls r1, r5, 2 - movs r2, 0xD0 - lsls r2, 4 - adds r0, r2 - adds r0, r1 - str r4, [r0] -_0809A73E: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x1 - bls _0809A6EC - bl sub_809BF2C - lsls r0, 24 - cmp r0, 0 - beq _0809A758 - movs r0, 0x1 - bl sub_809A860 -_0809A758: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809A760: .4byte gUnknown_083BB288 -_0809A764: .4byte gUnknown_083BB290 -_0809A768: .4byte gSpriteTemplate_83BB2F0 -_0809A76C: .4byte gSprites -_0809A770: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809A6DC - - thumb_func_start sub_809A774 -sub_809A774: @ 809A774 - push {r4-r7,lr} - lsls r0, 24 - lsrs r6, r0, 24 - movs r2, 0 - ldr r7, _0809A7C4 @ =gPokemonStorageSystemPtr - ldr r0, [r7] - movs r1, 0xD0 - lsls r1, 4 - adds r3, r0, r1 - movs r5, 0 - movs r4, 0x2 -_0809A78A: - lsls r1, r2, 2 - adds r1, r3, r1 - ldr r0, [r1] - strh r5, [r0, 0x24] - ldr r0, [r1] - strh r4, [r0, 0x2E] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x1 - bls _0809A78A - lsls r0, r6, 24 - cmp r0, 0 - bge _0809A7CC - ldr r1, [r7] - movs r2, 0xD0 - lsls r2, 4 - adds r3, r1, r2 - ldr r2, [r3] - movs r0, 0x1D - strh r0, [r2, 0x30] - ldr r0, _0809A7C8 @ =0x00000d04 - adds r1, r0 - ldr r2, [r1] - movs r0, 0x5 - strh r0, [r2, 0x30] - ldr r0, [r3] - movs r2, 0x48 - b _0809A7E8 - .align 2, 0 -_0809A7C4: .4byte gPokemonStorageSystemPtr -_0809A7C8: .4byte 0x00000d04 -_0809A7CC: - ldr r1, [r7] - movs r2, 0xD0 - lsls r2, 4 - adds r3, r1, r2 - ldr r2, [r3] - movs r0, 0x5 - strh r0, [r2, 0x30] - ldr r0, _0809A80C @ =0x00000d04 - adds r1, r0 - ldr r2, [r1] - movs r0, 0x1D - strh r0, [r2, 0x30] - ldr r0, [r3] - movs r2, 0xF8 -_0809A7E8: - strh r2, [r0, 0x32] - ldr r0, [r1] - strh r2, [r0, 0x32] - ldr r1, [r7] - movs r2, 0xD0 - lsls r2, 4 - adds r0, r1, r2 - ldr r2, [r0] - movs r0, 0 - strh r0, [r2, 0x3C] - ldr r0, _0809A80C @ =0x00000d04 - adds r1, r0 - ldr r1, [r1] - movs r0, 0x1 - strh r0, [r1, 0x3C] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809A80C: .4byte 0x00000d04 - thumb_func_end sub_809A774 - - thumb_func_start sub_809A810 -sub_809A810: @ 809A810 - push {r4-r6,lr} - movs r3, 0 - ldr r0, _0809A85C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0xD0 - lsls r1, 4 - adds r4, r0, r1 - movs r5, 0 - movs r6, 0x5 - negs r6, r6 -_0809A824: - lsls r1, r3, 2 - adds r1, r4, r1 - ldr r2, [r1] - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 3 - adds r0, 0x5C - strh r0, [r2, 0x20] - ldr r0, [r1] - strh r5, [r0, 0x24] - ldr r1, [r1] - adds r1, 0x3E - ldrb r2, [r1] - adds r0, r6, 0 - ands r0, r2 - strb r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x1 - bls _0809A824 - movs r0, 0x1 - bl sub_809A860 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809A85C: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809A810 - - thumb_func_start sub_809A860 -sub_809A860: @ 809A860 - push {r4,r5,lr} - lsls r0, 24 - cmp r0, 0 - beq _0809A89C - movs r2, 0 - ldr r0, _0809A898 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0xD0 - lsls r1, 4 - adds r4, r0, r1 - movs r3, 0 - movs r5, 0x1 -_0809A878: - lsls r1, r2, 2 - adds r1, r4, r1 - ldr r0, [r1] - strh r5, [r0, 0x2E] - ldr r0, [r1] - strh r3, [r0, 0x30] - ldr r0, [r1] - strh r3, [r0, 0x32] - ldr r0, [r1] - strh r3, [r0, 0x36] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x1 - bls _0809A878 - b _0809A8BC - .align 2, 0 -_0809A898: .4byte gPokemonStorageSystemPtr -_0809A89C: - movs r2, 0 - ldr r0, _0809A8C4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r3, 0xD0 - lsls r3, 4 - adds r1, r0, r3 - movs r3, 0 -_0809A8AA: - lsls r0, r2, 2 - adds r0, r1, r0 - ldr r0, [r0] - strh r3, [r0, 0x2E] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x1 - bls _0809A8AA -_0809A8BC: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809A8C4: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809A860 - thumb_func_start sub_809A8C8 sub_809A8C8: @ 809A8C8 push {lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index aa9767dfa..2af123090 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,31 +3,6 @@ .section .rodata - .align 2 -gOamData_83BB2D0:: @ 83BB2D0 - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83BB2D8:: @ 83BB2D8 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83BB2E0:: @ 83BB2E0 - obj_image_anim_frame 2, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83BB2E8:: @ 83BB2E8 - .4byte gSpriteAnim_83BB2D8 - .4byte gSpriteAnim_83BB2E0 - - .align 2 -gSpriteTemplate_83BB2F0:: @ 83BB2F0 - spr_template 6, 56015, gOamData_83BB2D0, gSpriteAnimTable_83BB2E8, NULL, gDummySpriteAffineAnimTable, sub_809A8C8 - .align 2 HandCursorPalette: @ 83BB308 .incbin "graphics/pokemon_storage/hand_cursor_pal.bin" diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 85ffeaefe..0131ce18b 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -117,7 +117,7 @@ struct PokemonStorageSystemData { u16 unk_0cee; struct Sprite *unk_0cf0[2]; struct Sprite *unk_0cf8[2]; - u8 filler_0cd0[8]; + struct Sprite *unk_0d00[2]; u32 unk_0d08; u8 filler_0d0c[0x50]; u16 unk_0d5c; @@ -215,7 +215,7 @@ void sub_8099C70(u8 whichBox); bool8 sub_8099D34(void); void sub_8099DCC(u8 a0); bool8 sub_8099E08(void); -void sub_809A860(u8 a0); +void sub_809A860(bool8 a0); void sub_809AA24(void); void sub_809AA98(void); bool8 sub_809AC00(void); diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index 290fa120a..4657ed158 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -1096,7 +1096,7 @@ void sub_809789C(void) { case -1: case 0: - sub_809A860(1); + sub_809A860(TRUE); sub_8098A5C(); SetPSSCallback(sub_8096C84); break; @@ -1133,7 +1133,7 @@ void sub_8097974(void) switch (gPokemonStorageSystemPtr->unk_0d5e) { case -1: - sub_809A860(1); + sub_809A860(TRUE); sub_8098A5C(); SetPSSCallback(sub_8096C84); break; @@ -1168,7 +1168,7 @@ void sub_8097974(void) case 3: if (!sub_8099E08()) { - sub_809A860(1); + sub_809A860(TRUE); SetPSSCallback(sub_8096C84); } break; @@ -1197,7 +1197,7 @@ void sub_8097A64(void) sub_8096310(); if (gPokemonStorageSystemPtr->unk_08b2 == 201 || gPokemonStorageSystemPtr->unk_08b2 == gPokemonStorage.currentBox) { - sub_809A860(1); + sub_809A860(TRUE); SetPSSCallback(sub_8096C84); } else diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index b48b20d5c..b40cc916c 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -44,107 +44,10 @@ void sub_809A6DC(void); void sub_809A774(s8 a0); void sub_809A810(void); void sub_809A8C8(struct Sprite *sprite); +bool8 sub_809BF2C(void); // .rodata -// .text - -void sub_8099BF8(u8 boxId) -{ - gPokemonStorageSystemPtr->unk_08ba = FALSE; - gPokemonStorageSystemPtr->unk_08b4 = 0; - DmaFill32(3, 0, BG_SCREEN_ADDR(26), 0x1000); - sub_8099EB0(boxId, 0); - sub_809A23C(boxId); - sub_809A6DC(); - SpawnBoxIconSprites(boxId); - REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(26) | BGCNT_TXT512x256; -} - -void sub_8099C70(u8 whichBox) -{ - s8 r4 = sub_8099D90(whichBox); - sub_8099EB0(whichBox, r4); - gPokemonStorageSystemPtr->unk_08b6 = r4 * 6; - gPokemonStorageSystemPtr->unk_08b8 = 0x20; - gPokemonStorageSystemPtr->unk_08bb = whichBox; - gPokemonStorageSystemPtr->unk_08bc = r4 > 0 ? 0 : 5; - gPokemonStorageSystemPtr->unk_08be = r4; - gPokemonStorageSystemPtr->unk_08c0 = r4 > 0 ? 0x108 : 0x38; - gPokemonStorageSystemPtr->unk_08c2 = r4 > 0 ? 0 : 5; - gPokemonStorageSystemPtr->unk_08c4 = r4; - gPokemonStorageSystemPtr->unk_08c6 = 0; - gPokemonStorageSystemPtr->unk_08c8 = 2; - sub_809900C(whichBox, r4); - sub_809A3D0(whichBox, r4); - sub_809A774(r4); -} - -bool8 sub_8099D34(void) -{ - bool8 retVal = sub_80990AC(); - if (gPokemonStorageSystemPtr->unk_08b8 != 0) - { - gPokemonStorageSystemPtr->unk_08b4 += gPokemonStorageSystemPtr->unk_08b6; - gPokemonStorageSystemPtr->unk_08b4 &= 0x1ff; - if (--gPokemonStorageSystemPtr->unk_08b8 == 0) - { - sub_809A598(); - sub_809A810(); - } - return TRUE; - } - return retVal; -} - -s8 sub_8099D90(u8 boxId) -{ - u8 curBox = get_preferred_box(); - u8 i; - - for (i = 0; curBox != boxId; i++) - { - if (++curBox >= 14) - curBox = 0; - } - return i <= 6 ? 1 : -1; -} - -void sub_8099DCC(u8 wallpaperId) -{ - u8 curBox = get_preferred_box(); - gPokemonStorage.wallpaper[curBox] = wallpaperId; - gPokemonStorageSystemPtr->unk_1032 = 0; -} - -bool8 sub_8099E08(void) -{ - switch (gPokemonStorageSystemPtr->unk_1032) - { - case 0: - BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0, 0x10, 0xffff); - gPokemonStorageSystemPtr->unk_1032++; - break; - case 1: - if (!UpdatePaletteFade()) - { - u8 curBox = get_preferred_box(); - sub_8099EB0(curBox, 0); - sub_809A654(); - BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0x10, 0, 0xffff); - gPokemonStorageSystemPtr->unk_1032++; - } - break; - case 2: - if (!UpdatePaletteFade()) - gPokemonStorageSystemPtr->unk_1032++; - break; - case 3: - return FALSE; - } - return TRUE; -} - const u16 gWallpaperPalettes_Forest[] = INCBIN_U16("graphics/pokemon_storage/box_bg1.gbapal"); const u16 gWallpaperPalettes_Forest_2[] = INCBIN_U16("graphics/pokemon_storage/forest_frame.gbapal"); const u16 gWallpaperPalettes_Forest_2_3[] = INCBIN_U16("graphics/pokemon_storage/forest_bg.gbapal"); @@ -314,6 +217,171 @@ const struct WallpaperTable gWallpaperTable[] = { {gWallpaperTiles_Plain, 0xFC, gWallpaperTilemap_Plain, gWallpaperPalettes_Plain} // Plain }; +const u16 PCPal_Arrow[] = INCBIN_U16("graphics/pokemon_storage/arrow.gbapal"); +const u8 PCGfx_Arrow[] = INCBIN_U8("graphics/pokemon_storage/arrow.4bpp"); + +const struct SpriteSheet gUnknown_083BB288 = {PCGfx_Arrow, 0x80, 6}; +const struct SpritePalette gUnknown_083BB290 = {PCPal_Arrow, 0xdacf}; + +const struct OamData gOamData_83BB298 = { + .shape = ST_OAM_H_RECTANGLE, + .size = 2, + .priority = 2 +}; + +const union AnimCmd gSpriteAnim_83BB2A0[] = { + ANIMCMD_FRAME(0, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83BB2A8[] = { + ANIMCMD_FRAME(8, 5), + ANIMCMD_END +}; + +const union AnimCmd *const gSpriteAnimTable_83BB2B0[] = { + gSpriteAnim_83BB2A0, + gSpriteAnim_83BB2A8 +}; + +const struct SpriteTemplate gSpriteTemplate_83BB2B8 = { + 3, + 0xdac8, + &gOamData_83BB298, + gSpriteAnimTable_83BB2B0, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +const struct OamData gOamData_83BB2D0 = { + .shape = ST_OAM_V_RECTANGLE, + .priority = 2 +}; + +const union AnimCmd gSpriteAnim_83BB2D8[] = { + ANIMCMD_FRAME(0, 5), + ANIMCMD_END +}; + +const union AnimCmd gSpriteAnim_83BB2E0[] = { + ANIMCMD_FRAME(2, 5), + ANIMCMD_END +}; + +const union AnimCmd *const gSpriteAnimTable_83BB2E8[] = { + gSpriteAnim_83BB2D8, + gSpriteAnim_83BB2E0 +}; + +const struct SpriteTemplate gSpriteTemplate_83BB2F0 = { + 6, + 0xdacf, + &gOamData_83BB2D0, + gSpriteAnimTable_83BB2E8, + NULL, + gDummySpriteAffineAnimTable, + sub_809A8C8 +}; + +// .text + +void sub_8099BF8(u8 boxId) +{ + gPokemonStorageSystemPtr->unk_08ba = FALSE; + gPokemonStorageSystemPtr->unk_08b4 = 0; + DmaFill32(3, 0, BG_SCREEN_ADDR(26), 0x1000); + sub_8099EB0(boxId, 0); + sub_809A23C(boxId); + sub_809A6DC(); + SpawnBoxIconSprites(boxId); + REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(26) | BGCNT_TXT512x256; +} + +void sub_8099C70(u8 whichBox) +{ + s8 r4 = sub_8099D90(whichBox); + sub_8099EB0(whichBox, r4); + gPokemonStorageSystemPtr->unk_08b6 = r4 * 6; + gPokemonStorageSystemPtr->unk_08b8 = 0x20; + gPokemonStorageSystemPtr->unk_08bb = whichBox; + gPokemonStorageSystemPtr->unk_08bc = r4 > 0 ? 0 : 5; + gPokemonStorageSystemPtr->unk_08be = r4; + gPokemonStorageSystemPtr->unk_08c0 = r4 > 0 ? 0x108 : 0x38; + gPokemonStorageSystemPtr->unk_08c2 = r4 > 0 ? 0 : 5; + gPokemonStorageSystemPtr->unk_08c4 = r4; + gPokemonStorageSystemPtr->unk_08c6 = 0; + gPokemonStorageSystemPtr->unk_08c8 = 2; + sub_809900C(whichBox, r4); + sub_809A3D0(whichBox, r4); + sub_809A774(r4); +} + +bool8 sub_8099D34(void) +{ + bool8 retVal = sub_80990AC(); + if (gPokemonStorageSystemPtr->unk_08b8 != 0) + { + gPokemonStorageSystemPtr->unk_08b4 += gPokemonStorageSystemPtr->unk_08b6; + gPokemonStorageSystemPtr->unk_08b4 &= 0x1ff; + if (--gPokemonStorageSystemPtr->unk_08b8 == 0) + { + sub_809A598(); + sub_809A810(); + } + return TRUE; + } + return retVal; +} + +s8 sub_8099D90(u8 boxId) +{ + u8 curBox = get_preferred_box(); + u8 i; + + for (i = 0; curBox != boxId; i++) + { + if (++curBox >= 14) + curBox = 0; + } + return i <= 6 ? 1 : -1; +} + +void sub_8099DCC(u8 wallpaperId) +{ + u8 curBox = get_preferred_box(); + gPokemonStorage.wallpaper[curBox] = wallpaperId; + gPokemonStorageSystemPtr->unk_1032 = 0; +} + +bool8 sub_8099E08(void) +{ + switch (gPokemonStorageSystemPtr->unk_1032) + { + case 0: + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0, 0x10, 0xffff); + gPokemonStorageSystemPtr->unk_1032++; + break; + case 1: + if (!UpdatePaletteFade()) + { + u8 curBox = get_preferred_box(); + sub_8099EB0(curBox, 0); + sub_809A654(); + BeginNormalPaletteFade(gPokemonStorageSystemPtr->unk_0d08, 1, 0x10, 0, 0xffff); + gPokemonStorageSystemPtr->unk_1032++; + } + break; + case 2: + if (!UpdatePaletteFade()) + gPokemonStorageSystemPtr->unk_1032++; + break; + case 3: + return FALSE; + } + return TRUE; +} + void sub_8099EB0(u8 boxId, s8 a1) { const struct WallpaperTable *wallpaperTable; @@ -855,43 +923,6 @@ void sub_809A3D0(u8 boxId, s8 a1) } } -const u16 PCPal_Arrow[] = INCBIN_U16("graphics/pokemon_storage/arrow.gbapal"); -const u8 PCGfx_Arrow[] = INCBIN_U8("graphics/pokemon_storage/arrow.4bpp"); - -const struct SpriteSheet gUnknown_083BB288 = {PCGfx_Arrow, 0x80, 6}; -const struct SpritePalette gUnknown_083BB290 = {PCPal_Arrow, 0xdacf}; - -const struct OamData gOamData_83BB298 = { - .shape = ST_OAM_H_RECTANGLE, - .size = 2, - .priority = 2 -}; - -const union AnimCmd gSpriteAnim_83BB2A0[] = { - ANIMCMD_FRAME(0, 5), - ANIMCMD_END -}; - -const union AnimCmd gSpriteAnim_83BB2A8[] = { - ANIMCMD_FRAME(8, 5), - ANIMCMD_END -}; - -const union AnimCmd *const gSpriteAnimTable_83BB2B0[] = { - gSpriteAnim_83BB2A0, - gSpriteAnim_83BB2A8 -}; - -const struct SpriteTemplate gSpriteTemplate_83BB2B8 = { - 3, - 0xdac8, - &gOamData_83BB298, - gSpriteAnimTable_83BB2B0, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallbackDummy -}; - void sub_809A598(void) { if (gPokemonStorageSystemPtr->unk_0cca == 0) @@ -937,3 +968,86 @@ s16 sub_809A6D0(u8 width) { return 0xb0 - width / 2; } + +void sub_809A6DC(void) +{ + u16 i; + + LoadSpriteSheet(&gUnknown_083BB288); + LoadSpritePalette(&gUnknown_083BB290); + for (i = 0; i < 2; i++) + { + u8 spriteId = CreateSprite(&gSpriteTemplate_83BB2F0, 0x5c + i * 0x88, 0x1c, 21); + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = gSprites + spriteId; + StartSpriteAnim(sprite, i); + sprite->data[3] = (i == 0) ? -1 : 1; + gPokemonStorageSystemPtr->unk_0d00[i] = sprite; + } + } + if (sub_809BF2C()) + sub_809A860(TRUE); +} + +void sub_809A774(s8 a0) +{ + u16 i; + + for (i = 0; i < 2; i++) + { + gPokemonStorageSystemPtr->unk_0d00[i]->pos2.x = 0; + gPokemonStorageSystemPtr->unk_0d00[i]->data[0] = 2; + } + if (a0 < 0) + { + gPokemonStorageSystemPtr->unk_0d00[0]->data[1] = 29; + gPokemonStorageSystemPtr->unk_0d00[1]->data[1] = 5; + gPokemonStorageSystemPtr->unk_0d00[0]->data[2] = 0x48; + gPokemonStorageSystemPtr->unk_0d00[1]->data[2] = 0x48; + } + else + { + gPokemonStorageSystemPtr->unk_0d00[0]->data[1] = 5; + gPokemonStorageSystemPtr->unk_0d00[1]->data[1] = 29; + gPokemonStorageSystemPtr->unk_0d00[0]->data[2] = 0xF8; + gPokemonStorageSystemPtr->unk_0d00[1]->data[2] = 0xF8; + } + gPokemonStorageSystemPtr->unk_0d00[0]->data[7] = 0; + gPokemonStorageSystemPtr->unk_0d00[1]->data[7] = 1; +} + +void sub_809A810(void) +{ + u16 i; + + for (i = 0; i < 2; i++) + { + gPokemonStorageSystemPtr->unk_0d00[i]->pos1.x = 0x88 * i + 0x5c; + gPokemonStorageSystemPtr->unk_0d00[i]->pos2.x = 0; + gPokemonStorageSystemPtr->unk_0d00[i]->invisible = FALSE; + } + sub_809A860(TRUE); +} + +void sub_809A860(bool8 a0) +{ + u16 i; + if (a0) + { + for (i = 0; i < 2; i++) + { + gPokemonStorageSystemPtr->unk_0d00[i]->data[0] = 1; + gPokemonStorageSystemPtr->unk_0d00[i]->data[1] = 0; + gPokemonStorageSystemPtr->unk_0d00[i]->data[2] = 0; + gPokemonStorageSystemPtr->unk_0d00[i]->data[4] = 0; + } + } + else + { + for (i = 0; i < 2; i++) + { + gPokemonStorageSystemPtr->unk_0d00[i]->data[0] = 0; + } + } +} -- cgit v1.2.3 From d8091a8fadb1089cbc090772bbb2fbcbab633357 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 21:01:43 -0500 Subject: through sub_809AA98 --- asm/pokemon_storage_system.s | 257 --------------------------------- include/pokemon_storage_system.h | 7 +- src/pokemon/pokemon_storage_system_4.c | 94 +++++++++++- 3 files changed, 92 insertions(+), 266 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 136d528f8..220266cd8 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,263 +5,6 @@ .text - thumb_func_start sub_809A8C8 -sub_809A8C8: @ 809A8C8 - push {lr} - adds r2, r0, 0 - movs r1, 0x2E - ldrsh r0, [r2, r1] - cmp r0, 0x4 - bhi _0809A994 - lsls r0, 2 - ldr r1, _0809A8E0 @ =_0809A8E4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0809A8E0: .4byte _0809A8E4 - .align 2, 0 -_0809A8E4: - .4byte _0809A8F8 - .4byte _0809A8FE - .4byte _0809A92C - .4byte _0809A932 - .4byte _0809A984 -_0809A8F8: - movs r0, 0 - strh r0, [r2, 0x24] - b _0809A994 -_0809A8FE: - ldrh r0, [r2, 0x30] - adds r0, 0x1 - movs r1, 0 - strh r0, [r2, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - ble _0809A994 - strh r1, [r2, 0x30] - ldrh r0, [r2, 0x34] - ldrh r3, [r2, 0x24] - adds r0, r3 - strh r0, [r2, 0x24] - ldrh r0, [r2, 0x32] - adds r0, 0x1 - strh r0, [r2, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _0809A994 - strh r1, [r2, 0x32] - strh r1, [r2, 0x24] - b _0809A994 -_0809A92C: - movs r0, 0x3 - strh r0, [r2, 0x2E] - b _0809A994 -_0809A932: - ldr r0, _0809A97C @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r0, _0809A980 @ =0x000008b6 - adds r1, r0 - ldrh r0, [r2, 0x20] - ldrh r1, [r1] - subs r0, r1 - strh r0, [r2, 0x20] - subs r0, 0x49 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xAE - bls _0809A958 - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r3] -_0809A958: - ldrh r0, [r2, 0x30] - subs r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - cmp r0, 0 - bne _0809A994 - ldrh r0, [r2, 0x32] - strh r0, [r2, 0x20] - adds r3, r2, 0 - adds r3, 0x3E - ldrb r1, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r3] - movs r0, 0x4 - strh r0, [r2, 0x2E] - b _0809A994 - .align 2, 0 -_0809A97C: .4byte gPokemonStorageSystemPtr -_0809A980: .4byte 0x000008b6 -_0809A984: - ldr r0, _0809A998 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809A99C @ =0x000008b6 - adds r0, r1 - ldrh r1, [r2, 0x20] - ldrh r0, [r0] - subs r1, r0 - strh r1, [r2, 0x20] -_0809A994: - pop {r0} - bx r0 - .align 2, 0 -_0809A998: .4byte gPokemonStorageSystemPtr -_0809A99C: .4byte 0x000008b6 - thumb_func_end sub_809A8C8 - - thumb_func_start sub_809A9A0 -sub_809A9A0: @ 809A9A0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - adds r6, r1, 0 - ldr r4, [sp, 0x18] - lsls r2, 24 - lsrs r7, r2, 24 - lsls r3, 24 - lsrs r3, 24 - mov r8, r3 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0809AA0C @ =gSpriteTemplate_83BB2F0 - lsls r5, 16 - asrs r5, 16 - lsls r6, 16 - asrs r6, 16 - adds r1, r5, 0 - adds r2, r6, 0 - adds r3, r4, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _0809AA18 - movs r1, 0x1 - ands r1, r7 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r5, _0809AA10 @ =gSprites - adds r6, r4, r5 - adds r0, r6, 0 - bl StartSpriteAnim - movs r0, 0x3 - mov r1, r8 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r6, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r6, 0x5] - adds r5, 0x1C - adds r4, r5 - ldr r0, _0809AA14 @ =SpriteCallbackDummy - str r0, [r4] - adds r0, r6, 0 - b _0809AA1A - .align 2, 0 -_0809AA0C: .4byte gSpriteTemplate_83BB2F0 -_0809AA10: .4byte gSprites -_0809AA14: .4byte SpriteCallbackDummy -_0809AA18: - movs r0, 0 -_0809AA1A: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809A9A0 - - thumb_func_start sub_809AA24 -sub_809AA24: @ 809AA24 - push {lr} - ldr r0, _0809AA38 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - cmp r1, 0x1 - beq _0809AA40 - ldr r1, _0809AA3C @ =gUnknown_020384E4 - movs r0, 0 - strb r0, [r1] - b _0809AA44 - .align 2, 0 -_0809AA38: .4byte gPokemonStorageSystemPtr -_0809AA3C: .4byte gUnknown_020384E4 -_0809AA40: - ldr r0, _0809AA78 @ =gUnknown_020384E4 - strb r1, [r0] -_0809AA44: - ldr r0, _0809AA7C @ =gUnknown_020384E5 - movs r1, 0 - strb r1, [r0] - ldr r0, _0809AA80 @ =gUnknown_020384E6 - strb r1, [r0] - ldr r0, _0809AA84 @ =gUnknown_020384E7 - strb r1, [r0] - ldr r0, _0809AA88 @ =gUnknown_020384E8 - strb r1, [r0] - ldr r0, _0809AA8C @ =gUnknown_020384E9 - strb r1, [r0] - bl sub_809B0D4 - bl sub_809CC04 - ldr r0, _0809AA90 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809AA94 @ =0x000011e2 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - bl sub_809BF74 - pop {r0} - bx r0 - .align 2, 0 -_0809AA78: .4byte gUnknown_020384E4 -_0809AA7C: .4byte gUnknown_020384E5 -_0809AA80: .4byte gUnknown_020384E6 -_0809AA84: .4byte gUnknown_020384E7 -_0809AA88: .4byte gUnknown_020384E8 -_0809AA8C: .4byte gUnknown_020384E9 -_0809AA90: .4byte gPokemonStorageSystemPtr -_0809AA94: .4byte 0x000011e2 - thumb_func_end sub_809AA24 - - thumb_func_start sub_809AA98 -sub_809AA98: @ 809AA98 - push {lr} - bl sub_809CC04 - bl sub_809C028 - ldr r0, _0809AAC0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809AAC4 @ =0x000011e2 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - ldr r0, _0809AAC8 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809AABA - bl sub_8098BF0 -_0809AABA: - pop {r0} - bx r0 - .align 2, 0 -_0809AAC0: .4byte gPokemonStorageSystemPtr -_0809AAC4: .4byte 0x000011e2 -_0809AAC8: .4byte gUnknown_020384E6 - thumb_func_end sub_809AA98 - thumb_func_start sub_809AACC sub_809AACC: @ 809AACC push {r4-r6,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 0131ce18b..1afed5d1b 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -144,7 +144,9 @@ struct PokemonStorageSystemData { u8 unk_117d; u8 filler_117e[0x42]; struct Sprite *unk_11c0; - u8 filler_11c4[0x24]; + u8 filler_11c4[0x1e]; + u8 unk_11e2; + u8 filler_11e3[5]; u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; @@ -200,6 +202,7 @@ void ResetPokemonStorageSystem(void); void ResetPSSMonIconSprites(void); void SpawnBoxIconSprites(u8 boxId); u8 get_preferred_box(void); +void sub_8098BF0(void); bool8 sub_80990AC(void); void sub_8099200(bool8 a0); void sub_8099310(void); @@ -208,7 +211,7 @@ void sub_80994A8(s16 a0); void sub_809954C(void); void sub_8099958(void); bool8 sub_8099990(void); -struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4); +struct Sprite *sub_809A9A0(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority); void sub_809BB90(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index b40cc916c..63d94b5a1 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -8,6 +8,13 @@ // Static type declarations +struct WallpaperTable { + const u8 *tiles; + u32 size; + const u8 *tileMap; + const u16 *palettes; +}; + // Static RAM declarations EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; @@ -19,13 +26,6 @@ EWRAM_DATA u8 gUnknown_020384E8 = 0; EWRAM_DATA u8 gUnknown_020384E9 = 0; EWRAM_DATA u16 gUnknown_020384EA = 0; -struct WallpaperTable { - const u8 *tiles; - u32 size; - const u8 *tileMap; - const u16 *palettes; -}; - // Static ROM declarations void sub_809900C(u8 boxId, s8 a1); @@ -45,6 +45,9 @@ void sub_809A774(s8 a0); void sub_809A810(void); void sub_809A8C8(struct Sprite *sprite); bool8 sub_809BF2C(void); +void sub_809BF74(void); +void sub_809C028(void); +void sub_809CC04(void); // .rodata @@ -1051,3 +1054,80 @@ void sub_809A860(bool8 a0) } } } + +void sub_809A8C8(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos2.x = 0; + break; + case 1: + if (++sprite->data[1] > 3) + { + sprite->data[1] = 0; + sprite->pos2.x += sprite->data[3]; + if (++sprite->data[2] > 5) + { + sprite->data[2] = 0; + sprite->pos2.x = 0; + } + } + break; + case 2: + sprite->data[0] = 3; + break; + case 3: + sprite->pos1.x -= gPokemonStorageSystemPtr->unk_08b6; + if (sprite->pos1.x < 0x49 || sprite->pos1.x > 0xf7) + sprite->invisible = TRUE; + if (--sprite->data[1] == 0) + { + sprite->pos1.x = sprite->data[2]; + sprite->invisible = FALSE; + sprite->data[0] = 4; + } + break; + case 4: + sprite->pos1.x -= gPokemonStorageSystemPtr->unk_08b6; + break; + } +} + +struct Sprite *sub_809A9A0(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority) +{ + u8 spriteId = CreateSprite(&gSpriteTemplate_83BB2F0, x, y, subpriority); + if (spriteId == MAX_SPRITES) + return NULL; + animId %= 2; + StartSpriteAnim(gSprites + spriteId, animId); + gSprites[spriteId].oam.priority = priority; + gSprites[spriteId].callback = SpriteCallbackDummy; + return gSprites + spriteId; +} + +void sub_809AA24(void) +{ + if (gPokemonStorageSystemPtr->unk_0005 != 1) + gUnknown_020384E4 = 0; + else + gUnknown_020384E4 = 1; + gUnknown_020384E5 = 0; + gUnknown_020384E6 = 0; + gUnknown_020384E7 = 0; + gUnknown_020384E8 = 0; + gUnknown_020384E9 = 0; + sub_809B0D4(); + sub_809CC04(); + gPokemonStorageSystemPtr->unk_11e2 = 1; + sub_809BF74(); +} + +void sub_809AA98(void) +{ + sub_809CC04(); + sub_809C028(); + gPokemonStorageSystemPtr->unk_11e2 = 1; + if (gUnknown_020384E6) + sub_8098BF0(); +} -- cgit v1.2.3 From 1288b752480e5d301c9ea9cff6d1efc737d6c5cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 21:25:25 -0500 Subject: through sub_809AB8C --- asm/pokemon_storage_system.s | 162 --------------------------------- src/pokemon/pokemon_storage_system_4.c | 58 +++++++++++- 2 files changed, 56 insertions(+), 164 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 220266cd8..b98fe24ec 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,168 +5,6 @@ .text - thumb_func_start sub_809AACC -sub_809AACC: @ 809AACC - push {r4-r6,lr} - adds r4, r2, 0 - adds r6, r3, 0 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - cmp r0, 0x4 - bhi _0809AB84 - lsls r0, 2 - ldr r1, _0809AAE8 @ =_0809AAEC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0809AAE8: .4byte _0809AAEC - .align 2, 0 -_0809AAEC: - .4byte _0809AB00 - .4byte _0809AB2E - .4byte _0809AB56 - .4byte _0809AB5E - .4byte _0809AB7C -_0809AB00: - adds r0, r5, 0 - movs r1, 0x6 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 3 - adds r1, 0x64 - strh r1, [r4] - adds r0, r5, 0 - movs r1, 0x6 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 3 - adds r1, 0x20 - strh r1, [r6] - b _0809AB84 -_0809AB2E: - cmp r5, 0 - bne _0809AB3A - movs r0, 0x68 - strh r0, [r4] - movs r0, 0x34 - b _0809AB82 -_0809AB3A: - cmp r5, 0x6 - bne _0809AB46 - movs r0, 0x98 - strh r0, [r4] - movs r0, 0x84 - b _0809AB82 -_0809AB46: - movs r0, 0x98 - strh r0, [r4] - subs r1, r5, 0x1 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 3 - adds r0, 0x4 - b _0809AB82 -_0809AB56: - movs r0, 0xA2 - strh r0, [r4] - movs r0, 0xC - b _0809AB82 -_0809AB5E: - ldr r0, _0809AB78 @ =gUnknown_020384E6 - ldrb r0, [r0] - movs r1, 0xE - cmp r0, 0 - beq _0809AB6A - movs r1, 0x8 -_0809AB6A: - strh r1, [r6] - movs r0, 0x58 - muls r0, r5 - adds r0, 0x78 - strh r0, [r4] - b _0809AB84 - .align 2, 0 -_0809AB78: .4byte gUnknown_020384E6 -_0809AB7C: - movs r0, 0xA0 - strh r0, [r4] - movs r0, 0x60 -_0809AB82: - strh r0, [r6] -_0809AB84: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_809AACC - - thumb_func_start sub_809AB8C -sub_809AB8C: @ 809AB8C - push {lr} - ldr r0, _0809ABB4 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _0809ABC0 - cmp r0, 0x1 - bne _0809ABF8 - ldr r0, _0809ABB8 @ =gUnknown_020384E5 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x64 - muls r0, r1 - ldr r1, _0809ABBC @ =gPlayerParty - adds r0, r1 - movs r1, 0xB - bl GetMonData - b _0809ABEA - .align 2, 0 -_0809ABB4: .4byte gUnknown_020384E4 -_0809ABB8: .4byte gUnknown_020384E5 -_0809ABBC: .4byte gPlayerParty -_0809ABC0: - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldr r1, _0809ABF0 @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - ldr r2, _0809ABF4 @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - movs r1, 0xB - bl GetBoxMonData -_0809ABEA: - lsls r0, 16 - lsrs r0, 16 - b _0809ABFA - .align 2, 0 -_0809ABF0: .4byte gUnknown_020384E5 -_0809ABF4: .4byte gPokemonStorage + 0x4 -_0809ABF8: - movs r0, 0 -_0809ABFA: - pop {r1} - bx r1 - thumb_func_end sub_809AB8C - thumb_func_start sub_809AC00 sub_809AC00: @ 809AC00 push {r4-r6,lr} diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 63d94b5a1..6d44b8ae8 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -1,6 +1,7 @@ // Includes #include "global.h" +#include "constants/species.h" #include "palette.h" #include "text.h" #include "menu.h" @@ -18,8 +19,8 @@ struct WallpaperTable { // Static RAM declarations EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; -EWRAM_DATA u8 gUnknown_020384E4 = 0; -EWRAM_DATA u8 gUnknown_020384E5 = 0; +EWRAM_DATA s8 gUnknown_020384E4 = 0; +EWRAM_DATA s8 gUnknown_020384E5 = 0; EWRAM_DATA u8 gUnknown_020384E6 = 0; EWRAM_DATA u8 gUnknown_020384E7 = 0; EWRAM_DATA u8 gUnknown_020384E8 = 0; @@ -1131,3 +1132,56 @@ void sub_809AA98(void) if (gUnknown_020384E6) sub_8098BF0(); } + +void sub_809AACC(u8 a0, u8 a1, u16 *a2, u16 *a3) +{ + switch (a0) + { + case 0: + *a2 = (a1 % 6) * 24 + 100; + *a3 = (a1 / 6) * 24 + 32; + break; + case 1: + if (a1 == 0) + { + *a2 = 0x68; + *a3 = 0x34; + } + else if (a1 == 6) + { + *a2 = 0x98; + *a3 = 0x84; + } + else + { + *a2 = 0x98; + *a3 = (a1 - 1) * 24 + 4; + } + break; + case 2: + *a2 = 0xa2; + *a3 = 0x0c; + break; + case 3: + *a3 = gUnknown_020384E6 ? 8 : 14; + *a2 = a1 * 0x58 + 0x78; + break; + case 4: + *a2 = 0xa0; + *a3 = 0x60; + break; + } +} + +u16 sub_809AB8C(void) +{ + switch (gUnknown_020384E4) + { + case 1: + return GetMonData(gPlayerParty + gUnknown_020384E5, MON_DATA_SPECIES); + case 0: + return GetBoxMonData(gPokemonStorage.boxes[get_preferred_box()] + gUnknown_020384E5, MON_DATA_SPECIES); + default: + return SPECIES_NONE; + } +} -- cgit v1.2.3 From 07f5db48c075f55a67136afb84ac804d525f5de3 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 20:39:52 -0600 Subject: start decompiling the behemoth that is sub_803E1B0 --- asm/pokemon_item_effect.s | 21 -- include/battle.h | 2 +- include/pokemon.h | 3 + include/pokemon_item_effect.h | 2 +- ld_script.txt | 1 + src/pokemon/pokemon_item_effect.c | 454 +++++++++++++++++++++++++++++++++++++- 6 files changed, 459 insertions(+), 24 deletions(-) diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index 6995dc62b..ba1b37dcb 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -5,27 +5,6 @@ .text - thumb_func_start ExecuteTableBasedItemEffect_ -ExecuteTableBasedItemEffect_: @ 803E18C - push {r4,lr} - sub sp, 0x4 - lsls r1, 16 - lsrs r1, 16 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - movs r4, 0 - str r4, [sp] - bl sub_803E1B0 - lsls r0, 24 - lsrs r0, 24 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end ExecuteTableBasedItemEffect_ - thumb_func_start sub_803E1B0 sub_803E1B0: @ 803E1B0 push {r4-r7,lr} diff --git a/include/battle.h b/include/battle.h index 27ed57045..c94325cd5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -473,7 +473,7 @@ struct sideTimer u8 lightscreenTimer; //0x1 u8 mistTimer; //0x2 u8 field3; //0x3 - u16 field4; //0x4 + u16 field4; //0x4 u8 spikesAmount; //0x6 u8 safeguardTimer; //0x7 u8 followmeTimer; //0x8 diff --git a/include/pokemon.h b/include/pokemon.h index 539323bdb..874ad7e09 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -628,5 +628,8 @@ void PartySpreadPokerus(struct Pokemon *party); struct Sprite *sub_80F7920(u16, u16, const u16 *); +bool8 HealStatusConditions(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId); + + #endif // GUARD_POKEMON_H diff --git a/include/pokemon_item_effect.h b/include/pokemon_item_effect.h index c09649aff..014612b05 100644 --- a/include/pokemon_item_effect.h +++ b/include/pokemon_item_effect.h @@ -1,6 +1,6 @@ #ifndef GUARD_POKEMON_ITEM_EFFECT_H #define GUARD_POKEMON_ITEM_EFFECT_H -bool8 ExecuteTableBasedItemEffect_(struct Pokemon *mon, u16, u8, u16); +bool8 ExecuteTableBasedItemEffect_(struct Pokemon *mon, u16, u8, u8); #endif // GUARD_POKEMON_ITEM_EFFECT_H diff --git a/ld_script.txt b/ld_script.txt index 128eb4c20..3a6305509 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -61,6 +61,7 @@ SECTIONS { src/pokemon/pokemon_1.o(.text); src/battle/calculate_base_damage.o(.text); src/pokemon/pokemon_2.o(.text); + src/pokemon/pokemon_item_effect.o(.text); asm/pokemon_item_effect.o(.text); src/pokemon/pokemon_3.o(.text); src/de_rom_8040FE0.o(.text); diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c index 66f2ff697..34a61a489 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon/pokemon_item_effect.c @@ -1,7 +1,29 @@ #include "global.h" +#include "constants/items.h" +#include "constants/species.h" +#include "battle.h" +#include "evolution_scene.h" +#include "ewram.h" +#include "item.h" +#include "main.h" #include "pokemon.h" +#include "pokemon_item_effect.h" +#include "rom_8077ABC.h" +#include "rom_8094928.h" +#include "util.h" -const u8 gUnknown_082082F2[] = { +extern s32 gBattleMoveDamage; +extern u8 gAbsentBankFlags; +extern u8 gBankInMenu; +extern u8 gNoOfAllBanks; +extern u16 gBattlePartyID[]; +extern u8 gActiveBank; +extern u8 gStringBank; +extern struct BattlePokemon gBattleMons[]; +extern struct BattleEnigmaBerry gEnigmaBerries[]; + +const u8 gUnknown_082082F2[] = +{ MON_DATA_HP_EV, MON_DATA_ATK_EV, MON_DATA_DEF_EV, @@ -9,3 +31,433 @@ const u8 gUnknown_082082F2[] = { MON_DATA_SPDEF_EV, MON_DATA_SPATK_EV }; + +bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e); + +bool8 ExecuteTableBasedItemEffect_(struct Pokemon *pkmn, u16 b, u8 c, u8 d) +{ + return sub_803E1B0(pkmn, b, c, d, 0); +} + +extern u8 gUnknown_08208238[]; +extern u8 gUnknown_08208240[]; + +bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) +{ + int r10; + int r5; + u8 sp18; + int sp1C = 1; + const u8 *sp20; + u8 sp24 = 6; + u32 sp28; + int sp2C = 0; + u8 sp30; + int sp34 = 4; + u16 item; + u16 r4; + + item = GetMonData(pkmn, MON_DATA_HELD_ITEM); + if (item == 0xAF) + { + if (gMain.inBattle) + sp30 = gEnigmaBerries[gBankInMenu].holdEffect; + else + sp30 = gSaveBlock1.enigmaBerry.holdEffect; + } + //_0803E240 + else + { + sp30 = ItemId_GetHoldEffect(item); + } + //_0803E248 + + gStringBank = gBankInMenu; + if (gMain.inBattle) + { + gActiveBank = gBankInMenu; + sp18 = (GetBankSide(gActiveBank) != 0); + r4 = b - 13; + while (sp18 < gNoOfAllBanks) + { + if (gBattlePartyID[sp18] == c) + { + sp34 = sp18; + break; + } + sp18 += 2; + } + } + //_0803E2E8 + else + { + gActiveBank = 0; + sp34 = 4; + r4 = b - 13; + } + //_0803E2F4 + + if (r4 > 0xA5) + return 1; + + if (gItemEffectTable[r4] == NULL && b != 0xAF) + return 1; + if (b == 0xAF) + { + //_0803E31E + if (gMain.inBattle) + sp20 = gEnigmaBerries[gActiveBank].itemEffect; + else + sp20 = gSaveBlock1.enigmaBerry.itemEffect; + } + //_0803E372 + else + { + sp20 = gItemEffectTable[r4]; + } + + // Now, the HUGE loop! + for (sp18 = 0; sp18 < 6; sp18++) + { + switch (sp18) + { + case 0: + //_0803E3A8 + if ((sp20[sp18] & 0x80) && gMain.inBattle + && sp34 != 4 && (gBattleMons[sp34].status2 & 0xF0000)) + { + gBattleMons[sp34].status2 &= 0xFFF0FFFF; + sp1C = 0; + } + //_0803E3F0 + if ((sp20[sp18] & 0x30) && !(gBattleMons[gActiveBank].status2 & 0x4000000)) + { + gBattleMons[gActiveBank].status2 |= 0x4000000; + sp1C = 0; + } + //_0803E41E + if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[1] < 12) + { + if (gBattleMons[gActiveBank].statStages[1] > 12) + gBattleMons[gActiveBank].statStages[1] = 12; + sp1C = 0; + break; + } + break; + case 1: + //_0803E474 + // r3 might be a temporary variable + if ((sp20[sp18] & 0xF0) && gBattleMons[gActiveBank].statStages[2] < 12) + { + gBattleMons[gActiveBank].statStages[2] += sp20[sp18] & 0xF0; + if (gBattleMons[gActiveBank].statStages[2] > 12) + gBattleMons[gActiveBank].statStages[2] = 12; + sp1C = 0; + } + //_0803E4BA + if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[3] < 12) + { + gBattleMons[gActiveBank].statStages[3] += sp20[sp18] & 0xF; + if (gBattleMons[gActiveBank].statStages[3] > 12) + gBattleMons[gActiveBank].statStages[3] = 12; + sp1C = 0; + } + break; + case 2: + //_0803E508 + if ((sp20[sp18] & 0xF0) && gBattleMons[gActiveBank].statStages[4] < 12) + { + gBattleMons[gActiveBank].statStages[4] += sp20[sp18] & 0xF0; + if (gBattleMons[gActiveBank].statStages[4] > 12) + gBattleMons[gActiveBank].statStages[4] = 12; + sp1C = 0; + } + //_0803E54E + if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[6] < 12) + { + gBattleMons[gActiveBank].statStages[6] += sp20[sp18] & 0xF; + if (gBattleMons[gActiveBank].statStages[6] > 12) + gBattleMons[gActiveBank].statStages[6] = 12; + sp1C = 0; + } + break; + case 3: + //_0803E59C + if ((sp20[sp18] & 0x80) && gSideTimers[GetBankSide(gActiveBank)].mistTimer == 0) + { + gSideTimers[GetBankSide(gActiveBank)].mistTimer = 5; + sp1C = 0; + } + //_0803E5E4 + if ((sp20[sp18] & 0x40) && GetMonData(pkmn, MON_DATA_LEVEL) != 100) + { + u32 exp = gExperienceTables[gBaseStats[GetMonData(pkmn, MON_DATA_SPECIES)].growthRate][GetMonData(pkmn, MON_DATA_LEVEL) + 1]; + + SetMonData(pkmn, MON_DATA_EXP, &exp); + CalculateMonStats(pkmn); + sp1C = 0; + } + //_0803E646 + if ((sp20[sp18] & 0x20) && HealStatusConditions(pkmn, c, 7, sp34) == 0) + { + if (sp34 != 4) + gBattleMons[sp34].status2 &= 0xF7FFFFFF; + sp1C = 0; + } + //_0803E682 + if ((sp20[sp18] & 0x10) && HealStatusConditions(pkmn, c, 0xF88, sp34) == 0) + sp1C = 0; + //_0803E6A2 + if ((sp20[sp18] & 8) && HealStatusConditions(pkmn, c, 16, sp34) == 0) + sp1C = 0; + //_0803E6C2 + if ((sp20[sp18] & 4) && HealStatusConditions(pkmn, c, 32, sp34) == 0) + sp1C = 0; + //_0803E6E2 + if ((sp20[sp18] & 2) && HealStatusConditions(pkmn, c, 64, sp34) == 0) + sp1C = 0; + //_0803E702 + if ((sp20[sp18] & 1) && gMain.inBattle + && sp34 != 4 && (gBattleMons[sp34].status2 & 7)) + { + gBattleMons[sp34].status2 &= ~7; + sp1C = 0; + } + break; + case 4: + //_0803E77C + r10 = sp20[sp18] & 0x20; + if (r10 != 0) + { + u32 sp0; + u16 r4; + + r10 &= 0xDF; + + sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) << (d * 2); + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); + sp28 = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); + if (sp0 <= 2 && sp28 > 4) + { + sp0 = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) + gUnknown_08208240[d]; + SetMonData(pkmn, MON_DATA_PP_BONUSES, &sp0); + + sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d), sp0, d) - sp28; + sp0 += GetMonData(pkmn, MON_DATA_PP1 + d, NULL); + SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); + sp1C = 0; + } + } + //_0803E854 + sp28 = 0; + while (r10 != 0) + { + if (r10 & 1) + { + u16 r5; + u32 r4; + u32 sp0; + u32 r1; + + switch (sp28) + { + case 0: + case 1: + //_0803E8AC + r5 = GetMonEVCount(pkmn); + if (r5 >= 510) + return 1; + r1 = GetMonData(pkmn, gUnknown_082082F2[sp28], NULL); + sp0 = r1; + if (r1 < 100) + { + r1 += sp20[sp24]; + if (r1 > 100) + r4 = 100 - r1; + else + r4 = sp20[sp24]; + //_0803E8F6 + if (r5 + r4 > 510) + r4 = (r4 - 510) - (r5 + r4); + sp0 += r4; + SetMonData(pkmn, gUnknown_082082F2[sp28], &sp0); + CalculateMonStats(pkmn); + sp24++; + sp1C = 0; + } + break; + case 2: + //_0803E934 + if (r10 & 0x10) + { + if (GetMonData(pkmn, MON_DATA_HP, NULL) != 0) + { + sp24++; + break; + } + if (gMain.inBattle) + { + if (sp34 != 4) + { + gAbsentBankFlags &= ~gBitTable[sp34]; + CopyPlayerPartyMonToBattleData(sp34, pokemon_order_func(gBattlePartyID[sp34])); + // tail merge, possibly? + } + //_0803E9B4 + else + { + gAbsentBankFlags &= ~gBitTable[gActiveBank ^ 2]; + } + //_0803E9CC + if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255) + gBattleResults.unk4++; + } + //to _0803EA0A + } + //_0803E9F4 + else + { + if (GetMonData(pkmn, MON_DATA_HP, NULL) == 0) + { + sp24++; + break; + } + } + //_0803EA0A + sp0 = sp20[sp24++]; + switch (sp0) + { + case 0xFF: + //_0803EA2C + if (sp0 == 0xFF) // wat? + sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) - GetMonData(pkmn, MON_DATA_HP, NULL); + break; + case 0xFE: + sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) * 2; + if (sp0 == 0) + sp0 = 1; + break; + case 0xFD: + sp0 = eStatHp; + break; + } + //_0803EA6C + if (GetMonData(pkmn, MON_DATA_MAX_HP) != GetMonData(pkmn, MON_DATA_HP)) + { + if (e == 0) + { + sp0 += GetMonData(pkmn, MON_DATA_HP, NULL); + if (sp0 > GetMonData(pkmn, MON_DATA_MAX_HP, NULL)) + sp0 = GetMonData(pkmn, MON_DATA_MAX_HP); + //_0803EAB8 + SetMonData(pkmn, MON_DATA_HP, &sp0); + if (gMain.inBattle && sp34 != 4) + { + gBattleMons[sp34].hp = sp0; + if (!(r10 & 0x10) && GetBankSide(gActiveBank) == 0) + { + u8 r5; + + if (gBattleResults.unk3 < 255) + gBattleResults.unk3++; + r5 = gActiveBank; + gActiveBank = sp34; + EmitGetAttributes(0, 0, 0); + MarkBufferBankForExecution(gActiveBank); + gActiveBank = r5; + } + } + //to _0803EB48 + } + //_0803EB40 + else + { + gBattleMoveDamage *= -1; + } + //_0803EB48 + sp1C = 0; + } + //_0803EB4C + r10 &= 0xEF; + break; + case 3: + if (!(r10 & 2)) + { + for (r5 = 0; r5 < 4; r5++) + { + u16 r4; + + sp0 = GetMonData(pkmn, MON_DATA_PP1 + r5, NULL); + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); + if (sp0 != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) + { + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); + if (sp0 > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) + { + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); + sp0 = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5); + } + //_0803EC28 + SetMonData(pkmn, MON_DATA_PP1 + r5, &sp0); + if (gMain.inBattle + && sp34 != 4 && !(gBattleMons[sp34].status2 & 0x200000) + && !(gDisableStructs[sp34].unk18_b & gBitTable[r5])) + gBattleMons[sp34].pp[r5] = sp0; + //_0803EC8E + sp1C = 0; + } + //_0803EC92 + } + //_0803EC9A + sp24++; + } + //_0803ECB8 + else + { + u16 r4; + + sp0 = GetMonData(pkmn, MON_DATA_PP1 + d, NULL); + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); + if (sp0 != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d)) + { + //_0803ED00 + sp0 = sp20[sp24++]; + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); + if (sp0 > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d)) + { + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); + sp0 = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); + } + //_0803ED74 + SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); + if (gMain.inBattle + && sp34 != 4 && !(gBattleMons[sp34].status2 & 0x200000) + && !(gDisableStructs[sp34].unk18_b & gBitTable[d])) + gBattleMons[sp34].pp[d] = sp0; + //_0803EDD8 + sp1C = 0; + } + } + break; + case 7: + //_0803EDF4 + { + u16 targetSpecies = GetEvolutionTargetSpecies(pkmn, 2, d); + + if (targetSpecies != SPECIES_NONE) + { + BeginEvolutionScene(pkmn, targetSpecies, 0, c); + return 0; + } + } + break; + } + } + //_0803EE0A + } + break; + } + } + //_0803F15A + return sp1C; +} -- cgit v1.2.3 From 20f4dd0677b5e01825b9e271a06f5d3ee4bb3252 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 14 Jan 2018 22:33:35 -0600 Subject: decompile sub_803E1B0 (nonmatching) --- src/pokemon/pokemon_item_effect.c | 181 +++++++++++++++++++++++++++++++++++++- 1 file changed, 177 insertions(+), 4 deletions(-) diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c index 34a61a489..d25e96f9d 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon/pokemon_item_effect.c @@ -6,6 +6,7 @@ #include "ewram.h" #include "item.h" #include "main.h" +#include "overworld.h" #include "pokemon.h" #include "pokemon_item_effect.h" #include "rom_8077ABC.h" @@ -40,18 +41,20 @@ bool8 ExecuteTableBasedItemEffect_(struct Pokemon *pkmn, u16 b, u8 c, u8 d) } extern u8 gUnknown_08208238[]; +extern u8 gUnknown_0820823C[]; extern u8 gUnknown_08208240[]; bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { int r10; - int r5; + u32 sp0; + u32 sp4; u8 sp18; int sp1C = 1; const u8 *sp20; u8 sp24 = 6; u32 sp28; - int sp2C = 0; + s8 sp2C = 0; u8 sp30; int sp34 = 4; u16 item; @@ -229,7 +232,6 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) r10 = sp20[sp18] & 0x20; if (r10 != 0) { - u32 sp0; u16 r4; r10 &= 0xDF; @@ -256,7 +258,6 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { u16 r5; u32 r4; - u32 sp0; u32 r1; switch (sp28) @@ -456,6 +457,178 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) //_0803EE0A } break; + case 5: + //_0803EE1E + r10 = sp20[sp18]; + sp28 = 0; + while (r10 != 0) + { + //_0803EE32 + if (r10 & 1) + { + u16 r5; + u32 r4; + u32 r1; + + switch (sp28) + { + case 0: + case 1: + case 2: + case 3: + //_0803EE74 + r5 = GetMonEVCount(pkmn); + if (r5 >= 510) + return 1; + r1 = GetMonData(pkmn, gUnknown_082082F2[sp28], NULL); + sp0 = r1; + if (r1 < 100) + { + r1 += sp20[sp24]; + if (r1 > 100) + r4 = 100 - r1; + else + r4 = sp20[sp24]; + //_0803EEC6 + if (r5 + r4 > 510) + r4 = (r4 + 510) - (r5 + r4); + sp0 += r4; + SetMonData(pkmn, gUnknown_082082F2[sp28], &sp0); + CalculateMonStats(pkmn); + sp1C = 0; + sp24++; + } + break; + case 4: + //_0803EEF8 + sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) << (d * 2); + if (sp0 < 3) + { + //_0803EF18 + u8 r4 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); + sp0 = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL); + sp0 &= gUnknown_0820823C[d]; + sp0 += gUnknown_08208240[d] * 3; + + SetMonData(pkmn, MON_DATA_PP_BONUSES, &sp0); + sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), sp0, d) - r4; + sp0 += GetMonData(pkmn, MON_DATA_PP1 + b, NULL); + SetMonData(pkmn, MON_DATA_PP1 + b, &sp0); + sp1C = 0; + } + break; + case 5: + //_0803EFCC + if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) < 100 && sp1C == 0 && sp2C == 0) + { + //_0803EFEC + sp2C = sp20[sp24]; + sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); + if (sp2C > 0 && sp30 == 0x1B) + { + sp4 = 0x96 * sp2C / 100; + } + //to _0803F0D0 hmm... + else + { + sp4 += sp2C; + } + //_0803F0DC (tail merged) + + if (sp2C > 0) + { + if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) + sp4++; + //_0803F0F4 + if (GetMonData(pkmn, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) + sp4++; + } + //_0803F112 + if (sp4 < 0) + sp4 = 0; + if (sp4 > 255) + sp4 = 255; + SetMonData(pkmn, MON_DATA_FRIENDSHIP, &sp4); + } + //to _0803F130 hmm... + sp24++; + break; + case 6: + //_0803F026 + if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) >= 100 && GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) < 200 + && sp1C == 0 && sp2C == 0) + { + sp2C = sp20[sp24]; + sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); + if (sp2C > 0 && sp30 == 0x1B) + { + //to _0803F0BE + sp4 = 0x96 * sp2C / 100; + } + else + { + sp4 += sp2C; + } + //_0803F0DC (tail merged) + + if (sp2C > 0) + { + if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) + sp4++; + //_0803F0F4 + if (GetMonData(pkmn, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) + sp4++; + } + //_0803F112 + if (sp4 < 0) + sp4 = 0; + if (sp4 > 255) + sp4 = 255; + SetMonData(pkmn, MON_DATA_FRIENDSHIP, &sp4); + } + //to _0803F130 hmm... + sp24++; + break; + case 7: + //_0803F07C + if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) >= 200 && sp1C == 0 && sp2C == 0) + { + sp2C = sp20[sp24]; + sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); + if (sp2C > 0 && sp30 == 0x1B) + { + //_0803F0BE + sp4 = 0x96 * sp2C / 100; + } + //_0803F0D0 + else + { + sp4 += sp2C; + } + //_0803F0DC + + if (sp2C > 0) + { + if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) + sp4++; + //_0803F0F4 + if (GetMonData(pkmn, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) + sp4++; + } + //_0803F112 + if (sp4 < 0) + sp4 = 0; + if (sp4 > 255) + sp4 = 255; + SetMonData(pkmn, MON_DATA_FRIENDSHIP, &sp4); + } + //to _0803F130 + sp24++; + break; + } + } + } + break; } } //_0803F15A -- cgit v1.2.3 From 2a2c61d46d77c0c974c785ddebab9105965e7275 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 00:40:55 -0600 Subject: get sub_803E1B0 closer --- src/pokemon/pokemon_item_effect.c | 81 ++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 36 deletions(-) diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c index d25e96f9d..b58298f52 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon/pokemon_item_effect.c @@ -46,19 +46,19 @@ extern u8 gUnknown_08208240[]; bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { - int r10; u32 sp0; - u32 sp4; - u8 sp18; - int sp1C = 1; + s32 sp4; + s32 sp18; + bool8 sp1C = TRUE; const u8 *sp20; u8 sp24 = 6; u32 sp28; s8 sp2C = 0; u8 sp30; - int sp34 = 4; + u8 sp34 = 4; u16 item; u16 r4; + u32 r10; item = GetMonData(pkmn, MON_DATA_HELD_ITEM); if (item == 0xAF) @@ -80,7 +80,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { gActiveBank = gBankInMenu; sp18 = (GetBankSide(gActiveBank) != 0); - r4 = b - 13; + //r4 = b - 13; while (sp18 < gNoOfAllBanks) { if (gBattlePartyID[sp18] == c) @@ -90,6 +90,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) } sp18 += 2; } + r4 = b - 13; } //_0803E2E8 else @@ -141,10 +142,10 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) //_0803E41E if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[1] < 12) { + gBattleMons[gActiveBank].statStages[1] += sp20[sp18] & 0xF; if (gBattleMons[gActiveBank].statStages[1] > 12) gBattleMons[gActiveBank].statStages[1] = 12; sp1C = 0; - break; } break; case 1: @@ -152,7 +153,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) // r3 might be a temporary variable if ((sp20[sp18] & 0xF0) && gBattleMons[gActiveBank].statStages[2] < 12) { - gBattleMons[gActiveBank].statStages[2] += sp20[sp18] & 0xF0; + gBattleMons[gActiveBank].statStages[2] += (sp20[sp18] & 0xF0) >> 4; if (gBattleMons[gActiveBank].statStages[2] > 12) gBattleMons[gActiveBank].statStages[2] = 12; sp1C = 0; @@ -164,23 +165,25 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (gBattleMons[gActiveBank].statStages[3] > 12) gBattleMons[gActiveBank].statStages[3] = 12; sp1C = 0; + //asm(""); } break; case 2: //_0803E508 - if ((sp20[sp18] & 0xF0) && gBattleMons[gActiveBank].statStages[4] < 12) + //asm_comment("case2"); + if ((sp20[sp18] & 0xF0) && gBattleMons[gActiveBank].statStages[6] < 12) { - gBattleMons[gActiveBank].statStages[4] += sp20[sp18] & 0xF0; - if (gBattleMons[gActiveBank].statStages[4] > 12) - gBattleMons[gActiveBank].statStages[4] = 12; + gBattleMons[gActiveBank].statStages[6] += (sp20[sp18] & 0xF0) >> 4; + if (gBattleMons[gActiveBank].statStages[6] > 12) + gBattleMons[gActiveBank].statStages[6] = 12; sp1C = 0; } //_0803E54E - if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[6] < 12) + if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[4] < 12) { - gBattleMons[gActiveBank].statStages[6] += sp20[sp18] & 0xF; - if (gBattleMons[gActiveBank].statStages[6] > 12) - gBattleMons[gActiveBank].statStages[6] = 12; + gBattleMons[gActiveBank].statStages[4] += sp20[sp18] & 0xF; + if (gBattleMons[gActiveBank].statStages[4] > 12) + gBattleMons[gActiveBank].statStages[4] = 12; sp1C = 0; } break; @@ -192,11 +195,10 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp1C = 0; } //_0803E5E4 - if ((sp20[sp18] & 0x40) && GetMonData(pkmn, MON_DATA_LEVEL) != 100) + if ((sp20[sp18] & 0x40) && GetMonData(pkmn, MON_DATA_LEVEL, NULL) != 100) { - u32 exp = gExperienceTables[gBaseStats[GetMonData(pkmn, MON_DATA_SPECIES)].growthRate][GetMonData(pkmn, MON_DATA_LEVEL) + 1]; - - SetMonData(pkmn, MON_DATA_EXP, &exp); + sp0 = gExperienceTables[gBaseStats[GetMonData(pkmn, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(pkmn, MON_DATA_LEVEL, NULL) + 1]; + SetMonData(pkmn, MON_DATA_EXP, &sp0); CalculateMonStats(pkmn); sp1C = 0; } @@ -229,22 +231,22 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) break; case 4: //_0803E77C - r10 = sp20[sp18] & 0x20; - if (r10 != 0) + r10 = sp20[sp18]; + if (r10 & 0x20) { - u16 r4; + //u16 r4; r10 &= 0xDF; sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) << (d * 2); - r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); - sp28 = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); + //r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); + sp28 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); if (sp0 <= 2 && sp28 > 4) { sp0 = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) + gUnknown_08208240[d]; SetMonData(pkmn, MON_DATA_PP_BONUSES, &sp0); - sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d), sp0, d) - sp28; + sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), sp0, d) - sp28; sp0 += GetMonData(pkmn, MON_DATA_PP1 + d, NULL); SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); sp1C = 0; @@ -256,7 +258,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { if (r10 & 1) { - u16 r5; + s32 r5; u32 r4; u32 r1; @@ -303,15 +305,17 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) gAbsentBankFlags &= ~gBitTable[sp34]; CopyPlayerPartyMonToBattleData(sp34, pokemon_order_func(gBattlePartyID[sp34])); // tail merge, possibly? + if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255) + gBattleResults.unk4++; } //_0803E9B4 else { gAbsentBankFlags &= ~gBitTable[gActiveBank ^ 2]; + if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255) + gBattleResults.unk4++; } //_0803E9CC - if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255) - gBattleResults.unk4++; } //to _0803EA0A } @@ -343,13 +347,13 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) break; } //_0803EA6C - if (GetMonData(pkmn, MON_DATA_MAX_HP) != GetMonData(pkmn, MON_DATA_HP)) + if (GetMonData(pkmn, MON_DATA_MAX_HP, NULL) != GetMonData(pkmn, MON_DATA_HP, NULL)) { if (e == 0) { sp0 += GetMonData(pkmn, MON_DATA_HP, NULL); if (sp0 > GetMonData(pkmn, MON_DATA_MAX_HP, NULL)) - sp0 = GetMonData(pkmn, MON_DATA_MAX_HP); + sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL); //_0803EAB8 SetMonData(pkmn, MON_DATA_HP, &sp0); if (gMain.inBattle && sp34 != 4) @@ -373,7 +377,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) //_0803EB40 else { - gBattleMoveDamage *= -1; + gBattleMoveDamage = -sp0; } //_0803EB48 sp1C = 0; @@ -392,6 +396,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); if (sp0 != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) { + sp0 += sp20[sp24]; r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); if (sp0 > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) { @@ -422,7 +427,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (sp0 != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d)) { //_0803ED00 - sp0 = sp20[sp24++]; + sp0 += sp20[sp24++]; r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); if (sp0 > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d)) { @@ -455,6 +460,8 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) } } //_0803EE0A + sp28++; + r10 >>= 1; } break; case 5: @@ -480,7 +487,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) r5 = GetMonEVCount(pkmn); if (r5 >= 510) return 1; - r1 = GetMonData(pkmn, gUnknown_082082F2[sp28], NULL); + r1 = GetMonData(pkmn, gUnknown_082082F2[sp28 + 2], NULL); sp0 = r1; if (r1 < 100) { @@ -493,7 +500,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (r5 + r4 > 510) r4 = (r4 + 510) - (r5 + r4); sp0 += r4; - SetMonData(pkmn, gUnknown_082082F2[sp28], &sp0); + SetMonData(pkmn, gUnknown_082082F2[sp28 + 2], &sp0); CalculateMonStats(pkmn); sp1C = 0; sp24++; @@ -526,7 +533,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); if (sp2C > 0 && sp30 == 0x1B) { - sp4 = 0x96 * sp2C / 100; + sp4 += 0x96 * sp2C / 100; } //to _0803F0D0 hmm... else @@ -627,6 +634,8 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) break; } } + sp28++; + r10 >>= 1; } break; } -- cgit v1.2.3 From fd3ab3fcc69708d082f3791052823ec333165b36 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 12:49:20 -0600 Subject: get sub_803E1B0 a bit closer --- src/pokemon/pokemon_item_effect.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c index b58298f52..b4b7206dc 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon/pokemon_item_effect.c @@ -57,10 +57,9 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) u8 sp30; u8 sp34 = 4; u16 item; - u16 r4; - u32 r10; + u8 r10; - item = GetMonData(pkmn, MON_DATA_HELD_ITEM); + item = GetMonData(pkmn, MON_DATA_HELD_ITEM, NULL); if (item == 0xAF) { if (gMain.inBattle) @@ -80,7 +79,6 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { gActiveBank = gBankInMenu; sp18 = (GetBankSide(gActiveBank) != 0); - //r4 = b - 13; while (sp18 < gNoOfAllBanks) { if (gBattlePartyID[sp18] == c) @@ -90,22 +88,20 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) } sp18 += 2; } - r4 = b - 13; } //_0803E2E8 else { gActiveBank = 0; sp34 = 4; - r4 = b - 13; } //_0803E2F4 - - if (r4 > 0xA5) + + if (b < 13 || b > 0xB2) return 1; - - if (gItemEffectTable[r4] == NULL && b != 0xAF) + if (gItemEffectTable[b - 13] == NULL && b != 0xAF) return 1; + if (b == 0xAF) { //_0803E31E @@ -117,7 +113,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) //_0803E372 else { - sp20 = gItemEffectTable[r4]; + sp20 = gItemEffectTable[b - 13]; } // Now, the HUGE loop! @@ -127,10 +123,11 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { case 0: //_0803E3A8 + // TODO: stop re-loading sp34 if ((sp20[sp18] & 0x80) && gMain.inBattle && sp34 != 4 && (gBattleMons[sp34].status2 & 0xF0000)) { - gBattleMons[sp34].status2 &= 0xFFF0FFFF; + gBattleMons[sp34].status2 &= ~0xF0000; sp1C = 0; } //_0803E3F0 @@ -236,7 +233,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { //u16 r4; - r10 &= 0xDF; + r10 &= ~0x20; sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) << (d * 2); //r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); @@ -287,6 +284,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) CalculateMonStats(pkmn); sp24++; sp1C = 0; + //asm(""); } break; case 2: -- cgit v1.2.3 From 72b9e7b2c2ee10d566fd923a9cfa1176ba283cb9 Mon Sep 17 00:00:00 2001 From: Devin Date: Mon, 15 Jan 2018 14:00:13 -0500 Subject: Add most English song and SFX names as comments in songs.h and song_table.inc Ported from my work in pokeemerald. --- include/constants/songs.h | 708 ++++++++++++++++++++++----------------------- sound/song_table.inc | 712 +++++++++++++++++++++++----------------------- 2 files changed, 710 insertions(+), 710 deletions(-) diff --git a/include/constants/songs.h b/include/constants/songs.h index 5225f5899..59c69b16e 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -2,371 +2,371 @@ #define GUARD_CONSTANTS_SONGS_H #define SE_STOP 0 -#define SE_KAIFUKU 1 -#define SE_PC_LOGON 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_LOGON 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_HAIK 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_HAIK 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_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 #define BGM_STOP 349 -#define BGM_TETSUJI 350 -#define BGM_FIELD13 351 -#define BGM_KACHI22 352 -#define BGM_KACHI2 353 -#define BGM_KACHI3 354 -#define BGM_KACHI5 355 -#define BGM_PCC 356 -#define BGM_NIBI 357 -#define BGM_SUIKUN 358 -#define BGM_DOORO1 359 -#define BGM_DOORO_X1 360 -#define BGM_DOORO_X3 361 -#define BGM_MACHI_S2 362 -#define BGM_MACHI_S4 363 -#define BGM_GIM 364 -#define BGM_NAMINORI 365 -#define BGM_DAN01 366 -#define BGM_FANFA1 367 -#define BGM_ME_ASA 368 -#define BGM_ME_BACHI 369 -#define BGM_FANFA4 370 -#define BGM_FANFA5 371 -#define BGM_ME_WAZA 372 -#define BGM_BIJYUTU 373 -#define BGM_DOORO_X4 374 -#define BGM_FUNE_KAN 375 -#define BGM_ME_SHINKA 376 -#define BGM_SHINKA 377 -#define BGM_ME_WASURE 378 -#define BGM_SYOUJOEYE 379 -#define BGM_BOYEYE 380 -#define BGM_DAN02 381 -#define BGM_MACHI_S3 382 -#define BGM_ODAMAKI 383 -#define BGM_B_TOWER 384 -#define BGM_SWIMEYE 385 -#define BGM_DAN03 386 -#define BGM_ME_KINOMI 387 -#define BGM_ME_TAMA 388 -#define BGM_ME_B_BIG 389 -#define BGM_ME_B_SMALL 390 -#define BGM_ME_ZANNEN 391 -#define BGM_BD_TIME 392 -#define BGM_TEST1 393 -#define BGM_TEST2 394 -#define BGM_TEST3 395 -#define BGM_TEST4 396 -#define BGM_TEST 397 -#define BGM_GOMACHI0 398 -#define BGM_GOTOWN 399 -#define BGM_POKECEN 400 -#define BGM_NEXTROAD 401 -#define BGM_GRANROAD 402 -#define BGM_CYCLING 403 -#define BGM_FRIENDLY 404 -#define BGM_MISHIRO 405 -#define BGM_TOZAN 406 -#define BGM_GIRLEYE 407 -#define BGM_MINAMO 408 -#define BGM_ASHROAD 409 -#define BGM_EVENT0 410 -#define BGM_DEEPDEEP 411 -#define BGM_KACHI1 412 -#define BGM_TITLE3 413 -#define BGM_DEMO1 414 -#define BGM_GIRL_SUP 415 -#define BGM_HAGESHII 416 -#define BGM_KAKKOII 417 -#define BGM_KAZANBAI 418 -#define BGM_AQA_0 419 -#define BGM_TSURETEK 420 -#define BGM_BOY_SUP 421 -#define BGM_RAINBOW 422 -#define BGM_AYASII 423 -#define BGM_KACHI4 424 -#define BGM_ROPEWAY 425 -#define BGM_CASINO 426 -#define BGM_HIGHTOWN 427 -#define BGM_SAFARI 428 -#define BGM_C_ROAD 429 -#define BGM_AJITO 430 -#define BGM_M_BOAT 431 -#define BGM_M_DUNGON 432 -#define BGM_FINECITY 433 -#define BGM_MACHUPI 434 -#define BGM_P_SCHOOL 435 -#define BGM_DENDOU 436 -#define BGM_TONEKUSA 437 -#define BGM_MABOROSI 438 -#define BGM_CON_FAN 439 -#define BGM_CONTEST0 440 -#define BGM_MGM0 441 -#define BGM_T_BATTLE 442 -#define BGM_OOAME 443 -#define BGM_HIDERI 444 -#define BGM_RUNECITY 445 -#define BGM_CON_K 446 -#define BGM_EIKOU_R 447 -#define BGM_KARAKURI 448 -#define BGM_HUTAGO 449 -#define BGM_SITENNOU 450 -#define BGM_YAMA_EYE 451 -#define BGM_CONLOBBY 452 -#define BGM_INTER_V 453 -#define BGM_DAIGO 454 -#define BGM_THANKFOR 455 -#define BGM_END 456 -#define BGM_BATTLE27 457 -#define BGM_BATTLE31 458 -#define BGM_BATTLE20 459 -#define BGM_BATTLE32 460 -#define BGM_BATTLE33 461 -#define BGM_BATTLE36 462 -#define BGM_BATTLE34 463 -#define BGM_BATTLE35 464 -#define BGM_BATTLE38 465 -#define BGM_BATTLE30 466 +#define BGM_TETSUJI 350 // Littleroot Town Test 'TETSUJI' +#define BGM_FIELD13 351 // GSC - Route 38 +#define BGM_KACHI22 352 // Wild Pokémon Defeated +#define BGM_KACHI2 353 // Wild Pokémon Defeated with Intro +#define BGM_KACHI3 354 // Gym Leader Defeated +#define BGM_KACHI5 355 // Victory! Elite Four +#define BGM_PCC 356 // Crystal - Pokémon Communication Center +#define BGM_NIBI 357 // GSC - Viridian/Saffron/Pewter/etc +#define BGM_SUIKUN 358 // Crystal - Battle! Legendary Beasts +#define BGM_DOORO1 359 // Route 101 +#define BGM_DOORO_X1 360 // Route 110 +#define BGM_DOORO_X3 361 // Route 120 +#define BGM_MACHI_S2 362 // Petalburg City +#define BGM_MACHI_S4 363 // Oldale Town +#define BGM_GIM 364 // Gym +#define BGM_NAMINORI 365 // Surfing +#define BGM_DAN01 366 // Caves and Darkness +#define BGM_FANFA1 367 // Level Up! +#define BGM_ME_ASA 368 // Pokémon Healed +#define BGM_ME_BACHI 369 // Obtained a Badge! +#define BGM_FANFA4 370 // Obtained an Item! +#define BGM_FANFA5 371 // Your Pokémon Just Evolved! +#define BGM_ME_WAZA 372 // Obtained a TM/HM! +#define BGM_BIJYUTU 373 // Lilycove Musseum +#define BGM_DOORO_X4 374 // Route 122/Intro +#define BGM_FUNE_KAN 375 // Slateport Museum +#define BGM_ME_SHINKA 376 // Evolution Intro +#define BGM_SHINKA 377 // Evolution +#define BGM_ME_WASURE 378 // Move Deleted +#define BGM_SYOUJOEYE 379 // Encounter! Tuber +#define BGM_BOYEYE 380 // Encounter! Boy +#define BGM_DAN02 381 // Abandoned Ship +#define BGM_MACHI_S3 382 // Fortree City +#define BGM_ODAMAKI 383 // Professor Birch's Lab +#define BGM_B_TOWER 384 // Battle Tower (RS) +#define BGM_SWIMEYE 385 // Encounter! Swimmer +#define BGM_DAN03 386 // Meteor Falls +#define BGM_ME_KINOMI 387 // Obtained a Berry! +#define BGM_ME_TAMA 388 // Awakening the Super-Ancient Pokémon +#define BGM_ME_B_BIG 389 // Slots Jackpot! +#define BGM_ME_B_SMALL 390 // Slots Victory! +#define BGM_ME_ZANNEN 391 // Too bad! +#define BGM_BD_TIME 392 // Roulette! +#define BGM_TEST1 393 // Contest Test 1 +#define BGM_TEST2 394 // Contest Test 2 +#define BGM_TEST3 395 // Contest Test 3 +#define BGM_TEST4 396 // Contest Test 4 +#define BGM_TEST 397 // Encounter! Gentleman (Test?) +#define BGM_GOMACHI0 398 // Verdanturf Town +#define BGM_GOTOWN 399 // Rustboro City +#define BGM_POKECEN 400 // Pokémon Center +#define BGM_NEXTROAD 401 // Route 104 +#define BGM_GRANROAD 402 // Route 119 +#define BGM_CYCLING 403 // Cycling +#define BGM_FRIENDLY 404 // Pokémart +#define BGM_MISHIRO 405 // Littleroot Town +#define BGM_TOZAN 406 // Sky Pillar +#define BGM_GIRLEYE 407 // Encounter! Girl +#define BGM_MINAMO 408 // Lilycove City +#define BGM_ASHROAD 409 // Route 111 +#define BGM_EVENT0 410 // Help me! +#define BGM_DEEPDEEP 411 // Underwater +#define BGM_KACHI1 412 // Victory! Trainer +#define BGM_TITLE3 413 // Title Screen +#define BGM_DEMO1 414 // Opening Movie +#define BGM_GIRL_SUP 415 // Encounter! May +#define BGM_HAGESHII 416 // Encounter! Biker +#define BGM_KAKKOII 417 // Encounter! Electric Trainer +#define BGM_KAZANBAI 418 // Route 113 +#define BGM_AQA_0 419 // Encounter! Team Aqua +#define BGM_TSURETEK 420 // Follow Me! +#define BGM_BOY_SUP 421 // Encounter! Brendan +#define BGM_RAINBOW 422 // Ever Grande City +#define BGM_AYASII 423 // Encounter! Psychic +#define BGM_KACHI4 424 // Victory! Aqua/Magma Grunt +#define BGM_ROPEWAY 425 // Cable Car +#define BGM_CASINO 426 // Game Corner +#define BGM_HIGHTOWN 427 // Dewford Town +#define BGM_SAFARI 428 // Safari Zone +#define BGM_C_ROAD 429 // Victory Toad +#define BGM_AJITO 430 // Aqua/Magma Hideout +#define BGM_M_BOAT 431 // Sailing +#define BGM_M_DUNGON 432 // Mt. Pyre (Inside) +#define BGM_FINECITY 433 // Slateport City +#define BGM_MACHUPI 434 // Mt. Pyre (Outside) +#define BGM_P_SCHOOL 435 // Pokémon Trainer's School +#define BGM_DENDOU 436 // Hall of Fame +#define BGM_TONEKUSA 437 // Lavaridge Town +#define BGM_MABOROSI 438 // Sealed Chamber +#define BGM_CON_FAN 439 // You are the Champion! +#define BGM_CONTEST0 440 // Pokémon Contest +#define BGM_MGM0 441 // Encounter! Team Magma +#define BGM_T_BATTLE 442 // Opening Battle +#define BGM_OOAME 443 // The Flood +#define BGM_HIDERI 444 // The Drought +#define BGM_RUNECITY 445 // Sootopolis City +#define BGM_CON_K 446 // Berry Blending Results +#define BGM_EIKOU_R 447 // Hall of Fame +#define BGM_KARAKURI 448 // Trick House +#define BGM_HUTAGO 449 // Encounter! Kid +#define BGM_SITENNOU 450 // Encounter! Elite Four +#define BGM_YAMA_EYE 451 // Encounter! Hiker +#define BGM_CONLOBBY 452 // Contest Lobby +#define BGM_INTER_V 453 // Encounter! Gabby and Ty +#define BGM_DAIGO 454 // Encounter! Wallace +#define BGM_THANKFOR 455 // Credits +#define BGM_END 456 // The End +#define BGM_BATTLE27 457 // Battle! Wild Pokémon +#define BGM_BATTLE31 458 // Battle! Team Aqua/Magma +#define BGM_BATTLE20 459 // Battle! Trainer +#define BGM_BATTLE32 460 // Battle! Gym Leader +#define BGM_BATTLE33 461 // Battle! Champion +#define BGM_BATTLE36 462 // Battle! Regi Trio +#define BGM_BATTLE34 463 // Battle! Legendary Pokémon +#define BGM_BATTLE35 464 // Battle! Rival +#define BGM_BATTLE38 465 // Battle! Elite Four +#define BGM_BATTLE30 466 // Battle! Archie/Maxie #define BGM_ROUTE_118 0x7FFF // What is this for? diff --git a/sound/song_table.inc b/sound/song_table.inc index ac2e3b494..d2aa7d327 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -1,253 +1,253 @@ .align 2 gSongTable:: @ 845548C song se_stop, 0, 0 - song se_kaifuku, 1, 1 - song se_pc_logon, 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_logon, 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_haik, 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_haik, 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_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 song song_248, 2, 2 song song_249, 2, 2 song song_250, 2, 2 @@ -350,125 +350,125 @@ gSongTable:: @ 845548C song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 - song bgm_tetsuji, 0, 0 - song bgm_field13, 0, 0 - song bgm_kachi22, 0, 0 - song bgm_kachi2, 0, 0 - song bgm_kachi3, 0, 0 - song bgm_kachi5, 0, 0 - song bgm_pcc, 0, 0 - song bgm_nibi, 0, 0 - song bgm_suikun, 0, 0 - song bgm_dooro1, 0, 0 - song bgm_dooro_x1, 0, 0 - song bgm_dooro_x3, 0, 0 - song bgm_machi_s2, 0, 0 - song bgm_machi_s4, 0, 0 - song bgm_gim, 0, 0 - song bgm_naminori, 0, 0 - song bgm_dan01, 0, 0 - song bgm_fanfa1, 2, 2 - song bgm_me_asa, 2, 2 - song bgm_me_bachi, 2, 2 - song bgm_fanfa4, 2, 2 - song bgm_fanfa5, 2, 2 - song bgm_me_waza, 2, 2 - song bgm_bijyutu, 0, 0 - song bgm_dooro_x4, 0, 0 - song bgm_fune_kan, 0, 0 - song bgm_me_shinka, 2, 2 - song bgm_shinka, 0, 0 - song bgm_me_wasure, 2, 2 - song bgm_syoujoeye, 0, 0 - song bgm_boyeye, 0, 0 - song bgm_dan02, 0, 0 - song bgm_machi_s3, 0, 0 - song bgm_odamaki, 0, 0 - song bgm_b_tower, 0, 0 - song bgm_swimeye, 0, 0 - song bgm_dan03, 0, 0 - song bgm_me_kinomi, 2, 2 - song bgm_me_tama, 2, 2 - song bgm_me_b_big, 2, 2 - song bgm_me_b_small, 2, 2 - song bgm_me_zannen, 2, 2 - song bgm_bd_time, 0, 0 - song bgm_test1, 0, 0 - song bgm_test2, 0, 0 - song bgm_test3, 0, 0 - song bgm_test4, 0, 0 - song bgm_test, 0, 0 - song bgm_gomachi0, 0, 0 - song bgm_gotown, 0, 0 - song bgm_pokecen, 0, 0 - song bgm_nextroad, 0, 0 - song bgm_granroad, 0, 0 - song bgm_cycling, 0, 0 - song bgm_friendly, 0, 0 - song bgm_mishiro, 0, 0 - song bgm_tozan, 0, 0 - song bgm_girleye, 0, 0 - song bgm_minamo, 0, 0 - song bgm_ashroad, 0, 0 - song bgm_event0, 0, 0 - song bgm_deepdeep, 0, 0 - song bgm_kachi1, 0, 0 - song bgm_title3, 0, 0 - song bgm_demo1, 0, 0 - song bgm_girl_sup, 0, 0 - song bgm_hageshii, 0, 0 - song bgm_kakkoii, 0, 0 - song bgm_kazanbai, 0, 0 - song bgm_aqa_0, 0, 0 - song bgm_tsuretek, 0, 0 - song bgm_boy_sup, 0, 0 - song bgm_rainbow, 0, 0 - song bgm_ayasii, 0, 0 - song bgm_kachi4, 0, 0 - song bgm_ropeway, 0, 0 - song bgm_casino, 0, 0 - song bgm_hightown, 0, 0 - song bgm_safari, 0, 0 - song bgm_c_road, 0, 0 - song bgm_ajito, 0, 0 - song bgm_m_boat, 0, 0 - song bgm_m_dungon, 0, 0 - song bgm_finecity, 0, 0 - song bgm_machupi, 0, 0 - song bgm_p_school, 0, 0 - song bgm_dendou, 0, 0 - song bgm_tonekusa, 0, 0 - song bgm_maborosi, 0, 0 - song bgm_con_fan, 0, 0 - song bgm_contest0, 0, 0 - song bgm_mgm0, 0, 0 - song bgm_t_battle, 0, 0 - song bgm_ooame, 0, 0 - song bgm_hideri, 0, 0 - song bgm_runecity, 0, 0 - song bgm_con_k, 0, 0 - song bgm_eikou_r, 0, 0 - song bgm_karakuri, 0, 0 - song bgm_hutago, 0, 0 - song bgm_sitennou, 0, 0 - song bgm_yama_eye, 0, 0 - song bgm_conlobby, 0, 0 - song bgm_inter_v, 0, 0 - song bgm_daigo, 0, 0 - song bgm_thankfor, 0, 0 - song bgm_end, 0, 0 - song bgm_battle27, 0, 0 - song bgm_battle31, 0, 0 - song bgm_battle20, 0, 0 - song bgm_battle32, 0, 0 - song bgm_battle33, 0, 0 - song bgm_battle36, 0, 0 - song bgm_battle34, 0, 0 - song bgm_battle35, 0, 0 - song bgm_battle38, 0, 0 - song bgm_battle30, 0, 0 - song bgm_radio_tower_occupied, 0, 0 + song bgm_tetsuji, 0, 0 @ Littleroot Town Test 'TETSUJI' + song bgm_field13, 0, 0 @ GSC - Route 38 + song bgm_kachi22, 0, 0 @ Wild Pokémon Defeated + song bgm_kachi2, 0, 0 @ Wild Pokémon Defeated with Intro + song bgm_kachi3, 0, 0 @ Gym Leader Defeated + song bgm_kachi5, 0, 0 @ Victory! Elite Four + song bgm_pcc, 0, 0 @ Crystal - Pokémon Communication Center + song bgm_nibi, 0, 0 @ GSC - Viridian/Saffron/Pewter/etc + song bgm_suikun, 0, 0 @ Crystal - Battle! Legendary Beasts + song bgm_dooro1, 0, 0 @ Route 101 + song bgm_dooro_x1, 0, 0 @ Route 110 + song bgm_dooro_x3, 0, 0 @ Route 120 + song bgm_machi_s2, 0, 0 @ Petalburg City + song bgm_machi_s4, 0, 0 @ Oldale Town + song bgm_gim, 0, 0 @ Gym + song bgm_naminori, 0, 0 @ Surfing + song bgm_dan01, 0, 0 @ Caves and Darkness + song bgm_fanfa1, 2, 2 @ Level Up! + song bgm_me_asa, 2, 2 @ Pokémon Healed + song bgm_me_bachi, 2, 2 @ Obtained a Badge! + song bgm_fanfa4, 2, 2 @ Obtained an Item! + song bgm_fanfa5, 2, 2 @ Your Pokémon Just Evolved! + song bgm_me_waza, 2, 2 @ Obtained a TM/HM! + song bgm_bijyutu, 0, 0 @ Lilycove Museum + song bgm_dooro_x4, 0, 0 @ Route 122/Intro + song bgm_fune_kan, 0, 0 @ Slateport Museum + song bgm_me_shinka, 2, 2 @ Evolution Intro + song bgm_shinka, 0, 0 @ Evolution + song bgm_me_wasure, 2, 2 @ Move Deleted + song bgm_syoujoeye, 0, 0 @ Encounter! Tuber + song bgm_boyeye, 0, 0 @ Encounter! Boy + song bgm_dan02, 0, 0 @ Abandoned Ship + song bgm_machi_s3, 0, 0 @ Fortree City + song bgm_odamaki, 0, 0 @ Professor Birch's Lab + song bgm_b_tower, 0, 0 @ Battle Tower (RS) + song bgm_swimeye, 0, 0 @ Encounter! Swimmer + song bgm_dan03, 0, 0 @ Meteor Falls + song bgm_me_kinomi, 2, 2 @ Obtained a Berry! + song bgm_me_tama, 2, 2 @ Awakening the Super-Ancient Pokémon + song bgm_me_b_big, 2, 2 @ Slots Jackpot! + song bgm_me_b_small, 2, 2 @ Slots Victory! + song bgm_me_zannen, 2, 2 @ Too bad! + song bgm_bd_time, 0, 0 @ Roulette! + song bgm_test1, 0, 0 @ Contest Test 1 + song bgm_test2, 0, 0 @ Contest Test 2 + song bgm_test3, 0, 0 @ Contest Test 3 + song bgm_test4, 0, 0 @ Contest Test 4 + song bgm_test, 0, 0 @ Encounter! Gentleman (Test?) + song bgm_gomachi0, 0, 0 @ Verdanturf Town + song bgm_gotown, 0, 0 @ Rustboro City + song bgm_pokecen, 0, 0 @ Pokémon Center + song bgm_nextroad, 0, 0 @ Route 104 + song bgm_granroad, 0, 0 @ Route 119 + song bgm_cycling, 0, 0 @ Cycling + song bgm_friendly, 0, 0 @ Pokémart + song bgm_mishiro, 0, 0 @ Littleroot Town + song bgm_tozan, 0, 0 @ Sky Pillar + song bgm_girleye, 0, 0 @ Encounter! Girl + song bgm_minamo, 0, 0 @ Lilycove City + song bgm_ashroad, 0, 0 @ Route 111 + song bgm_event0, 0, 0 @ Help me! + song bgm_deepdeep, 0, 0 @ Underwater + song bgm_kachi1, 0, 0 @ Victory! Trainer + song bgm_title3, 0, 0 @ Title Screen + song bgm_demo1, 0, 0 @ Opening Movie + song bgm_girl_sup, 0, 0 @ Encounter! May + song bgm_hageshii, 0, 0 @ Encounter! Biker + song bgm_kakkoii, 0, 0 @ Encounter! Electric Trainer + song bgm_kazanbai, 0, 0 @ Route 113 + song bgm_aqa_0, 0, 0 @ Encounter! Team Aqua + song bgm_tsuretek, 0, 0 @ Follow Me! + song bgm_boy_sup, 0, 0 @ Encounter! Brendan + song bgm_rainbow, 0, 0 @ Ever Grande City + song bgm_ayasii, 0, 0 @ Encounter! Psychic + song bgm_kachi4, 0, 0 @ Victory! Aqua/Magma Grunt + song bgm_ropeway, 0, 0 @ Cable Car + song bgm_casino, 0, 0 @ Game Corner + song bgm_hightown, 0, 0 @ Dewford Town + song bgm_safari, 0, 0 @ Safari Zone + song bgm_c_road, 0, 0 @ Victory Road + song bgm_ajito, 0, 0 @ Aqua/Magma Hideout + song bgm_m_boat, 0, 0 @ Sailing + song bgm_m_dungon, 0, 0 @ Mt. Pyre (Inside) + song bgm_finecity, 0, 0 @ Slateport City + song bgm_machupi, 0, 0 @ Mt. Pyte (Outside) + song bgm_p_school, 0, 0 @ Pokémon Trainer's School + song bgm_dendou, 0, 0 @ Hall of Fame + song bgm_tonekusa, 0, 0 @ Lavaridge Town + song bgm_maborosi, 0, 0 @ Sealed Chamber + song bgm_con_fan, 0, 0 @ You are the Champion! + song bgm_contest0, 0, 0 @ Pokémon Contest + song bgm_mgm0, 0, 0 @ Encounter! Team Magma + song bgm_t_battle, 0, 0 @ Opening Battle + song bgm_ooame, 0, 0 @ The Flood + song bgm_hideri, 0, 0 @ The Drought + song bgm_runecity, 0, 0 @ Sootopolis City + song bgm_con_k, 0, 0 @ Berry Blending Results + song bgm_eikou_r, 0, 0 @ Hall of Fame + song bgm_karakuri, 0, 0 @ Trick House + song bgm_hutago, 0, 0 @ Encounter! Kid + song bgm_sitennou, 0, 0 @ Encounter! Elite Four + song bgm_yama_eye, 0, 0 @ Encounter! Hiker + song bgm_conlobby, 0, 0 @ Contest Lobby + song bgm_inter_v, 0, 0 @ Encounter! Gabby and Ty + song bgm_daigo, 0, 0 @ Encounter! Wallace + song bgm_thankfor, 0, 0 @ Credits + song bgm_end, 0, 0 @ The End + song bgm_battle27, 0, 0 @ Battle! Wild Pokémon + song bgm_battle31, 0, 0 @ Battle! Team Aqua/Magma + song bgm_battle20, 0, 0 @ Battle! Trainer + song bgm_battle32, 0, 0 @ Battle! Gym Leader + song bgm_battle33, 0, 0 @ Battle! Champion + song bgm_battle36, 0, 0 @ Battle! Regi Trio + song bgm_battle34, 0, 0 @ Battle! Legendary Pokémon (dupe) + song bgm_battle35, 0, 0 @ Battle! Rival + song bgm_battle38, 0, 0 @ Battle! Elite Four + song bgm_battle30, 0, 0 @ Battle! Archie/Maxie + song bgm_radio_tower_occupied, 0, 0 @ GSC - Radio Tower Takeover! .align 2 -dummy_song_header: @ 845632C +dummy_song_header: @ 845632C .byte 0, 0, 0, 0 -- cgit v1.2.3 From e342649f56cd1580df7acc5a0b69d46f095487ab Mon Sep 17 00:00:00 2001 From: Devin Date: Mon, 15 Jan 2018 14:08:51 -0500 Subject: 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 59c69b16e..920873a7c 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -78,7 +78,7 @@ #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 @@ -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 -- cgit v1.2.3 From 68528382d5d8a17c5d6d65f1566a9ba7c807e14a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 15:10:56 -0500 Subject: through sub_809AF18 --- asm/pokemon_storage_system.s | 478 --------------------------------- include/pokemon_storage_system.h | 16 +- src/pokemon/pokemon_storage_system_4.c | 121 +++++++++ 3 files changed, 135 insertions(+), 480 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index b98fe24ec..835a87f5f 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,484 +5,6 @@ .text - thumb_func_start sub_809AC00 -sub_809AC00: @ 809AC00 - push {r4-r6,lr} - ldr r0, _0809AC14 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r0, _0809AC18 @ =0x000011dc - adds r1, r4, r0 - ldrh r0, [r1] - cmp r0, 0 - bne _0809AC1C - movs r0, 0 - b _0809AD2C - .align 2, 0 -_0809AC14: .4byte gPokemonStorageSystemPtr -_0809AC18: .4byte 0x000011dc -_0809AC1C: - subs r0, 0x1 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - beq _0809AD0C - ldr r1, _0809ACF4 @ =0x000011c8 - adds r3, r4, r1 - ldr r2, _0809ACF8 @ =0x000011d0 - adds r1, r4, r2 - ldr r0, [r3] - ldr r1, [r1] - adds r0, r1 - str r0, [r3] - ldr r6, _0809ACFC @ =0x000011cc - adds r2, r4, r6 - ldr r0, _0809AD00 @ =0x000011d4 - adds r1, r4, r0 - ldr r0, [r2] - ldr r1, [r1] - adds r0, r1 - str r0, [r2] - movs r1, 0x8E - lsls r1, 5 - adds r5, r4, r1 - ldr r1, [r5] - ldr r0, [r3] - asrs r0, 8 - strh r0, [r1, 0x20] - ldr r1, [r5] - ldr r0, [r2] - asrs r0, 8 - strh r0, [r1, 0x22] - ldr r1, [r5] - ldrh r2, [r1, 0x20] - movs r3, 0x20 - ldrsh r0, [r1, r3] - movs r3, 0x80 - lsls r3, 1 - cmp r0, r3 - ble _0809AC78 - ldr r6, _0809AD04 @ =0xffffff00 - adds r0, r2, r6 - lsls r0, 16 - asrs r0, 16 - adds r0, 0x40 - strh r0, [r1, 0x20] -_0809AC78: - ldr r1, [r5] - ldrh r2, [r1, 0x20] - movs r6, 0x20 - ldrsh r0, [r1, r6] - cmp r0, 0x3F - bgt _0809AC90 - movs r0, 0x40 - subs r0, r2 - lsls r0, 16 - asrs r0, 16 - subs r0, r3, r0 - strh r0, [r1, 0x20] -_0809AC90: - ldr r1, [r5] - ldrh r2, [r1, 0x22] - movs r3, 0x22 - ldrsh r0, [r1, r3] - cmp r0, 0xB0 - ble _0809ACA8 - adds r0, r2, 0 - subs r0, 0xB0 - lsls r0, 16 - asrs r0, 16 - subs r0, 0x10 - strh r0, [r1, 0x22] -_0809ACA8: - ldr r2, [r5] - ldrh r3, [r2, 0x22] - movs r6, 0x22 - ldrsh r0, [r2, r6] - movs r1, 0x10 - negs r1, r1 - cmp r0, r1 - bge _0809ACC4 - subs r0, r1, r3 - movs r1, 0xB0 - lsls r0, 16 - asrs r0, 16 - subs r1, r0 - strh r1, [r2, 0x22] -_0809ACC4: - ldr r0, _0809AD08 @ =0x000011e3 - adds r1, r4, r0 - ldrb r0, [r1] - cmp r0, 0 - beq _0809AD2A - subs r0, 0x1 - strb r0, [r1] - lsls r0, 24 - cmp r0, 0 - bne _0809AD2A - ldr r2, [r5] - adds r2, 0x3F - ldrb r3, [r2] - lsrs r1, r3, 1 - movs r0, 0x1 - eors r1, r0 - ands r1, r0 - lsls r1, 1 - movs r0, 0x3 - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2] - b _0809AD2A - .align 2, 0 -_0809ACF4: .4byte 0x000011c8 -_0809ACF8: .4byte 0x000011d0 -_0809ACFC: .4byte 0x000011cc -_0809AD00: .4byte 0x000011d4 -_0809AD04: .4byte 0xffffff00 -_0809AD08: .4byte 0x000011e3 -_0809AD0C: - movs r1, 0x8E - lsls r1, 5 - adds r2, r4, r1 - ldr r1, [r2] - ldr r3, _0809AD34 @ =0x000011d8 - adds r0, r4, r3 - ldrh r0, [r0] - strh r0, [r1, 0x20] - ldr r1, [r2] - ldr r6, _0809AD38 @ =0x000011da - adds r0, r4, r6 - ldrh r0, [r0] - strh r0, [r1, 0x22] - bl sub_809AFB8 -_0809AD2A: - movs r0, 0x1 -_0809AD2C: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_0809AD34: .4byte 0x000011d8 -_0809AD38: .4byte 0x000011da - thumb_func_end sub_809AC00 - - thumb_func_start sub_809AD3C -sub_809AD3C: @ 809AD3C - push {r4-r6,lr} - sub sp, 0x4 - adds r4, r0, 0 - adds r5, r1, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - mov r6, sp - adds r6, 0x2 - adds r0, r4, 0 - adds r1, r5, 0 - mov r2, sp - adds r3, r6, 0 - bl sub_809AACC - ldr r0, _0809AD88 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - movs r2, 0x8F - lsls r2, 5 - adds r0, r1, r2 - strb r4, [r0] - ldr r3, _0809AD8C @ =0x000011e1 - adds r0, r1, r3 - strb r5, [r0] - mov r0, sp - ldrh r2, [r0] - subs r3, 0x9 - adds r0, r1, r3 - strh r2, [r0] - ldrh r0, [r6] - ldr r2, _0809AD90 @ =0x000011da - adds r1, r2 - strh r0, [r1] - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809AD88: .4byte gPokemonStorageSystemPtr -_0809AD8C: .4byte 0x000011e1 -_0809AD90: .4byte 0x000011da - thumb_func_end sub_809AD3C - - thumb_func_start sub_809AD94 -sub_809AD94: @ 809AD94 - push {r4-r7,lr} - ldr r0, _0809ADB0 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r3, _0809ADB4 @ =0x000011de - adds r1, r2, r3 - ldrh r1, [r1] - adds r4, r0, 0 - cmp r1, 0 - beq _0809ADBC - ldr r0, _0809ADB8 @ =0x000011dc - adds r1, r2, r0 - movs r0, 0xC - b _0809ADC2 - .align 2, 0 -_0809ADB0: .4byte gPokemonStorageSystemPtr -_0809ADB4: .4byte 0x000011de -_0809ADB8: .4byte 0x000011dc -_0809ADBC: - ldr r3, _0809AE04 @ =0x000011dc - adds r1, r2, r3 - movs r0, 0x6 -_0809ADC2: - strh r0, [r1] - ldr r2, [r4] - ldr r0, _0809AE08 @ =0x000011e3 - adds r1, r2, r0 - ldrb r0, [r1] - cmp r0, 0 - beq _0809ADDA - ldr r3, _0809AE04 @ =0x000011dc - adds r0, r2, r3 - ldrh r0, [r0] - lsrs r0, 1 - strb r0, [r1] -_0809ADDA: - ldr r1, _0809AE0C @ =0x000011de - adds r0, r2, r1 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0809AE14 - cmp r1, 0x1 - beq _0809AE30 - ldr r3, _0809AE10 @ =0x000011da - adds r0, r2, r3 - movs r3, 0 - ldrsh r1, [r0, r3] - movs r3, 0x8E - lsls r3, 5 - adds r0, r2, r3 - ldr r0, [r0] - movs r2, 0x22 - ldrsh r0, [r0, r2] - b _0809AE46 - .align 2, 0 -_0809AE04: .4byte 0x000011dc -_0809AE08: .4byte 0x000011e3 -_0809AE0C: .4byte 0x000011de -_0809AE10: .4byte 0x000011da -_0809AE14: - ldr r3, _0809AE2C @ =0x000011da - adds r0, r2, r3 - movs r3, 0 - ldrsh r1, [r0, r3] - movs r3, 0x8E - lsls r3, 5 - adds r0, r2, r3 - ldr r0, [r0] - movs r2, 0x22 - ldrsh r0, [r0, r2] - adds r0, 0xC0 - b _0809AE46 - .align 2, 0 -_0809AE2C: .4byte 0x000011da -_0809AE30: - ldr r3, _0809AE74 @ =0x000011da - adds r0, r2, r3 - movs r3, 0 - ldrsh r1, [r0, r3] - movs r3, 0x8E - lsls r3, 5 - adds r0, r2, r3 - ldr r0, [r0] - movs r2, 0x22 - ldrsh r0, [r0, r2] - subs r0, 0xC0 -_0809AE46: - subs r7, r1, r0 - ldr r2, [r4] - ldr r3, _0809AE78 @ =0x000011df - adds r0, r2, r3 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _0809AE80 - cmp r1, 0x1 - beq _0809AE9C - ldr r1, _0809AE7C @ =0x000011d8 - adds r0, r2, r1 - movs r3, 0 - ldrsh r1, [r0, r3] - movs r3, 0x8E - lsls r3, 5 - adds r0, r2, r3 - ldr r0, [r0] - movs r2, 0x20 - ldrsh r0, [r0, r2] - b _0809AEB2 - .align 2, 0 -_0809AE74: .4byte 0x000011da -_0809AE78: .4byte 0x000011df -_0809AE7C: .4byte 0x000011d8 -_0809AE80: - ldr r3, _0809AE98 @ =0x000011d8 - adds r0, r2, r3 - movs r3, 0 - ldrsh r1, [r0, r3] - movs r3, 0x8E - lsls r3, 5 - adds r0, r2, r3 - ldr r0, [r0] - movs r2, 0x20 - ldrsh r0, [r0, r2] - adds r0, 0xC0 - b _0809AEB2 - .align 2, 0 -_0809AE98: .4byte 0x000011d8 -_0809AE9C: - ldr r3, _0809AF00 @ =0x000011d8 - adds r0, r2, r3 - movs r3, 0 - ldrsh r1, [r0, r3] - movs r3, 0x8E - lsls r3, 5 - adds r0, r2, r3 - ldr r0, [r0] - movs r2, 0x20 - ldrsh r0, [r0, r2] - subs r0, 0xC0 -_0809AEB2: - subs r0, r1, r0 - lsls r7, 8 - lsls r0, 8 - ldr r4, [r4] - ldr r3, _0809AF04 @ =0x000011d0 - adds r6, r4, r3 - ldr r1, _0809AF08 @ =0x000011dc - adds r5, r4, r1 - ldrh r1, [r5] - bl __divsi3 - str r0, [r6] - ldr r2, _0809AF0C @ =0x000011d4 - adds r6, r4, r2 - ldrh r1, [r5] - adds r0, r7, 0 - bl __divsi3 - str r0, [r6] - ldr r3, _0809AF10 @ =0x000011c8 - adds r2, r4, r3 - movs r0, 0x8E - lsls r0, 5 - adds r1, r4, r0 - ldr r0, [r1] - movs r3, 0x20 - ldrsh r0, [r0, r3] - lsls r0, 8 - str r0, [r2] - ldr r0, _0809AF14 @ =0x000011cc - adds r4, r0 - ldr r0, [r1] - movs r1, 0x22 - ldrsh r0, [r0, r1] - lsls r0, 8 - str r0, [r4] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809AF00: .4byte 0x000011d8 -_0809AF04: .4byte 0x000011d0 -_0809AF08: .4byte 0x000011dc -_0809AF0C: .4byte 0x000011d4 -_0809AF10: .4byte 0x000011c8 -_0809AF14: .4byte 0x000011cc - thumb_func_end sub_809AD94 - - thumb_func_start sub_809AF18 -sub_809AF18: @ 809AF18 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_809AD3C - bl sub_809AD94 - ldr r0, _0809AFA4 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - bne _0809AF46 - ldr r0, _0809AFA8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim -_0809AF46: - cmp r4, 0x1 - bne _0809AF70 - ldr r0, _0809AFAC @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - beq _0809AF70 - ldr r0, _0809AFA8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r2, _0809AFB0 @ =0x000011e2 - adds r1, r0, r2 - strb r4, [r1] - ldr r1, _0809AFB4 @ =0x000011c4 - adds r0, r1 - ldr r1, [r0] - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] -_0809AF70: - cmp r4, 0 - beq _0809AF9E - cmp r4, 0 - blt _0809AF9E - cmp r4, 0x3 - bgt _0809AF9E - ldr r0, _0809AFA8 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r0, _0809AFB4 @ =0x000011c4 - adds r2, r0 - ldr r1, [r2] - adds r1, 0x3E - ldrb r0, [r1] - movs r3, 0x4 - orrs r0, r3 - strb r0, [r1] - ldr r2, [r2] - ldrb r1, [r2, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - orrs r0, r3 - strb r0, [r2, 0x5] -_0809AF9E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809AFA4: .4byte gUnknown_020384E6 -_0809AFA8: .4byte gPokemonStorageSystemPtr -_0809AFAC: .4byte gUnknown_020384E4 -_0809AFB0: .4byte 0x000011e2 -_0809AFB4: .4byte 0x000011c4 - thumb_func_end sub_809AF18 - thumb_func_start sub_809AFB8 sub_809AFB8: @ 809AFB8 push {r4,r5,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 1afed5d1b..e911664de 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -144,9 +144,21 @@ struct PokemonStorageSystemData { u8 unk_117d; u8 filler_117e[0x42]; struct Sprite *unk_11c0; - u8 filler_11c4[0x1e]; + struct Sprite *unk_11c4; + s32 unk_11c8; + s32 unk_11cc; + s32 unk_11d0; + s32 unk_11d4; + s16 unk_11d8; + s16 unk_11da; + u16 unk_11dc; + s8 unk_11de; + s8 unk_11df; + u8 unk_11e0; + u8 unk_11e1; u8 unk_11e2; - u8 filler_11e3[5]; + u8 unk_11e3; + u8 filler_11e4[4]; u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 6d44b8ae8..06c2eeff5 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -44,6 +44,7 @@ s16 sub_809A6D0(u8 width); void sub_809A6DC(void); void sub_809A774(s8 a0); void sub_809A810(void); +void sub_809AFB8(void); void sub_809A8C8(struct Sprite *sprite); bool8 sub_809BF2C(void); void sub_809BF74(void); @@ -1185,3 +1186,123 @@ u16 sub_809AB8C(void) return SPECIES_NONE; } } + +bool8 sub_809AC00(void) +{ + s16 tmp; + if (gPokemonStorageSystemPtr->unk_11dc == 0) + return FALSE; + if (--gPokemonStorageSystemPtr->unk_11dc) + { + gPokemonStorageSystemPtr->unk_11c8 += gPokemonStorageSystemPtr->unk_11d0; + gPokemonStorageSystemPtr->unk_11cc += gPokemonStorageSystemPtr->unk_11d4; + gPokemonStorageSystemPtr->unk_11c0->pos1.x = gPokemonStorageSystemPtr->unk_11c8 >> 8; + gPokemonStorageSystemPtr->unk_11c0->pos1.y = gPokemonStorageSystemPtr->unk_11cc >> 8; + if (gPokemonStorageSystemPtr->unk_11c0->pos1.x > 0x100) + { + tmp = gPokemonStorageSystemPtr->unk_11c0->pos1.x - 0x100; + gPokemonStorageSystemPtr->unk_11c0->pos1.x = tmp + 0x40; + } + if (gPokemonStorageSystemPtr->unk_11c0->pos1.x < 0x40) + { + tmp = 0x40 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; + gPokemonStorageSystemPtr->unk_11c0->pos1.x = 0x100 - tmp; + } + if (gPokemonStorageSystemPtr->unk_11c0->pos1.y > 0xb0) + { + tmp = gPokemonStorageSystemPtr->unk_11c0->pos1.y - 0xb0; + gPokemonStorageSystemPtr->unk_11c0->pos1.y = tmp - 0x10; + } + if (gPokemonStorageSystemPtr->unk_11c0->pos1.y < -0x10) + { + tmp = -0x10 - gPokemonStorageSystemPtr->unk_11c0->pos1.y; + gPokemonStorageSystemPtr->unk_11c0->pos1.y = 0xb0 - tmp; + } + if (gPokemonStorageSystemPtr->unk_11e3 && --gPokemonStorageSystemPtr->unk_11e3 == 0) + gPokemonStorageSystemPtr->unk_11c0->vFlip = gPokemonStorageSystemPtr->unk_11c0->vFlip ? FALSE : TRUE; + } + else + { + gPokemonStorageSystemPtr->unk_11c0->pos1.x = gPokemonStorageSystemPtr->unk_11d8; + gPokemonStorageSystemPtr->unk_11c0->pos1.y = gPokemonStorageSystemPtr->unk_11da; + sub_809AFB8(); + } + return TRUE; +} + +void sub_809AD3C(u8 a0, u8 a1) +{ + u16 x; + u16 y; + + sub_809AACC(a0, a1, &x, &y); + gPokemonStorageSystemPtr->unk_11e0 = a0; + gPokemonStorageSystemPtr->unk_11e1 = a1; + gPokemonStorageSystemPtr->unk_11d8 = x; + gPokemonStorageSystemPtr->unk_11da = y; +} + +void sub_809AD94(void) +{ + int r7; + int r0; + + if (gPokemonStorageSystemPtr->unk_11de || gPokemonStorageSystemPtr->unk_11df) + gPokemonStorageSystemPtr->unk_11dc = 12; + else + gPokemonStorageSystemPtr->unk_11dc = 6; + if (gPokemonStorageSystemPtr->unk_11e3) + gPokemonStorageSystemPtr->unk_11e3 = gPokemonStorageSystemPtr->unk_11dc >> 1; + switch (gPokemonStorageSystemPtr->unk_11de) + { + default: + r7 = gPokemonStorageSystemPtr->unk_11da - gPokemonStorageSystemPtr->unk_11c0->pos1.y; + break; + case -1: + r7 = gPokemonStorageSystemPtr->unk_11da - 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.y; + break; + case 1: + r7 = gPokemonStorageSystemPtr->unk_11da + 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.y; + break; + } + switch (gPokemonStorageSystemPtr->unk_11df) + { + default: + r0 = gPokemonStorageSystemPtr->unk_11d8 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; + break; + case -1: + r0 = gPokemonStorageSystemPtr->unk_11d8 - 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; + break; + case 1: + r0 = gPokemonStorageSystemPtr->unk_11d8 + 0xc0 - gPokemonStorageSystemPtr->unk_11c0->pos1.x; + break; + } + r7 <<= 8; + r0 <<= 8; + gPokemonStorageSystemPtr->unk_11d0 = r0 / gPokemonStorageSystemPtr->unk_11dc; + gPokemonStorageSystemPtr->unk_11d4 = r7 / gPokemonStorageSystemPtr->unk_11dc; + gPokemonStorageSystemPtr->unk_11c8 = gPokemonStorageSystemPtr->unk_11c0->pos1.x << 8; + gPokemonStorageSystemPtr->unk_11cc = gPokemonStorageSystemPtr->unk_11c0->pos1.y << 8; +} + +void sub_809AF18(u8 a0, u8 a1) +{ + sub_809AD3C(a0, a1); + sub_809AD94(); + if (gUnknown_020384E6 == 0) + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 1); + if (a0 == 1 && gUnknown_020384E4 != 1) + { + gPokemonStorageSystemPtr->unk_11e2 = a0; + gPokemonStorageSystemPtr->unk_11c4->invisible = TRUE; + } + switch (a0) + { + case 0: + break; + case 1 ... 3: + gPokemonStorageSystemPtr->unk_11c4->invisible = TRUE; + gPokemonStorageSystemPtr->unk_11c4->oam.priority = 1; + break; + } +} -- cgit v1.2.3 From 650f85e7db8ea123256d661a7db59c9325115130 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 15:46:17 -0500 Subject: through sub_809B130 --- asm/pokemon_storage_system.s | 222 --------------------------------- data/pokemon_storage_system.s | 22 ---- include/pokemon_storage_system.h | 4 +- ld_script.txt | 2 +- src/pokemon/pokemon_storage_system_4.c | 85 ++++++++++++- src/pokemon/pokemon_storage_system_6.c | 14 --- 6 files changed, 88 insertions(+), 261 deletions(-) delete mode 100644 src/pokemon/pokemon_storage_system_6.c diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 835a87f5f..5a1853361 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,226 +5,6 @@ .text - thumb_func_start sub_809AFB8 -sub_809AFB8: @ 809AFB8 - push {r4,r5,lr} - ldr r5, _0809B000 @ =gUnknown_020384E4 - ldr r0, _0809B004 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - movs r1, 0x8F - lsls r1, 5 - adds r0, r4, r1 - ldrb r0, [r0] - strb r0, [r5] - ldr r1, _0809B008 @ =gUnknown_020384E5 - ldr r2, _0809B00C @ =0x000011e1 - adds r0, r4, r2 - ldrb r0, [r0] - strb r0, [r1] - ldr r0, _0809B010 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - bne _0809AFEA - movs r1, 0x8E - lsls r1, 5 - adds r0, r4, r1 - ldr r0, [r0] - movs r1, 0 - bl StartSpriteAnim -_0809AFEA: - bl sub_809BF74 - movs r0, 0 - ldrsb r0, [r5, r0] - cmp r0, 0x1 - beq _0809B020 - cmp r0, 0x1 - bgt _0809B014 - cmp r0, 0 - beq _0809B034 - b _0809B05E - .align 2, 0 -_0809B000: .4byte gUnknown_020384E4 -_0809B004: .4byte gPokemonStorageSystemPtr -_0809B008: .4byte gUnknown_020384E5 -_0809B00C: .4byte 0x000011e1 -_0809B010: .4byte gUnknown_020384E6 -_0809B014: - cmp r0, 0x2 - bne _0809B05E - movs r0, 0x1 - bl sub_809A860 - b _0809B05E -_0809B020: - ldr r2, _0809B030 @ =0x000011c4 - adds r0, r4, r2 - ldr r0, [r0] - adds r0, 0x43 - movs r1, 0xC - strb r1, [r0] - b _0809B05E - .align 2, 0 -_0809B030: .4byte 0x000011c4 -_0809B034: - ldr r0, _0809B064 @ =0x000011c4 - adds r2, r4, r0 - ldr r3, [r2] - ldrb r1, [r3, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r3, 0x5] - ldr r0, [r2] - adds r0, 0x43 - movs r1, 0x14 - strb r1, [r0] - ldr r1, [r2] - adds r1, 0x3E - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] -_0809B05E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809B064: .4byte 0x000011c4 - thumb_func_end sub_809AFB8 - - thumb_func_start sub_809B068 -sub_809B068: @ 809B068 - push {lr} - ldr r0, _0809B078 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - bne _0809B07C - movs r3, 0 - b _0809B08A - .align 2, 0 -_0809B078: .4byte gUnknown_020384E6 -_0809B07C: - bl CalculatePlayerPartyCount - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x5 - bls _0809B08A - movs r3, 0x5 -_0809B08A: - ldr r0, _0809B0B8 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r2, r1 - ldr r0, [r0] - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809B0AA - ldr r0, _0809B0BC @ =0x000011e3 - adds r1, r2, r0 - movs r0, 0x1 - strb r0, [r1] -_0809B0AA: - movs r0, 0x1 - adds r1, r3, 0 - bl sub_809AF18 - pop {r0} - bx r0 - .align 2, 0 -_0809B0B8: .4byte gPokemonStorageSystemPtr -_0809B0BC: .4byte 0x000011e3 - thumb_func_end sub_809B068 - - thumb_func_start sub_809B0C0 -sub_809B0C0: @ 809B0C0 - push {lr} - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - bl sub_809AF18 - pop {r0} - bx r0 - thumb_func_end sub_809B0C0 - - thumb_func_start sub_809B0D4 -sub_809B0D4: @ 809B0D4 - ldr r1, _0809B0DC @ =gUnknown_020384EA - movs r0, 0 - strb r0, [r1] - bx lr - .align 2, 0 -_0809B0DC: .4byte gUnknown_020384EA - thumb_func_end sub_809B0D4 - - thumb_func_start sub_809B0E0 -sub_809B0E0: @ 809B0E0 - ldr r0, _0809B0EC @ =gUnknown_020384EA - ldr r1, _0809B0F0 @ =gUnknown_020384E5 - ldrb r1, [r1] - strb r1, [r0] - bx lr - .align 2, 0 -_0809B0EC: .4byte gUnknown_020384EA -_0809B0F0: .4byte gUnknown_020384E5 - thumb_func_end sub_809B0E0 - - thumb_func_start sub_809B0F4 -sub_809B0F4: @ 809B0F4 - ldr r0, _0809B0FC @ =gUnknown_020384EA - ldrb r0, [r0] - bx lr - .align 2, 0 -_0809B0FC: .4byte gUnknown_020384EA - thumb_func_end sub_809B0F4 - - thumb_func_start sub_809B100 -sub_809B100: @ 809B100 - lsls r0, 24 - ldr r1, _0809B120 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _0809B124 @ =0x000012a4 - adds r3, r1, r2 - ldr r2, _0809B128 @ =gUnknown_083BBBC8 - lsrs r0, 22 - adds r0, r2 - ldr r0, [r0] - str r0, [r3] - ldr r0, _0809B12C @ =0x000012a8 - adds r1, r0 - movs r0, 0 - strb r0, [r1] - bx lr - .align 2, 0 -_0809B120: .4byte gPokemonStorageSystemPtr -_0809B124: .4byte 0x000012a4 -_0809B128: .4byte gUnknown_083BBBC8 -_0809B12C: .4byte 0x000012a8 - thumb_func_end sub_809B100 - - thumb_func_start sub_809B130 -sub_809B130: @ 809B130 - push {lr} - ldr r0, _0809B148 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809B14C @ =0x000012a4 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .align 2, 0 -_0809B148: .4byte gPokemonStorageSystemPtr -_0809B14C: .4byte 0x000012a4 - thumb_func_end sub_809B130 - thumb_func_start sub_809B150 sub_809B150: @ 809B150 push {r4,r5,lr} @@ -1526,8 +1306,6 @@ _0809BB88: .4byte gPokemonStorageSystemPtr _0809BB8C: .4byte 0x0000267d thumb_func_end sub_809B960 -// file boundary at or before here - thumb_func_start sub_809BB90 sub_809BB90: @ 809BB90 push {lr} diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 2af123090..4c988286d 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -3,28 +3,6 @@ .section .rodata - .align 2 -HandCursorPalette: @ 83BB308 - .incbin "graphics/pokemon_storage/hand_cursor_pal.bin" - - .align 2 -HandCursorAltPalette: @ 83BB328 - .incbin "graphics/pokemon_storage/hand_cursor_alt_pal.bin" - - .align 2 -HandCursorTiles: @ 83BB348 - .incbin "graphics/pokemon_storage/hand_cursor.4bpp" - - .align 2 -HandCursorShadowTiles: @ 83BBB48 - .incbin "graphics/pokemon_storage/hand_cursor_shadow.4bpp" - - .align 2 -gUnknown_083BBBC8:: @ 83BBBC8 - .4byte sub_809B150 - .4byte sub_809B1D8 - .4byte sub_809B24C - .align 2 gUnknown_083BBBD4:: @ 83BBBD4 .4byte sub_809C464, 0 diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index e911664de..3191b841c 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -172,7 +172,9 @@ struct PokemonStorageSystemData { u8 unk_120f[0x25]; u8 unk_1234[0x25]; u8 unk_1259[0x21]; - u8 unk_127a[0x32]; + u8 unk_127a[0x2a]; + bool8 (*unk_12a4)(void); + u8 unk_12a8; struct Sprite *unk_12ac; struct Sprite *unk_12b0[2]; u16 *unk_12b8; diff --git a/ld_script.txt b/ld_script.txt index 9bdc64fdb..d925d5c14 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -133,7 +133,6 @@ SECTIONS { src/pokemon/pokemon_storage_system_3.o(.text); src/pokemon/pokemon_storage_system_4.o(.text); src/pokemon/pokemon_storage_system_5.o(.text); - src/pokemon/pokemon_storage_system_6.o(.text); asm/pokemon_storage_system.o(.text); src/pokemon/pokemon_icon.o(.text); src/pokemon/pokemon_summary_screen.o(.text); @@ -555,6 +554,7 @@ SECTIONS { src/pokemon/pokemon_storage_system_2.o(.rodata); src/pokemon/pokemon_storage_system_3.o(.rodata); src/pokemon/pokemon_storage_system_4.o(.rodata); + src/pokemon/pokemon_storage_system_5.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon/pokemon_icon.o(.rodata); src/pokemon/pokemon_summary_screen.o(.rodata); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 06c2eeff5..2f2091259 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -25,7 +25,7 @@ EWRAM_DATA u8 gUnknown_020384E6 = 0; EWRAM_DATA u8 gUnknown_020384E7 = 0; EWRAM_DATA u8 gUnknown_020384E8 = 0; EWRAM_DATA u8 gUnknown_020384E9 = 0; -EWRAM_DATA u16 gUnknown_020384EA = 0; +EWRAM_DATA u8 gUnknown_020384EA = 0; // Static ROM declarations @@ -46,6 +46,9 @@ void sub_809A774(s8 a0); void sub_809A810(void); void sub_809AFB8(void); void sub_809A8C8(struct Sprite *sprite); +bool8 sub_809B150(void); +bool8 sub_809B1D8(void); +bool8 sub_809B24C(void); bool8 sub_809BF2C(void); void sub_809BF74(void); void sub_809C028(void); @@ -289,6 +292,16 @@ const struct SpriteTemplate gSpriteTemplate_83BB2F0 = { sub_809A8C8 }; +const u16 HandCursorPalette[] = INCBIN_U16("graphics/pokemon_storage/hand_cursor_pal.bin"); +const u16 HandCursorAltPalette[] = INCBIN_U16("graphics/pokemon_storage/hand_cursor_alt_pal.bin"); +const u8 HandCursorTiles[] = INCBIN_U8("graphics/pokemon_storage/hand_cursor.4bpp"); +const u8 HandCursorShadowTiles[] = INCBIN_U8("graphics/pokemon_storage/hand_cursor_shadow.4bpp"); + +bool8 (*const gUnknown_083BBBC8[])(void) = { + sub_809B150, + sub_809B1D8, + sub_809B24C +}; // .text void sub_8099BF8(u8 boxId) @@ -1306,3 +1319,73 @@ void sub_809AF18(u8 a0, u8 a1) break; } } + +void sub_809AFB8(void) +{ + gUnknown_020384E4 = gPokemonStorageSystemPtr->unk_11e0; + gUnknown_020384E5 = gPokemonStorageSystemPtr->unk_11e1; + if (gUnknown_020384E6 == 0) + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 0); + sub_809BF74(); + switch (gUnknown_020384E4) + { + case 2: + sub_809A860(TRUE); + break; + case 1: + gPokemonStorageSystemPtr->unk_11c4->subpriority = 12; + break; + case 0: + gPokemonStorageSystemPtr->unk_11c4->oam.priority = 2; + gPokemonStorageSystemPtr->unk_11c4->subpriority = 20; + gPokemonStorageSystemPtr->unk_11c4->invisible = FALSE; + break; + } +} + +void sub_809B068(void) +{ + u8 partyCount; + if (gUnknown_020384E6 == 0) + partyCount = 0; + else + { + partyCount = CalculatePlayerPartyCount(); + if (partyCount > PARTY_SIZE - 1) + partyCount = PARTY_SIZE - 1; + } + if (gPokemonStorageSystemPtr->unk_11c0->vFlip) + gPokemonStorageSystemPtr->unk_11e3 = 1; + sub_809AF18(1, partyCount); +} + +void sub_809B0C0(u8 a0) +{ + sub_809AF18(0, a0); +} + +void sub_809B0D4(void) +{ + gUnknown_020384EA = 0; +} + +void sub_809B0E0(void) +{ + gUnknown_020384EA = gUnknown_020384E5; +} + +u8 sub_809B0F4(void) +{ + return gUnknown_020384EA; +} + +void sub_809B100(u8 a0) +{ + gPokemonStorageSystemPtr->unk_12a4 = gUnknown_083BBBC8[a0]; + gPokemonStorageSystemPtr->unk_12a8 = 0; +} + +bool8 sub_809B130(void) +{ + return gPokemonStorageSystemPtr->unk_12a4(); +} diff --git a/src/pokemon/pokemon_storage_system_6.c b/src/pokemon/pokemon_storage_system_6.c deleted file mode 100644 index a781c1ed2..000000000 --- a/src/pokemon/pokemon_storage_system_6.c +++ /dev/null @@ -1,14 +0,0 @@ - -// Includes -#include "global.h" -#include "pokemon_storage_system.h" - -// Static type declarations - -// Static RAM declarations - -// Static ROM declarations - -// .rodata - -// .text -- cgit v1.2.3 From 66fe535e7f5f0466c15f5f82dd1c2823fc6110cf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 16:16:25 -0500 Subject: through sub_809B24C --- asm/pokemon_storage_system.s | 238 --------------------------------- include/pokemon_storage_system.h | 5 +- src/pokemon/pokemon_storage_system_4.c | 92 +++++++++++++ 3 files changed, 96 insertions(+), 239 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 5a1853361..d408dc7ea 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,244 +5,6 @@ .text - thumb_func_start sub_809B150 -sub_809B150: @ 809B150 - push {r4,r5,lr} - ldr r0, _0809B16C @ =gPokemonStorageSystemPtr - ldr r5, [r0] - ldr r0, _0809B170 @ =0x000012a8 - adds r4, r5, r0 - ldrb r0, [r4] - cmp r0, 0x1 - beq _0809B1A0 - cmp r0, 0x1 - bgt _0809B174 - cmp r0, 0 - beq _0809B17E - b _0809B1CE - .align 2, 0 -_0809B16C: .4byte gPokemonStorageSystemPtr -_0809B170: .4byte 0x000012a8 -_0809B174: - cmp r0, 0x2 - beq _0809B1BE - cmp r0, 0x3 - beq _0809B186 - b _0809B1CE -_0809B17E: - ldr r0, _0809B18C @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809B190 -_0809B186: - movs r0, 0 - b _0809B1D0 - .align 2, 0 -_0809B18C: .4byte gUnknown_020384E6 -_0809B190: - movs r1, 0x8E - lsls r1, 5 - adds r0, r5, r1 - ldr r0, [r0] - movs r1, 0x2 - bl StartSpriteAnim - b _0809B1C8 -_0809B1A0: - bl sub_809B324 - lsls r0, 24 - cmp r0, 0 - bne _0809B1CE - movs r1, 0x8E - lsls r1, 5 - adds r0, r5, r1 - ldr r0, [r0] - movs r1, 0x3 - bl StartSpriteAnim - bl sub_809B384 - b _0809B1C8 -_0809B1BE: - bl sub_809B358 - lsls r0, 24 - cmp r0, 0 - bne _0809B1CE -_0809B1C8: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] -_0809B1CE: - movs r0, 0x1 -_0809B1D0: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_809B150 - - thumb_func_start sub_809B1D8 -sub_809B1D8: @ 809B1D8 - push {r4,r5,lr} - ldr r0, _0809B1F4 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r0, _0809B1F8 @ =0x000012a8 - adds r5, r4, r0 - ldrb r0, [r5] - cmp r0, 0x1 - beq _0809B220 - cmp r0, 0x1 - bgt _0809B1FC - cmp r0, 0 - beq _0809B202 - b _0809B244 - .align 2, 0 -_0809B1F4: .4byte gPokemonStorageSystemPtr -_0809B1F8: .4byte 0x000012a8 -_0809B1FC: - cmp r0, 0x2 - beq _0809B240 - b _0809B244 -_0809B202: - bl sub_809B324 - lsls r0, 24 - cmp r0, 0 - bne _0809B244 - movs r1, 0x8E - lsls r1, 5 - adds r0, r4, r1 - ldr r0, [r0] - movs r1, 0x2 - bl StartSpriteAnim - bl sub_809B3E0 - b _0809B238 -_0809B220: - bl sub_809B358 - lsls r0, 24 - cmp r0, 0 - bne _0809B244 - movs r1, 0x8E - lsls r1, 5 - adds r0, r4, r1 - ldr r0, [r0] - movs r1, 0 - bl StartSpriteAnim -_0809B238: - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - b _0809B244 -_0809B240: - movs r0, 0 - b _0809B246 -_0809B244: - movs r0, 0x1 -_0809B246: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_809B1D8 - - thumb_func_start sub_809B24C -sub_809B24C: @ 809B24C - push {r4,r5,lr} - ldr r0, _0809B268 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r0, _0809B26C @ =0x000012a8 - adds r5, r4, r0 - ldrb r0, [r5] - cmp r0, 0x1 - beq _0809B2E0 - cmp r0, 0x1 - bgt _0809B270 - cmp r0, 0 - beq _0809B276 - b _0809B31C - .align 2, 0 -_0809B268: .4byte gPokemonStorageSystemPtr -_0809B26C: .4byte 0x000012a8 -_0809B270: - cmp r0, 0x2 - beq _0809B318 - b _0809B31C -_0809B276: - ldr r0, _0809B290 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _0809B298 - cmp r0, 0x1 - bne _0809B318 - ldr r2, _0809B294 @ =0x000012a9 - adds r1, r4, r2 - movs r0, 0xE - b _0809B2A0 - .align 2, 0 -_0809B290: .4byte gUnknown_020384E4 -_0809B294: .4byte 0x000012a9 -_0809B298: - bl get_preferred_box - ldr r2, _0809B2D0 @ =0x000012a9 - adds r1, r4, r2 -_0809B2A0: - strb r0, [r1] - ldr r0, _0809B2D4 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r4, r1 - ldr r0, [r0] - movs r1, 0x2 - bl StartSpriteAnim - ldr r2, _0809B2D0 @ =0x000012a9 - adds r0, r4, r2 - ldrb r0, [r0] - ldr r1, _0809B2D8 @ =gUnknown_020384E5 - ldrb r1, [r1] - bl sub_80996B0 - ldr r0, _0809B2DC @ =0x000012a8 - adds r4, r0 - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - b _0809B31C - .align 2, 0 -_0809B2D0: .4byte 0x000012a9 -_0809B2D4: .4byte gPokemonStorageSystemPtr -_0809B2D8: .4byte gUnknown_020384E5 -_0809B2DC: .4byte 0x000012a8 -_0809B2E0: - bl sub_809971C - lsls r0, 24 - cmp r0, 0 - bne _0809B31C - movs r1, 0x8E - lsls r1, 5 - adds r0, r4, r1 - ldr r0, [r0] - movs r1, 0x3 - bl StartSpriteAnim - ldr r2, _0809B310 @ =0x000012a9 - adds r0, r4, r2 - ldrb r0, [r0] - ldr r1, _0809B314 @ =gUnknown_020384E5 - ldrb r1, [r1] - bl diegohint1 - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - b _0809B31C - .align 2, 0 -_0809B310: .4byte 0x000012a9 -_0809B314: .4byte gUnknown_020384E5 -_0809B318: - movs r0, 0 - b _0809B31E -_0809B31C: - movs r0, 0x1 -_0809B31E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_809B24C - thumb_func_start sub_809B324 sub_809B324: @ 809B324 push {lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 3191b841c..a2b5964d4 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -175,6 +175,7 @@ struct PokemonStorageSystemData { u8 unk_127a[0x2a]; bool8 (*unk_12a4)(void); u8 unk_12a8; + u8 unk_12a9; struct Sprite *unk_12ac; struct Sprite *unk_12b0[2]; u16 *unk_12b8; @@ -223,10 +224,11 @@ void sub_8099310(void); bool8 sub_8099374(void); void sub_80994A8(s16 a0); void sub_809954C(void); +void sub_80996B0(u8 a0, u8 a1); +bool8 sub_809971C(void); void sub_8099958(void); bool8 sub_8099990(void); struct Sprite *sub_809A9A0(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority); -void sub_809BB90(void); void sub_8099BF8(u8 a0); void sub_8099C70(u8 whichBox); bool8 sub_8099D34(void); @@ -252,6 +254,7 @@ void sub_809B760(void); void sub_809B7AC(void); void sub_809B7D4(void); s8 sub_809B960(void); +void sub_809BB90(void); void sub_809BBC0(void); void sub_809BC18(void); void sub_809BD14(void); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 2f2091259..9e4865910 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -49,6 +49,11 @@ void sub_809A8C8(struct Sprite *sprite); bool8 sub_809B150(void); bool8 sub_809B1D8(void); bool8 sub_809B24C(void); +bool8 sub_809B324(void); +bool8 sub_809B358(void); +void sub_809B384(void); +void sub_809B3E0(void); +void diegohint1(u8 a0, u8 a1); bool8 sub_809BF2C(void); void sub_809BF74(void); void sub_809C028(void); @@ -1389,3 +1394,90 @@ bool8 sub_809B130(void) { return gPokemonStorageSystemPtr->unk_12a4(); } + +bool8 sub_809B150(void) +{ + switch (gPokemonStorageSystemPtr->unk_12a8) + { + case 0: + if (gUnknown_020384E6) + return FALSE; + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 2); + gPokemonStorageSystemPtr->unk_12a8++; + break; + case 1: + if (!sub_809B324()) + { + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3); + sub_809B384(); + gPokemonStorageSystemPtr->unk_12a8++; + } + break; + case 2: + if (!sub_809B358()) + gPokemonStorageSystemPtr->unk_12a8++; + break; + case 3: + return FALSE; + } + return TRUE; +} + +bool8 sub_809B1D8(void) +{ + switch (gPokemonStorageSystemPtr->unk_12a8) + { + case 0: + if (!sub_809B324()) + { + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 2); + sub_809B3E0(); + gPokemonStorageSystemPtr->unk_12a8++; + } + break; + case 1: + if (!sub_809B358()) + { + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 0); + gPokemonStorageSystemPtr->unk_12a8++; + } + break; + case 2: + return FALSE; + } + return TRUE; +} + +bool8 sub_809B24C(void) +{ + switch (gPokemonStorageSystemPtr->unk_12a8) + { + case 0: + switch (gUnknown_020384E4) + { + case 1: + gPokemonStorageSystemPtr->unk_12a9 = 14; + break; + case 0: + gPokemonStorageSystemPtr->unk_12a9 = get_preferred_box(); + break; + default: + return FALSE; + } + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 2); + sub_80996B0(gPokemonStorageSystemPtr->unk_12a9, gUnknown_020384E5); + gPokemonStorageSystemPtr->unk_12a8++; + break; + case 1: + if (!sub_809971C()) + { + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3); + diegohint1(gPokemonStorageSystemPtr->unk_12a9, gUnknown_020384E5); + gPokemonStorageSystemPtr->unk_12a8++; + } + break; + case 2: + return FALSE; + } + return TRUE; +} -- cgit v1.2.3 From c8bd765540bc38c2273a70caf99051727c467d21 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 15:29:27 -0600 Subject: get sub_803E1B0 a lot closer --- src/pokemon/pokemon_item_effect.c | 54 ++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c index b4b7206dc..92bf01171 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon/pokemon_item_effect.c @@ -33,6 +33,10 @@ const u8 gUnknown_082082F2[] = MON_DATA_SPATK_EV }; +extern u8 gUnknown_08208238[]; +extern u8 gUnknown_0820823C[]; +extern u8 gUnknown_08208240[]; + bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e); bool8 ExecuteTableBasedItemEffect_(struct Pokemon *pkmn, u16 b, u8 c, u8 d) @@ -40,10 +44,6 @@ bool8 ExecuteTableBasedItemEffect_(struct Pokemon *pkmn, u16 b, u8 c, u8 d) return sub_803E1B0(pkmn, b, c, d, 0); } -extern u8 gUnknown_08208238[]; -extern u8 gUnknown_0820823C[]; -extern u8 gUnknown_08208240[]; - bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { u32 sp0; @@ -58,6 +58,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) u8 sp34 = 4; u16 item; u8 r10; + u32 r4; item = GetMonData(pkmn, MON_DATA_HELD_ITEM, NULL); if (item == 0xAF) @@ -131,9 +132,9 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp1C = 0; } //_0803E3F0 - if ((sp20[sp18] & 0x30) && !(gBattleMons[gActiveBank].status2 & 0x4000000)) + if ((sp20[sp18] & 0x30) && !(gBattleMons[gActiveBank].status2 & 0x100000)) { - gBattleMons[gActiveBank].status2 |= 0x4000000; + gBattleMons[gActiveBank].status2 |= 0x100000; sp1C = 0; } //_0803E41E @@ -235,8 +236,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) r10 &= ~0x20; - sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) << (d * 2); - //r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); + sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) >> (d * 2); sp28 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); if (sp0 <= 2 && sp28 > 4) { @@ -255,8 +255,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { if (r10 & 1) { - s32 r5; - u32 r4; + s32 r5; // TODO: the ev count is a separate variable u32 r1; switch (sp28) @@ -271,14 +270,13 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp0 = r1; if (r1 < 100) { - r1 += sp20[sp24]; - if (r1 > 100) - r4 = 100 - r1; + if (r1 + sp20[sp24] > 100) + r4 = 100 - (r1 + sp20[sp24]) + sp20[sp24]; else r4 = sp20[sp24]; - //_0803E8F6 - if (r5 + r4 > 510) - r4 = (r4 - 510) - (r5 + r4); + r1 = r5 + r4; + if (r1 > 510) + r4 += 510 - r1; sp0 += r4; SetMonData(pkmn, gUnknown_082082F2[sp28], &sp0); CalculateMonStats(pkmn); @@ -336,7 +334,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) - GetMonData(pkmn, MON_DATA_HP, NULL); break; case 0xFE: - sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) * 2; + sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) / 2; if (sp0 == 0) sp0 = 1; break; @@ -472,7 +470,6 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (r10 & 1) { u16 r5; - u32 r4; u32 r1; switch (sp28) @@ -489,14 +486,13 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp0 = r1; if (r1 < 100) { - r1 += sp20[sp24]; - if (r1 > 100) - r4 = 100 - r1; + if (r1 + sp20[sp24] > 100) + r4 = 100 - (r1 + sp20[sp24]) + sp20[sp24]; else r4 = sp20[sp24]; - //_0803EEC6 - if (r5 + r4 > 510) - r4 = (r4 + 510) - (r5 + r4); + r1 = r5 + r4; + if (r1 > 510) + r4 += 510 - r1; sp0 += r4; SetMonData(pkmn, gUnknown_082082F2[sp28 + 2], &sp0); CalculateMonStats(pkmn); @@ -506,11 +502,11 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) break; case 4: //_0803EEF8 - sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) << (d * 2); + sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) >> (d * 2); if (sp0 < 3) { //_0803EF18 - u8 r4 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); + r4 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); sp0 = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL); sp0 &= gUnknown_0820823C[d]; sp0 += gUnknown_08208240[d] * 3; @@ -531,7 +527,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); if (sp2C > 0 && sp30 == 0x1B) { - sp4 += 0x96 * sp2C / 100; + sp4 += 150 * sp2C / 100; } //to _0803F0D0 hmm... else @@ -568,7 +564,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (sp2C > 0 && sp30 == 0x1B) { //to _0803F0BE - sp4 = 0x96 * sp2C / 100; + sp4 = 150 * sp2C / 100; } else { @@ -603,7 +599,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (sp2C > 0 && sp30 == 0x1B) { //_0803F0BE - sp4 = 0x96 * sp2C / 100; + sp4 = 150 * sp2C / 100; } //_0803F0D0 else -- cgit v1.2.3 From e3238abc63ac7e939ccdc58e555a9dcdc66f3525 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 16:54:02 -0500 Subject: through sub_809B44C --- asm/pokemon_storage_system.s | 223 --------------------------------- include/pokemon_storage_system.h | 2 + src/pokemon/pokemon_storage_system_4.c | 86 +++++++++++++ 3 files changed, 88 insertions(+), 223 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index d408dc7ea..9b37cbe69 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,229 +5,6 @@ .text - thumb_func_start sub_809B324 -sub_809B324: @ 809B324 - push {lr} - ldr r0, _0809B348 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r1 - ldr r1, [r0] - movs r2, 0x26 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _0809B33E - cmp r0, 0x8 - beq _0809B34C -_0809B33E: - ldrh r0, [r1, 0x26] - adds r0, 0x1 - strh r0, [r1, 0x26] - b _0809B350 - .align 2, 0 -_0809B348: .4byte gPokemonStorageSystemPtr -_0809B34C: - movs r0, 0 - b _0809B352 -_0809B350: - movs r0, 0x1 -_0809B352: - pop {r1} - bx r1 - thumb_func_end sub_809B324 - - thumb_func_start sub_809B358 -sub_809B358: @ 809B358 - push {lr} - ldr r0, _0809B378 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r1 - ldr r1, [r0] - movs r2, 0x26 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _0809B37C - ldrh r0, [r1, 0x26] - subs r0, 0x1 - strh r0, [r1, 0x26] - movs r0, 0x1 - b _0809B37E - .align 2, 0 -_0809B378: .4byte gPokemonStorageSystemPtr -_0809B37C: - movs r0, 0 -_0809B37E: - pop {r1} - bx r1 - thumb_func_end sub_809B358 - - thumb_func_start sub_809B384 -sub_809B384: @ 809B384 - push {r4,lr} - ldr r0, _0809B3AC @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _0809B3B4 - cmp r0, 0x1 - bne _0809B3D2 - ldr r4, _0809B3B0 @ =gUnknown_020384E5 - ldrb r1, [r4] - movs r0, 0xE - bl sub_809B44C - ldrb r1, [r4] - movs r0, 0 - bl sub_8099584 - b _0809B3CC - .align 2, 0 -_0809B3AC: .4byte gUnknown_020384E4 -_0809B3B0: .4byte gUnknown_020384E5 -_0809B3B4: - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - ldr r4, _0809B3D8 @ =gUnknown_020384E5 - ldrb r1, [r4] - bl sub_809B44C - ldrb r1, [r4] - movs r0, 0x1 - bl sub_8099584 -_0809B3CC: - ldr r1, _0809B3DC @ =gUnknown_020384E6 - movs r0, 0x1 - strb r0, [r1] -_0809B3D2: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809B3D8: .4byte gUnknown_020384E5 -_0809B3DC: .4byte gUnknown_020384E6 - thumb_func_end sub_809B384 - - thumb_func_start sub_809B3E0 -sub_809B3E0: @ 809B3E0 - push {r4,r5,lr} - ldr r0, _0809B408 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _0809B410 - cmp r0, 0x1 - bne _0809B432 - ldr r4, _0809B40C @ =gUnknown_020384E5 - ldrb r1, [r4] - movs r0, 0xE - bl diegohint2 - ldrb r1, [r4] - movs r0, 0xE - bl sub_809960C - b _0809B42C - .align 2, 0 -_0809B408: .4byte gUnknown_020384E4 -_0809B40C: .4byte gUnknown_020384E5 -_0809B410: - bl get_preferred_box - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, _0809B438 @ =gUnknown_020384E5 - ldrb r1, [r5] - adds r0, r4, 0 - bl diegohint2 - ldrb r1, [r5] - adds r0, r4, 0 - bl sub_809960C -_0809B42C: - ldr r1, _0809B43C @ =gUnknown_020384E6 - movs r0, 0 - strb r0, [r1] -_0809B432: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809B438: .4byte gUnknown_020384E5 -_0809B43C: .4byte gUnknown_020384E6 - thumb_func_end sub_809B3E0 - - thumb_func_start sub_809B440 -sub_809B440: @ 809B440 - push {lr} - bl sub_809BF74 - pop {r0} - bx r0 - thumb_func_end sub_809B440 - - thumb_func_start sub_809B44C -sub_809B44C: @ 809B44C - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - cmp r4, 0xE - bne _0809B488 - ldr r0, _0809B478 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809B47C @ =0x000025b4 - adds r0, r1 - ldr r3, _0809B480 @ =gPlayerParty - ldr r1, _0809B484 @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - movs r1, 0x64 - muls r1, r2 - adds r1, r3 - movs r2, 0x64 - bl memcpy - b _0809B4AA - .align 2, 0 -_0809B478: .4byte gPokemonStorageSystemPtr -_0809B47C: .4byte 0x000025b4 -_0809B480: .4byte gPlayerParty -_0809B484: .4byte gUnknown_020384E5 -_0809B488: - lsls r1, r4, 2 - adds r1, r4 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 4 - ldr r2, _0809B4C0 @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - ldr r1, _0809B4C4 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _0809B4C8 @ =0x000025b4 - adds r1, r2 - bl sub_803B4B4 -_0809B4AA: - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_809B548 - ldr r0, _0809B4CC @ =gUnknown_020384E7 - strb r4, [r0] - ldr r0, _0809B4D0 @ =gUnknown_020384E8 - strb r5, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809B4C0: .4byte gPokemonStorage + 0x4 -_0809B4C4: .4byte gPokemonStorageSystemPtr -_0809B4C8: .4byte 0x000025b4 -_0809B4CC: .4byte gUnknown_020384E7 -_0809B4D0: .4byte gUnknown_020384E8 - thumb_func_end sub_809B44C - thumb_func_start diegohint2 diegohint2: @ 809B4D4 push {r4-r6,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index a2b5964d4..eefea4ec8 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -224,6 +224,8 @@ void sub_8099310(void); bool8 sub_8099374(void); void sub_80994A8(s16 a0); void sub_809954C(void); +void sub_8099584(u8 a0, u8 a1); +void sub_809960C(u8 a0, u8 a1); void sub_80996B0(u8 a0, u8 a1); bool8 sub_809971C(void); void sub_8099958(void); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 9e4865910..1127927bf 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -53,6 +53,9 @@ bool8 sub_809B324(void); bool8 sub_809B358(void); void sub_809B384(void); void sub_809B3E0(void); +void sub_809B44C(u8 a0, u8 a1); +void diegohint2(u8 a0, u8 a1); +void sub_809B548(u8 a0, u8 a1); void diegohint1(u8 a0, u8 a1); bool8 sub_809BF2C(void); void sub_809BF74(void); @@ -1481,3 +1484,86 @@ bool8 sub_809B24C(void) } return TRUE; } + +bool8 sub_809B324(void) +{ + switch (gPokemonStorageSystemPtr->unk_11c0->pos2.y) + { + default: + gPokemonStorageSystemPtr->unk_11c0->pos2.y++; + break; + case 0: + gPokemonStorageSystemPtr->unk_11c0->pos2.y++; + break; + case 8: + return FALSE; + } + return TRUE; +} + +bool8 sub_809B358(void) +{ + switch (gPokemonStorageSystemPtr->unk_11c0->pos2.y) + { + case 0: + return FALSE; + default: + gPokemonStorageSystemPtr->unk_11c0->pos2.y--; + break; + } + return TRUE; +} + +void sub_809B384(void) +{ + switch (gUnknown_020384E4) + { + case 1: + sub_809B44C(14, gUnknown_020384E5); + sub_8099584(0, gUnknown_020384E5); + break; + case 0: + sub_809B44C(get_preferred_box(), gUnknown_020384E5); + sub_8099584(1, gUnknown_020384E5); + break; + default: + return; + } + gUnknown_020384E6 = 1; +} + +void sub_809B3E0(void) +{ + u8 boxId; + switch (gUnknown_020384E4) + { + case 1: + diegohint2(14, gUnknown_020384E5); + sub_809960C(14, gUnknown_020384E5); + break; + case 0: + boxId = get_preferred_box(); + diegohint2(boxId, gUnknown_020384E5); + sub_809960C(boxId, gUnknown_020384E5); + break; + default: + return; + } + gUnknown_020384E6 = 0; +} + +void sub_809B440(void) +{ + sub_809BF74(); +} + +void sub_809B44C(u8 a0, u8 a1) +{ + if (a0 == 14) + gPokemonStorageSystemPtr->unk_25b4 = gPlayerParty[gUnknown_020384E5]; + else + sub_803B4B4(gPokemonStorage.boxes[a0], &gPokemonStorageSystemPtr->unk_25b4); + sub_809B548(a0, a1); + gUnknown_020384E7 = a0; + gUnknown_020384E8 = a1; +} -- cgit v1.2.3 From 4e9f791782fff682b133dab88533fe587b520815 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 16:09:22 -0600 Subject: match sub_803E1B0 --- asm/pokemon_item_effect.s | 1940 ------------------------------------- src/pokemon/pokemon_item_effect.c | 40 +- 2 files changed, 19 insertions(+), 1961 deletions(-) diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index ba1b37dcb..c3461fa64 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -5,1944 +5,4 @@ .text - thumb_func_start sub_803E1B0 -sub_803E1B0: @ 803E1B0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x3C - mov r8, r0 - ldr r0, [sp, 0x5C] - lsls r1, 16 - lsrs r1, 16 - str r1, [sp, 0x8] - lsls r2, 24 - lsrs r2, 24 - str r2, [sp, 0xC] - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x10] - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x14] - movs r0, 0x1 - str r0, [sp, 0x1C] - movs r1, 0x6 - str r1, [sp, 0x24] - movs r2, 0 - str r2, [sp, 0x2C] - movs r3, 0x4 - str r3, [sp, 0x34] - mov r0, r8 - movs r1, 0xC - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xAF - bne _0803E240 - ldr r0, _0803E21C @ =gMain - ldr r4, _0803E220 @ =0x0000043d - adds r0, r4 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803E22C - ldr r2, _0803E224 @ =gEnigmaBerries - ldr r0, _0803E228 @ =gBankInMenu - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x7] - b _0803E248 - .align 2, 0 -_0803E21C: .4byte gMain -_0803E220: .4byte 0x0000043d -_0803E224: .4byte gEnigmaBerries -_0803E228: .4byte gBankInMenu -_0803E22C: - ldr r0, _0803E238 @ =gSaveBlock1 - ldr r5, _0803E23C @ =0x00003688 - adds r0, r5 - ldrb r0, [r0] - b _0803E248 - .align 2, 0 -_0803E238: .4byte gSaveBlock1 -_0803E23C: .4byte 0x00003688 -_0803E240: - bl ItemId_GetHoldEffect - lsls r0, 24 - lsrs r0, 24 -_0803E248: - str r0, [sp, 0x30] - ldr r1, _0803E2A4 @ =gStringBank - ldr r0, _0803E2A8 @ =gBankInMenu - ldrb r2, [r0] - strb r2, [r1] - ldr r0, _0803E2AC @ =gMain - ldr r1, _0803E2B0 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - beq _0803E2E8 - ldr r0, _0803E2B4 @ =gActiveBank - strb r2, [r0] - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - negs r1, r0 - orrs r1, r0 - lsrs r1, 31 - str r1, [sp, 0x18] - ldr r0, _0803E2B8 @ =gNoOfAllBanks - ldr r4, [sp, 0x8] - subs r4, 0xD - ldrb r0, [r0] - cmp r1, r0 - bge _0803E2F4 - ldr r2, _0803E2BC @ =gBattlePartyID - lsls r0, r1, 1 - adds r0, r2 - ldrh r3, [r0] - ldr r5, [sp, 0xC] - lsls r0, r5, 16 - lsrs r1, r0, 16 - adds r5, r0, 0 - cmp r3, r1 - bne _0803E2C0 - ldr r0, [sp, 0x18] - str r0, [sp, 0x34] - b _0803E2F4 - .align 2, 0 -_0803E2A4: .4byte gStringBank -_0803E2A8: .4byte gBankInMenu -_0803E2AC: .4byte gMain -_0803E2B0: .4byte 0x0000043d -_0803E2B4: .4byte gActiveBank -_0803E2B8: .4byte gNoOfAllBanks -_0803E2BC: .4byte gBattlePartyID -_0803E2C0: - ldr r1, [sp, 0x18] - adds r1, 0x2 - str r1, [sp, 0x18] - ldr r0, _0803E2E4 @ =gNoOfAllBanks - ldrb r0, [r0] - cmp r1, r0 - bge _0803E2F4 - lsls r0, r1, 1 - adds r0, r2 - ldrh r1, [r0] - lsrs r0, r5, 16 - cmp r1, r0 - bne _0803E2C0 - ldr r2, [sp, 0x18] - lsls r0, r2, 24 - lsrs r0, 24 - str r0, [sp, 0x34] - b _0803E2F4 - .align 2, 0 -_0803E2E4: .4byte gNoOfAllBanks -_0803E2E8: - ldr r0, _0803E310 @ =gActiveBank - strb r1, [r0] - movs r3, 0x4 - str r3, [sp, 0x34] - ldr r4, [sp, 0x8] - subs r4, 0xD -_0803E2F4: - lsls r0, r4, 16 - lsrs r0, 16 - cmp r0, 0xA5 - bhi _0803E36C - ldr r1, _0803E314 @ =gItemEffectTable - lsls r0, r4, 2 - adds r0, r1 - ldr r0, [r0] - cmp r0, 0 - bne _0803E318 - ldr r4, [sp, 0x8] - cmp r4, 0xAF - beq _0803E31E - b _0803E36C - .align 2, 0 -_0803E310: .4byte gActiveBank -_0803E314: .4byte gItemEffectTable -_0803E318: - ldr r5, [sp, 0x8] - cmp r5, 0xAF - bne _0803E372 -_0803E31E: - ldr r0, _0803E340 @ =gMain - ldr r1, _0803E344 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803E350 - ldr r0, _0803E348 @ =gActiveBank - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - ldr r1, _0803E34C @ =gUnknown_02024DF8 - adds r0, r1 - b _0803E372 - .align 2, 0 -_0803E340: .4byte gMain -_0803E344: .4byte 0x0000043d -_0803E348: .4byte gActiveBank -_0803E34C: .4byte gUnknown_02024DF8 -_0803E350: - ldr r2, _0803E358 @ =gSaveBlock1 + 0x3676 - str r2, [sp, 0x20] - b _0803E374 - .align 2, 0 -_0803E358: .4byte gSaveBlock1 + 0x3676 -_0803E35C: - mov r0, r8 - movs r2, 0 - ldr r3, [sp, 0xC] - bl BeginEvolutionScene - movs r0, 0 - bl _0803F15C -_0803E36C: - movs r0, 0x1 - bl _0803F15C -_0803E372: - str r0, [sp, 0x20] -_0803E374: - movs r3, 0 - str r3, [sp, 0x18] -_0803E378: - ldr r4, [sp, 0x18] - cmp r4, 0x5 - bls _0803E382 - bl _0803F14C -_0803E382: - lsls r0, r4, 2 - ldr r1, _0803E38C @ =_0803E390 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0803E38C: .4byte _0803E390 - .align 2, 0 -_0803E390: - .4byte _0803E3A8 - .4byte _0803E474 - .4byte _0803E508 - .4byte _0803E59C - .4byte _0803E77C - .4byte _0803EE1E -_0803E3A8: - ldr r5, [sp, 0x20] - ldr r0, [sp, 0x18] - adds r2, r5, r0 - ldrb r1, [r2] - movs r0, 0x80 - ands r0, r1 - adds r6, r2, 0 - cmp r0, 0 - beq _0803E3F0 - ldr r0, _0803E460 @ =gMain - ldr r1, _0803E464 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803E3F0 - ldr r2, [sp, 0x34] - cmp r2, 0x4 - beq _0803E3F0 - ldr r1, _0803E468 @ =gBattleMons - movs r0, 0x58 - muls r0, r2 - adds r1, 0x50 - adds r2, r0, r1 - ldr r1, [r2] - movs r0, 0xF0 - lsls r0, 12 - ands r0, r1 - cmp r0, 0 - beq _0803E3F0 - ldr r0, _0803E46C @ =0xfff0ffff - ands r1, r0 - str r1, [r2] - movs r3, 0 - str r3, [sp, 0x1C] -_0803E3F0: - ldrb r1, [r6] - movs r0, 0x30 - ands r0, r1 - cmp r0, 0 - beq _0803E41E - ldr r1, _0803E468 @ =gBattleMons - ldr r0, _0803E470 @ =gActiveBank - ldrb r2, [r0] - movs r0, 0x58 - muls r0, r2 - adds r1, 0x50 - adds r2, r0, r1 - ldr r1, [r2] - movs r3, 0x80 - lsls r3, 13 - adds r0, r1, 0 - ands r0, r3 - cmp r0, 0 - bne _0803E41E - orrs r1, r3 - str r1, [r2] - movs r4, 0 - str r4, [sp, 0x1C] -_0803E41E: - ldrb r0, [r6] - movs r3, 0xF - ands r3, r0 - cmp r3, 0 - bne _0803E42C - bl _0803F14C -_0803E42C: - ldr r6, _0803E468 @ =gBattleMons - ldr r5, _0803E470 @ =gActiveBank - ldrb r0, [r5] - movs r4, 0x58 - muls r0, r4 - adds r1, r0, r6 - ldrb r2, [r1, 0x19] - movs r0, 0x19 - ldrsb r0, [r1, r0] - cmp r0, 0xB - ble _0803E446 - bl _0803F14C -_0803E446: - adds r0, r2, r3 - strb r0, [r1, 0x19] - ldrb r0, [r5] - muls r0, r4 - adds r1, r0, r6 - movs r0, 0x19 - ldrsb r0, [r1, r0] - cmp r0, 0xC - bgt _0803E45A - b _0803E74E -_0803E45A: - movs r0, 0xC - strb r0, [r1, 0x19] - b _0803E74E - .align 2, 0 -_0803E460: .4byte gMain -_0803E464: .4byte 0x0000043d -_0803E468: .4byte gBattleMons -_0803E46C: .4byte 0xfff0ffff -_0803E470: .4byte gActiveBank -_0803E474: - ldr r0, [sp, 0x20] - ldr r1, [sp, 0x18] - adds r2, r0, r1 - ldrb r1, [r2] - movs r0, 0xF0 - ands r0, r1 - lsls r3, r0, 24 - adds r6, r2, 0 - cmp r3, 0 - beq _0803E4BA - ldr r7, _0803E500 @ =gBattleMons - ldr r5, _0803E504 @ =gActiveBank - ldrb r0, [r5] - movs r4, 0x58 - muls r0, r4 - adds r1, r0, r7 - ldrb r2, [r1, 0x1A] - movs r0, 0x1A - ldrsb r0, [r1, r0] - cmp r0, 0xB - bgt _0803E4BA - lsrs r0, r3, 28 - adds r0, r2, r0 - strb r0, [r1, 0x1A] - ldrb r0, [r5] - muls r0, r4 - adds r1, r0, r7 - movs r0, 0x1A - ldrsb r0, [r1, r0] - cmp r0, 0xC - ble _0803E4B6 - movs r0, 0xC - strb r0, [r1, 0x1A] -_0803E4B6: - movs r2, 0 - str r2, [sp, 0x1C] -_0803E4BA: - ldrb r0, [r6] - movs r3, 0xF - ands r3, r0 - cmp r3, 0 - bne _0803E4C8 - bl _0803F14C -_0803E4C8: - ldr r6, _0803E500 @ =gBattleMons - ldr r5, _0803E504 @ =gActiveBank - ldrb r0, [r5] - movs r4, 0x58 - muls r0, r4 - adds r1, r0, r6 - ldrb r2, [r1, 0x1B] - movs r0, 0x1B - ldrsb r0, [r1, r0] - cmp r0, 0xB - ble _0803E4E2 - bl _0803F14C -_0803E4E2: - adds r0, r2, r3 - strb r0, [r1, 0x1B] - ldrb r0, [r5] - muls r0, r4 - adds r1, r0, r6 - movs r0, 0x1B - ldrsb r0, [r1, r0] - cmp r0, 0xC - ble _0803E4F8 - movs r0, 0xC - strb r0, [r1, 0x1B] -_0803E4F8: - movs r3, 0 - str r3, [sp, 0x1C] - bl _0803F14C - .align 2, 0 -_0803E500: .4byte gBattleMons -_0803E504: .4byte gActiveBank -_0803E508: - ldr r4, [sp, 0x20] - ldr r5, [sp, 0x18] - adds r2, r4, r5 - ldrb r1, [r2] - movs r0, 0xF0 - ands r0, r1 - lsls r3, r0, 24 - adds r6, r2, 0 - cmp r3, 0 - beq _0803E54E - ldr r7, _0803E594 @ =gBattleMons - ldr r5, _0803E598 @ =gActiveBank - ldrb r0, [r5] - movs r4, 0x58 - muls r0, r4 - adds r1, r0, r7 - ldrb r2, [r1, 0x1E] - movs r0, 0x1E - ldrsb r0, [r1, r0] - cmp r0, 0xB - bgt _0803E54E - lsrs r0, r3, 28 - adds r0, r2, r0 - strb r0, [r1, 0x1E] - ldrb r0, [r5] - muls r0, r4 - adds r1, r0, r7 - movs r0, 0x1E - ldrsb r0, [r1, r0] - cmp r0, 0xC - ble _0803E54A - movs r0, 0xC - strb r0, [r1, 0x1E] -_0803E54A: - movs r0, 0 - str r0, [sp, 0x1C] -_0803E54E: - ldrb r0, [r6] - movs r3, 0xF - ands r3, r0 - cmp r3, 0 - bne _0803E55C - bl _0803F14C -_0803E55C: - ldr r6, _0803E594 @ =gBattleMons - ldr r5, _0803E598 @ =gActiveBank - ldrb r0, [r5] - movs r4, 0x58 - muls r0, r4 - adds r1, r0, r6 - ldrb r2, [r1, 0x1C] - movs r0, 0x1C - ldrsb r0, [r1, r0] - cmp r0, 0xB - ble _0803E576 - bl _0803F14C -_0803E576: - adds r0, r2, r3 - strb r0, [r1, 0x1C] - ldrb r0, [r5] - muls r0, r4 - adds r1, r0, r6 - movs r0, 0x1C - ldrsb r0, [r1, r0] - cmp r0, 0xC - ble _0803E58C - movs r0, 0xC - strb r0, [r1, 0x1C] -_0803E58C: - movs r1, 0 - str r1, [sp, 0x1C] - bl _0803F14C - .align 2, 0 -_0803E594: .4byte gBattleMons -_0803E598: .4byte gActiveBank -_0803E59C: - ldr r3, [sp, 0x20] - ldr r4, [sp, 0x18] - adds r2, r3, r4 - ldrb r1, [r2] - movs r0, 0x80 - ands r0, r1 - adds r6, r2, 0 - cmp r0, 0 - beq _0803E5E4 - ldr r5, _0803E758 @ =gSideTimers - ldr r4, _0803E75C @ =gActiveBank - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - ldrb r0, [r1, 0x2] - cmp r0, 0 - bne _0803E5E4 - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r5 - movs r0, 0x5 - strb r0, [r1, 0x2] - movs r5, 0 - str r5, [sp, 0x1C] -_0803E5E4: - ldrb r1, [r6] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0803E646 - mov r0, r8 - movs r1, 0x38 - movs r2, 0 - bl GetMonData - cmp r0, 0x64 - beq _0803E646 - ldr r5, _0803E760 @ =gExperienceTables - mov r0, r8 - movs r1, 0x38 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - mov r0, r8 - movs r1, 0xB - movs r2, 0 - bl GetMonData - adds r4, 0x1 - lsls r4, 2 - ldr r2, _0803E764 @ =gBaseStats - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r1, [r1, 0x13] - movs r0, 0xCA - lsls r0, 1 - muls r0, r1 - adds r4, r0 - adds r4, r5 - ldr r0, [r4] - str r0, [sp] - mov r0, r8 - movs r1, 0x19 - mov r2, sp - bl SetMonData - mov r0, r8 - bl CalculateMonStats - movs r0, 0 - str r0, [sp, 0x1C] -_0803E646: - ldrb r1, [r6] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0803E682 - mov r0, r8 - ldr r1, [sp, 0xC] - movs r2, 0x7 - ldr r3, [sp, 0x34] - bl HealStatusConditions - lsls r0, 24 - cmp r0, 0 - bne _0803E682 - ldr r1, [sp, 0x34] - cmp r1, 0x4 - beq _0803E67E - ldr r1, _0803E768 @ =gBattleMons - movs r0, 0x58 - ldr r3, [sp, 0x34] - adds r2, r3, 0 - muls r2, r0 - adds r1, 0x50 - adds r2, r1 - ldr r0, [r2] - ldr r1, _0803E76C @ =0xf7ffffff - ands r0, r1 - str r0, [r2] -_0803E67E: - movs r4, 0 - str r4, [sp, 0x1C] -_0803E682: - ldrb r1, [r6] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0803E6A2 - ldr r2, _0803E770 @ =0x00000f88 - mov r0, r8 - ldr r1, [sp, 0xC] - ldr r3, [sp, 0x34] - bl HealStatusConditions - lsls r0, 24 - cmp r0, 0 - bne _0803E6A2 - movs r5, 0 - str r5, [sp, 0x1C] -_0803E6A2: - ldrb r1, [r6] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0803E6C2 - mov r0, r8 - ldr r1, [sp, 0xC] - movs r2, 0x10 - ldr r3, [sp, 0x34] - bl HealStatusConditions - lsls r0, 24 - cmp r0, 0 - bne _0803E6C2 - movs r0, 0 - str r0, [sp, 0x1C] -_0803E6C2: - ldrb r1, [r6] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0803E6E2 - mov r0, r8 - ldr r1, [sp, 0xC] - movs r2, 0x20 - ldr r3, [sp, 0x34] - bl HealStatusConditions - lsls r0, 24 - cmp r0, 0 - bne _0803E6E2 - movs r1, 0 - str r1, [sp, 0x1C] -_0803E6E2: - ldrb r1, [r6] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803E702 - mov r0, r8 - ldr r1, [sp, 0xC] - movs r2, 0x40 - ldr r3, [sp, 0x34] - bl HealStatusConditions - lsls r0, 24 - cmp r0, 0 - bne _0803E702 - movs r2, 0 - str r2, [sp, 0x1C] -_0803E702: - ldrb r1, [r6] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _0803E710 - bl _0803F14C -_0803E710: - ldr r0, _0803E774 @ =gMain - ldr r3, _0803E778 @ =0x0000043d - adds r0, r3 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - bne _0803E724 - bl _0803F14C -_0803E724: - ldr r4, [sp, 0x34] - cmp r4, 0x4 - bne _0803E72E - bl _0803F14C -_0803E72E: - ldr r1, _0803E768 @ =gBattleMons - movs r0, 0x58 - muls r0, r4 - adds r1, 0x50 - adds r2, r0, r1 - ldr r1, [r2] - movs r0, 0x7 - ands r0, r1 - cmp r0, 0 - bne _0803E746 - bl _0803F14C -_0803E746: - movs r0, 0x8 - negs r0, r0 - ands r1, r0 - str r1, [r2] -_0803E74E: - movs r5, 0 - str r5, [sp, 0x1C] - bl _0803F14C - .align 2, 0 -_0803E758: .4byte gSideTimers -_0803E75C: .4byte gActiveBank -_0803E760: .4byte gExperienceTables -_0803E764: .4byte gBaseStats -_0803E768: .4byte gBattleMons -_0803E76C: .4byte 0xf7ffffff -_0803E770: .4byte 0x00000f88 -_0803E774: .4byte gMain -_0803E778: .4byte 0x0000043d -_0803E77C: - ldr r1, [sp, 0x20] - ldr r2, [sp, 0x18] - adds r0, r1, r2 - ldrb r0, [r0] - mov r10, r0 - movs r0, 0x20 - mov r3, r10 - ands r0, r3 - cmp r0, 0 - beq _0803E854 - movs r0, 0xDF - ands r3, r0 - mov r10, r3 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - ldr r1, _0803E880 @ =gUnknown_08208238 - ldr r4, [sp, 0x10] - adds r1, r4, r1 - ldrb r1, [r1] - ands r0, r1 - lsls r1, r4, 1 - lsrs r0, r1 - str r0, [sp] - adds r5, r4, 0 - adds r5, 0xD - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - ldr r2, [sp, 0x10] - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x28] - ldr r0, [sp] - cmp r0, 0x2 - bhi _0803E854 - ldr r0, [sp, 0x28] - cmp r0, 0x4 - bls _0803E854 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - ldr r1, _0803E884 @ =gUnknown_08208240 - ldr r2, [sp, 0x10] - adds r1, r2, r1 - ldrb r1, [r1] - adds r0, r1 - str r0, [sp] - mov r0, r8 - movs r1, 0x15 - mov r2, sp - bl SetMonData - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - ldr r1, [sp] - lsls r1, 24 - lsrs r1, 24 - ldr r2, [sp, 0x10] - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - ldr r3, [sp, 0x28] - subs r0, r3 - str r0, [sp] - ldr r4, [sp, 0x10] - adds r4, 0x11 - mov r0, r8 - adds r1, r4, 0 - movs r2, 0 - bl GetMonData - ldr r1, [sp] - adds r0, r1 - str r0, [sp] - mov r0, r8 - adds r1, r4, 0 - mov r2, sp - bl SetMonData - movs r4, 0 - str r4, [sp, 0x1C] -_0803E854: - movs r5, 0 - str r5, [sp, 0x28] - mov r0, r10 - cmp r0, 0 - bne _0803E862 - bl _0803F14C -_0803E862: - movs r0, 0x1 - mov r1, r10 - ands r0, r1 - cmp r0, 0 - bne _0803E86E - b _0803EE0A -_0803E86E: - ldr r2, [sp, 0x28] - cmp r2, 0x7 - bls _0803E876 - b _0803EE0A -_0803E876: - lsls r0, r2, 2 - ldr r1, _0803E888 @ =_0803E88C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0803E880: .4byte gUnknown_08208238 -_0803E884: .4byte gUnknown_08208240 -_0803E888: .4byte _0803E88C - .align 2, 0 -_0803E88C: - .4byte _0803E8AC - .4byte _0803E8AC - .4byte _0803E934 - .4byte _0803EB5C - .4byte _0803EE0A - .4byte _0803EE0A - .4byte _0803EE0A - .4byte _0803EDF4 -_0803E8AC: - mov r0, r8 - bl GetMonEVCount - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _0803E8EC @ =0x000001fd - cmp r5, r0 - bls _0803E8BE - b _0803E36C -_0803E8BE: - ldr r0, _0803E8F0 @ =gUnknown_082082F2 - ldr r3, [sp, 0x28] - adds r0, r3, r0 - ldrb r1, [r0] - mov r0, r8 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - str r1, [sp] - cmp r1, 0x63 - bls _0803E8D8 - b _0803EE0A -_0803E8D8: - ldr r4, [sp, 0x20] - ldr r2, [sp, 0x24] - adds r0, r4, r2 - ldrb r0, [r0] - adds r1, r0 - cmp r1, 0x64 - bls _0803E8F4 - adds r0, 0x64 - subs r4, r0, r1 - b _0803E8F6 - .align 2, 0 -_0803E8EC: .4byte 0x000001fd -_0803E8F0: .4byte gUnknown_082082F2 -_0803E8F4: - adds r4, r0, 0 -_0803E8F6: - adds r1, r5, r4 - movs r0, 0xFF - lsls r0, 1 - cmp r1, r0 - bls _0803E904 - adds r0, r4, r0 - subs r4, r0, r1 -_0803E904: - ldr r0, [sp] - adds r0, r4 - str r0, [sp] - ldr r0, _0803E930 @ =gUnknown_082082F2 - ldr r3, [sp, 0x28] - adds r0, r3, r0 - ldrb r1, [r0] - mov r0, r8 - mov r2, sp - bl SetMonData - mov r0, r8 - bl CalculateMonStats - ldr r0, [sp, 0x24] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x24] - movs r4, 0 - str r4, [sp, 0x1C] - b _0803EE0A - .align 2, 0 -_0803E930: .4byte gUnknown_082082F2 -_0803E934: - movs r0, 0x10 - mov r5, r10 - ands r0, r5 - cmp r0, 0 - beq _0803E9F4 - mov r0, r8 - movs r1, 0x39 - movs r2, 0 - bl GetMonData - cmp r0, 0 - beq _0803E954 - ldr r0, [sp, 0x24] - adds r0, 0x1 - lsls r0, 24 - b _0803EC9E -_0803E954: - ldr r0, _0803E99C @ =gMain - ldr r1, _0803E9A0 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r4, 0x2 - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803EA0A - ldr r2, [sp, 0x34] - cmp r2, 0x4 - beq _0803E9B4 - ldr r2, _0803E9A4 @ =gAbsentBankFlags - ldr r1, _0803E9A8 @ =gBitTable - ldr r3, [sp, 0x34] - lsls r0, r3, 2 - adds r0, r1 - ldr r1, [r0] - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - ldr r1, _0803E9AC @ =gBattlePartyID - lsls r0, r3, 1 - adds r0, r1 - ldrb r0, [r0] - bl pokemon_order_func - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - ldr r0, [sp, 0x34] - bl CopyPlayerPartyMonToBattleData - ldr r0, _0803E9B0 @ =gActiveBank - ldrb r0, [r0] - b _0803E9CC - .align 2, 0 -_0803E99C: .4byte gMain -_0803E9A0: .4byte 0x0000043d -_0803E9A4: .4byte gAbsentBankFlags -_0803E9A8: .4byte gBitTable -_0803E9AC: .4byte gBattlePartyID -_0803E9B0: .4byte gActiveBank -_0803E9B4: - ldr r3, _0803E9E4 @ =gAbsentBankFlags - ldr r1, _0803E9E8 @ =gBitTable - ldr r2, _0803E9EC @ =gActiveBank - ldrb r0, [r2] - eors r0, r4 - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - ldrb r0, [r3] - bics r0, r1 - strb r0, [r3] - ldrb r0, [r2] -_0803E9CC: - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _0803EA0A - ldr r1, _0803E9F0 @ =gBattleResults - ldrb r0, [r1, 0x4] - cmp r0, 0xFE - bhi _0803EA0A - adds r0, 0x1 - strb r0, [r1, 0x4] - b _0803EA0A - .align 2, 0 -_0803E9E4: .4byte gAbsentBankFlags -_0803E9E8: .4byte gBitTable -_0803E9EC: .4byte gActiveBank -_0803E9F0: .4byte gBattleResults -_0803E9F4: - mov r0, r8 - movs r1, 0x39 - movs r2, 0 - bl GetMonData - cmp r0, 0 - bne _0803EA0A - ldr r0, [sp, 0x24] - adds r0, 0x1 - lsls r0, 24 - b _0803EC9E -_0803EA0A: - ldr r1, [sp, 0x24] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x24] - ldr r4, [sp, 0x20] - adds r1, r4, r1 - ldrb r1, [r1] - str r1, [sp] - adds r0, r1, 0 - cmp r0, 0xFE - beq _0803EA4C - cmp r0, 0xFE - bhi _0803EA2C - cmp r0, 0xFD - beq _0803EA62 - b _0803EA6C -_0803EA2C: - cmp r1, 0xFF - bne _0803EA6C - mov r0, r8 - movs r1, 0x3A - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - mov r0, r8 - movs r1, 0x39 - movs r2, 0 - bl GetMonData - subs r4, r0 - str r4, [sp] - b _0803EA6C -_0803EA4C: - mov r0, r8 - movs r1, 0x3A - movs r2, 0 - bl GetMonData - lsrs r0, 1 - str r0, [sp] - cmp r0, 0 - bne _0803EA6C - movs r0, 0x1 - b _0803EA6A -_0803EA62: - ldr r0, _0803EB24 @ =gSharedMem - ldr r5, _0803EB28 @ =0x000160fa - adds r0, r5 - ldrb r0, [r0] -_0803EA6A: - str r0, [sp] -_0803EA6C: - mov r0, r8 - movs r1, 0x3A - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - mov r0, r8 - movs r1, 0x39 - movs r2, 0 - bl GetMonData - cmp r4, r0 - beq _0803EB4C - ldr r0, [sp, 0x14] - cmp r0, 0 - bne _0803EB40 - mov r0, r8 - movs r1, 0x39 - movs r2, 0 - bl GetMonData - ldr r1, [sp] - adds r0, r1 - str r0, [sp] - mov r0, r8 - movs r1, 0x3A - movs r2, 0 - bl GetMonData - ldr r1, [sp] - cmp r1, r0 - bls _0803EAB8 - mov r0, r8 - movs r1, 0x3A - movs r2, 0 - bl GetMonData - str r0, [sp] -_0803EAB8: - mov r0, r8 - movs r1, 0x39 - mov r2, sp - bl SetMonData - ldr r0, _0803EB2C @ =gMain - ldr r1, _0803EB30 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803EB48 - ldr r2, [sp, 0x34] - cmp r2, 0x4 - beq _0803EB48 - ldr r1, _0803EB34 @ =gBattleMons - movs r0, 0x58 - muls r0, r2 - adds r0, r1 - ldr r1, [sp] - strh r1, [r0, 0x28] - movs r0, 0x10 - mov r3, r10 - ands r0, r3 - cmp r0, 0 - bne _0803EB48 - ldr r4, _0803EB38 @ =gActiveBank - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _0803EB48 - ldr r1, _0803EB3C @ =gBattleResults - ldrb r0, [r1, 0x3] - cmp r0, 0xFE - bhi _0803EB08 - adds r0, 0x1 - strb r0, [r1, 0x3] -_0803EB08: - ldrb r5, [r4] - add r0, sp, 0x34 - ldrb r0, [r0] - strb r0, [r4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl EmitGetAttributes - ldrb r0, [r4] - bl MarkBufferBankForExecution - strb r5, [r4] - b _0803EB48 - .align 2, 0 -_0803EB24: .4byte gSharedMem -_0803EB28: .4byte 0x000160fa -_0803EB2C: .4byte gMain -_0803EB30: .4byte 0x0000043d -_0803EB34: .4byte gBattleMons -_0803EB38: .4byte gActiveBank -_0803EB3C: .4byte gBattleResults -_0803EB40: - ldr r1, _0803EB58 @ =gBattleMoveDamage - ldr r0, [sp] - negs r0, r0 - str r0, [r1] -_0803EB48: - movs r1, 0 - str r1, [sp, 0x1C] -_0803EB4C: - movs r0, 0xEF - mov r2, r10 - ands r2, r0 - mov r10, r2 - b _0803EE0A - .align 2, 0 -_0803EB58: .4byte gBattleMoveDamage -_0803EB5C: - movs r7, 0x2 - mov r0, r10 - ands r0, r7 - cmp r0, 0 - beq _0803EB68 - b _0803ECB8 -_0803EB68: - movs r5, 0 - ldr r3, [sp, 0x24] - adds r3, 0x1 - str r3, [sp, 0x38] -_0803EB70: - movs r4, 0x11 - adds r4, r5 - mov r9, r4 - mov r0, r8 - mov r1, r9 - movs r2, 0 - bl GetMonData - str r0, [sp] - adds r7, r5, 0 - adds r7, 0xD - mov r0, r8 - adds r1, r7, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r5, 24 - lsrs r6, r0, 24 - adds r0, r4, 0 - adds r2, r6, 0 - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - ldr r1, [sp] - cmp r1, r0 - beq _0803EC92 - ldr r2, [sp, 0x20] - ldr r3, [sp, 0x24] - adds r0, r2, r3 - ldrb r0, [r0] - adds r0, r1, r0 - str r0, [sp] - mov r0, r8 - adds r1, r7, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - adds r2, r6, 0 - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - ldr r1, [sp] - cmp r1, r0 - bls _0803EC28 - mov r0, r8 - adds r1, r7, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - adds r2, r6, 0 - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] -_0803EC28: - mov r0, r8 - mov r1, r9 - mov r2, sp - bl SetMonData - ldr r0, _0803ECA4 @ =gMain - ldr r4, _0803ECA8 @ =0x0000043d - adds r0, r4 - ldrb r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803EC8E - ldr r0, [sp, 0x34] - cmp r0, 0x4 - beq _0803EC8E - ldr r4, _0803ECAC @ =gBattleMons - movs r0, 0x58 - ldr r1, [sp, 0x34] - adds r3, r1, 0 - muls r3, r0 - adds r0, r4, 0 - adds r0, 0x50 - adds r0, r3, r0 - ldr r1, [r0] - movs r0, 0x80 - lsls r0, 14 - ands r1, r0 - cmp r1, 0 - bne _0803EC8E - ldr r1, _0803ECB0 @ =gDisableStructs - ldr r2, [sp, 0x34] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x18] - lsrs r1, 4 - ldr r2, _0803ECB4 @ =gBitTable - lsls r0, r5, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _0803EC8E - adds r0, r5, r3 - adds r1, r4, 0 - adds r1, 0x24 - adds r0, r1 - ldr r1, [sp] - strb r1, [r0] -_0803EC8E: - movs r3, 0 - str r3, [sp, 0x1C] -_0803EC92: - adds r5, 0x1 - cmp r5, 0x3 - bgt _0803EC9A - b _0803EB70 -_0803EC9A: - ldr r4, [sp, 0x38] - lsls r0, r4, 24 -_0803EC9E: - lsrs r0, 24 - str r0, [sp, 0x24] - b _0803EE0A - .align 2, 0 -_0803ECA4: .4byte gMain -_0803ECA8: .4byte 0x0000043d -_0803ECAC: .4byte gBattleMons -_0803ECB0: .4byte gDisableStructs -_0803ECB4: .4byte gBitTable -_0803ECB8: - ldr r6, [sp, 0x10] - adds r6, 0x11 - mov r0, r8 - adds r1, r6, 0 - movs r2, 0 - bl GetMonData - str r0, [sp] - ldr r5, [sp, 0x10] - adds r5, 0xD - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - ldr r2, [sp, 0x10] - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - ldr r2, [sp] - cmp r2, r0 - bne _0803ED00 - b _0803EE0A -_0803ED00: - ldr r1, [sp, 0x24] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x24] - ldr r0, [sp, 0x20] - adds r1, r0, r1 - ldrb r0, [r1] - adds r0, r2, r0 - str r0, [sp] - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - ldr r2, [sp, 0x10] - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - ldr r1, [sp] - cmp r1, r0 - bls _0803ED74 - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - ldr r2, [sp, 0x10] - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] -_0803ED74: - mov r0, r8 - adds r1, r6, 0 - mov r2, sp - bl SetMonData - ldr r0, _0803EDE0 @ =gMain - ldr r1, _0803EDE4 @ =0x0000043d - adds r0, r1 - ldrb r1, [r0] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _0803EDD8 - ldr r2, [sp, 0x34] - cmp r2, 0x4 - beq _0803EDD8 - ldr r4, _0803EDE8 @ =gBattleMons - movs r0, 0x58 - adds r3, r2, 0 - muls r3, r0 - adds r0, r4, 0 - adds r0, 0x50 - adds r0, r3, r0 - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 14 - ands r0, r1 - cmp r0, 0 - bne _0803EDD8 - ldr r1, _0803EDEC @ =gDisableStructs - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r0, 0x18] - lsrs r1, 4 - ldr r2, _0803EDF0 @ =gBitTable - ldr r5, [sp, 0x10] - lsls r0, r5, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _0803EDD8 - adds r0, r5, r3 - adds r1, r4, 0 - adds r1, 0x24 - adds r0, r1 - ldr r1, [sp] - strb r1, [r0] -_0803EDD8: - movs r0, 0 - str r0, [sp, 0x1C] - b _0803EE0A - .align 2, 0 -_0803EDE0: .4byte gMain -_0803EDE4: .4byte 0x0000043d -_0803EDE8: .4byte gBattleMons -_0803EDEC: .4byte gDisableStructs -_0803EDF0: .4byte gBitTable -_0803EDF4: - mov r0, r8 - movs r1, 0x2 - ldr r2, [sp, 0x8] - bl GetEvolutionTargetSpecies - lsls r0, 16 - lsrs r1, r0, 16 - cmp r1, 0 - beq _0803EE0A - bl _0803E35C -_0803EE0A: - ldr r1, [sp, 0x28] - adds r1, 0x1 - str r1, [sp, 0x28] - mov r2, r10 - lsrs r2, 1 - mov r10, r2 - cmp r2, 0 - beq _0803EE1C - b _0803E862 -_0803EE1C: - b _0803F14C -_0803EE1E: - ldr r3, [sp, 0x20] - ldr r4, [sp, 0x18] - adds r0, r3, r4 - ldrb r0, [r0] - mov r10, r0 - movs r5, 0 - str r5, [sp, 0x28] - cmp r0, 0 - bne _0803EE32 - b _0803F14C -_0803EE32: - movs r0, 0x1 - mov r1, r10 - ands r0, r1 - cmp r0, 0 - bne _0803EE3E - b _0803F13A -_0803EE3E: - ldr r2, [sp, 0x28] - cmp r2, 0x7 - bls _0803EE46 - b _0803F13A -_0803EE46: - lsls r0, r2, 2 - ldr r1, _0803EE50 @ =_0803EE54 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0803EE50: .4byte _0803EE54 - .align 2, 0 -_0803EE54: - .4byte _0803EE74 - .4byte _0803EE74 - .4byte _0803EE74 - .4byte _0803EE74 - .4byte _0803EEF8 - .4byte _0803EFCC - .4byte _0803F026 - .4byte _0803F07C -_0803EE74: - mov r0, r8 - bl GetMonEVCount - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _0803EEBC @ =0x000001fd - cmp r5, r0 - bls _0803EE88 - bl _0803E36C -_0803EE88: - ldr r0, _0803EEC0 @ =gUnknown_082082F2 - ldr r4, [sp, 0x28] - adds r4, 0x2 - adds r0, r4, r0 - ldrb r1, [r0] - mov r0, r8 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - str r1, [sp] - adds r2, r4, 0 - cmp r1, 0x63 - bls _0803EEA6 - b _0803F13A -_0803EEA6: - ldr r3, [sp, 0x20] - ldr r4, [sp, 0x24] - adds r0, r3, r4 - ldrb r0, [r0] - adds r1, r0 - cmp r1, 0x64 - bls _0803EEC4 - adds r0, 0x64 - subs r4, r0, r1 - b _0803EEC6 - .align 2, 0 -_0803EEBC: .4byte 0x000001fd -_0803EEC0: .4byte gUnknown_082082F2 -_0803EEC4: - adds r4, r0, 0 -_0803EEC6: - adds r1, r5, r4 - movs r0, 0xFF - lsls r0, 1 - cmp r1, r0 - bls _0803EED4 - adds r0, r4, r0 - subs r4, r0, r1 -_0803EED4: - ldr r0, [sp] - adds r0, r4 - str r0, [sp] - ldr r0, _0803EEF4 @ =gUnknown_082082F2 - adds r0, r2, r0 - ldrb r1, [r0] - mov r0, r8 - mov r2, sp - bl SetMonData - mov r0, r8 - bl CalculateMonStats - movs r5, 0 - str r5, [sp, 0x1C] - b _0803F130 - .align 2, 0 -_0803EEF4: .4byte gUnknown_082082F2 -_0803EEF8: - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - ldr r1, _0803EFC0 @ =gUnknown_08208238 - ldr r2, [sp, 0x10] - adds r1, r2, r1 - ldrb r1, [r1] - ands r0, r1 - lsls r1, r2, 1 - lsrs r0, r1 - str r0, [sp] - cmp r0, 0x2 - bls _0803EF18 - b _0803F13A -_0803EF18: - adds r5, r2, 0 - adds r5, 0xD - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - ldr r2, [sp, 0x10] - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r4, r0, 24 - mov r0, r8 - movs r1, 0x15 - movs r2, 0 - bl GetMonData - str r0, [sp] - ldr r1, _0803EFC4 @ =gUnknown_0820823C - ldr r3, [sp, 0x10] - adds r1, r3, r1 - ldrb r2, [r1] - ands r2, r0 - str r2, [sp] - ldr r0, _0803EFC8 @ =gUnknown_08208240 - adds r0, r3, r0 - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - adds r2, r0 - str r2, [sp] - mov r0, r8 - movs r1, 0x15 - mov r2, sp - bl SetMonData - mov r0, r8 - adds r1, r5, 0 - movs r2, 0 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - ldr r1, [sp] - lsls r1, 24 - lsrs r1, 24 - ldr r2, [sp, 0x10] - bl CalculatePPWithBonus - lsls r0, 24 - lsrs r0, 24 - subs r0, r4 - str r0, [sp] - ldr r4, [sp, 0x10] - adds r4, 0x11 - mov r0, r8 - adds r1, r4, 0 - movs r2, 0 - bl GetMonData - ldr r1, [sp] - adds r0, r1 - str r0, [sp] - mov r0, r8 - adds r1, r4, 0 - mov r2, sp - bl SetMonData - movs r4, 0 - str r4, [sp, 0x1C] - b _0803F13A - .align 2, 0 -_0803EFC0: .4byte gUnknown_08208238 -_0803EFC4: .4byte gUnknown_0820823C -_0803EFC8: .4byte gUnknown_08208240 -_0803EFCC: - mov r0, r8 - movs r1, 0x20 - movs r2, 0 - bl GetMonData - cmp r0, 0x63 - bls _0803EFDC - b _0803F130 -_0803EFDC: - ldr r5, [sp, 0x1C] - cmp r5, 0 - beq _0803EFE4 - b _0803F130 -_0803EFE4: - ldr r0, [sp, 0x2C] - cmp r0, 0 - beq _0803EFEC - b _0803F130 -_0803EFEC: - ldr r1, [sp, 0x20] - ldr r2, [sp, 0x24] - adds r0, r1, r2 - ldrb r0, [r0] - str r0, [sp, 0x2C] - mov r0, r8 - movs r1, 0x20 - movs r2, 0 - bl GetMonData - adds r5, r0, 0 - str r5, [sp, 0x4] - ldr r3, [sp, 0x2C] - lsls r4, r3, 24 - asrs r1, r4, 24 - cmp r1, 0 - ble _0803F0D0 - ldr r0, [sp, 0x30] - cmp r0, 0x1B - bne _0803F0D0 - movs r0, 0x96 - muls r0, r1 - movs r1, 0x64 - bl __divsi3 - adds r0, r5, r0 - str r0, [sp, 0x4] - adds r2, r4, 0 - b _0803F0DC -_0803F026: - mov r0, r8 - movs r1, 0x20 - movs r2, 0 - bl GetMonData - cmp r0, 0x63 - bls _0803F130 - mov r0, r8 - movs r1, 0x20 - movs r2, 0 - bl GetMonData - cmp r0, 0xC7 - bhi _0803F130 - ldr r2, [sp, 0x1C] - cmp r2, 0 - bne _0803F130 - ldr r3, [sp, 0x2C] - cmp r3, 0 - bne _0803F130 - ldr r4, [sp, 0x20] - ldr r5, [sp, 0x24] - adds r0, r4, r5 - ldrb r0, [r0] - str r0, [sp, 0x2C] - mov r0, r8 - movs r1, 0x20 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - str r4, [sp, 0x4] - ldr r0, [sp, 0x2C] - lsls r5, r0, 24 - asrs r1, r5, 24 - cmp r1, 0 - ble _0803F076 - ldr r2, [sp, 0x30] - cmp r2, 0x1B - beq _0803F0BE -_0803F076: - ldr r3, [sp, 0x2C] - lsls r2, r3, 24 - b _0803F0D4 -_0803F07C: - mov r0, r8 - movs r1, 0x20 - movs r2, 0 - bl GetMonData - cmp r0, 0xC7 - bls _0803F130 - ldr r4, [sp, 0x1C] - cmp r4, 0 - bne _0803F130 - ldr r5, [sp, 0x2C] - cmp r5, 0 - bne _0803F130 - ldr r1, [sp, 0x20] - ldr r2, [sp, 0x24] - adds r0, r1, r2 - ldrb r0, [r0] - str r0, [sp, 0x2C] - mov r0, r8 - movs r1, 0x20 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - str r4, [sp, 0x4] - ldr r3, [sp, 0x2C] - lsls r5, r3, 24 - asrs r1, r5, 24 - cmp r1, 0 - ble _0803F0D0 - ldr r0, [sp, 0x30] - cmp r0, 0x1B - bne _0803F0D0 -_0803F0BE: - movs r0, 0x96 - muls r0, r1 - movs r1, 0x64 - bl __divsi3 - adds r0, r4, r0 - str r0, [sp, 0x4] - adds r2, r5, 0 - b _0803F0DC -_0803F0D0: - ldr r1, [sp, 0x2C] - lsls r2, r1, 24 -_0803F0D4: - asrs r1, r2, 24 - ldr r0, [sp, 0x4] - adds r0, r1 - str r0, [sp, 0x4] -_0803F0DC: - cmp r2, 0 - ble _0803F112 - mov r0, r8 - movs r1, 0x26 - movs r2, 0 - bl GetMonData - cmp r0, 0xB - bne _0803F0F4 - ldr r0, [sp, 0x4] - adds r0, 0x1 - str r0, [sp, 0x4] -_0803F0F4: - mov r0, r8 - movs r1, 0x23 - movs r2, 0 - bl GetMonData - adds r4, r0, 0 - bl sav1_map_get_name - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bne _0803F112 - ldr r0, [sp, 0x4] - adds r0, 0x1 - str r0, [sp, 0x4] -_0803F112: - ldr r0, [sp, 0x4] - cmp r0, 0 - bge _0803F11C - movs r0, 0 - str r0, [sp, 0x4] -_0803F11C: - ldr r0, [sp, 0x4] - cmp r0, 0xFF - ble _0803F126 - movs r0, 0xFF - str r0, [sp, 0x4] -_0803F126: - add r2, sp, 0x4 - mov r0, r8 - movs r1, 0x20 - bl SetMonData -_0803F130: - ldr r0, [sp, 0x24] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x24] -_0803F13A: - ldr r2, [sp, 0x28] - adds r2, 0x1 - str r2, [sp, 0x28] - mov r3, r10 - lsrs r3, 1 - mov r10, r3 - cmp r3, 0 - beq _0803F14C - b _0803EE32 -_0803F14C: - ldr r4, [sp, 0x18] - adds r4, 0x1 - str r4, [sp, 0x18] - cmp r4, 0x5 - bgt _0803F15A - bl _0803E378 -_0803F15A: - ldr r0, [sp, 0x1C] -_0803F15C: - add sp, 0x3C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_803E1B0 - .align 2, 0 @ Don't pad with nop. diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c index 92bf01171..ae24db061 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon/pokemon_item_effect.c @@ -97,7 +97,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp34 = 4; } //_0803E2F4 - + if (b < 13 || b > 0xB2) return 1; if (gItemEffectTable[b - 13] == NULL && b != 0xAF) @@ -163,7 +163,6 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (gBattleMons[gActiveBank].statStages[3] > 12) gBattleMons[gActiveBank].statStages[3] = 12; sp1C = 0; - //asm(""); } break; case 2: @@ -244,7 +243,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) SetMonData(pkmn, MON_DATA_PP_BONUSES, &sp0); sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), sp0, d) - sp28; - sp0 += GetMonData(pkmn, MON_DATA_PP1 + d, NULL); + sp0 = GetMonData(pkmn, MON_DATA_PP1 + d, NULL) + sp0; SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); sp1C = 0; } @@ -255,7 +254,8 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { if (r10 & 1) { - s32 r5; // TODO: the ev count is a separate variable + u16 evCount; + s32 r5; u32 r1; switch (sp28) @@ -263,8 +263,8 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) case 0: case 1: //_0803E8AC - r5 = GetMonEVCount(pkmn); - if (r5 >= 510) + evCount = GetMonEVCount(pkmn); + if (evCount >= 510) return 1; r1 = GetMonData(pkmn, gUnknown_082082F2[sp28], NULL); sp0 = r1; @@ -274,7 +274,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) r4 = 100 - (r1 + sp20[sp24]) + sp20[sp24]; else r4 = sp20[sp24]; - r1 = r5 + r4; + r1 = evCount + r4; if (r1 > 510) r4 += 510 - r1; sp0 += r4; @@ -282,7 +282,6 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) CalculateMonStats(pkmn); sp24++; sp1C = 0; - //asm(""); } break; case 2: @@ -347,7 +346,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { if (e == 0) { - sp0 += GetMonData(pkmn, MON_DATA_HP, NULL); + sp0 = GetMonData(pkmn, MON_DATA_HP, NULL) + sp0; if (sp0 > GetMonData(pkmn, MON_DATA_MAX_HP, NULL)) sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL); //_0803EAB8 @@ -357,10 +356,9 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) gBattleMons[sp34].hp = sp0; if (!(r10 & 0x10) && GetBankSide(gActiveBank) == 0) { - u8 r5; - if (gBattleResults.unk3 < 255) gBattleResults.unk3++; + // I have to re-use this variable to match. r5 = gActiveBank; gActiveBank = sp34; EmitGetAttributes(0, 0, 0); @@ -444,7 +442,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) case 7: //_0803EDF4 { - u16 targetSpecies = GetEvolutionTargetSpecies(pkmn, 2, d); + u16 targetSpecies = GetEvolutionTargetSpecies(pkmn, 2, b); if (targetSpecies != SPECIES_NONE) { @@ -471,7 +469,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { u16 r5; u32 r1; - + switch (sp28) { case 0: @@ -510,11 +508,11 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp0 = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL); sp0 &= gUnknown_0820823C[d]; sp0 += gUnknown_08208240[d] * 3; - + SetMonData(pkmn, MON_DATA_PP_BONUSES, &sp0); sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), sp0, d) - r4; - sp0 += GetMonData(pkmn, MON_DATA_PP1 + b, NULL); - SetMonData(pkmn, MON_DATA_PP1 + b, &sp0); + sp0 = GetMonData(pkmn, MON_DATA_PP1 + d, NULL) + sp0; + SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); sp1C = 0; } break; @@ -535,7 +533,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp4 += sp2C; } //_0803F0DC (tail merged) - + if (sp2C > 0) { if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) @@ -564,14 +562,14 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (sp2C > 0 && sp30 == 0x1B) { //to _0803F0BE - sp4 = 150 * sp2C / 100; + sp4 += 150 * sp2C / 100; } else { sp4 += sp2C; } //_0803F0DC (tail merged) - + if (sp2C > 0) { if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) @@ -599,7 +597,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) if (sp2C > 0 && sp30 == 0x1B) { //_0803F0BE - sp4 = 150 * sp2C / 100; + sp4 += 150 * sp2C / 100; } //_0803F0D0 else @@ -607,7 +605,7 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) sp4 += sp2C; } //_0803F0DC - + if (sp2C > 0) { if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) -- cgit v1.2.3 From 08a108f432325d6501f3c6473a6d43265af0d5b7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 17:14:39 -0500 Subject: through diegohint1 --- asm/pokemon_storage_system.s | 168 +-------------------------------- include/pokemon.h | 2 +- include/pokemon_storage_system.h | 3 +- src/field/daycare.c | 2 +- src/pokemon/pokemon_1.c | 2 +- src/pokemon/pokemon_storage_system_4.c | 37 +++++++- src/pokemon/pokemon_summary_screen.c | 2 +- 7 files changed, 43 insertions(+), 173 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 9b37cbe69..e47abfda0 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,172 +5,6 @@ .text - thumb_func_start diegohint2 -diegohint2: @ 809B4D4 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r5, r1, 24 - cmp r6, 0xE - bne _0809B508 - ldr r1, _0809B4FC @ =gPlayerParty - movs r0, 0x64 - muls r0, r5 - adds r0, r1 - ldr r1, _0809B500 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _0809B504 @ =0x000025b4 - adds r1, r2 - movs r2, 0x64 - bl memcpy - b _0809B536 - .align 2, 0 -_0809B4FC: .4byte gPlayerParty -_0809B500: .4byte gPokemonStorageSystemPtr -_0809B504: .4byte 0x000025b4 -_0809B508: - ldr r0, _0809B53C @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r0, _0809B540 @ =0x000025b4 - adds r4, r0 - adds r0, r4, 0 - bl BoxMonRestorePP - ldr r3, _0809B544 @ =gPokemonStorage - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 4 - lsls r2, r6, 2 - adds r2, r6 - lsls r1, r2, 4 - subs r1, r2 - lsls r1, 5 - adds r0, r1 - adds r0, r3 - adds r0, 0x4 - adds r1, r4, 0 - movs r2, 0x50 - bl memcpy -_0809B536: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809B53C: .4byte gPokemonStorageSystemPtr -_0809B540: .4byte 0x000025b4 -_0809B544: .4byte gPokemonStorage - thumb_func_end diegohint2 - - thumb_func_start sub_809B548 -sub_809B548: @ 809B548 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r2, r1, 24 - cmp r0, 0xE - bne _0809B568 - movs r0, 0x64 - muls r0, r2 - ldr r1, _0809B564 @ =gPlayerParty - adds r0, r1 - bl ZeroMonData - b _0809B582 - .align 2, 0 -_0809B564: .4byte gPlayerParty -_0809B568: - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - ldr r2, _0809B588 @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - bl ZeroBoxMonData -_0809B582: - pop {r0} - bx r0 - .align 2, 0 -_0809B588: .4byte gPokemonStorage + 0x4 - thumb_func_end sub_809B548 - - thumb_func_start diegohint1 -diegohint1: @ 809B58C - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - cmp r5, 0xE - bne _0809B5C0 - ldr r0, _0809B5B4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809B5B8 @ =0x00002618 - adds r0, r1 - ldr r2, _0809B5BC @ =gPlayerParty - movs r1, 0x64 - muls r1, r6 - adds r1, r2 - movs r2, 0x64 - bl memcpy - b _0809B5E2 - .align 2, 0 -_0809B5B4: .4byte gPokemonStorageSystemPtr -_0809B5B8: .4byte 0x00002618 -_0809B5BC: .4byte gPlayerParty -_0809B5C0: - lsls r1, r5, 2 - adds r1, r5 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 4 - ldr r2, _0809B614 @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - ldr r1, _0809B618 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _0809B61C @ =0x00002618 - adds r1, r2 - bl sub_803B4B4 -_0809B5E2: - adds r0, r5, 0 - adds r1, r6, 0 - bl diegohint2 - ldr r0, _0809B618 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r0, _0809B620 @ =0x000025b4 - adds r4, r1, r0 - ldr r2, _0809B61C @ =0x00002618 - adds r1, r2 - adds r0, r4, 0 - movs r2, 0x64 - bl memcpy - adds r0, r4, 0 - movs r1, 0 - bl sub_809C04C - ldr r0, _0809B624 @ =gUnknown_020384E7 - strb r5, [r0] - ldr r0, _0809B628 @ =gUnknown_020384E8 - strb r6, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809B614: .4byte gPokemonStorage + 0x4 -_0809B618: .4byte gPokemonStorageSystemPtr -_0809B61C: .4byte 0x00002618 -_0809B620: .4byte 0x000025b4 -_0809B624: .4byte gUnknown_020384E7 -_0809B628: .4byte gUnknown_020384E8 - thumb_func_end diegohint1 - thumb_func_start sub_809B62C sub_809B62C: @ 809B62C push {r4-r6,lr} @@ -474,7 +308,7 @@ _0809B864: ldr r4, [r1] ldr r2, _0809B908 @ =0x00002618 adds r1, r4, r2 - bl sub_803B4B4 + bl ExpandBoxMon ldrb r0, [r5] ldr r1, _0809B90C @ =0x00002682 adds r4, r1 diff --git a/include/pokemon.h b/include/pokemon.h index 8624270f1..47d6bcfc7 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -522,7 +522,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src); void sub_803AF78(struct Pokemon *mon, struct UnknownPokemonStruct *dest); u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon); void CalculateMonStats(struct Pokemon *mon); -void sub_803B4B4(const struct BoxPokemon *src, struct Pokemon *dest); +void ExpandBoxMon(const struct BoxPokemon *src, struct Pokemon *dest); u8 GetLevelFromMonExp(struct Pokemon *mon); u8 GetLevelFromBoxMonExp(struct BoxPokemon *boxMon); u16 GiveMoveToMon(struct Pokemon *mon, u16 move); diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index eefea4ec8..7960213ae 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -182,7 +182,8 @@ struct PokemonStorageSystemData { struct PokemonMarkMenu unk_12bc; struct UnkPSSStruct_2002370 unk_2370; struct Pokemon unk_25b4; - u8 filler_2618[0x74]; + struct Pokemon unk_2618; + u8 filler_267c[0x10]; u8 unk_268c; u8 unk_268d; u8 unk_268e; diff --git a/src/field/daycare.c b/src/field/daycare.c index 36dd7ec03..2f0c7281e 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -205,7 +205,7 @@ static u16 TakeSelectedPokemonFromDaycare(struct DayCare * daycare, u8 slot) GetBoxMonNick(&daycare->mons[slot], gStringVar1); species = GetBoxMonData(&daycare->mons[slot], MON_DATA_SPECIES); - sub_803B4B4(&daycare->mons[slot], &pokemon); + ExpandBoxMon(&daycare->mons[slot], &pokemon); if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL) { diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index 0242e7444..06a088046 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -524,7 +524,7 @@ void CalculateMonStats(struct Pokemon *mon) SetMonData(mon, MON_DATA_HP, ¤tHP); } -void sub_803B4B4(const struct BoxPokemon *src, struct Pokemon *dest) +void ExpandBoxMon(const struct BoxPokemon *src, struct Pokemon *dest) { u32 value = 0; dest->box = *src; diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 1127927bf..73d71fa0e 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -60,6 +60,7 @@ void diegohint1(u8 a0, u8 a1); bool8 sub_809BF2C(void); void sub_809BF74(void); void sub_809C028(void); +void sub_809C04C(struct Pokemon *pokemon, u8 a1); void sub_809CC04(void); // .rodata @@ -1562,8 +1563,42 @@ void sub_809B44C(u8 a0, u8 a1) if (a0 == 14) gPokemonStorageSystemPtr->unk_25b4 = gPlayerParty[gUnknown_020384E5]; else - sub_803B4B4(gPokemonStorage.boxes[a0], &gPokemonStorageSystemPtr->unk_25b4); + ExpandBoxMon(gPokemonStorage.boxes[a0] + a1, &gPokemonStorageSystemPtr->unk_25b4); sub_809B548(a0, a1); gUnknown_020384E7 = a0; gUnknown_020384E8 = a1; } + +void diegohint2(u8 a0, u8 a1) +{ + if (a0 == 14) + { + gPlayerParty[a1] = gPokemonStorageSystemPtr->unk_25b4; + } + else + { + BoxMonRestorePP(&gPokemonStorageSystemPtr->unk_25b4.box); + gPokemonStorage.boxes[a0][a1] = gPokemonStorageSystemPtr->unk_25b4.box; + } +} + +void sub_809B548(u8 a0, u8 a1) +{ + if (a0 == 14) + ZeroMonData(gPlayerParty + a1); + else + ZeroBoxMonData(gPokemonStorage.boxes[a0] + a1); +} + +void diegohint1(u8 a0, u8 a1) +{ + if (a0 == 14) + gPokemonStorageSystemPtr->unk_2618 = gPlayerParty[a1]; + else + ExpandBoxMon(gPokemonStorage.boxes[a0] + a1, &gPokemonStorageSystemPtr->unk_2618); + diegohint2(a0, a1); + gPokemonStorageSystemPtr->unk_25b4 = gPokemonStorageSystemPtr->unk_2618; + sub_809C04C(&gPokemonStorageSystemPtr->unk_25b4, 0); + gUnknown_020384E7 = a0; + gUnknown_020384E8 = a1; +} diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index ce83ad070..dce65898c 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -2253,7 +2253,7 @@ static void sub_809F678(struct Pokemon *mon) else { struct BoxPokemon *mons = pssData.monList.boxMons; - sub_803B4B4(&mons[pssData.monIndex], mon); + ExpandBoxMon(&mons[pssData.monIndex], mon); } } -- cgit v1.2.3 From 3295ffbd5bcd75d586e3f6dde7469cad1fce2c85 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 17:36:16 -0600 Subject: clean up pokemon_item_effect.c --- asm/pokemon_item_effect.s | 8 - include/constants/items.h | 15 ++ include/pokemon.h | 2 + ld_script.txt | 1 - src/battle/battle_4.c | 4 +- src/pokemon/pokemon_item_effect.c | 539 ++++++++++++++++---------------------- 6 files changed, 245 insertions(+), 324 deletions(-) delete mode 100644 asm/pokemon_item_effect.s diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s deleted file mode 100644 index c3461fa64..000000000 --- a/asm/pokemon_item_effect.s +++ /dev/null @@ -1,8 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - .align 2, 0 @ Don't pad with nop. diff --git a/include/constants/items.h b/include/constants/items.h index cde5c7141..9b88db1da 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -2,6 +2,8 @@ #define GUARD_CONSTANTS_ITEMS_H #define ITEM_NONE 0 + +// Balls #define ITEM_MASTER_BALL 1 #define ITEM_ULTRA_BALL 2 #define ITEM_GREAT_BALL 3 @@ -14,6 +16,8 @@ #define ITEM_TIMER_BALL 10 #define ITEM_LUXURY_BALL 11 #define ITEM_PREMIER_BALL 12 + +// Pokemon Items #define ITEM_POTION 13 #define ITEM_ANTIDOTE 14 #define ITEM_BURN_HEAL 15 @@ -180,6 +184,8 @@ #define ITEM_0B0 176 #define ITEM_0B1 177 #define ITEM_0B2 178 + +// hold items #define ITEM_BRIGHT_POWDER 179 #define ITEM_WHITE_HERB 180 #define ITEM_MACHO_BRACE 181 @@ -260,6 +266,8 @@ #define ITEM_PINK_SCARF 256 #define ITEM_GREEN_SCARF 257 #define ITEM_YELLOW_SCARF 258 + +// Key Items #define ITEM_MACH_BIKE 259 #define ITEM_COIN_CASE 260 #define ITEM_ITEMFINDER 261 @@ -290,6 +298,8 @@ #define ITEM_ROOT_FOSSIL 286 #define ITEM_CLAW_FOSSIL 287 #define ITEM_DEVON_SCOPE 288 + +// TMs/HMs #define ITEM_TM01_FOCUS_PUNCH 289 #define ITEM_TM02_DRAGON_CLAW 290 #define ITEM_TM03_WATER_PULSE 291 @@ -348,6 +358,8 @@ #define ITEM_HM06_ROCK_SMASH 344 #define ITEM_HM07_WATERFALL 345 #define ITEM_HM08_DIVE 346 + +// Unknown #define ITEM_15B 347 #define ITEM_15C 348 @@ -386,4 +398,7 @@ #define NUM_TECHNICAL_MACHINES 50 #define NUM_HIDDEN_MACHINES 8 +// Check if the item is one that can be used on a Pokemon. +#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) + #endif // GUARD_CONSTANTS_ITEMS_H diff --git a/include/pokemon.h b/include/pokemon.h index 874ad7e09..8f1b46387 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -351,6 +351,8 @@ struct BattlePokemon /*0x54*/ u32 otId; }; +// Shouldn't these be the same enum? + enum { STAT_STAGE_HP, // 0 diff --git a/ld_script.txt b/ld_script.txt index 3a6305509..7bc64638c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -62,7 +62,6 @@ SECTIONS { src/battle/calculate_base_damage.o(.text); src/pokemon/pokemon_2.o(.text); src/pokemon/pokemon_item_effect.o(.text); - asm/pokemon_item_effect.o(.text); src/pokemon/pokemon_3.o(.text); src/de_rom_8040FE0.o(.text); src/engine/trig.o(.text); diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index ae8f94130..6b048f0ab 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -147,7 +147,7 @@ void ReshowBattleScreenAfterMenu(void); void BattleMainCB2(void); void AddMoney(u32* moneySaveblock, u32 to_give); u8 CountAliveMons(u8 caseID); -void sub_803E1B0(struct Pokemon*, u16 item, u8 partyID, u8 r3, u8 sp); +void PokemonUseItemEffects(struct Pokemon*, u16 item, u8 partyID, u8 r3, u8 sp); u8 CanRunFromBattle(void); u8 GetMoveTarget(u16 move, u8 targetbyte); //get target of move u8 CastformDataTypeChange(u8 bank); @@ -11996,7 +11996,7 @@ static void atk74_hpthresholds2(void) static void atk75_useitemonopponent(void) { gBankInMenu = gBankAttacker; - sub_803E1B0(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1); + PokemonUseItemEffects(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1); gBattlescriptCurrInstr += 1; } diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon/pokemon_item_effect.c index ae24db061..4ebece3b3 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon/pokemon_item_effect.c @@ -1,4 +1,6 @@ #include "global.h" +#include "constants/battle_constants.h" +#include "constants/hold_effects.h" #include "constants/items.h" #include "constants/species.h" #include "battle.h" @@ -23,7 +25,7 @@ extern u8 gStringBank; extern struct BattlePokemon gBattleMons[]; extern struct BattleEnigmaBerry gEnigmaBerries[]; -const u8 gUnknown_082082F2[] = +static const u8 sGetMonDataEVConstants[] = { MON_DATA_HP_EV, MON_DATA_ATK_EV, @@ -37,218 +39,201 @@ extern u8 gUnknown_08208238[]; extern u8 gUnknown_0820823C[]; extern u8 gUnknown_08208240[]; -bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e); +bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 moveIndex, u8 e); -bool8 ExecuteTableBasedItemEffect_(struct Pokemon *pkmn, u16 b, u8 c, u8 d) +bool8 ExecuteTableBasedItemEffect_(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 moveIndex) { - return sub_803E1B0(pkmn, b, c, d, 0); + return PokemonUseItemEffects(pkmn, item, partyIndex, moveIndex, 0); } -bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) +bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 moveIndex, u8 e) { - u32 sp0; - s32 sp4; - s32 sp18; - bool8 sp1C = TRUE; - const u8 *sp20; + u32 data; + s32 friendship; + s32 cmdIndex; + bool8 retVal = TRUE; + const u8 *itemEffect; u8 sp24 = 6; u32 sp28; s8 sp2C = 0; - u8 sp30; + u8 holdEffect; u8 sp34 = 4; - u16 item; + u16 heldItem; u8 r10; u32 r4; - item = GetMonData(pkmn, MON_DATA_HELD_ITEM, NULL); - if (item == 0xAF) + heldItem = GetMonData(pkmn, MON_DATA_HELD_ITEM, NULL); + if (heldItem == ITEM_ENIGMA_BERRY) { if (gMain.inBattle) - sp30 = gEnigmaBerries[gBankInMenu].holdEffect; + holdEffect = gEnigmaBerries[gBankInMenu].holdEffect; else - sp30 = gSaveBlock1.enigmaBerry.holdEffect; + holdEffect = gSaveBlock1.enigmaBerry.holdEffect; } - //_0803E240 else { - sp30 = ItemId_GetHoldEffect(item); + holdEffect = ItemId_GetHoldEffect(heldItem); } - //_0803E248 gStringBank = gBankInMenu; if (gMain.inBattle) { gActiveBank = gBankInMenu; - sp18 = (GetBankSide(gActiveBank) != 0); - while (sp18 < gNoOfAllBanks) + cmdIndex = (GetBankSide(gActiveBank) != 0); + while (cmdIndex < gNoOfAllBanks) { - if (gBattlePartyID[sp18] == c) + if (gBattlePartyID[cmdIndex] == partyIndex) { - sp34 = sp18; + sp34 = cmdIndex; break; } - sp18 += 2; + cmdIndex += 2; } } - //_0803E2E8 else { gActiveBank = 0; sp34 = 4; } - //_0803E2F4 - if (b < 13 || b > 0xB2) - return 1; - if (gItemEffectTable[b - 13] == NULL && b != 0xAF) - return 1; + if (!IS_POKEMON_ITEM(item)) + return TRUE; + if (gItemEffectTable[item - 13] == NULL && item != ITEM_ENIGMA_BERRY) + return TRUE; - if (b == 0xAF) + if (item == ITEM_ENIGMA_BERRY) { - //_0803E31E if (gMain.inBattle) - sp20 = gEnigmaBerries[gActiveBank].itemEffect; + itemEffect = gEnigmaBerries[gActiveBank].itemEffect; else - sp20 = gSaveBlock1.enigmaBerry.itemEffect; + itemEffect = gSaveBlock1.enigmaBerry.itemEffect; } - //_0803E372 else { - sp20 = gItemEffectTable[b - 13]; + itemEffect = gItemEffectTable[item - 13]; } - // Now, the HUGE loop! - for (sp18 = 0; sp18 < 6; sp18++) + for (cmdIndex = 0; cmdIndex < 6; cmdIndex++) { - switch (sp18) + switch (cmdIndex) { + // status healing effects case 0: - //_0803E3A8 - // TODO: stop re-loading sp34 - if ((sp20[sp18] & 0x80) && gMain.inBattle - && sp34 != 4 && (gBattleMons[sp34].status2 & 0xF0000)) + if ((itemEffect[cmdIndex] & 0x80) + && gMain.inBattle && sp34 != 4 && (gBattleMons[sp34].status2 & STATUS2_INFATUATION)) { - gBattleMons[sp34].status2 &= ~0xF0000; - sp1C = 0; + gBattleMons[sp34].status2 &= ~STATUS2_INFATUATION; + retVal = FALSE; } - //_0803E3F0 - if ((sp20[sp18] & 0x30) && !(gBattleMons[gActiveBank].status2 & 0x100000)) + if ((itemEffect[cmdIndex] & 0x30) + && !(gBattleMons[gActiveBank].status2 & STATUS2_FOCUS_ENERGY)) { - gBattleMons[gActiveBank].status2 |= 0x100000; - sp1C = 0; + gBattleMons[gActiveBank].status2 |= STATUS2_FOCUS_ENERGY; + retVal = FALSE; } - //_0803E41E - if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[1] < 12) + if ((itemEffect[cmdIndex] & 0xF) + && gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] < 12) { - gBattleMons[gActiveBank].statStages[1] += sp20[sp18] & 0xF; - if (gBattleMons[gActiveBank].statStages[1] > 12) - gBattleMons[gActiveBank].statStages[1] = 12; - sp1C = 0; + gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] += itemEffect[cmdIndex] & 0xF; + if (gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] > 12) + gBattleMons[gActiveBank].statStages[STAT_STAGE_ATK] = 12; + retVal = FALSE; } break; + // in-battle stat boosting effects? case 1: - //_0803E474 - // r3 might be a temporary variable - if ((sp20[sp18] & 0xF0) && gBattleMons[gActiveBank].statStages[2] < 12) + if ((itemEffect[cmdIndex] & 0xF0) + && gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] < 12) { - gBattleMons[gActiveBank].statStages[2] += (sp20[sp18] & 0xF0) >> 4; - if (gBattleMons[gActiveBank].statStages[2] > 12) - gBattleMons[gActiveBank].statStages[2] = 12; - sp1C = 0; + gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] += (itemEffect[cmdIndex] & 0xF0) >> 4; + if (gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] > 12) + gBattleMons[gActiveBank].statStages[STAT_STAGE_DEF] = 12; + retVal = FALSE; } - //_0803E4BA - if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[3] < 12) + if ((itemEffect[cmdIndex] & 0xF) + && gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] < 12) { - gBattleMons[gActiveBank].statStages[3] += sp20[sp18] & 0xF; - if (gBattleMons[gActiveBank].statStages[3] > 12) - gBattleMons[gActiveBank].statStages[3] = 12; - sp1C = 0; + gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] += itemEffect[cmdIndex] & 0xF; + if (gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] > 12) + gBattleMons[gActiveBank].statStages[STAT_STAGE_SPEED] = 12; + retVal = FALSE; } break; + // more stat boosting effects? case 2: - //_0803E508 - //asm_comment("case2"); - if ((sp20[sp18] & 0xF0) && gBattleMons[gActiveBank].statStages[6] < 12) + if ((itemEffect[cmdIndex] & 0xF0) + && gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] < 12) { - gBattleMons[gActiveBank].statStages[6] += (sp20[sp18] & 0xF0) >> 4; - if (gBattleMons[gActiveBank].statStages[6] > 12) - gBattleMons[gActiveBank].statStages[6] = 12; - sp1C = 0; + gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] += (itemEffect[cmdIndex] & 0xF0) >> 4; + if (gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] > 12) + gBattleMons[gActiveBank].statStages[STAT_STAGE_ACC] = 12; + retVal = FALSE; } - //_0803E54E - if ((sp20[sp18] & 0xF) && gBattleMons[gActiveBank].statStages[4] < 12) + if ((itemEffect[cmdIndex] & 0xF) + && gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] < 12) { - gBattleMons[gActiveBank].statStages[4] += sp20[sp18] & 0xF; - if (gBattleMons[gActiveBank].statStages[4] > 12) - gBattleMons[gActiveBank].statStages[4] = 12; - sp1C = 0; + gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] += itemEffect[cmdIndex] & 0xF; + if (gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] > 12) + gBattleMons[gActiveBank].statStages[STAT_STAGE_SPATK] = 12; + retVal = FALSE; } break; case 3: - //_0803E59C - if ((sp20[sp18] & 0x80) && gSideTimers[GetBankSide(gActiveBank)].mistTimer == 0) + if ((itemEffect[cmdIndex] & 0x80) + && gSideTimers[GetBankSide(gActiveBank)].mistTimer == 0) { gSideTimers[GetBankSide(gActiveBank)].mistTimer = 5; - sp1C = 0; + retVal = FALSE; } - //_0803E5E4 - if ((sp20[sp18] & 0x40) && GetMonData(pkmn, MON_DATA_LEVEL, NULL) != 100) + if ((itemEffect[cmdIndex] & 0x40) // raise level + && GetMonData(pkmn, MON_DATA_LEVEL, NULL) != 100) { - sp0 = gExperienceTables[gBaseStats[GetMonData(pkmn, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(pkmn, MON_DATA_LEVEL, NULL) + 1]; - SetMonData(pkmn, MON_DATA_EXP, &sp0); + data = gExperienceTables[gBaseStats[GetMonData(pkmn, MON_DATA_SPECIES, NULL)].growthRate][GetMonData(pkmn, MON_DATA_LEVEL, NULL) + 1]; + SetMonData(pkmn, MON_DATA_EXP, &data); CalculateMonStats(pkmn); - sp1C = 0; + retVal = FALSE; } - //_0803E646 - if ((sp20[sp18] & 0x20) && HealStatusConditions(pkmn, c, 7, sp34) == 0) + if ((itemEffect[cmdIndex] & 0x20) + && HealStatusConditions(pkmn, partyIndex, 7, sp34) == 0) { if (sp34 != 4) - gBattleMons[sp34].status2 &= 0xF7FFFFFF; - sp1C = 0; + gBattleMons[sp34].status2 &= ~STATUS2_NIGHTMARE; + retVal = FALSE; } - //_0803E682 - if ((sp20[sp18] & 0x10) && HealStatusConditions(pkmn, c, 0xF88, sp34) == 0) - sp1C = 0; - //_0803E6A2 - if ((sp20[sp18] & 8) && HealStatusConditions(pkmn, c, 16, sp34) == 0) - sp1C = 0; - //_0803E6C2 - if ((sp20[sp18] & 4) && HealStatusConditions(pkmn, c, 32, sp34) == 0) - sp1C = 0; - //_0803E6E2 - if ((sp20[sp18] & 2) && HealStatusConditions(pkmn, c, 64, sp34) == 0) - sp1C = 0; - //_0803E702 - if ((sp20[sp18] & 1) && gMain.inBattle - && sp34 != 4 && (gBattleMons[sp34].status2 & 7)) + if ((itemEffect[cmdIndex] & 0x10) && HealStatusConditions(pkmn, partyIndex, 0xF88, sp34) == 0) + retVal = FALSE; + if ((itemEffect[cmdIndex] & 8) && HealStatusConditions(pkmn, partyIndex, 16, sp34) == 0) + retVal = FALSE; + if ((itemEffect[cmdIndex] & 4) && HealStatusConditions(pkmn, partyIndex, 32, sp34) == 0) + retVal = FALSE; + if ((itemEffect[cmdIndex] & 2) && HealStatusConditions(pkmn, partyIndex, 64, sp34) == 0) + retVal = FALSE; + if ((itemEffect[cmdIndex] & 1) // heal confusion + && gMain.inBattle && sp34 != 4 && (gBattleMons[sp34].status2 & STATUS2_CONFUSION)) { - gBattleMons[sp34].status2 &= ~7; - sp1C = 0; + gBattleMons[sp34].status2 &= ~STATUS2_CONFUSION; + retVal = FALSE; } break; + // EV, HP, and PP raising effects case 4: - //_0803E77C - r10 = sp20[sp18]; + r10 = itemEffect[cmdIndex]; if (r10 & 0x20) { - //u16 r4; - r10 &= ~0x20; - - sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) >> (d * 2); - sp28 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); - if (sp0 <= 2 && sp28 > 4) + data = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[moveIndex]) >> (moveIndex * 2); + sp28 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex); + if (data <= 2 && sp28 > 4) { - sp0 = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) + gUnknown_08208240[d]; - SetMonData(pkmn, MON_DATA_PP_BONUSES, &sp0); + data = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) + gUnknown_08208240[moveIndex]; + SetMonData(pkmn, MON_DATA_PP_BONUSES, &data); - sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), sp0, d) - sp28; - sp0 = GetMonData(pkmn, MON_DATA_PP1 + d, NULL) + sp0; - SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); - sp1C = 0; + data = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), data, moveIndex) - sp28; + data = GetMonData(pkmn, MON_DATA_PP1 + moveIndex, NULL) + data; + SetMonData(pkmn, MON_DATA_PP1 + moveIndex, &data); + retVal = FALSE; } } - //_0803E854 sp28 = 0; while (r10 != 0) { @@ -256,36 +241,32 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { u16 evCount; s32 r5; - u32 r1; - + switch (sp28) { case 0: case 1: - //_0803E8AC evCount = GetMonEVCount(pkmn); if (evCount >= 510) - return 1; - r1 = GetMonData(pkmn, gUnknown_082082F2[sp28], NULL); - sp0 = r1; - if (r1 < 100) + return TRUE; + data = GetMonData(pkmn, sGetMonDataEVConstants[sp28], NULL); + if (data < 100) { - if (r1 + sp20[sp24] > 100) - r4 = 100 - (r1 + sp20[sp24]) + sp20[sp24]; + if (data + itemEffect[sp24] > 100) + r4 = 100 - (data + itemEffect[sp24]) + itemEffect[sp24]; else - r4 = sp20[sp24]; - r1 = evCount + r4; - if (r1 > 510) - r4 += 510 - r1; - sp0 += r4; - SetMonData(pkmn, gUnknown_082082F2[sp28], &sp0); + r4 = itemEffect[sp24]; + if (evCount + r4 > 510) + r4 += 510 - (evCount + r4); + data += r4; + SetMonData(pkmn, sGetMonDataEVConstants[sp28], &data); CalculateMonStats(pkmn); sp24++; - sp1C = 0; + retVal = FALSE; } break; case 2: - //_0803E934 + // revive? if (r10 & 0x10) { if (GetMonData(pkmn, MON_DATA_HP, NULL) != 0) @@ -299,22 +280,17 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { gAbsentBankFlags &= ~gBitTable[sp34]; CopyPlayerPartyMonToBattleData(sp34, pokemon_order_func(gBattlePartyID[sp34])); - // tail merge, possibly? if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255) gBattleResults.unk4++; } - //_0803E9B4 else { gAbsentBankFlags &= ~gBitTable[gActiveBank ^ 2]; if (GetBankSide(gActiveBank) == 0 && gBattleResults.unk4 < 255) gBattleResults.unk4++; } - //_0803E9CC } - //to _0803EA0A } - //_0803E9F4 else { if (GetMonData(pkmn, MON_DATA_HP, NULL) == 0) @@ -323,37 +299,32 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) break; } } - //_0803EA0A - sp0 = sp20[sp24++]; - switch (sp0) + data = itemEffect[sp24++]; + switch (data) { case 0xFF: - //_0803EA2C - if (sp0 == 0xFF) // wat? - sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) - GetMonData(pkmn, MON_DATA_HP, NULL); + data = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) - GetMonData(pkmn, MON_DATA_HP, NULL); break; case 0xFE: - sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) / 2; - if (sp0 == 0) - sp0 = 1; + data = GetMonData(pkmn, MON_DATA_MAX_HP, NULL) / 2; + if (data == 0) + data = 1; break; case 0xFD: - sp0 = eStatHp; + data = eStatHp; break; } - //_0803EA6C if (GetMonData(pkmn, MON_DATA_MAX_HP, NULL) != GetMonData(pkmn, MON_DATA_HP, NULL)) { if (e == 0) { - sp0 = GetMonData(pkmn, MON_DATA_HP, NULL) + sp0; - if (sp0 > GetMonData(pkmn, MON_DATA_MAX_HP, NULL)) - sp0 = GetMonData(pkmn, MON_DATA_MAX_HP, NULL); - //_0803EAB8 - SetMonData(pkmn, MON_DATA_HP, &sp0); + data = GetMonData(pkmn, MON_DATA_HP, NULL) + data; + if (data > GetMonData(pkmn, MON_DATA_MAX_HP, NULL)) + data = GetMonData(pkmn, MON_DATA_MAX_HP, NULL); + SetMonData(pkmn, MON_DATA_HP, &data); if (gMain.inBattle && sp34 != 4) { - gBattleMons[sp34].hp = sp0; + gBattleMons[sp34].hp = data; if (!(r10 & 0x10) && GetBankSide(gActiveBank) == 0) { if (gBattleResults.unk3 < 255) @@ -366,17 +337,13 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) gActiveBank = r5; } } - //to _0803EB48 } - //_0803EB40 else { - gBattleMoveDamage = -sp0; + gBattleMoveDamage = -data; } - //_0803EB48 - sp1C = 0; + retVal = FALSE; } - //_0803EB4C r10 &= 0xEF; break; case 3: @@ -386,89 +353,76 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) { u16 r4; - sp0 = GetMonData(pkmn, MON_DATA_PP1 + r5, NULL); + data = GetMonData(pkmn, MON_DATA_PP1 + r5, NULL); r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); - if (sp0 != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) + if (data != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) { - sp0 += sp20[sp24]; + data += itemEffect[sp24]; r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); - if (sp0 > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) + if (data > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5)) { r4 = GetMonData(pkmn, MON_DATA_MOVE1 + r5, NULL); - sp0 = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5); + data = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), r5); } - //_0803EC28 - SetMonData(pkmn, MON_DATA_PP1 + r5, &sp0); + SetMonData(pkmn, MON_DATA_PP1 + r5, &data); if (gMain.inBattle && sp34 != 4 && !(gBattleMons[sp34].status2 & 0x200000) && !(gDisableStructs[sp34].unk18_b & gBitTable[r5])) - gBattleMons[sp34].pp[r5] = sp0; - //_0803EC8E - sp1C = 0; + gBattleMons[sp34].pp[r5] = data; + retVal = FALSE; } - //_0803EC92 } - //_0803EC9A sp24++; } - //_0803ECB8 else { u16 r4; - sp0 = GetMonData(pkmn, MON_DATA_PP1 + d, NULL); - r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); - if (sp0 != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d)) + data = GetMonData(pkmn, MON_DATA_PP1 + moveIndex, NULL); + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL); + if (data != CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex)) { - //_0803ED00 - sp0 += sp20[sp24++]; - r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); - if (sp0 > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d)) + data += itemEffect[sp24++]; + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL); + if (data > CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex)) { - r4 = GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL); - sp0 = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); + r4 = GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL); + data = CalculatePPWithBonus(r4, GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex); } - //_0803ED74 - SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); + SetMonData(pkmn, MON_DATA_PP1 + moveIndex, &data); if (gMain.inBattle && sp34 != 4 && !(gBattleMons[sp34].status2 & 0x200000) - && !(gDisableStructs[sp34].unk18_b & gBitTable[d])) - gBattleMons[sp34].pp[d] = sp0; - //_0803EDD8 - sp1C = 0; + && !(gDisableStructs[sp34].unk18_b & gBitTable[moveIndex])) + gBattleMons[sp34].pp[moveIndex] = data; + retVal = FALSE; } } break; case 7: - //_0803EDF4 { - u16 targetSpecies = GetEvolutionTargetSpecies(pkmn, 2, b); + u16 targetSpecies = GetEvolutionTargetSpecies(pkmn, 2, item); if (targetSpecies != SPECIES_NONE) { - BeginEvolutionScene(pkmn, targetSpecies, 0, c); - return 0; + BeginEvolutionScene(pkmn, targetSpecies, 0, partyIndex); + return FALSE; } } break; } } - //_0803EE0A sp28++; r10 >>= 1; } break; case 5: - //_0803EE1E - r10 = sp20[sp18]; + r10 = itemEffect[cmdIndex]; sp28 = 0; while (r10 != 0) { - //_0803EE32 if (r10 & 1) { - u16 r5; - u32 r1; + u16 evCount; switch (sp28) { @@ -476,152 +430,112 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) case 1: case 2: case 3: - //_0803EE74 - r5 = GetMonEVCount(pkmn); - if (r5 >= 510) - return 1; - r1 = GetMonData(pkmn, gUnknown_082082F2[sp28 + 2], NULL); - sp0 = r1; - if (r1 < 100) + evCount = GetMonEVCount(pkmn); + if (evCount >= 510) + return TRUE; + data = GetMonData(pkmn, sGetMonDataEVConstants[sp28 + 2], NULL); + if (data < 100) { - if (r1 + sp20[sp24] > 100) - r4 = 100 - (r1 + sp20[sp24]) + sp20[sp24]; + if (data + itemEffect[sp24] > 100) + r4 = 100 - (data + itemEffect[sp24]) + itemEffect[sp24]; else - r4 = sp20[sp24]; - r1 = r5 + r4; - if (r1 > 510) - r4 += 510 - r1; - sp0 += r4; - SetMonData(pkmn, gUnknown_082082F2[sp28 + 2], &sp0); + r4 = itemEffect[sp24]; + if (evCount + r4 > 510) + r4 += 510 - (evCount + r4); + data += r4; + SetMonData(pkmn, sGetMonDataEVConstants[sp28 + 2], &data); CalculateMonStats(pkmn); - sp1C = 0; + retVal = FALSE; sp24++; } break; case 4: - //_0803EEF8 - sp0 = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[d]) >> (d * 2); - if (sp0 < 3) + data = (GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL) & gUnknown_08208238[moveIndex]) >> (moveIndex * 2); + if (data < 3) { - //_0803EF18 - r4 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), d); - sp0 = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL); - sp0 &= gUnknown_0820823C[d]; - sp0 += gUnknown_08208240[d] * 3; + r4 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex); + data = GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL); + data &= gUnknown_0820823C[moveIndex]; + data += gUnknown_08208240[moveIndex] * 3; - SetMonData(pkmn, MON_DATA_PP_BONUSES, &sp0); - sp0 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + d, NULL), sp0, d) - r4; - sp0 = GetMonData(pkmn, MON_DATA_PP1 + d, NULL) + sp0; - SetMonData(pkmn, MON_DATA_PP1 + d, &sp0); - sp1C = 0; + SetMonData(pkmn, MON_DATA_PP_BONUSES, &data); + data = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), data, moveIndex) - r4; + data = GetMonData(pkmn, MON_DATA_PP1 + moveIndex, NULL) + data; + SetMonData(pkmn, MON_DATA_PP1 + moveIndex, &data); + retVal = FALSE; } break; case 5: - //_0803EFCC - if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) < 100 && sp1C == 0 && sp2C == 0) + if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) < 100 && retVal == 0 && sp2C == 0) { - //_0803EFEC - sp2C = sp20[sp24]; - sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); - if (sp2C > 0 && sp30 == 0x1B) - { - sp4 += 150 * sp2C / 100; - } - //to _0803F0D0 hmm... + sp2C = itemEffect[sp24]; + friendship = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); + if (sp2C > 0 && holdEffect == HOLD_EFFECT_HAPPINESS_UP) + friendship += 150 * sp2C / 100; else - { - sp4 += sp2C; - } - //_0803F0DC (tail merged) - + friendship += sp2C; if (sp2C > 0) { if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) - sp4++; - //_0803F0F4 + friendship++; if (GetMonData(pkmn, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) - sp4++; + friendship++; } - //_0803F112 - if (sp4 < 0) - sp4 = 0; - if (sp4 > 255) - sp4 = 255; - SetMonData(pkmn, MON_DATA_FRIENDSHIP, &sp4); + if (friendship < 0) + friendship = 0; + if (friendship > 255) + friendship = 255; + SetMonData(pkmn, MON_DATA_FRIENDSHIP, &friendship); } - //to _0803F130 hmm... sp24++; break; case 6: - //_0803F026 if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) >= 100 && GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) < 200 - && sp1C == 0 && sp2C == 0) + && retVal == 0 && sp2C == 0) { - sp2C = sp20[sp24]; - sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); - if (sp2C > 0 && sp30 == 0x1B) - { - //to _0803F0BE - sp4 += 150 * sp2C / 100; - } + sp2C = itemEffect[sp24]; + friendship = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); + if (sp2C > 0 && holdEffect == HOLD_EFFECT_HAPPINESS_UP) + friendship += 150 * sp2C / 100; else - { - sp4 += sp2C; - } - //_0803F0DC (tail merged) - + friendship += sp2C; if (sp2C > 0) { if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) - sp4++; - //_0803F0F4 + friendship++; if (GetMonData(pkmn, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) - sp4++; + friendship++; } - //_0803F112 - if (sp4 < 0) - sp4 = 0; - if (sp4 > 255) - sp4 = 255; - SetMonData(pkmn, MON_DATA_FRIENDSHIP, &sp4); + if (friendship < 0) + friendship = 0; + if (friendship > 255) + friendship = 255; + SetMonData(pkmn, MON_DATA_FRIENDSHIP, &friendship); } - //to _0803F130 hmm... sp24++; break; case 7: - //_0803F07C - if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) >= 200 && sp1C == 0 && sp2C == 0) + if (GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL) >= 200 && retVal == 0 && sp2C == 0) { - sp2C = sp20[sp24]; - sp4 = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); - if (sp2C > 0 && sp30 == 0x1B) - { - //_0803F0BE - sp4 += 150 * sp2C / 100; - } - //_0803F0D0 + sp2C = itemEffect[sp24]; + friendship = GetMonData(pkmn, MON_DATA_FRIENDSHIP, NULL); + if (sp2C > 0 && holdEffect == HOLD_EFFECT_HAPPINESS_UP) + friendship += 150 * sp2C / 100; else - { - sp4 += sp2C; - } - //_0803F0DC - + friendship += sp2C; if (sp2C > 0) { if (GetMonData(pkmn, MON_DATA_POKEBALL, NULL) == 11) - sp4++; - //_0803F0F4 + friendship++; if (GetMonData(pkmn, MON_DATA_MET_LOCATION, NULL) == sav1_map_get_name()) - sp4++; + friendship++; } - //_0803F112 - if (sp4 < 0) - sp4 = 0; - if (sp4 > 255) - sp4 = 255; - SetMonData(pkmn, MON_DATA_FRIENDSHIP, &sp4); + if (friendship < 0) + friendship = 0; + if (friendship > 255) + friendship = 255; + SetMonData(pkmn, MON_DATA_FRIENDSHIP, &friendship); } - //to _0803F130 sp24++; break; } @@ -632,6 +546,5 @@ bool8 sub_803E1B0(struct Pokemon *pkmn, u16 b, u8 c, u8 d, u8 e) break; } } - //_0803F15A - return sp1C; + return retVal; } -- cgit v1.2.3 From bdb0628c913fe7f2e77598d6390f8f7d951b1703 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 15 Jan 2018 18:58:59 -0500 Subject: vertical scroll indicator labeling and more shop.c --- include/decoration.h | 2 +- include/item_menu.h | 2 +- include/menu_helpers.h | 27 +++- include/money.h | 2 +- include/shop.h | 18 ++- src/field/berry_tag_screen.c | 2 +- src/field/decoration.c | 24 ++-- src/field/field_specials.c | 24 ++-- src/field/item_menu.c | 84 ++++++------- src/field/menu_helpers.c | 120 +++++++++--------- src/field/money.c | 2 +- src/field/player_pc.c | 50 ++++---- src/field/pokeblock.c | 42 +++---- src/field/secret_base.c | 26 ++-- src/field/shop.c | 290 ++++++++++++++++++++++--------------------- src/field/trader.c | 4 +- src/field/tv.c | 22 ++-- src/pokemon/pokeblock_feed.c | 2 +- src/roulette.c | 6 +- 19 files changed, 389 insertions(+), 360 deletions(-) diff --git a/include/decoration.h b/include/decoration.h index 972e82faf..5e73df071 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -151,7 +151,7 @@ extern const struct YesNoFuncTable gUnknown_083EC634[]; extern const u8 gUnknown_083EC65A[]; extern const u8 gUnknown_083EC97C[]; extern const u8 gUnknown_083EC984[]; -extern void sub_80B3068(u8); // src/shop +extern void Shop_RunExitSellMenuTask(u8); // src/shop extern const struct YesNoFuncTable gUnknown_083EC95C; extern const struct YesNoFuncTable gUnknown_083EC964; extern const struct YesNoFuncTable gUnknown_083EC9CC; diff --git a/include/item_menu.h b/include/item_menu.h index 29618f347..726d36789 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -27,7 +27,7 @@ void CleanUpItemMenuMessage(u8); void CleanUpOverworldMessage(u8); void ExecuteItemUseFromBlackPalette(void); void sub_80A5D04(void); -void sub_80A6300(void); +void ItemMenu_LoadSellMenu(void); void sub_80A68CC(); void sub_80A6A30(void); bool32 sub_80A6D1C(void); diff --git a/include/menu_helpers.h b/include/menu_helpers.h index 993d698bd..a1c872c73 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -9,7 +9,22 @@ struct YesNoFuncTable void (*noFunc)(u8); }; -void sub_80F9020(void); +// SetVerticalScrollIndicators enums +enum +{ + TOP_ARROW, + BOTTOM_ARROW, + LEFT_ARROW, // Bag arrows + RIGHT_ARROW +}; + +enum +{ + VISIBLE, + INVISIBLE +}; + +void ClearBGTilemapBuffers(void); void DisplayItemMessageOnField(u8, const u8 *, TaskFunc, u16); void DoYesNoFuncWithChoice(u8, const struct YesNoFuncTable *); void sub_80F914C(u8, const struct YesNoFuncTable *); @@ -19,21 +34,21 @@ bool8 sub_80F92F4(u16); bool8 sub_80F931C(u16); bool8 sub_80F9344(void); void sub_80F9368(void); -void sub_80F9438(void); -void sub_80F944C(void); +void ClearVideoCallbacks(void); +void ClearVerticalScrollIndicatorPalettes(void); void sub_80F9480(u8 *, u8); void sub_80F94A4(u8, u8 *, s16, s16); void sub_80F94F8(u8 *); void sub_80F9520(u8 *, u8); void CreateVerticalScrollIndicators(u8, u16, u16); -void sub_80F979C(u8, bool8); +void SetVerticalScrollIndicators(u8, bool8); void DestroyVerticalScrollIndicator(u8); void LoadScrollIndicatorPalette(void); void BuyMenuFreeMemory(void); -void sub_80F98A4(u8); +void StopVerticalScrollIndicators(u8); void StartVerticalScrollIndicators(u8); void sub_80F98DC(u8); void PauseVerticalScrollIndicator(u8); -void sub_80F9988(u8, u8); +void SetVerticalScrollIndicatorPriority(u8, u8); #endif // GUARD_MENU_HELPERS_H diff --git a/include/money.h b/include/money.h index 9f4ef71bc..e3a3f898d 100644 --- a/include/money.h +++ b/include/money.h @@ -7,7 +7,7 @@ void RemoveMoney(u32 *, u32); void GetMoneyAmountText(u8 *buffer, u32 arg1, u8 arg2); void PrintMoneyAmount(u32 arg0, u8 arg1, u8 x, u8 y); void sub_80B7AEC(u32, u8 left, u8 top); -void sub_80B7B34(u8, u8, int); +void Draw10000Sprite(u8, u8, int); void UpdateMoneyWindow(u32, u8, u8); void OpenMoneyWindow(u32, u8, u8); void CloseMoneyWindow(u8, u8); diff --git a/include/shop.h b/include/shop.h index b785ca764..8ab24c724 100644 --- a/include/shop.h +++ b/include/shop.h @@ -17,6 +17,14 @@ enum ANIM_NUM }; +// shop options +enum +{ + BUY, + SELL, + EXIT +}; + struct MartInfo { /* 0x0 */ void (* callback) (void); @@ -31,18 +39,18 @@ struct MartInfo void sub_80B2E38(u8); void HandleShopMenuQuit(u8); -void sub_80B2FA0(u8); +void Shop_FadeAndRunBuySellCallback(u8); void BuyMenuDrawGraphics(void); void sub_80B3240(void); void sub_80B3270(void); -void BuyMenuDrawMapGraphics(void); +void Shop_DrawViewport(void); void sub_80B3764(int, int); -void sub_80B37EC(void); +void Shop_PrintItemDesc(void); void sub_80B40E8(u8); void CreatePokemartMenu(u16 *); void CreateDecorationShop1Menu(u16 *); void CreateDecorationShop2Menu(u16 *); -void sub_80B356C(void); -void sub_80B368C(void); +void Shop_LoadViewportObjects(void); +void Shop_AnimViewportObjects(void); #endif // GUARD_SHOP_H diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index a05d9bf87..bec16334d 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -93,7 +93,7 @@ static bool8 sub_8146058(void) switch (gMain.state) { case 0: - sub_80F9438(); + ClearVideoCallbacks(); sub_80F9368(); sub_8146288(); REG_BLDCNT = 0; diff --git a/src/field/decoration.c b/src/field/decoration.c index a6c0bd21f..889e8e8a2 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -1614,7 +1614,7 @@ void sub_80FE604(u8 taskId) sub_8134104(gUnknown_020388F6); gUnknown_020388D0 = gDecorationInventories[gUnknown_020388F6].items; sub_80FEF50(taskId); - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); sub_80F9480(gUnknown_020388F7, 8); LoadScrollIndicatorPalette(); gTasks[taskId].func = sub_80FE868; @@ -1659,7 +1659,7 @@ void sub_80FE758(u8 taskId) gTasks[taskId].func = Task_DecorationPCProcessMenuInput; } else { - sub_80B3068(taskId); + Shop_RunExitSellMenuTask(taskId); } } @@ -1783,17 +1783,17 @@ void sub_80FEABC(u8 taskId, u8 dummy1) u16 i; u16 j; u8 ni; - if (gUnknown_020388F4 != 0 || (DestroyVerticalScrollIndicator(0), gUnknown_020388F4 != 0)) + if (gUnknown_020388F4 != 0 || (DestroyVerticalScrollIndicator(TOP_ARROW), gUnknown_020388F4 != 0)) { - CreateVerticalScrollIndicators(0, 0x3c, 0x08); + CreateVerticalScrollIndicators(TOP_ARROW, 0x3c, 0x08); } if (gUnknown_020388F4 + 7 == gUnknown_020388D5) { - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); } if (gUnknown_020388F4 + 7 < gUnknown_020388D5) { - CreateVerticalScrollIndicators(1, 0x3c, 0x98); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 0x3c, 0x98); } for (i=gUnknown_020388F4; i> 1 != 1) { gUnknown_0203925C |= 0x2; - CreateVerticalScrollIndicators(0, 0x24, 0x08); + CreateVerticalScrollIndicators(TOP_ARROW, 0x24, 0x08); } } @@ -1356,7 +1356,7 @@ void sub_810ECD4(void) if ((gUnknown_0203925C & 1) == 0) { gUnknown_0203925C |= 0x1; - CreateVerticalScrollIndicators(1, 0x24, 0x48); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 0x24, 0x48); } } @@ -1428,11 +1428,11 @@ void sub_810EEDC(void) { if ((gUnknown_0203925C & 1) != 0) { - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); } if ((gUnknown_0203925C >> 1) == 1) { - DestroyVerticalScrollIndicator(0); + DestroyVerticalScrollIndicator(TOP_ARROW); } BuyMenuFreeMemory(); } @@ -1542,7 +1542,7 @@ void ShowGlassWorkshopMenu(void) Menu_DrawStdWindowFrame(0, 0, 10, 11); InitMenu(0, 1, 1, 5, 0, 9); gUnknown_0203925C = 0; - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); LoadScrollIndicatorPalette(); sub_810F2B4(); for (i=0; i<5; i++) @@ -1721,7 +1721,7 @@ void sub_810F290(void) if (gUnknown_0203925C >> 1 != 1) { gUnknown_0203925C |= 0x02; - CreateVerticalScrollIndicators(0, 0x2c, 0x08); + CreateVerticalScrollIndicators(TOP_ARROW, 0x2c, 0x08); } } @@ -1730,7 +1730,7 @@ void sub_810F2B4(void) if (!(gUnknown_0203925C & 0x01)) { gUnknown_0203925C |= 0x01; - CreateVerticalScrollIndicators(1, 0x2c, 0x58); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 0x2c, 0x58); } } @@ -1739,7 +1739,7 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) if (newPos == 0) { gUnknown_0203925C ^= 0x02; - DestroyVerticalScrollIndicator(0); + DestroyVerticalScrollIndicator(TOP_ARROW); } else { @@ -1752,7 +1752,7 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) else if (newPos + maxItems == gUnknown_0203925A) { gUnknown_0203925C ^= 0x01; - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); } } diff --git a/src/field/item_menu.c b/src/field/item_menu.c index e0575af4c..e07021acd 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -34,12 +34,12 @@ #include "task.h" #include "text.h" #include "scanline_effect.h" +#include "menu_helpers.h" #include "ewram.h" // External stuff extern void gpu_pal_allocator_reset__manage_upper_four(void); -extern void sub_80F9020(void); -extern void sub_80F9988(); +extern void SetVerticalScrollIndicatorPriority(); extern void sub_809D104(u16 *, u16, u16, const u8 *, u16, u16, u16, u16); extern void PauseVerticalScrollIndicator(); extern u8 sub_80F9284(void); @@ -50,7 +50,7 @@ extern void pal_fill_black(void); extern bool8 sub_807D770(void); extern u8 sub_80F931C(); extern void sub_808A3F8(u8); -extern void sub_80B3050(void); +extern void Shop_InitExitSellMenu(void); extern void sub_80546B8(u8); extern void sub_804E990(u8); extern void sub_802E424(u8); @@ -392,7 +392,7 @@ static bool8 SetupBagMultistep(void) switch (gMain.state) { case 0: - sub_80F9438(); + ClearVideoCallbacks(); sub_80A34E8(); gMain.state++; break; @@ -405,7 +405,7 @@ static bool8 SetupBagMultistep(void) gMain.state++; break; case 3: - sub_80F9020(); + ClearBGTilemapBuffers(); ewramBagSetupStep = 0; gMain.state++; break; @@ -437,20 +437,20 @@ static bool8 SetupBagMultistep(void) gMain.state++; break; case 10: - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); LoadScrollIndicatorPalette(); - CreateVerticalScrollIndicators(0, 172, 12); - CreateVerticalScrollIndicators(1, 172, 148); - CreateVerticalScrollIndicators(2, 28, 88); - CreateVerticalScrollIndicators(3, 100, 88); - sub_80F9988(0, 2); - sub_80F9988(1, 2); - sub_80F9988(2, 2); - sub_80F9988(3, 2); + CreateVerticalScrollIndicators(TOP_ARROW, 172, 12); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 172, 148); + CreateVerticalScrollIndicators(LEFT_ARROW, 28, 88); + CreateVerticalScrollIndicators(RIGHT_ARROW, 100, 88); + SetVerticalScrollIndicatorPriority(TOP_ARROW, 2); + SetVerticalScrollIndicatorPriority(BOTTOM_ARROW, 2); + SetVerticalScrollIndicatorPriority(LEFT_ARROW, 2); + SetVerticalScrollIndicatorPriority(RIGHT_ARROW, 2); if (sReturnLocation == RETURN_TO_FIELD_4 || sReturnLocation == RETURN_TO_FIELD_5) { - sub_80F979C(2, 1); - sub_80F979C(3, 1); + SetVerticalScrollIndicators(LEFT_ARROW, INVISIBLE); + SetVerticalScrollIndicators(RIGHT_ARROW, INVISIBLE); } gMain.state++; break; @@ -657,10 +657,10 @@ static void sub_80A3770(void) static void sub_80A37C0(u8 taskId) { gTasks[taskId].func = sub_80A50C8; - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); - StartVerticalScrollIndicators(2); - StartVerticalScrollIndicators(3); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); + StartVerticalScrollIndicators(LEFT_ARROW); + StartVerticalScrollIndicators(RIGHT_ARROW); } static void sub_80A37F8(u8 taskId) @@ -702,8 +702,8 @@ static void sub_80A37F8(u8 taskId) sub_80A37C0(FindTaskIdByFunc(sub_80A4F68)); DestroyTask(taskId); ItemListMenu_InitMenu(); - sub_80F979C(2, 0); - sub_80F979C(3, 0); + SetVerticalScrollIndicators(LEFT_ARROW, VISIBLE); + SetVerticalScrollIndicators(RIGHT_ARROW, VISIBLE); } } @@ -1505,14 +1505,14 @@ static void sub_80A47E8(u16 a, int b, int c, int d) break; } if (gBagPocketScrollStates[sCurrentBagPocket].scrollTop != 0) - sub_80F979C(0, 0); + SetVerticalScrollIndicators(TOP_ARROW, VISIBLE); else - sub_80F979C(0, 1); + SetVerticalScrollIndicators(TOP_ARROW, INVISIBLE); if ((sReturnLocation != RETURN_TO_FIELD_5 && gBagPocketScrollStates[sCurrentBagPocket].scrollTop + 8 < gBagPocketScrollStates[sCurrentBagPocket].numSlots + 1) || (sReturnLocation == RETURN_TO_FIELD_5 && gBagPocketScrollStates[sCurrentBagPocket].scrollTop + 8 < gBagPocketScrollStates[sCurrentBagPocket].numSlots)) - sub_80F979C(1, 0); + SetVerticalScrollIndicators(BOTTOM_ARROW, VISIBLE); else - sub_80F979C(1, 1); + SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); } static void sub_80A48E8(u16 taskId, int b, int c) @@ -1707,14 +1707,14 @@ static void sub_80A4DD8(u8 taskId, u8 b, u8 c, u8 d, u8 e, u8 digits) static void sub_80A4E8C(s8 delta, u8 b) { PlaySE(SE_SELECT); - sub_80F979C(0, 1); - sub_80F979C(1, 1); - sub_80F979C(2, 1); - sub_80F979C(3, 1); - PauseVerticalScrollIndicator(0); - PauseVerticalScrollIndicator(1); - PauseVerticalScrollIndicator(2); - PauseVerticalScrollIndicator(3); + SetVerticalScrollIndicators(TOP_ARROW, INVISIBLE); + SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); + SetVerticalScrollIndicators(LEFT_ARROW, INVISIBLE); + SetVerticalScrollIndicators(RIGHT_ARROW, INVISIBLE); + PauseVerticalScrollIndicator(TOP_ARROW); + PauseVerticalScrollIndicator(BOTTOM_ARROW); + PauseVerticalScrollIndicator(LEFT_ARROW); + PauseVerticalScrollIndicator(RIGHT_ARROW); ChangePocket(gBGTilemapBuffers[2], delta); DrawPocketIndicatorDots(gBGTilemapBuffers[2], sCurrentBagPocket); sub_80A3770(); @@ -1866,10 +1866,10 @@ static void sub_80A50C8(u8 taskId) gUnknown_02038560 = gBagPocketScrollStates[sCurrentBagPocket].scrollTop + gBagPocketScrollStates[sCurrentBagPocket].cursorPos; gSpecialVar_ItemId = gCurrentBagPocketItemSlots[gUnknown_02038560].itemId; gUnknown_083C16BC[sReturnLocation].onItemSelect(taskId); - sub_80F98A4(0); - sub_80F98A4(1); - sub_80F98A4(2); - sub_80F98A4(3); + StopVerticalScrollIndicators(TOP_ARROW); + StopVerticalScrollIndicators(BOTTOM_ARROW); + StopVerticalScrollIndicators(LEFT_ARROW); + StopVerticalScrollIndicators(RIGHT_ARROW); sub_80A797C(); } else @@ -2963,7 +2963,7 @@ static void sub_80A62D8(void) gUnknown_02038563 = CreateTask(sub_80A50C8, 0); } -void sub_80A6300(void) +void ItemMenu_LoadSellMenu(void) { sReturnLocation = RETURN_TO_SHOP; SetMainCallback2(sub_80A62D8); @@ -2971,7 +2971,7 @@ void sub_80A6300(void) static void OnBagClose_Shop(u8 taskId) { - gFieldCallback = sub_80B3050; + gFieldCallback = Shop_InitExitSellMenu; gTasks[taskId].data[8] = (u32)c2_exit_to_overworld_2_switch >> 16; gTasks[taskId].data[9] = (u32)c2_exit_to_overworld_2_switch; sub_80A5AE4(taskId); @@ -3523,8 +3523,8 @@ static void sub_80A7230(u8 taskId) break; case 204: PlaySE(SE_SELECT); - sub_80F98A4(2); - sub_80F98A4(3); + StopVerticalScrollIndicators(LEFT_ARROW); + StopVerticalScrollIndicators(RIGHT_ARROW); gSpecialVar_ItemId = ITEM_POKE_BALL; sPopupMenuActionList = gUnknown_083C1708; gUnknown_02038564 = 2; diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c index 76f0d367e..54668addb 100644 --- a/src/field/menu_helpers.c +++ b/src/field/menu_helpers.c @@ -18,7 +18,7 @@ static void sub_80F9834(struct Sprite *sprite); -static EWRAM_DATA u8 gUnknown_020388C0[4] = {0}; +static EWRAM_DATA u8 gVerticalScrollIndicatorIds[4] = {0}; static EWRAM_DATA struct YesNoFuncTable gUnknown_020388C4 = {0}; static TaskFunc gUnknown_0300074C; @@ -125,7 +125,7 @@ static const struct SpriteTemplate gSpriteTemplate_83E5A00 = .callback = SpriteCallbackDummy, }; -void sub_80F9020(void) +void ClearBGTilemapBuffers(void) { memset(&gBGTilemapBuffers[1], 0, 0x800); memset(&gBGTilemapBuffers[2], 0, 0x800); @@ -331,19 +331,19 @@ void sub_80F9368(void) DmaClear16(3, PLTT, PLTT_SIZE); } -void sub_80F9438(void) +void ClearVideoCallbacks(void) { SetVBlankCallback(NULL); SetHBlankCallback(NULL); } -void sub_80F944C(void) +void ClearVerticalScrollIndicatorPalettes(void) { u8 i; for (i = 0; i < 4; i++) { - gUnknown_020388C0[i] = 0xFF; + gVerticalScrollIndicatorIds[i] = 0xFF; } FreeSpritePaletteByTag(SCROLL_INDICATOR_PAL_TAG); @@ -401,92 +401,92 @@ void CreateVerticalScrollIndicators(u8 id, u16 x, u16 y) switch (id) { - case 0: - if (gUnknown_020388C0[0] == 0xFF) + case TOP_ARROW: + if (gVerticalScrollIndicatorIds[TOP_ARROW] == 0xFF) { - gUnknown_020388C0[0] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0); - gSprites[gUnknown_020388C0[0]].data[2] = -1; - if (gUnknown_020388C0[1] != 0xFF) + gVerticalScrollIndicatorIds[TOP_ARROW] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0); + gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].data[2] = -1; + if (gVerticalScrollIndicatorIds[BOTTOM_ARROW] != 0xFF) { - gSprites[gUnknown_020388C0[0]].pos2.y = gSprites[gUnknown_020388C0[1]].pos2.y * -1; - gSprites[gUnknown_020388C0[0]].data[3] = gSprites[gUnknown_020388C0[1]].data[3]; + gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].pos2.y = gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].pos2.y * -1; + gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].data[3] = gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].data[3]; } else { - gSprites[gUnknown_020388C0[0]].data[3] = 0; + gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].data[3] = 0; } } break; - case 1: - if (gUnknown_020388C0[1] == 0xFF) + case BOTTOM_ARROW: + if (gVerticalScrollIndicatorIds[BOTTOM_ARROW] == 0xFF) { - gUnknown_020388C0[1] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0); - gSprites[gUnknown_020388C0[1]].data[2] = 1; - if (gUnknown_020388C0[0] != 0xFF) + gVerticalScrollIndicatorIds[BOTTOM_ARROW] = CreateSprite(&gSpriteTemplate_83E59D0, x, y, 0); + gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].data[2] = 1; + if (gVerticalScrollIndicatorIds[TOP_ARROW] != 0xFF) { - gSprites[gUnknown_020388C0[1]].pos2.y = gSprites[gUnknown_020388C0[0]].pos2.y * -1; - gSprites[gUnknown_020388C0[1]].data[3] = gSprites[gUnknown_020388C0[0]].data[3]; + gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].pos2.y = gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].pos2.y * -1; + gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].data[3] = gSprites[gVerticalScrollIndicatorIds[TOP_ARROW]].data[3]; } else { - gSprites[gUnknown_020388C0[1]].data[3] = 0; + gSprites[gVerticalScrollIndicatorIds[BOTTOM_ARROW]].data[3] = 0; } } break; - case 2: - if (gUnknown_020388C0[2] == 0xFF) + case LEFT_ARROW: + if (gVerticalScrollIndicatorIds[LEFT_ARROW] == 0xFF) { - gUnknown_020388C0[2] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0); - gSprites[gUnknown_020388C0[2]].data[0] = -1; - if (gUnknown_020388C0[3] != 0xFF) + gVerticalScrollIndicatorIds[LEFT_ARROW] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0); + gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].data[0] = -1; + if (gVerticalScrollIndicatorIds[RIGHT_ARROW] != 0xFF) { - gSprites[gUnknown_020388C0[2]].pos2.x = gSprites[gUnknown_020388C0[3]].pos2.x * -1; - gSprites[gUnknown_020388C0[2]].data[1] = gSprites[gUnknown_020388C0[3]].data[1]; + gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].pos2.x = gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].pos2.x * -1; + gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].data[1] = gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].data[1]; } else { - gSprites[gUnknown_020388C0[2]].data[1] = 0; + gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].data[1] = 0; } } break; - case 3: - if (gUnknown_020388C0[3] == 0xFF) + case RIGHT_ARROW: + if (gVerticalScrollIndicatorIds[RIGHT_ARROW] == 0xFF) { - gUnknown_020388C0[3] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0); - gSprites[gUnknown_020388C0[3]].data[0] = 1; - if (gUnknown_020388C0[2] != 0xFF) + gVerticalScrollIndicatorIds[RIGHT_ARROW] = CreateSprite(&gSpriteTemplate_83E59E8, x, y, 0); + gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].data[0] = 1; + if (gVerticalScrollIndicatorIds[LEFT_ARROW] != 0xFF) { - gSprites[gUnknown_020388C0[3]].pos2.x = gSprites[gUnknown_020388C0[2]].pos2.x * -1; - gSprites[gUnknown_020388C0[3]].data[1] = gSprites[gUnknown_020388C0[2]].data[1]; + gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].pos2.x = gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].pos2.x * -1; + gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].data[1] = gSprites[gVerticalScrollIndicatorIds[LEFT_ARROW]].data[1]; } else { - gSprites[gUnknown_020388C0[3]].data[1] = 0; + gSprites[gVerticalScrollIndicatorIds[RIGHT_ARROW]].data[1] = 0; } } break; } - StartSpriteAnim(&gSprites[gUnknown_020388C0[id]], id & 1); + StartSpriteAnim(&gSprites[gVerticalScrollIndicatorIds[id]], id & 1); } -void sub_80F979C(u8 id, bool8 invisible) +void SetVerticalScrollIndicators(u8 id, bool8 invisible) { - if (id < 4 && gUnknown_020388C0[id] != 0xFF) + if (id < 4 && gVerticalScrollIndicatorIds[id] != 0xFF) { - gSprites[gUnknown_020388C0[id]].invisible = invisible; + gSprites[gVerticalScrollIndicatorIds[id]].invisible = invisible; } } void DestroyVerticalScrollIndicator(u8 id) { - if (id < 4 && gUnknown_020388C0[id] != 0xFF) + if (id < 4 && gVerticalScrollIndicatorIds[id] != 0xFF) { - DestroySprite(&gSprites[gUnknown_020388C0[id]]); - gUnknown_020388C0[id] = 0xFF; + DestroySprite(&gSprites[gVerticalScrollIndicatorIds[id]]); + gVerticalScrollIndicatorIds[id] = 0xFF; } } @@ -530,43 +530,43 @@ static void sub_80F9834(struct Sprite *sprite) } } -void sub_80F98A4(u8 id) +void StopVerticalScrollIndicators(u8 id) { - if (gUnknown_020388C0[id] != 0xFF && id < 4) + if (gVerticalScrollIndicatorIds[id] != 0xFF && id < 4) { - gSprites[gUnknown_020388C0[id]].callback = SpriteCallbackDummy; + gSprites[gVerticalScrollIndicatorIds[id]].callback = SpriteCallbackDummy; } } void StartVerticalScrollIndicators(u8 id) { - if (gUnknown_020388C0[id] != 0xFF && id < 4) + if (gVerticalScrollIndicatorIds[id] != 0xFF && id < 4) { - gSprites[gUnknown_020388C0[id]].callback = sub_80F9834; + gSprites[gVerticalScrollIndicatorIds[id]].callback = sub_80F9834; } } -static void sub_80F9914(u8 id) +static void ResetVerticalScrollIndicators(u8 id) { - if (gUnknown_020388C0[id] != 0xFF && id < 4) + if (gVerticalScrollIndicatorIds[id] != 0xFF && id < 4) { - gSprites[gUnknown_020388C0[id]].pos2.x = 0; - gSprites[gUnknown_020388C0[id]].pos2.y = 0; - gSprites[gUnknown_020388C0[id]].data[1] = 0; - gSprites[gUnknown_020388C0[id]].data[3] = 0; + gSprites[gVerticalScrollIndicatorIds[id]].pos2.x = 0; + gSprites[gVerticalScrollIndicatorIds[id]].pos2.y = 0; + gSprites[gVerticalScrollIndicatorIds[id]].data[1] = 0; + gSprites[gVerticalScrollIndicatorIds[id]].data[3] = 0; } } void PauseVerticalScrollIndicator(u8 id) { - sub_80F98A4(id); - sub_80F9914(id); + StopVerticalScrollIndicators(id); + ResetVerticalScrollIndicators(id); } -void sub_80F9988(u8 id, u8 priority) +void SetVerticalScrollIndicatorPriority(u8 id, u8 priority) { - if (gUnknown_020388C0[id] != 0xFF && id < 4) + if (gVerticalScrollIndicatorIds[id] != 0xFF && id < 4) { - gSprites[gUnknown_020388C0[id]].oam.priority = priority; + gSprites[gVerticalScrollIndicatorIds[id]].oam.priority = priority; } } diff --git a/src/field/money.c b/src/field/money.c index b85ed8009..6cd73f600 100644 --- a/src/field/money.c +++ b/src/field/money.c @@ -175,7 +175,7 @@ void sub_80B7AEC(u32 arg0, u8 left, u8 top) } __attribute__((naked)) -void sub_80B7B34(u8 var1, u8 var2, int var3) +void Draw10000Sprite(u8 var1, u8 var2, int var3) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ diff --git a/src/field/player_pc.c b/src/field/player_pc.c index 0d5c5234b..c6813b955 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -31,7 +31,7 @@ extern void LoadScrollIndicatorPalette(void); extern void ClearMailStruct(struct MailStruct *); extern u8 sub_807D770(void); extern void sub_808B020(void); -extern void sub_80F944C(void); +extern void ClearVerticalScrollIndicatorPalettes(void); static EWRAM_DATA const u8 *gPcItemMenuOptionOrder = NULL; @@ -563,8 +563,8 @@ static void ItemStorage_ProcessInput(u8 taskId) static void ItemStorage_GoBackToPlayerPCMenu(u8 taskId) { BuyMenuFreeMemory(); - DestroyVerticalScrollIndicator(0); - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(TOP_ARROW); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); Menu_EraseWindowRect(0, 0, 29, 19); Menu_DisplayDialogueFrame(); InitItemStorageMenu(TASK.CURRENT_ITEM_STORAGE_MENU); @@ -576,8 +576,8 @@ static void ItemStorage_DoItemAction(u8 taskId) s16 *data = TASK.data; u8 trueIndex = PAGE_INDEX + ITEMS_ABOVE_TOP; - PauseVerticalScrollIndicator(0); - PauseVerticalScrollIndicator(1); // PauseVerticalScrollIndicator + PauseVerticalScrollIndicator(TOP_ARROW); + PauseVerticalScrollIndicator(BOTTOM_ARROW); if(CURRENT_ITEM_STORAGE_MENU == ITEMPC_MENU_WITHDRAW) { @@ -663,8 +663,8 @@ static void ItemStorage_HandleQuantityRolling(u8 taskId) { PlaySE(SE_SELECT); Menu_EraseWindowRect(6, 6, 0xD, 0xB); - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); ItemStorage_PrintItemPcResponse(gSaveBlock1.pcItems[ITEMS_ABOVE_TOP + PAGE_INDEX].itemId); // why not use trueIndex? TASK.FUNC = ItemStorage_ProcessInput; } @@ -724,8 +724,8 @@ static void ItemStorage_ResumeInputFromNoToss(u8 taskId) Menu_EraseWindowRect(0x6, 0x6, 0xD, 0xB); InitMenu(0, 16, 2, NUM_PAGE_ITEMS, PAGE_INDEX, 0xD); - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); ItemStorage_PrintItemPcResponse(gSaveBlock1.pcItems[ITEMS_ABOVE_TOP + PAGE_INDEX].itemId); TASK.FUNC = ItemStorage_ProcessInput; } @@ -757,8 +757,8 @@ static void ItemStorage_WaitPressHandleResumeProcessInput(u8 taskId) if(gMain.newKeys & A_BUTTON || gMain.newKeys == B_BUTTON) { ItemStorage_PrintItemPcResponse(gSaveBlock1.pcItems[ITEMS_ABOVE_TOP + PAGE_INDEX].itemId); - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); TASK.FUNC = ItemStorage_ProcessInput; } } @@ -766,8 +766,8 @@ static void ItemStorage_WaitPressHandleResumeProcessInput(u8 taskId) static void ItemStorage_HandleResumeProcessInput(u8 taskId) { Menu_EraseWindowRect(0x6, 0x6, 0xD, 0xB); - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); ItemStorage_DrawBothListAndDescription(taskId); TASK.FUNC = ItemStorage_ProcessInput; } @@ -903,14 +903,14 @@ static void ItemStorage_DrawItemList(u8 taskId) Menu_BlankWindowRect(16, yCoord + 4, 0x1C, 0x12); if (ITEMS_ABOVE_TOP != 0) - CreateVerticalScrollIndicators(0, 0xB8, 8); + CreateVerticalScrollIndicators(TOP_ARROW, 0xB8, 8); else - DestroyVerticalScrollIndicator(0); + DestroyVerticalScrollIndicator(TOP_ARROW); if (ITEMS_ABOVE_TOP + NUM_PAGE_ITEMS <= NUM_ITEMS) - CreateVerticalScrollIndicators(1, 0xB8, 0x98); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 0xB8, 0x98); else - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); } static void ItemStorage_PrintItemPcResponse(u16 itemId) @@ -974,7 +974,7 @@ static void ItemStorage_GoBackToItemPCMenu(u8 taskId, u8 var) { s16 *data = TASK.data; - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); LoadScrollIndicatorPalette(); ItemStorage_LoadPalette(); Menu_DrawStdWindowFrame(0xF, 0, 0x1D, 0x13); @@ -1055,19 +1055,19 @@ static void Mailbox_DrawMailList(u8 taskId) // taskId is unused Menu_BlankWindowRect(0x15, yCoord + 4, 0x1C, 0x12); if (eMailboxInfo.itemsAbove != 0) - CreateVerticalScrollIndicators(0, 0xC8, 8); + CreateVerticalScrollIndicators(TOP_ARROW, 0xC8, 8); else - DestroyVerticalScrollIndicator(0); + DestroyVerticalScrollIndicator(TOP_ARROW); if (eMailboxInfo.itemsAbove + eMailboxInfo.pageItems <= eMailboxInfo.count) - CreateVerticalScrollIndicators(1, 0xC8, 0x98); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 0xC8, 0x98); else - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); } static void Mailbox_DrawMailboxMenu(u8 taskId) { - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); LoadScrollIndicatorPalette(); Menu_EraseWindowRect(0, 0, 0x1D, 0x13); Menu_DrawStdWindowFrame(0, 0, 0x8, 0x3); @@ -1137,8 +1137,8 @@ static void Mailbox_ProcessInput(u8 taskId) static void Mailbox_CloseScrollIndicators(void) { BuyMenuFreeMemory(); - DestroyVerticalScrollIndicator(0); - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(TOP_ARROW); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); } static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId) diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 7e8bdc2ce..31bdcc398 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -1,7 +1,3 @@ -// - -// - #include "global.h" #include "overworld.h" #include "sprite.h" @@ -248,7 +244,7 @@ static bool8 sub_810B6C0(void) switch (gMain.state) { case 0: - sub_80F9438(); + ClearVideoCallbacks(); sub_80F9368(); REG_BG2CNT = BGCNT_SCREENBASE(15) | BGCNT_CHARBASE(2) | BGCNT_PRIORITY(2); REG_BLDCNT = 0; @@ -310,10 +306,10 @@ static bool8 sub_810B6C0(void) } break; case 12: - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); LoadScrollIndicatorPalette(); - CreateVerticalScrollIndicators(0, 0xb0, 0x08); - CreateVerticalScrollIndicators(1, 0xb0, 0x98); + CreateVerticalScrollIndicators(TOP_ARROW, 0xb0, 0x08); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 0xb0, 0x98); gMain.state++; break; case 13: @@ -560,19 +556,19 @@ static void sub_810BDAC(bool8 flag) } if (gUnknown_02039248.unk1) { - sub_80F979C(0, 0); + SetVerticalScrollIndicators(TOP_ARROW, VISIBLE); } else { - sub_80F979C(0, 1); + SetVerticalScrollIndicators(TOP_ARROW, INVISIBLE); } if (gUnknown_02039248.unk2 > gUnknown_02039248.unk3 && gUnknown_02039248.unk1 + gUnknown_02039248.unk3 != gUnknown_02039248.unk2) { - sub_80F979C(1, 0); + SetVerticalScrollIndicators(BOTTOM_ARROW, VISIBLE); } else { - sub_80F979C(1, 1); + SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); } for (i=0; i<5; i++) { @@ -776,8 +772,8 @@ static void sub_810C23C(u8 taskId) static void sub_810C2B0(void) { - DestroyVerticalScrollIndicator(0); - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(TOP_ARROW); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); BuyMenuFreeMemory(); } @@ -810,8 +806,8 @@ static void sub_810C368(u8 taskId) int v0 = 0; if (gUnknown_02039244 > 1) v0 = 2; - sub_80F98A4(0); - sub_80F98A4(1); + StopVerticalScrollIndicators(TOP_ARROW); + StopVerticalScrollIndicators(BOTTOM_ARROW); BasicInitMenuWindow(&gWindowTemplate_81E6E50); Menu_DrawStdWindowFrame(7, v0 + 4, 13, 11); Menu_PrintItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758); @@ -878,7 +874,7 @@ static void sub_810C540(u8 taskId) static void sub_810C5C0(u8 taskId) { - sub_80F979C(1, 1); + SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); gTasks[taskId].func = sub_810C540; } @@ -900,11 +896,11 @@ static void sub_810C610(u8 taskId) static void sub_810C668(u8 taskId) { - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); if (gUnknown_02039248.unk2 > gUnknown_02039248.unk3 && gUnknown_02039248.unk1 + gUnknown_02039248.unk3 != gUnknown_02039248.unk2) { - sub_80F979C(1, 0); + SetVerticalScrollIndicators(BOTTOM_ARROW, VISIBLE); } BasicInitMenuWindow(&gWindowTemplate_81E6E50); Menu_EraseWindowRect(7, 6, 13, 11); @@ -924,14 +920,14 @@ static void sub_810C704(u8 taskId) { BasicInitMenuWindow(&gWindowTemplate_81E6E34); sub_810BC84(gUnknown_02039248.unk1); - sub_80F979C(1, 1); + SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); gTasks[taskId].func = sub_810C6DC; } static void sub_810C748(u8 taskId) { - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); Menu_DestroyCursor(); Menu_EraseWindowRect(7, 4, 13, 11); gTasks[taskId].func = sub_810BF7C; diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 203b57867..311cb614a 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -895,7 +895,7 @@ void Task_SecretBasePC_Registry(u8 taskId) s16 *taskData; ScriptContext2_Enable(); - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); LoadScrollIndicatorPalette(); taskData = gTasks[taskId].data; @@ -959,17 +959,17 @@ void sub_80BC6B0(u8 taskId) { Menu_BlankWindowRect(18, 2 * n + 2, 28, 2 * n + 3); Menu_PrintText(gUnknownText_Exit, 18, 2 * n + 2); - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); if (n != 7) Menu_BlankWindowRect(18, ((n << 25) + (1 << 26)) >> 24, 28, 18); // the shifts are needed to match } else - CreateVerticalScrollIndicators(1, 0xbc, 0x98); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 0xbc, 0x98); if (taskData[2] == 0) - DestroyVerticalScrollIndicator(0); + DestroyVerticalScrollIndicator(TOP_ARROW); else - CreateVerticalScrollIndicators(0, 0xbc, 0x08); + CreateVerticalScrollIndicators(TOP_ARROW, 0xbc, 0x08); } void sub_80BC7D8(u8 taskId) @@ -1064,8 +1064,8 @@ u8 sub_80BC948(u8 a) void sub_80BC980(u8 taskId) { - PauseVerticalScrollIndicator(0); - PauseVerticalScrollIndicator(1); + PauseVerticalScrollIndicator(TOP_ARROW); + PauseVerticalScrollIndicator(BOTTOM_ARROW); Menu_DrawStdWindowFrame(1, 0, 12, 5); Menu_PrintItems(2, 1, 2, (const struct MenuAction *)gUnknown_083D13D4); InitMenu(0, 2, 1, 2, 0, 10); @@ -1106,8 +1106,8 @@ void sub_80BCA84(u8 taskId) { s16 *taskData = gTasks[taskId].data; - DestroyVerticalScrollIndicator(0); - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(TOP_ARROW); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); @@ -1165,8 +1165,8 @@ void sub_80BCBF8(u8 taskId) InitMenu(0, 18, 2, taskData[3] + 1, taskData[1], 11); Menu_EraseWindowRect(1, 0, 12, 5); - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); gTasks[taskId].func = sub_80BC824; } @@ -1176,8 +1176,8 @@ void sub_80BCC54(u8 taskId) u16 curBaseIndex = VarGet(VAR_CURRENT_SECRET_BASE); BuyMenuFreeMemory(); - DestroyVerticalScrollIndicator(0); - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(TOP_ARROW); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); if (curBaseIndex == 0) { diff --git a/src/field/shop.c b/src/field/shop.c index 6ca515848..ab529d9a2 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -34,45 +34,45 @@ extern u8 gBuyMenuFrame_Gfx[]; extern u16 gBuyMenuFrame_Tilemap[]; extern u16 gMenuMoneyPal[16]; -void sub_80B39D0(int var1, int var2, bool32 hasControlCode); -void sub_80B3A70(void); -void sub_80B4378(u8); +void Shop_DisplayPriceInList(int var1, int var2, bool32 hasControlCode); +void Shop_PrintItemDescText(void); +void Shop_ReturnToBuyMenu(u8); void sub_80B43F0(u8); void Task_ExitBuyMenu(u8); void sub_80B4470(u8); -void sub_80B2EFC(u8 taskId); -void sub_80B2F30(u8 taskId); +void HandleShopMenuBuy(u8 taskId); +void HandleShopMenuSell(u8 taskId); void HandleShopMenuQuit(u8 taskId); -void sub_80B3BF4(u8 taskId); -void sub_80B3D7C(u8 taskId); +void Shop_DoItemPurchase(u8 taskId); +void Shop_CancelItemPurchase(u8 taskId); // iwram static struct MartInfo gMartInfo; // ewram EWRAM_DATA u32 gMartTotalCost = 0; -EWRAM_DATA s16 gUnknown_020386A4[16][4] = {0}; -EWRAM_DATA struct ItemSlot gUnknown_02038724[3] = {0}; // tv.c uses this, so it cant be static -EWRAM_DATA u8 gUnknown_02038730 = 0; +EWRAM_DATA s16 gMartViewportObjects[16][4] = {0}; +EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3] = {0}; +EWRAM_DATA u8 gMartPurchaseHistoryId = 0; EWRAM_DATA u8 gUnknown_02038731 = 0; // rodata static const struct MenuAction2 sBuySellQuitMenuActions[] = { - { MartText_Buy, sub_80B2EFC }, - { MartText_Sell, sub_80B2F30 }, + { MartText_Buy, HandleShopMenuBuy }, + { MartText_Sell, HandleShopMenuSell }, { MartText_Quit2, HandleShopMenuQuit }, }; -static const u8 gUnknown_083CC6E8[] = {0, 1, 2}; // BUY SELL EXIT -static const u8 gUnknown_083CC6EB[] = {0, 2}; // BUY EXIT +static const u8 gMartBuySellOptionList[] = {BUY, SELL, EXIT}; +static const u8 gMartBuyNoSellOptionList[] = {BUY, EXIT}; static const u16 gUnusedMartArray[] = {0x2, 0x3, 0x4, 0xD, 0x121, 0xE, 0xE, 0xE, 0xE, 0xE, 0xE, 0x0, 0x0}; -static const struct YesNoFuncTable gUnknown_083CC708[] = +static const struct YesNoFuncTable sShopPurchaseYesNoFuncs[] = { - sub_80B3BF4, - sub_80B3D7C + Shop_DoItemPurchase, + Shop_CancelItemPurchase }; u8 CreateShopMenu(u8 martType) @@ -85,13 +85,13 @@ u8 CreateShopMenu(u8 martType) { gMartInfo.numChoices = 2; Menu_DrawStdWindowFrame(0, 0, 10, 7); - Menu_PrintItemsReordered(1, 1, 3, sBuySellQuitMenuActions, gUnknown_083CC6E8); + Menu_PrintItemsReordered(1, 1, 3, sBuySellQuitMenuActions, gMartBuySellOptionList); } else { gMartInfo.numChoices = 1; Menu_DrawStdWindowFrame(0, 0, 10, 5); - Menu_PrintItemsReordered(1, 1, 2, sBuySellQuitMenuActions, gUnknown_083CC6EB); + Menu_PrintItemsReordered(1, 1, 2, sBuySellQuitMenuActions, gMartBuyNoSellOptionList); } InitMenu(0, 1, 1, gMartInfo.numChoices + 1, 0, 9); // add 1 for cancel @@ -142,11 +142,11 @@ void sub_80B2E38(u8 var) PlaySE(SE_SELECT); if (gMartInfo.martType == MART_TYPE_0) { - sBuySellQuitMenuActions[gUnknown_083CC6E8[gMartInfo.cursor]].func(local); + sBuySellQuitMenuActions[gMartBuySellOptionList[gMartInfo.cursor]].func(local); } else { - sBuySellQuitMenuActions[gUnknown_083CC6EB[gMartInfo.cursor]].func(local); + sBuySellQuitMenuActions[gMartBuyNoSellOptionList[gMartInfo.cursor]].func(local); } } else if (gMain.newKeys & B_BUTTON) @@ -156,19 +156,19 @@ void sub_80B2E38(u8 var) } } -void sub_80B2EFC(u8 taskId) +void HandleShopMenuBuy(u8 taskId) { gTasks[taskId].data[8] = (u32)BuyMenuDrawGraphics >> 16; gTasks[taskId].data[9] = (u32)BuyMenuDrawGraphics; - gTasks[taskId].func = sub_80B2FA0; + gTasks[taskId].func = Shop_FadeAndRunBuySellCallback; fade_screen(1, 0); } -void sub_80B2F30(u8 taskId) +void HandleShopMenuSell(u8 taskId) { - gTasks[taskId].data[8] = (u32)sub_80A6300 >> 16; - gTasks[taskId].data[9] = (u32)sub_80A6300; - gTasks[taskId].func = sub_80B2FA0; + gTasks[taskId].data[8] = (u32)ItemMenu_LoadSellMenu >> 16; + gTasks[taskId].data[9] = (u32)ItemMenu_LoadSellMenu; + gTasks[taskId].func = Shop_FadeAndRunBuySellCallback; fade_screen(1, 0); } @@ -184,7 +184,7 @@ void HandleShopMenuQuit(u8 taskId) gMartInfo.callback(); // run the callback if it exists. } -void sub_80B2FA0(u8 taskId) +void Shop_FadeAndRunBuySellCallback(u8 taskId) { if (!gPaletteFade.active) { @@ -210,23 +210,24 @@ void Task_ExitSellMenu(u8 taskId) } } -void sub_80B3050(void) +void Shop_InitExitSellMenu(void) { pal_fill_black(); CreateTask(Task_ExitSellMenu, 0x8); } -void sub_80B3068(u8 taskId) +void Shop_RunExitSellMenuTask(u8 taskId) { Task_ExitSellMenu(taskId); } -void unref_sub_80B3078(u8 taskId) +// unused +void Shop_LoadExitSellMenuTask(u8 taskId) { gTasks[taskId].func = Task_ExitSellMenu; } -void sub_80B3094(void) +static void MainCB2(void) { AnimateSprites(); BuildOamBuffer(); @@ -234,7 +235,7 @@ void sub_80B3094(void) UpdatePaletteFade(); } -void sub_80B30AC(void) +static void VBlankCB(void) { LoadOam(); ProcessSpriteCopyRequests(); @@ -246,7 +247,7 @@ void sub_80B30AC(void) void BuyMenuDrawGraphics(void) { - sub_80F9438(); + ClearVideoCallbacks(); ScanlineEffect_Stop(); REG_BG1HOFS = 0; REG_BG1VOFS = 0; @@ -280,53 +281,55 @@ void BuyMenuDrawGraphics(void) ResetTasks(); Text_LoadWindowTemplate(&gWindowTemplate_81E6DFC); InitMenuWindow(&gWindowTemplate_81E6DFC); - BuyMenuDrawMapGraphics(); + Shop_DrawViewport(); gMartInfo.cursor = 0; gMartInfo.choicesAbove = 0; Menu_EraseWindowRect(0, 0, 0x20, 0x20); OpenMoneyWindow(gSaveBlock1.money, 0, 0); sub_80B3764(0, 7); - sub_80B37EC(); + Shop_PrintItemDesc(); sub_80B3270(); CreateTask(sub_80B40E8, 0x8); sub_80B3240(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; - SetVBlankCallback(sub_80B30AC); - SetMainCallback2(sub_80B3094); + SetVBlankCallback(VBlankCB); + SetMainCallback2(MainCB2); } void sub_80B3240(void) { - u16 tempArr[2] = {0x41EE, 0x7FFF}; + u16 colors[2] = {RGB(14, 15, 16), RGB_WHITE}; - LoadPalette(&tempArr[1], 0xD1, 2); - LoadPalette(&tempArr[0], 0xD8, 2); + LoadPalette(&colors[1], 0xD1, sizeof colors[1]); + LoadPalette(&colors[0], 0xD8, sizeof colors[0]); } void sub_80B3270(void) { - sub_80F944C(); + ClearVerticalScrollIndicatorPalettes(); if (gMartInfo.itemCount > 7) { - CreateVerticalScrollIndicators(0, 172, 12); - CreateVerticalScrollIndicators(1, 172, 148); - sub_80F979C(0, 1); + CreateVerticalScrollIndicators(TOP_ARROW, 172, 12); + CreateVerticalScrollIndicators(BOTTOM_ARROW, 172, 148); + SetVerticalScrollIndicators(TOP_ARROW, INVISIBLE); } } -void sub_80B32A4(void) +void Shop_TryDrawVerticalScrollIndicators(void) { + // TOP ARROW if (gMartInfo.choicesAbove == 0) - sub_80F979C(0, 1); + SetVerticalScrollIndicators(TOP_ARROW, INVISIBLE); else - sub_80F979C(0, 0); + SetVerticalScrollIndicators(TOP_ARROW, VISIBLE); + // DOWN ARROW if (gMartInfo.choicesAbove + 7 >= gMartInfo.itemCount) - sub_80F979C(1, 1); + SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); else - sub_80F979C(1, 0); + SetVerticalScrollIndicators(BOTTOM_ARROW, VISIBLE); } void sub_80B32EC(u16 *array, s16 offset1, s16 offset2) @@ -375,7 +378,7 @@ void sub_80B33D0(s16 var1, int var2, u16 *var3) BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4); } -void sub_80B3420(void) +void Shop_DrawViewportTiles(void) { s16 facingX; s16 facingY; @@ -415,15 +418,15 @@ void sub_80B3420(void) } } -void BuyMenuDrawMapGraphics(void) +void Shop_DrawViewport(void) { - sub_80F9020(); - sub_80B356C(); - sub_80B368C(); - sub_80B3420(); + ClearBGTilemapBuffers(); + Shop_LoadViewportObjects(); + Shop_AnimViewportObjects(); + Shop_DrawViewportTiles(); } -void sub_80B356C(void) +void Shop_LoadViewportObjects(void) { s16 facingX; s16 facingY; @@ -435,7 +438,7 @@ void sub_80B356C(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); playerHeight = PlayerGetZCoord(); for (y = 0; y < 16; y++) - gUnknown_020386A4[y][MAP_OBJ_ID] = 16; + gMartViewportObjects[y][MAP_OBJ_ID] = 16; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) @@ -444,39 +447,39 @@ void sub_80B356C(void) if (mapObjId != 16) { - gUnknown_020386A4[r8][MAP_OBJ_ID] = mapObjId; - gUnknown_020386A4[r8][X_COORD] = x; - gUnknown_020386A4[r8][Y_COORD] = y; + gMartViewportObjects[r8][MAP_OBJ_ID] = mapObjId; + gMartViewportObjects[r8][X_COORD] = x; + gMartViewportObjects[r8][Y_COORD] = y; if (gMapObjects[mapObjId].mapobj_unk_18 == 1) - gUnknown_020386A4[r8][ANIM_NUM] = 0; + gMartViewportObjects[r8][ANIM_NUM] = 0; if (gMapObjects[mapObjId].mapobj_unk_18 == 2) - gUnknown_020386A4[r8][ANIM_NUM] = 1; + gMartViewportObjects[r8][ANIM_NUM] = 1; if (gMapObjects[mapObjId].mapobj_unk_18 == 3) - gUnknown_020386A4[r8][ANIM_NUM] = 2; + gMartViewportObjects[r8][ANIM_NUM] = 2; if (gMapObjects[mapObjId].mapobj_unk_18 == 4) - gUnknown_020386A4[r8][ANIM_NUM] = 3; + gMartViewportObjects[r8][ANIM_NUM] = 3; r8++; } } } } -void sub_80B368C(void) +void Shop_AnimViewportObjects(void) { u8 i; for (i = 0; i < 16; i++) // max objects? { - if (gUnknown_020386A4[i][MAP_OBJ_ID] == 16) + if (gMartViewportObjects[i][MAP_OBJ_ID] == 16) continue; StartSpriteAnim(&gSprites[AddPseudoFieldObject( - gMapObjects[gUnknown_020386A4[i][MAP_OBJ_ID]].graphicsId, + gMapObjects[gMartViewportObjects[i][MAP_OBJ_ID]].graphicsId, SpriteCallbackDummy, - (u16)gUnknown_020386A4[i][X_COORD] * 16 + 8, - (u16)gUnknown_020386A4[i][Y_COORD] * 16 + 32, + (u16)gMartViewportObjects[i][X_COORD] * 16 + 8, + (u16)gMartViewportObjects[i][Y_COORD] * 16 + 32, 2)], - gUnknown_020386A4[i][ANIM_NUM]); + gMartViewportObjects[i][ANIM_NUM]); } } @@ -494,7 +497,7 @@ void sub_80B3720(void) void sub_80B3764(int var1, int var2) { sub_80B3720(); - sub_80B39D0(var1, var2, 0); + Shop_DisplayPriceInList(var1, var2, 0); InitMenu(0, 0xE, 0x2, 0x8, gMartInfo.cursor, 0xF); } @@ -507,27 +510,29 @@ void sub_80B379C(void) gBGTilemapBuffers[1][32 * (i + 12) + j] = ewram18300[32 * i + j] + 0xC3E0; } -void sub_80B37EC(void) +void Shop_PrintItemDesc(void) { - sub_80B3A70(); + Shop_PrintItemDescText(); } -void sub_80B37F8(u8 taskId) +#define tItemCount data[1] + +void Shop_DisplayPriceInCheckoutWindow(u8 taskId) { u16 itemListIndex = gMartInfo.choicesAbove + gMartInfo.cursor; u16 itemId = gMartInfo.itemList[itemListIndex]; u32 price = (ItemId_GetPrice(itemId) >> GetPriceReduction(1)); - PrintMoneyAmount(gTasks[taskId].data[1] * price, 6, 6, 11); + PrintMoneyAmount(gTasks[taskId].tItemCount * price, 6, 6, 11); gStringVar1[0] = EXT_CTRL_CODE_BEGIN; gStringVar1[1] = 0x14; gStringVar1[2] = 0x6; - ConvertIntToDecimalStringN(&gStringVar1[3], gTasks[taskId].data[1], 1, 2); + ConvertIntToDecimalStringN(&gStringVar1[3], gTasks[taskId].tItemCount, 1, 2); Menu_PrintText(gOtherText_xString1, 1, 11); sub_80A3FA0(gBGTilemapBuffers[1], 1, 11, 12, 2, 0xC3E1); } -void sub_80B389C(u16 itemId, u8 var2, bool32 hasControlCode) +void Shop_DisplayNormalPriceInList(u16 itemId, u8 var2, bool32 hasControlCode) { u8 *stringPtr = gStringVar1; @@ -551,7 +556,7 @@ void sub_80B389C(u16 itemId, u8 var2, bool32 hasControlCode) Menu_PrintTextPixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 1); } -void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode) +void Shop_DisplayDecorationPriceInList(u16 itemId, u8 var2, bool32 hasControlCode) { u8 *stringPtr = gStringVar1; @@ -570,9 +575,12 @@ void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode) if (hasControlCode != FALSE) stringPtr = &gStringVar1[3]; + // some names are the maximum string length for a shop item. Because there is no room for + // a 6 character price (including the currency), a sprite is instead used for anything that + // is the maximum decoration price in order to fit it on screen. if (gDecorations[itemId].price == 10000) { - sub_80B7B34(0x19, var2, hasControlCode); // huh??? + Draw10000Sprite(0x19, var2, hasControlCode); } else { @@ -581,16 +589,16 @@ void sub_80B3930(u16 itemId, u8 var2, bool32 hasControlCode) } } -void sub_80B39D0(int var1, int var2, bool32 hasControlCode) +void Shop_DisplayPriceInList(int var1, int var2, bool32 hasControlCode) { u8 i; for (i = var1; i <= var2 && gMartInfo.choicesAbove + i < gMartInfo.itemCount; i++) { if (gMartInfo.martType == MART_TYPE_0) - sub_80B389C(gMartInfo.itemList[gMartInfo.choicesAbove + i], (i << 1) + 2, hasControlCode); + Shop_DisplayNormalPriceInList(gMartInfo.itemList[gMartInfo.choicesAbove + i], (i << 1) + 2, hasControlCode); else - sub_80B3930(gMartInfo.itemList[gMartInfo.choicesAbove + i], (i << 1) + 2, hasControlCode); + Shop_DisplayDecorationPriceInList(gMartInfo.itemList[gMartInfo.choicesAbove + i], (i << 1) + 2, hasControlCode); } if (i != 8 && gMartInfo.choicesAbove + i == gMartInfo.itemCount) @@ -600,7 +608,7 @@ void sub_80B39D0(int var1, int var2, bool32 hasControlCode) } } -void sub_80B3A70(void) +void Shop_PrintItemDescText(void) { if (gMartInfo.choicesAbove + gMartInfo.cursor != gMartInfo.itemCount) { @@ -623,13 +631,13 @@ void sub_80B3AEC(u8 taskId) { if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) { - sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0); // huh??? + Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); PlaySE(SE_SELECT); - if (gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor] == ITEM_POKE_BALL && gTasks[taskId].data[1] >= 10 && AddBagItem(ITEM_PREMIER_BALL, 1) == TRUE) - DisplayItemMessageOnField(taskId, gOtherText_FreePremierBall, sub_80B4378, 0xC3E1); + if (gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor] == ITEM_POKE_BALL && gTasks[taskId].tItemCount >= 10 && AddBagItem(ITEM_PREMIER_BALL, 1) == TRUE) + DisplayItemMessageOnField(taskId, gOtherText_FreePremierBall, Shop_ReturnToBuyMenu, 0xC3E1); else - sub_80B4378(taskId); + Shop_ReturnToBuyMenu(taskId); } } @@ -644,22 +652,22 @@ void sub_80B3B80(u8 taskId) void sub_80B3BD0(u8 taskId) { - sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0); // same thing as above? - sub_80B4378(taskId); + Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); // same thing as above? + Shop_ReturnToBuyMenu(taskId); } -void sub_80B3BF4(u8 taskId) +void Shop_DoItemPurchase(u8 taskId) { Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0); sub_80B379C(); - sub_80B3420(); + Shop_DrawViewportTiles(); if (IsEnoughMoney(gSaveBlock1.money, gMartTotalCost)) { if (gMartInfo.martType == MART_TYPE_0) { - if (AddBagItem(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gTasks[taskId].data[1])) + if (AddBagItem(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gTasks[taskId].tItemCount)) { DisplayItemMessageOnField(taskId, gOtherText_HereYouGo, sub_80B3B80, 0xC3E1); sub_80B4470(taskId); @@ -687,43 +695,43 @@ void sub_80B3BF4(u8 taskId) DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, sub_80B3BD0, 0xC3E1); } -void sub_80B3D38(u8 taskId) +void Shop_DoYesNoPurchase(u8 taskId) { DisplayYesNoMenu(7, 8, 1); sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0xC3E1); - DoYesNoFuncWithChoice(taskId, gUnknown_083CC708); + DoYesNoFuncWithChoice(taskId, sShopPurchaseYesNoFuncs); } -void sub_80B3D7C(u8 taskId) +void Shop_CancelItemPurchase(u8 taskId) { - sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0); + Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x8, 0x9, 0x4, 0x4, 0); - sub_80B4378(taskId); + Shop_ReturnToBuyMenu(taskId); } -void sub_80B3DC8(u8 taskId) +void Shop_PrintPrice(u8 taskId) { if (sub_80A52C4(taskId, gMartInfo.curItemCount) == TRUE) - sub_80B37F8(taskId); + Shop_DisplayPriceInCheckoutWindow(taskId); if (gMain.newKeys & A_BUTTON) { - gMartTotalCost = (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)) * gTasks[taskId].data[1]; // set total cost of your purchase. + gMartTotalCost = (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)) * gTasks[taskId].tItemCount; // set total cost of your purchase. Menu_EraseWindowRect(0, 0xA, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0); sub_80B379C(); - sub_80B3420(); + Shop_DrawViewportTiles(); CopyItemName(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gStringVar1); - ConvertIntToDecimalStringN(gStringVar2, gTasks[taskId].data[1], 0, 0x2); + ConvertIntToDecimalStringN(gStringVar2, gTasks[taskId].tItemCount, 0, 0x2); ConvertIntToDecimalStringN(gStringVar3, gMartTotalCost, 0, 0x8); StringExpandPlaceholders(gStringVar4, gOtherText_ThatWillBe); - DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3D38, 0xC3E1); + DisplayItemMessageOnField(taskId, gStringVar4, Shop_DoYesNoPurchase, 0xC3E1); } else if (gMain.newKeys & B_BUTTON) { - sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 0); - sub_80B4378(taskId); + Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); + Shop_ReturnToBuyMenu(taskId); } } @@ -731,9 +739,9 @@ void sub_80B3EFC(u8 taskId) { u16 var; - gTasks[taskId].data[1] = 1; + gTasks[taskId].tItemCount = 1; Menu_DrawStdWindowFrame(0, 0xA, 0xD, 0xD); - sub_80B37F8(taskId); + Shop_DisplayPriceInCheckoutWindow(taskId); var = gSaveBlock1.money / (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)); if (var > 99) @@ -741,7 +749,7 @@ void sub_80B3EFC(u8 taskId) else gMartInfo.curItemCount = var; - gTasks[taskId].func = sub_80B3DC8; + gTasks[taskId].func = Shop_PrintPrice; } #ifdef NONMATCHING @@ -1033,15 +1041,15 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction PlaySE(SE_SELECT); gMartInfo.choicesAbove--; // since cursor is at the top and there are choices above the top, scroll the menu up by updating choicesAbove. sub_80B3F88(); - sub_80B39D0(0, 0, 0); - sub_80B3A70(); - sub_80B32A4(); + Shop_DisplayPriceInList(0, 0, 0); + Shop_PrintItemDescText(); + Shop_TryDrawVerticalScrollIndicators(); } else // if the cursor is not 0, choicesAbove cannot be updated yet since the cursor is at the top of the menu, so update cursor. { PlaySE(SE_SELECT); gMartInfo.cursor = Menu_MoveCursor(-1); // move cursor up - sub_80B3A70(); + Shop_PrintItemDescText(); } } else if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN) // only down can be pressed @@ -1054,15 +1062,15 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction PlaySE(SE_SELECT); gMartInfo.choicesAbove++; sub_80B403C(); - sub_80B39D0(7, 7, 0); - sub_80B3A70(); - sub_80B32A4(); + Shop_DisplayPriceInList(7, 7, 0); + Shop_PrintItemDescText(); + Shop_TryDrawVerticalScrollIndicators(); } else if (gMartInfo.cursor != gMartInfo.itemCount) { PlaySE(SE_SELECT); gMartInfo.cursor = Menu_MoveCursor(1); - sub_80B3A70(); + Shop_PrintItemDescText(); } } else if (gMain.newKeys & A_BUTTON) @@ -1071,10 +1079,10 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction if (gMartInfo.choicesAbove + gMartInfo.cursor != gMartInfo.itemCount) // did you not hit CANCEL? { - PauseVerticalScrollIndicator(0); - PauseVerticalScrollIndicator(1); - sub_80F979C(1, 1); - sub_80B39D0(gMartInfo.cursor, gMartInfo.cursor, 1); + PauseVerticalScrollIndicator(TOP_ARROW); + PauseVerticalScrollIndicator(BOTTOM_ARROW); + SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); + Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 1); Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0xC, 0xD, 0x13); @@ -1113,7 +1121,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction { StringExpandPlaceholders(gStringVar4, gOtherText_ThatWillBe3); } - DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3D38, 0xC3E1); + DisplayItemMessageOnField(taskId, gStringVar4, Shop_DoYesNoPurchase, 0xC3E1); } } } @@ -1128,23 +1136,23 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction } } -void sub_80B4378(u8 taskId) +void Shop_ReturnToBuyMenu(u8 taskId) { Menu_EraseWindowRect(0, 0xE, 0x1D, 0x13); Menu_EraseWindowRect(0, 0xA, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0); - sub_80B3420(); + Shop_DrawViewportTiles(); sub_80B3764(6, 7); - sub_80B37EC(); - StartVerticalScrollIndicators(0); - StartVerticalScrollIndicators(1); - sub_80B32A4(); + Shop_PrintItemDesc(); + StartVerticalScrollIndicators(TOP_ARROW); + StartVerticalScrollIndicators(BOTTOM_ARROW); + Shop_TryDrawVerticalScrollIndicators(); gTasks[taskId].func = sub_80B40E8; } void sub_80B43F0(u8 taskId) { - gFieldCallback = sub_80B3050; + gFieldCallback = Shop_InitExitSellMenu; BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ExitBuyMenu; } @@ -1166,29 +1174,31 @@ void sub_80B4470(u8 taskId) for (i = 0; i < 3; i++) { - if (gUnknown_02038724[i].itemId == gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor] - && gUnknown_02038724[i].quantity != 0) + if (gMartPurchaseHistory[i].itemId == gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor] + && gMartPurchaseHistory[i].quantity != 0) { - if (gUnknown_02038724[i].quantity + gTasks[taskId].data[1] > 255) - gUnknown_02038724[i].quantity = 255; + if (gMartPurchaseHistory[i].quantity + gTasks[taskId].tItemCount > 255) + gMartPurchaseHistory[i].quantity = 255; else - gUnknown_02038724[i].quantity += gTasks[taskId].data[1]; + gMartPurchaseHistory[i].quantity += gTasks[taskId].tItemCount; return; } } - if (gUnknown_02038730 < 3) + if (gMartPurchaseHistoryId < 3) { - gUnknown_02038724[gUnknown_02038730].itemId = gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]; - gUnknown_02038724[gUnknown_02038730].quantity = gTasks[taskId].data[1]; - gUnknown_02038730++; + gMartPurchaseHistory[gMartPurchaseHistoryId].itemId = gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]; + gMartPurchaseHistory[gMartPurchaseHistoryId].quantity = gTasks[taskId].tItemCount; + gMartPurchaseHistoryId++; } } +#undef tItemCount + void ClearItemPurchases(void) { - gUnknown_02038730 = 0; - ClearItemSlots(gUnknown_02038724, 3); + gMartPurchaseHistoryId = 0; + ClearItemSlots(gMartPurchaseHistory, 3); } void CreatePokemartMenu(u16 *itemList) diff --git a/src/field/trader.c b/src/field/trader.c index b4732ab15..64bd708f6 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -217,8 +217,8 @@ void sub_8109D04(u8 taskId) { Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 29, 19); - DestroyVerticalScrollIndicator(0); - DestroyVerticalScrollIndicator(1); + DestroyVerticalScrollIndicator(TOP_ARROW); + DestroyVerticalScrollIndicator(BOTTOM_ARROW); sub_80F9520(gUnknown_020388F7, 8); BuyMenuFreeMemory(); if (sub_80FEFA4() == TRUE) diff --git a/src/field/tv.c b/src/field/tv.c index e1eade130..efda4b925 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -64,7 +64,7 @@ struct TVSaleItem { extern u8 gUnknown_02038694; -extern struct TVSaleItem gUnknown_02038724[3]; +extern struct TVSaleItem gMartPurchaseHistory[3]; struct UnkTvStruct gUnknown_03005D38; @@ -1032,7 +1032,7 @@ void sub_80BE3BC(void) if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_SMART_SHOPPER) != 1) { sub_80BF20C(); - if (gUnknown_02038724[0].item_amount >= 20) + if (gMartPurchaseHistory[0].item_amount >= 20) { struct TVShowSmartShopper *smartShopper = &gSaveBlock1.tvShows[gUnknown_03005D38.var0].smartshopperShow; @@ -1041,8 +1041,8 @@ void sub_80BE3BC(void) smartShopper->shopLocation = gMapHeader.regionMapSectionId; for (i=0; i<3; i++) { - smartShopper->itemIds[i] = gUnknown_02038724[i].item_id; - smartShopper->itemAmounts[i] = gUnknown_02038724[i].item_amount; + smartShopper->itemIds[i] = gMartPurchaseHistory[i].item_id; + smartShopper->itemAmounts[i] = gMartPurchaseHistory[i].item_amount; } smartShopper->priceReduced = GetPriceReduction(1); StringCopy(smartShopper->playerName, gSaveBlock2.playerName); @@ -1646,14 +1646,14 @@ void sub_80BF20C(void) { for (j = i + 1; j < 3; j++) { - if (gUnknown_02038724[i].item_amount < gUnknown_02038724[j].item_amount) + if (gMartPurchaseHistory[i].item_amount < gMartPurchaseHistory[j].item_amount) { - tmpId = gUnknown_02038724[i].item_id; - tmpAmount = gUnknown_02038724[i].item_amount; - gUnknown_02038724[i].item_id = gUnknown_02038724[j].item_id; - gUnknown_02038724[i].item_amount = gUnknown_02038724[j].item_amount; - gUnknown_02038724[j].item_id = tmpId; - gUnknown_02038724[j].item_amount = tmpAmount; + tmpId = gMartPurchaseHistory[i].item_id; + tmpAmount = gMartPurchaseHistory[i].item_amount; + gMartPurchaseHistory[i].item_id = gMartPurchaseHistory[j].item_id; + gMartPurchaseHistory[i].item_amount = gMartPurchaseHistory[j].item_amount; + gMartPurchaseHistory[j].item_id = tmpId; + gMartPurchaseHistory[j].item_amount = tmpAmount; } } } diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c index 194636e4d..2f2ce2f8f 100644 --- a/src/pokemon/pokeblock_feed.c +++ b/src/pokemon/pokeblock_feed.c @@ -511,7 +511,7 @@ static bool8 TransitionToPokeblockFeedScene(void) switch (gMain.state) { case 0: - sub_80F9438(); + ClearVideoCallbacks(); sub_80F9368(); sub_8147B04(); gMain.state++; diff --git a/src/roulette.c b/src/roulette.c index 6d79f9d38..41e8ef77f 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -579,7 +579,7 @@ void sub_8115384(void) case 0x0: SetVBlankCallback(NULL); ScanlineEffect_Stop(); - sub_80F9438(); + ClearVideoCallbacks(); sub_80F9368(); REG_BG2CNT = 0x4686; REG_BG1CNT = 0x4401; @@ -603,7 +603,7 @@ void sub_8115384(void) break; case 0x3: sub_8115238(); - sub_80F9020(); + ClearBGTilemapBuffers(); LZ77UnCompWram(&gUnknown_083F88BC, (void *)(ewram18800)); LZ77UnCompVram(&gUnknown_083F8A60, (void *)(VRAM + 0x3000)); gMain.state++; @@ -1604,7 +1604,7 @@ void sub_8116B40(u8 taskid) // end oulette ? FreeAllSpritePalettes(); ResetPaletteFade(); ResetSpriteData(); - sub_80F9020(); + ClearBGTilemapBuffers(); REG_BLDCNT = 0x0; REG_BLDALPHA = 0x0; REG_BLDY = 0x0; -- cgit v1.2.3 From 7b45766d0765d42d7326a7f6cdb21a54d386117e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 19:32:02 -0500 Subject: through sub_809B7D4 --- asm/pokemon_storage_system.s | 397 --------------------------------- include/pokemon_storage_system.h | 18 +- src/pokemon/pokemon_2.c | 3 +- src/pokemon/pokemon_storage_system_4.c | 119 ++++++++++ 4 files changed, 138 insertions(+), 399 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index e47abfda0..7fa65b32a 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,403 +5,6 @@ .text - thumb_func_start sub_809B62C -sub_809B62C: @ 809B62C - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r6, 0 - bl GetIndexOfFirstEmptySpaceInBoxN - lsls r0, 16 - lsrs r4, r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _0809B64A - movs r0, 0 - b _0809B6AC -_0809B64A: - ldr r5, _0809B668 @ =gUnknown_020384E6 - ldrb r0, [r5] - cmp r0, 0 - beq _0809B66C - lsls r4, 24 - lsrs r1, r4, 24 - adds r0, r6, 0 - bl diegohint2 - bl sub_8099480 - movs r0, 0 - strb r0, [r5] - b _0809B686 - .align 2, 0 -_0809B668: .4byte gUnknown_020384E6 -_0809B66C: - ldr r5, _0809B6B4 @ =gUnknown_020384E5 - ldrb r1, [r5] - movs r0, 0xE - bl sub_809B44C - lsls r4, 24 - lsrs r1, r4, 24 - adds r0, r6, 0 - bl diegohint2 - ldrb r0, [r5] - bl sub_8099520 -_0809B686: - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - cmp r6, r0 - bne _0809B698 - lsrs r0, r4, 24 - bl sub_8098D20 -_0809B698: - ldr r0, _0809B6B8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x1 - bl StartSpriteAnim - movs r0, 0x1 -_0809B6AC: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_0809B6B4: .4byte gUnknown_020384E5 -_0809B6B8: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809B62C - - thumb_func_start sub_809B6BC -sub_809B6BC: @ 809B6BC - push {lr} - ldr r0, _0809B6D8 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r1 - ldr r0, [r0] - movs r1, 0 - bl StartSpriteAnim - bl sub_809BF74 - pop {r0} - bx r0 - .align 2, 0 -_0809B6D8: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809B6BC - - thumb_func_start sub_809B6DC -sub_809B6DC: @ 809B6DC - push {lr} - ldr r0, _0809B6EC @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809B6F0 - movs r2, 0x2 - b _0809B700 - .align 2, 0 -_0809B6EC: .4byte gUnknown_020384E6 -_0809B6F0: - ldr r0, _0809B720 @ =gUnknown_020384E4 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r2, 0x1 - eors r1, r2 - negs r0, r1 - orrs r0, r1 - lsrs r2, r0, 31 -_0809B700: - ldr r0, _0809B724 @ =gUnknown_020384E5 - ldrb r1, [r0] - adds r0, r2, 0 - bl sub_809981C - ldr r0, _0809B728 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r2, _0809B72C @ =0x000026e4 - adds r0, r1, r2 - ldr r2, _0809B730 @ =0x000011fa - adds r1, r2 - bl StringCopy - pop {r0} - bx r0 - .align 2, 0 -_0809B720: .4byte gUnknown_020384E4 -_0809B724: .4byte gUnknown_020384E5 -_0809B728: .4byte gPokemonStorageSystemPtr -_0809B72C: .4byte 0x000026e4 -_0809B730: .4byte 0x000011fa - thumb_func_end sub_809B6DC - - thumb_func_start sub_809B734 -sub_809B734: @ 809B734 - push {lr} - bl sub_80998D8 - lsls r0, 24 - cmp r0, 0 - beq _0809B744 - movs r0, 0x1 - b _0809B758 -_0809B744: - ldr r0, _0809B75C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r1 - ldr r0, [r0] - movs r1, 0 - bl StartSpriteAnim - movs r0, 0 -_0809B758: - pop {r1} - bx r1 - .align 2, 0 -_0809B75C: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809B734 - - thumb_func_start sub_809B760 -sub_809B760: @ 809B760 - push {lr} - bl sub_8099920 - ldr r1, _0809B774 @ =gUnknown_020384E6 - ldrb r0, [r1] - cmp r0, 0 - beq _0809B778 - movs r0, 0 - strb r0, [r1] - b _0809B79E - .align 2, 0 -_0809B774: .4byte gUnknown_020384E6 -_0809B778: - ldr r0, _0809B788 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809B78C - movs r2, 0xE - b _0809B794 - .align 2, 0 -_0809B788: .4byte gUnknown_020384E4 -_0809B78C: - bl get_preferred_box - lsls r0, 24 - lsrs r2, r0, 24 -_0809B794: - ldr r0, _0809B7A8 @ =gUnknown_020384E5 - ldrb r1, [r0] - adds r0, r2, 0 - bl sub_809B548 -_0809B79E: - bl sub_809BF74 - pop {r0} - bx r0 - .align 2, 0 -_0809B7A8: .4byte gUnknown_020384E5 - thumb_func_end sub_809B760 - - thumb_func_start sub_809B7AC -sub_809B7AC: @ 809B7AC - push {lr} - ldr r0, _0809B7CC @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809B7C8 - ldr r0, _0809B7D0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r1, 0x8E - lsls r1, 5 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x3 - bl StartSpriteAnim -_0809B7C8: - pop {r0} - bx r0 - .align 2, 0 -_0809B7CC: .4byte gUnknown_020384E6 -_0809B7D0: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809B7AC - - thumb_func_start sub_809B7D4 -sub_809B7D4: @ 809B7D4 - push {r4-r6,lr} - ldr r0, _0809B804 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809B81C - ldr r0, _0809B808 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r1, _0809B80C @ =0x00002618 - adds r0, r4, r1 - ldr r2, _0809B810 @ =0x000025b4 - adds r1, r4, r2 - movs r2, 0x64 - bl memcpy - ldr r0, _0809B814 @ =0x00002682 - adds r1, r4, r0 - movs r0, 0xFF - strb r0, [r1] - ldr r1, _0809B818 @ =0x00002683 - adds r4, r1 - movs r0, 0x1 - negs r0, r0 - strb r0, [r4] - b _0809B8A6 - .align 2, 0 -_0809B804: .4byte gUnknown_020384E6 -_0809B808: .4byte gPokemonStorageSystemPtr -_0809B80C: .4byte 0x00002618 -_0809B810: .4byte 0x000025b4 -_0809B814: .4byte 0x00002682 -_0809B818: .4byte 0x00002683 -_0809B81C: - ldr r0, _0809B84C @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809B864 - ldr r0, _0809B850 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r2, _0809B854 @ =0x00002618 - adds r0, r4, r2 - ldr r3, _0809B858 @ =gPlayerParty - ldr r1, _0809B85C @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - movs r1, 0x64 - muls r1, r2 - adds r1, r3 - movs r2, 0x64 - bl memcpy - ldr r0, _0809B860 @ =0x00002682 - adds r4, r0 - movs r0, 0xE - b _0809B896 - .align 2, 0 -_0809B84C: .4byte gUnknown_020384E4 -_0809B850: .4byte gPokemonStorageSystemPtr -_0809B854: .4byte 0x00002618 -_0809B858: .4byte gPlayerParty -_0809B85C: .4byte gUnknown_020384E5 -_0809B860: .4byte 0x00002682 -_0809B864: - ldr r5, _0809B8FC @ =gPokemonStorage - ldrb r0, [r5] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldr r1, _0809B900 @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - adds r2, r5, 0x4 - adds r1, r2 - adds r0, r1 - ldr r1, _0809B904 @ =gPokemonStorageSystemPtr - ldr r4, [r1] - ldr r2, _0809B908 @ =0x00002618 - adds r1, r4, r2 - bl ExpandBoxMon - ldrb r0, [r5] - ldr r1, _0809B90C @ =0x00002682 - adds r4, r1 -_0809B896: - strb r0, [r4] - ldr r0, _0809B904 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809B900 @ =gUnknown_020384E5 - ldrb r1, [r1] - ldr r2, _0809B910 @ =0x00002683 - adds r0, r2 - strb r1, [r0] -_0809B8A6: - ldr r0, _0809B904 @ =gPokemonStorageSystemPtr - ldr r6, [r0] - ldr r0, _0809B914 @ =0x0000267e - adds r4, r6, r0 - movs r0, 0 - strb r0, [r4] - ldr r1, _0809B918 @ =0x0000267f - adds r5, r6, r1 - strb r0, [r5] - ldr r0, _0809B91C @ =0x00002686 - adds r2, r6, r0 - movs r0, 0x39 - strh r0, [r2] - ldr r0, _0809B920 @ =0x00002688 - adds r1, r6, r0 - ldr r0, _0809B924 @ =0x00000123 - strh r0, [r1] - ldr r0, _0809B928 @ =0x0000268a - adds r1, r6, r0 - ldr r0, _0809B92C @ =0x00000163 - strh r0, [r1] - ldr r1, _0809B908 @ =0x00002618 - adds r0, r6, r1 - movs r1, 0x50 - bl GetMonData - lsls r0, 16 - lsrs r1, r0, 16 - movs r2, 0x1 - ands r1, r2 - strb r1, [r4] - lsrs r0, 17 - movs r1, 0x1 - ands r0, r1 - strb r0, [r5] - ldrh r0, [r4] - cmp r0, 0 - beq _0809B934 - ldr r2, _0809B930 @ =0x0000267d - adds r1, r6, r2 - movs r0, 0 - strb r0, [r1] - b _0809B940 - .align 2, 0 -_0809B8FC: .4byte gPokemonStorage -_0809B900: .4byte gUnknown_020384E5 -_0809B904: .4byte gPokemonStorageSystemPtr -_0809B908: .4byte 0x00002618 -_0809B90C: .4byte 0x00002682 -_0809B910: .4byte 0x00002683 -_0809B914: .4byte 0x0000267e -_0809B918: .4byte 0x0000267f -_0809B91C: .4byte 0x00002686 -_0809B920: .4byte 0x00002688 -_0809B924: .4byte 0x00000123 -_0809B928: .4byte 0x0000268a -_0809B92C: .4byte 0x00000163 -_0809B930: .4byte 0x0000267d -_0809B934: - ldr r2, _0809B954 @ =0x0000267d - adds r0, r6, r2 - strb r1, [r0] - subs r2, 0x1 - adds r0, r6, r2 - strb r1, [r0] -_0809B940: - ldr r0, _0809B958 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809B95C @ =0x00002684 - adds r0, r1 - movs r1, 0 - strh r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809B954: .4byte 0x0000267d -_0809B958: .4byte gPokemonStorageSystemPtr -_0809B95C: .4byte 0x00002684 - thumb_func_end sub_809B7D4 - thumb_func_start sub_809B960 sub_809B960: @ 809B960 push {r4-r7,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 7960213ae..b0aa8cb47 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -183,7 +183,16 @@ struct PokemonStorageSystemData { struct UnkPSSStruct_2002370 unk_2370; struct Pokemon unk_25b4; struct Pokemon unk_2618; - u8 filler_267c[0x10]; + s8 unk_267c; + u8 unk_267d; + u8 unk_267e; + u8 unk_267f; + u8 unk_2680; + u8 unk_2681; + s8 unk_2682; + s8 unk_2683; + u16 unk_2684; + u16 unk_2686[3]; u8 unk_268c; u8 unk_268d; u8 unk_268e; @@ -206,6 +215,7 @@ extern struct UnkPSSStruct_2002370 *gUnknown_02038478; extern struct PokemonStorageSystemData *const gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; +s16 GetIndexOfFirstEmptySpaceInBoxN(u8 boxId); u8 CountPokemonInBoxN(u8 boxId); void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3); void sub_809634C(u8 curBox); @@ -219,16 +229,22 @@ void ResetPSSMonIconSprites(void); void SpawnBoxIconSprites(u8 boxId); u8 get_preferred_box(void); void sub_8098BF0(void); +void sub_8098D20(u8 monId); bool8 sub_80990AC(void); void sub_8099200(bool8 a0); void sub_8099310(void); bool8 sub_8099374(void); +void sub_8099480(void); void sub_80994A8(s16 a0); +void sub_8099520(u8 a0); void sub_809954C(void); void sub_8099584(u8 a0, u8 a1); void sub_809960C(u8 a0, u8 a1); void sub_80996B0(u8 a0, u8 a1); bool8 sub_809971C(void); +void sub_809981C(u8 mode, u8 idx); +bool8 sub_80998D8(void); +void sub_8099920(void); void sub_8099958(void); bool8 sub_8099990(void); struct Sprite *sub_809A9A0(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority); diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c index b941ed2ab..7fd1aa7b2 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon/pokemon_2.c @@ -1,5 +1,6 @@ #include "global.h" #include "constants/hold_effects.h" +#include "constants/moves.h" #include "battle.h" #include "battle_util.h" #include "data2.h" @@ -569,7 +570,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) u16 *moves = (u16 *)data; s32 i = 0; - while (moves[i] != 355) + while (moves[i] != NUM_MOVES) { u16 move = moves[i]; if (substruct1->moves[0] == move diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 73d71fa0e..a0a6fa145 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -1,8 +1,10 @@ // Includes #include "global.h" +#include "constants/moves.h" #include "constants/species.h" #include "palette.h" +#include "string_util.h" #include "text.h" #include "menu.h" #include "pokemon_storage_system.h" @@ -1602,3 +1604,120 @@ void diegohint1(u8 a0, u8 a1) gUnknown_020384E7 = a0; gUnknown_020384E8 = a1; } + +bool8 sub_809B62C(u8 boxId) +{ + s16 monIdx = GetIndexOfFirstEmptySpaceInBoxN(boxId); + if (monIdx == -1) + return FALSE; + if (gUnknown_020384E6) + { + diegohint2(boxId, monIdx); + sub_8099480(); + gUnknown_020384E6 = 0; + } + else + { + sub_809B44C(14, gUnknown_020384E5); + diegohint2(boxId, monIdx); + sub_8099520(gUnknown_020384E5); + } + if (boxId == get_preferred_box()) + sub_8098D20(monIdx); + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 1); + return TRUE; +} + +void sub_809B6BC(void) +{ + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 0); + sub_809BF74(); +} + +void sub_809B6DC(void) +{ + u8 mode; + + if (gUnknown_020384E6) + mode = 2; + else if (gUnknown_020384E4 == 1) + mode = 0; + else + mode = 1; + sub_809981C(mode, gUnknown_020384E5); + StringCopy(gPokemonStorageSystemPtr->unk_26e4, gPokemonStorageSystemPtr->unk_11fa); +} + +bool8 sub_809B734(void) +{ + if (!sub_80998D8()) + { + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 0); + return FALSE; + } + return TRUE; +} + +void sub_809B760(void) +{ + sub_8099920(); + if (gUnknown_020384E6) + gUnknown_020384E6 = 0; + else + { + u8 boxId; + if (gUnknown_020384E4 == 1) + boxId = 14; + else + boxId = get_preferred_box(); + sub_809B548(boxId, gUnknown_020384E5); + } + sub_809BF74(); +} + +void sub_809B7AC(void) +{ + if (gUnknown_020384E6) + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3); +} + +void sub_809B7D4(void) +{ + u16 knownMoves; + if (gUnknown_020384E6) + { + gPokemonStorageSystemPtr->unk_2618 = gPokemonStorageSystemPtr->unk_25b4; + gPokemonStorageSystemPtr->unk_2682 = -1; + gPokemonStorageSystemPtr->unk_2683 = -1; + } + else + { + if (gUnknown_020384E4 == 1) + { + gPokemonStorageSystemPtr->unk_2618 = gPlayerParty[gUnknown_020384E5]; + gPokemonStorageSystemPtr->unk_2682 = 14; + } + else + { + ExpandBoxMon(gPokemonStorage.boxes[gPokemonStorage.currentBox] + gUnknown_020384E5, &gPokemonStorageSystemPtr->unk_2618); + gPokemonStorageSystemPtr->unk_2682 = gPokemonStorage.currentBox; + } + gPokemonStorageSystemPtr->unk_2683 = gUnknown_020384E5; + } + gPokemonStorageSystemPtr->unk_267e = 0; + gPokemonStorageSystemPtr->unk_267f = 0; + gPokemonStorageSystemPtr->unk_2686[0] = MOVE_SURF; + gPokemonStorageSystemPtr->unk_2686[1] = MOVE_DIVE; + gPokemonStorageSystemPtr->unk_2686[2] = NUM_MOVES; + knownMoves = GetMonData(&gPokemonStorageSystemPtr->unk_2618, MON_DATA_KNOWN_MOVES, gPokemonStorageSystemPtr->unk_2686); + gPokemonStorageSystemPtr->unk_267e = knownMoves & 1; + gPokemonStorageSystemPtr->unk_267f = (knownMoves >> 1) & 1; + if (gPokemonStorageSystemPtr->unk_267e || gPokemonStorageSystemPtr->unk_267f) + gPokemonStorageSystemPtr->unk_267d = 0; + else + { + gPokemonStorageSystemPtr->unk_267d = 1; + gPokemonStorageSystemPtr->unk_267c = 1; + } + gPokemonStorageSystemPtr->unk_2684 = 0; +} -- cgit v1.2.3 From 7a2eef97c35e4672bd17bfca86a6ea19d22a3eba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 20:34:56 -0500 Subject: sub_809B960 --- asm/pokemon_storage_system.s | 277 --------------------------------- include/pokemon_storage_system.h | 6 +- src/pokemon/pokemon_storage_system_4.c | 65 ++++++++ 3 files changed, 68 insertions(+), 280 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 7fa65b32a..d8305b190 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,283 +5,6 @@ .text - thumb_func_start sub_809B960 -sub_809B960: @ 809B960 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, _0809B988 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r3, _0809B98C @ =0x0000267d - adds r1, r2, r3 - ldrb r1, [r1] - mov r12, r0 - cmp r1, 0 - beq _0809B994 - ldr r7, _0809B990 @ =0x0000267c - adds r0, r2, r7 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - b _0809BB5C - .align 2, 0 -_0809B988: .4byte gPokemonStorageSystemPtr -_0809B98C: .4byte 0x0000267d -_0809B990: .4byte 0x0000267c -_0809B994: - ldr r1, _0809B9A4 @ =0x00002684 - adds r0, r2, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _0809B9A8 - cmp r0, 0x1 - beq _0809BA84 - b _0809BB58 - .align 2, 0 -_0809B9A4: .4byte 0x00002684 -_0809B9A8: - movs r5, 0 - movs r6, 0 -_0809B9AC: - mov r2, r12 - ldr r4, [r2] - ldr r3, _0809BA28 @ =0x00002682 - adds r0, r4, r3 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0xE - bne _0809B9CC - ldr r7, _0809BA2C @ =0x00002683 - adds r0, r4, r7 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, r5 - beq _0809BA02 -_0809B9CC: - movs r0, 0x64 - muls r0, r5 - ldr r1, _0809BA30 @ =gPlayerParty - adds r0, r1 - ldr r1, _0809BA34 @ =0x00002686 - adds r2, r4, r1 - movs r1, 0x50 - bl GetMonData - lsls r0, 16 - lsrs r3, r0, 16 - movs r0, 0x1 - ands r0, r3 - cmp r0, 0 - beq _0809B9F0 - ldr r2, _0809BA38 @ =0x0000267e - adds r0, r4, r2 - strb r6, [r0] -_0809B9F0: - movs r0, 0x2 - ands r3, r0 - ldr r7, _0809BA3C @ =gPokemonStorageSystemPtr - mov r12, r7 - cmp r3, 0 - beq _0809BA02 - ldr r1, _0809BA40 @ =0x0000267f - adds r0, r4, r1 - strb r6, [r0] -_0809BA02: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x5 - bls _0809B9AC - mov r3, r12 - ldr r2, [r3] - ldr r7, _0809BA38 @ =0x0000267e - adds r0, r2, r7 - ldrh r0, [r0] - cmp r0, 0 - bne _0809BA4C - ldr r1, _0809BA44 @ =0x0000267d - adds r0, r2, r1 - movs r1, 0x1 - strb r1, [r0] - ldr r3, _0809BA48 @ =0x0000267c - b _0809BB54 - .align 2, 0 -_0809BA28: .4byte 0x00002682 -_0809BA2C: .4byte 0x00002683 -_0809BA30: .4byte gPlayerParty -_0809BA34: .4byte 0x00002686 -_0809BA38: .4byte 0x0000267e -_0809BA3C: .4byte gPokemonStorageSystemPtr -_0809BA40: .4byte 0x0000267f -_0809BA44: .4byte 0x0000267d -_0809BA48: .4byte 0x0000267c -_0809BA4C: - movs r7, 0x9A - lsls r7, 6 - adds r0, r2, r7 - movs r1, 0 - strb r1, [r0] - ldr r3, _0809BA68 @ =0x00002681 - adds r0, r2, r3 - strb r1, [r0] - adds r7, 0x4 - adds r1, r2, r7 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _0809BB58 - .align 2, 0 -_0809BA68: .4byte 0x00002681 -_0809BA6C: - ldr r1, _0809BA7C @ =0x0000267d - adds r0, r2, r1 - movs r1, 0x1 - strb r1, [r0] - ldr r7, _0809BA80 @ =0x0000267c - adds r0, r2, r7 - strb r3, [r0] - b _0809BB3C - .align 2, 0 -_0809BA7C: .4byte 0x0000267d -_0809BA80: .4byte 0x0000267c -_0809BA84: - movs r5, 0 - mov r9, r12 - adds r4, r2, 0 - movs r0, 0x9A - lsls r0, 6 - adds r6, r4, r0 - ldr r1, _0809BB6C @ =0x0000267f - adds r1, r4 - mov r8, r1 - ldr r2, _0809BB70 @ =0x0000ffff - mov r10, r2 -_0809BA9A: - movs r0, 0 - ldrsb r0, [r6, r0] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldr r3, _0809BB74 @ =0x00002681 - adds r1, r4, r3 - movs r2, 0 - ldrsb r2, [r1, r2] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - ldr r2, _0809BB78 @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - movs r1, 0x50 - ldr r7, _0809BB7C @ =0x00002686 - adds r2, r4, r7 - bl GetBoxMonData - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0 - beq _0809BB00 - ldr r1, _0809BB80 @ =0x00002682 - adds r0, r4, r1 - ldrh r0, [r0] - ldrh r2, [r6] - mov r1, r10 - ands r1, r0 - mov r0, r10 - ands r0, r2 - cmp r1, r0 - beq _0809BB00 - movs r0, 0x1 - ands r0, r3 - cmp r0, 0 - beq _0809BAF2 - ldr r2, _0809BB84 @ =0x0000267e - adds r1, r4, r2 - movs r0, 0 - strb r0, [r1] -_0809BAF2: - movs r0, 0x2 - ands r3, r0 - cmp r3, 0 - beq _0809BB00 - movs r0, 0 - mov r3, r8 - strb r0, [r3] -_0809BB00: - mov r7, r9 - ldr r2, [r7] - ldr r0, _0809BB74 @ =0x00002681 - adds r1, r2, r0 - ldrb r0, [r1] - adds r0, 0x1 - movs r3, 0 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - ldr r7, _0809BB88 @ =gPokemonStorageSystemPtr - mov r12, r7 - cmp r0, 0x1D - ble _0809BB32 - strb r3, [r1] - movs r0, 0x9A - lsls r0, 6 - adds r1, r2, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0xD - bgt _0809BA6C -_0809BB32: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x4 - bls _0809BA9A -_0809BB3C: - mov r1, r12 - ldr r2, [r1] - ldr r3, _0809BB84 @ =0x0000267e - adds r0, r2, r3 - ldrh r0, [r0] - cmp r0, 0 - bne _0809BB58 - ldr r7, _0809BB8C @ =0x0000267d - adds r0, r2, r7 - movs r1, 0x1 - strb r1, [r0] - subs r3, 0x2 -_0809BB54: - adds r0, r2, r3 - strb r1, [r0] -_0809BB58: - movs r0, 0x1 - negs r0, r0 -_0809BB5C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0809BB6C: .4byte 0x0000267f -_0809BB70: .4byte 0x0000ffff -_0809BB74: .4byte 0x00002681 -_0809BB78: .4byte gPokemonStorage + 0x4 -_0809BB7C: .4byte 0x00002686 -_0809BB80: .4byte 0x00002682 -_0809BB84: .4byte 0x0000267e -_0809BB88: .4byte gPokemonStorageSystemPtr -_0809BB8C: .4byte 0x0000267d - thumb_func_end sub_809B960 - thumb_func_start sub_809BB90 sub_809BB90: @ 809BB90 push {lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index b0aa8cb47..8e50cc8d0 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -183,12 +183,12 @@ struct PokemonStorageSystemData { struct UnkPSSStruct_2002370 unk_2370; struct Pokemon unk_25b4; struct Pokemon unk_2618; - s8 unk_267c; + u8 unk_267c; u8 unk_267d; u8 unk_267e; u8 unk_267f; - u8 unk_2680; - u8 unk_2681; + s8 unk_2680; + s8 unk_2681; s8 unk_2682; s8 unk_2683; u16 unk_2684; diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index a0a6fa145..2469d42b1 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -1721,3 +1721,68 @@ void sub_809B7D4(void) } gPokemonStorageSystemPtr->unk_2684 = 0; } + +s8 sub_809B960(void) +{ + u16 i; + u16 knownMoves; + + if (gPokemonStorageSystemPtr->unk_267d) + return gPokemonStorageSystemPtr->unk_267c; + switch (gPokemonStorageSystemPtr->unk_2684) + { + case 0: + for (i = 0; i < PARTY_SIZE; i++) + { + if (gPokemonStorageSystemPtr->unk_2682 != 14 || gPokemonStorageSystemPtr->unk_2683 != i) + { + knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, gPokemonStorageSystemPtr->unk_2686); + if (knownMoves & 1) + gPokemonStorageSystemPtr->unk_267e = 0; + if (knownMoves & 2) + gPokemonStorageSystemPtr->unk_267f = 0; + } + } + if (gPokemonStorageSystemPtr->unk_267e == 0 && gPokemonStorageSystemPtr->unk_267f == 0) + { + gPokemonStorageSystemPtr->unk_267d = 1; + gPokemonStorageSystemPtr->unk_267c = 1; + } + else + { + gPokemonStorageSystemPtr->unk_2680 = 0; + gPokemonStorageSystemPtr->unk_2681 = 0; + gPokemonStorageSystemPtr->unk_2684++; + } + break; + case 1: + for (i = 0; i < 5; i++) + { + knownMoves = GetBoxMonData(gPokemonStorage.boxes[gPokemonStorageSystemPtr->unk_2680] + gPokemonStorageSystemPtr->unk_2681, MON_DATA_KNOWN_MOVES, gPokemonStorageSystemPtr->unk_2686); + if (knownMoves && (gPokemonStorageSystemPtr->unk_2682 != gPokemonStorageSystemPtr->unk_2680 || gPokemonStorageSystemPtr->unk_2683 != gPokemonStorageSystemPtr->unk_2681)) + { + if (knownMoves & 1) + gPokemonStorageSystemPtr->unk_267e = 0; + if (knownMoves & 2) + gPokemonStorageSystemPtr->unk_267f = 0; + } + if (++gPokemonStorageSystemPtr->unk_2681 >= 30) + { + gPokemonStorageSystemPtr->unk_2681 = 0; + if (++gPokemonStorageSystemPtr->unk_2680 >= 14) + { + gPokemonStorageSystemPtr->unk_267d = 1; + gPokemonStorageSystemPtr->unk_267c = 0; + break; + } + } + } + if (gPokemonStorageSystemPtr->unk_267e == 0 && gPokemonStorageSystemPtr->unk_267f == 0) + { + gPokemonStorageSystemPtr->unk_267d = 1; + gPokemonStorageSystemPtr->unk_267c = 1; + } + break; + } + return -1; +} -- cgit v1.2.3 From 102515325993caef0d57082cd7d8db69335b665b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 21:11:01 -0500 Subject: through party_compaction --- asm/pokemon_storage_system.s | 284 --------------------------------- include/pokemon_storage_system.h | 8 +- src/pokemon/pokemon_storage_system_2.c | 2 +- src/pokemon/pokemon_storage_system_4.c | 75 +++++++++ 4 files changed, 82 insertions(+), 287 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index d8305b190..dc3c9a339 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,290 +5,6 @@ .text - thumb_func_start sub_809BB90 -sub_809BB90: @ 809BB90 - push {lr} - ldr r0, _0809BBB0 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809BBAA - ldr r0, _0809BBB4 @ =gUnknown_02038480 - ldr r1, _0809BBB8 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - ldr r2, _0809BBBC @ =0x000025b4 - adds r1, r2 - movs r2, 0x64 - bl memcpy -_0809BBAA: - pop {r0} - bx r0 - .align 2, 0 -_0809BBB0: .4byte gUnknown_020384E6 -_0809BBB4: .4byte gUnknown_02038480 -_0809BBB8: .4byte gPokemonStorageSystemPtr -_0809BBBC: .4byte 0x000025b4 - thumb_func_end sub_809BB90 - - thumb_func_start sub_809BBC0 -sub_809BBC0: @ 809BBC0 - push {lr} - ldr r0, _0809BBE4 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809BC08 - ldr r0, _0809BBE8 @ =gUnknown_020384E7 - ldrb r0, [r0] - cmp r0, 0xE - bne _0809BBF8 - ldr r0, _0809BBEC @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809BBF0 @ =0x000025b4 - adds r0, r1 - ldr r1, _0809BBF4 @ =gUnknown_02038480 - movs r2, 0x64 - bl memcpy - b _0809BC08 - .align 2, 0 -_0809BBE4: .4byte gUnknown_020384E6 -_0809BBE8: .4byte gUnknown_020384E7 -_0809BBEC: .4byte gPokemonStorageSystemPtr -_0809BBF0: .4byte 0x000025b4 -_0809BBF4: .4byte gUnknown_02038480 -_0809BBF8: - ldr r0, _0809BC0C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809BC10 @ =0x000025b4 - adds r0, r1 - ldr r1, _0809BC14 @ =gUnknown_02038480 - movs r2, 0x50 - bl memcpy -_0809BC08: - pop {r0} - bx r0 - .align 2, 0 -_0809BC0C: .4byte gPokemonStorageSystemPtr -_0809BC10: .4byte 0x000025b4 -_0809BC14: .4byte gUnknown_02038480 - thumb_func_end sub_809BBC0 - - thumb_func_start sub_809BC18 -sub_809BC18: @ 809BC18 - push {r4,r5,lr} - ldr r0, _0809BC48 @ =gUnknown_020384E6 - ldrb r5, [r0] - cmp r5, 0 - beq _0809BC64 - bl sub_809BB90 - ldr r0, _0809BC4C @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r0, _0809BC50 @ =0x00002690 - adds r1, r2, r0 - ldr r0, _0809BC54 @ =gUnknown_02038480 - str r0, [r1] - ldr r1, _0809BC58 @ =0x0000268d - adds r0, r2, r1 - movs r1, 0 - strb r1, [r0] - ldr r3, _0809BC5C @ =0x0000268c - adds r0, r2, r3 - strb r1, [r0] - ldr r0, _0809BC60 @ =0x0000268e - adds r2, r0 - strb r1, [r2] - b _0809BCF2 - .align 2, 0 -_0809BC48: .4byte gUnknown_020384E6 -_0809BC4C: .4byte gPokemonStorageSystemPtr -_0809BC50: .4byte 0x00002690 -_0809BC54: .4byte gUnknown_02038480 -_0809BC58: .4byte 0x0000268d -_0809BC5C: .4byte 0x0000268c -_0809BC60: .4byte 0x0000268e -_0809BC64: - ldr r0, _0809BC9C @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809BCBC - ldr r0, _0809BCA0 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r2, _0809BCA4 @ =0x00002690 - adds r1, r4, r2 - ldr r0, _0809BCA8 @ =gPlayerParty - str r0, [r1] - ldr r0, _0809BCAC @ =gUnknown_020384E5 - ldrb r1, [r0] - ldr r3, _0809BCB0 @ =0x0000268d - adds r0, r4, r3 - strb r1, [r0] - bl StorageSystemGetPartySize - subs r0, 0x1 - ldr r2, _0809BCB4 @ =0x0000268c - adds r1, r4, r2 - strb r0, [r1] - ldr r3, _0809BCB8 @ =0x0000268e - adds r4, r3 - strb r5, [r4] - b _0809BCF2 - .align 2, 0 -_0809BC9C: .4byte gUnknown_020384E4 -_0809BCA0: .4byte gPokemonStorageSystemPtr -_0809BCA4: .4byte 0x00002690 -_0809BCA8: .4byte gPlayerParty -_0809BCAC: .4byte gUnknown_020384E5 -_0809BCB0: .4byte 0x0000268d -_0809BCB4: .4byte 0x0000268c -_0809BCB8: .4byte 0x0000268e -_0809BCBC: - ldr r0, _0809BCF8 @ =gPokemonStorageSystemPtr - ldr r3, [r0] - ldr r0, _0809BCFC @ =0x00002690 - adds r4, r3, r0 - ldr r2, _0809BD00 @ =gPokemonStorage - ldrb r0, [r2] - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - adds r2, 0x4 - adds r0, r2 - str r0, [r4] - ldr r0, _0809BD04 @ =gUnknown_020384E5 - ldrb r1, [r0] - ldr r2, _0809BD08 @ =0x0000268d - adds r0, r3, r2 - strb r1, [r0] - ldr r0, _0809BD0C @ =0x0000268c - adds r1, r3, r0 - movs r0, 0x1D - strb r0, [r1] - ldr r1, _0809BD10 @ =0x0000268e - adds r3, r1 - movs r0, 0x5 - strb r0, [r3] -_0809BCF2: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809BCF8: .4byte gPokemonStorageSystemPtr -_0809BCFC: .4byte 0x00002690 -_0809BD00: .4byte gPokemonStorage -_0809BD04: .4byte gUnknown_020384E5 -_0809BD08: .4byte 0x0000268d -_0809BD0C: .4byte 0x0000268c -_0809BD10: .4byte 0x0000268e - thumb_func_end sub_809BC18 - - thumb_func_start sub_809BD14 -sub_809BD14: @ 809BD14 - push {lr} - ldr r0, _0809BD24 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809BD28 - bl sub_809BBC0 - b _0809BD30 - .align 2, 0 -_0809BD24: .4byte gUnknown_020384E6 -_0809BD28: - ldr r0, _0809BD34 @ =gUnknown_020384E5 - ldr r1, _0809BD38 @ =gSharedMem + 0x18000 - ldrb r1, [r1, 0x9] - strb r1, [r0] -_0809BD30: - pop {r0} - bx r0 - .align 2, 0 -_0809BD34: .4byte gUnknown_020384E5 -_0809BD38: .4byte gSharedMem + 0x18000 - thumb_func_end sub_809BD14 - - thumb_func_start party_compaction -party_compaction: @ 809BD3C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r7, _0809BD88 @ =0x0000ffff - movs r6, 0 - movs r5, 0 - movs r0, 0x64 - mov r9, r0 - ldr r1, _0809BD8C @ =gPlayerParty - mov r8, r1 - subs r0, 0x65 - mov r10, r0 -_0809BD58: - mov r0, r9 - muls r0, r6 - mov r1, r8 - adds r4, r0, r1 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - cmp r0, 0 - beq _0809BD90 - cmp r6, r5 - beq _0809BD80 - mov r0, r9 - muls r0, r5 - add r0, r8 - adds r1, r4, 0 - movs r2, 0x64 - bl memcpy -_0809BD80: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - b _0809BD9A - .align 2, 0 -_0809BD88: .4byte 0x0000ffff -_0809BD8C: .4byte gPlayerParty -_0809BD90: - lsls r0, r7, 16 - asrs r0, 16 - cmp r0, r10 - bne _0809BD9A - adds r7, r6, 0 -_0809BD9A: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x5 - bls _0809BD58 - lsls r7, 16 - cmp r5, 0x5 - bhi _0809BDC2 - movs r6, 0x64 - ldr r4, _0809BDD4 @ =gPlayerParty -_0809BDAE: - adds r0, r5, 0 - muls r0, r6 - adds r0, r4 - bl ZeroMonData - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0x5 - bls _0809BDAE -_0809BDC2: - asrs r0, r7, 16 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0809BDD4: .4byte gPlayerParty - thumb_func_end party_compaction - thumb_func_start sub_809BDD8 sub_809BDD8: @ 809BDD8 push {r4,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 8e50cc8d0..f8d288ff0 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -196,7 +196,10 @@ struct PokemonStorageSystemData { u8 unk_268c; u8 unk_268d; u8 unk_268e; - struct Pokemon *unk_2690; + union { + struct Pokemon *pokemon; + struct BoxPokemon *box; + } unk_2690; u8 unk_2694[18]; u8 unk_26a6[62]; u8 unk_26e4[0x16]; @@ -215,6 +218,7 @@ extern struct UnkPSSStruct_2002370 *gUnknown_02038478; extern struct PokemonStorageSystemData *const gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; +u8 StorageSystemGetPartySize(void); s16 GetIndexOfFirstEmptySpaceInBoxN(u8 boxId); u8 CountPokemonInBoxN(u8 boxId); void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3); @@ -277,7 +281,7 @@ void sub_809BB90(void); void sub_809BBC0(void); void sub_809BC18(void); void sub_809BD14(void); -void party_compaction(void); +s16 party_compaction(void); void sub_809BDD8(u8 markings); bool8 sub_809BE80(void); bool8 sub_809BEBC(void); diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c index 4657ed158..512bde5db 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon/pokemon_storage_system_2.c @@ -343,7 +343,7 @@ void sub_8096B5C(void) switch (gPokemonStorageSystemPtr->unk_0006) { case 0: - ShowPokemonSummaryScreen(gPokemonStorageSystemPtr->unk_2690, gPokemonStorageSystemPtr->unk_268d, gPokemonStorageSystemPtr->unk_268c, sub_80969A0, gPokemonStorageSystemPtr->unk_268e); + ShowPokemonSummaryScreen(gPokemonStorageSystemPtr->unk_2690.pokemon, gPokemonStorageSystemPtr->unk_268d, gPokemonStorageSystemPtr->unk_268c, sub_80969A0, gPokemonStorageSystemPtr->unk_268e); break; case 1: DoNamingScreen(1, gPokemonStorage.boxNames[gPokemonStorage.currentBox], 0, 0, 0, sub_80969A0); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 2469d42b1..40de7d634 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -1,12 +1,14 @@ // Includes #include "global.h" +#include "ewram.h" #include "constants/moves.h" #include "constants/species.h" #include "palette.h" #include "string_util.h" #include "text.h" #include "menu.h" +#include "pokemon_summary_screen.h" #include "pokemon_storage_system.h" // Static type declarations @@ -1786,3 +1788,76 @@ s8 sub_809B960(void) } return -1; } + +void sub_809BB90(void) +{ + if (gUnknown_020384E6) + gUnknown_02038480 = gPokemonStorageSystemPtr->unk_25b4; +} + +void sub_809BBC0(void) +{ + if (gUnknown_020384E6) + { + if (gUnknown_020384E7 == 14) + gPokemonStorageSystemPtr->unk_25b4 = gUnknown_02038480; + else + gPokemonStorageSystemPtr->unk_25b4.box = gUnknown_02038480.box; + } +} + +void sub_809BC18(void) +{ + if (gUnknown_020384E6) + { + sub_809BB90(); + gPokemonStorageSystemPtr->unk_2690.pokemon = &gUnknown_02038480; + gPokemonStorageSystemPtr->unk_268d = 0; + gPokemonStorageSystemPtr->unk_268c = 0; + gPokemonStorageSystemPtr->unk_268e = 0; + } + else if (gUnknown_020384E4 == 1) + { + gPokemonStorageSystemPtr->unk_2690.pokemon = gPlayerParty; + gPokemonStorageSystemPtr->unk_268d = gUnknown_020384E5; + gPokemonStorageSystemPtr->unk_268c = StorageSystemGetPartySize() - 1; + gPokemonStorageSystemPtr->unk_268e = 0; + } + else + { + gPokemonStorageSystemPtr->unk_2690.box = gPokemonStorage.boxes[gPokemonStorage.currentBox]; + gPokemonStorageSystemPtr->unk_268d = gUnknown_020384E5; + gPokemonStorageSystemPtr->unk_268c = 30 - 1; + gPokemonStorageSystemPtr->unk_268e = 5; + } +} + +void sub_809BD14(void) +{ + if (gUnknown_020384E6) + sub_809BBC0(); + else + gUnknown_020384E5 = pssData.monIndex; +} + +s16 party_compaction(void) +{ + s16 retVal = -1; + u16 i; + u16 last; + + for (i = 0, last = 0; i < PARTY_SIZE; i++) + { + if ((u16)GetMonData(gPlayerParty + i, MON_DATA_SPECIES) != SPECIES_NONE) + { + if (i != last) + gPlayerParty[last] = gPlayerParty[i]; + last++; + } + else if (retVal == -1) + retVal = i; + } + for (; last < PARTY_SIZE; last++) + ZeroMonData(gPlayerParty + last); + return retVal; +} -- cgit v1.2.3 From 1771d7761e4ff1406a8ffe3da4e636d633ad3135 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 15 Jan 2018 21:26:15 -0500 Subject: split out fldeff_escalator and label shop.c more --- include/shop.h | 10 +- ld_script.txt | 2 + src/field/fldeff_escalator.c | 132 ++++++++++++++++++ src/field/item_menu.c | 8 +- src/field/shop.c | 320 ++++++++++++++----------------------------- sym_ewram.txt | 1 + 6 files changed, 244 insertions(+), 229 deletions(-) create mode 100644 src/field/fldeff_escalator.c diff --git a/include/shop.h b/include/shop.h index 8ab24c724..63dd6cc81 100644 --- a/include/shop.h +++ b/include/shop.h @@ -37,16 +37,16 @@ struct MartInfo /* 0xD */ u8 curItemCount; // if you are selling an item, this is the count of the current item stack you have. }; -void sub_80B2E38(u8); -void HandleShopMenuQuit(u8); +void Task_DoBuySellMenu(u8); +void Task_HandleShopMenuQuit(u8); void Shop_FadeAndRunBuySellCallback(u8); void BuyMenuDrawGraphics(void); void sub_80B3240(void); -void sub_80B3270(void); +void DrawFirstMartScrollIndicators(void); void Shop_DrawViewport(void); -void sub_80B3764(int, int); +void Shop_InitMenus(int, int); void Shop_PrintItemDesc(void); -void sub_80B40E8(u8); +void Shop_DoCursorAction(u8); void CreatePokemartMenu(u16 *); void CreateDecorationShop1Menu(u16 *); void CreateDecorationShop2Menu(u16 *); diff --git a/ld_script.txt b/ld_script.txt index 7bc64638c..afa71a0c5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -143,6 +143,7 @@ SECTIONS { src/debug/matsuda_debug_menu.o(.text); src/contest.o(.text); src/field/shop.o(.text); + src/field/fldeff_escalator.o(.text); src/field/berry.o(.text); src/field/script_menu.o(.text); src/engine/naming_screen.o(.text); @@ -557,6 +558,7 @@ SECTIONS { src/debug/matsuda_debug_menu.o(.rodata); data/contest.o(.rodata); src/field/shop.o(.rodata); + src/field/fldeff_escalator.o(.rodata); src/field/berry.o(.rodata); src/field/script_menu.o(.rodata); src/engine/naming_screen.o(.rodata); diff --git a/src/field/fldeff_escalator.c b/src/field/fldeff_escalator.c new file mode 100644 index 000000000..981233480 --- /dev/null +++ b/src/field/fldeff_escalator.c @@ -0,0 +1,132 @@ +#include "global.h" +#include "task.h" +#include "fieldmap.h" +#include "field_camera.h" +#include "field_player_avatar.h" + +extern u8 gUnknown_02038731; + +void sub_80B45B4(u8 taskId, const s16 *list, u16 c) +{ + s16 r5 = gTasks[taskId].data[4] - 1; + s16 r3 = gTasks[taskId].data[5] - 1; + s16 r4 = gTasks[taskId].data[1]; + s16 y; + s16 x; + + if (gTasks[taskId].data[2] == 0) + { + for (y = 0; y < 3; y++) + { + for (x = 0; x < 3; x++) + { + s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y); + + if (list[r4] == metatileId) + { + if (r4 != 2) + MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[r4 + 1]); + else + MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[0]); + } + } + } + } + else + { + for (y = 0; y < 3; y++) + { + for (x = 0; x < 3; x++) + { + s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y); + + if (list[2 - r4] == metatileId) + { + if (r4 != 2) + MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[1 - r4]); + else + MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[2]); + } + } + } + } +} + +const u16 gUnknown_083CC714[] = {0x284, 0x282, 0x280}; +const u16 gUnknown_083CC71A[] = {0x285, 0x283, 0x281}; +const u16 gUnknown_083CC720[] = {0x28C, 0x28A, 0x288}; +const u16 gUnknown_083CC726[] = {0x28D, 0x28B, 0x289}; +const u16 gUnknown_083CC72C[] = {0x2A0, 0x2A2, 0x2A4}; +const u16 gUnknown_083CC732[] = {0x2A1, 0x2A3, 0x2A5}; +const u16 gUnknown_083CC738[] = {0x2A8, 0x2AA, 0x2AC}; + +void sub_80B4710(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + data[3] = 1; + + switch (data[0]) + { + case 0: + sub_80B45B4(taskId, gUnknown_083CC714, 0); + break; + case 1: + sub_80B45B4(taskId, gUnknown_083CC71A, 0); + break; + case 2: + sub_80B45B4(taskId, gUnknown_083CC720, 0xC00); + break; + case 3: + sub_80B45B4(taskId, gUnknown_083CC726, 0); + break; + case 4: + sub_80B45B4(taskId, gUnknown_083CC72C, 0xC00); + break; + case 5: + sub_80B45B4(taskId, gUnknown_083CC732, 0); + break; + case 6: + sub_80B45B4(taskId, gUnknown_083CC738, 0); + break; + } + + data[0] = (data[0] + 1) & 7; + if (!data[0]) + { + DrawWholeMapView(); + data[1] = (data[1] + 1) % 3; + data[3] = 0; + } +} + +u8 sub_80B47D8(u16 var) +{ + u8 taskId = CreateTask(sub_80B4710, 0); + s16 *data = gTasks[taskId].data; + + PlayerGetDestCoords(&data[4], &data[5]); + data[0] = 0; + data[1] = 0; + data[2] = var; + sub_80B4710(taskId); + return taskId; +} + +void sub_80B4824(u8 var) +{ + gUnknown_02038731 = sub_80B47D8(var); +} + +void sub_80B483C(void) +{ + DestroyTask(gUnknown_02038731); +} + +bool8 sub_80B4850(void) +{ + if (gTasks[gUnknown_02038731].data[3] == 0 && gTasks[gUnknown_02038731].data[1] == 2) + return FALSE; + else + return TRUE; +} diff --git a/src/field/item_menu.c b/src/field/item_menu.c index e07021acd..d86550eb6 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -50,7 +50,7 @@ extern void pal_fill_black(void); extern bool8 sub_807D770(void); extern u8 sub_80F931C(); extern void sub_808A3F8(u8); -extern void Shop_InitExitSellMenu(void); +extern void Shop_FadeReturnToMartMenu(void); extern void sub_80546B8(u8); extern void sub_804E990(u8); extern void sub_802E424(u8); @@ -1901,7 +1901,7 @@ static void sub_80A50C8(u8 taskId) } } -bool8 sub_80A52C4(u8 taskId, u16 b) +bool8 SellMenu_QuantityRoller(u8 taskId, u16 b) { s16 *taskData = gTasks[taskId].data; @@ -1948,7 +1948,7 @@ static bool8 sub_80A5350(u8 taskId) { s16 *taskData = gTasks[taskId].data; - if (sub_80A52C4(taskId, gCurrentBagPocketItemSlots[gUnknown_02038560].quantity) == TRUE) + if (SellMenu_QuantityRoller(taskId, gCurrentBagPocketItemSlots[gUnknown_02038560].quantity) == TRUE) { // if (sCurrentBagPocket == BAG_POCKET_BERRIES) Can't get it to match this way if (sCurrentBagPocket + 1 == BAG_POCKET_BERRIES + 1) @@ -2971,7 +2971,7 @@ void ItemMenu_LoadSellMenu(void) static void OnBagClose_Shop(u8 taskId) { - gFieldCallback = Shop_InitExitSellMenu; + gFieldCallback = Shop_FadeReturnToMartMenu; gTasks[taskId].data[8] = (u32)c2_exit_to_overworld_2_switch >> 16; gTasks[taskId].data[9] = (u32)c2_exit_to_overworld_2_switch; sub_80A5AE4(taskId); diff --git a/src/field/shop.c b/src/field/shop.c index ab529d9a2..233e430ee 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -28,23 +28,23 @@ #include "field_camera.h" #include "ewram.h" -extern bool8 sub_80A52C4(u8, u8); +extern bool8 SellMenu_QuantityRoller(u8, u8); extern u8 gBuyMenuFrame_Gfx[]; extern u16 gBuyMenuFrame_Tilemap[]; extern u16 gMenuMoneyPal[16]; -void Shop_DisplayPriceInList(int var1, int var2, bool32 hasControlCode); +void Shop_DisplayPriceInList(int firstItemId, int lastItemId, bool32 hasControlCode); void Shop_PrintItemDescText(void); -void Shop_ReturnToBuyMenu(u8); -void sub_80B43F0(u8); +void Task_ReturnToBuyMenu(u8); void Task_ExitBuyMenu(u8); -void sub_80B4470(u8); -void HandleShopMenuBuy(u8 taskId); -void HandleShopMenuSell(u8 taskId); -void HandleShopMenuQuit(u8 taskId); -void Shop_DoItemPurchase(u8 taskId); -void Shop_CancelItemPurchase(u8 taskId); +void Task_ExitBuyMenuDoFade(u8); +void Task_UpdatePurchaseHistory(u8); +void Task_HandleShopMenuBuy(u8 taskId); +void Task_HandleShopMenuSell(u8 taskId); +void Task_HandleShopMenuQuit(u8 taskId); +void Task_DoItemPurchase(u8 taskId); +void Task_CancelItemPurchase(u8 taskId); // iwram static struct MartInfo gMartInfo; @@ -54,14 +54,15 @@ EWRAM_DATA u32 gMartTotalCost = 0; EWRAM_DATA s16 gMartViewportObjects[16][4] = {0}; EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3] = {0}; EWRAM_DATA u8 gMartPurchaseHistoryId = 0; -EWRAM_DATA u8 gUnknown_02038731 = 0; + +EWRAM_DATA u8 gUnknown_02038731 = 0; // This really should be in fldeff_escalator, but being in a new file aligns the ewram, which doesnt match the ROM. // rodata static const struct MenuAction2 sBuySellQuitMenuActions[] = { - { MartText_Buy, HandleShopMenuBuy }, - { MartText_Sell, HandleShopMenuSell }, - { MartText_Quit2, HandleShopMenuQuit }, + { MartText_Buy, Task_HandleShopMenuBuy }, + { MartText_Sell, Task_HandleShopMenuSell }, + { MartText_Quit2, Task_HandleShopMenuQuit }, }; static const u8 gMartBuySellOptionList[] = {BUY, SELL, EXIT}; @@ -71,8 +72,8 @@ static const u16 gUnusedMartArray[] = {0x2, 0x3, 0x4, 0xD, 0x121, 0xE, 0xE, 0xE, static const struct YesNoFuncTable sShopPurchaseYesNoFuncs[] = { - Shop_DoItemPurchase, - Shop_CancelItemPurchase + Task_DoItemPurchase, + Task_CancelItemPurchase }; u8 CreateShopMenu(u8 martType) @@ -95,7 +96,7 @@ u8 CreateShopMenu(u8 martType) } InitMenu(0, 1, 1, gMartInfo.numChoices + 1, 0, 9); // add 1 for cancel - return CreateTask(sub_80B2E38, 8); + return CreateTask(Task_DoBuySellMenu, 8); } void SetShopMenuCallback(void *callbackPtr) @@ -117,9 +118,9 @@ void SetShopItemsForSale(u16 *items) } } -void sub_80B2E38(u8 var) +void Task_DoBuySellMenu(u8 taskId) { - const u8 local = var; + const u8 taskIdConst = taskId; // why is a local const needed to match? if (gMain.newAndRepeatedKeys & DPAD_UP) { @@ -142,21 +143,21 @@ void sub_80B2E38(u8 var) PlaySE(SE_SELECT); if (gMartInfo.martType == MART_TYPE_0) { - sBuySellQuitMenuActions[gMartBuySellOptionList[gMartInfo.cursor]].func(local); + sBuySellQuitMenuActions[gMartBuySellOptionList[gMartInfo.cursor]].func(taskIdConst); } else { - sBuySellQuitMenuActions[gMartBuyNoSellOptionList[gMartInfo.cursor]].func(local); + sBuySellQuitMenuActions[gMartBuyNoSellOptionList[gMartInfo.cursor]].func(taskIdConst); } } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); - HandleShopMenuQuit(local); + Task_HandleShopMenuQuit(taskIdConst); } } -void HandleShopMenuBuy(u8 taskId) +void Task_HandleShopMenuBuy(u8 taskId) { gTasks[taskId].data[8] = (u32)BuyMenuDrawGraphics >> 16; gTasks[taskId].data[9] = (u32)BuyMenuDrawGraphics; @@ -164,7 +165,7 @@ void HandleShopMenuBuy(u8 taskId) fade_screen(1, 0); } -void HandleShopMenuSell(u8 taskId) +void Task_HandleShopMenuSell(u8 taskId) { gTasks[taskId].data[8] = (u32)ItemMenu_LoadSellMenu >> 16; gTasks[taskId].data[9] = (u32)ItemMenu_LoadSellMenu; @@ -172,7 +173,7 @@ void HandleShopMenuSell(u8 taskId) fade_screen(1, 0); } -void HandleShopMenuQuit(u8 taskId) +void Task_HandleShopMenuQuit(u8 taskId) { Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 11, 8); @@ -199,7 +200,7 @@ void ReturnToShopMenuAfterExitingSellMenu(u8 taskId) DestroyTask(taskId); } -void Task_ExitSellMenu(u8 taskId) +void Task_ReturnToMartMenu(u8 taskId) { if (sub_807D770() == 1) { @@ -210,21 +211,21 @@ void Task_ExitSellMenu(u8 taskId) } } -void Shop_InitExitSellMenu(void) +void Shop_FadeReturnToMartMenu(void) { pal_fill_black(); - CreateTask(Task_ExitSellMenu, 0x8); + CreateTask(Task_ReturnToMartMenu, 0x8); } void Shop_RunExitSellMenuTask(u8 taskId) { - Task_ExitSellMenu(taskId); + Task_ReturnToMartMenu(taskId); } // unused void Shop_LoadExitSellMenuTask(u8 taskId) { - gTasks[taskId].func = Task_ExitSellMenu; + gTasks[taskId].func = Task_ReturnToMartMenu; } static void MainCB2(void) @@ -286,10 +287,10 @@ void BuyMenuDrawGraphics(void) gMartInfo.choicesAbove = 0; Menu_EraseWindowRect(0, 0, 0x20, 0x20); OpenMoneyWindow(gSaveBlock1.money, 0, 0); - sub_80B3764(0, 7); + Shop_InitMenus(0, 7); Shop_PrintItemDesc(); - sub_80B3270(); - CreateTask(sub_80B40E8, 0x8); + DrawFirstMartScrollIndicators(); + CreateTask(Shop_DoCursorAction, 0x8); sub_80B3240(); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; @@ -305,7 +306,7 @@ void sub_80B3240(void) LoadPalette(&colors[0], 0xD8, sizeof colors[0]); } -void sub_80B3270(void) +void DrawFirstMartScrollIndicators(void) { ClearVerticalScrollIndicatorPalettes(); @@ -319,20 +320,19 @@ void sub_80B3270(void) void Shop_TryDrawVerticalScrollIndicators(void) { - // TOP ARROW if (gMartInfo.choicesAbove == 0) SetVerticalScrollIndicators(TOP_ARROW, INVISIBLE); else SetVerticalScrollIndicators(TOP_ARROW, VISIBLE); - // DOWN ARROW if (gMartInfo.choicesAbove + 7 >= gMartInfo.itemCount) SetVerticalScrollIndicators(BOTTOM_ARROW, INVISIBLE); else SetVerticalScrollIndicators(BOTTOM_ARROW, VISIBLE); } -void sub_80B32EC(u16 *array, s16 offset1, s16 offset2) +// what is the point of this function? the tiles always get overwritten by BuyMenuDrawTextboxBG. +void BuyMenuDrawTextboxBG_Old(u16 *array, s16 offset1, s16 offset2) { array[offset1 + offset2] = 0xC3E1; array[offset1 + offset2 + 1] = 0xC3E1; @@ -340,10 +340,11 @@ void sub_80B32EC(u16 *array, s16 offset1, s16 offset2) void BuyMenuDrawMapMetatileLayer(u16 *array, s16 offset1, s16 offset2, u16 *array2) { - array[offset1 + offset2] = array2[0]; - array[offset1 + offset2 + 1] = array2[1]; - array[offset1 + offset2 + 32] = array2[2]; - array[offset1 + offset2 + 33] = array2[3]; + // This function draws a whole 2x2 metatile. + array[offset1 + offset2] = array2[0]; // top left + array[offset1 + offset2 + 1] = array2[1]; // top right + array[offset1 + offset2 + 32] = array2[2]; // bottom left + array[offset1 + offset2 + 33] = array2[3]; // bottom right } void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s32 var4) @@ -369,7 +370,8 @@ void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s32 var4) } } -void sub_80B33D0(s16 var1, int var2, u16 *var3) +// used to draw the border tiles around the viewport. +void BuyMenuDrawMapPartialMetatile(s16 var1, int var2, u16 *var3) { s16 offset1 = var1 * 2; s16 offset2 = (var2 * 0x40) + 0x40; @@ -407,13 +409,13 @@ void Shop_DrawViewportTiles(void) else { if (metatileId < 512) - sub_80B33D0(x, y, (u16 *)gMapHeader.mapData->primaryTileset->metatiles + metatileId * 8); + BuyMenuDrawMapPartialMetatile(x, y, (u16 *)gMapHeader.mapData->primaryTileset->metatiles + metatileId * 8); else - sub_80B33D0(x, y, (u16 *)gMapHeader.mapData->secondaryTileset->metatiles + (metatileId - 512) * 8); + BuyMenuDrawMapPartialMetatile(x, y, (u16 *)gMapHeader.mapData->secondaryTileset->metatiles + (metatileId - 512) * 8); } if (y == 0 && x != 0 && x != 6) - sub_80B32EC(gBGTilemapBuffers[1], x * 2, 64); + BuyMenuDrawTextboxBG_Old(gBGTilemapBuffers[1], x * 2, 64); } } } @@ -483,7 +485,7 @@ void Shop_AnimViewportObjects(void) } } -void sub_80B3720(void) +void BuyMenuDrawTextboxBG(void) { s16 i; @@ -494,14 +496,15 @@ void sub_80B3720(void) } } -void sub_80B3764(int var1, int var2) +void Shop_InitMenus(int firstItemId, int lastItemId) { - sub_80B3720(); - Shop_DisplayPriceInList(var1, var2, 0); + BuyMenuDrawTextboxBG(); + Shop_DisplayPriceInList(firstItemId, lastItemId, 0); InitMenu(0, 0xE, 0x2, 0x8, gMartInfo.cursor, 0xF); } -void sub_80B379C(void) +// after printing the item quantity and price, restore the textbox tiles before the Yes/No prompt. +void BuyMenuDrawTextboxBG_Restore(void) { u16 i, j; @@ -589,11 +592,11 @@ void Shop_DisplayDecorationPriceInList(u16 itemId, u8 var2, bool32 hasControlCod } } -void Shop_DisplayPriceInList(int var1, int var2, bool32 hasControlCode) +void Shop_DisplayPriceInList(int firstItemId, int lastItemId, bool32 hasControlCode) { u8 i; - for (i = var1; i <= var2 && gMartInfo.choicesAbove + i < gMartInfo.itemCount; i++) + for (i = firstItemId; i <= lastItemId && gMartInfo.choicesAbove + i < gMartInfo.itemCount; i++) { if (gMartInfo.martType == MART_TYPE_0) Shop_DisplayNormalPriceInList(gMartInfo.itemList[gMartInfo.choicesAbove + i], (i << 1) + 2, hasControlCode); @@ -627,7 +630,7 @@ void Shop_PrintItemDescText(void) } } -void sub_80B3AEC(u8 taskId) +void Shop_DoPremierBallCheck(u8 taskId) { if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) { @@ -635,32 +638,32 @@ void sub_80B3AEC(u8 taskId) PlaySE(SE_SELECT); if (gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor] == ITEM_POKE_BALL && gTasks[taskId].tItemCount >= 10 && AddBagItem(ITEM_PREMIER_BALL, 1) == TRUE) - DisplayItemMessageOnField(taskId, gOtherText_FreePremierBall, Shop_ReturnToBuyMenu, 0xC3E1); + DisplayItemMessageOnField(taskId, gOtherText_FreePremierBall, Task_ReturnToBuyMenu, 0xC3E1); else - Shop_ReturnToBuyMenu(taskId); + Task_ReturnToBuyMenu(taskId); } } -void sub_80B3B80(u8 taskId) +void Shop_DoItemTransaction(u8 taskId) { IncrementGameStat(0x26); RemoveMoney(&gSaveBlock1.money, gMartTotalCost); PlaySE(SE_REGI); UpdateMoneyWindow(gSaveBlock1.money, 0, 0); - gTasks[taskId].func = sub_80B3AEC; + gTasks[taskId].func = Shop_DoPremierBallCheck; } -void sub_80B3BD0(u8 taskId) +void Shop_DoPricePrintAndReturnToBuyMenu(u8 taskId) { - Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); // same thing as above? - Shop_ReturnToBuyMenu(taskId); + Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); + Task_ReturnToBuyMenu(taskId); } -void Shop_DoItemPurchase(u8 taskId) +void Task_DoItemPurchase(u8 taskId) { Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0); - sub_80B379C(); + BuyMenuDrawTextboxBG_Restore(); Shop_DrawViewportTiles(); if (IsEnoughMoney(gSaveBlock1.money, gMartTotalCost)) @@ -669,30 +672,30 @@ void Shop_DoItemPurchase(u8 taskId) { if (AddBagItem(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gTasks[taskId].tItemCount)) { - DisplayItemMessageOnField(taskId, gOtherText_HereYouGo, sub_80B3B80, 0xC3E1); - sub_80B4470(taskId); + DisplayItemMessageOnField(taskId, gOtherText_HereYouGo, Shop_DoItemTransaction, 0xC3E1); + Task_UpdatePurchaseHistory(taskId); } else - DisplayItemMessageOnField(taskId, gOtherText_NoRoomFor, sub_80B3BD0, 0xC3E1); + DisplayItemMessageOnField(taskId, gOtherText_NoRoomFor, Shop_DoPricePrintAndReturnToBuyMenu, 0xC3E1); } else // a normal mart is only type 0, so types 1 and 2 are decoration marts. { if (IsThereStorageSpaceForDecoration(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor])) { if (gMartInfo.martType == MART_TYPE_1) - DisplayItemMessageOnField(taskId, gOtherText_HereYouGo2, sub_80B3B80, 0xC3E1); + DisplayItemMessageOnField(taskId, gOtherText_HereYouGo2, Shop_DoItemTransaction, 0xC3E1); else - DisplayItemMessageOnField(taskId, gOtherText_HereYouGo3, sub_80B3B80, 0xC3E1); + DisplayItemMessageOnField(taskId, gOtherText_HereYouGo3, Shop_DoItemTransaction, 0xC3E1); } else { StringExpandPlaceholders(gStringVar4, gOtherText_SpaceForIsFull); - DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3BD0, 0xC3E1); + DisplayItemMessageOnField(taskId, gStringVar4, Shop_DoPricePrintAndReturnToBuyMenu, 0xC3E1); } } } else - DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, sub_80B3BD0, 0xC3E1); + DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, Shop_DoPricePrintAndReturnToBuyMenu, 0xC3E1); } void Shop_DoYesNoPurchase(u8 taskId) @@ -702,17 +705,17 @@ void Shop_DoYesNoPurchase(u8 taskId) DoYesNoFuncWithChoice(taskId, sShopPurchaseYesNoFuncs); } -void Shop_CancelItemPurchase(u8 taskId) +void Task_CancelItemPurchase(u8 taskId) { Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x8, 0x9, 0x4, 0x4, 0); - Shop_ReturnToBuyMenu(taskId); + Task_ReturnToBuyMenu(taskId); } void Shop_PrintPrice(u8 taskId) { - if (sub_80A52C4(taskId, gMartInfo.curItemCount) == TRUE) + if (SellMenu_QuantityRoller(taskId, gMartInfo.curItemCount) == TRUE) Shop_DisplayPriceInCheckoutWindow(taskId); if (gMain.newKeys & A_BUTTON) @@ -720,7 +723,7 @@ void Shop_PrintPrice(u8 taskId) gMartTotalCost = (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)) * gTasks[taskId].tItemCount; // set total cost of your purchase. Menu_EraseWindowRect(0, 0xA, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0); - sub_80B379C(); + BuyMenuDrawTextboxBG_Restore(); Shop_DrawViewportTiles(); CopyItemName(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gStringVar1); ConvertIntToDecimalStringN(gStringVar2, gTasks[taskId].tItemCount, 0, 0x2); @@ -731,11 +734,12 @@ void Shop_PrintPrice(u8 taskId) else if (gMain.newKeys & B_BUTTON) { Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); - Shop_ReturnToBuyMenu(taskId); + Task_ReturnToBuyMenu(taskId); } } -void sub_80B3EFC(u8 taskId) +// set the item count in the mart info to the maximum allowed by the player's budget. +void Shop_UpdateCurItemCountToMax(u8 taskId) { u16 var; @@ -753,7 +757,7 @@ void sub_80B3EFC(u8 taskId) } #ifdef NONMATCHING -void sub_80B3F88(void) +void Shop_MoveItemListUp(void) { u16 *r1; u16 *r2; @@ -795,7 +799,7 @@ void sub_80B3F88(void) } #else __attribute__((naked)) -void sub_80B3F88(void) +void Shop_MoveItemListUp(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -890,7 +894,7 @@ _080B4038: .4byte 0xfffffc40\n\ #endif #ifdef NONMATCHING -void sub_80B403C(void) +void Shop_MoveItemListDown(void) { u16 *r1; u16 *r2; @@ -934,7 +938,7 @@ void sub_80B403C(void) } #else __attribute__((naked)) -void sub_80B403C(void) +void Shop_MoveItemListDown(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -1027,7 +1031,7 @@ _080B40E4: .4byte 0x800000f0\n\ } #endif -void sub_80B40E8(u8 taskId) // Mart_DoCursorAction +void Shop_DoCursorAction(u8 taskId) { if (!gPaletteFade.active) { @@ -1040,7 +1044,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction PlaySE(SE_SELECT); gMartInfo.choicesAbove--; // since cursor is at the top and there are choices above the top, scroll the menu up by updating choicesAbove. - sub_80B3F88(); + Shop_MoveItemListUp(); Shop_DisplayPriceInList(0, 0, 0); Shop_PrintItemDescText(); Shop_TryDrawVerticalScrollIndicators(); @@ -1061,7 +1065,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction PlaySE(SE_SELECT); gMartInfo.choicesAbove++; - sub_80B403C(); + Shop_MoveItemListDown(); Shop_DisplayPriceInList(7, 7, 0); Shop_PrintItemDescText(); Shop_TryDrawVerticalScrollIndicators(); @@ -1091,13 +1095,13 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction gMartTotalCost = (ItemId_GetPrice(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor]) >> GetPriceReduction(1)); // set 1x price if (!IsEnoughMoney(gSaveBlock1.money, gMartTotalCost)) { - DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, sub_80B3BD0, 0xC3E1); // tail merge + DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, Shop_DoPricePrintAndReturnToBuyMenu, 0xC3E1); // tail merge } else // _080B42BA { CopyItemName(gMartInfo.itemList[gMartInfo.choicesAbove + gMartInfo.cursor], gStringVar1); StringExpandPlaceholders(gStringVar4, gOtherText_HowManyYouWant); - DisplayItemMessageOnField(taskId, gStringVar4, sub_80B3EFC, 0xC3E1); + DisplayItemMessageOnField(taskId, gStringVar4, Shop_UpdateCurItemCountToMax, 0xC3E1); } } else // _080B428C @@ -1106,7 +1110,7 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction if (!IsEnoughMoney(gSaveBlock1.money, gMartTotalCost)) { - DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, sub_80B3BD0, 0xC3E1); // tail merge + DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, Shop_DoPricePrintAndReturnToBuyMenu, 0xC3E1); // tail merge } else { @@ -1126,38 +1130,38 @@ void sub_80B40E8(u8 taskId) // Mart_DoCursorAction } } else - sub_80B43F0(taskId); + Task_ExitBuyMenu(taskId); } else if (gMain.newKeys & B_BUTTON) // go back to buy/sell/exit menu { PlaySE(SE_SELECT); - sub_80B43F0(taskId); + Task_ExitBuyMenu(taskId); } } } -void Shop_ReturnToBuyMenu(u8 taskId) +void Task_ReturnToBuyMenu(u8 taskId) { Menu_EraseWindowRect(0, 0xE, 0x1D, 0x13); Menu_EraseWindowRect(0, 0xA, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 0x1, 0xB, 0xC, 0x2, 0); Shop_DrawViewportTiles(); - sub_80B3764(6, 7); + Shop_InitMenus(6, 7); Shop_PrintItemDesc(); StartVerticalScrollIndicators(TOP_ARROW); StartVerticalScrollIndicators(BOTTOM_ARROW); Shop_TryDrawVerticalScrollIndicators(); - gTasks[taskId].func = sub_80B40E8; + gTasks[taskId].func = Shop_DoCursorAction; } -void sub_80B43F0(u8 taskId) +void Task_ExitBuyMenu(u8 taskId) { - gFieldCallback = Shop_InitExitSellMenu; + gFieldCallback = Shop_FadeReturnToMartMenu; BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); - gTasks[taskId].func = Task_ExitBuyMenu; + gTasks[taskId].func = Task_ExitBuyMenuDoFade; } -void Task_ExitBuyMenu(u8 taskId) +void Task_ExitBuyMenuDoFade(u8 taskId) { if (!gPaletteFade.active) { @@ -1168,7 +1172,8 @@ void Task_ExitBuyMenu(u8 taskId) } } -void sub_80B4470(u8 taskId) +// Task_UpdatePurchaseHistory +void Task_UpdatePurchaseHistory(u8 taskId) { u16 i; @@ -1222,128 +1227,3 @@ void CreateDecorationShop2Menu(u16 *itemList) SetShopItemsForSale(itemList); SetShopMenuCallback(EnableBothScriptContexts); } - -void sub_80B45B4(u8 taskId, const s16 *list, u16 c) -{ - s16 r5 = gTasks[taskId].data[4] - 1; - s16 r3 = gTasks[taskId].data[5] - 1; - s16 r4 = gTasks[taskId].data[1]; - s16 y; - s16 x; - - if (gTasks[taskId].data[2] == 0) - { - for (y = 0; y < 3; y++) - { - for (x = 0; x < 3; x++) - { - s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y); - - if (list[r4] == metatileId) - { - if (r4 != 2) - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[r4 + 1]); - else - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[0]); - } - } - } - } - else - { - for (y = 0; y < 3; y++) - { - for (x = 0; x < 3; x++) - { - s16 metatileId = MapGridGetMetatileIdAt(r5 + x, r3 + y); - - if (list[2 - r4] == metatileId) - { - if (r4 != 2) - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[1 - r4]); - else - MapGridSetMetatileIdAt(r5 + x, r3 + y, c | list[2]); - } - } - } - } -} - -static const u16 gUnknown_083CC714[] = {0x284, 0x282, 0x280}; -static const u16 gUnknown_083CC71A[] = {0x285, 0x283, 0x281}; -static const u16 gUnknown_083CC720[] = {0x28C, 0x28A, 0x288}; -static const u16 gUnknown_083CC726[] = {0x28D, 0x28B, 0x289}; -static const u16 gUnknown_083CC72C[] = {0x2A0, 0x2A2, 0x2A4}; -static const u16 gUnknown_083CC732[] = {0x2A1, 0x2A3, 0x2A5}; -static const u16 gUnknown_083CC738[] = {0x2A8, 0x2AA, 0x2AC}; - -void sub_80B4710(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - data[3] = 1; - - switch (data[0]) - { - case 0: - sub_80B45B4(taskId, gUnknown_083CC714, 0); - break; - case 1: - sub_80B45B4(taskId, gUnknown_083CC71A, 0); - break; - case 2: - sub_80B45B4(taskId, gUnknown_083CC720, 0xC00); - break; - case 3: - sub_80B45B4(taskId, gUnknown_083CC726, 0); - break; - case 4: - sub_80B45B4(taskId, gUnknown_083CC72C, 0xC00); - break; - case 5: - sub_80B45B4(taskId, gUnknown_083CC732, 0); - break; - case 6: - sub_80B45B4(taskId, gUnknown_083CC738, 0); - break; - } - - data[0] = (data[0] + 1) & 7; - if (!data[0]) - { - DrawWholeMapView(); - data[1] = (data[1] + 1) % 3; - data[3] = 0; - } -} - -u8 sub_80B47D8(u16 var) -{ - u8 taskId = CreateTask(sub_80B4710, 0); - s16 *data = gTasks[taskId].data; - - PlayerGetDestCoords(&data[4], &data[5]); - data[0] = 0; - data[1] = 0; - data[2] = var; - sub_80B4710(taskId); - return taskId; -} - -void sub_80B4824(u8 var) -{ - gUnknown_02038731 = sub_80B47D8(var); -} - -void sub_80B483C(void) -{ - DestroyTask(gUnknown_02038731); -} - -bool8 sub_80B4850(void) -{ - if (gTasks[gUnknown_02038731].data[3] == 0 && gTasks[gUnknown_02038731].data[1] == 2) - return FALSE; - else - return TRUE; -} diff --git a/sym_ewram.txt b/sym_ewram.txt index b9c08aac6..ae96c7873 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -486,6 +486,7 @@ gSpecialVar_ContestRank: @ 203869E .space 0x2 .include "src/field/shop.o" + .include "src/field/fldeff_escalator.o" .include "src/field/money.o" @ record_mixing -- cgit v1.2.3 From 0432df3afaa917f7df50820206bc7b42316ea505 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 15 Jan 2018 21:27:08 -0500 Subject: tab --- sym_ewram.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sym_ewram.txt b/sym_ewram.txt index ae96c7873..a3de14b52 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -486,7 +486,7 @@ gSpecialVar_ContestRank: @ 203869E .space 0x2 .include "src/field/shop.o" - .include "src/field/fldeff_escalator.o" + .include "src/field/fldeff_escalator.o" .include "src/field/money.o" @ record_mixing -- cgit v1.2.3 From 5d923c4d5f3d0786715663b3ad83bc9f3e778164 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 20:41:55 -0600 Subject: import some battle_4.c code from emerald and get atk23_getexp matching --- asm/battle_9.s | 24 +- data/battle_scripts_1.s | 6 +- include/battle.h | 124 +- include/battle_string_ids.h | 387 +++++ include/battle_util.h | 4 +- include/ewram.h | 2 +- src/battle/battle_2.c | 44 +- src/battle/battle_4.c | 2383 ++++++++-------------------- src/battle/battle_7.c | 8 +- src/battle/battle_ai.c | 18 +- src/battle/battle_controller_linkpartner.c | 10 +- src/battle/battle_controller_player.c | 16 +- src/battle/battle_controller_wally.c | 6 +- src/battle/battle_message.c | 40 +- src/battle/battle_util.c | 362 ++--- src/data/battle_strings_de.h | 2 +- src/data/battle_strings_en.h | 2 +- src/pokemon/pokemon_3.c | 10 +- src/rom3.c | 10 +- src/rom_800D42C.c | 8 +- src/script_pokemon_util_80C4BF0.c | 4 +- sym_ewram.txt | 6 +- 22 files changed, 1467 insertions(+), 2009 deletions(-) create mode 100644 include/battle_string_ids.h diff --git a/asm/battle_9.s b/asm/battle_9.s index fc4cbcf4b..9dbb7c619 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -273,7 +273,7 @@ sub_80361E8: @ 80361E8 beq _08036214 b _08036400 _08036214: - ldr r1, _0803627C @ =gMoveHitWith + ldr r1, _0803627C @ =gLastLandedMoves ldr r5, _08036280 @ =gActiveBank ldrb r3, [r5] lsls r0, r3, 1 @@ -326,7 +326,7 @@ _08036242: ldrb r7, [r5] b _080362B2 .align 2, 0 -_0803627C: .4byte gMoveHitWith +_0803627C: .4byte gLastLandedMoves _08036280: .4byte gActiveBank _08036284: .4byte 0x0000ffff _08036288: .4byte gBattleMoves @@ -348,7 +348,7 @@ _080362AE: mov r8, r7 _080362B2: ldr r3, _080362D4 @ =gBattleMoves - ldr r1, _080362D8 @ =gMoveHitWith + ldr r1, _080362D8 @ =gLastLandedMoves ldr r2, _080362DC @ =gActiveBank ldrb r0, [r2] lsls r0, 1 @@ -366,7 +366,7 @@ _080362B2: b _080362F2 .align 2, 0 _080362D4: .4byte gBattleMoves -_080362D8: .4byte gMoveHitWith +_080362D8: .4byte gLastLandedMoves _080362DC: .4byte gActiveBank _080362E0: cmp r0, 0xB @@ -548,7 +548,7 @@ AI_SwitchIfNaturalCure: @ 8036410 lsrs r0, 1 cmp r1, r0 bcc _080364D8 - ldr r1, _08036470 @ =gMoveHitWith + ldr r1, _08036470 @ =gLastLandedMoves lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] @@ -568,11 +568,11 @@ _08036456: .align 2, 0 _08036468: .4byte gBattleMons _0803646C: .4byte gActiveBank -_08036470: .4byte gMoveHitWith +_08036470: .4byte gLastLandedMoves _08036474: .4byte 0x0000ffff _08036478: ldr r2, _080364A4 @ =gBattleMoves - ldr r1, _080364A8 @ =gMoveHitWith + ldr r1, _080364A8 @ =gLastLandedMoves ldr r4, _080364AC @ =gActiveBank ldrb r0, [r4] lsls r0, 1 @@ -594,7 +594,7 @@ _08036478: b _080364E0 .align 2, 0 _080364A4: .4byte gBattleMoves -_080364A8: .4byte gMoveHitWith +_080364A8: .4byte gLastLandedMoves _080364AC: .4byte gActiveBank _080364B0: movs r0, 0x8 @@ -863,7 +863,7 @@ sub_80366A4: @ 80366A4 lsls r1, 24 lsrs r1, 24 str r1, [sp, 0x4] - ldr r1, _08036730 @ =gMoveHitWith + ldr r1, _08036730 @ =gLastLandedMoves ldr r5, _08036734 @ =gActiveBank ldrb r3, [r5] lsls r0, r3, 1 @@ -924,7 +924,7 @@ _080366F6: mov r10, r5 b _0803679C .align 2, 0 -_08036730: .4byte gMoveHitWith +_08036730: .4byte gLastLandedMoves _08036734: .4byte gActiveBank _08036738: .4byte 0x0000ffff _0803673C: .4byte gUnknown_02024C5C @@ -1053,7 +1053,7 @@ _08036844: adds r0, r2 ldrb r2, [r0, 0x16] _08036850: - ldr r1, _080368F0 @ =gMoveHitWith + ldr r1, _080368F0 @ =gLastLandedMoves ldr r5, _080368F4 @ =gActiveBank ldrb r0, [r5] lsls r0, 1 @@ -1132,7 +1132,7 @@ _080368DA: bx r1 .align 2, 0 _080368EC: .4byte gBaseStats -_080368F0: .4byte gMoveHitWith +_080368F0: .4byte gLastLandedMoves _080368F4: .4byte gActiveBank _080368F8: .4byte gUnknown_02024C5C _080368FC: .4byte gBattleMons diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b04ebefe5..d309aea7e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2589,12 +2589,12 @@ BattleScript_EffectEndeavor: @ 81D8852 attackstring ppreduce setdamagetohealthdifference BattleScript_ButItFailed - copyword gHP_dealt, gBattleMoveDamage + copyword gHpDealt, gBattleMoveDamage accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE typecalc jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE - copyword gBattleMoveDamage, gHP_dealt + copyword gBattleMoveDamage, gHpDealt adjustsetdamage goto BattleScript_HitFromAtkAnimation @@ -3314,7 +3314,7 @@ BattleScript_LeechSeedTurnDrain:: @ 81D904B orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - copyword gBattleMoveDamage, gHP_dealt + copyword gBattleMoveDamage, gHpDealt jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze manipulatedamage 0 setbyte cMULTISTRING_CHOOSER, 3 diff --git a/include/battle.h b/include/battle.h index c94325cd5..8727f2eca 100644 --- a/include/battle.h +++ b/include/battle.h @@ -4,6 +4,30 @@ #include "sprite.h" #include "constants/battle_constants.h" +/* + Banks are a name given to what could be called a 'battlerId' or 'monControllerId'. + Each bank has a value consisting of two bits. + 0x1 bit is responsible for the side, 0 = player's side, 1 = opponent's side. + 0x2 bit is responsible for the id of sent out pokemon. 0 means it's the first sent out pokemon, 1 it's the second one. (Triple battle didn't exist at the time yet.) +*/ + +#define BATTLE_BANKS_COUNT 4 + +#define IDENTITY_PLAYER_MON1 0 +#define IDENTITY_OPPONENT_MON1 1 +#define IDENTITY_PLAYER_MON2 2 +#define IDENTITY_OPPONENT_MON2 3 + +#define SIDE_PLAYER 0x0 +#define SIDE_OPPONENT 0x1 + +#define BIT_SIDE 0x1 +#define BIT_MON 0x2 + +#define GET_BANK_IDENTITY(bank)((gBanksByIdentity[bank])) +#define GET_BANK_SIDE(bank)((GetBankIdentity(bank) & BIT_SIDE)) +#define GET_BANK_SIDE2(bank)((GET_BANK_IDENTITY(bank) & BIT_SIDE)) + enum { BATTLE_TERRAIN_GRASS, @@ -302,6 +326,18 @@ struct BattleStruct /* 0x2000000 */ /* 0x16A00 */ struct UnkBattleStruct1 unk_2016A00_2; }; +struct StatsArray +{ + u16 hp; + u16 atk; + u16 def; + u16 spd; + u16 spAtk; + u16 spDef; +}; + +#define gBattleResources_statsBeforeLvlUp ((struct StatsArray *)(gSharedMem + 0x17180)) + struct DisableStruct { /*0x00*/ u32 transformedMonPersonality; @@ -504,6 +540,88 @@ extern struct WishFutureKnock gWishFutureKnock; extern struct AI_ThinkingStruct gAIThinkingSpace; extern struct Struct20238C8 gUnknown_020238C8; +#define GET_MOVE_TYPE(move, typeArg) \ +{ \ + if (gBattleStruct->dynamicMoveType) \ + typeArg = gBattleStruct->dynamicMoveType & 0x3F; \ + else \ + typeArg = gBattleMoves[move].type; \ +} + +#define MOVE_EFFECT_SLEEP 0x1 +#define MOVE_EFFECT_POISON 0x2 +#define MOVE_EFFECT_BURN 0x3 +#define MOVE_EFFECT_FREEZE 0x4 +#define MOVE_EFFECT_PARALYSIS 0x5 +#define MOVE_EFFECT_TOXIC 0x6 +#define MOVE_EFFECT_CONFUSION 0x7 +#define MOVE_EFFECT_FLINCH 0x8 +#define MOVE_EFFECT_TRI_ATTACK 0x9 +#define MOVE_EFFECT_UPROAR 0xA +#define MOVE_EFFECT_PAYDAY 0xB +#define MOVE_EFFECT_CHARGING 0xC +#define MOVE_EFFECT_WRAP 0xD +#define MOVE_EFFECT_RECOIL_25 0xE +#define MOVE_EFFECT_ATK_PLUS_1 0xF +#define MOVE_EFFECT_DEF_PLUS_1 0x10 +#define MOVE_EFFECT_SPD_PLUS_1 0x11 +#define MOVE_EFFECT_SP_ATK_PLUS_1 0x12 +#define MOVE_EFFECT_SP_DEF_PLUS_1 0x13 +#define MOVE_EFFECT_ACC_PLUS_1 0x14 +#define MOVE_EFFECT_EVS_PLUS_1 0x15 +#define MOVE_EFFECT_ATK_MINUS_1 0x16 +#define MOVE_EFFECT_DEF_MINUS_1 0x17 +#define MOVE_EFFECT_SPD_MINUS_1 0x18 +#define MOVE_EFFECT_SP_ATK_MINUS_1 0x19 +#define MOVE_EFFECT_SP_DEF_MINUS_1 0x1A +#define MOVE_EFFECT_ACC_MINUS_1 0x1B +#define MOVE_EFFECT_EVS_MINUS_1 0x1C +#define MOVE_EFFECT_RECHARGE 0x1D +#define MOVE_EFFECT_RAGE 0x1E +#define MOVE_EFFECT_STEAL_ITEM 0x1F +#define MOVE_EFFECT_PREVENT_ESCAPE 0x20 +#define MOVE_EFFECT_NIGHTMARE 0x21 +#define MOVE_EFFECT_ALL_STATS_UP 0x22 +#define MOVE_EFFECT_RAPIDSPIN 0x23 +#define MOVE_EFFECT_REMOVE_PARALYSIS 0x24 +#define MOVE_EFFECT_ATK_DEF_DOWN 0x25 +#define MOVE_EFFECT_RECOIL_33_PARALYSIS 0x26 +#define MOVE_EFFECT_ATK_PLUS_2 0x27 +#define MOVE_EFFECT_DEF_PLUS_2 0x28 +#define MOVE_EFFECT_SPD_PLUS_2 0x29 +#define MOVE_EFFECT_SP_ATK_PLUS_2 0x2A +#define MOVE_EFFECT_SP_DEF_PLUS_2 0x2B +#define MOVE_EFFECT_ACC_PLUS_2 0x2C +#define MOVE_EFFECT_EVS_PLUS_2 0x2D +#define MOVE_EFFECT_ATK_MINUS_2 0x2E +#define MOVE_EFFECT_DEF_MINUS_2 0x2F +#define MOVE_EFFECT_SPD_MINUS_2 0x30 +#define MOVE_EFFECT_SP_ATK_MINUS_2 0x31 +#define MOVE_EFFECT_SP_DEF_MINUS_2 0x32 +#define MOVE_EFFECT_ACC_MINUS_2 0x33 +#define MOVE_EFFECT_EVS_MINUS_2 0x34 +#define MOVE_EFFECT_THRASH 0x35 +#define MOVE_EFFECT_KNOCK_OFF 0x36 +#define MOVE_EFFECT_NOTHING_37 0x37 +#define MOVE_EFFECT_NOTHING_38 0x38 +#define MOVE_EFFECT_NOTHING_39 0x39 +#define MOVE_EFFECT_NOTHING_3A 0x3A +#define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x3B +#define MOVE_EFFECT_NOTHING_3C 0x3C +#define MOVE_EFFECT_NOTHING_3D 0x3D +#define MOVE_EFFECT_NOTHING_3E 0x3E +#define MOVE_EFFECT_NOTHING_3F 0x3F +#define MOVE_EFFECT_AFFECTS_USER 0x40 +#define MOVE_EFFECT_CERTAIN 0x80 + +#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8 +#define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40 +#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit + +#define SET_STAT_BUFF_VALUE(n)(((s8)(((s8)(n) << 4)) & 0xF0)) + +#define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + (stage << 4) + (goesDown << 7)) + // used in many battle files, it seems as though Hisashi Sogabe wrote // some sort of macro to replace the use of actually calling memset. // Perhaps it was thought calling memset was much slower? @@ -540,7 +658,7 @@ struct funcStack struct scriptsStack { - u8* ptr[8]; + const u8 *ptr[8]; u8 size; }; @@ -676,11 +794,11 @@ void nullsub_10(int); void load_gfxc_health_bar(); u8 battle_load_something(); void sub_8031F88(u8); -void sub_80324F8(struct Pokemon *, u8); +void HandleLowHpMusicChange(struct Pokemon *, u8); void sub_8032638(); void sub_8032AA8(u8, u8); void SetBankFuncToOpponentBufferRunCommand(void); -void BattleMusicStop(void); +void BattleStopLowHpSound(void); // asm/battle_9.o void SetBankFuncToLinkOpponentBufferRunCommand(void); diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h new file mode 100644 index 000000000..f242284b0 --- /dev/null +++ b/include/battle_string_ids.h @@ -0,0 +1,387 @@ +#ifndef GUARD_BATTLE_STRING_IDS_H +#define GUARD_BATTLE_STRING_IDS_H + +#define BATTLESTRINGS_COUNT 369 + +#define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved + +#define STRINGID_INTROMSG 0 +#define STRINGID_INTROSENDOUT 1 +#define STRINGID_RETURNMON 2 +#define STRINGID_SWITCHINMON 3 +#define STRINGID_USEDMOVE 4 +#define STRINGID_BATTLEEND 5 + + +// todo: make some of those names less vague: attacker/target vs pkmn, etc. +#define STRINGID_TRAINER1LOSETEXT 12 +#define STRINGID_PKMNGAINEDEXP 13 +#define STRINGID_PKMNGREWTOLV 14 +#define STRINGID_PKMNLEARNEDMOVE 15 +#define STRINGID_TRYTOLEARNMOVE1 16 +#define STRINGID_TRYTOLEARNMOVE2 17 +#define STRINGID_TRYTOLEARNMOVE3 18 +#define STRINGID_PKMNFORGOTMOVE 19 +#define STRINGID_STOPLEARNINGMOVE 20 +#define STRINGID_DIDNOTLEARNMOVE 21 +#define STRINGID_PKMNLEARNEDMOVE2 22 +#define STRINGID_ATTACKMISSED 23 +#define STRINGID_PKMNPROTECTEDITSELF 24 +#define STRINGID_STATSWONTINCREASE2 25 +#define STRINGID_AVOIDEDDAMAGE 26 +#define STRINGID_ITDOESNTAFFECT 27 +#define STRINGID_ATTACKERFAINTED 28 +#define STRINGID_TARGETFAINTED 29 +#define STRINGID_PLAYERGOTMONEY 30 +#define STRINGID_PLAYERWHITEOUT 31 +#define STRINGID_PLAYERWHITEOUT2 32 +#define STRINGID_PREVENTSESCAPE 33 +#define STRINGID_HITXTIMES 34 +#define STRINGID_PKMNFELLASLEEP 35 +#define STRINGID_PKMNMADESLEEP 36 +#define STRINGID_PKMNALREADYASLEEP 37 +#define STRINGID_PKMNALREADYASLEEP2 38 +#define STRINGID_PKMNWASNTAFFECTED 39 +#define STRINGID_PKMNWASPOISONED 40 +#define STRINGID_PKMNPOISONEDBY 41 +#define STRINGID_PKMNHURTBYPOISON 42 +#define STRINGID_PKMNALREADYPOISONED 43 +#define STRINGID_PKMNBADLYPOISONED 44 +#define STRINGID_PKMNENERGYDRAINED 45 +#define STRINGID_PKMNWASBURNED 46 +#define STRINGID_PKMNBURNEDBY 47 +#define STRINGID_PKMNHURTBYBURN 48 +#define STRINGID_PKMNWASFROZEN 49 +#define STRINGID_PKMNFROZENBY 50 +#define STRINGID_PKMNISFROZEN 51 +#define STRINGID_PKMNWASDEFROSTED 52 +#define STRINGID_PKMNWASDEFROSTED2 53 +#define STRINGID_PKMNWASDEFROSTEDBY 54 +#define STRINGID_PKMNWASPARALYZED 55 +#define STRINGID_PKMNWASPARALYZEDBY 56 +#define STRINGID_PKMNISPARALYZED 57 +#define STRINGID_PKMNISALREADYPARALYZED 58 +#define STRINGID_PKMNHEALEDPARALYSIS 59 +#define STRINGID_PKMNDREAMEATEN 60 +#define STRINGID_STATSWONTINCREASE 61 +#define STRINGID_STATSWONTDECREASE 62 +#define STRINGID_TEAMSTOPPEDWORKING 63 +#define STRINGID_FOESTOPPEDWORKING 64 +#define STRINGID_PKMNISCONFUSED 65 +#define STRINGID_PKMNHEALEDCONFUSION 66 +#define STRINGID_PKMNWASCONFUSED 67 +#define STRINGID_PKMNALREADYCONFUSED 68 +#define STRINGID_PKMNFELLINLOVE 69 +#define STRINGID_PKMNINLOVE 70 +#define STRINGID_PKMNIMMOBILIZEDBYLOVE 71 +#define STRINGID_PKMNBLOWNAWAY 72 +#define STRINGID_PKMNCHANGEDTYPE 73 +#define STRINGID_PKMNFLINCHED 74 +#define STRINGID_PKMNREGAINEDHEALTH 75 +#define STRINGID_PKMNHPFULL 76 +#define STRINGID_PKMNRAISEDSPDEF 77 +#define STRINGID_PKMNRAISEDDEF 78 +#define STRINGID_PKMNCOVEREDBYVEIL 79 +#define STRINGID_PKMNUSEDSAFEGUARD 80 +#define STRINGID_PKMNSAFEGUARDEXPIRED 81 +#define STRINGID_PKMNWENTTOSLEEP 82 +#define STRINGID_PKMNSLEPTHEALTHY 83 +#define STRINGID_PKMNWHIPPEDWHIRLWIND 84 +#define STRINGID_PKMNTOOKSUNLIGHT 85 +#define STRINGID_PKMNLOWEREDHEAD 86 +#define STRINGID_PKMNISGLOWING 87 +#define STRINGID_PKMNFLEWHIGH 88 +#define STRINGID_PKMNDUGHOLE 89 +#define STRINGID_PKMNSQUEEZEDBYBIND 90 +#define STRINGID_PKMNTRAPPEDINVORTEX 91 +#define STRINGID_PKMNWRAPPEDBY 92 +#define STRINGID_PKMNCLAMPED 93 +#define STRINGID_PKMNHURTBY 94 +#define STRINGID_PKMNFREEDFROM 95 +#define STRINGID_PKMNCRASHED 96 +#define STRINGID_PKMNSHROUDEDINMIST 97 +#define STRINGID_PKMNPROTECTEDBYMIST 98 +#define STRINGID_PKMNGETTINGPUMPED 99 +#define STRINGID_PKMNHITWITHRECOIL 100 +#define STRINGID_PKMNPROTECTEDITSELF2 101 +#define STRINGID_PKMNBUFFETEDBYSANDSTORM 102 +#define STRINGID_PKMNPELTEDBYHAIL 103 +#define STRINGID_PKMNSEEDED 104 +#define STRINGID_PKMNEVADEDATTACK 105 +#define STRINGID_PKMNSAPPEDBYLEECHSEED 106 +#define STRINGID_PKMNFASTASLEEP 107 +#define STRINGID_PKMNWOKEUP 108 +#define STRINGID_PKMNUPROARKEPTAWAKE 109 +#define STRINGID_PKMNWOKEUPINUPROAR 110 +#define STRINGID_PKMNCAUSEDUPROAR 111 +#define STRINGID_PKMNMAKINGUPROAR 112 +#define STRINGID_PKMNCALMEDDOWN 113 +#define STRINGID_PKMNCANTSLEEPINUPROAR 114 +#define STRINGID_PKMNSTOCKPILED 115 +#define STRINGID_PKMNCANTSTOCKPILE 116 +#define STRINGID_PKMNCANTSLEEPINUPROAR2 117 +#define STRINGID_UPROARKEPTPKMNAWAKE 118 +#define STRINGID_PKMNSTAYEDAWAKEUSING 119 +#define STRINGID_PKMNSTORINGENERGY 120 +#define STRINGID_PKMNUNLEASHEDENERGY 121 +#define STRINGID_PKMNFATIGUECONFUSION 122 +#define STRINGID_PKMNPICKEDUPITEM 123 +#define STRINGID_PKMNUNAFFECTED 124 +#define STRINGID_PKMNTRANSFORMEDINTO 125 +#define STRINGID_PKMNMADESUBSTITUTE 126 +#define STRINGID_PKMNHASSUBSTITUTE 127 +#define STRINGID_SUBSTITUTEDAMAGED 128 +#define STRINGID_PKMNSUBSTITUTEFADED 129 +#define STRINGID_PKMNMUSTRECHARGE 130 +#define STRINGID_PKMNRAGEBUILDING 131 +#define STRINGID_PKMNMOVEWASDISABLED 132 +#define STRINGID_PKMNMOVEISDISABLED 133 +#define STRINGID_PKMNMOVEDISABLEDNOMORE 134 +#define STRINGID_PKMNGOTENCORE 135 +#define STRINGID_PKMNENCOREENDED 136 +#define STRINGID_PKMNTOOKAIM 137 +#define STRINGID_PKMNSKETCHEDMOVE 138 +#define STRINGID_PKMNTRYINGTOTAKEFOE 139 +#define STRINGID_PKMNTOOKFOE 140 +#define STRINGID_PKMNREDUCEDPP 141 +#define STRINGID_PKMNSTOLEITEM 142 +#define STRINGID_TARGETCANTESCAPENOW 143 +#define STRINGID_PKMNFELLINTONIGHTMARE 144 +#define STRINGID_PKMNLOCKEDINNIGHTMARE 145 +#define STRINGID_PKMNLAIDCURSE 146 +#define STRINGID_PKMNAFFLICTEDBYCURSE 147 +#define STRINGID_SPIKESSCATTERED 148 +#define STRINGID_PKMNHURTBYSPIKES 149 +#define STRINGID_PKMNIDENTIFIED 150 +#define STRINGID_PKMNPERISHCOUNTFELL 151 +#define STRINGID_PKMNBRACEDITSELF 152 +#define STRINGID_PKMNENDUREDHIT 153 +#define STRINGID_MAGNITUDESTRENGTH 154 +#define STRINGID_PKMNCUTHPMAXEDATTACK 155 +#define STRINGID_PKMNCOPIEDSTATCHANGES 156 +#define STRINGID_PKMNGOTFREE 157 +#define STRINGID_PKMNSHEDLEECHSEED 158 +#define STRINGID_PKMNBLEWAWAYSPIKES 159 +#define STRINGID_PKMNFLEDFROMBATTLE 160 +#define STRINGID_PKMNFORESAWATTACK 161 +#define STRINGID_PKMNTOOKATTACK 162 +#define STRINGID_PKMNATTACK 163 +#define STRINGID_PKMNCENTERATTENTION 164 +#define STRINGID_PKMNCHARGINGPOWER 165 +#define STRINGID_NATUREPOWERTURNEDINTO 166 +#define STRINGID_PKMNSTATUSNORMAL 167 +#define STRINGID_PKMNHASNOMOVESLEFT 168 +#define STRINGID_PKMNSUBJECTEDTOTORMENT 169 +#define STRINGID_PKMNCANTUSEMOVETORMENT 170 +#define STRINGID_PKMNTIGHTENINGFOCUS 171 +#define STRINGID_PKMNFELLFORTAUNT 172 +#define STRINGID_PKMNCANTUSEMOVETAUNT 173 +#define STRINGID_PKMNREADYTOHELP 174 +#define STRINGID_PKMNSWITCHEDITEMS 175 +#define STRINGID_PKMNCOPIEDFOE 176 +#define STRINGID_PKMNMADEWISH 177 +#define STRINGID_PKMNWISHCAMETRUE 178 +#define STRINGID_PKMNPLANTEDROOTS 179 +#define STRINGID_PKMNABSORBEDNUTRIENTS 180 +#define STRINGID_PKMNANCHOREDITSELF 181 +#define STRINGID_PKMNWASMADEDROWSY 182 +#define STRINGID_PKMNKNOCKEDOFF 183 +#define STRINGID_PKMNSWAPPEDABILITIES 184 +#define STRINGID_PKMNSEALEDOPPONENTMOVE 185 +#define STRINGID_PKMNCANTUSEMOVESEALED 186 +#define STRINGID_PKMNWANTSGRUDGE 187 +#define STRINGID_PKMNLOSTPPGRUDGE 188 +#define STRINGID_PKMNSHROUDEDITSELF 189 +#define STRINGID_PKMNMOVEBOUNCED 190 +#define STRINGID_PKMNWAITSFORTARGET 191 +#define STRINGID_PKMNSNATCHEDMOVE 192 +#define STRINGID_PKMNMADEITRAIN 193 +#define STRINGID_PKMNRAISEDSPEED 194 +#define STRINGID_PKMNPROTECTEDBY 195 +#define STRINGID_PKMNPREVENTSUSAGE 196 +#define STRINGID_PKMNRESTOREDHPUSING 197 +#define STRINGID_PKMNCHANGEDTYPEWITH 198 +#define STRINGID_PKMNPREVENTSPARALYSISWITH 199 +#define STRINGID_PKMNPREVENTSROMANCEWITH 200 +#define STRINGID_PKMNPREVENTSPOISONINGWITH 201 +#define STRINGID_PKMNPREVENTSCONFUSIONWITH 202 +#define STRINGID_PKMNRAISEDFIREPOWERWITH 203 +#define STRINGID_PKMNANCHORSITSELFWITH 204 +#define STRINGID_PKMNCUTSATTACKWITH 205 +#define STRINGID_PKMNPREVENTSSTATLOSSWITH 206 +#define STRINGID_PKMNHURTSWITH 207 +#define STRINGID_PKMNTRACED 208 +#define STRINGID_STATSHARPLY 209 +#define STRINGID_STATROSE 210 +#define STRINGID_STATHARSHLY 211 +#define STRINGID_STATFELL 212 +#define STRINGID_PKMNSSTATCHANGED 213 +#define STRINGID_PKMNSSTATCHANGED2 214 +#define STRINGID_PKMNSSTATCHANGED3 215 +#define STRINGID_PKMNSSTATCHANGED4 216 +#define STRINGID_CRITICALHIT 217 +#define STRINGID_ONEHITKO 218 +#define STRINGID_123POOF 219 +#define STRINGID_ANDELLIPSIS 220 +#define STRINGID_NOTVERYEFFECTIVE 221 +#define STRINGID_SUPEREFFECTIVE 222 +#define STRINGID_GOTAWAYSAFELY 223 +#define STRINGID_WILDPKMNFLED 224 +#define STRINGID_NORUNNINGFROMTRAINERS 225 +#define STRINGID_CANTESCAPE 226 +#define STRINGID_DONTLEAVEBIRCH 227 +#define STRINGID_BUTNOTHINGHAPPENED 228 +#define STRINGID_BUTITFAILED 229 +#define STRINGID_ITHURTCONFUSION 230 +#define STRINGID_MIRRORMOVEFAILED 231 +#define STRINGID_STARTEDTORAIN 232 +#define STRINGID_DOWNPOURSTARTED 233 +#define STRINGID_RAINCONTINUES 234 +#define STRINGID_DOWNPOURCONTINUES 235 +#define STRINGID_RAINSTOPPED 236 +#define STRINGID_SANDSTORMBREWED 237 +#define STRINGID_SANDSTORMRAGES 238 +#define STRINGID_SANDSTORMSUBSIDED 239 +#define STRINGID_SUNLIGHTGOTBRIGHT 240 +#define STRINGID_SUNLIGHTSTRONG 241 +#define STRINGID_SUNLIGHTFADED 242 +#define STRINGID_STARTEDHAIL 243 +#define STRINGID_HAILCONTINUES 244 +#define STRINGID_HAILSTOPPED 245 +#define STRINGID_FAILEDTOSPITUP 246 +#define STRINGID_FAILEDTOSWALLOW 247 +#define STRINGID_WINDBECAMEHEATWAVE 248 +#define STRINGID_STATCHANGESGONE 249 +#define STRINGID_COINSSCATTERED 250 +#define STRINGID_TOOWEAKFORSUBSTITUTE 251 +#define STRINGID_SHAREDPAIN 252 +#define STRINGID_BELLCHIMED 253 +#define STRINGID_FAINTINTHREE 254 +#define STRINGID_NOPPLEFT 255 +#define STRINGID_BUTNOPPLEFT 256 +#define STRINGID_PLAYERUSEDITEM 257 +#define STRINGID_WALLYUSEDITEM 258 +#define STRINGID_TRAINERBLOCKEDBALL 259 +#define STRINGID_DONTBEATHIEF 260 +#define STRINGID_ITDODGEDBALL 261 +#define STRINGID_YOUMISSEDPKMN 262 +#define STRINGID_PKMNBROKEFREE 263 +#define STRINGID_ITAPPEAREDCAUGHT 264 +#define STRINGID_AARGHALMOSTHADIT 265 +#define STRINGID_SHOOTSOCLOSE 266 +#define STRINGID_GOTCHAPKMNCAUGHT 267 +#define STRINGID_GOTCHAPKMNCAUGHT2 268 +#define STRINGID_GIVENICKNAMECAPTURED 269 +#define STRINGID_PKMNSENTTOPC 270 +#define STRINGID_PKMNDATAADDEDTODEX 271 +#define STRINGID_ITISRAINING 272 +#define STRINGID_SANDSTORMISRAGING 273 +#define STRINGID_CANTESCAPE2 274 +#define STRINGID_PKMNIGNORESASLEEP 275 +#define STRINGID_PKMNIGNOREDORDERS 276 +#define STRINGID_PKMNBEGANTONAP 277 +#define STRINGID_PKMNLOAFING 278 +#define STRINGID_PKMNWONTOBEY 279 +#define STRINGID_PKMNTURNEDAWAY 280 +#define STRINGID_PKMNPRETENDNOTNOTICE 281 +#define STRINGID_ENEMYABOUTTOSWITCHPKMN 282 +#define STRINGID_CREPTCLOSER 283 +#define STRINGID_CANTGETCLOSER 284 +#define STRINGID_PKMNWATCHINGCAREFULLY 285 +#define STRINGID_PKMNCURIOUSABOUTX 286 +#define STRINGID_PKMNENTHRALLEDBYX 287 +#define STRINGID_PKMNIGNOREDX 288 +#define STRINGID_THREWPOKEBLOCKATPKMN 289 +#define STRINGID_OUTOFSAFARIBALLS 290 +#define STRINGID_PKMNSITEMCUREDPARALYSIS 291 +#define STRINGID_PKMNSITEMCUREDPOISON 292 +#define STRINGID_PKMNSITEMHEALEDBURN 293 +#define STRINGID_PKMNSITEMDEFROSTEDIT 294 +#define STRINGID_PKMNSITEMWOKEIT 295 +#define STRINGID_PKMNSITEMSNAPPEDOUT 296 +#define STRINGID_PKMNSITEMCUREDPROBLEM 297 +#define STRINGID_PKMNSITEMRESTOREDHEALTH 298 +#define STRINGID_PKMNSITEMRESTOREDPP 299 +#define STRINGID_PKMNSITEMRESTOREDSTATUS 300 +#define STRINGID_PKMNSITEMRESTOREDHPALITTLE 301 +#define STRINGID_ITEMALLOWSONLYYMOVE 302 +#define STRINGID_PKMNHUNGONWITHX 303 +#define STRINGID_EMPTYSTRING3 304 +#define STRINGID_PKMNSXPREVENTSBURNS 305 +#define STRINGID_PKMNSXBLOCKSY 306 +#define STRINGID_PKMNSXRESTOREDHPALITTLE2 307 +#define STRINGID_PKMNSXWHIPPEDUPSANDSTORM 308 +#define STRINGID_PKMNSXPREVENTSYLOSS 309 +#define STRINGID_PKMNSXINFATUATEDY 310 +#define STRINGID_PKMNSXMADEYINEFFECTIVE 311 +#define STRINGID_PKMNSXCUREDYPROBLEM 312 +#define STRINGID_ITSUCKEDLIQUIDOOZE 313 +#define STRINGID_PKMNTRANSFORMED 314 +#define STRINGID_ELECTRICITYWEAKENED 315 +#define STRINGID_FIREWEAKENED 316 +#define STRINGID_PKMNHIDUNDERWATER 317 +#define STRINGID_PKMNSPRANGUP 318 +#define STRINGID_HMMOVESCANTBEFORGOTTEN 319 +#define STRINGID_XFOUNDONEY 320 +#define STRINGID_PLAYERDEFEATEDTRAINER1 321 +#define STRINGID_SOOTHINGAROMA 322 +#define STRINGID_ITEMSCANTBEUSEDNOW 323 +#define STRINGID_FORXCOMMAYZ 324 +#define STRINGID_USINGXTHEYOFZN 325 +#define STRINGID_PKMNUSEDXTOGETPUMPED 326 +#define STRINGID_PKMNSXMADEYUSELESS 327 +#define STRINGID_PKMNTRAPPEDBYSANDTOMB 328 +#define STRINGID_EMPTYSTRING4 329 +#define STRINGID_ABOOSTED 330 +#define STRINGID_PKMNSXINTENSIFIEDSUN 331 +#define STRINGID_PKMNMAKESGROUNDMISS 332 +#define STRINGID_YOUTHROWABALLNOWRIGHT 333 +#define STRINGID_PKMNSXTOOKATTACK 334 +#define STRINGID_PKMNCHOSEXASDESTINY 335 +#define STRINGID_PKMNLOSTFOCUS 336 +#define STRINGID_USENEXTPKMN 337 +#define STRINGID_PKMNFLEDUSINGITS 338 +#define STRINGID_PKMNFLEDUSING 339 +#define STRINGID_PKMNWASDRAGGEDOUT 340 +#define STRINGID_PREVENTEDFROMWORKING 341 +#define STRINGID_PKMNSITEMNORMALIZEDSTATUS 342 +#define STRINGID_TRAINER1USEDITEM 343 +#define STRINGID_BOXISFULL 344 +#define STRINGID_PKMNAVOIDEDATTACK 345 +#define STRINGID_PKMNSXMADEITINEFFECTIVE 346 +#define STRINGID_PKMNSXPREVENTSFLINCHING 347 +#define STRINGID_PKMNALREADYHASBURN 348 +#define STRINGID_STATSWONTDECREASE2 349 +#define STRINGID_PKMNSXBLOCKSY2 350 +#define STRINGID_PKMNSXWOREOFF 351 +#define STRINGID_PKMNRAISEDDEFALITTLE 352 +#define STRINGID_PKMNRAISEDSPDEFALITTLE 353 +#define STRINGID_THEWALLSHATTERED 354 +#define STRINGID_PKMNSXPREVENTSYSZ 355 +#define STRINGID_PKMNSXCUREDITSYPROBLEM 356 +#define STRINGID_ATTACKERCANTESCAPE 357 +#define STRINGID_PKMNOBTAINEDX 358 +#define STRINGID_PKMNOBTAINEDX2 359 +#define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360 +#define STRINGID_BUTNOEFFECT 361 +#define STRINGID_PKMNSXHADNOEFFECTONY 362 +#define STRINGID_TWOENEMIESDEFEATED 363 +#define STRINGID_TRAINER2LOSETEXT 364 +#define STRINGID_PKMNINCAPABLEOFPOWER 365 +#define STRINGID_GLINTAPPEARSINEYE 366 +#define STRINGID_PKMNGETTINGINTOPOSITION 367 +#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368 +#define STRINGID_PKMNEAGERFORMORE 369 +#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370 +#define STRINGID_LOSTTOOPPONENTBYREFEREE 371 +#define STRINGID_TIEDOPPONENTBYREFEREE 372 +#define STRINGID_QUESTIONFORFEITMATCH 373 +#define STRINGID_FORFEITEDMATCH 374 +#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375 +#define STRINGID_PKMNTRANSFERREDLANETTESPC 376 +#define STRINGID_PKMNBOXSOMEONESPCFULL 377 +#define STRINGID_PKMNBOXLANETTESPCFULL 378 +#define STRINGID_TRAINER1WINTEXT 379 +#define STRINGID_TRAINER2WINTEXT 380 + +#endif // GUARD_BATTLE_STRING_IDS_H diff --git a/include/battle_util.h b/include/battle_util.h index f47b00b2c..15fa39d1a 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -11,7 +11,7 @@ #define BS_GET_OPPONENT2 14 void TryClearRageStatuses(void); -void BattleScriptPush(u8* BS_ptr); +void BattleScriptPush(const u8* BS_ptr); void PressurePPLoseOnUsingImprision(u8 bankAtk); void PressurePPLoseOnUsingPerishSong(u8 bankAtk); void sub_80155A4(u8); @@ -22,7 +22,7 @@ void ResetSentPokesToOpponentValue(void); void sub_8015740(u8 bank); void sub_80157C4(u8 bank); bool8 HandleWishPerishSongOnTurnEnd(void); -void BattleScriptExecute(u8* BS_ptr); +void BattleScriptExecute(const u8* BS_ptr); void BattleScriptPushCursorAndCallback(u8* BS_ptr); u8 IsMonDisobedient(void); diff --git a/include/ewram.h b/include/ewram.h index 36081dd2a..6f42925c1 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -9,7 +9,7 @@ extern u8 gSharedMem[]; // dupes can be determined to be the same, they will be deliberate // seperated. #define eWeatherPaletteData (*(struct WeatherPaletteData *)gSharedMem) -#define BATTLE_STRUCT ((struct BattleStruct *) (gSharedMem + 0x0)) +#define gBattleStruct ((struct BattleStruct *) (gSharedMem + 0x0)) #define ewram0_2 (*(struct Struct2000000 *)(gSharedMem + 0x0)) #define namingScreenData (*(struct NamingScreenData *)(gSharedMem + 0x0)) #define ewramBerryPic (gSharedMem + 0x0) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 990535b4e..2368f58df 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -87,8 +87,8 @@ extern u8 gMultiHitCounter; extern u8 gActionForBanks[]; extern u16 gUnknown_02024C2C[]; extern u16 gLastUsedMove[]; -extern u16 gMoveHitWith[]; -extern u16 gUnknown_02024C44[]; +extern u16 gLastLandedMoves[]; +extern u16 gLastHitByType[]; extern u16 gUnknown_02024C4C[]; extern u16 gLockedMoves[]; extern u8 gUnknown_02024C5C[]; @@ -301,8 +301,8 @@ void sub_800E9EC(void) if (species != SPECIES_EGG && hp == 0) r6 |= 3 << i * 2; } - BATTLE_STRUCT->unk2 = r6; - BATTLE_STRUCT->unk3 = r6 >> 8; + gBattleStruct->unk2 = r6; + gBattleStruct->unk3 = r6 >> 8; } void sub_800EAAC(void) @@ -398,11 +398,11 @@ void sub_800EC9C(void) { if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) { - BATTLE_STRUCT->unk0 = 1; - BATTLE_STRUCT->unk1 = 1; + gBattleStruct->unk0 = 1; + gBattleStruct->unk1 = 1; sub_800E9EC(); sub_800EAAC(); - SendBlock(bitmask_all_link_players_but_self(), BATTLE_STRUCT, 32); + SendBlock(bitmask_all_link_players_but_self(), gBattleStruct, 32); gBattleCommunication[0] = 1; } } @@ -458,7 +458,7 @@ void sub_800EC9C(void) gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 0; - gTasks[taskId].data[3] = BATTLE_STRUCT->unk2 | (BATTLE_STRUCT->unk3 << 8); + gTasks[taskId].data[3] = gBattleStruct->unk2 | (gBattleStruct->unk3 << 8); gTasks[taskId].data[4] = gBlockRecvBuffer[enemyId][1]; gBattleCommunication[0]++; } @@ -641,8 +641,8 @@ void sub_800F298(void) case 0: if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) { - BATTLE_STRUCT->unk0 = 1; - BATTLE_STRUCT->unk1 = 1; + gBattleStruct->unk0 = 1; + gBattleStruct->unk1 = 1; sub_800E9EC(); sub_800EAAC(); SendBlock(bitmask_all_link_players_but_self(), gSharedMem, 0x20); @@ -1579,8 +1579,8 @@ void sub_8010874(void) gDisableStructs[i].isFirstTurn= 2; gUnknown_02024C70[i] = 0; gLastUsedMove[i] = 0; - gMoveHitWith[i] = 0; - gUnknown_02024C44[i] = 0; + gLastLandedMoves[i] = 0; + gLastHitByType[i] = 0; gUnknown_02024C4C[i] = 0; gUnknown_02024C5C[i] = 0xFF; gLockedMoves[i] = 0; @@ -1732,8 +1732,8 @@ void SwitchInClearStructs(void) gDisableStructs[gActiveBank].isFirstTurn= 2; gLastUsedMove[gActiveBank] = 0; - gMoveHitWith[gActiveBank] = 0; - gUnknown_02024C44[gActiveBank] = 0; + gLastLandedMoves[gActiveBank] = 0; + gLastHitByType[gActiveBank] = 0; gUnknown_02024C4C[gActiveBank] = 0; gUnknown_02024C2C[gActiveBank] = 0; gUnknown_02024C5C[gActiveBank] = 0xFF; @@ -1796,8 +1796,8 @@ void UndoEffectsAfterFainting(void) gDisableStructs[gActiveBank].isFirstTurn= 2; gLastUsedMove[gActiveBank] = 0; - gMoveHitWith[gActiveBank] = 0; - gUnknown_02024C44[gActiveBank] = 0; + gLastLandedMoves[gActiveBank] = 0; + gLastHitByType[gActiveBank] = 0; gUnknown_02024C4C[gActiveBank] = 0; gUnknown_02024C2C[gActiveBank] = 0; gUnknown_02024C5C[gActiveBank] = 0xFF; @@ -4222,7 +4222,7 @@ void CheckFocusPunch_ClearVarsBeforeTurnStarts(void) } gDynamicBasePower = 0; - BATTLE_STRUCT->dynamicMoveType = 0; + gBattleStruct->dynamicMoveType = 0; gBattleMainFunc = RunTurnActionsFunctions; gBattleCommunication[3] = 0; gBattleCommunication[4] = 0; @@ -4235,7 +4235,7 @@ static void RunTurnActionsFunctions(void) if (gBattleOutcome != 0) gCurrentActionFuncId = 12; - BATTLE_STRUCT->unk16057 = gCurrentTurnActionNumber; + gBattleStruct->unk16057 = gCurrentTurnActionNumber; gUnknown_081FA640[gCurrentActionFuncId](); if (gCurrentTurnActionNumber >= gNoOfAllBanks) // everyone did their actions, turn finished @@ -4245,7 +4245,7 @@ static void RunTurnActionsFunctions(void) } else { - if (BATTLE_STRUCT->unk16057 != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank + if (gBattleStruct->unk16057 != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another bank { gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING); gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE); @@ -4270,7 +4270,7 @@ void HandleEndTurn_BattleWon(void) } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { - BattleMusicStop(); + BattleStopLowHpSound(); gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon; switch (gTrainers[gTrainerBattleOpponent].trainerClass) @@ -5378,8 +5378,8 @@ void HandleAction_ActionFinished(void) gBattleMoveDamage = 0; ewram16002 = 0; ewram160A1 = 0; - gMoveHitWith[gBankAttacker] = 0; - gUnknown_02024C44[gBankAttacker] = 0; + gLastLandedMoves[gBankAttacker] = 0; + gLastHitByType[gBankAttacker] = 0; eDynamicMoveType = 0; gDynamicBasePower = 0; ewram1600C = 0; diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 6b048f0ab..0c5f5927e 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -1,5 +1,7 @@ #include "global.h" #include "battle.h" +#include "battle_message.h" +#include "battle_string_ids.h" #include "battle_util.h" #include "constants/battle_move_effects.h" #include "constants/moves.h" @@ -22,22 +24,89 @@ #include "pokemon_summary_screen.h" #include "naming_screen.h" #include "ewram.h" +#include "util.h" + +// TODO: put this into battle_controllers.h + +#define RET_VALUE_LEVELLED_UP 11 + +enum +{ + CONTROLLER_GETMONDATA, + CONTROLLER_GETRAWMONDATA, + CONTROLLER_SETMONDATA, + CONTROLLER_SETRAWMONDATA, + CONTROLLER_LOADMONSPRITE, + CONTROLLER_SWITCHINANIM, + CONTROLLER_RETURNMONTOBALL, + CONTROLLER_DRAWTRAINERPIC, + CONTROLLER_TRAINERSLIDE, + CONTROLLER_TRAINERSLIDEBACK, + CONTROLLER_FAINTANIMATION, + CONTROLLER_PALETTEFADE, + CONTROLLER_SUCCESSBALLTHROWANIM, + CONTROLLER_BALLTHROWANIM, + CONTROLLER_PAUSE, + CONTROLLER_MOVEANIMATION, + CONTROLLER_PRINTSTRING, + CONTROLLER_PRINTSTRINGPLAYERONLY, + CONTROLLER_CHOOSEACTION, + CONTROLLER_UNKNOWNYESNOBOX, + CONTROLLER_CHOOSEMOVE, + CONTROLLER_OPENBAG, + CONTROLLER_CHOOSEPOKEMON, + CONTROLLER_23, + CONTROLLER_HEALTHBARUPDATE, + CONTROLLER_EXPUPDATE, + CONTROLLER_STATUSICONUPDATE, + CONTROLLER_STATUSANIMATION, + CONTROLLER_STATUSXOR, + CONTROLLER_DATATRANSFER, + CONTROLLER_DMA3TRANSFER, + CONTROLLER_31, + CONTROLLER_32, + CONTROLLER_TWORETURNVALUES, + CONTROLLER_CHOSENMONRETURNVALUE, + CONTROLLER_ONERETURNVALUE, + CONTROLLER_ONERETURNVALUE_DUPLICATE, + CONTROLLER_37, + CONTROLLER_38, + CONTROLLER_39, + CONTROLLER_40, + CONTROLLER_HITANIMATION, + CONTROLLER_42, + CONTROLLER_EFFECTIVENESSSOUND, + CONTROLLER_PLAYFANFAREORBGM, + CONTROLLER_FAINTINGCRY, + CONTROLLER_INTROSLIDE, + CONTROLLER_INTROTRAINERBALLTHROW, + CONTROLLER_DRAWPARTYSTATUSSUMMARY, + CONTROLLER_49, + CONTROLLER_50, + CONTROLLER_SPRITEINVISIBILITY, + CONTROLLER_BATTLEANIMATION, + CONTROLLER_LINKSTANDBYMSG, + CONTROLLER_RESETACTIONMOVESELECTION, + CONTROLLER_55, + /*new controllers should go here*/ + CONTROLLER_TERMINATOR_NOP, + CONTROLLER_CMDS_COUNT +}; //extern needed variables extern u8 gCritMultiplier; extern s32 gBattleMoveDamage; -extern u32 gStatuses3[4]; +extern u32 gStatuses3[BATTLE_BANKS_COUNT]; extern u16 gBattleTypeFlags; -extern const u32 gBitTable[]; extern const struct BaseStats gBaseStats[]; -extern struct BattleEnigmaBerry gEnigmaBerries[4]; -extern struct BattlePokemon gBattleMons[4]; +extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT]; +extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; extern u8 gActiveBank; extern u32 gBattleExecBuffer; extern u8 gNoOfAllBanks; -extern u16 gBattlePartyID[4]; -extern u8 gBanksByTurnOrder[4]; -extern u8 gActionsByTurnOrder[4]; +extern u16 gBattlePartyID[BATTLE_BANKS_COUNT]; +extern u8 gBanksByTurnOrder[BATTLE_BANKS_COUNT]; +extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT]; extern u16 gCurrentMove; extern u8 gLastUsedAbility; extern u16 gBattleWeather; @@ -57,23 +126,23 @@ extern u8 gBattleTerrain; extern u16 gTrainerBattleOpponent; extern u8 gBankAttacker; extern u8 gBankTarget; -extern u8* gBattlescriptCurrInstr; +extern const u8* gBattlescriptCurrInstr; extern u8 gCurrMovePos; extern u8 gCurrentActionFuncId; extern u32 gHitMarker; extern u8 gBattleMoveFlags; extern u8 gBattleCommunication[]; -extern u16 gMoveHitWith[4]; -extern u16 gUnknown_02024C44[4]; +extern u16 gLastLandedMoves[4]; +extern u16 gLastHitByType[4]; extern u8 gStringBank; extern u16 gDynamicBasePower; extern const u8 gTypeEffectiveness[]; extern u16 gLastUsedItem; extern u16 gBattleMovePower; -extern s32 gHP_dealt; -extern s32 gTakenDmg[4]; -extern u8 gTakenDmgBanks[4]; -extern const u16 gMissStrings[]; +extern s32 gHpDealt; +extern s32 gTakenDmg[BATTLE_BANKS_COUNT]; +extern u8 gTakenDmgBanks[BATTLE_BANKS_COUNT]; +extern const u16 gMissStringIds[]; extern u8 gSentPokesToOpponent[2]; extern u8 gBank1; extern u16 gExpShareExp; @@ -98,28 +167,40 @@ extern u16 gUnknown_02024C4C[4]; //last used moves by banks, another one extern u8 gCurrentTurnActionNumber; extern u16 gTrappingMoves[]; +extern u8 BattleScript_MoveEffectSleep[]; +extern u8 BattleScript_MoveEffectPoison[]; +extern u8 BattleScript_MoveEffectBurn[]; +extern u8 BattleScript_MoveEffectFreeze[]; +extern u8 BattleScript_MoveEffectParalysis[]; +extern u8 BattleScript_MoveEffectToxic[]; +extern u8 BattleScript_MoveEffectConfusion[]; +extern u8 BattleScript_MoveEffectUproar[]; +extern u8 BattleScript_MoveEffectWrap[]; +extern u8 BattleScript_MoveEffectPayDay[]; +extern u8 BattleScript_MoveEffectRecoil33[]; + //extern functions u8 AtkCanceller_UnableToUseMove(void); void PressurePPLose(u8 bank_atk, u8 bank_def, u16 move); void CancelMultiTurnMoves(u8 bank); -void BattleScriptPush(u8* BS_ptr); +void BattleScriptPush(const u8* BS_ptr); void BattleScriptPushCursor(void); void RecordAbilityBattle(u8 bank, u8 ability); void RecordItemBattle(u8 bank, u8 holdEffect); static bool8 IsTwoTurnsMove(u16 move); -static void DestinyBondFlagUpdate(void); -static void b_wonderguard_and_levitate(void); +static void TrySetDestinyBondToHappen(void); +static void CheckWonderGuardAndLevitate(void); u8 GetBankIdentity(u8 bank); u8 GetBankSide(u8 bank); u8 GetBattleBank(u8 bankValue); s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 a4, u16 powerOverride, u8 typeOverride, u8 bank_atk, u8 bank_def); static u8 AttacksThisTurn(u8 bank, u16 move); //Note: returns 1 if it's a charging turn, otherwise 2 void UndoEffectsAfterFainting(void); -void BattleMusicStop(void); +void BattleStopLowHpSound(void); void PlayBGM(u16 songID); void MonGainEVs(struct Pokemon*, u16 defeatedSpecies); extern u8 gBattleBufferB[4][0x200]; -void sub_80324F8(struct Pokemon*, u8 bank); +void HandleLowHpMusicChange(struct Pokemon*, u8 bank); void AdjustFriendship(struct Pokemon*, u8 value); bool8 IsTradedMon(struct Pokemon*); void BattleScriptPop(void); @@ -225,7 +306,7 @@ extern u8 BattleScript_SelectingImprisionedMoveInPalace[]; #define BS2ScriptRead16(ptr) ((ptr)[0] + ((ptr)[1] << 8)) #define BS2ScriptReadPtr(ptr) ((void *)BS2ScriptRead32(ptr)) -#define TargetProtectAffected ((gProtectStructs[gBankTarget].protected && gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) +#define TARGET_PROTECT_AFFECTED ((gProtectStructs[gBankTarget].protected && gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) //array entries for battle communication #define MOVE_EFFECT_BYTE 0x3 @@ -306,7 +387,7 @@ static void atk1F_jumpifsideaffecting(void); static void atk20_jumpifstat(void); static void atk21_jumpifstatus3condition(void); static void atk22_jumpiftype(void); -static void atk23_getexp(void); +void atk23_getexp(void); static void atk24(void); static void atk25_movevaluescleanup(void); static void atk26_setmultihit(void); @@ -521,7 +602,7 @@ static void atkF5_removeattackerstatus1(void); static void atkF6_finishaction(void); static void atkF7_finishturn(void); -const BattleCmdFunc gBattleScriptingCommandsTable[] = +void (* const gBattleScriptingCommandsTable[])(void) = { atk00_attackcanceler, atk01_accuracycheck, @@ -773,13 +854,13 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] = atkF7_finishturn, }; -struct statFractions +struct StatFractions { u8 dividend; u8 divisor; }; -static const struct statFractions gAccuracyStageRatios[] = +static const struct StatFractions gAccuracyStageRatios[] = { { 33, 100}, // -6 { 36, 100}, // -5 @@ -796,25 +877,25 @@ static const struct statFractions gAccuracyStageRatios[] = { 3, 1}, // +6 }; -//The chance is 1/N for each stage. -static const u16 gCriticalHitChance[] = {16, 8, 4, 3, 2}; +// The chance is 1/N for each stage. +static const u16 sCriticalHitChance[] = {16, 8, 4, 3, 2}; -static const u32 gStatusFlagsForMoveEffects[] = +static const u32 sStatusFlagsForMoveEffects[] = { 0x00000000, - 0x00000007, - 0x00000008, - 0x00000010, - 0x00000020, - 0x00000040, - 0x00000080, - 0x00000007, - 0x00000008, + STATUS_SLEEP, + STATUS_POISON, + STATUS_BURN, + STATUS_FREEZE, + STATUS_PARALYSIS, + STATUS_TOXIC_POISON, + STATUS2_CONFUSION, + STATUS2_FLINCHED, 0x00000000, - 0x00000070, + STATUS2_UPROAR, 0x00000000, - 0x00001000, - 0x0000E000, + STATUS2_MULTIPLETURNS, + STATUS2_WRAPPED, 0x00000000, 0x00000000, 0x00000000, @@ -830,11 +911,11 @@ static const u32 gStatusFlagsForMoveEffects[] = 0x00000000, 0x00000000, 0x00000000, - 0x00400000, + STATUS2_RECHARGE, 0x00000000, 0x00000000, - 0x04000000, - 0x08000000, + STATUS2_ESCAPE_PREVENTION, + STATUS2_NIGHTMARE, 0x00000000, 0x00000000, 0x00000000, @@ -854,7 +935,7 @@ static const u32 gStatusFlagsForMoveEffects[] = 0x00000000, 0x00000000, 0x00000000, - 0x00000C00, + STATUS2_LOCK_CONFUSE, 0x00000000, 0x00000000, 0x00000000, @@ -863,18 +944,6 @@ static const u32 gStatusFlagsForMoveEffects[] = 0x00000000 }; -extern u8 BattleScript_MoveEffectSleep[]; -extern u8 BattleScript_MoveEffectPoison[]; -extern u8 BattleScript_MoveEffectBurn[]; -extern u8 BattleScript_MoveEffectFreeze[]; -extern u8 BattleScript_MoveEffectParalysis[]; -extern u8 BattleScript_MoveEffectToxic[]; -extern u8 BattleScript_MoveEffectConfusion[]; -extern u8 BattleScript_MoveEffectUproar[]; -extern u8 BattleScript_MoveEffectWrap[]; -extern u8 BattleScript_MoveEffectPayDay[]; -extern u8 BattleScript_MoveEffectRecoil33[]; - u8* const gMoveEffectBS_Ptrs[] = { BattleScript_MoveEffectSleep, @@ -920,17 +989,25 @@ u8* const gMoveEffectBS_Ptrs[] = const u8 sUnreferencedBitMask1[] = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; -const u8 gLevelUpStatBoxStats[] = {MON_DATA_MAX_HP, MON_DATA_SPATK, MON_DATA_ATK, MON_DATA_SPDEF, MON_DATA_DEF, MON_DATA_SPEED}; +const u8 gLevelUpStatBoxStats[] = +{ + MON_DATA_MAX_HP, MON_DATA_SPATK, MON_DATA_ATK, + MON_DATA_SPDEF, MON_DATA_DEF, MON_DATA_SPEED +}; static const u16 sProtectSuccessRates[] = {0xFFFF, 0x7FFF, 0x3FFF, 0x1FFF}; -static const u16 sUnknown_081FACFE[] = //banned moves to copy +#define MIMIC_FORBIDDEN_END 0xFFFE +#define METRONOME_FORBIDDEN_END 0xFFFF +#define ASSIST_FORBIDDEN_END 0xFFFF + +static const u16 sMovesForbiddenToCopy[] = { MOVE_METRONOME, MOVE_STRUGGLE, MOVE_SKETCH, MOVE_MIMIC, - 0xFFFE, + MIMIC_FORBIDDEN_END, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_PROTECT, @@ -945,10 +1022,10 @@ static const u16 sUnknown_081FACFE[] = //banned moves to copy MOVE_COVET, MOVE_TRICK, MOVE_FOCUS_PUNCH, - 0xFFFF + METRONOME_FORBIDDEN_END }; -static const u8 sUnknown_081FAD26[] = //reversal+flail HP thresholds to power +static const u8 sFlailHpScaleToPowerTable[] = //reversal+flail HP thresholds to power { 1, 200, 4, 150, @@ -972,16 +1049,16 @@ static const u16 sNaturePowerMoves[] = MOVE_SWIFT }; -//weight-based damage table for Low Kick -//format: min. weight (hectograms), base power -static const u16 sWeightDamage[] = +// weight-based damage table for Low Kick +// format: min. weight (hectograms), base power +static const u16 sWeightToDamageTable[] = { 100, 20, 250, 40, 500, 60, 1000, 80, 2000, 100, - -1, -1 + 0xFFFF, 0xFFFF }; static const u16 sPickupItems[] = @@ -1006,23 +1083,24 @@ static const u8 sTerrainToType[] = TYPE_WATER, // underwater TYPE_WATER, // water TYPE_WATER, // pond water - TYPE_ROCK , // rock - TYPE_ROCK , // cave + TYPE_ROCK, // rock + TYPE_ROCK, // cave TYPE_NORMAL, // building TYPE_NORMAL, // plain }; static const u8 sBallCatchBonuses[] = { - 20, 15, 10, 15 //Ultra, Great, Poke, Safari + 20, 15, 10, 15 // Ultra, Great, Poke, Safari }; static void atk00_attackcanceler(void) { - int i; - if (gBattleOutcome) + s32 i; + + if (gBattleOutcome != 0) { - gCurrentActionFuncId = 0xC; + gCurrentActionFuncId = ACTION_FINISHED; return; } if (gBattleMons[gBankAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING)) @@ -1033,7 +1111,7 @@ static void atk00_attackcanceler(void) } if (AtkCanceller_UnableToUseMove()) return; - if (AbilityBattleEffects(2, gBankTarget, 0, 0, 0)) + if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBankTarget, 0, 0, 0)) return; if (!gBattleMons[gBankAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200) && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)) @@ -1042,22 +1120,27 @@ static void atk00_attackcanceler(void) gBattleMoveFlags |= MOVESTATUS_MISSED; return; } + gHitMarker &= ~(HITMARKER_x800000); + if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)) { - u8 disobedient = IsMonDisobedient(); - asm("":::"r0"); //It's impossible to match - asm("":::"r1"); - if ((disobedient)) + i = IsMonDisobedient(); // why use the 'i' variable...? + switch (i) { - if (disobedient == 2) - gHitMarker |= HITMARKER_OBEYS; - else - gBattleMoveFlags |= MOVESTATUS_MISSED; + case 0: + break; + case 2: + gHitMarker |= HITMARKER_OBEYS; + return; + default: + gBattleMoveFlags |= MOVESTATUS_MISSED; return; } } + gHitMarker |= HITMARKER_OBEYS; + if (gProtectStructs[gBankTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED) { PressurePPLose(gBankAttacker, gBankTarget, MOVE_MAGIC_COAT); @@ -1066,18 +1149,20 @@ static void atk00_attackcanceler(void) gBattlescriptCurrInstr = BattleScript_MagicCoatBounce; return; } + for (i = 0; i < gNoOfAllBanks; i++) { if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) { PressurePPLose(gBankAttacker, gBanksByTurnOrder[i], MOVE_SNATCH); gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0; - BATTLE_STRUCT->scriptingActive = gBanksByTurnOrder[i]; + gBattleStruct->scriptingActive = gBanksByTurnOrder[i]; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SnatchedMove; return; } } + if (gSpecialStatuses[gBankTarget].lightningRodRedirected) { gSpecialStatuses[gBankTarget].lightningRodRedirected = 0; @@ -1086,14 +1171,14 @@ static void atk00_attackcanceler(void) gBattlescriptCurrInstr = BattleScript_TookAttack; RecordAbilityBattle(gBankTarget, gLastUsedAbility); } - else if (TargetProtectAffected + else if (TARGET_PROTECT_AFFECTED && (gCurrentMove != MOVE_CURSE || (gBattleMons[gBankAttacker].type1 == TYPE_GHOST || gBattleMons[gBankAttacker].type2 == TYPE_GHOST)) && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS)))) { CancelMultiTurnMoves(gBankAttacker); gBattleMoveFlags |= MOVESTATUS_MISSED; - gMoveHitWith[gBankTarget] = 0; - gUnknown_02024C44[gBankTarget] = 0; + gLastLandedMoves[gBankTarget] = 0; + gLastHitByType[gBankTarget] = 0; gBattleCommunication[6] = 1; gBattlescriptCurrInstr++; } @@ -1105,25 +1190,25 @@ static void atk00_attackcanceler(void) static void JumpIfMoveFailed(u8 adder, u16 move) { - void* to_store = gBattlescriptCurrInstr + adder; + const u8 *BS_ptr = gBattlescriptCurrInstr + adder; if (gBattleMoveFlags & MOVESTATUS_NOEFFECT) { - gMoveHitWith[gBankTarget] = 0; - gUnknown_02024C44[gBankTarget] = 0; - to_store = T1_READ_PTR(gBattlescriptCurrInstr + 1); + gLastLandedMoves[gBankTarget] = 0; + gLastHitByType[gBankTarget] = 0; + BS_ptr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } else { - DestinyBondFlagUpdate(); - if (AbilityBattleEffects(3, gBankTarget, 0, 0, move)) + TrySetDestinyBondToHappen(); + if (AbilityBattleEffects(ABILITYEFFECT_ABSORBING, gBankTarget, 0, 0, move)) return; } - gBattlescriptCurrInstr = to_store; + gBattlescriptCurrInstr = BS_ptr; } static void atk40_jumpifaffectedbyprotect(void) { - if (TargetProtectAffected) + if (TARGET_PROTECT_AFFECTED) { gBattleMoveFlags |= MOVESTATUS_MISSED; JumpIfMoveFailed(5, 0); @@ -1137,13 +1222,13 @@ static void atk40_jumpifaffectedbyprotect(void) static bool8 JumpIfMoveAffectedByProtect(u16 move) { - bool8 affected = 0; - if (TargetProtectAffected) + bool8 affected = FALSE; + if (TARGET_PROTECT_AFFECTED) { gBattleMoveFlags |= MOVESTATUS_MISSED; JumpIfMoveFailed(7, move); gBattleCommunication[6] = 1; - affected = 1; + affected = TRUE; } return affected; } @@ -1162,6 +1247,7 @@ static bool8 AccuracyCalcHelper(u16 move) JumpIfMoveFailed(7, move); return TRUE; } + gHitMarker &= ~HITMARKER_IGNORE_ON_AIR; if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBankTarget] & STATUS3_UNDERGROUND) @@ -1170,6 +1256,7 @@ static bool8 AccuracyCalcHelper(u16 move) JumpIfMoveFailed(7, move); return TRUE; } + gHitMarker &= ~HITMARKER_IGNORE_UNDERGROUND; if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBankTarget] & STATUS3_UNDERWATER) @@ -1178,6 +1265,7 @@ static bool8 AccuracyCalcHelper(u16 move) JumpIfMoveFailed(7, move); return TRUE; } + gHitMarker &= ~HITMARKER_IGNORE_UNDERWATER; if ((WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY) && gBattleMoves[move].effect == EFFECT_THUNDER) @@ -1186,12 +1274,14 @@ static bool8 AccuracyCalcHelper(u16 move) JumpIfMoveFailed(7, move); return TRUE; } + return FALSE; } static void atk01_accuracycheck(void) { u16 move = T2_READ_16(gBattlescriptCurrInstr + 5); + if (move == 0xFFFE || move == 0xFFFF) { if (gStatuses3[gBankTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBankTarget].bankWithSureHit == gBankAttacker) @@ -1203,13 +1293,14 @@ static void atk01_accuracycheck(void) } else { - u8 type; s8 buff; u8 MoveAcc; u16 calc; u8 hold_effect; u8 quality; - if (move == 0) {move = gCurrentMove;} + u8 type, moveAcc, holdEffect, quality; + s8 buff; + u16 calc; - if (BATTLE_STRUCT->dynamicMoveType) - type = BATTLE_STRUCT->dynamicMoveType & 0x3F; - else - type = gBattleMoves[move].type; + if (move == 0) + move = gCurrentMove; + + GET_MOVE_TYPE(move, type); if (JumpIfMoveAffectedByProtect(move)) return; @@ -1227,47 +1318,52 @@ static void atk01_accuracycheck(void) buff = acc + 6 - gBattleMons[gBankTarget].statStages[STAT_STAGE_EVASION]; } - if (buff < 0) {buff = 0;} - if (buff > 0xC) {buff = 0xC;} + if (buff < 0) + buff = 0; + if (buff > 0xC) + buff = 0xC; - MoveAcc = gBattleMoves[move].accuracy; - //check Thunder on sunny weather + moveAcc = gBattleMoves[move].accuracy; + // check Thunder on sunny weather if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY && gBattleMoves[move].effect == EFFECT_THUNDER) - MoveAcc = 50; + moveAcc = 50; - calc = gAccuracyStageRatios[buff].dividend * MoveAcc; + calc = gAccuracyStageRatios[buff].dividend * moveAcc; calc /= gAccuracyStageRatios[buff].divisor; if (gBattleMons[gBankAttacker].ability == ABILITY_COMPOUND_EYES) - calc = (calc * 130) / 100; //1.3 compound eyes boost + calc = (calc * 130) / 100; // 1.3 compound eyes boost if (WEATHER_HAS_EFFECT && gBattleMons[gBankTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY) - calc = (calc * 80) / 100; //1.2 sand veil loss; + calc = (calc * 80) / 100; // 1.2 sand veil loss; if (gBattleMons[gBankAttacker].ability == ABILITY_HUSTLE && type < 9) - calc = (calc * 80) / 100; //1.2 hustle loss; + calc = (calc * 80) / 100; // 1.2 hustle loss; if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY) - hold_effect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam; + { + holdEffect = gEnigmaBerries[gBankTarget].holdEffect; + quality = gEnigmaBerries[gBankTarget].holdEffectParam; + } else { - hold_effect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item); + holdEffect = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item); quality = ItemId_GetHoldEffectParam(gBattleMons[gBankTarget].item); } gStringBank = gBankTarget; - if (hold_effect == HOLD_EFFECT_EVASION_UP) + if (holdEffect == HOLD_EFFECT_EVASION_UP) calc = (calc * (100 - quality)) / 100; - //final calculation + // final calculation if ((Random() % 100 + 1) > calc) { gBattleMoveFlags |= MOVESTATUS_MISSED; - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && (gBattleMoves[move].target == 0x8 || gBattleMoves[move].target == 0x20)) + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && + (gBattleMoves[move].target == 0x8 || gBattleMoves[move].target == 0x20)) gBattleCommunication[6] = 2; else gBattleCommunication[6] = 0; - b_wonderguard_and_levitate(); - + CheckWonderGuardAndLevitate(); } JumpIfMoveFailed(7, move); } @@ -1288,31 +1384,35 @@ static void atk02_attackstring(void) static void atk03_ppreduce(void) { - int to_deduct = 1; + s32 ppToDeduct = 1; + if (gBattleExecBuffer) return; + if (!gSpecialStatuses[gBankAttacker].flag20) { switch (gBattleMoves[gCurrentMove].target) { case TARGET_FOES_AND_ALLY: - to_deduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBankAttacker, ABILITY_PRESSURE, 0, 0); + ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBankAttacker, ABILITY_PRESSURE, 0, 0); break; case TARGET_BOTH: case TARGET_OPPONENTS_FIELD: - to_deduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBankAttacker, ABILITY_PRESSURE, 0, 0); + ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIZE, gBankAttacker, ABILITY_PRESSURE, 0, 0); break; default: if (gBankAttacker != gBankTarget && gBattleMons[gBankTarget].ability == ABILITY_PRESSURE) - to_deduct++; + ppToDeduct++; break; } } + if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBankAttacker].pp[gCurrMovePos]) { gProtectStructs[gBankAttacker].notFirstStrike = 1; - if (gBattleMons[gBankAttacker].pp[gCurrMovePos] > to_deduct) - gBattleMons[gBankAttacker].pp[gCurrMovePos] -= to_deduct; + + if (gBattleMons[gBankAttacker].pp[gCurrMovePos] > ppToDeduct) + gBattleMons[gBankAttacker].pp[gCurrMovePos] -= ppToDeduct; else gBattleMons[gBankAttacker].pp[gCurrMovePos] = 0; @@ -1324,56 +1424,45 @@ static void atk03_ppreduce(void) MarkBufferBankForExecution(gBankAttacker); } } + gHitMarker &= ~(HITMARKER_NO_PPDEDUCT); gBattlescriptCurrInstr++; } static void atk04_critcalc(void) { - u8 hold_effect; u16 item; u16 crit_chance; int adderv3, adderv5, adderv6, adderv7, adderv8, adderv9, adderv10, adderv11; u16 adderv12; + u8 holdEffect; + u16 item, critChance; + item = gBattleMons[gBankAttacker].item; + if (item == ITEM_ENIGMA_BERRY) - hold_effect = gEnigmaBerries[gBankAttacker].holdEffect; + holdEffect = gEnigmaBerries[gBankAttacker].holdEffect; else - hold_effect = ItemId_GetHoldEffect(item); + holdEffect = ItemId_GetHoldEffect(item); gStringBank = gBankAttacker; - if (gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY) - adderv3 = 2; - else - adderv3 = 0; - - if (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL) {adderv3++;} - adderv5 = adderv3; - if (gBattleMoves[gCurrentMove].effect == EFFECT_SKY_ATTACK) {adderv5 = adderv3 + 1;} - - if (gBattleMoves[gCurrentMove].effect == EFFECT_BLAZE_KICK) {adderv5++;} - adderv6 = adderv5; - if (gBattleMoves[gCurrentMove].effect == EFFECT_POISON_TAIL) {adderv6 = adderv5 + 1;} - - adderv7 = 0; - if (hold_effect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBankAttacker].species == SPECIES_CHANSEY) {adderv7 = 1;} - adderv8 = 2 * adderv7; - adderv9 = 0; - if (hold_effect == HOLD_EFFECT_STICK && gBattleMons[gBankAttacker].species == SPECIES_FARFETCHD) {adderv9 = 1;} - adderv11 = 2 * adderv9; - if (hold_effect == HOLD_EFFECT_SCOPE_LENS) - {adderv10 = 1 + adderv6 + adderv8; adderv12 = adderv10 + adderv11;} - else - {adderv10 = adderv6 + adderv8; adderv12 = adderv10 + adderv11;} - - crit_chance = adderv12; + critChance = 2 * ((gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0) + + (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL) + + (gBattleMoves[gCurrentMove].effect == EFFECT_SKY_ATTACK) + + (gBattleMoves[gCurrentMove].effect == EFFECT_BLAZE_KICK) + + (gBattleMoves[gCurrentMove].effect == EFFECT_POISON_TAIL) + + (holdEffect == HOLD_EFFECT_SCOPE_LENS) + + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBankAttacker].species == SPECIES_CHANSEY) + + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBankAttacker].species == SPECIES_FARFETCHD); - if (crit_chance > 4) {crit_chance = 4;} + if (critChance > 4) + critChance = 4; if ((gBattleMons[gBankTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBankTarget].ability != ABILITY_SHELL_ARMOR) && !(gStatuses3[gBankAttacker] & STATUS3_CANT_SCORE_A_CRIT) && !(gBattleTypeFlags & (BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FIRST_BATTLE)) - && !(Random() % gCriticalHitChance[crit_chance])) + && !(Random() % sCriticalHitChance[critChance])) gCritMultiplier = 2; else gCritMultiplier = 1; + gBattlescriptCurrInstr++; } @@ -1382,8 +1471,8 @@ static void atk05_damagecalc(void) u16 side_hword = gSideAffecting[GetBankIdentity(gBankTarget) & 1]; gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove, side_hword, gDynamicBasePower, - BATTLE_STRUCT->dynamicMoveType, gBankAttacker, gBankTarget); - gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * BATTLE_STRUCT->dmgMultiplier; + gBattleStruct->dynamicMoveType, gBankAttacker, gBankTarget); + gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleStruct->dmgMultiplier; if (gStatuses3[gBankAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) gBattleMoveDamage *= 2; @@ -1398,9 +1487,9 @@ void AI_CalcDmg(u8 BankAtk, u8 BankDef) u16 side_hword = gSideAffecting[GetBankIdentity(BankDef) & 1]; gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[BankAtk], &gBattleMons[BankDef], gCurrentMove, side_hword, gDynamicBasePower, - BATTLE_STRUCT->dynamicMoveType, BankAtk, BankDef); + gBattleStruct->dynamicMoveType, BankAtk, BankDef); gDynamicBasePower = 0; - gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * BATTLE_STRUCT->dmgMultiplier; + gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleStruct->dmgMultiplier; if (gStatuses3[BankAtk] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) gBattleMoveDamage *= 2; @@ -1448,8 +1537,8 @@ static void atk06_typecalc(void) u8 move_type; if (gCurrentMove != MOVE_STRUGGLE) { - if (BATTLE_STRUCT->dynamicMoveType) - move_type = BATTLE_STRUCT->dynamicMoveType & 0x3F; + if (gBattleStruct->dynamicMoveType) + move_type = gBattleStruct->dynamicMoveType & 0x3F; else move_type = gBattleMoves[gCurrentMove].type; @@ -1464,8 +1553,8 @@ static void atk06_typecalc(void) { gLastUsedAbility = gBattleMons[gBankTarget].ability; gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED); - gMoveHitWith[gBankTarget] = 0; - gUnknown_02024C44[gBankTarget] = 0; + gLastLandedMoves[gBankTarget] = 0; + gLastHitByType[gBankTarget] = 0; gBattleCommunication[6] = move_type; RecordAbilityBattle(gBankTarget, gLastUsedAbility); } @@ -1501,8 +1590,8 @@ static void atk06_typecalc(void) { gLastUsedAbility = ABILITY_WONDER_GUARD; gBattleMoveFlags |= MOVESTATUS_MISSED; - gMoveHitWith[gBankTarget] = 0; - gUnknown_02024C44[gBankTarget] = 0; + gLastLandedMoves[gBankTarget] = 0; + gLastHitByType[gBankTarget] = 0; gBattleCommunication[6] = 3; RecordAbilityBattle(gBankTarget, gLastUsedAbility); } @@ -1511,7 +1600,7 @@ static void atk06_typecalc(void) } gBattlescriptCurrInstr++; } -static void b_wonderguard_and_levitate(void) +static void CheckWonderGuardAndLevitate(void) { u8 flags = 0; int i = 0; @@ -1520,8 +1609,8 @@ static void b_wonderguard_and_levitate(void) if (gCurrentMove == MOVE_STRUGGLE || !gBattleMoves[gCurrentMove].power) return; - if (BATTLE_STRUCT->dynamicMoveType) - move_type = BATTLE_STRUCT->dynamicMoveType & 0x3F; + if (gBattleStruct->dynamicMoveType) + move_type = gBattleStruct->dynamicMoveType & 0x3F; else move_type = gBattleMoves[gCurrentMove].type; @@ -1841,12 +1930,12 @@ static void atk09_attackanimation(void) { BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_Pausex20; - BATTLE_STRUCT->animTurn += 1; - BATTLE_STRUCT->animTargetsHit += 1; + gBattleStruct->animTurn += 1; + gBattleStruct->animTargetsHit += 1; } else { - if ((gBattleMoves[gCurrentMove].target & TARGET_BOTH || gBattleMoves[gCurrentMove].target & TARGET_FOES_AND_ALLY || gBattleMoves[gCurrentMove].target & TARGET_DEPENDS) && BATTLE_STRUCT->animTargetsHit) + if ((gBattleMoves[gCurrentMove].target & TARGET_BOTH || gBattleMoves[gCurrentMove].target & TARGET_FOES_AND_ALLY || gBattleMoves[gCurrentMove].target & TARGET_DEPENDS) && gBattleStruct->animTargetsHit) { gBattlescriptCurrInstr++; return; @@ -1855,9 +1944,9 @@ static void atk09_attackanimation(void) { gActiveBank = gBankAttacker; - EmitMoveAnimation(0, gCurrentMove, BATTLE_STRUCT->animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBankAttacker].friendship, &gDisableStructs[gBankAttacker]); - BATTLE_STRUCT->animTurn += 1; - BATTLE_STRUCT->animTargetsHit += 1; + EmitMoveAnimation(0, gCurrentMove, gBattleStruct->animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBankAttacker].friendship, &gDisableStructs[gBankAttacker]); + gBattleStruct->animTurn += 1; + gBattleStruct->animTargetsHit += 1; MarkBufferBankForExecution(gBankAttacker); gBattlescriptCurrInstr++; } @@ -1879,49 +1968,60 @@ static void atk0B_healthbarupdate(void) { if (gBattleExecBuffer) return; - if (gBattleMoveFlags & MOVESTATUS_NOEFFECT) - goto END; - gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); - - if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)) { - PrepareStringBattle(0x80, gActiveBank); - goto END; - } + gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]); - EmitHealthBarUpdate(0, gBattleMoveDamage); - MarkBufferBankForExecution(gActiveBank); + if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) + { + PrepareStringBattle(0x80, gActiveBank); + } + else + { + // Emerald + /* + s16 healthValue; - if (!GetBankSide(gActiveBank) && gBattleMoveDamage > 0) - gBattleResults.unk5_0 = 1; + s32 currDmg = gBattleMoveDamage; + s32 maxPossibleDmgValue = 10000; // not present in R/S, ensures that huge damage values don't change sign - END: - gBattlescriptCurrInstr += 2; + if (currDmg <= maxPossibleDmgValue) + healthValue = currDmg; + else + healthValue = maxPossibleDmgValue; + + EmitHealthBarUpdate(0, healthValue); + */ + + EmitHealthBarUpdate(0, gBattleMoveDamage); + MarkBufferBankForExecution(gActiveBank); + + if (GetBankSide(gActiveBank) == SIDE_PLAYER && gBattleMoveDamage > 0) + gBattleResults.unk5_0 = 1; + } + } + + gBattlescriptCurrInstr += 2; } static void atk0C_datahpupdate(void) { - register u32 move_type asm("r6"); //no idea how to match it otherwise - u8 dynamic_move_type; + u32 moveType; if (gBattleExecBuffer) return; - dynamic_move_type = BATTLE_STRUCT->dynamicMoveType; - if (dynamic_move_type && !(dynamic_move_type & 0x40)) - { - move_type = 0x3F; - move_type &= dynamic_move_type; - } + if (gBattleStruct->dynamicMoveType == 0) + moveType = gBattleMoves[gCurrentMove].type; + else if (!(gBattleStruct->dynamicMoveType & 0x40)) + moveType = gBattleStruct->dynamicMoveType & 0x3F; else - { - move_type = gBattleMoves[gCurrentMove].type; - } + moveType = gBattleMoves[gCurrentMove].type; if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT)) { - gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]); if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) { if (gDisableStructs[gActiveBank].substituteHP >= gBattleMoveDamage) @@ -1929,16 +2029,16 @@ static void atk0C_datahpupdate(void) if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0) gSpecialStatuses[gActiveBank].moveturnLostHP = gBattleMoveDamage; gDisableStructs[gActiveBank].substituteHP -= gBattleMoveDamage; - gHP_dealt = gBattleMoveDamage; + gHpDealt = gBattleMoveDamage; } else { if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0) gSpecialStatuses[gActiveBank].moveturnLostHP = gDisableStructs[gActiveBank].substituteHP; - gHP_dealt = gDisableStructs[gActiveBank].substituteHP; + gHpDealt = gDisableStructs[gActiveBank].substituteHP; gDisableStructs[gActiveBank].substituteHP = 0; } - //check substitute fading + // check substitute fading if (gDisableStructs[gActiveBank].substituteHP == 0) { gBattlescriptCurrInstr += 2; @@ -1950,14 +2050,14 @@ static void atk0C_datahpupdate(void) else { gHitMarker &= ~(HITMARKER_IGNORE_SUBSTITUTE); - if (gBattleMoveDamage < 0) //hp goes up + if (gBattleMoveDamage < 0) // hp goes up { gBattleMons[gActiveBank].hp -= gBattleMoveDamage; if (gBattleMons[gActiveBank].hp > gBattleMons[gActiveBank].maxHP) gBattleMons[gActiveBank].hp = gBattleMons[gActiveBank].maxHP; } - else //hp goes down + else // hp goes down { if (gHitMarker & HITMARKER_x20) { @@ -1966,7 +2066,7 @@ static void atk0C_datahpupdate(void) else { gTakenDmg[gActiveBank] += gBattleMoveDamage; - if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0) + if (gBattlescriptCurrInstr[1] == BS_GET_TARGET) gTakenDmgBanks[gActiveBank] = gBankAttacker; else gTakenDmgBanks[gActiveBank] = gBankTarget; @@ -1975,22 +2075,22 @@ static void atk0C_datahpupdate(void) if (gBattleMons[gActiveBank].hp > gBattleMoveDamage) { gBattleMons[gActiveBank].hp -= gBattleMoveDamage; - gHP_dealt = gBattleMoveDamage; + gHpDealt = gBattleMoveDamage; } else { - gHP_dealt = gBattleMons[gActiveBank].hp; + gHpDealt = gBattleMons[gActiveBank].hp; gBattleMons[gActiveBank].hp = 0; } if (!gSpecialStatuses[gActiveBank].moveturnLostHP && !(gHitMarker & HITMARKER_x100000)) - gSpecialStatuses[gActiveBank].moveturnLostHP = gHP_dealt; + gSpecialStatuses[gActiveBank].moveturnLostHP = gHpDealt; - if (move_type <= 8 && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) + if (moveType <= 8 && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT) { - gProtectStructs[gActiveBank].physicalDmg = gHP_dealt; - gSpecialStatuses[gActiveBank].moveturnLostHP_physical = gHP_dealt; - if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0) + gProtectStructs[gActiveBank].physicalDmg = gHpDealt; + gSpecialStatuses[gActiveBank].moveturnLostHP_physical = gHpDealt; + if (gBattlescriptCurrInstr[1] == BS_GET_TARGET) { gProtectStructs[gActiveBank].physicalBank = gBankAttacker; gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankAttacker; @@ -2001,11 +2101,11 @@ static void atk0C_datahpupdate(void) gSpecialStatuses[gActiveBank].moveturnPhysicalBank = gBankTarget; } } - else if (move_type > 8 && !(gHitMarker & HITMARKER_x100000)) + else if (moveType > 8 && !(gHitMarker & HITMARKER_x100000)) { - gProtectStructs[gActiveBank].specialDmg = gHP_dealt; - gSpecialStatuses[gActiveBank].moveturnLostHP_special = gHP_dealt; - if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0) + gProtectStructs[gActiveBank].specialDmg = gHpDealt; + gSpecialStatuses[gActiveBank].moveturnLostHP_special = gHpDealt; + if (gBattlescriptCurrInstr[1] == BS_GET_TARGET) { gProtectStructs[gActiveBank].specialBank = gBankAttacker; gSpecialStatuses[gActiveBank].moveturnSpecialBank = gBankAttacker; @@ -2024,7 +2124,7 @@ static void atk0C_datahpupdate(void) } else { - gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); + gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]); if (gSpecialStatuses[gActiveBank].moveturnLostHP == 0) gSpecialStatuses[gActiveBank].moveturnLostHP = 0xFFFF; } @@ -2048,6 +2148,7 @@ static void atk0E_effectivenesssound(void) { if (gBattleExecBuffer) return; + gActiveBank = gBankTarget; if (!(gBattleMoveFlags & MOVESTATUS_MISSED)) { @@ -2092,37 +2193,39 @@ static void atk0E_effectivenesssound(void) static void atk0F_resultmessage(void) { - u16 stringID = 0; + u32 stringId = 0; if (gBattleExecBuffer) return; if (gBattleMoveFlags & MOVESTATUS_MISSED && (!(gBattleMoveFlags & MOVESTATUS_NOTAFFECTED) || gBattleCommunication[6] > 2)) { - stringID = gMissStrings[gBattleCommunication[6]]; + stringId = gMissStringIds[gBattleCommunication[6]]; gBattleCommunication[MSG_DISPLAY] = 1; } else { gBattleCommunication[MSG_DISPLAY] = 1; - switch (gBattleMoveFlags & 0xFE) + switch (gBattleMoveFlags & (u8)(~(MOVESTATUS_MISSED))) { case MOVESTATUS_SUPEREFFECTIVE: - stringID = 0xDE; + stringId = STRINGID_SUPEREFFECTIVE; break; case MOVESTATUS_NOTVERYEFFECTIVE: - stringID = 0xDD; + stringId = STRINGID_NOTVERYEFFECTIVE; break; case MOVESTATUS_ONEHITKO: - stringID = 0xDA; + stringId = STRINGID_ONEHITKO; break; case MOVESTATUS_ENDURED: - stringID = 0x99; + stringId = STRINGID_PKMNENDUREDHIT; break; case MOVESTATUS_FAILED: - goto FAILED; + stringId = STRINGID_BUTITFAILED; + break; case MOVESTATUS_NOTAFFECTED: - goto NOTAFFECTED; + stringId = STRINGID_ITDOESNTAFFECT; + break; case MOVESTATUS_HUNGON: gLastUsedItem = gBattleMons[gBankTarget].item; gStringBank = gBankTarget; @@ -2132,8 +2235,9 @@ static void atk0F_resultmessage(void) return; default: if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED) - NOTAFFECTED: - stringID = 0x1B; + { + stringId = STRINGID_ITDOESNTAFFECT; + } else if (gBattleMoveFlags & MOVESTATUS_ONEHITKO) { gBattleMoveFlags &= ~(MOVESTATUS_ONEHITKO); @@ -2160,18 +2264,19 @@ static void atk0F_resultmessage(void) return; } else if (gBattleMoveFlags & MOVESTATUS_FAILED) - FAILED: - stringID = 0xE5; + { + stringId = STRINGID_BUTITFAILED; + } else + { gBattleCommunication[MSG_DISPLAY] = 0; + } } } - if (stringID) - { - register u16 dummy asm("r0") = stringID; //Can't match it otherwise - PrepareStringBattle(dummy, gBankAttacker); - } + if (stringId) + PrepareStringBattle(stringId, gBankAttacker); + gBattlescriptCurrInstr++; } @@ -2268,12 +2373,12 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gEffectBank = gBankAttacker; //bank that effects get applied on gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(EffectAffectsUser); AffectsUser = EffectAffectsUser; - BATTLE_STRUCT->scriptingActive = gBankTarget; //theoretically the attacker + gBattleStruct->scriptingActive = gBankTarget; //theoretically the attacker } else { gEffectBank = gBankTarget; - BATTLE_STRUCT->scriptingActive = gBankAttacker; + gBattleStruct->scriptingActive = gBankAttacker; } if (gBattleMons[gEffectBank].ability == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) && @@ -2293,7 +2398,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6) //status change { - switch (gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) + switch (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) { case STATUS_SLEEP: //check active uproar @@ -2342,7 +2447,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (gBattleMons[gEffectBank].type2 == TYPE_STEEL) {break;} if (gBattleMons[gEffectBank].status1) {break;} if (gBattleMons[gEffectBank].ability == ABILITY_IMMUNITY) {break;} - + StatusChanged = 1; break; case STATUS_BURN: @@ -2454,10 +2559,10 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (StatusChanged == 1) { BattleScriptPush(gBattlescriptCurrInstr + 1); - if (gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS_SLEEP) + if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS_SLEEP) gBattleMons[gEffectBank].status1 |= ((Random() & 3) + 2); else - gBattleMons[gEffectBank].status1 |= gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; + gBattleMons[gEffectBank].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; gActiveBank = gEffectBank; EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBank].status1); @@ -2471,7 +2576,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattleCommunication[MULTISTRING_CHOOSER] = 0; if (gBattleCommunication[MOVE_EFFECT_BYTE] == 2 || gBattleCommunication[MOVE_EFFECT_BYTE] == 6 || gBattleCommunication[MOVE_EFFECT_BYTE] == 5 || gBattleCommunication[MOVE_EFFECT_BYTE] == 3) { - BATTLE_STRUCT->synchroniseEffect = gBattleCommunication[MOVE_EFFECT_BYTE]; + gBattleStruct->synchroniseEffect = gBattleCommunication[MOVE_EFFECT_BYTE]; gHitMarker |= HITMARKER_SYNCHRONISE_EFFECT; } return; @@ -2481,12 +2586,12 @@ void SetMoveEffect(bool8 primary, u8 certainArg) } else { - if (gBattleMons[gEffectBank].status2 & gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) + if (gBattleMons[gEffectBank].status2 & sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) { gBattlescriptCurrInstr++; return; } - switch (gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) + switch (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) { case 7: //confusion if (gBattleMons[gEffectBank].ability == ABILITY_OWN_TEMPO) @@ -2513,7 +2618,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) else { if (BankGetTurnOrder(gEffectBank) > gCurrentTurnActionNumber) - gBattleMons[gEffectBank].status2 |= gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; + gBattleMons[gEffectBank].status2 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattlescriptCurrInstr++; return; } break; @@ -2553,9 +2658,9 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (gBattleMons[gEffectBank].status2 & STATUS2_WRAPPED) {gBattlescriptCurrInstr++; return;} gBattleMons[gEffectBank].status2 |= ((Random() & 3) + 2) << 0xD; - BATTLE_STRUCT->wrappedMove[gEffectBank*2] = (u8)gCurrentMove; - (1 + BATTLE_STRUCT->wrappedMove)[gEffectBank*2] = gCurrentMove >> 8; //don't ask. - BATTLE_STRUCT->wrappedBy[gEffectBank] = gBankAttacker; + gBattleStruct->wrappedMove[gEffectBank*2] = (u8)gCurrentMove; + (1 + gBattleStruct->wrappedMove)[gEffectBank*2] = gCurrentMove >> 8; //don't ask. + gBattleStruct->wrappedBy[gEffectBank] = gBankAttacker; BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = gMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattleCommunication[MULTISTRING_CHOOSER] = 0; @@ -2564,7 +2669,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattleCommunication[MULTISTRING_CHOOSER]++; break; case 14: //25% recoil - gBattleMoveDamage = (gHP_dealt) / 4; + gBattleMoveDamage = (gHpDealt) / 4; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; BattleScriptPush(gBattlescriptCurrInstr + 1); @@ -2574,8 +2679,8 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (ChangeStatBuffs(0x10, gBattleCommunication[MOVE_EFFECT_BYTE] + 0xF2, certain, 0)) {gBattlescriptCurrInstr++;} else { - BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; //TODO: the arg ptr is wrong by one - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; //TODO: the arg ptr is wrong by one + gBattleStruct->animArg2 = 0; BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatUp; } @@ -2584,8 +2689,8 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (ChangeStatBuffs(~(0x6f), gBattleCommunication[MOVE_EFFECT_BYTE] + 0xEB, certain, 0)) {gBattlescriptCurrInstr++;} //TODO: negation doesnt work correctly else { - BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; + gBattleStruct->animArg2 = 0; BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatDown; } @@ -2594,8 +2699,8 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (ChangeStatBuffs(0x20, gBattleCommunication[MOVE_EFFECT_BYTE] + 0xDA, certain, 0)) {gBattlescriptCurrInstr++;} else { - BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; + gBattleStruct->animArg2 = 0; BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatUp; } @@ -2604,8 +2709,8 @@ void SetMoveEffect(bool8 primary, u8 certainArg) if (ChangeStatBuffs(~(0x5f), gBattleCommunication[MOVE_EFFECT_BYTE] + 0xD3, certain, 0)) {gBattlescriptCurrInstr++;} else { - BATTLE_STRUCT->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->animArg1 = gBattleCommunication[MOVE_EFFECT_BYTE] & 0x3F; + gBattleStruct->animArg2 = 0; BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_StatDown; } @@ -2695,7 +2800,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg) gBattlescriptCurrInstr = BattleScript_AtkDefDown; return; case 38: //33% recoil - gBattleMoveDamage = gHP_dealt / 3; + gBattleMoveDamage = gHpDealt / 3; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; BattleScriptPush(gBattlescriptCurrInstr + 1); @@ -2894,7 +2999,7 @@ _0801E50C:\n\ bls _0801E518\n\ b _0801EB4A\n\ _0801E518:\n\ - ldr r1, _0801E55C @ =gStatusFlagsForMoveEffects\n\ + ldr r1, _0801E55C @ =sStatusFlagsForMoveEffects\n\ ldrb r0, [r7, 0x3]\n\ lsls r0, 2\n\ adds r0, r1\n\ @@ -2922,7 +3027,7 @@ _0801E54C: .4byte gBattleMons\n\ _0801E550: .4byte gHitMarker\n\ _0801E554: .4byte gSideAffecting\n\ _0801E558: .4byte gBattleCommunication\n\ -_0801E55C: .4byte gStatusFlagsForMoveEffects\n\ +_0801E55C: .4byte sStatusFlagsForMoveEffects\n\ _0801E560:\n\ cmp r0, 0x40\n\ bne _0801E566\n\ @@ -3552,7 +3657,7 @@ _0801EA1C:\n\ ldr r0, [r0]\n\ adds r0, 0x1\n\ bl BattleScriptPush\n\ - ldr r1, _0801EA60 @ =gStatusFlagsForMoveEffects\n\ + ldr r1, _0801EA60 @ =sStatusFlagsForMoveEffects\n\ ldr r0, _0801EA64 @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ lsls r0, 2\n\ @@ -3578,7 +3683,7 @@ _0801EA1C:\n\ .align 2, 0\n\ _0801EA58: .4byte gBattleMoveFlags\n\ _0801EA5C: .4byte gBattlescriptCurrInstr\n\ -_0801EA60: .4byte gStatusFlagsForMoveEffects\n\ +_0801EA60: .4byte sStatusFlagsForMoveEffects\n\ _0801EA64: .4byte gBattleCommunication\n\ _0801EA68: .4byte gBattleMons\n\ _0801EA6C: .4byte gEffectBank\n\ @@ -3688,7 +3793,7 @@ _0801EB4A:\n\ mov r0, r9\n\ adds r0, 0x50\n\ adds r1, r0\n\ - ldr r2, _0801EB84 @ =gStatusFlagsForMoveEffects\n\ + ldr r2, _0801EB84 @ =sStatusFlagsForMoveEffects\n\ ldrb r3, [r7, 0x3]\n\ lsls r0, r3, 2\n\ adds r0, r2\n\ @@ -3710,7 +3815,7 @@ _0801EB78:\n\ ldr r0, [r0]\n\ mov pc, r0\n\ .align 2, 0\n\ -_0801EB84: .4byte gStatusFlagsForMoveEffects\n\ +_0801EB84: .4byte sStatusFlagsForMoveEffects\n\ _0801EB88: .4byte _0801EB8C\n\ .align 2, 0\n\ _0801EB8C:\n\ @@ -3870,7 +3975,7 @@ _0801ED2E:\n\ mov r0, r9\n\ adds r0, 0x50\n\ adds r2, r0\n\ - ldr r1, _0801ED58 @ =gStatusFlagsForMoveEffects\n\ + ldr r1, _0801ED58 @ =sStatusFlagsForMoveEffects\n\ ldr r0, _0801ED5C @ =gBattleCommunication\n\ ldrb r0, [r0, 0x3]\n\ lsls r0, 2\n\ @@ -3882,7 +3987,7 @@ _0801ED2E:\n\ bl _0801F5DC\n\ .align 2, 0\n\ _0801ED54: .4byte gCurrentTurnActionNumber\n\ -_0801ED58: .4byte gStatusFlagsForMoveEffects\n\ +_0801ED58: .4byte sStatusFlagsForMoveEffects\n\ _0801ED5C: .4byte gBattleCommunication\n\ _0801ED60:\n\ mov r3, r8\n\ @@ -4156,7 +4261,7 @@ _0801EFA0: .4byte gBattleCommunication\n\ _0801EFA4: .4byte gTrappingMoves\n\ _0801EFA8:\n\ ldr r1, _0801EFD8 @ =gBattleMoveDamage\n\ - ldr r0, _0801EFDC @ =gHP_dealt\n\ + ldr r0, _0801EFDC @ =gHpDealt\n\ ldr r0, [r0]\n\ cmp r0, 0\n\ bge _0801EFB4\n\ @@ -4182,7 +4287,7 @@ _0801EFC0:\n\ b _0801F5F8\n\ .align 2, 0\n\ _0801EFD8: .4byte gBattleMoveDamage\n\ -_0801EFDC: .4byte gHP_dealt\n\ +_0801EFDC: .4byte gHpDealt\n\ _0801EFE0: .4byte gBattlescriptCurrInstr\n\ _0801EFE4: .4byte gMoveEffectBS_Ptrs\n\ _0801EFE8: .4byte gBattleCommunication\n\ @@ -4711,7 +4816,7 @@ _0801F45C: .4byte gBattlescriptCurrInstr\n\ _0801F460: .4byte BattleScript_AtkDefDown\n\ _0801F464:\n\ ldr r4, _0801F494 @ =gBattleMoveDamage\n\ - ldr r0, _0801F498 @ =gHP_dealt\n\ + ldr r0, _0801F498 @ =gHpDealt\n\ ldr r0, [r0]\n\ movs r1, 0x3\n\ bl __divsi3\n\ @@ -4734,7 +4839,7 @@ _0801F47A:\n\ b _0801F5F8\n\ .align 2, 0\n\ _0801F494: .4byte gBattleMoveDamage\n\ -_0801F498: .4byte gHP_dealt\n\ +_0801F498: .4byte gHpDealt\n\ _0801F49C: .4byte gBattlescriptCurrInstr\n\ _0801F4A0: .4byte gMoveEffectBS_Ptrs\n\ _0801F4A4: .4byte gBattleCommunication\n\ @@ -4935,7 +5040,7 @@ static void atk15_seteffectwithchance(void) else gBattlescriptCurrInstr++; gBattleCommunication[MOVE_EFFECT_BYTE] = 0; - BATTLE_STRUCT->unk16112 = 0; + gBattleStruct->unk16112 = 0; } static void atk16_seteffectprimary(void) @@ -4952,13 +5057,13 @@ static void atk18_clearstatusfromeffect(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6) - gBattleMons[gActiveBank].status1 &= (~gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); + gBattleMons[gActiveBank].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); else - gBattleMons[gActiveBank].status2 &= (~gStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); + gBattleMons[gActiveBank].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattlescriptCurrInstr += 2; - BATTLE_STRUCT->unk16112 = 0; + gBattleStruct->unk16112 = 0; } static void atk19_tryfaintmon(void) @@ -5250,282 +5355,262 @@ static void atk22_jumpiftype(void) //u8 bank, u8 type, *ptr gBattlescriptCurrInstr += 7; } -//here we go again... -#ifdef NONMATCHING -static void atk23_getexp(void) -{ - u8 hold_effect; - int via_expshare = 0, sent_in; - u16* exp = &BATTLE_STRUCT->exp; - gBank1 = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); - sent_in = gSentPokesToOpponent[(gBank1 & 2) >> 1]; - switch (BATTLE_STRUCT->getexpStateTracker) - { - case 0: //check if should receive exp at all - if (GetBankSide(gBank1) != 1 || (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER))) - BATTLE_STRUCT->getexpStateTracker = 6; //goto last case +void atk23_getexp(void) +{ + u16 item; + s32 i; // also used as stringId + u8 holdEffect; + s32 sentIn; + + s32 viaExpShare = 0; + u16* exp = &gBattleStruct->exp; + + gBank1 = GetBattleBank(gBattlescriptCurrInstr[1]); + sentIn = gSentPokesToOpponent[(gBank1 & 2) >> 1]; + + switch (gBattleStruct->getexpStateTracker) + { + case 0: // check if should receive exp at all + if (GetBankSide(gBank1) != SIDE_OPPONENT || (gBattleTypeFlags & + (BATTLE_TYPE_LINK + | BATTLE_TYPE_SAFARI + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_EREADER_TRAINER))) + { + gBattleStruct->getexpStateTracker = 6; // goto last case + } else { - BATTLE_STRUCT->getexpStateTracker++; - ((u8*)ewram)[0x16113] |= gBitTable[gBattlePartyID[gBank1]]; + gBattleStruct->getexpStateTracker++; + gBattleStruct->unk16113 |= gBitTable[gBattlePartyID[gBank1]]; } break; - case 1: //calculate experience points to redistribute + case 1: // calculate experience points to redistribute { - int via_sent_in = 0; u16 calculatedExp; - int i; - for (i = 0; i < 6; i++) + s32 viaSentIn; + + for (viaSentIn = 0, i = 0; i < 6; i++) { - u16 item; - if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) == 0 || GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0) + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0) continue; - if (gBitTable[i] & sent_in) - via_sent_in++; + if (gBitTable[i] & sentIn) + viaSentIn++; item = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); + if (item == ITEM_ENIGMA_BERRY) - hold_effect = gSaveBlock1.enigmaBerry.holdEffect; + holdEffect = gSaveBlock1.enigmaBerry.holdEffect; else - hold_effect = ItemId_GetHoldEffect(item); + holdEffect = ItemId_GetHoldEffect(item); - if (hold_effect == HOLD_EFFECT_EXP_SHARE) - via_expshare++; + if (holdEffect == HOLD_EFFECT_EXP_SHARE) + viaExpShare++; } + calculatedExp = gBaseStats[gBattleMons[gBank1].species].expYield * gBattleMons[gBank1].level / 7; - if (via_expshare) //at least one poke is getting exp via exp share + + if (viaExpShare) // at least one mon is getting exp via exp share { - calculatedExp /= 2; - *exp = calculatedExp / via_sent_in; + *exp = calculatedExp / 2 / viaSentIn; if (*exp == 0) *exp = 1; - gExpShareExp = calculatedExp / via_expshare; + gExpShareExp = calculatedExp / 2 / viaExpShare; if (gExpShareExp == 0) gExpShareExp = 1; } else { - *exp = calculatedExp / via_sent_in; + *exp = calculatedExp / viaSentIn; if (*exp == 0) *exp = 1; gExpShareExp = 0; } - BATTLE_STRUCT->getexpStateTracker++; - BATTLE_STRUCT->expGetterID = 0; - BATTLE_STRUCT->sentInPokes = sent_in; - } //no break statement - case 2: //loop; set exp value to the poke in expgetter_id and print message + + gBattleStruct->getexpStateTracker++; + gBattleStruct->expGetterID = 0; + gBattleStruct->sentInPokes = sentIn; + } + // fall through + case 2: // set exp value to the poke in expgetter_id and print message if (gBattleExecBuffer == 0) { - u16 item = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_HELD_ITEM); - u8* tracker; u32 zero; + item = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HELD_ITEM); + if (item == ITEM_ENIGMA_BERRY) - hold_effect = gSaveBlock1.enigmaBerry.holdEffect; + holdEffect = gSaveBlock1.enigmaBerry.holdEffect; else - hold_effect = ItemId_GetHoldEffect(item); + holdEffect = ItemId_GetHoldEffect(item); - if ((hold_effect != HOLD_EFFECT_EXP_SHARE && !(BATTLE_STRUCT->sentInPokes & 1))) + if (holdEffect != HOLD_EFFECT_EXP_SHARE && !(gBattleStruct->sentInPokes & 1)) { - BATTLE_STRUCT->sentInPokes >>= 1; - tracker = &BATTLE_STRUCT->getexpStateTracker; - zero = 0; - *tracker = 5; //increment looper - gBattleMoveDamage = zero; //used for exp + gBattleStruct->sentInPokes >>= 1; + gBattleStruct->getexpStateTracker = 5; + gBattleMoveDamage = 0; // used for exp } - else if (GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL) == 100) + else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL) == 100) { - BATTLE_STRUCT->sentInPokes >>= 1; - tracker = &BATTLE_STRUCT->getexpStateTracker; - zero = 0; - *tracker = 5; //increment looper - gBattleMoveDamage = zero; //used for exp + gBattleStruct->sentInPokes >>= 1; + gBattleStruct->getexpStateTracker = 5; + gBattleMoveDamage = 0; // used for exp } else { - //music change in wild battle after fainting a poke - if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !BATTLE_STRUCT->wildVictorySong) + // music change in wild battle after fainting a poke + if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong) { - BattleMusicStop(); + BattleStopLowHpSound(); PlayBGM(0x161); - BATTLE_STRUCT->wildVictorySong++; + gBattleStruct->wildVictorySong++; } - if (GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_HP)) + if (GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP)) { - s16 stringID; - if (BATTLE_STRUCT->sentInPokes & 1) + if (gBattleStruct->sentInPokes & 1) gBattleMoveDamage = *exp; else gBattleMoveDamage = 0; - if (hold_effect == HOLD_EFFECT_EXP_SHARE) + if (holdEffect == HOLD_EFFECT_EXP_SHARE) gBattleMoveDamage += gExpShareExp; - if (hold_effect == HOLD_EFFECT_LUCKY_EGG) + if (holdEffect == HOLD_EFFECT_LUCKY_EGG) gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; - if (IsTradedMon(&gPlayerParty[BATTLE_STRUCT->expGetterID])) + if (IsTradedMon(&gPlayerParty[gBattleStruct->expGetterID])) { gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; - stringID = 0x14A; + i = 0x14A; } else { - stringID = 0x149; - } + i = 0x149; + } - //get exp getter bank + // get exp getter bank if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - if (!(gBattlePartyID[2] != BATTLE_STRUCT->expGetterID) && !(gAbsentBankFlags & gBitTable[2])) - BATTLE_STRUCT->expGetterBank = 2; + if (!(gBattlePartyID[2] != gBattleStruct->expGetterID) && !(gAbsentBankFlags & gBitTable[2])) + gBattleStruct->expGetterBank = 2; else { if (!(gAbsentBankFlags & gBitTable[0])) - BATTLE_STRUCT->expGetterBank = 0; + gBattleStruct->expGetterBank = 0; else - BATTLE_STRUCT->expGetterBank = 2; + gBattleStruct->expGetterBank = 2; } } else - BATTLE_STRUCT->expGetterBank = 0; + gBattleStruct->expGetterBank = 0; - //buffer poke name - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 4; - gBattleTextBuff1[2] = BATTLE_STRUCT->expGetterBank; - gBattleTextBuff1[3] = BATTLE_STRUCT->expGetterID; - gBattleTextBuff1[4] = 0xFF; - - //buffer 'gained' or 'gained a boosted' - gBattleTextBuff2[0] = 0xFD; - gBattleTextBuff2[1] = 0; - gBattleTextBuff2[2] = stringID; - stringID = (stringID >> 8) & (0xFF); //this does not want to cooperate - gBattleTextBuff2[3] = stringID; - gBattleTextBuff2[4] = 0xFF; - - //buffer exp number - gBattleTextBuff3[0] = 0xFD; - gBattleTextBuff3[1] = 1; - gBattleTextBuff3[2] = 4; //word - gBattleTextBuff3[3] = 5; //max digits - gBattleTextBuff3[4] = gBattleMoveDamage; - gBattleTextBuff3[5] = sBYTE1_32(gBattleMoveDamage); - gBattleTextBuff3[6] = sBYTE2_32(gBattleMoveDamage); - gBattleTextBuff3[7] = sBYTE3_32(gBattleMoveDamage); - gBattleTextBuff3[8] = 0xFF; - - PrepareStringBattle(0xD, BATTLE_STRUCT->expGetterBank); - MonGainEVs(&gPlayerParty[BATTLE_STRUCT->expGetterID], gBattleMons[gBank1].species); + PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBank, gBattleStruct->expGetterID) + + // buffer 'gained' or 'gained a boosted' + PREPARE_STRING_BUFFER(gBattleTextBuff2, i) + + PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage) + + PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBank); + MonGainEVs(&gPlayerParty[gBattleStruct->expGetterID], gBattleMons[gBank1].species); } - BATTLE_STRUCT->sentInPokes >>= 1; - BATTLE_STRUCT->getexpStateTracker++; + gBattleStruct->sentInPokes >>= 1; + gBattleStruct->getexpStateTracker++; } } break; - case 3: //Set Stats and give exp + case 3: // Set stats and give exp if (gBattleExecBuffer == 0) { - gBattleBufferB[BATTLE_STRUCT->expGetterBank][0] = 0; - if (GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_HP) && GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL) != 100) + gBattleBufferB[gBattleStruct->expGetterBank][0] = 0; + if (GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL) != 100) { - // Doesn't match. - BATTLE_STRUCT->beforeLvlUp[0] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_MAX_HP); - BATTLE_STRUCT->beforeLvlUp[1] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_ATK); - BATTLE_STRUCT->beforeLvlUp[2] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_DEF); - BATTLE_STRUCT->beforeLvlUp[3] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPEED); - BATTLE_STRUCT->beforeLvlUp[4] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPATK); - BATTLE_STRUCT->beforeLvlUp[5] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPDEF); - - gActiveBank = BATTLE_STRUCT->expGetterBank; - EmitExpBarUpdate(0, BATTLE_STRUCT->expGetterID, gBattleMoveDamage); + gBattleResources_statsBeforeLvlUp->hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MAX_HP); + gBattleResources_statsBeforeLvlUp->atk = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_ATK); + gBattleResources_statsBeforeLvlUp->def = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_DEF); + gBattleResources_statsBeforeLvlUp->spd = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); + gBattleResources_statsBeforeLvlUp->spAtk = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPATK); + gBattleResources_statsBeforeLvlUp->spDef = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPDEF); + + gActiveBank = gBattleStruct->expGetterBank; + EmitExpBarUpdate(0, gBattleStruct->expGetterID, gBattleMoveDamage); MarkBufferBankForExecution(gActiveBank); } - BATTLE_STRUCT->getexpStateTracker++; + gBattleStruct->getexpStateTracker++; } break; - case 4: //lvl up if necessary + case 4: // lvl up if necessary if (gBattleExecBuffer == 0) { - gActiveBank = BATTLE_STRUCT->expGetterBank; - if (gBattleBufferB[gActiveBank][0] == 0x21 && gBattleBufferB[gActiveBank][1] == 0xB) + gActiveBank = gBattleStruct->expGetterBank; + if (gBattleBufferB[gActiveBank][0] == CONTROLLER_TWORETURNVALUES + && gBattleBufferB[gActiveBank][1] == RET_VALUE_LEVELLED_UP) { - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBank] == BATTLE_STRUCT->expGetterID) - sub_80324F8(&gPlayerParty[gActiveBank], gActiveBank); + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlePartyID[gActiveBank] == gBattleStruct->expGetterID) + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); - //buff poke name - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 4; - gBattleTextBuff1[2] = gActiveBank; - gBattleTextBuff1[3] = BATTLE_STRUCT->expGetterID; - gBattleTextBuff1[4] = 0xFF; - - //buff level - gBattleTextBuff2[0] = 0xFD; - gBattleTextBuff2[1] = 1; - gBattleTextBuff2[2] = 1; - gBattleTextBuff2[3] = 3; - gBattleTextBuff2[4] = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL); - gBattleTextBuff2[5] = 0xFF; + PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBank, gBattleStruct->expGetterID) + + PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL)) BattleScriptPushCursor(); - gLeveledUpInBattle |= gBitTable[BATTLE_STRUCT->expGetterID]; + gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterID]; gBattlescriptCurrInstr = BattleScript_LevelUp; gBattleMoveDamage = (gBattleBufferB[gActiveBank][2] | (gBattleBufferB[gActiveBank][3] << 8)); - AdjustFriendship(&gPlayerParty[BATTLE_STRUCT->expGetterID], 0); + AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterID], 0); - //update battle mon structure after level up - if (gBattlePartyID[0] == BATTLE_STRUCT->expGetterID && gBattleMons[0].hp) + // update battle mon structure after level up + if (gBattlePartyID[0] == gBattleStruct->expGetterID && gBattleMons[0].hp) { - gBattleMons[0].level = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL); - gBattleMons[0].hp = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_HP); - gBattleMons[0].maxHP = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_MAX_HP); - gBattleMons[0].attack = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_ATK); - gBattleMons[0].defense = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_DEF); - gBattleMons[0].speed = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPEED); - gBattleMons[0].spAttack = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPATK); - gBattleMons[0].spDefense = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPDEF); + gBattleMons[0].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL); + gBattleMons[0].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP); + gBattleMons[0].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MAX_HP); + gBattleMons[0].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_ATK); + gBattleMons[0].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_DEF); + // Why is this duplicated? + gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); + gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); + gBattleMons[0].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPATK); + gBattleMons[0].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPDEF); } - //What is else if? Guess it's too advanced for GameFreak - if (gBattlePartyID[2] == BATTLE_STRUCT->expGetterID && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) + // What is else if? + if (gBattlePartyID[2] == gBattleStruct->expGetterID && gBattleMons[2].hp && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { - gBattleMons[2].level = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL); - gBattleMons[2].hp = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_HP); - gBattleMons[2].maxHP = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_MAX_HP); - gBattleMons[2].attack = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_ATK); - gBattleMons[2].defense = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_DEF); - //There are no words...GF can't even copy&paste code properly - gBattleMons[2].speed = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPEED); - gBattleMons[2].spAttack = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPEED /*RIP*/); - gBattleMons[2].spDefense = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPATK); + gBattleMons[2].level = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_LEVEL); + gBattleMons[2].hp = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_HP); + gBattleMons[2].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MAX_HP); + gBattleMons[2].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_ATK); + gBattleMons[2].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_DEF); + // Duplicated again, but this time there's no Sp Defense + gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); + gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPEED); + gBattleMons[2].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_SPATK); } - BATTLE_STRUCT->getexpStateTracker = 5; } else { gBattleMoveDamage = 0; - BATTLE_STRUCT->getexpStateTracker = 5; } + gBattleStruct->getexpStateTracker = 5; } break; - case 5: //looper increment - if (gBattleMoveDamage) //there is exp to give, goto case 3 that gives exp - BATTLE_STRUCT->getexpStateTracker = 3; + case 5: // looper increment + if (gBattleMoveDamage) // there is exp to give, goto case 3 that gives exp + gBattleStruct->getexpStateTracker = 3; else { - if (++BATTLE_STRUCT->expGetterID <= 5) - BATTLE_STRUCT->getexpStateTracker = 2; //loop again + gBattleStruct->expGetterID++; + if (gBattleStruct->expGetterID <= 5) + gBattleStruct->getexpStateTracker = 2; // loop again else - BATTLE_STRUCT->getexpStateTracker = 6; //we're done + gBattleStruct->getexpStateTracker = 6; // we're done } break; - case 6: //increment instruction + case 6: // increment instruction if (gBattleExecBuffer == 0) { - //not even sure why gamefreak clears that data in this place + // not sure why gf clears the item and ability here gBattleMons[gBank1].item = 0; gBattleMons[gBank1].ability = 0; gBattlescriptCurrInstr += 2; @@ -5533,1138 +5618,6 @@ static void atk23_getexp(void) break; } } -#else -__attribute__((naked)) -static void atk23_getexp(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - movs r6, 0\n\ - ldr r0, _0802004C @ =gSharedMem + 0x1605C\n\ - mov r10, r0\n\ - ldr r0, _08020050 @ =gBattlescriptCurrInstr\n\ - ldr r0, [r0]\n\ - ldrb r0, [r0, 0x1]\n\ - bl GetBattleBank\n\ - ldr r1, _08020054 @ =gBank1\n\ - strb r0, [r1]\n\ - ldr r2, _08020058 @ =gSentPokesToOpponent\n\ - movs r1, 0x2\n\ - ands r1, r0\n\ - lsls r1, 24\n\ - lsrs r1, 25\n\ - adds r1, r2\n\ - ldrb r1, [r1]\n\ - mov r8, r1\n\ - mov r0, r10\n\ - subs r0, 0x4D\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x6\n\ - bls _08020040\n\ - bl _08020996\n\ -_08020040:\n\ - lsls r0, 2\n\ - ldr r1, _0802005C @ =_08020060\n\ - adds r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ - .align 2, 0\n\ -_0802004C: .4byte gSharedMem + 0x1605C\n\ -_08020050: .4byte gBattlescriptCurrInstr\n\ -_08020054: .4byte gBank1\n\ -_08020058: .4byte gSentPokesToOpponent\n\ -_0802005C: .4byte _08020060\n\ - .align 2, 0\n\ -_08020060:\n\ - .4byte _0802007C\n\ - .4byte _080200FC\n\ - .4byte _08020216\n\ - .4byte _0802055C\n\ - .4byte _08020648\n\ - .4byte _08020910\n\ - .4byte _0802096C\n\ -_0802007C:\n\ - ldr r4, _080200A8 @ =gBank1\n\ - ldrb r0, [r4]\n\ - bl GetBankSide\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x1\n\ - bne _08020098\n\ - ldr r0, _080200AC @ =gBattleTypeFlags\n\ - ldrh r1, [r0]\n\ - ldr r0, _080200B0 @ =0x00000982\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080200BC\n\ -_08020098:\n\ - ldr r0, _080200B4 @ =gSharedMem\n\ - ldr r1, _080200B8 @ =0x0001600f\n\ - adds r0, r1\n\ - movs r1, 0x6\n\ - strb r1, [r0]\n\ - bl _08020996\n\ - .align 2, 0\n\ -_080200A8: .4byte gBank1\n\ -_080200AC: .4byte gBattleTypeFlags\n\ -_080200B0: .4byte 0x00000982\n\ -_080200B4: .4byte gSharedMem\n\ -_080200B8: .4byte 0x0001600f\n\ -_080200BC:\n\ - ldr r2, _080200E8 @ =gSharedMem\n\ - ldr r3, _080200EC @ =0x0001600f\n\ - adds r1, r2, r3\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - ldr r0, _080200F0 @ =0x00016113\n\ - adds r2, r0\n\ - ldr r3, _080200F4 @ =gBitTable\n\ - ldr r1, _080200F8 @ =gBattlePartyID\n\ - ldrb r0, [r4]\n\ - lsls r0, 1\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - lsls r0, 2\n\ - adds r0, r3\n\ - ldr r0, [r0]\n\ - ldrb r1, [r2]\n\ - orrs r0, r1\n\ - strb r0, [r2]\n\ - bl _08020996\n\ - .align 2, 0\n\ -_080200E8: .4byte gSharedMem\n\ -_080200EC: .4byte 0x0001600f\n\ -_080200F0: .4byte 0x00016113\n\ -_080200F4: .4byte gBitTable\n\ -_080200F8: .4byte gBattlePartyID\n\ -_080200FC:\n\ - movs r5, 0\n\ - movs r7, 0\n\ - ldr r1, _08020150 @ =gSaveBlock1 + 0x3688\n\ - mov r9, r1\n\ -_08020104:\n\ - movs r0, 0x64\n\ - adds r1, r7, 0\n\ - muls r1, r0\n\ - ldr r0, _08020154 @ =gPlayerParty\n\ - adds r4, r1, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0802016A\n\ - adds r0, r4, 0\n\ - movs r1, 0x39\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _0802016A\n\ - ldr r0, _08020158 @ =gBitTable\n\ - lsls r1, r7, 2\n\ - adds r1, r0\n\ - ldr r0, [r1]\n\ - mov r2, r8\n\ - ands r0, r2\n\ - cmp r0, 0\n\ - beq _08020138\n\ - adds r5, 0x1\n\ -_08020138:\n\ - adds r0, r4, 0\n\ - movs r1, 0xC\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - cmp r0, 0xAF\n\ - bne _0802015C\n\ - mov r3, r9\n\ - ldrb r4, [r3]\n\ - b _08020164\n\ - .align 2, 0\n\ -_08020150: .4byte gSaveBlock1 + 0x3688\n\ -_08020154: .4byte gPlayerParty\n\ -_08020158: .4byte gBitTable\n\ -_0802015C:\n\ - bl ItemId_GetHoldEffect\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ -_08020164:\n\ - cmp r4, 0x19\n\ - bne _0802016A\n\ - adds r6, 0x1\n\ -_0802016A:\n\ - adds r7, 0x1\n\ - cmp r7, 0x5\n\ - ble _08020104\n\ - ldr r3, _080201D0 @ =gBaseStats\n\ - ldr r2, _080201D4 @ =gBattleMons\n\ - ldr r0, _080201D8 @ =gBank1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x58\n\ - muls r1, r0\n\ - adds r1, r2\n\ - ldrh r2, [r1]\n\ - lsls r0, r2, 3\n\ - subs r0, r2\n\ - lsls r0, 2\n\ - adds r0, r3\n\ - ldrb r2, [r0, 0x9]\n\ - adds r1, 0x2A\n\ - ldrb r0, [r1]\n\ - muls r0, r2\n\ - movs r1, 0x7\n\ - bl __divsi3\n\ - lsls r0, 16\n\ - lsrs r1, r0, 16\n\ - cmp r6, 0\n\ - beq _080201E0\n\ - lsrs r4, r0, 17\n\ - adds r0, r4, 0\n\ - adds r1, r5, 0\n\ - bl __divsi3\n\ - mov r1, r10\n\ - strh r0, [r1]\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - bne _080201B6\n\ - movs r0, 0x1\n\ - strh r0, [r1]\n\ -_080201B6:\n\ - ldr r5, _080201DC @ =gExpShareExp\n\ - adds r0, r4, 0\n\ - adds r1, r6, 0\n\ - bl __divsi3\n\ - strh r0, [r5]\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - bne _080201FA\n\ - movs r0, 0x1\n\ - strh r0, [r5]\n\ - b _080201FA\n\ - .align 2, 0\n\ -_080201D0: .4byte gBaseStats\n\ -_080201D4: .4byte gBattleMons\n\ -_080201D8: .4byte gBank1\n\ -_080201DC: .4byte gExpShareExp\n\ -_080201E0:\n\ - adds r0, r1, 0\n\ - adds r1, r5, 0\n\ - bl __divsi3\n\ - mov r2, r10\n\ - strh r0, [r2]\n\ - lsls r0, 16\n\ - cmp r0, 0\n\ - bne _080201F6\n\ - movs r0, 0x1\n\ - strh r0, [r2]\n\ -_080201F6:\n\ - ldr r0, _08020248 @ =gExpShareExp\n\ - strh r6, [r0]\n\ -_080201FA:\n\ - ldr r1, _0802024C @ =gSharedMem\n\ - ldr r3, _08020250 @ =0x0001600f\n\ - adds r2, r1, r3\n\ - ldrb r0, [r2]\n\ - adds r0, 0x1\n\ - movs r3, 0\n\ - strb r0, [r2]\n\ - ldr r2, _08020254 @ =0x00016018\n\ - adds r0, r1, r2\n\ - strb r3, [r0]\n\ - ldr r3, _08020258 @ =0x0001605f\n\ - adds r1, r3\n\ - mov r0, r8\n\ - strb r0, [r1]\n\ -_08020216:\n\ - ldr r0, _0802025C @ =gBattleExecBuffer\n\ - ldr r0, [r0]\n\ - cmp r0, 0\n\ - beq _08020220\n\ - b _08020996\n\ -_08020220:\n\ - ldr r0, _0802024C @ =gSharedMem\n\ - ldr r1, _08020254 @ =0x00016018\n\ - adds r0, r1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x64\n\ - muls r0, r1\n\ - ldr r1, _08020260 @ =gPlayerParty\n\ - adds r0, r1\n\ - movs r1, 0xC\n\ - bl GetMonData\n\ - lsls r0, 16\n\ - lsrs r0, 16\n\ - cmp r0, 0xAF\n\ - bne _0802026C\n\ - ldr r0, _08020264 @ =gSaveBlock1\n\ - ldr r2, _08020268 @ =0x00003688\n\ - adds r0, r2\n\ - ldrb r4, [r0]\n\ - b _08020274\n\ - .align 2, 0\n\ -_08020248: .4byte gExpShareExp\n\ -_0802024C: .4byte gSharedMem\n\ -_08020250: .4byte 0x0001600f\n\ -_08020254: .4byte 0x00016018\n\ -_08020258: .4byte 0x0001605f\n\ -_0802025C: .4byte gBattleExecBuffer\n\ -_08020260: .4byte gPlayerParty\n\ -_08020264: .4byte gSaveBlock1\n\ -_08020268: .4byte 0x00003688\n\ -_0802026C:\n\ - bl ItemId_GetHoldEffect\n\ - lsls r0, 24\n\ - lsrs r4, r0, 24\n\ -_08020274:\n\ - ldr r5, _08020294 @ =gSharedMem\n\ - cmp r4, 0x19\n\ - beq _080202A0\n\ - ldr r3, _08020298 @ =0x0001605f\n\ - adds r1, r5, r3\n\ - ldrb r0, [r1]\n\ - movs r2, 0x1\n\ - ands r2, r0\n\ - cmp r2, 0\n\ - bne _080202A0\n\ - lsrs r0, 1\n\ - strb r0, [r1]\n\ - ldr r0, _0802029C @ =0x0001600f\n\ - adds r1, r5, r0\n\ - b _080202C8\n\ - .align 2, 0\n\ -_08020294: .4byte gSharedMem\n\ -_08020298: .4byte 0x0001605f\n\ -_0802029C: .4byte 0x0001600f\n\ -_080202A0:\n\ - ldr r1, _080202D4 @ =0x00016018\n\ - adds r0, r5, r1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x64\n\ - muls r0, r1\n\ - ldr r1, _080202D8 @ =gPlayerParty\n\ - adds r0, r1\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - cmp r0, 0x64\n\ - bne _080202E8\n\ - ldr r2, _080202DC @ =0x0001605f\n\ - adds r1, r5, r2\n\ - ldrb r0, [r1]\n\ - lsrs r0, 1\n\ - movs r2, 0\n\ - strb r0, [r1]\n\ - ldr r3, _080202E0 @ =0x0001600f\n\ - adds r1, r5, r3\n\ -_080202C8:\n\ - movs r0, 0x5\n\ - strb r0, [r1]\n\ - ldr r0, _080202E4 @ =gBattleMoveDamage\n\ - str r2, [r0]\n\ - b _08020996\n\ - .align 2, 0\n\ -_080202D4: .4byte 0x00016018\n\ -_080202D8: .4byte gPlayerParty\n\ -_080202DC: .4byte 0x0001605f\n\ -_080202E0: .4byte 0x0001600f\n\ -_080202E4: .4byte gBattleMoveDamage\n\ -_080202E8:\n\ - ldr r0, _0802034C @ =gBattleTypeFlags\n\ - ldrh r1, [r0]\n\ - movs r0, 0x8\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - bne _08020316\n\ - ldr r0, _08020350 @ =gBattleMons\n\ - ldrh r0, [r0, 0x28]\n\ - cmp r0, 0\n\ - beq _08020316\n\ - ldr r0, _08020354 @ =0x0001601b\n\ - adds r5, r0\n\ - ldrb r0, [r5]\n\ - cmp r0, 0\n\ - bne _08020316\n\ - bl BattleMusicStop\n\ - ldr r0, _08020358 @ =0x00000161\n\ - bl PlayBGM\n\ - ldrb r0, [r5]\n\ - adds r0, 0x1\n\ - strb r0, [r5]\n\ -_08020316:\n\ - ldr r5, _0802035C @ =gSharedMem\n\ - ldr r1, _08020360 @ =0x00016018\n\ - adds r0, r5, r1\n\ - ldrb r1, [r0]\n\ - movs r0, 0x64\n\ - muls r0, r1\n\ - ldr r1, _08020364 @ =gPlayerParty\n\ - adds r0, r1\n\ - movs r1, 0x39\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _08020332\n\ - b _0802051E\n\ -_08020332:\n\ - ldr r2, _08020368 @ =0x0001605f\n\ - adds r0, r5, r2\n\ - ldrb r0, [r0]\n\ - movs r3, 0x1\n\ - ands r3, r0\n\ - cmp r3, 0\n\ - beq _08020370\n\ - ldr r1, _0802036C @ =gBattleMoveDamage\n\ - mov r3, r10\n\ - ldrh r0, [r3]\n\ - str r0, [r1]\n\ - mov r8, r1\n\ - b _08020376\n\ - .align 2, 0\n\ -_0802034C: .4byte gBattleTypeFlags\n\ -_08020350: .4byte gBattleMons\n\ -_08020354: .4byte 0x0001601b\n\ -_08020358: .4byte 0x00000161\n\ -_0802035C: .4byte gSharedMem\n\ -_08020360: .4byte 0x00016018\n\ -_08020364: .4byte gPlayerParty\n\ -_08020368: .4byte 0x0001605f\n\ -_0802036C: .4byte gBattleMoveDamage\n\ -_08020370:\n\ - ldr r0, _080203EC @ =gBattleMoveDamage\n\ - str r3, [r0]\n\ - mov r8, r0\n\ -_08020376:\n\ - cmp r4, 0x19\n\ - bne _08020386\n\ - ldr r0, _080203F0 @ =gExpShareExp\n\ - ldrh r1, [r0]\n\ - mov r2, r8\n\ - ldr r0, [r2]\n\ - adds r0, r1\n\ - str r0, [r2]\n\ -_08020386:\n\ - cmp r4, 0x28\n\ - bne _0802039C\n\ - mov r3, r8\n\ - ldr r1, [r3]\n\ - movs r0, 0x96\n\ - muls r0, r1\n\ - movs r1, 0x64\n\ - bl __divsi3\n\ - mov r1, r8\n\ - str r0, [r1]\n\ -_0802039C:\n\ - ldr r0, _080203F4 @ =gBattleTypeFlags\n\ - ldrh r1, [r0]\n\ - movs r0, 0x8\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080203B8\n\ - ldr r4, _080203EC @ =gBattleMoveDamage\n\ - ldr r1, [r4]\n\ - movs r0, 0x96\n\ - muls r0, r1\n\ - movs r1, 0x64\n\ - bl __divsi3\n\ - str r0, [r4]\n\ -_080203B8:\n\ - ldr r0, _080203F8 @ =gSharedMem\n\ - ldr r2, _080203FC @ =0x00016018\n\ - adds r0, r2\n\ - ldrb r1, [r0]\n\ - movs r0, 0x64\n\ - muls r0, r1\n\ - ldr r1, _08020400 @ =gPlayerParty\n\ - adds r0, r1\n\ - bl IsTradedMon\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _08020404\n\ - ldr r4, _080203EC @ =gBattleMoveDamage\n\ - ldr r1, [r4]\n\ - movs r0, 0x96\n\ - muls r0, r1\n\ - movs r1, 0x64\n\ - bl __divsi3\n\ - str r0, [r4]\n\ - movs r7, 0xA5\n\ - lsls r7, 1\n\ - mov r8, r4\n\ - b _0802040A\n\ - .align 2, 0\n\ -_080203EC: .4byte gBattleMoveDamage\n\ -_080203F0: .4byte gExpShareExp\n\ -_080203F4: .4byte gBattleTypeFlags\n\ -_080203F8: .4byte gSharedMem\n\ -_080203FC: .4byte 0x00016018\n\ -_08020400: .4byte gPlayerParty\n\ -_08020404:\n\ - ldr r7, _0802043C @ =0x00000149\n\ - ldr r3, _08020440 @ =gBattleMoveDamage\n\ - mov r8, r3\n\ -_0802040A:\n\ - ldr r0, _08020444 @ =gBattleTypeFlags\n\ - ldrh r0, [r0]\n\ - movs r1, 0x1\n\ - ands r1, r0\n\ - cmp r1, 0\n\ - beq _08020488\n\ - ldr r1, _08020448 @ =gBattlePartyID\n\ - ldr r0, _0802044C @ =gSharedMem\n\ - ldr r3, _08020450 @ =0x00016018\n\ - adds r2, r0, r3\n\ - ldrh r1, [r1, 0x4]\n\ - adds r5, r0, 0\n\ - ldr r4, _08020454 @ =gBitTable\n\ - ldr r3, _08020458 @ =gAbsentBankFlags\n\ - ldrb r2, [r2]\n\ - cmp r1, r2\n\ - bne _08020460\n\ - ldrb r1, [r3]\n\ - ldr r0, [r4, 0x8]\n\ - ands r1, r0\n\ - cmp r1, 0\n\ - bne _08020460\n\ - ldr r0, _0802045C @ =0x000160a2\n\ - adds r1, r5, r0\n\ - b _0802047C\n\ - .align 2, 0\n\ -_0802043C: .4byte 0x00000149\n\ -_08020440: .4byte gBattleMoveDamage\n\ -_08020444: .4byte gBattleTypeFlags\n\ -_08020448: .4byte gBattlePartyID\n\ -_0802044C: .4byte gSharedMem\n\ -_08020450: .4byte 0x00016018\n\ -_08020454: .4byte gBitTable\n\ -_08020458: .4byte gAbsentBankFlags\n\ -_0802045C: .4byte 0x000160a2\n\ -_08020460:\n\ - ldrb r2, [r3]\n\ - ldr r0, [r4]\n\ - ands r2, r0\n\ - cmp r2, 0\n\ - bne _08020478\n\ - ldr r1, _08020474 @ =0x000160a2\n\ - adds r0, r5, r1\n\ - strb r2, [r0]\n\ - b _08020490\n\ - .align 2, 0\n\ -_08020474: .4byte 0x000160a2\n\ -_08020478:\n\ - ldr r2, _08020484 @ =0x000160a2\n\ - adds r1, r5, r2\n\ -_0802047C:\n\ - movs r0, 0x2\n\ - strb r0, [r1]\n\ - b _08020490\n\ - .align 2, 0\n\ -_08020484: .4byte 0x000160a2\n\ -_08020488:\n\ - ldr r0, _08020530 @ =gSharedMem\n\ - ldr r3, _08020534 @ =0x000160a2\n\ - adds r0, r3\n\ - strb r1, [r0]\n\ -_08020490:\n\ - ldr r1, _08020538 @ =gBattleTextBuff1\n\ - movs r3, 0\n\ - movs r2, 0xFD\n\ - strb r2, [r1]\n\ - movs r5, 0x4\n\ - strb r5, [r1, 0x1]\n\ - ldr r4, _08020530 @ =gSharedMem\n\ - ldr r0, _08020534 @ =0x000160a2\n\ - adds r6, r4, r0\n\ - ldrb r0, [r6]\n\ - strb r0, [r1, 0x2]\n\ - ldr r0, _0802053C @ =0x00016018\n\ - adds r4, r0\n\ - ldrb r0, [r4]\n\ - strb r0, [r1, 0x3]\n\ - movs r0, 0xFF\n\ - strb r0, [r1, 0x4]\n\ - ldr r1, _08020540 @ =gBattleTextBuff2\n\ - strb r2, [r1]\n\ - strb r3, [r1, 0x1]\n\ - strb r7, [r1, 0x2]\n\ - movs r3, 0xFF\n\ - lsls r3, 8\n\ - ands r7, r3\n\ - asrs r0, r7, 8\n\ - strb r0, [r1, 0x3]\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - strb r0, [r1, 0x4]\n\ - ldr r1, _08020544 @ =gBattleTextBuff3\n\ - strb r2, [r1]\n\ - movs r0, 0x1\n\ - strb r0, [r1, 0x1]\n\ - strb r5, [r1, 0x2]\n\ - movs r0, 0x5\n\ - strb r0, [r1, 0x3]\n\ - mov r0, r8\n\ - ldr r2, [r0]\n\ - strb r2, [r1, 0x4]\n\ - adds r0, r2, 0\n\ - ands r0, r3\n\ - asrs r0, 8\n\ - strb r0, [r1, 0x5]\n\ - movs r0, 0xFF\n\ - lsls r0, 16\n\ - ands r0, r2\n\ - asrs r0, 16\n\ - strb r0, [r1, 0x6]\n\ - lsrs r2, 24\n\ - strb r2, [r1, 0x7]\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - strb r0, [r1, 0x8]\n\ - ldrb r1, [r6]\n\ - movs r0, 0xD\n\ - bl PrepareStringBattle\n\ - ldrb r1, [r4]\n\ - movs r0, 0x64\n\ - muls r0, r1\n\ - ldr r1, _08020548 @ =gPlayerParty\n\ - adds r0, r1\n\ - ldr r3, _0802054C @ =gBattleMons\n\ - ldr r1, _08020550 @ =gBank1\n\ - ldrb r2, [r1]\n\ - movs r1, 0x58\n\ - muls r1, r2\n\ - adds r1, r3\n\ - ldrh r1, [r1]\n\ - bl MonGainEVs\n\ -_0802051E:\n\ - ldr r1, _08020530 @ =gSharedMem\n\ - ldr r3, _08020554 @ =0x0001605f\n\ - adds r2, r1, r3\n\ - ldrb r0, [r2]\n\ - lsrs r0, 1\n\ - strb r0, [r2]\n\ - ldr r0, _08020558 @ =0x0001600f\n\ - adds r1, r0\n\ - b _08020618\n\ - .align 2, 0\n\ -_08020530: .4byte gSharedMem\n\ -_08020534: .4byte 0x000160a2\n\ -_08020538: .4byte gBattleTextBuff1\n\ -_0802053C: .4byte 0x00016018\n\ -_08020540: .4byte gBattleTextBuff2\n\ -_08020544: .4byte gBattleTextBuff3\n\ -_08020548: .4byte gPlayerParty\n\ -_0802054C: .4byte gBattleMons\n\ -_08020550: .4byte gBank1\n\ -_08020554: .4byte 0x0001605f\n\ -_08020558: .4byte 0x0001600f\n\ -_0802055C:\n\ - ldr r0, _08020620 @ =gBattleExecBuffer\n\ - ldr r2, [r0]\n\ - cmp r2, 0\n\ - beq _08020566\n\ - b _08020996\n\ -_08020566:\n\ - ldr r1, _08020624 @ =gBattleBufferB\n\ - ldr r4, _08020628 @ =gSharedMem\n\ - ldr r3, _0802062C @ =0x000160a2\n\ - adds r3, r4\n\ - mov r8, r3\n\ - ldrb r0, [r3]\n\ - lsls r0, 9\n\ - adds r0, r1\n\ - strb r2, [r0]\n\ - ldr r0, _08020630 @ =0x00016018\n\ - adds r7, r4, r0\n\ - ldrb r0, [r7]\n\ - movs r6, 0x64\n\ - muls r0, r6\n\ - ldr r5, _08020634 @ =gPlayerParty\n\ - adds r0, r5\n\ - movs r1, 0x39\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _08020612\n\ - ldrb r0, [r7]\n\ - muls r0, r6\n\ - adds r0, r5\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - cmp r0, 0x64\n\ - beq _08020612\n\ - ldrb r0, [r7]\n\ - muls r0, r6\n\ - adds r0, r5\n\ - movs r1, 0x3A\n\ - bl GetMonData\n\ - ldr r1, _08020638 @ =0x00017180\n\ - adds r4, r1\n\ - strh r0, [r4]\n\ - ldrb r0, [r7]\n\ - muls r0, r6\n\ - adds r0, r5\n\ - movs r1, 0x3B\n\ - bl GetMonData\n\ - strh r0, [r4, 0x2]\n\ - ldrb r0, [r7]\n\ - muls r0, r6\n\ - adds r0, r5\n\ - movs r1, 0x3C\n\ - bl GetMonData\n\ - strh r0, [r4, 0x4]\n\ - ldrb r0, [r7]\n\ - muls r0, r6\n\ - adds r0, r5\n\ - movs r1, 0x3D\n\ - bl GetMonData\n\ - strh r0, [r4, 0x6]\n\ - ldrb r0, [r7]\n\ - muls r0, r6\n\ - adds r0, r5\n\ - movs r1, 0x3E\n\ - bl GetMonData\n\ - strh r0, [r4, 0x8]\n\ - ldrb r0, [r7]\n\ - muls r0, r6\n\ - adds r0, r5\n\ - movs r1, 0x3F\n\ - bl GetMonData\n\ - strh r0, [r4, 0xA]\n\ - ldr r4, _0802063C @ =gActiveBank\n\ - mov r2, r8\n\ - ldrb r0, [r2]\n\ - strb r0, [r4]\n\ - ldrb r1, [r7]\n\ - ldr r0, _08020640 @ =gBattleMoveDamage\n\ - ldrh r2, [r0]\n\ - movs r0, 0\n\ - bl EmitExpBarUpdate\n\ - ldrb r0, [r4]\n\ - bl MarkBufferBankForExecution\n\ -_08020612:\n\ - ldr r1, _08020628 @ =gSharedMem\n\ - ldr r3, _08020644 @ =0x0001600f\n\ - adds r1, r3\n\ -_08020618:\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - b _08020996\n\ - .align 2, 0\n\ -_08020620: .4byte gBattleExecBuffer\n\ -_08020624: .4byte gBattleBufferB\n\ -_08020628: .4byte gSharedMem\n\ -_0802062C: .4byte 0x000160a2\n\ -_08020630: .4byte 0x00016018\n\ -_08020634: .4byte gPlayerParty\n\ -_08020638: .4byte 0x00017180\n\ -_0802063C: .4byte gActiveBank\n\ -_08020640: .4byte gBattleMoveDamage\n\ -_08020644: .4byte 0x0001600f\n\ -_08020648:\n\ - ldr r0, _080208AC @ =gBattleExecBuffer\n\ - ldr r0, [r0]\n\ - cmp r0, 0\n\ - beq _08020652\n\ - b _08020996\n\ -_08020652:\n\ - ldr r1, _080208B0 @ =gActiveBank\n\ - ldr r4, _080208B4 @ =gSharedMem\n\ - ldr r2, _080208B8 @ =0x000160a2\n\ - adds r0, r4, r2\n\ - ldrb r0, [r0]\n\ - strb r0, [r1]\n\ - ldr r2, _080208BC @ =gBattleBufferB\n\ - ldrb r3, [r1]\n\ - lsls r1, r3, 9\n\ - adds r0, r1, r2\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x21\n\ - beq _0802066E\n\ - b _080208F0\n\ -_0802066E:\n\ - adds r0, r2, 0x1\n\ - adds r0, r1, r0\n\ - ldrb r0, [r0]\n\ - cmp r0, 0xB\n\ - beq _0802067A\n\ - b _080208F0\n\ -_0802067A:\n\ - ldr r0, _080208C0 @ =gBattleTypeFlags\n\ - ldrh r1, [r0]\n\ - movs r0, 0x8\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080206A8\n\ - ldr r1, _080208C4 @ =gBattlePartyID\n\ - lsls r0, r3, 1\n\ - adds r2, r0, r1\n\ - ldr r0, _080208C8 @ =0x00016018\n\ - adds r1, r4, r0\n\ - ldrh r0, [r2]\n\ - ldrb r1, [r1]\n\ - cmp r0, r1\n\ - bne _080206A8\n\ - adds r1, r0, 0\n\ - movs r0, 0x64\n\ - muls r0, r1\n\ - ldr r1, _080208CC @ =gPlayerParty\n\ - adds r0, r1\n\ - adds r1, r3, 0\n\ - bl sub_80324F8\n\ -_080206A8:\n\ - ldr r1, _080208D0 @ =gBattleTextBuff1\n\ - movs r2, 0xFD\n\ - strb r2, [r1]\n\ - movs r0, 0x4\n\ - strb r0, [r1, 0x1]\n\ - ldr r5, _080208B0 @ =gActiveBank\n\ - ldrb r0, [r5]\n\ - strb r0, [r1, 0x2]\n\ - ldr r0, _080208B4 @ =gSharedMem\n\ - ldr r3, _080208C8 @ =0x00016018\n\ - adds r6, r0, r3\n\ - ldrb r0, [r6]\n\ - strb r0, [r1, 0x3]\n\ - movs r0, 0xFF\n\ - strb r0, [r1, 0x4]\n\ - ldr r4, _080208D4 @ =gBattleTextBuff2\n\ - strb r2, [r4]\n\ - movs r0, 0x1\n\ - strb r0, [r4, 0x1]\n\ - strb r0, [r4, 0x2]\n\ - movs r0, 0x3\n\ - strb r0, [r4, 0x3]\n\ - ldrb r0, [r6]\n\ - movs r1, 0x64\n\ - mov r8, r1\n\ - mov r2, r8\n\ - muls r2, r0\n\ - adds r0, r2, 0\n\ - ldr r7, _080208CC @ =gPlayerParty\n\ - adds r0, r7\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - strb r0, [r4, 0x4]\n\ - movs r0, 0x1\n\ - negs r0, r0\n\ - strb r0, [r4, 0x5]\n\ - bl BattleScriptPushCursor\n\ - ldr r2, _080208D8 @ =gLeveledUpInBattle\n\ - ldr r1, _080208DC @ =gBitTable\n\ - ldrb r0, [r6]\n\ - lsls r0, 2\n\ - adds r0, r1\n\ - ldr r0, [r0]\n\ - ldrb r1, [r2]\n\ - orrs r0, r1\n\ - strb r0, [r2]\n\ - ldr r1, _080208E0 @ =gBattlescriptCurrInstr\n\ - ldr r0, _080208E4 @ =BattleScript_LevelUp\n\ - str r0, [r1]\n\ - ldr r4, _080208E8 @ =gBattleMoveDamage\n\ - ldr r2, _080208BC @ =gBattleBufferB\n\ - ldrb r1, [r5]\n\ - lsls r1, 9\n\ - adds r0, r2, 0x2\n\ - adds r0, r1, r0\n\ - ldrb r3, [r0]\n\ - adds r2, 0x3\n\ - adds r1, r2\n\ - ldrb r0, [r1]\n\ - lsls r0, 8\n\ - orrs r3, r0\n\ - str r3, [r4]\n\ - ldrb r0, [r6]\n\ - mov r3, r8\n\ - muls r3, r0\n\ - adds r0, r3, 0\n\ - adds r0, r7\n\ - movs r1, 0\n\ - bl AdjustFriendship\n\ - ldr r0, _080208C4 @ =gBattlePartyID\n\ - ldrb r1, [r6]\n\ - ldrh r0, [r0]\n\ - cmp r0, r1\n\ - bne _080207EC\n\ - ldr r4, _080208EC @ =gBattleMons\n\ - ldrh r0, [r4, 0x28]\n\ - cmp r0, 0\n\ - beq _080207EC\n\ - mov r0, r8\n\ - muls r0, r1\n\ - adds r0, r7\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - adds r1, r4, 0\n\ - adds r1, 0x2A\n\ - strb r0, [r1]\n\ - ldrb r0, [r6]\n\ - mov r1, r8\n\ - muls r1, r0\n\ - adds r0, r1, 0\n\ - adds r0, r7\n\ - movs r1, 0x39\n\ - bl GetMonData\n\ - strh r0, [r4, 0x28]\n\ - ldrb r0, [r6]\n\ - mov r2, r8\n\ - muls r2, r0\n\ - adds r0, r2, 0\n\ - adds r0, r7\n\ - movs r1, 0x3A\n\ - bl GetMonData\n\ - strh r0, [r4, 0x2C]\n\ - ldrb r0, [r6]\n\ - mov r3, r8\n\ - muls r3, r0\n\ - adds r0, r3, 0\n\ - adds r0, r7\n\ - movs r1, 0x3B\n\ - bl GetMonData\n\ - strh r0, [r4, 0x2]\n\ - ldrb r0, [r6]\n\ - mov r1, r8\n\ - muls r1, r0\n\ - adds r0, r1, 0\n\ - adds r0, r7\n\ - movs r1, 0x3C\n\ - bl GetMonData\n\ - strh r0, [r4, 0x4]\n\ - ldrb r0, [r6]\n\ - mov r2, r8\n\ - muls r2, r0\n\ - adds r0, r2, 0\n\ - adds r0, r7\n\ - movs r1, 0x3D\n\ - bl GetMonData\n\ - strh r0, [r4, 0x6]\n\ - ldrb r0, [r6]\n\ - mov r3, r8\n\ - muls r3, r0\n\ - adds r0, r3, 0\n\ - adds r0, r7\n\ - movs r1, 0x3D\n\ - bl GetMonData\n\ - strh r0, [r4, 0x6]\n\ - ldrb r0, [r6]\n\ - mov r1, r8\n\ - muls r1, r0\n\ - adds r0, r1, 0\n\ - adds r0, r7\n\ - movs r1, 0x3E\n\ - bl GetMonData\n\ - strh r0, [r4, 0x8]\n\ - ldrb r0, [r6]\n\ - mov r2, r8\n\ - muls r2, r0\n\ - adds r0, r2, 0\n\ - adds r0, r7\n\ - movs r1, 0x3F\n\ - bl GetMonData\n\ - strh r0, [r4, 0xA]\n\ -_080207EC:\n\ - ldr r0, _080208C4 @ =gBattlePartyID\n\ - ldr r1, _080208B4 @ =gSharedMem\n\ - ldr r3, _080208C8 @ =0x00016018\n\ - adds r7, r1, r3\n\ - ldrb r2, [r7]\n\ - ldrh r0, [r0, 0x4]\n\ - cmp r0, r2\n\ - bne _080208F6\n\ - ldr r6, _080208EC @ =gBattleMons\n\ - movs r0, 0xD8\n\ - adds r0, r6\n\ - mov r8, r0\n\ - ldrh r0, [r0]\n\ - cmp r0, 0\n\ - beq _080208F6\n\ - ldr r0, _080208C0 @ =gBattleTypeFlags\n\ - ldrh r1, [r0]\n\ - movs r0, 0x1\n\ - ands r0, r1\n\ - cmp r0, 0\n\ - beq _080208F6\n\ - movs r5, 0x64\n\ - adds r0, r2, 0\n\ - muls r0, r5\n\ - ldr r4, _080208CC @ =gPlayerParty\n\ - adds r0, r4\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - adds r1, r6, 0\n\ - adds r1, 0xDA\n\ - strb r0, [r1]\n\ - ldrb r0, [r7]\n\ - muls r0, r5\n\ - adds r0, r4\n\ - movs r1, 0x39\n\ - bl GetMonData\n\ - mov r1, r8\n\ - strh r0, [r1]\n\ - ldrb r0, [r7]\n\ - muls r0, r5\n\ - adds r0, r4\n\ - movs r1, 0x3A\n\ - bl GetMonData\n\ - adds r1, r6, 0\n\ - adds r1, 0xDC\n\ - strh r0, [r1]\n\ - ldrb r0, [r7]\n\ - muls r0, r5\n\ - adds r0, r4\n\ - movs r1, 0x3B\n\ - bl GetMonData\n\ - adds r1, r6, 0\n\ - adds r1, 0xB2\n\ - strh r0, [r1]\n\ - ldrb r0, [r7]\n\ - muls r0, r5\n\ - adds r0, r4\n\ - movs r1, 0x3C\n\ - bl GetMonData\n\ - adds r1, r6, 0\n\ - adds r1, 0xB4\n\ - strh r0, [r1]\n\ - ldrb r0, [r7]\n\ - muls r0, r5\n\ - adds r0, r4\n\ - movs r1, 0x3D\n\ - bl GetMonData\n\ - movs r2, 0xB6\n\ - adds r2, r6\n\ - mov r8, r2\n\ - strh r0, [r2]\n\ - ldrb r0, [r7]\n\ - muls r0, r5\n\ - adds r0, r4\n\ - movs r1, 0x3D\n\ - bl GetMonData\n\ - mov r3, r8\n\ - strh r0, [r3]\n\ - ldrb r0, [r7]\n\ - muls r0, r5\n\ - adds r0, r4\n\ - movs r1, 0x3E\n\ - bl GetMonData\n\ - adds r1, r6, 0\n\ - adds r1, 0xB8\n\ - strh r0, [r1]\n\ - b _080208F6\n\ - .align 2, 0\n\ -_080208AC: .4byte gBattleExecBuffer\n\ -_080208B0: .4byte gActiveBank\n\ -_080208B4: .4byte gSharedMem\n\ -_080208B8: .4byte 0x000160a2\n\ -_080208BC: .4byte gBattleBufferB\n\ -_080208C0: .4byte gBattleTypeFlags\n\ -_080208C4: .4byte gBattlePartyID\n\ -_080208C8: .4byte 0x00016018\n\ -_080208CC: .4byte gPlayerParty\n\ -_080208D0: .4byte gBattleTextBuff1\n\ -_080208D4: .4byte gBattleTextBuff2\n\ -_080208D8: .4byte gLeveledUpInBattle\n\ -_080208DC: .4byte gBitTable\n\ -_080208E0: .4byte gBattlescriptCurrInstr\n\ -_080208E4: .4byte BattleScript_LevelUp\n\ -_080208E8: .4byte gBattleMoveDamage\n\ -_080208EC: .4byte gBattleMons\n\ -_080208F0:\n\ - ldr r1, _08020904 @ =gBattleMoveDamage\n\ - movs r0, 0\n\ - str r0, [r1]\n\ -_080208F6:\n\ - ldr r0, _08020908 @ =gSharedMem\n\ - ldr r1, _0802090C @ =0x0001600f\n\ - adds r0, r1\n\ - movs r1, 0x5\n\ - strb r1, [r0]\n\ - b _08020996\n\ - .align 2, 0\n\ -_08020904: .4byte gBattleMoveDamage\n\ -_08020908: .4byte gSharedMem\n\ -_0802090C: .4byte 0x0001600f\n\ -_08020910:\n\ - ldr r0, _08020924 @ =gBattleMoveDamage\n\ - ldr r0, [r0]\n\ - cmp r0, 0\n\ - beq _08020930\n\ - ldr r0, _08020928 @ =gSharedMem\n\ - ldr r2, _0802092C @ =0x0001600f\n\ - adds r0, r2\n\ - movs r1, 0x3\n\ - strb r1, [r0]\n\ - b _08020996\n\ - .align 2, 0\n\ -_08020924: .4byte gBattleMoveDamage\n\ -_08020928: .4byte gSharedMem\n\ -_0802092C: .4byte 0x0001600f\n\ -_08020930:\n\ - ldr r2, _08020950 @ =gSharedMem\n\ - ldr r3, _08020954 @ =0x00016018\n\ - adds r1, r2, r3\n\ - ldrb r0, [r1]\n\ - adds r0, 0x1\n\ - strb r0, [r1]\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - cmp r0, 0x5\n\ - bhi _0802095C\n\ - ldr r0, _08020958 @ =0x0001600f\n\ - adds r1, r2, r0\n\ - movs r0, 0x2\n\ - strb r0, [r1]\n\ - b _08020996\n\ - .align 2, 0\n\ -_08020950: .4byte gSharedMem\n\ -_08020954: .4byte 0x00016018\n\ -_08020958: .4byte 0x0001600f\n\ -_0802095C:\n\ - ldr r3, _08020968 @ =0x0001600f\n\ - adds r1, r2, r3\n\ - movs r0, 0x6\n\ - strb r0, [r1]\n\ - b _08020996\n\ - .align 2, 0\n\ -_08020968: .4byte 0x0001600f\n\ -_0802096C:\n\ - ldr r0, _080209A4 @ =gBattleExecBuffer\n\ - ldr r5, [r0]\n\ - cmp r5, 0\n\ - bne _08020996\n\ - ldr r4, _080209A8 @ =gBattleMons\n\ - ldr r2, _080209AC @ =gBank1\n\ - ldrb r0, [r2]\n\ - movs r1, 0x58\n\ - muls r0, r1\n\ - adds r0, r4\n\ - movs r3, 0\n\ - strh r5, [r0, 0x2E]\n\ - ldrb r0, [r2]\n\ - muls r0, r1\n\ - adds r0, r4\n\ - adds r0, 0x20\n\ - strb r3, [r0]\n\ - ldr r1, _080209B0 @ =gBattlescriptCurrInstr\n\ - ldr r0, [r1]\n\ - adds r0, 0x2\n\ - str r0, [r1]\n\ -_08020996:\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080209A4: .4byte gBattleExecBuffer\n\ -_080209A8: .4byte gBattleMons\n\ -_080209AC: .4byte gBank1\n\ -_080209B0: .4byte gBattlescriptCurrInstr\n\ - .syntax divided\n"); -} - -#endif // NONMATCHING #ifdef NONMATCHING static void atk24(void) @@ -6952,7 +5905,7 @@ _08020B50: .4byte gBattlescriptCurrInstr\n\ static void MoveValuesCleanUp(void) { gBattleMoveFlags = 0; - BATTLE_STRUCT->dmgMultiplier = 1; + gBattleStruct->dmgMultiplier = 1; gCritMultiplier = 1; gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattleCommunication[6] = 0; @@ -7417,7 +6370,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po static void atk47_setgraphicalstatchangevalues(void) { u8 to_add = 0; - switch (BATTLE_STRUCT->statChanger & 0xF0) + switch (gBattleStruct->statChanger & 0xF0) { case 0x10: //+1 to_add = 0xF; @@ -7432,8 +6385,8 @@ static void atk47_setgraphicalstatchangevalues(void) to_add = 0x2E; break; } - BATTLE_STRUCT->animArg1 = (BATTLE_STRUCT->statChanger & 0xF) + to_add - 1; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->animArg1 = (gBattleStruct->statChanger & 0xF) + to_add - 1; + gBattleStruct->animArg2 = 0; gBattlescriptCurrInstr++; } @@ -7507,14 +6460,14 @@ static void atk48_playstatchangeanimation(void) stat_animID = 0x38; } if ((T2_READ_8(gBattlescriptCurrInstr + 3) & 2 && changeable_stats <= 1) - || changeable_stats == 0 || BATTLE_STRUCT->filler2[0] != 0) + || changeable_stats == 0 || gBattleStruct->filler2[0] != 0) gBattlescriptCurrInstr += 4; else { EmitBattleAnimation(0, 1, stat_animID); MarkBufferBankForExecution(gActiveBank); if ((T2_READ_8(gBattlescriptCurrInstr + 3) & 4) && changeable_stats > 1) - BATTLE_STRUCT->filler2[0] = 1; + gBattleStruct->filler2[0] = 1; gBattlescriptCurrInstr += 4; } } @@ -7807,14 +6760,14 @@ static void atk49_moveend(void) hold_effect_atk = ItemId_GetHoldEffect(gBattleMons[gBankTarget].item); choiced_move_atk = (u16*)(gBankAttacker * (ewram_addr + 0x160E8)); - if (BATTLE_STRUCT->dynamicMoveType) - move_type = BATTLE_STRUCT->dynamicMoveType & 0x3F; + if (gBattleStruct->dynamicMoveType) + move_type = gBattleStruct->dynamicMoveType & 0x3F; else move_type = gBattleMoves[gCurrentMove].type; do { - switch (BATTLE_STRUCT->cmd49StateTracker) + switch (gBattleStruct->cmd49StateTracker) { case 0: //rage check if (gBattleMons[gBankTarget].status2 & STATUS2_RAGE @@ -7828,7 +6781,7 @@ static void atk49_moveend(void) gBattlescriptCurrInstr = BattleScript_RageIsBuilding; effect = 1; } - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 1: //defrosting check if (gBattleMons[gBankTarget].status1 & STATUS_FREEZE @@ -7844,28 +6797,28 @@ static void atk49_moveend(void) gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove; effect = 1; } - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 2: //target synchronize if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBankTarget, 0, 0, 0)) effect = 1; - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 3: //contact abilities if (AbilityBattleEffects(ABILITYEFFECT_CONTACT, gBankTarget, 0, 0, 0)) effect = 1; - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 4: //status immunities if (AbilityBattleEffects(ABILITYEFFECT_IMMUNITY, 0, 0, 0, 0)) effect = 1; //it loops through 4 banks, so we increment after its done with all banks else - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 5: //attacker synchronize if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBankAttacker, 0, 0, 0)) effect = 1; - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 6: //update choice band move if (gHitMarker & HITMARKER_OBEYS && hold_effect_atk == HOLD_EFFECT_CHOICE_BAND @@ -7877,7 +6830,7 @@ static void atk49_moveend(void) if (i == 4) *choiced_move_atk = 0; } - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 7: //changed held items for (i = 0; i < gNoOfAllBanks; i++) @@ -7886,7 +6839,7 @@ static void atk49_moveend(void) if (CHANGED_ITEM(i)) gBattleMons[i].item = CHANGED_ITEM(i); } - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 8: //make sprite invisible if (gStatuses3[gBankAttacker] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER) @@ -7896,7 +6849,7 @@ static void atk49_moveend(void) EmitSpriteInvisibility(0, 1); MarkBufferBankForExecution(gActiveBank); } - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 9: //semi-invlurneable attacker make visible if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankAttacker] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER)) @@ -7908,7 +6861,7 @@ static void atk49_moveend(void) gStatuses3 &= ~(STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER); gSpecialStatuses[gBankAttacker].restored_bank_sprite = 1; } - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 10: //semi-invlurneable target make visible if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) || !(gStatuses3[gBankTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER)) @@ -7920,7 +6873,7 @@ static void atk49_moveend(void) gStatuses3 &= ~(STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER); gSpecialStatuses[gBankTarget].restored_bank_sprite = 1; } - BATTLE_STRUCT->cmd49StateTracker++; + gBattleStruct->cmd49StateTracker++; break; case 11: // } @@ -8865,7 +7818,7 @@ _08021FA0:\n\ ldr r0, _08021FD4 @ =0x0000ffff\n\ cmp r2, r0\n\ bne _08021FEC\n\ - ldr r1, _08021FE8 @ =gMoveHitWith\n\ + ldr r1, _08021FE8 @ =gLastLandedMoves\n\ ldr r4, _08021FDC @ =gBankTarget\n\ ldrb r0, [r4]\n\ lsls r0, 1\n\ @@ -8879,9 +7832,9 @@ _08021FD8: .4byte gUnknown_02024C4C\n\ _08021FDC: .4byte gBankTarget\n\ _08021FE0: .4byte gUnknown_02024C5C\n\ _08021FE4: .4byte gBattleMoveFlags\n\ -_08021FE8: .4byte gMoveHitWith\n\ +_08021FE8: .4byte gLastLandedMoves\n\ _08021FEC:\n\ - ldr r0, _08022014 @ =gMoveHitWith\n\ + ldr r0, _08022014 @ =gLastLandedMoves\n\ ldr r5, _08022018 @ =gBankTarget\n\ ldrb r1, [r5]\n\ lsls r1, 1\n\ @@ -8894,7 +7847,7 @@ _08021FEC:\n\ ldrb r3, [r0]\n\ cmp r3, 0\n\ beq _08022028\n\ - ldr r0, _08022024 @ =gUnknown_02024C44\n\ + ldr r0, _08022024 @ =gLastHitByType\n\ ldrb r1, [r5]\n\ lsls r1, 1\n\ adds r1, r0\n\ @@ -8902,13 +7855,13 @@ _08021FEC:\n\ ands r0, r3\n\ b _08021C22\n\ .align 2, 0\n\ -_08022014: .4byte gMoveHitWith\n\ +_08022014: .4byte gLastLandedMoves\n\ _08022018: .4byte gBankTarget\n\ _0802201C: .4byte gCurrentMove\n\ _08022020: .4byte 0x0001601c\n\ -_08022024: .4byte gUnknown_02024C44\n\ +_08022024: .4byte gLastHitByType\n\ _08022028:\n\ - ldr r0, _08022044 @ =gUnknown_02024C44\n\ + ldr r0, _08022044 @ =gLastHitByType\n\ ldr r1, _08022048 @ =gBankTarget\n\ ldrb r2, [r1]\n\ lsls r2, 1\n\ @@ -8922,10 +7875,10 @@ _08022028:\n\ strh r0, [r2]\n\ b _08022244\n\ .align 2, 0\n\ -_08022044: .4byte gUnknown_02024C44\n\ +_08022044: .4byte gLastHitByType\n\ _08022048: .4byte gBankTarget\n\ _0802204C:\n\ - ldr r0, _0802205C @ =gMoveHitWith\n\ + ldr r0, _0802205C @ =gLastLandedMoves\n\ ldr r2, _08022060 @ =gBankTarget\n\ ldrb r1, [r2]\n\ lsls r1, 1\n\ @@ -8933,7 +7886,7 @@ _0802204C:\n\ ldr r0, _08022064 @ =0x0000ffff\n\ b _08021C22\n\ .align 2, 0\n\ -_0802205C: .4byte gMoveHitWith\n\ +_0802205C: .4byte gLastLandedMoves\n\ _08022060: .4byte gBankTarget\n\ _08022064: .4byte 0x0000ffff\n\ _08022068:\n\ @@ -9250,7 +8203,7 @@ static void atk4A_typecalc2(void) { gLastUsedAbility = gBattleMons[gBankTarget].ability; gBattleMoveFlags |= (MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED); - gMoveHitWith[gBankTarget] = 0; + gLastLandedMoves[gBankTarget] = 0; gBattleCommunication[6] = move_type; RecordAbilityBattle(gBankTarget, gLastUsedAbility); } @@ -9305,7 +8258,7 @@ static void atk4A_typecalc2(void) { gLastUsedAbility = ABILITY_WONDER_GUARD; gBattleMoveFlags |= MOVESTATUS_MISSED; - gMoveHitWith[gBankTarget] = 0; + gLastLandedMoves[gBankTarget] = 0; gBattleCommunication[6] = 3; RecordAbilityBattle(gBankTarget, gLastUsedAbility); } @@ -9384,7 +8337,7 @@ static void atk4D_switchindataupdate(void) gBattleMons[gActiveBank].status2 = OldData.status2; } SwitchInClearStructs(); - BATTLE_STRUCT->scriptingActive = gActiveBank; + gBattleStruct->scriptingActive = gActiveBank; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 7; gBattleTextBuff1[2] = gActiveBank; @@ -9484,7 +8437,7 @@ static void atk4F_jumpifcantswitch(void) void sub_8022A3C(u8 unkown) { BATTLE_PARTY_ID(gActiveBank) = gBattlePartyID[gActiveBank]; - EmitChoosePokemon(0, 1, unkown, 0, BATTLE_STRUCT->unk1606C[gActiveBank]); + EmitChoosePokemon(0, 1, unkown, 0, gBattleStruct->unk1606C[gActiveBank]); MarkBufferBankForExecution(gActiveBank); } @@ -10630,7 +9583,7 @@ static void atk52_switchineffects(void) if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - BATTLE_STRUCT->scriptingActive = gActiveBank; + gBattleStruct->scriptingActive = gActiveBank; BattleScriptPushCursor(); if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0) @@ -10737,9 +9690,9 @@ void atk59_handlelearnnewmove(void) u8* loc1 = T1_READ_PTR(gBattlescriptCurrInstr + 1); u8* loc2 = T1_READ_PTR(gBattlescriptCurrInstr + 5); - u16 ret = MonTryLearningNewMove(&gPlayerParty[BATTLE_STRUCT->expGetterID], T2_READ_8(gBattlescriptCurrInstr + 9)); + u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterID], T2_READ_8(gBattlescriptCurrInstr + 9)); while (ret == 0xFFFE) - ret = MonTryLearningNewMove(&gPlayerParty[BATTLE_STRUCT->expGetterID], 0); + ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterID], 0); if (ret == 0) { @@ -10752,12 +9705,12 @@ void atk59_handlelearnnewmove(void) else { gActiveBank = GetBankByIdentity(0); - if (gBattlePartyID[gActiveBank] == BATTLE_STRUCT->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED)) + if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED)) GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) //what is else if { gActiveBank = GetBankByIdentity(2); - if (gBattlePartyID[gActiveBank] == BATTLE_STRUCT->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED)) + if (gBattlePartyID[gActiveBank] == gBattleStruct->expGetterID && !(gBattleMons[gActiveBank].status2 & STATUS2_TRANSFORMED)) GiveMoveToBattleMon(&gBattleMons[gActiveBank], ret); } gBattlescriptCurrInstr = loc1; @@ -10781,11 +9734,11 @@ void sub_8023AD8(void) static void atk5A_yesnoboxlearnmove(void) { gActiveBank = 0; - switch (BATTLE_STRUCT->atk5A_StateTracker) + switch (gBattleStruct->atk5A_StateTracker) { case 0: sub_8023A80(); - BATTLE_STRUCT->atk5A_StateTracker++; + gBattleStruct->atk5A_StateTracker++; gBattleCommunication[1] = 0; sub_802BC6C(); break; @@ -10811,7 +9764,7 @@ static void atk5A_yesnoboxlearnmove(void) { sub_8023AD8(); BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); - BATTLE_STRUCT->atk5A_StateTracker++; + gBattleStruct->atk5A_StateTracker++; return; } goto state_tracker_4; @@ -10820,14 +9773,14 @@ static void atk5A_yesnoboxlearnmove(void) { PlaySE(SE_SELECT); state_tracker_4: - BATTLE_STRUCT->atk5A_StateTracker = 4; + gBattleStruct->atk5A_StateTracker = 4; } break; case 2: if (!gPaletteFade.active) { - ShowSelectMovePokemonSummaryScreen(gPlayerParty, BATTLE_STRUCT->expGetterID, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn); - BATTLE_STRUCT->atk5A_StateTracker++; + ShowSelectMovePokemonSummaryScreen(gPlayerParty, gBattleStruct->expGetterID, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn); + gBattleStruct->atk5A_StateTracker++; } break; case 3: @@ -10836,15 +9789,15 @@ static void atk5A_yesnoboxlearnmove(void) u8 move_pos = sub_809FA30(); if (move_pos == 4) { - BATTLE_STRUCT->atk5A_StateTracker = 4; + gBattleStruct->atk5A_StateTracker = 4; } else { - u16 move = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_MOVE1 + move_pos); + u16 move = GetMonData(&gPlayerParty[gBattleStruct->expGetterID], MON_DATA_MOVE1 + move_pos); if (IsHMMove2(move)) { PrepareStringBattle(0x13F, gActiveBank); - BATTLE_STRUCT->atk5A_StateTracker = 5; + gBattleStruct->atk5A_StateTracker = 5; } else { @@ -10860,15 +9813,15 @@ static void atk5A_yesnoboxlearnmove(void) ptr += 4; } ptr[0] = 0xFF; - RemoveMonPPBonus(&gPlayerParty[BATTLE_STRUCT->expGetterID], move_pos); - SetMonMoveSlot(&gPlayerParty[BATTLE_STRUCT->expGetterID], gMoveToLearn, move_pos); - if (gBattlePartyID[0] == BATTLE_STRUCT->expGetterID && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED) + RemoveMonPPBonus(&gPlayerParty[gBattleStruct->expGetterID], move_pos); + SetMonMoveSlot(&gPlayerParty[gBattleStruct->expGetterID], gMoveToLearn, move_pos); + if (gBattlePartyID[0] == gBattleStruct->expGetterID && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[0].unk18_b & gBitTable[move_pos])) { RemoveBattleMonPPBonus(&gBattleMons[0], move_pos); SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, move_pos); } - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlePartyID[2] == BATTLE_STRUCT->expGetterID && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED) + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlePartyID[2] == gBattleStruct->expGetterID && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED) && !(gDisableStructs[2].unk18_b & gBitTable[move_pos])) { RemoveBattleMonPPBonus(&gBattleMons[2], move_pos); @@ -10885,7 +9838,7 @@ static void atk5A_yesnoboxlearnmove(void) case 5: if (gBattleExecBuffer == 0) { - BATTLE_STRUCT->atk5A_StateTracker = 2; + gBattleStruct->atk5A_StateTracker = 2; } break; } @@ -10893,11 +9846,11 @@ static void atk5A_yesnoboxlearnmove(void) static void atk5B_yesnoboxstoplearningmove(void) { - switch (BATTLE_STRUCT->atk5A_StateTracker) + switch (gBattleStruct->atk5A_StateTracker) { case 0: sub_8023A80(); - BATTLE_STRUCT->atk5A_StateTracker++; + gBattleStruct->atk5A_StateTracker++; gBattleCommunication[1] = 0; sub_802BC6C(); break; @@ -10959,7 +9912,7 @@ static void atk5D_getmoneyreward(void) u32 money_to_give; if (gTrainerBattleOpponent == 0x400) { - money_to_give = 2 * BATTLE_STRUCT->moneyMultiplier * MONEY_UNKNOWN; + money_to_give = 2 * gBattleStruct->moneyMultiplier * MONEY_UNKNOWN; } else { @@ -10987,7 +9940,7 @@ static void atk5D_getmoneyreward(void) } for (; gTrainerMoney[i * 4] != 0xFF && gTrainerMoney[i * 4 + 1] != gTrainers[gTrainerBattleOpponent].trainerClass ; i++) {} - money_to_give = (r5 << 2) * BATTLE_STRUCT->moneyMultiplier; + money_to_give = (r5 << 2) * gBattleStruct->moneyMultiplier; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) money_to_give = 2 * gTrainerMoney[i * 4 + 1] * money_to_give; else @@ -11471,7 +10424,7 @@ static void atk6C_drawlvlupbox(void) { u8 r1 = 0; u8 r7 = 0; - switch (BATTLE_STRUCT->atk6C_statetracker) + switch (gBattleStruct->atk6C_statetracker) { case 0: sub_802BBD4(0xB, 0, 0x1D, 0x7, r1); @@ -11956,13 +10909,13 @@ static void atk73_hpthresholds(void) result = 1; if (result > 69 || !gBattleMons[opposing_bank].hp) - BATTLE_STRUCT->hpScale = 0; + gBattleStruct->hpScale = 0; else if (result > 39) - BATTLE_STRUCT->hpScale = 1; + gBattleStruct->hpScale = 1; else if (result > 9) - BATTLE_STRUCT->hpScale = 2; + gBattleStruct->hpScale = 2; else - BATTLE_STRUCT->hpScale = 3; + gBattleStruct->hpScale = 3; } gBattlescriptCurrInstr += 2; @@ -11977,17 +10930,17 @@ static void atk74_hpthresholds2(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); opposing_bank = gActiveBank ^ 1; - hp_switchout = ewram160BCarr(GetBankSide(opposing_bank)); //BATTLE_STRUCT->HP_OnSwitchout[GetBankSide(opposing_bank)]; + hp_switchout = ewram160BCarr(GetBankSide(opposing_bank)); //gBattleStruct->HP_OnSwitchout[GetBankSide(opposing_bank)]; result = (hp_switchout - gBattleMons[opposing_bank].hp) * 100 / hp_switchout; if (gBattleMons[opposing_bank].hp >= hp_switchout) - BATTLE_STRUCT->hpScale = 0; + gBattleStruct->hpScale = 0; else if (result <= 29) - BATTLE_STRUCT->hpScale = 1; + gBattleStruct->hpScale = 1; else if (result <= 69) - BATTLE_STRUCT->hpScale = 2; + gBattleStruct->hpScale = 2; else - BATTLE_STRUCT->hpScale = 3; + gBattleStruct->hpScale = 3; } gBattlescriptCurrInstr += 2; @@ -12039,9 +10992,9 @@ static void atk76_various(void) { int i; u16* choiced_move; - if (gBattlePartyID[0] == BATTLE_STRUCT->expGetterID) + if (gBattlePartyID[0] == gBattleStruct->expGetterID) goto ACTIVE_0; - if (gBattlePartyID[2] != BATTLE_STRUCT->expGetterID) + if (gBattlePartyID[2] != gBattleStruct->expGetterID) break; if (gBattlePartyID[0] == gBattlePartyID[2]) { @@ -12355,7 +11308,7 @@ bool8 UproarWakeUpCheck(u8 bank) { if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[bank].ability == ABILITY_SOUNDPROOF) //wtf gamefreak, you should check this only once, not every time in a loop... continue; - BATTLE_STRUCT->scriptingActive = i; + gBattleStruct->scriptingActive = i; if (gBankTarget == 0xFF) gBankTarget = i; else if (gBankTarget == i) @@ -12424,7 +11377,7 @@ static void atk86_stockpiletobasedamage(void) gSideAffecting[GetBankIdentity(gBankTarget) & 1], 0, 0, gBankAttacker, gBankTarget) * gDisableStructs[gBankAttacker].stockpileCounter; - BATTLE_STRUCT->animTurn = gDisableStructs[gBankAttacker].stockpileCounter; + gBattleStruct->animTurn = gDisableStructs[gBankAttacker].stockpileCounter; if (gProtectStructs[gBankAttacker].helpingHand) gBattleMoveDamage = gBattleMoveDamage * 15 / 10; @@ -12455,7 +11408,7 @@ static void atk87_stockpiletohpheal(void) if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; gBattleMoveDamage *= -1; - BATTLE_STRUCT->animTurn = gDisableStructs[gBankAttacker].stockpileCounter; + gBattleStruct->animTurn = gDisableStructs[gBankAttacker].stockpileCounter; gDisableStructs[gBankAttacker].stockpileCounter = 0; gBattlescriptCurrInstr += 5; gBankTarget = gBankAttacker; @@ -12464,7 +11417,7 @@ static void atk87_stockpiletohpheal(void) static void atk88_negativedamage(void) { - gBattleMoveDamage = -(gHP_dealt / 2); + gBattleMoveDamage = -(gHpDealt / 2); if (gBattleMoveDamage == 0) gBattleMoveDamage = -1; gBattlescriptCurrInstr++; @@ -12504,7 +11457,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) else { BattleScriptPush(bs_ptr); - BATTLE_STRUCT->scriptingActive = gActiveBank; + gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_MistProtected; gSpecialStatuses[gActiveBank].statloweringflag = 1; } @@ -12525,7 +11478,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) else { BattleScriptPush(bs_ptr); - BATTLE_STRUCT->scriptingActive = gActiveBank; + gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; RecordAbilityBattle(gActiveBank, gLastUsedAbility); @@ -12539,7 +11492,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) if (flags == 1) { BattleScriptPush(bs_ptr); - BATTLE_STRUCT->scriptingActive = gActiveBank; + gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; RecordAbilityBattle(gActiveBank, gLastUsedAbility); @@ -12551,7 +11504,7 @@ u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) if (flags == 1) { BattleScriptPush(bs_ptr); - BATTLE_STRUCT->scriptingActive = gActiveBank; + gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; RecordAbilityBattle(gActiveBank, gLastUsedAbility); @@ -13224,7 +12177,7 @@ _080262C0: .4byte gBattleMoveFlags\n\ static void atk89_statbuffchange(void) { u8* jump_loc = T1_READ_PTR(gBattlescriptCurrInstr + 2); - if (ChangeStatBuffs(BATTLE_STRUCT->statChanger & 0xF0, BATTLE_STRUCT->statChanger & 0xF, T2_READ_8(gBattlescriptCurrInstr + 1), jump_loc) == 0) + if (ChangeStatBuffs(gBattleStruct->statChanger & 0xF0, gBattleStruct->statChanger & 0xF, T2_READ_8(gBattlescriptCurrInstr + 1), jump_loc) == 0) gBattlescriptCurrInstr += 6; } @@ -13456,7 +12409,7 @@ static void atk91_givepaydaymoney(void) { if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gPaydayMoney) { - AddMoney(&gSaveBlock1.money, gPaydayMoney * BATTLE_STRUCT->moneyMultiplier); + AddMoney(&gSaveBlock1.money, gPaydayMoney * gBattleStruct->moneyMultiplier); gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 1; gBattleTextBuff1[2] = 2; @@ -14142,8 +13095,8 @@ static void atk9C_setsubstitute(void) static bool8 IsMoveUncopyable(u16 move) { int i; - for (i = 0; sUnknown_081FACFE[i] != 0xFFFE && sUnknown_081FACFE[i] != move; i++) {} - return (sUnknown_081FACFE[i] != 0xFFFE); + for (i = 0; sMovesForbiddenToCopy[i] != 0xFFFE && sMovesForbiddenToCopy[i] != move; i++) {} + return (sMovesForbiddenToCopy[i] != 0xFFFE); } static void atk9D_mimicattackcopy(void) @@ -14187,13 +13140,13 @@ static void atk9D_mimicattackcopy(void) #ifdef NONMATCHING static void atk9E_metronome(void) { - // sUnknown_081FACFE + // sMovesForbiddenToCopy int i; do { while ((gCurrentMove = (Random() & 0x1FF) + 1) > 0x162); - for (i = 0; sUnknown_081FACFE[i] != gCurrentMove && sUnknown_081FACFE[i] != 0xFFFF; i++); - } while (sUnknown_081FACFE[i] != 0xFFFF); + for (i = 0; sMovesForbiddenToCopy[i] != gCurrentMove && sMovesForbiddenToCopy[i] != 0xFFFF; i++); + } while (sMovesForbiddenToCopy[i] != 0xFFFF); gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; @@ -14211,7 +13164,7 @@ static void atk9E_metronome(void) ldr r7, _08027938 @ =gCurrentMove\n\ movs r6, 0xB1\n\ lsls r6, 1\n\ - ldr r5, _0802793C @ =sUnknown_081FACFE\n\ + ldr r5, _0802793C @ =sMovesForbiddenToCopy\n\ ldr r0, _08027940 @ =gBattlescriptCurrInstr\n\ mov r8, r0\n\ _080278CA:\n\ @@ -14273,7 +13226,7 @@ _080278F8:\n\ bx r0\n\ .align 2, 0\n\ _08027938: .4byte gCurrentMove\n\ -_0802793C: .4byte sUnknown_081FACFE\n\ +_0802793C: .4byte sMovesForbiddenToCopy\n\ _08027940: .4byte gBattlescriptCurrInstr\n\ _08027944: .4byte 0x000001ff\n\ _08027948: .4byte 0x0000ffff\n\ @@ -14398,10 +13351,10 @@ static void atkA5_painsplitdmgcalc(void) { s32 hp_diff = (gBattleMons[gBankAttacker].hp + gBattleMons[gBankTarget].hp) / 2; s32 to_store = gBattleMoveDamage = gBattleMons[gBankTarget].hp - hp_diff; - BATTLE_STRUCT->unk16014 = sBYTE0_32(to_store); - BATTLE_STRUCT->unk16015 = sBYTE1_32(to_store); - BATTLE_STRUCT->unk16016 = sBYTE2_32(to_store); - BATTLE_STRUCT->unk16017 = sBYTE3_32(to_store); + gBattleStruct->unk16014 = sBYTE0_32(to_store); + gBattleStruct->unk16015 = sBYTE1_32(to_store); + gBattleStruct->unk16016 = sBYTE2_32(to_store); + gBattleStruct->unk16017 = sBYTE3_32(to_store); gBattleMoveDamage = gBattleMons[gBankAttacker].hp - hp_diff; gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF; @@ -14415,7 +13368,7 @@ static void atkA5_painsplitdmgcalc(void) #ifdef NONMATCHING static void atkA6_settypetorandomresistance(void) { - if (gMoveHitWith[gBankAttacker] == 0 || gMoveHitWith[gBankAttacker] == 0xFFFF || (IsTwoTurnsMove(gMoveHitWith[gBankAttacker]) && !gProtectStructs[gBankAttacker].physicalDmg && !gProtectStructs[gBankAttacker].specialDmg)) + if (gLastLandedMoves[gBankAttacker] == 0 || gLastLandedMoves[gBankAttacker] == 0xFFFF || (IsTwoTurnsMove(gLastLandedMoves[gBankAttacker]) && !gProtectStructs[gBankAttacker].physicalDmg && !gProtectStructs[gBankAttacker].specialDmg)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else { @@ -14424,7 +13377,7 @@ static void atkA6_settypetorandomresistance(void) { while (((type = (Random() & 0x7F)) > 0x70)); type *= 3; - if (gTypeEffectiveness[type] == gUnknown_02024C44[gBankAttacker] && gTypeEffectiveness[type + 2] <= 5 && gBattleMons[gBankAttacker].type1 != gTypeEffectiveness[type + 1] && gBattleMons[gBankAttacker].type2 != gTypeEffectiveness[type + 1]) + if (gTypeEffectiveness[type] == gLastHitByType[gBankAttacker] && gTypeEffectiveness[type + 2] <= 5 && gBattleMons[gBankAttacker].type1 != gTypeEffectiveness[type + 1] && gBattleMons[gBankAttacker].type2 != gTypeEffectiveness[type + 1]) { gBattleMons[gBankAttacker].type1 = type; gBattleMons[gBankAttacker].type2 = type; @@ -14443,7 +13396,7 @@ static void atkA6_settypetorandomresistance(void) { if (gTypeEffectiveness[type] == 0xFE || gTypeEffectiveness[type] != 0xFF) { - if (gTypeEffectiveness[type] == gUnknown_02024C44[gBankAttacker] && gTypeEffectiveness[type + 2] <= 5 && gBattleMons[gBankAttacker].type1 != gTypeEffectiveness[type + 1] && gBattleMons[gBankAttacker].type2 != gTypeEffectiveness[type + 1]) + if (gTypeEffectiveness[type] == gLastHitByType[gBankAttacker] && gTypeEffectiveness[type + 2] <= 5 && gBattleMons[gBankAttacker].type1 != gTypeEffectiveness[type + 1] && gBattleMons[gBankAttacker].type2 != gTypeEffectiveness[type + 1]) { gBattleMons[gBankAttacker].type1 = gTypeEffectiveness[rands + 1]; gBattleMons[gBankAttacker].type2 = gTypeEffectiveness[rands + 1]; @@ -14472,7 +13425,7 @@ static void atkA6_settypetorandomresistance(void) mov r6, r9\n\ mov r5, r8\n\ push {r5-r7}\n\ - ldr r1, _08027FA8 @ =gMoveHitWith\n\ + ldr r1, _08027FA8 @ =gLastLandedMoves\n\ ldr r4, _08027FAC @ =gBankAttacker\n\ ldrb r0, [r4]\n\ lsls r0, 1\n\ @@ -14518,7 +13471,7 @@ _08027F8C:\n\ str r1, [r3]\n\ b _08028110\n\ .align 2, 0\n\ -_08027FA8: .4byte gMoveHitWith\n\ +_08027FA8: .4byte gLastLandedMoves\n\ _08027FAC: .4byte gBankAttacker\n\ _08027FB0: .4byte 0x0000ffff\n\ _08027FB4: .4byte gProtectStructs\n\ @@ -14590,7 +13543,7 @@ _0802802C:\n\ adds r4, r0, r4\n\ ldr r6, _08028120 @ =gTypeEffectiveness\n\ adds r3, r4, r6\n\ - ldr r1, _08028124 @ =gUnknown_02024C44\n\ + ldr r1, _08028124 @ =gLastHitByType\n\ ldr r2, _08028128 @ =gBankAttacker\n\ ldrb r5, [r2]\n\ lsls r0, r5, 1\n\ @@ -14651,7 +13604,7 @@ _080280AE:\n\ mov r4, r10\n\ ldrb r2, [r4]\n\ lsls r0, r2, 1\n\ - ldr r7, _08028124 @ =gUnknown_02024C44\n\ + ldr r7, _08028124 @ =gLastHitByType\n\ adds r0, r7\n\ ldrh r0, [r0]\n\ cmp r1, r0\n\ @@ -14708,7 +13661,7 @@ _08028110:\n\ bx r0\n\ .align 2, 0\n\ _08028120: .4byte gTypeEffectiveness\n\ -_08028124: .4byte gUnknown_02024C44\n\ +_08028124: .4byte gLastHitByType\n\ _08028128: .4byte gBankAttacker\n\ _0802812C: .4byte gBattleMons\n\ _08028130: .4byte 0x000003e7\n\ @@ -14842,7 +13795,7 @@ static void atkAA_setdestinybond(void) gBattlescriptCurrInstr++; } -static void DestinyBondFlagUpdate(void) +static void TrySetDestinyBondToHappen(void) { u8 atk_side = GetBankSide(gBankAttacker); u8 def_side = GetBankSide(gBankTarget); @@ -14852,7 +13805,7 @@ static void DestinyBondFlagUpdate(void) static void atkAB_trysetdestinybondtohappen(void) { - DestinyBondFlagUpdate(); + TrySetDestinyBondToHappen(); gBattlescriptCurrInstr++; } @@ -14862,10 +13815,10 @@ static void atkAC_remaininghptopower(void) int i; for (i = 0; i < 12; i += 2) { - if (hp_fraction <= sUnknown_081FAD26[i]) + if (hp_fraction <= sFlailHpScaleToPowerTable[i]) break; } - gDynamicBasePower = sUnknown_081FAD26[i + 1]; + gDynamicBasePower = sFlailHpScaleToPowerTable[i + 1]; gBattlescriptCurrInstr++; } @@ -14941,7 +13894,7 @@ static void atkAE_healpartystatus(void) gBattleCommunication[MULTISTRING_CHOOSER] |= 1; } - gActiveBank = BATTLE_STRUCT->scriptingActive = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); + gActiveBank = gBattleStruct->scriptingActive = GetBankByIdentity(GetBankIdentity(gBankAttacker) ^ 2); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank])) { if (gBattleMons[gActiveBank].ability != ABILITY_SOUNDPROOF) @@ -15250,7 +14203,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void) } gCurrentMove = MOVE_PURSUIT; gBattlescriptCurrInstr += 5; - BATTLE_STRUCT->animTurn = 1; + gBattleStruct->animTurn = 1; gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); } else @@ -16400,7 +15353,7 @@ static void atkD6_doubledamagedealtifdamaged(void) { if ((gProtectStructs[gBankAttacker].physicalDmg && gProtectStructs[gBankAttacker].physicalBank == gBankTarget) || (gProtectStructs[gBankAttacker].specialDmg && gProtectStructs[gBankAttacker].specialBank == gBankTarget)) - BATTLE_STRUCT->dmgMultiplier = 2; + gBattleStruct->dmgMultiplier = 2; gBattlescriptCurrInstr++; } @@ -16509,13 +15462,13 @@ static void atkDC_trysetgrudge(void) static void atkDD_weightdamagecalculation(void) { int i; - for (i = 0; sWeightDamage[i] != 0xFFFF; i += 2) + for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2) { - if (sWeightDamage[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBankTarget].species), 1)) + if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBankTarget].species), 1)) break; } - if (sWeightDamage[i] != 0xFFFF) - gDynamicBasePower = sWeightDamage[i + 1]; + if (sWeightToDamageTable[i] != 0xFFFF) + gDynamicBasePower = sWeightToDamageTable[i + 1]; else gDynamicBasePower = 120; gBattlescriptCurrInstr++; @@ -16539,17 +15492,17 @@ static void atkDE_asistattackselect(void) break; if (!GetMonData(&party[i], MON_DATA_SPECIES2) || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) break; - chooseable_moves = &BATTLE_STRUCT->assistMove[chooseable_moves_no]; + chooseable_moves = &gBattleStruct->assistMove[chooseable_moves_no]; for (j = 0; j < 4; j++) { int k; u16 move = GetMonData(&party[i], MON_DATA_MOVE1 + i); if (IsMoveUnchoosable(move)) break; - //sUnknown_081FACFE[k] + //sMovesForbiddenToCopy[k] for (k = 0; ;k++) { - if (sUnknown_081FACFE[k] == 0xFFFF) + if (sMovesForbiddenToCopy[k] == 0xFFFF) { if (move) { @@ -16559,7 +15512,7 @@ static void atkDE_asistattackselect(void) } break; } - if (sUnknown_081FACFE[k] == move) + if (sMovesForbiddenToCopy[k] == move) break; } } @@ -16567,7 +15520,7 @@ static void atkDE_asistattackselect(void) if (chooseable_moves_no) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gRandomMove = BATTLE_STRUCT->assistMove[Random() % chooseable_moves_no]; + gRandomMove = gBattleStruct->assistMove[Random() % chooseable_moves_no]; gBankTarget = GetMoveTarget(gRandomMove, 0); gBattlescriptCurrInstr += 5; } @@ -16652,7 +15605,7 @@ _0802AAF8:\n\ adds r1, r5, 0x1\n\ cmp r0, 0\n\ bne _0802AB4E\n\ - ldr r0, _0802ABB4 @ =sUnknown_081FACFE\n\ + ldr r0, _0802ABB4 @ =sMovesForbiddenToCopy\n\ ldrh r2, [r0]\n\ adds r3, r0, 0\n\ cmp r2, r8\n\ @@ -16727,7 +15680,7 @@ _0802ABA4: .4byte gEnemyParty\n\ _0802ABA8: .4byte gBattlePartyID\n\ _0802ABAC: .4byte 0x0000ffff\n\ _0802ABB0: .4byte gSharedMem + 0x16024\n\ -_0802ABB4: .4byte sUnknown_081FACFE\n\ +_0802ABB4: .4byte sMovesForbiddenToCopy\n\ _0802ABB8: .4byte gHitMarker\n\ _0802ABBC: .4byte 0xfffffbff\n\ _0802ABC0: .4byte gRandomMove\n\ @@ -16792,11 +15745,11 @@ static void atkE1_trygetintimidatetarget(void) { u8 side; - BATTLE_STRUCT->scriptingActive = ewram160DD; - side = GetBankSide(BATTLE_STRUCT->scriptingActive); + gBattleStruct->scriptingActive = ewram160DD; + side = GetBankSide(gBattleStruct->scriptingActive); gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 9; - gBattleTextBuff1[2] = gBattleMons[BATTLE_STRUCT->scriptingActive].ability; + gBattleTextBuff1[2] = gBattleMons[gBattleStruct->scriptingActive].ability; gBattleTextBuff1[3] = 0xFF; for (;gBankTarget < gNoOfAllBanks; gBankTarget++) @@ -16901,10 +15854,10 @@ static void atkE5_pickup(void) static void atkE6_docastformchangeanimation(void) { - gActiveBank = BATTLE_STRUCT->scriptingActive; + gActiveBank = gBattleStruct->scriptingActive; if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE) - BATTLE_STRUCT->castformToChangeInto |= 0x80; - EmitBattleAnimation(0, B_ANIM_CASTFORM_CHANGE, BATTLE_STRUCT->castformToChangeInto); + gBattleStruct->castformToChangeInto |= 0x80; + EmitBattleAnimation(0, B_ANIM_CASTFORM_CHANGE, gBattleStruct->castformToChangeInto); MarkBufferBankForExecution(gActiveBank); gBattlescriptCurrInstr++; } @@ -16913,11 +15866,11 @@ static void atkE7_trycastformdatachange(void) { u8 form; gBattlescriptCurrInstr++; - form = CastformDataTypeChange(BATTLE_STRUCT->scriptingActive); + form = CastformDataTypeChange(gBattleStruct->scriptingActive); if (form) { BattleScriptPushCursorAndCallback(BattleScript_CastformChange); - BATTLE_STRUCT->castformToChangeInto = form - 1; + gBattleStruct->castformToChangeInto = form - 1; } } @@ -16953,17 +15906,17 @@ static void atkE9_setweatherballtype(void) if (WEATHER_HAS_EFFECT) { if ((u8)(gBattleWeather)) - BATTLE_STRUCT->dmgMultiplier = 2; + gBattleStruct->dmgMultiplier = 2; if (gBattleWeather & WEATHER_RAIN_ANY) - BATTLE_STRUCT->dynamicMoveType = TYPE_WATER | 0x80; + gBattleStruct->dynamicMoveType = TYPE_WATER | 0x80; else if (gBattleWeather & WEATHER_SANDSTORM_ANY) - BATTLE_STRUCT->dynamicMoveType = TYPE_ROCK | 0x80; + gBattleStruct->dynamicMoveType = TYPE_ROCK | 0x80; else if (gBattleWeather & WEATHER_SUN_ANY) - BATTLE_STRUCT->dynamicMoveType = TYPE_FIRE | 0x80; + gBattleStruct->dynamicMoveType = TYPE_FIRE | 0x80; else if (gBattleWeather & WEATHER_HAIL) - BATTLE_STRUCT->dynamicMoveType = TYPE_ICE | 0x80; + gBattleStruct->dynamicMoveType = TYPE_ICE | 0x80; else - BATTLE_STRUCT->dynamicMoveType = TYPE_NORMAL | 0x80; + gBattleStruct->dynamicMoveType = TYPE_NORMAL | 0x80; } gBattlescriptCurrInstr++; } @@ -17010,8 +15963,8 @@ static void atkEC_pursuitrelated(void) gActionsByTurnOrder[gActiveBank] = 11; gCurrentMove = MOVE_PURSUIT; gBattlescriptCurrInstr += 5; - BATTLE_STRUCT->animTurn = 1; - BATTLE_STRUCT->unk160A7 = gBankAttacker; + gBattleStruct->animTurn = 1; + gBattleStruct->unk160A7 = gBankAttacker; gBankAttacker = gActiveBank; } else @@ -17022,10 +15975,10 @@ static void atkED_snatchsetbanks(void) { gEffectBank = gBankAttacker; if (gBankAttacker == gBankTarget) - gBankAttacker = gBankTarget = BATTLE_STRUCT->scriptingActive; + gBankAttacker = gBankTarget = gBattleStruct->scriptingActive; else - gBankTarget = BATTLE_STRUCT->scriptingActive; - BATTLE_STRUCT->scriptingActive = gEffectBank; + gBankTarget = gBattleStruct->scriptingActive; + gBattleStruct->scriptingActive = gEffectBank; gBattlescriptCurrInstr++; } @@ -17038,13 +15991,13 @@ static void atkEE_removelightscreenreflect(void) //brick break gSideAffecting[side] &= ~(SIDE_STATUS_LIGHTSCREEN); gSideTimers[side].reflectTimer = 0; gSideTimers[side].lightscreenTimer = 0; - BATTLE_STRUCT->animTurn = 1; - BATTLE_STRUCT->animTargetsHit = 1; + gBattleStruct->animTurn = 1; + gBattleStruct->animTargetsHit = 1; } else { - BATTLE_STRUCT->animTurn = 0; - BATTLE_STRUCT->animTargetsHit = 0; + gBattleStruct->animTurn = 0; + gBattleStruct->animTargetsHit = 0; } gBattlescriptCurrInstr++; } @@ -17074,7 +16027,7 @@ void atkEF_handleballthrow(void) u32 odds; u8 catch_rate; if (gLastUsedItem == ITEM_SAFARI_BALL) - catch_rate = BATTLE_STRUCT->unk16089 * 1275 / 100; //correct the name to safariFleeRate + catch_rate = gBattleStruct->unk16089 * 1275 / 100; //correct the name to safariFleeRate else catch_rate = gBaseStats[gBattleMons[gBankTarget].species].catchRate; if (gLastUsedItem > 5) @@ -17386,15 +16339,15 @@ static void atkF3_trygivecaughtmonnick(void) case 2: if (!gPaletteFade.active) { - GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, BATTLE_STRUCT->caughtNick); - DoNamingScreen(2, BATTLE_STRUCT->caughtNick, GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_SPECIES), GetMonGender(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]), GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_PERSONALITY, 0), BattleMainCB2); + GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, gBattleStruct->caughtNick); + DoNamingScreen(2, gBattleStruct->caughtNick, GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_SPECIES), GetMonGender(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]), GetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_PERSONALITY, 0), BattleMainCB2); gBattleCommunication[0]++; } break; case 3: if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active ) { - SetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, BATTLE_STRUCT->caughtNick); + SetMonData(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]], MON_DATA_NICKNAME, gBattleStruct->caughtNick); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } break; diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 1c79d7ebf..00216ce05 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -763,7 +763,7 @@ void sub_80324E0(u8 a) ewram17800[a].substituteSprite = 0; } -void sub_80324F8(struct Pokemon *pkmn, u8 b) +void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b) { u16 hp = GetMonData(pkmn, MON_DATA_HP); u16 maxHP = GetMonData(pkmn, MON_DATA_MAX_HP); @@ -793,7 +793,7 @@ void sub_80324F8(struct Pokemon *pkmn, u8 b) } } -void BattleMusicStop(void) +void BattleStopLowHpSound(void) { u8 r4 = GetBankByIdentity(0); @@ -821,11 +821,11 @@ void sub_8032638(void) u8 r5 = pokemon_order_func(gBattlePartyID[r9]); if (GetMonData(&gPlayerParty[r4], MON_DATA_HP) != 0) - sub_80324F8(&gPlayerParty[r4], r8); + HandleLowHpMusicChange(&gPlayerParty[r4], r8); if (IsDoubleBattle()) { if (GetMonData(&gPlayerParty[r5], MON_DATA_HP) != 0) - sub_80324F8(&gPlayerParty[r5], r9); + HandleLowHpMusicChange(&gPlayerParty[r5], r9); } } } diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 80848d2fd..2ac9df2b9 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -1422,8 +1422,8 @@ static void BattleAICmd_get_highest_possible_damage(void) s32 i; gDynamicBasePower = 0; - BATTLE_STRUCT->dynamicMoveType = 0; - BATTLE_STRUCT->dmgMultiplier = 1; + gBattleStruct->dynamicMoveType = 0; + gBattleStruct->dmgMultiplier = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; AI_THINKING_STRUCT->funcResult = 0; @@ -1462,8 +1462,8 @@ static void BattleAICmd_if_damage_bonus(void) u8 damageVar; gDynamicBasePower = 0; - BATTLE_STRUCT->dynamicMoveType = 0; - BATTLE_STRUCT->dmgMultiplier = 1; + gBattleStruct->dynamicMoveType = 0; + gBattleStruct->dmgMultiplier = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; @@ -1669,8 +1669,8 @@ static void BattleAICmd_if_can_faint(void) } gDynamicBasePower = 0; - BATTLE_STRUCT->dynamicMoveType = 0; - BATTLE_STRUCT->dmgMultiplier = 1; + gBattleStruct->dynamicMoveType = 0; + gBattleStruct->dmgMultiplier = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; gCurrentMove = AI_THINKING_STRUCT->moveConsidered; @@ -1698,8 +1698,8 @@ static void BattleAICmd_if_cant_faint(void) } gDynamicBasePower = 0; - BATTLE_STRUCT->dynamicMoveType = 0; - BATTLE_STRUCT->dmgMultiplier = 1; + gBattleStruct->dynamicMoveType = 0; + gBattleStruct->dmgMultiplier = 1; gBattleMoveFlags = 0; gCritMultiplier = 1; gCurrentMove = AI_THINKING_STRUCT->moveConsidered; @@ -1907,7 +1907,7 @@ static void BattleAICmd_flee(void) static void BattleAICmd_if_random_100(void) { - u8 safariFleeRate = BATTLE_STRUCT->safariFleeRate * 5; // safari flee rate, from 0-20 + u8 safariFleeRate = gBattleStruct->safariFleeRate * 5; // safari flee rate, from 0-20 if ((u8)(Random() % 100) < safariFleeRate) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 1); diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c index e39d98997..3a16e12e6 100644 --- a/src/battle/battle_controller_linkpartner.c +++ b/src/battle/battle_controller_linkpartner.c @@ -94,7 +94,7 @@ extern void sub_804777C(); extern void sub_8043DFC(); //extern s16 sub_8045C78(); extern void sub_80440EC(); -extern void sub_80324F8(); +extern void HandleLowHpMusicChange(); extern void nullsub_9(u16); extern void sub_8043DB0(); extern void move_anim_start_t4(); @@ -355,7 +355,7 @@ void bx_t3_healthbar_update(void) } else { - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); LinkPartnerBufferExecCompleted(); } } @@ -434,7 +434,7 @@ void sub_811E0CC(void) FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); CreateTask(c3_0802FDF4, 10); - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); StartSpriteAnim(&gSprites[gObjectBankIDs[gActiveBank]], 0); sub_8045A5C(gHealthboxIDs[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], 0); sub_804777C(gActiveBank); @@ -1084,7 +1084,7 @@ void sub_811EC68(u8 a) SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]); break; } - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); } void LinkPartnerHandlecmd3(void) @@ -1243,7 +1243,7 @@ void LinkPartnerHandlecmd10(void) else if (!ewram17810[gActiveBank].unk0_6) { ewram17810[gActiveBank].unk4 = 0; - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlaySE12WithPanning(SE_POKE_DEAD, -64); gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; gSprites[gObjectBankIDs[gActiveBank]].data[2] = 5; diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 2bdf448db..0d05b7aed 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -87,7 +87,7 @@ extern void sub_802E220(); extern void sub_802E2D4(); extern void sub_802E004(void); extern void sub_802DF30(void); -extern void BattleMusicStop(void); +extern void BattleStopLowHpSound(void); extern void PlayerBufferExecCompleted(void); extern void bx_t1_healthbar_update(void); extern void nullsub_91(void); @@ -1019,9 +1019,9 @@ void sub_802D31C(void) m4aMPlayContinue(&gMPlay_BGM); else m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256); - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); if (IsDoubleBattle()) - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank ^ 2]], gActiveBank ^ 2); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank ^ 2]], gActiveBank ^ 2); ewram17810[gActiveBank].unk9 = 3; gBattleBankFunc[gActiveBank] = sub_802D2E0; } @@ -1077,7 +1077,7 @@ void sub_802D730(void) if (!ewram17810[gActiveBank].unk0_6 && !IsCryPlayingOrClearCrySongs()) { m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0x100); - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlayerBufferExecCompleted(); } } @@ -1118,7 +1118,7 @@ void bx_t1_healthbar_update(void) } else { - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlayerBufferExecCompleted(); } } @@ -2278,7 +2278,7 @@ void dp01_setattr_by_ch1_for_player_pokemon(u8 a) SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]); break; } - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); } void PlayerHandlecmd3(void) @@ -2438,7 +2438,7 @@ void PlayerHandlecmd10(void) if (ewram17810[gActiveBank].unk0_6 == 0) { ewram17810[gActiveBank].unk4 = 0; - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); PlaySE12WithPanning(SE_POKE_DEAD, -64); gSprites[gObjectBankIDs[gActiveBank]].data[1] = 0; gSprites[gObjectBankIDs[gActiveBank]].data[2] = 5; @@ -2655,7 +2655,7 @@ void PlayerHandlecmd22(void) void PlayerHandlecmd23(void) { - BattleMusicStop(); + BattleStopLowHpSound(); BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); PlayerBufferExecCompleted(); } diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index 4c0adab5e..49f530129 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -412,7 +412,7 @@ void sub_81376B8(void) FreeSpriteTilesByTag(0x27F9); FreeSpritePaletteByTag(0x27F9); CreateTask(c3_0802FDF4, 10); - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); WallyBufferExecCompleted(); } } @@ -429,7 +429,7 @@ void sub_81377B0(void) } else { - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); WallyBufferExecCompleted(); } } @@ -1066,7 +1066,7 @@ void sub_8138294(u8 a) SetMonData(&gPlayerParty[a], MON_DATA_TOUGH_RIBBON, &gBattleBufferA[gActiveBank][3]); break; } - sub_80324F8(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); + HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); } void WallyHandlecmd3(void) diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index d8efc09c5..18e07acf6 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -214,11 +214,11 @@ void BufferStringBattle(u16 stringID) gStringInfo = (struct StringInfoBattle*)(&gBattleBufferA[gActiveBank][4]); gLastUsedItem = gStringInfo->lastItem; gLastUsedAbility = gStringInfo->lastAbility; - BATTLE_STRUCT->scriptingActive = gStringInfo->scrActive; - BATTLE_STRUCT->unk1605E = gStringInfo->unk1605E; - BATTLE_STRUCT->hpScale = gStringInfo->hpScale; + gBattleStruct->scriptingActive = gStringInfo->scrActive; + gBattleStruct->unk1605E = gStringInfo->unk1605E; + gBattleStruct->hpScale = gStringInfo->hpScale; gStringBank = gStringInfo->StringBank; - BATTLE_STRUCT->stringMoveType = gStringInfo->moveType; + gBattleStruct->stringMoveType = gStringInfo->moveType; for (i = 0; i < 4; i++) { gAbilitiesPerBank[i] = gStringInfo->abilities[i]; @@ -304,11 +304,11 @@ void BufferStringBattle(u16 stringID) case 2: // sending poke to ball msg if (GetBankSide(gActiveBank) == 0) { - if (BATTLE_STRUCT->hpScale == 0) + if (gBattleStruct->hpScale == 0) stringPtr = BattleText_ComeBackSingle1; - else if (BATTLE_STRUCT->hpScale == 1 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + else if (gBattleStruct->hpScale == 1 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE) stringPtr = BattleText_ComeBackSingle2; - else if (BATTLE_STRUCT->hpScale == 2) + else if (gBattleStruct->hpScale == 2) stringPtr = BattleText_ComeBackSingle3; else stringPtr = BattleText_ComeBackSingle4; @@ -332,13 +332,13 @@ void BufferStringBattle(u16 stringID) } break; case 3: // switch-in msg - if (GetBankSide(BATTLE_STRUCT->scriptingActive) == 0) + if (GetBankSide(gBattleStruct->scriptingActive) == 0) { - if (BATTLE_STRUCT->hpScale == 0 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + if (gBattleStruct->hpScale == 0 || gBattleTypeFlags & BATTLE_TYPE_DOUBLE) stringPtr = BattleText_SentOutSingle7; - else if (BATTLE_STRUCT->hpScale == 1) + else if (gBattleStruct->hpScale == 1) stringPtr = BattleText_SentOutSingle8; - else if (BATTLE_STRUCT->hpScale == 2) + else if (gBattleStruct->hpScale == 2) stringPtr = BattleText_SentOutSingle9; else stringPtr = BattleText_SentOutSingle10; @@ -364,7 +364,7 @@ void BufferStringBattle(u16 stringID) case 4: // pokemon used a move msg sub_8121D1C(gBattleTextBuff1); if (gStringInfo->currentMove > 0x162) - StringCopy(gBattleTextBuff2, gUnknown_08401674[BATTLE_STRUCT->stringMoveType]); + StringCopy(gBattleTextBuff2, gUnknown_08401674[gBattleStruct->stringMoveType]); else StringCopy(gBattleTextBuff2, gMoveNames[gStringInfo->currentMove]); sub_8121D74(gBattleTextBuff2); @@ -636,17 +636,17 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) HANDLE_NICKNAME_STRING_CASE(gActiveBank, gBattlePartyID[gActiveBank]) break; case 16: // scripting active bank name with prefix - HANDLE_NICKNAME_STRING_CASE(BATTLE_STRUCT->scriptingActive, gBattlePartyID[BATTLE_STRUCT->scriptingActive]) + HANDLE_NICKNAME_STRING_CASE(gBattleStruct->scriptingActive, gBattlePartyID[gBattleStruct->scriptingActive]) break; case 17: // current move name if (gStringInfo->currentMove > 0x162) - toCpy = (void*) &gUnknown_08401674[BATTLE_STRUCT->stringMoveType]; + toCpy = (void*) &gUnknown_08401674[gBattleStruct->stringMoveType]; else toCpy = gMoveNames[gStringInfo->currentMove]; break; case 18: // last used move name if (gStringInfo->lastMove > 0x162) - toCpy = (void*) &gUnknown_08401674[BATTLE_STRUCT->stringMoveType]; + toCpy = (void*) &gUnknown_08401674[gBattleStruct->stringMoveType]; else toCpy = gMoveNames[gStringInfo->lastMove]; break; @@ -655,7 +655,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) { if (gLastUsedItem == ITEM_ENIGMA_BERRY) { - if (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18 == gStringBank) + if (gLinkPlayers[gBattleStruct->linkPlayerIndex].lp_field_18 == gStringBank) { StringCopy(text, gEnigmaBerries[gStringBank].name); #ifdef ENGLISH @@ -690,7 +690,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) toCpy = gAbilityNames[gAbilitiesPerBank[gBankTarget]]; break; case 23: // scripting active ability - toCpy = gAbilityNames[gAbilitiesPerBank[BATTLE_STRUCT->scriptingActive]]; + toCpy = gAbilityNames[gAbilitiesPerBank[gBattleStruct->scriptingActive]]; break; case 24: // effect bank ability toCpy = gAbilityNames[gAbilitiesPerBank[gEffectBank]]; @@ -750,7 +750,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) toCpy = gLinkPlayers[sub_803FC34(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name; break; case 31: // link scripting active name - toCpy = gLinkPlayers[sub_803FC34(BATTLE_STRUCT->scriptingActive)].name; + toCpy = gLinkPlayers[sub_803FC34(gBattleStruct->scriptingActive)].name; break; case 32: // player name toCpy = gSaveBlock2.playerName; @@ -759,7 +759,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) toCpy = GetTrainerLoseText(); break; case 34: // ? - HANDLE_NICKNAME_STRING_CASE(BATTLE_STRUCT->scriptingActive, BATTLE_STRUCT->unk1605E) + HANDLE_NICKNAME_STRING_CASE(gBattleStruct->scriptingActive, gBattleStruct->unk1605E) break; case 35: // lanette pc if (FlagGet(FLAG_SYS_PC_LANETTE)) @@ -946,7 +946,7 @@ void StrCpyDecodeBattleTextBuff(u8* src, u8* dst) { if (hword == ITEM_ENIGMA_BERRY) { - if (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18 == gStringBank) + if (gLinkPlayers[gBattleStruct->linkPlayerIndex].lp_field_18 == gStringBank) { StringCopy(dst, gEnigmaBerries[gStringBank].name); #ifdef ENGLISH diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index 9dc030a1a..f93664593 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -21,7 +21,7 @@ #include "constants/species.h" #include "constants/weather.h" -extern u8* gBattlescriptCurrInstr; +extern const u8* gBattlescriptCurrInstr; extern u8 gActiveBank; extern u8 gBattleBufferB[4][0x200]; extern u8* gUnknown_02024C1C[4]; //battlescript location when you try to choose a move you're not allowed to @@ -454,7 +454,7 @@ void sub_80157C4(u8 bank) } } -void BattleScriptPush(u8* BS_ptr) +void BattleScriptPush(const u8* BS_ptr) { B_BATTLESCRIPTS_STACK->ptr[B_BATTLESCRIPTS_STACK->size++] = BS_ptr; } @@ -477,7 +477,7 @@ u8 TrySetCantSelectMoveBattleScript(void) //msg can't select a move u16* choicedMove = CHOICED_MOVE(gActiveBank); if (gDisableStructs[gActiveBank].disabledMove == move && move) { - BATTLE_STRUCT->scriptingActive = gActiveBank; + gBattleStruct->scriptingActive = gActiveBank; gCurrentMove = move; gUnknown_02024C1C[gActiveBank] = BattleScript_MoveSelectionDisabledMove; limitations++; @@ -615,7 +615,7 @@ u8 UpdateTurnCounters(void) { u8 sideBank; - switch (BATTLE_STRUCT->turncountersTracker) + switch (gBattleStruct->turncountersTracker) { case 0: for (i = 0; i < gNoOfAllBanks; i++) @@ -631,12 +631,12 @@ u8 UpdateTurnCounters(void) SwapTurnOrder(i, j); } } - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; + gBattleStruct->turncountersTracker++; + gBattleStruct->turnSideTracker = 0; case 1: - while (BATTLE_STRUCT->turnSideTracker < 2) + while (gBattleStruct->turnSideTracker < 2) { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker; if (gSideAffecting[sideBank] & SIDE_STATUS_REFLECT) { @@ -653,20 +653,20 @@ u8 UpdateTurnCounters(void) effect++; } } - BATTLE_STRUCT->turnSideTracker++; + gBattleStruct->turnSideTracker++; if (effect) break; } if (!effect) { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; + gBattleStruct->turncountersTracker++; + gBattleStruct->turnSideTracker = 0; } break; case 2: - while (BATTLE_STRUCT->turnSideTracker < 2) + while (gBattleStruct->turnSideTracker < 2) { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker; if (gSideAffecting[sideBank] & SIDE_STATUS_LIGHTSCREEN) { if (--gSideTimers[sideBank].lightscreenTimer == 0) @@ -682,20 +682,20 @@ u8 UpdateTurnCounters(void) effect++; } } - BATTLE_STRUCT->turnSideTracker++; + gBattleStruct->turnSideTracker++; if (effect) break; } if (!effect) { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; + gBattleStruct->turncountersTracker++; + gBattleStruct->turnSideTracker = 0; } break; case 3: - while (BATTLE_STRUCT->turnSideTracker < 2) + while (gBattleStruct->turnSideTracker < 2) { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker; if (gSideTimers[sideBank].mistTimer && --gSideTimers[sideBank].mistTimer == 0) { gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST; @@ -708,20 +708,20 @@ u8 UpdateTurnCounters(void) gBattleTextBuff1[4] = EOS; effect++; } - BATTLE_STRUCT->turnSideTracker++; + gBattleStruct->turnSideTracker++; if (effect) break; } if (!effect) { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; + gBattleStruct->turncountersTracker++; + gBattleStruct->turnSideTracker = 0; } break; case 4: - while (BATTLE_STRUCT->turnSideTracker < 2) + while (gBattleStruct->turnSideTracker < 2) { - gActiveBank = gBankAttacker = sideBank = BATTLE_STRUCT->turnSideTracker; + gActiveBank = gBankAttacker = sideBank = gBattleStruct->turnSideTracker; if (gSideAffecting[sideBank] & SIDE_STATUS_SAFEGUARD) { if (--gSideTimers[sideBank].safeguardTimer == 0) @@ -731,33 +731,33 @@ u8 UpdateTurnCounters(void) effect++; } } - BATTLE_STRUCT->turnSideTracker++; + gBattleStruct->turnSideTracker++; if (effect) break; } if (!effect) { - BATTLE_STRUCT->turncountersTracker++; - BATTLE_STRUCT->turnSideTracker = 0; + gBattleStruct->turncountersTracker++; + gBattleStruct->turnSideTracker = 0; } break; case 5: - while (BATTLE_STRUCT->turnSideTracker < gNoOfAllBanks) + while (gBattleStruct->turnSideTracker < gNoOfAllBanks) { - gActiveBank = gBanksByTurnOrder[BATTLE_STRUCT->turnSideTracker]; + gActiveBank = gBanksByTurnOrder[gBattleStruct->turnSideTracker]; if (gWishFutureKnock.wishCounter[gActiveBank] && --gWishFutureKnock.wishCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp) { gBankTarget = gActiveBank; BattleScriptExecute(BattleScript_WishComesTrue); effect++; } - BATTLE_STRUCT->turnSideTracker++; + gBattleStruct->turnSideTracker++; if (effect) break; } if (!effect) { - BATTLE_STRUCT->turncountersTracker++; + gBattleStruct->turncountersTracker++; } break; case 6: @@ -783,7 +783,7 @@ u8 UpdateTurnCounters(void) BattleScriptExecute(BattleScript_RainContinuesOrEnds); effect++; } - BATTLE_STRUCT->turncountersTracker++; + gBattleStruct->turncountersTracker++; break; case 7: if (gBattleWeather & WEATHER_SANDSTORM_ANY) @@ -796,12 +796,12 @@ u8 UpdateTurnCounters(void) else gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; - BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; + gBattleStruct->animArg1 = B_ANIM_SANDSTORM_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 0; BattleScriptExecute(gBattlescriptCurrInstr); effect++; } - BATTLE_STRUCT->turncountersTracker++; + gBattleStruct->turncountersTracker++; break; case 8: if (gBattleWeather & WEATHER_SUN_ANY) @@ -817,7 +817,7 @@ u8 UpdateTurnCounters(void) BattleScriptExecute(gBattlescriptCurrInstr); effect++; } - BATTLE_STRUCT->turncountersTracker++; + gBattleStruct->turncountersTracker++; break; case 9: if (gBattleWeather & WEATHER_HAIL) @@ -830,12 +830,12 @@ u8 UpdateTurnCounters(void) else gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues; - BATTLE_STRUCT->animArg1 = B_ANIM_HAIL_CONTINUES; + gBattleStruct->animArg1 = B_ANIM_HAIL_CONTINUES; gBattleCommunication[MULTISTRING_CHOOSER] = 1; BattleScriptExecute(gBattlescriptCurrInstr); effect++; } - BATTLE_STRUCT->turncountersTracker++; + gBattleStruct->turncountersTracker++; break; case 10: effect++; @@ -852,16 +852,16 @@ u8 TurnBasedEffects(void) u8 effect = 0; gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); - while (BATTLE_STRUCT->turnEffectsBank < gNoOfAllBanks && BATTLE_STRUCT->turnEffectsTracker <= TURNBASED_MAX_CASE) + while (gBattleStruct->turnEffectsBank < gNoOfAllBanks && gBattleStruct->turnEffectsTracker <= TURNBASED_MAX_CASE) { - gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->turnEffectsBank]; + gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->turnEffectsBank]; if (gAbsentBankFlags & gBitTable[gActiveBank]) { - BATTLE_STRUCT->turnEffectsBank++; + gBattleStruct->turnEffectsBank++; } else { - switch (BATTLE_STRUCT->turnEffectsTracker) + switch (gBattleStruct->turnEffectsTracker) { case 0: // ingrain if ((gStatuses3[gActiveBank] & STATUS3_ROOTED) @@ -875,22 +875,22 @@ u8 TurnBasedEffects(void) BattleScriptExecute(BattleScript_IngrainTurnHeal); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 1: // end turn abilities if (AbilityBattleEffects(ABILITYEFFECT_ENDTURN, gActiveBank, 0, 0, 0)) effect++; - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 2: // item effects if (ItemBattleEffects(1, gActiveBank, 0)) effect++; - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 18: // item effects again if (ItemBattleEffects(1, gActiveBank, 1)) effect++; - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 3: // leech seed if (gStatuses3[gActiveBank] & STATUS3_LEECHSEED && gBattleMons[gStatuses3[gActiveBank] & STATUS3_LEECHSEED_BANK].hp != 0 && gBattleMons[gActiveBank].hp != 0) @@ -899,12 +899,12 @@ u8 TurnBasedEffects(void) gBattleMoveDamage = gBattleMons[gActiveBank].maxHP / 8; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - BATTLE_STRUCT->animArg1 = gBankTarget; - BATTLE_STRUCT->animArg2 = gBankAttacker; + gBattleStruct->animArg1 = gBankTarget; + gBattleStruct->animArg2 = gBankAttacker; BattleScriptExecute(BattleScript_LeechSeedTurnDrain); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 4: // poison if ((gBattleMons[gActiveBank].status1 & STATUS_POISON) && gBattleMons[gActiveBank].hp != 0) @@ -915,7 +915,7 @@ u8 TurnBasedEffects(void) BattleScriptExecute(BattleScript_PoisonTurnDmg); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 5: // toxic poison if ((gBattleMons[gActiveBank].status1 & STATUS_TOXIC_POISON) && gBattleMons[gActiveBank].hp != 0) @@ -929,7 +929,7 @@ u8 TurnBasedEffects(void) BattleScriptExecute(BattleScript_PoisonTurnDmg); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 6: // burn if ((gBattleMons[gActiveBank].status1 & STATUS_BURN) && gBattleMons[gActiveBank].hp != 0) @@ -940,7 +940,7 @@ u8 TurnBasedEffects(void) BattleScriptExecute(BattleScript_BurnTurnDmg); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 7: // spooky nightmares if ((gBattleMons[gActiveBank].status2 & STATUS2_NIGHTMARE) && gBattleMons[gActiveBank].hp != 0) @@ -952,7 +952,7 @@ u8 TurnBasedEffects(void) BattleScriptExecute(BattleScript_NightmareTurnDmg); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 8: // curse if ((gBattleMons[gActiveBank].status2 & STATUS2_CURSED) && gBattleMons[gActiveBank].hp != 0) @@ -963,7 +963,7 @@ u8 TurnBasedEffects(void) BattleScriptExecute(BattleScript_CurseTurnDmg); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 9: // wrap if ((gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) && gBattleMons[gActiveBank].hp != 0) @@ -971,8 +971,8 @@ u8 TurnBasedEffects(void) gBattleMons[gActiveBank].status2 -= 0x2000; if (gBattleMons[gActiveBank].status2 & STATUS2_WRAPPED) // damaged by wrap { - BATTLE_STRUCT->animArg1 = ewram16004arr(0, gActiveBank); - BATTLE_STRUCT->animArg2 = ewram16004arr(1, gActiveBank); + gBattleStruct->animArg1 = ewram16004arr(0, gActiveBank); + gBattleStruct->animArg2 = ewram16004arr(1, gActiveBank); gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 2; gBattleTextBuff1[2] = ewram16004arr(0, gActiveBank); @@ -995,7 +995,7 @@ u8 TurnBasedEffects(void) BattleScriptExecute(gBattlescriptCurrInstr); effect++; } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 10: // uproar if (gBattleMons[gActiveBank].status2 & STATUS2_UPROAR) @@ -1044,7 +1044,7 @@ u8 TurnBasedEffects(void) } } if (effect != 2) - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 11: // thrash if (gBattleMons[gActiveBank].status2 & STATUS2_LOCK_CONFUSE) @@ -1066,7 +1066,7 @@ u8 TurnBasedEffects(void) } } } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 12: // disable if (gDisableStructs[gActiveBank].disableTimer1 != 0) @@ -1089,7 +1089,7 @@ u8 TurnBasedEffects(void) effect++; } } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 13: // encore if (gDisableStructs[gActiveBank].encoreTimer1 != 0) @@ -1108,22 +1108,22 @@ u8 TurnBasedEffects(void) effect++; } } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 14: // lock-on decrement if (gStatuses3[gActiveBank] & STATUS3_ALWAYS_HITS) gStatuses3[gActiveBank] -= 0x8; - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 15: // charge if (gDisableStructs[gActiveBank].chargeTimer1 && --gDisableStructs[gActiveBank].chargeTimer1 == 0) gStatuses3[gActiveBank] &= ~STATUS3_CHARGED_UP; - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 16: // taunt if (gDisableStructs[gActiveBank].tauntTimer1) gDisableStructs[gActiveBank].tauntTimer1--; - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 17: // yawn if (gStatuses3[gActiveBank] & STATUS3_YAWN) @@ -1142,11 +1142,11 @@ u8 TurnBasedEffects(void) effect++; } } - BATTLE_STRUCT->turnEffectsTracker++; + gBattleStruct->turnEffectsTracker++; break; case 19: // done - BATTLE_STRUCT->turnEffectsTracker = 0; - BATTLE_STRUCT->turnEffectsBank++; + gBattleStruct->turnEffectsTracker = 0; + gBattleStruct->turnEffectsBank++; break; } if (effect != 0) @@ -1160,17 +1160,17 @@ u8 TurnBasedEffects(void) bool8 HandleWishPerishSongOnTurnEnd(void) { gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); - switch (BATTLE_STRUCT->sub80170DC_Tracker) + switch (gBattleStruct->sub80170DC_Tracker) { case 0: // future sight - while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks) + while (gBattleStruct->sub80170DC_Bank < gNoOfAllBanks) { - gActiveBank = BATTLE_STRUCT->sub80170DC_Bank; + gActiveBank = gBattleStruct->sub80170DC_Bank; if (gAbsentBankFlags & gBitTable[gActiveBank]) - BATTLE_STRUCT->sub80170DC_Bank++; + gBattleStruct->sub80170DC_Bank++; else { - BATTLE_STRUCT->sub80170DC_Bank++; + gBattleStruct->sub80170DC_Bank++; if (gWishFutureKnock.futureSightCounter[gActiveBank] && --gWishFutureKnock.futureSightCounter[gActiveBank] == 0 && gBattleMons[gActiveBank].hp) { if (gWishFutureKnock.futureSightMove[gActiveBank] == MOVE_FUTURE_SIGHT) @@ -1191,17 +1191,17 @@ bool8 HandleWishPerishSongOnTurnEnd(void) } } } - BATTLE_STRUCT->sub80170DC_Tracker = 1; - BATTLE_STRUCT->sub80170DC_Bank = 0; + gBattleStruct->sub80170DC_Tracker = 1; + gBattleStruct->sub80170DC_Bank = 0; case 1: // perish song - while (BATTLE_STRUCT->sub80170DC_Bank < gNoOfAllBanks) + while (gBattleStruct->sub80170DC_Bank < gNoOfAllBanks) { - gActiveBank = gBankAttacker = gBanksByTurnOrder[BATTLE_STRUCT->sub80170DC_Bank]; + gActiveBank = gBankAttacker = gBanksByTurnOrder[gBattleStruct->sub80170DC_Bank]; if (gAbsentBankFlags & gBitTable[gActiveBank]) - BATTLE_STRUCT->sub80170DC_Bank++; + gBattleStruct->sub80170DC_Bank++; else { - BATTLE_STRUCT->sub80170DC_Bank++; + gBattleStruct->sub80170DC_Bank++; if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG) { gBattleTextBuff1[0] = 0xFD; @@ -1241,11 +1241,11 @@ bool8 HandleFaintedMonActions(void) do { int i; - switch (BATTLE_STRUCT->sub80173A4_Tracker) + switch (gBattleStruct->sub80173A4_Tracker) { case 0: - BATTLE_STRUCT->unk1605A = 0; - BATTLE_STRUCT->sub80173A4_Tracker++; + gBattleStruct->unk1605A = 0; + gBattleStruct->sub80173A4_Tracker++; for (i = 0; i < gNoOfAllBanks; i++) { if (gAbsentBankFlags & gBitTable[i] && !sub_8018018(i, 6, 6)) @@ -1254,54 +1254,54 @@ bool8 HandleFaintedMonActions(void) case 1: do { - gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; - if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(BATTLE_STRUCT->unk16113 & gBitTable[gBattlePartyID[BATTLE_STRUCT->unk1605A]]) && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) + gBank1 = gBankTarget = gBattleStruct->unk1605A; + if (gBattleMons[gBattleStruct->unk1605A].hp == 0 && !(gBattleStruct->unk16113 & gBitTable[gBattlePartyID[gBattleStruct->unk1605A]]) && !(gAbsentBankFlags & gBitTable[gBattleStruct->unk1605A])) { BattleScriptExecute(BattleScript_GiveExp); - BATTLE_STRUCT->sub80173A4_Tracker = 2; + gBattleStruct->sub80173A4_Tracker = 2; return 1; } - } while (++BATTLE_STRUCT->unk1605A != gNoOfAllBanks); - BATTLE_STRUCT->sub80173A4_Tracker = 3; + } while (++gBattleStruct->unk1605A != gNoOfAllBanks); + gBattleStruct->sub80173A4_Tracker = 3; break; case 2: sub_8015740(gBank1); - if (++BATTLE_STRUCT->unk1605A == gNoOfAllBanks) - BATTLE_STRUCT->sub80173A4_Tracker = 3; + if (++gBattleStruct->unk1605A == gNoOfAllBanks) + gBattleStruct->sub80173A4_Tracker = 3; else - BATTLE_STRUCT->sub80173A4_Tracker = 1; + gBattleStruct->sub80173A4_Tracker = 1; break; case 3: - BATTLE_STRUCT->unk1605A = 0; - BATTLE_STRUCT->sub80173A4_Tracker++; + gBattleStruct->unk1605A = 0; + gBattleStruct->sub80173A4_Tracker++; case 4: do { - gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; //or should banks be switched? - if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A])) + gBank1 = gBankTarget = gBattleStruct->unk1605A; //or should banks be switched? + if (gBattleMons[gBattleStruct->unk1605A].hp == 0 && !(gAbsentBankFlags & gBitTable[gBattleStruct->unk1605A])) { BattleScriptExecute(BattleScript_HandleFaintedMon); - BATTLE_STRUCT->sub80173A4_Tracker = 5; + gBattleStruct->sub80173A4_Tracker = 5; return 1; } - } while (++BATTLE_STRUCT->unk1605A != gNoOfAllBanks); - BATTLE_STRUCT->sub80173A4_Tracker = 6; + } while (++gBattleStruct->unk1605A != gNoOfAllBanks); + gBattleStruct->sub80173A4_Tracker = 6; break; case 5: - if (++BATTLE_STRUCT->unk1605A == gNoOfAllBanks) - BATTLE_STRUCT->sub80173A4_Tracker = 6; + if (++gBattleStruct->unk1605A == gNoOfAllBanks) + gBattleStruct->sub80173A4_Tracker = 6; else - BATTLE_STRUCT->sub80173A4_Tracker = 4; + gBattleStruct->sub80173A4_Tracker = 4; break; case 6: if (AbilityBattleEffects(9, 0, 0, 0, 0) || AbilityBattleEffects(0xB, 0, 0, 0, 0) || ItemBattleEffects(1, 0, 1) || AbilityBattleEffects(6, 0, 0, 0, 0)) return 1; - BATTLE_STRUCT->sub80173A4_Tracker++; + gBattleStruct->sub80173A4_Tracker++; break; case 7: break; } - } while (BATTLE_STRUCT->sub80173A4_Tracker != HandleFaintedMonActions_MAX_CASE); + } while (gBattleStruct->sub80173A4_Tracker != HandleFaintedMonActions_MAX_CASE); return 0; } @@ -1320,15 +1320,15 @@ void TryClearRageStatuses(void) u8 AtkCanceller_UnableToUseMove(void) { u8 effect = 0; - s32* bideDmg = &BATTLE_STRUCT->bideDmg; + s32* bideDmg = &gBattleStruct->bideDmg; do { - switch (BATTLE_STRUCT->atkCancellerTracker) + switch (gBattleStruct->atkCancellerTracker) { case 0: // flags clear gBattleMons[gBankAttacker].status2 &= ~(STATUS2_DESTINY_BOND); gStatuses3[gBankAttacker] &= ~(STATUS3_GRUDGE); - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 1: // check being asleep if (gBattleMons[gBankAttacker].status1 & STATUS_SLEEP) @@ -1372,7 +1372,7 @@ u8 AtkCanceller_UnableToUseMove(void) } } } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 2: // check being frozen if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE) @@ -1386,7 +1386,7 @@ u8 AtkCanceller_UnableToUseMove(void) } else { - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; } } @@ -1399,7 +1399,7 @@ u8 AtkCanceller_UnableToUseMove(void) } effect = 2; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 3: // truant if (gBattleMons[gBankAttacker].ability == ABILITY_TRUANT && gDisableStructs[gBankAttacker].truantCounter) @@ -1411,7 +1411,7 @@ u8 AtkCanceller_UnableToUseMove(void) gBattleMoveFlags |= MOVESTATUS_MISSED; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 4: // recharge if (gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE) @@ -1423,7 +1423,7 @@ u8 AtkCanceller_UnableToUseMove(void) gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 5: // flinch if (gBattleMons[gBankAttacker].status2 & STATUS2_FLINCHED) @@ -1435,19 +1435,19 @@ u8 AtkCanceller_UnableToUseMove(void) gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 6: // disabled move if (gDisableStructs[gBankAttacker].disabledMove == gCurrentMove && gDisableStructs[gBankAttacker].disabledMove != 0) { gProtectStructs[gBankAttacker].usedDisabledMove = 1; - BATTLE_STRUCT->scriptingActive = gBankAttacker; + gBattleStruct->scriptingActive = gBankAttacker; CancelMultiTurnMoves(gBankAttacker); gBattlescriptCurrInstr = BattleScript_MoveUsedIsDisabled; gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 7: // taunt if (gDisableStructs[gBankAttacker].tauntTimer1 && gBattleMoves[gCurrentMove].power == 0) @@ -1458,7 +1458,7 @@ u8 AtkCanceller_UnableToUseMove(void) gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 8: // imprisoned if (IsImprisoned(gBankAttacker, gCurrentMove)) @@ -1469,7 +1469,7 @@ u8 AtkCanceller_UnableToUseMove(void) gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 9: // confusion if (gBattleMons[gBankAttacker].status2 & STATUS2_CONFUSION) @@ -1499,7 +1499,7 @@ u8 AtkCanceller_UnableToUseMove(void) } effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 10: // paralysis if (gBattleMons[gBankAttacker].status1 & STATUS_PARALYSIS && (Random() % 4) == 0) @@ -1510,12 +1510,12 @@ u8 AtkCanceller_UnableToUseMove(void) gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 11: // infatuation if (gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) { - BATTLE_STRUCT->scriptingActive = CountTrailingZeroBits((gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) >> 0x10); + gBattleStruct->scriptingActive = CountTrailingZeroBits((gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) >> 0x10); if (Random() & 1) BattleScriptPushCursor(); else @@ -1528,7 +1528,7 @@ u8 AtkCanceller_UnableToUseMove(void) gBattlescriptCurrInstr = BattleScript_MoveUsedIsInLove; effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 12: // bide if (gBattleMons[gBankAttacker].status2 & STATUS2_BIDE) @@ -1553,7 +1553,7 @@ u8 AtkCanceller_UnableToUseMove(void) } effect = 1; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 13: // move thawing if (gBattleMons[gBankAttacker].status1 & STATUS_FREEZE) @@ -1567,13 +1567,13 @@ u8 AtkCanceller_UnableToUseMove(void) } effect = 2; } - BATTLE_STRUCT->atkCancellerTracker++; + gBattleStruct->atkCancellerTracker++; break; case 14: // last case break; } - } while (BATTLE_STRUCT->atkCancellerTracker != ATKCANCELLER_MAX_CASE && effect == 0); + } while (gBattleStruct->atkCancellerTracker != ATKCANCELLER_MAX_CASE && effect == 0); if (effect == 2) { @@ -1731,8 +1731,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) else move = gCurrentMove; - if (BATTLE_STRUCT->dynamicMoveType) - moveType = BATTLE_STRUCT->dynamicMoveType & 0x3F; + if (gBattleStruct->dynamicMoveType) + moveType = gBattleStruct->dynamicMoveType & 0x3F; else moveType = gBattleMoves[move].type; @@ -1755,8 +1755,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (!(gBattleWeather & WEATHER_RAIN_ANY)) { gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); - BATTLE_STRUCT->animArg1 = B_ANIM_RAIN_CONTINUES; - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->animArg1 = B_ANIM_RAIN_CONTINUES; + gBattleStruct->scriptingActive = bank; effect++; } break; @@ -1764,8 +1764,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); - BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES; - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->animArg1 = B_ANIM_SANDSTORM_CONTINUES; + gBattleStruct->scriptingActive = bank; effect++; } break; @@ -1773,8 +1773,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (!(gBattleWeather & WEATHER_SUN_ANY)) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); - BATTLE_STRUCT->animArg1 = B_ANIM_SUN_CONTINUES; - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->animArg1 = B_ANIM_SUN_CONTINUES; + gBattleStruct->scriptingActive = bank; effect++; } break; @@ -1791,7 +1791,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY); BattleScriptPushCursorAndCallback(BattleScript_DrizzleActivates); - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; effect++; } break; @@ -1801,7 +1801,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); BattleScriptPushCursorAndCallback(BattleScript_SandstreamActivates); - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; effect++; } break; @@ -1811,7 +1811,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates); - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; effect++; } break; @@ -1829,8 +1829,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (effect != 0) { BattleScriptPushCursorAndCallback(BattleScript_CastformChange); - BATTLE_STRUCT->scriptingActive = bank; - BATTLE_STRUCT->castformToChangeInto = effect - 1; + gBattleStruct->scriptingActive = bank; + gBattleStruct->castformToChangeInto = effect - 1; } break; case ABILITY_TRACE: @@ -1852,8 +1852,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (effect != 0) { BattleScriptPushCursorAndCallback(BattleScript_CastformChange); - BATTLE_STRUCT->scriptingActive = target1; - BATTLE_STRUCT->castformToChangeInto = effect - 1; + gBattleStruct->scriptingActive = target1; + gBattleStruct->castformToChangeInto = effect - 1; break; } } @@ -1897,7 +1897,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) gBattleMons[bank].status1 = 0; // BUG: The nightmare status does not get cleared here. This was fixed in Emerald. //gBattleMons[bank].status2 &= ~(STATUS2_NIGHTMARE); - BATTLE_STRUCT->scriptingActive = gActiveBank = bank; + gBattleStruct->scriptingActive = gActiveBank = bank; BattleScriptPushCursorAndCallback(BattleScript_ShedSkinActivates); EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[bank].status1); MarkBufferBankForExecution(gActiveBank); @@ -1908,10 +1908,10 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (gBattleMons[bank].statStages[STAT_STAGE_SPEED] < 0xC && gDisableStructs[bank].isFirstTurn != 2) { gBattleMons[bank].statStages[STAT_STAGE_SPEED]++; - BATTLE_STRUCT->animArg1 = 0x11; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->animArg1 = 0x11; + gBattleStruct->animArg2 = 0; BattleScriptPushCursorAndCallback(BattleScript_SpeedBoostActivates); - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; effect++; } break; @@ -2218,7 +2218,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus; - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; gActiveBank = bank; EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); MarkBufferBankForExecution(gActiveBank); @@ -2238,8 +2238,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (effect) { BattleScriptPushCursorAndCallback(BattleScript_CastformChange); - BATTLE_STRUCT->scriptingActive = bank; - BATTLE_STRUCT->castformToChangeInto = effect - 1; + gBattleStruct->scriptingActive = bank; + gBattleStruct->castformToChangeInto = effect - 1; return effect; } } @@ -2251,11 +2251,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) { gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); - BATTLE_STRUCT->synchroniseEffect &= 0x3F; - if (BATTLE_STRUCT->synchroniseEffect == 6) - BATTLE_STRUCT->synchroniseEffect = 2; - gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect + 0x40; - BATTLE_STRUCT->scriptingActive = gBankTarget; + gBattleStruct->synchroniseEffect &= 0x3F; + if (gBattleStruct->synchroniseEffect == 6) + gBattleStruct->synchroniseEffect = 2; + gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchroniseEffect + 0x40; + gBattleStruct->scriptingActive = gBankTarget; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SynchronizeActivates; gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; @@ -2267,11 +2267,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) { gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); - BATTLE_STRUCT->synchroniseEffect &= 0x3F; - if (BATTLE_STRUCT->synchroniseEffect == 6) - BATTLE_STRUCT->synchroniseEffect = 2; - gBattleCommunication[MOVE_EFFECT_BYTE] = BATTLE_STRUCT->synchroniseEffect; - BATTLE_STRUCT->scriptingActive = gBankAttacker; + gBattleStruct->synchroniseEffect &= 0x3F; + if (gBattleStruct->synchroniseEffect == 6) + gBattleStruct->synchroniseEffect = 2; + gBattleCommunication[MOVE_EFFECT_BYTE] = gBattleStruct->synchroniseEffect; + gBattleStruct->scriptingActive = gBankAttacker; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SynchronizeActivates; gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; @@ -2287,7 +2287,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) gLastUsedAbility = ABILITY_INTIMIDATE; gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); BattleScriptPushCursorAndCallback(gUnknown_081D978C); - BATTLE_STRUCT->intimidateBank = i; + gBattleStruct->intimidateBank = i; effect++; break; } @@ -2346,7 +2346,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { BattleScriptPushCursorAndCallback(BattleScript_TraceActivates); gStatuses3[i] &= ~(STATUS3_TRACE); - BATTLE_STRUCT->scriptingActive = i; + gBattleStruct->scriptingActive = i; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 4; @@ -2373,7 +2373,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) gStatuses3[i] &= ~(STATUS3_INTIMIDATE_POKES); BattleScriptPushCursor(); gBattlescriptCurrInstr = gUnknown_081D9795; - BATTLE_STRUCT->intimidateBank = i; + gBattleStruct->intimidateBank = i; effect++; break; } @@ -2499,7 +2499,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) return effect; } -void BattleScriptExecute(u8* BS_ptr) +void BattleScriptExecute(const u8* BS_ptr) { gBattlescriptCurrInstr = BS_ptr; B_FUNCTION_STACK->ptr[B_FUNCTION_STACK->size++] = gBattleMainFunc; @@ -2586,7 +2586,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) switch (bankHoldEffect) { case HOLD_EFFECT_DOUBLE_PRIZE: - BATTLE_STRUCT->moneyMultiplier = 2; + gBattleStruct->moneyMultiplier = 2; break; case HOLD_EFFECT_RESTORE_STATS: for (i = 0; i < 8; i++) @@ -2599,7 +2599,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } if (effect) { - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; gStringBank = bank; gActiveBank = gBankAttacker = bank; BattleScriptExecute(BattleScript_WhiteHerbEnd2); @@ -2672,7 +2672,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } if (effect) { - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; gStringBank = bank; gActiveBank = gBankAttacker = bank; BattleScriptExecute(BattleScript_WhiteHerbEnd2); @@ -2809,9 +2809,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleTextBuff2[4] = EOS; gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_ATK; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_ATK; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->statChanger = 0x10 + STAT_STAGE_ATK; + gBattleStruct->animArg1 = 0xE + STAT_STAGE_ATK; + gBattleStruct->animArg2 = 0; BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); effect = ITEM_STATS_CHANGE; } @@ -2825,9 +2825,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleTextBuff1[3] = EOS; gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_DEF; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_DEF; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->statChanger = 0x10 + STAT_STAGE_DEF; + gBattleStruct->animArg1 = 0xE + STAT_STAGE_DEF; + gBattleStruct->animArg2 = 0; BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); effect = ITEM_STATS_CHANGE; } @@ -2841,9 +2841,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleTextBuff1[3] = EOS; gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPEED; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPEED; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->statChanger = 0x10 + STAT_STAGE_SPEED; + gBattleStruct->animArg1 = 0xE + STAT_STAGE_SPEED; + gBattleStruct->animArg2 = 0; BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); effect = ITEM_STATS_CHANGE; } @@ -2857,9 +2857,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleTextBuff1[3] = EOS; gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPATK; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPATK; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->statChanger = 0x10 + STAT_STAGE_SPATK; + gBattleStruct->animArg1 = 0xE + STAT_STAGE_SPATK; + gBattleStruct->animArg2 = 0; BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); effect = ITEM_STATS_CHANGE; } @@ -2873,9 +2873,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleTextBuff1[3] = EOS; gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x10 + STAT_STAGE_SPDEF; - BATTLE_STRUCT->animArg1 = 0xE + STAT_STAGE_SPDEF; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->statChanger = 0x10 + STAT_STAGE_SPDEF; + gBattleStruct->animArg1 = 0xE + STAT_STAGE_SPDEF; + gBattleStruct->animArg2 = 0; BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); effect = ITEM_STATS_CHANGE; } @@ -2918,9 +2918,9 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) gBattleTextBuff2[7] = EOS; gEffectBank = bank; - BATTLE_STRUCT->statChanger = 0x21 + i; - BATTLE_STRUCT->animArg1 = 0x21 + i + 6; - BATTLE_STRUCT->animArg2 = 0; + gBattleStruct->statChanger = 0x21 + i; + gBattleStruct->animArg1 = 0x21 + i + 6; + gBattleStruct->animArg2 = 0; BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); effect = ITEM_STATS_CHANGE; } @@ -3033,7 +3033,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } if (effect) { - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; gStringBank = bank; gActiveBank = gBankAttacker = bank; switch (effect) @@ -3181,7 +3181,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } if (effect) { - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; gStringBank = bank; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_WhiteHerbRet; @@ -3191,7 +3191,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) } if (effect) { - BATTLE_STRUCT->scriptingActive = bank; + gBattleStruct->scriptingActive = bank; gStringBank = bank; gActiveBank = bank; EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1); @@ -3228,7 +3228,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn) { gLastUsedItem = atkItem; gStringBank = gBankAttacker; - BATTLE_STRUCT->scriptingActive = gBankAttacker; + gBattleStruct->scriptingActive = gBankAttacker; gBattleMoveDamage = (gSpecialStatuses[gBankTarget].moveturnLostHP / atkQuality) * -1; if (gBattleMoveDamage == 0) gBattleMoveDamage = -1; @@ -3433,7 +3433,7 @@ u8 IsMonDisobedient(void) gRandomMove = gBattleMons[gBankAttacker].moves[gCurrMovePos]; gBattleCommunication[3] = 0; gDynamicBasePower = 0; - BATTLE_STRUCT->dynamicMoveType = 0; + gBattleStruct->dynamicMoveType = 0; gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove; gBankTarget = GetMoveTarget(gRandomMove, 0); gHitMarker |= HITMARKER_x200000; diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h index a3d51f2a5..a19c0fc6c 100644 --- a/src/data/battle_strings_de.h +++ b/src/data/battle_strings_de.h @@ -1218,7 +1218,7 @@ const u8 *const gBattleStringsTable[] = }; // below are lists of battle string enums and NOT pointers to the strings. -const u16 gMissStrings[] = +const u16 gMissStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_ProtectedItself, diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index f29e48410..67eb70ee1 100644 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -1218,7 +1218,7 @@ const u8 *const gBattleStringsTable[] = }; // below are lists of battle string enums and NOT pointers to the strings. -const u16 gMissStrings[] = +const u16 gMissStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_ProtectedItself, diff --git a/src/pokemon/pokemon_3.c b/src/pokemon/pokemon_3.c index 221de831a..9346031a6 100644 --- a/src/pokemon/pokemon_3.c +++ b/src/pokemon/pokemon_3.c @@ -1293,15 +1293,15 @@ void BoxMonRestorePP(struct BoxPokemon *boxMon) void sub_8040B8C(void) { - gLastUsedAbility = BATTLE_STRUCT->unk160C0;; + gLastUsedAbility = gBattleStruct->unk160C0;; gBattleTextBuff1[0] = 0xFD; gBattleTextBuff1[1] = 4; - gBattleTextBuff1[2] = BATTLE_STRUCT->unk16054; + gBattleTextBuff1[2] = gBattleStruct->unk16054; gBattleTextBuff1[4] = EOS; - if (!GetBankSide(BATTLE_STRUCT->unk16054)) - gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[BATTLE_STRUCT->unk16054]); + if (!GetBankSide(gBattleStruct->unk16054)) + gBattleTextBuff1[3] = pokemon_order_func(gBattlePartyID[gBattleStruct->unk16054]); else - gBattleTextBuff1[3] = gBattlePartyID[BATTLE_STRUCT->unk16054]; + gBattleTextBuff1[3] = gBattlePartyID[gBattleStruct->unk16054]; gBattleTextBuff2[0] = 0xFD; gBattleTextBuff2[1] = 4; gBattleTextBuff2[2] = gBankInMenu; diff --git a/src/rom3.c b/src/rom3.c index 11239a681..713713162 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -749,9 +749,9 @@ void EmitPrintString(u8 a, u16 stringID) stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; - stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; - stringInfo->unk1605E = BATTLE_STRUCT->unk1605E; - stringInfo->hpScale = BATTLE_STRUCT->hpScale; + stringInfo->scrActive = gBattleStruct->scriptingActive; + stringInfo->unk1605E = gBattleStruct->unk1605E; + stringInfo->hpScale = gBattleStruct->hpScale; stringInfo->StringBank = gStringBank; stringInfo->moveType = gBattleMoves[gCurrentMove].type; @@ -781,8 +781,8 @@ void EmitPrintStringPlayerOnly(u8 a, u16 stringID) stringInfo->lastMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; - stringInfo->scrActive = BATTLE_STRUCT->scriptingActive; - stringInfo->unk1605E = BATTLE_STRUCT->unk1605E; + stringInfo->scrActive = gBattleStruct->scriptingActive; + stringInfo->unk1605E = gBattleStruct->unk1605E; for (i = 0; i < 4; i++) stringInfo->abilities[i] = gBattleMons[i].ability; diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c index 9449ca0d1..a1b0f5ecb 100644 --- a/src/rom_800D42C.c +++ b/src/rom_800D42C.c @@ -52,7 +52,7 @@ void PrintLinkBattleWinLossTie(void) { // lp_field_18 = player position? - switch (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18) + switch (gLinkPlayers[gBattleStruct->linkPlayerIndex].lp_field_18) { case 0: case 2: @@ -70,7 +70,7 @@ void PrintLinkBattleWinLossTie(void) else { - switch (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18) + switch (gLinkPlayers[gBattleStruct->linkPlayerIndex].lp_field_18) { case 1: case 3: @@ -92,7 +92,7 @@ void PrintLinkBattleWinLossTie(void) if (gBattleOutcome == 1) { - if (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18 != 0) + if (gLinkPlayers[gBattleStruct->linkPlayerIndex].lp_field_18 != 0) { PRINT_MESSAGE_RIGHT(BattleText_Win, TILE_OFFSET_WIN); PRINT_MESSAGE_LEFT(BattleText_Loss, TILE_OFFSET_LOSS); @@ -105,7 +105,7 @@ void PrintLinkBattleWinLossTie(void) } else { - if (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18 != 0) + if (gLinkPlayers[gBattleStruct->linkPlayerIndex].lp_field_18 != 0) { PRINT_MESSAGE_LEFT(BattleText_Win, TILE_OFFSET_WIN); PRINT_MESSAGE_RIGHT(BattleText_Loss, TILE_OFFSET_LOSS); diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index b13006c13..f991297ab 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -238,8 +238,8 @@ void ShowContestWinner(void) if(gUnknown_0203856C) { sub_80AAF30(); - BATTLE_STRUCT->unk15DDF = 1; - BATTLE_STRUCT->unk15DDE = sub_80B2C4C(254, 0); + gBattleStruct->unk15DDF = 1; + gBattleStruct->unk15DDE = sub_80B2C4C(254, 0); Contest_SaveWinner(3); gUnknown_0203856C = 0; } diff --git a/sym_ewram.txt b/sym_ewram.txt index b9c08aac6..0bb35e8c2 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -119,7 +119,7 @@ gRandomMove: @ 2024BEA gBattleMoveDamage: @ 2024BEC .space 0x4 -gHP_dealt: @ 2024BF0 +gHpDealt: @ 2024BF0 .space 0x4 gTakenDmg: @ 2024BF4 @@ -170,10 +170,10 @@ gUnknown_02024C2C: @ 2024C2C gLastUsedMove: @ 2024C34 .space 0x8 -gMoveHitWith: @ 2024C3C +gLastLandedMoves: @ 2024C3C .space 0x8 -gUnknown_02024C44: @ 2024C44 +gLastHitByType: @ 2024C44 .space 0x8 gUnknown_02024C4C: @ 2024C4C -- cgit v1.2.3 From 40d8fee1d0badb81120cad7a5aabfd8f5b0031d8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 21:59:56 -0500 Subject: through sub_809BF48 --- asm/pokemon_storage_system.s | 216 --------------------------------- include/pokemon_storage_system.h | 1 + src/pokemon/pokemon_storage_system_4.c | 68 +++++++++-- 3 files changed, 60 insertions(+), 225 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index dc3c9a339..e2090bee9 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,222 +5,6 @@ .text - thumb_func_start sub_809BDD8 -sub_809BDD8: @ 809BDD8 - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - mov r1, sp - strb r0, [r1] - ldr r1, _0809BE04 @ =gPokemonStorageSystemPtr - ldr r2, [r1] - ldr r3, _0809BE08 @ =0x000011f7 - adds r1, r2, r3 - strb r0, [r1] - ldr r0, _0809BE0C @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809BE14 - ldr r1, _0809BE10 @ =0x000025b4 - adds r0, r2, r1 - movs r1, 0x8 - mov r2, sp - bl SetMonData - b _0809BE68 - .align 2, 0 -_0809BE04: .4byte gPokemonStorageSystemPtr -_0809BE08: .4byte 0x000011f7 -_0809BE0C: .4byte gUnknown_020384E6 -_0809BE10: .4byte 0x000025b4 -_0809BE14: - ldr r4, _0809BE70 @ =gUnknown_020384E4 - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r0, 0x1 - bne _0809BE34 - ldr r0, _0809BE74 @ =gUnknown_020384E5 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x64 - muls r0, r1 - ldr r1, _0809BE78 @ =gPlayerParty - adds r0, r1 - movs r1, 0x8 - mov r2, sp - bl SetMonData -_0809BE34: - movs r0, 0 - ldrsb r0, [r4, r0] - cmp r0, 0 - bne _0809BE68 - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldr r1, _0809BE74 @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - ldr r2, _0809BE7C @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - movs r1, 0x8 - mov r2, sp - bl SetBoxMonData -_0809BE68: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809BE70: .4byte gUnknown_020384E4 -_0809BE74: .4byte gUnknown_020384E5 -_0809BE78: .4byte gPlayerParty -_0809BE7C: .4byte gPokemonStorage + 0x4 - thumb_func_end sub_809BDD8 - - thumb_func_start sub_809BE80 -sub_809BE80: @ 809BE80 - push {lr} - ldr r0, _0809BEA8 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809BEB4 - ldr r0, _0809BEAC @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - bne _0809BEB4 - ldr r0, _0809BEB0 @ =gUnknown_020384E5 - ldrb r0, [r0] - bl CountAlivePartyMonsExceptOne - lsls r0, 24 - cmp r0, 0 - bne _0809BEB4 - movs r0, 0x1 - b _0809BEB6 - .align 2, 0 -_0809BEA8: .4byte gUnknown_020384E4 -_0809BEAC: .4byte gUnknown_020384E6 -_0809BEB0: .4byte gUnknown_020384E5 -_0809BEB4: - movs r0, 0 -_0809BEB6: - pop {r1} - bx r1 - thumb_func_end sub_809BE80 - - thumb_func_start sub_809BEBC -sub_809BEBC: @ 809BEBC - push {lr} - ldr r0, _0809BF00 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809BF18 - ldr r0, _0809BF04 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809BEFC - ldr r0, _0809BF08 @ =gUnknown_020384E5 - ldrb r0, [r0] - bl CountAlivePartyMonsExceptOne - lsls r0, 24 - cmp r0, 0 - bne _0809BEFC - ldr r0, _0809BF0C @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r2, _0809BF10 @ =0x000011f9 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0 - bne _0809BF18 - ldr r2, _0809BF14 @ =0x000025b4 - adds r0, r1, r2 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _0809BF18 -_0809BEFC: - movs r0, 0x1 - b _0809BF1A - .align 2, 0 -_0809BF00: .4byte gUnknown_020384E6 -_0809BF04: .4byte gUnknown_020384E4 -_0809BF08: .4byte gUnknown_020384E5 -_0809BF0C: .4byte gPokemonStorageSystemPtr -_0809BF10: .4byte 0x000011f9 -_0809BF14: .4byte 0x000025b4 -_0809BF18: - movs r0, 0 -_0809BF1A: - pop {r1} - bx r1 - thumb_func_end sub_809BEBC - - thumb_func_start sub_809BF20 -sub_809BF20: @ 809BF20 - ldr r0, _0809BF28 @ =gUnknown_020384E6 - ldrb r0, [r0] - bx lr - .align 2, 0 -_0809BF28: .4byte gUnknown_020384E6 - thumb_func_end sub_809BF20 - - thumb_func_start sub_809BF2C -sub_809BF2C: @ 809BF2C - push {lr} - movs r1, 0 - ldr r0, _0809BF44 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x2 - bne _0809BF3E - movs r1, 0x1 -_0809BF3E: - adds r0, r1, 0 - pop {r1} - bx r1 - .align 2, 0 -_0809BF44: .4byte gUnknown_020384E4 - thumb_func_end sub_809BF2C - - thumb_func_start sub_809BF48 -sub_809BF48: @ 809BF48 - push {lr} - movs r1, 0 - ldr r0, _0809BF6C @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x3 - bne _0809BF66 - ldr r0, _0809BF70 @ =gUnknown_020384E5 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809BF66 - movs r1, 0x1 -_0809BF66: - adds r0, r1, 0 - pop {r1} - bx r1 - .align 2, 0 -_0809BF6C: .4byte gUnknown_020384E4 -_0809BF70: .4byte gUnknown_020384E5 - thumb_func_end sub_809BF48 - thumb_func_start sub_809BF74 sub_809BF74: @ 809BF74 push {r4,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index f8d288ff0..8dd51259c 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -220,6 +220,7 @@ extern u8 *const gUnknown_083B6DB8; u8 StorageSystemGetPartySize(void); s16 GetIndexOfFirstEmptySpaceInBoxN(u8 boxId); +u8 CountAlivePartyMonsExceptOne(u8 toSkip); u8 CountPokemonInBoxN(u8 boxId); void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3); void sub_809634C(u8 curBox); diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 40de7d634..96e237d4f 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -25,7 +25,7 @@ struct WallpaperTable { EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; EWRAM_DATA s8 gUnknown_020384E4 = 0; EWRAM_DATA s8 gUnknown_020384E5 = 0; -EWRAM_DATA u8 gUnknown_020384E6 = 0; +EWRAM_DATA bool8 gUnknown_020384E6 = FALSE; EWRAM_DATA u8 gUnknown_020384E7 = 0; EWRAM_DATA u8 gUnknown_020384E8 = 0; EWRAM_DATA u8 gUnknown_020384E9 = 0; @@ -1141,7 +1141,7 @@ void sub_809AA24(void) else gUnknown_020384E4 = 1; gUnknown_020384E5 = 0; - gUnknown_020384E6 = 0; + gUnknown_020384E6 = FALSE; gUnknown_020384E7 = 0; gUnknown_020384E8 = 0; gUnknown_020384E9 = 0; @@ -1315,7 +1315,7 @@ void sub_809AF18(u8 a0, u8 a1) { sub_809AD3C(a0, a1); sub_809AD94(); - if (gUnknown_020384E6 == 0) + if (!gUnknown_020384E6) StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 1); if (a0 == 1 && gUnknown_020384E4 != 1) { @@ -1337,7 +1337,7 @@ void sub_809AFB8(void) { gUnknown_020384E4 = gPokemonStorageSystemPtr->unk_11e0; gUnknown_020384E5 = gPokemonStorageSystemPtr->unk_11e1; - if (gUnknown_020384E6 == 0) + if (!gUnknown_020384E6) StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 0); sub_809BF74(); switch (gUnknown_020384E4) @@ -1359,7 +1359,7 @@ void sub_809AFB8(void) void sub_809B068(void) { u8 partyCount; - if (gUnknown_020384E6 == 0) + if (!gUnknown_020384E6) partyCount = 0; else { @@ -1534,7 +1534,7 @@ void sub_809B384(void) default: return; } - gUnknown_020384E6 = 1; + gUnknown_020384E6 = TRUE; } void sub_809B3E0(void) @@ -1554,7 +1554,7 @@ void sub_809B3E0(void) default: return; } - gUnknown_020384E6 = 0; + gUnknown_020384E6 = FALSE; } void sub_809B440(void) @@ -1616,7 +1616,7 @@ bool8 sub_809B62C(u8 boxId) { diegohint2(boxId, monIdx); sub_8099480(); - gUnknown_020384E6 = 0; + gUnknown_020384E6 = FALSE; } else { @@ -1664,7 +1664,7 @@ void sub_809B760(void) { sub_8099920(); if (gUnknown_020384E6) - gUnknown_020384E6 = 0; + gUnknown_020384E6 = FALSE; else { u8 boxId; @@ -1861,3 +1861,53 @@ s16 party_compaction(void) ZeroMonData(gPlayerParty + last); return retVal; } + +void sub_809BDD8(u8 markings) +{ + gPokemonStorageSystemPtr->unk_11f7 = markings; + if (gUnknown_020384E6) + SetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_MARKINGS, &markings); + else + { + if (gUnknown_020384E4 == 1) + SetMonData(gPlayerParty + gUnknown_020384E5, MON_DATA_MARKINGS, &markings); + if (gUnknown_020384E4 == 0) + SetBoxMonData(gPokemonStorage.boxes[get_preferred_box()] + gUnknown_020384E5, MON_DATA_MARKINGS, &markings); + } +} + +bool8 sub_809BE80(void) +{ + if (gUnknown_020384E4 == 1 && !gUnknown_020384E6 && CountAlivePartyMonsExceptOne(gUnknown_020384E5) == 0) + return TRUE; + return FALSE; +} + +bool8 sub_809BEBC(void) +{ + if (gUnknown_020384E6) + { + if (gUnknown_020384E4 == 1 && CountAlivePartyMonsExceptOne(gUnknown_020384E5) == 0) + { + if (gPokemonStorageSystemPtr->unk_11f9 || GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_HP) == 0) + return FALSE; + } + return TRUE; + } + return FALSE; +} + +bool8 sub_809BF20(void) +{ + return gUnknown_020384E6; +} + +bool8 sub_809BF2C(void) +{ + return gUnknown_020384E4 == 2 ? TRUE : FALSE; +} + +bool8 sub_809BF48(void) +{ + return (gUnknown_020384E4 == 3 && gUnknown_020384E5 == 1) ? TRUE : FALSE; +} -- cgit v1.2.3 From 470c09225f4c058831c2226195af413204f5f03c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 22:08:46 -0500 Subject: through sub_809C028 --- asm/pokemon_storage_system.s | 110 --------------------------------- src/pokemon/pokemon_storage_system_4.c | 37 ++++++++++- 2 files changed, 35 insertions(+), 112 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index e2090bee9..854190e40 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,116 +5,6 @@ .text - thumb_func_start sub_809BF74 -sub_809BF74: @ 809BF74 - push {r4,lr} - ldr r0, _0809BFA8 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - movs r2, 0 - ldr r3, _0809BFAC @ =gUnknown_020384E6 - ldrb r0, [r3] - cmp r0, 0 - bne _0809BF86 - movs r2, 0x1 -_0809BF86: - ldr r4, _0809BFB0 @ =0x000011f6 - adds r0, r1, r4 - strb r2, [r0] - ldrb r0, [r3] - cmp r0, 0 - bne _0809C018 - ldr r0, _0809BFB4 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - beq _0809BFBE - cmp r0, 0x1 - bgt _0809BFB8 - cmp r0, 0 - beq _0809BFEE - b _0809C018 - .align 2, 0 -_0809BFA8: .4byte gPokemonStorageSystemPtr -_0809BFAC: .4byte gUnknown_020384E6 -_0809BFB0: .4byte 0x000011f6 -_0809BFB4: .4byte gUnknown_020384E4 -_0809BFB8: - cmp r0, 0x3 - bgt _0809C018 - b _0809BFE4 -_0809BFBE: - ldr r1, _0809BFDC @ =gUnknown_020384E5 - movs r0, 0 - ldrsb r0, [r1, r0] - cmp r0, 0x5 - bgt _0809BFE4 - adds r1, r0, 0 - movs r0, 0x64 - muls r0, r1 - ldr r1, _0809BFE0 @ =gPlayerParty - adds r0, r1 - movs r1, 0 - bl sub_809C04C - b _0809C018 - .align 2, 0 -_0809BFDC: .4byte gUnknown_020384E5 -_0809BFE0: .4byte gPlayerParty -_0809BFE4: - movs r0, 0 - movs r1, 0x2 - bl sub_809C04C - b _0809C018 -_0809BFEE: - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldr r1, _0809C020 @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - ldr r2, _0809C024 @ =gPokemonStorage + 0x4 - adds r1, r2 - adds r0, r1 - movs r1, 0x1 - bl sub_809C04C -_0809C018: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809C020: .4byte gUnknown_020384E5 -_0809C024: .4byte gPokemonStorage + 0x4 - thumb_func_end sub_809BF74 - - thumb_func_start sub_809C028 -sub_809C028: @ 809C028 - push {lr} - ldr r0, _0809C03C @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809C044 - ldr r0, _0809C040 @ =gUnknown_02038480 - movs r1, 0 - bl sub_809C04C - b _0809C048 - .align 2, 0 -_0809C03C: .4byte gUnknown_020384E6 -_0809C040: .4byte gUnknown_02038480 -_0809C044: - bl sub_809BF74 -_0809C048: - pop {r0} - bx r0 - thumb_func_end sub_809C028 - thumb_func_start sub_809C04C sub_809C04C: @ 809C04C push {r4-r7,lr} diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index 96e237d4f..ada4b43bd 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -64,7 +64,7 @@ void diegohint1(u8 a0, u8 a1); bool8 sub_809BF2C(void); void sub_809BF74(void); void sub_809C028(void); -void sub_809C04C(struct Pokemon *pokemon, u8 a1); +void sub_809C04C(struct BoxPokemon *pokemon, u8 a1); void sub_809CC04(void); // .rodata @@ -1602,7 +1602,7 @@ void diegohint1(u8 a0, u8 a1) ExpandBoxMon(gPokemonStorage.boxes[a0] + a1, &gPokemonStorageSystemPtr->unk_2618); diegohint2(a0, a1); gPokemonStorageSystemPtr->unk_25b4 = gPokemonStorageSystemPtr->unk_2618; - sub_809C04C(&gPokemonStorageSystemPtr->unk_25b4, 0); + sub_809C04C(&gPokemonStorageSystemPtr->unk_25b4.box, 0); gUnknown_020384E7 = a0; gUnknown_020384E8 = a1; } @@ -1911,3 +1911,36 @@ bool8 sub_809BF48(void) { return (gUnknown_020384E4 == 3 && gUnknown_020384E5 == 1) ? TRUE : FALSE; } + +void sub_809BF74(void) +{ + gPokemonStorageSystemPtr->unk_11f6 = gUnknown_020384E6 ? 0 : 1; + if (!gUnknown_020384E6) + { + switch (gUnknown_020384E4) + { + case 1: + if (gUnknown_020384E5 < PARTY_SIZE) + { + sub_809C04C(&gPlayerParty[gUnknown_020384E5].box, 0); + break; + } + // fallthrough + case 2: + case 3: + sub_809C04C(NULL, 2); + break; + case 0: + sub_809C04C(gPokemonStorage.boxes[get_preferred_box()] + gUnknown_020384E5, 1); + break; + } + } +} + +void sub_809C028(void) +{ + if (gUnknown_020384E6) + sub_809C04C(&gUnknown_02038480.box, 0); + else + sub_809BF74(); +} -- cgit v1.2.3 From 15cffaecf34d93c99aa635586ad24fa9978a70a0 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 21:29:14 -0600 Subject: match ChangeStatBuffs --- include/battle.h | 22 +- include/battle_script_commands.h | 65 +++ src/battle/battle_2.c | 2 +- src/battle/battle_4.c | 893 +++++++++------------------------------ 4 files changed, 265 insertions(+), 717 deletions(-) create mode 100644 include/battle_script_commands.h diff --git a/include/battle.h b/include/battle.h index 8727f2eca..d3cbd24f5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -73,16 +73,16 @@ struct AI_Stack struct AI_ThinkingStruct /* 0x2016800 */ { -/* 0x00 */ u8 aiState; -/* 0x01 */ u8 movesetIndex; -/* 0x02 */ u16 moveConsidered; -/* 0x04 */ s8 score[4]; // score? -/* 0x08 */ u32 funcResult; -/* 0x0C */ u32 aiFlags; -/* 0x10 */ u8 aiAction; -/* 0x11 */ u8 aiLogicId; -/* 0x12 */ u8 filler12[6]; -/* 0x18 */ u8 simulatedRNG[4]; + /*0x00*/ u8 aiState; + /*0x01*/ u8 movesetIndex; + /*0x02*/ u16 moveConsidered; + /*0x04*/ s8 score[4]; // score? + /*0x08*/ u32 funcResult; + /*0x0C*/ u32 aiFlags; + /*0x10*/ u8 aiAction; + /*0x11*/ u8 aiLogicId; + /*0x12*/ u8 filler12[6]; + /*0x18*/ u8 simulatedRNG[4]; }; struct BattleStruct /* 0x2000000 */ @@ -527,7 +527,7 @@ struct WishFutureKnock u8 wishCounter[MAX_BANKS_BATTLE]; u8 wishUserID[MAX_BANKS_BATTLE]; u8 weatherDuration; - u16 knockedOffPokes; + u8 knockedOffPokes[2]; }; extern struct UnkBattleStruct1 unk_2016A00; diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h new file mode 100644 index 000000000..030844ec3 --- /dev/null +++ b/include/battle_script_commands.h @@ -0,0 +1,65 @@ +#ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H +#define GUARD_BATTLE_SCRIPT_COMMANDS_H + +#define NO_ACC_CALC 0xFFFE +#define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF +#define ACC_CURR_MOVE 0 + +#define CMP_EQUAL 0x0 +#define CMP_NOT_EQUAL 0x1 +#define CMP_GREATER_THAN 0x2 +#define CMP_LESS_THAN 0x3 +#define CMP_COMMON_BITS 0x4 +#define CMP_NO_COMMON_BITS 0x5 + +#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_status_icon_update +#define BS_GET_ATTACKER_SIDE 8 // for atk1E_jumpifability +#define BS_GET_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability + +#define ATK48_STAT_NEGATIVE 0x1 +#define ATK48_STAT_BY_TWO 0x2 +#define ATK48_BIT_x4 0x4 +#define ATK48_LOWER_FAIL_CHECK 0x8 + +#define ATK4F_DONT_CHECK_STATUSES 0x80 + +#define VARIOUS_CANCEL_MULTI_TURN_MOVES 0 +#define VARIOUS_SET_MAGIC_COAT_TARGET 1 +#define VARIOUS_IS_RUNNING_IMPOSSIBLE 2 +#define VARIOUS_GET_MOVE_TARGET 3 +#define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 +#define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 +#define VARIOUS_EMIT_YESNOBOX 13 +#define VARIOUS_WAIT_CRY 18 +#define VARIOUS_RETURN_OPPONENT_MON1 19 +#define VARIOUS_RETURN_OPPONENT_MON2 20 +#define VARIOUS_SET_TELEPORT_OUTCOME 25 +#define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC 26 + +#define ATK80_DMG_CHANGE_SIGN 0 +#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP 1 +#define ATK80_DMG_DOUBLED 2 + +#define STAT_CHANGE_BS_PTR 0x1 +#define STAT_CHANGE_NOT_PROTECT_AFFECTED 0x20 + +#define STAT_CHANGE_WORKED 0 +#define STAT_CHANGE_DIDNT_WORK 1 + +#define WINDOW_CLEAR 0x1 +#define WINDOW_x80 0x80 + +void AI_CalcDmg(u8 bankAtk, u8 bankDef); +u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef); +u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility); +u8 BankGetTurnOrder(u8 bank); +void SetMoveEffect(bool8 primary, u8 certain); +void BattleDestroyYesNoCursorAt(u8 cursorPosition); +void BattleCreateYesNoCursorAt(u8 cursorPosition); +void BufferMoveToLearnIntoBattleTextBuff2(void); +void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); +bool8 UproarWakeUpCheck(u8 bank); + +extern void (* const gBattleScriptingCommandsTable[])(void); + +#endif // GUARD_BATTLE_SCRIPT_COMMANDS_H diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 2368f58df..b00c35312 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1664,7 +1664,7 @@ void sub_8010874(void) } } -void SwitchInClearStructs(void) +void SwitchInClearSetData(void) { struct DisableStruct sp0 = gDisableStructs[gActiveBank]; s32 i; diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 0c5f5927e..3763fc309 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -2,6 +2,7 @@ #include "battle.h" #include "battle_message.h" #include "battle_string_ids.h" +#include "battle_script_commands.h" #include "battle_util.h" #include "constants/battle_move_effects.h" #include "constants/moves.h" @@ -204,7 +205,7 @@ void HandleLowHpMusicChange(struct Pokemon*, u8 bank); void AdjustFriendship(struct Pokemon*, u8 value); bool8 IsTradedMon(struct Pokemon*); void BattleScriptPop(void); -void SwitchInClearStructs(void); +void SwitchInClearSetData(void); u8* ConvertIntToDecimalStringN(u8*, s32, u8, u8); u8 GetSetPokedexFlag(u16 nationalNum, u8 caseID); u16 SpeciesToNationalPokedexNum(u16 species); @@ -348,7 +349,7 @@ extern u8 BattleScript_SelectingImprisionedMoveInPalace[]; #define RecordAbilitySetField6(ability, fieldValue) \ (gLastUsedAbility = ability, gBattleCommunication[6] = fieldValue, RecordAbilityBattle(gBankTarget, ability)) -#define TARGET_TURN_DAMAGED (((gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_physical.moveturnLostHP_special))) +#define TARGET_TURN_DAMAGED (((gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special))) #define HP_ON_SWITCHOUT (((u16*)(ewram_addr + 0x160BC))) @@ -387,7 +388,7 @@ static void atk1F_jumpifsideaffecting(void); static void atk20_jumpifstat(void); static void atk21_jumpifstatus3condition(void); static void atk22_jumpiftype(void); -void atk23_getexp(void); +static void atk23_getexp(void); static void atk24(void); static void atk25_movevaluescleanup(void); static void atk26_setmultihit(void); @@ -425,7 +426,7 @@ static void atk45_playanimation(void); static void atk46_playanimation2(void); static void atk47_setgraphicalstatchangevalues(void); static void atk48_playstatchangeanimation(void); -static void atk49_moveend(void); +void atk49_moveend(void); static void atk4A_typecalc2(void); static void atk4B_returnatktoball(void); static void atk4C_getswitchedmondata(void); @@ -489,7 +490,7 @@ static void atk85_stockpile(void); static void atk86_stockpiletobasedamage(void); static void atk87_stockpiletohpheal(void); static void atk88_negativedamage(void); -static u8 ChangeStatBuffs(s8, u8, u8, u8*); +static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr); static void atk89_statbuffchange(void); static void atk8A_normalisebuffs(void); static void atk8B_setbide(void); @@ -5355,7 +5356,7 @@ static void atk22_jumpiftype(void) //u8 bank, u8 type, *ptr gBattlescriptCurrInstr += 7; } -void atk23_getexp(void) +static void atk23_getexp(void) { u16 item; s32 i; // also used as stringId @@ -6882,7 +6883,7 @@ static void atk49_moveend(void) } #else __attribute__((naked)) -static void atk49_moveend(void) +void atk49_moveend(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -8293,27 +8294,19 @@ static void atk4C_getswitchedmondata(void) gBattlescriptCurrInstr += 2; } -static inline u8 get_knocked_off_byte(u8 bank) -{ - register u32 side asm("r2") = GetBankSide(bank); - register struct WishFutureKnock* dummy = &gWishFutureKnock; - register u8* aa = ((u8*)((u8*)(dummy))); - register u8* bb = aa + 0x29; - register u8* cc asm("r0") = side + bb; - return *cc; -} - static void atk4D_switchindataupdate(void) { - struct BattlePokemon OldData; - int i; + struct BattlePokemon oldData; + s32 i; u8 *monData; + if (gBattleExecBuffer) return; - gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); - OldData = gBattleMons[gActiveBank]; + gActiveBank = GetBattleBank(gBattlescriptCurrInstr[1]); + oldData = gBattleMons[gActiveBank]; monData = (u8*)(&gBattleMons[gActiveBank]); + for (i = 0; i < sizeof(struct BattlePokemon); i++) { monData[i] = gBattleBufferB[gActiveBank][4 + i]; @@ -8322,8 +8315,10 @@ static void atk4D_switchindataupdate(void) gBattleMons[gActiveBank].type1 = gBaseStats[gBattleMons[gActiveBank].species].type1; gBattleMons[gActiveBank].type2 = gBaseStats[gBattleMons[gActiveBank].species].type2; gBattleMons[gActiveBank].ability = GetAbilityBySpecies(gBattleMons[gActiveBank].species, gBattleMons[gActiveBank].altAbility); - //check knocked off item - if (get_knocked_off_byte(gActiveBank) & gBitTable[gBattlePartyID[gActiveBank]]) + + // check knocked off item + i = GetBankSide(gActiveBank); + if (gWishFutureKnock.knockedOffPokes[i] & gBitTable[gBattlePartyID[gActiveBank]]) { gBattleMons[gActiveBank].item = 0; } @@ -8332,17 +8327,16 @@ static void atk4D_switchindataupdate(void) { for (i = 0; i < 8; i++) { - gBattleMons[gActiveBank].statStages[i] = OldData.statStages[i]; + gBattleMons[gActiveBank].statStages[i] = oldData.statStages[i]; } - gBattleMons[gActiveBank].status2 = OldData.status2; + gBattleMons[gActiveBank].status2 = oldData.status2; } - SwitchInClearStructs(); + + SwitchInClearSetData(); + gBattleStruct->scriptingActive = gActiveBank; - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 7; - gBattleTextBuff1[2] = gActiveBank; - gBattleTextBuff1[3] = gBattlePartyID[gActiveBank]; - gBattleTextBuff1[4] = EOS; + + PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBank, gBattlePartyID[gActiveBank]); gBattlescriptCurrInstr += 2; } @@ -10160,6 +10154,76 @@ _08024190: .4byte gBattlescriptCurrInstr\n\ } #endif //NONMATCHING +/* +static u32 GetTrainerMoneyToGive(u16 trainerId) +{ + u32 i = 0; + u32 lastMonLevel = 0; + u32 moneyReward = 0; + + if (trainerId == SECRET_BASE_OPPONENT) + { + moneyReward = 20 * eSecretBaseRecord->partyLevels[0] * gBattleStruct->moneyMultiplier; + } + else + { + switch (gTrainers[trainerId].partyFlags) + { + case 0: + { + const struct TrainerMonNoItemDefaultMoves *party = gTrainers[trainerId].party.NoItemDefaultMoves; + lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; + } + break; + case F_TRAINER_PARTY_CUSTOM_MOVESET: + { + const struct TrainerMonNoItemCustomMoves *party = gTrainers[trainerId].party.NoItemCustomMoves; + lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; + } + break; + case F_TRAINER_PARTY_HELD_ITEM: + { + const struct TrainerMonItemDefaultMoves *party = gTrainers[trainerId].party.ItemDefaultMoves; + lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; + } + break; + case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: + { + const struct TrainerMonItemCustomMoves *party = gTrainers[trainerId].party.ItemCustomMoves; + lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; + } + break; + } + + for (; gTrainerMoneyTable[i].classId != 0xFF; i++) + { + if (gTrainerMoneyTable[i].classId == gTrainers[trainerId].trainerClass) + break; + } + + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) + moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * 2 * gTrainerMoneyTable[i].value; + else + moneyReward = 4 * lastMonLevel * gBattleStruct->moneyMultiplier * gTrainerMoneyTable[i].value; + } + + return moneyReward; +} + +static void atk5D_getmoneyreward(void) +{ + u32 moneyReward = GetTrainerMoneyToGive(gTrainerBattleOpponent_A); + if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) + moneyReward += GetTrainerMoneyToGive(gTrainerBattleOpponent_B); + + AddMoney(&gSaveBlock1Ptr->money, moneyReward); + + PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward) + + gBattlescriptCurrInstr++; +} +*/ + static void atk5E_8025A70(void) { gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1)); @@ -11423,756 +11487,175 @@ static void atk88_negativedamage(void) gBattlescriptCurrInstr++; } -#ifdef NONMATCHING -u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) +static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) { - u8 r9 = 0; - u8 r10 = 0; - u8 index; - if (flags & 0x40) + bool8 certain = FALSE; + bool8 notProtectAffected = FALSE; + u32 index; + + if (flags & MOVE_EFFECT_AFFECTS_USER) gActiveBank = gBankAttacker; else gActiveBank = gBankTarget; - flags &= ~(0x40); - if (flags & 0x80) - r9++; - flags &= ~(0x80); - if (flags & 0x20) - r10++; - flags &= ~(0x20); - gBattleTextBuff1[0] = 0xFD; - gBattleTextBuff1[1] = 5; - gBattleTextBuff1[2] = stat; - gBattleTextBuff1[3] = 0xFF; + flags &= ~(MOVE_EFFECT_AFFECTS_USER); + + if (flags & MOVE_EFFECT_CERTAIN) + certain++; + flags &= ~(MOVE_EFFECT_CERTAIN); - if ((statchanger << 0x18) < 0) //stat decrease + if (flags & STAT_CHANGE_NOT_PROTECT_AFFECTED) + notProtectAffected++; + flags &= ~(STAT_CHANGE_NOT_PROTECT_AFFECTED); + + PREPARE_STAT_BUFFER(gBattleTextBuff1, statId) + + if ((statValue << 0x18) < 0) // stat decrease { - if (gSideTimers[GetBankIdentity(gActiveBank) & 1].mistTimer && !r9 && gCurrentMove != MOVE_CURSE) + if (gSideTimers[GET_BANK_SIDE(gActiveBank)].mistTimer + && !certain && gCurrentMove != MOVE_CURSE) { - if (flags == 1) + if (flags == STAT_CHANGE_BS_PTR) { - if (gSpecialStatuses[gActiveBank].statloweringflag) - gBattlescriptCurrInstr = bs_ptr; + if (gSpecialStatuses[gActiveBank].statLowered) + { + gBattlescriptCurrInstr = BS_ptr; + } else { - BattleScriptPush(bs_ptr); + BattleScriptPush(BS_ptr); gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_MistProtected; - gSpecialStatuses[gActiveBank].statloweringflag = 1; + gSpecialStatuses[gActiveBank].statLowered = 1; } } - return 1; + return STAT_CHANGE_DIDNT_WORK; } - else if (gCurrentMove != MOVE_CURSE && r10 != 1 && JumpIfMoveAffectedByProtect(0)) + else if (gCurrentMove != MOVE_CURSE + && notProtectAffected != TRUE && JumpIfMoveAffectedByProtect(0)) { gBattlescriptCurrInstr = BattleScript_ButItFailed; - return 1; + return STAT_CHANGE_DIDNT_WORK; } - else if ((gBattleMons[gActiveBank].ability == ABILITY_CLEAR_BODY || gBattleMons[gActiveBank].ability == ABILITY_WHITE_SMOKE) && !r9 && gCurrentMove != MOVE_CURSE) + else if ((gBattleMons[gActiveBank].ability == ABILITY_CLEAR_BODY + || gBattleMons[gActiveBank].ability == ABILITY_WHITE_SMOKE) + && !certain && gCurrentMove != MOVE_CURSE) { - if (flags == 1) + if (flags == STAT_CHANGE_BS_PTR) { - if (gSpecialStatuses[gActiveBank].statloweringflag) - gBattlescriptCurrInstr = bs_ptr; + if (gSpecialStatuses[gActiveBank].statLowered) + { + gBattlescriptCurrInstr = BS_ptr; + } else { - BattleScriptPush(bs_ptr); + BattleScriptPush(BS_ptr); gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; RecordAbilityBattle(gActiveBank, gLastUsedAbility); - gSpecialStatuses[gActiveBank].statloweringflag = 1; + gSpecialStatuses[gActiveBank].statLowered = 1; } } - return 1; + return STAT_CHANGE_DIDNT_WORK; } - else if (gBattleMons[gActiveBank].ability == ABILITY_KEEN_EYE && !r9 && stat == STAT_STAGE_ACC) + else if (gBattleMons[gActiveBank].ability == ABILITY_KEEN_EYE + && !certain && statId == STAT_STAGE_ACC) { - if (flags == 1) + if (flags == STAT_CHANGE_BS_PTR) { - BattleScriptPush(bs_ptr); + BattleScriptPush(BS_ptr); gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; RecordAbilityBattle(gActiveBank, gLastUsedAbility); } - return 1; + return STAT_CHANGE_DIDNT_WORK; } - else if (gBattleMons[gActiveBank].ability == ABILITY_HYPER_CUTTER && !r9 && stat == STAT_STAGE_ATK) + else if (gBattleMons[gActiveBank].ability == ABILITY_HYPER_CUTTER + && !certain && statId == STAT_STAGE_ATK) { - if (flags == 1) + if (flags == STAT_CHANGE_BS_PTR) { - BattleScriptPush(bs_ptr); + BattleScriptPush(BS_ptr); gBattleStruct->scriptingActive = gActiveBank; gBattlescriptCurrInstr = BattleScript_AbilityNoSpecificStatLoss; gLastUsedAbility = gBattleMons[gActiveBank].ability; RecordAbilityBattle(gActiveBank, gLastUsedAbility); } - return 1; + return STAT_CHANGE_DIDNT_WORK; } else if (gBattleMons[gActiveBank].ability == ABILITY_SHIELD_DUST && flags == 0) - return 1; - else //decrease { - statchanger = -((statchanger >> 4) & (7)); - gBattleTextBuff2[0] = 0xFD; + return STAT_CHANGE_DIDNT_WORK; + } + else // try to decrease + { + statValue = -GET_STAT_BUFF_VALUE(statValue); + gBattleTextBuff2[0] = B_BUFF_PLACEHOLDER_BEGIN; index = 1; - if (statchanger == -2) + if (statValue == -2) { - gBattleTextBuff2[1] = 0; - gBattleTextBuff2[2] = 0xD3; //harshly - gBattleTextBuff2[3] = 0x0; + gBattleTextBuff2[1] = B_BUFF_STRING; + gBattleTextBuff2[2] = STRINGID_STATHARSHLY; + gBattleTextBuff2[3] = STRINGID_STATHARSHLY >> 8; index = 4; } - gBattleTextBuff2[index] = 0; + gBattleTextBuff2[index] = B_BUFF_STRING; index++; - gBattleTextBuff2[index] = 0xD4; //fell + gBattleTextBuff2[index] = STRINGID_STATFELL; index++; - gBattleTextBuff2[index] = 0; + gBattleTextBuff2[index] = STRINGID_STATFELL >> 8; index++; - gBattleTextBuff2[index] = 0xFF; + gBattleTextBuff2[index] = B_BUFF_EOS; - if (gBattleMons[gActiveBank].statStages[stat] == 0) - { + if (gBattleMons[gActiveBank].statStages[statId] == 0) gBattleCommunication[MULTISTRING_CHOOSER] = 2; - } else - { - u8 stringID = 0; - if (gBankTarget == gActiveBank) - stringID = 1; - gBattleCommunication[MULTISTRING_CHOOSER] = stringID; - } + gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBank); + } } - else //stat increase + else // stat increase { - statchanger = (statchanger >> 4) & (7); - gBattleTextBuff2[0] = 0xFD; + statValue = GET_STAT_BUFF_VALUE(statValue); + gBattleTextBuff2[0] = B_BUFF_PLACEHOLDER_BEGIN; index = 1; - if (statchanger == 2) + if (statValue == 2) { - gBattleTextBuff2[1] = 0; - gBattleTextBuff2[2] = 0xD1; //sharply - gBattleTextBuff2[3] = 0x0; + gBattleTextBuff2[1] = B_BUFF_STRING; + gBattleTextBuff2[2] = STRINGID_STATSHARPLY; + gBattleTextBuff2[3] = STRINGID_STATSHARPLY >> 8; index = 4; } - gBattleTextBuff2[index] = 0; + gBattleTextBuff2[index] = B_BUFF_STRING; index++; - gBattleTextBuff2[index] = 0xD2; //rose + gBattleTextBuff2[index] = STRINGID_STATROSE; index++; - gBattleTextBuff2[index] = 0; + gBattleTextBuff2[index] = STRINGID_STATROSE >> 8; index++; - gBattleTextBuff2[index] = 0xFF; + gBattleTextBuff2[index] = B_BUFF_EOS; - if (gBattleMons[gActiveBank].statStages[stat] == 0xC) - { + if (gBattleMons[gActiveBank].statStages[statId] == 0xC) gBattleCommunication[MULTISTRING_CHOOSER] = 2; - } else - { - u8 stringID = 0; - if (gBankTarget == gActiveBank) - stringID = 1; - gBattleCommunication[MULTISTRING_CHOOSER] = stringID; - } + gBattleCommunication[MULTISTRING_CHOOSER] = (gBankTarget == gActiveBank); } - gBattleMons[gActiveBank].statStages[stat] += statchanger; - if (gBattleMons[gActiveBank].statStages[stat] < 0) - gBattleMons[gActiveBank].statStages[stat] = 0; - if (gBattleMons[gActiveBank].statStages[stat] > 0xC) - gBattleMons[gActiveBank].statStages[stat] = 0xC; + gBattleMons[gActiveBank].statStages[statId] += statValue; + if (gBattleMons[gActiveBank].statStages[statId] < 0) + gBattleMons[gActiveBank].statStages[statId] = 0; + if (gBattleMons[gActiveBank].statStages[statId] > 0xC) + gBattleMons[gActiveBank].statStages[statId] = 0xC; - if (gBattleCommunication[MULTISTRING_CHOOSER] == 2) - { - if (flags & 1) - gBattleMoveFlags |= MOVESTATUS_MISSED; - if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & 1)) //what the actual fuck gamefreak... - return 1; - } - return 0; -} + if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_BS_PTR) + gBattleMoveFlags |= MOVESTATUS_MISSED; -#else -__attribute__((naked)) -u8 ChangeStatBuffs(s8 statchanger, u8 stat, u8 flags, u8* bs_ptr) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - mov r8, r3\n\ - lsls r0, 24\n\ - lsrs r6, r0, 24\n\ - lsls r1, 24\n\ - lsrs r7, r1, 24\n\ - lsls r2, 24\n\ - lsrs r5, r2, 24\n\ - movs r0, 0\n\ - mov r9, r0\n\ - mov r10, r0\n\ - movs r0, 0x40\n\ - ands r0, r5\n\ - cmp r0, 0\n\ - beq _08025E54\n\ - ldr r0, _08025E4C @ =gActiveBank\n\ - ldr r1, _08025E50 @ =gBankAttacker\n\ - b _08025E58\n\ - .align 2, 0\n\ -_08025E4C: .4byte gActiveBank\n\ -_08025E50: .4byte gBankAttacker\n\ -_08025E54:\n\ - ldr r0, _08025EF8 @ =gActiveBank\n\ - ldr r1, _08025EFC @ =gBankTarget\n\ -_08025E58:\n\ - ldrb r1, [r1]\n\ - strb r1, [r0]\n\ - movs r0, 0xBF\n\ - ands r5, r0\n\ - movs r0, 0x80\n\ - ands r0, r5\n\ - cmp r0, 0\n\ - beq _08025E72\n\ - mov r0, r9\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r9, r0\n\ -_08025E72:\n\ - movs r0, 0x7F\n\ - ands r5, r0\n\ - movs r0, 0x20\n\ - ands r0, r5\n\ - cmp r0, 0\n\ - beq _08025E88\n\ - mov r0, r10\n\ - adds r0, 0x1\n\ - lsls r0, 24\n\ - lsrs r0, 24\n\ - mov r10, r0\n\ -_08025E88:\n\ - movs r0, 0xDF\n\ - ands r5, r0\n\ - ldr r1, _08025F00 @ =gBattleTextBuff1\n\ - movs r4, 0\n\ - movs r2, 0xFD\n\ - strb r2, [r1]\n\ - movs r0, 0x5\n\ - strb r0, [r1, 0x1]\n\ - strb r7, [r1, 0x2]\n\ - movs r3, 0x1\n\ - negs r3, r3\n\ - mov r12, r3\n\ - movs r0, 0xFF\n\ - strb r0, [r1, 0x3]\n\ - lsls r0, r6, 24\n\ - cmp r0, 0\n\ - blt _08025EAC\n\ - b _080261B0\n\ -_08025EAC:\n\ - ldr r4, _08025F04 @ =gSideTimers\n\ - ldr r1, _08025EF8 @ =gActiveBank\n\ - ldrb r0, [r1]\n\ - bl GetBankIdentity\n\ - movs r1, 0x1\n\ - ands r1, r0\n\ - lsls r0, r1, 1\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - ldrb r0, [r0, 0x2]\n\ - cmp r0, 0\n\ - beq _08025F54\n\ - mov r2, r9\n\ - cmp r2, 0\n\ - bne _08025F54\n\ - ldr r0, _08025F08 @ =gCurrentMove\n\ - ldrh r0, [r0]\n\ - cmp r0, 0xAE\n\ - beq _08025F84\n\ - cmp r5, 0x1\n\ - bne _08025F74\n\ - ldr r4, _08025F0C @ =gSpecialStatuses\n\ - ldr r3, _08025EF8 @ =gActiveBank\n\ - ldrb r0, [r3]\n\ - lsls r1, r0, 2\n\ - adds r1, r0\n\ - lsls r1, 2\n\ - adds r1, r4\n\ - ldrb r0, [r1]\n\ - lsls r0, 31\n\ - cmp r0, 0\n\ - beq _08025F14\n\ - ldr r0, _08025F10 @ =gBattlescriptCurrInstr\n\ - mov r4, r8\n\ - str r4, [r0]\n\ - b _08025F74\n\ - .align 2, 0\n\ -_08025EF8: .4byte gActiveBank\n\ -_08025EFC: .4byte gBankTarget\n\ -_08025F00: .4byte gBattleTextBuff1\n\ -_08025F04: .4byte gSideTimers\n\ -_08025F08: .4byte gCurrentMove\n\ -_08025F0C: .4byte gSpecialStatuses\n\ -_08025F10: .4byte gBattlescriptCurrInstr\n\ -_08025F14:\n\ - mov r0, r8\n\ - bl BattleScriptPush\n\ - ldr r0, _08025F40 @ =gSharedMem\n\ - ldr r6, _08025F44 @ =gActiveBank\n\ - ldrb r1, [r6]\n\ - ldr r2, _08025F48 @ =0x00016003\n\ - adds r0, r2\n\ - strb r1, [r0]\n\ - ldr r1, _08025F4C @ =gBattlescriptCurrInstr\n\ - ldr r0, _08025F50 @ =BattleScript_MistProtected\n\ - str r0, [r1]\n\ - ldrb r1, [r6]\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - ldrb r1, [r0]\n\ - movs r2, 0x1\n\ - orrs r1, r2\n\ - strb r1, [r0]\n\ - b _08025F74\n\ - .align 2, 0\n\ -_08025F40: .4byte gSharedMem\n\ -_08025F44: .4byte gActiveBank\n\ -_08025F48: .4byte 0x00016003\n\ -_08025F4C: .4byte gBattlescriptCurrInstr\n\ -_08025F50: .4byte BattleScript_MistProtected\n\ -_08025F54:\n\ - ldr r0, _08025F78 @ =gCurrentMove\n\ - ldrh r0, [r0]\n\ - cmp r0, 0xAE\n\ - beq _08025F84\n\ - mov r3, r10\n\ - cmp r3, 0x1\n\ - beq _08025F84\n\ - movs r0, 0\n\ - bl JumpIfMoveAffectedByProtect\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _08025F84\n\ - ldr r1, _08025F7C @ =gBattlescriptCurrInstr\n\ - ldr r0, _08025F80 @ =BattleScript_ButItFailed\n\ - str r0, [r1]\n\ -_08025F74:\n\ - movs r0, 0x1\n\ - b _080262A4\n\ - .align 2, 0\n\ -_08025F78: .4byte gCurrentMove\n\ -_08025F7C: .4byte gBattlescriptCurrInstr\n\ -_08025F80: .4byte BattleScript_ButItFailed\n\ -_08025F84:\n\ - ldr r2, _08025FCC @ =gBattleMons\n\ - ldr r1, _08025FD0 @ =gActiveBank\n\ - ldrb r3, [r1]\n\ - movs r4, 0x58\n\ - adds r0, r3, 0\n\ - muls r0, r4\n\ - adds r0, r2\n\ - adds r0, 0x20\n\ - ldrb r0, [r0]\n\ - mov r10, r2\n\ - cmp r0, 0x1D\n\ - beq _08025FA0\n\ - cmp r0, 0x49\n\ - bne _08026040\n\ -_08025FA0:\n\ - mov r0, r9\n\ - cmp r0, 0\n\ - bne _08026040\n\ - ldr r0, _08025FD4 @ =gCurrentMove\n\ - ldrh r0, [r0]\n\ - cmp r0, 0xAE\n\ - beq _08026040\n\ - cmp r5, 0x1\n\ - bne _08025F74\n\ - ldr r4, _08025FD8 @ =gSpecialStatuses\n\ - lsls r0, r3, 2\n\ - adds r0, r3\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - ldrb r0, [r0]\n\ - lsls r0, 31\n\ - cmp r0, 0\n\ - beq _08025FE0\n\ - ldr r0, _08025FDC @ =gBattlescriptCurrInstr\n\ - mov r1, r8\n\ - str r1, [r0]\n\ - b _08025F74\n\ - .align 2, 0\n\ -_08025FCC: .4byte gBattleMons\n\ -_08025FD0: .4byte gActiveBank\n\ -_08025FD4: .4byte gCurrentMove\n\ -_08025FD8: .4byte gSpecialStatuses\n\ -_08025FDC: .4byte gBattlescriptCurrInstr\n\ -_08025FE0:\n\ - mov r0, r8\n\ - bl BattleScriptPush\n\ - ldr r0, _08026028 @ =gSharedMem\n\ - ldr r2, _0802602C @ =gActiveBank\n\ - ldrb r1, [r2]\n\ - ldr r3, _08026030 @ =0x00016003\n\ - adds r0, r3\n\ - strb r1, [r0]\n\ - ldr r1, _08026034 @ =gBattlescriptCurrInstr\n\ - ldr r0, _08026038 @ =BattleScript_AbilityNoStatLoss\n\ - str r0, [r1]\n\ - ldr r1, _0802603C @ =gLastUsedAbility\n\ - ldrb r0, [r2]\n\ - movs r6, 0x58\n\ - muls r0, r6\n\ - add r0, r10\n\ - adds r0, 0x20\n\ - ldrb r0, [r0]\n\ - strb r0, [r1]\n\ - ldrb r0, [r2]\n\ - ldrb r1, [r1]\n\ - bl RecordAbilityBattle\n\ - ldr r0, _0802602C @ =gActiveBank\n\ - ldrb r1, [r0]\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsls r0, 2\n\ - adds r0, r4\n\ - ldrb r1, [r0]\n\ - movs r2, 0x1\n\ - orrs r1, r2\n\ - strb r1, [r0]\n\ - b _08025F74\n\ - .align 2, 0\n\ -_08026028: .4byte gSharedMem\n\ -_0802602C: .4byte gActiveBank\n\ -_08026030: .4byte 0x00016003\n\ -_08026034: .4byte gBattlescriptCurrInstr\n\ -_08026038: .4byte BattleScript_AbilityNoStatLoss\n\ -_0802603C: .4byte gLastUsedAbility\n\ -_08026040:\n\ - ldr r1, _08026090 @ =gActiveBank\n\ - ldrb r0, [r1]\n\ - movs r4, 0x58\n\ - muls r0, r4\n\ - add r0, r10\n\ - adds r0, 0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x33\n\ - bne _080260A8\n\ - mov r2, r9\n\ - cmp r2, 0\n\ - bne _080260A8\n\ - cmp r7, 0x6\n\ - bne _080260A8\n\ - cmp r5, 0x1\n\ - bne _08025F74\n\ - mov r0, r8\n\ - bl BattleScriptPush\n\ - ldr r0, _08026094 @ =gSharedMem\n\ - ldr r3, _08026090 @ =gActiveBank\n\ - ldrb r1, [r3]\n\ - ldr r6, _08026098 @ =0x00016003\n\ - adds r0, r6\n\ - strb r1, [r0]\n\ - ldr r1, _0802609C @ =gBattlescriptCurrInstr\n\ - ldr r0, _080260A0 @ =BattleScript_AbilityNoSpecificStatLoss\n\ - str r0, [r1]\n\ - ldr r1, _080260A4 @ =gLastUsedAbility\n\ - ldrb r0, [r3]\n\ - muls r0, r4\n\ - add r0, r10\n\ - adds r0, 0x20\n\ - ldrb r0, [r0]\n\ - strb r0, [r1]\n\ - ldrb r0, [r3]\n\ - ldrb r1, [r1]\n\ - bl RecordAbilityBattle\n\ - b _08025F74\n\ - .align 2, 0\n\ -_08026090: .4byte gActiveBank\n\ -_08026094: .4byte gSharedMem\n\ -_08026098: .4byte 0x00016003\n\ -_0802609C: .4byte gBattlescriptCurrInstr\n\ -_080260A0: .4byte BattleScript_AbilityNoSpecificStatLoss\n\ -_080260A4: .4byte gLastUsedAbility\n\ -_080260A8:\n\ - ldr r1, _080260FC @ =gActiveBank\n\ - ldrb r0, [r1]\n\ - movs r4, 0x58\n\ - muls r0, r4\n\ - add r0, r10\n\ - adds r0, 0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x34\n\ - bne _08026114\n\ - mov r2, r9\n\ - cmp r2, 0\n\ - bne _08026114\n\ - cmp r7, 0x1\n\ - bne _08026114\n\ - cmp r5, 0x1\n\ - beq _080260CA\n\ - b _08025F74\n\ -_080260CA:\n\ - mov r0, r8\n\ - bl BattleScriptPush\n\ - ldr r0, _08026100 @ =gSharedMem\n\ - ldr r3, _080260FC @ =gActiveBank\n\ - ldrb r1, [r3]\n\ - ldr r6, _08026104 @ =0x00016003\n\ - adds r0, r6\n\ - strb r1, [r0]\n\ - ldr r1, _08026108 @ =gBattlescriptCurrInstr\n\ - ldr r0, _0802610C @ =BattleScript_AbilityNoSpecificStatLoss\n\ - str r0, [r1]\n\ - ldr r1, _08026110 @ =gLastUsedAbility\n\ - ldrb r0, [r3]\n\ - muls r0, r4\n\ - add r0, r10\n\ - adds r0, 0x20\n\ - ldrb r0, [r0]\n\ - strb r0, [r1]\n\ - ldrb r0, [r3]\n\ - ldrb r1, [r1]\n\ - bl RecordAbilityBattle\n\ - b _08025F74\n\ - .align 2, 0\n\ -_080260FC: .4byte gActiveBank\n\ -_08026100: .4byte gSharedMem\n\ -_08026104: .4byte 0x00016003\n\ -_08026108: .4byte gBattlescriptCurrInstr\n\ -_0802610C: .4byte BattleScript_AbilityNoSpecificStatLoss\n\ -_08026110: .4byte gLastUsedAbility\n\ -_08026114:\n\ - ldr r0, _080261A0 @ =gActiveBank\n\ - ldrb r1, [r0]\n\ - movs r0, 0x58\n\ - muls r0, r1\n\ - add r0, r10\n\ - adds r0, 0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, 0x13\n\ - bne _0802612C\n\ - cmp r5, 0\n\ - bne _0802612C\n\ - b _08025F74\n\ -_0802612C:\n\ - lsls r0, r6, 24\n\ - asrs r0, 28\n\ - movs r1, 0x7\n\ - ands r0, r1\n\ - negs r0, r0\n\ - lsls r0, 24\n\ - ldr r3, _080261A4 @ =gBattleTextBuff2\n\ - movs r4, 0\n\ - movs r1, 0xFD\n\ - strb r1, [r3]\n\ - movs r2, 0x1\n\ - lsrs r6, r0, 24\n\ - asrs r0, 24\n\ - subs r1, 0xFF\n\ - cmp r0, r1\n\ - bne _08026156\n\ - strb r4, [r3, 0x1]\n\ - movs r0, 0xD3\n\ - strb r0, [r3, 0x2]\n\ - strb r4, [r3, 0x3]\n\ - movs r2, 0x4\n\ -_08026156:\n\ - adds r0, r2, r3\n\ - strb r4, [r0]\n\ - adds r2, 0x1\n\ - adds r1, r2, r3\n\ - movs r0, 0xD4\n\ - strb r0, [r1]\n\ - adds r2, 0x1\n\ - adds r0, r2, r3\n\ - strb r4, [r0]\n\ - adds r2, 0x1\n\ - adds r1, r2, r3\n\ - movs r0, 0xFF\n\ - strb r0, [r1]\n\ - ldr r1, _080261A0 @ =gActiveBank\n\ - ldrb r2, [r1]\n\ - movs r0, 0x58\n\ - muls r0, r2\n\ - adds r0, r7, r0\n\ - mov r1, r10\n\ - adds r1, 0x18\n\ - adds r0, r1\n\ - ldrb r0, [r0]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - cmp r0, 0\n\ - beq _08026206\n\ - movs r1, 0\n\ - ldr r0, _080261A8 @ =gBankTarget\n\ - ldrb r0, [r0]\n\ - ldr r3, _080261AC @ =gBattleCommunication\n\ - mov r8, r3\n\ - cmp r0, r2\n\ - bne _0802619A\n\ - movs r1, 0x1\n\ -_0802619A:\n\ - mov r4, r8\n\ - strb r1, [r4, 0x5]\n\ - b _08026234\n\ - .align 2, 0\n\ -_080261A0: .4byte gActiveBank\n\ -_080261A4: .4byte gBattleTextBuff2\n\ -_080261A8: .4byte gBankTarget\n\ -_080261AC: .4byte gBattleCommunication\n\ -_080261B0:\n\ - asrs r6, r0, 28\n\ - movs r0, 0x7\n\ - ands r6, r0\n\ - ldr r3, _08026210 @ =gBattleTextBuff2\n\ - strb r2, [r3]\n\ - movs r2, 0x1\n\ - cmp r6, 0x2\n\ - bne _080261CA\n\ - strb r4, [r3, 0x1]\n\ - movs r0, 0xD1\n\ - strb r0, [r3, 0x2]\n\ - strb r4, [r3, 0x3]\n\ - movs r2, 0x4\n\ -_080261CA:\n\ - adds r0, r2, r3\n\ - strb r4, [r0]\n\ - adds r2, 0x1\n\ - adds r1, r2, r3\n\ - movs r0, 0xD2\n\ - strb r0, [r1]\n\ - adds r2, 0x1\n\ - adds r0, r2, r3\n\ - strb r4, [r0]\n\ - adds r2, 0x1\n\ - adds r1, r2, r3\n\ - ldrb r0, [r1]\n\ - mov r2, r12\n\ - orrs r0, r2\n\ - strb r0, [r1]\n\ - ldr r2, _08026214 @ =gBattleMons\n\ - ldr r4, _08026218 @ =gActiveBank\n\ - ldrb r3, [r4]\n\ - movs r0, 0x58\n\ - muls r0, r3\n\ - adds r0, r7, r0\n\ - adds r1, r2, 0\n\ - adds r1, 0x18\n\ - adds r0, r1\n\ - ldrb r0, [r0]\n\ - lsls r0, 24\n\ - asrs r0, 24\n\ - mov r10, r2\n\ - cmp r0, 0xC\n\ - bne _08026220\n\ -_08026206:\n\ - ldr r1, _0802621C @ =gBattleCommunication\n\ - movs r0, 0x2\n\ - strb r0, [r1, 0x5]\n\ - mov r8, r1\n\ - b _08026234\n\ - .align 2, 0\n\ -_08026210: .4byte gBattleTextBuff2\n\ -_08026214: .4byte gBattleMons\n\ -_08026218: .4byte gActiveBank\n\ -_0802621C: .4byte gBattleCommunication\n\ -_08026220:\n\ - movs r1, 0\n\ - ldr r0, _080262B4 @ =gBankTarget\n\ - ldrb r0, [r0]\n\ - ldr r2, _080262B8 @ =gBattleCommunication\n\ - mov r8, r2\n\ - cmp r0, r3\n\ - bne _08026230\n\ - movs r1, 0x1\n\ -_08026230:\n\ - mov r3, r8\n\ - strb r1, [r3, 0x5]\n\ -_08026234:\n\ - ldr r2, _080262BC @ =gActiveBank\n\ - ldrb r0, [r2]\n\ - movs r4, 0x58\n\ - adds r1, r0, 0\n\ - muls r1, r4\n\ - adds r1, r7, r1\n\ - mov r3, r10\n\ - adds r3, 0x18\n\ - adds r1, r3\n\ - lsls r0, r6, 24\n\ - asrs r0, 24\n\ - ldrb r6, [r1]\n\ - adds r0, r6\n\ - strb r0, [r1]\n\ - ldrb r0, [r2]\n\ - muls r0, r4\n\ - adds r0, r7, r0\n\ - adds r1, r0, r3\n\ - movs r0, 0\n\ - ldrsb r0, [r1, r0]\n\ - cmp r0, 0\n\ - bge _08026264\n\ - movs r0, 0\n\ - strb r0, [r1]\n\ -_08026264:\n\ - ldr r1, _080262BC @ =gActiveBank\n\ - ldrb r0, [r1]\n\ - muls r0, r4\n\ - adds r0, r7, r0\n\ - adds r1, r0, r3\n\ - movs r0, 0\n\ - ldrsb r0, [r1, r0]\n\ - cmp r0, 0xC\n\ - ble _0802627A\n\ - movs r0, 0xC\n\ - strb r0, [r1]\n\ -_0802627A:\n\ - mov r2, r8\n\ - ldrb r0, [r2, 0x5]\n\ - cmp r0, 0x2\n\ - bne _080262A2\n\ - movs r3, 0x1\n\ - ands r3, r5\n\ - cmp r3, 0\n\ - beq _08026294\n\ - ldr r0, _080262C0 @ =gBattleMoveFlags\n\ - ldrb r1, [r0]\n\ - movs r2, 0x1\n\ - orrs r1, r2\n\ - strb r1, [r0]\n\ -_08026294:\n\ - mov r4, r8\n\ - ldrb r0, [r4, 0x5]\n\ - cmp r0, 0x2\n\ - bne _080262A2\n\ - cmp r3, 0\n\ - bne _080262A2\n\ - b _08025F74\n\ -_080262A2:\n\ - movs r0, 0\n\ -_080262A4:\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r1}\n\ - bx r1\n\ - .align 2, 0\n\ -_080262B4: .4byte gBankTarget\n\ -_080262B8: .4byte gBattleCommunication\n\ -_080262BC: .4byte gActiveBank\n\ -_080262C0: .4byte gBattleMoveFlags\n\ - .syntax divided"); + if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_CHANGE_BS_PTR)) + return STAT_CHANGE_DIDNT_WORK; + + return STAT_CHANGE_WORKED; } -#endif // NONMATCHING static void atk89_statbuffchange(void) { -- cgit v1.2.3 From c4bae7a571f5aea6785e108089e904f9dad67701 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Jan 2018 22:45:08 -0500 Subject: sub_809C04C --- asm/pokemon_storage_system.s | 472 --------------------------------- include/pokemon_storage_system.h | 2 +- src/pokemon/pokemon_storage_system_4.c | 163 +++++++++++- 3 files changed, 161 insertions(+), 476 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 854190e40..eb4a9650e 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,478 +5,6 @@ .text - thumb_func_start sub_809C04C -sub_809C04C: @ 809C04C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r7, r0, 0 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0 - str r0, [sp] - ldr r0, _0809C0FC @ =gPokemonStorageSystemPtr - ldr r6, [r0] - ldr r2, _0809C100 @ =0x000011f2 - adds r2, r6 - mov r8, r2 - mov r0, sp - ldrh r0, [r0] - strh r0, [r2] - cmp r1, 0 - bne _0809C120 - adds r0, r7, 0 - movs r1, 0x41 - bl GetMonData - ldr r2, _0809C104 @ =0x000011f0 - adds r1, r6, r2 - strh r0, [r1] - lsls r0, 16 - cmp r0, 0 - bne _0809C08C - b _0809C1EC -_0809C08C: - adds r0, r7, 0 - movs r1, 0x2D - bl GetMonData - ldr r2, _0809C108 @ =0x000011f9 - adds r1, r6, r2 - strb r0, [r1] - ldr r0, _0809C10C @ =0x000011fa - adds r4, r6, r0 - adds r0, r7, 0 - movs r1, 0x2 - adds r2, r4, 0 - bl GetMonData - adds r0, r4, 0 - bl StringGetEnd10 - adds r0, r7, 0 - movs r1, 0x38 - bl GetMonData - ldr r2, _0809C110 @ =0x000011f8 - adds r1, r6, r2 - strb r0, [r1] - adds r0, r7, 0 - movs r1, 0x8 - bl GetMonData - ldr r2, _0809C114 @ =0x000011f7 - adds r1, r6, r2 - strb r0, [r1] - adds r0, r7, 0 - movs r1, 0 - bl GetMonData - ldr r2, _0809C118 @ =0x000011ec - adds r1, r6, r2 - str r0, [r1] - adds r0, r7, 0 - bl GetMonSpritePal - ldr r2, _0809C11C @ =0x000011e8 - adds r1, r6, r2 - str r0, [r1] - adds r0, r7, 0 - bl GetMonGender - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - adds r0, r7, 0 - movs r1, 0xC - bl GetMonData - b _0809C1B2 - .align 2, 0 -_0809C0FC: .4byte gPokemonStorageSystemPtr -_0809C100: .4byte 0x000011f2 -_0809C104: .4byte 0x000011f0 -_0809C108: .4byte 0x000011f9 -_0809C10C: .4byte 0x000011fa -_0809C110: .4byte 0x000011f8 -_0809C114: .4byte 0x000011f7 -_0809C118: .4byte 0x000011ec -_0809C11C: .4byte 0x000011e8 -_0809C120: - cmp r1, 0x1 - bne _0809C1D4 - adds r0, r7, 0 - movs r1, 0x41 - bl GetBoxMonData - ldr r2, _0809C1B8 @ =0x000011f0 - adds r5, r6, r2 - strh r0, [r5] - lsls r0, 16 - cmp r0, 0 - beq _0809C1EC - adds r0, r7, 0 - movs r1, 0x1 - bl GetBoxMonData - mov r9, r0 - adds r0, r7, 0 - movs r1, 0x2D - bl GetBoxMonData - ldr r2, _0809C1BC @ =0x000011f9 - adds r1, r6, r2 - strb r0, [r1] - ldr r0, _0809C1C0 @ =0x000011fa - adds r4, r6, r0 - adds r0, r7, 0 - movs r1, 0x2 - adds r2, r4, 0 - bl GetBoxMonData - adds r0, r4, 0 - bl StringGetEnd10 - adds r0, r7, 0 - bl GetLevelFromBoxMonExp - ldr r2, _0809C1C4 @ =0x000011f8 - adds r1, r6, r2 - strb r0, [r1] - adds r0, r7, 0 - movs r1, 0x8 - bl GetBoxMonData - ldr r2, _0809C1C8 @ =0x000011f7 - adds r1, r6, r2 - strb r0, [r1] - adds r0, r7, 0 - movs r1, 0 - bl GetBoxMonData - adds r2, r0, 0 - ldr r0, _0809C1CC @ =0x000011ec - adds r4, r6, r0 - str r2, [r4] - ldrh r0, [r5] - mov r1, r9 - bl GetMonSpritePalFromOtIdPersonality - ldr r2, _0809C1D0 @ =0x000011e8 - adds r1, r6, r2 - str r0, [r1] - ldrh r0, [r5] - ldr r1, [r4] - bl GetGenderFromSpeciesAndPersonality - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - adds r0, r7, 0 - movs r1, 0xC - bl GetBoxMonData -_0809C1B2: - mov r1, r8 - strh r0, [r1] - b _0809C1DE - .align 2, 0 -_0809C1B8: .4byte 0x000011f0 -_0809C1BC: .4byte 0x000011f9 -_0809C1C0: .4byte 0x000011fa -_0809C1C4: .4byte 0x000011f8 -_0809C1C8: .4byte 0x000011f7 -_0809C1CC: .4byte 0x000011ec -_0809C1D0: .4byte 0x000011e8 -_0809C1D4: - ldr r2, _0809C220 @ =0x000011f0 - adds r0, r6, r2 - mov r1, sp - ldrh r1, [r1] - strh r1, [r0] -_0809C1DE: - ldr r0, _0809C224 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r2, _0809C220 @ =0x000011f0 - adds r0, r4, r2 - ldrh r1, [r0] - cmp r1, 0 - bne _0809C23C -_0809C1EC: - ldr r0, _0809C224 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r0, _0809C228 @ =0x000011fa - adds r2, r1, r0 - movs r0, 0xFF - strb r0, [r2] - ldr r0, _0809C22C @ =0x0000120f - adds r2, r1, r0 - movs r0, 0x1 - negs r0, r0 - strb r0, [r2] - ldr r0, _0809C230 @ =0x00001234 - adds r2, r1, r0 - movs r0, 0x1 - negs r0, r0 - strb r0, [r2] - ldr r0, _0809C234 @ =0x00001259 - adds r2, r1, r0 - movs r0, 0x1 - negs r0, r0 - strb r0, [r2] - ldr r2, _0809C238 @ =0x0000127a - adds r1, r2 - strb r0, [r1] - b _0809C43E - .align 2, 0 -_0809C220: .4byte 0x000011f0 -_0809C224: .4byte gPokemonStorageSystemPtr -_0809C228: .4byte 0x000011fa -_0809C22C: .4byte 0x0000120f -_0809C230: .4byte 0x00001234 -_0809C234: .4byte 0x00001259 -_0809C238: .4byte 0x0000127a -_0809C23C: - ldr r2, _0809C28C @ =0x000011f9 - adds r0, r4, r2 - ldrb r0, [r0] - cmp r0, 0 - beq _0809C2A4 - ldr r0, _0809C290 @ =0x0000120f - adds r7, r4, r0 - movs r0, 0xFC - strb r0, [r7] - movs r0, 0x4 - strb r0, [r7, 0x1] - movs r0, 0xF - strb r0, [r7, 0x2] - movs r0, 0 - strb r0, [r7, 0x3] - movs r0, 0x1 - strb r0, [r7, 0x4] - ldr r1, _0809C294 @ =0x00001214 - adds r7, r4, r1 - adds r2, 0x1 - adds r1, r4, r2 - adds r0, r7, 0 - bl StringCopy - ldr r0, _0809C298 @ =0x00001234 - adds r1, r4, r0 - movs r0, 0xFF - strb r0, [r1] - ldr r2, _0809C29C @ =0x00001259 - adds r1, r4, r2 - movs r0, 0x1 - negs r0, r0 - strb r0, [r1] - ldr r0, _0809C2A0 @ =0x0000127a - adds r1, r4, r0 - movs r0, 0x1 - negs r0, r0 - strb r0, [r1] - b _0809C43E - .align 2, 0 -_0809C28C: .4byte 0x000011f9 -_0809C290: .4byte 0x0000120f -_0809C294: .4byte 0x00001214 -_0809C298: .4byte 0x00001234 -_0809C29C: .4byte 0x00001259 -_0809C2A0: .4byte 0x0000127a -_0809C2A4: - cmp r1, 0x20 - beq _0809C2AC - cmp r1, 0x1D - bne _0809C2B0 -_0809C2AC: - movs r1, 0xFF - str r1, [sp] -_0809C2B0: - ldr r0, _0809C388 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r2, _0809C38C @ =0x0000120f - adds r7, r4, r2 - movs r0, 0xFC - mov r9, r0 - strb r0, [r7] - movs r1, 0x4 - mov r8, r1 - strb r1, [r7, 0x1] - movs r2, 0xF - strb r2, [r7, 0x2] - movs r0, 0 - strb r0, [r7, 0x3] - movs r6, 0x1 - strb r6, [r7, 0x4] - ldr r1, _0809C390 @ =0x00001214 - adds r7, r4, r1 - ldr r2, _0809C394 @ =0x000011fa - adds r1, r4, r2 - adds r0, r7, 0 - bl StringCopy - ldr r0, _0809C398 @ =0x00001234 - adds r7, r4, r0 - mov r1, r9 - strb r1, [r7] - mov r2, r8 - strb r2, [r7, 0x1] - movs r0, 0xF - strb r0, [r7, 0x2] - movs r1, 0 - strb r1, [r7, 0x3] - strb r6, [r7, 0x4] - mov r2, r9 - strb r2, [r7, 0x5] - movs r0, 0x13 - mov r10, r0 - strb r0, [r7, 0x6] - movs r1, 0x7 - strb r1, [r7, 0x7] - movs r0, 0xBA - strb r0, [r7, 0x8] - ldr r2, _0809C39C @ =0x0000123d - adds r7, r4, r2 - ldr r1, _0809C3A0 @ =0x000011f0 - adds r0, r4, r1 - ldrh r1, [r0] - movs r0, 0xB - muls r1, r0 - ldr r0, _0809C3A4 @ =gSpeciesNames - adds r1, r0 - adds r0, r7, 0 - bl StringCopy - adds r7, r0, 0 - mov r2, r9 - strb r2, [r7] - mov r0, r10 - strb r0, [r7, 0x1] - movs r0, 0x50 - strb r0, [r7, 0x2] - movs r0, 0xFF - strb r0, [r7, 0x3] - ldr r1, _0809C3A8 @ =0x00001259 - adds r7, r4, r1 - strb r2, [r7] - mov r2, r8 - strb r2, [r7, 0x1] - movs r0, 0xF - strb r0, [r7, 0x2] - movs r1, 0 - strb r1, [r7, 0x3] - strb r6, [r7, 0x4] - mov r2, r9 - strb r2, [r7, 0x5] - mov r0, r10 - strb r0, [r7, 0x6] - movs r6, 0x8 - strb r6, [r7, 0x7] - ldr r1, _0809C3AC @ =0x00001261 - adds r7, r4, r1 - movs r0, 0x34 - strb r0, [r7] - ldr r2, _0809C3B0 @ =0x00001262 - adds r7, r4, r2 - ldr r0, _0809C3B4 @ =0x000011f8 - adds r4, r0 - ldrb r1, [r4] - adds r0, r7, 0 - movs r2, 0x22 - movs r3, 0x1 - bl sub_8072C14 - adds r7, r0, 0 - mov r1, r9 - strb r1, [r7] - movs r0, 0x11 - strb r0, [r7, 0x1] - strb r6, [r7, 0x2] - adds r7, 0x3 - ldr r2, [sp] - cmp r2, 0 - beq _0809C3B8 - cmp r2, 0xFE - beq _0809C3D0 - b _0809C3EA - .align 2, 0 -_0809C388: .4byte gPokemonStorageSystemPtr -_0809C38C: .4byte 0x0000120f -_0809C390: .4byte 0x00001214 -_0809C394: .4byte 0x000011fa -_0809C398: .4byte 0x00001234 -_0809C39C: .4byte 0x0000123d -_0809C3A0: .4byte 0x000011f0 -_0809C3A4: .4byte gSpeciesNames -_0809C3A8: .4byte 0x00001259 -_0809C3AC: .4byte 0x00001261 -_0809C3B0: .4byte 0x00001262 -_0809C3B4: .4byte 0x000011f8 -_0809C3B8: - mov r0, r9 - strb r0, [r7] - mov r1, r8 - strb r1, [r7, 0x1] - strb r1, [r7, 0x2] - mov r2, sp - ldrb r2, [r2] - strb r2, [r7, 0x3] - movs r0, 0x5 - strb r0, [r7, 0x4] - movs r0, 0xB5 - b _0809C3E6 -_0809C3D0: - mov r0, r9 - strb r0, [r7] - mov r1, r8 - strb r1, [r7, 0x1] - movs r0, 0x6 - strb r0, [r7, 0x2] - movs r2, 0 - strb r2, [r7, 0x3] - movs r0, 0x7 - strb r0, [r7, 0x4] - movs r0, 0xB6 -_0809C3E6: - strb r0, [r7, 0x5] - adds r7, 0x6 -_0809C3EA: - movs r5, 0xFF - strb r5, [r7] - ldr r0, _0809C450 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r1, _0809C454 @ =0x0000127a - adds r7, r2, r1 - ldr r0, _0809C458 @ =0x000011f2 - adds r3, r2, r0 - ldrh r0, [r3] - cmp r0, 0 - beq _0809C43C - movs r4, 0xFC - strb r4, [r7] - movs r1, 0x4 - strb r1, [r7, 0x1] - movs r0, 0xF - strb r0, [r7, 0x2] - movs r0, 0 - strb r0, [r7, 0x3] - movs r0, 0x1 - strb r0, [r7, 0x4] - ldr r0, _0809C45C @ =0x0000127f - adds r7, r2, r0 - strb r4, [r7] - movs r0, 0x6 - strb r0, [r7, 0x1] - strb r1, [r7, 0x2] - ldr r1, _0809C460 @ =0x00001282 - adds r7, r2, r1 - ldrh r0, [r3] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r7, 0 - bl StringCopy - adds r7, r0, 0 - strb r4, [r7] - movs r0, 0x7 - strb r0, [r7, 0x1] - adds r7, 0x2 -_0809C43C: - strb r5, [r7] -_0809C43E: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809C450: .4byte gPokemonStorageSystemPtr -_0809C454: .4byte 0x0000127a -_0809C458: .4byte 0x000011f2 -_0809C45C: .4byte 0x0000127f -_0809C460: .4byte 0x00001282 - thumb_func_end sub_809C04C - thumb_func_start sub_809C464 sub_809C464: @ 809C464 push {r4-r7,lr} diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 8dd51259c..5319b7a2d 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -159,7 +159,7 @@ struct PokemonStorageSystemData { u8 unk_11e2; u8 unk_11e3; u8 filler_11e4[4]; - u8 *unk_11e8; + const u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; u16 unk_11f2; diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index ada4b43bd..eb5a6cb0b 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -2,12 +2,14 @@ // Includes #include "global.h" #include "ewram.h" +#include "data2.h" #include "constants/moves.h" #include "constants/species.h" #include "palette.h" #include "string_util.h" #include "text.h" #include "menu.h" +#include "item.h" #include "pokemon_summary_screen.h" #include "pokemon_storage_system.h" @@ -64,7 +66,7 @@ void diegohint1(u8 a0, u8 a1); bool8 sub_809BF2C(void); void sub_809BF74(void); void sub_809C028(void); -void sub_809C04C(struct BoxPokemon *pokemon, u8 a1); +void sub_809C04C(void *pokemon, u8 a1); void sub_809CC04(void); // .rodata @@ -1602,7 +1604,7 @@ void diegohint1(u8 a0, u8 a1) ExpandBoxMon(gPokemonStorage.boxes[a0] + a1, &gPokemonStorageSystemPtr->unk_2618); diegohint2(a0, a1); gPokemonStorageSystemPtr->unk_25b4 = gPokemonStorageSystemPtr->unk_2618; - sub_809C04C(&gPokemonStorageSystemPtr->unk_25b4.box, 0); + sub_809C04C(&gPokemonStorageSystemPtr->unk_25b4, 0); gUnknown_020384E7 = a0; gUnknown_020384E8 = a1; } @@ -1922,7 +1924,7 @@ void sub_809BF74(void) case 1: if (gUnknown_020384E5 < PARTY_SIZE) { - sub_809C04C(&gPlayerParty[gUnknown_020384E5].box, 0); + sub_809C04C(gPlayerParty + gUnknown_020384E5, 0); break; } // fallthrough @@ -1944,3 +1946,158 @@ void sub_809C028(void) else sub_809BF74(); } + +void sub_809C04C(void *pokemon, u8 a1) +{ + u8 *buf; + u16 gender = MON_MALE; + gPokemonStorageSystemPtr->unk_11f2 = 0; + if (a1 == 0) + { + struct Pokemon *pkmn = (struct Pokemon *)pokemon; + gPokemonStorageSystemPtr->unk_11f0 = GetMonData(pokemon, MON_DATA_SPECIES2); + if (gPokemonStorageSystemPtr->unk_11f0 != SPECIES_NONE) + { + gPokemonStorageSystemPtr->unk_11f9 = GetMonData(pkmn, MON_DATA_IS_EGG); + GetMonData(pkmn, MON_DATA_NICKNAME, gPokemonStorageSystemPtr->unk_11fa); + StringGetEnd10(gPokemonStorageSystemPtr->unk_11fa); + gPokemonStorageSystemPtr->unk_11f8 = GetMonData(pkmn, MON_DATA_LEVEL); + gPokemonStorageSystemPtr->unk_11f7 = GetMonData(pkmn, MON_DATA_MARKINGS); + gPokemonStorageSystemPtr->unk_11ec = GetMonData(pkmn, MON_DATA_PERSONALITY); + gPokemonStorageSystemPtr->unk_11e8 = GetMonSpritePal(pkmn); + gender = GetMonGender(pkmn); + gPokemonStorageSystemPtr->unk_11f2 = GetMonData(pkmn, MON_DATA_HELD_ITEM); + } + } + else if (a1 == 1) + { + struct BoxPokemon *boxmon = (struct BoxPokemon *)pokemon; + gPokemonStorageSystemPtr->unk_11f0 = GetBoxMonData(pokemon, MON_DATA_SPECIES2); + if (gPokemonStorageSystemPtr->unk_11f0 != SPECIES_NONE) + { + u32 otId = GetBoxMonData(boxmon, MON_DATA_OT_ID); + gPokemonStorageSystemPtr->unk_11f9 = GetBoxMonData(boxmon, MON_DATA_IS_EGG); + GetBoxMonData(boxmon, MON_DATA_NICKNAME, gPokemonStorageSystemPtr->unk_11fa); + StringGetEnd10(gPokemonStorageSystemPtr->unk_11fa); + gPokemonStorageSystemPtr->unk_11f8 = GetLevelFromBoxMonExp(boxmon); + gPokemonStorageSystemPtr->unk_11f7 = GetBoxMonData(boxmon, MON_DATA_MARKINGS); + gPokemonStorageSystemPtr->unk_11ec = GetBoxMonData(boxmon, MON_DATA_PERSONALITY); + gPokemonStorageSystemPtr->unk_11e8 = GetMonSpritePalFromOtIdPersonality(gPokemonStorageSystemPtr->unk_11f0, otId, gPokemonStorageSystemPtr->unk_11ec); + gender = GetGenderFromSpeciesAndPersonality(gPokemonStorageSystemPtr->unk_11f0, gPokemonStorageSystemPtr->unk_11ec); + gPokemonStorageSystemPtr->unk_11f2 = GetBoxMonData(boxmon, MON_DATA_HELD_ITEM); + } + } + else + { + gPokemonStorageSystemPtr->unk_11f0 = SPECIES_NONE; + } + if (gPokemonStorageSystemPtr->unk_11f0 == SPECIES_NONE) + { + gPokemonStorageSystemPtr->unk_11fa[0] = EOS; + gPokemonStorageSystemPtr->unk_120f[0] = EOS; + gPokemonStorageSystemPtr->unk_1234[0] = EOS; + gPokemonStorageSystemPtr->unk_1259[0] = EOS; + gPokemonStorageSystemPtr->unk_127a[0] = EOS; + } + else if (gPokemonStorageSystemPtr->unk_11f9) + { + buf = gPokemonStorageSystemPtr->unk_120f; + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x04; // COLOR_HIGHLIGHT_SHADOW + buf[2] = 0x0F; // WHITE2 + buf[3] = 0x00; // TRANSPARENT + buf[4] = 0x01; // DARK_GREY + buf = gPokemonStorageSystemPtr->unk_120f + 5; + buf = StringCopy(buf, gPokemonStorageSystemPtr->unk_11fa); + gPokemonStorageSystemPtr->unk_1234[0] = EOS; + gPokemonStorageSystemPtr->unk_1259[0] = EOS; + gPokemonStorageSystemPtr->unk_127a[0] = EOS; + } + else + { + if (gPokemonStorageSystemPtr->unk_11f0 == SPECIES_NIDORAN_M || gPokemonStorageSystemPtr->unk_11f0 == SPECIES_NIDORAN_F) + gender = MON_GENDERLESS; + buf = gPokemonStorageSystemPtr->unk_120f; + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x04; // COLOR_HIGHLIGHT_SHADOW + buf[2] = 0x0F; // WHITE2 + buf[3] = 0x00; // TRANSPARENT + buf[4] = 0x01; // DARK_GREY + buf = gPokemonStorageSystemPtr->unk_120f + 5; + buf = StringCopy(buf, gPokemonStorageSystemPtr->unk_11fa); + buf = gPokemonStorageSystemPtr->unk_1234; + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x04; // COLOR_HIGHLIGHT_SHADOW + buf[2] = 0x0F; // WHITE2 + buf[3] = 0x00; // TRANSPARENT + buf[4] = 0x01; // DARK_GREY + buf[5] = EXT_CTRL_CODE_BEGIN; + buf[6] = 0x13; // CLEAR_TO + buf[7] = 7; + buf[8] = CHAR_SLASH; + buf = gPokemonStorageSystemPtr->unk_1234 + 9; + buf = StringCopy(buf, gSpeciesNames[gPokemonStorageSystemPtr->unk_11f0]); + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x13; // CLEAR_TO + buf[2] = 0x50; + buf[3] = EOS; + buf = gPokemonStorageSystemPtr->unk_1259; + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x04; // COLOR_HIGHLIGHT_SHADOW + buf[2] = 0x0F; // WHITE2 + buf[3] = 0x00; // TRANSPARENT + buf[4] = 0x01; // DARK_GREY + buf[5] = EXT_CTRL_CODE_BEGIN; + buf[6] = 0x13; // CLEAR_TO + buf[7] = 8; + buf = gPokemonStorageSystemPtr->unk_1259 + 8; + buf[0] = 0x34; // LV + buf = gPokemonStorageSystemPtr->unk_1259 + 9; + buf = sub_8072C14(buf, gPokemonStorageSystemPtr->unk_11f8, 0x22, STR_CONV_MODE_RIGHT_ALIGN); + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x11; // CLEAR + buf[2] = 8; + buf += 3; + switch (gender) + { + case MON_MALE: + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x04; // COLOR_HIGHLIGHT_SHADOW + buf[2] = 0x04; // BLUE + buf[3] = 0x00; // TRANSPARENT + buf[4] = 0x05; // YELLOW + buf[5] = CHAR_MALE; + buf += 6; + break; + case MON_FEMALE: + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x04; // COLOR_HIGHLIGHT_SHADOW + buf[2] = 0x06; // CYAN + buf[3] = 0x00; // TRANSPARENT + buf[4] = 0x07; // MAGENTA + buf[5] = CHAR_FEMALE; + buf += 6; + break; + } + buf[0] = EOS; + buf = gPokemonStorageSystemPtr->unk_127a; + if (gPokemonStorageSystemPtr->unk_11f2) + { + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x04; // COLOR_HIGHLIGHT_SHADOW + buf[2] = 0x0F; // WHITE2 + buf[3] = 0x00; // TRANSPARENT + buf[4] = 0x01; // DARK_GREY + buf = gPokemonStorageSystemPtr->unk_127a + 5; + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x06; // size + buf[2] = 0x04; + buf = gPokemonStorageSystemPtr->unk_127a + 8; + buf = StringCopy(buf, ItemId_GetItem(gPokemonStorageSystemPtr->unk_11f2)->name); + buf[0] = EXT_CTRL_CODE_BEGIN; + buf[1] = 0x07; // UNKNOWN_7; + buf += 2; + } + buf[0] = EOS; + } +} -- cgit v1.2.3 From 7860ce8dbe3d4abca3a8d3fb336705e3d09b32e0 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 16 Jan 2018 14:00:52 -0500 Subject: split data2a and make shop.c stuff static --- data/btl_attrs.s | 337 ++++++++++++++++ data/data2a.s | 1032 ------------------------------------------------ data/mon_attrs.s | 704 +++++++++++++++++++++++++++++++++ include/decoration.h | 1 - include/shop.h | 19 +- ld_script.txt | 3 +- src/field/decoration.c | 1 + src/field/scrcmd.c | 6 +- src/field/shop.c | 137 ++++--- 9 files changed, 1125 insertions(+), 1115 deletions(-) create mode 100644 data/btl_attrs.s delete mode 100644 data/data2a.s create mode 100644 data/mon_attrs.s diff --git a/data/btl_attrs.s b/data/btl_attrs.s new file mode 100644 index 000000000..1bd5ed6e5 --- /dev/null +++ b/data/btl_attrs.s @@ -0,0 +1,337 @@ +@ the second big chunk of data + +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +@ 81ECAD8 + .include "data/graphics/trainers/back_pic_coords.inc" + +@ 81ECAE4 + .include "data/graphics/trainers/back_pic_table.inc" + +@ 81ECAFC + .include "data/graphics/trainers/back_pic_palette_table.inc" + +@ 81ECB14 + .include "data/enemy_mon_elevation.inc" + +@ 81ECCB0 + .include "data/trainer_parties.inc" + +@ 81F0208 + .include "data/text/trainer_class_names.inc" + +@ 81F04FC + .include "data/trainers.inc" + +@ 81F716C + .include "data/text/species_names.inc" + +@ 81F8320 + .include "data/text/move_names.inc" + + .align 2 +@ 81F9528 + .4byte 0x101 @ unknown data + + .align 2 +gOamData_81F952C:: @ 81F952C + .2byte 0x0300 + .2byte 0xC000 + .2byte 0x0000 + + .align 2 +gOamData_81F9534:: @ 81F9534 + .2byte 0x0300 + .2byte 0xC000 + .2byte 0x0040 + + .align 2 +gSpriteAffineAnim_81F953C:: @ 81F953C + obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81F954C:: @ 81F954C + obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 + obj_rot_scal_anim_frame 0x18, 0x18, 0, -128 + obj_rot_scal_anim_frame 0x18, 0x18, 0, -128 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_81F956C:: @ 81F956C + .4byte gSpriteAffineAnim_81F953C + .4byte gSpriteAffineAnim_81F954C + + .align 2 +gSpriteTemplate_81F9574:: @ 81F9574 + spr_template 10000, 10000, gOamData_81F952C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36 + + .align 2 +gSpriteTemplate_81F958C:: @ 81F958C + spr_template 10000, 10000, gOamData_81F9534, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36 + + .align 2 +gUnknown_081F95A4:: @ 81F95A4 + obj_tiles gUnknown_08E5DC2C, 4096, 0x2710 + + .align 2 +gBattleTerrainTable:: @ 81F95AC + @ tall_grass + .4byte gBattleTerrainTiles_TallGrass + .4byte gBattleTerrainTilemap_TallGrass + .4byte gBattleTerrainAnimTiles_TallGrass + .4byte gBattleTerrainAnimTilemap_TallGrass + .4byte gBattleTerrainPalette_TallGrass + + @ long_grass + .4byte gBattleTerrainTiles_LongGrass + .4byte gBattleTerrainTilemap_LongGrass + .4byte gBattleTerrainAnimTiles_LongGrass + .4byte gBattleTerrainAnimTilemap_LongGrass + .4byte gBattleTerrainPalette_LongGrass + + @ sand + .4byte gBattleTerrainTiles_Sand + .4byte gBattleTerrainTilemap_Sand + .4byte gBattleTerrainAnimTiles_Sand + .4byte gBattleTerrainAnimTilemap_Sand + .4byte gBattleTerrainPalette_Sand + + @ underwater + .4byte gBattleTerrainTiles_Underwater + .4byte gBattleTerrainTilemap_Underwater + .4byte gBattleTerrainAnimTiles_Underwater + .4byte gBattleTerrainAnimTilemap_Underwater + .4byte gBattleTerrainPalette_Underwater + + @ water + .4byte gBattleTerrainTiles_Water + .4byte gBattleTerrainTilemap_Water + .4byte gBattleTerrainAnimTiles_Water + .4byte gBattleTerrainAnimTilemap_Water + .4byte gBattleTerrainPalette_Water + + @ pond_water + .4byte gBattleTerrainTiles_PondWater + .4byte gBattleTerrainTilemap_PondWater + .4byte gBattleTerrainAnimTiles_PondWater + .4byte gBattleTerrainAnimTilemap_PondWater + .4byte gBattleTerrainPalette_PondWater + + @ rock + .4byte gBattleTerrainTiles_Rock + .4byte gBattleTerrainTilemap_Rock + .4byte gBattleTerrainAnimTiles_Rock + .4byte gBattleTerrainAnimTilemap_Rock + .4byte gBattleTerrainPalette_Rock + + @ cave + .4byte gBattleTerrainTiles_Cave + .4byte gBattleTerrainTilemap_Cave + .4byte gBattleTerrainAnimTiles_Cave + .4byte gBattleTerrainAnimTilemap_Cave + .4byte gBattleTerrainPalette_Cave + + @ building + .4byte gBattleTerrainTiles_Building + .4byte gBattleTerrainTilemap_Building + .4byte gBattleTerrainAnimTiles_Building + .4byte gBattleTerrainAnimTilemap_Building + .4byte gBattleTerrainPalette_Building + + @ plain + .4byte gBattleTerrainTiles_Building + .4byte gBattleTerrainTilemap_Building + .4byte gBattleTerrainAnimTiles_Building + .4byte gBattleTerrainAnimTilemap_Building + .4byte gBattleTerrainPalette_Plain + + .align 2 +gUnknown_081F9674:: @ 81F9674 + .4byte REG_BG3HOFS + .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 + .4byte 1 + + .align 2 +gUnknown_081F9680:: @ 81F9680 + .4byte gUnknown_030041D0 + .2byte 0x20 + .byte 0x13 + .byte 0x10 + .4byte BG_VRAM + 0xE104 + + .4byte gUnknown_03004250 + .2byte 0x40 + .byte 0x13 + .byte 0x10 + .4byte BG_VRAM + 0xF104 + + .4byte gUnknown_030041D0 + .2byte 0x60 + .byte 0x13 + .byte 0x30 + .4byte BG_VRAM + 0xE204 + + .4byte gUnknown_03004250 + .2byte 0x80 + .byte 0x13 + .byte 0x30 + .4byte BG_VRAM + 0xF204 + + .4byte gUnknown_030041D0 + .2byte 0x20 + .byte 0x13 + .byte 0x18 + .4byte BG_VRAM + 0xE1C4 + + .4byte gUnknown_03004250 + .2byte 0x40 + .byte 0x13 + .byte 0x18 + .4byte BG_VRAM + 0xF1C4 + +gUnknown_081F96C8:: @ 81F96C8 + .string "ヌケニン$" @ "Nukenin" (Shedinja) + + .align 2 +gSpriteTemplate_81F96D0:: @ 81F96D0 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828 + + .align 2 +gOamData_81F96E8:: @ 81F96E8 + .2byte 0x0100 + .2byte 0xC000 + .2byte 0x0800 + + .align 2 +gOamData_81F96F0:: @ 81F96F0 + .2byte 0x0100 + .2byte 0xC000 + .2byte 0x2800 + + .align 2 +gSpriteAnim_81F96F8:: @ 81F96F8 + obj_image_anim_frame 0, 5 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_81F9700:: @ 81F9700 + .4byte gSpriteAnim_81F96F8 + + .align 2 +gSpriteAffineAnim_81F9704:: @ 81F9704 + obj_rot_scal_anim_frame 0xFFF0, 0x0, 0, 4 + obj_rot_scal_anim_frame 0x0, 0x0, 0, 60 + obj_rot_scal_anim_jump 1 + + .align 2 +gSpriteAffineAnimTable_81F971C:: @ 81F971C + .4byte gSpriteAffineAnim_81F9704 + +@ 81F9720 + .include "data/type_effectiveness.inc" + +@ 81F9870 + .include "data/text/type_names.inc" + +@ 81F98F0 + .include "data/trainer_money.inc" + +@ 81F99CC + .include "data/text/ability_descriptions.inc" + +@ 81FA248 + .include "data/text/ability_names.inc" + + .align 2 +gUnknown_081FA640:: @ 81FA640 + .4byte HandleAction_UseMove + .4byte HandleAction_UseItem + .4byte HandleAction_Switch + .4byte HandleAction_Run + .4byte HandleAction_WatchesCarefully + .4byte HandleAction_SafariZoneBallThrow + .4byte HandleAction_ThrowPokeblock + .4byte HandleAction_GoNear + .4byte HandleAction_SafriZoneRun + .4byte HandleAction_Action9 + .4byte sub_801B594 + .4byte HandleAction_Action11 + .4byte HandleAction_ActionFinished + .4byte HandleAction_NothingIsFainted + + .align 2 +gUnknown_081FA678:: @ 81FA678 + .4byte bc_8013B1C + .4byte HandleEndTurn_BattleWon + .4byte HandleEndTurn_BattleLost + .4byte HandleEndTurn_BattleLost + .4byte HandleEndTurn_RanFromBattle + .4byte HandleEndTurn_FinishBattle + .4byte HandleEndTurn_MonFled + .4byte HandleEndTurn_FinishBattle + .4byte HandleEndTurn_FinishBattle + +gStatusConditionString_PoisonJpn:: @ 81FA69C + .string "どく$$$$$$" + +gStatusConditionString_SleepJpn:: @ 81FA6A4 + .string "ねむり$$$$$" + +gStatusConditionString_ParalysisJpn:: @ 81FA6AC + .string "まひ$$$$$$" + +gStatusConditionString_BurnJpn:: @ 81FA6B4 + .string "やけど$$$$$" + +gStatusConditionString_IceJpn:: @ 81FA6BC + .string "こおり$$$$$" + +gStatusConditionString_ConfusionJpn:: @ 81FA6C4 + .string "こんらん$$$$" + +gStatusConditionString_LoveJpn:: @ 81FA6CC + .string "メロメロ$$$$" + + .align 2 +gUnknown_081FA6D4:: @ 81FA6D4 + .4byte gStatusConditionString_PoisonJpn, BattleText_PoisonStatus + .4byte gStatusConditionString_SleepJpn, BattleText_Sleep + .4byte gStatusConditionString_ParalysisJpn, BattleText_Paralysis + .4byte gStatusConditionString_BurnJpn, BattleText_Burn + .4byte gStatusConditionString_IceJpn, BattleText_IceStatus + .4byte gStatusConditionString_ConfusionJpn, BattleText_Confusion + .4byte gStatusConditionString_LoveJpn, BattleText_Love + +gUnknown_081FA70C:: @ 81FA70C + .byte 0, 0, 0 + .byte 3, 5, 0 + .byte 2, 3, 0 + .byte 1, 2, 0 + .byte 1, 1, 0 + +gUnknown_081FA71B:: @ 81FA71B + .byte 4, 3, 2, 1 + +gUnknown_081FA71F:: @ 81FA71F + .byte 4, 4, 4, 4 + + .align 1 +gSoundMovesTable:: @ 81FA724 + .2byte 0x2D + .2byte 0x2E + .2byte 0x2F + .2byte 0x30 + .2byte 0x67 + .2byte 0xAD + .2byte 0xFD + .2byte 0x13F + .2byte 0x140 + .2byte 0x130 + .2byte 0xFFFF diff --git a/data/data2a.s b/data/data2a.s deleted file mode 100644 index c4d6343d8..000000000 --- a/data/data2a.s +++ /dev/null @@ -1,1032 +0,0 @@ -@ the second big chunk of data - -#include "constants/items.h" -#include "constants/moves.h" -#include "constants/species.h" - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSpriteImageTable_81E7A10:: @ 81E7A10 - obj_frame_tiles gSharedMem + 0x8000, 0x800 - obj_frame_tiles gSharedMem + 0x8800, 0x800 - obj_frame_tiles gSharedMem + 0x9000, 0x800 - obj_frame_tiles gSharedMem + 0x9800, 0x800 - - .align 2 -gSpriteImageTable_81E7A30:: @ 81E7A30 - obj_frame_tiles gSharedMem + 0xA000, 0x800 - obj_frame_tiles gSharedMem + 0xA800, 0x800 - obj_frame_tiles gSharedMem + 0xB000, 0x800 - obj_frame_tiles gSharedMem + 0xB800, 0x800 - - .align 2 -gSpriteImageTable_81E7A50:: @ 81E7A50 - obj_frame_tiles gSharedMem + 0xC000, 0x800 - obj_frame_tiles gSharedMem + 0xC800, 0x800 - obj_frame_tiles gSharedMem + 0xD000, 0x800 - obj_frame_tiles gSharedMem + 0xD800, 0x800 - - .align 2 -gSpriteImageTable_81E7A70:: @ 81E7A70 - obj_frame_tiles gSharedMem + 0xE000, 0x800 - obj_frame_tiles gSharedMem + 0xE800, 0x800 - obj_frame_tiles gSharedMem + 0xF000, 0x800 - obj_frame_tiles gSharedMem + 0xF800, 0x800 - - .align 2 -gSpriteAnim_81E7A90:: @ 81E7A90 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_81E7A98:: @ 81E7A98 - obj_image_anim_frame 3, 0 - obj_image_anim_end - - .align 2 -gSpriteAffineAnim_81E7AA0:: @ 81E7AA0 - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7AB0:: @ 81E7AB0 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7AC0:: @ 81E7AC0 - obj_rot_scal_anim_frame 0x28, 0x28, 0, 0 - obj_rot_scal_anim_frame 0x12, 0x12, 0, 12 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7AD8:: @ 81E7AD8 - obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 18 - obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 15 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7AF0:: @ 81E7AF0 - obj_rot_scal_anim_frame 0xA0, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x4, 0x0, 0, 8 - obj_rot_scal_anim_frame 0xFFFC, 0x0, 0, 8 - obj_rot_scal_anim_jump 1 - - .align 2 -gSpriteAffineAnim_81E7B10:: @ 81E7B10 - obj_rot_scal_anim_frame 0x2, 0x2, 0, 20 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7B20:: @ 81E7B20 - obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 20 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7B30:: @ 81E7B30 - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 9 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7B48:: @ 81E7B48 - obj_rot_scal_anim_frame 0x4, 0x4, 0, 63 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7B58:: @ 81E7B58 - obj_rot_scal_anim_frame 0x0, 0x0, -3, 5 - obj_rot_scal_anim_frame 0x0, 0x0, 3, 5 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_81E7B70:: @ 81E7B70 - .4byte gSpriteAffineAnim_81E7AA0 - .4byte gSpriteAffineAnim_81E7AC0 - .4byte gSpriteAffineAnim_81E7AD8 - .4byte gSpriteAffineAnim_81E7AF0 - .4byte gSpriteAffineAnim_81E7B10 - .4byte gSpriteAffineAnim_81E7B20 - .4byte gSpriteAffineAnim_81E7B48 - .4byte gSpriteAffineAnim_81E7B58 - .4byte gSpriteAffineAnim_81E7B30 - - .align 2 -gSpriteAffineAnim_81E7B94:: @ 81E7B94 - obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 4, 63 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7BA4:: @ 81E7BA4 - obj_rot_scal_anim_frame 0x0, 0x0, 3, 5 - obj_rot_scal_anim_frame 0x0, 0x0, -3, 5 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7BBC:: @ 81E7BBC - obj_rot_scal_anim_frame 0x0, 0x0, -5, 20 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 20 - obj_rot_scal_anim_frame 0x0, 0x0, 5, 20 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81E7BDC:: @ 81E7BDC - obj_rot_scal_anim_frame 0x0, 0x0, 9, 110 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_81E7BEC:: @ 81E7BEC - .4byte gSpriteAffineAnim_81E7AA0 - .4byte gSpriteAffineAnim_81E7AC0 - .4byte gSpriteAffineAnim_81E7AD8 - .4byte gSpriteAffineAnim_81E7AF0 - .4byte gSpriteAffineAnim_81E7B10 - .4byte gSpriteAffineAnim_81E7B20 - .4byte gSpriteAffineAnim_81E7B94 - .4byte gSpriteAffineAnim_81E7BA4 - .4byte gSpriteAffineAnim_81E7BBC - .4byte gSpriteAffineAnim_81E7B30 - .4byte gSpriteAffineAnim_81E7BDC - - .align 2 -gSpriteAffineAnimTable_81E7C18:: @ 81E7C18 - .4byte gSpriteAffineAnim_81E7AB0 - .4byte gSpriteAffineAnim_81E7AC0 - .4byte gSpriteAffineAnim_81E7AD8 - .4byte gSpriteAffineAnim_81E7AF0 - .4byte gSpriteAffineAnim_81E7B10 - .4byte gSpriteAffineAnim_81E7B20 - .4byte gSpriteAffineAnim_81E7B94 - .4byte gSpriteAffineAnim_81E7BA4 - .4byte gSpriteAffineAnim_81E7BBC - .4byte gSpriteAffineAnim_81E7B30 - .4byte gSpriteAffineAnim_81E7BDC - - .align 2 -gSpriteAnim_81E7C44:: @ 81E7C44 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_81E7C4C:: @ 81E7C4C - obj_image_anim_frame 1, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_81E7C54:: @ 81E7C54 - obj_image_anim_frame 2, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_81E7C5C:: @ 81E7C5C - obj_image_anim_frame 3, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_81E7C64:: @ 81E7C64 - .4byte gSpriteAnim_81E7C44 - .4byte gSpriteAnim_81E7C4C - .4byte gSpriteAnim_81E7C54 - .4byte gSpriteAnim_81E7C5C - -@ 81E7C74 - .include "data/graphics/pokemon/front_pic_coords.inc" - -@ 81E8354 - .include "data/graphics/pokemon/front_pic_table.inc" - -@ 81E9114 - .include "data/graphics/pokemon/back_pic_coords.inc" - -@ 81E97F4 - .include "data/graphics/pokemon/back_pic_table.inc" - -@ 81EA5B4 - .include "data/graphics/pokemon/palette_table.inc" - -@ 81EB374 - .include "data/graphics/pokemon/shiny_palette_table.inc" - - .align 2 -gSpriteAnim_81EC134:: @ 81EC134 - obj_image_anim_frame 0, 7 - obj_image_anim_end - - .align 2 -gSpriteAnim_81EC13C:: @ 81EC13C - obj_image_anim_frame 0, 2 - obj_image_anim_end - - .align 2 -gSpriteAnim_81EC144:: @ 81EC144 - obj_image_anim_frame 0, 2 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_81EC14C:: @ 81EC14C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC150:: @ 81EC150 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC154:: @ 81EC154 - .4byte gSpriteAnim_81E7A90 - .4byte gSpriteAnim_81EC134 - - .align 2 -gSpriteAnimTable_81EC15C:: @ 81EC15C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC160:: @ 81EC160 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC164:: @ 81EC164 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC168:: @ 81EC168 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC16C:: @ 81EC16C - .4byte gSpriteAnim_81E7A90 - .4byte gSpriteAnim_81EC13C - - .align 2 -gSpriteAnimTable_81EC174:: @ 81EC174 - .4byte gSpriteAnim_81E7A90 - .4byte gSpriteAnim_81EC144 - - .align 2 -gSpriteAnimTable_81EC17C:: @ 81EC17C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC180:: @ 81EC180 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC184:: @ 81EC184 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC188:: @ 81EC188 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC18C:: @ 81EC18C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC190:: @ 81EC190 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC194:: @ 81EC194 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC198:: @ 81EC198 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC19C:: @ 81EC19C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1A0:: @ 81EC1A0 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1A4:: @ 81EC1A4 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1A8:: @ 81EC1A8 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1AC:: @ 81EC1AC - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1B0:: @ 81EC1B0 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1B4:: @ 81EC1B4 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1B8:: @ 81EC1B8 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1BC:: @ 81EC1BC - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1C0:: @ 81EC1C0 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1C4:: @ 81EC1C4 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1C8:: @ 81EC1C8 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1CC:: @ 81EC1CC - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1D0:: @ 81EC1D0 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1D4:: @ 81EC1D4 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1D8:: @ 81EC1D8 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1DC:: @ 81EC1DC - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1E0:: @ 81EC1E0 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1E4:: @ 81EC1E4 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1E8:: @ 81EC1E8 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1EC:: @ 81EC1EC - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1F0:: @ 81EC1F0 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1F4:: @ 81EC1F4 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1F8:: @ 81EC1F8 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC1FC:: @ 81EC1FC - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC200:: @ 81EC200 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC204:: @ 81EC204 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC208:: @ 81EC208 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC20C:: @ 81EC20C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC210:: @ 81EC210 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC214:: @ 81EC214 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC218:: @ 81EC218 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC21C:: @ 81EC21C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC220:: @ 81EC220 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC224:: @ 81EC224 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC228:: @ 81EC228 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC22C:: @ 81EC22C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC230:: @ 81EC230 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC234:: @ 81EC234 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC238:: @ 81EC238 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC23C:: @ 81EC23C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC240:: @ 81EC240 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC244:: @ 81EC244 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC248:: @ 81EC248 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC24C:: @ 81EC24C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC250:: @ 81EC250 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC254:: @ 81EC254 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC258:: @ 81EC258 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC25C:: @ 81EC25C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC260:: @ 81EC260 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC264:: @ 81EC264 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC268:: @ 81EC268 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC26C:: @ 81EC26C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC270:: @ 81EC270 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC274:: @ 81EC274 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC278:: @ 81EC278 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC27C:: @ 81EC27C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC280:: @ 81EC280 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC284:: @ 81EC284 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC288:: @ 81EC288 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC28C:: @ 81EC28C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC290:: @ 81EC290 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC294:: @ 81EC294 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC298:: @ 81EC298 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC29C:: @ 81EC29C - .4byte gSpriteAnim_81E7A90 - - .align 2 -gSpriteAnimTable_81EC2A0:: @ 81EC2A0 - .4byte gSpriteAnim_81E7A90 - - .align 2 -gUnknown_081EC2A4:: @ 81EC2A4 - .4byte gSpriteAnimTable_81EC14C - .4byte gSpriteAnimTable_81EC150 - .4byte gSpriteAnimTable_81EC154 - .4byte gSpriteAnimTable_81EC15C - .4byte gSpriteAnimTable_81EC160 - .4byte gSpriteAnimTable_81EC164 - .4byte gSpriteAnimTable_81EC168 - .4byte gSpriteAnimTable_81EC16C - .4byte gSpriteAnimTable_81EC174 - .4byte gSpriteAnimTable_81EC17C - .4byte gSpriteAnimTable_81EC180 - .4byte gSpriteAnimTable_81EC184 - .4byte gSpriteAnimTable_81EC188 - .4byte gSpriteAnimTable_81EC18C - .4byte gSpriteAnimTable_81EC190 - .4byte gSpriteAnimTable_81EC194 - .4byte gSpriteAnimTable_81EC198 - .4byte gSpriteAnimTable_81EC19C - .4byte gSpriteAnimTable_81EC1A0 - .4byte gSpriteAnimTable_81EC1A4 - .4byte gSpriteAnimTable_81EC1A8 - .4byte gSpriteAnimTable_81EC1AC - .4byte gSpriteAnimTable_81EC1B0 - .4byte gSpriteAnimTable_81EC1B4 - .4byte gSpriteAnimTable_81EC1B8 - .4byte gSpriteAnimTable_81EC1BC - .4byte gSpriteAnimTable_81EC1C0 - .4byte gSpriteAnimTable_81EC1C4 - .4byte gSpriteAnimTable_81EC1C8 - .4byte gSpriteAnimTable_81EC1CC - .4byte gSpriteAnimTable_81EC1D0 - .4byte gSpriteAnimTable_81EC1D4 - .4byte gSpriteAnimTable_81EC1D8 - .4byte gSpriteAnimTable_81EC1DC - .4byte gSpriteAnimTable_81EC1E0 - .4byte gSpriteAnimTable_81EC1E4 - .4byte gSpriteAnimTable_81EC1E8 - .4byte gSpriteAnimTable_81EC1EC - .4byte gSpriteAnimTable_81EC1F0 - .4byte gSpriteAnimTable_81EC1F4 - .4byte gSpriteAnimTable_81EC1F8 - .4byte gSpriteAnimTable_81EC1FC - .4byte gSpriteAnimTable_81EC200 - .4byte gSpriteAnimTable_81EC204 - .4byte gSpriteAnimTable_81EC208 - .4byte gSpriteAnimTable_81EC20C - .4byte gSpriteAnimTable_81EC210 - .4byte gSpriteAnimTable_81EC214 - .4byte gSpriteAnimTable_81EC218 - .4byte gSpriteAnimTable_81EC21C - .4byte gSpriteAnimTable_81EC220 - .4byte gSpriteAnimTable_81EC224 - .4byte gSpriteAnimTable_81EC228 - .4byte gSpriteAnimTable_81EC22C - .4byte gSpriteAnimTable_81EC230 - .4byte gSpriteAnimTable_81EC234 - .4byte gSpriteAnimTable_81EC238 - .4byte gSpriteAnimTable_81EC23C - .4byte gSpriteAnimTable_81EC240 - .4byte gSpriteAnimTable_81EC244 - .4byte gSpriteAnimTable_81EC248 - .4byte gSpriteAnimTable_81EC24C - .4byte gSpriteAnimTable_81EC250 - .4byte gSpriteAnimTable_81EC254 - .4byte gSpriteAnimTable_81EC258 - .4byte gSpriteAnimTable_81EC25C - .4byte gSpriteAnimTable_81EC260 - .4byte gSpriteAnimTable_81EC264 - .4byte gSpriteAnimTable_81EC268 - .4byte gSpriteAnimTable_81EC26C - .4byte gSpriteAnimTable_81EC270 - .4byte gSpriteAnimTable_81EC274 - .4byte gSpriteAnimTable_81EC278 - .4byte gSpriteAnimTable_81EC27C - .4byte gSpriteAnimTable_81EC280 - .4byte gSpriteAnimTable_81EC284 - .4byte gSpriteAnimTable_81EC288 - .4byte gSpriteAnimTable_81EC28C - .4byte gSpriteAnimTable_81EC290 - .4byte gSpriteAnimTable_81EC294 - .4byte gSpriteAnimTable_81EC298 - .4byte gSpriteAnimTable_81EC29C - .4byte gSpriteAnimTable_81EC2A0 - -@ 81EC3F0 - .include "data/graphics/trainers/front_pic_coords.inc" - -@ 81EC53C - .include "data/graphics/trainers/front_pic_table.inc" - -@ 81EC7D4 - .include "data/graphics/trainers/front_pic_palette_table.inc" - - .align 2 -gSpriteAnim_81ECA6C:: @ 81ECA6C - obj_image_anim_frame 0, 24 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 24 - obj_image_anim_frame 0, 9 - obj_image_anim_frame 3, 50 - obj_image_anim_end - - .align 2 -gSpriteAnim_81ECA84:: @ 81ECA84 - obj_image_anim_frame 0, 24 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 24 - obj_image_anim_frame 0, 9 - obj_image_anim_frame 3, 50 - obj_image_anim_end - - .align 2 -gSpriteAnim_81ECA9C:: @ 81ECA9C - obj_image_anim_frame 0, 24 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 24 - obj_image_anim_frame 0, 9 - obj_image_anim_frame 3, 50 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_81ECAB4:: @ 81ECAB4 - .4byte gSpriteAnim_81E7A98 - .4byte gSpriteAnim_81ECA6C - - .align 2 -gSpriteAnimTable_81ECABC:: @ 81ECABC - .4byte gSpriteAnim_81E7A98 - .4byte gSpriteAnim_81ECA84 - - .align 2 -gSpriteAnimTable_81ECAC4:: @ 81ECAC4 - .4byte gSpriteAnim_81E7A98 - .4byte gSpriteAnim_81ECA9C - - .align 2 -gUnknown_081ECACC:: @ 81ECACC - .4byte gSpriteAnimTable_81ECAB4 - .4byte gSpriteAnimTable_81ECABC - .4byte gSpriteAnimTable_81ECAC4 - -@ 81ECAD8 - .include "data/graphics/trainers/back_pic_coords.inc" - -@ 81ECAE4 - .include "data/graphics/trainers/back_pic_table.inc" - -@ 81ECAFC - .include "data/graphics/trainers/back_pic_palette_table.inc" - -@ 81ECB14 - .include "data/enemy_mon_elevation.inc" - -@ 81ECCB0 - .include "data/trainer_parties.inc" - -@ 81F0208 - .include "data/text/trainer_class_names.inc" - -@ 81F04FC - .include "data/trainers.inc" - -@ 81F716C - .include "data/text/species_names.inc" - -@ 81F8320 - .include "data/text/move_names.inc" - - .align 2 -@ 81F9528 - .4byte 0x101 @ unknown data - - .align 2 -gOamData_81F952C:: @ 81F952C - .2byte 0x0300 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_81F9534:: @ 81F9534 - .2byte 0x0300 - .2byte 0xC000 - .2byte 0x0040 - - .align 2 -gSpriteAffineAnim_81F953C:: @ 81F953C - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_81F954C:: @ 81F954C - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_frame 0x18, 0x18, 0, -128 - obj_rot_scal_anim_frame 0x18, 0x18, 0, -128 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_81F956C:: @ 81F956C - .4byte gSpriteAffineAnim_81F953C - .4byte gSpriteAffineAnim_81F954C - - .align 2 -gSpriteTemplate_81F9574:: @ 81F9574 - spr_template 10000, 10000, gOamData_81F952C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36 - - .align 2 -gSpriteTemplate_81F958C:: @ 81F958C - spr_template 10000, 10000, gOamData_81F9534, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36 - - .align 2 -gUnknown_081F95A4:: @ 81F95A4 - obj_tiles gUnknown_08E5DC2C, 4096, 0x2710 - - .align 2 -gBattleTerrainTable:: @ 81F95AC - @ tall_grass - .4byte gBattleTerrainTiles_TallGrass - .4byte gBattleTerrainTilemap_TallGrass - .4byte gBattleTerrainAnimTiles_TallGrass - .4byte gBattleTerrainAnimTilemap_TallGrass - .4byte gBattleTerrainPalette_TallGrass - - @ long_grass - .4byte gBattleTerrainTiles_LongGrass - .4byte gBattleTerrainTilemap_LongGrass - .4byte gBattleTerrainAnimTiles_LongGrass - .4byte gBattleTerrainAnimTilemap_LongGrass - .4byte gBattleTerrainPalette_LongGrass - - @ sand - .4byte gBattleTerrainTiles_Sand - .4byte gBattleTerrainTilemap_Sand - .4byte gBattleTerrainAnimTiles_Sand - .4byte gBattleTerrainAnimTilemap_Sand - .4byte gBattleTerrainPalette_Sand - - @ underwater - .4byte gBattleTerrainTiles_Underwater - .4byte gBattleTerrainTilemap_Underwater - .4byte gBattleTerrainAnimTiles_Underwater - .4byte gBattleTerrainAnimTilemap_Underwater - .4byte gBattleTerrainPalette_Underwater - - @ water - .4byte gBattleTerrainTiles_Water - .4byte gBattleTerrainTilemap_Water - .4byte gBattleTerrainAnimTiles_Water - .4byte gBattleTerrainAnimTilemap_Water - .4byte gBattleTerrainPalette_Water - - @ pond_water - .4byte gBattleTerrainTiles_PondWater - .4byte gBattleTerrainTilemap_PondWater - .4byte gBattleTerrainAnimTiles_PondWater - .4byte gBattleTerrainAnimTilemap_PondWater - .4byte gBattleTerrainPalette_PondWater - - @ rock - .4byte gBattleTerrainTiles_Rock - .4byte gBattleTerrainTilemap_Rock - .4byte gBattleTerrainAnimTiles_Rock - .4byte gBattleTerrainAnimTilemap_Rock - .4byte gBattleTerrainPalette_Rock - - @ cave - .4byte gBattleTerrainTiles_Cave - .4byte gBattleTerrainTilemap_Cave - .4byte gBattleTerrainAnimTiles_Cave - .4byte gBattleTerrainAnimTilemap_Cave - .4byte gBattleTerrainPalette_Cave - - @ building - .4byte gBattleTerrainTiles_Building - .4byte gBattleTerrainTilemap_Building - .4byte gBattleTerrainAnimTiles_Building - .4byte gBattleTerrainAnimTilemap_Building - .4byte gBattleTerrainPalette_Building - - @ plain - .4byte gBattleTerrainTiles_Building - .4byte gBattleTerrainTilemap_Building - .4byte gBattleTerrainAnimTiles_Building - .4byte gBattleTerrainAnimTilemap_Building - .4byte gBattleTerrainPalette_Plain - - .align 2 -gUnknown_081F9674:: @ 81F9674 - .4byte REG_BG3HOFS - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - - .align 2 -gUnknown_081F9680:: @ 81F9680 - .4byte gUnknown_030041D0 - .2byte 0x20 - .byte 0x13 - .byte 0x10 - .4byte BG_VRAM + 0xE104 - - .4byte gUnknown_03004250 - .2byte 0x40 - .byte 0x13 - .byte 0x10 - .4byte BG_VRAM + 0xF104 - - .4byte gUnknown_030041D0 - .2byte 0x60 - .byte 0x13 - .byte 0x30 - .4byte BG_VRAM + 0xE204 - - .4byte gUnknown_03004250 - .2byte 0x80 - .byte 0x13 - .byte 0x30 - .4byte BG_VRAM + 0xF204 - - .4byte gUnknown_030041D0 - .2byte 0x20 - .byte 0x13 - .byte 0x18 - .4byte BG_VRAM + 0xE1C4 - - .4byte gUnknown_03004250 - .2byte 0x40 - .byte 0x13 - .byte 0x18 - .4byte BG_VRAM + 0xF1C4 - -gUnknown_081F96C8:: @ 81F96C8 - .string "ヌケニン$" @ "Nukenin" (Shedinja) - - .align 2 -gSpriteTemplate_81F96D0:: @ 81F96D0 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828 - - .align 2 -gOamData_81F96E8:: @ 81F96E8 - .2byte 0x0100 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_81F96F0:: @ 81F96F0 - .2byte 0x0100 - .2byte 0xC000 - .2byte 0x2800 - - .align 2 -gSpriteAnim_81F96F8:: @ 81F96F8 - obj_image_anim_frame 0, 5 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_81F9700:: @ 81F9700 - .4byte gSpriteAnim_81F96F8 - - .align 2 -gSpriteAffineAnim_81F9704:: @ 81F9704 - obj_rot_scal_anim_frame 0xFFF0, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 60 - obj_rot_scal_anim_jump 1 - - .align 2 -gSpriteAffineAnimTable_81F971C:: @ 81F971C - .4byte gSpriteAffineAnim_81F9704 - -@ 81F9720 - .include "data/type_effectiveness.inc" - -@ 81F9870 - .include "data/text/type_names.inc" - -@ 81F98F0 - .include "data/trainer_money.inc" - -@ 81F99CC - .include "data/text/ability_descriptions.inc" - -@ 81FA248 - .include "data/text/ability_names.inc" - - .align 2 -gUnknown_081FA640:: @ 81FA640 - .4byte HandleAction_UseMove - .4byte HandleAction_UseItem - .4byte HandleAction_Switch - .4byte HandleAction_Run - .4byte HandleAction_WatchesCarefully - .4byte HandleAction_SafariZoneBallThrow - .4byte HandleAction_ThrowPokeblock - .4byte HandleAction_GoNear - .4byte HandleAction_SafriZoneRun - .4byte HandleAction_Action9 - .4byte sub_801B594 - .4byte HandleAction_Action11 - .4byte HandleAction_ActionFinished - .4byte HandleAction_NothingIsFainted - - .align 2 -gUnknown_081FA678:: @ 81FA678 - .4byte bc_8013B1C - .4byte HandleEndTurn_BattleWon - .4byte HandleEndTurn_BattleLost - .4byte HandleEndTurn_BattleLost - .4byte HandleEndTurn_RanFromBattle - .4byte HandleEndTurn_FinishBattle - .4byte HandleEndTurn_MonFled - .4byte HandleEndTurn_FinishBattle - .4byte HandleEndTurn_FinishBattle - -gStatusConditionString_PoisonJpn:: @ 81FA69C - .string "どく$$$$$$" - -gStatusConditionString_SleepJpn:: @ 81FA6A4 - .string "ねむり$$$$$" - -gStatusConditionString_ParalysisJpn:: @ 81FA6AC - .string "まひ$$$$$$" - -gStatusConditionString_BurnJpn:: @ 81FA6B4 - .string "やけど$$$$$" - -gStatusConditionString_IceJpn:: @ 81FA6BC - .string "こおり$$$$$" - -gStatusConditionString_ConfusionJpn:: @ 81FA6C4 - .string "こんらん$$$$" - -gStatusConditionString_LoveJpn:: @ 81FA6CC - .string "メロメロ$$$$" - - .align 2 -gUnknown_081FA6D4:: @ 81FA6D4 - .4byte gStatusConditionString_PoisonJpn, BattleText_PoisonStatus - .4byte gStatusConditionString_SleepJpn, BattleText_Sleep - .4byte gStatusConditionString_ParalysisJpn, BattleText_Paralysis - .4byte gStatusConditionString_BurnJpn, BattleText_Burn - .4byte gStatusConditionString_IceJpn, BattleText_IceStatus - .4byte gStatusConditionString_ConfusionJpn, BattleText_Confusion - .4byte gStatusConditionString_LoveJpn, BattleText_Love - -gUnknown_081FA70C:: @ 81FA70C - .byte 0, 0, 0 - .byte 3, 5, 0 - .byte 2, 3, 0 - .byte 1, 2, 0 - .byte 1, 1, 0 - -gUnknown_081FA71B:: @ 81FA71B - .byte 4, 3, 2, 1 - -gUnknown_081FA71F:: @ 81FA71F - .byte 4, 4, 4, 4 - - .align 1 -gSoundMovesTable:: @ 81FA724 - .2byte 0x2D - .2byte 0x2E - .2byte 0x2F - .2byte 0x30 - .2byte 0x67 - .2byte 0xAD - .2byte 0xFD - .2byte 0x13F - .2byte 0x140 - .2byte 0x130 - .2byte 0xFFFF diff --git a/data/mon_attrs.s b/data/mon_attrs.s new file mode 100644 index 000000000..ea47c8de6 --- /dev/null +++ b/data/mon_attrs.s @@ -0,0 +1,704 @@ +@ the second big chunk of data + +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteImageTable_81E7A10:: @ 81E7A10 + obj_frame_tiles gSharedMem + 0x8000, 0x800 + obj_frame_tiles gSharedMem + 0x8800, 0x800 + obj_frame_tiles gSharedMem + 0x9000, 0x800 + obj_frame_tiles gSharedMem + 0x9800, 0x800 + + .align 2 +gSpriteImageTable_81E7A30:: @ 81E7A30 + obj_frame_tiles gSharedMem + 0xA000, 0x800 + obj_frame_tiles gSharedMem + 0xA800, 0x800 + obj_frame_tiles gSharedMem + 0xB000, 0x800 + obj_frame_tiles gSharedMem + 0xB800, 0x800 + + .align 2 +gSpriteImageTable_81E7A50:: @ 81E7A50 + obj_frame_tiles gSharedMem + 0xC000, 0x800 + obj_frame_tiles gSharedMem + 0xC800, 0x800 + obj_frame_tiles gSharedMem + 0xD000, 0x800 + obj_frame_tiles gSharedMem + 0xD800, 0x800 + + .align 2 +gSpriteImageTable_81E7A70:: @ 81E7A70 + obj_frame_tiles gSharedMem + 0xE000, 0x800 + obj_frame_tiles gSharedMem + 0xE800, 0x800 + obj_frame_tiles gSharedMem + 0xF000, 0x800 + obj_frame_tiles gSharedMem + 0xF800, 0x800 + + .align 2 +gSpriteAnim_81E7A90:: @ 81E7A90 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_81E7A98:: @ 81E7A98 + obj_image_anim_frame 3, 0 + obj_image_anim_end + + .align 2 +gSpriteAffineAnim_81E7AA0:: @ 81E7AA0 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7AB0:: @ 81E7AB0 + obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7AC0:: @ 81E7AC0 + obj_rot_scal_anim_frame 0x28, 0x28, 0, 0 + obj_rot_scal_anim_frame 0x12, 0x12, 0, 12 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7AD8:: @ 81E7AD8 + obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 18 + obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 15 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7AF0:: @ 81E7AF0 + obj_rot_scal_anim_frame 0xA0, 0x100, 0, 0 + obj_rot_scal_anim_frame 0x4, 0x0, 0, 8 + obj_rot_scal_anim_frame 0xFFFC, 0x0, 0, 8 + obj_rot_scal_anim_jump 1 + + .align 2 +gSpriteAffineAnim_81E7B10:: @ 81E7B10 + obj_rot_scal_anim_frame 0x2, 0x2, 0, 20 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7B20:: @ 81E7B20 + obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 20 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7B30:: @ 81E7B30 + obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 + obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 9 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7B48:: @ 81E7B48 + obj_rot_scal_anim_frame 0x4, 0x4, 0, 63 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7B58:: @ 81E7B58 + obj_rot_scal_anim_frame 0x0, 0x0, -3, 5 + obj_rot_scal_anim_frame 0x0, 0x0, 3, 5 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_81E7B70:: @ 81E7B70 + .4byte gSpriteAffineAnim_81E7AA0 + .4byte gSpriteAffineAnim_81E7AC0 + .4byte gSpriteAffineAnim_81E7AD8 + .4byte gSpriteAffineAnim_81E7AF0 + .4byte gSpriteAffineAnim_81E7B10 + .4byte gSpriteAffineAnim_81E7B20 + .4byte gSpriteAffineAnim_81E7B48 + .4byte gSpriteAffineAnim_81E7B58 + .4byte gSpriteAffineAnim_81E7B30 + + .align 2 +gSpriteAffineAnim_81E7B94:: @ 81E7B94 + obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 4, 63 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7BA4:: @ 81E7BA4 + obj_rot_scal_anim_frame 0x0, 0x0, 3, 5 + obj_rot_scal_anim_frame 0x0, 0x0, -3, 5 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7BBC:: @ 81E7BBC + obj_rot_scal_anim_frame 0x0, 0x0, -5, 20 + obj_rot_scal_anim_frame 0x0, 0x0, 0, 20 + obj_rot_scal_anim_frame 0x0, 0x0, 5, 20 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnim_81E7BDC:: @ 81E7BDC + obj_rot_scal_anim_frame 0x0, 0x0, 9, 110 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_81E7BEC:: @ 81E7BEC + .4byte gSpriteAffineAnim_81E7AA0 + .4byte gSpriteAffineAnim_81E7AC0 + .4byte gSpriteAffineAnim_81E7AD8 + .4byte gSpriteAffineAnim_81E7AF0 + .4byte gSpriteAffineAnim_81E7B10 + .4byte gSpriteAffineAnim_81E7B20 + .4byte gSpriteAffineAnim_81E7B94 + .4byte gSpriteAffineAnim_81E7BA4 + .4byte gSpriteAffineAnim_81E7BBC + .4byte gSpriteAffineAnim_81E7B30 + .4byte gSpriteAffineAnim_81E7BDC + + .align 2 +gSpriteAffineAnimTable_81E7C18:: @ 81E7C18 + .4byte gSpriteAffineAnim_81E7AB0 + .4byte gSpriteAffineAnim_81E7AC0 + .4byte gSpriteAffineAnim_81E7AD8 + .4byte gSpriteAffineAnim_81E7AF0 + .4byte gSpriteAffineAnim_81E7B10 + .4byte gSpriteAffineAnim_81E7B20 + .4byte gSpriteAffineAnim_81E7B94 + .4byte gSpriteAffineAnim_81E7BA4 + .4byte gSpriteAffineAnim_81E7BBC + .4byte gSpriteAffineAnim_81E7B30 + .4byte gSpriteAffineAnim_81E7BDC + + .align 2 +gSpriteAnim_81E7C44:: @ 81E7C44 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_81E7C4C:: @ 81E7C4C + obj_image_anim_frame 1, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_81E7C54:: @ 81E7C54 + obj_image_anim_frame 2, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_81E7C5C:: @ 81E7C5C + obj_image_anim_frame 3, 0 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_81E7C64:: @ 81E7C64 + .4byte gSpriteAnim_81E7C44 + .4byte gSpriteAnim_81E7C4C + .4byte gSpriteAnim_81E7C54 + .4byte gSpriteAnim_81E7C5C + +@ 81E7C74 + .include "data/graphics/pokemon/front_pic_coords.inc" + +@ 81E8354 + .include "data/graphics/pokemon/front_pic_table.inc" + +@ 81E9114 + .include "data/graphics/pokemon/back_pic_coords.inc" + +@ 81E97F4 + .include "data/graphics/pokemon/back_pic_table.inc" + +@ 81EA5B4 + .include "data/graphics/pokemon/palette_table.inc" + +@ 81EB374 + .include "data/graphics/pokemon/shiny_palette_table.inc" + + .align 2 +gSpriteAnim_81EC134:: @ 81EC134 + obj_image_anim_frame 0, 7 + obj_image_anim_end + + .align 2 +gSpriteAnim_81EC13C:: @ 81EC13C + obj_image_anim_frame 0, 2 + obj_image_anim_end + + .align 2 +gSpriteAnim_81EC144:: @ 81EC144 + obj_image_anim_frame 0, 2 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_81EC14C:: @ 81EC14C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC150:: @ 81EC150 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC154:: @ 81EC154 + .4byte gSpriteAnim_81E7A90 + .4byte gSpriteAnim_81EC134 + + .align 2 +gSpriteAnimTable_81EC15C:: @ 81EC15C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC160:: @ 81EC160 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC164:: @ 81EC164 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC168:: @ 81EC168 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC16C:: @ 81EC16C + .4byte gSpriteAnim_81E7A90 + .4byte gSpriteAnim_81EC13C + + .align 2 +gSpriteAnimTable_81EC174:: @ 81EC174 + .4byte gSpriteAnim_81E7A90 + .4byte gSpriteAnim_81EC144 + + .align 2 +gSpriteAnimTable_81EC17C:: @ 81EC17C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC180:: @ 81EC180 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC184:: @ 81EC184 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC188:: @ 81EC188 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC18C:: @ 81EC18C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC190:: @ 81EC190 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC194:: @ 81EC194 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC198:: @ 81EC198 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC19C:: @ 81EC19C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1A0:: @ 81EC1A0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1A4:: @ 81EC1A4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1A8:: @ 81EC1A8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1AC:: @ 81EC1AC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1B0:: @ 81EC1B0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1B4:: @ 81EC1B4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1B8:: @ 81EC1B8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1BC:: @ 81EC1BC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1C0:: @ 81EC1C0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1C4:: @ 81EC1C4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1C8:: @ 81EC1C8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1CC:: @ 81EC1CC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1D0:: @ 81EC1D0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1D4:: @ 81EC1D4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1D8:: @ 81EC1D8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1DC:: @ 81EC1DC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1E0:: @ 81EC1E0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1E4:: @ 81EC1E4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1E8:: @ 81EC1E8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1EC:: @ 81EC1EC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1F0:: @ 81EC1F0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1F4:: @ 81EC1F4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1F8:: @ 81EC1F8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1FC:: @ 81EC1FC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC200:: @ 81EC200 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC204:: @ 81EC204 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC208:: @ 81EC208 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC20C:: @ 81EC20C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC210:: @ 81EC210 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC214:: @ 81EC214 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC218:: @ 81EC218 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC21C:: @ 81EC21C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC220:: @ 81EC220 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC224:: @ 81EC224 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC228:: @ 81EC228 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC22C:: @ 81EC22C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC230:: @ 81EC230 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC234:: @ 81EC234 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC238:: @ 81EC238 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC23C:: @ 81EC23C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC240:: @ 81EC240 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC244:: @ 81EC244 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC248:: @ 81EC248 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC24C:: @ 81EC24C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC250:: @ 81EC250 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC254:: @ 81EC254 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC258:: @ 81EC258 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC25C:: @ 81EC25C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC260:: @ 81EC260 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC264:: @ 81EC264 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC268:: @ 81EC268 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC26C:: @ 81EC26C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC270:: @ 81EC270 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC274:: @ 81EC274 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC278:: @ 81EC278 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC27C:: @ 81EC27C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC280:: @ 81EC280 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC284:: @ 81EC284 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC288:: @ 81EC288 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC28C:: @ 81EC28C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC290:: @ 81EC290 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC294:: @ 81EC294 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC298:: @ 81EC298 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC29C:: @ 81EC29C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC2A0:: @ 81EC2A0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gUnknown_081EC2A4:: @ 81EC2A4 + .4byte gSpriteAnimTable_81EC14C + .4byte gSpriteAnimTable_81EC150 + .4byte gSpriteAnimTable_81EC154 + .4byte gSpriteAnimTable_81EC15C + .4byte gSpriteAnimTable_81EC160 + .4byte gSpriteAnimTable_81EC164 + .4byte gSpriteAnimTable_81EC168 + .4byte gSpriteAnimTable_81EC16C + .4byte gSpriteAnimTable_81EC174 + .4byte gSpriteAnimTable_81EC17C + .4byte gSpriteAnimTable_81EC180 + .4byte gSpriteAnimTable_81EC184 + .4byte gSpriteAnimTable_81EC188 + .4byte gSpriteAnimTable_81EC18C + .4byte gSpriteAnimTable_81EC190 + .4byte gSpriteAnimTable_81EC194 + .4byte gSpriteAnimTable_81EC198 + .4byte gSpriteAnimTable_81EC19C + .4byte gSpriteAnimTable_81EC1A0 + .4byte gSpriteAnimTable_81EC1A4 + .4byte gSpriteAnimTable_81EC1A8 + .4byte gSpriteAnimTable_81EC1AC + .4byte gSpriteAnimTable_81EC1B0 + .4byte gSpriteAnimTable_81EC1B4 + .4byte gSpriteAnimTable_81EC1B8 + .4byte gSpriteAnimTable_81EC1BC + .4byte gSpriteAnimTable_81EC1C0 + .4byte gSpriteAnimTable_81EC1C4 + .4byte gSpriteAnimTable_81EC1C8 + .4byte gSpriteAnimTable_81EC1CC + .4byte gSpriteAnimTable_81EC1D0 + .4byte gSpriteAnimTable_81EC1D4 + .4byte gSpriteAnimTable_81EC1D8 + .4byte gSpriteAnimTable_81EC1DC + .4byte gSpriteAnimTable_81EC1E0 + .4byte gSpriteAnimTable_81EC1E4 + .4byte gSpriteAnimTable_81EC1E8 + .4byte gSpriteAnimTable_81EC1EC + .4byte gSpriteAnimTable_81EC1F0 + .4byte gSpriteAnimTable_81EC1F4 + .4byte gSpriteAnimTable_81EC1F8 + .4byte gSpriteAnimTable_81EC1FC + .4byte gSpriteAnimTable_81EC200 + .4byte gSpriteAnimTable_81EC204 + .4byte gSpriteAnimTable_81EC208 + .4byte gSpriteAnimTable_81EC20C + .4byte gSpriteAnimTable_81EC210 + .4byte gSpriteAnimTable_81EC214 + .4byte gSpriteAnimTable_81EC218 + .4byte gSpriteAnimTable_81EC21C + .4byte gSpriteAnimTable_81EC220 + .4byte gSpriteAnimTable_81EC224 + .4byte gSpriteAnimTable_81EC228 + .4byte gSpriteAnimTable_81EC22C + .4byte gSpriteAnimTable_81EC230 + .4byte gSpriteAnimTable_81EC234 + .4byte gSpriteAnimTable_81EC238 + .4byte gSpriteAnimTable_81EC23C + .4byte gSpriteAnimTable_81EC240 + .4byte gSpriteAnimTable_81EC244 + .4byte gSpriteAnimTable_81EC248 + .4byte gSpriteAnimTable_81EC24C + .4byte gSpriteAnimTable_81EC250 + .4byte gSpriteAnimTable_81EC254 + .4byte gSpriteAnimTable_81EC258 + .4byte gSpriteAnimTable_81EC25C + .4byte gSpriteAnimTable_81EC260 + .4byte gSpriteAnimTable_81EC264 + .4byte gSpriteAnimTable_81EC268 + .4byte gSpriteAnimTable_81EC26C + .4byte gSpriteAnimTable_81EC270 + .4byte gSpriteAnimTable_81EC274 + .4byte gSpriteAnimTable_81EC278 + .4byte gSpriteAnimTable_81EC27C + .4byte gSpriteAnimTable_81EC280 + .4byte gSpriteAnimTable_81EC284 + .4byte gSpriteAnimTable_81EC288 + .4byte gSpriteAnimTable_81EC28C + .4byte gSpriteAnimTable_81EC290 + .4byte gSpriteAnimTable_81EC294 + .4byte gSpriteAnimTable_81EC298 + .4byte gSpriteAnimTable_81EC29C + .4byte gSpriteAnimTable_81EC2A0 + +@ 81EC3F0 + .include "data/graphics/trainers/front_pic_coords.inc" + +@ 81EC53C + .include "data/graphics/trainers/front_pic_table.inc" + +@ 81EC7D4 + .include "data/graphics/trainers/front_pic_palette_table.inc" + + .align 2 +gSpriteAnim_81ECA6C:: @ 81ECA6C + obj_image_anim_frame 0, 24 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 24 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 3, 50 + obj_image_anim_end + + .align 2 +gSpriteAnim_81ECA84:: @ 81ECA84 + obj_image_anim_frame 0, 24 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 24 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 3, 50 + obj_image_anim_end + + .align 2 +gSpriteAnim_81ECA9C:: @ 81ECA9C + obj_image_anim_frame 0, 24 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 24 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 3, 50 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_81ECAB4:: @ 81ECAB4 + .4byte gSpriteAnim_81E7A98 + .4byte gSpriteAnim_81ECA6C + + .align 2 +gSpriteAnimTable_81ECABC:: @ 81ECABC + .4byte gSpriteAnim_81E7A98 + .4byte gSpriteAnim_81ECA84 + + .align 2 +gSpriteAnimTable_81ECAC4:: @ 81ECAC4 + .4byte gSpriteAnim_81E7A98 + .4byte gSpriteAnim_81ECA9C + + .align 2 +gUnknown_081ECACC:: @ 81ECACC + .4byte gSpriteAnimTable_81ECAB4 + .4byte gSpriteAnimTable_81ECABC + .4byte gSpriteAnimTable_81ECAC4 diff --git a/include/decoration.h b/include/decoration.h index 5e73df071..74ca47a3a 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -151,7 +151,6 @@ extern const struct YesNoFuncTable gUnknown_083EC634[]; extern const u8 gUnknown_083EC65A[]; extern const u8 gUnknown_083EC97C[]; extern const u8 gUnknown_083EC984[]; -extern void Shop_RunExitSellMenuTask(u8); // src/shop extern const struct YesNoFuncTable gUnknown_083EC95C; extern const struct YesNoFuncTable gUnknown_083EC964; extern const struct YesNoFuncTable gUnknown_083EC9CC; diff --git a/include/shop.h b/include/shop.h index 63dd6cc81..76b68d0e9 100644 --- a/include/shop.h +++ b/include/shop.h @@ -37,20 +37,9 @@ struct MartInfo /* 0xD */ u8 curItemCount; // if you are selling an item, this is the count of the current item stack you have. }; -void Task_DoBuySellMenu(u8); -void Task_HandleShopMenuQuit(u8); -void Shop_FadeAndRunBuySellCallback(u8); -void BuyMenuDrawGraphics(void); -void sub_80B3240(void); -void DrawFirstMartScrollIndicators(void); -void Shop_DrawViewport(void); -void Shop_InitMenus(int, int); -void Shop_PrintItemDesc(void); -void Shop_DoCursorAction(u8); -void CreatePokemartMenu(u16 *); -void CreateDecorationShop1Menu(u16 *); -void CreateDecorationShop2Menu(u16 *); -void Shop_LoadViewportObjects(void); -void Shop_AnimViewportObjects(void); +void Shop_CreatePokemartMenu(u16 *); +void Shop_CreateDecorationShop1Menu(u16 *); +void Shop_CreateDecorationShop2Menu(u16 *); +void Shop_RunExitSellMenuTask(u8 taskId); #endif // GUARD_SHOP_H diff --git a/ld_script.txt b/ld_script.txt index afa71a0c5..3749b49f5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -481,7 +481,8 @@ SECTIONS { src/engine/link.o(.rodata); src/engine/rtc.o(.rodata); src/engine/main_menu.o(.rodata); - data/data2a.o(.rodata); + data/mon_attrs.o(.rodata); + data/btl_attrs.o(.rodata); src/battle/battle_4.o(.rodata); src/battle/battle_controller_player.o(.rodata); data/data2b.o(.rodata); diff --git a/src/field/decoration.c b/src/field/decoration.c index 889e8e8a2..e1604cfa1 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -19,6 +19,7 @@ #include "event_data.h" #include "field_weather.h" #include "decoration.h" +#include "shop.h" #include "ewram.h" EWRAM_DATA u8 *gUnknown_020388D0 = NULL; diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c index e795fd8ed..36edbe472 100644 --- a/src/field/scrcmd.c +++ b/src/field/scrcmd.c @@ -1755,7 +1755,7 @@ bool8 ScrCmd_pokemart(struct ScriptContext *ctx) { void *ptr = (void *)ScriptReadWord(ctx); - CreatePokemartMenu(ptr); + Shop_CreatePokemartMenu(ptr); ScriptContext1_Stop(); return TRUE; } @@ -1764,7 +1764,7 @@ bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx) { void *ptr = (void *)ScriptReadWord(ctx); - CreateDecorationShop1Menu(ptr); + Shop_CreateDecorationShop1Menu(ptr); ScriptContext1_Stop(); return TRUE; } @@ -1773,7 +1773,7 @@ bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx) { void *ptr = (void *)ScriptReadWord(ctx); - CreateDecorationShop2Menu(ptr); + Shop_CreateDecorationShop2Menu(ptr); ScriptContext1_Stop(); return TRUE; } diff --git a/src/field/shop.c b/src/field/shop.c index 233e430ee..5a47b033b 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -34,17 +34,28 @@ extern u8 gBuyMenuFrame_Gfx[]; extern u16 gBuyMenuFrame_Tilemap[]; extern u16 gMenuMoneyPal[16]; -void Shop_DisplayPriceInList(int firstItemId, int lastItemId, bool32 hasControlCode); -void Shop_PrintItemDescText(void); -void Task_ReturnToBuyMenu(u8); -void Task_ExitBuyMenu(u8); -void Task_ExitBuyMenuDoFade(u8); -void Task_UpdatePurchaseHistory(u8); -void Task_HandleShopMenuBuy(u8 taskId); -void Task_HandleShopMenuSell(u8 taskId); -void Task_HandleShopMenuQuit(u8 taskId); -void Task_DoItemPurchase(u8 taskId); -void Task_CancelItemPurchase(u8 taskId); +static void Shop_DisplayPriceInList(int firstItemId, int lastItemId, bool32 hasControlCode); +static void Shop_PrintItemDescText(void); +static void Task_ReturnToBuyMenu(u8); +static void Task_ExitBuyMenu(u8); +static void Task_ExitBuyMenuDoFade(u8); +static void Task_UpdatePurchaseHistory(u8); +static void Task_HandleShopMenuBuy(u8 taskId); +static void Task_HandleShopMenuSell(u8 taskId); +static void Task_HandleShopMenuQuit(u8 taskId); +static void Task_DoItemPurchase(u8 taskId); +static void Task_CancelItemPurchase(u8 taskId); +static void Task_DoBuySellMenu(u8); +static void Shop_FadeAndRunBuySellCallback(u8); +static void BuyMenuDrawGraphics(void); +static void sub_80B3240(void); +static void DrawFirstMartScrollIndicators(void); +static void Shop_DrawViewport(void); +static void Shop_InitMenus(int, int); +static void Shop_PrintItemDesc(void); +static void Shop_DoCursorAction(u8); +static void Shop_LoadViewportObjects(void); +static void Shop_AnimViewportObjects(void); // iwram static struct MartInfo gMartInfo; @@ -76,7 +87,7 @@ static const struct YesNoFuncTable sShopPurchaseYesNoFuncs[] = Task_CancelItemPurchase }; -u8 CreateShopMenu(u8 martType) +static u8 CreateShopMenu(u8 martType) { ScriptContext2_Enable(); gMartInfo.martType = martType; @@ -99,12 +110,12 @@ u8 CreateShopMenu(u8 martType) return CreateTask(Task_DoBuySellMenu, 8); } -void SetShopMenuCallback(void *callbackPtr) +static void SetShopMenuCallback(void *callbackPtr) { gMartInfo.callback = callbackPtr; } -void SetShopItemsForSale(u16 *items) +static void SetShopItemsForSale(u16 *items) { u16 i = 0; @@ -118,7 +129,7 @@ void SetShopItemsForSale(u16 *items) } } -void Task_DoBuySellMenu(u8 taskId) +static void Task_DoBuySellMenu(u8 taskId) { const u8 taskIdConst = taskId; // why is a local const needed to match? @@ -157,7 +168,7 @@ void Task_DoBuySellMenu(u8 taskId) } } -void Task_HandleShopMenuBuy(u8 taskId) +static void Task_HandleShopMenuBuy(u8 taskId) { gTasks[taskId].data[8] = (u32)BuyMenuDrawGraphics >> 16; gTasks[taskId].data[9] = (u32)BuyMenuDrawGraphics; @@ -165,7 +176,7 @@ void Task_HandleShopMenuBuy(u8 taskId) fade_screen(1, 0); } -void Task_HandleShopMenuSell(u8 taskId) +static void Task_HandleShopMenuSell(u8 taskId) { gTasks[taskId].data[8] = (u32)ItemMenu_LoadSellMenu >> 16; gTasks[taskId].data[9] = (u32)ItemMenu_LoadSellMenu; @@ -173,7 +184,7 @@ void Task_HandleShopMenuSell(u8 taskId) fade_screen(1, 0); } -void Task_HandleShopMenuQuit(u8 taskId) +static void Task_HandleShopMenuQuit(u8 taskId) { Menu_DestroyCursor(); Menu_EraseWindowRect(0, 0, 11, 8); @@ -185,7 +196,7 @@ void Task_HandleShopMenuQuit(u8 taskId) gMartInfo.callback(); // run the callback if it exists. } -void Shop_FadeAndRunBuySellCallback(u8 taskId) +static void Shop_FadeAndRunBuySellCallback(u8 taskId) { if (!gPaletteFade.active) { @@ -194,13 +205,13 @@ void Shop_FadeAndRunBuySellCallback(u8 taskId) } } -void ReturnToShopMenuAfterExitingSellMenu(u8 taskId) +static void ReturnToShopMenuAfterExitingSellMenu(u8 taskId) { CreateShopMenu(gMartInfo.martType); DestroyTask(taskId); } -void Task_ReturnToMartMenu(u8 taskId) +static void Task_ReturnToMartMenu(u8 taskId) { if (sub_807D770() == 1) { @@ -246,7 +257,7 @@ static void VBlankCB(void) DmaCopy16Defvars(3, gBGTilemapBuffers[3], (void *)(VRAM + 0xF000), 0x800); } -void BuyMenuDrawGraphics(void) +static void BuyMenuDrawGraphics(void) { ClearVideoCallbacks(); ScanlineEffect_Stop(); @@ -298,7 +309,7 @@ void BuyMenuDrawGraphics(void) SetMainCallback2(MainCB2); } -void sub_80B3240(void) +static void sub_80B3240(void) { u16 colors[2] = {RGB(14, 15, 16), RGB_WHITE}; @@ -306,7 +317,7 @@ void sub_80B3240(void) LoadPalette(&colors[0], 0xD8, sizeof colors[0]); } -void DrawFirstMartScrollIndicators(void) +static void DrawFirstMartScrollIndicators(void) { ClearVerticalScrollIndicatorPalettes(); @@ -318,7 +329,7 @@ void DrawFirstMartScrollIndicators(void) } } -void Shop_TryDrawVerticalScrollIndicators(void) +static void Shop_TryDrawVerticalScrollIndicators(void) { if (gMartInfo.choicesAbove == 0) SetVerticalScrollIndicators(TOP_ARROW, INVISIBLE); @@ -332,13 +343,13 @@ void Shop_TryDrawVerticalScrollIndicators(void) } // what is the point of this function? the tiles always get overwritten by BuyMenuDrawTextboxBG. -void BuyMenuDrawTextboxBG_Old(u16 *array, s16 offset1, s16 offset2) +static void BuyMenuDrawTextboxBG_Old(u16 *array, s16 offset1, s16 offset2) { array[offset1 + offset2] = 0xC3E1; array[offset1 + offset2 + 1] = 0xC3E1; } -void BuyMenuDrawMapMetatileLayer(u16 *array, s16 offset1, s16 offset2, u16 *array2) +static void BuyMenuDrawMapMetatileLayer(u16 *array, s16 offset1, s16 offset2, u16 *array2) { // This function draws a whole 2x2 metatile. array[offset1 + offset2] = array2[0]; // top left @@ -347,7 +358,7 @@ void BuyMenuDrawMapMetatileLayer(u16 *array, s16 offset1, s16 offset2, u16 *arra array[offset1 + offset2 + 33] = array2[3]; // bottom right } -void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s32 var4) +static void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s32 var4) { u8 tempVar4 = var4; s16 offset1 = var1 * 2; @@ -371,7 +382,7 @@ void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s32 var4) } // used to draw the border tiles around the viewport. -void BuyMenuDrawMapPartialMetatile(s16 var1, int var2, u16 *var3) +static void BuyMenuDrawMapPartialMetatile(s16 var1, int var2, u16 *var3) { s16 offset1 = var1 * 2; s16 offset2 = (var2 * 0x40) + 0x40; @@ -380,7 +391,7 @@ void BuyMenuDrawMapPartialMetatile(s16 var1, int var2, u16 *var3) BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4); } -void Shop_DrawViewportTiles(void) +static void Shop_DrawViewportTiles(void) { s16 facingX; s16 facingY; @@ -420,7 +431,7 @@ void Shop_DrawViewportTiles(void) } } -void Shop_DrawViewport(void) +static void Shop_DrawViewport(void) { ClearBGTilemapBuffers(); Shop_LoadViewportObjects(); @@ -428,7 +439,7 @@ void Shop_DrawViewport(void) Shop_DrawViewportTiles(); } -void Shop_LoadViewportObjects(void) +static void Shop_LoadViewportObjects(void) { s16 facingX; s16 facingY; @@ -466,7 +477,7 @@ void Shop_LoadViewportObjects(void) } } -void Shop_AnimViewportObjects(void) +static void Shop_AnimViewportObjects(void) { u8 i; @@ -485,7 +496,7 @@ void Shop_AnimViewportObjects(void) } } -void BuyMenuDrawTextboxBG(void) +static void BuyMenuDrawTextboxBG(void) { s16 i; @@ -496,7 +507,7 @@ void BuyMenuDrawTextboxBG(void) } } -void Shop_InitMenus(int firstItemId, int lastItemId) +static void Shop_InitMenus(int firstItemId, int lastItemId) { BuyMenuDrawTextboxBG(); Shop_DisplayPriceInList(firstItemId, lastItemId, 0); @@ -504,7 +515,7 @@ void Shop_InitMenus(int firstItemId, int lastItemId) } // after printing the item quantity and price, restore the textbox tiles before the Yes/No prompt. -void BuyMenuDrawTextboxBG_Restore(void) +static void BuyMenuDrawTextboxBG_Restore(void) { u16 i, j; @@ -513,14 +524,14 @@ void BuyMenuDrawTextboxBG_Restore(void) gBGTilemapBuffers[1][32 * (i + 12) + j] = ewram18300[32 * i + j] + 0xC3E0; } -void Shop_PrintItemDesc(void) +static void Shop_PrintItemDesc(void) { Shop_PrintItemDescText(); } #define tItemCount data[1] -void Shop_DisplayPriceInCheckoutWindow(u8 taskId) +static void Shop_DisplayPriceInCheckoutWindow(u8 taskId) { u16 itemListIndex = gMartInfo.choicesAbove + gMartInfo.cursor; u16 itemId = gMartInfo.itemList[itemListIndex]; @@ -535,7 +546,7 @@ void Shop_DisplayPriceInCheckoutWindow(u8 taskId) sub_80A3FA0(gBGTilemapBuffers[1], 1, 11, 12, 2, 0xC3E1); } -void Shop_DisplayNormalPriceInList(u16 itemId, u8 var2, bool32 hasControlCode) +static void Shop_DisplayNormalPriceInList(u16 itemId, u8 var2, bool32 hasControlCode) { u8 *stringPtr = gStringVar1; @@ -559,7 +570,7 @@ void Shop_DisplayNormalPriceInList(u16 itemId, u8 var2, bool32 hasControlCode) Menu_PrintTextPixelCoords(&gStringVar1[0], 0xCA, var2 << 3, 1); } -void Shop_DisplayDecorationPriceInList(u16 itemId, u8 var2, bool32 hasControlCode) +static void Shop_DisplayDecorationPriceInList(u16 itemId, u8 var2, bool32 hasControlCode) { u8 *stringPtr = gStringVar1; @@ -592,7 +603,7 @@ void Shop_DisplayDecorationPriceInList(u16 itemId, u8 var2, bool32 hasControlCod } } -void Shop_DisplayPriceInList(int firstItemId, int lastItemId, bool32 hasControlCode) +static void Shop_DisplayPriceInList(int firstItemId, int lastItemId, bool32 hasControlCode) { u8 i; @@ -611,7 +622,7 @@ void Shop_DisplayPriceInList(int firstItemId, int lastItemId, bool32 hasControlC } } -void Shop_PrintItemDescText(void) +static void Shop_PrintItemDescText(void) { if (gMartInfo.choicesAbove + gMartInfo.cursor != gMartInfo.itemCount) { @@ -630,7 +641,7 @@ void Shop_PrintItemDescText(void) } } -void Shop_DoPremierBallCheck(u8 taskId) +static void Shop_DoPremierBallCheck(u8 taskId) { if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON) { @@ -644,7 +655,7 @@ void Shop_DoPremierBallCheck(u8 taskId) } } -void Shop_DoItemTransaction(u8 taskId) +static void Shop_DoItemTransaction(u8 taskId) { IncrementGameStat(0x26); RemoveMoney(&gSaveBlock1.money, gMartTotalCost); @@ -653,13 +664,13 @@ void Shop_DoItemTransaction(u8 taskId) gTasks[taskId].func = Shop_DoPremierBallCheck; } -void Shop_DoPricePrintAndReturnToBuyMenu(u8 taskId) +static void Shop_DoPricePrintAndReturnToBuyMenu(u8 taskId) { Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); Task_ReturnToBuyMenu(taskId); } -void Task_DoItemPurchase(u8 taskId) +static void Task_DoItemPurchase(u8 taskId) { Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0); @@ -698,14 +709,14 @@ void Task_DoItemPurchase(u8 taskId) DisplayItemMessageOnField(taskId, gOtherText_NotEnoughMoney, Shop_DoPricePrintAndReturnToBuyMenu, 0xC3E1); } -void Shop_DoYesNoPurchase(u8 taskId) +static void Shop_DoYesNoPurchase(u8 taskId) { DisplayYesNoMenu(7, 8, 1); sub_80A3FA0(gBGTilemapBuffers[1], 8, 9, 4, 4, 0xC3E1); DoYesNoFuncWithChoice(taskId, sShopPurchaseYesNoFuncs); } -void Task_CancelItemPurchase(u8 taskId) +static void Task_CancelItemPurchase(u8 taskId) { Shop_DisplayPriceInList(gMartInfo.cursor, gMartInfo.cursor, 0); Menu_EraseWindowRect(0x7, 0x8, 0xD, 0xD); @@ -713,7 +724,7 @@ void Task_CancelItemPurchase(u8 taskId) Task_ReturnToBuyMenu(taskId); } -void Shop_PrintPrice(u8 taskId) +static void Shop_PrintPrice(u8 taskId) { if (SellMenu_QuantityRoller(taskId, gMartInfo.curItemCount) == TRUE) Shop_DisplayPriceInCheckoutWindow(taskId); @@ -739,7 +750,7 @@ void Shop_PrintPrice(u8 taskId) } // set the item count in the mart info to the maximum allowed by the player's budget. -void Shop_UpdateCurItemCountToMax(u8 taskId) +static void Shop_UpdateCurItemCountToMax(u8 taskId) { u16 var; @@ -757,7 +768,7 @@ void Shop_UpdateCurItemCountToMax(u8 taskId) } #ifdef NONMATCHING -void Shop_MoveItemListUp(void) +static void Shop_MoveItemListUp(void) { u16 *r1; u16 *r2; @@ -799,7 +810,7 @@ void Shop_MoveItemListUp(void) } #else __attribute__((naked)) -void Shop_MoveItemListUp(void) +static void Shop_MoveItemListUp(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -894,7 +905,7 @@ _080B4038: .4byte 0xfffffc40\n\ #endif #ifdef NONMATCHING -void Shop_MoveItemListDown(void) +static void Shop_MoveItemListDown(void) { u16 *r1; u16 *r2; @@ -938,7 +949,7 @@ void Shop_MoveItemListDown(void) } #else __attribute__((naked)) -void Shop_MoveItemListDown(void) +static void Shop_MoveItemListDown(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ @@ -1031,7 +1042,7 @@ _080B40E4: .4byte 0x800000f0\n\ } #endif -void Shop_DoCursorAction(u8 taskId) +static void Shop_DoCursorAction(u8 taskId) { if (!gPaletteFade.active) { @@ -1140,7 +1151,7 @@ void Shop_DoCursorAction(u8 taskId) } } -void Task_ReturnToBuyMenu(u8 taskId) +static void Task_ReturnToBuyMenu(u8 taskId) { Menu_EraseWindowRect(0, 0xE, 0x1D, 0x13); Menu_EraseWindowRect(0, 0xA, 0xD, 0xD); @@ -1154,14 +1165,14 @@ void Task_ReturnToBuyMenu(u8 taskId) gTasks[taskId].func = Shop_DoCursorAction; } -void Task_ExitBuyMenu(u8 taskId) +static void Task_ExitBuyMenu(u8 taskId) { gFieldCallback = Shop_FadeReturnToMartMenu; BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ExitBuyMenuDoFade; } -void Task_ExitBuyMenuDoFade(u8 taskId) +static void Task_ExitBuyMenuDoFade(u8 taskId) { if (!gPaletteFade.active) { @@ -1173,7 +1184,7 @@ void Task_ExitBuyMenuDoFade(u8 taskId) } // Task_UpdatePurchaseHistory -void Task_UpdatePurchaseHistory(u8 taskId) +static void Task_UpdatePurchaseHistory(u8 taskId) { u16 i; @@ -1200,13 +1211,13 @@ void Task_UpdatePurchaseHistory(u8 taskId) #undef tItemCount -void ClearItemPurchases(void) +static void ClearItemPurchases(void) { gMartPurchaseHistoryId = 0; ClearItemSlots(gMartPurchaseHistory, 3); } -void CreatePokemartMenu(u16 *itemList) +void Shop_CreatePokemartMenu(u16 *itemList) { CreateShopMenu(MART_TYPE_0); SetShopItemsForSale(itemList); @@ -1214,14 +1225,14 @@ void CreatePokemartMenu(u16 *itemList) SetShopMenuCallback(EnableBothScriptContexts); } -void CreateDecorationShop1Menu(u16 *itemList) +void Shop_CreateDecorationShop1Menu(u16 *itemList) { CreateShopMenu(MART_TYPE_1); SetShopItemsForSale(itemList); SetShopMenuCallback(EnableBothScriptContexts); } -void CreateDecorationShop2Menu(u16 *itemList) +void Shop_CreateDecorationShop2Menu(u16 *itemList) { CreateShopMenu(MART_TYPE_2); SetShopItemsForSale(itemList); -- cgit v1.2.3 From b779a60ad70bcf65001bf88bc1c652629b22a2f9 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 16 Jan 2018 15:03:22 -0500 Subject: split data2b --- data/battle_7.s | 25 +++++++++++++++++ data/data2b.s | 78 ------------------------------------------------------ data/smokescreen.s | 57 +++++++++++++++++++++++++++++++++++++++ ld_script.txt | 3 ++- 4 files changed, 84 insertions(+), 79 deletions(-) create mode 100644 data/battle_7.s delete mode 100644 data/data2b.s create mode 100644 data/smokescreen.s diff --git a/data/battle_7.s b/data/battle_7.s new file mode 100644 index 000000000..50fad468a --- /dev/null +++ b/data/battle_7.s @@ -0,0 +1,25 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_081FAF24:: @ 81FAF24 + obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 + + .align 2 +gOamData_81FAF2C:: @ 81FAF2C + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0C00 + + .align 2 +gSpriteTemplate_81FAF34:: @ 81FAF34 + spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978 + + .align 2 +gUnknown_081FAF4C:: @ 81FAF4C + .4byte gSharedMem + 0x8000 + .4byte gSharedMem + 0xA000 + .4byte gSharedMem + 0xC000 + .4byte gSharedMem + 0xE000 diff --git a/data/data2b.s b/data/data2b.s deleted file mode 100644 index c7cd4dfcf..000000000 --- a/data/data2b.s +++ /dev/null @@ -1,78 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_081FAEA4:: @ 81FAEA4 - obj_tiles gSmokescreenImpactTiles, 0x180, 55019 - - .align 2 -gUnknown_081FAEAC:: @ 81FAEAC - obj_pal gSmokescreenImpactPalette, 55019 - - .align 2 -gOamData_81FAEB4:: @ 81FAEB4 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_81FAEBC:: @ 81FAEBC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_81FAECC:: @ 81FAECC - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_81FAEDC:: @ 81FAEDC - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_81FAEEC:: @ 81FAEEC - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnimTable_81FAEFC:: @ 81FAEFC - .4byte gSpriteAnim_81FAEBC - .4byte gSpriteAnim_81FAECC - .4byte gSpriteAnim_81FAEDC - .4byte gSpriteAnim_81FAEEC - - .align 2 -gSpriteTemplate_81FAF0C:: @ 81FAF0C - spr_template 55019, 55019, gOamData_81FAEB4, gSpriteAnimTable_81FAEFC, NULL, gDummySpriteAffineAnimTable, sub_80463CC - - .align 2 -gUnknown_081FAF24:: @ 81FAF24 - obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 - - .align 2 -gOamData_81FAF2C:: @ 81FAF2C - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0C00 - - .align 2 -gSpriteTemplate_81FAF34:: @ 81FAF34 - spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978 - - .align 2 -gUnknown_081FAF4C:: @ 81FAF4C - .4byte gSharedMem + 0x8000 - .4byte gSharedMem + 0xA000 - .4byte gSharedMem + 0xC000 - .4byte gSharedMem + 0xE000 diff --git a/data/smokescreen.s b/data/smokescreen.s new file mode 100644 index 000000000..21cca5917 --- /dev/null +++ b/data/smokescreen.s @@ -0,0 +1,57 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_081FAEA4:: @ 81FAEA4 + obj_tiles gSmokescreenImpactTiles, 0x180, 55019 + + .align 2 +gUnknown_081FAEAC:: @ 81FAEAC + obj_pal gSmokescreenImpactPalette, 55019 + + .align 2 +gOamData_81FAEB4:: @ 81FAEB4 + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0400 + + .align 2 +gSpriteAnim_81FAEBC:: @ 81FAEBC + obj_image_anim_frame 0, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_end + + .align 2 +gSpriteAnim_81FAECC:: @ 81FAECC + obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_end + + .align 2 +gSpriteAnim_81FAEDC:: @ 81FAEDC + obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP + obj_image_anim_end + + .align 2 +gSpriteAnim_81FAEEC:: @ 81FAEEC + obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_end + + .align 2 +gSpriteAnimTable_81FAEFC:: @ 81FAEFC + .4byte gSpriteAnim_81FAEBC + .4byte gSpriteAnim_81FAECC + .4byte gSpriteAnim_81FAEDC + .4byte gSpriteAnim_81FAEEC + + .align 2 +gSpriteTemplate_81FAF0C:: @ 81FAF0C + spr_template 55019, 55019, gOamData_81FAEB4, gSpriteAnimTable_81FAEFC, NULL, gDummySpriteAffineAnimTable, sub_80463CC diff --git a/ld_script.txt b/ld_script.txt index 3749b49f5..38fd4ff74 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -485,7 +485,8 @@ SECTIONS { data/btl_attrs.o(.rodata); src/battle/battle_4.o(.rodata); src/battle/battle_controller_player.o(.rodata); - data/data2b.o(.rodata); + data/smokescreen.o(.rodata); /* why is smokescreen rodata way up here and not in the correct location? */ + data/battle_7.o(.rodata); src/battle/battle_controller_opponent.o(.rodata); src/battle/battle_controller_linkopponent.o(.rodata); data/battle_moves.o(.rodata); -- cgit v1.2.3 From dc872c0cbf1983d06b382dc0747df9140c9ecc03 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 16 Jan 2018 17:18:31 -0500 Subject: split data_8393054 --- data/data_8393054.s | 110 ---------------------------------------------------- data/gray_sun.s | 21 ++++++++++ data/sparkle.s | 21 ++++++++++ data/unused_hit.s | 29 ++++++++++++++ data/unused_orb.s | 24 ++++++++++++ data/unused_orb2.s | 27 +++++++++++++ data/unused_paw.s | 8 ++++ ld_script.txt | 7 +++- src/rom_8077ABC.c | 9 +++++ 9 files changed, 145 insertions(+), 111 deletions(-) delete mode 100644 data/data_8393054.s create mode 100644 data/gray_sun.s create mode 100644 data/sparkle.s create mode 100644 data/unused_hit.s create mode 100644 data/unused_orb.s create mode 100644 data/unused_orb2.s create mode 100644 data/unused_paw.s diff --git a/data/data_8393054.s b/data/data_8393054.s deleted file mode 100644 index 38ba47b63..000000000 --- a/data/data_8393054.s +++ /dev/null @@ -1,110 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSpriteAnim_8393054:: @ 8393054 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 4, 3 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 12, 3 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_8393068:: @ 8393068 - .4byte gSpriteAnim_8393054 - - .align 2 -gSpriteTemplate_839306C:: @ 839306C - spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A5C4 - - .align 2 -gSpriteTemplate_8393084:: @ 8393084 - spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A544 - - .align 2 -gSpriteAnim_839309C:: @ 839309C - obj_image_anim_frame 0, 3 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83930A4:: @ 83930A4 - .4byte gSpriteAnim_839309C - - .align 2 -gBattleAnimSpriteTemplate_83930A8:: @ 83930A8 - spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A908 - - .align 2 -gBattleAnimSpriteTemplate_83930C0:: @ 83930C0 - spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A9BC - - .align 2 -gSpriteAnim_83930D8:: @ 83930D8 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 32, 3 - obj_image_anim_frame 48, 3 - obj_image_anim_frame 64, 3 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83930F0:: @ 83930F0 - .4byte gSpriteAnim_83930D8 - - .align 2 -gBattleAnimSpriteTemplate_83930F4:: @ 83930F4 - spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83930F0, NULL, gDummySpriteAffineAnimTable, sub_807A63C - - .align 2 -gSpriteTemplate_839310C:: @ 839310C - spr_template 10051, 10051, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807A5C4 - - .align 2 -gSpriteAnim_8393124:: @ 8393124 - obj_image_anim_frame 0, 5 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_839312C:: @ 839312C - obj_image_anim_frame 0, 5 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_8393134:: @ 8393134 - obj_image_anim_frame 0, 5 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_839313C:: @ 839313C - .4byte gSpriteAnim_8393124 - .4byte gSpriteAnim_839312C - .4byte gSpriteAnim_8393134 - - .align 2 -gSpriteTemplate_8393148:: @ 8393148 - spr_template 10135, 10135, gOamData_837DF34, gSpriteAnimTable_839313C, NULL, gDummySpriteAffineAnimTable, sub_807A5C4 - - .align 2 -gSpriteAnim_8393160:: @ 8393160 - obj_image_anim_frame 0, 15 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_8393168:: @ 8393168 - .4byte gSpriteAnim_8393160 - - .align 2 -gSpriteAffineAnim_839316C:: @ 839316C - obj_rot_scal_anim_frame 0x60, 0x60, 0, 0 - obj_rot_scal_anim_frame 0x2, 0x2, 0, 1 - obj_rot_scal_anim_jump 1 - - .align 2 -gSpriteAffineAnimTable_8393184:: @ 8393184 - .4byte gSpriteAffineAnim_839316C - - .align 2 -gSpriteTemplate_8393188:: @ 8393188 - spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544 diff --git a/data/gray_sun.s b/data/gray_sun.s new file mode 100644 index 000000000..bee64873a --- /dev/null +++ b/data/gray_sun.s @@ -0,0 +1,21 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteAnim_839309C:: @ 839309C + obj_image_anim_frame 0, 3 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_83930A4:: @ 83930A4 + .4byte gSpriteAnim_839309C + + .align 2 +gBattleAnimSpriteTemplate_83930A8:: @ 83930A8 + spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A908 + + .align 2 +gBattleAnimSpriteTemplate_83930C0:: @ 83930C0 + spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A9BC diff --git a/data/sparkle.s b/data/sparkle.s new file mode 100644 index 000000000..0c2593fbd --- /dev/null +++ b/data/sparkle.s @@ -0,0 +1,21 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteAnim_83930D8:: @ 83930D8 + obj_image_anim_frame 0, 3 + obj_image_anim_frame 16, 3 + obj_image_anim_frame 32, 3 + obj_image_anim_frame 48, 3 + obj_image_anim_frame 64, 3 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83930F0:: @ 83930F0 + .4byte gSpriteAnim_83930D8 + + .align 2 +gBattleAnimSpriteTemplate_83930F4:: @ 83930F4 + spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83930F0, NULL, gDummySpriteAffineAnimTable, sub_807A63C diff --git a/data/unused_hit.s b/data/unused_hit.s new file mode 100644 index 000000000..d7bdef912 --- /dev/null +++ b/data/unused_hit.s @@ -0,0 +1,29 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteAnim_8393124:: @ 8393124 + obj_image_anim_frame 0, 5 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_839312C:: @ 839312C + obj_image_anim_frame 0, 5 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnim_8393134:: @ 8393134 + obj_image_anim_frame 0, 5 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_839313C:: @ 839313C + .4byte gSpriteAnim_8393124 + .4byte gSpriteAnim_839312C + .4byte gSpriteAnim_8393134 + + .align 2 +gSpriteTemplate_8393148:: @ 8393148 + spr_template 10135, 10135, gOamData_837DF34, gSpriteAnimTable_839313C, NULL, gDummySpriteAffineAnimTable, sub_807A5C4 diff --git a/data/unused_orb.s b/data/unused_orb.s new file mode 100644 index 000000000..d49ddd908 --- /dev/null +++ b/data/unused_orb.s @@ -0,0 +1,24 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteAnim_8393054:: @ 8393054 + obj_image_anim_frame 0, 3 + obj_image_anim_frame 4, 3 + obj_image_anim_frame 8, 3 + obj_image_anim_frame 12, 3 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_8393068:: @ 8393068 + .4byte gSpriteAnim_8393054 + + .align 2 +gSpriteTemplate_839306C:: @ 839306C + spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A5C4 + + .align 2 +gSpriteTemplate_8393084:: @ 8393084 + spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A544 diff --git a/data/unused_orb2.s b/data/unused_orb2.s new file mode 100644 index 000000000..899f41372 --- /dev/null +++ b/data/unused_orb2.s @@ -0,0 +1,27 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteAnim_8393160:: @ 8393160 + obj_image_anim_frame 0, 15 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_8393168:: @ 8393168 + .4byte gSpriteAnim_8393160 + + .align 2 +gSpriteAffineAnim_839316C:: @ 839316C + obj_rot_scal_anim_frame 0x60, 0x60, 0, 0 + obj_rot_scal_anim_frame 0x2, 0x2, 0, 1 + obj_rot_scal_anim_jump 1 + + .align 2 +gSpriteAffineAnimTable_8393184:: @ 8393184 + .4byte gSpriteAffineAnim_839316C + + .align 2 +gSpriteTemplate_8393188:: @ 8393188 + spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544 diff --git a/data/unused_paw.s b/data/unused_paw.s new file mode 100644 index 000000000..cb29168d7 --- /dev/null +++ b/data/unused_paw.s @@ -0,0 +1,8 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteTemplate_839310C:: @ 839310C + spr_template 10051, 10051, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807A5C4 diff --git a/ld_script.txt b/ld_script.txt index 38fd4ff74..3be3a6e56 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -532,7 +532,12 @@ SECTIONS { src/battle/battle_anim.o(.rodata); src/rom_8077ABC.o(.rodata); data/map_events.o(.rodata); - data/data_8393054.o(.rodata); + data/unused_orb.o(.rodata); /* these files are clearly the rodata for latter part of rom_8077ABC, but the linker linked map_events before these objects for some reason. perhaps it was compiling and linking 2 folders at the same time? */ + data/gray_sun.o(.rodata); + data/sparkle.o(.rodata); + data/unused_paw.o(.rodata); + data/unused_hit.o(.rodata); + data/unused_orb2.o(.rodata); src/engine/task.o(.rodata); src/battle/battle_anim_807B69C.o(.rodata); src/scene/title_screen.o(.rodata); diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 2b5a3c036..11a71155d 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -151,6 +151,7 @@ const struct SpriteSheet gUnknown_0837F5E0[] = { gMiscBlank_Gfx, 0x800, 55126, }, }; +// pkmn_form.c u8 GetBankPosition(u8 slot, u8 a2) { @@ -2149,6 +2150,8 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3) return new_sprite; } +// unused_orb + void sub_807A544(struct Sprite *sprite) { sub_8078650(sprite); @@ -2192,6 +2195,8 @@ void sub_807A5C4(struct Sprite *sprite) sprite->callback = sub_8078504; } +// file_2 + void sub_807A63C(struct Sprite *sprite) { sub_8078650(sprite); @@ -2204,6 +2209,8 @@ void sub_807A63C(struct Sprite *sprite) StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } +// file_3 (punch effect?) + void sub_807A69C(u8 taskId) { u16 src; @@ -2287,6 +2294,8 @@ void sub_807A8D4(struct Sprite *sprite) } } +// file_4 + void sub_807A908(struct Sprite *sprite) { sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); -- cgit v1.2.3 From 58dd1c92ac6270d229c6762ca640118e4dd5e3cf Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 16 Jan 2018 18:10:40 -0600 Subject: remove some symbols from sym_ewram.txt --- include/easy_chat.h | 2 - src/battle/battle_message.c | 3 +- src/contest.c | 26 +++--- src/easy_chat_2.c | 2 + src/engine/record_mixing.c | 2 +- src/engine/trade.c | 10 ++- src/field/field_weather.c | 12 ++- src/field/party_menu.c | 13 +-- src/field/pc_screen_effect.c | 2 +- src/field/secret_base.c | 2 +- src/pokemon/pokemon_summary_screen.c | 5 +- src/scene/intro_credits_graphics.c | 7 +- sym_ewram.txt | 161 +++-------------------------------- 13 files changed, 60 insertions(+), 187 deletions(-) diff --git a/include/easy_chat.h b/include/easy_chat.h index c68a3fa02..58750fa92 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -114,8 +114,6 @@ struct Shared1000 u8 unk9F8E[7]; // unknown length }; -extern u8 gUnknown_020388AC; - // const pointer to shared1000. easy_chat might be two separate files. extern struct Shared1000 *const gEasyChatStruct; diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index 18e07acf6..e9334ef61 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -158,7 +158,6 @@ extern u8 gBankAttacker; extern u8 gBankTarget; extern u8 gStringBank; extern u8 gEffectBank; -extern u8 gAbilitiesPerBank[4]; extern u8 gBattleTextBuff1[]; extern u8 gBattleTextBuff2[]; extern u8 gBattleTextBuff3[]; @@ -175,6 +174,8 @@ extern u16 gBattlePartyID[4]; extern struct BattleEnigmaBerry gEnigmaBerries[4]; extern u8 gBattleBufferA[4][0x200]; +EWRAM_DATA u8 gAbilitiesPerBank[4] = {0}; + extern const u8* const gUnknown_08401674[]; // table of pointers to 'a -TYPE' strings extern const u8* const gUnknown_08400F58[]; // table of pointers to stat strings extern const u8* const gUnknown_08400F78[]; // table of pointers to flavour strings diff --git a/src/contest.c b/src/contest.c index df4bb361d..972c19c2c 100644 --- a/src/contest.c +++ b/src/contest.c @@ -39,8 +39,6 @@ extern void sub_80C8AD0(u8); extern void sub_80C8C80(u8); extern struct MusicPlayerInfo gMPlay_SE1; -extern u16 gSpecialVar_ContestCategory; -extern u16 gSpecialVar_ContestRank; extern u8 gBattleMonForms[]; extern u8 gDisplayedStringBattle[]; extern u16 gBattleTypeFlags; @@ -48,8 +46,6 @@ extern u8 gBankAttacker; extern u8 gBankTarget; extern u8 gBanksBySide[]; extern u8 gObjectBankIDs[]; -extern u8 gIsLinkContest; -extern u8 gContestPlayerMonIndex; extern u16 gBattle_BG3_X; extern s16 gBattle_BG1_Y; extern u16 gBattle_BG3_Y; @@ -65,14 +61,6 @@ extern u16 gBattle_BG1_X; extern u16 gBattle_WIN0H; extern u32 gUnknown_03005D28; // saved RNG value -extern s16 gUnknown_02038680[]; -extern u16 gUnknown_02038688[]; -extern u8 gUnknown_02038694; -extern u8 gUnknown_02038696[]; -extern u8 gUnknown_0203869B; -extern s16 gUnknown_02038670[]; -extern s16 gUnknown_02038678[]; -extern u8 gContestFinalStandings[]; // What "place" each participant came in. extern struct SpriteTemplate gUnknown_02024E8C; @@ -292,6 +280,20 @@ void sub_80B292C(void); void sub_80B2968(void); void SelectContestMoveBankTarget(u16); +EWRAM_DATA u8 gUnknown_0203856C = 0; +EWRAM_DATA struct ContestPokemon gContestMons[4] = {0}; +EWRAM_DATA s16 gUnknown_02038670[4] = {0}; +EWRAM_DATA s16 gUnknown_02038678[4] = {0}; +EWRAM_DATA s16 gUnknown_02038680[4] = {0}; +EWRAM_DATA u16 gUnknown_02038688[4] = {0}; +EWRAM_DATA u8 gContestFinalStandings[4] = {0}; // What "place" each participant came in. +EWRAM_DATA u8 gUnknown_02038694 = 0; +EWRAM_DATA u8 gContestPlayerMonIndex = 0; +EWRAM_DATA u8 gUnknown_02038696[4] = {0}; +EWRAM_DATA u8 gIsLinkContest = 0; +EWRAM_DATA u8 gUnknown_0203869B = 0; +EWRAM_DATA u16 gSpecialVar_ContestCategory = 0; +EWRAM_DATA u16 gSpecialVar_ContestRank = 0; void nullsub_89(u8 taskId) { diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index dc8bddd5a..c56fe7576 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -70,6 +70,8 @@ static u16 sub_80EB960(void); u8 sub_80EB9C8(void); static u16 sub_80EB9D8(void); +EWRAM_DATA u8 gUnknown_020388AC = 0; + static u8 gUnknown_03000740; const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 75ca92e6a..a2660bf82 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -26,7 +26,7 @@ #include "tv.h" #include "ewram.h" -extern struct RecordMixingDayCareMail gUnknown_02038738; +EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02038738 = {0}; extern u16 gSpecialVar_0x8005; u32 gUnknown_03005D2C; diff --git a/src/engine/trade.c b/src/engine/trade.c index 3a14adaca..e49cde6cd 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -213,12 +213,14 @@ static #endif void sub_804DB84(void); -extern u8 gUnknown_020297D8[2]; -extern u8 *gUnknown_020296CC[13]; +EWRAM_DATA u8 *gUnknown_020296CC[13] = {0}; +EWRAM_DATA struct MailStruct gUnknown_02029700[6] = {0}; +EWRAM_DATA u8 gUnknown_020297D8[2] = {0}; + extern struct TradeEwramSubstruct *gUnknown_03004824; -extern struct MailStruct gUnknown_02029700[16]; -const u32 unref_data_820ABD4[] = { +const u32 unref_data_820ABD4[] = +{ 0x00000890, 0x00003AC0, 0x0000001C, diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 48d7da7f7..b6475d8ff 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -35,10 +35,11 @@ struct WeatherCallbacks bool8 (*finish)(void); }; -extern struct Weather gWeather; -extern u8 gUnknown_0202FF38[]; -extern u16 gUnknown_0202FF58; -IWRAM_DATA const u8 *gUnknown_030006DC; +EWRAM_DATA struct Weather gWeather = {0}; +EWRAM_DATA u8 gUnknown_0202FF38[32] = {0}; +EWRAM_DATA u16 gUnknown_0202FF58 = {0}; + +static const u8 *gUnknown_030006DC; const u8 DroughtPaletteData_0[] = INCBIN_U8("graphics/weather/drought0.bin.lz"); const u8 DroughtPaletteData_1[] = INCBIN_U8("graphics/weather/drought1.bin.lz"); @@ -47,9 +48,6 @@ const u8 DroughtPaletteData_3[] = INCBIN_U8("graphics/weather/drought3.bin.lz"); const u8 DroughtPaletteData_4[] = INCBIN_U8("graphics/weather/drought4.bin.lz"); const u8 DroughtPaletteData_5[] = INCBIN_U8("graphics/weather/drought5.bin.lz"); -extern u8 (*gUnknown_0202FC48)[32]; -extern u8 gUnknown_0202F9E8[32]; - static const u8 *const sCompressedDroughtPalettes[] = { DroughtPaletteData_0, diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 48275435e..32986fae9 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -101,7 +101,14 @@ static void sub_806BF24(const u8 *a, u8 monIndex, u8 c, u8 d); static void sub_806BB9C(u8 a); static void sub_806BBEC(u8 a); -const u16 TMHMMoves[] = { +EWRAM_DATA u8 gUnknown_0202E8F4 = 0; +EWRAM_DATA u8 gUnknown_0202E8F5 = 0; +EWRAM_DATA u8 gUnknown_0202E8F6 = 0; +EWRAM_DATA u16 gUnknown_0202E8F8 = 0; +EWRAM_DATA u8 gPartyMenuType = 0; + +const u16 TMHMMoves[] = +{ MOVE_FOCUS_PUNCH, MOVE_DRAGON_CLAW, MOVE_WATER_PULSE, @@ -458,10 +465,6 @@ struct Unk201FE00 extern u16 gBattleTypeFlags; extern u8 gTileBuffer[]; -extern u8 gUnknown_0202E8F4; -extern u8 gUnknown_0202E8F6; -extern u16 gUnknown_0202E8F8; -extern u8 gPartyMenuType; extern u8 gLastFieldPokeMenuOpened; extern u8 gPlayerPartyCount; extern s32 gBattleMoveDamage; diff --git a/src/field/pc_screen_effect.c b/src/field/pc_screen_effect.c index 364fca0aa..e0853e01d 100644 --- a/src/field/pc_screen_effect.c +++ b/src/field/pc_screen_effect.c @@ -30,7 +30,7 @@ extern const u16 gUnknownPal_083D18EC[16]; extern const u8 gUnknownGfx_083D190C[128]; -extern struct UnkStruct *gUnknown_020387EC; +EWRAM_DATA struct UnkStruct *gUnknown_020387EC = NULL; const struct SpriteSheet gUnknown_083D1898 = { gUnknownGfx_083D190C, sizeof(gUnknownGfx_083D190C), 0 }; diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 203b57867..728decc9c 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -51,7 +51,7 @@ static void Task_SecretBasePC_Registry(u8 taskId); extern u8 gUnknown_0815F399[]; extern u8 gUnknown_0815F49A[]; -extern u8 gUnknown_020387DC; +EWRAM_DATA u8 gUnknown_020387DC = 0; const struct { diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index bf8306fc0..7b40918e9 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -121,7 +121,6 @@ extern u8 ball_number_to_ball_processing_index(u16); extern u8 StorageSystemGetNextMonIndex(struct BoxPokemon *, u8, u8, u8); extern struct MusicPlayerInfo gMPlay_BGM; -extern u8 gUnknown_020384F0; extern u8 gUnknown_08208238[]; extern u16 gBattle_BG3_Y; extern u16 gBattle_BG2_Y; @@ -130,7 +129,6 @@ extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; extern u16 gBattle_BG3_X; extern TaskFunc gUnknown_03005CF0; -extern struct Sprite *gUnknown_020384F4; extern struct SpriteTemplate gUnknown_02024E8C; extern const u8 gStatusPal_Icons[]; @@ -157,6 +155,9 @@ extern const u16 gUnknown_08E94550[]; extern const u16 gUnknown_08E94590[]; extern const u8 gUnknown_08E73E88[]; +EWRAM_DATA u8 gUnknown_020384F0 = 0; +EWRAM_DATA struct Sprite *gUnknown_020384F4 = NULL; + #if ENGLISH #include "../data/text/move_descriptions_en.h" #include "../data/text/nature_names_en.h" diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c index f0f1264a0..7f6765ef6 100644 --- a/src/scene/intro_credits_graphics.c +++ b/src/scene/intro_credits_graphics.c @@ -301,9 +301,10 @@ const struct CompressedSpriteSheet gUnknown_08416E34[] = { }; -extern u16 gUnknown_02039358; -extern s16 gUnknown_0203935A; -extern s16 gUnknown_0203935C; +EWRAM_DATA u16 gUnknown_02039358 = 0; +EWRAM_DATA s16 gUnknown_0203935A = 0; +EWRAM_DATA s16 gUnknown_0203935C = 0; + extern u8 gReservedSpritePaletteCount; void sub_8149248(); diff --git a/sym_ewram.txt b/sym_ewram.txt index 0bb35e8c2..aeb04170d 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -296,18 +296,7 @@ gBattleMonForms: @ 2024E84 .include "src/pokemon/pokemon_1.o" .include "src/pokemon/pokemon_2.o" .include "src/engine/load_save.o" - -@ trade - -gUnknown_020296CC: @ 20296CC - .space 0x34 - -gUnknown_02029700: @ 2029700 - .space 0xD8 - -gUnknown_020297D8: @ 20297D8 - .space 0x4 - + .include "src/engine/trade.o" .include "src/scene/berry_blender.o" .include "src/scene/new_game.o" .include "src/field/overworld.o" @@ -319,25 +308,7 @@ gUnknown_020297D8: @ 20297D8 .include "src/field/scrcmd.o" .include "src/field/field_control_avatar.o" .include "src/field/event_data.o" - -@ party_menu - - .align 2 -gUnknown_0202E8F4: @ 202E8F4 - .space 0x1 - -gUnknown_0202E8F5: @ 202E8F5 - .space 0x1 - -gUnknown_0202E8F6: @ 202E8F6 - .space 0x2 - -gUnknown_0202E8F8: @ 202E8F8 - .space 0x2 - -gPartyMenuType: @ 202E8FA - .space 0x2 - + .include "src/field/party_menu.o" .include "src/field/start_menu.o" .include "src/engine/menu.o" .include "src/engine/tileset_anim.o" @@ -346,25 +317,7 @@ gPartyMenuType: @ 202E8FA .include "src/battle/battle_anim.o" .include "src/rom_8077ABC.o" .include "src/scene/title_screen.o" - -@ field_weather - - .align 2 -gWeather: @ 202F7E8 - .space 0x200 - -gUnknown_0202F9E8: @ 202F9E8 - .space 0x260 - -gUnknown_0202FC48: @ 202FC48 - .space 0x2F0 - -gUnknown_0202FF38: @ 202FF38 - .space 0x20 - -gUnknown_0202FF58: @ 202FF58 - .space 0x4 - + .include "src/field/field_weather.o" .include "src/battle/battle_setup.o" .include "src/field/wild_encounter.o" .include "src/field/field_effect.o" @@ -428,100 +381,25 @@ gUnknown_020384EA: @ 20384EA gUnknown_020384EC: @ 20384EC .space 0x4 -@ pokemon_summary_screen - -gUnknown_020384F0: @ 20384F0 - .space 0x4 - -gUnknown_020384F4: @ 20384F4 - .space 0x4 - + .include "src/pokemon/pokemon_summary_screen.o" .include "src/field/script_movement.o" .include "src/field/map_name_popup.o" .include "src/field/item_menu.o" - -@ contest - - .align 2 -gUnknown_0203856C: @ 203856C - .space 0x4 - -gContestMons: @ 2038570 - .space 0x100 - -gUnknown_02038670: @ 2038670 - .space 0x8 - -gUnknown_02038678: @ 2038678 - .space 0x8 - -gUnknown_02038680: @ 2038680 - .space 0x8 - -gUnknown_02038688: @ 2038688 - .space 0x8 - -gContestFinalStandings: @ 2038690 - .space 0x4 - -gUnknown_02038694: @ 2038694 - .space 0x1 - -gContestPlayerMonIndex: @ 2038695 - .space 0x1 - -gUnknown_02038696: @ 2038696 - .space 0x4 - -gIsLinkContest: @ 203869A - .space 0x1 - -gUnknown_0203869B: @ 203869B - .space 0x1 - -gSpecialVar_ContestCategory: @ 203869C - .space 0x2 - -gSpecialVar_ContestRank: @ 203869E - .space 0x2 - + .include "src/contest.o" .include "src/field/shop.o" .include "src/field/money.o" - -@ record_mixing - - .align 2 -gUnknown_02038738: @ 2038738 - .space 0x78 - + .include "src/engine/record_mixing.o" .include "src/debug/sound_check_menu.o" - -@ secret_base - - .align 2 -gUnknown_020387DC: @ 20387DC - .space 0x4 - -@ tv - + .include "src/field/secret_base.o" .include "src/field/tv.o" - -@ fldeff_80C5CD4 - - .align 2 -gUnknown_020387EC: @ 20387EC - .space 0x4 - + .include "src/field/pc_screen_effect.o" .include "src/field/rotating_gate.o" .include "src/field/safari_zone.o" - -@ easy_chat - -gUnknown_020388AC: @ 20388AC - .space 0x4 + .include "src/easy_chat_2.o" @ pokenav + .align 2 gUnknown_020388B0: @ 20388B0 .space 0x4 @@ -559,11 +437,7 @@ gUnknown_02039268: @ 2039268 gUnknown_0203926A: @ 203926A .space 0x2 -@ battle_message - -gAbilitiesPerBank: @ 203926C - .space 0x4 - + .include "src/battle/battle_message.o" .include "src/field/choose_party.o" .include "src/scene/cable_car.o" .include "src/engine/save.o" @@ -579,20 +453,11 @@ gAbilitiesPerBank: @ 203926C .include "src/engine/mystery_event_menu.o" .include "src/engine/save_failed_screen.o" .include "src/pokemon/pokeblock_feed.o" - -@ intro_credits_graphics - -gUnknown_02039358: @ 2039358 - .space 0x2 - -gUnknown_0203935A: @ 203935A - .space 0x2 - -gUnknown_0203935C: @ 203935C - .space 0x4 + .include "src/scene/intro_credits_graphics.o" @ ??? + .align 4 gTileBuffer: @ 2039360 .space 0x100 -- cgit v1.2.3 From 31a322fdc589c381af6ec4b4c4781d28cb394cc1 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 16 Jan 2018 19:14:14 -0500 Subject: use game stat defines --- src/battle/battle_setup.c | 36 ++++++++++++++++++------------------ src/battle/post_battle_event_funcs.c | 6 +++--- src/engine/save.c | 4 ++-- src/field/field_control_avatar.c | 2 +- src/field/field_player_avatar.c | 2 +- src/field/field_weather_effects.c | 2 +- src/field/fldeff_cut.c | 4 ++-- src/field/item_use.c | 2 +- src/field/safari_zone.c | 2 +- src/field/shop.c | 2 +- src/field/start_menu.c | 4 ++-- src/field/wild_encounter.c | 2 +- src/rom6.c | 2 +- src/scene/berry_blender.c | 4 ++-- src/scene/evolution_scene.c | 4 ++-- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index b4ff407fc..892be1029 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -520,8 +520,8 @@ static void DoStandardWildBattle(void) gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; CreateBattleStartTask(GetWildBattleTransition(), 0); - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } void BattleSetup_StartRoamerBattle(void) @@ -532,8 +532,8 @@ void BattleSetup_StartRoamerBattle(void) gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; CreateBattleStartTask(GetWildBattleTransition(), 0); - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } static void DoSafariBattle(void) @@ -549,8 +549,8 @@ static void DoSafariBattle(void) static void StartTheBattle(void) { CreateBattleStartTask(GetTrainerBattleTransition(), 0); - IncrementGameStat(7); - IncrementGameStat(9); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_TRAINER_BATTLES); } //Initiates battle where Wally catches Ralts @@ -569,8 +569,8 @@ void BattleSetup_StartScriptedWildBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = 0; CreateBattleStartTask(GetWildBattleTransition(), 0); - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } void ScrSpecial_StartSouthernIslandBattle(void) @@ -579,8 +579,8 @@ void ScrSpecial_StartSouthernIslandBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; CreateBattleStartTask(GetWildBattleTransition(), 0); - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } void ScrSpecial_StartRayquazaBattle(void) @@ -589,8 +589,8 @@ void ScrSpecial_StartRayquazaBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; CreateBattleStartTask(B_TRANSITION_BLUR, BGM_BATTLE34); - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } void ScrSpecial_StartGroudonKyogreBattle(void) @@ -602,8 +602,8 @@ void ScrSpecial_StartGroudonKyogreBattle(void) CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON else CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } void ScrSpecial_StartRegiBattle(void) @@ -612,8 +612,8 @@ void ScrSpecial_StartRegiBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE36); - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } static void CB2_EndWildBattle(void) @@ -879,8 +879,8 @@ static void CB2_StartFirstBattle(void) SetMainCallback2(sub_800E7C4); prev_quest_postbuffer_cursor_backup_reset(); overworld_poison_timer_set(); - IncrementGameStat(7); - IncrementGameStat(8); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); } } diff --git a/src/battle/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c index 0617763f6..a44cf028b 100644 --- a/src/battle/post_battle_event_funcs.c +++ b/src/battle/post_battle_event_funcs.c @@ -26,8 +26,8 @@ int GameClear(void) FlagSet(FLAG_SYS_GAME_CLEAR); } - if (!GetGameStat(1)) - SetGameStat(1, (gSaveBlock2.playTimeHours << 16) | (gSaveBlock2.playTimeMinutes << 8) | gSaveBlock2.playTimeSeconds); + if (!GetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME)) + SetGameStat(GAME_STAT_FIRST_HOF_PLAY_TIME, (gSaveBlock2.playTimeHours << 16) | (gSaveBlock2.playTimeMinutes << 8) | gSaveBlock2.playTimeSeconds); SetSecretBase2Field_9(); @@ -54,7 +54,7 @@ int GameClear(void) if (ribbonGet == TRUE) { - IncrementGameStat(42); + IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS); FlagSet(FLAG_SYS_RIBBON_GET); } diff --git a/src/engine/save.c b/src/engine/save.c index be907edcc..250b29a87 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -674,8 +674,8 @@ u8 Save_WriteDataInternal(u8 saveType) EraseFlashSector(i); // fall through case SAVE_HALL_OF_FAME: // hall of fame. - if (GetGameStat(10) < 999) - IncrementGameStat(10); + if (GetGameStat(GAME_STAT_ENTERED_HOF) < 999) + IncrementGameStat(GAME_STAT_ENTERED_HOF); for (i = 0; i < NUM_HALL_OF_FAME_SECTORS; i++) HandleWriteSectorNBytes(HALL_OF_FAME_SECTOR + i, sHallOfFameChunks[i].data, sHallOfFameChunks[i].size); SaveSerializedGame(); diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index 52e66f16e..c156df035 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -181,7 +181,7 @@ int sub_8068024(struct FieldInput *input) return TRUE; if (input->input_field_0_6) { - IncrementGameStat(5); + IncrementGameStat(GAME_STAT_STEPS); if (sub_80687E4(&position, r4, r6) == 1) return TRUE; } diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 9a29e2e92..ba45e506d 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -523,7 +523,7 @@ u8 CheckForFieldObjectCollision(struct MapObject *a, s16 x, s16 y, u8 direction, return 5; if (ShouldJumpLedge(x, y, direction)) { - IncrementGameStat(0x2B); + IncrementGameStat(GAME_STAT_JUMPED_DOWN_LEDGES); return COLLISION_LEDGE_JUMP; } if (collision == 4 && sub_8058F6C(x, y, direction)) diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c index 5a59d6c2a..7406363a5 100644 --- a/src/field/field_weather_effects.c +++ b/src/field/field_weather_effects.c @@ -2380,5 +2380,5 @@ void UpdateRainCounter(u8 newWeather, u8 oldWeather) { if (newWeather != oldWeather && (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED)) - IncrementGameStat(0x28); + IncrementGameStat(GAME_STAT_GOT_RAINED_ON); } diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c index e4328acfc..513107729 100644 --- a/src/field/fldeff_cut.c +++ b/src/field/fldeff_cut.c @@ -122,7 +122,7 @@ bool8 FldEff_UseCutOnGrass(void) gTasks[taskId].data[8] = (u32)sub_80A2684 >> 16; gTasks[taskId].data[9] = (u32)sub_80A2684; - IncrementGameStat(0x12); + IncrementGameStat(GAME_STAT_USED_CUT); return FALSE; } @@ -138,7 +138,7 @@ bool8 FldEff_UseCutOnTree(void) gTasks[taskId].data[8] = (u32)sub_80A2B00 >> 16; gTasks[taskId].data[9] = (u32)sub_80A2B00; - IncrementGameStat(0x12); + IncrementGameStat(GAME_STAT_USED_CUT); return FALSE; } diff --git a/src/field/item_use.c b/src/field/item_use.c index 55fb21814..9346cf42e 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -259,7 +259,7 @@ void ItemUseOnFieldCB_Rod(u8 taskId) void ItemUseOutOfBattle_Itemfinder(u8 var) { - IncrementGameStat(0x27); + IncrementGameStat(GAME_STAT_USED_ITEMFINDER); gFieldItemUseCallback = (void *)ItemUseOnFieldCB_Itemfinder; SetUpItemUseOnFieldCallback(var); } diff --git a/src/field/safari_zone.c b/src/field/safari_zone.c index e9ca3a9f9..6c7c8b391 100644 --- a/src/field/safari_zone.c +++ b/src/field/safari_zone.c @@ -56,7 +56,7 @@ void ResetSafariZoneFlag(void) void EnterSafariMode(void) { - IncrementGameStat(0x11); + IncrementGameStat(GAME_STAT_ENTERED_SAFARI_ZONE); SetSafariZoneFlag(); ClearAllPokeblockFeeders(); gNumSafariBalls = 30; diff --git a/src/field/shop.c b/src/field/shop.c index 5a47b033b..beed50a41 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -657,7 +657,7 @@ static void Shop_DoPremierBallCheck(u8 taskId) static void Shop_DoItemTransaction(u8 taskId) { - IncrementGameStat(0x26); + IncrementGameStat(GAME_STAT_SHOPPED); RemoveMoney(&gSaveBlock1.money, gMartTotalCost); PlaySE(SE_REGI); UpdateMoneyWindow(gSaveBlock1.money, 0, 0); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 87597eb6a..110351016 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -345,7 +345,7 @@ static u8 StartMenu_PokedexCallback(void) { if (!gPaletteFade.active) { - IncrementGameStat(0x29); + IncrementGameStat(GAME_STAT_CHECKED_POKEDEX); PlayRainSoundEffect(); SetMainCallback2(CB2_InitPokedex); return 1; @@ -666,7 +666,7 @@ static u8 SaveDialogCB_DoSave(void) { u8 saveStatus; - IncrementGameStat(0); + IncrementGameStat(GAME_STAT_SAVED_GAME); if (gDifferentSaveFile == TRUE) { saveStatus = Save_WriteData(SAVE_OVERWRITE_DIFFERENT_FILE); diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c index 4bf83cad8..79542422e 100644 --- a/src/field/wild_encounter.c +++ b/src/field/wild_encounter.c @@ -4254,7 +4254,7 @@ void FishingWildEncounter(u8 rod) gWildMonHeaders[GetCurrentMapWildMonHeader()].fishingMonsInfo, rod); } - IncrementGameStat(12); + IncrementGameStat(GAME_STAT_FISHING_CAPTURES); sub_80BEA50(species); BattleSetup_StartWildBattle(); } diff --git a/src/rom6.c b/src/rom6.c index e71484b0a..62fbc987c 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -142,7 +142,7 @@ int FldEff_RockSmash(void) gTasks[taskId].data[8] = (u32)sub_810B58C >> 16; gTasks[taskId].data[9] = (u32)sub_810B58C; - IncrementGameStat(0x13); + IncrementGameStat(GAME_STAT_USED_ROCK_SMASH); return 0; } diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index b59d02939..0a7e14e4e 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -2567,9 +2567,9 @@ static void sub_8050954(void) if (Blender_PrintBlendingResults()) { if (gInGameOpponentsNo == 0) - IncrementGameStat(34); + IncrementGameStat(GAME_STAT_POKEBLOCKS_WITH_FRIENDS); else - IncrementGameStat(33); + IncrementGameStat(GAME_STAT_POKEBLOCKS); gBerryBlenderData->field_6F++; } break; diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index 931ec0d4d..3ba325574 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -649,7 +649,7 @@ static void Task_EvolutionScene(u8 taskID) EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies); GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2); GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3); - IncrementGameStat(14); + IncrementGameStat(GAME_STAT_EVOLVED_POKEMON); } break; case 14: // check if it wants to learn a new move @@ -991,7 +991,7 @@ static void Task_TradeEvolutionScene(u8 taskID) EvolutionRenameMon(mon, gTasks[taskID].tPreEvoSpecies, gTasks[taskID].tPostEvoSpecies); GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 2); GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskID].tPostEvoSpecies), 3); - IncrementGameStat(14); + IncrementGameStat(GAME_STAT_EVOLVED_POKEMON); } break; case 13: -- cgit v1.2.3 From bd0caeee2d7b5745503394cbb9d0ea0563c995c8 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 16 Jan 2018 18:32:21 -0600 Subject: add debug target --- .travis.yml | 1 + Makefile | 5 +++-- config.mk | 7 +++++++ ruby_de_debug.sha1 | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 ruby_de_debug.sha1 diff --git a/.travis.yml b/.travis.yml index 9a196819b..27e572c75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ matrix: - make -j2 sapphire - make -j2 sapphire_rev1 - make -j2 sapphire_rev2 + - make -j2 ruby_debug_de COMPARE=0 - os: linux env: _="Formatting" addons: diff --git a/Makefile b/Makefile index 13c91f71d..21973a915 100644 --- a/Makefile +++ b/Makefile @@ -19,9 +19,9 @@ PREPROC := tools/preproc/preproc SCANINC := tools/scaninc/scaninc RAMSCRGEN := tools/ramscrgen/ramscrgen -ASFLAGS := -mcpu=arm7tdmi -I include --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym $(GAME_LANGUAGE)=1 +ASFLAGS := -mcpu=arm7tdmi -I include --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym $(GAME_LANGUAGE)=1 --defsym DEBUG=$(DEBUG) CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Wunused -Werror -O2 -fhex-asm -CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -D $(GAME_VERSION) -D REVISION=$(GAME_REVISION) -D $(GAME_LANGUAGE) +CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef -Werror -Wno-trigraphs -D $(GAME_VERSION) -D REVISION=$(GAME_REVISION) -D $(GAME_LANGUAGE) -D DEBUG=$(DEBUG) #### Files #### @@ -142,6 +142,7 @@ sapphire_rev1: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_REVISI sapphire_rev2: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_REVISION=2 ruby_de: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN sapphire_de: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN +ruby_de_debug: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1 #### Graphics Rules #### diff --git a/config.mk b/config.mk index 9f901658e..bdcf5aa7e 100644 --- a/config.mk +++ b/config.mk @@ -4,6 +4,7 @@ GAME_VERSION ?= RUBY GAME_REVISION ?= 0 GAME_LANGUAGE ?= ENGLISH +DEBUG ?= 0 COMPARE ?= 1 # Version @@ -42,3 +43,9 @@ else $(error unknown language $(GAME_LANGUAGE)) endif endif + +# Debug +ifeq ($(DEBUG), 1) + BUILD_NAME := $(BUILD_NAME)_debug +endif + diff --git a/ruby_de_debug.sha1 b/ruby_de_debug.sha1 new file mode 100644 index 000000000..4ecbf29a7 --- /dev/null +++ b/ruby_de_debug.sha1 @@ -0,0 +1 @@ +ca5e3d415c4b47353a73a616878ba833f3648b7a pokeruby_de_debug.gba -- cgit v1.2.3 From 6b5a7d8611103ab2ee0210dc6d87bd42f4e3317f Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 16 Jan 2018 18:50:41 -0600 Subject: add debug event scripts --- data-de/event_scripts.s | 529 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 529 insertions(+) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 1569e87c6..4598e9f45 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -3279,6 +3279,535 @@ PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC Route101_EventScript_1A14DC:: @ 81A14DC return +.if DEBUG + +DebugScript_081C1CFE:: @ 81C1CFE + setflag 0x804 + call 0x81C032D + end + +DebugScript_081C1D07:: @ 81C1D07 + checkitem ITEM_COIN_CASE, 1 + compare 0x800d, 1 + goto_if_eq DebugScript_081C1D1D + giveitem ITEM_COIN_CASE, 1 + end + +DebugScript_081C1D1D:: @ 81C1D1D + end + +DebugScript_081C1D1E:: @ 81C1D1E + goto 0x8167646 + +DebugScript_081C1D23:: @ 81C1D23 + end + +DebugScript_081C1D24:: @ 81C1D24 + setvar 0x40ba, 1 + end + +DebugScript_081C1D2A:: @ 81C1D2A + giveitem ITEM_SS_TICKET, 1 + goto DebugScript_081C1CFE + +DebugScript_081C1D34:: @ 81C1D34 + end + +DebugScript_081C1D35:: @ 81C1D35 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C1D45 + giveegg SPECIES_KYOGRE + end + +DebugScript_081C1D45:: @ 81C1D45 + end + +DebugScript_081C1D46:: @ 81C1D46 + giveitem ITEM_POTION, 99 + giveitem ITEM_ANTIDOTE, 99 + giveitem ITEM_BURN_HEAL, 99 + giveitem ITEM_ICE_HEAL, 99 + giveitem ITEM_AWAKENING, 99 + giveitem ITEM_PARALYZE_HEAL, 99 + giveitem ITEM_FULL_RESTORE, 99 + giveitem ITEM_MAX_POTION, 99 + giveitem ITEM_HYPER_POTION, 99 + giveitem ITEM_SUPER_POTION, 99 + giveitem ITEM_FULL_HEAL, 99 + giveitem ITEM_REVIVE, 99 + giveitem ITEM_MAX_REVIVE, 99 + giveitem ITEM_FRESH_WATER, 99 + giveitem ITEM_SODA_POP, 99 + giveitem ITEM_LEMONADE, 99 + giveitem ITEM_MOOMOO_MILK, 99 + giveitem ITEM_ENERGY_POWDER, 99 + giveitem ITEM_ENERGY_ROOT, 99 + giveitem ITEM_HEAL_POWDER, 99 + giveitem ITEM_ORANGE_MAIL, 92 + giveitem ITEM_RETRO_MAIL, 94 + giveitem ITEM_POTION, 89 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_ULTRA_BALL, 99 + giveitem ITEM_GREAT_BALL, 99 + giveitem ITEM_POKE_BALL, 99 + giveitem ITEM_NET_BALL, 99 + giveitem ITEM_DIVE_BALL, 99 + giveitem ITEM_NEST_BALL, 99 + giveitem ITEM_REPEAT_BALL, 99 + giveitem ITEM_TIMER_BALL, 99 + giveitem ITEM_LUXURY_BALL, 99 + giveitem ITEM_PREMIER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_GREAT_BALL, 79 + giveitem ITEM_ULTRA_BALL, 84 + giveitem ITEM_POKE_BALL, 89 + giveitem ITEM_MASTER_BALL, 74 + giveitem ITEM_TM01, 99 + giveitem ITEM_TM02, 99 + giveitem ITEM_TM03, 99 + giveitem ITEM_TM04, 99 + giveitem ITEM_TM05, 99 + giveitem ITEM_TM06, 99 + giveitem ITEM_TM07, 99 + giveitem ITEM_TM08, 99 + giveitem ITEM_TM09, 99 + giveitem ITEM_TM10, 99 + giveitem ITEM_TM11, 99 + giveitem ITEM_TM12, 99 + giveitem ITEM_TM13, 99 + giveitem ITEM_TM14, 99 + giveitem ITEM_TM15, 99 + giveitem ITEM_TM16, 99 + giveitem ITEM_TM17, 99 + giveitem ITEM_TM18, 99 + giveitem ITEM_TM19, 99 + giveitem ITEM_TM20, 99 + giveitem ITEM_TM21, 99 + giveitem ITEM_TM22, 99 + giveitem ITEM_TM23, 99 + giveitem ITEM_TM24, 99 + giveitem ITEM_TM25, 99 + giveitem ITEM_TM26, 99 + giveitem ITEM_TM27, 99 + giveitem ITEM_TM28, 99 + giveitem ITEM_TM29, 99 + giveitem ITEM_TM30, 99 + giveitem ITEM_TM31, 99 + giveitem ITEM_TM32, 99 + giveitem ITEM_TM33, 99 + giveitem ITEM_TM34, 99 + giveitem ITEM_TM35, 99 + giveitem ITEM_TM36, 99 + giveitem ITEM_TM37, 99 + giveitem ITEM_TM38, 99 + giveitem ITEM_TM39, 99 + giveitem ITEM_TM40, 99 + giveitem ITEM_TM41, 99 + giveitem ITEM_TM42, 99 + giveitem ITEM_TM43, 99 + giveitem ITEM_TM44, 99 + giveitem ITEM_TM45, 99 + giveitem ITEM_TM46, 99 + giveitem ITEM_TM47, 99 + giveitem ITEM_TM48, 99 + giveitem ITEM_TM49, 99 + giveitem ITEM_TM50, 99 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 199 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 199 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 199 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 199 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 199 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 199 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 199 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 199 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 199 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 199 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 199 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 199 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 199 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 199 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 199 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 199 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 199 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 199 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 199 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 199 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 199 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 199 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 199 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 199 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 199 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 199 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 199 + giveitem ITEM_MAGOST_BERRY, 999 + giveitem ITEM_RABUTA_BERRY, 999 + giveitem ITEM_NOMEL_BERRY, 999 + giveitem ITEM_SPELON_BERRY, 999 + giveitem ITEM_PAMTRE_BERRY, 999 + giveitem ITEM_WATMEL_BERRY, 999 + giveitem ITEM_DURIN_BERRY, 999 + giveitem ITEM_BELUE_BERRY, 999 + giveitem ITEM_LIECHI_BERRY, 999 + giveitem ITEM_GANLON_BERRY, 999 + giveitem ITEM_SALAC_BERRY, 999 + giveitem ITEM_PETAYA_BERRY, 999 + giveitem ITEM_APICOT_BERRY, 999 + giveitem ITEM_LANSAT_BERRY, 999 + giveitem ITEM_STARF_BERRY, 999 + giveitem ITEM_ENIGMA_BERRY, 999 + end + +DebugScript_081C221F:: @ 81C221F + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + end + +DebugScript_081C23E2:: @ 81C23E2 + givecoins 9999 + end + +DebugScript_081C23E6:: @ 81C23E6 + setflag 0x081 + setflag 0x071 + warp MAP_SOOTOPOLIS_CITY, 0xFF, 31, 33 + waitstate + end + +DebugScript_081C23F6:: @ 81C23F6 + takemoney 999999, 0x00 + end + +DebugScript_081C23FD:: @ 81C23FD + getpartysize + compare 0x800d, 1 + goto_if_eq DebugScript_081C2436 + compare 0x800d, 2 + goto_if_eq 0x81C2445 + compare 0x800d, 3 + goto_if_eq 0x81C2454 + compare 0x800d, 4 + goto_if_eq 0x81C2463 + compare 0x800d, 5 + goto_if_eq 0x81C2472 + end + +DebugScript_081C2436:: @ 81C2436 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + end + +DebugScript_081C2482:: @ 81C2482 + getpartysize + compare 0x800d, 1 + goto_if_eq 0x81C24BB + compare 0x800d, 2 + goto_if_eq 0x81C24CA + compare 0x800d, 3 + goto_if_eq 0x81C24D9 + compare 0x800d, 4 + goto_if_eq 0x81C24E8 + compare 0x800d, 5 + goto_if_eq 0x81C24F7 + end + +DebugScript_081C24BB:: @ 81C24BB + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + end + +DebugScript_081C2507:: @ 81C2507 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C2517 + giveegg SPECIES_BARBOACH + end + +DebugScript_081C2517:: @ 81C2517 + end + +DebugScript_081C2518:: @ 81C2518 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C2528 + giveegg SPECIES_SHROOMISH + end + +DebugScript_081C2528:: @ 81C2528 + end + +.endif + .include "data/scripts/berry_tree.inc" .include "data/text/berry_tree.inc" -- cgit v1.2.3 From 91cfb6a564f73f02eb57792f8a0f4aa82e1867d1 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 16 Jan 2018 22:25:35 -0600 Subject: add debug ifdefs --- data/contest_opponents.inc | 224 +- data/event_scripts.s | 1271 ++- data/field_move_scripts.inc | 74 +- data/maps/VictoryRoad_B1F/map.bin | 4 +- data/maps/VictoryRoad_B2F/map.bin | 2 +- data/strings2.s | 409 +- data/text/ability_descriptions.inc | 156 +- data/text/ability_names.inc | 146 +- data/text/aqua_awakening.inc | 136 +- data/text/aqua_chimney.inc | 187 +- data/text/aqua_settled.inc | 17 +- data/text/aqua_summit.inc | 228 +- data/text/barboach.inc | 44 +- data/text/bard.inc | 38 +- data/text/berries.inc | 307 +- data/text/berry_tree.inc | 58 +- data/text/birch_speech.inc | 79 +- data/text/braille.inc | 229 +- data/text/cable_club.inc | 198 +- data/text/contest_hall.inc | 312 +- data/text/contest_strings.inc | 704 +- data/text/day_care.inc | 140 +- data/text/easy_chat/group_name_strings.inc | 34 +- data/text/easy_chat/groups/actions/order.inc | 114 +- data/text/easy_chat/groups/actions/words.inc | 152 +- data/text/easy_chat/groups/adjectives/order.inc | 52 +- data/text/easy_chat/groups/adjectives/words.inc | 72 +- data/text/easy_chat/groups/battle/order.inc | 88 +- data/text/easy_chat/groups/battle/words.inc | 124 +- data/text/easy_chat/groups/conditions/order.inc | 100 +- data/text/easy_chat/groups/conditions/words.inc | 136 +- data/text/easy_chat/groups/endings/order.inc | 90 +- data/text/easy_chat/groups/endings/words.inc | 134 +- data/text/easy_chat/groups/events/order.inc | 26 +- data/text/easy_chat/groups/events/words.inc | 34 +- data/text/easy_chat/groups/feelings/order.inc | 102 +- data/text/easy_chat/groups/feelings/words.inc | 138 +- data/text/easy_chat/groups/greetings/order.inc | 54 +- data/text/easy_chat/groups/greetings/words.inc | 72 +- data/text/easy_chat/groups/hobbies/order.inc | 58 +- data/text/easy_chat/groups/hobbies/words.inc | 84 +- data/text/easy_chat/groups/lifestyle/order.inc | 44 +- data/text/easy_chat/groups/lifestyle/words.inc | 72 +- data/text/easy_chat/groups/misc/order.inc | 58 +- data/text/easy_chat/groups/misc/words.inc | 84 +- data/text/easy_chat/groups/move_1/order.inc | 218 +- data/text/easy_chat/groups/move_2/order.inc | 270 +- data/text/easy_chat/groups/people/order.inc | 110 +- data/text/easy_chat/groups/people/words.inc | 146 +- data/text/easy_chat/groups/pokemon/order.inc | 226 +- data/text/easy_chat/groups/pokemon_2/order.inc | 284 +- data/text/easy_chat/groups/speech/order.inc | 88 +- data/text/easy_chat/groups/speech/words.inc | 116 +- data/text/easy_chat/groups/status/order.inc | 154 +- data/text/easy_chat/groups/status/words.inc | 204 +- data/text/easy_chat/groups/time/order.inc | 58 +- data/text/easy_chat/groups/time/words.inc | 86 +- data/text/easy_chat/groups/trainer/order.inc | 10 +- data/text/easy_chat/groups/trainer/words.inc | 24 +- data/text/easy_chat/groups/trendy_saying/order.inc | 42 +- data/text/easy_chat/groups/trendy_saying/words.inc | 58 +- data/text/easy_chat/groups/voices/order.inc | 54 +- data/text/easy_chat/groups/voices/words.inc | 74 +- data/text/easy_chat/words_by_letter.inc | 2794 +++--- data/text/eon_ticket.inc | 55 +- data/text/gabby_and_ty.inc | 327 +- data/text/giddy.inc | 16 +- data/text/gift_ribbon_descriptions.inc | 92 +- data/text/hipster.inc | 25 +- data/text/landmarks.inc | 74 +- data/text/lottery_corner.inc | 97 +- data/text/magma_awakening.inc | 136 +- data/text/magma_chimney.inc | 195 +- data/text/magma_settled.inc | 17 +- data/text/magma_summit.inc | 229 +- data/text/maps/AbandonedShip_CaptainsOffice.inc | 24 +- data/text/maps/AbandonedShip_Corridors_1F.inc | 15 +- data/text/maps/AbandonedShip_Corridors_B1F.inc | 35 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 3 +- data/text/maps/AbandonedShip_HiddenFloorRooms.inc | 36 +- data/text/maps/AbandonedShip_Rooms2_1F.inc | 78 +- data/text/maps/AbandonedShip_Rooms2_B1F.inc | 8 +- data/text/maps/AbandonedShip_Rooms_1F.inc | 6 +- data/text/maps/AbandonedShip_Rooms_B1F.inc | 8 +- data/text/maps/AquaHideout_1F.inc | 70 +- data/text/maps/AquaHideout_B1F.inc | 45 +- data/text/maps/AquaHideout_B2F.inc | 71 +- data/text/maps/BattleTower_BattleRoom.inc | 16 +- data/text/maps/BattleTower_Lobby.inc | 248 +- data/text/maps/BattleTower_Outside.inc | 51 +- data/text/maps/DewfordTown.inc | 215 +- data/text/maps/DewfordTown_Gym.inc | 141 +- data/text/maps/DewfordTown_Hall.inc | 244 +- data/text/maps/DewfordTown_House1.inc | 19 +- data/text/maps/DewfordTown_House2.inc | 43 +- data/text/maps/DewfordTown_PokemonCenter_1F.inc | 15 +- data/text/maps/EverGrandeCity.inc | 12 +- data/text/maps/EverGrandeCity_ChampionsRoom.inc | 135 +- data/text/maps/EverGrandeCity_DrakesRoom.inc | 50 +- data/text/maps/EverGrandeCity_GlaciasRoom.inc | 35 +- data/text/maps/EverGrandeCity_HallOfFame.inc | 20 +- data/text/maps/EverGrandeCity_PhoebesRoom.inc | 37 +- data/text/maps/EverGrandeCity_PokemonCenter_1F.inc | 18 +- data/text/maps/EverGrandeCity_PokemonLeague.inc | 20 +- data/text/maps/EverGrandeCity_SidneysRoom.inc | 30 +- data/text/maps/FallarborTown.inc | 55 +- data/text/maps/FallarborTown_ContestHall.inc | 28 +- data/text/maps/FallarborTown_ContestLobby.inc | 34 +- data/text/maps/FallarborTown_House1.inc | 67 +- data/text/maps/FallarborTown_House2.inc | 46 +- data/text/maps/FallarborTown_Mart.inc | 23 +- data/text/maps/FallarborTown_PokemonCenter_1F.inc | 48 +- data/text/maps/FortreeCity.inc | 78 +- data/text/maps/FortreeCity_DecorationShop.inc | 19 +- data/text/maps/FortreeCity_Gym.inc | 147 +- data/text/maps/FortreeCity_House1.inc | 46 +- data/text/maps/FortreeCity_House2.inc | 60 +- data/text/maps/FortreeCity_House3.inc | 27 +- data/text/maps/FortreeCity_House4.inc | 36 +- data/text/maps/FortreeCity_House5.inc | 17 +- data/text/maps/FortreeCity_Mart.inc | 20 +- data/text/maps/FortreeCity_PokemonCenter_1F.inc | 36 +- data/text/maps/GraniteCave_1F.inc | 32 +- data/text/maps/GraniteCave_StevensRoom.inc | 50 +- data/text/maps/InsideOfTruck.inc | 6 +- data/text/maps/JaggedPass.inc | 74 +- data/text/maps/LavaridgeTown.inc | 193 +- data/text/maps/LavaridgeTown_Gym_1F.inc | 184 +- data/text/maps/LavaridgeTown_HerbShop.inc | 29 +- data/text/maps/LavaridgeTown_House.inc | 11 +- data/text/maps/LavaridgeTown_Mart.inc | 16 +- data/text/maps/LavaridgeTown_PokemonCenter_1F.inc | 25 +- data/text/maps/LilycoveCity.inc | 424 +- data/text/maps/LilycoveCity_ContestHall.inc | 282 +- data/text/maps/LilycoveCity_ContestLobby.inc | 232 +- data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc | 84 +- data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc | 66 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 36 +- data/text/maps/LilycoveCity_DepartmentStore_1F.inc | 32 +- data/text/maps/LilycoveCity_DepartmentStore_2F.inc | 17 +- data/text/maps/LilycoveCity_DepartmentStore_3F.inc | 26 +- data/text/maps/LilycoveCity_DepartmentStore_4F.inc | 25 +- data/text/maps/LilycoveCity_DepartmentStore_5F.inc | 20 +- data/text/maps/LilycoveCity_Harbor.inc | 58 +- data/text/maps/LilycoveCity_House1.inc | 8 +- data/text/maps/LilycoveCity_House2.inc | 12 +- data/text/maps/LilycoveCity_House3.inc | 110 +- data/text/maps/LilycoveCity_House4.inc | 14 +- data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc | 165 +- data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc | 148 +- data/text/maps/LilycoveCity_MoveDeletersHouse.inc | 36 +- data/text/maps/LilycoveCity_PokemonCenter_1F.inc | 37 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 350 +- data/text/maps/LittlerootTown.inc | 124 +- data/text/maps/LittlerootTown_BrendansHouse_1F.inc | 189 +- data/text/maps/LittlerootTown_BrendansHouse_2F.inc | 51 +- data/text/maps/LittlerootTown_MaysHouse_1F.inc | 46 +- data/text/maps/LittlerootTown_MaysHouse_2F.inc | 137 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 230 +- data/text/maps/MauvilleCity.inc | 240 +- data/text/maps/MauvilleCity_BikeShop.inc | 202 +- data/text/maps/MauvilleCity_GameCorner.inc | 167 +- data/text/maps/MauvilleCity_Gym.inc | 144 +- data/text/maps/MauvilleCity_House1.inc | 23 +- data/text/maps/MauvilleCity_House2.inc | 28 +- data/text/maps/MauvilleCity_Mart.inc | 22 +- data/text/maps/MauvilleCity_PokemonCenter_1F.inc | 28 +- data/text/maps/MauvilleCity_PokemonCenter_2F.inc | 13 +- data/text/maps/MeteorFalls_1F_1R.inc | 142 +- data/text/maps/MeteorFalls_1F_2R.inc | 148 +- data/text/maps/MossdeepCity.inc | 114 +- data/text/maps/MossdeepCity_GameCorner_1F.inc | 60 +- data/text/maps/MossdeepCity_Gym.inc | 227 +- data/text/maps/MossdeepCity_House1.inc | 19 +- data/text/maps/MossdeepCity_House2.inc | 17 +- data/text/maps/MossdeepCity_House3.inc | 29 +- data/text/maps/MossdeepCity_House4.inc | 21 +- data/text/maps/MossdeepCity_Mart.inc | 30 +- data/text/maps/MossdeepCity_PokemonCenter_1F.inc | 15 +- data/text/maps/MossdeepCity_PokemonCenter_2F.inc | 6 +- data/text/maps/MossdeepCity_SpaceCenter_1F.inc | 42 +- data/text/maps/MossdeepCity_SpaceCenter_2F.inc | 20 +- data/text/maps/MossdeepCity_StevensHouse.inc | 132 +- data/text/maps/MtChimney.inc | 115 +- data/text/maps/MtChimney_CableCarStation.inc | 8 +- data/text/maps/MtPyre_1F.inc | 25 +- data/text/maps/MtPyre_2F.inc | 78 +- data/text/maps/MtPyre_3F.inc | 31 +- data/text/maps/MtPyre_4F.inc | 12 +- data/text/maps/MtPyre_5F.inc | 18 +- data/text/maps/MtPyre_6F.inc | 20 +- data/text/maps/NewMauville_Entrance.inc | 8 +- data/text/maps/NewMauville_Inside.inc | 17 +- data/text/maps/OldaleTown.inc | 72 +- data/text/maps/OldaleTown_House1.inc | 12 +- data/text/maps/OldaleTown_House2.inc | 11 +- data/text/maps/OldaleTown_Mart.inc | 17 +- data/text/maps/OldaleTown_PokemonCenter_1F.inc | 31 +- data/text/maps/PacifidlogTown.inc | 25 +- data/text/maps/PacifidlogTown_House1.inc | 20 +- data/text/maps/PacifidlogTown_House2.inc | 58 +- data/text/maps/PacifidlogTown_House3.inc | 30 +- data/text/maps/PacifidlogTown_House4.inc | 29 +- data/text/maps/PacifidlogTown_House5.inc | 19 +- data/text/maps/PacifidlogTown_PokemonCenter_1F.inc | 23 +- data/text/maps/PetalburgCity.inc | 56 +- data/text/maps/PetalburgCity_Gym.inc | 569 +- data/text/maps/PetalburgCity_House1.inc | 25 +- data/text/maps/PetalburgCity_House2.inc | 17 +- data/text/maps/PetalburgCity_Mart.inc | 23 +- data/text/maps/PetalburgCity_PokemonCenter_1F.inc | 56 +- data/text/maps/PetalburgCity_WallysHouse.inc | 115 +- data/text/maps/PetalburgWoods.inc | 189 +- data/text/maps/Route101.inc | 49 +- data/text/maps/Route102.inc | 46 +- data/text/maps/Route103.inc | 86 +- data/text/maps/Route104.inc | 115 +- data/text/maps/Route104_MrBrineysHouse.inc | 98 +- data/text/maps/Route104_Prototype.inc | 118 +- .../Route104_PrototypePrettyPetalFlowerShop.inc | 10 +- data/text/maps/Route106.inc | 6 +- data/text/maps/Route109.inc | 112 +- data/text/maps/Route109_SeashoreHouse.inc | 104 +- data/text/maps/Route110.inc | 305 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 15 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 15 +- data/text/maps/Route110_TrickHouseEnd.inc | 156 +- data/text/maps/Route110_TrickHouseEntrance.inc | 143 +- data/text/maps/Route110_TrickHousePuzzle1.inc | 38 +- data/text/maps/Route110_TrickHousePuzzle2.inc | 39 +- data/text/maps/Route110_TrickHousePuzzle3.inc | 44 +- data/text/maps/Route110_TrickHousePuzzle4.inc | 41 +- data/text/maps/Route110_TrickHousePuzzle5.inc | 167 +- data/text/maps/Route110_TrickHousePuzzle6.inc | 45 +- data/text/maps/Route110_TrickHousePuzzle7.inc | 44 +- data/text/maps/Route110_TrickHousePuzzle8.inc | 34 +- data/text/maps/Route111.inc | 129 +- data/text/maps/Route111_OldLadysRestStop.inc | 24 +- data/text/maps/Route111_WinstrateFamilysHouse.inc | 70 +- data/text/maps/Route112.inc | 31 +- data/text/maps/Route112_CableCarStation.inc | 8 +- data/text/maps/Route113.inc | 34 +- data/text/maps/Route113_GlassWorkshop.inc | 116 +- data/text/maps/Route114.inc | 23 +- data/text/maps/Route114_FossilManiacsHouse.inc | 30 +- data/text/maps/Route114_FossilManiacsTunnel.inc | 42 +- data/text/maps/Route114_LanettesHouse.inc | 86 +- data/text/maps/Route115.inc | 15 +- data/text/maps/Route116.inc | 164 +- data/text/maps/Route116_TunnelersRestHouse.inc | 50 +- data/text/maps/Route117.inc | 25 +- data/text/maps/Route118.inc | 61 +- data/text/maps/Route119.inc | 137 +- data/text/maps/Route119_House.inc | 11 +- data/text/maps/Route119_WeatherInstitute_1F.inc | 67 +- data/text/maps/Route119_WeatherInstitute_2F.inc | 90 +- data/text/maps/Route120.inc | 89 +- data/text/maps/Route121.inc | 19 +- data/text/maps/Route123.inc | 27 +- data/text/maps/Route124.inc | 2 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 65 +- data/text/maps/Route128.inc | 92 +- data/text/maps/RustboroCity.inc | 242 +- data/text/maps/RustboroCity_CuttersHouse.inc | 48 +- data/text/maps/RustboroCity_DevonCorp_1F.inc | 50 +- data/text/maps/RustboroCity_DevonCorp_2F.inc | 130 +- data/text/maps/RustboroCity_DevonCorp_3F.inc | 150 +- data/text/maps/RustboroCity_Flat1_1F.inc | 6 +- data/text/maps/RustboroCity_Flat1_2F.inc | 14 +- data/text/maps/RustboroCity_Flat2_1F.inc | 6 +- data/text/maps/RustboroCity_Flat2_2F.inc | 17 +- data/text/maps/RustboroCity_Flat2_3F.inc | 8 +- data/text/maps/RustboroCity_Gym.inc | 163 +- data/text/maps/RustboroCity_House1.inc | 33 +- data/text/maps/RustboroCity_House2.inc | 12 +- data/text/maps/RustboroCity_House3.inc | 18 +- data/text/maps/RustboroCity_Mart.inc | 25 +- data/text/maps/RustboroCity_PokemonCenter_1F.inc | 24 +- data/text/maps/RustboroCity_PokemonSchool.inc | 144 +- data/text/maps/RusturfTunnel.inc | 149 +- data/text/maps/SSTidalCorridor.inc | 76 +- data/text/maps/SSTidalLowerDeck.inc | 28 +- data/text/maps/SSTidalRooms.inc | 123 +- data/text/maps/SeafloorCavern_Room1.inc | 22 +- data/text/maps/SeafloorCavern_Room3.inc | 35 +- data/text/maps/SeafloorCavern_Room4.inc | 11 +- data/text/maps/SecretBase_RedCave1.inc | 3 +- data/text/maps/ShoalCave_LowTideLowerRoom.inc | 14 +- data/text/maps/SlateportCity.inc | 409 +- data/text/maps/SlateportCity_ContestHall.inc | 158 +- data/text/maps/SlateportCity_ContestLobby.inc | 38 +- data/text/maps/SlateportCity_Harbor.inc | 204 +- data/text/maps/SlateportCity_House1.inc | 60 +- data/text/maps/SlateportCity_House2.inc | 23 +- data/text/maps/SlateportCity_Mart.inc | 16 +- data/text/maps/SlateportCity_OceanicMuseum_1F.inc | 215 +- data/text/maps/SlateportCity_OceanicMuseum_2F.inc | 256 +- data/text/maps/SlateportCity_PokemonCenter_1F.inc | 21 +- data/text/maps/SlateportCity_PokemonFanClub.inc | 187 +- data/text/maps/SlateportCity_SternsShipyard_1F.inc | 119 +- data/text/maps/SlateportCity_SternsShipyard_2F.inc | 27 +- data/text/maps/SootopolisCity.inc | 307 +- data/text/maps/SootopolisCity_Gym_1F.inc | 242 +- data/text/maps/SootopolisCity_House1.inc | 12 +- data/text/maps/SootopolisCity_House2.inc | 16 +- data/text/maps/SootopolisCity_House3.inc | 27 +- data/text/maps/SootopolisCity_House4.inc | 21 +- data/text/maps/SootopolisCity_House5.inc | 11 +- data/text/maps/SootopolisCity_House6.inc | 21 +- data/text/maps/SootopolisCity_House7.inc | 22 +- data/text/maps/SootopolisCity_House8.inc | 125 +- data/text/maps/SootopolisCity_Mart.inc | 20 +- data/text/maps/SootopolisCity_PokemonCenter_1F.inc | 35 +- data/text/maps/Underwater_SeafloorCavern.inc | 12 +- data/text/maps/VerdanturfTown.inc | 91 +- data/text/maps/VerdanturfTown_ContestHall.inc | 39 +- data/text/maps/VerdanturfTown_ContestLobby.inc | 45 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 40 +- data/text/maps/VerdanturfTown_House.inc | 20 +- data/text/maps/VerdanturfTown_Mart.inc | 25 +- data/text/maps/VerdanturfTown_PokemonCenter_1F.inc | 13 +- data/text/maps/VerdanturfTown_WandasHouse.inc | 121 +- data/text/maps/VictoryRoad_1F.inc | 85 +- data/text/maps/VictoryRoad_B1F.inc | 38 +- data/text/maps/VictoryRoad_B2F.inc | 53 +- data/text/move_names.inc | 686 +- data/text/mystery_event_club.inc | 100 +- data/text/pokeblocks.inc | 140 +- data/text/pokedex_rating.inc | 114 +- data/text/pokemon_news.inc | 242 +- data/text/ribbon_descriptions.inc | 38 +- data/text/roulette.inc | 51 +- data/text/safari_zone.inc | 217 +- data/text/save.inc | 28 +- data/text/secret_power_tm.inc | 56 +- data/text/shoal_cave.inc | 67 +- data/text/species_names.inc | 550 +- data/text/storyteller.inc | 640 +- data/text/surf.inc | 6 +- data/text/trader.inc | 62 +- data/text/trainer_class_names.inc | 100 +- data/text/trainer_eye_descriptions.inc | 552 +- data/text/trainers.inc | 3502 +++---- data/text/tv.inc | 1529 +-- data/text/type_names.inc | 32 +- data/tilesets/primary/general/tiles.png | Bin 7443 -> 7438 bytes data/tilesets/secondary/shop/metatiles.bin | Bin 4480 -> 4480 bytes data/tilesets/secondary/shop/tiles.png | Bin 3817 -> 3835 bytes data/trainers.inc | 1246 +-- de_after.sh | 1 + graphics/battle_interface/hpbar.png | Bin 217 -> 222 bytes graphics/battle_interface/status2.png | Bin 198 -> 199 bytes graphics/battle_interface/status3.png | Bin 199 -> 200 bytes graphics/battle_interface/status4.png | Bin 197 -> 198 bytes graphics/battle_interface/status_brn.png | Bin 176 -> 174 bytes graphics/battle_interface/status_frz.png | Bin 176 -> 175 bytes graphics/battle_interface/status_psn.png | Bin 176 -> 175 bytes graphics/battle_interface/status_slp.png | Bin 177 -> 176 bytes graphics/battle_interface/window.png | Bin 360 -> 357 bytes graphics/berry_blender/outer.png | Bin 1880 -> 1879 bytes graphics/contest/applause.png | Bin 287 -> 289 bytes graphics/contest/contest_words.bin | Bin 512 -> 576 bytes graphics/contest/misc.png | Bin 1735 -> 1774 bytes graphics/contest/misc_2.png | Bin 2853 -> 2048 bytes graphics/contest/misc_2_tilemap_2.bin | Bin 2048 -> 2048 bytes graphics/contest/nextturn.png | Bin 199 -> 193 bytes graphics/contest/nextturn_numbers.png | Bin 200 -> 198 bytes graphics/contest/nextturn_random.png | Bin 161 -> 162 bytes graphics/fonts/font3_lat.png | Bin 3689 -> 3649 bytes graphics/fonts/font4_lat.4bpp.bin | Bin 0 -> 7040 bytes graphics/interface/bag_screen.png | Bin 1634 -> 1547 bytes graphics/interface/berry_tag.bin | Bin 2048 -> 2048 bytes graphics/interface/check_berry.png | Bin 1134 -> 890 bytes graphics/interface/money.png | Bin 201 -> 202 bytes graphics/interface/outline_cursor_00.png | Bin 75 -> 78 bytes graphics/interface/outline_cursor_01.png | Bin 115 -> 122 bytes graphics/interface/outline_cursor_02.png | Bin 115 -> 122 bytes graphics/interface/outline_cursor_03.png | Bin 115 -> 122 bytes graphics/interface/outline_cursor_04.png | Bin 115 -> 122 bytes graphics/interface/outline_cursor_05.png | Bin 115 -> 122 bytes graphics/interface/outline_cursor_06.png | Bin 115 -> 122 bytes graphics/interface/outline_cursor_07.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_08.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_09.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_10.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_11.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_12.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_13.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_14.png | Bin 114 -> 122 bytes graphics/interface/outline_cursor_15.png | Bin 112 -> 118 bytes graphics/interface/party_menu_hpbar.png | Bin 220 -> 222 bytes graphics/interface/party_menu_misc.png | Bin 546 -> 561 bytes graphics/interface/party_menu_ordertext.png | Bin 758 -> 764 bytes graphics/interface/pokeblock_case_frame.png | Bin 720 -> 532 bytes graphics/interface/pokemon_info.bin | Bin 2048 -> 2048 bytes graphics/interface/status_icons.png | Bin 449 -> 442 bytes graphics/interface/status_screen.bin | Bin 2048 -> 2048 bytes graphics/interface/status_screen.png | Bin 2011 -> 1540 bytes graphics/interface/status_screen_battle_moves.bin | Bin 2048 -> 2048 bytes graphics/interface/status_screen_contest_moves.bin | Bin 2048 -> 2048 bytes .../interface/status_screen_pokemon_skills.bin | Bin 2048 -> 2048 bytes graphics/interface/wordgroup_frame.png | Bin 705 -> 804 bytes graphics/interface/wordgroup_indicator.png | Bin 558 -> 491 bytes graphics/interface/wordgroup_layout.bin | Bin 1280 -> 1280 bytes graphics/intro/copyright.bin | Bin 1280 -> 1280 bytes graphics/intro/copyright.png | Bin 567 -> 597 bytes graphics/misc/clock.png | Bin 1308 -> 1352 bytes graphics/misc/condition_up_down.png | Bin 234 -> 246 bytes graphics/misc/end_copyright.png | Bin 983 -> 1005 bytes graphics/misc/hof.png | Bin 422 -> 435 bytes graphics/misc/interview_outline_cursor.png | Bin 186 -> 187 bytes graphics/misc/trainer_card.png | Bin 1583 -> 1417 bytes graphics/misc/wallclock_edit.bin | Bin 1280 -> 1280 bytes graphics/misc/wallclock_view.bin | Bin 1280 -> 1280 bytes graphics/naming_screen/back_button.png | Bin 301 -> 299 bytes graphics/naming_screen/lower_text.png | Bin 183 -> 183 bytes graphics/naming_screen/menu.png | Bin 541 -> 485 bytes graphics/naming_screen/ok_button.png | Bin 277 -> 278 bytes graphics/naming_screen/others_text.png | Bin 186 -> 180 bytes graphics/naming_screen/upper_text.png | Bin 183 -> 188 bytes graphics/pokedex/area_unknown.png | Bin 393 -> 378 bytes graphics/pokedex/cry_meter.png | Bin 673 -> 619 bytes graphics/pokedex/cry_meter_map.bin | Bin 160 -> 512 bytes graphics/pokedex/menu.png | Bin 2798 -> 2494 bytes graphics/pokedex/menu2.png | Bin 963 -> 898 bytes graphics/pokedex/menu3.pal | 6 +- graphics/pokedex/menu_search.png | Bin 1222 -> 1054 bytes graphics/pokedex/noball.png | Bin 189 -> 193 bytes graphics/pokedex/pokedex_detail_layout.bin | Bin 1280 -> 1280 bytes graphics/pokedex/pokedex_list_menu.bin | Bin 768 -> 768 bytes graphics/pokedex/pokedex_listing_menu.bin | Bin 768 -> 768 bytes graphics/pokedex/pokedex_navbar.bin | Bin 192 -> 192 bytes graphics/pokedex/pokedex_navbar_3.bin | Bin 192 -> 192 bytes graphics/pokemon_storage/header.png | Bin 498 -> 502 bytes graphics/pokemon_storage/misc1.png | Bin 799 -> 734 bytes graphics/pokenav/bottom_toolbar.bin | Bin 512 -> 512 bytes graphics/pokenav/condition_cancel.png | Bin 182 -> 183 bytes graphics/pokenav/condition_menu.png | Bin 557 -> 553 bytes graphics/pokenav/condition_menu_header.png | Bin 290 -> 280 bytes graphics/pokenav/condition_menu_misc.png | Bin 373 -> 430 bytes graphics/pokenav/condition_menu_options.png | Bin 539 -> 553 bytes graphics/pokenav/condition_menu_options2.png | Bin 397 -> 511 bytes graphics/pokenav/condition_screen.bin | 2 +- graphics/pokenav/condition_search_beauty.png | Bin 261 -> 291 bytes graphics/pokenav/condition_search_cancel.png | Bin 264 -> 281 bytes graphics/pokenav/condition_search_cool.png | Bin 223 -> 273 bytes graphics/pokenav/condition_search_cute.png | Bin 239 -> 238 bytes graphics/pokenav/condition_search_smart.png | Bin 256 -> 264 bytes graphics/pokenav/condition_search_tough.png | Bin 240 -> 280 bytes graphics/pokenav/condition_view.png | Bin 1419 -> 1687 bytes graphics/pokenav/mainmenu.png | Bin 300 -> 298 bytes graphics/pokenav/map_header.png | Bin 471 -> 470 bytes graphics/pokenav/map_misc2.png | Bin 1180 -> 1252 bytes graphics/pokenav/map_squares.png | Bin 692 -> 746 bytes graphics/pokenav/menu_condition.png | Bin 299 -> 298 bytes graphics/pokenav/menu_eyes.png | Bin 365 -> 283 bytes graphics/pokenav/menu_hoennmap.png | Bin 308 -> 335 bytes graphics/pokenav/menu_off.png | Bin 320 -> 334 bytes graphics/pokenav/menu_ribbons.png | Bin 298 -> 294 bytes graphics/pokenav/ribbons.png | Bin 278 -> 283 bytes graphics/pokenav/trainereyes.png | Bin 361 -> 265 bytes graphics/roulette/credit.png | Bin 325 -> 330 bytes graphics/slot_machine/slots.png | Bin 2382 -> 2417 bytes graphics/slot_machine/slots_layout.bin | Bin 1280 -> 1280 bytes graphics/summary_screen/text.png | Bin 223 -> 225 bytes graphics/title_screen/logo_ruby.pal | 272 +- graphics/title_screen/logo_sapphire.pal | 354 +- graphics/title_screen/pokemon_ruby.png | Bin 4666 -> 4565 bytes graphics/title_screen/pokemon_sapphire.png | Bin 4558 -> 4558 bytes graphics/title_screen/press_start.png | Bin 455 -> 493 bytes graphics/title_screen/rubyversion.png | Bin 1915 -> 2160 bytes graphics/title_screen/sapphireversion.png | Bin 2199 -> 2321 bytes graphics/trade/menu.png | Bin 539 -> 583 bytes graphics/types/bug.png | Bin 205 -> 229 bytes graphics/types/contest_beauty.png | Bin 224 -> 226 bytes graphics/types/contest_cool.png | Bin 212 -> 215 bytes graphics/types/contest_cute.png | Bin 216 -> 218 bytes graphics/types/contest_smart.png | Bin 223 -> 215 bytes graphics/types/contest_tough.png | Bin 217 -> 241 bytes graphics/types/dark.png | Bin 219 -> 203 bytes graphics/types/dragon.png | Bin 223 -> 205 bytes graphics/types/electric.png | Bin 227 -> 220 bytes graphics/types/fight.png | Bin 227 -> 229 bytes graphics/types/fire.png | Bin 216 -> 222 bytes graphics/types/flying.png | Bin 230 -> 214 bytes graphics/types/ghost.png | Bin 232 -> 231 bytes graphics/types/grass.png | Bin 229 -> 208 bytes graphics/types/ground.png | Bin 231 -> 227 bytes graphics/types/ice.png | Bin 207 -> 210 bytes graphics/types/poison.png | Bin 236 -> 218 bytes graphics/types/psychic.png | Bin 234 -> 234 bytes graphics/types/rock.png | Bin 220 -> 226 bytes graphics/types/steel.png | Bin 223 -> 219 bytes graphics/types/water.png | Bin 218 -> 231 bytes graphics/unknown/unknown_E953D0.bin | Bin 1152 -> 1152 bytes graphics/unknown/unknown_E9ABB4.bin | 2 +- graphics/unused/old_charmap.bin | Bin 4096 -> 4096 bytes graphics/unused/old_charmap.png | Bin 1934 -> 1873 bytes include/cable_club.h | 3 + include/clock.h | 1 + include/constants/decorations.h | 2 + include/debug.h | 1 + include/overworld.h | 2 + override.mk | 25 + src/battle/battle_2.c | 7964 ++++++++++++++++ src/battle/battle_ai.c | 209 + src/battle/battle_interface.c | 669 +- src/battle/battle_records.c | 29 +- src/debug/kagaya_debug_menu.c | 420 + src/debug/nakamura_debug_menu.c | 5031 ++++++++++ src/debug/nohara_debug_menu.c | 2316 +++++ src/debug/taya_debug_window.c | 2122 +++++ src/debug/tomomichi_debug_menu.c | 8643 +++++++++++++++++ src/debug/watanabe_debug_menu.c | 9846 ++++++++++++++++++++ src/engine/cable_club.c | 4 + src/engine/clock.c | 3 +- src/engine/link.c | 141 + src/engine/rtc.c | 29 + src/engine/save.c | 77 + src/engine/sprite.c | 14 + src/engine/task.c | 10 +- src/engine/trainer_card.c | 97 +- src/field/berry.c | 521 ++ src/field/bike.c | 21 + src/field/choose_party.c | 101 + src/field/decoration_inventory.c | 11 + src/field/field_control_avatar.c | 472 +- src/field/field_map_obj.c | 515 + src/field/field_player_avatar.c | 100 +- src/field/mauville_man.c | 81 + src/field/overworld.c | 95 + src/field/party_menu.c | 14 +- src/field/pokeblock.c | 46 +- src/field/roamer.c | 19 + src/field/slot_machine.c | 1237 ++- src/field/start_menu.c | 303 + src/field/wild_encounter.c | 31 + src/pokemon/mail.c | 1866 +++- src/pokemon/pokemon_1.c | 322 + src/rom3.c | 14 + src/rom6.c | 18 +- src/roulette.c | 5 +- src/scene/cable_car.c | 218 + src/scene/new_game.c | 77 + src/scene/title_screen.c | 17 + sym_ewram.txt | 2 + 546 files changed, 65195 insertions(+), 20122 deletions(-) create mode 100644 src/debug/kagaya_debug_menu.c create mode 100644 src/debug/nakamura_debug_menu.c create mode 100644 src/debug/nohara_debug_menu.c create mode 100644 src/debug/taya_debug_window.c create mode 100644 src/debug/tomomichi_debug_menu.c create mode 100644 src/debug/watanabe_debug_menu.c diff --git a/data/contest_opponents.inc b/data/contest_opponents.inc index 8c9c76f1b..1bdf7027e 100644 --- a/data/contest_opponents.inc +++ b/data/contest_opponents.inc @@ -1,7 +1,7 @@ .align 2 gContestOpponents:: @ 83C9408 .2byte 286 @ SPECIES_ID - .string "POOCHY$", 11 @ POKE_NICKNAME + .string "FIFFI$", 11 @ POKE_NICKNAME .string "JIMMY$", 8 @ TRAINER_NAME .byte 7 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -12,8 +12,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 288 @ SPECIES_ID - .string "ZIGOON$", 11 @ POKE_NICKNAME - .string "EDITH$", 8 @ TRAINER_NAME + .string "ZIGGY$", 11 @ POKE_NICKNAME + .string "KLARA$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x82000fff @ FLAGS @@ -23,8 +23,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 294 @ SPECIES_ID - .string "DUSTER$", 11 @ POKE_NICKNAME - .string "EVAN$", 8 @ TRAINER_NAME + .string "DOXU$", 11 @ POKE_NICKNAME + .string "KARLO$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x21000fff @ FLAGS @@ -34,8 +34,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 298 @ SPECIES_ID - .string "DOTS$", 11 @ POKE_NICKNAME - .string "KELSEY$", 8 @ TRAINER_NAME + .string "SAMINI$", 11 @ POKE_NICKNAME + .string "TRUDI$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x20800fff @ FLAGS @@ -45,8 +45,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 304 @ SPECIES_ID - .string "TATAY$", 11 @ POKE_NICKNAME - .string "MADISON$", 8 @ TRAINER_NAME + .string "SCHWALBI$", 11 @ POKE_NICKNAME + .string "HELENA$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80400fff @ FLAGS @@ -56,8 +56,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 301 @ SPECIES_ID - .string "NINDA$", 11 @ POKE_NICKNAME - .string "RAYMOND$", 8 @ TRAINER_NAME + .string "CADINJA$", 11 @ POKE_NICKNAME + .string "WILLI$", 8 @ TRAINER_NAME .byte 44 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x10200fff @ FLAGS @@ -67,8 +67,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 306 @ SPECIES_ID - .string "SMISH$", 11 @ POKE_NICKNAME - .string "GRANT$", 8 @ TRAINER_NAME + .string "KNILZLI$", 11 @ POKE_NICKNAME + .string "HARTMUT$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x20100fff @ FLAGS @@ -78,8 +78,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 309 @ SPECIES_ID - .string "GULWEE$", 11 @ POKE_NICKNAME - .string "PAIGE$", 8 @ TRAINER_NAME + .string "WINGI$", 11 @ POKE_NICKNAME + .string "CLAUDIA$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08080fff @ FLAGS @@ -89,7 +89,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 364 @ SPECIES_ID - .string "SLOKTH$", 11 @ POKE_NICKNAME + .string "BLUMPI$", 11 @ POKE_NICKNAME .string "ALEC$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -100,8 +100,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 370 @ SPECIES_ID - .string "WHIRIS$", 11 @ POKE_NICKNAME - .string "SYDNEY$", 8 @ TRAINER_NAME + .string "FLURMI$", 11 @ POKE_NICKNAME + .string "SILKE$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -112,7 +112,7 @@ gContestOpponents:: @ 83C9408 .2byte 335 @ SPECIES_ID .string "MAHITA$", 11 @ POKE_NICKNAME - .string "MORRIS$", 8 @ TRAINER_NAME + .string "PEER$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08010fff @ FLAGS @@ -122,8 +122,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 382 @ SPECIES_ID - .string "RONAR$", 11 @ POKE_NICKNAME - .string "MARIAH$", 8 @ TRAINER_NAME + .string "STOLLI$", 11 @ POKE_NICKNAME + .string "MARIA$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08008fff @ FLAGS @@ -133,8 +133,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 41 @ SPECIES_ID - .string "ZUTZU$", 11 @ POKE_NICKNAME - .string "RUSSELL$", 8 @ TRAINER_NAME + .string "BLUTBAT$", 11 @ POKE_NICKNAME + .string "RUDOLF$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x90004fff @ FLAGS @@ -144,7 +144,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 367 @ SPECIES_ID - .string "GULIN$", 11 @ POKE_NICKNAME + .string "SCHLUPPI$", 11 @ POKE_NICKNAME .string "MELANIE$", 8 @ TRAINER_NAME .byte 6 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -155,8 +155,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 337 @ SPECIES_ID - .string "RIKELEC$", 11 @ POKE_NICKNAME - .string "CHANCE$", 8 @ TRAINER_NAME + .string "FRIZZZEL$", 11 @ POKE_NICKNAME + .string "BERTRAM$", 8 @ TRAINER_NAME .byte 15 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80001fff @ FLAGS @@ -166,7 +166,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 363 @ SPECIES_ID - .string "RELIA$", 11 @ POKE_NICKNAME + .string "ROSALI$", 11 @ POKE_NICKNAME .string "KARINA$", 8 @ TRAINER_NAME .byte 32 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -177,7 +177,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 84 @ SPECIES_ID - .string "DUODO$", 11 @ POKE_NICKNAME + .string "DOLDI$", 11 @ POKE_NICKNAME .string "BOBBY$", 8 @ TRAINER_NAME .byte 51 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -188,8 +188,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 332 @ SPECIES_ID - .string "PINCHIN$", 11 @ POKE_NICKNAME - .string "CLAIRE$", 8 @ TRAINER_NAME + .string "KNACKI$", 11 @ POKE_NICKNAME + .string "JUDITH$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x81000fff @ FLAGS @@ -199,8 +199,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 344 @ SPECIES_ID - .string "NACAC$", 11 @ POKE_NICKNAME - .string "WILLIE$", 8 @ TRAINER_NAME + .string "KOTUS$", 11 @ POKE_NICKNAME + .string "HELMUT$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80800fff @ FLAGS @@ -210,8 +210,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 27 @ SPECIES_ID - .string "SHRAND$", 11 @ POKE_NICKNAME - .string "CASSIDY$", 8 @ TRAINER_NAME + .string "SADAN$", 11 @ POKE_NICKNAME + .string "BRITTA$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x10400fff @ FLAGS @@ -221,8 +221,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 318 @ SPECIES_ID - .string "TOYBAL$", 11 @ POKE_NICKNAME - .string "MORGAN$", 8 @ TRAINER_NAME + .string "PUPPIBAL$", 11 @ POKE_NICKNAME + .string "TORBEN$", 8 @ TRAINER_NAME .byte 44 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08200fff @ FLAGS @@ -232,8 +232,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 339 @ SPECIES_ID - .string "LENUM$", 11 @ POKE_NICKNAME - .string "SUMMER$", 8 @ TRAINER_NAME + .string "CLAMAUK$", 11 @ POKE_NICKNAME + .string "BIANKA$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x10100fff @ FLAGS @@ -243,8 +243,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 308 @ SPECIES_ID - .string "SPININ$", 11 @ POKE_NICKNAME - .string "MILES$", 8 @ TRAINER_NAME + .string "SPIRRWIRR$", 11 @ POKE_NICKNAME + .string "ALEX$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80080fff @ FLAGS @@ -254,8 +254,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 358 @ SPECIES_ID - .string "SWABY$", 11 @ POKE_NICKNAME - .string "AUDREY$", 8 @ TRAINER_NAME + .string "BLUPPF$", 11 @ POKE_NICKNAME + .string "SABINE$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0xa0040fff @ FLAGS @@ -265,8 +265,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 289 @ SPECIES_ID - .string "NOONE$", 11 @ POKE_NICKNAME - .string "AVERY$", 8 @ TRAINER_NAME + .string "DAKSIRAD$", 11 @ POKE_NICKNAME + .string "AUGUST$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -276,7 +276,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 317 @ SPECIES_ID - .string "KECON$", 11 @ POKE_NICKNAME + .string "KECLI$", 11 @ POKE_NICKNAME .string "ARIANA$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -287,8 +287,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 118 @ SPECIES_ID - .string "GOLDEN$", 11 @ POKE_NICKNAME - .string "ASHTON$", 8 @ TRAINER_NAME + .string "GOLDINCHEN$", 11 @ POKE_NICKNAME + .string "TONI$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80008fff @ FLAGS @@ -298,8 +298,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 323 @ SPECIES_ID - .string "BOBOACH$", 11 @ POKE_NICKNAME - .string "SANDRA$", 8 @ TRAINER_NAME + .string "SCHMERBSE$", 11 @ POKE_NICKNAME + .string "SUSI$", 8 @ TRAINER_NAME .byte 6 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80004fff @ FLAGS @@ -309,8 +309,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 227 @ SPECIES_ID - .string "CORPY$", 11 @ POKE_NICKNAME - .string "CARSON$", 8 @ TRAINER_NAME + .string "KREBSILI$", 11 @ POKE_NICKNAME + .string "CLEMENS$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08002fff @ FLAGS @@ -320,8 +320,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 295 @ SPECIES_ID - .string "TADO$", 11 @ POKE_NICKNAME - .string "KATRINA$", 8 @ TRAINER_NAME + .string "URLOTZO$", 11 @ POKE_NICKNAME + .string "KATRIN$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08001fff @ FLAGS @@ -331,8 +331,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 383 @ SPECIES_ID - .string "LAIRN$", 11 @ POKE_NICKNAME - .string "RONNIE$", 8 @ TRAINER_NAME + .string "STROLLAK$", 11 @ POKE_NICKNAME + .string "ACHIM$", 8 @ TRAINER_NAME .byte 55 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x84000fff @ FLAGS @@ -342,8 +342,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 299 @ SPECIES_ID - .string "NUZLE$", 11 @ POKE_NICKNAME - .string "CLAUDIA$", 8 @ TRAINER_NAME + .string "BLASNI$", 11 @ POKE_NICKNAME + .string "GABI$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x82000fff @ FLAGS @@ -353,8 +353,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 302 @ SPECIES_ID - .string "NINAS$", 11 @ POKE_NICKNAME - .string "ELIAS$", 8 @ TRAINER_NAME + .string "ASKINJA$", 11 @ POKE_NICKNAME + .string "ROLF$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x81000fff @ FLAGS @@ -364,8 +364,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 305 @ SPECIES_ID - .string "WELOW$", 11 @ POKE_NICKNAME - .string "JADE$", 8 @ TRAINER_NAME + .string "SCHWALLO$", 11 @ POKE_NICKNAME + .string "ELSE$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80800fff @ FLAGS @@ -375,8 +375,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 287 @ SPECIES_ID - .string "YENA$", 11 @ POKE_NICKNAME - .string "FRANCIS$", 8 @ TRAINER_NAME + .string "JÄNAGI$", 11 @ POKE_NICKNAME + .string "FRANK$", 8 @ TRAINER_NAME .byte 44 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80400fff @ FLAGS @@ -386,8 +386,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 292 @ SPECIES_ID - .string "TIFLY$", 11 @ POKE_NICKNAME - .string "ALISHA$", 8 @ TRAINER_NAME + .string "PAPINILLI$", 11 @ POKE_NICKNAME + .string "ANNA$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80200fff @ FLAGS @@ -397,8 +397,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 119 @ SPECIES_ID - .string "KINGSEA$", 11 @ POKE_NICKNAME - .string "SAUL$", 8 @ TRAINER_NAME + .string "KINGOLA$", 11 @ POKE_NICKNAME + .string "KONRAD$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80100fff @ FLAGS @@ -408,8 +408,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 340 @ SPECIES_ID - .string "ERUPAM$", 11 @ POKE_NICKNAME - .string "FELICIA$", 8 @ TRAINER_NAME + .string "ERUPTAM$", 11 @ POKE_NICKNAME + .string "LUISE$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80080fff @ FLAGS @@ -419,8 +419,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 66 @ SPECIES_ID - .string "CHOPAM$", 11 @ POKE_NICKNAME - .string "EMILIO$", 8 @ TRAINER_NAME + .string "OLLOMA$", 11 @ POKE_NICKNAME + .string "MICHAEL$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80040fff @ FLAGS @@ -430,8 +430,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 296 @ SPECIES_ID - .string "LOMBE$", 11 @ POKE_NICKNAME - .string "KARLA$", 8 @ TRAINER_NAME + .string "OMBRE$", 11 @ POKE_NICKNAME + .string "ANIKA$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -441,8 +441,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 379 @ SPECIES_ID - .string "VIPES$", 11 @ POKE_NICKNAME - .string "DARRYL$", 8 @ TRAINER_NAME + .string "PITISVI$", 11 @ POKE_NICKNAME + .string "DETLEF$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80010fff @ FLAGS @@ -452,8 +452,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 313 @ SPECIES_ID - .string "MERAIL$", 11 @ POKE_NICKNAME - .string "SELENA$", 8 @ TRAINER_NAME + .string "WAILA$", 11 @ POKE_NICKNAME + .string "XENIA$", 8 @ TRAINER_NAME .byte 22 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80008fff @ FLAGS @@ -463,8 +463,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 129 @ SPECIES_ID - .string "KARPAG$", 11 @ POKE_NICKNAME - .string "NOEL$", 8 @ TRAINER_NAME + .string "KARDORPA$", 11 @ POKE_NICKNAME + .string "FLORIAN$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80004fff @ FLAGS @@ -474,8 +474,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 348 @ SPECIES_ID - .string "LUNONE$", 11 @ POKE_NICKNAME - .string "LACEY$", 8 @ TRAINER_NAME + .string "LUNA$", 11 @ POKE_NICKNAME + .string "DIANA$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80002fff @ FLAGS @@ -485,8 +485,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 310 @ SPECIES_ID - .string "PELIPE$", 11 @ POKE_NICKNAME - .string "CORBIN$", 8 @ TRAINER_NAME + .string "PEPE$", 11 @ POKE_NICKNAME + .string "LUTZ$", 8 @ TRAINER_NAME .byte 39 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80001fff @ FLAGS @@ -496,8 +496,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 130 @ SPECIES_ID - .string "RADOS$", 11 @ POKE_NICKNAME - .string "JUSTINA$", 8 @ TRAINER_NAME + .string "GARADI$", 11 @ POKE_NICKNAME + .string "JASMIN$", 8 @ TRAINER_NAME .byte 32 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x84000fff @ FLAGS @@ -507,8 +507,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 371 @ SPECIES_ID - .string "LOUDERD$", 11 @ POKE_NICKNAME - .string "RALPH$", 8 @ TRAINER_NAME + .string "KRAKEEL$", 11 @ POKE_NICKNAME + .string "GERT$", 8 @ TRAINER_NAME .byte 21 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x82000fff @ FLAGS @@ -518,7 +518,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 316 @ SPECIES_ID - .string "CATTED$", 11 @ POKE_NICKNAME + .string "ENEKOTO$", 11 @ POKE_NICKNAME .string "ROSA$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -529,8 +529,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 366 @ SPECIES_ID - .string "SLING$", 11 @ POKE_NICKNAME - .string "KEATON$", 8 @ TRAINER_NAME + .string "ASSIMAX$", 11 @ POKE_NICKNAME + .string "KURT$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80800fff @ FLAGS @@ -540,8 +540,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 359 @ SPECIES_ID - .string "TARIA$", 11 @ POKE_NICKNAME - .string "MAYRA$", 8 @ TRAINER_NAME + .string "RIA$", 11 @ POKE_NICKNAME + .string "SONJA$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80400fff @ FLAGS @@ -551,8 +551,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 393 @ SPECIES_ID - .string "SHEDJA$", 11 @ POKE_NICKNAME - .string "LAMAR$", 8 @ TRAINER_NAME + .string "EXUVINJA$", 11 @ POKE_NICKNAME + .string "SÖNKE$", 8 @ TRAINER_NAME .byte 15 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80200fff @ FLAGS @@ -562,8 +562,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 45 @ SPECIES_ID - .string "PLUMILE$", 11 @ POKE_NICKNAME - .string "AUBREY$", 8 @ TRAINER_NAME + .string "BLUMIEFT$", 11 @ POKE_NICKNAME + .string "MAGDA$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80100fff @ FLAGS @@ -573,8 +573,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 361 @ SPECIES_ID - .string "KULLUSK$", 11 @ POKE_NICKNAME - .string "NIGEL$", 8 @ TRAINER_NAME + .string "WANDELBOLD$", 11 @ POKE_NICKNAME + .string "SASCHA$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80080fff @ FLAGS @@ -584,8 +584,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 178 @ SPECIES_ID - .string "UTAN$", 11 @ POKE_NICKNAME - .string "CAMILLE$", 8 @ TRAINER_NAME + .string "TUMANI$", 11 @ POKE_NICKNAME + .string "MILA$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80040fff @ FLAGS @@ -595,8 +595,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 331 @ SPECIES_ID - .string "PEDOS$", 11 @ POKE_NICKNAME - .string "DEON$", 8 @ TRAINER_NAME + .string "HAITODO$", 11 @ POKE_NICKNAME + .string "KNUT$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -606,8 +606,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 325 @ SPECIES_ID - .string "LUVIS$", 11 @ POKE_NICKNAME - .string "JANELLE$", 8 @ TRAINER_NAME + .string "KUSSLIEB$", 11 @ POKE_NICKNAME + .string "INCA$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80010fff @ FLAGS @@ -617,8 +617,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 214 @ SPECIES_ID - .string "HEROSS$", 11 @ POKE_NICKNAME - .string "HEATH$", 8 @ TRAINER_NAME + .string "SKARAB$", 11 @ POKE_NICKNAME + .string "FELIX$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80008fff @ FLAGS @@ -628,8 +628,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 101 @ SPECIES_ID - .string "RODLECT$", 11 @ POKE_NICKNAME - .string "SASHA$", 8 @ TRAINER_NAME + .string "LEKBAL$", 11 @ POKE_NICKNAME + .string "DEBORA$", 8 @ TRAINER_NAME .byte 6 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80004fff @ FLAGS @@ -639,8 +639,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 172 @ SPECIES_ID - .string "CHUPY$", 11 @ POKE_NICKNAME - .string "FRANKIE$", 8 @ TRAINER_NAME + .string "DEIBEL$", 11 @ POKE_NICKNAME + .string "BORIS$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80002fff @ FLAGS @@ -650,8 +650,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 202 @ SPECIES_ID - .string "WOBET$", 11 @ POKE_NICKNAME - .string "HELEN$", 8 @ TRAINER_NAME + .string "WOHINGENAU$", 11 @ POKE_NICKNAME + .string "DELIA$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80001fff @ FLAGS diff --git a/data/event_scripts.s b/data/event_scripts.s index 3b25ceab4..4598e9f45 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -863,19 +863,20 @@ EventScript_15F573: .include "data/text/maps/Route110_TrickHouseEntrance.inc" Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8 - .string "{PLAYER} found a scroll.$" + .string "{PLAYER} findet eine Schriftrolle.$" Route110_TrickHousePuzzle1_Text_19C1CB:: @ 819C1CB - .string "{PLAYER} memorized the secret code\n" - .string "written on the scroll.$" + .string "{PLAYER} lernt den geheimen Code, der\n" + .string "auf der Schriftrolle steht, auswendig.$" Route110_TrickHousePuzzle1_Text_19C1FF:: @ 819C1FF - .string "A secret code is written on it.$" + .string "Dort steht ein geheimer Code.$" UnknownString_819C21F: @ 819C21F - .string "The door is locked.\p" - .string "...On closer inspection, this is written\n" - .string "on it: “Write the secret code here.”$" + .string "Die Tür ist verschlossen.\p" + .string "Bei näherer Betrachtung findet sich\n" + .string "ein Hinweis. “Schreibe hier den\l" + .string "geheimen Code auf.”$" .include "data/text/maps/Route110_TrickHouseEnd.inc" .include "data/text/maps/Route110_TrickHousePuzzle1.inc" @@ -928,6 +929,11 @@ Std_5: @ 819F805 return +S_DoSaveDialog:: @ 819F806 +S_DoSaveDialog:: @ 819F806 +S_DoSaveDialog:: @ 819F806 +S_DoSaveDialog:: @ 819F806 +S_DoSaveDialog:: @ 819F806 S_DoSaveDialog:: @ 819F806 special ScrSpecial_DoSaveDialog waitstate @@ -1433,12 +1439,12 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO compare RESULT, YES - goto_if_eq do_heal_party + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FD7C compare RESULT, NO - goto_if_eq dont_heal_party + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDC7 end -do_heal_party:: @ 819FD7C +OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage @@ -1462,7 +1468,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 waitmessage return -dont_heal_party:: @ 819FDC7 +OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7 message gText_NurseJoy_WeHopeToSeeYouAgain waitmessage return @@ -2933,74 +2939,72 @@ BlueprintScript:: @ 81A0891 end SampleMessage1:: @ 81A089A - .string "This is sample message 1.\p" - .string "Welcome to the world of\n" + .string "Dies ist Beispiel 1.\p" + .string "Willkommen in der Welt von\n" .string "POKéMON AGB!\l" - .string "We hope you enjoy this!$" + .string "Wir hoffen, dir gefällt es hier!$" SampleMessage2:: @ 81A08F1 - .string "This is sample message 2.\p" - .string "Welcome to the world of\n" + .string "Dies ist Beispiel 2.\p" + .string "Willkommen in der Welt von\n" .string "POKéMON AGB!\l" - .string "We hope you enjoy this!$" + .string "Wir hoffen, dir gefällt es hier!$" SampleMessage3:: @ 81A0948 - .string "This is sample message 3.\p" - .string "Welcome to the world of\n" + .string "Dies ist Beispiel 3.\p" + .string "Willkommen in der Welt von\n" .string "POKéMON AGB!\l" - .string "We hope you enjoy this!$" + .string "Wir hoffen, dir gefällt es hier!$" UnusedMixRecordsPromptText: @ 81A099F - .string "Would you like to mix records with other\n" - .string "TRAINERS?$" + .string "Möchtest du deine Rekorde mit\n" + .string "anderen TRAINERN austauschen?$" UnusedMixRecordsSeeYouAgainText: @ 81A09D2 - .string "We hope to see you again!$" + .string "Komm bald wieder!$" UnknownString_81A09EC: @ 81A09EC - .string "{PLAYER} booted up the PC.$" + .string "{PLAYER} schaltet den PC ein.$" gPCText_WhichPCShouldBeAccessed:: @ 81A0A01 - .string "Which PC should be accessed?$" + .string "Zugriff auf wessen PC?$" UnknownString_81A0A1E: @ 81A0A1E - .string "Accessed someone’s PC.$" + .string "Verbindung zu jemandes PC hergestellt.$" UnknownString_81A0A35: @ 81A0A35 - .string "POKéMON Storage System opened.$" + .string "POKéMON-Lagerungs-System geöffnet.$" UnknownString_81A0A54: @ 81A0A54 - .string "Accessed {PLAYER}’s PC.$" + .string "Verbindung mit PC von {PLAYER}.$" UnknownString_81A0A66: @ 81A0A66 - .string "Accessed LANETTE’s PC.$" + .string "Verbindung zu LANETTES PC hergestellt.$" gText_NurseJoy_Welcome:: @ 81A0A7D - .string "Hello, and welcome to the POKéMON\n" - .string "CENTER.\p" - .string "We restore your tired POKéMON to\n" - .string "full health.\p" - .string "Would you like to rest your POKéMON?$" + .string "Willkommen im POKéMON-CENTER!\p" + .string "Wir heilen deine POKéMON und\n" + .string "machen sie wieder fit.\p" + .string "O.K. Wir benötigen deine POKéMON.$" gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA - .string "We hope to see you again!$" + .string "Komm jederzeit wieder vorbei!$" gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 - .string "Thank you for waiting.\p" - .string "We’ve restored your POKéMON to\n" - .string "full health.$" + .string "Danke!\p" + .string "Deine POKéMON sind wieder topfit!$" UnknownString_81A0B57: @ 81A0B57 - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "TRADE CENTER.$" + .string "Willkommen im POKéMON KABEL-CLUB-\n" + .string "HANDELSCENTER.$" UnknownString_81A0B87: @ 81A0B87 - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "COLOSSEUM.$" + .string "Willkommen im POKéMON KABEL-CLUB-\n" + .string "KOLOSSEUM.$" UnknownString_81A0BB4: @ 81A0BB4 - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "TIME CAPSULE.$" + .string "Willkommen in der POKéMON KABEL-CLUB-\n" + .string "ZEITKAPSEL.$" EverGrandeCity_PokemonLeague_Text_1A0BE4:: @ 81A0BE4 FallarborTown_Mart_Text_1A0BE4:: @ 81A0BE4 @@ -3021,8 +3025,8 @@ SlateportCity_Mart_Text_1A0BE4:: @ 81A0BE4 SlateportCity_Text_1A0BE4:: @ 81A0BE4 SootopolisCity_Mart_Text_1A0BE4:: @ 81A0BE4 VerdanturfTown_Mart_Text_1A0BE4:: @ 81A0BE4 - .string "Welcome!\p" - .string "How may I serve you?$" + .string "Willkommen!\p" + .string "Kann ich dir helfen?$" EverGrandeCity_PokemonLeague_Text_1A0C02:: @ 81A0C02 FallarborTown_Mart_Text_1A0C02:: @ 81A0C02 @@ -3045,29 +3049,29 @@ SlateportCity_Mart_Text_1A0C02:: @ 81A0C02 SlateportCity_Text_1A0C02:: @ 81A0C02 SootopolisCity_Mart_Text_1A0C02:: @ 81A0C02 VerdanturfTown_Mart_Text_1A0C02:: @ 81A0C02 - .string "Please come again!$" + .string "Bitte komm bald wieder!$" UnknownString_81A0C15: @ 81A0C15 - .string "Welcome!\p" - .string "We’re having a discount sale today!$" + .string "Willkommen!\p" + .string "Wir bieten heute Sonderangebote an!$" Route104_PrettyPetalFlowerShop_Text_1A0C42:: @ 81A0C42 - .string "{PLAYER}{KUN}, welcome!\p" - .string "What can I do for you?$" + .string "{PLAYER}{KUN}, willkommen!\p" + .string "Wie kann ich dir behilflich sein?$" Message_ObtainedItem: @ 81A0C68 - .string "Obtained the {STR_VAR_2}.$" + .string "{STR_VAR_2} erhalten!$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C79:: @ 81A0C79 - .string "The BAG is full...$" + .string "Der BEUTEL ist voll...$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C:: @ 81A0C8C -Message_PutAwayItem: - .string "{PLAYER} put away the {STR_VAR_2}\n" - .string "in the {STR_VAR_3} POCKET.$" +Message_PutAwayItem: @ 81A0C8C + .string "{PLAYER} packt {STR_VAR_2} in die\n" + .string "{STR_VAR_3}-TASCHE.$" -Message_FoundOneItem: - .string "{PLAYER} found one {STR_VAR_2}!$" +Message_FoundOneItem: @ 81A0CB1 + .string "{PLAYER} hat {STR_VAR_2} gefunden!$" MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2 MauvilleCity_Text_1A0CC2:: @ 81A0CC2 @@ -3075,169 +3079,175 @@ MtChimney_Text_1A0CC2:: @ 81A0CC2 OldaleTown_Text_1A0CC2:: @ 81A0CC2 Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2 Message_BagFull: - .string "Too bad!\n" - .string "The BAG is full...$" + .string "Zu schade!\n" + .string "Der BEUTEL ist voll...$" Message_ObtainedDecoration: @ 81A0CDE - .string "Obtained the {STR_VAR_2}.$" + .string "{STR_VAR_2} erhalten.$" BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF Route114_LanettesHouse_Text_1A0CEF:: @ 81A0CEF SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF - .string "Too bad! There’s no room left for\n" - .string "another {STR_VAR_2}...$" + .string "Zu schade! Es ist kein Platz für\n" + .string "{STR_VAR_2}...$" Message_TransferredToPC: @ 81A0D1F - .string "The {STR_VAR_2} was transferred\n" - .string "to the PC.$" + .string "{STR_VAR_2} wurde auf den PC\n" + .string "übertragen.$" PetalburgCity_Text_1A0D41:: @ 81A0D41 - .string "“Selected items for your convenience!”\n" - .string "POKéMON MART$" + .string "“Ausgewählte Items für Ihren\n" + .string "Gebrauch!”\l" + .string "POKéMON-SUPERMARKT$" PetalburgCity_Text_1A0D75:: @ 81A0D75 - .string "“Rejuvenate your tired partners!”\n" - .string "POKéMON CENTER$" + .string "“Erfrische deine müden Partner!”\n" + .string "POKéMON-CENTER$" UnknownString_81A0DA6: @ 81A0DA6 - .string "Fufufu...$" + .string "Hahaha...$" UnknownString_81A0DB0: @ 81A0DB0 - .string "Mumble, mumble...$" + .string "Murmel... Murmel...$" UnknownString_81A0DC2: @ 81A0DC2 .string "Oh!$" UnknownString_81A0DC6: @ 81A0DC6 - .string "Closed today!$" + .string "Heute geschlossen!$" UnknownString_81A0DD4: @ 81A0DD4 - .string "You like the {STR_VAR_3}-type POKéMON\n" - .string "{STR_VAR_1}?$" + .string "Magst du {STR_VAR_3}-POKéMON, {STR_VAR_1}?$" UnknownString_81A0DF5: @ 81A0DF5 - .string "It contains a POKéMON!$" + .string "Er enthält ein POKéMON.$" UnknownString_81A0E0C: @ 81A0E0C - .string "We’re making preparations.$" + .string "Wir treffen Vorbereitungen.$" UnknownString_81A0E27: @ 81A0E27 - .string "I’m a pseudo-GYM LEADER for\n" - .string "interviews.$" + .string "Ich bin ein Pseudo-ARENALEITER für\n" + .string "Interviews.$" UnknownString_81A0E4F: @ 81A0E4F - .string "Ready for a test battle.$" + .string "Bereit für einen Testkampf.$" UnknownString_81A0E68: @ 81A0E68 - .string "{STR_VAR_1} might like this program.\n" + .string "{STR_VAR_1} würde dieses Programm gefallen.\p" .string "... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...\p" - .string "Better get going!$" + .string "Ich beeile mich besser!$" UnknownString_81A0ED6: @ 81A0ED6 - .string "What should I do for fun today?$" + .string "Womit soll ich mir die Zeit vertreiben?$" LilycoveCity_DepartmentStoreElevator_Text_1A0EF6:: @ 81A0EF6 - .string "Welcome to LILYCOVE DEPARTMENT STORE.\p" - .string "Which floor would you like?$" + .string "Willkommen im SEEGRASULB CITY\n" + .string "EINKAUFSZENTRUM.\p" + .string "In welches Stockwerk möchtest du?$" UnknownString_81A0F38: @ 81A0F38 - .string "Warp to BATTLE TOWER.$" + .string "Zum DUELLTURM warpen.$" UnknownString_81A0F4E: @ 81A0F4E - .string "Warp to LILYCOVE.$" + .string "Nach SEEGRASULB CITY warpen.$" UnknownString_81A0F60: @ 81A0F60 - .string "The time is {STR_VAR_1}!$" + .string "Es ist {STR_VAR_1} Uhr.$" UnknownString_81A0F70: @ 81A0F70 - .string "The HALL OF FAME will be accessed.$" + .string "Zugang zur RUHMESHALLE genehmigt.$" Route111_Text_1A0F93:: @ 81A0F93 - .string "The sandstorm is vicious.\n" - .string "It’s impossible to keep going.$" + .string "Der Sandsturm ist zu stark.\n" + .string "Dagegen kann man nicht angehen!$" Text_NoRegisteredItem: @ 81A0FCC - .string "An item in the BAG can be registered\n" - .string "on SELECT for convenience.$" + .string "Ein Basis-Item aus dem BEUTEL kann auf\n" + .string "SELECT gelegt werden. Sehr praktisch!$" LittlerootTown_BrendansHouse_2F_Text_1A100C:: @ 81A100C LittlerootTown_MaysHouse_2F_Text_1A100C:: @ 81A100C - .string "There’s an e-mail from POKéMON TRAINER\n" - .string "SCHOOL.\p" + .string "Da ist eine E-Mail von der POKéMON\n" + .string "TRAINERSCHULE.\p" .string "... ... ... ... ... ...\p" - .string "A POKéMON may learn up to four moves.\p" - .string "A TRAINER’s expertise is tested on the\n" - .string "move sets chosen for POKéMON.\p" + .string "Ein POKéMON kann bis zu vier Attacken\n" + .string "lernen.\p" + .string "Die Fähigkeiten eines TRAINERS werden\n" + .string "durch die Attacken, die er seinen\l" + .string "POKéMON beibringt, erprobt.\p" .string "... ... ... ... ... ...$" LittlerootTown_BrendansHouse_2F_Text_1A10D6:: @ 81A10D6 LittlerootTown_MaysHouse_2F_Text_1A10D6:: @ 81A10D6 - .string "{PLAYER} booted up the PC.$" + .string "{PLAYER} schaltet den PC ein.$" FallarborTown_ContestLobby_Text_1A10EB:: @ 81A10EB - .string "The link was canceled.$" + .string "Die Verbindung wurde abgebrochen.$" MossdeepCity_StevensHouse_Text_1A1102:: @ 81A1102 RustboroCity_DevonCorp_2F_Text_1A1102:: @ 81A1102 - .string "Want to give a nickname to the\n" - .string "{STR_VAR_2} you received?$" + .string "Möchtest du {STR_VAR_2} einen\n" + .string "Kosenamen geben?$" fieldPoisonText_PokemonFainted:: @ 81A1132 - .string "{STR_VAR_1} fainted...\p$" + .string "{STR_VAR_1} wurde besiegt...\p" + .string "$" UnknownString_81A1141: @ 81A1141 - .string "{PLAYER} is out of useable POKéMON!\p" - .string "{PLAYER} whited out!$" + .string "{PLAYER} hat kein kampffähiges POKéMON\n" + .string "mehr!\p" + .string "{PLAYER} wird ohnmächtig!$" SlateportCity_Text_1A116E:: @ 81A116E - .string "Do you know the TM SECRET POWER?\p" - .string "Our group, we love the TM SECRET\n" - .string "POWER.\p" - .string "One of our members will give it to you.\n" - .string "Come back and show me if you get it.\p" - .string "We’ll accept you as a member and sell\n" - .string "you good stuff in secrecy.$" + .string "Kennst du die TM GEHEIMPOWER?\p" + .string "In unserer Gruppe mögen alle die TM\n" + .string "GEHEIMPOWER.\p" + .string "Eines unserer Mitglieder wird sie dir\n" + .string "geben. Sag mir, wenn du sie hast.\p" + .string "Wir werden dich dann als Mitglied auf-\n" + .string "nehmen und dir unter der Hand tolle\l" + .string "Sachen verkaufen.$" gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245 - .string "Okay, I’ll take your POKéMON for a\n" - .string "few seconds.$" + .string "Okay, ich nehme deine POKéMON für einen\n" + .string "Moment in meine Obhut.$" gText_NurseJoy_Pokerus:: @ 81A1275 - .string "Your POKéMON may be infected with\n" - .string "POKéRUS.\p" - .string "Little is known about the POKéRUS\n" - .string "except that they are microscopic life-\l" - .string "forms that attach to POKéMON.\p" - .string "While infected, POKéMON are said to\n" - .string "grow exceptionally well.$" + .string "Dein POKéMON scheint von dem\n" + .string "POKéRUS befallen zu sein.\p" + .string "Über den POKéRUS ist bisher wenig be-\n" + .string "kannt, außer dass es Mikroorganismen\l" + .string "sind, die POKéMON befallen.\p" + .string "Sind deine POKéMON infiziert, wachsen\n" + .string "sie besonders gut.$" .include "data/text/surf.inc" SealedChamber_InnerRoom_Text_1A138B:: @ 81A138B - .string "It sounded as if a door opened\n" - .string "somewhere far away.$" + .string "Das hörte sich an, als würde irgendwo\n" + .string "eine Tür geöffnet.$" AncientTomb_Text_1A13BE:: @ 81A13BE DesertRuins_Text_1A13BE:: @ 81A13BE IslandCave_Text_1A13BE:: @ 81A13BE SealedChamber_OuterRoom_Text_1A13BE:: @ 81A13BE - .string "There is a big hole in the wall.$" + .string "In der Wand ist ein großes Loch.$" OldaleTown_PokemonCenter_2F_Text_1A13DF:: @ 81A13DF - .string "I’m terribly sorry. The COLOSSEUM\n" - .string "is undergoing adjustments.$" + .string "Tut mir schrecklich Leid. Das KOLOSSEUM\n" + .string "wird gerade renoviert.$" OldaleTown_PokemonCenter_2F_Text_1A141C:: @ 81A141C - .string "I’m terribly sorry. The TRADE CENTER\n" - .string "is undergoing inspections.$" + .string "Tut mir schrecklich Leid. Das\n" + .string "HANDELSCENTER wird gerade renoviert.$" OldaleTown_PokemonCenter_2F_Text_1A145C:: @ 81A145C - .string "I’m terribly sorry. The RECORD CORNER\n" - .string "is under preparation.$" + .string "Tut mir schrecklich Leid. Hier wird\n" + .string "für den STATISTIKTAUSCH renoviert.$" FallarborTown_House1_Text_1A1498:: @ 81A1498 - .string "{PLAYER} handed over the\n" + .string "{PLAYER} übergibt\n" .string "{STR_VAR_1}.$" Event_NoRegisteredItem:: @ 81A14AF @@ -3269,325 +3279,865 @@ PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC Route101_EventScript_1A14DC:: @ 81A14DC return +.if DEBUG + +DebugScript_081C1CFE:: @ 81C1CFE + setflag 0x804 + call 0x81C032D + end + +DebugScript_081C1D07:: @ 81C1D07 + checkitem ITEM_COIN_CASE, 1 + compare 0x800d, 1 + goto_if_eq DebugScript_081C1D1D + giveitem ITEM_COIN_CASE, 1 + end + +DebugScript_081C1D1D:: @ 81C1D1D + end + +DebugScript_081C1D1E:: @ 81C1D1E + goto 0x8167646 + +DebugScript_081C1D23:: @ 81C1D23 + end + +DebugScript_081C1D24:: @ 81C1D24 + setvar 0x40ba, 1 + end + +DebugScript_081C1D2A:: @ 81C1D2A + giveitem ITEM_SS_TICKET, 1 + goto DebugScript_081C1CFE + +DebugScript_081C1D34:: @ 81C1D34 + end + +DebugScript_081C1D35:: @ 81C1D35 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C1D45 + giveegg SPECIES_KYOGRE + end + +DebugScript_081C1D45:: @ 81C1D45 + end + +DebugScript_081C1D46:: @ 81C1D46 + giveitem ITEM_POTION, 99 + giveitem ITEM_ANTIDOTE, 99 + giveitem ITEM_BURN_HEAL, 99 + giveitem ITEM_ICE_HEAL, 99 + giveitem ITEM_AWAKENING, 99 + giveitem ITEM_PARALYZE_HEAL, 99 + giveitem ITEM_FULL_RESTORE, 99 + giveitem ITEM_MAX_POTION, 99 + giveitem ITEM_HYPER_POTION, 99 + giveitem ITEM_SUPER_POTION, 99 + giveitem ITEM_FULL_HEAL, 99 + giveitem ITEM_REVIVE, 99 + giveitem ITEM_MAX_REVIVE, 99 + giveitem ITEM_FRESH_WATER, 99 + giveitem ITEM_SODA_POP, 99 + giveitem ITEM_LEMONADE, 99 + giveitem ITEM_MOOMOO_MILK, 99 + giveitem ITEM_ENERGY_POWDER, 99 + giveitem ITEM_ENERGY_ROOT, 99 + giveitem ITEM_HEAL_POWDER, 99 + giveitem ITEM_ORANGE_MAIL, 92 + giveitem ITEM_RETRO_MAIL, 94 + giveitem ITEM_POTION, 89 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_ULTRA_BALL, 99 + giveitem ITEM_GREAT_BALL, 99 + giveitem ITEM_POKE_BALL, 99 + giveitem ITEM_NET_BALL, 99 + giveitem ITEM_DIVE_BALL, 99 + giveitem ITEM_NEST_BALL, 99 + giveitem ITEM_REPEAT_BALL, 99 + giveitem ITEM_TIMER_BALL, 99 + giveitem ITEM_LUXURY_BALL, 99 + giveitem ITEM_PREMIER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_GREAT_BALL, 79 + giveitem ITEM_ULTRA_BALL, 84 + giveitem ITEM_POKE_BALL, 89 + giveitem ITEM_MASTER_BALL, 74 + giveitem ITEM_TM01, 99 + giveitem ITEM_TM02, 99 + giveitem ITEM_TM03, 99 + giveitem ITEM_TM04, 99 + giveitem ITEM_TM05, 99 + giveitem ITEM_TM06, 99 + giveitem ITEM_TM07, 99 + giveitem ITEM_TM08, 99 + giveitem ITEM_TM09, 99 + giveitem ITEM_TM10, 99 + giveitem ITEM_TM11, 99 + giveitem ITEM_TM12, 99 + giveitem ITEM_TM13, 99 + giveitem ITEM_TM14, 99 + giveitem ITEM_TM15, 99 + giveitem ITEM_TM16, 99 + giveitem ITEM_TM17, 99 + giveitem ITEM_TM18, 99 + giveitem ITEM_TM19, 99 + giveitem ITEM_TM20, 99 + giveitem ITEM_TM21, 99 + giveitem ITEM_TM22, 99 + giveitem ITEM_TM23, 99 + giveitem ITEM_TM24, 99 + giveitem ITEM_TM25, 99 + giveitem ITEM_TM26, 99 + giveitem ITEM_TM27, 99 + giveitem ITEM_TM28, 99 + giveitem ITEM_TM29, 99 + giveitem ITEM_TM30, 99 + giveitem ITEM_TM31, 99 + giveitem ITEM_TM32, 99 + giveitem ITEM_TM33, 99 + giveitem ITEM_TM34, 99 + giveitem ITEM_TM35, 99 + giveitem ITEM_TM36, 99 + giveitem ITEM_TM37, 99 + giveitem ITEM_TM38, 99 + giveitem ITEM_TM39, 99 + giveitem ITEM_TM40, 99 + giveitem ITEM_TM41, 99 + giveitem ITEM_TM42, 99 + giveitem ITEM_TM43, 99 + giveitem ITEM_TM44, 99 + giveitem ITEM_TM45, 99 + giveitem ITEM_TM46, 99 + giveitem ITEM_TM47, 99 + giveitem ITEM_TM48, 99 + giveitem ITEM_TM49, 99 + giveitem ITEM_TM50, 99 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 199 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 199 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 199 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 199 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 199 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 199 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 199 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 199 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 199 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 199 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 199 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 199 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 199 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 199 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 199 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 199 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 199 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 199 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 199 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 199 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 199 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 199 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 199 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 199 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 199 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 199 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 199 + giveitem ITEM_MAGOST_BERRY, 999 + giveitem ITEM_RABUTA_BERRY, 999 + giveitem ITEM_NOMEL_BERRY, 999 + giveitem ITEM_SPELON_BERRY, 999 + giveitem ITEM_PAMTRE_BERRY, 999 + giveitem ITEM_WATMEL_BERRY, 999 + giveitem ITEM_DURIN_BERRY, 999 + giveitem ITEM_BELUE_BERRY, 999 + giveitem ITEM_LIECHI_BERRY, 999 + giveitem ITEM_GANLON_BERRY, 999 + giveitem ITEM_SALAC_BERRY, 999 + giveitem ITEM_PETAYA_BERRY, 999 + giveitem ITEM_APICOT_BERRY, 999 + giveitem ITEM_LANSAT_BERRY, 999 + giveitem ITEM_STARF_BERRY, 999 + giveitem ITEM_ENIGMA_BERRY, 999 + end + +DebugScript_081C221F:: @ 81C221F + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + end + +DebugScript_081C23E2:: @ 81C23E2 + givecoins 9999 + end + +DebugScript_081C23E6:: @ 81C23E6 + setflag 0x081 + setflag 0x071 + warp MAP_SOOTOPOLIS_CITY, 0xFF, 31, 33 + waitstate + end + +DebugScript_081C23F6:: @ 81C23F6 + takemoney 999999, 0x00 + end + +DebugScript_081C23FD:: @ 81C23FD + getpartysize + compare 0x800d, 1 + goto_if_eq DebugScript_081C2436 + compare 0x800d, 2 + goto_if_eq 0x81C2445 + compare 0x800d, 3 + goto_if_eq 0x81C2454 + compare 0x800d, 4 + goto_if_eq 0x81C2463 + compare 0x800d, 5 + goto_if_eq 0x81C2472 + end + +DebugScript_081C2436:: @ 81C2436 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + end + +DebugScript_081C2482:: @ 81C2482 + getpartysize + compare 0x800d, 1 + goto_if_eq 0x81C24BB + compare 0x800d, 2 + goto_if_eq 0x81C24CA + compare 0x800d, 3 + goto_if_eq 0x81C24D9 + compare 0x800d, 4 + goto_if_eq 0x81C24E8 + compare 0x800d, 5 + goto_if_eq 0x81C24F7 + end + +DebugScript_081C24BB:: @ 81C24BB + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + end + +DebugScript_081C2507:: @ 81C2507 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C2517 + giveegg SPECIES_BARBOACH + end + +DebugScript_081C2517:: @ 81C2517 + end + +DebugScript_081C2518:: @ 81C2518 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C2528 + giveegg SPECIES_SHROOMISH + end + +DebugScript_081C2528:: @ 81C2528 + end + +.endif + .include "data/scripts/berry_tree.inc" .include "data/text/berry_tree.inc" UnknownString_81A1948: @ 81A1948 - .string "If some vines drop down, this tree can\n" - .string "be climbed.$" + .string "Wenn einige Äste herunterhängen, kann\n" + .string "man auf den Baum klettern.$" UnknownString_81A197B: @ 81A197B - .string "If some vines drop down, this tree can\n" - .string "be climbed.\p" - .string "Use the SECRET POWER?$" + .string "Wenn einige Äste herunterhängen, kann\n" + .string "man auf den Baum klettern.\p" + .string "Möchtest du GEHEIMPOWER einsetzen?$" UnknownString_81A19C4: @ 81A19C4 - .string "A thick vine dropped down!$" + .string "Ein dicker Ast fällt herunter!$" UnknownString_81A19DF: @ 81A19DF - .string "Want to make your SECRET BASE here?$" + .string "Möchtest du hier deine GEHEIMBASIS\n" + .string "einrichten?$" UnknownString_81A1A03: @ 81A1A03 - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.$" + .string "Dieser Busch kann bewegt werden,\n" + .string "so dass man hineinklettern kann.$" UnknownString_81A1A4B: @ 81A1A4B - .string "If this clump of grass can be moved,\n" - .string "it might be possible to go inside.\p" - .string "Use the SECRET POWER?$" + .string "Dieser Busch kann bewegt werden,\n" + .string "so dass man hineinklettern kann.\p" + .string "Möchtest du GEHEIMPOWER einsetzen?$" UnknownString_81A1AA9: @ 81A1AA9 - .string "Discovered a small entrance!$" + .string "Ein kleiner Eingang wird sichtbar.$" UnknownString_81A1AC6: @ 81A1AC6 - .string "Want to make your SECRET BASE here?$" + .string "Möchtest du hier deine GEHEIMBASIS\n" + .string "einrichten?$" SecretBase_RedCave1_Text_1A1AEA:: @ 81A1AEA - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Since you’re already here, how would\n" - .string "you like to battle?$" + .string "Hast du dir schon eine GEHEIMBASIS\n" + .string "eingerichtet?\p" + .string "Ich bin hier und dort, überall hin-\n" + .string "gelaufen, bevor ich mich für diesen\l" + .string "Ort entschieden habe.\p" + .string "Da du schon mal hier bist... Hast du\n" + .string "Lust zu kämpfen?$" SecretBase_RedCave1_Text_1A1B83:: @ 81A1B83 .string "Okay!\n" - .string "Here we come!$" + .string "Jetzt kommen wir!$" SecretBase_RedCave1_Text_1A1B97:: @ 81A1B97 - .string "Hunh?\n" - .string "Oh, you can’t now...$" + .string "Wie? Was? Wo?\n" + .string "Du kannst doch nicht...$" UnknownString_81A1BB2:: @ 81A1BB2 - .string "Waaargh! You’re too strong!\n" - .string "About me losing... Please keep it secret!$" + .string "Ahaaargh! Du bist zu stark für mich! Ich\n" + .string "habe verloren, aber verrate das nicht!$" SecretBase_RedCave1_Text_1A1BF8:: @ 81A1BF8 - .string "What do you think of my SECRET BASE?\n" - .string "Come visit me again tomorrow.$" + .string "Was hältst du von meiner GEHEIMBASIS?\n" + .string "Komm mich doch morgen wieder besuchen!$" SecretBase_RedCave1_Text_1A1C3B:: @ 81A1C3B - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Feel free to hang out!$" + .string "Hast du dir schon eine GEHEIMBASIS\n" + .string "eingerichtet?\p" + .string "Ich bin hier und dort, überall hin-\n" + .string "gelaufen, bevor ich mich für diesen\l" + .string "Ort entschieden habe.\p" + .string "Schau dich ruhig in aller Ruhe um.$" SecretBase_RedCave1_Text_1A1CB2:: @ 81A1CB2 - .string "There’re a lot of places where you can\n" - .string "make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don’t you think it’s nice?\p" - .string "Oh, would you like to have a battle?$" + .string "Es gibt eine Menge Orte, an denen man\n" + .string "eine GEHEIMBASIS einrichten kann.\p" + .string "Aber dieser hier gefällt mir am besten.\n" + .string "Findest du es nicht auch nett hier?\p" + .string "Oh, hast du Lust auf einen Kampf?$" SecretBase_RedCave1_Text_1A1D48:: @ 81A1D48 - .string "Okay, here goes!$" + .string "Okay, los geht’s!$" SecretBase_RedCave1_Text_1A1D59:: @ 81A1D59 .string "Oh...\n" - .string "You can’t now, okay.$" + .string "Du hast gerade keine Zeit.$" UnknownString_81A1D74:: @ 81A1D74 - .string "Hmmm... It’s our loss...\n" - .string "But don’t tell anyone!\l" - .string "It’s a confidential secret!$" + .string "Hmm... Das ist unsere Niederlage...\n" + .string "Aber erzähl das bloß nicht weiter!\l" + .string "Das ist ein streng geheimes Geheimnis!$" SecretBase_RedCave1_Text_1A1DC0:: @ 81A1DC0 - .string "If you’re in this area again, I hope\n" - .string "you’ll visit me.$" + .string "Wenn du wieder mal in der Nähe bist,\n" + .string "komm mich doch besuchen!$" SecretBase_RedCave1_Text_1A1DF6:: @ 81A1DF6 - .string "There’re a lot of places where you can\n" - .string "make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don’t you think it’s nice?$" + .string "Es gibt eine Menge Orte, an denen man\n" + .string "eine GEHEIMBASIS einrichten kann.\p" + .string "Aber dieser hier gefällt mir am besten.\n" + .string "Findest du es nicht auch nett hier?$" SecretBase_RedCave1_Text_1A1E67:: @ 81A1E67 - .string "This is a popular spot.\n" - .string "It’s always taken.\p" - .string "Oh! Were you thinking about taking this\n" - .string "spot, too?\p" - .string "I’ll tell you what, you can have this\n" - .string "spot if you can beat me.$" + .string "Dies ist ein beliebter Platz.\n" + .string "Er ist eigentlich immer besetzt.\p" + .string "Ach, du wolltest dich hier auch\n" + .string "häuslich niederlassen?\p" + .string "Ich sag dir was: Du kannst den Platz\n" + .string "haben, wenn du mich besiegen kannst.$" SecretBase_RedCave1_Text_1A1F04:: @ 81A1F04 - .string "Okay!\n" - .string "I’m going to defend my SECRET BASE!$" + .string "Okay! Ich werde meine\n" + .string "GEHEIMBASIS verteidigen!$" SecretBase_RedCave1_Text_1A1F2E:: @ 81A1F2E - .string "Hunh? Is that right?\n" - .string "You’re not interested in this spot?$" + .string "Was? Stimmt das? Du hast gar\n" + .string "kein Interesse an diesem Platz?!?$" UnknownString_81A1F67:: @ 81A1F67 - .string "I can’t keep going!\n" - .string "I surrender!$" + .string "Ich kann nicht mehr!\n" + .string "Ich gebe mich geschlagen!$" SecretBase_RedCave1_Text_1A1F88:: @ 81A1F88 - .string "Okay, when I move one day, this place\n" - .string "will be yours!$" + .string "Okay, wenn ich eines Tages von hier\n" + .string "fortziehe, kannst du den Platz haben.$" SecretBase_RedCave1_Text_1A1FBD:: @ 81A1FBD - .string "This is a popular spot.\n" - .string "It’s always taken.\p" - .string "I waited a long time for it to open.\n" - .string "I finally got to use it!$" + .string "Dies ist ein beliebter Platz.\n" + .string "Er ist eigentlich immer besetzt.\p" + .string "Ich habe ewig gewartet, bis er wieder\n" + .string "frei wurde. Endlich ist es soweit!$" SecretBase_RedCave1_Text_1A2026:: @ 81A2026 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.\p" - .string "Would you like to see how strong I am?$" + .string "Willkommen in meinem POKéMON-LABOR.\p" + .string "Ich forsche, indem ich im Geheimen\n" + .string "kämpfe.\p" + .string "Möchtest du sehen, wie stark ich bin?$" SecretBase_RedCave1_Text_1A2095:: @ 81A2095 - .string "I’m going to go all out!$" + .string "Das war ja wohl nichts!$" SecretBase_RedCave1_Text_1A20AE:: @ 81A20AE .string "Oh.\n" - .string "Some other time, then!$" + .string "Ein anderes Mal vielleicht...$" UnknownString_81A20C9:: @ 81A20C9 - .string "Hmm... I’ve still got lots to learn.\n" - .string "I have to study some more.$" + .string "Hm... Ich muss noch viel lernen.\n" + .string "Ich muss fleißiger studieren.$" SecretBase_RedCave1_Text_1A2109:: @ 81A2109 - .string "Thanks for battling with me.\n" - .string "Please come back again tomorrow.$" + .string "Danke, dass du mit mir gekämpft hast.\n" + .string "Komm doch bitte morgen wieder.$" SecretBase_RedCave1_Text_1A2147:: @ 81A2147 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.$" + .string "Willkommen in meinem POKéMON-LABOR.\p" + .string "Ich forsche, indem ich im Geheimen\n" + .string "kämpfe.$" SecretBase_RedCave1_Text_1A218F:: @ 81A218F - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.\p" - .string "So, how would you like a battle?$" + .string "Ein großes Anwesen ist natürlich auch\n" + .string "ganz nett, aber hier ist es schöner.\p" + .string "Viele Leute kommen mich besuchen.\p" + .string "So. Wie wäre es mit einem Kampf?$" SecretBase_RedCave1_Text_1A2220:: @ 81A2220 - .string "That’s the way!$" + .string "Genauso muss es laufen!$" SecretBase_RedCave1_Text_1A2230:: @ 81A2230 - .string "When you’re ready, give me a shout!$" + .string "Wenn du bereit bist, sag Bescheid.$" UnknownString_81A2254:: @ 81A2254 - .string "Aww! Done in!\n" - .string "But it’s still fun to battle!$" + .string "Ooch! Ich hab’s vergeigt!\n" + .string "Aber es hat sehr viel Spaß gemacht!$" SecretBase_RedCave1_Text_1A2280:: @ 81A2280 - .string "Well, anyway, I should go buy some\n" - .string "decorations and furniture.\p" - .string "I want my SECRET BASE to be a place\n" - .string "other people can enjoy.$" + .string "Egal. Ich sollte mir auf jeden Fall einige\n" + .string "Dekorationen und Möbel zulegen.\p" + .string "Ich möchte, dass sich auch andere in\n" + .string "meiner GEHEIMBASIS wohl fühlen.$" SecretBase_RedCave1_Text_1A22FA:: @ 81A22FA - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.$" + .string "Ein großes Anwesen ist natürlich auch\n" + .string "ganz nett, aber hier ist es schöner.\p" + .string "Viele Leute kommen mich besuchen.$" SecretBase_RedCave1_Text_1A236A:: @ 81A236A - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.\p" - .string "If you would be so kind, will you battle\n" - .string "with my POKéMON?$" + .string "Ich liebe es, Dekorationen und Möbel\n" + .string "zu kaufen!!!\p" + .string "Ich liebe es genauso, POKéMON aufzu-\n" + .string "ziehen!\p" + .string "Wärest du so nett, mit meinen\n" + .string "POKéMON zu kämpfen?$" SecretBase_RedCave1_Text_1A2405:: @ 81A2405 - .string "Thank you.\n" - .string "Shall we begin?$" + .string "Danke schön.\n" + .string "Bist du bereit?$" SecretBase_RedCave1_Text_1A2420:: @ 81A2420 .string "Oh.\n" - .string "How disappointing...$" + .string "Was für eine Enttäuschung.$" UnknownString_81A2439:: @ 81A2439 - .string "I concede...$" + .string "Ich kapituliere...$" SecretBase_RedCave1_Text_1A2446:: @ 81A2446 - .string "That was all in good fun!\n" - .string "I should go enjoy shopping now.$" + .string "Das war vielleicht ein Spaß! Und nun\n" + .string "sollte ich mich dem Einkaufen widmen.$" SecretBase_RedCave1_Text_1A2480:: @ 81A2480 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.$" + .string "Ich liebe es, Dekorationen und Möbel\n" + .string "zu kaufen!!!\p" + .string "Ich liebe es genauso, POKéMON aufzu-\n" + .string "ziehen!$" SecretBase_RedCave1_Text_1A24E1:: @ 81A24E1 - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?\p" - .string "But since you found me, how about we\n" - .string "have a battle?$" + .string "Einige Leute richten ihre GEHEIMBASIS\n" + .string "an gut versteckten Orten ein.\l" + .string "Wollen sie sich nicht mehr sehen lassen?\p" + .string "Da du mich gefunden hast, lass uns\n" + .string "doch gleich mal kämpfen.$" SecretBase_RedCave1_Text_1A256F:: @ 81A256F - .string "I’m not going down easily!$" + .string "Ich bin nicht einfach zu besiegen!$" SecretBase_RedCave1_Text_1A258A:: @ 81A258A - .string "Oh... Are you maybe tired from searching\n" - .string "for this place?$" + .string "Oh. Sag bloß, du bist müde von der Suche\n" + .string "nach diesem Platz?$" UnknownString_81A25C3:: @ 81A25C3 - .string "I went down...$" + .string "Ich bin untergegangen...$" SecretBase_RedCave1_Text_1A25D2:: @ 81A25D2 - .string "Where’s your SECRET BASE?\n" - .string "I should go visit you there.$" + .string "Wo ist deine GEHEIMBASIS?\n" + .string "Ich sollte dich dort mal besuchen.$" SecretBase_RedCave1_Text_1A2609:: @ 81A2609 - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?$" + .string "Einige Leute richten ihre GEHEIMBASIS\n" + .string "an gut versteckten Orten ein.\l" + .string "Wollen sie sich nicht mehr sehen lassen?$" SecretBase_RedCave1_Text_1A2663:: @ 81A2663 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!\p" - .string "In the meantime, want to battle?$" + .string "Einige Leute haben mir erzählt, dass man\n" + .string "auf verschiedene Arten an Deko-\l" + .string "rationen kommen kann.\p" + .string "Wir sollten einen Wettbewerb veran-\n" + .string "stalten, wer die schönsten Dinge hat.\p" + .string "Aber zuerst lass uns kämpfen.$" SecretBase_RedCave1_Text_1A2710:: @ 81A2710 - .string "This is my SECRET BASE.\n" - .string "I can’t lose!$" + .string "Das ist meine GEHEIMBASIS.\n" + .string "Ich kann hier gar nicht verlieren!$" SecretBase_RedCave1_Text_1A2736:: @ 81A2736 - .string "I’ll battle with you anytime.$" + .string "Ich kämpfe jederzeit mit dir.$" UnknownString_81A2754:: @ 81A2754 - .string "Huh?\n" - .string "Did I just lose?$" + .string "Wie?\n" + .string "Ich habe doch verloren?$" SecretBase_RedCave1_Text_1A276A:: @ 81A276A - .string "I won’t lose at collecting decorations.\n" - .string "Come visit again!$" + .string "Ich werde den Wettbewerb um die\n" + .string "schönsten Dekorationen nicht ver-\l" + .string "lieren. Überzeuge dich selbst!$" SecretBase_RedCave1_Text_1A27A4:: @ 81A27A4 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!$" + .string "Einige Leute haben mir erzählt, dass man\n" + .string "auf verschiedene Arten an Deko-\l" + .string "rationen kommen kann.\p" + .string "Wir sollten einen Wettbewerb veran-\n" + .string "stalten, wer die schönsten Dinge hat.$" SecretBase_RedCave1_Text_1A2830:: @ 81A2830 - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "That’s what I do.\n" - .string "Want to battle with me?$" + .string "Ich habe einen Ort gefunden, der mir\n" + .string "gefällt und den ich mit meinen Lieblings-\l" + .string "dekorationen ausgestattet habe.\p" + .string "Dort ziehe ich meine Lieblings-POKéMON\n" + .string "auf und werde mit ihnen stärker.\p" + .string "Genau das mache ich.\n" + .string "Möchtest du mit mir kämpfen?$" SecretBase_RedCave1_Text_1A28D7:: @ 81A28D7 - .string "Show me what you’re made of!$" + .string "Zeig mir, aus welchem Holz du\n" + .string "geschnitzt bist.$" SecretBase_RedCave1_Text_1A28F4:: @ 81A28F4 - .string "I guess there are times when you’re not\n" - .string "into it.$" + .string "Ich glaube, es gibt immer wieder Zeiten,\n" + .string "in denen man nicht so gut drauf ist.$" UnknownString_81A2925:: @ 81A2925 - .string "I know exactly what you’re made of now.$" + .string "Ich weiß jetzt genau, aus welchem Holz\n" + .string "du geschnitzt bist.$" SecretBase_RedCave1_Text_1A294D:: @ 81A294D - .string "We can both become stronger.\n" - .string "Let’s keep at it!$" + .string "Wir können beide noch stärker werden!\n" + .string "Das macht doch Mut!$" SecretBase_RedCave1_Text_1A297C:: @ 81A297C - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "Every day is a great day.$" + .string "Ich habe einen Ort gefunden, der mir\n" + .string "gefällt und den ich mit meinen Lieblings-\l" + .string "dekorationen ausgestattet habe.\p" + .string "Dort ziehe ich meine Lieblings-POKéMON\n" + .string "auf und werde mit ihnen stärker.\p" + .string "Jeder Tag ist mein Lieblingstag.$" SecretBase_RedCave1_Text_1A2A13:: @ 81A2A13 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?\p" - .string "Want to see my taste in battling?$" + .string "Man lernt viel über den Geschmack und\n" + .string "den Stil von Menschen, wenn man sich\l" + .string "ihre Dekorationen und den Platz, auf\l" + .string "dem sie stehen, anschaut.\p" + .string "Wie findest du meinen Geschmack?\n" + .string "Bist du sprachlos? Hihihi...\p" + .string "Willst du mal meinen Kampfstil sehen?$" SecretBase_RedCave1_Text_1A2AE2:: @ 81A2AE2 - .string "There’s no holding back!$" + .string "Es gibt kein Zurück mehr.$" SecretBase_RedCave1_Text_1A2AFB:: @ 81A2AFB - .string "I’ll be happy to demonstrate my style\n" - .string "anytime.$" + .string "Ich zeige dir gerne jederzeit wieder \n" + .string "meinen erlesenen Kampfstil!$" UnknownString_81A2B2A:: @ 81A2B2A - .string "You’re supremely talented!\n" - .string "Your power seems to be limitless...$" + .string "Du bist hoch talentiert! Deine Stärke\n" + .string "scheint grenzenlos zu sein.$" SecretBase_RedCave1_Text_1A2B69:: @ 81A2B69 - .string "What did you think of my style?\n" - .string "I’ll keep on polishing it!$" + .string "Was hältst du von meinem Stil?\n" + .string "Ich muss ihn noch mehr aufpolieren.$" SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?$" + .string "Man lernt viel über den Geschmack und\n" + .string "den Stil von Menschen, wenn man sich\l" + .string "ihre Dekorationen und den Platz, auf\l" + .string "dem sie stehen, anschaut.\p" + .string "Wie findest du meinen Geschmack?\n" + .string "Bist du sprachlos? Hihihi...$" gUnknown_081A2C51:: @ 81A2C51 special sub_80BB70C @@ -4281,69 +4831,80 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A .include "data/scripts/secret_power_tm.inc" UnknownString_81A38FB: @ 81A38FB - .string "All decorations and furniture in your\n" - .string "SECRET BASE will be returned to your PC.\p" - .string "Is that okay?$" + .string "Alle Dekorationsgegenstände und das\n" + .string "Mobiliar aus deiner GEHEIMBASIS werden\l" + .string "auf deinen PC gesendet.\p" + .string "Einverstanden?$" UnknownString_81A3958: @ 81A3958 - .string "Do you want to register\n" - .string "{STR_VAR_1}’s SECRET BASE?$" + .string "Möchtest du GEHEIMBASIS von\n" + .string "{STR_VAR_1} eintragen?$" UnknownString_81A3982: @ 81A3982 - .string "This data is already registered.\n" - .string "Would you like to delete it?$" + .string "Diese Daten wurden bereits\n" + .string "eingetragen. Möchtest du sie löschen?$" UnknownString_81A39C0: @ 81A39C0 - .string "Up to 10 locations can be registered.\p" - .string "Delete a location if you want to\n" - .string "register another location.$" + .string "Bis zu 10 Orte können eingetragen\n" + .string "werden.\p" + .string "Lösche einen Ort, um einen neuen\n" + .string "eintragen zu können.$" UnknownString_81A3A22: @ 81A3A22 - .string "Registration completed.$" + .string "Registrierung abgeschlossen.$" UnknownString_81A3A3A: @ 81A3A3A - .string "Data has been unregistered.$" + .string "Daten wurden aus der Registrierung\n" + .string "genommen.$" UnknownString_81A3A56: @ 81A3A56 - .string "There are no decorations...$" + .string "Es sind keine Dekorationen vorhanden.$" UnknownString_81A3A72: @ 81A3A72 - .string "{PLAYER} booted up the PC.$" + .string "{PLAYER} schaltet den PC ein.$" UnknownString_81A3A87: @ 81A3A87 - .string "What would you like to do?$" + .string "Was möchtest du tun?$" UnknownString_81A3AA2: @ 81A3AA2 - .string "The registered SECRET BASE will remain\n" - .string "unless the owner moves away.\p" - .string "If it is removed from the registry,\n" - .string "another SECRET BASE may take its place.\p" - .string "Up to ten locations can be registered.{PAUSE_UNTIL_PRESS}$" + .string "Die eingetragene GEHEIMBASIS bleibt\n" + .string "erhalten, bis der Eigentümer umzieht.\p" + .string "Wird sie aus dem Grundbuch ent-\n" + .string "fernt, kann eine andere GEHEIMBASIS\l" + .string "diesen Platz einnehmen.\p" + .string "Bis zu 10 Orte können eingetragen\n" + .string "werden.{0xFC}Ì$" UnknownString_81A3B5B: @ 81A3B5B - .string "A shield of {STR_VAR_2} that marks winning\n" - .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" + .string "Ein Schild aus {STR_VAR_2}, welches zeigt,\n" + .string "dass {STR_VAR_1}-mal hintereinander im\l" + .string "DUELLTURM ein Kampf gewonnen wurde.$" UnknownString_81A3BA4: @ 81A3BA4 - .string "A realistic toy TV. It could be easily\n" - .string "mistaken for the real thing.$" + .string "Ein sehr realistischer Spielzeug-\n" + .string "Fernseher. Man könnte ihn glatt mit\l" + .string "einem echten Gerät verwechseln.$" UnknownString_81A3BE8: @ 81A3BE8 - .string "A toy TV shaped like a SEEDOT.\n" - .string "It looks ready to roll away on its own...$" + .string "Ein Spielzeug-Fernseher, der aussieht\n" + .string "wie ein SAMURZEL. Er scheint von\l" + .string "alleine davonrollen zu wollen...$" UnknownString_81A3C31: @ 81A3C31 - .string "A toy TV shaped like a SKITTY.\n" - .string "It looks ready to stroll away...$" + .string "Ein Spielzeug-Fernseher, der aussieht\n" + .string "wie ein ENECO. Es scheint, als wolle\l" + .string "er sich langsam davonschleichen ...$" UnknownString_81A3C71: @ 81A3C71 - .string "You may only make one SECRET BASE.\p" - .string "Would you like to move from the SECRET\n" - .string "BASE near {STR_VAR_1}?$" + .string "Du kannst dir nur eine GEHEIMBASIS\n" + .string "einrichten.\p" + .string "Möchtest du deine GEHEIMBASIS in der\n" + .string "Nähe von {STR_VAR_1} hierher\l" + .string "verlegen?$" UnknownString_81A3CC9: @ 81A3CC9 - .string "Moving completed.\p" - .string "Would you like to use the SECRET POWER?$" + .string "Umzug wurde abgeschlossen.\p" + .string "Möchtest du GEHEIMPOWER einsetzen?$" .include "data/scripts/cable_club.inc" .include "data/text/cable_club.inc" @@ -4765,7 +5326,7 @@ S_RepelWoreOff:: @ 81C33E6 end Text_RepelWoreOff: @ 81C33EF - .string "REPEL’s effect wore off...$" + .string "SCHUTZ wirkt nicht mehr...$" .include "data/scripts/safari_zone.inc" .include "data/text/safari_zone.inc" @@ -4809,32 +5370,32 @@ MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA .include "data/text/shoal_cave.inc" PictureBookShelfText: @ 81C6A69 - .string "There’s a set of POKéMON picture books.$" + .string "Eine Sammlung von POKéMON-Büchern.$" BookshelfText: @ 81C6A91 - .string "It’s filled with all sorts of books.$" + .string "Hier stehen jede Menge Bücher.$" PokemonCenterBookshelfText: @ 81C6AB6 - .string "POKéMON magazines!\n" - .string "POKéMON PAL...\p" - .string "POKéMON HANDBOOK...\n" - .string "ADORABLE POKéMON...$" + .string "POKéMON-Magazine!\n" + .string "DER POKéMON FREUND...\p" + .string "POKéMON HANDBUCH...\n" + .string "GELIEBTE POKéMON...$" VaseText: @ 81C6B00 - .string "This vase looks expensive...\n" - .string "Peered inside...\p" - .string "But, it was empty.$" + .string "Diese Vase sieht sehr teuer aus...\n" + .string "Schauen wir mal hinein...\p" + .string "Och, sie ist leer.$" TrashCanText: @ 81C6B41 - .string "It’s empty.$" + .string "Leer...$" ShopShelfText: @ 81C6B4D - .string "The shelves brim with all sorts of\n" - .string "POKéMON merchandise.$" + .string "Die Regale biegen sich unter dem\n" + .string "Gewicht von POKéMON-Artikeln.$" BlueprintText: @ 81C6B85 - .string "A blueprint of some sort?\n" - .string "It’s too complicated!$" + .string "Sind das Blaupausen?\n" + .string "Die sind zu kompliziert zu lesen.$" GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index f5ba25643..86a4d1b24 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -46,14 +46,17 @@ Cut_ChoseNo: @ 81B0E3C end UseCutPromptText: @ 81B0E3F - .string "This tree looks like it can be CUT down.\p" - .string "Would you like to CUT it?$" + .string "Du kannst den ZERSCHNEIDER hier\n" + .string "einsetzen!\p" + .string "Möchtest du den ZERSCHNEIDER\n" + .string "einsetzen?$" UsedCutRockSmashText: @ 81B0E82 - .string "{STR_VAR_1} used {STR_VAR_2}.$" + .string "{STR_VAR_1} setzt {STR_VAR_2} ein.$" CannotUseCutText: @ 81B0E8E - .string "This tree looks like it can be CUT down.$" + .string "Der ZERSCHNEIDER kann hier eingesetzt\n" + .string "werden.$" S_BreakableRock:: @ 81B0EB7 lockall @@ -114,12 +117,12 @@ RockSmash_ChoseNo: @ 81B0F48 end UseRockSmashPromptText: @ 81B0F4B - .string "This rock appears to be breakable.\n" - .string "Would you like to use ROCK SMASH?$" + .string "Dieser Fels sieht zerbrechlich aus.\n" + .string "Soll ZERTRÜMMERER eingesetzt werden?$" CannotUseRockSmashText: @ 81B0F90 - .string "It’s a rugged rock, but a POKéMON\n" - .string "may be able to smash it.$" + .string "Ein großer Felsen. Ein POKéMON könnte\n" + .string "ihn vielleicht zertrümmern.$" S_PushableBoulder:: @ 81B0FCB lockall @@ -167,22 +170,22 @@ Strength_ChoseNo: @ 81B103A end UseStrengthPromptText: @ 81B103D - .string "It’s a big boulder, but a POKéMON\n" - .string "may be able to push it aside.\p" - .string "Would you like to use STRENGTH?$" + .string "Ein POKéMON kann diesen Felsen\n" + .string "vielleicht bewegen.\p" + .string "Möchtest du STÄRKE einsetzen?$" UsedStrengthText: @ 81B109D - .string "{STR_VAR_1} used STRENGTH.\p" - .string "{STR_VAR_1}’s STRENGTH made it possible\n" - .string "to move boulders around.$" + .string "{STR_VAR_1} setzt STÄRKE ein.\p" + .string "STÄRKE von {STR_VAR_1} ermöglicht es,\n" + .string "den Felsen zu bewegen.$" CannotUseStrengthText: @ 81B10E7 - .string "It’s a big boulder, but a POKéMON\n" - .string "may be able to push it aside.$" + .string "Ein POKéMON kann diesen Felsen\n" + .string "vielleicht bewegen.$" AlreadyUsedStrengthText: @ 81B1127 - .string "STRENGTH made it possible to move\n" - .string "boulders around.$" + .string "STÄRKE ermöglicht es, Felsen zu\n" + .string "bewegen.$" S_UseWaterfall:: @ 81B115A lockall @@ -207,15 +210,15 @@ Waterfall_Done: @ 81B119D end CannotUseWaterfallText: @ 81B119F - .string "A wall of water is crashing down with\n" - .string "a mighty roar.$" + .string "Das Wasser fällt steil wie eine Wand\n" + .string "brüllend in die Tiefe.$" UseWaterfallPromptText: @ 81B11D4 - .string "It’s a large waterfall.\n" - .string "Would you like to use WATERFALL?$" + .string "Ein riesiger Wasserfall.\n" + .string "Möchtest du KASKADE einsetzen?$" UsedWaterfallText: @ 81B120D - .string "{STR_VAR_1} used WATERFALL.$" + .string "{STR_VAR_1} setzt KASKADE ein.$" UseDiveScript:: @ 81B1220 lockall @@ -270,31 +273,32 @@ UnderwaterDive_Done: @ 81B12BE end CannotUseDiveText: @ 81B12C0 - .string "The sea is deep here. A POKéMON may be\n" - .string "able to go underwater here.$" + .string "Das Wasser ist hier tief. Ein POKéMON\n" + .string "könnte hier vielleicht tauchen.$" UseDivePromptText: @ 81B1303 - .string "The sea is deep here.\n" - .string "Would you like to use DIVE?$" + .string "Das Meer ist an dieser Stelle sehr tief.\n" + .string "Möchtest du TAUCHER einsetzen?$" UsedDiveText: @ 81B1335 - .string "{STR_VAR_1} used DIVE.$" + .string "{STR_VAR_1} setzt TAUCHER ein.$" UnderwaterCannotUseDiveText: @ 81B1343 - .string "Light is filtering down from above.\n" - .string "A POKéMON may be able to surface here.$" + .string "Licht schimmert von oben herab. Ein\n" + .string "POKéMON könnte hier auftauchen.$" UnderwaterUseDivePromptText: @ 81B138E - .string "Light is filtering down from above.\n" - .string "Would you like to use DIVE?$" + .string "Licht schimmert von oben herab.\n" + .string "Möchtest du TAUCHER einsetzen?$" SurfacingBlockedText: @ 81B13CE - .string "There is something in the way above.\n" - .string "DIVE can’t be used here.$" + .string "An der Oberfläche ist irgendetwas im\n" + .string "Weg. TAUCHER kann nicht\l" + .string "eingesetzt werden.$" SweetScentNothingHereScript:: @ 81B140C msgbox SweetScentNothingHereText, 3 end SweetScentNothingHereText: @ 81B1415 - .string "There appears to be nothing here...$" + .string "Hier scheint nichts zu sein...$" diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/maps/VictoryRoad_B1F/map.bin index 706c96974..bd5f9065f 100644 --- a/data/maps/VictoryRoad_B1F/map.bin +++ b/data/maps/VictoryRoad_B1F/map.bin @@ -13,8 +13,8 @@ 22228222#  22222 ##       ##  228222#   -22  B B#B #22R222 #B B B B¼B»B¼ò¼ò½B½BBBB222P22622#    -22BBBBÄBÃBÄòÄòÅBÅBBBB2222222228222222222BBB2222222222R222 #2222BBB22#       +22  B B#B #22R222 #B B B B¼B»B¼ò¼ò½B½BBBB222222622#    +22BBBBÄBÃBÄòÄòÅBÅBBBB222222222P222222222BBB2222222222R222 #2222BBB22#       2222222222#22BB #22#  2222#  2222#22BB22222#222#    #222BB22#22#  diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/maps/VictoryRoad_B2F/map.bin index 682c31764..24c4f646a 100644 --- a/data/maps/VictoryRoad_B2F/map.bin +++ b/data/maps/VictoryRoad_B2F/map.bin @@ -1 +1 @@ -€‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰�2�{{{{{{{{{{{{{{{{{{{{{{’2222�{{{{{{{{{{{{{{{{{{{{{{’22222222�{{{{{{{{{{{{{{{{{{{{{{’222222222�{{{{{TUUUV{{{{{{{{{{{{’22222222222W3W3W3y{’W3W3W3W3W3W3W3W3y{{{’222  "22222222222�{’22222222W3W3y{’ #B22#B"222222222222�{’222222222222�{’222222222222222�{’»³¼22222222222�{’¹¹¹222222222»³¼¹¹¹222222222¹¹¹€‰�222€Z[‰tuv‰‰‰‰�222222222¹¹¹�{’222�XY{{{{{{{{’22222222222€tuv‰‰‰‰‰˜{š‰‰‰˜{PQ{{{{{{{š‰‰�22222222�{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222###UUUV{{{{{{{{{TUUUUUUUUUUV{{’  2#2222222#     "¤V{{{TUUUU¤         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B»B»B»B¼ò¼ò¼ò½B½B½BB222222222BB»B»B»B»B¼ò¼ò¼ò»B»B»B B B B B#BBBBBBBÃBÃBÃBÄòÄòÄòÅBÅBÅBB2222BBÃBÃBÃBÃBÄòÄòÄòÃBÃBÃBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222Q222222222222229222222222222222222622222S2222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file +€‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰�2�{{{{{{{{{{{{{{{{{{{{{{’2222�{{{{{{{{{{{{{{{{{{{{{{’22222222�{{{{{{{{{{{{{{{{{{{{{{’222222222�{{{{{TUUUV{{{{{{{{{{{{’22222222222W3W3W3y{’W3W3W3W3W3W3W3W3y{{{’222  "22222222222�{’22222222W3W3y{’ #B22#B"222222222222�{’222222222222�{’222222222222222�{’»³¼22222222222�{’¹¹¹222222222»³¼¹¹¹222222222¹¹¹€‰�222€Z[‰tuv‰‰‰‰�222222222¹¹¹�{’222�XY{{{{{{{{’22222222222€tuv‰‰‰‰‰˜{š‰‰‰˜{PQ{{{{{{{š‰‰�22222222�{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222¤¤UUUUV{{{{{{{{{TUUUUUUUUUUV{{’  2#2222222#     "¤V{{{TUUUU¤         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B»B»B»B¼ò¼ò¼ò½B½B½BB222222222BB»B»B»B»B¼ò¼ò¼ò»B»B»B B B B B#BBBBBBBÃBÃBÃBÄòÄòÄòÅBÅBÅBB2222BBÃBÃBÃBÃBÄòÄòÄòÃBÃBÃBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222222222222222222222222222222222222262222222222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file diff --git a/data/strings2.s b/data/strings2.s index f73aba76f..52e964938 100644 --- a/data/strings2.s +++ b/data/strings2.s @@ -5,64 +5,70 @@ @ unused gOtherText_TopSpeed:: - .string "TOP SPEED$" + .string "TEMPO$" gMultiText_BerryBlenderMaxSpeedRecord:: @ 842C2E6 - .string "BERRY BLENDER\nMAXIMUM SPEED RECORD!$" + .string "BEERENMIXER\n" + .string "MAXIMALTEMPO-REKORD!$" gMultiText_2P3P4P:: @ 842C30A - .string "2 PLAYERS\n3 PLAYERS\n4 PLAYERS$" + .string "2 SPIELER\n" + .string "3 SPIELER\n" + .string "4 SPIELER$" gMultiText_Saving:: @ 842C328 - .string "SAVING...\nDON’T TURN OFF THE POWER.$" + .string "SPEICHERVORGANG...\n" + .string "DAS GERÄT NICHT AUSSCHALTEN!$" gMultiText_LinkError:: @ 842C34C - .string "{HIGHLIGHT TRANSPARENT}{COLOR WHITE2}Link error...\nCheck your Game Link cable connection,\nand turn the power off and on.$" + .string "{HIGHLIGHT TRANSPARENT}{COLOR WHITE2}Verbindungsfehler...\n" + .string "Die Kabelverbindungen überprüfen und\n" + .string "die Geräte aus- und wieder einschalten.$" gSystemText_OptionMenu:: @ 842C3A6 - .string "{PALETTE 9}OPTION$" + .string "{PALETTE 9}OPTIONEN$" gSystemText_TextSpeed:: @ 842C3B0 - .string "{PALETTE 9}TEXT SPEED$" + .string "{PALETTE 9}TEXT-TEMPO$" gSystemText_BattleScene:: @ 842C3BE - .string "{PALETTE 9}BATTLE SCENE$" + .string "{PALETTE 9}ANIMATION$" gSystemText_BattleStyle:: @ 842C3CE - .string "{PALETTE 9}BATTLE STYLE$" + .string "{PALETTE 9}KAMPFSTIL$" gSystemText_Sound:: @ 842C3DE - .string "{PALETTE 9}SOUND$" + .string "{PALETTE 9}TON$" gSystemText_Frame:: @ 842C3E7 - .string "{PALETTE 9}FRAME$" + .string "{PALETTE 9}RAHMEN$" gSystemText_Cancel:: @ 842C3F0 - .string "{PALETTE 9}CANCEL$" + .string "{PALETTE 9}ZURÜCK$" gSystemText_ButtonMode:: @ 842C3FA - .string "{PALETTE 9}BUTTON MODE$" + .string "{PALETTE 9}KNOPFBELEGUNG$" gSystemText_Slow:: @ 842C409 - .string "{PALETTE 15}SLOW$" + .string "{PALETTE 15}1$" gSystemText_Mid:: @ 842C411 - .string "{PALETTE 15}MID$" + .string "{PALETTE 15}2$" gSystemText_Fast:: @ 842C418 - .string "{PALETTE 15}FAST$" + .string "{PALETTE 15}3$" gSystemText_On:: @ 842C420 - .string "{PALETTE 15}ON$" + .string "{PALETTE 15}EIN$" gSystemText_Off:: @ 842C426 - .string "{PALETTE 15}OFF$" + .string "{PALETTE 15}AUS$" gSystemText_Shift:: @ 842C42D - .string "{PALETTE 15}SHIFT$" + .string "{PALETTE 15}WECHSEL$" gSystemText_Set:: @ 842C436 - .string "{PALETTE 15}SET$" + .string "{PALETTE 15}FOLGE$" gSystemText_Mono:: @ 842C43D .string "{PALETTE 15}MONO$" @@ -71,7 +77,7 @@ gSystemText_Stereo:: @ 842C445 .string "{PALETTE 15}STEREO$" gSystemText_Type:: @ 842C44F - .string "{PALETTE 15}TYPE$" + .string "{PALETTE 15}MOTIV $" gSystemText_Terminator:: @ 842C457 .string "{PALETTE 8}$" @@ -80,7 +86,7 @@ gSystemText_Normal:: @ 842C45B .string "{PALETTE 15}NORMAL$" gSystemText_LR:: @ 842C465 - .string "{PALETTE 15}LR$" + .string "{PALETTE 15}L/R$" gSystemText_LA:: @ 842C46B .string "{PALETTE 15}L=A$" @@ -90,100 +96,111 @@ SystemText_Pokedex:: SystemText_Pokemon:: .string "POKéMON$" SystemText_BAG:: - .string "BAG$" + .string "BEUTEL$" SystemText_Pokenav:: .string "POKéNAV$" SystemText_Player:: .string "{PLAYER}$" SystemText_Save:: - .string "SAVE$" + .string "SICHERN$" SystemText_Option:: - .string "OPTION$" + .string "OPTION.$" SystemText_Exit:: - .string "EXIT$" + .string "BEENDEN$" SystemText_Retire:: @ safari zone? - .string "RETIRE$" + .string "SCHLUSS$" gOtherText_SafariStock:: @ 842C4A9 - .string "SAFARI BALLS\nStock: {STR_VAR_1}$" + .string "SAFARIBÄLLE\n" + .string "Vorrat: {STR_VAR_1}$" gSystemText_LinkStandby:: @ 842C4C0 - .string "Link standby...\n... ... B Button: Cancel$" + .string "Verbindung...\n" + .string "... ... B-Knopf: Abbrechen$" gSystemText_LoadEventPressA:: @ 842C4E9 - .string "Press the A Button to load event.\n... ... B Button: Cancel$" + .string "Lade Geschehen mit A-Knopf.\n" + .string "... ... B-Knopf: Abbrechen$" gSystemText_LoadingEvent:: @ 842C524 - .string "Loading event...$" + .string "Geschehen wird geladen.$" gSystemText_DontCutLink:: @ 842C535 - .string "Don’t remove the Game Link cable.\nDon’t turn off the power.$" + .string "Verbindungskabel nicht entfernen!\n" + .string "Die Geräte nicht ausschalten!$" gSystemText_EventLoadSuccess:: @ 842C571 - .string "The event was safely loaded.$$" + .string "Geschehen ist erfolgreich geladen.$$" gSystemText_LoadingError:: @ 842C58F - .string "Loading error.\nEnding session.$$$$$$$$" + .string "Fehler beim Laden!\n" + .string "Vorgang wird abgebrochen.$$$$$$$$" gOtherText_Hoenn:: @ 842C5B5 .string "HOENN$" gOtherText_OhABite:: @ 842C5BB - .string "Oh! A bite!$" + .string "Oh! Da hat etwas angebissen!$" gOtherText_PokeOnHook:: @ 842C5C7 - .string "A POKéMON’s on the hook!{PAUSE_UNTIL_PRESS}$" + .string "Du hast ein POKéMON am Haken!{PAUSE_UNTIL_PRESS}$" gOtherText_NotEvenANibble:: @ 842C5E2 - .string "Not even a nibble...{PAUSE_UNTIL_PRESS}$" + .string "Nicht mal ein klitzekleines Knabbern...{PAUSE_UNTIL_PRESS}$" gOtherText_ItGotAway:: @ 842C5F9 - .string "It got away...{PAUSE_UNTIL_PRESS}$$" + .string "Es ist entkommen...{PAUSE_UNTIL_PRESS}$$" gTradeText_WillBeSent:: @ 842C60B - .string "{STR_VAR_2} will be sent to {STR_VAR_1}.$" + .string "{STR_VAR_2} wird {STR_VAR_1} zugesandt.$" gTradeText_ByeBye:: @ 842C622 - .string "Bye-bye, {STR_VAR_2}!$" + .string "Tschüss, {STR_VAR_2}!$" gTradeText_SentOverPoke:: @ 842C62F - .string "{STR_VAR_1} sent over {STR_VAR_3}.$" + .string "{STR_VAR_1} versandte {STR_VAR_3}.$" gTradeText_TakeGoodCare:: @ 842C640 - .string "Take good care of {STR_VAR_3}!$" + .string "Kümmere dich gut um {STR_VAR_3}!$" TradeText_Cancel:: - .string "CANCEL$" + .string "ZUR.$" TradeText_ChoosePoke:: - .string "Choose a POKéMON.$" + .string "Wähle ein POKéMON.$" TradeText_Summary1:: - .string "SUMMARY$" + .string "BERICHT$" TradeText_Trade1:: - .string "TRADE$" + .string "TAUSCH$" TradeText_CancelTradePrompt:: - .string "Cancel trade?$" + .string "Tausch abbrechen?$" TradeText_PressBToExit:: - .string "Press the B Button to exit.$" + .string "Mit B-Knopf beenden.$" TradeText_Summary2:: - .string "SUMMARY$" + .string "BERICHT$" TradeText_Trade2:: - .string "TRADE$" + .string "TAUSCH$" TradeText_LinkStandby:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Link standby...\nPlease wait.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Verbindung...\n" + .string "Bitte warten...$" TradeText_TradeCancelled:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Der Tausch\n" + .string "wurde abgebrochen.$" TradeText_OnlyPoke:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}That’s your only\nPOKéMON for battle.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Das ist das einzige\n" + .string "POKéMON zum Kampf.$" TradeText_NonTradablePoke:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Your friend can’t\ntrade that one.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Dein Freund kann\n" + .string "das nicht senden.$" TradeText_WaitingForFriend:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Waiting for your\nfriend to finish...$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Dein Freund ist\n" + .string "noch nicht fertig...$" TradeText_WantToTrade:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Your friend wants\nto trade POKéMON.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Dein Freund möchte\n" + .string "POKéMON tauschen.$" .string "$" gTradeText_TradeOkayPrompt:: @ 842C7B6 - .string "Is this trade okay?$" + .string "Ist der Tausch O.K.?$" gOtherText_Terminator2:: @ 842C7CA .string "$" @@ -191,7 +208,7 @@ gOtherText_Terminator2:: @ 842C7CA gOtherText_ControlAndMiscText:: @ 842C7CB .string "\n$" .string "/$" - .string "Lv$" + .string "Lv.$" .string "---$" gOtherText_FourQuestions:: @ 842C7D6 @@ -204,79 +221,81 @@ gOtherText_ThreeQuestions:: @ 842C890 .string "???$" gOtherText_From:: @ 842C894 - .string "From $" + .string "Von $" gOtherText_MixingRecordsWithFriend:: @ 842C89A - .string "Mixing records...$" + .string "Rekorddaten-Austausch...$" gOtherText_MixingComplete:: @ 842C8AC - .string "Record mixing completed.\nThank you for waiting.$" + .string "Rekorddaten-Austausch beendet.\n" + .string "Vielen Dank für deine Geduld.$" gOtherText_TrainersTrainerCard:: @ 842C8DC - .string "’s TRAINER CARD$" + .string "TRAINERPASS von {PLAYER}$" gOtherText_FirstHOF:: @ 842C8EC - .string "FIRST HALL OF FAME$" + .string "ERSTE RUHMESHALLE:$" gOtherText_LinkCableBattles:: @ 842C8FF - .string "LINK CABLE BATTLES W/ L/$" + .string "KÄMPFE GG. FREUND/E S.: N.:$" gOtherText_BattleTowerWinRecord:: @ 842C924 - .string "BATTLE TOWER W/{CLEAR_TO 0x72}&{CLEAR_TO 0x98}STRAIGHT$" + .string "DUELLTURM-S.:{CLEAR_TO 114}&{CLEAR_TO 152} IN FOLGE$" gOtherText_ContestRecord:: @ 842C943 - .string "CONTESTS W/FRIENDS W/$" + .string "WETTB. MIT FREUND/EN S.:$" gOtherText_MixingRecord:: @ 842C959 - .string "{POKEBLOCK}S W/FRIENDS$" + .string "{POKEBLOCK} MIT FREUND/EN:$" gOtherText_TradeRecord:: @ 842C96A - .string "POKéMON TRADES$" + .string "POKéMON-TAUSCH:$" gOtherText_Boy:: @ 842C979 - .string "BOY$" + .string "JUNGE$" gOtherText_Girl:: @ 842C97D - .string "GIRL$" + .string "MÄDEL$" .string "$" gOtherText_Player:: @ 842C983 - .string "PLAYER$" + .string "SPIELER$" gOtherText_Badges:: @ 842C98A - .string "BADGES$" + .string "ORDEN$" .string "$" gOtherText_Pokedex:: @ 842C992 .string "POKéDEX$" gOtherText_PlayTime:: @ 842C99A - .string "PLAY TIME$" + .string "SPIELZEIT$" gOtherText_SentToPC:: @ 842C9A4 - .string "{STR_VAR_1} was sent to\nthe PC.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} wurde auf\n" + .string "den PC übertragen.{PAUSE_UNTIL_PRESS}$" OtherText_YourName:: - .string "YOUR NAME?$" + .string "DEIN NAME?$" OtherText_BoxName:: - .string "BOX NAME?$" + .string "NAME DER BOX?$" OtherText_PokeName:: - .string "{STR_VAR_1}’s nickname?$" + .string "Kosename f. {STR_VAR_1}$" gOtherText_Marco:: @ 842C9E1 .string "MARCO$" @ polo gOtherText_Coins:: @ 842C9E7 - .string "{STR_VAR_1} COINS$" + .string "{STR_VAR_1} MÜNZ.$" gOtherText_BattleResults:: @ 842C9F0 - .string "{PLAYER}’s BATTLE RESULTS$" + .string "KAMPFERGEBNISSE von {PLAYER}$" gOtherText_WinRecord:: @ 842CA04 - .string "TOTAL RECORD W/{STR_VAR_1} L/{STR_VAR_2} D/{STR_VAR_3}$" + .string "GESAMT-REKORD S.:{STR_VAR_1} N.:{STR_VAR_2} P.:{STR_VAR_3}$" gOtherText_WinLoseDraw:: @ 842CA20 - .string "WIN LOSE DRAW$" + .string "SIEG NIEDER. PATT$" gOtherText_SevenDashes:: @ 842CA3C .string "-------$" @@ -285,270 +304,318 @@ gOtherText_FourDashes:: @ 842CA44 .string "----$" gOtherText_BattleTowerResults:: @ 842CA49 - .string "{PLAYER}’s BATTLE TOWER RESULTS$" + .string "DUELLTURM-ERGEBNIS. von {PLAYER}$" gOtherText_Lv50:: @ 842CA63 - .string "LV 50$" + .string "Lv. 50$" gOtherText_Lv100:: @ 842CA69 - .string "LV 100$" + .string "Lv. 100$" gOtherText_WinStreak:: @ 842CA70 - .string "{STR_VAR_1}W STREAK$" + .string "{STR_VAR_1}S IN FOLGE$" gOtherText_Current:: @ 842CA7B - .string "CURRENT$" + .string "MOMENTAN$" gOtherText_Record:: @ 842CA83 - .string "RECORD$" + .string "REKORD$" gOtherText_Prev:: @ 842CA8A - .string "PREV.$" + .string "VORHER$" gOtherText_QuitGamePrompt:: @ 842CA90 - .string "Quit the game?$" + .string "Spiel beenden?$" gOtherText_MaxCoins:: @ 842CA9F - .string "You’ve got 9,999 COINS.$" + .string "Du hast 9.999 MÜNZEN.$" gOtherText_OutOfCoins:: @ 842CAB7 - .string "You’ve run out of COINS.\nGame over!$" + .string "Du hast keine MÜNZEN mehr.\n" + .string "Game over!$" gOtherText_DontHaveThreeCoins:: @ 842CADB - .string "You don’t have three COINS.$" + .string "Du hast keine drei MÜNZEN.$" gOtherText_ReelTime:: @ 842CAF7 - .string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nThe Reel Time continues for\nas often as the drawn number.\nIt all ends on a Big Bonus.$" + .string "REEL TIME\n" + .string "Hier hast du die Chance, in\n" + .string "Blitzesschnelle zu gewinnen!\n" + .string "Die Glücksrunde wiederholt\n" + .string "sich, so oft die Zahl anzeigt.\n" + .string "Sie endet mit einem BIG BONUS!$" DaycareText_GetAlongVeryWell:: - .string "The two seem to get along very well.$" + .string "Die beiden scheinen sich sehr zu mögen.$" DaycareText_GetAlong:: - .string "The two seem to get along.$" + .string "Die beiden scheinen sich zu vertragen.$" DaycareText_DontLikeOther:: - .string "The two don’t seem to like each other.$" + .string "Die beiden mögen sich nicht sehr.$" DaycareText_PlayOther:: - .string "The two prefer to play with other\nPOKéMON than each other.$" + .string "Die beiden spielen lieber mit anderen\n" + .string "POKéMON als miteinander.$" gOtherText_NewLine2:: @ 842CC28 .string "\n$" gOtherText_CancelAndLv:: @ 842CC2A - .string "CANCEL$" - .string "LV$" + .string "KEINES$" + .string "Lv.$" gEggNickname:: @ 842CC34 - .string "EGG$" + .string "EI$" gOtherText_HatchedFromEgg:: @ 842CC38 - .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}{STR_VAR_1} hatched from the EGG!$" + .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}{STR_VAR_1} schlüpfte aus dem EI!$" gOtherText_NickHatchPrompt:: @ 842CC5A - .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}Would you like to nickname the newly\nhatched {STR_VAR_1}?$" + .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}Möchtest du dem geschlüpften\n" + .string "{STR_VAR_1} einen Kosenamen geben?$" OtherText_Battle:: - .string "BATTLE$" + .string "KAMPF$" OtherText_Contest:: - .string "CONTEST$" + .string "WETTB.$" OtherText_Type:: - .string "TYPE/$" + .string "TYP/$" OtherText_PP:: - .string "PP/$" + .string "AP/$" OtherText_Power:: - .string "POWER$" + .string "STÄRKE$" OtherText_Accuracy:: - .string "ACCURACY$" + .string "GENAU.$" OtherText_Appeal:: - .string "APPEAL$" + .string "AUSDRUCK$" OtherText_Jam:: - .string "JAM$" + .string "EINDRUCK$" gOtherText_TeachWhichMove:: @ 842CCC7 - .string "Teach which move to {STR_VAR_1}?$" + .string "{STR_VAR_1} welche Attacke beibr.?$" gOtherText_TeachSpecificMove:: @ 842CCDF - .string "Teach {STR_VAR_2}?$" + .string "{STR_VAR_2} beibringen?$" gOtherText_PokeLearnedMove:: @ 842CCE9 - .string "{STR_VAR_1} learned {STR_VAR_2}.$" + .string "{STR_VAR_1} erlernte {STR_VAR_2}.$" gOtherText_DeleteOlderMove:: @ 842CCF8 - .string "{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can’t learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?$" + .string "{STR_VAR_1} versucht,\n" + .string "{STR_VAR_2} zu erlernen.\p" + .string "Aber {STR_VAR_1} kann nicht mehr\n" + .string "als vier Attacken erlernen.\p" + .string "Soll eine Attacke zu Gunsten von\n" + .string "{STR_VAR_2} vergessen werden?$" gOtherText_StopLearningMove:: @ 842CD65 - .string "Stop learning {STR_VAR_2}?$" + .string "{STR_VAR_2} nicht erlernen?$" gOtherText_ForgotMove123:: @ 842CD77 - .string "{PAUSE 32}1, {PAUSE 15}2 {PAUSE 15}...{PAUSE 15}...{PAUSE 15}...{PAUSE 15} {PLAY_SE 0x0038}Poof!\p$" + .string "{PAUSE 32}1, {PAUSE 15}2 {PAUSE 15}...{PAUSE 15}...{PAUSE 15}...{PAUSE 15} {PLAY_SE 0x38 0x00} Schwupp!\p$" + +deuOtherText_ForgotAndLearned:: @ 843912f + .string "{STR_VAR_1} vergaß {STR_VAR_3}.\p" + .string "Und...\p" + .string "{STR_VAR_1} erlernt {STR_VAR_2}.$" gOtherText_ForgotOrDidNotLearnMove:: @ 842CDA3 - .string "{STR_VAR_1} forgot {STR_VAR_3}.\pAnd...\p{STR_VAR_1} learned {STR_VAR_2}.$" - .string "{STR_VAR_1} did not learn\n{STR_VAR_2}.$" + .string "{STR_VAR_1} hat {STR_VAR_2}\n" + .string "nicht erlernt.$" gOtherText_GiveUpTeachingMove:: @ 842CDDC - .string "Give up trying to teach a new move\nto {STR_VAR_1}?$" + .string "Soll {STR_VAR_1} keine neue Attacke\n" + .string "erlernen?$" gOtherText_WhichMoveToForget:: @ 842CE06 - .string "Which move should be forgotten?\p$" + .string "Welche Attacke soll vergessen\n" + .string "werden?\p" + .string "$" gSystemText_ClearAllSaveDataPrompt:: @ 842CE27 - .string "Clear all save data areas?$" + .string "Alle gesich. Datenbereiche löschen?$" gSystemText_ClearingData:: @ 842CE42 - .string "Clearing data...\nPlease wait.$" + .string "Daten werden gelöscht...\n" + .string "Bitte warten...$" gContestText_AnnounceResults:: @ 842CE60 - .string "Announcing the results!$" + .string "Bekanntgabe der Ergebnisse!$" gContestText_PreliminaryResults:: @ 842CE78 - .string "The preliminary results!$" + .string "Ergebnisse 1. Durchlauf!$" gContestText_Round2Results:: @ 842CE91 - .string "Round 2 results!$" + .string "Ergebnisse 2. Durchlauf!$" gContestText_PokeWon:: @ 842CEA2 - .string "{STR_VAR_1}’s {STR_VAR_2} won!$" + .string "Sieger ist: {STR_VAR_2} von {STR_VAR_1}!$" gOtherText_LinkStandby:: @ 842CEAF - .string "Link standby...$" + .string "Verbindung...$" @ 842CEBF .include "data/text/landmarks.inc" gOtherText_Terminator4:: @ 842D0E6 - .string "$" + .string ", $" gOtherText_Nature:: @ 842D0E7 - .string " nature, $" + .string "Wesen: $" gOtherText_Comma:: @ 842D0F1 .string ",$" gOtherText_Met:: @ 842D0F3 - .string " (met).$" + .string " (gef.)$" gOtherText_Egg2:: @ 842D0FB - .string " (EGG).$" + .string " (EI)$" gOtherText_ObtainedInTrade:: @ 842D103 - .string "obtained in a trade.$" + .string "im Tausch erhalten.$" gOtherText_FatefulEncounter:: @ 842D118 - .string "fateful encounter.$" + .string "schicksalhafte Begegnung.$" gOtherText_Met2:: @ 842D12B - .string " (met).$" + .string " (gef.)$" gOtherText_EggDayCare:: @ 842D133 - .string "An odd POKéMON EGG found\nby the DAY CARE couple.$" + .string "Seltsames POKéMON-EI, das\n" + .string "die PENSIONSLEITUNG fand.$" gOtherText_EggNicePlace:: @ 842D164 - .string "A peculiar POKéMON EGG\nobtained at the nice place.$" + .string "Kurioses POKéMON-EI an\n" + .string "hübschem Ort erhalten.$" gOtherText_EggObtainedInTrade:: @ 842D197 - .string "A peculiar POKéMON EGG\nobtained in a trade.$" + .string "Kurioses POKéMON-EI im\n" + .string "Tausch erhalten.$" gOtherText_EggHotSprings:: @ 842D1C3 - .string "A POKéMON EGG obtained\nat the hot springs.$" + .string "Ein POKéMON-EI an den\n" + .string "Heißen Quellen erhalten.$" gOtherText_LinkStandby2:: @ 842D1EE - .string "Link standby...$" + .string "Verbindung...$" gOtherText_YesNoAndPlayer:: @ 842D1FE - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}YES\nNO$" - .string "{HIGHLIGHT TRANSPARENT}PLAYER$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}JA\n" + .string "NEIN$" + + .string "{HIGHLIGHT TRANSPARENT}SPIELER$" + .string "{HIGHLIGHT TRANSPARENT}$" gOtherText_HoennDex:: @ 842D21C .string "HOENN$" gOtherText_NationalDex:: @ 842D222 - .string "NATIONAL$" + .string "NATIONALER$" gOtherText_DiplomaCertificationGameFreak:: @ 842D22B - .string "{HIGHLIGHT TRANSPARENT}Player: {CLEAR 0x10}{COLOR RED}{PLAYER}\n\n{COLOR DARK_GREY}{STR_VAR_1} POKéDEX\nThis document certifies\nthat you have successfully\ncompleted your POKéDEX.\n\n{CLEAR_TO 0x42}{COLOR RED}GAME FREAK$" + .string "{HIGHLIGHT TRANSPARENT}Spieler: {CLEAR 16}{COLOR RED}{PLAYER}\n" + .string "\n" + .string "{COLOR DARK_GREY}{STR_VAR_1} POKéDEX\n" + .string "Dies Dokument bescheinigt\n" + .string "die erfolgreiche Vervoll-\n" + .string "ständigung des POKéDEX.\n" + .string "\n" + .string "{CLEAR_TO 66}{COLOR RED}GAME FREAK$" + .string "{COLOR RED}{HIGHLIGHT TRANSPARENT}GAME FREAK$" gOtherText_PLink:: @ 842D2BC - .string "{STR_VAR_1}P LINK$" + .string "{STR_VAR_1}SP-LINK$" gOtherText_YesNoTerminating:: @ 842D2C5 - .string "YES\nNO$" - .string "Terminating.$" + .string "JA\n" + .string "NEIN$" + + .string "Abbruch$" gOtherText_LinkNotFound:: @ 842D2D9 - .string "Link partner(s) not found.\nPlease try again.\p$" + .string "Kein(e) Link-Partner gefunden.\n" + .string "Bitte erneut versuchen.\p$" gOtherText_BlenderChooseBerry:: @ 842D307 - .string "Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p$" + .string "BEERENMIXER wird gestartet.\p" + .string "Wähle die BEERE aus dem BEUTEL,\n" + .string "die in den BEERENMIXER soll.\p$" gOtherText_PokeBlockMade:: @ 842D368 - .string " was made!$" + .string "{STR_VAR_1} wurde gemixt!$" gOtherText_PressAToStart:: @ 842D373 - .string "Press the A Button to start.$" + .string "Drücke A-Knopf zum Starten.$" gOtherText_PleaseWait:: @ 842D390 - .string "Please wait a while.$" + .string "Bitte hab noch ein wenig Geduld.$" gOtherText_LinkStandby3:: @ 842D3A5 - .string "Link standby...$" + .string "Verbindung...$" gOtherText_BlendAnotherBerryPrompt:: @ 842D3B5 - .string "Would you like to blend another BERRY?$" + .string "Möchtest du noch eine BEERE mixen?$" gOtherText_OutOfBerries:: @ 842D3DC - .string "You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p$" + .string "Du hast keine BEEREN mehr zum\n" + .string "Mixen im BEERENMIXER.\p" + .string "$" gOtherText_CaseIsFull:: @ 842D41A - .string "Your {POKEBLOCK} CASE is full.\p$" + .string "Deine {POKEBLOCK}-BOX ist voll.\p$" gOtherText_NoBerriesForBlend:: @ 842D434 - .string " has no BERRIES to put in\nthe BERRY BLENDER.$" + .string "{PLAYER} hat keine BEEREN\n" + .string "für den BEERENMIXER.$" gOtherText_OtherCaseIsFull:: @ 842D461 - .string "’s {POKEBLOCK} CASE is full.\p$" + .string "{POKEBLOCK}-BOX von {PLAYER} \n" + .string "ist voll.\n$" gOtherText_ResultsOfBlending:: @ 842D479 - .string "RESULTS OF BLENDING$" - .string "BERRY USED$" + .string "MIX-RESULTATE$" + + .string "VERW. BEERE$" gOtherText_Berry:: @ 842D498 - .string " BERRY$" + .string "{STR_VAR_1}BEERE$" gOtherText_RequiredTime:: @ 842D49F - .string "REQUIRED TIME$" + .string "ZEIT BENÖTIGT$" gOtherText_Min:: @ 842D4AD .string "MIN.$" gOtherText_Sec:: @ 842D4B2 - .string "SEC.$" + .string "SEK.$" gOtherText_MaxSpeed:: @ 842D4B7 - .string "MAXIMUM SPEED$" + .string "MAXIMALTEMPO$" gOtherText_RPM:: @ 842D4C5 - .string "RPM$" - .string ".$" + .string " RPM$" + + .string ",$" gOtherText_Ranking:: @ 842D4CB - .string "RANKING$" + .string "STUFE$" gOtherText_BlockLevelIs:: @ 842D4D3 - .string "The level is $" + .string "Der Level ist $" gOtherText_BlockFeelIs:: @ 842D4E1 - .string ", and the feel is $" + .string " und die Würze ist $" gOtherText_Period:: @ 842D4F4 .string ".$" gOtherText_Day:: @ 842D4F6 - .string "DAY$" + .string "TAG$" .string ":$" gOtherText_OK:: @ 842D4FC - .string "OK$" + .string "O.K.$" gOtherText_CorrectTimePrompt:: @ 842D4FF - .string "Is this the correct time?$" + .string "Ist die Uhrzeit korrekt?$" diff --git a/data/text/ability_descriptions.inc b/data/text/ability_descriptions.inc index a57225a50..ef3162a9a 100644 --- a/data/text/ability_descriptions.inc +++ b/data/text/ability_descriptions.inc @@ -1,236 +1,236 @@ gAbilityDescription_None: @ 81F99CC - .string "No special ability.$" + .string "Keine Spezial-Fähigkeit.$" gAbilityDescription_Stench: @ 81F99E0 - .string "Helps repel wild POKéMON.$" + .string "Wehrt wilde POKéMON ab.$" gAbilityDescription_Drizzle: @ 81F99FA - .string "Summons rain in battle.$" + .string "Ruft im Kampf Regen herbei.$" gAbilityDescription_SpeedBoost: @ 81F9A12 - .string "Gradually boosts SPEED.$" + .string "Erhöht INIT. nach und nach.$" gAbilityDescription_BattleArmor: @ 81F9A2A - .string "Blocks critical hits.$" + .string "Wehrt Volltreffer ab.$" gAbilityDescription_Sturdy: @ 81F9A40 - .string "Negates 1-hit KO attacks.$" + .string "Keine 1-Treffer-K.O.-Att.$" gAbilityDescription_Damp: @ 81F9A5A - .string "Prevents self-destruction.$" + .string "Gegen Selbstzerstörung.$" gAbilityDescription_Limber: @ 81F9A75 - .string "Prevents paralysis.$" + .string "Verhindert Paralyse.$" gAbilityDescription_SandVeil: @ 81F9A89 - .string "Ups evasion in a sandstorm.$" + .string "Erh. Fluchtw. i. Sandsturm.$" gAbilityDescription_Static: @ 81F9AA5 - .string "Paralyzes on contact.$" + .string "Paralysiert bei Berührung.$" gAbilityDescription_VoltAbsorb: @ 81F9ABB - .string "Turns electricity into HP.$" + .string "Wandelt Elektriz. in KP um.$" gAbilityDescription_WaterAbsorb: @ 81F9AD6 - .string "Changes water into HP.$" + .string "Wandelt Wasser in KP um.$" gAbilityDescription_Oblivious: @ 81F9AED - .string "Prevents attraction.$" + .string "Verhindert Anziehung.$" gAbilityDescription_CloudNine: @ 81F9B02 - .string "Negates weather effects.$" + .string "Keine Wetter-Effekte.$" gAbilityDescription_CompoundEyes: @ 81F9B1B - .string "Raises accuracy.$" + .string "Steigert Genauigkeit.$" gAbilityDescription_Insomnia: @ 81F9B2C - .string "Prevents sleep.$" + .string "Verhindert Einschlafen.$" gAbilityDescription_ColorChange: @ 81F9B3C - .string "Changes type to foe’s move.$" + .string "Ändert Att.-Typ d. Gegners.$" gAbilityDescription_Immunity: @ 81F9B58 - .string "Prevents poisoning.$" + .string "Verhindert Vergiftungen.$" gAbilityDescription_FlashFire: @ 81F9B6C - .string "Powers up if hit by fire.$" + .string "Steigt, wenn v. Feuer getr.$" gAbilityDescription_ShieldDust: @ 81F9B86 - .string "Prevents added effects.$" + .string "Gegen Zusatz-Effekte.$" gAbilityDescription_OwnTempo: @ 81F9B9E - .string "Prevents confusion.$" + .string "Verhindert Verwirrung.$" gAbilityDescription_SuctionCups: @ 81F9BB2 - .string "Firmly anchors the body.$" + .string "Verankert den Körper.$" gAbilityDescription_Intimidate: @ 81F9BCB - .string "Lowers the foe’s ATTACK.$" + .string "Senkt ANGR. des Gegners.$" gAbilityDescription_ShadowTag: @ 81F9BE4 - .string "Prevents the foe’s escape.$" + .string "Hindert Gegner an Flucht.$" gAbilityDescription_RoughSkin: @ 81F9BFF - .string "Hurts to touch.$" + .string "Verletzt bei Berührung.$" gAbilityDescription_WonderGuard: @ 81F9C0F - .string "“Super effective” hits.$" + .string "Nur sehr eff. Treff. schad.$" gAbilityDescription_Levitate: @ 81F9C27 - .string "Not hit by GROUND attacks.$" + .string "Kein Treffer b. BODEN-Att.$" gAbilityDescription_EffectSpore: @ 81F9C42 - .string "Leaves spores on contact.$" + .string "Gibt bei Kontakt Sporen ab.$" gAbilityDescription_Synchronize: @ 81F9C5C - .string "Passes on status problems.$" + .string "Gibt Stat.-Probleme weiter.$" gAbilityDescription_ClearBody: @ 81F9C77 - .string "Prevents ability reduction.$" + .string "Verhindert Fähigk.-Reduk.$" gAbilityDescription_NaturalCure: @ 81F9C93 - .string "Heals upon switching out.$" + .string "Heilt bei Austausch.$" gAbilityDescription_LightningRod: @ 81F9CAD - .string "Draws electrical moves.$" + .string "Zieht Elektro-Attacken an.$" gAbilityDescription_SereneGrace: @ 81F9CC5 - .string "Promotes added effects.$" + .string "Verstärkt Zusatz-Effekte.$" gAbilityDescription_SwiftSwim: @ 81F9CDD - .string "Raises SPEED in rain.$" + .string "Steigert INIT. bei Regen.$" gAbilityDescription_Chlorophyll: @ 81F9CF3 - .string "Raises SPEED in sunshine.$" + .string "INIT. + bei Sonnenschein.$" gAbilityDescription_Illuminate: @ 81F9D0D - .string "Encounter rate increases.$" + .string "Mehr PKMN-Begegnungen.$" gAbilityDescription_Trace: @ 81F9D27 - .string "Copies special ability.$" + .string "Kopiert Spezial-Attacke.$" gAbilityDescription_HugePower: @ 81F9D3F - .string "Raises ATTACK.$" + .string "Steigert ANGR.$" gAbilityDescription_PoisonPoint: @ 81F9D4E - .string "Poisons foe on contact.$" + .string "Vergiftet bei Berührung.$" gAbilityDescription_InnerFocus: @ 81F9D66 - .string "Prevents flinching.$" + .string "Verhindert Zurückschreck.$" gAbilityDescription_MagmaArmor: @ 81F9D7A - .string "Prevents freezing.$" + .string "Verhindert Einfrieren.$" gAbilityDescription_WaterVeil: @ 81F9D8D - .string "Prevents burns.$" + .string "Verhindert Verbrennungen.$" gAbilityDescription_MagnetPull: @ 81F9D9D - .string "Traps STEEL-type POKéMON.$" + .string "Fängt STAHL-POKéMON.$" gAbilityDescription_Soundproof: @ 81F9DB7 - .string "Avoids sound-based moves.$" + .string "Immun gg. Lärm-Attacken.$" gAbilityDescription_RainDish: @ 81F9DD1 - .string "Slight HP recovery in rain.$" + .string "KP-Anstieg bei Regen.$" gAbilityDescription_SandStream: @ 81F9DED - .string "Summons a sandstorm.$" + .string "Erzeugt einen Sandsturm.$" gAbilityDescription_Pressure: @ 81F9E02 - .string "Raises foe’s PP usage.$" + .string "Steigert AP des Gegners.$" gAbilityDescription_ThickFat: @ 81F9E19 - .string "Heat-and-cold protection.$" + .string "Schutz vor Hitze und Kälte.$" gAbilityDescription_EarlyBird: @ 81F9E33 - .string "Awakens quickly from sleep.$" + .string "Schnelles Aufwachen.$" gAbilityDescription_FlameBody: @ 81F9E4F - .string "Burns the foe on contact.$" + .string "Verbrennt bei Berührung.$" gAbilityDescription_RunAway: @ 81F9E69 - .string "Makes escaping easier.$" + .string "Erleichtert das Entkommen.$" gAbilityDescription_KeenEye: @ 81F9E80 - .string "Prevents loss of accuracy.$" + .string "Verhindert Verl. d. Genauig.$" gAbilityDescription_HyperCutter: @ 81F9E9B - .string "Prevents ATTACK reduction.$" + .string "Verhindert ANGR.-Reduz.$" gAbilityDescription_Pickup: @ 81F9EB6 - .string "May pick up items.$" + .string "Kann Objekte aufnehmen.$" gAbilityDescription_Truant: @ 81F9EC9 - .string "Moves only every two turns.$" + .string "Greift in jedem 2. Zug an.$" gAbilityDescription_Hustle: @ 81F9EE5 - .string "Trades accuracy for power.$" + .string "Tauscht Genauigk. u. Kraft.$" gAbilityDescription_CuteCharm: @ 81F9F00 - .string "Infatuates on contact.$" + .string "Wirkt bei Kontakt betörend.$" gAbilityDescription_Plus: @ 81F9F17 - .string "Powers up with MINUS.$" + .string "Bildet ein Team mit MINUN.$" gAbilityDescription_Minus: @ 81F9F2D - .string "Powers up with PLUS.$" + .string "Bildet ein Team mit PLUSLE.$" gAbilityDescription_Forecast: @ 81F9F42 - .string "Changes with the weather.$" + .string "Ist vom Wetter abhängig.$" gAbilityDescription_StickyHold: @ 81F9F5C - .string "Prevents item theft.$" + .string "Verhindert ITEM-Diebstahl.$" gAbilityDescription_ShedSkin: @ 81F9F71 - .string "Heals the body by shedding.$" + .string "Heilt durch Häutung.$" gAbilityDescription_Guts: @ 81F9F8D - .string "Ups ATTACK if suffering.$" + .string "Steigert ANGR. bei Leiden.$" gAbilityDescription_MarvelScale: @ 81F9FA6 - .string "Ups DEFENSE if suffering.$" + .string "Steigert VERT. bei Leiden.$" gAbilityDescription_LiquidOoze: @ 81F9FC0 - .string "Draining causes injury.$" + .string "Saug-Attacken schädigen.$" gAbilityDescription_Overgrow: @ 81F9FD8 - .string "Ups GRASS moves in a pinch.$" + .string "Erhöht PFL.-Att. i. d. Not.$" gAbilityDescription_Blaze: @ 81F9FF4 - .string "Ups FIRE moves in a pinch.$" + .string "Erhöht FEUER-Att. in Not.$" gAbilityDescription_Torrent: @ 81FA00F - .string "Ups WATER moves in a pinch.$" + .string "Erhöht WASSER-Att. in Not.$" gAbilityDescription_Swarm: @ 81FA02B - .string "Ups BUG moves in a pinch.$" + .string "Erhöht KÄFER-Att. in Not.$" gAbilityDescription_RockHead: @ 81FA045 - .string "Prevents recoil damage.$" + .string "Verh. Rückstoß-Schaden.$" gAbilityDescription_Drought: @ 81FA05D - .string "Summons sunlight in battle.$" + .string "Erzeugt Sonne im Kampf.$" gAbilityDescription_ArenaTrap: @ 81FA079 - .string "Prevents fleeing.$" + .string "Verhindert Flucht.$" gAbilityDescription_VitalSpirit: @ 81FA08B - .string "Prevents sleep.$" + .string "Verhindert Einschlafen.$" gAbilityDescription_WhiteSmoke: @ 81FA09B - .string "Prevents ability reduction.$" + .string "Verhindert Fähigk.-Reduz.$" gAbilityDescription_PurePower: @ 81FA0B7 - .string "Raises ATTACK.$" + .string "Steigert ANGR.$" gAbilityDescription_ShellArmor: @ 81FA0C6 - .string "Blocks critical hits.$" + .string "Wehrt Volltreffer ab.$" gAbilityDescription_Cacophony: @ 81FA0DC - .string "Avoids sound-based moves.$" + .string "Immun gg. Lärm-Attacken.$" gAbilityDescription_AirLock: @ 81FA0F6 - .string "Negates weather effects.$" + .string "Kehrt Wetter-Effekte um.$" .align 2 gAbilityDescriptions:: @ 81FA110 diff --git a/data/text/ability_names.inc b/data/text/ability_names.inc index ec0265fda..6ed9dd033 100644 --- a/data/text/ability_names.inc +++ b/data/text/ability_names.inc @@ -1,79 +1,79 @@ gAbilityNames:: @ 81FA248 .string "-------$", 13 - .string "STENCH$", 13 - .string "DRIZZLE$", 13 - .string "SPEED BOOST$", 13 - .string "BATTLE ARMOR$", 13 - .string "STURDY$", 13 - .string "DAMP$", 13 - .string "LIMBER$", 13 - .string "SAND VEIL$", 13 - .string "STATIC$", 13 - .string "VOLT ABSORB$", 13 - .string "WATER ABSORB$", 13 - .string "OBLIVIOUS$", 13 - .string "CLOUD NINE$", 13 - .string "COMPOUNDEYES$", 13 + .string "DUFTNOTE$", 13 + .string "NIESEL$", 13 + .string "TEMPOSCHUB$", 13 + .string "KAMPFPANZER$", 13 + .string "ROBUSTHEIT$", 13 + .string "FEUCHTIGKEIT$", 13 + .string "FLEXIBILITÄT$", 13 + .string "SANDSCHLEIER$", 13 + .string "STATIK$", 13 + .string "VOLTABSORBER$", 13 + .string "H2O-ABSORBER$", 13 + .string "DÖSIGKEIT$", 13 + .string "WOLKE SIEBEN$", 13 + .string "FACETTENAUGE$", 13 .string "INSOMNIA$", 13 - .string "COLOR CHANGE$", 13 - .string "IMMUNITY$", 13 - .string "FLASH FIRE$", 13 - .string "SHIELD DUST$", 13 - .string "OWN TEMPO$", 13 - .string "SUCTION CUPS$", 13 - .string "INTIMIDATE$", 13 - .string "SHADOW TAG$", 13 - .string "ROUGH SKIN$", 13 - .string "WONDER GUARD$", 13 - .string "LEVITATE$", 13 - .string "EFFECT SPORE$", 13 - .string "SYNCHRONIZE$", 13 - .string "CLEAR BODY$", 13 - .string "NATURAL CURE$", 13 - .string "LIGHTNINGROD$", 13 - .string "SERENE GRACE$", 13 - .string "SWIFT SWIM$", 13 + .string "FARBWECHSEL$", 13 + .string "IMMUNITÄT$", 13 + .string "FEUERFÄNGER$", 13 + .string "PUDERABWEHR$", 13 + .string "TEMPOMACHER$", 13 + .string "SAUGNAPF$", 13 + .string "BEDROHER$", 13 + .string "WEGSPERRE$", 13 + .string "RAUHAUT$", 13 + .string "WUNDERWACHE$", 13 + .string "SCHWEBE$", 13 + .string "SPORENWIRT$", 13 + .string "SYNCHRO$", 13 + .string "NEUTRALTORSO$", 13 + .string "INNERE KRAFT$", 13 + .string "BLITZFÄNGER$", 13 + .string "EDELMUT$", 13 + .string "WASSERTEMPO$", 13 .string "CHLOROPHYLL$", 13 - .string "ILLUMINATE$", 13 - .string "TRACE$", 13 - .string "HUGE POWER$", 13 - .string "POISON POINT$", 13 - .string "INNER FOCUS$", 13 - .string "MAGMA ARMOR$", 13 - .string "WATER VEIL$", 13 - .string "MAGNET PULL$", 13 - .string "SOUNDPROOF$", 13 - .string "RAIN DISH$", 13 - .string "SAND STREAM$", 13 - .string "PRESSURE$", 13 - .string "THICK FAT$", 13 - .string "EARLY BIRD$", 13 - .string "FLAME BODY$", 13 - .string "RUN AWAY$", 13 - .string "KEEN EYE$", 13 - .string "HYPER CUTTER$", 13 - .string "PICKUP$", 13 - .string "TRUANT$", 13 - .string "HUSTLE$", 13 - .string "CUTE CHARM$", 13 + .string "ERLEUCHTUNG$", 13 + .string "FÄHRTE$", 13 + .string "KRAFTKOLOSS$", 13 + .string "GIFTDORN$", 13 + .string "KONZENTRATOR$", 13 + .string "MAGMAPANZER$", 13 + .string "AQUAHÜLLE$", 13 + .string "MAGNETFALLE$", 13 + .string "LÄRMSCHUTZ$", 13 + .string "REGENGENUSS$", 13 + .string "SANDSTURM$", 13 + .string "ERZWINGER$", 13 + .string "SPECKSCHICHT$", 13 + .string "FRÜHWECKER$", 13 + .string "FLAMMKÖRPER$", 13 + .string "ANGSTHASE$", 13 + .string "ADLERAUGE$", 13 + .string "SCHERENMACHT$", 13 + .string "MITNAHME$", 13 + .string "SCHNARCHNASE$", 13 + .string "ÜBEREIFER$", 13 + .string "CHARMEBOLZEN$", 13 .string "PLUS$", 13 .string "MINUS$", 13 - .string "FORECAST$", 13 - .string "STICKY HOLD$", 13 - .string "SHED SKIN$", 13 - .string "GUTS$", 13 - .string "MARVEL SCALE$", 13 - .string "LIQUID OOZE$", 13 - .string "OVERGROW$", 13 - .string "BLAZE$", 13 - .string "TORRENT$", 13 - .string "SWARM$", 13 - .string "ROCK HEAD$", 13 - .string "DROUGHT$", 13 - .string "ARENA TRAP$", 13 - .string "VITAL SPIRIT$", 13 - .string "WHITE SMOKE$", 13 - .string "PURE POWER$", 13 - .string "SHELL ARMOR$", 13 - .string "CACOPHONY$", 13 - .string "AIR LOCK$", 13 + .string "PROGNOSE$", 13 + .string "WERTEHALTER$", 13 + .string "EXPIDERMIS$", 13 + .string "ADRENALIN$", 13 + .string "NOTSCHUTZ$", 13 + .string "KLOAKENSOSSE$", 13 + .string "NOTDÜNGER$", 13 + .string "GROSSBRAND$", 13 + .string "STURZBACH$", 13 + .string "HEXAPLAGA$", 13 + .string "STEINHAUPT$", 13 + .string "DÜRRE$", 13 + .string "AUSWEGSLOS$", 13 + .string "MUNTERKEIT$", 13 + .string "PULVERRAUCH$", 13 + .string "MENTALKRAFT$", 13 + .string "PANZERHAUT$", 13 + .string "KAKOPHONY$", 13 + .string "KLIMASCHUTZ$", 13 diff --git a/data/text/aqua_awakening.inc b/data/text/aqua_awakening.inc index bfe2d1d01..4e69277ca 100644 --- a/data/text/aqua_awakening.inc +++ b/data/text/aqua_awakening.inc @@ -1,96 +1,100 @@ UnknownString_81B41B8: @ 81B41B8 - .string "ARCHIE: Hold it right there.$" + .string "ADRIAN: Bleib sofort stehen!$" UnknownString_81B41D5: @ 81B41D5 - .string "ARCHIE: Fufufu...\n" - .string "So it was you, after all.$" + .string "ADRIAN: Hahahaha...\n" + .string "Du warst das also die ganze Zeit.$" UnknownString_81B4201: @ 81B4201 - .string "ARCHIE: Behold!\p" - .string "See how beautiful it is, the sleeping\n" - .string "form of the ancient POKéMON KYOGRE!\p" - .string "I have waited so long for this day to\n" - .string "come...$" + .string "ADRIAN: Schau nur, schau nur!\p" + .string "Schau, wie schön die schlafende Gestalt\n" + .string "des antiken POKéMON KYOGRE ist!\p" + .string "Ich habe so lange auf diesen Tag\n" + .string "gewartet...$" UnknownString_81B4289: @ 81B4289 - .string "ARCHIE: It surprises me, how you’ve\n" - .string "managed to chase me here.\p" - .string "But that’s all over now.\p" - .string "For the realization of my dream,\n" - .string "you must disappear now!$" + .string "ADRIAN: Es überrascht mich, wie du es\n" + .string "geschafft hast, mir zu folgen.\p" + .string "Aber das ist nun alles Nebensache.\p" + .string "Damit meine Träume wahr werden, musst\n" + .string "du leider verschwinden!$" UnknownString_81B4319: @ 81B4319 - .string "I...\n" - .string "I lost again?$" + .string "Ich...\n" + .string "Ich habe wieder verloren?$" UnknownString_81B432C: @ 81B432C - .string "ARCHIE: Fufufu...\p" - .string "I commend you. I must recognize that\n" - .string "you are truly gifted.\p" - .string "But!\n" - .string "I have this in my possession!\p" - .string "With this RED ORB, I can make KYOGRE...$" + .string "ADRIAN: Hahahaha...\p" + .string "Ich empfehle mich. Ich muss sagen, du\n" + .string "bist wirklich sehr talentiert.\p" + .string "Aber!\n" + .string "Ich habe dieses hier in meinem Besitz!\p" + .string "Mit dieser ROTEN KUGEL kann ich\n" + .string "KYOGRE...$" UnknownString_81B43C4: @ 81B43C4 - .string "The RED ORB suddenly began shining\n" - .string "by itself!$" + .string "Die ROTE KUGEL beginnt plötzlich von\n" + .string "innen heraus zu leuchten!$" UnknownString_81B43F2: @ 81B43F2 - .string "ARCHIE: What?!\p" - .string "I didn’t do anything.\n" - .string "Why did the RED ORB...\p" - .string "Where did KYOGRE go?$" + .string "ADRIAN: Was?!?\p" + .string "Ich habe doch gar nichts gemacht.\n" + .string "Die ROTE KUGEL... Warum...\p" + .string "Wo ist KYOGRE geblieben?$" UnknownString_81B4443: @ 81B4443 - .string "ARCHIE: Hm? It’s a message from our\n" - .string "members outside...$" + .string "ADRIAN: Hm? Dies ist eine Nachricht\n" + .string "unserer Mitglieder draußen...$" UnknownString_81B447A: @ 81B447A - .string "ARCHIE: Yes, what is it?\p" + .string "ADRIAN: Ja, was ist denn jetzt los?\p" .string "Hm...\n" - .string "It’s raining heavily?\p" - .string "Good... That should have happened.\n" - .string "That is why we awakened KYOGRE,\l" - .string "to realize TEAM AQUA’s vision of\l" - .string "expanding the sea.\p" - .string "What?!\p" - .string "It’s raining far harder than we\n" - .string "envisioned? You’re in danger?\p" - .string "That can’t be...\n" - .string "That’s just not possible...\p" - .string "Hold your position and monitor the\n" - .string "situation!$" + .string "Es regnet? So heftig?\p" + .string "Gut... Genau darauf habe ich gewartet.\n" + .string "Deshalb haben wir KYOGRE erweckt.\l" + .string "Um TEAM AQUAS Vision von der Erweite-\l" + .string "rung der Meere zu realisieren.\p" + .string "Was?!?\p" + .string "Es regnet stärker, als wir es voraus-\n" + .string "gesagt haben? Wir sind in Gefahr?\p" + .string "Das kann nicht sein...\n" + .string "Das ist unmöglich...\p" + .string "Bleib wo du bist und behalte die\n" + .string "Situation im Auge!$" UnknownString_81B45C6: @ 81B45C6 - .string "ARCHIE: There’s something wrong...\p" - .string "The RED ORB is supposed to awaken\n" - .string "and control KYOGRE...\p" - .string "But... Why?\n" - .string "Why did KYOGRE disappear?\p" - .string "Why?!$" + .string "ADRIAN: Irgendetwas stimmt da ganz und\n" + .string "gar nicht...\p" + .string "Die ROTE KUGEL sollte KYOGRE auf-\n" + .string "wecken und unter Kontrolle halten...\p" + .string "Aber... Warum?\n" + .string "Warum ist KYOGRE verschwunden?\p" + .string "Warum?!?$" UnknownString_81B464D: @ 81B464D - .string "MAXIE: What have you wrought?\p" - .string "ARCHIE... You’ve finally awoken KYOGRE,\n" - .string "haven’t you?\p" - .string "What will happen to the world if this\n" - .string "downpour continues for all eternity?\p" - .string "The world’s landmass will drown in\n" - .string "the deepening sea...$" + .string "MARC: Was hast du da nur herauf-\n" + .string "beschworen?\p" + .string "ADRIAN... Du hast KYOGRE aufge-\n" + .string "weckt, stimmt’s?\p" + .string "Was wird nur aus der Welt, wenn es\n" + .string "bis in alle Ewigkeit regnen wird?\p" + .string "Das Land wird untergehen und im\n" + .string "Meer verschwinden...$" UnknownString_81B4723: @ 81B4723 - .string "ARCHIE: What are you saying?\p" - .string "The RED ORB should let me control\n" - .string "KYOGRE...\l" - .string "That can’t be possible...$" + .string "ADRIAN: Was sagst du da?\p" + .string "Die ROTE KUGEL sollte mir die Kontrolle\n" + .string "über KYOGRE verschaffen...\l" + .string "Das kann einfach nicht wahr sein...$" UnknownString_81B4786: @ 81B4786 - .string "MAXIE: We don’t have the time to\n" - .string "argue about it here!\p" - .string "Get outside and see for yourself!\p" - .string "See if what you’ve wrought is the\n" - .string "world that you desired!$" + .string "MARC: Wir haben keine Zeit für\n" + .string "Diskussionen!\p" + .string "Geh nach draußen und sieh es dir\n" + .string "selber an!\p" + .string "Sieh, ob das, was du heraufbeschworen\n" + .string "hast, das ist, was du wolltest!$" UnknownString_81B4818: @ 81B4818 - .string "MAXIE: {PLAYER}{KUN}, come on, you have\n" - .string "to get out of here, too!$" + .string "MARC: {PLAYER}{KUN}, komm, du musst\n" + .string "ebenfalls von hier verschwinden!$" diff --git a/data/text/aqua_chimney.inc b/data/text/aqua_chimney.inc index 2c8d94a0b..1d7e39f81 100644 --- a/data/text/aqua_chimney.inc +++ b/data/text/aqua_chimney.inc @@ -1,142 +1,145 @@ MtChimney_Text_1B2DEE:: @ 81B2DEE - .string "The power contained in the\n" - .string "METEORITE...\p" - .string "By amplifying its power with this\n" - .string "machine, MT. CHIMNEY’s volcanic activity\l" - .string "will stop.\p" - .string "Fufufu... Eventually, the cooled-down\n" - .string "crater will fill with rainwater, giving\l" - .string "WATER POKéMON a place to live.$" + .string "Die Kraft, die in diesem METEORITEN\n" + .string "steckt...\p" + .string "Wenn man diese Kraft mit dieser\n" + .string "Maschine verstärkt, kann man die\l" + .string "Aktivität des SCHLOTBERGs stoppen.\p" + .string "Hahaha... Und dann füllt sich der ausge-\n" + .string "kühlte Krater mit Regenwasser und gibt\l" + .string "den WASSER-POKéMON Lebensraum.$" MtChimney_Text_1B2ED9:: @ 81B2ED9 - .string "ARCHIE: You again...\p" - .string "Now listen.\n" - .string "All life depends on the sea.\p" - .string "The sea is everything!\n" - .string "Its importance is paramount!\p" - .string "That is why we of TEAM AQUA are\n" - .string "committed to expanding the sea.\p" - .string "Doing so will result in the emergence\n" - .string "of new POKéMON species.\p" - .string "We will return the world back to\n" - .string "nature for the good of POKéMON.\p" - .string "That is TEAM AQUA’s vision!\p" - .string "I can’t allow an ignorant child like\n" - .string "you to get in our way.\p" - .string "I, ARCHIE, will show you the\n" - .string "consequences of meddling!$" + .string "ADRIAN: Du schon wieder...\p" + .string "Hör gut zu.\n" + .string "Das Meer bringt alles Leben hervor.\p" + .string "Wasser bedeutet Leben!\n" + .string "Es besitzt absolute Priorität!\p" + .string "Daher widmet sich TEAM AQUA der Auf-\n" + .string "gabe, die Meere zu vergrößern.\p" + .string "So können sich neue POKéMON-Arten\n" + .string "entwickeln.\p" + .string "Wir wollen die Welt zum Wohle der\n" + .string "POKéMON umgestalten.\p" + .string "Das ist die große Vision von TEAM AQUA!\p" + .string "Ich kann einem sturen Kind wie dir nicht\n" + .string "erlauben, sich uns in den Weg zu stellen.\p" + .string "Ich, ADRIAN, werde dir zeigen, was\n" + .string "passiert, wenn du uns aufhalten willst!$" MtChimney_Text_1B3099:: @ 81B3099 - .string "What?!\p" - .string "I, ARCHIE, was caught off guard?!$" + .string "Wie bitte?!?\p" + .string "Ich, ADRIAN, wurde ganz hinterhältig\n" + .string "besiegt?!?$" MtChimney_Text_1B30C2:: @ 81B30C2 - .string "ARCHIE: Ah, whatever.\n" - .string "I will give up our plans for MT.\l" - .string "CHIMNEY for the time being...\p" - .string "But no one can ever stop us!\n" - .string "TEAM AQUA will prevail!\p" - .string "Don’t you ever forget that!$" + .string "ADRIAN: Ach, was soll’s.\n" + .string "Ich werde für heute meine Pläne am\l" + .string "SCHLOTBERG vergessen. Für heute!\p" + .string "Niemand wird uns jemals stoppen!\n" + .string "TEAM AQUA wird siegen!!!\p" + .string "Vergiss das nicht!!!$" MtChimney_Text_1B3168:: @ 81B3168 - .string "Hehehe!\p" - .string "So you’ve come all the way here!\p" - .string "But you’re too late!\n" - .string "I’ve already delivered the METEORITE\l" - .string "from METEOR FALLS to the BOSS!$" + .string "Hahahaha!\p" + .string "Hast du dich den ganzen Weg hier\n" + .string "heraufgequält?\p" + .string "So ein Jammer. Du kommst zu spät.\n" + .string "Ich habe den METEORITEN aus METEOR-\l" + .string "FÄLLE bereits unserem BOSS gegeben!$" MtChimney_Text_1B31EA:: @ 81B31EA - .string "Hehehe...\n" - .string "So I lost...\p" - .string "I’m sure glad I never took you on back\n" - .string "at METEOR FALLS.$" + .string "Hahaha...\n" + .string "Da habe ich wohl verloren...\p" + .string "Gut, dass ich dich nicht schon in\n" + .string "METEORFÄLLE herausgefordert habe.$" MtChimney_Text_1B3239:: @ 81B3239 - .string "Hehehe!\p" - .string "You might have beaten me, but you don’t\n" - .string "stand a chance against the BOSS!\p" - .string "If you get lost now, you won’t have to\n" - .string "face a sound whipping!$" + .string "Hahaha!\p" + .string "Du hast mich besiegt, aber gegen\n" + .string "unseren BOSS hast du keine Chance!\p" + .string "Wenn du dich jetzt leise aus dem Staub\n" + .string "machst, vermeidest du jede Menge Ärger.$" MtChimney_Text_1B32C8:: @ 81B32C8 - .string "We of TEAM AQUA are working hard for\n" - .string "everyone’s sake.\p" - .string "Like, if there’s more water around,\n" - .string "WATER POKéMON will be happy, and it’ll\l" - .string "give people more fun places to swim!$" + .string "Wir vom TEAM AQUA setzen unsere\n" + .string "Energie zum Wohle aller ein.\p" + .string "Wenn es mehr Wasser gibt, sind die\n" + .string "WASSER-POKéMON glücklicher und die\l" + .string "Menschen hätten mehr Platz zum\l" + .string "Schwimmen.$" MtChimney_Text_1B336E:: @ 81B336E - .string "Hunh?\n" - .string "What do you mean I lost?$" + .string "Bitte?\n" + .string "Was heißt das? Ich habe verloren?$" MtChimney_Text_1B338D:: @ 81B338D - .string "Our BOSS says, “It will make everyone\n" - .string "happy.”\p" - .string "But why does everyone keep getting\n" - .string "in our way?$" + .string "Unser BOSS sagt: “So wird jeder\n" + .string "glücklich sein...”\p" + .string "Aber warum versucht dann jeder, uns\n" + .string "aufzuhalten?$" MtChimney_Text_1B33EA:: @ 81B33EA - .string "That annoying TEAM MAGMA...\n" - .string "They always mess with our plans!$" + .string "Dieses nervtötende TEAM MAGMA! Jedes\n" + .string "Mal versuchen sie, uns zu stoppen!$" MtChimney_Text_1B3427:: @ 81B3427 - .string "METEORITES pack amazing power!$" + .string "METEORITEN stecken voller Energie.$" MtChimney_Text_1B3446:: @ 81B3446 - .string "Go! Stomp TEAM MAGMA!\n" - .string "And expand the sea!$" + .string "Los! Stampfen wir TEAM MAGMA in den\n" + .string "Boden! Und vergrößern die Meere!$" MtChimney_Text_1B3470:: @ 81B3470 - .string "Stay out of our way, okay?\p" - .string "We’re trying to enlarge the sea for\n" - .string "the good of everybody!$" + .string "Komm uns nicht in die Quere, okay?\p" + .string "Wir versuchen, das Meer zum Wohle aller\n" + .string "zu vergrößern!$" MtChimney_Text_1B34C6:: @ 81B34C6 .string "Yeah!\n" - .string "Hose them down!$" + .string "Jeder wird nass!$" MtChimney_Text_1B34DC:: @ 81B34DC - .string "We’re going to keep expanding the sea!$" + .string "Wir werden die Meere vergrößern.$" MtChimney_Text_1B3503:: @ 81B3503 .string "Bushaa!$" MtChimney_Text_1B350B:: @ 81B350B - .string "MAXIE: Oh, {PLAYER}{KUN}!\p" - .string "Please, you must stop TEAM AQUA\n" - .string "for me!\p" - .string "They’re trying to make this volcano\n" - .string "inactive by using the stolen\l" - .string "METEORITE’s power!$" + .string "MARC: Oh, {PLAYER}{KUN}!\p" + .string "Bitte, halte TEAM AQUA für mich auf!\p" + .string "Sie versuchen, mit der Kraft des\n" + .string "gestohlenen METEORITEN den Vulkan\l" + .string "zu inaktivieren!$" MtChimney_Text_1B3598:: @ 81B3598 - .string "MAXIE: {PLAYER}{KUN}!\p" - .string "Please, you’ve got to stop TEAM AQUA\n" - .string "for me!\p" - .string "Dealing with these three thugs is\n" - .string "a lot, even for me!$" + .string "MARC: Oh, {PLAYER}{KUN}!\p" + .string "Bitte, halte TEAM AQUA für mich auf!\p" + .string "Diese drei Schurken sind selbst für mich\n" + .string "eine harte Nuss!$" MtChimney_Text_1B3608:: @ 81B3608 - .string "MAXIE: {PLAYER}{KUN}! Thank you!\p" - .string "With your help, we thwarted TEAM\n" - .string "AQUA’s destructive plan!\p" - .string "But... This victory doesn’t mean the\n" - .string "end of their evil plans.\p" - .string "We will remain vigilant and keep up\n" - .string "our pursuit of TEAM AQUA.\p" - .string "{PLAYER}{KUN}, we shall meet again!$" + .string "MARC: {PLAYER}{KUN}!\p" + .string "Mit deiner Hilfe konnte ich die Pläne\n" + .string "von TEAM AQUA durchkreuzen!\p" + .string "Aber... Dieser Sieg bedeutet nicht, dass\n" + .string "sie ihre üblen Pläne aufgeben werden.\p" + .string "Wir werden ein wachsames Auge auf TEAM\n" + .string "AQUA haben und sie weiter verfolgen.\p" + .string "{PLAYER}{KUN}, wir werden uns wieder sehen!$" MtChimney_Text_1B36F1:: @ 81B36F1 - .string "Darn... TEAM AQUA outnumbers us!\n" - .string "We can’t keep up with them!$" + .string "Mist... TEAM AQUA ist uns zahlenmäßig\n" + .string "überlegen! Wir können es nicht mit ihnen\l" + .string "aufnehmen!$" MtChimney_Text_1B372E:: @ 81B372E - .string "If they expand the sea, there’ll be less\n" - .string "habitats for POKéMON and people!$" + .string "Wenn sie die Meere vergrößern, gibt es\n" + .string "weniger Lebensraum für POKéMON und\l" + .string "Menschen!$" MtChimney_Text_1B3778:: @ 81B3778 - .string "TEAM AQUA wants to expand the sea...\n" - .string "How’s that for insane?$" + .string "TEAM AQUA versucht, die Meere zu ver-\n" + .string "größern... Sind die krank im Hirn?$" MtChimney_Text_1B37B4:: @ 81B37B4 .string "Bufoh!$" diff --git a/data/text/aqua_settled.inc b/data/text/aqua_settled.inc index 13f503c41..0cf2c5ed4 100644 --- a/data/text/aqua_settled.inc +++ b/data/text/aqua_settled.inc @@ -1,16 +1,17 @@ UnknownString_81B4F03: @ 81B4F03 - .string "{PLAYER}’s BLUE ORB suddenly began\n" - .string "glowing!$" + .string "Die BLAUE KUGEL von {PLAYER}\n" + .string "beginnt plötzlich von innen\l" + .string "heraus zu leuchten!$" UnknownString_81B4F29: @ 81B4F29 - .string "KYOGRE appears to have settled\n" - .string "into sleep again...$" + .string "KYOGRE wurde offensichtlich\n" + .string "wieder in Schlaf versetzt...$" UnknownString_81B4F5C: @ 81B4F5C - .string "ARCHIE: This...$" + .string "ADRIAN: Das...$" UnknownString_81B4F6C: @ 81B4F6C - .string "ARCHIE: ... ... ... ... ... ...\n" + .string "ADRIAN: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "This is good-bye.\n" - .string "This is the last you’ve seen of me...$" + .string "Das heißt wohl Goodbye. Das ist das\n" + .string "Letzte, was du von mir siehst.$" diff --git a/data/text/aqua_summit.inc b/data/text/aqua_summit.inc index 696ef0084..501c4d435 100644 --- a/data/text/aqua_summit.inc +++ b/data/text/aqua_summit.inc @@ -1,156 +1,164 @@ UnknownString_81B50C3: @ 81B50C3 - .string "I’ll show you exactly how scary\n" - .string "TEAM AQUA can be!$" + .string "Ich zeige dir, wie unheimlich gruselig\n" + .string "TEAM AQUA sein kann!$" UnknownString_81B50F5: @ 81B50F5 - .string "So you think you can stand up alone\n" - .string "to TEAM AQUA’s might...$" + .string "Und du glaubst wirklich, du bist der\n" + .string "Stärke TEAM AQUAS gewachsen?!?$" UnknownString_81B5131: @ 81B5131 - .string "Yeah, so you are strong...\n" - .string "But there’re a lot of us!$" + .string "Ja, du bist ganz schön stark...\n" + .string "Aber wir sind viele...$" UnknownString_81B5166: @ 81B5166 - .string "What’s up with you?\n" - .string "What does a single kid expect to do?$" + .string "Was ist los mit dir? Was kann ein\n" + .string "kleines Kind schon ausrichten?$" UnknownString_81B519F: @ 81B519F - .string "Dang...\n" - .string "Too strong...$" + .string "Bumms...\n" + .string "Zu stark... Viel zu stark...$" UnknownString_81B51B5: @ 81B51B5 - .string "You don’t know anything.\n" - .string "Quit messing around with us!$" + .string "Du weißt doch gar nichts! Misch dich\n" + .string "besser nicht in unsere Sachen ein!$" UnknownString_81B51EB: @ 81B51EB - .string "Hey, I remember you from MT. CHIMNEY!\n" - .string "It’s payback time!$" + .string "Hey, ich kenne dich vom SCHLOTBERG!\n" + .string "Der Tag der Abrechnung ist gekommen!$" UnknownString_81B5224: @ 81B5224 - .string "Urgggh...\n" - .string "Beaten by some kid again!$" + .string "Aaaaargh!\n" + .string "Schon wieder von einem Kind besiegt...$" UnknownString_81B5248: @ 81B5248 - .string "Heh, it doesn’t matter!\n" - .string "We bought ourselves some time!\p" - .string "The BOSS should have snatched what\n" - .string "he was after!$" + .string "Ach, das spielt keine Rolle.\n" + .string "Wir haben Zeit herausgeschlagen!\p" + .string "Der BOSS müsste mittlerweile haben, was\n" + .string "er besorgen wollte!$" UnknownString_81B52B0: @ 81B52B0 - .string "ARCHIE: Not you again...\p" - .string "You’ve impeded our plans repeatedly,\n" - .string "but this time you’re too late.\p" - .string "The RED ORB that rested atop\n" - .string "MT. PYRE...\l" - .string "I, ARCHIE, claim it as mine!\p" - .string "Fufufu... Finally, I can realize my\n" - .string "grand design...\p" - .string "Come on, crew!\n" - .string "It’s SLATEPORT next!$" + .string "ADRIAN: Nicht du schon wieder...\p" + .string "Du bist uns ja sehr schnell auf die Spur\n" + .string "gekommen, aber es ist schon zu spät.\p" + .string "Die ROTE KUGEL, die sich oben\n" + .string "auf dem PYROBERG befindet...\l" + .string "Ich, ADRIAN, sage, sie gehört mir!\p" + .string "Hahaha... Jetzt werden meine\n" + .string "Visionen Wirklichkeit!\p" + .string "Los, Mannschaft!\n" + .string "GRAPHITPORT CITY heißt unser Ziel.$" UnknownString_81B53AB: @ 81B53AB - .string "Oh, no...\n" - .string "This cannot happen...\p" - .string "How could they take the RED ORB?\p" - .string "The BLUE ORB and RED ORB must never\n" - .string "be separated. They belong together.\p" + .string "Oh, neeeeiiinnn...\n" + .string "Das darf nicht wahr sein!\p" + .string "Wie konnten sie nur an die ROTE\n" + .string "KUGEL gelangen?!?\p" + .string "Die BLAUE KUGEL und die ROTE KUGEL\n" + .string "dürfen nie getrennt sein.\l" + .string "Sie gehören zusammen!!!\p" .string "... ... ... ... ... ... ... ...\n" .string "Hmm...\p" - .string "Fine!\n" - .string "You take the remaining BLUE ORB.\p" - .string "Please take after that foul man and\n" - .string "get the other ORB back!$" + .string "Gut! Nimm die verbliebene BLAUE\n" + .string "KUGEL an dich.\p" + .string "Bitte folge diesem Schurken und bring\n" + .string "die KUGEL zurück!$" UnknownString_81B54BE: @ 81B54BE - .string "The BLUE ORB you have been entrusted\n" - .string "with and the stolen RED ORB...\p" - .string "They must never be apart...\n" - .string "Something terrible will happen...$" + .string "Die BLAUE KUGEL, die dir anvertraut\n" + .string "wurde, und die gestohlene ROTE KUGEL...\p" + .string "Sie dürfen niemals getrennt werden...\n" + .string "Sonst passiert etwas Schreckliches!$" UnknownString_81B5540: @ 81B5540 .string "So...\n" - .string "KYOGRE has awoken...\p" - .string "The wondrous ORB that is said to have\n" - .string "becalmed the raging KYOGRE...\l" - .string "It is the BLUE ORB you bear.\p" - .string "That BLUE ORB was found buried inside\n" - .string "the CAVE OF ORIGIN in SOOTOPOLIS...\p" - .string "There is perhaps a link between\n" - .string "KYOGRE and the CAVE OF ORIGIN...$" + .string "KYOGRE wurde erweckt...\p" + .string "Von der wundersamen KUGEL sagt man,\n" + .string "dass sie das wütende KYOGRE beruhigt.\p" + .string "Es handelt sich um die BLAUE KUGEL,\n" + .string "die du bei dir trägst...\p" + .string "Diese ROTE KUGEL fand man in der\n" + .string "URZEITHÖHLE in XENEROVILLE...\p" + .string "Es gibt anscheinend eine Verbindung\n" + .string "zwischen KYOGRE und der \l" + .string "URZEITHÖHLE...$" UnknownString_81B5647: @ 81B5647 - .string "That man, he returned the RED ORB.\p" - .string "Are you going to return the BLUE ORB\n" - .string "to its rightful place, too?$" + .string "Dieser Mann - er hat die ROTE KUGEL\n" + .string "zurückgebracht.\p" + .string "Bringst du die BLAUE KUGEL auch an\n" + .string "ihren angestammten Platz zurück?$" UnknownString_81B56AB: @ 81B56AB - .string "What’s that?!\p" - .string "If the balance is not restored, there\n" - .string "is no telling what could happen.\p" - .string "You will return the BLUE ORB to its\n" - .string "rightful place, yes?$" + .string "Was soll das?\p" + .string "Wenn das Gleichgewicht nicht wiederher-\n" + .string "gestellt wird, weiß niemand, was\l" + .string "passieren wird!\p" + .string "Du wirst die BLAUE KUGEL an ihren Platz\n" + .string "zurückbringen, ja?$" UnknownString_81B5739: @ 81B5739 - .string "{PLAYER} handed the BLUE ORB to the\n" - .string "old woman.$" + .string "{PLAYER} gibt der alten Frau die\n" + .string "BLAUE KUGEL.$" UnknownString_81B5762: @ 81B5762 - .string "Yes...\n" - .string "The two ORBS should remain here.\p" - .string "It is how it should be for the good\n" - .string "of all HOENN...$" + .string "Ja...\n" + .string "Die beiden KUGELN müssen hier bleiben.\p" + .string "So soll es sein, zum Wohle aller in HOENN.$" UnknownString_81B57BE: @ 81B57BE - .string "The spirit of the sea...\p" - .string "That is what KYOGRE is said to be in\n" - .string "POKéMON form...\p" - .string "In the same manner that we and POKéMON\n" - .string "have life, the sea is alive...\p" - .string "KYOGRE has taught us that...$" + .string "Der Geist des Meeres...\p" + .string "Das, so heißt es, ist KYOGRE in\n" + .string "POKéMON-Gestalt...\p" + .string "So wie wir und die POKéMON leben, ist\n" + .string "auch das Meer lebendig...\p" + .string "KYOGRE hat uns das gelehrt.$" UnknownString_81B586F: @ 81B586F - .string "MT. PYRE is where we calm the spirits\n" - .string "of POKéMON that have passed on...\p" - .string "This is a high place where one can\n" - .string "see all of HOENN...\p" - .string "The disembodied spirits of POKéMON\n" - .string "must find solace here...\p" - .string "Is it coincidence that you are here...\p" - .string "Will you hear out my tale? A tale long\n" - .string "told in the HOENN region?$" + .string "Am PYROBERG legen wir die Geister der\n" + .string "POKéMON, die von uns gegangen sind, zur\l" + .string "Ruhe...\p" + .string "Von hier aus hat man einen Ausblick über\n" + .string "die ganze Region von HOENN...\p" + .string "Die körperlosen Geister der POKéMON\n" + .string "finden hier ihre Ruhe...\p" + .string "Es ist Fügung, dass du jetzt hier bist...\p" + .string "Möchtest du meine Geschichte hören?\n" + .string "Eine lange, sehr alte Geschichte der\l" + .string "HOENN-Region?$" UnknownString_81B5992: @ 81B5992 - .string "It happened long, long ago...\p" - .string "The world was wracked by a ferocious\n" - .string "clash between the POKéMON of the sea\l" - .string "and the POKéMON of the land...\p" - .string "The POKéMON of the sea raised huge\n" - .string "waves and carved out oceans...\p" - .string "The POKéMON of the land raised\n" - .string "mountains and created continents...\p" - .string "Their fierce duel raged without end.\p" - .string "The world was engulfed in massive\n" - .string "infernos and vicious storms.\p" - .string "The BLUE ORB and the RED ORB brought\n" - .string "an end to the calamity.\p" - .string "Light poured from the two ORBS and\n" - .string "becalmed the enraged adversaries.\p" - .string "The pair, made docile, dove deep into\n" - .string "the sea where eventually they\l" - .string "disappeared...$" + .string "Es geschah vor langer, langer Zeit...\p" + .string "Die Welt erbebte unter der Auseinander-\n" + .string "setzung der POKéMON des Meeres mit den\l" + .string "POKéMON des Landes...\p" + .string "Die POKéMON des Meeres erschufen hohe\n" + .string "Wellen und tiefe Meeresbecken...\p" + .string "Die POKéMON des Landes erschufen\n" + .string "Berge und Kontinente...\p" + .string "Das Duell wütete ohne absehbares Ende.\p" + .string "Die Welt wurde von erbarmungslosen\n" + .string "Stürmen und unglaublichen Infernos\l" + .string "heimgesucht.\p" + .string "Die BLAUE und die ROTE KUGEL setzten\n" + .string "schließlich diesem Kampf ein Ende.\p" + .string "Licht strahlte von den beiden KUGELN\n" + .string "und beruhigte die Kontrahenten.\p" + .string "Die beruhigten POKéMON verbargen sich\n" + .string "in den Tiefen des Meeres und der Erde\l" + .string "und eines Tages verschwanden sie.$" UnknownString_81B5BD7: @ 81B5BD7 - .string "I see...\n" - .string "Well, that, too, is fine...$" + .string "Ich verstehe...\n" + .string "Nun, das ist auch in Ordnung...$" UnknownString_81B5BFC: @ 81B5BFC - .string "ARCHIE: You...\n" - .string "So you stopped KYOGRE...\p" - .string "I shouldn’t be surprised...\p" - .string "I understand now that humans cannot\n" - .string "freely control the balance between\l" - .string "the land and the sea...\p" - .string "So I have come to return the\n" - .string "RED ORB...\p" - .string "I doubt that we will cross paths again...\n" - .string "Farewell...$" + .string "ADRIAN: Du...\n" + .string "Du hast KYOGRE aufgehalten...\p" + .string "Das sollte mich nicht überraschen...\p" + .string "Nun habe ich verstanden, dass es nicht\n" + .string "an den Menschen ist, das Gleichgewicht\l" + .string "zwischen Land und Meer zu stören...\p" + .string "Daher bin ich hier, um die ROTE KUGEL\n" + .string "zurückzubringen...\p" + .string "Ich glaube nicht, dass wir uns wieder\n" + .string "sehen werden... Leb wohl...$" diff --git a/data/text/barboach.inc b/data/text/barboach.inc index b78603286..98807cc3c 100644 --- a/data/text/barboach.inc +++ b/data/text/barboach.inc @@ -1,36 +1,38 @@ UnknownString_81C426C: @ 81C426C - .string "I’m very interested in big {STR_VAR_1}.\n" - .string "The bigger the better.\p" - .string "Huh? Do you have a {STR_VAR_1}?\n" - .string "P-p-please, show me!$" + .string "Ich bin sehr interessiert an einer\n" + .string "großen {STR_VAR_1}. Je größer, desto\l" + .string "besser.\p" + .string "Was? Du hast ein {STR_VAR_1}?\n" + .string "B-b-bitte zeig es mir!!!$" UnknownString_81C42CE: @ 81C42CE - .string "Oh, my gosh, this is a big one!\n" - .string "This is a grand {STR_VAR_1}!\p" - .string "Thanks for showing me.\n" - .string "This is my thanks!$" + .string "Oh, du liebe Zeit, ist das groß!\n" + .string "Das ist eine große {STR_VAR_1}!\p" + .string "Danke, dass du es mir gezeigt hast.\n" + .string "Dies ist mein Dankeschön!$" UnknownString_81C432C: @ 81C432C - .string "{PLAYER} received one {STR_VAR_2}.$" + .string "{PLAYER} erhält {STR_VAR_2}.$" UnknownString_81C4340: @ 81C4340 - .string "Hunh?\n" - .string "Your BAG is crammed full.$" + .string "Wie? Wo? Was?\n" + .string "Dein BEUTEL ist megavoll.$" UnknownString_81C4360: @ 81C4360 - .string "Hmm... I’ve seen a bigger {STR_VAR_1}\n" - .string "than this one.$" + .string "Hmm... Ich habe schon größere\n" + .string "{STR_VAR_1} als dieses gesehen!$" UnknownString_81C438C: @ 81C438C - .string "Oh, now this is quite something...\n" - .string "But it’s not a {STR_VAR_1}!$" + .string "Och, das ist schon ganz ansehnlich...\n" + .string "Aber das ist kein {STR_VAR_1}!$" UnknownString_81C43C2: @ 81C43C2 - .string "You don’t have a big {STR_VAR_1}?\n" - .string "That’s too bad...\p" - .string "If you get a big {STR_VAR_1},\n" - .string "please come show me.$" + .string "Du hast kein großes {STR_VAR_1}?\n" + .string "Das ist aber schade...\p" + .string "Sobald du ein großes {STR_VAR_1}\n" + .string "besitzt, zeig es mir bitte.$" UnknownString_81C4417: @ 81C4417 - .string "The biggest {STR_VAR_1} in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!$" + .string "Das größte {STR_VAR_1} in der Ge-\n" + .string "schichte! Der {STR_VAR_3} cm Koloss\l" + .string "von {STR_VAR_2}!$" diff --git a/data/text/bard.inc b/data/text/bard.inc index bd22c97a3..dbfb7d400 100644 --- a/data/text/bard.inc +++ b/data/text/bard.inc @@ -1,38 +1,38 @@ gTextBard_BardTesting: @ 81B0A83 - .string "BARD testing!$" + .string "BARDEN Test.$" gTextBard_HiImTheBard:: @ 81B0A91 - .string "Hi, I’m the BARD.\n" - .string "Would you like to hear my song?$" + .string "Hallo, ich bin der BARDE.\n" + .string "Möchtest du meinem Lied lauschen?$" gTextBard_OhYouveLeftMe:: @ 81B0AC3 .string "Oh...\n" - .string "You’ve left me feeling the blues...$" + .string "Du überlässt mich meinem Blues?$" gTextBard_OhWhatAMovingSong:: @ 81B0AED - .string "Oh, what a moving song...\n" - .string "I wish I could play it for others...$" + .string "Hach, was für ein bewegendes Lied...\n" + .string "Ich wünschte, ich könnte es für\l" + .string "andere spielen...$" gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C .string "So?\n" - .string "How do you like my song?\p" - .string "But I’m none too happy about the\n" - .string "lyrics.\p" - .string "How would you like to write some new\n" - .string "lyrics for me?$" + .string "Wie fandest du mein Lied?\p" + .string "Ich bin noch nicht ganz zufrieden mit\n" + .string "dem Text.\p" + .string "Hast du nicht Lust, den Text für mich\n" + .string "neu zu schreiben?$" gTextBard_OhYouveLeftMe2:: @ 81B0BA6 - .string "Oh...\n" - .string "You’ve left me feeling the blues...$" + .string "Oh... Und wieder werde ich meinem\n" + .string "Blues überlassen.$" gTextBard_ThankYouKindly:: @ 81B0BD0 - .string "Thank you kindly!\n" - .string "Let me sing it for you.$" + .string "Vielen herzlichen Dank!\n" + .string "Ich möchte für dich singen.$" gTextBard_WasThatHowYouWanted:: @ 81B0BFA - .string "Was that how you wanted your song\n" - .string "to go?$" + .string "Hast du dir dein Lied so vorgestellt?$" gTextBard_OkayThatsIt:: @ 81B0C23 - .string "Okay! That’s it, then.\n" - .string "I’ll sing this song for a while.$" + .string "Okay! Das ist es! Dieses Lied werde\n" + .string "ich nun für eine Weile singen.$" diff --git a/data/text/berries.inc b/data/text/berries.inc index 8a5abad2c..34afb1a69 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -1,235 +1,240 @@ PetalburgCity_Gym_Text_1C5570:: @ 81C5570 - .string "DAD: Hi, {PLAYER}!\p" - .string "I just received a very rare BERRY.\n" - .string "I’d like you to have it.$" + .string "VATER: Hallo, {PLAYER}!\p" + .string "Ich habe gerade eine sehr seltene\n" + .string "BEERE erhalten. Die schenke ich dir.$" Route104_Text_1C55B9:: @ 81C55B9 - .string "If you see BERRIES growing in loamy\n" - .string "soil, feel free to take them.\p" - .string "But make sure you plant a BERRY in the\n" - .string "same spot. That’s common courtesy.\p" - .string "Here, I’ll share this with you.$" + .string "Wenn du BEEREN siehst, die im Lehmboden\n" + .string "wachsen, pflücke sie ruhig.\p" + .string "Aber pflanze eine neue BEERE an der\n" + .string "Stelle. Das ist einfache Höflichkeit.\p" + .string "Hier, das ist für dich.$" Route104_Text_1C5665:: @ 81C5665 - .string "The way you look, you must be a\n" - .string "TRAINER, no?\p" - .string "TRAINERS often make POKéMON hold\n" - .string "BERRIES.\p" - .string "It’s up to you whether to grow BERRIES\n" - .string "or use them.$" + .string "Du siehst aus wie ein TRAINER. Du\n" + .string "bist auch einer, stimmt’s?\p" + .string "TRAINER geben ihren POKéMON manchmal\n" + .string "BEEREN zu tragen.\p" + .string "Es liegt an dir, ob du BEEREN pflanzt\n" + .string "oder verwendest.$" Route111_Text_1C56F0:: @ 81C56F0 - .string "I watered my plants lots and lots!\n" - .string "A whole bunch of flowers bloomed!\p" - .string "And then a whole bunch of BERRIES\n" - .string "appeared!\p" - .string "Here you go!\n" - .string "You can have this!$" + .string "Ich habe meine Pflanzen sehr oft ge-\n" + .string "wässert! Sie trugen sehr viele Blüten.\p" + .string "Und dann wuchsen auf einmal viele\n" + .string "BEEREN!\p" + .string "Hier, bitte!\n" + .string "Die schenke ich dir!$" Route111_Text_1C5781:: @ 81C5781 - .string "I’m going to try really hard and make\n" - .string "some RED {POKEBLOCK}S!\p" - .string "I hope you try hard, too!$" + .string "Ich werde mich anstrengen und einige\n" + .string "rote {POKEBLOCK} herstellen!\p" + .string "Ich hoffe, du strengst dich auch an.$" Route111_Text_1C57D2:: @ 81C57D2 - .string "I wonder what color BERRIES I’ll look\n" - .string "for today?$" + .string "Ich frage mich, welche BEEREN-Farbe ich\n" + .string "heute wählen soll.$" Route114_Text_1C5803:: @ 81C5803 - .string "I’m gathering BERRIES so I can win a\n" - .string "POKéMON CONTEST.\p" - .string "If you’d like, I’ll share one with you.$" + .string "Ich sammle BEEREN, damit ich einen\n" + .string "POKéMON WETTBEWERB gewinnen kann.\p" + .string "Wenn du magst, gebe ich dir eine ab.$" Route114_Text_1C5861:: @ 81C5861 - .string "Good luck to you, too!$" + .string "Dir auch viel Glück!$" Route114_Text_1C5878:: @ 81C5878 - .string "What BERRIES should I plant today?\n" - .string "What color {POKEBLOCK}S should I make?\p" - .string "Fretting over stuff like that is fun\n" - .string "in its own way.$" + .string "Welche BEEREN soll ich heute pflanzen?\n" + .string "Welche Farben sollen die {POKEBLOCK} haben?\p" + .string "Darüber nachzudenken, macht irre Spaß.$" Route120_Text_1C58F1:: @ 81C58F1 - .string "Give the case a shake, and out pops\n" - .string "a {POKEBLOCK}...\p" - .string "And that {POKEBLOCK} is caught and eaten\n" - .string "by a POKéMON...\p" - .string "It’s an expression of love, isn’t it?$" + .string "Gib dieser Box einen Stoß und ein\n" + .string "{POKEBLOCK} kommt heraus...\p" + .string "Und dieser {POKEBLOCK} wird von einem\n" + .string "POKéMON gefressen...\p" + .string "Es ist ein Ausdruck der Liebe, richtig?$" Route120_Text_1C5979:: @ 81C5979 - .string "Yes, yes.\n" - .string "You understand what I mean.\p" - .string "You should take this.$" + .string "Ja, ja.\n" + .string "Du verstehst, was ich meine.\p" + .string "Das hier ist für dich.$" Route120_Text_1C59B5:: @ 81C59B5 - .string "Oh... But it is important to make your\n" - .string "own impressions, I guess...\p" - .string "You can have this.$" + .string "Oh... Aber es ist wichtig, dass man sich\n" + .string "einen eigenen Eindruck verschafft...\p" + .string "Hier. Das kannst du haben.$" Route120_Text_1C5A0B:: @ 81C5A0B - .string "I think that BERRY is rare.\n" - .string "I hope you raise it with loving care.$" + .string "Dies ist eine seltene BEERE. Ich hoffe,\n" + .string "du gehst sorgfältig mit ihr um.$" Route120_Text_1C5A4D:: @ 81C5A4D - .string "I’ll get more BERRIES from the\n" - .string "BERRY MASTER.$" + .string "Ich habe einige BEEREN vom\n" + .string "BEERENMEISTER erhalten.$" LilycoveCity_Text_1C5A7A:: @ 81C5A7A - .string "When it gets right down to it...\p" - .string "The same way suits suit me perfectly,\n" - .string "a crisp breeze suits the sea.\p" - .string "And you, a BERRY suits you to a “T”...\p" - .string "Why should that be so?$" + .string "Also, im Grunde ist es so...\p" + .string "Ein Anzug passt zu mir wie die\n" + .string "Brise zum Meer - perfekt!\p" + .string "Und bei dir... Eine BEERE passt zu\n" + .string "“T”...\p" + .string "Warum ist das so?$" LilycoveCity_Text_1C5B1D:: @ 81C5B1D - .string "When it gets right down to it...\p" - .string "It’s because you’re a TRAINER!$" + .string "Also, im Grunde ist es so...\p" + .string "Weil du ein TRAINER bist.$" LilycoveCity_Text_1C5B5D:: @ 81C5B5D - .string "When it gets right down to it...\p" - .string "The way dignified simplicity suits me,\n" - .string "{POKEBLOCK}S perfectly suit POKéMON.$" + .string "Grundsätzlich verhält es sich so...\p" + .string "So wie die würdevolle Einfachheit mich\n" + .string "ziert, zieren {POKEBLOCK} POKéMON.$" Route123_BerryMastersHouse_Text_1C5BC4:: @ 81C5BC4 - .string "You may call me the BERRY MASTER.\p" - .string "I dream of filling the world with\n" - .string "beautiful flowers, so I raise BERRIES\l" - .string "and hand them out to everyone.\p" - .string "You’re deserving of one!$" + .string "Du kannst mich BEERENMEISTER\n" + .string "nennen.\p" + .string "Ich träume davon, die Welt mit hübschen\n" + .string "Blumen zu bereichern, daher züchte ich\l" + .string "BEEREN und gebe sie an andere weiter.\p" + .string "Du hast dir auch eine verdient!$" Route123_BerryMastersHouse_Text_1C5C66:: @ 81C5C66 - .string "Why be stingy?\n" - .string "Take another!$" + .string "Sei nicht so schüchtern.\n" + .string "Nimm dir noch eine!$" Route123_BerryMastersHouse_Text_1C5C83:: @ 81C5C83 - .string "Be sure to visit the PRETTY PETAL\n" - .string "flower shop near RUSTBORO.\p" - .string "Let flowers fill the world!$" + .string "Besuch unbedingt den BLÜTENTRAUM\n" + .string "BLUMENLADEN bei METAROST CITY.\p" + .string "Lasst die Welt in Blumen schwelgen.$" Route123_BerryMastersHouse_Text_1C5CDC:: @ 81C5CDC - .string "I’m done for today.\n" - .string "Come again another day.\p" - .string "Let flowers fill the world!$" + .string "Für heute bin ich fertig.\n" + .string "Komm ein anderes Mal wieder.\p" + .string "Lasst die Welt in Blumen schwelgen!$" Route123_BerryMastersHouse_Text_1C5D24:: @ 81C5D24 - .string "The way my husband grows BERRIES,\n" - .string "oh, he’s the best in the world.\p" - .string "He makes me proud, that he does.\p" - .string "Incidentally, child, have you heard\n" - .string "a good saying lately?$" + .string "Mein Mann züchtet BEEREN. Er ist be-\n" + .string "stimmt der beste Züchter der Welt.\p" + .string "Er macht mich unglaublich stolz.\p" + .string "Sag mal, Kind, du kennst nicht zufällig\n" + .string "einen guten Spruch?$" Route123_BerryMastersHouse_Text_1C5DC1:: @ 81C5DC1 - .string "Ah! What a remarkable saying!\n" - .string "Inspirational, it is!\p" - .string "I want you to have this.$" + .string "Ah! Was für ein wunderbarer Spruch!\n" + .string "So inspirierend!\p" + .string "Das hier möchte ich dir schenken.$" Route123_BerryMastersHouse_Text_1C5E0E:: @ 81C5E0E - .string "Oh! A good saying it is.\n" - .string "You’re quite remarkable.\p" - .string "I want you to have this.$" + .string "Oh! Das ist ein guter Spruch!\n" + .string "Du bist bemerkenswert!\p" + .string "Das hier möchte ich dir schenken.$" Route123_BerryMastersHouse_Text_1C5E59:: @ 81C5E59 - .string "Our four grandchildren should become\n" - .string "more accomplished than my husband.\p" - .string "Joy never goes out of my life!$" + .string "Unsere vier Enkelkinder sollten noch\n" + .string "begabter als mein Mann werden.\p" + .string "Das Leben erfüllt einen immer wieder mit\n" + .string "Freude!$" Route123_BerryMastersHouse_Text_1C5EC0:: @ 81C5EC0 .string "Ah...$" Route104_PrettyPetalFlowerShop_Text_1C5EC6:: @ 81C5EC6 - .string "Hello!\p" - .string "This is the PRETTY PETAL flower shop.\n" - .string "Spreading flowers throughout the world!$" + .string "Hallo!\p" + .string "Dies ist der BLÜTENTRAUM BLUMENLADEN.\n" + .string "Verwandelt die Welt in ein Blumenmeer!$" Route104_PrettyPetalFlowerShop_Text_1C5F1B:: @ 81C5F1B - .string "{PLAYER}{KUN}, would you like to learn about\n" - .string "BERRIES?$" + .string "{PLAYER}{KUN}, möchtest du etwas über\n" + .string "BEEREN lernen?$" Route104_PrettyPetalFlowerShop_Text_1C5F48:: @ 81C5F48 - .string "Your name is?\p" + .string "Wie heißt du?\p" .string "{PLAYER}{KUN}.\n" - .string "That’s a nice name.\p" - .string "{PLAYER}{KUN}, would you like to learn about\n" - .string "BERRIES?$" + .string "Das ist aber ein hübscher Name.\p" + .string "Möchtest du etwas über BEEREN lernen?$" Route104_PrettyPetalFlowerShop_Text_1C5F9D:: @ 81C5F9D - .string "BERRIES grow on trees that thrive\n" - .string "only in dark, loamy soil.\p" - .string "If you take some BERRIES, be sure to\n" - .string "plant one in the loamy soil again.\p" - .string "A planted BERRY will soon sprout,\n" - .string "grow into a plant, flower beautifully,\l" - .string "then grow BERRIES again.\p" - .string "I want to see the whole wide world\n" - .string "filled with beautiful flowers.\l" - .string "That’s my dream.\p" - .string "Please help me, {PLAYER}{KUN}. Plant BERRIES\n" - .string "and bring more flowers into the world.$" + .string "BEEREN wachsen an Bäumen, die nur in\n" + .string "dunklem Lehmboden gedeihen.\p" + .string "Wenn du BEEREN pflückst, pflanze\n" + .string "immer neue in den Boden ein.\p" + .string "Eine gepflanzte BEERE wird bald an-\n" + .string "fangen zu sprießen, dann mit einer\p" + .string "wunderhübschen Blüte erblühen, die bald\n" + .string "zu einer BEERE wird.\p" + .string "Ich würde die ganze Welt am liebsten mit\n" + .string "wunderhübschen Blüten bedeckt sehen.\l" + .string "Das ist mein Traum.\p" + .string "Bitte, hilf mir, {PLAYER}{KUN}. Pflanze BEEREN\n" + .string "und bring so Blüten in die Welt.$" Route104_PrettyPetalFlowerShop_Text_1C6121:: @ 81C6121 - .string "Flowers bring so much happiness to\n" - .string "people, don’t they?$" + .string "Blumen erfreuen jedes Herz, nicht\n" + .string "wahr?$" Route104_PrettyPetalFlowerShop_Text_1C6158:: @ 81C6158 - .string "Hello!\p" - .string "The more attention you give to flowers,\n" - .string "the more beautifully they bloom.\p" - .string "You’ll like tending flowers. I’m sure\n" - .string "of it. You can have this.$" + .string "Hallo!\p" + .string "Je mehr du dich um die Blumen kümmerst,\n" + .string "desto schöner werden sie blühen.\p" + .string "Auch du hast Blumen gerne.\n" + .string "Das weiß ich genau. Das ist für dich.$" Route104_PrettyPetalFlowerShop_Text_1C61E8:: @ 81C61E8 - .string "While BERRY plants are growing,\n" - .string "water them with the WAILMER PAIL.\p" - .string "Oh, another thing.\p" - .string "If you don’t pick BERRIES for a while,\n" - .string "they’ll drop off onto the ground.\l" - .string "But they’ll sprout again.\p" - .string "Isn’t that awesome?\n" - .string "It’s like they have the will to live.$" + .string "Nachdem du die BEEREN eingepflanzt\n" + .string "hast, musst du sie mit der\l" + .string "WAILMERKANNE wässern.\p" + .string "Oh, und noch etwas!\p" + .string "Wenn die BEEREN nicht gepflückt werden,\n" + .string "fallen sie zu Boden. Aber sie werden\l" + .string "wieder nachwachsen.\p" + .string "Ist das nicht unglaublich? Es ist, als\n" + .string "hätten sie den Willen zu leben.$" Route104_PrettyPetalFlowerShop_Text_1C62DA:: @ 81C62DA - .string "I’m trying to be like my big sisters.\n" - .string "I’m growing flowers, too!\p" - .string "Here you go! It’s for you!$" + .string "Ich versuche, so zu sein wie meine große\n" + .string "Schwester. Ich züchte auch Blumen!\p" + .string "Hier, das ist für dich!$" Route104_PrettyPetalFlowerShop_Text_1C6335:: @ 81C6335 - .string "You can plant a BERRY and grow it big,\n" - .string "or you can make a POKéMON hold it.\p" - .string "But now they have a machine that mixes\n" - .string "up different BERRIES and makes candies\l" - .string "for POKéMON.\p" - .string "I want some candy, too.$" + .string "Du kannst eine BEERE pflanzen und sie\n" + .string "wachsen lassen, oder du gibst sie einem\l" + .string "POKéMON zum Tragen.\p" + .string "Und neuerdings gibt es eine Maschine,\n" + .string "mit der kann man die verschiedensten\l" + .string "BEEREN mixen und Süßigkeiten für die\l" + .string "POKéMON daraus machen.\p" + .string "Ich möchte auch Süßigkeiten haben.$" SootopolisCity_Text_1C63F2:: @ 81C63F2 - .string "Hi, what’s your name?\p" - .string "... ... ... ... ... ... ... ... ...\n" - .string "Okay. That’s nice!\p" - .string "My name is KIRI.\p" - .string "My mommy and daddy named me that so\n" - .string "I would grow healthy and warmhearted.\l" - .string "That’s what they wished.\p" - .string "You can have one of these.$" + .string "Hi, wie heißt du?\p" + .string "... ... ... ... ... ... ... ... ...\n" + .string "Okay. Netter Name!\p" + .string "Ich heiße BERTA.\p" + .string "Meine Eltern haben mich so genannt,\n" + .string "damit ich gesund und warmherzig werde.\l" + .string "Das war ihr Wunsch.\p" + .string "Hier, das schenke ich dir.$" SootopolisCity_Text_1C64D0:: @ 81C64D0 - .string "KIRI will give you this BERRY, too!\n" - .string "I really like it lots!$" + .string "BERTA will dir auch diese BEERE geben.\n" + .string "Ich mag sie sehr!$" SootopolisCity_Text_1C650B:: @ 81C650B - .string "I wonder what kind of wish is included\n" - .string "in your name.$" + .string "Ich frage mich, welcher Wunsch in deinem\n" + .string "Namen verborgen ist.$" SootopolisCity_Text_1C6540:: @ 81C6540 - .string "Spring, summer, autumn, and winter.\p" - .string "If you’re born in springtime, do you like\n" - .string "the spring, and if you’re born in the\l" - .string "summer, do you like the summer?$" + .string "Frühling, Sommer, Herbst und Winter.\p" + .string "Wenn du im Frühling geboren bist, magst\n" + .string "du dann den Frühling? Wenn du im Sommer\l" + .string "geboren bist, magst du den Sommer?$" SootopolisCity_Text_1C65D4:: @ 81C65D4 - .string "Then KIRI was born in the autumn,\n" - .string "so I love the autumn!\p" - .string "Which season do you like?$" + .string "Dann wurde BERTA im Herbst geboren,\n" + .string "denn ich liebe den Herbst!\p" + .string "Welche Jahreszeit hast du am liebsten?$" SootopolisCity_Text_1C6626:: @ 81C6626 .string "Oh...\n" - .string "It doesn’t matter...\p" - .string "There’s so much that I want to know...$" + .string "Das macht nichts...\p" + .string "Es gibt so viel, was ich wissen möchte...$" diff --git a/data/text/berry_tree.inc b/data/text/berry_tree.inc index 4ffbf51c4..12179d9b2 100644 --- a/data/text/berry_tree.inc +++ b/data/text/berry_tree.inc @@ -1,67 +1,69 @@ Route102_Text_1A16B6:: @ 81A16B6 - .string "It’s soft, loamy soil.$" + .string "Das ist weicher Lehmboden.$" Route102_Text_1A16CD:: @ 81A16CD - .string "It’s soft, loamy soil.\n" - .string "Want to plant a BERRY?$" + .string "Das ist weicher Lehmboden.\n" + .string "Möchtest du eine BEERE pflanzen?$" Route102_Text_1A16FB:: @ 81A16FB - .string "{PLAYER} planted one {STR_VAR_1} BERRY in\n" - .string "the soft, loamy soil.$" + .string "{PLAYER} pflanzt eine\n" + .string "{STR_VAR_1}BEERE in den Lehmboden.$" Route102_Text_1A172C:: @ 81A172C - .string "One {STR_VAR_1} BERRY was planted here.$" + .string "Eine {STR_VAR_1}BEERE wurde\n" + .string "hier gepflanzt.$" Route102_Text_1A174B:: @ 81A174B - .string "{STR_VAR_1} has sprouted.$" + .string "{STR_VAR_1} blüht auf.$" Route102_Text_1A175C:: @ 81A175C - .string "This {STR_VAR_1} plant is growing taller.$" + .string "Die {STR_VAR_1}pflanze wächst.$" Route102_Text_1A177D:: @ 81A177D - .string "These {STR_VAR_1} flowers are blooming\n" + .string "Diese {STR_VAR_1}blumen sind\n" .string "{STR_VAR_2}.$" Route102_Text_1A179F:: @ 81A179F - .string "very beautifully$" + .string "wunderschön$" Route102_Text_1A17B0:: @ 81A17B0 - .string "cutely$" + .string "zierlich$" Route102_Text_1A17B7:: @ 81A17B7 - .string "prettily$" + .string "hübsch$" Route102_Text_1A17C0:: @ 81A17C0 - .string "There are {STR_VAR_2} {STR_VAR_1} BERRIES!\p" - .string "Do you want to pick the\n" - .string "{STR_VAR_1} BERRIES?$" + .string "{STR_VAR_2} {STR_VAR_1}BEERE/N!\p" + .string "Möchtest du die {STR_VAR_1}BEERE/N\n" + .string "pflücken?$" Route102_Text_1A17FD:: @ 81A17FD - .string "{PLAYER} picked the {STR_VAR_2} {STR_VAR_1} BERRIES.$" + .string "{PLAYER} pflückt die {STR_VAR_2}\n" + .string "{STR_VAR_1}BEERE/N.$" Route102_Text_1A181A:: @ 81A181A - .string "{PLAYER} put away the {STR_VAR_1} BERRIES\n" - .string "in the BAG’s BERRIES POCKET.\p" - .string "The soil returned to its soft and\n" - .string "loamy state.$" + .string "{PLAYER} packt die {STR_VAR_1}BEERE/N\n" + .string "in die BEERENTASCHE des BEUTELS.\p" + .string "Der Boden ist wieder weich und lehmig.$" Route102_Text_1A1881:: @ 81A1881 - .string "The BAG’s BERRIES POCKET is full.\p" - .string "The {STR_VAR_1} BERRIES couldn’t be taken.$" + .string "Die BEERENTASCHE des BEUTELS ist voll.\p" + .string "Die {STR_VAR_1}BEERE/N können nicht\n" + .string "mitgenommen werden.$" Route102_Text_1A18C5:: @ 81A18C5 - .string "{PLAYER} left the {STR_VAR_1} BERRIES\n" - .string "unpicked.$" + .string "{PLAYER} pflückt keine\n" + .string "{STR_VAR_1}BEEREN.$" Route102_Text_1A18E6:: @ 81A18E6 - .string "Want to water the {STR_VAR_1} with the\n" - .string "WAILMER PAIL?$" + .string "Möchtest du die {STR_VAR_1} mit der\n" + .string "WAILMERKANNE gießen?$" Route102_Text_1A1912:: @ 81A1912 - .string "{PLAYER} watered the {STR_VAR_1}.$" + .string "{PLAYER} gießt die {STR_VAR_1}.$" Route102_Text_1A1925:: @ 81A1925 - .string "The plant seems to be delighted.$" + .string "Die Pflanze scheint sich zu freuen.$" Route102_Text_1A1946:: @ 81A1946 .string "!$" diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc index be9c03588..08967e28f 100644 --- a/data/text/birch_speech.inc +++ b/data/text/birch_speech.inc @@ -1,55 +1,60 @@ gBirchSpeech_Welcome:: @ 81C6D78 - .string "Hi! Sorry to keep you waiting!\p" - .string "Welcome to the world of POKéMON!\p" - .string "My name is BIRCH.\p" - .string "But everyone calls me the POKéMON\n" - .string "PROFESSOR.\p$" + .string "Sorry, dass du warten musstest.\p" + .string "Willkommen in der Welt der POKéMON!\p" + .string "Mein Name ist BIRK.\p" + .string "Aber jeder nennt mich nur\n" + .string "PROFESSOR POKéMON.\p" + .string "$" gBirchSpeech_ThisIsPokemon:: @ 81C6DF8 - .string "This is what we call a “POKéMON.”$" + .string "Das nennen wir ein “POKéMON”.$" gBirchSpeech_WorldInhabitedByPokemon:: @ 81C6E1A - .string "This world is widely inhabited by\n" - .string "creatures known as POKéMON.\p" - .string "We humans live alongside POKéMON,\n" - .string "at times as friendly playmates, and\l" - .string "at times as cooperative workmates.\p" - .string "And sometimes, we band together\n" - .string "and battle others like us.\p" - .string "But despite our closeness, we don’t\n" - .string "know everything about POKéMON.\p" - .string "In fact, there are many, many\n" - .string "secrets surrounding POKéMON.\p" - .string "To unravel POKéMON mysteries,\n" - .string "I’ve been undertaking research.\l" - .string "That’s what I do.\p$" + .string "Auf dieser Welt leben Wesen,\n" + .string "die uns als POKéMON bekannt sind.\p" + .string "Wir Menschen leben Seite an Seite\n" + .string "mit ihnen, als Freunde oder als\l" + .string "Arbeitskollegen.\p" + .string "Und manchmal schließen wir uns mit\n" + .string "ihnen zusammen und tragen Kämpfe\l" + .string "gegen andere von uns aus.\p" + .string "Doch obwohl wir den POKéMON so\n" + .string "nahe stehen, wissen wir noch nicht\l" + .string "alles über sie.\p" + .string "Es gibt noch viele, viele Geheim-\n" + .string "nisse über die POKéMON.\p" + .string "Um die Mysterien der POKéMON\n" + .string "aufzudecken, widme ich mich der\l" + .string "Forschung. Genau das tue ich.\p" + .string "$" gBirchSpeech_AndYouAre:: @ 81C6FCB - .string "And you are?$" + .string "Und wer bist du?$" gBirchSpeech_AreYouBoyOrGirl:: @ 81C6FD8 - .string "Are you a boy?\n" - .string "Or are you a girl?$" + .string "Bist du ein Junge?\n" + .string "Oder bist du ein Mädchen?$" gBirchSpeech_WhatsYourName:: @ 81C6FFA - .string "All right.\n" - .string "What’s your name?$" + .string "Fein!\n" + .string "Und wie heißt du?$" gBirchSpeech_SoItsPlayer:: @ 81C7017 - .string "So it’s {PLAYER}{KUN}?$" + .string "Ah, du bist also {PLAYER}{KUN}?$" gBirchSpeech_AhOkayYouArePlayer:: @ 81C7025 .string "Ah, okay!\p" - .string "You’re {PLAYER}{KUN} who’s moving to my\n" - .string "hometown of LITTLEROOT.\l" - .string "I get it now!$" + .string "Jetzt habe ich es! Du heißt {PLAYER}{KUN}\n" + .string "und bist gerade nach WURZELHEIM,\l" + .string "meinem Heimatort, gezogen!$" gBirchSpeech_AreYouReady:: @ 81C7074 - .string "All right, are you ready?\p" - .string "Your very own adventure is about\n" - .string "to unfold.\p" - .string "Take courage, and leap into the\n" - .string "world of POKéMON where dreams,\l" - .string "adventure, and friendships await!\p" - .string "Well, I’ll be expecting you later.\n" - .string "Come see me in my POKéMON LAB.\p$" + .string "Gut, bist du bereit?\p" + .string "Dein eigenes Abenteuer wird\n" + .string "nun beginnen.\p" + .string "Hab nur Mut und stürze dich in die\n" + .string "Welt der POKéMON, wo Abenteuer,\l" + .string "Träume und Freundschaft warten.\p" + .string "Komm später in mein POKéMON-LABOR,\n" + .string "ich erwarte dich dort.\p" + .string "$" diff --git a/data/text/braille.inc b/data/text/braille.inc index 66b6438a6..071657502 100644 --- a/data/text/braille.inc +++ b/data/text/braille.inc @@ -1,223 +1,92 @@ Underwater_SealedChamber_Braille_1C533D:: @ 81C533D - .byte 3 - .byte 6 - .byte 27 - .byte 13 - .byte 5 - .byte 9 - .braille "GO UP HERE.$" + .string "ÀÉëÒÂÌÒÉÌë ÒÉéÀ{0x31}Ê{0x3F}Œ$" SealedChamber_OuterRoom_Braille_1C534F:: @ 81C534F - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 - .braille "ABC$" + .string "ÊÉßÒÎÌÀÈÂÎ$" SealedChamber_OuterRoom_Braille_1C5359:: @ 81C5359 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 - .braille "GHI$" + .string "ÊÉßÒÎÌÉÓÙß$" SealedChamber_OuterRoom_Braille_1C5363:: @ 81C5363 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 - .braille "MNO$" + .string "ÊÉßÒÎÌ{0x1F}ëàì$" SealedChamber_OuterRoom_Braille_1C536D:: @ 81C536D - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 - .braille "TUV$" + .string "ÌÉÛÒÒÌ{0x3B}{0x39}$" SealedChamber_OuterRoom_Braille_1C5377:: @ 81C5377 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 - .braille "DEF$" + .string "ÊÉßÒÎÌÌÊÔÒ$" SealedChamber_OuterRoom_Braille_1C5381:: @ 81C5381 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 - .braille "JKL$" + .string "ÊÉßÒÎÌÛéçá$" SealedChamber_OuterRoom_Braille_1C538B:: @ 81C538B - .byte 7 - .byte 6 - .byte 21 - .byte 13 - .byte 11 - .byte 9 - .braille "PQRS$" + .string "ÊÉßÒÎÌ{0x31}=+{0x33}$" SealedChamber_OuterRoom_Braille_1C5396:: @ 81C5396 - .byte 10 - .byte 6 - .byte 18 - .byte 13 - .byte 14 - .byte 9 - .braille ".$" + .string "ÌÉÛÒÒÌ{0x3F}Œ$" SealedChamber_OuterRoom_Braille_1C539E:: @ 81C539E - .byte 7 - .byte 6 - .byte 21 - .byte 13 - .byte 11 - .byte 9 - .braille "WXYZ$" + .string "ËÉÑÒÏÌèù&$" SealedChamber_OuterRoom_Braille_1C53A9:: @ 81C53A9 - .byte 10 - .byte 6 - .byte 18 - .byte 13 - .byte 14 - .byte 9 - .braille ",$" + .string "ÌÉÛÒÒÌ{0x3F}Ç$" SealedChamber_OuterRoom_Braille_1C53B1:: @ 81C53B1 - .byte 5 - .byte 6 - .byte 25 - .byte 13 - .byte 7 - .byte 9 - .braille "DIG HERE.$" + .string "ÉÇ{0x18}ÔËÊàÂÒÀ{0x31}ÊßÌ\n" + .string "ÒÉÌë{0x3F}Œ$" SealedChamber_InnerRoom_Braille_1C53C1:: @ 81C53C1 - .byte 3 - .byte 0 - .byte 27 - .byte 19 - .byte 5 - .byte 3 - .braille "FIRST COMES\n" - .braille "RELICANTH.\n" - .braille "LAST COMES\n" - .braille "WAILORD.$" + .string "È çÛÊÂëÌßÉÂÀéìÒ\n" + .string "{0x39}{0x31}Ìëàì{0x3F}Ç\n" + .string "+ÀÉßçëÎ\n" + .string "{0x39}{0x31}ßÌì{0x39}ì{0x3F}Œ$" SealedChamber_InnerRoom_Braille_1C53F2:: @ 81C53F2 - .byte 6 - .byte 0 - .byte 22 - .byte 19 - .byte 8 - .byte 3 - .braille "IN THIS\n" - .braille "CAVE WE\n" - .braille "HAVE\n" - .braille "LIVED.$" + .string "ÁÁêÙÇÈÉé ÎÉÌàÌë\n" + .string "ÒùÒßÌ ÒÀÈÌé\n" + .string "+Éë ÔÌßÌÈì{0x3F}Œ$" SealedChamber_InnerRoom_Braille_1C5414:: @ 81C5414 - .byte 4 - .byte 2 - .byte 26 - .byte 17 - .byte 6 - .byte 5 - .braille "WE OWE ALL\n" - .braille "TO THE\n" - .braille "POKEMON.$" + .string "ÀÁëÙÂÈ+Éë =ÌëÎÀéÙÌé\n" + .string "ÀßßÌà ÎÌé\n" + .string "áçÙÌÛçé{0x3F}Ç$" SealedChamber_InnerRoom_Braille_1C5435:: @ 81C5435 - .byte 3 - .byte 0 - .byte 25 - .byte 19 - .byte 5 - .byte 3 - .braille "BUT, WE\n" - .braille "SEALED THE\n" - .braille "POKEMON\n" - .braille "AWAY.$" + .string "Á êÛÇÂÎÌééçÂÒ\n" + .string "àáÌëëìÌé +Éë\n" + .string "ÎÉÌ áçÙÌÛçé\n" + .string "+ÌÔ{0x3F}Œ$" SealedChamber_InnerRoom_Braille_1C545C:: @ 81C545C - .byte 1 - .byte 6 - .byte 29 - .byte 13 - .byte 3 - .byte 9 - .braille "WE FEARED IT.$" + .string "ÇÇèÔÉÊ+Éë ÒÀììÌé\n" + .string "ÀéÔàì{0x3F}Œ$" SealedChamber_InnerRoom_Braille_1C5470:: @ 81C5470 - .byte 4 - .byte 0 - .byte 26 - .byte 19 - .byte 6 - .byte 3 - .braille "THOSE WITH\n" - .braille "COURAGE,\n" - .braille "THOSE WITH\n" - .braille "HOPE.$" + .string " ëÛÀÂÎÌéÓÌéÉÔÌé{0x3F}Ç\n" + .string "ÎÉÌ ÒçÊÊÌé {0x31}éÎ\n" + .string "Û{0x31}ìÉÔ àÉéÎ{0x3F}Ç\n" + .string "+ÉëÎ àÉÂÒ$" SealedChamber_InnerRoom_Braille_1C549B:: @ 81C549B - .byte 2 - .byte 0 - .byte 28 - .byte 19 - .byte 4 - .byte 3 - .braille "OPEN A DOOR.\n" - .braille "AN ETERNAL\n" - .braille "POKEMON\n" - .braille "WAITS.$" + .string "Á êÛÇÂÌÉéÌ ì&ëÌ {0x39}{0x31}\n" + .string "ÌÉéÌÛ Ì+ÉÔÌé\n" + .string "áçÙÌÛçé\n" + .string "ùÊÊéÌé{0x3F}Œ$" DesertRuins_Braille_1C54C8:: @ 81C54C8 - .byte 0 - .byte 0 - .byte 29 - .byte 19 - .byte 2 - .byte 3 - .braille "RIGHT, RIGHT,\n" - .braille "DOWN, DOWN.\n" - .braille "THEN, USE\n" - .braille "STRENGTH.$" + .string " ëÛÀÂ{0x39}+ÌÉÛÀß ëÌÂÒìà\n" + .string "{0x31}éÎ {0x39}+ÌÉ\n" + .string "ÒÉé{0x31}éìÌë{0x3F}Ç\n" + .string "ÎÀéé àìèëÙÌ{0x3F}Œ$" IslandCave_Braille_1C54FC:: @ 81C54FC - .byte 3 - .byte 0 - .byte 27 - .byte 19 - .byte 5 - .byte 3 - .braille "STOP AND\n" - .braille "WAIT. WAIT\n" - .braille "FOR TIME TO\n" - .braille "PASS TWICE.$" + .string " éÛÈÂ+ÀëìÌ{0x3F}Ç ÈÉà\n" + .string "ÎÉÌ {0x39}ÌÉì\n" + .string "{0x39}+ÌÉÛÀß\n" + .string "Î{0x31}ëÂÒ Éàì{0x3F}Œ$" AncientTomb_Braille_1C552E:: @ 81C552E - .byte 0 - .byte 0 - .byte 29 - .byte 19 - .byte 1 - .byte 3 - .braille "WITH NEW TIME,\n" - .braille "HOPE AND LOVE,\n" - .braille "AIM TO THE SKY\n" - .braille "IN THE MIDDLE.$" + .string " ëÛÀÂéÌ{0x31}Ì {0x39}ÌÉì{0x3F}Ç\n" + .string "ÒçÊÊé{0x31}éÔ {0x31}éÎ\n" + .string "ßÉÌÈÌ àÉéÎ ÎÉÌ\n" + .string "ÒÉÛÛÌßàÛÉììÌ{0x3F}Œ$" diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc index a4c8bc7c0..4cadd759a 100644 --- a/data/text/cable_club.inc +++ b/data/text/cable_club.inc @@ -1,176 +1,178 @@ OldaleTown_PokemonCenter_2F_Text_1A4510:: @ 81A4510 - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "COLOSSEUM.\p" - .string "You may battle with your friends here.\p" - .string "Would you like to battle?$" + .string "Willkommen im POKéMON KABEL-CLUB-\n" + .string "KOLOSSEUM.\p" + .string "Hier kannst du mit deinen Freunden\n" + .string "kämpfen.\p" + .string "Möchtest du jetzt kämpfen?$" OldaleTown_PokemonCenter_2F_Text_1A457E:: @ 81A457E - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "TRADE CENTER.\p" - .string "You may trade your POKéMON here\n" - .string "with a friend.\p" - .string "Would you like to trade POKéMON?$" + .string "Willkommen im POKéMON KABEL-CLUB-\n" + .string "HANDELSCENTER.\p" + .string "Hier kannst du mit deinen Freunden\n" + .string "POKéMON tauschen.\p" + .string "Möchtest du jetzt POKéMON tauschen?$" OldaleTown_PokemonCenter_2F_Text_1A45FE:: @ 81A45FE - .string "Welcome to the POKéMON CABLE CLUB\n" - .if REVISION >= 1 - .string "RECORD CORNER.\p" - .else - .string "RECORD CENTER.\p" - .endif - .string "You may mix your records as a TRAINER\n" - .string "with the records of your friends.\p" - .string "Would you like to mix records?$" + .string "Willkommen beim POKéMON KABEL-CLUB-\n" + .string "STATISTIKTAUSCH.\p" + .string "Hier kannst du mit deinen Freunden\n" + .string "die Rekorde als TRAINER austauschen.\p" + .string "Möchtest du Rekorde austauschen?$" OldaleTown_PokemonCenter_2F_Text_1A4696:: @ 81A4696 - .string "There are three link battle modes.\p" - .string "SINGLE BATTLE is for two TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.\p" - .string "DOUBLE BATTLE is for two TRAINERS\n" - .string "with two or more POKéMON each.\p" - .string "Each TRAINER will send out two\n" - .string "POKéMON in battle at a time.\p" - .string "MULTI BATTLE is for four TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.$" + .string "Es gibt drei Arten des Kampfes\n" + .string "via Verbindungskabel.\p" + .string "EINZELKAMPF ist für zwei TRAINER, die\n" + .string "jeder ein oder mehrere POKéMON\l" + .string "besitzen.\p" + .string "Jeder TRAINER schickt pro Runde\n" + .string "ein POKéMON in den Kampf.\p" + .string "DOPPELKAMPF ist für zwei TRAINER mit\n" + .string "zwei oder mehr POKéMON.\p" + .string "Jeder TRAINER schickt pro Runde zwei\n" + .string "POKéMON in den Kampf.\p" + .string "MULTIKÄMPFE sind für vier TRAINER mit\n" + .string "einem oder mehr POKéMON.\p" + .string "Jeder TRAINER schickt pro Runde ein\n" + .string "POKéMON in den Kampf.$" OldaleTown_PokemonCenter_2F_Text_1A4826:: @ 81A4826 - .string "Would you like to battle?$" + .string "Möchtest du kämpfen?$" OldaleTown_PokemonCenter_2F_Text_1A4840:: @ 81A4840 - .string "Which Battle Mode would you like\n" - .string "to play?$" + .string "Welche Art des Kampfes?$" OldaleTown_PokemonCenter_2F_Text_1A486A:: @ 81A486A - .string "For a DOUBLE BATTLE, you must have\n" - .string "at least two POKéMON.$" + .string "Für einen DOPPELKAMPF brauchst du\n" + .string "mindestens zwei POKéMON.$" OldaleTown_PokemonCenter_2F_Text_1A48A3:: @ 81A48A3 - .string "For trading, you must have at least\n" - .string "two POKéMON with you.$" + .string "Für einen Tausch musst du mindestens\n" + .string "zwei POKéMON bei dir haben.$" OldaleTown_PokemonCenter_2F_Text_1A48DD:: @ 81A48DD - .string "Your {STR_VAR_1} BERRY-holding POKéMON\n" - .string "can’t be traded.$" + .string "Dein POKéMON trägt eine {STR_VAR_1}-\n" + .string "BEERE und kann nicht getauscht werden.$" -gUnknown_081A490C:: @ 81A490C OldaleTown_PokemonCenter_2F_Text_1A490C:: @ 81A490C - .string "Please wait.\n" - .string "... ... B Button: Cancel$" +gUnknown_081A490C:: @ 81A490C + .string "Bitte warten.\n" + .string "... ... B-Knopf: Abbruch$" -gUnknown_081A4932:: @ 81A4932 UnknownString_81A4932: @ 81A4932 - .string "When all players are ready...\n" - .string "A Button: Confirm B Button: Cancel$" +gUnknown_081A4932:: @ 81A4932 + .string "Wenn die Spieler bereit sind...\n" + .string "A-Knopf: Bestätigen B-Knopf: Abbruch$" -gUnknown_081A4975:: @ 81A4975 UnknownString_81A4975: @ 81A4975 - .string "Start link with {STR_VAR_1} players.\n" - .string "A Button: Confirm B Button: Cancel$" +gUnknown_081A4975:: @ 81A4975 + .string "Verbindung für {STR_VAR_1} Spieler aufbauen.\n" + .string "A-Knopf: Bestätigen B-Knopf: Abbruch$" -gUnknown_081A49B6:: @ 81A49B6 UnknownString_81A49B6: @ 81A49B6 - .string "Awaiting linkup...\n" - .string "... ... B Button: Cancel$" +gUnknown_081A49B6:: @ 81A49B6 + .string "Verbindungsaufbau...\n" + .string "... ... B-Knopf: Abbruch$" UnknownString_81A49E2: @ 81A49E2 - .string "Your progress must be saved before\n" - .string "linking. Is it okay to save?$" + .string "Dein Spiel muss vor Verbindungsaufbau\n" + .string "gespeichert werden. Speichern?$" OldaleTown_PokemonCenter_2F_Text_1A4A22:: @ 81A4A22 - .string "Please enter.$" + .string "Bitte eintreten.$" FallarborTown_ContestLobby_Text_1A4A30:: @ 81A4A30 OldaleTown_PokemonCenter_2F_Text_1A4A30:: @ 81A4A30 - .string "Someone is not ready to link.\p" - .string "Please come back after everyone has\n" - .string "made preparations.$" + .string "Ein Spieler ist noch nicht bereit\n" + .string "für den Link.\p" + .string "Bitte kommt wieder, wenn jeder seine\n" + .string "Vorbereitungen getroffen hat.$" FallarborTown_ContestLobby_Text_1A4A85:: @ 81A4A85 OldaleTown_PokemonCenter_2F_Text_1A4A85:: @ 81A4A85 - .string "Sorry, we have a transmission error...\n" - .string "Please reset and try again.$" + .string "Verbindungsfehler...\n" + .string "Die Kabelverbindungen überprüfen und\l" + .string "die Geräte aus- und wieder einschalten.$" OldaleTown_PokemonCenter_2F_Text_1A4AC8:: @ 81A4AC8 - .string "Sorry, we have a transmission error.\n" - .string "You may not mix records in different\l" - .string "languages.$" + .string "Tut uns Leid. Hier liegt ein Über-\n" + .string "tragungsfehler vor. Rekorde können\l" + .string "nicht in unterschiedlichen Sprachen\l" + .string "ausgetauscht werden.$" FallarborTown_ContestLobby_Text_1A4B1D:: @ 81A4B1D OldaleTown_PokemonCenter_2F_Text_1A4B1D:: @ 81A4B1D - .string "The link partners appear to have made\n" - .string "different selections.$" + .string "Die Link-Partner haben eine unter-\n" + .string "schiedliche Auswahl getroffen.$" OldaleTown_PokemonCenter_2F_Text_1A4B59:: @ 81A4B59 - .string "Please come again.$" + .string "Bitte komm bald wieder.$" OldaleTown_PokemonCenter_2F_Text_1A4B6C:: @ 81A4B6C - .string "The number of participants is\n" - .string "incorrect.$" + .string "Die Anzahl der Teilnehmer ist nicht\n" + .string "korrekt.$" OldaleTown_PokemonCenter_2F_Text_1A4B95:: @ 81A4B95 - .string "The SINGLE Battle Mode cannot be\n" - .string "played by {STR_VAR_1} players.$" + .string "Ein EINZELKAMPF kann nicht von\n" + .string "{STR_VAR_1} Spielern geführt werden.$" OldaleTown_PokemonCenter_2F_Text_1A4BCC:: @ 81A4BCC - .string "The DOUBLE Battle Mode cannot be\n" - .string "played by {STR_VAR_1} players.$" + .string "Ein DOPPELKAMPF kann nicht von\n" + .string "{STR_VAR_1} Spielern geführt werden.$" OldaleTown_PokemonCenter_2F_Text_1A4C03:: @ 81A4C03 - .string "There must be four players to play\n" - .string "this Battle Mode.$" + .string "Für diesen Kampfmodus werden vier\n" + .string "Spieler benötigt.$" OldaleTown_PokemonCenter_2F_Text_1A4C38:: @ 81A4C38 - .string "Please confirm the number of players\n" - .string "and start again.$" + .string "Bitte überprüfe die Anzahl der Spieler\n" + .string "und fange noch einmal an.$" TradeRoom_WillLinkBeTerminated: @ 81A4C6E - .string "The link will be terminated if you\n" - .string "leave the room. Is that okay?$" + .string "Wenn du den Raum verlässt, wird die Ver-\n" + .string "bindung abgebrochen. Einverstanden?$" TradeRoom_TerminatingLink: @ 81A4CAF - .string "Terminating link... You will be\n" - .string "escorted out of the room. Please wait.$" + .string "Verbindung wird abgebrochen... Du wirst\n" + .string "aus dem Raum begleitet. Bitte warten.$" CableClub_TooBusyToNotice: @ 81A4CF6 - .string "This TRAINER is too busy to notice...$" + .string "Dieser TRAINER ist zu beschäftigt...$" CableClub_LookAtTrainerCard1: @ 81A4D1C - .string "Score! Got to look at {STR_VAR_1}’s\n" - .string "TRAINER CARD!$" + .string "Hey! Schau dir mal den TRAINERPASS\n" + .string "von {STR_VAR_1} an!$" CableClub_LookAtTrainerCard2: @ 81A4D45 - .string "Score! Got to look at {STR_VAR_1}’s\n" - .string "TRAINER CARD! It’s a {STR_VAR_2} card!$" + .string "Hey! Schau dir mal den TRAINERPASS\n" + .string "von {STR_VAR_1} an! Es ist ein\l" + .string "{STR_VAR_2}PASS.$" SingleBattleColosseum_Text_1A4D7E:: @ 81A4D7E - .string "Please take your seat and start\n" - .string "your battle.$" + .string "Bitte geh in Position und beginne mit\n" + .string "dem Kampf.$" TradeCenter_Text_1A4DAB:: @ 81A4DAB - .string "Please take your seat and start\n" - .string "your trade.$" + .string "Bitte geh in Position und beginne mit\n" + .string "dem Tausch.$" RecordCorner_Text_1A4DD7:: @ 81A4DD7 - .string "Please take your seat and wait.$" + .string "Bitte geh in Position und warte.$" RecordCorner_Text_1A4DF7:: @ 81A4DF7 - .string "Thanks for coming.$" + .string "Danke für den Besuch!$" UnknownString_81A4E0A: @ 81A4E0A - .string "Please choose your POKéMON for the\n" - .string "MULTI BATTLE.$" + .string "Bitte wähle die POKéMON für den\n" + .string "MULTIKAMPF.$" RecordCorner_Text_1A4E3B:: @ 81A4E3B - .string "{STR_VAR_1} sent over one\n" - .string "{STR_VAR_2}.$" + .string "{STR_VAR_1} hat ein {STR_VAR_2}\n" + .string "versendet.$" OldaleTown_PokemonCenter_2F_Text_1A4E50:: @ 81A4E50 - .string "The TRAINER CARD data will\n" - .string "be rewritten.$" + .string "Der Eintrag auf dem TRAINERPASS wird\n" + .string "geändert.$" OldaleTown_PokemonCenter_2F_Text_1A4E79:: @ 81A4E79 - .string "I hope to see you again!$" + .string "Ich hoffe, du kommst bald wieder vorbei.$" diff --git a/data/text/contest_hall.inc b/data/text/contest_hall.inc index 3a8682208..7e05a9a2d 100644 --- a/data/text/contest_hall.inc +++ b/data/text/contest_hall.inc @@ -1,238 +1,246 @@ FallarborTown_ContestLobby_Text_1A5DFC:: @ 81A5DFC - .string "Hello, there!\p" - .string "We’re accepting registrations for\n" - .string "{STR_VAR_1} Rank POKéMON CONTESTS.$" + .string "Hallo! Wir nehmen Anmeldungen für die\n" + .string "{STR_VAR_1}-KLASSE POKéMON\l" + .string "WETTBEWERBE entgegen.$" FallarborTown_ContestLobby_Text_1A5E46:: @ 81A5E46 - .string "Would you like to enter your POKéMON\n" - .string "in our CONTESTS?$" + .string "Soll eines deiner POKéMON an einem der\n" + .string "WETTBEWERBE teilnehmen?$" FallarborTown_ContestLobby_Text_1A5E7C:: @ 81A5E7C - .string "Which topic would you like?$" + .string "Welches Thema möchtest du dir ansehen?$" FallarborTown_ContestLobby_Text_1A5E98:: @ 81A5E98 - .string "A POKéMON CONTEST involves four\n" - .string "TRAINERS entering one POKéMON each\l" - .string "in competitive judging.\p" - .string "A CONTEST has two stages of judging,\n" - .string "primary and secondary.\p" - .string "Primary judging is a popularity poll\n" - .string "involving the audience.\p" - .string "Secondary judging features appeals\n" - .string "by the POKéMON using their moves.\p" - .string "Plan appeals carefully to earn the\n" - .string "most attention of the JUDGE and\l" - .string "excite the audience.\l" - .string "Do your best to stand out.\p" - .string "The primary and secondary scores are\n" - .string "added at the end.\p" - .string "The POKéMON garnering the highest\n" - .string "score is declared the winner.$" + .string "In einem POKéMON WETTBEWERB zeigen\n" + .string "4 TRAINER jeweils eines ihrer POKéMON\l" + .string "einer Jury.\p" + .string "Der WETTBEWERB besteht aus zwei\n" + .string "Durchläufen.\p" + .string "Im ersten Durchlauf wird geprüft, wie\n" + .string "gut das POKéMON beim Publikum ankommt.\p" + .string "Im zweiten Durchlauf muss das POKéMON\n" + .string "mit der Ausdruckskraft seiner Attacken\l" + .string "überzeugen.\p" + .string "Die Attacken müssen sorgfältig gewählt\n" + .string "werden, damit sie dem JUROR ins Auge\l" + .string "fallen und das Publikum begeistern. Ver-\l" + .string "suche, die Attacken gut zu platzieren.\p" + .string "Am Ende werden die Ergebnisse beider\n" + .string "Durchläufe addiert.\p" + .string "Das POKéMON mit dem besten Ergebnis\n" + .string "wird zum Gewinner erklärt.$" FallarborTown_ContestLobby_Text_1A609B:: @ 81A609B - .string "There are five kinds of CONTESTS.\p" - .string "COOL, BEAUTY, CUTE, SMART, and\n" - .string "TOUGH are the five categories.\p" - .string "Choose the CONTEST that is right for\n" - .string "the POKéMON you plan to enter.$" + .string "Es gibt fünf verschiedene WETTBEWERBE.\p" + .string "COOLNESS, SCHÖNHEIT, ANMUT, KLUGHEIT\n" + .string "und STÄRKE heißen die Kategorien.\p" + .string "Wähle einen WETTBEWERB, der deinem\n" + .string "POKéMON am besten liegt.$" FallarborTown_ContestLobby_Text_1A613F:: @ 81A613F - .string "There are four ranks of POKéMON\n" - .string "CONTESTS.\p" - .string "NORMAL, SUPER, HYPER and MASTER\n" - .string "are the four ranks.\p" - .string "In the NORMAL Rank, any POKéMON may\n" - .string "enter.\p" - .string "Any POKéMON that won a NORMAL Rank\n" - .string "CONTEST may move up the SUPER Rank in\l" - .string "the same category.\p" - .string "In the same way, a SUPER Rank winner\n" - .string "can move up to the HYPER Rank, and a\l" - .string "HYPER Rank winner can advance to the\l" - .string "MASTER Rank in the same category.\p" - .string "A POKéMON that won in the MASTER Rank\n" - .string "may compete in the MASTER Rank as\l" - .string "often as its TRAINER wants.$" + .string "Die POKéMON WETTBEWERBE sind in vier\n" + .string "Klassen aufgeteilt.\p" + .string "NORMAL, SUPER, HYPER und MASTER.\p" + .string "In der NORMAL-KLASSE kann jedes\n" + .string "POKéMON antreten.\p" + .string "Jedes POKéMON, das die NORMAL-KLASSE\n" + .string "gewonnen hat, kann in der SUPER-KLASSE\l" + .string "derselben Kategorie antreten.\p" + .string "Genauso kann das POKéMON, das in der\n" + .string "SUPER-KLASSE gewonnen hat, in der\l" + .string "HYPER-KLASSE und nach einem Sieg\p" + .string "dort in der MASTER-KLASSE antreten.\n" + .string "Immer in derselben Kategorie.\p" + .string "Ein POKéMON, das in der MASTER-KLASSE\n" + .string "gewonnen hat, kann sooft es sein\l" + .string "TRAINER mag, wieder dort antreten.$" FallarborTown_ContestLobby_Text_1A6319:: @ 81A6319 - .string "Which POKéMON would you like to enter?$" + .string "Welches POKéMON soll teilnehmen?$" FallarborTown_ContestLobby_Text_1A6340:: @ 81A6340 - .string "Anyone with a CONTEST PASS may enter.\p" - .string "You may obtain a CONTEST PASS at the\n" - .string "NORMAL RANK CONTEST HALL in\l" - .string "VERDANTURF TOWN free of charge.\p" - .string "Please obtain a CONTEST PASS and\n" - .string "come again.$" + .string "Jeder, der eine WETTBEWERBSKARTE\n" + .string "besitzt, darf teilnehmen.\p" + .string "Du bekommst die WETTBEWERBSKARTE\n" + .string "kostenlos in der WETTBEWERBSHALLE für\l" + .string "die NORMAL-KLASSE in WIESENFLUR.\p" + .string "Bitte hol dir die KARTE dort ab und komm\n" + .string "dann wieder.$" LilycoveCity_ContestLobby_Text_1A63F4:: @ 81A63F4 - .string "I accept registrations only from four\n" - .string "linked players for a POKéMON CONTEST.\p" - .string "Anyone with a CONTEST PASS may enter.\p" - .string "You may obtain a CONTEST PASS at the\n" - .string "NORMAL RANK CONTEST HALL in\l" - .string "VERDANTURF TOWN free of charge.\p" - .string "Please obtain a CONTEST PASS and\n" - .string "come again.$" + .string "Ich akzeptiere nur Anmeldungen von\n" + .string "vier Spielern, die via Link verbunden\l" + .string "sind und am POKéMON WETTBEWERB\l" + .string "teilnehmen wollen.\p" + .string "Jeder, der eine WETTBEWERBSKARTE\n" + .string "besitzt, darf teilnehmen.\p" + .string "Du bekommst die WETTBEWERBSKARTE\n" + .string "kostenlos in der WETTBEWERBSHALLE für\l" + .string "die NORMAL-KLASSE in WIESENFLUR.\p" + .string "Bitte hol dir die KARTE dort ab und komm\n" + .string "dann wieder.$" FallarborTown_ContestLobby_Text_1A64F4:: @ 81A64F4 - .string "Anyone with a CONTEST PASS may enter.\p" - .string "If you don’t have one, I can issue one\n" - .string "for you right now.\p" - .string "Would you like me to issue you a\n" - .string "CONTEST PASS?$" + .string "Jeder, der eine WETTBEWERBSKARTE\n" + .string "besitzt, darf teilnehmen.\p" + .string "Wenn du keine hast, kann ich dir sofort\n" + .string "eine ausstellen.\p" + .string "Möchtest du eine WETTBEWERBSKARTE\n" + .string "haben?$" FallarborTown_ContestLobby_Text_1A6583:: @ 81A6583 - .string "Here you go!$" + .string "Bitte schön!$" FallarborTown_ContestLobby_Text_1A6590:: @ 81A6590 - .string "Oh?\p" - .string "We’ve already issued you a CONTEST\n" - .string "PASS, {PLAYER}.\p" - .string "Please come back with your CONTEST\n" - .string "PASS.$" + .string "Oh!\p" + .string "Aber du besitzt ja bereits eine WETT-\n" + .string "BEWERBSKARTE, {PLAYER}.\p" + .string "Bitte bring die KARTE das nächste Mal\n" + .string "mit.$" FallarborTown_ContestLobby_Text_1A65EA:: @ 81A65EA - .string "Please visit whenever you would like\n" - .string "to enter a CONTEST.$" + .string "Bitte komm vorbei, wann immer du an\n" + .string "einem WETTBEWERB teilnehmen möchtest.$" FallarborTown_ContestLobby_Text_1A6623:: @ 81A6623 - .string "Which CONTEST would you like to enter?$" + .string "An welchem WETTBEWERB möchtest du\n" + .string "teilnehmen?$" FallarborTown_ContestLobby_Text_1A664A:: @ 81A664A LilycoveCity_ContestLobby_Text_1A664A:: @ 81A664A - .string "I’m terribly sorry, but your POKéMON\n" - .string "is not qualified to compete at this\l" - .string "Rank yet...$" + .string "Tut mir schrecklich Leid, aber dein\n" + .string "POKéMON kann hier noch nicht\l" + .string "antreten...$" FallarborTown_ContestLobby_Text_1A669F:: @ 81A669F LilycoveCity_ContestLobby_Text_1A669F:: @ 81A669F - .string "I’m sorry, but an EGG cannot take part\n" - .string "in a POKéMON CONTEST.$" + .string "Tut mit Leid, aber ein EI kann nicht an\n" + .string "einem WETTBEWERB teilnehmen.$" FallarborTown_ContestLobby_Text_1A66DC:: @ 81A66DC LilycoveCity_ContestLobby_Text_1A66DC:: @ 81A66DC - .string "Your POKéMON appears to be in no\n" - .string "condition to take part in a CONTEST...$" + .string "Dein POKéMON ist nicht in der Lage, an\n" + .string "einem WETTBEWERB teilzunehmen...$" FallarborTown_ContestLobby_Text_1A6724:: @ 81A6724 - .string "Oh, but that RIBBON...\p" - .string "Your POKéMON has won this CONTEST\n" - .string "before, hasn’t it?\p" - .string "Would you like to enter it in this\n" - .string "CONTEST anyway?$" + .string "Oh, aber das BAND...\p" + .string "Dein POKéMON hat diesen WETTBEWERB\n" + .string "schon einmal gewonnen, oder?\p" + .string "Möchtest du es trotzdem für diesen\n" + .string "WETTBEWERB anmelden?$" FallarborTown_ContestLobby_Text_1A67A3:: @ 81A67A3 LilycoveCity_ContestLobby_Text_1A67A3:: @ 81A67A3 - .string "Is that your CONTEST POKéMON?$" + .string "Ist das dein WETTBEWERBS-POKéMON?$" FallarborTown_ContestLobby_Text_1A67C1:: @ 81A67C1 - .string "Okay, your POKéMON will be entered\n" - .string "in this CONTEST.\p" - .string "Your POKéMON is Entry No. 4.\n" - .string "The CONTEST will begin shortly.$" + .string "Okay, dein POKéMON wird an diesem\n" + .string "WETTBEWERB teilnehmen.\p" + .string "Dein POKéMON ist die Nummer 4.\n" + .string "Der WETTBEWERB wird in Kürze starten.$" FallarborTown_ContestLobby_Text_1A6832:: @ 81A6832 LilycoveCity_ContestLobby_Text_1A6832:: @ 81A6832 SlateportCity_ContestLobby_Text_1A6832:: @ 81A6832 VerdanturfTown_ContestLobby_Text_1A6832:: @ 81A6832 - .string "Please come in through here.\n" - .string "Good luck!$" + .string "Bitte folge mir, und viel Glück!$" FallarborTown_ContestLobby_Text_1A685A:: @ 81A685A - .string "Congratulations! Your POKéMON is the\n" - .string "CONTEST winner!\p" - .string "We have your prize right here.\n" - .string "Please, right this way!$" + .string "Herzlichen Glückwunsch! Dein POKéMON\n" + .string "hat den WETTBEWERB gewonnen!\p" + .string "Und hier haben wir deinen Preis.\n" + .string "Bitte, komm hier herüber!$" FallarborTown_ContestLobby_Text_1A68C6:: @ 81A68C6 - .string "Please come back for your prize\n" - .string "later on.$" + .string "Bitte hole deinen Preis später ab.$" LinkContestRoom1_Text_1A68F0:: @ 81A68F0 - .string "MC: Hello! We’re just getting started\n" - .string "with a {STR_VAR_3} Rank POKéMON\l" - .string "{STR_VAR_2} CONTEST!\p" - .string "The participating TRAINERS and their\n" - .string "POKéMON are as follows:$" + .string "MC: Hallo! Wir fangen nun mit einem \n" + .string "{STR_VAR_3}-KLASSE POKéMON {STR_VAR_2}-\l" + .string "WETTBEWERB an!\p" + .string "Die folgenden TRAINER und ihre POKéMON\n" + .string "nehmen teil:$" LinkContestRoom1_Text_1A6976:: @ 81A6976 - .string "MC: Hello! We’re just getting started\n" - .string "with a 4-player linked POKéMON\l" - .string "{STR_VAR_2} CONTEST!\p" - .string "The participating TRAINERS and their\n" - .string "POKéMON are as follows:$" + .string "MC: Hallo! Wir fangen nun mit einem \n" + .string "4-Spieler POKéMON {STR_VAR_2}-\l" + .string "WETTBEWERB via Link an!\p" + .string "Die folgenden TRAINER und ihre POKéMON\n" + .string "nehmen teil:$" LinkContestRoom1_Text_1A6A04:: @ 81A6A04 - .string "MC: Entry No. {STR_VAR_2}!\n" - .string "{STR_VAR_1}’s {STR_VAR_3}!$" + .string "MC: Teilnehmer Nr. {STR_VAR_2}!\n" + .string "{STR_VAR_3} von {STR_VAR_1}!$" LinkContestRoom1_Text_1A6A1F:: @ 81A6A1F - .string "MC: We’ve just seen the four POKéMON\n" - .string "contestants.\p" - .string "Now it’s time for primary judging!\p" - .string "The audience will vote on their\n" - .string "favorite POKéMON contestants.\p" - .string "Without any further ado, let the\n" - .string "voting begin!$" + .string "MC: Nun haben wir alle vier teilnehmenden\n" + .string "POKéMON gesehen.\p" + .string "Zeit für die erste Bewertung!\p" + .string "Das Publikum entscheidet, welches\n" + .string "POKéMON am besten gefällt.\p" + .string "Und ohne weitere Verzögerung kommen\n" + .string "wir zu der Bewertung!$" LinkContestRoom1_Text_1A6AE1:: @ 81A6AE1 - .string "Voting under way...$" + .string "Bewertung läuft...$" LinkContestRoom1_Text_1A6AF5:: @ 81A6AF5 - .string "Voting is now complete!\p" - .string "While the votes are being tallied,\n" - .string "let’s move on to secondary judging!\p" - .string "The second stage of judging is the\n" - .string "much anticipated appeal time!\p" - .string "May the contestants amaze us with\n" - .string "superb appeals of dazzling moves!\p" - .string "Let’s see a little enthusiasm!\n" - .string "Let’s appeal!$" + .string "Die Bewertung ist nun abgeschlossen!\p" + .string "Während diese ausgewertet wird, kommen\n" + .string "wir zum zweiten Durchlauf!\p" + .string "Im zweiten Durchlauf zeigen uns die\n" + .string "Kontrahenten die Ausdruckskraft\l" + .string "ihrer Attacken!\p" + .string "Hoffen wir, dass sie uns mit ihren Vor-\n" + .string "führungen den Atem rauben!\p" + .string "Hoffen wir auf Enthusiasmus!\n" + .string "Lasst die Vorführung beginnen!$" LinkContestRoom1_Text_1A6C06:: @ 81A6C06 - .string "MC: That’s it for judging!$" + .string "MC: Die Bewertung ist auch hier beendet!$" LinkContestRoom1_Text_1A6C21:: @ 81A6C21 - .string "Thank you all for a most wonderful\n" - .string "display of quality appeals!\p" - .string "This concludes all judging!\n" - .string "Thank you for your fine efforts!$" + .string "Herzlichen Dank an die Teilnehmer für\n" + .string "ihre wunderbare Vorführung!\p" + .string "Damit ist die Bewertung abgeschlossen!\n" + .string "Vielen Dank für alles!$" LinkContestRoom1_Text_1A6C9D:: @ 81A6C9D - .string "Now, all that remains is the pulse-\n" - .string "pounding proclamation of the winner.\p" - .string "The JUDGE looks ready to make the\n" - .string "announcement!$" + .string "Kommen wir nun zu dem, was unseren Puls\n" + .string "höher schlagen lässt: Die Bekanntgabe\l" + .string "der Gewinner.\p" + .string "Der JUROR scheint für die Bekanntgabe\n" + .string "bereit zu sein!$" LinkContestRoom1_Text_1A6D16:: @ 81A6D16 - .string "JUDGE: I will now declare the winner!$" + .string "JUROR: Ich werde nun den Sieger\n" + .string "bekannt geben!$" LinkContestRoom1_Text_1A6D3C:: @ 81A6D3C - .string "MC: Entry No. {STR_VAR_2}!\p" - .string "{STR_VAR_3} and {STR_VAR_1},\n" - .string "congratulations!$" + .string "MC: Teilnehmer Nr. {STR_VAR_2}!\p" + .string "{STR_VAR_3} und {STR_VAR_1}!\n" + .string "Herzlichen Glückwunsch!$" LinkContestRoom1_Text_1A6D6A:: @ 81A6D6A - .string "We confer on you this RIBBON as your\n" - .string "prize!$" + .string "Wir überreichen dir hiermit dieses BAND\n" + .string "als Zeichen deines Sieges!$" LinkContestRoom1_Text_1A6D96:: @ 81A6D96 - .string "{PLAYER} received a RIBBON.$" + .string "{PLAYER} erhält ein BAND.$" LinkContestRoom1_Text_1A6DAC:: @ 81A6DAC - .string "{PLAYER} put the RIBBON on\n" - .string "{STR_VAR_1}.$" + .string "{PLAYER} steckt {STR_VAR_1} das\n" + .string "BAND an.$" LinkContestRoom1_Text_1A6DC5:: @ 81A6DC5 - .string "MC: Here you are!\n" - .string "Please accept your prize!$" + .string "MC: Bitte schön!\n" + .string "Bitte, dies ist dein Preis!$" LinkContestRoom1_Text_1A6DF1:: @ 81A6DF1 - .string "MC: Congratulations!\n" - .string "Please do compete again!$" + .string "MC: Herzlichen Glückwunsch!\n" + .string "Komm bald wieder!$" LinkContestRoom1_Text_1A6E1F:: @ 81A6E1F - .string "Please pick up your prize at the\n" - .string "reception counter later.\l" - .string "Please do compete again!$" + .string "Bitte hole deinen Preis später an der\n" + .string "Rezeption ab.\l" + .string "Und nimm bald wieder teil!$" diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 5c9fdf0db..02264880e 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -1,99 +1,151 @@ -ContestString_DescHighlyAppealing: - .string "A highly appealing move.$" -ContestString_DescStartled1: - .string "After this move, the user is\nmore easily startled.$" -ContestString_DescGreatLock: - .string "Makes a great appeal, but\nallows no more to the end.$" -ContestString_DescRepeatable: - .string "Can be repeatedly used\nwithout boring the JUDGE.$" -ContestString_DescStartled2: - .string "Can avoid being startled\nby others once.$" -ContestString_DescStartled3: - .string "Can avoid being startled\nby others.$" -ContestString_DescStartled4: - .string "Can avoid being startled\nby others a little.$" -ContestString_DescStartled5: - .string "After this move, the user is\nless likely to be startled.$" -ContestString_DescStartled6: - .string "Slightly startles the\nPOKéMON in front.$" -ContestString_DescStartled7: - .string "Slightly startles those\nthat have made appeals.$" -ContestString_DescStartled8: - .string "Startles the POKéMON that\nappealed before the user.$" -ContestString_DescStartled9: - .string "Startles all POKéMON that\nhave done their appeals.$" -ContestString_DescStartled10: - .string "Badly startles the\nPOKéMON in front.$" -ContestString_DescStartled11: - .string "Badly startles those that\nhave made appeals.$" -ContestString_DescStartled12: - .string "Startles the POKéMON that\nappealed before the user.$" -ContestString_DescStartled13: - .string "Startles all POKéMON that\nappealed before the user.$" -ContestString_DescAttentionShift: - .string "Shifts the JUDGE’s\nattention from others.$" -ContestString_DescStartled14: - .string "Startles the POKéMON that\nhas the JUDGE’s attention.$" -ContestString_DescJamOthersMissTurn: - .string "Jams the others, and misses\none turn of appeals.$" -ContestString_DescStartled15: - .string "Startles POKéMON that\nmade a same-type appeal.$" -ContestString_DescStartled16: - .string "Badly startles POKéMON\nthat made COOL appeals.$" -ContestString_DescStartled17: - .string "Badly startles POKéMON\nthat made BEAUTY appeals.$" -ContestString_DescStartled18: - .string "Badly startles POKéMON\nthat made CUTE appeals.$" -ContestString_DescStartled19: - .string "Badly startles POKéMON\nthat made SMART appeals.$" -ContestString_DescStartled20: - .string "Badly startles POKéMON\nthat made TOUGH appeals.$" -ContestString_DescNervousOne: - .string "Makes one POKéMON after\nthe user nervous.$" -ContestString_DescNervousAllAfter: - .string "Makes all POKéMON after\nthe user nervous.$" -ContestString_DescConditionWorseBefore: - .string "Worsens the condition of\nthose that made appeals.$" -ContestString_DescStartled21: - .string "Badly startles POKéMON in\ngood condition.$" -ContestString_DescGreatWhenFirst: - .string "The appeal works great if\nperformed first.$" -ContestString_DescGreatWhenLast: - .string "The appeal works great if\nperformed last.$" -ContestString_DescAppealGoodBeforeAll: - .string "Makes the appeal as good\nas those before it.$" -ContestString_DescAppealGoodBeforeOne: - .string "Makes the appeal as good\nas the one before it.$" -ContestString_DescBetterWhenLater: - .string "The appeal works better\nthe later it is performed.$" -ContestString_DescAffectedByTiming: - .string "The appeal’s quality varies\ndepending on its timing.$" -ContestString_DescBetterWhenSameType: - .string "Works well if it’s the same\ntype as the one before.$" -ContestString_DescBetterWhenDiffType: - .string "Works well if different in\ntype than the one before.$" -ContestString_DescAffectedByFront: - .string "Affected by how well the\nappeal in front goes.$" -ContestString_DescConditionUp: - .string "Ups the user’s condition.\nHelps prevent nervousness.$" -ContestString_DescAffectedByCondition: - .string "The appeal works well if the\nuser’s condition is good.$" -ContestString_DescAppealEarlier: - .string "The next appeal can be made\nearlier next turn.$" -ContestString_DescAppealLater: - .string "The next appeal can be made\nlater next turn.$" -ContestString_DescRandomOrderEasier: - .string "Makes the next turn’s order\nmore easily scrambled.$" -ContestString_DescRandomOrder: - .string "Scrambles the order of\nappeals on the next turn.$" -ContestString_DescAnyExcitement: - .string "An appeal that excites the\naudience in any CONTEST.$" -ContestString_DescStartled22: - .string "Badly startles all POKéMON\nthat made good appeals.$" -ContestString_DescScaleWithExcitement: - .string "The appeal works best the\nmore the crowd is excited.$" -ContestString_DescStopExcitement: - .string "Temporarily stops the\ncrowd from growing excited.$" +ContestString_DescHighlyAppealing: @ 83CA4EC + .string "Eine sehr ansprechende\n" + .string "Vorführung.$" +ContestString_DescStartled1: @ 83CA505 + .string "Einsatz der Attacke macht\n" + .string "PKMN leichter irritierbar.$" +ContestString_DescGreatLock: @ 83CA538 + .string "Großartiger Ausdruck, der\n" + .string "sich nicht steigern lässt.$" +ContestString_DescRepeatable: @ 83CA56D + .string "Langweilt den JUROR auch\n" + .string "bei Wiederholung nicht.$" +ContestString_DescStartled2: @ 83CA59E + .string "Kann Irritation durch\n" + .string "andere einmal verhindern.$" +ContestString_DescStartled3: @ 83CA5C7 + .string "Kann Irritation durch\n" + .string "andere verhindern.$" +ContestString_DescStartled4: @ 83CA5EB + .string "Kann Irritation durch an-\n" + .string "dere ein wenig eindämmen.$" +ContestString_DescStartled5: @ 83CA618 + .string "Einsatz der Attacke dämmt\n" + .string "danach Irritation ein.$" +ContestString_DescStartled6: @ 83CA651 + .string "Irritiert das vordere\n" + .string "POKéMON ein wenig.$" +ContestString_DescStartled7: @ 83CA679 + .string "Irritiert die POKéMON ein\n" + .string "wenig, die schon auftraten.$" +ContestString_DescStartled8: @ 83CA6A9 + .string "Irritiert das POKéMON, das\n" + .string "vorher aufgetreten ist.$" +ContestString_DescStartled9: @ 83CA6DD + .string "Irritiert alle POKéMON,\n" + .string "die bisher auftraten.$" +ContestString_DescStartled10: @ 83CA710 + .string "Irritiert das vordere\n" + .string "POKéMON sehr stark.$" +ContestString_DescStartled11: @ 83CA735 + .string "Irritiert die POKéMON, die\n" + .string "schon aufgetreten sind.$" +ContestString_DescStartled12: @ 83CA762 + .string "Irritiert das POKéMON, das\n" + .string "vorher aufgetreten ist.$" +ContestString_DescStartled13: @ 83CA796 + .string "Irritiert alle POKéMON, die\n" + .string "vorher aufgetreten sind.$" +ContestString_DescAttentionShift: @ 83CA7CA + .string "Lenkt den JUROR von den\n" + .string "anderen POKéMON ab.$" +ContestString_DescStartled14: @ 83CA7F4 + .string "Irritiert PKMN, bes. die,\n" + .string "auf die der JUROR achtet.$" +ContestString_DescJamOthersMissTurn: @ 83CA829 + .string "Stört die anderen und An-\n" + .string "wender setzt 1 Runde aus.$" +ContestString_DescStartled15: @ 83CA85A + .string "Irritiert PKMN, bes. die, die\n" + .string "Ausdruck gl. Typs zeigten.$" +ContestString_DescStartled16: @ 83CA889 + .string "Irritiert PKMN, die Ausdrck.\n" + .string "des Typs COOL vorführten.$" +ContestString_DescStartled17: @ 83CA8B8 + .string "Irritiert PKMN, die Ausdrck.\n" + .string "des Typs SCHÖN vorführten.$" +ContestString_DescStartled18: @ 83CA8E9 + .string "Irritiert PKMN, die Ausdrck.\n" + .string "des Typs ANMUT vorführten.$" +ContestString_DescStartled19: @ 83CA918 + .string "Irritiert PKMN, die Ausdrck.\n" + .string "des Typs KLUG vorführten.$" +ContestString_DescStartled20: @ 83CA948 + .string "Irritiert PKMN, die Ausdrck.\n" + .string "des Typs STARK vorführten.$" + +ContestString_DescNervousOne: @ 83CA978 + .string "Macht nachfolgendes\n" + .string "POKéMON nervös.$" + +ContestString_DescNervousAllAfter: @ 83CA9A2 + .string "Macht alle nachfolgenden\n" + .string "POKéMON nervös.$" + +ContestString_DescConditionWorseBefore: @ 83CA9CC + .string "Schwächt Kondition der\n" + .string "PKMN, die bisher auftraten.$" + +ContestString_DescStartled21: @ 83CA9FE + .string "Irritiert POKéMON, die eine\n" + .string "gute Kondition haben.$" +ContestString_DescGreatWhenFirst: @ 83CAA28 + .string "Ausdruck gelingt sehr gut,\n" + .string "wenn als Erster vorgeführt.$" +ContestString_DescGreatWhenLast: @ 83CAA53 + .string "Ausdruck gelingt sehr gut,\n" + .string "wenn zuletzt vorgeführt.$" +ContestString_DescAppealGoodBeforeAll: @ 83CAA7D + .string "Ausdruck gelingt so gut\n" + .string "wie die der Vorgänger.$" +ContestString_DescAppealGoodBeforeOne: @ 83CAAAA + .string "Ausdruck gelingt so gut\n" + .string "wie der des Vorgängers.$" +ContestString_DescBetterWhenLater: @ 83CAAD9 + .string "Je später der Auftritt,\n" + .string "desto besser der Ausdruck.$" +ContestString_DescAffectedByTiming: @ 83CAB0C + .string "Die Qualität des Ausdrucks\n" + .string "hängt vom Timing ab.$" +ContestString_DescBetterWhenSameType: @ 83CAB41 + .string "Gelingt gut, wenn vom\n" + .string "selben Typ wie der vorige.$" +ContestString_DescBetterWhenDiffType: @ 83CAB75 + .string "Gelingt gut, wenn vom\n" + .string "anderen Typ als der vorige.$" +ContestString_DescAffectedByFront: @ 83CABAA + .string "Hängt von Qualität des Aus-\n" + .string "drucks des Vorgängers ab.$" +ContestString_DescConditionUp: @ 83CABD9 + .string "Verbessert die Kondition\n" + .string "und verhindert Nervosität.$" +ContestString_DescAffectedByCondition: @ 83CAC0E + .string "Ausdruck gelingt gut, wenn\n" + .string "Kondition des PKMN gut ist.$" +ContestString_DescAppealEarlier: @ 83CAC45 + .string "Der nächste Ausdruck kann\n" + .string "früher vorgeführt werden.$" +ContestString_DescAppealLater: @ 83CAC74 + .string "Der nächste Ausdruck kann\n" + .string "später vorgeführt werden.$" +ContestString_DescRandomOrderEasier: @ 83CACA1 + .string "Ändert die Reihenfolge der\n" + .string "nächst. Auftritte leichter.$" +ContestString_DescRandomOrder: @ 83CACD4 + .string "Ändert die Reihenfolge der\n" + .string "nächsten Auftritte.$" +ContestString_DescAnyExcitement: @ 83CAD05 + .string "Verzückt das Publikum in \n" + .string "jedem WETTBEWERB.$" +ContestString_DescStartled22: @ 83CAD39 + .string "Irritiert alle POKéMON,\n" + .string "deren Ausdruck gut war.$" +ContestString_DescScaleWithExcitement: @ 83CAD6C + .string "Gelingt am besten, wenn\n" + .string "das Publikum gespannt ist.$" +ContestString_DescStopExcitement: @ 83CADA1 + .string "Bremst zeitweise Begeis-\n" + .string "terung des Publikums.$" .align 2 gContestEffectStrings:: @ 83CADD4 @@ -146,32 +198,32 @@ gContestEffectStrings:: @ 83CADD4 .4byte ContestString_DescScaleWithExcitement .4byte ContestString_DescStopExcitement -ContestString_MoveRainDance: - .string "RAIN DANCE$" -ContestString_MoveRage: - .string "RAGE$" -ContestString_MoveFocusEnergy: - .string "FOCUS ENERGY$" -ContestString_MoveHypnosis: - .string "HYPNOSIS$" -ContestString_MoveSoftboiled: - .string "SOFTBOILED$" -ContestString_MoveHornAttack: - .string "HORN ATTACK$" -ContestString_MoveSwordsDance: - .string "SWORDS DANCE$" -ContestString_MoveConversion: - .string "CONVERSION$" -ContestString_MoveSunnyDay: - .string "SUNNY DAY$" -ContestString_MoveRest: - .string "REST$" -ContestString_MoveVicegrip: - .string "VICEGRIP$" -ContestString_MoveDefenseCurl: - .string "DEFENSE CURL$" -ContestString_MoveLockOn: - .string "LOCK-ON$" +ContestString_MoveRainDance: @ 83CAE94 + .string "REGENTANZ$" +ContestString_MoveRage: @ 83CAE9F + .string "RASEREI$" +ContestString_MoveFocusEnergy: @ 83CAEA4 + .string "ENERGIEFOKUS$" +ContestString_MoveHypnosis: @ 83CAEB1 + .string "HYPNOSE$" +ContestString_MoveSoftboiled: @ 83CAEBA + .string "WEICHEI$" +ContestString_MoveHornAttack: @ 83CAEC5 + .string "HORNATTACKE$" +ContestString_MoveSwordsDance: @ 83CAED1 + .string "SCHWERTTANZ$" +ContestString_MoveConversion: @ 83CAEDE + .string "UMWANDLUNG$" +ContestString_MoveSunnyDay: @ 83CAEE9 + .string "SONNENTAG$" +ContestString_MoveRest: @ 83CAEF3 + .string "ERHOLUNG$" +ContestString_MoveVicegrip: @ 83CAEF8 + .string "KLAMMER$" +ContestString_MoveDefenseCurl: @ 83CAF01 + .string "EINIGLER$" +ContestString_MoveLockOn: @ 83CAF0E + .string "ZIELSCHUSS$" .align 2 .4byte ContestString_MoveRainDance @@ -190,15 +242,15 @@ ContestString_MoveLockOn: .4byte ContestString_MoveLockOn ContestString_Cool: - .string "COOL$" + .string "COOL.$" ContestString_Beauty: - .string "BEAUTY$" + .string "SCHÖN.$" ContestString_Cute: - .string "CUTE$" + .string "ANMUT$" ContestString_Smart: - .string "SMART$" + .string "KLUG.$" ContestString_Tough: - .string "TOUGH$" + .string "STÄRKE$" .align 2 gUnknown_083CAF70:: @ 83CAF70 @@ -209,47 +261,70 @@ gUnknown_083CAF70:: @ 83CAF70 .4byte ContestString_Tough gText_Contest_WhichMoveWillBePlayed:: @ 83CAF84 - .string "Appeal no. {NAME_END}!\nWhich move will be played?$" + .string "Ausdruck {NAME_END}! Welche\n" + .string "Attacke wird gezeigt?$" gText_Contest_ButItCantParticipate:: @ 83CAFAE - .string "Appeal no. {NAME_END}!\nBut it can’t participate!$" + .string "Ausdruck {NAME_END}! Aber es\n" + .string "kann nicht teilnehmen!$" gUnknown_083CAFD7:: @ 83CAFD7 - .string "{STR_VAR_1} appealed with\n{STR_VAR_2}!$" - .string "The other POKéMON\nmade moves.{PAUSE 60}$" + .string "{STR_VAR_1} führt\n" + .string "{STR_VAR_2} vor!$" + + .string "Die anderen POKéMON\n" + .string "zeigten ihre Attacken!$" gUnknown_083CB00D:: @ 83CB00D - .string "{STR_VAR_1} was watching\nthe others.{PAUSE 60}$" + .string "{STR_VAR_1} beobachtet\n" + .string "die anderen.{PAUSE 60}$" gUnknown_083CB02C:: @ 83CB02C - .string "We’re all out of\nAppeal Time!{PAUSE 60}$" - .string "{STR_VAR_1}’s {STR_VAR_3}\nmove {STR_VAR_2}!{PAUSE 60}$" + .string "Soweit zur\n" + .string "Ausdruckskraft!{PAUSE 60}$" + + .string "{STR_VAR_3}-\n" + .string "Att. {STR_VAR_2}\n" + .string "von {STR_VAR_1}!$" + .string "TRICK$" - .string "SPECIAL$" + + .string "SPEZIAL$" + ContestString_AppealJammed: - .string "But the appeal was\njammed.$" + .string "Der Auftritt\n" + .string "wurde gestört.$" ContestString_FollowLead: - .string "It followed another\nPOKéMON’s lead.$" + .string "Es folgte einem\n" + .string "anderen POKéMON.$" ContestString_MessedUp: - .string "But it messed up.$" + .string "Es scheiterte.$" ContestString_BetterUsual: - .string "It went better than\nusual.$" + .string "Das lief besser\n" + .string "als sonst.$" ContestString_JudgeLookAway: - .string "The JUDGE looked away\nfor some reason.$" + .string "Der JUROR war\n" + .string "irgendwie abgelenkt.$" ContestString_WorkHard: - .string "It worked hard to build on\npast mistakes.$" + .string "Es strengte sich an,\n" + .string "Fehler auszubügeln.$" ContestString_NoMoreMoves: - .string "It can’t make any more\nmoves.$" + .string "Es kann keine Attacken\n" + .string "mehr ausführen.$" ContestString_WorkReallyWell: - .string "It worked frighteningly\nwell.$" + .string "Das lief unheimlich gut.$" ContestString_WorkHardStandout: - .string "It worked as hard as the\nstandout POKéMON.$" + .string "Es strengte sich genauso\n" + .string "wie das beste POKéMON an.$" ContestString_JudgeExpectantly: - .string "The JUDGE looked on\nexpectantly.$" + .string "Der JUROR schaute es\n" + .string "besonders aufmerksam an.$" ContestString_WorkRatherWell: - .string "It worked rather well.$" + .string "Das lief bedeutend\n" + .string "besser.$" ContestString_WorkBetter: - .string "It worked a little better\nthan usual.$" + .string "Es lief etwas besser\n" + .string "als sonst.$" .align 2 .4byte ContestString_AppealJammed @@ -267,17 +342,23 @@ ContestString_WorkBetter: .4byte ContestString_WorkBetter ContestString_StandOutNone: - .string "{STR_VAR_1} failed to\nstand out at all...{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} stach\n" + .string "überhaupt nicht hervor...{PAUSE_UNTIL_PRESS}$" ContestString_StandOutNotMuch: - .string "{STR_VAR_1} didn’t stand\nout very much...{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} stach nicht\n" + .string "besonders hervor...{PAUSE_UNTIL_PRESS}$" ContestString_StandOutLittle: - .string "{STR_VAR_1} caught a\nlittle attention.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} erregte ein\n" + .string "wenig Aufmerksamkeit.{PAUSE_UNTIL_PRESS}$" ContestString_StandOutLot: - .string "{STR_VAR_1} attracted a\nlot of attention.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} erregte eine\n" + .string "Menge Aufmerksamkeit.{PAUSE_UNTIL_PRESS}$" ContestString_StandOutTotal: - .string "{STR_VAR_1} commanded\ntotal attention.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} erhielt die\n" + .string "volle Aufmerksamkeit.{PAUSE_UNTIL_PRESS}$" ContestString_StandOutDidnt: - .string "{STR_VAR_1} hasn’t made\nits appeal.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} konnte\n" + .string "keinen Ausdruck zeigen.{PAUSE_UNTIL_PRESS}$" .align 2 gContestStandOutStrings:: @ 83CB2F0 @@ -289,57 +370,82 @@ gContestStandOutStrings:: @ 83CB2F0 .4byte ContestString_StandOutDidnt ContestString_AppealAnticipation3: - .string "Anticipation swelled for\n{STR_VAR_1}’s appeal next.$" + .string "Heiß ersehnt: Der Aus-\n" + .string "druck von {STR_VAR_1}.$" ContestString_JudgeSatisfied: - .string "The JUDGE was very\nsatisfied.$" + .string "Der JUROR war sehr\n" + .string "zufrieden.$" ContestString_Terminator: .string "$" ContestString_JudgeHeldFirm: - .string "The JUDGE ’s views on\n{STR_VAR_1} held firm.$" + .string "Der JUROR behält\n" + .string "{STR_VAR_1} fest im Blick.$" ContestString_ChangedPerceptions: - .string "{STR_VAR_1}’s {STR_VAR_3}\nchanged perceptions.$" + .string "{STR_VAR_3} von {STR_VAR_1}\n" + .string "ändert die Wahrnehmung.$" ContestString_AppealWoreOff: - .string "{STR_VAR_1}’s appeal\neffect wore off.$" + .string "Wirkung von {STR_VAR_1}\n" + .string "lässt nach.$" ContestString_AppealWoreOff2: - .string "The special appeal’s\neffect wore off.$" + .string "Die besondere Wirkung\n" + .string "lässt nach.$" ContestString_AppealLookSame: - .string "Everyone’s appeals were\nmade to look the same.$" + .string "Jeder Ausdruck wird sich\n" + .string "nun gleichen.$" ContestString_AppealCheapened: - .string "{STR_VAR_2}’s appeal was\ncheapened.$" + .string "Ausdruck von {STR_VAR_2}\n" + .string "wurde abgewertet.$" ContestString_AppealCheapened2: - .string "It cheapened the appeal\nof those ahead.$" + .string "Es wertete die Ausdrücke\n" + .string "der anderen PKMN ab.$" ContestString_AppealAttentionStolen: - .string "It stole attention away\nfrom {STR_VAR_2}.$" + .string "Es stahl {STR_VAR_2} die\n" + .string "Aufmerksamkeit.$" ContestString_AppealCheapened3: - .string "It cheapened\n{STR_VAR_2}’s appeal.$" + .string "Es wertete Ausdruck\n" + .string "von {STR_VAR_2} ab.$" ContestString_AppealCheapened4: - .string "It severely cheapened\nother appeals.$" + .string "Es wertete die Ausdrücke\n" + .string "der anderen stark ab.$" ContestString_AppealAnticipation: - .string "Anticipation swelled for\n{STR_VAR_1}’s appeal next.$" + .string "Alle warten sehnsüchtig\n" + .string "auf {STR_VAR_1}.$" ContestString_AppealCheapened5: - .string "It cheapened the appeal\nof those ahead.$" + .string "Es wertete den Ausdruck\n" + .string "der PKMN vor ihm ab.$" ContestString_AppealCheapened6: - .string "It cheapened the JUDGE’s\nfavorite appeal.$" + .string "Es wertete den Lieblings-\n" + .string "ausdruck des JURORS ab.$" ContestString_AppealCheapened7: - .string "The appeals of others\nwere cheapened by half.$" + .string "Der Ausdruckswert der\n" + .string "anderen wurde halbiert.$" ContestString_JammedStoodOut: - .string "It stood out to make up\nfor being jammed.$" + .string "Es macht sich bereit, die\n" + .string "anderen zu beeindrucken.$" ContestString_AppealNoMore: - .string "It can’t participate in\nappeals any more.$" + .string "Es kann an keiner Vor-\n" + .string "führung mehr teilnehmen.$" ContestString_AppealTouched: - .string "It touched the JUDGE for\na fantastic appeal.$" + .string "Der fantastische Aus-\n" + .string "druck berührte den JUROR.$" ContestString_AppealAnticipation2: - .string "Anticipation rose for\nupcoming appeals.$" + .string "Die Erwartung für die fol-\n" + .string "genden Ausdrücke steigt.$" ContestString_AppealStoodOut2: - .string "It stood out as much as\nspecial appeals.$" + .string "Es war so beeindruckend\n" + .string "wie ein Spezialausdruck.$" ContestString_AppealStoodOut3: - .string "It stood out as much as\n{STR_VAR_1}.$" + .string "Es war so beeindruckend\n" + .string "wie {STR_VAR_1}.$" ContestString_JammedAppealsNotice: - .string "Jammed appeals were made\neven less noticeable.$" + .string "Ein Ausdruck, der gestört\n" + .string "wurde, ist unauffälliger.$" ContestString_AppealSame: - .string "Everyone’s appeals were\nmade the same.$" + .string "Jeder Teilnehmer hat nun\n" + .string "den gleichen Ausdruck.$" ContestString_AppealFullWorse: - .string "Its {STR_VAR_1} is full.\nIt worsened its appeal.$" + .string "{STR_VAR_1} ist voll. Der\n" + .string "Ausdruck wird schlechter.$" .align 2 .4byte ContestString_JudgeHeldFirm @@ -369,169 +475,237 @@ ContestString_AppealFullWorse: .4byte ContestString_JammedAppealsNotice .4byte ContestString_AppealSame ContestString_MoreConscious: - .string "It became more conscious\nof the other POKéMON.{PAUSE 60}$" + .string "Es wird sich der anderen\n" + .string "PKMN mehr bewusst.{PAUSE 60}$" ContestString_NoAppeal: - .string "{STR_VAR_1} can’t make an\nappeal after this.{PAUSE 60}$" + .string "{STR_VAR_1} kann danach\n" + .string "keinen Ausdruck zeigen.{PAUSE 60}$" ContestString_SettleDown: - .string "It settled down just a\nlittle bit.{PAUSE 60}$" + .string "Es kommt ein wenig\n" + .string "zur Ruhe.{PAUSE 60}$" ContestString_ObliviousToOthers: - .string "It became oblivious to\nthe other POKéMON.{PAUSE 60}$" + .string "Die anderen PKMN nehmen\n" + .string "es überhaupt nicht wahr.{PAUSE 60}$" ContestString_LessAware: - .string "It became less aware of\nthe other POKéMON.{PAUSE 60}$" + .string "Es ist sich der anderen\n" + .string "PKMN kaum bewusst.{PAUSE 60}$" ContestString_StoppedCaring: - .string "It stopped caring about\nother POKéMON much.{PAUSE 60}$" + .string "Es kümmert sich nicht\n" + .string "mehr viel um andere PKMN.{PAUSE 60}$" ContestString_StartleAttempt: - .string "It tried to startle the\nother POKéMON.{PAUSE 60}$" + .string "Es versucht, die anderen\n" + .string "PKMN zu erschrecken.{PAUSE 60}$" ContestString_DazzleAttempt: - .string "It tried to dazzle the\nothers.{PAUSE 60}$" + .string "Es versucht, die anderen\n" + .string "PKMN zu blenden.{PAUSE 60}$" ContestString_JudgeLookAway2: - .string "The JUDGE looked away\nfrom {STR_VAR_1}.{PAUSE 60}$" + .string "Der JUROR schaut\n" + .string "{STR_VAR_1} nicht mehr an.{PAUSE 60}$" ContestString_UnnerveAttempt: - .string "It tried to unnerve the\nnext POKéMON.{PAUSE 60}$" + .string "Es versucht, die folgenden\n" + .string "PKMN zu entnerven.{PAUSE 60}$" ContestString_Nervous: - .string "{STR_VAR_1} became\nnervous.{PAUSE 60}$" + .string "{STR_VAR_1} wird\n" + .string "nervös.{PAUSE 60}$" ContestString_UnnerveWaiting: - .string "The appeal tried to\nunnerve waiting POKéMON.{PAUSE 60}$" + .string "Dieser Ausdruck soll die\n" + .string "anderen PKMN entnerven.{PAUSE 60}$" ContestString_TauntWell: - .string "It taunted POKéMON\ndoing well.{PAUSE 60}$" + .string "Es verhöhnt die\n" + .string "besseren PKMN.{PAUSE 60}$" ContestString_RegainedForm: - .string "{STR_VAR_1} regained its\nform.{PAUSE 60}$" + .string "{STR_VAR_1} findet zu\n" + .string "seiner Form zurück.{PAUSE 60}$" ContestString_JamWell: - .string "It tried to jam POKéMON\ndoing well.{PAUSE 60}$" + .string "Es versucht, die besseren\n" + .string "PKMN zu beeindrucken.{PAUSE 60}$" ContestString_HustleStandout: - .string "The standout {STR_VAR_1}\nhustled even more.{PAUSE 60}$" + .string "{STR_VAR_1} an der Spitze\n" + .string "engagiert sich noch mehr.{PAUSE 60}$" ContestString_WorkHardUnnoticed: - .string "The largely unnoticed\n{STR_VAR_1} worked hard.{PAUSE 60}$" + .string "Das bisher unauffällige\n" + .string "{STR_VAR_1} gibt alles.$" ContestString_WorkBefore: - .string "It worked as much as\nPOKéMON before it.{PAUSE 60}$" + .string "Es strengt sich genauso\n" + .string "an wie die PKMN vor ihm.{PAUSE 60}$" ContestString_AppealNotWell: - .string "{STR_VAR_1}’s appeal did\nnot go well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Kam nicht gut an.{PAUSE 60}$" ContestString_WorkPreceding: - .string "It worked as much as the\npreceding POKéMON.{PAUSE 60}$" + .string "Es strengt sich an wie die\n" + .string "vorangegangenen PKMN.{PAUSE 60}$" ContestString_AppealNotWell2: - .string "{STR_VAR_1}’s appeal did\nnot go well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Verlief nicht so gut.{PAUSE 60}$" ContestString_AppealNotShownWell: - .string "{STR_VAR_1}’s appeal\ncouldn’t be shown well.{PAUSE 60}$" + .string "Ausdruck v. {STR_VAR_1}: \n" + .string "Wurde gestört.{PAUSE 60}$" ContestString_AppealSlightlyWell: - .string "{STR_VAR_1}’s appeal\nwent slightly well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Verlief ganz gut.{PAUSE 60}$" ContestString_AppealPrettyWell: - .string "{STR_VAR_1}’s appeal\nwent pretty well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Kam ganz gut an.{PAUSE 60}$" ContestString_AppealExcellently: - .string "{STR_VAR_1}’s appeal\nwent excellently.{PAUSE 60}$" + .string "{STR_VAR_1} führte seinen\n" + .string "Ausdruck exzellent vor.{PAUSE 60}$" ContestString_AppealDud: - .string "{STR_VAR_1}’s appeal was\na dud.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Er war absolut mies.{PAUSE 60}$" ContestString_AppealNotVeryWell: - .string "{STR_VAR_1}’s appeal did\nnot work very well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Er war nicht so gut.{PAUSE 60}$" ContestString_AppealSlightlyWell2: - .string "{STR_VAR_1}’s appeal\nwent slightly well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Er war nicht schlecht.{PAUSE 60}$" ContestString_AppealPrettyWell2: - .string "{STR_VAR_1}’s appeal\nwent pretty well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Er war recht gut.{PAUSE 60}$" ContestString_AppealVeryWell: - .string "{STR_VAR_1}’s appeal\nwent very well.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Er war sehr gut.{PAUSE 60}$" ContestString_AppealExcellently2: - .string "{STR_VAR_1}’s appeal\nwent excellently.{PAUSE 60}$" + .string "Ausdruck von {STR_VAR_1}:\n" + .string "Er war exzellent.{PAUSE 60}$" ContestString_SameTypeGood: - .string "It’s the same type as the\nPOKéMON before - good!{PAUSE 60}$" + .string "Der gleiche Typ wie das\n" + .string "vorhergehende PKMN - gut!{PAUSE 60}$" ContestString_DiffTypeGood: - .string "It’s not the same type as\nthe one before - good!{PAUSE 60}$" + .string "Nicht der gleiche Typ wie\n" + .string "das vorherige PKMN - gut!{PAUSE 60}$" ContestString_StoodOutAsMuch: - .string "It stood out much more\nthan the POKéMON before.{PAUSE 60}$" + .string "Es ist viel besser als die\n" + .string "vorhergehenden PKMN.{PAUSE 60}$" ContestString_NotAsWell: - .string "It didn’t do as well as the\nPOKéMON before.{PAUSE 60}$" + .string "Es war nicht so gut wie\n" + .string "das PKMN vor ihm.{PAUSE 60}$" ContestString_ConditionRose: - .string "{STR_VAR_1}’s condition\nrose above usual.{PAUSE 60}$" + .string "Die Kondition von\n" + .string "{STR_VAR_1} stieg.{PAUSE 60}$" ContestString_HotStatus: - .string "{STR_VAR_1}’s hot status\nmade it a great appeal!{PAUSE 60}$" + .string "Status von {STR_VAR_1}:\n" + .string "Bewirkt guten Ausdruck!{PAUSE 60}$" ContestString_MoveUpLine: - .string "It moved up in line for\nthe next appeal.{PAUSE 60}$" + .string "Es steigt in der Reihen-\n" + .string "folge auf.{PAUSE 60}$" ContestString_MoveBackLine: - .string "It moved back in line once\nfor the next appeal.{PAUSE 60}$" + .string "Es fällt in der Reihen-\n" + .string "folge zurück.{PAUSE 60}$" ContestString_ScrambleOrder: - .string "It scrambled up the\norder for the next turn.{PAUSE 60}$" + .string "Es bringt die Reihenfolge\n" + .string "durcheinander.{PAUSE 60}$" gUnknown_083CBD52:: @ 83CBD52 ContestString_JudgeExpectantly2:: - .string "The JUDGE looked at\n{STR_VAR_1} expectantly.{PAUSE 60}$" + .string "Der JUROR betrachtet\n" + .string "{STR_VAR_1} interessiert.{PAUSE 60}$" gUnknown_083CBD79:: @ 83CBD79 ContestString_WentOverWell:: - .string "The appeal combo went\nover well.{PAUSE 60}$" + .string "Die Combo der Ausdrücke\n" + .string "kam gut an.{PAUSE 60}$" gUnknown_083CBD9D:: @ 83CBD9D ContestString_WentOverVeryWell:: - .string "The appeal combo went\nover very well.{PAUSE 60}$" + .string "Die Combo der Ausdrücke\n" + .string "kam sehr gut an.{PAUSE 60}$" gUnknown_083CBDC6:: @ 83CBDC6 ContestString_AppealComboExcellently:: - .string "The appeal combo went\nover excellently.{PAUSE 60}$" + .string "Die Combo der Ausdrücke\n" + .string "kam exzellent an.{PAUSE 60}$" ContestString_AvertGaze: - .string "{STR_VAR_1} managed to\navert its gaze.{PAUSE 60}$" + .string "{STR_VAR_1} gelingt es,\n" + .string "den Blick abzuwenden.{PAUSE 60}$" ContestString_AvoidSeeing: - .string "{STR_VAR_1} managed to\navoid seeing it.{PAUSE 60}$" + .string "{STR_VAR_1} wandte den\n" + .string "Blick erfolgreich ab.{PAUSE 60}$" ContestString_NotFazed: - .string "{STR_VAR_1} isn’t fazed\nby that sort of thing.{PAUSE 60}$" + .string "{STR_VAR_1} lässt sich\n" + .string "davon nicht ablenken.{PAUSE 60}$" ContestString_LittleDistracted: - .string "{STR_VAR_1} became a\nlittle distracted.{PAUSE 60}$" + .string "{STR_VAR_1} wurde etwas\n" + .string "unruhig.{PAUSE 60}$" ContestString_AttemptStartle: - .string "It tried to startle the\nother POKéMON.{PAUSE 60}$" + .string "Es versucht, die anderen\n" + .string "PKMN zu verschrecken.{PAUSE 60}$" ContestString_LookedDown: - .string "{STR_VAR_1} looked down\nout of distraction.{PAUSE 60}$" + .string "{STR_VAR_1} blickt\n" + .string "irritiert zu Boden.{PAUSE 60}$" ContestString_TurnedBack: - .string "{STR_VAR_1} turned back\nout of distraction.{PAUSE 60}$" + .string "{STR_VAR_1} dreht sich\n" + .string "irritiert um.{PAUSE 60}$" ContestString_UtterCry: - .string "{STR_VAR_1} couldn’t help\nuttering a cry.{PAUSE 60}$" + .string "{STR_VAR_1} kann einen \n" + .string "Laut nicht unterdrücken.{PAUSE 60}$" ContestString_LeaptUp: - .string "{STR_VAR_1} couldn’t help\nleaping up.{PAUSE 60}$" + .string "{STR_VAR_1} kann nicht\n" + .string "anders und springt auf.{PAUSE 60}$" ContestString_TrippedOver: - .string "{STR_VAR_1} tripped over\nout of distraction.{PAUSE 60}$" + .string "{STR_VAR_1} ist so irri-\n" + .string "tiert, dass es stolpert.{PAUSE 60}$" gUnknown_083CBF60:: @ 83CBF60 ContestString_TooNervous: - .string "{STR_VAR_1} was too\nnervous to move.{PAUSE 60}$" + .string "{STR_VAR_1} ist zu nervös,\n" + .string "um etwas vorzuführen.{PAUSE 60}$" ContestString_MessedUp2: - .string "But it messed up.{PAUSE 60}$" + .string "Es hatte keinen Erfolg.{PAUSE 60}$" ContestString_FailedTargetNervous: - .string "But it failed to make\nthe target nervous.{PAUSE 60}$" + .string "Es konnte keine\n" + .string "Nervosität erzeugen.{PAUSE 60}$" ContestString_FailedAnyoneNervous: - .string "But it failed to make\nanyone nervous.{PAUSE 60}$" + .string "Aber es konnte niemanden\n" + .string "nervös machen.{PAUSE 60}$" ContestString_Ignored: - .string "But it was ignored...{PAUSE 60}$" + .string "Es wurde ignoriert...{PAUSE 60}$" ContestString_NoConditionImprove: - .string "But it couldn’t improve\nits condition...{PAUSE 60}$" + .string "Es konnte seinen Aus-\n" + .string "druck nicht verstärken...{PAUSE 60}$" ContestString_BadConditionWeakAppeal: - .string "Its bad condition\nresulted in a weak appeal.{PAUSE 60}$" + .string "Schwacher Ausdruck we-\n" + .string "gen schlechter Konditon.{PAUSE 60}$" ContestString_Unaffected: - .string "{STR_VAR_1} was\nunaffected.{PAUSE 60}$" + .string "{STR_VAR_1} blieb\n" + .string "unbeeindruckt.{PAUSE 60}$" gUnknown_083CC075:: @ 83CC075 ContestString_DissapointedRepeat:: - .string "{STR_VAR_1} disappointed\nby repeating an appeal.{PAUSE 60}$" + .string "{STR_VAR_1} enttäuscht\n" + .string "durch Wiederholung.{PAUSE 60}$" gUnknown_083CC0A0:: @ 83CC0A0 ContestString_WentOverGreat:: - .string "{STR_VAR_1}’s {STR_VAR_3}\nwent over great.{PAUSE 60}$" + .string "Die {STR_VAR_3} von\n" + .string "{STR_VAR_1} war sehr gut.{PAUSE 60}$" gUnknown_083CC0BC:: @ 83CC0BC ContestString_DidntGoWell:: - .string "{STR_VAR_1}’s {STR_VAR_3}\ndidn’t go over well here...{PAUSE 60}$" + .string "Die {STR_VAR_3} von\n" + .string "{STR_VAR_1} war nicht gut.{PAUSE 60}$" gUnknown_083CC0E3:: @ 83CC0E3 ContestString_GotCrowdGoing:: - .string "{STR_VAR_1}’s {STR_VAR_3}\ngot the crowd going.{PAUSE 60}$" + .string "{STR_VAR_1} begeistert\n" + .string "Publikum mit {STR_VAR_3}.{PAUSE 60}$" gUnknown_083CC103:: @ 83CC103 ContestString_CantAppealNextTurn:: - .string "{STR_VAR_1} can’t appeal\nnext turn...{PAUSE 60}$" + .string "{STR_VAR_1} setzt in der \n" + .string "folgenden Runde aus.{PAUSE 60}$" ContestString_AttractedAttention:: - .string "It attracted the crowd’s\nattention.{PAUSE 60}$" + .string "Die Aufmerksamkeit des\n" + .string "Publikums liegt auf ihm.{PAUSE 60}$" gUnknown_083CC14A:: @ 83CC14A ContestString_CrowdWatches:: - .string "The crowd continues to\nwatch {STR_VAR_3}.{PAUSE 60}$" + .string "Das Publikum beobachtet\n" + .string "weiterhin {STR_VAR_3}.{PAUSE 60}$" gUnknown_083CC16E:: @ 83CC16E ContestString_Ignored2:: - .string "{STR_VAR_1}’s\n{STR_VAR_2} is ignored.{PAUSE 60}$" + .string "{STR_VAR_2} von\n" + .string "{STR_VAR_1} ist ignoriert.{PAUSE 60}$" .align 2 gUnknown_083CC188:: @ 83CC188 @@ -599,30 +773,30 @@ gUnknown_083CC188:: @ 83CC188 .4byte ContestString_AttractedAttention gText_Contest_Shyness:: @ 83CC280 - .string "shyness$" + .string "Scheu$" gText_Contest_Anxiety:: @ 83CC288 - .string "anxiety$" + .string "Besorgnis$" gText_Contest_Laziness:: @ 83CC290 - .string "laziness$" + .string "Faulheit$" gText_Contest_Hesitancy:: @ 83CC299 - .string "hesitancy$" + .string "Zögern$" gText_Contest_Fear:: @ 83CC2A3 - .string "fear$" + .string "Furcht$" ContestString_Coolness: - .string "coolness$" + .string "Coolness$" ContestString_Beauty2: - .string "beauty$" + .string "Schönheit$" ContestString_Cuteness: - .string "cuteness$" + .string "Anmut$" ContestString_Smartness: - .string "smartness$" + .string "Klugheit$" ContestString_Toughness: - .string "toughness$" + .string "Stärke$" .align 2 gContestCategoryStrings:: @ 83CC2D8 @@ -633,22 +807,22 @@ gContestCategoryStrings:: @ 83CC2D8 .4byte ContestString_Toughness gUnknown_083CC2EC:: @ 83CC2EC - .string "TENSION:$" + .string "SPANNUNG:$" ContestString_CoolMove: - .string "COOL Move$" + .string "COOLE Att.$" ContestString_BeautyMove: - .string "BEAUTY Move$" + .string "SCHÖNE Att.$" ContestString_CuteMove: - .string "CUTE Move$" + .string "ANMUT-Att.$" ContestString_SmartMove: - .string "SMART Move$" + .string "KLUGE Att.$" ContestString_ToughMove: - .string "TOUGH Move$" + .string "STARKE Att.$" ContestString_UnknownMoveType: .string "???$" @@ -664,6 +838,6 @@ gUnknown_083CC330:: @ 83CC330 @ unused? ContestString_Rank: - .string "RANK$" + .string "KLASSE$" .string "{HIGHLIGHT TRANSPARENT}{COLOR MAGENTA} $" diff --git a/data/text/day_care.inc b/data/text/day_care.inc index 8f8e31266..bf97f0e34 100644 --- a/data/text/day_care.inc +++ b/data/text/day_care.inc @@ -1,132 +1,136 @@ Route117_Text_1B25CB:: @ 81B25CB - .string "I’m the DAY-CARE MAN.\p" - .string "I help take care of the precious\n" - .string "POKéMON of TRAINERS.\p" - .string "If you’d like me to raise your POKéMON,\n" - .string "have a word with my wife.$" + .string "Ich bin der PENSIONSLEITER.\p" + .string "Ich kümmere mich um die wertvollen\n" + .string "POKéMON der TRAINER.\p" + .string "Wenn ich eines deiner POKéMON auf-\n" + .string "ziehen soll, sprich mit meiner Frau.$" Route117_Text_1B2659:: @ 81B2659 - .string "Ah, it’s you!\p" - .string "We were raising your POKéMON, and my\n" - .string "goodness, were we surprised!\p" - .string "Your POKéMON had an EGG!\p" - .string "We don’t know how it got there,\n" - .string "but your POKéMON had it.\p" - .string "You do want it, yes?$" + .string "Ach, du bist es!\p" + .string "Wir haben deine POKéMON aufgezogen\n" + .string "und wurden überrascht!\p" + .string "Deine POKéMON haben nun ein EI!\p" + .string "Wir wissen nicht, wie das passiert ist,\n" + .string "aber deine POKéMON haben es.\p" + .string "Möchtest du es haben?$" Route117_Text_1B2710:: @ 81B2710 - .string "Ah, it’s you! Good to see you.\n" - .string "Your {STR_VAR_1}’s doing fine.$" + .string "Ach, du bist es! Schön, dich zu sehen.\n" + .string "Deinem {STR_VAR_1} geht es sehr gut.$" Route117_Text_1B2745:: @ 81B2745 - .string "Well then, I’ll keep it.\n" - .string "Thanks!$" + .string "Ich werde es behalten.$" Route117_Text_1B2766:: @ 81B2766 - .string "You have no room for it...\n" - .string "Come back when you’ve made room.$" + .string "Du hast keinen Platz dafür... Komm\n" + .string "wieder, wenn du Platz geschaffen hast.$" Route117_Text_1B27A2:: @ 81B27A2 - .string "{PLAYER} received the EGG from\n" - .string "the DAY-CARE MAN.$" + .string "{PLAYER} erhält das EI vom\n" + .string "PENSIONSLEITER.$" Route117_Text_1B27CD:: @ 81B27CD - .string "Take good care of it.$" + .string "Kümmere dich gut darum.$" Route117_Text_1B27E3:: @ 81B27E3 - .string "By the way, about your {STR_VAR_1},\n" - .string "it seemed to be friendly with\l" - .string "{STR_VAR_2}’s {STR_VAR_3}.\p" - .string "I may even have seen it receiving\n" - .string "a piece of MAIL.$" + .string "Übrigens, dein {STR_VAR_1} scheint sich\n" + .string "gut mit dem {STR_VAR_3} von {STR_VAR_2} \l" + .string "zu verstehen.\p" + .string "Ich habe gesehen, wie sie einen BRIEF\n" + .string "ausgetauscht haben...$" UnknownString_81B2858: @ 81B2858 - .string "If you want to pick up your POKéMON,\n" - .string "have a word with my wife.$" + .string "Wenn du deine POKéMON zurückhaben\n" + .string "möchtest, sprich doch mit meiner Frau.$" Route117_Text_1B2897:: @ 81B2897 - .string "Ah, it’s you! Your {STR_VAR_1} and\n" - .string "{STR_VAR_2} are doing fine.$" + .string "Ah, du bist es! Deine POKéMON\n" + .string "{STR_VAR_1} und {STR_VAR_2} entwickeln\l" + .string "sich prächtig.$" Route117_Text_1B28C4:: @ 81B28C4 - .string "I really will keep it.\n" - .string "You do want this, yes?$" + .string "Ich werde es behalten.\n" + .string "Oder möchtest du es haben?$" Route117_PokemonDayCare_Text_1B28F2:: @ 81B28F2 - .string "I’m the DAY-CARE LADY.\p" - .string "We can raise POKéMON for you.\p" - .string "Would you like us to raise one?$" + .string "Ich bin die PENSIONSLEITERIN.\p" + .string "Wir ziehen POKéMON für dich auf.\p" + .string "Sollen wir eins für dich aufziehen?$" Route117_PokemonDayCare_Text_1B2947:: @ 81B2947 - .string "Which POKéMON should we raise for you?$" + .string "Welches POKéMON sollen wir für dich\n" + .string "aufziehen?$" Route117_PokemonDayCare_Text_1B296E:: @ 81B296E - .string "Fine, we’ll raise your {STR_VAR_1} for\n" - .string "a while.\p" - .string "Come back for it later.$" + .string "Fein, dann nehmen wir dein {STR_VAR_1}\n" + .string "für eine Weile in Pflege.\p" + .string "Schau später mal nach ihm.$" Route117_PokemonDayCare_Text_1B29AD:: @ 81B29AD - .string "We can raise two of your POKéMON.\n" - .string "Would you like us to raise one more?$" + .string "Wir können zwei deiner POKéMON nehmen.\n" + .string "Möchtest du noch eins in Pflege geben?$" Route117_PokemonDayCare_Text_1B29F4:: @ 81B29F4 - .string "My husband was looking for you.$" + .string "Mein Mann hat dich schon gesucht.$" Route117_PokemonDayCare_Text_1B2A14:: @ 81B2A14 - .string "Oh, fine, then.\n" - .string "Come again.$" + .string "Oh, gut.\n" + .string "Komm bald wieder.$" Route117_PokemonDayCare_Text_1B2A30:: @ 81B2A30 - .string "You don’t have enough money...$" + .string "Du hast nicht genug Geld...$" Route117_PokemonDayCare_Text_1B2A4F:: @ 81B2A4F - .string "Will you take back the other one, too?$" + .string "Möchtest du das andere auch wieder\n" + .string "mitnehmen?$" Route117_PokemonDayCare_Text_1B2A76:: @ 81B2A76 - .string "Fine.\n" - .string "Come again.$" + .string "Gut.\n" + .string "Komm bald wieder.$" Route117_PokemonDayCare_Text_1B2A88:: @ 81B2A88 - .string "Ah, it’s you! Good to see you.\n" - .string "Your POKéMON can only be doing good!$" + .string "Ach, du bist es! Schön dich zu sehen.\n" + .string "Deinen POKéMON kann es einfach\l" + .string "nur gut gehen!$" Route117_PokemonDayCare_Text_1B2ACC:: @ 81B2ACC - .string "By level, your {STR_VAR_1} has grown\n" - .string "by {STR_VAR_2}.$" + .string "Dein {STR_VAR_1} ist um {STR_VAR_2} Level\n" + .string "gewachsen.$" Route117_PokemonDayCare_Text_1B2AEF:: @ 81B2AEF - .string "Your POKéMON team is full.\n" - .string "Make room, then come see me.$" + .string "Dein POKéMON-Team ist vollzählig.\n" + .string "Schaffe Platz und komm dann wieder.$" UnknownString_81B2B27: @ 81B2B27 - .string "Which POKéMON will you take back?$" + .string "Welches POKéMON nimmst du wieder mit?$" Route117_PokemonDayCare_Text_1B2B49:: @ 81B2B49 - .string "If you want your {STR_VAR_1} back,\n" - .string "it will cost ¥{STR_VAR_2}.$" + .string "Wenn du dein {STR_VAR_1}\n" + .string "mitnehmen willst, kostet das ¥{STR_VAR_2}.$" Route117_PokemonDayCare_Text_1B2B75:: @ 81B2B75 - .string "Perfect!\n" - .string "Here’s your POKéMON.$" + .string "Sehr schön!\n" + .string "Hier ist dein POKéMON!$" Route117_PokemonDayCare_Text_1B2B93:: @ 81B2B93 - .string "{PLAYER} took back {STR_VAR_1} from\n" - .string "the DAY-CARE LADY.$" + .string "{PLAYER} hat {STR_VAR_1} von der\n" + .string "PENSIONSLEITERIN zurückerhalten.$" Route117_PokemonDayCare_Text_1B2BBB:: @ 81B2BBB - .string "Oh? But you have just one POKéMON.\p" - .string "Come back another time.$" + .string "Oh! Du hast aber nur ein POKéMON.\p" + .string "Komm einfach später wieder.$" Route117_PokemonDayCare_Text_1B2BF6:: @ 81B2BF6 - .string "Will you take your POKéMON back?$" + .string "Möchtest du dein POKéMON wieder\n" + .string "mitnehmen?$" Route117_PokemonDayCare_Text_1B2C17:: @ 81B2C17 - .string "If you leave me that POKéMON,\n" - .string "what will you battle with?\p" - .string "Come back another time.$" + .string "Wenn du das POKéMON hier lässt, womit\n" + .string "willst du denn dann kämpfen?\p" + .string "Komm einfach später wieder.$" UnknownString_81B2C68: @ 81B2C68 - .string "Huh?$" + .string "Wie?$" @ XXX JP .string "\p" diff --git a/data/text/easy_chat/group_name_strings.inc b/data/text/easy_chat/group_name_strings.inc index 3d5e3a158..1c9edac38 100644 --- a/data/text/easy_chat/group_name_strings.inc +++ b/data/text/easy_chat/group_name_strings.inc @@ -8,31 +8,31 @@ gEasyChatGroupName_Status:: @ 842C7EB .string "STATUS$" gEasyChatGroupName_Battle:: @ 842C7F2 - .string "BATTLE$" + .string "KAMPF$" gEasyChatGroupName_Greetings:: @ 842C7F9 - .string "GREETINGS$" + .string "EMPFANG$" gEasyChatGroupName_People:: @ 842C803 - .string "PEOPLE$" + .string "PERSONEN$" gEasyChatGroupName_Voices:: @ 842C80A - .string "VOICES$" + .string "AUSRUFE$" gEasyChatGroupName_Speech:: @ 842C811 - .string "SPEECH$" + .string "STILMITTEL$" gEasyChatGroupName_Endings:: @ 842C818 - .string "ENDINGS$" + .string "VERKNÜPFUNG$" gEasyChatGroupName_Feelings:: @ 842C820 - .string "FEELINGS$" + .string "GEFÜHLE$" gEasyChatGroupName_Conditions:: @ 842C829 - .string "CONDITIONS$" + .string "KONDITIONEN$" gEasyChatGroupName_Actions:: @ 842C834 - .string "ACTIONS$" + .string "AKTIONEN$" gEasyChatGroupName_Lifestyle:: @ 842C83C .string "LIFESTYLE$" @@ -41,25 +41,25 @@ gEasyChatGroupName_Hobbies:: @ 842C846 .string "HOBBIES$" gEasyChatGroupName_Time:: @ 842C84E - .string "TIME$" + .string "ZEIT$" gEasyChatGroupName_Misc:: @ 842C853 - .string "MISC.$" + .string "POSITIONEN$" gEasyChatGroupName_Adjectives:: @ 842C859 - .string "ADJECTIVES$" + .string "GERÄUSCHE$" gEasyChatGroupName_Events:: @ 842C864 - .string "EVENT.$" + .string "MISCHMASCH$" gEasyChatGroupName_Move1:: @ 842C86B - .string "MOVE 1$" + .string "ATTACKEN 1$" gEasyChatGroupName_Move2:: @ 842C872 - .string "MOVE 2$" + .string "ATTACKEN 2$" gEasyChatGroupName_TrendySaying:: @ 842C879 - .string "TRENDY SAYING$" + .string "HIPPER SPRUCH$" gEasyChatGroupName_Pokemon2:: @ 842C887 - .string "POKéMON2$" + .string "POKéMON 2$" diff --git a/data/text/easy_chat/groups/actions/order.inc b/data/text/easy_chat/groups/actions/order.inc index ffe2ec4e0..1e0201db1 100644 --- a/data/text/easy_chat/groups/actions/order.inc +++ b/data/text/easy_chat/groups/actions/order.inc @@ -1,81 +1,81 @@ .align 1 gEasyChatGroupOrder_Actions: @ 83DF6A0 - .2byte 72 + .2byte 36 + .2byte 58 .2byte 14 + .2byte 12 + .2byte 76 + .2byte 70 + .2byte 17 + .2byte 38 + .2byte 72 .2byte 48 .2byte 75 - .2byte 39 - .2byte 36 - .2byte 28 + .2byte 71 .2byte 46 - .2byte 31 - .2byte 19 - .2byte 26 - .2byte 6 - .2byte 27 - .2byte 1 - .2byte 45 - .2byte 47 - .2byte 54 - .2byte 41 - .2byte 76 - .2byte 77 - .2byte 73 - .2byte 74 + .2byte 53 .2byte 2 - .2byte 3 + .2byte 42 + .2byte 43 .2byte 24 - .2byte 37 - .2byte 32 - .2byte 33 + .2byte 3 + .2byte 10 + .2byte 39 + .2byte 40 .2byte 22 - .2byte 18 + .2byte 31 .2byte 23 - .2byte 67 - .2byte 30 - .2byte 0 - .2byte 65 - .2byte 70 - .2byte 4 - .2byte 5 - .2byte 17 + .2byte 37 + .2byte 41 + .2byte 28 + .2byte 77 + .2byte 27 + .2byte 45 + .2byte 35 + .2byte 15 + .2byte 16 + .2byte 18 .2byte 64 - .2byte 63 - .2byte 34 - .2byte 53 + .2byte 30 + .2byte 59 + .2byte 60 .2byte 56 .2byte 55 - .2byte 11 + .2byte 1 .2byte 9 - .2byte 29 - .2byte 69 - .2byte 68 - .2byte 66 - .2byte 61 + .2byte 11 + .2byte 6 + .2byte 67 .2byte 52 - .2byte 51 - .2byte 40 .2byte 62 - .2byte 35 + .2byte 51 + .2byte 57 + .2byte 68 + .2byte 50 + .2byte 5 + .2byte 4 .2byte 20 - .2byte 71 - .2byte 60 - .2byte 59 - .2byte 15 - .2byte 16 - .2byte 38 - .2byte 49 + .2byte 69 + .2byte 29 .2byte 25 + .2byte 0 + .2byte 54 + .2byte 65 + .2byte 73 + .2byte 74 + .2byte 47 + .2byte 61 .2byte 21 - .2byte 42 - .2byte 43 .2byte 44 - .2byte 12 + .2byte 63 .2byte 13 + .2byte 26 .2byte 7 .2byte 8 - .2byte 10 - .2byte 58 - .2byte 57 - .2byte 50 + .2byte 19 + .2byte 34 + .2byte 33 + .2byte 49 + .2byte 32 + .2byte 66 diff --git a/data/text/easy_chat/groups/actions/words.inc b/data/text/easy_chat/groups/actions/words.inc index 39f10f896..28822dd64 100644 --- a/data/text/easy_chat/groups/actions/words.inc +++ b/data/text/easy_chat/groups/actions/words.inc @@ -1,80 +1,80 @@ gEasyChatGroupWords_Actions: @ 83DD26E - .string "MEETS$" - .string "CONCEDE$" - .string "GIVE$" - .string "GIVES$" - .string "PLAYED$" - .string "PLAYS$" - .string "COLLECT$" - .string "WALKING$" - .string "WALKS$" - .string "SAYS$" - .string "WENT$" - .string "SAID$" - .string "WAKE UP$" - .string "WAKES UP$" - .string "ANGERS$" - .string "TEACH$" - .string "TEACHES$" - .string "PLEASE$" - .string "LEARN$" - .string "CHANGE$" + .string "TRIFFT$" + .string "RESIGNIEREN$" + .string "GEBEN$" + .string "GIBT$" + .string "SPIELTE$" + .string "SPIELT$" + .string "SAMMELN$" + .string "WANDERN$" + .string "WANDERT$" + .string "SAGT$" + .string "GING$" + .string "SAGTE$" + .string "AUFWACHEN$" + .string "WACHT AUF$" + .string "ÄRGERT$" + .string "LEHREN$" + .string "LEHRT$" + .string "BITTE$" + .string "LERNE$" + .string "WECHSELN$" .string "STORY$" - .string "TRUST$" - .string "LAVISH$" - .string "LISTENS$" - .string "HEARING$" - .string "TRAINS$" - .string "CHOOSE$" - .string "COME$" - .string "CAME$" - .string "SEARCH$" - .string "MAKE$" - .string "CAUSE$" - .string "KNOW$" - .string "KNOWS$" - .string "REFUSE$" - .string "STORES$" - .string "BRAG$" + .string "VERTRAUEN$" + .string "GROSSZÜGIG$" + .string "HÖRT$" + .string "GEHÖRT$" + .string "TRAINIERT$" + .string "WÄHLEN$" + .string "KOMMEN$" + .string "KAM$" + .string "SUCHE$" + .string "MACHEN$" + .string "GRUND$" + .string "WISSEN$" + .string "WEISS$" + .string "WEIGERN$" + .string "LAGERT$" + .string "ANGEBEN$" .string "IGNORANT$" - .string "THINKS$" - .string "BELIEVE$" - .string "SLIDE$" - .string "EATS$" - .string "USE$" - .string "USES$" - .string "USING$" - .string "COULDN’T$" - .string "CAPABLE$" - .string "DISAPPEAR$" - .string "APPEAR$" - .string "THROW$" - .string "WORRY$" - .string "SLEPT$" - .string "SLEEP$" - .string "RELEASE$" - .string "DRINKS$" - .string "RUNS$" - .string "RUN$" - .string "WORKS$" - .string "WORKING$" - .string "TALKING$" - .string "TALK$" - .string "SINK$" - .string "SMACK$" - .string "PRETEND$" - .string "PRAISE$" - .string "OVERDO$" - .string "SHOW$" - .string "LOOKS$" - .string "SEES$" - .string "SEEK$" - .string "OWN$" - .string "TAKE$" - .string "ALLOW$" - .string "FORGET$" - .string "FORGETS$" - .string "APPEARS$" - .string "FAINT$" - .string "FAINTED$" + .string "DENKT$" + .string "GLAUBE$" + .string "GLEITEN$" + .string "ISST$" + .string "GEBRAUCHEN$" + .string "GEBRAUCHT$" + .string "VERWENDEN$" + .string "KÖNNEN NICHT$" + .string "FÄHIG$" + .string "VERSCHWINDE$" + .string "ERSCHEINEN$" + .string "WERFEN$" + .string "SORGE$" + .string "SCHLIEF$" + .string "SCHLAF$" + .string "FREILASSEN$" + .string "TRINKT$" + .string "RENNT$" + .string "RENNEN$" + .string "SEHEN$" + .string "ARBEITEN$" + .string "REDEN$" + .string "REDET$" + .string "VERSENKEN$" + .string "SCHLAG$" + .string "VORTÄUSCHEN$" + .string "LOBEN$" + .string "ÜBERTREIBEN$" + .string "ZEIGEN$" + .string "SCHAUT$" + .string "SIEHT$" + .string "STREBEN NACH$" + .string "BESITZEN$" + .string "ERTRAGEN$" + .string "ERLAUBEN$" + .string "VERGESSEN$" + .string "VERGISST$" + .string "ERSCHEINT$" + .string "BESIEGEN$" + .string "KAMPFUNFÄHIG$" .string "$" diff --git a/data/text/easy_chat/groups/adjectives/order.inc b/data/text/easy_chat/groups/adjectives/order.inc index 886d6e466..bbd816f48 100644 --- a/data/text/easy_chat/groups/adjectives/order.inc +++ b/data/text/easy_chat/groups/adjectives/order.inc @@ -1,39 +1,39 @@ .align 1 gEasyChatGroupOrder_Adjectives: @ 83DF8B0 + .2byte 24 + .2byte 28 + .2byte 17 + .2byte 18 .2byte 35 .2byte 23 - .2byte 20 - .2byte 31 - .2byte 14 .2byte 15 - .2byte 32 + .2byte 5 + .2byte 19 + .2byte 4 + .2byte 0 + .2byte 8 + .2byte 9 + .2byte 3 + .2byte 21 .2byte 34 + .2byte 13 + .2byte 30 .2byte 12 - .2byte 3 - .2byte 29 - .2byte 9 - .2byte 33 - .2byte 1 .2byte 27 - .2byte 2 - .2byte 11 + .2byte 31 + .2byte 14 + .2byte 20 + .2byte 6 .2byte 22 + .2byte 33 + .2byte 11 .2byte 26 - .2byte 28 - .2byte 10 - .2byte 18 - .2byte 17 - .2byte 7 .2byte 16 - .2byte 19 - .2byte 8 - .2byte 5 - .2byte 4 - .2byte 6 - .2byte 13 - .2byte 21 - .2byte 0 - .2byte 24 + .2byte 2 + .2byte 1 + .2byte 7 + .2byte 29 + .2byte 10 + .2byte 32 .2byte 25 - .2byte 30 diff --git a/data/text/easy_chat/groups/adjectives/words.inc b/data/text/easy_chat/groups/adjectives/words.inc index ca1762a5b..2912989c5 100644 --- a/data/text/easy_chat/groups/adjectives/words.inc +++ b/data/text/easy_chat/groups/adjectives/words.inc @@ -1,38 +1,38 @@ gEasyChatGroupWords_Adjectives: @ 83DD96C - .string "WANDERING$" - .string "RICKETY$" - .string "ROCK-SOLID$" - .string "HUNGRY$" - .string "TIGHT$" - .string "TICKLISH$" - .string "TWIRLING$" - .string "SPIRALING$" - .string "THIRSTY$" - .string "LOLLING$" - .string "SILKY$" - .string "SADLY$" - .string "HOPELESS$" - .string "USELESS$" - .string "DROOLING$" - .string "EXCITING$" - .string "THICK$" - .string "SMOOTH$" - .string "SLIMY$" - .string "THIN$" - .string "BREAK$" - .string "VORACIOUS$" - .string "SCATTER$" - .string "AWESOME$" - .string "WIMPY$" - .string "WOBBLY$" - .string "SHAKY$" - .string "RIPPED$" - .string "SHREDDED$" - .string "INCREASING$" - .string "YET$" - .string "DESTROYED$" - .string "FIERY$" - .string "LOVEY-DOVEY$" - .string "HAPPILY$" - .string "ANTICIPATION$" + .string "LATSCH$" + .string "WACKEL$" + .string "STEINHART$" + .string "MAGENKNURR$" + .string "KNURSCHP$" + .string "KILLE KILLE$" + .string "SCHLEUDER$" + .string "WIRBEL$" + .string "LECHZ$" + .string "LÜMMEL RÄKEL$" + .string "WUSCHEL$" + .string "SCHNÜFF$" + .string "OOCH$" + .string "MÜLL$" + .string "SABBER$" + .string "JIPP! JIPP!$" + .string "SCHWABBEL$" + .string "GLATT$" + .string "GLIBBER$" + .string "KLAPPER$" + .string "SCHEPPER$" + .string "MAMPF FRESS$" + .string "SCHMEISS$" + .string "IRRE$" + .string "ANGST BIBBER$" + .string "ZITTER$" + .string "SCHÜTTEL$" + .string "RATSCH$" + .string "FETZ$" + .string "WURGS$" + .string "NÖÖÖ$" + .string "RUMMS BERST$" + .string "ZISCH FACKEL$" + .string "SCHNUCKELIG$" + .string "MEGAGRINS$" + .string "GRINS HOFF$" .string "$" diff --git a/data/text/easy_chat/groups/battle/order.inc b/data/text/easy_chat/groups/battle/order.inc index f47f4b43e..1419e5e87 100644 --- a/data/text/easy_chat/groups/battle/order.inc +++ b/data/text/easy_chat/groups/battle/order.inc @@ -1,66 +1,66 @@ .align 1 gEasyChatGroupOrder_Battle: @ 83DF2A4 + .2byte 52 .2byte 53 - .2byte 39 .2byte 18 - .2byte 40 - .2byte 11 - .2byte 10 - .2byte 31 - .2byte 17 + .2byte 62 + .2byte 45 + .2byte 42 .2byte 3 .2byte 14 - .2byte 56 + .2byte 19 + .2byte 55 + .2byte 44 .2byte 38 - .2byte 41 - .2byte 29 + .2byte 28 .2byte 35 .2byte 36 - .2byte 45 - .2byte 1 - .2byte 34 - .2byte 50 - .2byte 20 - .2byte 47 + .2byte 6 .2byte 8 - .2byte 54 - .2byte 60 - .2byte 37 - .2byte 4 - .2byte 49 - .2byte 46 - .2byte 48 - .2byte 24 + .2byte 5 + .2byte 7 .2byte 0 - .2byte 62 - .2byte 12 + .2byte 31 + .2byte 4 + .2byte 40 + .2byte 41 + .2byte 11 + .2byte 17 + .2byte 30 + .2byte 59 + .2byte 37 + .2byte 56 + .2byte 60 + .2byte 1 + .2byte 20 + .2byte 16 .2byte 2 .2byte 26 + .2byte 24 .2byte 51 .2byte 43 - .2byte 30 - .2byte 59 - .2byte 55 - .2byte 52 - .2byte 42 .2byte 61 - .2byte 27 - .2byte 44 .2byte 23 + .2byte 34 + .2byte 57 .2byte 13 - .2byte 22 + .2byte 25 + .2byte 10 + .2byte 9 + .2byte 27 .2byte 32 - .2byte 19 - .2byte 16 + .2byte 22 + .2byte 29 .2byte 21 - .2byte 33 - .2byte 58 .2byte 15 - .2byte 28 - .2byte 25 - .2byte 57 - .2byte 9 - .2byte 6 - .2byte 5 - .2byte 7 + .2byte 54 + .2byte 12 + .2byte 47 + .2byte 49 + .2byte 48 + .2byte 46 + .2byte 50 + .2byte 39 + .2byte 58 + .2byte 33 diff --git a/data/text/easy_chat/groups/battle/words.inc b/data/text/easy_chat/groups/battle/words.inc index cdea8c7b8..a68df0ba4 100644 --- a/data/text/easy_chat/groups/battle/words.inc +++ b/data/text/easy_chat/groups/battle/words.inc @@ -1,65 +1,65 @@ gEasyChatGroupWords_Battle: @ 83DC53C - .string "MATCH UP$" - .string "GO$" - .string "NO. 1$" - .string "DECIDE$" - .string "LET ME WIN$" - .string "WINS$" - .string "WIN$" - .string "WON$" - .string "IF I WIN$" - .string "WHEN I WIN$" - .string "CAN’T WIN$" - .string "CAN WIN$" - .string "NO MATCH$" - .string "SPIRIT$" - .string "DECIDED$" - .string "TRUMP CARD$" - .string "TAKE THAT$" - .string "COME ON$" - .string "ATTACK$" - .string "SURRENDER$" - .string "GUTSY$" - .string "TALENT$" - .string "STRATEGY$" - .string "SMITE$" - .string "MATCH$" - .string "VICTORY$" - .string "OFFENSIVE$" - .string "SENSE$" - .string "VERSUS$" - .string "FIGHTS$" - .string "POWER$" - .string "CHALLENGE$" - .string "STRONG$" - .string "TOO STRONG$" - .string "GO EASY$" - .string "FOE$" - .string "GENIUS$" - .string "LEGEND$" - .string "ESCAPE$" - .string "AIM$" - .string "BATTLE$" - .string "FIGHT$" - .string "RESUSCITATE$" - .string "POINTS$" - .string "SERIOUS$" - .string "GIVE UP$" - .string "LOSS$" - .string "IF I LOSE$" - .string "LOST$" - .string "LOSE$" - .string "GUARD$" + .string "HARMONIEREN$" + .string "LOS$" + .string "NR. 1$" + .string "ENTSCHEIDEN$" + .string "ICH SIEGE!$" + .string "GEWINNEN$" + .string "GEWINNE$" + .string "GEWONNEN$" + .string "GEWINNE ICH$" + .string "SIEGE ICH$" + .string "SIEG UNMÖGL.$" + .string "KANN SIEGEN$" + .string "UNTERLEGEN$" + .string "SEELE$" + .string "ENTSCHIEDEN$" + .string "TRUMPFKARTE$" + .string "NIMM DAS$" + .string "KOMM SCHON$" + .string "ANGRIFF$" + .string "ERGEBEN$" + .string "MUTIG$" + .string "TALENTIERT$" + .string "STRATEGIE$" + .string "SCHLAGEN$" + .string "PARTIE$" + .string "SIEG$" + .string "OFFENSIV$" + .string "SINN$" + .string "GEGEN$" + .string "STREITEN$" + .string "KRAFT$" + .string "HERAUSFORDRG$" + .string "STARKEN$" + .string "ZU STARK$" + .string "SCHONEN$" + .string "GEGNER$" + .string "GENIE$" + .string "LEGENDE$" + .string "FLUCHT$" + .string "ZIEL$" + .string "KÄMPFE$" + .string "KÄMPFEN$" + .string "BELEBEN$" + .string "PUNKTE$" + .string "ERNSTHAFT$" + .string "AUFGEBEN$" + .string "VERLUST$" + .string "VERLIERE ICH$" + .string "VERLOREN$" + .string "VERLIEREN$" + .string "WACHE$" .string "PARTNER$" - .string "REJECT$" - .string "ACCEPT$" - .string "INVINCIBLE$" - .string "RECEIVED$" - .string "EASY$" - .string "WEAK$" - .string "TOO WEAK$" - .string "PUSHOVER$" - .string "LEADER$" - .string "RULE$" - .string "MOVE$" + .string "ABLEHNEN$" + .string "AKZEPTIEREN$" + .string "UNSCHLAGBAR$" + .string "ERHALTEN$" + .string "LEICHT$" + .string "SCHWACH$" + .string "ZU SCHWACH$" + .string "LAPPALIE$" + .string "LEITER$" + .string "REGEL$" + .string "ATTACKE$" .string "$" diff --git a/data/text/easy_chat/groups/conditions/order.inc b/data/text/easy_chat/groups/conditions/order.inc index 6705f9ff6..b1fae35b7 100644 --- a/data/text/easy_chat/groups/conditions/order.inc +++ b/data/text/easy_chat/groups/conditions/order.inc @@ -1,72 +1,72 @@ .align 1 gEasyChatGroupOrder_Conditions: @ 83DF616 + .2byte 46 .2byte 13 .2byte 55 .2byte 23 - .2byte 3 - .2byte 54 - .2byte 68 - .2byte 50 - .2byte 14 - .2byte 60 - .2byte 19 - .2byte 56 - .2byte 10 - .2byte 21 - .2byte 30 - .2byte 38 - .2byte 41 - .2byte 22 .2byte 36 - .2byte 24 - .2byte 28 - .2byte 2 + .2byte 10 + .2byte 60 + .2byte 15 + .2byte 66 + .2byte 31 .2byte 1 - .2byte 37 + .2byte 28 .2byte 35 - .2byte 52 - .2byte 12 - .2byte 8 + .2byte 62 + .2byte 59 .2byte 5 - .2byte 4 + .2byte 58 + .2byte 57 + .2byte 8 + .2byte 56 + .2byte 3 + .2byte 43 + .2byte 17 + .2byte 65 .2byte 27 + .2byte 19 + .2byte 4 .2byte 0 - .2byte 39 .2byte 63 - .2byte 59 - .2byte 20 - .2byte 6 + .2byte 26 + .2byte 30 + .2byte 47 + .2byte 40 .2byte 61 - .2byte 53 + .2byte 18 .2byte 51 - .2byte 62 - .2byte 7 - .2byte 33 - .2byte 58 + .2byte 16 + .2byte 68 + .2byte 34 + .2byte 42 + .2byte 21 .2byte 49 - .2byte 15 - .2byte 18 - .2byte 45 - .2byte 47 .2byte 48 - .2byte 34 + .2byte 53 + .2byte 45 .2byte 25 - .2byte 46 - .2byte 26 - .2byte 31 - .2byte 57 + .2byte 38 + .2byte 22 .2byte 67 - .2byte 66 - .2byte 43 - .2byte 17 - .2byte 40 - .2byte 16 - .2byte 42 - .2byte 11 + .2byte 64 + .2byte 54 + .2byte 52 + .2byte 7 + .2byte 14 + .2byte 20 + .2byte 37 .2byte 44 - .2byte 32 + .2byte 2 .2byte 29 - .2byte 65 + .2byte 39 + .2byte 24 + .2byte 32 .2byte 9 - .2byte 64 + .2byte 41 + .2byte 33 + .2byte 12 + .2byte 6 + .2byte 50 + .2byte 11 diff --git a/data/text/easy_chat/groups/conditions/words.inc b/data/text/easy_chat/groups/conditions/words.inc index fd9b9a29d..7822d0381 100644 --- a/data/text/easy_chat/groups/conditions/words.inc +++ b/data/text/easy_chat/groups/conditions/words.inc @@ -1,71 +1,71 @@ gEasyChatGroupWords_Conditions: @ 83DD07D - .string "HOT$" - .string "EXISTS$" - .string "EXCESS$" - .string "APPROVED$" - .string "HAS$" - .string "GOOD$" - .string "LESS$" - .string "MOMENTUM$" - .string "GOING$" - .string "WEIRD$" - .string "BUSY$" - .string "TOGETHER$" - .string "FULL$" - .string "ABSENT$" - .string "BEING$" - .string "NEED$" - .string "TASTY$" - .string "SKILLED$" - .string "NOISY$" - .string "BIG$" - .string "LATE$" - .string "CLOSE$" - .string "DOCILE$" - .string "AMUSING$" - .string "ENTERTAINING$" - .string "PERFECTION$" - .string "PRETTY$" - .string "HEALTHY$" - .string "EXCELLENT$" - .string "UPSIDE DOWN$" - .string "COLD$" - .string "REFRESHING$" - .string "UNAVOIDABLE$" - .string "MUCH$" - .string "OVERWHELMING$" - .string "FABULOUS$" - .string "ELSE$" - .string "EXPENSIVE$" - .string "CORRECT$" - .string "IMPOSSIBLE$" - .string "SMALL$" - .string "DIFFERENT$" - .string "TIRED$" - .string "SKILL$" + .string "HEISS$" + .string "EXISTIERT$" + .string "ÜBERMÄSSIG$" + .string "GENEHMIGT$" + .string "HAT$" + .string "FEIN$" + .string "WENIGER$" + .string "SCHWUNG$" + .string "GEHEN$" + .string "VERRÜCKT$" + .string "BESCHÄFTIGT$" + .string "ZUSAMMEN$" + .string "VOLL$" + .string "ABWESEND$" + .string "SEINE$" + .string "BRAUCHE$" + .string "LECKER$" + .string "GESCHICKT$" + .string "LAUT$" + .string "GROSS$" + .string "SPÄT$" + .string "NAHE BEI$" + .string "SANFTMÜTIG$" + .string "AMÜSANT$" + .string "UNTERHALTSAM$" + .string "PERFEKTION$" + .string "HÜBSCH$" + .string "GESUND$" + .string "EXZELLENT$" + .string "UMGEDREHT$" + .string "KALT$" + .string "ERFRISCHEND$" + .string "UNVERMEIDBAR$" + .string "VIELE$" + .string "MITREISSEND$" + .string "FABELHAFT$" + .string "ANDERES$" + .string "TEUER$" + .string "RICHTIG$" + .string "UNMÖGLICH$" + .string "KLEIN$" + .string "VERSCHIEDENE$" + .string "MÜDE$" + .string "GESCHICK$" .string "TOP$" - .string "NON-STOP$" - .string "PREPOSTEROUS$" - .string "NONE$" - .string "NOTHING$" - .string "NATURAL$" - .string "BECOMES$" - .string "LUKEWARM$" - .string "FAST$" - .string "LOW$" - .string "AWFUL$" - .string "ALONE$" - .string "BORED$" - .string "SECRET$" - .string "MYSTERY$" - .string "LACKS$" - .string "BEST$" - .string "LOUSY$" - .string "MISTAKE$" - .string "KIND$" - .string "WELL$" - .string "WEAKENED$" - .string "SIMPLE$" - .string "SEEMS$" - .string "BADLY$" + .string "NONSTOP$" + .string "ABSURD$" + .string "KEIN$" + .string "NICHTS$" + .string "NATÜRLICH$" + .string "WIRD$" + .string "LAUWARM$" + .string "SCHNELL$" + .string "NIEDRIG$" + .string "SCHLIMM$" + .string "ALLEINE$" + .string "GELANGWEILT$" + .string "GEHEIMNIS$" + .string "GEHEIM$" + .string "FEHLT$" + .string "BESTES$" + .string "LAUSIG$" + .string "FEHLER$" + .string "HÖFLICH$" + .string "SCHLECHT$" + .string "GESCHWÄCHT$" + .string "EINFACH$" + .string "SCHEINBAR$" + .string "MIES$" .string "$" diff --git a/data/text/easy_chat/groups/endings/order.inc b/data/text/easy_chat/groups/endings/order.inc index 403a02523..c2d5af8e1 100644 --- a/data/text/easy_chat/groups/endings/order.inc +++ b/data/text/easy_chat/groups/endings/order.inc @@ -1,72 +1,72 @@ .align 1 gEasyChatGroupOrder_Endings: @ 83DF502 - .2byte 32 - .2byte 39 - .2byte 63 + .2byte 58 .2byte 42 - .2byte 33 - .2byte 68 - .2byte 15 - .2byte 46 + .2byte 66 + .2byte 44 + .2byte 14 + .2byte 57 + .2byte 56 + .2byte 45 .2byte 54 - .2byte 6 - .2byte 64 - .2byte 53 .2byte 49 - .2byte 22 - .2byte 21 - .2byte 8 - .2byte 59 - .2byte 60 - .2byte 24 - .2byte 25 - .2byte 61 - .2byte 23 - .2byte 50 + .2byte 15 + .2byte 35 + .2byte 32 + .2byte 33 + .2byte 52 + .2byte 67 + .2byte 41 + .2byte 5 .2byte 43 + .2byte 53 + .2byte 46 + .2byte 59 .2byte 7 .2byte 30 .2byte 31 .2byte 55 + .2byte 68 .2byte 11 - .2byte 5 .2byte 19 - .2byte 12 - .2byte 41 + .2byte 50 + .2byte 21 + .2byte 22 + .2byte 8 .2byte 13 - .2byte 58 - .2byte 9 - .2byte 38 + .2byte 24 + .2byte 61 + .2byte 48 + .2byte 63 + .2byte 23 + .2byte 60 .2byte 34 - .2byte 52 - .2byte 45 + .2byte 12 .2byte 36 - .2byte 44 - .2byte 67 .2byte 2 - .2byte 14 - .2byte 56 - .2byte 40 + .2byte 62 + .2byte 6 .2byte 51 - .2byte 37 - .2byte 66 - .2byte 35 .2byte 18 - .2byte 3 - .2byte 47 - .2byte 57 + .2byte 37 + .2byte 29 + .2byte 25 + .2byte 40 + .2byte 39 + .2byte 9 + .2byte 38 + .2byte 64 + .2byte 65 .2byte 16 .2byte 28 - .2byte 17 - .2byte 29 .2byte 27 - .2byte 65 .2byte 26 + .2byte 20 .2byte 0 .2byte 1 - .2byte 48 - .2byte 62 - .2byte 20 .2byte 4 .2byte 10 + .2byte 17 + .2byte 3 + .2byte 47 diff --git a/data/text/easy_chat/groups/endings/words.inc b/data/text/easy_chat/groups/endings/words.inc index e7ca49996..bf4c2cec3 100644 --- a/data/text/easy_chat/groups/endings/words.inc +++ b/data/text/easy_chat/groups/endings/words.inc @@ -1,71 +1,71 @@ gEasyChatGroupWords_Endings: @ 83DCD23 - .string "WILL$" - .string "WILL BE HERE$" - .string "OR$" - .string "TIMES$" - .string "WONDER$" - .string "IS IT?$" - .string "BE$" - .string "GIMME$" - .string "COULD$" - .string "LIKELY TO$" - .string "WOULD$" - .string "IS$" - .string "ISN’T IT?$" - .string "LET’S$" - .string "OTHER$" - .string "ARE$" - .string "WAS$" - .string "WERE$" - .string "THOSE$" - .string "ISN’T$" - .string "WON’T$" - .string "CAN’T$" - .string "CAN$" - .string "DON’T$" - .string "DO$" - .string "DOES$" - .string "WHOM$" - .string "WHICH$" - .string "WASN’T$" - .string "WEREN’T$" - .string "HAVE$" - .string "HAVEN’T$" - .string "A$" - .string "AN$" - .string "NOT$" - .string "THERE$" - .string "OK?$" + .string "WERDEN$" + .string "WIRD DA SEIN$" + .string "ODER$" + .string "ZEITEN$" + .string "WUNDER$" + .string "ES IST$" + .string "SEI$" + .string "GIB MIR$" + .string "KÖNNTE$" + .string "VERMUTLICH$" + .string "WÜRDE$" + .string "IST$" + .string "NICHT WAHR?$" + .string "LASS UNS$" + .string "ANDERE$" + .string "BIST$" + .string "WAR$" + .string "WURDEN$" + .string "SIND$" + .string "IST KEIN$" + .string "WERDE NICHT$" + .string "KANNST$" + .string "KÖNNEN$" + .string "NICHT$" + .string "MACHE$" + .string "TUT$" + .string "WEM$" + .string "WELCHE$" + .string "WAR NICHT$" + .string "SOLLTEN$" + .string "HABE$" + .string "HABEN NICHT$" + .string "EIN$" + .string "EINE$" + .string "NICHT NUR$" + .string "DA$" + .string "O.K.?$" .string "SO$" - .string "MAYBE$" - .string "ABOUT$" - .string "OVER$" - .string "IT$" - .string "ALL$" - .string "FOR$" - .string "ON$" - .string "OFF$" - .string "AS$" - .string "TO$" - .string "WITH$" - .string "BETTER$" - .string "EVER$" - .string "SINCE$" - .string "OF$" - .string "BELONGS TO$" - .string "AT$" + .string "VIELLEICHT$" + .string "UMHER$" + .string "ÜBER$" + .string "ES$" + .string "ALLE$" + .string "FÜR$" + .string "AN$" + .string "AUS$" + .string "GENAUSO$" + .string "ZU$" + .string "MIT$" + .string "BESSER$" + .string "JEMALS$" + .string "SEIT$" + .string "EINEN$" + .string "GEHÖRT ZU$" + .string "BEI$" .string "IN$" - .string "OUT$" - .string "TOO$" - .string "LIKE$" - .string "DID$" - .string "DIDN’T$" - .string "DOESN’T$" - .string "WITHOUT$" - .string "AFTER$" - .string "BEFORE$" - .string "WHILE$" - .string "THAN$" - .string "ONCE$" - .string "ANYWHERE$" + .string "AUF$" + .string "AUCH$" + .string "ÄHNLICH$" + .string "GETAN$" + .string "NICHT GETAN$" + .string "MACHT$" + .string "OHNE$" + .string "NACH$" + .string "VORHER$" + .string "WÄHREND$" + .string "ALS$" + .string "EINMAL$" + .string "IRGENDWO$" .string "$" diff --git a/data/text/easy_chat/groups/events/order.inc b/data/text/easy_chat/groups/events/order.inc index 0b48d0f0b..d1555c2a6 100644 --- a/data/text/easy_chat/groups/events/order.inc +++ b/data/text/easy_chat/groups/events/order.inc @@ -2,24 +2,24 @@ gEasyChatGroupOrder_Events: @ 83DF8F8 .2byte 0 - .2byte 14 - .2byte 12 + .2byte 2 + .2byte 21 .2byte 3 - .2byte 17 - .2byte 4 - .2byte 1 + .2byte 8 + .2byte 12 .2byte 10 - .2byte 9 - .2byte 15 + .2byte 1 + .2byte 16 .2byte 11 .2byte 6 + .2byte 14 + .2byte 20 .2byte 13 - .2byte 19 .2byte 5 + .2byte 19 + .2byte 17 .2byte 18 - .2byte 20 - .2byte 21 - .2byte 16 - .2byte 8 - .2byte 2 + .2byte 9 .2byte 7 + .2byte 15 + .2byte 4 diff --git a/data/text/easy_chat/groups/events/words.inc b/data/text/easy_chat/groups/events/words.inc index 6bfe9c296..1e4b52fb1 100644 --- a/data/text/easy_chat/groups/events/words.inc +++ b/data/text/easy_chat/groups/events/words.inc @@ -1,24 +1,24 @@ gEasyChatGroupWords_Events: @ 83DDA8D - .string "APPEAL$" + .string "AUSDRUCK$" .string "EVENTS$" - .string "STAY-AT-HOME$" - .string "BERRY$" - .string "CONTEST$" + .string "BABYSITTEN$" + .string "BEERE$" + .string "WETTBEWERB$" .string "MC$" - .string "JUDGE$" + .string "JUROR$" .string "SUPER$" - .string "STAGE$" - .string "HALL OF FAME$" - .string "EVOLUTION$" + .string "BÜHNE$" + .string "RUHMESHALLE$" + .string "ENTWICKLUNG$" .string "HYPER$" - .string "BATTLE TOWER$" - .string "LEADERS$" - .string "BATTLE ROOM$" - .string "HIDDEN$" - .string "SECRET BASE$" - .string "BLEND$" + .string "DUELLTURM$" + .string "LEITER$" + .string "KAMPFRAUM$" + .string "VERSTECKTE$" + .string "GEHEIMBASIS$" + .string "MIXEN$" .string "{POKEBLOCK}$" - .string "MASTER$" - .string "RANK$" - .string "RIBBON$" + .string "MEISTER$" + .string "KLASSE$" + .string "BAND$" .string "$" diff --git a/data/text/easy_chat/groups/feelings/order.inc b/data/text/easy_chat/groups/feelings/order.inc index 0570ae7dc..40027cbe8 100644 --- a/data/text/easy_chat/groups/feelings/order.inc +++ b/data/text/easy_chat/groups/feelings/order.inc @@ -1,72 +1,72 @@ .align 1 gEasyChatGroupOrder_Feelings: @ 83DF58C - .2byte 40 - .2byte 39 - .2byte 24 - .2byte 23 - .2byte 46 - .2byte 63 - .2byte 36 - .2byte 37 - .2byte 38 - .2byte 61 - .2byte 31 + .2byte 35 + .2byte 7 + .2byte 29 .2byte 62 - .2byte 27 - .2byte 12 - .2byte 13 .2byte 41 - .2byte 22 - .2byte 35 - .2byte 60 + .2byte 2 + .2byte 26 .2byte 32 - .2byte 51 + .2byte 13 + .2byte 12 .2byte 44 - .2byte 42 - .2byte 43 - .2byte 7 + .2byte 60 + .2byte 66 + .2byte 28 + .2byte 18 + .2byte 27 .2byte 53 - .2byte 9 - .2byte 29 - .2byte 4 - .2byte 11 + .2byte 61 .2byte 3 - .2byte 10 - .2byte 64 + .2byte 42 + .2byte 43 .2byte 6 .2byte 5 - .2byte 47 - .2byte 19 + .2byte 64 + .2byte 39 .2byte 17 - .2byte 2 - .2byte 8 - .2byte 33 - .2byte 28 - .2byte 45 - .2byte 34 - .2byte 26 - .2byte 0 - .2byte 21 + .2byte 10 + .2byte 11 + .2byte 19 + .2byte 57 + .2byte 55 + .2byte 36 + .2byte 9 + .2byte 49 + .2byte 54 .2byte 59 - .2byte 30 .2byte 50 - .2byte 1 - .2byte 66 - .2byte 58 + .2byte 22 + .2byte 30 .2byte 65 + .2byte 33 + .2byte 46 + .2byte 63 + .2byte 48 + .2byte 47 + .2byte 4 + .2byte 58 + .2byte 37 + .2byte 38 + .2byte 1 .2byte 14 - .2byte 56 - .2byte 25 - .2byte 57 - .2byte 49 + .2byte 51 .2byte 52 - .2byte 48 - .2byte 18 - .2byte 16 + .2byte 25 .2byte 15 + .2byte 45 + .2byte 31 + .2byte 40 + .2byte 21 .2byte 67 .2byte 68 - .2byte 55 - .2byte 54 + .2byte 16 + .2byte 34 + .2byte 0 + .2byte 8 .2byte 20 + .2byte 24 + .2byte 23 + .2byte 56 diff --git a/data/text/easy_chat/groups/feelings/words.inc b/data/text/easy_chat/groups/feelings/words.inc index 510d285c2..5ee8571fa 100644 --- a/data/text/easy_chat/groups/feelings/words.inc +++ b/data/text/easy_chat/groups/feelings/words.inc @@ -1,71 +1,71 @@ gEasyChatGroupWords_Feelings: @ 83DCE9B - .string "MEET$" - .string "PLAY$" - .string "HURRIED$" - .string "GOES$" - .string "GIDDY$" - .string "HAPPY$" - .string "HAPPINESS$" - .string "EXCITE$" - .string "IMPORTANT$" - .string "FUNNY$" - .string "GOT$" - .string "GO HOME$" - .string "DISAPPOINTED$" - .string "DISAPPOINTS$" - .string "SAD$" - .string "TRY$" - .string "TRIES$" - .string "HEARS$" - .string "THINK$" - .string "HEAR$" - .string "WANTS$" - .string "MISHEARD$" - .string "DISLIKE$" - .string "ANGRY$" - .string "ANGER$" - .string "SCARY$" - .string "LONESOME$" - .string "DISAPPOINT$" - .string "JOY$" - .string "GETS$" - .string "NEVER$" - .string "DARN$" - .string "DOWNCAST$" - .string "INCREDIBLE$" - .string "LIKES$" - .string "DISLIKES$" - .string "BORING$" - .string "CARE$" - .string "CARES$" - .string "ALL RIGHT$" - .string "ADORE$" - .string "DISASTER$" - .string "ENJOY$" - .string "ENJOYS$" - .string "EAT$" - .string "LACKING$" - .string "BAD$" - .string "HARD$" - .string "TERRIBLE$" - .string "SHOULD$" - .string "NICE$" - .string "DRINK$" - .string "SURPRISE$" - .string "FEAR$" - .string "WANT$" - .string "WAIT$" - .string "SATISFIED$" - .string "SEE$" - .string "RARE$" - .string "NEGATIVE$" - .string "DONE$" - .string "DANGER$" - .string "DEFEATED$" - .string "BEAT$" - .string "GREAT$" - .string "ROMANTIC$" - .string "QUESTION$" - .string "UNDERSTAND$" - .string "UNDERSTANDS$" + .string "WEINEN$" + .string "SPIELEN$" + .string "EILIG$" + .string "GEHT$" + .string "SCHWINDELIG$" + .string "GLÜCKLICH$" + .string "GLÜCK$" + .string "BEGEISTERN$" + .string "WICHTIG$" + .string "LUSTIG$" + .string "HABEN$" + .string "HEIMGEHEN$" + .string "ENTTÄUSCHT$" + .string "ENTTÄUSCHEN$" + .string "TRAURIG$" + .string "UNZUFRIEDEN$" + .string "VERSUCHT$" + .string "GUTE LAUNE$" + .string "FRÖHLICH$" + .string "HÖREN$" + .string "WILL$" + .string "VERHÖRT$" + .string "NICHT MÖGEN$" + .string "WÜTEND$" + .string "WUT$" + .string "UNHEIMLICH$" + .string "EINSAM$" + .string "FRUSTRIERT$" + .string "FREUDE$" + .string "BEKOMMT$" + .string "NIE$" + .string "VERDAMMT$" + .string "ENTMUTIGT$" + .string "SAGENHAFT$" + .string "VORLIEBEN$" + .string "ABNEIGUNG$" + .string "LANGWEILIG$" + .string "SORGEN$" + .string "SORGT$" + .string "GUT$" + .string "VERGÖTTERN$" + .string "DESASTER$" + .string "GENIESSEN$" + .string "GENIESST$" + .string "ESSEN$" + .string "UNZUREICHEND$" + .string "SCHLECHTE$" + .string "SCHWER$" + .string "SCHRECKLICH$" + .string "MIESE LAUNE$" + .string "NETT$" + .string "TRINKEN$" + .string "ÜBERRASCHUNG$" + .string "FURCHT$" + .string "MÖCHTE$" + .string "LANGEWEILE$" + .string "ZUFRIEDEN$" + .string "LACHEN$" + .string "SELTEN$" + .string "NEGATIV$" + .string "FERTIG$" + .string "GEFAHR$" + .string "BESIEGT$" + .string "SCHLUG$" + .string "GROSSARTIG$" + .string "ROMANTISCH$" + .string "FRAGE$" + .string "VERSTEHEN$" + .string "VERSTEHT$" .string "$" diff --git a/data/text/easy_chat/groups/greetings/order.inc b/data/text/easy_chat/groups/greetings/order.inc index 8310ebd07..b02a5d0f7 100644 --- a/data/text/easy_chat/groups/greetings/order.inc +++ b/data/text/easy_chat/groups/greetings/order.inc @@ -1,45 +1,45 @@ .align 1 gEasyChatGroupOrder_Greetings: @ 83DF322 - .2byte 12 - .2byte 25 - .2byte 32 .2byte 40 - .2byte 9 - .2byte 41 - .2byte 20 + .2byte 7 + .2byte 33 + .2byte 21 + .2byte 0 + .2byte 17 .2byte 22 - .2byte 13 + .2byte 35 .2byte 10 - .2byte 24 - .2byte 16 + .2byte 9 .2byte 15 - .2byte 2 - .2byte 3 - .2byte 4 .2byte 34 .2byte 14 .2byte 26 - .2byte 30 + .2byte 3 + .2byte 4 + .2byte 2 + .2byte 36 .2byte 37 - .2byte 8 - .2byte 28 .2byte 18 - .2byte 36 - .2byte 33 + .2byte 1 + .2byte 39 + .2byte 38 .2byte 29 - .2byte 7 + .2byte 23 .2byte 19 - .2byte 21 - .2byte 35 + .2byte 25 + .2byte 13 .2byte 11 - .2byte 17 - .2byte 0 - .2byte 6 - .2byte 23 + .2byte 30 + .2byte 20 + .2byte 32 + .2byte 16 + .2byte 12 .2byte 27 - .2byte 38 + .2byte 24 + .2byte 8 + .2byte 28 + .2byte 6 .2byte 5 .2byte 31 - .2byte 1 - .2byte 39 + .2byte 41 diff --git a/data/text/easy_chat/groups/greetings/words.inc b/data/text/easy_chat/groups/greetings/words.inc index b283168ca..96a48e9fe 100644 --- a/data/text/easy_chat/groups/greetings/words.inc +++ b/data/text/easy_chat/groups/greetings/words.inc @@ -1,44 +1,44 @@ gEasyChatGroupWords_Greetings: @ 83DC70F - .string "THANKS$" - .string "YES$" - .string "HERE GOES$" - .string "HERE I COME$" - .string "HERE IT IS$" + .string "DANK$" + .string "JA$" + .string "HIER KOMMT$" + .string "HIER BIN ICH$" + .string "HIER IST ES$" .string "YEAH$" - .string "WELCOME$" - .string "OI$" - .string "HOW DO$" - .string "CONGRATS$" - .string "GIVE ME$" + .string "WILLKOMMEN$" + .string "AU$" + .string "WIE$" + .string "GLÜCKWUNSCH$" + .string "GIB$" .string "SORRY$" - .string "APOLOGIZE$" - .string "FORGIVE$" - .string "HEY, THERE$" - .string "HELLO$" - .string "GOOD-BYE$" - .string "THANK YOU$" - .string "I’VE ARRIVED$" + .string "VERZEIHUNG$" + .string "SCHON GUT$" + .string "HEY DA$" + .string "HALLO$" + .string "TSCHÜSS$" + .string "DANKE SCHÖN$" + .string "ICH BIN DA$" .string "PARDON$" - .string "EXCUSE$" - .string "SEE YA$" - .string "EXCUSE ME$" - .string "WELL, THEN$" - .string "GO AHEAD$" - .string "APPRECIATE$" + .string "TAGCHEN$" + .string "BIS DANN$" + .string "ENTSCHULDIGE$" + .string "NUN, DANN$" + .string "WEITER SO$" + .string "SCHÄTZEN$" .string "HEY?$" - .string "WHAT’S UP?$" - .string "HUH?$" - .string "NO$" - .string "HI$" + .string "WAS IST LOS?$" + .string "WIE?$" + .string "NEIN$" + .string "TAG AUCH$" .string "YEAH, YEAH$" - .string "BYE-BYE$" - .string "MEET YOU$" + .string "TSCHAU$" + .string "BIS BALD$" .string "HEY$" - .string "SMELL$" - .string "LISTENING$" - .string "HOO-HAH$" - .string "YAHOO$" - .string "YO$" - .string "COME OVER$" - .string "COUNT ON$" + .string "GERUCH$" + .string "HÖR ZU$" + .string "HUH HAH$" + .string "JUCHUU$" + .string "JEPP$" + .string "ACH, KOMM$" + .string "ZÄHLEN AUF$" .string "$" diff --git a/data/text/easy_chat/groups/hobbies/order.inc b/data/text/easy_chat/groups/hobbies/order.inc index 41ced1099..7ed127e1e 100644 --- a/data/text/easy_chat/groups/hobbies/order.inc +++ b/data/text/easy_chat/groups/hobbies/order.inc @@ -2,56 +2,56 @@ gEasyChatGroupOrder_Hobbies: @ 83DF796 .2byte 43 + .2byte 32 .2byte 1 + .2byte 53 .2byte 45 - .2byte 21 + .2byte 12 + .2byte 38 .2byte 44 .2byte 46 - .2byte 11 - .2byte 9 - .2byte 30 - .2byte 5 - .2byte 6 - .2byte 17 .2byte 48 - .2byte 18 - .2byte 29 - .2byte 33 .2byte 34 - .2byte 26 - .2byte 42 + .2byte 10 + .2byte 50 + .2byte 21 + .2byte 49 .2byte 47 - .2byte 32 - .2byte 38 - .2byte 15 + .2byte 3 + .2byte 11 .2byte 14 .2byte 39 .2byte 41 + .2byte 31 .2byte 22 - .2byte 49 .2byte 0 + .2byte 9 + .2byte 6 + .2byte 18 + .2byte 27 .2byte 35 - .2byte 53 .2byte 19 - .2byte 31 - .2byte 3 + .2byte 42 .2byte 8 + .2byte 26 + .2byte 4 .2byte 40 .2byte 37 - .2byte 50 + .2byte 5 .2byte 36 + .2byte 28 .2byte 16 - .2byte 10 + .2byte 17 + .2byte 51 .2byte 24 .2byte 2 .2byte 25 - .2byte 13 - .2byte 23 - .2byte 4 + .2byte 20 + .2byte 15 .2byte 7 - .2byte 28 - .2byte 27 - .2byte 51 + .2byte 23 + .2byte 29 .2byte 52 - .2byte 12 - .2byte 20 + .2byte 33 + .2byte 30 + .2byte 13 diff --git a/data/text/easy_chat/groups/hobbies/words.inc b/data/text/easy_chat/groups/hobbies/words.inc index 3aa4f2887..5ef66eac7 100644 --- a/data/text/easy_chat/groups/hobbies/words.inc +++ b/data/text/easy_chat/groups/hobbies/words.inc @@ -2,55 +2,55 @@ gEasyChatGroupWords_Hobbies: @ 83DD5B1 .string "IDOL$" .string "ANIME$" .string "SONG$" - .string "MOVIE$" - .string "SWEETS$" - .string "CHAT$" - .string "CHILD’S PLAY$" - .string "TOYS$" - .string "MUSIC$" - .string "CARDS$" - .string "SHOPPING$" - .string "CAMERA$" - .string "VIEWING$" - .string "SPECTATOR$" + .string "FILM$" + .string "NASCHEN$" + .string "PLAUDERN$" + .string "KINDERSPIEL$" + .string "SPIELZEUG$" + .string "MUSIK$" + .string "KARTENSPIELE$" + .string "EINKAUFEN$" + .string "FOTOS$" + .string "BESICHTIGUNG$" + .string "ZUSCHAUER$" .string "GOURMET$" - .string "GAME$" + .string "SPIEL$" .string "RPG$" - .string "COLLECTION$" - .string "COMPLETE$" - .string "MAGAZINE$" - .string "WALK$" - .string "BIKE$" + .string "SAMMLUNG$" + .string "KOMPLETT$" + .string "MAGAZIN$" + .string "SPAZIEREN$" + .string "FAHRRAD$" .string "HOBBY$" - .string "SPORTS$" + .string "SPORT$" .string "SOFTWARE$" .string "SONGS$" - .string "DIET$" - .string "TREASURE$" - .string "TRAVEL$" - .string "DANCE$" - .string "CHANNEL$" - .string "MAKING$" - .string "FISHING$" - .string "DATE$" + .string "NAHRUNG$" + .string "KOSTBARKEIT$" + .string "REISEN$" + .string "TANZEN$" + .string "WASSERSPORT$" + .string "HERSTELLUNG$" + .string "ANGELN$" + .string "VERABREDUNG$" .string "DESIGN$" - .string "LOCOMOTIVE$" - .string "PLUSH DOLL$" + .string "LOKOMOTIVEN$" + .string "PLÜSCHPUPPEN$" .string "PC$" - .string "FLOWERS$" - .string "HERO$" - .string "NAP$" - .string "HEROINE$" - .string "FASHION$" - .string "ADVENTURE$" - .string "BOARD$" + .string "BLUMEN$" + .string "HELD$" + .string "NICKERCHEN$" + .string "HELDIN$" + .string "MODE$" + .string "ABENTEUER$" + .string "BRETTSPIELE$" .string "BALL$" - .string "BOOK$" - .string "FESTIVAL$" + .string "BÜCHER$" + .string "FESTIVALS$" .string "COMICS$" - .string "HOLIDAY$" - .string "PLANS$" - .string "TRENDY$" - .string "VACATION$" - .string "LOOK$" + .string "FERIEN$" + .string "ETWAS PLANEN$" + .string "SCHICKIMICKI$" + .string "URLAUB$" + .string "AUSSEHEN$" .string "$" diff --git a/data/text/easy_chat/groups/lifestyle/order.inc b/data/text/easy_chat/groups/lifestyle/order.inc index c0aff2d7b..e21269bb5 100644 --- a/data/text/easy_chat/groups/lifestyle/order.inc +++ b/data/text/easy_chat/groups/lifestyle/order.inc @@ -1,48 +1,48 @@ .align 1 gEasyChatGroupOrder_Lifestyle: @ 83DF73C - .2byte 3 + .2byte 13 .2byte 4 - .2byte 0 - .2byte 16 - .2byte 7 - .2byte 5 - .2byte 26 + .2byte 22 .2byte 24 - .2byte 39 + .2byte 27 + .2byte 7 + .2byte 2 .2byte 23 - .2byte 9 + .2byte 5 .2byte 8 + .2byte 9 .2byte 1 .2byte 18 .2byte 29 + .2byte 26 .2byte 40 - .2byte 17 - .2byte 22 + .2byte 11 .2byte 41 .2byte 19 + .2byte 20 + .2byte 16 + .2byte 34 .2byte 35 - .2byte 36 + .2byte 43 .2byte 37 - .2byte 2 .2byte 30 .2byte 31 .2byte 33 - .2byte 28 + .2byte 0 .2byte 32 - .2byte 38 + .2byte 36 .2byte 42 - .2byte 43 .2byte 6 .2byte 12 - .2byte 11 - .2byte 34 .2byte 14 - .2byte 20 - .2byte 27 + .2byte 3 + .2byte 28 .2byte 25 - .2byte 21 .2byte 15 - .2byte 10 - .2byte 13 + .2byte 39 + .2byte 21 + .2byte 17 + .2byte 38 .2byte 44 + .2byte 10 diff --git a/data/text/easy_chat/groups/lifestyle/words.inc b/data/text/easy_chat/groups/lifestyle/words.inc index 64cc1cd86..526ff4b17 100644 --- a/data/text/easy_chat/groups/lifestyle/words.inc +++ b/data/text/easy_chat/groups/lifestyle/words.inc @@ -1,47 +1,47 @@ gEasyChatGroupWords_Lifestyle: @ 83DD468 - .string "CHORES$" - .string "HOME$" - .string "MONEY$" - .string "ALLOWANCE$" - .string "BATH$" - .string "CONVERSATION$" - .string "SCHOOL$" - .string "COMMEMORATE$" - .string "HABIT$" - .string "GROUP$" - .string "WORD$" - .string "STORE$" + .string "PFLICHTEN$" + .string "HEIM$" + .string "GELD$" + .string "TASCHENGELD$" + .string "BAD$" + .string "GESPRÄCH$" + .string "SCHULE$" + .string "GEDENKEN$" + .string "GEWOHNHEIT$" + .string "GRUPPE$" + .string "WORT$" + .string "LAGER$" .string "SERVICE$" - .string "WORK$" + .string "ARBEIT$" .string "SYSTEM$" - .string "TRAIN$" - .string "CLASS$" - .string "LESSONS$" + .string "TRAINIEREN$" + .string "LEKTION$" + .string "UNTERRICHT$" .string "INFORMATION$" - .string "LIVING$" - .string "TEACHER$" - .string "TOURNAMENT$" - .string "LETTER$" - .string "EVENT$" - .string "DIGITAL$" + .string "LEBENDIG$" + .string "LEHRER$" + .string "TURNIER$" + .string "BRIEF$" + .string "GESCHEHEN$" + .string "DIGITALES$" .string "TEST$" - .string "DEPT. STORE$" - .string "TELEVISION$" - .string "PHONE$" + .string "KAUFHAUS$" + .string "FERNSEHER$" + .string "TELEFON$" .string "ITEM$" .string "NAME$" - .string "NEWS$" - .string "POPULAR$" + .string "NEUIGKEITEN$" + .string "POPULÄR$" .string "PARTY$" - .string "STUDY$" - .string "MACHINE$" - .string "MAIL$" - .string "MESSAGE$" - .string "PROMISE$" - .string "DREAM$" + .string "LERNEN$" + .string "MASCHINE$" + .string "POST$" + .string "MITTEILUNG$" + .string "VERSPRECHEN$" + .string "TRAUM$" .string "KINDERGARTEN$" - .string "LIFE$" + .string "LEBEN$" .string "RADIO$" - .string "RENTAL$" - .string "WORLD$" + .string "MIETE$" + .string "WELT$" .string "$" diff --git a/data/text/easy_chat/groups/misc/order.inc b/data/text/easy_chat/groups/misc/order.inc index 95184c8fb..8e8a529f1 100644 --- a/data/text/easy_chat/groups/misc/order.inc +++ b/data/text/easy_chat/groups/misc/order.inc @@ -1,45 +1,45 @@ .align 1 gEasyChatGroupOrder_Misc: @ 83DF85C - .2byte 7 + .2byte 2 + .2byte 16 + .2byte 12 + .2byte 20 + .2byte 14 + .2byte 23 .2byte 24 + .2byte 25 + .2byte 15 + .2byte 17 + .2byte 18 + .2byte 5 .2byte 30 - .2byte 8 - .2byte 6 - .2byte 13 - .2byte 28 - .2byte 38 - .2byte 35 - .2byte 19 - .2byte 16 - .2byte 29 - .2byte 26 + .2byte 39 + .2byte 22 + .2byte 33 .2byte 10 + .2byte 3 + .2byte 19 .2byte 9 .2byte 0 .2byte 11 .2byte 40 - .2byte 1 .2byte 31 - .2byte 39 - .2byte 12 - .2byte 3 + .2byte 13 + .2byte 27 + .2byte 7 .2byte 41 - .2byte 36 - .2byte 20 - .2byte 25 - .2byte 23 - .2byte 17 - .2byte 18 - .2byte 5 .2byte 4 - .2byte 15 - .2byte 14 .2byte 21 - .2byte 22 - .2byte 2 - .2byte 27 + .2byte 36 + .2byte 35 + .2byte 1 + .2byte 6 + .2byte 38 + .2byte 26 + .2byte 28 + .2byte 37 .2byte 34 - .2byte 33 + .2byte 29 .2byte 32 - .2byte 37 + .2byte 8 diff --git a/data/text/easy_chat/groups/misc/words.inc b/data/text/easy_chat/groups/misc/words.inc index 9e52baf07..e9025bcf5 100644 --- a/data/text/easy_chat/groups/misc/words.inc +++ b/data/text/easy_chat/groups/misc/words.inc @@ -1,44 +1,44 @@ gEasyChatGroupWords_Misc: @ 83DD860 - .string "HIGHS$" - .string "LOWS$" - .string "UM$" - .string "REAR$" - .string "THINGS$" - .string "THING$" - .string "BELOW$" - .string "ABOVE$" - .string "BACK$" - .string "HIGH$" - .string "HERE$" - .string "INSIDE$" - .string "OUTSIDE$" - .string "BESIDE$" - .string "THIS IS IT!$" - .string "THIS$" - .string "EVERY$" - .string "THESE$" - .string "THESE WERE$" - .string "DOWN$" - .string "THAT$" - .string "THOSE ARE$" - .string "THOSE WERE$" - .string "THAT’S IT!$" - .string "AM$" - .string "THAT WAS$" - .string "FRONT$" - .string "UP$" - .string "CHOICE$" - .string "FAR$" - .string "AWAY$" - .string "NEAR$" - .string "WHERE$" - .string "WHEN$" - .string "WHAT$" - .string "DEEP$" - .string "SHALLOW$" - .string "WHY$" - .string "CONFUSED$" - .string "OPPOSITE$" - .string "LEFT$" - .string "RIGHT$" + .string "HÖHEN$" + .string "TIEFEN$" + .string "ÄH$" + .string "HINTEN$" + .string "SACHEN$" + .string "DING$" + .string "UNTERHALB$" + .string "OBERHALB$" + .string "ZURÜCK$" + .string "HOCH$" + .string "HIER$" + .string "INNEN$" + .string "AUSSEN$" + .string "NEBEN$" + .string "DAS IST ES!$" + .string "DIES$" + .string "ALLES$" + .string "DIESE$" + .string "DIESE WAREN$" + .string "HINUNTER$" + .string "DAS$" + .string "SCHON$" + .string "GENUG$" + .string "DAS IST’S!$" + .string "DAS SIND$" + .string "DAS WAR$" + .string "VORNE$" + .string "OBEN$" + .string "WAHL$" + .string "WEIT$" + .string "FORT$" + .string "NAHE$" + .string "WO$" + .string "GLEICH$" + .string "WAS$" + .string "TIEF$" + .string "SEICHT$" + .string "WARUM$" + .string "VERWIRRT$" + .string "GEGENÜBER$" + .string "LINKS$" + .string "RECHTS$" .string "$" diff --git a/data/text/easy_chat/groups/move_1/order.inc b/data/text/easy_chat/groups/move_1/order.inc index 08a250dab..73fa0c69c 100644 --- a/data/text/easy_chat/groups/move_1/order.inc +++ b/data/text/easy_chat/groups/move_1/order.inc @@ -2,155 +2,155 @@ gEasyChatGroupOrder_Move1: @ 83DF924 .2byte 71 - .2byte 177 .2byte 97 - .2byte 314 + .2byte 324 + .2byte 207 .2byte 246 .2byte 312 - .2byte 310 + .2byte 253 .2byte 62 - .2byte 117 - .2byte 20 + .2byte 203 + .2byte 50 .2byte 44 - .2byte 280 .2byte 145 - .2byte 268 + .2byte 141 + .2byte 219 .2byte 204 - .2byte 128 - .2byte 109 - .2byte 132 - .2byte 322 - .2byte 68 - .2byte 152 - .2byte 238 - .2byte 242 - .2byte 15 - .2byte 91 - .2byte 50 + .2byte 87 + .2byte 85 + .2byte 9 .2byte 104 - .2byte 38 + .2byte 175 + .2byte 114 .2byte 3 + .2byte 280 + .2byte 231 + .2byte 329 + .2byte 196 + .2byte 116 .2byte 89 - .2byte 227 - .2byte 283 - .2byte 203 - .2byte 326 - .2byte 245 + .2byte 310 + .2byte 81 .2byte 263 - .2byte 313 - .2byte 90 - .2byte 175 + .2byte 317 + .2byte 120 + .2byte 325 .2byte 172 .2byte 53 - .2byte 260 .2byte 19 - .2byte 116 - .2byte 264 - .2byte 266 + .2byte 259 + .2byte 323 + .2byte 301 + .2byte 37 + .2byte 209 + .2byte 67 + .2byte 281 + .2byte 117 + .2byte 179 + .2byte 105 + .2byte 90 + .2byte 47 .2byte 202 .2byte 320 - .2byte 74 - .2byte 288 - .2byte 16 + .2byte 184 + .2byte 180 .2byte 258 .2byte 106 - .2byte 114 - .2byte 29 - .2byte 215 + .2byte 327 + .2byte 143 + .2byte 315 + .2byte 212 .2byte 95 - .2byte 301 - .2byte 196 - .2byte 231 + .2byte 261 .2byte 2 - .2byte 134 - .2byte 141 - .2byte 122 - .2byte 142 - .2byte 67 - .2byte 212 + .2byte 20 + .2byte 13 + .2byte 242 + .2byte 109 + .2byte 68 + .2byte 29 + .2byte 322 + .2byte 152 + .2byte 103 + .2byte 238 + .2byte 268 + .2byte 221 + .2byte 220 + .2byte 230 + .2byte 177 .2byte 262 .2byte 319 - .2byte 309 - .2byte 170 - .2byte 119 - .2byte 54 + .2byte 311 .2byte 234 - .2byte 267 + .2byte 166 + .2byte 288 .2byte 171 + .2byte 267 + .2byte 283 .2byte 190 - .2byte 316 - .2byte 200 - .2byte 315 - .2byte 220 - .2byte 181 - .2byte 60 + .2byte 110 + .2byte 147 + .2byte 264 .2byte 244 .2byte 94 + .2byte 134 + .2byte 60 .2byte 149 - .2byte 228 + .2byte 181 .2byte 99 + .2byte 108 .2byte 240 - .2byte 229 - .2byte 13 - .2byte 105 + .2byte 265 + .2byte 38 .2byte 216 - .2byte 179 - .2byte 157 - .2byte 249 - .2byte 88 - .2byte 317 - .2byte 205 - .2byte 221 - .2byte 219 + .2byte 39 .2byte 328 - .2byte 28 .2byte 201 - .2byte 184 - .2byte 103 - .2byte 120 - .2byte 247 - .2byte 325 + .2byte 28 .2byte 159 - .2byte 329 - .2byte 324 - .2byte 318 - .2byte 47 - .2byte 166 - .2byte 285 - .2byte 143 - .2byte 327 + .2byte 91 + .2byte 122 .2byte 163 - .2byte 265 - .2byte 123 - .2byte 108 + .2byte 260 + .2byte 128 .2byte 173 + .2byte 316 + .2byte 318 + .2byte 123 .2byte 76 - .2byte 49 - .2byte 209 + .2byte 326 + .2byte 321 + .2byte 119 .2byte 169 - .2byte 180 - .2byte 147 - .2byte 70 - .2byte 81 + .2byte 266 + .2byte 247 .2byte 78 - .2byte 66 - .2byte 162 - .2byte 207 - .2byte 230 + .2byte 70 + .2byte 157 + .2byte 88 + .2byte 309 .2byte 129 + .2byte 162 .2byte 235 - .2byte 39 - .2byte 37 - .2byte 87 - .2byte 85 - .2byte 9 - .2byte 321 - .2byte 259 - .2byte 253 + .2byte 142 + .2byte 313 + .2byte 229 + .2byte 245 + .2byte 66 .2byte 233 - .2byte 323 - .2byte 311 + .2byte 49 + .2byte 132 + .2byte 228 + .2byte 215 + .2byte 74 + .2byte 205 + .2byte 54 + .2byte 285 .2byte 250 - .2byte 261 - .2byte 110 - .2byte 281 + .2byte 170 + .2byte 314 + .2byte 16 + .2byte 200 + .2byte 15 + .2byte 249 + .2byte 227 diff --git a/data/text/easy_chat/groups/move_2/order.inc b/data/text/easy_chat/groups/move_2/order.inc index 114d799b1..918bd0116 100644 --- a/data/text/easy_chat/groups/move_2/order.inc +++ b/data/text/easy_chat/groups/move_2/order.inc @@ -1,197 +1,197 @@ .align 1 gEasyChatGroupOrder_Move2: @ 83DFA56 - .2byte 51 - .2byte 151 + .2byte 194 + .2byte 195 + .2byte 282 .2byte 332 .2byte 133 - .2byte 292 - .2byte 274 .2byte 213 - .2byte 140 + .2byte 55 + .2byte 352 + .2byte 292 + .2byte 278 .2byte 112 - .2byte 226 - .2byte 251 .2byte 187 - .2byte 299 - .2byte 59 - .2byte 335 - .2byte 34 - .2byte 125 - .2byte 198 - .2byte 155 - .2byte 340 - .2byte 61 - .2byte 339 - .2byte 331 - .2byte 347 - .2byte 293 - .2byte 4 - .2byte 93 - .2byte 160 - .2byte 176 .2byte 178 + .2byte 286 .2byte 343 - .2byte 306 - .2byte 174 - .2byte 111 - .2byte 194 - .2byte 197 - .2byte 291 - .2byte 146 + .2byte 186 + .2byte 80 + .2byte 148 + .2byte 192 + .2byte 59 + .2byte 61 + .2byte 36 + .2byte 34 + .2byte 65 + .2byte 46 + .2byte 297 + .2byte 164 + .2byte 84 + .2byte 86 .2byte 24 + .2byte 131 .2byte 337 .2byte 349 .2byte 82 - .2byte 225 - .2byte 138 - .2byte 65 - .2byte 223 + .2byte 167 + .2byte 41 + .2byte 73 .2byte 121 - .2byte 52 + .2byte 111 + .2byte 334 + .2byte 8 + .2byte 58 + .2byte 255 + .2byte 156 .2byte 284 .2byte 153 - .2byte 185 - .2byte 252 - .2byte 206 - .2byte 297 - .2byte 126 + .2byte 27 + .2byte 350 + .2byte 299 + .2byte 225 .2byte 7 + .2byte 126 .2byte 83 - .2byte 148 - .2byte 193 + .2byte 185 + .2byte 174 + .2byte 17 .2byte 218 .2byte 31 - .2byte 210 - .2byte 154 - .2byte 248 + .2byte 347 + .2byte 290 + .2byte 69 + .2byte 217 + .2byte 193 .2byte 137 - .2byte 45 + .2byte 77 + .2byte 342 + .2byte 40 + .2byte 139 + .2byte 305 + .2byte 52 .2byte 12 + .2byte 287 + .2byte 45 .2byte 257 - .2byte 270 - .2byte 136 - .2byte 237 .2byte 30 .2byte 32 - .2byte 336 + .2byte 254 .2byte 56 .2byte 63 .2byte 158 - .2byte 304 - .2byte 58 - .2byte 8 - .2byte 286 - .2byte 275 - .2byte 334 - .2byte 26 - .2byte 282 + .2byte 222 + .2byte 146 + .2byte 336 + .2byte 127 + .2byte 11 + .2byte 198 + .2byte 125 + .2byte 155 + .2byte 4 + .2byte 107 + .2byte 93 + .2byte 276 + .2byte 237 + .2byte 10 + .2byte 154 + .2byte 331 .2byte 348 - .2byte 73 - .2byte 43 + .2byte 330 + .2byte 189 + .2byte 341 + .2byte 300 .2byte 113 - .2byte 199 - .2byte 295 - .2byte 183 .2byte 277 - .2byte 345 - .2byte 222 + .2byte 188 .2byte 96 - .2byte 72 - .2byte 25 .2byte 5 - .2byte 224 + .2byte 25 + .2byte 72 .2byte 232 .2byte 118 .2byte 208 .2byte 102 - .2byte 107 - .2byte 243 - .2byte 296 + .2byte 252 .2byte 236 - .2byte 341 - .2byte 300 - .2byte 189 - .2byte 330 - .2byte 302 .2byte 101 - .2byte 6 - .2byte 64 - .2byte 195 - .2byte 80 .2byte 42 - .2byte 305 - .2byte 139 - .2byte 40 - .2byte 342 - .2byte 77 + .2byte 346 + .2byte 296 + .2byte 302 .2byte 1 - .2byte 217 - .2byte 182 - .2byte 98 + .2byte 150 + .2byte 339 + .2byte 251 + .2byte 22 .2byte 75 - .2byte 278 + .2byte 168 + .2byte 270 .2byte 115 - .2byte 287 - .2byte 156 - .2byte 279 - .2byte 46 - .2byte 350 .2byte 272 - .2byte 27 - .2byte 10 - .2byte 290 - .2byte 69 - .2byte 351 + .2byte 335 + .2byte 98 + .2byte 51 + .2byte 151 + .2byte 197 .2byte 130 - .2byte 303 - .2byte 21 + .2byte 304 + .2byte 295 .2byte 79 .2byte 214 .2byte 124 - .2byte 188 - .2byte 289 - .2byte 135 - .2byte 131 + .2byte 64 + .2byte 351 + .2byte 182 + .2byte 294 + .2byte 14 + .2byte 248 + .2byte 43 + .2byte 21 + .2byte 241 + .2byte 243 + .2byte 340 + .2byte 26 .2byte 191 - .2byte 255 - .2byte 150 + .2byte 226 .2byte 211 - .2byte 254 + .2byte 140 .2byte 23 - .2byte 165 - .2byte 164 - .2byte 241 - .2byte 276 .2byte 48 .2byte 57 - .2byte 256 - .2byte 186 - .2byte 14 .2byte 33 - .2byte 294 - .2byte 36 - .2byte 269 + .2byte 303 + .2byte 293 + .2byte 291 .2byte 298 .2byte 100 - .2byte 168 - .2byte 86 - .2byte 84 + .2byte 183 .2byte 92 - .2byte 144 - .2byte 161 + .2byte 138 .2byte 271 - .2byte 167 - .2byte 41 + .2byte 161 + .2byte 206 + .2byte 136 + .2byte 289 + .2byte 160 + .2byte 176 + .2byte 279 + .2byte 269 + .2byte 275 + .2byte 256 + .2byte 165 + .2byte 224 + .2byte 144 + .2byte 135 + .2byte 35 .2byte 239 - .2byte 11 - .2byte 22 - .2byte 55 - .2byte 352 - .2byte 346 - .2byte 127 .2byte 18 - .2byte 17 + .2byte 223 .2byte 273 - .2byte 35 - .2byte 192 + .2byte 6 + .2byte 345 + .2byte 306 + .2byte 199 + .2byte 210 + .2byte 274 diff --git a/data/text/easy_chat/groups/people/order.inc b/data/text/easy_chat/groups/people/order.inc index 6144d7ba3..2934f8339 100644 --- a/data/text/easy_chat/groups/people/order.inc +++ b/data/text/easy_chat/groups/people/order.inc @@ -1,78 +1,78 @@ .align 1 gEasyChatGroupOrder_People: @ 83DF376 - .2byte 13 - .2byte 52 - .2byte 31 - .2byte 17 - .2byte 22 - .2byte 62 - .2byte 12 .2byte 14 - .2byte 34 - .2byte 28 - .2byte 54 - .2byte 23 - .2byte 11 - .2byte 51 - .2byte 21 - .2byte 9 - .2byte 16 + .2byte 50 + .2byte 49 + .2byte 4 + .2byte 3 + .2byte 5 + .2byte 22 + .2byte 2 + .2byte 6 + .2byte 7 + .2byte 18 .2byte 26 .2byte 30 - .2byte 24 + .2byte 13 + .2byte 58 .2byte 72 - .2byte 25 - .2byte 29 + .2byte 23 + .2byte 0 + .2byte 36 + .2byte 51 + .2byte 71 + .2byte 57 + .2byte 63 + .2byte 46 + .2byte 32 + .2byte 16 + .2byte 9 + .2byte 35 .2byte 1 .2byte 41 - .2byte 38 .2byte 42 - .2byte 49 + .2byte 38 + .2byte 25 + .2byte 55 + .2byte 24 + .2byte 44 + .2byte 12 .2byte 33 - .2byte 50 + .2byte 34 + .2byte 21 .2byte 19 - .2byte 20 - .2byte 8 - .2byte 35 - .2byte 36 .2byte 40 + .2byte 45 + .2byte 20 .2byte 37 - .2byte 0 - .2byte 64 - .2byte 18 - .2byte 53 + .2byte 8 + .2byte 10 .2byte 27 + .2byte 53 .2byte 66 + .2byte 15 + .2byte 29 .2byte 69 + .2byte 60 + .2byte 74 .2byte 73 + .2byte 68 + .2byte 59 .2byte 70 - .2byte 32 - .2byte 15 - .2byte 74 - .2byte 44 - .2byte 4 - .2byte 58 - .2byte 55 .2byte 56 - .2byte 59 - .2byte 60 - .2byte 71 - .2byte 39 - .2byte 57 - .2byte 63 - .2byte 46 - .2byte 10 - .2byte 61 - .2byte 65 - .2byte 67 + .2byte 31 + .2byte 17 + .2byte 28 + .2byte 54 + .2byte 64 + .2byte 11 + .2byte 52 + .2byte 62 .2byte 43 .2byte 48 - .2byte 45 .2byte 47 - .2byte 68 - .2byte 2 - .2byte 6 - .2byte 7 - .2byte 5 - .2byte 3 + .2byte 61 + .2byte 67 + .2byte 65 + .2byte 39 diff --git a/data/text/easy_chat/groups/people/words.inc b/data/text/easy_chat/groups/people/words.inc index 89f370251..c7f499be6 100644 --- a/data/text/easy_chat/groups/people/words.inc +++ b/data/text/easy_chat/groups/people/words.inc @@ -1,77 +1,77 @@ gEasyChatGroupWords_People: @ 83DC85A - .string "OPPONENT$" - .string "I$" - .string "YOU$" - .string "YOURS$" - .string "SON$" - .string "YOUR$" - .string "YOU’RE$" - .string "YOU’VE$" - .string "MOTHER$" - .string "GRANDFATHER$" - .string "UNCLE$" - .string "FATHER$" - .string "BOY$" - .string "ADULT$" - .string "BROTHER$" - .string "SISTER$" - .string "GRANDMOTHER$" - .string "AUNT$" - .string "PARENT$" + .string "FEIND$" + .string "ICH$" + .string "DU$" + .string "DEINE$" + .string "DEIN$" + .string "DEINER$" + .string "DU BIST$" + .string "DU HAST$" + .string "MUTTER$" + .string "GROSSVATER$" + .string "ONKEL$" + .string "VATER$" + .string "JUNGE$" + .string "ERWACHSENER$" + .string "BRUDER$" + .string "SCHWESTER$" + .string "GROSSMUTTER$" + .string "TANTE$" + .string "ELTERN$" .string "MAN$" - .string "ME$" - .string "GIRL$" - .string "BABE$" - .string "FAMILY$" - .string "HER$" - .string "HIM$" - .string "HE$" - .string "PLACE$" - .string "DAUGHTER$" - .string "HIS$" - .string "HE’S$" - .string "AREN’T$" - .string "SIBLINGS$" - .string "KID$" - .string "CHILDREN$" - .string "MR.$" - .string "MRS.$" - .string "MYSELF$" - .string "I WAS$" - .string "TO ME$" - .string "MY$" - .string "I AM$" - .string "I’VE$" - .string "WHO$" - .string "SOMEONE$" - .string "WHO WAS$" - .string "TO WHOM$" - .string "WHOSE$" - .string "WHO IS$" - .string "IT’S$" - .string "LADY$" - .string "FRIEND$" - .string "ALLY$" + .string "MICH$" + .string "MÄDCHEN$" + .string "DICH$" + .string "FAMILIE$" + .string "IHR$" + .string "IHM$" + .string "ER$" + .string "ORT$" + .string "TOCHTER$" + .string "SEIN$" + .string "ER IST$" + .string "SIND NICHT$" + .string "GESCHWISTER$" + .string "KINDCHEN$" + .string "KINDER$" + .string "HERR$" + .string "FRAU$" + .string "MIR$" + .string "ICH WAR$" + .string "ZU MIR$" + .string "MEIN$" + .string "ICH BIN$" + .string "ICH HABE$" + .string "WER$" + .string "JEMAND$" + .string "MEINE$" + .string "FÜR WEN$" + .string "WESSEN$" + .string "WER IST$" + .string "DAS IST$" + .string "DAME$" + .string "FREUND$" + .string "VERBÜNDETER$" .string "PERSON$" - .string "DUDE$" - .string "THEY$" - .string "THEY WERE$" - .string "TO THEM$" - .string "THEIR$" - .string "THEY’RE$" - .string "THEY’VE$" - .string "WE$" - .string "BEEN$" - .string "TO US$" - .string "OUR$" - .string "WE’RE$" - .string "RIVAL$" - .string "WE’VE$" - .string "WOMAN$" - .string "SHE$" - .string "SHE WAS$" - .string "TO HER$" - .string "HER’S$" - .string "SHE IS$" - .string "SOME$" + .string "TYPE$" + .string "IHNEN$" + .string "SIE WAREN$" + .string "FÜR SIE$" + .string "EUCH$" + .string "SIE SIND$" + .string "SIE HABEN$" + .string "WIR$" + .string "WAREN$" + .string "FÜR UNS$" + .string "UNSER$" + .string "WIR SIND$" + .string "RIVALE$" + .string "WIR HABEN$" + .string "SIE KONNTEN$" + .string "SIE$" + .string "SIE WAR$" + .string "FÜR ALLE$" + .string "EURE$" + .string "SIE IST$" + .string "SIE HATTE$" .string "$" diff --git a/data/text/easy_chat/groups/pokemon/order.inc b/data/text/easy_chat/groups/pokemon/order.inc index b39d5bd28..3afe49659 100644 --- a/data/text/easy_chat/groups/pokemon/order.inc +++ b/data/text/easy_chat/groups/pokemon/order.inc @@ -1,205 +1,205 @@ .align 1 gEasyChatGroupOrder_Pokemon: @ 83DF010 + .2byte 374 .2byte 63 .2byte 376 - .2byte 384 - .2byte 65 .2byte 359 .2byte 390 .2byte 391 - .2byte 382 .2byte 184 .2byte 350 - .2byte 395 - .2byte 318 .2byte 378 - .2byte 323 - .2byte 292 - .2byte 398 + .2byte 328 + .2byte 299 .2byte 182 - .2byte 282 - .2byte 307 - .2byte 344 - .2byte 345 + .2byte 397 + .2byte 364 + .2byte 339 .2byte 340 - .2byte 330 - .2byte 293 - .2byte 385 - .2byte 411 - .2byte 170 - .2byte 373 - .2byte 319 - .2byte 281 - .2byte 326 .2byte 222 - .2byte 389 - .2byte 327 - .2byte 169 - .2byte 316 .2byte 410 .2byte 85 .2byte 84 .2byte 232 - .2byte 362 - .2byte 361 - .2byte 294 + .2byte 396 + .2byte 44 + .2byte 315 + .2byte 316 + .2byte 54 + .2byte 55 + .2byte 286 + .2byte 347 + .2byte 280 + .2byte 174 + .2byte 355 + .2byte 370 + .2byte 385 .2byte 337 - .2byte 101 - .2byte 372 - .2byte 328 - .2byte 334 - .2byte 394 - .2byte 74 + .2byte 130 + .2byte 277 + .2byte 311 + .2byte 75 + .2byte 76 + .2byte 289 + .2byte 279 + .2byte 45 .2byte 203 - .2byte 347 - .2byte 44 .2byte 42 .2byte 118 - .2byte 55 - .2byte 76 - .2byte 375 - .2byte 75 - .2byte 88 - .2byte 405 - .2byte 278 + .2byte 119 .2byte 352 - .2byte 367 - .2byte 130 + .2byte 405 + .2byte 394 .2byte 336 - .2byte 214 - .2byte 116 - .2byte 374 - .2byte 174 + .2byte 283 + .2byte 169 .2byte 387 - .2byte 39 + .2byte 360 .2byte 409 + .2byte 281 .2byte 64 + .2byte 330 + .2byte 307 + .2byte 297 + .2byte 129 .2byte 317 - .2byte 230 + .2byte 395 .2byte 393 - .2byte 109 + .2byte 74 + .2byte 332 + .2byte 306 + .2byte 40 + .2byte 371 + .2byte 372 + .2byte 326 + .2byte 327 .2byte 404 - .2byte 383 + .2byte 170 .2byte 171 .2byte 407 .2byte 408 + .2byte 101 + .2byte 319 + .2byte 366 + .2byte 334 + .2byte 325 .2byte 388 - .2byte 289 + .2byte 282 .2byte 296 .2byte 295 - .2byte 371 - .2byte 297 .2byte 348 - .2byte 325 - .2byte 68 - .2byte 67 .2byte 66 + .2byte 68 .2byte 219 - .2byte 129 + .2byte 287 .2byte 81 .2byte 82 .2byte 335 - .2byte 338 .2byte 183 - .2byte 284 + .2byte 67 .2byte 312 - .2byte 355 .2byte 357 .2byte 356 .2byte 400 .2byte 399 - .2byte 287 .2byte 329 .2byte 354 - .2byte 283 - .2byte 89 + .2byte 284 + .2byte 365 + .2byte 43 + .2byte 320 .2byte 177 .2byte 301 - .2byte 38 .2byte 302 - .2byte 320 - .2byte 339 - .2byte 299 - .2byte 43 + .2byte 303 + .2byte 345 + .2byte 411 + .2byte 308 + .2byte 293 + .2byte 227 + .2byte 292 .2byte 310 + .2byte 373 .2byte 231 .2byte 172 .2byte 25 .2byte 127 .2byte 353 - .2byte 286 - .2byte 54 + .2byte 294 + .2byte 39 + .2byte 318 + .2byte 321 .2byte 26 - .2byte 392 .2byte 406 .2byte 402 .2byte 401 .2byte 403 .2byte 381 - .2byte 112 + .2byte 278 .2byte 111 + .2byte 112 .2byte 363 - .2byte 322 - .2byte 397 - .2byte 27 - .2byte 28 - .2byte 279 - .2byte 117 - .2byte 119 - .2byte 342 + .2byte 375 .2byte 298 - .2byte 379 - .2byte 331 - .2byte 303 - .2byte 396 - .2byte 300 - .2byte 306 - .2byte 377 + .2byte 28 + .2byte 27 .2byte 291 - .2byte 227 - .2byte 315 - .2byte 366 - .2byte 364 + .2byte 368 + .2byte 367 + .2byte 323 .2byte 218 .2byte 346 - .2byte 349 + .2byte 304 + .2byte 305 + .2byte 230 + .2byte 342 + .2byte 117 .2byte 341 - .2byte 308 + .2byte 116 + .2byte 380 + .2byte 377 + .2byte 65 + .2byte 214 + .2byte 88 + .2byte 89 + .2byte 110 + .2byte 109 + .2byte 349 .2byte 351 .2byte 121 .2byte 120 - .2byte 311 - .2byte 358 - .2byte 368 + .2byte 384 + .2byte 383 + .2byte 382 .2byte 285 - .2byte 305 - .2byte 304 + .2byte 398 + .2byte 300 .2byte 72 .2byte 73 - .2byte 280 - .2byte 321 - .2byte 332 - .2byte 277 + .2byte 331 + .2byte 392 .2byte 369 + .2byte 344 .2byte 333 - .2byte 365 - .2byte 45 + .2byte 379 .2byte 386 + .2byte 338 .2byte 100 + .2byte 38 .2byte 37 + .2byte 358 .2byte 313 .2byte 314 .2byte 343 - .2byte 110 + .2byte 290 .2byte 324 - .2byte 370 - .2byte 40 + .2byte 389 .2byte 309 .2byte 202 - .2byte 290 - .2byte 360 .2byte 178 - .2byte 380 .2byte 288 + .2byte 322 .2byte 41 + .2byte 362 + .2byte 361 diff --git a/data/text/easy_chat/groups/pokemon_2/order.inc b/data/text/easy_chat/groups/pokemon_2/order.inc index 219e7dfb0..ce515d7b1 100644 --- a/data/text/easy_chat/groups/pokemon_2/order.inc +++ b/data/text/easy_chat/groups/pokemon_2/order.inc @@ -3,42 +3,33 @@ gEasyChatGroupOrder_Pokemon2: @ 83DFC1C .2byte 63 .2byte 142 - .2byte 190 - .2byte 65 + .2byte 93 + .2byte 138 + .2byte 139 .2byte 181 + .2byte 134 .2byte 24 - .2byte 59 .2byte 168 + .2byte 59 .2byte 144 + .2byte 91 .2byte 184 - .2byte 153 + .2byte 211 .2byte 15 - .2byte 182 - .2byte 69 - .2byte 9 - .2byte 242 + .2byte 3 + .2byte 2 .2byte 1 - .2byte 12 - .2byte 10 + .2byte 135 + .2byte 182 + .2byte 48 + .2byte 225 .2byte 251 .2byte 113 - .2byte 6 - .2byte 4 - .2byte 5 - .2byte 152 - .2byte 170 - .2byte 36 - .2byte 35 - .2byte 173 - .2byte 91 .2byte 222 - .2byte 169 - .2byte 159 - .2byte 104 - .2byte 155 - .2byte 225 - .2byte 87 + .2byte 234 + .2byte 248 .2byte 50 + .2byte 51 .2byte 132 .2byte 85 .2byte 84 @@ -46,208 +37,217 @@ gEasyChatGroupOrder_Pokemon2: @ 83DFC1C .2byte 148 .2byte 149 .2byte 147 - .2byte 96 - .2byte 51 + .2byte 44 .2byte 206 - .2byte 133 - .2byte 23 - .2byte 125 - .2byte 101 .2byte 239 + .2byte 125 + .2byte 152 .2byte 244 - .2byte 196 - .2byte 102 - .2byte 103 - .2byte 83 - .2byte 22 - .2byte 160 - .2byte 180 + .2byte 54 + .2byte 55 + .2byte 133 + .2byte 235 + .2byte 194 + .2byte 155 .2byte 136 + .2byte 79 + .2byte 174 .2byte 205 - .2byte 162 - .2byte 92 + .2byte 58 + .2byte 78 + .2byte 130 .2byte 94 - .2byte 74 + .2byte 75 + .2byte 76 + .2byte 45 .2byte 203 - .2byte 207 - .2byte 44 + .2byte 4 + .2byte 6 + .2byte 5 .2byte 42 .2byte 118 - .2byte 55 - .2byte 76 + .2byte 119 .2byte 210 - .2byte 75 - .2byte 88 - .2byte 58 - .2byte 130 - .2byte 93 - .2byte 214 - .2byte 107 - .2byte 106 - .2byte 237 + .2byte 190 + .2byte 21 + .2byte 242 .2byte 250 .2byte 163 .2byte 187 - .2byte 116 + .2byte 13 + .2byte 188 .2byte 229 .2byte 228 .2byte 97 - .2byte 174 - .2byte 2 - .2byte 39 - .2byte 135 - .2byte 189 - .2byte 124 + .2byte 22 + .2byte 201 + .2byte 156 + .2byte 169 + .2byte 160 + .2byte 87 + .2byte 86 .2byte 140 .2byte 141 .2byte 64 - .2byte 14 .2byte 115 - .2byte 230 + .2byte 237 + .2byte 158 + .2byte 129 + .2byte 221 + .2byte 106 .2byte 99 - .2byte 109 + .2byte 74 + .2byte 69 + .2byte 105 + .2byte 40 + .2byte 103 + .2byte 14 .2byte 98 + .2byte 198 + .2byte 238 + .2byte 80 + .2byte 170 .2byte 171 .2byte 131 .2byte 246 + .2byte 199 + .2byte 146 .2byte 166 .2byte 165 - .2byte 108 + .2byte 101 + .2byte 153 .2byte 249 - .2byte 68 - .2byte 67 .2byte 66 + .2byte 68 .2byte 240 .2byte 219 - .2byte 129 .2byte 126 .2byte 81 .2byte 82 - .2byte 56 .2byte 226 - .2byte 179 .2byte 183 - .2byte 105 - .2byte 154 + .2byte 67 .2byte 52 - .2byte 11 + .2byte 154 + .2byte 56 .2byte 151 .2byte 150 .2byte 241 - .2byte 200 - .2byte 146 - .2byte 122 - .2byte 89 - .2byte 198 + .2byte 185 + .2byte 195 + .2byte 90 + .2byte 43 + .2byte 197 .2byte 177 + .2byte 92 .2byte 34 .2byte 31 .2byte 29 .2byte 32 .2byte 30 .2byte 33 - .2byte 38 + .2byte 107 .2byte 164 .2byte 224 - .2byte 43 - .2byte 138 - .2byte 139 + .2byte 49 .2byte 95 + .2byte 102 + .2byte 122 + .2byte 227 + .2byte 189 .2byte 46 .2byte 47 - .2byte 53 .2byte 231 .2byte 172 - .2byte 18 - .2byte 17 - .2byte 16 + .2byte 35 + .2byte 173 .2byte 25 - .2byte 221 - .2byte 204 .2byte 127 - .2byte 186 - .2byte 60 - .2byte 61 - .2byte 62 + .2byte 36 .2byte 77 + .2byte 83 .2byte 137 .2byte 233 - .2byte 57 - .2byte 54 + .2byte 213 + .2byte 196 + .2byte 39 .2byte 247 - .2byte 195 - .2byte 156 - .2byte 211 + .2byte 62 + .2byte 60 + .2byte 61 + .2byte 186 + .2byte 220 + .2byte 236 .2byte 26 .2byte 243 - .2byte 78 - .2byte 20 + .2byte 57 .2byte 19 + .2byte 20 + .2byte 10 + .2byte 143 .2byte 223 - .2byte 112 + .2byte 23 .2byte 111 - .2byte 27 + .2byte 112 + .2byte 124 + .2byte 11 .2byte 28 + .2byte 27 + .2byte 71 .2byte 212 - .2byte 123 - .2byte 117 - .2byte 119 - .2byte 86 - .2byte 161 - .2byte 90 - .2byte 213 - .2byte 227 - .2byte 188 - .2byte 80 - .2byte 199 - .2byte 79 + .2byte 7 + .2byte 8 + .2byte 108 .2byte 218 - .2byte 235 - .2byte 238 + .2byte 230 + .2byte 117 + .2byte 116 + .2byte 123 + .2byte 65 + .2byte 214 + .2byte 207 + .2byte 88 + .2byte 89 + .2byte 12 + .2byte 110 + .2byte 109 .2byte 215 - .2byte 143 + .2byte 53 .2byte 209 - .2byte 21 - .2byte 167 - .2byte 7 - .2byte 234 + .2byte 192 + .2byte 191 + .2byte 208 .2byte 121 .2byte 120 - .2byte 208 - .2byte 185 .2byte 245 - .2byte 192 - .2byte 191 - .2byte 220 .2byte 114 + .2byte 204 + .2byte 17 + .2byte 18 + .2byte 16 .2byte 128 .2byte 216 .2byte 72 .2byte 73 .2byte 175 .2byte 176 - .2byte 158 .2byte 157 - .2byte 248 - .2byte 236 - .2byte 197 - .2byte 201 + .2byte 104 + .2byte 96 + .2byte 200 + .2byte 9 + .2byte 159 + .2byte 70 .2byte 217 - .2byte 134 - .2byte 49 - .2byte 48 - .2byte 3 - .2byte 71 - .2byte 45 + .2byte 179 .2byte 100 + .2byte 38 .2byte 37 - .2byte 8 - .2byte 13 - .2byte 70 - .2byte 110 - .2byte 40 + .2byte 180 + .2byte 167 + .2byte 162 + .2byte 161 .2byte 202 - .2byte 194 .2byte 178 .2byte 193 .2byte 145 diff --git a/data/text/easy_chat/groups/speech/order.inc b/data/text/easy_chat/groups/speech/order.inc index c2cd47835..6b8d64fea 100644 --- a/data/text/easy_chat/groups/speech/order.inc +++ b/data/text/easy_chat/groups/speech/order.inc @@ -1,63 +1,63 @@ .align 1 gEasyChatGroupOrder_Speech: @ 83DF48A - .2byte 19 - .2byte 18 - .2byte 27 - .2byte 20 + .2byte 10 + .2byte 49 .2byte 41 - .2byte 40 - .2byte 21 - .2byte 57 + .2byte 37 + .2byte 48 + .2byte 6 + .2byte 30 + .2byte 14 + .2byte 53 + .2byte 13 + .2byte 20 + .2byte 51 + .2byte 44 + .2byte 19 + .2byte 5 + .2byte 56 + .2byte 46 .2byte 23 - .2byte 49 - .2byte 43 - .2byte 52 - .2byte 10 + .2byte 38 + .2byte 24 .2byte 12 - .2byte 17 - .2byte 31 .2byte 59 .2byte 9 - .2byte 56 .2byte 34 - .2byte 8 - .2byte 16 - .2byte 15 - .2byte 11 - .2byte 25 - .2byte 58 - .2byte 36 - .2byte 30 + .2byte 52 .2byte 4 - .2byte 3 - .2byte 0 .2byte 2 - .2byte 14 - .2byte 53 + .2byte 15 + .2byte 57 + .2byte 39 + .2byte 11 .2byte 50 + .2byte 3 .2byte 54 .2byte 32 - .2byte 33 - .2byte 6 .2byte 1 + .2byte 47 + .2byte 29 .2byte 22 + .2byte 40 .2byte 42 - .2byte 24 - .2byte 7 - .2byte 51 - .2byte 37 - .2byte 44 - .2byte 5 - .2byte 46 - .2byte 39 - .2byte 38 - .2byte 29 - .2byte 13 - .2byte 55 - .2byte 47 - .2byte 45 - .2byte 35 - .2byte 48 + .2byte 17 + .2byte 36 .2byte 26 + .2byte 43 + .2byte 58 + .2byte 16 + .2byte 31 + .2byte 21 + .2byte 35 + .2byte 33 + .2byte 18 + .2byte 8 + .2byte 45 + .2byte 27 + .2byte 25 .2byte 28 + .2byte 7 + .2byte 55 + .2byte 0 diff --git a/data/text/easy_chat/groups/speech/words.inc b/data/text/easy_chat/groups/speech/words.inc index becfd03d0..28db99df1 100644 --- a/data/text/easy_chat/groups/speech/words.inc +++ b/data/text/easy_chat/groups/speech/words.inc @@ -1,62 +1,62 @@ gEasyChatGroupWords_Speech: @ 83DCB82 - .string "LISTEN$" - .string "NOT VERY$" - .string "MEAN$" - .string "LIE$" - .string "LAY$" - .string "RECOMMEND$" - .string "NITWIT$" - .string "QUITE$" - .string "FROM$" - .string "FEELING$" - .string "BUT$" - .string "HOWEVER$" - .string "CASE$" - .string "THE$" - .string "MISS$" - .string "HOW$" - .string "HIT$" - .string "ENOUGH$" - .string "A LOT$" - .string "A LITTLE$" - .string "ABSOLUTELY$" - .string "AND$" - .string "ONLY$" - .string "AROUND$" - .string "PROBABLY$" - .string "IF$" - .string "VERY$" - .string "A TINY BIT$" + .string "ZUHÖREN$" + .string "NICHT SEHR$" + .string "GEMEIN$" + .string "LÜGEN$" + .string "GELOGEN$" + .string "EMPFOHLEN$" + .string "BLÖDKOPF$" + .string "WIRKLICH$" + .string "VON$" + .string "FÜHLEN$" + .string "ABER$" + .string "JEDOCH$" + .string "FALL$" + .string "DER$" + .string "DANEBEN$" + .string "GENAU WIE$" + .string "TREFFER$" + .string "REICHT AUS$" + .string "VIEL$" + .string "EIN BISSCHEN$" + .string "DIE$" + .string "UND$" + .string "NUR$" + .string "ETWA$" + .string "EVENTUELL$" + .string "WENN$" + .string "SEHR$" + .string "WENIG$" .string "WILD$" - .string "THAT’S$" - .string "JUST$" - .string "EVEN SO,$" - .string "MUST BE$" - .string "NATURALLY$" - .string "FOR NOW,$" - .string "UNDERSTOOD$" - .string "JOKING$" - .string "READY$" - .string "SOMETHING$" - .string "SOMEHOW$" - .string "ALTHOUGH$" + .string "NOCH MAL$" + .string "BLOSS$" + .string "TROTZDEM$" + .string "MUSS$" + .string "VERSTÄNDLICH$" + .string "FÜR NUN$" + .string "VERSTANDEN$" + .string "SCHERZEN$" + .string "BEREIT$" + .string "ETWAS$" + .string "IRGENDWIE$" + .string "OBWOHL$" .string "ALSO$" - .string "PERFECT$" - .string "AS MUCH AS$" - .string "REALLY$" - .string "TRULY$" - .string "SERIOUSLY$" - .string "TOTALLY$" - .string "UNTIL$" - .string "AS IF$" - .string "MOOD$" - .string "RATHER$" - .string "AWFULLY$" - .string "MODE$" - .string "MORE$" - .string "TOO LATE$" - .string "FINALLY$" - .string "ANY$" - .string "INSTEAD$" - .string "FANTASTIC$" + .string "PERFEKT$" + .string "SO VIEL WIE$" + .string "EHRLICH$" + .string "WAHRHAFTIG$" + .string "ERNST$" + .string "NOCH$" + .string "BIS$" + .string "ALS OB$" + .string "LAUNE$" + .string "EHER$" + .string "FURCHTBAR$" + .string "DENKE$" + .string "MEHR$" + .string "ZU SPÄT$" + .string "ENDLICH$" + .string "IRGENDEIN$" + .string "STATT$" + .string "FANTASTISCH$" .string "$" diff --git a/data/text/easy_chat/groups/status/order.inc b/data/text/easy_chat/groups/status/order.inc index 1f1c32fd5..01efb3917 100644 --- a/data/text/easy_chat/groups/status/order.inc +++ b/data/text/easy_chat/groups/status/order.inc @@ -1,112 +1,112 @@ .align 1 gEasyChatGroupOrder_Status: @ 83DF1CA - .2byte 13 + .2byte 47 + .2byte 33 .2byte 9 + .2byte 66 + .2byte 25 + .2byte 24 + .2byte 96 .2byte 5 - .2byte 23 - .2byte 11 - .2byte 12 - .2byte 101 - .2byte 97 + .2byte 6 + .2byte 77 + .2byte 38 + .2byte 99 .2byte 106 - .2byte 29 - .2byte 68 - .2byte 8 - .2byte 86 - .2byte 78 .2byte 21 .2byte 22 - .2byte 24 - .2byte 99 - .2byte 25 - .2byte 37 - .2byte 0 + .2byte 64 .2byte 62 - .2byte 4 + .2byte 1 .2byte 76 - .2byte 72 - .2byte 88 + .2byte 59 + .2byte 32 .2byte 57 - .2byte 16 + .2byte 71 + .2byte 84 + .2byte 53 + .2byte 78 + .2byte 63 + .2byte 8 + .2byte 86 + .2byte 37 .2byte 90 - .2byte 91 .2byte 104 + .2byte 91 + .2byte 39 .2byte 75 - .2byte 58 + .2byte 72 .2byte 31 - .2byte 28 - .2byte 38 - .2byte 33 - .2byte 54 - .2byte 73 - .2byte 15 - .2byte 32 - .2byte 71 + .2byte 10 + .2byte 60 + .2byte 61 + .2byte 101 + .2byte 56 + .2byte 98 .2byte 100 - .2byte 48 + .2byte 36 .2byte 81 - .2byte 6 - .2byte 47 - .2byte 82 - .2byte 77 - .2byte 39 + .2byte 97 + .2byte 16 + .2byte 23 + .2byte 13 .2byte 85 + .2byte 18 + .2byte 19 + .2byte 48 + .2byte 54 + .2byte 87 .2byte 94 .2byte 40 - .2byte 79 + .2byte 107 .2byte 92 - .2byte 36 + .2byte 102 + .2byte 105 + .2byte 103 + .2byte 29 + .2byte 4 .2byte 69 - .2byte 64 .2byte 43 - .2byte 93 - .2byte 103 - .2byte 102 - .2byte 89 + .2byte 79 + .2byte 35 + .2byte 28 .2byte 83 - .2byte 60 - .2byte 61 - .2byte 84 + .2byte 89 + .2byte 58 .2byte 14 - .2byte 107 - .2byte 3 - .2byte 10 - .2byte 7 - .2byte 34 - .2byte 66 - .2byte 45 - .2byte 46 - .2byte 59 - .2byte 17 - .2byte 53 - .2byte 35 .2byte 108 - .2byte 74 - .2byte 18 - .2byte 19 - .2byte 87 - .2byte 20 - .2byte 49 - .2byte 70 - .2byte 1 - .2byte 67 + .2byte 41 + .2byte 34 + .2byte 3 .2byte 26 + .2byte 46 + .2byte 45 .2byte 27 - .2byte 98 - .2byte 44 - .2byte 42 + .2byte 74 + .2byte 15 + .2byte 65 + .2byte 11 + .2byte 12 + .2byte 82 .2byte 2 - .2byte 30 + .2byte 88 + .2byte 70 .2byte 51 .2byte 52 - .2byte 63 - .2byte 65 + .2byte 49 + .2byte 7 + .2byte 30 + .2byte 42 + .2byte 93 + .2byte 20 .2byte 50 - .2byte 105 + .2byte 73 + .2byte 0 .2byte 55 .2byte 95 - .2byte 56 - .2byte 96 - .2byte 41 + .2byte 44 + .2byte 17 + .2byte 67 + .2byte 68 .2byte 80 diff --git a/data/text/easy_chat/groups/status/words.inc b/data/text/easy_chat/groups/status/words.inc index 28109b361..de6758036 100644 --- a/data/text/easy_chat/groups/status/words.inc +++ b/data/text/easy_chat/groups/status/words.inc @@ -1,111 +1,111 @@ gEasyChatGroupWords_Status: @ 83DC152 - .string "DARK$" - .string "STENCH$" - .string "THICK FAT$" - .string "RAIN DISH$" - .string "DRIZZLE$" - .string "ARENA TRAP$" - .string "INTIMIDATE$" - .string "ROCK HEAD$" - .string "COLOR$" - .string "ALT. COLOR$" - .string "ROCK$" - .string "BEAUTIFUL$" - .string "BEAUTY$" - .string "AIR LOCK$" - .string "PSYCHIC$" - .string "HYPER CUTTER$" - .string "FIGHTING$" - .string "SHADOW TAG$" - .string "SMART$" - .string "SMARTNESS$" - .string "SPEED BOOST$" + .string "UNLICHT$" + .string "DUFTNOTE$" + .string "SPECKSCHICHT$" + .string "REGENGENUSS$" + .string "NIESEL$" + .string "AUSWEGLOS$" + .string "BEDROHER$" + .string "STEINHAUPT$" + .string "FARBE$" + .string "ALT. FARBE$" + .string "GESTEIN$" + .string "SCHÖN$" + .string "SCHÖNHEIT$" + .string "KLIMASCHUTZ$" + .string "PSYCHO$" + .string "SCHERENMACHT$" + .string "KAMPF$" + .string "WEGSPERRE$" + .string "KLUG$" + .string "KLUGHEIT$" + .string "TEMPOSCHUB$" .string "COOL$" .string "COOLNESS$" - .string "BATTLE ARMOR$" - .string "CUTE$" - .string "CUTENESS$" - .string "STURDY$" - .string "SUCTION CUPS$" - .string "GRASS$" - .string "CLEAR BODY$" - .string "TORRENT$" - .string "GHOST$" - .string "ICE$" - .string "GUTS$" - .string "ROUGH SKIN$" - .string "SHELL ARMOR$" - .string "NATURAL CURE$" - .string "DAMP$" - .string "GROUND$" - .string "LIMBER$" - .string "MAGNET PULL$" - .string "WHITE SMOKE$" - .string "SYNCHRONIZE$" - .string "OVERGROW$" - .string "SWIFT SWIM$" - .string "SAND STREAM$" - .string "SAND VEIL$" - .string "KEEN EYE$" - .string "INNERFOCUS$" - .string "STATIC$" - .string "TYPE$" - .string "TOUGH$" - .string "TOUGHNESS$" - .string "SHED SKIN$" - .string "HUGE POWER$" - .string "VOLT ABSORB$" - .string "WATER ABSORB$" - .string "ELECTRIC$" - .string "FORECAST$" - .string "SERENE GRACE$" - .string "POISON$" - .string "POISON POINT$" - .string "DRAGON$" - .string "TRACE$" - .string "OBLIVIOUS$" - .string "TRUANT$" - .string "RUN AWAY$" - .string "STICKY HOLD$" - .string "CLOUD NINE$" + .string "KAMPFPANZER$" + .string "ANMUTIG$" + .string "ANMUT$" + .string "ROBUSTHEIT$" + .string "SAUGNAPF$" + .string "PFLANZE$" + .string "NEUTRALTORSO$" + .string "STURZBACH$" + .string "GEIST$" + .string "EIS$" + .string "ADRENALIN$" + .string "RAUHAUT$" + .string "PANZERHAUT$" + .string "INNERE KRAFT$" + .string "FEUCHTIGKEIT$" + .string "BODEN$" + .string "FLEXIBILITÄT$" + .string "MAGNETFALLE$" + .string "PULVERRAUCH$" + .string "SYNCHRO$" + .string "NOTDÜNGER$" + .string "WASSERTEMPO$" + .string "SANDSTURM$" + .string "SANDSCHLEIER$" + .string "ADLERAUGE$" + .string "KONZENTRATOR$" + .string "STATIK$" + .string "TYP$" + .string "STARK$" + .string "STÄRKE$" + .string "EXPIDERMIS$" + .string "KRAFTKOLOSS$" + .string "VOLTABSORBER$" + .string "H2O-ABSORBER$" + .string "ELEKTRO$" + .string "PROGNOSE$" + .string "EDELMUT$" + .string "GIFT$" + .string "GIFTDORN$" + .string "DRACHEN$" + .string "FÄHRTE$" + .string "DÖSIGKEIT$" + .string "SCHNARCHNASE$" + .string "ANGSTHASE$" + .string "WERTEHALTER$" + .string "WOLKE SIEBEN$" .string "NORMAL$" - .string "STEEL$" - .string "ILLUMINATE$" - .string "EARLY BIRD$" - .string "HUSTLE$" - .string "SHINE$" - .string "FLYING$" - .string "DROUGHT$" - .string "LIGHTNINGROD$" - .string "COMPOUNDEYES$" - .string "MARVEL SCALE$" - .string "WONDER GUARD$" + .string "STAHL$" + .string "ERLEUCHTUNG$" + .string "FRÜHWECKER$" + .string "ÜBEREIFER$" + .string "SCHEINEN$" + .string "FLIEGEN$" + .string "DÜRRE$" + .string "BLITZFÄNGER$" + .string "FACETTENAUGE$" + .string "NOTSCHUTZ$" + .string "WUNDERWACHE$" .string "INSOMNIA$" - .string "LEVITATE$" + .string "SCHWEBE$" .string "PLUS$" - .string "PRESSURE$" - .string "LIQUID OOZE$" - .string "COLOR CHANGE$" - .string "SOUNDPROOF$" - .string "EFFECT SPORE$" - .string "{PK}RS$" - .string "FIRE$" - .string "FLAME BODY$" + .string "ERZWINGER$" + .string "KLOAKENSOSSE$" + .string "FARBWECHSEL$" + .string "LÄRMSCHUTZ$" + .string "SPORENWIRT$" + .string "POKéRUS$" + .string "FEUER$" + .string "FLAMMKÖRPER$" .string "MINUS$" - .string "OWN TEMPO$" - .string "MAGMA ARMOR$" - .string "WATER$" - .string "WATER VEIL$" - .string "BUG$" - .string "SWARM$" - .string "CUTE CHARM$" - .string "IMMUNITY$" - .string "BLAZE$" - .string "PICKUP$" - .string "PATTERN$" - .string "FLASH FIRE$" - .string "VITAL SPIRIT$" + .string "TEMPOMACHER$" + .string "MAGMAPANZER$" + .string "WASSER$" + .string "AQUAHÜLLE$" + .string "KÄFER$" + .string "HEXAPLAGA$" + .string "CHARMEBOLZEN$" + .string "IMMUNITÄT$" + .string "GROSSBRAND$" + .string "MITNAHME$" + .string "MUSTER$" + .string "FEUERFÄNGER$" + .string "MUNTERKEIT$" .string "CHLOROPHYLL$" - .string "PURE POWER$" - .string "SHIELD DUST$" + .string "MENTALKRAFT$" + .string "PUDERABWEHR$" .string "$" diff --git a/data/text/easy_chat/groups/time/order.inc b/data/text/easy_chat/groups/time/order.inc index c8be7bc3b..5cf8225c5 100644 --- a/data/text/easy_chat/groups/time/order.inc +++ b/data/text/easy_chat/groups/time/order.inc @@ -2,47 +2,47 @@ gEasyChatGroupOrder_Time: @ 83DF802 .2byte 29 - .2byte 39 - .2byte 6 .2byte 18 .2byte 33 - .2byte 7 - .2byte 37 - .2byte 4 - .2byte 9 - .2byte 35 - .2byte 17 + .2byte 22 + .2byte 40 + .2byte 42 + .2byte 38 + .2byte 11 + .2byte 41 .2byte 10 - .2byte 0 - .2byte 27 - .2byte 20 .2byte 8 + .2byte 39 .2byte 14 + .2byte 17 + .2byte 34 + .2byte 12 + .2byte 0 + .2byte 13 + .2byte 6 + .2byte 5 + .2byte 26 .2byte 3 - .2byte 16 - .2byte 15 + .2byte 27 + .2byte 21 + .2byte 7 .2byte 24 + .2byte 15 .2byte 1 - .2byte 40 .2byte 28 .2byte 43 - .2byte 42 - .2byte 26 - .2byte 38 .2byte 30 - .2byte 5 - .2byte 22 - .2byte 34 - .2byte 23 - .2byte 25 + .2byte 20 .2byte 31 .2byte 32 - .2byte 41 - .2byte 19 - .2byte 13 + .2byte 16 + .2byte 23 + .2byte 25 + .2byte 4 + .2byte 9 + .2byte 35 + .2byte 37 .2byte 2 - .2byte 11 - .2byte 21 - .2byte 44 .2byte 36 - .2byte 12 + .2byte 44 + .2byte 19 diff --git a/data/text/easy_chat/groups/time/words.inc b/data/text/easy_chat/groups/time/words.inc index 4048d3714..43389bbc6 100644 --- a/data/text/easy_chat/groups/time/words.inc +++ b/data/text/easy_chat/groups/time/words.inc @@ -1,47 +1,47 @@ gEasyChatGroupWords_Time: @ 83DD72D - .string "FALL$" - .string "MORNING$" - .string "TOMORROW$" - .string "LAST$" - .string "DAY$" - .string "SOMETIME$" - .string "ALWAYS$" - .string "CURRENT$" - .string "FOREVER$" - .string "DAYS$" - .string "END$" - .string "TUESDAY$" - .string "YESTERDAY$" - .string "TODAY$" - .string "FRIDAY$" - .string "MONDAY$" - .string "LATER$" - .string "EARLIER$" - .string "ANOTHER$" - .string "TIME$" - .string "FINISH$" - .string "WEDNESDAY$" - .string "SOON$" + .string "HERBST$" + .string "MORGEN$" + .string "ÜBERMORGEN$" + .string "LETZTE(N)$" + .string "TAG$" + .string "IRGENDWANN$" + .string "IMMER$" + .string "MOMENTAN$" + .string "EWIG$" + .string "TAGE$" + .string "ENDE$" + .string "DIENSTAG$" + .string "GESTERN$" + .string "HEUTE$" + .string "FREITAG$" + .string "MONTAG$" + .string "SPÄTER$" + .string "FRÜHER$" + .string "AM ANDEREN$" + .string "ZEIT$" + .string "SCHLUSS$" + .string "MITTWOCH$" + .string "BALD$" .string "START$" - .string "MONTH$" - .string "STOP$" - .string "NOW$" - .string "FINAL$" - .string "NEXT$" - .string "AGE$" - .string "SATURDAY$" - .string "SUMMER$" - .string "SUNDAY$" - .string "BEGINNING$" - .string "SPRING$" - .string "DAYTIME$" + .string "MONAT$" + .string "STOPP$" + .string "JETZT$" + .string "LETZTER$" + .string "NÄCHSTES$" + .string "ALTER$" + .string "SAMSTAG$" + .string "SOMMER$" + .string "SONNTAG$" + .string "ANFANG$" + .string "FRÜHLING$" + .string "TAGESZEIT$" .string "WINTER$" - .string "DAILY$" - .string "OLDEN$" - .string "ALMOST$" - .string "NEARLY$" - .string "THURSDAY$" - .string "NIGHTTIME$" - .string "NIGHT$" - .string "WEEK$" + .string "TÄGLICH$" + .string "DAMALS$" + .string "FAST$" + .string "BEINAHE$" + .string "DONNERSTAG$" + .string "BETTZEIT$" + .string "NACHT$" + .string "WOCHE$" .string "$" diff --git a/data/text/easy_chat/groups/trainer/order.inc b/data/text/easy_chat/groups/trainer/order.inc index 4238e578a..98ef9a29e 100644 --- a/data/text/easy_chat/groups/trainer/order.inc +++ b/data/text/easy_chat/groups/trainer/order.inc @@ -1,22 +1,22 @@ .align 1 gEasyChatGroupOrder_Trainer: @ 83DF1A4 + .2byte 15 .2byte 7 + .2byte 0 .2byte 8 - .2byte 5 .2byte 4 - .2byte 15 + .2byte 5 + .2byte 10 .2byte 1 - .2byte 0 .2byte 18 .2byte 9 - .2byte 6 .2byte 16 .2byte 14 .2byte 13 .2byte 17 .2byte 3 - .2byte 10 .2byte 2 .2byte 11 .2byte 12 + .2byte 6 diff --git a/data/text/easy_chat/groups/trainer/words.inc b/data/text/easy_chat/groups/trainer/words.inc index 8a1a40c76..93f862f20 100644 --- a/data/text/easy_chat/groups/trainer/words.inc +++ b/data/text/easy_chat/groups/trainer/words.inc @@ -1,21 +1,21 @@ -gEasyChatGroupWords_Trainer: @ 83DC0C0 - .string "I CHOOSE YOU$" - .string "GOTCHA$" - .string "TRADE$" - .string "SAPPHIRE$" - .string "EVOLVE$" - .string "ENCYCLOPEDIA$" - .string "NATURE$" +gEasyChatGroupWords_Trainer: + .string "DU BIST DRAN$" + .string "HAB DICH$" + .string "TAUSCH$" + .string "SAPHIR$" + .string "ENTWICKELN$" + .string "ENZYKLOPÄDIE$" + .string "WESEN$" .string "CENTER$" - .string "EGG$" + .string "EI$" .string "LINK$" - .string "SP. ABILITY$" + .string "FÄHIGKEIT$" .string "TRAINER$" .string "VERSION$" .string "POKéNAV$" .string "POKéMON$" - .string "GET$" + .string "BEKOMMEN$" .string "POKéDEX$" - .string "RUBY$" + .string "RUBIN$" .string "LEVEL$" .string "$" diff --git a/data/text/easy_chat/groups/trendy_saying/order.inc b/data/text/easy_chat/groups/trendy_saying/order.inc index 5b4cd031a..4ba916489 100644 --- a/data/text/easy_chat/groups/trendy_saying/order.inc +++ b/data/text/easy_chat/groups/trendy_saying/order.inc @@ -1,36 +1,36 @@ .align 1 gEasyChatGroupOrder_TrendySaying: @ 83DFBDA - .2byte 7 + .2byte 32 + .2byte 24 .2byte 2 + .2byte 1 .2byte 28 - .2byte 22 - .2byte 9 - .2byte 3 - .2byte 8 - .2byte 26 + .2byte 17 + .2byte 19 .2byte 11 + .2byte 27 .2byte 15 - .2byte 24 - .2byte 29 + .2byte 7 .2byte 16 - .2byte 12 + .2byte 29 + .2byte 4 + .2byte 5 + .2byte 31 + .2byte 8 + .2byte 26 + .2byte 25 .2byte 23 - .2byte 0 .2byte 13 - .2byte 14 .2byte 6 .2byte 20 - .2byte 4 - .2byte 10 + .2byte 9 .2byte 30 + .2byte 10 .2byte 18 - .2byte 17 .2byte 21 - .2byte 32 - .2byte 19 - .2byte 27 - .2byte 25 - .2byte 5 - .2byte 1 - .2byte 31 + .2byte 12 + .2byte 22 + .2byte 0 + .2byte 3 + .2byte 14 diff --git a/data/text/easy_chat/groups/trendy_saying/words.inc b/data/text/easy_chat/groups/trendy_saying/words.inc index d69a5213c..dbe6ff4da 100644 --- a/data/text/easy_chat/groups/trendy_saying/words.inc +++ b/data/text/easy_chat/groups/trendy_saying/words.inc @@ -1,35 +1,35 @@ gEasyChatGroupWords_TrendySaying: @ 83DDDF2 - .string "KTHX, BYE.$" - .string "YES, SIR!$" - .string "AVANT GARDE$" - .string "COUPLE$" - .string "MUCH OBLIGED$" - .string "YEEHAW!$" + .string "VOKUHILA$" + .string "AYE, AYE!$" + .string "AVANTGARDE$" + .string "YUPPIES$" + .string "IHR DIENER!$" + .string "JIIHAAH$" .string "MEGA$" - .string "1-HIT KO!$" - .string "DESTINY$" - .string "CANCEL$" - .string "NEW$" - .string "FLATTEN$" - .string "KIDDING$" + .string "GUMMIPUNKT$" + .string "KARMA$" + .string "NDW$" + .string "POPPER$" + .string "ERDBEERTEE$" + .string "SCHOFEL$" .string "LOSER$" - .string "LOSING$" - .string "HAPPENING$" - .string "HIP AND$" - .string "SHAKE$" - .string "SHADY$" - .string "UPBEAT$" + .string "ZOFF$" + .string "GIMMICK$" + .string "HIP UND$" + .string "BANANENSHAKE$" + .string "ROCK’N’ROLL$" + .string "DUFTE$" .string "MODERN$" - .string "SMELL YA$" - .string "BANG$" - .string "KNOCKOUT$" - .string "HASSLE$" - .string "WINNER$" - .string "FEVER$" - .string "WANNABE$" + .string "RÜBENNASE$" + .string "STULPEN$" + .string "LICHT AUS...$" + .string "AUFSTAND$" + .string "LEUCHTKEKS$" + .string "KÖRPERHITZE$" + .string "GERNEGROSS$" .string "BABY$" - .string "HEART$" - .string "OLD$" - .string "YOUNG$" - .string "UGLY$" + .string "HOLDE$" + .string "OLL$" + .string "JUNG$" + .string "ÄTZEND$" .string "$" diff --git a/data/text/easy_chat/groups/voices/order.inc b/data/text/easy_chat/groups/voices/order.inc index 563abcb09..f8ab2dac7 100644 --- a/data/text/easy_chat/groups/voices/order.inc +++ b/data/text/easy_chat/groups/voices/order.inc @@ -10,57 +10,57 @@ gEasyChatGroupOrder_Voices: @ 83DF40C .2byte 6 .2byte 3 .2byte 2 - .2byte 23 + .2byte 52 .2byte 11 .2byte 41 - .2byte 52 - .2byte 59 - .2byte 22 - .2byte 25 - .2byte 32 - .2byte 24 - .2byte 26 + .2byte 14 + .2byte 35 + .2byte 44 + .2byte 56 .2byte 43 - .2byte 19 + .2byte 31 .2byte 33 .2byte 61 .2byte 34 .2byte 38 + .2byte 24 + .2byte 37 .2byte 40 + .2byte 26 .2byte 48 - .2byte 37 .2byte 47 + .2byte 53 .2byte 42 .2byte 15 - .2byte 49 .2byte 46 + .2byte 49 + .2byte 30 + .2byte 32 + .2byte 58 + .2byte 39 + .2byte 60 + .2byte 19 .2byte 57 - .2byte 44 + .2byte 51 .2byte 54 - .2byte 53 .2byte 13 .2byte 29 - .2byte 51 + .2byte 9 .2byte 28 - .2byte 55 .2byte 12 .2byte 27 - .2byte 56 - .2byte 30 - .2byte 31 - .2byte 20 + .2byte 55 + .2byte 16 .2byte 45 + .2byte 23 + .2byte 25 + .2byte 22 + .2byte 20 .2byte 36 + .2byte 59 .2byte 50 - .2byte 9 .2byte 21 - .2byte 14 .2byte 10 .2byte 62 - .2byte 35 - .2byte 16 - .2byte 18 - .2byte 60 .2byte 17 - .2byte 58 - .2byte 39 + .2byte 18 diff --git a/data/text/easy_chat/groups/voices/words.inc b/data/text/easy_chat/groups/voices/words.inc index 1dde075b9..65341a6b9 100644 --- a/data/text/easy_chat/groups/voices/words.inc +++ b/data/text/easy_chat/groups/voices/words.inc @@ -1,6 +1,6 @@ gEasyChatGroupWords_Voices: @ 83DCA20 .string "!$" - .string "!!$" + .string "!!!$" .string "?!$" .string "?$" .string "…$" @@ -8,58 +8,58 @@ gEasyChatGroupWords_Voices: @ 83DCA20 .string "………$" .string "-$" .string "- - -$" - .string "UH-OH$" + .string "OH OH$" .string "WAAAH$" - .string "AHAHA$" + .string "AHAHAHA$" .string "OH?$" - .string "NOPE$" - .string "URGH$" + .string "NÖ$" + .string "ARGH$" .string "HMM$" - .string "WHOAH$" - .string "WROOOAAR!$" + .string "OOOH$" + .string "WOOOAR$" .string "WOW$" - .string "GIGGLE$" - .string "SIGH$" - .string "UNBELIEVABLE$" - .string "CRIES$" - .string "AGREE$" - .string "EH?$" - .string "CRY$" - .string "EHEHE$" - .string "OI, OI, OI$" + .string "KICHER$" + .string "SEUFZ$" + .string "UNGLAUBLICH$" + .string "SCHREIT$" + .string "RICHTIG!$" + .string "HÄH?$" + .string "SCHREI$" + .string "HÄHÄHÄ$" + .string "OJE OJE$" .string "OH, YEAH$" .string "OH$" - .string "OOPS$" - .string "SHOCKED$" - .string "EEK$" + .string "HUPS$" + .string "GESCHOCKT$" + .string "IGITT$" .string "GRAAAH$" .string "GWAHAHAHA$" - .string "WAY$" - .string "TCH$" - .string "HEHE$" + .string "ART$" + .string "TSE$" + .string "HÄHÄ$" .string "HAH$" - .string "YUP$" + .string "JAJAJA$" .string "HAHAHA$" .string "AIYEEH$" .string "HIYAH$" - .string "FUFUFU$" - .string "LOL$" - .string "SNORT$" - .string "HUMPH$" + .string "FÖFÖFÖ$" + .string "BRÜLL LACH$" + .string "PRUST$" + .string "HMPF$" .string "HEHEHE$" .string "HEH$" .string "HOHOHO$" - .string "UH-HUH$" - .string "OH, DEAR$" - .string "ARRGH$" - .string "MUFUFU$" - .string "MMM$" - .string "OH-KAY$" + .string "UI UI$" + .string "MEINE GÜTE$" + .string "AARRGH$" + .string "HIHIHI$" + .string "MMMH$" .string "OKAY$" + .string "DURCHSCHNITT$" .string "LALALA$" - .string "YAY$" - .string "AWW$" - .string "WOWEE$" - .string "GWAH$" + .string "JAHA$" + .string "UFF$" + .string "JUCHEE$" + .string "GRRR$" .string "WAHAHAHA$" .string "$" diff --git a/data/text/easy_chat/words_by_letter.inc b/data/text/easy_chat/words_by_letter.inc index 3c7f5bafc..4850009bb 100644 --- a/data/text/easy_chat/words_by_letter.inc +++ b/data/text/easy_chat/words_by_letter.inc @@ -8,575 +8,573 @@ gEasyChatWordsByLetter_Others: .2byte EC_WORD_ELLIPSIS .2byte EC_WORD_ELLIPSIS_EXCL .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte EC_WORD_1_HIT_KO_EXCL .2byte EC_WORD_QUES .2byte EC_WORD_QUES_EXCL gEasyChatWordsByLetter_A: - .2byte EC_WORD_A - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_A_LOT - .2byte EC_WORD_A_TINY_BIT - .2byte EC_WORD_ABOUT - .2byte EC_WORD_ABOVE + .2byte EC_POKEMON(HUNTAIL) + .2byte EC_WORD_ARRGH + .2byte EC_WORD_ADVENTURE + .2byte EC_WORD_BUT + .2byte EC_MOVE2(DESTINY_BOND) + .2byte EC_MOVE2(PERISH_SONG) + .2byte EC_WORD_REJECT + .2byte EC_WORD_DISLIKES ec_duplicates 2 .2byte EC_POKEMON(ABRA) .2byte EC_POKEMON2(ABRA) - .2byte EC_WORD_ABSENT + .2byte EC_MOVE2(KNOCK_OFF) .2byte EC_POKEMON(ABSOL) - .2byte EC_WORD_ABSOLUTELY .2byte EC_MOVE(ABSORB) - .2byte EC_WORD_ACCEPT - .2byte EC_MOVE2(ACID) - .2byte EC_MOVE2(ACID_ARMOR) - .2byte EC_WORD_ADORE - .2byte EC_WORD_ADULT - .2byte EC_WORD_ADVENTURE + .2byte EC_WORD_PREPOSTEROUS + .2byte EC_WORD_ABSENT + .2byte EC_WORD_COME_OVER + .2byte EC_WORD_KEEN_EYE + .2byte EC_WORD_GUTS .2byte EC_MOVE2(AERIAL_ACE) - .2byte EC_MOVE(AEROBLAST) .2byte EC_POKEMON2(AERODACTYL) - .2byte EC_WORD_AFTER - .2byte EC_WORD_AGE - .2byte EC_POKEMON(AGGRON) .2byte EC_MOVE(AGILITY) - .2byte EC_WORD_AGREE + .2byte EC_WORD_UM .2byte EC_WORD_AHAHA - .2byte EC_WORD_AIM - .2byte EC_POKEMON2(AIPOM) - .2byte EC_MOVE(AIR_CUTTER) - .2byte EC_WORD_AIR_LOCK + .2byte EC_WORD_LIKE .2byte EC_WORD_AIYEEH - ec_duplicates 2 - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(ALAKAZAM) + .2byte EC_WORD_ACCEPT .2byte EC_WORD_ALL - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_ALLOW - .2byte EC_WORD_ALLOWANCE - .2byte EC_WORD_ALLY - .2byte EC_WORD_ALMOST .2byte EC_WORD_ALONE + .2byte EC_WORD_EVERY + .2byte EC_POKEMON2(HAUNTER) + .2byte EC_WORD_THAN + .2byte EC_WORD_AS_IF .2byte EC_WORD_ALSO .2byte EC_WORD_ALT_COLOR .2byte EC_POKEMON(ALTARIA) - .2byte EC_WORD_ALTHOUGH - .2byte EC_WORD_ALWAYS - .2byte EC_WORD_AM + .2byte EC_WORD_AGE + .2byte EC_WORD_ANOTHER .2byte EC_MOVE2(AMNESIA) + .2byte EC_POKEMON2(OMANYTE) + .2byte EC_POKEMON2(OMASTAR) + .2byte EC_MOVE(SIGNAL_BEAM) .2byte EC_POKEMON2(AMPHAROS) .2byte EC_WORD_AMUSING - .2byte EC_WORD_AN - .2byte EC_MOVE(ANCIENT_POWER) - .2byte EC_WORD_AND - .2byte EC_WORD_ANGER - .2byte EC_WORD_ANGERS - .2byte EC_WORD_ANGRY + .2byte EC_WORD_ON + .2byte EC_WORD_OTHER + .2byte EC_WORD_ELSE + .2byte EC_WORD_BEGINNING + .2byte EC_WORD_BRAG + .2byte EC_MOVE(SWAGGER) + .2byte EC_WORD_FISHING + .2byte EC_WORD_ATTACK + .2byte EC_WORD_WIMPY + .2byte EC_WORD_RUN_AWAY .2byte EC_WORD_ANIME + .2byte EC_WORD_CUTENESS + .2byte EC_WORD_CUTE .2byte EC_POKEMON(ANORITH) - .2byte EC_WORD_ANOTHER - .2byte EC_WORD_ANTICIPATION - .2byte EC_WORD_ANY - .2byte EC_WORD_ANYWHERE - .2byte EC_WORD_APOLOGIZE - .2byte EC_WORD_APPEAL - .2byte EC_WORD_APPEAR - .2byte EC_WORD_APPEARS - .2byte EC_WORD_APPRECIATE - .2byte EC_WORD_APPROVED + .2byte EC_MOVE(ANCIENT_POWER) + .2byte EC_MOVE2(ATTRACT) + .2byte EC_WORD_WATER_VEIL + .2byte EC_MOVE2(WATER_GUN) + .2byte EC_POKEMON2(VAPOREON) + .2byte EC_MOVE2(WATER_PULSE) + .2byte EC_WORD_WORK + .2byte EC_WORD_WORKING .2byte EC_POKEMON2(ARBOK) - .2byte EC_POKEMON2(ARCANINE) - .2byte EC_WORD_ARE - .2byte EC_WORD_AREN_T - .2byte EC_WORD_ARENA_TRAP + .2byte EC_WORD_ANGERS + .2byte EC_WORD_URGH .2byte EC_POKEMON2(ARIADOS) - .2byte EC_MOVE2(ARM_THRUST) + .2byte EC_POKEMON2(ARCANINE) + .2byte EC_POKEMON2(ARTICUNO) .2byte EC_POKEMON(ARMALDO) + .2byte EC_MOVE2(ARM_THRUST) .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_POKEMON(ARON) - .2byte EC_WORD_AROUND - .2byte EC_WORD_ARRGH - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_WORD_AS - .2byte EC_WORD_AS_IF - .2byte EC_WORD_AS_MUCH_AS - .2byte EC_MOVE2(ASSIST) - .2byte EC_MOVE(ASTONISH) - .2byte EC_WORD_AT - .2byte EC_WORD_ATTACK - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_AUNT + .2byte EC_WORD_WAY + .2byte EC_WORD_MOVE + .2byte EC_WORD_UGLY + .2byte EC_WORD_OI + .2byte EC_WORD_TOO + .2byte EC_WORD_OUT + .2byte EC_MOVE2(RECYCLE) + .2byte EC_WORD_GIVE_UP + .2byte EC_MOVE(UPROAR) + .2byte EC_WORD_HASSLE + .2byte EC_WORD_WAKE_UP .2byte EC_MOVE(AURORA_BEAM) + .2byte EC_WORD_OFF + .2byte EC_MOVE(ENDURE) + .2byte EC_WORD_APPEAL + .2byte EC_WORD_LOOK + .2byte EC_WORD_OUTSIDE + .2byte EC_MOVE(DISABLE) + .2byte EC_POKEMON2(CLOYSTER) + .2byte EC_WORD_ARENA_TRAP .2byte EC_WORD_AVANT_GARDE - .2byte EC_WORD_AWAY - .2byte EC_WORD_AWESOME - .2byte EC_WORD_AWFUL - .2byte EC_WORD_AWFULLY - .2byte EC_WORD_AWW + .2byte EC_WORD_YES_SIR_EXCL ec_duplicates 2 .2byte EC_POKEMON(AZUMARILL) .2byte EC_POKEMON2(AZUMARILL) .2byte EC_POKEMON(AZURILL) gEasyChatWordsByLetter_B: - .2byte EC_WORD_BABE .2byte EC_WORD_BABY - .2byte EC_WORD_BACK - .2byte EC_WORD_BAD - .2byte EC_WORD_BADLY - .2byte EC_POKEMON(BAGON) + .2byte EC_WORD_STAY_AT_HOME + .2byte EC_WORD_BATH + .2byte EC_WORD_SOON + .2byte EC_POKEMON2(QWILFISH) .2byte EC_WORD_BALL - .2byte EC_POKEMON(BALTOY) + .2byte EC_WORD_SHAKE + .2byte EC_WORD_RIBBON .2byte EC_POKEMON(BANETTE) - .2byte EC_WORD_BANG - .2byte EC_POKEMON(BARBOACH) - .2byte EC_MOVE2(BARRAGE) .2byte EC_MOVE2(BARRIER) - .2byte EC_WORD_BATH - .2byte EC_MOVE2(BATON_PASS) - .2byte EC_WORD_BATTLE - .2byte EC_WORD_BATTLE_ARMOR - .2byte EC_WORD_BATTLE_ROOM - .2byte EC_WORD_BATTLE_TOWER - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_BE - .2byte EC_WORD_BEAT - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_POKEMON(BEAUTIFLY) - .2byte EC_WORD_BEAUTIFUL - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_BECOMES - .2byte EC_POKEMON2(BEEDRILL) - .2byte EC_WORD_BEEN - .2byte EC_WORD_BEFORE - .2byte EC_WORD_BEGINNING - .2byte EC_WORD_BEING - .2byte EC_POKEMON(BELDUM) - .2byte EC_WORD_BELIEVE - ec_duplicates 2 - .2byte EC_POKEMON(BELLOSSOM) - .2byte EC_POKEMON2(BELLOSSOM) - .2byte EC_POKEMON2(BELLSPROUT) + .2byte EC_POKEMON(FEEBAS) .2byte EC_MOVE2(BELLY_DRUM) - .2byte EC_WORD_BELONGS_TO - .2byte EC_WORD_BELOW + .2byte EC_MOVE2(COTTON_SPORE) + .2byte EC_WORD_INTIMIDATE .2byte EC_WORD_BERRY - .2byte EC_WORD_BESIDE - .2byte EC_WORD_BEST + .2byte EC_WORD_EXCITE + .2byte EC_MOVE2(IMPRISON) + .2byte EC_WORD_AT + .2byte EC_WORD_NEARLY + .2byte EC_WORD_GET + .2byte EC_WORD_GETS + .2byte EC_WORD_RESUSCITATE + .2byte EC_WORD_READY + .2byte EC_WORD_BUSY + .2byte EC_WORD_VIEWING + .2byte EC_WORD_FAINT + .2byte EC_WORD_DEFEATED + .2byte EC_WORD_OWN .2byte EC_WORD_BETTER - .2byte EC_MOVE(BIDE) - .2byte EC_WORD_BIG - .2byte EC_WORD_BIKE - .2byte EC_MOVE(BIND) + .2byte EC_WORD_BEST + .2byte EC_WORD_NIGHTTIME + .2byte EC_MOVE2(COVET) + .2byte EC_POKEMON2(BEEDRILL) + .2byte EC_WORD_UNTIL + .2byte EC_WORD_MEET_YOU + .2byte EC_WORD_SEE_YA + .2byte EC_POKEMON2(VENUSAUR) + .2byte EC_POKEMON2(IVYSAUR) + .2byte EC_POKEMON2(BULBASAUR) .2byte EC_MOVE(BITE) - .2byte EC_POKEMON2(BLASTOISE) - .2byte EC_WORD_BLAZE - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_POKEMON(BLAZIKEN) - .2byte EC_WORD_BLEND - .2byte EC_POKEMON2(BLISSEY) + .2byte EC_WORD_ARE + .2byte EC_WORD_PLEASE + .2byte EC_MOVE2(SWEET_KISS) + .2byte EC_POKEMON(NUZLEAF) + .2byte EC_MOVE2(PETAL_DANCE) + .2byte EC_MOVE2(FLASH) + .2byte EC_POKEMON2(JOLTEON) + .2byte EC_WORD_LIGHTNINGROD + .2byte EC_MOVE2(ZAP_CANNON) .2byte EC_MOVE2(BLIZZARD) - .2byte EC_MOVE2(BLOCK) - .2byte EC_WORD_BOARD - .2byte EC_MOVE2(BODY_SLAM) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_WORD_BOOK - .2byte EC_WORD_BORED - .2byte EC_WORD_BORING - .2byte EC_MOVE2(BOUNCE) - .2byte EC_WORD_BOY - .2byte EC_WORD_BRAG - .2byte EC_WORD_BREAK - .2byte EC_POKEMON(BRELOOM) - .2byte EC_MOVE(BRICK_BREAK) - .2byte EC_WORD_BROTHER + .2byte EC_WORD_NITWIT + .2byte EC_WORD_JUST .2byte EC_MOVE(BUBBLE) .2byte EC_MOVE2(BUBBLE_BEAM) - .2byte EC_WORD_BUG - .2byte EC_POKEMON2(BULBASAUR) - .2byte EC_MOVE2(BULK_UP) - .2byte EC_MOVE2(BULLET_SEED) - .2byte EC_WORD_BUSY - .2byte EC_WORD_BUT - .2byte EC_POKEMON2(BUTTERFREE) - .2byte EC_WORD_BYE_BYE + ec_duplicates 2 + .2byte EC_POKEMON(BELLOSSOM) + .2byte EC_POKEMON2(BELLOSSOM) + .2byte EC_WORD_FLOWERS + .2byte EC_MOVE(LEECH_LIFE) + .2byte EC_POKEMON2(VENONAT) + .2byte EC_WORD_GROUND + .2byte EC_MOVE2(TAKE_DOWN) + .2byte EC_MOVE(SAFEGUARD) + .2byte EC_MOVE2(BODY_SLAM) + .2byte EC_MOVE2(DRILL_PECK) + .2byte EC_POKEMON2(DELIBIRD) + .2byte EC_WORD_NEED + .2byte EC_WORD_BOARD + .2byte EC_WORD_LETTER + .2byte EC_WORD_BROTHER + .2byte EC_WORD_LOL + .2byte EC_MOVE2(ROAR) + .2byte EC_POKEMON(SALAMENCE) + .2byte EC_WORD_BOOK + .2byte EC_WORD_STAGE + .2byte EC_POKEMON(SLAKOTH) gEasyChatWordsByLetter_C: - .2byte EC_POKEMON(CACNEA) - .2byte EC_POKEMON(CACTURNE) - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_CAME - .2byte EC_WORD_CAMERA + .2byte EC_POKEMON(NUMEL) .2byte EC_POKEMON(CAMERUPT) - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_CAN - .2byte EC_WORD_CAN_WIN - .2byte EC_WORD_CAN_T - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_CANCEL - .2byte EC_WORD_CAPABLE - .2byte EC_WORD_CARDS - .2byte EC_WORD_CARE - .2byte EC_WORD_CARES - .2byte EC_POKEMON(CARVANHA) - .2byte EC_POKEMON(CASCOON) - .2byte EC_WORD_CASE - .2byte EC_POKEMON(CASTFORM) - .2byte EC_POKEMON2(CATERPIE) - .2byte EC_WORD_CAUSE .2byte EC_POKEMON2(CELEBI) .2byte EC_WORD_CENTER - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_CHANGE - .2byte EC_WORD_CHANNEL .2byte EC_POKEMON2(CHANSEY) - .2byte EC_MOVE(CHARGE) - .2byte EC_POKEMON2(CHARIZARD) .2byte EC_MOVE(CHARM) - .2byte EC_POKEMON2(CHARMANDER) - .2byte EC_POKEMON2(CHARMELEON) - .2byte EC_WORD_CHAT - .2byte EC_POKEMON2(CHIKORITA) - .2byte EC_WORD_CHILD_S_PLAY - .2byte EC_WORD_CHILDREN - .2byte EC_POKEMON(CHIMECHO) - ec_duplicates 2 - .2byte EC_POKEMON(CHINCHOU) - .2byte EC_POKEMON2(CHINCHOU) + .2byte EC_WORD_CUTE_CHARM .2byte EC_WORD_CHLOROPHYLL - .2byte EC_WORD_CHOICE - .2byte EC_WORD_CHOOSE - .2byte EC_WORD_CHORES - .2byte EC_MOVE(CLAMP) - .2byte EC_POKEMON(CLAMPERL) - .2byte EC_WORD_CLASS - .2byte EC_POKEMON(CLAYDOL) - .2byte EC_WORD_CLEAR_BODY - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_POKEMON2(CLEFFA) - .2byte EC_WORD_CLOSE - .2byte EC_WORD_CLOUD_NINE - .2byte EC_POKEMON2(CLOYSTER) - .2byte EC_WORD_COLD - .2byte EC_WORD_COLLECT - .2byte EC_WORD_COLLECTION - .2byte EC_WORD_COLOR - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_WORD_COME - .2byte EC_WORD_COME_ON - .2byte EC_WORD_COME_OVER - .2byte EC_MOVE2(COMET_PUNCH) .2byte EC_WORD_COMICS - .2byte EC_WORD_COMMEMORATE - .2byte EC_WORD_COMPLETE - .2byte EC_WORD_COMPOUNDEYES - .2byte EC_WORD_CONCEDE - .2byte EC_MOVE(CONFUSE_RAY) - .2byte EC_WORD_CONFUSED - .2byte EC_MOVE2(CONFUSION) - .2byte EC_WORD_CONGRATS - .2byte EC_MOVE(CONSTRICT) - .2byte EC_WORD_CONTEST - .2byte EC_WORD_CONVERSATION - .2byte EC_MOVE2(CONVERSION) - .2byte EC_MOVE2(CONVERSION_2) .2byte EC_WORD_COOL .2byte EC_WORD_COOLNESS - .2byte EC_POKEMON(CORPHISH) - .2byte EC_WORD_CORRECT ec_duplicates 2 .2byte EC_POKEMON(CORSOLA) .2byte EC_POKEMON2(CORSOLA) - .2byte EC_MOVE(COSMIC_POWER) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_COULD - .2byte EC_WORD_COULDN_T - .2byte EC_WORD_COUNT_ON - .2byte EC_MOVE(COUNTER) - .2byte EC_WORD_COUPLE - .2byte EC_MOVE2(COVET) - .2byte EC_MOVE(CRABHAMMER) - .2byte EC_POKEMON(CRADILY) - .2byte EC_POKEMON(CRAWDAUNT) - .2byte EC_WORD_CRIES - ec_duplicates 2 - .2byte EC_POKEMON(CROBAT) - .2byte EC_POKEMON2(CROBAT) - .2byte EC_POKEMON2(CROCONAW) - .2byte EC_MOVE(CROSS_CHOP) - .2byte EC_MOVE(CRUNCH) - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_WORD_CRY - .2byte EC_POKEMON2(CUBONE) - .2byte EC_WORD_CURRENT - .2byte EC_MOVE2(CURSE) - .2byte EC_MOVE(CUT) - .2byte EC_WORD_CUTE - .2byte EC_WORD_CUTE_CHARM - .2byte EC_WORD_CUTENESS - .2byte EC_POKEMON2(CYNDAQUIL) gEasyChatWordsByLetter_D: - .2byte EC_WORD_DAILY - .2byte EC_WORD_DAMP - .2byte EC_WORD_DANCE - .2byte EC_WORD_DANGER - .2byte EC_WORD_DARK - .2byte EC_WORD_DARN - .2byte EC_WORD_DATE - .2byte EC_WORD_DAUGHTER - .2byte EC_WORD_DAY - .2byte EC_WORD_DAYS - .2byte EC_WORD_DAYTIME - .2byte EC_WORD_DECIDE - .2byte EC_WORD_DECIDED - .2byte EC_WORD_DEEP - .2byte EC_WORD_DEFEATED - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_POKEMON(DELCATTY) - .2byte EC_POKEMON2(DELIBIRD) + .2byte EC_WORD_THERE + .2byte EC_WORD_OLDEN + .2byte EC_WORD_LADY + .2byte EC_POKEMON2(STANTLER) + .2byte EC_WORD_MISS + .2byte EC_WORD_THANKS + .2byte EC_WORD_THANK_YOU + .2byte EC_WORD_THAT + .2byte EC_WORD_IT_S + .2byte EC_WORD_THIS_IS_IT_EXCL + .2byte EC_WORD_THAT_S_IT_EXCL + .2byte EC_WORD_AM + .2byte EC_WORD_THAT_WAS + .2byte EC_MOVE2(FEATHER_DANCE) + .2byte EC_WORD_SON + .2byte EC_WORD_YOURS + .2byte EC_WORD_YOUR + .2byte EC_MOVE2(SUBSTITUTE) + .2byte EC_WORD_MODE + .2byte EC_WORD_THINKS .2byte EC_POKEMON(DEOXYS) - .2byte EC_WORD_DEPT_STORE + .2byte EC_WORD_THE + .2byte EC_WORD_DISASTER .2byte EC_WORD_DESIGN - .2byte EC_WORD_DESTINY - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_WORD_DESTROYED - .2byte EC_MOVE2(DETECT) - .2byte EC_POKEMON2(DEWGONG) - .2byte EC_WORD_DID - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_DIET - .2byte EC_WORD_DIFFERENT - .2byte EC_MOVE(DIG) - .2byte EC_WORD_DIGITAL + .2byte EC_POKEMON2(TYRANITAR) + .2byte EC_WORD_BABE + .2byte EC_WORD_ABSOLUTELY + .2byte EC_WORD_TUESDAY + .2byte EC_WORD_THIS + .2byte EC_WORD_THESE + .2byte EC_WORD_THESE_WERE .2byte EC_POKEMON2(DIGLETT) - .2byte EC_MOVE(DISABLE) - .2byte EC_WORD_DISAPPEAR - .2byte EC_WORD_DISAPPOINT - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_DISAPPOINTS - .2byte EC_WORD_DISASTER - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_DISLIKES + .2byte EC_POKEMON2(DUGTRIO) + .2byte EC_WORD_DIGITAL + .2byte EC_WORD_THING .2byte EC_POKEMON2(DITTO) - .2byte EC_MOVE2(DIVE) - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_WORD_DO - .2byte EC_WORD_DOCILE ec_duplicates 2 .2byte EC_POKEMON(DODRIO) .2byte EC_POKEMON2(DODRIO) ec_duplicates 2 .2byte EC_POKEMON(DODUO) .2byte EC_POKEMON2(DODUO) - .2byte EC_WORD_DOES - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_DON_T - .2byte EC_WORD_DONE + .2byte EC_MOVE(THUNDER) + .2byte EC_MOVE(THUNDERBOLT) + .2byte EC_MOVE(THUNDER_PUNCH) + .2byte EC_MOVE2(THUNDER_SHOCK) + .2byte EC_WORD_THURSDAY + .2byte EC_MOVE2(THUNDER_WAVE) ec_duplicates 2 .2byte EC_POKEMON(DONPHAN) .2byte EC_POKEMON2(DONPHAN) .2byte EC_MOVE2(DOUBLE_KICK) .2byte EC_MOVE(DOUBLE_TEAM) - .2byte EC_MOVE(DOUBLE_EDGE) - .2byte EC_MOVE(DOUBLE_SLAP) - .2byte EC_WORD_DOWN - .2byte EC_WORD_DOWNCAST + .2byte EC_MOVE2(SPIKE_CANNON) + .2byte EC_WORD_OBLIVIOUS .2byte EC_WORD_DRAGON .2byte EC_MOVE2(DRAGON_CLAW) .2byte EC_MOVE2(DRAGON_DANCE) .2byte EC_MOVE2(DRAGON_RAGE) .2byte EC_POKEMON2(DRAGONAIR) - .2byte EC_MOVE2(DRAGON_BREATH) .2byte EC_POKEMON2(DRAGONITE) + .2byte EC_POKEMON(SHELGON) .2byte EC_POKEMON2(DRATINI) - .2byte EC_WORD_DREAM - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_MOVE2(DRILL_PECK) - .2byte EC_WORD_DRINK - .2byte EC_WORD_DRINKS - .2byte EC_WORD_DRIZZLE - .2byte EC_WORD_DROOLING - .2byte EC_WORD_DROUGHT - .2byte EC_POKEMON2(DROWZEE) - .2byte EC_WORD_DUDE - .2byte EC_POKEMON2(DUGTRIO) + .2byte EC_MOVE2(TRIPLE_KICK) + .2byte EC_MOVE(FLAIL) + .2byte EC_WORD_YOU + .2byte EC_WORD_YOU_RE + .2byte EC_WORD_I_CHOOSE_YOU + .2byte EC_WORD_YOU_VE + .2byte EC_WORD_BATTLE_TOWER + ec_duplicates 2 + .2byte EC_POKEMON(GLOOM) + .2byte EC_POKEMON2(GLOOM) + .2byte EC_WORD_UPBEAT + .2byte EC_WORD_STENCH .2byte EC_POKEMON2(DUNSPARCE) - .2byte EC_POKEMON(DUSCLOPS) - .2byte EC_POKEMON(DUSKULL) - .2byte EC_POKEMON(DUSTOX) - .2byte EC_MOVE2(DYNAMIC_PUNCH) + .2byte EC_MOVE(HAZE) + .2byte EC_MOVE2(TWINEEDLE) + .2byte EC_MOVE(DOUBLE_SLAP) + .2byte EC_MOVE(BRICK_BREAK) + .2byte EC_WORD_OKAY + .2byte EC_WORD_DROUGHT gEasyChatWordsByLetter_E: - .2byte EC_WORD_EARLIER - .2byte EC_WORD_EARLY_BIRD - .2byte EC_MOVE(EARTHQUAKE) - .2byte EC_WORD_EASY - .2byte EC_WORD_EAT - .2byte EC_WORD_EATS - .2byte EC_WORD_EEK - .2byte EC_POKEMON2(EEVEE) - .2byte EC_WORD_EFFECT_SPORE + .2byte EC_WORD_SERENE_GRACE + .2byte EC_MOVE2(LEECH_SEED) + .2byte EC_WORD_RATHER + .2byte EC_WORD_REALLY .2byte EC_WORD_EGG .2byte EC_MOVE2(EGG_BOMB) - .2byte EC_WORD_EH_QUES - .2byte EC_WORD_EHEHE - .2byte EC_POKEMON2(EKANS) + .2byte EC_WORD_HURRIED + .2byte EC_WORD_A + .2byte EC_WORD_A_LITTLE + .2byte EC_WORD_AN + .2byte EC_WORD_OF + .2byte EC_WORD_SIMPLE + .2byte EC_MOVE2(DEFENSE_CURL) + .2byte EC_WORD_SHOPPING + .2byte EC_WORD_ONCE + .2byte EC_WORD_LONESOME + .2byte EC_WORD_ICE + .2byte EC_MOVE2(IRON_DEFENSE) + .2byte EC_MOVE(IRON_TAIL) + .2byte EC_MOVE(SHEER_COLD) + .2byte EC_MOVE2(ICE_PUNCH) + .2byte EC_MOVE2(ICE_BEAM) + .2byte EC_MOVE(ICY_WIND) + .2byte EC_POKEMON2(ELEKID) .2byte EC_POKEMON2(ELECTABUZZ) .2byte EC_WORD_ELECTRIC - .2byte EC_POKEMON(ELECTRIKE) - ec_duplicates 2 - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON2(ELEKID) - .2byte EC_WORD_ELSE - .2byte EC_MOVE2(EMBER) - .2byte EC_MOVE(ENCORE) - .2byte EC_WORD_ENCYCLOPEDIA + .2byte EC_WORD_PARENT + .2byte EC_WORD_RECOMMEND .2byte EC_WORD_END - .2byte EC_MOVE(ENDEAVOR) - .2byte EC_MOVE(ENDURE) - .2byte EC_WORD_ENJOY - .2byte EC_WORD_ENJOYS - .2byte EC_WORD_ENOUGH + .2byte EC_POKEMON2(CHIKORITA) + .2byte EC_WORD_FINALLY + .2byte EC_POKEMON(SKITTY) + .2byte EC_POKEMON(DELCATTY) + .2byte EC_MOVE(FOCUS_ENERGY) .2byte EC_POKEMON2(ENTEI) - .2byte EC_WORD_ENTERTAINING + .2byte EC_MOVE2(SPIT_UP) + .2byte EC_WORD_DOWNCAST + ec_duplicates 2 + .2byte EC_POKEMON(PSYDUCK) + .2byte EC_POKEMON2(PSYDUCK) + ec_duplicates 2 + .2byte EC_POKEMON(GOLDUCK) + .2byte EC_POKEMON2(GOLDUCK) + .2byte EC_WORD_DECIDE + .2byte EC_WORD_DECIDED + .2byte EC_WORD_EXCUSE_ME + .2byte EC_WORD_DISAPPOINTS + .2byte EC_WORD_DISAPPOINTED + .2byte EC_WORD_EVOLVE + .2byte EC_WORD_EVOLUTION + .2byte EC_WORD_ENCYCLOPEDIA + .2byte EC_WORD_HE + .2byte EC_WORD_HE_S + .2byte EC_MOVE(EARTHQUAKE) + .2byte EC_WORD_FLATTEN + .2byte EC_WORD_REFRESHING + .2byte EC_WORD_SURRENDER + .2byte EC_WORD_RECEIVED + .2byte EC_MOVE2(REST) + .2byte EC_WORD_ALLOW + .2byte EC_WORD_ILLUMINATE + .2byte EC_WORD_SERIOUSLY + .2byte EC_WORD_SERIOUS + .2byte EC_WORD_APPEAR + .2byte EC_WORD_APPEARS + .2byte EC_MOVE(ASTONISH) + .2byte EC_WORD_TAKE .2byte EC_MOVE2(ERUPTION) - .2byte EC_WORD_ESCAPE - .2byte EC_POKEMON2(ESPEON) - .2byte EC_WORD_EVEN_SO - .2byte EC_WORD_EVENT + .2byte EC_WORD_ADULT + .2byte EC_WORD_PRESSURE + .2byte EC_WORD_IT + .2byte EC_WORD_IS_IT_QUES + .2byte EC_WORD_EAT + .2byte EC_WORD_AROUND + .2byte EC_WORD_SOMETHING + .2byte EC_WORD_PLANS + .2byte EC_WORD_THEIR + .2byte EC_WORD_HERS .2byte EC_WORD_EVENTS - .2byte EC_WORD_EVER - .2byte EC_WORD_EVERY - .2byte EC_WORD_EVOLUTION - .2byte EC_WORD_EVOLVE - .2byte EC_WORD_EXCELLENT - .2byte EC_WORD_EXCESS - .2byte EC_WORD_EXCITE - .2byte EC_WORD_EXCITING - .2byte EC_WORD_EXCUSE - .2byte EC_WORD_EXCUSE_ME - .2byte EC_POKEMON2(EXEGGCUTE) - .2byte EC_POKEMON2(EXEGGUTOR) + .2byte EC_WORD_PROBABLY + .2byte EC_POKEMON2(EEVEE) + .2byte EC_WORD_FOREVER .2byte EC_WORD_EXISTS - .2byte EC_WORD_EXPENSIVE + .2byte EC_WORD_SHED_SKIN .2byte EC_MOVE2(EXPLOSION) - .2byte EC_POKEMON(EXPLOUD) - .2byte EC_MOVE(EXTRASENSORY) - .2byte EC_MOVE(EXTREME_SPEED) + .2byte EC_WORD_EXCELLENT gEasyChatWordsByLetter_F: .2byte EC_WORD_FABULOUS - .2byte EC_MOVE(FACADE) - .2byte EC_WORD_FAINT - .2byte EC_MOVE2(FAINT_ATTACK) - .2byte EC_WORD_FAINTED - .2byte EC_MOVE2(FAKE_OUT) - .2byte EC_MOVE(FAKE_TEARS) - .2byte EC_WORD_FALL - .2byte EC_MOVE2(FALSE_SWIPE) + .2byte EC_WORD_COMPOUNDEYES + .2byte EC_MOVE(STRING_SHOT) + .2byte EC_WORD_CAPABLE + .2byte EC_WORD_SP_ABILITY + .2byte EC_WORD_BIKE + .2byte EC_WORD_TRACE + .2byte EC_WORD_CASE .2byte EC_WORD_FAMILY .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_FAR - .2byte EC_POKEMON2(FARFETCHD) - .2byte EC_WORD_FASHION - .2byte EC_WORD_FAST - .2byte EC_WORD_FATHER - .2byte EC_WORD_FEAR - .2byte EC_POKEMON2(FEAROW) - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_POKEMON(FEEBAS) - .2byte EC_WORD_FEELING - .2byte EC_POKEMON2(FERALIGATR) + .2byte EC_WORD_COLOR + .2byte EC_POKEMON2(SMEARGLE) + .2byte EC_WORD_COLOR_CHANGE + .2byte EC_MOVE(FACADE) + .2byte EC_WORD_ALMOST + .2byte EC_MOVE2(ROLLING_KICK) + .2byte EC_WORD_MISTAKE + .2byte EC_WORD_LACKS + .2byte EC_WORD_GOOD + .2byte EC_WORD_OPPONENT + .2byte EC_POKEMON2(WOOPER) + .2byte EC_MOVE(ROCK_TOMB) + .2byte EC_MOVE2(ROCK_BLAST) + .2byte EC_WORD_HOLIDAY + .2byte EC_WORD_TELEVISION + .2byte EC_WORD_DONE .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_FEVER - .2byte EC_WORD_FIERY - .2byte EC_WORD_FIGHT - .2byte EC_WORD_FIGHTING - .2byte EC_WORD_FIGHTS - .2byte EC_WORD_FINAL - .2byte EC_WORD_FINALLY - .2byte EC_WORD_FINISH + .2byte EC_WORD_SHREDDED + .2byte EC_WORD_DAMP .2byte EC_WORD_FIRE - .2byte EC_MOVE2(FIRE_BLAST) + .2byte EC_WORD_FLASH_FIRE + .2byte EC_MOVE2(BLAZE_KICK) + .2byte EC_MOVE2(DRAGON_BREATH) .2byte EC_MOVE2(FIRE_PUNCH) + .2byte EC_MOVE2(FIRE_BLAST) .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_WORD_FISHING - .2byte EC_MOVE(FISSURE) - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_MOVE(FLAIL) - .2byte EC_WORD_FLAME_BODY + .2byte EC_POKEMON2(CYNDAQUIL) + .2byte EC_POKEMON(POOCHYENA) + .2byte EC_WORD_MOVIE + .2byte EC_MOVE(SELF_DESTRUCT) + .2byte EC_MOVE(SHADOW_PUNCH) + .2byte EC_MOVE2(FAINT_ATTACK) + .2byte EC_POKEMON(GLALIE) + .2byte EC_POKEMON2(FLAREON) .2byte EC_MOVE(FLAME_WHEEL) .2byte EC_MOVE(FLAMETHROWER) - .2byte EC_POKEMON2(FLAREON) - .2byte EC_MOVE2(FLASH) - .2byte EC_WORD_FLASH_FIRE - .2byte EC_WORD_FLATTEN - .2byte EC_MOVE(FLATTER) - .2byte EC_WORD_FLOWERS - .2byte EC_MOVE(FLY) - .2byte EC_POKEMON(FLYGON) + .2byte EC_WORD_FLAME_BODY + .2byte EC_POKEMON2(SLOWPOKE) + .2byte EC_POKEMON(TORCHIC) + .2byte EC_WORD_LIMBER + ec_duplicates 2 .2byte EC_WORD_FLYING - .2byte EC_MOVE(FOCUS_ENERGY) - .2byte EC_MOVE(FOCUS_PUNCH) - .2byte EC_WORD_FOE - .2byte EC_MOVE(FOLLOW_ME) - .2byte EC_WORD_FOR - .2byte EC_WORD_FOR_NOW - .2byte EC_WORD_FORECAST - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_FOREVER - .2byte EC_WORD_FORGET - .2byte EC_WORD_FORGETS - .2byte EC_WORD_FORGIVE + .2byte EC_MOVE(FLY) + .2byte EC_MOVE2(CURSE) + .2byte EC_WORD_ESCAPE + ec_duplicates 2 + .2byte EC_POKEMON(IGGLYBUFF) + .2byte EC_POKEMON2(IGGLYBUFF) + .2byte EC_MOVE2(WING_ATTACK) + .2byte EC_POKEMON(MAWILE) + .2byte EC_POKEMON(WHISMUR) + .2byte EC_WORD_FUFUFU + .2byte EC_MOVE(TORMENT) + .2byte EC_MOVE(WATER_SPOUT) + .2byte EC_POKEMON(CASTFORM) .2byte EC_POKEMON2(FORRETRESS) + .2byte EC_WORD_AWAY + .2byte EC_WORD_CAMERA + .2byte EC_WORD_QUESTION + .2byte EC_WORD_MRS + .2byte EC_WORD_RELEASE .2byte EC_WORD_FRIDAY + .2byte EC_WORD_JOY .2byte EC_WORD_FRIEND - .2byte EC_WORD_FROM - .2byte EC_WORD_FRONT + .2byte EC_POKEMON(ELECTRIKE) + .2byte EC_WORD_THINK + .2byte EC_MOVE(ICE_BALL) + .2byte EC_WORD_EARLIER + .2byte EC_WORD_SPRING + .2byte EC_WORD_EARLY_BIRD .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_FUFUFU - .2byte EC_WORD_FULL - .2byte EC_WORD_FUNNY - .2byte EC_POKEMON2(FURRET) + .2byte EC_WORD_DISAPPOINT + .2byte EC_MOVE(THRASH) + .2byte EC_WORD_FEELING + .2byte EC_POKEMON2(GROWLITHE) + .2byte EC_MOVE(SPARK) + .2byte EC_WORD_FOR + .2byte EC_WORD_TO_HER + .2byte EC_WORD_FOR_NOW + .2byte EC_WORD_TO_THEM + .2byte EC_WORD_TO_US + .2byte EC_WORD_TO_WHOM + .2byte EC_WORD_FEAR + .2byte EC_WORD_AWFULLY .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_MOVE2(FUTURE_SIGHT) + .2byte EC_MOVE(LOW_KICK) gEasyChatWordsByLetter_G: - .2byte EC_WORD_GAME - .2byte EC_POKEMON(GARDEVOIR) - .2byte EC_POKEMON2(GASTLY) + .2byte EC_MOVE(YAWN) + .2byte EC_POKEMON2(RAPIDASH) + ec_duplicates 2 + .2byte EC_POKEMON(GYARADOS) + .2byte EC_POKEMON2(GYARADOS) + .2byte EC_WORD_GIVE + .2byte EC_WORD_USE + .2byte EC_WORD_USES + .2byte EC_POKEMON(TREECKO) + .2byte EC_MOVE2(CALM_MIND) + .2byte EC_WORD_COMMEMORATE + .2byte EC_MOVE(BIDE) + .2byte EC_WORD_DANGER + .2byte EC_WORD_VERSUS + .2byte EC_MOVE(REVERSAL) + .2byte EC_WORD_OPPOSITE + .2byte EC_WORD_FOE + .2byte EC_WORD_MYSTERY + .2byte EC_WORD_SECRET_BASE + .2byte EC_WORD_SECRET + .2byte EC_MOVE2(SECRET_POWER) + .2byte EC_WORD_GOING + .2byte EC_WORD_HEARING + .2byte EC_WORD_BELONGS_TO + .2byte EC_WORD_GOES + .2byte EC_POKEMON(SURSKIT) + .2byte EC_WORD_GHOST + .2byte EC_WORD_BORED + .2byte EC_WORD_MONEY + .2byte EC_WORD_LAY + .2byte EC_WORD_MEAN + .2byte EC_WORD_HOW + .2byte EC_WORD_AS + .2byte EC_WORD_APPROVED + .2byte EC_MOVE(RECOVER) .2byte EC_POKEMON2(GENGAR) .2byte EC_WORD_GENIUS + .2byte EC_WORD_ENJOY + .2byte EC_WORD_ENJOYS + .2byte EC_WORD_THOSE_WERE + .2byte EC_MOVE(FISSURE) ec_duplicates 2 - .2byte EC_POKEMON(GEODUDE) - .2byte EC_POKEMON2(GEODUDE) - .2byte EC_WORD_GET - .2byte EC_WORD_GETS - .2byte EC_WORD_GHOST - .2byte EC_WORD_GIDDY - .2byte EC_MOVE(GIGA_DRAIN) - .2byte EC_WORD_GIGGLE - .2byte EC_WORD_GIMME + .2byte EC_POKEMON(GRAVELER) + .2byte EC_POKEMON2(GRAVELER) ec_duplicates 2 - .2byte EC_POKEMON(GIRAFARIG) - .2byte EC_POKEMON2(GIRAFARIG) - .2byte EC_WORD_GIRL - .2byte EC_WORD_GIVE + .2byte EC_POKEMON(GOLEM) + .2byte EC_POKEMON2(GOLEM) + .2byte EC_MOVE2(SEISMIC_TOSS) + .2byte EC_POKEMON(LINOONE) + .2byte EC_WORD_WANNABE + .2byte EC_WORD_SMELL + .2byte EC_MOVE(SING) + .2byte EC_WORD_EVENT + .2byte EC_MOVE2(PRESENT) + .2byte EC_WORD_SKILL + .2byte EC_WORD_SKILLED + .2byte EC_WORD_SHOCKED + .2byte EC_WORD_WEAKENED + .2byte EC_WORD_SIBLINGS + .2byte EC_MOVE2(FORESIGHT) + .2byte EC_WORD_CONVERSATION + .2byte EC_WORD_ROCK + .2byte EC_WORD_YESTERDAY + .2byte EC_WORD_HEALTHY + .2byte EC_WORD_DID + .2byte EC_POKEMON(SCEPTILE) + .2byte EC_WORD_WIN + .2byte EC_WORD_IF_I_WIN + .2byte EC_WORD_WINS + .2byte EC_WORD_HABIT + .2byte EC_WORD_WON .2byte EC_WORD_GIVE_ME - .2byte EC_WORD_GIVE_UP + .2byte EC_WORD_GIMME .2byte EC_WORD_GIVES - .2byte EC_POKEMON(GLALIE) + ec_duplicates 2 + .2byte EC_POKEMON(VILEPLUME) + .2byte EC_POKEMON2(VILEPLUME) + .2byte EC_WORD_POISON .2byte EC_MOVE2(GLARE) - .2byte EC_POKEMON2(GLIGAR) + .2byte EC_WORD_POISON_POINT + .2byte EC_MOVE2(POISON_POWDER) + .2byte EC_MOVE2(POISON_TAIL) + .2byte EC_MOVE2(POISON_STING) + .2byte EC_MOVE2(POISON_GAS) + .2byte EC_MOVE2(POISON_FANG) + .2byte EC_MOVE(GIGA_DRAIN) + .2byte EC_WORD_HAPPENING + .2byte EC_WORD_WENT ec_duplicates 2 - .2byte EC_POKEMON(GLOOM) - .2byte EC_POKEMON2(GLOOM) - .2byte EC_WORD_GO - .2byte EC_WORD_GO_AHEAD - .2byte EC_WORD_GO_EASY - .2byte EC_WORD_GO_HOME - .2byte EC_WORD_GOES - .2byte EC_WORD_GOING + .2byte EC_POKEMON(GIRAFARIG) + .2byte EC_POKEMON2(GIRAFARIG) + .2byte EC_WORD_SMOOTH + .2byte EC_WORD_BELIEVE + .2byte EC_WORD_WHEN + .2byte EC_WORD_SLIDE + .2byte EC_WORD_SLIMY + .2byte EC_WORD_HAPPINESS + .2byte EC_WORD_HAPPY + .2byte EC_WORD_CONGRATS + .2byte EC_POKEMON2(CHARMANDER) + .2byte EC_POKEMON2(CHARIZARD) + .2byte EC_MOVE2(EMBER) + .2byte EC_POKEMON2(CHARMELEON) ec_duplicates 2 .2byte EC_POKEMON(GOLBAT) .2byte EC_POKEMON2(GOLBAT) @@ -584,1310 +582,1316 @@ gEasyChatWordsByLetter_G: .2byte EC_POKEMON(GOLDEEN) .2byte EC_POKEMON2(GOLDEEN) ec_duplicates 2 - .2byte EC_POKEMON(GOLDUCK) - .2byte EC_POKEMON2(GOLDUCK) - ec_duplicates 2 - .2byte EC_POKEMON(GOLEM) - .2byte EC_POKEMON2(GOLEM) - .2byte EC_WORD_GOOD - .2byte EC_WORD_GOOD_BYE - .2byte EC_POKEMON(GOREBYSS) - .2byte EC_WORD_GOT - .2byte EC_WORD_GOTCHA + .2byte EC_POKEMON(SEAKING) + .2byte EC_POKEMON2(SEAKING) .2byte EC_WORD_GOURMET .2byte EC_WORD_GRAAAH .2byte EC_POKEMON2(GRANBULL) - .2byte EC_WORD_GRANDFATHER - .2byte EC_WORD_GRANDMOTHER - .2byte EC_WORD_GRASS .2byte EC_MOVE(GRASS_WHISTLE) - ec_duplicates 2 - .2byte EC_POKEMON(GRAVELER) - .2byte EC_POKEMON2(GRAVELER) + .2byte EC_POKEMON2(AIPOM) + .2byte EC_MOVE(SCARY_FACE) + .2byte EC_WORD_ANTICIPATION + .2byte EC_POKEMON(GRUMPIG) + .2byte EC_MOVE(SPITE) + .2byte EC_WORD_BIG .2byte EC_WORD_GREAT - ec_duplicates 2 - .2byte EC_POKEMON(GRIMER) - .2byte EC_POKEMON2(GRIMER) + .2byte EC_WORD_BLAZE + .2byte EC_WORD_GRANDMOTHER + .2byte EC_WORD_GRANDFATHER + .2byte EC_WORD_LAVISH .2byte EC_POKEMON(GROUDON) - .2byte EC_WORD_GROUND + .2byte EC_WORD_GWAH + .2byte EC_WORD_CAUSE .2byte EC_WORD_GROUP - .2byte EC_POKEMON(GROVYLE) - .2byte EC_MOVE2(GROWL) - .2byte EC_POKEMON2(GROWLITHE) - .2byte EC_MOVE(GROWTH) - .2byte EC_MOVE(GRUDGE) - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_WORD_GUARD + .2byte EC_POKEMON(GARDEVOIR) .2byte EC_MOVE2(GUILLOTINE) - .2byte EC_POKEMON(GULPIN) - .2byte EC_MOVE(GUST) - .2byte EC_WORD_GUTS - .2byte EC_WORD_GUTSY - .2byte EC_WORD_GWAH + .2byte EC_WORD_1_HIT_KO_EXCL + .2byte EC_WORD_ALL_RIGHT + .2byte EC_WORD_HEARS .2byte EC_WORD_GWAHAHAHA - ec_duplicates 2 - .2byte EC_POKEMON(GYARADOS) - .2byte EC_POKEMON2(GYARADOS) gEasyChatWordsByLetter_H: - .2byte EC_WORD_HABIT - .2byte EC_WORD_HAH - .2byte EC_WORD_HAHAHA - .2byte EC_MOVE(HAIL) - .2byte EC_WORD_HALL_OF_FAME - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_HAPPILY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_HAPPY - .2byte EC_WORD_HARD - .2byte EC_MOVE(HARDEN) - .2byte EC_POKEMON(HARIYAMA) - .2byte EC_WORD_HAS - .2byte EC_WORD_HASSLE - .2byte EC_POKEMON2(HAUNTER) + .2byte EC_WORD_WATER_ABSORB + .2byte EC_WORD_GOTCHA .2byte EC_WORD_HAVE + .2byte EC_WORD_GOT .2byte EC_WORD_HAVEN_T - .2byte EC_MOVE(HAZE) - .2byte EC_WORD_HE - .2byte EC_WORD_HE_S - .2byte EC_MOVE(HEADBUTT) - .2byte EC_MOVE(HEAL_BELL) - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_HEAR - .2byte EC_WORD_HEARING - .2byte EC_WORD_HEARS - .2byte EC_WORD_HEART - .2byte EC_MOVE2(HEAT_WAVE) - .2byte EC_WORD_HEH + .2byte EC_POKEMON2(SPEAROW) + .2byte EC_MOVE(HAIL) + .2byte EC_WORD_HAH + .2byte EC_WORD_EH_QUES .2byte EC_WORD_HEHE - .2byte EC_WORD_HEHEHE + .2byte EC_WORD_HAHAHA + .2byte EC_WORD_EHEHE .2byte EC_WORD_HELLO - .2byte EC_MOVE2(HELPING_HAND) - .2byte EC_WORD_HER - .2byte EC_WORD_HERS - ec_duplicates 2 - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_WORD_HERE - .2byte EC_WORD_HERE_GOES - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_HERE_IT_IS + .2byte EC_POKEMON(HARIYAMA) + .2byte EC_WORD_MATCH_UP + .2byte EC_MOVE(HARDEN) + .2byte EC_WORD_HAS + .2byte EC_WORD_HEH + .2byte EC_WORD_HEHEHE + .2byte EC_MOVE2(REFRESH) + .2byte EC_WORD_HOME + .2byte EC_WORD_GO_HOME + .2byte EC_WORD_HOT + .2byte EC_POKEMON2(BLISSEY) .2byte EC_WORD_HERO .2byte EC_WORD_HEROINE + .2byte EC_WORD_CHALLENGE + .2byte EC_WORD_FALL + .2byte EC_WORD_MR + .2byte EC_WORD_MAKING + .2byte EC_MOVE2(GROWL) + .2byte EC_WORD_TODAY + .2byte EC_WORD_SWARM .2byte EC_WORD_HEY .2byte EC_WORD_HEY_THERE .2byte EC_WORD_HEY_QUES - .2byte EC_WORD_HI - .2byte EC_MOVE2(HI_JUMP_KICK) - .2byte EC_WORD_HIDDEN - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_WORD_HIGH - .2byte EC_WORD_HIGHS - .2byte EC_WORD_HIM + .2byte EC_WORD_HERE + .2byte EC_WORD_HERE_I_COME + .2byte EC_WORD_HERE_IT_IS + .2byte EC_WORD_HERE_GOES + .2byte EC_WORD_MUFUFU + .2byte EC_MOVE(SKY_UPPERCUT) + .2byte EC_MOVE(SKY_ATTACK) + .2byte EC_WORD_REAR + .2byte EC_WORD_DOWN .2byte EC_WORD_HIP_AND - .2byte EC_WORD_HIS - .2byte EC_WORD_HIT - .2byte EC_POKEMON2(HITMONCHAN) - .2byte EC_POKEMON2(HITMONLEE) - .2byte EC_POKEMON2(HITMONTOP) + .2byte EC_MOVE(OVERHEAT) + .2byte EC_MOVE2(HEAT_WAVE) .2byte EC_WORD_HIYAH .2byte EC_WORD_HMM + .2byte EC_WORD_HUMPH .2byte EC_POKEMON2(HO_OH) .2byte EC_WORD_HOBBY + .2byte EC_WORD_HIGH + .2byte EC_WORD_KIND + .2byte EC_WORD_HIGHS .2byte EC_WORD_HOHOHO - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_HOME - .2byte EC_WORD_HOO_HAH + .2byte EC_WORD_HEART .2byte EC_POKEMON2(HOOTHOOT) - .2byte EC_WORD_HOPELESS .2byte EC_POKEMON2(HOPPIP) + .2byte EC_WORD_LISTENING + .2byte EC_WORD_HEAR .2byte EC_MOVE2(HORN_ATTACK) .2byte EC_MOVE2(HORN_DRILL) - ec_duplicates 2 - .2byte EC_POKEMON(HORSEA) - .2byte EC_POKEMON2(HORSEA) - .2byte EC_WORD_HOT + .2byte EC_POKEMON2(WEEDLE) + .2byte EC_MOVE(MEAN_LOOK) + .2byte EC_WORD_LISTENS + .2byte EC_MOVE2(STOCKPILE) + .2byte EC_POKEMON2(SKIPLOOM) + .2byte EC_WORD_PRETTY + .2byte EC_WORD_HOO_HAH .2byte EC_POKEMON2(HOUNDOOM) .2byte EC_POKEMON2(HOUNDOUR) - .2byte EC_WORD_HOW - .2byte EC_WORD_HOW_DO - .2byte EC_WORD_HOWEVER - .2byte EC_MOVE2(HOWL) - .2byte EC_WORD_HUGE_POWER - .2byte EC_WORD_HUH_QUES - .2byte EC_WORD_HUMPH - .2byte EC_WORD_HUNGRY - .2byte EC_POKEMON(HUNTAIL) - .2byte EC_WORD_HURRIED - .2byte EC_WORD_HUSTLE + .2byte EC_WORD_OOPS + .2byte EC_POKEMON(MUDKIP) .2byte EC_MOVE2(HYDRO_PUMP) .2byte EC_WORD_HYPER .2byte EC_MOVE2(HYPER_BEAM) - .2byte EC_WORD_HYPER_CUTTER .2byte EC_MOVE2(HYPER_FANG) - .2byte EC_MOVE2(HYPER_VOICE) .2byte EC_POKEMON2(HYPNO) .2byte EC_MOVE(HYPNOSIS) gEasyChatWordsByLetter_I: + .2byte EC_POKEMON2(FEAROW) .2byte EC_WORD_I .2byte EC_WORD_I_AM - .2byte EC_WORD_I_CHOOSE_YOU - .2byte EC_WORD_I_WAS - .2byte EC_WORD_I_VE .2byte EC_WORD_I_VE_ARRIVED - .2byte EC_WORD_ICE - .2byte EC_MOVE(ICE_BALL) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE(ICY_WIND) + .2byte EC_WORD_I_VE + .2byte EC_WORD_LET_ME_WIN + .2byte EC_WORD_I_WAS + .2byte EC_POKEMON2(UNOWN) .2byte EC_WORD_IDOL - .2byte EC_WORD_IF - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_IF_I_WIN - ec_duplicates 2 - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_POKEMON2(IGGLYBUFF) + .2byte EC_POKEMON2(QUILAVA) + .2byte EC_WORD_EEK .2byte EC_WORD_IGNORANT - .2byte EC_WORD_ILLUMINATE + .2byte EC_WORD_HIM + .2byte EC_WORD_THEY + .2byte EC_WORD_HER + .2byte EC_WORD_MUCH_OBLIGED + ec_duplicates 2 + .2byte EC_POKEMON(CROBAT) + .2byte EC_POKEMON2(CROBAT) .2byte EC_POKEMON(ILLUMISE) + .2byte EC_WORD_ALWAYS .2byte EC_WORD_IMMUNITY - .2byte EC_WORD_IMPORTANT - .2byte EC_WORD_IMPOSSIBLE - .2byte EC_MOVE2(IMPRISON) + .2byte EC_POKEMON2(FERALIGATR) .2byte EC_WORD_IN - .2byte EC_WORD_INCREASING - .2byte EC_WORD_INCREDIBLE .2byte EC_WORD_INFORMATION - .2byte EC_MOVE2(INGRAIN) - .2byte EC_WORD_INNER_FOCUS .2byte EC_WORD_INSIDE + .2byte EC_WORD_NATURAL_CURE .2byte EC_WORD_INSOMNIA - .2byte EC_WORD_INSTEAD - .2byte EC_WORD_INTIMIDATE - .2byte EC_WORD_INVINCIBLE - .2byte EC_MOVE2(IRON_DEFENSE) - .2byte EC_MOVE(IRON_TAIL) + .2byte EC_MOVE2(MAGNITUDE) + .2byte EC_WORD_ANY + .2byte EC_WORD_SOMETIME + .2byte EC_WORD_SOMEHOW + .2byte EC_WORD_ANYWHERE + .2byte EC_WORD_AWESOME + .2byte EC_MOVE(WILL_O_WISP) + .2byte EC_MOVE2(DIZZY_PUNCH) + .2byte EC_POKEMON(WYNAUT) + .2byte EC_WORD_EATS .2byte EC_WORD_IS - .2byte EC_WORD_IS_IT_QUES .2byte EC_WORD_ISN_T - .2byte EC_WORD_ISN_T_IT_QUES - .2byte EC_WORD_IT - .2byte EC_WORD_IT_S .2byte EC_WORD_ITEM - .2byte EC_POKEMON2(IVYSAUR) gEasyChatWordsByLetter_J: - ec_duplicates 2 - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(JIGGLYPUFF) + .2byte EC_WORD_YES + .2byte EC_WORD_YAY + .2byte EC_WORD_YUP + .2byte EC_MOVE2(HOWL) + .2byte EC_WORD_HOWEVER + .2byte EC_WORD_EVER + .2byte EC_WORD_SOMEONE + .2byte EC_WORD_YO + .2byte EC_WORD_NOW + .2byte EC_WORD_YEEHAW_EXCL + .2byte EC_WORD_EXCITING .2byte EC_POKEMON(JIRACHI) - .2byte EC_WORD_JOKING - .2byte EC_POKEMON2(JOLTEON) - .2byte EC_WORD_JOY + .2byte EC_WORD_WOWEE + .2byte EC_WORD_YAHOO + .2byte EC_POKEMON2(DEWGONG) + .2byte EC_WORD_YOUNG + .2byte EC_WORD_BOY + .2byte EC_POKEMON(COMBUSKEN) + .2byte EC_POKEMON2(SEEL) .2byte EC_WORD_JUDGE - .2byte EC_MOVE2(JUMP_KICK) - .2byte EC_POKEMON2(JUMPLUFF) - .2byte EC_WORD_JUST - .2byte EC_POKEMON2(JYNX) gEasyChatWordsByLetter_K: .2byte EC_POKEMON2(KABUTO) .2byte EC_POKEMON2(KABUTOPS) ec_duplicates 2 .2byte EC_POKEMON(KADABRA) .2byte EC_POKEMON2(KADABRA) - .2byte EC_POKEMON2(KAKUNA) + .2byte EC_WORD_BUG + .2byte EC_WORD_COLD + .2byte EC_WORD_CAME + .2byte EC_WORD_FIGHTING + .2byte EC_WORD_BATTLE + .2byte EC_WORD_FIGHT + .2byte EC_WORD_BATTLE_ARMOR + .2byte EC_WORD_BATTLE_ROOM + .2byte EC_WORD_FAINTED .2byte EC_POKEMON2(KANGASKHAN) + .2byte EC_POKEMON(CARVANHA) + .2byte EC_WORD_CAN_WIN + .2byte EC_WORD_CAN_T + .2byte EC_POKEMON(BRELOOM) + .2byte EC_POKEMON2(HITMONTOP) + .2byte EC_POKEMON(LUDICOLO) .2byte EC_MOVE(KARATE_CHOP) + .2byte EC_WORD_DESTINY + .2byte EC_POKEMON2(TOTODILE) + ec_duplicates 2 + .2byte EC_POKEMON(MAGIKARP) + .2byte EC_POKEMON2(MAGIKARP) + .2byte EC_WORD_CARDS + .2byte EC_MOVE2(WATERFALL) + .2byte EC_WORD_DEPT_STORE .2byte EC_POKEMON(KECLEON) - .2byte EC_WORD_KEEN_EYE + .2byte EC_POKEMON2(PILOSWINE) + .2byte EC_WORD_NONE + .2byte EC_WORD_GIGGLE + .2byte EC_POKEMON2(HITMONLEE) + .2byte EC_WORD_TICKLISH .2byte EC_WORD_KID - .2byte EC_WORD_KIDDING - .2byte EC_WORD_KIND + .2byte EC_WORD_CHILDREN .2byte EC_WORD_KINDERGARTEN - .2byte EC_MOVE(KINESIS) - ec_duplicates 2 - .2byte EC_POKEMON(KINGDRA) - .2byte EC_POKEMON2(KINGDRA) + .2byte EC_WORD_CHILD_S_PLAY + .2byte EC_POKEMON(BAGON) .2byte EC_POKEMON2(KINGLER) .2byte EC_POKEMON(KIRLIA) - .2byte EC_MOVE2(KNOCK_OFF) - .2byte EC_WORD_KNOCKOUT - .2byte EC_WORD_KNOW - .2byte EC_WORD_KNOWS + .2byte EC_MOVE2(VICE_GRIP) + .2byte EC_MOVE(BIND) + .2byte EC_WORD_THIN + .2byte EC_WORD_RANK + .2byte EC_WORD_SMALL ec_duplicates 2 - .2byte EC_POKEMON(KOFFING) - .2byte EC_POKEMON2(KOFFING) + .2byte EC_POKEMON(GEODUDE) + .2byte EC_POKEMON2(GEODUDE) + .2byte EC_WORD_AIR_LOCK + .2byte EC_MOVE(RAZOR_WIND) + .2byte EC_WORD_LIQUID_OOZE + .2byte EC_WORD_SMART + .2byte EC_WORD_SMARTNESS + .2byte EC_POKEMON(TRAPINCH) + .2byte EC_POKEMON(SHROOMISH) + .2byte EC_MOVE(CRUNCH) + .2byte EC_MOVE2(BONE_RUSH) + .2byte EC_MOVE2(BONE_CLUB) + .2byte EC_MOVE2(BONEMERANG) + .2byte EC_POKEMON2(BELLSPROUT) + .2byte EC_POKEMON2(MAROWAK) + ec_duplicates 2 + .2byte EC_POKEMON(WIGGLYTUFF) + .2byte EC_POKEMON2(WIGGLYTUFF) + .2byte EC_WORD_TIGHT + .2byte EC_POKEMON2(EXEGGUTOR) + .2byte EC_POKEMON2(KAKUNA) + .2byte EC_MOVE2(COMET_PUNCH) + .2byte EC_WORD_COME_ON + .2byte EC_WORD_COME + .2byte EC_WORD_COMPLETE + .2byte EC_MOVE2(MINIMIZE) + .2byte EC_MOVE2(CONFUSION) + .2byte EC_MOVE(CONFUSE_RAY) + .2byte EC_WORD_CAN + .2byte EC_WORD_COULDN_T + .2byte EC_WORD_COULD + .2byte EC_MOVE(COUNTER) + .2byte EC_WORD_INNER_FOCUS + .2byte EC_MOVE(HEADBUTT) + .2byte EC_WORD_FEVER + .2byte EC_MOVE(COSMIC_POWER) + .2byte EC_WORD_TREASURE + .2byte EC_MOVE(CRABHAMMER) .2byte EC_POKEMON2(KRABBY) - .2byte EC_WORD_KTHX_BYE + .2byte EC_WORD_POWER + ec_duplicates 2 + .2byte EC_WORD_HUGE_POWER + .2byte EC_MOVE2(SUPERPOWER) + .2byte EC_MOVE2(HIDDEN_POWER) + .2byte EC_POKEMON(LOUDRED) + .2byte EC_POKEMON2(MURKROW) + .2byte EC_MOVE2(SCRATCH) + .2byte EC_MOVE2(FURY_SWIPES) + .2byte EC_POKEMON(EXPLOUD) + .2byte EC_POKEMON(CORPHISH) + .2byte EC_POKEMON(CRAWDAUNT) + .2byte EC_MOVE(SCREECH) + .2byte EC_MOVE(CROSS_CHOP) + .2byte EC_MOVE2(BULLET_SEED) + .2byte EC_POKEMON2(SMOOCHUM) .2byte EC_POKEMON(KYOGRE) gEasyChatWordsByLetter_L: - .2byte EC_WORD_LACKING - .2byte EC_WORD_LACKS - .2byte EC_WORD_LADY - .2byte EC_POKEMON(LAIRON) + .2byte EC_WORD_SEE + .2byte EC_MOVE(CHARGE) + .2byte EC_WORD_STORE + .2byte EC_WORD_STORES + .2byte EC_POKEMON2(SLOWBRO) .2byte EC_WORD_LALALA ec_duplicates 2 + .2byte EC_POKEMON(CHINCHOU) + .2byte EC_POKEMON2(CHINCHOU) + .2byte EC_WORD_WAIT + .2byte EC_WORD_BORING + ec_duplicates 2 .2byte EC_POKEMON(LANTURN) .2byte EC_POKEMON2(LANTURN) + .2byte EC_WORD_PUSHOVER .2byte EC_POKEMON2(LAPRAS) + .2byte EC_WORD_SOUNDPROOF .2byte EC_POKEMON2(LARVITAR) - .2byte EC_WORD_LAST - .2byte EC_WORD_LATE - .2byte EC_WORD_LATER + .2byte EC_POKEMON2(SLOWKING) + .2byte EC_WORD_LET_S .2byte EC_POKEMON(LATIAS) .2byte EC_POKEMON(LATIOS) - .2byte EC_WORD_LAVISH - .2byte EC_WORD_LAY - .2byte EC_WORD_LEADER - .2byte EC_WORD_LEADERS + .2byte EC_WORD_WANDERING .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_WORD_LEARN + .2byte EC_WORD_MOOD + .2byte EC_WORD_LOUSY + .2byte EC_WORD_NOISY + .2byte EC_MOVE(SACRED_FIRE) + .2byte EC_WORD_LUKEWARM + .2byte EC_POKEMON2(MOLTRES) + .2byte EC_WORD_LIFE + .2byte EC_WORD_LIVING + .2byte EC_WORD_THIRSTY + .2byte EC_WORD_TASTY .2byte EC_POKEMON2(LEDIAN) .2byte EC_POKEMON2(LEDYBA) - .2byte EC_MOVE(LEECH_LIFE) - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_MOVE2(LEER) - .2byte EC_WORD_LEFT .2byte EC_WORD_LEGEND - .2byte EC_WORD_LESS - .2byte EC_WORD_LESSONS - .2byte EC_WORD_LET_ME_WIN - .2byte EC_WORD_LET_S - .2byte EC_WORD_LETTER + .2byte EC_MOVE2(MUDDY_WATER) + .2byte EC_MOVE2(MUD_SLAP) + .2byte EC_MOVE2(MUD_SHOT) + .2byte EC_MOVE2(MUD_SPORT) + .2byte EC_WORD_TEACH + .2byte EC_WORD_TEACHER + .2byte EC_WORD_TEACHES + .2byte EC_WORD_EASY + .2byte EC_MOVE(PAIN_SPLIT) + ec_duplicates 2 + .2byte EC_WORD_LEADER + .2byte EC_WORD_LEADERS + .2byte EC_WORD_CLASS + ec_duplicates 2 + .2byte EC_POKEMON(ELECTRODE) + .2byte EC_POKEMON2(ELECTRODE) + .2byte EC_POKEMON(CLAYDOL) + .2byte EC_WORD_LEARN + .2byte EC_WORD_STUDY + .2byte EC_POKEMON(SLAKING) + .2byte EC_WORD_LAST + .2byte EC_WORD_FINAL + .2byte EC_WORD_WINNER .2byte EC_WORD_LEVEL - .2byte EC_WORD_LEVITATE - .2byte EC_MOVE(LICK) - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_LIE - .2byte EC_WORD_LIFE + .2byte EC_POKEMON(FLYGON) + .2byte EC_WORD_KNOCKOUT .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_WORD_LIGHTNINGROD - .2byte EC_WORD_LIKE - .2byte EC_WORD_LIKELY_TO - .2byte EC_WORD_LIKES + .2byte EC_POKEMON(LUVDISC) .2byte EC_POKEMON(LILEEP) - .2byte EC_WORD_LIMBER .2byte EC_WORD_LINK - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_WORD_LISTEN - .2byte EC_WORD_LISTENING - .2byte EC_WORD_LISTENS - .2byte EC_WORD_LIVING - .2byte EC_MOVE2(LOCK_ON) + .2byte EC_WORD_LEFT + .2byte EC_WORD_PRAISE + .2byte EC_MOVE(SWEET_SCENT) + .2byte EC_POKEMON(BLAZIKEN) .2byte EC_WORD_LOCOMOTIVE - .2byte EC_WORD_LOL - .2byte EC_WORD_LOLLING .2byte EC_POKEMON(LOMBRE) - .2byte EC_WORD_LONESOME - .2byte EC_WORD_LOOK - .2byte EC_WORD_LOOKS - .2byte EC_WORD_LOSE + .2byte EC_POKEMON2(BAYLEEF) + .2byte EC_WORD_GO .2byte EC_WORD_LOSER - .2byte EC_WORD_LOSING - .2byte EC_WORD_LOSS - .2byte EC_WORD_LOST .2byte EC_POKEMON(LOTAD) - .2byte EC_POKEMON(LOUDRED) - .2byte EC_WORD_LOUSY - .2byte EC_MOVE(LOVELY_KISS) - .2byte EC_WORD_LOVEY_DOVEY - .2byte EC_WORD_LOW - .2byte EC_MOVE(LOW_KICK) - .2byte EC_WORD_LOWS - .2byte EC_POKEMON(LUDICOLO) + .2byte EC_MOVE(AEROBLAST) + .2byte EC_WORD_LIE .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LUKEWARM + .2byte EC_WORD_LOLLING .2byte EC_POKEMON(LUNATONE) - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_POKEMON(LUVDISC) + .2byte EC_WORD_FUNNY gEasyChatWordsByLetter_M: - .2byte EC_MOVE2(MACH_PUNCH) - ec_duplicates 2 - .2byte EC_POKEMON(MACHAMP) - .2byte EC_POKEMON2(MACHAMP) - .2byte EC_WORD_MACHINE - ec_duplicates 2 - .2byte EC_POKEMON(MACHOKE) - .2byte EC_POKEMON2(MACHOKE) + .2byte EC_WORD_DO + .2byte EC_WORD_MAKE ec_duplicates 2 .2byte EC_POKEMON(MACHOP) .2byte EC_POKEMON2(MACHOP) + ec_duplicates 2 + .2byte EC_POKEMON(MACHAMP) + .2byte EC_POKEMON2(MACHAMP) + .2byte EC_WORD_DOESN_T + .2byte EC_WORD_GIRL .2byte EC_WORD_MAGAZINE .2byte EC_POKEMON2(MAGBY) ec_duplicates 2 .2byte EC_POKEMON(MAGCARGO) .2byte EC_POKEMON2(MAGCARGO) + .2byte EC_WORD_HUNGRY .2byte EC_MOVE2(MAGIC_COAT) - .2byte EC_MOVE2(MAGICAL_LEAF) - ec_duplicates 2 - .2byte EC_POKEMON(MAGIKARP) - .2byte EC_POKEMON2(MAGIKARP) .2byte EC_WORD_MAGMA_ARMOR .2byte EC_POKEMON2(MAGMAR) + .2byte EC_POKEMON(MIGHTYENA) + .2byte EC_WORD_MAGNET_PULL ec_duplicates 2 .2byte EC_POKEMON(MAGNEMITE) .2byte EC_POKEMON2(MAGNEMITE) - .2byte EC_WORD_MAGNET_PULL ec_duplicates 2 .2byte EC_POKEMON(MAGNETON) .2byte EC_POKEMON2(MAGNETON) - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_WORD_MAIL - .2byte EC_WORD_MAKE - .2byte EC_WORD_MAKING .2byte EC_POKEMON(MAKUHITA) + .2byte EC_WORD_VORACIOUS .2byte EC_WORD_MAN - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_POKEMON2(MANKEY) .2byte EC_POKEMON2(MANTINE) - .2byte EC_POKEMON2(MAREEP) ec_duplicates 2 .2byte EC_POKEMON(MARILL) .2byte EC_POKEMON2(MARILL) - .2byte EC_POKEMON2(MAROWAK) - .2byte EC_POKEMON(MARSHTOMP) - .2byte EC_WORD_MARVEL_SCALE + .2byte EC_WORD_MACHINE + ec_duplicates 2 + .2byte EC_POKEMON(MACHOKE) + .2byte EC_POKEMON2(MACHOKE) .2byte EC_POKEMON(MASQUERAIN) - .2byte EC_WORD_MASTER - .2byte EC_WORD_MATCH - .2byte EC_WORD_MATCH_UP - .2byte EC_POKEMON(MAWILE) - .2byte EC_WORD_MAYBE + .2byte EC_MOVE2(SLUDGE_BOMB) + .2byte EC_POKEMON2(MEOWTH) .2byte EC_WORD_MC - .2byte EC_WORD_ME - .2byte EC_WORD_MEAN - .2byte EC_MOVE(MEAN_LOOK) .2byte EC_POKEMON(MEDICHAM) .2byte EC_MOVE2(MEDITATE) .2byte EC_POKEMON(MEDITITE) - .2byte EC_WORD_MEET - .2byte EC_WORD_MEET_YOU - .2byte EC_WORD_MEETS .2byte EC_WORD_MEGA - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_MOVE2(MEGA_KICK) + .2byte EC_WORD_HAPPILY .2byte EC_MOVE2(MEGA_PUNCH) - .2byte EC_MOVE2(MEGAHORN) + .2byte EC_MOVE2(MEGA_KICK) .2byte EC_POKEMON2(MEGANIUM) + .2byte EC_MOVE2(MEGA_DRAIN) + .2byte EC_WORD_MORE + .2byte EC_WORD_MY + .2byte EC_WORD_WHO_WAS + .2byte EC_WORD_OH_DEAR + .2byte EC_WORD_MASTER .2byte EC_MOVE(MEMENTO) - .2byte EC_POKEMON2(MEOWTH) - .2byte EC_WORD_MESSAGE + .2byte EC_POKEMON2(MANKEY) + .2byte EC_WORD_PURE_POWER .2byte EC_POKEMON(METAGROSS) .2byte EC_MOVE2(METAL_CLAW) .2byte EC_MOVE(METAL_SOUND) .2byte EC_POKEMON(METANG) - .2byte EC_POKEMON2(METAPOD) - .2byte EC_MOVE(METEOR_MASH) + .2byte EC_MOVE(WEATHER_BALL) .2byte EC_MOVE2(METRONOME) .2byte EC_POKEMON2(MEW) .2byte EC_POKEMON2(MEWTWO) - .2byte EC_POKEMON(MIGHTYENA) + .2byte EC_WORD_ME + .2byte EC_WORD_BADLY + .2byte EC_WORD_SHOULD + .2byte EC_WORD_RENTAL .2byte EC_MOVE2(MILK_DRINK) .2byte EC_POKEMON(MILOTIC) .2byte EC_POKEMON2(MILTANK) .2byte EC_MOVE2(MIMIC) - .2byte EC_MOVE(MIND_READER) - .2byte EC_MOVE2(MINIMIZE) .2byte EC_POKEMON(MINUN) .2byte EC_WORD_MINUS - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE(MIRROR_MOVE) - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_MISHEARD - .2byte EC_WORD_MISS - .2byte EC_MOVE(MIST) - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_WORD_MISTAKE + .2byte EC_WORD_MYSELF + .2byte EC_WORD_WITH + .2byte EC_WORD_PICKUP + .2byte EC_WORD_OVERWHELMING + .2byte EC_WORD_MESSAGE + .2byte EC_WORD_WEDNESDAY + .2byte EC_WORD_BLEND .2byte EC_WORD_MMM - .2byte EC_WORD_MODE + .2byte EC_WORD_WANT + .2byte EC_WORD_FASHION .2byte EC_WORD_MODERN - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_MOMENTUM - .2byte EC_WORD_MONDAY - .2byte EC_WORD_MONEY + .2byte EC_POKEMON2(SUDOWOODO) + .2byte EC_MOVE2(FAKE_OUT) + .2byte EC_WORD_CURRENT .2byte EC_WORD_MONTH - .2byte EC_WORD_MOOD .2byte EC_MOVE2(MOONLIGHT) - .2byte EC_WORD_MORE + .2byte EC_WORD_MONDAY + .2byte EC_POKEMON(MARSHTOMP) .2byte EC_WORD_MORNING .2byte EC_MOVE(MORNING_SUN) - .2byte EC_WORD_MOTHER - .2byte EC_WORD_MOVE - .2byte EC_WORD_MOVIE - .2byte EC_WORD_MR - .2byte EC_POKEMON2(MR_MIME) - .2byte EC_WORD_MRS - .2byte EC_WORD_MUCH - .2byte EC_WORD_MUCH_OBLIGED - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MUD_SPORT) - .2byte EC_MOVE2(MUD_SLAP) - .2byte EC_MOVE2(MUDDY_WATER) - .2byte EC_POKEMON(MUDKIP) - .2byte EC_WORD_MUFUFU - ec_duplicates 2 - .2byte EC_POKEMON(MUK) - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON2(MURKROW) + .2byte EC_POKEMON2(QUAGSIRE) + .2byte EC_WORD_TIRED + .2byte EC_WORD_USELESS + .2byte EC_WORD_VITAL_SPIRIT + .2byte EC_POKEMON(VIGOROTH) + .2byte EC_POKEMON2(SHELLDER) .2byte EC_WORD_MUSIC .2byte EC_WORD_MUST_BE - .2byte EC_WORD_MY - .2byte EC_WORD_MYSELF - .2byte EC_WORD_MYSTERY + .2byte EC_WORD_PATTERN + .2byte EC_WORD_GUTSY + .2byte EC_WORD_MOTHER + ec_duplicates 2 + .2byte EC_POKEMON(ODDISH) + .2byte EC_POKEMON2(ODDISH) gEasyChatWordsByLetter_N: + .2byte EC_WORD_AFTER + .2byte EC_MOVE(SKETCH) + .2byte EC_MOVE(GRUDGE) + .2byte EC_WORD_NEXT + .2byte EC_WORD_NIGHT + .2byte EC_POKEMON2(UMBREON) + .2byte EC_MOVE(NIGHTMARE) + .2byte EC_MOVE2(NIGHT_SHADE) + .2byte EC_MOVE2(PIN_MISSILE) + .2byte EC_WORD_NEAR + .2byte EC_WORD_CLOSE + .2byte EC_WORD_DIET .2byte EC_WORD_NAME - .2byte EC_WORD_NAP + .2byte EC_WORD_SWEETS + .2byte EC_POKEMON(NOSEPASS) + .2byte EC_MOVE2(WATER_SPORT) ec_duplicates 2 .2byte EC_POKEMON(NATU) .2byte EC_POKEMON2(NATU) - .2byte EC_WORD_NATURAL - .2byte EC_WORD_NATURAL_CURE - .2byte EC_WORD_NATURALLY - .2byte EC_WORD_NATURE .2byte EC_MOVE(NATURE_POWER) - .2byte EC_WORD_NEAR - .2byte EC_WORD_NEARLY - .2byte EC_WORD_NEED - .2byte EC_MOVE2(NEEDLE_ARM) + .2byte EC_WORD_NATURAL + .2byte EC_WORD_CANCEL + .2byte EC_MOVE2(MIST_BALL) + .2byte EC_WORD_BESIDE + .2byte EC_POKEMON2(GASTLY) .2byte EC_WORD_NEGATIVE - .2byte EC_WORD_NEVER - .2byte EC_WORD_NEW - .2byte EC_WORD_NEWS - .2byte EC_WORD_NEXT + .2byte EC_WORD_NO .2byte EC_WORD_NICE + .2byte EC_WORD_NEWS + .2byte EC_WORD_CLEAR_BODY + .2byte EC_WORD_DON_T + .2byte EC_WORD_DIDN_T + .2byte EC_WORD_DISLIKE + .2byte EC_WORD_NOT + .2byte EC_WORD_NOT_VERY + .2byte EC_WORD_ISN_T_IT_QUES + .2byte EC_WORD_NOTHING + .2byte EC_WORD_NAP .2byte EC_POKEMON2(NIDOKING) .2byte EC_POKEMON2(NIDOQUEEN) .2byte EC_POKEMON2(NIDORAN_F) .2byte EC_POKEMON2(NIDORAN_M) .2byte EC_POKEMON2(NIDORINA) .2byte EC_POKEMON2(NIDORINO) - .2byte EC_WORD_NIGHT - .2byte EC_MOVE2(NIGHT_SHADE) - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_WORD_NIGHTTIME + .2byte EC_WORD_NEVER + .2byte EC_WORD_LOW + .2byte EC_WORD_DRIZZLE + .2byte EC_MOVE2(NEEDLE_ARM) + .2byte EC_WORD_TAKE_THAT .2byte EC_POKEMON(NINCADA) - ec_duplicates 2 - .2byte EC_POKEMON(NINETALES) - .2byte EC_POKEMON2(NINETALES) .2byte EC_POKEMON(NINJASK) - .2byte EC_WORD_NITWIT - .2byte EC_WORD_NO - .2byte EC_WORD_NO_MATCH - .2byte EC_WORD_NO_1 + .2byte EC_POKEMON(SHEDINJA) + .2byte EC_WORD_NOPE + .2byte EC_WORD_TOTALLY + .2byte EC_WORD_THAT_S + .2byte EC_POKEMON2(HITMONCHAN) .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_WORD_NOISY + .2byte EC_POKEMON(CACTURNE) .2byte EC_WORD_NON_STOP - .2byte EC_WORD_NONE - .2byte EC_WORD_NOPE + .2byte EC_WORD_YET .2byte EC_WORD_NORMAL - .2byte EC_POKEMON(NOSEPASS) - .2byte EC_WORD_NOT - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_NOTHING - .2byte EC_WORD_NOW - .2byte EC_POKEMON(NUMEL) - .2byte EC_POKEMON(NUZLEAF) + .2byte EC_WORD_OVERGROW + .2byte EC_WORD_MARVEL_SCALE + .2byte EC_MOVE(ENDEAVOR) + .2byte EC_WORD_NO_1 + .2byte EC_WORD_WELL_THEN + .2byte EC_WORD_ONLY gEasyChatWordsByLetter_O: - .2byte EC_WORD_OBLIVIOUS + .2byte EC_WORD_OK_QUES + .2byte EC_WORD_UP + .2byte EC_WORD_ABOVE + .2byte EC_WORD_ALTHOUGH .2byte EC_MOVE(OCTAZOOKA) .2byte EC_POKEMON2(OCTILLERY) - ec_duplicates 2 - .2byte EC_POKEMON(ODDISH) - .2byte EC_POKEMON2(ODDISH) - .2byte EC_MOVE(ODOR_SLEUTH) - .2byte EC_WORD_OF - .2byte EC_WORD_OFF + .2byte EC_WORD_OR .2byte EC_WORD_OFFENSIVE .2byte EC_WORD_OH - .2byte EC_WORD_OH_DEAR + .2byte EC_WORD_UH_OH .2byte EC_WORD_OH_YEAH - .2byte EC_WORD_OH_KAY .2byte EC_WORD_OH_QUES - .2byte EC_WORD_OI + .2byte EC_WORD_WITHOUT .2byte EC_WORD_OI_OI_OI - .2byte EC_WORD_OK_QUES - .2byte EC_WORD_OKAY + .2byte EC_WORD_OH_KAY .2byte EC_WORD_OLD - .2byte EC_WORD_OLDEN - .2byte EC_POKEMON2(OMANYTE) - .2byte EC_POKEMON2(OMASTAR) - .2byte EC_WORD_ON - .2byte EC_WORD_ONCE + .2byte EC_POKEMON2(VENOMOTH) .2byte EC_POKEMON2(ONIX) - .2byte EC_WORD_ONLY - .2byte EC_WORD_OOPS - .2byte EC_WORD_OPPONENT - .2byte EC_WORD_OPPOSITE - .2byte EC_WORD_OR - .2byte EC_WORD_OTHER - .2byte EC_WORD_OUR - .2byte EC_WORD_OUT - .2byte EC_MOVE(OUTRAGE) - .2byte EC_WORD_OUTSIDE - .2byte EC_WORD_OVER - .2byte EC_WORD_OVERDO - .2byte EC_WORD_OVERGROW - .2byte EC_MOVE(OVERHEAT) - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_OWN - .2byte EC_WORD_OWN_TEMPO + .2byte EC_WORD_UNCLE + .2byte EC_WORD_HOPELESS + .2byte EC_WORD_WHOAH + .2byte EC_WORD_PLACE + .2byte EC_POKEMON2(EXEGGCUTE) gEasyChatWordsByLetter_P: - .2byte EC_MOVE(PAIN_SPLIT) + .2byte EC_POKEMON(CHIMECHO) + .2byte EC_POKEMON(SPINDA) + .2byte EC_POKEMON(CASCOON) + .2byte EC_POKEMON2(MR_MIME) + ec_duplicates 2 + .2byte EC_POKEMON(SKARMORY) + .2byte EC_POKEMON2(SKARMORY) + .2byte EC_WORD_SHELL_ARMOR + .2byte EC_MOVE(WITHDRAW) + .2byte EC_POKEMON(BEAUTIFLY) + .2byte EC_POKEMON2(JUMPLUFF) .2byte EC_POKEMON2(PARAS) .2byte EC_POKEMON2(PARASECT) .2byte EC_WORD_PARDON - .2byte EC_WORD_PARENT + .2byte EC_WORD_MATCH .2byte EC_WORD_PARTNER .2byte EC_WORD_PARTY - .2byte EC_WORD_PATTERN - .2byte EC_MOVE2(PAY_DAY) .2byte EC_WORD_PC - .2byte EC_MOVE2(PECK) .2byte EC_POKEMON(PELIPPER) .2byte EC_WORD_PERFECT .2byte EC_WORD_PERFECTION - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_POKEMON2(PERSIAN) + .2byte EC_POKEMON(CLAMPERL) .2byte EC_WORD_PERSON - .2byte EC_MOVE2(PETAL_DANCE) + .2byte EC_WORD_GRASS + .2byte EC_WORD_CHORES + .2byte EC_MOVE2(POUND) ec_duplicates 2 .2byte EC_POKEMON(PHANPY) .2byte EC_POKEMON2(PHANPY) - .2byte EC_WORD_PHONE ec_duplicates 2 .2byte EC_POKEMON(PICHU) .2byte EC_POKEMON2(PICHU) - .2byte EC_WORD_PICKUP - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_POKEMON2(PIDGEY) + .2byte EC_POKEMON2(CLEFAIRY) + .2byte EC_POKEMON2(CLEFFA) ec_duplicates 2 .2byte EC_POKEMON(PIKACHU) .2byte EC_POKEMON2(PIKACHU) - .2byte EC_POKEMON2(PILOSWINE) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_POKEMON2(PINECO) + .2byte EC_MOVE(SPORE) ec_duplicates 2 .2byte EC_POKEMON(PINSIR) .2byte EC_POKEMON2(PINSIR) - .2byte EC_WORD_PKRS - .2byte EC_WORD_PLACE - .2byte EC_WORD_PLANS - .2byte EC_WORD_PLAY - .2byte EC_WORD_PLAYED - .2byte EC_WORD_PLAYS - .2byte EC_WORD_PLEASE + .2byte EC_POKEMON2(CLEFABLE) + .2byte EC_MOVE2(SPLASH) + .2byte EC_WORD_CHAT .2byte EC_WORD_PLUS .2byte EC_WORD_PLUSH_DOLL .2byte EC_POKEMON(PLUSLE) - .2byte EC_WORD_POINTS - .2byte EC_WORD_POISON - .2byte EC_MOVE2(POISON_FANG) - .2byte EC_MOVE2(POISON_GAS) - .2byte EC_WORD_POISON_POINT - .2byte EC_MOVE2(POISON_STING) - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_WORD_POKEBLOCK .2byte EC_WORD_POKEDEX .2byte EC_WORD_POKEMON .2byte EC_WORD_POKENAV - .2byte EC_POKEMON2(POLITOED) - .2byte EC_POKEMON2(POLIWAG) - .2byte EC_POKEMON2(POLIWHIRL) - .2byte EC_POKEMON2(POLIWRATH) + .2byte EC_WORD_POKEBLOCK + .2byte EC_WORD_PKRS .2byte EC_POKEMON2(PONYTA) - .2byte EC_POKEMON(POOCHYENA) + .2byte EC_WORD_NEW .2byte EC_WORD_POPULAR + .2byte EC_POKEMON2(FARFETCHD) .2byte EC_POKEMON2(PORYGON) .2byte EC_POKEMON2(PORYGON2) - .2byte EC_MOVE2(POUND) - .2byte EC_MOVE(POWDER_SNOW) - .2byte EC_WORD_POWER - .2byte EC_WORD_PRAISE - .2byte EC_WORD_PREPOSTEROUS - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_PRETEND - .2byte EC_WORD_PRETTY - .2byte EC_POKEMON2(PRIMEAPE) - .2byte EC_WORD_PROBABLY - .2byte EC_WORD_PROMISE - .2byte EC_MOVE2(PROTECT) - .2byte EC_MOVE(PSYBEAM) - .2byte EC_MOVE(PSYCH_UP) - ec_duplicates 2 + .2byte EC_WORD_MAIL + .2byte EC_POKEMON2(SHUCKLE) + .2byte EC_MOVE(FOCUS_PUNCH) + .2byte EC_WORD_FORECAST + .2byte EC_MOVE2(BULK_UP) + .2byte EC_MOVE2(BEAT_UP) + .2byte EC_WORD_SNORT + .2byte EC_POKEMON2(ESPEON) .2byte EC_WORD_PSYCHIC + .2byte EC_MOVE(PSYCH_UP) .2byte EC_MOVE(PSYCHIC) - ec_duplicates 2 - .2byte EC_POKEMON(PSYDUCK) - .2byte EC_POKEMON2(PSYDUCK) + .2byte EC_MOVE(KINESIS) + .2byte EC_MOVE(PSYBEAM) .2byte EC_MOVE(PSYWAVE) - .2byte EC_POKEMON2(PUPITAR) - .2byte EC_WORD_PURE_POWER - .2byte EC_MOVE(PURSUIT) - .2byte EC_WORD_PUSHOVER -gEasyChatWordsByLetter_Q: - .2byte EC_POKEMON2(QUAGSIRE) - .2byte EC_WORD_QUESTION - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_QUITE - .2byte EC_POKEMON2(QWILFISH) + .2byte EC_WORD_SHIELD_DUST + .2byte EC_POKEMON(DUSTOX) + .2byte EC_WORD_WHITE_SMOKE + .2byte EC_MOVE(POWDER_SNOW) + ec_duplicates 2 + .2byte EC_POKEMON(JIGGLYPUFF) + .2byte EC_POKEMON2(JIGGLYPUFF) + .2byte EC_WORD_POINTS + .2byte EC_POKEMON2(PUPITAR) + .2byte EC_POKEMON(BALTOY) +gEasyChatWordsByLetter_Q: + .2byte EC_POKEMON2(POLIWRATH) + .2byte EC_POKEMON2(POLIWAG) + .2byte EC_POKEMON2(POLIWHIRL) + .2byte EC_POKEMON2(POLITOED) + .2byte EC_POKEMON2(SWINUB) + .2byte EC_POKEMON(TORKOAL) gEasyChatWordsByLetter_R: + .2byte EC_POKEMON2(TYROGUE) .2byte EC_WORD_RADIO - .2byte EC_MOVE(RAGE) ec_duplicates 2 .2byte EC_POKEMON(RAICHU) .2byte EC_POKEMON2(RAICHU) .2byte EC_POKEMON2(RAIKOU) - .2byte EC_MOVE(RAIN_DANCE) - .2byte EC_WORD_RAIN_DISH - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_RANK - .2byte EC_MOVE(RAPID_SPIN) - .2byte EC_POKEMON2(RAPIDASH) - .2byte EC_WORD_RARE - .2byte EC_WORD_RATHER - .2byte EC_POKEMON2(RATICATE) + .2byte EC_MOVE2(VINE_WHIP) + .2byte EC_POKEMON2(PRIMEAPE) + .2byte EC_MOVE(RAGE) + .2byte EC_MOVE2(RAZOR_LEAF) + .2byte EC_WORD_RIPPED .2byte EC_POKEMON2(RATTATA) + .2byte EC_POKEMON2(RATICATE) + .2byte EC_MOVE2(THIEF) + .2byte EC_MOVE(SMOKESCREEN) + .2byte EC_WORD_ROUGH_SKIN + .2byte EC_POKEMON2(CATERPIE) .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_MOVE2(RAZOR_LEAF) - .2byte EC_MOVE(RAZOR_WIND) - .2byte EC_WORD_READY - .2byte EC_WORD_REALLY - .2byte EC_WORD_REAR - .2byte EC_WORD_RECEIVED - .2byte EC_WORD_RECOMMEND - .2byte EC_MOVE(RECOVER) - .2byte EC_MOVE2(RECYCLE) + .2byte EC_MOVE2(HELPING_HAND) + .2byte EC_WORD_RIGHT + .2byte EC_WORD_TALKING + .2byte EC_WORD_TALK .2byte EC_MOVE2(REFLECT) - .2byte EC_MOVE2(REFRESH) - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_REFUSE + .2byte EC_WORD_RULE + .2byte EC_WORD_RAIN_DISH + .2byte EC_MOVE(RAIN_DANCE) .2byte EC_POKEMON(REGICE) .2byte EC_POKEMON(REGIROCK) .2byte EC_POKEMON(REGISTEEL) - .2byte EC_WORD_REJECT - .2byte EC_WORD_RELEASE + .2byte EC_WORD_ENOUGH + .2byte EC_WORD_TRAVEL + .2byte EC_POKEMON2(SNORLAX) .2byte EC_POKEMON(RELICANTH) .2byte EC_POKEMON2(REMORAID) - .2byte EC_WORD_RENTAL - .2byte EC_MOVE2(REST) - .2byte EC_WORD_RESUSCITATE - .2byte EC_MOVE(RETURN) - .2byte EC_MOVE2(REVENGE) - .2byte EC_MOVE(REVERSAL) - ec_duplicates 2 - .2byte EC_POKEMON(RHYDON) - .2byte EC_POKEMON2(RHYDON) + .2byte EC_WORD_RUN + .2byte EC_WORD_RUNS + .2byte EC_POKEMON(GROVYLE) + .2byte EC_WORD_CONCEDE + .2byte EC_POKEMON2(EKANS) + .2byte EC_WORD_CORRECT + .2byte EC_WORD_AGREE + .2byte EC_MOVE(SMELLING_SALT) ec_duplicates 2 .2byte EC_POKEMON(RHYHORN) .2byte EC_POKEMON2(RHYHORN) - .2byte EC_WORD_RIBBON - .2byte EC_WORD_RICKETY - .2byte EC_WORD_RIGHT - .2byte EC_WORD_RIPPED + .2byte EC_MOVE(DOUBLE_EDGE) .2byte EC_WORD_RIVAL - .2byte EC_MOVE2(ROAR) - .2byte EC_WORD_ROCK - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_ROCK_HEAD - .2byte EC_MOVE(ROCK_SLIDE) - .2byte EC_MOVE(ROCK_SMASH) - .2byte EC_MOVE(ROCK_THROW) - .2byte EC_MOVE(ROCK_TOMB) - .2byte EC_WORD_ROCK_SOLID + ec_duplicates 2 + .2byte EC_POKEMON(RHYDON) + .2byte EC_POKEMON2(RHYDON) + .2byte EC_WORD_STURDY + .2byte EC_WORD_SHADY .2byte EC_MOVE2(ROLE_PLAY) - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_MOVE(ROLLOUT) .2byte EC_WORD_ROMANTIC .2byte EC_POKEMON(ROSELIA) - .2byte EC_WORD_ROUGH_SKIN + .2byte EC_POKEMON2(JYNX) .2byte EC_WORD_RPG + .2byte EC_WORD_SMELL_YA .2byte EC_WORD_RUBY - .2byte EC_WORD_RULE - .2byte EC_WORD_RUN - .2byte EC_WORD_RUN_AWAY - .2byte EC_WORD_RUNS + .2byte EC_MOVE2(BLOCK) + .2byte EC_MOVE(RETURN) + .2byte EC_MOVE2(QUICK_ATTACK) + .2byte EC_WORD_HALL_OF_FAME + .2byte EC_WORD_DESTROYED + .2byte EC_MOVE(TAIL_WHIP) gEasyChatWordsByLetter_S: - .2byte EC_POKEMON(SABLEYE) - .2byte EC_MOVE(SACRED_FIRE) - .2byte EC_WORD_SAD - .2byte EC_WORD_SADLY - .2byte EC_MOVE(SAFEGUARD) + .2byte EC_WORD_DROOLING + .2byte EC_WORD_THINGS + .2byte EC_POKEMON2(METAPOD) + .2byte EC_POKEMON(GOREBYSS) + .2byte EC_WORD_INCREDIBLE + .2byte EC_WORD_SAYS .2byte EC_WORD_SAID - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_SAND_STREAM - .2byte EC_MOVE(SAND_TOMB) - .2byte EC_WORD_SAND_VEIL - .2byte EC_MOVE(SAND_ATTACK) + .2byte EC_WORD_COLLECT + .2byte EC_WORD_COLLECTION + .2byte EC_WORD_SATURDAY + .2byte EC_POKEMON(SEEDOT) + ec_duplicates 2 + .2byte EC_POKEMON(SANDSLASH) + .2byte EC_POKEMON2(SANDSLASH) ec_duplicates 2 .2byte EC_POKEMON(SANDSHREW) .2byte EC_POKEMON2(SANDSHREW) + .2byte EC_MOVE(SAND_TOMB) + .2byte EC_WORD_SAND_VEIL ec_duplicates 2 - .2byte EC_POKEMON(SANDSLASH) - .2byte EC_POKEMON2(SANDSLASH) + .2byte EC_WORD_SAND_STREAM .2byte EC_MOVE(SANDSTORM) + .2byte EC_MOVE(SAND_ATTACK) + .2byte EC_WORD_DOCILE .2byte EC_WORD_SAPPHIRE - .2byte EC_WORD_SATISFIED - .2byte EC_WORD_SATURDAY - .2byte EC_WORD_SAYS - .2byte EC_WORD_SCARY - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_SCATTER - .2byte EC_POKEMON(SCEPTILE) - .2byte EC_WORD_SCHOOL + .2byte EC_POKEMON2(VICTREEBEL) + .2byte EC_WORD_SUCTION_CUPS + .2byte EC_MOVE2(ACID) + .2byte EC_MOVE2(ACID_ARMOR) + .2byte EC_MOVE2(DETECT) + .2byte EC_MOVE2(SKULL_BASH) + .2byte EC_MOVE2(HYPER_VOICE) + .2byte EC_POKEMON(SILCOON) + .2byte EC_MOVE(SHARPEN) + .2byte EC_WORD_APPRECIATE + .2byte EC_MOVE(DIG) + .2byte EC_WORD_LOOKS + .2byte EC_WORD_SEEMS + .2byte EC_WORD_SHINE + .2byte EC_MOVE2(LUSTER_PURGE) + .2byte EC_WORD_BREAK + .2byte EC_WORD_HYPER_CUTTER .2byte EC_POKEMON2(SCIZOR) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_MOVE(SCREECH) - .2byte EC_POKEMON2(SCYTHER) + .2byte EC_WORD_JOKING + .2byte EC_WORD_TRENDY + .2byte EC_POKEMON2(SQUIRTLE) + .2byte EC_POKEMON2(WARTORTLE) + .2byte EC_WORD_SLEEP + .2byte EC_MOVE2(SLEEP_POWDER) + .2byte EC_MOVE2(SLEEP_TALK) + .2byte EC_WORD_SMACK + .2byte EC_WORD_SMITE + .2byte EC_MOVE2(SLUDGE) + .2byte EC_WORD_WELL + .2byte EC_WORD_BAD + .2byte EC_MOVE(LICK) + .2byte EC_WORD_TWIRLING + .2byte EC_WORD_SLEPT + .2byte EC_WORD_AWFUL + .2byte EC_MOVE(SLASH) + .2byte EC_WORD_BEAT + .2byte EC_POKEMON(SWALOT) + .2byte EC_POKEMON(GULPIN) + .2byte EC_POKEMON2(LICKITUNG) + .2byte EC_WORD_FINISH + .2byte EC_MOVE(FLATTER) + .2byte EC_WORD_SCATTER + .2byte EC_POKEMON(BARBOACH) + .2byte EC_MOVE2(PECK) + .2byte EC_MOVE(CLAMP) + .2byte EC_MOVE(SNORE) + .2byte EC_WORD_TRUANT ec_duplicates 2 - .2byte EC_POKEMON(SEADRA) - .2byte EC_POKEMON2(SEADRA) + .2byte EC_POKEMON(SLUGMA) + .2byte EC_POKEMON2(SLUGMA) + .2byte EC_WORD_FAST + .2byte EC_POKEMON(SNORUNT) + .2byte EC_WORD_LOVEY_DOVEY + .2byte EC_WORD_SADLY + .2byte EC_MOVE(ODOR_SLEUTH) + .2byte EC_MOVE2(SHOCK_WAVE) + .2byte EC_WORD_KIDDING + .2byte EC_WORD_THOSE_ARE + .2byte EC_WORD_BEAUTIFUL + .2byte EC_WORD_FORGIVE + .2byte EC_WORD_GO_EASY + .2byte EC_WORD_BEAUTY + .2byte EC_WORD_TERRIBLE + .2byte EC_WORD_CRY + .2byte EC_WORD_CRIES + .2byte EC_WORD_SCHOOL + .2byte EC_WORD_SHAKY + .2byte EC_MOVE2(PROTECT) + .2byte EC_WORD_THICK + .2byte EC_WORD_WEAK + .2byte EC_POKEMON(TAILLOW) + .2byte EC_POKEMON(SWELLOW) + .2byte EC_WORD_LEVITATE + .2byte EC_MOVE2(TAIL_GLOW) + .2byte EC_WORD_HARD + .2byte EC_MOVE2(SWORDS_DANCE) + .2byte EC_WORD_SISTER + .2byte EC_WORD_GIDDY + .2byte EC_WORD_MOMENTUM ec_duplicates 2 - .2byte EC_POKEMON(SEAKING) - .2byte EC_POKEMON2(SEAKING) + .2byte EC_POKEMON(KINGDRA) + .2byte EC_POKEMON2(KINGDRA) .2byte EC_POKEMON(SEALEO) - .2byte EC_WORD_SEARCH - .2byte EC_WORD_SECRET - .2byte EC_WORD_SECRET_BASE - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_WORD_SEE - .2byte EC_WORD_SEE_YA - .2byte EC_POKEMON(SEEDOT) - .2byte EC_WORD_SEEK - .2byte EC_POKEMON2(SEEL) - .2byte EC_WORD_SEEMS - .2byte EC_WORD_SEES - .2byte EC_MOVE2(SEISMIC_TOSS) - .2byte EC_MOVE(SELF_DESTRUCT) - .2byte EC_WORD_SENSE - .2byte EC_POKEMON2(SENTRET) - .2byte EC_WORD_SERENE_GRACE - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_SERVICE - .2byte EC_POKEMON(SEVIPER) - .2byte EC_MOVE(SHADOW_BALL) - .2byte EC_MOVE(SHADOW_PUNCH) - .2byte EC_WORD_SHADOW_TAG - .2byte EC_WORD_SHADY - .2byte EC_WORD_SHAKE - .2byte EC_WORD_SHAKY + .2byte EC_WORD_SPIRIT + ec_duplicates 2 + .2byte EC_POKEMON(SEADRA) + .2byte EC_POKEMON2(SEADRA) + .2byte EC_POKEMON(SPHEAL) + ec_duplicates 2 + .2byte EC_POKEMON(HORSEA) + .2byte EC_POKEMON2(HORSEA) + .2byte EC_WORD_WORKS + .2byte EC_MOVE2(FUTURE_SIGHT) + .2byte EC_WORD_VERY + .2byte EC_WORD_BE .2byte EC_WORD_SHALLOW - .2byte EC_POKEMON(SHARPEDO) - .2byte EC_MOVE(SHARPEN) + .2byte EC_WORD_HIS + .2byte EC_WORD_BEING + .2byte EC_WORD_SINCE + .2byte EC_WORD_RARE + .2byte EC_POKEMON(ZANGOOSE) + .2byte EC_WORD_SERVICE + .2byte EC_WORD_SIGH + .2byte EC_POKEMON(SHUPPET) + .2byte EC_POKEMON2(SCYTHER) .2byte EC_WORD_SHE + .2byte EC_WORD_THEY_VE + .2byte EC_WORD_SOME .2byte EC_WORD_SHE_IS + .2byte EC_WORD_WOMAN + .2byte EC_WORD_THEY_RE .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_SHED_SKIN - .2byte EC_POKEMON(SHEDINJA) - .2byte EC_MOVE(SHEER_COLD) - .2byte EC_POKEMON(SHELGON) - .2byte EC_WORD_SHELL_ARMOR - .2byte EC_POKEMON2(SHELLDER) - .2byte EC_WORD_SHIELD_DUST - .2byte EC_POKEMON(SHIFTRY) - .2byte EC_WORD_SHINE - .2byte EC_MOVE2(SHOCK_WAVE) - .2byte EC_WORD_SHOCKED - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_SHOULD - .2byte EC_WORD_SHOW - .2byte EC_WORD_SHREDDED - .2byte EC_POKEMON(SHROOMISH) - .2byte EC_POKEMON2(SHUCKLE) - .2byte EC_POKEMON(SHUPPET) - .2byte EC_WORD_SIBLINGS - .2byte EC_WORD_SIGH - .2byte EC_MOVE(SIGNAL_BEAM) - .2byte EC_POKEMON(SILCOON) - .2byte EC_WORD_SILKY + .2byte EC_WORD_THEY_WERE + .2byte EC_WORD_VICTORY + .2byte EC_WORD_CAN_T_WIN + .2byte EC_WORD_WHEN_I_WIN + .2byte EC_WORD_SEES + .2byte EC_MOVE2(LEER) .2byte EC_MOVE(SILVER_WIND) - .2byte EC_WORD_SIMPLE - .2byte EC_WORD_SINCE - .2byte EC_MOVE(SING) - .2byte EC_WORD_SINK - .2byte EC_WORD_SISTER ec_duplicates 2 - .2byte EC_POKEMON(SKARMORY) - .2byte EC_POKEMON2(SKARMORY) - .2byte EC_MOVE(SKETCH) - .2byte EC_WORD_SKILL - .2byte EC_MOVE(SKILL_SWAP) - .2byte EC_WORD_SKILLED - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_POKEMON(SKITTY) - .2byte EC_MOVE2(SKULL_BASH) - .2byte EC_MOVE(SKY_ATTACK) - .2byte EC_MOVE(SKY_UPPERCUT) - .2byte EC_MOVE2(SLACK_OFF) - .2byte EC_POKEMON(SLAKING) - .2byte EC_POKEMON(SLAKOTH) + .2byte EC_POKEMON(ALAKAZAM) + .2byte EC_POKEMON2(ALAKAZAM) + .2byte EC_WORD_THOSE + .2byte EC_WORD_AREN_T + .2byte EC_WORD_SENSE + ec_duplicates 2 + .2byte EC_POKEMON(HERACROSS) + .2byte EC_POKEMON2(HERACROSS) + .2byte EC_POKEMON2(GLIGAR) .2byte EC_MOVE2(SLAM) - .2byte EC_MOVE(SLASH) - .2byte EC_WORD_SLEEP - .2byte EC_MOVE2(SLEEP_POWDER) - .2byte EC_MOVE2(SLEEP_TALK) - .2byte EC_WORD_SLEPT - .2byte EC_WORD_SLIDE - .2byte EC_WORD_SLIMY - .2byte EC_POKEMON2(SLOWBRO) - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_MOVE2(SLUDGE) - .2byte EC_MOVE2(SLUDGE_BOMB) ec_duplicates 2 - .2byte EC_POKEMON(SLUGMA) - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_WORD_SMACK - .2byte EC_WORD_SMALL - .2byte EC_WORD_SMART - .2byte EC_WORD_SMARTNESS - .2byte EC_POKEMON2(SMEARGLE) - .2byte EC_WORD_SMELL - .2byte EC_WORD_SMELL_YA - .2byte EC_MOVE(SMELLING_SALT) - .2byte EC_WORD_SMITE + .2byte EC_POKEMON(GRIMER) + .2byte EC_POKEMON2(GRIMER) + ec_duplicates 2 + .2byte EC_POKEMON(MUK) + .2byte EC_POKEMON2(MUK) + .2byte EC_POKEMON2(BUTTERFREE) .2byte EC_MOVE(SMOG) - .2byte EC_MOVE(SMOKESCREEN) - .2byte EC_POKEMON2(SMOOCHUM) - .2byte EC_WORD_SMOOTH - .2byte EC_MOVE2(SNATCH) + ec_duplicates 2 + .2byte EC_POKEMON(WEEZING) + .2byte EC_POKEMON2(WEEZING) + ec_duplicates 2 + .2byte EC_POKEMON(KOFFING) + .2byte EC_POKEMON2(KOFFING) .2byte EC_POKEMON2(SNEASEL) - .2byte EC_MOVE(SNORE) - .2byte EC_POKEMON2(SNORLAX) - .2byte EC_WORD_SNORT - .2byte EC_POKEMON(SNORUNT) + .2byte EC_POKEMON2(PERSIAN) .2byte EC_POKEMON2(SNUBBULL) .2byte EC_WORD_SO - .2byte EC_MOVE2(SOFT_BOILED) + .2byte EC_WORD_AS_MUCH_AS .2byte EC_WORD_SOFTWARE .2byte EC_MOVE(SOLAR_BEAM) - .2byte EC_POKEMON(SOLROCK) - .2byte EC_WORD_SOME - .2byte EC_WORD_SOMEHOW - .2byte EC_WORD_SOMEONE - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_SOMETIME - .2byte EC_WORD_SON + .2byte EC_WORD_WEREN_T + .2byte EC_WORD_SUMMER + .2byte EC_MOVE(EXTRASENSORY) .2byte EC_WORD_SONG .2byte EC_WORD_SONGS - .2byte EC_MOVE(SONIC_BOOM) - .2byte EC_WORD_SOON + .2byte EC_MOVE2(SUNNY_DAY) + .2byte EC_POKEMON(SOLROCK) + .2byte EC_POKEMON2(SUNFLORA) + .2byte EC_POKEMON2(SUNKERN) + .2byte EC_WORD_SUNDAY + .2byte EC_WORD_WORRY + .2byte EC_WORD_CARE + .2byte EC_WORD_CARES .2byte EC_WORD_SORRY - .2byte EC_WORD_SOUNDPROOF - .2byte EC_WORD_SP_ABILITY - .2byte EC_MOVE(SPARK) - .2byte EC_POKEMON2(SPEAROW) - .2byte EC_WORD_SPECTATOR - .2byte EC_WORD_SPEED_BOOST - .2byte EC_POKEMON(SPHEAL) + .2byte EC_MOVE(TICKLE) + .2byte EC_WORD_LATE + .2byte EC_WORD_LATER + .2byte EC_WORD_WALK + .2byte EC_WORD_THICK_FAT + .2byte EC_MOVE2(MIRROR_COAT) + .2byte EC_MOVE(MIRROR_MOVE) + .2byte EC_WORD_GAME + .2byte EC_WORD_PLAY + .2byte EC_WORD_PLAYS + .2byte EC_WORD_PLAYED + .2byte EC_WORD_TOYS .2byte EC_MOVE(SPIDER_WEB) - .2byte EC_MOVE2(SPIKE_CANNON) - .2byte EC_MOVE2(SPIKES) - .2byte EC_POKEMON2(SPINARAK) - .2byte EC_POKEMON(SPINDA) - .2byte EC_WORD_SPIRALING - .2byte EC_WORD_SPIRIT - .2byte EC_MOVE2(SPIT_UP) - .2byte EC_MOVE(SPITE) - .2byte EC_MOVE2(SPLASH) .2byte EC_POKEMON(SPOINK) - .2byte EC_MOVE(SPORE) + .2byte EC_WORD_EFFECT_SPORE .2byte EC_WORD_SPORTS - .2byte EC_WORD_SPRING - .2byte EC_POKEMON2(SQUIRTLE) - .2byte EC_WORD_STAGE - .2byte EC_POKEMON2(STANTLER) + .2byte EC_MOVE(FOLLOW_ME) + .2byte EC_MOVE2(BOUNCE) + .2byte EC_MOVE2(JUMP_KICK) + .2byte EC_MOVE(SHADOW_BALL) + .2byte EC_MOVE(STUN_SPORE) + .2byte EC_MOVE2(SPIKES) + .2byte EC_MOVE2(BATON_PASS) + .2byte EC_WORD_STEEL + .2byte EC_MOVE2(STEEL_WING) + .2byte EC_POKEMON2(STEELIX) + .2byte EC_MOVE2(BARRAGE) + .2byte EC_MOVE2(STOMP) + .2byte EC_WORD_TOUGH + ec_duplicates 2 + .2byte EC_WORD_TOUGHNESS + .2byte EC_MOVE(STRENGTH) + .2byte EC_WORD_STRONG ec_duplicates 2 .2byte EC_POKEMON(STARMIE) .2byte EC_POKEMON2(STARMIE) .2byte EC_WORD_START + .2byte EC_WORD_STATIC + .2byte EC_WORD_INSTEAD + .2byte EC_MOVE(ROCK_SLIDE) + .2byte EC_WORD_ROCK_SOLID + .2byte EC_WORD_ROCK_HEAD + .2byte EC_MOVE(ROCK_THROW) ec_duplicates 2 .2byte EC_POKEMON(STARYU) .2byte EC_POKEMON2(STARYU) - .2byte EC_WORD_STATIC - .2byte EC_WORD_STAY_AT_HOME - .2byte EC_WORD_STEEL - .2byte EC_MOVE2(STEEL_WING) - .2byte EC_POKEMON2(STEELIX) - .2byte EC_WORD_STENCH - .2byte EC_WORD_STICKY_HOLD - .2byte EC_MOVE2(STOCKPILE) - .2byte EC_MOVE2(STOMP) + .2byte EC_MOVE(METEOR_MASH) + .2byte EC_MOVE(SWIFT) + .2byte EC_POKEMON(AGGRON) + .2byte EC_POKEMON(LAIRON) + .2byte EC_POKEMON(ARON) .2byte EC_WORD_STOP - .2byte EC_WORD_STORE - .2byte EC_WORD_STORES .2byte EC_WORD_STORY .2byte EC_WORD_STRATEGY - .2byte EC_MOVE(STRENGTH) - .2byte EC_MOVE(STRING_SHOT) - .2byte EC_WORD_STRONG - .2byte EC_MOVE2(STRUGGLE) - .2byte EC_WORD_STUDY - .2byte EC_MOVE(STUN_SPORE) - .2byte EC_WORD_STURDY - .2byte EC_MOVE(SUBMISSION) - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_SUCTION_CUPS - .2byte EC_POKEMON2(SUDOWOODO) - .2byte EC_POKEMON2(SUICUNE) - .2byte EC_WORD_SUMMER - .2byte EC_WORD_SUNDAY - .2byte EC_POKEMON2(SUNFLORA) - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_MOVE2(SUNNY_DAY) - .2byte EC_WORD_SUPER - .2byte EC_MOVE(SUPER_FANG) - .2byte EC_MOVE2(SUPERPOWER) - .2byte EC_MOVE2(SUPERSONIC) - .2byte EC_MOVE2(SURF) - .2byte EC_WORD_SURPRISE - .2byte EC_WORD_SURRENDER - .2byte EC_POKEMON(SURSKIT) - .2byte EC_POKEMON(SWABLU) - .2byte EC_MOVE(SWAGGER) - .2byte EC_MOVE2(SWALLOW) - .2byte EC_POKEMON(SWALOT) + .2byte EC_WORD_SEEK + .2byte EC_WORD_FIGHTS + .2byte EC_WORD_BANG + .2byte EC_WORD_TORRENT + .2byte EC_WORD_SEARCH + .2byte EC_POKEMON2(SUICUNE) .2byte EC_POKEMON(SWAMPERT) - .2byte EC_WORD_SWARM - .2byte EC_MOVE2(SWEET_KISS) - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_WORD_SWEETS - .2byte EC_POKEMON(SWELLOW) - .2byte EC_MOVE(SWIFT) - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_POKEMON2(SWINUB) - .2byte EC_MOVE2(SWORDS_DANCE) + .2byte EC_WORD_SUPER + .2byte EC_MOVE2(SUPERSONIC) + .2byte EC_MOVE(SUPER_FANG) + .2byte EC_MOVE2(SURF) .2byte EC_WORD_SYNCHRONIZE .2byte EC_MOVE(SYNTHESIS) .2byte EC_WORD_SYSTEM gEasyChatWordsByLetter_T: .2byte EC_MOVE2(TACKLE) - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_MOVE(TAIL_WHIP) - .2byte EC_POKEMON(TAILLOW) - .2byte EC_WORD_TAKE - .2byte EC_MOVE2(TAKE_DOWN) - .2byte EC_WORD_TAKE_THAT + .2byte EC_WORD_DAY + .2byte EC_WORD_HI + .2byte EC_WORD_EXCUSE + .2byte EC_WORD_DAYS + .2byte EC_MOVE2(SLACK_OFF) + .2byte EC_WORD_DAYTIME + .2byte EC_WORD_DAILY .2byte EC_WORD_TALENT - .2byte EC_WORD_TALK - .2byte EC_WORD_TALKING .2byte EC_POKEMON2(TANGELA) - .2byte EC_WORD_TASTY - .2byte EC_MOVE2(TAUNT) + .2byte EC_POKEMON(BELDUM) + .2byte EC_POKEMON2(PINECO) + .2byte EC_WORD_AUNT + .2byte EC_WORD_DANCE + .2byte EC_MOVE2(CAMOUFLAGE) + .2byte EC_WORD_ALLOWANCE + .2byte EC_POKEMON2(PIDGEOTTO) + .2byte EC_POKEMON2(PIDGEOT) + .2byte EC_POKEMON2(PIDGEY) + .2byte EC_MOVE2(DIVE) + .2byte EC_MOVE2(TEETER_DANCE) .2byte EC_POKEMON2(TAUROS) - .2byte EC_WORD_TCH - .2byte EC_WORD_TEACH - .2byte EC_WORD_TEACHER - .2byte EC_WORD_TEACHES + .2byte EC_WORD_TRADE .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_MOVE2(TEETER_DANCE) + .2byte EC_WORD_PHONE .2byte EC_MOVE2(TELEPORT) - .2byte EC_WORD_TELEVISION + .2byte EC_MOVE2(MACH_PUNCH) + .2byte EC_WORD_OWN_TEMPO + .2byte EC_WORD_SPEED_BOOST + .2byte EC_POKEMON(SHIFTRY) ec_duplicates 2 .2byte EC_POKEMON(TENTACOOL) .2byte EC_POKEMON2(TENTACOOL) ec_duplicates 2 .2byte EC_POKEMON(TENTACRUEL) .2byte EC_POKEMON2(TENTACRUEL) - .2byte EC_WORD_TERRIBLE .2byte EC_WORD_TEST - .2byte EC_WORD_THAN - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_THANKS - .2byte EC_WORD_THAT - .2byte EC_WORD_THAT_WAS - .2byte EC_WORD_THAT_S - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte EC_WORD_THE - .2byte EC_WORD_THEIR - .2byte EC_WORD_THERE - .2byte EC_WORD_THESE - .2byte EC_WORD_THESE_WERE - .2byte EC_WORD_THEY - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_THEY_RE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_THICK - .2byte EC_WORD_THICK_FAT - .2byte EC_MOVE2(THIEF) - .2byte EC_WORD_THIN - .2byte EC_WORD_THING - .2byte EC_WORD_THINGS - .2byte EC_WORD_THINK - .2byte EC_WORD_THINKS - .2byte EC_WORD_THIRSTY - .2byte EC_WORD_THIS - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte EC_WORD_THOSE - .2byte EC_WORD_THOSE_ARE - .2byte EC_WORD_THOSE_WERE - .2byte EC_MOVE(THRASH) - .2byte EC_WORD_THROW - .2byte EC_MOVE(THUNDER) - .2byte EC_MOVE2(THUNDER_WAVE) - .2byte EC_MOVE(THUNDERBOLT) - .2byte EC_MOVE(THUNDER_PUNCH) - .2byte EC_MOVE2(THUNDER_SHOCK) - .2byte EC_WORD_THURSDAY - .2byte EC_MOVE(TICKLE) - .2byte EC_WORD_TICKLISH - .2byte EC_WORD_TIGHT - .2byte EC_WORD_TIME - .2byte EC_WORD_TIMES - .2byte EC_WORD_TIRED - .2byte EC_WORD_TO - .2byte EC_WORD_TO_HER - .2byte EC_WORD_TO_ME - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_TO_US - .2byte EC_WORD_TO_WHOM - .2byte EC_WORD_TODAY + .2byte EC_WORD_EXPENSIVE + .2byte EC_WORD_DEEP + .2byte EC_WORD_LOWS + .2byte EC_WORD_DAUGHTER + .2byte EC_MOVE(LOVELY_KISS) .2byte EC_POKEMON2(TOGEPI) - .2byte EC_WORD_TOGETHER .2byte EC_POKEMON2(TOGETIC) - .2byte EC_WORD_TOMORROW - .2byte EC_WORD_TOO - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_TOO_STRONG - .2byte EC_WORD_TOO_WEAK + .2byte EC_POKEMON(SHARPEDO) .2byte EC_WORD_TOP - .2byte EC_POKEMON(TORCHIC) - .2byte EC_POKEMON(TORKOAL) - .2byte EC_MOVE(TORMENT) - .2byte EC_WORD_TORRENT - .2byte EC_WORD_TOTALLY - .2byte EC_POKEMON2(TOTODILE) - .2byte EC_WORD_TOUGH - .2byte EC_WORD_TOUGHNESS - .2byte EC_WORD_TOURNAMENT + .2byte EC_POKEMON2(TYPHLOSION) .2byte EC_MOVE2(TOXIC) - .2byte EC_WORD_TOYS - .2byte EC_WORD_TRACE - .2byte EC_WORD_TRADE - .2byte EC_WORD_TRAIN + .2byte EC_POKEMON2(CUBONE) .2byte EC_WORD_TRAINER + .2byte EC_WORD_TRAIN .2byte EC_WORD_TRAINS - .2byte EC_MOVE2(TRANSFORM) - .2byte EC_POKEMON(TRAPINCH) - .2byte EC_WORD_TRAVEL - .2byte EC_WORD_TREASURE - .2byte EC_POKEMON(TREECKO) - .2byte EC_WORD_TRENDY - .2byte EC_MOVE2(TRI_ATTACK) + .2byte EC_POKEMON(RALTS) + .2byte EC_WORD_DREAM + .2byte EC_POKEMON2(DROWZEE) + .2byte EC_MOVE2(DREAM_EATER) + .2byte EC_POKEMON2(MISDREAVUS) + .2byte EC_WORD_SAD + .2byte EC_WORD_HIT .2byte EC_MOVE2(TRICK) - .2byte EC_WORD_TRIES - .2byte EC_MOVE2(TRIPLE_KICK) + .2byte EC_WORD_MEETS + .2byte EC_WORD_DRINK + .2byte EC_WORD_DRINKS + .2byte EC_MOVE2(TRI_ATTACK) .2byte EC_POKEMON(TROPIUS) - .2byte EC_WORD_TRUANT - .2byte EC_WORD_TRULY + .2byte EC_WORD_EVEN_SO + .2byte EC_MOVE2(FALSE_SWIPE) + .2byte EC_MOVE(FAKE_TEARS) .2byte EC_WORD_TRUMP_CARD - .2byte EC_WORD_TRUST - .2byte EC_WORD_TRY - .2byte EC_WORD_TUESDAY - .2byte EC_MOVE2(TWINEEDLE) - .2byte EC_WORD_TWIRLING - .2byte EC_MOVE2(TWISTER) + .2byte EC_WORD_BYE_BYE + .2byte EC_WORD_GOOD_BYE + .2byte EC_WORD_TCH + .2byte EC_MOVE(RAPID_SPIN) + .2byte EC_MOVE(EXTREME_SPEED) + .2byte EC_MOVE2(HI_JUMP_KICK) + .2byte EC_WORD_TOURNAMENT + .2byte EC_POKEMON2(BLASTOISE) + .2byte EC_POKEMON(CACNEA) + .2byte EC_WORD_DOES .2byte EC_WORD_TYPE - .2byte EC_POKEMON2(TYPHLOSION) - .2byte EC_POKEMON2(TYRANITAR) - .2byte EC_POKEMON2(TYROGUE) + .2byte EC_WORD_DUDE + .2byte EC_POKEMON2(CROCONAW) gEasyChatWordsByLetter_U: - .2byte EC_WORD_UGLY + .2byte EC_WORD_OVER + .2byte EC_WORD_HUSTLE + .2byte EC_WORD_EXCESS + .2byte EC_WORD_TOMORROW + .2byte EC_MOVE2(SNATCH) + .2byte EC_WORD_SURPRISE + .2byte EC_MOVE(SUBMISSION) + .2byte EC_WORD_OVERDO + .2byte EC_MOVE(VITAL_THROW) + .2byte EC_WORD_AWW .2byte EC_WORD_UH_HUH - .2byte EC_WORD_UH_OH - .2byte EC_WORD_UM - .2byte EC_POKEMON2(UMBREON) - .2byte EC_WORD_UNAVOIDABLE - .2byte EC_WORD_UNBELIEVABLE - .2byte EC_WORD_UNCLE - .2byte EC_WORD_UNDERSTAND - .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_UNDERSTOOD - .2byte EC_POKEMON2(UNOWN) - .2byte EC_WORD_UNTIL - .2byte EC_WORD_UP - .2byte EC_WORD_UPBEAT - .2byte EC_MOVE(UPROAR) + .2byte EC_MOVE(SONIC_BOOM) + .2byte EC_POKEMON2(WEEPINBELL) .2byte EC_WORD_UPSIDE_DOWN - .2byte EC_WORD_URGH + .2byte EC_WORD_ABOUT + .2byte EC_MOVE(CONSTRICT) + .2byte EC_MOVE2(CONVERSION) + .2byte EC_MOVE2(CONVERSION_2) + .2byte EC_WORD_AND + .2byte EC_WORD_UNBELIEVABLE + .2byte EC_WORD_SCARY + .2byte EC_WORD_DARK + .2byte EC_WORD_IMPOSSIBLE + .2byte EC_WORD_INVINCIBLE + .2byte EC_WORD_OUR + .2byte EC_WORD_BELOW + .2byte EC_WORD_ENTERTAINING + .2byte EC_WORD_NO_MATCH + .2byte EC_WORD_LESSONS + .2byte EC_WORD_UNAVOIDABLE + .2byte EC_WORD_TRY + .2byte EC_WORD_LACKING + .2byte EC_WORD_VACATION .2byte EC_POKEMON2(URSARING) - .2byte EC_WORD_USE - .2byte EC_WORD_USELESS - .2byte EC_WORD_USES - .2byte EC_WORD_USING gEasyChatWordsByLetter_V: - .2byte EC_WORD_VACATION - .2byte EC_POKEMON2(VAPOREON) - .2byte EC_POKEMON2(VENOMOTH) - .2byte EC_POKEMON2(VENONAT) - .2byte EC_POKEMON2(VENUSAUR) + .2byte EC_WORD_FATHER + .2byte EC_WORD_DATE + .2byte EC_WORD_ALLY + .2byte EC_WORD_DARN + .2byte EC_MOVE(PURSUIT) + .2byte EC_MOVE2(REVENGE) + .2byte EC_WORD_FORGET + .2byte EC_WORD_FORGETS + .2byte EC_WORD_ADORE + .2byte EC_MOVE2(TAUNT) + .2byte EC_WORD_MISHEARD + .2byte EC_WORD_IF_I_LOSE + .2byte EC_WORD_LOSE + .2byte EC_WORD_LOST + .2byte EC_WORD_LOSS + .2byte EC_WORD_LIKELY_TO + .2byte EC_WORD_WEIRD + .2byte EC_WORD_DIFFERENT + .2byte EC_WORD_DISAPPEAR + .2byte EC_WORD_SINK .2byte EC_WORD_VERSION - .2byte EC_WORD_VERSUS - .2byte EC_WORD_VERY + .2byte EC_WORD_PROMISE + .2byte EC_WORD_UNDERSTOOD + .2byte EC_WORD_NATURALLY + .2byte EC_WORD_HIDDEN + .2byte EC_WORD_UNDERSTAND + .2byte EC_WORD_UNDERSTANDS + .2byte EC_WORD_TRIES + .2byte EC_WORD_TRUST + .2byte EC_WORD_USING + .2byte EC_WORD_CONFUSED + .2byte EC_MOVE2(INGRAIN) + .2byte EC_MOVE2(SWALLOW) + .2byte EC_WORD_APOLOGIZE + .2byte EC_MOVE2(STRUGGLE) .2byte EC_POKEMON(VIBRAVA) - .2byte EC_MOVE2(VICE_GRIP) - .2byte EC_WORD_VICTORY - .2byte EC_POKEMON2(VICTREEBEL) - .2byte EC_WORD_VIEWING - .2byte EC_POKEMON(VIGOROTH) - ec_duplicates 2 - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_MOVE2(VINE_WHIP) - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_MOVE(VITAL_THROW) + .2byte EC_WORD_A_LOT + .2byte EC_WORD_MUCH + .2byte EC_MOVE2(MEGAHORN) + .2byte EC_WORD_MAYBE + .2byte EC_POKEMON(SEVIPER) + .2byte EC_MOVE(HEAL_BELL) + .2byte EC_WORD_KTHX_BYE .2byte EC_POKEMON(VOLBEAT) + .2byte EC_WORD_FULL .2byte EC_WORD_VOLT_ABSORB + .2byte EC_POKEMON(MANECTRIC) + .2byte EC_POKEMON2(MAREEP) ec_duplicates 2 .2byte EC_POKEMON(VOLTORB) .2byte EC_POKEMON2(VOLTORB) - .2byte EC_WORD_VORACIOUS + .2byte EC_WORD_FROM + .2byte EC_WORD_BEFORE + .2byte EC_WORD_LIKES + .2byte EC_WORD_FRONT + .2byte EC_WORD_PRETEND + ec_duplicates 2 + .2byte EC_POKEMON(NINETALES) + .2byte EC_POKEMON2(NINETALES) ec_duplicates 2 .2byte EC_POKEMON(VULPIX) .2byte EC_POKEMON2(VULPIX) gEasyChatWordsByLetter_W: .2byte EC_WORD_WAAAH + .2byte EC_POKEMON2(FLAAFFY) + .2byte EC_POKEMON(SWABLU) + .2byte EC_WORD_GUARD + .2byte EC_MOVE(GROWTH) + .2byte EC_WORD_WAKES_UP + .2byte EC_WORD_RICKETY .2byte EC_WORD_WAHAHAHA + .2byte EC_WORD_CHOICE + .2byte EC_WORD_CHOOSE + .2byte EC_WORD_WHILE + .2byte EC_WORD_TRULY .2byte EC_POKEMON(WAILMER) .2byte EC_POKEMON(WAILORD) - .2byte EC_WORD_WAIT - .2byte EC_WORD_WAKE_UP - .2byte EC_WORD_WAKES_UP - .2byte EC_WORD_WALK + .2byte EC_POKEMON(WALREIN) + .2byte EC_MOVE(ROLLOUT) .2byte EC_WORD_WALKING .2byte EC_WORD_WALKS - .2byte EC_POKEMON(WALREIN) - .2byte EC_WORD_WANDERING - .2byte EC_WORD_WANNABE - .2byte EC_WORD_WANT - .2byte EC_WORD_WANTS - .2byte EC_POKEMON2(WARTORTLE) + .2byte EC_MOVE2(TRANSFORM) .2byte EC_WORD_WAS .2byte EC_WORD_WASN_T - .2byte EC_WORD_WATER - .2byte EC_WORD_WATER_ABSORB - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_MOVE2(WATER_SPORT) - .2byte EC_MOVE(WATER_SPOUT) - .2byte EC_WORD_WATER_VEIL - .2byte EC_MOVE2(WATERFALL) - .2byte EC_WORD_WAY - .2byte EC_WORD_WE - .2byte EC_WORD_WE_RE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_WEAK - .2byte EC_WORD_WEAKENED - .2byte EC_MOVE(WEATHER_BALL) - .2byte EC_WORD_WEDNESDAY - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_WORD_WEEK - .2byte EC_POKEMON2(WEEPINBELL) - ec_duplicates 2 - .2byte EC_POKEMON(WEEZING) - .2byte EC_POKEMON2(WEEZING) - .2byte EC_WORD_WEIRD - .2byte EC_WORD_WELCOME - .2byte EC_WORD_WELL - .2byte EC_WORD_WELL_THEN - .2byte EC_WORD_WENT - .2byte EC_WORD_WERE - .2byte EC_WORD_WEREN_T + .2byte EC_WORD_BEEN + .2byte EC_WORD_WHY .2byte EC_WORD_WHAT .2byte EC_WORD_WHAT_S_UP_QUES - .2byte EC_WORD_WHEN - .2byte EC_WORD_WHEN_I_WIN - .2byte EC_WORD_WHERE + .2byte EC_WORD_WATER + .2byte EC_WORD_CHANNEL + .2byte EC_WORD_SWIFT_SWIM + .2byte EC_POKEMON(WURMPLE) + .2byte EC_POKEMON2(SPINARAK) + .2byte EC_WORD_CHANGE + .2byte EC_WORD_SHADOW_TAG + .2byte EC_MOVE2(SOFT_BOILED) + .2byte EC_WORD_REFUSE + .2byte EC_WORD_MEET + .2byte EC_WORD_KNOWS + .2byte EC_MOVE(MIST) + .2byte EC_WORD_FAR + .2byte EC_WORD_GO_AHEAD .2byte EC_WORD_WHICH - .2byte EC_WORD_WHILE - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_MOVE2(WHIRLWIND) .2byte EC_POKEMON(WHISCASH) - .2byte EC_POKEMON(WHISMUR) - .2byte EC_WORD_WHITE_SMOKE + .2byte EC_WORD_WORLD + .2byte EC_WORD_WHOM + .2byte EC_WORD_A_TINY_BIT + .2byte EC_WORD_LESS + .2byte EC_WORD_IF .2byte EC_WORD_WHO .2byte EC_WORD_WHO_IS - .2byte EC_WORD_WHO_WAS - .2byte EC_WORD_WHOAH - .2byte EC_WORD_WHOM + .2byte EC_WORD_WON_T + .2byte EC_WORD_WILL + .2byte EC_WORD_THROW + .2byte EC_WORD_STICKY_HOLD + .2byte EC_MOVE(SKILL_SWAP) + .2byte EC_WORD_NATURE .2byte EC_WORD_WHOSE - .2byte EC_WORD_WHY - ec_duplicates 2 - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_POKEMON2(WIGGLYTUFF) + .2byte EC_WORD_CONTEST + .2byte EC_MOVE(WHIRLPOOL) + .2byte EC_WORD_IMPORTANT + .2byte EC_MOVE2(WRAP) + .2byte EC_WORD_HOW_DO + .2byte EC_WORD_HUH_QUES + .2byte EC_POKEMON(CRADILY) + .2byte EC_POKEMON2(FURRET) + .2byte EC_POKEMON2(SENTRET) .2byte EC_WORD_WILD - .2byte EC_WORD_WILL - .2byte EC_WORD_WILL_BE_HERE - .2byte EC_MOVE(WILL_O_WISP) - .2byte EC_WORD_WIMPY - .2byte EC_WORD_WIN - .2byte EC_MOVE2(WING_ATTACK) + .2byte EC_WORD_WANTS + .2byte EC_MOVE(MIND_READER) + .2byte EC_WORD_WELCOME + .2byte EC_MOVE2(TWISTER) + .2byte EC_MOVE(AIR_CUTTER) + .2byte EC_MOVE(GUST) .2byte EC_POKEMON(WINGULL) - .2byte EC_WORD_WINNER - .2byte EC_WORD_WINS .2byte EC_WORD_WINTER - .2byte EC_MOVE2(WISH) - .2byte EC_WORD_WITH - .2byte EC_MOVE(WITHDRAW) - .2byte EC_WORD_WITHOUT - .2byte EC_WORD_WOBBLY + .2byte EC_WORD_WE + .2byte EC_WORD_WE_VE + .2byte EC_WORD_WE_RE + .2byte EC_WORD_SPIRALING + .2byte EC_MOVE2(WHIRLWIND) + .2byte EC_WORD_BECOMES + .2byte EC_WORD_WILL_BE_HERE + .2byte EC_WORD_QUITE + .2byte EC_WORD_KNOW + .2byte EC_WORD_WHERE + .2byte EC_WORD_WEEK ec_duplicates 2 .2byte EC_POKEMON(WOBBUFFET) .2byte EC_POKEMON2(WOBBUFFET) - .2byte EC_WORD_WOMAN - .2byte EC_WORD_WON - .2byte EC_WORD_WON_T + .2byte EC_WORD_CLOUD_NINE + .2byte EC_WORD_WROOOAAR_EXCL + .2byte EC_WORD_WORD + .2byte EC_WORD_WOW + .2byte EC_MOVE2(DYNAMIC_PUNCH) .2byte EC_WORD_WONDER .2byte EC_WORD_WONDER_GUARD - .2byte EC_POKEMON2(WOOPER) - .2byte EC_WORD_WORD - .2byte EC_WORD_WORK - .2byte EC_WORD_WORKING - .2byte EC_WORD_WORKS - .2byte EC_WORD_WORLD - .2byte EC_WORD_WORRY + .2byte EC_MOVE2(WISH) .2byte EC_WORD_WOULD - .2byte EC_WORD_WOW - .2byte EC_WORD_WOWEE - .2byte EC_MOVE2(WRAP) - .2byte EC_WORD_WROOOAAR_EXCL - .2byte EC_POKEMON(WURMPLE) - .2byte EC_POKEMON(WYNAUT) + .2byte EC_WORD_WERE + .2byte EC_WORD_INCREASING + .2byte EC_WORD_SILKY + .2byte EC_WORD_ANGER + .2byte EC_MOVE(OUTRAGE) + .2byte EC_WORD_ANGRY gEasyChatWordsByLetter_X: ec_duplicates 2 .2byte EC_POKEMON(XATU) .2byte EC_POKEMON2(XATU) gEasyChatWordsByLetter_Y: - .2byte EC_WORD_YAHOO .2byte EC_POKEMON2(YANMA) - .2byte EC_MOVE(YAWN) - .2byte EC_WORD_YAY .2byte EC_WORD_YEAH .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_YEEHAW_EXCL - .2byte EC_WORD_YES - .2byte EC_WORD_YES_SIR_EXCL - .2byte EC_WORD_YESTERDAY - .2byte EC_WORD_YET - .2byte EC_WORD_YO - .2byte EC_WORD_YOU - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_YOUNG - .2byte EC_WORD_YOUR - .2byte EC_WORD_YOURS - .2byte EC_WORD_YUP + .2byte EC_WORD_COUPLE gEasyChatWordsByLetter_Z: - .2byte EC_POKEMON(ZANGOOSE) - .2byte EC_MOVE2(ZAP_CANNON) + .2byte EC_WORD_COUNT_ON + .2byte EC_MOVE2(PAY_DAY) .2byte EC_POKEMON2(ZAPDOS) + .2byte EC_MOVE2(MAGICAL_LEAF) + .2byte EC_WORD_SHOW + .2byte EC_WORD_TIME + .2byte EC_WORD_TIMES + .2byte EC_MOVE2(CRUSH_CLAW) + .2byte EC_MOVE(CUT) + .2byte EC_MOVE(ROCK_SMASH) + .2byte EC_WORD_AIM + .2byte EC_MOVE2(LOCK_ON) .2byte EC_POKEMON(ZIGZAGOON) + .2byte EC_WORD_FIERY + .2byte EC_WORD_WOBBLY + .2byte EC_POKEMON(SABLEYE) + .2byte EC_WORD_LOSING + .2byte EC_MOVE2(FURY_CUTTER) + .2byte EC_WORD_TO + .2byte EC_WORD_TO_ME + .2byte EC_WORD_TOO_WEAK + .2byte EC_WORD_TOO_LATE + .2byte EC_WORD_TOO_STRONG ec_duplicates 2 .2byte EC_POKEMON(ZUBAT) .2byte EC_POKEMON2(ZUBAT) + .2byte EC_WORD_SATISFIED + .2byte EC_MOVE(ENCORE) + .2byte EC_WORD_LISTEN + .2byte EC_WORD_BACK + .2byte EC_WORD_TOGETHER + .2byte EC_WORD_SPECTATOR + .2byte EC_MOVE2(ASSIST) + .2byte EC_POKEMON(DUSCLOPS) + .2byte EC_POKEMON(DUSKULL) gEasyChatWordsByLetter_End: .align 1 diff --git a/data/text/eon_ticket.inc b/data/text/eon_ticket.inc index 0da9317af..b979f472e 100644 --- a/data/text/eon_ticket.inc +++ b/data/text/eon_ticket.inc @@ -1,44 +1,45 @@ UnknownString_81C5033: @ 81C5033 - .string "DAD: {PLAYER}! Good to see you!\n" - .string "There’s a letter here for you, {PLAYER}.$" + .string "VATER: {PLAYER}! Schön, dich zu sehen!\n" + .string "Hier habe ich einen Brief für dich.$" UnknownString_81C5070: @ 81C5070 - .string "DAD: I guess this is a PASS for a ship.\n" - .string "But I’ve never seen this ship before.\p" - .string "You should find out what this is about\n" - .string "in LILYCOVE.$" + .string "VATER: Das muss ein FAHRSCHEIN\n" + .string "für ein Schiff sein. Aber für welches?\p" + .string "In SEEGRASULB CITY kann dir bestimmt\n" + .string "jemand mehr dazu sagen.$" LilycoveCity_Harbor_Text_1C50F2:: @ 81C50F2 - .string "The ferry to SLATEPORT is...\p" - .string "Oh?\n" - .string "That PASS...$" + .string "Die Fähre nach GRAPHITPORT CITY ist...\p" + .string "Oh!\n" + .string "Der FAHRSCHEIN...$" LilycoveCity_Harbor_Text_1C5120:: @ 81C5120 - .string "Aye, mate, are you the one who brought\n" - .string "that mighty odd PASS?\p" - .string "I’ll tell you, you’re trying to reach a\n" - .string "tiny spit of an island far in the south.\p" - .string "There’s no telling what we’ll encounter\n" - .string "once we reach there, aye.\l" - .string "That shivers my timbers!\p" - .string "All aboard!$" + .string "Aye, Maat, hast du den alten FAHRSCHEIN\n" + .string "mitgebracht?\p" + .string "Ich sage dir, du bist auf dem Weg zu\n" + .string "einer briefmarkengroßen Insel im Süden.\p" + .string "Niemand kann sagen, was uns dort er-\n" + .string "warten wird, aye. Und das erschüttert\l" + .string "meine alten Knochen!\p" + .string "Alle Mann an Bord!$" SouthernIsland_Exterior_Text_1C5215:: @ 81C5215 - .string "Aye, mate, there’s nothing here to\n" - .string "see or do on this forgettable island.\p" - .string "What say we sail back to LILYCOVE?$" + .string "Aye, Maat, auf dieser gottverlassenen\n" + .string "Insel gibt’s nichts zu sehen und zu tun.\p" + .string "Sollen wir nicht nach SEEGRASULB CITY\n" + .string "zurücksegeln?$" SouthernIsland_Exterior_Text_1C5281:: @ 81C5281 - .string "Aye, right, then!\n" - .string "Sail home we will!$" + .string "Aye, alles klar!\n" + .string "Segeln wir nach Hause!$" SouthernIsland_Exterior_Text_1C52A6:: @ 81C52A6 - .string "Aye, right, as you like, then.$" + .string "Aye, ganz wie du willst.$" SouthernIsland_Interior_Text_1C52C5:: @ 81C52C5 - .string "“All dreams are but another reality.\n" - .string "Never forget...”$" + .string "“Alle Träume sind nur eine andere\n" + .string "Realität. Vergiss das nicht...”$" SouthernIsland_Exterior_Text_1C52FB:: @ 81C52FB - .string "“Those whose memories fade seek to\n" - .string "carve them in their hearts...”$" + .string "“Die, denen die Erinnerung verblasst,\n" + .string "versuchen sie im Herzen zu halten.”$" diff --git a/data/text/gabby_and_ty.inc b/data/text/gabby_and_ty.inc index d0eb413be..a1a65459d 100644 --- a/data/text/gabby_and_ty.inc +++ b/data/text/gabby_and_ty.inc @@ -1,244 +1,247 @@ Route111_Text_1ABED8:: @ 81ABED8 - .string "GABBY: Oh! We’ve just spotted a tough-\n" - .string "looking TRAINER here of all places!\p" - .string "Okay, roll camera!\n" - .string "Let’s get this interview.$" + .string "PIA: Oh! Wir haben hier viele stark\n" + .string "aussehende TRAINER gesehen!\p" + .string "Okay, Kamera ab!\n" + .string "Interviewen wir jemanden!$" Route111_Text_1ABF50:: @ 81ABF50 Route118_Text_1ABF50:: @ 81ABF50 Route120_Text_1ABF50:: @ 81ABF50 - .string "GABBY: Oh! You’re {PLAYER}! Hi!\n" - .string "Do you remember us from last time?\p" - .string "Can you show us how much stronger\n" - .string "you’ve become? Okay, cue interview!$" + .string "PIA: Oh! Du bist {PLAYER}! Hallo!\n" + .string "Erinnerst du dich an uns?\p" + .string "Zeigst du uns, wie stark du geworden\n" + .string "bist? Okay, das war das Stichwort.$" Route111_Text_1ABFD3:: @ 81ABFD3 - .string "GABBY: My eyes didn’t lie!\n" - .string "I did discover an astonishing TRAINER!$" + .string "PIA: Mein Gefühl hat nicht getrogen.\n" + .string "Der TRAINER ist wirklich erstaunlich.$" Route111_Text_1AC015:: @ 81AC015 - .string "GABBY: Awesome! Awesome!\n" - .string "Who are you?!\p" - .string "I knew we were onto something wild\n" - .string "when we spotted you!\p" - .string "Oh, please let me explain. We travel\n" - .string "around everywhere interviewing all\l" - .string "sorts of TRAINERS.\p" - .string "So, would you give us a bit of your time\n" - .string "for an interview?$" + .string "PIA: Erstaunlich! Erstaunlich!\n" + .string "Wer bist du?!?\p" + .string "Ich wusste, wir erleben etwas Außer-\n" + .string "gewöhnliches, als ich dich gesehen habe.\p" + .string "Oh, ich schulde dir eine Erklärung. Wir\n" + .string "reisen durch das Land und führen mit\l" + .string "TRAINERN Interviews.\p" + .string "Würdest du uns auch etwas von deiner\n" + .string "Zeit zur Verfügung stellen?$" Route111_Text_1AC10A:: @ 81AC10A - .string "GABBY: “{STR_VAR_1}!”\p" - .string "Do you remember? That’s the quote you\n" - .string "gave us as the battle clincher last time.\p" - .string "I never, ever forget stuff like that!$" + .string "PIA: “{STR_VAR_1}!”\p" + .string "Erinnerst du dich? Das hast du uns das\n" + .string "letzte Mal nach einem Kampf gesagt.\p" + .string "So etwas vergesse ich nie!$" Route111_Text_1AC18D:: @ 81AC18D - .string "The last time we battled, you stomped\n" - .string "us before we could brace ourselves...\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" + .string "Als wir das letzte Mal kämpften, hast du\n" + .string "uns in den Boden gerammt, bevor wir\l" + .string "etwas dagegen tun konnten...\p" + .string "Und wie sieht es heute aus? Dürfen\n" + .string "wir dich noch einmal interviewen?$" Route111_Text_1AC219:: @ 81AC219 - .string "The last time we battled, didn’t you\n" - .string "throw a POKé BALL at us?\p" - .string "We were shocked! So we told everyone,\n" - .string "just everyone, about it!\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" + .string "Hast du bei unserem letzten Kampf nicht\n" + .string "einen POKéBALL nach uns geworfen?\p" + .string "Wir waren geschockt! Daher haben wir\n" + .string "das jedem, wirklich jedem, erzählt!\p" + .string "Was meinst du? Dürfen wir dich noch\n" + .string "einmal interviewen?$" Route111_Text_1AC2D6:: @ 81AC2D6 - .string "The last time we battled, your item\n" - .string "skills cleverly did us in.\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" + .string "Bei unserem letzten Kampf hast du uns\n" + .string "mit dem Einsatz der Items geschlagen.\p" + .string "Was meinst du? Dürfen wir dich noch\n" + .string "einmal interviewen?$" Route111_Text_1AC355:: @ 81AC355 - .string "The last time we battled, we managed\n" - .string "to look respectable.\p" - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" + .string "In unserem letzten Kampf haben wir uns\n" + .string "bemüht, nicht ganz so übel auszusehen.\p" + .string "Was meinst du? Dürfen wir dich noch\n" + .string "einmal interviewen?$" Route111_Text_1AC3CF:: @ 81AC3CF - .string "Anyway, what do you think?\n" - .string "Do you want to be interviewed again?$" + .string "Was meinst du? Dürfen wir dich noch\n" + .string "einmal interviewen?$" Route111_Text_1AC40F:: @ 81AC40F - .string "You will?\n" - .string "Thank you!\p" - .string "Okay, I need you to describe your\n" - .string "feelings about our battle, but it\l" - .string "has to be short and sweet. Go!$" + .string "Ja?\n" + .string "Wunderbar! Danke!\p" + .string "Okay. Wie würdest du deine Gefühle\n" + .string "hinsichtlich unseres Kampfes\l" + .string "beschreiben? Kurz und nett, bitte.$" Route111_Text_1AC487:: @ 81AC487 - .string "GABBY: Mmm, yeah!\n" - .string "That’s the perfect clincher!\p" - .string "I get the feeling that this will make\n" - .string "a great TV show.\p" - .string "There’s a chance that they’ll air this\n" - .string "on TV, so make sure to look for us!\p" + .string "PIA: Mmm, yeah!\n" + .string "Das ist das perfekte Schlagwort!\p" + .string "Ich bin überzeugt, dass dies eine groß-\n" + .string "artige TV-Sendung wäre!\p" + .string "Vielleicht strahlen sie dies im Fern-\n" + .string "sehen aus, also achte auf das Programm!\p" .string "Okay!\n" - .string "We’ll be seeing you!$" + .string "Man sieht sich!$" Route111_Text_1AC553:: @ 81AC553 - .string "GABBY: Oh...\p" - .string "Okay, but don’t give up!\n" - .string "We’ll be keeping an eye out for you!$" + .string "PIA: Oh...\p" + .string "Okay, aber gib nicht auf!\n" + .string "Wir werden dich weiter im Auge behalten!$" Route111_Text_1AC59E:: @ 81AC59E Route118_Text_1AC59E:: @ 81AC59E Route120_Text_1AC59E:: @ 81AC59E - .string "GABBY: We’ll be keeping an eye out\n" - .string "for you!$" + .string "PIA: Wir werden dich im Auge behalten!$" Route111_Text_1AC5CA:: @ 81AC5CA Route118_Text_1AC5CA:: @ 81AC5CA Route120_Text_1AC5CA:: @ 81AC5CA - .string "GABBY: Is there a strong TRAINER\n" - .string "anywhere with a lot of POKéMON?$" + .string "PIA: Gibt es irgendwo einen starken\n" + .string "TRAINER mit vielen POKéMON?$" Route111_Text_1AC60B:: @ 81AC60B - .string "GABBY: Wow, you are something!\p" - .string "You’ve gotten a lot stronger - a lot -\n" - .string "since we last battled.\p" - .string "We were right about you when we\n" - .string "spotted you as a hot TRAINER.\p" - .string "So, anyway, what do you think?\n" - .string "Are you willing to give us an interview\l" - .string "this time?$" + .string "PIA: Wow, das war was!\p" + .string "Seit unserem letzten Kampf bist du\n" + .string "stärker geworden - viel stärker.\p" + .string "Unser Gefühl, du würdest ein heißer\n" + .string "TRAINER werden, hat uns Recht gegeben.\p" + .string "Was meinst du? Dürfen wir dich noch\n" + .string "einmal interviewen?$" Route111_Text_1AC6F8:: @ 81AC6F8 Route118_Text_1AC6F8:: @ 81AC6F8 Route120_Text_1AC6F8:: @ 81AC6F8 - .string "GABBY: That was an intense battle!\n" - .string "Did you get all that on camera?$" + .string "PIA: Das war aber ein intensiver\n" + .string "Kampf! Hast du alles aufgezeichnet?!?$" Route111_Text_1AC73B:: @ 81AC73B - .string "TY: Hey, lookie here! A tough-looking\n" - .string "TRAINER here, of all places!\l" - .string "Camera’s rolling!$" + .string "UDO: Hey, guck mal! Ein stark\n" + .string "aussehender TRAINER! Und das hier\l" + .string "an diesem Ort! Kamera ab!$" Route111_Text_1AC790:: @ 81AC790 Route118_Text_1AC790:: @ 81AC790 Route120_Text_1AC790:: @ 81AC790 - .string "TY: Hey, lookie here!\n" - .string "I remember you!\p" - .string "I’ll get this battle all on this\n" - .string "here camera!$" + .string "UDO: Da schau her!\n" + .string "Ich erinnere mich an dich!\p" + .string "Ich werde den ganzen Kampf mit der\n" + .string "Kamera aufnehmen!$" Route111_Text_1AC7E4:: @ 81AC7E4 Route118_Text_1AC7E4:: @ 81AC7E4 Route120_Text_1AC7E4:: @ 81AC7E4 - .string "TY: You’re a natural!\n" - .string "Got me some prime footage right here!$" + .string "UDO: Du bist ein Naturtalent!\n" + .string "Du gibst mir erstklassiges Bildmaterial!$" Route111_Text_1AC820:: @ 81AC820 Route118_Text_1AC820:: @ 81AC820 Route120_Text_1AC820:: @ 81AC820 - .string "TY: Do you only have the one POKéMON\n" - .string "and that’s it?\p" - .string "If you had more POKéMON, it’d make for\n" - .string "better footage, but...$" + .string "UDO: Du hast nur ein POKéMON?\n" + .string "Mehr nicht?\p" + .string "Wenn du mehr POKéMON hättest, wäre\n" + .string "das Bildmaterial viel, viel besser!$" Route111_Text_1AC892:: @ 81AC892 - .string "TY: Yep, we sure spotted a hot TRAINER.\n" - .string "This is a huge scoop for us!$" + .string "UDO: Wir haben tatsächlich einen\n" + .string "starken TRAINER entdeckt.\l" + .string "Das ist unser Durchbruch.$" Route111_Text_1AC8D7:: @ 81AC8D7 Route118_Text_1AC8D7:: @ 81AC8D7 Route120_Text_1AC8D7:: @ 81AC8D7 - .string "TY: Yep, I got it all.\n" - .string "That whole battle’s on camera.$" + .string "UDO: Ja, alles im Kasten!\n" + .string "Der ganze Kampf ist auf Band!$" gTVGabbyAndTyText1:: @ 81AC90D - .string "IN SEARCH OF TRAINERS...\p" - .string "GABBY: Hi! Today I’m visiting an area\n" - .string "near {STR_VAR_1}.\p" - .string "We’re trying to spot some up-and-coming\n" - .string "new talent in the field.\p" - .string "Today, we turned our lens on the\n" + .string "AUF DER SUCHE NACH TRAINERN...\p" + .string "PIA: Hallo! Heute besuche ich ein Ge-\n" + .string "biet in der Nähe von {STR_VAR_1}.\p" + .string "Wir versuchen, ein neues, großes\n" + .string "Talent zu finden.\p" + .string "Unsere Kamera ruht daher auf dem\n" .string "TRAINER {PLAYER}.\p" - .string "There’s something about this TRAINER\n" - .string "that piqued our interest.$" + .string "Etwas an diesem TRAINER hat unser\n" + .string "Interesse geweckt...$" gTVGabbyAndTyText2:: @ 81ACA02 - .string "We’ve battled {PLAYER} before, but we\n" - .string "can attest that the TRAINER has most\l" - .string "definitely improved from before.\p" - .string "I knew we were onto someone special\n" - .string "when we spotted this TRAINER!$" + .string "Wir sind schon früher gegen {PLAYER}\n" + .string "angetreten, und wir versichern, dass\l" + .string "der TRAINER viel stärker geworden ist!\p" + .string "Ich wusste sofort, dass wir hier einen\n" + .string "ganz besonderen TRAINER vor uns haben.$" gTVGabbyAndTyText3:: @ 81ACAAA - .string "The best way to determine how strong\n" - .string "a TRAINER is...\p" - .string "Well, the fastest way is to battle.\n" - .string "And so we began our investigation!\p" + .string "Die beste Art, das Können eines\n" + .string "TRAINERS festzustellen, ist...\p" + .string "Das Tempo des Kampfes anzuheben.\n" + .string "Und das haben wir gemacht.\p" .string "... ...\p" - .string "That’s how we ended up in battle\n" - .string "with {PLAYER}.\p" - .string "In a dominating performance, we were\n" - .string "flattened, rolled up, and tossed aside!\p" - .string "{PLAYER} is ruthlessly strong...\p" - .string "We asked the TRAINER for a succinct\n" - .string "summation of the battle we shared.$" + .string "Und so endete schließlich der Kampf\n" + .string "gegen {PLAYER}.\p" + .string "Seine dominierende Vorstellung schlug\n" + .string "uns vernichtend, zerknüllte uns und\l" + .string "warf uns weg.\p" + .string "{PLAYER} ist einfach unglaublich stark...\p" + .string "Gehen wir etwas näher auf den Kampf\n" + .string "ein.$" gTVGabbyAndTyText4:: @ 81ACC07 - .string "The combination of {STR_VAR_1} and\n" - .string "{STR_VAR_3} was divine!\p" - .string "The sight of them - {STR_VAR_1} and\n" - .string "{STR_VAR_3} - selflessly supporting\l" - .string "each other in the thick of battle...\p" - .string "It was a marvelous sight to behold!\p" - .string "{STR_VAR_2} was the move the TRAINER\n" - .string "used last in our battle.\p" - .string "The move {STR_VAR_2} is {STR_VAR_1}\n" - .string "and {STR_VAR_3}’s sign of friendship!$" + .string "Die Kombination von {STR_VAR_1} und\n" + .string "{STR_VAR_3} war einfach göttlich!\p" + .string "Schon die Ausstrahlung der beiden ließ\n" + .string "erkennen, dass sie sich gegenseitig un-\l" + .string "eingeschränkt unterstützen würden.\p" + .string "Einfach eine unglaubliche Atmosphäre!\p" + .string "Der TRAINER setzte als letzte Attacke\n" + .string "{STR_VAR_2} ein.\p" + .string "Die Attacke {STR_VAR_2} ist das\n" + .string "Zeichen der Freundschaft zwischen\l" + .string "{STR_VAR_1} und {STR_VAR_3}.$" gTVGabbyAndTyText5:: @ 81ACD13 - .string "...I lost confidence in myself as\n" - .string "a result of our encounter.\p" - .string "We were beaten before we could launch\n" - .string "a single attack.\l" - .string "Ohhh... Snivel...\p" - .string "In spite of that, {PLAYER}’s battles\n" - .string "are worth seeing.\p" - .string "I recommend confident TRAINERS to\n" - .string "challenge {PLAYER}.$" + .string "So geht mein ganzes Selbstbewusstsein\n" + .string "dahin... Die Folge unserer Entdeckung.\p" + .string "Wir wurden geschlagen, bevor wir\n" + .string "überhaupt eine einzige Attacke ein-\l" + .string "setzen konnten. Oooh... Schnüff...\p" + .string "Allein das macht die Kämpfe von\n" + .string "{PLAYER} schon sehenswert.\p" + .string "Ich fordere mutige TRAINER auf, sich\n" + .string "mit {PLAYER} zu messen!$" gTVGabbyAndTyText6:: @ 81ACDFA - .string "There’s only one thing to be said.\n" - .string "Don’t you dare throw a POKé BALL during\l" - .string "a TRAINER battle!\p" - .string "{PLAYER} is certainly strong, but has\n" - .string "no clue about the basic rules.\p" - .string "To our TV audience, I have a request.\p" - .string "If you see {PLAYER}, please caution\n" - .string "the TRAINER!$" + .string "Dazu gibt es nur eines zu sagen.\n" + .string "Wage es nicht, während eines Kampfes\l" + .string "einen POKéBALL zu werfen!\p" + .string "{PLAYER} mag ein starker Kämpfer sein,\n" + .string "aber die Regeln kennt er nicht.\p" + .string "Ich gebe unseren Zuschauern\n" + .string "einen Tipp.\p" + .string "Wenn ihr {PLAYER} seht, dann weist den\n" + .string "TRAINER zurecht!$" gTVGabbyAndTyText7:: @ 81ACEE7 - .string "{PLAYER} is adept at reading the\n" - .string "opponent’s actions.\p" - .string "The timing of item usage was remarkably\n" - .string "effective!$" + .string "{PLAYER} hat ein Talent dafür, das Vor-\n" + .string "gehen seines Gegners vorherzusehen.\p" + .string "Das Item wurde erstaunlicherweise \n" + .string "genau zum richtigen Zeitpunkt benutzt!$" gTVGabbyAndTyText8:: @ 81ACF49 - .string "Honestly speaking, I thought that\n" - .string "I might even be pretty good.\p" - .string "While we did end up losing, we did have\n" - .string "a hotly contested battle.\p" - .string "But if you’re struggling against me,\n" - .string "you have a ways to go, {PLAYER}!$" + .string "Ehrlich gesagt, bin ich davon ausge-\n" + .string "gangen, dass ich sehr gut bin.\p" + .string "Auch wenn wir verloren hätten, dann\n" + .string "wäre der Kampf heiß gewesen!\p" + .string "Wenn du es mit uns aufnehmen willst,\n" + .string "{PLAYER}, musst du noch viel trainieren!$" gTVGabbyAndTyText9:: @ 81AD00A - .string "After our battle, we asked {PLAYER} for\n" - .string "a succinct summary.\p" - .string "The TRAINER replied, “{STR_VAR_1}.”\p" - .string "{PLAYER}’s POKéMON {STR_VAR_2} and\n" - .string "{STR_VAR_3}...\l" - .string "And “{STR_VAR_1}”...\p" - .string "Mmm! That’s deep! There’s deep\n" - .string "significance behind that quote!\p" - .string "It’s no surprise - a good TRAINER has\n" - .string "good things to say.\p" - .string "That’s all for today!\n" - .string "See you again on our next broadcast!$" + .string "Nach dem Kampf baten wir {PLAYER}\n" + .string "um eine kurze Stellungnahme.\p" + .string "Der TRAINER sagte: “{STR_VAR_1}”.\p" + .string "Die POKéMON {STR_VAR_2} und\n" + .string "{STR_VAR_3} von {PLAYER}...\l" + .string "Und “{STR_VAR_1}”...\p" + .string "Mmh! Sehr tiefsinnig! Da liegt ein\n" + .string "tieferer Sinn in dieser Aussage!\p" + .string "Kein Wunder! Ein bedeutender TRAINER\n" + .string "wird auch bedeutende Worte sagen!\p" + .string "Das war’s für heute!\n" + .string "Bis zur nächsten Sendung!$" diff --git a/data/text/giddy.inc b/data/text/giddy.inc index a763776bf..8bc5bebda 100644 --- a/data/text/giddy.inc +++ b/data/text/giddy.inc @@ -1,16 +1,16 @@ gTextGiddy_Introduction:: @ 81B092A - .string "I’m GIDDY!\n" - .string "I have a scintillating story for you!\p" - .string "Would you like to hear my story?$" + .string "Ich bin MÄRCHEN-MAN! Ich habe eine sehr\n" + .string "geistreiche Geschichte für dich!\p" + .string "Soll ich sie dir erzählen?$" gTextGiddy_YouveDeflatedMe:: @ 81B097C .string "Oh...\n" - .string "You’ve deflated me...$" + .string "Du hast mir die Luft rausgelassen...$" gTextGiddy_AlsoIWasThinking:: @ 81B0998 - .string "Also, I was thinking...$" + .string "Und ich war in Gedanken vertieft...$" gTextGiddy_ByeBye:: @ 81B09B0 - .string "That’s about it, I think...\p" - .string "We should chat again!\n" - .string "Bye-bye!$" + .string "Das wäre alles, glaube ich...\p" + .string "Wir sollten bald wieder ein Schwätzchen\n" + .string "halten! Tschüss!$" diff --git a/data/text/gift_ribbon_descriptions.inc b/data/text/gift_ribbon_descriptions.inc index 798d291b9..8cd5416e8 100644 --- a/data/text/gift_ribbon_descriptions.inc +++ b/data/text/gift_ribbon_descriptions.inc @@ -1,143 +1,143 @@ gGiftRibbonDescriptionPart1_2003RegionalTourney: - .string "2003 REGIONAL TOURNEY$" + .string "REGIONALTURNIER 2003$" gGiftRibbonDescriptionPart2_Champion: - .string "CHAMPION RIBBON$" + .string "BAND des CHAMPS$" gGiftRibbonDescriptionPart1_2003NationalTourney: - .string "2003 NATIONAL TOURNEY$" + .string "NATIONALTURNIER 2003$" gGiftRibbonDescriptionPart1_2003GlobalCup: - .string "2003 GLOBAL CUP$" + .string "WELTPOKAL 2003$" gGiftRibbonDescriptionPart2_RunnerUp: - .string "Runner-up RIBBON$" + .string "BAND für Platzierungen$" gGiftRibbonDescriptionPart2_Semifinalist: - .string "Semifinalist RIBBON$" + .string "BAND für Halbfinalisten$" gGiftRibbonDescriptionPart1_2004RegionalTourney: - .string "2004 REGIONAL TOURNEY$" + .string "REGIONALTURNIER 2004$" gGiftRibbonDescriptionPart1_2004NationalTourney: - .string "2004 NATIONAL TOURNEY$" + .string "NATIONALTURNIER 2004$" gGiftRibbonDescriptionPart1_2004GlobalCup: - .string "2004 GLOBAL CUP$" + .string "WELTPOKAL 2004$" gGiftRibbonDescriptionPart1_2005RegionalTourney: - .string "2005 REGIONAL TOURNEY$" + .string "REGIONALTURNIER 2005$" gGiftRibbonDescriptionPart1_2005NationalTourney: - .string "2005 NATIONAL TOURNEY$" + .string "NATIONALTURNIER 2005$" gGiftRibbonDescriptionPart1_2005GlobalCup: - .string "2005 GLOBAL CUP$" + .string "WELTPOKAL 2005$" gGiftRibbonDescriptionPart1_PokemonBattleCup: - .string "POKéMON BATTLE CUP$" + .string "POKéMON-KAMPF-POKAL$" gGiftRibbonDescriptionPart2_Participation: - .string "Participation RIBBON$" + .string "Teilnehmer-BAND$" gGiftRibbonDescriptionPart1_PokemonLeague: - .string "POKéMON LEAGUE$" + .string "POKéMON LIGA$" gGiftRibbonDescriptionPart1_AdvanceCup: - .string "ADVANCE CUP$" + .string "TALENTPOKAL$" gGiftRibbonDescriptionPart1_PokemonTournament: - .string "POKéMON Tournament$" + .string "POKéMON-Turnier$" gGiftRibbonDescriptionPart2_Participation2: - .string "Participation RIBBON$" + .string "Teilnehmer-BAND$" gGiftRibbonDescriptionPart1_PokemonEvent: - .string "POKéMON Event$" + .string "POKéMON-Wettkampf$" gGiftRibbonDescriptionPart1_PokemonFestival: - .string "POKéMON Festival$" + .string "POKéMON-Festival$" gGiftRibbonDescriptionPart1_DifficultyClearing: - .string "Difficulty-clearing$" + .string "Schw.-Grad-Abschl.$" gGiftRibbonDescriptionPart2_Commemorative: - .string "Commemorative RIBBON$" + .string "Gedenk-BAND$" gGiftRibbonDescriptionPart1_ClearingAllDifficulties: - .string "RIBBON awarded for$" + .string "BAND für erf. Abschluss$" gGiftRibbonDescriptionPart2_ClearingAllDifficulties: - .string "clearing all difficulties.$" + .string "aller Schwierigk.-Grade.$" gGiftRibbonDescriptionPart1_100StraightWin: - .string "100-straight Win$" + .string "100. Sieg in Folge$" gGiftRibbonDescriptionPart1_DarknessTower: - .string "DARKNESS TOWER Clear$" + .string "APOKELIPSE-TURM fertig$" gGiftRibbonDescriptionPart1_RedTower: - .string "RED TOWER Clear$" + .string "ROTER TURM fertig$" gGiftRibbonDescriptionPart1_BlackironTower: - .string "BLACKIRON TOWER Clear$" + .string "EISERNER TURM fertig$" gGiftRibbonDescriptionPart1_FinalTower: - .string "FINAL TOWER Clear$" + .string "FINAL-TURM-Abschluss$" gGiftRibbonDescriptionPart1_LegendMaking: - .string "Legend-making$" + .string "Legendäres$" gGiftRibbonDescriptionPart1_PokemonCenterTokyo: - .string "POKéMON CENTER TOKYO$" + .string "POKéMON-CENTER TOKIO$" gGiftRibbonDescriptionPart1_PokemonCenterOsaka: - .string "POKéMON CENTER OSAKA$" + .string "POKéMON-CENTER OSAKA$" gGiftRibbonDescriptionPart1_PokemonCenterNagoya: - .string "POKéMON CENTER NAGOYA$" + .string "POKéMON-CENTER NAGOYA$" gGiftRibbonDescriptionPart1_PokemonCenterNY: - .string "POKéMON CENTER NY$" + .string "POKéMON-CENTER N. Y.$" gGiftRibbonDescriptionPart1_SummerHolidays: - .string "Summer Holidays RIBBON$" + .string "Sommerferien-BAND$" gGiftRibbonDescriptionPart2_EmptyString: .string "$" gGiftRibbonDescriptionPart1_WinterHolidays: - .string "Winter Holidays RIBBON$" + .string "Weihnachtsferien-BAND$" gGiftRibbonDescriptionPart1_SpringHolidays: - .string "Spring Holidays RIBBON$" + .string "Osterferien-BAND$" gGiftRibbonDescriptionPart1_Evergreen: - .string "Evergreen RIBBON$" + .string "Evergreen-BAND$" gGiftRibbonDescriptionPart1_SpecialHoliday: - .string "Special Holiday RIBBON$" + .string "Sonderurlaubs-BAND$" gGiftRibbonDescriptionPart1_HardWorker: - .string "Hard Worker RIBBON$" + .string "Fleiß-BAND$" gGiftRibbonDescriptionPart1_LotsOfFriends: - .string "Lots of Friends RIBBON$" + .string "Beliebtheits-BAND$" gGiftRibbonDescriptionPart1_FullOfEnergy: - .string "Full of Energy RIBBON$" + .string "Energie-BAND$" gGiftRibbonDescriptionPart1_LovedPokemon: - .string "A commemorative RIBBON$" + .string "Ein Gedenk-BAND für ein$" gGiftRibbonDescriptionPart2_LovedPokemon: - .string "for a loved POKéMON.$" + .string "beliebtes POKéMON.$" gGiftRibbonDescriptionPart1_LoveForPokemon: - .string "RIBBON that shows$" + .string "Ein BAND für POKéMON-$" gGiftRibbonDescriptionPart2_LoveForPokemon: - .string "love for POKéMON.$" + .string "Freunde.$" .align 2 gGiftRibbonDescriptions:: @ 83E158C diff --git a/data/text/hipster.inc b/data/text/hipster.inc index 630db02b2..8801b05fd 100644 --- a/data/text/hipster.inc +++ b/data/text/hipster.inc @@ -1,20 +1,19 @@ gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B - .string "Hey, yo! They call me the HIPSTER.\n" - .string "I’ll teach you what’s hip and happening.$" + .string "Hey, yo! Man nennt mich TRENDWIG. Ich\n" + .string "zeige dir, was hip ist und abgeht.$" gTextHipster_TaughtYouAlready:: @ 81B0CA7 - .string "But, hey, I taught you what’s hip and\n" - .string "happening already.\p" - .string "I’d like to spread the good word to\n" - .string "other folks.$" + .string "Aber, hey, ich habe dir doch schon ge-\n" + .string "zeigt, was hip ist und abgeht.\p" + .string "Ich will das auch anderen mitteilen.$" gTextHipster_YouAlreadyKnowALot:: @ 81B0D11 - .string "But, hey, you already know a lot about\n" - .string "what’s hip and happening.\p" - .string "I’ve got nothing new to teach you!$" + .string "Aber, hey, ich habe dir doch schon ge-\n" + .string "zeigt, was hip ist und abgeht.\p" + .string "Ich habe nichts mehr in petto.$" gTextHipster_HaveYouHeardAbout:: @ 81B0D75 - .string "Hey, have you heard about\n" - .string "“{STR_VAR_1}”?\p" - .string "What’s it mean? Well...\n" - .string "Ask your daddy or mommy, okay?$" + .string "Hast du schon von\n" + .string "“{STR_VAR_1}” gehört?\p" + .string "Was das heißt? Ähäm...\n" + .string "Frag mal deinen Papi oder deine Mami, ja?$" diff --git a/data/text/landmarks.inc b/data/text/landmarks.inc index 72d5398bd..8d78c37db 100644 --- a/data/text/landmarks.inc +++ b/data/text/landmarks.inc @@ -1,110 +1,110 @@ gLandmarkName_FlowerShop:: - .string "FLOWER SHOP$" + .string "BLUMENLADEN$" gLandmarkName_PetalburgWoods:: - .string "PETALBURG WOODS$" + .string "BLÜTENBURGWALD$" gLandmarkName_MrBrineysCottage:: - .string "MR. BRINEY’S COTTAGE$" + .string "MR. BRACKS HÜTTE$" gLandmarkName_AbandonedShip:: - .string "ABANDONED SHIP$" + .string "SCHIFFSWRACK$" gLandmarkName_SeashoreHouse:: - .string "SEASHORE HOUSE$" + .string "STRANDHAUS$" gLandmarkName_SlateportBeach:: - .string "SLATEPORT BEACH$" + .string "GRAPHITPORTSTRAND$" gLandmarkName_CyclingRoad:: - .string "CYCLING ROAD$" + .string "RADWEG$" gLandmarkName_NewMauville:: - .string "NEW MAUVILLE$" + .string "NEU MALVENFROH$" gLandmarkName_TrickHouse:: - .string "TRICK HOUSE$" + .string "RÄTSELHAUS$" gLandmarkName_OldLadysRestShop:: - .string "OLD LADY’S REST STOP$" + .string "HOTEL DER ALTEN DAME$" gLandmarkName_Desert:: - .string "DESERT$" + .string "WÜSTE$" gLandmarkName_WinstrateFamily:: - .string "THE WINSTRATE FAMILY$" + .string "FAMILIE SIHGERS$" gLandmarkName_CableCar:: - .string "CABLE CAR$" + .string "SEILBAHN$" gLandmarkName_GlassWorkshop:: - .string "GLASS WORKSHOP$" + .string "GLASWERKSTATT$" gLandmarkName_WeatherInstitute:: - .string "WEATHER INSTITUTE$" + .string "KLIMA-INSTITUT$" gLandmarkName_MeteorFalls:: - .string "METEOR FALLS$" + .string "METEORFÄLLE$" gLandmarkName_TunnelersRestHouse:: - .string "TUNNELER’S REST HOUSE$" + .string "BERGRASTHAUS$" gLandmarkName_RusturfTunnel:: - .string "RUSTURF TUNNEL$" + .string "METAFLURTUNNEL$" gLandmarkName_PokemonDayCare:: - .string "POKéMON DAY CARE$" + .string "POKéMON-PENSION$" gLandmarkName_SafariZoneEntrance:: - .string "SAFARI ZONE ENTRANCE$" + .string "EINGANG SAFARI-ZONE$" gLandmarkName_MtPyre:: - .string "MT. PYRE$" + .string "PYROBERG$" gLandmarkName_ShoalCave:: - .string "SHOAL CAVE$" + .string "KÜSTENHÖHLE$" gLandmarkName_SeafloorCavern:: - .string "SEAFLOOR CAVERN$" + .string "TIEFSEEHÖHLE$" gLandmarkName_GraniteCave:: - .string "GRANITE CAVE$" + .string "GRANITHÖHLE$" gLandmarkName_OceanCurrent:: - .string "OCEAN CURRENT$" + .string "MEERESSTRÖMUNG$" gLandmarkName_LanettesHouse:: - .string "LANETTE’S HOUSE$" + .string "LANETTES HAUS$" gLandmarkName_FieryPath:: - .string "FIERY PATH$" + .string "FEURIGER PFAD$" gLandmarkName_JaggedPass:: - .string "JAGGED PASS$" + .string "STEILPASS$" gLandmarkName_SkyPillar:: - .string "SKY PILLAR$" + .string "HIMMELTURM$" gLandmarkName_BerryMastersHouse:: - .string "BERRY MASTER’S HOUSE$" + .string "BEERENMEISTER-VILLA$" gLandmarkName_IslandCave:: - .string "ISLAND CAVE$" + .string "INSELHÖHLE$" gLandmarkName_DesertRuins:: - .string "DESERT RUINS$" + .string "WÜSTENRUINE$" gLandmarkName_ScorchedSlab:: - .string "SCORCHED SLAB$" + .string "SONNENGROTTE$" gLandmarkName_AncientTomb:: - .string "ANCIENT TOMB$" + .string "GRABMAL$" gLandmarkName_SealedChamber:: - .string "SEALED CHAMBER$" + .string "SIEGELKAMMER$" gLandmarkName_FossilManiacsHouse:: - .string "FOSSIL MANIAC’S HOUSE$" + .string "FOSSILMANIACS HAUS$" gLandmarkName_HuntersHouse:: - .string "HUNTER’S HOUSE$" + .string "HAUS DES TAUCHERS$" diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc index 6fb3f1e91..b38a328d4 100644 --- a/data/text/lottery_corner.inc +++ b/data/text/lottery_corner.inc @@ -1,81 +1,82 @@ LilycoveCity_DepartmentStore_1F_Text_1C4B5E:: @ 81C4B5E - .string "This is the POKéMON LOTTERY CORNER.\p" - .string "All shoppers visiting our DEPARTMENT\n" - .string "STORE get to draw a POKéMON LOTO\l" - .string "TICKET.\p" - .string "If the LOTO TICKET’s number matches\n" - .string "the ID number of any of your POKéMON,\l" - .string "you will receive a fabulous gift.\p" - .string "Would you like to draw a POKéMON\n" - .string "LOTO TICKET?$" + .string "Dies ist die POKéMON-LOTTERIE.\p" + .string "Alle Besucher des EINKAUFSZENTRUMS\n" + .string "können einen POKéMON-LOTTOSCHEIN\l" + .string "ziehen.\p" + .string "Wenn die Nummer des LOTTOSCHEINS mit\n" + .string "der ID-Nummer eines deiner POKéMON\l" + .string "übereinstimmt, gewinnst du einen Preis.\p" + .string "Möchtest du einen\n" + .string "POKéMON-LOTTOSCHEIN ziehen?$" LilycoveCity_DepartmentStore_1F_Text_1C4C6A:: @ 81C4C6A - .string "Please come back tomorrow.$" + .string "Bitte, komme morgen wieder.$" LilycoveCity_DepartmentStore_1F_Text_1C4C85:: @ 81C4C85 - .string "Please do visit us again.$" + .string "Bitte, besuche uns bald wieder.$" UnknownString_81C4C9F: @ 81C4C9F - .string "Please pick a LOTO TICKET.\n" + .string "Bitte, ziehe einen LOTTOSCHEIN.\n" .string "... ... ...$" LilycoveCity_DepartmentStore_1F_Text_1C4CC6:: @ 81C4CC6 - .string "Please pick a LOTO TICKET.\n" - .string "...{PAUSE}{0x39} ...{PAUSE}{0x39} ...{PAUSE}{0x39}$" + .string "Bitte, ziehe einen LOTTOSCHEIN.\n" + .string "...{0xFC}Ë{0x39} ...{0xFC}Ë{0x39} ...{0xFC}Ë{0x39}$" LilycoveCity_DepartmentStore_1F_Text_1C4CF6:: @ 81C4CF6 - .string "The LOTO TICKET number is {STR_VAR_1}.\p" - .string "I need to run a check on this number\n" - .string "to see if it matches any of your\l" - .string "POKéMON’s ID numbers. Please wait.$" + .string "Der LOTTOSCHEIN hat die Nummer {STR_VAR_1}.\p" + .string "Ich muss diese Nummer jetzt prüfen,\n" + .string "um zu sehen, ob sie mit der ID-Nummer\l" + .string "eines deiner POKéMON übereinstimmt.$" LilycoveCity_DepartmentStore_1F_Text_1C4D7D:: @ 81C4D7D - .string "Congratulations!\p" - .string "The ID number of your team’s\n" - .string "{STR_VAR_1} matches your LOTO TICKET’s\l" - .string "number!$" + .string "Herzlichen Glückwunsch!\p" + .string "Die ID-Nummer deines {STR_VAR_1} im\n" + .string "Team stimmt mit der des LOTTO-\l" + .string "SCHEINS überein!$" LilycoveCity_DepartmentStore_1F_Text_1C4DD1:: @ 81C4DD1 - .string "Congratulations!\p" - .string "The ID number of your PC-boxed\n" - .string "{STR_VAR_1} matches your LOTO TICKET’s\l" - .string "number!$" + .string "Herzlichen Glückwunsch!\p" + .string "Die ID-Nummer deines {STR_VAR_1} in\n" + .string "der Box des PCs stimmt mit der des\l" + .string "LOTTOSCHEINS überein!$" LilycoveCity_DepartmentStore_1F_Text_1C4E27:: @ 81C4E27 - .string "I’m sorry.\n" - .string "None of the numbers matched.$" + .string "Tut mir Leid.\n" + .string "Keine der Nummern stimmt überein.$" LilycoveCity_DepartmentStore_1F_Text_1C4E4F:: @ 81C4E4F - .string "Two digits matched, so you win the\n" - .string "third prize!\l" - .string "You’ve won the {STR_VAR_1}!$" + .string "Zwei Ziffern stimmen überein,\n" + .string "daher bekommst du den dritten Preis!\l" + .string "Du gewinnst {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4E92:: @ 81C4E92 - .string "Three digits matched, so you win the\n" - .string "second prize!\l" - .string "You’ve won the {STR_VAR_1}!$" + .string "Drei Ziffern stimmen überein,\n" + .string "daher bekommst du den zweiten Preis!\l" + .string "Du gewinnst {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4ED8:: @ 81C4ED8 - .string "Four digits matched, so you win the\n" - .string "first prize!\l" - .string "You’ve won the {STR_VAR_1}!$" + .string "Vier Ziffern stimmen überein,\n" + .string "daher bekommst du den ersten Preis!\l" + .string "Du gewinnst {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4F1C:: @ 81C4F1C - .string "Oh, my goodness, all five digits matched!\p" - .string "You’ve won the jackpot prize!\n" - .string "You’ve won the {STR_VAR_1}!$" + .string "Meine Güte! Alle fünf Ziffern stimmen\n" + .string "überein!\p" + .string "Du hast den Jackpot geknackt!\n" + .string "Du gewinnst {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4F77:: @ 81C4F77 - .string "Oh?\n" - .string "You seem to have no room for this.\p" - .string "Please make room in your BAG and\n" - .string "let me know.$" + .string "Oh! Du scheinst keinen Platz\n" + .string "dafür zu haben.\p" + .string "Wenn du wieder Platz in deinem BEUTEL\n" + .string "hast, lass es mich wissen.$" LilycoveCity_DepartmentStore_1F_Text_1C4FCC:: @ 81C4FCC .string "{PLAYER}?\n" - .string "Yes, I’ve been expecting you.\p" - .string "This is the prize we’ve been holding\n" - .string "for you.$" + .string "Ja, ich habe dich schon erwartet.\p" + .string "Diesen Preis habe ich für dich\n" + .string "aufbewahrt.$" LilycoveCity_DepartmentStore_1F_Text_1C501C:: @ 81C501C - .string "Please do visit again.$" + .string "Bitte, besuche uns bald wieder.$" diff --git a/data/text/magma_awakening.inc b/data/text/magma_awakening.inc index c64b35543..e42444437 100644 --- a/data/text/magma_awakening.inc +++ b/data/text/magma_awakening.inc @@ -1,97 +1,101 @@ SeafloorCavern_Room9_Text_1B4850:: @ 81B4850 - .string "MAXIE: Hold it right there.$" + .string "MARC: Bleib sofort stehen!$" SeafloorCavern_Room9_Text_1B486C:: @ 81B486C - .string "MAXIE: Fufufu...\n" - .string "So it was you, after all.$" + .string "MARC: Hahahaha...\n" + .string "Du warst das also die ganze Zeit!$" SeafloorCavern_Room9_Text_1B4897:: @ 81B4897 - .string "MAXIE: Behold!\p" - .string "See how beautiful it is, the sleeping\n" - .string "form of the ancient POKéMON GROUDON!\p" - .string "I have waited so long for this day to\n" - .string "come...$" + .string "MARC: Schau nur, schau nur!\p" + .string "Schau, wie schön die schlafende Gestalt\n" + .string "des antiken POKéMON GROUDON ist!\p" + .string "Ich habe so lange auf diesen Tag\n" + .string "gewartet...$" SeafloorCavern_Room9_Text_1B491F:: @ 81B491F - .string "MAXIE: It surprises me, how you’ve\n" - .string "managed to chase me here.\p" - .string "But that’s all over now.\p" - .string "For the realization of my dream,\n" - .string "you must disappear now!$" + .string "MARC: Es überrascht mich, wie du es ge-\n" + .string "schafft hast, mir zu folgen.\p" + .string "Aber das ist nun alles Nebensache.\p" + .string "Damit meine Träume wahr werden, musst\n" + .string "du leider verschwinden!$" SeafloorCavern_Room9_Text_1B49AE:: @ 81B49AE - .string "I...\n" - .string "I lost again?$" + .string "Ich...\n" + .string "Ich habe wieder verloren?$" SeafloorCavern_Room9_Text_1B49C1:: @ 81B49C1 - .string "MAXIE: Fufufu...\p" - .string "I commend you. I must recognize that\n" - .string "you are truly gifted.\p" - .string "But!\n" - .string "I have this in my possession!\p" - .string "With this BLUE ORB, I can make\n" + .string "MARC: Kicher...\p" + .string "Ich empfehle mich. Ich muss sagen, du\n" + .string "bist wirklich sehr talentiert.\p" + .string "Aber!\n" + .string "Ich habe dieses hier in meinem Besitz!\p" + .string "Mit dieser BLAUEN KUGEL kann ich\n" .string "GROUDON...$" SeafloorCavern_Room9_Text_1B4A5A:: @ 81B4A5A - .string "The BLUE ORB suddenly began shining\n" - .string "by itself!$" + .string "Die BLAUE KUGEL beginnt plötzlich von\n" + .string "innen heraus zu leuchten!$" SeafloorCavern_Room9_Text_1B4A89:: @ 81B4A89 - .string "MAXIE: What?!\p" - .string "I didn’t do anything.\n" - .string "Why did the BLUE ORB...\p" - .string "Where did GROUDON go?$" + .string "MARC: Was?!?\p" + .string "Ich habe doch gar nichts gemacht.\n" + .string "Die BLAUE KUGEL... Warum...\p" + .string "Wo ist GROUDON geblieben?$" SeafloorCavern_Room9_Text_1B4ADB:: @ 81B4ADB - .string "MAXIE: Hm? It’s a message from our\n" - .string "members outside...$" + .string "MARC: Hm? Dies ist eine Nachricht\n" + .string "unserer Mitglieder draußen...$" SeafloorCavern_Room9_Text_1B4B11:: @ 81B4B11 - .string "MAXIE: Yes, what is it?\p" + .string "MARC: Ja, was ist denn jetzt los?\p" .string "Hm...\n" - .string "The sun is burning brightly?\p" - .string "Good... That should have happened.\n" - .string "That is why we awakened GROUDON,\l" - .string "to realize TEAM MAGMA’s vision of\l" - .string "expanding the world’s landmass.\p" - .string "What?!\p" - .string "It’s far hotter than we envisioned?\n" - .string "It’s so hot that it’s dangerous?\p" - .string "That can’t be...\n" - .string "That’s just not possible...\p" - .string "Hold your position and monitor the\n" - .string "situation!$" + .string "Die Sonne scheint? So extrem?\p" + .string "Gut... Genau darauf habe ich gewartet.\n" + .string "Deshalb haben wir GROUDON erweckt.\l" + .string "Um TEAM MAGMAS Vision von der Erweite-\l" + .string "rung der Landmassen zu realisieren.\p" + .string "Was?!?\p" + .string "Es ist heißer, als wir es vorausgesagt\n" + .string "haben? Die Hitze ist sogar gefährlich?\p" + .string "Das kann nicht sein...\n" + .string "Das ist unmöglich...\p" + .string "Bleib wo du bist und behalte die\n" + .string "Situation im Auge!$" SeafloorCavern_Room9_Text_1B4C79:: @ 81B4C79 - .string "MAXIE: There’s something wrong...\p" - .string "The BLUE ORB is supposed to awaken\n" - .string "and control GROUDON...\p" - .string "But... Why?\n" - .string "Why did GROUDON disappear?\p" - .string "Why?!$" + .string "MARC: Irgendetwas stimmt da ganz und\n" + .string "gar nicht...\p" + .string "Die BLAUE KUGEL sollte GROUDON auf-\n" + .string "wecken und unter Kontrolle halten...\p" + .string "Aber... Warum?\n" + .string "Warum ist GROUDON verschwunden?\p" + .string "Warum?!?$" SeafloorCavern_Room9_Text_1B4D02:: @ 81B4D02 - .string "ARCHIE: What have you wrought?\p" - .string "MAXIE... You’ve finally awoken GROUDON,\n" - .string "haven’t you?\p" - .string "What will happen to the world if this\n" - .string "sunshine continues for all eternity?\p" - .string "The world’s seas will all dry up and\n" - .string "disappear...$" + .string "ADRIAN: Was hast du da nur herauf-\n" + .string "beschworen?\p" + .string "MARC... Du hast GROUDON aufge-\n" + .string "weckt, stimmt’s?\p" + .string "Was wird nur aus der Welt, wenn die\n" + .string "Sonne bis in alle Ewigkeit mit dieser\l" + .string "Kraft scheint?\p" + .string "Die Meere werden austrocknen und\n" + .string "verschwinden...$" SeafloorCavern_Room9_Text_1B4DD3:: @ 81B4DD3 - .string "MAXIE: What are you saying?\p" - .string "The BLUE ORB should let me control\n" - .string "GROUDON...\l" - .string "That can’t be possible...$" + .string "MARC: Was sagst du da?\p" + .string "Die BLAUE KUGEL sollte mir die Kontrolle\n" + .string "über GROUDON verschaffen...\l" + .string "Das kann einfach nicht wahr sein...$" SeafloorCavern_Room9_Text_1B4E37:: @ 81B4E37 - .string "ARCHIE: We don’t have the time to\n" - .string "argue about it here!\p" - .string "Get outside and see for yourself!\p" - .string "See if what you’ve wrought is the\n" - .string "world that you desired!$" + .string "ADRIAN: Wir haben keine Zeit für\n" + .string "Diskussionen!\p" + .string "Geh nach draußen und sieh es dir\n" + .string "selber an!\p" + .string "Sieh, ob das, was du heraufbeschworen\n" + .string "hast, das ist, was du wolltest!$" SeafloorCavern_Room9_Text_1B4ECA:: @ 81B4ECA - .string "ARCHIE: {PLAYER}{KUN}, come on, you have\n" - .string "to get out of here, too!$" + .string "ADRIAN: {PLAYER}{KUN}, komm, du musst\n" + .string "ebenfalls von hier verschwinden!$" diff --git a/data/text/magma_chimney.inc b/data/text/magma_chimney.inc index cdfde2ef2..15d953e9e 100644 --- a/data/text/magma_chimney.inc +++ b/data/text/magma_chimney.inc @@ -1,143 +1,150 @@ MtChimney_Text_1B37BB:: @ 81B37BB - .string "The power contained in the METEORITE...\p" - .string "By amplifying its power with this\n" - .string "machine, MT. CHIMNEY’s volcanic activity\l" - .string "will instantly intensify...\p" - .string "Fufufu... The volcano will erupt, spewing\n" - .string "lava that will cool and harden.\l" - .string "It will expand the landmass...$" + .string "Die Kraft, die in dem METEORITEN\n" + .string "steckt...\p" + .string "Wenn man die mit dieser Maschine\n" + .string "verstärkt, würde die Aktivität des\l" + .string "SCHLOTBERGS enorm verstärkt...\p" + .string "Hahaha... Der Vulkan würde ausbrechen,\n" + .string "Lava würde erkalten und hart werden.\l" + .string "Und so entsteht neues Land...$" MtChimney_Text_1B38B3:: @ 81B38B3 - .string "MAXIE: You again...\p" - .string "Now listen.\n" - .string "We humans have grown on dry land.\p" - .string "The land is everything!\n" - .string "Its importance is paramount!\p" - .string "That is why we of TEAM MAGMA are\n" - .string "committed to expanding the landmass.\p" - .string "It will create space for new species\n" - .string "of POKéMON to evolve.\p" - .string "It will give us humans more space to\n" - .string "advance.\p" - .string "That is TEAM MAGMA’s vision!\p" - .string "I can’t allow an ignorant child like\n" - .string "you to get in our way.\p" - .string "I, MAXIE, will show you the\n" - .string "consequences of meddling!$" + .string "MARC: Du schon wieder...\p" + .string "Hör gut zu.\n" + .string "Wir Menschen sind an Land groß\l" + .string "geworden.\p" + .string "Land bedeutet Leben!\n" + .string "Es besitzt absolute Priorität!\p" + .string "Daher widmet sich TEAM MAGMA der Auf-\n" + .string "gabe, die Landmassen zu vergrößern.\p" + .string "So entsteht mehr Raum für neue Arten\n" + .string "von POKéMON.\p" + .string "Und die Menschheit erhält mehr Raum,\n" + .string "sich zu entwickeln.\p" + .string "Das ist die große Vision von TEAM MAGMA!\p" + .string "Ich kann einem sturen Kind wie dir nicht\n" + .string "erlauben, sich uns in den Weg zu stellen.\p" + .string "Ich, MARC, werde dir zeigen, was\n" + .string "passiert, wenn du uns aufhalten willst!$" MtChimney_Text_1B3A68:: @ 81B3A68 - .string "What?!\p" - .string "I, MAXIE, was caught off guard?!$" + .string "Wie bitte?!?\p" + .string "Ich, MARC, wurde ganz hinterhältig\n" + .string "besiegt?!?$" MtChimney_Text_1B3A90:: @ 81B3A90 - .string "MAXIE: Ah, whatever.\n" - .string "I will give up our plans for MT. CHIMNEY\l" - .string "for the time being...\p" - .string "But no one can ever stop us!\n" - .string "TEAM MAGMA will prevail!\p" - .string "Don’t you ever forget that!$" + .string "MARC: Ach, was soll’s.\n" + .string "Ich werde für heute meine Pläne am\l" + .string "SCHLOTBERG vergessen. Für heute!\p" + .string "Niemand wird uns jemals stoppen!\n" + .string "TEAM MAGMA wird siegen!!!\p" + .string "Vergiss das nicht!!!$" MtChimney_Text_1B3B36:: @ 81B3B36 - .string "Hehehe!\p" - .string "So you’ve come all the way here!\p" - .string "But you’re too late!\n" - .string "I’ve already delivered the METEORITE\l" - .string "from METEOR FALLS to the BOSS!$" + .string "Hahahahaha!\p" + .string "Da bist du also den weiten Weg hier\n" + .string "hoch gelatscht.\p" + .string "Tja, du kommst leider zu spät. Ich habe\n" + .string "den METEORITEN aus METEORFÄLLE\l" + .string "bereits bei meinem BOSS abgeliefert!$" MtChimney_Text_1B3BB8:: @ 81B3BB8 - .string "Hehehe...\n" - .string "So I lost...\p" - .string "I’m sure glad I never took you on back\n" - .string "at METEOR FALLS.$" + .string "Hahahaha...\n" + .string "Da hab ich wohl verloren...\p" + .string "Ich kann nur froh sein, dass ich mich\n" + .string "nicht in METEORFÄLLE mit dir einge-\l" + .string "lassen habe!$" MtChimney_Text_1B3C07:: @ 81B3C07 - .string "Hehehe!\p" - .string "You might have beaten me, but you don’t\n" - .string "stand a chance against the BOSS!\p" - .string "If you get lost now, you won’t have to\n" - .string "face a sound whipping!$" + .string "Hahaha...\p" + .string "Du hast mich vielleicht besiegt, aber\n" + .string "gegen unseren BOSS hast du keine\l" + .string "Schnitte!\p" + .string "Wenn du dich jetzt verkrümelst, ent-\n" + .string "gehst du einer saftigen Tracht Prügel!$" MtChimney_Text_1B3C96:: @ 81B3C96 - .string "We of TEAM MAGMA are working hard for\n" - .string "everyone’s sake.\p" - .string "Like, if there’s more land, there’d be\n" - .string "more places to live.\l" - .string "Everyone’d be happy!$" + .string "Wir vom TEAM MAGMA setzen alles daran,\n" + .string "zum Wohle aller zu handeln.\p" + .string "Wenn es mehr Land gibt, gibt es auch\n" + .string "mehr Platz zum Leben.\l" + .string "Und jeder wäre glücklich!$" MtChimney_Text_1B3D1E:: @ 81B3D1E - .string "Hunh?\n" - .string "What do you mean I lost?$" + .string "Bitte?\n" + .string "Was sagst du? Ich habe verloren???$" MtChimney_Text_1B3D3D:: @ 81B3D3D - .string "Our BOSS says, “It will make everyone\n" - .string "happy.”\p" - .string "But why does everyone keep getting\n" - .string "in our way?$" + .string "Unser BOSS sagt: “Jeder wird glücklich\n" + .string "sein.”\p" + .string "Aber warum will uns dann jeder\n" + .string "aufhalten?$" MtChimney_Text_1B3D9A:: @ 81B3D9A - .string "That annoying TEAM AQUA...\n" - .string "They always mess with our plans!$" + .string "Dieses lästige TEAM AQUA... Sie ver-\n" + .string "suchen alles, unsere Pläne zu vereiteln.$" MtChimney_Text_1B3DD6: @ 81B3DD6 - .string "METEORITES pack amazing power!$" + .string "METEORITEN stecken voller Energie.$" MtChimney_Text_1B3DF5:: @ 81B3DF5 - .string "Go! Stomp TEAM AQUA!\n" - .string "And expand the land!$" + .string "Los! Stampfen wir TEAM AQUA in den\n" + .string "Boden! Und vergrößern die Landmassen!$" MtChimney_Text_1B3E1F:: @ 81B3E1F - .string "Stay out of our way, okay?\p" - .string "We’re trying to enlarge the landmass\n" - .string "for the good of everybody!$" + .string "Geh uns aus dem Weg, okay?\p" + .string "Wir wollen die Landmassen zum Wohle\n" + .string "aller vergrößern!$" MtChimney_Text_1B3E7A:: @ 81B3E7A .string "Yeah!\n" - .string "Douse them in fire!$" + .string "Taucht sie ins Feuer!$" UnknownString_81B3E94: @ 81B3E94 - .string "We’re going to keep making more land!$" + .string "Wir werden weiter für mehr Land sorgen!$" MtChimney_Text_1B3EBA:: @ 81B3EBA - .string "Bufoh!$" + .string "Hahoh!$" MtChimney_Text_1B3EC1:: @ 81B3EC1 - .string "ARCHIE: Oh, {PLAYER}{KUN}!\p" - .string "Please, you must stop TEAM MAGMA\n" - .string "for me!\p" - .string "They’re trying to make this volcano\n" - .string "erupt by using the stolen METEORITE’s\l" - .string "power!\p" - .string "It’s all a part of their plans to\n" - .string "expand the world’s landmass!$" + .string "ADRIAN: Oh, {PLAYER}{KUN}!\p" + .string "Bitte, hilf mir, TEAM MAGMA zu stoppen!\p" + .string "Sie wollen den Vulkan mit Hilfe der Kraft\n" + .string "des gestohlenen METEORITEN zum\l" + .string "Ausbruch bringen!\p" + .string "Das gehört alles zu ihrem Plan, die Land-\n" + .string "massen der Welt zu vergrößern!$" MtChimney_Text_1B3F8C:: @ 81B3F8C - .string "ARCHIE: {PLAYER}{KUN}!\p" - .string "Please, you’ve got to stop TEAM MAGMA\n" - .string "for me!\p" - .string "Dealing with these three thugs is\n" - .string "a lot, even for me!$" + .string "ADRIAN: {PLAYER}{KUN}!\p" + .string "Bitte, hilf mir TEAM MAGMA zu stoppen!\p" + .string "Sich mit diesen drei Schurken aus-\n" + .string "einander zu setzen, ist selbst für mich\l" + .string "kaum zu schaffen!$" MtChimney_Text_1B3FFE:: @ 81B3FFE - .string "ARCHIE: {PLAYER}{KUN}! Thank you!\p" - .string "With your help, we thwarted TEAM\n" - .string "MAGMA’s destructive plan!\p" - .string "But... This victory doesn’t mean the\n" - .string "end of their evil plans.\p" - .string "We will remain vigilant and keep up\n" - .string "our pursuit of TEAM MAGMA.\p" - .string "{PLAYER}{KUN}, we shall meet again!$" + .string "ADRIAN: {PLAYER}{KUN}!\p" + .string "Mit deiner Hilfe konnte ich die Pläne\n" + .string "von TEAM MAGMA durchkreuzen!\p" + .string "Aber... Dieser Sieg bedeutet nicht, dass\n" + .string "es seine üblen Pläne aufgeben wird.\p" + .string "Wir werden ein wachsames Auge auf TEAM\n" + .string "MAGMA haben und es weiter verfolgen.\p" + .string "{PLAYER}{KUN}, wir werden uns wieder sehen!$" MtChimney_Text_1B40EA:: @ 81B40EA - .string "Darn... TEAM MAGMA outnumbers us!\n" - .string "We can’t keep up with them!$" + .string "Mist... TEAM MAGMA ist uns zahlenmäßig\n" + .string "überlegen! Wir können es nicht mit ihm\l" + .string "aufnehmen!$" MtChimney_Text_1B4128:: @ 81B4128 - .string "If they expand the land, there’ll be\n" - .string "less habitats for WATER POKéMON!$" + .string "Wenn sie die Landmassen vergrößern,\n" + .string "gibt es weniger Lebensraum für\l" + .string "WASSER-POKéMON!$" MtChimney_Text_1B416E:: @ 81B416E - .string "TEAM MAGMA wants to expand the\n" - .string "landmass... How’s that for insane?$" + .string "TEAM MAGMA will die Landmassen ver-\n" + .string "größern... Wie krank sind die eigentlich?$" MtChimney_Text_1B41B0:: @ 81B41B0 .string "Bushaa!$" diff --git a/data/text/magma_settled.inc b/data/text/magma_settled.inc index 073f6540f..0bd5ddcd4 100644 --- a/data/text/magma_settled.inc +++ b/data/text/magma_settled.inc @@ -1,16 +1,17 @@ CaveOfOrigin_B4F_Text_1B4FE4:: @ 81B4FE4 - .string "{PLAYER}’s RED ORB suddenly began\n" - .string "glowing!$" + .string "Die ROTE KUGEL von {PLAYER}\n" + .string "beginnt plötzlich von innen\l" + .string "heraus zu leuchten!$" CaveOfOrigin_B4F_Text_1B5009:: @ 81B5009 - .string "GROUDON appears to have settled\n" - .string "into sleep again...$" + .string "GROUDON wurde offensichtlich\n" + .string "wieder in Schlaf versetzt...$" UnknownString_81B503D: @ 81B503D - .string "MAXIE: This...$" + .string "MARC: Das...$" UnknownString_81B504C: @ 81B504C - .string "MAXIE: ... ... ... ... ... ...\n" + .string "MARC: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "This is good-bye.\n" - .string "This is the last you’ve seen of me...$" + .string "Das heißt wohl Goodbye. Das ist das\n" + .string "Letzte, was du von mir siehst.$" diff --git a/data/text/magma_summit.inc b/data/text/magma_summit.inc index 8e17fe87d..48d97614f 100644 --- a/data/text/magma_summit.inc +++ b/data/text/magma_summit.inc @@ -1,156 +1,165 @@ MtPyre_Summit_Text_1B5CFD:: @ 81B5CFD - .string "I’ll show you exactly how scary\n" - .string "TEAM MAGMA can be!$" + .string "Ich werde dir zeigen, wie unheimlich\n" + .string "gruselig TEAM MAGMA sein kann!$" MtPyre_Summit_Text_1B5D30:: @ 81B5D30 - .string "So you think you can stand up alone\n" - .string "to TEAM MAGMA’s might...$" + .string "Und du glaubst wirklich, du bist der\n" + .string "Stärke TEAM MAGMAS gewachsen?!?$" MtPyre_Summit_Text_1B5D6D:: @ 81B5D6D - .string "Yeah, so you are strong...\n" - .string "But there’re a lot of us!$" + .string "Ja, du bist ganz schön stark...\n" + .string "Aber wir sind viele...$" MtPyre_Summit_Text_1B5DA2:: @ 81B5DA2 - .string "What’s up with you?\n" - .string "What does a single kid expect to do?$" + .string "Was ist los mit dir? Was kann ein kleines\n" + .string "Kind schon gegen uns ausrichten?$" MtPyre_Summit_Text_1B5DDB:: @ 81B5DDB - .string "Dang...\n" - .string "Too strong...$" + .string "Bumms...\n" + .string "Zu stark... Viel zu stark...$" MtPyre_Summit_Text_1B5DF1:: @ 81B5DF1 - .string "You don’t know anything.\n" - .string "Quit messing around with us!$" + .string "Du weißt doch gar nichts! Misch dich\n" + .string "besser nicht in unsere Sachen ein!$" MtPyre_Summit_Text_1B5E27:: @ 81B5E27 - .string "Hey, I remember you from MT. CHIMNEY!\n" - .string "It’s payback time!$" + .string "Hey, ich kenne dich vom SCHLOTBERG!\n" + .string "Der Tag der Abrechnung ist gekommen!$" MtPyre_Summit_Text_1B5E60:: @ 81B5E60 - .string "Urgggh...\n" - .string "Beaten by some kid again!$" + .string "Aaaaargh!\n" + .string "Schon wieder von einem Kind besiegt...$" MtPyre_Summit_Text_1B5E84:: @ 81B5E84 - .string "Heh, it doesn’t matter!\n" - .string "We bought ourselves some time!\p" - .string "The BOSS should have snatched what\n" - .string "he was after!$" + .string "Ach, das spielt keine Rolle.\n" + .string "Wir haben Zeit herausgeschlagen!\p" + .string "Der BOSS müsste mittlerweile haben, was\n" + .string "er besorgen wollte!$" MtPyre_Summit_Text_1B5EEC:: @ 81B5EEC - .string "MAXIE: Not you again...\p" - .string "You’ve impeded our plans repeatedly,\n" - .string "but this time you’re too late.\p" - .string "The BLUE ORB that rested atop\n" - .string "MT. PYRE...\l" - .string "I, MAXIE, claim it as mine!\p" - .string "Fufufu... Finally, I can realize my\n" - .string "grand design...\p" - .string "Come on, crew!\n" - .string "It’s SLATEPORT next!$" + .string "MARC: Nicht du schon wieder!\p" + .string "Du bist uns ja sehr schnell auf die Spur\n" + .string "gekommen, aber es ist schon zu spät.\p" + .string "Die BLAUE KUGEL, die sich oben\n" + .string "auf dem PYROBERG befindet...\l" + .string "Ich, MARC, sage, sie gehört mir!\p" + .string "Hahaha... Jetzt werden meine\n" + .string "Visionen Wirklichkeit!\p" + .string "Los, Mannschaft!\n" + .string "GRAPHITPORT CITY heißt unser Ziel.$" MtPyre_Summit_Text_1B5FE6:: @ 81B5FE6 - .string "Oh, no...\n" - .string "This cannot happen...\p" - .string "How could they take the BLUE ORB?\p" - .string "The BLUE ORB and RED ORB must never\n" - .string "be separated. They belong together.\p" + .string "Oh, neeeeiiinnn...\n" + .string "Das darf nicht wahr sein!\p" + .string "Wie konnten sie nur an die\n" + .string "BLAUE KUGEL gelangen?!?\p" + .string "Die BLAUE und die ROTE KUGEL dürfen nie\n" + .string "getrennt sein. Sie gehören zusammen!!!\p" .string "... ... ... ... ... ... ... ...\n" .string "Hmm...\p" - .string "Fine!\n" - .string "You take the remaining RED ORB.\p" - .string "Please take after that foul man and\n" - .string "get the other ORB back!$" + .string "Gut! Nimm die verbliebene\n" + .string "ROTE KUGEL an dich.\p" + .string "Bitte folge diesem Schurken und bring\n" + .string "die KUGEL zurück!$" MtPyre_Summit_Text_1B60F9:: @ 81B60F9 - .string "The RED ORB you have been entrusted\n" - .string "with and the stolen BLUE ORB...\p" - .string "They must never be apart...\n" - .string "Something terrible will happen...$" + .string "Die ROTE KUGEL, die dir anvertraut\n" + .string "wurde, und die gestohlene\l" + .string "BLAUE KUGEL...\p" + .string "Sie dürfen niemals getrennt werden...\n" + .string "Sonst passiert etwas Schreckliches!$" MtPyre_Summit_Text_1B617B:: @ 81B617B .string "So...\n" - .string "GROUDON has awoken...\p" - .string "The wondrous ORB that is said to have\n" - .string "becalmed the raging GROUDON...\l" - .string "It is the RED ORB you bear.\p" - .string "That RED ORB was found buried inside\n" - .string "the CAVE OF ORIGIN in SOOTOPOLIS...\p" - .string "There is perhaps a link between\n" - .string "GROUDON and the CAVE OF ORIGIN...$" + .string "GROUDON wurde erweckt...\p" + .string "Von der wundersamen KUGEL sagt\n" + .string "man, dass sie das wütende GROUDON\l" + .string "beruhigt.\p" + .string "Es handelt sich um die ROTE KUGEL,\n" + .string "die du bei dir trägst...\p" + .string "Diese ROTE KUGEL fand man in der\n" + .string "URZEITHÖHLE in XENEROVILLE...\p" + .string "Es gibt anscheinend eine Verbindung\n" + .string "zwischen GROUDON und der\l" + .string "URZEITHÖHLE...$" MtPyre_Summit_Text_1B6283:: @ 81B6283 - .string "That man, he returned the BLUE ORB.\p" - .string "Are you going to return the RED ORB\n" - .string "to its rightful place, too?$" + .string "Dieser Mann - er hat die BLAUE KUGEL\n" + .string "zurückgebracht.\p" + .string "Bringst du die ROTE KUGEL auch an ihren\n" + .string "angestammten Platz zurück?$" MtPyre_Summit_Text_1B62E7:: @ 81B62E7 - .string "What’s that?!\p" - .string "If the balance is not restored, there\n" - .string "is no telling what could happen.\p" - .string "You will return the RED ORB to its\n" - .string "rightful place, yes?$" + .string "Was soll das?\p" + .string "Wenn das Gleichgewicht nicht wiederher-\n" + .string "gestellt wird, weiß niemand, was\l" + .string "passieren wird!\p" + .string "Du wirst die ROTE KUGEL an ihren Platz\n" + .string "zurückbringen, ja?$" UnknownString_81B6374: @ 81B6374 - .string "{PLAYER} handed the RED ORB to the\n" - .string "old woman.$" + .string "{PLAYER} gibt der alten Frau die\n" + .string "ROTE KUGEL.$" MtPyre_Summit_Text_1B639C:: @ 81B639C - .string "Yes...\n" - .string "The two ORBS should remain here.\p" - .string "It is how it should be for the good\n" - .string "of all HOENN...$" + .string "Ja...\n" + .string "Die beiden KUGELN müssen hier bleiben.\p" + .string "So soll es sein, zum Wohle aller in HOENN.$" MtPyre_Summit_Text_1B63F8:: @ 81B63F8 - .string "The spirit of the land...\p" - .string "That is what GROUDON is said to be in\n" - .string "POKéMON form...\p" - .string "In the same manner that we and POKéMON\n" - .string "have life, this very land is alive...\p" - .string "GROUDON has taught us that...$" + .string "Der Geist des Landes...\p" + .string "Das, so heißt es, ist GROUDON in\n" + .string "POKéMON-Gestalt...\p" + .string "So wie wir und die POKéMON leben, ist\n" + .string "auch dieses Land lebendig...\p" + .string "GROUDON hat uns das gelehrt.$" MtPyre_Summit_Text_1B64B3:: @ 81B64B3 - .string "MT. PYRE is where we calm the spirits\n" - .string "of POKéMON that have passed on...\p" - .string "This is a high place where one can\n" - .string "see all of HOENN...\p" - .string "The disembodied spirits of POKéMON\n" - .string "must find solace here...\p" - .string "Is it coincidence that you are here...\p" - .string "Will you hear out my tale? A tale long\n" - .string "told in the HOENN region?$" + .string "Am PYROBERG legen wir die Geister der\n" + .string "POKéMON, die von uns gegangen sind, zur\l" + .string "Ruhe...\p" + .string "Von hier aus hat man einen Ausblick über\n" + .string "die ganze Region von HOENN...\p" + .string "Die körperlosen Geister der POKéMON\n" + .string "finden hier ihre Ruhe...\p" + .string "Es ist Fügung, dass du jetzt hier bist...\p" + .string "Möchtest du meine Geschichte hören?\n" + .string "Eine lange, sehr alte Geschichte der\l" + .string "HOENN-Region?$" MtPyre_Summit_Text_1B65D6:: @ 81B65D6 - .string "It happened long, long ago...\p" - .string "The world was wracked by a ferocious\n" - .string "clash between the POKéMON of the land\l" - .string "and the POKéMON of the sea...\p" - .string "The POKéMON of the land raised\n" - .string "mountains and created continents...\p" - .string "The POKéMON of the sea raised huge\n" - .string "waves and carved out oceans...\p" - .string "Their fierce duel raged without end.\p" - .string "The world was engulfed in vicious\n" - .string "storms and massive infernos.\p" - .string "The RED ORB and the BLUE ORB brought\n" - .string "an end to the calamity.\p" - .string "Light poured from the two ORBS and\n" - .string "becalmed the enraged adversaries.\p" - .string "The pair, made docile, burrowed deep\n" - .string "under the ground where eventually\l" - .string "they disappeared...$" + .string "Es geschah vor langer, langer Zeit...\p" + .string "Die Welt erbebte unter der Auseinander-\n" + .string "setzung der POKéMON des Landes mit den\l" + .string "POKéMON des Meeres...\p" + .string "Die POKéMON des Landes erschufen\n" + .string "Berge und Kontinente...\p" + .string "Die POKéMON des Meeres erschufen hohe\n" + .string "Wellen und tiefe Meeresbecken...\p" + .string "Das Duell wütete ohne absehbares Ende.\p" + .string "Die Welt wurde von erbarmungslosen\n" + .string "Stürmen und unglaublichen Infernos\l" + .string "heimgesucht.\p" + .string "Die BLAUE und die ROTE KUGEL setzten\n" + .string "schließlich diesem Kampf ein Ende.\p" + .string "Licht strahlte von den beiden KUGELN\n" + .string "und beruhigte die Kontrahenten.\p" + .string "Die beruhigten POKéMON verbargen sich\n" + .string "in den Tiefen des Meeres und der Erde,\l" + .string "und eines Tages verschwanden sie.$" MtPyre_Summit_Text_1B6823:: @ 81B6823 - .string "I see...\n" - .string "Well, that, too, is fine...$" + .string "Ich verstehe...\n" + .string "Nun, das ist auch in Ordnung...$" MtPyre_Summit_Text_1B6848:: @ 81B6848 - .string "MAXIE: You...\n" - .string "So you stopped GROUDON...\p" - .string "I shouldn’t be surprised...\p" - .string "I understand now that humans cannot\n" - .string "freely control the balance between\l" - .string "the land and the sea...\p" - .string "So I have come to return the\n" - .string "BLUE ORB...\p" - .string "I doubt that we will cross paths again...\n" - .string "Farewell...$" + .string "MARC: Du...\n" + .string "Du hast GROUDON aufgehalten...\p" + .string "Das sollte mich nicht überraschen...\p" + .string "Nun habe ich verstanden, dass es nicht\n" + .string "an den Menschen ist, das Gleichgewicht\l" + .string "zwischen Land und Meer zu stören...\p" + .string "Daher bin ich hier, um die\n" + .string "BLAUE KUGEL zurückzubringen...\p" + .string "Ich glaube nicht, dass wir uns wieder\n" + .string "sehen werden... Leb wohl...$" diff --git a/data/text/maps/AbandonedShip_CaptainsOffice.inc b/data/text/maps/AbandonedShip_CaptainsOffice.inc index bdd2057c4..8d5c30655 100644 --- a/data/text/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/text/maps/AbandonedShip_CaptainsOffice.inc @@ -1,16 +1,18 @@ AbandonedShip_CaptainsOffice_Text_198C85:: @ 8198C85 - .string "I’m investigating this ship on behalf\n" - .string "of CAPT. STERN.\p" - .string "He also asked me to find a SCANNER,\n" - .string "but I haven’t had any success...$" + .string "Ich untersuche das Schiff im Auftrag\n" + .string "von KAPT. BRIGG.\p" + .string "Er hat mich auch beauftragt, einen\n" + .string "SCANNER zu finden, aber ich habe \l" + .string "ihn noch nicht gefunden.$" AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00 - .string "Oh! That’s a SCANNER!\p" - .string "Listen, can I get you to deliver that\n" - .string "to CAPT. STERN?\p" - .string "I want to investigate this ship a\n" - .string "little more.$" + .string "Oh! Das ist der SCANNER!\p" + .string "Würdest du den bitte für mich zu\n" + .string "KAPT. BRIGG bringen? Das wäre nett.\p" + .string "Ich möchte das Schiff noch weiter\n" + .string "untersuchen.$" AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B - .string "This ship is called S.S. CACTUS.\n" - .string "It seems to be from an earlier era.$" + .string "Dieses Schiff heißt MS CACTUS. Es\n" + .string "scheint aus einer früheren Epoche zu\l" + .string "stammen.$" diff --git a/data/text/maps/AbandonedShip_Corridors_1F.inc b/data/text/maps/AbandonedShip_Corridors_1F.inc index 2df1c32b2..90091e04f 100644 --- a/data/text/maps/AbandonedShip_Corridors_1F.inc +++ b/data/text/maps/AbandonedShip_Corridors_1F.inc @@ -1,14 +1,15 @@ AbandonedShip_Corridors_1F_Text_19843D:: @ 819843D - .string "What’s so funny about having my inner\n" - .string "tube aboard the ship?$" + .string "Was ist so lustig daran, dass ich meinen\n" + .string "Schwimmreifen mit an Bord habe?$" AbandonedShip_Corridors_1F_Text_198479:: @ 8198479 - .string "Whoa, you overwhelmed me!$" + .string "Hui, du hast mir die Luft rausgelassen!$" AbandonedShip_Corridors_1F_Text_198493:: @ 8198493 - .string "It’s not easy throwing POKé BALLS\n" - .string "while hanging on to an inner tube!$" + .string "Es ist gar nicht so einfach, POKéBÄLLE\n" + .string "zu werfen, wenn man einen Schwimmreifen\l" + .string "trägt!$" AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8 - .string "Isn’t it fun here?\n" - .string "I get excited just being here!$" + .string "Hier ist es doch wirklich lustig, nicht\n" + .string "wahr? Ich bin total aufgeregt.$" diff --git a/data/text/maps/AbandonedShip_Corridors_B1F.inc b/data/text/maps/AbandonedShip_Corridors_B1F.inc index 887a6c11a..56edc9491 100644 --- a/data/text/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/text/maps/AbandonedShip_Corridors_B1F.inc @@ -1,29 +1,28 @@ AbandonedShip_Corridors_B1F_Text_19856F:: @ 819856F - .string "When we go out to sea, we SAILORS\n" - .string "always bring our POKéMON.\l" - .string "How about a quick battle?$" + .string "Wenn wir zur See fahren, nehmen wir\n" + .string "MATROSEN immer unsere POKéMON mit.\l" + .string "Wie wäre es mit einem schnellen Kampf?$" AbandonedShip_Corridors_B1F_Text_1985C5:: @ 81985C5 - .string "Whoops, I’m sunk!$" + .string "Huups, da bin ich abgesoffen.$" AbandonedShip_Corridors_B1F_Text_1985D7:: @ 81985D7 - .string "The ship’s bottom has sunk into the\n" - .string "depths.\p" - .string "If a POKéMON knew how to go underwater,\n" - .string "we might make some progress...$" + .string "Der Schiffsrumpf liegt tief unter der\n" + .string "Wasserlinie.\p" + .string "Wenn ein POKéMON wissen würde, wie\n" + .string "man taucht, würden wir Fortschritte\l" + .string "machen.$" AbandonedShip_Corridors_B1F_Text_19864A:: @ 819864A - .string "Yay!\n" - .string "It’s a ship!$" + .string "Jahaa!\n" + .string "Ein Schiff!$" AbandonedShip_Corridors_B1F_Text_19865C:: @ 819865C - .string "The door is locked.\p" - .string "“STORAGE” is painted on the door.$" + .string "Die Tür ist verschlossen.\p" + .string "“LAGER” steht auf dem Schild.$" AbandonedShip_Corridors_B1F_Text_198692:: @ 8198692 - .string "{PLAYER} inserted and turned the\n" - .string "STORAGE KEY.\p" - .string "The inserted KEY stuck fast, but the\n" - .string "door opened.$" - -AbandonedShip_Corridors_B1F_Text_1986EC:: @ 81986EC + .string "{PLAYER} steckt den SCHLÜSSEL zum\n" + .string "LAGER ins Schlüsselloch und dreht ihn.\p" + .string "Der SCHLÜSSEL ist schwergängig, aber\n" + .string "das Schloss lässt sich öffnen.$" diff --git a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc index 4e7c2014f..af957c711 100644 --- a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -1,2 +1,3 @@ +AbandonedShip_Corridors_B1F_Text_1986EC:: @ 81986EC AbandonedShip_HiddenFloorCorridors_Text_1986EC:: @ 81986EC - .string "The door is open.$" + .string "Die Tür ist offen.$" diff --git a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc b/data/text/maps/AbandonedShip_HiddenFloorRooms.inc index 1be9f8f02..a2e40f5a5 100644 --- a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/text/maps/AbandonedShip_HiddenFloorRooms.inc @@ -1,35 +1,35 @@ AbandonedShip_HiddenFloorCorridors_Text_198DC0:: @ 8198DC0 - .string "The door is locked.\p" - .string "“RM. 1” is painted on the door.$" + .string "Die Tür ist verschlossen.\p" + .string "“K. 1” steht auf der Tür.$" AbandonedShip_HiddenFloorCorridors_Text_198DF4:: @ 8198DF4 - .string "The door is locked.\p" - .string "“RM. 2” is painted on the door.$" + .string "Die Tür ist verschlossen.\p" + .string "“K. 2” steht auf der Tür.$" AbandonedShip_HiddenFloorCorridors_Text_198E28:: @ 8198E28 - .string "The door is locked.\p" - .string "“RM. 4” is painted on the door.$" + .string "Die Tür ist verschlossen.\p" + .string "“K. 4” steht auf der Tür.$" AbandonedShip_HiddenFloorCorridors_Text_198E5C:: @ 8198E5C - .string "The door is locked.\p" - .string "“RM. 6” is painted on the door.$" + .string "Die Tür ist verschlossen.\p" + .string "“K. 6” steht auf der Tür.$" AbandonedShip_HiddenFloorCorridors_Text_198E90:: @ 8198E90 - .string "{PLAYER} inserted and turned the\n" - .string "KEY.\p" - .string "The inserted KEY stuck fast, but the\n" - .string "door opened.$" + .string "{PLAYER} steckt den SCHLÜSSEL ins\n" + .string "Schloss und dreht ihn um.\p" + .string "Der SCHLÜSSEL ist schwergängig, aber\n" + .string "die Tür öffnet sich.$" AbandonedShip_HiddenFloorRooms_Text_198EE2:: @ 8198EE2 - .string "It’s bright and shiny!\n" - .string "But it’s just trash...$" + .string "Es ist hell und glänzend!\n" + .string "Aber es ist trotzdem nur Müll...$" UnknownString_8198F10: @ 8198F10 - .string "There’s a small indent in the wall.$" + .string "In der Wand ist eine kleine Einkerbung.$" UnknownString_8198F34: @ 8198F34 - .string "There’s a small indent in the wall.\p" - .string "Use the SECRET POWER?$" + .string "In der Wand ist eine kleine Einkerbung.\p" + .string "Möchtest du GEHEIMPOWER einsetzen?$" UnknownString_8198F6E: @ 8198F6E - .string "Discovered a small cavern!$" + .string "Eine kleine Höhle wird sichtbar.$" diff --git a/data/text/maps/AbandonedShip_Rooms2_1F.inc b/data/text/maps/AbandonedShip_Rooms2_1F.inc index 3acf542fc..39c1dd614 100644 --- a/data/text/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/text/maps/AbandonedShip_Rooms2_1F.inc @@ -1,70 +1,70 @@ AbandonedShip_Rooms2_1F_Text_1987C1:: @ 81987C1 - .string "HAL: While searching for treasures,\n" - .string "we discovered a TRAINER!$" + .string "PIT: Wir haben nach Schätzen gesucht\n" + .string "- und einen TRAINER gefunden!$" AbandonedShip_Rooms2_1F_Text_1987FE:: @ 81987FE - .string "HAL: We couldn’t win even though\n" - .string "we worked together...$" + .string "PIT: Wir konnten nicht gewinnen, obwohl\n" + .string "wir zusammengearbeitet haben...$" AbandonedShip_Rooms2_1F_Text_198835:: @ 8198835 - .string "HAL: We can’t find any treasures...\n" - .string "I wonder if someone got them already?$" + .string "PIT: Wir konnten keine Schätze finden.\n" + .string "Ob uns jemand zuvorgekommen ist?$" AbandonedShip_Rooms2_1F_Text_19887F:: @ 819887F - .string "HAL: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" + .string "PIT: Du hast keine zwei POKéMON.\n" + .string "So kannst du nicht gegen uns antreten.$" AbandonedShip_Rooms2_1F_Text_1988CC:: @ 81988CC - .string "LOIS: Oh? We were looking for some\n" - .string "treasure, but we only found a TRAINER.$" + .string "GESA: Oh? Wir haben nach Schätzen\n" + .string "gesucht und einen TRAINER gefunden.$" AbandonedShip_Rooms2_1F_Text_198916:: @ 8198916 - .string "LOIS: Oh, wow, you’re strong!$" + .string "GESA: Oh, wow, bist du stark!$" AbandonedShip_Rooms2_1F_Text_198934:: @ 8198934 - .string "LOIS: I wonder where the treasures\n" - .string "are hidden?\p" - .string "I already know what I’m going to buy\n" - .string "when I find them!$" + .string "GESA: Ich frage mich, wo die Schätze\n" + .string "versteckt sind...\p" + .string "Ich weiß, was ich mir alles kaufen\n" + .string "würde, wenn ich reich wäre...$" AbandonedShip_Rooms2_1F_Text_19899A:: @ 819899A - .string "LOIS: Don’t you have two POKéMON?\n" - .string "We’ll have to battle another time!$" + .string "GESA: Hast du keine zwei POKéMON?\n" + .string "Dann können wir jetzt nicht kämpfen.$" AbandonedShip_Rooms2_1F_Text_1989DF:: @ 81989DF - .string "HAL: We’ve been searching for\n" - .string "treasures all this time.\p" - .string "Our POKéMON have grown stronger, too.\n" - .string "Let us show you, okay?$" + .string "PIT: Wir haben die ganze Zeit nur nach\n" + .string "Schätzen gesucht.\p" + .string "Aber unsere POKéMON sind auch stärker\n" + .string "geworden. Dürfen wir dir das zeigen?$" AbandonedShip_Rooms2_1F_Text_198A53:: @ 8198A53 - .string "HAL: You’re strong as usual!$" + .string "PIT: Du bist stark wie immer.$" AbandonedShip_Rooms2_1F_Text_198A70:: @ 8198A70 - .string "HAL: We can’t find any treasures,\n" - .string "we lose at POKéMON...\p" - .string "I want to go home... But if I say that,\n" - .string "she gets all angry with me...$" + .string "PIT: Wir haben keine Schätze gefunden,\n" + .string "sondern gegen POKéMON verloren...\p" + .string "Ich will nach Hause... Aber wenn ich das\n" + .string "laut sage, wird sie sauer auf mich.$" AbandonedShip_Rooms2_1F_Text_198AEE:: @ 8198AEE - .string "HAL: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" + .string "PIT: Du hast keine zwei POKéMON.\n" + .string "So können wir nicht kämpfen.$" AbandonedShip_Rooms2_1F_Text_198B3B:: @ 8198B3B - .string "LOIS: Oh, hi, we meet again!\p" - .string "Just like us, you haven’t given up\n" - .string "searching for treasures!\p" - .string "How about we battle, and the loser has\n" - .string "to give up looking?$" + .string "GESA: Oh, da bist du ja wieder!\p" + .string "Genau wie wir, hast du die Suche nach\n" + .string "Schätzen auch nicht aufgegeben, was?\p" + .string "Wie wäre es mit einem Kampf? Und der\n" + .string "Verlierer gibt die Suche auf?$" AbandonedShip_Rooms2_1F_Text_198BCF:: @ 8198BCF - .string "LOIS: Oh, we lost again...$" + .string "GESA: Ach, wir haben wieder verloren...$" AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA - .string "LOIS: We’ll raise our POKéMON more.\p" - .string "We’re not going home until we find our\n" - .string "treasures!$" + .string "GESA: Wir müssen unsere POKéMON mehr\n" + .string "trainieren.\p" + .string "Wir gehen nicht ohne Schatz nach Hause!$" AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40 - .string "LOIS: Don’t you have two POKéMON?\n" - .string "We’ll have to battle another time!$" + .string "GESA: Hast du keine zwei POKéMON?\n" + .string "Dann müssen wir später kämpfen.$" diff --git a/data/text/maps/AbandonedShip_Rooms2_B1F.inc b/data/text/maps/AbandonedShip_Rooms2_B1F.inc index 11e505abd..1eeb3c110 100644 --- a/data/text/maps/AbandonedShip_Rooms2_B1F.inc +++ b/data/text/maps/AbandonedShip_Rooms2_B1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759 - .string "This is a perfect place to go exploring!\n" - .string "It’s exciting here!\p" - .string "I bet there’re amazing treasures on\n" - .string "board.$" + .string "Ein perfekter Ort, auf Erkundungstour\n" + .string "zu gehen. Es ist aufregend hier!\p" + .string "Ich wette, hier sind wertvolle Schätze\n" + .string "versteckt...$" diff --git a/data/text/maps/AbandonedShip_Rooms_1F.inc b/data/text/maps/AbandonedShip_Rooms_1F.inc index 67b67ca4c..8e5c0f910 100644 --- a/data/text/maps/AbandonedShip_Rooms_1F.inc +++ b/data/text/maps/AbandonedShip_Rooms_1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A - .string "Ships of this sort are rare, so I’m\n" - .string "taking a look around.\p" + .string "Schiffe dieser Art sind sehr selten,\n" + .string "daher schaue ich mich hier gut um.\p" .string "Hmhm...\n" - .string "There appear to be other cabins...$" + .string "Da sind die anderen Kabinen...$" diff --git a/data/text/maps/AbandonedShip_Rooms_B1F.inc b/data/text/maps/AbandonedShip_Rooms_B1F.inc index 45df47d60..6bf155e54 100644 --- a/data/text/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/text/maps/AbandonedShip_Rooms_B1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE - .string "Urrrrppp...\p" - .string "I’m getting queasy just being aboard\n" - .string "this ship...\p" - .string "It’s not even moving, but...$" + .string "Bööörps...\p" + .string "Mir wird schon übel, sobald ich ein\n" + .string "Schiff nur betrete...\p" + .string "Es bewegt sich zwar nicht, aber...$" diff --git a/data/text/maps/AquaHideout_1F.inc b/data/text/maps/AquaHideout_1F.inc index 6c003d308..5d702b1c9 100644 --- a/data/text/maps/AquaHideout_1F.inc +++ b/data/text/maps/AquaHideout_1F.inc @@ -1,51 +1,53 @@ AquaHideout_1F_Text_196AFD:: @ 8196AFD - .string "What? What? What do you want with \n" - .string "TEAM {EVIL_TEAM}?\p" - .string "Our BOSS isn’t here! He’s gone off to\n" - .string "snatch something important!\p" + .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" + .string "schaffen?\p" + .string "Unser BOSS ist nicht hier! Er ist dabei,\n" + .string "sich etwas sehr Wichtiges unter den\l" + .string "Nagel zu reißen.\p" .string "... ...\n" - .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" + .string "Wo er hin ist?\p" + .string "Uahahaha! Du glaubst doch nicht im\n" + .string "Ernst, dass ich dir das verrate!?!$" AquaHideout_1F_Text_196BC5:: @ 8196BC5 - .string "What? What? What do you want with \n" - .string "TEAM {EVIL_TEAM}?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s gone off to jack a submarine!\p" + .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" + .string "schaffen?\p" + .string "Unser BOSS ist nicht hier! Er ist dabei,\n" + .string "sich ein U-Boot unter den Nagel zu\l" + .string "reißen.\p" .string "... ...\n" - .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" + .string "Wo er hin ist?\p" + .string "Uahahaha! Du glaubst doch nicht im\n" + .string "Ernst, dass ich dir das verrate!?!$" AquaHideout_1F_Text_196C83:: @ 8196C83 - .string "What? What? What do you want with \n" - .string "TEAM {EVIL_TEAM}?\p" - .string "Our BOSS isn’t here! He’s on his way to\n" - .string "MT. PYRE on ROUTE 122!\p" + .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" + .string "schaffen?\p" + .string "Unser BOSS ist nicht hier! Er ist auf dem\n" + .string "Weg nach PYROBERG auf der ROUTE 122!\p" .string "... ...\n" - .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" + .string "Warum er dorthin ist?\p" + .string "Uahahaha! Du glaubst doch nicht im\n" + .string "Ernst, dass ich dir das verrate!?!$" AquaHideout_1F_Text_196D46:: @ 8196D46 - .string "What? What? What do you want with\n" - .string "TEAM {EVIL_TEAM}?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s on his way to SLATEPORT CITY!\p" + .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" + .string "schaffen?\p" + .string "Unser BOSS ist nicht hier! Er ist auf dem\n" + .string "Weg nach GRAPHITPORT CITY!\p" .string "... ...\n" - .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" - .string "you something that crucial?$" + .string "Warum er dorthin ist?\p" + .string "Uahahaha! Du glaubst doch nicht im\n" + .string "Ernst, dass ich dir das verrate!?!$" AquaHideout_1F_Text_196E01:: @ 8196E01 - .string "Ayiyiyi!\n" - .string "Suspicious character spotted!$" + .string "Huhuuhuhuu!\n" + .string "Verdächtige Person gesichtet!$" AquaHideout_1F_Text_196E28:: @ 8196E28 - .string "Grrrrr...\n" - .string "I lost it!$" + .string "Grrr...\n" + .string "Ich habe verloren!$" AquaHideout_1F_Text_196E3D:: @ 8196E3D - .string "I took the loss for the TEAM, but\n" - .string "I did my job...$" + .string "Nun hat das TEAM verloren, aber ich habe\n" + .string "meinen Job gemacht...$" diff --git a/data/text/maps/AquaHideout_B1F.inc b/data/text/maps/AquaHideout_B1F.inc index 605a98b8b..7a8ea0395 100644 --- a/data/text/maps/AquaHideout_B1F.inc +++ b/data/text/maps/AquaHideout_B1F.inc @@ -1,39 +1,40 @@ AquaHideout_B1F_Text_196E6F:: @ 8196E6F - .string "If you want to know the secret about\n" - .string "our HIDEOUT, you have me to beat!$" + .string "Wenn du das Geheimnis unseres\n" + .string "VERSTECKS erfahren willst, musst du\l" + .string "mich besiegen!$" AquaHideout_B1F_Text_196EB6:: @ 8196EB6 - .string "I can’t win at all...$" + .string "Ich kann anscheinend nicht gewinnen...$" AquaHideout_B1F_Text_196ECC:: @ 8196ECC - .string "Our HIDEOUT’s secret?\p" - .string "Well, let’s just say...\n" - .string "There’s a submarine at the far end!\p" - .string "But, by now...\n" - .string "Kekekeke...$" + .string "Das Geheimnis unseres VERSTECKS?\p" + .string "Nun, sagen wir mal soooo...\n" + .string "Am Ende befindet sich ein U-Boot!\p" + .string "Aber, im Moment...\n" + .string "Hehehehe...$" AquaHideout_B1F_Text_196F39:: @ 8196F39 - .string "Fuel supply loaded A-OK!\n" - .string "In-cruise snacks loaded A-OK!\p" - .string "Nothing left to do but KO a pesky\n" - .string "meddler!$" + .string "Tankbefüllung... OKAY!\n" + .string "Proviant... OKAY!\p" + .string "Nichts anderes mehr zu tun, als eine\n" + .string "Nervensäge aus dem Weg zu räumen.$" AquaHideout_B1F_Text_196F9B:: @ 8196F9B - .string "I took a serious licking!$" + .string "Das war ein Schuss vor den Bug.$" AquaHideout_B1F_Text_196FB5:: @ 8196FB5 - .string "Humph!\n" - .string "This was supposed to happen!\p" - .string "My mission was to just hold you up!$" + .string "Pah!\n" + .string "Meine Niederlage war geplant.\p" + .string "Ich sollte dich eh nur aufhalten!$" AquaHideout_B1F_Text_196FFD:: @ 8196FFD - .string "Yawn... Keeping watch over the\n" - .string "HIDEOUT bores me. I’ll take you on.$" + .string "Gääähn... Hier im VERSTECK Wache zu\n" + .string "stehen, ist ermüdend. Ich muss kämpfen.$" AquaHideout_B1F_Text_197040:: @ 8197040 - .string "Yawn...\n" - .string "Oh, I lost...$" + .string "Gähn...\n" + .string "Oh, da habe ich wohl verloren...$" AquaHideout_B1F_Text_197056:: @ 8197056 - .string "If you scurry too much, other TEAM\n" - .string "{EVIL_TEAM} members might get you.$" + .string "Wenn du weiter hier herumschleichst, \n" + .string "schnappt dich das TEAM {EVIL_TEAM}.$" diff --git a/data/text/maps/AquaHideout_B2F.inc b/data/text/maps/AquaHideout_B2F.inc index f4b7dd035..649d33696 100644 --- a/data/text/maps/AquaHideout_B2F.inc +++ b/data/text/maps/AquaHideout_B2F.inc @@ -1,58 +1,59 @@ AquaHideout_B2F_Text_197093:: @ 8197093 - .string "Hehehe...\p" - .string "Got here already, did you?\n" - .string "We underestimated you!\p" - .string "But this is it!\p" - .string "I’m a cut above the GRUNTS you’ve seen\n" - .string "so far.\p" - .string "I’m not stalling for time. I’m going\n" - .string "to pulverize you!$" + .string "Hehehehe... Du hast es tatsächlich\n" + .string "bis hierher geschafft?\p" + .string "Da haben wir dich wohl etwas\n" + .string "unterschätzt!\p" + .string "Aber hier geht es für dich nicht weiter!\p" + .string "Ich bin besser als die anderen RÜPEL,\n" + .string "die dir bisher begegnet sind.\p" + .string "Ich schinde keine Zeit heraus. Ich\n" + .string "werde dich pulverisieren!$" AquaHideout_B2F_Text_197145:: @ 8197145 .string "Hehehe...\n" - .string "So, I lost, too...$" + .string "Dann habe ich eben auch verloren. Pöh.$" AquaHideout_B2F_Text_197162:: @ 8197162 .string "Hehehe!\p" - .string "While I was toying with you, our BOSS\n" - .string "got through his preparations!$" + .string "Während ich mit dir gespielt habe, hat\n" + .string "sich unser BOSS vorbereitet!$" AquaHideout_B2F_Text_1971AE:: @ 81971AE .string "Hehehe!\p" - .string "Our BOSS has already gone on his way to\n" - .string "some cave under the sea!\p" - .string "If you’re going to give chase, you’d\n" - .string "better search the big, wide sea beyond\l" - .string "LILYCOVE.\p" - .string "But will you find it then?\n" - .string "Hehehe!$" + .string "Unser BOSS ist schon unterwegs zu\n" + .string "einer Unterwasserhöhle!\p" + .string "Falls du ihn verfolgen willst, suche doch\n" + .string "mal die Tiefsee in der Region um\l" + .string "SEEGRASULB CITY ab.\p" + .string "Aber ob du ihn dort auch finden wirst?\n" + .string "Hehehehehehe...$" AquaHideout_B2F_Text_197270:: @ 8197270 - .string "Wahahah, I grew weary of waiting!\n" - .string "You owe me a battle, too!$" + .string "Wahahahah, ich bin müde vom Warten!\n" + .string "Du schuldest mir einen Kampf!$" AquaHideout_B2F_Text_1972AC:: @ 81972AC - .string "Tired of waiting...\n" - .string "Lost and dazed...$" + .string "Des Wartens müde...\n" + .string "Gedöst und verloren...$" AquaHideout_B2F_Text_1972D2:: @ 81972D2 .string "BOSS...\n" - .string "Is this good enough?$" + .string "Reicht das aus?$" AquaHideout_B2F_Text_1972EF:: @ 81972EF - .string "Warp panels, the HIDEOUT’s pride\n" - .string "and joy!\p" - .string "You’re clueless about where you are,\n" - .string "aren’t you?\p" - .string "Fluster and tire out the enemy, then\n" - .string "lower the boom! That’s our plan!$" + .string "Teleporter... Der ganze Stolz des\n" + .string "VERSTECKS!\p" + .string "Du weißt gar nicht mehr, wo du gerade\n" + .string "bist, stimmt’s? Kicher...\p" + .string "Den Gegner verwirren, ermüden und dann\n" + .string "auf ihn mit Gebrüll! Das ist der Plan!$" AquaHideout_B2F_Text_197390:: @ 8197390 - .string "What’s wrong with you?\n" - .string "You’re not tired at all!$" + .string "Was stimmt nicht mit dir?\n" + .string "Du bist ja überhaupt nicht müde!$" AquaHideout_B2F_Text_1973C0:: @ 81973C0 - .string "That reminds me... I can’t remember\n" - .string "where I put the MASTER BALL.\p" - .string "If I fail to guard it, our BOSS will\n" - .string "chew me out...$" + .string "Da fällt mir ein... Wo habe ich nur den\n" + .string "MEISTERBALL hingelegt?\p" + .string "Wenn ich den verloren habe, zieht mir\n" + .string "der BOSS die Ohren lang...$" diff --git a/data/text/maps/BattleTower_BattleRoom.inc b/data/text/maps/BattleTower_BattleRoom.inc index 9f72d8971..0c1714f08 100644 --- a/data/text/maps/BattleTower_BattleRoom.inc +++ b/data/text/maps/BattleTower_BattleRoom.inc @@ -1,15 +1,15 @@ BattleTower_BattleRoom_Text_19ACDC:: @ 819ACDC - .string "We will restore your POKéMON to\n" - .string "full health.$" + .string "Wir heilen deine POKéMON und machen\n" + .string "sie wieder fit!$" BattleTower_BattleRoom_Text_19AD09:: @ 819AD09 - .string "You will be facing opponent no. {STR_VAR_1}.\n" - .string "Are you ready?$" + .string "Nun wirst du dich Gegner Nr. {STR_VAR_1} stellen\n" + .string "müssen. Bist du bereit?$" BattleTower_BattleRoom_Text_19AD3C:: @ 819AD3C - .string "Would you like to save and\n" - .string "quit the game?$" + .string "Möchtest du das Spiel speichern und\n" + .string "beenden?$" BattleTower_BattleRoom_Text_19AD66:: @ 819AD66 - .string "Would you like to cancel your BATTLE\n" - .string "ROOM challenge?$" + .string "Möchtest du die Herausforderung im\n" + .string "KAMPFRAUM abbrechen?$" diff --git a/data/text/maps/BattleTower_Lobby.inc b/data/text/maps/BattleTower_Lobby.inc index db94f1bce..6b2a8431b 100644 --- a/data/text/maps/BattleTower_Lobby.inc +++ b/data/text/maps/BattleTower_Lobby.inc @@ -1,192 +1,200 @@ BattleTower_Lobby_Text_199F2C:: @ 8199F2C - .string "Welcome to the BATTLE TOWER!\p" - .string "Please register with me to enter\n" - .string "a BATTLE ROOM.$" + .string "Willkommen im DUELLTURM!\p" + .string "Bitte registriere dich bei mir, um einen\n" + .string "KAMPFRAUM betreten zu können.$" BattleTower_Lobby_Text_199F79:: @ 8199F79 - .string "Would you like to make a BATTLE ROOM\n" - .string "challenge?$" + .string "Möchtest du jemanden in einem\n" + .string "KAMPFRAUM herausfordern?$" BattleTower_Lobby_Text_199FA9:: @ 8199FA9 - .string "We’ll be looking forward to your\n" - .string "next challenge.$" + .string "Wir freuen uns auf deine nächste\n" + .string "Herausforderung.$" BattleTower_Lobby_Text_199FDA:: @ 8199FDA - .string "Before entering a BATTLE ROOM, your\n" - .string "progress must be saved. Is that okay?$" + .string "Bevor du einen KAMPFRAUM betrittst,\n" + .string "musst du dein Spiel speichern. Okay?$" BattleTower_Lobby_Text_19A024:: @ 819A024 - .string "There are two BATTLE ROOMS,\n" - .string "Level 50 and Level 100.\l" - .string "Which would you like to challenge?$" + .string "Es gibt hier zwei KAMPFRÄUME, Level 50\n" + .string "und Level 100.\l" + .string "In welchem möchtest du antreten?$" BattleTower_Lobby_Text_19A07B:: @ 819A07B - .string "Please select the POKéMON you wish\n" - .string "to enter.$" + .string "Bitte wähle die POKéMON aus, die\n" + .string "antreten sollen.$" BattleTower_Lobby_Text_19A0A8:: @ 819A0A8 - .string "I’ll direct you to your BATTLE ROOM now.$" + .string "Ich bringe dich nun zum KAMPFRAUM.$" BattleTower_Lobby_Text_19A0D1:: @ 819A0D1 - .string "The BATTLE TOWER is a facility made\n" - .string "especially for POKéMON battles.\p" - .string "Within the TOWER are many BATTLE ROOMS.\p" - .string "In each BATTLE ROOM, seven TRAINERS\n" - .string "await your challenge.\p" - .string "Beat all seven, and you will be rewarded\n" - .string "with a fabulous prize.\p" - .string "You may also take a break from your\n" - .string "challenge by saving your progress.\p" - .string "Make sure you save properly or you\n" - .string "won’t be able to resume your challenge.$" + .string "Der DUELLTURM ist ein Gebäude, das\n" + .string "für POKéMON-Kämpfe gebaut wurde.\p" + .string "Im TURM gibt es viele KAMPFRÄUME.\p" + .string "In jedem KAMPFRAUM warten sieben\n" + .string "TRAINER auf einen Herausforderer.\p" + .string "Besiege alle sieben und du gewinnst\n" + .string "einen wunderbaren Preis.\p" + .string "Du kannst auch pausieren, indem du\n" + .string "deinen Fortschritt speicherst.\p" + .string "Vergewissere dich, dass du ordentlich\n" + .string "abspeicherst, denn du kannst sonst\l" + .string "nach einer Pause den Kampf nicht\l" + .string "fortsetzen.$" BattleTower_Lobby_Text_19A249:: @ 819A249 - .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" - .string "You must have three different POKéMON\n" - .string "of Level 50 or less to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" + .string "Entschuldigung!\p" + .string "Aber deine POKéMON sind nicht\n" + .string "teilnahmeberechtigt.\p" + .string "Du brauchst drei verschiedene\n" + .string "POKéMON von Level 50 oder weniger.\p" + .string "Jedes muss außerdem ein anderes Item\n" + .string "halten.\p" + .string "EIER{STR_VAR_1} nicht zugelassen.\p" + .string "Bitte komm wieder, wenn du bereit bist.$" BattleTower_Lobby_Text_19A32D:: @ 819A32D - .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" - .string "You must have three different POKéMON\n" - .string "to enter.\p" - .string "They also must be holding different\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Please come see me when you are ready.$" + .string "Entschuldigung!\p" + .string "Aber deine POKéMON sind nicht\n" + .string "teilnahmeberechtigt.\p" + .string "Du brauchst drei verschiedene\n" + .string "POKéMON.\p" + .string "Jedes muss außerdem ein anderes Item\n" + .string "halten.\p" + .string "EIER{STR_VAR_1} nicht zugelassen.\p" + .string "Bitte komm wieder, wenn du bereit bist.$" BattleTower_Lobby_Text_19A3FD:: @ 819A3FD - .string "Excuse me!\p" - .string "You didn’t save before you quit your\n" - .string "challenge last time.\p" - .string "Because of that, your challenge so far\n" - .string "has been disqualified. Sorry!$" + .string "Entschuldigung!\p" + .string "Du hast, bevor du die Herausforderung\n" + .string "abgebrochen hast, nicht gespeichert.\p" + .string "Daher wirst du für diese Herausforde-\n" + .string "rung disqualifiziert. Schade!$" BattleTower_Lobby_Text_19A487:: @ 819A487 - .string "Congratulations!\n" - .string "You’ve beaten all seven TRAINERS!\p" + .string "Herzlichen Glückwunsch!\n" + .string "Du hast alle 7 TRAINER besiegt!\p" .string "$" BattleTower_Lobby_Text_19A4BB:: @ 819A4BB - .string "For beating seven TRAINERS in a row,\n" - .string "you have earned this fabulous prize!\p" + .string "Da du 7 TRAINER in Folge besiegt hast,\n" + .string "gewinnst du einen wunderbaren Preis!\p" .string "$" BattleTower_Lobby_Text_19A506:: @ 819A506 - .string "{PLAYER} received the prize\n" + .string "{PLAYER} gewinnt\n" .string "{STR_VAR_1}.$" BattleTower_Lobby_Text_19A520:: @ 819A520 - .string "Oh, your BAG appears to be full.\p" - .string "Please make room in your BAG, then come\n" - .string "see me.$" + .string "Oh, dein BEUTEL ist voll.\p" + .string "Bitte schaffe Platz in deinem BEUTEL\n" + .string "und komme dann wieder.$" BattleTower_Lobby_Text_19A571:: @ 819A571 - .string "Thank you for playing!\p" + .string "Vielen Dank für die Teilnahme!\p" .string "$" BattleTower_Lobby_Text_19A589:: @ 819A589 - .string "Your record will be saved.\n" - .string "Please wait.$" + .string "Dein Erfolg wird gespeichert.\n" + .string "Bitte warten...$" BattleTower_Lobby_Text_19A5B1:: @ 819A5B1 - .string "We’ve been waiting for you!\p" + .string "Wir haben schon auf dich gewartet!\p" .string "$" BattleTower_Lobby_Text_19A5CE:: @ 819A5CE - .string "Before entering a BATTLE ROOM, your\n" - .string "progress will be saved. Please wait.$" + .string "Bevor du einen KAMPFRAUM betrittst,\n" + .string "wird dein Spiel gespeichert.\l" + .string "Bitte warten...$" BattleTower_Lobby_Text_19A617:: @ 819A617 - .string "You’re finally about to face the\n" - .string "50th TRAINER.\p" - .string "From here on, every time you beat seven\n" - .string "TRAINERS in a row, your POKéMON will\l" - .string "receive a commemorative RIBBON.\p" - .string "Good luck!$" + .string "Und nun wartet der 50. TRAINER auf\n" + .string "deine Herausforderung.\p" + .string "Jedes Mal, wenn du von jetzt an 7\n" + .string "TRAINER in Folge besiegst, wird deinen\l" + .string "POKéMON ein BAND verliehen.\p" + .string "Viel Glück!$" BattleTower_Lobby_Text_19A6BE:: @ 819A6BE - .string "Here are some RIBBONS for beating\n" - .string "seven tough TRAINERS in a row.\p" - .string "{PLAYER} received some RIBBONS!$" + .string "Dies sind einige BÄNDER für den erfolg-\n" + .string "reichen Kampf gegen 7 TRAINER in Folge.\p" + .string "{PLAYER} erhält einige BÄNDER!$" BattleTower_Lobby_Text_19A719:: @ 819A719 - .string "{PLAYER} put the RIBBONS on the\n" - .string "challenger POKéMON.$" + .string "{PLAYER} steckt den herausfordernden\n" + .string "POKéMON die BÄNDER an.$" BattleTower_Lobby_Text_19A747:: @ 819A747 - .string "Hello, hello!\n" - .string "You’re going to battle here, right?\p" - .string "Can you tell me what’s going through\n" - .string "your mind as you prepare for battle?$" + .string "Hallo, hallo!\n" + .string "Du willst hier kämpfen, richtig?\p" + .string "Verrätst du mir, was du jetzt, während\n" + .string "der Kampfvorbereitungen, denkst?$" BattleTower_Lobby_Text_19A7C3:: @ 819A7C3 - .string "Oh, wow, you’ll tell me?\n" - .string "Great! Then, what’s your answer?$" + .string "Ja? Du verrätst es mir?\n" + .string "Toll! Also, wie lautet deine Antwort?$" BattleTower_Lobby_Text_19A7FD:: @ 819A7FD - .string "Oh, so you don’t think much about it?\n" - .string "You’re one cool customer.$" + .string "Ach, so viel denkst du gar nicht darüber\n" + .string "nach? Bist du aber cool!$" BattleTower_Lobby_Text_19A83D:: @ 819A83D - .string "Hunh? You changed your mind?\n" - .string "I guess you’re fickle.$" + .string "Wie? Du hast deine Meinung geändert?\n" + .string "Meine Güte, bist du aber launisch!$" BattleTower_Lobby_Text_19A871:: @ 819A871 - .string "Okay, so that’s how you feel?\n" - .string "That’s quite original.\p" - .string "Thanks!$" + .string "Ach? So fühlst du dich? Das ist\n" + .string "aber eine originelle Beschreibung.\p" + .string "Danke!$" BattleTower_Lobby_Text_19A8AE:: @ 819A8AE - .string "The number of matches you win in a row\n" - .string "is recorded.\p" - .string "The record is posted beside the\n" - .string "registration counter.\p" - .string "It’s also on the back of your\n" - .string "TRAINER’S CARD.$" + .string "Die Anzahl der in Folge gewonnenen\n" + .string "Kämpfe wird hier aufgezeichnet.\p" + .string "Die Erfolge werden dann neben dem\n" + .string "Registrierungsschalter ausgehängt.\p" + .string "Sie stehen auch auf der Rückseite\n" + .string "deines TRAINERPASSES.$" BattleTower_Lobby_Text_19A946:: @ 819A946 - .string "Once you’ve entered the BATTLE TOWER,\n" - .string "you can’t leave until you either lose\l" - .string "or you beat seven TRAINERS in a row.\p" - .string "You’d best be certain that you’re up\n" - .string "to the challenge.$" + .string "Sobald du den DUELLTURM offiziell be-\n" + .string "treten hast, kannst du ihn nicht eher\l" + .string "verlassen, bis du gegen 7 TRAINER\l" + .string "entweder verloren oder gewonnen hast.\p" + .string "Überlege also gut, bevor du als\n" + .string "Herausforderer antrittst.$" BattleTower_Lobby_Text_19A9EE:: @ 819A9EE - .string "Hahahaha! Pure magnificence!\n" - .string "Pure magnificence indeed!\p" - .string "Do you realize what you’ve achieved?\n" - .string "You’ve beaten 50 TRAINERS in a row!\p" - .string "Yes, purely magnificent!\p" - .string "As the OWNER of the BATTLE TOWER,\n" - .string "let me give you a memento!$" + .string "Hahaha! Absolut großartig!\n" + .string "Wirklich einfach großartig!\p" + .string "Bist du dir bewusst, was du geschafft\n" + .string "hast? Du hast 50 TRAINER in Folge\l" + .string "besiegt!\p" + .string "Ja, der pure Wahnsinn!!!\p" + .string "Als EIGENTÜMER dieses DUELLTURMS\n" + .string "überreiche ich dir hiermit ein Andenken!$" BattleTower_Lobby_Text_19AAC4:: @ 819AAC4 - .string "Wahahaha! Pure magnificence!\n" - .string "Absolutely pure magnificence indeed!\p" - .string "Do you realize what you’ve achieved?\n" - .string "You’ve beaten 100 TRAINERS in a row!\p" - .string "Yes, absolutely magnificent!\p" - .string "As the OWNER of the BATTLE TOWER,\n" - .string "let me give you a memento!$" + .string "Hahaha! Absolut großartig!\n" + .string "Wirklich einfach großartig!\p" + .string "Bist du dir bewusst, was du geschafft\n" + .string "hast? Du hast 100 TRAINER in Folge\l" + .string "besiegt!\p" + .string "Ja, der pure Wahnsinn!!!\p" + .string "Als EIGENTÜMER dieses DUELLTURMS\n" + .string "überreiche ich dir hiermit ein Andenken.$" BattleTower_Lobby_Text_19ABAA:: @ 819ABAA - .string "I suggest you keep it displayed.\n" - .string "It will surely attract attention.$" + .string "Ich vermute, du willst es hier auf-\n" + .string "hängen. Das findet sicher Beachtung!$" BattleTower_Lobby_Text_19ABED:: @ 819ABED - .string "Oh?\n" - .string "Your PC has no room for this...\p" - .string "But it would be a shame to waste this...\n" - .string "Please come back for this!$" + .string "Ach!\n" + .string "Auf deinem PC ist kein Platz mehr dafür.\p" + .string "Aber deshalb sollten wir es nicht weg-\n" + .string "werfen! Bitte regle das und komm wieder.$" BattleTower_Lobby_Text_19AC55:: @ 819AC55 - .string "I’m overwhelmed with satisfaction after\n" - .string "seeing your magnificent performance.\p" - .string "It makes the building of the BATTLE\n" - .string "TOWER all worthwhile!$" + .string "Ich bin einfach überwältigt von deiner\n" + .string "großartigen Leistung!\p" + .string "TRAINER wie du geben dem DUELLTURM\n" + .string "seinen wahren Sinn.$" diff --git a/data/text/maps/BattleTower_Outside.inc b/data/text/maps/BattleTower_Outside.inc index 934ebca36..3be50176f 100644 --- a/data/text/maps/BattleTower_Outside.inc +++ b/data/text/maps/BattleTower_Outside.inc @@ -1,48 +1,49 @@ BattleTower_Outside_Text_199C6F:: @ 8199C6F - .string "BATTLE TOWER\n" - .string "“Win it all and be the best, TRAINERS!”$" + .string "DUELLTURM\n" + .string "“Besiege alle und werde der beste\l" + .string "TRAINER!”$" BattleTower_Outside_Text_199CA4:: @ 8199CA4 - .string "This is the BATTLE TOWER.\p" - .string "TRAINERS bring their best-raised\n" - .string "POKéMON for elimination-style matches.$" + .string "Dies ist der DUELLTURM.\p" + .string "TRAINER tragen mit ihren besten\n" + .string "POKéMON Ausscheidungskämpfe aus.$" BattleTower_Outside_Text_199D06:: @ 8199D06 - .string "Hello, are you here for the ferry?\n" - .string "May I see your TICKET?$" + .string "Hallo! Möchtest du mit der Fähre fahren?\n" + .string "Darf ich bitte dein TICKET sehen?$" BattleTower_Outside_Text_199D40:: @ 8199D40 - .string "{PLAYER} doesn’t have the TICKET...\p" - .string "I’m terribly sorry.\p" - .string "You must have a TICKET to board\n" - .string "the ferry.$" + .string "{PLAYER} hat kein TICKET...\p" + .string "Es tut mir schrecklich Leid.\p" + .string "Du brauchst ein TICKET, um mit der\n" + .string "Fähre fahren zu dürfen.$" BattleTower_Outside_Text_199D9D:: @ 8199D9D - .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" - .string "And where would you like to go?$" + .string "{PLAYER} zeigt das TICKET.\p" + .string "Wunderbar! Das ist gut!\p" + .string "Und wohin möchtest du reisen?$" BattleTower_Outside_Text_199DF2:: @ 8199DF2 - .string "SLATEPORT CITY it is, then!$" + .string "Also nach GRAPHITPORT CITY, richtig?$" BattleTower_Outside_Text_199E0E:: @ 8199E0E - .string "LILYCOVE CITY it is, then!$" + .string "Also nach SEEGRASULB CITY, richtig?$" BattleTower_Outside_Text_199E29:: @ 8199E29 - .string "Please sail with us another time!$" + .string "Bitte beehre uns bald wieder!$" BattleTower_Outside_Text_199E4B:: @ 8199E4B - .string "Please board the ferry and wait for\n" - .string "departure.$" + .string "Bitte geh auf die Fähre. Wir legen in\n" + .string "Kürze ab.$" BattleTower_Outside_Text_199E7A:: @ 8199E7A - .string "Then, where would you like to go?$" + .string "Und? Wo soll die Reise hingehen?$" BattleTower_Outside_Text_199E9C:: @ 8199E9C - .string "I’m not leaving until I’ve beaten 35\n" - .string "TRAINERS in a row!$" + .string "Ich gehe nicht eher hier weg, bis ich 35\n" + .string "TRAINER in Folge besiegt habe!$" BattleTower_Outside_Text_199ED4:: @ 8199ED4 - .string "Gee, there’re a lot of tough-looking\n" - .string "TRAINERS here.\l" - .string "I’m not good enough to enter yet...$" + .string "Hui, sind das aber viele stark\n" + .string "aussehende TRAINER... Ich bin\l" + .string "nicht gut genug, hier anzutreten...$" diff --git a/data/text/maps/DewfordTown.inc b/data/text/maps/DewfordTown.inc index efdbfbff6..65eba572d 100644 --- a/data/text/maps/DewfordTown.inc +++ b/data/text/maps/DewfordTown.inc @@ -1,167 +1,170 @@ DewfordTown_Text_16B23B:: @ 816B23B - .string "DEWFORD TOWN is a tiny island community.\n" - .string "If something gets trendy here,\l" - .string "everyone picks up on it right away.$" + .string "FAUSTAUHAVEN ist eine kleine\n" + .string "Inselgemeinschaft. Wenn hier etwas in\l" + .string "Mode kommt, will jeder es haben.$" DewfordTown_Text_16B2A7:: @ 816B2A7 - .string "DEWFORD TOWN\n" - .string "“A tiny island in the blue sea.”$" + .string "FAUSTAUHAVEN\n" + .string "“Eine kleine Insel im blauen Meer.”$" DewfordTown_Text_16B2D5:: @ 816B2D5 - .string "DEWFORD TOWN POKéMON GYM\n" - .string "LEADER: BRAWLY\l" - .string "“A big wave in fighting!”$" + .string "POKéMON ARENA von FAUSTAUHAVEN\n" + .string "LEITER: KAMILLO\l" + .string "“Eine große Welle des Kampfes!”$" DewfordTown_Text_16B317:: @ 816B317 - .string "DEWFORD HALL\n" - .string "“Everyone’s information exchange!”$" + .string "FAUSTAUHAVEN HALLE\n" + .string "“Die Informationsbörse für jedermann!”$" Route104_Text_16B347:: @ 816B347 - .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD.\p" - .string "I suppose you’re off to deliver that\n" - .string "LETTER to, who was it now, STEVEN!$" + .string "MR. BRACK: Ahoi! Wir haben in\n" + .string "FAUSTAUHAVEN Anker geworfen.\p" + .string "Ich vermute, du wirst diesen BRIEF\n" + .string "jetzt diesem... TROY bringen!?!$" DewfordTown_Text_16B3BC:: @ 816B3BC - .string "MR. BRINEY: Have you delivered your\n" - .string "LETTER?\p" - .string "Or were you meaning to sail back to\n" - .string "PETALBURG?$" + .string "MR. BRACK: Hast du den BRIEF\n" + .string "überbracht?\p" + .string "Oder meinst du, wir müssen zurück\n" + .string "nach BLÜTENBURG CITY segeln?$" DewfordTown_Text_16B417:: @ 816B417 - .string "MR. BRINEY: PETALBURG it is, then!\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "MR. BRACK: BLÜTENBURG CITY...\n" + .string "In Ordnung.\p" + .string "Anker gelichtet!\n" + .string "PECKO, mein Schatz, wir setzen Segel!$" DewfordTown_Text_16B471:: @ 816B471 - .string "MR. BRINEY: Then you go on and deliver\n" - .string "the LETTER. I’ll be waiting.$" + .string "MR. BRACK: Dann bring den BRIEF zu\n" + .string "seinem Empfänger. Ich warte hier.$" Route104_Text_16B4B5:: @ 816B4B5 Route109_Text_16B4B5:: @ 816B4B5 - .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD!\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail again!$" + .string "MR. BRACK: Ahoi! Wir haben in\n" + .string "FAUSTAUHAVEN Anker geworfen!\p" + .string "Komm, wenn wir wieder Segel\n" + .string "setzen sollen.$" DewfordTown_Text_16B522:: @ 816B522 - .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" - .string "Now, my friend, where are we bound?$" + .string "MR. BRACK: Ahoi! Für dich segle ich zu\n" + .string "jeder Zeit überall hin.\p" + .string "Nun, mein Freund, wohin soll es gehen?$" DewfordTown_Text_16B57D:: @ 816B57D - .string "MR. BRINEY: PETALBURG, is it?\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "MR. BRACK: BLÜTENBURG CITY soll es sein?\p" + .string "Anker gelichtet!\n" + .string "PECKO, mein Schatz, wir setzen Segel!$" DewfordTown_Text_16B5D2:: @ 816B5D2 - .string "MR. BRINEY: SLATEPORT, is it?\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "MR. BRACK: GRAPHITPORT CITY soll\n" + .string "es sein?\p" + .string "Anker gelichtet!\n" + .string "PECKO, mein Schatz, wir setzen Segel!$" DewfordTown_Text_16B627:: @ 816B627 - .string "MR. BRINEY: Just tell me whenever you\n" - .string "want to set sail again.$" + .string "MR. BRACK: Sag mir, wenn wir wieder\n" + .string "Segel setzen sollen.$" DewfordTown_Text_16B665:: @ 816B665 - .string "This is a renowned fishing spot.\n" - .string "Are you getting the itch to fish?$" + .string "Dies ist ein berühmter Angelplatz.\n" + .string "Hast du Lust zu angeln?$" DewfordTown_Text_16B6A8:: @ 816B6A8 - .string "I hear you, and I like what\n" - .string "you’re saying!\p" - .string "I’ll give you one of my fishing RODS.$" + .string "Ich habe dir genau zugehört und mir\n" + .string "gefällt, was du gesagt hast!\p" + .string "Ich werde dir eine meiner ANGELN\n" + .string "geben.$" DewfordTown_Text_16B6F9:: @ 816B6F9 - .string "And, as an added bonus, I’ll even throw\n" - .string "in a little fishing advice!\p" - .string "First, you want to face the water,\n" - .string "then use the ROD.\p" - .string "Focus your mind...\n" - .string "If you get a bite, pull on the ROD.\p" - .string "Sometimes you can snag something\n" - .string "immediately, but with bigger catches,\l" - .string "you need to time the pulls on your ROD\l" - .string "to haul them in.$" + .string "Und, als kleine Zugabe, gebe ich dir noch\n" + .string "einige Tipps zum Angeln!\p" + .string "Schau dir zuerst das Wasser an und dann\n" + .string "benutze deine ANGEL.\p" + .string "Konzentriere dich... Wenn etwas anbeißt,\n" + .string "hol die ANGEL ein.\p" + .string "Manchmal kannst du mit einem Mal etwas\n" + .string "Großes fangen, manchmal musst du\l" + .string "immer wieder kurz die ANGEL anheben,\l" + .string "um etwas an Land zu ziehen.$" DewfordTown_Text_16B828:: @ 816B828 - .string "Oh, is that so?\n" - .string "That’s too bad, then.$" + .string "Oh, wirklich?\n" + .string "Das ist aber schade.$" DewfordTown_Text_16B84E:: @ 816B84E - .string "Yo!\n" - .string "How’s your fishing?$" + .string "Yeah!\n" + .string "Wie steht’s mit deinen Angelkünsten?$" DewfordTown_Text_16B866:: @ 816B866 - .string "Is that right! That’s great!\n" - .string "Haul in some big ones!$" + .string "Also, wenn das stimmt... Das wäre\n" + .string "großartig! Petri heil!$" DewfordTown_Text_16B89A:: @ 816B89A - .string "Oh, hey, don’t get down on yourself!\n" - .string "I’ll give you a little fishing advice.\p" - .string "First, you want to face the water,\n" - .string "then use the ROD.\p" - .string "Focus your mind...\n" - .string "If you get a bite, pull the ROD.\p" - .string "Sometimes you can snag something\n" - .string "immediately, but with bigger catches,\l" - .string "you need to time the pulls on your ROD\l" - .string "to haul them in.$" + .string "Hey, lass den Kopf nicht hängen! Ich\n" + .string "gebe dir einige Tipps zum Angeln!\p" + .string "Schau dir zuerst das Wasser an\n" + .string "und dann benutze deine ANGEL.\p" + .string "Konzentriere dich... Wenn etwas\n" + .string "anbeißt, hol die ANGEL ein.\p" + .string "Manchmal kannst du mit einem Mal etwas\n" + .string "Großes fangen, manchmal musst du\l" + .string "immer wieder kurz die ANGEL anheben,\l" + .string "um etwas an Land zu ziehen.$" DewfordTown_Text_16B9CE:: @ 816B9CE - .string "I like what’s hip, happening, and trendy.\n" - .string "I’m always checking it out.\p" - .string "Listen, have you heard about this new\n" - .string "“{STR_VAR_1}”?\p" - .string "That’s right!\n" - .string "Of course you know!\p" - .string "I mean, sheesh,\n" + .string "Ich mag, was hip, aufregend und modern\n" + .string "ist. So etwas probiere ich immer aus.\p" + .string "Hast du schon einmal was von\n" + .string "“{STR_VAR_1}” gehört?\p" + .string "Wusste ich es doch!\n" + .string "Natürlich hast du schon davon gehört!\p" + .string "Oh, meine Güte,\n" .string "“{STR_VAR_1}”...\l" - .string "It’s the hottest thing in cool!\p" - .string "Wherever you’re from,\n" + .string "Das ist das Coolste überhaupt!\p" + .string "Wo immer du auch herkommst,\n" .string "“{STR_VAR_1}”\l" - .string "is the biggest happening thing, right?$" + .string "ist das Aufregendste überhaupt!$" DewfordTown_Text_16BADC:: @ 816BADC - .string "Hunh?\n" - .string "It’s not the hip and happening thing?\p" - .string "Well, hey, you have to tell me,\n" - .string "what’s new and what’s “in”?$" + .string "Wie bitte?\n" + .string "Es ist nicht hip und aufregend?\p" + .string "Nun, hey, dann verrate mir aber, was\n" + .string "wirklich cool und “in” ist?$" DewfordTown_Text_16BB44:: @ 816BB44 - .string "Hunh?\n" + .string "Was?\n" .string "“{STR_VAR_2}”?\p" .string "... ...\p" - .string "...Uh... Yeah! That’s right!\n" - .string "Yeah, I knew that! Knew it all along!\p" - .string "Of course I know about that!\n" - .string "“{STR_VAR_2},” right?\p" - .string "Yeah, that’s it, it’s there!\n" - .string "Isn’t “{STR_VAR_2}”\l" - .string "the coolest, or what?\p" - .string "It’s the hippest thing in hip.\n" - .string "You think I’d not know about it?\p" + .string "...Hm... Äh... Yeah! Das stimmt!\n" + .string "Yeah, ich wusste das! Schon lange!\p" + .string "Natürlich weiß ich das!\n" + .string "“{STR_VAR_2}”, richtig?\p" + .string "Yeah, das ist es, das ist es!\n" + .string "Ist “{STR_VAR_2}”\l" + .string "nicht das Coolste?\p" + .string "Das ist die hippeste Sache überhaupt.\n" + .string "Und du dachtest, ich wüsste das nicht?\p" .string "“{STR_VAR_1}”...\n" - .string "It’s, like, so five minutes ago.\p" - .string "Now, “{STR_VAR_2}” is\n" - .string "what’s vital and in tune with the times!$" + .string "Das ist doch schon uralt und unmodern.\p" + .string "“{STR_VAR_2}” ist das,\n" + .string "was vital und zeitgemäß ist!$" DewfordTown_Text_16BCA2:: @ 816BCA2 .string "Hmm...\n" - .string "“{STR_VAR_2},” huh?\p" - .string "But personally, I think\n" + .string "“{STR_VAR_2}”, oder?\p" + .string "Aber ich persönlich finde,\n" .string "“{STR_VAR_1}”\l" - .string "is what’s real in cool.$" + .string "ist das Coolste überhaupt!$" DewfordTown_Text_16BCE9:: @ 816BCE9 - .string "Well, if you hear of any happening new\n" - .string "trends, come share them with me, okay?$" + .string "Wenn du irgendetwas über neue, auf-\n" + .string "regende Sachen hörst, erzähl mir davon!$" DewfordTown_Text_16BD37:: @ 816BD37 - .string "Yeah, absolutely right!\p" - .string "“{STR_VAR_1}” is the\n" - .string "definition of “in” right now.$" + .string "Yeah, absolut richtig!\p" + .string "“{STR_VAR_1}” ist die\n" + .string "Definition von “in”.$" DewfordTown_Text_16BD79: @ 816BD79 - .string "“{STR_VAR_2}” is at\n" - .string "the pinnacle of cool right now.$" + .string "“{STR_VAR_2}” ist\n" + .string "die Spitze der Coolness im Moment.$" diff --git a/data/text/maps/DewfordTown_Gym.inc b/data/text/maps/DewfordTown_Gym.inc index 24d90ec6c..3cc2fb9f4 100644 --- a/data/text/maps/DewfordTown_Gym.inc +++ b/data/text/maps/DewfordTown_Gym.inc @@ -1,107 +1,110 @@ DewfordTown_Gym_Text_174D98:: @ 8174D98 - .string "Hey, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "DEWFORD’s GYM LEADER BRAWLY commands\n" - .string "FIGHTING-type POKéMON.\p" - .string "Going against him with NORMAL-type\n" - .string "POKéMON is asking for trouble.\p" - .string "FIGHTING POKéMON will lay a serious\n" - .string "smack down on NORMAL POKéMON,\l" - .string "so be careful!\p" - .string "What’s worse, the GYM is as dark as\n" - .string "the ocean floor.\p" - .string "But it will get brighter after defeating\n" - .string "the TRAINERS in your way.\p" - .string "Hey, okay, go for it!$" + .string "Na, wie sieht es aus, auf dem Weg zum\n" + .string "CHAMP, {PLAYER}?\p" + .string "FAUSTAUHAVENS ARENALEITER KAMILLO\n" + .string "besitzt KAMPF-POKéMON.\p" + .string "Wenn du dort NORMAL-POKéMON antreten\n" + .string "lässt, sind Probleme vorprogrammiert!\p" + .string "KAMPF-POKéMON schlagen die NORMALEN\n" + .string "POKéMON einfach nieder. Pass gut auf!\p" + .string "Und das Schlimme ist: Die ARENA ist\n" + .string "dunkel wie die Tiefsee!\p" + .string "Aber mit jedem TRAINER, den du auf dem\n" + .string "Weg zum ARENALEITER besiegst, wird sie\l" + .string "heller!\p" + .string "Also, dann leg mal los!$" DewfordTown_Gym_Text_174F1E:: @ 8174F1E - .string "Whoah! It’s turned too bright in here!\p" - .string "Your future is bright, too!$" + .string "Huuh! Das ist mir hier aber schon zu hell!\p" + .string "Deine Zukunft wird strahlend hell sein!$" DewfordTown_Gym_Text_174F61:: @ 8174F61 - .string "Might is right!\n" - .string "Come on!$" + .string "Die Macht bestimmt alles!\n" + .string "Komm schon!$" DewfordTown_Gym_Text_174F7A:: @ 8174F7A - .string "Not enough power...$" + .string "Nicht genug Macht...$" DewfordTown_Gym_Text_174F8E:: @ 8174F8E - .string "Your skill overcame my strength!\n" - .string "Your technique is commendable!$" + .string "Gegen dein Talent ist meine Macht\n" + .string "machtlos. Deine Technik ist super!$" DewfordTown_Gym_Text_174FCE:: @ 8174FCE - .string "There’s no need for BRAWLY to be\n" - .string "involved!\p" - .string "I’ll crush you!$" + .string "Man muss doch KAMILLO nicht mit so\n" + .string "etwas Nichtigem belästigen!\p" + .string "Ich mache dich fertig!$" DewfordTown_Gym_Text_175009:: @ 8175009 - .string "But... How?\n" - .string "How could I lose so easily?$" + .string "Aber... Wie...?\n" + .string "Wie konnte ich nur so schnell verlieren?$" DewfordTown_Gym_Text_175031:: @ 8175031 - .string "I’m not going to waste this loss.\n" - .string "I’ll use it to motivate me to train!\p" - .string "One day I’ll become a GYM LEADER...\p" - .string "No, I’ll become the POKéMON LEAGUE\n" - .string "CHAMPION!$" + .string "Ich werde diese Niederlage nicht ab-\n" + .string "haken. Sie wird mich beim Training\l" + .string "motivieren!\p" + .string "Eines Tages werde ich auch ein\n" + .string "ARENALEITER sein!\p" + .string "Nein! Ich werde der CHAMP der\n" + .string "POKéMON LIGA!$" DewfordTown_Gym_Text_1750C9:: @ 81750C9 - .string "Don’t you dare brush me off!\n" - .string "It’s not my fault if you cry!$" + .string "Du forderst mich heraus? Dann wundere\n" + .string "dich nicht, wenn du weinst wie ein Baby!$" DewfordTown_Gym_Text_175104:: @ 8175104 - .string "Waaaaaaah!\n" - .string "I lost!$" + .string "Waaaaahaaaaaa!\n" + .string "Schluchz! Schnief! Ich habe verloooren!$" DewfordTown_Gym_Text_175117:: @ 8175117 - .string "I battle in the dark to make my heart\n" - .string "stronger.\p" - .string "But because it’s so dark, I can never\n" - .string "see BRAWLY’s face...$" + .string "Ich kämpfe im Dunkeln, das macht mich\n" + .string "mutiger und trainiert mein Herz.\p" + .string "Weil es hier so dunkel ist, habe ich noch\n" + .string "nie das Gesicht von KAMILLO gesehen.$" DewfordTown_Gym_Text_175182:: @ 8175182 - .string "I’m BRAWLY!\n" - .string "DEWFORD’s GYM LEADER!\p" - .string "I’ve been churned in the rough waves\n" - .string "of these parts, and I’ve grown tough\l" - .string "in the pitch-black cave!\p" - .string "So you wanted to challenge me?\n" - .string "Let me see what you’re made of!$" + .string "Ich bin KAMILLO!\n" + .string "Der ARENALEITER von FAUSTAUHAVEN!\p" + .string "Ich habe die wilden Strudel dieser\n" + .string "Gegend gemeistert und bin in dieser\l" + .string "pechschwarzen Höhle stark geworden.\p" + .string "Du willst mich wirklich herausfordern?\n" + .string "Dann zeig mir, woraus du gemacht bist!$" DewfordTown_Gym_Text_175246:: @ 8175246 - .string "Whoah, wow! You made a much bigger\n" - .string "splash than I expected!\p" - .string "You swamped me!\p" - .string "Okay, you’ve got me.\n" - .string "Take this GYM BADGE!$" + .string "Huihuihui! Du hast eine größere Welle\n" + .string "produziert, als ich dir zugetraut hätte.\p" + .string "Du hast mich absaufen lassen!\p" + .string "Okay, du hast mich erwischt!\n" + .string "Nimm den ORDEN dieser ARENA!$" DewfordTown_Gym_Text_1752BB:: @ 81752BB - .string "{PLAYER} received the KNUCKLE BADGE\n" - .string "from BRAWLY.$" + .string "{PLAYER} erhält den KNÖCHELORDEN von\n" + .string "KAMILLO.$" DewfordTown_Gym_Text_1752E6:: @ 81752E6 - .string "The KNUCKLE BADGE makes all POKéMON\n" - .string "up to Level 30, even those you get in\l" - .string "trades, obey without question.\p" - .string "And, you’ll be able to use the HM move\n" - .string "FLASH outside of battle.\p" - .string "If you’d like, use this TECHNICAL\n" - .string "MACHINE, too.$" + .string "Dank des KNÖCHELORDENS werden dir alle\n" + .string "POKéMON bis Level 30 gehorchen, auch\l" + .string "die, die du durch Tausch erhalten hast.\p" + .string "Und du kannst die VM BLITZ auch\n" + .string "außerhalb eines Kampfes anwenden.\p" + .string "Und wenn du magst, kannst du auch diese\n" + .string "TECHNISCHE MASCHINE anwenden.$" DewfordTown_Gym_Text_1753BF:: @ 81753BF - .string "That TM08 contains BULK UP.\p" - .string "It’s a move that raises both ATTACK\n" - .string "and DEFENSE stats.$" + .string "Die TM08 enthält PROTZER.\p" + .string "Diese Attacke hebt den Status des\n" + .string "ANGRIFFS und der VERTEIDIGUNG.$" DewfordTown_Gym_Text_175412:: @ 8175412 - .string "I can see your talent becoming a giant\n" - .string "wave to cause a storm of astonishment\l" - .string "among TRAINERS one day!$" + .string "Ich sehe in dir ein Talent, das eines\n" + .string "Tages zu einer riesigen Welle wird und\l" + .string "einen Sturm des Erstaunens bei anderen\l" + .string "TRAINERN entfachen wird!$" DewfordTown_Gym_Text_175477:: @ 8175477 - .string "DEWFORD TOWN POKéMON GYM$" + .string "POKéMON ARENA von FAUSTAUHAVEN$" DewfordTown_Gym_Text_175490:: @ 8175490 - .string "DEWFORD TOWN POKéMON GYM\p" - .string "BRAWLY’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von FAUSTAUHAVEN\p" + .string "KAMILLOS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/DewfordTown_Hall.inc b/data/text/maps/DewfordTown_Hall.inc index 6b9f4337e..4921793d7 100644 --- a/data/text/maps/DewfordTown_Hall.inc +++ b/data/text/maps/DewfordTown_Hall.inc @@ -1,183 +1,189 @@ DewfordTown_Hall_Text_1754C9:: @ 81754C9 - .string "What’s in vogue? Why, it has to be\n" + .string "Was in ist? Nun, mit Sicherheit\n" .string "“{STR_VAR_1}”!\p" - .string "I can’t imagine what life would be like\n" - .string "without “{STR_VAR_1}”!$" + .string "Ich kann mir ein Leben ohne\n" + .string "“{STR_VAR_1}” nicht\l" + .string "vorstellen!$" DewfordTown_Hall_Text_175528:: @ 8175528 - .string "What’s in vogue? Why, it has to be\n" + .string "Was in ist? Nun, mit Sicherheit\n" .string "“{STR_VAR_1}”!\p" - .string "But I’m getting kind of bored with it.\p" - .string "I should look for the next big thing.$" + .string "Aber so langsam langweilt es mich.\p" + .string "Ich sollte mich nach neuen Sachen\n" + .string "umsehen.$" DewfordTown_Hall_Text_17559E:: @ 817559E - .string "I’m teaching my POKéMON about\n" - .string "“{STR_VAR_1},”\l" - .string "but it’s not going well.\p" - .string "It’s a bit too much, I think.$" + .string "Ich bringe meinen POKéMON etwas über\n" + .string "“{STR_VAR_1}” bei,\l" + .string "aber es klappt nicht so recht.\p" + .string "Scheinbar sind sie damit überfordert.$" DewfordTown_Hall_Text_1755F9:: @ 81755F9 - .string "I’m studying up on the hip and trendy\n" - .string "“{STR_VAR_1}” now.\p" - .string "Is it true that there’s a deep link\n" - .string "between “{STR_VAR_1}”\l" - .string "and “{STR_VAR_2}”?$" + .string "Ich vertiefe mich gerade in ein hippes\n" + .string "“{STR_VAR_1}”.\p" + .string "Gibt es eine enge Verbindung\n" + .string "zwischen “{STR_VAR_1}”\l" + .string "und “{STR_VAR_2}”?$" DewfordTown_Hall_Text_175664:: @ 8175664 .string "Oh!\n" - .string "So, my hunch was right!\p" - .string "I’m one step closer to being hip and\n" - .string "happening, yowza!$" + .string "Da lag ich ja absolut richtig!\p" + .string "Ich bin einen Schritt weiter in meinen\n" + .string "Bemühungen, hip und aufregend zu sein!$" DewfordTown_Hall_Text_1756B7:: @ 81756B7 - .string "What?!\n" - .string "Is that so?!\p" - .string "It’s not easy for an older fellow like\n" - .string "me to keep up with trends!$" + .string "Was?!?\n" + .string "Wirklich?!?\p" + .string "Für einen alten Menschen ist es gar\n" + .string "nicht so leicht, mit der Mode zu gehen!$" DewfordTown_Hall_Text_17570D:: @ 817570D - .string "This whole business about\n" + .string "Diese ganze Sache mit\n" .string "“{STR_VAR_1}”...\l" - .string "Isn’t there a TV show on it?$" + .string "Gibt es da nicht eine Sendung drüber?$" DewfordTown_Hall_Text_17574C:: @ 817574C - .string "Across the sea...\p" - .string "Is “{STR_VAR_1}”\n" - .string "even more popular?$" + .string "Jenseits des Meeres...\p" + .string "Ist dort “{STR_VAR_1}”\n" + .string "noch beliebter?$" DewfordTown_Hall_Text_175779:: @ 8175779 - .string "I collect official\n" - .string "“{STR_VAR_1}”\l" - .string "licensed merchandise.\p" - .string "I have official\n" - .string "“{STR_VAR_1}” dolls...\p" - .string "Official “{STR_VAR_1}”\n" - .string "brand clothing...\p" - .string "And officially licensed\n" - .string "“{STR_VAR_1}”\l" - .string "picture books.\p" - .string "Heheh, I own!\n" - .string "I’m not sharing anything with you!$" + .string "Ich sammle lizenzierte\n" + .string "“{STR_VAR_1}”-\l" + .string "Artikel.\p" + .string "Ich habe die offiziellen\n" + .string "“{STR_VAR_1}”-Puppen.\p" + .string "Offizielle\n" + .string "“{STR_VAR_1}”-\l" + .string "Kleidung...\p" + .string "Und die offiziellen\n" + .string "“{STR_VAR_1}”-\l" + .string "Bilderbücher.\p" + .string "Hähähä, das besitze ich alles!\n" + .string "Und ich gebe dir nichts ab! Ätsch!$" DewfordTown_Hall_Text_175842:: @ 8175842 - .string "IDENTIFYING GOOD\n" - .string "“{STR_VAR_1}” &\l" - .string "BAD “{STR_VAR_1}”...\p" - .string "THE LINK BETWEEN\n" - .string "“{STR_VAR_1}” AND\l" - .string "POKéMON...\p" - .string "USEFUL\n" + .string "GUTE “{STR_VAR_1}” &\n" + .string "SCHLECHTE\l" + .string "“{STR_VAR_1}”...\p" + .string "DAS BAND ZWISCHEN\n" + .string "“{STR_VAR_1}”\l" + .string "UND POKéMON...\p" + .string "HILFREICHE\n" .string "“{STR_VAR_1}”...\p" - .string "It’s neatly jammed with books about\n" - .string "“{STR_VAR_1}.”$" + .string "Es ist total vollgestopft mit Büchern\n" + .string "über “{STR_VAR_1}”.$" DewfordTown_Hall_Text_1758C4:: @ 81758C4 - .string "“{STR_VAR_1}’S\n" - .string "SCREAM” is the title.$" + .string "“DER RUF VON\n" + .string "{STR_VAR_1}”\l" + .string "ist der Titel.$" DewfordTown_Hall_Text_1758E0:: @ 81758E0 - .string "“{STR_VAR_1}’S\n" - .string "SMILE” is the title.$" + .string "“DAS LÄCHELN VON\n" + .string "{STR_VAR_1}”\l" + .string "ist der Titel.$" DewfordTown_Hall_Text_1758FB:: @ 81758FB - .string "It’s titled “THE LAST\n" + .string "Es heißt “DAS LETZTE\n" .string "{STR_VAR_1}”.$" DewfordTown_Hall_Text_175916:: @ 8175916 - .string "It’s titled “THE BIRTH OF\n" + .string "Es heißt “DIE GEBURT EINES\n" .string "{STR_VAR_1}”.$" DewfordTown_Hall_Text_175935:: @ 8175935 - .string "I saw “{STR_VAR_1}”!\n" - .string "Cool, huh?\p" - .string "It’s, like, the coolest thing going!\p" - .string "It was awesome!\n" - .string "It was the real thing, oh yeah!$" + .string "Ich habe “{STR_VAR_1}”\n" + .string "gesehen! Cool, was?\p" + .string "Das Coolste überhaupt, würde ich sagen!\p" + .string "Es war unglaublich!\n" + .string "Das war das absolut Wahre, oh yeah!$" DewfordTown_Hall_Text_1759A1:: @ 81759A1 - .string "Oh, no, no, no.\p" - .string "That alleged\n" - .string "“{STR_VAR_1}”\l" - .string "you claim to have seen - it’s not.\p" - .string "The authentic article is much...\n" - .string "How should I say it?\l" - .string "Sharper, yet more mellifluous!\p" - .string "Ah, no matter. It’s astonishing!$" + .string "Oh, nein, nein, nein.\p" + .string "Das vermeintliche\n" + .string "“{STR_VAR_1}”,\l" + .string "das du gesehen hast - war nicht echt.\p" + .string "Das echte ist...\n" + .string "Wie soll ich sagen?\l" + .string "Ist spitzer und wohlgeformter!\p" + .string "Aber egal. Es ist erstaunlich!$" DewfordTown_Hall_Text_175A5C:: @ 8175A5C - .string "Hey, listen, I composed a theme song\n" - .string "for “{STR_VAR_1}.”\p" + .string "Hey, hör zu! Ich habe ein Leitmotiv\n" + .string "für “{STR_VAR_1}”\l" + .string "komponiert.\p" .string "“{STR_VAR_1}”\n" - .string "is really popular right now.\p" - .string "Okay, listen!\n" + .string "ist gerade sehr populär.\p" + .string "Okay, hör zu!\n" .string "... ...\p" .string "Oh!\n" .string "{STR_VAR_1}!\p" - .string "Wonderful\n" + .string "Wundervolles\n" .string "{STR_VAR_1}!$" DewfordTown_Hall_Text_175AD9:: @ 8175AD9 .string "... ...\p" - .string "I dare say, chap, it would pay for you\n" - .string "to work on your singing before you\l" - .string "trifle yourself with\l" - .string "“{STR_VAR_1}.”$" + .string "Ich würde sagen, du solltest erst einmal\n" + .string "Gesangsunterricht nehmen, bevor du es\l" + .string "mit “{STR_VAR_1}”\l" + .string "aufnimmst.$" DewfordTown_Hall_Text_175B46:: @ 8175B46 - .string "Anyway, as I was saying earlier, we\n" - .string "should get together and organize a\l" - .string "“{STR_VAR_1}” party\l" - .string "on the island.$" + .string "Wie ich vorhin schon sagte, sollten wir\n" + .string "uns zusammentun und eine\l" + .string "“{STR_VAR_1}”-Party\l" + .string "auf der Insel veranstalten.$" DewfordTown_Hall_Text_175BA7:: @ 8175BA7 - .string "Oh, a smashing good idea!\p" - .string "It will settle once and for all\n" - .string "who is the best at\l" - .string "“{STR_VAR_1}.”\l" - .string "Brilliant, indeed!\p" - .string "Starting today, our lives will revolve\n" - .string "around “{STR_VAR_1}”!$" + .string "Oh, was für eine gute Idee!\p" + .string "Nun stellen wir ein für alle Mal fest, wer\n" + .string "der Beste in\l" + .string "“{STR_VAR_1}” ist.\l" + .string "Brillant, wirklich!\p" + .string "Von heute an dreht sich unser Leben\n" + .string "um “{STR_VAR_1}”!$" DewfordTown_Hall_Text_175C41:: @ 8175C41 - .string "I was thinking, though...\p" - .string "Wouldn’t you agree that\n" - .string "“{STR_VAR_1}” has\l" - .string "grown from being something trendy to\l" - .string "being a part of our daily lives?$" + .string "Ich habe nachgedacht...\p" + .string "Stimmst du mir zu, dass\n" + .string "“{STR_VAR_1}” von\l" + .string "etwas Modernem zu einem Teil unseres\l" + .string "Lebens geworden ist?$" DewfordTown_Hall_Text_175CC2:: @ 8175CC2 - .string "Beg pardon?\n" - .string "That much, what?\p" - .string "However, it’s true that\n" - .string "“{STR_VAR_1}”\l" - .string "weighs heavily on your mind, whether\l" - .string "you’re awake or asleep.\p" - .string "Absolutely, you’re the\n" - .string "“{STR_VAR_1}”\l" - .string "PROFESSOR, old sport!$" + .string "Bitte?\n" + .string "So dominant?\p" + .string "Nun ja, natürlich bestimmt\n" + .string "“{STR_VAR_1}” auch\l" + .string "unsere Gedanken, im Wachen und\l" + .string "im Schlafen.\p" + .string "Du bist mit Sicherheit der\n" + .string "“{STR_VAR_1}”-\l" + .string "PROFESSOR!$" DewfordTown_Hall_Text_175D6B:: @ 8175D6B - .string "If you and me team up as a combo,\n" - .string "we’ll be invincible when it comes to all\l" - .string "things “{STR_VAR_1}”!$" + .string "Wenn du und ich ein Team bilden,\n" + .string "sind wir unverwundbar gegen\l" + .string "“{STR_VAR_1}”!$" DewfordTown_Hall_Text_175DC3:: @ 8175DC3 - .string "Spot on, my friend!\p" - .string "We shall be the\n" - .string "“{STR_VAR_1}” DUO!\p" - .string "Isn’t that a ripe image?\n" - .string "Hahahah!$" + .string "Licht an, mein Freund!\p" + .string "Wir sind das\n" + .string "“{STR_VAR_1}”-DUO!\p" + .string "Ist das nicht eine irre Vorstellung?\n" + .string "Hahahaha!$" DewfordTown_Hall_Text_175E13:: @ 8175E13 - .string "For me, SLUDGE BOMB is at the peak\n" - .string "of popularity. It’s the one.\p" - .string "Hunh? You’re telling me that you don’t\n" - .string "know about SLUDGE BOMB?\p" - .string "That’s outright pitiful.\n" - .string "I’ll give you one.$" + .string "Für mich ist MATSCHBOMBE das absolut\n" + .string "Größte!\p" + .string "Wie? Du willst mir doch nicht weismachen,\n" + .string "dass du MATSCHBOMBE nicht kennst?\p" + .string "Das ist aber jammerschade.\n" + .string "Ich werde dir eine geben.$" DewfordTown_Hall_Text_175EBE:: @ 8175EBE - .string "I love SLUDGE BOMB.\p" - .string "But POKéMON with the\n" - .string "“{STR_VAR_1}”\l" - .string "move are in, too.$" + .string "Ich liebe MATSCHBOMBE.\p" + .string "Aber POKéMON, die die Attacke\n" + .string "“{STR_VAR_1}” kennen,\l" + .string "sind auch absolut angesagt.$" diff --git a/data/text/maps/DewfordTown_House1.inc b/data/text/maps/DewfordTown_House1.inc index d004acf7f..fa93711e4 100644 --- a/data/text/maps/DewfordTown_House1.inc +++ b/data/text/maps/DewfordTown_House1.inc @@ -1,14 +1,15 @@ DewfordTown_House1_Text_174BA5:: @ 8174BA5 - .string "There’s a lot to be said for living on\n" - .string "a small island like this in harmony with\l" - .string "POKéMON and the family.$" + .string "Über das harmonische Leben mit den\n" + .string "POKéMON und der Familie auf diesem\l" + .string "kleinen Eiland ließe sich viel erzählen.$" DewfordTown_House1_Text_174C0D:: @ 8174C0D - .string "I came from the large port of SLATEPORT\n" - .string "CITY when I married my husband here.\p" - .string "Life goes by slowly on this little\n" - .string "island. But being surrounded by the\l" - .string "beautiful sea - that’s happiness, too.$" + .string "Bevor ich meinen Mann geheiratet habe,\n" + .string "lebte ich in der großen Hafenstadt\l" + .string "GRAPHITPORT CITY.\p" + .string "Hier auf der Insel verläuft das Leben\n" + .string "geruhsamer. Vom wunderbaren Meer um-\l" + .string "geben - das ist die pure Glückseligkeit!$" DewfordTown_House1_Text_174CC8:: @ 8174CC8 - .string "ZIGZAGOON: Guguuh!$" + .string "ZIGZACHS: Guguuh!$" diff --git a/data/text/maps/DewfordTown_House2.inc b/data/text/maps/DewfordTown_House2.inc index b37456112..8f3c5218a 100644 --- a/data/text/maps/DewfordTown_House2.inc +++ b/data/text/maps/DewfordTown_House2.inc @@ -1,28 +1,29 @@ DewfordTown_House2_Text_175EFE:: @ 8175EFE - .string "Gorge your eyes on this!\p" - .string "It’s a SILK SCARF. It’s right at the\n" - .string "cutting edge of fashion, yeah!\p" - .string "Oh, I can see your eyes twinkling!\n" - .string "You appreciate my dazzling style!\p" - .string "Oh, you’re a delight!\n" - .string "Here you go. I want you to have it!$" + .string "Wirf dein Auge mal hierauf!\p" + .string "Das ist ein SEIDENSCHAL. Das ist\n" + .string "der letzte Schrei in der Mode. Yeah!\p" + .string "Oh, deine Augen blitzen.\n" + .string "Du magst meinen Stil, nicht wahr?\p" + .string "Hihi, du machst mir eine Freude!\n" + .string "Hier, das möchte ich dir schenken!$" DewfordTown_House2_Text_175FDA:: @ 8175FDA - .string "Oh, you don’t have room?\p" - .string "Now, listen tight, this SCARF is a must-\n" - .string "have! Why, I would sell all my items\l" - .string "in order to get it!$" + .string "Och, du hast ja gar keinen Platz mehr.\p" + .string "Nun, hör gut zu... Diesen SCHAL musst\n" + .string "du einfach haben! Ich würde alle meine\l" + .string "Items verkaufen, um ihn zu bekommen!$" DewfordTown_House2_Text_176055:: @ 8176055 - .string "The SILK SCARF raises the power of\n" - .string "NORMAL-type moves.\p" - .string "It’s a marvelous SCARF that will go\n" - .string "with almost all POKéMON!$" + .string "Dieser SEIDENSCHAL steigert die Stärke\n" + .string "der NORMALEN Attacken.\p" + .string "Dieser wunderbare SCHAL passt einfach\n" + .string "zu fast allen POKéMON!$" DewfordTown_House2_Text_1760C8:: @ 81760C8 - .string "Wow, you bothered to cross the sea\n" - .string "to visit DEWFORD?\p" - .string "Did you maybe come here because you\n" - .string "heard about BRAWLY?\p" - .string "He’s so cool...\n" - .string "Everyone idolizes him.$" + .string "Wow, du hast die beschwerliche Reise\n" + .string "über das Meer auf dich genommen, um\l" + .string "nach FAUSTAUHAVEN zu gelangen?\p" + .string "Bist du hier, weil du von KAMILLO\n" + .string "gehört hast?\p" + .string "Er ist sooo cool...\n" + .string "Er ist ein Idol für jeden!$" diff --git a/data/text/maps/DewfordTown_PokemonCenter_1F.inc b/data/text/maps/DewfordTown_PokemonCenter_1F.inc index 9c4a6f41c..5d7b555f0 100644 --- a/data/text/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/text/maps/DewfordTown_PokemonCenter_1F.inc @@ -1,10 +1,11 @@ DewfordTown_PokemonCenter_1F_Text_174CDB:: @ 8174CDB - .string "There’s a stone cavern at the edge\n" - .string "of town.\p" - .string "I’ve heard you can find rare stones\n" - .string "there.$" + .string "Am Rande des Ortes befindet sich eine\n" + .string "steinerne Höhle.\p" + .string "Dort soll man seltene Steine finden\n" + .string "können.$" DewfordTown_PokemonCenter_1F_Text_174D32:: @ 8174D32 - .string "Even if a POKéMON faints and can’t\n" - .string "battle, it can still use a move learned\l" - .string "from a Hidden Machine, HM.$" + .string "Auch wenn in deinem Team ein kampf-\n" + .string "unfähiges POKéMON ist, kann es außer-\p" + .string "halb des Kampfes eine Versteckte\n" + .string "Maschine, eine VM, anwenden.$" diff --git a/data/text/maps/EverGrandeCity.inc b/data/text/maps/EverGrandeCity.inc index f468bf3b7..6d1a09d16 100644 --- a/data/text/maps/EverGrandeCity.inc +++ b/data/text/maps/EverGrandeCity.inc @@ -1,11 +1,11 @@ EverGrandeCity_Text_16A74D:: @ 816A74D - .string "ENTERING VICTORY ROAD$" + .string "SIE BETRETEN DIE SIEGESSTRASSE$" EverGrandeCity_Text_16A763:: @ 816A763 - .string "ENTERING POKéMON LEAGUE\n" - .string "CENTER GATE$" + .string "SIE ERREICHEN DEN EINGANG ZUR\n" + .string "POKéMON LIGA$" EverGrandeCity_Text_16A787:: @ 816A787 - .string "EVER GRANDE CITY\p" - .string "“The paradise of flowers, the sea,\n" - .string "and POKéMON.”$" + .string "PRACHTPOLIS CITY\p" + .string "“Das Paradies der Blumen, des Meeres\n" + .string "und der POKéMON.”$" diff --git a/data/text/maps/EverGrandeCity_ChampionsRoom.inc b/data/text/maps/EverGrandeCity_ChampionsRoom.inc index c7c63e208..d8787a895 100644 --- a/data/text/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/text/maps/EverGrandeCity_ChampionsRoom.inc @@ -1,100 +1,99 @@ EverGrandeCity_ChampionsRoom_Text_190F9C:: @ 8190F9C - .string "STEVEN: Welcome, {PLAYER}{KUN}.\p" - .string "I was looking forward to seeing you\n" - .string "here one day.\p" - .string "You... What did you see on your\n" - .string "journey with POKéMON?\p" - .string "What did you feel, meeting so many\n" - .string "other TRAINERS like you?\p" - .string "What has awoken in you?\n" - .string "I want you to hit me with it all!\p" - .string "Now, bring it!$" + .string "TROY: Willkommen, {PLAYER}{KUN}!\p" + .string "Ich habe schon darauf gewartet, dich\n" + .string "eines Tages hier zu sehen.\p" + .string "Und? Was hast du alles auf deiner Reise\n" + .string "mit den POKéMON erlebt?\p" + .string "Was hast du gefühlt, als du auf so viele\n" + .string "andere TRAINER getroffen bist?\p" + .string "Was wurde in dir erweckt? Ich will, dass\n" + .string "du all das im Kampf gegen mich einsetzt!\p" + .string "Nun, zeig es mir!$" EverGrandeCity_ChampionsRoom_Text_1910A0:: @ 81910A0 - .string "I, the CHAMPION, fall in defeat...\p" - .string "Kudos to you, {PLAYER}{KUN}!\p" - .string "You are a truly noble POKéMON\n" + .string "Ich, der CHAMP, habe verloren...\p" + .string "Dir gebührt alle Ehre, {PLAYER}{KUN}!\p" + .string "Du bist wahrhaft ein edler POKéMON-\n" .string "TRAINER!$" EverGrandeCity_ChampionsRoom_Text_1910FE:: @ 81910FE - .string "STEVEN: Congratulations!\p" - .string "The feelings you have for your\n" - .string "POKéMON...\p" - .string "And the POKéMON that responded to\n" - .string "those feelings with all their might...\p" - .string "They came together as one, and created\n" - .string "an even greater power.\p" - .string "And thus, you were able to grasp\n" - .string "victory today!\p" - .string "You are rightfully the HOENN region’s\n" - .string "new...$" + .string "TROY: Herzlichen Glückwunsch!\p" + .string "Die Gefühle, die du deinen POKéMON\n" + .string "entgegenbringst...\p" + .string "Und die POKéMON, die auf diese Gefühle\n" + .string "mit all ihrer Kraft antworten...\p" + .string "Sie werden eins und bringen eine weit\n" + .string "größere Stärke hervor.\p" + .string "Und so gehört der Sieg heute dir!\p" + .string "Du bist mit Recht HOENNS neuer...$" EverGrandeCity_ChampionsRoom_Text_191225:: @ 8191225 - .string "MAY: {PLAYER}{KUN}!\p" - .string "Here’s some advice before you challenge\n" - .string "the CHAMPION...$" + .string "MAIKE: {PLAYER}{KUN}!\p" + .string "Ich muss dir unbedingt einen Rat geben,\n" + .string "bevor du gegen den CHAMP antrittst!$" EverGrandeCity_ChampionsRoom_Text_191268:: @ 8191268 - .string "MAY: Huh? What, what, what?\p" + .string "MAIKE: Wie? Waswaswas?\p" .string "{PLAYER}{KUN}...\n" - .string "Could it be that...\l" - .string "It’s already over?$" + .string "Das kann nicht sein...\l" + .string "Es ist schon vorbei?$" EverGrandeCity_ChampionsRoom_Text_1912B3:: @ 81912B3 - .string "BRENDAN: {PLAYER}!\p" - .string "How would you like some advice before\n" - .string "you challenge the CHAMPION?...$" + .string "BRIX: {PLAYER}!\p" + .string "Möchtest du nicht ein paar Tipps, bevor\n" + .string "du den CHAMP herausforderst?$" EverGrandeCity_ChampionsRoom_Text_191305:: @ 8191305 - .string "BRENDAN: {PLAYER}...\p" - .string "Are you trying to tell me...\n" - .string "You’ve beaten the CHAMPION?$" + .string "BRIX: {PLAYER}!\p" + .string "Willst du mir etwa sagen...\n" + .string "Du hast den CHAMP besiegt?!?!?!$" EverGrandeCity_ChampionsRoom_Text_19134D:: @ 819134D - .string "PROF. BIRCH: See?\n" - .string "What did I tell you, {RIVAL}?\p" - .string "Didn’t I tell you that you don’t need\n" - .string "to worry about {PLAYER}{KUN}?\p" + .string "PROF. BIRK: Siehst du?\n" + .string "Was habe ich dir gesagt, {RIVAL}?\p" + .string "Ich wusste, du brauchst dir keine\n" + .string "Sorgen um {PLAYER}{KUN} zu machen!\p" .string "... ... ... ... ... ... ... ...\n" - .string "{PLAYER}{KUN}, you’ve finally done it.\p" - .string "When I heard that you defeated your\n" - .string "own father at the PETALBURG GYM,\l" - .string "I thought perhaps you had a chance...\p" - .string "But to think you’ve actually become\n" - .string "the CHAMPION!\p" - .string "Ah, yes!\p" - .string "What became of your POKéDEX?\n" - .string "Here, let me see.$" + .string "{PLAYER}{KUN}, du hast es geschafft.\p" + .string "Als ich hörte, dass du deinen Vater in\n" + .string "der ARENA von BLÜTENBURG CITY\p" + .string "besiegt hast, wusste ich, dass du eine\n" + .string "Chance hast...\p" + .string "Aber, dass du dann sogar CHAMP\n" + .string "geworden bist!\p" + .string "Oh, ja!\p" + .string "Was ist aus deinem POKéDEX geworden?\n" + .string "Lass mich mal sehen...$" EverGrandeCity_ChampionsRoom_Text_1914C6:: @ 81914C6 - .string "PROF. BIRCH: Anyways,\n" - .string "congratulations!\p" - .string "Now, go proudly into the final room!$" + .string "PROF. BIRK: Also, dann sage ich:\n" + .string "Herzlichen Glückwunsch!\p" + .string "Nun kannst du mit Stolz den letzten\n" + .string "Raum betreten!$" EverGrandeCity_ChampionsRoom_Text_191512:: @ 8191512 - .string "STEVEN: {PLAYER}{KUN}...\p" - .string "No, the new CHAMPION!\p" - .string "Come with me.$" + .string "TROY: {PLAYER}{KUN}...\p" + .string "Nein! Neuer CHAMP!\p" + .string "Komm mit mir.$" EverGrandeCity_ChampionsRoom_Text_191546:: @ 8191546 - .string "STEVEN: I’m sorry, but...\p" - .string "From here on, only those TRAINERS who\n" - .string "have become CHAMPIONS may enter.\p" - .string "You’ll have to wait outside with the\n" - .string "PROFESSOR.$" + .string "TROY: Tut mir Leid, aber...\p" + .string "Diesen Raum dürfen nur TRAINER\n" + .string "betreten, die CHAMPS geworden sind.\p" + .string "Warte bitte draußen mit dem PROFESSOR.$" EverGrandeCity_ChampionsRoom_Text_1915D7:: @ 81915D7 - .string "MAY: Groan...\p" + .string "MAIKE: Grummel...\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "I’m just joking! That’s okay!\n" - .string "That’s the rule!\p" + .string "Ich mache nur Spaß! Ist schon okay!\n" + .string "So sind die Regeln!\p" .string "{PLAYER}{KUN}!\n" - .string "Honestly, congratulations!$" + .string "Ehrlich. Herzlichen Glückwunsch!$" EverGrandeCity_ChampionsRoom_Text_191675:: @ 8191675 - .string "BRENDAN: ... ... ... ... ... ...\n" + .string "BRIX: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "It can’t be helped if that’s the rule.\p" - .string "{PLAYER}, way to go!\n" - .string "Congratulations!$" + .string "Na, wenn es die Regeln so bestimmen...\p" + .string "{PLAYER}, das ist dein Tag!\n" + .string "Herzlichen Glückwunsch!$" diff --git a/data/text/maps/EverGrandeCity_DrakesRoom.inc b/data/text/maps/EverGrandeCity_DrakesRoom.inc index ed89c22bf..484aefc14 100644 --- a/data/text/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/text/maps/EverGrandeCity_DrakesRoom.inc @@ -1,28 +1,32 @@ EverGrandeCity_DrakesRoom_Text_190CEB:: @ 8190CEB - .string "I am the last of the POKéMON LEAGUE\n" - .string "ELITE FOUR, DRAKE the DRAGON master!\p" - .string "In their natural state, POKéMON are\n" - .string "wild living things. They are free.\p" - .string "At times, they hinder us.\n" - .string "At times, they help us.\p" - .string "For us to battle with POKéMON as\n" - .string "partners, do you know what it takes?\p" - .string "Do you know what is needed?\p" - .string "If you don’t, then you will never\n" - .string "prevail over me!$" + .string "Ich bin der letzte der TOP VIER in der\n" + .string "POKéMON LIGA, DRAGAN der\l" + .string "DRACHEN-Meister!\p" + .string "Von Natur aus sind POKéMON wild.\n" + .string "Sie sind frei.\p" + .string "Manchmal behindern sie uns.\n" + .string "Manchmal helfen sie uns.\p" + .string "Weißt du, was es bedeutet, mit POKéMON\n" + .string "als gleichwertigen Partnern\l" + .string "zu kämpfen?\p" + .string "Weißt du, was verlangt wird?\p" + .string "Wenn du das nicht weißt, wirst du\n" + .string "hier an dieser Stelle scheitern!$" EverGrandeCity_DrakesRoom_Text_190E42:: @ 8190E42 - .string "Superb, it should be said.$" + .string "Hervorragend! Das muss man sagen.$" EverGrandeCity_DrakesRoom_Text_190E5D:: @ 8190E5D - .string "You deserve every credit for coming\n" - .string "this far as a TRAINER of POKéMON.\p" - .string "You do seem to know what is needed.\p" - .string "Yes, what a TRAINER needs is a\n" - .string "virtuous heart.\p" - .string "POKéMON touch the good hearts of\n" - .string "TRAINERS and learn good from wrong.\p" - .string "They touch the good hearts of\n" - .string "TRAINERS and grow strong.\p" - .string "Go! Go onwards!\n" - .string "The CHAMPION is waiting!$" + .string "Dir gebührt wahre Ehre, da du als\n" + .string "TRAINER der POKéMON so weit\l" + .string "gekommen bist.\p" + .string "Du weißt, was verlangt wird.\p" + .string "Ja, ein TRAINER braucht ein ehrliches\n" + .string "Herz.\p" + .string "POKéMON berühren das Gute im Herzen\n" + .string "des TRAINERS und lernen, zwischen gut\l" + .string "und schlecht zu unterscheiden.\p" + .string "Sie berühren die guten Herzen der\n" + .string "TRAINER und wachsen daran.\p" + .string "Geh! Geh weiter!\n" + .string "Der CHAMP erwartet dich!$" diff --git a/data/text/maps/EverGrandeCity_GlaciasRoom.inc b/data/text/maps/EverGrandeCity_GlaciasRoom.inc index 88fa1e664..8bb9b3427 100644 --- a/data/text/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/text/maps/EverGrandeCity_GlaciasRoom.inc @@ -1,22 +1,23 @@ EverGrandeCity_GlaciasRoom_Text_190AF9:: @ 8190AF9 - .string "Welcome, my name is GLACIA of the\n" - .string "ELITE FOUR.\p" - .string "I’ve traveled from afar to HOENN so\n" - .string "that I may hone my ice skills.\p" - .string "But all I have seen are challenges by\n" - .string "weak TRAINERS and their POKéMON.\p" - .string "What about you?\p" - .string "It would please me to no end if I could\n" - .string "go all out against you!$" + .string "Willkommen. Mein Name ist FROSINA\n" + .string "von den TOP VIER.\p" + .string "Ich bin von weit her nach HOENN gereist,\n" + .string "um meine eisigen Talente zu trainieren.\p" + .string "Aber bisher haben mich nur lausige\n" + .string "TRAINER mit noch lausigeren POKéMON\l" + .string "herausgefordert.\p" + .string "Wie sieht es mit dir aus?\p" + .string "Es würde mich überaus freuen, wenn du\n" + .string "mich zwingst, alles zu geben!$" EverGrandeCity_GlaciasRoom_Text_190C01:: @ 8190C01 - .string "You and your POKéMON...\n" - .string "How hot your spirits burn!\p" - .string "The all-consuming heat overwhelms.\p" - .string "It’s no surprise that my icy skills\n" - .string "failed to harm you.$" + .string "Du und deine POKéMON...\n" + .string "Euer Zusammenhalt verbrennt alles!\p" + .string "Diese Hitze besiegt jeden.\p" + .string "Kein Wunder, dass mein eisiges Talent\n" + .string "dahinschmolz und dir nicht schadete.$" EverGrandeCity_GlaciasRoom_Text_190C8F:: @ 8190C8F - .string "Advance to the next room.\p" - .string "And there, confirm the truly fearsome\n" - .string "side of the POKéMON LEAGUE.$" + .string "Geh weiter in den nächsten Raum.\p" + .string "Und dort wirst du die schrecklichste\n" + .string "Seite der POKéMON LIGA kennen lernen.$" diff --git a/data/text/maps/EverGrandeCity_HallOfFame.inc b/data/text/maps/EverGrandeCity_HallOfFame.inc index c684dcb72..4806915c9 100644 --- a/data/text/maps/EverGrandeCity_HallOfFame.inc +++ b/data/text/maps/EverGrandeCity_HallOfFame.inc @@ -1,13 +1,13 @@ EverGrandeCity_HallOfFame_Text_191841:: @ 8191841 - .string "STEVEN: This room...\p" - .string "This is where we keep records of\n" - .string "POKéMON that prevailed through\l" - .string "harsh battles.\p" - .string "It is here that the LEAGUE CHAMPIONS\n" - .string "are honored.$" + .string "TROY: Dieser Raum...\p" + .string "Hier verzeichnen wir die POKéMON, die\n" + .string "siegreich aus harten Kämpfen hervorge-\l" + .string "gangen sind.\p" + .string "Hier werden die CHAMPS der POKéMON\n" + .string "LIGA geehrt.$" EverGrandeCity_HallOfFame_Text_1918D7:: @ 81918D7 - .string "STEVEN: Come on, let’s record your\n" - .string "name as a TRAINER who triumphed over\l" - .string "the POKéMON LEAGUE, and the names of\l" - .string "the partners who battled with you.$" + .string "TROY: Komm, schreiben wir deinen\n" + .string "Namen nieder, als ein TRAINER, der über\l" + .string "die POKéMON LIGA triumphiert hat - und\l" + .string "die Namen deiner Partner ebenfalls.$" diff --git a/data/text/maps/EverGrandeCity_PhoebesRoom.inc b/data/text/maps/EverGrandeCity_PhoebesRoom.inc index e77a7d31a..e844262c2 100644 --- a/data/text/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/text/maps/EverGrandeCity_PhoebesRoom.inc @@ -1,23 +1,24 @@ EverGrandeCity_PhoebesRoom_Text_1908F5:: @ 81908F5 - .string "Ahahaha!\p" - .string "I’m PHOEBE of the ELITE FOUR.\n" - .string "I did my training on MT. PYRE.\p" - .string "While I trained, I gained the ability\n" - .string "to commune with GHOST-type POKéMON.\p" - .string "Yes, the bond I developed with POKéMON\n" - .string "is extremely tight.\p" - .string "So, come on, just try and see if you can\n" - .string "even inflict damage on my POKéMON!$" + .string "Ahahahahaha!\p" + .string "Ich bin ANTONIA von den TOP VIER.\n" + .string "Ich habe am PYROBERG trainiert.\p" + .string "Während des Trainings habe ich die\n" + .string "Fähigkeit erworben, mit GEIST-POKéMON\l" + .string "zu kommunizieren.\p" + .string "In der Tat ist das Band zwischen mir und\n" + .string "den POKéMON sehr stark.\p" + .string "Komm und schau, ob du irgendetwas\n" + .string "gegen meine POKéMON ausrichten kannst.$" EverGrandeCity_PhoebesRoom_Text_190A0C:: @ 8190A0C - .string "Oh, darn.\n" - .string "I’ve gone and lost.$" + .string "Oh, verdammt.\n" + .string "Aus und vorbei. Verloren.$" EverGrandeCity_PhoebesRoom_Text_190A2A:: @ 8190A2A - .string "There’s a definite bond between you\n" - .string "and your POKéMON, too.\p" - .string "I didn’t recognize it, so it’s only\n" - .string "natural that I lost.\p" - .string "Yup, I’d like to see how far your bond\n" - .string "will carry you.\p" - .string "Go ahead, move on to the next room.$" + .string "Das Band zwischen dir und deinen\n" + .string "POKéMON ist ebenfalls sehr stark.\p" + .string "Das habe ich gar nicht bemerkt, daher\n" + .string "konnte ich nur verlieren.\p" + .string "Ja, jetzt möchte ich sehen, wie weit\n" + .string "dieses Band euch bringt.\p" + .string "Geh und betrete den nächsten Raum.$" diff --git a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc index 18594308a..6bf6c9803 100644 --- a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -1,12 +1,12 @@ EverGrandeCity_PokemonCenter_1F_Text_191967:: @ 8191967 - .string "The POKéMON LEAGUE is only a short\n" - .string "distance after the VICTORY ROAD.\p" - .string "If you’ve come this far, what choice\n" - .string "do you have but to keep going?$" + .string "Die POKéMON LIGA triffst du kurz hinter\n" + .string "der SIEGESSTRASSE.\p" + .string "Wenn du schon so weit gekommen bist,\n" + .string "musst du einfach weitergehen.$" EverGrandeCity_PokemonCenter_1F_Text_1919EF:: @ 81919EF - .string "The long and harrowing VICTORY ROAD...\p" - .string "It’s like reliving the path one has\n" - .string "traveled in life...\p" - .string "Believe in your POKéMON and give it\n" - .string "your very best!$" + .string "Die lange und qualvolle SIEGESSTRASSE...\p" + .string "Es ist fast so, als würde man sein\n" + .string "ganzes Leben noch einmal leben...\p" + .string "Glaube an deine POKéMON und gib\n" + .string "dein Bestes!$" diff --git a/data/text/maps/EverGrandeCity_PokemonLeague.inc b/data/text/maps/EverGrandeCity_PokemonLeague.inc index 89971022c..b2e8a76f1 100644 --- a/data/text/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/text/maps/EverGrandeCity_PokemonLeague.inc @@ -1,15 +1,15 @@ EverGrandeCity_PokemonLeague_Text_1916FD:: @ 81916FD - .string "Beyond this point, only those TRAINERS\n" - .string "who have collected all the GYM BADGES\l" - .string "are permitted to enter.\p" - .string "TRAINER, let us confirm that you have\n" - .string "all the GYM BADGES.$" + .string "Ab hier haben nur die TRAINER, die alle\n" + .string "ORDEN der ARENEN erhalten haben,\l" + .string "Zutritt.\p" + .string "TRAINER, lass uns sicherstellen, dass\n" + .string "du auch alle ORDEN hast.$" EverGrandeCity_PokemonLeague_Text_19179C:: @ 819179C - .string "You haven’t obtained all the BADGES.\p" - .string "If you’re bound for the POKéMON\n" - .string "LEAGUE, you must return with them.$" + .string "Du hast noch nicht alle ORDEN erhalten.\p" + .string "Wenn du zur POKéMON LIGA willst,\n" + .string "musst du alle ORDEN vorweisen können.$" EverGrandeCity_PokemonLeague_Text_191804:: @ 8191804 - .string "TRAINER! Believe in yourself and your\n" - .string "POKéMON, and go forth!$" + .string "TRAINER! Glaube an dich und deine\n" + .string "POKéMON und gehe weiter!$" diff --git a/data/text/maps/EverGrandeCity_SidneysRoom.inc b/data/text/maps/EverGrandeCity_SidneysRoom.inc index 84d1dddf5..76871909d 100644 --- a/data/text/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/text/maps/EverGrandeCity_SidneysRoom.inc @@ -1,20 +1,20 @@ EverGrandeCity_SidneysRoom_Text_190728:: @ 8190728 - .string "Welcome, challenger!\n" - .string "I’m SIDNEY of the ELITE FOUR.\p" - .string "I like that look you’re giving me.\n" - .string "I guess you’ll give me a good match.\l" - .string "That’s good! Looking real good!\p" - .string "All right! You and me, let’s enjoy a\n" - .string "battle that can only be staged here\l" - .string "in the POKéMON LEAGUE!$" + .string "Willkommen, Herausforderer!\n" + .string "Ich bin ULRICH von den TOP VIER.\p" + .string "Ich mag deinen herausfordernden Blick.\n" + .string "Ich denke, das wird ein guter Kampf.\l" + .string "Gut! Das sieht gut aus!\p" + .string "Schön! Dann lass uns beide einen Kampf\n" + .string "erleben, wie man ihn nur hier in der\l" + .string "POKéMON LIGA erleben kann!$" EverGrandeCity_SidneysRoom_Text_190823:: @ 8190823 - .string "Well, how do you like that? I lost!\n" - .string "Eh, it was fun, so it doesn’t matter.$" + .string "Ich habe verloren! Ich, ULRICH von den\n" + .string "TOP VIER. Macht nichts, es war lustig.$" EverGrandeCity_SidneysRoom_Text_19086D:: @ 819086D - .string "Well, listen to what this loser has\n" - .string "to say.\p" - .string "You’ve got what it takes to go far.\n" - .string "Now, go on to the next room and enjoy\l" - .string "your next battle!$" + .string "Nun, hör dir an, was dieser Verlierer\n" + .string "zu sagen hat.\p" + .string "Du bist bestens ausgerüstet.\n" + .string "Daher solltest du nun in den nächsten\l" + .string "Raum gehen - zum nächsten Kampf.$" diff --git a/data/text/maps/FallarborTown.inc b/data/text/maps/FallarborTown.inc index 1483272de..a695f5d83 100644 --- a/data/text/maps/FallarborTown.inc +++ b/data/text/maps/FallarborTown.inc @@ -1,41 +1,46 @@ FallarborTown_Text_16C7FF:: @ 816C7FF - .string "What’s up, what’s up?\p" - .string "I saw a shady fellow scuttling in and\n" - .string "out of PROF. COZMO’s LAB.$" + .string "Was ist los? Was ist los?\p" + .string "Ich habe eine zwielichtige Gestalt aus\n" + .string "dem LABOR von PROF. KOSMO flitzen\l" + .string "sehen.$" FallarborTown_Text_16C855:: @ 816C855 - .string "This region’s been known for meteors\n" - .string "since the olden days.\p" - .string "They say METEOR FALLS was gouged out\n" - .string "by a falling meteorite long ago.$" + .string "Diese Region ist schon seit Urzeiten\n" + .string "für ihre Meteoritenschauer bekannt.\p" + .string "Man sagt, METEORFÄLLE sei durch\n" + .string "den Aufprall eines METEORITEN\l" + .string "entstanden.$" FallarborTown_Text_16C8D6:: @ 816C8D6 - .string "See! Take a look!\n" - .string "This is my precious AZURILL!\p" - .string "It’s slick and smooth and plushy, too!$" + .string "Schau mal! Guck doch mal!\n" + .string "Das ist mein süßes AZURILL!\p" + .string "Es ist glatt, weich und plüschig!$" FallarborTown_Text_16C92C:: @ 816C92C .string "AZURILL: Rooreelooo.$" FallarborTown_Text_16C941:: @ 816C941 - .string "Have you already challenged FLANNERY,\n" - .string "the LEADER of LAVARIDGE GYM?\p" - .string "The girl’s grandfather was famous.\n" - .string "He was one of the ELITE FOUR in the\l" - .string "POKéMON LEAGUE at one point.\p" - .string "It wouldn’t surprise me to see FLANNERY\n" - .string "become a great TRAINER in her own\l" - .string "right.$" + .string "Hast du schon FLAVIA, die LEITERIN\n" + .string "der ARENA von BAD LAVASTADT,\l" + .string "herausgefordert?\p" + .string "Ihr Großvater ist sehr berühmt.\n" + .string "Er war einer der TOP VIER in der\l" + .string "POKéMON LIGA.\p" + .string "Es würde mich gar nicht wundern, wenn\n" + .string "FLAVIA ebenfalls ein großer TRAINER\l" + .string "wird.$" FallarborTown_Text_16CA39:: @ 816CA39 - .string "POKéMON CONTESTS\n" - .string "SUPER RANK REGISTRATION\p" - .string "“Burst on to the POKéMON scene!”$" + .string "POKéMON WETTBEWERBE\n" + .string "SUPER-KLASSE REGISTRIERUNGEN\p" + .string "“Brecht in die POKéMON-Szene\n" + .string "ein!”$" FallarborTown_Text_16CA83:: @ 816CA83 - .string "FALLARBOR TOWN\n" - .string "“A farm community with small gardens.”$" + .string "LAUBWECHSELFELD\n" + .string "“Eine Gemeinschaft von Farmern mit\l" + .string "kleinen Gärten.”$" FallarborTown_Text_16CAB9:: @ 816CAB9 - .string "MOVE TUTOR’S HOUSE\n" - .string "“New moves taught to POKéMON.”$" + .string "HAUS des ATTACKEN-HELFERS\n" + .string "“Neue Attacken für deine POKéMON.”$" diff --git a/data/text/maps/FallarborTown_ContestHall.inc b/data/text/maps/FallarborTown_ContestHall.inc index 5db8766c5..43c34e295 100644 --- a/data/text/maps/FallarborTown_ContestHall.inc +++ b/data/text/maps/FallarborTown_ContestHall.inc @@ -1,21 +1,21 @@ FallarborTown_ContestHall_Text_177335:: @ 8177335 - .string "We do all right in the preliminary round,\n" - .string "but we can never win the appeals...\p" - .string "Maybe it means I have to watch what\n" - .string "other contestants are doing...$" + .string "Im 1. Durchlauf schneiden wir immer\n" + .string "gut ab, aber im 2. Durchlauf...\p" + .string "Vielleicht sollte ich beobachten, was\n" + .string "die anderen Teilnehmer machen...$" FallarborTown_ContestHall_Text_1773C6:: @ 81773C6 - .string "See!\n" - .string "My POKéMON won all these RIBBONS!\p" - .string "Have your POKéMON earned any RIBBONS?\n" - .string "You can check them on your POKéNAV.$" + .string "Schau mal! Mein POKéMON hat all\n" + .string "diese BÄNDER gewonnen!\p" + .string "Besitzen deine POKéMON auch BÄNDER?\n" + .string "Du kannst das im POKéNAV überprüfen.$" FallarborTown_ContestHall_Text_177437:: @ 8177437 - .string "I can’t beat GYM LEADERS...\p" - .string "I can’t win any CONTESTS...\p" - .string "I’ve been here, there, and everywhere,\n" - .string "and it’s all for naught...$" + .string "Ich kann ARENALEITER nicht besiegen...\p" + .string "Ich kann keine WETTBEWERBE gewinnen...\p" + .string "Ich war schon hier und dort und überall,\n" + .string "aber immer vergebens.$" FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 - .string "POKéMON CONTESTS\n" - .string "SUPER RANK STAGE!$" + .string "POKéMON-WETTBEWERBE\n" + .string "BÜHNE für die SUPER-KLASSE!$" diff --git a/data/text/maps/FallarborTown_ContestLobby.inc b/data/text/maps/FallarborTown_ContestLobby.inc index 5d4305f8c..085d43e7d 100644 --- a/data/text/maps/FallarborTown_ContestLobby.inc +++ b/data/text/maps/FallarborTown_ContestLobby.inc @@ -1,23 +1,25 @@ FallarborTown_ContestLobby_Text_177141:: @ 8177141 - .string "They had a sketch of my POKéMON up\n" - .string "on the wall over there, but they\l" - .string "changed it with a new one already.\p" - .string "I’m going to enter my HANA in CONTESTS\n" - .string "so we can get her sketch up again!$" + .string "Dort hing mal eine Zeichnung von meinem\n" + .string "POKéMON, aber nun hängt dort die\l" + .string "Zeichnung eines anderen POKéMON.\p" + .string "Ich werde mein HANA am WETTBEWERB\n" + .string "teilnehmen lassen, dann gibt es eine\l" + .string "neue Zeichnung von ihm!$" FallarborTown_ContestLobby_Text_1771F2:: @ 81771F2 - .string "Hi, are you making any {POKEBLOCK}S?\p" - .string "You should come by with a bunch of\n" - .string "BERRIES sometime.$" + .string "Hallo, willst du {POKEBLOCK} herstellen?\p" + .string "Dann komm doch mal wieder vorbei und\n" + .string "bring genug BEEREN mit.$" FallarborTown_ContestLobby_Text_177246:: @ 8177246 - .string "You see how they display a sketch of\n" - .string "a CONTEST winner here?\p" - .string "I sketch them!\p" - .string "If any of your POKéMON wins a CONTEST,\n" - .string "I’d gladly make a sketch of it!$" + .string "Siehst du, wie sie hier die Zeichnungen\n" + .string "des Sieger-POKéMON aushängen?\p" + .string "Ich bin der Zeichner dieser Werke!\p" + .string "Sobald eines deiner POKéMON einen\n" + .string "WETTBEWERB gewinnt, werde ich es mit\l" + .string "Vergnügen zeichnen!$" FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 - .string "Hello! Congratulations!\p" - .string "I’ve put up a sketch of your POKéMON\n" - .string "right here for everyone to see!$" + .string "Hallo und herzlichen Glückwunsch!\p" + .string "Ich habe eine Zeichnung deines POKéMON\n" + .string "hier aufgehängt, damit jeder es sieht.$" diff --git a/data/text/maps/FallarborTown_House1.inc b/data/text/maps/FallarborTown_House1.inc index c882bc9b7..c19ee545d 100644 --- a/data/text/maps/FallarborTown_House1.inc +++ b/data/text/maps/FallarborTown_House1.inc @@ -1,51 +1,52 @@ FallarborTown_House1_Text_177755:: @ 8177755 - .string "PROF. COZMO: Oh...\n" - .string "I never should have let myself be\l" - .string "conned into telling TEAM {EVIL_TEAM} where\l" - .string "you can find METEORITES...\p" - .string "That METEORITE from METEOR FALLS...\n" - .string "It’s never going to be mine now...$" + .string "PROF. KOSMO: Oh...\n" + .string "Ich hätte mich nie dazu verleiten\l" + .string "lassen dürfen, TEAM {EVIL_TEAM} zu verraten,\l" + .string "wo METEORITEN zu finden sind...\p" + .string "Der METEORIT von METEORFÄLLE...\n" + .string "Nun wird er niemals mir gehören...$" FallarborTown_House1_Text_17780E:: @ 817780E .string "Oh!\n" - .string "Hah?\p" - .string "That item...\p" - .string "Could it be?\p" - .string "Is it the METEORITE that TEAM {EVIL_TEAM}\n" - .string "took from METEOR FALLS?\p" - .string "Please, may I have it?\p" - .string "I’m not asking for it for free.\n" - .string "How about in exchange for this TM?$" + .string "Oooh?\p" + .string "Dieses Item...\p" + .string "Kann es sein?\p" + .string "Ist das der METEORIT, den TEAM {EVIL_TEAM}\n" + .string "aus METEORFÄLLE entwendet hat?\p" + .string "Bitte, darf ich den haben?\p" + .string "Du bekommst auch etwas dafür.\n" + .string "Was hältst du von dieser TM?$" FallarborTown_House1_Text_1778C4:: @ 81778C4 - .string "PROF. COZMO: This TM, it represents\n" - .string "my feeling of gratitude.\l" - .string "Please use it!$" + .string "PROF. KOSMO: Mit dieser TM möchte ich\n" + .string "dir meine Dankbarkeit ausdrücken.\l" + .string "Bitte, nimm sie an!$" FallarborTown_House1_Text_177910:: @ 8177910 - .string "PROF. COZMO: Oh, I can’t believe it.\n" - .string "This is really, really great!\p" - .string "This is really going to help my research!$" + .string "PROF. KOSMO: Oh, ich kann es einfach\n" + .string "nicht glauben! Das ist nett! So nett!!!\p" + .string "Das wird mir bei meinen Forschungen\n" + .string "enorm weiterhelfen!$" FallarborTown_House1_Text_17797D:: @ 817797D - .string "PROF. COZMO: Oh, but...\n" - .string "I’m crushed with disappointment...$" + .string "PROF. KOSMO: Oh, aber...\n" + .string "Das enttäuscht mich jetzt maßlos...$" FallarborTown_House1_Text_1779B8:: @ 81779B8 - .string "PROF. COZMO: Please, may I have that\n" - .string "METEORITE?\p" - .string "I’m not asking for it for free.\n" - .string "How about in exchange for this TM?$" + .string "PROF. KOSMO: Bitte, darf ich den\n" + .string "METEORITEN haben?\p" + .string "Ich möchte ihn nicht umsonst haben! Wie\n" + .string "wäre es mit dieser TM im Tausch dafür?$" FallarborTown_House1_Text_177A2B:: @ 8177A2B - .string "PROF. COZMO went off to METEOR FALLS\n" - .string "on ROUTE 114 with some people from\l" - .string "TEAM {EVIL_TEAM}.$" + .string "PROF. KOSMO ist unterwegs zu\n" + .string "METEORFÄLLE an der ROUTE 114. Einige\l" + .string "Leute von TEAM {EVIL_TEAM} begleiten ihn.$" FallarborTown_House1_Text_177A7C:: @ 8177A7C - .string "Poor PROF. COZMO...\n" - .string "He’s so depressed... I feel sorry for him.$" + .string "Armer PROF. KOSMO...\n" + .string "Er ist so deprimiert... Er tut mir Leid.$" FallarborTown_House1_Text_177ABB:: @ 8177ABB - .string "Look at PROF. COZMO...\n" - .string "He’s so happy! I think it’s cute.$" + .string "Schau dir nur PROF. KOSMO an...\n" + .string "Er ist so glücklich! Richtig niedlich.$" diff --git a/data/text/maps/FallarborTown_House2.inc b/data/text/maps/FallarborTown_House2.inc index de6d63fad..b0450c136 100644 --- a/data/text/maps/FallarborTown_House2.inc +++ b/data/text/maps/FallarborTown_House2.inc @@ -1,38 +1,38 @@ FallarborTown_House2_Text_177AF4:: @ 8177AF4 - .string "I’m the MOVE TUTOR.\p" - .string "I know all the moves that POKéMON\n" - .string "learn - every one of them - and I can\l" - .string "teach POKéMON those moves.\p" - .string "I can teach a move to a POKéMON\n" - .string "of yours if you’d like.\p" - .string "I’ll do it for a HEART SCALE.\n" - .string "I’m collecting those now.$" + .string "Ich bin der ATTACKEN-HELFER.\p" + .string "Ich kenne alle Attacken, die ein\n" + .string "POKéMON lernen kann - und ich kann sie\l" + .string "ihnen beibringen.\p" + .string "Ich kann auch deinen POKéMON neue\n" + .string "Attacken beibringen, wenn du magst.\p" + .string "Als Gegenleistung hätte ich gerne eine\n" + .string "HERZSCHUPPE. Die sammle ich nämlich.$" FallarborTown_House2_Text_177BDB:: @ 8177BDB - .string "Oh! That’s it! That’s an honest to\n" - .string "goodness HEART SCALE!\p" - .string "Let me guess, you want me to teach\n" - .string "a move?$" + .string "Oh! Das ist es! Das ist ehrlich und\n" + .string "wahrhaftig eine HERZSCHUPPE!\p" + .string "Lass mich raten... Ich soll einem POKéMON\n" + .string "eine neue Attacke beibringen?!?$" FallarborTown_House2_Text_177C3F:: @ 8177C3F - .string "Which POKéMON needs tutoring?$" + .string "Welches POKéMON soll sie lernen?$" FallarborTown_House2_Text_177C5D:: @ 8177C5D - .string "Which move should I teach?$" + .string "Welche Attacke soll ich es lehren?$" FallarborTown_House2_Text_177C78:: @ 8177C78 - .string "Sorry...\p" - .string "It doesn’t appear as if I have any move\n" - .string "I can teach that POKéMON.$" + .string "Tut mir Leid...\p" + .string "Scheinbar gibt es keine Attacke, die ich\n" + .string "diesem POKéMON beibringen kann.$" FallarborTown_House2_Text_177CC3:: @ 8177CC3 - .string "{PLAYER} handed over one HEART SCALE\n" - .string "in exchange.$" + .string "{PLAYER} tauscht eine HERZSCHUPPE ein.$" FallarborTown_House2_Text_177CEF:: @ 8177CEF - .string "If your POKéMON need to learn a move,\n" - .string "come back with a HEART SCALE.$" + .string "Falls deine POKéMON neue Attacken\n" + .string "lernen sollen, komm mit einer\l" + .string "HERZSCHUPPE wieder.$" FallarborTown_House2_Text_177D33:: @ 8177D33 - .string "Hunh? There isn’t a single move that\n" - .string "I can teach an EGG.$" + .string "Bitte? Ich kann einem EI nicht eine\n" + .string "einzige Attacke beibringen!$" diff --git a/data/text/maps/FallarborTown_Mart.inc b/data/text/maps/FallarborTown_Mart.inc index bc8b3fb32..6f6ebef5c 100644 --- a/data/text/maps/FallarborTown_Mart.inc +++ b/data/text/maps/FallarborTown_Mart.inc @@ -1,16 +1,17 @@ FallarborTown_Mart_Text_176FF0:: @ 8176FF0 - .string "I’m having a hard time deciding if I\n" - .string "should make my SKITTY evolve or not.\p" - .string "I only have to use this MOON STONE,\n" - .string "but it’s so hard to decide...\p" - .string "If I make it evolve, it will become\n" - .string "much stronger.\p" - .string "But it will look so different, too.$" + .string "Ich habe lange überlegt, ob sich mein\n" + .string "ENECO entwickeln soll oder nicht.\p" + .string "Ich müsste nur diesen MONDSTEIN ein-\n" + .string "setzen, aber das ist eine schwere\l" + .string "Entscheidung...\p" + .string "Würde es sich entwickeln, wäre es viel\n" + .string "stärker.\p" + .string "Aber es würde auch anders aussehen.$" FallarborTown_Mart_Text_1770D3:: @ 81770D3 - .string "SKITTY: Miyao?$" + .string "ENECO: Miyao?$" FallarborTown_Mart_Text_1770E2:: @ 81770E2 - .string "This NUGGET I found here...\n" - .string "I suppose I’ll have to sell it, seeing\l" - .string "as how it has no other use.$" + .string "Ich habe hier ein NUGGET gefunden...\n" + .string "Das werde ich wohl verkaufen. Was soll\l" + .string "ich sonst damit machen?$" diff --git a/data/text/maps/FallarborTown_PokemonCenter_1F.inc b/data/text/maps/FallarborTown_PokemonCenter_1F.inc index a626ff1e9..66a21c458 100644 --- a/data/text/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/text/maps/FallarborTown_PokemonCenter_1F.inc @@ -1,27 +1,31 @@ FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 - .string "Oh, hello.\n" - .string "You are?\p" - .string "Okay, your name’s {PLAYER}{KUN}.\n" - .string "I can see that you’re a TRAINER.\p" - .string "So that means you use the POKéMON\n" - .string "Storage System I developed.\p" - .string "How I arrived at that conclusion is\n" - .string "a simple deductive process.\p" - .string "You spoke to me because you wanted\n" - .string "to access something on this PC.\p" - .string "Oh, I’m sorry. I’m LANETTE.\p" - .string "Honestly, I’m glad to meet you - it’s\n" - .string "great you’re using the Storage System.\p" - .string "If you could, please visit me at home.\n" - .string "My house is on ROUTE 114.$" + .string "Oh, hallo.\n" + .string "Wer bist du?\p" + .string "Du heißt {PLAYER}{KUN}?\n" + .string "Ich sehe schon, du bist ein TRAINER.\p" + .string "Und das bedeutet, du nutzt das\n" + .string "POKéMON-Lagerungs-System, das ich\l" + .string "entwickelt habe.\p" + .string "Ich bin durch simple Deduktion zu\n" + .string "diesem Schluss gekommen.\p" + .string "Du hast mich angesprochen, weil du\n" + .string "mit diesem PC arbeiten willst.\p" + .string "Ach, ich habe mich gar nicht vorgestellt.\n" + .string "Ich bin LANETTE.\p" + .string "Ich bin ehrlich erfreut, dich kennen zu\n" + .string "lernen. Und ich freue mich, dass du das\l" + .string "Lagerungs-System benutzt.\p" + .string "Wenn du magst, besuche mich doch mal.\n" + .string "Ich wohne an der ROUTE 114.$" FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C - .string "I wonder what POKéMON looked like\n" - .string "long, long ago?\p" - .string "Maybe the FOSSIL MANIAC at the edge\n" - .string "of town will know.$" + .string "Ich frage mich, wie die POKéMON wohl\n" + .string "vor langer, langer Zeit aussahen.\p" + .string "Vielleicht kann mir der FOSSILMANIAC\n" + .string "am Ortsrand etwas dazu sagen.$" FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 - .string "In the fields of FALLARBOR, we plant\n" - .string "seedlings of hardy trees that thrive\l" - .string "even in volcanic ash.$" + .string "Auf den Feldern von LAUBWECHSELFELD\n" + .string "haben wir widerstandsfähige Bäume\p" + .string "gepflanzt, die auch in der Vulkanasche\n" + .string "gedeihen.$" diff --git a/data/text/maps/FortreeCity.inc b/data/text/maps/FortreeCity.inc index 8640fada7..9f12b016e 100644 --- a/data/text/maps/FortreeCity.inc +++ b/data/text/maps/FortreeCity.inc @@ -1,62 +1,62 @@ FortreeCity_Text_167577:: @ 8167577 - .string "Sniff...\n" - .string "Um... You, uh...smell singed.\p" - .string "Were you at a volcano or something?$" + .string "Schnüffel...\n" + .string "Äh... Du, uh... riechst angesengt.\p" + .string "Warst du auf einem Vulkan oder so?$" FortreeCity_Text_1675C2:: @ 81675C2 - .string "I want to go to the POKéMON GYM, but\n" - .string "something’s blocking the way.\p" - .string "After all the bother I went through\n" - .string "training on ROUTE 120...$" + .string "Ich wollte zur POKéMON ARENA, aber\n" + .string "irgendetwas blockiert den Weg.\p" + .string "Und das, nachdem ich auf der ROUTE 120\n" + .string "so fleißig trainiert habe...$" FortreeCity_Text_167642:: @ 8167642 - .string "I’ve got my pride-and-joy POKéMON\n" - .string "with me. This time, I’ll beat WINONA.$" + .string "Dieses POKéMON ist mein ganzer Stolz!\n" + .string "Diesmal werde ich WIBKE besiegen!$" FortreeCity_Text_16768A:: @ 816768A - .string "The ground absorbs rainwater, and\n" - .string "trees grow by drinking that water...\p" - .string "Our FORTREE CITY exists because\n" - .string "there’s both water and soil.$" + .string "Der Boden nimmt das Regenwasser auf,\n" + .string "die Bäume trinken es und wachsen...\p" + .string "Unser BAUMHAUSEN CITY existiert, weil\n" + .string "es genügend Wasser und Boden gibt.$" FortreeCity_Text_16770E:: @ 816770E - .string "The CITY consists of homes built on\n" - .string "trees.\p" - .string "Perhaps because of that lifestyle,\n" - .string "everyone is healthy and lively.\p" - .string "Why, even myself - I feel as if I’ve\n" - .string "grown thirty years younger.$" + .string "Die STADT besteht aus Häusern, die auf\n" + .string "Bäumen gebaut sind.\p" + .string "Aufgrund dieser Lebensweise ist jeder\n" + .string "hier gesund und munter.\p" + .string "Und auch ich fühle mich, als sei ich\n" + .string "30 Jahre jünger geworden.$" FortreeCity_Text_1677BD:: @ 81677BD - .string "Living on top of trees is okay.\p" - .string "But sometimes BUG POKéMON come in\n" - .string "through windows.\l" - .string "It can be really startling.$" + .string "Auf Bäumen zu leben ist klasse.\p" + .string "Aber manchmal kommen KÄFER-POKéMON\n" + .string "durch die Fenster herein.\l" + .string "Das kann einen ganz schön erschrecken.$" FortreeCity_Text_16782C:: @ 816782C - .string "Some POKéMON evolve when they go\n" - .string "through a Game Link cable.$" + .string "Manche POKéMON entwickeln sich, wenn\n" + .string "sie durch ein Verbindungskabel laufen.$" FortreeCity_Text_167868:: @ 8167868 - .string "Something unseeable is in the way.$" + .string "Etwas Unsichtbares blockiert den Weg.$" FortreeCity_Text_16788B:: @ 816788B - .string "Something unseeable is in the way.\p" - .string "Want to use the DEVON SCOPE?$" + .string "Etwas Unsichtbares blockiert den Weg.\p" + .string "Willst du das DEVON-SCOPE einsetzen?$" FortreeCity_Text_1678CB:: @ 81678CB - .string "{PLAYER} used the DEVON SCOPE.\p" - .string "An invisible POKéMON became completely\n" - .string "visible!\p" - .string "The startled POKéMON fled!$" + .string "{PLAYER} setzt das DEVON-SCOPE ein.\p" + .string "Ein unsichtbares POKéMON ist sichtbar\n" + .string "geworden!\p" + .string "Das erschrockene POKéMON flieht!$" FortreeCity_Text_16792F:: @ 816792F - .string "FORTREE CITY\n" - .string "“The treetop city that frolics with\l" - .string "nature.”$" + .string "BAUMHAUSEN CITY\n" + .string "“Die Stadt in den Baumkronen,\l" + .string "verbrüdert mit der Natur.”$" FortreeCity_Text_167969:: @ 8167969 - .string "FORTREE CITY POKéMON GYM\n" - .string "LEADER: WINONA\p" - .string "“The bird user taking flight into\n" - .string "the world.”$" + .string "POKéMON ARENA von BAUMHAUSEN CITY\n" + .string "LEITERIN: WIBKE\p" + .string "“Die Vogel-Liebhaberin hebt ab zum\n" + .string "Flug in die Welt.”$" diff --git a/data/text/maps/FortreeCity_DecorationShop.inc b/data/text/maps/FortreeCity_DecorationShop.inc index 7809f10ff..07c3b3379 100644 --- a/data/text/maps/FortreeCity_DecorationShop.inc +++ b/data/text/maps/FortreeCity_DecorationShop.inc @@ -1,12 +1,13 @@ FortreeCity_DecorationShop_Text_186A61:: @ 8186A61 - .string "Merchandise you buy here is sent to\n" - .string "your own PC.\p" - .string "That’s fantastic! I wish they could\n" - .string "also deliver me home like that.$" + .string "Die Artikel, die du hier kaufst, werden\n" + .string "sofort auf deinen PC gesendet.\p" + .string "Das ist großartig! Ich wünschte, ich\n" + .string "könnte mich so auch nach Hause\l" + .string "senden lassen.$" FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 - .string "I’m buying a pretty desk and I’m\n" - .string "putting my cute DOLLS on it.\p" - .string "If I don’t, when I decorate my\n" - .string "SECRET BASE, my DOLLS will get\l" - .string "dirty or poked with splinters.$" + .string "Ich kaufe mir einen schönen Tisch, auf\n" + .string "den ich meine PUPPEN setze.\p" + .string "Wenn ich das nicht tue, werden meine\n" + .string "PUPPEN schmutzig, wenn ich damit meine\l" + .string "GEHEIMBASIS dekoriere.$" diff --git a/data/text/maps/FortreeCity_Gym.inc b/data/text/maps/FortreeCity_Gym.inc index 036cacd50..5c1696822 100644 --- a/data/text/maps/FortreeCity_Gym.inc +++ b/data/text/maps/FortreeCity_Gym.inc @@ -1,116 +1,119 @@ FortreeCity_Gym_Text_18589C:: @ 818589C - .string "Yo, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "FORTREE GYM LEADER WINONA is a\n" - .string "master of FLYING-type POKéMON.\p" - .string "She’s waiting at the back of this GYM,\n" - .string "behind the rotating doors.\p" - .string "She’s waiting for new challengers who\n" - .string "are trying to take wing!\p" - .string "Okay, go for it!$" + .string "Na, wie sieht es aus, auf dem Weg zum\n" + .string "CHAMP, {PLAYER}?\p" + .string "Die LEITERIN der ARENA von BAUMHAUSEN\n" + .string "CITY, WIBKE, ist eine Meisterin der\l" + .string "FLUG-POKéMON.\p" + .string "Sie wartet hinten in der ARENA auf dich,\n" + .string "hinter den Drehtüren.\p" + .string "Sie wartet auf neue Herausforderer,\n" + .string "denen sie die Flügel stutzen kann!\p" + .string "Okay, dann viel Glück!$" FortreeCity_Gym_Text_185994:: @ 8185994 - .string "You did it!\n" - .string "You’ve achieved liftoff!$" + .string "Du hast es geschafft!\n" + .string "Du hast Startfreigabe!$" FortreeCity_Gym_Text_1859B9:: @ 81859B9 - .string "Behold the elegant battle style of\n" - .string "BIRD POKéMON!$" + .string "Bewundere den eleganten Kampfstil der\n" + .string "VOGEL-POKéMON!$" FortreeCity_Gym_Text_1859EA:: @ 81859EA - .string "You...\n" - .string "You’re strong...$" + .string "Du...\n" + .string "Du bist stark...$" FortreeCity_Gym_Text_185A02:: @ 8185A02 - .string "A TRAINER has to be smart to keep\n" - .string "up with unexpected turns of events.\p" - .string "Let’s see if you have the smarts to\n" - .string "get to our LEADER?$" + .string "Ein TRAINER muss clever genug sein, mit\n" + .string "den Wendungen im Kampf fertig zu\l" + .string "werden.\p" + .string "Mal sehen, ob du clever genug bist, bis\n" + .string "zu unserer LEITERIN vorzudringen.$" FortreeCity_Gym_Text_185A7F:: @ 8185A7F - .string "The lovers of BIRD POKéMON aspire\n" - .string "to join this GYM.\p" - .string "As a member of the FORTREE GYM,\n" - .string "I’m not allowed to lose!$" + .string "Liebhaber von VOGEL-POKéMON streben\n" + .string "danach, dieser ARENA beizutreten.\p" + .string "Als Mitglied der ARENA von BAUMHAUSEN\n" + .string "CITY darf ich nicht verlieren!$" FortreeCity_Gym_Text_185AEC:: @ 8185AEC - .string "It was too much of a load for me\n" - .string "to bear...$" + .string "Das war doch etwas zu schwer für mich\n" + .string "zu tragen...$" FortreeCity_Gym_Text_185B18:: @ 8185B18 - .string "The world is huge, and there are\n" - .string "countless tough TRAINERS.\p" - .string "I’m going to keep training and make\n" - .string "myself even stronger.$" + .string "Die Welt ist groß und es gibt zahlreiche\n" + .string "starke TRAINER.\p" + .string "Ich werde weiter trainieren und so\n" + .string "immer stärker werden!$" FortreeCity_Gym_Text_185B8D:: @ 8185B8D - .string "There’s no need for WINONA, our GYM\n" - .string "LEADER, to deal with you!\p" - .string "I’m plenty good enough for you!$" + .string "Es gibt keinen Grund, dass WIBKE,\n" + .string "unsere ARENALEITERIN, sich mit dir\l" + .string "abgibt!\p" + .string "Ich bin schon stark genug für dich!$" FortreeCity_Gym_Text_185BEB:: @ 8185BEB - .string "WINONA, I...\n" - .string "I lost!$" + .string "WIBKE... Ich...\n" + .string "Ich habe verlooooren!$" FortreeCity_Gym_Text_185C00:: @ 8185C00 - .string "WINONA is cute and she’s strong.\n" - .string "She’s the ultimate LEADER!\p" - .string "Blush...$" + .string "WIBKE ist süß, aber auch stark.\n" + .string "Sie ist die ultimative LEITERIN!\p" + .string "Hups... Wie peinlich. Ich werde nicht rot!$" FortreeCity_Gym_Text_185C45:: @ 8185C45 - .string "WINONA taught me personally!\n" - .string "You can’t beat me easily!$" + .string "WIBKE hat mich persönlich geschult!\n" + .string "Du wirst kein leichtes Spiel haben!$" FortreeCity_Gym_Text_185C7C:: @ 8185C7C - .string "I was beaten...$" + .string "Ich wurde geschlagen...$" FortreeCity_Gym_Text_185C8C:: @ 8185C8C - .string "Thanks to WINONA, the people of\n" - .string "FORTREE can live without fear.$" + .string "Dank WIBKE leben die Einwohner von\n" + .string "BAUMHAUSEN CITY ohne Furcht.$" FortreeCity_Gym_Text_185CCB:: @ 8185CCB - .string "I am WINONA. I am the LEADER of the\n" - .string "FORTREE POKéMON GYM.\p" - .string "I have become one with BIRD POKéMON\n" - .string "and have soared the skies...\p" - .string "However grueling the battle, we have\n" - .string "triumphed with grace...\p" - .string "Witness the elegant choreography\n" - .string "of BIRD POKéMON and I!$" + .string "Ich bin WIBKE, die LEITERIN der ARENA\n" + .string "von BAUMHAUSEN CITY.\p" + .string "Ich wurde das mit Hilfe meiner VOGEL-\n" + .string "POKéMON und habe den Himmel berührt.\p" + .string "Wie anstrengend der Kampf auch war, wir\n" + .string "haben mit Grazie gewonnen...\p" + .string "Werde Zeuge der eleganten Choreo-\n" + .string "graphie meiner VOGEL-POKéMON!$" FortreeCity_Gym_Text_185DBA:: @ 8185DBA - .string "Never before have I seen a TRAINER\n" - .string "command POKéMON with more grace\l" - .string "than I...\p" - .string "In recognition of your prowess,\n" - .string "I present to you this GYM BADGE.$" + .string "Ich habe noch nie einen TRAINER ge-\n" + .string "sehen, der seine POKéMON mit mehr\l" + .string "Grazie trainiert als ich...\p" + .string "In Anbetracht deiner Fähigkeiten\n" + .string "überreiche ich dir diesen ARENAORDEN.$" FortreeCity_Gym_Text_185E48:: @ 8185E48 - .string "{PLAYER} received the FEATHER BADGE\n" - .string "from WINONA.$" + .string "{PLAYER} erhält den FEDERORDEN von\n" + .string "WIBKE.$" FortreeCity_Gym_Text_185E73:: @ 8185E73 - .string "With the FEATHER BADGE, all POKéMON up\n" - .string "to LV 70, even those received through\l" - .string "trades, will obey your every command.\p" - .string "You will also be able to use the\n" - .string "HM move FLY outside of battle.\p" - .string "And this...\n" - .string "This is a gift from me.$" + .string "Mit dem FEDERORDEN gehorchen dir alle\n" + .string "POKéMON bis Lv. 70, auch die, die du\l" + .string "durch Tausch bekommen hast.\p" + .string "Außerdem kannst du nun die VM FLIEGEN\n" + .string "außerhalb eines Kampfes einsetzen.\p" + .string "Und dies...\n" + .string "Dies ist ein Geschenk von mir.$" FortreeCity_Gym_Text_185F4A:: @ 8185F4A - .string "TM40 contains AERIAL ACE.\p" - .string "Its speed...\n" - .string "No POKéMON should be able to avoid it.$" + .string "TM40 enthält AERO-ASS.\p" + .string "Diese Geschwindigkeit...\n" + .string "Kein POKéMON kann ihr entgehen.$" FortreeCity_Gym_Text_185F98:: @ 8185F98 - .string "Though I fell to you, I will remain\n" - .string "devoted to BIRD POKéMON.$" + .string "Auch wenn ich gegen dich verloren habe,\n" + .string "gehört meine Liebe den VOGEL-POKéMON.$" FortreeCity_Gym_Text_185FD5:: @ 8185FD5 - .string "FORTREE CITY POKéMON GYM$" + .string "POKéMON ARENA von BAUMHAUSEN CITY$" FortreeCity_Gym_Text_185FEE:: @ 8185FEE - .string "FORTREE CITY POKéMON GYM\p" - .string "WINONA’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von BAUMHAUSEN CITY\p" + .string "WIBKES ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/FortreeCity_House1.inc b/data/text/maps/FortreeCity_House1.inc index 0d94fcd27..0f22af768 100644 --- a/data/text/maps/FortreeCity_House1.inc +++ b/data/text/maps/FortreeCity_House1.inc @@ -1,35 +1,37 @@ FortreeCity_House1_Text_18568C:: @ 818568C - .string "Hi, there’s this POKéMON that I’m\n" - .string "looking for.\p" - .string "I want a {STR_VAR_1}.\n" - .string "Do you have one?\p" - .string "Would you trade it for my {STR_VAR_2}?$" + .string "Hi! Da gibt es dieses POKéMON, nach\n" + .string "dem ich suche.\p" + .string "Ich möchte ein {STR_VAR_1} haben.\n" + .string "Hast du eines?\p" + .string "Würdest du es gegen mein {STR_VAR_2}\n" + .string "tauschen?$" FortreeCity_House1_Text_1856F7:: @ 81856F7 - .string "Thank you!\p" - .string "I’ll be good to your {STR_VAR_1},\n" - .string "so please be nice to my {STR_VAR_2}!$" + .string "Danke schön!\p" + .string "Ich werde gut zu deinem {STR_VAR_1}\n" + .string "sein, also sei auch gut zu meinem\l" + .string "{STR_VAR_2}!$" FortreeCity_House1_Text_185737:: @ 8185737 - .string "Wait!\n" - .string "That POKéMON isn’t a {STR_VAR_1}.\p" - .string "I guess you don’t want to trade\n" - .string "with me.$" + .string "Warte!\n" + .string "Das ist kein {STR_VAR_1}.\p" + .string "Ich glaube, du willst gar nicht mit mir\n" + .string "tauschen.$" FortreeCity_House1_Text_18577F:: @ 818577F - .string "Oh, okay. If you change your mind,\n" - .string "please come see me.\p" - .string "I’ll be waiting!$" + .string "Oh, okay. Wenn du es dir anders über-\n" + .string "legst, komm wieder vorbei.\p" + .string "Ich werde hier warten!$" FortreeCity_House1_Text_1857C7:: @ 81857C7 - .string "Thank you for trading with me!\p" - .string "I really wanted this POKéMON, so\n" - .string "I promise to take good care of it!$" + .string "Danke, dass du mit mir getauscht hast!\p" + .string "Dieses POKéMON habe ich mir schon lange\n" + .string "gewünscht. Bei mir wird’s ihm gut gehen!$" FortreeCity_House1_Text_18582A:: @ 818582A - .string "Trading POKéMON with others...\p" - .string "It’s as if you’re trading your own\n" - .string "memories with other people.$" + .string "Mit anderen sein POKéMON tauschen...\p" + .string "Das ist, als ob du die Erinnerungen mit\n" + .string "anderen Menschen teilst.$" FortreeCity_House1_Text_185888:: @ 8185888 - .string "ZIGZAGOON: Gumomoh?$" + .string "ZIGZACHS: Gumomoh?$" diff --git a/data/text/maps/FortreeCity_House2.inc b/data/text/maps/FortreeCity_House2.inc index 8b78e1ae8..c257d6c5b 100644 --- a/data/text/maps/FortreeCity_House2.inc +++ b/data/text/maps/FortreeCity_House2.inc @@ -1,45 +1,45 @@ FortreeCity_House2_Text_186306:: @ 8186306 - .string "People... POKéMON...\p" - .string "Their hidden powers are aroused by\n" - .string "living in natural environments...$" + .string "Menschen... POKéMON...\p" + .string "Ihre versteckten Kräfte werden durch\n" + .string "das Leben in der Natur geweckt.$" FortreeCity_House2_Text_186360:: @ 8186360 - .string "Let this old woman see if your hidden\n" - .string "power has awoken...\p" - .string "I hold a coin in my hand.\p" - .string "Now, tell me, have I palmed it in the\n" - .string "right hand? Or in the left?$" + .string "Lass diese alte Frau mal sehen, ob deine\n" + .string "versteckten Kräfte erwacht sind...\p" + .string "Ich halte eine Münze in meiner Hand.\p" + .string "Nun? In welcher Hand halte ich sie?\n" + .string "In der linken oder rechten Hand?$" FortreeCity_House2_Text_1863F6:: @ 81863F6 - .string "Oh! Yes, correct!\p" - .string "We shall try again.\p" - .string "In which hand have I palmed the coin?\n" - .string "The right or left?$" + .string "Oh! Das stimmt!\p" + .string "Versuchen wir es noch einmal.\p" + .string "In welcher Hand halte ich die Münze?\n" + .string "Rechts oder links?$" FortreeCity_House2_Text_186455:: @ 8186455 - .string "Oh! Yes, correct again!\p" - .string "We shall try once more.\p" - .string "In which hand have I palmed the coin?\n" - .string "The right or left? Choose!$" + .string "Oh! Schon wieder richtig!\p" + .string "Probieren wir es noch einmal.\p" + .string "In welcher Hand ist die Münze nun?\n" + .string "In der linken oder der rechten Hand?$" FortreeCity_House2_Text_1864C6:: @ 81864C6 - .string "Oh! Splendid!\n" - .string "Your hidden power has awoken!\p" - .string "Here, take this and awaken the hidden\n" - .string "power of your POKéMON.$" + .string "Oh! Hervorragend!\n" + .string "Deine versteckten Kräfte sind erwacht!\p" + .string "Hier, das ist für dich. Wecke damit die\n" + .string "versteckten Kräfte deiner POKéMON.$" FortreeCity_House2_Text_18652F:: @ 818652F - .string "HIDDEN POWER is a move that changes\n" - .string "with the POKéMON.$" + .string "KRAFTRESERVE ist eine Attacke, die je\n" + .string "nach POKéMON anders aussieht.$" FortreeCity_House2_Text_186565:: @ 8186565 - .string "No, too bad.\n" - .string "You guessed wrong.$" + .string "Och, zu schade!\n" + .string "Du hast falsch geraten.$" UnknownString_8186585: @ 8186585 - .string "The area around FORTREE CITY is like\n" - .string "a jungle.\p" - .string "It gets awfully tiring walking around\n" - .string "this city.\p" - .string "That’s why I use FLY to instantly go to\n" - .string "any city I’ve visited.$" + .string "Das Gebiet um BAUMHAUSEN CITY\n" + .string "ist wie ein Dschungel.\p" + .string "Man ermüdet schnell, wenn man alles\n" + .string "erkunden will.\p" + .string "Deshalb benutze ich FLIEGEN, um von\n" + .string "einem Ort zum anderen zu kommen.$" diff --git a/data/text/maps/FortreeCity_House3.inc b/data/text/maps/FortreeCity_House3.inc index 6b0b254f6..8370d6692 100644 --- a/data/text/maps/FortreeCity_House3.inc +++ b/data/text/maps/FortreeCity_House3.inc @@ -1,17 +1,18 @@ FortreeCity_House3_Text_186624:: @ 8186624 - .string "Speaking of POKéDEXES, I remembered\n" - .string "something.\p" - .string "I met this TRAINER, STEVEN, when\n" - .string "I was searching for rare stones.\p" - .string "Hoo, boy, he had some amazing POKéMON\n" - .string "with him.\p" - .string "They weren’t just rare, they were\n" - .string "trained to terrifying extremes!\p" - .string "He might even be stronger than the\n" - .string "GYM LEADER in this town...$" + .string "Da wir gerade vom POKéDEX reden... Ich\n" + .string "erinnere mich...\p" + .string "Ich habe diesen TRAINER, TROY,\n" + .string "getroffen, als ich seltene Steine\l" + .string "suchte.\p" + .string "Oh Junge, der hatte vielleicht\n" + .string "interessante POKéMON bei sich!\p" + .string "Die waren nicht nur selten, sondern\n" + .string "auch ausgesprochen gut trainiert!\p" + .string "Er ist bestimmt stärker als die ARENA-\n" + .string "LEITERIN in diesem Ort...$" FortreeCity_House3_Text_186745:: @ 8186745 - .string "What’s that thing you have there?\p" + .string "Was ist das da? Was hast du da?\p" .string "... ... ... ... ... ...\p" - .string "Oh, it’s called a POKéDEX?\n" - .string "It’s really awesome!$" + .string "Oh, das ist also ein POKéDEX?\n" + .string "Der ist aber wirklich klasse!$" diff --git a/data/text/maps/FortreeCity_House4.inc b/data/text/maps/FortreeCity_House4.inc index 9389ec4aa..c1491ae96 100644 --- a/data/text/maps/FortreeCity_House4.inc +++ b/data/text/maps/FortreeCity_House4.inc @@ -1,30 +1,30 @@ FortreeCity_House4_Text_1867AF:: @ 81867AF - .string "By being together with POKéMON,\n" - .string "people make more and more friends.\p" - .string "And that brings the world closer\n" - .string "together. I think it’s wonderful!$" + .string "Wenn sie mit POKéMON zusammen sind,\n" + .string "finden die Menschen schnell Freunde.\p" + .string "Und so rücken die Menschen weltweit\n" + .string "näher zusammen. Wunderbar, nicht wahr?$" FortreeCity_House4_Text_186835:: @ 8186835 - .string "There!\n" - .string "Go, BIRD POKéMON!$" + .string "Fertig!\n" + .string "Los, VOGEL-POKéMON!$" FortreeCity_House4_Text_18684E:: @ 818684E - .string "Heheh, I asked my WINGULL to run an\n" - .string "errand for me.$" + .string "Hähähä, mein WINGULL macht\n" + .string "Besorgungen für mich.$" FortreeCity_House4_Text_186881:: @ 8186881 - .string "Good!\n" - .string "Welcome back, WINGULL!\p" - .string "Huh? What is this?\n" - .string "What is it holding?\p" - .string "A MENTAL HERB?\n" - .string "It must have picked it up somewhere.\p" - .string "But I’m not a TRAINER, so you can\n" - .string "have it.$" + .string "Gut!\n" + .string "Komm zurück, WINGULL!\p" + .string "Huch! Was ist das?\n" + .string "Was trägt es denn da?\p" + .string "Ein MENTALKRAUT?\n" + .string "Das muss es irgendwo gefunden haben.\p" + .string "Aber, ich bin kein TRAINER, daher kannst\n" + .string "du es haben.$" FortreeCity_House4_Text_186924:: @ 8186924 - .string "Thanks to my WINGULL, I have friends\n" - .string "who live far away.$" + .string "Dank meines WINGULL habe ich Freunde,\n" + .string "die sehr weit weg von hier wohnen.$" FortreeCity_House4_Text_18695C:: @ 818695C .string "WINGULL: Pihyoh!$" diff --git a/data/text/maps/FortreeCity_House5.inc b/data/text/maps/FortreeCity_House5.inc index 711b9579e..26c5b21ad 100644 --- a/data/text/maps/FortreeCity_House5.inc +++ b/data/text/maps/FortreeCity_House5.inc @@ -1,13 +1,14 @@ FortreeCity_House5_Text_18696D:: @ 818696D - .string "The tree houses of FORTREE are great!\p" - .string "I think it’s the number one town for\n" - .string "living together with POKéMON.$" + .string "Die Baumhäuser von BAUMHAUSEN\n" + .string "CITY sind fantastisch!\p" + .string "Ich glaube, es ist der beste Platz, um\n" + .string "mit seinen POKéMON zusammenzuleben.$" FortreeCity_House5_Text_1869D6:: @ 81869D6 - .string "POKéMON and people have adapted to\n" - .string "nature to survive.\p" - .string "There’s no need to make nature\n" - .string "conform to the way we want to live.$" + .string "POKéMON und Menschen sind auf die\n" + .string "Natur angewiesen, um zu überleben.\p" + .string "Es gibt überhaupt keinen Grund, die\n" + .string "Natur nach unserem Willen zu formen.$" FortreeCity_House5_Text_186A4F:: @ 8186A4F - .string "ZIGZAGOON: Bufuu!$" + .string "ZIGZACHS: Bufuu!$" diff --git a/data/text/maps/FortreeCity_Mart.inc b/data/text/maps/FortreeCity_Mart.inc index c8c2c4f0f..da371d141 100644 --- a/data/text/maps/FortreeCity_Mart.inc +++ b/data/text/maps/FortreeCity_Mart.inc @@ -1,15 +1,15 @@ FortreeCity_Mart_Text_1861EF:: @ 81861EF - .string "SUPER REPEL lasts a long time, and\n" - .string "it gets the job done.\p" - .string "It’s much better than an ordinary\n" - .string "REPEL.$" + .string "SUPERSCHUTZ hält lange an, und ist auch\n" + .string "äußerst nützlich.\p" + .string "Es ist viel besser als normaler SCHUTZ.$" FortreeCity_Mart_Text_186251:: @ 8186251 - .string "I always stock up on more items than\n" - .string "I’m sure I’ll need.\p" - .string "You never know what might happen.\n" - .string "Better to be safe than sorry!$" + .string "Ich horte immer mehr Items, als ich\n" + .string "eigentlich benötige.\p" + .string "Man weiß ja nie, was einem passieren\n" + .string "kann. Vorsicht ist die Mutter der\l" + .string "Porzellankiste!$" FortreeCity_Mart_Text_1862CA:: @ 81862CA - .string "A RARE CANDY makes a POKéMON grow\n" - .string "immediately by one level.$" + .string "Ein SONDERBONBON erhöht den Level\n" + .string "eines POKéMON sofort um 1.$" diff --git a/data/text/maps/FortreeCity_PokemonCenter_1F.inc b/data/text/maps/FortreeCity_PokemonCenter_1F.inc index d5ffb8a61..f38a010bc 100644 --- a/data/text/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/text/maps/FortreeCity_PokemonCenter_1F.inc @@ -1,22 +1,24 @@ FortreeCity_PokemonCenter_1F_Text_186027:: @ 8186027 - .string "Listen, kid, are you working\n" - .string "on a POKéDEX?\p" - .string "Hmm... Go to the SAFARI ZONE.\n" - .string "That’s my suggestion.$" + .string "Na, Kindchen, arbeitest du an einem\n" + .string "POKéDEX?\p" + .string "Hmm... Ich an deiner Stelle würde mal\n" + .string "die SAFARI-ZONE auf der ROUTE 121\l" + .string "besuchen.$" FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 - .string "Have you done anything at the\n" - .string "RECORD CORNER?\p" - .string "It’s pretty neat. It mixes and matches\n" - .string "the records of TRAINERS.\p" - .string "I don’t know quite how it works,\n" - .string "but it’s cool. It’s exciting, even!$" + .string "Hast du schon mal eine\n" + .string "STATISTIK GETAUSCHT?\p" + .string "Sehr nützliche Einrichtung! Die Erfolge\n" + .string "eines jeden TRAINERS werden dort\l" + .string "gespeichert und miteinander verglichen.\p" + .string "Ich weiß zwar nicht, wie das passiert,\n" + .string "aber es ist einfach irre. Und aufregend!$" FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 - .string "Hey, you’ve got a POKéNAV!\n" - .string "It’s the same as mine.\p" - .string "Check out the TRAINER’S EYES on it.\p" - .string "It shows you TRAINERS who want a\n" - .string "rematch with you.\p" - .string "Isn’t it great?\n" - .string "You have to hand it to DEVON!$" + .string "Hey, du hast einen POKéNAV!\n" + .string "Ich habe auch so einen.\p" + .string "Schau dir mal die TRAINER an.\p" + .string "Dort kannst du sehen, welche TRAINER\n" + .string "erneut gegen dich antreten möchten.\p" + .string "Ist das nicht einfach super?\n" + .string "Das muss man DEVON wirklich lassen!$" diff --git a/data/text/maps/GraniteCave_1F.inc b/data/text/maps/GraniteCave_1F.inc index 3344f76d9..16c943455 100644 --- a/data/text/maps/GraniteCave_1F.inc +++ b/data/text/maps/GraniteCave_1F.inc @@ -1,19 +1,19 @@ GraniteCave_1F_Text_194917:: @ 8194917 - .string "Hey, you.\n" - .string "It gets awfully dark ahead.\l" - .string "It’ll be tough trying to explore.\p" - .string "That guy who came by earlier...\n" - .string "STEVEN, I think it was.\p" - .string "He knew how to use FLASH, so he ought\n" - .string "to be all right, but...\p" - .string "Well, for us HIKERS, helping out those\n" - .string "that we meet is our motto.\p" - .string "Here you go, I’ll pass this on to you.$" + .string "Hey, du!\n" + .string "Hier ist es schrecklich dunkel.\l" + .string "Eine Erforschung wird damit schwierig.\p" + .string "Der Typ, der vorher schon mal hier war...\n" + .string "TROY heißt er, glaube ich...\p" + .string "Der weiß, wie man BLITZ einsetzt, daher\n" + .string "wird es ihm wohl gut gehen, aber...\p" + .string "Das Motto unter uns WANDERERN heißt:\n" + .string "Jedem aus der Klemme helfen.\p" + .string "Deshalb bekommst du dies von mir.$" GraniteCave_1F_Text_194A3E:: @ 8194A3E - .string "Teach that hidden move FLASH to a\n" - .string "POKéMON and use it.\p" - .string "It lights up even the inky darkness\n" - .string "of caves.\p" - .string "But, to use it, you need the GYM BADGE\n" - .string "from DEWFORD’s POKéMON GYM.$" + .string "Bringe einem POKéMON die VM BLITZ\n" + .string "bei und setze sie ein.\p" + .string "Damit wird selbst die dunkelste Höhle\n" + .string "von Licht erfüllt.\p" + .string "Aber um das zu können, brauchst du den\n" + .string "ORDEN der ARENA von FAUSTAUHAVEN.$" diff --git a/data/text/maps/GraniteCave_StevensRoom.inc b/data/text/maps/GraniteCave_StevensRoom.inc index 873acea22..19d4ac0ca 100644 --- a/data/text/maps/GraniteCave_StevensRoom.inc +++ b/data/text/maps/GraniteCave_StevensRoom.inc @@ -1,33 +1,33 @@ GraniteCave_StevensRoom_Text_194AE5:: @ 8194AE5 - .string "That device you have there...\n" - .string "It’s a POKéNAV.\p" - .string "When TRAINERS that have POKéNAVS\n" - .string "battle, it keeps a record of how\l" - .string "things went, I think.\p" - .string "Oh, pardon me.\n" - .string "My name is STEVEN.\p" - .string "I’m interested in rare stones, so\n" - .string "I travel here and there.\p" + .string "Dieses Ding, das du da trägst...\n" + .string "Das ist ein POKéNAV.\p" + .string "Wenn TRAINER, die einen POKéNAV be-\n" + .string "sitzen, gegeneinander kämpfen, wird das\l" + .string "Ergebnis hier gespeichert.\p" + .string "Oh, entschuldige. Ich habe mich gar\n" + .string "nicht vorgestellt. Mein Name ist TROY.\p" + .string "Ich sammle seltene Steine, daher gehe\n" + .string "ich immer mal wieder auf Reisen.\p" .string "Oh?\n" - .string "A LETTER for me?$" + .string "Ein BRIEF? Für mich?$" GraniteCave_StevensRoom_Text_194BDD:: @ 8194BDD - .string "STEVEN: Okay, thank you.\p" - .string "You went through all this trouble to\n" - .string "deliver that. I need to thank you.\p" - .string "Let me see...\n" - .string "I’ll give you this TM.\p" - .string "It contains my favorite move,\n" - .string "STEEL WING.$" + .string "TROY: Okay, danke schön.\p" + .string "Du hast all die Beschwerlichkeiten auf\n" + .string "dich genommen, um ihn mir zu bringen.\p" + .string "Ich muss mich bedanken. Ehrlich.\n" + .string "Ich werde dir diese TM geben.\p" + .string "Sie enthält meine Lieblingsattacke,\n" + .string "STAHLFLÜGEL.$" GraniteCave_StevensRoom_Text_194C8D:: @ 8194C8D - .string "STEVEN: Your POKéMON appear quite\n" - .string "capable.\p" - .string "If you keep training, you could even\n" - .string "become the CHAMPION of the POKéMON\l" - .string "LEAGUE one day. That’s what I think.\p" - .string "Now, I’ve got to hurry along.$" + .string "TROY: Deine POKéMON sehen recht\n" + .string "talentiert aus.\p" + .string "Wenn du fleißig trainierst, wirst du\n" + .string "vielleicht eines Tages der CHAMP der\l" + .string "POKéMON LIGA. Das ist meine Meinung.\p" + .string "Nun muss ich mich aber wirklich beeilen.$" GraniteCave_StevensRoom_Text_194D43:: @ 8194D43 - .string "Oh, your BAG is full...\n" - .string "That’s too bad, then.$" + .string "Oh, dein BEUTEL ist voll.\n" + .string "Das ist aber wirklich schade.$" diff --git a/data/text/maps/InsideOfTruck.inc b/data/text/maps/InsideOfTruck.inc index 19166c481..3c92c3cc0 100644 --- a/data/text/maps/InsideOfTruck.inc +++ b/data/text/maps/InsideOfTruck.inc @@ -1,4 +1,4 @@ InsideOfTruck_Text_198FAD:: @ 8198FAD - .string "The box is printed with a POKéMON logo.\p" - .string "It’s a POKéMON brand moving and\n" - .string "delivery service.$" + .string "Auf der Kiste ist ein POKéMON-Logo.\p" + .string "Es ist ein Umzugs- und Lieferservice\n" + .string "einer POKéMON-Firma.$" diff --git a/data/text/maps/JaggedPass.inc b/data/text/maps/JaggedPass.inc index 23216b12b..4411ff4f1 100644 --- a/data/text/maps/JaggedPass.inc +++ b/data/text/maps/JaggedPass.inc @@ -1,63 +1,69 @@ JaggedPass_Text_195DAC:: @ 8195DAC - .string "MT. CHIMNEY’s JAGGED PASS...\p" - .string "Now this is what I’ve always wanted\n" - .string "in a mountain.\p" - .string "This jagged bumpiness...\n" - .string "It rocks my soul!$" + .string "SCHLOTBERG STEILPASS...\p" + .string "Davon habe ich immer geträumt, wenn ich\n" + .string "in den Bergen unterwegs war.\p" + .string "Zerklüftete Massive...\n" + .string "Das bringt meine Seele zum Erbeben.$" JaggedPass_Text_195E27:: @ 8195E27 - .string "Losing left me bitter!$" + .string "Verlieren ist bitter.$" JaggedPass_Text_195E3E:: @ 8195E3E - .string "Yes, I did lose at POKéMON...\p" - .string "But, when it comes to the love of\n" - .string "the mountains, I have you beat!$" + .string "Ja, ich bin im Umgang mit POKéMON nicht\n" + .string "gerade talentiert.\p" + .string "Aber wenn es um die Leidenschaft für\n" + .string "die Berge geht, stecke ich dich locker\l" + .string "in die Tasche!$" JaggedPass_Text_195E9E:: @ 8195E9E - .string "This place isn’t your casual hike.\n" - .string "It’s not suited for a picnic.$" + .string "Dich habe ich hier noch nie gesehen.\n" + .string "Dieser Platz eignet sich nicht für ein\l" + .string "Picknick.$" JaggedPass_Text_195EDF:: @ 8195EDF - .string "Ohhh, no!\n" - .string "The ground is too bumpy...$" + .string "Oooh, nein!\n" + .string "Das liegt am Boden. Er ist zu uneben!$" JaggedPass_Text_195F04:: @ 8195F04 - .string "Did you know?\p" - .string "Some people cleverly ride their\n" - .string "bicycles up this horribly bumpy pass.$" + .string "Stell dir mal vor!\p" + .string "Einige fahren tatsächlich mit ihren\n" + .string "Fahrrädern diesen zerklüfteten Pass\l" + .string "hinauf.$" JaggedPass_Text_195F58:: @ 8195F58 - .string "Picnics are fun wherever you go.\n" - .string "Just like POKéMON!$" + .string "Picknicke machen überall und immer Spaß.\n" + .string "Und PKMN leisten mir dabei Gesellschaft!$" JaggedPass_Text_195F8C:: @ 8195F8C - .string "I only lost because the ground is\n" - .string "too bumpy!$" + .string "Ich habe nur verloren, weil der Boden\n" + .string "wirklich sehr uneben ist.$" JaggedPass_Text_195FB9:: @ 8195FB9 - .string "I’ll forget about losing and just\n" - .string "enjoy this bumpy hike.$" + .string "Ich werde meine Niederlage einfach\n" + .string "vergessen und mit dem Rad den Pass\l" + .string "entlangdüsen.$" JaggedPass_Text_195FF2:: @ 8195FF2 - .string "JAGGED PASS is hard to walk on.\n" - .string "It’s a good place for training.$" + .string "Der STEILPASS ist sehr schwer zu Fuß\n" + .string "zu meistern. Aber ein guter Ort zum\l" + .string "Trainieren.$" JaggedPass_Text_196032:: @ 8196032 - .string "It was all over while we were still\n" - .string "trying to find a good footing...$" + .string "Schon vorbei? Ich habe überhaupt\n" + .string "keinen sicheren Stand gehabt.$" JaggedPass_Text_196077:: @ 8196077 - .string "If I had an ACRO BIKE, I’d be able to\n" - .string "jump ledges.$" + .string "Wenn ich ein KUNSTRAD hätte, könnte\n" + .string "ich die Abhänge einfach überspringen.$" JaggedPass_Text_1960AA:: @ 81960AA - .string "I got used to this bumpiness.\n" - .string "I sing while I climb now.$" + .string "Ich habe mich an die Unebenheiten ge-\n" + .string "wöhnt. Ich singe beim Klettern.$" JaggedPass_Text_1960E2:: @ 81960E2 - .string "It’s still not easy to battle on this\n" - .string "bumpy ground...$" + .string "Auf diesem unebenen Boden ist es wirk-\n" + .string "lich nicht leicht, gut zu kämpfen.$" JaggedPass_Text_196118:: @ 8196118 - .string "I should get an ACRO BIKE from RYDEL\n" - .string "in MAUVILLE CITY...$" + .string "Ich sollte mir ein KUNSTRAD von RADLA\n" + .string "in MALVENFROH CITY besorgen...$" diff --git a/data/text/maps/LavaridgeTown.inc b/data/text/maps/LavaridgeTown.inc index 308548510..3fa8668e5 100644 --- a/data/text/maps/LavaridgeTown.inc +++ b/data/text/maps/LavaridgeTown.inc @@ -1,129 +1,138 @@ LavaridgeTown_Text_16BDA4:: @ 816BDA4 - .string "MAY: {PLAYER}{KUN}! Long time no see!\p" - .string "Oh? While I was visiting the hot springs,\n" - .string "you got the LAVARIDGE GYM BADGE.\p" - .string "You must have caught good POKéMON...\n" - .string "No, I guess you raised some.\p" - .string "I guess it would be okay for you to\n" - .string "have this.$" + .string "MAIKE: {PLAYER}{KUN}! Wir haben uns lange\n" + .string "nicht gesehen!\p" + .string "Oh? Als ich die Heißen Quellen aufge-\n" + .string "sucht habe, habe ich den ORDEN der\p" + .string "ARENA von BAD LAVASTADT erhalten.\n" + .string "Du hast anscheinend viele POKéMON\p" + .string "gefangen... Äh, ich meine, du hast ja\n" + .string "schon einige POKéMON aufgezogen. \p" + .string "Ich denke, das hier wirst du gut\n" + .string "gebrauchen können.$" LavaridgeTown_Text_16BE7D:: @ 816BE7D - .string "MAY: With those GO-GOGGLES, you’ll\n" - .string "have no trouble getting through the\l" - .string "desert near ROUTE 111.\p" - .string "But, wow, {PLAYER}{KUN}...\n" - .string "Challenging GYMS...\p" - .string "You’re trying hard because you don’t\n" - .string "want to lose to me, I bet!\p" - .string "{PLAYER}{KUN}, I think I should challenge\n" - .string "your dad in PETALBURG GYM.\p" - .string "{PLAYER}{KUN}, see you again!$" + .string "MAIKE: Mit diesem WÜSTENGLAS wirst du\n" + .string "keine Probleme haben, durch die Wüste in\l" + .string "der Nähe von ROUTE 111 zu gehen.\p" + .string "Aber, wow, {PLAYER}{KUN}...\n" + .string "In ARENEN antreten...\p" + .string "Du strengst dich bestimmt sehr an, weil\n" + .string "du nicht gegen mich verlieren willst!\p" + .string "{PLAYER}{KUN}, ich glaube, ich sollte deinen\n" + .string "Vater in der ARENA von BLÜTENBURG\l" + .string "CITY herausfordern.\p" + .string "{PLAYER}{KUN}, man sieht sich!$" LavaridgeTown_Text_16BF92:: @ 816BF92 - .string "BRENDAN: {PLAYER}, hey, it’s been a while.\n" - .string "How’s it going?\p" - .string "Hmm...\n" - .string "That’s a decent collection of BADGES.\p" - .string "All right, then.\n" - .string "You may as well have this.$" + .string "BRIX: {PLAYER}, wie geht es dir?\p" + .string "Hmm... Das ist eine beachtliche\n" + .string "Sammlung von ORDEN.\p" + .string "Also gut.\n" + .string "Hier, dies schenke ich dir.$" LavaridgeTown_Text_16C020:: @ 816C020 - .string "BRENDAN: Keep those with you if you’re\n" - .string "planning on going into that desert near\l" - .string "ROUTE 111.\p" - .string "There should be some POKéMON that\n" - .string "are exclusively desert-dwellers.\l" - .string "You might look around for those.\p" - .string "As for me...\n" - .string "I’m considering challenging NORMAN,\l" - .string "the GYM LEADER of PETALBURG.\p" - .string "Unlike you, {PLAYER}, your dad looks like\n" - .string "he really is tough.\p" - .string "See you around!$" + .string "BRIX: Nimm das mit, wenn du in die\n" + .string "Wüste in der Nähe von ROUTE 111 willst.\p" + .string "Da sollten sich einige POKéMON fangen\n" + .string "lassen, die Wüstenbewohner sind. Schau\l" + .string "dich nach ihnen um.\p" + .string "Und ich...\n" + .string "Ich werde wohl NORMAN, den ARENALEITER\l" + .string "in BLÜTENBURG CITY herausfordern.\p" + .string "Im Gegensatz zu dir, macht dein Vater\n" + .string "einen sehr starken Eindruck.\p" + .string "Man sieht sich!$" LavaridgeTown_Text_16C174:: @ 816C174 - .string "I have here an EGG.\p" - .string "I’d hoped to hatch it by covering it in\n" - .string "hot sand by the hot springs.\l" - .string "But that doesn’t seem to be enough...\p" - .string "I’ve heard it would be best if it were\n" - .string "kept together with POKéMON and\l" - .string "carried about.\p" - .string "You are a TRAINER, yes?\n" - .string "And your POKéMON radiate vitality.\p" - .string "So, what say you?\n" - .string "Will you take this EGG to hatch?$" + .string "Ich habe hier ein EI.\p" + .string "Ich dachte, ich könnte es ausbrüten,\n" + .string "indem ich es in den heißen Sand bei den\p" + .string "Heißen Quellen vergrabe. Aber das reicht\n" + .string "offensichtlich nicht aus.\p" + .string "Jemand erzählte mir, dass man es\n" + .string "zusammen mit den POKéMON tragen\l" + .string "soll.\p" + .string "Du bist ein TRAINER, nicht wahr? Und\n" + .string "deine POKéMON strahlen Vitalität aus.\p" + .string "So, was meinst du? Wirst du das EI mit-\n" + .string "nehmen und zum Ausschlüpfen bringen?$" LavaridgeTown_Text_16C2B6:: @ 816C2B6 - .string "Good! I hope you’ll walk plenty with\n" - .string "this here EGG!$" + .string "Gut! Ich hoffe, du hast mehr Glück\n" + .string "mit diesem EI!$" LavaridgeTown_Text_16C2EA:: @ 816C2EA - .string "{PLAYER} received the EGG.$" + .string "{PLAYER} erhält ein EI.$" LavaridgeTown_Text_16C2FF:: @ 816C2FF - .string "Oh? You’ve too many POKéMON.\n" - .string "There’s no room for this EGG...$" + .string "Oh! Du hast zu viele POKéMON dabei.\n" + .string "Du hast keinen Platz für das EI...$" LavaridgeTown_Text_16C33C:: @ 816C33C - .string "As you wish, then...\p" - .string "If you have a change of heart about\n" - .string "hatching this EGG, I will be here.$" + .string "Ganz, wie du willst...\p" + .string "Wenn dein Herz sich anders entscheidet\n" + .string "und das EI haben möchte, ich bin hier.$" LavaridgeTown_Text_16C398:: @ 816C398 - .string "Every so often, an EGG will be found at\n" - .string "the POKéMON DAY CARE.\p" - .string "Or at least that’s how the rumor goes.$" + .string "Von Zeit zu Zeit findet man in der\n" + .string "PENSION ein EI.\p" + .string "So zumindest erzählt man es sich.$" LavaridgeTown_Text_16C3FD:: @ 816C3FD - .string "We draw as much hot water as we need,\n" - .string "and yet the hot springs never run dry.\p" - .string "Isn’t it magical?\p" - .string "These hot springs appear near active\n" - .string "volcanoes. Veins of water under the\l" - .string "ground are heated by magma to well up\l" - .string "as hot springs.$" + .string "Wir nehmen uns so viel heißes Wasser,\n" + .string "wie wir brauchen, und trotzdem trocknen\l" + .string "die Heißen Quellen nicht aus.\p" + .string "Ist das nicht schon fast Magie?\p" + .string "Diese Heißen Quellen bilden sich in der\n" + .string "Nähe von aktiven Vulkanen. Wasseradern\l" + .string "im Boden werden durch das Magma\l" + .string "erhitzt und kommen als heiße Quellen\l" + .string "an die Erdoberfläche.$" LavaridgeTown_Text_16C4DB:: @ 816C4DB - .string "Being buried in this hot sand is...\n" - .string "Sigh...\p" - .string "So warm and heavenly...\p" - .string "Eh? Gyaah! Ouch!\p" - .string "A POKéMON nipped my backside!$" + .string "Hier im heißen Sand vergraben zu sein,\n" + .string "ist... Seufz...\p" + .string "So warm und einfach himmlisch... Seufz...\p" + .string "Äh? Gyaah! Aua!\p" + .string "Ein POKéMON hat meinen Rücken ange-\n" + .string "knabbert!$" LavaridgeTown_Text_16C54E:: @ 816C54E - .string "Oh, you like hot springs, do you?\p" - .string "That’s surprising for one as young\n" - .string "as you.$" + .string "Ach, du magst auch heiße Quellen?\p" + .string "Das ist überraschend bei einem so\n" + .string "jungen Menschen wie dir.$" LavaridgeTown_Text_16C59B:: @ 816C59B - .string "I bathe in the hot springs every day.\p" - .string "I want to become a beautiful and strong\n" - .string "GYM LEADER like FLANNERY.$" + .string "Ich bade jeden Tag in den\n" + .string "Heißen Quellen.\p" + .string "Ich will ein wunderschöner und starker\n" + .string "ARENALEITER wie FLAVIA werden.$" LavaridgeTown_Text_16C603:: @ 816C603 - .string "If people put POKéMON in hot springs,\n" - .string "it might be seriously strange.\p" - .string "Why, it might be an electric bath, or\n" - .string "a bubble bath, or even a lava bath...$" + .string "Wenn Leute ihre POKéMON in die Heißen\n" + .string "Quellen setzen, ist das schon\l" + .string "merkwürdig.\p" + .string "Nun, es könnte auch ein Bad in\n" + .string "Elektrizität, ein Schaumbad oder sogar\l" + .string "ein Bad in Lava sein...$" LavaridgeTown_Text_16C694:: @ 816C694 - .string "They’re claiming that these hot springs\n" - .string "are good for calming nervous tension,\l" - .string "relieving aching muscles, solving\l" - .string "romantic problems, and attracting\l" - .string "money...$" + .string "Man sagt, diese Heißen Quellen seien gut\n" + .string "gegen nervöse Anspannungen, gegen\l" + .string "Muskelkrämpfe, sie sollen bei roman-\l" + .string "tischen Problemen helfen und auch bei\l" + .string "Geldsorgen...$" LavaridgeTown_Text_16C72F:: @ 816C72F - .string "LAVARIDGE TOWN\p" - .string "“POKéMON CENTER HOT SPRINGS\n" - .string "An excellent place for relaxing!”$" + .string "BAD LAVASTADT\p" + .string "“POKéMON-CENTER - HEISSE QUELLEN\n" + .string "Der ideale Ort zum Entspannen!”$" LavaridgeTown_Text_16C77C:: @ 816C77C - .string "LAVARIDGE TOWN POKéMON GYM\n" - .string "LEADER: FLANNERY\l" - .string "“One with a fiery passion that burns!”$" + .string "POKéMON ARENA von BAD LAVASTADT\n" + .string "LEITERIN: FLAVIA\l" + .string "“Die mit der brennenden Leidenschaft!”$" LavaridgeTown_Text_16C7CF:: @ 816C7CF - .string "POKéMON HERB SHOP\n" - .string "“Bitter taste - better cure!”$" + .string "POKéMON KRÄUTERLADEN\n" + .string "“Bitterer Geschmack - Bessere Kur!”$" diff --git a/data/text/maps/LavaridgeTown_Gym_1F.inc b/data/text/maps/LavaridgeTown_Gym_1F.inc index 87ec05632..cb2eca809 100644 --- a/data/text/maps/LavaridgeTown_Gym_1F.inc +++ b/data/text/maps/LavaridgeTown_Gym_1F.inc @@ -1,140 +1,144 @@ LavaridgeTown_Gym_1F_Text_176312:: @ 8176312 - .string "Hey, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "LAVARIDGE’s GYM LEADER FLANNERY\n" - .string "uses FIRE-type POKéMON.\p" - .string "Her passion for POKéMON burns stronger\n" - .string "and hotter than a volcano.\p" - .string "Don’t get too close to her - you’ll burn!\n" - .string "Hose her down with water and then\l" - .string "go for it!$" + .string "Na, wie sieht es aus, auf dem Weg zum\n" + .string "CHAMP, {PLAYER}?\p" + .string "Die ARENALEITERIN von BAD LAVA-\n" + .string "STADT, FLAVIA, setzt FEUER-POKéMON\l" + .string "ein.\p" + .string "Ihre Leidenschaft für POKéMON brennt\n" + .string "heißer und stärker als ein Vulkan.\p" + .string "Komm ihr nicht zu nahe - du verbrennst\n" + .string "dich! Lösche die Glut mit Wasser und\l" + .string "dann besiege sie!$" LavaridgeTown_Gym_1F_Text_17640C:: @ 817640C - .string "Yow! That was a scorching hot battle!$" + .string "Hui! Das war ein glühend heißer Kampf!$" LavaridgeTown_Gym_1F_Text_176432:: @ 8176432 - .string "Owowowowow!\n" - .string "Yikes, it’s hot!$" + .string "Auauauauau!\n" + .string "Hach, ist das heiß!$" LavaridgeTown_Gym_1F_Text_17644F:: @ 817644F - .string "I’m blinded by sweat in my eyes...$" + .string "Der Schweiß lief mir in die Augen...$" LavaridgeTown_Gym_1F_Text_176472:: @ 8176472 - .string "Being buried in hot sand promotes\n" - .string "circulation.\p" - .string "It’s effective for healing pain in\n" - .string "your joints.$" + .string "Ein Bad im heißen Sand regt den\n" + .string "Kreislauf an.\p" + .string "Auch Gelenkschmerzen lassen sich damit\n" + .string "kurieren.$" LavaridgeTown_Gym_1F_Text_1764D1:: @ 81764D1 - .string "I’m trying to relieve my stress.\n" - .string "Don’t come along and stress me out!$" + .string "Ich versuche, Stress abzubauen.\n" + .string "Komm her. Ich will mich abreagieren.$" LavaridgeTown_Gym_1F_Text_176516:: @ 8176516 - .string "I hope FLANNERY flames you good!$" + .string "Ich hoffe, FLAVIA wird dich rösten!$" LavaridgeTown_Gym_1F_Text_176537:: @ 8176537 - .string "Haaah... Whew...\p" - .string "If you spend too much time buried in\n" - .string "hot sand, it tuckers you out...$" + .string "Haaah... Huuuuh...\p" + .string "Bleibt man zu lange im heißen Sand,\n" + .string "macht einen das ganz schön fertig.$" LavaridgeTown_Gym_1F_Text_17658D:: @ 817658D - .string "You must be getting tired by now.\n" - .string "You’d like to rest in the hot sand,\l" - .string "wouldn’t you?\p" - .string "But you should know that maintaining\n" - .string "your willpower is an important ability\l" - .string "for all TRAINERS.$" + .string "Du musst ganz schön müde sein.\n" + .string "Willst du dich nicht hier im heißen\l" + .string "Sand ausruhen?\p" + .string "Aber du solltest wissen, dass\n" + .string "Willenskraft ganz wichtig für einen\l" + .string "TRAINER ist.$" LavaridgeTown_Gym_1F_Text_17663F:: @ 817663F - .string "Play with fire, and be burned...$" + .string "Spiele mit Feuer und du verbrennst dich.$" LavaridgeTown_Gym_1F_Text_176660:: @ 8176660 - .string "Your skill is real...\n" - .string "But our LEADER FLANNERY is strong.\p" - .string "If you don’t watch yourself, you’ll be\n" - .string "burned seriously.$" + .string "Dein Können ist gut... Aber unsere\n" + .string "LEITERIN FLAVIA ist stark.\p" + .string "Wenn du nicht aufpasst, verbrennst\n" + .string "du dich ernsthaft.$" LavaridgeTown_Gym_1F_Text_1766D2:: @ 81766D2 - .string "Can your POKéMON withstand\n" - .string "392-degree heat?$" + .string "Kann dein POKéMON 200 Grad aushalten?$" LavaridgeTown_Gym_1F_Text_1766FE:: @ 81766FE - .string "It didn’t burn hotly enough...$" + .string "Die Hitze war nicht stark genug...$" LavaridgeTown_Gym_1F_Text_17671D:: @ 817671D - .string "The temperature of magma is\n" - .string "392 degrees.\p" - .string "Your POKéMON beat me, so they should\n" - .string "easily survive in magma.$" + .string "Die Temperatur von Magma beträgt\n" + .string "über 200 Grad.\p" + .string "Deine POKéMON haben mich besiegt, sie\n" + .string "sollten auch in Magma überleben können.$" LavaridgeTown_Gym_1F_Text_176784:: @ 8176784 - .string "Um...\n" - .string "Okay, I’ll battle with you.$" + .string "Ähm...\n" + .string "Okay, ich kämpfe mit dir.$" LavaridgeTown_Gym_1F_Text_1767A6:: @ 81767A6 - .string "Oh, but you’re too strong.$" + .string "Oh, du bist zu stark.$" LavaridgeTown_Gym_1F_Text_1767C1:: @ 81767C1 - .string "I’m going to be a pretty and strong\n" - .string "TRAINER just like FLANNERY.$" + .string "Ich will einmal so eine starke TRAINERIN\n" + .string "werden wie FLAVIA.$" LavaridgeTown_Gym_1F_Text_176801:: @ 8176801 - .string "Welcome... No, wait.\p" - .string "Puny TRAINER, how good to see you’ve\n" - .string "made it here!\p" - .string "I have been entrusted with the...\n" - .string "No, wait.\p" - .string "I am FLANNERY, and I’m the GYM\n" - .string "LEADER here!\p" - .string "Uh...\n" - .string "Dare not underestimate me, though\l" - .string "I have been LEADER only a short time!\p" - .string "With skills inherited from my grand-\n" - .string "father, I shall, uh...demonstrate the\l" - .string "hot moves we have honed on this land!$" + .string "Willkommen... Halt, warte!\p" + .string "Hallo, du Winzling von TRAINER, wie\n" + .string "schön, dich hier zu sehen!\p" + .string "Ich bin verantwortlich für, äh...\n" + .string "Nein, warte.\p" + .string "Ich bin FLAVIA und ich bin die ARENA-\n" + .string "LEITERIN hier!\p" + .string "Äh... Du solltest mich nicht\n" + .string "unterschätzen, nur weil ich noch nicht\l" + .string "so lange LEITERIN bin!\p" + .string "Ich habe das Talent meines Großvaters\n" + .string "geerbt und daher... äh... kann ich dir die\l" + .string "heißen Attacken zeigen, die wir hier\l" + .string "entwickelt haben!$" LavaridgeTown_Gym_1F_Text_176960:: @ 8176960 - .string "Oh...\n" - .string "I guess I was trying too hard...\p" - .string "I... I’ve only recently become a GYM\n" - .string "LEADER.\p" - .string "I tried too hard to be someone I’m not.\p" - .string "I have to do things my natural way.\n" - .string "If I don’t, my POKéMON will be confused.\p" - .string "Thanks for teaching me that.\n" - .string "For that, you deserve this.$" + .string "Äh...\n" + .string "Ich glaube, ich habe es übertrieben...\p" + .string "Ich... Ich bin ja auch noch nicht lange\n" + .string "ARENALEITERIN!\p" + .string "Ich habe zu sehr versucht, jemand zu\n" + .string "sein, der ich gar nicht bin.\p" + .string "Ich muss die Dinge auf meine eigene Art\n" + .string "angehen. Sonst verwirre ich nur meine\l" + .string "POKéMON.\p" + .string "Danke, dass du mich das gelehrt hast!\n" + .string "Du hast dir das hier wohl verdient!$" LavaridgeTown_Gym_1F_Text_176A62:: @ 8176A62 - .string "{PLAYER} received the HEAT BADGE\n" - .string "from FLANNERY.$" + .string "{PLAYER} erhält den HITZEORDEN\n" + .string "von FLAVIA.$" LavaridgeTown_Gym_1F_Text_176A8C:: @ 8176A8C - .string "If you have a HEAT BADGE, all POKéMON\n" - .string "up to Level 50, even those you get in\l" - .string "trades from other people, will obey\l" - .string "you completely.\p" - .string "And, it lets POKéMON use the HM move\n" - .string "STRENGTH outside of battle.\p" - .string "This is a token of my appreciation.\n" - .string "Don’t be shy about taking it!$" + .string "Mit dem HITZEORDEN gehorchen dir alle\n" + .string "POKéMON bis Level 50, auch die, die du\l" + .string "durch Tausch erhalten hast.\p" + .string "Und du kannst ab sofort STÄRKE auch\n" + .string "außerhalb eines Kampfes einsetzen.\p" + .string "Dies ist das Zeichen meiner\n" + .string "Anerkennung. Nimm es ruhig an!$" LavaridgeTown_Gym_1F_Text_176B8F:: @ 8176B8F - .string "That TM50 contains OVERHEAT.\p" - .string "That move inflicts serious damage on\n" - .string "the opponent.\p" - .string "But it also sharply cuts the SP. ATK\n" - .string "of the POKéMON using it. It might not\l" - .string "be suitable for longer battles.$" + .string "Die TM50 enthält HITZEKOLLER.\p" + .string "Diese Attacke richtet beim Gegner\n" + .string "großen Schaden an.\p" + .string "Aber gleichzeitig wird der SP. ANG.\n" + .string "des POKéMON, das die Attacke\p" + .string "anwendet, herabgesetzt. Für längere\n" + .string "Kämpfe ist sie daher nicht geeignet.$" LavaridgeTown_Gym_1F_Text_176C4A:: @ 8176C4A - .string "Your power reminds me of someone...\p" - .string "Oh! I know! You battle like NORMAN,\n" - .string "the GYM LEADER of PETALBURG.$" + .string "Deine Stärke erinnert mich an\n" + .string "jemanden...\p" + .string "Jetzt weiß ich’s! Du kämpfst wie NORMAN,\n" + .string "der ARENALEITER von BLÜTENBURG CITY.$" LavaridgeTown_Gym_1F_Text_176CAF:: @ 8176CAF - .string "LAVARIDGE TOWN POKéMON GYM$" + .string "POKéMON ARENA von BAD LAVASTADT$" LavaridgeTown_Gym_1F_Text_176CCA:: @ 8176CCA - .string "LAVARIDGE TOWN POKéMON GYM\p" - .string "FLANNERY’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von BAD LAVASTADT\p" + .string "FLAVIAS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/LavaridgeTown_HerbShop.inc b/data/text/maps/LavaridgeTown_HerbShop.inc index 893d3399f..612d4e9a4 100644 --- a/data/text/maps/LavaridgeTown_HerbShop.inc +++ b/data/text/maps/LavaridgeTown_HerbShop.inc @@ -1,22 +1,21 @@ LavaridgeTown_HerbShop_Text_17615C:: @ 817615C - .string "Welcome to the HERB SHOP, home of\n" - .string "effective and inexpensive medicine!$" + .string "Willkommen im KRÄUTERLADEN! Dem Heim\n" + .string "wirkungsvoller und preiswerter Medizin!$" LavaridgeTown_HerbShop_Text_1761A2:: @ 81761A2 - .string "You’ve come to look at herbal medicine\n" - .string "in LAVARIDGE?\p" - .string "That’s rather commendable.\p" - .string "I like you! Take this!$" + .string "Du kommst nach BAD LAVASTADT, um\n" + .string "Kräutermedizin zu kaufen?\p" + .string "Das ist lobenswert!\p" + .string "Ich finde dich nett! Hier, für dich!$" LavaridgeTown_HerbShop_Text_176209:: @ 8176209 - .string "That CHARCOAL I gave you, it’s used\n" - .string "for making herbal medicine.\p" - .string "It also does wonders when held by\n" - .string "a POKéMON.\p" - .string "It intensifies the power of FIRE-type\n" - .string "moves.$" + .string "Mit dieser HOLZKOHLE wird die Kräuter-\n" + .string "medizin hergestellt.\p" + .string "Sie wirkt auch Wunder, wenn sie von\n" + .string "einem POKéMON getragen wird.\p" + .string "Sie verstärkt FEUER-Attacken.$" LavaridgeTown_HerbShop_Text_1762A3:: @ 81762A3 - .string "Herbal medicine works impressively well.\n" - .string "But your POKéMON will dislike you for it.\l" - .string "It must be horribly bitter!$" + .string "Kräutermedizin ist erstaunlich\n" + .string "wirkungsvoll. Aber deine POKéMON mögen\l" + .string "sie nicht. Sie schmeckt bitter...$" diff --git a/data/text/maps/LavaridgeTown_House.inc b/data/text/maps/LavaridgeTown_House.inc index 9710d9398..6a6a3663c 100644 --- a/data/text/maps/LavaridgeTown_House.inc +++ b/data/text/maps/LavaridgeTown_House.inc @@ -1,8 +1,9 @@ LavaridgeTown_House_Text_176D07:: @ 8176D07 - .string "My wife’s warming an EGG in the hot\n" - .string "springs. This is what she told me.\p" - .string "She left two POKéMON with the DAY CARE.\n" - .string "And they discovered that EGG!$" + .string "Meine Frau wärmt ein EI in den Heißen\n" + .string "Quellen. So hat sie es mir jedenfalls\l" + .string "gesagt.\p" + .string "Sie hat zwei POKéMON in der PENSION\n" + .string "abgegeben und heraus kam ein EI...$" LavaridgeTown_House_Text_176D94:: @ 8176D94 - .string "ZIGZAGOON: Pshoo!$" + .string "ZIGZACHS: Pshoo!$" diff --git a/data/text/maps/LavaridgeTown_Mart.inc b/data/text/maps/LavaridgeTown_Mart.inc index db79bd321..fc957492c 100644 --- a/data/text/maps/LavaridgeTown_Mart.inc +++ b/data/text/maps/LavaridgeTown_Mart.inc @@ -1,10 +1,12 @@ LavaridgeTown_Mart_Text_176DA6:: @ 8176DA6 - .string "Use X SPEED to add to a POKéMON’s\n" - .string "SPEED in battle.\p" - .string "That will help it get in the first\n" - .string "strike - a decided advantage!$" + .string "Mit X-TEMPO kannst du die INITIATIVE\n" + .string "im Kampf erhöhen.\p" + .string "So kann man eventuell den ersten\n" + .string "Angriff ausführen - ein entscheidender\l" + .string "Vorteil!$" LavaridgeTown_Mart_Text_176E1A:: @ 8176E1A - .string "On MT. CHIMNEY’s peak, there’s a local\n" - .string "specialty that you can buy only there.\p" - .string "Give it to a POKéMON - it will be elated.$" + .string "Auf dem Gipfel des SCHLOTBERGS wird\n" + .string "eine lokale Spezialität angeboten.\p" + .string "Gib sie einem POKéMON und es wird\n" + .string "begeistert sein.$" diff --git a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc index c66d6df8a..e0425c1ee 100644 --- a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -1,17 +1,18 @@ LavaridgeTown_PokemonCenter_1F_Text_176E92:: @ 8176E92 - .string "I think POKéMON get closer to their\n" - .string "TRAINERS if they spend time together.\p" - .string "The longer the better.\n" - .string "That’s what I think.$" + .string "Ich denke, die POKéMON fühlen sich\n" + .string "ihrem TRAINER mehr verbunden, wenn sie\l" + .string "viel Zeit miteinander verbringen.\p" + .string "Je länger, desto besser.\n" + .string "Das ist meine Meinung.$" LavaridgeTown_PokemonCenter_1F_Text_176F08:: @ 8176F08 - .string "I gave a RED {POKEBLOCK} to my POKéMON.\n" - .string "It looks a lot cooler all of a sudden.\p" - .string "Hmm...\n" - .string "Maybe I ought to eat a RED {POKEBLOCK}.$" + .string "Ich habe meinem POKéMON einen {POKEBLOCK}\n" + .string "ROT gegeben. Seitdem ist es cooler.\p" + .string "Hmm... Vielleicht sollte ich auch einen\n" + .string "{POKEBLOCK} ROT essen...$" LavaridgeTown_PokemonCenter_1F_Text_176F7A:: @ 8176F7A - .string "Hohoho! Hey, kid, you can reach\n" - .string "the hot springs from here.\p" - .string "If POKéMON are getting rest, so too\n" - .string "should their TRAINERS.$" + .string "Hohoho! Hey, Kindchen, du kannst von\n" + .string "hier die Heißen Quellen erreichen.\p" + .string "Wenn POKéMON ausruhen, sollten sich\n" + .string "ihre TRAINER auch ausruhen.$" diff --git a/data/text/maps/LilycoveCity.inc b/data/text/maps/LilycoveCity.inc index 0f9b45c1d..eb11d39b5 100644 --- a/data/text/maps/LilycoveCity.inc +++ b/data/text/maps/LilycoveCity.inc @@ -1,301 +1,313 @@ LilycoveCity_Text_1679BF:: @ 81679BF - .string "MAY: Oh, hey?\n" - .string "{PLAYER}{KUN}, are you shopping, too?\p" - .string "I bought a whole bunch of DOLLS and\n" - .string "POSTERS.\p" - .string "Of course, I’ve also caught a lot of\n" - .string "POKéMON, and I’m raising them\l" - .string "properly, too.\p" - .string "Actually, I’m more worried if you’re\n" - .string "raising POKéMON properly, {PLAYER}{KUN}.\p" - .string "I’ll battle with you, so you can show\n" - .string "me your POKéMON, {PLAYER}{KUN}.$" + .string "MAIKE: Oh, hey?\n" + .string "{PLAYER}{KUN}, bist du auch am Einkaufen?\p" + .string "Ich habe eine Menge PUPPEN und POSTER\n" + .string "gekauft.\p" + .string "Natürlich habe ich auch POKéMON\n" + .string "gefangen und die ziehe ich geradezu\l" + .string "vorbildlich auf.\p" + .string "Ich habe eher Bedenken, dass du dich um\n" + .string "deine POKéMON nicht richtig kümmerst.\p" + .string "Ich werde gegen dich kämpfen, dann\n" + .string "sehe ich, ob du sie gut behandelst.$" LilycoveCity_Text_167AEB:: @ 8167AEB - .string "MAY: Oh, why? {PLAYER}{KUN}, haven’t you\n" - .string "been raising your POKéMON?\p" - .string "That’s not a very good showing as a\n" - .string "TRAINER...$" + .string "MAIKE: Oh, hui. Hast du dich denn nicht\n" + .string "um deine POKéMON gekümmert, {PLAYER}{KUN}?\p" + .string "Als Trainer machst du wirklich keinen\n" + .string "guten Eindruck!$" LilycoveCity_Text_167B55:: @ 8167B55 - .string "MAY: Come on, battle with me, so I can\n" - .string "check out your POKéMON!$" + .string "MAIKE: Komm, kämpfe mit mir, dann kann\n" + .string "ich deine POKéMON beurteilen.$" LilycoveCity_Text_167B94:: @ 8167B94 - .string "MAY: The POKéMON I raised won’t be\n" - .string "beaten by your POKéMON, {PLAYER}{KUN}!$" + .string "MAIKE: Die POKéMON, die ich aufgezogen\n" + .string "habe, sind mit Sicherheit unbesiegbar.$" LilycoveCity_Text_167BD5:: @ 8167BD5 .string "... ... ... ... ... ... ... ...\p" - .string "I remember the battle I had with you,\n" - .string "{PLAYER}{KUN}, on ROUTE 103.\p" - .string "That battle helped you become this\n" - .string "strong, {PLAYER}{KUN}, didn’t it?$" + .string "Ich kann mich noch gut an unseren\n" + .string "Kampf auf der ROUTE 103 erinnern,\l" + .string "{PLAYER}{KUN}.\p" + .string "Dieser Kampf hat dir enorm geholfen,\n" + .string "stärker zu werden, oder?$" LilycoveCity_Text_167C6B:: @ 8167C6B - .string "MAY: I’m thinking of going back to\n" - .string "LITTLEROOT soon.\p" - .string "I’ve caught a decent group of POKéMON,\n" - .string "and my POKéDEX is coming along, so\l" - .string "I’m going home to show my dad.$" + .string "MAIKE: Ich überlege, ob ich bald nach\n" + .string "WURZELHEIM zurückgehe.\p" + .string "Ich habe eine anständige Gruppe von\n" + .string "POKéMON gefangen und mein POKéDEX\p" + .string "sieht immer besser aus. Ich gehe nach\n" + .string "Hause und zeige das meinem Papa.$" LilycoveCity_Text_167D08:: @ 8167D08 - .string "{PLAYER}{KUN}, what are you going to do?\p" - .string "Collect all the GYM BADGES and take\n" - .string "the POKéMON LEAGUE challenge?\p" - .string "Well, while you’re collecting BADGES,\n" - .string "{PLAYER}{KUN}, I’m going to work on my\l" - .string "POKéDEX. I’ll complete it before you!\p" - .string "See you!$" + .string "{PLAYER}{KUN}, was wirst du machen?\p" + .string "Alle ORDEN der ARENEN sammeln und die\n" + .string "POKéMON LIGA herausfordern?\p" + .string "Nun, während du deine ORDEN sammelst,\n" + .string "werde ich weiter an meinem POKéDEX\l" + .string "arbeiten. Ich werde ihn eher vollständig\l" + .string "haben als du, wetten?\p" + .string "Bis dann!$" LilycoveCity_Text_167DDD:: @ 8167DDD - .string "{PLAYER}{KUN}, what are you going to do?\p" - .string "Are you taking the POKéMON LEAGUE\n" - .string "challenge?\p" - .string "Or, are you going to complete your\n" - .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" - .string "See you!$" + .string "Und, {PLAYER}{KUN}, was wirst du machen?\p" + .string "Wirst du die POKéMON LIGA heraus-\n" + .string "fordern?\p" + .string "Oder wirst du deinen POKéDEX vervoll-\n" + .string "ständigen?\p" + .string "Ich habe gegen dich verloren, aber den\n" + .string "POKéDEX werde ich eher vollständig\l" + .string "haben als du!!\p" + .string "Man sieht sich!$" LilycoveCity_Text_167EAA:: @ 8167EAA - .string "{PLAYER}{KUN}, what are you going to do?\p" - .string "Are you taking the BATTLE TOWER\n" - .string "challenge?\p" - .string "Or, are you going to complete your\n" - .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" - .string "See you!$" + .string "Und, {PLAYER}{KUN}, was wirst du machen?\p" + .string "Wirst du im DUELLTURM antreten?\p" + .string "Oder wirst du deinen POKéDEX vervoll-\n" + .string "ständigen?\p" + .string "Ich habe gegen dich verloren, aber den\n" + .string "POKéDEX werde ich eher vollständig\l" + .string "haben als du!\p" + .string "Man sieht sich!$" LilycoveCity_Text_167F75:: @ 8167F75 - .string "BRENDAN: Oh, hey, it’s {PLAYER}.\p" - .string "I’m running an errand for my dad.\n" - .string "No, I’m not buying any DOLLS.\p" - .string "Anyways, it’s been a while.\p" - .string "Want to have a battle to see who’s been\n" - .string "raising POKéMON better?$" + .string "BRIX: Oh, du bist es, {PLAYER}.\p" + .string "Ich mache Besorgungen für meinen\n" + .string "Vater. Nein, ich kaufe keine PUPPEN!\p" + .string "Wir haben uns lange nicht mehr gesehen.\p" + .string "Sollen wir kämpfen, um zu sehen, wer\n" + .string "seine POKéMON besser trainiert?$" LilycoveCity_Text_16802C:: @ 816802C - .string "BRENDAN: Oh, what’s the matter?\n" - .string "Don’t have the confidence?$" + .string "BRIX: Oh, hast du ein Problem? Nicht\n" + .string "genügend Selbstbewusstsein, was?$" LilycoveCity_Text_168067:: @ 8168067 - .string "BRENDAN: Want to battle to see who’s\n" - .string "been raising POKéMON better?$" + .string "BRIX: Sollen wir kämpfen, um zu\n" + .string "sehen, wer seine POKéMON besser\l" + .string "trainiert?$" LilycoveCity_Text_1680A9:: @ 81680A9 - .string "BRENDAN: Aww, but you know I’m not\n" - .string "going to lose to no {PLAYER}.$" + .string "BRIX: Aah, ich werde doch nicht\n" + .string "gegen {PLAYER} verlieren! Niemals!$" LilycoveCity_Text_1680E4:: @ 81680E4 - .string "Humph...\n" - .string "You’ve done a lot of raising.\p" - .string "That stings a bit - I had a head start\n" - .string "on you as a TRAINER...$" + .string "Ach...\n" + .string "Du hast dich stark verbessert.\p" + .string "Das schmerzt - und dabei hatte ich als\n" + .string "TRAINER sogar einen Vorsprung...$" LilycoveCity_Text_168149:: @ 8168149 - .string "BRENDAN: I...\n" - .string "I plan on going home to LITTLEROOT.\p" - .string "You know I’m helping out my dad on his\n" - .string "POKéDEX. It’s coming together pretty\l" - .string "decently, so I should go show him.$" + .string "BRIX: Ich...\n" + .string "Ich gehe nach Hause, nach WURZELHEIM.\p" + .string "Weißt du, ich helfe meinem Vater bei dem\n" + .string "POKéDEX. Es geht ganz anständig voran\l" + .string "und ich sollte ihm das mal zeigen.$" LilycoveCity_Text_1681EA:: @ 81681EA - .string "{PLAYER}, what are you going to do?\p" - .string "Collect all the GYM BADGES and take\n" - .string "the POKéMON LEAGUE challenge?\p" - .string "Maybe I’ll do that, too...\p" - .string "Well, anyway, hang in there!$" + .string "Und, {PLAYER}, was wirst du tun?\p" + .string "Wirst du alle ORDEN der ARENEN sammeln\n" + .string "und die POKéMON LIGA herausfordern?\p" + .string "Vielleicht werde ich das auch machen...\p" + .string "Gut, bleib am Ball!$" LilycoveCity_Text_168282:: @ 8168282 - .string "{PLAYER}, what are you going to do?\p" - .string "Since you’re that strong, are you\n" - .string "taking the POKéMON LEAGUE challenge?\p" - .string "Heh, even me - if I trained my POKéMON\n" - .string "a bit more, I should be stronger than\l" - .string "you, {PLAYER}.\p" - .string "Well, anyway, hang in there!$" + .string "Und, {PLAYER}, was wirst du tun?\p" + .string "Da du so stark geworden bist, wirst du\n" + .string "die POKéMON LIGA herausfordern?\p" + .string "Hey, ich habe meine POKéMON bestimmt\n" + .string "viel besser trainiert und sollte\l" + .string "eigentlich stärker sein als du...\p" + .string "Nun ja, bleib am Ball!$" LilycoveCity_Text_16835A:: @ 816835A - .string "{PLAYER}, what are you going to do?\p" - .string "Since you’re that strong, are you\n" - .string "taking the BATTLE TOWER challenge?\p" - .string "Heh, even me - if I trained my POKéMON\n" - .string "a bit more, I should be stronger than\l" - .string "you, {PLAYER}.\l" - .string "Maybe I will go to the BATTLE TOWER.\p" - .string "Well, anyway, hang in there!$" + .string "Und, {PLAYER}, was machst du nun?\p" + .string "Da du so stark geworden bist, wirst du\n" + .string "zum DUELLTURM gehen?\p" + .string "Ich habe meine POKéMON viel besser\n" + .string "trainiert und sollte eigentlich stärker\l" + .string "sein als du...\l" + .string "Vielleicht gehe ich zum DUELLTURM...\p" + .string "Nun, bleib am Ball!$" LilycoveCity_Text_168455:: @ 8168455 - .string "Fufufu...\p" - .string "We moved more loot into our secret\n" - .string "HIDEOUT today...\p" - .string "Wh-who are you?!\n" - .string "I was just talking to myself!$" + .string "Hähähä...\p" + .string "Heute haben wir noch mehr Beute in\n" + .string "unser VERSTECK gebracht...\p" + .string "We...wer bist du denn??? Ich... äh, habe\n" + .string "mit mir selbst gesprochen!$" LilycoveCity_Text_1684C2:: @ 81684C2 - .string "I’m just a GRUNT, so I don’t know what\n" - .string "the BOSS is thinking...\p" - .string "But being on TEAM {EVIL_TEAM}, I know I’ll get\n" - .string "the chance to do big things!\p" - .string "Wh-who are you?!\n" - .string "I was just talking to myself!$" + .string "Ich bin nur ein RÜPEL, ich weiß nicht,\n" + .string "was unser BOSS so vorhat...\p" + .string "Aber als Mitglied vom TEAM {EVIL_TEAM} habe\n" + .string "ich die Möglichkeit, große Dinge zu tun!\p" + .string "Ww...wer bist du denn??? I-Ich... hähähä,\n" + .string "habe nur mit mir selber gesprochen!$" LilycoveCity_Text_168573:: @ 8168573 - .string "Hey, you!\p" - .string "Don’t go near the cave in the cove!\p" - .string "Why? You don’t need a reason why!\n" - .string "I’m an adult, so you just listen to me!$" + .string "Hey, du da!\p" + .string "Komm bloß nicht in die Nähe der Höhle in\n" + .string "der Bucht!\p" + .string "Warum nicht? Das geht dich nichts an!\n" + .string "Ich bin ein Erwachsener, also gehorche!$" LilycoveCity_Text_1685EB:: @ 81685EB - .string "If this whole wide world becomes ours,\n" - .string "TEAM {EVIL_TEAM}’s, it will be a happier\l" - .string "place for POKéMON, too.$" + .string "Wenn die ganze Welt erst einmal uns\n" + .string "gehört, dem TEAM {EVIL_TEAM}, dann wird sie\l" + .string "ein besserer Ort für POKéMON sein.$" LilycoveCity_Text_16864A:: @ 816864A - .string "There! WAILMER!\n" - .string "Leap out of the water now!$" + .string "Hier, WAILMER!!!\n" + .string "Springt aus dem Wasser!$" LilycoveCity_Text_168675:: @ 8168675 - .string "Hunh? What do you want?\p" - .string "You’re messing up our training, so can\n" - .string "you, like, get lost?$" + .string "Häh? Was willst du?\p" + .string "Du störst uns beim Training, also würde\n" + .string "ich vorschlagen, du verschwindest!$" LilycoveCity_Text_1686C9:: @ 81686C9 - .string "The POKéMON that come to this CONTEST\n" - .string "HALL are all prizewinners.\l" - .string "They come from all over the country.\p" - .string "My heart swells with excitement!$" + .string "Die POKéMON, die in diese WETTBEWERBS-\n" + .string "HALLE kommen, sind alle preisgekrönt.\l" + .string "Sie kommen aus dem ganzen Land.\p" + .string "Mein Herz strömt über vor Begeisterung!$" LilycoveCity_Text_168750:: @ 8168750 - .string "Have you seen that strange cave in\n" - .string "the cove at the edge of town?$" + .string "Hast du die seltsame Höhle in der Bucht\n" + .string "am Ende des Ortes gesehen?$" LilycoveCity_Text_168791:: @ 8168791 - .string "I’m going to teach my POKéMON some new\n" - .string "moves for entering a CONTEST.\p" - .string "So, I’m going to see the MOVE DELETER\n" - .string "and make it forget HM moves.$" + .string "Ich werde meinem POKéMON einige neue\n" + .string "Attacken für den WETTBEWERB\l" + .string "beibringen.\p" + .string "Daher werde ich den ATTACKEN-\n" + .string "VERLERNER besuchen, damit einige\l" + .string "VM verlernt werden.$" LilycoveCity_Text_168819:: @ 8168819 - .string "I came from KANTO.\p" - .string "The HOENN region is beautiful with\n" - .string "all its water and verdant nature.\p" - .string "Hunh? Wait a second...\p" - .string "Could there be rare POKéMON that live\n" - .string "only in this area?$" + .string "Ich komme aus KANTO.\p" + .string "Die HOENN-Region ist wunderschön mit\n" + .string "all dem Wasser und dem Grün.\p" + .string "Hey, warte mal!\p" + .string "Ob es seltene POKéMON gibt, die nur in\n" + .string "dieser Region leben???$" LilycoveCity_Text_1688C1:: @ 81688C1 - .string "TEAM {EVIL_TEAM}’s been training their\n" - .string "WAILMER in the cove.\p" - .string "We SAILORS can’t get our boats out\n" - .string "to sea with them in the way!$" + .string "TEAM {EVIL_TEAM} trainieren ihre WAILMER\n" + .string "drüben in der Bucht.\p" + .string "Wir MATROSEN können nicht auslaufen,\n" + .string "da sie uns im Weg sind.$" LilycoveCity_Text_168934:: @ 8168934 - .string "Ahoy, did you know?\p" - .string "Someone punted TEAM {EVIL_TEAM} out of the\n" - .string "way for us!\p" - .string "That got the WAILMER out of the cove,\n" - .string "so we can get our boats out again.$" + .string "Ahoi, hast du das mitbekommen?\p" + .string "Jemand hat für uns TEAM {EVIL_TEAM} aus\n" + .string "unserer Fahrrinne verjagt!\p" + .string "Die WAILMER befinden sich nicht mehr in\n" + .string "der Bucht und wir haben freie Fahrt.$" LilycoveCity_Text_1689BF:: @ 81689BF - .string "I was taking a relaxing snooze at the\n" - .string "seaside inn to the sound of waves...\p" - .string "When someone stole my POKéMON!\p" - .string "Who’s the abductor?\n" - .string "TEAM {EVIL_TEAM}? Is it TEAM {EVIL_TEAM}?$" + .string "Ich habe ein entspannendes Nickerchen\n" + .string "im Gasthof am Meer gehalten. Das\l" + .string "Rauschen der Wellen war so angenehm.\p" + .string "Und da hat mir jemand mein POKéMON\n" + .string "gestohlen!\p" + .string "Wer ist der schändliche Dieb?\n" + .string "TEAM {EVIL_TEAM}? Es war TEAM {EVIL_TEAM}?!?$" LilycoveCity_Text_168A55:: @ 8168A55 - .string "My missing POKéMON...\n" - .string "It came back without me noticing!$" + .string "Mein gestohlenes POKéMON...\n" + .string "Es kam zurück, ohne dass ich es merkte.$" LilycoveCity_Text_168A8D:: @ 8168A8D - .string "I’m an ART DEALER.\p" - .string "I am a buyer and seller of fine art,\n" - .string "especially paintings.\p" - .string "I’ve heard that the MUSEUM here has\n" - .string "magnificent works on exhibit...$" + .string "Ich bin ein KUNSTHÄNDLER.\p" + .string "Ich kaufe und verkaufe Kunstgegen-\n" + .string "stände. Vorzugsweise Gemälde.\p" + .string "Ich habe gehört, dass das hiesige\n" + .string "MUSEUM ständig erstklassige Werke\l" + .string "ausstellt.$" LilycoveCity_Text_168B1F:: @ 8168B1F - .string "Even as we grow old and wrinkled, the\n" - .string "sea remains forever young with the\l" - .string "vivid brilliance of life...\p" - .string "Fwohoho fwohohohoho...$" + .string "Auch wenn ich alt und grau werde, das\n" + .string "Meer wird immer jung und voll von Leben\l" + .string "sein...\p" + .string "Hahahahaha... Haaahahahaha...$" LilycoveCity_Text_168B9B:: @ 8168B9B - .string "It was sixty years ago that my husband\n" - .string "proposed to me here.\l" - .string "The sea remains as beautiful as ever.\p" - .string "Mufufufu mufufufufufu...$" + .string "Vor 60 Jahren hat mein Mann hier um\n" + .string "meine Hand angehalten. Und das Meer\l" + .string "ist immer noch genauso schön.\p" + .string "Hahahahaha... Haaahahahaha...$" LilycoveCity_Text_168C16:: @ 8168C16 - .string "Hm, you know of the peculiar cavern\n" - .string "in this cove?\p" - .string "That had been a natural formation, but\n" - .string "then that TEAM {EVIL_TEAM} lot came along\l" - .string "and made their renovations.\p" - .string "They call themselves the “nature-loving\n" + .string "Hm, kennst du diese besondere Höhle in\n" + .string "der Bucht?\p" + .string "Das ist eine natürlich Formation, aber\n" + .string "TEAM {EVIL_TEAM} kam und hat das Aussehen\l" + .string "verändert.\p" + .string "Sie nennen sich selber “Naturliebendes\n" .string "TEAM {EVIL_TEAM}”!\p" - .string "But what they do and what they say\n" - .string "don’t match at all!$" + .string "Aber was sie sagen und was sie tun,\n" + .string "passt überhaupt nicht zusammen!$" LilycoveCity_Text_168D15:: @ 8168D15 - .string "That cave in the cove...\n" - .string "It seems someone sealed the entrance,\l" - .string "so no one can enter it anymore.\p" - .string "That TEAM {EVIL_TEAM} lot, they must\n" - .string "have gone away for good.$" + .string "Die Höhle in der Bucht...\n" + .string "Jemand scheint den Eingang versiegelt\l" + .string "zu haben, niemand kommt hinein.\p" + .string "TEAM {EVIL_TEAM} muss verschwunden sein.$" LilycoveCity_Text_168DA9:: @ 8168DA9 - .string "LILYCOVE CITY\p" - .string "“Where the land ends and the\n" - .string "sea begins.”$" + .string "SEEGRASULB CITY\p" + .string "“Wo das Land endet und das\n" + .string "Meer beginnt.”$" LilycoveCity_Text_168DE1:: @ 8168DE1 - .string "POKéMON CONTESTS\n" - .string "MASTER RANK REGISTRATION\p" - .string "“Enter CONTESTS with your friends!”$" + .string "POKéMON WETTBEWERB\n" + .string "MASTER-KLASSE REGISTRIERUNGEN\p" + .string "“Nimm mit deinen FREUNDEN am\n" + .string "WETTBEWERB teil!”$" LilycoveCity_Text_168E2F:: @ 8168E2F - .string "COVE LILY MOTEL\p" - .string "“Remember us as COVE LILY of\n" - .string "LILYCOVE.”$" + .string "GRASSEE MOTEL\p" + .string "“Behalte uns als Rose der\n" + .string "SEEGRASULB CITY in Erinnerung.”$" LilycoveCity_Text_168E67:: @ 8168E67 - .string "LILYCOVE MUSEUM\p" - .string "“POKéMON Masterpiece Collection\n" - .string "on exhibit!”$" + .string "SEEGRASULB CITY MUSEUM\p" + .string "“Ausstellung von\n" + .string "POKéMON-Meisterwerken!”$" LilycoveCity_Text_168EA4:: @ 8168EA4 - .string "LILYCOVE MUSEUM\p" - .string "“{PLAYER}’s POKéMON Collection\n" - .string "on exhibit!”$" + .string "SEEGRASULB CITY MUSEUM\p" + .string "“Aktuelle Ausstellung:\n" + .string "Die POKéMON-Sammlung von {PLAYER}!”$" LilycoveCity_Text_168EDA:: @ 8168EDA - .string "LILYCOVE CITY HARBOR\p" - .string "“The ferry S.S. TIDAL is under\n" - .string "construction in SLATEPORT CITY.\p" - .string "“Service is scheduled to begin\n" - .string "shortly.”$" + .string "HAFEN SEEGRASULB CITY\p" + .string "“Die Fähre MS TIDE wird momentan\n" + .string "in der WERFT gebaut.\p" + .string "Die Fähre wird so bald wie möglich ihren\n" + .string "Dienst aufnehmen.”$" LilycoveCity_Text_168F57:: @ 8168F57 - .string "LILYCOVE CITY HARBOR\p" - .string "“Enjoy a delightful cruise on the\n" - .string "ferry S.S. TIDAL.”$" + .string "HAFEN SEEGRASULB CITY\p" + .string "“Genießen Sie die entspannende Fahrt\n" + .string "mit der Fähre MS TIDE.”$" LilycoveCity_Text_168FA1:: @ 8168FA1 - .string "POKéMON TRAINER FAN CLUB\p" - .string "The names of TRAINERS are scribbled\n" - .string "all over the sign...$" + .string "POKéMON TRAINER-FANCLUB\p" + .string "Die Namen von TRAINERN sind auf dem\n" + .string "Schild eingeritzt...$" LilycoveCity_Text_168FF3:: @ 8168FF3 - .string "LILYCOVE DEPARTMENT STORE\p" - .string "“Overflowing with great merchandise\n" - .string "and excitement!\p" - .string "“A great place to find that something\n" - .string "you need!”$" + .string "SEEGRASULB CITY EINKAUFSZENTRUM\p" + .string "“Ein Überfluss an Waren und\n" + .string "Überraschungen!\p" + .string "Ein Ort, an dem man alles findet, was\n" + .string "das Herz begehrt!”$" LilycoveCity_Text_169072:: @ 8169072 - .string "MOVE DELETER’S HOUSE\p" - .string "“Unwanted POKéMON moves deleted.”$" + .string "HAUS des ATTACKEN-VERLERNERS\p" + .string "“Hier werden POKéMON-Attacken\n" + .string "verlernt.”$" diff --git a/data/text/maps/LilycoveCity_ContestHall.inc b/data/text/maps/LilycoveCity_ContestHall.inc index 96507b770..11b422ec7 100644 --- a/data/text/maps/LilycoveCity_ContestHall.inc +++ b/data/text/maps/LilycoveCity_ContestHall.inc @@ -1,206 +1,222 @@ LilycoveCity_ContestHall_Text_1890D4:: @ 81890D4 - .string "This POKéMON won the BEAUTY CONTEST\n" - .string "here before.\p" - .string "Well, guess what? Today, I made it\n" - .string "win a SMARTNESS CONTEST!\p" - .string "My abilities scare even me...$" + .string "Dieses POKéMON hat den vorherigen\n" + .string "SCHÖNHEITSWETTBEWERB gewonnen.\p" + .string "Weißt du was? Heute werde ich den\n" + .string "KLUGHEITS-WETTBEWERB gewinnen!\p" + .string "Meine Fähigkeiten erstaunen sogar\n" + .string "mich...$" LilycoveCity_ContestHall_Text_18915F:: @ 818915F - .string "I’ve entered a bunch of CONTESTS,\n" - .string "so I’m seeing how things work.\p" - .string "If you’re in a COOLNESS CONTEST,\n" - .string "cool moves go over as appeals.\p" - .string "But smart moves and cute moves\n" - .string "don’t go over well, for instance.$" + .string "Ich habe einige WETTBEWERBE mitge-\n" + .string "macht, weil ich wissen wollte, wie\l" + .string "das so läuft.\p" + .string "Wenn du an einem COOLNESS-WETTBEWERB\n" + .string "teilnimmst, zählen coole Attacken.\p" + .string "Anmutige oder kluge Attacken sind\n" + .string "dagegen nicht so angesagt.$" LilycoveCity_ContestHall_Text_189221:: @ 8189221 - .string "That young man who won earlier had\n" - .string "a whole bunch of different {POKEBLOCK}S.\p" - .string "Can you win if you had that many\n" - .string "of those things?$" + .string "Der junge Mann, der vor kurzem hier ge-\n" + .string "wonnen hat, hatte viele verschiedene\l" + .string "{POKEBLOCK} bei sich.\p" + .string "Ob man gewinnt, wenn man genug dieser\n" + .string "Items dabei hat?$" LilycoveCity_ContestHall_Text_189299:: @ 8189299 - .string "Whoa, isn’t this place humongous!\p" - .string "The tension in the air... It’s not\n" - .string "like a CONTEST hall in the sticks.$" + .string "Wow, dieser Ort ist einfach riesig!\p" + .string "Diese Spannung in der Luft... Das ist\n" + .string "kein Vergleich zu einer WETTBEWERBS-\l" + .string "HALLE in der tiefsten Provinz.$" LilycoveCity_ContestHall_Text_189301:: @ 8189301 - .string "MC: Okay, SMART POKéMON and their\n" - .string "TRAINERS, are you ready?!\p" - .string "Give it your best showing!\n" - .string "Let’s appeal!$" + .string "MC: Okay, KLUGE POKéMON und TRAINER.\n" + .string "Seid ihr bereit?!?\p" + .string "Gebt euer Bestes!\n" + .string "Es geht um den Ausdruck!$" LilycoveCity_ContestHall_Text_189366:: @ 8189366 - .string "JUDGE: Are you enjoying this CONTEST?\p" - .string "Come back with three friends, and\n" - .string "all of you may enter a CONTEST!$" + .string "JUROR: Gefällt euch dieser\n" + .string "WETTBEWERB?\p" + .string "Komm mit drei Freunden wieder her,\n" + .string "dann könnt ihr alle gemeinsam am\l" + .string "WETTBEWERB teilnehmen.$" LilycoveCity_ContestHall_Text_1893CE:: @ 81893CE - .string "Ayayayay...\n" - .string "I entered the wrong CONTEST.\p" - .string "I entered this tough POKéMON in the\n" - .string "SMARTNESS CONTEST...\p" - .string "Come on, wow them with a smart-looking\n" - .string "ROCK SMASH.$" + .string "Eieieiei...\n" + .string "Ich habe am falschen WETTBEWERB teil-\l" + .string "genommen. Hach...\p" + .string "Ich habe dieses starke POKéMON in\n" + .string "einen KLUGHEITS-WETTBEWERB geschickt.\p" + .string "Los, beeindrucke mit einem\n" + .string "klugen ZERTRÜMMERER.$" LilycoveCity_ContestHall_Text_189463:: @ 8189463 - .string "I’ve spent many a year, and all my\n" - .string "wisdom besides, raising this POKéMON\l" - .string "to be smart.\p" - .string "It won’t be easily bested by some\n" - .string "young pup’s POKéMON.\p" - .string "My dear wife, are you seeing this?$" + .string "Ich habe viele Jahre und all meine\n" + .string "Weisheit gebraucht, um dieses POKéMON\l" + .string "klug zu machen.\p" + .string "Damit mache ich es den jungen Spunden\n" + .string "nicht leicht, mein POKéMON zu über-\l" + .string "trumpfen.\p" + .string "Mein holdes Weib, siehst du das?$" LilycoveCity_ContestHall_Text_189512:: @ 8189512 - .string "There it is!\p" - .string "If my POKéMON pulls a smart move next,\n" - .string "the audience’s excitement will peak!$" + .string "Das ist es!\p" + .string "Wenn mein POKéMON eine kluge Attacke\n" + .string "vorführt, wird das Publikum ausflippen\l" + .string "vor Begeisterung!$" LilycoveCity_ContestHall_Text_18956B:: @ 818956B - .string "Oh, dear, no!\p" - .string "My darling ZUBAT’s LEECH LIFE is so\n" - .string "cute I kept using it over and over!\p" - .string "But these mean people don’t appreciate\n" - .string "it at all!$" + .string "Oh, du liebe Güte, nein!\p" + .string "Der BLUTSAUGER meines ZUBAT ist\n" + .string "wirklich anmutig, daher setze ich ihn\l" + .string "immer wieder ein!\p" + .string "Aber diese gemeinen Leute wissen das\n" + .string "überhaupt nicht zu schätzen!$" LilycoveCity_ContestHall_Text_1895F3:: @ 81895F3 - .string "Kiyaaah! You’re beautiful, Grandpa!$" + .string "Kiaaayh! Du bist wunderbar, Opa!$" LilycoveCity_ContestHall_Text_189617:: @ 8189617 - .string "Even when TRAINERS enter the same\n" - .string "kind of POKéMON, they all seem to use\l" - .string "different moves for appeals.\p" - .string "It’s just like the way people have\n" - .string "different styles for battling.$" + .string "Selbst wenn die TRAINER die gleichen\n" + .string "POKéMON einsetzen, so führen sie doch\l" + .string "unterschiedliche Attacken vor.\p" + .string "Das ist so wie bei den Kämpfen: Jeder\n" + .string "hat seinen eigenen Stil.$" LilycoveCity_ContestHall_Text_1896BE:: @ 81896BE - .string "I think the POKéMON look smarter\n" - .string "than their TRAINERS. By a lot.$" + .string "Ich denke, die POKéMON machen einen\n" + .string "klügeren Eindruck als ihre TRAINER.$" LilycoveCity_ContestHall_Text_1896FE:: @ 81896FE - .string "When all’s said and done, I still love\n" - .string "SMARTNESS CONTESTS.\p" - .string "That intellectual green color...\n" - .string "It’s so... So... Cool.$" + .string "Jetzt, wo alles vorbei ist, liebe ich\n" + .string "KLUGHEITS-WETTBEWERBE noch immer.\p" + .string "Diese intellektuelle, grüne Farbe...\n" + .string "Das ist so... so... so cooool!$" LilycoveCity_ContestHall_Text_189771:: @ 8189771 - .string "MC: Are you entering the BEAUTY\n" - .string "CONTEST, too? Good luck!$" + .string "MC: Nimmst du auch am SCHÖNHEITS-\n" + .string "WETTBEWERB teil? Viel Glück!$" LilycoveCity_ContestHall_Text_1897AA:: @ 81897AA - .string "JUDGE: Ah, every POKéMON here is a\n" - .string "model of pristine beauty!\p" - .string "Why, I almost forgot to score them!$" + .string "JUROR: Ah, jedes POKéMON ist ein\n" + .string "Beispiel makelloser Schönheit!\p" + .string "Huch, fast hätte ich vergessen, sie zu\n" + .string "bewerten...$" LilycoveCity_ContestHall_Text_18980B:: @ 818980B - .string "A POKéMON this beautiful...\n" - .string "There isn’t another one like it.\p" - .string "Everyone’s eyes will be glued to\n" - .string "my beauty.$" + .string "Ein POKéMON von dieser Schönheit...\n" + .string "Es gibt keines wie dieses.\p" + .string "Jedem werden die Augen übergehen, wenn\n" + .string "er diese Schönheit betrachtet.$" LilycoveCity_ContestHall_Text_189874:: @ 8189874 - .string "Waaaah!\p" - .string "I brushed and groomed my POKéMON\n" - .string "carefully for this CONTEST...\p" - .string "But I overdid it...\n" - .string "My POKéMON’s coat turned all scraggly...\p" - .string "What should I do?$" + .string "Aaaaargh!\p" + .string "Ich habe mein POKéMON für diesen WETT-\n" + .string "BEWERB sorgfältig gebürstet und\l" + .string "gestriegelt.\p" + .string "Dabei habe ich wohl übertrieben...\n" + .string "Das Fell meines POKéMON ist nun ganz\l" + .string "voller Fusseln...\p" + .string "Was soll ich jetzt nur tun?$" LilycoveCity_ContestHall_Text_18990A:: @ 818990A - .string "This AURORA BEAM is so dazzling,\n" - .string "the JUDGE won’t be able to see it.\p" - .string "Uh, wait a second...\n" - .string "That’ll be meaningless, then!$" + .string "Der AURORASTRAHL ist eine so blendende\n" + .string "Erscheinung, dass der JUROR sie nicht\l" + .string "sehen wird.\p" + .string "Äh, einen Moment mal...\n" + .string "Dann ist sie ja völlig sinnlos...$" LilycoveCity_ContestHall_Text_189981:: @ 8189981 - .string "This pretty POKéMON looks just like\n" - .string "me when I was younger.\p" - .string "Right when I said that, my husband\n" - .string "spewed the coffee he was drinking.\p" - .string "Did I say something funny?$" + .string "Dieses hübsche POKéMON sieht genau\n" + .string "aus wie ich, als ich jünger war.\p" + .string "Als ich das zu meinem Mann sagte, hat er\n" + .string "den Kaffee, den er trank, ausgespuckt.\p" + .string "Was ist daran so lustig?$" LilycoveCity_ContestHall_Text_189A1D:: @ 8189A1D - .string "You know, as a woman, if I win at a\n" - .string "BEAUTY CONTEST, sure it makes me\l" - .string "happy. More than usual, anyway.$" + .string "Natürlich, als Frau wäre ich überglück-\n" + .string "lich, wenn ich den SCHÖNHEITS-\l" + .string "WETTBEWERB gewinnen würde.$" LilycoveCity_ContestHall_Text_189A82:: @ 8189A82 - .string "Wahahahah!\p" - .string "Will you take a gander at all those\n" - .string "pretty POKéMON!\l" - .string "I just love this sort of glitz!$" + .string "Ahahahahaha!\p" + .string "Wirf mal einen Blick auf all diese\n" + .string "schönen POKéMON!\l" + .string "Ich liebe diesen Liebreiz!$" LilycoveCity_ContestHall_Text_189AE1:: @ 8189AE1 - .string "You can’t always win on just beauty\n" - .string "alone.\p" - .string "You have to groom your POKéMON so\n" - .string "it’s nice and glossy like mine.$" + .string "Du kannst nicht immer nur aufgrund von\n" + .string "Schönheit gewinnen.\p" + .string "Du musst dein POKéMON striegeln, damit\n" + .string "es so schön und glänzend ist wie meines.$" LilycoveCity_ContestHall_Text_189B4E:: @ 8189B4E - .string "MC: Uh-oh! Hello!\n" - .string "We’re in the middle of a CONTEST!\p" - .string "Please enter at our registration\n" - .string "counter and come out, okay?$" + .string "MC: Oh oh! Hallo!\n" + .string "Wir sind mitten in einem WETTBEWERB!\p" + .string "Lass dich bitte zuerst am Schalter\n" + .string "registrieren und komm dann wieder, ja?$" LilycoveCity_ContestHall_Text_189BBF:: @ 8189BBF - .string "JUDGE: Oh, such charming and cute\n" - .string "appeals!\p" - .string "Oh, my goodness! What a perfectly\n" - .string "adorable WATER SPORT appeal!$" + .string "JUROR: Oh, was für reizende und\n" + .string "anmutige Ausdrücke!\p" + .string "Oh, meine Güte! Was für ein perfekter\n" + .string "NASSMACHER-Ausdruck!$" LilycoveCity_ContestHall_Text_189C29:: @ 8189C29 - .string "Oh, no... My sweet AZURILL was\n" - .string "distracted by another POKéMON.$" + .string "Oh, nein... Mein AZURILL wurde von\n" + .string "einem anderen POKéMON abgelenkt.$" LilycoveCity_ContestHall_Text_189C67:: @ 8189C67 - .string "My POKéMON has never won in a battle,\n" - .string "but put it in a CONTEST and look out!$" + .string "Mein POKéMON hat noch nie einen Kampf\n" + .string "gewonnen. Aber geh mit ihm in einen\l" + .string "WETTBEWERB und pass auf, was passiert.$" LilycoveCity_ContestHall_Text_189CB3:: @ 8189CB3 - .string "My POKéMON’s PETAL DANCE is a marvel\n" - .string "of elegance.\p" - .string "I won’t let anyone disturb its\n" - .string "performance.$" + .string "Der BLÄTTERTANZ meines POKéMON ist der\n" + .string "Inbegriff von Eleganz.\p" + .string "Ich lasse es nicht zu, dass irgend-\n" + .string "jemand es dabei stört.$" LilycoveCity_ContestHall_Text_189D11:: @ 8189D11 - .string "Everyone’s POKéMON are very cute.\p" - .string "However, if my POKéMON were to make\n" - .string "a cute appeal...\p" - .string "I’m sure that it would be so much \n" - .string "cuter than the others.$" + .string "All diese POKéMON sind anmutig.\p" + .string "Aber, wenn mein POKéMON einen\n" + .string "anmutigen Ausdruck vorführt...\p" + .string "Ich bin sicher, dass es dann anmutiger\n" + .string "als all die anderen POKéMON sein wird.$" LilycoveCity_ContestHall_Text_189DA2:: @ 8189DA2 - .string "My child is in this CONTEST.\p" - .string "Come on, dear. Go for it!\n" - .string "Your POKéMON is the best!$" + .string "Mein Kind nimmt an diesem WETTBEWERB\n" + .string "teil.\p" + .string "Los, mein Schatz! Zeig es ihnen!\n" + .string "Dein POKéMON ist das Beste!$" LilycoveCity_ContestHall_Text_189DF3:: @ 8189DF3 - .string "I think that girl over there is the\n" - .string "cutest of the lot.\p" - .string "What’s that? They’re judging\n" - .string "POKéMON by their looks?$" + .string "Ich finde, das Mädchen dort drüben ist\n" + .string "das anmutigste Geschöpf von allen.\p" + .string "Wie bitte? Sie bewerten die POKéMON\n" + .string "nach ihrer Anmut?!?$" LilycoveCity_ContestHall_Text_189E5F:: @ 8189E5F - .string "Ohh, seeing all these cute POKéMON,\n" - .string "they make we want to get my own!\p" - .string "I’m going to go catch some!$" + .string "Oooh, all diese anmutigen POKéMON!\n" + .string "Ich möchte auch gerne eines haben!\p" + .string "Ich werde mir jetzt eines fangen.$" UnknownString_8189EC0: @ 8189EC0 - .string "COOLNESS CONTEST STAGE\n" - .string "BE CHILLED BY COOL POKéMON!$" + .string "BÜHNE des COOLNESS-WETTBEWERBS\n" + .string "ERZITTERE VOR DEN COOLEN POKéMON!$" LilycoveCity_ContestHall_Text_189EF3:: @ 8189EF3 - .string "BEAUTY CONTEST STAGE\n" - .string "BE ALLURED BY BEAUTIFUL POKéMON!$" + .string "BÜHNE des SCHÖNHEITSWETTBEWERBS\n" + .string "SEI GEBLENDET VON SCHÖNEN POKéMON!$" LilycoveCity_ContestHall_Text_189F29:: @ 8189F29 - .string "CUTENESS CONTEST STAGE\n" - .string "BE CHARMED BY CUTE POKéMON!$" + .string "BÜHNE des ANMUT-WETTBEWERBS\n" + .string "SEI GEFESSELT VON ANMUTIGEN POKéMON!$" LilycoveCity_ContestHall_Text_189F5C:: @ 8189F5C - .string "SMARTNESS CONTEST STAGE\n" - .string "BE IMPRESSED BY SMART POKéMON!$" + .string "BÜHNE des KLUGHEITS-WETTBEWERBS\n" + .string "SEI BEEINDRUCKT VON KLUGEN POKéMON!$" UnknownString_8189F93: @ 8189F93 - .string "TOUGHNESS CONTEST STAGE\n" - .string "BE THRILLED BY TOUGH POKéMON!$" + .string "BÜHNE des STÄRKEWETTBEWERBS\n" + .string "FÜRCHTE DICH VOR STARKEN POKéMON!$" diff --git a/data/text/maps/LilycoveCity_ContestLobby.inc b/data/text/maps/LilycoveCity_ContestLobby.inc index d173519e8..aca01301b 100644 --- a/data/text/maps/LilycoveCity_ContestLobby.inc +++ b/data/text/maps/LilycoveCity_ContestLobby.inc @@ -1,186 +1,192 @@ LilycoveCity_ContestLobby_Text_18848C:: @ 818848C - .string "I only register four players for\n" - .string "POKéMON CONTESTS.\p" - .string "If three other players link up, all\n" - .string "four may enter the same CONTEST.\p" - .string "Would you like to take part?$" + .string "Nur vier Spieler können sich für den\n" + .string "POKéMON WETTBEWERB registrieren.\p" + .string "Wenn die anderen drei Spieler via\n" + .string "Link hinzukommen, können alle\l" + .string "an dem gleichen WETTBEWERB teilnehmen.\p" + .string "Möchtest du auch teilnehmen?$" LilycoveCity_ContestLobby_Text_188521:: @ 8188521 - .string "Before entering a CONTEST, your\n" - .string "progress will be saved.$" + .string "Bevor du an einem WETTBEWERB teil-\n" + .string "nimmst, wird dein Spiel gespeichert.$" FallarborTown_ContestLobby_Text_188559:: @ 8188559 LilycoveCity_ContestLobby_Text_188559:: @ 8188559 - .string "We hope you will participate another\n" - .string "time.$" + .string "Wir hoffen, du nimmst ein anderes Mal\n" + .string "teil.$" LilycoveCity_ContestLobby_Text_188584:: @ 8188584 - .string "Would you like to enter a CONTEST?$" + .string "Möchtest du am WETTBEWERB teilnehmen?$" LilycoveCity_ContestLobby_Text_1885A7:: @ 81885A7 - .string "When four players are ready, connect\n" - .string "over a Game Link cable, and register\l" - .string "with me, please.\p" - .string "Please choose the same CONTEST\n" - .string "as your fellow contestants.\p" - .string "The CONTEST begins as soon as all\n" - .string "players register their entry.\p" - .string "After that, the usual CONTEST rules\n" - .string "apply.$" + .string "Wenn die vier Spieler bereit sind,\n" + .string "verbindet euch via Verbindungskabel\l" + .string "und registriert euch bitte bei mir.\p" + .string "Bitte wähle den gleichen WETTBEWERB\n" + .string "wie deine vier Mitspieler.\p" + .string "Der WETTBEWERB beginnt, sobald \n" + .string "alle Spieler registriert wurden.\p" + .string "Danach werden die üblichen Regeln\n" + .string "des WETTBEWERBS erklärt.$" UnknownString_81886A8: @ 81886A8 - .string "Once you have linked up, please choose\n" - .string "the CONTEST.$" + .string "Sobald ihr per Link verbunden seid,\n" + .string "wählt bitte den WETTBEWERB aus.$" LilycoveCity_ContestLobby_Text_1886DC:: @ 81886DC - .string "Which CONTEST would you like to enter?$" + .string "An welchem WETTBEWERB möchtest du\n" + .string "teilnehmen?$" LilycoveCity_ContestLobby_Text_188703:: @ 8188703 - .string "Which POKéMON would you like to enter?$" + .string "Welches POKéMON soll teilnehmen?$" LilycoveCity_ContestLobby_Text_18872A:: @ 818872A - .string "Transmitting...$" + .string "Übertragung... $" LilycoveCity_ContestLobby_Text_18873A:: @ 818873A - .string "Transmission error...$" + .string "Übertragungsfehler.$" LilycoveCity_ContestLobby_Text_188750:: @ 8188750 - .string "You may have chosen a different\n" - .string "CONTEST than another player.$" + .string "Du hast wohl einen anderen WETTBEWERB\n" + .string "gewählt als ein anderer Teilnehmer.$" LilycoveCity_ContestLobby_Text_18878D:: @ 818878D - .string "You may have made a different\n" - .string "choice than another player.$" + .string "Du hast wohl eine andere Entscheidung\n" + .string "getroffen als ein anderer Teilnehmer.$" LilycoveCity_ContestLobby_Text_1887C7:: @ 81887C7 - .string "Please wait.\n" - .string "Press the B Button to cancel...$" + .string "Bitte warten.\n" + .string "Drücke den B-Knopf, um abzubrechen...$" LilycoveCity_ContestLobby_Text_1887F4:: @ 81887F4 - .string "We hope you will participate\n" - .string "another time.$" + .string "Wir hoffen, du nimmst ein anderes Mal\n" + .string "teil.$" LilycoveCity_ContestLobby_Text_18881F:: @ 818881F - .string "Transmission error.\n" - .string "Please try again.$" + .string "Übertragungsfehler.\n" + .string "Bitte versuche es erneut.$" LilycoveCity_ContestLobby_Text_188845:: @ 8188845 - .string "Your POKéMON will be entered in\n" - .string "the CONTEST.\p" - .string "Your POKéMON is Entry No. {STR_VAR_2}.$" + .string "Dein POKéMON wird an dem WETTBEWERB\n" + .string "teilnehmen.\p" + .string "Dein POKéMON hat die Nummer {STR_VAR_2}.$" UnknownString_8188890: @ 8188890 - .string "Entry No. {STR_VAR_2} is assigned this color\n" - .string "for this CONTEST.$" + .string "Nummer {STR_VAR_2} hat diese Farbe für\n" + .string "den WETTBEWERB zugewiesen bekommen.$" LilycoveCity_ContestLobby_Text_1888C6:: @ 81888C6 - .string "The CONTEST will begin shortly.$" + .string "Der WETTBEWERB wird bald beginnen.$" UnknownString_81888E6: @ 81888E6 - .string "Please come through this way.\n" - .string "Good luck!$" + .string "Bitte hier entlang.\n" + .string "Viel Glück!$" LilycoveCity_ContestLobby_Text_18890F:: @ 818890F - .string "Congratulations!\p" - .string "I did a painting of your POKéMON to\n" - .string "commemorate its victory...\p" - .string "Well, your POKéMON’s appeals were\n" - .string "so fantastic, it spurred me into\l" - .string "painting better than I usually do.\l" - .string "Look, see?$" + .string "Herzlichen Glückwunsch!\p" + .string "Ich habe dein POKéMON gezeichnet, zum\n" + .string "Andenken an seinen Sieg...\p" + .string "Nun, der Auftritt deines POKéMON war so\n" + .string "fantastisch, dass er mich zu einer\l" + .string "künstlerischen Hochleistung anspornte.\l" + .string "Siehst du?$" UnknownString_81889D0: @ 81889D0 - .string "The screen switches to display the\n" - .string "painting.$" + .string "Das Gemälde wird auf den Bildschirm\n" + .string "gerufen.$" LilycoveCity_ContestLobby_Text_1889FD:: @ 81889FD - .string "What do you think? I’m confident in\n" - .string "what I’ve done, but do you like it?\p" - .string "A work of this caliber, it wouldn’t look\n" - .string "out of place in an art museum.\p" - .string "Huh? An art museum really is looking\n" - .string "for paintings?\p" - .string "Do you think I should take this there?$" + .string "Was meinst du? Ich bin mit meiner Arbeit\n" + .string "zufrieden, aber gefällt sie auch dir?\p" + .string "Eine Arbeit dieses Formats würde sich\n" + .string "bestimmt gut in einem Museum machen.\p" + .string "Ach? Es gibt ein Museum, das nach neuen\n" + .string "Gemälden sucht?\p" + .string "Meinst du, ich sollte das Bild anbieten?$" LilycoveCity_ContestLobby_Text_188AE8:: @ 8188AE8 - .string "What, really? Then, sure, I will take\n" - .string "this painting there right now.\p" - .string "I’ll give it a proper title, too.\p" - .string "I hope they’ll like it and consider\n" - .string "exhibiting this.\p" - .string "Please check if they did accept this.\n" - .string "Thank you!$" + .string "Nein, wirklich? Dann werde ich das Bild\n" + .string "natürlich sofort dort hinbringen.\p" + .string "Ich werde ihm einen angemessenen Titel\n" + .string "geben.\p" + .string "Ich hoffe, es gefällt ihnen, und sie\n" + .string "werden es ausstellen.\p" + .string "Bitte, schau es dir mal an, wenn sie es\n" + .string "ausgestellt haben. Vielen, vielen Dank!$" LilycoveCity_ContestLobby_Text_188BB5:: @ 8188BB5 - .string "Oh, that’s right!\p" - .string "As a memento of me painting your\n" - .string "POKéMON, please take this.$" + .string "Oh, richtig!\p" + .string "Da ich dein POKéMON malen durfte,\n" + .string "möchte ich dir dies gerne geben.$" LilycoveCity_ContestLobby_Text_188C03:: @ 8188C03 - .string "{PLAYER} received a RIBBON.$" + .string "{PLAYER} erhält ein BAND.$" LilycoveCity_ContestLobby_Text_188C19:: @ 8188C19 - .string "{PLAYER} put the RIBBON on\n" + .string "{PLAYER} befestigt das BAND an\n" .string "{STR_VAR_1}.$" LilycoveCity_ContestLobby_Text_188C32:: @ 8188C32 - .string "Okay, see you!$" + .string "Okay, man sieht sich!$" LilycoveCity_ContestLobby_Text_188C41:: @ 8188C41 - .string "Oh... Then, I guess I’ll just take\n" - .string "this home with me...\p" - .string "But, you know, I would like to take\n" - .string "this to the art museum... Okay?$" + .string "Oh... Ich glaube, dann nehme ich das mit\n" + .string "zu mir nach Hause...\p" + .string "Aber weißt du, eigentlich möchte ich das\n" + .string "viel lieber einem Kunstmuseum\l" + .string "schenken... Ja?$" LilycoveCity_ContestLobby_Text_188CBD:: @ 8188CBD - .string "Oh, fine, that’s the way it is.\n" - .string "I will hang this in my own house.\p" - .string "I’ll just have to try harder next time.\n" - .string "Well, be seeing you.$" + .string "Oh, fein. Genauso soll es sein.\n" + .string "Ich hänge das bei mir zu Hause auf.\p" + .string "Nächstes Mal muss ich mir mehr Mühe\n" + .string "geben. Bis bald mal.$" LilycoveCity_ContestLobby_Text_188D3C:: @ 8188D3C - .string "Hoo, boy... Master Rank CONTESTS,\n" - .string "here I come.\p" - .string "The world will know that my dearest\n" - .string "POKéMON is the cutest being in all\l" - .string "existence. The time has come!\l" - .string "Uheheheh.$" + .string "Hoo, Junge. WETTBEWERB der\n" + .string "MASTER-KLASSE, jetzt komme ich.\p" + .string "Bald wird die Welt wissen, dass mein\n" + .string "POKéMON das niedlichste aller POKéMON\l" + .string "ist. Die Zeit ist reif!\l" + .string "Ahahahaha.$" LilycoveCity_ContestLobby_Text_188DDA:: @ 8188DDA - .string "You can see a whole variety of\n" - .string "POKéMON here.\p" - .string "That’s why I make this place a regular\n" - .string "part of my daily stroll.$" + .string "Hier sieht man eine ganze Reihe der\n" + .string "unterschiedlichsten POKéMON.\p" + .string "Daher mache ich hier jeden Tag eine\n" + .string "kurze Stippvisite.$" LilycoveCity_ContestLobby_Text_188E47:: @ 8188E47 - .string "Oh, dear! They still haven’t given\n" - .string "you a CONTEST PASS?\p" - .string "You should go get one in VERDANTURF\n" - .string "TOWN right away.\p" - .string "It’s such a thrill having others see\n" - .string "POKéMON that you’ve raised with care\l" - .string "and love.$" + .string "Oh, du liebe Güte! Sie haben dir noch\n" + .string "keine WETTBEWERBSKARTE gegeben?\p" + .string "Du solltest sofort nach WIESENFLUR\n" + .string "gehen. Dort bekommst du eine.\p" + .string "Es ist unwahrscheinlich aufregend,\n" + .string "anderen ein POKéMON zu präsentieren,\l" + .string "das man mit Liebe aufgezogen hat.$" LilycoveCity_ContestLobby_Text_188F07:: @ 8188F07 - .string "When you get up to the Master Rank\n" - .string "CONTESTS, you get your eyes opened\l" - .string "to striking POKéMON that just scream\l" - .string "to be painted.$" + .string "Wenn du erstmals am WETTBEWERB\n" + .string "der MASTER-KLASSE teilnimmst, wirst du\l" + .string "POKéMON sehen, die schreien geradezu\l" + .string "danach, gemalt zu werden.$" LilycoveCity_ContestLobby_Text_188F81:: @ 8188F81 - .string "The TOUGHNESS CONTEST is like\n" - .string "extreme, man!\p" - .string "Those muscular appeals...\n" - .string "Cascading sweat... I swoon!$" + .string "Der WETTBEWERB der STÄRKE ist tierisch\n" + .string "hart!\p" + .string "Dieses Muskelspiel... Schweiß, der\n" + .string "rinnt... Da fall ich glatt in Ohnmacht!$" LilycoveCity_ContestLobby_Text_188FE3:: @ 8188FE3 - .string "Day in and day out, I lavished my care\n" - .string "on this POKéMON.\p" - .string "Its condition is peaking.\n" - .string "Today, victory is mine!$" + .string "Tag für Tag habe ich dieses POKéMON mit\n" + .string "meiner Liebe und Fürsorge überhäuft.\p" + .string "Seine Kondition ist einfach unver-\n" + .string "gleichbar. Heute gehört der Sieg uns!$" LilycoveCity_ContestLobby_Text_18904D:: @ 818904D - .string "I made {POKEBLOCK}S with Mom, Dad and\n" - .string "Big Sister. They turned out great!\p" - .string "I bet you can make smoother, better\n" - .string "{POKEBLOCK}S if you have more people.$" + .string "Ich habe {POKEBLOCK} mit Mama, Papa und\n" + .string "meiner Schwester gemacht. Sie sind\l" + .string "sehr gut geworden!\p" + .string "Ich glaube, je mehr Leute dir bei der\n" + .string "Herstellung von {POKEBLOCK} helfen, desto\l" + .string "besser ist die Qualität.$" diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc index 7d6e4942f..3bce2592b 100644 --- a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -1,53 +1,57 @@ LilycoveCity_CoveLilyMotel_1F_Text_186B71:: @ 8186B71 - .string "Hm, so they doubled the guests by\n" - .string "using POKéMON as attractions?\p" - .string "Hm, well, maybe I should make a cute\n" - .string "POKéMON our inn’s mascot.\p" - .string "I wonder if that will attract more\n" - .string "guests to stay with us?$" + .string "Hm, so haben sie also die Anzahl der\n" + .string "Gäste verdoppelt. Indem sie POKéMON\l" + .string "als Attraktion präsentieren?\p" + .string "Hm, vielleicht sollte ich ein niedliches\n" + .string "POKéMON zum Maskottchen meines\l" + .string "Gasthofes machen...\p" + .string "Ich frage mich, ob ich so mehr\n" + .string "Gäste hätte?$" LilycoveCity_CoveLilyMotel_1F_Text_186C2B:: @ 8186C2B - .string "Oh, sorry, sorry!\n" - .string "I was too involved in watching TV!\p" - .string "Since that TEAM {EVIL_TEAM} came to town,\n" - .string "the tourists have been staying away.$" + .string "Oh, tut mir Leid, tut mir Leid!\n" + .string "Ich habe so konzentriert ferngesehen!\p" + .string "Seit TEAM {EVIL_TEAM} in diesem Ort ist,\n" + .string "bleiben die Gäste aus.$" LilycoveCity_CoveLilyMotel_1F_Text_186CA6:: @ 8186CA6 - .string "Hey, down in front!\n" - .string "I can’t see the TV!$" + .string "Hey, geh weg da!\n" + .string "Du bist doch nicht aus Glas!$" LilycoveCity_CoveLilyMotel_1F_Text_186CCE:: @ 8186CCE - .string "Amazing! You’re telling me a POKéMON\n" - .string "found someone’s lost item?\p" - .string "That’s something. If we had some smart\n" - .string "POKéMON like that...\p" - .string "We could recover anything that our\n" - .string "guests mislaid...$" + .string "Interessant! Du sagst, ein POKéMON\n" + .string "hat ein Item gefunden, das jemand ver-\l" + .string "loren hat?\p" + .string "Das ist ja was! Wenn wir auch so clevere\n" + .string "POKéMON hätten...\p" + .string "Dann könnten wir alles wiederfinden, was\n" + .string "unsere Gäste verloren haben.$" LilycoveCity_CoveLilyMotel_1F_Text_186D7F:: @ 8186D7F - .string "Oh, sorry, sorry!\n" - .string "I was too involved in watching TV!\p" - .string "I heard that someone busted the\n" - .string "TEAM {EVIL_TEAM} HIDEOUT.\p" - .string "Thanks to that, we just booked a\n" - .string "reservation from a big group.\p" - .string "It was a company called... Uh...\n" - .string "GAME something...$" + .string "Oh, tut mir Leid, tut mir Leid!\n" + .string "Ich habe so konzentriert ferngesehen!\p" + .string "Ich habe gehört, dass jemand das VER-\n" + .string "STECK von TEAM {EVIL_TEAM} auffliegen ließ.\p" + .string "Gut! Dadurch haben wir endlich Gäste.\n" + .string "Eine ganze Gruppe hat reserviert!\p" + .string "Das sind Angestellte einer Firma... Äh...\n" + .string "GAME irgendwas...$" LilycoveCity_CoveLilyMotel_1F_Text_186E57:: @ 8186E57 - .string "Amazing! A house-sitting POKéMON\n" - .string "caught a burglar?\p" - .string "That’s something. If we had a tough\n" - .string "POKéMON as a security guard...\p" - .string "We would be able to provide our guests\n" - .string "with greater safety.$" + .string "Irre! Ein POKéMON, das das Haus be-\n" + .string "wachte, hat Einbrecher geschnappt?\p" + .string "Klasse! Wir sollten auch über einen\n" + .string "Wachschutz durch POKéMON nachdenken.\p" + .string "Dadurch könnten wir unseren Gästen\n" + .string "viel mehr Sicherheit bieten.$" LilycoveCity_CoveLilyMotel_1F_Text_186F09:: @ 8186F09 - .string "Oh, sorry, sorry!\n" - .string "I was too involved in watching TV.\p" - .string "Oh, yes. A big group of guests arrived\n" - .string "a little while ago.\p" - .string "They booked in as GAME FREAK, so I\n" - .string "guess they must make games.\p" - .string "Uh-oh, I’d better get working on\n" - .string "their dinner!$" + .string "Oh, tut mir Leid, tut mir Leid!\n" + .string "Ich habe so konzentriert ferngesehen!\p" + .string "Oh, ja. Eine große Gruppe von Gästen\n" + .string "ist vor kurzem hier eingetroffen.\p" + .string "Sie haben sich als GAME FREAK einge-\n" + .string "tragen. Ich denke, sie entwickeln\l" + .string "Spiele.\p" + .string "Oh oh, ich sollte mich besser um ihr\n" + .string "Abendessen kümmern!$" diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc index 0306db9e9..648e1d684 100644 --- a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,45 +1,47 @@ LilycoveCity_CoveLilyMotel_2F_Text_186FE7:: @ 8186FE7 - .string "I’m the GAME DESIGNER.\p" - .string "Oh, is that right?\n" - .string "You’re working on a POKéDEX?\p" - .string "It’s tough trying to complete it,\n" - .string "but don’t give up.\p" - .string "If you do complete it, please come\n" - .string "show me.$" + .string "Ich bin der GAME DESIGNER.\p" + .string "Oh, wirklich?\n" + .string "Du arbeitest an einem POKéDEX?\p" + .string "Es ist schwer, ihn zu vervollständigen,\n" + .string "aber du darfst nicht aufgeben.\p" + .string "Sobald du ihn vervollständigt hast,\n" + .string "komm mich wieder besuchen.$" LilycoveCity_CoveLilyMotel_2F_Text_18708F:: @ 818708F - .string "Wow! That’s awesome!\n" - .string "Yep, it’s totally awesome!\p" - .string "This POKéDEX is completely filled!\n" - .string "You really must love POKéMON!\p" - .string "I’m so impressed!\p" - .string "Let me give you something in\n" - .string "recognition of your feat!$" + .string "Wow! Das ist beeindruckend!\n" + .string "Wirklich äußerst beeindruckend!\p" + .string "Dein POKéDEX ist absolut vollständig!\n" + .string "Du musst die POKéMON wirklich lieben!\p" + .string "Ich bin echt beeindruckt!\p" + .string "Ich möchte dir als Zeichen meiner Aner-\n" + .string "kennung gerne etwas schenken!$" LilycoveCity_CoveLilyMotel_2F_Text_187149:: @ 8187149 - .string "Me? You’re talking to me?\n" - .string "I’m the PROGRAMMER.\p" - .string "I wonder what the SLOTS are\n" - .string "like here.$" + .string "Ich? Sprichst du mit mir?\n" + .string "Ich bin der PROGRAMMIERER.\p" + .string "Ich frage mich, wie die EINARMIGEN\n" + .string "BANDITEN hier wohl so sind.$" LilycoveCity_CoveLilyMotel_2F_Text_18719E:: @ 818719E - .string "I’m the GRAPHIC ARTIST! Aren’t the\n" - .string "POKéMON of HOENN interesting?$" + .string "Ich bin der GRAPHIC ARTIST! Sind die\n" + .string "POKéMON in der Region von HOENN\l" + .string "nicht interessant?$" LilycoveCity_CoveLilyMotel_2F_Text_1871DF:: @ 81871DF - .string "The girl TUBERS, they’re cute, hey?\n" - .string "To battle against a cute TUBER...\p" - .string "Whoop, it drives me wild!\p" - .string "And the TWINS! Aren’t they cute?\n" - .string "A 2-on-2 battle with TWINS...\p" - .string "Whoop, it’s unbearably fun!$" + .string "Die MÄDCHEN mit den SCHWIMMREIFEN\n" + .string "sind total niedlich, meinst du nicht?\l" + .string "Ein Kampf gegen so niedliche Mädchen...\p" + .string "Huuh, das ist vielleicht ein Spaß!\p" + .string "Und die ZWILLINGE erst! Sind die süß!?!\n" + .string "Ein 2-gegen-2 Kampf mit ZWILLINGEN...\p" + .string "Huuh, einfach unglaublicher Spaß!$" LilycoveCity_CoveLilyMotel_2F_Text_18729A:: @ 818729A - .string "The sea breeze tickles my heart.\n" - .string "It feels wonderful here!$" + .string "Die frische Seebrise berührt mein Herz.\n" + .string "Es ist einfach wundervoll hier.$" LilycoveCity_CoveLilyMotel_2F_Text_1872D4:: @ 81872D4 - .string "You never know when and where\n" - .string "people will challenge you.\p" - .string "That’s why I never leave home without\n" - .string "my GAME BOY ADVANCE.$" + .string "Du kannst nie vorhersagen, wann und wo\n" + .string "die Leute dich herausfordern.\p" + .string "Daher gehe ich niemals ohne meinen GAME\n" + .string "BOY ADVANCE aus dem Haus.$" diff --git a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc index 62eb03bc1..f09c4aa08 100644 --- a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,33 +1,33 @@ LilycoveCity_DepartmentStoreRooftop_Text_18C61F:: @ 818C61F - .string "Don’t they have set dates for their\n" - .string "clear-out sales?\p" - .string "I watch TV, but they never show any\n" - .string "commercials.$" + .string "Haben sie noch nicht bekannt gegeben,\n" + .string "wann sie den Ausverkauf starten?\p" + .string "Ich achte immer auf die Werbung im\n" + .string "Fernsehen, aber bisher war da nichts.$" LilycoveCity_DepartmentStoreRooftop_Text_18C685:: @ 818C685 - .string "Yes! I’ve been waiting a long time for\n" - .string "this clear-out sale.\p" - .string "They have items that you can only get\n" - .string "here. I’m going to load up, that I am!$" + .string "Ja! Ich habe schon lange auf diesen\n" + .string "Ausverkauf gewartet.\p" + .string "Hier gibt es Items, die findest du sonst\n" + .string "nirgends. Ich decke mich damit ein!$" LilycoveCity_DepartmentStoreRooftop_Text_18C70E:: @ 818C70E - .string "Ohh... I’m bone-dry thirsty!$" + .string "Ooh... Ich bin am Verdursten!$" LilycoveCity_DepartmentStoreRooftop_Text_18C72B:: @ 818C72B - .string "It’s a VENDING MACHINE.\n" - .string "Which drink would you like?$" + .string "Das ist ein GETRÄNKEAUTOMAT.\n" + .string "Möchtest du etwas trinken?$" LilycoveCity_DepartmentStoreRooftop_Text_18C75F:: @ 818C75F - .string "Clang!\p" - .string "A can of {STR_VAR_1} dropped down.$" + .string "Deng!\p" + .string "Eine Dose {STR_VAR_1} fällt heraus.$" LilycoveCity_DepartmentStoreRooftop_Text_18C780:: @ 818C780 - .string "Clang!\p" - .string "Score! An extra can of {STR_VAR_1}\n" - .string "dropped down!$" + .string "Deng!\p" + .string "Treffer! Eine weitere Dose\n" + .string "{STR_VAR_1} fällt heraus!$" LilycoveCity_DepartmentStoreRooftop_Text_18C7AF:: @ 818C7AF - .string "Not enough money...$" + .string "Nicht genug Geld...$" LilycoveCity_DepartmentStoreRooftop_Text_18C7C3:: @ 818C7C3 - .string "Decided against buying a drink.$" + .string "Es wird kein Getränk gekauft.$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc b/data/text/maps/LilycoveCity_DepartmentStore_1F.inc index 45cf3686d..fb4d5b589 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_1F.inc @@ -1,27 +1,29 @@ LilycoveCity_DepartmentStore_1F_Text_18BFB5:: @ 818BFB5 - .string "Welcome to LILYCOVE DEPARTMENT STORE.$" + .string "Willkommen im EINKAUFSZENTRUM von\n" + .string "SEEGRASULB CITY.$" LilycoveCity_DepartmentStore_1F_Text_18BFDB:: @ 818BFDB - .string "Whenever I come to the DEPARTMENT\n" - .string "STORE, I always end up buying all sorts\l" - .string "of things because it’s so fun.$" + .string "Immer wenn ich in das EINKAUFSZENTRUM\n" + .string "gehe, endet das damit, dass ich tausend\l" + .string "Dinge kaufe, weil es so viel Spaß macht.$" LilycoveCity_DepartmentStore_1F_Text_18C044:: @ 818C044 - .string "Today, my mom is going to buy me some\n" - .string "nice furniture.$" + .string "Heute wird mir meine Mama ein paar\n" + .string "schöne Möbel kaufen.$" LilycoveCity_DepartmentStore_1F_Text_18C07A:: @ 818C07A - .string "I’m buying something for my AZUMARILL\n" - .string "as a reward for winning a CONTEST.$" + .string "Ich kaufe etwas Schönes für mein\n" + .string "AZUMARILL, weil es einen WETTBEWERB\l" + .string "gewonnen hat.$" LilycoveCity_DepartmentStore_1F_Text_18C0C3:: @ 818C0C3 .string "AZUMARILL: Maririroo!$" LilycoveCity_DepartmentStore_1F_Text_18C0D9:: @ 818C0D9 - .string "1F: SERVICE COUNTER\n" - .string " LOTTERY CORNER\p" - .string "2F: TRAINER’S ZONE\p" - .string "3F: BATTLE COLLECTION\p" - .string "4F: TM CORNER\p" - .string "5F: POKé DOLL FLOOR\p" - .string "ROOFTOP: ROOFTOP PLAZA$" + .string "EG: INFORMATION\n" + .string " LOTTERIE\p" + .string "1S: ALLES FÜR DEN TRAINER\p" + .string "2S: ALLES FÜR DEN KAMPF\p" + .string "3S: TM\p" + .string "4S: POKéPUPPEN\p" + .string "DACH: DACHTERRASSE$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc b/data/text/maps/LilycoveCity_DepartmentStore_2F.inc index e9a52bbee..721974796 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_2F.inc @@ -1,15 +1,16 @@ LilycoveCity_DepartmentStore_2F_Text_18C162:: @ 818C162 - .string "Learn to use items properly.\n" - .string "That’s basic, really.$" + .string "Lerne, mit Items vernünftig umzugehen.\n" + .string "Das ist essentiell. Ehrlich.$" LilycoveCity_DepartmentStore_2F_Text_18C195:: @ 818C195 - .string "My husband is waiting at home.\n" - .string "What would make a good gift for him?$" + .string "Mein Mann wartet zu Hause auf mich.\n" + .string "Was wäre wohl ein passendes Geschenk\l" + .string "für ihn?$" LilycoveCity_DepartmentStore_2F_Text_18C1D9:: @ 818C1D9 - .string "I’m leaving on a long journey soon.\n" - .string "I need to stock up on items.$" + .string "Ich werde bald auf eine lange Reise\n" + .string "gehen. Ich muss daher Items kaufen.$" UnknownString_818C21A: @ 818C21A - .string "FOR YOUR TRAVELING COMPANIONS\n" - .string "2F: TRAINER’S ZONE$" + .string "FÜR DEINE REISEBEGLEITER\n" + .string "1S: ALLES FÜR DEN TRAINER$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc b/data/text/maps/LilycoveCity_DepartmentStore_3F.inc index 8777fd1f3..eb430e21c 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_3F.inc @@ -1,19 +1,21 @@ LilycoveCity_DepartmentStore_3F_Text_18C24B:: @ 818C24B - .string "For quickly toughening up POKéMON,\n" - .string "items are the best.\p" - .string "PROTEIN boosts ATTACK, and CALCIUM\n" - .string "raises SP. ATK.$" + .string "Um POKéMON schnell stärker zu machen,\n" + .string "eignen sich Items hervorragend.\p" + .string "PROTEIN steigert den ANGRIFF und\n" + .string "KALZIUM den SPEZ. ANGRIFF.$" LilycoveCity_DepartmentStore_3F_Text_18C2B5:: @ 818C2B5 - .string "I want my POKéMON to have more\n" - .string "endurance.\p" - .string "I’m trying to decide whether to raise\n" - .string "DEFENSE with IRON, or SP. DEF with ZINC.$" + .string "Ich möchte, dass mein POKéMON mehr\n" + .string "Ausdauer hat.\p" + .string "Ich frage mich, ob ich lieber die\n" + .string "VERTEIDIGUNG mit EISEN oder die SPEZ.\l" + .string "VER. mit ZINK steigern soll.$" LilycoveCity_DepartmentStore_3F_Text_18C32E:: @ 818C32E - .string "I gave a CARBOS to my POKéMON and its\n" - .string "SPEED went up.$" + .string "Ich habe meinem POKéMON CARBON\n" + .string "gegeben, um die INIT. zu erhöhen.$" UnknownString_818C363: @ 818C363 - .string "ESSENTIALS FOR UNBEATABLE TRAINERS\n" - .string "3F: BATTLE COLLECTION$" + .string "UNVERZICHTBARES FÜR UNBESIEGBARE\n" + .string "TRAINER\l" + .string "2S: ALLES FÜR DEN KAMPF$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc b/data/text/maps/LilycoveCity_DepartmentStore_4F.inc index b26962a8f..86a1438a2 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_4F.inc @@ -1,20 +1,21 @@ LilycoveCity_DepartmentStore_4F_Text_18C39C:: @ 818C39C .string "Hmm...\p" - .string "An attacking move...\n" - .string "Or a defensive move...\p" - .string "It’s no easy matter to decide which TM\n" - .string "moves should be taught to POKéMON...$" + .string "Eine offensive Attacke...\n" + .string "Oder defensive Attacke...\p" + .string "Es ist nicht einfach, zu entscheiden,\n" + .string "welche TM ein POKéMON lernen soll.$" LilycoveCity_DepartmentStore_4F_Text_18C41B:: @ 818C41B - .string "There are so many different kinds of\n" - .string "TM moves.\p" - .string "A catalog I read said there are fifty\n" - .string "different kinds.$" + .string "Es gibt so viele verschiedene Arten von\n" + .string "TMs.\p" + .string "In einem Katalog habe ich gelesen, dass\n" + .string "es 50 verschiedene Arten gibt.$" LilycoveCity_DepartmentStore_4F_Text_18C481:: @ 818C481 - .string "I’d like to get all the different TMs,\n" - .string "but a POKéMON learns only four moves.$" + .string "Ich hätte gerne all die unterschied-\n" + .string "lichen TMs, aber ein POKéMON kann nur\l" + .string "vier Attacken lernen.$" UnknownString_818C4CE: @ 818C4CE - .string "A SHORTCUT TO POKéMON LEAGUE\n" - .string "4F: TM CORNER$" + .string "EINE ABKÜRZUNG ZUR POKéMON LIGA\n" + .string "3S: TM$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc b/data/text/maps/LilycoveCity_DepartmentStore_5F.inc index 8b1d81c2e..821a85431 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_5F.inc @@ -1,17 +1,17 @@ LilycoveCity_DepartmentStore_5F_Text_18C4F9:: @ 818C4F9 - .string "This place is full of cute DOLLS.\p" - .string "I should buy some for me, instead of\n" - .string "just for my children.$" + .string "Hier gibt es viele niedliche PUPPEN.\p" + .string "Ich sollte lieber mir selbst welche\n" + .string "kaufen, anstatt immer für meine Kinder.$" LilycoveCity_DepartmentStore_5F_Text_18C556:: @ 818C556 - .string "I’m not big enough to raise POKéMON,\n" - .string "so I’m getting a cute DOLL instead.$" + .string "Ich bin noch zu klein, um POKéMON auf-\n" + .string "zuziehen, daher bekomme ich eine PUPPE.$" LilycoveCity_DepartmentStore_5F_Text_18C59F:: @ 818C59F - .string "They sell many cute MATS here.\p" - .string "I wonder which one I should get?\n" - .string "Maybe I’ll buy them all...$" + .string "Sie verkaufen viele hübsche MATTEN.\p" + .string "Welche soll ich nur kaufen?\n" + .string "Ich sollte sie alle kaufen...$" UnknownString_818C5FA: @ 818C5FA - .string "ADORABLE FRIENDS\n" - .string "5F: POKé DOLL FLOOR$" + .string "ANBETUNGSWÜRDIGE FREUNDE\n" + .string "4S: POKéPUPPEN$" diff --git a/data/text/maps/LilycoveCity_Harbor.inc b/data/text/maps/LilycoveCity_Harbor.inc index 0f31f697b..1282cb3b9 100644 --- a/data/text/maps/LilycoveCity_Harbor.inc +++ b/data/text/maps/LilycoveCity_Harbor.inc @@ -1,49 +1,51 @@ LilycoveCity_Harbor_Text_18B306:: @ 818B306 - .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" - .string "available at present...$" + .string "Bitte?\n" + .string "Du suchst ein Schiff?\p" + .string "Tut mir Leid, aber die Fähre ist\n" + .string "momentan nicht in Betrieb...$" LilycoveCity_Harbor_Text_18B36F:: @ 818B36F - .string "Hello, are you here for the ferry?\n" - .string "May I see your TICKET?$" + .string "Hallo, du willst mit der Fähre fahren?\n" + .string "Zeigst du mir dann bitte dein TICKET?$" LilycoveCity_Harbor_Text_18B3A9:: @ 818B3A9 - .string "{PLAYER} doesn’t have the TICKET...\p" - .string "I’m terribly sorry.\p" - .string "You must have a TICKET to board\n" - .string "the ferry.$" + .string "{PLAYER} besitzt kein TICKET.\p" + .string "Das tut mir Leid!\p" + .string "Du benötigst ein TICKET, um mit der\n" + .string "Fähre fahren zu können.$" LilycoveCity_Harbor_Text_18B406:: @ 818B406 - .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" - .string "And where would you like to go?$" + .string "{PLAYER} zeigt das TICKET.\p" + .string "Perfekt! Das ist alles, was du brauchst!\p" + .string "Und wo soll die Reise hingehen?$" LilycoveCity_Harbor_Text_18B45B:: @ 818B45B - .string "Please sail with us another time!$" + .string "Bitte fahre bald mit uns!$" LilycoveCity_Harbor_Text_18B47D:: @ 818B47D - .string "SLATEPORT CITY it is, then!$" + .string "Nach GRAPHITPORT CITY, einverstanden?$" LilycoveCity_Harbor_Text_18B499:: @ 818B499 - .string "BATTLE TOWER it is, then!$" + .string "Zum DUELLTURM, einverstanden?$" LilycoveCity_Harbor_Text_18B4B3:: @ 818B4B3 - .string "Please board the ferry and wait for\n" - .string "departure.$" + .string "Bitte komm an Bord. Wir legen bald ab.$" LilycoveCity_Harbor_Text_18B4E2:: @ 818B4E2 - .string "Then, where would you like to go?$" + .string "Und? Wo soll die Reise hingehen?$" LilycoveCity_Harbor_Text_18B504:: @ 818B504 - .string "Until they finish making the ferry, we\n" - .string "sailors have nothing to do...\p" - .string "I wish they’d get a move on, the folks\n" - .string "at the SHIPYARD in SLATEPORT.$" + .string "Solange die Fähre noch nicht see-\n" + .string "tüchtig ist, haben wir Seeleute\l" + .string "nichts zu tun...\p" + .string "Ich wünschte, sie würden sich ein\n" + .string "bisschen beeilen - die Leute von der\l" + .string "WERFT von GRAPHITPORT CITY.$" LilycoveCity_Harbor_Text_18B58E:: @ 818B58E - .string "The ferry S.S. TIDAL is finally in\n" - .string "operation.\p" - .string "The folks at the SHIPYARD in SLATEPORT\n" - .string "must’ve worked extra hard.\p" - .string "Well, it’s my turn to get busy now!$" + .string "Die Fähre MS TIDE ist endlich in\n" + .string "Betrieb.\p" + .string "Die Leute von der WERFT in\n" + .string "GRAPHITPORT CITY müssen wirklich\l" + .string "hart gearbeitet haben.\p" + .string "Nun, jetzt ist meine Arbeit gefragt!$" diff --git a/data/text/maps/LilycoveCity_House1.inc b/data/text/maps/LilycoveCity_House1.inc index a937ff64d..c374ed813 100644 --- a/data/text/maps/LilycoveCity_House1.inc +++ b/data/text/maps/LilycoveCity_House1.inc @@ -1,8 +1,8 @@ LilycoveCity_House1_Text_18B7B0:: @ 818B7B0 - .string "POKéMON are partners to people.\n" - .string "They aren’t our tools.\p" - .string "Unfortunately, there are some people\n" - .string "who fail to understand that...$" + .string "POKéMON sind die Partner der Menschen.\n" + .string "Sie sind nicht unser Spielzeug!\p" + .string "Leider gibt es immer wieder Menschen,\n" + .string "die das nicht begreifen.$" LilycoveCity_House1_Text_18B82B:: @ 818B82B .string "KECLEON: Ruroro?$" diff --git a/data/text/maps/LilycoveCity_House2.inc b/data/text/maps/LilycoveCity_House2.inc index 0e037a65f..f5aae781d 100644 --- a/data/text/maps/LilycoveCity_House2.inc +++ b/data/text/maps/LilycoveCity_House2.inc @@ -1,9 +1,9 @@ LilycoveCity_House2_Text_18B83C:: @ 818B83C - .string "Huh? What? What’s that?\p" - .string "I’m not near awake yet...\n" - .string "You can have this...$" + .string "Huch? Was? Wie?\p" + .string "Ich bin noch nicht ganz wach...\n" + .string "Hier, das kannst du haben...$" LilycoveCity_House2_Text_18B883:: @ 818B883 - .string "Yawn...\p" - .string "Sleep is essential for good health...\n" - .string "Sleep and regain health...$" + .string "Gääähn...\p" + .string "Schlaf ist wichtig für die Gesundheit...\n" + .string "Schlafe und erhole dich...$" diff --git a/data/text/maps/LilycoveCity_House3.inc b/data/text/maps/LilycoveCity_House3.inc index 03db4920f..b9f243868 100644 --- a/data/text/maps/LilycoveCity_House3.inc +++ b/data/text/maps/LilycoveCity_House3.inc @@ -1,68 +1,72 @@ LilycoveCity_House3_Text_18B8CC:: @ 818B8CC - .string "Oh, my, my! Are you traveling alone?\n" - .string "But you’re so young! Good for you!\p" - .string "I’m sure my kids could learn a thing\n" - .string "or two from you!\p" - .string "Me? I’m a master of {POKEBLOCK}S.\p" - .string "If I get serious just a little, why, I\n" - .string "can concoct great {POKEBLOCK}S.\p" - .string "Would you like to learn from me, a\n" - .string "master of {POKEBLOCK}S?$" + .string "Ach, du liebes bisschen! Reist du ganz\n" + .string "alleine? Aber du bist so jung! Gut!\p" + .string "Ich bin sicher, meine Kinder könnten\n" + .string "das eine oder andere von dir lernen!\p" + .string "Ich? Ich bin die Expertin der {POKEBLOCK}.\p" + .string "Wenn ich es mir recht überlege, dann\n" + .string "könnte ich ein paar {POKEBLOCK} zaubern.\p" + .string "Möchtest du das von mir, der Expertin\n" + .string "der {POKEBLOCK}, lernen?$" LilycoveCity_House3_Text_18B9DC:: @ 818B9DC - .string "Oh? Are you sure?\p" - .string "You shouldn’t always try to do\n" - .string "everything by yourself, dear!$" + .string "Oh? Ganz sicher?\p" + .string "Du solltest nicht immer versuchen, alles\n" + .string "alleine zu meistern, mein Kind.$" LilycoveCity_House3_Text_18BA2B:: @ 818BA2B - .string "Oh, good! You’re a smart soul!\n" - .string "This is a bit long, so listen up!\p" - .string "Are you ready?\p" - .string "If you look at {POKEBLOCK}S, you should see\n" - .string "that they are rated on how they feel.\p" - .string "The lower the feel rating,\n" - .string "the better it is. Don’t forget this!\p" - .string "A good {POKEBLOCK} has a low feel\n" - .string "rating and a high level.\p" - .string "A POKéMON can eat more good\n" - .string "{POKEBLOCK}S than ordinary ones, too.\p" - .string "And this is important.\p" - .string "If you want to make smooth {POKEBLOCK}S,\n" - .string "use different kinds of BERRIES.\p" - .string "Don’t be stingy - the kinds of BERRIES\n" - .string "affect the smoothness of {POKEBLOCK}S.\p" - .string "And another thing.\p" - .string "The more people blending BERRIES, the\n" - .string "smoother the {POKEBLOCK}S.\p" - .string "That’s why you should talk to other\n" - .string "people and make {POKEBLOCK}S together.\p" - .string "That’s about all you need to know to\n" - .string "make good {POKEBLOCK}S.\p" - .string "If everyone had POKéMON they love,\n" - .string "smooth {POKEBLOCK}S, and a loving family,\l" - .string "the world would be a happier place.\p" - .string "Don’t give up, dear!$" + .string "Oh, schön! Du bist clever! Das\n" + .string "wird eine lange Erklärung. Hör gut zu.\p" + .string "Bist du bereit?\p" + .string "Wenn du einen {POKEBLOCK} betrachtest,\n" + .string "siehst du, dass er danach bewertet\l" + .string "wird, wie würzig er ist.\p" + .string "Je niedriger dieser Wert ist, desto\n" + .string "besser ist das. Vergiss das nicht!\p" + .string "Ein guter {POKEBLOCK} hat einen niedrigen\n" + .string "Würzwert und einen hohen Level.\p" + .string "Ein POKéMON kann mehr gute {POKEBLOCK}\n" + .string "essen als durchschnittliche.\p" + .string "Und das ist wichtig.\p" + .string "Wenn du weiche {POKEBLOCK} herstellen\n" + .string "willst, benutze verschiedene BEEREN.\p" + .string "Sei nicht geizig - die Art der BEEREN\n" + .string "beeinflusst die Weichheit der {POKEBLOCK}.\p" + .string "Und noch etwas.\p" + .string "Je mehr Leute BEEREN mixen,\n" + .string "desto weicher werden die {POKEBLOCK}.\p" + .string "Daher solltest du andere Leute an-\n" + .string "sprechen und mit ihnen zusammen\l" + .string "{POKEBLOCK} herstellen.\p" + .string "Das ist alles, was du wissen musst, um\n" + .string "gute {POKEBLOCK} herstellen zu können.\p" + .string "Wenn jeder POKéMON hätte, die er liebt,\n" + .string "weiche {POKEBLOCK} und eine liebevolle\p" + .string "Familie, sähe es auf der Welt viel\n" + .string "besser aus.\p" + .string "Lass dich nicht unterkriegen, Schatz!$" LilycoveCity_House3_Text_18BD64:: @ 818BD64 - .string "When my wife gave birth to quadruplets,\n" - .string "you bet I was shocked.\p" - .string "But, now, seeing them play together,\n" - .string "it makes me happy.$" + .string "Als meine Frau Vierlinge zur Welt\n" + .string "brachte, war ich zuerst geschockt.\p" + .string "Aber wenn ich sie jetzt zusammen\n" + .string "spielen sehe, bin ich richtig glücklich.$" LilycoveCity_House3_Text_18BDDB:: @ 818BDDB - .string "We’re having MULTI BATTLES, but I know\n" - .string "I’m going to win.$" + .string "Wir üben MULTIKÄMPFE aus, aber ich\n" + .string "weiß, dass ich gewinnen werde.$" LilycoveCity_House3_Text_18BE14:: @ 818BE14 - .string "We like mixing stuff at the RECORD\n" - .string "CORNER.\p" - .string "But what gets mixed up?$" + .string "Wir lieben es, Sachen beim STATISTIK-\n" + .string "TAUSCH durcheinander zu würfeln.\p" + .string "Aber, was kann man durcheinander\n" + .string "würfeln?$" LilycoveCity_House3_Text_18BE57:: @ 818BE57 - .string "We’re going to make super {POKEBLOCK}S\n" - .string "with a BERRY BLENDER!$" + .string "Wir wollen super {POKEBLOCK}\n" + .string "im BEERENMIXER machen!$" LilycoveCity_House3_Text_18BE8E:: @ 818BE8E - .string "I want to brag about how tough my\n" - .string "POKéMON is, so we’re going to enter a\l" - .string "CONTEST together.$" + .string "Ich möchte damit angeben, wie stark\n" + .string "mein POKéMON ist, daher werden wir\l" + .string "an einem WETTBEWERB teilnehmen.$" diff --git a/data/text/maps/LilycoveCity_House4.inc b/data/text/maps/LilycoveCity_House4.inc index ebfd5ae71..ee6b0fa8b 100644 --- a/data/text/maps/LilycoveCity_House4.inc +++ b/data/text/maps/LilycoveCity_House4.inc @@ -1,9 +1,11 @@ LilycoveCity_House4_Text_18BEE8:: @ 818BEE8 - .string "This planet’s biggest mysteries are\n" - .string "at the bottom of the sea.\p" - .string "Somebody said that, but I don’t know...$" + .string "Das größte Geheimnis dieses Planeten\n" + .string "hütet der Meeresboden.\p" + .string "Das hat mal jemand gesagt, aber ich\n" + .string "weiß nicht...$" LilycoveCity_House4_Text_18BF4E:: @ 818BF4E - .string "There’s a deep underwater trench\n" - .string "between MOSSDEEP and SOOTOPOLIS.\p" - .string "That’s what someone told me, anyway.$" + .string "Zwischen MOOSBACH CITY und\n" + .string "XENEROVILLE befindet sich ein\l" + .string "tiefer Unterwassergraben.\p" + .string "Das hat mir jemand erzählt.$" diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc index b60e0e50d..93f9d2f7e 100644 --- a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,130 +1,131 @@ LilycoveCity_LilycoveMuseum_1F_Text_187348:: @ 8187348 - .string "Welcome to LILYCOVE MUSEUM.\p" - .string "Please take the time to enjoy our\n" - .string "collection of fantastic artwork\l" - .string "featuring POKéMON.$" + .string "Willkommen im MUSEUM von\n" + .string "SEEGRASULB CITY.\p" + .string "Bitte nimm dir die Zeit, unsere Sammlung\n" + .string "wunderbarer Kunstwerke zum Thema\l" + .string "POKéMON zu betrachten.$" LilycoveCity_LilycoveMuseum_1F_Text_1873B9:: @ 81873B9 - .string "I’m the CURATOR of this MUSEUM of\n" - .string "fine arts.\p" - .string "It’s heartening to see someone so\n" - .string "young as you in our MUSEUM.\p" - .string "Have you viewed our collection of\n" - .string "paintings already?$" + .string "Ich bin der KURATOR dieses MUSEUMS der\n" + .string "schönen Künste.\p" + .string "Es freut mich immer wieder, junge\n" + .string "Menschen wie dich im MUSEUM zu treffen.\p" + .string "Hast du dir schon unsere Gemäldesamm-\n" + .string "lung angesehen?$" LilycoveCity_LilycoveMuseum_1F_Text_187459:: @ 8187459 - .string "Ah, then let me not disturb you.\n" - .string "Please, do take your time.$" + .string "Ah, dann möchte ich dich nicht länger\n" + .string "aufhalten. Bitte, nimm dir Zeit.$" LilycoveCity_LilycoveMuseum_1F_Text_187495:: @ 8187495 - .string "Oh? I do believe that you seem to\n" - .string "be a POKéMON TRAINER.\p" - .string "Have you an interest in paintings,\n" - .string "too?$" + .string "Oh? Ich glaube, du bist ein POKéMON-\n" + .string "TRAINER.\p" + .string "Bist du auch an Gemälden interessiert?$" LilycoveCity_LilycoveMuseum_1F_Text_1874F5:: @ 81874F5 - .string "I see...\p" - .string "I’m honored that you would visit\n" - .string "us in spite of that.$" + .string "Ich verstehe...\p" + .string "Ich fühle mich geehrt, dass du uns\n" + .string "trotzdem besuchst.$" LilycoveCity_LilycoveMuseum_1F_Text_187534:: @ 8187534 - .string "Ah, excellent!\n" - .string "You do like paintings!\p" - .string "Then, may I ask you to come with me?$" + .string "Ah, exzellent!\n" + .string "Du magst Gemälde!\p" + .string "Dann möchte ich dir gerne etwas zeigen.$" LilycoveCity_LilycoveMuseum_1F_Text_18757F:: @ 818757F - .string "It’s a very old painting.\n" - .string "The paint is peeling here and there.$" + .string "Dies ist ein sehr altes Gemälde.\n" + .string "Die Farbe blättert hier und da schon ab.$" LilycoveCity_LilycoveMuseum_1F_Text_1875BE:: @ 81875BE - .string "It’s an odd landscape with bizarre\n" - .string "and fantastic scenery.$" + .string "Eine merkwürdige Landschaft mit\n" + .string "bizarren und fantastischen Details.$" LilycoveCity_LilycoveMuseum_1F_Text_1875F8:: @ 81875F8 - .string "It’s a painting of a beautiful, smiling\n" - .string "woman with a POKéMON on her lap.$" + .string "Das Bildnis einer hübschen, lächelnden\n" + .string "Frau mit einem POKéMON auf dem Schoß.$" LilycoveCity_LilycoveMuseum_1F_Text_187641:: @ 8187641 - .string "It’s a painting of a legendary POKéMON\n" - .string "from long ago.\p" - .string "The artist painted this from\n" - .string "imagination.$" + .string "Das Bild eines legendären POKéMON aus\n" + .string "längst vergangener Zeit.\p" + .string "Der Künstler hat dies aus der\n" + .string "Vorstellung heraus gemalt.$" LilycoveCity_LilycoveMuseum_1F_Text_1876A1:: @ 81876A1 - .string "It’s a painting of GRASS POKéMON\n" - .string "swaying in a breeze.\p" - .string "They appear to be enjoying the wind’s\n" - .string "gentle caress.$" + .string "PFLANZEN-POKéMON, die sich im\n" + .string "Wind wiegen.\p" + .string "Es scheint, als genießen sie das zarte\n" + .string "Streicheln des Windes.$" LilycoveCity_LilycoveMuseum_1F_Text_18770C:: @ 818770C - .string "It’s a delicious-looking painting\n" - .string "of BERRIES.\p" - .string "This painting could make you hungry!$" + .string "BEEREN. Sie sehen äußerst delikat aus.\p" + .string "Das Bild kann einen hungrig machen!$" LilycoveCity_LilycoveMuseum_1F_Text_18775F:: @ 818775F - .string "It’s a replica of a famous sculpture.\p" - .string "It depicts an ancient BIRD POKéMON.$" + .string "Ein Replikat einer berühmten Skulptur.\p" + .string "Es zeigt ein antikes VOGEL-POKéMON.$" LilycoveCity_LilycoveMuseum_1F_Text_1877A9:: @ 81877A9 - .string "It’s a big POKé BALL carved from a\n" - .string "black stone.\p" - .string "It was apparently used in festivals\n" - .string "in the olden days.$" + .string "Ein großer POKéBALL aus schwarzem\n" + .string "Stein gehauen.\p" + .string "In früheren Zeiten wurde er zu\n" + .string "Festlichkeiten ausgestellt.$" LilycoveCity_LilycoveMuseum_1F_Text_187810:: @ 8187810 - .string "It’s a huge stone tablet inscribed\n" - .string "with POKéMON and dense text in the\l" - .string "small characters of an ancient,\l" - .string "unreadable language.$" + .string "Eine große Steintafel, auf der POKéMON\n" + .string "und eng gesetzte, kleine Schrift-\l" + .string "zeichen einer alten unverständlichen\l" + .string "Sprache eingraviert sind.$" UnknownString_818788B: @ 818788B .string "Hmmm...\n" - .string "What works of great magnificence...$" + .string "Was für eine große Pracht...$" LilycoveCity_LilycoveMuseum_1F_Text_1878B7:: @ 81878B7 - .string "Battling with POKéMON is fun,\n" - .string "I’ll grant you that.\p" - .string "But one mustn’t forget our love for\n" - .string "the fine arts.$" + .string "Die Kämpfe mit POKéMON machen schon\n" + .string "Spaß, das gebe ich zu.\p" + .string "Aber man darf darüber nicht seine Liebe\n" + .string "zu den schönen Künsten vergessen.$" LilycoveCity_LilycoveMuseum_1F_Text_18791D:: @ 818791D - .string "This ART MUSEUM... Well, you could\n" - .string "see many fantastic paintings.\p" - .string "And the CURATOR is a wonderful person.\p" - .string "Among artists like myself, this MUSEUM\n" - .string "is an inspiration.$" + .string "Dieses KUNSTMUSEUM... Hier bekommst du\n" + .string "viele fantastische Gemälde zu sehen.\p" + .string "Und der KURATOR ist einfach wunderbar.\p" + .string "Unter Künstlern wie mir ist dieses\n" + .string "MUSEUM einfach eine Inspiration.$" LilycoveCity_LilycoveMuseum_1F_Text_1879BF:: @ 81879BF - .string "This lady is pretty!\n" - .string "She’s like Mommy!$" + .string "Diese Frau ist hübsch!\n" + .string "Genau wie meine Mama!$" LilycoveCity_LilycoveMuseum_1F_Text_1879E6:: @ 81879E6 - .string "This POKéMON is adorable!\n" - .string "Just like our little boy!$" + .string "Dieses POKéMON ist anbetungswürdig!\n" + .string "Genau wie unser kleiner Sohn!$" LilycoveCity_LilycoveMuseum_1F_Text_187A1A:: @ 8187A1A - .string "I’d heard that this ART MUSEUM got\n" - .string "in some new paintings.\p" - .string "So, naturally I hurried over.\p" - .string "Are the new paintings up on the\n" - .string "second floor?$" + .string "Ich habe gehört, dass das KUNSTMUSEUM\n" + .string "einige neue Gemälde erhalten hat.\p" + .string "Die will ich mir natürlich sofort\n" + .string "anschauen.\p" + .string "Befinden sich die neuen Gemälde im\n" + .string "zweiten Stockwerk?$" LilycoveCity_LilycoveMuseum_1F_Text_187AA0:: @ 8187AA0 - .string "Lately, the CURATOR has been\n" - .string "unusually cheerful.\p" - .string "I bet something good happened for him.\n" - .string "Definitely.$" + .string "In letzter Zeit war der KURATOR außer-\n" + .string "gewöhnlich gut gelaunt.\p" + .string "Ich wette, er hat etwas Tolles erlebt.\n" + .string "Mit Sicherheit!$" LilycoveCity_LilycoveMuseum_1F_Text_187B04:: @ 8187B04 - .string "I aim to see many great paintings\n" - .string "here and learn from them.\p" - .string "I have this dream of one day having\n" - .string "my artwork exhibited here.$" + .string "Ich will mir hier viele große Werke an-\n" + .string "schauen und von ihnen lernen.\p" + .string "Ich träume davon, eines Tages hier\n" + .string "meine eigene Ausstellung zu haben.$" LilycoveCity_LilycoveMuseum_1F_Text_187B7F:: @ 8187B7F - .string "The ART MUSEUM has become a favorite\n" - .string "tourist destination.\p" - .string "It’s great for LILYCOVE...\n" - .string "No, great for the HOENN region!\p" - .string "This is what I’ve heard - a lone TRAINER\n" - .string "procured all the paintings upstairs.$" + .string "Das KUNSTMUSEUM ist zu einem\n" + .string "beliebten Ziel für Touristen geworden.\p" + .string "Das ist großartig für SEEGRASULB CITY.\n" + .string "Nein, großartig für die ganze HOENN-\l" + .string "Region!\p" + .string "Ein einziger TRAINER soll all die Gemälde\n" + .string "im oberen Stockwerk beschafft haben.$" diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc index 067cc335f..4fc29ee73 100644 --- a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,114 +1,114 @@ LilycoveCity_LilycoveMuseum_2F_Text_187C42:: @ 8187C42 - .string "This is our special exhibit hall.$" + .string "Dies ist unser besonderer Ausstellungs-\n" + .string "raum.$" LilycoveCity_LilycoveMuseum_2F_Text_187C64:: @ 8187C64 - .string "As you can plainly see, there is not a\n" - .string "single painting on exhibit.\p" - .string "Here, I don’t wish to exhibit works of\n" - .string "so-called classical art.\p" - .string "Such classical works you can see on\n" - .string "our ground floor.\p" - .string "I wish to exhibit work that is far\n" - .string "different from the classics.\p" - .string "Art, after all, is not restricted to old,\n" - .string "famous works!\p" - .string "This exhibit hall, I wish to fill it with...\p" - .string "Modern and vibrant artworks of\n" - .string "POKéMON seemingly ready to spring\l" - .string "forth into glorious life!$" + .string "Wie du klar erkennen kannst, gibt es\n" + .string "hier nicht ein einziges Gemälde.\p" + .string "Ich möchte hier auch nicht einfach die\n" + .string "Gemälde der so genannten Klassiker\l" + .string "ausstellen.\p" + .string "Hier soll Kunst zu sehen sein, die\n" + .string "weit von den Klassikern entfernt ist.\p" + .string "Kunst ist doch nicht nur auf alte,\n" + .string "berühmte Werke begrenzt!\p" + .string "In diesem Ausstellungsraum will ich...\p" + .string "Moderne und lebendige Kunst über\n" + .string "POKéMON sehen, die bereit sind, in\l" + .string "ein ruhmreiches Leben zu treten!$" LilycoveCity_LilycoveMuseum_2F_Text_187E1D:: @ 8187E1D - .string "I beg your pardon. I didn’t intend\n" - .string "to monopolize the conversation.\p" - .string "Now, as you are young, and yet\n" - .string "obviously well traveled...\p" - .string "You must encounter lively POKéMON\n" - .string "and works of art depicting them.\p" - .string "If you were to come across such a\n" - .string "painting, may we ask you to obtain\l" - .string "the artist’s permission to exhibit\l" - .string "it here?$" + .string "Oh, entschuldige. Ich wollte dich nicht\n" + .string "mit meinen Monologen langweilen.\p" + .string "Nun, du bist jung und offensichtlich\n" + .string "weit gereist...\p" + .string "Du hast bestimmt schon viele POKéMON\n" + .string "gesehen und Bilder, die sie darstellen.\p" + .string "Wenn du ein solches Bild siehst, kannst\n" + .string "du den Künstler bitte fragen, ob wir\l" + .string "sein Werk hier ausstellen dürfen?$" LilycoveCity_LilycoveMuseum_2F_Text_187F4E:: @ 8187F4E - .string "I wish to fill this exhibit hall with\n" - .string "modern and vibrant paintings of\l" - .string "POKéMON.$" + .string "Ich möchte diesen Ausstellungsraum mit\n" + .string "modernen und lebendigen Gemälden von\l" + .string "POKéMON füllen.$" LilycoveCity_LilycoveMuseum_2F_Text_187F9D:: @ 8187F9D - .string "Thanks to you, we’ve added a new\n" - .string "painting to our collection!\p" - .string "I’ve heard it depicts your POKéMON.\n" - .string "Truly magnificent!\p" - .string "Thank you so very, very much!$" + .string "Dank dir konnten wir ein neues Gemälde\n" + .string "für unsere Kollektion erwerben!\p" + .string "Ich habe gehört, es stellt dein POKéMON\n" + .string "dar. Wirklich einzigartig!\p" + .string "Vielen, vielen Dank!$" LilycoveCity_LilycoveMuseum_2F_Text_18802F:: @ 818802F - .string "Ah! It’s you!\n" + .string "Ah! Du bist es!\n" .string "{PLAYER}!$" LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 - .string "Isn’t this marvelous?\n" - .string "This collection of paintings!\p" - .string "Each one of them flawless!\n" - .string "None better than another!\p" - .string "These paintings have attracted\n" - .string "more guests to our ART MUSEUM.\p" - .string "Sincerely, I thank you, {PLAYER}.\n" - .string "This is my dream come true!$" + .string "Ist das nicht fantastisch?\n" + .string "Diese Sammlung von Gemälden!\p" + .string "Jedes einzelne makellos!\n" + .string "Keines besser als das andere!\p" + .string "Diese Gemälde ziehen viele neue\n" + .string "Besucher für unser KUNSTMUSEUM an.\p" + .string "Ehrlich, ich danke dir, {PLAYER}.\n" + .string "Mein Traum ist wahr geworden!$" LilycoveCity_LilycoveMuseum_2F_Text_188120:: @ 8188120 - .string "This is merely a token of my gratitude.$" + .string "Dies ist nur ein kleines Dankeschön.$" UnknownString_8188148: @ 8188148 - .string "{PLAYER} received a GLASS ORNAMENT.$" + .string "{PLAYER} erhält das GLASORNAMENT.$" LilycoveCity_LilycoveMuseum_2F_Text_188166:: @ 8188166 - .string "I will keep this for you until we\n" - .string "meet again.$" + .string "Ich werde das für dich aufbewahren, bis\n" + .string "wir uns wieder sehen.$" LilycoveCity_LilycoveMuseum_2F_Text_188194:: @ 8188194 - .string "Ah, so good to see you, {PLAYER}!\p" - .string "It’s an honor to have you visit us\n" - .string "on your busy journeys.\p" - .string "Please, relax and do enjoy your\n" - .string "visit with us.$" + .string "Ah, schön dich zu sehen, {PLAYER}!\p" + .string "Es ist eine Ehre für uns, dass du uns\n" + .string "trotz deiner vielen Aufgaben besuchst.\p" + .string "Bitte, entspanne dich und genieße\n" + .string "deinen Besuch bei uns.$" LilycoveCity_LilycoveMuseum_2F_Text_188219:: @ 8188219 - .string "It’s a picture frame with pink-colored\n" - .string "adornments.$" + .string "Ein Bilderrahmen mit pinkfarbenen\n" + .string "Verzierungen.$" LilycoveCity_LilycoveMuseum_2F_Text_18824C:: @ 818824C - .string "It’s a picture frame with yellow-colored\n" - .string "adornments.$" + .string "Ein Bilderrahmen mit gelben\n" + .string "Verzierungen.$" LilycoveCity_LilycoveMuseum_2F_Text_188281:: @ 8188281 - .string "It’s a picture frame with blue-colored\n" - .string "adornments.$" + .string "Ein Bilderrahmen mit blauen\n" + .string "Verzierungen.$" LilycoveCity_LilycoveMuseum_2F_Text_1882B4:: @ 81882B4 - .string "It’s a picture frame with red-colored\n" - .string "adornments.$" + .string "Ein Bilderrahmen mit roten\n" + .string "Verzierungen.$" LilycoveCity_LilycoveMuseum_2F_Text_1882E6:: @ 81882E6 - .string "It’s a picture frame with green-colored\n" - .string "adornments.$" + .string "Ein Bilderrahmen mit grünen\n" + .string "Verzierungen.$" LilycoveCity_LilycoveMuseum_2F_Text_18831A:: @ 818831A - .string "It’s a painting of POKéMON.$" + .string "Ein Bild eines POKéMON.$" LilycoveCity_LilycoveMuseum_2F_Text_188336:: @ 8188336 - .string "I’ve been away awhile, so the new\n" - .string "paintings up here surprised me.\p" - .string "I wish someone would paint my POKéMON\n" - .string "this pretty.$" + .string "Ich war eine Weile nicht hier, daher\n" + .string "haben mich die neuen Gemälde über-\l" + .string "rascht.\p" + .string "Ich wünschte, jemand würde mein\n" + .string "POKéMON so wunderbar porträtieren.$" LilycoveCity_LilycoveMuseum_2F_Text_1883AB:: @ 81883AB - .string "Well... So this is where they show the\n" - .string "topical POKéMON paintings.\p" - .string "I see, these new paintings are indeed\n" - .string "rather amusing.$" + .string "Nun... Hier stellen sie also Werke zum\n" + .string "Thema POKéMON aus.\p" + .string "Ich sehe schon. Die Gemälde sind\n" + .string "wirklich amüsant.$" LilycoveCity_LilycoveMuseum_2F_Text_188423:: @ 8188423 - .string "Wow, is that right?\n" - .string "These paintings are of your POKéMON.\p" - .string "Isn’t that just the ultimate joy for\n" - .string "a TRAINER?$" + .string "Wow, ehrlich?\n" + .string "Das sind Gemälde deiner POKéMON?\p" + .string "Ist das nicht die absolute Freude für\n" + .string "einen TRAINER?$" diff --git a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc b/data/text/maps/LilycoveCity_MoveDeletersHouse.inc index 1e2181aca..0898d7e2a 100644 --- a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/text/maps/LilycoveCity_MoveDeletersHouse.inc @@ -1,32 +1,34 @@ LilycoveCity_MoveDeletersHouse_Text_18B622:: @ 818B622 - .string "Uh...\n" - .string "Oh, yes, I’m the MOVE DELETER.\p" - .string "I can make POKéMON forget their moves.\p" - .string "Would you like me to do that?$" + .string "Äh...\n" + .string "Oh, ja. Ich bin der ATTACKEN-VERLERNER.\p" + .string "Ich sorge dafür, dass die POKéMON ihre\n" + .string "Attacken vergessen.\p" + .string "Möchtest du, dass ich dir helfe?$" LilycoveCity_MoveDeletersHouse_Text_18B68C:: @ 818B68C - .string "Which POKéMON should forget a move?$" + .string "Welches POKéMON soll eine Attacke\n" + .string "vergessen?$" LilycoveCity_MoveDeletersHouse_Text_18B6B0:: @ 818B6B0 - .string "Which move should be forgotten?$" + .string "Welche Attacke soll vergessen werden?$" LilycoveCity_MoveDeletersHouse_Text_18B6D0:: @ 818B6D0 - .string "{STR_VAR_1} seems to know only one\n" - .string "move...$" + .string "{STR_VAR_1} kennt scheinbar nur eine\n" + .string "einzige Attacke...$" LilycoveCity_MoveDeletersHouse_Text_18B6F2:: @ 818B6F2 - .string "Hm! {STR_VAR_1}’s {STR_VAR_2}?\n" - .string "That move should be forgotten?$" + .string "Hm! {STR_VAR_2} von {STR_VAR_1}?\n" + .string "Diese Attacke soll vergessen werden?$" LilycoveCity_MoveDeletersHouse_Text_18B71E:: @ 818B71E - .string "It worked to perfection!\p" - .string "{STR_VAR_1} has forgotten\n" - .string "{STR_VAR_2} completely.$" + .string "Das klappte doch perfekt!\p" + .string "{STR_VAR_1} hat {STR_VAR_2}\n" + .string "komplett vergessen.$" LilycoveCity_MoveDeletersHouse_Text_18B757:: @ 818B757 - .string "Come again if there are other moves\n" - .string "to be forgotten.$" + .string "Komm wieder, wenn es andere Attacken\n" + .string "gibt, die vergessen werden sollen.$" LilycoveCity_MoveDeletersHouse_Text_18B78C:: @ 818B78C - .string "What?\n" - .string "No EGG should know any moves.$" + .string "Was?\n" + .string "Ein EI kennt doch keine Attacken!$" diff --git a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc b/data/text/maps/LilycoveCity_PokemonCenter_1F.inc index c0cbb7436..b1f676671 100644 --- a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/text/maps/LilycoveCity_PokemonCenter_1F.inc @@ -1,26 +1,29 @@ LilycoveCity_PokemonCenter_1F_Text_189FC9:: @ 8189FC9 - .string "I wonder how many kinds of POKéMON\n" - .string "there are in the world?\p" - .string "It’d be great to cross seas and\n" - .string "trade POKéMON with people far away.$" + .string "Ich frage mich, wie viele Arten von\n" + .string "POKéMON es in der Welt wohl gibt?\p" + .string "Es muss toll sein, die Meere zu über-\n" + .string "queren und POKéMON mit Leuten zu\l" + .string "tauschen, die weit weg leben.$" LilycoveCity_PokemonCenter_1F_Text_18A048:: @ 818A048 - .string "I’ve been hearing about some rotten\n" - .string "scoundrels who steal POKéMON and rip\l" - .string "off METEORITES.$" + .string "Ich habe von einigen Schurken gehört,\n" + .string "die POKéMON stehlen und METEORITEN\l" + .string "klauen.$" LilycoveCity_PokemonCenter_1F_Text_18A0A1:: @ 818A0A1 - .string "Those rotten scoundrels who steal\n" - .string "POKéMON and rip off METEORITES...\p" - .string "I haven’t seen them around recently.$" + .string "Diese verkommenen Schurken, die\n" + .string "POKéMON stehlen und METEORITEN\l" + .string "klauen...\p" + .string "Ich habe sie in letzter Zeit nicht\n" + .string "gesehen.$" UnknownString_818A10A: @ 818A10A - .string "I’m going to get X ATTACK to raise\n" - .string "ATTACK during battle.\p" - .string "That way, I’ll be guaranteed to win!$" + .string "Ich besorge mir X-ANGRIFF, um meine\n" + .string "ATTACKEN im Kampf zu verstärken.\p" + .string "Auf diese Weise gewinne ich garantiert.$" UnknownString_818A168: @ 818A168 - .string "FULL HEAL is a little expensive,\n" - .string "but it is convenient.\p" - .string "Just one of these can cure any\n" - .string "POKéMON status problem.$" + .string "HYPERHEILER ist etwas teuer, aber sehr\n" + .string "nützlich.\p" + .string "Einer davon kann alle Statusprobleme\n" + .string "eines POKéMON heilen.$" diff --git a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc index fbfbf4353..09b4d59b5 100644 --- a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -1,251 +1,261 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A1D6:: @ 818A1D6 .string "Oh, wow!\n" - .string "It’s {PLAYER}!$" + .string "Das ist {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18A1E8:: @ 818A1E8 - .string "I’ve heard the news!\n" - .string "You’re really strong, aren’t you?\p" - .string "We always argue about who is the\n" - .string "strongest of all TRAINERS here.\p" - .string "So when I heard about you, I decided\n" - .string "to be your fan!\p" - .string "I hope you’ll keep on battling other\n" - .string "tough TRAINERS.\p" - .string "That way, we’ll be able to see more\n" - .string "of your hot, hot battles.\p" - .string "That will make the others here see\n" - .string "exactly how great you are.\p" - .string "Remember, I’m cheering for you,\n" + .string "Ich habe die Neuigkeit schon gehört.\n" + .string "Du bist wirklich stark, nicht wahr?\p" + .string "Wir diskutieren immer darüber, wer hier\n" + .string "der stärkste TRAINER ist.\p" + .string "Als ich von dir gehört habe, beschloss\n" + .string "ich, dein Fan zu werden!\p" + .string "Ich hoffe, du wirst auch weiterhin\n" + .string "gegen starke TRAINER antreten.\p" + .string "So kommen wir auch weiterhin in den\n" + .string "Genuss deiner megaheißen Kämpfe.\p" + .string "Dann sehen auch die anderen hier, wie\n" + .string "stark du wirklich bist!\p" + .string "Denk dran: Ich jubele dir zu,\n" .string "{PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18A36A:: @ 818A36A - .string "Yo, {PLAYER}!\n" - .string "You’re the one we want to win!$" + .string "Ja, {PLAYER}!\n" + .string "Dich wollen wir als Sieger sehen!$" LilycoveCity_PokemonTrainerFanClub_Text_18A391:: @ 818A391 - .string "The others, they don’t know that\n" - .string "you’re the best of the best!\p" - .string "Isn’t that right, {PLAYER}?\n" - .string "Show them you’ve got guts!$" + .string "Die anderen wissen gar nicht, dass du\n" + .string "besser bist als alle anderen!\p" + .string "Das stimmt doch, oder {PLAYER}?\n" + .string "Zeig ihnen, was du drauf hast!$" LilycoveCity_PokemonTrainerFanClub_Text_18A400:: @ 818A400 - .string "I hate to say this, but the TRAINER\n" - .string "everybody’s talking about is\l" - .string "{STR_VAR_1}, no question about it!\p" - .string "That TRAINER’s power...\n" - .string "It’s out of the ordinary.$" + .string "Ich sage es ja nicht gerne, aber der\n" + .string "TRAINER, über den alle sprechen, ist\l" + .string "{STR_VAR_1}, keine Frage!\p" + .string "Die Stärke dieses TRAINERS...\n" + .string "Ganz außergewöhnlich.$" LilycoveCity_PokemonTrainerFanClub_Text_18A48D:: @ 818A48D - .string "Darn it... I’ve been telling people\n" - .string "that {STR_VAR_1} is the best now...\p" - .string "But no one wants to listen...$" + .string "Mist... Ich sage jedem, dass {STR_VAR_1}\n" + .string "der Beste von allen ist.\p" + .string "Aber niemand hört mir zu...$" LilycoveCity_PokemonTrainerFanClub_Text_18A4EA:: @ 818A4EA - .string "I’ve been hearing things about a\n" - .string "tough new TRAINER.\p" - .string "This TRAINER’s supposed to be beating\n" - .string "GYM LEADERS, even.\p" - .string "Do you know anything about this\n" - .string "new TRAINER?$" + .string "Ich habe etwas über einen neuen,\n" + .string "starken TRAINER gehört.\p" + .string "Dieser TRAINER wird bestimmt auch die\n" + .string "ARENALEITER besiegen.\p" + .string "Weißt du irgendwas über diesen neuen\n" + .string "TRAINER?$" LilycoveCity_PokemonTrainerFanClub_Text_18A584:: @ 818A584 .string "Oh!\n" .string "{PLAYER}!\p" - .string "Go for it!\n" - .string "I’m pulling for you!$" + .string "Los!\n" + .string "Ich drücke dir die Daumen!$" LilycoveCity_PokemonTrainerFanClub_Text_18A5AC:: @ 818A5AC - .string "Sigh...\n" - .string "BRAWLY...\p" - .string "Oh, no! Wait!\n" - .string "That’s not right! No, no, no!\p" - .string "I’m your fan through and through!\p" - .string "So make me proud!\n" - .string "Go for it!$" + .string "Seufz...\n" + .string "KAMILLO...\p" + .string "Oh, nein! Warte mal!\n" + .string "Das stimmt gar nicht! Nein, nein!\p" + .string "Ich bin dein größter Fan!\p" + .string "Also mach mich stolz!\n" + .string "Los!$" LilycoveCity_PokemonTrainerFanClub_Text_18A629:: @ 818A629 - .string "I can’t help it, I can only get to\n" - .string "like BRAWLY...$" + .string "Ich kann mir nicht helfen, aber ich\n" + .string "finde nur KAMILLO klasse...$" LilycoveCity_PokemonTrainerFanClub_Text_18A65B:: @ 818A65B - .string "Nobody understands the charm of\n" - .string "BRAWLY...\p" - .string "I don’t care!\p" - .string "Even if I’m the only one, I’m going\n" - .string "to keep cheering for BRAWLY!$" + .string "Niemand erkennt den Charme von\n" + .string "KAMILLO...\p" + .string "Mir doch egal!\p" + .string "Auch wenn keiner ihm zujubelt, ICH\n" + .string "unterstütze KAMILLO!$" LilycoveCity_PokemonTrainerFanClub_Text_18A6D4:: @ 818A6D4 - .string "Whatever anyone says, my favorite\n" - .string "TRAINER is DEWFORD’s GYM LEADER\l" - .string "BRAWLY!$" + .string "Egal, was die anderen sagen, der ARENA-\n" + .string "LEITER von FAUSTAUHAVEN, KAMILLO,\l" + .string "ist mein Favorit!$" LilycoveCity_PokemonTrainerFanClub_Text_18A71E:: @ 818A71E - .string "You’ve surpassed your own father in\n" - .string "every regard!\p" - .string "I’m telling you, so there’s no question\n" - .string "about it at all!$" + .string "Du hast deinen Vater in jeder Hinsicht\n" + .string "übertroffen!\p" + .string "Das sag ich dir. Und da gibt es\n" + .string "überhaupt keinen Zweifel dran!$" LilycoveCity_PokemonTrainerFanClub_Text_18A789:: @ 818A789 - .string "Even when things turned bleak, your\n" - .string "father never gave up.\p" - .string "This I know to be true.\p" - .string "You never give up even if you lose!\n" - .string "So keep on battling!$" + .string "Selbst in scheinbar aussichtslosen\n" + .string "Situationen gibt dein Vater nicht auf.\p" + .string "Ich weiß, dass das stimmt!\p" + .string "Und du verhältst dich genauso.\n" + .string "Also, kämpfe fleißig weiter.$" LilycoveCity_PokemonTrainerFanClub_Text_18A814:: @ 818A814 - .string "NORMAN battled with more power,\n" - .string "charisma, and showmanship than you.\p" - .string "Even though people may say that\n" - .string "you’re strong...\p" - .string "You’ve still got a long way to go\n" - .string "compared to your father.$" + .string "NORMAN hat im Kampf mehr Kraft, \n" + .string "Charisma und Darbietungstalent\l" + .string "gezeigt als du.\p" + .string "Auch wenn die Leute sagen, dass du\n" + .string "stark bist...\p" + .string "Du hast noch einen weiten Weg vor dir,\n" + .string "wenn du so werden willst wie dein Vater.$" LilycoveCity_PokemonTrainerFanClub_Text_18A8C4:: @ 818A8C4 - .string "You’re beginning to get the same\n" - .string "air of awe NORMAN exudes.\p" - .string "But there’s something conclusively\n" - .string "different between you and NORMAN.\p" - .string "I can’t tell you what that is.\n" - .string "You’ll have to find it yourself.$" + .string "Du bekommst langsam auch die Aura von\n" + .string "Autorität, die NORMAN umgibt.\p" + .string "Aber es gibt einen gewaltigen\n" + .string "Unterschied zwischen dir und NORMAN.\p" + .string "Aber ich kann dir nicht sagen, was das\n" + .string "ist. Du musst es selbst herausfinden.$" LilycoveCity_PokemonTrainerFanClub_Text_18A984:: @ 818A984 - .string "Everyone here, we’re all huge fans\n" - .string "of POKéMON battles.\p" - .string "We discuss who we consider to be\n" - .string "the strongest of all TRAINERS.\p" - .string "If you were to become famous, we\n" - .string "might even become your fans!$" + .string "Jeder hier ist ein großer Fan von\n" + .string "POKéMON-Kämpfen.\p" + .string "Wir diskutieren gerade, welcher\n" + .string "TRAINER der stärkste ist.\p" + .string "Wenn du berühmt wirst, werden wir\n" + .string "vielleicht deine Fans!$" LilycoveCity_PokemonTrainerFanClub_Text_18AA39:: @ 818AA39 - .string "Oh, woweee! It’s {PLAYER}!\n" - .string "For real, too!\p" - .string "Please, shake my hand, shake my hand!$" + .string "KREISCH! Das ist {PLAYER}!\n" + .string "Wirklich und wahrhaftig!!!\p" + .string "Bitte, schüttle mir die Hand! Biiitte!!!$" LilycoveCity_PokemonTrainerFanClub_Text_18AA83:: @ 818AA83 - .string "I’ll always cheer for you, {PLAYER}!\n" - .string "Always, always!\p" - .string "I don’t want to see you lose ever,\n" - .string "{PLAYER}.\p" - .string "Because I know you’re really, really\n" - .string "strong, {PLAYER}!$" + .string "Ich juble dir ständig zu, {PLAYER}!\n" + .string "Immer! Iiimmer!\p" + .string "Ich möchte dich niemals als Verlierer\n" + .string "sehen, {PLAYER}.\p" + .string "Ich weiß, dass du sehr, sehr, sehr stark\n" + .string "bist, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18AB0A:: @ 818AB0A - .string "{STR_VAR_1} is really cool...\p" - .string "Everyone thinks so, right, right?$" + .string "{STR_VAR_1} ist wirklich megacool...\p" + .string "Jeder denkt das, stimmt’s? Stimmt’s?!?$" LilycoveCity_PokemonTrainerFanClub_Text_18AB41:: @ 818AB41 - .string "{STR_VAR_1} really is cool, don’t\n" - .string "you think so?\p" - .string "Even if it’s just me, I’m going to keep\n" - .string "cheering my favorite TRAINER.$" + .string "{STR_VAR_1} ist cooool, meinst du nicht\n" + .string "auch?\p" + .string "Selbst ein Würstchen wie ich jubelt\n" + .string "seinem favorisierten TRAINER zu.$" LilycoveCity_PokemonTrainerFanClub_Text_18ABAE:: @ 818ABAE - .string "My favorite TRAINER is...\p" - .string "Cool...\p" - .string "Strong...\p" - .string "And really nice...\p" - .string "I wish there was a TRAINER like that...$" + .string "Mein Lieblings-TRAINER muss...\p" + .string "cool...\p" + .string "stark...\p" + .string "und total nett sein...\p" + .string "Ich wollte, es gäbe so einen TRAINER...$" LilycoveCity_PokemonTrainerFanClub_Text_18AC15:: @ 818AC15 - .string "Whoa! It’s {PLAYER}!\n" - .string "Wicked!\p" - .string "When I grow up, I want to be strong\n" - .string "like you, {PLAYER}!$" + .string "Hui! Das ist {PLAYER}!\n" + .string "Wahnsinn!\p" + .string "Wenn ich groß bin, möchte ich auch so\n" + .string "stark sein wie du, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18AC5E:: @ 818AC5E - .string "Even if I’m the only one...\p" - .string "You’ll always be the only one I\n" - .string "cheer for, {PLAYER}!\p" - .string "Because I believe in you, {PLAYER}!$" + .string "Auch wenn ich dein einziger Fan bin...\p" + .string "Ich werde dir immer zujubeln, du bist\n" + .string "mein Favorit, {PLAYER}!\p" + .string "Denn ich glaube an dich, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18ACC7:: @ 818ACC7 - .string "{STR_VAR_1} is so wickedly cool...\n" - .string "I want to shake hands with my hero.$" + .string "{STR_VAR_1} ist so unverschämt cool...\n" + .string "Ich möchte meinem Held die Hand\l" + .string "schütteln.$" LilycoveCity_PokemonTrainerFanClub_Text_18AD05:: @ 818AD05 - .string "Even if I’m the only one...\p" - .string "I’m never going to stop being\n" - .string "{STR_VAR_1}’s fan!\p" - .string "Because I’ve heard, {STR_VAR_1}\n" - .string "never loses!$" + .string "Auch wenn ich der einzige Fan bin...\p" + .string "Ich werde niemals aufhören,\n" + .string "ein Fan von {STR_VAR_1} zu sein!\p" + .string "Denn ich habe gehört, dass {STR_VAR_1}\n" + .string "niemals verliert!$" LilycoveCity_PokemonTrainerFanClub_Text_18AD6D:: @ 818AD6D .string "{PLAYER}!\n" - .string "You are amazing after all!\p" - .string "Ever since I set eyes on you, I knew\n" - .string "that you were great.\p" - .string "It looks like my eyes didn’t deceive me.$" + .string "Du bist wirklich unglaublich!\p" + .string "Schon als ich dich das erste Mal gesehen\n" + .string "habe, habe ich deine Einzigartigkeit\l" + .string "bemerkt.\p" + .string "Scheinbar täuschen mich meine Augen\n" + .string "nie.$" LilycoveCity_PokemonTrainerFanClub_Text_18ADEF:: @ 818ADEF - .string "Who cares about the others.\n" - .string "I’m in your corner!\p" - .string "You don’t need to worry. Just get\n" - .string "out there and battle like always.$" + .string "Wen kümmern schon die anderen?\n" + .string "Ich bin auf deiner Seite!\p" + .string "Keine Sorge. Geh da raus und kämpfe\n" + .string "wie immer.$" LilycoveCity_PokemonTrainerFanClub_Text_18AE63:: @ 818AE63 - .string "You’re a pretty decent TRAINER,\n" - .string "I think.\p" - .string "But I also think that {STR_VAR_1}\n" - .string "is number one right now.\p" - .string "That’s just my opinion.\n" - .string "Don’t worry about it too much.$" + .string "Du bist ein anständiger TRAINER.\n" + .string "Das ist meine Meinung.\p" + .string "Aber ich denke, {STR_VAR_1} ist im\n" + .string "Moment die Nummer eins.\p" + .string "Das ist jedenfalls meine Auffassung.\n" + .string "Aber lass dir darüber keine grauen\l" + .string "Haare wachsen.$" LilycoveCity_PokemonTrainerFanClub_Text_18AEF5:: @ 818AEF5 - .string "Wow, you really are strong.\n" - .string "Maybe even stronger than {STR_VAR_1}.\p" - .string "But {STR_VAR_1} needs me.\p" - .string "If I don’t cheer for {STR_VAR_1},\n" - .string "who will?$" + .string "Wow, du bist wirklich sehr stark.\n" + .string "Vielleicht sogar stärker als\l" + .string "{STR_VAR_1}.\p" + .string "Aber {STR_VAR_1} braucht mich.\p" + .string "Wenn ich {STR_VAR_1} nicht zujuble, wer\n" + .string "wird es dann tun?$" LilycoveCity_PokemonTrainerFanClub_Text_18AF62:: @ 818AF62 - .string "You’ve changed my mind!\n" - .string "You are strong, aren’t you?\p" - .string "I’d like you to tell me how you managed\n" - .string "to get so strong!$" + .string "Du hast mich überzeugt.\n" + .string "Du bist stark, nicht wahr?\p" + .string "Würdest du mir bitte erzählen, wie\n" + .string "du so stark geworden bist?$" LilycoveCity_PokemonTrainerFanClub_Text_18AFD0:: @ 818AFD0 - .string "The tougher the situation, the more\n" - .string "attractively you battle.\p" - .string "I can’t wait for your next battle!$" + .string "Je schwieriger die Lage, desto\n" + .string "ästhetischer wird dein Kampf.\p" + .string "Ich kann deinen nächsten Kampf gar\n" + .string "nicht erwarten!$" LilycoveCity_PokemonTrainerFanClub_Text_18B030:: @ 818B030 - .string "Among the recently hot TRAINERS,\n" - .string "{STR_VAR_1} is the standout.\p" - .string "That toughness, it’s simply not normal.\p" - .string "You’re doing okay, but you’re not in\n" - .string "the same class as {STR_VAR_1}.$" + .string "Unter den wirklich heißen TRAINERN\n" + .string "hebt sich {STR_VAR_1} besonders hervor.\p" + .string "Diese Stärke. Das ist nicht normal.\p" + .string "Du kämpfst auch sehr gut, aber du\n" + .string "gehörst nicht in die gleiche Klasse\l" + .string "wie {STR_VAR_1}.$" LilycoveCity_PokemonTrainerFanClub_Text_18B0C8:: @ 818B0C8 - .string "You are really popular...\p" - .string "You’re strong, and you’re caring to\n" - .string "POKéMON. No one can knock you.\p" - .string "But, you know, I believe in {STR_VAR_1}.\p" - .string "{STR_VAR_1} is definitely stronger!\n" - .string "I’m positive!$" + .string "Du bist sehr populär...\p" + .string "Du bist stark und du sorgst gut für\n" + .string "deine POKéMON.\p" + .string "Aber, weißt du, ich glaube an\n" + .string "{STR_VAR_1}.\p" + .string "{STR_VAR_1} ist definitiv stärker!\n" + .string "Ich bin mir da sicher!$" LilycoveCity_PokemonTrainerFanClub_Text_18B16E:: @ 818B16E - .string "You...\p" - .string "Impressive!$" + .string "Du...\p" + .string "Beeindruckend!$" LilycoveCity_PokemonTrainerFanClub_Text_18B181:: @ 818B181 - .string "Your true worth, it is fine if only\n" - .string "I recognized it.\p" - .string "The others I doubt will understand\n" - .string "the hidden power that beats within.$" + .string "Dein wahrer Wert... Es ist gut, wenn\n" + .string "nur ich ihn erkenne.\p" + .string "Ich glaube nicht, dass die anderen die\n" + .string "versteckten Kräfte verstehen würden.$" LilycoveCity_PokemonTrainerFanClub_Text_18B1FD:: @ 818B1FD - .string "Yes, I see strength in your eyes.\p" - .string "But!\p" - .string "You still haven’t realized your\n" - .string "potential.$" + .string "Ja, deine Augen spiegeln deine Stärke\n" + .string "wider.\p" + .string "Aber!\p" + .string "Du hast dein eigenes Potential noch\n" + .string "nicht erkannt.$" LilycoveCity_PokemonTrainerFanClub_Text_18B24F:: @ 818B24F - .string "It is true that you are tremendously\n" - .string "powerful.\p" - .string "But!\n" - .string "I can tell...\p" - .string "That strength cannot be considered\n" - .string "true strength yet!\p" - .string "True strength is...!\n" + .string "Es stimmt, du agierst wirklich sehr\n" + .string "kraftvoll.\p" + .string "Aber!\n" + .string "Ich sage dir was!\p" + .string "Diese Kraft kann noch nicht als wahre\n" + .string "Stärke betrachtet werden!\p" + .string "Wahre Stärke ist...\n" .string "... ...\p" - .string "Actually, I have no idea, either.$" + .string "Äh, eigentlich weiß ich das auch nicht...$" diff --git a/data/text/maps/LittlerootTown.inc b/data/text/maps/LittlerootTown.inc index 1e23d584f..e41038b1c 100644 --- a/data/text/maps/LittlerootTown.inc +++ b/data/text/maps/LittlerootTown.inc @@ -1,94 +1,100 @@ LittlerootTown_Text_16A7C9:: @ 816A7C9 - .string "MOM: {PLAYER}, we’re here, honey!\p" - .string "It must be tiring riding with our things\n" - .string "in the moving truck.\p" - .string "Well, this is LITTLEROOT TOWN.\p" - .string "How do you like it?\n" - .string "This is our new home!\p" - .string "It has a quaint feel, but it seems to be\n" - .string "an easy place to live, don’t you think?\p" - .string "And, you get your own room, {PLAYER}!\n" - .string "Let’s go inside.$" + .string "MUTTER: {PLAYER}, wir sind da, Schatz!\p" + .string "Die Fahrt im Umzugswagen zwischen all\n" + .string "unseren Sachen war bestimmt ermüdend.\p" + .string "Nun, wir sind in WURZELHEIM.\p" + .string "Wie gefällt es dir?\n" + .string "Dies ist unser neues Zuhause!\p" + .string "Ist das idyllisch! Man kann hier sicher\n" + .string "wunderbar leben, meinst du nicht?\p" + .string "Und... Du bekommst dein eigenes\n" + .string "Zimmer, {PLAYER}! Lass uns hineingehen!$" LittlerootTown_Text_16A8EE:: @ 816A8EE - .string "MOM: Wait, {PLAYER}!$" + .string "MUTTER: Warte, {PLAYER}!$" LittlerootTown_Text_16A8FD:: @ 816A8FD - .string "MOM: {PLAYER}! {PLAYER}! Did you\n" - .string "introduce yourself to PROF. BIRCH?\p" - .string "Oh! What an adorable POKéMON!\n" - .string "You got it from PROF. BIRCH. How nice!\p" - .string "You’re your father’s child, all right.\n" - .string "You look good together with POKéMON!\p" - .string "Here, honey! If you’re going out on an\n" - .string "adventure, wear these RUNNING SHOES.\p" - .string "They’ll put a zip in your step!$" + .string "MUTTER: {PLAYER}! Hast du dich schon\n" + .string "PROF. BIRK vorgestellt?\p" + .string "Oh! Was für ein hübsches POKéMON! Du\n" + .string "hast es von PROF. BIRK erhalten? Toll!\p" + .string "Du bist das Kind deines Vaters! Wunder-\n" + .string "bar. Du siehst gut aus mit deinem\l" + .string "POKéMON!\p" + .string "Hier, Liebling! Für eine Abenteuerreise\n" + .string "sind diese TURBOTRETER wie geschaffen.\p" + .string "Sie werden deinen Schritt\n" + .string "beschleunigen!$" LittlerootTown_Text_16AA32:: @ 816AA32 - .string "{PLAYER} switched shoes with the\n" - .string "RUNNING SHOES.$" + .string "{PLAYER} zieht die TURBOTRETER an.$" LittlerootTown_Text_16AA5C:: @ 816AA5C - .string "MOM: {PLAYER}, those shoes came with\n" - .string "instructions.\p" - .string "“Press the B Button while wearing these\n" - .string "RUNNING SHOES to run extra-fast!\p" - .string "“Slip on these RUNNING SHOES and race\n" - .string "in the great outdoors!”$" + .string "MUTTER: {PLAYER}, für diese Schuhe gibt\n" + .string "es eine Bedienungsanleitung.\p" + .string "“Halte den B-Knopf gedrückt,\n" + .string "wenn du diese TURBOTRETER anhast,\l" + .string "um zu rennen!\p" + .string "Schlüpf in diese TURBOTRETER und\n" + .string "erobere die Welt da draußen!”$" LittlerootTown_Text_16AB10:: @ 816AB10 .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "To think that you have your very own\n" - .string "POKéMON now...\l" - .string "Your father will be overjoyed.\p" - .string "...But please be careful.\n" - .string "If anything happens, you can come home.\p" - .string "Go on, go get them, honey!$" + .string "Sich vorzustellen, dass du nun dein\n" + .string "eigenes POKéMON besitzt...\l" + .string "Dein Vater wird überglücklich sein.\p" + .string "...Aber sei bitte vorsichtig.\n" + .string "Sollte etwas passieren, komm wieder\l" + .string "nach Hause.\p" + .string "Lauf, schnapp’ sie dir alle, Schatz!$" LittlerootTown_Text_16AC00:: @ 816AC00 - .string "If you use a PC, you can store items\n" - .string "and POKéMON.\p" - .string "The power of science is staggering!$" + .string "Wenn du einen PC benutzt, kannst du\n" + .string "dort Items und POKéMON lagern.\p" + .string "Die Kraft der Wissenschaft ist\n" + .string "atemberaubend!$" LittlerootTown_Text_16AC56:: @ 816AC56 - .string "PROF. BIRCH spends days in his LAB\n" - .string "studying, then he’ll suddenly go out in\l" - .string "the wild to do more research...\p" - .string "When does PROF. BIRCH spend time\n" - .string "at home?$" + .string "PROF. BIRK verbringt seine Tage in\n" + .string "seinem LABOR, dann rennt er plötzlich\l" + .string "nach draußen in die Wildnis, um zu\l" + .string "forschen...\p" + .string "Wann ist PROF. BIRK eigentlich mal\n" + .string "zu Hause?$" LittlerootTown_Text_16ACEB:: @ 816ACEB - .string "If you go in the tall grass at the sides\n" - .string "of this road, wild POKéMON will appear.$" + .string "Wenn du in das hohe Gras am Seitenrand\n" + .string "der Pfade gehst, triffst du auf\l" + .string "wilde POKéMON.$" LittlerootTown_Text_16AD3C:: @ 816AD3C - .string "It’s not safe to go out there if you\n" - .string "don’t have any POKéMON with you.$" + .string "Hast du keine POKéMON dabei, ist es\n" + .string "dort sehr gefährlich.$" LittlerootTown_Text_16AD82:: @ 816AD82 - .string "I can hear someone shouting down the\n" - .string "road here.\p" - .string "What should I do? What should we do?\n" - .string "Somebody has to go help...$" + .string "Ich kann am Ende dieser Straße\n" + .string "jemanden schreien hören.\p" + .string "Was soll ich tun? Was sollen wir tun?\n" + .string "Jemand muss doch helfen...$" LittlerootTown_Text_16ADF2:: @ 816ADF2 - .string "Boy, am I glad you went and rescued\n" - .string "the PROFESSOR.$" + .string "Junge, bin ich froh, dass du den\n" + .string "PROFESSOR gerettet hast!$" LittlerootTown_Text_16AE25:: @ 816AE25 - .string "Are you going to catch POKéMON?\n" - .string "Good luck!$" + .string "Gehst du POKéMON fangen?\n" + .string "Viel Glück!$" LittlerootTown_Text_16AE50:: @ 816AE50 - .string "LITTLEROOT TOWN\n" - .string "“A town that can’t be shaded any hue.”$" + .string "WURZELHEIM\n" + .string "“Ein Ort, wie es ihn nur einmal gibt.”$" LittlerootTown_Text_16AE87:: @ 816AE87 - .string "PROF. BIRCH’S POKéMON LAB$" + .string "PROF. BIRKS POKéMON-LABOR$" LittlerootTown_Text_16AEA1:: @ 816AEA1 - .string "{PLAYER}’s HOUSE$" + .string "HAUS von {PLAYER}$" LittlerootTown_Text_16AEAC:: @ 816AEAC - .string "PROF. BIRCH’S HOUSE$" + .string "PROF. BIRKS HAUS$" diff --git a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc b/data/text/maps/LittlerootTown_BrendansHouse_1F.inc index 888fc8973..9952028d1 100644 --- a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/text/maps/LittlerootTown_BrendansHouse_1F.inc @@ -1,73 +1,76 @@ LittlerootTown_BrendansHouse_1F_Text_172429:: @ 8172429 - .string "MOM: See, {PLAYER}?\n" - .string "Isn’t it nice in here, too?$" + .string "MUTTER: Siehst du, {PLAYER}?\n" + .string "Hier ist es doch auch schön, oder nicht?$" LittlerootTown_BrendansHouse_1F_Text_172453:: @ 8172453 - .string "The mover’s POKéMON do all the work\n" - .string "of moving us in and cleaning up after.\l" - .string "This is so convenient!\p" - .string "{PLAYER}, your room is upstairs.\n" - .string "Go check it out, dear!\p" - .string "DAD bought you a new clock to mark\n" - .string "our move here.\l" - .string "Don’t forget to set it!$" + .string "Die POKéMON machen für uns den Umzug,\n" + .string "räumen alles ein und machen sauber.\l" + .string "Das ist doch so etwas von praktisch!\p" + .string "{PLAYER}, dein Zimmer ist oben.\n" + .string "Schau es dir doch mal an, Spatz!\p" + .string "VATI hat dir eine neue Uhr zur\n" + .string "Begrüßung geschenkt.\l" + .string "Vergiss nicht, sie einzustellen!$" LittlerootTown_BrendansHouse_1F_Text_172531:: @ 8172531 - .string "MOM: Well, {PLAYER}?\p" - .string "Aren’t you interested in seeing your\n" - .string "very own room?$" + .string "MUTTER: Nun, {PLAYER}?\p" + .string "Bist du nicht neugierig, dein neues\n" + .string "Zimmer zu sehen?$" LittlerootTown_BrendansHouse_1F_Text_172574:: @ 8172574 LittlerootTown_MaysHouse_1F_Text_172574:: @ 8172574 - .string "MOM: {PLAYER}.\p" - .string "Go set the clock in your room, honey.$" + .string "MUTTER: {PLAYER}, Schatz!\p" + .string "Stell bitte die Uhr in deinem Zimmer ein.$" LittlerootTown_BrendansHouse_1F_Text_1725A3:: @ 81725A3 - .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" - .string "Quick! Come quickly!$" + .string "MUTTER: Oh! {PLAYER}! {PLAYER}!\n" + .string "Schnell! Komm schnell her!$" LittlerootTown_BrendansHouse_1F_Text_1725C9:: @ 81725C9 LittlerootTown_MaysHouse_1F_Text_1725C9:: @ 81725C9 - .string "MOM: Look! It’s PETALBURG GYM!\n" - .string "Maybe DAD will be on!$" + .string "MUTTER: Da! Da ist die ARENA von BLÜTEN-\n" + .string "BURG CITY! Ich glaube, VATI ist im\l" + .string "Fernsehen!$" LittlerootTown_BrendansHouse_1F_Text_1725FE:: @ 81725FE LittlerootTown_MaysHouse_1F_Text_1725FE:: @ 81725FE - .string "MOM: Oh... It’s over.\p" - .string "I think DAD was on, but we missed him.\n" - .string "Too bad.$" + .string "MUTTER: Oh... Schon vorbei.\p" + .string "Ich glaube, VATI war im Fernsehen und\n" + .string "wir haben ihn verpasst. Schade!$" LittlerootTown_BrendansHouse_1F_Text_172644:: @ 8172644 LittlerootTown_MaysHouse_1F_Text_172644:: @ 8172644 - .string "Oh, yes.\n" - .string "One of DAD’s friends lives in town.\p" - .string "PROF. BIRCH is his name.\p" - .string "He lives right next door, so you should\n" - .string "go over and introduce yourself.$" + .string "Ach ja.\n" + .string "Einer von VATIS Freunden lebt hier.\p" + .string "PROF. BIRK ist sein Name.\p" + .string "Er lebt gleich nebenan, daher solltest\n" + .string "du hinübergehen und dich vorstellen.$" LittlerootTown_BrendansHouse_1F_Text_1726D2:: @ 81726D2 - .string "MOM: See you, honey!$" + .string "MUTTER: Bis später, Spatz!$" LittlerootTown_BrendansHouse_1F_Text_1726E7:: @ 81726E7 - .string "MOM: Did you introduce yourself to\n" - .string "PROF. BIRCH?$" + .string "MUTTER: Hast du dich bei PROF. BIRK\n" + .string "vorgestellt?$" LittlerootTown_BrendansHouse_1F_Text_172717:: @ 8172717 - .string "MOM: How are you doing, {PLAYER}?\n" - .string "You look a little tired.\p" - .string "I think you should rest a bit.$" + .string "MUTTER: Wie geht es dir, {PLAYER}?\n" + .string "Du siehst müde aus.\p" + .string "Ich denke, du solltest dich etwas\n" + .string "ausruhen.$" LittlerootTown_BrendansHouse_1F_Text_17276B:: @ 817276B - .string "MOM: Take care, honey!$" + .string "MUTTER: Pass auf dich auf, Schatz!$" LittlerootTown_BrendansHouse_1F_Text_172782:: @ 8172782 - .string "MOM: Oh? Did DAD give you that BADGE?\p" - .string "Then here’s something from your MOM!$" + .string "MUTTER: Oh! Hat VATI dir den ORDEN\n" + .string "gegeben?\p" + .string "Dann ist das hier von deiner MUTTI!$" LittlerootTown_BrendansHouse_1F_Text_1727CD:: @ 81727CD - .string "Don’t push yourself too hard, dear.\n" - .string "You can always come home.\p" - .string "Go for it, honey!$" + .string "Überanstreng dich nicht, Liebes.\n" + .string "Du kannst jederzeit nach Hause kommen.\p" + .string "Und jetzt nichts wie los, Schatz!$" LittlerootTown_BrendansHouse_1F_Text_17281D:: @ 817281D .string "Gyao, gyao gyaoh...$" @@ -76,71 +79,81 @@ LittlerootTown_BrendansHouse_1F_Text_172831:: @ 8172831 .string "Gwagwah gwah...$" LittlerootTown_BrendansHouse_1F_Text_172841:: @ 8172841 - .string "INTERVIEWER: ...We brought you this\n" - .string "report from in front of PETALBURG GYM.$" + .string "INTERVIEWER: Das war unsere Reportage\n" + .string "über die ARENA in BLÜTENBURG CITY.$" UnknownString_817288C: @ 817288C - .string "There is a movie on TV.\p" - .string "Two men are dancing on a big piano\n" - .string "keyboard.\p" - .string "Better get going!$" + .string "Da läuft gerade ein Film.\p" + .string "Zwei Männer tanzen auf riesengroßen\n" + .string "Klaviertasten.\p" + .string "Aber es wird Zeit aufzubrechen!$" UnknownString_81728E3: @ 81728E3 - .string "It’s the instruction booklet for the\n" - .string "RUNNING SHOES.\p" - .string "“Press the B Button to run while\n" - .string "wearing your RUNNING SHOES.\p" - .string "“Lace up your RUNNING SHOES and hit\n" - .string "the road running!”$" + .string "Das ist die Bedienungsanleitung für\n" + .string "die TURBOTRETER.\p" + .string "“Halte den B-Knopf gedrückt, um\n" + .string "zu rennen, während du deine\l" + .string "TURBOTRETER anhast.\p" + .string "Binde dir die TURBOTRETER zu und wirble\n" + .string "den Staub der Straße auf!”$" LittlerootTown_BrendansHouse_1F_Text_17298B:: @ 817298B - .string "DAD: Hm?\p" - .string "Hey, it’s {PLAYER}!\p" - .string "It’s been a while since I saw you,\n" - .string "but you look...stronger, somehow.\p" - .string "That’s the impression I get.\n" - .string "But your old man hasn’t given up yet!\p" - .string "Oh, yes, I have something for you.\n" - .string "This came to you from someone named\l" - .string "MR. BRINEY.$" + .string "VATER: Hm?\p" + .string "Hey, das ist ja {PLAYER}!\p" + .string "Du hast uns ja schon lange nicht mehr\n" + .string "besucht... Du siehst irgendwie\l" + .string "stärker aus.\p" + .string "Das ist zumindest mein Eindruck. Aber\n" + .string "dein alter Herr gibt noch nicht auf.\p" + .string "Oh, ich habe hier etwas für dich.\n" + .string "Das soll ich dir von einem MR. BRACK\l" + .string "geben.$" LittlerootTown_BrendansHouse_1F_Text_172A7D:: @ 8172A7D - .string "DAD: Hm, a TICKET for a ferry?\p" - .string "If I recall, there are ferry ports in\n" - .string "SLATEPORT and LILYCOVE.\p" - .string "{PLAYER}, if you have ambition as a\n" - .string "TRAINER, go to the BATTLE TOWER.\p" - .string "It should teach you that there is\n" - .string "no end to a TRAINER’s chosen path.$" + .string "VATER: Hm, ein TICKET für eine Fähre?\p" + .string "Ich weiß, dass es in GRAPHITPORT CITY\n" + .string "und SEEGRASULB CITY Anlegestellen für\l" + .string "Fähren gibt.\p" + .string "{PLAYER}, wenn du den Ehrgeiz eines\n" + .string "TRAINERS hast, dann geh zum DUELLTURM.\p" + .string "Dort wirst du lernen, dass der Weg eines\n" + .string "TRAINERS niemals ein Ende findet.$" LittlerootTown_BrendansHouse_1F_Text_172B5E:: @ 8172B5E - .string "I’d better get back to PETALBURG GYM.\p" - .string "MOM, thanks for looking after the house\n" - .string "while I’m away.$" + .string "Ich muss jetzt wieder in die ARENA von\n" + .string "BLÜTENBURG CITY.\p" + .string "Ich danke dir, dass du dich während\n" + .string "meiner Abwesenheit um das Haus\l" + .string "kümmerst.$" LittlerootTown_BrendansHouse_1F_Text_172BBC:: @ 8172BBC - .string "MOM: That DAD of yours...\p" - .string "He comes home for the first time in a\n" - .string "while, but all he talks about is POKéMON.\p" - .string "He should relax and stay a little longer.$" + .string "MUTTER: Das ist wieder typisch dein\n" + .string "VATER...\p" + .string "Da kommt er das erste Mal nach ewigen\n" + .string "Zeiten nach Hause und spricht nur über\l" + .string "POKéMON.\p" + .string "Er sollte sich lieber ausruhen und etwas\n" + .string "hier bleiben!$" UnknownString_8172C50: @ 8172C50 - .string "We bring you a special news bulletin.\p" - .string "We’ve received reports of a blue FLYING\n" - .string "POKéMON in various HOENN locales.\p" - .string "The identity of this POKéMON has not\n" - .string "yet been determined.\p" - .string "We now return you to your regular\n" - .string "movie presentation.$" + .string "Hier sind die Sondernachrichten.\p" + .string "Wir haben die Meldung erhalten, dass in\n" + .string "der HOENN-Region ein blaues FLIEGENDES\l" + .string "POKéMON gesichtet wurde.\p" + .string "Die Identität des POKéMON konnte\n" + .string "bisher nicht festgestellt werden.\p" + .string "Und damit schalten wir wieder um in\n" + .string "unser laufendes Programm.$" UnknownString_8172D30: @ 8172D30 - .string "We bring you a special news bulletin.\p" - .string "We’ve received reports of a red FLYING\n" - .string "POKéMON in various HOENN locales.\p" - .string "The identity of this POKéMON has not\n" - .string "yet been determined.\p" - .string "We now return you to your regular\n" - .string "movie presentation.$" + .string "Hier sind die Sondernachrichten.\p" + .string "Wir haben die Meldung erhalten, dass in\n" + .string "der HOENN-Region ein rotes FLIEGENDES\l" + .string "POKéMON gesichtet wurde.\p" + .string "Die Identität des POKéMON konnte\n" + .string "bisher nicht festgestellt werden.\p" + .string "Und damit schalten wir wieder um in\n" + .string "unser laufendes Programm.$" UnknownString_8172E0F: @ 8172E0F .string "Gau gau!$" diff --git a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc b/data/text/maps/LittlerootTown_BrendansHouse_2F.inc index 06206caaa..102eb6664 100644 --- a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/text/maps/LittlerootTown_BrendansHouse_2F.inc @@ -1,38 +1,39 @@ LittlerootTown_BrendansHouse_2F_Text_172E18:: @ 8172E18 - .string "The clock is stopped...\p" - .string "Better set it and start it!$" + .string "Die Uhr ist stehen geblieben...\p" + .string "Stelle sie besser ein und ziehe sie auf.$" LittlerootTown_BrendansHouse_2F_Text_172E4C:: @ 8172E4C - .string "MOM: {PLAYER}, how do you like your\n" - .string "new room?\p" - .string "Good! Everything’s put away neatly!\p" - .string "They finished moving everything in\n" - .string "downstairs, too.\p" - .string "POKéMON movers are so convenient!\p" - .string "Oh, you should make sure that\n" - .string "everything’s all there on your desk.$" + .string "MUTTER: {PLAYER}, wie gefällt dir dein\n" + .string "neues Zimmer?\p" + .string "Gut! Alles ist wunderbar aufgeräumt!\p" + .string "Auch im Erdgeschoss ist alles\n" + .string "komplett eingerichtet.\p" + .string "POKéMON-Umzugshelfer sind so\n" + .string "praktisch.\p" + .string "Oh, du solltest prüfen, ob dein Schreib-\n" + .string "tisch vollständig eingeräumt ist!$" UnknownString_8172F31: @ 8172F31 - .string "The bookshelf is lined entirely with\n" - .string "books on POKéMON.\p" - .string "It’s {PLAYER}’s prized collection.$" + .string "Im Regal stehen Bücher über POKéMON.\n" + .string "Das ist die wertvolle Sammlung\l" + .string "von {PLAYER}.$" UnknownString_8172F85: @ 8172F85 - .string "{PLAYER} booted up the PC.$" + .string "{PLAYER} schaltet den PC ein.$" LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A - .string "{PLAYER} flipped open the notebook.\p" - .string "ADVENTURE RULE NO. 1\n" - .string "Open the MENU with START.\p" - .string "ADVENTURE RULE NO. 2\n" - .string "Record your progress with SAVE.\p" - .string "The remaining pages are blank...$" + .string "{PLAYER} schlägt das Notizbuch auf.\p" + .string "REGEL NR. 1 FÜR ABENTEURER\n" + .string "Öffne das MENÜ mit START.\p" + .string "REGEL NR. 2 FÜR ABENTEURER\n" + .string "Speichere den Fortschritt mit SICHERN.\p" + .string "Die übrigen Seiten sind leer.$" UnknownString_817303D: @ 817303D - .string "{PLAYER} took a closer look at the\n" - .string "HOENN region map.$" + .string "{PLAYER} schaut sich die Karte der\n" + .string "HOENN-Region genauer an.$" LittlerootTown_BrendansHouse_2F_Text_17306C:: @ 817306C - .string "It’s a Nintendo GameCube.\p" - .string "A Game Boy Advance is connected to\n" - .string "serve as the Controller.$" + .string "Das ist ein Nintendo GameCube.\p" + .string "Ein Game Boy Advance ist angeschlossen\n" + .string "und dient als Controller.$" diff --git a/data/text/maps/LittlerootTown_MaysHouse_1F.inc b/data/text/maps/LittlerootTown_MaysHouse_1F.inc index aef905854..a4fab5261 100644 --- a/data/text/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/text/maps/LittlerootTown_MaysHouse_1F.inc @@ -1,34 +1,36 @@ LittlerootTown_BrendansHouse_1F_Text_1730C2:: @ 81730C2 LittlerootTown_MaysHouse_1F_Text_1730C2:: @ 81730C2 - .string "Oh, hello. And you are?\p" + .string "Oh, hallo. Wer bist du?\p" .string "... ... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ... ...\p" - .string "Oh, you’re {PLAYER}{KUN}, our new next-door\n" - .string "neighbor! Hi!\p" - .string "We have a {STR_VAR_1} about the same\n" - .string "age as you.\p" - .string "Our {STR_VAR_1} was excited about making\n" - .string "a new friend.\p" - .string "Our {STR_VAR_1} is upstairs, I think.$" + .string "Oh, du bist {PLAYER}{KUN}, unser neuer\n" + .string "Nachbar! Hallo!\p" + .string "Wir haben ein Kind in deinem Alter.\p" + .string "Mein/e {STR_VAR_1} freut sich schon\n" + .string "darauf, mit dir Freundschaft zu\l" + .string "schließen.\p" + .string "Lauf doch mal die Treppe hoch...$" LittlerootTown_BrendansHouse_1F_Text_1731C6:: @ 81731C6 - .string "Our {STR_VAR_1} is upstairs, I think.$" + .string "Mein/e {STR_VAR_1} ist oben.$" LittlerootTown_BrendansHouse_1F_Text_1731E3:: @ 81731E3 - .string "Where has my husband gone?\n" - .string "Just when {PLAYER}{KUN} is visiting, too...\p" - .string "That man can never sit still for long...\n" - .string "He might be at his LAB.$" + .string "Wo ist denn nur mein Mann? Und gerade\n" + .string "jetzt, wo {PLAYER}{KUN} uns besucht...\p" + .string "Dieser Mann kann einfach nicht\n" + .string "entspannen... Er ist wohl im LABOR.$" LittlerootTown_BrendansHouse_1F_Text_173262:: @ 8173262 - .string "Oh, {RIVAL} has gone out somewhere.\p" - .string "Like father, like child.\n" - .string "{RIVAL} can’t stay quietly at home.$" + .string "Oh, {RIVAL} ist irgendwohin gegangen.\p" + .string "Wie der Vater, so das Kind.\n" + .string "{RIVAL} kann einfach nicht stillsitzen\l" + .string "oder zu Hause bleiben.$" LittlerootTown_BrendansHouse_1F_Text_1732B9:: @ 81732B9 - .string "I think it’s wonderful for people to\n" - .string "travel with POKéMON.\p" - .string "But you should go home every so often\n" - .string "to let your mother know you’re okay.\p" - .string "She might not say it, but I’m sure she\n" - .string "worries about you, {PLAYER}{KUN}.$" + .string "Ich glaube, es ist wunderbar für Leute,\n" + .string "mit ihren POKéMON zu reisen.\p" + .string "Aber du solltest öfter nach Hause\n" + .string "gehen und deiner Mutter zeigen, dass es\l" + .string "dir gut geht.\p" + .string "Sie lässt es sich nicht anmerken, aber\n" + .string "sie macht sich bestimmt Sorgen!$" diff --git a/data/text/maps/LittlerootTown_MaysHouse_2F.inc b/data/text/maps/LittlerootTown_MaysHouse_2F.inc index 313095c8d..6cad66063 100644 --- a/data/text/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/text/maps/LittlerootTown_MaysHouse_2F.inc @@ -1,86 +1,91 @@ LittlerootTown_BrendansHouse_2F_Text_17337E:: @ 817337E - .string "POKéMON fully restored!\n" - .string "Items ready, and... Huh?$" + .string "POKéMON: Bei guter Gesundheit!\n" + .string "Items: Verstaut. Fehlt noch... Was?$" LittlerootTown_BrendansHouse_2F_Text_1733AF:: @ 81733AF - .string "Huh?\n" - .string "Who... Who are you?\p" + .string "Was?\n" + .string "Wer... Wer bist du denn?\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Oh, you’re {PLAYER}{KUN}.\n" - .string "So your move was today.\p" - .string "Um... I’m MAY.\n" - .string "Glad to meet you!\p" - .string "I...\n" - .string "I have this dream of becoming friends\l" - .string "with POKéMON all over the world.\p" - .string "I... I heard about you, {PLAYER}{KUN}, from\n" - .string "my dad, PROF. BIRCH.\p" - .string "I was hoping that you would be nice,\n" - .string "{PLAYER}{KUN}, and that we could be friends.\p" - .string "Oh, this is silly, isn’t it?\n" - .string "I... I’ve just met you, {PLAYER}{KUN}.\p" - .string "Eheheh...\p" - .string "Oh, no! I forgot!\p" - .string "I was supposed to go help Dad catch\n" - .string "some wild POKéMON!\p" - .string "{PLAYER}{KUN}, I’ll catch you later!$" + .string "Ach, du bist {PLAYER}{KUN}!\n" + .string "Du bist heute hierher gezogen.\p" + .string "Ähm... Ich bin MAIKE.\n" + .string "Schön, dich kennen zu lernen.\p" + .string "Ich... Ich habe diesen Traum...\n" + .string "Mit POKéMON in der ganzen Welt\l" + .string "Freundschaft zu schließen.\p" + .string "Ich... Ich habe schon von dir gehört.\n" + .string "Mein Vater, PROF. BIRK, hat mir von\l" + .string "dir erzählt.\p" + .string "Ich habe gehofft, dass du nett bist,\n" + .string "{PLAYER}{KUN}, und wir Freunde werden.\p" + .string "Ist das nicht albern? Ich... Ich habe\n" + .string "dich doch gerade erst kennen gelernt.\p" + .string "Hihihihi...\p" + .string "Oh, nein! Das habe ich ja total\n" + .string "vergessen!\p" + .string "Ich sollte Vati doch helfen, ein paar\n" + .string "wilde POKéMON zu fangen!\p" + .string "{PLAYER}{KUN}, wir treffen uns später!$" LittlerootTown_BrendansHouse_2F_Text_1735C9:: @ 81735C9 - .string "POKéMON fully restored...\n" - .string "Items all packed, and...$" + .string "POKéMON: Bei guter Gesundheit!\n" + .string "Items: Verstaut. Fehlt noch... Was?$" LittlerootTown_BrendansHouse_2F_Text_1735FC:: @ 81735FC .string "Hey!\n" - .string "You...\p" - .string "Who are you?\p" - .string "Oh, you’re {PLAYER}, aren’t you?\n" - .string "Moved in next door, right?\p" - .string "I didn’t know that you’re a girl.\p" - .string "Dad, PROF. BIRCH, said that our new\n" - .string "next-door neighbor is a GYM LEADER’s\l" - .string "kid, so I assumed you’d be a guy.\p" - .string "My name’s BRENDAN.\n" - .string "So, hi, neighbor!\p" - .string "Huh? Hey, {PLAYER}, don’t you have\n" - .string "a POKéMON?\p" - .string "Do you want me to go catch you one?\p" - .string "Aw, darn, I forgot...\p" - .string "I’m supposed to go help my dad catch\n" - .string "some wild POKéMON.\p" - .string "Some other time, okay?$" + .string "Du...\p" + .string "Wer bist du denn?\p" + .string "Ach ja, du bist {PLAYER}, richtig?\n" + .string "Du bist nebenan eingezogen, stimmt’s?\p" + .string "Ich wusste nicht, dass du ein Mädchen\n" + .string "bist.\p" + .string "Vater, PROF. BIRK, hat mir erzählt, dass\n" + .string "nebenan das Kind eines ARENALEITERS\p" + .string "einzieht und irgendwie habe ich\n" + .string "gedacht, du seiest ein Junge.\p" + .string "Ich heiße übrigens BRIX.\n" + .string "Also: Hallo, Nachbarin!\p" + .string "Was? {PLAYER}, du hast kein einziges\n" + .string "POKéMON?\p" + .string "Soll ich eines für dich fangen?\p" + .string "Ach, Mist, das habe ich ganz vergessen...\p" + .string "Ich muss meinem Vater helfen, einige\n" + .string "wilde POKéMON zu fangen.\p" + .string "Ein anderes Mal, okay?$" LittlerootTown_BrendansHouse_2F_Text_1737AE:: @ 81737AE - .string "MAY: {PLAYER}{KUN}!\p" - .string "I was just checking my POKéDEX.\p" - .string "There’s still a lot of POKéMON that\n" - .string "I’ve seen but haven’t caught.\p" - .string "And there are many others that\n" - .string "I think will evolve.\p" - .string "I wonder where I should go catch\n" - .string "some POKéMON next?$" + .string "MAIKE: {PLAYER}{KUN}!\p" + .string "Ich prüfe gerade meinen POKéDEX.\p" + .string "Es gibt eine Menge POKéMON, die ich\n" + .string "gesehen, aber nicht gefangen habe.\p" + .string "Und es gibt viele, von denen ich\n" + .string "annehme, dass sie sich bald entwickeln.\p" + .string "Jetzt überlege ich, wo ich hingehen soll,\n" + .string "um weitere POKéMON zu fangen.$" LittlerootTown_BrendansHouse_2F_Text_173883:: @ 8173883 - .string "MAY: I wonder where I should go catch\n" - .string "some POKéMON next?\p" - .string "Wouldn’t it be funny if we ran into each\n" - .string "other, {PLAYER}{KUN}?$" + .string "MAIKE: Ich überlege, wo ich hingehen\n" + .string "soll, um weitere POKéMON zu fangen.\p" + .string "Wäre es nicht lustig, wenn wir uns dabei\n" + .string "über den Weg laufen würden?$" LittlerootTown_BrendansHouse_2F_Text_1738F2:: @ 81738F2 - .string "BRENDAN: Hey, it’s {PLAYER}.\p" - .string "I was just checking out my POKéDEX.\p" - .string "There are still many POKéMON that\n" - .string "I need to catch, I know, but this\l" - .string "is looking pretty good.\p" - .string "Checking this POKéDEX out gives me\n" - .string "the urge to hit the road again.$" + .string "BRIX: Hey, {PLAYER}!\p" + .string "Ich prüfe gerade meinen POKéDEX.\p" + .string "Es gibt noch viele POKéMON, die ich\n" + .string "fangen muss, aber er sieht schon sehr\l" + .string "gut aus.\p" + .string "Immer wenn ich den POKéDEX betrachte,\n" + .string "bekomme ich Lust zum Reisen.$" LittlerootTown_BrendansHouse_2F_Text_1739CC:: @ 81739CC - .string "BRENDAN: I’m having a hard time deciding\n" - .string "where I should catch POKéMON next.\p" - .string "Hey, {PLAYER}, if I see you while I’m out\n" - .string "catching POKéMON, I can pitch you a\l" - .string "battle if you’d like.$" + .string "BRIX: Ich habe lange überlegt, wo ich\n" + .string "hingehen soll, um weitere POKéMON\l" + .string "zu fangen.\p" + .string "Hey, {PLAYER}, wenn ich dich auf meiner\n" + .string "Suche treffe, können wir ja einen\l" + .string "POKéMON-Kampf austragen.$" UnknownString_8173A76: @ 8173A76 - .string "It’s lined with POKéMON picture books.$" + .string "Dort stehen POKéMON-Bücher.$" diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc index dd470ef08..a142a3b2f 100644 --- a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -1,163 +1,169 @@ UnknownString_8173A9D: @ 8173A9D - .string "POKéMON SPECIES & HABITATS...\n" - .string "HUMAN & POKéMON COEXISTENCE...\l" - .string "POKéMONOLOGY FOR BEGINNERS...\p" - .string "It’s brimming with books written by\n" - .string "PROF. BIRCH.$" + .string "POKéMON & IHRE LEBENSRÄUME...\n" + .string "DIE KOEXISTENZ VON MENSCH & POKéMON...\l" + .string "POKéMONOLOGIE FÜR ANFÄNGER...\p" + .string "Es biegt sich unter der Last der Bücher,\n" + .string "die PROF. BIRK geschrieben hat.$" LittlerootTown_ProfessorBirchsLab_Text_173B29:: @ 8173B29 - .string "Hunh? PROF. BIRCH?\p" - .string "The PROF’s away on fieldwork.\n" - .string "Ergo, he isn’t here.\p" - .string "Oh, let me explain what fieldwork is.\p" - .string "It is to study things in the natural\n" - .string "environment, like fields and mountains,\l" - .string "instead of a laboratory.\p" - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" - .string "rather go outside and experience\l" - .string "things than read about them here.$" + .string "Wie? PROF. BIRK?\p" + .string "Der PROF arbeitet an einer Feld-Studie.\n" + .string "Also ist er nicht hier.\p" + .string "Oh, ich erkläre dir, was eine Feld-Studie\n" + .string "in diesem Falle ist:\p" + .string "Man beobachtet und studiert Dinge in\n" + .string "ihrem natürlichen Umfeld. In Feldern\l" + .string "oder auf Bergen, anstatt im Labor.\p" + .string "Der PROF ist kein Typ, der am Schreib-\n" + .string "tisch arbeiten kann. Er muss einfach\l" + .string "draußen in der freien Natur die Dinge\l" + .string "beobachten und studieren.$" LittlerootTown_ProfessorBirchsLab_Text_173C88:: @ 8173C88 - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" - .string "rather go outside and experience\l" - .string "things than read about them here.$" + .string "Der PROF ist kein Typ, der am Schreib-\n" + .string "tisch arbeiten kann. Er muss einfach\l" + .string "draußen in der freien Natur die Dinge\l" + .string "beobachten und studieren.$" LittlerootTown_ProfessorBirchsLab_Text_173D15:: @ 8173D15 - .string "PROF. BIRCH is studying the habitats\n" - .string "and distribution of POKéMON.\p" - .string "The PROF enjoys {RIVAL}’s help, too.\n" - .string "There’s a lot of love there.$" + .string "PROF. BIRK studiert den Lebensraum\n" + .string "und die Verbreitung von POKéMON.\p" + .string "Der PROF freut sich über die Mitarbeit\n" + .string "von {RIVAL}. Da spürt man Zuneigung!$" LittlerootTown_ProfessorBirchsLab_Text_173D94:: @ 8173D94 - .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" - .string "I’ve heard so much about you from\n" - .string "your father.\p" - .string "I’ve heard that you don’t have your\n" - .string "own POKéMON yet.\p" - .string "But the way you battled earlier,\n" - .string "you pulled it off with aplomb!\p" - .string "I guess you have your father’s blood\n" - .string "in your veins after all!\p" - .string "Oh, yes. As thanks for rescuing me,\n" - .string "I’d like you to have the POKéMON you\l" - .string "used earlier.\p" - .string "{PLAYER} received the {STR_VAR_1}!$" + .string "PROF. BIRK: Du bist also {PLAYER}{KUN}!\p" + .string "Dein Vater hat mir schon viel von dir\n" + .string "erzählt.\p" + .string "Ich habe auch erfahren, dass du noch\n" + .string "kein eigenes POKéMON besitzt.\p" + .string "Aber wie du eben gekämpft hast...\n" + .string "Diese Gelassenheit...\p" + .string "In deinen Adern fließt wirklich das Blut\n" + .string "deines Vaters!\p" + .string "Als Dank dafür, dass du mich gerettet\n" + .string "hast, möchte ich dir das POKéMON\l" + .string "schenken, das du dabei benutzt hast.\p" + .string "{PLAYER} erhält {STR_VAR_1}!$" LittlerootTown_ProfessorBirchsLab_Text_173EF8:: @ 8173EF8 - .string "PROF. BIRCH: While you’re at it, why not\n" - .string "give a nickname to that {STR_VAR_1}?$" + .string "PROF. BIRK: Willst du dem\n" + .string "{STR_VAR_1} einen Kosenamen geben?$" LittlerootTown_ProfessorBirchsLab_Text_173F3D:: @ 8173F3D - .string "PROF. BIRCH: If you work at POKéMON\n" - .string "and gain experience, I think you’ll make\l" - .string "a darn good TRAINER.\p" - .string "My kid, {RIVAL}, is out on ROUTE 103\n" - .string "studying POKéMON.\p" - .string "It might not be a bad idea for you to\n" - .string "go see {RIVAL}. What do you think?$" + .string "PROF. BIRK: Wenn du dich erst einmal\n" + .string "mit POKéMON beschäftigst und Er-\l" + .string "fahrungen sammelst, wirst du bestimmt\l" + .string "ein verdammt guter TRAINER!\p" + .string "Mein Nachwuchs, {RIVAL}, studiert an\n" + .string "der ROUTE 103 POKéMON.\p" + .string "Hast du nicht Lust, {RIVAL} dort\n" + .string "zu suchen?$" LittlerootTown_ProfessorBirchsLab_Text_174015:: @ 8174015 - .string "PROF. BIRCH: Great!\n" - .string "{RIVAL} should be happy, too.\p" - .string "Get {RIVAL} to teach you what it\n" - .string "means to be a TRAINER.$" + .string "PROF. BIRK: Großartig!\n" + .string "{RIVAL} wird sich auch sehr freuen.\p" + .string "{RIVAL} soll dir beibringen, was es\n" + .string "bedeutet, ein TRAINER zu sein.$" LittlerootTown_ProfessorBirchsLab_Text_174075:: @ 8174075 - .string "PROF. BIRCH: Oh, don’t be that way.\n" - .string "You should go meet my kid.$" + .string "PROF. BIRK: Ach, sei doch nicht so!\n" + .string "Du solltest dich wirklich mit meinem\l" + .string "Sprössling treffen!$" LittlerootTown_ProfessorBirchsLab_Text_1740B4:: @ 81740B4 - .string "PROF. BIRCH: {RIVAL} should be on\n" - .string "ROUTE 103 somewhere.\p" - .string "If you or your POKéMON get tired,\n" - .string "get some rest at home.$" + .string "PROF. BIRK: {RIVAL} muss irgendwo\n" + .string "auf der ROUTE 103 zu finden sein.\p" + .string "Falls du müde bist - oder deine\n" + .string "POKéMON - ruh dich zu Hause aus.$" LittlerootTown_ProfessorBirchsLab_Text_17411F:: @ 817411F - .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" - .string "I heard you beat {RIVAL} on\n" - .string "your first try. That’s excellent!\p" - .string "{RIVAL}’s been helping with my research\n" - .string "for a long time.\p" - .string "{RIVAL} has an extensive history as\n" - .string "a TRAINER already.\p" - .string "Here, {PLAYER}{KUN}, I ordered this for my\n" - .string "research, but I think you should have\l" - .string "this POKéDEX.$" + .string "PROF. BIRK: Oh, hallo, {PLAYER}{KUN}!\p" + .string "Ich habe gehört, du hast {RIVAL} \n" + .string "besiegt! Super! Das war dein erster\l" + .string "Kampf gegen einen TRAINER!\p" + .string "{RIVAL} hilft mir schon sehr lange bei\n" + .string "meinen Forschungen.\p" + .string "{RIVAL} besitzt eine respektable\n" + .string "Geschichte als TRAINER.\p" + .string "Hier, das hilft mir bei meinen For-\n" + .string "schungen. Aber ich denke, du kannst\l" + .string "den POKéDEX auch gebrauchen.$" LittlerootTown_ProfessorBirchsLab_Text_17422F:: @ 817422F - .string "{PLAYER} received the POKéDEX!$" + .string "{PLAYER} erhält den POKéDEX!$" LittlerootTown_ProfessorBirchsLab_Text_174248:: @ 8174248 - .string "PROF. BIRCH: The POKéDEX is a high-tech\n" - .string "tool that automatically makes a record\l" - .string "of any POKéMON you meet or catch.\p" - .string "My kid, {RIVAL}, goes everywhere\n" - .string "with it.\p" - .string "Whenever my kid catches a rare POKéMON\n" - .string "and records its data in the POKéDEX,\l" - .string "why, {RIVAL} looks for me while I’m out\l" - .string "doing fieldwork, and shows me.$" + .string "PROF. BIRK: Der POKéDEX ist ein hoch\n" + .string "entwickeltes, technisches Gerät, das\l" + .string "automatisch jedes POKéMON, das du\l" + .string "siehst oder fängst, registriert.\p" + .string "{RIVAL} geht nie ohne ihn aus dem Haus.\p" + .string "Immer wenn mein Kind ein seltenes\n" + .string "POKéMON fängt, kommt es und\l" + .string "zeigt mir den Eintrag im POKéDEX,\l" + .string "während ich draußen forsche.$" LittlerootTown_ProfessorBirchsLab_Text_17436C:: @ 817436C - .string "PROF. BIRCH: Countless POKéMON await\n" - .string "you!\p" - .string "Argh, I’m getting the itch to get out\n" - .string "and do fieldwork again!$" + .string "PROF. BIRK: Unzählige POKéMON erwarten\n" + .string "dich bereits.\p" + .string "Hach, ich muss jetzt auch dringend\n" + .string "wieder meinen Forschungen nachgehen.$" LittlerootTown_ProfessorBirchsLab_Text_1743D4:: @ 81743D4 - .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" - .string "You got a POKéDEX, too!\p" - .string "That’s great! Just like me!\n" - .string "I’ve got something for you, too!$" + .string "MAIKE: Oh, wow, {PLAYER}{KUN}!\n" + .string "Jetzt hast du auch einen POKéDEX!\p" + .string "Das ist ja toll! Genau wie ich!\n" + .string "Ich habe hier etwas für dich!$" LittlerootTown_ProfessorBirchsLab_Text_17443D:: @ 817443D - .string "MAY: It’s fun if you can get a lot of\n" - .string "POKéMON!\p" - .string "I’m going to look all over the place\n" - .string "because I want different POKéMON.\p" - .string "If I find any cute POKéMON, I’ll catch\n" - .string "them with POKé BALLS!$" + .string "MAIKE: Es macht unheimlich viel Spaß, all\n" + .string "die verschiedenen POKéMON zu fangen!\p" + .string "Ich schaue mich wirklich überall um, denn\n" + .string "ich will die unterschiedlichsten POKéMON\l" + .string "fangen.\p" + .string "Sobald ich niedliche POKéMON entdecke,\n" + .string "fange ich sie mit POKéBÄLLEN.$" LittlerootTown_ProfessorBirchsLab_Text_1744F0:: @ 81744F0 - .string "Oh? Your BAG’s full.$" + .string "Oh! Dein BEUTEL ist voll.$" LittlerootTown_ProfessorBirchsLab_Text_174505:: @ 8174505 - .string "MAY: I wonder where I should go look\n" - .string "for POKéMON next?$" + .string "MAIKE: Ich frage mich, wo ich jetzt nach\n" + .string "weiteren POKéMON suchen soll.$" LittlerootTown_ProfessorBirchsLab_Text_17453C:: @ 817453C - .string "BRENDAN: Huh...\n" - .string "So you got a POKéDEX, too.\p" - .string "Well then, here.\n" - .string "I’ll give you this.$" + .string "BRIX: Ach...\n" + .string "Du hast auch einen POKéDEX.\p" + .string "Na, dann.\n" + .string "Ich gebe dir dies.$" LittlerootTown_ProfessorBirchsLab_Text_17458C:: @ 817458C - .string "BRENDAN: You know it’s more fun to\n" - .string "have a whole bunch of POKéMON.\p" - .string "I’m going to explore all over the place\n" - .string "to find different POKéMON.\p" - .string "If I find any cool POKéMON, you bet\n" - .string "I’ll try to get them with POKé BALLS.$" + .string "BRIX: Weißt du, je mehr POKéMON du\n" + .string "besitzt, desto mehr Spaß macht es.\p" + .string "Ich reise viel umher, um die unter-\n" + .string "schiedlichsten POKéMON zu finden.\p" + .string "Und wenn ich ein cooles POKéMON sehe,\n" + .string "versuche ich natürlich, es zu fangen.$" LittlerootTown_ProfessorBirchsLab_Text_17465B:: @ 817465B - .string "Hey, your BAG’s full.$" + .string "Hey, dein BEUTEL ist voll.$" LittlerootTown_ProfessorBirchsLab_Text_174671:: @ 8174671 - .string "BRENDAN: Where should I look for\n" - .string "POKéMON next...$" + .string "BRIX: Und wo soll ich jetzt mal nach\n" + .string "POKéMON suchen?$" LittlerootTown_ProfessorBirchsLab_Text_1746A2:: @ 81746A2 - .string "It’s a serious-looking machine.\n" - .string "The PROF must use this for research.$" + .string "Das ist eine kompliziert aussehende\n" + .string "Maschine. Der PROF wird sie für seine\l" + .string "Forschungen brauchen...$" LittlerootTown_ProfessorBirchsLab_Text_1746E7:: @ 81746E7 - .string "It’s a PC used for research.\n" - .string "Better not mess around with it.$" + .string "Ein PC, der in der Forschung eingesetzt\n" + .string "wird. Besser nicht damit spielen!$" LittlerootTown_ProfessorBirchsLab_Text_174724:: @ 8174724 - .string "It’s crammed with books on POKéMON.$" + .string "Es ist voll mit Büchern über POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_174748:: @ 8174748 - .string "It’s a book that’s too hard to read.$" + .string "Dieses Buch ist viel zu kompliziert...$" diff --git a/data/text/maps/MauvilleCity.inc b/data/text/maps/MauvilleCity.inc index 8080d10d9..4a06fff34 100644 --- a/data/text/maps/MauvilleCity.inc +++ b/data/text/maps/MauvilleCity.inc @@ -1,174 +1,178 @@ MauvilleCity_Text_165B76:: @ 8165B76 - .string "UNCLE: It’s because of POKéMON that\n" - .string "this boy’s got more pep, I suppose...\l" - .string "But he’s become a bit too peppy...$" + .string "ONKEL: Ich glaube, es liegt an dem\n" + .string "POKéMON, dass dieser Junge mehr Pep\l" + .string "hat. Aber er hat zu viel Pep...$" MauvilleCity_Text_165BE3:: @ 8165BE3 - .string "WALLY: Aww, UNCLE, please?\p" - .string "I want to challenge this GYM and see\n" - .string "how much better I’ve become.\p" - .string "Please? May I, please?$" + .string "HEIKO: Oooch, bitte, ONKEL, bitte!\p" + .string "Ich möchte in dieser ARENA antreten,\n" + .string "um zu sehen, wie gut ich bin.\p" + .string "Bitte! Darf ich? Biiiitte!$" MauvilleCity_Text_165C57:: @ 8165C57 - .string "UNCLE: Now hold on, WALLY.\p" - .string "Since you started living with POKéMON,\n" - .string "you have grown quite a lot stronger.\p" - .string "But don’t you think you’re pushing it\n" - .string "to suddenly challenge a GYM?$" + .string "ONKEL: Nun hör mal auf, HEIKO.\p" + .string "Seit du mit POKéMON zusammenlebst, bist\n" + .string "du viel stärker geworden.\p" + .string "Aber - du überforderst dich, wenn du\n" + .string "plötzlich in einer ARENA antrittst.$" MauvilleCity_Text_165D01:: @ 8165D01 - .string "WALLY: I’m not pushing it.\p" - .string "If I combine forces with RALTS,\n" - .string "we can beat anyone!$" + .string "HEIKO: Ich bin nicht überfordert!\p" + .string "Wenn ich die Kräfte von TRASLA\n" + .string "kombiniere, besiege ich jeden!$" MauvilleCity_Text_165D50:: @ 8165D50 - .string "WALLY: Oh! Hi, {PLAYER}!\p" - .string "I’ve gotten a lot stronger since we\n" - .string "met.\p" - .string "{PLAYER}, I want you and my UNCLE to\n" - .string "understand that.\p" - .string "{PLAYER}, please, will you have a\n" - .string "battle with me?$" + .string "HEIKO: Oh! Hi, {PLAYER}!\p" + .string "Seit wir uns das letzte Mal gesehen\n" + .string "haben, bin ich viel stärker geworden.\p" + .string "{PLAYER}, ich möchte von dir und auch\n" + .string "von meinem ONKEL verstanden werden.\p" + .string "{PLAYER}, bitte, würdest du gegen mich\n" + .string "kämpfen?$" MauvilleCity_Text_165DE8:: @ 8165DE8 - .string "WALLY: Oh... If you won’t battle me,\n" - .string "{PLAYER}, my UNCLE won’t know that I’ve\l" - .string "become really strong.$" + .string "HEIKO: Oh... Wenn du nicht gegen mich an-\n" + .string "treten willst, {PLAYER}, wird mein ONKEL\l" + .string "nie erkennen, wie stark ich schon bin.$" MauvilleCity_Text_165E45:: @ 8165E45 - .string "UNCLE: {PLAYER}{KUN}, was it?\n" - .string "On WALLY’s behalf, can I ask you to\l" - .string "battle with him just this once?\p" - .string "I don’t think he’s going to listen to\n" - .string "any reason the way he is now.$" + .string "ONKEL: {PLAYER}{KUN}, richtig?\n" + .string "Darf ich dich um HEIKOS Willen bitten,\l" + .string "dieses eine Mal gegen ihn zu kämpfen?\p" + .string "Ich glaube nicht, dass er mir im Moment\n" + .string "überhaupt zuhören will...$" MauvilleCity_Text_165EE2:: @ 8165EE2 - .string "WALLY: {PLAYER}, please!\n" - .string "Battle with me, please.$" + .string "HEIKO: {PLAYER}, bitte!\n" + .string "Kämpfe gegen mich! Biiiitte!$" MauvilleCity_Text_165F0D:: @ 8165F0D - .string "WALLY: {PLAYER}, thank you.\p" - .string "Okay... Here I come!$" + .string "HEIKO: {PLAYER}, vielen Dank!\p" + .string "Okay... Jetzt komme ich!$" MauvilleCity_Text_165F38:: @ 8165F38 - .string "WALLY: ... ... ... ... ... ... ...\p" + .string "HEIKO: ... ... ... ... ... ... ...\p" .string "... ... ... ... ... ... ... ...\p" - .string "I lost...$" + .string "Ich habe verloren...$" MauvilleCity_Text_165F85:: @ 8165F85 - .string "WALLY: UNCLE...\n" - .string "I’ll go back to VERDANTURF...$" + .string "HEIKO: ONKEL...\n" + .string "Ich gehe zurück nach WIESENFLUR...$" MauvilleCity_Text_165FB3:: @ 8165FB3 - .string "{PLAYER}, thank you.\n" - .string "Being a TRAINER is tough, isn’t it?\p" - .string "It’s not enough just to have POKéMON\n" - .string "and make them battle. That isn’t what\l" - .string "being a real TRAINER is about.$" + .string "{PLAYER}, herzlichen Dank! TRAINER zu\n" + .string "sein verlangt viel von einem, oder?\p" + .string "Man besitzt nicht einfach nur POKéMON\n" + .string "und lässt sie kämpfen. Um ein richtiger\l" + .string "TRAINER zu sein, braucht es mehr.$" MauvilleCity_Text_166050:: @ 8166050 - .string "UNCLE: WALLY, there’s no need to be so\n" - .string "down on yourself.\p" - .string "Why, what’s keeping you from becoming\n" - .string "stronger and stronger?\p" - .string "Come on, let’s go home.\n" - .string "Everyone’s waiting for you.$" + .string "ONKEL: HEIKO, du brauchst deshalb nicht\n" + .string "so niedergeschlagen zu sein.\p" + .string "Was hält dich davon ab, stärker und\n" + .string "stärker zu werden? Nichts!\p" + .string "Komm, gehen wir nach Hause.\n" + .string "Da warten sie alle schon auf dich.$" MauvilleCity_Text_1660FA:: @ 81660FA - .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" - .string "that you must be the TRAINER who kept\l" - .string "an eye out for WALLY when he caught\l" - .string "his POKéMON.\p" - .string "Why don’t you visit us in VERDANTURF\n" - .string "sometime?\l" - .string "I’m sure WALLY would enjoy it.$" + .string "ONKEL: {PLAYER}{KUN}, mir dämmert es so\n" + .string "langsam. Du musst der TRAINER sein, der\l" + .string "sich damals um HEIKO gekümmert hat, als\l" + .string "er sein erstes POKéMON fing.\p" + .string "Warum besuchst du uns nicht irgendwann\n" + .string "in WIESENFLUR? Ich bin sicher,\l" + .string "HEIKO würde sich sehr freuen.$" MauvilleCity_Text_1661C1:: @ 81661C1 - .string "WATTSON: Oh, {PLAYER}{KUN}!\n" - .string "You look like you have a lot of zip!\l" - .string "That’s a good thing, wahahahaha!\p" - .string "Fine! I’ve decided!\n" - .string "I need a favor, {PLAYER}{KUN}!\p" - .string "MAUVILLE CITY has an underground\n" - .string "sector called NEW MAUVILLE.\p" - .string "{PLAYER}{KUN}, I’d like you to go there and\n" - .string "switch off the GENERATOR.\p" - .string "The GENERATOR has been running a bit\n" - .string "haywire. It’s getting unsafe.\p" - .string "Here, this is the KEY to get into NEW\n" - .string "MAUVILLE.$" + .string "WALTER: Oh, {PLAYER}{KUN}!\n" + .string "Du siehst aus, als hättest du Mumm!\l" + .string "Das ist sehr gut, hähähähähä...\p" + .string "Gut! Ich habe es entschieden!\n" + .string "Du tust mir einen Gefallen, {PLAYER}{KUN}!\p" + .string "MALVENFROH CITY hat einen unter-\n" + .string "irdischen Bereich, der NEU MALVENFROH\l" + .string "heißt.\p" + .string "{PLAYER}{KUN}, ich schicke dich jetzt da\n" + .string "hinunter, damit du den GENERATOR aus-\l" + .string "schaltest.\p" + .string "Der GENERATOR ist kurz davor, \n" + .string "heißzulaufen. Das ist sehr gefährlich.\p" + .string "Hier hast du den SCHLÜSSEL für\n" + .string "NEU MALVENFROH.$" MauvilleCity_Text_166331:: @ 8166331 - .string "WATTSON: Don’t you worry about it.\n" - .string "It won’t be a challenge to you.\p" - .string "The entrance to NEW MAUVILLE is just\n" - .string "a short SURF away from ROUTE 110.\p" - .string "That’s it, then, you have my trust!\n" - .string "Wahahahaha!$" + .string "WALTER: Mach dir keine Sorgen. Man\n" + .string "kann das nicht gerade eine Heraus-\l" + .string "forderung nennen.\p" + .string "Der Eingang zu NEU MALVENFROH\n" + .string "ist eine kurze SURF-Strecke von\l" + .string "ROUTE 110 entfernt.\p" + .string "Das ist alles. Du kannst mir vertrauen!\n" + .string "Wahahahahahaha!$" MauvilleCity_Text_1663EB:: @ 81663EB - .string "WATTSON: Wahahahaha!\p" - .string "I knew it, {PLAYER}{KUN}! I knew I’d made\n" - .string "the right choice asking you!\p" - .string "This is my thanks - a TM containing\n" - .string "THUNDERBOLT!\p" - .string "Go on, you’ve earned it!$" + .string "WALTER: Wahahahahaha!\p" + .string "Ich wusste es, {PLAYER}{KUN}! Ich wusste, ich\n" + .string "habe die richtige Person herausgepickt!\p" + .string "Hier, das ist mein Dankeschön - eine TM,\n" + .string "die DONNERBLITZ enthält!\p" + .string "Nimm! Du hast sie dir wirklich verdient!$" MauvilleCity_Text_166488:: @ 8166488 - .string "WATTSON: Wahahahaha!\p" - .string "It pleases me to no end to see the\n" - .string "young step up and take charge!$" + .string "WALTER: Wahahahahaha!\p" + .string "Es freut mich zu sehen, wie energetisch\n" + .string "sich die jungen Leute heute entwickeln!$" MauvilleCity_Text_1664DF:: @ 81664DF - .string "You know, it’s cool to have POKéMON\n" - .string "battles and stuff...\p" - .string "But if your POKéMON gets hurt, you\n" - .string "have to nurse it back to health.$" + .string "Weißt du, es ist cool, dass es POKéMON-\n" + .string "Kämpfe und all das Zeugs gibt...\p" + .string "Aber wenn dein POKéMON verletzt wird,\n" + .string "dann musst du es gesund pflegen.$" MauvilleCity_Text_16655C:: @ 816655C - .string "The roads of this town stretch north\n" - .string "and south, and east and west.\p" - .string "Because of that, we get all sorts of\n" - .string "people coming through.$" + .string "Die Straßen dieses Ortes führen nach\n" + .string "Norden, Süden, nach Westen und Osten.\p" + .string "Daher reisen hier auch so viele ver-\n" + .string "schiedene Leute durch.$" MauvilleCity_Text_1665DB:: @ 81665DB - .string "Have you been to RYDEL’S CYCLES yet?\p" - .string "RYDEL, the owner, is a very generous\n" - .string "man.$" + .string "Warst du schon in RADLAS RADLADEN?\p" + .string "RADLA, der Eigentümer, ist ein sehr\n" + .string "großzügiger Mann.$" MauvilleCity_Text_16662A:: @ 816662A - .string "Even if you’re riding a BIKE, wild\n" - .string "POKéMON could jump you.$" + .string "Selbst wenn du mit dem RAD fährst,\n" + .string "können dich POKéMON anspringen.$" MauvilleCity_Text_166665:: @ 8166665 - .string "MAUVILLE CITY\n" - .string "“The bright and shiny city of fun!”$" + .string "MALVENFROH CITY\n" + .string "“Die strahlende Stadt der Freude!”$" MauvilleCity_Text_166697:: @ 8166697 - .string "MAUVILLE CITY POKéMON GYM\n" - .string "LEADER: WATTSON\l" - .string "“The cheerfully electrifying man!”$" + .string "POKéMON ARENA von MALVENFROH CITY\n" + .string "LEITER: WALTER\l" + .string "“Der Mann, der Spannung entlädt!”$" MauvilleCity_Text_1666E4:: @ 81666E4 - .string "“Ride in gravel and shake up your\n" - .string "soul!”\l" - .string "RYDEL’S CYCLES$" + .string "“Fahre im Kies und lass dich durch-\n" + .string "schütteln!”\l" + .string "RADLAS RÄDER$" MauvilleCity_Text_16671C:: @ 816671C - .string "“The play spot for all!”\n" - .string "MAUVILLE GAME CORNER$" + .string "“Der Ort für alle Spieler!”\n" + .string "MALVENFROH CITY SPIELHALLE$" MauvilleCity_Text_16674A:: @ 816674A - .string "Hi, do you check out TV at all?\p" - .string "They’ve added a bunch of cool new\n" - .string "shows recently.\p" - .string "TV is so cool. I’ve seen my friends on\n" - .string "TV just out of the blue.\p" - .string "And, sometimes, they even put you on TV\n" - .string "without telling you.\p" - .string "I wish I would be on TV sometime.\p" - .string "That’s why I think you should check\n" - .string "out TVs whenever you can.$" + .string "Hi, hast du in letzter Zeit ferngesehen?\p" + .string "Da gibt es jetzt jede Menge coole, neue\n" + .string "Shows.\p" + .string "Fernsehen ist so cool. Plötzlich habe\n" + .string "ich meine Freunde im Fernsehen gesehen.\p" + .string "Und manchmal, da zeigen sie dich im\n" + .string "Fernsehen und du weißt es gar nicht.\p" + .string "Ich möchte auch mal im Fernsehen sein.\p" + .string "Du solltest immer mal wieder den\n" + .string "Fernseher einschalten...$" MauvilleCity_Text_166879:: @ 8166879 - .string "Hi, have you been checking out TVs?$" + .string "Hi, hast du in letzter Zeit ferngesehen?$" diff --git a/data/text/maps/MauvilleCity_BikeShop.inc b/data/text/maps/MauvilleCity_BikeShop.inc index 3fbdffc09..6587535ef 100644 --- a/data/text/maps/MauvilleCity_BikeShop.inc +++ b/data/text/maps/MauvilleCity_BikeShop.inc @@ -1,144 +1,146 @@ MauvilleCity_BikeShop_Text_180F9F:: @ 8180F9F - .string "Well, well, what have we here?\n" - .string "A most energetic customer!\p" - .string "Me? You may call me RYDEL.\n" - .string "I’m the owner of this cycle shop.$" + .string "Nun, was haben wir denn hier?\n" + .string "Einen höchst energetischen Kunden!\p" + .string "Ich? Du kannst RADLA zu mir sagen.\n" + .string "Ich bin der Besitzer des Fahrrad-Shops.$" MauvilleCity_BikeShop_Text_181016:: @ 8181016 - .string "RYDEL: Your RUNNING SHOES...\n" - .string "They’re awfully filthy.\p" - .string "Did you come from far away?$" + .string "RADLA: Deine TURBOTRETER...\n" + .string "Die sehen ja wirklich schmuddelig aus...\p" + .string "Kommst du von weit her?$" MauvilleCity_BikeShop_Text_181067:: @ 8181067 - .string "RYDEL: Is that right?\p" - .string "Then, I guess you have no need for\n" - .string "any of my BIKES.$" + .string "RADLA: Stimmt das wirklich?\p" + .string "Dann kannst du, glaube ich, keines\n" + .string "meiner Fahrräder gebrauchen.$" MauvilleCity_BikeShop_Text_1810B1:: @ 81810B1 - .string "RYDEL: Hm, hm... ... ... ... ...\n" + .string "RADLA: Hm, hm... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "You’re saying that you came all this\n" - .string "way from LITTLEROOT?\p" - .string "My goodness!\n" - .string "That’s ridiculously far!\p" - .string "If you had one of my BIKES, you could\n" - .string "go anywhere easily while feeling the\l" - .string "gentle caress of the wind!\p" - .string "I’ll tell you what!\n" - .string "I’ll give you a BIKE!\p" - .string "Oh, wait a second!\p" - .string "I forgot to tell you that there are\n" - .string "two kinds of BIKES!\p" - .string "They are the MACH BIKE and the\n" - .string "ACRO BIKE!\p" - .string "MACH BIKE is for cyclists who want\n" - .string "to feel the wind with their bodies!\p" - .string "And an ACRO BIKE is for those who\n" - .string "prefer technical rides!\p" - .string "I’m a real sweetheart, so you can\n" - .string "have whichever one you like!\p" - .string "Which one will you choose?$" + .string "Du kommst den ganzen Weg von\n" + .string "WURZELHEIM her?\p" + .string "Meine Güte!\n" + .string "Das ist unwahrscheinlich weit weg!\p" + .string "Wenn du eines meiner RÄDER\n" + .string "hättest, könntest du leicht überall hin\l" + .string "und den Wind in den Haaren spüren!\p" + .string "Ich sag dir was!\n" + .string "Ich werde dir ein RAD geben!\p" + .string "Oh, eine Sekunde!\p" + .string "Ich sollte dir sagen, dass es zwei\n" + .string "verschiedene RÄDER gibt!\p" + .string "Das EILRAD und das KUNSTRAD!\p" + .string "EILRÄDER für Leute, die den Wind in\n" + .string "den Haaren spüren wollen!\p" + .string "KUNSTRÄDER für Leute, die die\n" + .string "Techniken des Radfahrens\l" + .string "beherrschen wollen!\p" + .string "Da ich ein richtig weiches Herz habe,\n" + .string "darfst du dir eines aussuchen!\p" + .string "Welches möchtest du haben?$" MauvilleCity_BikeShop_Text_181332:: @ 8181332 - .string "{PLAYER} chose the MACH BIKE.$" + .string "{PLAYER} wählt das EILRAD.$" MauvilleCity_BikeShop_Text_18134A:: @ 818134A - .string "{PLAYER} chose the ACRO BIKE.$" + .string "{PLAYER} wählt das KUNSTRAD.$" MauvilleCity_BikeShop_Text_181362:: @ 8181362 - .string "RYDEL: If you get the urge to switch\n" - .string "BIKES, just come see me!$" + .string "RADLA: Wenn du die RÄDER tauschen\n" + .string "möchtest, komm einfach wieder vorbei!$" MauvilleCity_BikeShop_Text_1813A0:: @ 81813A0 - .string "RYDEL: Oh? Were you thinking about\n" - .string "switching BIKES?$" + .string "RADLA: Oh. Du möchtest die RÄDER\n" + .string "tauschen?$" MauvilleCity_BikeShop_Text_1813D4:: @ 81813D4 - .string "RYDEL: Okay, no problem!\n" - .string "I’ll switch BIKES for you!$" + .string "RADLA: Kein Problem!\n" + .string "Ich tausche die RÄDER für dich aus!$" MauvilleCity_BikeShop_Text_181408:: @ 8181408 - .string "{PLAYER} got the MACH BIKE exchanged\n" - .string "for an ACRO BIKE.$" + .string "{PLAYER} bekommt für das EILRAD ein\n" + .string "KUNSTRAD.$" MauvilleCity_BikeShop_Text_181439:: @ 8181439 - .string "{PLAYER} got the ACRO BIKE exchanged\n" - .string "for a MACH BIKE.$" + .string "{PLAYER} bekommt für das KUNSTRAD ein\n" + .string "EILRAD.$" MauvilleCity_BikeShop_Text_181469:: @ 8181469 - .string "RYDEL: Good, good!\n" - .string "I’m happy that you like it!$" + .string "RADLA: Wunderbar!\n" + .string "Ich freue mich, dass es dir gefällt!$" MauvilleCity_BikeShop_Text_181498:: @ 8181498 - .string "Oh? What happened to that BIKE I\n" - .string "gave you?\p" - .string "Oh, I get it, you stored it using your PC.\p" - .string "Well, take it out of PC storage,\n" - .string "and I’ll be happy to exchange it!\p" - .string "May the wind always be at your back\n" - .string "on your adventure!$" + .string "Oh? Was ist mit dem RAD geschehen,\n" + .string "das ich dir gegeben habe?\p" + .string "Ach so, du hast es in deinem PC gelagert.\p" + .string "Nun, hol es heraus und ich werde es mit\n" + .string "Freuden gegen ein anderes tauschen!\p" + .string "Möge der Wind dir stets im Rücken sein\n" + .string "bei deinem Abenteuer!$" MauvilleCity_BikeShop_Text_181568:: @ 8181568 - .string "I’m learning about BIKES while\n" - .string "I work here.\p" - .string "If you need advice on how to ride your\n" - .string "BIKE, there’re a couple handbooks in\l" - .string "the back.$" + .string "Ich lerne etwas über RÄDER,\n" + .string "während ich hier arbeite.\p" + .string "Wenn du eine Anleitung brauchst, wie\n" + .string "man RAD fährt - da vorne findest du\l" + .string "einige Handbücher.$" MauvilleCity_BikeShop_Text_1815EA:: @ 81815EA - .string "It’s a handbook on the MACH BIKE.\p" - .string "Which page do you want to read?$" + .string "Ein Handbuch zum EILRAD.\p" + .string "Welche Seite möchtest du lesen?$" MauvilleCity_BikeShop_Text_18162C:: @ 818162C - .string "A BIKE moves in the direction that\n" - .string "the + Control Pad is pressed.\p" - .string "It will speed up once it gets rolling.\p" - .string "To stop, release the + Control Pad.\n" - .string "The BIKE will slow to a stop.\p" - .string "Want to read a different page?$" + .string "Mit Hilfe des + Steuerkreuzes lässt\n" + .string "sich das RAD lenken.\p" + .string "Es wird immer schneller, wenn es\n" + .string "einmal fährt.\p" + .string "Lass das Steuerkreuz los, um das\n" + .string "RAD anzuhalten.\p" + .string "Eine andere Seite lesen?$" MauvilleCity_BikeShop_Text_1816F5:: @ 81816F5 - .string "A MACH BIKE is speedy, but it can’t\n" - .string "stop very quickly.\p" - .string "It gets a little tricky to get around\n" - .string "a corner.\p" - .string "Release the + Control Pad a little\n" - .string "before the corner and slow down.\p" - .string "Want to read a different page?$" + .string "Ein EILRAD ist sehr schnell und kann\n" + .string "nicht schnell gestoppt werden.\p" + .string "Das Kurvenfahren ist sehr schwierig.\p" + .string "Lasse das + Steuerkreuz etwas los und\n" + .string "bremse, bevor du an eine Kurve kommst.\p" + .string "Eine andere Seite lesen?$" MauvilleCity_BikeShop_Text_1817BF:: @ 81817BF - .string "There are small sandy slopes throughout\n" - .string "the HOENN region.\p" - .string "The loose, crumbly sand makes it\n" - .string "impossible to climb normally.\p" - .string "But if you have a MACH BIKE, you can\n" - .string "zip up a sandy slope.\p" - .string "Want to read a different page?$" + .string "In der ganzen HOENN-Region gibt es\n" + .string "sandige Gefälle.\p" + .string "Der lose Sand erlaubt es nicht, diese\n" + .string "Gefälle normal zu erklettern.\p" + .string "Aber mit einem EILRAD können auch\n" + .string "diese Gefälle gemeistert werden.\p" + .string "Eine andere Seite lesen?$" MauvilleCity_BikeShop_Text_181892:: @ 8181892 - .string "It’s a handbook on the ACRO BIKE.\p" - .string "Which page do you want to read?$" + .string "Ein Handbuch zum KUNSTRAD.\p" + .string "Welche Seite möchtest du lesen?$" MauvilleCity_BikeShop_Text_1818D4:: @ 81818D4 - .string "Press the B Button while riding, and the\n" - .string "front wheel lifts up.\p" - .string "You can zip around with the front\n" - .string "wheel up using the + Control Pad.\p" - .string "This technique is called a wheelie.\p" - .string "Want to read a different page?$" + .string "Drücke während des Fahrens den\n" + .string "B-Knopf, um das Vorderrad anzuheben.\p" + .string "Ist das Vorderrad angehoben, können\n" + .string "mit Hilfe des Steuerkreuzes Sprünge\l" + .string "ausgeführt werden.\p" + .string "Diese Technik nennt sich Wheelie.\p" + .string "Eine andere Seite lesen?$" MauvilleCity_BikeShop_Text_18199A:: @ 818199A - .string "Keeping the B Button pressed, your\n" - .string "BIKE can hop on the spot.\p" - .string "This technique is called a bunny hop.\p" - .string "You can ride while hopping, too.\p" - .string "Want to read a different page?$" + .string "Wird der B-Knopf gedrückt, kann auf der\n" + .string "Stelle gehüpft werden.\p" + .string "Diese Technik nennt sich Hoppeln.\p" + .string "Dabei kann gleichzeitig gefahren\n" + .string "werden.\p" + .string "Eine andere Seite lesen?$" MauvilleCity_BikeShop_Text_181A3D:: @ 8181A3D - .string "Press the B Button and the + Control\n" - .string "Pad at the same time to jump.\p" - .string "Press the + Control Pad to the side\n" - .string "to jump sideways.\p" - .string "Press it backwards to make the BIKE\n" - .string "change directions while jumping.\p" - .string "Want to read a different page?$" + .string "Drücke gleichzeitig den B-Knopf und das\n" + .string "Steuerkreuz, um zu springen.\p" + .string "Drücke das + Steuerkreuz seitlich, um\n" + .string "einen seitlichen Sprung auszuführen.\p" + .string "Drücke es nach hinten, um die Richtung\n" + .string "zu ändern.\p" + .string "Eine andere Seite lesen?$" diff --git a/data/text/maps/MauvilleCity_GameCorner.inc b/data/text/maps/MauvilleCity_GameCorner.inc index f367c3cf2..a8756771a 100644 --- a/data/text/maps/MauvilleCity_GameCorner.inc +++ b/data/text/maps/MauvilleCity_GameCorner.inc @@ -1,147 +1,152 @@ MauvilleCity_GameCorner_Text_181C35:: @ 8181C35 - .string "This is MAUVILLE GAME CORNER.$" + .string "Willkommen in unserer SPIELHALLE.$" MauvilleCity_GameCorner_Text_181C53:: @ 8181C53 - .string "Okay, you wanted some COINS for\n" - .string "the games?\p" - .string "But you don’t have a COIN CASE for\n" - .string "stowing the COINS.$" + .string "Okay, du möchtest MÜNZEN für die\n" + .string "Spiele haben?\p" + .string "Aber du hast keinen MÜNZKORB für die\n" + .string "MÜNZEN.$" MauvilleCity_GameCorner_Text_181CB4:: @ 8181CB4 - .string "Were you looking for COINS?\p" - .string "It’s ¥1000 for 50 COINS.\n" - .string "Would you like some?$" + .string "Suchst du nach MÜNZEN?\p" + .string "Das macht ¥1000 für 50 MÜNZEN.\n" + .string "Möchtest du welche haben?$" MauvilleCity_GameCorner_Text_181CFE:: @ 8181CFE - .string "Thank you very much!\n" - .string "Here are your COINS!$" + .string "Vielen Dank!\n" + .string "Hier sind deine MÜNZEN!$" MauvilleCity_GameCorner_Text_181D28:: @ 8181D28 - .string "Um... You don’t appear to have\n" - .string "enough money...$" + .string "Ähm... Es scheint, du hast nicht\n" + .string "genügend Geld dabei...$" MauvilleCity_GameCorner_Text_181D57:: @ 8181D57 .string "Oh?\n" - .string "Your COIN CASE is full.$" + .string "Dein MÜNZKORB ist voll.$" MauvilleCity_GameCorner_Text_181D73:: @ 8181D73 - .string "Oh... You don’t need COINS, then?\n" - .string "Good luck on your adventure!$" + .string "Oh... Dann brauchst du keine MÜNZEN?\n" + .string "Viel Glück bei deinem Abenteuer!$" UnknownString_8181DB2: @ 8181DB2 - .string "It’s ¥1,000 for 50 COINS.\n" - .string "Would you like some?$" + .string "Das macht ¥1000 für 50 MÜNZEN.\n" + .string "Möchtest du welche haben?$" MauvilleCity_GameCorner_Text_181DE1:: @ 8181DE1 - .string "Welcome.\p" - .string "You can exchange your COINS for\n" - .string "prizes here.$" + .string "Willkommen.\p" + .string "Hier kannst du deine MÜNZEN gegen\n" + .string "Preise eintauschen.$" MauvilleCity_GameCorner_Text_181E17:: @ 8181E17 - .string "Which prize would you like?$" + .string "Welchen Preis hättest du gerne?$" MauvilleCity_GameCorner_Text_181E33:: @ 8181E33 - .string "So your choice is {STR_VAR_1}?$" + .string "Du möchtest also {STR_VAR_1}?$" MauvilleCity_GameCorner_Text_181E49:: @ 8181E49 - .string "Thank you!\n" - .string "We’ll send it to your PC at home.$" + .string "Danke!\n" + .string "Wir senden das auf deinen PC.$" MauvilleCity_GameCorner_Text_181E76:: @ 8181E76 - .string "You don’t have enough COINS.$" + .string "Du hast nicht genügend MÜNZEN.$" UnknownString_8181E93: @ 8181E93 - .string "There isn’t any room available for\n" - .string "placing {STR_VAR_1}.$" + .string "Du hast nicht genügend Platz, um\n" + .string "{STR_VAR_1} zu lagern.$" MauvilleCity_GameCorner_Text_181EC2:: @ 8181EC2 - .string "Oh, is that so? \n" - .string "You need to save some COINS before\l" - .string "coming back here.$" + .string "Oh, wirklich?\n" + .string "Du musst einige MÜNZEN sparen, bevor\l" + .string "du wiederkommst.$" MauvilleCity_GameCorner_Text_181F08:: @ 8181F08 - .string "Here you go!$" + .string "Bitte schön!$" UnknownString_8181F15: @ 8181F15 - .string "Oh, you can’t carry any more than that.$" + .string "Oh, du kannst nicht mehr tragen.$" MauvilleCity_GameCorner_Text_181F3D:: @ 8181F3D - .string "I made a mistake and got two of the\n" - .string "same DOLLS.\p" - .string "Would you like one of them?$" + .string "Ich habe mich vertan und zweimal die\n" + .string "gleiche PUPPE genommen.\p" + .string "Möchtest du eine davon haben?$" MauvilleCity_GameCorner_Text_181F89:: @ 8181F89 - .string "There you go!$" + .string "Bitte schön!$" MauvilleCity_GameCorner_Text_181F97:: @ 8181F97 - .string "Huh?\n" - .string "You want it, but not right now?$" + .string "Bitte?\n" + .string "Du möchtest sie, aber nicht jetzt???$" MauvilleCity_GameCorner_Text_181FBC:: @ 8181FBC - .string "Oh, don’t be so negative!\n" - .string "You can have this!$" + .string "Oh, sei doch nicht so negativ drauf!\n" + .string "Du kannst sie wirklich gerne haben!$" MauvilleCity_GameCorner_Text_181FE9:: @ 8181FE9 - .string "There’s a prize I want, but I can’t win\n" - .string "the jackpot.$" + .string "Es gibt einen Preis, den ich haben\n" + .string "möchte, aber ich kann den Jackpot\l" + .string "nicht knacken.$" MauvilleCity_GameCorner_Text_18201E:: @ 818201E - .string "Hey, kid, if you want to play here,\n" - .string "you need a COIN CASE.\p" - .string "I think the young lady next door\n" - .string "had one. Go see her!$" + .string "Hey, Kindchen, wenn du hier spielen\n" + .string "willst, brauchst du einen MÜNZKORB.\p" + .string "Ich glaube, die junge Dame nebenan hat\n" + .string "einen. Besuche sie mal!$" MauvilleCity_GameCorner_Text_18208E:: @ 818208E - .string "My luck can only last so long.\n" - .string "This is too much for me.\l" - .string "Here, take some COINS!$" + .string "Mein Glück wird nicht immer anhalten.\n" + .string "Das ist zu viel für mich.\l" + .string "Hier, nimm die MÜNZEN!$" MauvilleCity_GameCorner_Text_1820DD:: @ 81820DD - .string "MAUVILLE has something for\n" - .string "everyone.\p" - .string "For me, it’s the GAME CORNER.$" + .string "Immer wenn ich in MALVENFROH CITY bin,\n" + .string "gehe ich in die SPIELHALLE.\p" + .string "MALVENFROH CITY bringt mir einfach\n" + .string "Glück.$" MauvilleCity_GameCorner_Text_182120:: @ 8182120 - .string "The ROULETTE tables have different\n" - .string "rates.\p" - .string "Check your COINS if you’re going to\n" - .string "pick a table.$" + .string "Beim ROULETTE gibt es verschiedene\n" + .string "Einsatzhöhen.\p" + .string "Überprüf deine MÜNZEN, bevor du dich\n" + .string "für einen Tisch entscheidest.$" MauvilleCity_GameCorner_Text_18217C:: @ 818217C - .string "It’s easy to lose track of time in here. \n" - .string "I should get back to work.$" + .string "Hier kann man leicht die Zeit vergessen.\n" + .string "Ich sollte wieder an die Arbeit gehen.$" MauvilleCity_GameCorner_Text_1821C1:: @ 81821C1 - .string "COINS are needed to play here in the\n" - .string "GAME CORNER.$" + .string "MÜNZEN werden gebraucht, um hier in der\n" + .string "SPIELHALLE spielen zu können.$" MauvilleCity_GameCorner_Text_1821F3:: @ 81821F3 - .string "This ROULETTE thing...\n" - .string "It’s rather demanding.\p" - .string "Win or lose, it’s only by luck.$" + .string "Dieses ROULETTE-Dingens...\n" + .string "Es ist ziemlich anstrengend.\p" + .string "Ich versuche, zu gewinnen. Aber ich\n" + .string "verliere immer. Doch ich gebe nicht auf.$" MauvilleCity_GameCorner_Text_182241:: @ 8182241 - .string "Up to three COINS can be used to play\n" - .string "the SLOTS.$" + .string "Bis zu drei MÜNZEN können an den EIN-\n" + .string "ARMIGEN BANDITEN eingesetzt werden.\p" + .string "Je mehr Münzen du einsetzt, desto\n" + .string "höher ist deine Chance auf den Jackpot.$" MauvilleCity_GameCorner_Text_182272:: @ 8182272 - .string "It’s very difficult to make it stop\n" - .string "right on “7.”\p" - .string "If it stops on “7” during the REEL TIME\n" - .string "bonus game, you’ll receive extra COINS.$" + .string "Kannst du es genau bei “7” stoppen?\p" + .string "Wenn es bei “7” stoppt,\n" + .string "während ein REEL TIME gespielt wird,\l" + .string "erhältst du Extra-MÜNZEN.$" MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 - .string "Here’s some information for you\n" - .string "about the SLOTS.\p" - .string "The more lightning bolts you stock, the\n" - .string "more REEL TIME chances you get.\p" - .string "In a game with the maximum five REEL\n" - .string "TIME chances...\p" - .string "It is possible to receive four regular\n" - .string "bonuses, then a big bonus.\p" - .string "The big bonus is 660 COINS, but it’s\n" - .string "very difficult to get.$" + .string "Ich kann dir einige nützliche Tipps zu\n" + .string "den EINARMIGEN BANDITEN geben.\p" + .string "Je mehr Blitze du anhältst, desto größer\n" + .string "die Chance auf ein REEL TIME, eine\l" + .string "Glücksrunde!\p" + .string "In einem Spiel mit fünf möglichen\n" + .string "Glücksrunden...\p" + .string "Ist es möglich, vier reguläre Boni und\n" + .string "dann einen Big Bonus zu gewinnen.\p" + .string "Der Big Bonus bringt 660 MÜNZEN,\n" + .string "aber der ist sehr schwer zu gewinnen.$" MauvilleCity_GameCorner_Text_182420:: @ 8182420 - .string "You can’t play if you don’t have a\n" - .string "COIN CASE.$" + .string "Du kannst ohne MÜNZKORB nicht spielen.$" diff --git a/data/text/maps/MauvilleCity_Gym.inc b/data/text/maps/MauvilleCity_Gym.inc index 5ae43f880..9d002ba9e 100644 --- a/data/text/maps/MauvilleCity_Gym.inc +++ b/data/text/maps/MauvilleCity_Gym.inc @@ -1,116 +1,122 @@ MauvilleCity_Gym_Text_180815:: @ 8180815 - .string "Hey, how’s it going, the CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "WATTSON, the LEADER of MAUVILLE\n" - .string "GYM, uses ELECTRIC-type POKéMON.\p" - .string "If you challenge him with WATER-type\n" - .string "POKéMON, he’ll zap them! Bzzt!\p" - .string "And, he’s put in switch-controlled doors\n" - .string "all over his GYM! Eccentric!\p" - .string "Hey, go for it!$" + .string "Hey, wie sieht es aus, auf dem Weg zum\n" + .string "CHAMP, {PLAYER}?\p" + .string "WALTER, der ARENALEITER von\n" + .string "MALVENFROH CITY, setzt\l" + .string "ELEKTRO-POKéMON ein.\p" + .string "Wenn du ihn mit WASSER-POKéMON\n" + .string "angreifst, macht er sie fertig! Britzel!\p" + .string "Und die Türen lassen sich nur mit\n" + .string "Schaltern öffnen! Wahnsinn!\p" + .string "Nun, dann mal los!$" MauvilleCity_Gym_Text_18091D:: @ 818091D - .string "Whoa, you’re electrifying!\n" - .string "You’ve powered the door open!$" + .string "Aah, du bist elektrifizierend!\n" + .string "Du hast die Tür offen gezwungen!$" MauvilleCity_Gym_Text_180956:: @ 8180956 - .string "My electric soul, it’ll shatter your\n" - .string "dreams whole, whoah-yeahah!$" + .string "Die Spannung meiner Seele, sie setzt\n" + .string "alle deine Träume unter Strom! Ja-haha!$" MauvilleCity_Gym_Text_180997:: @ 8180997 - .string "That was plugged in, amped up,\n" - .string "over-driven electric, man!$" + .string "Da wurde der Stromkreis geschlossen\n" + .string "und bis zum Kurzschluss belastet!$" MauvilleCity_Gym_Text_1809D1:: @ 81809D1 - .string "POKéMON and rock, it’s all about heart,\n" - .string "whoah yeah!$" + .string "POKéMON und Rock... Alles, was ins Herz\n" + .string "trifft, boh yeah!$" MauvilleCity_Gym_Text_180A05:: @ 8180A05 - .string "I trained under WATTSON!\n" - .string "There ain’t no way I’d lose easily!$" + .string "Ich habe unter WALTER trainiert!\n" + .string "So einfach verliere ich nicht.$" MauvilleCity_Gym_Text_180A42:: @ 8180A42 - .string "Unplugged and turned off...$" + .string "Stecker raus und ausgeschaltet...$" MauvilleCity_Gym_Text_180A5E:: @ 8180A5E - .string "WATTSON, our GYM LEADER, has been\n" - .string "around for a long, long time.\p" - .string "He was battling even before your\n" - .string "daddy was born, that tough coot.$" + .string "WALTER, unser ARENALEITER, ist schon\n" + .string "sehr sehr lange hier ansässig.\p" + .string "Er kämpfte schon, da war dein Vater\n" + .string "noch nicht geboren.$" MauvilleCity_Gym_Text_180AE0:: @ 8180AE0 - .string "This GYM’s got puzzles!\n" - .string "Isn’t it fun?$" + .string "Diese ARENA stellt dir eine Knobel-\n" + .string "aufgabe. Ist das nicht lustig?$" MauvilleCity_Gym_Text_180B06:: @ 8180B06 - .string "It’s no fun to lose...$" + .string "Verlieren ist gar nicht lustig...$" MauvilleCity_Gym_Text_180B1D:: @ 8180B1D - .string "WATTSON says he likes setting up\n" - .string "little traps with switches.$" + .string "WALTER sagt, er liebt es, Fallen mit\n" + .string "Schaltern zu installieren.$" MauvilleCity_Gym_Text_180B5A:: @ 8180B5A - .string "With my charm and my POKéMON’s moves,\n" - .string "you’ll be shocked!$" + .string "Mein Charme und die Attacken meiner\n" + .string "POKéMON werden dich schocken!$" MauvilleCity_Gym_Text_180B93:: @ 8180B93 - .string "I’m shocked by your power!$" + .string "Ich bin geschockt von deiner Stärke!$" MauvilleCity_Gym_Text_180BAE:: @ 8180BAE - .string "I’ve heard that MAUVILLE was founded\n" - .string "by WATTSON.\p" - .string "He was a TRAINER long before we\n" - .string "became TRAINERS.\l" - .string "He must know all sorts of things!$" + .string "Ich habe gehört, dass MALVENFROH CITY\n" + .string "von WALTER gegründet wurde.\p" + .string "Er war TRAINER, lange bevor wir geboren\n" + .string "wurden. Er muss ein umfangreiches\l" + .string "Wissen besitzen.$" MauvilleCity_Gym_Text_180C32:: @ 8180C32 - .string "I’ve given up on my plans to convert\n" - .string "the city, I have.\p" - .string "And so, I put my time into making\n" - .string "door traps in my GYM.\p" - .string "Oh? Now, what are you doing here?\p" - .string "What’s that? You say you’ve gotten\n" - .string "past all my rigged doors?\p" - .string "Wahahahah!\n" - .string "Now, that is amusing!\p" - .string "Then, I, WATTSON, the LEADER of\n" - .string "MAUVILLE GYM, shall electrify you!$" + .string "Ich habe es aufgegeben, die Stadt\n" + .string "umpolen zu wollen.\p" + .string "Stattdessen verwende ich meine Energie\n" + .string "lieber auf das Installieren von Fallen in\l" + .string "meiner Arena.\p" + .string "Oh? Was machst du denn hier?\p" + .string "Was ist das? Du hast es geschafft, alle\n" + .string "meine Schalter zu finden?\p" + .string "Uahahahaha!\n" + .string "Das ist wirklich amüsant!\p" + .string "Dann ist es nun an mir - dem\n" + .string "ARENALEITER von MALVENFROH CITY\l" + .string "- dich unter Spannung zu setzen!$" MauvilleCity_Gym_Text_180D64:: @ 8180D64 - .string "Wahahahah!\n" - .string "Fine, I lost!\p" - .string "You ended up giving me a thrill!\n" - .string "Take this BADGE!$" + .string "Uahahahaha!\n" + .string "Schön, ich habe verloren!\p" + .string "Du hast es geschafft, meinen Strom-\n" + .string "kreis zu unterbrechen! Nimm diesen\l" + .string "ORDEN!$" MauvilleCity_Gym_Text_180DAF:: @ 8180DAF - .string "{PLAYER} received the DYNAMO BADGE\n" - .string "from WATTSON.$" + .string "{PLAYER} hat den DYNAMO-ORDEN von\n" + .string "WALTER erhalten.$" MauvilleCity_Gym_Text_180DDA:: @ 8180DDA - .string "With the DYNAMO BADGE, POKéMON can\n" - .string "use ROCK SMASH out of battle.\p" - .string "And, it will make your POKéMON a little\n" - .string "bit faster, too.\p" + .string "Mit dem DYNAMO-ORDEN können POKéMON\n" + .string "ZERTRÜMMERER auch außerhalb eines\l" + .string "Kampfes einsetzen.\p" + .string "Und außerdem werden deine POKéMON ein\n" + .string "kleines bisschen schneller.\p" .string "Hmm...\n" - .string "You should take this, too!$" + .string "Dies hier solltest du auch nehmen!$" MauvilleCity_Gym_Text_180E76:: @ 8180E76 - .string "That TM34 there contains SHOCK WAVE.\p" - .string "It’s a trustworthy move that never\n" - .string "misses! You can count on it!$" + .string "Dies ist TM34 - SCHOCKWELLE.\p" + .string "Eine verlässliche Attacke, die niemals\n" + .string "daneben geht! Verlass dich drauf!$" MauvilleCity_Gym_Text_180EDB:: @ 8180EDB - .string "I swell with optimism, seeing a promising\n" - .string "young TRAINER like you!$" + .string "Optimismus erfüllt mich, wenn ich einen\n" + .string "so viel versprechenden TRAINER wie dich\l" + .string "sehe!$" MauvilleCity_Gym_Text_180F1D:: @ 8180F1D - .string "Wahahahah!\n" - .string "Go forth and endeavor, youngster!$" + .string "Ahahahaha!\n" + .string "Mach weiter so, streng dich an, Kind!$" MauvilleCity_Gym_Text_180F4A:: @ 8180F4A - .string "MAUVILLE CITY POKéMON GYM$" + .string "POKéMON ARENA von MALVENFROH CITY$" MauvilleCity_Gym_Text_180F64:: @ 8180F64 - .string "MAUVILLE CITY POKéMON GYM\p" - .string "WATTSON’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von MALVENFROH CITY\p" + .string "WALTERS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/MauvilleCity_House1.inc b/data/text/maps/MauvilleCity_House1.inc index c5eec210e..2f0067526 100644 --- a/data/text/maps/MauvilleCity_House1.inc +++ b/data/text/maps/MauvilleCity_House1.inc @@ -1,16 +1,17 @@ MauvilleCity_House1_Text_181B1A:: @ 8181B1A - .string "Woohoo, your POKéMON look pretty\n" - .string "strong.\p" - .string "I like that!\n" - .string "Here, take this HM!$" + .string "Woohoo, deine POKéMON sehen wirklich\n" + .string "sehr stark aus.\p" + .string "Das sehe ich gerne!\n" + .string "Hier, nimm diese VM!$" MauvilleCity_House1_Text_181B64:: @ 8181B64 - .string "That HM contains ROCK SMASH.\p" - .string "If you come across large boulders\n" - .string "that block your path...\p" - .string "Well, use that HM move and smash\n" - .string "it right out of your way!$" + .string "Diese VM enthält ZERTRÜMMERER.\p" + .string "Wenn du unterwegs auf große\n" + .string "Felsbrocken stößt...\p" + .string "Dann nutze diese VM, um dir den Weg\n" + .string "freizumachen.$" MauvilleCity_House1_Text_181BF6:: @ 8181BF6 - .string "Oh, yes, if you smash a rock, a POKéMON\n" - .string "could come flying out.$" + .string "Oh ja, wenn du einen Felsen\n" + .string "zertrümmerst, könnte ein POKéMON\l" + .string "zum Vorschein kommen.$" diff --git a/data/text/maps/MauvilleCity_House2.inc b/data/text/maps/MauvilleCity_House2.inc index 50cdf1fa7..6de1ff1d9 100644 --- a/data/text/maps/MauvilleCity_House2.inc +++ b/data/text/maps/MauvilleCity_House2.inc @@ -1,22 +1,24 @@ MauvilleCity_House2_Text_18244E:: @ 818244E - .string "If I had a BIKE, it’d be easy to cycle to\n" - .string "SLATEPORT for some shopping.\p" - .string "I’d be able to buy HARBOR MAIL at the\n" - .string "POKéMON MART in SLATEPORT...$" + .string "Wenn ich doch nur ein RAD hätte...\n" + .string "Dann könnte ich nach GRAPHITPORT\l" + .string "CITY zum Einkaufen fahren.\p" + .string "Dort würde ich mir dann einen HAFEN-\n" + .string "BRIEF im PKMN-SUPERMARKT kaufen...$" MauvilleCity_House2_Text_1824D8:: @ 81824D8 - .string "Oh! You have HARBOR MAIL?\n" - .string "Will you trade it for a COIN CASE?$" + .string "Oh! Du besitzt einen HAFENBRIEF!!!\n" + .string "Würdest du den gegen einen MÜNZKORB\l" + .string "tauschen?$" MauvilleCity_House2_Text_182515:: @ 8182515 - .string "Oh, I’m so happy!\n" - .string "Okay, I’ll trade you a COIN CASE!$" + .string "Oh, ich bin so glücklich!\n" + .string "Okay, ich gebe dir diesen MÜNZKORB!$" MauvilleCity_House2_Text_182549:: @ 8182549 - .string "That COIN CASE can be used at the\n" - .string "GAME CORNER.$" + .string "Diesen MÜNZKORB brauchst du in der\n" + .string "SPIELHALLE.$" MauvilleCity_House2_Text_182578:: @ 8182578 - .string "Oh, that’s disappointing.\p" - .string "A COIN CASE is needed for the\n" - .string "GAME CORNER.$" + .string "Oh, das ist schade.\p" + .string "In der SPIELHALLE benötigt man einen\n" + .string "MÜNZKORB.$" diff --git a/data/text/maps/MauvilleCity_Mart.inc b/data/text/maps/MauvilleCity_Mart.inc index 6b8f6c002..b8bf2ebb5 100644 --- a/data/text/maps/MauvilleCity_Mart.inc +++ b/data/text/maps/MauvilleCity_Mart.inc @@ -1,13 +1,15 @@ MauvilleCity_Mart_Text_1827D3:: @ 81827D3 - .string "There are items that temporarily\n" - .string "elevate the stats of POKéMON.\p" - .string "The ones I know you use in battle\n" - .string "are X ATTACK and X DEFEND...\p" - .string "I do believe that there are others\n" - .string "like them.$" + .string "Es gibt Items, die den Status eines\n" + .string "POKéMON kurzzeitig erhöhen.\p" + .string "Ich weiß, dass man X-ANGRIFF und\n" + .string "X-VERTEIDIGUNG im Kampf einsetzen\l" + .string "kann...\p" + .string "Ich glaube, es gibt aber auch noch\n" + .string "andere.$" MauvilleCity_Mart_Text_18287F:: @ 818287F - .string "Use a certain move, or use an item\n" - .string "instead...\p" - .string "The TRAINER’s decisions determine how\n" - .string "battles turn out, I think.$" + .string "Setze eine bestimmte Attacke ein,\n" + .string "oder stattdessen ein Item...\p" + .string "Ich glaube, die Entscheidungen des\n" + .string "TRAINERS bestimmen, wie ein Kampf\l" + .string "verläuft.$" diff --git a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc b/data/text/maps/MauvilleCity_PokemonCenter_1F.inc index c4287cda3..bb09903b0 100644 --- a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/text/maps/MauvilleCity_PokemonCenter_1F.inc @@ -1,18 +1,20 @@ MauvilleCity_PokemonCenter_1F_Text_1825BD:: @ 81825BD - .string "That man over there, he says weird\n" - .string "things!\p" - .string "He’s funny in a weird way.\n" - .string "I doubt I’ll forget about him!$" + .string "Der Mann dort drüben, der sagt\n" + .string "vielleicht verrückte Dinge!\p" + .string "Auf seltsame Weise ist er aber amüsant.\n" + .string "Den werde ich wohl nicht vergessen!$" MauvilleCity_PokemonCenter_1F_Text_182622:: @ 8182622 - .string "When I accessed the RECORD CORNER,\n" - .string "the data for what’s hot in DEWFORD\l" - .string "got updated.\p" - .string "Now that bit of data is the same\n" - .string "as my friend’s!$" + .string "Wenn ich auf STATISTIKTAUSCH Zugriff\n" + .string "nehme, werden die neuesten Nachrichten\l" + .string "aus FAUSTAUHAVEN hochgeladen.\p" + .string "Diese Daten decken sich nun mit denen\n" + .string "meines Freundes!$" MauvilleCity_PokemonCenter_1F_Text_1826A6:: @ 81826A6 - .string "A RECORD CORNER opened upstairs in\n" - .string "the POKéMON CENTER.\p" - .string "I don’t know what it’s about, but it\n" - .string "sounds fun. I’ll go check it out!$" + .string "Im oberen Stockwerk des POKéMON-\n" + .string "CENTERS wurde die Möglichkeit des\l" + .string "STATISTIKTAUSCHES eingerichtet.\p" + .string "Ich weiß nicht genau, was das ist. Aber\n" + .string "das werde ich herausfinden! Ist\l" + .string "bestimmt lustig!$" diff --git a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc b/data/text/maps/MauvilleCity_PokemonCenter_2F.inc index 1e67948a5..27f3ae66e 100644 --- a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc +++ b/data/text/maps/MauvilleCity_PokemonCenter_2F.inc @@ -1,7 +1,8 @@ MauvilleCity_PokemonCenter_2F_Text_182724:: @ 8182724 - .string "Did you know that you can link battle\n" - .string "at the COLOSSEUM here?\p" - .string "They put up your record on the wall\n" - .string "for everyone to see.\p" - .string "It’s embarrassing if you lose more\n" - .string "often than you win...$" + .string "Wusstest du, dass du von hier aus via\n" + .string "Link Kämpfe im KOLOSSEUM ausfechten\l" + .string "kannst?\p" + .string "Deine Ergebnisse werden dann an der\n" + .string "Wand ausgehängt, wo sie jeder sieht.\p" + .string "Es ist schon peinlich, wenn man öfter\n" + .string "verliert als gewinnt...$" diff --git a/data/text/maps/MeteorFalls_1F_1R.inc b/data/text/maps/MeteorFalls_1F_1R.inc index ad19e3e0b..3efe7ff39 100644 --- a/data/text/maps/MeteorFalls_1F_1R.inc +++ b/data/text/maps/MeteorFalls_1F_1R.inc @@ -1,93 +1,99 @@ MeteorFalls_1F_1R_Text_193237:: @ 8193237 - .string "Hehehe!\p" - .string "With this METEORITE, MT. CHIMNEY\n" - .string "will...$" + .string "Hähähä!\p" + .string "Mit diesem METEORITEN wird\n" + .string "SCHLOTBERG...$" MeteorFalls_1F_1R_Text_193268:: @ 8193268 - .string "Heh?\p" - .string "I don’t know who you are, but if you get\n" - .string "in the way of TEAM {EVIL_TEAM}, don’t\l" - .string "expect any mercy!$" + .string "Häh?\p" + .string "Ich weiß zwar nicht, wer du bist. Aber\n" + .string "wenn du dich TEAM {EVIL_TEAM} in den Weg\l" + .string "stellst, erwarte keine Gnade!$" MeteorFalls_1F_1R_Text_1932C5:: @ 81932C5 - .string "Hold it right there, TEAM {EVIL_TEAM}!\p" - .string "We, TEAM {GOOD_TEAM}, won’t allow you to\n" - .string "get away with your misdeeds!$" + .string "Bleibt sofort stehen, TEAM {EVIL_TEAM}!\p" + .string "Wir, TEAM {GOOD_TEAM}, lassen euch nicht so \n" + .string "einfach mit euren Missetaten davon-\l" + .string "kommen.$" MeteorFalls_1F_1R_Text_193320:: @ 8193320 - .string "Hehehe!\n" - .string "Even TEAM {GOOD_TEAM} joins us!\p" - .string "But it’s too much trouble to deal with\n" - .string "you all...\p" - .string "Heh, it doesn’t matter!\p" - .string "We’ve got the METEORITE, so off to\n" - .string "MT. CHIMNEY we go!\p" - .string "Hehehe! Be seeing you, you TEAM\n" - .string "{GOOD_TEAM} dingbats!$" + .string "Hähähä!\n" + .string "Sogar TEAM {GOOD_TEAM} leistet uns\l" + .string "Gesellschaft!\p" + .string "Aber es ist viel zu anstrengend, sich\n" + .string "mit allen auseinander zu setzen...\p" + .string "Hey, das spielt auch keine Rolle!\p" + .string "Wir haben den METEORITEN und so\n" + .string "machen wir uns auf zum SCHLOTBERG!\p" + .string "Hähähä! Wir sehen uns, ihr Würstchen\n" + .string "vom TEAM {GOOD_TEAM}!$" MeteorFalls_1F_1R_Text_1933EC:: @ 81933EC - .string "And you are?\p" + .string "Und du bist?\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Fine, so you are {PLAYER}{KUN}.\p" - .string "I am MAXIE. As the head of TEAM MAGMA,\n" - .string "I have dedicated myself to thwarting\l" - .string "the dangerous plans of TEAM AQUA.\p" - .string "Why? Because TEAM AQUA is a grave\n" - .string "threat to us all.\p" - .string "They have committed many destructive\n" - .string "acts in their bid to enlarge the sea.\p" - .string "We, TEAM MAGMA, love dry land above\n" - .string "all! TEAM AQUA is our sworn enemy!$" + .string "Schön, du bist also {PLAYER}{KUN}.\p" + .string "Ich bin MARC. Als Kopf vom TEAM MAGMA\n" + .string "widme ich mich hingebungsvoll der\l" + .string "Aufgabe, die gefährlichen Pläne von\l" + .string "TEAM AQUA zu durchkreuzen.\p" + .string "Warum? Weil TEAM AQUA unser aller\n" + .string "Sargnagel ist, deshalb!\p" + .string "Sie haben schon etliche gefährliche\n" + .string "Dinge unternommen, um die Meere zu\l" + .string "vergrößern.\p" + .string "Wir, TEAM MAGMA, lieben trockenes Land\n" + .string "über alles! TEAM AQUA? Unser Erzfeind!$" MeteorFalls_1F_1R_Text_193584:: @ 8193584 - .string "Who might you be?\p" + .string "Wer bist du denn???\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Ah, so you are {PLAYER}{KUN}.\p" - .string "I am ARCHIE. As the head of TEAM AQUA,\n" - .string "I have dedicated myself to thwarting\l" - .string "the dangerous plans of TEAM MAGMA.\p" - .string "Why? Because TEAM MAGMA is a grave\n" - .string "threat to us all.\p" - .string "They have committed many destructive\n" - .string "acts in their bid to expand the land.\p" - .string "We, TEAM AQUA, love the sea above\n" - .string "all! TEAM MAGMA is our sworn enemy!$" + .string "Ah ja, du bist {PLAYER}{KUN}.\p" + .string "Ich bin ADRIAN. Als Kopf von TEAM AQUA\n" + .string "setze ich alles daran, die gefährlichen\l" + .string "Pläne von TEAM MAGMA zu vereiteln.\p" + .string "Warum? Weil TEAM MAGMA uns alle noch\n" + .string "zugrunde richtet!\p" + .string "Sie führen waghalsige und gefährliche\n" + .string "Pläne aus, um die Landmassen zu\l" + .string "vergrößern.\p" + .string "Wir, TEAM AQUA, lieben das Meer über\n" + .string "alles. TEAM MAGMA ist unser Erzfeind!$" MeteorFalls_1F_1R_Text_193720:: @ 8193720 - .string "{GOOD_LEADER}, we should give chase to\n" - .string "TEAM {EVIL_TEAM}...$" + .string "{GOOD_LEADER}, wir sollten TEAM {EVIL_TEAM}\n" + .string "verfolgen...$" MeteorFalls_1F_1R_Text_193747:: @ 8193747 - .string "{GOOD_LEADER}: Yes, yes, we must!\n" - .string "We’ve got to hurry.\p" - .string "There’s no telling what TEAM {EVIL_TEAM}\n" - .string "will do at MT. CHIMNEY!$" + .string "{GOOD_LEADER}: Ja, ja. Das müssen wir!\n" + .string "Wir müssen uns beeilen.\p" + .string "Nicht auszudenken, was TEAM {EVIL_TEAM} am\n" + .string "SCHLOTBERG anrichten will!$" MeteorFalls_1F_1R_Text_1937AA:: @ 81937AA - .string "{GOOD_LEADER}: {PLAYER}{KUN}, you should keep\n" - .string "an eye out for TEAM {EVIL_TEAM}, too.\p" - .string "Farewell!$" + .string "{GOOD_LEADER}: {PLAYER}{KUN}, du solltest\n" + .string "TEAM {EVIL_TEAM} im Auge behalten.\p" + .string "Leb wohl!$" MeteorFalls_1F_1R_Text_1937EB:: @ 81937EB - .string "I... I’m COZMO...\n" - .string "I’m a PROFESSOR...\p" - .string "I usually study METEORITES in\n" - .string "FALLARBOR TOWN...\p" - .string "Then some people from TEAM {EVIL_TEAM}\n" - .string "made me guide them to METEOR FALLS...\p" - .string "They promised me that they would\n" - .string "excavate METEORITES for me...\p" - .string "But, I...\n" - .string "TEAM {EVIL_TEAM} tricked me...\p" - .string "Oh... That METEORITE...\n" - .string "It will never be mine now...\p" - .string "But that TEAM {EVIL_TEAM}...\p" - .string "What are they going to do with that\n" - .string "METEORITE at MT. CHIMNEY?$" + .string "Ich... Ich bin KOSMO...\n" + .string "Ich bin Professor...\p" + .string "Eigentlich studiere ich METEORITEN in\n" + .string "LAUBWECHSELFELD...\p" + .string "Dann haben mich einige Typen vom\n" + .string "TEAM {EVIL_TEAM} überredet, sie zu METEOR-\l" + .string "FÄLLE zu führen...\p" + .string "Sie haben mir versprochen, für mich\n" + .string "einen METEORITEN auszugraben...\p" + .string "Aber ich...\n" + .string "TEAM {EVIL_TEAM} hat mich hereingelegt...\p" + .string "Oh... Dieser METEORIT... Der wird\n" + .string "jetzt wohl nie mehr mir gehören...\p" + .string "Aber TEAM {EVIL_TEAM}...\p" + .string "Was haben sie mit dem METEORITEN am\n" + .string "SCHLOTBERG vor?$" MeteorFalls_1F_1R_Text_19396A:: @ 819396A - .string "PROF. COZMO: That TEAM {EVIL_TEAM}...\p" - .string "What are they going to do with that\n" - .string "METEORITE at MT. CHIMNEY?$" + .string "PROF. KOSMO: Dieses TEAM {EVIL_TEAM}...\p" + .string "Was haben sie mit dem METEORITEN am\n" + .string "SCHLOTBERG vor?$" diff --git a/data/text/maps/MeteorFalls_1F_2R.inc b/data/text/maps/MeteorFalls_1F_2R.inc index 35b60d662..ee685eb0c 100644 --- a/data/text/maps/MeteorFalls_1F_2R.inc +++ b/data/text/maps/MeteorFalls_1F_2R.inc @@ -1,113 +1,121 @@ MeteorFalls_1F_2R_Text_1939C5:: @ 81939C5 - .string "This is where we DRAGON users do our\n" - .string "training.\p" - .string "The CHAMPION even visits.\n" - .string "Now do you see how special it is here?$" + .string "Dort trainieren wir DRACHEN-Besitzer...\p" + .string "Auch der CHAMP kommt manchmal vorbei.\n" + .string "Verstehst du nun, dass dies ein\l" + .string "besonderer Ort ist?$" MeteorFalls_1F_2R_Text_193A35:: @ 8193A35 - .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" + .string "Argh!\n" + .string "Ich hätte nicht gedacht, dass du so\l" + .string "stark bist!$" MeteorFalls_1F_2R_Text_193A60:: @ 8193A60 - .string "The road ahead remains long and harsh.\p" - .string "When will my POKéMON and I become the\n" - .string "best?$" + .string "Der Weg vor mir ist lang und\n" + .string "beschwerlich.\p" + .string "Wann werden meine POKéMON und ich\n" + .string "zu den Besten gehören?$" MeteorFalls_1F_2R_Text_193AB3:: @ 8193AB3 - .string "Since we met, we have trained hard\n" - .string "with our sights on number one.\p" - .string "Help us see how much stronger we’ve\n" - .string "become!$" + .string "Seit wir uns das letzte Mal gesehen\n" + .string "haben, haben wir hart trainiert ver-\l" + .string "glichen mit unserem ersten Kampf.\p" + .string "Hilf uns, herauszufinden, wie stark wir\n" + .string "wirklich sind.$" MeteorFalls_1F_2R_Text_193B21:: @ 8193B21 - .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" + .string "Argh!\n" + .string "Wie kannst du nur so stark sein?$" MeteorFalls_1F_2R_Text_193B4C:: @ 8193B4C - .string "You’ve obviously kept up your\n" - .string "POKéMON training.\p" - .string "So long as you remain strong, I, too,\n" - .string "can become stronger!$" + .string "Du hast uns bei unserem Training\n" + .string "wirklich sehr geholfen.\p" + .string "Solange du stärker wirst, kann auch\n" + .string "ich stärker werden.$" MeteorFalls_1F_2R_Text_193BB7:: @ 8193BB7 - .string "JOHN: We’ve always battled POKéMON\n" - .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" + .string "URS: Wir haben immer in trauter Zwei-\n" + .string "samkeit mit unseren POKéMON gegen\l" + .string "andere gekämpft. Wir werden siegen!$" MeteorFalls_1F_2R_Text_193C10:: @ 8193C10 - .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" + .string "URS: O weh.\n" + .string "Wir haben verloren, liebstes Weib.$" MeteorFalls_1F_2R_Text_193C35:: @ 8193C35 - .string "JOHN: We’ve been married for\n" - .string "fifty years.\p" - .string "Come to think of it, I’ve yet to beat\n" - .string "my dear wife in a battle.$" + .string "URS: Wir sind seit 50 Jahren glücklich\n" + .string "verheiratet.\p" + .string "Und denk mal, ich habe es noch nie ge-\n" + .string "schafft, meine Frau zu besiegen.$" MeteorFalls_1F_2R_Text_193C9F:: @ 8193C9F - .string "JOHN: Well, well, what a young TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" - .string "have to return with more POKéMON.$" + .string "URS: Nun, was für ein junger TRAINER!\p" + .string "Möchtest du mit uns kämpfen? Wenn ja,\n" + .string "dann musst du dir noch mehr POKéMON\l" + .string "besorgen.$" MeteorFalls_1F_2R_Text_193D10:: @ 8193D10 - .string "JAY: We’ve been married for\n" - .string "fifty years.\p" - .string "The bond we share as a couple could\n" - .string "never be broken.$" + .string "EVI: Wir sind seit 50 Jahren glücklich\n" + .string "verheiratet.\p" + .string "Das Band, das uns verbindet, kann\n" + .string "niemand durchtrennen.$" MeteorFalls_1F_2R_Text_193D6E:: @ 8193D6E - .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" + .string "EVI: O weh.\n" + .string "Wir haben verloren, mein Lieber.$" MeteorFalls_1F_2R_Text_193D9A:: @ 8193D9A - .string "JAY: Fifty years of marriage...\p" - .string "If we ever argued, we always settled\n" - .string "it with a POKéMON battle...$" + .string "EVI: 50 Jahre verheiratet...\p" + .string "Immer wenn wir uneinig sind, ent-\n" + .string "scheiden wir es mit einem POKéMON-\l" + .string "Kampf.$" MeteorFalls_1F_2R_Text_193DFB:: @ 8193DFB - .string "JAY: Well, well, aren’t you a young\n" - .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" - .string "have to come back with more POKéMON.$" + .string "EVI: Hmm... Bist du nicht ein bisschen zu\n" + .string "klein für einen TRAINER?\p" + .string "Möchtest du mit uns kämpfen? Dann\n" + .string "musst du dir noch mehr POKéMON\l" + .string "besorgen.$" MeteorFalls_1F_2R_Text_193E75:: @ 8193E75 - .string "JOHN: We’ve always battled POKéMON\n" - .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" + .string "URS: Wir haben immer in trauter Zwei-\n" + .string "samkeit mit unseren POKéMON gegen\l" + .string "andere gekämpft. Wir werden siegen!$" MeteorFalls_1F_2R_Text_193ECE:: @ 8193ECE - .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" + .string "URS: O weh.\n" + .string "Wir haben verloren, liebstes Weib.$" MeteorFalls_1F_2R_Text_193EF3:: @ 8193EF3 - .string "JOHN: Married for fifty years...\p" - .string "On reflection, the dear wife and I,\n" - .string "we battled day in and day out...$" + .string "URS: 50 Jahre verheiratet...\p" + .string "Rückblickend kann man sagen: Meine Frau\n" + .string "und ich haben Tag für Tag miteinander\l" + .string "gekämpft...$" MeteorFalls_1F_2R_Text_193F59:: @ 8193F59 - .string "JOHN: Well, well, what a young\n" - .string "TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" - .string "have to return with more POKéMON.$" + .string "URS: Nun, was für ein junger TRAINER!\p" + .string "Möchtest du mit uns kämpfen? Wenn ja,\n" + .string "dann musst du dir noch mehr POKéMON\l" + .string "besorgen.$" MeteorFalls_1F_2R_Text_193FCA:: @ 8193FCA - .string "JAY: We’ve been married for\n" - .string "fifty years.\p" - .string "We’ve supported each other all that\n" - .string "time. We’ve made ourselves strong.$" + .string "EVI: Wir sind seit 50 Jahren\n" + .string "verheiratet.\p" + .string "Wir haben uns immer gegenseitig unter-\n" + .string "stützt. Das hat uns stark gemacht.$" MeteorFalls_1F_2R_Text_19403A:: @ 819403A - .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" + .string "EVI: O weh.\n" + .string "Wir haben verloren, mein Lieber.$" MeteorFalls_1F_2R_Text_194066:: @ 8194066 - .string "JAY: Fifty years of marriage...\n" - .string "Many things have happened.\p" - .string "I hope that we will continue to make\n" - .string "happy memories together.$" + .string "EVI: 50 Jahre verheiratet...\n" + .string "Vieles ist in dieser Zeit passiert.\p" + .string "Ich hoffe, wir werden noch lange unsere\n" + .string "Erinnerungen miteinander teilen können.$" MeteorFalls_1F_2R_Text_1940DF:: @ 81940DF - .string "JAY: Well, well, aren’t you a young\n" - .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" - .string "have to come back with more POKéMON.$" + .string "EVI: Hmm... Bist du nicht ein bisschen zu\n" + .string "klein für einen TRAINER?\p" + .string "Möchtest du gegen uns kämpfen? Dann\n" + .string "musst du dir noch mehr POKéMON\l" + .string "besorgen.$" diff --git a/data/text/maps/MossdeepCity.inc b/data/text/maps/MossdeepCity.inc index 9bdcf3b3c..48d0e95d0 100644 --- a/data/text/maps/MossdeepCity.inc +++ b/data/text/maps/MossdeepCity.inc @@ -1,84 +1,88 @@ MossdeepCity_Text_1690A9:: @ 81690A9 - .string "I got this from STEVEN, but I don’t\n" - .string "know what it’s good for.\p" - .string "I think it’s called KING’S ROCK.\n" - .string "Do you want it?$" + .string "Ich habe das von TROY bekommen, weiß\n" + .string "aber nicht, was ich damit machen soll.\p" + .string "Ich glaube, es heißt KING-STEIN.\n" + .string "Möchtest du das haben?$" MossdeepCity_Text_169117:: @ 8169117 - .string "Why would you want it?\n" - .string "You’re weird.\p" - .string "You can keep it, but keep it a secret\n" - .string "from STEVEN.$" + .string "Warum willst du das haben?\n" + .string "Du bist komisch.\p" + .string "Du kannst es behalten, aber erzähle\n" + .string "es nicht TROY.$" MossdeepCity_Text_16916F:: @ 816916F - .string "Is it really that fun collecting\n" - .string "rocks? I don’t get it.$" + .string "Macht es wirklich so viel Spaß, Steine zu\n" + .string "sammeln? Kann ich gar nicht verstehen.$" MossdeepCity_Text_1691A7:: @ 81691A7 - .string "Yeah, you think so, too! What are you\n" - .string "supposed to do with some weird rock?$" + .string "Ach, du denkst das auch! Was soll man\n" + .string "auch mit komischen Steinen anfangen?$" MossdeepCity_Text_1691F2:: @ 81691F2 - .string "Around MOSSDEEP, you can see wild\n" - .string "WAILMER.\p" - .string "It’s called, uh...\n" - .string "What was it now...\p" - .string "WAI, WAI, WAI...\p" - .string "WAILMER watching!$" + .string "In der Nähe von MOOSBACH CITY\n" + .string "kann man wilde WAILMER sehen.\p" + .string "Das nennt man, äh...\n" + .string "Nennt man... äh... ähm...\p" + .string "WAI..., WAI..., WAI...\p" + .string "WAILMER Watching!$" MossdeepCity_Text_169266:: @ 8169266 - .string "The island’s SPACE CENTER has been\n" - .string "launching huge rockets.$" + .string "Am RAUMFAHRTZENTRUM auf der Insel\n" + .string "werden große Raketen gestartet.$" MossdeepCity_Text_1692A1:: @ 81692A1 - .string "I’d heard from my mates in LILYCOVE\n" - .string "that the herd of WAILMER has\l" - .string "disappeared.\p" - .string "What went down over there, I wonder?$" + .string "Ich habe von Freunden in SEEGRA-\n" + .string "SULB gehört, dass eine Herde WAILMER\l" + .string "verschwunden ist.\p" + .string "Was mag da wohl passiert sein?$" MossdeepCity_Text_169314:: @ 8169314 - .string "Wouldn’t it be nice?\p" - .string "If the whole world was covered in\n" - .string "plants and flowers like this island?$" + .string "Wäre das nicht schön?\p" + .string "Wenn die ganze Welt so mit Blumen und\n" + .string "Pflanzen bewachsen wäre wie diese\l" + .string "Insel?$" MossdeepCity_Text_169370:: @ 8169370 - .string "All life needs the sea to live, even\n" - .string "though it makes its home on the land.\p" - .string "Life, having run its course, becomes\n" - .string "soil and returns to the land.\p" - .string "And the sea is always connected to\n" - .string "the land.\p" - .string "Yes, like the very shoreline here.$" + .string "Alle Lebewesen brauchen das Meer, um\n" + .string "leben zu können, auch wenn sie an Land\l" + .string "leben.\p" + .string "Am Ende seiner Reise wird aus dem\n" + .string "Lebenden Erde und er kehrt zurück\l" + .string "zum Land.\p" + .string "Und das Meer steht immer in Verbindung\n" + .string "zum Land.\p" + .string "Genau wie dieses Ufer hier.$" MossdeepCity_Text_16944E:: @ 816944E - .string "A voyage on a ship is fine.\p" - .string "But crossing the sea with POKéMON\n" - .string "using SURF...\p" - .string "Now that’s an exhilarating trip!\n" - .string "Wouldn’t you agree, youngster?$" + .string "Eine Reise auf einem Schiff ist toll.\p" + .string "Aber das Meer auf einem POKéMON zu\n" + .string "überqueren, das SURFER einsetzt...\p" + .string "Das ist wirklich eine aufregende Sache.\n" + .string "Meinst du nicht auch, Kindchen?$" MossdeepCity_Text_1694DA:: @ 81694DA - .string "This rock has a special meaning to\n" - .string "the people at the SPACE CENTER.\p" - .string "They put it here as their wish for\n" - .string "their rockets to fly safely.\p" - .string "When you make a wish, what do you use?\n" - .string "Do you wish upon a star?\p" - .string "I use a wish tag to make it happen.\n" - .string "That’s what I do.$" + .string "Dieser Felsen hat eine ganz besondere\n" + .string "Bedeutung für das RAUMFAHRTZENTRUM.\p" + .string "Sie haben ihn hier hingesetzt als\n" + .string "Glücksbringer für den sicheren Flug der\l" + .string "Raketen.\p" + .string "Wenn du dir etwas wünschst, was machst\n" + .string "du dann? Sternschnuppen beobachten?\p" + .string "Ich benutze ein Wunschkärtchen.\n" + .string "Genau das mache ich.$" MossdeepCity_Text_1695D3:: @ 81695D3 - .string "It’s a white rock.$" + .string "Ein weißer Felsen.$" MossdeepCity_Text_1695E6:: @ 81695E6 - .string "MOSSDEEP CITY POKéMON GYM\n" - .string "LEADERS: LIZA & TATE\p" - .string "“The mystic combination!”$" + .string "POKéMON ARENA von MOOSBACH CITY \n" + .string "LEITER: SVENJA & BEN\p" + .string "“Die mystische Kombination!”$" MossdeepCity_Text_16962F:: @ 816962F - .string "MOSSDEEP CITY\n" - .string "“Our slogan: Cherish POKéMON!”$" + .string "MOOSBACH CITY\n" + .string "“Unser Motto: Liebe POKéMON!”$" MossdeepCity_Text_16965C:: @ 816965C - .string "MOSSDEEP SPACE CENTER\n" - .string "“The closest place to space.”$" + .string "MOOSBACH CITY RAUMFAHRTZENTRUM\n" + .string "“Der letzte Ort vor dem All.”$" diff --git a/data/text/maps/MossdeepCity_GameCorner_1F.inc b/data/text/maps/MossdeepCity_GameCorner_1F.inc index 7324999c8..277f8008a 100644 --- a/data/text/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/text/maps/MossdeepCity_GameCorner_1F.inc @@ -1,59 +1,61 @@ MossdeepCity_GameCorner_1F_Text_18E59A:: @ 818E59A - .string "When I was young, I traveled the world\n" - .string "as a POKéMON TRAINER.\p" - .string "Now that I’ve become an old buzzard,\n" - .string "my only amusement is watching young\l" - .string "TRAINERS battle.$" + .string "Als ich noch jung war, bin ich als\n" + .string "POKéMON-TRAINER durch die Welt\l" + .string "gereist.\p" + .string "Nun, da ich ein alter Knabe geworden bin,\n" + .string "beobachte ich mit Freuden die jungen\l" + .string "TRAINER bei ihren Kämpfen.$" MossdeepCity_GameCorner_1F_Text_18E631:: @ 818E631 - .string "The door appears to be locked.$" + .string "Diese Tür ist verschlossen.$" MossdeepCity_GameCorner_1F_Text_18E650:: @ 818E650 - .string "A TRAINER named {STR_VAR_1} is\n" - .string "visiting my home.\p" - .string "Would you like to challenge\n" - .string "{STR_VAR_1}?$" + .string "Ein TRAINER namens {STR_VAR_1} ist bei\n" + .string "mir zu Besuch.\p" + .string "Möchtest du einmal gegen {STR_VAR_1}\n" + .string "antreten?$" MossdeepCity_GameCorner_1F_Text_18E698:: @ 818E698 - .string "You won’t battle? I’m disappointed\n" - .string "that I can’t see you battle...$" + .string "Du möchtest nicht kämpfen? Es ent-\n" + .string "täuscht mich, dass ich dich nicht\l" + .string "kämpfen sehen kann.$" MossdeepCity_GameCorner_1F_Text_18E6DA:: @ 818E6DA - .string "Oh, good, good!\p" - .string "But my house isn’t all that sturdy.\p" - .string "Could I ask you to keep it down to\n" - .string "a 3-on-3 match?$" + .string "Oh, sehr gut!\p" + .string "Aber mein Haus ist nicht sehr stabil.\p" + .string "Könntet ihr einen 3-gegen-3-Kampf\n" + .string "ausfechten?$" MossdeepCity_GameCorner_1F_Text_18E741:: @ 818E741 - .string "Before you two battle, you should\n" - .string "save your progress.$" + .string "Bevor ihr gegeneinander antretet,\n" + .string "solltet ihr eure Spiele speichern!$" MossdeepCity_GameCorner_1F_Text_18E777:: @ 818E777 - .string "I hope to see a good match!$" + .string "Ich hoffe, einen guten Kampf zu sehen!$" UnknownString_818E793: @ 818E793 .string "{STR_VAR_1}$" MossdeepCity_GameCorner_B1F_Text_18E796:: @ 818E796 - .string "The match ended up a draw.$" + .string "Der Kampf endet unentschieden.$" MossdeepCity_GameCorner_1F_Text_18E7B1:: @ 818E7B1 - .string "So, it became a standoff.\p" - .string "It was a brilliant match in which\n" - .string "neither side conceded a step!$" + .string "So, also ist es ein Unentschieden.\p" + .string "Ein brillanter Kampf, in dem niemand\n" + .string "auch nur einen Schritt ausgewichen ist.$" UnknownString_818E80B: @ 818E80B .string "{STR_VAR_1}$" MossdeepCity_GameCorner_1F_Text_18E80E:: @ 818E80E - .string "That was superlative!\p" - .string "Why, it was like seeing myself in my\n" - .string "youth again!$" + .string "Das war absolute Spitzenklasse!\p" + .string "Ich habe mich wieder erkannt - mich in\n" + .string "meinen jungen Jahren!$" UnknownString_818E856: @ 818E856 .string "{STR_VAR_1}$" MossdeepCity_GameCorner_1F_Text_18E859:: @ 818E859 - .string "Ah, too bad for you!\p" - .string "But it was a good match.\n" - .string "I hope you can win next time.$" + .string "Ach, wie bedauerlich für dich!\p" + .string "Aber es war ein guter Kampf.\n" + .string "Ich hoffe, das nächste Mal gewinnst du.$" diff --git a/data/text/maps/MossdeepCity_Gym.inc b/data/text/maps/MossdeepCity_Gym.inc index 5ff5f6554..a5b692603 100644 --- a/data/text/maps/MossdeepCity_Gym.inc +++ b/data/text/maps/MossdeepCity_Gym.inc @@ -1,168 +1,177 @@ MossdeepCity_Gym_Text_18C7E3:: @ 818C7E3 - .string "Yo, how’s it going, CHAMPION-bound\n" - .string "{PLAYER}?\p" - .string "The GYM LEADERS here use PSYCHIC-type\n" - .string "POKéMON.\p" - .string "If you go up against them with\n" - .string "FIGHTING- or POISON-type POKéMON,\l" - .string "they’ll inflict horrible damage!\p" - .string "Plus, they’ll come at you with\n" - .string "outstanding combination attacks.\p" - .string "If you want to win, you’ll need to show\n" - .string "them how tight you are with your\l" - .string "POKéMON. Go for it!$" + .string "Na, wie sieht es aus, auf dem Weg zum\n" + .string "CHAMP, {PLAYER}?\p" + .string "Die ARENALEITER hier setzen PSYCHO-\n" + .string "POKéMON ein.\p" + .string "Setzt du KAMPF- oder GIFT-POKéMON ein,\n" + .string "werden diese großen Schaden nehmen!\p" + .string "Und außerdem wirst du dich gegen eine\n" + .string "außergewöhnliche Kombination von\l" + .string "Attacken behaupten müssen.\p" + .string "Wenn du gewinnen willst, musst du ihnen\n" + .string "beweisen, wie sehr du mit deinen\l" + .string "POKéMON verbunden bist! Und nun los!$" MossdeepCity_Gym_Text_18C938:: @ 818C938 - .string "Wow, you’re astounding!\n" - .string "You’re one great TRAINER!$" + .string "Wow, du bist erstaunlich!\n" + .string "Du bist ein großartiger TRAINER!$" MossdeepCity_Gym_Text_18C96A:: @ 818C96A - .string "Battles hinge on the strength of your\n" - .string "spirit! The weak-spirited will never win!$" + .string "Kämpfe hängen von der Stärke deines\n" + .string "Geistes ab! Die mit schwachem Geist\l" + .string "werden niemals gewinnen.$" MossdeepCity_Gym_Text_18C9BA:: @ 818C9BA - .string "I lost! I must temper my spirit again!$" + .string "Ich habe verloren! Ich muss meinen\n" + .string "Geist stärken!$" MossdeepCity_Gym_Text_18C9E1:: @ 818C9E1 - .string "The indecisive lose.\n" - .string "That’s my warning to you.$" + .string "Eine nichtssagende Niederlage.\n" + .string "Das war doch nur eine Warnung an dich.$" MossdeepCity_Gym_Text_18CA10:: @ 818CA10 - .string "Let me see your talent!$" + .string "Zeig mir, ob du Talent hast.$" MossdeepCity_Gym_Text_18CA28:: @ 818CA28 - .string "You possess spectacular talent!$" + .string "Du besitzt offensichtlich Talent.$" MossdeepCity_Gym_Text_18CA48:: @ 818CA48 - .string "If there are prodigies in the world,\n" - .string "then our GYM LEADERS are them!\p" - .string "However, you may be even more talented\n" - .string "than them...$" + .string "Wenn es überhaupt Wunderkinder gibt, \n" + .string "dann sind es unsere ARENALEITER.\p" + .string "Aber du scheinst doch talentierter\n" + .string "als sie zu sein...$" MossdeepCity_Gym_Text_18CAC0:: @ 818CAC0 - .string "Fufufufu... Watch me levitate a POKé\n" - .string "BALL telekinetically!\p" - .string "Wrooooooooaaaar!\n" + .string "Hihihihi... Achtung! Ich lasse meinen\n" + .string "POKéBALL durch Telekinese schweben!\p" + .string "Wuhuuuuuuuhuiii!\n" .string "... ... ... ... ... ... ...\p" - .string "Sometimes, I’m out of sync...$" + .string "Äh, manchmal fehlt es mir etwas an\n" + .string "Balance...$" MossdeepCity_Gym_Text_18CB46:: @ 818CB46 - .string "My POKéMON battling skills are out\n" - .string "of sync, too!$" + .string "Meine POKéMON kämpften nicht synchron!$" MossdeepCity_Gym_Text_18CB77:: @ 818CB77 - .string "A POKé BALL was too heavy to lift\n" - .string "psychically. But this dust bunny...\p" - .string "Whoooooooooooooooh!\n" - .string "... ... ... ... ... ...\p" - .string "No, I’m not cheating!\n" - .string "I didn’t blow on it! Honestly!$" + .string "Ein POKéBALL ist doch etwas zu schwer,\n" + .string "um ihn schweben zu lassen!\l" + .string "Aber ein Staubknäuel...\p" + .string "Wuhuuuuuuuhu!\n" + .string "... ... ... ... ... ... ...\p" + .string "Das ist kein Trick!\n" + .string "Da ist kein Luftstrom! Ehrlich!$" MossdeepCity_Gym_Text_18CC1E:: @ 818CC1E - .string "When you lose to me, don’t be too hard\n" - .string "on yourself.\p" - .string "It’s not that you’re weak - I’m just\n" - .string "too strong!$" + .string "Solltest du gegen mich verlieren, darfst\n" + .string "du dir das nicht so zu Herzen nehmen.\p" + .string "Du bist nicht zu schwach - ich bin nur\n" + .string "zu stark für dich!$" MossdeepCity_Gym_Text_18CC83:: @ 818CC83 - .string "You’re just too strong!$" + .string "Du bist nur zu stark für mich!$" MossdeepCity_Gym_Text_18CC9B:: @ 818CC9B - .string "I’m not going to get down on myself for\n" - .string "losing. I just need to train harder.\p" - .string "Positive thinking - that’s my strong\n" - .string "point!$" + .string "Ich lasse mich von dieser Niederlage\n" + .string "nicht herunterziehen. Ich werde härter\l" + .string "trainieren.\p" + .string "Positives Denken - das ist meine\n" + .string "Stärke!$" MossdeepCity_Gym_Text_18CD14:: @ 818CD14 - .string "I see it...\n" - .string "I see your future...\p" - .string "If you can beat me, I will tell you\n" - .string "your future!$" + .string "Ich kann sie sehen...\n" + .string "Ich sehe deine Zukunft...\p" + .string "Wenn du mich besiegen kannst, sage ich\n" + .string "dir deine Zukunft voraus.$" MossdeepCity_Gym_Text_18CD66:: @ 818CD66 - .string "I surrender!$" + .string "Ich ergebe mich!$" MossdeepCity_Gym_Text_18CD73:: @ 818CD73 - .string "You will wage a terrifically intense\n" - .string "battle with our GYM LEADERS...\p" - .string "The result...\n" - .string "You won’t hear it from me!$" + .string "Du wirst einen irrsinnigen Kampf gegen\n" + .string "unsere ARENALEITER führen...\p" + .string "Der Ausgang dieses Kampfes...\n" + .string "Meine Lippen sind versiegelt.$" MossdeepCity_Gym_Text_18CDE0:: @ 818CDE0 - .string "The roads you have traveled...\n" - .string "What you have experienced...\p" - .string "Come at me with everything you’ve\n" - .string "learned!$" + .string "Die Straßen, die du gewandert bist...\n" + .string "Das, was du erfahren hast...\p" + .string "Leg mir alles, was du gelernt hast,\n" + .string "zu Füßen.$" MossdeepCity_Gym_Text_18CE47:: @ 818CE47 - .string "You’ve traveled a path of greatness!$" + .string "Du wandelst auf dem Pfad der Größe!$" MossdeepCity_Gym_Text_18CE6C:: @ 818CE6C - .string "A bright future awaits those who have\n" - .string "worked diligently.\p" - .string "For those who lazed idly, there is\n" - .string "only despair at the end.\p" - .string "What goes around comes around...$" + .string "Eine glänzende Zukunft erwartet die,\n" + .string "die fleißig sind.\p" + .string "Die, die dem Müßiggang frönen, erwartet\n" + .string "am Ende des Weges nur die Verzweiflung.\p" + .string "Man erntet das, was man sät.$" MossdeepCity_Gym_Text_18CF02:: @ 818CF02 - .string "TATE: Hehehe... Were you surprised?\p" - .string "LIZA: Fufufu... Were you surprised?\p" - .string "TATE: That there are two GYM LEADERS?\n" - .string "LIZA: That there are two GYM LEADERS?\p" - .string "TATE: We’re twins!\n" - .string "LIZA: We’re twins!\p" - .string "TATE: We don’t need to talk because...\n" - .string "LIZA: We can each determine what...\p" - .string "TATE: The other is thinking...\n" - .string "LIZA: All in our minds!\p" - .string "TATE: This combination of ours...\n" - .string "LIZA: Can you beat it?$" + .string "BEN: Hähähä... Bist du überrascht?\p" + .string "SVENJA: Hihihi... Bist du überrascht?\p" + .string "BEN: Dass es hier 2 ARENALEITER gibt?\n" + .string "SVENJA: Dass es hier 2 ARENALEITER\l" + .string "gibt?\p" + .string "BEN: Wir sind Zwillinge!\n" + .string "SVENJA: Wir sind Zwillinge!\p" + .string "BEN: Wir brauchen nicht zu sprechen...\n" + .string "SVENJA: Wir wissen, was...\p" + .string "BEN: Der andere gerade denkt...\n" + .string "SVENJA: Gedankenübertragung!\p" + .string "BEN: Diese doppelte Stärke...\n" + .string "SVENJA: Kannst du sie besiegen?$" MossdeepCity_Gym_Text_18D077:: @ 818D077 - .string "TATE: What?! Our combination...\n" - .string "LIZA: Was shattered!\p" - .string "TATE: It can’t be helped. You’ve won...\n" - .string "LIZA: So, in recognition, take this.$" + .string "BEN: Was?!? Unsere Kombination...\n" + .string "SVENJA: Wurde auseinander gerissen!\p" + .string "BEN: So sieht’s aus. Du hast gewonnen.\n" + .string "SVENJA: Daher überreichen wir dir dies.$" MossdeepCity_Gym_Text_18D0F9:: @ 818D0F9 - .string "{PLAYER} received the MIND BADGE\n" - .string "from LIZA and TATE.$" + .string "{PLAYER} erhält den MENTALORDEN von\n" + .string "SVENJA und BEN.$" MossdeepCity_Gym_Text_18D128:: @ 818D128 - .string "TATE: The MIND BADGE enhances the\n" - .string "SP. ATK and SP. DEF of POKéMON.\p" - .string "LIZA: It also lets you use the HM move\n" - .string "DIVE outside of battle.\p" - .string "TATE: You should also take this, too.$" + .string "BEN: Der MENTALORDEN erhöht den SP.\n" + .string "ANG. und die SP. VER. von POKéMON.\p" + .string "SVENJA: Und du kannst damit die VM\n" + .string "TAUCHER außerhalb eines Kampfes\l" + .string "einsetzen.\p" + .string "BEN: Dies ist ebenfalls für dich.$" MossdeepCity_Gym_Text_18D1CF:: @ 818D1CF - .string "TATE: That TM04 contains...\n" - .string "LIZA: CALM MIND!\p" - .string "TATE: It raises SP. ATK and...\n" - .string "LIZA: It raises SP. DEF!\p" - .string "TATE: It’s a move that’s perfect...\n" - .string "LIZA: For PSYCHIC POKéMON!$" + .string "BEN: TM04 enthält...\n" + .string "SVENJA: GEDANKENGUT!\p" + .string "BEN: Dies erhöht den SP. ANG. und...\n" + .string "SVENJA: Erhöht die SP. VER.!\p" + .string "BEN: Eine Attacke, die perfekt...\n" + .string "SVENJA: Für PSYCHO-POKéMON ist!$" MossdeepCity_Gym_Text_18D273:: @ 818D273 - .string "TATE: Looks like the bond between you\n" - .string "and your POKéMON is far stronger than\l" - .string "the bond that we share as twins.\p" - .string "LIZA: You will become even stronger!\n" - .string "We’ve battled you, so we know.$" + .string "BEN: Es scheint, als sei das Band\n" + .string "zwischen dir und deinen POKéMON viel\l" + .string "stärker als zwischen uns Zwillingen.\p" + .string "SVENJA: Und du wirst noch stärker\n" + .string "werden! Wir haben gegen dich gekämpft,\l" + .string "daher können wir das vorhersagen.$" MossdeepCity_Gym_Text_18D324:: @ 818D324 - .string "TATE: Hehehe... Were you surprised?\p" - .string "LIZA: That there are two GYM LEADERS?\p" - .string "TATE: Oops, you have only one...\n" - .string "LIZA: POKéMON that can battle.\p" - .string "TATE: We can’t battle that way!\p" - .string "LIZA: If you want to challenge us,\n" - .string "bring some more POKéMON.$" + .string "BEN: Hähähä... Bist du überrascht?\p" + .string "SVENJA: Dass es hier 2 ARENALEITER\n" + .string "gibt?\p" + .string "BEN: Hups, du hast nur ein...\n" + .string "SVENJA: POKéMON für den Kampf.\p" + .string "BEN: So können wir nicht kämpfen!\p" + .string "SVENJA: Wenn du uns herausfordern\n" + .string "willst, dann musst du mehr POKéMON\l" + .string "haben.$" MossdeepCity_Gym_Text_18D40A:: @ 818D40A - .string "MOSSDEEP CITY POKéMON GYM$" + .string "POKéMON ARENA von MOOSBACH CITY$" MossdeepCity_Gym_Text_18D424:: @ 818D424 - .string "MOSSDEEP CITY POKéMON GYM\p" - .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von MOOSBACH CITY\p" + .string "SVENJA UND BENS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/MossdeepCity_House1.inc b/data/text/maps/MossdeepCity_House1.inc index 0572ba260..bb6520f6f 100644 --- a/data/text/maps/MossdeepCity_House1.inc +++ b/data/text/maps/MossdeepCity_House1.inc @@ -1,17 +1,18 @@ MossdeepCity_House1_Text_18D465:: @ 818D465 .string "Hmm!\n" - .string "Your {STR_VAR_1}...$" + .string "Dein {STR_VAR_1}...$" MossdeepCity_House1_Text_18D475:: @ 818D475 - .string "It likes {STR_VAR_1}S,\n" - .string "doesn’t it?\p" - .string "No, I’m positive of it! It definitely\n" - .string "likes {STR_VAR_1}S!$" + .string "Es mag {STR_VAR_1},\n" + .string "nicht wahr?\p" + .string "Nein, ich bin mir sicher. Es mag mit\n" + .string "Sicherheit {STR_VAR_1}!$" MossdeepCity_House1_Text_18D4C0:: @ 818D4C0 - .string "It doesn’t appear to like or dislike\n" - .string "any {POKEBLOCK}S.$" + .string "Es scheint {POKEBLOCK}\n" + .string "weder zu lieben noch abzulehnen.$" MossdeepCity_House1_Text_18D4F1:: @ 818D4F1 - .string "My husband can tell what kind of\n" - .string "{POKEBLOCK}S a POKéMON likes at a glance.$" + .string "Mein Mann weiß auf den ersten Blick,\n" + .string "welche Art von {POKEBLOCK}\l" + .string "ein POKéMON mag und welche nicht.$" diff --git a/data/text/maps/MossdeepCity_House2.inc b/data/text/maps/MossdeepCity_House2.inc index ae4b11cb6..2a3774ad7 100644 --- a/data/text/maps/MossdeepCity_House2.inc +++ b/data/text/maps/MossdeepCity_House2.inc @@ -1,14 +1,15 @@ MossdeepCity_House2_Text_18D536:: @ 818D536 - .string "My little sister exchanges MAIL with\n" - .string "her boyfriend in FORTREE.\p" - .string "I don’t envy her one bit at all.$" + .string "Meine kleine Schwester tauscht immer\n" + .string "BRIEFE mit ihrem Freund in BAUMHAUSEN\l" + .string "CITY aus.\p" + .string "Ich beneide sie kein bisschen darum.$" MossdeepCity_House2_Text_18D596:: @ 818D596 - .string "Even though I can’t see my friend in\n" - .string "FORTREE, my POKéMON carries MAIL back\l" - .string "and forth for us.\p" - .string "I’m not lonesome, even though we’re\n" - .string "apart.$" + .string "Auch wenn ich meinen Freund in\n" + .string "BAUMHAUSEN CITY nicht sehen kann...\l" + .string "Mein POKéMON bringt uns unsere BRIEFE.\p" + .string "Ich bin nicht einsam, auch wenn wir\n" + .string "getrennt sind.$" MossdeepCity_House2_Text_18D61E:: @ 818D61E .string "WINGULL: Pihyoh!$" diff --git a/data/text/maps/MossdeepCity_House3.inc b/data/text/maps/MossdeepCity_House3.inc index 270457172..c4dc6f0d3 100644 --- a/data/text/maps/MossdeepCity_House3.inc +++ b/data/text/maps/MossdeepCity_House3.inc @@ -1,23 +1,24 @@ MossdeepCity_House3_Text_18D909:: @ 818D909 - .string "Hey there, TRAINER!\n" - .string "A SUPER ROD really is super!\p" - .string "Say all you want, but this baby can\n" - .string "catch POKéMON off the seafloor!\p" - .string "What do you think?\n" - .string "You want it, don’t you?$" + .string "Hey, du da! TRAINER!\n" + .string "Eine SUPERANGEL ist wirklich super!\p" + .string "Man kann sagen, was man will, aber mit\n" + .string "diesem Baby kann man POKéMON vom\l" + .string "Meeresboden weg fangen!\p" + .string "Na? Du würdest doch zu gerne auch so\n" + .string "eine Angel haben, oder?$" MossdeepCity_House3_Text_18D9A9:: @ 818D9A9 - .string "You bet, you bet!\n" - .string "After all, a SUPER ROD is really super!$" + .string "Sicher, sicher!\n" + .string "Schließlich ist eine SUPERANGEL super!$" MossdeepCity_House3_Text_18D9E3:: @ 818D9E3 - .string "If there’s any water, try dropping in\n" - .string "your ROD and see what bites!$" + .string "Stehst du am Wasser, dann wirf die\n" + .string "ANGEL aus und schau, was anbeißt!$" MossdeepCity_House3_Text_18DA26:: @ 818DA26 - .string "Hunh?\n" - .string "Don’t you like to fish?$" + .string "Was???\n" + .string "Liebst du das Angeln nicht?$" MossdeepCity_House3_Text_18DA44:: @ 818DA44 - .string "Go after the seafloor POKéMON with\n" - .string "your SUPER ROD.$" + .string "Mit deiner SUPERANGEL kannst du die\n" + .string "POKéMON am Meeresboden fangen.$" diff --git a/data/text/maps/MossdeepCity_House4.inc b/data/text/maps/MossdeepCity_House4.inc index e612a8018..0738d9563 100644 --- a/data/text/maps/MossdeepCity_House4.inc +++ b/data/text/maps/MossdeepCity_House4.inc @@ -1,19 +1,20 @@ MossdeepCity_House4_Text_18E0E3:: @ 818E0E3 - .string "My little brother says he likes to go\n" - .string "find people’s SECRET BASES.$" + .string "Mein kleiner Bruder liebt es, die GEHEIM-\n" + .string "BASEN der anderen zu finden.$" MossdeepCity_House4_Text_18E125:: @ 818E125 - .string "My little brother says he likes to\n" - .string "visit people’s SECRET BASES and have\l" - .string "POKéMON battles.$" + .string "Mein kleiner Bruder sagt, er liebt es, die\n" + .string "GEHEIMBASEN der anderen zu finden und\l" + .string "Kämpfe mit POKéMON auszutragen.$" MossdeepCity_House4_Text_18E17E:: @ 818E17E - .string "Was it you who made a SECRET BASE in\n" - .string "{STR_VAR_1}?$" + .string "Hast du dir eine GEHEIMBASIS in\n" + .string "{STR_VAR_1} eingerichtet?$" MossdeepCity_House4_Text_18E1A7:: @ 818E1A7 - .string "You should make a SECRET BASE\n" - .string "somewhere. I’ll go find it!$" + .string "Solltest du dir irgendwo eine GEHEIM-\n" + .string "BASIS einrichten, werde ich sie sicher\l" + .string "finden.$" MossdeepCity_House4_Text_18E1E1:: @ 818E1E1 - .string "DELCATTY: Miyaan?$" + .string "ENEKORO: Miyaan?$" diff --git a/data/text/maps/MossdeepCity_Mart.inc b/data/text/maps/MossdeepCity_Mart.inc index cdce8c48c..7f1761efc 100644 --- a/data/text/maps/MossdeepCity_Mart.inc +++ b/data/text/maps/MossdeepCity_Mart.inc @@ -1,19 +1,21 @@ MossdeepCity_Mart_Text_18D758:: @ 818D758 - .string "REVIVE is fantastic!\p" - .string "Give it to a fainted POKéMON, and the\n" - .string "POKéMON will arise.\p" - .string "But be careful, REVIVE doesn’t restore\n" - .string "the used-up PP of moves.$" + .string "BELEBER ist einfach fantastisch!\p" + .string "Gib es einem besiegten POKéMON und\n" + .string "es ist wieder fit.\p" + .string "Aber Vorsicht! BELEBER füllt nicht die\n" + .string "verbrauchten AP neu auf!$" MossdeepCity_Mart_Text_18D7E7:: @ 818D7E7 - .string "MAX REPEL keeps all weak POKéMON away.\p" - .string "Out of all the REPEL sprays, it lasts\n" - .string "the longest.$" + .string "TOP-SCHUTZ hält alle schwachen POKéMON\n" + .string "auf Distanz.\p" + .string "Von allen SCHUTZ-Sprays hält dieses am\n" + .string "längsten an.$" MossdeepCity_Mart_Text_18D841:: @ 818D841 - .string "The NET and DIVE BALLS are rare POKé\n" - .string "BALLS that are only made in MOSSDEEP.\p" - .string "A NET BALL is effective against\n" - .string "BUG-type and WATER-type POKéMON.\p" - .string "A DIVE BALL works best on POKéMON at\n" - .string "the bottom of the sea.$" + .string "Der NETZ- und der TAUCHBALL sind\n" + .string "seltene POKéBÄLLE, die in\l" + .string "MOOSBACH CITY hergestellt werden.\p" + .string "Ein NETZBALL ist höchst wirkungsvoll\n" + .string "bei KÄFER- und WASSER-POKéMON.\p" + .string "Der TAUCHBALL ist wirkungsvoll bei\n" + .string "POKéMON, die in der Tiefsee leben.$" diff --git a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc b/data/text/maps/MossdeepCity_PokemonCenter_1F.inc index 5f345613e..397b90178 100644 --- a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/text/maps/MossdeepCity_PokemonCenter_1F.inc @@ -1,10 +1,11 @@ MossdeepCity_PokemonCenter_1F_Text_18D62F:: @ 818D62F - .string "The GYM LEADERS in this town are a\n" - .string "formidable duo.\p" - .string "Their combination attacks are, like,\n" - .string "excellent and wow!$" + .string "Die ARENALEITER dieses Ortes sind ein\n" + .string "ausgezeichnetes Team.\p" + .string "Die Kombination ihrer Attacken ist\n" + .string "einfach exzellent und... wow!$" MossdeepCity_PokemonCenter_1F_Text_18D69A:: @ 818D69A - .string "Depending on the special abilities of\n" - .string "POKéMON, some moves might change\l" - .string "or not work at all.$" + .string "Abhängig von den speziellen Fähigkeiten\n" + .string "eines POKéMON, werden einige Attacken\p" + .string "in ihrer Wirkung verändert oder\n" + .string "sogar wirkungslos.$" diff --git a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc b/data/text/maps/MossdeepCity_PokemonCenter_2F.inc index 66bba2421..3e8f190e9 100644 --- a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc +++ b/data/text/maps/MossdeepCity_PokemonCenter_2F.inc @@ -1,4 +1,4 @@ MossdeepCity_PokemonCenter_2F_Text_18D6F5:: @ 818D6F5 - .string "If I win a whole lot of link battles\n" - .string "and show everyone how good I am,\l" - .string "I might get a fan following!$" + .string "Wenn ich eine Menge Kämpfe via Link\n" + .string "gewinne und jedem zeige, wie gut ich bin,\l" + .string "dann bekomme ich sicher auch Fans!$" diff --git a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc b/data/text/maps/MossdeepCity_SpaceCenter_1F.inc index a94d343bc..4c5703222 100644 --- a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/text/maps/MossdeepCity_SpaceCenter_1F.inc @@ -1,33 +1,35 @@ MossdeepCity_SpaceCenter_1F_Text_18E1F3:: @ 818E1F3 - .string "The rocket’s launch is imminent!$" + .string "Die Rakete wird in Kürze starten.$" MossdeepCity_SpaceCenter_1F_Text_18E214:: @ 818E214 - .string "The rocket launched safely!\n" - .string "That’s successful launch no. {STR_VAR_1}!$" + .string "Die Rakete ist sicher gestartet!\n" + .string "Das war der erfolgreiche Start Nr. {STR_VAR_1}!$" MossdeepCity_SpaceCenter_1F_Text_18E251:: @ 818E251 - .string "A rocket launch demands perfection.\n" - .string "Not even a 1% margin of error is allowed.\p" - .string "Even if it’s 99% okay, the whole thing\n" - .string "is useless if 1% happens to be no good.\p" - .string "Despite that, we never stop trying.\n" - .string "Why? It’s a dream that never ends.$" + .string "Jeder Raketenstart verlangt\n" + .string "sorgfältige Vorbereitungen. Die Fehler-\l" + .string "quote darf nicht einmal 1% betragen.\p" + .string "Selbst wenn 99% perfekt sind, kann 1%\n" + .string "schon für ein Misslingen sorgen.\p" + .string "Trotzdem versuchen wir es immer wieder.\n" + .string "Warum? Weil es ein ewiger Traum ist.$" MossdeepCity_SpaceCenter_1F_Text_18E335:: @ 818E335 - .string "I was taking a stroll down the beach\n" - .string "when I found this.\p" - .string "It’s not anything I need, so you can\n" - .string "have it.$" + .string "Ich schlenderte am Strand entlang, da\n" + .string "habe ich dieses hier gefunden.\p" + .string "Ich kann damit nichts anfangen, daher\n" + .string "kannst du es haben.$" MossdeepCity_SpaceCenter_1F_Text_18E39B:: @ 818E39B - .string "The HOENN region has been famous for \n" - .string "its meteor showers for a long time.$" + .string "Die HOENN-Region ist bekannt für die\n" + .string "Häufigkeit der Meteoriteneinschläge.$" MossdeepCity_SpaceCenter_1F_Text_18E3E5:: @ 818E3E5 - .string "Some people claim that POKéMON came\n" - .string "from space. Could it be true?$" + .string "Einige Menschen nehmen an, dass die\n" + .string "POKéMON aus dem Weltall kommen. Ob das\l" + .string "stimmt?$" MossdeepCity_SpaceCenter_1F_Text_18E427:: @ 818E427 - .string "A giant chunk of metal bursts through\n" - .string "the skies and flies into space...\p" - .string "It boggles my mind!$" + .string "Ein gigantischer Brocken Metall durch-\n" + .string "bricht den Himmel und fliegt ins All...\p" + .string "Das übersteigt jede Vorstellungskraft.$" diff --git a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc b/data/text/maps/MossdeepCity_SpaceCenter_2F.inc index 0c8159423..e6b42eef1 100644 --- a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/text/maps/MossdeepCity_SpaceCenter_2F.inc @@ -1,15 +1,15 @@ MossdeepCity_SpaceCenter_2F_Text_18E483:: @ 818E483 - .string "MOSSDEEP has mainly sunny weather,\n" - .string "and its winds are stable.\p" - .string "It’s an ideal location for launching\n" - .string "rockets.$" + .string "MOOSBACH CITY hat meistens sonniges\n" + .string "Wetter und einen beständigen Wind.\p" + .string "Ein idealer Ort, um Raketen ins All zu\n" + .string "schicken.$" MossdeepCity_SpaceCenter_2F_Text_18E4EE:: @ 818E4EE - .string "If only I was a little younger, I would\n" - .string "have liked being an astronaut...\p" - .string "No... It’s not too late!\n" - .string "I can and will try!$" + .string "Wenn ich jünger wäre, würde ich mit\n" + .string "Sicherheit Astronaut...\p" + .string "Nein... Dazu ist es nie zu spät!\n" + .string "Ich werde es versuchen!!!$" MossdeepCity_SpaceCenter_2F_Text_18E564:: @ 818E564 - .string "I wish ordinary people could go into\n" - .string "space one day...$" + .string "Ich wünschte, auch normale Leute\n" + .string "könnten eines Tages ins All reisen...$" diff --git a/data/text/maps/MossdeepCity_StevensHouse.inc b/data/text/maps/MossdeepCity_StevensHouse.inc index 6f5b9b9b8..abf80ddda 100644 --- a/data/text/maps/MossdeepCity_StevensHouse.inc +++ b/data/text/maps/MossdeepCity_StevensHouse.inc @@ -1,83 +1,91 @@ MossdeepCity_StevensHouse_Text_18DA77:: @ 818DA77 - .string "STEVEN: {PLAYER}{KUN}?\p" - .string "Yes, this is my place. It’s a little\n" - .string "embarrassing how empty it is here.\p" - .string "Oh, here, you should take this HM.\p" - .string "It contains DIVE.\n" - .string "I’ve already taught my POKéMON.$" + .string "TROY: {PLAYER}{KUN}?\p" + .string "Ja, das ist mein Zuhause. Peinlich, wie\n" + .string "kahl die Räume hier sind.\p" + .string "Oh, hier, nimm diese VM.\p" + .string "Sie enthält TAUCHER. Ich habe das\n" + .string "meinen POKéMON schon beigebracht.$" MossdeepCity_StevensHouse_Text_18DB22:: @ 818DB22 - .string "STEVEN: While you’re using SURF, you\n" - .string "should notice dark patches of water.\p" - .string "Use DIVE if you come to deep water\n" - .string "like it. You’ll drop to the seafloor.\p" - .string "When you want to come back up, use\n" - .string "DIVE again.\p" - .string "In some places, it won’t be possible\n" - .string "for you to surface, though.$" + .string "TROY: Wenn du SURFER einsetzt und\n" + .string "über das Meer gleitest, wirst du dunkle\l" + .string "Stellen im Wasser bemerken können.\p" + .string "Setze hier TAUCHER ein und du kannst\n" + .string "hinabtauchen bis zum Meeresboden.\p" + .string "Wenn du wieder auftauchen möchtest,\n" + .string "setze ebenfalls TAUCHER ein.\p" + .string "An manchen Stellen ist das Auftauchen\n" + .string "allerdings nicht möglich.$" MossdeepCity_StevensHouse_Text_18DC25:: @ 818DC25 - .string "STEVEN: Apparently, there’s an\n" - .string "underwater cavern between\l" - .string "MOSSDEEP and SOOTOPOLIS.\p" - .string "You know, the one that CAPT. STERN\n" - .string "found in his submarine.\p" - .string "An underwater cavern...\p" - .string "There might be some rare stones down\n" - .string "there... I should go for a DIVE...$" + .string "TROY: Zwischen MOOSBACH CITY und\n" + .string "XENEROVILLE gibt es eine Unterwasser-\l" + .string "höhle.\p" + .string "Die, die KAPT. BRIGG auf seiner\n" + .string "Expedition entdeckt hat, weißt du.\p" + .string "Eine Unterwasserhöhle...\p" + .string "Da gibt es bestimmt einige seltene\n" + .string "Steine zu finden... Ich sollte auch\l" + .string "einmal TAUCHER einsetzen...$" MossdeepCity_StevensHouse_Text_18DD12:: @ 818DD12 - .string "{PLAYER} checked the POKé BALL.\p" - .string "It contained the POKéMON\n" - .string "BELDUM.\p" - .string "Take the POKé BALL?$" + .string "{PLAYER} überprüft den POKéBALL.\p" + .string "Er enthält das POKéMON\n" + .string "TANHEL.\p" + .string "Den POKéBALL nehmen?$" MossdeepCity_StevensHouse_Text_18DD61:: @ 818DD61 - .string "{PLAYER} obtained a BELDUM.$" + .string "{PLAYER} hat TANHEL erhalten.$" MossdeepCity_StevensHouse_Text_18DD77:: @ 818DD77 - .string "There is no space for another POKéMON.$" + .string "Es ist nicht genug Platz vorhanden für\n" + .string "ein weiteres POKéMON.$" MossdeepCity_StevensHouse_Text_18DD9E:: @ 818DD9E - .string "{PLAYER} left the POKé BALL where\n" - .string "it was.$" + .string "{PLAYER} legt den POKéBALL zurück.$" MossdeepCity_StevensHouse_Text_18DDC2:: @ 818DDC2 - .string "It’s a letter.\p" + .string "Das ist ein Brief.\p" + .string "\n" .string "... ... ... ... ... ...\p" - .string "To {PLAYER}{KUN}...\p" - .string "I’ve decided to do a little soul-\n" - .string "searching and train on the road.\p" - .string "I don’t plan to return home for some\n" - .string "time.\p" - .string "I have a favor to ask of you.\p" - .string "I want you to take the POKé BALL on\n" - .string "the desk.\p" - .string "Inside it is a BELDUM, my favorite\n" - .string "POKéMON.\p" - .string "I’m counting on you.\p" - .string "May our paths cross some day.\p" - .string "STEVEN STONE$" + .string "An {PLAYER}{KUN}...\p" + .string "Ich habe mich dazu entschlossen, etwas\n" + .string "Mentaltraining zu machen und auf der\l" + .string "Straße zu trainieren.\p" + .string "Ich werde für einige Zeit nicht nach\n" + .string "Hause kommen.\p" + .string "Ich möchte dich um einen Gefallen\n" + .string "bitten.\p" + .string "Ich möchte, dass du den POKéBALL\n" + .string "nimmst, der auf dem Tisch liegt.\p" + .string "Er enthält mein Lieblings-POKéMON\n" + .string "TANHEL.\p" + .string "Ich verlasse mich auf dich.\p" + .string "Mögen wir uns eines Tages wieder sehen.\p" + .string "TROY TRUMM$" MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A - .string "It’s a letter.\p" + .string "Das ist ein Brief.\p" + .string "\n" .string "... ... ... ... ... ...\p" - .string "To {PLAYER}{KUN}...\p" - .string "I’ve decided to do a little soul-\n" - .string "searching and train on the road.\p" - .string "I don’t plan to return home for some\n" - .string "time.\p" - .string "I have a favor to ask of you.\p" - .string "I want you to take the POKé BALL on\n" - .string "the desk.\p" - .string "Inside it is a BELDUM, my favorite\n" - .string "POKéMON.\p" - .string "I’m counting on you.\p" - .string "If you’d like, you should also take\n" - .string "the HM DIVE.\p" - .string "May our paths cross some day.\p" - .string "STEVEN STONE$" + .string "An {PLAYER}{KUN}...\p" + .string "Ich habe mich dazu entschlossen, etwas\n" + .string "Mentaltraining zu machen und auf der\l" + .string "Straße zu trainieren.\p" + .string "Ich werde für einige Zeit nicht nach\n" + .string "Hause kommen.\p" + .string "Ich möchte dich um einen Gefallen\n" + .string "bitten.\p" + .string "Ich möchte, dass du den POKéBALL\n" + .string "nimmst, der auf dem Tisch liegt.\p" + .string "Er enthält mein Lieblings-POKéMON\n" + .string "TANHEL.\p" + .string "Ich verlasse mich auf dich.\p" + .string "Wenn du magst, nimm dir auch die VM\n" + .string "TAUCHER.\p" + .string "Mögen wir uns eines Tages wieder sehen.\p" + .string "TROY TRUMM$" MossdeepCity_StevensHouse_Text_18E0A3:: @ 818E0A3 - .string "It’s a collection of rare rocks and\n" - .string "stones assembled by STEVEN.$" + .string "Eine Kollektion seltener Steine,\n" + .string "zusammengetragen von TROY.$" diff --git a/data/text/maps/MtChimney.inc b/data/text/maps/MtChimney.inc index 8641bde00..949a74ffd 100644 --- a/data/text/maps/MtChimney.inc +++ b/data/text/maps/MtChimney.inc @@ -1,107 +1,106 @@ MtChimney_Text_195760:: @ 8195760 - .string "LAVA COOKIES are MT. CHIMNEY’s local\n" - .string "specialty.\p" - .string "Try one. It’s just ¥200.$" + .string "LAVAKEKSE sind die Spezialität am\n" + .string "SCHLOTBERG.\p" + .string "Nimm einen. Er kostet nur ¥200.$" MtChimney_Text_1957A9:: @ 81957A9 - .string "Thank you, dear!$" + .string "Vielen Dank, Herzchen!$" MtChimney_Text_1957BA:: @ 81957BA - .string "Oh, dear. You can’t buy a thing if\n" - .string "you’ve not got the money.$" + .string "Oh je. Du kannst nichts kaufen, wenn\n" + .string "du nicht genug Geld bei dir hast.$" MtChimney_Text_1957F7:: @ 81957F7 - .string "Oh, fine then.$" + .string "Oh, ist gut.$" MtChimney_Text_195806:: @ 8195806 - .string "A METEORITE is fitted on a mysterious\n" - .string "machine...\p" - .string "The machine seems to be storing\n" - .string "energy in the METEORITE.$" + .string "Ein METEORIT steckt in dieser\n" + .string "mysteriösen Vorrichtung...\p" + .string "Die Maschine scheint den METEORITEN\n" + .string "mit Energie zu versorgen.$" MtChimney_Text_195870:: @ 8195870 - .string "A METEORITE is fitted on a mysterious\n" - .string "machine...\p" - .string "Do you want to remove the METEORITE?$" + .string "Ein METEORIT steckt in dieser\n" + .string "mysteriösen Vorrichtung...\p" + .string "Willst du den METEORITEN nehmen?$" MtChimney_Text_1958C6:: @ 81958C6 - .string "{PLAYER} removed the METEORITE from\n" - .string "the mysterious machine.$" + .string "{PLAYER} entfernt den METEORITEN aus\n" + .string "der mysteriösen Vorrichtung.$" MtChimney_Text_1958FC:: @ 81958FC - .string "{PLAYER} left the METEORITE where\n" - .string "it was.$" + .string "{PLAYER} fasst den METEORITEN nicht an.$" MtChimney_Text_195920:: @ 8195920 - .string "This mysterious machine...\n" - .string "It makes no response whatsoever.$" + .string "Diese mysteriöse Vorrichtung...\n" + .string "Sie reagiert in keinster Weise.$" MtChimney_Text_19595C:: @ 819595C - .string "{0x7A} JAGGED PATH\n" - .string "LAVARIDGE TOWN AHEAD$" + .string "{DOWN_ARROW} STEILPASS\n" + .string "BAD LAVASTADT GERADEAUS$" MtChimney_Text_19597F:: @ 819597F - .string "I’ve been to the hot springs and\n" - .string "refreshed my tired bones.\l" - .string "Right now I’m feeling strong!$" + .string "Ich war bei den Heißen Quellen und habe\n" + .string "meine müden Knochen erfrischt.\l" + .string "Jetzt fühle ich mich richtig stark!$" MtChimney_Text_1959D8:: @ 81959D8 - .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" + .string "Oh, du meine Güte!\n" + .string "Wer bist du denn?!?$" MtChimney_Text_195A04:: @ 8195A04 - .string "Well, well, I’ve lost. I can’t call\n" - .string "myself an EXPERT now, can I?$" + .string "Nun, ich habe verloren. Ich darf mich\n" + .string "nun nicht mehr EXPERTE nennen, oder?$" MtChimney_Text_195A45:: @ 8195A45 - .string "If you can mesh your heart with those\n" - .string "of your POKéMON, why, you should be\l" - .string "able to achieve great things.$" + .string "Wenn du in deinem Herzen Platz für deine\n" + .string "POKéMON hast, dann kannst du auch\l" + .string "große Dinge erreichen.$" MtChimney_Text_195AAD:: @ 8195AAD - .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" + .string "Oh, du meine Güte!\n" + .string "Wer bist du denn!$" MtChimney_Text_195AD9:: @ 8195AD9 - .string "Perhaps your heart has become one\n" - .string "with the hearts of your POKéMON.$" + .string "Vielleicht schlägt dein Herz im Gleich-\n" + .string "klang mit den POKéMON.$" MtChimney_Text_195B1C:: @ 8195B1C - .string "I’ve got the fire in me, baby.\n" - .string "I can’t stand it! I have to battle!$" + .string "Ich habe Feuer in mir, Baby.\n" + .string "Ich halt’s nicht aus! Ich muss kämpfen!$" MtChimney_Text_195B5F:: @ 8195B5F - .string "Ooh, that was a scorching-hot match!$" + .string "Oh, was für ein kochend heißer Kampf!$" MtChimney_Text_195B84:: @ 8195B84 - .string "The heat of MT. CHIMNEY lights my\n" - .string "fire, baby!$" + .string "Die Hitze vom SCHLOTBERG bringt mein\n" + .string "Feuer in Gang.$" MtChimney_Text_195BB2:: @ 8195BB2 - .string "I’ve finally made it to MT. CHIMNEY.\n" - .string "I want to make my POKéMON battle!$" + .string "Endlich bin ich am SCHLOTBERG ange-\n" + .string "kommen. Jetzt will ich kämpfen!!!$" MtChimney_Text_195BF9:: @ 8195BF9 - .string "The way you battle...\n" - .string "It’s like a MT. CHIMNEY eruption!$" + .string "Wie du kämpfst...\n" + .string "Als würde der SCHLOTBERG ausbrechen!$" MtChimney_Text_195C31:: @ 8195C31 - .string "Like I said, I’ve finally made it to\n" - .string "MT. CHIMNEY. It would be a shame if\l" - .string "I only do a little sightseeing...\p" - .string "I want to get in some battles and buy\n" - .string "COOKIES as souvenirs.$" + .string "Wie ich schon sagte, endlich bin ich am\n" + .string "SCHLOTBERG. Wäre doch blödsinnig, wenn\l" + .string "ich nur zum Sightseeing hier wäre...\p" + .string "Ich will ein bisschen kämpfen und KEKSE\n" + .string "als Andenken kaufen.$" MtChimney_Text_195CD8:: @ 8195CD8 - .string "Since I bathed in the hot springs,\n" - .string "I’ve been feeling great!\l" - .string "I’m sure I’m going to win!$" + .string "Seit ich in den Heißen Quellen gebadet\n" + .string "habe, fühle ich mich großartig!\l" + .string "Ich bin sicher, ich werde gewinnen!$" MtChimney_Text_195D2F:: @ 8195D2F - .string "Yowch!\n" - .string "I’m getting a chill out of the water.$" + .string "Huaah!\n" + .string "Außerhalb des Wassers ist es saukalt.$" MtChimney_Text_195D5C:: @ 8195D5C - .string "I’ll have to take another dip in the\n" - .string "hot springs. Want to join me?\p" - .string "Just joking!$" + .string "Ich werde mich wieder in die Heiße\n" + .string "Quelle setzen. Kommst du mit?\p" + .string "Kleiner Scherz am Rande... Hähähä.$" diff --git a/data/text/maps/MtChimney_CableCarStation.inc b/data/text/maps/MtChimney_CableCarStation.inc index 03e2f7a2a..38393fb2d 100644 --- a/data/text/maps/MtChimney_CableCarStation.inc +++ b/data/text/maps/MtChimney_CableCarStation.inc @@ -1,10 +1,10 @@ MtChimney_CableCarStation_Text_19256A:: @ 819256A - .string "The CABLE CAR is ready to go down.\n" - .string "Would you like to be on it?$" + .string "Die SEILBAHN fährt gleich hinab.\n" + .string "Möchtest du mit?$" MtChimney_CableCarStation_Text_1925A9:: @ 81925A9 Route112_CableCarStation_Text_1925A9:: @ 81925A9 - .string "Please step this way.$" + .string "Bitte hier entlang.$" MtChimney_CableCarStation_Text_1925BF:: @ 81925BF - .string "Please ride with us another time.$" + .string "Dann fahre bitte später mit uns.$" diff --git a/data/text/maps/MtPyre_1F.inc b/data/text/maps/MtPyre_1F.inc index 84e1cef07..27402c5c7 100644 --- a/data/text/maps/MtPyre_1F.inc +++ b/data/text/maps/MtPyre_1F.inc @@ -1,19 +1,20 @@ MtPyre_1F_Text_196151:: @ 8196151 - .string "All sorts of beings wander the slopes\n" - .string "of MT. PYRE...\p" - .string "There is no telling what may happen.\n" - .string "Take this. It’s for your own good.$" + .string "Auf den Pfaden des PYROBERG kreucht\n" + .string "und fleucht alles Mögliche...\p" + .string "Niemand kann sagen, was passieren wird.\n" + .string "Dies ist für dich, es wird dir helfen.$" MtPyre_1F_Text_1961CE:: @ 81961CE - .string "Have a POKéMON hold that\n" - .string "CLEANSE TAG.\p" - .string "It will help ward off wild POKéMON.$" + .string "Lass ein POKéMON das SCHUTZBAND\n" + .string "tragen.\p" + .string "Das hilft, wilde POKéMON fern zu halten.$" MtPyre_1F_Text_196218:: @ 8196218 - .string "Did you come to pay your respect\n" - .string "to the spirits of departed POKéMON?\p" - .string "You must care for your POKéMON a lot.$" + .string "Bist du hier, um den verstorbenen\n" + .string "POKéMON deinen Respekt zu zollen?\p" + .string "Du musst immer sehr fürsorglich zu\n" + .string "deinen POKéMON sein.$" MtPyre_1F_Text_196283:: @ 8196283 - .string "This is the final resting place of my\n" - .string "ZIGZAGOON. I cherished it...$" + .string "Hier ruht mein ZIGZACHS. Ich habe\n" + .string "es wirklich sehr geliebt...$" diff --git a/data/text/maps/MtPyre_2F.inc b/data/text/maps/MtPyre_2F.inc index 28c57d0ba..88d5a5546 100644 --- a/data/text/maps/MtPyre_2F.inc +++ b/data/text/maps/MtPyre_2F.inc @@ -1,63 +1,65 @@ MtPyre_2F_Text_1962C6:: @ 81962C6 - .string "LUKE: We’re here on a dare.\p" - .string "Heheh, if I show her how cool I am,\n" - .string "she’ll fall for me. I know it!\p" - .string "I know! I’ll cream you and show her\n" - .string "how cool I am!$" + .string "LEIF: Wir machen hier eine Mutprobe.\p" + .string "Hähä, wenn ich zeige, wie cool ich bin,\n" + .string "wird sie sich sicher in mich verlieben!\p" + .string "Besser: Ich werde dich vernichtend\n" + .string "schlagen. Dann bin ich echt cool!$" MtPyre_2F_Text_196358:: @ 8196358 - .string "LUKE: Whoopsie!$" + .string "LEIF: Huups!$" MtPyre_2F_Text_196368:: @ 8196368 - .string "LUKE: Well, we lost but that’s okay!\n" - .string "I’m right here by your side.\l" - .string "We’ll make it through this dare!$" + .string "LEIF: Wir haben verloren, aber das macht\n" + .string "nichts! Solange ich nur bei ihr bin. Wir\l" + .string "werden diese Mutprobe bestehen!$" MtPyre_2F_Text_1963CB:: @ 81963CB - .string "LUKE: If you want to take me on, bring\n" - .string "some more POKéMON.\p" - .string "If you don’t, I won’t be able to show\n" - .string "off how cool I am to my girl!$" + .string "LEIF: Wenn du es mit mir aufnehmen\n" + .string "willst, brauchst du mehr POKéMON.\p" + .string "Hast du die nicht, kann ich meiner An-\n" + .string "gebeteten nicht beweisen, wie cool ich\l" + .string "bin!$" MtPyre_2F_Text_196449:: @ 8196449 - .string "DEZ: I came here on a dare with my\n" - .string "boyfriend.\p" - .string "It’s really scary, but I’m with my\n" - .string "boyfriend. It’s okay.\p" - .string "I know! I’ll get my boyfriend to look\n" - .string "cool by beating you!$" + .string "INA: Ich bin hier, um mit meinem Freund\n" + .string "eine Mutprobe zu bestehen.\p" + .string "Es ist unheimlich hier, aber zusammen\n" + .string "mit meinem Freund ist es schon okay.\p" + .string "Ich hab’s: Mein Freund soll zeigen, wie\n" + .string "cool er ist, indem er dich besiegt!$" MtPyre_2F_Text_1964EB:: @ 81964EB - .string "DEZ: Waaaah! I’m scared!$" + .string "INA: Uuuaaa! Ich habe Angst.$" MtPyre_2F_Text_196504:: @ 8196504 - .string "DEZ: We’re lovey-dovey, so we don’t\n" - .string "care if we lose!$" + .string "INA: Wir sind ineinander verliebt, daher\n" + .string "stört uns eine Niederlage nicht.$" MtPyre_2F_Text_196539:: @ 8196539 - .string "DEZ: If you want to challenge us, you\n" - .string "should bring at least two POKéMON.\p" - .string "My boyfriend’s strong.\n" - .string "Just one POKéMON won’t do at all.$" + .string "INA: Wenn du gegen uns antreten willst,\n" + .string "solltest du mindestens zwei POKéMON\l" + .string "besitzen.\p" + .string "Mein Freund ist stark. Daher wirst du\n" + .string "mit einem POKéMON nichts ausrichten.$" MtPyre_2F_Text_1965BB:: @ 81965BB - .string "Memories of my darling SKITTY...\n" - .string "My eyes overflow thinking about it.$" + .string "Die Erinnerungen an meinen Liebling\n" + .string "ENECO... Ich könnte weinen...$" MtPyre_2F_Text_196600:: @ 8196600 - .string "Ooch, ouch... There are holes in the\n" - .string "ground here and there.\p" - .string "I didn’t notice and took a tumble from\n" - .string "the floor above.$" + .string "Au au au au... Der Boden hat an einigen\n" + .string "Stellen Löcher.\p" + .string "Ich habe das nicht gesehen und bin ins\n" + .string "untere Stockwerk gefallen. Autsch, aua.$" MtPyre_2F_Text_196674:: @ 8196674 - .string "Hey! Are you searching for POKéMON?\n" - .string "You came along after me! You’re rude!$" + .string "Hey! Suchst du nach POKéMON? Du bist\n" + .string "mir hinterhergeschlichen! Fiesling!$" MtPyre_2F_Text_1966BE:: @ 81966BE - .string "Ayieeeeh!\n" - .string "I’m sorry, forgive me, please!$" + .string "Oweiowei.\n" + .string "Tut mir Leid. Entschuldige bitte!$" MtPyre_2F_Text_1966E7:: @ 81966E7 - .string "People don’t come here often, so\n" - .string "I thought there’d be rare POKéMON.$" + .string "Hier sind nie viele Leute. Daher soll es\n" + .string "hier seltene POKéMON geben.$" diff --git a/data/text/maps/MtPyre_3F.inc b/data/text/maps/MtPyre_3F.inc index c714c97a0..c1fa592e1 100644 --- a/data/text/maps/MtPyre_3F.inc +++ b/data/text/maps/MtPyre_3F.inc @@ -1,27 +1,26 @@ MtPyre_3F_Text_19672B:: @ 819672B - .string "The rich atmosphere of the mountain\n" - .string "has elevated my psychic power!\p" - .string "A mere child like you...\n" - .string "You dream of winning?$" + .string "Die unglaubliche Atmosphäre der Berge\n" + .string "hat meine psychischen Kräfte gestärkt!\p" + .string "Ein kleines Kind wie du...\n" + .string "Du willst gewinnen? Träum weiter!$" MtPyre_3F_Text_19679D:: @ 819679D - .string "I drown in self-pity...$" + .string "Ich vertiefe mich in Selbstmitleid.$" MtPyre_3F_Text_1967B5:: @ 81967B5 - .string "My psychic powers have surely\n" - .string "grown several times, but...$" + .string "Meine psychischen Kräfte sind mit\n" + .string "Sicherheit stärker geworden, aber...$" MtPyre_3F_Text_1967EF:: @ 81967EF - .string "Ahahahaha!\p" - .string "This is no place for children, least\n" - .string "of all you!$" + .string "Ahahahahaha!!!!!\p" + .string "Dies ist kein Platz für einen kleinen\n" + .string "Hosenscheißer wie dich!$" MtPyre_3F_Text_19682B:: @ 819682B - .string "I lost that cleanly...$" + .string "Oh, ich habe mir in die Hose gemacht.$" MtPyre_3F_Text_196842:: @ 8196842 - .string "This means my training is still not\n" - .string "enough...\p" - .string "I’ve got to keep working toward the\n" - .string "summit...\p" - .string "Go, me!$" + .string "Mein Training reicht also nicht aus...\p" + .string "Ich muss mein Training auf die Spitze\n" + .string "treiben...\p" + .string "Ich darf keine Zeit verlieren!$" diff --git a/data/text/maps/MtPyre_4F.inc b/data/text/maps/MtPyre_4F.inc index 275b6f5ac..46ec64d44 100644 --- a/data/text/maps/MtPyre_4F.inc +++ b/data/text/maps/MtPyre_4F.inc @@ -1,11 +1,11 @@ MtPyre_4F_Text_1968A6:: @ 81968A6 - .string "Teacher...\n" - .string "Please watch over my progress!$" + .string "Mein Lehrer...\n" + .string "Bitte achtet auf meine Fortschritte!$" MtPyre_4F_Text_1968D0:: @ 81968D0 - .string "Teacher...\n" - .string "Please forgive me!$" + .string "Mein Lehrer...\n" + .string "Bitte verzeiht mir!$" MtPyre_4F_Text_1968EE:: @ 81968EE - .string "Until I improve, my teacher, who rests\n" - .string "here, will never find true peace...$" + .string "Wenn ich nicht besser werde, wird mein\n" + .string "Lehrer, der hier ruht, keine Ruhe finden.$" diff --git a/data/text/maps/MtPyre_5F.inc b/data/text/maps/MtPyre_5F.inc index c70211067..d42949f30 100644 --- a/data/text/maps/MtPyre_5F.inc +++ b/data/text/maps/MtPyre_5F.inc @@ -1,14 +1,14 @@ MtPyre_5F_Text_196939:: @ 8196939 - .string "I love all things horrifying...\n" - .string "It’s like a disease...\p" - .string "When I’m here...\n" - .string "I shiver with fear...$" + .string "Ich mag gruselige Horrordinge...\n" + .string "Es ist wie eine Sucht...\p" + .string "Sobald ich hier bin...\n" + .string "Stehen mir die Haare zu Berge.$" MtPyre_5F_Text_196997:: @ 8196997 - .string "Losing, I dislike...$" + .string "Ich hasse Niederlagen...$" MtPyre_5F_Text_1969AC:: @ 81969AC - .string "I want to see dreadful things...\n" - .string "I can’t leave...\p" - .string "Stay...\n" - .string "Won’t you stay with me?$" + .string "Ich will unheimliche Dinge sehen...\n" + .string "Ich kann nicht weggehen...\p" + .string "Muss bleiben...\n" + .string "Willst du nicht bei mir bleiben?$" diff --git a/data/text/maps/MtPyre_6F.inc b/data/text/maps/MtPyre_6F.inc index 711c87570..50419c363 100644 --- a/data/text/maps/MtPyre_6F.inc +++ b/data/text/maps/MtPyre_6F.inc @@ -1,21 +1,21 @@ MtPyre_6F_Text_1969FE:: @ 81969FE - .string "When I’m here...\n" - .string "A curious power flows into me...$" + .string "Wenn ich hier bin... Dann durchströmt\n" + .string "mich eine seltsame Macht...$" MtPyre_6F_Text_196A30:: @ 8196A30 - .string "The power is ebbing away...$" + .string "Die Macht ebbt ab...$" MtPyre_6F_Text_196A4C:: @ 8196A4C - .string "Perhaps the power is from the spirits\n" - .string "of POKéMON in fitful sleep here...$" + .string "Die Geister der hier ruhenden POKéMON\n" + .string "erfüllen mich mit ihrer Macht...$" MtPyre_6F_Text_196A95:: @ 8196A95 - .string "Behind you...\n" - .string "What is it...$" + .string "Hinter dir...\n" + .string "W... Was ist das?$" MtPyre_6F_Text_196AB1:: @ 8196AB1 - .string "Something faded away...$" + .string "Etwas war da und verschwand...$" MtPyre_6F_Text_196AC9:: @ 8196AC9 - .string "The POKéMON at rest here...\n" - .string "Sometimes, they play...$" + .string "Die POKéMON, die hier ruhen...\n" + .string "Manchmal spielen sie...$" diff --git a/data/text/maps/NewMauville_Entrance.inc b/data/text/maps/NewMauville_Entrance.inc index 36739ec3e..f6f8ad75f 100644 --- a/data/text/maps/NewMauville_Entrance.inc +++ b/data/text/maps/NewMauville_Entrance.inc @@ -1,9 +1,9 @@ NewMauville_Entrance_Text_1982C0:: @ 81982C0 - .string "The door is closed.$" + .string "Die Tür ist geschlossen.$" NewMauville_Entrance_Text_1982D4:: @ 81982D4 - .string "Use the BASEMENT KEY?$" + .string "Den KELLERÖFFNER benutzen?$" NewMauville_Entrance_Text_1982EA:: @ 81982EA - .string "{PLAYER} used the BASEMENT KEY.\p" - .string "The door opened!$" + .string "{PLAYER} benutzt den KELLERÖFFNER.\p" + .string "Die Tür öffnet sich.$" diff --git a/data/text/maps/NewMauville_Inside.inc b/data/text/maps/NewMauville_Inside.inc index c18354294..2c7325674 100644 --- a/data/text/maps/NewMauville_Inside.inc +++ b/data/text/maps/NewMauville_Inside.inc @@ -1,16 +1,15 @@ NewMauville_Inside_Text_198315:: @ 8198315 - .string "The generator is radiating heat that\n" - .string "can be felt even at a distance.\p" - .string "It looks like it should be turned off\n" - .string "as soon as possible.$" + .string "Der Generator strahlt eine Hitze ab, die\n" + .string "sogar aus der Entfernung zu spüren ist.\p" + .string "Man sollte ihn so schnell wie möglich\n" + .string "abschalten.$" NewMauville_Inside_Text_198395:: @ 8198395 - .string "The generator quieted down.$" + .string "Der Generator ist ausgeschaltet.$" NewMauville_Inside_Text_1983B1:: @ 81983B1 - .string "{PLAYER} stepped on the switch.\p" - .string "Click...\p" + .string "{PLAYER} stellt sich auf den Schalter.\p" + .string "Klick.\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "The generator appears to have\n" - .string "stopped...$" + .string "Der Generator ist ausgeschaltet...$" diff --git a/data/text/maps/OldaleTown.inc b/data/text/maps/OldaleTown.inc index 2d0b31a44..39d3f8142 100644 --- a/data/text/maps/OldaleTown.inc +++ b/data/text/maps/OldaleTown.inc @@ -1,55 +1,57 @@ OldaleTown_Text_16AEC0:: @ 816AEC0 - .string "I want to take a rest, so I’m saving my\n" - .string "progress.$" + .string "Ich möchte eine Pause einlegen, daher\n" + .string "speichere ich mein Spiel.$" OldaleTown_Text_16AEF2:: @ 816AEF2 .string "Hi!\n" - .string "I work at a POKéMON MART.\p" - .string "Can I get you to come with me?$" + .string "Ich arbeite in einem PKMN-SUPERMARKT.\p" + .string "Kommst du bitte einmal mit mir?$" OldaleTown_Text_16AF2F:: @ 816AF2F - .string "This is a POKéMON MART.\n" - .string "Just look for our blue roof.\p" - .string "We sell a variety of goods including\n" - .string "POKé BALLS for catching POKéMON.\p" - .string "Here, I’d like you to have this as a\n" - .string "promotional item.$" + .string "Dies ist ein PKMN-SUPERMARKT.\n" + .string "Er ist an dem blauen Dach erkennbar.\p" + .string "Wir verkaufen eine Menge nützlicher\n" + .string "Dinge, wie POKéBÄLLE, mit denen man\l" + .string "POKéMON fängt.\p" + .string "Hier, dies ist ein Item, quasi als Werbe-\n" + .string "geschenk für dich.$" OldaleTown_Text_16AFE1:: @ 816AFE1 - .string "A POTION can be used anytime, so it’s\n" - .string "even more useful than a POKéMON CENTER\l" - .string "in certain situations.$" + .string "Ein TRANK kann zu jeder Zeit eingesetzt\n" + .string "werden, daher ist er in manchen\l" + .string "Situationen wertvoller als ein POKéMON-\l" + .string "CENTER.$" OldaleTown_Text_16B045:: @ 816B045 - .string "Aaaaah! Wait!\n" - .string "Please don’t come in here.\p" - .string "I just discovered the footprints of\n" - .string "a rare POKéMON!\p" - .string "Wait until I finish sketching\n" - .string "them, okay?$" + .string "Aaaah! Warte!\n" + .string "Bitte nicht dort entlang laufen!\p" + .string "Ich habe dort die Fußspuren eines\n" + .string "seltenen POKéMON gesehen!\p" + .string "Warte bis ich fertig bin, sie\n" + .string "abzuzeichnen, okay?$" OldaleTown_Text_16B0CC:: @ 816B0CC - .string "I just discovered the footprints of\n" - .string "a rare POKéMON!\p" - .string "Wait until I finish sketching\n" - .string "them, okay?$" + .string "Ich habe dort die Fußspuren eines\n" + .string "seltenen POKéMON gesehen!\p" + .string "Warte, bis ich fertig bin, sie\n" + .string "abzuzeichnen, okay?$" OldaleTown_Text_16B12A:: @ 816B12A - .string "I finished sketching the footprints of\n" - .string "a rare POKéMON.\p" - .string "But it turns out they were only my\n" - .string "own footprints...$" + .string "Ich habe die Fußspuren eines seltenen\n" + .string "POKéMON abgezeichnet.\p" + .string "Aber hinterher habe ich festgestellt,\n" + .string "dass es meine eigenen Spuren waren...$" OldaleTown_Text_16B196:: @ 816B196 - .string "MAY: {PLAYER}{KUN}!\n" - .string "Over here!\l" - .string "Let’s hurry home!$" + .string "MAIKE: {PLAYER}{KUN}!\n" + .string "Hier entlang!\l" + .string "Lass uns nach Hause gehen!$" OldaleTown_Text_16B1BE:: @ 816B1BE - .string "BRENDAN: I’m heading back to my dad’s\n" - .string "LAB now.\l" - .string "{PLAYER}, you should hustle back, too.$" + .string "BRIX: Ich gehe nun in das LABOR\n" + .string "meines Vaters.\l" + .string "{PLAYER}, du solltest auch zurücklaufen.$" OldaleTown_Text_16B20E:: @ 816B20E - .string "OLDALE TOWN\n" - .string "“Where things start off scarce.”$" + .string "ROSALTSTADT\n" + .string "“Wo Dinge selten ihren Anfang nehmen.”$" diff --git a/data/text/maps/OldaleTown_House1.inc b/data/text/maps/OldaleTown_House1.inc index 943003b97..d12e86fb7 100644 --- a/data/text/maps/OldaleTown_House1.inc +++ b/data/text/maps/OldaleTown_House1.inc @@ -1,7 +1,7 @@ OldaleTown_House1_Text_17476D:: @ 817476D - .string "When a POKéMON battle starts, the one\n" - .string "at the left of the list goes out first.\p" - .string "So, when you get more POKéMON in your\n" - .string "party, try switching around the order\l" - .string "of your POKéMON.\p" - .string "It could give you an advantage.$" + .string "Das POKéMON auf der linken Seite der\n" + .string "Liste tritt im Kampf als Erstes an.\p" + .string "Hast du mehrere POKéMON in deinem Team,\n" + .string "stelle sie so der Reihe nach auf, wie es\l" + .string "für den Kampf am günstigsten ist.\p" + .string "Das kann ein Vorteil für dich sein.$" diff --git a/data/text/maps/OldaleTown_House2.inc b/data/text/maps/OldaleTown_House2.inc index 54a6547b4..c14c3803a 100644 --- a/data/text/maps/OldaleTown_House2.inc +++ b/data/text/maps/OldaleTown_House2.inc @@ -1,8 +1,9 @@ OldaleTown_House2_Text_174838:: @ 8174838 - .string "When POKéMON battle, they eventually\n" - .string "level up and become stronger.$" + .string "Während eines Kampfes können POKéMON\n" + .string "manchmal einen Level dazugewinnen und\l" + .string "stärker werden.$" OldaleTown_House2_Text_17487B:: @ 817487B - .string "If the POKéMON with you become\n" - .string "stronger, you’ll be able to go farther\l" - .string "away from here.$" + .string "Sobald deine Team-POKéMON stärker\n" + .string "geworden sind, kannst du auch andere\l" + .string "Orte bereisen.$" diff --git a/data/text/maps/OldaleTown_Mart.inc b/data/text/maps/OldaleTown_Mart.inc index 5abb0cb9b..19e1e600f 100644 --- a/data/text/maps/OldaleTown_Mart.inc +++ b/data/text/maps/OldaleTown_Mart.inc @@ -1,13 +1,14 @@ OldaleTown_Mart_Text_174A8A:: @ 8174A8A - .string "The clerk says they’re all sold out.\n" - .string "I can’t buy any POKé BALLS.$" + .string "Der Verkäufer sagt, es sei alles ausver-\n" + .string "kauft. Jetzt stehe ich ohne\l" + .string "POKéBÄLLE da.$" OldaleTown_Mart_Text_174ACB:: @ 8174ACB - .string "I’m going to buy a bunch of POKé BALLS\n" - .string "and catch a bunch of POKéMON!$" + .string "Ich will mir viele POKéBÄLLE kaufen und\n" + .string "damit genauso viele POKéMON fangen!$" OldaleTown_Mart_Text_174B10:: @ 8174B10 - .string "If a POKéMON gets hurt and loses its HP\n" - .string "and faints, it won’t be able to battle.\p" - .string "To prevent your POKéMON from fainting,\n" - .string "restore its HP with a POTION.$" + .string "Wird ein POKéMON verletzt und verliert\n" + .string "alle KP, so ist es kampfunfähig.\p" + .string "Um das zu vermeiden, solltest du die KP\n" + .string "bei Bedarf mit einem TRANK auffüllen.$" diff --git a/data/text/maps/OldaleTown_PokemonCenter_1F.inc b/data/text/maps/OldaleTown_PokemonCenter_1F.inc index 4fa7f4d9b..4396e8638 100644 --- a/data/text/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/text/maps/OldaleTown_PokemonCenter_1F.inc @@ -1,22 +1,23 @@ OldaleTown_PokemonCenter_1F_Text_1748D1:: @ 81748D1 - .string "That PC in the corner there is\n" - .string "for any POKéMON TRAINER to use.\p" - .string "Naturally, that means you’re welcome\n" - .string "to use it, too.$" + .string "Der PC dort in der Ecke ist für alle\n" + .string "POKéMON-TRAINER.\p" + .string "Das heißt, dass auch du ihn benutzen\n" + .string "darfst.$" OldaleTown_PokemonCenter_1F_Text_174945:: @ 8174945 - .string "POKéMON CENTERS are great!\p" - .string "You can use their services as much\n" - .string "as you like, and it’s all for free.\l" - .string "You never have to worry!$" + .string "POKéMON-CENTER sind eine großartige\n" + .string "Einrichtung!\p" + .string "Du kannst ihren Service sooft du willst\n" + .string "in Anspruch nehmen - kostenlos! Daher\l" + .string "kannst du unbeschwert umherreisen.$" OldaleTown_PokemonCenter_1F_Text_1749C0:: @ 81749C0 - .string "The POKéMON CABLE CLUB on the second\n" - .string "floor was built recently.\p" - .string "But they say they’re still making\n" - .string "adjustments.$" + .string "Der POKéMON KABEL-CLUB im zweiten\n" + .string "Stock wurde erst kürzlich eröffnet.\p" + .string "Und sie sind immer noch nicht ganz\n" + .string "fertig mit dem Einrichten.$" OldaleTown_PokemonCenter_1F_Text_174A2E:: @ 8174A2E - .string "The POKéMON CABLE CLUB on the second\n" - .string "floor was built recently.\p" - .string "I traded POKéMON right away.$" + .string "Der POKéMON KABEL-CLUB im zweiten\n" + .string "Stock wurde erst kürzlich eröffnet.\p" + .string "Ich habe schon POKéMON getauscht!$" diff --git a/data/text/maps/PacifidlogTown.inc b/data/text/maps/PacifidlogTown.inc index f598c566a..f9cf80a48 100644 --- a/data/text/maps/PacifidlogTown.inc +++ b/data/text/maps/PacifidlogTown.inc @@ -1,19 +1,20 @@ PacifidlogTown_Text_16CFC5:: @ 816CFC5 - .string "The sea between PACIFIDLOG and\n" - .string "SLATEPORT has a fast-running tide.\p" - .string "If you decide to SURF, you could end\n" - .string "up swept away somewhere else.$" + .string "Im Meer zwischen FLOSSBRUNN und\n" + .string "GRAPHITPORT CITY befinden sich\l" + .string "reißende Strömungen.\p" + .string "Wenn du dort SURFER einsetzt, kann es\n" + .string "sein, dass du fortgetrieben wirst.$" PacifidlogTown_Text_16D04A:: @ 816D04A - .string "See, isn’t it neat?\n" - .string "These houses are on water!\p" - .string "I was born here!$" + .string "Schau mal. Ist das nicht hübsch?\n" + .string "Die Häuser stehen auf dem Wasser.\p" + .string "Ich wurde hier geboren.$" PacifidlogTown_Text_16D08A:: @ 816D08A - .string "The folks of PACIFIDLOG all fish and\n" - .string "dive as part of the lifestyle.$" + .string "Das Volk von FLOSSBRUNN fischt und\n" + .string "taucht. Das gehört zu ihrem Leben.$" PacifidlogTown_Text_16D0CE:: @ 816D0CE - .string "PACIFIDLOG TOWN\p" - .string "“Where the morning sun smiles upon\n" - .string "the waters.”$" + .string "FLOSSBRUNN\p" + .string "“Wo die Morgensonne ein Lächeln auf\n" + .string "das Meer zaubert.”$" diff --git a/data/text/maps/PacifidlogTown_House1.inc b/data/text/maps/PacifidlogTown_House1.inc index 5d2f5a2c9..deed4a0f6 100644 --- a/data/text/maps/PacifidlogTown_House1.inc +++ b/data/text/maps/PacifidlogTown_House1.inc @@ -1,13 +1,13 @@ PacifidlogTown_House1_Text_178F9F:: @ 8178F9F - .string "In the HOENN region, there are three\n" - .string "POKéMON that represent the power of\l" - .string "rock, ice, and steel.\p" - .string "Each of them is said to hide away deep\n" - .string "inside caves.\p" - .string "That’s the story I heard when I was\n" - .string "just a little kid.$" + .string "In der HOENN-Region gibt es drei\n" + .string "POKéMON, die die Stärke von Gestein,\l" + .string "Eis und Stahl repräsentieren.\p" + .string "Man sagt, sie verstecken sich in\n" + .string "Höhlen vor den Augen der Menschen.\p" + .string "Diese Geschichte wurde mir als Kind\n" + .string "erzählt.$" PacifidlogTown_House1_Text_17906A:: @ 817906A - .string "“Six dots open three doors.”\p" - .string "Grandpa used to say that, but I don’t\n" - .string "know what he meant.$" + .string "“Sechs Punkte öffnen drei Türen.”\p" + .string "Mein Großvater sagte das immer, aber\n" + .string "ich habe keine Ahnung, was es bedeutet.$" diff --git a/data/text/maps/PacifidlogTown_House2.inc b/data/text/maps/PacifidlogTown_House2.inc index 5c669dc98..d5d93ae24 100644 --- a/data/text/maps/PacifidlogTown_House2.inc +++ b/data/text/maps/PacifidlogTown_House2.inc @@ -1,54 +1,54 @@ PacifidlogTown_House2_Text_1790C1:: @ 81790C1 - .string "Er-hem!\p" - .string "I am the POKéMON FAN CLUB’s most\n" - .string "important person, the CHAIRMAN’s\l" - .string "younger brother.\p" - .string "I’m here enjoying my vacation with\n" - .string "POKéMON, yes, indeed.$" + .string "Ähhäm!\p" + .string "Ich bin die wichtigste Person des\n" + .string "POKéMON-FANCLUBS, ich bin der kleine\l" + .string "Bruder des VORSITZENDEN.\p" + .string "Ich genieße hier die Ferien mit meinen\n" + .string "POKéMON. Ja, das tue ich.$" PacifidlogTown_House2_Text_179155:: @ 8179155 .string "Ah!\n" - .string "Your POKéMON...$" + .string "Dein POKéMON...$" PacifidlogTown_House2_Text_179169:: @ 8179169 - .string "It clearly likes you very much.\p" - .string "A POKéMON that adoring and adorable\n" - .string "deserves a TM like this, no?$" + .string "Es mag dich offensichtlich sehr.\p" + .string "Ein derart liebevolles und wunderbares\n" + .string "POKéMON verdient eine TM wie diese!$" PacifidlogTown_House2_Text_1791CA:: @ 81791CA .string "Hmm...\n" - .string "It’s not bad, but it’s also not good.\p" - .string "You, as the TRAINER, need to put in\n" - .string "some more effort.$" + .string "Nicht schlecht... Aber auch nicht gut.\p" + .string "Du musst dich als TRAINER mehr\n" + .string "anstrengen.$" PacifidlogTown_House2_Text_17922D:: @ 817922D - .string "It has a vicious look to it.\p" - .string "A frightening POKéMON like that\n" - .string "deserves a TM like this.$" + .string "Es hat einen bösartigen Blick.\p" + .string "Ein Furcht erregendes POKéMON wie\n" + .string "dieses verdient eine TM wie diese!$" PacifidlogTown_House2_Text_179283:: @ 8179283 - .string "If a POKéMON likes you a lot, RETURN’s\n" - .string "power is enhanced.\p" - .string "If it doesn’t like you, FRUSTRATION’s\n" - .string "power goes up.$" + .string "Wenn ein POKéMON dich sehr mag, wird die\n" + .string "Kraft von RÜCKKEHR verstärkt.\p" + .string "Wenn es dich nicht mag, wird die Kraft\n" + .string "von FRUSTRATION verstärkt.$" PacifidlogTown_House2_Text_1792F2:: @ 81792F2 - .string "Oh, yes. In about {STR_VAR_1} or so days,\n" - .string "I should be getting a good TM or two.\p" - .string "You should come see me then.\n" - .string "I’ll give you a TM that’s suitable for\l" - .string "your POKéMON.$" + .string "Oh, ja. In {STR_VAR_1} Tag/en müsste\n" + .string "ich eine gute TM bekommen haben.\p" + .string "Komm doch dann wieder vorbei.\n" + .string "Ich werde dir dann eine TM geben, die\l" + .string "wunderbar zu deinem POKéMON passt.$" PacifidlogTown_House2_Text_17938B:: @ 817938B .string "AZURILL: Rurii.$" PacifidlogTown_House2_Text_17939B:: @ 817939B - .string "It appears to be very friendly with the\n" - .string "TRAINER.$" + .string "Es scheint freundschaftlich mit dem\n" + .string "TRAINER umzugehen.$" PacifidlogTown_House2_Text_1793CC:: @ 81793CC .string "AZURILL: Rururi!$" PacifidlogTown_House2_Text_1793DD:: @ 81793DD - .string "It doesn’t appear to like the TRAINER\n" - .string "very much.$" + .string "Es scheint den TRAINER nicht\n" + .string "sonderlich zu mögen.$" diff --git a/data/text/maps/PacifidlogTown_House3.inc b/data/text/maps/PacifidlogTown_House3.inc index 1aabc9578..2e0e34d9e 100644 --- a/data/text/maps/PacifidlogTown_House3.inc +++ b/data/text/maps/PacifidlogTown_House3.inc @@ -1,27 +1,27 @@ PacifidlogTown_House3_Text_17940E:: @ 817940E - .string "Hello, TRAINER. Would you do me a favor\n" - .string "and trade POKéMON with me?\p" - .string "Living in PACIFIDLOG, I can only catch\n" - .string "certain kinds of POKéMON.\p" - .string "{STR_VAR_1}? Do you have one?\n" - .string "I’ll trade you my {STR_VAR_2} for it.$" + .string "Hallo, TRAINER. Würdest du POKéMON\n" + .string "mit mir tauschen?\p" + .string "Da ich in FLOSSBRUNN lebe, kann ich nur\n" + .string "bestimmte POKéMON fangen.\p" + .string "{STR_VAR_1}? Hast du das POKéMON?\n" + .string "Ich gebe dir mein {STR_VAR_2} dafür.$" PacifidlogTown_House3_Text_1794C4:: @ 81794C4 .string "Wow!\n" - .string "This {STR_VAR_1} is so fluffy!$" + .string "Das {STR_VAR_1} ist so weich!$" PacifidlogTown_House3_Text_1794DF:: @ 81794DF - .string "That’s no {STR_VAR_1}.$" + .string "Das ist kein {STR_VAR_1}.$" PacifidlogTown_House3_Text_1794ED:: @ 81794ED - .string "I’m a little disappointed...$" + .string "Ich bin ein bisschen enttäuscht.$" PacifidlogTown_House3_Text_17950A:: @ 817950A - .string "Since we traded, you and me,\n" - .string "we’re friends, aren’t we?$" + .string "Seit wir POKéMON getauscht haben, sind\n" + .string "wir Freunde, nicht wahr?$" PacifidlogTown_House3_Text_179541:: @ 8179541 - .string "Is that a POKéDEX?\p" - .string "Did you get to meet a lot of different\n" - .string "POKéMON?\p" - .string "I wish I was like you.$" + .string "Ist das ein POKéDEX?\p" + .string "Hast du schon viele verschiedene\n" + .string "POKéMON getroffen?\p" + .string "Ich wollte, ich wäre wie du.$" diff --git a/data/text/maps/PacifidlogTown_House4.inc b/data/text/maps/PacifidlogTown_House4.inc index 3ca9e5cca..6e1dfb1db 100644 --- a/data/text/maps/PacifidlogTown_House4.inc +++ b/data/text/maps/PacifidlogTown_House4.inc @@ -1,23 +1,24 @@ PacifidlogTown_House4_Text_17959B:: @ 817959B - .string "People were saying they saw a POKéMON\n" - .string "FLYING high above HOENN.\p" - .string "Is it FLYING around all the time?\n" - .string "Doesn’t it need to rest somewhere?$" + .string "Die Menschen sagen, sie hätten ein \n" + .string "POKéMON über HOENN FLIEGEN sehen.\p" + .string "FLIEGT es die ganze Zeit über herum?\n" + .string "Muss es sich nicht ausruhen?$" PacifidlogTown_House4_Text_17961F:: @ 817961F - .string "A sky POKéMON!\n" - .string "A sky POKéMON!$" + .string "Ein Himmels-POKéMON!\n" + .string "Ein Himmels-POKéMON!$" PacifidlogTown_House4_Text_17963D:: @ 817963D - .string "Where did you come from?$" + .string "Woher kommst du?$" PacifidlogTown_House4_Text_179656:: @ 8179656 - .string "Yes?\n" - .string "YES TOWN?\p" - .string "I’ve never heard of a place like that.$" + .string "Ja?\n" + .string "JA-Stadt???\p" + .string "Davon habe ich ja noch nie gehört!$" PacifidlogTown_House4_Text_17968C:: @ 817968C - .string "No? That doesn’t make any sense.\n" - .string "You have to come from somewhere.\p" - .string "Oh! Wait! You’re not going to say you\n" - .string "were born at the bottom of the sea?$" + .string "Nein? Das ergibt doch gar keinen Sinn.\n" + .string "Du musst doch von irgendwo herkommen!\p" + .string "Oh! Warte! Du willst doch nicht etwa be-\n" + .string "haupten, du wärest in den Tiefen des\l" + .string "Meeres geboren???$" diff --git a/data/text/maps/PacifidlogTown_House5.inc b/data/text/maps/PacifidlogTown_House5.inc index 5fc9ca5c5..eaba254c7 100644 --- a/data/text/maps/PacifidlogTown_House5.inc +++ b/data/text/maps/PacifidlogTown_House5.inc @@ -1,14 +1,15 @@ PacifidlogTown_House5_Text_179718:: @ 8179718 - .string "I can’t see MIRAGE ISLAND today...$" + .string "Ich kann WUNDEREILAND heute\n" + .string "nicht sehen...$" PacifidlogTown_House5_Text_17973B:: @ 817973B - .string "Oh! Oh my!\n" - .string "I can see MIRAGE ISLAND today!$" + .string "Oh! Oh! Heute kann ich WUNDEREILAND\n" + .string "sehen!$" PacifidlogTown_House5_Text_179765:: @ 8179765 - .string "MIRAGE ISLAND...\p" - .string "It must become visible and invisible\n" - .string "depending on the weather conditions\l" - .string "that make mirages appear.\p" - .string "Or is it really appearing and\n" - .string "disappearing?$" + .string "WUNDEREILAND...\p" + .string "Die Insel ist sichtbar oder nicht\n" + .string "sichtbar. Das hängt vom Wetter ab, das\l" + .string "Fata Morganen möglich macht oder nicht.\p" + .string "Oder verschwindet die Insel tatsächlich\n" + .string "manchmal?$" diff --git a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc index 9f87c6a54..648c562fe 100644 --- a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -1,17 +1,16 @@ PacifidlogTown_PokemonCenter_1F_Text_178E47:: @ 8178E47 - .string "What color is your TRAINER’S CARD?\n" - .string "Mine’s copper!$" + .string "Welche Farbe hat dein TRAINERPASS?\n" + .string "Meiner ist kupferrot.$" PacifidlogTown_PokemonCenter_1F_Text_178E79:: @ 8178E79 - .string "PACIFIDLOG TOWN floats on top of\n" - .string "a colony of CORSOLA.\p" - .string "If I told you that, would you believe me?$" + .string "FLOSSBRUNN schwimmt auf einer\n" + .string "Kolonie von CORASONN.\p" + .string "Glaubst du mir das?$" PacifidlogTown_PokemonCenter_1F_Text_178ED9:: @ 8178ED9 - .string "The ancestors of the people in\n" - .string "PACIFIDLOG were said to have been\l" - .string "born on boats and then lived and died \l" - .string "aboard them.\p" - .string "I understand that they lived that way\n" - .string "because they were searching for\l" - .string "something.$" + .string "Man sagt, die Vorfahren der Menschen in\n" + .string "FLOSSBRUNN wurden an Bord von\l" + .string "Schiffen geboren, lebten und starben\l" + .string "auch dort.\p" + .string "Diese Lebensart ist verständlich, denn\n" + .string "sie waren auf der Suche nach etwas.$" diff --git a/data/text/maps/PetalburgCity.inc b/data/text/maps/PetalburgCity.inc index fbe00df96..2e8d02124 100644 --- a/data/text/maps/PetalburgCity.inc +++ b/data/text/maps/PetalburgCity.inc @@ -1,44 +1,46 @@ PetalburgCity_Text_16433E:: @ 816433E - .string "Where has our WALLY gone?\p" - .string "We have to leave for VERDANTURF TOWN\n" - .string "very soon...$" + .string "Wohin ist unser HEIKO nur gegangen?\p" + .string "Wir müssen doch bald nach WIESENFLUR\n" + .string "aufbrechen...$" PetalburgCity_Text_16438A:: @ 816438A - .string "Hiya! Are you maybe...\n" - .string "A rookie TRAINER?\p" - .string "Do you know what POKéMON TRAINERS\n" - .string "do when they reach a new town?\p" - .string "They first check what kind of GYM\n" - .string "is in the town.$" + .string "He da! Bist du vielleicht...\n" + .string "Ein Anfänger unter den TRAINERN?\p" + .string "Weißt du, was POKéMON-TRAINER machen,\n" + .string "wenn sie in einen neuen Ort kommen?\p" + .string "Sie sehen sich als Erstes die ARENA\n" + .string "im Ort an.$" PetalburgCity_Text_164426:: @ 8164426 - .string "See? This is PETALBURG CITY’s GYM.$" + .string "Schau. Das ist die ARENA von\n" + .string "BLÜTENBURG CITY.$" PetalburgCity_Text_164449:: @ 8164449 - .string "This is the GYM’s sign. Look for it\n" - .string "whenever you’re looking for a GYM.$" + .string "Das ist das Logo der ARENA. Daran\n" + .string "kannst du immer eine ARENA erkennen.$" PetalburgCity_Text_164490:: @ 8164490 - .string "My face is reflected in the water.\p" - .string "It’s a shining grin full of hope...\p" - .string "Or it could be a look of somber silence\n" - .string "struggling with fear...\p" - .string "What do you see reflected in your face?$" + .string "Mein Gesicht spiegelt sich im Wasser...\p" + .string "Ein schimmerndes Lächeln der Hoffnung.\p" + .string "Oder ist es der Ausdruck düsterer\n" + .string "Stille, an der die Angst nagt...\p" + .string "Was siehst du in deinem Spiegelbild?$" PetalburgCity_Text_16453F:: @ 816453F - .string "Let’s say you have six POKéMON.\n" - .string "If you catch another one...\p" - .string "It is automatically sent to a STORAGE\n" - .string "BOX over a PC connection.$" + .string "Nehmen wir an, du hättest 6 POKéMON.\n" + .string "Wenn du jetzt ein weiteres fängst...\p" + .string "wird es automatisch in das POKéMON-\n" + .string "LAGERUNGS-SYSTEM gesendet.$" PetalburgCity_Text_1645BB:: @ 81645BB - .string "PETALBURG CITY POKéMON GYM\n" - .string "LEADER: NORMAN\l" - .string "“A man in pursuit of power!”$" + .string "POKéMON ARENA von BLÜTENBURG CITY\n" + .string "LEITER: NORMAN\l" + .string "“Ein Mann, der nach Stärke strebt!”$" PetalburgCity_Text_164602:: @ 8164602 - .string "PETALBURG CITY\n" - .string "“Where people mingle with nature.”$" + .string "BLÜTENBURG CITY\n" + .string "“Wo Menschen Hand in Hand\l" + .string "mit der Natur gehen.”$" PetalburgCity_Text_164634:: @ 8164634 - .string "WALLY’S HOUSE$" + .string "HEIKOS HAUS$" diff --git a/data/text/maps/PetalburgCity_Gym.inc b/data/text/maps/PetalburgCity_Gym.inc index bbd072564..1d1ca9db7 100644 --- a/data/text/maps/PetalburgCity_Gym.inc +++ b/data/text/maps/PetalburgCity_Gym.inc @@ -1,411 +1,430 @@ PetalburgCity_Gym_Text_179DF6:: @ 8179DF6 - .string "DAD: Hm?\p" - .string "Well, if it isn’t {PLAYER}!\n" - .string "So you’re all finished moving in?\p" - .string "I’m surprised that you managed to\n" - .string "get here by yourself.\p" - .string "Oh, I see.\n" - .string "You’re with your POKéMON.\p" - .string "Hm... Then I guess you’re going to\n" - .string "become a TRAINER like me, {PLAYER}.\p" - .string "That’s great news!\n" - .string "I’ll be looking forward to it!$" + .string "VATER: Hm?\p" + .string "Na, wenn das nicht {PLAYER} ist!\n" + .string "Dann habt ihr also den Umzug beendet?\p" + .string "Ich bin überrascht, dass du ganz\n" + .string "alleine hierher gefunden hast.\p" + .string "Oh, so ist das.\n" + .string "Du bist in POKéMON-Begleitung.\p" + .string "Ich glaube, du wirst einmal in meine Fuß-\n" + .string "stapfen als TRAINER treten, {PLAYER}.\p" + .string "Das sind großartige Aussichten!\n" + .string "Ich kann es kaum erwarten!$" PetalburgCity_Gym_Text_179F07:: @ 8179F07 - .string "Um... I... I’d like to get a\n" - .string "POKéMON, please...$" + .string "Äh... Ich... Ich hätte so gerne ein\n" + .string "POKéMON. Bitte...$" PetalburgCity_Gym_Text_179F37:: @ 8179F37 - .string "DAD: Hm? You’re... Uh... Oh, right.\n" - .string "You’re WALLY, right?$" + .string "VATER: Wie? Du... Ach... Gut.\n" + .string "Du bist HEIKO, nicht wahr?$" PetalburgCity_Gym_Text_179F70:: @ 8179F70 - .string "WALLY: I’m going to go stay with my\n" - .string "relatives in VERDANTURF TOWN.\p" - .string "I thought I would be lonely by myself,\n" - .string "so I wanted to take a POKéMON along.\p" - .string "But I’ve never caught a POKéMON before.\n" - .string "I don’t know how...$" + .string "HEIKO: Ich werde meine Verwandten\n" + .string "in WIESENFLUR besuchen.\p" + .string "Ich glaube, ich werde mich da doch\n" + .string "einsam fühlen, daher würde ich gerne ein\l" + .string "POKéMON mitnehmen.\p" + .string "Aber ich habe noch nie eines gefangen.\n" + .string "Ich weiß nicht, wie das geht...$" PetalburgCity_Gym_Text_17A03A:: @ 817A03A - .string "DAD: Hm. I see.$" + .string "VATER: Oh, ich verstehe...$" PetalburgCity_Gym_Text_17A04A:: @ 817A04A - .string "DAD: {PLAYER}, you heard that,\n" - .string "right?\p" - .string "Go with WALLY and make sure that he\n" - .string "safely catches a POKéMON.$" + .string "VATER: {PLAYER}, hast du das gehört?\p" + .string "Hilf doch bitte HEIKO dabei,\n" + .string "ein POKéMON zu fangen.$" PetalburgCity_Gym_Text_17A0A8:: @ 817A0A8 - .string "WALLY, here, I’ll loan you my POKéMON.\p" - .string "WALLY received a ZIGZAGOON!$" + .string "HEIKO, hier, ich leihe dir mein\n" + .string "POKéMON.\p" + .string "HEIKO hat ein ZIGZACHS erhalten.$" PetalburgCity_Gym_Text_17A0EB:: @ 817A0EB - .string "WALLY: Oh, wow!\n" - .string "A POKéMON!\p" - .string "DAD: Hm. I’ll give you a POKé BALL, too.\n" - .string "Go for it!\p" - .string "WALLY received a POKé BALL!$" + .string "HEIKO: Oh, wow!!!\n" + .string "Ein POKéMON!\p" + .string "VATER: Hm. Ich gebe dir auch diesen\n" + .string "POKéBALL. Dann leg los!\p" + .string "HEIKO erhält einen POKéBALL!$" PetalburgCity_Gym_Text_17A156:: @ 817A156 - .string "WALLY: Oh, wow!\n" - .string "Thank you!$" + .string "HEIKO: Oh, wow!!!\n" + .string "Danke schön!$" PetalburgCity_Gym_Text_17A171:: @ 817A171 - .string "{PLAYER}... Would you really come\n" - .string "with me?$" + .string "{PLAYER}... Kommst du wirklich mit mir???$" PetalburgCity_Gym_Text_17A196:: @ 817A196 - .string "DAD: So, did it work out?$" + .string "VATER: Und? Hat es geklappt?$" PetalburgCity_Gym_Text_17A1B0:: @ 817A1B0 - .string "WALLY: Thank you, yes, it did.\n" - .string "Here’s your POKéMON back.\p" - .string "{PLAYER}, thank you for coming along\n" - .string "with me.\p" - .string "You two are why I was able to catch\n" - .string "my POKéMON.\p" - .string "I promise I’ll take really good\n" - .string "care of it.\p" - .string "Oh! My mom’s waiting for me, so I\n" - .string "have to go!\p" - .string "Bye, {PLAYER}!$" + .string "HEIKO: Danke. Ja, wunderbar.\n" + .string "Hier haben Sie Ihr POKéMON zurück.\p" + .string "Danke, {PLAYER}, dass du mit mir\n" + .string "gegangen bist.\p" + .string "Euch beiden habe ich es zu verdanken,\n" + .string "dass ich mein erstes POKéMON fangen\l" + .string "konnte.\p" + .string "Ich verspreche, ich werde mich gut\n" + .string "darum kümmern!\p" + .string "Oh! Meine Mama wartet sicher schon auf\n" + .string "mich! Ich muss nach Hause!\p" + .string "Bis bald, {PLAYER}!$" PetalburgCity_Gym_Text_17A2A4:: @ 817A2A4 - .string "DAD: Now...\p" - .string "{PLAYER}, if you want to become a\n" - .string "strong TRAINER, here’s my advice.\p" - .string "Head for RUSTBORO CITY beyond this\n" - .string "town.\p" - .string "There, you should challenge the GYM\n" - .string "LEADER, ROXANNE.\p" - .string "After her, go on to other POKéMON\n" - .string "GYMS and defeat their LEADERS.\p" - .string "Collect BADGES from them,\n" - .string "understood?\p" - .string "Of course, I’m a GYM LEADER, too.\n" - .string "We’ll battle one day, {PLAYER}.\p" - .string "But that’s only after you become\n" - .string "stronger, {PLAYER}.$" + .string "VATER: Nun...\p" + .string "{PLAYER}, wenn du ein guter TRAINER\n" + .string "werden willst - hier ist mein Rat.\p" + .string "Gehe nach METAROST CITY, gleich hinter\n" + .string "diesem Ort.\p" + .string "Dort solltest du die ARENALEITERIN\n" + .string "FELIZIA herausfordern.\p" + .string "Danach suche die anderen POKéMON\n" + .string "ARENEN auf und besiege die LEITER.\p" + .string "Sammle die ORDEN der verschiedenen\n" + .string "ARENEN, verstehst du?\p" + .string "Ich bin natürlich auch ein ARENALEITER.\n" + .string "Auch wir werden eines Tages\l" + .string "gegeneinander antreten.\p" + .string "Aber erst, wenn du stärker geworden\n" + .string "bist, {PLAYER}.$" PetalburgCity_Gym_Text_17A41E:: @ 817A41E - .string "DAD: Hm? Aren’t you going to the\n" - .string "POKéMON GYM in RUSTBORO CITY?\p" - .string "There’s no challenge for me to\n" - .string "battle a greenhorn TRAINER.\p" - .string "{PLAYER}, I want you to challenge me\n" - .string "when you become a lot stronger.\p" - .string "I’ll battle you, {PLAYER}, when you\n" - .string "can show me four GYM BADGES, okay?$" + .string "VATER: Hm? Wolltest du nicht zur\n" + .string "POKéMON ARENA in METAROST CITY?\p" + .string "Für mich ist es keine Herausforderung,\n" + .string "gegen einen Grünschnabel anzutreten.\p" + .string "{PLAYER}, ich möchte, dass du mich he-\n" + .string "rausforderst, sobald du stärker bist.\p" + .string "Ich werde gegen dich kämpfen, {PLAYER},\n" + .string "sobald du vier ORDEN erhalten hast, ja?$" PetalburgCity_Gym_Text_17A518:: @ 817A518 - .string "DAD: I see... So, you’ve beaten the\n" - .string "GYM LEADER in RUSTBORO CITY.\p" - .string "But there are many more TRAINERS\n" - .string "who are stronger than you, {PLAYER}.\p" - .string "Across the sea in DEWFORD TOWN is a\n" - .string "GYM LEADER named BRAWLY.\p" - .string "You should go challenge him.$" + .string "VATER: Oh, ich sehe schon... Du hast die\n" + .string "ARENALEITERIN in METAROST CITY\l" + .string "besiegt.\p" + .string "Aber es gibt weitere TRAINER, die\n" + .string "stärker sind als du, {PLAYER}.\p" + .string "Wenn du das Meer überquerst, kommst du\n" + .string "nach FAUSTAUHAVEN. Dort triffst du auf\l" + .string "den ARENALEITER KAMILLO.\p" + .string "Du solltest ihn wirklich herausfordern...$" PetalburgCity_Gym_Text_17A5F3:: @ 817A5F3 - .string "DAD: Hm... {PLAYER}, you have gotten\n" - .string "stronger.\p" - .string "I can tell by the number of BADGES\n" - .string "that you’ve earned.$" + .string "VATER: Hm... {PLAYER}, du bist stärker\n" + .string "geworden.\p" + .string "Das sehe ich an der Anzahl der ORDEN,\n" + .string "die du dir verdient hast.$" PetalburgCity_Gym_Text_17A653:: @ 817A653 - .string "DAD: Hm...\n" - .string "So, you did get four GYM BADGES.\p" - .string "Fine, as I promised, we will have a\n" - .string "POKéMON battle.\p" + .string "VATER: Hm...\n" + .string "Du besitzt vier ORDEN.\p" + .string "Fein. Wie versprochen werden wir nun\n" + .string "einen POKéMON-Kampf ausfechten.\p" .string "{PLAYER}...\p" - .string "I’m so happy that I can have a \n" - .string "real battle with my own child.\p" - .string "But, a battle is a battle!\p" - .string "I will do everything in my power as\n" - .string "a GYM LEADER to win.\p" - .string "{PLAYER}, you’d better give it your\n" - .string "best shot, too!$" + .string "Ich bin so glücklich, dass mein eigenes\n" + .string "Kind stark genug ist, gegen\l" + .string "mich zu kämpfen!\p" + .string "Aber: Kampf ist Kampf!\p" + .string "Ich werde als ARENALEITER alles tun, um\n" + .string "diesen Kampf zu gewinnen!\p" + .string "{PLAYER}, du solltest ebenfalls dein\n" + .string "Bestes geben!$" PetalburgCity_Gym_Text_17A77A:: @ 817A77A .string "...\p" - .string "I... I can’t...\p" - .string "I can’t believe it. {PLAYER}...\p" - .string "I lost to {PLAYER}?\p" - .string "But, rules are rules!\n" - .string "Here, take this.$" + .string "Ich... Ich kann es nicht...\p" + .string "Ich kann es nicht glauben, {PLAYER}...\p" + .string "Ich habe gegen {PLAYER} verloren?\p" + .string "Nun, Regeln sind Regeln!\n" + .string "Hier, das ist für dich.$" PetalburgCity_Gym_Text_17A7DD:: @ 817A7DD - .string "{PLAYER} received the BALANCE BADGE\n" - .string "from DAD!$" + .string "{PLAYER} hat den BALANCEORDEN vom\n" + .string "VATER erhalten!$" PetalburgCity_Gym_Text_17A805:: @ 817A805 - .string "DAD: With that BADGE, the DEFENSE\n" - .string "of all your POKéMON will increase.\p" - .string "POKéMON that know the HM move SURF\n" - .string "will be able to travel over water.\p" - .string "This is my gift to you. {PLAYER}, I’m\n" - .string "sure you can use it correctly.$" + .string "VATER: Mit diesem ORDEN erhöht sich die\n" + .string "VERTEIDIGUNG all deiner POKéMON.\p" + .string "POKéMON, die die VM SURFER erlernt\n" + .string "haben, können diese auch zum Reisen\l" + .string "über das Wasser einsetzen.\p" + .string "{PLAYER}, das ist mein Geschenk für\n" + .string "dich. Ich bin sicher, du wirst es gut\l" + .string "nutzen.$" PetalburgCity_Gym_Text_17A8CF:: @ 817A8CF - .string "DAD: TM42 contains FACADE.\p" - .string "It doubles the power of moves if\n" - .string "the POKéMON is poisoned, paralyzed,\l" - .string "or burned.\p" - .string "It might be able to turn a bad\n" - .string "situation into an advantage.$" + .string "VATER: TM42 enthält FASSADE.\p" + .string "Sie verdoppelt die Stärke der Attacken,\n" + .string "wenn das POKéMON vergiftet,\l" + .string "paralysiert oder verbrannt wurde.\p" + .string "So kann eine vermeintlich aussichtslose\n" + .string "Situation vielleicht gerettet werden.$" PetalburgCity_Gym_Text_17A976:: @ 817A976 - .string "DAD: As the GYM LEADER, I can’t\n" - .string "express how upset I am...\p" - .string "But as a father, it makes me both\n" - .string "happy and a little sad. It’s odd...$" + .string "VATER: Als ARENALEITER kann ich gar\n" + .string "nicht sagen, wie bestürzt ich bin...\p" + .string "Als Vater macht es mich einerseits sehr\n" + .string "stolz, andererseits aber auch traurig...$" PetalburgCity_Gym_Text_17A9F6:: @ 817A9F6 - .string "DAD: Oh, yes...\p" - .string "WALLY’s parents came calling\n" - .string "earlier.\p" - .string "They said that they had something\n" - .string "they wanted to give you, {PLAYER}.$" + .string "VATER: Oh, ja...\p" + .string "Die Eltern von HEIKO sind vor\n" + .string "kurzem hier gewesen.\p" + .string "Sie sagten, dass sie dir etwas schenken\n" + .string "möchten, {PLAYER}.$" PetalburgCity_Gym_Text_17AA6B:: @ 817AA6B - .string "DAD: {PLAYER}, you should go visit\n" - .string "your mother every so often.\p" - .string "I’m going to stay here and redouble\n" - .string "my training.\p" - .string "It would bother me as a TRAINER to\n" - .string "not avenge my loss to you, {PLAYER}!$" + .string "VATER: {PLAYER}, du solltest deine\n" + .string "Mutter öfter mal besuchen.\p" + .string "Ich bleibe hier und werde mein Training\n" + .string "verdoppeln.\p" + .string "Als TRAINER lässt es mir keine Ruhe. Ich\n" + .string "möchte irgendwann gegen dich gewinnen.$" PetalburgCity_Gym_Text_17AB17:: @ 817AB17 - .string "DAD: {PLAYER}, how are things going?\p" - .string "The world of POKéMON is deep.\p" - .string "I honestly think that no amount of\n" - .string "training would ever be enough.$" + .string "VATER: {PLAYER}! Wie geht es dir?\p" + .string "Die Welt der POKéMON ist vielfältig.\p" + .string "Ich bin überzeugt, dass selbst das \n" + .string "härteste Training dieser Vielfalt nicht\l" + .string "gerecht wird.$" PetalburgCity_Gym_Text_17AB96:: @ 817AB96 - .string "Hey, how’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "The doors in this GYM open when you\n" - .string "beat the awaiting TRAINERS.\p" - .string "Whoops! The doors in this room are\n" - .string "already open, so don’t attack me!\p" - .string "The TRAINERS of PETALBURG GYM use\n" - .string "all kinds of items.\p" - .string "The door at the left leads to the\n" - .string "SPEED ROOM.\p" - .string "The door at the right leads to the\n" - .string "ACCURACY ROOM.\p" - .string "The room’s name will be on the\n" - .string "door, so choose carefully.\p" - .string "Once you’ve chosen the door...\n" - .string "Well, hey, go for it!$" + .string "Na, wie sieht es aus, auf dem Weg zum\n" + .string "CHAMP, {PLAYER}?\p" + .string "Die Türen dieser ARENA öffnen sich,\n" + .string "wenn du die einzelnen TRAINER besiegst.\p" + .string "Huups! Die Türen in diesem Raum sind ja\n" + .string "schon offen, greif mich bitte nicht an!\p" + .string "Die TRAINER der ARENA von BLÜTENBURG\n" + .string "CITY setzen die verschiedensten\l" + .string "Items ein.\p" + .string "Die Tür auf der linken Seite führt in den\n" + .string "INIT.-RAUM.\p" + .string "Die Tür auf der rechten Seite führt in\n" + .string "den RAUM der GENAUIGKEIT.\p" + .string "Die Türen sind beschriftet, lies genau\n" + .string "und treffe eine überlegte Wahl.\p" + .string "Hast du dich für eine Tür entschieden...\n" + .string "Nun, ähm, genug der Worte!$" PetalburgCity_Gym_Text_17AD49:: @ 817AD49 - .string "{PLAYER}! Whoa! You’ve overcome even\n" - .string "your own father!\p" - .string "Like, whoa!\n" - .string "What a stunning turn of events!$" + .string "{PLAYER}! Hui! Du hast sogar deinen\n" + .string "eigenen Vater besiegt!\p" + .string "Wie... Unglaublich!\n" + .string "Die Ereignisse überschlagen sich!$" PetalburgCity_Gym_Text_17ADA5:: @ 817ADA5 - .string "The ability to attack before the\n" - .string "opponent...\p" - .string "Just that alone puts me at a great\n" - .string "advantage, don’t you agree?$" + .string "Die Fähigkeit, dem Gegner mit einer\n" + .string "Attacke zuvorzukommen...\p" + .string "Das alleine gibt einem doch schon einen\n" + .string "enormen Vorteil, meinst du nicht auch?$" PetalburgCity_Gym_Text_17AE11:: @ 817AE11 - .string "That was a magnificent battle!$" + .string "Das war ein unglaublicher Kampf!$" PetalburgCity_Gym_Text_17AE30:: @ 817AE30 - .string "Go on to the next room where a new\n" - .string "challenge awaits you.\p" - .string "At the left is the ZERO REDUCTION\n" - .string "ROOM.\p" - .string "The right door leads to the DEFENSE\n" - .string "ROOM.$" + .string "Geh weiter in den nächsten Raum, wo\n" + .string "eine neue Herausforderung wartet.\p" + .string "Auf der linken Seite befindet sich der\n" + .string "KP-SAUGER-RAUM.\p" + .string "Auf der rechten Seite findest du den\n" + .string "RAUM der VERTEIDIGUNG.$" PetalburgCity_Gym_Text_17AEBB:: @ 817AEBB - .string "Whomever you beat, and whomever you\n" - .string "may lose to, you never shirk from\l" - .string "training yourself and your POKéMON.\p" - .string "That’s what I think being a\n" - .string "GYM LEADER is all about.$" + .string "Ob du siegst oder verlierst... Du darfst\n" + .string "dein Training und das deiner POKéMON\l" + .string "auf keinen Fall vernachlässigen.\p" + .string "Das macht für mich einen wahren\n" + .string "ARENALEITER aus.$" PetalburgCity_Gym_Text_17AF5A:: @ 817AF5A - .string "Don’t waste your time trying to\n" - .string "lower my POKéMON’s abilities!$" + .string "Verschwende deine kostbare Zeit nicht\n" + .string "damit, die Fähigkeiten meines POKéMON\l" + .string "zu blockieren!$" PetalburgCity_Gym_Text_17AF98:: @ 817AF98 - .string "My POKéMON’s abilities weren’t\n" - .string "harmed, but I still lost...$" + .string "Die Fähigkeiten meines POKéMON wurden\n" + .string "nicht blockiert, und doch habe ich\l" + .string "verloren...$" PetalburgCity_Gym_Text_17AFD3:: @ 817AFD3 - .string "The next room is the STRENGTH ROOM.\n" - .string "Can you withstand brute force?$" + .string "Der nächste Raum ist der RAUM der\n" + .string "STÄRKE. Kommst du gegen pure\l" + .string "Gewalt an?$" PetalburgCity_Gym_Text_17B016:: @ 817B016 - .string "After you beat our LEADER, the\n" - .string "training has become a lot tougher.$" + .string "Nachdem du unseren ARENALEITER be-\n" + .string "siegt hast, wurde unser Training härter.$" PetalburgCity_Gym_Text_17B058:: @ 817B058 - .string "Just when you think you’re going to\n" - .string "win, your opponent restores HP...\p" - .string "Can you just imagine how awful that\n" - .string "must feel?\p" - .string "I’ll show you exactly how awful it\n" - .string "feels!$" + .string "Immer, wenn du den Sieg in greifbarer\n" + .string "Nähe siehst, füllt dein Gegner KP auf...\p" + .string "Kannst du dir vorstellen, wie man sich in\n" + .string "so einer Situation fühlt?\p" + .string "Ich werde dir so eine Situation\n" + .string "demonstrieren!$" PetalburgCity_Gym_Text_17B0F7:: @ 817B0F7 - .string "I couldn’t restore HP enough...\n" - .string "What ATTACK power...$" + .string "Ich konnte nicht genügend KP\n" + .string "auffüllen... Welch eine ANGRIFFskraft...$" PetalburgCity_Gym_Text_17B12C:: @ 817B12C - .string "I should have expected no less from\n" - .string "our LEADER’s kid.\p" - .string "No, wait! A TRAINER’s abilities are\n" - .string "earned only through effort.\p" - .string "I lost because my own efforts\n" - .string "weren’t enough.\p" - .string "Go on! The ONE-HIT KO ROOM is next.$" + .string "Ich hatte vom Kind unseres ARENA-\n" + .string "LEITERS nichts anderes erwartet!\p" + .string "Nein! Die Fähigkeiten eines TRAINERS\n" + .string "entwickeln sich mit dem Training.\p" + .string "Ich habe mich offensichtlich nicht\n" + .string "genug angestrengt.\p" + .string "Geh! Der nächste Raum ist der K.O.-\n" + .string "TREFFER-RAUM.$" PetalburgCity_Gym_Text_17B1F4:: @ 817B1F4 - .string "I’m going to keep training at GYMS.\n" - .string "One day, I’ll become a LEADER.$" + .string "Ich werde auch weiterhin in den ARENEN\n" + .string "trainieren. Und ARENALEITER werden!$" PetalburgCity_Gym_Text_17B237:: @ 817B237 - .string "I’m not going to take it easy just\n" - .string "because you’re our LEADER’s kid.\p" - .string "I’ll show you how horrid it is for\n" - .string "a POKéMON to take a critical hit!$" + .string "Ich werde es dir nicht leicht machen,\n" + .string "nur weil du das Kind unseres LEITERS\l" + .string "bist.\p" + .string "Ich werde dir beibringen, was es für ein\n" + .string "POKéMON bedeutet, einen kritischen\l" + .string "Schlag zu erhalten.$" PetalburgCity_Gym_Text_17B2C0:: @ 817B2C0 - .string "Your power...\n" - .string "You’re the real deal.$" + .string "Deine Stärke...\n" + .string "Du kämpfst großartig!$" PetalburgCity_Gym_Text_17B2E4:: @ 817B2E4 - .string "Your father really is strong. He’s\n" - .string "a TRAINER worth my respect.\p" - .string "And, I sense the same glow coming\n" - .string "from you as your father.\p" - .string "I hope that you’ll stage a terrific\n" - .string "battle with your father!$" + .string "Dein Vater ist stark. Als TRAINER\n" + .string "erweise ich ihm den größten Respekt.\p" + .string "Und ich sehe, dass die gleiche Stärke\n" + .string "auch in dir ruht.\p" + .string "Ich fühle, dass du dich nun einem\n" + .string "Kampf mit deinem Vater stellen kannst.$" PetalburgCity_Gym_Text_17B39B:: @ 817B39B - .string "Since your dad became the LEADER,\n" - .string "the TRAINERS of PETALBURG CITY have\l" - .string "become a lot tougher.$" + .string "Seit dein Vater der LEITER der ARENA\n" + .string "von BLÜTENBURG CITY ist, sind die\l" + .string "TRAINER dort viel stärker geworden.$" PetalburgCity_Gym_Text_17B3F7:: @ 817B3F7 - .string "Giggle...\n" - .string "This is the ACCURACY ROOM.\p" - .string "It’s pretty nasty when every attack\n" - .string "lands without fail.$" + .string "Kicher...\n" + .string "Dies ist der RAUM der GENAUIGKEIT.\p" + .string "Es ist schon ziemlich fies, wenn jede\n" + .string "Attacke ein Treffer ist.$" PetalburgCity_Gym_Text_17B454:: @ 817B454 - .string "You were a cut above me...$" + .string "Du bist ein bisschen stärker als ich...$" PetalburgCity_Gym_Text_17B46F:: @ 817B46F - .string "There are some even stronger\n" - .string "TRAINERS waiting for you.\p" - .string "The left is the DEFENSE ROOM, and\n" - .string "the right is the RECOVERY ROOM.\p" - .string "Your POKéMON’s ATTACK power will be\n" - .string "on trial either way.$" + .string "Es warten noch weitaus stärkere\n" + .string "TRAINER auf dich.\p" + .string "Der linke ist der RAUM der VERTEIDIGUNG\n" + .string "und der rechte der RAUM der ERHOLUNG.\p" + .string "Die ATTACKEN deiner POKéMON werden\n" + .string "in beiden Räumen auf die Probe gestellt.$" PetalburgCity_Gym_Text_17B521:: @ 817B521 - .string "Do you know what we’re trying to\n" - .string "achieve as TRAINERS?\p" - .string "We’re striving to become soul mates\n" - .string "with our POKéMON.$" + .string "Weißt du, wonach wir als TRAINER\n" + .string "streben?\p" + .string "Wir streben danach, die Seelenfreunde\n" + .string "unserer POKéMON zu werden.$" PetalburgCity_Gym_Text_17B58D:: @ 817B58D - .string "The higher the DEFENSE, the more\n" - .string "reckless I can be in attack.$" + .string "Je stärker die VERTEIDIGUNG ist, desto\n" + .string "rücksichtsloser kann ich angreifen.$" PetalburgCity_Gym_Text_17B5CB:: @ 817B5CB - .string "Our defenses weren’t enough...$" + .string "Unsere Verteidigung reichte nicht aus...$" PetalburgCity_Gym_Text_17B5EA:: @ 817B5EA - .string "I think you’ve taught me a valuable\n" - .string "lesson here.\p" - .string "Now, go on! The left door goes to\n" - .string "the STRENGTH ROOM.\p" - .string "The right door opens to the\n" - .string "ONE-HIT KO ROOM.\p" - .string "Both of them have TRAINERS who are\n" - .string "offensively skilled.$" + .string "Ich denke, du hast mir eine wertvolle\n" + .string "Lektion erteilt.\p" + .string "Nun, geh weiter. Die linke Tür führt in\n" + .string "den RAUM der STÄRKE.\p" + .string "Die rechte Tür öffnet den K.O.-TREFFER-\n" + .string "RAUM.\p" + .string "In beiden warten äußerst talentierte\n" + .string "TRAINER.$" PetalburgCity_Gym_Text_17B6B5:: @ 817B6B5 - .string "Hi! Have you tried using SURF?$" + .string "Hallo! Hast du mal SURFER ausprobiert?$" PetalburgCity_Gym_Text_17B6D4:: @ 817B6D4 - .string "Our GYM LEADER told us to go all out\n" - .string "and beat you.\p" - .string "Even if you happen to be the\n" - .string "LEADER’s kid!$" + .string "Unser ARENALEITER hat uns angewiesen,\n" + .string "alles zu geben und dich zu besiegen.\p" + .string "Auch wenn du das Kind des LEITERS bist!$" PetalburgCity_Gym_Text_17B732:: @ 817B732 - .string "But... I went all out!$" + .string "Aber... Das war wohl nichts!$" PetalburgCity_Gym_Text_17B749:: @ 817B749 - .string "The way you use your POKéMON...\n" - .string "It’s like your father’s style.\p" - .string "Go on through! The GYM LEADER, your\n" - .string "father, is waiting!$" + .string "Wie du deine POKéMON einsetzt...\n" + .string "Du bist wie dein Vater.\p" + .string "Geh weiter! Der ARENALEITER, dein\n" + .string "Vater, erwartet dich bereits!$" PetalburgCity_Gym_Text_17B7C0:: @ 817B7C0 - .string "Sure, it’s fine to make your POKéMON\n" - .string "stronger.\p" - .string "But what decides the winner?\p" - .string "Why, it’s the feelings TRAINERS have for\n" - .string "their POKéMON.$" + .string "Sicher, es ist immer von Vorteil, die\n" + .string "POKéMON stärker werden zu lassen.\p" + .string "Aber was macht einen Gewinner aus?\p" + .string "Nun, das sind die Gefühle, die ein\n" + .string "TRAINER seinen POKéMON entgegen-\l" + .string "bringt.$" PetalburgCity_Gym_Text_17B844:: @ 817B844 - .string "This door appears to be locked\n" - .string "right now...$" + .string "Die Tür ist noch verschlossen...$" PetalburgCity_Gym_Text_17B870:: @ 817B870 - .string "“SPEED ROOM,” the sign says.\p" - .string "Do you want to go through?$" + .string "“INITIATIVE-RAUM” steht auf\n" + .string "dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" UnknownString_817B8A8: @ 817B8A8 - .string "This door appears to be locked\n" - .string "right now...$" + .string "Die Tür ist noch verschlossen...$" PetalburgCity_Gym_Text_17B8D4:: @ 817B8D4 - .string "“ACCURACY ROOM,” the sign says.\p" - .string "Do you want to go through?$" + .string "“RAUM der GENAUIGKEIT” steht\n" + .string "auf dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" PetalburgCity_Gym_Text_17B90F:: @ 817B90F - .string "“ZERO REDUCTION ROOM,” the sign\n" - .string "says.\p" - .string "Do you want to go through?$" + .string "“KP-SAUGER-RAUM”\n" + .string "steht auf dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" PetalburgCity_Gym_Text_17B950:: @ 817B950 - .string "“DEFENSE ROOM,” the sign says.\p" - .string "Do you want to go through?$" + .string "“RAUM der VERTEIDIGUNG” steht\n" + .string "auf dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" PetalburgCity_Gym_Text_17B98A:: @ 817B98A - .string "“RECOVERY ROOM,” the sign says.\p" - .string "Do you want to go through?$" + .string "“RAUM der ERHOLUNG” steht auf\n" + .string "dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" PetalburgCity_Gym_Text_17B9C5:: @ 817B9C5 - .string "“STRENGTH ROOM,” the sign says.\p" - .string "Do you want to go through?$" + .string "“RAUM der STÄRKE” steht auf\n" + .string "dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" PetalburgCity_Gym_Text_17BA00:: @ 817BA00 - .string "“ONE-HIT KO ROOM,” the sign says.\p" - .string "Do you want to go through?$" + .string "“K.O.-TREFFER-RAUM”\n" + .string "steht auf dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" PetalburgCity_Gym_Text_17BA3D:: @ 817BA3D - .string "“GYM LEADER’S ROOM\p" - .string "“See for yourself what POKéMON await\n" - .string "you!” the sign says.\p" - .string "Do you want to go through?$" + .string "“ARENALEITER”\p" + .string "“Sieh selbst, welche POKéMON dich\n" + .string "erwarten!” steht auf dem Schild.\p" + .string "Möchtest du die Tür öffnen?$" PetalburgCity_Gym_Text_17BAA5:: @ 817BAA5 - .string "PETALBURG CITY POKéMON GYM$" + .string "POKéMON ARENA von BLÜTENBURG CITY$" PetalburgCity_Gym_Text_17BAC0:: @ 817BAC0 - .string "PETALBURG CITY POKéMON GYM\p" - .string "NORMAN’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von BLÜTENBURG CITY\p" + .string "NORMANS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/PetalburgCity_House1.inc b/data/text/maps/PetalburgCity_House1.inc index d41fadd1f..84bc33fed 100644 --- a/data/text/maps/PetalburgCity_House1.inc +++ b/data/text/maps/PetalburgCity_House1.inc @@ -1,16 +1,15 @@ PetalburgCity_House1_Text_17BAFB:: @ 817BAFB - .string "Traveling is wonderful!\p" - .string "When I was young, I roamed the seas\n" - .string "and the mountains!$" + .string "Reisen ist einfach wundervoll!\p" + .string "Als ich noch jung war, waren die See und\n" + .string "die Berge mein Zuhause.$" PetalburgCity_House1_Text_17BB4A:: @ 817BB4A - .string "Sigh...\p" - .string "I wish I could go on an adventure\n" - .string "with some POKéMON...\p" - .string "Crawl through some damp grass...\n" - .string "Climb rocky, rugged mountains...\p" - .string "Cross the raging seas...\n" - .string "Wander about in dark caves...\p" - .string "And, sometimes, even get a little\n" - .string "homesick...\p" - .string "It must be fabulous to travel!$" + .string "Seufz...\p" + .string "Ich wünschte, ich könnte mit einigen\n" + .string "POKéMON auf Abenteuerreise gehen...\p" + .string "Sich durch hohes Gras schleichen...\n" + .string "Steile, zerklüftete Berge erklimmen...\p" + .string "Das tosende Meer überqueren...\n" + .string "Dunkle Höhlen erforschen...\p" + .string "Und manchmal ein wenig Heimweh haben...\p" + .string "Reisen muss einfach toll sein!$" diff --git a/data/text/maps/PetalburgCity_House2.inc b/data/text/maps/PetalburgCity_House2.inc index 426dac360..35af2bb8b 100644 --- a/data/text/maps/PetalburgCity_House2.inc +++ b/data/text/maps/PetalburgCity_House2.inc @@ -1,12 +1,11 @@ PetalburgCity_House2_Text_17BC4F:: @ 817BC4F - .string "NORMAN became our town’s new GYM\n" - .string "LEADER.\p" - .string "I think he called his family over from\n" - .string "the JOHTO region.$" + .string "NORMAN ist unser neuer ARENALEITER.\p" + .string "Ich glaube, er ist mit seiner Familie aus\n" + .string "der JOHTO-Region hier hergezogen.$" PetalburgCity_House2_Text_17BCB1:: @ 817BCB1 - .string "I battled NORMAN once, but, whew,\n" - .string "he was way too strong.\p" - .string "How would I put it?\p" - .string "I just got the feeling that he\n" - .string "lives for POKéMON.$" + .string "Ich bin erst einmal gegen NORMAN\n" + .string "angetreten. Wow, war der stark!\p" + .string "Wie soll ich es sagen?\p" + .string "Ich habe den Eindruck, er lebt für\n" + .string "seine POKéMON.$" diff --git a/data/text/maps/PetalburgCity_Mart.inc b/data/text/maps/PetalburgCity_Mart.inc index d6fcc6fff..988502492 100644 --- a/data/text/maps/PetalburgCity_Mart.inc +++ b/data/text/maps/PetalburgCity_Mart.inc @@ -1,17 +1,16 @@ PetalburgCity_Mart_Text_17BFFD:: @ 817BFFD - .string "Even if a POKéMON is weak now,\n" - .string "it will grow stronger.\p" - .string "The most important thing is love!\n" - .string "Love for your POKéMON!$" + .string "Auch wenn ein POKéMON jetzt noch\n" + .string "schwach ist - es wird ständig stärker.\p" + .string "Das Schlüsselwort heißt Liebe!\n" + .string "Liebe für deine POKéMON!$" PetalburgCity_Mart_Text_17C06C:: @ 817C06C - .string "Do you use REPEL?\n" - .string "It keeps POKéMON away, so it’s\l" - .string "useful when you’re in a hurry.$" + .string "Setzt du SCHUTZ ein?\n" + .string "Das hält POKéMON fern und ist sehr\l" + .string "nützlich, wenn du es eilig hast.$" PetalburgCity_Mart_Text_17C0BC:: @ 817C0BC - .string "Do you have any ANTIDOTES with\n" - .string "you?\p" - .string "If you walk around with a poisoned\n" - .string "POKéMON, it will lose HP until it faints.\l" - .string "Take some ANTIDOTES with you.$" + .string "Hast du etwas GEGENGIFT dabei?\p" + .string "Ein vergiftetes POKéMON verliert\n" + .string "ständig KP, bis es kampfunfähig wird.\l" + .string "Halte deshalb stets GEGENGIFT bereit!$" diff --git a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc b/data/text/maps/PetalburgCity_PokemonCenter_1F.inc index 1c4689672..15235279a 100644 --- a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/text/maps/PetalburgCity_PokemonCenter_1F.inc @@ -1,39 +1,39 @@ PetalburgCity_PokemonCenter_1F_Text_17BD30:: @ 817BD30 - .string "That PC-based POKéMON storage\n" - .string "system...\p" - .string "Whoever made it must be some kind\n" - .string "of a scientific wizard!$" + .string "Computerbasiertes POKéMON-Lagerungs-\n" + .string "System...\p" + .string "Wer auch immer dies entwickelt hat, muss\n" + .string "ein wahrer Zauberer sein!$" PetalburgCity_PokemonCenter_1F_Text_17BD92:: @ 817BD92 - .string "When my POKéMON ate an\n" - .string "ORAN BERRY, it regained HP!$" + .string "Als mein POKéMON eine SINELBEERE\n" + .string "aß, wurden seine KP aufgefüllt!$" PetalburgCity_PokemonCenter_1F_Text_17BDC5:: @ 817BDC5 - .string "There are many types of POKéMON.\p" - .string "All types have their strengths and\n" - .string "weaknesses against other types.\p" - .string "Depending on the types of POKéMON,\n" - .string "a battle could be easy or hard.$" + .string "Es gibt viele Typen von POKéMON.\p" + .string "Jeder Typ hat seine Stärken und\n" + .string "Schwächen gegenüber anderen Typen.\p" + .string "Je nach Typ des POKéMON kann der\n" + .string "Kampf leicht oder schwer sein.$" PetalburgCity_PokemonCenter_1F_Text_17BE6C:: @ 817BE6C - .string "For example, your TREECKO is a\n" - .string "GRASS type.\p" - .string "It’s strong against the WATER and\n" - .string "GROUND types.\p" - .string "But, it’s weak against FIRE-type\n" - .string "POKéMON.$" + .string "Dein GECKARBOR ist beispielsweise ein\n" + .string "PFLANZEN-Typ.\p" + .string "Es ist stark gegenüber dem WASSER-\n" + .string "und BODEN-Typ.\p" + .string "Aber es ist schwach gegenüber den\n" + .string "FEUER-POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_17BEF1:: @ 817BEF1 - .string "For example, your TORCHIC is a\n" - .string "FIRE type.\p" - .string "It’s strong against the GRASS and\n" - .string "BUG types.\p" - .string "But, it’s weak against WATER-type\n" - .string "POKéMON.$" + .string "Dein FLEMMLI ist beispielsweise ein\n" + .string "FEUER-Typ.\p" + .string "Es ist stark gegenüber dem PFLANZEN-\n" + .string "und KÄFER-Typ.\p" + .string "Aber es ist schwach gegenüber den\n" + .string "WASSER-POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_17BF73:: @ 817BF73 - .string "For example, your MUDKIP is a\n" - .string "WATER type.\p" - .string "It’s strong against the FIRE type.\p" - .string "But, it’s weak against GRASS-type\n" - .string "and ELECTRIC-type POKéMON.$" + .string "Dein HYDROPI ist beispielsweise ein\n" + .string "WASSER-Typ.\p" + .string "Es ist stark gegenüber dem FEUER-Typ.\p" + .string "Aber es ist schwach gegenüber den\n" + .string "PFLANZEN- und ELEKTRO-POKéMON.$" diff --git a/data/text/maps/PetalburgCity_WallysHouse.inc b/data/text/maps/PetalburgCity_WallysHouse.inc index 888dfbc91..6eade6f20 100644 --- a/data/text/maps/PetalburgCity_WallysHouse.inc +++ b/data/text/maps/PetalburgCity_WallysHouse.inc @@ -1,72 +1,77 @@ PetalburgCity_WallysHouse_Text_179805:: @ 8179805 - .string "You’re...\n" - .string "Ah, you must be {PLAYER}{KUN}, right?\p" - .string "Thank you for playing with WALLY a\n" - .string "little while ago.\p" - .string "He’s been frail and sickly ever\n" - .string "since he was a baby.\p" - .string "We’ve sent him to stay with my relatives\n" - .string "in VERDANTURF TOWN for a while.\p" - .string "The air is a lot cleaner there\n" - .string "than it is here.\p" - .string "What’s that? Where’s WALLY?\n" - .string "He’s already left, our WALLY.\p" - .string "I wonder where he could have\n" - .string "gotten by now?$" + .string "Du...\n" + .string "Ach, du bist bestimmt {PLAYER}{KUN}, richtig?\p" + .string "Danke, dass du dich um HEIKO gekümmert\n" + .string "hast.\p" + .string "Er war schon als Baby immer zart und\n" + .string "kränklich.\p" + .string "Wir haben ihn für eine Weile zu\n" + .string "Verwandten nach WIESENFLUR\l" + .string "geschickt.\p" + .string "Die Luft ist dort viel sauberer als hier.\p" + .string "Was heißt das? Wo ist HEIKO?\n" + .string "Er ist fort, unser HEIKO?\p" + .string "Ich frage mich, wo er jetzt wohl sein\n" + .string "mag?$" PetalburgCity_WallysHouse_Text_179975:: @ 8179975 - .string "I wonder how our WALLY is doing?$" + .string "Ich frage mich, wie es unserem\n" + .string "HEIKO geht.$" PetalburgCity_WallysHouse_Text_179996:: @ 8179996 - .string "Hi there, {PLAYER}{KUN}!\p" - .string "Our WALLY’s become very healthy\n" - .string "since he went to VERDANTURF TOWN.\p" - .string "We owe it all to you!\p" - .string "When WALLY left town, you helped\n" - .string "him catch a POKéMON, right?\p" - .string "I think that made WALLY really\n" - .string "happy.\p" - .string "Actually, not just WALLY.\n" - .string "It made me, his father, happy too.\p" - .string "Happy that he’s got such a great\n" - .string "friend as you.\p" - .string "This isn’t a bribe or anything, but\n" - .string "I’d really like you to have this.$" + .string "Hallo, {PLAYER}{KUN}!\p" + .string "Unser HEIKO ist viel robuster ge-\n" + .string "worden, seit er in WIESENFLUR ist.\p" + .string "Das verdanken wir allein dir!\p" + .string "Als HEIKO den Ort verließ, hast du\n" + .string "ihm geholfen, ein POKéMON zu fangen,\l" + .string "stimmt’s?\p" + .string "Ich glaube, das hat HEIKO richtig\n" + .string "glücklich gemacht.\p" + .string "Und nicht nur HEIKO. Auch mich als\n" + .string "Vater hat es sehr glücklich gemacht.\p" + .string "Glücklich darüber, dass er einen Freund\n" + .string "wie dich gefunden hat.\p" + .string "Das soll jetzt keine Bestechung sein!\n" + .string "Aber ich möchte dir dies schenken.$" PetalburgCity_WallysHouse_Text_179B14:: @ 8179B14 - .string "If your POKéMON can SURF, you’ll be\n" - .string "able to go to all sorts of places.$" + .string "Wenn dein POKéMON SURFER beherrscht,\n" + .string "kannst du viele neue Orte bereisen.$" PetalburgCity_WallysHouse_Text_179B5B:: @ 8179B5B - .string "WALLY’s coming home soon.\n" - .string "I’m looking forward to that.$" + .string "HEIKO wird bald wieder nach Hause\n" + .string "kommen. Ich freue mich schon so.$" PetalburgCity_WallysHouse_Text_179B92:: @ 8179B92 - .string "Oh? You met WALLY in EVER GRANDE\n" - .string "CITY?\p" - .string "Oh, {PLAYER}{KUN}, don’t be silly.\p" - .string "He may have gotten healthy, but he\n" - .string "can’t go somewhere far away like\l" - .string "that all by himself.$" + .string "Oh! Du hast HEIKO in PRACHTPOLIS CITY\n" + .string "getroffen?\p" + .string "Ach, {PLAYER}{KUN}, du willst mich auf den Arm\n" + .string "nehmen!\p" + .string "Er mag sich gesundheitlich erholt haben,\n" + .string "aber er wird nicht alleine so weit fort-\l" + .string "gegangen sein!$" PetalburgCity_WallysHouse_Text_179C2C:: @ 8179C2C - .string "WALLY was really happy when he told\n" - .string "us that he caught a POKéMON.\p" - .string "It’s been ages since I’ve seen him\n" - .string "smile like that.$" + .string "HEIKO war richtig glücklich, als er\n" + .string "uns erzählte, dass er ein POKéMON\l" + .string "gefangen habe.\p" + .string "Ich habe ihn schon seit Ewigkeiten\n" + .string "nicht mehr so glücklich erlebt!$" PetalburgCity_WallysHouse_Text_179CA1:: @ 8179CA1 - .string "Oh, hello, {PLAYER}! We’ve got\n" - .string "something we want you to have.\p" - .string "My husband has it, so please have a\n" - .string "word with him, dear.$" + .string "Oh, hallo {PLAYER}! Wir haben hier etwas,\n" + .string "das wir dir gerne schenken möchten.\p" + .string "Mein Mann hat es. Sprich doch mal mit\n" + .string "ihm, Liebes.$" PetalburgCity_WallysHouse_Text_179D12:: @ 8179D12 - .string "I want you to keep this a secret\n" - .string "from my husband...\p" - .string "But our WALLY left VERDANTURF TOWN\n" - .string "without telling anyone.\p" - .string "You know, WALLY is frail, but\n" - .string "he’s surprisingly strong-willed.\p" - .string "I’m sure that he’ll come back safe\n" - .string "and sound one day!$" + .string "Ich muss das vor meinem Mann\n" + .string "verheimlichen...\p" + .string "Aber unser HEIKO hat WIESENFLUR\n" + .string "verlassen, ohne jemandem davon zu\l" + .string "erzählen.\p" + .string "Weißt du, HEIKO ist nicht kräftig,\n" + .string "besitzt aber einen starken Willen.\p" + .string "Ich bin sicher, er wird gesund und wohl-\n" + .string "behalten wieder nach Hause kommen.$" diff --git a/data/text/maps/PetalburgWoods.inc b/data/text/maps/PetalburgWoods.inc index 21a04dcc8..da1f43b40 100644 --- a/data/text/maps/PetalburgWoods.inc +++ b/data/text/maps/PetalburgWoods.inc @@ -1,145 +1,152 @@ PetalburgWoods_Text_194D71:: @ 8194D71 .string "Hmmm...\n" - .string "Not a one to be found...$" + .string "Kein Einziges zu finden.$" PetalburgWoods_Text_194D92:: @ 8194D92 - .string "Hello, have you seen any POKéMON\n" - .string "called SHROOMISH around here?\p" - .string "I really love that POKéMON.$" + .string "Hallo, du hast nicht zufällig einige\n" + .string "POKéMON namens KNILZ hier\p" + .string "gesehen? Ich liebe diese POKéMON.$" PetalburgWoods_Text_194DED:: @ 8194DED - .string "I was going to ambush you, but you\n" - .string "had to dawdle in PETALBURG WOODS\l" - .string "forever, didn’t you?\p" - .string "I got sick of waiting, so here I am!$" + .string "Ich wollte dich eigentlich aus dem\n" + .string "Hinterhalt angreifen, aber du trödelst\l" + .string "wohl auf ewig im BLÜTENBURGWALD\l" + .string "herum, oder?\p" + .string "Das Warten machte mich ganz krank.\n" + .string "Also, hier bin ich.$" PetalburgWoods_Text_194E6B:: @ 8194E6B - .string "You! DEVON RESEARCHER!\p" - .string "Hand over those papers!$" + .string "He, du! FORSCHER von DEVON!\p" + .string "Gib sofort die Papiere her!$" PetalburgWoods_Text_194E9A:: @ 8194E9A - .string "Aiyeeeh!\p" - .string "You’re a POKéMON TRAINER, aren’t you?\n" - .string "You’ve got to help me, please!$" + .string "Attackeee!\p" + .string "Du bist ein POKéMON-TRAINER, oder?\n" + .string "Du musst mir bitte helfen!$" PetalburgWoods_Text_194EE8:: @ 8194EE8 - .string "Hunh? What do you think you’re doing?\n" - .string "What, you’re going to protect him?\p" - .string "No one who crosses TEAM {EVIL_TEAM}\n" - .string "gets any mercy, not even a kid!\p" - .string "Come on and battle me!$" + .string "Huch. Was machst du da eigentlich???\n" + .string "Was?!? Du schützt ihn???\p" + .string "Niemand, der sich TEAM {EVIL_TEAM} in den Weg\n" + .string "stellt, kann auf Gnade hoffen. Niemand!\p" + .string "Los, kämpfe gegen uns!$" PetalburgWoods_Text_194F83:: @ 8194F83 - .string "You’re kidding me! You’re tough!$" + .string "Du hast mich geleimt! Du bist stark!$" PetalburgWoods_Text_194FA4:: @ 8194FA4 - .string "Grrr... You’ve got some nerve\n" - .string "meddling with TEAM {EVIL_TEAM}!\l" - .string "Come on and battle me again!\p" - .string "I wish I could say that, but I’m out of\n" - .string "POKéMON...\p" - .string "And, hey, we of TEAM {EVIL_TEAM} are also\n" - .string "after something in RUSTBORO.\p" - .string "I’ll let you go today!$" + .string "Grrr... Du hast vielleicht Nerven, dich\n" + .string "mit TEAM {EVIL_TEAM} anzulegen!\l" + .string "Los, kämpfen wir noch einmal!\p" + .string "Hm, das würde ich jetzt zu gerne sagen,\n" + .string "aber ich habe keine POKéMON mehr...\p" + .string "Außerdem sind wir, TEAM {EVIL_TEAM}, auf dem\n" + .string "Weg nach METAROST CITY.\p" + .string "Für heute lasse ich dich gehen.$" PetalburgWoods_Text_19507E:: @ 819507E - .string "Whew...\n" - .string "That was awfully close!\p" - .string "Thanks to you, he didn’t rob me of\n" - .string "these important papers.\p" - .string "I know, I’ll give you a GREAT BALL as\n" - .string "my thanks!$" + .string "Huuuh...\n" + .string "Das war aber mehr als knapp!\p" + .string "Dank dir konnte er mir diese\n" + .string "wichtigen Papiere nicht rauben.\p" + .string "Ich weiß! Ich gebe dir diesen\n" + .string "SUPERBALL als Dankeschön!$" PetalburgWoods_Text_19510A:: @ 819510A - .string "Didn’t that TEAM {EVIL_TEAM} thug say\n" - .string "they were after something in\l" - .string "RUSTBORO, too?$" + .string "Hat dieser Schuft von TEAM {EVIL_TEAM} nicht\n" + .string "gesagt, dass sie irgendetwas in\l" + .string "METAROST CITY erledigen wollen?$" PetalburgWoods_Text_195153:: @ 8195153 - .string "Uh-oh! It’s a crisis!\n" - .string "I can’t be wasting time!$" + .string "Oh oh! Das ist ein Notfall!\n" + .string "Ich darf keine Zeit verlieren!$" PetalburgWoods_Text_195182:: @ 8195182 - .string "You’re loaded with items.\n" - .string "I can’t give you this GREAT BALL.$" + .string "Du bist mit Items überfrachtet.\n" + .string "Ich kann dir den SUPERBALL nicht geben.$" PetalburgWoods_Text_1951BE:: @ 81951BE - .string "I caught a whole bunch of POKéMON!\p" - .string "Go, go, go!\n" - .string "My BUG POKéMON team!$" + .string "Ich habe eine Menge POKéMON gefangen!\p" + .string "Los, los, los!\n" + .string "Mein KÄFER-POKéMON Team!$" PetalburgWoods_Text_195202:: @ 8195202 - .string "I have all these POKéMON, but I\n" - .string "couldn’t win...$" + .string "Ich habe all diese POKéMON, aber ich\n" + .string "konnte doch nicht gewinnen...$" PetalburgWoods_Text_195232:: @ 8195232 - .string "I caught a bunch of POKéMON.\n" - .string "Now I’m out of POKé BALLS.$" + .string "Ich habe eine Menge POKéMON gefangen.\n" + .string "Nun habe ich keine POKéBÄLLE mehr.$" PetalburgWoods_Text_19526A:: @ 819526A - .string "If you take BUG POKéMON to school,\n" - .string "you get to be instantly popular!$" + .string "Wenn du ein KÄFER-POKéMON mit zur\n" + .string "Schule bringst, bist du sofort beliebt.$" PetalburgWoods_Text_1952AE:: @ 81952AE - .string "I can’t be popular if I lose.$" + .string "Wenn ich verliere, kann ich nicht\n" + .string "beliebt werden.$" PetalburgWoods_Text_1952CC:: @ 81952CC - .string "If you have a big BUG POKéMON, people\n" - .string "respect you for it.$" + .string "Hast du ein großes KÄFER-POKéMON,\n" + .string "werden die Leute dich respektieren.$" PetalburgWoods_Text_195306:: @ 8195306 - .string "My BUG POKéMON have grown.\n" - .string "I’ll be popular again.$" + .string "Meine KÄFER-POKéMON sind gewachsen.\n" + .string "Ich werde wieder beliebt sein.$" PetalburgWoods_Text_195338:: @ 8195338 - .string "I can’t be popular if I lose.$" + .string "Ich werde nie beliebt, wenn ich\n" + .string "immer verliere.$" PetalburgWoods_Text_195356:: @ 8195356 - .string "You get to be popular if you have\n" - .string "strong POKéMON, right?\l" - .string "So, I’ve been training hard.$" + .string "Du wirst beliebt, wenn du starke\n" + .string "POKéMON besitzt, oder?\l" + .string "Daher trainiere ich bis zum Umfallen.$" PetalburgWoods_Text_1953AC:: @ 81953AC - .string "Yo, there!\n" - .string "Your POKéMON doing okay?\p" - .string "If your POKéMON are weak and you want\n" - .string "to avoid battles, you should stay out\l" - .string "of tall grass.$" + .string "Hey, du!\n" + .string "Geht es deinen POKéMON gut?\p" + .string "Wenn deine POKéMON schwach sind und\n" + .string "du Kämpfe vermeiden willst, solltest du\l" + .string "dich von hohem Gras fernhalten.$" PetalburgWoods_Text_19542B:: @ 819542B - .string "Sometimes, there are things on the\n" - .string "ground even if you can’t see them.\p" - .string "That’s why I always check where I’m\n" - .string "walking.$" + .string "Manchmal liegen auf dem Boden Dinge, die\n" + .string "einem auf Anhieb gar nicht auffallen.\p" + .string "Daher schaue ich mich bei jedem Schritt\n" + .string "sorgfältig um.$" PetalburgWoods_Text_19549E:: @ 819549E - .string "Oh, neat!\n" - .string "That’s the BADGE from RUSTBORO GYM!\p" - .string "You must be a TRAINER.\n" - .string "You should try using this item.$" + .string "Oh, hübsch! Das ist der ORDEN\n" + .string "der ARENA in METAROST CITY!\p" + .string "Du siehst wie ein TRAINER aus. Dann\n" + .string "musst du dieses Item ausprobieren.$" PetalburgWoods_Text_195503:: @ 8195503 - .string "It’s a MIRACLE SEED.\n" - .string "If a POKéMON holds that item, its\l" - .string "GRASS-type moves become stronger.\p" - .string "Besides MIRACLE SEED, I think there are\n" - .string "other convenient items for POKéMON\l" - .string "to hold.$" + .string "Das ist WUNDERSAAT.\n" + .string "Wenn ein POKéMON sie trägt, werden\l" + .string "die PFLANZEN-Attacken stärker.\p" + .string "Neben der WUNDERSAAT gibt es bestimmt\n" + .string "noch andere nützliche Items, die von\l" + .string "POKéMON getragen werden können.$" PetalburgWoods_Text_1955B0:: @ 81955B0 - .string "TRAINER TIPS\p" - .string "Any POKéMON that appears even once\n" - .string "in a battle is awarded EXP Points.\p" - .string "To raise a weak POKéMON, put it at the\n" - .string "top of the team list.\p" - .string "As soon as a battle starts, switch it\n" - .string "out. It will earn EXP Points without\l" - .string "being exposed to any harm.$" + .string "TIPPS für TRAINER\p" + .string "Jedes POKéMON, das am Kampf teilnimmt,\n" + .string "erhält ERFAHRUNGSPUNKTE, auch wenn es\l" + .string "nur ganz kurz dabei ist.\p" + .string "Setze eines deiner schwachen POKéMON\n" + .string "daher an die Spitze der Liste.\p" + .string "Sobald der Kampf beginnt, wechselst du\n" + .string "es aus. Es wird E-Punkte bekommen und\l" + .string "bleibt trotzdem immer unbeschadet.$" PetalburgWoods_Text_1956A6:: @ 81956A6 - .string "TRAINER TIPS\p" - .string "In addition to Hit Points (HP), POKéMON\n" - .string "have Power Points (PP) that are used to\l" - .string "make moves during battle.\p" - .string "If a POKéMON runs out of PP, it must be\n" - .string "taken to a POKéMON CENTER.$" + .string "TIPPS für TRAINER\p" + .string "Neben den Kraftpunkten (KP) besitzt\n" + .string "ein POKéMON auch Angriffspunkte (AP),\l" + .string "die für die Attacken im Kampf gebraucht\l" + .string "werden.\p" + .string "Wenn ein POKéMON keine AP mehr besitzt,\n" + .string "muss es in ein POKéMON-CENTER gebracht\l" + .string "werden.$" diff --git a/data/text/maps/Route101.inc b/data/text/maps/Route101.inc index 3bfa1ef6e..bbdbb034d 100644 --- a/data/text/maps/Route101.inc +++ b/data/text/maps/Route101.inc @@ -1,39 +1,40 @@ Route101_Text_16D10E:: @ 816D10E - .string "H-help me!$" + .string "HI... HIIIILFE!!!$" Route101_Text_16D119:: @ 816D119 - .string "Hello! You over there!\n" - .string "Please! Help!\p" - .string "In my BAG!\n" - .string "There’s a POKé BALL!$" + .string "HILFE!!! Du dort drüben!\n" + .string "Bitte! HILFE!!!\p" + .string "In meinem BEUTEL...\n" + .string "Da findest du einen POKéBALL!$" Route101_Text_16D15E:: @ 816D15E - .string "Wh-Where are you going?!\n" - .string "Don’t leave me like this!$" + .string "Wo-Wo wi-willst du hin?\n" + .string "Lass mich nicht im Stich!!!$" Route101_Text_16D191:: @ 816D191 - .string "PROF. BIRCH: Whew...\p" - .string "I was in the tall grass studying wild\n" - .string "POKéMON when I was jumped.\p" - .string "You saved me.\n" - .string "Thanks a lot!\p" + .string "PROF. BIRK: Puuuh...\p" + .string "Ich habe im hohen Gras POKéMON\n" + .string "studiert, als ich angesprungen wurde.\p" + .string "Du hast mich gerettet.\n" + .string "Vielen, vielen Dank!\p" .string "Oh?\p" - .string "Hi, you’re {PLAYER}{KUN}!\p" - .string "This is not the place to chat, so come\n" - .string "by my POKéMON LAB later, okay?$" + .string "Hi, du bist doch {PLAYER}{KUN}!\p" + .string "Aber dies ist nicht der Ort für ein\n" + .string "Schwätzchen, komm doch mit \l" + .string "in mein POKéMON-LABOR, okay?$" Route101_Text_16D25E:: @ 816D25E - .string "If POKéMON get tired, take them to\n" - .string "a POKéMON CENTER.\p" - .string "There’s a POKéMON CENTER in OLDALE\n" - .string "TOWN right close by.$" + .string "Sind deine POKéMON müde, bring sie in\n" + .string "ein POKéMON-CENTER.\p" + .string "In ROSALTSTADT, gleich hier um die\n" + .string "Ecke, gibt es ein POKéMON-CENTER.$" Route101_Text_16D2CB:: @ 816D2CB - .string "Wild POKéMON will jump out at you in\n" - .string "tall grass.\p" - .string "If you want to catch POKéMON, you have\n" - .string "to go into the tall grass and search.$" + .string "Wilde POKéMON springen dich in hohem\n" + .string "Gras gerne an.\p" + .string "Wenn du POKéMON fangen willst, musst\n" + .string "du ins hohe Gras gehen und sie suchen.$" Route101_Text_16D349:: @ 816D349 .string "ROUTE 101\n" - .string "{0x79} OLDALE TOWN$" + .string "{UP_ARROW} ROSALTSTADT$" diff --git a/data/text/maps/Route102.inc b/data/text/maps/Route102.inc index cf367edc2..c544db7d5 100644 --- a/data/text/maps/Route102.inc +++ b/data/text/maps/Route102.inc @@ -1,43 +1,43 @@ PetalburgCity_Text_16D361:: @ 816D361 - .string "WALLY: {PLAYER}...\n" - .string "POKéMON hide in tall grass like this,\l" - .string "don’t they?\p" - .string "Please watch me and see if I can\n" - .string "catch one properly.\p" + .string "HEIKO: {PLAYER}...\n" + .string "POKéMON verstecken sich in hohem Gras\l" + .string "wie diesem hier, oder?\p" + .string "Bitte bleib hier und schau, ob ich sie\n" + .string "auch richtig fange.\p" .string "...Whoa!$" PetalburgCity_Text_16D3DE:: @ 816D3DE - .string "WALLY: I did it... It’s my...\n" - .string "My POKéMON!$" + .string "HEIKO: Ich habe es geschafft... Es\n" + .string "gehört mir... Mein POKéMON!!!$" PetalburgCity_Text_16D408:: @ 816D408 - .string "{PLAYER}, thank you!\n" - .string "Let’s go back to the GYM!$" + .string "{PLAYER}, danke schön!\n" + .string "Lass uns zurück zur ARENA gehen!$" Route102_Text_16D431:: @ 816D431 - .string "I’m...not very tall, so I sink right\n" - .string "into tall grass.\p" - .string "The grass goes up my nose and...\n" - .string "Fwafwafwafwafwa...\p" - .string "Fwatchoo!$" + .string "Ich... bin nicht groß, ich versinke im\n" + .string "hohen Gras.\p" + .string "Das Gras erreicht meine Nase und...\n" + .string "Hahahaha...\p" + .string "Haaatschiiii!$" UnknownString_816D4A5: @ 816D4A5 - .string "Fufufufu...\n" - .string "Watch me.$" + .string "Hähähä...\n" + .string "Beobachte mich gut.$" UnknownString_816D4BB: @ 816D4BB - .string "Ta-daaaah! Awesome, huh?\p" - .string "There are some ledges that you can’t\n" - .string "climb up, but you can jump down.$" + .string "Ta-daaaaah! Unglaublich, oder?\p" + .string "Es gibt einige Absätze, die man nicht\n" + .string "hochklettern, aber von denen man\l" + .string "herunterspringen kann.$" Route102_Text_16D51A:: @ 816D51A - .string "I’m going to catch a whole bunch of\n" - .string "POKéMON!$" + .string "Ich werde jede Menge POKéMON fangen!$" Route102_Text_16D547:: @ 816D547 .string "ROUTE 102\n" - .string "{0x7C} OLDALE TOWN$" + .string "{RIGHT_ARROW} ROSALTSTADT$" Route102_Text_16D55F:: @ 816D55F .string "ROUTE 102\n" - .string "{0x7B} PETALBURG CITY$" + .string "{LEFT_ARROW} BLÜTENBURG CITY$" diff --git a/data/text/maps/Route103.inc b/data/text/maps/Route103.inc index ebdedea82..e6e6481b3 100644 --- a/data/text/maps/Route103.inc +++ b/data/text/maps/Route103.inc @@ -1,64 +1,66 @@ Route103_Text_16D57A:: @ 816D57A - .string "MAY: Let’s see... The POKéMON found\n" - .string "on ROUTE 103 include...$" + .string "MAIKE: Mal seh’n... Das POKéMON von\n" + .string "ROUTE 103 besitzt...$" Route103_Text_16D5B6:: @ 816D5B6 - .string "Oh, hi, {PLAYER}{KUN}!\p" - .string "...Oh, I see, my dad gave you a\n" - .string "POKéMON as a gift.\p" - .string "Since we’re here, let’s have a quick\n" - .string "battle!\p" - .string "I’ll give you a taste of what being a\n" - .string "TRAINER is like.$" + .string "Oh, hi {PLAYER}{KUN}!\p" + .string "...Oh... Ich seh’ schon. Mein Vater hat dir\n" + .string "ein POKéMON geschenkt.\p" + .string "Wenn wir schon mal hier sind, lass uns\n" + .string "doch kämpfen!\p" + .string "Ich gebe dir einen Vorgeschmack auf\n" + .string "das Leben als TRAINER.$" Route103_Text_16D65B:: @ 816D65B - .string "Wow! That’s great!\n" - .string "{PLAYER}{KUN}, you’re pretty good!$" + .string "Wow! Das war spitze!\n" + .string "{PLAYER}{KUN}, du bist ein Naturtalent!$" Route103_Text_16D688:: @ 816D688 - .string "MAY: I think I know why my dad has an\n" - .string "eye out for you now.\p" - .string "I mean, you just got that POKéMON but\n" - .string "it already likes you.\p" - .string "You might be able to befriend any\n" - .string "kind of POKéMON easily.\p" - .string "Well, it’s time to head back to the\n" - .string "LAB.$" + .string "MAIKE: Ich glaube, ich weiß jetzt, warum\n" + .string "mein Vater dich ausgesucht hat.\p" + .string "Ich meine, du hast dein POKéMON erst\n" + .string "sehr kurze Zeit und es mag dich bereits.\p" + .string "Du wirst es einfach haben, dich mit\n" + .string "jeder Art von POKéMON anzufreunden.\p" + .string "Nun wird es aber Zeit, zurück ins LABOR\n" + .string "zu gehen!$" Route103_Text_16D762:: @ 816D762 - .string "BRENDAN: Okay, so it’s this one and\n" - .string "that one that live on ROUTE 103...$" + .string "BRIX: So... Dieses und dieses lebt an\n" + .string "der ROUTE 103...$" Route103_Text_16D7A9:: @ 816D7A9 - .string "Hey, it’s {PLAYER}!\p" - .string "...Oh, yeah, Dad gave you a POKéMON.\p" - .string "Since we’re here, how about a little\n" - .string "battle?\p" - .string "I’ll teach you what being a TRAINER’s\n" - .string "about!$" + .string "Hey, da ist ja {PLAYER}!\p" + .string "...Oh ja. Mein Vater hat dir ein POKéMON\n" + .string "geschenkt, nicht wahr?\p" + .string "Wenn wir schon mal hier sind, lass uns\n" + .string "doch einen kleinen Kampf austragen.\p" + .string "Ich bringe dir bei, was ein TRAINER\n" + .string "wissen muss.$" Route103_Text_16D836:: @ 816D836 - .string "Huh, {PLAYER}, you’re not too shabby.$" + .string "Hey, {PLAYER}, das war gar nicht so übel.$" Route103_Text_16D856:: @ 816D856 - .string "BRENDAN: I think I get it.\n" - .string "I think I know why my dad has his eye\l" - .string "out for you now.\p" - .string "Look, your POKéMON already likes you,\n" - .string "even though you just got it.\p" - .string "{PLAYER}, I get the feeling that you\n" - .string "could befriend any POKéMON with ease.\p" - .string "We should head back to the LAB.$" + .string "BRIX: Ich denke, ich habe es kapiert.\n" + .string "Ich weiß jetzt, warum mein Vater dich\l" + .string "ausgesucht hat.\p" + .string "Du hast dein POKéMON noch nicht lange,\n" + .string "und doch mag es dich schon.\p" + .string "{PLAYER}, ich glaube, du kannst mit jedem\n" + .string "POKéMON Freundschaft schließen.\p" + .string "Wir sollten nun zurück zum LABOR gehen.$" Route103_Text_16D950:: @ 816D950 - .string "My POKéMON is staggeringly tired...\n" - .string "I should have brought a POTION...$" + .string "Mein POKéMON ist unglaublich müde...\n" + .string "Ich hätte einen TRANK mitnehmen sollen.$" Route103_Text_16D996:: @ 816D996 - .string "If you cross the sea from here,\n" - .string "it’ll be a shortcut to OLDALE TOWN.\p" - .string "Fufufu, that’s useful, isn’t it?$" + .string "Wenn du von hier das Meer überquerst,\n" + .string "nimmst du eine Abkürzung nach\l" + .string "ROSALTSTADT.\p" + .string "Hahaha, ist das kein praktischer Tipp?$" Route103_Text_16D9FB:: @ 816D9FB .string "ROUTE 103\n" - .string "{0x7A} OLDALE TOWN$" + .string "{DOWN_ARROW} ROSALTSTADT$" diff --git a/data/text/maps/Route104.inc b/data/text/maps/Route104.inc index 95f70a7ec..e8378ca4b 100644 --- a/data/text/maps/Route104.inc +++ b/data/text/maps/Route104.inc @@ -1,81 +1,88 @@ Route104_Text_16DA13:: @ 816DA13 - .string "That seaside cottage is where\n" - .string "MR. BRINEY lives.\p" - .string "He was once a mighty sailor who never\n" - .string "feared the sea, however stormy.$" + .string "In dieser Hütte am Meer lebt MR. BRACK.\p" + .string "Er war einst ein stolzer Seemann, der\n" + .string "niemals Angst vor dem Meer hatte.$" Route104_Text_16DA89:: @ 816DA89 - .string "The sea, huh?\p" - .string "I wonder what it’s like at the bottom\n" - .string "of the sea?$" + .string "Das Meer, was?\p" + .string "Ich möchte zu gerne wissen, wie es auf\n" + .string "dem Meeresgrund aussieht...$" Route104_Text_16DAC9:: @ 816DAC9 - .string "If you’re going to throw a POKé BALL,\n" - .string "weaken the wild POKéMON first.\p" - .string "It will be easier to catch if it’s been\n" - .string "poisoned, burned, or lulled to sleep.$" + .string "Bevor du einen POKéBALL wirfst,\n" + .string "schwäche das POKéMON erst.\p" + .string "Wenn es vergiftet ist, eine Verbrennung\n" + .string "hat oder schläft, kann es leichter\l" + .string "gefangen werden.$" Route104_Text_16DB5C:: @ 816DB5C - .string "You’re a thief if you try to steal\n" - .string "someone else’s POKéMON.\p" - .string "You should throw POKé BALLS only at\n" - .string "wild POKéMON.$" + .string "Du bist ein gemeiner Dieb, wenn du ver-\n" + .string "suchst, das POKéMON eines anderen zu\l" + .string "stehlen.\p" + .string "Du solltest deine POKéBÄLLE nur auf\n" + .string "wilde POKéMON werfen.$" Route104_Text_16DBC9:: @ 816DBC9 - .string "Oh, no, I’m not a TRAINER.\p" - .string "But that’s right, if TRAINERS lock eyes,\n" - .string "it’s a challenge to battle.\p" - .string "If you don’t want to battle, stay out\n" - .string "of their sight.$" + .string "Oh, nein, ich bin kein TRAINER.\p" + .string "Aber es stimmt schon, wenn TRAINER sich\n" + .string "in die Augen schauen, ist das eine\l" + .string "Herausforderung zum Kampf.\p" + .string "Willst du nicht kämpfen, weiche ihren\n" + .string "Blicken aus.$" Route104_Text_16DC5F:: @ 816DC5F - .string "I like filling my mouth with seeds,\n" - .string "then spitting them out fast!\p" - .string "You can have this, so you try it out!\p" - .string "Use it on a POKéMON, and it will learn\n" - .string "a move for firing seeds rapidly.$" + .string "Ich liebe es, meinen Mund voller\n" + .string "Saatkörner zu nehmen und sie dann in\l" + .string "hohem Bogen auszuspucken.\p" + .string "Du kannst dies hier haben, versuch es\n" + .string "einfach mal!\p" + .string "Wende es an einem POKéMON an und es\n" + .string "wird lernen, in schneller Folge\l" + .string "Saatkörner auszuspucken.$" Route104_Text_16DD0E:: @ 816DD0E - .string "A word of advice!\p" - .string "A TM, TECHNICAL MACHINE, is good only\n" - .string "for one-time use.\p" - .string "Once you use it, it’s gone.\n" - .string "Think twice before using it!$" + .string "Ein Hinweis noch!\p" + .string "Eine TM, eine TECHNISCHE MASCHINE,\n" + .string "kann nur einmal beigebracht werden.\p" + .string "Einmal verwendet, ist sie weg. Denke\n" + .string "zweimal nach, bevor du eine TM nutzt.$" Route104_Text_16DD91:: @ 816DD91 - .string "This FLOWER SHOP started selling\n" - .string "saplings recently.\p" - .string "It made me so happy, I went overboard\n" - .string "shopping. I don’t need this WHITE HERB\l" - .string "anymore. Would you take it, please?$" + .string "Der BLUMENLADEN verkauft seit kurzem\n" + .string "junge Bäume.\p" + .string "Das macht mich so glücklich, dass ich\n" + .string "ganz viele gekauft habe. Dieses SCHLOH-\l" + .string "KRAUT brauche ich nicht, das schenke\l" + .string "ich dir.$" Route104_Text_16DE36:: @ 816DE36 - .string "This FLOWER SHOP started selling\n" - .string "saplings recently.\p" - .string "It made me so happy, I went overboard\n" - .string "shopping. Where should I put them?$" + .string "Der BLUMENLADEN verkauft seit kurzem\n" + .string "junge Bäume.\p" + .string "Das macht mich so glücklich, dass ich\n" + .string "ganz viele gekauft habe. Wohin damit?$" Route104_Text_16DEB3:: @ 816DEB3 - .string "MR. BRINEY’S COTTAGE$" + .string "MR. BRACKS HÜTTE$" Route104_Text_16DEC8:: @ 816DEC8 - .string "ROUTE 1O4\n" - .string "{0x7C} PETALBURG CITY$" + .string "ROUTE 104\n" + .string "{RIGHT_ARROW} BLÜTENBURG CITY$" Route104_Text_16DEE3:: @ 816DEE3 - .string "ROUTE 1O4\n" - .string "{0x79} RUSTBORO CITY$" + .string "ROUTE 104\n" + .string "{UP_ARROW} METAROST CITY$" Route104_Text_16DEFD:: @ 816DEFD - .string "PRETTY PETAL FLOWER SHOP$" + .string "BLÜTENTRAUM BLUMENLADEN$" Route104_Text_16DF16:: @ 816DF16 - .string "TRAINER TIPS\p" - .string "In the HOENN region there are pairs\n" - .string "of TRAINERS who challenge others\l" - .string "for 2-on-2 POKéMON battles called\l" - .string "DOUBLE BATTLES.\p" - .string "In a DOUBLE BATTLE, the TRAINER must\n" - .string "send out two POKéMON, the one at the\l" - .string "left of the list and the top one.\l" - .string "Watch how POKéMON are lined up.$" + .string "TIPPS für TRAINER\p" + .string "In der HOENN-Region gibt es Paare von\n" + .string "TRAINERN, die andere zu einem\l" + .string "2-gegen-2 POKéMON-Kampf, einem\l" + .string "DOPPELKAMPF, herausfordern.\p" + .string "In einem DOPPELKAMPF muss der TRAINER\n" + .string "zwei POKéMON antreten lassen. Das \l" + .string "POKéMON links neben der Liste und das\l" + .string "an der Spitze der Liste. Achte also auf\l" + .string "die Reihenfolge der POKéMON.$" diff --git a/data/text/maps/Route104_MrBrineysHouse.inc b/data/text/maps/Route104_MrBrineysHouse.inc index 37fd0c0e1..8d3e36750 100644 --- a/data/text/maps/Route104_MrBrineysHouse.inc +++ b/data/text/maps/Route104_MrBrineysHouse.inc @@ -1,67 +1,71 @@ Route104_MrBrineysHouse_Text_191A82:: @ 8191A82 - .string "MR. BRINEY: Hold on, lass!\n" - .string "Wait up, PEEKO!$" + .string "MR. BRACK: Warte, Mädchen!\n" + .string "Immer langsam, PECKO!$" Route104_MrBrineysHouse_Text_191AAD:: @ 8191AAD - .string "Hm? You’re {PLAYER}{KUN}!\n" - .string "You saved my darling PEEKO!\l" - .string "We owe so much to you!\p" - .string "What’s that?\n" - .string "You want to sail with me?\p" + .string "Hm? Du bist {PLAYER}{KUN}!\n" + .string "Du hast meinen Liebling PECKO gerettet!\l" + .string "Wir verdanken dir sehr viel!\p" + .string "Wie bitte?\n" + .string "Du möchtest mit mir segeln?\p" .string "Hmhm...\p" - .string "You have a LETTER bound for DEWFORD\n" - .string "and a package for SLATEPORT, then?\p" - .string "Quite the busy life you must lead!\p" - .string "But, certainly, what you’re asking is\n" - .string "no problem at all.\p" - .string "You’ve come to the right man!\n" - .string "We’ll set sail for DEWFORD.$" + .string "Du musst einen BRIEF in FAUSTAUHAVEN\n" + .string "und ein Paket in GRAPHITPORT CITY\l" + .string "abgeben?\p" + .string "Da bist du aber gut beschäftigt!\p" + .string "Aber deine Bitte ist überhaupt kein\n" + .string "Problem für mich.\p" + .string "Bei mir bist du richtig! Wir setzen\n" + .string "Segel Richtung FAUSTAUHAVEN!$" Route104_MrBrineysHouse_Text_191BFD:: @ 8191BFD - .string "MR. BRINEY: DEWFORD, here we come!\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "MR. BRACK: FAUSTAUHAVEN, wir kommen!\p" + .string "Anker gelichtet!\n" + .string "PECKO, mein Liebling, wir setzen Segel!$" Route104_MrBrineysHouse_Text_191C57:: @ 8191C57 - .string "MR. BRINEY: Is that so?\n" - .string "Your deliveries can wait?\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail!$" + .string "MR. BRACK: Wirklich?\n" + .string "Deine Besorgungen können warten?\p" + .string "Lass dir Zeit. Ein Wort genügt und wir\n" + .string "setzen Segel.$" Route104_MrBrineysHouse_Text_191CC3:: @ 8191CC3 - .string "MR. BRINEY: Ahoy!\n" - .string "I know exactly what you want to say!\p" - .string "You’re to deliver a LETTER to DEWFORD\n" - .string "and a package to SLATEPORT.\p" - .string "What you need me to do is no problem\n" - .string "at all - I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" + .string "MR. BRACK: Ahoi! Ich weiß genau,\n" + .string "was du jetzt sagen willst!\p" + .string "Du musst einen BRIEF in FAUSTAUHAVEN\n" + .string "und ein Paket in GRAPHITPORT CITY\l" + .string "abgeben.\p" + .string "Nun, ich bin der richtige Mann für\n" + .string "diesen Job!\p" + .string "Dann segeln wir zuerst Richtung\n" + .string "FAUSTAUHAVEN.$" Route104_MrBrineysHouse_Text_191DA6:: @ 8191DA6 - .string "MR. BRINEY: Ahoy!\n" - .string "I know exactly what you want to say!\p" - .string "You’re to deliver a package to\n" - .string "CAPT. STERN in SLATEPORT.\p" - .string "What you need me to do is no problem\n" - .string "at all - I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" + .string "MR. BRACK: Ahoi! Ich weiß genau,\n" + .string "was du jetzt sagen willst!\p" + .string "Du musst KAPT. BRIGG in\n" + .string "GRAPHITPORT CITY ein Paket bringen.\p" + .string "Nun, ich bin der richtige Mann für\n" + .string "diesen Job!\p" + .string "Dann segeln wir zuerst Richtung\n" + .string "FAUSTAUHAVEN.$" Route104_MrBrineysHouse_Text_191E80:: @ 8191E80 - .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" - .string "Now, my friend, where are we bound?$" + .string "MR. BRACK: Ahoi! Für dich fahre ich\n" + .string "jederzeit wieder raus!\p" + .string "Nun, wo soll es hingehen?$" Route104_MrBrineysHouse_Text_191EDB:: @ 8191EDB - .string "MR. BRINEY: Is that so?\n" - .string "Well, PEEKO owes her life to you.\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail!$" + .string "MR. BRACK: Wirklich?\n" + .string "Nun, PECKO verdankt dir ihr Leben.\p" + .string "Lass dir Zeit. Ein Wort genügt und wir\n" + .string "setzen Segel.$" UnknownString_8191F4F: @ 8191F4F - .string "MR. BRINEY: Ahoy!\n" - .string "We’ve made land in PETALBURG!\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail!$" + .string "MR. BRACK: Ahoi!\n" + .string "Wir haben in BLÜTENBURG CITY angelegt.\p" + .string "Lass dir Zeit. Ein Wort genügt und wir\n" + .string "setzen Segel.$" Route104_MrBrineysHouse_Text_191FB9:: @ 8191FB9 - .string "PEEKO: Pii pihyoroo!$" + .string "PECKO: Pii pihyoroo!$" diff --git a/data/text/maps/Route104_Prototype.inc b/data/text/maps/Route104_Prototype.inc index 7ce19f609..447d6a1ea 100644 --- a/data/text/maps/Route104_Prototype.inc +++ b/data/text/maps/Route104_Prototype.inc @@ -1,115 +1,115 @@ Route104_Prototype_Text_19AD9B:: @ 819AD9B - .string "Oh? You look like a good TRAINER.\n" - .string "Will you look at my POKéMON?$" + .string "Oh! Du siehst wie ein guter TRAINER aus.\n" + .string "Schaust du dir mal meine POKéMON an?$" Route104_Prototype_Text_19ADDA:: @ 819ADDA - .string "I’m not good enough for you.$" + .string "Ich bin nicht gut genug für dich.$" Route104_Prototype_Text_19ADF7:: @ 819ADF7 - .string "I enjoyed our battle very much.\n" - .string "Please battle with me some other time.$" + .string "Ich habe den Kampf richtig genossen.\n" + .string "Bitte kämpfe bald wieder mit mir.$" Route104_Prototype_Text_19AE3E:: @ 819AE3E - .string "Go!\n" - .string "Go, our POKéMON!$" + .string "Los!\n" + .string "Los, POKéMON!$" Route104_Prototype_Text_19AE53:: @ 819AE53 - .string "Oh... We couldn’t win.$" + .string "Oh... Wir hatten keine Chance.$" Route104_Prototype_Text_19AE6A:: @ 819AE6A - .string "Did it surprise you that two POKéMON\n" - .string "battled at the same time?$" + .string "Überrascht es dich, dass zwei POKéMON\n" + .string "zur gleichen Zeit kämpften?$" Route104_Prototype_Text_19AEA9:: @ 819AEA9 - .string "You can’t battle with us if you have\n" - .string "only one POKéMON.\l" - .string "Why? Because we’re strong!$" + .string "Du kannst nicht mit uns kämpfen, wenn\n" + .string "du nur ein POKéMON hast. Warum nicht?\l" + .string "Nun, weil wir stark sind!$" Route104_Prototype_Text_19AEFB:: @ 819AEFB - .string "Hey, hey! This is my first battle in\n" - .string "a while. I’ll give it my all!$" + .string "Hey, hey! Das ist seit langer Zeit mein\n" + .string "erster Kampf. Ich gebe mein Bestes!$" Route104_Prototype_Text_19AF3E:: @ 819AF3E - .string "But I gave it my all...$" + .string "Ich habe doch mein Bestes gegeben...$" Route104_Prototype_Text_19AF56:: @ 819AF56 - .string "You’re far too strong!\n" - .string "You must be a great TRAINER!$" + .string "Du bist viel zu stark!\n" + .string "Du musst ein großer TRAINER sein!$" Route104_Prototype_Text_19AF8A:: @ 819AF8A - .string "My POKéMON are extremely cute and\n" - .string "extremely strong.\l" - .string "Please allow me to show you.$" + .string "Meine POKéMON sind sehr niedlich und\n" + .string "sehr stark.\l" + .string "Das möchte ich dir gerne zeigen.$" Route104_Prototype_Text_19AFDB:: @ 819AFDB - .string "I must concede defeat.\n" - .string "After all, you are strong.$" + .string "Ich gebe mich geschlagen.\n" + .string "Du bist wirklich stark.$" Route104_Prototype_Text_19B00D:: @ 819B00D - .string "The next time we meet, I will have raised\n" - .string "my POKéMON much more.\p" - .string "Don’t expect mercy then!$" + .string "Wenn wir uns das nächste Mal treffen, \n" + .string "werden meine POKéMON stärker sein!\p" + .string "Und erwarte dann keine Gnade!$" Route104_Prototype_Text_19B066:: @ 819B066 - .string "We HIKERS are always full of energy!\n" - .string "My POKéMON are also full of energy, too.\l" - .string "We’re always itching for a battle!$" + .string "Wir WANDERER sind stets voller Energie!\n" + .string "Auch meine POKéMON sind voller Energie!\l" + .string "Wir sind stets auf einen Kampf aus!$" Route104_Prototype_Text_19B0D7:: @ 819B0D7 - .string "We ran out of energy...$" + .string "Uns ist die Energie ausgegangen...$" Route104_Prototype_Text_19B0EF:: @ 819B0EF - .string "Wahahah! Sure, we lost!\n" - .string "But we had a great battle, didn’t we?\l" - .string "We’re satisfied with that!$" + .string "Hahahaha! Natürlich, wir haben verloren.\n" + .string "Aber es war ein toller Kampf, oder?\l" + .string "Wir sind jedenfalls zufrieden damit!$" Route104_Prototype_Text_19B148:: @ 819B148 - .string "You look like a strong TRAINER,\n" - .string "but can you beat us?$" + .string "Du siehst wie ein starker TRAINER aus,\n" + .string "aber kannst du uns auch schlagen?$" Route104_Prototype_Text_19B17D:: @ 819B17D .string "Waaah!\n" - .string "We lost!$" + .string "Wir haben verloren!$" Route104_Prototype_Text_19B18D:: @ 819B18D - .string "If two POKéMON can battle at the same\n" - .string "time, all sorts of new things can happen.$" + .string "Wenn zwei POKéMON zur gleichen Zeit\n" + .string "kämpfen können, ist alles möglich.$" Route104_Prototype_Text_19B1DD:: @ 819B1DD - .string "Do you only have one POKéMON that can\n" - .string "battle?\p" - .string "Then we can’t battle with you yet.$" + .string "Hast du nur ein POKéMON, das\n" + .string "kämpfen kann?\p" + .string "Dann können wir nicht mit dir kämpfen.$" Route104_Prototype_Text_19B22E:: @ 819B22E - .string "Have you tried beating all the other\n" - .string "TRAINERS in battle?$" + .string "Hast du versucht, alle anderen TRAINER\n" + .string "im Kampf zu besiegen?$" Route104_Prototype_Text_19B267:: @ 819B267 - .string "Thanks for coming today!\p" - .string "I hope you’re looking forward to this\n" - .string "game’s release!$" + .string "Danke, dass du heute gekommen bist!\p" + .string "Ich hoffe, du freust dich auch auf das\n" + .string "Erscheinen dieses Spiels!$" Route104_Prototype_Text_19B2B6:: @ 819B2B6 - .string "Huh? Did you battle with all the\n" - .string "TRAINERS already?$" + .string "Was? Du bist schon gegen alle TRAINER\n" + .string "angetreten?$" Route104_Prototype_Text_19B2E9:: @ 819B2E9 - .string "Thank you for coming today!\p" - .string "I hope you’re looking forward to this\n" - .string "game’s release!$" + .string "Danke, dass du heute gekommen bist!\p" + .string "Ich hoffe, du freust dich auch auf das\n" + .string "Erscheinen dieses Spiels!$" Route104_Prototype_Text_19B33B:: @ 819B33B - .string "I’ve never seen the POKéMON you have.\n" - .string "It makes me envious a little.$" + .string "POKéMON, wie du sie hast, habe ich noch\n" + .string "nie gesehen. Ich bin richtig neidisch!$" Route104_Prototype_Text_19B37F:: @ 819B37F - .string "Look at all those TRAINERS!\n" - .string "They have different POKéMON, too.\l" - .string "And they’re all waiting for you!$" + .string "Schau dir all diese TRAINER an! Sie\n" + .string "haben alle die unterschiedlichsten\l" + .string "POKéMON. Und sie warten alle auf dich!$" Route104_Prototype_Text_19B3DE:: @ 819B3DE - .string "Welcome to the World of POKéMON!$" + .string "Willkommen in der Welt der POKéMON!$" Route104_Prototype_Text_19B3FF:: @ 819B3FF - .string "May all POKéMON battles be bright,\n" - .string "fun, and ferocious!$" + .string "Mögen alle POKéMON-Kämpfe strahlend,\n" + .string "unterhaltsam und wild sein!$" diff --git a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc index 3ec76ff55..240f903cc 100644 --- a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc +++ b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc @@ -1,6 +1,6 @@ Route104_PrototypePrettyPetalFlowerShop_Text_19B436:: @ 819B436 - .string "I have to stay home today.\p" - .string "My big sisters had to go out.\n" - .string "They said it was for preparations.\p" - .string "In the autumn, we’re going to start\n" - .string "a flower shop. Please wait for it!$" + .string "Ich muss heute zu Hause bleiben.\p" + .string "Meine großen Schwestern sind wegge-\n" + .string "gangen. Sie wollen alles vorbereiten.\p" + .string "Im Herbst eröffnen wir einen Blumen-\n" + .string "laden. Ich hoffe, du schaust mal vorbei.$" diff --git a/data/text/maps/Route106.inc b/data/text/maps/Route106.inc index 38e92c65d..c40321971 100644 --- a/data/text/maps/Route106.inc +++ b/data/text/maps/Route106.inc @@ -1,4 +1,4 @@ Route106_Text_16E026:: @ 816E026 - .string "TRAINER TIPS\p" - .string "Advice on catching POKéMON with a ROD:\n" - .string "Press the A Button if you get a bite.$" + .string "TIPPS für TRAINER\p" + .string "Hinweis zum Fangen von POKéMON mit der\n" + .string "ANGEL: Drücke A, wenn eines anbeißt.$" diff --git a/data/text/maps/Route109.inc b/data/text/maps/Route109.inc index a86efa2c4..61e48788c 100644 --- a/data/text/maps/Route109.inc +++ b/data/text/maps/Route109.inc @@ -1,86 +1,88 @@ DewfordTown_Text_16E080:: @ 816E080 - .string "MR. BRINEY: Ahoy!\n" - .string "We’ve made land in SLATEPORT!\p" - .string "I suppose you’re going to visit CAPT.\n" - .string "STERN and deliver the DEVON GOODS?$" + .string "MR. BRACK: Ahoi!\n" + .string "Wir haben in GRAPHITPORT CITY angelegt.\p" + .string "Ich vermute, du gehst jetzt zu KAPT.\n" + .string "BRIGG und bringst ihm die DEVON-\l" + .string "WAREN?$" Route109_Text_16E0F9:: @ 816E0F9 - .string "MR. BRINEY: Aren’t you delivering the\n" - .string "DEVON GOODS?\p" - .string "Or were you meaning to sail back to\n" - .string "DEWFORD?$" + .string "MR. BRACK: Überbringst du nicht die\n" + .string "DEVON-WAREN?\p" + .string "Heißt das, du willst nach FAUSTAUHAVEN\n" + .string "zurücksegeln?$" Route109_Text_16E159:: @ 816E159 - .string "MR. BRINEY: DEWFORD it is, then!\p" - .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "MR. BRACK: Also, auf nach FAUSTAUHAVEN!\p" + .string "Anker gelichtet!\n" + .string "PECKO, wir setzen Segel, mein Liebling!$" Route109_Text_16E1B1:: @ 816E1B1 - .string "MR. BRINEY: Then you go on and deliver\n" - .string "the DEVON GOODS. I’ll be waiting.$" + .string "MR. BRACK: Dann geh und überbringe die\n" + .string "DEVON-WAREN. Ich warte hier.$" DewfordTown_Text_16E1FA:: @ 816E1FA - .string "MR. BRINEY: Ahoy! We’ve made land in\n" - .string "SLATEPORT!\p" - .string "You just go on and tell me whenever\n" - .string "you want to set sail again!$" + .string "MR. BRACK: Ahoi! Wir haben in\n" + .string "GRAPHITPORT CITY angelegt!\p" + .string "Wann immer du magst, können wir wieder\n" + .string "die Segel setzen.$" Route109_Text_16E26A:: @ 816E26A - .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" - .string "Now, my friend, where are we bound?$" + .string "MR. BRACK: Ahoi! Für dich fahre ich\n" + .string "jederzeit wieder raus!\p" + .string "Nun, wo soll es hingehen?$" Route109_Text_16E2C5:: @ 816E2C5 - .string "MR. BRINEY: You just tell me whenever\n" - .string "you need to set sail again!$" + .string "MR. BRACK: Sag mir einfach Bescheid,\n" + .string "wenn wir wieder Segel setzen sollen.$" Route109_Text_16E307:: @ 816E307 - .string "Yo, TRAINERS!\n" - .string "Whether you’re hot to trot,\l" - .string "or cool cat not,\l" - .string "chill at my papa’s spot!$" + .string "Yo, TRAINER!\n" + .string "Seid ihr in Eile,\l" + .string "müsst wieder fort,\l" + .string "erfrischt euch doch an Papas Ort!$" Route109_Text_16E35B:: @ 816E35B - .string "Little kids can dart around so quickly...\p" - .string "You don’t dare take your eyes off them\n" - .string "for an instant. It’s very taxing.\p" - .string "Mine’s with my POKéMON, so they should\n" - .string "be okay, but...$" + .string "Kleine Kinder sind blitzschnell und flink.\p" + .string "Du darfst sie nicht eine Sekunde aus\n" + .string "den Augen lassen. Das strengt an.\p" + .string "Meine Kinder sind mit meinen POKéMON\n" + .string "zusammen, da sind sie gut aufgehoben.$" Route109_Text_16E405:: @ 816E405 - .string "Our sand castle’s taking a long time\n" - .string "to make.$" + .string "Wir brauchen ganz lange, um unsere\n" + .string "Sandburg zu bauen.$" Route109_Text_16E433:: @ 816E433 - .string "You can have this!$" + .string "Das schenk ich dir!$" Route109_Text_16E446:: @ 816E446 - .string "We’re going to get all the sand from\n" - .string "the beach and make a big castle!\p" - .string "And then we’re going to be a king and\n" - .string "queen.\p" - .string "We’ll let you be a servant.$" + .string "Wir nehmen allen Sand vom Strand\n" + .string "und bauen damit eine gaaanz große Burg.\p" + .string "Und dann sind wir Königin und König!\p" + .string "Und du darfst unser Diener sein.$" Route109_Text_16E4D5:: @ 816E4D5 - .string "The water around these parts is clean.\p" - .string "But, I get my ZIGZAGOON to pick up\n" - .string "litter from the shoreline at times.\p" - .string "Dirty water becomes rain and joins our\n" - .string "rivers, which we drink from...\p" - .string "If we pollute the sea, it all comes\n" - .string "back to haunt us eventually.$" + .string "Das Wasser in diesen Breiten ist sauber.\p" + .string "Aber ich sammle zusammen mit meinem\n" + .string "ZIGZACHS den Müll am Ufer auf.\p" + .string "Verschmutztes Wasser wird zu Regen und\n" + .string "gelangt in die Flüsse, aus denen wir\l" + .string "unser Trinkwasser gewinnen...\p" + .string "Verschmutzen wir das Meer, bekommen\n" + .string "wir den Schmutz wieder zurück.$" Route109_Text_16E5CA:: @ 816E5CA - .string "ZIGZAGOON: Guguu?$" + .string "ZIGZACHS: Guguu?$" Route109_Text_16E5DC:: @ 816E5DC - .string "SEASHORE HOUSE\p" - .string "“May hot battles rage on hot sands!\n" - .string "The place for hot TRAINERS!”$" + .string "STRANDHAUS\p" + .string "“Mögen heiße Kämpfe im heißen Sand\n" + .string "stattfinden! Heiße TRAINER willkommen!”$" Route109_Text_16E62C:: @ 816E62C - .string "TRAINER TIPS\p" - .string "POKéMON at the same level may not\n" - .string "always have identical stats.\p" - .string "POKéMON raised by TRAINERS are said\n" - .string "to grow stronger than wild POKéMON.$" + .string "TIPPS für TRAINER\p" + .string "POKéMON mit gleichem Level haben nicht\n" + .string "unbedingt identische Statuswerte.\p" + .string "POKéMON, die von TRAINERN aufgezogen\n" + .string "werden, wachsen schneller als wilde\l" + .string "POKéMON.$" diff --git a/data/text/maps/Route109_SeashoreHouse.inc b/data/text/maps/Route109_SeashoreHouse.inc index ebd6f05e5..7d830c12c 100644 --- a/data/text/maps/Route109_SeashoreHouse.inc +++ b/data/text/maps/Route109_SeashoreHouse.inc @@ -1,92 +1,94 @@ Route109_SeashoreHouse_Text_19B4D9:: @ 819B4D9 - .string "I’m the owner of the SEASHORE HOUSE.\n" - .string "But you can call me MR. SEA!\p" - .string "What I love above all is to see hot\n" - .string "POKéMON battles.\p" - .string "Let me see that your heart burns hot!\p" - .string "If you can defeat all the TRAINERS\n" - .string "here, I’ll reward your efforts.$" + .string "Ich bin der Besitzer des STRANDHAUSES.\n" + .string "Du kannst MR. MARE zu mir sagen.\p" + .string "Heißen POKéMON-Kämpfen zuzusehen\n" + .string "liebe ich über alles!\p" + .string "Zeig mir, wie heiß dein Herz lodert!\p" + .string "Wenn du alle TRAINER besiegen kannst,\n" + .string "werde ich dich belohnen!$" Route109_SeashoreHouse_Text_19B5B9:: @ 819B5B9 - .string "Show me some hot matches!\p" - .string "I run this SEASHORE HOUSE just for\n" - .string "that reason alone!$" + .string "Zeig mir heiße Kämpfe!\p" + .string "Nur für diese habe ich das STRANDHAUS\n" + .string "überhaupt geöffnet!$" Route109_SeashoreHouse_Text_19B609:: @ 819B609 - .string "You’re scorching hot!\n" - .string "Those battles blazed!\l" - .string "I’m more than just satisfied!\p" - .string "As thanks for showing me your hot\n" - .string "streak, I want you to take these.\p" - .string "It’s half a dozen bottles of SODA POP!$" + .string "Du bist brandheiß!\n" + .string "Die Kämpfe glühen geradezu!\l" + .string "Ich bin mehr als zufrieden!\p" + .string "Du hast deine Fertigkeiten bewiesen.\n" + .string "Zum Dank schenke ich dir etwas.\p" + .string "Es sind sechs Flaschen SPRUDEL!$" Route109_SeashoreHouse_Text_19B6BE:: @ 819B6BE - .string "Oh, but hey, your BAG’s jammed full.\n" - .string "I’ll hang on to these for you.$" + .string "Aber dein BEUTEL ist ja gerammelt voll.\n" + .string "Ich werde sie für dich aufbewahren.$" Route109_SeashoreHouse_Text_19B702:: @ 819B702 - .string "Want to buy some SODA POP?\n" - .string "POKéMON love it!\p" - .string "Just ¥300 a bottle!\n" - .string "Buy some!$" + .string "Möchtest du etwas SPRUDEL kaufen?\n" + .string "POKéMON lieben ihn!\p" + .string "Nur ¥300 pro Flasche!\n" + .string "Kauf doch welchen!$" Route109_SeashoreHouse_Text_19B74C:: @ 819B74C - .string "Here you go!$" + .string "Hier, bitte schön!$" Route109_SeashoreHouse_Text_19B759:: @ 819B759 - .string "You don’t have the money.$" + .string "Du hast nicht genügend Geld.$" Route109_SeashoreHouse_Text_19B773:: @ 819B773 - .string "No?\n" - .string "That’s too bad.$" + .string "Nein?\n" + .string "Das ist aber wirklich schade.$" UnknownString_819B787: @ 819B787 - .string "SODA POP! The POKéMON favorite!\n" - .string "Just ¥300 a bottle! Want one?$" + .string "SPRUDEL! POKéMONs Liebling!\n" + .string "Nur ¥300 pro Flasche! Möchtest du eine?$" UnknownString_819B7C5: @ 819B7C5 - .string "Here you go!$" + .string "Hier, bitte schön!$" UnknownString_819B7D2: @ 819B7D2 - .string "Oh, dear!\n" - .string "You don’t have enough money.$" + .string "Oh je!\n" + .string "Du hast nicht genügend Geld.$" UnknownString_819B7F9: @ 819B7F9 - .string "That’s too bad.$" + .string "Das ist wirklich sehr schade.$" Route109_SeashoreHouse_Text_19B809:: @ 819B809 - .string "If you’re looking for a battle on the\n" - .string "high seas, you’ll find no hotter \l" - .string "TRAINER than me, matey!$" + .string "Wenn du Lust auf einen heißen Kampf\n" + .string "auf hoher See hast, findest du keinen\l" + .string "lodernderen TRAINER als mich!$" Route109_SeashoreHouse_Text_19B869:: @ 819B869 - .string "That was a hot battle!\n" - .string "I can accept that loss, matey!$" + .string "Das war ein heißer Kampf!\n" + .string "Ich kann die Niederlage verkraften!$" Route109_SeashoreHouse_Text_19B89F:: @ 819B89F - .string "Whenever I’m in SLATEPORT, I enjoy\n" - .string "hot battles and ice-cold SODA POP!$" + .string "Immer wenn ich in GRAPHITPORT CITY bin,\n" + .string "genieße ich heiße Kämpfe und\l" + .string "eisgekühlten SPRUDEL!$" Route109_SeashoreHouse_Text_19B8E5:: @ 819B8E5 - .string "Boring battles aren’t worth the effort.\p" - .string "Fiery hot battles are what toughen up\n" - .string "TRAINERS and POKéMON!$" + .string "Langweilige Kämpfe lohnen sich nicht.\p" + .string "Feurig heiße Kämpfe aber stählen\n" + .string "TRAINER und POKéMON.$" Route109_SeashoreHouse_Text_19B949:: @ 819B949 - .string "That’s hot!$" + .string "Das war brandheiß!$" Route109_SeashoreHouse_Text_19B955:: @ 819B955 - .string "Whew, I’m all thirsty.\n" - .string "Maybe I’ll have a SODA POP.$" + .string "Puh, ich bin am Verdursten.\n" + .string "Ich sollte SPRUDEL trinken.$" Route109_SeashoreHouse_Text_19B988:: @ 819B988 - .string "I’m going to show you how great my\n" - .string "POKéMON are, but don’t cry!$" + .string "Ich werde dir zeigen, wie toll meine\n" + .string "POKéMON sind. Aber heul bloß nicht los!$" Route109_SeashoreHouse_Text_19B9C7:: @ 819B9C7 - .string "...I lost, but I won’t cry...$" + .string "Ich habe verloren. Aber ich heule nicht!$" Route109_SeashoreHouse_Text_19B9E5:: @ 819B9E5 - .string "If one of my POKéMON knew the move\n" - .string "for carrying me across water on its\l" - .string "back, I could get rid of this inner tube.$" + .string "Wenn doch nur eines meiner POKéMON\n" + .string "wüsste, wie es mich über das Wasser\l" + .string "tragen kann. Dann wäre ich den\l" + .string "ollen Schwimmreifen los.$" diff --git a/data/text/maps/Route110.inc b/data/text/maps/Route110.inc index 78be8d595..9ebf3507b 100644 --- a/data/text/maps/Route110.inc +++ b/data/text/maps/Route110.inc @@ -1,236 +1,251 @@ Route110_Text_16E6C0:: @ 816E6C0 - .string "TEAM {EVIL_TEAM}’s activities must be kept\n" - .string "secret for now.$" + .string "TEAM {EVIL_TEAM}S Aktivitäten müssen im\n" + .string "Moment geheim bleiben!$" Route110_Text_16E6F2:: @ 816E6F2 - .string "I want to get going to SLATEPORT and\n" - .string "kick up a ruckus!$" + .string "Ich würde liebend gerne nach\n" + .string "GRAPHITPORT CITY gehen und ein\l" + .string "bisschen Krawall machen.$" Route110_Text_16E729:: @ 816E729 - .string "This is my first job after joining\n" - .string "TEAM {EVIL_TEAM}. I’ve got the shakes!$" + .string "Das ist mein erster Job, seit ich dem\n" + .string "TEAM {EVIL_TEAM} beigetreten bin. Ich bin\l" + .string "ganz tatterig.$" Route110_Text_16E76A:: @ 816E76A - .string "TEAM {EVIL_TEAM}’s actions will put a smile\n" - .string "on everyone’s face!$" + .string "TEAM {EVIL_TEAM}S Aktionen zaubern ein\n" + .string "Lächeln auf jedes Gesicht!$" Route110_Text_16E7A1:: @ 816E7A1 - .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" - .string "While I was searching for other\n" - .string "POKéMON, my POKéMON grew stronger.\p" - .string "So...\n" - .string "How about a little battle?$" + .string "MAIKE: Hi, {PLAYER}{KUN}, wir haben uns ja\n" + .string "lange nicht gesehen!\p" + .string "Während ich auf der Suche nach\n" + .string "weiteren POKéMON war, sind meine\l" + .string "POKéMON stärker geworden.\p" + .string "Daher...\n" + .string "Wie wäre es mit einem kleinen Kampf?$" Route110_Text_16E826:: @ 816E826 - .string "Yikes!\n" - .string "You’re better than I expected!$" + .string "AchDuSchande!\n" + .string "Du bist besser als ich gedacht habe.$" Route110_Text_16E84C:: @ 816E84C - .string "MAY: {PLAYER}{KUN}, you’ve been busy\n" - .string "training, too, haven’t you?\p" - .string "I think you deserve a reward!\n" - .string "This is from me!$" + .string "MAIKE: {PLAYER}{KUN}, du hast auch fleißig\n" + .string "trainiert, nicht wahr?\p" + .string "Ich denke, du verdienst eine Belohnung!\n" + .string "Hier, dies ist von mir für dich!$" Route110_Text_16E8B3:: @ 816E8B3 - .string "MAY: That’s an ITEMFINDER.\p" - .string "Try it out. If there is an item that’s\n" - .string "not visible, it emits a sound.\p" - .string "Okay, {PLAYER}{KUN}, let’s meet again!\p" - .string "I know it’s a little silly coming from\n" - .string "me, but I think you should train a lot\l" - .string "harder for the next time.$" + .string "MAIKE: Das ist ein DETEKTOR.\p" + .string "Probier ihn mal aus. Wenn irgendwo ein\n" + .string "Item versteckt ist, gibt er ein\l" + .string "Geräusch von sich.\p" + .string "Bis zum nächsten Mal, {PLAYER}{KUN}.\p" + .string "Es hört sich aus meinem Munde zwar blöd\n" + .string "an, aber bis dahin solltest du viel mehr\l" + .string "trainiert haben.$" Route110_Text_16E99A:: @ 816E99A - .string "BRENDAN: Hey, {PLAYER}.\n" - .string "So this is where you were.\l" - .string "How’s it going?\p" - .string "Have you been raising your POKéMON?\n" - .string "I’ll check for you.$" + .string "BRIX: Hey, {PLAYER}.\n" + .string "Hier treibst du dich also herum.\l" + .string "Wie geht es?\p" + .string "Hast du deine POKéMON gut aufgezogen?\n" + .string "Ich werde das für dich überprüfen.$" Route110_Text_16EA0F:: @ 816EA0F .string "Hmm...\n" - .string "You’re pretty good.$" + .string "Du bist sehr gut.$" Route110_Text_16EA2A:: @ 816EA2A - .string "BRENDAN: {PLAYER}, you’ve trained\n" - .string "without me noticing...\p" - .string "Good enough!\n" - .string "Here, take this.$" + .string "BRIX: {PLAYER}, du hast trainiert,\n" + .string "ohne dass ich etwas davon\l" + .string "mitbekommen habe...\p" + .string "Aber genug!\n" + .string "Hier, das ist für dich!$" Route110_Text_16EA7B:: @ 816EA7B - .string "BRENDAN: That’s an ITEMFINDER.\p" - .string "Use it to root around for items that\n" - .string "aren’t visible.\p" - .string "If it senses something, it emits a\n" - .string "sound.\p" - .string "Anyway, I’m off to look for new\n" - .string "POKéMON.$" + .string "BRIX: Das ist ein DETEKTOR.\p" + .string "Probier ihn mal aus. \p" + .string "Ist irgendwo ein Item versteckt, gibt\n" + .string "er ein Geräusch von sich.\p" + .string "Wie auch immer, ich suche jetzt weiter\n" + .string "nach POKéMON.$" Route110_Text_16EB22:: @ 816EB22 - .string "Wouldn’t it be great to ride a BIKE\n" - .string "at full speed on CYCLING ROAD?$" + .string "Wäre das nicht ein Spaß, mit einem FAHR-\n" + .string "RAD volle Pulle den RADWEG\l" + .string "entlangzudüsen?$" Route110_Text_16EB65:: @ 816EB65 - .string "How do you like the way my raven-\n" - .string "colored hair streams behind me?\p" - .string "I grew my hair out just for that.$" + .string "Gefällt es dir, wie mein raben-\n" + .string "schwarzes Haar im Wind weht?\p" + .string "Ich habe nur deshalb die Haare wachsen\n" + .string "lassen!$" Route110_Text_16EBC9:: @ 816EBC9 - .string "Oh, hey, you got that BIKE from RYDEL!\p" - .string "Oh, it’s glaringly obvious.\n" - .string "It says right on your bike...\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" - .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL...\n" - .string "That name’s everywhere.\p" - .string "You should ride it around all over\n" - .string "the place - it’s good advertising!$" + .string "Oh, hey, du hast ein RAD von RADLA!\p" + .string "Oh, das ist mehr als offensichtlich.\n" + .string "Es steht ja dort geschrieben...\p" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" + .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" + .string "RADLA, RADLA, RADLA, RADLA, RADLA...\n" + .string "Der Name steht überall.\p" + .string "Du solltest damit überall herumfahren,\n" + .string "eine bessere Werbung gibt es nicht!$" Route110_Text_16EDC5:: @ 816EDC5 - .string "The two roads, one above, one below...\p" - .string "A road each for people and POKéMON.\n" - .string "Perhaps that is right and fair.$" + .string "Zwei Straßen, eine oben, eine unten...\p" + .string "Eine Straße für Menschen und eine für\n" + .string "POKéMON. Das ist nur recht und billig.$" Route110_Text_16EE30:: @ 816EE30 - .string "I don’t have a BIKE, so I’ll take a\n" - .string "leisurely walk on the low road.$" + .string "Ich habe kein RAD, ich werde gemüt-\n" + .string "lich über die untere Straße schlendern.$" Route110_Text_16EE74:: @ 816EE74 - .string "Learning techniques will make BIKE\n" - .string "riding even more fun.\p" - .string "There are some places that you can\n" - .string "reach only by using a BIKE technique.$" + .string "Neue Techniken zu lernen, geben dem\n" + .string "Radfahren erst die richtige Würze.\p" + .string "Einige Orte kannst du nur erreichen,\n" + .string "wenn du die richtige Technik anwendest.$" Route110_Text_16EEF6:: @ 816EEF6 - .string "Which should I choose?\p" - .string "Make a beeline for MAUVILLE on\n" - .string "CYCLING ROAD, or take the low road\l" - .string "and look for POKéMON?$" + .string "Was soll ich tun?\p" + .string "Schnurstracks über den RADWEG nach\n" + .string "MALVENFROH CITY fahren oder die untere\p" + .string "Straße nehmen und nach POKéMON\n" + .string "suchen?$" Route110_Text_16EF65:: @ 816EF65 - .string "Number of collisions:\n" + .string "Anzahl der Zusammenstöße:\n" .string "... ... {STR_VAR_1}!\p" - .string "Total time:\n" + .string "Zeit:\n" .string "... ... {STR_VAR_2}!$" Route110_Text_16EF9F:: @ 816EF9F - .string "Bravo! Splendid showing!\p" - .string "Your love of cycling comes from deep\n" - .string "within your heart.\l" - .string "You’ve shaken me to my very soul!$" + .string "Bravo! Eine hervorragende Leistung!\p" + .string "Ich glaube, dein Talent zum Radfahren\n" + .string "kommt tief aus deinem innersten Herzen.\l" + .string "Du hast mich bis in die Seele getroffen!$" Route110_Text_16F012:: @ 816F012 - .string "Your technique is remarkable.\p" - .string "I suggest you slow down just enough\n" - .string "to avoid collisions.$" + .string "Deine Technik ist bemerkenswert.\p" + .string "Achte stets darauf, dass du nicht zu\n" + .string "schnell fährst und mit niemandem zu-\l" + .string "sammenstößt.$" Route110_Text_16F069:: @ 816F069 - .string "I would consider you a work in\n" - .string "progress.\p" - .string "Still, I hope you don’t forget the\n" - .string "sheer pleasure of cycling.$" + .string "Ich rate dir, weiter zu üben.\p" + .string "Und ich wünsche dir, dass du das Ver-\n" + .string "gnügen des Radfahrens nie vergisst.$" Route110_Text_16F0D0:: @ 816F0D0 - .string "My word... Your cycling skills border\n" - .string "on terrifying.\p" - .string "Most certainly, you need much more\n" - .string "practice riding.$" + .string "Ich sage... Dein Talent zum Radfahren\n" + .string "ist einfach miserabel.\p" + .string "Du brauchst wirklich noch viel mehr\n" + .string "Übung im Radfahren.$" Route110_Text_16F139:: @ 816F139 - .string "...I am aghast...\p" - .string "You’re perhaps not cut out for this\n" - .string "unfortunate cycling business.\p" - .string "You ought to give serious thought to\n" - .string "returning that BIKE to RYDEL.$" + .string "...Ich bin entgeistert...\p" + .string "Du hast wirklich kein Talent zum\n" + .string "Radfahren.\p" + .string "Du solltest ernsthaft darüber nach-\n" + .string "denken, dein RAD bei RADLA\l" + .string "zurückzugeben.$" Route110_Text_16F1D0:: @ 816F1D0 - .string "This is CYCLING ROAD.\p" - .string "If you were to ride from MAUVILLE to\n" - .string "SLATEPORT on a MACH BIKE, you would\l" - .string "be rated for the number of collisions\l" - .string "and your total time.$" + .string "Dies ist der RADWEG.\p" + .string "Wenn du mit einem EILRAD von MALVEN-\n" + .string "FROH CITY nach GRAPHITPORT CITY\p" + .string "fährst, wirst du nach der Anzahl der\n" + .string "Zusammenstöße und deiner Zeit\l" + .string "bewertet.$" Route110_Text_16F26A:: @ 816F26A - .string "Regardless of the results, I count on\n" - .string "seeing more challenges from you.\l" - .string "Always aim higher!$" + .string "Unabhängig von den Resultaten möchte\n" + .string "ich mehr Herausforderungen von dir\l" + .string "sehen. Immer das höchste Ziel im Auge\l" + .string "behalten!$" Route110_Text_16F2C4:: @ 816F2C4 - .string "On this CYCLING ROAD, those riding\n" - .string "MACH BIKES are rated for their number\l" - .string "of collisions and their total times.\p" - .string "ACRO BIKES do not qualify for rating.\n" - .string "They are easy to turn, so it’s not fair.$" + .string "Auf diesem RADWEG werden die, die\n" + .string "EILRÄDER fahren, nach ihren Zu-\l" + .string "sammenstößen und ihrer Zeit bewertet.\p" + .string "KUNSTRÄDER nehmen nicht an der\n" + .string "Qualifikation teil. Sie sind zu einfach\l" + .string "zu lenken.$" Route110_Text_16F381:: @ 816F381 .string "ROUTE 110\n" - .string "{0x7A} SLATEPORT CITY$" + .string "{DOWN_ARROW} GRAPHITPORT CITY$" Route110_Text_16F39C:: @ 816F39C - .string "SEASIDE CYCLING ROAD$" + .string "KÜSTENRADWEG$" Route110_Text_16F3B1:: @ 816F3B1 - .string "“TEAM {EVIL_TEAM} RULEZ!”\p" - .string "Somebody scribbled that on the sign...$" + .string "“TEAM {EVIL_TEAM} HÄRRSCHD!”\p" + .string "Das hat jemand auf das Schild\n" + .string "gekritzelt...$" Route110_Text_16F3E9:: @ 816F3E9 .string "ROUTE 110\n" - .string "{0x7B} ROUTE 103$" + .string "{LEFT_ARROW} ROUTE 103$" Route110_Text_16F3FF:: @ 816F3FF - .string "SEASIDE PARKING$" + .string "KÜSTENPARKPLATZ$" Route110_Text_16F40F:: @ 816F40F .string "ROUTE 110\n" - .string "{0x79} MAUVILLE CITY$" + .string "{UP_ARROW} MALVENFROH CITY$" Route110_Text_16F429:: @ 816F429 - .string "TRAINER TIPS\p" - .string "The foe can be made helpless by\n" - .string "paralyzing it or causing it to sleep.\p" - .string "It is an important technique for\n" - .string "POKéMON battles.$" + .string "TIPPS für TRAINER\p" + .string "Der Gegner kann paralysiert oder\n" + .string "in Schlaf versetzt werden und ist damit\l" + .string "wehrlos.\p" + .string "Das sind wichtige Techniken in einem\n" + .string "POKéMON-Kampf.$" Route110_Text_16F4AE:: @ 816F4AE - .string "TRAINER TIPS\p" - .string "The items in the BAG can be reorganized\n" - .string "by pressing SELECT.$" + .string "TIPPS für TRAINER\p" + .string "Die Items in dem BEUTEL können mit\n" + .string "SELECT neu geordnet werden.$" Route110_Text_16F4F7:: @ 816F4F7 - .string "“Three steps {0x7C} and two steps {0x79}\n" - .string "to reach the wondrous TRICK HOUSE.”$" + .string "“Drei Schritte {RIGHT_ARROW} und zwei Schritte {UP_ARROW}\n" + .string "und du erreichst das wundersame\l" + .string "RÄTSELHAUS.”$" Route110_Text_16F53A:: @ 816F53A - .string "THE BEST RECORD TO DATE...\p" - .string "No. of collisions: {STR_VAR_1}\p" - .string "Elapsed time: {STR_VAR_2}$" + .string "DAS BESTE ERGEBNIS...\p" + .string "Anzahl der Zusammenstöße: {STR_VAR_1}\p" + .string "Zeit: {STR_VAR_2}$" Route110_Text_16F57C:: @ 816F57C - .string "THE BEST RECORD TO DATE...\p" - .string "No one seems to have taken the\n" - .string "challenge. There is no record...$" + .string "DAS BESTE ERGEBNIS...\p" + .string "Niemand scheint sich bis jetzt der He-\n" + .string "rausforderung gestellt zu haben...$" UnknownString_816F5D7: @ 816F5D7 - .string "I watered the plants every day.\n" - .string "They grew lots of flowers.\p" - .string "And they gave me lots of BERRIES, too.\p" - .string "Here you go!\n" - .string "You can have it!$" + .string "Ich gieße die Pflanzen jeden Tag.\n" + .string "Dann bekommen sie viele Blüten.\p" + .string "Und daraus werden dann viele BEEREN.\p" + .string "Hier, die ist für dich.\n" + .string "Du kannst sie haben.$" UnknownString_816F657: @ 816F657 - .string "I’m trying to make RED {POKEBLOCK}S!\n" - .string "I hope you do, too!$" + .string "Ich versuche {POKEBLOCK} ROT zu machen!\n" + .string "Ich hoffe, das versuchst du auch!$" UnknownString_816F68A: @ 816F68A - .string "Your BAG’s BERRIES POCKET is full.\p" - .string "I’ll give it to you another time.$" + .string "Deine BEEREN-TASCHE ist voll.\p" + .string "Ich gebe sie dir ein anderes Mal.$" UnknownString_816F6CF: @ 816F6CF - .string "I’m going to look for red BERRIES to\n" - .string "make RED {POKEBLOCK}S.$" + .string "Ich suche nach roten BEEREN, um\n" + .string "{POKEBLOCK} ROT herzustellen.$" diff --git a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8d5a0433e..1179fa0ce 100644 --- a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -1,10 +1,11 @@ Route110_SeasideCyclingRoadNorthEntrance_Text_19E406:: @ 819E406 - .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" - .string "It feels great to go that fast, but try\n" - .string "not to crash into anyone!$" + .string "Auf dem RADWEG kannst du so\n" + .string "schnell fahren, wie du willst.\p" + .string "Schnell fahren macht Spaß, pass aber\n" + .string "auf, dass du mit niemandem\l" + .string "zusammenstößt.$" UnknownString_819E48D: @ 819E48D - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" - .string "Please come back with a BIKE.$" + .string "Tut mir Leid, aber auf dem RADWEG\n" + .string "sind Fußgänger nicht gestattet.\p" + .string "Das ist gefährlich. Bring dein RAD mit...$" diff --git a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 77bf90751..d2cd1bd34 100644 --- a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -1,11 +1,12 @@ Route110_SeasideCyclingRoadSouthEntrance_Text_19E326:: @ 819E326 - .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" - .string "It feels great to go that fast, but try\n" - .string "not to crash into anyone!$" + .string "Auf dem RADWEG kannst du so\n" + .string "schnell fahren, wie du willst.\p" + .string "Schnell fahren macht Spaß, pass aber\n" + .string "auf, dass du mit niemandem\l" + .string "zusammenstößt.$" Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD:: @ 819E3AD Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD:: @ 819E3AD - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" - .string "Please come back with a BIKE.$" + .string "Tut mir Leid, aber auf dem RADWEG\n" + .string "sind Fußgänger nicht gestattet.\p" + .string "Das ist gefährlich. Bring dein RAD mit...$" diff --git a/data/text/maps/Route110_TrickHouseEnd.inc b/data/text/maps/Route110_TrickHouseEnd.inc index 03f2252fd..508e52b85 100644 --- a/data/text/maps/Route110_TrickHouseEnd.inc +++ b/data/text/maps/Route110_TrickHouseEnd.inc @@ -1,110 +1,120 @@ Route110_TrickHouseEnd_Text_19C281:: @ 819C281 - .string "Aak!\n" - .string "You’ve made it to me?\l" - .string "Hmmm... You’re sharp!$" + .string "Argh!\n" + .string "Du hast mich gefunden?\l" + .string "Hmmm... Du bist verdammt clever!$" Route110_TrickHouseEnd_Text_19C2B2:: @ 819C2B2 - .string "It took me all night to plant all those\n" - .string "trees...\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three, four, five, six places!$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "all die Bäume zu pflanzen...\p" + .string "Du bist meiner Größe fast ebenbürtig,\n" + .string "bis auf ein, zwei, drei, vier, fünf, sechs\l" + .string "Punkte!$" Route110_TrickHouseEnd_Text_19C333:: @ 819C333 - .string "It took me all night to make the maze...\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three, four, five places!$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "das Labyrinth anzulegen...\p" + .string "Du bist meiner Größe fast ebenbürtig,\n" + .string "bis auf ein, zwei, drei, vier, fünf \l" + .string "Punkte!$" Route110_TrickHouseEnd_Text_19C3A7:: @ 819C3A7 - .string "It took me all night to bring in those\n" - .string "boulders...\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three, four places!$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "die Felsen zu platzieren...\p" + .string "Du bist meiner Größe fast ebenbürtig,\n" + .string "bis auf ein, zwei, drei, vier Punkte!$" Route110_TrickHouseEnd_Text_19C41F:: @ 819C41F - .string "It took me all night to shove in those\n" - .string "boulders...\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two, three places!$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "die Felsen hin- und herzuschieben...\p" + .string "Du bist meiner Größe fast ebenbürtig,\n" + .string "bis auf ein, zwei, drei Punkte!$" Route110_TrickHouseEnd_Text_19C491:: @ 819C491 - .string "It took me all night to make MECHADOLLS\n" - .string "and another to think up the quiz...\p" - .string "You’re almost my equal in greatness by\n" - .string "one, two places!$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "die ROBOPUPPEN zu konstruieren und\l" + .string "mir das Quiz auszudenken...\p" + .string "Du bist meiner Größe fast ebenbürtig,\n" + .string "bis auf ein oder zwei Punkte!$" Route110_TrickHouseEnd_Text_19C515:: @ 819C515 - .string "It took me all night to install\n" - .string "the doors...\p" - .string "You’re almost my equal in greatness!$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "die Türen zu installieren...\p" + .string "Du bist meiner Größe fast ebenbürtig!$" Route110_TrickHouseEnd_Text_19C567:: @ 819C567 - .string "It took me all night setting up arrows...\p" - .string "You’re my equal in greatness!$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "die Pfeile anzubringen.\p" + .string "Du bist meiner Größe ebenbürtig!$" Route110_TrickHouseEnd_Text_19C5AF:: @ 819C5AF - .string "It took me all night polishing floors...\p" - .string "You’re above me in greatness!\n" - .string "Possibly...$" + .string "Ich habe die ganze Nacht gebraucht,\n" + .string "den Boden zu polieren...\p" + .string "Du bist mir weit überlegen!\n" + .string "Unmöglich...$" Route110_TrickHouseEnd_Text_19C602:: @ 819C602 - .string "Wh-what should I do?\n" - .string "My fountain of ideas for tricks has\l" - .string "run dry...\p" - .string "Perhaps it is time I toured the country\n" - .string "on a quest to devise new tricks...$" + .string "Was soll ich nur tun?\n" + .string "Die Quelle der Ideen für meine Tricks\l" + .string "ist trocken gelegt...\p" + .string "Vielleicht ist es an der Zeit, durch die\n" + .string "Lande zu reisen und mich für neue\l" + .string "Tricks inspirieren zu lassen...$" Route110_TrickHouseEnd_Text_19C691:: @ 819C691 - .string "I hate to admit defeat, but you have\n" - .string "bested me!\p" - .string "Still, you must have been reeled in by\n" - .string "my charisma for you to visit me again\l" - .string "and again. Yes, you must have!\p" - .string "But that has nothing to do with my\n" - .string "losing!\p" - .string "In recognition of the friendship\n" - .string "between you, the driven, and the genius\l" - .string "that is myself, I demand that you take\l" - .string "this keepsake!$" + .string "Ich hasse es, zuzugeben, dass ich be-\n" + .string "siegt wurde. Du hast mich geschlagen!\p" + .string "Mein Charisma muss dich gefangen\n" + .string "genommen haben, da du immer wieder\l" + .string "herkommst. Ja, so muss es sein!\p" + .string "Aber das hat nichts mit meiner\n" + .string "Niederlage zu tun!\p" + .string "Als Zeichen der Freundschaft zwischen\n" + .string "dir, dem Aufstrebenden und mir, dem\l" + .string "Genie, überreiche ich dir dieses\l" + .string "Andenken!$" Route110_TrickHouseEnd_Text_19C7D7:: @ 819C7D7 - .string "What? No room in your PC?\n" - .string "What am I to make of that?\p" - .string "I wish I could say that, but I am much\n" - .string "too kind and caring, so come back later!$" + .string "Was? Du hast keinen Platz im PC?\n" + .string "Und was soll ich jetzt damit machen?\p" + .string "Sei froh, dass ich so nett und rück-\n" + .string "sichtsvoll bin. Ich verwahre es für\l" + .string "dich. Komm einfach später wieder.$" Route110_TrickHouseEnd_Text_19C85C:: @ 819C85C .string "... ... ... ... ... ...\p" - .string "I am leaving on a journey of discovery.\n" - .string "A quest in search of new tricks.\p" - .string "I wish that you will one day visit and\n" - .string "entertain me again.\p" - .string "And now, farewell!$" + .string "Ich gehe jetzt auf eine Entdeckungs-\n" + .string "reise. Auf die Suche nach neuen Tricks.\p" + .string "Ich hoffe, du besuchst mich eines\n" + .string "Tages wieder und unterhältst mich.\p" + .string "Für heute lebe wohl!$" Route110_TrickHouseEnd_Text_19C90B:: @ 819C90B - .string "Fine!\n" - .string "You have earned this reward!$" + .string "Gut!\n" + .string "Du hast dir diese Belohnung verdient!$" Route110_TrickHouseEnd_Text_19C92E:: @ 819C92E - .string "What? Have you no room for this?\n" - .string "What manner of items do you carry?\p" - .string "But fine, since you’ve reached me,\n" - .string "your reward will be with me till later.$" + .string "Was? Du hast keinen Platz dafür?\n" + .string "Wie viele Items schleppst du denn mit?\p" + .string "Aber du kannst dir deine Belohnung\n" + .string "auch später bei mir abholen.$" Route110_TrickHouseEnd_Text_19C9BD:: @ 819C9BD - .string "Scrub that smug smirk from your face!\n" - .string "It’s much too early to think you’ve won!\p" - .string "I’ll make new tricks to stump you, I will.\n" - .string "You may mock me only when you’re done.\p" - .string "Come back for the next exciting\n" - .string "installment!$" + .string "Putz dir das selbstgefällige Grinsen von\n" + .string "der Backe! Noch hast du nicht gewonnen!\p" + .string "Ich werde neue Tricks erfinden, die\n" + .string "dich zu Fall bringen werden. Zum Grinsen\p" + .string "hast du erst Grund, wenn du es\n" + .string "geschafft hast.\p" + .string "Komm wieder, wenn ich die nächste\n" + .string "interessante Installation fertig habe.$" Route110_TrickHouseEnd_Text_19CA8B:: @ 819CA8B - .string "Now, now! You’re ignoring me now?\n" - .string "Now that, I consider heartbreaking!$" + .string "Nun, nun! Du ignorierst mich?\n" + .string "Das bricht mir glatt das Herz!$" UnknownString_819CAD1: @ 819CAD1 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is fabulous.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“RÄTSELMEISTER ist sagenhaft.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHouseEntrance.inc b/data/text/maps/Route110_TrickHouseEntrance.inc index fe39a4441..5d218bc1a 100644 --- a/data/text/maps/Route110_TrickHouseEntrance.inc +++ b/data/text/maps/Route110_TrickHouseEntrance.inc @@ -1,111 +1,114 @@ Route110_TrickHouseEntrance_Text_19BA56:: @ 819BA56 - .string "You’re being watched...$" + .string "Du wirst beobachtet...$" Route110_TrickHouseEntrance_Text_19BA6E:: @ 819BA6E - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "beneath this desk? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich unter\n" + .string "dem Tisch versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BAC0:: @ 819BAC0 - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "behind this tree? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich hinter\n" + .string "dem Baum versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BB11:: @ 819BB11 - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "in this dresser? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich in\n" + .string "der Kommode versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BB61:: @ 819BB61 - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "beyond this window? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich über\n" + .string "dem Fenster versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BBB4:: @ 819BBB4 - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "in this planter? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich in\n" + .string "der Pflanze versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BC04:: @ 819BC04 - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "in this cupboard? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich\n" + .string "im Schrank versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BC55:: @ 819BC55 - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "behind this window? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich hinter\n" + .string "dem Fenster versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BCA8:: @ 819BCA8 - .string "Hah? Grrr...\p" - .string "How did you know I concealed myself\n" - .string "beneath this cushion? You’re sharp!$" + .string "Was? Grrrr...\p" + .string "Woher wusstest du, dass ich mich unter\n" + .string "dem Kissen versteckt hatte? Clever!$" Route110_TrickHouseEntrance_Text_19BCFD:: @ 819BCFD - .string "Behold!\p" - .string "For I am the greatest living mystery\n" - .string "of a man in all of HOENN!\l" - .string "They call me...\p" - .string "The TRICK MASTER!\n" - .string "Wahahaha! Glad to meet you!$" + .string "Sehe und staune!\p" + .string "Ich bin das größte lebende menschliche\n" + .string "Mysterium in ganz HOENN!\l" + .string "Man nennt mich...\p" + .string "RÄTSELMEISTER!\n" + .string "Hahaha! Erfreut dich kennen zu lernen!$" Route110_TrickHouseEntrance_Text_19BD82:: @ 819BD82 - .string "You, you’ve come to challenge my\n" - .string "TRICK HOUSE, haven’t you?\p" - .string "That’s why you’re here, isn’t it?\n" - .string "Yes, it is!\p" - .string "Consider your challenge accepted!\p" - .string "Enter through the scroll there,\n" - .string "and let your challenge commence!\p" - .string "I shall be waiting in the back!$" + .string "Du, du bist hier, um mein RÄTSELHAUS\n" + .string "herauszufordern, oder?\p" + .string "Deshalb bist du doch hier?\n" + .string "Ja, ja, so muss es sein!\p" + .string "Betrachte deine Herausforderung als\n" + .string "angenommen!\p" + .string "Trete hinter diese Schriftrolle und\n" + .string "die Herausforderung beginnt!\p" + .string "Ich warte im hinteren Bereich!$" Route110_TrickHouseEntrance_Text_19BE6E:: @ 819BE6E - .string "It’s a scroll.$" + .string "Das ist eine Schriftrolle.$" Route110_TrickHouseEntrance_Text_19BE7D:: @ 819BE7D - .string "There is a big hole behind the scroll!\p" - .string "Want to go in?$" + .string "Hinter der Schriftrolle ist ein Loch!\p" + .string "Möchtest du hindurchgehen?$" Route110_TrickHouseEntrance_Text_19BEB3:: @ 819BEB3 - .string "There is a note affixed to the scroll...\p" - .string "“I am leaving on a journey.\n" - .string "Don’t look for me. TRICK MASTER”$" + .string "Auf der Schriftrolle steht etwas...\p" + .string "“Ich bin auf eine Reise gegangen.\n" + .string "Sucht mich nicht. RÄTSELMEISTER”$" Route110_TrickHouseEntrance_Text_19BF19:: @ 819BF19 - .string "For the next time, I’ll use this trick,\n" - .string "and that scheme, and those ruses...\p" - .string "Mufufufu... If I may say so, it’s\n" - .string "brilliantly difficult, even for me!$" + .string "Nächstes Mal nehme ich diesen Trick,\n" + .string "nach diesem Schema und mit List und...\p" + .string "Ähähähä... Ich muss sagen, ich habe mich\n" + .string "in meiner Brillanz mal wieder selbst\l" + .string "übertroffen!$" Route110_TrickHouseEntrance_Text_19BFAB:: @ 819BFAB - .string "Hah? What?!\n" - .string "Oh, it’s you!\p" - .string "I’m in the midst of devising new tricky\n" - .string "challenges!\p" - .string "It’s not too much to ask for a bit more\n" - .string "time for me to think, is it now?\l" - .string "You wouldn’t begrudge me that?\l" - .string "Come back in a little while!$" + .string "Hah! Was???\n" + .string "Ach, du bist das!\p" + .string "Ich bin gerade dabei, mir neue Tricks\n" + .string "und Herausforderungen auszudenken!\p" + .string "Es ist doch nicht zu viel verlangt, mir\n" + .string "noch etwas Zeit zum Nachdenken zu\l" + .string "geben, oder? Das ist mir doch gegönnt,\l" + .string "oder? Danke. Komm später wieder!$" Route110_TrickHouseEntrance_Text_19C07E:: @ 819C07E - .string "Ah, it’s you! You’re here to accept the\n" - .string "reward from before, isn’t that right?\l" - .string "Yes, right I am!\p" - .string "Here!\n" - .string "I’ll give it to you now!$" + .string "Ah, du bist es! Du willst dir deine\n" + .string "Belohnung von eben abholen, habe ich\l" + .string "Recht? Natürlich habe ich Recht!\p" + .string "Hier!\n" + .string "Das ist für dich!$" Route110_TrickHouseEntrance_Text_19C0FC:: @ 819C0FC - .string "Hah?\n" - .string "Did you not come to claim your reward?$" + .string "Was? Du kommst nicht, um deine\n" + .string "Belohnung abzuholen?$" Route110_TrickHouseEntrance_Text_19C128:: @ 819C128 - .string "MECHADOLL 5 I AM!\n" - .string "IF REWARD IS NOT TAKEN BY YOU,\l" - .string "THEN TRICK MASTER YOU CANNOT FOLLOW.$" + .string "ROBOPUPPE 5 BIN ICH!\n" + .string "HOLST DU DIE BELOHNUNG NICHT AB,\l" + .string "DANN KANNST DU RÄTSELMEISTER NICHT\l" + .string "FOLGEN!$" Route110_TrickHouseEntrance_Text_19C17E:: @ 819C17E - .string "THEN FAREWELL.$" + .string "DANN LEBE WOHL.$" Route110_TrickHouseEntrance_Text_19C18D:: @ 819C18D - .string "YOUR PC STATUS: FULL AGAIN.\n" - .string "MEAN, YOU ARE.$" + .string "PC-STATUS: WIEDER VOLL.\n" + .string "GEMEIN DU BIST.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle1.inc b/data/text/maps/Route110_TrickHousePuzzle1.inc index 84208ead5..96eb9115e 100644 --- a/data/text/maps/Route110_TrickHousePuzzle1.inc +++ b/data/text/maps/Route110_TrickHousePuzzle1.inc @@ -1,38 +1,40 @@ Route110_TrickHousePuzzle1_Text_19CB4F:: @ 819CB4F - .string "I’ll hack and slash my way to victory\n" - .string "with the CUT we just learned!$" + .string "Ich habe mir den Weg zum Sieg mit dem\n" + .string "ZERSCHNEIDER, den wir gerade gelernt\l" + .string "haben, gebahnt.$" Route110_TrickHousePuzzle1_Text_19CB93:: @ 819CB93 - .string "Why are you so serious?$" + .string "Warum nimmst du das so ernst?$" Route110_TrickHousePuzzle1_Text_19CBAB:: @ 819CBAB - .string "I never get tired of hacking\n" - .string "and slashing!$" + .string "Ich werde des Hackens und\n" + .string "Schneidens nie müde!$" Route110_TrickHousePuzzle1_Text_19CBD6:: @ 819CBD6 - .string "I wandered into this weird house\n" - .string "by accident...$" + .string "Ich bin nur zufällig in diesem\n" + .string "verrückten Haus gelandet...$" Route110_TrickHousePuzzle1_Text_19CC06:: @ 819CC06 - .string "And now I’ve lost...$" + .string "Und nun habe ich verloren...$" Route110_TrickHousePuzzle1_Text_19CC1B:: @ 819CC1B - .string "I lost my way, I lost a battle, and I’m\n" - .string "even more lost... I can’t get out...$" + .string "Ich bin vom Weg abgekommen, ich habe\n" + .string "verloren und bin verloren. Ich finde den\l" + .string "Ausgang nicht mehr...$" Route110_TrickHousePuzzle1_Text_19CC68:: @ 819CC68 - .string "Just who is the TRICK MASTER?$" + .string "Wer ist dieser RÄTSELMEISTER bloß?$" Route110_TrickHousePuzzle1_Text_19CC86:: @ 819CC86 - .string "I lost while I was lost in thought!$" + .string "Ich verlor ganz gedankenverloren.$" Route110_TrickHousePuzzle1_Text_19CCAA:: @ 819CCAA - .string "You’re strong!\n" - .string "Just who are you?$" + .string "Du bist stark!\n" + .string "Wer bist du eigentlich?$" UnknownString_819CCCB: @ 819CCCB - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is smart.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“RÄTSELMEISTER ist gewieft.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle2.inc b/data/text/maps/Route110_TrickHousePuzzle2.inc index cb64f04d8..a737ec0cf 100644 --- a/data/text/maps/Route110_TrickHousePuzzle2.inc +++ b/data/text/maps/Route110_TrickHousePuzzle2.inc @@ -1,39 +1,40 @@ Route110_TrickHousePuzzle2_Text_19CD46:: @ 819CD46 - .string "Which switch closes which hole?$" + .string "Welcher Schalter schließt welches Loch?$" Route110_TrickHousePuzzle2_Text_19CD66:: @ 819CD66 - .string "After that battle, I’m even more\n" - .string "confused!$" + .string "Nach diesem Kampf bin ich nur noch\n" + .string "verwirrter!$" Route110_TrickHousePuzzle2_Text_19CD91:: @ 819CD91 - .string "Can I get you to push all the buttons\n" - .string "for me?$" + .string "Kannst du nicht alle Schalter für mich\n" + .string "betätigen?$" Route110_TrickHousePuzzle2_Text_19CDBF:: @ 819CDBF - .string "Oh! You’re on your second TRICK HOUSE\n" - .string "challenge!$" + .string "Oh! Du forderst das RÄTSELHAUS schon\n" + .string "zum zweiten Mal heraus!?!$" Route110_TrickHousePuzzle2_Text_19CDF0:: @ 819CDF0 - .string "You’re good at battling too?$" + .string "Du bist auch im Kämpfen so gut!?!$" Route110_TrickHousePuzzle2_Text_19CE0D:: @ 819CE0D - .string "The TRICK MASTER rigged all the tricks\n" - .string "in this house all by himself.$" + .string "Der RÄTSELMEISTER tüftelt alle Tricks\n" + .string "in diesem Haus selber aus.$" Route110_TrickHousePuzzle2_Text_19CE52:: @ 819CE52 - .string "I want to make my own GYM one day.\n" - .string "So, I’m studying how to set traps.$" + .string "Eines Tages gründe ich meine eigene\n" + .string "ARENA. Und hier studiere ich die Fallen.$" Route110_TrickHousePuzzle2_Text_19CE98:: @ 819CE98 - .string "I didn’t study battling enough!$" + .string "Ich habe das Kämpfen nicht genug\n" + .string "studiert!$" Route110_TrickHousePuzzle2_Text_19CEB8:: @ 819CEB8 - .string "You’re strong, aren’t you?\n" - .string "Maybe even enough to be a GYM LEADER!$" + .string "Du bist stark, nicht wahr?\n" + .string "Stark genug, ein ARENALEITER zu sein.$" UnknownString_819CEF9: @ 819CEF9 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is coveted.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“RÄTSELMEISTER ist gefragt.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle3.inc b/data/text/maps/Route110_TrickHousePuzzle3.inc index 01287a068..de3c0116d 100644 --- a/data/text/maps/Route110_TrickHousePuzzle3.inc +++ b/data/text/maps/Route110_TrickHousePuzzle3.inc @@ -1,41 +1,43 @@ Route110_TrickHousePuzzle3_Text_19CF76:: @ 819CF76 - .string "I keep coming back to this same place!$" + .string "Ich laufe und laufe und lande immer\n" + .string "wieder hier.$" Route110_TrickHousePuzzle3_Text_19CF9D:: @ 819CF9D - .string "I’m already having trouble, and then\n" - .string "you have to beat me? It’s not fair!$" + .string "Ich habe eh schon Probleme und dann\n" + .string "musst du mich auch noch besiegen? Pfui.$" Route110_TrickHousePuzzle3_Text_19CFE6:: @ 819CFE6 - .string "It’s full of doors here!\n" - .string "It’s too small and dark in here! Help!$" + .string "Hier sieht man vor lauter Türen den Aus-\n" + .string "gang nicht! Ich bin total verwirrt...$" Route110_TrickHousePuzzle3_Text_19D026:: @ 819D026 - .string "I don’t know what’s going on here.\n" - .string "I’m starting to feel sad...$" + .string "Ich weiß nicht, was hier vorgeht.\n" + .string "Ich habe ein ganz schlechtes Gefühl...$" Route110_TrickHousePuzzle3_Text_19D065:: @ 819D065 - .string "You... You’re awful!$" + .string "Du... Du bist furchtbar!$" Route110_TrickHousePuzzle3_Text_19D07A:: @ 819D07A - .string "I know I’m weak!\n" - .string "And, I have no sense of direction!$" + .string "Ich weiß, ich bin schwach! Ich weiß\n" + .string "nicht, in welche Richtung es weitergeht.$" Route110_TrickHousePuzzle3_Text_19D0AE:: @ 819D0AE - .string "I don’t get it. What would anyone want\n" - .string "with a house this bizarre?$" + .string "Ich verstehe es nicht. Was macht einer\n" + .string "mit so einem bizarren Haus???$" Route110_TrickHousePuzzle3_Text_19D0F0:: @ 819D0F0 - .string "I don’t get it.\n" - .string "How did I lose?$" + .string "Ich verstehe es wieder nicht.\n" + .string "Wie konnte ich jetzt verlieren?$" Route110_TrickHousePuzzle3_Text_19D110:: @ 819D110 - .string "I don’t get it.\n" - .string "How many traps are in this house?\p" - .string "You may be the one to solve that.$" + .string "Ich habe absolut keine Ahnung...\n" + .string "Wie viele Fallen gibt es in diesem Haus?\p" + .string "Du kannst mir das bestimmt\n" + .string "beantworten!$" UnknownString_819D164: @ 819D164 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is cool.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“RÄTSELMEISTER ist cool.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle4.inc b/data/text/maps/Route110_TrickHousePuzzle4.inc index 293e5ab93..126a27eab 100644 --- a/data/text/maps/Route110_TrickHousePuzzle4.inc +++ b/data/text/maps/Route110_TrickHousePuzzle4.inc @@ -1,40 +1,41 @@ Route110_TrickHousePuzzle4_Text_19D1DE:: @ 819D1DE - .string "It’s too much bother to think this out.\n" - .string "I only wanted to battle!$" + .string "Ich habe keine Zeit, das zu verstehen.\n" + .string "Ich will nur kämpfen!$" Route110_TrickHousePuzzle4_Text_19D21F:: @ 819D21F - .string "Even though I lost, I still like battling\n" - .string "the best!$" + .string "Auch wenn ich verloren habe, liebe ich\n" + .string "das Kämpfen.$" Route110_TrickHousePuzzle4_Text_19D253:: @ 819D253 - .string "Wouldn’t you agree? You would go\n" - .string "anywhere if TRAINERS were there.$" + .string "Stimmst du mir zu? Du würdest überall\n" + .string "hingehen, wo man TRAINER findet.$" Route110_TrickHousePuzzle4_Text_19D295:: @ 819D295 - .string "Heh! Boulders like this, I can brush\n" - .string "aside with one finger!$" + .string "Hey! Felsen wie diese räume ich mit\n" + .string "dem kleinen Finger aus dem Weg.$" Route110_TrickHousePuzzle4_Text_19D2D1:: @ 819D2D1 - .string "I can push boulders, but I can’t solve\n" - .string "the puzzle...$" + .string "Ich kann Felsen bewegen, aber ein\n" + .string "Rätsel zu lösen ist mir zu schwer...$" Route110_TrickHousePuzzle4_Text_19D306:: @ 819D306 - .string "It’s not good enough to be brawny...\n" - .string "You have to use your head. Be brainy!$" + .string "Muskeln alleine sind nicht alles... Auch\n" + .string "Gehirnschmalz ist wichtig. Sei helle!$" Route110_TrickHousePuzzle4_Text_19D351:: @ 819D351 - .string "The TRICK HOUSE is getting trickier,\n" - .string "isn’t it?$" + .string "Das RÄTSELHAUS wird immer\n" + .string "verrätselter... äh, komplizierter, oder?$" Route110_TrickHousePuzzle4_Text_19D380:: @ 819D380 - .string "Aaak!$" + .string "Aaaak!$" Route110_TrickHousePuzzle4_Text_19D386:: @ 819D386 - .string "Has anyone made it to the end?$" + .string "Hat es jemand schon mal bis zum\n" + .string "Ende geschafft?$" UnknownString_819D3A5: @ 819D3A5 - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is a genius.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“RÄTSELMEISTER ist ein Genie.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle5.inc b/data/text/maps/Route110_TrickHousePuzzle5.inc index 8cddc3f65..69870f2c8 100644 --- a/data/text/maps/Route110_TrickHousePuzzle5.inc +++ b/data/text/maps/Route110_TrickHousePuzzle5.inc @@ -1,141 +1,144 @@ Route110_TrickHousePuzzle5_Text_19D423:: @ 819D423 - .string "CLICKETY-CLACK...\n" - .string "MECHADOLL 1 AM I!\p" - .string "IF YOU ANSWER QUIZZES CORRECTLY,\n" - .string "THEN YOU WILL GO TO MECHADOLL 5.\l" - .string "THEN YOU CAN OBTAIN THE SECRET CODE.$" + .string "KLICK-KLACK...\n" + .string "ROBOPUPPE 1 ICH BIN!\p" + .string "GIBST DU IM QUIZ RICHTIGE ANTWORTEN,\n" + .string "ERREICHST DU BALD ROBOPUPPE 5.\l" + .string "DORT ERHÄLTST DU DEN GEHEIMEN CODE.$" Route110_TrickHousePuzzle5_Text_19D4AE:: @ 819D4AE - .string "MECHADOLL 1 QUIZ.\p" - .string "One of these POKéMON is not found\n" - .string "on ROUTE 103. Which one is it?$" + .string "ROBOPUPPE 1 QUIZ.\p" + .string "Eines dieser POKéMON kann man nicht\n" + .string "auf der ROUTE 103 finden. Welches?$" Route110_TrickHousePuzzle5_Text_19D501:: @ 819D501 - .string "MECHADOLL 1 QUIZ.\p" - .string "One of these POKéMON is not of the\n" - .string "GRASS type. Which one is it?$" + .string "ROBOPUPPE 1 QUIZ.\p" + .string "Eines dieser POKéMON ist kein\n" + .string "PFLANZEN-POKéMON. Welches?$" Route110_TrickHousePuzzle5_Text_19D553:: @ 819D553 - .string "MECHADOLL 1 QUIZ.\p" - .string "One of these POKéMON uses SCRATCH.\n" - .string "Which one is it?$" + .string "ROBOPUPPE 1 QUIZ.\p" + .string "Eines dieser POKéMON setzt\n" + .string "KRATZER ein. Welches?$" Route110_TrickHousePuzzle5_Text_19D599:: @ 819D599 - .string "CONGRATULATIONS. CORRECT YOU ARE.\n" - .string "GO THROUGH. PLEASE.$" + .string "GLÜCKWUNSCH! RICHTIG.\n" + .string "GEHE HINDURCH. BITTE.$" Route110_TrickHousePuzzle5_Text_19D5CF:: @ 819D5CF - .string "BZZZT. DISAPPOINTMENT.\n" - .string "ERROR.$" + .string "BZZZT. ENTTÄUSCHEND.\n" + .string "FEHLER.$" Route110_TrickHousePuzzle5_Text_19D5ED:: @ 819D5ED .string "WAHAHAHAHA! WAHAHAHAHA!\n" - .string "CLICKETY-CLACK!$" + .string "KLICK-KLACK!$" Route110_TrickHousePuzzle5_Text_19D615:: @ 819D615 - .string "YOUR NEXT CHALLENGE WE WAIT FOR.$" + .string "DEINE NÄCHSTE HERAUSFORDERUNG WIR\n" + .string "ERWARTEN.$" Route110_TrickHousePuzzle5_Text_19D636:: @ 819D636 - .string "CLICKETY-CLACK...\n" - .string "MECHADOLL 2 AM I!\p" - .string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n" - .string "IS SET TOO LOW.$" + .string "KLICK-KLACK...\n" + .string "ROBOPUPPE 2 ICH BIN!\p" + .string "ROBOPUPPE 1 QUIZ-SCHWIERIGKEITS-\n" + .string "GRAD IST ZU NIEDRIG.$" Route110_TrickHousePuzzle5_Text_19D68E:: @ 819D68E - .string "MECHADOLL 2 QUIZ.\p" - .string "In PROF. BIRCH’s bag, there were three\n" - .string "POKéMON. Which one was at the right?$" + .string "ROBOPUPPE 2 QUIZ.\p" + .string "In PROF. BIRKS Beutel befanden sich\n" + .string "drei POKéMON. Welches lag ganz rechts?$" Route110_TrickHousePuzzle5_Text_19D6EC:: @ 819D6EC - .string "MECHADOLL 2 QUIZ.\p" - .string "Which POKéMON was offered for a trade\n" - .string "at the POKéMON TRAINER’S SCHOOL?$" + .string "ROBOPUPPE 2 QUIZ.\p" + .string "Welches POKéMON wurde in der POKéMON\n" + .string "TRAINERSCHULE zum Tausch angeboten?$" Route110_TrickHousePuzzle5_Text_19D745:: @ 819D745 - .string "MECHADOLL 2 QUIZ.\p" - .string "The DEVON RESEARCHER was looking for\n" - .string "what POKéMON in PETALBURG WOODS?$" + .string "ROBOPUPPE 2 QUIZ.\p" + .string "Welches POKéMON hat der FORSCHER von\n" + .string "DEVON im BLÜTENBURGWALD gesucht?$" UnknownString_819D79D: @ 819D79D - .string "CONGRATULATIONS. CORRECT YOU ARE.\n" - .string "GO THROUGH. PLEASE.$" + .string "GLÜCKWUNSCH! RICHTIG.\n" + .string "GEHE HINDURCH. BITTE.$" Route110_TrickHousePuzzle5_Text_19D7D3:: @ 819D7D3 - .string "CLICKETY-CLACK...\n" - .string "MECHADOLL 3 AM I!\p" - .string "MATTERS OF MONEY ARE MY SOLE FOCUS.$" + .string "KLICK-KLACK...\n" + .string "ROBOPUPPE 3 ICH BIN!\p" + .string "FÜR MICH ZÄHLT NUR GELD.$" Route110_TrickHousePuzzle5_Text_19D81B:: @ 819D81B - .string "MECHADOLL 3 QUIZ.\p" - .string "Which costs more?\n" - .string "Three POKé BALLS or one SUPER POTION?$" + .string "ROBOPUPPE 3 QUIZ.\p" + .string "Was ist teurer?\n" + .string "Drei POKéBÄLLE oder ein SUPERTRANK?$" Route110_TrickHousePuzzle5_Text_19D865:: @ 819D865 - .string "MECHADOLL 3 QUIZ.\p" - .string "Sell one ESCAPE ROPE and buy\n" - .string "one ANTIDOTE. How much money remains?$" + .string "ROBOPUPPE 3 QUIZ.\p" + .string "Verkaufe ein FLUCHTSEIL und kaufe ein\n" + .string "GEGENGIFT. Wie viel Geld bleibt übrig?$" Route110_TrickHousePuzzle5_Text_19D8BA:: @ 819D8BA - .string "MECHADOLL 3 QUIZ.\p" - .string "Do one FULL HEAL and GREAT BALL\n" - .string "cost more than one REVIVE?$" + .string "ROBOPUPPE 3 QUIZ.\p" + .string "Kosten ein HYPERHEILER und ein\n" + .string "SUPERBALL mehr als ein BELEBER?$" UnknownString_819D907: @ 819D907 - .string "CONGRATULATIONS. CORRECT YOU ARE.\n" - .string "GO THROUGH. PLEASE.$" + .string "GLÜCKWUNSCH! RICHTIG.\n" + .string "GEHE HINDURCH. BITTE.$" Route110_TrickHousePuzzle5_Text_19D93D:: @ 819D93D - .string "CLICKETY-CLACK...\n" - .string "MECHADOLL 4 THAT IS ME!\p" - .string "MY QUIZ IS AN OBJECT OF BEAUTY.$" + .string "KLICK-KLACK...\n" + .string "ROBOPUPPE 4 ICH BIN!\p" + .string "ICH INTERESSIERE MICH FÜR SCHÖNES.$" Route110_TrickHousePuzzle5_Text_19D987:: @ 819D987 - .string "MECHADOLL 4 QUIZ.\p" - .string "RUSTBORO GYM LEADER ROXANNE used a\n" - .string "GEODUDE. Was it male or female?$" + .string "ROBOPUPPE 4 QUIZ.\p" + .string "ARENALEITERIN FELIZIA in METAROST\n" + .string "CITY kämpft mit KLEINSTEIN. Ist es\l" + .string "männlich oder weiblich?$" Route110_TrickHousePuzzle5_Text_19D9DC:: @ 819D9DC - .string "MECHADOLL 4 QUIZ.\p" - .string "In DEWFORD HALL, were there more men\n" - .string "or women?$" + .string "ROBOPUPPE 4 QUIZ.\p" + .string "Befanden sich in der FAUSTAUHAVEN\n" + .string "HALLE mehr Männer oder mehr Frauen?$" Route110_TrickHousePuzzle5_Text_19DA1D:: @ 819DA1D - .string "MECHADOLL 4 QUIZ.\p" - .string "The first TRAINER in DEWFORD GYM was\n" - .string "male or female?$" + .string "ROBOPUPPE 4 QUIZ.\p" + .string "Der erste TRAINER in der ARENA von\n" + .string "FAUSTAUHAVEN, war der männlich oder\l" + .string "weiblich?$" UnknownString_819DA64: @ 819DA64 - .string "CONGRATULATIONS. CORRECT YOU ARE.\n" - .string "GO THROUGH. PLEASE.$" + .string "GLÜCKWUNSCH! RICHTIG.\n" + .string "GEHE HINDURCH. BITTE.$" Route110_TrickHousePuzzle5_Text_19DA9A:: @ 819DA9A - .string "CLICKETY-CLACK...\n" - .string "MECHADOLL 5 AM I!\p" - .string "THE MASTER’S BEST AND PROUDEST\n" - .string "ACHIEVEMENT AM I.$" + .string "KLICK-KLACK...\n" + .string "ROBOPUPPE 5 ICH BIN!\p" + .string "DES MEISTERS BESTE UND STOLZESTE\n" + .string "ERFINDUNG ICH BIN.$" Route110_TrickHousePuzzle5_Text_19DAEF:: @ 819DAEF - .string "MECHADOLL 5 QUIZ.\p" - .string "How many BIKES does RYDEL have on\n" - .string "display outside his cycle shop?$" + .string "ROBOPUPPE 5 QUIZ.\p" + .string "Wie viele RÄDER stehen bei\n" + .string "RADLA vor dem Laden?$" Route110_TrickHousePuzzle5_Text_19DB43:: @ 819DB43 - .string "MECHADOLL 5 QUIZ.\p" - .string "How many people give you BERRIES at the\n" - .string "PRETTY PETAL flower shop?$" + .string "ROBOPUPPE 5 QUIZ.\p" + .string "Von wie vielen Leuten bekommst du im\n" + .string "BLÜTENTRAUM BLUMENLADEN BEEREN?$" Route110_TrickHousePuzzle5_Text_19DB97:: @ 819DB97 - .string "MECHADOLL 5 QUIZ.\p" - .string "How many signs are there in\n" - .string "LILYCOVE CITY?$" + .string "ROBOPUPPE 5 QUIZ.\p" + .string "Wie viele Schilder gibt es in\n" + .string "SEEGRASULB CITY?$" UnknownString_819DBD4: @ 819DBD4 - .string "CONGRATULATIONS. CORRECT YOU ARE.\n" - .string "GO THROUGH. PLEASE.$" + .string "GLÜCKWUNSCH! RICHTIG.\n" + .string "GEHE HINDURCH. BITTE.$" UnknownString_819DC0A: @ 819DC0A - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is my life.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“RÄTSELMEISTER ist mein Leben.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle6.inc b/data/text/maps/Route110_TrickHousePuzzle6.inc index 7fb5aa914..0bf347297 100644 --- a/data/text/maps/Route110_TrickHousePuzzle6.inc +++ b/data/text/maps/Route110_TrickHousePuzzle6.inc @@ -1,42 +1,43 @@ Route110_TrickHousePuzzle6_Text_19DC87:: @ 819DC87 - .string "When I heard there was a strange\n" - .string "house, I had to check it out.$" + .string "Als ich von dem seltsamen Haus hörte,\n" + .string "musste ich mir das sofort ansehen.$" Route110_TrickHousePuzzle6_Text_19DCC6:: @ 819DCC6 - .string "I’ve discovered a tough TRAINER!$" + .string "Ich habe einen starken TRAINER\n" + .string "entdeckt!$" Route110_TrickHousePuzzle6_Text_19DCE7:: @ 819DCE7 - .string "I’m sure having a good time checking\n" - .string "this place out.\p" - .string "It’s a challenge I’ve found worth\n" - .string "repeating!$" + .string "Es hat viel Spaß gemacht, diesen Ort zu\n" + .string "erforschen.\p" + .string "Eine Herausforderung, die ich gerne\n" + .string "wiederholen möchte!$" Route110_TrickHousePuzzle6_Text_19DD49:: @ 819DD49 - .string "Maybe I could get my BIRD POKéMON\n" - .string "to fly over the wall...$" + .string "Vielleicht kann mein VOGEL-POKéMON\n" + .string "über die Mauer fliegen...$" Route110_TrickHousePuzzle6_Text_19DD83:: @ 819DD83 - .string "Gwaaah! I blew it!$" + .string "Uaah! Ich hab’s vermasselt!$" Route110_TrickHousePuzzle6_Text_19DD96:: @ 819DD96 - .string "Ehehehe... I guess I lost because I\n" - .string "was trying to cheat.$" + .string "Hihihihi... Ich habe doch nur verloren,\n" + .string "weil ich bescheißen wollte.$" Route110_TrickHousePuzzle6_Text_19DDCF:: @ 819DDCF - .string "I’m getting dizzy from these rotating\n" - .string "doors...$" + .string "Mir wird ganz schwindelig von diesen\n" + .string "rotierenden Türen... Huuh...$" Route110_TrickHousePuzzle6_Text_19DDFE:: @ 819DDFE - .string "Everything’s spinning around and\n" - .string "around. I can’t take this anymore...$" + .string "Bei mir dreht sich alles. Mir wird übel.\n" + .string "Ich kann nicht mehr...$" Route110_TrickHousePuzzle6_Text_19DE44:: @ 819DE44 - .string "You don’t seem to be affected at all.\n" - .string "Or do you have your poker face on?$" + .string "Dir scheint das gar nichts auszumachen.\n" + .string "Oder ist das nur Show?$" UnknownString_819DE8D: @ 819DE8D - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER is huggable.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“RÄTSELMEISTER ist riesig.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle7.inc b/data/text/maps/Route110_TrickHousePuzzle7.inc index e8ce4b3a4..3111fcb65 100644 --- a/data/text/maps/Route110_TrickHousePuzzle7.inc +++ b/data/text/maps/Route110_TrickHousePuzzle7.inc @@ -1,42 +1,42 @@ Route110_TrickHousePuzzle7_Text_19DF0B:: @ 819DF0B - .string "The TRICK MASTER always vanishes\n" - .string "like smoke. How does he do it?$" + .string "Der RÄTSELMEISTER verschwindet immer\n" + .string "wie Rauch. Wie macht er das nur?$" Route110_TrickHousePuzzle7_Text_19DF4B:: @ 819DF4B - .string "Aiyeeeh! You’re much too strong!\n" - .string "How do you do it?$" + .string "Aiijeeh! Du bist viel zu stark!\n" + .string "Wie machst du das nur?$" Route110_TrickHousePuzzle7_Text_19DF7E:: @ 819DF7E - .string "I wish I could appear and disappear as\n" - .string "if I were smoke, too.$" + .string "Ich wollte, ich könnte mich auch wie\n" + .string "Rauch in Luft auflösen...$" Route110_TrickHousePuzzle7_Text_19DFBB:: @ 819DFBB - .string "Going around the same spot...\n" - .string "It begets ill fortune...$" + .string "Immer am gleichen Ort herumgeistern...\n" + .string "Das bringt Unglück...$" Route110_TrickHousePuzzle7_Text_19DFF2:: @ 819DFF2 - .string "Defeated!\n" - .string "It’s a bad sign...$" + .string "Besiegt!\n" + .string "Das ist ein schlechtes Omen...$" Route110_TrickHousePuzzle7_Text_19E00F:: @ 819E00F - .string "I’ve circled the same spot over ten\n" - .string "times now... It’s ill fortune...$" + .string "Ich bin nun schon zehn Mal an diesem Ort\n" + .string "herumgegeistert. Daher hatte ich Pech!$" Route110_TrickHousePuzzle7_Text_19E054:: @ 819E054 - .string "Whoever wins will get through here\n" - .string "first. That’s the feeling I get.$" + .string "Ich glaube, der Sieger wird der erste\n" + .string "Gewinner an diesem Ort überhaupt sein.$" Route110_TrickHousePuzzle7_Text_19E098:: @ 819E098 - .string "Oh!\n" - .string "Well, go ahead, then!$" + .string "Ah!\n" + .string "Dann geh hurtig weiter!$" Route110_TrickHousePuzzle7_Text_19E0B2:: @ 819E0B2 - .string "You’re solving all the puzzles in the\n" - .string "TRICK HOUSE. That’s the feeling I get.$" + .string "Ich glaube, du wirst alle Rätsel in\n" + .string "diesem RÄTSELHAUS lösen!$" UnknownString_819E0FF: @ 819E0FF - .string "{PLAYER} wrote down the secret code\n" - .string "on the door.\p" - .string "“TRICK MASTER I love.”\n" + .string "{PLAYER} hat den geheimen Code auf die\n" + .string "Tür geschrieben.\p" + .string "“Ich liebe den RÄTSELMEISTER.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "The lock clicked open!$" + .string "Das Schloss geht klickend auf.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle8.inc b/data/text/maps/Route110_TrickHousePuzzle8.inc index 8b0025bfb..74a7c868b 100644 --- a/data/text/maps/Route110_TrickHousePuzzle8.inc +++ b/data/text/maps/Route110_TrickHousePuzzle8.inc @@ -1,34 +1,34 @@ Route110_TrickHousePuzzle8_Text_19E178:: @ 819E178 - .string "Not many TRAINERS have made it\n" - .string "this far.$" + .string "Nicht viele TRAINER haben es bis\n" + .string "hierher geschafft.$" Route110_TrickHousePuzzle8_Text_19E1A1:: @ 819E1A1 - .string "That must mean you’re tough, too...$" + .string "Das bedeutet, dass du sehr stark bist...$" Route110_TrickHousePuzzle8_Text_19E1C5:: @ 819E1C5 - .string "You’ve beaten the POKéMON LEAGUE\n" - .string "CHAMPION? That’s too much!$" + .string "Du hast den CHAMP der POKéMON LIGA\n" + .string "besiegt? Das ist zu viel für mich!$" Route110_TrickHousePuzzle8_Text_19E201:: @ 819E201 - .string "Consider yourself lucky to be\n" - .string "battling me!$" + .string "Sieh es als Glücksfall an, dass du gegen\n" + .string "mich antreten darfst.$" Route110_TrickHousePuzzle8_Text_19E22C:: @ 819E22C - .string "This isn’t right!\n" - .string "I can’t lose!$" + .string "Das ist nicht korrekt!\n" + .string "Ich darf nicht verlieren!$" Route110_TrickHousePuzzle8_Text_19E24C:: @ 819E24C - .string "It’s a miracle that you beat me.\n" - .string "You can brag about it.$" + .string "Nur ein Wunder hat dir zu diesem Sieg\n" + .string "verholfen. Prahl doch damit...$" Route110_TrickHousePuzzle8_Text_19E284:: @ 819E284 - .string "You’ve been slugging through the TRICK\n" - .string "HOUSE challenge, too.$" + .string "Du schleichst hier auch durch das\n" + .string "RÄTSELHAUS?$" Route110_TrickHousePuzzle8_Text_19E2C1:: @ 819E2C1 - .string "I see...\n" - .string "You possess an extraordinary style.$" + .string "Ich verstehe...\n" + .string "Du hast einen außergewöhnlichen Stil.$" Route110_TrickHousePuzzle8_Text_19E2EE:: @ 819E2EE - .string "Seeing someone like you should please\n" - .string "the TRICK MASTER.$" + .string "Dein Anblick wird den RÄTSELMEISTER\n" + .string "bestimmt erfreuen.$" diff --git a/data/text/maps/Route111.inc b/data/text/maps/Route111.inc index 24bcc1008..fc7eba19a 100644 --- a/data/text/maps/Route111.inc +++ b/data/text/maps/Route111.inc @@ -1,119 +1,120 @@ Route111_Text_16F705:: @ 816F705 - .string "Hello! I take it you’re a traveler.\p" - .string "How’s this? What do you say to taking\n" - .string "on our family of four in a series of\l" - .string "POKéMON battles?$" + .string "Hallo! Ich hab’s, du bist ein Reisender.\p" + .string "Was hältst du davon? Du trittst mit\n" + .string "deinen POKéMON gegen alle vier Familien-\l" + .string "mitglieder hintereinander an?$" Route111_Text_16F785:: @ 816F785 - .string "Is that so?\n" - .string "Drop in, if you change your mind!$" + .string "Ach, wirklich? Nun, wenn du deine\n" + .string "Meinung änderst, komm einfach wieder.$" Route111_Text_16F7B3:: @ 816F7B3 - .string "That’s the spirit! I like you!$" + .string "Das nenne ich Kampfgeist! Ich mag dich!$" Route111_Text_16F7D2:: @ 816F7D2 .string "Aiyah!\n" - .string "You’re a lot tougher than I expected!$" + .string "Du bist stärker, als ich dachte.$" Route111_Text_16F7FF:: @ 816F7FF - .string "Hey, all!\n" - .string "I’ve found a pretty strong TRAINER!$" + .string "Hey, ihr! Ich habe einen starken\n" + .string "TRAINER gefunden!$" Route111_Text_16F82D:: @ 816F82D - .string "Oh, my goodness! Aren’t you young?\p" - .string "You must be quite the TRAINER to beat\n" - .string "my husband, though.\p" - .string "It’s my turn to battle now!$" + .string "Oh, du meine Güte! Bist du jung!\p" + .string "Du musst ein sehr guter TRAINER sein,\n" + .string "wenn du meinen Mann besiegen konntest.\p" + .string "Nun bin ich an der Reihe.$" Route111_Text_16F8A6:: @ 816F8A6 - .string "Oh, gosh!\n" - .string "I can’t get over how strong you are!$" + .string "Ach, nein! Ich komme nicht darüber\n" + .string "hinweg, wie stark du bist!$" Route111_Text_16F8D5:: @ 816F8D5 - .string "There’s a strong TRAINER here!\n" - .string "This one’s really strong!$" + .string "Hier draußen ist ein starker TRAINER!\n" + .string "Ein wirklich starker, sage ich euch!$" Route111_Text_16F90E:: @ 816F90E - .string "You’re stronger than Mommy? Wow!\p" - .string "But I’m strong, too!\n" - .string "Really! Honestly!$" + .string "Du bist stärker als Mami? Wow!\p" + .string "Aber ich bin auch stark!\n" + .string "Wirklich! Ganz ehrlich!$" Route111_Text_16F956:: @ 816F956 - .string "Huh? Did I just lose?$" + .string "Was? Habe ich verloren?$" Route111_Text_16F96C:: @ 816F96C - .string "This stinks...\p" - .string "...Snivel... Grandma!$" + .string "Das ist gemein...\p" + .string "...Schluchz... Heul... Omaaaaa... Schluchz...$" Route111_Text_16F991:: @ 816F991 - .string "How dare you make my granddaughter\n" - .string "cry!\p" - .string "For that, I’m going to smack you!\n" - .string "Prepare to lose!$" + .string "Wie konntest du nur meine Enkelin zum\n" + .string "Weinen bringen? Schäm dich!\p" + .string "Dafür werde ich dich in Grund und Boden\n" + .string "stampfen. Mach dich auf was gefasst!$" Route111_Text_16F9EC:: @ 816F9EC - .string "Kwah! You are strong...\n" - .string "My granddaughter was right...$" + .string "Uaah! Du bist stark...\n" + .string "Meine Enkelin hatte Recht...$" Route111_Text_16FA22:: @ 816FA22 - .string "If you’re not in any hurry, visit with\n" - .string "us awhile.$" + .string "Wenn du es nicht allzu eilig hast,\n" + .string "besuche uns doch mal wieder!$" Route111_Text_16FA54:: @ 816FA54 - .string "You found the ROOT FOSSIL.\p" - .string "If this FOSSIL is taken, the other\n" - .string "one will sink into the sand...\p" - .string "Take the ROOT FOSSIL anyway?$" + .string "Du hast das WURZELFOSSIL gefunden.\p" + .string "Wenn du dieses FOSSIL nimmst,\n" + .string "versinkt das andere im Sand...\p" + .string "Willst du das WURZELFOSSIL nehmen?$" Route111_Text_16FACE:: @ 816FACE - .string "{PLAYER} left the ROOT FOSSIL alone.$" + .string "{PLAYER} lässt das WURZELFOSSIL liegen.$" Route111_Text_16FAED:: @ 816FAED - .string "You found the CLAW FOSSIL.\p" - .string "If this FOSSIL is taken, the other\n" - .string "one will sink into the sand...\p" - .string "Take the CLAW FOSSIL anyway?$" + .string "Du hast das KLAUENFOSSIL gefunden.\p" + .string "Wenn du dieses FOSSIL nimmst,\n" + .string "versinkt das andere im Sand...\p" + .string "Willst du das KLAUENFOSSIL nehmen?$" Route111_Text_16FB67:: @ 816FB67 - .string "{PLAYER} left the CLAW FOSSIL alone.$" + .string "{PLAYER} lässt das KLAUENFOSSIL liegen.$" Route111_Text_16FB86:: @ 816FB86 - .string "If you don’t raise your POKéMON some\n" - .string "more, it could be tough to keep winning\l" - .string "up through the ranks.\p" - .string "I’ve heard the POKéMON LEAGUE’s\n" - .string "ELITE FOUR are far stronger than\l" - .string "any GYM LEADER.$" + .string "Wenn du deine POKéMON nicht ein\n" + .string "bisschen besser trainierst, wird es\l" + .string "schwer, sich hier durchzukämpfen.\p" + .string "Ich habe gehört, dass die TOP VIER der\n" + .string "POKéMON LIGA um einiges schwerer zu\l" + .string "besiegen sind als die ARENALEITER.$" Route111_Text_16FC3A:: @ 816FC3A - .string "I challenged the WINSTRATE family,\n" - .string "but four matches in a row is tough\l" - .string "going... They destroyed me.$" + .string "Ich habe die Familie SIHGERS heraus-\n" + .string "gefordert und viermal hintereinander\l" + .string "gekämpft... Hinterher war ich kaputt...$" Route111_Text_16FC9C:: @ 816FC9C .string "ROUTE 111\n" - .string "{0x7A} MAUVILLE CITY$" + .string "{DOWN_ARROW} MALVENFROH CITY$" Route111_Text_16FCB6:: @ 816FCB6 - .string "“Our family’s hearts beat as one!”\n" - .string "THE WINSTRATE’S HOUSE$" + .string "“Die Herzen unserer Familie schlagen im\n" + .string "Einklang!”\l" + .string "DAS HAUS DER SIHGERS$" Route111_Text_16FCEF:: @ 816FCEF .string "ROUTE 111\n" - .string "{0x7B} ROUTE 112$" + .string "{LEFT_ARROW} ROUTE 112$" Route111_Text_16FD05:: @ 816FD05 .string "ROUTE 111\n" - .string "{0x7B} ROUTE 113$" + .string "{LEFT_ARROW} ROUTE 113$" Route111_Text_16FD1B:: @ 816FD1B - .string "OLD LADY’S REST STOP\n" - .string "“Come in and rest your tired bones.”$" + .string "HOTEL DER ALTEN DAME\n" + .string "“Komm, ruh deine müden Knochen aus.”$" Route111_Text_16FD55:: @ 816FD55 - .string "TRAINER TIPS\p" - .string "One of the indicators of a POKéMON’s\n" - .string "powerfulness is SP. ATK. It stands for\l" - .string "“SPECIAL ATTACK.”\p" - .string "Likewise, SP. DEF stands for “SPECIAL\n" - .string "DEFENSE.”$" + .string "TIPPS für TRAINER\p" + .string "Ein Indikator für die Stärke eines\n" + .string "POKéMON ist der SP. ANG. Das steht\l" + .string "für “SPEZIAL ANGRIFF”.\p" + .string "SP. VER. steht für “SPEZIAL\n" + .string "VERTEIDIGUNG”.$" diff --git a/data/text/maps/Route111_OldLadysRestStop.inc b/data/text/maps/Route111_OldLadysRestStop.inc index aeef47a32..e65bb57e7 100644 --- a/data/text/maps/Route111_OldLadysRestStop.inc +++ b/data/text/maps/Route111_OldLadysRestStop.inc @@ -1,19 +1,19 @@ Route111_OldLadysRestStop_Text_1923AF:: @ 81923AF - .string "Oh, dear, dear.\n" - .string "Aren’t your POKéMON exhausted?\p" - .string "If you’d like, rest up here.\n" - .string "That’s a fine idea! You should do that.$" + .string "Oh, du meine Güte.\n" + .string "Sind deine POKéMON nicht erschöpft?\p" + .string "Wenn du magst, ruhe dich doch hier aus.\n" + .string "Das ist doch eine gute Idee, oder?$" Route111_OldLadysRestStop_Text_192423:: @ 8192423 - .string "That’s right.\n" - .string "Take your time and rest up!$" + .string "Genau.\n" + .string "Nimm dir Zeit und ruhe dich aus.$" Route111_OldLadysRestStop_Text_19244D:: @ 819244D - .string "Oh, dear, dear.\n" - .string "Are your POKéMON still tired?\p" - .string "You should take another rest here.\n" - .string "That’s a fine idea. You should do that.$" + .string "Oh, du meine Güte.\n" + .string "Sind deine POKéMON immer noch müde?\p" + .string "Dann solltest du dich noch länger hier\n" + .string "ausruhen. Was meinst du?$" Route111_OldLadysRestStop_Text_1924C6:: @ 81924C6 - .string "Is that so?\n" - .string "You don’t need to be shy about it.$" + .string "Ach so. Na, das macht doch nichts!\n" + .string "Besuche mich bald wieder.$" diff --git a/data/text/maps/Route111_WinstrateFamilysHouse.inc b/data/text/maps/Route111_WinstrateFamilysHouse.inc index e1986320b..b7342721a 100644 --- a/data/text/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/text/maps/Route111_WinstrateFamilysHouse.inc @@ -1,43 +1,49 @@ Route111_WinstrateFamilysHouse_Text_191FCE:: @ 8191FCE - .string "You’re the first TRAINER I’ve seen who\n" - .string "deploys POKéMON so masterfully.\p" - .string "But, I should tell you - my son is\n" - .string "stronger than you.\p" - .string "He even took the POKéMON LEAGUE\n" - .string "challenge, I’ll have you know.$" + .string "Ich habe noch nie einen TRAINER ge-\n" + .string "sehen, der seine POKéMON so meister-\l" + .string "haft einsetzt wie du.\p" + .string "Aber, ich muss dir auch sagen... Mein\n" + .string "Sohn ist stärker als du.\p" + .string "Er hat sogar die POKéMON LIGA heraus-\n" + .string "gefordert. Das solltest du wissen.$" Route111_WinstrateFamilysHouse_Text_19208A:: @ 819208A - .string "We use this MACHO BRACE to more\n" - .string "effectively strengthen our POKéMON\l" - .string "in training.\p" - .string "Since you’ve beaten our entire family,\n" - .string "I don’t know if you need it, but we\l" - .string "would like you to have our MACHO BRACE.$" + .string "Wir benutzen dieses MACHOBAND, um die\n" + .string "POKéMON im Training noch mehr\l" + .string "zu stärken.\p" + .string "Da du unsere gesamte Familie besiegt\n" + .string "hast, brauchst du es vielleicht gar\l" + .string "nicht. Aber wir möchten dir dieses\l" + .string "MACHOBAND trotzdem gerne schenken.$" Route111_WinstrateFamilysHouse_Text_19214D:: @ 819214D - .string "When it comes to POKéMON battles,\n" - .string "we tend to be pretty passionate.$" + .string "Wenn es um POKéMON-Kämpfe geht, ist\n" + .string "die ganze Familie sehr leidenschaftlich.$" Route111_WinstrateFamilysHouse_Text_192190:: @ 8192190 - .string "Mommy is stronger than Daddy.\p" - .string "I’m stronger than Mommy.\p" - .string "And Grandma’s stronger than me!\p" - .string "But my big brother is even stronger\n" - .string "than Grandma.$" + .string "Mami ist stärker als Papi.\p" + .string "Ich bin stärker als Mami.\p" + .string "Und Omi ist stärker als ich!\p" + .string "Und mein großer Bruder ist noch\n" + .string "stärker als Omi!$" Route111_WinstrateFamilysHouse_Text_192219:: @ 8192219 - .string "There’s no question that you’re strong.\p" - .string "But if you were to battle my grandson,\n" - .string "you’d end up crying in frustration.\p" - .string "He’s much stronger than any TRAINER\n" - .string "our family knows.\p" - .string "He must be challenging the POKéMON\n" - .string "LEAGUE CHAMPION by now.\p" - .string "Knowing my grandson, he could be the\n" - .string "CHAMPION already!$" + .string "Es steht außer Frage, dass du stark\n" + .string "bist.\p" + .string "Aber wenn du gegen meinen Enkel an-\n" + .string "treten willst, bringt dir das nur Tränen\l" + .string "der Frustration ein.\p" + .string "Er ist viel stärker als jeder TRAINER,\n" + .string "den unsere Familie kennt.\p" + .string "Er müsste jetzt gerade eigentlich dabei\n" + .string "sein, die POKéMON LIGA\l" + .string "herauszufordern.\p" + .string "Wie ich meinen Enkel kenne, ist er\n" + .string "mittlerweile bestimmt schon der CHAMP!$" Route111_WinstrateFamilysHouse_Text_192334:: @ 8192334 - .string "My grandson must be challenging the\n" - .string "POKéMON LEAGUE CHAMPION by now.\p" - .string "Knowing my grandson, he could be the\n" - .string "CHAMPION already!$" + .string "Mein Enkel müsste jetzt gerade dabei\n" + .string "sein, die POKéMON LIGA\l" + .string "herauszufordern.\p" + .string "Wie ich meinen Enkel kenne, ist er\n" + .string "mittlerweile bestimmt schon der CHAMP!$" diff --git a/data/text/maps/Route112.inc b/data/text/maps/Route112.inc index c967c562c..dfda876ce 100644 --- a/data/text/maps/Route112.inc +++ b/data/text/maps/Route112.inc @@ -1,27 +1,28 @@ Route112_Text_16FDF0:: @ 816FDF0 - .string "Grumble...\p" - .string "What happened to the others who went\n" - .string "to FALLARBOR? They’re late...$" + .string "Grummel...\p" + .string "Wo bleiben nur die anderen, die in LAUB-\n" + .string "WECHSELFELD waren? Sie sind spät dran.$" Route112_Text_16FE3E:: @ 816FE3E - .string "Grumble...\p" - .string "I’d like to ride the CABLE CAR to the\n" - .string "top, too..$" + .string "Grummel...\p" + .string "Ich möchte auch mit der SEILBAHN nach\n" + .string "oben auf den Gipfel fahren...$" Route112_Text_16FE7A:: @ 816FE7A - .string "Eh, I’d like to get to MAUVILLE, but if\n" - .string "I went down these ledges, it’d be no\l" - .string "easy matter to get back to LAVARIDGE.$" + .string "Ich würde gerne nach MALVENFROH CITY,\n" + .string "aber wenn ich diese Stufen hinunter-\p" + .string "gehe, komme ich kaum wieder nach\n" + .string "BAD LAVASTADT.$" Route112_Text_16FEED:: @ 816FEED - .string "MT. CHIMNEY CABLE CAR\n" - .string "“A short walk {0x79} way!”$" + .string "SEILBAHN ZUM SCHLOTBERG\n" + .string "“Ein kurzer Weg nach {UP_ARROW}!”$" Route112_Text_16FF19:: @ 816FF19 - .string "MT. CHIMNEY\p" - .string "“For LAVARIDGE TOWN or the summit,\n" - .string "please take the CABLE CAR.”$" + .string "SCHLOTBERG\p" + .string "“BAD LAVASTADT oder den Gipfel\n" + .string "erreichen Sie mit der SEILBAHN.”$" Route112_Text_16FF64:: @ 816FF64 .string "ROUTE 112\n" - .string "{0x7B} LAVARIDGE TOWN$" + .string "{LEFT_ARROW} BAD LAVASTADT$" diff --git a/data/text/maps/Route112_CableCarStation.inc b/data/text/maps/Route112_CableCarStation.inc index 245172542..bce76d721 100644 --- a/data/text/maps/Route112_CableCarStation.inc +++ b/data/text/maps/Route112_CableCarStation.inc @@ -1,9 +1,9 @@ Route112_CableCarStation_Text_1924F5:: @ 81924F5 - .string "The CABLE CAR is ready to go up.\n" - .string "Would you like to be on it?$" + .string "Die SEILBAHN fährt gleich hinauf.\n" + .string "Möchtest du mit?$" UnknownString_8192532: @ 8192532 - .string "Please step this way.$" + .string "Bitte hier entlang.$" Route112_CableCarStation_Text_192548:: @ 8192548 - .string "Please ride with us another time.$" + .string "Dann fahre bitte später mit uns.$" diff --git a/data/text/maps/Route113.inc b/data/text/maps/Route113.inc index 2ce41fda9..e9b3abeb5 100644 --- a/data/text/maps/Route113.inc +++ b/data/text/maps/Route113.inc @@ -1,30 +1,30 @@ Route113_Text_16FF7F:: @ 816FF7F - .string "Wahahaha! Today’s technology is a\n" - .string "wondrous thing!\p" - .string "Take this volcanic ash here.\n" - .string "It can be fashioned into glass.$" + .string "Wahahaha! Die heutige Technologie ist\n" + .string "schon eine wundersame Sache!\p" + .string "Nimm zum Beispiel diese Vulkanasche\n" + .string "hier. Aus ihr kann man Glas machen!$" Route113_Text_16FFEE:: @ 816FFEE - .string "It’s fun walking through the volcano’s\n" - .string "ashes on the ground and grass.\p" - .string "You can see where you walked - it’s\n" - .string "really neat!$" + .string "Es macht Spaß, durch die Vulkanasche zu\n" + .string "laufen, über Boden und Gras.\p" + .string "Du kannst genau erkennen, wo du her-\n" + .string "gelaufen bist - total klasse!$" Route113_Text_170065:: @ 8170065 .string "ROUTE 113\n" - .string "{0x7C} ROUTE 111$" + .string "{RIGHT_ARROW} ROUTE 111$" Route113_Text_17007B:: @ 817007B .string "ROUTE 113\n" - .string "{0x7B} FALLARBOR TOWN$" + .string "{LEFT_ARROW} LAUBWECHSELFELD$" Route113_Text_170096:: @ 8170096 - .string "TRAINER TIPS\p" - .string "You may register one of the KEY ITEMS\n" - .string "in your BAG as SELECT.\p" - .string "Simply press SELECT to use the\n" - .string "registered item conveniently.$" + .string "TIPPS für TRAINER\p" + .string "Du kannst eines deiner BASIS-ITEMS in\n" + .string "deinem BEUTEL auf SELECT legen.\p" + .string "Durch Drücken von SELECT kannst du\n" + .string "so ganz bequem das Item einsetzen.$" Route113_Text_17011D:: @ 817011D - .string "GLASS WORKSHOP\n" - .string "“Turning Volcanic Ash into Glass Items”$" + .string "GLASWERKSTATT\n" + .string "“Glasdekor aus Vulkanasche.”$" diff --git a/data/text/maps/Route113_GlassWorkshop.inc b/data/text/maps/Route113_GlassWorkshop.inc index 2923255a4..37fa22f70 100644 --- a/data/text/maps/Route113_GlassWorkshop.inc +++ b/data/text/maps/Route113_GlassWorkshop.inc @@ -1,86 +1,88 @@ Route113_GlassWorkshop_Text_19E4E6:: @ 819E4E6 - .string "This area is covered in volcanic ash,\n" - .string "huff-puff!\p" - .string "I’m specially gifted, huff-puff.\p" - .string "I make glass out of volcanic ash\n" - .string "and make items, huff-puff.\p" - .string "Go collect ashes with this, huff-puff.$" + .string "Diese Region ist mit Vulkanasche\n" + .string "bedeckt! Schnauf, keuch...\p" + .string "Ich habe ein besonderes Talent.\n" + .string "Schnauf, keuch...\p" + .string "Ich mache aus der Asche Glas und stelle\n" + .string "daraus Items her. Schnauf, keuch...\p" + .string "Hiermit kannst du Asche sammeln.\n" + .string "Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E59B:: @ 819E59B - .string "Just take that SOOT SACK and walk\n" - .string "through piles of ash, huff-puff.\p" - .string "And it will fill up with the volcanic ash,\n" - .string "huff-puff.\p" - .string "Once you think you’ve collected a good\n" - .string "amount, come see me, huff-puff.$" + .string "Nimm diese ASCHETASCHE und lauf durch\n" + .string "die Asche. Schnauf, keuch...\p" + .string "Damit füllst du die ASCHETASCHE mit\n" + .string "Asche. Schnauf, keuch...\p" + .string "Und wenn du meinst, du hast genug ge-\n" + .string "sammelt, komm zu mir. Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E65B:: @ 819E65B - .string "Have you collected ashes, huff-puff?\n" - .string "Let me see, huff-puff.$" + .string "Hast du Asche gesammelt? Schnauf,\n" + .string "keuch. Zeig mal her. Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E697:: @ 819E697 - .string "Hmmm...\n" - .string "There’s not enough ash here, huff-puff.\l" - .string "I can’t make glass with this, huff-puff.\p" - .string "Let’s see... {STR_VAR_1} is the number of steps\n" - .string "you’ll need to walk for me to make you\l" - .string "a BLUE FLUTE, huff-puff.$" + .string "Hmmm... Das reicht aber nicht.\n" + .string "Schnauf, keuch. Daraus kann ich\l" + .string "kein Glas machen. Schnauf, keuch...\p" + .string "Mal sehen... Du musst noch {STR_VAR_1} Schritt/e\n" + .string "gehen, damit ich eine BLAUE FLÖTE her-\l" + .string "stellen kann. Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E757:: @ 819E757 - .string "Oh!\n" - .string "You’ve got a lot of ashes, huff-puff!\p" - .string "I’ll make you a glass item, huff-puff!\n" - .string "Which one would you like, huff-puff?$" + .string "Oh! Du hast aber viel Asche gesammelt.\n" + .string "Schnauf, keuch...\p" + .string "Ich mache dir ein Item aus Glas daraus.\n" + .string "Welches möchtest du? Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E7CD:: @ 819E7CD - .string "A {STR_VAR_1}, huff-puff?\n" - .string "Is that the one for you, huff-puff?$" + .string "Eine {STR_VAR_1}? Schnauf, keuch...\n" + .string "Das möchtest du haben? Schnauf, keuch.$" Route113_GlassWorkshop_Text_19E802:: @ 819E802 - .string "Which one would you like, huff-puff?$" + .string "Was möchtest du haben? Schnauf, keuch.$" Route113_GlassWorkshop_Text_19E827:: @ 819E827 - .string "A {STR_VAR_1} it is, then, huff-puff!\p" - .string "Okay! I’ll make it for you, huff-puff.\n" - .string "Just wait a little while, huff-puff.$" + .string "Eine {STR_VAR_1}? Schnauf, keuch...\p" + .string "O.K. Wird erledigt. Schnauf, keuch. Einen\n" + .string "Moment Geduld bitte. Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E890:: @ 819E890 - .string "A {STR_VAR_1}, huff-puff?\p" - .string "There’s not enough ash here to make\n" - .string "that, though, huff-puff.\p" - .string "Let’s see... {STR_VAR_2} is the number of steps\n" - .string "you’ll need to walk through volcanic ash\l" - .string "for me to make that item, huff-puff.\p" - .string "Which item would you rather have me\n" - .string "make instead, huff-puff?$" + .string "{STR_VAR_1}? Schnauf, keuch...\p" + .string "Du hast nicht genug Asche für dieses\n" + .string "Item mitgebracht. Schnauf, keuch...\p" + .string "Mal sehen... Du musst noch {STR_VAR_2}\n" + .string "Schritt/e gehen, damit ich dieses Item\l" + .string "herstellen kann. Schnauf, keuch.\p" + .string "Was möchtest du stattdessen haben?\n" + .string "Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E990:: @ 819E990 - .string "You’ve collected all that ash, but you\n" - .string "don’t want anything, huff-puff?$" + .string "Du hast all die Asche gesammelt und\n" + .string "willst nichts haben? Schnauf, keuch...$" Route113_GlassWorkshop_Text_19E9D7:: @ 819E9D7 - .string "Ah, I’ve finished your {STR_VAR_1}.\n" - .string "Take it, huff-puff.$" + .string "So, hier ist ein/e {STR_VAR_1} für\n" + .string "dich. Hier, für dich. Schnauf, keuch...$" Route113_GlassWorkshop_Text_19EA06:: @ 819EA06 - .string "Oh?\n" - .string "You’ve no room in your BAG, huff-puff.\p" - .string "I’ll hold on to it, so come back later,\n" - .string "huff-puff.$" + .string "Oh. In deinem BEUTEL ist kein Platz\n" + .string "dafür. Schnauf, keuch...\p" + .string "Ich verwahre es für dich. Hol es dir\n" + .string "einfach später ab. Schnauf, keuch...$" Route113_GlassWorkshop_Text_19EA64:: @ 819EA64 - .string "Oh?\n" - .string "You’ve no room in your PC, huff-puff?\p" - .string "I’ll hold on to it, so come back later,\n" - .string "huff-puff.$" + .string "Oh. Du hast keinen Platz auf deinem PC.\n" + .string "Schnauf, keuch...\p" + .string "Ich verwahre es für dich. Hol es dir\n" + .string "einfach später ab. Schnauf, keuch...$" Route113_GlassWorkshop_Text_19EAC1:: @ 819EAC1 - .string "Hah? You haven’t got your SOOT SACK\n" - .string "with you, huff-puff.\p" - .string "You have to keep it with you to collect\n" - .string "volcanic ash, huff-puff.$" + .string "Oh. Du hast die ASCHETASCHE nicht\n" + .string "dabei? Schnauf, keuch...\p" + .string "Du musst sie aber dabei haben, um Asche\n" + .string "sammeln zu können! Schnauf, keuch...$" Route113_GlassWorkshop_Text_19EB3B:: @ 819EB3B - .string "It’s fun to blow a glass flute while my\n" - .string "boss is talking.\p" - .string "Huff-huff! Puff-puff!$" + .string "Es macht Spaß, das Glas zu einer Flöte\n" + .string "zu blasen, wenn der Boss redet.\p" + .string "Schnauf, keuch! Pust, pust!$" diff --git a/data/text/maps/Route114.inc b/data/text/maps/Route114.inc index 9a46954da..059389be3 100644 --- a/data/text/maps/Route114.inc +++ b/data/text/maps/Route114.inc @@ -1,23 +1,24 @@ Route114_Text_170154:: @ 8170154 - .string "All my POKéMON does is ROAR...\n" - .string "No one dares to come near me...\p" - .string "Sigh... If you would, please take\n" - .string "this TM away...$" + .string "Alles was mein POKéMON von sich gibt, ist\n" + .string "BRÜLLER... Niemand wagt sich nah heran...\p" + .string "Seufz... Wenn du magst, dann nimm mir\n" + .string "diese Bürde... äh, diese TM ab...$" Route114_Text_1701C5:: @ 81701C5 - .string "TM05 contains ROAR.\n" - .string "A ROAR sends POKéMON scurrying.$" + .string "TM05 enthält BRÜLLER.\n" + .string "Ein BRÜLLER schlägt POKéMON in\l" + .string "die Flucht.$" Route114_Text_1701F9:: @ 81701F9 .string "Bow! Bowwow!$" Route114_Text_170206:: @ 8170206 - .string "METEOR FALLS\n" - .string "RUSTBORO CITY THROUGH HERE$" + .string "METEORFÄLLE\n" + .string "HIER ENTLANG NACH METAROST CITY$" Route114_Text_17022E:: @ 817022E - .string "FOSSIL MANIAC’S HOUSE\n" - .string "“Fossils gratefully accepted!”$" + .string "FOSSILMANIAC\n" + .string "“Fossilien gesucht!”$" Route114_Text_170263:: @ 8170263 - .string "LANETTE’S HOUSE$" + .string "LANETTES HAUS$" diff --git a/data/text/maps/Route114_FossilManiacsHouse.inc b/data/text/maps/Route114_FossilManiacsHouse.inc index 4515a161a..afc141338 100644 --- a/data/text/maps/Route114_FossilManiacsHouse.inc +++ b/data/text/maps/Route114_FossilManiacsHouse.inc @@ -1,21 +1,23 @@ Route114_FossilManiacsHouse_Text_1925E1:: @ 81925E1 - .string "My big brother’s the FOSSIL MANIAC...\n" - .string "He’s a nice guy who loves fossils...\p" - .string "He loves digging holes, too...\n" - .string "He dug this hole by himself...\p" - .string "You can have this, so you can DIG\n" - .string "holes just like my big brother...$" + .string "Mein großer Bruder ist ein FOSSIL-\n" + .string "MANIAC... Er ist ein netter Kerl, der\l" + .string "Fossilien liebt...\p" + .string "Er liebt es auch, Löcher zu graben...\n" + .string "Dieses Loch hat er alleine gegraben!\p" + .string "Hier, das kannst du haben. Damit kannst\n" + .string "du Löcher graben, wie mein Bruder...$" Route114_FossilManiacsHouse_Text_1926AE:: @ 81926AE - .string "If you make a POKéMON DIG inside a\n" - .string "cave, you’re returned to the entrance...$" + .string "Wenn ein POKéMON in einer Höhle\n" + .string "SCHAUFLER einsetzt, kommst du zum\l" + .string "Eingang zurück.$" Route114_FossilManiacsHouse_Text_1926FA:: @ 81926FA - .string "Rocks in peculiar shapes fill the\n" - .string "display case$" + .string "Steine in den unterschiedlichsten\n" + .string "Formen liegen im Glasschaukasten.$" Route114_FossilManiacsHouse_Text_192729:: @ 8192729 - .string "THE COMPOSITION OF STRATA...\n" - .string "HOW RAIN SHAPES THE LAND...\l" - .string "STONES, SOIL, AND ROCK...\p" - .string "It’s crammed with books.$" + .string "DIE ZUSAMMENSETZUNG DER ERDSCHICHT...\n" + .string "WIE REGEN DAS LAND FORMT...\l" + .string "STEINE, BODEN UND FELSEN...\p" + .string "Gerammelt voll mit Büchern.$" diff --git a/data/text/maps/Route114_FossilManiacsTunnel.inc b/data/text/maps/Route114_FossilManiacsTunnel.inc index cbcd6172d..82bd7cb5f 100644 --- a/data/text/maps/Route114_FossilManiacsTunnel.inc +++ b/data/text/maps/Route114_FossilManiacsTunnel.inc @@ -1,26 +1,26 @@ Route114_FossilManiacsTunnel_Text_192795:: @ 8192795 - .string "I’m the FOSSIL MANIAC...\n" - .string "I’m a nice guy who loves fossils...\p" - .string "Do you want a fossil?\p" - .string "But the fossils around these parts all\n" - .string "belong to me... None for you...\p" - .string "If you can’t go without a fossil, go to\n" - .string "the desert on ROUTE 111...\p" - .string "From what I’ve heard, fossils that were\n" - .string "buried in the sand sometimes rise to\l" - .string "the surface from sandstorms...$" + .string "Ich bin der FOSSILMANIAC... Ich bin\n" + .string "ein netter Typ, der Fossilien liebt...\p" + .string "Möchtest du ein Fossil haben?\p" + .string "Die Fossilien in dieser Gegend gehören\n" + .string "allerdings alle mir! Keines ist für dich...\p" + .string "Wenn du unbedingt ein Fossil haben\n" + .string "möchtest, geh in die Wüste bei\l" + .string "ROUTE 111...\p" + .string "Ich habe gehört, dass dort Fossilien,\n" + .string "die im Boden versteckt liegen, manchmal\l" + .string "durch Sandstürme freigelegt werden.$" Route114_FossilManiacsTunnel_Text_1928DE:: @ 81928DE - .string "You found a FOSSIL, didn’t you?\n" - .string "That’s so nice... It’s so dreamy...\p" - .string "What are you going to do with that\n" - .string "FOSSIL?\p" - .string "From what I’ve heard, DEVON is doing\n" - .string "research on reviving POKéMON from\l" - .string "FOSSILS...\p" - .string "I love my FOSSILS, so I would never\n" - .string "do anything like that...$" + .string "Du hast ein FOSSIL gefunden, stimmt’s?\n" + .string "Das ist schön... Traumhaft...\p" + .string "Was wirst du mit dem FOSSIL machen?\p" + .string "Ich habe gehört, dass DEVON versucht,\n" + .string "aus den FOSSILIEN POKéMON zum\l" + .string "Leben zu erwecken...\p" + .string "Ich liebe FOSSILIEN, daher würde ich\n" + .string "so etwas niemals machen...$" Route114_FossilManiacsTunnel_Text_1929DC:: @ 81929DC - .string "FOSSILS are so... Wonderful...\n" - .string "It’s so dreamy...$" + .string "FOSSILIEN sind so... Wundervoll...\n" + .string "Einfach traumhaft...$" diff --git a/data/text/maps/Route114_LanettesHouse.inc b/data/text/maps/Route114_LanettesHouse.inc index 5d6747895..d4f0e155d 100644 --- a/data/text/maps/Route114_LanettesHouse.inc +++ b/data/text/maps/Route114_LanettesHouse.inc @@ -1,56 +1,62 @@ Route114_LanettesHouse_Text_192A0D:: @ 8192A0D .string "LANETTE: Oh! {PLAYER}{KUN}!\p" - .string "I’m sorry everything is so cluttered...\n" - .string "When I get engrossed in research,\l" - .string "things end up this way...\p" - .string "This is embarrassing... Please keep\n" - .string "this a secret in exchange for this.$" + .string "Entschuldige, dass es hier so chaotisch\n" + .string "aussieht. Immer, wenn ich forsche,\l" + .string "vergesse ich aufzuräumen...\p" + .string "Das ist echt peinlich... Erzähl das bloß\n" + .string "niemandem! Ich gebe dir auch dies hier...$" Route114_LanettesHouse_Text_192ACC:: @ 8192ACC - .string "May I offer advice about my POKéMON\n" - .string "Storage System?\p" - .string "You should organize your BOXES so you\n" - .string "can tell which POKéMON are in them.$" + .string "Soll ich dir einige Hinweise zum POKéMON-\n" + .string "Lagerungs-System geben?\p" + .string "Du solltest deine BOXEN gut verwalten,\n" + .string "damit du weißt, welche POKéMON sich \l" + .string "in welcher BOX befinden...$" Route114_LanettesHouse_Text_192B4A:: @ 8192B4A - .string "It’s LANETTE’s research notes.\n" - .string "There’s information about BOXES.\p" - .string "Design BOXES to hold 30 POKéMON each.\p" - .string "Each TRAINER should be able to store\n" - .string "420 POKéMON on the PC system.\p" - .string "Keep reading?$" + .string "LANETTES Forschungs-Aufzeichnungen.\n" + .string "Das sind Informationen zu den BOXEN.\p" + .string "Es sollten BOXEN eingerichtet werden,\n" + .string "die jeweils 30 POKéMON aufnehmen\l" + .string "können.\p" + .string "Jeder TRAINER sollte in der Lage sein,\n" + .string "420 POKéMON im PC-System zu lagern.\p" + .string "Weiterlesen?$" Route114_LanettesHouse_Text_192C01:: @ 8192C01 - .string "A marking system should be added to\n" - .string "make POKéMON easier to organize.\p" - .string "The name and wallpaper design of each\n" - .string "BOX will be made changeable to please\l" - .string "the stored POKéMON.\p" - .string "Keep reading?$" + .string "Es muss ein Markierungssystem einge-\n" + .string "richtet werden, mit dem man eine gute\l" + .string "Übersicht über die POKéMON bekommt.\p" + .string "Der Name und der Hintergrund jeder BOX\n" + .string "lässt sich verändern, zur Freude der\l" + .string "darin gelagerten POKéMON.\p" + .string "Weiterlesen?$" Route114_LanettesHouse_Text_192CB4:: @ 8192CB4 - .string "When storing a POKéMON, it should be\n" - .string "sent to the BOX inspected last.\p" - .string "If that BOX is full, the received\n" - .string "POKéMON is stored in the next BOX.\p" - .string "In other words, when a BOX is examined,\n" - .string "it is automatically selected as the BOX\l" - .string "to which POKéMON are sent.$" + .string "Immer, wenn ein POKéMON gelagert wird,\n" + .string "wird es in der BOX gelagert, die als\l" + .string "Letzte geöffnet wurde.\p" + .string "Ist diese BOX voll, wird das POKéMON in\n" + .string "der nächsten BOX gelagert.\p" + .string "Mit anderen Worten, die zuletzt ge-\n" + .string "öffnete BOX wird automatisch gewählt,\l" + .string "um ein POKéMON zu lagern.$" Route114_LanettesHouse_Text_192DA9:: @ 8192DA9 - .string "{PLAYER} closed the notebook.$" + .string "{PLAYER} schließt das Notizbuch.$" Route114_LanettesHouse_Text_192DC1:: @ 8192DC1 - .string "There’s an e-mail from someone on\n" - .string "the PC.\p" + .string "Da ist eine E-Mail von jemandem\n" + .string "auf dem PC.\p" .string "“... ... ... ... ... ... ...\p" - .string "“Your Storage System offers more\n" - .string "convenience than mine.\p" - .string "“It has a lot of user-friendly features\n" - .string "that make it fun and useful, too.\p" - .string "“It makes me proud that I played\n" - .string "a part in its development.\p" - .string "“Here’s hoping that you’ll continue\n" - .string "research in Storage Systems.\p" - .string "“From BILL\n" + .string "Dein Lagerungs-System bietet viel mehr\n" + .string "Komfort als meines.\p" + .string "Es besitzt viele anwenderfreundliche\n" + .string "Features, die nützlich sind und Spaß\l" + .string "machen.\p" + .string "Es macht mich stolz, dass ich Teil\n" + .string "dieser Entwicklung war.\p" + .string "Ich hoffe sehr, du setzt deine For-\n" + .string "schungen in diesem Bereich weiter fort.\p" + .string "BILL\n" .string "... ... ... ... ... ... ... ...”$" diff --git a/data/text/maps/Route115.inc b/data/text/maps/Route115.inc index f5fc22b0d..d7b8bb4b2 100644 --- a/data/text/maps/Route115.inc +++ b/data/text/maps/Route115.inc @@ -1,13 +1,14 @@ Route115_Text_170273:: @ 8170273 - .string "Exploring a cave isn’t like walking\n" - .string "on a road.\p" - .string "You never know when wild POKéMON will\n" - .string "appear. It’s full of suspense.$" + .string "Höhlenforschung ist nicht mit einem\n" + .string "Spaziergang auf einer Straße zu\l" + .string "vergleichen.\p" + .string "Du weißt nie, wann ein wildes POKéMON\n" + .string "auftaucht. Du bist immer angespannt.$" Route115_Text_1702E7:: @ 81702E7 .string "ROUTE 115\n" - .string "{0x7A} RUSTBORO CITY$" + .string "{DOWN_ARROW} METAROST CITY$" Route115_Text_170301:: @ 8170301 - .string "METEOR FALLS\n" - .string "FALLARBOR TOWN THROUGH HERE$" + .string "METEORFÄLLE\n" + .string "LAUBWECHSELFELD HIER ENTLANG$" diff --git a/data/text/maps/Route116.inc b/data/text/maps/Route116.inc index 64694199d..286879807 100644 --- a/data/text/maps/Route116.inc +++ b/data/text/maps/Route116.inc @@ -1,119 +1,123 @@ Route116_Text_17032A:: @ 817032A - .string "Ohhh, what am I to do?\p" - .string "We were on our walk, PEEKO and I, when\n" - .string "we were jumped by an odd thug...\p" - .string "The scoundrel made off with my\n" - .string "darling PEEKO!\p" - .string "Wrrrooooooaaaar! PEEKO!$" + .string "Oooh, was mache ich nur?!?\p" + .string "PECKO und ich waren auf einem Spazier-\n" + .string "gang und da kam so ein Schlägertyp...\p" + .string "Der Schurke hat mir meinen Liebling\n" + .string "PECKO geklaut!\p" + .string "Ooooooooooooaaaargh! PECKO!$" Route116_Text_1703CF:: @ 81703CF - .string "Nnn... Roar!\p" - .string "I want to dig that tunnel!$" + .string "Nnn... Brüll!\p" + .string "Ich will diesen vermaledeiten Tunnel\n" + .string "graben!$" Route116_Text_1703F7:: @ 81703F7 - .string "Nnn... Roar!\n" - .string "What’s going on?\p" - .string "I was digging the tunnel without any\n" - .string "tools when some goon ordered me out!\p" - .string "That tunnel’s filled with POKéMON\n" - .string "that react badly to loud noises.\l" - .string "They could cause an uproar.\p" - .string "That’s why we stopped using heavy\n" - .string "equipment for tunneling...\p" - .string "I’m worried that the goon will do\n" - .string "something stupid and startle the\l" - .string "POKéMON into an uproar.$" + .string "Nnn... Brüll!\n" + .string "Was ist hier los?\p" + .string "Ich war dabei, einen Tunnel ohne Werk-\n" + .string "zeug zu graben, als so ein Idiot mich\l" + .string "verjagt hat!\p" + .string "Dieser Tunnel ist voller POKéMON, die\n" + .string "sensibel auf Lärm reagieren. Sie können\l" + .string "einen Aufruhr veranstalten.\p" + .string "Daher arbeiten wir ohne schwere\n" + .string "Maschinen an dem Tunnel...\p" + .string "Ich befürchte, dieser Idiot wird\n" + .string "irgendetwas Dummes tun und die\l" + .string "POKéMON in Aufruhr versetzen.$" Route116_Text_170556:: @ 8170556 - .string "Nnn... Roar!\p" - .string "That goofy goon hightailed it out of\n" - .string "the tunnel! I can go back to digging!$" + .string "Nnn... Brüll!\p" + .string "Dieser dämliche Idiot ist aus dem Tunnel\n" + .string "abgehauen. Ich kann weitergraben!$" Route116_Text_1705AE:: @ 81705AE - .string "Oh! It’s you!\p" - .string "You’re that person who not only helped\n" - .string "me in PETALBURG WOODS, but also got\l" - .string "back my stolen package and then even\l" - .string "graciously delivered it to SLATEPORT!\p" - .string "CAPT. STERN informed us that the\n" - .string "package arrived, too!\p" - .string "I thank you very, very much!\p" - .string "Why, if I were a rain cloud, I would\n" - .string "shower you with gratitude and hail\l" - .string "you as a hero!\p" - .string "For you, the most wonderful TRAINER,\n" - .string "I bear good news!\p" - .string "Recently, our company developed a new\n" - .string "kind of POKé BALL.\p" - .string "As a token of our appreciation, this\n" - .string "is our gift to our wonderful TRAINER!$" + .string "Oh! Du bist das!\p" + .string "Du hast mir nicht nur im BLÜTEN-\n" + .string "BURGWALD geholfen, sondern auch\l" + .string "mein gestohlenes Paket zurückgeholt\l" + .string "und nach GRAPHITPORT CITY gebracht!\p" + .string "KAPT. BRIGG hat uns über die Ankunft\n" + .string "des Paketes unterrichtet!\p" + .string "Vielen, vielen Dank!\p" + .string "Wäre ich ein Meer, würde ich\n" + .string "dich in Dankbarkeit baden und als\l" + .string "Held auf meinen Wellen tragen!\p" + .string "Ich habe für dich, den wunderbarsten\n" + .string "TRAINER, gute Nachrichten!\p" + .string "Unsere Firma hat vor kurzem eine\n" + .string "neue Art von POKéBALL entwickelt...\p" + .string "Als Zeichen meiner Dankbarkeit\n" + .string "schenke ich ihn dem wunderbarsten\l" + .string "TRAINER!$" Route116_Text_1707B8:: @ 81707B8 - .string "Our new POKé BALL will be available\n" - .string "at the POKéMON MART in RUSTBORO.\p" - .string "Please do try it out!\n" - .string "Thank you and bye-bye!$" + .string "Unser neuer POKéBALL wird im PKMN-\n" + .string "MARKT in METAROST CITY erhältlich sein.\p" + .string "Bitte, probiere ihn aus!\n" + .string "Vielen Dank und Lebewohl.$" Route116_Text_17082A:: @ 817082A - .string "Your BAG is jam-packed.\n" - .string "I can’t give you this REPEAT BALL.$" + .string "Dein BEUTEL ist brechend voll.\n" + .string "Ich kann dir diesen WIEDERBALL nicht\l" + .string "geben.$" Route116_Text_170865:: @ 8170865 - .string "As a token of our appreciation for\n" - .string "your delivering our package, I have a\l" - .string "gift of a new kind of POKé BALL for our\l" - .string "most wonderful TRAINER!$" + .string "Als Zeichen unseres Dankes für die\n" + .string "Überbringung unseres Paketes, habe ich\l" + .string "eine neue Art von POKéBALL für dich.\l" + .string "Für unseren wunderbarsten TRAINER!$" Route116_Text_1708EE:: @ 81708EE - .string "I dropped my glasses...\n" - .string "Can you help me find them?$" + .string "Ich habe meine Brille fallen lassen...\n" + .string "Kannst du mir helfen, sie zu finden?$" Route116_Text_170921:: @ 8170921 - .string "Those glasses!\n" - .string "May I see them for a second?$" + .string "Deine Brille...\n" + .string "Darf ich sie mal kurz ausprobieren?$" Route116_Text_17094D:: @ 817094D .string "Hmm...\n" - .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for...\p" - .string "Maybe my glasses aren’t around\n" - .string "here...$" + .string "Das ist ein SCHATTENGLAS.\l" + .string "Das habe ich nicht gesucht...\p" + .string "Vielleicht ist meine Brille gar nicht hier\n" + .string "zu finden...$" Route116_Text_1709B7:: @ 81709B7 .string "Hmm...\n" - .string "I can’t find my glasses anywhere...\l" - .string "Maybe they’re not around here...$" + .string "Ich kann meine Brille nirgends finden...\l" + .string "Vielleicht liegt sie gar nicht hier...$" Route116_Text_170A03:: @ 8170A03 .string "Hmm...\n" - .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for...$" + .string "Das ist ein SCHATTENGLAS.\l" + .string "Das habe ich nicht gesucht...$" Route116_Text_170A46:: @ 8170A46 .string "ROUTE 116\n" - .string "{0x7B} RUSTBORO CITY$" + .string "{LEFT_ARROW} METAROST CITY$" Route116_Text_170A60:: @ 8170A60 - .string "RUSTURF TUNNEL\n" - .string "“Linking RUSTBORO and VERDANTURF\p" - .string "“The tunnel project has been\n" - .string "canceled.”$" + .string "METAFLURTUNNEL\n" + .string "“Verbindet METAROST CITY und\p" + .string "WIESENFLUR.\n" + .string "Das Tunnelprojekt wurde abgebrochen.”$" Route116_Text_170AB8:: @ 8170AB8 - .string "TUNNELER’S REST HOUSE$" + .string "BERGRASTHAUS$" Route116_Text_170ACE:: @ 8170ACE - .string "TRAINER TIPS\p" - .string "If you want to stop a POKéMON from\n" - .string "evolving, press the B Button while it\l" - .string "is trying to evolve.\l" - .string "The startled POKéMON will stop.\p" - .string "This is called an evolution cancel.$" + .string "TIPPS für TRAINER\p" + .string "Wenn du die Entwicklung eines POKéMON\n" + .string "stoppen willst, musst du den B-Knopf\l" + .string "drücken, während es sich entwickeln will.\l" + .string "Das POKéMON entwickelt sich dann nicht.\p" + .string "Das nennt man Entwicklungsstopp.$" Route116_Text_170B7D:: @ 8170B7D - .string "TRAINER TIPS\p" - .string "Your BAG has several POCKETS.\p" - .string "Items you obtain are automatically\n" - .string "placed in the appropriate POCKETS.\p" - .string "No TRAINER can afford to be without\n" - .string "a BAG of their own.$" + .string "TIPPS für TRAINER\p" + .string "Dein BEUTEL hat mehrere TASCHEN.\p" + .string "Items werden automatisch in die dafür\n" + .string "vorgesehene TASCHE gelegt.\p" + .string "Kein TRAINER kann auf einen eigenen\n" + .string "BEUTEL verzichten.$" diff --git a/data/text/maps/Route116_TunnelersRestHouse.inc b/data/text/maps/Route116_TunnelersRestHouse.inc index d777ff0c8..2245b81ff 100644 --- a/data/text/maps/Route116_TunnelersRestHouse.inc +++ b/data/text/maps/Route116_TunnelersRestHouse.inc @@ -1,31 +1,33 @@ Route116_TunnelersRestHouse_Text_192F33:: @ 8192F33 - .string "That RUSTURF TUNNEL there...\p" - .string "At first, we had a huge work crew boring\n" - .string "through rock with the latest machinery.\l" - .string "But, we had to stop.\p" - .string "It turns out that we would have had\n" - .string "a negative effect on wild POKéMON in\l" - .string "the area.\p" - .string "So, we’ve got nothing to do but loll\n" - .string "around here doing nothing.$" + .string "Der METAFLURTUNNEL...\p" + .string "Zunächst hatten wir ein großes Team,\n" + .string "das mit schweren Maschinen durch den\l" + .string "Felsen brechen sollte. Dann mussten wir\l" + .string "die Arbeit stoppen.\p" + .string "Es stellte sich heraus, dass sich unsere\n" + .string "Arbeit negativ auf die wilden\l" + .string "POKéMON in dieser Gegend auswirkte.\p" + .string "Und daher haben wir nun nichts mehr zu\n" + .string "tun, außer hier faul herumzuhängen.$" Route116_TunnelersRestHouse_Text_193049:: @ 8193049 - .string "There’s a man digging his way to\n" - .string "VERDANTURF all by his lonesome.\l" - .string "He’s desperate to get through.\p" - .string "He says that if he digs little by little\n" - .string "without using machines, he won’t\l" - .string "disturb POKéMON, and he’ll avoid harming\l" - .string "the natural environment.$" + .string "Da ist ein Mann, der sich ganz alleine\n" + .string "seinen Weg nach WIESENFLUR gräbt. Er\l" + .string "versucht verzweifelt durchzukommen.\p" + .string "Er sagt, wenn er Schritt für Schritt\n" + .string "ohne laute Maschinen gräbt, werden die\l" + .string "POKéMON nicht gestört und ihr natür-\l" + .string "licher Lebensraum bleibt erhalten.$" Route116_TunnelersRestHouse_Text_193135:: @ 8193135 - .string "To get to VERDANTURF without using\n" - .string "this TUNNEL, you’d have to cross the\l" - .string "sea to DEWFORD, sail on to SLATEPORT,\l" - .string "then travel through MAUVILLE.$" + .string "Um ohne diesen Tunnel nach WIESENFLUR\n" + .string "zu kommen, muss man das Meer bei\p" + .string "FAUSTAUHAVEN überqueren, nach\n" + .string "GRAPHITPORT CITY segeln und durch\l" + .string "MALVENFROH CITY reisen.$" Route116_TunnelersRestHouse_Text_1931C1:: @ 81931C1 - .string "Did you hear? The TUNNEL to VERDANTURF\n" - .string "has gone through!\p" - .string "Sometimes, if you hope strongly enough,\n" - .string "dreams do come true.$" + .string "Hast du schon gehört!?! Der TUNNEL bei\n" + .string "WIESENFLUR ist fertig!\p" + .string "Wenn man nur fest an seine Träume\n" + .string "glaubt, werden sie irgendwann wahr.$" diff --git a/data/text/maps/Route117.inc b/data/text/maps/Route117.inc index deadb8f5d..f115fe782 100644 --- a/data/text/maps/Route117.inc +++ b/data/text/maps/Route117.inc @@ -1,25 +1,26 @@ Route117_Text_170C26:: @ 8170C26 - .string "I left my POKéMON at the DAY CARE.\p" - .string "When I got it back, it had a new move\n" - .string "that I didn’t teach it.\l" - .string "I was really, really surprised.$" + .string "Ich habe mein POKéMON in der PENSION\n" + .string "abgegeben.\p" + .string "Als ich es wieder abholte, kannte es\n" + .string "eine Attacke, die ich ihm nicht beige-\l" + .string "bracht habe. Ich war total überrascht.$" Route117_Text_170CA7:: @ 8170CA7 - .string "What do you think?\n" - .string "Aren’t these flowers pretty?\p" - .string "I planted them all!$" + .string "Was meinst du?\n" + .string "Sind diese Blumen nicht wunderhübsch?\p" + .string "Ich habe sie alle selber gepflanzt.$" Route117_Text_170CEB:: @ 8170CEB - .string "The air is tasty here!$" + .string "Die Luft hier ist wunderbar frisch.$" Route117_Text_170D02:: @ 8170D02 .string "ROUTE 117\n" - .string "{0x7B} VERDANTURF TOWN$" + .string "{LEFT_ARROW} WIESENFLUR$" Route117_Text_170D1E:: @ 8170D1E .string "ROUTE 117\n" - .string "{0x7C} MAUVILLE CITY$" + .string "{RIGHT_ARROW} MALVENFROH CITY$" Route117_Text_170D38:: @ 8170D38 - .string "POKéMON DAY CARE\n" - .string "“Let us raise your POKéMON.”$" + .string "POKéMON-PENSION\n" + .string "“Lass uns deine POKéMON aufziehen.”$" diff --git a/data/text/maps/Route118.inc b/data/text/maps/Route118.inc index 649efe3f0..5ff87f473 100644 --- a/data/text/maps/Route118.inc +++ b/data/text/maps/Route118.inc @@ -1,55 +1,56 @@ Route118_Text_170D66:: @ 8170D66 - .string "STEVEN: Hi!\p" - .string "You’re that TRAINER I met in DEWFORD!\p" + .string "TROY: Hi!\p" + .string "Du bist der TRAINER, den ich in\n" + .string "FAUSTAUHAVEN getroffen habe!\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Oh, okay, you’re {PLAYER}{KUN}.\n" - .string "I’ll remember it.\p" + .string "Oh, okay, du bist {PLAYER}{KUN}.\n" + .string "Ich erinnere mich.\p" .string "{PLAYER}{KUN}.\p" - .string "In this vast world, there are many\n" - .string "kinds of POKéMON.\l" - .string "They come in many types.\p" - .string "Do you raise different types?\n" - .string "Or do you raise only POKéMON of a\l" - .string "certain type?\p" - .string "What do you think as a TRAINER?\p" - .string "Sorry, it’s not my place to ask, is it?\p" - .string "Well, anyway, I hope to see you\n" - .string "again.$" + .string "In dieser großen Welt gibt es viele ver-\n" + .string "schiedene Arten von POKéMON mit\l" + .string "vielen verschiedenen Elementklassen.\p" + .string "Ziehst du verschiedene Elementklassen\n" + .string "auf? Oder nur POKéMON einer bestimmten\l" + .string "Elementklasse?\p" + .string "Was denkst du als TRAINER darüber?\p" + .string "Tut mir Leid, ich bombardiere dich hier\n" + .string "mit Fragen...\p" + .string "Nun, ich hoffe wir sehen uns bald wieder.$" Route118_Text_170F12:: @ 8170F12 .string "Hmm!\n" - .string "A GOOD ROD is really good!\p" - .string "Wouldn’t you agree?$" + .string "Eine PROFIANGEL ist wirklich gut!\p" + .string "Meinst du nicht auch?$" Route118_Text_170F46:: @ 8170F46 .string "Hmm!\n" - .string "We’re of identical minds!\p" + .string "Da sind wir ja der gleichen Meinung!\p" .string "Hmm!\n" - .string "Take this GOOD ROD!$" + .string "Ich schenke dir diese PROFIANGEL!$" Route118_Text_170F7E:: @ 8170F7E - .string "Wherever there’s water, try your luck\n" - .string "at fishing.$" + .string "Wo immer du Wasser findest, versuche\n" + .string "dein Glück mit Angeln.$" Route118_Text_170FB0:: @ 8170FB0 - .string "Don’t you like to fish?$" + .string "Magst du keinen Fisch?$" Route118_Text_170FC8:: @ 8170FC8 - .string "Try catching all sorts of POKéMON\n" - .string "with your GOOD ROD.$" + .string "Versuche, alle möglichen Arten von\n" + .string "POKéMON mit der PROFIANGEL zu fangen.$" Route118_Text_170FFE:: @ 8170FFE - .string "Even if there isn’t a boat, you can\n" - .string "cross rivers and the sea if you have\l" - .string "a POKéMON that knows SURF.\p" - .string "POKéMON can be counted on to do so\n" - .string "much!$" + .string "Auch wenn gerade kein Schiff in der\n" + .string "Nähe ist, kannst du mit einem POKéMON,\l" + .string "das SURFER kennt, das Meer überqueren.\p" + .string "Auf POKéMON kann man sich immer\n" + .string "verlassen!$" Route118_Text_17108B:: @ 817108B .string "ROUTE 118\n" - .string "{0x7B} MAUVILLE CITY$" + .string "{LEFT_ARROW} MALVENFROH CITY$" Route118_Text_1710A5:: @ 81710A5 .string "ROUTE 118\n" - .string "{0x79} ROUTE 119$" + .string "{UP_ARROW} ROUTE 119$" diff --git a/data/text/maps/Route119.inc b/data/text/maps/Route119.inc index 489ca053d..81df1b8ea 100644 --- a/data/text/maps/Route119.inc +++ b/data/text/maps/Route119.inc @@ -1,102 +1,103 @@ Route119_Text_1710BB:: @ 81710BB - .string "MAY: {PLAYER}{KUN}!\n" - .string "Where were you? I was looking for you!\p" - .string "How much stronger have you gotten?\n" - .string "Let me check for you!\p" - .string "Ready with your POKéMON?\n" - .string "Of course you are! Go!$" + .string "MAIKE: {PLAYER}{KUN}! Wo warst du?\n" + .string "Ich habe dich schon gesucht!\p" + .string "Wie stark bist du geworden?\n" + .string "Lass mich das für dich herausfinden!\p" + .string "Bereit? Du und deine POKéMON?\n" + .string "Natürlich seid ihr das! Los!$" Route119_Text_171156:: @ 8171156 .string "Achah!\n" - .string "{PLAYER}{KUN}, you’re strong!\p" - .string "I was worried that you might be\n" - .string "struggling with your training.$" + .string "{PLAYER}{KUN}, du bist stark!\p" + .string "Ich hatte schon befürchtet, du\n" + .string "hättest im Training nachgelassen.$" Route119_Text_1711B1:: @ 81711B1 - .string "MAY: But I had absolutely nothing to\n" - .string "worry about! Keep it up!\p" - .string "And, here! I have a present for you.$" + .string "MAIKE: Aber ich hätte mir absolut keine\n" + .string "Sorgen zu machen brauchen! Weiter so!\p" + .string "Und hier! Dies ist ein Geschenk für dich!$" Route119_Text_171214:: @ 8171214 - .string "MAY: Use FLY, and your POKéMON will\n" - .string "instantly carry you to any town you’ve\l" - .string "already visited.\p" - .string "But, to use FLY, you have to get the\n" - .string "GYM BADGE from FORTREE CITY.\l" - .string "That’s important, so don’t forget.\p" - .string "You should FLY home and visit\n" - .string "LITTLEROOT for a change.\p" - .string "I bet your mom’s worried about you,\n" - .string "{PLAYER}{KUN}.\p" - .string "Well, let’s meet again somewhere!$" + .string "MAIKE: Setze FLIEGEN ein und deine\n" + .string "POKéMON bringen dich an jeden Ort, an\l" + .string "dem du schon einmal warst.\p" + .string "Aber um FLIEGEN einsetzen zu können,\n" + .string "brauchst du erst den ORDEN der ARENA\l" + .string "von BAUMHAUSEN CITY. Vergiss das nicht!\p" + .string "Du solltest mal nach WURZELHEIM\n" + .string "FLIEGEN.\p" + .string "Ich wette, deine Mutter macht sich\n" + .string "schon Sorgen um dich, {PLAYER}{KUN}.\p" + .string "Nun, wir treffen uns sicher bald wieder!$" Route119_Text_171358:: @ 8171358 - .string "BRENDAN: {PLAYER}! So this is where\n" - .string "you’ve been looking for POKéMON?\p" - .string "Let me see how good you got.\n" - .string "I’ll test you!\p" - .string "Now!\n" - .string "It’s a battle, so battle!$" + .string "BRIX: {PLAYER}! Hier schaust du dich\n" + .string "also nach POKéMON um?\p" + .string "Zeig mir, wie gut du geworden bist.\n" + .string "Ich werde dich jetzt testen!\p" + .string "Nun!\n" + .string "Das ist ein Kampf, also kämpfen wir!$" Route119_Text_1713E2:: @ 81713E2 .string "Hmm...\n" - .string "You’ve gotten pretty darn decent.$" + .string "Du bist verdammt gut geworden.$" Route119_Text_17140B:: @ 817140B - .string "BRENDAN: I’d say you’re good enough\n" - .string "to search for POKéMON anywhere.\p" - .string "Here, I’ll give you this.\n" - .string "Try it out.$" + .string "BRIX: Ich sage, du bist so gut, dass\n" + .string "du überall nach POKéMON suchen kannst.\p" + .string "Hier, das ist für dich.\n" + .string "Probier es aus.$" Route119_Text_171475:: @ 8171475 - .string "BRENDAN: Use FLY, and your POKéMON\n" - .string "instantly carries you to any town\l" - .string "you’ve already visited.\p" - .string "But you need the FORTREE GYM BADGE \n" - .string "to do that.\p" - .string "Anyway, I have to move along.$" + .string "BRIX: Setze es ein, und deine\n" + .string "POKéMON FLIEGEN dich sofort an jeden\l" + .string "Ort, an dem du schon einmal warst.\p" + .string "Aber du brauchst den ORDEN der ARENA\n" + .string "von BAUMHAUSEN CITY dafür.\p" + .string "Nun ja, ich muss jetzt weiter. Bis bald.$" Route119_Text_171520:: @ 8171520 - .string "We’re standing lookout here.\p" - .string "Hey, you! Stay away from the WEATHER\n" - .string "INSTITUTE. It’s not safe.$" + .string "Wir stehen hier Wache.\p" + .string "Hey, du! Halt dich bloß von dem KLIMA-\n" + .string "INSTITUT fern. Da ist es nicht sicher!$" Route119_Text_17157C:: @ 817157C - .string "Lookout duty is surprisingly boring.\p" - .string "Hey, you! Please don’t go near the\n" - .string "WEATHER INSTITUTE.$" + .string "Wache schieben ist langweilig.\p" + .string "Hey, du! Komm nicht in die Nähe des\n" + .string "KLIMA-INSTITUTS.$" Route119_Text_1715D7:: @ 81715D7 - .string "I thought you FLY by catching a whole\n" - .string "flock of BIRD POKéMON, and then\l" - .string "hanging on to them somehow.\p" - .string "But it turns out there’s an HM move\n" - .string "called FLY!\p" - .string "I wish I’d known about that a long\n" - .string "time ago...$" + .string "Ich dachte, FLIEGEN könnte man, indem\n" + .string "man viele VOGEL-POKéMON fängt, sie\p" + .string "zusammenbindet und sich dann\n" + .string "dranhängt.\p" + .string "Aber es gibt tatsächlich eine VM, die\n" + .string "FLIEGEN heißt!\p" + .string "Wenn ich das doch nur eher gewusst\n" + .string "hätte...$" Route119_Text_171698:: @ 8171698 - .string "Tch... It’s a no-go...\p" - .string "The tall grass snares BIKE tires.\n" - .string "There’s no way you can cycle here.$" + .string "Tse... So geht es nicht weiter...\p" + .string "Das hohe Gras verfängt sich in den \n" + .string "Speichen des RADS...$" Route119_Text_1716F4:: @ 81716F4 - .string "Can your POKéMON use its SECRET POWER\n" - .string "on a big pile of grass and make a\l" - .string "SECRET BASE?$" + .string "Kann dein POKéMON GEHEIMPOWER an\n" + .string "einem Berg von Gras einsetzen und eine\l" + .string "GEHEIMBASIS einrichten?$" Route119_Text_171749:: @ 8171749 .string "ROUTE 119\n" - .string "{0x7C} FORTREE CITY$" + .string "{RIGHT_ARROW} BAUMHAUSEN CITY$" Route119_Text_171762:: @ 8171762 - .string "WEATHER INSTITUTE$" + .string "KLIMA-INSTITUT$" Route119_Text_171774:: @ 8171774 - .string "TRAINER TIPS\p" - .string "Up to sixteen decorations and\n" - .string "furniture items can be placed in\l" - .string "a SECRET BASE.\p" - .string "Pick your favorite items and create\n" - .string "your very own SECRET BASE exactly the\l" - .string "way you want.$" + .string "TIPPS für TRAINER\p" + .string "In der GEHEIMBASIS können bis zu 16\n" + .string "Dekorationen und Möbel untergebracht\l" + .string "werden.\p" + .string "Nimm deine Lieblingsitems und richte dir\n" + .string "deine GEHEIMBASIS ganz nach deinem\l" + .string "Geschmack ein.$" diff --git a/data/text/maps/Route119_House.inc b/data/text/maps/Route119_House.inc index fe069c1ed..33fa9fe32 100644 --- a/data/text/maps/Route119_House.inc +++ b/data/text/maps/Route119_House.inc @@ -1,9 +1,10 @@ Route119_House_Text_19F371:: @ 819F371 - .string "I heard about a cave called the CAVE\n" - .string "OF ORIGIN.\p" - .string "People rumor that the spirits of\n" - .string "POKéMON are revived there.\l" - .string "Could something like that really happen?$" + .string "Es soll eine Höhle geben - die\n" + .string "URZEITHÖHLE.\p" + .string "Die Menschen erzählen sich, dass dort\n" + .string "die Geister der POKéMON wieder zum\l" + .string "Leben erweckt werden.\l" + .string "Ob das tatsächlich möglich ist?$" Route119_House_Text_19F406:: @ 819F406 .string "WINGULL: Pihyo?$" diff --git a/data/text/maps/Route119_WeatherInstitute_1F.inc b/data/text/maps/Route119_WeatherInstitute_1F.inc index 1f7fff794..d2c2165cb 100644 --- a/data/text/maps/Route119_WeatherInstitute_1F.inc +++ b/data/text/maps/Route119_WeatherInstitute_1F.inc @@ -1,54 +1,55 @@ Route119_WeatherInstitute_1F_Text_19EB8A:: @ 819EB8A - .string "The BOSS got interested in the\n" - .string "research they have going here, so he\l" - .string "sent us out.\p" - .string "You quit meddling!$" + .string "Der BOSS hat Interesse an den \n" + .string "Forschungen gezeigt, daher hat er uns\l" + .string "hergeschickt.\p" + .string "Stör uns gefälligst nicht!$" Route119_WeatherInstitute_1F_Text_19EBEE:: @ 819EBEE - .string "Blast it...\n" - .string "Blasted by a kid...$" + .string "So ein Mist...\n" + .string "Besiegt... Von einem Kind!$" Route119_WeatherInstitute_1F_Text_19EC0E:: @ 819EC0E - .string "Our BOSS knows everything.\p" - .string "But I’m just a GRUNT. What would I know\n" - .string "about what he’s thinking?$" + .string "Unser BOSS weiß alles.\p" + .string "Ich bin nur ein RÜPEL. Woher soll ich\n" + .string "wissen, was er denkt?$" Route119_WeatherInstitute_1F_Text_19EC6B:: @ 819EC6B - .string "Huh?\n" - .string "What’s a kid doing here?$" + .string "Wie?\n" + .string "Was macht denn das Kind hier?$" Route119_WeatherInstitute_1F_Text_19EC89:: @ 819EC89 - .string "Huh?\n" - .string "I lost?!$" + .string "Wie?\n" + .string "Ich habe verloren?!?$" Route119_WeatherInstitute_1F_Text_19EC97:: @ 819EC97 - .string "Oh, no...\n" - .string "I’ll catch an earful for losing to a kid...\p" - .string "I should just take a nap in the bed...$" + .string "Oh. Ich werde mir etwas anhören müssen,\n" + .string "weil ich gegen ein Kind verloren habe...\p" + .string "Ich muss mich jetzt dringend hinlegen...$" Route119_WeatherInstitute_1F_Text_19ECF4:: @ 819ECF4 - .string "While I was sleeping, everyone went\n" - .string "upstairs!$" + .string "Als ich schlief, schlich sich jemand\n" + .string "nach oben!$" Route119_WeatherInstitute_1F_Text_19ED22:: @ 819ED22 - .string "Wow, you’re really strong!\p" - .string "I wish I could be a POKéMON TRAINER\n" - .string "like you!$" + .string "Wow! Bist du aber stark!\p" + .string "Ich wäre auch gerne ein POKéMON-\n" + .string "TRAINER wie du!$" Route119_WeatherInstitute_1F_Text_19ED6B:: @ 819ED6B - .string "The PROFESSOR loves rain.\n" - .string "That’s a fact.\p" - .string "But if it keeps raining, people will be in\n" - .string "trouble. That’s another fact.\p" - .string "And thus, the PROFESSOR is studying\n" - .string "if the rain can be put to good use.$" + .string "Der PROFESSOR liebt den Regen.\n" + .string "Das ist eine Tatsache.\p" + .string "Aber wenn es noch lange so regnet,\n" + .string "wird das zu Problemen führen. Das ist\l" + .string "die andere Seite der Medaille.\p" + .string "Und daher erforscht der PROFESSOR,\n" + .string "wie man den Regen positiv nutzen kann.$" Route119_WeatherInstitute_1F_Text_19EE25:: @ 819EE25 - .string "Hello!\n" - .string "We’ve been saved by your actions!\p" - .string "What I don’t understand is what on\n" - .string "earth the {EVIL_TEAM}S were up to.$" + .string "Hallo! Dein beherztes Eingreifen hat\n" + .string "uns gerettet!\p" + .string "Ich verstehe nur nicht, was die {EVIL_TEAM}S\n" + .string "von uns wollten...$" Route119_WeatherInstitute_1F_Text_19EE8B:: @ 819EE8B - .string "There’s a bed...\n" - .string "Let’s take a rest.$" + .string "Da steht ein Bett...\n" + .string "Eine Pause wäre willkommen.$" diff --git a/data/text/maps/Route119_WeatherInstitute_2F.inc b/data/text/maps/Route119_WeatherInstitute_2F.inc index f2854f6d0..27dabca33 100644 --- a/data/text/maps/Route119_WeatherInstitute_2F.inc +++ b/data/text/maps/Route119_WeatherInstitute_2F.inc @@ -1,71 +1,73 @@ Route119_WeatherInstitute_2F_Text_19EEAF:: @ 819EEAF - .string "The INSTITUTE created a type of\n" - .string "POKéMON that has something to do with\l" - .string "the weather. We’re here to take them!$" + .string "Das INSTITUT hat ein POKéMON ent-\n" + .string "wickelt, das irgendwas mit dem Wetter zu\l" + .string "tun hat. Das müssen wir kriegen!$" Route119_WeatherInstitute_2F_Text_19EF1B:: @ 819EF1B - .string "Our plan’s being spoiled by a kid?$" + .string "Ein Kind hat unsere Pläne durchkreuzt?$" Route119_WeatherInstitute_2F_Text_19EF3E:: @ 819EF3E - .string "If the POKéMON they made here can\n" - .string "control the weather freely, then we of\l" - .string "TEAM {EVIL_TEAM} definitely need it!$" + .string "Wenn sie hier tatsächlich ein POKéMON\n" + .string "entwickelt haben, das das Wetter kon-\l" + .string "trollieren kann, müssen wir vom TEAM\l" + .string "{EVIL_TEAM} es in unsere Gewalt bringen!$" Route119_WeatherInstitute_2F_Text_19EFA3:: @ 819EFA3 - .string "We’re TEAM {EVIL_TEAM}!\n" - .string "We appear wherever anything rare is\l" - .string "found!$" + .string "Wir sind TEAM {EVIL_TEAM}!\n" + .string "Wir sind überall dort, wo Raritäten\l" + .string "gefunden wurden!$" Route119_WeatherInstitute_2F_Text_19EFDD:: @ 819EFDD - .string "You got me!$" + .string "Das war’s dann wohl!$" Route119_WeatherInstitute_2F_Text_19EFE9:: @ 819EFE9 - .string "You don’t have any idea what we of\n" - .string "TEAM {EVIL_TEAM} are working towards!\l" - .string "You stay out of our way!$" + .string "Du hast doch gar keine Ahnung, was wir\n" + .string "vom TEAM {EVIL_TEAM} vorbereiten!\l" + .string "Geh uns gefälligst aus dem Weg!$" Route119_WeatherInstitute_2F_Text_19F042:: @ 819F042 - .string "Ahahahaha!\p" - .string "You’re going to meddle in TEAM {EVIL_TEAM}’s\n" - .string "affairs?\p" - .string "You’re either absolutely fearless,\n" - .string "simply ignorant, or both!\p" - .string "You’re so cute, you’re disgusting!\n" - .string "I’ll put you down, kiddy!$" + .string "Ahahahahaha!!!\p" + .string "Du willst dich allen Ernstes in die Ange-\n" + .string "legenheiten von TEAM {EVIL_TEAM} einmischen?\p" + .string "Dann bist du entweder furchtlos oder\n" + .string "einfach dumm! Oder beides?\p" + .string "Du bist ja so niedlich. Einfach widerlich!\n" + .string "Ich mach dich fertig, du Baby!$" Route119_WeatherInstitute_2F_Text_19F0F4:: @ 819F0F4 - .string "Ahahahaha!\n" - .string "You’re disgustingly strong!$" + .string "Ahahahahaha!!!!!\n" + .string "Du bist einfach widerlich... stark!$" Route119_WeatherInstitute_2F_Text_19F11B:: @ 819F11B - .string "Ahahahaha!\n" - .string "We got meddled with unexpectedly!\p" - .string "We’re out of options.\n" - .string "We’ll have to pull out.\p" - .string "But this isn’t the last you’ll see of\n" - .string "TEAM {EVIL_TEAM}! We have other plans!\l" - .string "Don’t you forget it!$" + .string "Ahahahahaha! Wir wurden von\n" + .string "Unvorhergesehenem gestört!\p" + .string "Wir haben keine Möglichkeiten mehr. Wir\n" + .string "müssen uns aus dem Schlamassel ziehen.\p" + .string "Aber das ist nicht das Letzte, was du\n" + .string "von TEAM {EVIL_TEAM} siehst! Wir werden\l" + .string "andere Pläne entwickeln. Merk dir das!$" Route119_WeatherInstitute_2F_Text_19F1CF:: @ 819F1CF - .string "Thanks!\n" - .string "Thanks to you, we’re safe!\p" - .string "It might be an odd way of thanking you,\n" - .string "but take this POKéMON.$" + .string "Danke!\n" + .string "Vielen Dank! Nun sind wir in Sicherheit!\p" + .string "Es ist vielleicht eine seltsame Art\n" + .string "danke zu sagen, aber dieses POKéMON\l" + .string "ist für dich!$" Route119_WeatherInstitute_2F_Text_19F231:: @ 819F231 - .string "Hm? You don’t seem to have any room\n" - .string "for this POKéMON.$" + .string "Oh! Du hast keinen Platz für dieses\n" + .string "POKéMON.$" Route119_WeatherInstitute_2F_Text_19F267:: @ 819F267 - .string "{PLAYER} received CASTFORM!$" + .string "{PLAYER} erhält FORMEO!$" Route119_WeatherInstitute_2F_Text_19F27D:: @ 819F27D - .string "That POKéMON changes shape according\n" - .string "to the weather conditions.\p" - .string "There’re plenty of them in the\n" - .string "INSTITUTE - go ahead and take it.$" + .string "Dieses POKéMON ändert seine Gestalt\n" + .string "abhängig vom jeweiligen Wetter.\p" + .string "Hier im INSTITUT gibt es sehr viele\n" + .string "davon - du kannst es ruhig annehmen.$" Route119_WeatherInstitute_2F_Text_19F2FE:: @ 819F2FE - .string "I’ve been researching rain for many\n" - .string "years, but it’s ridiculous to think that\l" - .string "humans can freely change the weather.$" + .string "Seit Jahren erforsche ich den Regen,\n" + .string "aber zu denken, dass Menschen das\l" + .string "Wetter frei bestimmen können, ist dumm.$" diff --git a/data/text/maps/Route120.inc b/data/text/maps/Route120.inc index adaf369b1..e19a22949 100644 --- a/data/text/maps/Route120.inc +++ b/data/text/maps/Route120.inc @@ -1,69 +1,70 @@ Route120_Text_171827:: @ 8171827 - .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" - .string "It’s been a while.\p" - .string "There’s something here that you can’t\n" - .string "see, right?\p" - .string "Now, if I were to use this device on\n" - .string "the invisible obstacle...\p" - .string "No, no. Rather than describing it,\n" - .string "I should just show you.\l" - .string "That would be more fun.\p" - .string "{PLAYER}{KUN}, are your POKéMON ready for\n" - .string "battle?$" + .string "TROY: Hm? {PLAYER}{KUN}, hi.\n" + .string "Es ist lange her...\p" + .string "Hier ist etwas, das du nicht sehen\n" + .string "kannst, richtig?\p" + .string "Also, wenn ich dieses Gerät bei einem\n" + .string "unsichtbaren Objekt benutzen würde...\p" + .string "Nein, nein. Statt es zu beschreiben,\n" + .string "zeige ich es dir lieber.\l" + .string "Das macht mehr Spaß.\p" + .string "{PLAYER}{KUN}, sind deine POKéMON bereit\n" + .string "für einen Kampf?$" Route120_Text_17193D:: @ 817193D - .string "STEVEN: No?\p" - .string "I’ll wait here, so you can get ready.$" + .string "TROY: Nein?\p" + .string "Ich warte hier, dann kannst du sie vor-\n" + .string "bereiten.$" Route120_Text_17196F:: @ 817196F - .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" - .string "ready for battle?$" + .string "TROY: {PLAYER}{KUN}, sind deine\n" + .string "POKéMON bereit für einen Kampf?$" Route120_Text_1719A0:: @ 81719A0 - .string "STEVEN: {PLAYER}{KUN}, show me your true\n" - .string "power as a TRAINER!$" + .string "TROY: {PLAYER}{KUN}, zeig mir deine\n" + .string "wahre Stärke als TRAINER!$" Route120_Text_1719D4:: @ 81719D4 - .string "STEVEN used the DEVON SCOPE.\p" - .string "An invisible POKéMON became completely\n" - .string "visible!\p" - .string "The startled POKéMON attacked!$" + .string "TROY setzt das DEVON-SCOPE ein.\p" + .string "Ein unsichtbares POKéMON wird sichtbar!\p" + .string "Das erschreckte POKéMON greift an!$" Route120_Text_171A40:: @ 8171A40 - .string "STEVEN: I see...\n" - .string "Your battle style is intriguing.\p" - .string "Your POKéMON have obviously grown\n" - .string "since I first met you in DEWFORD.\p" - .string "I’d like you to have this\n" - .string "DEVON SCOPE.\p" - .string "Who knows, there may be other\n" - .string "concealed POKéMON.$" + .string "TROY: Bemerkenswert... Dein\n" + .string "Kampfstil ist wirklich bemerkenswert.\p" + .string "Deine POKéMON sind offensichtlich sehr\n" + .string "gewachsen, seit wir uns das erste Mal in\l" + .string "FAUSTAUHAVEN getroffen haben.\p" + .string "Ich möchte dir dieses DEVON-SCOPE\n" + .string "geben.\p" + .string "Wer weiß, es gibt bestimmt noch andere\n" + .string "verborgene POKéMON.$" Route120_Text_171B0E:: @ 8171B0E - .string "STEVEN: {PLAYER}{KUN}.\p" - .string "I enjoy seeing POKéMON and TRAINERS\n" - .string "who strive together.\p" - .string "I think you’re doing great.\p" - .string "Well, let’s meet again somewhere.$" + .string "TROY: {PLAYER}{KUN}.\p" + .string "Ich liebe es, TRAINER und POKéMON zu\n" + .string "sehen, die fest zusammenhalten.\p" + .string "Ich finde, du machst das großartig.\p" + .string "Nun, mach’s gut. Wir sehen uns!$" Route119_Text_171B93:: @ 8171B93 Route120_Text_171B93:: @ 8171B93 - .string "Something unseeable is in the way.$" + .string "Etwas Unsichtbares blockiert den Weg.$" Route119_Text_171BB6:: @ 8171BB6 - .string "Something unseeable is in the way.\p" - .string "Want to use the DEVON SCOPE?$" + .string "Etwas Unsichtbares blockiert den Weg.\p" + .string "Möchtest du das DEVON-SCOPE\n" + .string "einsetzen?$" Route119_Text_171BF6:: @ 8171BF6 - .string "{PLAYER} used the DEVON SCOPE.\p" - .string "An invisible POKéMON became completely\n" - .string "visible!\p" - .string "The startled POKéMON attacked!$" + .string "{PLAYER} setzt DEVON-SCOPE ein.\p" + .string "Ein unsichtbares POKéMON wird sichtbar!\p" + .string "Das erschreckte POKéMON greift an!$" Route120_Text_171C5E:: @ 8171C5E .string "ROUTE 120\n" - .string "{0x7B} FORTREE CITY$" + .string "{LEFT_ARROW} BAUMHAUSEN CITY$" Route120_Text_171C77:: @ 8171C77 - .string "{0x7C} ROUTE 121\n" - .string "{0x7B} ROUTE 120$" + .string "{RIGHT_ARROW} ROUTE 121\n" + .string "{LEFT_ARROW} ROUTE 120$" diff --git a/data/text/maps/Route121.inc b/data/text/maps/Route121.inc index 7861b1744..61a70040c 100644 --- a/data/text/maps/Route121.inc +++ b/data/text/maps/Route121.inc @@ -1,17 +1,18 @@ Route121_Text_171C8F:: @ 8171C8F .string "Okay!\n" - .string "We’re to move out to MT. PYRE!$" + .string "Wir sind auf dem Weg zum PYROBERG!$" Route121_Text_171CB4:: @ 8171CB4 - .string "Ahead looms MT. PYRE...\p" - .string "It is a natural monument to the spirits \n" - .string "of departed POKéMON...$" + .string "Vor uns erhebt sich der PYROBERG...\p" + .string "Er ist das natürlich gewachsene\n" + .string "Monument der Geister der von uns\l" + .string "gegangenen POKéMON.$" Route121_Text_171D0C:: @ 8171D0C - .string "MT. PYRE PIER\p" - .string "...The sign is old and worn out.\n" - .string "The words are barely legible...$" + .string "PIER AM PYROBERG\p" + .string "...Das Schild ist alt und verwittert.\n" + .string "Die Worte sind kaum noch lesbar...$" Route121_Text_171D5B:: @ 8171D5B - .string "“Filled with rare POKéMON!”\n" - .string "SAFARI ZONE$" + .string "“Hier sind seltene POKéMON zu Hause!”\n" + .string "SAFARI-ZONE$" diff --git a/data/text/maps/Route123.inc b/data/text/maps/Route123.inc index 911915f9e..fca4e9d2d 100644 --- a/data/text/maps/Route123.inc +++ b/data/text/maps/Route123.inc @@ -1,25 +1,26 @@ Route123_Text_171D83:: @ 8171D83 - .string "I love GRASS-type POKéMON!\p" - .string "Do you have any GRASS-type POKéMON?$" + .string "Ich liebe PFLANZEN-POKéMON!\p" + .string "Hast du einige PFLANZEN-POKéMON?$" Route123_Text_171DC2:: @ 8171DC2 .string "Oh?\p" - .string "You like GRASS-type POKéMON, too,\n" - .string "don’t you?\p" - .string "I’m so happy, you can have this!\n" - .string "It’s a token of our friendship.$" + .string "Du magst PFLANZEN-POKéMON auch sehr\n" + .string "gerne, habe ich Recht?\p" + .string "Das freut mich sehr. Ich schenke dir \n" + .string "ein Zeichen unserer Freundschaft.$" Route123_Text_171E34:: @ 8171E34 - .string "I check trees with my GRASS-type\n" - .string "POKéMON. I’m like a tree doctor.$" + .string "Ich prüfe die Bäume mit Hilfe meiner\n" + .string "PFLANZEN-POKéMON. Ich bin so etwas wie\l" + .string "ein Baumdoktor.$" Route123_Text_171E76:: @ 8171E76 - .string "{0x7C} ROUTE 123\n" - .string "{0x7B} ROUTE 118$" + .string "{RIGHT_ARROW} ROUTE 123\n" + .string "{LEFT_ARROW} ROUTE 118$" Route123_Text_171E8E:: @ 8171E8E - .string "{0x79} MT. PYRE\n" - .string "“Forbidden to the faint of heart.”$" + .string "{UP_ARROW} PYROBERG\n" + .string "“Für Zaghafte verboten.”$" Route123_Text_171EBC:: @ 8171EBC - .string "BERRY MASTER’S HOUSE$" + .string "VILLA DES BEERENMEISTERS$" diff --git a/data/text/maps/Route124.inc b/data/text/maps/Route124.inc index 6f33d40b7..a349672ed 100644 --- a/data/text/maps/Route124.inc +++ b/data/text/maps/Route124.inc @@ -1,2 +1,2 @@ Route124_Text_171ED1:: @ 8171ED1 - .string "HUNTER’S HOUSE$" + .string "HAUS DES SCHATZTAUCHERS$" diff --git a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc b/data/text/maps/Route124_DivingTreasureHuntersHouse.inc index 3eda96254..ac9b18a23 100644 --- a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/text/maps/Route124_DivingTreasureHuntersHouse.inc @@ -1,53 +1,54 @@ Route124_DivingTreasureHuntersHouse_Text_19F416:: @ 819F416 - .string "I’m the DIVING TREASURE HUNTER!\p" - .string "I’m the awesome dude who makes\n" - .string "deep-sea dives to gather treasures\l" - .string "resting at the bottom.$" + .string "Ich bin der SCHATZTAUCHER!\p" + .string "Ich bin der Typ, der in der Tiefsee\n" + .string "taucht und nach Schätzen am Meeres-\l" + .string "grund sucht.$" Route124_DivingTreasureHuntersHouse_Text_19F48F:: @ 819F48F - .string "Tell me, have you seen any SHARDS of\n" - .string "tools made in ancient times?$" + .string "Sag, hast du SCHERBEN antiker\n" + .string "Werkzeuge gesehen?$" Route124_DivingTreasureHuntersHouse_Text_19F4D1:: @ 819F4D1 - .string "You haven’t got any treasures\n" - .string "for me...\p" - .string "If you see any SHARDS, like the RED\n" - .string "SHARD, you’ve got to trade it with me!$" + .string "Du hast keinerlei Schätze für mich...\p" + .string "Wenn du Stücke findest, besonders\n" + .string "PURPURSTÜCKE, tausche sie mit mir!$" Route124_DivingTreasureHuntersHouse_Text_19F544:: @ 819F544 - .string "Oh, hey! That...\n" - .string "That’s a SHARD! I’m looking for those!\p" - .string "Oh, man, you’ve got to trade that\n" - .string "with me! I’ll give you something good!$" + .string "Oh, hey! Das... Das ist eine\n" + .string "Scherbe! Genau die suche ich!\p" + .string "Oh, du musst unbedingt mit mir\n" + .string "tauschen! Ich gebe dir etwas\l" + .string "Gutes dafür!$" Route124_DivingTreasureHuntersHouse_Text_19F5C5:: @ 819F5C5 - .string "What do you want to trade?$" + .string "Was möchtest du tauschen?$" Route124_DivingTreasureHuntersHouse_Text_19F5E0:: @ 819F5E0 - .string "You’ll trade your {STR_VAR_1} for\n" - .string "my {STR_VAR_2}, then?$" + .string "Du tauschst dein {STR_VAR_1} gegen\n" + .string "mein {STR_VAR_2}?$" Route124_DivingTreasureHuntersHouse_Text_19F606:: @ 819F606 - .string "It’s a done deal!\n" - .string "Use that wisely!$" + .string "Das ist ein guter Tausch!\n" + .string "Setze es wohl überlegt ein!$" Route124_DivingTreasureHuntersHouse_Text_19F629:: @ 819F629 - .string "Do you want to trade something else?$" + .string "Möchtest du noch etwas tauschen?$" Route124_DivingTreasureHuntersHouse_Text_19F64E:: @ 819F64E - .string "Whoops, your BAG’s full.\n" - .string "Get rid of some items, friend!$" + .string "Hups, dein BEUTEL ist voll.\n" + .string "Schaffe Platz, mein Freund!$" Route124_DivingTreasureHuntersHouse_Text_19F686:: @ 819F686 - .string "No? That’s a downer.\n" - .string "Well, if you change your mind, come back.$" + .string "Nein? Das ist niederschmetternd.\n" + .string "Wenn du deine Meinung änderst, ich\l" + .string "bin hier!$" Route124_DivingTreasureHuntersHouse_Text_19F6C5:: @ 819F6C5 - .string "Wanted item Trade item\n" - .string " RED SHARD {0x7B}{0x7C} FIRE STONE\p" - .string "Wanted item Trade item\n" - .string " YELLOW SHARD {0x7B}{0x7C} THUNDERSTONE\p" - .string "Wanted item Trade item\n" - .string " BLUE SHARD {0x7B}{0x7C} WATER STONE\p" - .string "Wanted item Trade item\n" - .string " GREEN SHARD {0x7B}{0x7C} LEAF STONE$" + .string "Gesuchtes Item Item zum Tausch\n" + .string " PURPURSTÜCK {LEFT_ARROW}{RIGHT_ARROW} FEUERSTEIN\p" + .string "Gesuchtes Item Item zum Tausch\n" + .string " GELBSTÜCK {LEFT_ARROW}{RIGHT_ARROW} DONNERSTEIN\p" + .string "Gesuchtes Item Item zum Tausch\n" + .string " INDIGOSTÜCK {LEFT_ARROW}{RIGHT_ARROW} WASSERSTEIN\p" + .string "Gesuchtes Item Item zum Tausch\n" + .string " GRÜNSTÜCK {LEFT_ARROW}{RIGHT_ARROW} BLATTSTEIN$" diff --git a/data/text/maps/Route128.inc b/data/text/maps/Route128.inc index da813609b..bf2e5b424 100644 --- a/data/text/maps/Route128.inc +++ b/data/text/maps/Route128.inc @@ -1,65 +1,69 @@ Route128_Text_171EE0:: @ 8171EE0 - .string "{EVIL_LEADER}: What happened...\n" - .string "What is this wretched scene...\p" - .string "Did I...make a horrible mistake?$" + .string "{EVIL_LEADER}: Was ist passiert... Was für\n" + .string "ein Furcht erregendes Szenario...\p" + .string "Habe ich... einen schrecklichen Fehler\n" + .string "begangen?$" Route128_Text_171F35:: @ 8171F35 - .string "I...\n" - .string "I only wanted...$" + .string "Ich...\n" + .string "Ich wollte doch nur...$" Route128_Text_171F4B:: @ 8171F4B - .string "{GOOD_LEADER}: Do you understand now,\n" + .string "{GOOD_LEADER}: Begreifst du es nun,\n" .string "{EVIL_LEADER}?\p" - .string "Do you finally see how disastrous\n" - .string "your dream turned out to be?\p" - .string "We have to hurry! We have to do\n" - .string "something before the situation goes\l" - .string "completely out of control!$" + .string "Begreifst du nun die schrecklichen\n" + .string "Folgen deines katastrophalen Traums?\p" + .string "Wir müssen uns beeilen! Wir müssen etwas\n" + .string "unternehmen, bevor die Situation völlig\l" + .string "außer Kontrolle gerät!$" Route128_Text_172008:: @ 8172008 .string "{GOOD_LEADER}: {PLAYER}{KUN}...\p" - .string "We, TEAM {GOOD_TEAM}, had been pursuing TEAM\n" - .string "{EVIL_TEAM} to prevent this from happening.\p" - .string "You’ve been very helpful, but I fear\n" - .string "the worst has happened...\p" - .string "It’s gone too far for a child like you\n" - .string "to manage...\p" - .string "Leave things to us, and get out of\n" - .string "here while you still can!$" + .string "Wir, TEAM {GOOD_TEAM}, verfolgen TEAM {EVIL_TEAM}\n" + .string "schon lange, weil wir dies verhindern\l" + .string "wollten.\p" + .string "Du warst uns eine große Hilfe, aber ich\n" + .string "fürchte, das Schlimmste ist passiert...\p" + .string "Für ein Kind wie dich ist die Sache viel\n" + .string "zu weit gegangen...\p" + .string "Überlass die Sache uns und lauf weg,\n" + .string "solange es noch geht!$" Route128_Text_17210B:: @ 817210B - .string "{GOOD_LEADER}: This defies belief...\p" - .string "A super-ancient POKéMON...\p" - .string "Its power is unbelievable.\n" - .string "It has upset the balance of nature...$" + .string "{GOOD_LEADER}: Das ist ja unglaublich...\p" + .string "Ein super-antikes POKéMON...\p" + .string "Seine Kraft ist unglaublich. Es hat\n" + .string "das Gleichgewicht der Natur verändert.$" Route128_Text_172181:: @ 8172181 - .string "STEVEN: {PLAYER}{KUN}!\n" - .string "What is happening?$" + .string "TROY: {PLAYER}{KUN}!\n" + .string "Was geht hier vor?$" Route128_Text_1721A2:: @ 81721A2 - .string "This is terrible...\p" - .string "If this doesn’t stop, all HOENN...\n" - .string "No, the whole world will drown.\p" - .string "This huge rain cloud is spreading\n" - .string "from above SOOTOPOLIS?\p" - .string "What in the world is taking place there?\p" - .string "There’s no point arguing here...\n" - .string "SOOTOPOLIS should provide answers...$" + .string "Das ist schrecklich...\p" + .string "Wenn das nicht aufhört, wird ganz\n" + .string "HOENN... Nein, die ganze Welt wird\l" + .string "untergehen.\p" + .string "Diese riesige Regenwolke kommt\n" + .string "aus Richtung XENEROVILLE?\p" + .string "Was um Himmels Willen geht dort vor?\p" + .string "Es bleibt keine Zeit für Spekulationen...\n" + .string "In XENEROVILLE erfahren wir mehr...$" Route128_Text_1722A1:: @ 81722A1 - .string "This is terrible...\p" - .string "If this doesn’t stop, all of HOENN...\n" - .string "No, the whole world will be parched.\p" - .string "The cause of this calamity, the blazing\n" - .string "sun, is in the sky above SOOTOPOLIS...\p" - .string "What in the world is taking place there?\p" - .string "There’s no point arguing here...\n" - .string "SOOTOPOLIS should provide answers...$" + .string "Das ist schrecklich...\p" + .string "Wenn das nicht aufhört, wird ganz\n" + .string "HOENN... Nein, die ganze Welt wird\l" + .string "vertrocknen.\p" + .string "Die strahlende Sonne steht über\n" + .string "XENEROVILLE?\p" + .string "Was um Himmels Willen geht dort vor?\p" + .string "Es bleibt keine Zeit für Spekulationen...\n" + .string "In XENEROVILLE erfahren wir mehr...$" Route128_Text_1723BE:: @ 81723BE .string "{PLAYER}{KUN}...\n" - .string "I don’t know what you intend to do,\l" - .string "but don’t do anything reckless.\p" + .string "Ich weiß nicht, was du vorhast, aber tue\l" + .string "nichts Unüberlegtes.\p" .string "Okay.\n" - .string "I’m going to SOOTOPOLIS.$" + .string "Ich gehe nach XENEROVILLE.$" diff --git a/data/text/maps/RustboroCity.inc b/data/text/maps/RustboroCity.inc index 4f2954f35..6248b9e30 100644 --- a/data/text/maps/RustboroCity.inc +++ b/data/text/maps/RustboroCity.inc @@ -1,178 +1,188 @@ RustboroCity_Text_16689D:: @ 816689D - .string "The DEVON CORPORATION...\n" - .string "We all just shorten it to DEVON.\p" - .string "That company makes all sorts of\n" - .string "convenient products.$" + .string "Die DEVON CORPORATION...\n" + .string "Wir nennen sie kurz DEVON.\p" + .string "Die Firma stellt viele praktische\n" + .string "Dinge her.$" RustboroCity_Text_16690C:: @ 816690C - .string "Hm? A sneaky-looking man?\p" - .string "Come to think of it, yes, a shady-\n" - .string "looking guy went around the corner.$" + .string "Hm? Ein verschlagen wirkender Mann?\p" + .string "Wenn ich so darüber nachdenke, fällt mir\n" + .string "ein, dass ich einen zwielichtigen Typen\l" + .string "eben hier an der Ecke gesehen habe.$" RustboroCity_Text_16696D:: @ 816696D - .string "Have you taken the POKéMON GYM\n" - .string "challenge?\p" - .string "When you get that shiny GYM BADGE\n" - .string "in hand, I guess TRAINERS begin to\l" - .string "realize what is required of them.$" + .string "Hast du schon die Herausforderung der\n" + .string "POKéMON ARENA angenommen?\p" + .string "Ich glaube, wenn sie den glänzenden\n" + .string "ORDEN der ARENA in der Hand halten, wird\l" + .string "den TRAINERN klar, was von ihnen\l" + .string "verlangt wird.$" RustboroCity_Text_1669FE:: @ 81669FE - .string "Hey, that’s RUSTBORO’s GYM BADGE!\p" - .string "Out of all the POKéMON GYM BADGES,\n" - .string "RUSTBORO’s is the coolest, I’d say.$" + .string "Hey, das ist der ORDEN der ARENA von\n" + .string "METAROST CITY!\p" + .string "Von allen ARENA-ORDEN ist der von\n" + .string "METAROST CITY der coolste, sage ich dir.$" RustboroCity_Text_166A67:: @ 8166A67 - .string "Oh? Who might you be?\n" - .string "You’re a new face around these parts.\p" - .string "Have you just transferred into the\n" - .string "POKéMON TRAINER’S SCHOOL?$" + .string "Oh? Wer magst du wohl sein?\n" + .string "Ein neues Gesicht in dieser Gegend.\p" + .string "Bist du gerade in die POKéMON TRAINER-\n" + .string "SCHULE gekommen?$" RustboroCity_Text_166AE0:: @ 8166AE0 - .string "I challenged the GYM LEADER, but...\p" - .string "It’s not going to be easy winning with\n" - .string "my FIRE-type POKéMON...\p" - .string "FIRE-type POKéMON don’t match up\n" - .string "well against ROCK-type POKéMON...$" + .string "Ich habe den ARENALEITER heraus-\n" + .string "gefordert, aber...\p" + .string "Es ist nicht einfach, mit meinen FEUER-\n" + .string "POKéMON zu gewinnen...\p" + .string "FEUER-POKéMON haben keinen guten\n" + .string "Stand gegenüber GESTEINS-POKéMON.$" RustboroCity_Text_166B86:: @ 8166B86 - .string "The old sailor MR. BRINEY lives in a\n" - .string "cottage by the sea.\p" - .string "He goes for walks in the tunnel every\n" - .string "so often.$" + .string "Der alte Seebär MR. BRACK lebt in einer\n" + .string "Hütte am Meer.\p" + .string "Er geht sehr oft in dem Tunnel\n" + .string "spazieren.$" RustboroCity_Text_166BEF:: @ 8166BEF - .string "The old sailor MR. BRINEY lives in a\n" - .string "cottage by the sea.\p" - .string "He said he was going shopping in\n" - .string "SLATEPORT for his pet, PEEKO.\p" - .string "That old seadog, he must really love\n" - .string "that PEEKO.$" + .string "Der alte Seebär MR. BRACK lebt in einer\n" + .string "Hütte am Meer.\p" + .string "Er sagt, er wäre in GRAPHITPORT CITY\n" + .string "gewesen, um etwas für sein Haustier,\l" + .string "PECKO, zu kaufen.\p" + .string "Der alte Seebär muss sein PECKO wirklich\n" + .string "sehr lieben.$" RustboroCity_Text_166C98:: @ 8166C98 - .string "Wow, you have POKéMON with you, too.\p" - .string "When I get bigger, I’m going to go\n" - .string "places with POKéMON, too.$" + .string "Wow, du hast ja auch POKéMON dabei.\p" + .string "Wenn ich größer bin, werde ich auch\n" + .string "immer POKéMON dabeihaben.$" RustboroCity_Text_166CFA:: @ 8166CFA - .string "POKéMON TRAINER’S SCHOOL!\p" - .string "If I go to this school, will I be able\n" - .string "to catch rare POKéMON easily?$" + .string "POKéMON TRAINERSCHULE!\p" + .string "Wenn ich in diese Schule gehe, werde ich\n" + .string "später seltene POKéMON fangen können?$" RustboroCity_Text_166D59:: @ 8166D59 - .string "If a POKéMON gains experience in\n" - .string "battles, it can sometimes change in\l" - .string "the way it looks.$" + .string "Wenn ein POKéMON Erfahrungen im Kampf\n" + .string "sammelt, kann es vorkommen, dass es\l" + .string "irgendwann sein Aussehen verändert.$" RustboroCity_Text_166DB0:: @ 8166DB0 - .string "A POKéMON changes shape?\n" - .string "If one did that, I would be shocked!$" + .string "Ein POKéMON verändert sein Aussehen?!?\n" + .string "Wenn es das tun würde, wäre ich zu Tode\l" + .string "erschrocken!$" RustboroCity_Text_166DEE:: @ 8166DEE - .string "A POKéMON you get in a trade from\n" - .string "someone grows fast.\p" - .string "But if you don’t have certain GYM\n" - .string "BADGES, it may not obey you...$" + .string "Ein POKéMON, das du durch Tausch\n" + .string "erhältst, wächst schnell.\p" + .string "Aber wenn dir ORDEN von bestimmten\n" + .string "ARENEN fehlen, wird es dir eventuell\l" + .string "nicht gehorchen.$" RustboroCity_Text_166E65:: @ 8166E65 - .string "Get out! Out of the way!$" + .string "Geh weg! Aus dem Weg!!!$" RustboroCity_Text_166E7E:: @ 8166E7E - .string "Wait! Pleeeaaase!\p" - .string "Don’t take my GOODS!$" + .string "Warte! Waaaaarte doch! Bitte!\p" + .string "Du kannst doch nicht einfach meine\n" + .string "WAREN stehlen!!!$" RustboroCity_Text_166EA5:: @ 8166EA5 - .string "Oh, it’s you!\p" - .string "You’re that fantastic TRAINER who\n" - .string "helped me in PETALBURG WOODS!\p" - .string "Help me! I was robbed by TEAM {EVIL_TEAM}!\n" - .string "I have to get the DEVON GOODS back!\p" - .string "If I don’t...\n" - .string "I’m going to be in serious trouble.$" + .string "Oh, du bist das!\p" + .string "Du bist dieser großartige TRAINER, der\n" + .string "mir im BLÜTENBURGWALD geholfen hat.\p" + .string "Hilf mir! Das TEAM {EVIL_TEAM} hat mich aus-\n" + .string "geraubt! Ich muss die DEVON-WAREN\l" + .string "zurückbekommen.\p" + .string "Wenn ich sie nicht bekomme...\n" + .string "Dann habe ich ein riesiges Problem.$" RustboroCity_Text_166F6B:: @ 8166F6B - .string "That shady character, I think he took\n" - .string "off towards the tunnel over there.$" + .string "Ich glaube, dieser zwielichtige Typ ist\n" + .string "in Richtung Tunnel gelaufen.$" RustboroCity_Text_166FB4:: @ 8166FB4 - .string "Oh! How did it go?\n" - .string "The DEVON GOODS?\p" - .string "You did!\n" - .string "You got them back!\p" - .string "You really are a great TRAINER!\p" - .string "I know! As my thanks, I’ll give you\n" - .string "another GREAT BALL!$" + .string "Oh! Und? Wie sieht es aus?\n" + .string "Die DEVON-WAREN?\p" + .string "Du hast es geschafft!\n" + .string "Du hast sie zurückbekommen!\p" + .string "Du bist wirklich ein großer TRAINER!\n" + .string "Ich weiß! Ich werde dir zum Dank einen\l" + .string "weiteren SUPERBALL schenken!$" RustboroCity_Text_16704C:: @ 816704C - .string "Your BAG’s full.\n" - .string "I can’t give you this GREAT BALL.$" + .string "Dein BEUTEL ist voll.\n" + .string "Ich kann dir den SUPERBALL nicht geben.$" RustboroCity_Text_16707F:: @ 816707F - .string "Excuse me, please!\n" - .string "Please come with me!$" + .string "Bitte entschuldige!\n" + .string "Würdest du mir bitte folgen?$" RustboroCity_Text_1670A7:: @ 81670A7 - .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" - .string "How’s your POKéDEX coming along?\p" - .string "Mine’s looking pretty decent.\p" - .string "I caught POKéMON in PETALBURG WOODS\n" - .string "until I ran out of POKé BALLS.$" + .string "MAIKE: Oh, hi {PLAYER}{KUN}!\n" + .string "Wie geht es mit deinem POKéDEX voran?\p" + .string "Meiner sieht schon ganz anständig aus.\p" + .string "Ich habe im BLÜTENBURGWALD\n" + .string "POKéMON gefangen, bis ich keine\l" + .string "POKéBÄLLE mehr hatte.$" RustboroCity_Text_16713C:: @ 816713C - .string "MAY: Oh, by the way, I passed MR. BRINEY\n" - .string "in PETALBURG WOODS.\p" - .string "I guess he’s on his way home to his\n" - .string "cottage by the sea.\p" - .string "{PLAYER}{KUN}, you just moved here so you\n" - .string "might not know this, but MR. BRINEY\l" - .string "was once a revered seafarer.$" + .string "MAIKE: Ach, übrigens. Ich habe MR.\n" + .string "BRACK im BLÜTENBURGWALD gesehen.\p" + .string "Ich glaube, er ist auf dem Weg zu seiner\n" + .string "Hütte am Meer.\p" + .string "{PLAYER}{KUN}, du bist gerade hierher\n" + .string "gezogen, daher kannst du das nicht\l" + .string "wissen, aber MR. BRACK war Seefahrer.$" RustboroCity_Text_167213:: @ 8167213 - .string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n" - .string "Have you filled in any pages yet?\p" - .string "Mine rules.\p" - .string "I went on a POKéMON-catching frenzy\n" - .string "in PETALBURG WOODS until I ran out\l" - .string "of POKé BALLS.$" + .string "BRIX: {PLAYER}, wie sieht es mit\n" + .string "deinem POKéDEX aus?\p" + .string "Meiner ist eine Wucht.\p" + .string "Ich habe im BLÜTENBURGWALD jede\n" + .string "Menge POKéMON gefangen, bis ich keine\l" + .string "POKéBÄLLE mehr hatte.$" RustboroCity_Text_1672B8:: @ 81672B8 - .string "BRENDAN: By the way, I walked by MR.\n" - .string "BRINEY in PETALBURG WOODS.\p" - .string "I bet he was on his way home to his\n" - .string "cottage by the sea.\p" - .string "I bet you didn’t know this, but he’s\n" - .string "always got a POKéMON with him.$" + .string "BRIX: Übrigens habe ich dort auch\n" + .string "MR. BRACK gesehen.\p" + .string "Ich wette, er ist auf dem Weg zu seiner\n" + .string "Hütte am Meer.\p" + .string "Und ich wette, du weißt nicht, dass er\n" + .string "immer ein POKéMON bei sich hat.$" RustboroCity_Text_167374:: @ 8167374 - .string "“Timesaving tunnel nearing\n" - .string "completion!”\p" - .string "...Is what it says on the sign, but\n" - .string "there’s also a big “X” splashed\l" - .string "across it in red paint...$" + .string "“Tunnel zur Abkürzung steht vor\n" + .string "Fertigstellung!”\p" + .string "...Das steht auf dem Schild, aber darüber\n" + .string "wurde ein “X” in roter Farbe gemalt...$" RustboroCity_Text_1673FA:: @ 81673FA .string "DEVON CORPORATION\p" - .string "“For all your living needs, we make\n" - .string "it all.”$" + .string "“Alles, was man im Leben braucht - \n" + .string "wir stellen es her.”$" RustboroCity_Text_167439:: @ 8167439 - .string "RUSTBORO CITY POKéMON GYM\n" - .string "LEADER: ROXANNE\p" - .string "“The ROCK-loving honors student!”$" + .string "POKéMON ARENA von METAROST CITY\n" + .string "LEITER: FELIZIA\p" + .string "“GESTEINS-Liebhaberin und\n" + .string "ihre Schüler!”$" RustboroCity_Text_167485: @ 8167485 - .string "DEVON CORP. BRANCH OFFICE\p" - .string "“Access limited to DEVON employees\n" - .string "and authorized personnel.”$" + .string "DEVON CORP. FILIALE\p" + .string "“Zutritt nur für Angestellte von DEVON\n" + .string "und autorisierte Personen.”$" RustboroCity_Text_1674DD:: @ 81674DD - .string "RUSTBORO CITY\p" - .string "“The city probing the integration of\n" - .string "nature and science.”$" + .string "METAROST CITY\p" + .string "“Diese Stadt steht im Zeichen der Inte-\n" + .string "gration von Natur und Wissenschaften.”$" RustboroCity_Text_167525:: @ 8167525 - .string "POKéMON TRAINER’S SCHOOL\p" - .string "“We’ll teach you anything about\n" - .string "POKéMON!”$" + .string "POKéMON TRAINERSCHULE\p" + .string "“Wir bringen dir alles über die\n" + .string "POKéMON bei!”$" RustboroCity_Text_167568:: @ 8167568 - .string "CUTTER’S HOUSE$" + .string "HAUS DES ZERSCHNEIDERS$" diff --git a/data/text/maps/RustboroCity_CuttersHouse.inc b/data/text/maps/RustboroCity_CuttersHouse.inc index 8b4c237f5..7e8448070 100644 --- a/data/text/maps/RustboroCity_CuttersHouse.inc +++ b/data/text/maps/RustboroCity_CuttersHouse.inc @@ -1,27 +1,31 @@ RustboroCity_CuttersHouse_Text_18509C:: @ 818509C - .string "That determined expression...\n" - .string "That limber way you move...\l" - .string "And your well-trained POKéMON...\p" - .string "You’re obviously a skilled TRAINER!\p" - .string "No, wait, don’t say a word.\n" - .string "I can tell just by looking at you.\p" - .string "I’m sure that you will be capable\n" - .string "of putting this HM to good use.\p" - .string "No need to be modest or shy.\n" - .string "Go on, take it!$" + .string "Diese Entschlossenheit...\n" + .string "Deine Beweglichkeit...\l" + .string "Deine Hingabe für POKéMON...\p" + .string "Du bist wirklich ein talentierter\n" + .string "TRAINER!\p" + .string "Nein, warte. Sag jetzt nichts.\n" + .string "Ich brauche dich nur anzuschauen.\p" + .string "Ich bin mir sicher, dass du mit dieser\n" + .string "VM sehr gut umgehen wirst.\p" + .string "Kein Grund, so schüchtern zu sein.\n" + .string "Hier, nimm sie!$" RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 - .string "That HM, it’s CUT.\p" - .string "An HM move is one that can be used\n" - .string "by POKéMON out of a battle.\p" - .string "Any POKéMON that’s learned CUT can\n" - .string "chop down thin trees if the TRAINER\l" - .string "has earned the STONE BADGE.\p" - .string "And, unlike a TM, an HM doesn’t break\n" - .string "after one use.$" + .string "Diese VM, sie enthält ZERSCHNEIDER.\p" + .string "Eine VM ist eine Attacke, die auch\n" + .string "außerhalb des Kampfes von einem\l" + .string "POKéMON angewandt werden kann.\p" + .string "Jedes POKéMON, das diese Attacke\n" + .string "gelernt hat, kann Bäume damit\p" + .string "zerschneiden, wenn der TRAINER den\n" + .string "STEINORDEN besitzt.\p" + .string "Und, im Gegensatz zur TM, kann eine VM\n" + .string "mehrfach gelehrt werden.$" RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 - .string "When they were expanding the city of\n" - .string "RUSTBORO, my dad helped out.\p" - .string "He made his POKéMON use CUT to clear\n" - .string "the land of trees.$" + .string "Als sie die Stadt METAROST CITY\n" + .string "vergrößert haben, hat mein Vater ihnen\l" + .string "geholfen.\p" + .string "Seine POKéMON fällten die Bäume mit\n" + .string "ZERSCHNEIDER.$" diff --git a/data/text/maps/RustboroCity_DevonCorp_1F.inc b/data/text/maps/RustboroCity_DevonCorp_1F.inc index 209fd049c..c7b4b4028 100644 --- a/data/text/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/text/maps/RustboroCity_DevonCorp_1F.inc @@ -1,38 +1,42 @@ RustboroCity_DevonCorp_1F_Text_1828EE:: @ 81828EE - .string "Hello and welcome to the DEVON\n" - .string "CORPORATION.\p" - .string "We’re proud producers of items and\n" - .string "medicine that enhance your life.$" + .string "Hallo und Willkommen in der\n" + .string "DEVON CORPORATION.\p" + .string "Wir sind die stolzen Entwickler von\n" + .string "Medizin und Items, die das Leben\l" + .string "bereichern.$" RustboroCity_DevonCorp_1F_Text_18295E:: @ 818295E - .string "One of our research staff stupidly\n" - .string "got robbed of an important parcel.$" + .string "Einem Mitglied unseres Forschungsteams\n" + .string "ist blöderweise ein wichtiges Paket\l" + .string "gestohlen worden.$" RustboroCity_DevonCorp_1F_Text_1829A4:: @ 81829A4 - .string "Hey, those RUNNING SHOES!\n" - .string "They’re one of our products!\p" - .string "It makes me happy when I see someone\n" - .string "using something we made.$" + .string "Hey, diese TURBOTRETER!\n" + .string "Die haben wir auch entwickelt!\p" + .string "Ich freue mich immer, wenn ich jemanden\n" + .string "treffe, der eines unserer Produkte\l" + .string "benutzt.$" RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 - .string "That stolen parcel...\p" - .string "Well, sure it’s important, but it’s not\n" - .string "anything that anyone can use.\p" - .string "In my estimation, that robber must not\n" - .string "have been very bright.$" + .string "Das gestohlene Paket...\p" + .string "Nun, es ist natürlich sehr wichtig, aber\n" + .string "mit dem Inhalt kann niemand etwas\l" + .string "anfangen.\p" + .string "Meiner Einschätzung nach ist der Dieb\n" + .string "wirklich nicht sehr schlau gewesen...$" RustboroCity_DevonCorp_1F_Text_182AB3:: @ 8182AB3 - .string "It sounds like they’ve recovered\n" - .string "the ripped-off DEVON GOODS.$" + .string "Klingt, als hätten wir die gestohlenen\n" + .string "DEVON-WAREN zurückerhalten.$" RustboroCity_DevonCorp_1F_Text_182AF0:: @ 8182AF0 - .string "I’m sorry, only authorized people\n" - .string "are allowed to enter here.$" + .string "Tut mir Leid, aber nur autorisierte\n" + .string "Personen haben hier Zutritt.$" RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D - .string "It’s beyond stupid.\n" - .string "How could we get robbed?$" + .string "Das ist mehr als blöd.\n" + .string "Wie konnten wir nur ausgeraubt werden?$" RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A - .string "Hi, there!\n" - .string "You’re always welcome here!$" + .string "Hi, du da!\n" + .string "Du bist hier jederzeit willkommen!$" diff --git a/data/text/maps/RustboroCity_DevonCorp_2F.inc b/data/text/maps/RustboroCity_DevonCorp_2F.inc index a6a6bb6c2..3e672ab46 100644 --- a/data/text/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/text/maps/RustboroCity_DevonCorp_2F.inc @@ -1,88 +1,98 @@ RustboroCity_DevonCorp_2F_Text_182B81:: @ 8182B81 - .string "We’re developing a device for talking\n" - .string "with POKéMON.\p" - .string "But we haven’t had much success...$" + .string "Wir wollen ein Gerät entwickeln, mit dem\n" + .string "wir mit POKéMON reden können.\p" + .string "Aber bisher waren wir nicht sehr\n" + .string "erfolgreich...$" RustboroCity_DevonCorp_2F_Text_182BD8:: @ 8182BD8 - .string "I’m developing new kinds of\n" - .string "POKé BALLS...\p" - .string "But I haven’t made much headway...$" + .string "Ich entwickle neue Arten von\n" + .string "POKéBÄLLEN...\p" + .string "Aber noch bin ich nicht sonderlich weit\n" + .string "mit der Entwicklung gekommen...$" RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 - .string "We finally made new kinds of POKé BALLS!\p" - .string "The REPEAT BALL makes it easier to\n" - .string "catch POKéMON you’d caught before.\p" - .string "The TIMER BALL gets better at catching\n" - .string "POKéMON the longer a battle runs.\p" - .string "Both are proudly developed by the\n" - .string "DEVON CORPORATION.\p" - .string "Please give them a try!$" + .string "Wir haben endlich neue POKéBÄLLE\n" + .string "entwickelt!\p" + .string "Mit dem WIEDERBALL lassen sich\n" + .string "POKéMON leichter fangen, die du\l" + .string "vorher schon mal gefangen hattest.\p" + .string "Mit dem TIMERBALL lassen sich POKéMON\n" + .string "umso leichter fangen, je länger der\l" + .string "Kampf dauert.\p" + .string "Beide werden voller Stolz von der\n" + .string "DEVON CORPORATION präsentiert.\p" + .string "Probiere sie bitte unbedingt aus!$" RustboroCity_DevonCorp_2F_Text_182D2A:: @ 8182D2A - .string "I made the POKéNAV!\p" - .string "As an engineer, I feel blessed to have\n" - .string "made something so great!$" + .string "Ich habe den POKéNAV entwickelt!\p" + .string "Als Ingenieur erfüllt es mich mit Stolz,\n" + .string "so etwas Großartiges entwickelt zu\l" + .string "haben.$" RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E .string "Oh, wow!\n" - .string "That’s a POKéNAV!\p" - .string "It came about as a result of our\n" - .string "PRESIDENT’s desire to learn about\l" - .string "the feelings of POKéMON.\p" - .string "Would you like me to describe its\n" - .string "features in detail?\p" - .string "No, no. I think you’ll find out just by\n" - .string "trying the POKéNAV out.$" + .string "Das ist ein POKéNAV!\p" + .string "Er ist das Resultat der Wissbegierde\n" + .string "unseres PRÄSIDENTEN, der etwas über\l" + .string "die Gefühle der POKéMON lernen möchte.\p" + .string "Soll ich dir die Funktionen im Einzelnen\n" + .string "erklären?\p" + .string "Ach was, du findest sie schon ganz\n" + .string "alleine heraus.$" RustboroCity_DevonCorp_2F_Text_182E6B:: @ 8182E6B - .string "I’m trying to develop a device that\n" - .string "visually reproduces the dreams of\l" - .string "POKéMON...\p" - .string "But it’s not going well.$" + .string "Ich arbeite an einer Vorrichtung, die\n" + .string "die Träume der POKéMON visualisieren\l" + .string "kann...\p" + .string "Aber so richtig geht es nicht voran.$" RustboroCity_DevonCorp_2F_Text_182ED5:: @ 8182ED5 - .string "I’ve been trying to develop a device\n" - .string "that resurrects POKéMON from fossils...\p" - .string "And, it’s working!$" + .string "Ich arbeite an einer Vorrichtung, die\n" + .string "POKéMON aus Fossilien wieder zum Leben\l" + .string "erweckt.\p" + .string "Und... Es klappt!!!$" RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 - .string "Wait! That thing you have there...\n" - .string "Is that a POKéMON fossil?\p" - .string "Would you like to bring that POKéMON\n" - .string "back to life?\p" - .string "I can with my newly developed\n" - .string "FOSSIL REGENERATOR.$" + .string "Warte! Das Teil dort...\n" + .string "Ist das ein POKéMON-Fossil?\p" + .string "Möchtest du das POKéMON wieder zum\n" + .string "Leben erwecken?\p" + .string "Ich kann dir mit meiner neuesten Ent-\n" + .string "wicklung, dem FOSSIL-REGENERATOR,\l" + .string "dabei helfen.$" RustboroCity_DevonCorp_2F_Text_182FD7:: @ 8182FD7 - .string "Oh, is that so?\p" - .string "DEVON’s technological expertise\n" - .string "is outstanding, I tell you.$" + .string "Ehrlich?\p" + .string "DEVON besitzt einen hervorragenden\n" + .string "Ruf in Sachen Technik. \l" + .string "Das versichere ich dir!$" RustboroCity_DevonCorp_2F_Text_183023:: @ 8183023 - .string "Excellent!\n" - .string "Let’s do this right away.\p" - .string "{PLAYER} handed the {STR_VAR_1} to\n" - .string "the DEVON RESEARCHER.$" + .string "Exzellent!\n" + .string "Dann lass uns sofort zur Tat schreiten.\p" + .string "{PLAYER} gibt dem FORSCHER von DEVON\n" + .string "{STR_VAR_1}.$" RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 - .string "The FOSSIL REGENERATOR, which I made,\n" - .string "is incredible.\p" - .string "But it has one drawback - it takes\n" - .string "a long time to work.\p" - .string "So, uh... How about you go for a stroll\n" - .string "and look around for a while?$" + .string "Der FOSSIL-REGENERATOR, den ich ent-\n" + .string "wickelt habe, ist einfach unglaublich.\p" + .string "Aber einen Nachteil gibt es: Es dauert\n" + .string "eine Weile, bis der Prozess\l" + .string "abgeschlossen ist.\p" + .string "Also, äh... Warum schaust du dich in der\n" + .string "Zeit nicht ein wenig um?$" RustboroCity_DevonCorp_2F_Text_183124:: @ 8183124 - .string "Thanks for waiting!\p" - .string "Your fossilized POKéMON has been\n" - .string "brought back to life!\p" - .string "The fossil was an ancient POKéMON.\n" - .string "{STR_VAR_2}, it was!$" + .string "Danke für deine Geduld!\p" + .string "Dein fossiles POKéMON wurde zu neuem\n" + .string "Leben erweckt!\p" + .string "Das Fossil war ein altertümliches\n" + .string "POKéMON. Ein {STR_VAR_2}!$" RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E - .string "{PLAYER} received {STR_VAR_2} from\n" - .string "the DEVON RESEARCHER.$" + .string "{PLAYER} erhält das {STR_VAR_2} vom\n" + .string "FORSCHER von DEVON.$" RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 - .string "Uh-oh, you’ve got too many POKéMON.\n" - .string "You have no room for this one.$" + .string "Oh oh, du hast zu viele POKéMON bei dir.\n" + .string "Du hast keinen Platz für dieses hier.$" diff --git a/data/text/maps/RustboroCity_DevonCorp_3F.inc b/data/text/maps/RustboroCity_DevonCorp_3F.inc index c868a4836..01bca10d4 100644 --- a/data/text/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/text/maps/RustboroCity_DevonCorp_3F.inc @@ -1,98 +1,106 @@ RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B - .string "I’m MR. STONE, the PRESIDENT of\n" - .string "the DEVON CORPORATION.\p" - .string "I’d just got word about you!\p" - .string "You saved our staff not just once,\n" - .string "but twice!\p" - .string "I have a favor to ask of an amazing\n" - .string "person like you.\p" - .string "I understand that you’re delivering\n" - .string "a package to SLATEPORT’s SHIPYARD.\p" - .string "Well, on the way, could you stop off in\n" - .string "DEWFORD TOWN?\p" - .string "I was hoping that you’d deliver a LETTER\n" - .string "to STEVEN in DEWFORD.$" + .string "Ich bin MR. TRUMM, der PRÄSIDENT der\n" + .string "DEVON CORPORATION.\p" + .string "Ich muss etwas mit dir besprechen!\p" + .string "Du hast unseren Mitarbeitern nicht\n" + .string "nur einmal, sondern zweimal aus\l" + .string "der Klemme geholfen!\p" + .string "Du bist so außergewöhnlich, dass ich\n" + .string "dich gerne um einen Gefallen\l" + .string "bitten möchte.\p" + .string "Ich weiß, dass du ein Paket zur WERFT in\n" + .string "GRAPHITPORT CITY bringen willst.\p" + .string "Könntest du auf dem Weg nicht\n" + .string "auch in FAUSTAUHAVEN Halt machen?\p" + .string "Und TROY in FAUSTAUHAVEN einen BRIEF\n" + .string "von mir überbringen?$" RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E - .string "MR. STONE: Now, you should know that\n" - .string "I am a great PRESIDENT.\p" - .string "So, I’d never be so cheap as to ask\n" - .string "a favor for nothing in return.\p" - .string "That’s why I want you to have this!$" + .string "MR. TRUMM: Nun, du sollst wissen, dass\n" + .string "ich ein einflussreicher PRÄSIDENT bin.\p" + .string "Und daher würde ich dich nie um einen\n" + .string "Gefallen bitten, ohne eine\l" + .string "Gegenleistung zu erbringen!\p" + .string "Deshalb möchte ich dir dies hier geben.$" RustboroCity_DevonCorp_3F_Text_183422:: @ 8183422 - .string "{PLAYER} received a POKéNAV.$" + .string "{PLAYER} erhält den POKéNAV.$" RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 - .string "MR. STONE: That device...\p" - .string "It’s a POKéMON NAVIGATOR, or POKéNAV\n" - .string "for short.\p" - .string "It’s an indispensable tool for any\n" - .string "TRAINER on an adventure.\p" - .string "It has a map of the HOENN region.\p" - .string "You can check the locations of\n" - .string "DEWFORD and SLATEPORT easily!$" + .string "MR. TRUMM: Dieses Gerät...\p" + .string "Es ist ein POKéMON NAVIGATOR - oder\n" + .string "kurz ein POKéNAV.\p" + .string "Ein unentbehrliches Hilfsmittel für\n" + .string "jeden TRAINER auf Abenteuerreise.\p" + .string "Er enthält die Karte von HOENN.\p" + .string "So kannst du ganz leicht herausfinden,\n" + .string "wo die Orte FAUSTAUHAVEN und\l" + .string "GRAPHITPORT CITY liegen.$" RustboroCity_DevonCorp_3F_Text_18351E:: @ 818351E - .string "MR. STONE: I’m counting on you!$" + .string "MR. TRUMM: Ich verlasse mich auf dich!$" RustboroCity_DevonCorp_3F_Text_18353E:: @ 818353E - .string "MR. STONE: You delivered my LETTER?\n" - .string "Thank you kindly!\p" - .string "This is my way of thanking you.\n" - .string "It should help you, a TRAINER.$" + .string "MR. TRUMM: Du hast meinen BRIEF\n" + .string "überbracht? Herzlichen Dank!\p" + .string "Dies ist ein Dankeschön von mir.\n" + .string "Es wird dir als TRAINER sicher helfen.$" RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 - .string "MR. STONE: A POKéMON holding that\n" - .string "EXP. SHARE will be given some of the\l" - .string "EXP Points from battle.\p" - .string "It will get EXP Points even if it didn’t\n" - .string "actually battle.\p" - .string "I would say EXP. SHARE is quite useful\n" - .string "for raising weak POKéMON.$" + .string "MR. TRUMM: Trägt ein POKéMON den EP-\n" + .string "TEILER, so erhält es in jedem Kampf\l" + .string "Erfahrungspunkte.\p" + .string "Auch wenn es gar nicht am Kampf\n" + .string "teilnimmt.\p" + .string "Ich würde sagen, der EP-TEILER ist sehr\n" + .string "nützlich, um schwache POKéMON aufzu-\l" + .string "ziehen.$" RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D - .string "MR. STONE: Since my youth, I’ve immersed\n" - .string "myself in work.\p" - .string "Consequently, I’m not familiar with\n" - .string "trends and that sort of thing.\p" - .string "But do young people all want to be\n" - .string "TRAINERS in the POKéMON LEAGUE?$" + .string "MR. TRUMM: Schon in meiner Jugend habe\n" + .string "ich mich voll auf die Arbeit\l" + .string "konzentriert.\p" + .string "Deshalb weiß ich auch nicht unbedingt,\n" + .string "was gerade im Trend liegt.\p" + .string "Wollen alle jungen Leute TRAINER in der\n" + .string "POKéMON LIGA werden?$" RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C - .string "This is the DEVON CORPORATION’s\n" - .string "third floor.\p" - .string "Our PRESIDENT’s OFFICE is on this floor.\p" - .string "Anyway, I can’t tell you how much I’m\n" - .string "grateful for what you’ve done.\p" - .string "Um... By the way, that parcel you got\n" - .string "back for us...\p" - .string "Could I get you to deliver that to the\n" - .string "SHIPYARD in SLATEPORT?\p" - .string "It would be awful if those robbers\n" - .string "tried to take it again.\p" - .string "Uh... Hehehe, so, uh, could I count\n" - .string "on you to do that for me?\p" - .string "Oh, that’s right.\n" - .string "Could you wait here a second?$" + .string "Dies ist die zweite Etage der DEVON\n" + .string "CORPORATION.\p" + .string "Hier befindet sich das BÜRO des\n" + .string "PRÄSIDENTEN.\p" + .string "Nun ja, ich kann dir gar nicht sagen, wie\n" + .string "dankbar ich dir für deine Taten bin.\p" + .string "Ähm... Äh, das Paket, das du uns\n" + .string "zurückgebracht hast...\p" + .string "Darf ich dich bitten, es zur WERFT\n" + .string "in GRAPHITPORT CITY zu bringen?\p" + .string "Es wäre fürchterlich, wenn es den\n" + .string "Dieben erneut in die Hände fallen würde.\p" + .string "Äh... Hehehe, also, äh, kann ich auch\n" + .string "dieses Mal wieder mit dir rechnen?\p" + .string "Ach, da fällt mir ein... Würdest du mich\n" + .string "einen Moment entschuldigen?$" RustboroCity_DevonCorp_3F_Text_183903:: @ 8183903 - .string "Our PRESIDENT would like to have\n" - .string "a word with you.\p" - .string "Please come with me.$" + .string "Unser PRÄSIDENT würde gerne kurz mit\n" + .string "dir sprechen.\p" + .string "Komm bitte mit mir.$" RustboroCity_DevonCorp_3F_Text_18394A:: @ 818394A - .string "Please, go ahead.$" + .string "Bitte, hier entlang.$" RustboroCity_DevonCorp_3F_Text_18395C:: @ 818395C - .string "If you visit the SHIPYARD in SLATEPORT,\n" - .string "you should go see CAPT. STERN.$" + .string "Wenn du die WERFT in GRAPHITPORT CITY\n" + .string "besuchst, solltest du mit KAPT. BRIGG\l" + .string "sprechen.$" RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 - .string "DEVON’s new products, the REPEAT BALL\n" - .string "and TIMER BALL, have become hugely\l" - .string "popular among TRAINERS.$" + .string "DEVONS neue Produkte, der WIEDERBALL\n" + .string "und der TIMERBALL, sind mittlerweile\l" + .string "sehr populär unter den TRAINERN.$" RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 - .string "It’s a collection of rare rocks and\n" - .string "stones assembled by the PRESIDENT.$" + .string "Eine Kollektion seltener Steine und\n" + .string "Mineralien - gesammelt vom PRÄSIDENTEN.$" diff --git a/data/text/maps/RustboroCity_Flat1_1F.inc b/data/text/maps/RustboroCity_Flat1_1F.inc index 4721931e4..44a6d8800 100644 --- a/data/text/maps/RustboroCity_Flat1_1F.inc +++ b/data/text/maps/RustboroCity_Flat1_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 - .string "Every POKéMON has a special ability\n" - .string "that it can use.$" + .string "Jedes POKéMON besitzt eine spezielle\n" + .string "Begabung, die es einsetzen kann.$" RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 - .string "POKéMON are such strange creatures.$" + .string "POKéMON sind sehr seltsame Geschöpfe.$" diff --git a/data/text/maps/RustboroCity_Flat1_2F.inc b/data/text/maps/RustboroCity_Flat1_2F.inc index 7ddb678bf..d744b8484 100644 --- a/data/text/maps/RustboroCity_Flat1_2F.inc +++ b/data/text/maps/RustboroCity_Flat1_2F.inc @@ -1,8 +1,8 @@ RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D - .string "Oh, it’s so hard every day...\p" - .string "What’s hard?\n" - .string "You need to ask?\p" - .string "It’s trying to figure out what to\n" - .string "make for meals every day.\p" - .string "It really isn’t easy coming up with\n" - .string "meals every day.$" + .string "Oh, jeden Tag wird es schwerer...\p" + .string "Was so schwer ist?\n" + .string "Das fragst du noch?\p" + .string "Herauszufinden, was ich jeden Tag\n" + .string "kochen soll, natürlich!\p" + .string "Es ist nicht einfach, jeden Tag eine\n" + .string "Mahlzeit auf den Tisch zu bringen.$" diff --git a/data/text/maps/RustboroCity_Flat2_1F.inc b/data/text/maps/RustboroCity_Flat2_1F.inc index d949a0ab8..d6cb53734 100644 --- a/data/text/maps/RustboroCity_Flat2_1F.inc +++ b/data/text/maps/RustboroCity_Flat2_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD - .string "DEVON CORPORATION’s workers live in\n" - .string "this building.$" + .string "Die Angestellten der DEVON CORPORATION\n" + .string "leben in diesem Haus.$" RustboroCity_Flat2_1F_Text_185410:: @ 8185410 - .string "SKITTY: Gyaaaah!$" + .string "ENECO: Gyaaaah!$" diff --git a/data/text/maps/RustboroCity_Flat2_2F.inc b/data/text/maps/RustboroCity_Flat2_2F.inc index 8a3d52fda..13d9b9f93 100644 --- a/data/text/maps/RustboroCity_Flat2_2F.inc +++ b/data/text/maps/RustboroCity_Flat2_2F.inc @@ -1,13 +1,14 @@ RustboroCity_Flat2_2F_Text_185421:: @ 8185421 - .string "Way back in the old days, DEVON was just\n" - .string "a teeny, tiny company.$" + .string "Vor langer, langer Zeit war DEVON eine\n" + .string "kleine, überschaubare Firma.$" RustboroCity_Flat2_2F_Text_185461:: @ 8185461 - .string "My daddy’s working at the CORPORATION.\p" - .string "My daddy made this!\n" - .string "But I can’t use it, so you can have it.$" + .string "Mein Papa arbeitet für die CORPORATION.\p" + .string "Mein Papa hat dies gemacht! Ich kann\n" + .string "damit aber nichts anfangen, daher\l" + .string "schenke ich es dir.$" RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 - .string "My daddy’s working at the CORPORATION.\p" - .string "When I grow up, I’m going to work for\n" - .string "DEVON, too.$" + .string "Mein Papa arbeitet für die CORPORATION.\p" + .string "Wenn ich groß bin, werde ich auch für\n" + .string "DEVON arbeiten.$" diff --git a/data/text/maps/RustboroCity_Flat2_3F.inc b/data/text/maps/RustboroCity_Flat2_3F.inc index 9f95ce92e..3bb2affc0 100644 --- a/data/text/maps/RustboroCity_Flat2_3F.inc +++ b/data/text/maps/RustboroCity_Flat2_3F.inc @@ -1,7 +1,7 @@ RustboroCity_Flat2_3F_Text_18551D:: @ 818551D - .string "DEVON’s PRESIDENT likes to collect\n" - .string "rare stones.$" + .string "Der PRÄSIDENT von DEVON sammelt\n" + .string "leidenschaftlich gerne seltene Steine.$" RustboroCity_Flat2_3F_Text_18554D:: @ 818554D - .string "I think the PRESIDENT’s son also\n" - .string "collects rare stones.$" + .string "Ich glaube, der Sohn des PRÄSIDENTEN\n" + .string "sammelt auch seltene Steine.$" diff --git a/data/text/maps/RustboroCity_Gym.inc b/data/text/maps/RustboroCity_Gym.inc index 7bb737097..88e0e01f2 100644 --- a/data/text/maps/RustboroCity_Gym.inc +++ b/data/text/maps/RustboroCity_Gym.inc @@ -1,111 +1,118 @@ RustboroCity_Gym_Text_183A4B:: @ 8183A4B - .string "Yo, how’s it going?\p" - .string "Listen, my friend!\n" - .string "Would you like to become the CHAMPION?\p" - .string "I’m no TRAINER, not me, but I can\n" - .string "sure give you winning advice.\p" - .string "That’s settled, then! We’ll aim for the\n" - .string "POKéMON CHAMPIONSHIP together!\p" - .string "It’s your job as a TRAINER to collect\n" - .string "GYM BADGES, am I right?\p" - .string "But GYM LEADERS aren’t pushovers!\p" - .string "And that’s where I come in!\n" - .string "I’m here to provide expert advice!\p" - .string "ROXANNE, the GYM LEADER, is a user\n" - .string "of ROCK-type POKéMON.\p" - .string "The ROCK type is very durable, but\n" - .string "it can’t stand WATER-type and\l" - .string "GRASS-type moves.\p" - .string "Come see me afterwards, if you beat\n" - .string "the GYM LEADER.\p" - .string "Well, go for it!$" + .string "Hi, wie geht’s?\p" + .string "Hör zu, mein Freund!\n" + .string "Würdest du gerne CHAMP werden?\p" + .string "Ich bin kein TRAINER. Ich nicht. Aber\n" + .string "ich kann dir trotzdem einen nützlichen\l" + .string "Rat geben.\p" + .string "Also, abgemacht! Wir werden zusammen\n" + .string "nach der POKéMON MEISTERSCHAFT\l" + .string "streben!\p" + .string "Als TRAINER musst du die ORDEN der\n" + .string "ARENEN sammeln, habe ich Recht?\p" + .string "Aber die ARENALEITER sind nicht gerade\n" + .string "einfach zu besiegen!\p" + .string "Und hier komme ich ins Spiel!\n" + .string "Ich werde dir einen Expertentipp geben!\p" + .string "FELIZIA, die ARENALEITERIN, setzt\n" + .string "GESTEINS-POKéMON ein.\p" + .string "Ein GESTEINS-POKéMON ist sehr zäh,\n" + .string "hat aber gegen WASSER- und PFLANZEN-\l" + .string "Attacken keine Chance.\p" + .string "Komm wieder vorbei, wenn du die ARENA-\n" + .string "LEITERIN besiegt hast.\p" + .string "Nun zeig, was du drauf hast!$" RustboroCity_Gym_Text_183C90:: @ 8183C90 - .string "Whoa! What a breathtaking victory!\n" - .string "My cheering must’ve worked!\p" - .string "Great!\n" - .string "Check your TRAINER CARD.\p" - .string "The STONE BADGE you got should be\n" - .string "properly recorded on it.\p" - .string "In other words...\p" - .string "You’ve climbed the first step on\n" - .string "the stairs to the CHAMPIONSHIP!\p" - .string "That’s got to feel awesome!$" + .string "Hui! Was für ein atemberaubender Sieg!\n" + .string "Meine Zurufe müssen gewirkt haben!\p" + .string "Großartig!\n" + .string "Schau mal auf deinen TRAINERPASS.\p" + .string "Der STEINORDEN, den du gerade bekommen\n" + .string "hast, müsste dort schon vermerkt sein.\p" + .string "Nun hast du den ersten Schritt zur\n" + .string "MEISTERSCHAFT schon erfolgreich\l" + .string "hinter dir!\p" + .string "Ein großartiges Gefühl!$" RustboroCity_Gym_Text_183D99:: @ 8183D99 - .string "Don’t take us GYM TRAINERS lightly!\n" - .string "I’ll show you why we’re better!$" + .string "Unterschätze die TRAINER einer ARENA\n" + .string "nicht! Ich zeige dir, warum wir die\l" + .string "Besten sind!$" RustboroCity_Gym_Text_183DDD:: @ 8183DDD - .string "You were too good for me...$" + .string "Du warst viel zu gut für mich...$" RustboroCity_Gym_Text_183DF9:: @ 8183DF9 - .string "You haven’t seen anything of the ROCK\n" - .string "type’s terrifying power!$" + .string "Du hast noch gar nicht gesehen, was\n" + .string "GESTEINS-POKéMON alles können.$" RustboroCity_Gym_Text_183E38:: @ 8183E38 - .string "If you can’t beat me, you won’t stand\n" - .string "a chance against ROXANNE!$" + .string "Wenn du mich nicht besiegen kannst,\n" + .string "hast du keine Chance gegen FELIZIA.$" RustboroCity_Gym_Text_183E78:: @ 8183E78 - .string "Wow! You’ve got some potential!$" + .string "Wow! Du hast wirklich Talent!$" RustboroCity_Gym_Text_183E98:: @ 8183E98 - .string "ROXANNE is stronger than me by\n" - .string "several times.\p" - .string "You’d better be on your guard!$" + .string "FELIZIA ist um ein Vielfaches stärker\n" + .string "als ich.\p" + .string "Du solltest dich besser wappnen!$" RustboroCity_Gym_Text_183EE5:: @ 8183EE5 - .string "Hello, I am ROXANNE, the RUSTBORO\n" - .string "POKéMON GYM LEADER.\p" - .string "I became a GYM LEADER so that I may\n" - .string "apply what I learned at the POKéMON\l" - .string "TRAINER’S SCHOOL in battle.\p" - .string "Would you kindly demonstrate how you\n" - .string "battle, and with which POKéMON?$" + .string "Hallo, ich bin FELIZIA, die LEITERIN der\n" + .string "ARENA von METAROST CITY.\p" + .string "Ich wurde ARENALEITERIN, um mein\n" + .string "Wissen, das ich in der POKéMON TRAINER-\l" + .string "SCHULE erworben habe, umzusetzen.\p" + .string "Würdest du mir bitte zeigen, wie du\n" + .string "kämpfst und mit welchen POKéMON?$" RustboroCity_Gym_Text_183FC4:: @ 8183FC4 .string "So...\n" - .string "I lost...\p" - .string "It seems that I still have much more\n" - .string "to learn...\p" - .string "I understand.\p" - .string "The POKéMON LEAGUE’s rules state\n" - .string "that TRAINERS are to be given this\l" - .string "if they defeat a GYM LEADER.\p" - .string "Please accept the official POKéMON\n" - .string "LEAGUE STONE BADGE.$" + .string "Ich habe verloren...\p" + .string "Es scheint, ich muss noch eine ganze\n" + .string "Menge lernen...\p" + .string "Ich verstehe schon.\p" + .string "Die Regeln der POKéMON LIGA schreiben\n" + .string "vor, dass TRAINER, die einen ARENA-\l" + .string "LEITER besiegt haben, dieses erhalten.\p" + .string "Bitte nimm den offiziellen POKéMON LIGA\n" + .string "STEINORDEN an!$" RustboroCity_Gym_Text_1840AB:: @ 81840AB - .string "{PLAYER} received the STONE BADGE\n" - .string "from ROXANNE.$" + .string "{PLAYER} hat den STEINORDEN von\n" + .string "FELIZIA erhalten.$" RustboroCity_Gym_Text_1840D5:: @ 81840D5 - .string "The STONE BADGE heightens the ATTACK\n" - .string "power of your POKéMON.\p" - .string "It also enables them to use the HM move\n" - .string "CUT outside of battle.\p" - .string "Please take this with you, too.$" + .string "Der STEINORDEN erhöht die Kraft der\n" + .string "ATTACKEN deiner POKéMON.\p" + .string "Außerdem sind sie nun in der Lage, die\n" + .string "VM ZERSCHNEIDER auch außerhalb eines\l" + .string "Kampfes einzusetzen.\p" + .string "Dies möchte ich dir auch noch geben.$" RustboroCity_Gym_Text_184170:: @ 8184170 - .string "That TM39 contains ROCK TOMB.\p" - .string "It not only inflicts damage by dropping\n" - .string "rocks, it also lowers SPEED.\p" - .string "If you use a TM, it instantly teaches\n" - .string "the move to a POKéMON.\p" - .string "Remember, a TM can be used only once,\n" - .string "so think before you use it.$" + .string "Diese TM39 enthält FELSGRAB.\p" + .string "Sie richtet nicht nur durch das Fallen\n" + .string "von Steinen Schaden an, sondern\l" + .string "reduziert auch die INITIATIVE.\p" + .string "Sobald du eine TM aktivierst, wird die\n" + .string "Attacke einem POKéMON beigebracht.\p" + .string "Aber vergiss nicht, dass eine TM nur\n" + .string "einmal beigebracht werden kann. Ihr\l" + .string "Einsatz will also überlegt sein.$" RustboroCity_Gym_Text_184252:: @ 8184252 - .string "Since you are so strong, you should\n" - .string "challenge other GYM LEADERS.\p" - .string "By battling many TRAINERS, you should\n" - .string "learn many things.$" + .string "Da du so stark bist, solltest du auch die\n" + .string "anderen ARENALEITER herausfordern.\p" + .string "Du lernst wertvolle Dinge dazu, wenn du\n" + .string "gegen viele TRAINER antrittst.$" RustboroCity_Gym_Text_1842CC:: @ 81842CC - .string "RUSTBORO CITY POKéMON GYM$" + .string "POKéMON ARENA von METAROST CITY$" RustboroCity_Gym_Text_1842E6:: @ 81842E6 - .string "RUSTBORO CITY POKéMON GYM\p" - .string "ROXANNE’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von METAROST CITY\p" + .string "FELIZIAS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/RustboroCity_House1.inc b/data/text/maps/RustboroCity_House1.inc index 6427aa326..e47e4a727 100644 --- a/data/text/maps/RustboroCity_House1.inc +++ b/data/text/maps/RustboroCity_House1.inc @@ -1,27 +1,28 @@ RustboroCity_House1_Text_184EBA:: @ 8184EBA - .string "Do you nickname your POKéMON?\n" - .string "I gave a cool name to mine.\p" - .string "But when I call my POKéMON by that\n" - .string "name, people laugh at me...\p" - .string "If it’s okay with you, want to trade\n" - .string "your {STR_VAR_1} for my {STR_VAR_2}?$" + .string "Gibst du deinen POKéMON Kosenamen?\n" + .string "Ich habe meinem einen coolen Namen\l" + .string "gegeben.\p" + .string "Aber wenn ich es nun beim Namen rufe,\n" + .string "rollen sich die Leute vor Lachen ab...\p" + .string "Hast du Lust, dein {STR_VAR_1} gegen\n" + .string "mein {STR_VAR_2} zu tauschen?$" RustboroCity_House1_Text_184F6B:: @ 8184F6B - .string "Eheheheh, ooh, this is so exciting!$" + .string "Hihihihihi, oooh, ist das aufregend!$" RustboroCity_House1_Text_184F8F:: @ 8184F8F - .string "But that’s no {STR_VAR_1}.\n" - .string "Tch, that’s so disappointing...$" + .string "Aber das ist kein {STR_VAR_1}.\n" + .string "Tse, wie enttäuschend.$" RustboroCity_House1_Text_184FC1:: @ 8184FC1 - .string "Aww, it’s a good POKéMON...$" + .string "Ooh, das ist ein gutes POKéMON...$" RustboroCity_House1_Text_184FDD:: @ 8184FDD - .string "Don’t you get curious about what other\n" - .string "people named their POKéMON?$" + .string "Willst du nicht wissen, wie andere\n" + .string "Leute ihre POKéMON nennen?$" RustboroCity_House1_Text_185020:: @ 8185020 - .string "In all sorts of places, there are all\n" - .string "sorts of POKéMON and people.\p" - .string "I find that fascinating, so I go to all\n" - .string "sorts of places.$" + .string "An allen Orten gibt es alle Sorten von\n" + .string "POKéMON und Menschen.\p" + .string "Ich finde das faszinierend, daher\n" + .string "besuche ich alle möglichen Orte.$" diff --git a/data/text/maps/RustboroCity_House2.inc b/data/text/maps/RustboroCity_House2.inc index 7a1d9c706..2d9e4ab4d 100644 --- a/data/text/maps/RustboroCity_House2.inc +++ b/data/text/maps/RustboroCity_House2.inc @@ -1,9 +1,9 @@ RustboroCity_House2_Text_18532D:: @ 818532D - .string "The TRAINER’S SCHOOL is excellent.\p" - .string "If you study there, you could even\n" - .string "become a GYM LEADER.$" + .string "Die TRAINERSCHULE ist hervorragend.\p" + .string "Wenn du dort lernst, kannst du später\n" + .string "sogar ARENALEITER werden.$" RustboroCity_House2_Text_185388:: @ 8185388 - .string "ROXANNE, the GYM LEADER, really knows\n" - .string "a lot about POKéMON.\p" - .string "She’s really strong, too!$" + .string "FELIZIA, die ARENALEITERIN, weiß\n" + .string "wirklich eine Menge über POKéMON.\p" + .string "Und sie ist sehr stark!$" diff --git a/data/text/maps/RustboroCity_House3.inc b/data/text/maps/RustboroCity_House3.inc index 43a3f6ff0..1da0876d9 100644 --- a/data/text/maps/RustboroCity_House3.inc +++ b/data/text/maps/RustboroCity_House3.inc @@ -1,14 +1,16 @@ RustboroCity_House3_Text_185584:: @ 8185584 - .string "For my own POKéMON, I give them\n" - .string "perfectly suited nicknames!\p" - .string "It’s my expression of, uh...\n" - .string "originality, yes, that’s it!$" + .string "Meinen eigenen POKéMON habe ich\n" + .string "perfekt passende Kosenamen gegeben!\p" + .string "Das ist mein Ausdruck von... äh...\n" + .string "Originalität. Genau! Originalität!$" RustboroCity_House3_Text_1855FA:: @ 81855FA - .string "But giving the name PEKACHU to a\n" - .string "PIKACHU? It seems pointless.\p" - .string "I suppose it is good to use a name\n" - .string "that’s easy to understand, but...$" + .string "Aber ein PIKACHU einfach PEKACHU zu\n" + .string "nennen? Das haut einen nicht gerade\l" + .string "vom Hocker.\p" + .string "Ich glaube ja auch, man sollte einen\n" + .string "leicht verständlichen Kosenamen wählen,\l" + .string "aber irgendwie...$" RustboroCity_House3_Text_18567D:: @ 818567D .string "PEKACHU: Peka!$" diff --git a/data/text/maps/RustboroCity_Mart.inc b/data/text/maps/RustboroCity_Mart.inc index f11395b68..5288402dc 100644 --- a/data/text/maps/RustboroCity_Mart.inc +++ b/data/text/maps/RustboroCity_Mart.inc @@ -1,17 +1,18 @@ RustboroCity_Mart_Text_184C76:: @ 8184C76 - .string "I’m buying some PARLYZ HEALS and\n" - .string "ANTIDOTES.\p" - .string "Just in case I run into SHROOMISH\n" - .string "in PETALBURG WOODS.$" + .string "Ich habe einige PARA-HEILER und\n" + .string "etwas GEGENGIFT gekauft.\p" + .string "Nur für den Fall, dass mir ein\n" + .string "KNILZ im BLÜTENBURGWALD\l" + .string "über den Weg läuft.$" RustboroCity_Mart_Text_184CD8:: @ 8184CD8 - .string "My POKéMON evolved.\n" - .string "It has a lot of HP now.\p" - .string "I should buy SUPER POTIONS for it\n" - .string "instead of ordinary POTIONS.$" + .string "Mein POKéMON hat sich entwickelt.\n" + .string "Es hat jetzt sehr viele KP.\p" + .string "Ich sollte nun einige SUPERTRÄNKE\n" + .string "anstelle der normalen TRÄNKE kaufen.$" RustboroCity_Mart_Text_184D43:: @ 8184D43 - .string "I’m getting an ESCAPE ROPE just in\n" - .string "case I get lost in a cave.\p" - .string "I just need to use it to get back to the\n" - .string "entrance.$" + .string "Ich habe ein FLUCHTSEIL besorgt, falls\n" + .string "ich mich mal in einer Höhle verlaufe.\p" + .string "Damit kann ich zurück zum Eingang der\n" + .string "Höhle gelangen.$" diff --git a/data/text/maps/RustboroCity_PokemonCenter_1F.inc b/data/text/maps/RustboroCity_PokemonCenter_1F.inc index 0265f0363..8c73d883e 100644 --- a/data/text/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/text/maps/RustboroCity_PokemonCenter_1F.inc @@ -1,16 +1,18 @@ RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 - .string "My POKéMON has a NAIVE nature, and my\n" - .string "friend’s has a JOLLY nature.\p" - .string "It’s fascinating how POKéMON have\n" - .string "personalities!$" + .string "Mein POKéMON hat ein NAIVES\n" + .string "Wesen und das meines Freundes ein\l" + .string "FRÖHLICHES.\p" + .string "Es ist faszinierend, dass POKéMON\n" + .string "unterschiedliche Persönlichkeiten\l" + .string "haben.$" RustboroCity_PokemonCenter_1F_Text_184BAB:: @ 8184BAB - .string "Just like people, there are male and\n" - .string "female POKéMON.\p" - .string "But no one seems to have any idea how\n" - .string "they’re different.$" + .string "Es gibt männliche und weibliche POKéMON.\p" + .string "Aber niemand kann sagen, worin der\n" + .string "eigentliche Unterschied liegt.$" RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 - .string "The man next door gave me an HM!\p" - .string "I used it to teach my POKéMON how to\n" - .string "CUT down skinny trees.$" + .string "Der Mann nebenan hat mir eine VM\n" + .string "gegeben!\p" + .string "Ich habe meinem POKéMON beigebracht,\n" + .string "damit kleinere Bäume zu ZERSCHNEIDEN.$" diff --git a/data/text/maps/RustboroCity_PokemonSchool.inc b/data/text/maps/RustboroCity_PokemonSchool.inc index e12349bd2..9e477deaa 100644 --- a/data/text/maps/RustboroCity_PokemonSchool.inc +++ b/data/text/maps/RustboroCity_PokemonSchool.inc @@ -1,101 +1,101 @@ RustboroCity_PokemonSchool_Text_184321:: @ 8184321 - .string "The blackboard lists status changes\n" - .string "that may affect POKéMON in battle.$" + .string "Auf der Tafel sind die Statusverände-\n" + .string "rungen von POKéMON aufgelistet.$" RustboroCity_PokemonSchool_Text_184368:: @ 8184368 - .string "Which topic do you want to read?$" + .string "Welches Thema möchtest du lesen?$" RustboroCity_PokemonSchool_Text_184389:: @ 8184389 - .string "If a POKéMON is poisoned, it will\n" - .string "steadily lose HP.\p" - .string "The effects of poison remain after\n" - .string "a battle.\p" - .string "A poisoned POKéMON’s HP will drop\n" - .string "while it is traveling.\p" - .string "Heal a poisoning using an ANTIDOTE.$" + .string "Wenn ein POKéMON vergiftet wurde, wird\n" + .string "es ständig KP verlieren.\p" + .string "Die Auswirkungen des Giftes halten\n" + .string "auch nach dem Kampf an.\p" + .string "Die KP eines vergifteten POKéMON\n" + .string "werden auch unterwegs weiter sinken.\p" + .string "Mit einem GEGENGIFT kann das POKéMON\n" + .string "geheilt werden.$" RustboroCity_PokemonSchool_Text_184447:: @ 8184447 - .string "If a POKéMON becomes paralyzed,\n" - .string "its SPEED drops.\p" - .string "It may also not be able to move while\n" - .string "it is in battle.\p" - .string "Paralysis remains after battle.\n" - .string "Cure it using a PARLYZ HEAL.$" + .string "Wurde ein POKéMON paralysiert, sinkt\n" + .string "seine INITIATIVE.\p" + .string "Es kann passieren, dass es während des\n" + .string "Kampfes bewegungsunfähig wird.\p" + .string "Die Paralyse hält auch nach dem Kampf\n" + .string "an. Heile das POKéMON mit PARA-HEILER.$" RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC - .string "If a POKéMON falls asleep, it will be\n" - .string "unable to attack.\p" - .string "A POKéMON may wake up on its own,\n" - .string "but if a battle ends while it is sleeping,\l" - .string "it will stay asleep.\p" - .string "Wake it up using an AWAKENING.$" + .string "Wenn ein POKéMON einschläft, kann es\n" + .string "nicht mehr angreifen.\p" + .string "Das POKéMON wird vielleicht von selber\n" + .string "wieder wach, aber wenn der Kampf endet\l" + .string "und es noch schläft, schläft es weiter.\p" + .string "Wecke es mit AUFWECKER auf.$" RustboroCity_PokemonSchool_Text_1845A5:: @ 81845A5 - .string "A burn reduces ATTACK power, and it\n" - .string "steadily reduces the victim’s HP.\p" - .string "A burn lingers after battle.\n" - .string "Cure a burn using a BURN HEAL.$" + .string "Eine Verbrennung senkt die Kraft des\n" + .string "ANGRIFFS. Die KP nehmen ständig ab.\p" + .string "Eine Verbrennung hält auch nach dem\n" + .string "Kampf an. Setze FEUERHEILER ein!$" RustboroCity_PokemonSchool_Text_184627:: @ 8184627 - .string "If a POKéMON is frozen, it becomes\n" - .string "completely helpless.\p" - .string "It will remain frozen after battle.\n" - .string "Thaw it out using an ICE HEAL.$" + .string "Wurde ein POKéMON eingefroren, so ist\n" + .string "es völlig hilflos.\p" + .string "Auch nach dem Kampf hält der Zustand\n" + .string "an. Setze dann EISHEILER ein.$" RustboroCity_PokemonSchool_Text_1846A2:: @ 81846A2 - .string "Students who don’t study get a little\n" - .string "taste of my QUICK CLAW.\p" - .string "Whether or not you are a good student \n" - .string "will be evident from the way you use\l" - .string "this item.$" + .string "Schüler, die nicht aufpassen, bekommen\n" + .string "meine FLINKKLAUE zu spüren.\p" + .string "Wie du dieses Item einsetzt, zeigt,\n" + .string "ob du ein guter Schüler bist oder nicht.$" RustboroCity_PokemonSchool_Text_184737:: @ 8184737 - .string "A POKéMON holding the QUICK CLAW will\n" - .string "occasionally speed up and get to move\l" - .string "before its opponent.\p" - .string "There are many other items that are\n" - .string "meant to be held by POKéMON.\p" - .string "Just those alone will give you many\n" - .string "topics to study!$" + .string "Ein POKéMON, das die FLINKKLAUE trägt,\n" + .string "steigert seine Schnelligkeit und greift\l" + .string "eventuell schneller an als sein Gegner.\p" + .string "Es gibt noch viele andere Items, die von\n" + .string "einem POKéMON getragen werden können.\p" + .string "Du kannst also noch viel lernen.$" RustboroCity_PokemonSchool_Text_18480E:: @ 818480E - .string "I’m trading POKéMON with my friend\n" - .string "right now.$" + .string "Ich tausche gerade mit meinem Freund\n" + .string "POKéMON.$" RustboroCity_PokemonSchool_Text_18483C:: @ 818483C - .string "I always wanted a SEEDOT, and\n" - .string "I’m finally getting one!$" + .string "Ich wollte schon immer ein SAMURZEL\n" + .string "haben - und endlich habe ich eines!$" RustboroCity_PokemonSchool_Text_184873:: @ 8184873 - .string "POKéMON can hold items, but they\n" - .string "don’t know what to do with man-made\l" - .string "items like POTION and ANTIDOTE.$" + .string "POKéMON können Items tragen, aber sie\n" + .string "wissen nicht, was sie mit Items von\l" + .string "Menschen wie TRANK oder GEGENGIFT\l" + .string "machen sollen.$" RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 - .string "You know how some POKéMON moves can\n" - .string "confuse a POKéMON?\p" - .string "A confused POKéMON will sometimes\n" - .string "attack itself without meaning to.\p" - .string "But once it leaves battle, it will\n" - .string "return to normal.$" + .string "Weißt du, wie man mit einigen POKéMON-\n" + .string "Attacken ein POKéMON verwirren kann?\p" + .string "Ein verwirrtes POKéMON wird manchmal\n" + .string "sich selber verletzen, ohne es zu wollen.\p" + .string "Aber sobald es aus dem Kampf genommen\n" + .string "wird, ist es wieder normal.$" RustboroCity_PokemonSchool_Text_184988:: @ 8184988 - .string "A POKéMON holding a BERRY will heal\n" - .string "itself...\p" - .string "There are many kinds of items that\n" - .string "POKéMON can hold...\p" - .string "Boy, it sure is hard taking notes\n" - .string "down...$" + .string "Ein POKéMON, das eine BEERE trägt, wird\n" + .string "sich selber heilen...\p" + .string "Es gibt viele Items, die ein POKéMON\n" + .string "tragen kann...\p" + .string "Junge, Junge, ist das alles schwer\n" + .string "zu merken...$" RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 - .string "It’s this student’s notebook...\p" - .string "POKéMON are to be caught using\n" - .string "POKé BALLS.\p" - .string "Up to six POKéMON can accompany\n" - .string "a TRAINER.\p" - .string "A TRAINER is someone who catches\n" - .string "POKéMON, raises them, and battles\l" - .string "with them.\p" - .string "A TRAINER’s mission is to defeat the\n" - .string "strong TRAINERS who await challengers\l" - .string "in POKéMON GYMS.$" + .string "Das ist das Heft eines Schülers...\p" + .string "POKéMON werden mit POKéBÄLLEN\n" + .string "gefangen.\p" + .string "Bis zu sechs POKéMON können den\n" + .string "TRAINER begleiten.\p" + .string "Ein TRAINER ist jemand, der POKéMON\n" + .string "fängt, sie aufzieht, und mit ihnen\l" + .string "kämpft.\p" + .string "Die Aufgabe eines TRAINERS ist es, die\n" + .string "starken TRAINER, die ihn in den ARENEN\l" + .string "erwarten, zu besiegen.$" diff --git a/data/text/maps/RusturfTunnel.inc b/data/text/maps/RusturfTunnel.inc index 3403808fd..1335318b3 100644 --- a/data/text/maps/RusturfTunnel.inc +++ b/data/text/maps/RusturfTunnel.inc @@ -1,105 +1,112 @@ RusturfTunnel_Text_194159:: @ 8194159 - .string "What, are you coming?\n" - .string "Come and get some, then!$" + .string "Was? Du willst gegen uns antreten?\n" + .string "Na, dann hol dir eine Tracht Prügel.$" RusturfTunnel_Text_194188:: @ 8194188 - .string "PEEKO: Pii pihyoh!$" + .string "PECKO: Pii pihyoh!$" RusturfTunnel_Text_19419B:: @ 819419B - .string "Grah, keelhaul it all!\p" - .string "That hostage POKéMON turned out to\n" - .string "be worthless!\p" - .string "And to think I made a getaway...\n" - .string "In this tunnel to nowhere!\p" - .string "Hey! You!\n" - .string "So you want to battle me?$" + .string "Grrr, man sollte sie alle kielholen.\p" + .string "Das als Geisel genommene POKéMON hat\n" + .string "sich als völlig wertlos erwiesen!\p" + .string "Und dafür habe ich nun einen Flucht-\n" + .string "weg in diesem Tunnel nach Nirgendwo\l" + .string "gegraben!\p" + .string "Hey! Du!\n" + .string "Forderst du mich etwa heraus?$" RusturfTunnel_Text_194243:: @ 8194243 - .string "Urrrggh! My career in crime comes to\n" - .string "a dead end!$" + .string "Aargh! Und so läuft eine viel ver-\n" + .string "sprechende kriminelle Karriere in eine\l" + .string "Sackgasse!$" RusturfTunnel_Text_194274:: @ 8194274 - .string "This is plain not right...\p" - .string "The BOSS told me this would be a\n" - .string "slick-and-easy job to pull.\p" - .string "All I had to do was steal some package\n" - .string "from DEVON.\p" - .string "Tch!\n" - .string "You want it back that badly, take it!$" + .string "Das ist einfach nicht fair...\p" + .string "Der BOSS hat doch gesagt, der Job sei\n" + .string "ein wahres Kinderspiel.\p" + .string "Alles was ich zu tun hatte, war ein\n" + .string "Paket von DEVON zu stehlen.\p" + .string "Tse! Wenn du es so dringend wieder-\n" + .string "haben willst, dann nimm es halt!$" RusturfTunnel_Text_19432A:: @ 819432A - .string "PEEKO! Am I glad to see you’re safe!$" + .string "PECKO! Bin ich froh, dass du unversehrt\n" + .string "wieder bei mir bist.$" RusturfTunnel_Text_19434F:: @ 819434F - .string "PEEKO owes her life to you!\p" - .string "They call me MR. BRINEY.\n" - .string "And, you are?\p" + .string "PECKO verdankt dir ihr Leben!\p" + .string "Man nennt mich MR. BRACK.\n" + .string "Und du bist...\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Ah, so you are {PLAYER}{KUN}!\n" - .string "I sincerely thank you!\p" - .string "Now, if there’s anything that troubles\n" - .string "you, don’t hesitate to tell me!\p" - .string "You can usually find me in my cottage\n" - .string "by the sea near PETALBURG WOODS.\p" - .string "Come, PEEKO, we should make our way\n" - .string "home.\p" - .string "PEEKO: Pihyoh!$" + .string "Ah, du bist also {PLAYER}{KUN}!\n" + .string "Ich danke dir von ganzem Herzen!\p" + .string "Wenn du irgendein Problem hast, zögere\n" + .string "nicht, mich um Hilfe zu bitten!\p" + .string "Ich wohne in dem kleinen Haus am Meer\n" + .string "in der Nähe des BLÜTENBURGWALDS.\p" + .string "Komm, PECKO, wir sollten uns auf den\n" + .string "Heimweg machen.\p" + .string "PECKO: Pihyoh!$" RusturfTunnel_Text_1944C5:: @ 81944C5 .string "... ...\p" - .string "Why can’t they keep digging?\n" - .string "Is the bedrock too hard?\p" - .string "My beloved awaits me in VERDANTURF\n" - .string "TOWN just beyond here...\p" - .string "If RUSTBORO and VERDANTURF were\n" - .string "joined by this tunnel, I could visit\l" - .string "her every day...\p" - .string "But this...\n" - .string "What am I to do?$" + .string "Warum graben sie nicht weiter?\n" + .string "Ist das Gestein zu hart?\p" + .string "Meine Geliebte wartet in WIESENFLUR\n" + .string "auf mich, gleich hinter diesen\l" + .string "Felsen...\p" + .string "Wenn METAROST CITY und WIESENFLUR\n" + .string "durch diesen Tunnel verbunden wären,\l" + .string "könnte ich sie jeden Tag besuchen!\p" + .string "Aber so...\n" + .string "Was soll ich nur machen?$" RusturfTunnel_Text_1945B2:: @ 81945B2 - .string "To get from RUSTBORO to VERDANTURF,\n" - .string "you need to go to DEWFORD, then pass\l" - .string "through SLATEPORT and MAUVILLE...$" + .string "Um von METAROST CITY nach WIESENFLUR\n" + .string "zu gelangen, muss man nach FAUSTAU-\l" + .string "HAVEN und dann über GRAPHITPORT CITY\l" + .string "und MALVENFROH CITY reisen...$" RusturfTunnel_Text_19461D:: @ 819461D - .string "Wow! You shattered that boulder\n" - .string "blocking the way.\p" - .string "To show you how much I appreciate it,\n" - .string "I’d like you to have this HM.$" + .string "Wow! Du hast den Felsen, der den Weg\n" + .string "blockierte, einfach zertrümmert.\p" + .string "Darüber bin ich überglücklich und daher\n" + .string "möchte ich dir diese VM geben.$" RusturfTunnel_Text_194693:: @ 8194693 - .string "That HM contains STRENGTH.\p" - .string "If a muscular POKéMON were to learn\n" - .string "that, it would be able to move even\l" - .string "large boulders.$" + .string "Diese VM enthält STÄRKE.\p" + .string "Wenn ein kräftiges POKéMON diese VM\n" + .string "lernt, ist es in der Lage, sogar die\l" + .string "schwersten Felsen zu bewegen.$" RusturfTunnel_Text_194706:: @ 8194706 - .string "WANDA!\n" - .string "Now I can see you anytime!\p" - .string "WANDA: That’s...wonderful.\p" - .string "Please, take some rest at my home.$" + .string "HEIKE!\n" + .string "Nun kann ich dich jederzeit besuchen!\p" + .string "HEIKE: Das ist... wunderbar.\p" + .string "Bitte, ruh dich ein bisschen in meinem\n" + .string "Haus aus.$" RusturfTunnel_Text_194766:: @ 8194766 - .string "On the other side of this rock...\n" - .string "My boyfriend is there.\p" - .string "He... He’s not just digging the tunnel\n" - .string "to come see me.\p" - .string "He works his hands raw and rough\n" - .string "for the benefit of everyone.$" + .string "Auf der anderen Seite dieses Felsens\n" + .string "wartet mein Freund.\p" + .string "Er... Er gräbt den Tunnel nicht nur, um\n" + .string "mich zu sehen.\p" + .string "Er reißt sich die Hände auf zum Wohle\n" + .string "aller.$" RusturfTunnel_Text_194814:: @ 8194814 - .string "What do you call a wild man up in the\n" - .string "mountains? A mountain man, right?\p" - .string "So why don’t they call a POKéMON in the\n" - .string "mountains a mountain POKéMON?$" + .string "Wie nennt man einen ungestümen Mann\n" + .string "hoch im Gebirge? Einen Bergfreund.\p" + .string "So, warum nennt man dann nicht auch ein\n" + .string "POKéMON in den Bergen ein Berg-\l" + .string "POKéMON?$" RusturfTunnel_Text_1948A2:: @ 81948A2 - .string "My POKéMON...\n" - .string "Ran out of power...$" + .string "Meine POKéMON...\n" + .string "Haben alle Energie verloren...$" RusturfTunnel_Text_1948C4:: @ 81948C4 - .string "They halted development here to\n" - .string "protect POKéMON, right?\l" - .string "There’s a feel-good story!$" + .string "Sie haben das Projekt hier einge-\n" + .string "stellt, um die POKéMON zu schützen,\l" + .string "nicht wahr? Eine rührende Story.$" diff --git a/data/text/maps/SSTidalCorridor.inc b/data/text/maps/SSTidalCorridor.inc index 530ff6c55..bb6922229 100644 --- a/data/text/maps/SSTidalCorridor.inc +++ b/data/text/maps/SSTidalCorridor.inc @@ -1,67 +1,71 @@ SSTidalCorridor_Text_199007:: @ 8199007 SSTidalRooms_Text_199007:: @ 8199007 - .string "This ferry is built to plow through\n" - .string "fast-running currents.\p" - .string "We hope you enjoy your voyage with us.\n" - .string "Feel free to explore the ship.$" + .string "Diese Fähre ist so konstruiert, dass sie\n" + .string "auch durch starke Strömungen\l" + .string "fahren kann.\p" + .string "Wir hoffen, du genießt die Reise mit\n" + .string "uns. Schau dich ruhig auf dem Schiff um.$" SSTidalCorridor_Text_199088:: @ 8199088 - .string "We hope you enjoy your voyage on\n" - .string "our ferry.$" + .string "Wir hoffen, du genießt die Reise mit\n" + .string "uns. Schau dich ruhig auf dem Schiff um.$" SSTidalCorridor_Text_1990B4:: @ 81990B4 SSTidalRooms_Text_1990B4:: @ 81990B4 - .string "We have made land in SLATEPORT CITY.\n" - .string "Thank you for sailing with us.$" + .string "Wir gehen in GRAPHITPORT CITY vor\n" + .string "Anker. Danke, dass du mit uns gefahren\l" + .string "bist.$" SSTidalRooms_Text_1990F8:: @ 81990F8 - .string "We have made land in LILYCOVE CITY.\n" - .string "Thank you for sailing with us.$" + .string "Wir gehen in SEEGRASULB CITY vor Anker.\n" + .string "Danke, dass du mit uns gefahren bist.$" SSTidalCorridor_Text_19913B:: @ 819913B - .string "It’ll be some time before we make land,\n" - .string "I reckon.\p" - .string "You can rest up in your cabin if you’d\n" - .string "like. Your cabin’s No. 2.\p" - .string "The bed in there is soft and plushy.\n" - .string "I can attest to how comfy it is!$" + .string "Ich schätze, es wird einige Zeit dauern,\n" + .string "bis wir an Land gehen.\p" + .string "Du kannst dich in deiner Kabine aus-\n" + .string "ruhen. Du hast Kabine 2.\p" + .string "Das Bett ist weich und gemütlich. Das\n" + .string "habe ich bereits überprüft!$" SSTidalCorridor_Text_1991F4:: @ 81991F4 - .string "We’ve arrived!$" + .string "Wir sind angekommen!$" SSTidalCorridor_Text_199203:: @ 8199203 - .string "Go visit other cabins.\n" - .string "TRAINERS bored of the boat trip will\l" - .string "be itching to battle.$" + .string "Schau dir ruhig die anderen Kabinen an.\n" + .string "TRAINER langweilen sich auf der Über-\l" + .string "fahrt und werden sicher gerne kämpfen.$" SSTidalCorridor_Text_199255:: @ 8199255 - .string "Enjoy your cruise!$" + .string "Genieße die Überfahrt.$" SSTidalCorridor_Text_199268:: @ 8199268 - .string "The horizon spreads beyond the\n" - .string "porthole.$" + .string "Durch das Bullauge sieht man\n" + .string "den Horizont.$" SSTidalCorridor_Text_199291:: @ 8199291 - .string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p" - .string "They made me honorary captain of the\n" - .string "S.S. TIDAL!\p" - .string "You can call me CAPTAIN BRINEY now!\p" - .string "You know, I retired once before, but\n" - .string "when I saw this majestic ship...\p" - .string "Let me just say, it stirred my sleeping\n" - .string "soul as a sailor!$" + .string "MR. BRACK: Willkommen an Bord, {PLAYER}{KUN}!\p" + .string "Ich bin jetzt der Kapitän der\n" + .string "MS TIDE!\p" + .string "Du kannst mich ab sofort\n" + .string "KAPITÄN BRACK nennen.\p" + .string "Ich war zwar schon in Rente gegangen,\n" + .string "aber als ich dieses majestätische\l" + .string "Schiff gesehen habe...\p" + .string "Lass es mich so sagen: Es weckte die\n" + .string "schlafende Seele des Seemannes in mir.$" SSTidalCorridor_Text_199388:: @ 8199388 - .string "PEEKO: Pihyo pihyohyo...$" + .string "PECKO: Pihyo pihyohyo...$" SSTidalCorridor_Text_1993A1:: @ 81993A1 - .string "Cabin 1$" + .string "Kabine 1$" SSTidalCorridor_Text_1993A9:: @ 81993A9 - .string "Cabin 2$" + .string "Kabine 2$" SSTidalCorridor_Text_1993B1:: @ 81993B1 - .string "Cabin 3$" + .string "Kabine 3$" SSTidalCorridor_Text_1993B9:: @ 81993B9 - .string "Cabin 4$" + .string "Kabine 4$" diff --git a/data/text/maps/SSTidalLowerDeck.inc b/data/text/maps/SSTidalLowerDeck.inc index 2c54d743c..2341734dd 100644 --- a/data/text/maps/SSTidalLowerDeck.inc +++ b/data/text/maps/SSTidalLowerDeck.inc @@ -1,25 +1,25 @@ SSTidalLowerDeck_Text_1993C1:: @ 81993C1 - .string "Arrrgh! I’m fed up and dog-tired of\n" - .string "cleaning this huge place!\p" - .string "Let’s have a quick battle!$" + .string "Arrgh! Ich habe die Schnauze voll und\n" + .string "bin hundemüde vom Putzen.\p" + .string "Ein Kampf ist jetzt genau das Richtige!$" SSTidalLowerDeck_Text_19941A:: @ 819941A - .string "Little bro, I lost!$" + .string "Brüderchen, ich habe verloren!$" SSTidalLowerDeck_Text_19942E:: @ 819942E - .string "We’re the CLEANUP BROTHERS!\p" - .string "The old one dumps the detergent,\n" - .string "and the young one does the scrubbing!$" + .string "Wir sind die GEBRÜDER SAUBERMANN!\p" + .string "Der Ältere verteilt die Schmierseife und\n" + .string "der Jüngere schrubbt das Deck!$" SSTidalLowerDeck_Text_199491:: @ 8199491 - .string "This is the bottom of the ship’s hull.\n" - .string "There’s plenty of room.\l" - .string "It’ll be alright for a POKéMON battle.$" + .string "Dies ist der untere Bereich des Schiffs.\n" + .string "Hier gibt es sehr viel Platz.\l" + .string "Genau richtig für einen POKéMON-Kampf.$" SSTidalLowerDeck_Text_1994F7:: @ 81994F7 - .string "Big bro, I lost!$" + .string "Oh, großer Bruder. Ich habe verloren.$" SSTidalLowerDeck_Text_199508:: @ 8199508 - .string "We’re the CLEANUP BROTHERS!\p" - .string "The old one dumps the detergent,\n" - .string "and the young one does the scrubbing!$" + .string "Wir sind die GEBRÜDER SAUBERMANN!\p" + .string "Der Ältere verteilt die Schmierseife und\n" + .string "der Jüngere schrubbt das Deck!$" diff --git a/data/text/maps/SSTidalRooms.inc b/data/text/maps/SSTidalRooms.inc index a0f9000d3..72f9a0b48 100644 --- a/data/text/maps/SSTidalRooms.inc +++ b/data/text/maps/SSTidalRooms.inc @@ -1,111 +1,114 @@ SSTidalRooms_Text_19956B:: @ 819956B - .string "It’s a bed.\n" - .string "Let’s take a rest.$" + .string "Ein warmes, weiches Bett...\n" + .string "Machen wir doch ein kleines Schläfchen.$" SSTidalRooms_Text_19958A:: @ 819958A - .string "Go back and forth between LILYCOVE\n" - .string "and SLATEPORT, that’s what I do.\p" - .string "It’s my hobby - going from port to port\n" - .string "to take in POKéMON CONTESTS.$" + .string "Ich pendle ständig zwischen\n" + .string "SEEGRASULB CITY und GRAPHITPORT CITY.\p" + .string "Das ist mein Hobby - ich gehe von Stadt\n" + .string "zu Stadt und nehme an POKéMON\l" + .string "WETTBEWERBEN teil.$" SSTidalRooms_Text_199613:: @ 8199613 - .string "That was an enjoyable match!$" + .string "Das war ein wunderbarer Kampf!$" SSTidalRooms_Text_199630:: @ 8199630 - .string "I get so excited imagining what kinds\n" - .string "of POKéMON I’ll get to see in the next\l" - .string "CONTEST. The anticipation of it thrills!$" + .string "Ich bin schon ganz aufgeregt, wenn ich\n" + .string "mir vorstelle, welche POKéMON ich im\l" + .string "nächsten WETTBEWERB sehen werde!$" SSTidalRooms_Text_1996A6:: @ 81996A6 - .string "Are your friends strong?$" + .string "Sind deine Freunde stark?$" SSTidalRooms_Text_1996BF:: @ 81996BF - .string "Your friends are, indeed, strong.$" + .string "Deine Freunde sind in der Tat stark.$" SSTidalRooms_Text_1996E1:: @ 81996E1 - .string "Friends need not be human.\n" - .string "For me, POKéMON are treasured friends!$" + .string "Freunde müssen nicht unbedingt\n" + .string "menschlich sein. Für mich sind\l" + .string "POKéMON die besten Freunde.$" SSTidalRooms_Text_199723:: @ 8199723 - .string "Child...\n" - .string "Did you knock on the door?$" + .string "Kind...\n" + .string "Hast du an der Tür geklopft?$" SSTidalRooms_Text_199747:: @ 8199747 - .string "A loss is to be accepted without haste\n" - .string "or panic.$" + .string "Eine Niederlage muss mit aufrechtem\n" + .string "Kopf akzeptiert werden.$" SSTidalRooms_Text_199778:: @ 8199778 - .string "To be never ruffled in any situation is\n" - .string "the GENTLEMAN’s code of conduct.$" + .string "In jeder Situation die absolute Ruhe zu\n" + .string "bewahren, ist die Devise des GENTLEMAN.$" SSTidalRooms_Text_1997C1:: @ 81997C1 - .string "JED: I feel a little shy about this, but...\n" - .string "We’ll show you our lovey-dovey power!$" + .string "UWE: Eigentlich bin ich ja schüchtern...\n" + .string "Aber die Liebe gibt einem Kraft!$" SSTidalRooms_Text_199813:: @ 8199813 - .string "JED: Sigh...$" + .string "UWE: Seufz...$" SSTidalRooms_Text_199820:: @ 8199820 - .string "JED: It’s the first time that our lovey-\n" - .string "dovey power couldn’t prevail!\l" - .string "You must be an awesome TRAINER!$" + .string "UWE: Zum ersten Mal war unsere Kraft\n" + .string "der Liebe unterlegen!\l" + .string "Du bist ein unglaublicher TRAINER!$" SSTidalRooms_Text_199887:: @ 8199887 - .string "JED: You only have one POKéMON?\n" - .string "Isn’t that just too lonesome?$" + .string "UWE: Du hast nur ein POKéMON?\n" + .string "Fühlt es sich nicht sehr einsam?$" SSTidalRooms_Text_1998C5:: @ 81998C5 - .string "LEA: I feel a little silly, but...\n" - .string "We’ll show you our lovey-dovey power!$" + .string "LENA: Ich fühle mich etwas albern,\n" + .string "aber... Aber die Liebe gibt mir Kraft!$" SSTidalRooms_Text_19990E:: @ 819990E - .string "LEA: Oh, boo!$" + .string "LENA: Oh, buuuuh!$" SSTidalRooms_Text_19991C:: @ 819991C - .string "LEA: I can’t believe it!\n" - .string "Our lovey-dovey power failed...\l" - .string "You must be an awesome TRAINER!$" + .string "LENA: Ich kann es einfach nicht fassen!\n" + .string "Die Kraft unserer Liebe reichte nicht...\l" + .string "Du bist ein unglaublicher TRAINER!$" SSTidalRooms_Text_199975:: @ 8199975 - .string "LEA: I wanted to battle...\n" - .string "But you don’t even have two POKéMON...$" + .string "LENA: Ich möchte kämpfen...\n" + .string "Aber du hast nur ein POKéMON...$" SSTidalRooms_Text_1999B7:: @ 81999B7 - .string "Ah, you’ve come just in time.\p" - .string "I’m bored, you see.\n" - .string "You may entertain me.$" + .string "Ah, du kommst gerade rechtzeitig.\p" + .string "Ich langweile mich schrecklich.\n" + .string "Du musst mich jetzt unterhalten.$" SSTidalRooms_Text_1999FF:: @ 81999FF - .string "...That will do.$" + .string "...Das reicht.$" SSTidalRooms_Text_199A10:: @ 8199A10 - .string "Perhaps I shall get Father to acquire\n" - .string "a yacht for me.\l" - .string "A yacht for me and POKéMON!$" + .string "Ich muss meinen Vater unbedingt\n" + .string "fragen, ob er mir eine Yacht schenkt.\l" + .string "Eine Yacht für mich und meine POKéMON!$" SSTidalRooms_Text_199A62:: @ 8199A62 - .string "Oh, you’re such an adorable TRAINER.\n" - .string "Would you like to have tea?\l" - .string "Or would you rather battle?$" + .string "Oh, du bist so ein wunderbarer TRAINER.\n" + .string "Möchtest du eine Tasse Tee?\l" + .string "Oder möchtest du lieber kämpfen?$" SSTidalRooms_Text_199ABF:: @ 8199ABF - .string "I see.\n" - .string "You’re the active sort.$" + .string "Ich verstehe.\n" + .string "Du bist eher der aktive Typ.$" SSTidalRooms_Text_199ADE:: @ 8199ADE - .string "A world cruise on a luxury liner has its\n" - .string "charms, I must say...\p" - .string "But, I will admit there is an appealing\n" - .string "side to touring HOENN by ferry.$" + .string "Eine Weltreise auf einem Luxusliner hat\n" + .string "etwas für sich, das muss ich sagen...\p" + .string "Aber auch eine Fahrt auf der Fähre\n" + .string "durch HOENN hat etwas.$" SSTidalRooms_Text_199B65:: @ 8199B65 - .string "Uh... Hi! I... I’m not acting suspicious!\n" - .string "Uh... You can have this! For free!\p" - .string "It... Honestly, I didn’t SNATCH it from\n" - .string "someone! I’d never do such a thing!\l" - .string "It’s clean! You can use it!$" + .string "Äh... Hallo! Ich... Ich verhalte mich über-\n" + .string "haupt nicht verdächtig! Äh... hier, das\l" + .string "ist für dich! Es kostet dich nichts!\p" + .string "Es... Ehrlich! Ich habe es nicht von\n" + .string "jemandem ÜBERNOMMEN! Das würde ich\l" + .string "nie tun! Es ist sauber! Nimm es ruhig!$" SSTidalRooms_Text_199C1A:: @ 8199C1A - .string "SNATCH steals the foe’s move in\n" - .string "advance, and then uses the snatched\l" - .string "move on the foe.$" + .string "ÜBERNAHME raubt die nächste Attacke\n" + .string "eines POKéMON und setzt sie dann\l" + .string "gegen diesen Gegner ein.$" diff --git a/data/text/maps/SeafloorCavern_Room1.inc b/data/text/maps/SeafloorCavern_Room1.inc index da6e207ae..0b46a9267 100644 --- a/data/text/maps/SeafloorCavern_Room1.inc +++ b/data/text/maps/SeafloorCavern_Room1.inc @@ -1,22 +1,22 @@ SeafloorCavern_Room1_Text_1974BA:: @ 81974BA - .string "We don’t need a kid around!\n" - .string "Go on home already!$" + .string "Wir können hier keine Kinder\n" + .string "gebrauchen! Geh nach Hause! Sofort!$" SeafloorCavern_Room1_Text_1974EA:: @ 81974EA - .string "I want to go home...$" + .string "Ich will nach Hause zu meiner Mami...$" SeafloorCavern_Room1_Text_1974FF:: @ 81974FF - .string "I want to get a promotion so I can\n" - .string "boss around the GRUNTS...$" + .string "Ich möchte befördert werden, dann kann\n" + .string "ich all die RÜPEL herumkommandieren!$" SeafloorCavern_Room1_Text_19753C:: @ 819753C - .string "That submarine... It’s tiny inside.\n" - .string "I’m sore all over!$" + .string "Dieses U-Boot... Es ist sehr eng.\n" + .string "Ich habe deshalb überall blaue Flecken.$" SeafloorCavern_Room1_Text_197573:: @ 8197573 - .string "Losing makes me sore!$" + .string "Verlieren verursacht mir Muskelkater!$" SeafloorCavern_Room1_Text_197589:: @ 8197589 - .string "That submarine we jacked, man, it’s\n" - .string "brutal as a ride.\l" - .string "It’s way too tight in there!$" + .string "Das U-Boot, das wir aufgetrieben haben,\n" + .string "ist fürchterlich eng. Brutal eng, sage\l" + .string "ich. Man stößt sich überall den Kopf.$" diff --git a/data/text/maps/SeafloorCavern_Room3.inc b/data/text/maps/SeafloorCavern_Room3.inc index 07187b142..896ef9e06 100644 --- a/data/text/maps/SeafloorCavern_Room3.inc +++ b/data/text/maps/SeafloorCavern_Room3.inc @@ -1,24 +1,23 @@ SeafloorCavern_Room3_Text_1975DC:: @ 81975DC - .string "Ahahahaha!\p" - .string "How did you manage to get here without\n" - .string "a submarine?\l" - .string "What an impressive child!\p" - .string "But... It won’t do to have you\n" - .string "meddling about here.\p" - .string "And, I do want payback for what\n" - .string "happened at the WEATHER INSTITUTE...\p" - .string "I’m going to give you a little taste\n" - .string "of pain! Resign yourself to it!$" + .string "Ahahahahaha!\p" + .string "Wie bist du uns ohne U-Boot gefolgt?\n" + .string "Was für ein bemerkenswertes Kind!\p" + .string "Aber... Das berechtigt dich nicht, hier\n" + .string "herumzuschnüffeln!\p" + .string "Jetzt kann ich dir die Sache vom\n" + .string "KLIMA-INSTITUT heimzahlen...\p" + .string "Ich gebe dir eine Lektion in Sachen\n" + .string "Schmerz! Pass gut auf!$" SeafloorCavern_Room3_Text_1976F3:: @ 81976F3 - .string "Ahahahaha!\p" - .string "Ouch!$" + .string "Ahahahahaha!\p" + .string "Auuuaaa!$" SeafloorCavern_Room3_Text_197704:: @ 8197704 .string "Ahahahaha!\n" - .string "You’re so darn strong.\p" - .string "It’s terribly disappointing that you’re\n" - .string "not a TEAM {EVIL_TEAM} member.\p" - .string "You could have enjoyed the fabulous\n" - .string "world our BOSS has promised to one\l" - .string "of our own...$" + .string "Du bist unglaublich stark!\p" + .string "Es ist verdammt schade, dass du kein\n" + .string "Mitglied vom TEAM {EVIL_TEAM} bist!\p" + .string "So könntest du an der wunderbaren,\n" + .string "neuen Welt, die unser BOSS seinen\l" + .string "Leuten versprochen hat, teilhaben...$" diff --git a/data/text/maps/SeafloorCavern_Room4.inc b/data/text/maps/SeafloorCavern_Room4.inc index ca0600450..3b54317da 100644 --- a/data/text/maps/SeafloorCavern_Room4.inc +++ b/data/text/maps/SeafloorCavern_Room4.inc @@ -1,10 +1,11 @@ SeafloorCavern_Room4_Text_1977B9:: @ 81977B9 - .string "Who are you?\n" - .string "Where did you come in from?$" + .string "Wer bist du?\n" + .string "Woher kommst du?$" SeafloorCavern_Room4_Text_1977E2:: @ 81977E2 - .string "Lost it...$" + .string "Verloren...$" SeafloorCavern_Room4_Text_1977ED:: @ 81977ED - .string "I can’t find the way out!\p" - .string "I’m not afraid. Don’t get me wrong!$" + .string "Ich finde den Ausgang nicht mehr!\p" + .string "Ich bin nicht verzweifelt. Denk das\n" + .string "bloß nicht!$" diff --git a/data/text/maps/SecretBase_RedCave1.inc b/data/text/maps/SecretBase_RedCave1.inc index efb2c8fdb..ffe6c4d04 100644 --- a/data/text/maps/SecretBase_RedCave1.inc +++ b/data/text/maps/SecretBase_RedCave1.inc @@ -1,2 +1,3 @@ SecretBase_RedCave1_Text_198F89:: @ 8198F89 - .string "Want to make your SECRET BASE here?$" + .string "Möchtest du hier deine GEHEIMBASIS\n" + .string "einrichten?$" diff --git a/data/text/maps/ShoalCave_LowTideLowerRoom.inc b/data/text/maps/ShoalCave_LowTideLowerRoom.inc index c9d4337de..1522dc019 100644 --- a/data/text/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/text/maps/ShoalCave_LowTideLowerRoom.inc @@ -1,9 +1,11 @@ ShoalCave_LowTideLowerRoom_Text_198200:: @ 8198200 - .string "The penetrating cold around these\n" - .string "parts is an impediment to training.\p" - .string "But with focus, one can overcome!\p" - .string "With this FOCUS BAND, buckle down and\n" - .string "withstand the cold!$" + .string "Die eisige Kälte in dieser Gegend ist\n" + .string "ein gewaltiges Hindernis beim Training.\p" + .string "Aber wenn man sich konzentriert, kann\n" + .string "man doch gewinnen!\p" + .string "Mit diesem FOKUS-BAND kannst du dich\n" + .string "besser konzentrieren und der Kälte\l" + .string "widerstehen.$" ShoalCave_LowTideLowerRoom_Text_1982A2:: @ 81982A2 - .string "Everything starts with focus!$" + .string "Alles hängt von der Konzentration ab!$" diff --git a/data/text/maps/SlateportCity.inc b/data/text/maps/SlateportCity.inc index 3ff5d51bf..b65cf82a4 100644 --- a/data/text/maps/SlateportCity.inc +++ b/data/text/maps/SlateportCity.inc @@ -1,321 +1,336 @@ SlateportCity_Text_164642:: @ 8164642 - .string "I’m the ENERGY GURU!\n" - .string "I’ll go for it and sell you what you need!$" + .string "Ich bin der STATUSWERTE GURU!\n" + .string "Ich werde dir verkaufen, was du\l" + .string "brauchst!$" SlateportCity_Text_164682:: @ 8164682 .string "Oh?\n" - .string "Your {STR_VAR_1}...$" + .string "Dein {STR_VAR_1}...$" SlateportCity_Text_164691:: @ 8164691 - .string "Went for it stupendously!\p" - .string "As its reward, please give it this\n" - .string "EFFORT RIBBON.$" + .string "Es hat sich enorm angestrengt!\p" + .string "Gib ihm als Belohnung bitte dieses\n" + .string "FLEISS-BAND.$" SlateportCity_Text_1646DD:: @ 81646DD - .string "{PLAYER} received the EFFORT RIBBON.$" + .string "{PLAYER} erhält das FLEISS-BAND.$" SlateportCity_Text_1646FC:: @ 81646FC - .string "{PLAYER} put the EFFORT RIBBON\n" - .string "on {STR_VAR_1}.$" + .string "{PLAYER} steckt {STR_VAR_1} das\n" + .string "FLEISS-BAND an.$" SlateportCity_Text_16471C:: @ 816471C - .string "You have to go for it a little harder.\p" - .string "If you do, I’ll give your POKéMON\n" - .string "something nice.$" + .string "Du musst dich mehr anstrengen.\p" + .string "Dann gebe ich dir und deinen POKéMON\n" + .string "ein schönes Geschenk.$" SlateportCity_Text_164775:: @ 8164775 - .string "Oh! Your {STR_VAR_1}, that EFFORT\n" - .string "RIBBON looks good on it!$" + .string "Oh! Dein {STR_VAR_1} sieht gut mit dem\n" + .string "FLEISS-BAND aus!$" SlateportCity_Text_1647A7:: @ 81647A7 - .string "The light of the lighthouse reaches\n" - .string "dozens of miles away.\p" - .string "I wonder if it doesn’t startle POKéMON\n" - .string "in the sea.$" + .string "Das Licht dieses Leuchtturms sieht man\n" + .string "dutzende von Kilometern weit.\p" + .string "Ich frage mich, ob es nicht die POKéMON\n" + .string "im Meer verwirrt.$" SlateportCity_Text_164814:: @ 8164814 - .string "Ooh, look at this!\p" - .string "The seaweed you can get around these\n" - .string "parts is fresh and full of life.\p" - .string "Why, it looks like it can even rear up\n" - .string "and attack!$" + .string "Ooh, schau dir das an!\p" + .string "Das Seegras hier in dieser Gegend sieht\n" + .string "frisch und fast lebendig aus.\p" + .string "Es sieht aus, als könne es sich auf-\n" + .string "richten und angreifen!$" SlateportCity_Text_1648A0:: @ 81648A0 - .string "Where the water is clean, the fruits\n" - .string "of bountiful harvest gather.\p" - .string "And where people gather, a market\n" - .string "soon starts.\p" - .string "That is how a town is born and grows.$" + .string "Wo das Wasser sauber ist, geben die\n" + .string "Früchte eine reiche Ernte.\p" + .string "Und wo es eine reiche Ernte gibt, gibt\n" + .string "es auch bald einen Markt.\p" + .string "So entsteht und wächst eine Stadt.$" SlateportCity_Text_164937:: @ 8164937 - .string "Shopping where you can breathe the\n" - .string "scent of the ocean...\p" - .string "SLATEPORT is such a wonderful place!$" + .string "Einkaufen, wo man die salzige Luft des\n" + .string "Meeres einatmen kann...\p" + .string "GRAPHITPORT CITY ist so ein toller Ort!$" SlateportCity_Text_164995:: @ 8164995 - .string "If you put DOLLS or CUSHIONS on the\n" - .string "floor, they’ll get dirty.\p" - .string "I’m going to buy some BRICKS so my\n" - .string "DOLLS and CUSHIONS won’t get dirty\l" - .string "when I leave them out.$" + .string "Wenn du PUPPEN oder KISSEN einfach auf\n" + .string "den Boden legst, werden sie schmutzig.\p" + .string "Ich kaufe mir einige BACKSTEINE, auf\n" + .string "die ich meine PUPPEN und KISSEN lege.\l" + .string "So bleiben sie schön sauber.$" SlateportCity_Text_164A30:: @ 8164A30 - .string "Yeah! I’ve waited so long for this!\n" - .string "POKéMON CONTESTS!\l" - .string "I’m going to enter!\p" - .string "But before I do, I have to catch some\n" - .string "POKéMON!$" + .string "Yeah! Darauf habe ich lange gewartet!\n" + .string "WETTBEWERBE für POKéMON!\l" + .string "Ich werde mit Sicherheit teilnehmen!\p" + .string "Aber vorher muss ich mir einige\n" + .string "POKéMON fangen!$" SlateportCity_Text_164AA9:: @ 8164AA9 - .string "Whew... I’m just bushed...\p" - .string "I hiked over from MAUVILLE CITY.\n" - .string "But, boy, this city’s huge.\p" - .string "If I’d known this, I would’ve ridden\n" - .string "my BIKE here.$" + .string "Puuuh... Ich bin fix und fertig...\p" + .string "Ich komme aus MALVENFROH CITY. Diese\n" + .string "Stadt ist vielleicht groß! Riesengroß!\p" + .string "Hätte ich das gewusst, wäre ich mit dem\n" + .string "RAD gekommen.$" SlateportCity_Text_164B34:: @ 8164B34 - .string "STERN, the fellow who built the\n" - .string "MUSEUM, also happens to be the leader\l" - .string "of an undersea exploration team.\p" - .string "So, everyone calls him CAPT. STERN.$" + .string "Der Typ, der das MUSEUM gebaut\n" + .string "hat, ist auch der Leiter eines Teams zur\l" + .string "Erforschung der Tiefsee.\p" + .string "Daher nennt ihn jeder KAPT. BRIGG.$" SlateportCity_Text_164BBF:: @ 8164BBF - .string "What is that over there?\n" - .string "That long line...$" + .string "Was ist das dort drüben?\n" + .string "Diese Menschenansammlung...$" SlateportCity_Text_164BEA:: @ 8164BEA - .string "When I was a child, I visited the\n" - .string "MUSEUM often.\p" - .string "I used to dream about the mysteries of\n" - .string "the sea after seeing the exhibits.$" + .string "Als ich noch ein Kind war, war ich oft in\n" + .string "dem MUSEUM.\p" + .string "Ich habe danach immer von den\n" + .string "Mysterien des Meeres geträumt.$" SlateportCity_Text_164C64:: @ 8164C64 - .string "Hey, there! Quit pushing!\n" - .string "This is the line, can’t you see?$" + .string "Hey, du da! Hör auf zu drängeln!\n" + .string "Wir stehen hier ordentlich an!$" SlateportCity_Text_164C9F:: @ 8164C9F - .string "TEAM {EVIL_TEAM} has a policy of\n" - .string "assembling and dispersing at the\l" - .string "operation site.$" + .string "TEAM {EVIL_TEAM} verfolgt die Strategie des\n" + .string "Versammelns und Verteilens.$" SlateportCity_Text_164CE8:: @ 8164CE8 - .string "Our BOSS is brilliant.\p" - .string "What would he want to do with a\n" - .string "MUSEUM now?$" + .string "Unser BOSS ist brillant.\p" + .string "Wozu er jetzt wohl Interesse am\n" + .string "MUSEUM zeigt?$" SlateportCity_Text_164D2B:: @ 8164D2B - .string "What’s the new scheme, I wonder?\p" - .string "Our BOSS is scary when he’s mad, so\n" - .string "I’d better not screw things up...$" + .string "Was hat diese neue Masche zu bedeuten?\p" + .string "Unser BOSS ist richtig Furcht ein-\n" + .string "flößend, wenn er so abgedreht ist. Ich\l" + .string "halte lieber Abstand und frage nicht...$" SlateportCity_Text_164D92:: @ 8164D92 - .string "If there’s something we need in the\n" - .string "MUSEUM, we should take it all!$" + .string "Wenn es im MUSEUM etwas Brauchbares\n" + .string "gibt, dann müssen wir das an uns nehmen!$" SlateportCity_Text_164DD5:: @ 8164DD5 - .string "Hey, you there!\n" - .string "Don’t butt in!$" + .string "Hey, du! Du willst dich doch wohl\n" + .string "nicht vordrängeln!?!$" SlateportCity_Text_164DF4:: @ 8164DF4 - .string "A long line, huh?\p" - .string "It reminds me of the times I lined up to\n" - .string "buy smash-hit games...$" + .string "Eine lange Schlange, was?\p" + .string "Erinnert mich an die Zeiten, als ich\n" + .string "Ewigkeiten anstand, um mir die neuesten\l" + .string "brandheißen Spiele zu kaufen...$" SlateportCity_Text_164E46:: @ 8164E46 - .string "Why are we even lining up and paying?\n" - .string "We should just march in!$" + .string "Warum stehen wir hier eigentlich an und\n" + .string "bezahlen? Wir sollten einfach\l" + .string "hineingehen.$" SlateportCity_Text_164E85:: @ 8164E85 - .string "The sea is just so vast...\p" - .string "Could the sea have been made by the\n" - .string "tears shed by POKéMON?$" + .string "Das Meer ist wirklich überwältigend...\p" + .string "Ob es durch die vergossenen Tränen der\n" + .string "POKéMON entstanden ist?$" SlateportCity_Text_164EDB:: @ 8164EDB - .string "Do you know what they do with old\n" - .string "ships that become too creaky to sail?\p" - .string "They sink them in the sea so they\n" - .string "become habitats for POKéMON.$" + .string "Weißt du, was mit alten, nicht mehr\n" + .string "seetüchtigen Schiffen gemacht wird?\p" + .string "Sie werden im Meer versenkt und so\n" + .string "zu Lebensraum für die POKéMON.$" SlateportCity_Text_164F62:: @ 8164F62 - .string "Whenever I visit here, I get carried\n" - .string "away and buy too much.$" + .string "Immer wenn ich hier herkomme, vergesse\n" + .string "ich mich und kaufe wie bescheuert ein.$" SlateportCity_Text_164F9E:: @ 8164F9E - .string "If you want to change your POKéMON’s\n" - .string "nickname, you’ll have to get the NAME\l" - .string "RATER to help you.$" + .string "Wenn du die Kosenamen deiner POKéMON\n" + .string "ändern willst, solltest du den NAMEN-\l" + .string "BEWERTER um Hilfe bitten.$" SlateportCity_Text_164FFC:: @ 8164FFC - .string "Any POKéMON you get in a trade, you\n" - .string "can’t change its nickname.\p" - .string "The original TRAINER’s love for that\n" - .string "POKéMON is in the nickname.$" + .string "Erhältst du ein POKéMON durch Tausch,\n" + .string "kannst du den Kosenamen nicht ändern.\p" + .string "Die Liebe des ursprünglichen TRAINERS\n" + .string "drückt sich in dem Kosenamen aus.$" SlateportCity_Text_16507C:: @ 816507C - .string "A POKéMON CONTEST HALL opened in\n" - .string "SLATEPORT recently.\p" - .string "I plan on entering after I improve the\n" - .string "condition of my POKéMON.$" + .string "Eine WETTBEWERBSHALLE für POKéMON\n" + .string "wurde kürzlich in GRAPHITPORT CITY\l" + .string "eröffnet.\p" + .string "Ich plane dort hinzugehen, wenn ich\n" + .string "meine POKéMON besser trainiert habe.$" SlateportCity_Text_1650F1:: @ 81650F1 - .string "Do you know about the machine\n" - .string "BERRY BLENDER?$" + .string "Hast du schon mal etwas über den\n" + .string "BEERENMIXER gehört?$" SlateportCity_Text_16511E:: @ 816511E - .string "People have to work together to get it\n" - .string "to spin faster.\p" - .string "The faster you can make it spin, the\n" - .string "better {POKEBLOCK}S you can get, I’ve heard.$" + .string "Man muss mit anderen zusammenarbeiten,\n" + .string "um ihn schneller drehen zu können.\p" + .string "Ich habe gehört, je schneller man ihn\n" + .string "dreht, desto besser werden die {POKEBLOCK}.$" SlateportCity_Text_1651A1:: @ 81651A1 - .string "It’s used for making a kind of candy\n" - .string "called a {POKEBLOCK}.\p" - .string "If you give a good {POKEBLOCK} to a POKéMON,\n" - .string "its condition will improve by a lot.$" + .string "Damit stellt man eine Leckerei her, die\n" + .string "{POKEBLOCK} genannt wird.\p" + .string "Wenn du einem POKéMON einen guten\n" + .string "{POKEBLOCK} gibst, verbessern sich seine\l" + .string "Eigenschaften.$" SlateportCity_Text_165222:: @ 8165222 - .string "I was hoping that it was a famous star\n" - .string "so I could get an autograph.\p" - .string "But who’s that being interviewed?\n" - .string "Isn’t that CAPT. STERN?$" + .string "Ich habe gehofft, es wäre ein berühmter\n" + .string "Star. Dann hätte ich mir ein Autogramm\l" + .string "geben lassen.\p" + .string "Aber wer wird denn da interviewt?\n" + .string "Ist das nicht KAPT. BRIGG?$" SlateportCity_Text_1652A0:: @ 81652A0 - .string "That lady interviewer is so cool and\n" - .string "pretty.\p" - .string "When I grow up, I’m going to be an\n" - .string "international journalist!$" + .string "Die Interviewerin ist so cool und\n" + .string "hübsch.\p" + .string "Wenn ich groß bin, werde ich ein\n" + .string "weltberühmter Journalist.$" SlateportCity_Text_16530A:: @ 816530A - .string "CAPT. STERN says they discovered\n" - .string "something at the bottom of the sea.\p" - .string "I wonder what it is?\n" - .string "What could it be?$" + .string "KAPT. BRIGG sagt, sie hätten etwas auf\n" + .string "dem Meeresgrund entdeckt.\p" + .string "Ich frage mich, was das wohl ist.\n" + .string "Was könnte das sein???$" SlateportCity_Text_165376:: @ 8165376 - .string "What’s going on here?\p" - .string "Did the good CAPTAIN come back with\n" - .string "a big fish from the ocean floor?$" + .string "Was ist denn hier los?\p" + .string "Hat KAPT. BRIGG etwa einen Riesen-\n" + .string "fisch vom Meeresgrund mitgebracht?$" SlateportCity_Text_1653D1:: @ 81653D1 - .string "Hey! Are you watching?\n" - .string "Am I on TV?$" + .string "Hey! Nimmst du mich auf?\n" + .string "Komm ich jetzt ins Fernsehen?$" SlateportCity_Text_1653F4:: @ 81653F4 - .string "A TV interview! Here!\n" - .string "The CAPTAIN’s a celebrity!$" + .string "Ein TV-Interview! Hier!!!\n" + .string "Der KAPITÄN ist ein Star!$" SlateportCity_Text_165425:: @ 8165425 - .string "TY: Okay, CAPT. STERN, a big smile\n" - .string "for the camera!$" + .string "UDO: Okay, KAPT. BRIGG, schenken Sie\n" + .string "unserer Kamera Ihr schönstes Lächeln!$" SlateportCity_Text_165458:: @ 8165458 - .string "GABBY: I see, I see. You’ve had a most\n" - .string "invaluable experience...$" + .string "PIA: Ich verstehe, ich verstehe. Sie\n" + .string "haben eine unschätzbare Entdeckung\l" + .string "gemacht...$" SlateportCity_Text_165498:: @ 8165498 - .string "CAPT. STERN: Yes, indeed. We intend to\n" - .string "move ahead with our exploration.$" + .string "KAPT. BRIGG: Ja, genau. Wir haben vor,\n" + .string "unsere Expedition weiter fortzuführen.$" SlateportCity_Text_1654E0:: @ 81654E0 - .string "GABBY: That’s wonderful, CAPT. STERN!\n" - .string "Thank you for taking the time from\l" - .string "your busy schedule to talk to us.\p" - .string "We hope we can interview you again\n" - .string "with news of more discoveries!$" + .string "PIA: Das ist wunderbar, KAPT. BRIGG!\n" + .string "Vielen Dank, dass Sie trotz Ihres vollen\l" + .string "Terminkalenders Zeit für uns gefunden\l" + .string "haben!\p" + .string "Wir hoffen, Sie bald wieder zu neuen\n" + .string "aufregenden Funden interviewen zu\l" + .string "dürfen!$" SlateportCity_Text_16558D:: @ 816558D - .string "CAPT. STERN: Whew...\p" - .string "That was my first time to be filmed for\n" - .string "TV. That was nerve wracking.$" + .string "KAPT. BRIGG: Puuh...\p" + .string "Das war das erste Mal, dass ich für eine\n" + .string "Fernsehsendung interviewt wurde. Ich\l" + .string "war vielleicht nervööös!$" SlateportCity_Text_1655E7:: @ 81655E7 .string "Oh! {PLAYER}{KUN}!\n" - .string "You’re looking great!\p" - .string "We made a huge discovery on our last\n" - .string "seafloor exploration.\p" - .string "We found an underwater cavern on\n" - .string "ROUTE 128.\p" - .string "We think it’s the habitat of a POKéMON\n" - .string "that’s said to have been long extinct.$" + .string "Gut siehst du aus!\p" + .string "Wir haben bei unserer letzten Tiefsee-\n" + .string "Expedition eine großartige Entdeckung\l" + .string "gemacht.\p" + .string "Wir haben auf der ROUTE 128 eine Unter-\n" + .string "wasserhöhle entdeckt.\p" + .string "Wir glauben, es ist die Höhle eines\n" + .string "POKéMON, das schon lange ausge-\l" + .string "storben ist.$" SlateportCity_Text_1656BC:: @ 81656BC - .string "Fufufu...\n" - .string "CAPT. STERN, I presume.\p" - .string "We of TEAM {EVIL_TEAM} will assume\n" - .string "control of your submarine!\p" - .string "Your objections are meaningless!\n" - .string "We expect your total cooperation!\p" - .string "Fufufu...\n" - .string "Just watch and learn what TEAM\l" - .string "{EVIL_TEAM} has planned!$" + .string "Hähähä...\n" + .string "KAPT. BRIGG, nehme ich an.\p" + .string "Wir vom TEAM {EVIL_TEAM} werden das U-Boot\n" + .string "in unsere Gewalt nehmen!\p" + .string "Eure Einwände sind bedeutungslos!\n" + .string "Wir erwarten absolute Kooperation!\p" + .string "Hähähä...\n" + .string "Mal sehen, was ihr zu den Plänen von\l" + .string "TEAM {EVIL_TEAM} sagt!$" SlateportCity_Text_16578F:: @ 816578F - .string "CAPT. STERN: What was that all about?\p" - .string "It sounded like someone using a\n" - .string "megaphone...\p" - .string "Where did it come from?$" + .string "KAPT. BRIGG: Was soll das Ganze?\p" + .string "Sieht aus, als benutze jemand ein\n" + .string "Megaphon...\p" + .string "Wo kommt das her?$" SlateportCity_Text_1657FA:: @ 81657FA - .string "It’s from the HARBOR!\p" - .string "The submarine!\n" - .string "They’re trying to take it!$" + .string "Das kommt von der Anlegestelle!\p" + .string "Das U-Boot!\n" + .string "Jemand versucht, es zu stehlen!$" SlateportCity_Text_16583A:: @ 816583A .string "{PLAYER}{KUN}!\n" - .string "Please, come with me!$" + .string "Bitte, komm mit mir!$" SlateportCity_Text_165856:: @ 8165856 - .string "POKéMON CONTESTS\n" - .string "HYPER RANK REGISTRATION\l" - .string "“Let it burn! POKéMON TRAINERS!”$" + .string "POKéMON WETTBEWERBE\n" + .string "HYPER-KLASSE REGISTRIERUNGEN\l" + .string "“Lasst es krachen! POKéMON-\l" + .string "TRAINER!”$" SlateportCity_Text_1658A0:: @ 81658A0 - .string "STERN’S SHIPYARD\p" - .string "“Wanted: A sailor capable of sailing\n" - .string "in all currents.”$" + .string "BRIGGWERFT\p" + .string "“Gesucht: Ein erfahrener Seemann,\n" + .string "der die Gefahr nicht scheut.”$" SlateportCity_Text_1658E8:: @ 81658E8 - .string "STERN’S SHIPYARD\p" - .string "“The ferry S.S. TIDAL nears\n" - .string "completion for serving the ports of\l" - .string "SLATEPORT and LILYCOVE.”$" + .string "BRIGGWERFT\p" + .string "“Die Fähre MS TIDE wird bald fertig\n" + .string "gestellt sein und die Häfen von\l" + .string "GRAPHITPORT CITY und SEEGRASULB CITY\l" + .string "bedienen.”$" SlateportCity_Text_165952:: @ 8165952 - .string "STERN’S SHIPYARD\p" - .string "“Boarding of the SLATEPORT-LILYCOVE\n" - .string "ferry S.S. TIDAL is handled at the\l" - .string "HARBOR.”$" + .string "BRIGGWERFT\p" + .string "“Bordkarten für die GRAPHITPORT CITY-\n" + .string "SEEGRASULB CITY Fähre MS TIDE werden\l" + .string "am HAFEN ausgegeben.”$" SlateportCity_Text_1659B3:: @ 81659B3 - .string "POKéMON FAN CLUB\n" - .string "“Calling all fans of POKéMON!”$" + .string "POKéMON-FANCLUB\n" + .string "“Wir rufen alle Fans der POKéMON!”$" SlateportCity_Text_1659E3:: @ 81659E3 - .string "“The endless sea sustains\n" - .string "all life.”\p" - .string "OCEANIC MUSEUM$" + .string "“Das unendliche Meer erhält\n" + .string "alles Leben.”\p" + .string "OZEANMUSEUM$" SlateportCity_Text_165A17:: @ 8165A17 - .string "SLATEPORT CITY\p" - .string "“The port where people and POKéMON\n" - .string "cross paths.”$" + .string "GRAPHITPORT CITY\p" + .string "“Der Hafen, an dem sich Menschen\n" + .string "und POKéMON begegnen.”$" SlateportCity_Text_165A57:: @ 8165A57 - .string "SLATEPORT MARKET\n" - .string "“Unique items found nowhere else!”$" + .string "GRAPHITPORT CITY MARKT\n" + .string "“Einzigartige Items, die es\l" + .string "nirgendwo sonst gibt!”$" SlateportCity_Text_165A8B:: @ 8165A8B - .string "SLATEPORT HARBOR\p" - .string "“The ferry S.S. TIDAL is under\n" - .string "construction in the SHIPYARD.\p" - .string "“Service is scheduled to begin\n" - .string "shortly.”$" + .string "HAFEN GRAPHITPORT CITY\p" + .string "“Die Fähre MS TIDE wird momentan\n" + .string "in der WERFT gebaut.\p" + .string "Die Fähre wird so bald wie möglich ihren\n" + .string "Dienst aufnehmen.”$" SlateportCity_Text_165B02:: @ 8165B02 - .string "SLATEPORT HARBOR\p" - .string "“Enjoy a delightful cruise on the\n" - .string "ferry S.S. TIDAL.”$" + .string "HAFEN GRAPHITPORT CITY\p" + .string "“Genießen Sie die entspannende Fahrt\n" + .string "mit der Fähre MS TIDE.”$" SlateportCity_Text_165B48:: @ 8165B48 - .string "NAME RATER’S HOUSE\n" - .string "“POKéMON nicknames rated.”$" + .string "HAUS DES NAMENBEWERTERS\n" + .string "“Bewertung von POKéMON-Kosenamen.”$" diff --git a/data/text/maps/SlateportCity_ContestHall.inc b/data/text/maps/SlateportCity_ContestHall.inc index 6199157fb..7a52c4a13 100644 --- a/data/text/maps/SlateportCity_ContestHall.inc +++ b/data/text/maps/SlateportCity_ContestHall.inc @@ -1,105 +1,111 @@ SlateportCity_ContestHall_Text_17CB71:: @ 817CB71 - .string "Want a tasty little bit of advice\n" - .string "for CONTESTS?\p" - .string "Using a certain move after another\n" - .string "certain kind of move sometimes gets\l" - .string "you extra attention.\p" - .string "If you know what you’re doing, you\n" - .string "can score big in appeal.\p" - .string "Of course, your opponents might try\n" - .string "disrupting your POKéMON’s showing.$" + .string "Soll ich dir einen klitzekleinen Tipp für\n" + .string "den WETTBEWERB geben?\p" + .string "Wenn du eine besondere Attacke nach\n" + .string "einer bestimmten Attacke einsetzt,\l" + .string "weckst du besondere Aufmerksamkeit.\p" + .string "Solange du genau weißt, was du wie zu\n" + .string "tun hast, wirst du erfolgreich sein.\p" + .string "Natürlich werden die Mitstreiter\n" + .string "versuchen, deinem POKéMON die Show zu\l" + .string "stehlen.$" SlateportCity_ContestHall_Text_17CC80:: @ 817CC80 - .string "My papa, he’s a CONTEST JUDGE.\p" - .string "I wonder what I should be when I\n" - .string "grow up, a JUDGE or a GYM LEADER?$" + .string "Mein Papa ist ein JUROR des\n" + .string "WETTBEWERBS.\p" + .string "Ich frage mich, was ich mal werden soll:\n" + .string "Ein JUROR oder ein ARENALEITER?$" SlateportCity_ContestHall_Text_17CCE2:: @ 817CCE2 - .string "Hey, man, I’m like majorly cheesed,\n" - .string "you know. Like, you know, I just\l" - .string "wanted to know why my POKéMON\l" - .string "never won, you know, like, hey?\p" - .string "So, like, I gave the JUDGE my two\n" - .string "cents, you know, they’re free.\p" - .string "And he wouldn’t hear me out, like, hey!\n" - .string "So, like, total bummer, man!\p" - .string "Hey, like, you! Zip it, you know?\n" - .string "Just, you know, take this!$" + .string "Hey, also, das ist wohl Künstlerpech,\n" + .string "Mann. Ich will einfach wissen, warum\l" + .string "mein POKéMON nie gewinnt.\l" + .string "Weißt du, Mann?\p" + .string "Daher, Mann, habe ich dem JUROR meinen\n" + .string "Senf dazugegeben.\p" + .string "Und der hat nicht einmal zugehört, Mann!\n" + .string "Das ist vielleicht eine Niete.\p" + .string "Hey! Zieh dir das mal rein!\n" + .string "Hier, Mann, das ist für dich!$" SlateportCity_ContestHall_Text_17CE28:: @ 817CE28 - .string "That’s, like, TM41, you know?\n" - .string "Hey, it’s TORMENT, you hearing me?\p" - .string "Like, it won’t let the other guy\n" - .string "use the same move twice in a row, see?\p" - .string "Hey, now, you listen here, like,\n" - .string "I’m not laying a torment on you!$" + .string "Das ist die TM41, weißt du?\n" + .string "Hey, das ist FOLTERKNECHT, sag ich dir.\p" + .string "Der Gegner wird so daran gehindert, eine\n" + .string "Attacke zweimal hintereinander\l" + .string "auszuführen.\p" + .string "Aber nun hör mir gut zu. Ich würde NIE\n" + .string "FOLTERKNECHT gegen dich einsetzen.$" SlateportCity_ContestHall_Text_17CEF3:: @ 817CEF3 - .string "MC: Oh, my, my!\n" - .string "Now isn’t that a dandy of a POKéMON?\p" - .string "Please! Do step right up and take\n" - .string "part in our splendid CONTESTS!\p" - .string "You’ll do well! I’m sure of it!\n" - .string "My eyes have never failed me!$" + .string "MC: Oh, meine Güte!\n" + .string "Ist das nicht ein Dandy von POKéMON?\p" + .string "Bitte! Tritt näher und nimm an unserem\n" + .string "großartigen WETTBEWERB teil!\p" + .string "Ich bin sicher, du wirst hervorragend\n" + .string "abschneiden. Meine Augen täuschen\l" + .string "mich nie!$" SlateportCity_ContestHall_Text_17CFA7:: @ 817CFA7 - .string "JUDGE: Well, hello there!\n" - .string "I see that you’re a TRAINER!\p" - .string "Then, it just wouldn’t do for you\n" - .string "to miss a POKéMON CONTEST!\p" - .string "Get a CONTEST PASS in VERDANTURF\n" - .string "CITY and enter anytime!$" + .string "JUROR: Hallo, du da!\n" + .string "Wie ich sehe, bist du ein TRAINER!\p" + .string "Nun, dann kannst du es dir eigentlich\n" + .string "nicht leisten, einen WETTBEWERB zu\l" + .string "verpassen!\p" + .string "Hol dir in WIESENFLUR eine\n" + .string "WETTBEWERBSKARTE und nimm teil!$" SlateportCity_ContestHall_Text_17D054:: @ 817D054 - .string "It’s appeal time!\n" - .string "What should I lead with?$" + .string "Showtime!\n" + .string "Womit soll ich beginnen?$" SlateportCity_ContestHall_Text_17D07F:: @ 817D07F - .string "They didn’t pay much attention to\n" - .string "my POKéMON’s appeal...\p" - .string "Humph, that JUDGE, he doesn’t know\n" - .string "a good thing when he sees it.$" + .string "Der Auftritt meines POKéMON fand\n" + .string "nicht viel Beachtung...\p" + .string "Männo, der Juror hat wohl Tomaten auf\n" + .string "den Augen!?!$" SlateportCity_ContestHall_Text_17D0F9:: @ 817D0F9 - .string "Oh, hi! You must be a serious fan to get\n" - .string "this close to the action.\p" - .string "I’ll reward your enthusiasm with this\n" - .string "sage advice.\p" - .string "If a move goes over really well,\n" - .string "the audience will get excited.\p" - .string "The POKéMON that makes its appeal\n" - .string "right when everyone’s excited...\p" - .string "Well, you’d think something good has\n" - .string "to happen!$" + .string "Oh, hi! Du musst ein wirklich großer Fan\n" + .string "sein, wenn du so nah herangehst.\p" + .string "Ich belohne deinen Enthusiasmus mit\n" + .string "einem weisen Rat.\p" + .string "Wenn eine Attacke wirklich gut gelingt,\n" + .string "ist das Publikum begeistert.\p" + .string "Wenn alle begeistert sind, hat das\n" + .string "POKéMON einen tollen Auftritt gehabt.\p" + .string "Dann weißt du, dass etwas Tolles\n" + .string "passieren wird!$" SlateportCity_ContestHall_Text_17D222:: @ 817D222 - .string "I can’t do this! I’m more freaked out\n" - .string "than my POKéMON.\p" - .string "I’m shivering and my heart is racing!$" + .string "Ich kann es einfach nicht! Ich bin\n" + .string "nervöser als mein POKéMON.\p" + .string "Ich zittere und mein Herz rast!$" SlateportCity_ContestHall_Text_17D27F:: @ 817D27F - .string "A battle and a CONTEST aren’t the\n" - .string "same, but they are alike, too.\p" - .string "You need to work hard and believe\n" - .string "in the POKéMON you’ve raised.$" + .string "Ein Kampf und ein WETTBEWERB sind nicht\n" + .string "dasselbe, aber sie sind sich ähnlich.\p" + .string "Du musst hart arbeiten und an die\n" + .string "POKéMON, die du aufziehst, glauben.$" SlateportCity_ContestHall_Text_17D300:: @ 817D300 - .string "That POKéMON looks like it’s on top\n" - .string "of its game, huh?\p" - .string "A POKéMON that does good in the\n" - .string "secondary judging seems to be more\l" - .string "relaxed when it’s doing appeals.$" + .string "Dieses POKéMON scheint an der Spitze\n" + .string "zu stehen, was?\p" + .string "Ein POKéMON, das im zweiten Durchgang\n" + .string "gut abschneidet, wird im Wettbewerb\l" + .string "viel ruhiger auftreten.$" SlateportCity_ContestHall_Text_17D39A:: @ 817D39A - .string "Will you look at that sorry sight?\p" - .string "Heh, my POKéMON’s absolutely better\n" - .string "than that lot!$" + .string "Guck dir mal diese jämmerlichen\n" + .string "Gestalten an.\p" + .string "Mein POKéMON ist viel, viel besser als\n" + .string "dieser Haufen!$" SlateportCity_ContestHall_Text_17D3F0:: @ 817D3F0 - .string "Don’t you get the urge to move with\n" - .string "POKéMON if they’re putting on an\l" - .string "energetic appeal?$" + .string "Geht es dir nicht auch so? Wenn ein\n" + .string "POKéMON all seine Energie in eine\l" + .string "Attacke steckt, bewegt mich das enorm.$" SlateportCity_ContestHall_Text_17D447:: @ 817D447 - .string "POKéMON CONTESTS\n" - .string "HYPER RANK STAGE!$" + .string "POKéMON WETTBEWERBE\n" + .string "BÜHNE für die HYPER-KLASSE!$" diff --git a/data/text/maps/SlateportCity_ContestLobby.inc b/data/text/maps/SlateportCity_ContestLobby.inc index 7c32cd8ac..24d4c8529 100644 --- a/data/text/maps/SlateportCity_ContestLobby.inc +++ b/data/text/maps/SlateportCity_ContestLobby.inc @@ -1,27 +1,29 @@ SlateportCity_ContestLobby_Text_17C937:: @ 817C937 - .string "I want to raise a POKéMON that’s\n" - .string "the ultimate in “great” for both\l" - .string "battles and CONTESTS.\p" - .string "It’s vexing, trying to figure out\n" - .string "which moves I should make it learn.$" + .string "Ich möchte ein POKéMON aufziehen, das\n" + .string "im Kampf und im WETTBEWERB\l" + .string "“unbesiegbar” ist.\p" + .string "Es ist schon verwirrend, herauszu-\n" + .string "finden, welche Attacken es lernen soll.$" SlateportCity_ContestLobby_Text_17C9D5:: @ 817C9D5 - .string "Do any of your friends have any\n" - .string "BERRIES?\p" - .string "You can use that BERRY BLENDER and\n" - .string "make {POKEBLOCK}S with your friends!\p" - .string "You should try it - it’s a lot of fun!$" + .string "Haben einige deiner Freunde BEEREN?\p" + .string "Du kannst den BEERENMIXER benutzen\n" + .string "und zusammen mit ihnen {POKEBLOCK}\l" + .string "herstellen.\p" + .string "Das macht sehr viel Spaß!$" SlateportCity_ContestLobby_Text_17CA67:: @ 817CA67 - .string "I have two, so you can have one!$" + .string "Ich habe zwei. Du kannst eine haben.$" SlateportCity_ContestLobby_Text_17CA88:: @ 817CA88 - .string "Make {POKEBLOCK}S and put them in there.\p" - .string "When you make a {POKEBLOCK}, everyone\n" - .string "has to put in a different BERRY.$" + .string "Stelle {POKEBLOCK} her und verstaue sie\n" + .string "darin.\p" + .string "Wenn ihr einen {POKEBLOCK} herstellt, muss\n" + .string "jeder eine andere BEERE einsetzen.$" SlateportCity_ContestLobby_Text_17CAEC:: @ 817CAEC - .string "If you win a CONTEST, they put up a\n" - .string "poster of your POKéMON on the wall.\p" - .string "It will have a portrait of your\n" - .string "POKéMON and both your names.$" + .string "Wenn du einen WETTBEWERB gewinnst,\n" + .string "wird ein Bild deines POKéMON an die\l" + .string "Wand gehängt.\p" + .string "Das Porträt deines POKéMON wird\n" + .string "außerdem mit deinem Namen versehen.$" diff --git a/data/text/maps/SlateportCity_Harbor.inc b/data/text/maps/SlateportCity_Harbor.inc index 187dfe07c..930375a5f 100644 --- a/data/text/maps/SlateportCity_Harbor.inc +++ b/data/text/maps/SlateportCity_Harbor.inc @@ -1,148 +1,154 @@ SlateportCity_Harbor_Text_17FA0A:: @ 817FA0A - .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" - .string "available at present...$" + .string "Verzeihung?\n" + .string "Du suchst nach einem Schiff?\p" + .string "Oh, das tut mir Leid, aber die Fähre\n" + .string "steht momentan nicht zur Verfügung...$" SlateportCity_Harbor_Text_17FA73:: @ 817FA73 - .string "Hello, are you here for the ferry?\n" - .string "May I see your TICKET?$" + .string "Hallo! Möchtest du mit der Fähre fahren?\n" + .string "Zeigst du mir bitte dein TICKET?$" SlateportCity_Harbor_Text_17FAAD:: @ 817FAAD - .string "{PLAYER} doesn’t have the TICKET...\p" - .string "I’m terribly sorry.\p" - .string "You must have a TICKET to board\n" - .string "the ferry.$" + .string "{PLAYER} hat kein TICKET...\p" + .string "Das tut mir schrecklich Leid.\p" + .string "Nur mit einem TICKET kannst du mit der\n" + .string "Fähre fahren.$" SlateportCity_Harbor_Text_17FB0A:: @ 817FB0A - .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" - .string "And where would you like to go?$" + .string "{PLAYER} zückt das TICKET.\p" + .string "Perfekt! Damit kannst du an Bord!\p" + .string "Und wo soll die Reise hingehen?$" SlateportCity_Harbor_Text_17FB5F:: @ 817FB5F - .string "Please sail with us another time!$" + .string "Bitte komm später noch einmal wieder!$" SlateportCity_Harbor_Text_17FB81:: @ 817FB81 - .string "LILYCOVE CITY it is, then!$" + .string "Nach SEEGRASULB CITY?$" SlateportCity_Harbor_Text_17FB9C:: @ 817FB9C - .string "BATTLE TOWER it is, then!$" + .string "Zum DUELLTURM?$" SlateportCity_Harbor_Text_17FBB6:: @ 817FBB6 - .string "Please board the ferry and wait for\n" - .string "departure.$" + .string "Bitte komm an Bord. Wir legen bald ab.$" SlateportCity_Harbor_Text_17FBE5:: @ 817FBE5 - .string "Then, where would you like to go?$" + .string "Und wo soll die Reise hingehen?$" SlateportCity_Harbor_Text_17FC07:: @ 817FC07 - .string "A journey to the bottom of the sea...\n" - .string "I wonder what it’d be like?\p" - .string "I’d love to go deep underwater like\n" - .string "that some day.$" + .string "Eine Reise zum Meeresboden...\n" + .string "Ich frage mich, wie es dort wohl ist?\p" + .string "Eines Tages möchte ich auch einmal so\n" + .string "tief unter Wasser reisen.$" SlateportCity_Harbor_Text_17FC7C:: @ 817FC7C - .string "I wanted to go with CAPT. STERN on\n" - .string "the ocean floor exploration.\p" - .string "But the sub’s too small for me.\p" - .string "If I squeezed in, there wouldn’t be\n" - .string "any room for the CAPTAIN...$" + .string "Ich wäre gerne mit KAPT. BRIGG auf die\n" + .string "Expedition zum Meeresboden gegangen.\p" + .string "Aber das U-Boot ist zu klein für mich.\p" + .string "Ich könnte mich ja reinquetschen, aber\n" + .string "dann hätte der KAPITÄN keinen Platz\l" + .string "mehr...$" SlateportCity_Harbor_Text_17FD1C:: @ 817FD1C - .string "CAPT. STERN: Those thugs...\p" - .string "They’re the same lot who tried to rob\n" - .string "the DEVON GOODS at the MUSEUM.$" + .string "KAPT. BRIGG: Diese Schlägertypen...\p" + .string "Das sind die gleichen Typen, die\n" + .string "versucht haben, die DEVON-WAREN aus\l" + .string "dem MUSEUM zu stehlen.$" SlateportCity_Harbor_Text_17FD7D:: @ 817FD7D - .string "{EVIL_LEADER}: Fwahahaha...\n" - .string "I commiserate with you!\p" - .string "All that effort you spent following\n" - .string "me here all the way from MT. PYRE.\p" - .string "But now...\n" - .string "No one can stop us! No one!\p" - .string "Or, will you follow us back to our\n" - .string "HIDEOUT in LILYCOVE CITY?\p" - .string "Fwahahahaha...$" + .string "{EVIL_LEADER}: Ahahahahaha!!!!!\n" + .string "Du tust mir ja so Leid!\p" + .string "All die Mühen, um mir vom PYROBERG\n" + .string "bis hierher zu folgen...\p" + .string "Und nun...\n" + .string "Niemand kann uns stoppen! Niemand!!!\p" + .string "Oder willst du uns etwa in unser VER-\n" + .string "STECK in SEEGRASULB CITY folgen?\p" + .string "Ahahahahaha!!!!!$" SlateportCity_Harbor_Text_17FE60:: @ 817FE60 - .string "CAPT. STERN: Why...\p" - .string "Why would TEAM {EVIL_TEAM} steal my\n" - .string "SUBMARINE EXPLORER 1?\p" - .string "They can’t be after the slumbering\n" - .string "POKéMON at the bottom of the sea...\p" - .string "But even if I were to chase them,\n" - .string "I don’t stand a chance against them...$" + .string "KAPT. BRIGG: Warum...\p" + .string "Warum sollte TEAM {EVIL_TEAM} mein TIEF-\n" + .string "SEE-FORSCHUNGSBOOT 1 stehlen wollen?\p" + .string "Sie können doch nicht hinter dem\n" + .string "schlafenden POKéMON am Meeresgrund\l" + .string "her sein...\p" + .string "Selbst wenn ich sie verfolgen würde...\n" + .string "Ich hätte keine Chance gegen sie...$" SlateportCity_Harbor_Text_17FF35:: @ 817FF35 - .string "CAPT. STERN: Oh, {PLAYER}{KUN}...\p" - .string "Okay... So TEAM {EVIL_TEAM} left before you\n" - .string "could stop them...\p" - .string "Oh, no, don’t blame yourself.\n" - .string "You’re not responsible for this.\p" - .string "Trying to catch a submarine...\n" - .string "It’s impossible for most people.\p" - .string "You would need a POKéMON that knows\n" - .string "how to DIVE...\p" - .string "Perhaps if you went out to\n" - .string "MOSSDEEP CITY...\p" - .string "A lot of divers live out there, so\n" - .string "someone might teach you...$" + .string "KAPT. BRIGG: Oh, {PLAYER}{KUN}...\p" + .string "Okay... Du konntest TEAM {EVIL_TEAM} nicht\n" + .string "aufhalten...\p" + .string "Oh, nein, mach dir bitte keine Vorwürfe!\n" + .string "Die Schuld liegt nicht bei dir.\p" + .string "Ein U-Boot zu verfolgen und aufzu-\n" + .string "halten ist für die meisten Menschen\l" + .string "unmöglich.\p" + .string "Du benötigst ein POKéMON, das weiß, wie\n" + .string "man TAUCHER ausführt...\p" + .string "Vielleicht, wenn du dich nach\n" + .string "MOOSBACH CITY begibst...\p" + .string "Dort trifft man auf viele Taucher.\n" + .string "Vielleicht kann dir einer das\l" + .string "beibringen...$" SlateportCity_Harbor_Text_1800A0:: @ 81800A0 - .string "CAPT. STERN: Trying to catch a\n" - .string "submarine... It’s impossible.\p" - .string "You would need a POKéMON that knows\n" - .string "how to DIVE...\p" - .string "Perhaps if you went out to\n" - .string "MOSSDEEP CITY...\p" - .string "A lot of divers live out there, so\n" - .string "someone might teach you...$" + .string "KAPT. BRIGG: Ein U-Boot einzuholen und\n" + .string "aufzuhalten... Das ist unmöglich.\p" + .string "Du benötigst ein POKéMON, das weiß, wie\n" + .string "man TAUCHER ausführt...\p" + .string "Vielleicht, wenn du dich nach\n" + .string "MOOSBACH CITY begibst...\p" + .string "Dort trifft man auf viele Taucher, \n" + .string "vielleicht kann dir einer das bei-\l" + .string "bringen...$" SlateportCity_Harbor_Text_18017B:: @ 818017B - .string "CAPT. STERN: Oh, yes.\n" - .string "MR. BRINEY came to our SHIPYARD.\p" - .string "It won’t be long now before we finish\n" - .string "making the ferry!$" + .string "KAPT. BRIGG: Oh, ja.\n" + .string "MR. BRACK kam in unsere WERFT.\p" + .string "Nun dauert es nicht mehr lange, bis wir\n" + .string "unsere Fähre fertig stellen!$" SlateportCity_Harbor_Text_1801EA:: @ 81801EA - .string "CAPT. STERN: {PLAYER}{KUN}!\p" - .string "We finally finished making the ferry\n" - .string "S.S. TIDAL!\p" - .string "We couldn’t have done it without your\n" - .string "friend MR. BRINEY.\p" - .string "Please go for a short cruise on it!$" + .string "KAPT. BRIGG: {PLAYER}{KUN}!\p" + .string "Wir haben die Fähre MS TIDE endlich\n" + .string "fertig gestellt.\p" + .string "Ohne die Hilfe deines Freundes MR.\n" + .string "BRACK hätten wir das nicht geschafft.\p" + .string "Bitte, nimm an einer kurzen Fahrt teil!$" SlateportCity_Harbor_Text_18028B:: @ 818028B - .string "CAPT. STERN: Oh?\n" - .string "{PLAYER}{KUN}, that item you have...\p" - .string "That’s a SCANNER! That would sure\n" - .string "help us on our explorations.\p" - .string "{PLAYER}{KUN}, would you trade your\n" - .string "SCANNER for something?\p" - .string "Like say a DEEPSEATOOTH or a\n" - .string "DEEPSEASCALE that I have?$" + .string "KAPT. BRIGG: Oh?\n" + .string "{PLAYER}{KUN}, das Item, das du da hast...\p" + .string "Das ist ein SCANNER! Der würde uns\n" + .string "sicher bei unseren Forschungen helfen.\p" + .string "{PLAYER}{KUN}, würdest du ihn gegen etwas\n" + .string "anderes eintauschen?\p" + .string "Zum Beispiel gegen einen ABYSSZAHN\n" + .string "oder eine ABYSSPLATTE?$" SlateportCity_Harbor_Text_180360:: @ 8180360 - .string "CAPT. STERN: Are you certain?\n" - .string "It’s useless to you, {PLAYER}{KUN}...\p" - .string "Well, okay, then. If you want to trade\n" - .string "your SCANNER, let me know.$" + .string "KAPT. BRIGG: Bist du sicher? Aber damit\n" + .string "kannst du doch nichts anfangen...\p" + .string "Also gut. Wenn du aber den SCANNER doch\n" + .string "noch gegen etwas anderes tauschen\l" + .string "willst, dann lass es mich wissen!$" SlateportCity_Harbor_Text_1803DD:: @ 81803DD - .string "CAPT. STERN: So you’ll trade it for\n" - .string "my DEEPSEATOOTH?$" + .string "KAPT. BRIGG: Du möchtest den\n" + .string "ABYSSZAHN dafür haben?$" SlateportCity_Harbor_Text_180412:: @ 8180412 - .string "CAPT. STERN: So you’ll trade it for\n" - .string "my DEEPSEASCALE?$" + .string "KAPT. BRIGG: Du möchtest die\n" + .string "ABYSSPLATTE dafür haben?$" SlateportCity_Harbor_Text_180447:: @ 8180447 - .string "CAPT. STERN: Which one do you want?$" + .string "KAPT. BRIGG: Was hättest du gerne?$" SlateportCity_Harbor_Text_18046B:: @ 818046B - .string "{PLAYER} handed the SCANNER to\n" - .string "CAPT. STERN.$" + .string "{PLAYER} gibt KAPT. BRIGG den SCANNER.$" SlateportCity_Harbor_Text_180491:: @ 8180491 - .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" - .string "This will help our research a lot!$" + .string "KAPT. BRIGG: Danke, {PLAYER}{KUN}!\n" + .string "Das wird unsere Forschungen weiter-\l" + .string "bringen!$" diff --git a/data/text/maps/SlateportCity_House1.inc b/data/text/maps/SlateportCity_House1.inc index c711aec2f..1a5f503dd 100644 --- a/data/text/maps/SlateportCity_House1.inc +++ b/data/text/maps/SlateportCity_House1.inc @@ -1,47 +1,47 @@ SlateportCity_House1_Text_17D46A:: @ 817D46A - .string "Hi, hi! I’m the NAME RATER!\n" - .string "I’m the fortune-teller of names!\p" - .string "I shall be pleased to rate your\n" - .string "POKéMON’s nickname.$" + .string "Hallo! Ich bin der NAMENBEWERTER!\n" + .string "Ich bin das Orakel der Namen!\p" + .string "Ich würde mich freuen, die Kosenamen\n" + .string "deiner POKéMON bewerten zu dürfen.$" SlateportCity_House1_Text_17D4DB:: @ 817D4DB - .string "Which POKéMON’s nickname should\n" - .string "I divine?$" + .string "Für welches POKéMON soll ich den\n" + .string "Kosenamen bewerten?$" SlateportCity_House1_Text_17D505:: @ 817D505 - .string "Hmmm... {STR_VAR_1}, is it? That is\n" - .string "quite a fine name you bestowed.\p" - .string "But! What say you, if I were to\n" - .string "suggest a slightly better name?$" + .string "Hmmm... {STR_VAR_1}, nicht wahr? Da hast\n" + .string "du aber einen schönen Namen verliehen.\p" + .string "Aber! Was hältst du davon, wenn ich ihm\n" + .string "einen etwas besseren Namen gebe?$" SlateportCity_House1_Text_17D580:: @ 817D580 - .string "Ah, good. Then, what shall the new\n" - .string "nickname be?$" + .string "Sehr schön! Und wie soll der neue\n" + .string "Kosename lauten?$" SlateportCity_House1_Text_17D5B0:: @ 817D5B0 - .string "Done! From now on, this POKéMON\n" - .string "shall be known as {STR_VAR_1}!\p" - .string "It is a better name than before!\n" - .string "How fortunate for you!$" + .string "Fertig! Von nun an heißt dein POKéMON\n" + .string "{STR_VAR_1}!\p" + .string "Das ist ein besserer Name als der\n" + .string "vorherige. Welch ein Glück für dich!$" SlateportCity_House1_Text_17D61E:: @ 817D61E - .string "I see.\n" - .string "Do come visit again.$" + .string "Ich verstehe.\n" + .string "Komm mich mal wieder besuchen.$" SlateportCity_House1_Text_17D63A:: @ 817D63A - .string "Done! From now on, this POKéMON\n" - .string "shall be known as {STR_VAR_1}!\p" - .string "It looks no different from before,\n" - .string "and yet, this is vastly superior!\l" - .string "How fortunate for you!$" + .string "Fertig! Von nun an heißt dein POKéMON\n" + .string "{STR_VAR_1}!\p" + .string "Eigentlich unterscheidet sich der Name\n" + .string "nicht von dem vorherigen, und doch ist\l" + .string "er um einiges besser! Welch ein Glück!$" SlateportCity_House1_Text_17D6CC:: @ 817D6CC - .string "Hmmm... {STR_VAR_1} it is!\p" - .string "This is a magnificent nickname!\n" - .string "It is impeccably beyond reproach!\p" - .string "You’ll do well to cherish your\n" - .string "{STR_VAR_1} now and beyond.$" + .string "Hmmm... {STR_VAR_1}!\p" + .string "Das ist ein wundervoller Kosename!\n" + .string "Ein Name ohne Fehl und Tadel!\p" + .string "Du tust gut daran, {STR_VAR_1} auch\n" + .string "weiterhin liebevoll zu behandeln!$" SlateportCity_House1_Text_17D752:: @ 817D752 - .string "Now, now.\n" - .string "That is merely an EGG!$" + .string "Mhm, mhm...\n" + .string "Das ist eigentlich ein EI!$" diff --git a/data/text/maps/SlateportCity_House2.inc b/data/text/maps/SlateportCity_House2.inc index c3d8346bc..360e4c1a7 100644 --- a/data/text/maps/SlateportCity_House2.inc +++ b/data/text/maps/SlateportCity_House2.inc @@ -1,16 +1,17 @@ SlateportCity_House2_Text_1804CF:: @ 81804CF - .string "My POKéMON has a HASTY nature.\p" - .string "It has higher SPEED compared to my\n" - .string "other POKéMON.\p" - .string "Maybe their nature has something to\n" - .string "do with the stat gains of POKéMON.$" + .string "Mein POKéMON hat ein HASTIGES Wesen.\p" + .string "Seine INITIATIVE ist im Vergleich\n" + .string "zu meinen anderen POKéMON höher.\p" + .string "Vielleicht hat ihr Wesen etwas mit den\n" + .string "Statusvorteilen der POKéMON zu tun.$" SlateportCity_House2_Text_180567:: @ 8180567 - .string "You need a CONTEST PASS to enter a\n" - .string "CONTEST.\p" - .string "It’s easy to get. They give it to\n" - .string "anyone who has POKéMON.$" + .string "Um an dem WETTBEWERB teilnehmen zu\n" + .string "können, brauchst du eine\l" + .string "WETTBEWERBSKARTE.\p" + .string "Die bekommst du leicht. Jeder, der ein\n" + .string "POKéMON hat, bekommt eine.$" SlateportCity_House2_Text_1805CD:: @ 81805CD - .string "Oh, a CONTEST PASS!\n" - .string "You’re going to be a contestant?$" + .string "Oh, eine WETTBEWERBSKARTE!\n" + .string "Bist du auch ein Bewerber?$" diff --git a/data/text/maps/SlateportCity_Mart.inc b/data/text/maps/SlateportCity_Mart.inc index b5243d406..8c09f7874 100644 --- a/data/text/maps/SlateportCity_Mart.inc +++ b/data/text/maps/SlateportCity_Mart.inc @@ -1,11 +1,11 @@ SlateportCity_Mart_Text_180730:: @ 8180730 - .string "The MARKET does have some interesting\n" - .string "merchandise.\p" - .string "But there are some items you can only\n" - .string "get at a POKé MART.$" + .string "Der MARKT bietet einige interessante\n" + .string "Merchandising-Artikel an.\p" + .string "Aber einige Sachen wirst du nur in einem\n" + .string "POKéMON-SUPERMARKT finden.$" SlateportCity_Mart_Text_18079D:: @ 818079D - .string "A GREAT BALL is better than a POKé BALL\n" - .string "at catching POKéMON.\p" - .string "With this, I should be able to get that\n" - .string "elusive POKéMON...$" + .string "Ein SUPERBALL eignet sich besser zum\n" + .string "Fangen von POKéMON als ein POKéBALL.\p" + .string "Hiermit sollte ich in der Lage sein, das\n" + .string "begehrte POKéMON zu überlisten.$" diff --git a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc b/data/text/maps/SlateportCity_OceanicMuseum_1F.inc index 0d3d1eec6..5087f3278 100644 --- a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/text/maps/SlateportCity_OceanicMuseum_1F.inc @@ -1,157 +1,164 @@ SlateportCity_OceanicMuseum_1F_Text_17E18D:: @ 817E18D - .string "Welcome to the OCEANIC MUSEUM.\p" - .string "The entrance fee is ¥50.\n" - .string "Would you like to enter?$" + .string "Willkommen im OZEANMUSEUM.\p" + .string "Der Eintritt kostet ¥50.\n" + .string "Hast du Interesse?$" SlateportCity_OceanicMuseum_1F_Text_17E1DE:: @ 817E1DE - .string "Please enjoy yourself.$" + .string "Viel Vergnügen!$" SlateportCity_OceanicMuseum_1F_Text_17E1F5:: @ 817E1F5 - .string "Oh? I’m sorry, but you don’t seem to\n" - .string "have enough money.$" + .string "Oh. Tut mir Leid, aber du hast\n" + .string "anscheinend nicht genug Geld bei dir.$" SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D - .string "Oh? You’re with that group that\n" - .string "went in earlier?\p" - .string "You’re the only one who’s late.\n" - .string "You’d better go catch up to them!$" + .string "Oh. Du gehörst zu der Gruppe, die gerade\n" + .string "hineingegangen ist?\p" + .string "Sie sind alle schon drin. Beeil dich,\n" + .string "sonst verlierst du die Gruppe.$" UnknownString_817E2A0: @ 817E2A0 - .string "Please visit another time!$" + .string "Bitte komm ein anderes Mal wieder!$" SlateportCity_OceanicMuseum_1F_Text_17E2BB:: @ 817E2BB - .string "We, TEAM {EVIL_TEAM}, exist for the good\n" - .string "of all!$" + .string "Wir, TEAM {EVIL_TEAM}, bestehen zum Besten\n" + .string "für alle!$" SlateportCity_OceanicMuseum_1F_Text_17E2E3:: @ 817E2E3 - .string "We were told to assemble here, so\n" - .string "we did, but...\p" - .string "Our BOSS, the lynchpin, isn’t here.$" + .string "Uns wurde befohlen, uns hier zu\n" + .string "versammeln. Das taten wir, aber...\p" + .string "Unser BOSS, der Galgenvogel, ist nicht\n" + .string "hier.$" SlateportCity_OceanicMuseum_1F_Text_17E338:: @ 817E338 - .string "If I ripped off the stuff here,\n" - .string "would it make me rich?$" + .string "Wenn ich diese ganzen Sachen an mich\n" + .string "reißen würde, wäre ich dann reich?$" SlateportCity_OceanicMuseum_1F_Text_17E36F:: @ 817E36F - .string "What I learn here, I can put to use on\n" - .string "nefarious deeds...$" + .string "Was ich hier lerne, kann ich für meine\n" + .string "ruchlosen Taten gut gebrauchen...$" SlateportCity_OceanicMuseum_1F_Text_17E3A9:: @ 817E3A9 - .string "If our goons didn’t bungle things\n" - .string "in RUSTBORO, we wouldn’t be here!$" + .string "Wenn dieser Idiot die Sache in\n" + .string "METAROST CITY nicht vermasselt hätte,\l" + .string "wären wir jetzt nicht hier.$" SlateportCity_OceanicMuseum_1F_Text_17E3ED:: @ 817E3ED - .string "I didn’t have ¥50, so it took a long\n" - .string "time getting by the receptionist.$" + .string "Ich hatte keine ¥50, daher habe ich\n" + .string "Ewigkeiten gebraucht, an der Rezeption\l" + .string "vorbeizukommen.$" SlateportCity_OceanicMuseum_1F_Text_17E434:: @ 817E434 - .string "I want to learn about the sea and\n" - .string "use that knowledge for battling.$" + .string "Ich möchte etwas über das Meer lernen\n" + .string "und dieses Wissen in Kämpfen einsetzen.$" SlateportCity_OceanicMuseum_1F_Text_17E477:: @ 817E477 - .string "I get all giddy and gooey when I\n" - .string "see the sea!\p" - .string "For me, CAPT. STERN is the number\n" - .string "one role model!$" + .string "Mir wird ganz schwindelig und rühr-\n" + .string "selig, wenn ich das Meer erblicke!\p" + .string "Für mich ist KAPT. BRIGG das absolute\n" + .string "Vorbild!$" SlateportCity_OceanicMuseum_1F_Text_17E4D7:: @ 817E4D7 - .string "The sea is vast without end, and\n" - .string "infinitely deep...\p" - .string "There must be many POKéMON that we\n" - .string "don’t know about.$" + .string "Das Meer ist erbarmungslos rau und\n" + .string "unendlich tief...\p" + .string "In ihm müssen viele POKéMON leben, die\n" + .string "wir bisher noch nicht kennen.$" SlateportCity_OceanicMuseum_1F_Text_17E540:: @ 817E540 - .string "I want a sea POKéMON.\p" - .string "I think it would feel cool and nice\n" - .string "to hug.$" + .string "Ich möchte ein POKéMON aus dem Meer\n" + .string "haben.\p" + .string "Wenn man das umarmt, ist es bestimmt\n" + .string "schön kalt und wunderbar glitschig.$" SlateportCity_OceanicMuseum_1F_Text_17E582:: @ 817E582 - .string "Aiyeeeh!\n" - .string "What are you doing here?\p" - .string "Me? I’m the TEAM {EVIL_TEAM} member you\n" - .string "thumped before, remember?\p" - .string "Here, take this!\n" - .string "You have to forgive me!$" + .string "Aiyeeh!\n" + .string "Was machst du hier?\p" + .string "Ich? Ich bin vom TEAM {EVIL_TEAM}. Du hast\n" + .string "mich in den Boden gestampft. Erinnerst\l" + .string "du dich?\p" + .string "Hier, das ist für dich!\n" + .string "Vergeben und vergessen!$" SlateportCity_OceanicMuseum_1F_Text_17E606:: @ 817E606 - .string "Aww, darn it!\n" - .string "You so screwed up our plans!\p" - .string "I was going to rip off something\n" - .string "to make up for it, but...\p" - .string "Just you wait!\n" - .string "You’ll get yours one day!$" + .string "Au, verdammt!\n" + .string "Du hast unsere Pläne zunichte gemacht!\p" + .string "Ich wollte als Ausgleich etwas mitgehen\n" + .string "lassen, aber...\p" + .string "Warte!\n" + .string "Du bekommst deine Belohnung auch noch!$" SlateportCity_OceanicMuseum_1F_Text_17E695:: @ 817E695 - .string "Awww, come on!\n" - .string "You have to take this and let me go!$" + .string "Oooch, komm schon!\n" + .string "Nimm es und lass mich gehen!$" SlateportCity_OceanicMuseum_1F_Text_17E6C9:: @ 817E6C9 - .string "A blue fluid is spiraling inside a\n" - .string "glass vessel.\p" - .string "“This is an experiment to create a\n" - .string "WHIRLPOOL artificially using wind.”$" + .string "Eine blaue Flüssigkeit bewegt sich\n" + .string "spiralförmig in einem Glasgefäß.\p" + .string "“Dies ist ein Experiment, das einen\n" + .string "künstlichen WHIRLPOOL mit Hilfe von\l" + .string "Wind erzeugt.”$" SlateportCity_OceanicMuseum_1F_Text_17E741:: @ 817E741 - .string "A red ball is bobbing up and down\n" - .string "inside a glass vessel.\p" - .string "“This is an experiment simulating a\n" - .string "WATERFALL using the ball’s buoyancy.”$" + .string "Ein roter Ball hüpft in dem Glasgefäß\n" + .string "auf und ab.\p" + .string "“Dies ist ein Experiment, das eine\n" + .string "künstliche KASKADE mit Hilfe des\l" + .string "Ballauftriebs erzeugt.”$" SlateportCity_OceanicMuseum_1F_Text_17E7C4:: @ 817E7C4 - .string "It’s a sample of soil from the ocean\n" - .string "floor.\p" - .string "“Over many years, the remains of\n" - .string "life-forms settle at the bottom of\l" - .string "the sea making sedimentary layers.\p" - .string "“By analyzing these layers, the\n" - .string "ancient past is revealed.”$" + .string "Dies ist eine Probe vom Meeresboden.\p" + .string "“Über viele Jahre haben sich die Spuren\n" + .string "allen Lebens als Sedimente auf dem\l" + .string "Grund des Meeres abgelagert.\p" + .string "Analysen dieser Proben geben einen\n" + .string "Einblick in längst vergangenes Leben.”$" SlateportCity_OceanicMuseum_1F_Text_17E892:: @ 817E892 - .string "It’s a sample of beach sand.\p" - .string "“Stones from mountains are washed\n" - .string "down by rivers where they are\l" - .string "chipped and ground down.\p" - .string "“They are reduced to grains and end\n" - .string "up as sand on beaches.”$" + .string "Dies ist eine Probe vom Sand der Küste.\p" + .string "“Die Gesteinsschichten der Berge\n" + .string "wurden im Laufe der Jahre durch Wasser\l" + .string "abgetragen und am Boden abgelagert.\p" + .string "Nun sind sie nur noch kleine Körnchen,\n" + .string "die den Sand an der Küste bilden.”$" SlateportCity_OceanicMuseum_1F_Text_17E944:: @ 817E944 - .string "“OCEANIC MINI FACT 1\n" - .string "Why is seawater blue?\p" - .string "“Light is composed of many colors.\p" - .string "“When light passes through water,\n" - .string "most kinds of light lose color.\p" - .string "“However, blue light retains its\n" - .string "color, making the sea appear blue.”$" + .string "“MEERESKUNDE FAKT 1”\n" + .string "Warum ist das Wasser im Meer blau?\p" + .string "“Licht setzt sich aus vielen\n" + .string "Farben zusammen.\p" + .string "Scheint das Licht durch Wasser, so\n" + .string "gehen einige Farben verloren.\p" + .string "Der Blauanteil des Lichts bleibt aber\n" + .string "erhalten, das Wasser erscheint blau.”$" SlateportCity_OceanicMuseum_1F_Text_17EA19:: @ 817EA19 - .string "“OCEANIC MINI FACT 2\n" - .string "Why is the sea salty?\p" - .string "“Seawater contains dissolved salt in\n" - .string "the form of sodium and chlorine ions.\p" - .string "“These ions leach out of rocks and are\n" - .string "carried out to sea by rain.\p" - .string "“The concentration of dissolved salt\n" - .string "makes the sea salty.”$" + .string "“MEERESKUNDE FAKT 2”\n" + .string "Warum ist das Meer salzig?\p" + .string "“Meerwasser enthält gelöste Salzionen\n" + .string "in Form von Natrium und Chlorid.\p" + .string "Diese Ionen wurden durch den Regen\n" + .string "aus Gesteinsschichten herausgespült.\p" + .string "Die Konzentration des aufgelösten\n" + .string "Salzes macht das Meer salzig.”$" SlateportCity_OceanicMuseum_1F_Text_17EB0D:: @ 817EB0D - .string "“OCEANIC MINI FACT 3\n" - .string "Which is bigger? The sea or land?\p" - .string "“The sea covers about 70% of the\n" - .string "planet, and the rest is land.\p" - .string "“The sea is therefore more than twice\n" - .string "the size of land.”$" + .string "“MEERESKUNDE FAKT 3”\n" + .string "Was ist größer? Das Meer oder das Land?\p" + .string "“Die Erde ist zu 70% von Wasser\n" + .string "bedeckt, der Rest ist Land.\p" + .string "Das Meer ist also mehr als doppelt\n" + .string "so groß wie das Land.”$" SlateportCity_OceanicMuseum_1F_Text_17EBBC:: @ 817EBBC - .string "It’s a fossil with wavy ridges on it.\p" - .string "“Soil on the ocean floor gets scoured\n" - .string "by the tide.\p" - .string "“The flowing seawater marks the soil\n" - .string "with small ridges and valleys.\p" - .string "“If this soil becomes fossilized, it is\n" - .string "called a ripple mark.”$" + .string "Das ist ein Fossil mit vielen Furchen.\p" + .string "“Das Erdreich des Meeresbodens wird\n" + .string "durch die Gezeiten abgetragen.\p" + .string "Die Bewegungen des Wassers zeichnen\n" + .string "Rillen und Wellen in den Meeresboden.\p" + .string "Wenn der Meeresboden versteinert, wird\n" + .string "ein Bodenrelief sichtbar.”$" SlateportCity_OceanicMuseum_1F_Text_17EC98:: @ 817EC98 - .string "A strange machine is rotating under\n" - .string "a glass dome.\p" - .string "Maybe it’s for measuring the depth\n" - .string "of something...$" + .string "Eine seltsame Vorrichtung rotiert unter\n" + .string "einer Glaskuppel.\p" + .string "Vielleicht misst sie die Tiefe von\n" + .string "irgendetwas...$" diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc b/data/text/maps/SlateportCity_OceanicMuseum_2F.inc index a3c624f0c..9f5c3eeab 100644 --- a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/text/maps/SlateportCity_OceanicMuseum_2F.inc @@ -1,176 +1,190 @@ SlateportCity_OceanicMuseum_2F_Text_17ECFD:: @ 817ECFD - .string "Yes? If you’re looking for STERN,\n" - .string "that would be me.\p" - .string "Ah! That must be the part I\n" - .string "ordered from MR. STONE of DEVON.\p" - .string "Thank you! That’s great!\n" - .string "We can prepare for our expedition now.$" + .string "Ja? Wenn du BRIGG suchst... Der\n" + .string "bin ich.\p" + .string "Ah! Das müssen die Stücke sein, die ich\n" + .string "bei MR. TRUMM von DEVON bestellt habe.\p" + .string "Danke schön! Das ist großartig!\n" + .string "Nun können wir unsere Expedition\l" + .string "vorbereiten.$" SlateportCity_OceanicMuseum_2F_Text_17EDAE:: @ 817EDAE - .string "Hehehe, hold it!\n" - .string "We’ll take those parts!$" + .string "Hähähähä! Wartet! Das ist doch viel zu\n" + .string "schwer für euch! Wir nehmen das an uns!$" SlateportCity_OceanicMuseum_2F_Text_17EDD7:: @ 817EDD7 - .string "CAPT. STERN: Wh-what?\n" - .string "Who are you people?$" + .string "KAPT. BRIGG: W... Was?\n" + .string "Wer seid ihr?$" SlateportCity_OceanicMuseum_2F_Text_17EE01:: @ 817EE01 - .string "We’re TEAM {EVIL_TEAM}!\p" - .string "Our BOSS wants those parts!\n" - .string "Shut your yap and fork them over!$" + .string "Wir sind TEAM {EVIL_TEAM}!\p" + .string "Unser BOSS will diese Dinge haben!\n" + .string "Also hört auf zu labern und lasst die\l" + .string "Teile rüberwachsen!$" SlateportCity_OceanicMuseum_2F_Text_17EE4E:: @ 817EE4E - .string "Awaaaah!\n" - .string "A kid beat me!$" + .string "Oooaaah!\n" + .string "Geschlagen von einem KIND!$" SlateportCity_OceanicMuseum_2F_Text_17EE66:: @ 817EE66 - .string "Oh, man, what a disaster...\n" - .string "The BOSS is going to be furious...$" + .string "Oh, Mann! Was für ein Desaster...\n" + .string "Der BOSS wird verdammt wütend sein...$" SlateportCity_OceanicMuseum_2F_Text_17EEA5:: @ 817EEA5 - .string "Humph, sniveling wimp!\n" - .string "Let me take care of this!$" + .string "Pah, du Waschlappen!\n" + .string "Ich werde das Ding schon schaukeln!$" SlateportCity_OceanicMuseum_2F_Text_17EED6:: @ 817EED6 - .string "What?!\n" - .string "I lost, too!$" + .string "Was?!?\n" + .string "Ich habe auch verloren?!?$" SlateportCity_OceanicMuseum_2F_Text_17EEEA:: @ 817EEEA - .string "Now what? If we don’t get the parts,\n" - .string "we’re in for it!\p" - .string "Arrgh, I didn’t count on being meddled\n" - .string "with by some meddling kid!$" + .string "Und nun? Wenn wir die Stücke nicht\n" + .string "bekommen, können wir uns auf etwas\l" + .string "gefasst machen!\p" + .string "Argh, ich hatte nicht damit gerechnet,\n" + .string "dass ein nervendes Kind meine Nerven\l" + .string "nervt.$" SlateportCity_OceanicMuseum_2F_Text_17EF62:: @ 817EF62 - .string "I came to see what was taking so\n" - .string "long to snatch some parts, and you\l" - .string "simps are held up by a mere child?$" + .string "Ich bin gekommen, um zu sehen, warum ihr\n" + .string "so lange braucht. Und was sehe ich? Ihr\l" + .string "Idioten lasst euch von einem kleinen\l" + .string "Kind die Suppe versalzen!$" SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9 - .string "I am TEAM AQUA’s ARCHIE.\p" - .string "Tell me, why do you meddle in the\n" - .string "noble affairs of TEAM AQUA?\p" - .string "POKéMON, people, all life depends on\n" - .string "the sea.\p" - .string "So, TEAM AQUA is dedicated to the\n" - .string "expansion of the sea.\p" - .string "Don’t you agree? What we are doing\n" - .string "is a magnificent undertaking.\p" - .string "Ah, fine...\n" - .string "You’re still too young.\p" - .string "It can’t be helped that you do not\n" - .string "understand our ideals.\p" - .string "But, if you ever oppose us again,\n" - .string "there will be consequences!\p" - .string "Heed my warning!\n" - .string "Farewell!$" + .string "Ich bin ADRIAN vom TEAM AQUA.\p" + .string "Kannst du mir verraten, warum du dich in\n" + .string "die ehrbaren Pläne von TEAM AQUA ein-\l" + .string "mischst?\p" + .string "POKéMON, Menschen - alles Leben\n" + .string "basiert auf den Kräften des Meeres.\p" + .string "Daher setzt TEAM AQUA sich für die\n" + .string "Ausweitung des Meeres ein.\p" + .string "Meinst du nicht auch, dass wir uns eine\n" + .string "großartige Aufgabe gestellt haben?\p" + .string "Mhm...\n" + .string "Du bist wahrscheinlich noch zu klein.\p" + .string "Du kannst unsere Ideale einfach noch\n" + .string "nicht verstehen.\p" + .string "Aber: Wenn du dich jemals wieder gegen\n" + .string "uns stellst, wirst du die Konsequenzen\l" + .string "zu spüren bekommen!\p" + .string "Das ist eine Warnung!\n" + .string "Leb wohl!$" SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E - .string "I am TEAM MAGMA’s MAXIE.\p" - .string "Why on earth do you feel compelled\n" - .string "to mess up TEAM MAGMA’s plans?\p" - .string "POKéMON, people, all life exists on land...\p" - .string "That’s why TEAM MAGMA is trying to\n" - .string "expand the world’s landmass.\p" - .string "Don’t you agree? What we are doing\n" - .string "is a magnificent undertaking.\p" - .string "Well, no matter...\n" - .string "You’re young.\p" - .string "Your inability to understand our\n" - .string "noble cause can’t be helped...\p" - .string "But, if you were to impede us ever\n" - .string "again, you’ll see no mercy from us!\p" - .string "Keep that firmly in mind!\n" - .string "Farewell!$" + .string "Ich bin MARC vom TEAM MAGMA.\p" + .string "Himmel noch mal! Warum mischst du dich in\n" + .string "die Pläne von TEAM MAGMA ein?\p" + .string "POKéMON, Menschen - alles lebt an Land...\p" + .string "Deshalb versucht TEAM MAGMA, die Land-\n" + .string "massen der Welt zu vergrößern.\p" + .string "Meinst du nicht auch, dass wir wirklich\n" + .string "etwas Großartiges vorhaben?\p" + .string "Nun, wie auch immer...\n" + .string "Du bist noch sehr jung.\p" + .string "Daher kannst du unsere noblen Ideale\n" + .string "noch nicht verstehen. Da kann man\l" + .string "nichts machen...\p" + .string "Aber, solltest du uns noch einmal in\n" + .string "die Quere kommen, werden wir keine\l" + .string "Rücksicht nehmen!\p" + .string "Das solltest du nicht vergessen!\n" + .string "Leb wohl!$" SlateportCity_OceanicMuseum_2F_Text_17F352:: @ 817F352 - .string "CAPT. STERN: You’re...\n" - .string "Ah, okay, you’re {PLAYER}{KUN}...\p" - .string "Anyway, that was a tense situation!\n" - .string "Thank you for saving us!\p" - .string "Oh, yes, I almost forgot that you\n" - .string "even brought the parts from DEVON!$" + .string "KAPT. BRIGG: Du bist...\n" + .string "Aah, du bist {PLAYER}{KUN}...\p" + .string "Wow, das war eine kritische Situation!\n" + .string "Danke, dass du uns gerettet hast!\p" + .string "Oh, fast hätte ich vergessen, dass du\n" + .string "uns die Teile von DEVON gebracht hast!$" UnknownString_817F404: @ 817F404 - .string "{PLAYER} handed over the DEVON GOODS\n" - .string "to CAPT. STERN.$" + .string "{PLAYER} gibt die DEVON-WAREN an\n" + .string "KAPT. BRIGG.$" SlateportCity_OceanicMuseum_2F_Text_17F433:: @ 817F433 - .string "CAPT. STERN: Whoops!\n" - .string "There’s no time to lose!\p" - .string "We have to set out on our ocean floor\n" - .string "expedition really soon.\p" - .string "Thanks, and excuse me!$" + .string "KAPT. BRIGG: Hoppla!\n" + .string "Wir dürfen keine Zeit mehr verlieren!\p" + .string "Wir müssen so schnell wie möglich zur Ex-\n" + .string "pedition zum Meeresgrund aufbrechen.\p" + .string "Danke! Und entschuldige mich nun!$" SlateportCity_OceanicMuseum_2F_Text_17F4B6:: @ 817F4B6 - .string "I saw a model of a ship here.\p" - .string "It reminded me of the ABANDONED SHIP\n" - .string "near DEWFORD TOWN...$" + .string "Ich habe hier ein Schiffsmodell\n" + .string "gesehen.\p" + .string "Es erinnert mich an das SCHIFFSWRACK\n" + .string "in der Nähe von FAUSTAUHAVEN...$" SlateportCity_OceanicMuseum_2F_Text_17F50E:: @ 817F50E - .string "Don’t you dare run around inside\n" - .string "the MUSEUM!$" + .string "Es ist strikt verboten, im MUSEUM\n" + .string "zu rennen!$" SlateportCity_OceanicMuseum_2F_Text_17F53B:: @ 817F53B - .string "Wow, the submarine’s awesome!\n" - .string "I want to go for a ride!$" + .string "Wow, das U-Boot ist der helle Wahnsinn!\n" + .string "Damit würde ich gerne auf Fahrt gehen!$" SlateportCity_OceanicMuseum_2F_Text_17F572:: @ 817F572 - .string "“KANTO WATER QUALITY SAMPLE,” the\n" - .string "label says.\p" - .string "The sea is all connected, but the\n" - .string "water seems to differ by region.$" + .string "“KANTO WASSERQUALITÄT”\n" + .string "steht auf dem Schild.\p" + .string "Das Meer ist grenzübergreifend, aber\n" + .string "das Wasser scheint in jeder Region eine\l" + .string "andere Qualität zu haben.$" SlateportCity_OceanicMuseum_2F_Text_17F5E3:: @ 817F5E3 - .string "“JOHTO WATER QUALITY SAMPLE,” the\n" - .string "label says.\p" - .string "Maybe the water’s saltiness differs\n" - .string "from one region to another...$" + .string "“JOHTO WASSERQUALITÄT”\n" + .string "steht auf dem Schild.\p" + .string "Anscheinend ist der Salzgehalt in jeder\n" + .string "Region anders.$" SlateportCity_OceanicMuseum_2F_Text_17F653:: @ 817F653 - .string "A rubber ball is expanding and shrinking.\p" - .string "“In the sea, the weight of water itself\n" - .string "exerts pressure.\p" - .string "“In shallow water, the pressure is not\n" - .string "very heavy.\p" - .string "“However, in extremely deep water,\n" - .string "the pressure can reach even tens of\l" - .string "thousands of tons on a small area.”$" + .string "Ein Gummiball wird größer und kleiner.\p" + .string "“Im Meer sorgt das Gewicht des Wassers\n" + .string "für ständigen Druck.\p" + .string "In seichtem Wasser ist der Druck nicht\n" + .string "sehr hoch.\p" + .string "In extrem tiefem Wasser kann der\n" + .string "Druck zehntausende von Tonnen inner-\l" + .string "halb eines kleinen Bereiches betragen.”$" SlateportCity_OceanicMuseum_2F_Text_17F754:: @ 817F754 - .string "“MODEL OF HOENN REGION”\p" - .string "It’s a miniature diorama of the\n" - .string "HOENN region.\p" - .string "Where is LITTLEROOT TOWN on this?$" + .string "“MODELL DER HOENN-REGION”\p" + .string "Ein Diorama der HOENN-Region.\p" + .string "Wo liegt hier WURZELHEIM?$" SlateportCity_OceanicMuseum_2F_Text_17F7BC:: @ 817F7BC - .string "It’s a display on the flow of seawater.\p" - .string "“Near the bottom of the sea, water\n" - .string "flows due to differences in such\l" - .string "factors as temperature and salinity.”$" + .string "Dies ist eine Anzeige der Meeres-\n" + .string "strömungen.\p" + .string "“In der Nähe des Meeresbodens sind die\n" + .string "Strömungen abhängig von Faktoren wie\l" + .string "Temperatur und Salzgehalt.”$" SlateportCity_OceanicMuseum_2F_Text_17F84E:: @ 817F84E - .string "It’s a display on the flow of\n" - .string "seawater.\p" - .string "“Toward the surface, seawater flows\n" - .string "as currents driven by the winds.”$" + .string "Dies ist eine Anzeige der Meeres-\n" + .string "strömungen.\p" + .string "“An der Oberfläche sind die Strömungen\n" + .string "abhängig vom Einfluss des Windes.”$" SlateportCity_OceanicMuseum_2F_Text_17F8BC:: @ 817F8BC - .string "“THE FERRY S.S. TIDAL\p" - .string "“A scale replica of the ship under\n" - .string "construction at STERN’S SHIPYARD.”$" + .string "“DIE FÄHRE MS TIDE”\p" + .string "“Ein maßstabsgetreues Modell eines\n" + .string "Schiffes unter Konstruktion in der\l" + .string "BRIGGWERFT.”$" SlateportCity_OceanicMuseum_2F_Text_17F918:: @ 817F918 - .string "“SUBMARINE EXPLORER 1\p" - .string "“A replica of the high-performance\n" - .string "ocean floor exploration submarine.”$" + .string "“TIEFSEE-FORSCHUNGSBOOT 1”\p" + .string "“Ein Replikat des Hochleistungs-\n" + .string "U-Bootes zur Erforschung des\l" + .string "Meeresbodens.”$" SlateportCity_OceanicMuseum_2F_Text_17F975:: @ 817F975 - .string "“SUBMERSIBLE POD\p" - .string "“A replica of a compact, unmanned\n" - .string "pod for seafloor exploration.”$" + .string "“TAUCHBOOT”\p" + .string "“Ein Replikat eines kompakten,\n" + .string "unbemannten Spezial-U-Bootes zur Er-\l" + .string "forschung des Meeresbodens.”$" SlateportCity_OceanicMuseum_2F_Text_17F9C7:: @ 817F9C7 - .string "“S.S. ANNE\p" - .string "“A replica of the luxury liner that\n" - .string "circles the globe.”$" + .string "“MS ANNE”\p" + .string "“Ein Replikat eines Luxusliners, der\n" + .string "um den Globus kreuzt.”$" diff --git a/data/text/maps/SlateportCity_PokemonCenter_1F.inc b/data/text/maps/SlateportCity_PokemonCenter_1F.inc index 2a87ffa93..291a0212d 100644 --- a/data/text/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/text/maps/SlateportCity_PokemonCenter_1F.inc @@ -1,13 +1,14 @@ SlateportCity_PokemonCenter_1F_Text_180602:: @ 8180602 - .string "Want a tip for battling?\p" - .string "I’d say it’s raising different kinds\n" - .string "of POKéMON in a balanced manner.\p" - .string "It’s no good to make just one\n" - .string "POKéMON strong.\p" - .string "If it has a type disadvantage, it\n" - .string "might not stand a chance.$" + .string "Möchtest du einen Tipp?\p" + .string "Ich sage dir, es ist wichtig, die unter-\n" + .string "schiedlichsten POKéMON zu trainieren.\p" + .string "Gleichmäßigkeit ist wichtig. Ein\n" + .string "einzelnes starkes POKéMON reicht nicht.\p" + .string "Wenn es vom Typ her Nachteile besitzt,\n" + .string "kann auch ein sehr starkes POKéMON\l" + .string "einen Kampf verlieren.$" SlateportCity_PokemonCenter_1F_Text_1806CB:: @ 81806CB - .string "I trade POKéMON with my friends.\p" - .string "If a traded POKéMON is holding an\n" - .string "item, it makes me twice as happy!$" + .string "Ich tausche mit Freunden POKéMON.\p" + .string "Und wenn ein getauschtes POKéMON ein\n" + .string "Item trägt, bin ich umso glücklicher!$" diff --git a/data/text/maps/SlateportCity_PokemonFanClub.inc b/data/text/maps/SlateportCity_PokemonFanClub.inc index eab516c2b..e3dfa27c8 100644 --- a/data/text/maps/SlateportCity_PokemonFanClub.inc +++ b/data/text/maps/SlateportCity_PokemonFanClub.inc @@ -1,131 +1,138 @@ SlateportCity_PokemonFanClub_Text_17D773:: @ 817D773 - .string "Er-hem! I am the CHAIRMAN of the\n" - .string "POKéMON FAN CLUB!\p" - .string "Being the CHAIRMAN, I am naturally\n" - .string "the most important!\p" - .string "No one could best me when it comes\n" - .string "to raising POKéMON. No one!\p" - .string "In any CONTEST, my victory is a\n" - .string "foregone conclusion!\p" - .string "But, that would deprive others of\n" - .string "their enjoyment.\p" - .string "So, I now while away my time\n" - .string "examining the POKéMON of others.\p" - .string "It is marvelous to witness how\n" - .string "others have raised POKéMON.\p" - .string "The contented faces of properly\n" - .string "raised POKéMON...\p" - .string "The kind and loving gazes of their\n" - .string "TRAINERS...\p" - .string "My heart is overwhelmed - there is\n" - .string "so much happiness.\p" - .string "Oh, my! Excuse me! I seem to have\n" - .string "nattered on far too long!\p" - .string "Please, do allow me to examine your\n" - .string "POKéMON and see how it’s grown.$" + .string "Äh-hm. Ich bin der VORSITZENDE des\n" + .string "POKéMON-FANCLUBS!\p" + .string "Als VORSITZENDER bin ich natürlich die\n" + .string "wichtigste Person hier!\p" + .string "Keiner kann mir im Umgang mit POKéMON\n" + .string "das Wasser reichen! Keiner!!!\p" + .string "Und in jedem WETTBEWERB bin ich\n" + .string "natürlich der Sieger!\p" + .string "Aber dadurch enthalte ich den anderen\n" + .string "ihr Vergnügen vor.\p" + .string "Und deshalb beschränke ich mich darauf,\n" + .string "die POKéMON der anderen zu beurteilen.\p" + .string "Es ist toll, zu sehen, wie andere ihre\n" + .string "POKéMON aufziehen.\p" + .string "Die zufriedenen Gesichter der POKéMON,\n" + .string "die gut behandelt werden...\p" + .string "Die fürsorgliche und liebevolle Art ihrer\n" + .string "Trainer...\p" + .string "Mein Herz geht über vor Freude - da\n" + .string "gibt es so viel Glück.\p" + .string "Oh je! Entschuldige, ich schwatze hier\n" + .string "die ganze Zeit vor mich hin!\p" + .string "Bitte, erlaube mir einen Blick auf deine\n" + .string "POKéMON. Wie sind sie gewachsen?$" SlateportCity_PokemonFanClub_Text_17DA14:: @ 817DA14 - .string "How is your POKéMON growing?\n" - .string "Allow me to examine it.$" + .string "Wie sehen deine POKéMON aus? Wie sind\n" + .string "sie gewachsen? Erlaube mir einen Blick!$" SlateportCity_PokemonFanClub_Text_17DA49:: @ 817DA49 .string "Hm, hm...\n" - .string "I see...$" + .string "Verstehe...$" SlateportCity_PokemonFanClub_Text_17DA5C:: @ 817DA5C - .string "Hmmm... It’s not bad, but it’s not\n" - .string "good, either...\p" - .string "You, the TRAINER, must put more\n" - .string "effort into raising this POKéMON!\p" - .string "For instance, may I suggest that\n" - .string "you give it more {POKEBLOCK}S?$" + .string "Hmmm... Das ist weder gut noch\n" + .string "schlecht...\p" + .string "Du bist der TRAINER. Streng dich bei der\n" + .string "Aufzucht dieses POKéMON mehr an!\p" + .string "Dürfte ich vorschlagen, ihm mehr\n" + .string "{POKEBLOCK} zu geben?$" SlateportCity_PokemonFanClub_Text_17DB0B:: @ 817DB0B - .string "Oh, my...\p" - .string "Your POKéMON is growing quite well,\n" - .string "so you deserve a reward.\p" - .string "Unfortunately, you have no space for\n" - .string "this in your BAG.$" + .string "Oh, hey...\p" + .string "Dein POKéMON macht einen guten Ein-\n" + .string "druck. Ich möchte dir eine Belohnung\l" + .string "geben.\p" + .string "Leider hast du in deinem BEUTEL nicht\n" + .string "mehr genügend Platz.$" SlateportCity_PokemonFanClub_Text_17DB89:: @ 817DB89 - .string "Your {STR_VAR_1}, it is growing in\n" - .string "a most impressive manner!\l" - .string "It is one fine specimen!\p" - .string "But! If you were to give it this,\n" - .string "it would grow even better! Indeed!$" + .string "Dein {STR_VAR_1} ist wirklich sehr\n" + .string "beeindruckend! Das ist wirklich ein\l" + .string "wunderbares Exemplar!\p" + .string "Und wenn du ihm dies gibst, wird\n" + .string "es noch besser wachsen! Wirklich!$" SlateportCity_PokemonFanClub_Text_17DC1B:: @ 817DC1B - .string "Let a POKéMON hold that RED SCARF.\p" - .string "Everyone will recognize the coolness\n" - .string "of that POKéMON!$" + .string "Lass ein POKéMON einen ROTEN SCHAL\n" + .string "tragen.\p" + .string "Dadurch wird die Coolness deines\n" + .string "POKéMON unübersehbar!$" SlateportCity_PokemonFanClub_Text_17DC74:: @ 817DC74 - .string "Let a POKéMON hold that BLUE SCARF.\p" - .string "Its beauty will be accentuated much\n" - .string "more than now!$" + .string "Lass ein POKéMON einen BLAUEN SCHAL\n" + .string "tragen.\p" + .string "Dadurch wird die Schönheit deines\n" + .string "POKéMON unübersehbar!$" SlateportCity_PokemonFanClub_Text_17DCCB:: @ 817DCCB - .string "Let a POKéMON hold that PINK SCARF.\p" - .string "It will draw out the cuteness of\n" - .string "the POKéMON some more!$" + .string "Lass ein POKéMON einen ROSA SCHAL\n" + .string "tragen.\p" + .string "Dadurch wird die Anmut deines\n" + .string "POKéMON unübersehbar!$" SlateportCity_PokemonFanClub_Text_17DD27:: @ 817DD27 - .string "Let a POKéMON hold that GREEN SCARF.\p" - .string "That will enhance the\n" - .string "smartness of POKéMON!$" + .string "Lass ein POKéMON einen GRÜNEN SCHAL\n" + .string "tragen.\p" + .string "Dadurch wird die Klugheit deines\n" + .string "POKéMON unübersehbar!$" SlateportCity_PokemonFanClub_Text_17DD78:: @ 817DD78 - .string "Let a POKéMON hold that YELLOW SCARF.\p" - .string "It will bolster your POKéMON’s\n" - .string "toughness so much more!$" + .string "Lass ein POKéMON einen GELBEN SCHAL\n" + .string "tragen.\p" + .string "Dadurch wird die Stärke deines\n" + .string "POKéMON unübersehbar!$" SlateportCity_PokemonFanClub_Text_17DDD5:: @ 817DDD5 - .string "I’m sorry, but I’ve nothing else to\n" - .string "give you! None at all!\p" - .string "After all, you’re blessed with the gift\n" - .string "of raising POKéMON without resorting\l" - .string "to any items!$" + .string "Tut mir Leid, mehr kann ich dir leider\n" + .string "nicht geben! Ich habe nichts mehr!\p" + .string "Aber du besitzt etwas viel Wertvolleres:\n" + .string "Das Talent, POKéMON ohne Zuhilfenahme\l" + .string "von Items perfekt aufzuziehen!$" SlateportCity_PokemonFanClub_Text_17DE6B:: @ 817DE6B - .string "I love seeing POKéMON that love\n" - .string "their TRAINERS.\p" - .string "POKéMON are very sensitive to the\n" - .string "feelings of their TRAINERS.\p" - .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.\p" - .string "When your POKéMON grow to love you,\n" - .string "please come show me.$" + .string "Ich freue mich immer, POKéMON zu sehen,\n" + .string "die ihre TRAINER lieben.\p" + .string "POKéMON haben ein sensibles Gespür\n" + .string "für die Gefühle ihrer TRAINER.\p" + .string "Wenn du einem POKéMON Liebe und\n" + .string "Achtung entgegenbringst, werden die\l" + .string "Gefühle erwidert.\p" + .string "Sobald dein POKéMON dich liebt, komm und\n" + .string "besuche mich nochmals.$" SlateportCity_PokemonFanClub_Text_17DF57:: @ 817DF57 - .string "Your POKéMON really adores you.\p" - .string "For you, a most compassionate\n" - .string "TRAINER, a gift from the FAN CLUB!$" + .string "Dein POKéMON betet dich geradezu an.\p" + .string "Für einen so mitfühlenden TRAINER\n" + .string "hat der FANCLUB ein Geschenk!$" SlateportCity_PokemonFanClub_Text_17DFB8:: @ 817DFB8 - .string "POKéMON are very sensitive to the\n" - .string "feelings of their TRAINERS.\p" - .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.$" + .string "POKéMON haben ein sensibles Gespür\n" + .string "für die Gefühle ihrer TRAINER.\p" + .string "Wenn du einem POKéMON Liebe und\n" + .string "Achtung entgegenbringst, werden die\l" + .string "Gefühle erwidert.$" SlateportCity_PokemonFanClub_Text_17E03B:: @ 817E03B - .string "If you keep letting a POKéMON faint\n" - .string "in battle, it’ll come to resent it.\p" - .string "Soon, it will become less trusting\n" - .string "of the TRAINER.\p" - .string "In other words, it certainly won’t\n" - .string "like you very much.$" + .string "Wenn ein POKéMON in einem Kampf besiegt\n" + .string "wird, nimmt es das übel.\p" + .string "Und bald wird es dem TRAINER weniger\n" + .string "Vertrauen schenken.\p" + .string "Mit anderen Worten: Es wird dich nicht\n" + .string "mehr so sehr mögen.$" SlateportCity_PokemonFanClub_Text_17E0ED:: @ 817E0ED - .string "Do POKéMON enjoy having items used\n" - .string "on them?\p" - .string "Mine acted really happy when I gave\n" - .string "it some PROTEIN.$" + .string "Mögen POKéMON Items?\p" + .string "Mein POKéMON hat sich sehr gefreut,\n" + .string "als ich ihm PROTEIN gegeben habe.$" SlateportCity_PokemonFanClub_Text_17E14E:: @ 817E14E - .string "SKITTY: Fffnyaaaah...$" + .string "ENECO: Fffnyaaaah...$" SlateportCity_PokemonFanClub_Text_17E164:: @ 817E164 - .string "ZIGZAGOON: Kyuuu...$" + .string "ZIGZACHS: Kyuuu...$" SlateportCity_PokemonFanClub_Text_17E178:: @ 817E178 .string "AZUMARILL: Marimari?$" diff --git a/data/text/maps/SlateportCity_SternsShipyard_1F.inc b/data/text/maps/SlateportCity_SternsShipyard_1F.inc index 8a08a15ae..d38e4b7ae 100644 --- a/data/text/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/text/maps/SlateportCity_SternsShipyard_1F.inc @@ -1,79 +1,80 @@ SlateportCity_SternsShipyard_1F_Text_17C14B:: @ 817C14B - .string "Umm... If this goes here, and that\n" - .string "goes over there...\p" - .string "Then where does this thing go?\n" - .string "And what about that doohickey?\p" - .string "Aaargh! I can’t make heads or tails\n" - .string "of this!$" + .string "Ähmm... Wenn das hierhin gehört und das\n" + .string "dahin...\p" + .string "Wo gehört dieses dann hin?\n" + .string "Und was ist mit diesem Dingsbums?\p" + .string "Aaargh! Ich werde daraus einfach nicht\n" + .string "schlau!$" SlateportCity_SternsShipyard_1F_Text_17C1EC:: @ 817C1EC .string "Hm?\n" - .string "Hi, I’m DOCK.\p" - .string "CAPT. STERN commissioned me to\n" - .string "design a ferry.\p" - .string "Oh! That there...\n" - .string "Are they DEVON GOODS?\p" - .string "But, hmm...\n" - .string "This won’t do...\p" - .string "CAPT. STERN went off somewhere.\n" - .string "He said he had some work to do.\p" - .string "Could I get you to go find CAPT.\n" - .string "STERN and deliver that to him?$" + .string "Hallo, ich bin BOOTMAR.\p" + .string "KAPT. BRIGG hat mich damit\n" + .string "beauftragt, eine Fähre zu konstruieren.\p" + .string "Oh! Das da...\n" + .string "Sind das DEVON-WAREN?\p" + .string "Aber, ähm... Das ist ein ungünstiger\n" + .string "Zeitpunkt...\p" + .string "KAPT. BRIGG ist irgendwohin ge-\n" + .string "gangen. Er sagte, er müsse was\l" + .string "erledigen.\p" + .string "Kann ich dich bitten, KAPT. BRIGG zu\n" + .string "suchen und ihm das Paket zu bringen?$" SlateportCity_SternsShipyard_1F_Text_17C2F2:: @ 817C2F2 - .string "DOCK: Where could CAPT. STERN have\n" - .string "gone off to?\p" - .string "Could you go find CAPT. STERN and\n" - .string "deliver that parcel to him?$" + .string "BOOTMAR: Wo könnte KAPT. BRIGG wohl\n" + .string "hingegangen sein?\p" + .string "Kannst du bitte KAPT. BRIGG suchen und\n" + .string "ihm die Waren übergeben?$" SlateportCity_SternsShipyard_1F_Text_17C360:: @ 817C360 - .string "DOCK: Shipbuilding is an art.\p" - .string "A lot of things can’t be figured out\n" - .string "just by calculating.\p" - .string "I really could use advice from a veteran\n" - .string "who knows the seas...$" + .string "BOOTMAR: Der Schiffsbau ist eine Kunst.\p" + .string "Manche Dinge lassen sich auch durch\n" + .string "Berechnungen nicht vorhersehen.\p" + .string "Jemand, der das Meer kennt wie seine\n" + .string "Westentasche, müsste mir helfen...$" SlateportCity_SternsShipyard_1F_Text_17C3F7:: @ 817C3F7 - .string "DOCK: Hi! MR. BRINEY’s joined us to\n" - .string "lend us his help.\p" - .string "Thanks to the veteran sailor, the\n" - .string "ferry is steadily coming together.$" + .string "BOOTMAR: Hallo! MR. BRACK hat sich bereit\n" + .string "erklärt, uns zu helfen.\p" + .string "Dank dieses erfahrenen Seemannes\n" + .string "kommen wir zügig voran.$" SlateportCity_SternsShipyard_1F_Text_17C472:: @ 817C472 - .string "DOCK: The ferry is finally ready!\p" - .string "The new S.S. TIDAL is truly a marvel\n" - .string "of technology!\p" - .string "But, I get the feeling that we can\n" - .string "make something even better.\p" - .string "You know, there’s never an end to\n" - .string "technology’s march.$" + .string "BOOTMAR: Die Fähre ist bald fertig!\p" + .string "Die neue MS TIDE ist ein wahres\n" + .string "Technikwunder!\p" + .string "Aber ich denke doch, dass wir noch\n" + .string "einiges besser machen können.\p" + .string "Weißt du, die technische Entwicklung\n" + .string "wird niemals abgeschlossen sein.$" SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D - .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" - .string "It’s been too long!\p" - .string "Aye, since I met you, this old seadog’s\n" - .string "been feeling frisky!\p" - .string "So I’ve decided to help DOCK make a\n" - .string "ferry.\p" - .string "Aye, after all, a ferry would be able\n" - .string "to carry a lot of people.\p" - .string "But, you know, that DOCK is really\n" - .string "something special.\p" - .string "With his knack for technology and\n" - .string "my experience, I’m sure that we can\l" - .string "build one great ship, aye!$" + .string "MR. BRACK: Ah, {PLAYER}{KUN}!\n" + .string "Es ist schon lange her!\p" + .string "Aye, seit ich dich kennen gelernt habe,\n" + .string "bin ich wieder voller Tatendrang.\p" + .string "Also habe ich mich entschlossen,\n" + .string "BOOTMAR beim Bau der Fähre zu helfen.\p" + .string "Aye, so wie es aussieht, wird die Fähre\n" + .string "viele Passagiere befördern können.\p" + .string "Aber, weißt du, BOOTMAR ist wirklich\n" + .string "eine besondere Persönlichkeit.\p" + .string "Mit seinem technischen Wissen und\n" + .string "meiner Erfahrung auf See werden wir\l" + .string "ein ganz besonderes Schiff bauen, aye.$" UnknownString_817C6A6: @ 817C6A6 - .string "PEEKO: Pii piihyoro!$" + .string "PECKO: Pii piihyoro!$" SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB - .string "The seasons, the weather, where the\n" - .string "moon sits in the sky...\p" - .string "These and other conditions make the\n" - .string "sea change its expression.\p" - .string "That’s right!\n" - .string "The sea is like a living thing!$" + .string "Die Jahreszeit, das Wetter, der Mond,\n" + .string "der vom Himmel herabstrahlt...\p" + .string "Das sind die Bedingungen, die die See\n" + .string "so wechselhaft machen.\p" + .string "Ganz genau!\n" + .string "Die See ist wie ein lebendiges Wesen!$" SlateportCity_SternsShipyard_1F_Text_17C764:: @ 817C764 - .string "I get seasick real easily.\n" - .string "So I get to help out here instead.$" + .string "Ich werde sehr schnell seekrank.\n" + .string "Deshalb helfe ich lieber hier aus.$" diff --git a/data/text/maps/SlateportCity_SternsShipyard_2F.inc b/data/text/maps/SlateportCity_SternsShipyard_2F.inc index 0bf4e27e0..d2a0dbd4c 100644 --- a/data/text/maps/SlateportCity_SternsShipyard_2F.inc +++ b/data/text/maps/SlateportCity_SternsShipyard_2F.inc @@ -1,18 +1,19 @@ SlateportCity_SternsShipyard_2F_Text_17C7A2:: @ 817C7A2 - .string "Designing a large ship is more like\n" - .string "making a big building than putting\l" - .string "together a transportation vehicle.$" + .string "Die Konstruktion eines großen Schiffes\n" + .string "ist eher vergleichbar mit der eines\l" + .string "Gebäudes, als eines Transportmittels.$" SlateportCity_SternsShipyard_2F_Text_17C80C:: @ 817C80C - .string "Don’t you think it’s strange that a\n" - .string "ship made of heavy iron floats?\p" - .string "It floats because of a principle\n" - .string "called buoyancy.$" + .string "Findest du es nicht auch seltsam, dass\n" + .string "ein Schiff aus Eisen gebaut wird?\p" + .string "Es schwimmt aufgrund des so genannten\n" + .string "Auftriebs.$" UnknownString_817C882: @ 817C882 - .string "The sea between SLATEPORT and\n" - .string "PACIFIDLOG has a fast-running tide.\p" - .string "Ordinary ships can’t make headway\n" - .string "through there.\p" - .string "You’d need substantial propulsion\n" - .string "to plow through those waters...$" + .string "Die See zwischen GRAPHITPORT CITY und\n" + .string "FLOSSBRUNN hat einen starken Ge- \l" + .string "zeitenwechsel.\p" + .string "Normale Schiffe können dort nicht\n" + .string "fahren.\p" + .string "Man braucht einen starken Antrieb,\n" + .string "um diese Wasser befahren zu können...$" diff --git a/data/text/maps/SootopolisCity.inc b/data/text/maps/SootopolisCity.inc index cc89d86bd..7ae79d654 100644 --- a/data/text/maps/SootopolisCity.inc +++ b/data/text/maps/SootopolisCity.inc @@ -1,215 +1,222 @@ ClosedSootopolisGymDoorText: @ 8169690 - .string "The door is closed.$" + .string "Die Tür ist zu.$" SootopolisCity_Text_1696A4:: @ 81696A4 - .string "Who might you be?\p" - .string "This is the CAVE OF ORIGIN.\p" - .string "The spirits of POKéMON, becalmed at\n" - .string "MT. PYRE, are said to be revived here.\p" - .string "Please leave.$" + .string "Wer bist du denn wohl?\p" + .string "Dies ist die URZEITHÖHLE.\p" + .string "Die Geister der POKéMON, zur Ruhe\n" + .string "gebettet am PYROBERG, erwachen\l" + .string "hier zum Leben, sagt man.\p" + .string "Bitte verlasse diesen Ort.$" SootopolisCity_Text_16972B:: @ 816972B - .string "Diving in the sea. Climbing up and\n" - .string "down stairs all the time...\p" - .string "If you live in this town, you end up\n" - .string "getting physically fit.$" + .string "Im Meer tauchen. Treppenstufen auf und\n" + .string "ab rennen...\p" + .string "Wenn du in diesem Ort lebst, wirst du\n" + .string "körperlich fit.$" SootopolisCity_Text_1697A7:: @ 81697A7 - .string "I... I’ve never been out of this city.\p" - .string "I wonder what the world is like on the\n" - .string "other side of this round sky?$" + .string "Ich... Ich war noch nie außerhalb der\n" + .string "Stadt.\p" + .string "Ich frage mich, wie die Welt hinter\n" + .string "diesem Horizont aussieht?$" SootopolisCity_Text_169813:: @ 8169813 - .string "Hm!\n" - .string "You’ve come all the way to SOOTOPOLIS?\l" - .string "You’re no ordinary tourist.\p" - .string "But I suppose that doesn’t make you an\n" - .string "extraordinary tourist, either.$" + .string "Hm! Du bist den ganzen Weg nach\n" + .string "XENEROVILLE gekommen? Du bist\l" + .string "kein normaler Tourist.\p" + .string "Aber das macht dich auch nicht zu einem\n" + .string "außergewöhnlichen Touristen.$" SootopolisCity_Text_1698A0:: @ 81698A0 - .string "SOOTOPOLIS sprang up as a town in the\n" - .string "crater of a volcano.\p" - .string "If you look up at the sky, the lip of\n" - .string "the crater is also visible.\l" - .string "So, all you see is the sky in a circle.\p" - .string "But that’s what makes the sky above\n" - .string "SOOTOPOLIS the most beautiful.$" + .string "XENEROVILLE entwickelte sich im Krater\n" + .string "eines Vulkans.\p" + .string "Wenn du in den Himmel schaust, kannst\n" + .string "du den Rand des Kraters über dir\l" + .string "erkennen. Der Himmel wird zum Kreis.\p" + .string "Aber das macht den Himmel über\n" + .string "XENEROVILLE zum schönsten Himmel.$" SootopolisCity_Text_169988:: @ 8169988 - .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" - .string "In this terrible rainstorm, yet...\p" - .string "Oh, yes, can you hear out what my\n" - .string "friend has to say?$" + .string "TROY: {PLAYER}{KUN}, du bist auch hier?\n" + .string "Bei diesem schrecklichen Regen...\p" + .string "Oh, ja, kannst du verstehen, was mein\n" + .string "Freund gerade sagt?$" SootopolisCity_Text_1699FD:: @ 81699FD - .string "My name is WALLACE.\n" - .string "I’m this town’s GYM LEADER.\p" - .string "I’ve also been entrusted with the\n" - .string "protection of the CAVE OF ORIGIN.\p" - .string "This downpour is caused by a power\n" - .string "emanating from the CAVE OF ORIGIN.$" + .string "Mein Name ist WASSILI.\n" + .string "Ich bin der hiesige ARENALEITER.\p" + .string "Ich bin auch damit beauftragt, die\n" + .string "URZEITHÖHLE zu schützen.\p" + .string "Diese Regenschauer werden durch eine\n" + .string "Kraft in der Höhle verursacht.$" SootopolisCity_Text_169AB7:: @ 8169AB7 - .string "That... That is the BLUE ORB.\p" - .string "I see.\n" - .string "Follow me.$" + .string "Das... Das ist die BLAUE KUGEL.\p" + .string "Ich verstehe.\n" + .string "Folge mir.$" SootopolisCity_Text_169AE7:: @ 8169AE7 - .string "STEVEN: This rain...\p" - .string "People and POKéMON need water to live...\p" - .string "But why does this rain fill us with\n" - .string "so much dread?\p" - .string "The rain clouds over SOOTOPOLIS will\n" - .string "keep building and soon extend all\l" - .string "over HOENN...\p" - .string "If that were to happen...$" + .string "TROY: Dieser Regen...\p" + .string "Menschen und POKéMON brauchen\n" + .string "Wasser zum Leben...\p" + .string "Aber warum verursacht dieser Regen\n" + .string "so viele Probleme?\p" + .string "Immer mehr Regenwolken werden sich\n" + .string "über XENEROVILLE bilden und sich über\l" + .string "die ganze HOENN-Region ausbreiten.$" SootopolisCity_Text_169BC7:: @ 8169BC7 - .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" - .string "No one from SOOTOPOLIS is permitted\n" - .string "to enter the CAVE OF ORIGIN.\p" - .string "But you must go.\n" - .string "Together with your BLUE ORB.\p" - .string "You must go regardless of what awaits\n" - .string "you inside the CAVE...$" + .string "WASSILI: Die URZEITHÖHLE ist dort\n" + .string "drüben.\p" + .string "Niemandem in XENEROVILLE ist es\n" + .string "erlaubt, die URZEITHÖHLE zu betreten.\p" + .string "Aber du musst hineingehen.\n" + .string "Zusammen mit der BLAUEN KUGEL.\p" + .string "Du musst gehen, egal was dich im Inneren\n" + .string "der Höhle erwartet...$" SootopolisCity_Text_169C99:: @ 8169C99 - .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" - .string "to be holding the BLUE ORB.\p" - .string "You’ll be okay. With your POKéMON,\n" - .string "you’ll get things done no matter what.\p" - .string "I’m convinced of it!$" + .string "TROY: {PLAYER}{KUN}, ich hätte nie ver-\n" + .string "mutet, dass du die BLAUE KUGEL bei dir\l" + .string "hast.\p" + .string "Dir wird nichts passieren. Mit deinen\n" + .string "POKéMON an deiner Seite schaffst du es.\p" + .string "Davon bin ich überzeugt!$" SootopolisCity_Text_169D37:: @ 8169D37 - .string "WALLACE: You must go together with\n" - .string "your BLUE ORB.\p" - .string "You must go regardless of what awaits\n" - .string "you inside the CAVE...$" + .string "WASSILI: Du musst deine BLAUE KUGEL\n" + .string "mitnehmen.\p" + .string "Du musst gehen, egal was dich im Inneren\n" + .string "der HÖHLE erwartet...$" SootopolisCity_Text_169DA6:: @ 8169DA6 - .string "STEVEN: You’ll be okay. With your\n" - .string "POKéMON, you’ll get things done\l" - .string "whatever happens.\p" - .string "I’m convinced of it!$" + .string "TROY: Dir wird nichts passieren.\n" + .string "Mit deinen POKéMON an deiner Seite\l" + .string "schaffst du es.\p" + .string "Davon bin ich überzeugt!$" SootopolisCity_Text_169E0F:: @ 8169E0F - .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" - .string "Under this scorching sun, yet...\p" - .string "Oh, yes, can you hear out what my\n" - .string "friend has to say?$" + .string "TROY: {PLAYER}{KUN}, du bist auch hier?\n" + .string "Bei diesem heißen Sonnenschein...\p" + .string "Oh, ja, kannst du verstehen, was mein\n" + .string "Freund gerade sagt?$" SootopolisCity_Text_169E82:: @ 8169E82 - .string "My name is WALLACE.\n" - .string "I’m this town’s GYM LEADER.\p" - .string "I’ve also been entrusted with the\n" - .string "protection of the CAVE OF ORIGIN.\p" - .string "This sunshine is caused by a power\n" - .string "emanating from the CAVE OF ORIGIN.$" + .string "Mein Name ist WASSILI.\n" + .string "Ich bin der hiesige ARENALEITER.\p" + .string "Ich bin auch damit beauftragt, die\n" + .string "URZEITHÖHLE zu schützen.\p" + .string "Dieser Sonnenschein wird durch eine\n" + .string "Kraft in der Höhle verursacht.$" SootopolisCity_Text_169F3C:: @ 8169F3C - .string "That... That is the RED ORB.\p" - .string "I see.\n" - .string "Follow me.$" + .string "Das... Das ist die ROTE KUGEL.\p" + .string "Ich verstehe.\n" + .string "Folge mir.$" SootopolisCity_Text_169F6B:: @ 8169F6B - .string "STEVEN: This sunlight...\p" - .string "People and POKéMON need sunlight\n" - .string "to live...\p" - .string "But why does this sunlight fill us\n" - .string "with so much dread?\p" - .string "The blazing sun over SOOTOPOLIS is\n" - .string "intensifying... Soon, all of HOENN\l" - .string "will be under its withering glare...\p" - .string "If that were to happen...$" + .string "TROY: Dieser Sonnenschein...\p" + .string "Menschen und POKéMON brauchen\n" + .string "Sonnenlicht zum Leben...\p" + .string "Aber warum verursacht dieses Licht\n" + .string "so viele Probleme?\p" + .string "Die Sonnenstrahlen über XENEROVILLE\n" + .string "werden immer intensiver und bald\l" + .string "wird es in ganz HOENN zu heiß.\p" + .string "Und wenn das passiert...$" SootopolisCity_Text_16A06C:: @ 816A06C - .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" - .string "No one from SOOTOPOLIS is permitted\n" - .string "to enter the CAVE OF ORIGIN.\p" - .string "But you must go. \n" - .string "Together with your RED ORB.\p" - .string "You must go regardless of what awaits\n" - .string "you inside the CAVE...$" + .string "WASSILI: Die URZEITHÖHLE ist dort\n" + .string "drüben.\p" + .string "Niemandem in XENEROVILLE ist es\n" + .string "erlaubt, die URZEITHÖHLE zu betreten.\p" + .string "Aber du musst hineingehen.\n" + .string "Zusammen mit der ROTEN KUGEL.\p" + .string "Du musst gehen, egal was dich im Inneren\n" + .string "der Höhle erwartet...$" SootopolisCity_Text_16A13E:: @ 816A13E - .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" - .string "to be holding the RED ORB.\p" - .string "You’ll be okay. With your POKéMON,\n" - .string "you’ll get things done no matter what.\p" - .string "I’m convinced of it!$" + .string "TROY: {PLAYER}{KUN}, ich hätte nie ver-\n" + .string "mutet, dass du die ROTE KUGEL bei dir\l" + .string "hast.\p" + .string "Dir wird nichts passieren. Mit deinen\n" + .string "POKéMON an deiner Seite schaffst du es.\p" + .string "Davon bin ich überzeugt!$" SootopolisCity_Text_16A1DB:: @ 816A1DB - .string "WALLACE: You must go together with\n" - .string "your RED ORB.\p" - .string "You must go regardless of what awaits\n" - .string "you inside the CAVE...$" + .string "WASSILI: Du musst deine ROTE KUGEL\n" + .string "mitnehmen.\p" + .string "Du musst gehen, egal was dich im Inneren\n" + .string "der Höhle erwartet...$" SootopolisCity_Text_16A249:: @ 816A249 - .string "STEVEN: You’ll be okay. With your\n" - .string "POKéMON, you’ll get things done\l" - .string "whatever happens.\p" - .string "I’m convinced of it!$" + .string "TROY: Dir wird nichts passieren. Mit\n" + .string "deinen POKéMON an deiner Seite\l" + .string "schaffst du es.\p" + .string "Davon bin ich überzeugt!$" SootopolisCity_Text_16A2B2:: @ 816A2B2 - .string "The legend told by the old man on\n" - .string "MT. PYRE... It wasn’t a made-up story.$" + .string "Die Legende, die der alte Mann am PYRO-\n" + .string "BERG erzählt hat... war kein Märchen.$" SootopolisCity_Text_16A2FB:: @ 816A2FB - .string "The natural balance of HOENN is going\n" - .string "through a wrenching shift...$" + .string "Das natürliche Gleichgewicht von HOENN\n" + .string "verändert sich dramatisch...$" SootopolisCity_Text_16A33E:: @ 816A33E - .string "STEVEN: {PLAYER}{KUN}, we owe it all to you.\p" - .string "The sky above SOOTOPOLIS has returned\n" - .string "to normal. For that, WALLACE sends his\l" - .string "thanks, too.\p" - .string "And, that same WALLACE is waiting for\n" - .string "you inside.\p" - .string "He’s strong.\n" - .string "But the way you are now, you should be\l" - .string "on equal footing with him.\p" - .string "Give it your best shot.$" + .string "TROY: {PLAYER}{KUN}, dir verdanken\n" + .string "wir alles.\p" + .string "Der Himmel über XENEROVILLE ist\n" + .string "wieder normal. Dafür dankt dir auch\l" + .string "WASSILI.\p" + .string "Und genau dieser WASSILI\n" + .string "erwartet dich dort drinnen.\p" + .string "Er ist stark. Aber auf dem Weg, auf dem\n" + .string "du dich jetzt befindest, solltest du\l" + .string "keine Probleme haben, ihn zu besiegen.\p" + .string "Gib dein Bestes.$" SootopolisCity_Text_16A455:: @ 816A455 - .string "All life starts at the CAVE OF ORIGIN,\n" - .string "and it all ends on MT. PYRE...\p" - .string "Where do people and POKéMON come\n" - .string "from? Where are we bound?$" + .string "Alles Leben beginnt in der URZEITHÖHLE\n" + .string "und endet am PYROBERG...\p" + .string "Woher kommen die Menschen und\n" + .string "POKéMON? Wohin gehen wir?$" SootopolisCity_Text_16A4D6:: @ 816A4D6 - .string "Let me guess, you’re going to challenge\n" - .string "WALLACE?\p" - .string "Oh, you are really?\n" - .string "You’re awfully brave!$" + .string "Lass mich raten! Du wirst WASSILI\n" + .string "herausfordern?!?\p" + .string "Wirklich?\n" + .string "Du bist wirklich mutig!$" SootopolisCity_Text_16A531:: @ 816A531 - .string "Let me guess, you’ve beaten WALLACE!\n" - .string "Oh, you did, really?\p" - .string "Maybe I’ll become your fan!$" + .string "Lass mich raten! Du hast WASSILI\n" + .string "besiegt!?! Wirklich!?!\p" + .string "Dann werde ich vielleicht dein Fan!$" SootopolisCity_Text_16A587:: @ 816A587 - .string "Hm!\n" - .string "You’ve come all the way to SOOTOPOLIS?\l" - .string "You’re no ordinary tourist.\p" - .string "But I suppose that doesn’t make you an\n" - .string "extraordinary tourist, either.$" + .string "Hm! Du bist den ganzen Weg nach\n" + .string "XENEROVILLE gekommen? Du bist\l" + .string "kein gewöhnlicher Tourist.\p" + .string "Aber das macht dich auch nicht zu einem\n" + .string "außergewöhnlichen Touristen.$" SootopolisCity_Text_16A614:: @ 816A614 - .string "A circle of a night sky framed by the\n" - .string "crater of a volcano...\p" - .string "And in that ring, stars flicker and\n" - .string "blink as if they were alive...\l" - .string "It’s my favorite scenery.$" + .string "Ein Stück des Nachthimmels, umgeben\n" + .string "vom Rund des Vulkankraters...\p" + .string "Und in diesem runden Stück Himmel\n" + .string "strahlen und blinken die Sterne, als\l" + .string "wären sie lebendig. Ich liebe das...$" SootopolisCity_Text_16A6AE:: @ 816A6AE - .string "Hunh? Where is my house?$" + .string "Huch! Wo ist mein Haus?$" SootopolisCity_Text_16A6C7:: @ 816A6C7 - .string "SOOTOPOLIS CITY POKéMON GYM\n" - .string "LEADER: WALLACE\p" - .string "“Artist, and lover of WATER.”$" + .string "POKéMON ARENA von XENEROVILLE\n" + .string "LEITER: WASSILI\p" + .string "“Künstler und Liebhaber des WASSERS.”$" SootopolisCity_Text_16A711:: @ 816A711 - .string "SOOTOPOLIS CITY\p" - .string "“The mystical city where history\n" - .string "slumbers.”$" + .string "XENEROVILLE\p" + .string "“Die mystische Stadt, in der die\n" + .string "Geschichte stillsteht.”$" diff --git a/data/text/maps/SootopolisCity_Gym_1F.inc b/data/text/maps/SootopolisCity_Gym_1F.inc index 1047a5326..3216ea0c9 100644 --- a/data/text/maps/SootopolisCity_Gym_1F.inc +++ b/data/text/maps/SootopolisCity_Gym_1F.inc @@ -1,192 +1,194 @@ SootopolisCity_Gym_1F_Text_18E8A5:: @ 818E8A5 - .string "Yo! How’s it going, CHAMPION-\n" - .string "bound {PLAYER}?\p" - .string "SOOTOPOLIS’s GYM LEADER WALLACE is\n" - .string "a master of WATER-type POKéMON.\p" - .string "And, to get to WALLACE, an icy floor\n" - .string "will hamper your progress...\p" - .string "Listen, I’m sorry, but that’s all the\n" - .string "advice that I have for you.\p" - .string "The rest of the way, you have to\n" - .string "go for it yourself!$" + .string "Na, wie sieht es aus, auf dem Weg zum\n" + .string "CHAMP, {PLAYER}?\p" + .string "ARENALEITER WASSILI in XENEROVILLE\n" + .string "ist der Meister der WASSER-POKéMON.\p" + .string "Und auf dem Weg zu ihm wirst du auf\n" + .string "gefrorenem Boden ins Rutschen kommen.\p" + .string "Tut mir Leid, aber mehr kann ich dir dazu\n" + .string "auch nicht sagen.\p" + .string "Den Rest des Weges musst du alleine\n" + .string "meistern.$" SootopolisCity_Gym_1F_Text_18E9C9:: @ 818E9C9 - .string "Yow! You’ve beaten even WALLACE, who\n" - .string "was supposedly the best in all HOENN!\p" - .string "Okay! Check out your TRAINER’s CARD.\p" - .string "If you’ve gotten all the BADGES, you’re\n" - .string "set for the POKéMON LEAGUE challenge!$" + .string "Hui! Du hast WASSILI besiegt, von dem\n" + .string "man sagt, er sei der beste TRAINER in\l" + .string "der HOENN-Region.\p" + .string "Okay! Schau auf deinem\n" + .string "TRAINERPASS nach.\p" + .string "Wenn du alle ORDEN erhalten hast,\n" + .string "kannst du die POKéMON LIGA\l" + .string "herausfordern!$" SootopolisCity_Gym_B1F_Text_18EA87:: @ 818EA87 - .string "I’ll show you the sublime techniques\n" - .string "I learned from our LEADER WALLACE!$" + .string "Ich zeige dir die sublimen Techniken,\n" + .string "die ich vom ARENALEITER WASSILI\l" + .string "gelernt habe.$" SootopolisCity_Gym_B1F_Text_18EACF:: @ 818EACF - .string "Please forgive me, WALLACE...$" + .string "Bitte verzeih mir, WASSILI...$" SootopolisCity_Gym_B1F_Text_18EAED:: @ 818EAED - .string "Watch what happens if you crack all\n" - .string "the floor tiles.$" + .string "Pass auf, was passiert, wenn du alle\n" + .string "Bodenfliesen betreten hast...$" SootopolisCity_Gym_B1F_Text_18EB22:: @ 818EB22 - .string "You came all the way here, but you won’t\n" - .string "get to see WALLACE.\p" - .string "Not if you lose to me, you won’t!$" + .string "Du bist den ganzen Weg hierher ge-\n" + .string "kommen, aber bis zu WASSILI dringst\l" + .string "du nicht vor.\p" + .string "Weil du gegen mich verlieren wirst!$" SootopolisCity_Gym_B1F_Text_18EB81:: @ 818EB81 - .string "You’re strong!\n" - .string "I was fooled by your cute looks!$" + .string "Du bist stark! Ich habe mich durch dein\n" + .string "unschuldiges Aussehen täuschen lassen.$" SootopolisCity_Gym_B1F_Text_18EBB1:: @ 818EBB1 - .string "You might be good enough to avoid\n" - .string "being wiped out in one hit by WALLACE.$" + .string "Du bist gut genug, um nicht sofort von\n" + .string "WASSILI besiegt zu werden.$" SootopolisCity_Gym_B1F_Text_18EBFA:: @ 818EBFA - .string "The sight of WALLACE conducting a\n" - .string "battle...\p" - .string "The very beauty of it compelled me to\n" - .string "become a TRAINER.$" + .string "Die Art, wie WASSILI kämpft...\p" + .string "Dieser wunderbare Anblick hat mich dazu\n" + .string "inspiriert, TRAINER zu werden.$" SootopolisCity_Gym_B1F_Text_18EC5E:: @ 818EC5E - .string "You battled with more beauty than\n" - .string "I could muster...$" + .string "Du kämpfst mit mehr Anmut als ich...$" SootopolisCity_Gym_B1F_Text_18EC92:: @ 818EC92 - .string "The grace you bring to battle is\n" - .string "fabulous.\p" - .string "Oh... I’m so fortunate to have found\n" - .string "POKéMON.$" + .string "Die Ästhetik, die du in den Kampf ein-\n" + .string "bringst, ist unbeschreiblich.\p" + .string "Oh... Ich bin so glücklich, dass ich mich\n" + .string "für POKéMON entschieden habe.$" SootopolisCity_Gym_B1F_Text_18ECEB:: @ 818ECEB - .string "I should teach you how harsh battles\n" - .string "can be.$" + .string "Ich werde dir beibringen, dass Kämpfe\n" + .string "kein Zuckerschlecken sind!$" SootopolisCity_Gym_B1F_Text_18ED18:: @ 818ED18 .string "Oh.\n" - .string "You’re strong.$" + .string "Du bist stark.$" SootopolisCity_Gym_B1F_Text_18ED2B:: @ 818ED2B - .string "I’ll tell you something good.\p" - .string "If you want to reach WALLACE, you\n" - .string "need to walk on each floor tile once.$" + .string "Ich verrate dir etwas.\p" + .string "Wenn du zu WASSILI willst, dann darfst\n" + .string "du auf jede Fliese nur ein Mal treten.$" SootopolisCity_Gym_B1F_Text_18ED91:: @ 818ED91 - .string "The POKéMON GYM of the highest level\n" - .string "in the HOENN region...\p" - .string "That’s the SOOTOPOLIS GYM.$" + .string "Die POKéMON ARENA mit den höchsten\n" + .string "Anforderungen in der HOENN-Region...\p" + .string "Das ist die ARENA von XENEROVILLE.$" SootopolisCity_Gym_B1F_Text_18EDE8:: @ 818EDE8 - .string "What a high level you are!$" + .string "Du kämpfst aber auf einem hohen Niveau!$" SootopolisCity_Gym_B1F_Text_18EE03:: @ 818EE03 - .string "Rather than being satisfied by being\n" - .string "in a strong GYM, I imagine training in\l" - .string "other places will make you stronger.\l" - .string "But above all, it looks more fun.$" + .string "Statt damit zufrieden zu sein, zur\n" + .string "besten ARENA zu gehören, würde ich\l" + .string "gerne auch an anderen Orten trainieren.\l" + .string "Aber hier ist es so lustig!$" SootopolisCity_Gym_B1F_Text_18EE96:: @ 818EE96 - .string "I train my POKéMON together with\n" - .string "WALLACE.\p" - .string "Don’t think I’m a pushover.$" + .string "Ich trainiere meine POKéMON zusammen\n" + .string "mit WASSILI.\p" + .string "Ich bin nicht leicht zu nehmen!$" SootopolisCity_Gym_B1F_Text_18EEDC:: @ 818EEDC - .string "I was bowled right over...$" + .string "Da wurde ich glatt überrollt...$" SootopolisCity_Gym_B1F_Text_18EEF7:: @ 818EEF7 - .string "I think you have potential.\n" - .string "Why don’t you stay and train with us?$" + .string "Ich denke, du hast durchaus Potential.\n" + .string "Warum bleibst du nicht bei uns?$" SootopolisCity_Gym_B1F_Text_18EF39:: @ 818EF39 - .string "A graceful glide across the ice while\n" - .string "crossing no lines...\p" - .string "A TRAINER putting on that performance\n" - .string "would be elegantly beautiful!$" + .string "Anmutig über das Eis zu gleiten, ohne\n" + .string "die Linien zu berühren...\p" + .string "Ein TRAINER, der das beherrscht, wird\n" + .string "auch in anderen Dingen elegant wirken.$" SootopolisCity_Gym_B1F_Text_18EFB8:: @ 818EFB8 - .string "Well, excuse me?!$" + .string "Äh, entschuldige mich...$" SootopolisCity_Gym_B1F_Text_18EFCA:: @ 818EFCA - .string "This is really obvious, but how strong\n" - .string "you are as a TRAINER has nothing to do\l" - .string "with how young or old you are.$" + .string "Es ist offensichtlich: Die Stärke eines\n" + .string "TRAINERS hat nichts mit seinem Alter\l" + .string "zu tun!$" SootopolisCity_Gym_B1F_Text_18F037:: @ 818F037 - .string "When I’m with my POKéMON, the time\n" - .string "flies by before you can say, “Oops!”$" + .string "Wenn ich mit meinen POKéMON zusammen\n" + .string "bin, vergeht die Zeit so schnell, dass\l" + .string "ich noch nicht mal “Uuups” sagen kann.$" SootopolisCity_Gym_B1F_Text_18F07F:: @ 818F07F - .string "Oops!$" + .string "Uuups!$" SootopolisCity_Gym_B1F_Text_18F085:: @ 818F085 - .string "I wish I can forget about lost causes\n" - .string "before I can manage an “Oops!”$" + .string "Ich wollte, ich könnte meine Niederlagen\n" + .string "vergessen, bevor ich “Uuups”\l" + .string "ausgesprochen habe.$" SootopolisCity_Gym_1F_Text_18F0CA:: @ 818F0CA - .string "Allow me to formally introduce\n" - .string "myself.\p" - .string "I am WALLACE.\n" - .string "The GYM LEADER of SOOTOPOLIS.\p" - .string "There’s something about you...\n" - .string "A difference in your demeanor.\p" - .string "I think I sense that in you.\p" - .string "What happened inside the CAVE OF\n" - .string "ORIGIN, and what you did, I will likely\l" - .string "learn through our upcoming battle.\p" - .string "Now, show me. Show me the power you\n" - .string "wield with your POKéMON.\p" - .string "And I, in turn, shall present you with\n" - .string "a performance of illusions in water\l" - .string "by me and my POKéMON!$" + .string "Erlaube mir, mich kurz vorzustellen.\p" + .string "Ich bin WASSILI.\n" + .string "Der ARENALEITER von XENEROVILLE.\p" + .string "Irgendetwas fällt mir an dir auf...\n" + .string "Da ist etwas in deinem Auftreten...\p" + .string "Ich denke, ich spüre etwas in dir.\p" + .string "Das, was in der URZEITHÖHLE\n" + .string "passierte und was du getan hast, all das\l" + .string "werde ich im Kampf mit dir lesen können.\p" + .string "Gib mir die Gelegenheit dazu. Zeig mir,\n" + .string "wie du deine POKéMON im Kampf führst.\p" + .string "Und als Gegenleistung zeige ich dir eine\n" + .string "Illusion im Wasser. Dargeboten von mir\l" + .string "und meinen POKéMON.$" SootopolisCity_Gym_1F_Text_18F282:: @ 818F282 .string "Bravo.\p" - .string "I realize now your authenticity and\n" - .string "magnificence as a POKéMON TRAINER.\p" - .string "I find much joy in having met you and\n" - .string "your POKéMON.\p" - .string "You have proven yourself worthy of\n" - .string "the RAIN BADGE. Accept it.$" + .string "Jetzt erkenne ich, welch ein groß-\n" + .string "artiger POKéMON-TRAINER vor mir steht.\p" + .string "Es hat mir viel Freude gemacht, dich und\n" + .string "deine POKéMON kennen gelernt zu haben.\p" + .string "Du verdienst zu Recht den\n" + .string "SCHAUERORDEN. Bitte nimm ihn an.$" SootopolisCity_Gym_1F_Text_18F342:: @ 818F342 - .string "{PLAYER} received the RAIN BADGE\n" - .string "from WALLACE.$" + .string "{PLAYER} erhält den SCHAUERORDEN\n" + .string "von WASSILI.$" SootopolisCity_Gym_1F_Text_18F36B:: @ 818F36B - .string "Having that BADGE assures you the\n" - .string "full obedience of all your POKéMON to\l" - .string "every command you make.\p" - .string "The BADGE also allows the use of the\n" - .string "HM move WATERFALL to scale walls\l" - .string "of cascading water.\p" - .string "And, so that you never forget the\n" - .string "battle we shared, take this...$" + .string "Dieser ORDEN sorgt dafür, dass dir alle\n" + .string "deine POKéMON gehorchen.\p" + .string "Der ORDEN befähigt dich außerdem dazu,\n" + .string "mit der VM KASKADE Wasserfälle in jede\l" + .string "Richtung zu passieren.\p" + .string "Und damit du unseren Kampf stets in\n" + .string "Erinnerung behältst, gebe ich dir dies...$" SootopolisCity_Gym_1F_Text_18F466:: @ 818F466 - .string "The TM I handed you contains\n" - .string "WATER PULSE.\p" - .string "In use, it will occasionally confuse\n" - .string "the target with ultrasonic waves.$" + .string "Diese TM enthält AQUAWELLE.\p" + .string "Damit kann das gegnerische POKéMON\n" + .string "mit Ultraschallwellen verwirrt werden.$" SootopolisCity_Gym_1F_Text_18F4D7:: @ 818F4D7 - .string "TRAINERS who have gathered all the\n" - .string "GYM BADGES of HOENN should make way\l" - .string "for the ultimate destination.\p" - .string "The POKéMON LEAGUE.\p" - .string "Travel to the easternmost reaches\n" - .string "of HOENN, to the island EVER GRANDE.\l" - .string "The POKéMON LEAGUE is there.$" + .string "TRAINER, die alle ORDEN der ARENEN in\n" + .string "HOENN erhalten haben, sollten sich...\p" + .string "Auf den Weg zur ultimativen Heraus-\n" + .string "forderung machen. Der POKéMON LIGA!\p" + .string "Reise zu den östlichsten Gebieten von\n" + .string "HOENN, zur Insel PRACHTPOLIS CITY. Dort\l" + .string "findest du die POKéMON LIGA.$" SootopolisCity_Gym_1F_Text_18F5B4:: @ 818F5B4 - .string "There remains but one BADGE to\n" - .string "obtain in HOENN.\p" - .string "If you wish to challenge the POKéMON\n" - .string "LEAGUE, you must obtain the last\l" - .string "BADGE from the GYM in FORTREE.$" + .string "In HOENN gibt es nur noch einen ORDEN\n" + .string "zu verdienen.\p" + .string "Wenn du die POKéMON LIGA herausfordern\n" + .string "willst, musst du zuerst den ORDEN der\l" + .string "ARENA in BAUMHAUSEN CITY bekommen.$" SootopolisCity_Gym_1F_Text_18F649:: @ 818F649 - .string "SOOTOPOLIS CITY POKéMON GYM$" + .string "POKéMON ARENA von XENEROVILLE$" SootopolisCity_Gym_1F_Text_18F665:: @ 818F665 - .string "SOOTOPOLIS CITY POKéMON GYM\p" - .string "WALLACE’S CERTIFIED TRAINERS:\n" + .string "POKéMON ARENA von XENEROVILLE\p" + .string "WASSILIS ANERKANNTE TRAINER:\n" .string "{PLAYER}$" diff --git a/data/text/maps/SootopolisCity_House1.inc b/data/text/maps/SootopolisCity_House1.inc index 78e8454e5..b028594a8 100644 --- a/data/text/maps/SootopolisCity_House1.inc +++ b/data/text/maps/SootopolisCity_House1.inc @@ -1,12 +1,12 @@ SootopolisCity_House1_Text_18F991:: @ 818F991 - .string "For thirty years I’ve remained in\n" - .string "SOOTOPOLIS honing my skills.\p" - .string "I developed a shattering TM.\n" - .string "I bequeath it to you!$" + .string "Seit 30 Jahren lebe ich in XENEROVILLE\n" + .string "und verbessere meine Fähigkeiten.\p" + .string "Ich habe eine alles erschütternde TM\n" + .string "entwickelt. Die schenke ich dir!$" SootopolisCity_House1_Text_18FA03:: @ 818FA03 - .string "TM31 contains BRICK BREAK! It’s a move\n" - .string "so horrible that I can’t describe it.$" + .string "TM31 enthält DURCHBRUCH! Eine schier\n" + .string "unbeschreibliche Attacke. Horror!$" SootopolisCity_House1_Text_18FA50:: @ 818FA50 .string "KECLEON: Puu puhyaah.$" diff --git a/data/text/maps/SootopolisCity_House2.inc b/data/text/maps/SootopolisCity_House2.inc index e132b20f7..b19b34275 100644 --- a/data/text/maps/SootopolisCity_House2.inc +++ b/data/text/maps/SootopolisCity_House2.inc @@ -1,13 +1,13 @@ SootopolisCity_House2_Text_18FA66:: @ 818FA66 - .string "MT. PYRE...\p" - .string "At its peak are two orbs placed side\n" - .string "by side. Did you know?$" + .string "PYROBERG...\p" + .string "Auf seiner Spitze sind 2 Kugeln neben-\n" + .string "einander angebracht. Wusstest du das?$" SootopolisCity_House2_Text_18FAAE:: @ 818FAAE - .string "Yes, two orbs side by side...\p" - .string "The sight of them together...\n" - .string "It is somehow soothing...$" + .string "Ja, genau. 2 Kugeln nebeneinander...\p" + .string "Der Anblick dieser beiden...\n" + .string "Irgendwie wirkt er beruhigend...$" SootopolisCity_House2_Text_18FB04:: @ 818FB04 - .string "Is that so?\n" - .string "Perhaps you ought to visit and see...$" + .string "Ehrlich?\n" + .string "Du solltest dir das mal selber ansehen...$" diff --git a/data/text/maps/SootopolisCity_House3.inc b/data/text/maps/SootopolisCity_House3.inc index b67e0a4dc..338881d2e 100644 --- a/data/text/maps/SootopolisCity_House3.inc +++ b/data/text/maps/SootopolisCity_House3.inc @@ -1,20 +1,21 @@ SootopolisCity_House3_Text_18FB36:: @ 818FB36 - .string "You’re a POKéMON TRAINER, aren’t you?\p" - .string "SOOTOPOLIS’s GYM LEADER WALLACE has\n" - .string "many fans.\l" - .string "Do you have any?$" + .string "Du bist ein POKéMON-TRAINER, oder?\p" + .string "Der ARENALEITER von XENEROVILLE, \n" + .string "WASSILI, hat viele Fans.\l" + .string "Hast du auch Fans?$" SootopolisCity_House3_Text_18FB9C:: @ 818FB9C - .string "Oh, then you must be pretty strong.$" + .string "Oh, dann musst du aber sehr stark sein.$" SootopolisCity_House3_Text_18FBC0:: @ 818FBC0 - .string "Oh, dear...\n" - .string "That’s a little lonesome.\p" - .string "Try working a little harder to get a\n" - .string "fan following.$" + .string "Oh, meine Güte...\n" + .string "Dann stehst du ja ganz alleine da.\p" + .string "Streng dich einfach mehr an, dann\n" + .string "bekommst du auch einen Fan.$" SootopolisCity_House3_Text_18FC1A:: @ 818FC1A - .string "Dedicated fans come over from even\n" - .string "KANTO and JOHTO.\p" - .string "It was really wild when I went to the\n" - .string "TRAINER FAN CLUB in LILYCOVE.$" + .string "Die Fans strömen sogar aus KANTO und\n" + .string "JOHTO herbei.\p" + .string "Ich habe den TRAINER-FANCLUB in\n" + .string "SEEGRASULB CITY besucht.\l" + .string "Verrückte Sache...$" diff --git a/data/text/maps/SootopolisCity_House4.inc b/data/text/maps/SootopolisCity_House4.inc index 277e2e060..d603808da 100644 --- a/data/text/maps/SootopolisCity_House4.inc +++ b/data/text/maps/SootopolisCity_House4.inc @@ -1,17 +1,16 @@ SootopolisCity_House4_Text_18FC92:: @ 818FC92 - .string "Listen up, and I’ll tell you something\n" - .string "good.\p" - .string "There’s supposed to be an ancient\n" - .string "ruin in the sea around here.\p" - .string "There could be treasures just waiting\n" - .string "to be discovered down there.$" + .string "Hör mir zu und ich verrate dir etwas.\p" + .string "Unter Wasser soll sich eine antike\n" + .string "Ruine befinden.\p" + .string "Da gibt es bestimmt Schätze, die nur\n" + .string "darauf warten, gehoben zu werden.$" SootopolisCity_House4_Text_18FD41:: @ 818FD41 - .string "Ancient treasures...\p" - .string "It would be nice if they existed, but\n" - .string "even if they didn’t, it would be so\l" - .string "beautiful to take an underwater\l" - .string "stroll with my POKéMON.$" + .string "Antike Schätze...\p" + .string "Wäre das schön, wenn es die tatsächlich\n" + .string "gäbe. Aber auch ohne Schätze wäre eine\p" + .string "Reise unter Wasser zusammen mit\n" + .string "meinen POKéMON herrlich.$" SootopolisCity_House4_Text_18FDD8:: @ 818FDD8 .string "AZUMARILL: Marurii.$" diff --git a/data/text/maps/SootopolisCity_House5.inc b/data/text/maps/SootopolisCity_House5.inc index c5887ffe2..ca22756e3 100644 --- a/data/text/maps/SootopolisCity_House5.inc +++ b/data/text/maps/SootopolisCity_House5.inc @@ -1,8 +1,9 @@ SootopolisCity_House5_Text_18FDEC:: @ 818FDEC - .string "There appears to be some connection\n" - .string "between SOOTOPOLIS and MT. PYRE.\p" - .string "My friends and I did some research on\n" - .string "it at the lab where I used to work.$" + .string "Es muss eine Verbindung zwischen\n" + .string "XENEROVILLE und dem PYROBERG geben.\p" + .string "Meine Freunde und ich haben ein\n" + .string "bisschen nachgeforscht - im Labor,\l" + .string "in dem wir gearbeitet haben.$" SootopolisCity_House5_Text_18FE7B:: @ 818FE7B - .string "My big brother used to study the sea.$" + .string "Mein großer Bruder studiert das Meer.$" diff --git a/data/text/maps/SootopolisCity_House6.inc b/data/text/maps/SootopolisCity_House6.inc index c8547b412..ca1c6236b 100644 --- a/data/text/maps/SootopolisCity_House6.inc +++ b/data/text/maps/SootopolisCity_House6.inc @@ -1,19 +1,20 @@ SootopolisCity_House6_Text_18FEA1:: @ 818FEA1 - .string "Hello! You’re our first guest in a\n" - .string "good while.\p" - .string "You’ve brightened up my day, so I’ll\n" - .string "give you a big WAILMER DOLL.$" + .string "Hallo! Du bist nach langer Zeit der erste\n" + .string "Gast, den ich begrüße.\p" + .string "Du hast mir den Tag gerettet, daher\n" + .string "möchte ich dir diese WAILMER-PUPPE\l" + .string "schenken.$" SootopolisCity_House6_Text_18FF12:: @ 818FF12 - .string "Take good care of it!$" + .string "Pass gut auf sie auf!$" SootopolisCity_House6_Text_18FF28:: @ 818FF28 - .string "Oh, you want it, but not right now?\n" - .string "Okay, then I’ll hold it for you.$" + .string "Oh, du möchtest sie zwar haben, aber\n" + .string "nicht sofort? Dann hebe ich sie dir auf.$" SootopolisCity_House6_Text_18FF6D:: @ 818FF6D - .string "Are you sure?\n" - .string "You don’t want this DOLL?$" + .string "Bist du sicher?\n" + .string "Du möchtest diese PUPPE wirklich nicht?$" SootopolisCity_House6_Text_18FF95:: @ 818FF95 - .string "I love plush DOLLS!$" + .string "Ich liiiiebe Plüsch-PUPPEN!$" diff --git a/data/text/maps/SootopolisCity_House7.inc b/data/text/maps/SootopolisCity_House7.inc index 756a96a1b..e58e57222 100644 --- a/data/text/maps/SootopolisCity_House7.inc +++ b/data/text/maps/SootopolisCity_House7.inc @@ -1,14 +1,14 @@ SootopolisCity_House7_Text_18FFA9:: @ 818FFA9 - .string "An underwater volcano erupted and\n" - .string "forced itself up from the depths.\p" - .string "Its crater emerged from the sea and\n" - .string "became filled with rainwater.\p" - .string "That’s how SOOTOPOLIS CITY came into\n" - .string "being.$" + .string "Ein Unterwasservulkan brach aus\n" + .string "und schob sich an die Oberfläche.\p" + .string "Der Krater lag über der Meeresober-\n" + .string "fläche und konnte sich so mit Regen-\p" + .string "wasser füllen.\n" + .string "Und so entstand XENEROVILLE.$" SootopolisCity_House7_Text_19005B:: @ 819005B - .string "The cave that links SOOTOPOLIS and\n" - .string "the outside world...\p" - .string "It seems as if the cave was made to\n" - .string "keep something from getting out.\p" - .string "Or am I just imagining things?$" + .string "Die Höhle, die XENEROVILLE mit der Welt\n" + .string "verbindet...\p" + .string "Sie sollte ursprünglich wohl etwas\n" + .string "in der Stadt festhalten.\p" + .string "Oder bilde ich mir das nur ein?$" diff --git a/data/text/maps/SootopolisCity_House8.inc b/data/text/maps/SootopolisCity_House8.inc index 4efc111cc..0ea3dff9b 100644 --- a/data/text/maps/SootopolisCity_House8.inc +++ b/data/text/maps/SootopolisCity_House8.inc @@ -1,90 +1,93 @@ SootopolisCity_House8_Text_1900F7:: @ 81900F7 - .string "Do you know the POKéMON SHROOMISH?\n" - .string "It’s hardly ever seen in SOOTOPOLIS.\p" - .string "Anyway, I love big SHROOMISH.\n" - .string "The bigger the better.\p" - .string "But my younger brother, he says that\n" - .string "BARBOACH is bigger.\p" - .string "That’s silly. SHROOMISH has to be\n" - .string "bigger than that!\p" - .string "Huh? Do you have a SHROOMISH with you?\n" - .string "P-p-please, show me!$" + .string "Kennst du das POKéMON KNILZ?\n" + .string "In XENEROVILLE wird es kaum gesehen.\p" + .string "Aber ich liebe große KNILZ.\n" + .string "Je größer, desto besser.\p" + .string "Aber mein jüngerer Bruder sagt, dass\n" + .string "SCHMERBE größer ist.\p" + .string "Verrückt! KNILZ muss einfach\n" + .string "größer sein!\p" + .string "Wie? Du hast ein KNILZ dabei???\n" + .string "B-b-bitte zeig es mir!$" SootopolisCity_House8_Text_19021D:: @ 819021D - .string "{STR_VAR_2} inches!\n" - .string "Oh, my gosh, this is a big one!\p" - .string "It might even beat the big BARBOACH\n" - .string "my younger brother saw!\p" - .string "Thanks for showing me.\n" - .string "This is my thanks!$" + .string "{STR_VAR_2}cm!\n" + .string "Meine Güte, ist das aber groß!\p" + .string "Das wird sogar größer als das SCHMERBE\n" + .string "sein, das mein Bruder gesehen hat!\p" + .string "Danke, dass du es mir gezeigt hast.\n" + .string "Hier, ein kleines Dankeschön!$" UnknownString_81902AE: @ 81902AE - .string "{PLAYER} received a POTION.$" + .string "{PLAYER} erhält einen TRANK.$" SootopolisCity_House8_Text_1902C4:: @ 81902C4 - .string "Hunh?\n" - .string "Your BAG is crammed full.$" + .string "Huch.\n" + .string "Dein BEUTEL ist ja randvoll.$" SootopolisCity_House8_Text_1902E4:: @ 81902E4 - .string "{STR_VAR_2} inches, is it?\p" - .string "Hmm... I’ve seen a bigger SHROOMISH\n" - .string "than this one.$" + .string "{STR_VAR_2}cm, nicht wahr?\p" + .string "Hmm... Ich habe schon größere\n" + .string "KNILZ als dieses gesehen.$" SootopolisCity_House8_Text_190329:: @ 8190329 - .string "Oh, now this is quite something...\n" - .string "But it’s not a SHROOMISH!$" + .string "Na, das ist doch schon ganz ordentlich...\n" + .string "Aber das ist kein KNILZ!$" SootopolisCity_House8_Text_190366:: @ 8190366 - .string "You don’t have a big SHROOMISH?\n" - .string "That’s too bad...\p" - .string "If you get a big SHROOMISH, please\n" - .string "come show me.$" + .string "Du hast gar kein großes KNILZ?\n" + .string "Och, wie schade...\p" + .string "Wenn du ein großes KNILZ hast,\n" + .string "dann komm bitte wieder und zeig es mir.$" SootopolisCity_House8_Text_1903C9:: @ 81903C9 - .string "The biggest SHROOMISH in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch giant!\p" - .string "A SHROOMISH bigger than a BARBOACH\n" - .string "always wanted!$" + .string "Das größte KNILZ aller Zeiten!\n" + .string "Der {STR_VAR_3}cm-Gigant von {STR_VAR_2}!\p" + .string "Ein KNILZ so groß, wie ein\n" + .string "SCHMERBE gerne sein würde!$" SootopolisCity_House8_Text_190431:: @ 8190431 - .string "Do you know the POKéMON BARBOACH?\n" - .string "It’s rarely seen in SOOTOPOLIS.\p" - .string "I love, I mean love, big BARBOACH!\p" - .string "My big brother says that SHROOMISH is\n" - .string "bigger.\p" - .string "But that’s wrong! Everyone knows that\n" - .string "BARBOACH is a lot bigger.\p" - .string "Hunh? Do you have a BARBOACH?\n" - .string "P-p-please show me!$" + .string "Kennst du das POKéMON SCHMERBE?\n" + .string "Das ist bisher selten in XENEROVILLE\l" + .string "aufgetaucht.\p" + .string "Ich liebe große SCHMERBE.\p" + .string "Mein großer Bruder sagt, dass\n" + .string "KNILZ größer ist.\p" + .string "Aber das stimmt gar nicht! Jeder weiß\n" + .string "doch, dass SCHMERBE viel größer\l" + .string "ist.\p" + .string "Wie? Oh, du hast ein SCHMERBE?\n" + .string "Bitte, bitte zeig es mir!$" SootopolisCity_House8_Text_190536:: @ 8190536 - .string "{STR_VAR_2} inches!\n" - .string "Wow, that is big!\p" - .string "It might be even bigger than the huge\n" - .string "SHROOMISH my big brother saw.\p" - .string "Thanks for showing me!\n" - .string "This is my thanks!$" + .string "{STR_VAR_2}cm!\n" + .string "Wow, das ist aber groß!\p" + .string "Das ist bestimmt größer als das\n" + .string "KNILZ, das mein Bruder gesehen\l" + .string "hat.\p" + .string "Danke, dass ich es anschauen durfte.\n" + .string "Hier, ein kleines Dankeschön!$" SootopolisCity_House8_Text_1905C1:: @ 81905C1 - .string "Whoops, looks like your BAG is full.$" + .string "Huups, dein BEUTEL ist voll.$" SootopolisCity_House8_Text_1905E6:: @ 81905E6 - .string "{STR_VAR_2} inches?\p" - .string "Hmm... I’ve seen a bigger BARBOACH\n" - .string "than this one here.$" + .string "{STR_VAR_2}cm?\p" + .string "Ach... Da habe ich aber schon ein\n" + .string "größeres SCHMERBE gesehen.$" SootopolisCity_House8_Text_190628:: @ 8190628 - .string "Well, isn’t this something!\n" - .string "But it’s no BARBOACH!$" + .string "Nun, das ist ganz stattlich.\n" + .string "Aber es ist kein SCHMERBE!$" SootopolisCity_House8_Text_19065A:: @ 819065A - .string "Don’t you have a big BARBOACH?\n" - .string "How disappointing...\p" - .string "If you get a big BARBOACH, please\n" - .string "come show me!$" + .string "Hast du kein großes SCHMERBE?\n" + .string "Och, wie enttäuschend...\p" + .string "Wenn du ein großes SCHMERBE hast,\n" + .string "dann komm bitte wieder her.$" SootopolisCity_House8_Text_1906BE:: @ 81906BE - .string "The biggest BARBOACH in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" - .string "A BARBOACH bigger than a SHROOMISH\n" - .string "always wanted!$" + .string "Das größte SCHMERBE aller Zeiten!\n" + .string "Der {STR_VAR_3}cm-Koloss von {STR_VAR_2}!\p" + .string "Ein SCHMERBE so groß, wie ein\n" + .string "KNILZ gerne sein würde.$" diff --git a/data/text/maps/SootopolisCity_Mart.inc b/data/text/maps/SootopolisCity_Mart.inc index 858d1530d..74db2bcd9 100644 --- a/data/text/maps/SootopolisCity_Mart.inc +++ b/data/text/maps/SootopolisCity_Mart.inc @@ -1,17 +1,17 @@ SootopolisCity_Mart_Text_18F890:: @ 818F890 - .string "PP UP is great!\p" - .string "It raises the POWER POINTS, the PP,\n" - .string "of a POKéMON move.$" + .string "AP-PLUS ist sehr nützlich!\p" + .string "Es steigert die ANGRIFFSPUNKTE, die AP\n" + .string "einer POKéMON-Attacke.$" SootopolisCity_Mart_Text_18F8D7:: @ 818F8D7 - .string "What... What is happening?$" + .string "Was... Was ist passiert?$" SootopolisCity_Mart_Text_18F8F2:: @ 818F8F2 - .string "Do you know FULL RESTORE?\p" - .string "Full restoration of HP!\n" - .string "Eradication of all status problems!\p" - .string "It’s truly an item of your dreams!$" + .string "Kennst du TOP-GENESUNG?\p" + .string "Alle KP werden aufgefüllt!\n" + .string "Alle Statusprobleme werden aufgehoben!\p" + .string "Ein wundervolles Item!$" SootopolisCity_Mart_Text_18F96B:: @ 818F96B - .string "This weather...\n" - .string "Did something awaken?$" + .string "Dieses Wetter...\n" + .string "Wurde etwas aufgeweckt?$" diff --git a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc b/data/text/maps/SootopolisCity_PokemonCenter_1F.inc index fd078ad0c..034b51f4d 100644 --- a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/text/maps/SootopolisCity_PokemonCenter_1F.inc @@ -1,24 +1,25 @@ SootopolisCity_PokemonCenter_1F_Text_18F6A2:: @ 818F6A2 - .string "WALLACE, this town’s GYM LEADER, is a\n" - .string "powerful TRAINER.\p" - .string "He’s rumored to be the best in the\n" - .string "whole HOENN region.\p" - .string "But the ELITE FOUR...\p" - .string "They’re said to be even stronger than\n" - .string "WALLACE. How strong could they be?$" + .string "WASSILI, der ARENALEITER dieses Ortes,\n" + .string "ist ein mächtiger TRAINER.\p" + .string "Man sagt, er sei der beste TRAINER der\n" + .string "ganzen HOENN-Region.\p" + .string "Aber die TOP VIER...\p" + .string "Man sagt, sie seien stärker als WASSILI.\n" + .string "Wie stark müssen sie dann erst sein?$" SootopolisCity_PokemonCenter_1F_Text_18F770:: @ 818F770 - .string "Everyone in town has taken refuge\n" - .string "and won’t come out of their homes.\p" - .string "This weather..\n" - .string "Could it be the prelude to something?$" + .string "Jeder im Ort hat sich zurückgezogen in\n" + .string "sein Haus und bleibt auch dort.\p" + .string "Dieses Wetter...\n" + .string "Ob dies die Ouvertüre von etwas ist?$" SootopolisCity_PokemonCenter_1F_Text_18F7EA:: @ 818F7EA - .string "Whenever, wherever, and whatever\n" - .string "happens, I will always be friends with\l" - .string "POKéMON.\p" - .string "Because it’s fun to be with POKéMON!$" + .string "Was auch immer wann oder wo passiert,\n" + .string "meine Freundschaft zu den POKéMON\l" + .string "leidet darunter bestimmt nicht!\p" + .string "Ich liebe es, mit POKéMON zusammen\n" + .string "zu sein.$" SootopolisCity_PokemonCenter_1F_Text_18F860:: @ 818F860 - .string "I don’t know why...\n" - .string "But... I’m really scared...$" + .string "Ich weiß nicht, warum...\n" + .string "Aber... Ich habe richtig Angst...$" diff --git a/data/text/maps/Underwater_SeafloorCavern.inc b/data/text/maps/Underwater_SeafloorCavern.inc index 8df6cb492..c638a26d0 100644 --- a/data/text/maps/Underwater_SeafloorCavern.inc +++ b/data/text/maps/Underwater_SeafloorCavern.inc @@ -1,7 +1,7 @@ Underwater_SeafloorCavern_Text_197435:: @ 8197435 - .string "“SUBMARINE EXPLORER 1” is painted\n" - .string "on the hull.\p" - .string "This is the submarine TEAM {EVIL_TEAM}\n" - .string "stole in SLATEPORT!\p" - .string "TEAM {EVIL_TEAM} must have gone\n" - .string "ashore here.$" + .string "“TIEFSEE-FORSCHUNGSBOOT 1” steht auf\n" + .string "der Außenhülle.\p" + .string "Das ist das U-Boot, das TEAM {EVIL_TEAM} in\n" + .string "GRAPHITPORT CITY gestohlen hat!\p" + .string "TEAM {EVIL_TEAM} muss hier also an Land\n" + .string "gegangen sein.$" diff --git a/data/text/maps/VerdanturfTown.inc b/data/text/maps/VerdanturfTown.inc index a3ccdd34e..a1a394ac7 100644 --- a/data/text/maps/VerdanturfTown.inc +++ b/data/text/maps/VerdanturfTown.inc @@ -1,62 +1,67 @@ VerdanturfTown_Text_16CAEB:: @ 816CAEB - .string "My papa told me.\p" - .string "He says this tunnel is full of\n" - .string "timid POKéMON.\p" - .string "They get all scared of loud noise and\n" - .string "make a big uproar.\p" - .string "So they had to stop the big tunnel\n" - .string "project.\p" - .string "But there’s one man.\n" - .string "He’s trying to dig the tunnel by himself!$" + .string "Mein Papa hat mir das erzählt.\p" + .string "Er sagt, der Tunnel sei voller scheuer\n" + .string "POKéMON.\p" + .string "Sie haben Angst vor lauten Geräuschen\n" + .string "und machen einen Aufruhr.\p" + .string "Daher musste das Tunnelprojekt\n" + .string "gestoppt werden.\p" + .string "Aber es gibt da einen Mann. Der ver-\n" + .string "sucht, den Tunnel alleine zu graben.$" VerdanturfTown_Text_16CBCE:: @ 816CBCE - .string "There was a man who dug a tunnel for\n" - .string "a lady he loved.\p" - .string "I don’t really get it, but hey!$" + .string "Da war ein Mann, der hat den Tunnel\n" + .string "ganz alleine für die Frau seines Herzens\l" + .string "gegraben.\p" + .string "Ich habe das nie so ganz verstanden.\n" + .string "Aber, hey, ich finde es trotzdem klasse.$" VerdanturfTown_Text_16CC24:: @ 816CC24 - .string "The way the winds blow, volcanic ash\n" - .string "is never blown in this direction.\p" - .string "The air is clean and delicious here.\n" - .string "Living here should do wonders for even\l" - .string "frail and sickly people.$" + .string "Der Wind steht immer so günstig, dass\n" + .string "die Asche vom Vulkan nie hierher\l" + .string "geweht wird.\p" + .string "Die Luft ist sauber und klar.\n" + .string "Hier zu leben hilft auch den schwachen\l" + .string "und kränklichen Menschen.$" VerdanturfTown_Text_16CCD0:: @ 816CCD0 - .string "I’m feeling a little confident about the\n" - .string "cuteness of my POKéMON.\p" - .string "I wanted to make its CONTEST debut,\n" - .string "so that’s why I’m here.$" + .string "Ich bin doch zufrieden mit der Anmut\n" + .string "meiner POKéMON.\p" + .string "Ich möchte hier zum ersten Mal an einem\n" + .string "WETTBEWERB teilnehmen.$" VerdanturfTown_Text_16CD4D:: @ 816CD4D - .string "Did you see the cave next to the\n" - .string "POKéMON MART?\p" - .string "There’s a guy in there who’s trying to\n" - .string "bust up boulders so he can bust out\l" - .string "through to the other side.\p" - .string "It’d be great if we could go through...\n" - .string "It’ll make it easy to visit RUSTBORO.$" + .string "Siehst du die Höhle neben dem PKMN-\n" + .string "SUPERMARKT?\p" + .string "Da ist ein Typ drin, der die Felsbrocken\n" + .string "sprengen will, damit er auf die andere\l" + .string "Seite gehen kann.\p" + .string "Wäre das toll, wenn ich auch dort durch-\n" + .string "gehen könnte... Ein Besuch in\l" + .string "METAROST CITY wäre dann ganz einfach.$" VerdanturfTown_Text_16CE30:: @ 816CE30 - .string "That cave next to the POKéMON MART\n" - .string "is now a tunnel to the other side.\p" - .string "It’s great - it’s easy to go shop for new\n" - .string "DEVON products in RUSTBORO now.$" + .string "Die Höhle neben dem PKMN-SUPERMARKT\n" + .string "ist nun ein Tunnel zur anderen Seite.\p" + .string "Das ist toll! Jetzt kommt man ganz\n" + .string "einfach nach METAROST CITY, um\l" + .string "DEVON-WAREN zu kaufen.$" VerdanturfTown_Text_16CEC0:: @ 816CEC0 - .string "VERDANTURF TOWN\p" - .string "“The windswept highlands with the\n" - .string "sweet fragrance of grass.”$" + .string "WIESENFLUR\p" + .string "“Das vom Wind gestreichelte Hoch-\n" + .string "land mit dem süßen Duft des Grases.”$" VerdanturfTown_Text_16CF0D:: @ 816CF0D - .string "WANDA’S HOUSE$" + .string "HEIKES HAUS$" VerdanturfTown_Text_16CF1B:: @ 816CF1B - .string "POKéMON CONTESTS\n" - .string "NORMAL RANK REGISTRATION\p" - .string "“Gather here, all ye POKéMON TRAINERS!”$" + .string "POKéMON WETTBEWERBE\n" + .string "NORMAL-KLASSE REGISTRIERUNGEN\p" + .string "“Kommt her, all ihr POKéMON-TRAINER!”$" VerdanturfTown_Text_16CF6D:: @ 816CF6D - .string "RUSTURF TUNNEL\n" - .string "“Linking RUSTBORO and VERDANTURF\p" - .string "“The tunnel project has been\n" - .string "canceled.”$" + .string "METAFLURTUNNEL\n" + .string "“Die Verbindung zwischen\l" + .string "METAROST CITY und WIESENFLUR.\p" + .string "Das Tunnelprojekt wurde abgebrochen.”$" diff --git a/data/text/maps/VerdanturfTown_ContestHall.inc b/data/text/maps/VerdanturfTown_ContestHall.inc index 2bf97f1de..4fd58f853 100644 --- a/data/text/maps/VerdanturfTown_ContestHall.inc +++ b/data/text/maps/VerdanturfTown_ContestHall.inc @@ -1,26 +1,27 @@ VerdanturfTown_ContestHall_Text_177FB4:: @ 8177FB4 - .string "Which CONTEST are you entering?\n" - .string "Want a piece of advice?\p" - .string "In any CONTEST, for example, a CUTE\n" - .string "CONTEST, I don’t think they judge you\l" - .string "only on cuteness in the first round.\p" - .string "You need to work out ways for raising\n" - .string "POKéMON better.$" + .string "An welchem WETTBEWERB nimmst du teil?\n" + .string "Darf ich dir einen Rat geben?\p" + .string "In jedem WETTBEWERB, zum Beispiel im\n" + .string "WETTBEWERB für ANMUT, bewerten sie im\l" + .string "ersten Durchlauf nicht nur die Anmut.\p" + .string "Du solltest daher Wege finden, deine\n" + .string "POKéMON besser aufzuziehen.$" VerdanturfTown_ContestHall_Text_178091:: @ 8178091 - .string "I raised my POKéMON to be cute.\p" - .string "I found out you can put POKéMON in\n" - .string "a CONTEST for cuteness!\p" - .string "I’m so glad I raised my POKéMON with\n" - .string "loving care...$" + .string "Ich habe meine POKéMON zur Anmut\n" + .string "erzogen.\p" + .string "Man kann seine POKéMON an einem WETT-\n" + .string "BEWERB für ANMUT teilnehmen lassen!\p" + .string "Ich bin so froh, dass ich meine POKéMON\n" + .string "liebevoll aufgezogen habe.$" VerdanturfTown_ContestHall_Text_178120:: @ 8178120 - .string "My POKéMON rules!\p" - .string "It’s cool, tough yet beautiful, cute,\n" - .string "and smart. It’s complete!\p" - .string "I may as well go for wins in every\n" - .string "single CONTEST.$" + .string "Mein POKéMON ist der Kracher!\p" + .string "Es ist cool, stark, schön, anmutig und\n" + .string "klug. Alles in einem!\p" + .string "Ich werde mit ihm sämtliche\n" + .string "WETTBEWERBE gewinnen!$" VerdanturfTown_ContestHall_Text_1781A5:: @ 81781A5 - .string "POKéMON CONTESTS\n" - .string "NORMAL RANK STAGE!$" + .string "POKéMON WETTBEWERBE\n" + .string "BÜHNE für die NORMAL-KLASSE!$" diff --git a/data/text/maps/VerdanturfTown_ContestLobby.inc b/data/text/maps/VerdanturfTown_ContestLobby.inc index 2f9121c52..9f8326613 100644 --- a/data/text/maps/VerdanturfTown_ContestLobby.inc +++ b/data/text/maps/VerdanturfTown_ContestLobby.inc @@ -1,28 +1,31 @@ VerdanturfTown_ContestLobby_Text_177D6C:: @ 8177D6C - .string "I went in through the entrance and\n" - .string "took a look around the CONTEST hall.\p" - .string "Getting up on that big stage...\n" - .string "It’s going to be tense!$" + .string "Ich bin hineingegangen und habe mich\n" + .string "ein bisschen in der WETTBEWERBSHALLE\l" + .string "umgeschaut.\p" + .string "Wenn man da oben auf der riesigen Bühne\n" + .string "steht... Das muss Aufregung pur sein!$" VerdanturfTown_ContestLobby_Text_177DEC:: @ 8177DEC - .string "Oh, my love for POKéMON...\n" - .string "The attraction they evoke in me...\p" - .string "Whoops!\n" - .string "You weren’t meant to see that!\l" - .string "Well, anyway.\p" - .string "If you’re entering a CONTEST, try this\n" - .string "move on for size.$" + .string "Oh, die Liebe zu meinen POKéMON...\n" + .string "Diese Anziehungskraft...\p" + .string "Hups!\n" + .string "Das war gar nicht für deine Ohren\l" + .string "bestimmt! Nun, wie auch immer...\p" + .string "Wenn du an einem WETTBEWERB teil-\n" + .string "nimmst, probiere mal diese Attacke aus.$" VerdanturfTown_ContestLobby_Text_177E98:: @ 8177E98 - .string "My feelings for POKéMON...\n" - .string "Oh, they attract me so...$" + .string "Meine Gefühle für POKéMON...\n" + .string "Oh, POKéMON ziehen mich so an...$" VerdanturfTown_ContestLobby_Text_177ECD:: @ 8177ECD - .string "Which CONTEST are you planning on\n" - .string "entering?\p" - .string "If you’re entering a COOL CONTEST,\n" - .string "a cool POKéMON has to be the one!\p" - .string "Pick a POKéMON worthy of the CONTEST\n" - .string "theme, and make sure it has the\l" - .string "right set of moves to match.\p" - .string "That’s fundamental!$" + .string "An welchem WETTBEWERB planst du teil-\n" + .string "zunehmen?\p" + .string "Wenn du an einem COOLNESS-WETTBE-\n" + .string "WERB teilnehmen willst, muss das\l" + .string "POKéMON cool sein!\p" + .string "Wähle immer das POKéMON aus, das am\n" + .string "besten zur Kategorie des WETTBE-\l" + .string "WERBS passt und die passenden\l" + .string "Attacken kennt.\p" + .string "Das ist das Wesentliche!$" diff --git a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc index e6e7f9730..39b1b5f4c 100644 --- a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -1,39 +1,39 @@ VerdanturfTown_FriendshipRatersHouse_Text_178A9C:: @ 8178A9C - .string "Let me see your POKéMON.\n" - .string "I’ll check to see how much it likes you.\p" + .string "Zeig mir doch mal dein POKéMON.\n" + .string "Ich prüfe, wie sehr es dich mag.\p" .string "Oh.\n" - .string "Your POKéMON...$" + .string "Dein POKéMON...$" VerdanturfTown_FriendshipRatersHouse_Text_178AF2:: @ 8178AF2 - .string "It adores you.\n" - .string "It can’t possibly love you any more.\l" - .string "I even feel happy seeing it.$" + .string "Es liebt dich über alles.\n" + .string "Mehr lieben könnte es dich gar nicht.\l" + .string "Das zu sehen, macht mich glücklich.$" VerdanturfTown_FriendshipRatersHouse_Text_178B43:: @ 8178B43 - .string "It seems to be very happy.\n" - .string "It obviously likes you a whole lot.$" + .string "Es scheint sehr glücklich zu sein.\n" + .string "Es mag dich wirklich sehr.$" VerdanturfTown_FriendshipRatersHouse_Text_178B82:: @ 8178B82 - .string "It likes you quite a lot.\n" - .string "It seems to want to be babied a little.$" + .string "Es mag dich.\n" + .string "Es möchte von dir verwöhnt werden.$" VerdanturfTown_FriendshipRatersHouse_Text_178BC4:: @ 8178BC4 - .string "It’s getting used to you.\n" - .string "It seems to believe in you.$" + .string "Es gewöhnt sich langsam an dich.\n" + .string "Es glaubt an dich.$" VerdanturfTown_FriendshipRatersHouse_Text_178BFA:: @ 8178BFA - .string "It’s not very used to you yet.\n" - .string "It neither loves nor hates you.$" + .string "Es hat sich noch nicht an dich gewöhnt.\n" + .string "Weder liebt es dich, noch hasst es dich.$" VerdanturfTown_FriendshipRatersHouse_Text_178C39:: @ 8178C39 - .string "It’s very wary.\n" - .string "It has scary viciousness in its eyes.\l" - .string "It doesn’t like you much at all.$" + .string "Es schwankt in seinen Gefühlen.\n" + .string "Es hat eine beängstigende Bösartigkeit\l" + .string "in den Augen. Es mag dich nicht.$" VerdanturfTown_FriendshipRatersHouse_Text_178C90:: @ 8178C90 - .string "This is a little hard for me to say...\p" - .string "Your POKéMON simply detests you.\n" - .string "Doesn’t that make you uncomfortable?$" + .string "Es fällt mir schwer, das zu sagen...\p" + .string "Dein POKéMON hasst dich. Das ist nicht\n" + .string "gerade angenehm für dich, oder?$" VerdanturfTown_FriendshipRatersHouse_Text_178CFD:: @ 8178CFD .string "PIKACHU: Pika pika!$" diff --git a/data/text/maps/VerdanturfTown_House.inc b/data/text/maps/VerdanturfTown_House.inc index 8db1656ee..0e6b1eaf1 100644 --- a/data/text/maps/VerdanturfTown_House.inc +++ b/data/text/maps/VerdanturfTown_House.inc @@ -1,13 +1,13 @@ VerdanturfTown_House_Text_178D11:: @ 8178D11 - .string "Far away, deep in EVER GRANDE CITY,\n" - .string "is the POKéMON LEAGUE.\p" - .string "The TRAINERS who gather there are\n" - .string "all frighteningly well skilled.$" + .string "Weit von hier, in PRACHTPOLIS CITY,\n" + .string "findest du die POKéMON LIGA.\p" + .string "Die TRAINER dort sind alle geradezu\n" + .string "Furcht erregend talentiert.$" VerdanturfTown_House_Text_178D8E:: @ 8178D8E - .string "In the POKéMON LEAGUE, I think the\n" - .string "rules say that you have to battle the\l" - .string "ELITE FOUR all in a row.\p" - .string "If you lose to any of them, you have\n" - .string "to begin your challenge again from the\l" - .string "first one.$" + .string "In der POKéMON LIGA musst du die TOP\n" + .string "VIER hintereinander besiegen. Das\l" + .string "sagen die Regeln.\p" + .string "Wenn du gegen einen dieser TRAINER\n" + .string "verlierst, musst du die Herausforderung\l" + .string "von vorne beginnen.$" diff --git a/data/text/maps/VerdanturfTown_Mart.inc b/data/text/maps/VerdanturfTown_Mart.inc index fbd655f08..35f88e2f1 100644 --- a/data/text/maps/VerdanturfTown_Mart.inc +++ b/data/text/maps/VerdanturfTown_Mart.inc @@ -1,17 +1,18 @@ VerdanturfTown_Mart_Text_1781C9:: @ 81781C9 - .string "For any POKéMON match, X SPECIAL\n" - .string "is crucial.\p" - .string "It jacks up the power of some moves\n" - .string "even though it’s only for one battle.$" + .string "X-SPEZIAL ist für jeden POKéMON-Kampf\n" + .string "äußerst wichtig.\p" + .string "Es erhöht die Stärke mancher Attacken.\n" + .string "Aber leider nur für einen Kampf.$" VerdanturfTown_Mart_Text_178240:: @ 8178240 - .string "They don’t sell any items that will let\n" - .string "you win CONTESTS...\p" - .string "It means you have to raise POKéMON\n" - .string "diligently on an everyday basis.$" + .string "Sie verkaufen keine Items, mit denen\n" + .string "man einen WETTBEWERB gewinnen kann...\p" + .string "Und das bedeutet, dass du deine\n" + .string "POKéMON mit äußerster Sorgfalt\l" + .string "aufziehen musst.$" VerdanturfTown_Mart_Text_1782C0:: @ 81782C0 - .string "The NEST BALL works better on\n" - .string "weakened POKéMON.\p" - .string "VERDANTURF is the only place you can\n" - .string "buy it.$" + .string "Der NESTBALL ist bei schwächeren\n" + .string "POKéMON hervorragend geeignet.\p" + .string "Den kannst du nur in WIESENFLUR\n" + .string "kaufen.$" diff --git a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc index e79898ead..33b100c01 100644 --- a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -1,9 +1,10 @@ VerdanturfTown_PokemonCenter_1F_Text_17831D:: @ 817831D - .string "I daresay a TRAINER isn’t qualified if\n" - .string "POKéMON aren’t settled and friendly.\l" - .string "Have you given them any {POKEBLOCK}S?$" + .string "Ich wage zu behaupten, ein TRAINER ist\n" + .string "nicht qualifiziert, wenn seine POKéMON\p" + .string "nicht freundlich sind und sich wohl-\n" + .string "fühlen. Hast du ihnen {POKEBLOCK} gegeben?$" VerdanturfTown_PokemonCenter_1F_Text_178389:: @ 8178389 - .string "Let me hazard a guess why you’re in\n" - .string "VERDANTURF. The reason: CONTESTS.\p" - .string "All CONTEST challenges originate here.$" + .string "Lass mich raten, warum du in WIESENFLUR\n" + .string "bist... Wegen des WETTBEWERBS!\p" + .string "Hier ist die Wiege aller WETTBEWERBE.$" diff --git a/data/text/maps/VerdanturfTown_WandasHouse.inc b/data/text/maps/VerdanturfTown_WandasHouse.inc index d8aae2958..85028a3c4 100644 --- a/data/text/maps/VerdanturfTown_WandasHouse.inc +++ b/data/text/maps/VerdanturfTown_WandasHouse.inc @@ -1,83 +1,84 @@ VerdanturfTown_WandasHouse_Text_1783F6:: @ 81783F6 - .string "WALLY: I lost to you, {PLAYER}, but I’m\n" - .string "not feeling down anymore.\p" - .string "Because I have a new purpose in life.\n" - .string "Together with my RALTS, I’m going\l" - .string "to challenge POKéMON GYMS and become\l" - .string "a great TRAINER.\p" - .string "Please watch me, {PLAYER}.\n" - .string "I’m going to be stronger than you.\p" - .string "When I do, I’m going to challenge you\n" - .string "to another battle.$" + .string "HEIKO: Ich habe gegen dich verloren,\n" + .string "{PLAYER}. Aber das betrübt mich nicht.\p" + .string "Ich habe ein neues Ziel in meinem Leben.\n" + .string "Zusammen mit meinem TRASLA mache\p" + .string "ich mich auf, die ARENEN herauszu-\n" + .string "fordern und ein großer TRAINER zu\l" + .string "werden.\p" + .string "Behalte mich ruhig im Auge, {PLAYER}.\n" + .string "Bald bin ich stärker als du!\p" + .string "Und dann werde ich dich zu einem neuen\n" + .string "Kampf herausfordern.$" VerdanturfTown_WandasHouse_Text_178521:: @ 8178521 - .string "WALLY: Please watch me, {PLAYER}.\n" - .string "I’m going to get stronger than you.\p" - .string "When I do, I’m going to challenge you\n" - .string "to another battle.$" + .string "HEIKO: Behalte mich ruhig im Auge,\n" + .string "{PLAYER}. Bald bin ich stärker als du!\p" + .string "Und dann werde ich dich zu einem neuen\n" + .string "Kampf herausfordern.$" VerdanturfTown_WandasHouse_Text_17859A:: @ 817859A - .string "UNCLE: Oh! {PLAYER}{KUN}!\n" - .string "WALLY’s next door.\p" - .string "But, boy, there’s something I have to\n" - .string "tell you.\p" - .string "This natural environment is doing\n" - .string "wonders for WALLY’s health.\p" - .string "Maybe it’s not just the environment.\n" - .string "It could be POKéMON that are giving the\l" - .string "boy hope.$" + .string "ONKEL: Oh! {PLAYER}{KUN}!\n" + .string "Du findest HEIKO nebenan.\p" + .string "Aber es gibt etwas, das ich dir sagen\n" + .string "muss.\p" + .string "Diese natürliche Umgebung hat Wunder\n" + .string "gewirkt bei HEIKOS Gesundheit.\p" + .string "Und nicht nur die natürliche Umgebung!\n" + .string "Ich denke, auch die Freundschaft zu\l" + .string "den POKéMON hat ihm geholfen...$" VerdanturfTown_WandasHouse_Text_178683:: @ 8178683 - .string "WALLY’s gone away...\n" - .string "He slipped off on his own...$" + .string "HEIKO ist weggegangen...\n" + .string "Er ist nun auf seinem eigenen Weg...$" VerdanturfTown_WandasHouse_Text_1786B5:: @ 81786B5 - .string "UNCLE: Is that right?\n" - .string "WALLY’s gone away that far all by\l" - .string "himself...\p" - .string "Well, I have to give him credit - he is\n" - .string "my little brother’s son.$" + .string "ONKEL: Stimmt das?\n" + .string "HEIKO ist ganz alleine in die Welt\l" + .string "hinausgezogen...\p" + .string "Ich sollte ihn unterstützen - er ist der\n" + .string "Sohn meines kleinen Bruders...$" VerdanturfTown_WandasHouse_Text_178739:: @ 8178739 - .string "WANDA: You are?\n" - .string "Oh, right, I get it!\p" - .string "You’re the {PLAYER} who WALLY was\n" - .string "telling me about.\p" - .string "I’m WALLY’s cousin.\n" - .string "Glad to meet you!\p" - .string "I think WALLY’s become a lot more lively\n" - .string "and healthy since he came here.$" + .string "HEIKE: Wer bist du?\n" + .string "Oh, ja, ich weiß schon...\p" + .string "Du bist {PLAYER}. HEIKO hat mir schon\n" + .string "viel von dir erzählt.\p" + .string "Ich bin HEIKOS Cousine.\n" + .string "Nett, dich kennen zu lernen!\p" + .string "Ich finde, seit HEIKO hier lebt, ist er\n" + .string "viel gesünder und lebendiger geworden.$" VerdanturfTown_WandasHouse_Text_1787FB:: @ 81787FB - .string "WANDA: Don’t worry about WALLY.\n" - .string "He’ll be just fine.\p" - .string "I know my little cousin, and he has\n" - .string "POKéMON with him, too.$" + .string "HEIKE: Mach dir keine Sorgen um HEIKO.\n" + .string "Ihm geht es mit Sicherheit gut.\p" + .string "Ich kenne doch meinen kleinen Vetter.\n" + .string "Außerdem hat er sein POKéMON dabei.$" VerdanturfTown_WandasHouse_Text_17886A:: @ 817886A - .string "Thanks to you, I can see my girlfriend\n" - .string "every day.\l" - .string "Happy? You bet I am!$" + .string "Dank dir kann ich meine Freundin jetzt\n" + .string "jeden Tag sehen. Ob ich glücklich bin?\l" + .string "Darauf kannst du wetten!$" VerdanturfTown_WandasHouse_Text_1788B1:: @ 81788B1 - .string "My daughter’s boyfriend is a very\n" - .string "driven and passionate sort of person.\p" - .string "He’s been digging a tunnel nonstop\n" - .string "just so he can see my daughter.\p" - .string "My daughter’s a little concerned,\n" - .string "so she goes out to the tunnel a lot.$" + .string "Der Freund meiner Tochter besitzt viel\n" + .string "Schwung und Energie.\p" + .string "Er gräbt ununterbrochen einen Tunnel,\n" + .string "damit er meine Tochter sehen kann.\p" + .string "Meine Tochter ist etwas besorgt des-\n" + .string "wegen und schaut jeden Tag nach ihm.$" VerdanturfTown_WandasHouse_Text_178983:: @ 8178983 - .string "It’s amazing. My daughter’s boyfriend\n" - .string "was digging the tunnel by hand!\p" - .string "It’s so incredible!$" + .string "Es ist unglaublich! Der Freund meiner \n" + .string "Tochter hat den Tunnel\p" + .string "von Hand gegraben! Einfach sagenhaft!$" VerdanturfTown_WandasHouse_Text_1789DD:: @ 81789DD - .string "If anything were to happen to WALLY,\n" - .string "I would never be able to look his\l" - .string "parents in PETALBURG in the eye...$" + .string "Sollte HEIKO irgendetwas passieren,\n" + .string "könnte ich seinen Eltern in BLÜTENBURG\l" + .string "CITY nicht mehr in die Augen schauen...$" VerdanturfTown_WandasHouse_Text_178A47:: @ 8178A47 - .string "WALLY was in EVER GRANDE?\p" - .string "His parents in PETALBURG would be\n" - .string "astonished to hear that!$" + .string "HEIKO war in PRACHTPOLIS CITY?\p" + .string "Seine Eltern in BLÜTENBURG CITY werden\n" + .string "erstaunt sein, das zu hören.$" diff --git a/data/text/maps/VictoryRoad_1F.inc b/data/text/maps/VictoryRoad_1F.inc index 2f52e5cd4..770e75b3b 100644 --- a/data/text/maps/VictoryRoad_1F.inc +++ b/data/text/maps/VictoryRoad_1F.inc @@ -1,72 +1,75 @@ VictoryRoad_1F_Text_19782B:: @ 819782B - .string "WALLY: Hi! {PLAYER}!\p" - .string "I bet you’re surprised to see me here!\p" - .string "I made it all the way here, and it’s\n" - .string "all thanks to you!\p" - .string "{PLAYER}, losing to you that time\n" - .string "made me stronger!\p" - .string "But I’m not going to lose anymore!\p" - .string "I’m going to win! For the POKéMON who\n" - .string "gave me courage and strength!\p" - .string "Okay... Here I come!$" + .string "HEIKO: Hallo, {PLAYER}!\p" + .string "Du bist bestimmt überrascht, mich hier\n" + .string "zu treffen!\p" + .string "Ich habe es bis hierher geschafft und\n" + .string "das verdanke ich dir!\p" + .string "{PLAYER}, meine Niederlage gegen dich\n" + .string "hat mich viel stärker gemacht!\p" + .string "Ich werde nie wieder verlieren!\p" + .string "Ich werde gewinnen! Für die POKéMON,\n" + .string "die mir Mut und Kraft gegeben haben!\p" + .string "Okay... Jetzt komme ich!$" VictoryRoad_1F_Text_197943:: @ 8197943 .string "Wow!\n" - .string "{PLAYER}, you are strong, after all!$" + .string "{PLAYER}, du wirst immer stärker!$" VictoryRoad_1F_Text_197967:: @ 8197967 - .string "WALLY: I couldn’t beat you today,\n" - .string "{PLAYER}, but one of these days, I’ll\l" - .string "catch up to you!$" + .string "HEIKO: Ich konnte dich heute nicht be-\n" + .string "siegen, aber eines Tages werde ich es\l" + .string "mit dir aufnehmen!$" VictoryRoad_1F_Text_1979BA:: @ 81979BA - .string "WALLY: Hi! {PLAYER}!\p" - .string "I’ve gotten stronger since that last\n" - .string "time! I wanted to show you, {PLAYER}!\p" - .string "Okay... Here I come!$" + .string "HEIKO: Hallo, {PLAYER}!\p" + .string "Ich bin viel stärker geworden! Das\n" + .string "möchte ich dir zeigen, {PLAYER}!\p" + .string "Okay... Jetzt komme ich!$" VictoryRoad_1F_Text_197A23:: @ 8197A23 .string "Wow!\n" - .string "{PLAYER}, you are strong, after all!$" + .string "{PLAYER}, du bist immer noch zu stark!$" VictoryRoad_1F_Text_197A47:: @ 8197A47 - .string "WALLY: I couldn’t beat you this time,\n" - .string "too... But one of these days, {PLAYER},\l" - .string "I’m going to catch up to you...\p" - .string "And challenge the POKéMON LEAGUE!$" + .string "HEIKO: Ich konnte dich wieder nicht\n" + .string "besiegen... Aber eines Tages, {PLAYER},\l" + .string "eines Tages...\p" + .string "Da werde ich sogar die POKéMON LIGA\n" + .string "herausfordern!$" VictoryRoad_1F_Text_197AD1:: @ 8197AD1 - .string "I’ve made it this far a couple times,\n" - .string "but the last stretch is so long...$" + .string "Ich habe es innerhalb kürzester Zeit\n" + .string "bis hierher geschafft, aber das letzte\l" + .string "Stück zieht sich wie Kaugummi...$" VictoryRoad_1F_Text_197B1A:: @ 8197B1A - .string "My dream ends here again...$" + .string "Hier enden meine Träume...$" VictoryRoad_1F_Text_197B36:: @ 8197B36 - .string "You’ve made it this far. Keep the\n" - .string "momentum going and become the\l" - .string "CHAMPION! If anyone can, it’s you!$" + .string "Du bist weit gekommen. Lasse nicht nach\n" + .string "und versuche, der CHAMP zu werden!\l" + .string "Wenn einer das kann, dann du!$" VictoryRoad_1F_Text_197B99:: @ 8197B99 - .string "I didn’t come all this way to lose now.\n" - .string "That possibility doesn’t exist!$" + .string "Ich bin nicht hierher gekommen, um zu\n" + .string "verlieren. Diese Option existiert nicht!$" VictoryRoad_1F_Text_197BE1:: @ 8197BE1 - .string "Impossible...\n" - .string "I lost?$" + .string "Unmöglich...\n" + .string "Ich habe verloren???$" VictoryRoad_1F_Text_197BF7:: @ 8197BF7 - .string "I lost here...\p" - .string "That means I lack the qualifications\n" - .string "to become the CHAMPION...$" + .string "Ich habe hier verloren...\p" + .string "Das heißt, mir fehlt noch eine Menge,\n" + .string "um CHAMP werden zu können.$" VictoryRoad_1F_Text_197C45:: @ 8197C45 - .string "This seemingly infinite and harsh road\n" - .string "lives up to its name of VICTORY.$" + .string "Diese unendliche, raue Straße wird\n" + .string "ihrem Namen - SIEG - gerecht.$" VictoryRoad_1F_Text_197C8D:: @ 8197C8D - .string "Your battle style is fantastic...$" + .string "Dein Kampfstil ist fantastisch...$" VictoryRoad_1F_Text_197CAF:: @ 8197CAF - .string "You seem to have the potential for\n" - .string "becoming the CHAMPION.$" + .string "Du hast wirklich das Potential, der\n" + .string "CHAMP zu werden.$" diff --git a/data/text/maps/VictoryRoad_B1F.inc b/data/text/maps/VictoryRoad_B1F.inc index d820a5c31..2261fceff 100644 --- a/data/text/maps/VictoryRoad_B1F.inc +++ b/data/text/maps/VictoryRoad_B1F.inc @@ -1,35 +1,37 @@ VictoryRoad_B1F_Text_197CE9:: @ 8197CE9 - .string "The thought that I’m getting closer to\n" - .string "the POKéMON LEAGUE...\p" - .string "I’m getting stage fright...$" + .string "Der Gedanke, dass ich der POKéMON LIGA\n" + .string "immer näher komme...\p" + .string "Ich bekomme Lampenfieber...$" VictoryRoad_B1F_Text_197D42:: @ 8197D42 - .string "I couldn’t do a thing...$" + .string "Ich konnte gar nichts machen...$" VictoryRoad_B1F_Text_197D5B:: @ 8197D5B - .string "The POKéMON LEAGUE became distant\n" - .string "again... What a letdown...$" + .string "Die POKéMON LIGA rückt in weite Ferne...\n" + .string "Was für eine Enttäuschung...$" VictoryRoad_B1F_Text_197D98:: @ 8197D98 - .string "To win your way through the POKéMON\n" - .string "LEAGUE, you need the trust of your\l" - .string "POKéMON.$" + .string "Um dich siegreich durch die POKéMON\n" + .string "LIGA zu kämpfen, brauchst du das\l" + .string "Vertrauen deiner POKéMON.$" VictoryRoad_B1F_Text_197DE8:: @ 8197DE8 - .string "Your relationship is based on\n" - .string "solid trust.$" + .string "Eure Beziehung ist auf solidem\n" + .string "Vertrauen aufgebaut.$" VictoryRoad_B1F_Text_197E13:: @ 8197E13 - .string "By being together all the time, trust\n" - .string "grows between POKéMON and TRAINERS.$" + .string "Das Vertrauen zwischen POKéMON und\n" + .string "TRAINER wächst beständig, da sie immer\l" + .string "zusammen sind.$" VictoryRoad_B1F_Text_197E5D:: @ 8197E5D - .string "This isn’t the goal. It’s only a place\n" - .string "on the way to the POKéMON LEAGUE.$" + .string "Das ist nicht das Ziel. Nur eine\n" + .string "Zwischenstation auf dem Weg zur\l" + .string "POKéMON LIGA.$" VictoryRoad_B1F_Text_197EA6:: @ 8197EA6 - .string "That’s the way!$" + .string "Das ist der Weg!$" VictoryRoad_B1F_Text_197EB6:: @ 8197EB6 - .string "You’ll do fine, for sure!\n" - .string "Your POKéMON are all eager to go!$" + .string "Du wirst dich sehr gut schlagen, das ist\n" + .string "sicher. Deine POKéMON lieben dich!$" diff --git a/data/text/maps/VictoryRoad_B2F.inc b/data/text/maps/VictoryRoad_B2F.inc index 760a732ff..2d3301d39 100644 --- a/data/text/maps/VictoryRoad_B2F.inc +++ b/data/text/maps/VictoryRoad_B2F.inc @@ -1,49 +1,50 @@ VictoryRoad_B2F_Text_197EF2:: @ 8197EF2 - .string "I trained together with my whole family,\n" - .string "every one of us!\l" - .string "I’m not losing to anyone!$" + .string "Ich habe mit meiner Familie trainiert,\n" + .string "mit jedem einzelnen Mitglied!\l" + .string "Ich verliere gegen niemanden!$" VictoryRoad_B2F_Text_197F46:: @ 8197F46 - .string "Better than my family?!\n" - .string "Is that possible?!$" + .string "Besser als meine Familie?\n" + .string "Ist das möglich?$" VictoryRoad_B2F_Text_197F71:: @ 8197F71 - .string "I was better than everyone in my\n" - .string "family. I’ve never lost before...\p" - .string "I’ve lost my confidence...\n" - .string "Maybe I’ll go home...$" + .string "Ich war besser als jeder andere aus\n" + .string "meiner Familie. Ich habe nie verloren!\p" + .string "Ich habe mein Selbstvertrauen ver-\n" + .string "loren. Ich gehe nach Hause...$" VictoryRoad_B2F_Text_197FE5:: @ 8197FE5 - .string "I’d heard that there was a tough\n" - .string "little kid around. Do they mean you?$" + .string "Ich habe gehört, dass sich hier ein sehr\n" + .string "starkes Kind herumtreibt. Bist du das?$" VictoryRoad_B2F_Text_19802B:: @ 819802B - .string "The little shrimp is tough!$" + .string "Diese kleine Kröte ist echt stark!$" VictoryRoad_B2F_Text_198047:: @ 8198047 - .string "The rumors I heard, that tough little\n" - .string "kid is from PETALBURG CITY.$" + .string "Das Gerücht sagt, das Kind käme aus\n" + .string "BLÜTENBURG CITY.$" VictoryRoad_B2F_Text_198089:: @ 8198089 - .string "You must be getting a little tired.$" + .string "Du musst doch langsam mal müde werden.$" VictoryRoad_B2F_Text_1980AD:: @ 81980AD - .string "No signs of tiring at all!$" + .string "Keine Anzeichen von Müdigkeit...$" VictoryRoad_B2F_Text_1980C8:: @ 81980C8 - .string "VICTORY ROAD and the POKéMON LEAGUE\n" - .string "are long and grueling challenges.\l" - .string "Beware of fatigue!$" + .string "Die SIEGESSTRASSE und die POKéMON\n" + .string "LIGA sind große und langwierige Heraus-\l" + .string "forderungen. Werde bloß nicht müde!!!$" VictoryRoad_B2F_Text_198121:: @ 8198121 - .string "You shouldn’t get complacent just\n" - .string "because you have a lot of GYM BADGES.\p" - .string "There’s always going to be someone\n" - .string "who’s better than you!$" + .string "Du solltest nicht selbstzufrieden\n" + .string "werden, nur weil du viele ORDEN der\l" + .string "ARENEN besitzt.\p" + .string "Es wird immer jemanden geben, der\n" + .string "besser ist als du!$" VictoryRoad_B2F_Text_1981A3:: @ 81981A3 - .string "You’re better than me!$" + .string "Du bist besser als ich!$" VictoryRoad_B2F_Text_1981BA:: @ 81981BA - .string "Gaze on your collected BADGES and\n" - .string "remember the TRAINERS you’ve faced.$" + .string "Schau dir deine ORDEN an - erinnere dich\n" + .string "an die TRAINER, die du getroffen hast.$" diff --git a/data/text/move_names.inc b/data/text/move_names.inc index e4895646c..94a189b89 100644 --- a/data/text/move_names.inc +++ b/data/text/move_names.inc @@ -1,356 +1,356 @@ gMoveNames:: @ 81F8320 .string "-$$$$$$$", 13 - .string "POUND$", 13 - .string "KARATE CHOP$", 13 - .string "DOUBLESLAP$", 13 - .string "COMET PUNCH$", 13 - .string "MEGA PUNCH$", 13 - .string "PAY DAY$", 13 - .string "FIRE PUNCH$", 13 - .string "ICE PUNCH$", 13 - .string "THUNDERPUNCH$", 13 - .string "SCRATCH$", 13 - .string "VICEGRIP$", 13 + .string "PFUND$", 13 + .string "KARATESCHLAG$", 13 + .string "DUPLEXHIEB$", 13 + .string "KOMETENHIEB$", 13 + .string "MEGAHIEB$", 13 + .string "ZAHLTAG$", 13 + .string "FEUERSCHLAG$", 13 + .string "EISHIEB$", 13 + .string "DONNERSCHLAG$", 13 + .string "KRATZER$", 13 + .string "KLAMMER$", 13 .string "GUILLOTINE$", 13 - .string "RAZOR WIND$", 13 - .string "SWORDS DANCE$", 13 - .string "CUT$", 13 - .string "GUST$", 13 - .string "WING ATTACK$", 13 - .string "WHIRLWIND$", 13 - .string "FLY$", 13 - .string "BIND$", 13 + .string "KLINGENSTURM$", 13 + .string "SCHWERTTANZ$", 13 + .string "ZERSCHNEIDER$", 13 + .string "WINDSTOSS$", 13 + .string "FLÜGELSCHLAG$", 13 + .string "WIRBELWIND$", 13 + .string "FLIEGEN$", 13 + .string "KLAMMERGRIFF$", 13 .string "SLAM$", 13 - .string "VINE WHIP$", 13 - .string "STOMP$", 13 - .string "DOUBLE KICK$", 13 - .string "MEGA KICK$", 13 - .string "JUMP KICK$", 13 - .string "ROLLING KICK$", 13 - .string "SAND-ATTACK$", 13 - .string "HEADBUTT$", 13 - .string "HORN ATTACK$", 13 - .string "FURY ATTACK$", 13 - .string "HORN DRILL$", 13 + .string "RANKENHIEB$", 13 + .string "STAMPFER$", 13 + .string "DOPPELKICK$", 13 + .string "MEGAKICK$", 13 + .string "SPRUNGKICK$", 13 + .string "FEGEKICK$", 13 + .string "SANDWIRBEL$", 13 + .string "KOPFNUSS$", 13 + .string "HORNATTACKE$", 13 + .string "FURIENSCHLAG$", 13 + .string "HORNBOHRER$", 13 .string "TACKLE$", 13 - .string "BODY SLAM$", 13 - .string "WRAP$", 13 - .string "TAKE DOWN$", 13 - .string "THRASH$", 13 - .string "DOUBLE-EDGE$", 13 - .string "TAIL WHIP$", 13 - .string "POISON STING$", 13 - .string "TWINEEDLE$", 13 - .string "PIN MISSILE$", 13 - .string "LEER$", 13 - .string "BITE$", 13 - .string "GROWL$", 13 - .string "ROAR$", 13 - .string "SING$", 13 - .string "SUPERSONIC$", 13 - .string "SONICBOOM$", 13 - .string "DISABLE$", 13 - .string "ACID$", 13 - .string "EMBER$", 13 - .string "FLAMETHROWER$", 13 - .string "MIST$", 13 - .string "WATER GUN$", 13 - .string "HYDRO PUMP$", 13 - .string "SURF$", 13 - .string "ICE BEAM$", 13 + .string "BODYSLAM$", 13 + .string "WICKEL$", 13 + .string "BODYCHECK$", 13 + .string "FUCHTLER$", 13 + .string "RISIKOTACKLE$", 13 + .string "RUTENSCHLAG$", 13 + .string "GIFTSTACHEL$", 13 + .string "DUONADEL$", 13 + .string "NADELRAKETE$", 13 + .string "SILBERBLICK$", 13 + .string "BISS$", 13 + .string "HEULER$", 13 + .string "BRÜLLER$", 13 + .string "GESANG$", 13 + .string "SUPERSCHALL$", 13 + .string "ULTRASCHALL$", 13 + .string "AUSSETZER$", 13 + .string "SÄURE$", 13 + .string "GLUT$", 13 + .string "FLAMMENWURF$", 13 + .string "WEISSNEBEL$", 13 + .string "AQUAKNARRE$", 13 + .string "HYDROPUMPE$", 13 + .string "SURFER$", 13 + .string "EISSTRAHL$", 13 .string "BLIZZARD$", 13 - .string "PSYBEAM$", 13 - .string "BUBBLEBEAM$", 13 - .string "AURORA BEAM$", 13 - .string "HYPER BEAM$", 13 - .string "PECK$", 13 - .string "DRILL PECK$", 13 - .string "SUBMISSION$", 13 - .string "LOW KICK$", 13 - .string "COUNTER$", 13 - .string "SEISMIC TOSS$", 13 - .string "STRENGTH$", 13 - .string "ABSORB$", 13 - .string "MEGA DRAIN$", 13 - .string "LEECH SEED$", 13 - .string "GROWTH$", 13 - .string "RAZOR LEAF$", 13 - .string "SOLARBEAM$", 13 - .string "POISONPOWDER$", 13 - .string "STUN SPORE$", 13 - .string "SLEEP POWDER$", 13 - .string "PETAL DANCE$", 13 - .string "STRING SHOT$", 13 - .string "DRAGON RAGE$", 13 - .string "FIRE SPIN$", 13 - .string "THUNDERSHOCK$", 13 - .string "THUNDERBOLT$", 13 - .string "THUNDER WAVE$", 13 - .string "THUNDER$", 13 - .string "ROCK THROW$", 13 - .string "EARTHQUAKE$", 13 - .string "FISSURE$", 13 - .string "DIG$", 13 - .string "TOXIC$", 13 - .string "CONFUSION$", 13 - .string "PSYCHIC$", 13 - .string "HYPNOSIS$", 13 - .string "MEDITATE$", 13 - .string "AGILITY$", 13 - .string "QUICK ATTACK$", 13 - .string "RAGE$", 13 + .string "PSYSTRAHL$", 13 + .string "BLUBBSTRAHL$", 13 + .string "AURORASTRAHL$", 13 + .string "HYPERSTRAHL$", 13 + .string "SCHNABEL$", 13 + .string "BOHRSCHNABEL$", 13 + .string "ÜBERROLLER$", 13 + .string "FUSSKICK$", 13 + .string "KONTER$", 13 + .string "GEOWURF$", 13 + .string "STÄRKE$", 13 + .string "ABSORBER$", 13 + .string "MEGASAUGER$", 13 + .string "EGELSAMEN$", 13 + .string "WACHSTUM$", 13 + .string "RASIERBLATT$", 13 + .string "SOLARSTRAHL$", 13 + .string "GIFTPUDER$", 13 + .string "STACHELSPORE$", 13 + .string "SCHLAFPUDER$", 13 + .string "BLÄTTERTANZ$", 13 + .string "FADENSCHUSS$", 13 + .string "DRACHENWUT$", 13 + .string "FEUERWIRBEL$", 13 + .string "DONNERSCHOCK$", 13 + .string "DONNERBLITZ$", 13 + .string "DONNERWELLE$", 13 + .string "DONNER$", 13 + .string "STEINWURF$", 13 + .string "ERDBEBEN$", 13 + .string "GEOFISSUR$", 13 + .string "SCHAUFLER$", 13 + .string "TOXIN$", 13 + .string "KONFUSION$", 13 + .string "PSYCHOKINESE$", 13 + .string "HYPNOSE$", 13 + .string "MEDITATION$", 13 + .string "AGILITÄT$", 13 + .string "RUCKZUCKHIEB$", 13 + .string "RASEREI$", 13 .string "TELEPORT$", 13 - .string "NIGHT SHADE$", 13 - .string "MIMIC$", 13 - .string "SCREECH$", 13 - .string "DOUBLE TEAM$", 13 - .string "RECOVER$", 13 - .string "HARDEN$", 13 - .string "MINIMIZE$", 13 - .string "SMOKESCREEN$", 13 - .string "CONFUSE RAY$", 13 - .string "WITHDRAW$", 13 - .string "DEFENSE CURL$", 13 - .string "BARRIER$", 13 - .string "LIGHT SCREEN$", 13 - .string "HAZE$", 13 - .string "REFLECT$", 13 - .string "FOCUS ENERGY$", 13 - .string "BIDE$", 13 - .string "METRONOME$", 13 - .string "MIRROR MOVE$", 13 - .string "SELFDESTRUCT$", 13 - .string "EGG BOMB$", 13 - .string "LICK$", 13 + .string "NACHTNEBEL$", 13 + .string "MIMIKRY$", 13 + .string "KREIDESCHREI$", 13 + .string "DOPPELTEAM$", 13 + .string "GENESUNG$", 13 + .string "HÄRTNER$", 13 + .string "KOMPRIMATOR$", 13 + .string "RAUCHWOLKE$", 13 + .string "KONFUSTRAHL$", 13 + .string "PANZERSCHUTZ$", 13 + .string "EINIGLER$", 13 + .string "BARRIERE$", 13 + .string "LICHTSCHILD$", 13 + .string "DUNKELNEBEL$", 13 + .string "REFLEKTOR$", 13 + .string "ENERGIEFOKUS$", 13 + .string "GEDULD$", 13 + .string "METRONOM$", 13 + .string "SPIEGELTRICK$", 13 + .string "FINALE$", 13 + .string "EIERBOMBE$", 13 + .string "SCHLECKER$", 13 .string "SMOG$", 13 - .string "SLUDGE$", 13 - .string "BONE CLUB$", 13 - .string "FIRE BLAST$", 13 - .string "WATERFALL$", 13 - .string "CLAMP$", 13 - .string "SWIFT$", 13 - .string "SKULL BASH$", 13 - .string "SPIKE CANNON$", 13 - .string "CONSTRICT$", 13 - .string "AMNESIA$", 13 - .string "KINESIS$", 13 - .string "SOFTBOILED$", 13 - .string "HI JUMP KICK$", 13 - .string "GLARE$", 13 - .string "DREAM EATER$", 13 - .string "POISON GAS$", 13 - .string "BARRAGE$", 13 - .string "LEECH LIFE$", 13 - .string "LOVELY KISS$", 13 - .string "SKY ATTACK$", 13 - .string "TRANSFORM$", 13 - .string "BUBBLE$", 13 - .string "DIZZY PUNCH$", 13 - .string "SPORE$", 13 - .string "FLASH$", 13 - .string "PSYWAVE$", 13 - .string "SPLASH$", 13 - .string "ACID ARMOR$", 13 - .string "CRABHAMMER$", 13 + .string "SCHLAMMBAD$", 13 + .string "KNOCHENKEULE$", 13 + .string "FEUERSTURM$", 13 + .string "KASKADE$", 13 + .string "SCHNAPPER$", 13 + .string "STERNSCHAUER$", 13 + .string "SCHÄDELWUMME$", 13 + .string "DORNKANONE$", 13 + .string "UMKLAMMERUNG$", 13 + .string "AMNESIE$", 13 + .string "PSYKRAFT$", 13 + .string "WEICHEI$", 13 + .string "TURMKICK$", 13 + .string "GIFTBLICK$", 13 + .string "TRAUMFRESSER$", 13 + .string "GIFTWOLKE$", 13 + .string "STAKKATO$", 13 + .string "BLUTSAUGER$", 13 + .string "TODESKUSS$", 13 + .string "HIMMELSFEGER$", 13 + .string "WANDLER$", 13 + .string "BLUBBER$", 13 + .string "IRRSCHLAG$", 13 + .string "PILZSPORE$", 13 + .string "BLITZ$", 13 + .string "PSYWELLE$", 13 + .string "PLATSCHER$", 13 + .string "SÄUREPANZER$", 13 + .string "KRABBHAMMER$", 13 .string "EXPLOSION$", 13 - .string "FURY SWIPES$", 13 - .string "BONEMERANG$", 13 - .string "REST$", 13 - .string "ROCK SLIDE$", 13 - .string "HYPER FANG$", 13 - .string "SHARPEN$", 13 - .string "CONVERSION$", 13 - .string "TRI ATTACK$", 13 - .string "SUPER FANG$", 13 - .string "SLASH$", 13 - .string "SUBSTITUTE$", 13 - .string "STRUGGLE$", 13 - .string "SKETCH$", 13 - .string "TRIPLE KICK$", 13 - .string "THIEF$", 13 - .string "SPIDER WEB$", 13 - .string "MIND READER$", 13 - .string "NIGHTMARE$", 13 - .string "FLAME WHEEL$", 13 - .string "SNORE$", 13 - .string "CURSE$", 13 - .string "FLAIL$", 13 - .string "CONVERSION 2$", 13 - .string "AEROBLAST$", 13 - .string "COTTON SPORE$", 13 - .string "REVERSAL$", 13 - .string "SPITE$", 13 - .string "POWDER SNOW$", 13 - .string "PROTECT$", 13 - .string "MACH PUNCH$", 13 - .string "SCARY FACE$", 13 - .string "FAINT ATTACK$", 13 - .string "SWEET KISS$", 13 - .string "BELLY DRUM$", 13 - .string "SLUDGE BOMB$", 13 - .string "MUD-SLAP$", 13 + .string "KRATZFURIE$", 13 + .string "KNOCHMERANG$", 13 + .string "ERHOLUNG$", 13 + .string "STEINHAGEL$", 13 + .string "HYPERZAHN$", 13 + .string "SCHÄRFER$", 13 + .string "UMWANDLUNG$", 13 + .string "TRIPLETTE$", 13 + .string "SUPERZAHN$", 13 + .string "SCHLITZER$", 13 + .string "DELEGATOR$", 13 + .string "VERZWEIFLER$", 13 + .string "NACHAHMER$", 13 + .string "DREIFACHKICK$", 13 + .string "RAUB$", 13 + .string "SPINNENNETZ$", 13 + .string "WILLENSLESER$", 13 + .string "NACHTMAHR$", 13 + .string "FLAMMENRAD$", 13 + .string "SCHNARCHER$", 13 + .string "FLUCH$", 13 + .string "DRESCHFLEGEL$", 13 + .string "UMWANDLUNG2$", 13 + .string "LUFTSTOSS$", 13 + .string "BAUMWOLLSAAT$", 13 + .string "GEGENSCHLAG$", 13 + .string "GROLL$", 13 + .string "PULVERSCHNEE$", 13 + .string "SCHUTZSCHILD$", 13 + .string "TEMPOHIEB$", 13 + .string "GRIMASSE$", 13 + .string "FINTE$", 13 + .string "BITTERKUSS$", 13 + .string "BAUCHTROMMEL$", 13 + .string "MATSCHBOMBE$", 13 + .string "LEHMSCHELLE$", 13 .string "OCTAZOOKA$", 13 - .string "SPIKES$", 13 - .string "ZAP CANNON$", 13 - .string "FORESIGHT$", 13 - .string "DESTINY BOND$", 13 - .string "PERISH SONG$", 13 - .string "ICY WIND$", 13 - .string "DETECT$", 13 - .string "BONE RUSH$", 13 - .string "LOCK-ON$", 13 - .string "OUTRAGE$", 13 - .string "SANDSTORM$", 13 - .string "GIGA DRAIN$", 13 - .string "ENDURE$", 13 - .string "CHARM$", 13 - .string "ROLLOUT$", 13 - .string "FALSE SWIPE$", 13 - .string "SWAGGER$", 13 - .string "MILK DRINK$", 13 - .string "SPARK$", 13 - .string "FURY CUTTER$", 13 - .string "STEEL WING$", 13 - .string "MEAN LOOK$", 13 - .string "ATTRACT$", 13 - .string "SLEEP TALK$", 13 - .string "HEAL BELL$", 13 - .string "RETURN$", 13 - .string "PRESENT$", 13 + .string "STACHLER$", 13 + .string "BLITZKANONE$", 13 + .string "GESICHTE$", 13 + .string "ABGANGSBUND$", 13 + .string "ABGESANG$", 13 + .string "EISSTURM$", 13 + .string "SCANNER$", 13 + .string "KNOCHENHATZ$", 13 + .string "ZIELSCHUSS$", 13 + .string "WUTANFALL$", 13 + .string "SANDSTURM$", 13 + .string "GIGASAUGER$", 13 + .string "AUSDAUER$", 13 + .string "CHARME$", 13 + .string "WALZER$", 13 + .string "TRUGSCHLAG$", 13 + .string "ANGEBEREI$", 13 + .string "MILCHGETRÄNK$", 13 + .string "FUNKENSPRUNG$", 13 + .string "ZORNKLINGE$", 13 + .string "STAHLFLÜGEL$", 13 + .string "HORRORBLICK$", 13 + .string "ANZIEHUNG$", 13 + .string "SCHLAFREDE$", 13 + .string "VITALGLOCKE$", 13 + .string "RÜCKKEHR$", 13 + .string "GESCHENK$", 13 .string "FRUSTRATION$", 13 - .string "SAFEGUARD$", 13 - .string "PAIN SPLIT$", 13 - .string "SACRED FIRE$", 13 - .string "MAGNITUDE$", 13 - .string "DYNAMICPUNCH$", 13 - .string "MEGAHORN$", 13 - .string "DRAGONBREATH$", 13 - .string "BATON PASS$", 13 - .string "ENCORE$", 13 - .string "PURSUIT$", 13 - .string "RAPID SPIN$", 13 - .string "SWEET SCENT$", 13 - .string "IRON TAIL$", 13 - .string "METAL CLAW$", 13 - .string "VITAL THROW$", 13 - .string "MORNING SUN$", 13 - .string "SYNTHESIS$", 13 - .string "MOONLIGHT$", 13 - .string "HIDDEN POWER$", 13 - .string "CROSS CHOP$", 13 - .string "TWISTER$", 13 - .string "RAIN DANCE$", 13 - .string "SUNNY DAY$", 13 - .string "CRUNCH$", 13 - .string "MIRROR COAT$", 13 - .string "PSYCH UP$", 13 - .string "EXTREMESPEED$", 13 - .string "ANCIENTPOWER$", 13 - .string "SHADOW BALL$", 13 - .string "FUTURE SIGHT$", 13 - .string "ROCK SMASH$", 13 + .string "BODYGUARD$", 13 + .string "LEIDTEILER$", 13 + .string "LÄUTERFEUER$", 13 + .string "INTENSITÄT$", 13 + .string "WUCHTSCHLAG$", 13 + .string "VIELENDER$", 13 + .string "FEUERODEM$", 13 + .string "STAFFETTE$", 13 + .string "ZUGABE$", 13 + .string "VERFOLGUNG$", 13 + .string "TURBODREHER$", 13 + .string "LOCKDUFT$", 13 + .string "EISENSCHWEIF$", 13 + .string "METALLKLAUE$", 13 + .string "ÜBERWURF$", 13 + .string "MORGENGRAUEN$", 13 + .string "SYNTHESE$", 13 + .string "MONDSCHEIN$", 13 + .string "KRAFTRESERVE$", 13 + .string "KREUZHIEB$", 13 + .string "WINDHOSE$", 13 + .string "REGENTANZ$", 13 + .string "SONNENTAG$", 13 + .string "KNIRSCHER$", 13 + .string "SPIEGELCAPE$", 13 + .string "PSYCHO-PLUS$", 13 + .string "TURBOTEMPO$", 13 + .string "ANTIK-KRAFT$", 13 + .string "SPUKBALL$", 13 + .string "SEHER$", 13 + .string "ZERTRÜMMERER$", 13 .string "WHIRLPOOL$", 13 - .string "BEAT UP$", 13 - .string "FAKE OUT$", 13 - .string "UPROAR$", 13 - .string "STOCKPILE$", 13 - .string "SPIT UP$", 13 - .string "SWALLOW$", 13 - .string "HEAT WAVE$", 13 - .string "HAIL$", 13 - .string "TORMENT$", 13 - .string "FLATTER$", 13 - .string "WILL-O-WISP$", 13 - .string "MEMENTO$", 13 - .string "FACADE$", 13 - .string "FOCUS PUNCH$", 13 - .string "SMELLINGSALT$", 13 - .string "FOLLOW ME$", 13 - .string "NATURE POWER$", 13 - .string "CHARGE$", 13 - .string "TAUNT$", 13 - .string "HELPING HAND$", 13 - .string "TRICK$", 13 - .string "ROLE PLAY$", 13 - .string "WISH$", 13 - .string "ASSIST$", 13 - .string "INGRAIN$", 13 - .string "SUPERPOWER$", 13 - .string "MAGIC COAT$", 13 - .string "RECYCLE$", 13 - .string "REVENGE$", 13 - .string "BRICK BREAK$", 13 - .string "YAWN$", 13 - .string "KNOCK OFF$", 13 - .string "ENDEAVOR$", 13 + .string "PRÜGLER$", 13 + .string "MOGELHIEB$", 13 + .string "AUFRUHR$", 13 + .string "HORTER$", 13 + .string "ENTFESSLER$", 13 + .string "VERZEHRER$", 13 + .string "HITZEWELLE$", 13 + .string "HAGELSTURM$", 13 + .string "FOLTERKNECHT$", 13 + .string "SCHMEICHLER$", 13 + .string "IRRLICHT$", 13 + .string "MEMENTO-MORI$", 13 + .string "FASSADE$", 13 + .string "POWER-PUNCH$", 13 + .string "RIECHSALZ$", 13 + .string "SPOTLIGHT$", 13 + .string "NATUR-KRAFT$", 13 + .string "LADEVORGANG$", 13 + .string "VERHÖHNER$", 13 + .string "RECHTE HAND$", 13 + .string "TRICKBETRUG$", 13 + .string "ROLLENTAUSCH$", 13 + .string "WUNSCHTRAUM$", 13 + .string "ZUSCHUSS$", 13 + .string "VERWURZLER$", 13 + .string "KRAFTKOLOSS$", 13 + .string "MAGIEMANTEL$", 13 + .string "AUFBEREITUNG$", 13 + .string "VERGELTUNG$", 13 + .string "DURCHBRUCH$", 13 + .string "GÄHNER$", 13 + .string "ABSCHLAG$", 13 + .string "NOTSITUATION$", 13 .string "ERUPTION$", 13 - .string "SKILL SWAP$", 13 - .string "IMPRISON$", 13 - .string "REFRESH$", 13 - .string "GRUDGE$", 13 - .string "SNATCH$", 13 - .string "SECRET POWER$", 13 - .string "DIVE$", 13 - .string "ARM THRUST$", 13 - .string "CAMOUFLAGE$", 13 - .string "TAIL GLOW$", 13 - .string "LUSTER PURGE$", 13 - .string "MIST BALL$", 13 - .string "FEATHERDANCE$", 13 - .string "TEETER DANCE$", 13 - .string "BLAZE KICK$", 13 - .string "MUD SPORT$", 13 - .string "ICE BALL$", 13 - .string "NEEDLE ARM$", 13 - .string "SLACK OFF$", 13 - .string "HYPER VOICE$", 13 - .string "POISON FANG$", 13 - .string "CRUSH CLAW$", 13 - .string "BLAST BURN$", 13 - .string "HYDRO CANNON$", 13 - .string "METEOR MASH$", 13 - .string "ASTONISH$", 13 - .string "WEATHER BALL$", 13 - .string "AROMATHERAPY$", 13 - .string "FAKE TEARS$", 13 - .string "AIR CUTTER$", 13 - .string "OVERHEAT$", 13 - .string "ODOR SLEUTH$", 13 - .string "ROCK TOMB$", 13 - .string "SILVER WIND$", 13 - .string "METAL SOUND$", 13 - .string "GRASSWHISTLE$", 13 - .string "TICKLE$", 13 - .string "COSMIC POWER$", 13 - .string "WATER SPOUT$", 13 - .string "SIGNAL BEAM$", 13 - .string "SHADOW PUNCH$", 13 - .string "EXTRASENSORY$", 13 - .string "SKY UPPERCUT$", 13 - .string "SAND TOMB$", 13 - .string "SHEER COLD$", 13 - .string "MUDDY WATER$", 13 - .string "BULLET SEED$", 13 - .string "AERIAL ACE$", 13 - .string "ICICLE SPEAR$", 13 - .string "IRON DEFENSE$", 13 - .string "BLOCK$", 13 - .string "HOWL$", 13 - .string "DRAGON CLAW$", 13 - .string "FRENZY PLANT$", 13 - .string "BULK UP$", 13 - .string "BOUNCE$", 13 - .string "MUD SHOT$", 13 - .string "POISON TAIL$", 13 - .string "COVET$", 13 - .string "VOLT TACKLE$", 13 - .string "MAGICAL LEAF$", 13 - .string "WATER SPORT$", 13 - .string "CALM MIND$", 13 - .string "LEAF BLADE$", 13 - .string "DRAGON DANCE$", 13 - .string "ROCK BLAST$", 13 - .string "SHOCK WAVE$", 13 - .string "WATER PULSE$", 13 - .string "DOOM DESIRE$", 13 - .string "PSYCHO BOOST$", 13 + .string "WERTEWECHSEL$", 13 + .string "BEGRENZER$", 13 + .string "HEILUNG$", 13 + .string "NACHSPIEL$", 13 + .string "ÜBERNAHME$", 13 + .string "GEHEIMPOWER$", 13 + .string "TAUCHER$", 13 + .string "ARMSTOSS$", 13 + .string "TARNUNG$", 13 + .string "SCHWEIFGLANZ$", 13 + .string "SCHEINWERFER$", 13 + .string "NEBELBALL$", 13 + .string "DAUNENREIGEN$", 13 + .string "TAUMELTANZ$", 13 + .string "FEUERFEGER$", 13 + .string "LEHMSUHLER$", 13 + .string "FROSTBEULE$", 13 + .string "NIETENRANKE$", 13 + .string "TAGEDIEB$", 13 + .string "SCHALLWELLE$", 13 + .string "GIFTZAHN$", 13 + .string "ZERMALMKLAUE$", 13 + .string "LOHEKANONADE$", 13 + .string "AQUAHAUBITZE$", 13 + .string "STERNENHIEB$", 13 + .string "ERSTAUNER$", 13 + .string "METEOROLOGE$", 13 + .string "AROMAKUR$", 13 + .string "TRUGTRÄNE$", 13 + .string "WINDSCHNITT$", 13 + .string "HITZEKOLLER$", 13 + .string "SCHNÜFFLER$", 13 + .string "FELSGRAB$", 13 + .string "SILBERHAUCH$", 13 + .string "METALLSOUND$", 13 + .string "GRASFLÖTE$", 13 + .string "SPASSKANONE$", 13 + .string "KOSMIK-KRAFT$", 13 + .string "FONTRÄNEN$", 13 + .string "AMPELLEUCHTE$", 13 + .string "FINSTERFAUST$", 13 + .string "SONDERSENSOR$", 13 + .string "HIMMELHIEB$", 13 + .string "SANDGRAB$", 13 + .string "EISESKÄLTE$", 13 + .string "LEHMBRÜHE$", 13 + .string "KUGELSAAT$", 13 + .string "AERO-ASS$", 13 + .string "EISSPEER$", 13 + .string "EISENABWEHR$", 13 + .string "RÜCKENTZUG$", 13 + .string "JAULER$", 13 + .string "DRACHENKLAUE$", 13 + .string "FAUNA-STATUE$", 13 + .string "PROTZER$", 13 + .string "SPRUNGFEDER$", 13 + .string "LEHMSCHUSS$", 13 + .string "GIFTSCHWEIF$", 13 + .string "BEZIRZER$", 13 + .string "VOLTTACKLE$", 13 + .string "ZAUBERBLATT$", 13 + .string "NASSMACHER$", 13 + .string "GEDANKENGUT$", 13 + .string "LAUBKLINGE$", 13 + .string "DRACHENTANZ$", 13 + .string "FELSWURF$", 13 + .string "SCHOCKWELLE$", 13 + .string "AQUAWELLE$", 13 + .string "KISMETWUNSCH$", 13 + .string "PSYSCHUB$", 13 diff --git a/data/text/mystery_event_club.inc b/data/text/mystery_event_club.inc index cfe8c4947..05662c2e8 100644 --- a/data/text/mystery_event_club.inc +++ b/data/text/mystery_event_club.inc @@ -1,75 +1,77 @@ PetalburgCity_PokemonCenter_1F_Text_1B1C97:: @ 81B1C97 - .string "Hello there, TRAINER!\n" - .string "You’ve got a wonderful smile, there.\p" - .string "I have a hobby - collecting the profiles\n" - .string "of POKéMON TRAINERS.$" + .string "Hallo, du! TRAINER!\n" + .string "Du hast ein wundervolles Lächeln.\p" + .string "Ich habe ein Hobby: Ich sammle die\n" + .string "Profile von POKéMON-TRAINERN.$" PetalburgCity_PokemonCenter_1F_Text_1B1D10:: @ 81B1D10 - .string "So, how about it?\n" - .string "May I see your profile?$" + .string "Nun, wie sieht es aus?\n" + .string "Darf ich dein Profil sehen?$" PetalburgCity_PokemonCenter_1F_Text_1B1D3A:: @ 81B1D3A - .string "You make your own profile by putting\n" - .string "together four words or phrases.\p" - .string "Here, I’ll show you an example of a\n" - .string "profile using four pieces of text.\p" - .string "You can switch those four pieces with\n" - .string "other text pieces any which way you\l" - .string "like to make your own profile.\p" - .string "There are a lot of text pieces that you\n" - .string "can use.\p" - .string "They are arranged in groups like\n" - .string "POKéMON, lifestyles, and hobbies so\l" - .string "it is easier to look them up.\p" - .string "So, first, choose the group of text\n" - .string "pieces to display a list of choices.\p" - .string "Then, pick the choice you want.\p" - .string "Repeat for the remaining text choices,\n" - .string "and you’ll have your very own profile.$" + .string "Du erstellst dir dein eigenes Profil,\n" + .string "indem du 4 Worte oder Phrasen\l" + .string "zusammenstellst.\p" + .string "Ich gebe dir ein Beispiel für ein Profil\n" + .string "mit vier Begriffen.\p" + .string "Du kannst diese vier Begriffe mit\n" + .string "anderen Begriffen tauschen, ganz\l" + .string "so, wie du dein Profil haben möchtest.\p" + .string "Dir stehen sehr viele Begriffe\n" + .string "zur Verfügung.\p" + .string "Sie sind nach Gruppen sortiert, wie\n" + .string "POKéMON, Lifestyle und Hobbies. So\l" + .string "hast du einen besseren Überblick.\p" + .string "Wähle zunächst eine Gruppe aus, um\n" + .string "eine Liste entsprechender Begriffe\p" + .string "zu öffnen. Dann triffst du deine Wahl.\p" + .string "Suche dir beliebige Begriffe aus den\n" + .string "Gruppen aus, um dein ganz persönliches\l" + .string "Profil zu erstellen.$" UnknownString_81B1F7A: @ 81B1F7A .string "$" PetalburgCity_PokemonCenter_1F_Text_1B1F7B:: @ 81B1F7B - .string "Yes! Thank you!\n" - .string "May I see your profile?$" + .string "Ja! Danke schön!\n" + .string "Zeigst du mir jetzt dein Profil?$" PetalburgCity_PokemonCenter_1F_Text_1B1FA3:: @ 81B1FA3 - .string "Oh, no, really?\p" - .string "I imagine someone like you would have\n" - .string "a wonderful profile...$" + .string "Oh, nein, ehrlich?\p" + .string "Ich dachte, jemand wie du hätte ein\n" + .string "wundervolles Profil...$" PetalburgCity_PokemonCenter_1F_Text_1B1FF0:: @ 81B1FF0 - .string "Oh? You’re not into it right now?\p" - .string "Well, anytime is good by me!$" + .string "Oh! Du bist noch nicht so weit?\p" + .string "Nun, dann zeig es mir doch später!$" PetalburgCity_PokemonCenter_1F_Text_1B202F:: @ 81B202F - .string "Hello there, TRAINER!\n" - .string "You’ve got a wonderful smile.$" + .string "Hallo, da drüben! TRAINER!\p" + .string "Du hast ein wundervolles Lächeln.$" PetalburgCity_PokemonCenter_1F_Text_1B2063:: @ 81B2063 - .string "May I see your new profile?$" + .string "Darf ich dein neues Profil sehen?$" PetalburgCity_PokemonCenter_1F_Text_1B207F:: @ 81B207F - .string "Yes! Thank you!\p" - .string "I hope it’s even better than the profile\n" - .string "you showed me before.$" + .string "Ja? Danke schön!\p" + .string "Ich hoffe, das Profil ist besser als das\n" + .string "vorhergehende.$" PetalburgCity_PokemonCenter_1F_Text_1B20CE:: @ 81B20CE - .string "Oh, you like your profile the way it is.\p" - .string "I don’t blame you - it’s a wonderful\n" - .string "profile the way it is now.$" + .string "Oh, du magst dein Profil, wie es ist?\p" + .string "Ich mache dir keine Vorwürfe - so, wie\n" + .string "es jetzt ist, ist das Profil wunderbar.$" PetalburgCity_PokemonCenter_1F_Text_1B2137:: @ 81B2137 - .string "F-fantastic!\p" - .string "Your profile, it’s wonderful!\n" - .string "It really says what you’re about.\p" - .string "Why, anyone hearing this profile would\n" - .string "be captivated by you!\p" - .string "Thank you!$" + .string "Fa-fantastisch!\p" + .string "Dein Profil... Einfach wunderbar!\n" + .string "Es sagt wirklich alles über dich aus.\p" + .string "Jeder, der dieses Profil sieht, wird\n" + .string "von dir entzückt sein!\p" + .string "Danke schön.$" PetalburgCity_PokemonCenter_1F_Text_1B21CC:: @ 81B21CC - .string "Oh?\n" - .string "You know the secret saying!\p" - .string "That means you’re now a fellow member\n" - .string "of the MYSTERY EVENT CLUB!$" + .string "Oh!\n" + .string "Du kennst die Losung!!\p" + .string "Das bedeutet, dass du ein Mitglied des\n" + .string "CLUB des GEHEIMGESCHEHENS bist!$" diff --git a/data/text/pokeblocks.inc b/data/text/pokeblocks.inc index e73a74cc0..f137c8fb5 100644 --- a/data/text/pokeblocks.inc +++ b/data/text/pokeblocks.inc @@ -1,125 +1,129 @@ FallarborTown_ContestLobby_Text_1B6E63:: @ 81B6E63 - .string "Oh? Did you want to make some {POKEBLOCK}S\n" - .string "with this old-timer?$" + .string "Oh? Möchtest du mit diesem alten Herrn\n" + .string "ein paar {POKEBLOCK} herstellen?$" FallarborTown_ContestLobby_Text_1B6E9D:: @ 81B6E9D - .string "Excellent!$" + .string "Ausgezeichnet!$" FallarborTown_ContestLobby_Text_1B6EA8:: @ 81B6EA8 .string "Oh...\n" - .string "You’ve made this old-timer sad...$" + .string "Das macht diesen alten Herrn traurig.$" FallarborTown_ContestLobby_Text_1B6ED0:: @ 81B6ED0 - .string "Do you know how to make a {POKEBLOCK}?$" + .string "Weißt du, wie man {POKEBLOCK} herstellt?$" FallarborTown_ContestLobby_Text_1B6EF1:: @ 81B6EF1 - .string "Let’s get started, then!\p" - .string "Let’s BERRY BLENDER!$" + .string "Dann lass uns loslegen!\p" + .string "Lass uns BEEREN MIXEN!$" FallarborTown_ContestLobby_Text_1B6F1F:: @ 81B6F1F - .string "Okay, a little explanation, then.\p" - .string "Oh, don’t worry, it’s quite simple.\p" - .string "When the BLENDER’s arrow comes to\n" - .string "your marker, just press the A Button.\p" - .string "That’s all you have to do.\n" - .string "You’ll see how easy it is when you try.$" + .string "Okay, ich gebe dir eine kurze Erklärung.\p" + .string "Keine Angst, es ist ganz einfach.\p" + .string "Erreicht der rotierende Pfeil deine\n" + .string "Markierung, dann drücke den A-Knopf.\p" + .string "Das ist schon alles. Probier es mal, du\n" + .string "wirst sehen, wie einfach das ist.$" FallarborTown_ContestLobby_Text_1B6FF0:: @ 81B6FF0 - .string "Oh?\n" - .string "You don’t have any BERRIES?\p" - .string "If you don’t have any BERRIES,\n" - .string "you can’t make any {POKEBLOCK}S.$" + .string "Oh!\n" + .string "Du hast keine BEEREN dabei?\p" + .string "Wenn du keine BEEREN hast, kannst du\n" + .string "keine {POKEBLOCK} machen.$" FallarborTown_ContestLobby_Text_1B704A:: @ 81B704A - .string "Well, that won’t do at all now, will it?\p" - .string "If you don’t mind leftovers, you can\n" - .string "have one of my BERRIES.\p" - .string "That way, we could make some {POKEBLOCK}S\n" - .string "together using the BERRY BLENDER.$" + .string "Nun, das hilft uns jetzt nicht weiter.\p" + .string "Wenn du nichts gegen Reste hast,\n" + .string "kannst du diese BEERE haben.\p" + .string "Dann können wir mit dem BEERENMIXER\n" + .string "{POKEBLOCK} herstellen.$" FallarborTown_ContestLobby_Text_1B70F6:: @ 81B70F6 - .string "If I had some BERRIES left over,\n" - .string "I’d gladly give you one...\p" - .string "But, I don’t have any to spare today.\n" - .string "We’ll have to do this another time.$" + .string "Hätte ich BEEREN übrig, würde ich dir\n" + .string "gerne eine abgeben...\p" + .string "Aber heute habe ich keine übrig. Wir\n" + .string "müssen das ein anderes Mal machen.$" FallarborTown_ContestLobby_Text_1B717C:: @ 81B717C - .string "But your {POKEBLOCK} CASE is full.\p" - .string "You should use some {POKEBLOCK}S before\n" - .string "you come see me again.$" + .string "Aber deine {POKEBLOCK}BOX ist voll.\p" + .string "Du solltest einige {POKEBLOCK} verwenden\n" + .string "und dann wiederkommen.$" FallarborTown_ContestLobby_Text_1B71D2:: @ 81B71D2 - .string "But you don’t have a {POKEBLOCK} CASE.\p" - .string "You should get a {POKEBLOCK} CASE and then\n" - .string "come see me.$" + .string "Aber du hast keine {POKEBLOCK}BOX.\p" + .string "Besorg dir eine {POKEBLOCK}BOX und\n" + .string "komm dann wieder.$" LilycoveCity_ContestLobby_Text_1B7225:: @ 81B7225 SlateportCity_ContestLobby_Text_1B7225:: @ 81B7225 - .string "Let’s get blending already!$" + .string "Dann lass uns mal mixen.$" LilycoveCity_ContestLobby_Text_1B7241:: @ 81B7241 - .string "I wonder what kind of {POKEBLOCK} I’ll get?\n" - .string "This is so exciting!$" + .string "Ich bin mal gespannt, welchen {POKEBLOCK}\n" + .string "ich bekomme. Das ist ja total aufregend!$" FallarborTown_ContestLobby_Text_1B727C:: @ 81B727C - .string "{POKEBLOCK}S will be made with your friends \n" - .string "from BERRIES in the BERRY BLENDER.\p" - .string "Is it okay to save the game before\n" - .string "linking with your friends?$" + .string "{POKEBLOCK} können mit Hilfe deiner Freunde\n" + .string "im BEERENMIXER aus BEEREN gemacht\l" + .string "werden.\p" + .string "Soll das Spiel gespeichert werden, bevor\n" + .string "du dich mit Freunden verbindest?$" FallarborTown_ContestLobby_Text_1B7304:: @ 81B7304 - .string "Searching for your friends...\n" - .string "... ... B Button: Cancel$" + .string "Verbindung zu Freunden wird aufgebaut.\n" + .string "...B-Knopf: Abbruch$" FallarborTown_ContestLobby_Text_1B733B:: @ 81B733B - .string "{STR_VAR_1} arrived.$" + .string "{STR_VAR_1} ist eingetroffen.$" FallarborTown_ContestLobby_Text_1B7347:: @ 81B7347 - .string "{STR_VAR_1} and {STR_VAR_2} arrived.$" + .string "{STR_VAR_1} und {STR_VAR_2} sind\n" + .string "eingetroffen.$" FallarborTown_ContestLobby_Text_1B735A:: @ 81B735A - .string "{STR_VAR_1}, {STR_VAR_2}, and\n" - .string "{STR_VAR_3} arrived.$" + .string "{STR_VAR_1}, {STR_VAR_2} und\n" + .string "{STR_VAR_3} sind eingetroffen.$" UnknownString_81B7372: @ 81B7372 - .string "Nobody came...$" + .string "Keiner da...$" FallarborTown_ContestLobby_Text_1B7381:: @ 81B7381 - .string "You have no BERRIES.\n" - .string "The BERRY BLENDER can’t be used.$" + .string "Du hast keine BEEREN. Du kannst\n" + .string "den BEERENMIXER nicht benutzen.$" FallarborTown_ContestLobby_Text_1B73B7:: @ 81B73B7 - .string "Your {POKEBLOCK} CASE is full.\n" - .string "The BERRY BLENDER can’t be used.$" + .string "Deine {POKEBLOCK}BOX ist voll. Du kannst\n" + .string "den BEERENMIXER nicht benutzen.$" FallarborTown_ContestLobby_Text_1B73F1:: @ 81B73F1 - .string "You don’t have a {POKEBLOCK} CASE.\n" - .string "The BERRY BLENDER can’t be used.$" + .string "Du hast keine {POKEBLOCK}BOX und\n" + .string "kannst den BEERENMIXER nicht nutzen.$" FallarborTown_ContestLobby_Text_1B742F:: @ 81B742F - .string "I love making {POKEBLOCK}S.\p" - .string "I always have some BERRIES with me.$" + .string "Ich liebe es, {POKEBLOCK}\n" + .string "herzustellen!\p" + .string "Ich habe immer einige BEEREN dabei.$" FallarborTown_ContestLobby_Text_1B7469:: @ 81B7469 - .string "If you’d like, we could make some\n" - .string "{POKEBLOCK}S together using the\l" - .string "BERRY BLENDER.$" + .string "Wenn du magst, können wir einige\n" + .string "{POKEBLOCK} zusammen am BEERENMIXER\l" + .string "herstellen.$" FallarborTown_ContestLobby_Text_1B74B4:: @ 81B74B4 .string "Oh?\n" - .string "You don’t have any BERRIES?\p" - .string "Well, that won’t do at all now, will it?\p" - .string "If you don’t mind leftovers, you can\n" - .string "have one of my BERRIES.$" + .string "Du hast keine BEEREN?\p" + .string "Na, dann klappt das dieses Mal nicht.\p" + .string "Aber... Wenn du nichts gegen Reste\n" + .string "einzuwenden hast, dann kannst du eine\l" + .string "meiner BEEREN haben.$" FallarborTown_ContestLobby_Text_1B753A:: @ 81B753A - .string "We’ll use it to make {POKEBLOCK}S together\n" - .string "using the BERRY BLENDER.$" + .string "Aus den BEEREN stellen wir im\n" + .string "BEERENMIXER {POKEBLOCK} her.$" FallarborTown_ContestLobby_Text_1B7578:: @ 81B7578 .string "Oh?\n" - .string "You don’t have any BERRIES?\p" - .string "If I had some left over, I’d gladly\n" - .string "give you one...\p" - .string "But, I don’t have any to spare today.\n" - .string "Sorry about that.$" + .string "Du hast keine BEEREN?\p" + .string "Wenn ich welche übrig hätte, würde ich\n" + .string "dir gerne eine abgeben...\p" + .string "Aber leider habe ich heute keine übrig.\n" + .string "Das tut mir echt Leid.$" diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index bcf57eb5b..fa3507866 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,106 +1,110 @@ Route101_Text_1C4449:: @ 81C4449 - .string "PROF. BIRCH: Ah, {PLAYER}{KUN}!\p" - .string "Have you come to show me how your\n" - .string "POKéDEX is coming along?$" + .string "PROF. BIRK: Ah, {PLAYER}{KUN}!\p" + .string "Möchtest du mir deine Fortschritte mit\n" + .string "dem POKéDEX zeigen?$" Route101_Text_1C449B:: @ 81C449B - .string "Hm? Oh, you haven’t caught enough\n" - .string "POKéMON to make it worthwhile.$" + .string "Ach? Du hast erst so wenige POKéMON\n" + .string "gefangen, dass es sich nicht lohnt,\l" + .string "ihn mir zu zeigen?$" Route101_Text_1C44DC:: @ 81C44DC .string "Hmhm...\p" - .string "So, you’ve seen {STR_VAR_1} POKéMON,\n" - .string "and you’ve caught {STR_VAR_2} POKéMON...$" + .string "Oh, du hast {STR_VAR_1} POKéMON gesehen\n" + .string "und {STR_VAR_2} POKéMON gefangen...$" gBirchDexRatingText_LessThan10:: @ 81C4520 - .string "You should go into grassy areas more\n" - .string "and look for POKéMON more carefully.$" + .string "Du solltest mehr ins hohe Gras gehen\n" + .string "und mehr auf POKéMON achten.$" gBirchDexRatingText_LessThan20:: @ 81C456A - .string "I guess you’re getting the hang of it.\n" - .string "But, it gets harder from here.$" + .string "So langsam bekommst du den Bogen raus.\n" + .string "Aber es wird immer schwieriger werden!$" gBirchDexRatingText_LessThan30:: @ 81C45B0 - .string "Some POKéMON only appear in certain\n" - .string "areas. You’ll need to be persistent.$" + .string "Einige POKéMON tauchen nur in be-\n" + .string "stimmten Regionen auf. Hab nur Geduld.$" gBirchDexRatingText_LessThan40:: @ 81C45F9 - .string "Well, it could use more quantity, but\n" - .string "this is looking more like a POKéDEX now.$" + .string "Nun, er könnte mehr Einträge enthalten,\n" + .string "aber es sieht schon eher nach einem\l" + .string "POKéDEX aus.$" gBirchDexRatingText_LessThan50:: @ 81C4648 - .string "This is coming along pretty good.\n" - .string "Keep up the effort.$" + .string "Das läuft doch wunderbar.\n" + .string "Mach weiter so.$" gBirchDexRatingText_LessThan60:: @ 81C467E - .string "Are you using any RODS?\n" - .string "There are many POKéMON in the sea.$" + .string "Verwendest du irgendwelche ANGELN?\n" + .string "Hier gibt es viele POKéMON im Meer.$" gBirchDexRatingText_LessThan70:: @ 81C46B9 - .string "Instead of just catching POKéMON,\n" - .string "how about making them evolve, too?$" + .string "Statt die POKéMON nur zu fangen, wie\n" + .string "wäre es, sie sich entwickeln zu lassen?$" gBirchDexRatingText_LessThan80:: @ 81C46FE - .string "This is going to be a fantastic POKéDEX.\n" - .string "That’s the feeling I’m getting.$" + .string "Der POKéDEX wird einfach fantastisch.\n" + .string "Das habe ich im Gefühl...$" gBirchDexRatingText_LessThan90:: @ 81C4747 - .string "You’ve collected this many...\n" - .string "Your talent is remarkable!$" + .string "Du hast so viele gefangen...\n" + .string "Du hast ein außergewöhnliches Talent!$" gBirchDexRatingText_LessThan100:: @ 81C4780 - .string "Have you visited the SAFARI ZONE?\p" - .string "I hear there are some POKéMON that\n" - .string "can only be caught there.$" + .string "Warst du schon mal in der SAFARI-ZONE?\p" + .string "Ich habe gehört, es gibt POKéMON,\n" + .string "die man nur dort finden kann.$" gBirchDexRatingText_LessThan110:: @ 81C47DF - .string "You’ve finally reached the 100-kind\n" - .string "mark. This is an impressive POKéDEX!$" + .string "Du hast die 100er Marke überschritten!\n" + .string "Das ist ein beeindruckender POKéDEX!$" gBirchDexRatingText_LessThan120:: @ 81C4828 - .string "There might be POKéMON that can be\n" - .string "found using ROCK SMASH.$" + .string "Es gibt auch POKéMON, die man durch den\n" + .string "Einsatz von ZERTRÜMMERER findet.$" gBirchDexRatingText_LessThan130:: @ 81C4863 - .string "You should get some more POKéMON by\n" - .string "trading with others.$" + .string "Du solltest einige POKéMON fangen und\n" + .string "sie mit anderen tauschen.$" gBirchDexRatingText_LessThan140:: @ 81C489C - .string "I’ve heard of POKéMON that evolve when\n" - .string "they come to fully love their TRAINERS.$" + .string "Ich habe von POKéMON gehört, die sich\n" + .string "entwickeln, wenn sie ihren TRAINER sehr\l" + .string "lieben.$" gBirchDexRatingText_LessThan150:: @ 81C48EB - .string "I had no idea that there were so many\n" - .string "POKéMON species in the HOENN region.$" + .string "Ich hatte keine Ahnung, dass es in der\n" + .string "HOENN-Region so viele verschiedene\l" + .string "POKéMON-Arten gibt.$" gBirchDexRatingText_LessThan160:: @ 81C4936 - .string "On occasion, some POKéMON appear in\n" - .string "large numbers like wild outbreaks.\l" - .string "Don’t miss opportunities like those.$" + .string "Manchmal erscheinen einige POKéMON in\n" + .string "großer Anzahl, wie bei einem Ausbruch.\l" + .string "Das solltest du nicht verpassen!$" gBirchDexRatingText_LessThan170:: @ 81C49A2 - .string "One can get a very good idea about the\n" - .string "POKéMON of the HOENN region by looking\l" - .string "through your POKéDEX.$" + .string "Dein POKéDEX liefert einen erstaunlich\n" + .string "guten Einblick in die POKéMON der\l" + .string "HOENN-Region!$" gBirchDexRatingText_LessThan180:: @ 81C4A06 - .string "I’d say you already qualify as a POKéMON\n" - .string "PROFESSOR, and a good one, too!$" + .string "Ich sage, du hast dich bereits als\n" + .string "guter POKéMON-PROFESSOR qualifiziert.$" gBirchDexRatingText_LessThan190:: @ 81C4A4F - .string "With a POKéDEX this complete, you’re\n" - .string "a real professional at this!$" + .string "Mit diesem POKéDEX, der schon so weit\n" + .string "gediehen ist, bist du ein echter Profi.$" gBirchDexRatingText_LessThan200:: @ 81C4A91 - .string "You’re very close to completing this\n" - .string "POKéDEX. I can feel it in my bones!$" + .string "Du bist sehr nahe dran, den POKéDEX zu\n" + .string "vervollständigen. Das fühle ich einfach.$" gBirchDexRatingText_DexCompleted:: @ 81C4ADA - .string "Congratulations!\n" - .string "Your POKéDEX is complete!$" + .string "Herzlichen Glückwunsch!\n" + .string "Dein POKéDEX ist vollständig!$" Route101_Text_1C4B05:: @ 81C4B05 .string "Hmhm...\n" - .string "On a nationwide basis...\p" - .string "You’ve seen {STR_VAR_1} POKéMON,\n" - .string "and you’ve caught {STR_VAR_2} POKéMON...$" + .string "Auf nationaler Ebene...\p" + .string "Hast du {STR_VAR_1} POKéMON gesehen\n" + .string "und {STR_VAR_2} POKéMON gefangen...$" diff --git a/data/text/pokemon_news.inc b/data/text/pokemon_news.inc index 95bb0888a..1de2ce817 100644 --- a/data/text/pokemon_news.inc +++ b/data/text/pokemon_news.inc @@ -1,146 +1,152 @@ gTVNewsText_EnergyGuru1:: @ 81AD135 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "SLATEPORT’s most popular kind of guy,\n" - .string "the ENERGY GURU, is in the news again!\p" - .string "He promises to, “Stupendously go for\n" - .string "it in just this many days: {STR_VAR_1}!”\p" - .string "While he refused to elaborate on what\n" - .string "he will stupendously go for, the\l" - .string "ENERGY GURU advised, “Save up your\l" - .string "money. That’ll be good...”\p" - .string "It sounds like a trip to SLATEPORT\n" - .string "would be well worth your while that day.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag, meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Heute berichten wir über GRAPHITPORT\n" + .string "CITYS bekanntesten Typen, den\l" + .string "STATUSWERTE GURU!\p" + .string "Er werde sich: “Enorm ins Zeug legen\n" + .string "in den nächsten {STR_VAR_1} Tag/en!”\p" + .string "Er wollte uns nicht verraten, wofür er\n" + .string "sich ins Zeug legt. Stattdessen gab\p" + .string "er uns den Rat: “Spart euer\n" + .string "Geld. Das wäre gut...”\p" + .string "GRAPHITPORT CITY ist eine Reise wert!\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_EnergyGuru2:: @ 81AD2E0 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "SLATEPORT’S ENERGY GURU is going\n" - .string "for it stupendously in the MARKET!\p" - .string "He promises unbeatable bargain\n" - .string "prices on CALCIUM and PROTEIN!\p" - .string "A trip to SLATEPORT CITY sounds\n" - .string "worthwhile. Why not visit and shop\l" - .string "to your heart’s content?\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag, meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Auf diese Nachrichten haben Sie\n" + .string "alle schon sehnsüchtig gewartet!\p" + .string "GRAPHITPORT CITYS STATUSWERTE GURU\n" + .string "legt sich im MARKT enorm ins Zeug!\p" + .string "Er verspricht uns unschlagbare Preise\n" + .string "zum Beispiel für KALZIUM und PROTEIN!\p" + .string "GRAPHITPORT CITY ist also eine Reise\n" + .string "wert. Also: Schauen Sie vorbei und\l" + .string "kaufen Sie, was das Herz begehrt.\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_EnergyGuru3:: @ 81AD434 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "SLATEPORT’S ENERGY GURU is going\n" - .string "for it stupendously in the MARKET!\p" - .string "He promises unbeatable bargain\n" - .string "prices on CALCIUM and PROTEIN!\p" - .string "According to the ENERGY GURU, he\n" - .string "still has ample merchandise left.\p" - .string "Why not visit SLATEPORT CITY for\n" - .string "a most enjoyable shopping trip?\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag, meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Auf diese Nachrichten haben Sie\n" + .string "alle schon sehnsüchtig gewartet!\p" + .string "GRAPHITPORT CITYS STATUSWERTE GURU\n" + .string "legt sich im MARKT enorm ins Zeug!\p" + .string "Er verspricht uns unschlagbare Preise\n" + .string "für KALZIUM und PROTEIN!\p" + .string "Aber der STATUSWERTE GURU weist\n" + .string "auch darauf hin, dass noch viele\l" + .string "Packungen vorhanden sind.\p" + .string "Also: Auf nach GRAPHITPORT CITY und\n" + .string "genießen Sie den Einkauf!\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_GameCorner1:: @ 81AD5B0 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s approaching!\n" - .string "It’s finally coming!\p" - .string "The GAME CORNER’s service day will be\n" - .string "here in just this many days: {STR_VAR_1}!\p" - .string "Even those who are usually unlucky\n" - .string "may be lucky on this particular day!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Bald ist es so weit!\n" + .string "Bald ist der Tag gekommen!\p" + .string "In {STR_VAR_1} Tagen erleben wir ihn, den\n" + .string "Tag der SPIELHALLE!\p" + .string "Selbst diejenigen, die nie Glück haben,\n" + .string "werden ihr Glück nicht fassen können!\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_GameCorner2:: @ 81AD6AE - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s here!\n" - .string "It’s finally arrived!\p" - .string "GAME CORNER’s service day has finally\n" - .string "arrived!\p" - .string "Could you be lucky at the SLOTS \n" - .string "and ROULETTE?\p" - .string "The location is MAUVILLE CITY.\n" - .string "This is the place!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Endlich ist es so weit!\n" + .string "Endlich ist der Tag gekommen!\p" + .string "Heute erleben wir ihn, den Tag der\n" + .string "SPIELHALLE!\p" + .string "Fordern Sie Ihr Glück beim ROULETTE\n" + .string "oder den EINARMIGEN BANDITEN heraus.\p" + .string "Das Stichwort heißt: MALVENFROH CITY!\n" + .string "Dort finden Sie Ihr Glück!\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_GameCorner3:: @ 81AD7A7 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "It’s here!\n" - .string "It’s finally arrived!\p" - .string "GAME CORNER’s service day has finally\n" - .string "arrived!\p" - .string "Could you be lucky at the SLOTS\n" - .string "and ROULETTE?\p" - .string "Time is limited and has almost run out.\n" - .string "The location is MAUVILLE CITY.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag, meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Endlich ist es so weit!\n" + .string "Endlich ist der Tag gekommen!\p" + .string "Heute erleben wir ihn, den Tag der\n" + .string "SPIELHALLE!\p" + .string "Fordern Sie Ihr Glück beim ROULETTE\n" + .string "oder den EINARMIGEN BANDITEN heraus.\p" + .string "Beeilen Sie sich, denn auch dieser Tag\n" + .string "hat nur 24 Stunden. MALVENFROH CITY\l" + .string "ruft!\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_LilycoveDepartment1:: @ 81AD8B4 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "We’ve just received wonderful news\n" - .string "from LILYCOVE DEPARTMENT STORE.\p" - .string "The DEPARTMENT STORE’s clear-out sale\n" - .string "will be in just this many days: {STR_VAR_1}!\p" - .string "That thingamajig or that doodad that\n" - .string "you’ve always wanted could be yours!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Soeben erreichen uns wundervolle Nach-\n" + .string "richten vom SEEGRASULB CITY\l" + .string "EINKAUFSZENTRUM.\p" + .string "In {STR_VAR_1} Tag/en findet dort ein totaler\n" + .string "Ausverkauf statt!\p" + .string "Das Dingsbums und das Dingsda, welches\n" + .string "Sie schon immer haben wollten, kann\l" + .string "Ihnen gehören.\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_LilycoveDepartment2:: @ 81AD9D3 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" - .string "sale has finally arrived!\p" - .string "All the thingamajigs and doodads that\n" - .string "you’ve always dreamt about...\p" - .string "You may be in for fateful encounters\n" - .string "with them all!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Auf diese Nachricht haben Sie schon\n" + .string "sehnsüchtig gewartet!\p" + .string "Im SEEGRASULB CITY EINKAUFSZENTRUM\n" + .string "findet heute ein totaler Ausverkauf\l" + .string "statt!\p" + .string "Das Dingsbums und das Dingsda, welches\n" + .string "Sie schon immer haben wollten...\p" + .string "Sie können sie dort finden!\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNewsText_LilycoveDepartment3:: @ 81ADB01 - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "This is the news you’ve all been\n" - .string "waiting for!\p" - .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" - .string "sale has finally arrived!\p" - .string "All the thingamajigs and doodads that\n" - .string "you’ve always dreamt about...\p" - .string "You may be in for fateful encounters\n" - .string "with them all!\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag, meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Auf diese Nachricht haben Sie schon\n" + .string "sehnsüchtig gewartet!\p" + .string "Im SEEGRASULB CITY EINKAUFSZENTRUM\n" + .string "findet heute ein totaler Ausverkauf\l" + .string "statt!\p" + .string "Das Dingsbums und das Dingsda, welches\n" + .string "Sie schon immer haben wollten...\p" + .string "Sie können sie dort finden!\p" + .string "Das waren die POKéMON NACHRICHTEN.$" @ all text advertisements below are unused. gTVUnusedText_DevonCorporation:: @ 81ADC2F - .string "This program has been brought to you\n" - .string "by the DEVON CORPORATION.$" + .string "Diese Sendung wurde Ihnen präsentiert\n" + .string "von der DEVON CORPORATION.$" gTVUnusedText_Contests:: @ 81ADC6E - .string "What’s important is love for POKéMON.\p" - .string "What you need is a little courage.\p" - .string "Let your cherished POKéMON take\n" - .string "center stage! POKéMON CONTESTS!$" + .string "Das Wichtigste ist Liebe zu den\n" + .string "POKéMON!\p" + .string "Was man braucht ist Mut.\p" + .string "Stelle die geliebten POKéMON in den\n" + .string "Mittelpunkt! POKéMON WETTBEWERB!$" gTVUnusedText_DayCare:: @ 81ADCF7 - .string "We raise your beloved POKéMON with\n" - .string "all of our love!\p" - .string "For all your POKéMON-training needs,\n" - .string "visit our DAY CARE on ROUTE 117.$" + .string "Wir ziehen deine geliebten POKéMON mit\n" + .string "all unserer Hingabe auf!\p" + .string "Alles was deine POKéMON zum Wachsen\n" + .string "brauchen: Die PENSION an der ROUTE 117.$" gTVUnusedText_LavaridgeSpa:: @ 81ADD71 - .string "The cauldron of good times and laughs!\n" - .string "LAVARIDGE SPA.$" + .string "Im Schoß der Freude und Entspannung!\n" + .string "KURORT BAD LAVASTADT.$" gTVUnusedText_LilycoveDepartment:: @ 81ADDA7 - .string "Overflowing with great merchandise\n" - .string "and excitement!\p" - .string "A great place to find that something\n" - .string "you need!\p" - .string "Visit LILYCOVE DEPARTMENT STORE for\n" - .string "all your shopping needs!$" + .string "Ein Überfluss an Waren und\n" + .string "Überraschungen!\p" + .string "Ein Ort, an dem man alles findet, was\n" + .string "das Herz begehrt!\p" + .string "Einkaufen im EINKAUFSZENTRUM\n" + .string "von SEEGRASULB CITY, dem\l" + .string "Einkaufsparadies!$" diff --git a/data/text/ribbon_descriptions.inc b/data/text/ribbon_descriptions.inc index ebbfc34ff..0450d8db5 100644 --- a/data/text/ribbon_descriptions.inc +++ b/data/text/ribbon_descriptions.inc @@ -1,59 +1,59 @@ gRibbonDescriptionPart1_Champion: - .string "CHAMPION-beating, HALL$" + .string "BAND für unschlagbare$" gRibbonDescriptionPart2_Champion: - .string "OF FAME Member RIBBON$" + .string "RUHMESHALLE-Mitglieder$" gRibbonDescriptionPart1_CoolContest: - .string "COOL CONTEST$" + .string "COOLNESS-WETTBEWERB$" gRibbonDescriptionPart1_BeautyContest: - .string "BEAUTY CONTEST$" + .string "SCHÖNHEITSWETTBEWERB$" gRibbonDescriptionPart1_CuteContest: - .string "CUTE CONTEST$" + .string "ANMUT-WETTBEWERB$" gRibbonDescriptionPart1_SmartContest: - .string "SMART CONTEST$" + .string "KLUGHEITSWETTBEWERB$" gRibbonDescriptionPart1_ToughContest: - .string "TOUGH CONTEST$" + .string "STÄRKE-WETTBEWERB$" gRibbonDescriptionPart2_NormalRank: - .string "Normal Rank winner!$" + .string "Sieger in Normal-Klasse!$" gRibbonDescriptionPart2_SuperRank: - .string "Super Rank winner!$" + .string "Sieger in Super-Klasse!$" gRibbonDescriptionPart2_HyperRank: - .string "Hyper Rank winner!$" + .string "Sieger in Hyper-Klasse!$" gRibbonDescriptionPart2_MasterRank: - .string "Master Rank winner!$" + .string "Sieger in Master-Klasse!$" gRibbonDescriptionPart1_Winning: - .string "RIBBON for clearing LV50$" + .string "BAND für Lv. 50-Erfolg$" gRibbonDescriptionPart2_Winning: - .string "at the BATTLE TOWER.$" + .string "im DUELLTURM.$" gRibbonDescriptionPart1_Victory: - .string "Won for clearing LV100$" + .string "Für Erfolg in Lv. 100$" gRibbonDescriptionPart2_Victory: - .string "at the BATTLE TOWER.$" + .string "im DUELLTURM.$" gRibbonDescriptionPart1_Artist: - .string "RIBBON for being chosen$" + .string "Band für auserwählte$" gRibbonDescriptionPart2_Artist: - .string "as a super sketch model.$" + .string "Porträt-Modelle.$" gRibbonDescriptionPart1_Effort: - .string "RIBBON awarded for$" + .string "BAND für$" gRibbonDescriptionPart2_Effort: - .string "being a hard worker.$" + .string "fleißige Arbeiter.$" .align 2 gRibbonDescriptions:: @ 83E113C diff --git a/data/text/roulette.inc b/data/text/roulette.inc index f228cf779..bcabbd012 100644 --- a/data/text/roulette.inc +++ b/data/text/roulette.inc @@ -1,52 +1,51 @@ gUnknown_081C40DF:: @ 81C40DF -UnknownString_81C40DF: @ 81C40DF - .string "The minimum wager at this table is {STR_VAR_1}. \n" - .string "Do you want to play?$" + .string "Der Einsatz an diesem Tisch ist\n" + .string "{STR_VAR_1}. Möchtest du spielen?$" -gUnknown_081C411C:: @ 81C411C UnknownString_81C411C: @ 81C411C - .string "You don’t have enough COINS.$" +gUnknown_081C411C:: @ 81C411C + .string "Du hast nicht genug MÜNZEN.$" -gUnknown_081C4139:: @ 81C4139 UnknownString_81C4139: @ 81C4139 - .string "Special rate table right now!$" +gUnknown_081C4139:: @ 81C4139 + .string "Und nun eine Bonusrunde!$" gUnknown_081C4157:: @ 81C4157 - .string "Place your wager with the + Control Pad,\n" - .string "then press the A Button.$" + .string "Mache deinen Einsatz mit dem + Steuer-\n" + .string "kreuz und drücke dann den A-Knopf.$" -gUnknown_081C4199:: @ 81C4199 UnknownString_81C4199: @ 81C4199 - .string "It’s a hit!$" +gUnknown_081C4199:: @ 81C4199 + .string "Ein Treffer!$" -gUnknown_081C41A5:: @ 81C41A5 UnknownString_81C41A5: @ 81C41A5 +gUnknown_081C41A5:: @ 81C41A5 .string "Jackpot!$" -gUnknown_081C41AE:: @ 81C41AE UnknownString_81C41AE: @ 81C41AE - .string "Nothing doing!$" +gUnknown_081C41AE:: @ 81C41AE + .string "Das war nichts!$" -gUnknown_081C41BD:: @ 81C41BD UnknownString_81C41BD: @ 81C41BD - .string "You’ve won {STR_VAR_1} COINS!$" +gUnknown_081C41BD:: @ 81C41BD + .string "Du hast {STR_VAR_1} MÜNZEN gewonnen!$" -gUnknown_081C41D2:: @ 81C41D2 UnknownString_81C41D2: @ 81C41D2 - .string "No COINS left...$" +gUnknown_081C41D2:: @ 81C41D2 + .string "Nicht mehr genug MÜNZEN übrig...$" -gUnknown_081C41E3:: @ 81C41E3 UnknownString_81C41E3: @ 81C41E3 - .string "Keep playing?$" +gUnknown_081C41E3:: @ 81C41E3 + .string "Weiterspielen?$" -gUnknown_081C41F1:: @ 81C41F1 UnknownString_81C41F1: @ 81C41F1 - .string "The ROULETTE board will be cleared.$" +gUnknown_081C41F1:: @ 81C41F1 + .string "Der ROULETTE-Tisch wird abgeräumt.$" UnknownString_81C4215: @ 81C4215 - .string "You don’t have a COIN CASE.$" + .string "Du hast keinen MÜNZKORB.$" -gUnknown_081C4231:: @ 81C4231 UnknownString_81C4231: @ 81C4231 - .string "Your COIN CASE is full!\n" - .string "Coins can be exchanged for prizes.$" +gUnknown_081C4231:: @ 81C4231 + .string "Dein MÜNZKORB ist voll! Münzen können\n" + .string "gegen Preise eingetauscht werden.$" diff --git a/data/text/safari_zone.inc b/data/text/safari_zone.inc index 34966b9d1..8dfbdeed2 100644 --- a/data/text/safari_zone.inc +++ b/data/text/safari_zone.inc @@ -1,176 +1,183 @@ UnknownString_81C34B2: @ 81C34B2 - .string "Would you like to exit the SAFARI ZONE\n" - .string "right now?$" + .string "Möchtest du die SAFARI-ZONE jetzt\n" + .string "verlassen?$" UnknownString_81C34E4: @ 81C34E4 - .string "Ding-dong! Time’s up!\n" - .string "Your SAFARI Game is over.$" + .string "Ding Dong! Die Zeit ist abgelaufen!\n" + .string "Dein SAFARI-Spiel ist vorbei.$" UnknownString_81C3514: @ 81C3514 - .string "You’ve run out of SAFARI BALLS.\n" - .string "Your SAFARI Game is over.$" + .string "Du hast keine SAFARIBÄLLE mehr.\n" + .string "Dein SAFARI-Spiel ist vorbei.$" UnknownString_81C354E: @ 81C354E - .string "Would you like to place a {POKEBLOCK}\n" - .string "on the {POKEBLOCK} FEEDER?$" + .string "Möchtest du einen {POKEBLOCK} in den\n" + .string "{POKEBLOCK}NAPF legen?$" UnknownString_81C3583: @ 81C3583 - .string "The {STR_VAR_1} you left\n" - .string "before is still here.$" + .string "Dein {STR_VAR_1} befindet sich\n" + .string "noch in unserer Obhut.$" UnknownString_81C35A9: @ 81C35A9 - .string "The {STR_VAR_1} was placed\n" - .string "on the {POKEBLOCK} FEEDER.$" + .string "{STR_VAR_1} wurde in den {POKEBLOCK}-\n" + .string "NAPF gelegt.$" Route121_SafariZoneEntrance_Text_1C35D0:: @ 81C35D0 - .string "Welcome to the SAFARI ZONE!\p" - .string "Here, you may witness many kinds of\n" - .string "POKéMON rarely seen in HOENN.\p" - .string "And, you’ll see them in their wild,\n" - .string "untamed state in natural habitats.\p" - .string "What’s more, we’ve thrown open the\n" - .string "gates to POKéMON TRAINERS.\p" - .string "You’re encouraged to catch POKéMON\n" - .string "for keeps!\p" - .string "Come in and enjoy the SAFARI ZONE!$" + .string "Willkommen in der SAFARI-ZONE!\p" + .string "Hier bekommst du viele POKéMON zu\n" + .string "Gesicht, die sehr selten in der HOENN-\l" + .string "Region sind.\p" + .string "Du kannst sie in ihrer ganzen Wildheit\n" + .string "und ungezähmt in ihrer natürlichen\l" + .string "Umgebung beobachten.\p" + .string "Wir haben unsere Tore für die POKéMON-\n" + .string "TRAINER geöffnet.\p" + .string "Fangt euch POKéMON. Und behaltet sie!\p" + .string "Kommt und genießt die Welt der\n" + .string "SAFARI-ZONE!$" Route121_SafariZoneEntrance_Text_1C3704:: @ 81C3704 - .string "Welcome to the SAFARI ZONE!\n" - .string "Is it your first time here?$" + .string "Willkommen in der SAFARI-ZONE!\n" + .string "Bist du zum ersten Mal hier?$" Route121_SafariZoneEntrance_Text_1C373C:: @ 81C373C - .string "Come in and enjoy the SAFARI ZONE!$" + .string "Komm und genieße die SAFARI-ZONE!$" Route121_SafariZoneEntrance_Text_1C375F:: @ 81C375F - .string "When you enter the SAFARI ZONE, you\n" - .string "start with 30 SAFARI BALLS for\l" - .string "catching POKéMON.\p" - .string "The SAFARI Game is over when you run\n" - .string "out of SAFARI BALLS, or when you’ve\l" - .string "walked 500 steps.\p" - .string "Come in and enjoy the SAFARI ZONE!$" + .string "Sobald du die SAFARI-ZONE betrittst,\n" + .string "stehen dir 30 SAFARIBÄLLE zur Ver-\l" + .string "fügung, um POKéMON zu fangen.\p" + .string "Das SAFARI-Spiel ist vorbei, sobald du\n" + .string "deine SAFARIBÄLLE verbraucht oder\l" + .string "500 Schritte gemacht hast.\p" + .string "Komm und genieße die SAFARI-ZONE!$" Route121_SafariZoneEntrance_Text_1C3832:: @ 81C3832 - .string "Welcome to the SAFARI ZONE!\p" - .string "All you can catch for just ¥500!\n" - .string "Would you like to play a SAFARI Game?$" + .string "Willkommen in der SAFARI-ZONE!\p" + .string "Alles, was du fangen kannst für nur\n" + .string "¥500! Möchtest du es einmal probieren?$" Route121_SafariZoneEntrance_Text_1C3895:: @ 81C3895 .string "Okay.\n" - .string "Please play another time!$" + .string "Bitte beehre uns doch später einmal.$" Route121_SafariZoneEntrance_Text_1C38B5:: @ 81C38B5 - .string "You don’t have enough money.\n" - .string "Sorry.$" + .string "Du hast nicht genug Geld dabei.\n" + .string "Tut mir Leid.$" Route121_SafariZoneEntrance_Text_1C38D9:: @ 81C38D9 - .string "That will be ¥500, please.$" + .string "Das macht dann ¥500, bitte.$" Route121_SafariZoneEntrance_Text_1C38F4:: @ 81C38F4 - .string "Here are your SAFARI BALLS.$" + .string "Hier sind deine SAFARIBÄLLE.$" Route121_SafariZoneEntrance_Text_1C3910:: @ 81C3910 - .string "{PLAYER} received 30 SAFARI BALLS.$" + .string "{PLAYER} erhält 30 SAFARIBÄLLE.$" Route121_SafariZoneEntrance_Text_1C392D:: @ 81C392D - .string "We’ll let you know when your game\n" - .string "is over.\p" - .string "So, until then, enjoy yourself, please!\n" - .string "Off you go on your wild excursion!$" + .string "Wir geben dir Bescheid, wenn das Spiel\n" + .string "vorbei ist.\p" + .string "Bis dahin wünschen wir viel Spaß!\n" + .string "Und auf geht’s in die Wildnis!$" Route121_SafariZoneEntrance_Text_1C39A3:: @ 81C39A3 - .string "Excuse me!\n" - .string "Your PC BOX is full.$" + .string "Entschuldigung!\n" + .string "Deine PC-BOXEN sind voll.$" Route121_SafariZoneEntrance_Text_1C39C3:: @ 81C39C3 - .string "Excuse me!\n" - .string "You seem to be without a {POKEBLOCK} CASE.\p" - .string "Your SAFARI Game will be much more\n" - .string "fruitful if you use {POKEBLOCK}S.\p" - .string "Please come back with a {POKEBLOCK} CASE.$" + .string "Entschuldigung!\n" + .string "Du besitzt keine {POKEBLOCK}BOX.\p" + .string "Dein SAFARI-Spiel wäre viel erfolg-\n" + .string "reicher, wenn du {POKEBLOCK} benutzen\l" + .string "würdest.\p" + .string "Bitte besorge dir doch eine {POKEBLOCK}BOX.$" SafariZone_Southeast_Text_1C3A56:: @ 81C3A56 - .string "You still have time left. Would you like\n" - .string "to exit the SAFARI ZONE now?$" + .string "Du hast noch Zeit übrig. Möchtest du\n" + .string "die SAFARI-ZONE jetzt verlassen?$" SafariZone_Southeast_Text_1C3A9C:: @ 81C3A9C - .string "Please enjoy the rest of your wild\n" - .string "adventure!$" + .string "Viel Vergnügen bei dem Rest deines\n" + .string "wilden Abenteuers!$" SafariZone_Southeast_Text_1C3ACA:: @ 81C3ACA .string "Okay.\p" - .string "I’ll take back your remaining SAFARI\n" - .string "BALLS.\p" - .string "Thank you for playing.\n" - .string "We hope to see you again.$" + .string "Ich nehme die verbleibenden\n" + .string "SAFARIBÄLLE zurück.\p" + .string "Vielen Dank für deine Teilnahme.\n" + .string "Komm bald wieder!$" SafariZone_Southeast_Text_1C3B2D:: @ 81C3B2D - .string "Good luck!\p" - .string "If you need anything, don’t hesitate\n" - .string "to tell me, please!$" + .string "Viel Glück!\p" + .string "Wenn du irgendetwas brauchst, zögere\n" + .string "nicht, mich anzusprechen!$" SafariZone_Southeast_Text_1C3B71:: @ 81C3B71 - .string "Did you know?\p" - .string "If you put a {POKEBLOCK} in that square box,\n" - .string "POKéMON gather around.$" + .string "Weißt du was?\p" + .string "Wenn du einen {POKEBLOCK} in diese Kiste\n" + .string "dort legst, werden POKéMON angelockt.$" SafariZone_Southeast_Text_1C3BBD:: @ 81C3BBD - .string "I want to keep going deeper, but I\n" - .string "forgot to bring a BIKE.\p" - .string "Something tells me that rare POKéMON\n" - .string "live in the outlying areas.$" + .string "Ich wollte noch weiter hinein, aber\n" + .string "ich habe mein RAD vergessen.\p" + .string "Irgendetwas sagt mir, dass in den abge-\n" + .string "legenen Gegenden seltene POKéMON\l" + .string "leben.$" SafariZone_Southwest_Text_1C3C39:: @ 81C3C39 - .string "Sometimes, when I toss a {POKEBLOCK} at \n" - .string "POKéMON, it gets ignored.\p" - .string "Do POKéMON have likes and dislikes\n" - .string "about what they eat?$" + .string "Manchmal, wenn ich einem POKéMON einen\n" + .string "{POKEBLOCK} zuwerfe, ignoriert es das total.\p" + .string "Ob POKéMON auch manche Dinge mögen\n" + .string "und manche nicht? Wie wir Menschen?$" SafariZone_Northwest_Text_1C3CAE:: @ 81C3CAE - .string "Gasp... Gasp...\n" - .string "I...made it out here...but...\p" - .string "I’m exhausted... I don’t have the\n" - .string "energy to catch POKéMON...$" + .string "Hechel... Keuch...\n" + .string "Ich... bin hierher gekommen... aber...\p" + .string "Ich bin erschöpft... Japs... Ich habe\n" + .string "keine Energie, ein POKéMON zu fangen.$" SafariZone_Northeast_Text_1C3D19:: @ 81C3D19 - .string "I’m on a mission to find WATER POKéMON\n" - .string "you don’t see in HOENN.\p" - .string "Do you have any idea where the lake is?$" + .string "Ich habe eine Mission. Ich will WASSER-\n" + .string "POKéMON fangen, die es in HOENN nicht\l" + .string "gibt.\p" + .string "Weißt du zufällig, wo hier der See ist?$" SafariZone_Northeast_Text_1C3D80:: @ 81C3D80 - .string "I’m going to catch a lot of rare POKéMON\n" - .string "here and trade them with my friends!$" + .string "Ich will viele seltene POKéMON fangen\n" + .string "und mit meinen Freunden tauschen.$" SafariZone_Southeast_Text_1C3DCE:: @ 81C3DCE - .string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n" - .string "But it seems to have disappeared.\p" - .string "I guess POKéMON must have eaten it\n" - .string "without me noticing.$" + .string "Ich habe einen {POKEBLOCK} in den {POKEBLOCK}-\n" + .string "NAPF gelegt. Er ist verschwunden.\p" + .string "Ein POKéMON muss ihn gefuttert haben,\n" + .string "ohne dass ich das gemerkt habe.$" Route121_SafariZoneEntrance_Text_1C3E4B:: @ 81C3E4B - .string "SAFARI ZONE TRAINER TIP!\p" - .string "Throw {POKEBLOCK}S at wild POKéMON to make\n" - .string "them less likely to flee.$" + .string "TIPP für TRAINER in der SAFARI-ZONE!\p" + .string "Wirf POKéMON {POKEBLOCK} zu, dann ergreifen\n" + .string "sie nicht so schnell die Flucht.$" SafariZone_Southwest_Text_1C3EA3:: @ 81C3EA3 - .string "“Relieve your tired feet.”\n" - .string "REST HOUSE$" + .string "“Erhole deine gemarterten Füße.”\n" + .string "RASTHAUS$" SafariZone_RestHouse_Text_1C3EC9:: @ 81C3EC9 - .string "I don’t have any {POKEBLOCK}S, but I caught\n" - .string "a good number of POKéMON.\p" - .string "You can improve your chances of making\n" - .string "a catch by getting closer to them\l" - .string "before throwing a SAFARI BALL.$" + .string "Ich habe keine {POKEBLOCK}, aber ich habe\n" + .string "trotzdem viele POKéMON gefangen.\p" + .string "Du kannst deine Chancen erhöhen, indem\n" + .string "du näher an das POKéMON herangehst,\l" + .string "bevor du den SAFARIBALL wirfst.$" SafariZone_RestHouse_Text_1C3F71:: @ 81C3F71 - .string "If you use {POKEBLOCK}S, wild POKéMON won’t\n" - .string "be so quick to run away.\p" - .string "It’s not much use to give {POKEBLOCK}S to\n" - .string "POKéMON that don’t flee easily.$" + .string "POKéMON fliehen nicht so schnell, wenn\n" + .string "man ihnen {POKEBLOCK} zuwirft.\p" + .string "POKéMON, die von Natur aus nicht schnell\n" + .string "fliehen, braucht man sie nicht\l" + .string "unbedingt zuzuwerfen.$" SafariZone_RestHouse_Text_1C3FF4:: @ 81C3FF4 - .string "If you put a {POKEBLOCK} on the FEEDER,\n" - .string "POKéMON are attracted to it.\p" - .string "I think POKéMON with the same sort of\n" - .string "nature are drawn by a certain {POKEBLOCK}.$" + .string "Wird ein {POKEBLOCK} in den NAPF gelegt,\n" + .string "werden POKéMON angelockt.\p" + .string "Ich glaube, POKéMON mit der gleichen\n" + .string "Wesensart werden von ähnlichen {POKEBLOCK}N\l" + .string "angezogen.$" diff --git a/data/text/save.inc b/data/text/save.inc index c35432540..dec291fac 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -1,26 +1,24 @@ gSaveText_WouldYouLikeToSave:: @ 81C6C85 -UnknownString_81C6C85: @ 81C6C85 - .string "Would you like to save the game?$" + .string "Möchtest du das Spiel speichern?$" -gSaveText_ThereIsAlreadyAFile:: @ 81C6CA6 UnknownString_81C6CA6: @ 81C6CA6 - .string "There is already a saved file.\n" - .string "Is it okay to overwrite it?$" +gSaveText_ThereIsAlreadyAFile:: @ 81C6CA6 + .string "Es gibt bereits einen Spielstand.\n" + .string "Spielstand überschreiben?$" -gSaveText_DontTurnOff:: @ 81C6CE1 BattleTower_BattleRoom_Text_1C6CE1:: @ 81C6CE1 - .string "SAVING...\n" - .string "DON’T TURN OFF THE POWER.$" +gSaveText_DontTurnOff:: @ 81C6CE1 + .string "SPEICHERN...\n" + .string "BITTE DAS GERÄT NICHT AUSSCHALTEN.$" -gSaveText_PlayerSavedTheGame:: @ 81C6D05 BattleTower_BattleRoom_Text_1C6D05:: @ 81C6D05 - .string "{PLAYER} saved the game.$" +gSaveText_PlayerSavedTheGame:: @ 81C6D05 + .string "{PLAYER} hat das Spiel gespeichert.$" UnknownString_81C6D18: @ 81C6D18 - .string "Save error...$" + .string "Fehler beim Speichern...$" -gSaveText_ThereIsADifferentFile:: @ 81C6D26 UnknownString_81C6D26: @ 81C6D26 - .string "There is a different game file that is\n" - .string "already saved.\p" - .string "Is it okay to overwrite it?$" +gSaveText_ThereIsADifferentFile:: @ 81C6D26 + .string "Es gibt schon einen anderen Spielstand.\p" + .string "Soll er überschrieben werden?$" diff --git a/data/text/secret_power_tm.inc b/data/text/secret_power_tm.inc index 88e9bc2e8..1c8cdab7e 100644 --- a/data/text/secret_power_tm.inc +++ b/data/text/secret_power_tm.inc @@ -1,34 +1,36 @@ Route111_Text_1A3520:: @ 81A3520 - .string "What’s that?\n" - .string "What am I doing?\p" - .string "I’m thinking about making my own room\n" - .string "here using a POKéMON move.\p" - .string "I know! I’ll give you this TM.\n" - .string "Will you use it to make your own room?$" + .string "Was das ist?\n" + .string "Was ich hier mache?\p" + .string "Ich überlege, ob ich mir hier mein\n" + .string "eigenes Refugium mit Hilfe einer\l" + .string "POKéMON-Attacke einrichte.\p" + .string "Genau! Ich gebe dir diese TM. Richte\n" + .string "dir damit auch dein eigenes Reich ein!$" Route111_Text_1A35C5:: @ 81A35C5 - .string "Find a big tree that looks like it might\n" - .string "drop some vines.\p" - .string "Use SECRET POWER in front of the tree.\n" - .string "Some vines should get free and drop\l" - .string "down, so you can climb the tree.\p" - .string "You’ll find a lot of space for putting\n" - .string "your favorite things.\p" - .string "It’ll be your own secret room...\n" - .string "A SECRET BASE!\p" - .string "You should make one, too.\p" - .string "Another thing, you don’t always have\n" - .string "to make your SECRET BASE in a tree.\p" - .string "Try using SECRET POWER on rock walls\n" - .string "that have small indents in them.\p" - .string "I’m going to look for other places, too.\n" - .string "Okay, bye!$" + .string "Suche dir einen Baum, der aussieht, als\n" + .string "ob er einige Äste verlieren würde.\p" + .string "Setze davor GEHEIMPOWER ein. Einige\n" + .string "Äste werden sich öffnen und du\l" + .string "kannst dann den Baum hinaufklettern.\p" + .string "Du findest dort einen großen Raum, den\n" + .string "du nach eigenem Geschmack einrichten\l" + .string "kannst.\p" + .string "Das ist dein eigener geheimer Raum...\n" + .string "Eine GEHEIMBASIS!\p" + .string "Du solltest dir auch eine einrichten.\p" + .string "Du musst dir deine GEHEIMBASIS nicht\n" + .string "unbedingt in einem Baum einrichten.\p" + .string "Setze GEHEIMPOWER an steinigen\n" + .string "Wänden ein, die Einkerbungen haben.\p" + .string "Ich schaue mich jetzt nach weiteren\n" + .string "Orten um. Tschüss!$" Route111_Text_1A37B5:: @ 81A37B5 - .string "Oh, you don’t want this?\n" - .string "If you change your mind, tell me, okay?$" + .string "Oh, das willst du nicht haben? Wenn du\n" + .string "deine Meinung änderst, sag Bescheid.$" Route111_Text_1A37F6:: @ 81A37F6 - .string "Oh, you don’t have any room for this.\p" - .string "I’ll hold on to it, so come back for it\n" - .string "another time, okay?$" + .string "Oh, dafür hast du keinen Platz mehr.\p" + .string "Ich verwahre es für dich. Hol es dir\n" + .string "später ab, einverstanden?$" diff --git a/data/text/shoal_cave.inc b/data/text/shoal_cave.inc index c786e1f4a..280eb6bc8 100644 --- a/data/text/shoal_cave.inc +++ b/data/text/shoal_cave.inc @@ -1,55 +1,54 @@ ShoalCave_LowTideEntranceRoom_Text_1C6668:: @ 81C6668 - .string "Are you planning on going deep in\n" - .string "there?\p" - .string "How about bringing me back some\n" - .string "SHOAL SALT and SHOAL SHELLS?\p" - .string "I can make you something good if\n" - .string "you bring me the ingredients.$" + .string "Hast du vor, tiefer hineinzugehen?\p" + .string "Würdest du mir bitte KÜSTENSALZ\n" + .string "und KÜSTENSCHALEN mitbringen?\p" + .string "Ich kann dir daraus etwas Wunderbares\n" + .string "anfertigen.$" ShoalCave_LowTideEntranceRoom_Text_1C670D:: @ 81C670D - .string "If you bring me four each of the\n" - .string "SHOAL SALT and SHOAL SHELLS,\l" - .string "I can make you a SHELL BELL...\p" - .string "You can get those ingredients\n" - .string "every day.$" + .string "Wenn du mir jeweils viermal KÜSTENSALZ\n" + .string "und KÜSTENSCHALE mitbringst, fertige\l" + .string "ich dir SEEGESANG daraus an.\p" + .string "Jeder Tag ist ein guter Tag, die Zutaten\n" + .string "dafür zu finden...$" ShoalCave_LowTideEntranceRoom_Text_1C6793:: @ 81C6793 - .string "Oh, hey! SHOAL SALT and SHOAL\n" - .string "SHELLS! And enough of them, too!\p" - .string "Would you like me to make you a\n" - .string "SHELL BELL with them?$" + .string "Oh, hey! KÜSTENSALZ und KÜSTENSCHALE!\n" + .string "Und davon auch noch so viele!\p" + .string "Soll ich dir daraus SEEGESANG\n" + .string "anfertigen?$" ShoalCave_LowTideEntranceRoom_Text_1C6808:: @ 81C6808 - .string "All righty, then! I’ll make you a\n" - .string "SHELL BELL right away.\p" + .string "Sehr schön! Ich werde dir sofort\n" + .string "SEEGESANG anfertigen.\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "There! Done!$" + .string "Fertig! Bitte schön!$" ShoalCave_LowTideEntranceRoom_Text_1C688E:: @ 81C688E - .string "Have a POKéMON hold on to that.\n" - .string "It’ll love it, that’s for certain.\p" - .string "Why, the SHELL BELL’s chime...\n" - .string "It’s simply sublime!\p" - .string "You can get its ingredients every\n" - .string "day, so I can make you more.$" + .string "Gib das einem POKéMON zum Tragen.\n" + .string "Es wird das lieben, das garantiere ich!\p" + .string "Der Klang von SEEGESANG...\n" + .string "Er ist einfach vollendet!\p" + .string "Die Zutaten kannst du jeden Tag finden,\n" + .string "daher kann ich dir mehrere machen.$" ShoalCave_LowTideEntranceRoom_Text_1C6944:: @ 81C6944 - .string "Oh... Is that so...\n" - .string "I wanted to make a SHELL BELL...$" + .string "Oh... Wirklich?\n" + .string "Ich wollte SEEGESANG anfertigen...$" ShoalCave_LowTideInnerRoom_Text_1C6979:: @ 81C6979 ShoalCave_LowTideLowerRoom_Text_1C6979:: @ 81C6979 ShoalCave_LowTideStairsRoom_Text_1C6979:: @ 81C6979 - .string "There was some SHOAL SALT here.\n" - .string "But, there’s nothing here now.$" + .string "Hier gab es mal KÜSTENSALZ.\n" + .string "Aber jetzt ist nichts mehr davon da.$" ShoalCave_LowTideInnerRoom_Text_1C69B8:: @ 81C69B8 - .string "There was a SHOAL SHELL here.\n" - .string "But, there’s nothing here now.$" + .string "Hier gab es mal eine KÜSTENSCHALE.\n" + .string "Aber jetzt gibt es keine mehr.$" ShoalCave_LowTideEntranceRoom_Text_1C69F5:: @ 81C69F5 - .string "You don’t have space in your BAG\n" - .string "if I were to make it for you.\p" - .string "You should make room and come back\n" - .string "for a SHELL BELL.$" + .string "In deinem BEUTEL ist nicht genügend\n" + .string "Platz für das neue Item.\p" + .string "Schaffe Platz und hole dir dann\n" + .string "SEEGESANG bei mir ab.$" diff --git a/data/text/species_names.inc b/data/text/species_names.inc index 8a387eb38..70bd91e7f 100644 --- a/data/text/species_names.inc +++ b/data/text/species_names.inc @@ -1,253 +1,253 @@ gSpeciesNames:: @ 81F716C .string "??????????$", 11 - .string "BULBASAUR$", 11 - .string "IVYSAUR$", 11 - .string "VENUSAUR$", 11 - .string "CHARMANDER$", 11 - .string "CHARMELEON$", 11 - .string "CHARIZARD$", 11 - .string "SQUIRTLE$", 11 - .string "WARTORTLE$", 11 - .string "BLASTOISE$", 11 - .string "CATERPIE$", 11 - .string "METAPOD$", 11 - .string "BUTTERFREE$", 11 - .string "WEEDLE$", 11 - .string "KAKUNA$", 11 - .string "BEEDRILL$", 11 - .string "PIDGEY$", 11 - .string "PIDGEOTTO$", 11 - .string "PIDGEOT$", 11 - .string "RATTATA$", 11 - .string "RATICATE$", 11 - .string "SPEAROW$", 11 - .string "FEAROW$", 11 - .string "EKANS$", 11 + .string "BISASAM$", 11 + .string "BISAKNOSP$", 11 + .string "BISAFLOR$", 11 + .string "GLUMANDA$", 11 + .string "GLUTEXO$", 11 + .string "GLURAK$", 11 + .string "SCHIGGY$", 11 + .string "SCHILLOK$", 11 + .string "TURTOK$", 11 + .string "RAUPY$", 11 + .string "SAFCON$", 11 + .string "SMETTBO$", 11 + .string "HORNLIU$", 11 + .string "KOKUNA$", 11 + .string "BIBOR$", 11 + .string "TAUBSI$", 11 + .string "TAUBOGA$", 11 + .string "TAUBOSS$", 11 + .string "RATTFRATZ$", 11 + .string "RATTIKARL$", 11 + .string "HABITAK$", 11 + .string "IBITAK$", 11 + .string "RETTAN$", 11 .string "ARBOK$", 11 .string "PIKACHU$", 11 .string "RAICHU$", 11 - .string "SANDSHREW$", 11 - .string "SANDSLASH$", 11 + .string "SANDAN$", 11 + .string "SANDAMER$", 11 .string "NIDORAN♀$", 11 .string "NIDORINA$", 11 .string "NIDOQUEEN$", 11 .string "NIDORAN♂$", 11 .string "NIDORINO$", 11 .string "NIDOKING$", 11 - .string "CLEFAIRY$", 11 - .string "CLEFABLE$", 11 + .string "PIEPI$", 11 + .string "PIXI$", 11 .string "VULPIX$", 11 - .string "NINETALES$", 11 - .string "JIGGLYPUFF$", 11 - .string "WIGGLYTUFF$", 11 + .string "VULNONA$", 11 + .string "PUMMELUFF$", 11 + .string "KNUDDELUFF$", 11 .string "ZUBAT$", 11 .string "GOLBAT$", 11 - .string "ODDISH$", 11 - .string "GLOOM$", 11 - .string "VILEPLUME$", 11 + .string "MYRAPLA$", 11 + .string "DUFLOR$", 11 + .string "GIFLOR$", 11 .string "PARAS$", 11 - .string "PARASECT$", 11 - .string "VENONAT$", 11 - .string "VENOMOTH$", 11 - .string "DIGLETT$", 11 - .string "DUGTRIO$", 11 - .string "MEOWTH$", 11 - .string "PERSIAN$", 11 - .string "PSYDUCK$", 11 - .string "GOLDUCK$", 11 - .string "MANKEY$", 11 - .string "PRIMEAPE$", 11 - .string "GROWLITHE$", 11 - .string "ARCANINE$", 11 - .string "POLIWAG$", 11 - .string "POLIWHIRL$", 11 - .string "POLIWRATH$", 11 + .string "PARASEK$", 11 + .string "BLUZUK$", 11 + .string "OMOT$", 11 + .string "DIGDA$", 11 + .string "DIGDRI$", 11 + .string "MAUZI$", 11 + .string "SNOBILIKAT$", 11 + .string "ENTON$", 11 + .string "ENTORON$", 11 + .string "MENKI$", 11 + .string "RASAFF$", 11 + .string "FUKANO$", 11 + .string "ARKANI$", 11 + .string "QUAPSEL$", 11 + .string "QUAPUTZI$", 11 + .string "QUAPPO$", 11 .string "ABRA$", 11 .string "KADABRA$", 11 - .string "ALAKAZAM$", 11 - .string "MACHOP$", 11 - .string "MACHOKE$", 11 - .string "MACHAMP$", 11 - .string "BELLSPROUT$", 11 - .string "WEEPINBELL$", 11 - .string "VICTREEBEL$", 11 - .string "TENTACOOL$", 11 - .string "TENTACRUEL$", 11 - .string "GEODUDE$", 11 - .string "GRAVELER$", 11 - .string "GOLEM$", 11 - .string "PONYTA$", 11 - .string "RAPIDASH$", 11 - .string "SLOWPOKE$", 11 - .string "SLOWBRO$", 11 - .string "MAGNEMITE$", 11 + .string "SIMSALA$", 11 + .string "MACHOLLO$", 11 + .string "MASCHOCK$", 11 + .string "MACHOMEI$", 11 + .string "KNOFENSA$", 11 + .string "ULTRIGARIA$", 11 + .string "SARZENIA$", 11 + .string "TENTACHA$", 11 + .string "TENTOXA$", 11 + .string "KLEINSTEIN$", 11 + .string "GEOROK$", 11 + .string "GEOWAZ$", 11 + .string "PONITA$", 11 + .string "GALLOPA$", 11 + .string "FLEGMON$", 11 + .string "LAHMUS$", 11 + .string "MAGNETILO$", 11 .string "MAGNETON$", 11 - .string "FARFETCH’D$", 11 - .string "DODUO$", 11 - .string "DODRIO$", 11 - .string "SEEL$", 11 - .string "DEWGONG$", 11 - .string "GRIMER$", 11 - .string "MUK$", 11 - .string "SHELLDER$", 11 - .string "CLOYSTER$", 11 - .string "GASTLY$", 11 - .string "HAUNTER$", 11 + .string "PORENTA$", 11 + .string "DODU$", 11 + .string "DODRI$", 11 + .string "JUROB$", 11 + .string "JUGONG$", 11 + .string "SLEIMA$", 11 + .string "SLEIMOK$", 11 + .string "MUSCHAS$", 11 + .string "AUSTOS$", 11 + .string "NEBULAK$", 11 + .string "ALPOLLO$", 11 .string "GENGAR$", 11 .string "ONIX$", 11 - .string "DROWZEE$", 11 + .string "TRAUMATO$", 11 .string "HYPNO$", 11 .string "KRABBY$", 11 .string "KINGLER$", 11 - .string "VOLTORB$", 11 - .string "ELECTRODE$", 11 - .string "EXEGGCUTE$", 11 - .string "EXEGGUTOR$", 11 - .string "CUBONE$", 11 - .string "MAROWAK$", 11 - .string "HITMONLEE$", 11 - .string "HITMONCHAN$", 11 - .string "LICKITUNG$", 11 - .string "KOFFING$", 11 - .string "WEEZING$", 11 - .string "RHYHORN$", 11 - .string "RHYDON$", 11 - .string "CHANSEY$", 11 + .string "VOLTOBAL$", 11 + .string "LEKTROBAL$", 11 + .string "OWEI$", 11 + .string "KOKOWEI$", 11 + .string "TRAGOSSO$", 11 + .string "KNOGGA$", 11 + .string "KICKLEE$", 11 + .string "NOCKCHAN$", 11 + .string "SCHLURP$", 11 + .string "SMOGON$", 11 + .string "SMOGMOG$", 11 + .string "RIHORN$", 11 + .string "RIZEROS$", 11 + .string "CHANEIRA$", 11 .string "TANGELA$", 11 - .string "KANGASKHAN$", 11 - .string "HORSEA$", 11 - .string "SEADRA$", 11 - .string "GOLDEEN$", 11 - .string "SEAKING$", 11 - .string "STARYU$", 11 + .string "KANGAMA$", 11 + .string "SEEPER$", 11 + .string "SEEMON$", 11 + .string "GOLDINI$", 11 + .string "GOLKING$", 11 + .string "STERNDU$", 11 .string "STARMIE$", 11 - .string "MR. MIME$", 11 - .string "SCYTHER$", 11 - .string "JYNX$", 11 - .string "ELECTABUZZ$", 11 + .string "PANTIMOS$", 11 + .string "SICHLOR$", 11 + .string "ROSSANA$", 11 + .string "ELEKTEK$", 11 .string "MAGMAR$", 11 .string "PINSIR$", 11 .string "TAUROS$", 11 - .string "MAGIKARP$", 11 - .string "GYARADOS$", 11 + .string "KARPADOR$", 11 + .string "GARADOS$", 11 .string "LAPRAS$", 11 .string "DITTO$", 11 - .string "EEVEE$", 11 - .string "VAPOREON$", 11 - .string "JOLTEON$", 11 - .string "FLAREON$", 11 + .string "EVOLI$", 11 + .string "AQUANA$", 11 + .string "BLITZA$", 11 + .string "FLAMARA$", 11 .string "PORYGON$", 11 - .string "OMANYTE$", 11 - .string "OMASTAR$", 11 + .string "AMONITAS$", 11 + .string "AMOROSO$", 11 .string "KABUTO$", 11 .string "KABUTOPS$", 11 .string "AERODACTYL$", 11 - .string "SNORLAX$", 11 - .string "ARTICUNO$", 11 + .string "RELAXO$", 11 + .string "ARKTOS$", 11 .string "ZAPDOS$", 11 - .string "MOLTRES$", 11 + .string "LAVADOS$", 11 .string "DRATINI$", 11 - .string "DRAGONAIR$", 11 - .string "DRAGONITE$", 11 - .string "MEWTWO$", 11 + .string "DRAGONIR$", 11 + .string "DRAGORAN$", 11 + .string "MEWTU$", 11 .string "MEW$", 11 - .string "CHIKORITA$", 11 - .string "BAYLEEF$", 11 - .string "MEGANIUM$", 11 - .string "CYNDAQUIL$", 11 - .string "QUILAVA$", 11 - .string "TYPHLOSION$", 11 - .string "TOTODILE$", 11 - .string "CROCONAW$", 11 - .string "FERALIGATR$", 11 - .string "SENTRET$", 11 - .string "FURRET$", 11 + .string "ENDIVIE$", 11 + .string "LORBLATT$", 11 + .string "MEGANIE$", 11 + .string "FEURIGEL$", 11 + .string "IGELAVAR$", 11 + .string "TORNUPTO$", 11 + .string "KARNIMANI$", 11 + .string "TYRACROC$", 11 + .string "IMPERGATOR$", 11 + .string "WIESOR$", 11 + .string "WIESENIOR$", 11 .string "HOOTHOOT$", 11 - .string "NOCTOWL$", 11 + .string "NOCTUH$", 11 .string "LEDYBA$", 11 .string "LEDIAN$", 11 - .string "SPINARAK$", 11 + .string "WEBARAK$", 11 .string "ARIADOS$", 11 - .string "CROBAT$", 11 - .string "CHINCHOU$", 11 + .string "IKSBAT$", 11 + .string "LAMPI$", 11 .string "LANTURN$", 11 .string "PICHU$", 11 - .string "CLEFFA$", 11 - .string "IGGLYBUFF$", 11 + .string "PII$", 11 + .string "FLUFFELUFF$", 11 .string "TOGEPI$", 11 .string "TOGETIC$", 11 .string "NATU$", 11 .string "XATU$", 11 - .string "MAREEP$", 11 - .string "FLAAFFY$", 11 + .string "VOLTILAMM$", 11 + .string "WAATY$", 11 .string "AMPHAROS$", 11 - .string "BELLOSSOM$", 11 + .string "BLUBELLA$", 11 .string "MARILL$", 11 .string "AZUMARILL$", 11 - .string "SUDOWOODO$", 11 - .string "POLITOED$", 11 - .string "HOPPIP$", 11 - .string "SKIPLOOM$", 11 - .string "JUMPLUFF$", 11 - .string "AIPOM$", 11 - .string "SUNKERN$", 11 - .string "SUNFLORA$", 11 + .string "MOGELBAUM$", 11 + .string "QUAXO$", 11 + .string "HOPPSPROSS$", 11 + .string "HUBELUPF$", 11 + .string "PAPUNGHA$", 11 + .string "GRIFFEL$", 11 + .string "SONNKERN$", 11 + .string "SONNFLORA$", 11 .string "YANMA$", 11 - .string "WOOPER$", 11 - .string "QUAGSIRE$", 11 - .string "ESPEON$", 11 - .string "UMBREON$", 11 - .string "MURKROW$", 11 - .string "SLOWKING$", 11 - .string "MISDREAVUS$", 11 - .string "UNOWN$", 11 - .string "WOBBUFFET$", 11 + .string "FELINO$", 11 + .string "MORLORD$", 11 + .string "PSIANA$", 11 + .string "NACHTARA$", 11 + .string "KRAMURX$", 11 + .string "LASCHOKING$", 11 + .string "TRAUNFUGIL$", 11 + .string "ICOGNITO$", 11 + .string "WOINGENAU$", 11 .string "GIRAFARIG$", 11 - .string "PINECO$", 11 - .string "FORRETRESS$", 11 - .string "DUNSPARCE$", 11 - .string "GLIGAR$", 11 - .string "STEELIX$", 11 + .string "TANNZA$", 11 + .string "FORSTELLKA$", 11 + .string "DUMMISEL$", 11 + .string "SKORGLA$", 11 + .string "STAHLOS$", 11 .string "SNUBBULL$", 11 .string "GRANBULL$", 11 - .string "QWILFISH$", 11 - .string "SCIZOR$", 11 - .string "SHUCKLE$", 11 - .string "HERACROSS$", 11 - .string "SNEASEL$", 11 + .string "BALDORFISH$", 11 + .string "SCHEROX$", 11 + .string "POTTROTT$", 11 + .string "SKARABORN$", 11 + .string "SNIEBEL$", 11 .string "TEDDIURSA$", 11 .string "URSARING$", 11 - .string "SLUGMA$", 11 + .string "SCHNECKMAG$", 11 .string "MAGCARGO$", 11 - .string "SWINUB$", 11 - .string "PILOSWINE$", 11 - .string "CORSOLA$", 11 + .string "QUIEKEL$", 11 + .string "KEIFEL$", 11 + .string "CORASONN$", 11 .string "REMORAID$", 11 .string "OCTILLERY$", 11 - .string "DELIBIRD$", 11 - .string "MANTINE$", 11 - .string "SKARMORY$", 11 - .string "HOUNDOUR$", 11 - .string "HOUNDOOM$", 11 - .string "KINGDRA$", 11 + .string "BOTOGEL$", 11 + .string "MANTAX$", 11 + .string "PANZAERON$", 11 + .string "HUNDUSTER$", 11 + .string "HUNDEMON$", 11 + .string "SEEDRAKING$", 11 .string "PHANPY$", 11 .string "DONPHAN$", 11 .string "PORYGON2$", 11 - .string "STANTLER$", 11 - .string "SMEARGLE$", 11 - .string "TYROGUE$", 11 - .string "HITMONTOP$", 11 - .string "SMOOCHUM$", 11 + .string "DAMHIRPLEX$", 11 + .string "FARBEAGLE$", 11 + .string "RABAUZ$", 11 + .string "KAPOERA$", 11 + .string "KUSSILLA$", 11 .string "ELEKID$", 11 .string "MAGBY$", 11 .string "MILTANK$", 11 - .string "BLISSEY$", 11 + .string "HEITEIRA$", 11 .string "RAIKOU$", 11 .string "ENTEI$", 11 .string "SUICUNE$", 11 .string "LARVITAR$", 11 .string "PUPITAR$", 11 - .string "TYRANITAR$", 11 + .string "DESPOTAR$", 11 .string "LUGIA$", 11 .string "HO-OH$", 11 .string "CELEBI$", 11 @@ -276,128 +276,128 @@ gSpeciesNames:: @ 81F716C .string "?$", 11 .string "?$", 11 .string "?$", 11 - .string "TREECKO$", 11 - .string "GROVYLE$", 11 - .string "SCEPTILE$", 11 - .string "TORCHIC$", 11 - .string "COMBUSKEN$", 11 - .string "BLAZIKEN$", 11 - .string "MUDKIP$", 11 - .string "MARSHTOMP$", 11 - .string "SWAMPERT$", 11 - .string "POOCHYENA$", 11 - .string "MIGHTYENA$", 11 - .string "ZIGZAGOON$", 11 - .string "LINOONE$", 11 - .string "WURMPLE$", 11 - .string "SILCOON$", 11 - .string "BEAUTIFLY$", 11 - .string "CASCOON$", 11 - .string "DUSTOX$", 11 - .string "LOTAD$", 11 - .string "LOMBRE$", 11 - .string "LUDICOLO$", 11 - .string "SEEDOT$", 11 - .string "NUZLEAF$", 11 - .string "SHIFTRY$", 11 + .string "GECKARBOR$", 11 + .string "REPTAIN$", 11 + .string "GEWALDRO$", 11 + .string "FLEMMLI$", 11 + .string "JUNGGLUT$", 11 + .string "LOHGOCK$", 11 + .string "HYDROPI$", 11 + .string "MOORABBEL$", 11 + .string "SUMPEX$", 11 + .string "FIFFYEN$", 11 + .string "MAGNAYEN$", 11 + .string "ZIGZACHS$", 11 + .string "GERADAKS$", 11 + .string "WAUMPEL$", 11 + .string "SCHALOKO$", 11 + .string "PAPINELLA$", 11 + .string "PANEKON$", 11 + .string "PUDOX$", 11 + .string "LOTURZEL$", 11 + .string "LOMBRERO$", 11 + .string "KAPPALORES$", 11 + .string "SAMURZEL$", 11 + .string "BLANAS$", 11 + .string "TENGULIST$", 11 .string "NINCADA$", 11 .string "NINJASK$", 11 - .string "SHEDINJA$", 11 - .string "TAILLOW$", 11 - .string "SWELLOW$", 11 - .string "SHROOMISH$", 11 - .string "BRELOOM$", 11 - .string "SPINDA$", 11 + .string "NINJATOM$", 11 + .string "SCHWALBINI$", 11 + .string "SCHWALBOSS$", 11 + .string "KNILZ$", 11 + .string "KAPILZ$", 11 + .string "PANDIR$", 11 .string "WINGULL$", 11 .string "PELIPPER$", 11 - .string "SURSKIT$", 11 - .string "MASQUERAIN$", 11 + .string "GEHWEIHER$", 11 + .string "MASKEREGEN$", 11 .string "WAILMER$", 11 .string "WAILORD$", 11 - .string "SKITTY$", 11 - .string "DELCATTY$", 11 + .string "ENECO$", 11 + .string "ENEKORO$", 11 .string "KECLEON$", 11 - .string "BALTOY$", 11 - .string "CLAYDOL$", 11 - .string "NOSEPASS$", 11 - .string "TORKOAL$", 11 - .string "SABLEYE$", 11 - .string "BARBOACH$", 11 - .string "WHISCASH$", 11 - .string "LUVDISC$", 11 - .string "CORPHISH$", 11 - .string "CRAWDAUNT$", 11 - .string "FEEBAS$", 11 + .string "PUPPANCE$", 11 + .string "LEPUMENTAS$", 11 + .string "NASGNET$", 11 + .string "QURTEL$", 11 + .string "ZOBIRIS$", 11 + .string "SCHMERBE$", 11 + .string "WELSAR$", 11 + .string "LIEBISKUS$", 11 + .string "KREBSCORPS$", 11 + .string "KREBUTACK$", 11 + .string "BARSCHWA$", 11 .string "MILOTIC$", 11 - .string "CARVANHA$", 11 - .string "SHARPEDO$", 11 - .string "TRAPINCH$", 11 + .string "KANIVANHA$", 11 + .string "TOHAIDO$", 11 + .string "KNACKLION$", 11 .string "VIBRAVA$", 11 - .string "FLYGON$", 11 + .string "LIBELLDRA$", 11 .string "MAKUHITA$", 11 .string "HARIYAMA$", 11 - .string "ELECTRIKE$", 11 - .string "MANECTRIC$", 11 - .string "NUMEL$", 11 + .string "FRIZELBLIZ$", 11 + .string "VOLTENSO$", 11 + .string "CAMAUB$", 11 .string "CAMERUPT$", 11 - .string "SPHEAL$", 11 - .string "SEALEO$", 11 - .string "WALREIN$", 11 - .string "CACNEA$", 11 - .string "CACTURNE$", 11 - .string "SNORUNT$", 11 - .string "GLALIE$", 11 - .string "LUNATONE$", 11 - .string "SOLROCK$", 11 + .string "SEEMOPS$", 11 + .string "SEEJONG$", 11 + .string "WALRAISA$", 11 + .string "TUSKA$", 11 + .string "NOKTUSKA$", 11 + .string "SCHNEPPKE$", 11 + .string "FIRNONTOR$", 11 + .string "LUNASTEIN$", 11 + .string "SONNFEL$", 11 .string "AZURILL$", 11 .string "SPOINK$", 11 - .string "GRUMPIG$", 11 + .string "GROINK$", 11 .string "PLUSLE$", 11 .string "MINUN$", 11 - .string "MAWILE$", 11 - .string "MEDITITE$", 11 - .string "MEDICHAM$", 11 - .string "SWABLU$", 11 + .string "FLUNKIFER$", 11 + .string "MEDITIE$", 11 + .string "MEDITALIS$", 11 + .string "WABLU$", 11 .string "ALTARIA$", 11 - .string "WYNAUT$", 11 - .string "DUSKULL$", 11 - .string "DUSCLOPS$", 11 + .string "ISSO$", 11 + .string "ZWIRRLICHT$", 11 + .string "ZWIRRKLOP$", 11 .string "ROSELIA$", 11 - .string "SLAKOTH$", 11 - .string "VIGOROTH$", 11 - .string "SLAKING$", 11 - .string "GULPIN$", 11 - .string "SWALOT$", 11 + .string "BUMMELZ$", 11 + .string "MUNTIER$", 11 + .string "LETARKING$", 11 + .string "SCHLUPPUCK$", 11 + .string "SCHLUKWECH$", 11 .string "TROPIUS$", 11 - .string "WHISMUR$", 11 - .string "LOUDRED$", 11 - .string "EXPLOUD$", 11 - .string "CLAMPERL$", 11 - .string "HUNTAIL$", 11 - .string "GOREBYSS$", 11 + .string "FLURMEL$", 11 + .string "KRAKEELO$", 11 + .string "KRAWUMMS$", 11 + .string "PERLU$", 11 + .string "AALABYSS$", 11 + .string "SAGANABYSS$", 11 .string "ABSOL$", 11 .string "SHUPPET$", 11 .string "BANETTE$", 11 - .string "SEVIPER$", 11 - .string "ZANGOOSE$", 11 + .string "VIPITIS$", 11 + .string "SENGO$", 11 .string "RELICANTH$", 11 - .string "ARON$", 11 - .string "LAIRON$", 11 - .string "AGGRON$", 11 - .string "CASTFORM$", 11 + .string "STOLLUNIOR$", 11 + .string "STOLLRAK$", 11 + .string "STOLLOSS$", 11 + .string "FORMEO$", 11 .string "VOLBEAT$", 11 .string "ILLUMISE$", 11 - .string "LILEEP$", 11 - .string "CRADILY$", 11 + .string "LILIEP$", 11 + .string "WIELIE$", 11 .string "ANORITH$", 11 .string "ARMALDO$", 11 - .string "RALTS$", 11 + .string "TRASLA$", 11 .string "KIRLIA$", 11 - .string "GARDEVOIR$", 11 - .string "BAGON$", 11 - .string "SHELGON$", 11 - .string "SALAMENCE$", 11 - .string "BELDUM$", 11 + .string "GUARDEVOIR$", 11 + .string "KINDWURM$", 11 + .string "DRASCHEL$", 11 + .string "BRUTALANDA$", 11 + .string "TANHEL$", 11 .string "METANG$", 11 .string "METAGROSS$", 11 .string "REGIROCK$", 11 @@ -410,4 +410,4 @@ gSpeciesNames:: @ 81F716C .string "LATIOS$", 11 .string "JIRACHI$", 11 .string "DEOXYS$", 11 - .string "CHIMECHO$", 11 + .string "PALIMPALIM$", 11 diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc index 437a1fa21..abcc8a4a8 100644 --- a/data/text/storyteller.inc +++ b/data/text/storyteller.inc @@ -1,554 +1,562 @@ gTextStoryteller_Introduction:: @ 81AECC6 - .string "I’m the STORYTELLER.\n" - .string "I’ll tell you tales of legendary\l" - .string "TRAINERS.\p" - .string "Will you hear my tale?$" + .string "Ich bin der GESCHICHTENERZÄHLER.\n" + .string "Ich erzähle dir die Geschichten von\l" + .string "legendären TRAINERN.\p" + .string "Soll ich dir etwas erzählen?$" gTextStoryteller_OhIFeelStifled:: @ 81AED1D .string "Oh...\n" - .string "I feel stifled...$" + .string "Keiner mag mich...$" gTextStoryteller_WhichTale:: @ 81AED35 - .string "I know of these legends.\n" - .string "Which tale will you have me tell?$" + .string "Ich kenne viele dieser Legenden.\n" + .string "Welche möchtest du hören?$" gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70 - .string "But, I know of no legendary TRAINERS.\n" - .string "Hence, I know no tales.\p" - .string "Where does one find a TRAINER worthy\n" - .string "of a legendary tale?$" + .string "Aber ich weiß nichts über legendäre\n" + .string "TRAINER. Also habe ich keine Ge-\l" + .string "schichte auf Lager.\p" + .string "Wo findet man wohl einen TRAINER, der\n" + .string "einer lebenden Legende gleicht?$" gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8 - .string "What’s that?!\n" - .string "You... You...\p" + .string "Was ist?\n" + .string "Du... Du...\p" .string "{STR_VAR_2}\n" - .string "{STR_VAR_1} time(s)?!\p" - .string "That is indeed magnificent!\n" - .string "It’s the birth of a new legend!$" + .string "{STR_VAR_1}-mal?\p" + .string "Das ist einfach großartig!\n" + .string "Die Geburt einer neuen Legende!$" gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50 - .string "It gets me thinking, could there be\n" - .string "other TRAINERS with more impressive\l" - .string "legends awaiting discovery?$" + .string "Ich überlege, ob es nicht noch andere\n" + .string "TRAINER gibt, die mir beeindruckende\l" + .string "Geschichten erzählen können.$" gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4 - .string "Are you a TRAINER?\p" - .string "Then tell me, have you any tales that\n" - .string "are even remotely legendary?$" + .string "Bist du ein TRAINER?\p" + .string "Dann sag mir, ob du Geschichten\n" + .string "für mich hast, die legendär sind?$" gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A - .string "Incidentally... Would you care to hear\n" - .string "another legendary tale?$" + .string "Übrigens... Möchtest du eine weitere\n" + .string "legendäre Geschichte hören?$" gTextStoryteller_ImNotSatisfied:: @ 81AEF49 .string "Hmm...\n" - .string "I’m not satisfied...\p" - .string "I wish you would bring me news worthy\n" - .string "of being called a legend.$" + .string "Ich bin nicht zufrieden...\p" + .string "Ich wünschte, du würdest mir Neuig-\n" + .string "keiten erzählen, die den Titel Legende\l" + .string "verdienen.$" gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5 - .string "I wish more people would be interested\n" - .string "in hearing my epic tales of legendary\l" - .string "TRAINERS.$" + .string "Ich wollte, mehr Leute würden sich für\n" + .string "meine epischen Geschichten über\l" + .string "legendäre TRAINER interessieren.$" gTextStoryteller_Story1Title:: @ 81AEFFC - .string "The Save-Happy TRAINER$" + .string "Der speicherfreudige TRAINER$" gTextStoryteller_Story1Action:: @ 81AF013 - .string "Saved the game$" + .string "Hast das Spiel gespeichert?$" gTextStoryteller_Story1Text:: @ 81AF022 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER saved the game\n" - .string "{STR_VAR_1} times!\p" - .string "A more cautious TRAINER than\n" - .string "{STR_VAR_3} one will never find!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat das Spiel\n" + .string "{STR_VAR_1}-mal gespeichert!\p" + .string "Einen vorsichtigeren TRAINER als\n" + .string "{STR_VAR_3} wird man nicht finden!$" gTextStoryteller_Story2Title:: @ 81AF0A3 - .string "The Trendsetter TRAINER$" + .string "Der TRAINER als Trendsetter$" gTextStoryteller_Story2Action:: @ 81AF0BB - .string "Started trends$" + .string "Hast Trends gesetzt?$" gTextStoryteller_Story2Text:: @ 81AF0CA - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER started new trends\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} is setting trends for all\n" - .string "the HOENN region!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "neue Trends gesetzt!\p" + .string "{STR_VAR_3} setzt den Trend für alle - in\n" + .string "der ganzen HOENN-Region!$" gTextStoryteller_Story3Title:: @ 81AF149 - .string "The BERRY-Planting TRAINER$" + .string "Der BEEREN pflanzende TRAINER$" gTextStoryteller_Story3Action:: @ 81AF164 - .string "Planted BERRIES$" + .string "Hast BEEREN gepflanzt?$" gTextStoryteller_Story3Text:: @ 81AF174 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER planted BERRIES\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} is a legendary lover of\n" - .string "BERRIES!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "BEEREN gepflanzt!\p" + .string "{STR_VAR_3} ist ein legendärer Lieb-\n" + .string "haber von BEEREN!$" gTextStoryteller_Story4Title:: @ 81AF1E5 - .string "The BIKE-Loving TRAINER$" + .string "Der RAD verrückte TRAINER$" gTextStoryteller_Story4Action:: @ 81AF1FD - .string "Traded BIKES$" + .string "Hast RÄDER getauscht?$" gTextStoryteller_Story4Text:: @ 81AF20A - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER swapped BIKES\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must love BIKES deeply\n" - .string "and passionately!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "das RAD getauscht!\p" + .string "{STR_VAR_3} ist ein TRAINER, dessen\n" + .string "Passion das RADfahren ist!$" gTextStoryteller_Story5Title:: @ 81AF281 - .string "The Interviewed TRAINER$" + .string "Der Interviews gebende TRAINER$" gTextStoryteller_Story5Action:: @ 81AF299 - .string "Got interviewed$" + .string "Hast Interviews gegeben?$" gTextStoryteller_Story5Text:: @ 81AF2A9 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER got interviewed\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a TRAINER who’s\n" - .string "attracting much attention!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER wurde {STR_VAR_1}-mal\n" + .string "interviewt!\p" + .string "{STR_VAR_3} ist ein TRAINER, der überall\n" + .string "Aufmerksamkeit erregt!$" gTextStoryteller_Story6Title:: @ 81AF32C - .string "The Battle-Happy TRAINER$" + .string "Der kampfliebende TRAINER$" gTextStoryteller_Story6Action:: @ 81AF345 - .string "Battled$" + .string "Hast oft gekämpft?$" gTextStoryteller_Story6Text:: @ 81AF34D - .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!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "gekämpft!\p" + .string "{STR_VAR_3} ist ein TRAINER, der zu\n" + .string "einem Kampf nicht nein sagt!$" gTextStoryteller_Story7Title:: @ 81AF3D0 - .string "The POKéMON-Catching TRAINER$" + .string "Der POKéMON fangende TRAINER$" gTextStoryteller_Story7Action:: @ 81AF3ED - .string "Caught POKéMON$" + .string "Hast POKéMON gefangen?$" gTextStoryteller_Story7Text:: @ 81AF3FC - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER caught\n" - .string "{STR_VAR_1} POKéMON!\p" - .string "{STR_VAR_3} is a legendary catcher of\n" - .string "wild POKéMON!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}\n" + .string "POKéMON gefangen!\p" + .string "{STR_VAR_3} ist ein legendärer Fänger\n" + .string "von POKéMON!$" gTextStoryteller_Story8Title:: @ 81AF46D - .string "The Fishing TRAINER$" + .string "Der angelnde TRAINER$" gTextStoryteller_Story8Action:: @ 81AF481 - .string "Caught POKéMON with a ROD$" + .string "Hast POKéMON mit einer ANGEL gefangen?$" gTextStoryteller_Story8Text:: @ 81AF49B - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER caught\n" - .string "{STR_VAR_1} POKéMON while fishing!\p" - .string "{STR_VAR_3} is a legendary fishing\n" - .string "expert!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}\n" + .string "POKéMON beim Angeln gefangen!\p" + .string "{STR_VAR_3} ist ein legendärer Angel-\n" + .string "experte!$" gTextStoryteller_Story9Title:: @ 81AF511 - .string "The EGG-Warming TRAINER$" + .string "Der EIER wärmende TRAINER$" gTextStoryteller_Story9Action:: @ 81AF529 - .string "Hatched EGGS$" + .string "Hast EIER ausgebrütet?$" gTextStoryteller_Story9Text:: @ 81AF536 - .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" - .string "from EGGS!\p" - .string "{STR_VAR_3} is a legendary warmer\n" - .string "of EGGS!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Es passierte {STR_VAR_1}-mal, dass der TRAINER\n" + .string "ein POKéMON aus einem EI schlüpfen ließ!\p" + .string "{STR_VAR_3} ist ein legendärer Pfleger\n" + .string "von EIERN!$" gTextStoryteller_Story10Title:: @ 81AF5A9 - .string "The Evolver TRAINER$" + .string "Der TRAINER der Entwicklungen$" gTextStoryteller_Story10Action:: @ 81AF5BD - .string "Evolved POKéMON$" + .string "Hast POKéMON sich entwickeln lassen?$" gTextStoryteller_Story10Text:: @ 81AF5CD - .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" - .string "evolve!\p" - .string "{STR_VAR_3} is the ultimate evolver\n" - .string "of POKéMON!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}\n" + .string "POKéMON zur Entwicklung gebracht!\p" + .string "{STR_VAR_3} ist der ultimative Ent-\n" + .string "wickler von POKéMON!$" gTextStoryteller_Story11Title:: @ 81AF63F - .string "The POKéMON CENTER-Loving TRAINER$" + .string "Der PKMN-CENTER liebende TRAINER$" gTextStoryteller_Story11Action:: @ 81AF661 - .string "Used POKéMON CENTERS$" + .string "Gingst in ein POKéMON-CENTER?$" gTextStoryteller_Story11Text:: @ 81AF676 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER healed POKéMON\n" - .string "{STR_VAR_1} times at POKéMON CENTERS!\p" - .string "There could be no greater lover of\n" - .string "POKéMON CENTERS than {STR_VAR_3}!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat POKéMON\n" + .string "{STR_VAR_1}-mal in einem POKéMON-CENTER\l" + .string "heilen lassen!\p" + .string "Es gibt keinen größeren Fan der\n" + .string "POKéMON-CENTER als {STR_VAR_3}!$" gTextStoryteller_Story12Title:: @ 81AF711 - .string "The Homebody TRAINER$" + .string "Der gastfreundliche TRAINER$" gTextStoryteller_Story12Action:: @ 81AF726 - .string "Rested POKéMON at home$" + .string "POKéMON haben sich bei dir erholt?$" gTextStoryteller_Story12Text:: @ 81AF73D - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER healed POKéMON\n" - .string "{STR_VAR_1} times at home!\p" - .string "There could be no more of a homebody\n" - .string "than {STR_VAR_3}!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat POKéMON\n" + .string "{STR_VAR_1}-mal bei sich zu Hause ausruhen\l" + .string "und heilen lassen.\p" + .string "Kein TRAINER ist so gastfreundlich\n" + .string "wie {STR_VAR_3}!$" gTextStoryteller_Story13Title:: @ 81AF7BF - .string "The SAFARI-Loving TRAINER$" + .string "Der SAFARI liebende TRAINER$" gTextStoryteller_Story13Action:: @ 81AF7D9 - .string "Entered the SAFARI ZONE$" + .string "Bist in die SAFARI-ZONE gegangen?$" gTextStoryteller_Story13Text:: @ 81AF7F1 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER went into the SAFARI ZONE\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} is a TRAINER whose wild side\n" - .string "must come out in the SAFARI ZONE!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER ist {STR_VAR_1}-mal in die\n" + .string "SAFARI-ZONE gegangen!\p" + .string "{STR_VAR_3} ist ein TRAINER, dessen\n" + .string "wilde Seite in der SAFARI-ZONE zum\l" + .string "Vorschein kommt!$" gTextStoryteller_Story14Title:: @ 81AF88A - .string "The CUT-Frenzy TRAINER$" + .string "Der TRAINER als ZERSCHNEIDER$" gTextStoryteller_Story14Action:: @ 81AF8A1 - .string "Used CUT$" + .string "Hast ZERSCHNEIDER eingesetzt?$" gTextStoryteller_Story14Text:: @ 81AF8AA - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER used CUT\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} is a TRAINER who just must\n" - .string "love to CUT!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "ZERSCHNEIDER eingesetzt!\p" + .string "{STR_VAR_3} ist ein TRAINER, der es\n" + .string "liebt, etwas zu ZERSCHNEIDEN.$" gTextStoryteller_Story15Title:: @ 81AF91B - .string "The ROCK-SMASHING TRAINER$" + .string "Der TRAINER als ZERTRÜMMERER$" gTextStoryteller_Story15Action:: @ 81AF935 - .string "Smashed rocks$" + .string "Hast Felsen ZERTRÜMMERT?$" gTextStoryteller_Story15Text:: @ 81AF943 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER used ROCK SMASH\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a TRAINER who\n" - .string "can’t leave a stone unsmashed!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "ZERTRÜMMERER eingesetzt!\p" + .string "{STR_VAR_3} ist ein TRAINER, der keinen\n" + .string "Felsen unbeschädigt lassen kann.$" gTextStoryteller_Story16Title:: @ 81AF9C8 - .string "The Move-Loving TRAINER$" + .string "Der Umzüge liebende TRAINER$" gTextStoryteller_Story16Action:: @ 81AF9E0 - .string "Moved the SECRET BASE$" + .string "Bist du mit der GEHEIMBASIS umgezogen?$" gTextStoryteller_Story16Text:: @ 81AF9F6 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER moved the SECRET BASE\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} is a TRAINER who loves\n" - .string "to move houses often!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER ist {STR_VAR_1}-mal mit\n" + .string "seiner GEHEIMBASIS umgezogen!\p" + .string "{STR_VAR_3} ist ein TRAINER, der es\n" + .string "liebt, sich ein neues Haus einzurichten.$" gTextStoryteller_Story17Title:: @ 81AFA79 - .string "The SPLASH-Happy TRAINER$" + .string "Der PLATSCHER des TRAINERS$" gTextStoryteller_Story17Action:: @ 81AFA92 - .string "Used SPLASH$" + .string "Hast PLATSCHER eingesetzt?$" gTextStoryteller_Story17Text:: @ 81AFA9E - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER used SPLASH\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} is a TRAINER who must love\n" - .string "SPLASHING around!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "PLATSCHER eingesetzt!\p" + .string "{STR_VAR_3} ist ein TRAINER, der es\n" + .string "liebt, zu PLATSCHEN.$" gTextStoryteller_Story18Title:: @ 81AFB17 - .string "The Tenacious TRAINER$" + .string "Der verbissene TRAINER$" gTextStoryteller_Story18Action:: @ 81AFB2D - .string "Resorted to using STRUGGLE$" + .string "Hast VERZWEIFLER angewendet?$" gTextStoryteller_Story18Text:: @ 81AFB48 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER had to rely on STRUGGLE\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} is a tenacious TRAINER\n" - .string "who never gives in to adversity!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat sich {STR_VAR_1}-mal\n" + .string "auf VERZWEIFLER verlassen!\p" + .string "{STR_VAR_3}... Ein verbissener TRAINER,\n" + .string "der auch in der Not nicht aufgibt.$" gTextStoryteller_Story19Title:: @ 81AFBD8 - .string "The SLOT Champ$" + .string "Der König der EINARMIGEN BANDITEN$" gTextStoryteller_Story19Action:: @ 81AFBE7 - .string "Won the jackpot on the SLOTS$" + .string "Hast den EINARMIGEN BANDITEN besiegt?$" gTextStoryteller_Story19Text:: @ 81AFC04 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER won the jackpot on\n" - .string "the SLOTS {STR_VAR_1} times.\p" - .string "{STR_VAR_3} is a TRAINER who was lucky\n" - .string "on the SLOTS!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "am EINARMIGEN BANDITEN gewonnen!\p" + .string "{STR_VAR_3}... Ein TRAINER, der am\n" + .string "EINARMIGEN BANDITEN Glück hat.$" gTextStoryteller_Story20Title:: @ 81AFC8A - .string "The ROULETTE Champ$" + .string "Der König des ROULETTES$" gTextStoryteller_Story20Action:: @ 81AFC9D - .string "Had consecutive ROULETTE wins of$" + .string "Hast in Folge beim ROULETTE gewonnen,$" gTextStoryteller_Story20Text:: @ 81AFCBE - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER won in ROULETTE\n" - .string "{STR_VAR_1} times in a row.\p" - .string "{STR_VAR_3} was lucky when the ball\n" - .string "bounced in ROULETTE!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal in Folge\n" + .string "beim ROULETTE gewonnen!\p" + .string "{STR_VAR_3}... Ein TRAINER, dem die Kugel\n" + .string "beim ROULETTE gehorcht.$" gTextStoryteller_Story21Title:: @ 81AFD44 - .string "The BATTLE TOWER Challenger$" + .string "Der Herausforderer im DUELLTURM$" gTextStoryteller_Story21Action:: @ 81AFD60 - .string "Took the BATTLE TOWER challenge$" + .string "Hast Gegner im DUELLTURM gefordert?$" gTextStoryteller_Story21Text:: @ 81AFD80 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER took the BATTLE TOWER\n" - .string "challenge {STR_VAR_1} times!\p" - .string "{STR_VAR_3} is a TRAINER who aspires\n" - .string "for excellence in the BATTLE TOWER!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal Gegner\n" + .string "im DUELLTURM herausgefordert!\p" + .string "{STR_VAR_3}... Ein TRAINER, der im DUELL-\n" + .string "TURM nach Perfektion strebt.$" gTextStoryteller_Story22Title:: @ 81AFE1D - .string "The Blend-Loving TRAINER$" + .string "Der mixende TRAINER$" gTextStoryteller_Story22Action:: @ 81AFE36 - .string "Made {POKEBLOCK}S$" + .string "Hast {POKEBLOCK} hergestellt?$" gTextStoryteller_Story22Text:: @ 81AFE42 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER made {POKEBLOCK}S\n" - .string "{STR_VAR_1} times!\p" - .string "There is none better at using a BERRY\n" - .string "BLENDER than {STR_VAR_3}!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "{POKEBLOCK} hergestellt!\p" + .string "Niemand bedient den BEERENMIXER\n" + .string "besser als {STR_VAR_3}.$" gTextStoryteller_Story23Title:: @ 81AFEC2 - .string "The CONTEST-Loving TRAINER$" + .string "Der Fan der WETTBEWERBE$" gTextStoryteller_Story23Action:: @ 81AFEDD - .string "Entered CONTESTS$" + .string "Hast an WETTBEWERBEN teilgenommen?$" gTextStoryteller_Story23Text:: @ 81AFEEE - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER entered CONTESTS\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must love showing off\n" - .string "POKéMON to others!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "an einem WETTBEWERB teilgenommen!\p" + .string "{STR_VAR_3} liebt es, anderen seine\n" + .string "POKéMON zu zeigen.$" gTextStoryteller_Story24Title:: @ 81AFF68 - .string "The CONTEST Master$" + .string "Der Meister der WETTBEWERBE$" gTextStoryteller_Story24Action:: @ 81AFF7B - .string "Won CONTESTS$" + .string "Hast WETTBEWERBE gewonnen?$" gTextStoryteller_Story24Text:: @ 81AFF88 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER won CONTESTS\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be an incredible\n" - .string "CONTEST master!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "einen WETTBEWERB gewonnen!\p" + .string "{STR_VAR_3} ist ein unvergleichlicher\n" + .string "Meister der WETTBEWERBE.$" gTextStoryteller_Story25Title:: @ 81AFFFB - .string "The Happy Shopper$" + .string "Der glückliche Einkäufer$" gTextStoryteller_Story25Action:: @ 81B000D - .string "Shopped$" + .string "Bist einkaufen gegangen?$" gTextStoryteller_Story25Text:: @ 81B0015 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER bought items in shops\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be one of those\n" - .string "people who are born to shop.$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "in einem Geschäft Items gekauft!\p" + .string "{STR_VAR_3} ein geborener Einkäufer.$" gTextStoryteller_Story26Title:: @ 81B009D - .string "The Item-Finding TRAINER$" + .string "Der TRAINER, der Items findet$" gTextStoryteller_Story26Action:: @ 81B00B6 - .string "Used an ITEMFINDER$" + .string "Hast den DETEKTOR eingesetzt?$" gTextStoryteller_Story26Text:: @ 81B00C9 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER used an ITEMFINDER\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must enjoy scouring the\n" - .string "ground for hidden items!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "den DETEKTOR eingesetzt!\p" + .string "{STR_VAR_3} liebt es, den Boden nach\n" + .string "verborgenen Items abzusuchen.$" gTextStoryteller_Story27Title:: @ 81B014D - .string "The Rain-Soaked TRAINER$" + .string "Der regennasse TRAINER$" gTextStoryteller_Story27Action:: @ 81B0165 - .string "Got rained on$" + .string "Wurdest nass geregnet?$" gTextStoryteller_Story27Text:: @ 81B0173 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER got soaked by rain\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3}’s charisma must even\n" - .string "attract rain!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER wurde {STR_VAR_1}-mal\n" + .string "nass geregnet!\p" + .string "Das Charisma von {STR_VAR_3} zieht\n" + .string "sogar den Regen an.$" gTextStoryteller_Story28Title:: @ 81B01E9 - .string "The Avid POKéDEX Reader$" + .string "Der passionierte POKéDEX-Leser$" gTextStoryteller_Story28Action:: @ 81B0201 - .string "Checked a POKéDEX$" + .string "Hast im POKéDEX nachgeschlagen?$" gTextStoryteller_Story28Text:: @ 81B0213 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER checked a POKéDEX\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must love inspecting\n" - .string "POKéMON in a POKéDEX!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "im POKéDEX nachgeschlagen!\p" + .string "{STR_VAR_3} liebt es, alles über\n" + .string "POKéMON im POKéDEX nachzulesen.$" gTextStoryteller_Story29Title:: @ 81B0290 - .string "The RIBBON Collector$" + .string "Der Sammler der BÄNDER$" gTextStoryteller_Story29Action:: @ 81B02A5 - .string "Received RIBBONS$" + .string "Hast BÄNDER erhalten?$" gTextStoryteller_Story29Text:: @ 81B02B6 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER received RIBBONS\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a TRAINER who\n" - .string "loves to collect RIBBONS!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}\n" + .string "BÄNDER erhalten!\p" + .string "{STR_VAR_3} ist ein TRAINER, der es\n" + .string "liebt, BÄNDER zu sammeln.$" gTextStoryteller_Story30Title:: @ 81B0337 - .string "The Ledge-Jumping TRAINER$" + .string "Der springende TRAINER$" gTextStoryteller_Story30Action:: @ 81B0351 - .string "Jumped down ledges$" + .string "Bist Absätze heruntergesprungen?$" gTextStoryteller_Story30Text:: @ 81B0364 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER jumped down ledges\n" - .string "{STR_VAR_1} times!\p" - .string "If there’s a ledge to be jumped,\n" - .string "{STR_VAR_3} can’t ignore it!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER ist {STR_VAR_1}-mal\n" + .string "einen Absatz hinabgesprungen!\p" + .string "Sobald er an einen Absatz kommt, muss\n" + .string "TRAINER {STR_VAR_3} einfach hinab-\l" + .string "springen.$" gTextStoryteller_Story31Title:: @ 81B03E9 - .string "The Legendary TV Viewer$" + .string "Der legendäre Fernsehzuschauer$" gTextStoryteller_Story31Action:: @ 81B0401 - .string "Watched TV$" + .string "Hast ferngeschaut?$" gTextStoryteller_Story31Text:: @ 81B040C - .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!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "Fernsehen geschaut!\p" + .string "{STR_VAR_3} liebt es, fernzusehen.$" gTextStoryteller_Story32Title:: @ 81B046E - .string "The Time-Conscious TRAINER$" + .string "Der zeitbewusste TRAINER$" gTextStoryteller_Story32Action:: @ 81B0489 - .string "Checked the time$" + .string "Hast nach der Uhrzeit gesehen?$" gTextStoryteller_Story32Text:: @ 81B049A - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER checked the time\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a punctual TRAINER\n" - .string "who’s conscious of the time.$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "nach der Uhrzeit geschaut!\p" + .string "{STR_VAR_3} ist ein pünktlicher\n" + .string "TRAINER, der sich der Zeit bewusst ist.$" gTextStoryteller_Story33Title:: @ 81B0523 - .string "The POKéMON LOTTERY Wizard$" + .string "Der Zauberer der POKéMON-LOTTERIE$" gTextStoryteller_Story33Action:: @ 81B053E - .string "Won POKéMON LOTTERIES$" + .string "Hast in der LOTTERIE gewonnen?$" gTextStoryteller_Story33Text:: @ 81B0554 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER won POKéMON LOTTERIES\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must have many friends\n" - .string "to trade POKéMON with!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "in der POKéMON-LOTTERIE gewonnen!\p" + .string "TRAINER {STR_VAR_3} hat viele Freunde,\n" + .string "die mit ihm POKéMON tauschen.$" gTextStoryteller_Story34Title:: @ 81B05D8 - .string "The DAY CARE-Using Trainer$" + .string "Der TRAINER und die PENSION$" gTextStoryteller_Story34Action:: @ 81B05F3 - .string "Left POKéMON at the DAY CARE$" + .string "Hast POKéMON in die PENSION gebracht?$" gTextStoryteller_Story34Text:: @ 81B0610 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER left POKéMON with the\n" - .string "DAY CARE {STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a real go-getter\n" - .string "who raises POKéMON aggressively!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "seine POKéMON in die PENSION gegeben!\p" + .string "{STR_VAR_3} ist ein Ellenbogentyp, der\n" + .string "alles für die Entwicklung seiner\l" + .string "POKéMON tut.$" gTextStoryteller_Story35Title:: @ 81B06A9 - .string "The CABLE CAR-Loving TRAINER$" + .string "Der SEILBAHN verrückte TRAINER$" gTextStoryteller_Story35Action:: @ 81B06C6 - .string "Rode the CABLE CAR$" + .string "Bist mit der SEILBAHN gefahren?$" gTextStoryteller_Story35Text:: @ 81B06D9 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER rode the CABLE CAR\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a busy TRAINER\n" - .string "who’s up and down all the time!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER ist {STR_VAR_1}-mal\n" + .string "mit der SEILBAHN gefahren!\p" + .string "{STR_VAR_3} ein sehr beschäftigter\n" + .string "TRAINER, der ständig rauf und runter\l" + .string "fährt.$" gTextStoryteller_Story36Title:: @ 81B0763 - .string "The Hot Spring-Loving TRAINER$" + .string "Der Liebhaber der Heißen Quellen$" gTextStoryteller_Story36Action:: @ 81B0781 - .string "Bathed in hot springs$" + .string "Hast in den Heißen Quellen gebadet?$" gTextStoryteller_Story36Text:: @ 81B0797 - .string "This is a tale of a TRAINER\n" - .string "named {STR_VAR_3}.\p" - .string "This TRAINER bathed in hot springs\n" - .string "{STR_VAR_1} times!\p" - .string "{STR_VAR_3} must be a TRAINER with\n" - .string "baby-smooth skin!$" + .string "Dies ist die Geschichte eines TRAINERS\n" + .string "namens {STR_VAR_3}.\p" + .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" + .string "in den Heißen Quellen gebadet!\p" + .string "{STR_VAR_3} wird eine babyweiche Haut\n" + .string "haben.$" diff --git a/data/text/surf.inc b/data/text/surf.inc index e9e3e9026..161923726 100644 --- a/data/text/surf.inc +++ b/data/text/surf.inc @@ -1,6 +1,6 @@ UseSurfPromptText: @ 81A1344 - .string "The water is dyed a deep blue...\n" - .string "Would you like to SURF?$" + .string "Das Wasser ist tiefblau.\n" + .string "Möchtest du SURFER einsetzen?$" UsedSurfText: @ 81A137D - .string "{STR_VAR_1} used SURF!$" + .string "{STR_VAR_1} setzt SURFER ein.$" diff --git a/data/text/trader.inc b/data/text/trader.inc index 599344091..dae453e8b 100644 --- a/data/text/trader.inc +++ b/data/text/trader.inc @@ -1,58 +1,60 @@ gTextTrader_Introduction:: @ 81AE88F - .string "Hi, I’m the TRADER.\n" - .string "Want to trade decorations with me?$" + .string "Hallo! Ich bin der HÄNDLER. Möchtest\n" + .string "du Dekorationen mit mir tauschen?$" gTextTrader_FeelUnwanted1:: @ 81AE8C6 .string "Oh...\n" - .string "I feel unwanted...$" + .string "Ich fühle mich überflüssig...$" gTextTrader_TradedAlready:: @ 81AE8DF - .string "But we’ve traded decorations already,\n" - .string "you and I.$" + .string "Aber wir beide haben doch bereits\n" + .string "Dekorationen ausgetauscht.$" gTextTrader_MenuPrompt:: @ 81AE910 - .string "If you see any decorative item that\n" - .string "you want of mine, speak up.$" + .string "Wenn du etwas Dekoratives siehst, das\n" + .string "du haben möchtest, lass es mich wissen.$" gTextTrader_DontWantAnything:: @ 81AE950 - .string "You don’t want anything?\n" - .string "I feel unwanted...$" + .string "Du möchtest nichts haben?\n" + .string "Ich fühle mich so überflüssig...$" gTextTrader_ItemOnceBelongedTo:: @ 81AE97C - .string "That decorative item once belonged\n" - .string "to {STR_VAR_1}.\p" - .string "Do you want it?$" + .string "Das dekorative Item gehörte einst\n" + .string "{STR_VAR_1}.\p" + .string "Möchtest du es haben?$" gTextTrader_YouDontHaveDecorations:: @ 81AE9B6 - .string "Uh... Wait a second. You don’t have a\n" - .string "single piece of decoration!$" + .string "Äh... Warte eine Sekunde. Du hast über-\n" + .string "haupt kein dekoratives Item!$" gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8 - .string "Okay, pick the decoration that you’ll\n" - .string "trade to me.$" + .string "Okay, wähle die Dekoration aus, die du\n" + .string "mit mir tauschen willst.$" gTextTrader_FeelUnwanted2:: @ 81AEA2B - .string "You won’t trade with me?\n" - .string "I feel unwanted...$" + .string "Du willst nicht mit mir tauschen?\n" + .string "Ich fühle mich überflüssig...$" gTextTrader_NoRoomForThis:: @ 81AEA57 - .string "You’ve got all the {STR_VAR_2}S that can\n" - .string "be stored. You’ve no room for this.$" + .string "Du hast keinen Platz mehr für eine/n\n" + .string "{STR_VAR_2}.$" gTextTrader_SoWellTrade:: @ 81AEA9B - .string "Okay, so we’ll trade my {STR_VAR_3}\n" - .string "for your {STR_VAR_2}?$" + .string "Okay, dann lass uns tauschen:\n" + .string "{STR_VAR_3} gegen\l" + .string "{STR_VAR_2}!$" gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3 - .string "That piece of decoration is in use.\n" - .string "You can’t trade it.$" + .string "Dieses Dekorationsstück ist im Ge-\n" + .string "brauch. Das kannst du nicht tauschen.$" gTextTrader_ThenWellTrade:: @ 81AEAFB - .string "Then we’ll trade!\n" - .string "I’ll send my decoration to your PC.$" + .string "Dann lass uns tauschen! Ich werde meine\n" + .string "Dekorationen auf deinen PC senden.$" gTextTrader_ICantTradeThatOneAway:: @ 81AEB31 - .string "Oops! Sorry!\n" - .string "That’s a really rare piece of decoration.\l" - .string "I can’t trade that one away!\p" - .string "Can I interest you in something else?$" + .string "Huups! Tut mir Leid!\n" + .string "Das ist ein ganz seltenes Stück!\l" + .string "Das kann ich nicht tauschen!\p" + .string "Kann ich dich für etwas anderes\n" + .string "begeistern?$" diff --git a/data/text/trainer_class_names.inc b/data/text/trainer_class_names.inc index 8678a29a6..94ab2078b 100644 --- a/data/text/trainer_class_names.inc +++ b/data/text/trainer_class_names.inc @@ -1,59 +1,59 @@ gTrainerClassNames:: @ 81F0208 - .string "{PKMN} TRAINER$", 13 - .string "{PKMN} TRAINER$", 13 - .string "AQUA LEADER$", 13 + .string "{PKMN}-TRAINER$", 13 + .string "{PKMN}-TRAINER$", 13 + .string "AQUA BOSS$", 13 .string "TEAM AQUA$", 13 - .string "AQUA ADMIN$", 13 - .string "AROMA LADY$", 13 - .string "RUIN MANIAC$", 13 + .string "AQUA VORS.$", 13 + .string "AROMALADY$", 13 + .string "RUINENMANIAC$", 13 .string "INTERVIEWER$", 13 - .string "TUBER$", 13 @ うきわガール (Inner Tube Girl) in Japanese - .string "TUBER$", 13 @ うきわボーイ (Inner Tube Boy) in Japanese - .string "COOLTRAINER$", 13 - .string "HEX MANIAC$", 13 + .string "PLANSCHER$", 13 @ うきわガール (Inner Tube Girl) in Japanese + .string "PLANSCHER$", 13 @ うきわボーイ (Inner Tube Boy) in Japanese + .string "ASS-TRAINER$", 13 + .string "HEXE$", 13 .string "LADY$", 13 - .string "BEAUTY$", 13 - .string "RICH BOY$", 13 + .string "SCHÖNHEIT$", 13 + .string "SCHNÖSEL$", 13 .string "POKéMANIAC$", 13 - .string "SWIMMER♂$", 13 - .string "BLACK BELT$", 13 - .string "GUITARIST$", 13 - .string "KINDLER$", 13 + .string "SCHWIMMER$", 13 + .string "SCHWARZGURT$", 13 + .string "GITARRIST$", 13 + .string "HITZKOPF$", 13 .string "CAMPER$", 13 - .string "BUG MANIAC$", 13 - .string "PSYCHIC$", 13 + .string "KÄFERMANIAC$", 13 + .string "PSYCHO$", 13 .string "GENTLEMAN$", 13 - .string "ELITE FOUR$", 13 - .string "LEADER$", 13 - .string "SCHOOL KID$", 13 - .string "SR. AND JR.$", 13 - .string "WINSTRATE$", 13 + .string "TOP VIER$", 13 + .string "LEITER$", 13 + .string "SCHULKIND$", 13 + .string "SEN. & JUN.$", 13 + .string "SIHGERS,$", 13 .string "POKéFAN$", 13 - .string "EXPERT$", 13 - .string "YOUNGSTER$", 13 - .string "CHAMPION$", 13 - .string "FISHERMAN$", 13 - .string "TRIATHLETE$", 13 - .string "DRAGON TAMER$", 13 - .string "BIRD KEEPER$", 13 - .string "NINJA BOY$", 13 - .string "BATTLE GIRL$", 13 - .string "PARASOL LADY$", 13 - .string "SWIMMER♀$", 13 - .string "PICNICKER$", 13 - .string "TWINS$", 13 - .string "SAILOR$", 13 - .string "BOARDER$", 13 - .string "COLLECTOR$", 13 - .string "{PKMN} TRAINER$", 13 - .string "{PKMN} BREEDER$", 13 - .string "{PKMN} RANGER$", 13 - .string "MAGMA LEADER$", 13 + .string "EXPERTE$", 13 + .string "TEENAGER$", 13 + .string "CHAMP$", 13 + .string "ANGLER$", 13 + .string "TRIATHLET$", 13 + .string "DRACHENPROFI$", 13 + .string "VOGELFÄNGER$", 13 + .string "NINJAJUNGE$", 13 + .string "KÄMPFERIN$", 13 + .string "SCHIRMDAME$", 13 + .string "SCHWIMMERIN$", 13 + .string "PICKNICKER$", 13 + .string "ZWIL.$", 13 + .string "MATROSE$", 13 + .string "SNOWBOARDER$", 13 + .string "{PKMN}-SAMMLER$", 13 + .string "{PKMN}-TRAINER$", 13 + .string "{PKMN}-ZÜCHTER$", 13 + .string "{PKMN}-RANGER$", 13 + .string "MAGMA BOSS$", 13 .string "TEAM MAGMA$", 13 - .string "MAGMA ADMIN$", 13 - .string "LASS$", 13 - .string "BUG CATCHER$", 13 - .string "HIKER$", 13 - .string "YOUNG COUPLE$", 13 - .string "OLD COUPLE$", 13 - .string "SIS AND BRO$", 13 + .string "MAGMA VORS.$", 13 + .string "GÖRE$", 13 + .string "KÄFERSAMMLER$", 13 + .string "WANDERER$", 13 + .string "JUNGES GLÜCK$", 13 + .string "ALTES PAAR$", 13 + .string "GESCHWISTER$", 13 diff --git a/data/text/trainer_eye_descriptions.inc b/data/text/trainer_eye_descriptions.inc index c0b3f2399..ee4285401 100644 --- a/data/text/trainer_eye_descriptions.inc +++ b/data/text/trainer_eye_descriptions.inc @@ -1,348 +1,348 @@ TrainerEyeDescription_0: - .string "Becalm fighting emotions.$" - .string "Fragrant GRASS POKéMON$" - .string "Soothing aromas make the$" - .string "body and mind healthy.$" + .string "Emotionen beruhigen.$" + .string "Duftende PFLANZEN-PKMN.$" + .string "Beruhigende Aromen reini-$" + .string "gen Körper und Geist.$" TrainerEyeDescription_1: - .string "Overwhelm with power!$" - .string "Craggy ROCK POKéMON$" - .string "In search of ancient lore,$" - .string "I travel the world.$" + .string "Durch Stärke überzeugen!$" + .string "Felsige GESTEINS-PKMN.$" + .string "Während des Studiums der$" + .string "Antike sehe ich die Welt.$" TrainerEyeDescription_2: - .string "I’m going to try hard!$" - .string "Good swimmer POKéMON$" - .string "I wish I could swim without$" - .string "using an inner tube.$" + .string "Ich strenge mich stets an!$" + .string "PKMN, die gut schwimmen.$" + .string "Ich würde gerne ohne den$" + .string "Reifen schwimmen können.$" TrainerEyeDescription_3: - .string "I don’t know. I’ll try hard.$" - .string "WATER POKéMON are buddies.$" - .string "It’s not like I can’t swim.$" - .string "I just like my inner tube.$" + .string "Ich versuche einfach alles.$" + .string "WASSER-PKMN sind Kumpel.$" + .string "Ich kann schwimmen! Ich$" + .string "mag halt den Schwimmreifen!$" TrainerEyeDescription_4: - .string "We split our duties.$" - .string "We like friendly POKéMON.$" - .string "We enjoy POKéMON together$" - .string "as sister and brother.$" + .string "Wir teilen die Arbeit auf.$" + .string "Wir lieben freundliche PKMN.$" + .string "Wir teilen die Liebe zu den$" + .string "PKMN. Wir sind Geschwister!$" TrainerEyeDescription_5: - .string "Exploit the foe’s weakness.$" - .string "Balance is crucial.$" - .string "My goal is to become the$" - .string "POKéMON CHAMPION.$" + .string "Schwächen erkennen.$" + .string "Gleichgewicht ist wichtig.$" + .string "Mein Ziel ist es, der$" + .string "PKMN-CHAMP zu werden.$" TrainerEyeDescription_6: - .string "Upset the opponent.$" - .string "Type doesn’t matter.$" - .string "I’m a top student at the$" - .string "TRAINER’S SCHOOL.$" + .string "Den Gegner umwerfen.$" + .string "Der PKMN-Typ ist unwichtig.$" + .string "Ich bin der beste Schüler$" + .string "der PKMN TRAINERSCHULE.$" TrainerEyeDescription_7: - .string "Slow, steady suffering$" - .string "Scary to meet at night.$" - .string "I see things that others$" - .string "can’t see...$" + .string "Langsames Niederringen.$" + .string "Nachts Furcht einflößend.$" + .string "Ich sehe Dinge, die den$" + .string "anderen verborgen sind...$" TrainerEyeDescription_8: - .string "Anything to win.$" - .string "Gorgeous type!$" - .string "I have a pool specially for$" - .string "my POKéMON at home.$" + .string "Alles, was zum Sieg führt.$" + .string "Hinreißende Wesen!$" + .string "Ich habe zu Hause einen$" + .string "Pool für meine PKMN.$" TrainerEyeDescription_9: - .string "I’ll lead you astray.$" - .string "Cute, of course.$" - .string "I love the SAFARI ZONE.$" - .string "I seem to end up there.$" + .string "Ich bringe dich vom Weg ab.$" + .string "Niedlich, natürlich!$" + .string "Ich liebe die SAFARI-ZONE,$" + .string "dort werde ich bleiben.$" TrainerEyeDescription_10: - .string "Strategy? Who needs it?$" - .string "I spent big money on it!$" - .string "I, being rich, sleep in a$" - .string "custom POKéMON bed.$" + .string "Wer braucht Strategie?!?$" + .string "Alle, die gut und teuer sind.$" + .string "Ich bin reich. Und daher$" + .string "besitze ich ein PKMN-Bett.$" TrainerEyeDescription_11: - .string "Wrestle down with power.$" - .string "Took all night to catch...$" - .string "Big, burly, and buff$" - .string "POKéMON are the best...$" + .string "Durch Stärke gewinnen!$" + .string "Habe sie nachts gefangen...$" + .string "Große, kräftige und zähe$" + .string "POKéMON sind die besten...$" TrainerEyeDescription_12: - .string "Ram at full speed!$" - .string "Funky WATER type!$" - .string "If I can’t be out swimming,$" - .string "I’ll be pumping weights.$" + .string "Volle Pulle zuschlagen!$" + .string "Funky WASSER-PKMN!$" + .string "Wenn ich nicht schwimme,$" + .string "stemme ich Gewichte!$" TrainerEyeDescription_13: - .string "Grand slam pummeling!$" - .string "FIGHTING type$" - .string "Not to brag, but I can bust$" - .string "ten roof tiles!$" + .string "Immer gewinnen!$" + .string "KAMPF-PKMN!$" + .string "Ohne zu prahlen: Ich kann$" + .string "10 Ziegel zerschmettern!$" TrainerEyeDescription_14: - .string "I’ll electrify you!$" - .string "They’re ELECTRIC!$" - .string "I want to make people cry$" - .string "with songs from my heart.$" + .string "Ich elektrisiere dich!$" + .string "Es sind ELEKTRO-PKMN.$" + .string "Ich bringe die Menschen mit$" + .string "meinen Liedern zum Weinen.$" TrainerEyeDescription_15: - .string "Burn it all down!$" - .string "Burn-inducing POKéMON$" - .string "When you light a campfire,$" - .string "be sure there’s some water.$" + .string "Alles niederbrennen!$" + .string "Feuergefährliche POKéMON!$" + .string "Neben einem Lagerfeuer$" + .string "sollte stets Wasser stehen!$" TrainerEyeDescription_16: - .string "Hang in and be tenacious!$" - .string "I’ll raise any POKéMON.$" - .string "POKéMON raised in the wild$" - .string "grow strong!$" + .string "Man muss hartnäckig sein.$" + .string "Jede Art von POKéMON.$" + .string "PKMN, die in der Wildnis auf-$" + .string "wachsen, werden stark!$" TrainerEyeDescription_17: - .string "Our love lets us prevail.$" - .string "We’ve had them for years.$" - .string "Married 50 years, we’ve$" - .string "devotedly raised POKéMON.$" + .string "Unsere Liebe schlägt alles.$" + .string "Wir haben sie seit Jahren.$" + .string "In 50 Jahren Ehe waren$" + .string "wir den PKMN immer treu.$" TrainerEyeDescription_18: - .string "Attack in waves!$" - .string "BUG POKéMON are cool.$" - .string "I go into the forest every$" - .string "day to catch BUG POKéMON.$" + .string "Wellenförmiger Angriff!$" + .string "KÄFER-PKMN sind cool!$" + .string "Ich gehe jeden Tag in den$" + .string "Wald, KÄFER-PKMN fangen.$" TrainerEyeDescription_19: - .string "Daze and confuse!$" - .string "Ones with weird powers.$" - .string "I can see through exactly$" - .string "what you’re thinking!$" + .string "Schwächen und verwirren!$" + .string "Solche mit irren Kräften.$" + .string "Ich kann deine Gedanken$" + .string "klar und deutlich lesen.$" TrainerEyeDescription_20: - .string "Battle at full power.$" - .string "POKéMON of many mysteries$" - .string "When we spoke, I was really$" - .string "using telepathy.$" + .string "Mit vollem Einsatz kämpfen.$" + .string "Geheimnisvolle POKéMON.$" + .string "Wenn ich spreche,$" + .string "setze ich Telepathie ein.$" TrainerEyeDescription_21: - .string "Calm and collected.$" - .string "POKéMON of distinction$" - .string "We enjoy a spot of tea$" - .string "every day. It’s imported.$" + .string "Ruhig, gesammelt vorgehen.$" + .string "Ganz verschiedene PKMN.$" + .string "Wir genießen die tägliche$" + .string "Tasse Tee.$" TrainerEyeDescription_22: - .string "I use my head to battle.$" - .string "I love any kind of POKéMON!$" - .string "My daddy gives me spending$" - .string "money if I ace a test.$" + .string "Ich kämpfe mit Köpfchen.$" + .string "Ich liebe jedes PKMN.$" + .string "Schreibe ich gute Noten,$" + .string "gibt Papi mir Geld.$" TrainerEyeDescription_23: - .string "My knowledge rules!$" - .string "Any smart POKéMON!$" - .string "I want to be a POKéMON$" - .string "researcher in the future.$" + .string "Mein Wissen ist Macht!$" + .string "Jedes clevere PKMN.$" + .string "Ich will später ein großer$" + .string "PKMN-Forscher werden.$" TrainerEyeDescription_24: - .string "We talk it over first.$" - .string "POKéMON that we both like.$" - .string "We’re senior and junior$" - .string "students into POKéMON!$" + .string "Wir sprechen uns ab.$" + .string "PKMN, die wir beide mögen.$" + .string "Wir sind Senior und Junior$" + .string "im Studium der PKMN.$" TrainerEyeDescription_25: - .string "Go for it, my dears!$" - .string "I have no likes or dislikes.$" - .string "While out shopping for$" - .string "supper, I battle too.$" + .string "Los geht’s, meine Lieben!$" + .string "Ich mag sie alle!$" + .string "Auch beim Einkaufen lasse$" + .string "ich keinen Kampf aus!$" TrainerEyeDescription_26: - .string "I battle with love!$" - .string "A POKéMON raised with love!$" - .string "It’s important to build$" - .string "trust with your POKéMON.$" + .string "Ich kämpfe mit dem Herzen.$" + .string "PKMN, die Liebe erfahren!$" + .string "PKMN und Menschen müssen$" + .string "Vertrauen aufbauen!$" TrainerEyeDescription_27: - .string "I see through your moves!$" - .string "The essence of FIGHTING.$" - .string "I’m not ready to give way$" - .string "to the young yet!$" + .string "Ich durchschaue Gegner!$" + .string "Die Basis des Kampfes.$" + .string "Ich bin noch nicht bereit,$" + .string "Jüngeren Platz zu machen.$" TrainerEyeDescription_28: - .string "Attack while defending$" - .string "The FIGHTING type$" - .string "Being old, I have my own$" - .string "style of battling.$" + .string "Angriff als Verteidigung!$" + .string "KAMPF-PKMN!$" + .string "Ich bin alt und habe daher$" + .string "meinen eigenen Stil.$" TrainerEyeDescription_29: - .string "I do what I can.$" - .string "I use different types.$" - .string "I’m going to keep working$" - .string "until I beat a GYM LEADER.$" + .string "Ich tue, was ich kann.$" + .string "Verschiedene Arten.$" + .string "Ich will irgendwann einen$" + .string "ARENALEITER besiegen!$" TrainerEyeDescription_30: - .string "I battle patiently.$" - .string "WATER POKéMON to battle!$" - .string "I’m the world’s only guy to$" - .string "catch a huge POKéMON!$" + .string "Geduld und Spucke.$" + .string "WASSER-PKMN!$" + .string "Niemand vor mir hat je$" + .string "etwas Größeres gefangen!$" TrainerEyeDescription_31: - .string "Defense is crucial.$" - .string "My POKéMON is solid.$" - .string "I started this for dieting,$" - .string "but I got right into it.$" + .string "Verteidigung ist die Basis.$" + .string "Kraftvolle PKMN!$" + .string "Dies war als Diät gedacht,$" + .string "jetzt ist es mein Hobby.$" TrainerEyeDescription_32: - .string "Push and push again!$" - .string "The strength of STEEL$" - .string "If you’re sweating, get$" - .string "fluids into you regularly.$" + .string "Weiter, immer weiter!$" + .string "Die Stärke von STAHL...$" + .string "Wenn du schwitzt, musst du$" + .string "regelmäßig etwas trinken!$" TrainerEyeDescription_33: - .string "Exploit the environment!$" - .string "All hail the WATER type!$" - .string "I won’t be beaten by some$" - .string "beach bum SWIMMER!$" + .string "Die Umgebung erforschen.$" + .string "WASSER-PKMN!$" + .string "Ich lasse mich nicht von$" + .string "Strandhäschen besiegen.$" TrainerEyeDescription_34: - .string "All-out offensive!$" - .string "WATER POKéMON rule!$" - .string "I must swim over 6 miles$" - .string "every day.$" + .string "Stets Offensive zeigen!$" + .string "Nur WASSER-PKMN...$" + .string "Ich muss jeden Tag$" + .string "10 Kilometer schwimmen.$" TrainerEyeDescription_35: - .string "Speed above all!$" - .string "I use a speedy POKéMON.$" - .string "A marathon is a challenge$" - .string "against your own self.$" + .string "Geschwindigkeit ist alles!$" + .string "Ich liebe schnelle PKMN.$" + .string "Beim Marathon forderst du$" + .string "dich selbst heraus.$" TrainerEyeDescription_36: - .string "Strike before stricken!$" - .string "A fast-running POKéMON!$" - .string "If you ran and ran, you’d$" - .string "become one with the wind.$" + .string "Schneller als andere sein.$" + .string "Ein rasend schnelles PKMN!$" + .string "Rennt man rasend schnell,$" + .string "wird man eins mit dem Wind.$" TrainerEyeDescription_37: - .string "It’s about POKéMON power!$" - .string "See the power of DRAGONS!$" - .string "I’ll become legendary as the$" - .string "strongest one day!$" + .string "Die Stärke der PKMN nutzen.$" + .string "Sieh die Macht der DRACHEN!$" + .string "Eines Tages werde ich zur$" + .string "Legende!!!$" TrainerEyeDescription_38: - .string "I’ll show you my technique!$" - .string "Elegantly wheeling BIRDS$" - .string "My BIRD POKéMON, deliver my$" - .string "love to that girl!$" + .string "Ich zeige dir die Technik!$" + .string "Elegant kreisende VÖGEL.$" + .string "Meine VOGEL-PKMN bringen$" + .string "dem Mädchen meine Liebe!$" TrainerEyeDescription_39: - .string "You’ll suffer from poison!$" - .string "Poisonous POKéMON$" - .string "I undertake training so$" - .string "that I may become a ninja.$" + .string "Du wirst Gift schmecken!$" + .string "Giftige PKMN.$" + .string "Ich trainiere hart, um ein$" + .string "Ninja zu werden.$" TrainerEyeDescription_40: - .string "The first strike wins!$" - .string "Speedy FIGHTING type$" - .string "If my POKéMON lose,$" - .string "I’ll carry on the fight!$" + .string "Der Erstschlag siegt!$" + .string "Schnelle KAMPF-PKMN.$" + .string "Wenn mein PKMN verliert,$" + .string "kämpfe ich doch weiter.$" TrainerEyeDescription_41: - .string "Go, go, my POKéMON!$" - .string "I’ll raise anything.$" - .string "UV rays are your skin’s$" - .string "enemy. Get protected.$" + .string "Los, los, meine PKMN!$" + .string "Ich mag alle PKMN.$" + .string "UV-Strahlen sind die Feinde$" + .string "der Haut. Creme dich ein!$" TrainerEyeDescription_42: - .string "No mercy!$" - .string "Cute WATER POKéMON$" - .string "I have too many fans.$" - .string "I was interviewed on TV.$" + .string "Keine Gnade!$" + .string "Niedliche WASSER-PKMN.$" + .string "Ich habe zu viele Fans, ich$" + .string "war nämlich im Fernsehen.$" TrainerEyeDescription_43: - .string "I think about this & that.$" - .string "I like all POKéMON.$" - .string "What lies beyond that$" - .string "yonder hill?$" + .string "Ich probiere dies und das.$" + .string "Ich liebe alle PKMN.$" + .string "Was liegt hinter diesem$" + .string "hohen Berg dort?$" TrainerEyeDescription_44: - .string "We battle together!$" - .string "We train together!$" - .string "We like the same POKéMON,$" - .string "but different desserts.$" + .string "Wir kämpfen zusammen!$" + .string "Wir trainieren zusammen!$" + .string "Wir lieben die gleichen PKMN$" + .string "und verschiedene Desserts.$" TrainerEyeDescription_45: - .string "I force things with power!$" - .string "WATER and FIGHTING types$" - .string "Seamen are rough spirits!$" - .string "Any complaints?$" + .string "Ich setze Stärke ein.$" + .string "WASSER- und KAMPF-PKMN.$" + .string "Matrosen sind raue Typen!$" + .string "Irgendwelche Einwände?$" TrainerEyeDescription_46: - .string "Protect POKéMON from harm.$" - .string "I love rare POKéMON.$" - .string "I want to collect all the$" - .string "world’s rare POKéMON.$" + .string "PKMN vor Schaden bewahren.$" + .string "Ich liebe seltene PKMN.$" + .string "Ich möchte seltene PKMN$" + .string "aus aller Welt sammeln.$" TrainerEyeDescription_47: - .string "I count on power.$" - .string "POKéMON are my children.$" - .string "It takes knowledge and$" - .string "love to raise POKéMON.$" + .string "Meine Stärke...$" + .string "PKMN sind meine Kinder.$" + .string "Man benötigt Wissen und$" + .string "Liebe im Umgang mit PKMN.$" TrainerEyeDescription_48: - .string "Full-on attack!$" - .string "Anything. I’ll raise it.$" - .string "I give them {POKEBLOCK}S for$" - .string "going after CONTEST titles.$" + .string "Angriff aus vollen Rohren!$" + .string "Jedes PKMN kommt in Frage.$" + .string "Ich gebe ihnen {POKEBLOCK}, um$" + .string "in WETTBEWERBEN zu siegen.$" TrainerEyeDescription_49: - .string "I believe in my POKéMON.$" - .string "I like strong POKéMON.$" - .string "I’m training for rescue$" - .string "work with my POKéMON.$" + .string "Ich glaube an meine PKMN.$" + .string "Ich liebe starke PKMN.$" + .string "Ich bilde meine PKMN zu$" + .string "einem Rettungsteam aus.$" TrainerEyeDescription_50: - .string "I attack in waves.$" - .string "Different types$" - .string "Those who destroy nature$" - .string "must never be forgiven!$" + .string "Ich greife in Etappen an.$" + .string "Verschiedene Arten.$" + .string "Umweltverschmutzern darf$" + .string "man niemals vergeben!$" TrainerEyeDescription_51: - .string "I’ll show you some guts!$" - .string "Cute POKéMON are my faves!$" - .string "After a battle, I always$" - .string "bathe with my POKéMON.$" + .string "Ich zeige meinen Mut.$" + .string "Ich liebe niedliche PKMN!$" + .string "Nach einem Kampf gehe ich$" + .string "mit meinen PKMN schwimmen.$" TrainerEyeDescription_52: - .string "Lightning-fast attack!$" - .string "BUG POKéMON are number 1!$" - .string "If you want to catch BUG$" - .string "POKéMON, wake up early.$" + .string "Blitzschnelle Attacken.$" + .string "KÄFER-PKMN sind das Beste!$" + .string "Um KÄFER-PKMN zu fangen,$" + .string "musst du früh aufstehen.$" TrainerEyeDescription_53: - .string "I battle with power.$" - .string "Hard-bodied POKéMON$" - .string "I’ve been planning a month$" - .string "for today’s hike.$" + .string "Ich kämpfe mit Stärke.$" + .string "PKMN mit hartem Körper.$" + .string "Ich habe diese Wanderung$" + .string "einen Monat vorbereitet.$" TrainerEyeDescription_54: - .string "Lovey-dovey strategy!$" - .string "Lovey-dovey POKéMON!$" - .string "We’re lovey-dovey!$" - .string "Forever lovey-dovey!$" + .string "Liebevolle Strategie!$" + .string "Liebevolle PKMN!$" + .string "Wir sind liebevoll!$" + .string "Immer liebevoll!$" TrainerEyeDescription_55: - .string "We let it all hang out.$" - .string "The 1st POKéMON I caught.$" - .string "POKéMON and I have grown$" - .string "stronger together.$" + .string "Wir lassen alles raus.$" + .string "Das 1. PKMN, das ich fing.$" + .string "Die PKMN und ich sind$" + .string "zusammen gewachsen.$" TrainerEyeDescription_56: - .string "ROCK-type power attack$" - .string "Rock-solid types are good.$" - .string "Through battling, I want to$" - .string "learn all about POKéMON.$" + .string "Steinharte Attacken.$" + .string "Steinharte PKMN...$" + .string "Ich möchte durch Kämpfe$" + .string "alles über PKMN lernen.$" TrainerEyeDescription_57: - .string "Direct physical action!$" - .string "FIGHTING POKéMON rule!$" - .string "The world awaits me as the$" - .string "next big wave!$" + .string "Direkte physische Attacke.$" + .string "Ich baue auf KAMPF-PKMN.$" + .string "Die Welt erwartet mich, als$" + .string "neuen, starken Kämpfer.$" TrainerEyeDescription_58: - .string "I choose to electrify.$" - .string "Get shocked by electricity!$" - .string "Wahahahaha! The secret to$" - .string "health is laughter!$" + .string "Elektrisieren... Britzel...$" + .string "Elektrizität bestimmt alles.$" + .string "Hahahahaha! Lachen hält$" + .string "gesund und jung!$" TrainerEyeDescription_59: - .string "Battle aggressively.$" - .string "Burn with passion!$" - .string "Wash away daily fatigue in$" - .string "hot springs completely!$" + .string "Aggressiv kämpfen.$" + .string "Brennen vor Leidenschaft!$" + .string "Spül die tägliche Müdigkeit$" + .string "in den Heißen Quellen ab.$" TrainerEyeDescription_60: - .string "I flexibly adapt my style.$" - .string "Grown in a balanced manner.$" - .string "POKéMON are my life.$" - .string "My chosen path is harsh...$" + .string "Mein Stil ist flexibel.$" + .string "Gleichmäßig gewachsen.$" + .string "PKMN sind mein Leben. Mein$" + .string "Weg des Lebens ist steinig.$" TrainerEyeDescription_61: - .string "I take advantage of speed.$" - .string "Graceful sky dancers$" - .string "I can see the ebb and flow$" - .string "of the winds.$" + .string "Ich nutze die Initiative.$" + .string "Anmutige Himmelstänzer.$" + .string "Ich sehe das Auf und Ab$" + .string "der Winde.$" TrainerEyeDescription_62: - .string "We battle in cooperation.$" - .string "Always friendly POKéMON.$" - .string "We understand each other,$" - .string "and we understand others.$" + .string "Wir kämpfen zusammen.$" + .string "Immer freundliche PKMN.$" + .string "Wir verstehen uns.$" + .string "Und wir verstehen andere.$" TrainerEyeDescription_63: - .string "Dignity and respect$" - .string "I prefer POKéMON of grace.$" - .string "Aquatic illusions best suit$" - .string "my distinctive elegance.$" + .string "Würde und Respekt.$" + .string "Ich liebe anmutige PKMN.$" + .string "Wasserillusionen unter-$" + .string "streichen meinen Stil.$" TrainerEyeDescription_64: - .string "Offense over defense$" - .string "The DARK side’s beauties$" - .string "You can talk all you want -$" - .string "might is right!$" + .string "Offensive vor Defensive.$" + .string "Das Schöne des UNLICHTS.$" + .string "Du kannst sagen, was du$" + .string "willst, Macht ist alles!$" TrainerEyeDescription_65: - .string "Confuse and confound$" - .string "There’s nothing definite.$" - .string "I wonder how my grandma at$" - .string "MT. PYRE is doing?$" + .string "Verwirrend verwirren.$" + .string "Keine besondere Vorliebe.$" + .string "Wie es wohl meiner Oma am$" + .string "PYROBERG geht?$" TrainerEyeDescription_66: - .string "I use items for help.$" - .string "Flaming passion in icy cold!$" - .string "The ICE type can be better$" - .string "trained in this hot land.$" + .string "Ich setze Items ein.$" + .string "Flammendes Inferno in Eis.$" + .string "Der EIS-Typ entwickelt$" + .string "sich gut an warmen Orten.$" TrainerEyeDescription_67: - .string "Harness strong abilities.$" - .string "The raw power of DRAGONS!$" - .string "I live to battle every day$" - .string "to learn about POKéMON.$" + .string "Starke Fähigkeiten nutzen.$" + .string "Die rohe Kraft der DRACHEN.$" + .string "Beim täglichen Kampf lerne$" + .string "ich alles über PKMN.$" TrainerEyeDescription_68: - .string "Pick on the foe’s weakness.$" - .string "The ultimate STEEL POKéMON$" - .string "When it comes down to it,$" - .string "I’m still the strongest!$" + .string "Die gegn. Schwäche nutzen.$" + .string "Das ultimative STAHL-PKMN.$" + .string "Wenn es drauf ankommt,$" + .string "bin ich am stärksten!$" .align 2 gTrainerEyeDescriptions:: @ 83E309C diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 1bdd5be29..175091d6f 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -1,3350 +1,3418 @@ Route102_Text_1B79C3:: @ 81B79C3 - .string "If you have POKéMON with you, then\n" - .string "you’re an official POKéMON TRAINER!\l" - .string "You can’t say no to my challenge!$" + .string "Wenn du POKéMON bei dir hast, bist du\n" + .string "offiziell ein POKéMON-TRAINER! Daher\l" + .string "kannst du meine Herausforderung nicht\l" + .string "ablehnen!$" Route102_Text_1B7A2C:: @ 81B7A2C - .string "Arrgh, I lost...\n" - .string "I should have trained mine more...$" + .string "Aargh, ich habe verloren... Ich\n" + .string "hätte fleißiger trainieren sollen.$" Route102_Text_1B7A60:: @ 81B7A60 - .string "Listen, you. If you’re strong, you\n" - .string "should have told me before!$" + .string "Hör mal! Du hättest mir vorher sagen\n" + .string "sollen, dass du so stark bist.$" Route102_Text_1B7A9F:: @ 81B7A9F - .string "Ever since I lost to you, I desperately\n" - .string "trained my POKéMON.\l" - .string "You can’t say no to my challenge!$" + .string "Seit ich gegen dich verloren habe,\n" + .string "trainiere ich verzweifelt meine\l" + .string "POKéMON. Sag nicht nein zu einem Kampf!$" Route102_Text_1B7AFD:: @ 81B7AFD - .string "Arrgh, I lost...\n" - .string "Is my training method not right?$" + .string "Aaaah, ich habe schon wieder verloren...\n" + .string "Ob ich nicht richtig trainiere?$" Route102_Text_1B7B2F:: @ 81B7B2F - .string "If you’re going to get stronger, I’ll\n" - .string "get stronger, too.$" + .string "Wenn du stärker wirst, werde ich auch\n" + .string "stärker.$" Route102_Text_1B7B68:: @ 81B7B68 - .string "Did you just become a TRAINER?\n" - .string "We’re both beginners!$" + .string "Bist du gerade erst TRAINER geworden?\n" + .string "Dann sind wir ja beide Anfänger.$" Route102_Text_1B7B9D:: @ 81B7B9D - .string "I called you because I thought I\n" - .string "could beat you...$" + .string "Ich habe dich angesprochen, weil ich\n" + .string "dachte, ich könnte dich besiegen.$" Route102_Text_1B7BD0:: @ 81B7BD0 - .string "I haven’t won once yet...\n" - .string "I wish I would win soon...$" + .string "Ich habe noch nicht ein Mal gewonnen...\n" + .string "Ich hoffe, ich werde bald gewinnen!$" Route102_Text_1B7C05:: @ 81B7C05 - .string "Hahah! Our eyes met!\n" - .string "I’ll take you on with my BUG POKéMON!$" + .string "Haha! Unsere Augen haben sich\n" + .string "getroffen! Ich kämpfe mit meinen\l" + .string "KÄFER-POKéMON gegen dich!$" Route102_Text_1B7C40:: @ 81B7C40 - .string "Ow! Down and out!$" + .string "Auaaa! Besiegt und verloren!$" Route102_Text_1B7C52:: @ 81B7C52 - .string "If you lock eyes with a TRAINER,\n" - .string "you have to challenge! It’s a rule!$" + .string "Wenn du einem TRAINER in die Augen\n" + .string "schaust, forderst du ihn heraus! Das\l" + .string "ist die Regel!$" Route102_Text_1B7C97:: @ 81B7C97 - .string "I’m going to keep winning and aim\n" - .string "to be the best TRAINER.\p" - .string "Help me further my career!$" + .string "Mein Ziel? Stets gewinnen und der beste\n" + .string "TRAINER aller Zeiten werden.\p" + .string "Hilf mir bei meiner Karriere!$" Route102_Text_1B7CEC:: @ 81B7CEC - .string "I ended up furthering your career...$" + .string "Da habe ich wohl deine Karriere\n" + .string "angekurbelt.$" Route102_Text_1B7D11:: @ 81B7D11 - .string "To keep winning my way up, I see that\n" - .string "I have to catch more POKéMON.$" + .string "Um auf der Straße der Sieger laufen zu\n" + .string "können, brauche ich mehr POKéMON.$" Route103_Text_1B7D55:: @ 81B7D55 - .string "Did you feel the tug of our soul-\n" - .string "soothing fragrance?$" + .string "Spürst du die wohlige Berührung\n" + .string "unseres wohltuenden Wohlgeruches?$" Route103_Text_1B7D8B:: @ 81B7D8B - .string "You weren’t led astray by our aroma...$" + .string "Du hast dich vom Duft nicht ablenken\n" + .string "lassen...$" Route103_Text_1B7DB2:: @ 81B7DB2 - .string "Aromatherapy is a form of mental\n" - .string "healing that works with fragrances.$" + .string "Aromatherapie ist eine Form der\n" + .string "mentalen Kur, die mit Düften arbeitet.$" Route103_Text_1B7DF7:: @ 81B7DF7 - .string "AMY: I’m AMY.\n" - .string "And this is my little sister LIV.\l" - .string "We battle together!$" + .string "NORA: Hallo, ich bin NORA.\n" + .string "Und das ist meine kleine Schwester JO.\l" + .string "Wir kämpfen stets zusammen!$" Route103_Text_1B7E3B:: @ 81B7E3B - .string "AMY: Uh-oh, we lost.$" + .string "NORA: Oh, wir haben verloren.$" Route103_Text_1B7E50:: @ 81B7E50 - .string "AMY: You have to think about all\n" - .string "kinds of things when you’re battling\l" - .string "against two TRAINERS.$" + .string "NORA: Du musst auf alles Mögliche\n" + .string "achten, wenn du gegen zwei TRAINER\l" + .string "antrittst.$" Route103_Text_1B7EAC:: @ 81B7EAC - .string "AMY: Uh-oh, you have only one\n" - .string "POKéMON with you.\l" - .string "You can’t battle us like that.$" + .string "NORA: Oh oh, du hast nur ein POKéMON\n" + .string "dabei. Damit kannst du nicht gegen uns\l" + .string "beide antreten.$" Route103_Text_1B7EFB:: @ 81B7EFB - .string "LIV: We battle together as one\n" - .string "team.$" + .string "JO: Wir kämpfen als Team...$" Route103_Text_1B7F20:: @ 81B7F20 - .string "LIV: Oh, we lost, big sister...$" + .string "JO: Schwesterherz, wir haben verloren.$" Route103_Text_1B7F40:: @ 81B7F40 - .string "LIV: We work perfectly together, me\n" - .string "and my big sister...\p" - .string "But we still lost...$" + .string "JO: Wir arbeiten sehr gut zusammen, ich\n" + .string "und meine große Schwester...\p" + .string "Aber wir haben verloren...$" Route103_Text_1B7F8E:: @ 81B7F8E - .string "LIV: If you want to battle us, you\n" - .string "have to have two POKéMON!\l" - .string "It’s not fair if you don’t!$" + .string "JO: Wenn du gegen uns kämpfen willst,\n" + .string "brauchst du zwei POKéMON. Hast du die\l" + .string "nicht, wäre der Kampf unfair!$" Route103_Text_1B7FE7:: @ 81B7FE7 - .string "AMY: I’m AMY.\n" - .string "And this is my little sister LIV.\l" - .string "We battle together!$" + .string "NORA: Hallo, weißt du noch? Ich bin NORA.\n" + .string "Und das ist meine kleine Schwester JO.\l" + .string "Wir kämpfen stets zusammen!$" Route103_Text_1B802B:: @ 81B802B - .string "AMY: Aww, boo!\n" - .string "We couldn’t win again...$" + .string "NORA: Aahaaa, buuuh!\n" + .string "Wir haben es nicht geschafft...$" Route103_Text_1B8053:: @ 81B8053 - .string "AMY: You have to think about all\n" - .string "kinds of things when you’re battling\l" - .string "against two TRAINERS.$" + .string "NORA: Du musst auf alles Mögliche\n" + .string "achten, wenn du gegen zwei TRAINER\l" + .string "antrittst. Erwähnte ich das schon?$" Route103_Text_1B80AF:: @ 81B80AF - .string "AMY: Uh-oh, you have only one\n" - .string "POKéMON with you.\l" - .string "You can’t battle us like that.$" + .string "NORA: Oh oh, du hast nur ein POKéMON\n" + .string "dabei. Damit kannst du nicht gegen uns\l" + .string "beide antreten.$" Route103_Text_1B80FE:: @ 81B80FE - .string "LIV: We battle together as one\n" - .string "team.$" + .string "JO: Wir kämpfen als Team...$" Route103_Text_1B8123:: @ 81B8123 - .string "LIV: Awww, we lost again...\n" - .string "Big sister...$" + .string "JO: Heul... Große Schwester, wir haben\n" + .string "schon wieder verloren.$" Route103_Text_1B814D:: @ 81B814D - .string "LIV: We work perfectly together, me\n" - .string "and my big sister...\p" - .string "But why did we lose again?$" + .string "JO: Wir haben wieder perfekt zusammen-\n" + .string "gearbeitet, ich und meine Schwester...\p" + .string "Warum haben wir wieder verloren?$" Route103_Text_1B81A1:: @ 81B81A1 - .string "LIV: If you want to battle us, you\n" - .string "have to have two POKéMON!\l" - .string "It’s not fair if you don’t!$" + .string "JO: Wenn du gegen uns kämpfen willst,\n" + .string "brauchst du zwei POKéMON. Hast du die\l" + .string "nicht, wäre der Kampf unfair!$" Route103_Text_1B81FA:: @ 81B81FA - .string "Gah! My fishing line’s all snarled up!\n" - .string "I’m getting frustrated and mean!\l" - .string "That’s it! Battle me!$" + .string "Ach! Meine Angelschnur hat sich ver-\n" + .string "heddert! Jetzt bin ich frustriert und\l" + .string "wütend! So! Und du darfst es ausbaden!$" Route103_Text_1B8258:: @ 81B8258 - .string "Gah! Lost it!\n" - .string "I’m even more annoyed now!$" + .string "Ach! Verloren!\n" + .string "Nun bin ich noch wütender...$" Route103_Text_1B8281:: @ 81B8281 - .string "Gah, I’m still boiling mad...\n" - .string "Grrrrr...$" + .string "Ach! Ich koche vor Wut, Mann...\n" + .string "Grrrr...$" Route103_Text_1B82A9:: @ 81B82A9 - .string "My POKéMON is delightfully adorable!\n" - .string "Don’t be shy - I’ll show you!$" + .string "Mein POKéMON ist einfach anbetungs-\n" + .string "würdig. Nur keine Scheu, ich zeig’s dir.$" Route103_Text_1B82EC:: @ 81B82EC - .string "Oh, my gosh!\n" - .string "My darling POKéMON!$" + .string "Oh, so was aber auch!\n" + .string "Mein geliebtes POKéMON!$" Route103_Text_1B830D:: @ 81B830D - .string "My delightful POKéMON looks darling\n" - .string "even when it’s fainted!$" + .string "Mein wunderbares POKéMON sieht sogar\n" + .string "besiegt noch wunderbar aus.$" Route103_Text_1B8349:: @ 81B8349 - .string "Hi, you! My delightfully adorable\n" - .string "POKéMON has become more darling!$" + .string "Hey, du! Mein anbetungswürdiges\n" + .string "POKéMON ist noch anbetungswürdiger\l" + .string "geworden.$" Route103_Text_1B838C:: @ 81B838C .string "Oh!\n" - .string "My darling POKéMON!$" + .string "Mein geliebtes POKéMON.$" Route103_Text_1B83A4:: @ 81B83A4 - .string "The more I spend time with it, the\n" - .string "more adorable my POKéMON becomes.$" + .string "Je mehr Zeit ich mit ihm verbringe,\n" + .string "desto anbetungswürdiger wird es.$" Route104_Text_1B83E9:: @ 81B83E9 - .string "GINA: Okay, let’s battle with our\n" - .string "POKéMON!$" + .string "GINA: Okay, dann lass uns mit unseren\n" + .string "POKéMON kämpfen.$" Route104_Text_1B8414:: @ 81B8414 - .string "GINA: Losing upsets me!$" + .string "GINA: Wenn ich verliere, bin ich sauer.$" Route104_Text_1B842C:: @ 81B842C - .string "GINA: {STR_VAR_1} is strong!\n" - .string "We have to train lots more!$" + .string "GINA: Du bist stark!\n" + .string "Wir müssen doch mehr trainieren!$" Route104_Text_1B845C:: @ 81B845C - .string "GINA: Oh? Only one POKéMON?\n" - .string "Then, we don’t battle with you.\p" - .string "If there’s only one POKéMON, it will\n" - .string "be lonesome. That’s not nice.$" + .string "GINA: Oh, nur ein POKéMON?\n" + .string "Dann können wir nicht kämpfen.\p" + .string "Wenn du nur ein POKéMON hast, wird es\n" + .string "sich einsam fühlen. Das ist nicht gut.$" Route104_Text_1B84DB:: @ 81B84DB - .string "MIA: We are twins, so we battle\n" - .string "POKéMON together.$" + .string "MIA: Wir sind Zwillinge und kämpfen auch\n" + .string "mit unseren POKéMON zusammen.$" Route104_Text_1B850D:: @ 81B850D - .string "MIA: We battled together, but we\n" - .string "both lost...$" + .string "MIA: Wir haben zusammen gekämpft und\n" + .string "auch zusammen verloren.$" Route104_Text_1B853B:: @ 81B853B - .string "MIA: We will train our POKéMON more\n" - .string "and be strong like you.$" + .string "MIA: Wir werden unsere POKéMON\n" + .string "trainieren. Und dann gewinnen wir!$" Route104_Text_1B8577:: @ 81B8577 - .string "MIA: You want to battle with us?\p" - .string "It’s a big no-no if you don’t have two\n" - .string "POKéMON with you.\l" - .string "We’re too strong for you!$" + .string "MIA: Du willst gegen uns kämpfen?\p" + .string "Ein dickes NEIN - da du weniger als zwei\n" + .string "POKéMON bei dir hast. Wir sind zu\l" + .string "stark für dich!$" Route104_Text_1B85EB:: @ 81B85EB - .string "Why keep it a secret?\n" - .string "I’m the WATER POKéMON expert!\p" - .string "Huh?\n" - .string "You don’t know me?$" + .string "Warum soll ich ein Geheimnis daraus\n" + .string "machen? Ich bin der...\p" + .string "WASSER-POKéMON-Experte!\n" + .string "Wie?!? Du kennst mich nicht?!?$" Route104_Text_1B8637:: @ 81B8637 - .string "I thought I wasn’t too bad, if I may\n" - .string "say so, but I guess not... Bleah...$" + .string "Ich dachte, ich wäre gar nicht so\n" + .string "schlecht. Aber... Ach, Mist...$" Route104_Text_1B8680:: @ 81B8680 - .string "I got too into fishing.\n" - .string "I forgot I had to raise my POKéMON...$" + .string "Über das Angeln habe ich glatt das\n" + .string "Training meiner POKéMON vergessen.$" Route104_Text_1B86BE:: @ 81B86BE - .string "Leaving footprints in the sand is\n" - .string "so fun!$" + .string "Spuren im Sand zu hinterlassen ist total\n" + .string "lustig!$" Route104_Text_1B86E8:: @ 81B86E8 - .string "Waah! I got sand in my runners!\n" - .string "They’re all gritty!$" + .string "Igitt! Ich habe Sand in den Schuhen!\n" + .string "Das ist vielleicht unangenehm!$" Route104_Text_1B871C:: @ 81B871C - .string "I want to leave my footprints in the\n" - .string "sand everywhere, but they disappear\l" - .string "quickly...$" + .string "Ich will meine Fußspuren im Sand hinter-\n" + .string "lassen, aber sie verschwinden viel zu\l" + .string "schnell wieder...$" Route104_Text_1B8770:: @ 81B8770 - .string "Should I...\n" - .string "Or shouldn’t I?\p" - .string "Okay, sure, I will battle!$" + .string "Soll ich...\n" + .string "Oder soll ich nicht?\p" + .string "Okay, natürlich kämpfe ich!$" Route104_Text_1B87A7:: @ 81B87A7 - .string "I shouldn’t have battled...$" + .string "Ich hätte doch nicht kämpfen sollen...$" Route104_Text_1B87C3:: @ 81B87C3 - .string "If you’re faced with a decision and\n" - .string "you let someone else choose for you,\l" - .string "you will regret it, however things\l" - .string "turn out.$" + .string "Wenn du vor einer Entscheidung stehst\n" + .string "und einen anderen für dich entscheiden\l" + .string "lässt, wirst du es bereuen. Egal, was\l" + .string "dabei am Ende herauskommt.$" Route104_Text_1B8839:: @ 81B8839 - .string "Come on, battle with me!$" + .string "Komm schon, kämpf mit mir!$" Route104_Text_1B8852:: @ 81B8852 - .string "Ohh...\n" - .string "I thought I could win...$" + .string "Oohh...\n" + .string "Ich dachte, ich könnte gewinnen...$" Route104_Text_1B8872:: @ 81B8872 - .string "I made the decision to battle, so I\n" - .string "can accept this loss in grace.\p" - .string "I am still upset about losing!$" + .string "Ich kann diesen Verlust der Würde\n" + .string "akzeptieren. Doch, doch...\p" + .string "Aber trotzdem bin ich stinkig deswegen.$" Route104_Text_1B88D4:: @ 81B88D4 - .string "Oh, sure, I’ll accept your challenge.\n" - .string "I have a lot of money.$" + .string "Oh, natürlich nehme ich die Heraus-\n" + .string "forderung an! Ich habe eine Menge Geld.$" Route104_Text_1B8911:: @ 81B8911 - .string "Why couldn’t I win?$" + .string "Warum konnte ich nicht gewinnen?$" Route104_Text_1B8925:: @ 81B8925 - .string "There are some things money can’t buy.\n" - .string "That’s POKéMON...$" + .string "Manche Dinge kann man für Geld nicht\n" + .string "kaufen. Das sind POKéMON...$" Route104_Text_1B895E:: @ 81B895E - .string "After I lost to you, I learned a bunch\n" - .string "of things about POKéMON.$" + .string "Nachdem ich gegen dich verloren hatte,\n" + .string "habe ich viel über POKéMON gelernt.$" Route104_Text_1B899E:: @ 81B899E - .string "I lost again?\n" - .string "Why couldn’t I win?$" + .string "Ich habe schon wieder verloren???\n" + .string "Warum... kann... ich... nicht... gewinnen?$" Route104_Text_1B89C0:: @ 81B89C0 - .string "I’m fabulously wealthy, but I can’t\n" - .string "seem to win at POKéMON...\p" - .string "It’s so deep, the world of POKéMON...$" + .string "Ich bin unsagbar reich, aber einen\n" + .string "Kampf kann ich nicht gewinnen...\p" + .string "Sie ist so tiefgründig, die Welt der\n" + .string "POKéMON.$" Route104_Text_1B8A24:: @ 81B8A24 - .string "We must have been fated to meet.\n" - .string "May I ask you for a battle?$" + .string "Das Schicksal hat uns zusammengeführt.\n" + .string "Darf ich um einen Kampf bitten?$" Route104_Text_1B8A61:: @ 81B8A61 - .string "Oh, my!$" + .string "Oh, meine Güte!$" Route104_Text_1B8A69:: @ 81B8A69 - .string "“Hello” is the beginning of “good-bye.”\n" - .string "I hope we meet again.$" + .string "“Hallo” ist der Anfang von\n" + .string "“Leb wohl.”\l" + .string "Ich hoffe, wir sehen uns wieder.$" Route104_Text_1B8AA7:: @ 81B8AA7 - .string "Hello, we meet again.\n" - .string "May I ask you for a battle?$" + .string "Hallo, so treffen wir uns wieder.\n" + .string "Darf ich dich um einen Kampf bitten?$" Route104_Text_1B8AD9:: @ 81B8AD9 - .string "Oh, my...\n" - .string "I did the best that I could...$" + .string "Oh je...\n" + .string "Ich habe mein Bestes gegeben...$" Route104_Text_1B8B02:: @ 81B8B02 - .string "“Hello” is the beginning of “good-bye.”\n" - .string "I hope we meet again.$" + .string "“Hallo” ist der Anfang von\n" + .string "“Leb wohl.”\l" + .string "Ich hoffe, wir sehen uns wieder.$" Route105_Text_1B8B40:: @ 81B8B40 - .string "There’s supposed to be a mystical\n" - .string "rock around here.\l" - .string "Do you know anything about it?$" + .string "Hier in der Gegend soll es einen\n" + .string "mystischen Felsen geben. Weißt\l" + .string "du etwas darüber?$" Route105_Text_1B8B93:: @ 81B8B93 - .string "I was thinking too much about that\n" - .string "rock, while my POKéMON remained weak...$" + .string "Ich habe zu sehr über den Felsen nach-\n" + .string "gedacht, so dass meine POKéMON schwach\l" + .string "blieben...$" Route105_Text_1B8BDE:: @ 81B8BDE - .string "I can spend hours and hours staring\n" - .string "at a nice rock without growing bored.$" + .string "Ich kann Stunden damit verbringen,\n" + .string "einen Felsen anzustarren, ohne dass\l" + .string "mir langweilig wird.$" Route105_Text_1B8C28:: @ 81B8C28 - .string "Whew! I was worried that a kid was\n" - .string "drowning when I saw you.\p" - .string "You seem to be okay, so what do you\n" - .string "say to a battle?$" + .string "Puuh! Als ich dich sah, habe ich zuerst\n" + .string "gedacht, ein Kind würde ertrinken.\p" + .string "Dir scheint nichts zu fehlen. Wie wäre\n" + .string "es deshalb mit einem kleinen Kampf?$" Route105_Text_1B8C99:: @ 81B8C99 - .string "Glub... Glub...$" + .string "Blubb... blubbb... blubb...$" Route105_Text_1B8CA9:: @ 81B8CA9 - .string "If you are drowning, the signal is to\n" - .string "wave one arm toward the beach.$" + .string "Wenn du zu ertrinken drohst, musst du\n" + .string "mit einem Arm in Richtung Strand winken.$" Route105_Text_1B8CEE:: @ 81B8CEE - .string "Swimming the deep blue sea...\n" - .string "It feels the greatest!$" + .string "Im tiefen, blauen Meer schwimmen...\n" + .string "Das ist das Größte überhaupt!$" Route105_Text_1B8D23:: @ 81B8D23 - .string "I lost...\n" - .string "Now I’m feeling blue...$" + .string "Ich bin abgesoffen...$" Route105_Text_1B8D45:: @ 81B8D45 - .string "Why is the sea blue?\p" - .string "I learned about that at the MUSEUM in\n" - .string "SLATEPORT, but I forgot.$" + .string "Warum ist das Meer blau?\p" + .string "Im MUSEUM in GRAPHITPORT CITY habe ich\n" + .string "etwas dazu gelernt, habe es aber\l" + .string "vergessen.$" Route105_Text_1B8D99:: @ 81B8D99 - .string "My body feels lighter in the water.\n" - .string "It’s as if I’ve gotten slimmer!$" + .string "Mein Körper fühlt sich im Wasser\n" + .string "so leicht an, als hätte ich abgenommen.$" Route105_Text_1B8DDD:: @ 81B8DDD - .string "I’m floating...$" + .string "Ich lasse mich treiben...$" Route105_Text_1B8DED:: @ 81B8DED - .string "Your body weight is reduced to just\n" - .string "one tenth in the water.\p" - .string "That would make me...\n" - .string "Whoops! I’m not telling you my weight!$" + .string "Dein Körpergewicht reduziert sich auf\n" + .string "10 Prozent, wenn du im Wasser bist.\p" + .string "Dann würde ich nur... Huups! Ich verrate\n" + .string "dir doch nicht mein Gewicht!$" Route105_Text_1B8E66:: @ 81B8E66 - .string "The blue, blue sky...\n" - .string "The vast sea...\l" - .string "It’s so peaceful...$" + .string "Der blaue, blaue Himmel...\n" + .string "Das unendliche Meer...\l" + .string "Es ist so friedlich...$" Route105_Text_1B8EA0:: @ 81B8EA0 - .string "I lost while I was lounging!$" + .string "Ich habe verloren, weil ich hier nur\n" + .string "herumhänge...$" Route105_Text_1B8EBD:: @ 81B8EBD - .string "I want to be told I’m relaxing to be\n" - .string "with. Giggle.$" + .string "So war der Kampf mit mir wenigstens\n" + .string "entspannend. Kicher...$" Route106_Text_1B8EF0:: @ 81B8EF0 - .string "Which do you prefer, fishing in the\n" - .string "sea or a stream?$" + .string "Was bevorzugst du? Fischen im\n" + .string "Meer oder im Fluss?$" Route106_Text_1B8F25:: @ 81B8F25 - .string "Like in deep-sea fishing, I lost\n" - .string "spectacularly!$" + .string "Wie beim Tiefseefischen habe ich auch\n" + .string "hier geradezu spektakulär verloren.$" Route106_Text_1B8F55:: @ 81B8F55 - .string "Fishing is the greatest whether it’s\n" - .string "in the sea or a stream.\l" - .string "You agree with me, right?$" + .string "Angeln ist das Größte, egal ob im Meer\n" + .string "oder im Fluss. Stimmst du mir zu?$" Route106_Text_1B8FAC:: @ 81B8FAC - .string "I caught a bunch of POKéMON fishing.\n" - .string "I’ll show you an impressive battle!$" + .string "Ich habe beim Angeln eine Menge\n" + .string "POKéMON gefangen. Ich zeige sie dir!$" Route106_Text_1B8FF5:: @ 81B8FF5 - .string "I lost again spectacularly!$" + .string "Ich habe wieder ganz famos verloren!$" Route106_Text_1B9011:: @ 81B9011 - .string "Win or lose, POKéMON are the greatest!\n" - .string "You agree with me, right?$" + .string "Gewinnen, verlieren, POKéMON sind groß-\n" + .string "artig! Stimmst du mir zu?$" Route106_Text_1B9052:: @ 81B9052 - .string "What do people do if they need to go\n" - .string "to a washroom?\p" - .string "What if my ROD hooks a big one while\n" - .string "I’m in the washroom? I just can’t go...$" + .string "Was machen Angler, wenn sie mal auf die\n" + .string "Toilette müssen?\p" + .string "Ich gehe nicht. Niemals! In der Zeit\n" + .string "könnte ja etwas anbeißen.$" Route106_Text_1B90D3:: @ 81B90D3 - .string "I lost because I’m trying to not go\n" - .string "to the washroom...$" + .string "Ich habe verloren, weil ich nicht auf die\n" + .string "Toilette gegangen bin.$" Route106_Text_1B910A:: @ 81B910A - .string "Oh, no! I’ve got this feeling I’ll hook\n" - .string "a big one!$" + .string "Oh! Ich habe das Gefühl, bald\n" + .string "etwas Großes zu fangen.$" Route106_Text_1B913D:: @ 81B913D - .string "Hahahah! I’m a lousy runner, but in\n" - .string "the water you can’t catch me!$" + .string "Hahaha! Ich bin ein lausiger Läufer,\n" + .string "aber im Wasser fängst du mich nicht!$" Route106_Text_1B917F:: @ 81B917F - .string "I give up!$" + .string "Ich gebe auf!$" Route106_Text_1B918A:: @ 81B918A - .string "I wouldn’t lose in a swim race...$" + .string "Beim Wettschwimmen wäre ich der Sieger!$" Route106_Text_1B91AC:: @ 81B91AC - .string "The sea is my backyard. I’m not going\n" - .string "to take it easy because you’re a kid!$" + .string "Das Meer ist mein Garten. Ich werde es\n" + .string "dir nicht leicht machen, Kind!$" Route106_Text_1B91F8:: @ 81B91F8 - .string "Did you take it easy on me by any\n" - .string "chance?$" + .string "Konntest du es mir nicht leicht machen?$" Route106_Text_1B9222:: @ 81B9222 - .string "Drifting along with the waves...\n" - .string "I love it! Why don’t you give it a try?$" + .string "Sich auf den Wellen treiben lassen...\n" + .string "Ich liebe das! Versuch es doch auch mal!$" Route107_Text_1B926B:: @ 81B926B - .string "Yawn...\p" - .string "I must have drifted off to sleep while\n" - .string "I was drifting in the waves.$" + .string "Gäähn...\p" + .string "Ich muss wohl eingeschlafen sein, als\n" + .string "ich mich auf den Wellen treiben ließ.$" Route107_Text_1B92B7:: @ 81B92B7 - .string "Ahaha, I lost...\n" - .string "I’ll take a snooze, I think...$" + .string "Ahahaha, ich habe verloren...\n" + .string "Ich mache jetzt ein Nickerchen...$" Route107_Text_1B92E7:: @ 81B92E7 - .string "Floating and being rocked by the\n" - .string "waves - it’s like sleeping in a plush,\l" - .string "comfy bed.$" + .string "Sich treiben und von den Wellen\n" + .string "schaukeln lassen - als ob man in einem\l" + .string "weichen, bequemen Bett schläft.$" Route107_Text_1B933A:: @ 81B933A - .string "The sea is like my backyard.\n" - .string "Let’s battle!$" + .string "Das Meer ist wie mein Garten.\n" + .string "Lass uns kämpfen.$" Route107_Text_1B9365:: @ 81B9365 - .string "I lost on my home field...\n" - .string "I’m in shock!$" + .string "Ich habe in meinem eigenen Garten ver-\n" + .string "loren... Ich bin geschockt!$" Route107_Text_1B938E:: @ 81B938E - .string "I swim the seas with a heart full of\n" - .string "dreams...\p" - .string "It’s a song!\n" - .string "Anyways, I’m swimming some more.$" + .string "Ich schwimme im Meer, das Herz voller\n" + .string "Träume...\p" + .string "Das ist ein Lied!\n" + .string "Wie auch immer, ich schwimme weiter.$" Route107_Text_1B93EB:: @ 81B93EB - .string "Swimming in the big, wide sea, my\n" - .string "POKéMON has grown stronger!$" + .string "Durch das Schwimmen im Meer ist\n" + .string "mein POKéMON stärker geworden!$" Route107_Text_1B9429:: @ 81B9429 - .string "What a shock!\p" - .string "My POKéMON has gotten stronger, but\n" - .string "I stayed weak as a TRAINER!$" + .string "Was für ein Schock!\p" + .string "Mein POKéMON ist stärker geworden,\n" + .string "aber ich bin ein Weichei von TRAINER.$" Route107_Text_1B9477:: @ 81B9477 - .string "What you learn in battle makes you a\n" - .string "stronger TRAINER.\l" - .string "The waves taught me that.$" + .string "Das, was du im Kampf lernst, macht dich\n" + .string "zu einem starken TRAINER.\l" + .string "Das haben mir die Wellen beigebracht.$" Route107_Text_1B94C8:: @ 81B94C8 - .string "Do you know a little town called\n" - .string "DEWFORD?$" + .string "Kennst du einen kleinen Ort namens\n" + .string "FAUSTAUHAVEN?$" Route107_Text_1B94F2:: @ 81B94F2 - .string "I hate this!$" + .string "Ich hasse das!$" Route107_Text_1B94FF:: @ 81B94FF - .string "A weird saying is getting really\n" - .string "trendy at DEWFORD HALL.$" + .string "Verrücktheiten zu erzählen ist der neue\n" + .string "Trend in der FAUSTAUHAVEN HALLE.$" Route107_Text_1B9538:: @ 81B9538 - .string "Did you want to battle me?\n" - .string "Sure, I’ll go with you!$" + .string "Willst du gegen mich kämpfen?\n" + .string "Natürlich trete ich gegen dich an!$" Route107_Text_1B956B:: @ 81B956B - .string "I wasn’t good enough for you.$" + .string "Ich war nicht gut genug für dich.$" Route107_Text_1B9589:: @ 81B9589 - .string "I think you’re going to keep getting\n" - .string "better. I’ll go for it, too!$" + .string "Ich denke, du wirst dich bemühen, noch\n" + .string "besser zu werden. Das tue ich auch!$" Route107_Text_1B95CB:: @ 81B95CB - .string "LISA: We challenge you as a sister\n" - .string "and brother!$" + .string "BEA: Wir fordern dich als Bruder und\n" + .string "Schwester heraus!$" Route107_Text_1B95FB:: @ 81B95FB - .string "LISA: Awesome.\n" - .string "You’re in a different class of tough.$" + .string "BEA: Unglaublich.\n" + .string "Du bist in einer anderen Stärke-Klasse.$" Route107_Text_1B9630:: @ 81B9630 - .string "LISA: Do you have any friends who\n" - .string "would go to the beach with you?$" + .string "BEA: Hast du Freunde, die mit dir an den\n" + .string "Strand gehen würden?$" Route107_Text_1B9672:: @ 81B9672 - .string "LISA: If you want to battle with us,\n" - .string "bring more POKéMON.$" + .string "BEA: Wenn du gegen uns kämpfen willst,\n" + .string "bring mehr POKéMON mit.$" Route107_Text_1B96AB:: @ 81B96AB - .string "RAY: We always battle POKéMON, me\n" - .string "and my sister.\p" - .string "I always lose, but we can beat you\n" - .string "2-on-2!$" + .string "ERKO: Wir kämpfen immer mit POKéMON,\n" + .string "meine Schwester und ich.\p" + .string "Ich alleine verliere ständig, aber wir\n" + .string "können dich 2-gegen-2 schlagen!$" Route107_Text_1B9707:: @ 81B9707 - .string "RAY: Wowee, you’re at a higher level\n" - .string "than us!$" + .string "ERKO: Huiuiui! Du kämpfst auf einem viel\n" + .string "höheren Level als wir!$" Route107_Text_1B9735:: @ 81B9735 - .string "RAY: My sister gave me my POKéMON.\n" - .string "I raised it, and now it’s my important\l" - .string "partner!$" + .string "ERKO: Meine Schwester hat mir mein\n" + .string "POKéMON gegeben und nun ist es mein\l" + .string "Partner!$" Route107_Text_1B9788:: @ 81B9788 - .string "RAY: If you want to battle us, go\n" - .string "bring some more POKéMON!$" + .string "ERKO: Wenn du gegen uns antreten willst,\n" + .string "bring mehr POKéMON mit.$" Route108_Text_1B97C3:: @ 81B97C3 - .string "My dream is to swim the world’s seven\n" - .string "seas!$" + .string "Mein Traum ist es, durch die sieben\n" + .string "Weltmeere zu schwimmen.$" Route108_Text_1B97EF:: @ 81B97EF - .string "I won’t be able to swim the seven seas\n" - .string "like this...$" + .string "So werde ich niemals in der Lage sein,\n" + .string "die sieben Weltmeere zu durchschwimmen.$" Route108_Text_1B9823:: @ 81B9823 - .string "Playing with marine POKéMON is one of\n" - .string "the pleasures of swimming!$" + .string "Mit maritimen POKéMON zu spielen, ist\n" + .string "eine der Freuden beim Schwimmen.$" Route108_Text_1B9864:: @ 81B9864 - .string "Ahoy, there! Are you going out to the\n" - .string "ABANDONED SHIP, too?$" + .string "Ahoi, da! Willst du auch zum\n" + .string "SCHIFFSWRACK?$" Route108_Text_1B989F:: @ 81B989F - .string "I’m sinking!\n" - .string "Glub... Glub...$" + .string "Ich gehe unter!\n" + .string "Blubb... blubb... blubb...$" Route108_Text_1B98BC:: @ 81B98BC - .string "Some people even go inside that\n" - .string "ABANDONED SHIP.$" + .string "Einige Leute gehen sogar in das\n" + .string "SCHIFFSWRACK hinein!$" Route108_Text_1B98EC:: @ 81B98EC - .string "My liar of a boyfriend told me that\n" - .string "I look great in a bikini...$" + .string "Mein Freund, dieser Lügner, sagt,\n" + .string "ich sähe klasse in dem Bikini aus...$" Route108_Text_1B992C:: @ 81B992C - .string "Oh, boo!$" + .string "Oh, buuuh!$" Route108_Text_1B9935:: @ 81B9935 - .string "Even if it’s a lie, I love being told\n" - .string "I look great...\l" - .string "We girls are so complex...$" + .string "Auch wenn es eine Lüge ist, liebe ich es,\n" + .string "Komplimente zu bekommen.\l" + .string "Wir Mädchen sind so komplex...$" Route108_Text_1B9986:: @ 81B9986 - .string "I love the sea!\n" - .string "I forget all my worries when I swim!$" + .string "Ich liebe das Meer! Ich vergesse all\n" + .string "meine Probleme, wenn ich schwimme.$" Route108_Text_1B99BB:: @ 81B99BB - .string "When I lose a battle, I get all\n" - .string "stressed out!$" + .string "Wenn ich verliere, bin ich total\n" + .string "gestresst!$" Route108_Text_1B99E9:: @ 81B99E9 - .string "Work off your stress by swimming!\n" - .string "It’s so healthy!$" + .string "Baue Stress durch Schwimmen ab.\n" + .string "Das ist sehr gesund!$" Route109_Text_1B9A1C:: @ 81B9A1C - .string "Hiyah! Look at my chiseled abs!\n" - .string "This is what you call “cut”!$" + .string "Hiya! Schau dir meine gemeißelten \n" + .string "Vollmatrosen an! Das nennt\l" + .string "man einen “Schnitt”!$" Route109_Text_1B9A59:: @ 81B9A59 .string "Aiyah!\n" - .string "Flubbed out!$" + .string "Ausgerutscht.$" Route109_Text_1B9A6D:: @ 81B9A6D .string "Hiyah!\p" - .string "My sculpted abs have nothing to do\n" - .string "with POKéMON battles!$" + .string "Meine gemeißelten Vollmatrosen haben\n" + .string "nichts mit meinen Kämpfen zu tun!$" Route109_Text_1B9AAD:: @ 81B9AAD - .string "Are you properly protected against\n" - .string "the sun?$" + .string "Hast du dich auch gut mit Sonnenmilch\n" + .string "eingerieben?$" Route109_Text_1B9AD9:: @ 81B9AD9 - .string "Ouch, ouch, ouch!$" + .string "Aua, aua, aua.$" Route109_Text_1B9AEB:: @ 81B9AEB - .string "Cheeks are the most prone to burning!$" + .string "An den Wangen bekommt man als Erstes\n" + .string "einen Sonnenbrand.$" Route109_Text_1B9B11:: @ 81B9B11 - .string "I’ve laid anchor in ports around the\n" - .string "world, but SLATEPORT’s the best.$" + .string "Ich habe meinen Anker in vielen Häfen\n" + .string "der Welt geworfen, aber GRAPHITPORT\l" + .string "CITY ist der schönste Hafen.$" Route109_Text_1B9B57:: @ 81B9B57 - .string "You’re the best!$" + .string "Du bist der Beste!$" Route109_Text_1B9B68:: @ 81B9B68 - .string "In the best port was the best\n" - .string "TRAINER...$" + .string "Im besten Hafen gibt es auch den\n" + .string "besten TRAINER...$" Route109_Text_1B9B91:: @ 81B9B91 .string "Urrrrppp...\n" - .string "Battle? With me?$" + .string "Kämpfen? Mit mir?$" Route109_Text_1B9BAE:: @ 81B9BAE - .string "Urp... Ooooooohhhhhh...\n" - .string "Urrrrpppp...$" + .string "Böör... Ooooooohhhhhh...\n" + .string "Bööörrppp...$" Route109_Text_1B9BD3:: @ 81B9BD3 - .string "I’m usually stronger than this!\n" - .string "I’m just seasick as a dog!\p" - .string "I’m a SAILOR, but...$" + .string "Normalerweise bin ich viel stärker!\n" + .string "Ich bin seekrank!\p" + .string "Ich bin MATROSE, aber...$" Route109_Text_1B9C23:: @ 81B9C23 - .string "I’m thirsty... I could go for a SODA POP\n" - .string "at the SEASHORE HOUSE...$" + .string "Ich bin durstig... Ich könnte im\n" + .string "STRANDHAUS etwas SPRUDEL kaufen...$" Route109_Text_1B9C65:: @ 81B9C65 - .string "Groan...$" + .string "Grummel...$" Route109_Text_1B9C6E:: @ 81B9C6E - .string "I’m getting famished... My inner tube\n" - .string "looks like a giant doughnut...$" + .string "Ich bin am Verhungern... Mein Schwimm-\n" + .string "reifen sieht aus wie ein Schmalzkringel.$" Route109_Text_1B9CB3:: @ 81B9CB3 - .string "I’m hungry, but I’ve got enough pep in\n" - .string "me for a battle!$" + .string "Ich habe tierischen Hunger, aber ich\n" + .string "habe genug Kraft für einen Kampf!$" Route109_Text_1B9CEB:: @ 81B9CEB - .string "I lost...\n" - .string "It’s because I’m hungry...$" + .string "Ich habe verloren...\n" + .string "Und das nur, weil ich so hungrig bin...$" Route109_Text_1B9D10:: @ 81B9D10 - .string "When you eat on a beach, everything\n" - .string "seems to taste a little better.$" + .string "Wenn man am Strand sitzt und isst,\n" + .string "schmeckt alles gleich viel besser.$" Route109_Text_1B9D54:: @ 81B9D54 - .string "Doesn’t a beach umbrella look like\n" - .string "a giant flower?$" + .string "So ein Sonnenschirm sieht doch aus wie\n" + .string "eine riesige Blume, findest du nicht?$" Route109_Text_1B9D87:: @ 81B9D87 - .string "Mommy!$" + .string "Maaaami!$" Route109_Text_1B9D8E:: @ 81B9D8E - .string "If you look at the beach from the sky,\n" - .string "it looks like a big flower garden!$" + .string "Ein Strand sieht aus der Luft be-\n" + .string "trachtet wie ein Blumengarten aus.$" Route109_Text_1B9DD8:: @ 81B9DD8 - .string "I’m not losing to you again!\n" - .string "That’s why I have my inner tube!$" + .string "Ich verliere nicht wieder gegen dich!\n" + .string "Schließlich habe ich einen Schwimm-\l" + .string "reifen um!$" Route109_Text_1B9E16:: @ 81B9E16 - .string "Mommy!$" + .string "Maaaaaaaaaaamiiiii!$" Route109_Text_1B9E1D:: @ 81B9E1D - .string "If I have an inner tube, me and my\n" - .string "POKéMON’s cuteness goes way up!$" + .string "Sobald ich den Schwimmreifen trage,\n" + .string "sehen meine POKéMON und ich noch\l" + .string "niedlicher aus!$" Route109_Text_1B9E60:: @ 81B9E60 - .string "I can’t swim without my inner tube,\n" - .string "but I won’t lose at POKéMON!$" + .string "Ohne Schwimmreifen kann ich nicht\n" + .string "schwimmen, aber im Kampf siege ich.$" Route109_Text_1B9EA1:: @ 81B9EA1 - .string "Did I lose because I have an inner\n" - .string "tube?$" + .string "Habe ich verloren, weil ich einen\n" + .string "Schwimmreifen trage?$" Route109_Text_1B9ECA:: @ 81B9ECA - .string "My inner tube is a fashion item.\n" - .string "I can’t be seen without it.$" + .string "Mein Schwimmreifen ist voll in Mode. Ohne\n" + .string "ihn kann ich mich nicht sehen lassen!$" Route109_Text_1B9F07:: @ 81B9F07 - .string "Hi, big TRAINER.\n" - .string "Will you battle with me?$" + .string "Hey, großer TRAINER!\n" + .string "Kämpfst du mit mir?$" Route109_Text_1B9F31:: @ 81B9F31 - .string "Oh, you’re strong.$" + .string "Oh, bist du aber stark!$" Route109_Text_1B9F44:: @ 81B9F44 - .string "How did you get to be so strong?$" + .string "Wie bist du so stark geworden?$" Route109_Text_1B9F65:: @ 81B9F65 - .string "Wahahah! This dude’s going to catch\n" - .string "himself a big one!$" + .string "Hahaha! Dieser Kerl hier wird jetzt\n" + .string "einen großen Fang machen!$" Route109_Text_1B9F9C:: @ 81B9F9C - .string "This dude just lost one...$" + .string "Dieser Kerl hier hat ganz groß verloren.$" Route109_Text_1B9FB7:: @ 81B9FB7 - .string "This dude thinks you’re a big one.\n" - .string "No, you’re a big-one-to-be!$" + .string "Dieser Kerl hier denkt, dass du ganz\n" + .string "groß bist. Nein, ein Gernegroß bist!$" Route109_Text_1B9FF6:: @ 81B9FF6 - .string "PAUL: Well, this is a mood-breaker.\p" - .string "I wish you wouldn’t disturb our\n" - .string "precious time together.$" + .string "OLE: Nun, das ist ein Stimmungstöter!\p" + .string "Ich wünschte, du würdest uns nicht \n" + .string "unsere kostbare Zeit rauben!$" Route109_Text_1BA052:: @ 81BA052 - .string "PAUL: Well, I give up.$" + .string "OLE: Nun, ich gebe mich geschlagen.$" Route109_Text_1BA069:: @ 81BA069 - .string "PAUL: Well, don’t tell anyone that\n" - .string "we’re here.\l" - .string "This is just our private world of two!$" + .string "OLE: Nun, sag niemandem, dass wir\n" + .string "hier sind. Das ist unsere kleine, private\l" + .string "Welt!$" Route109_Text_1BA0BF:: @ 81BA0BF - .string "PAUL: We’re totally, deeply in love.\n" - .string "That’s why we make our POKéMON battle\l" - .string "together.$" + .string "OLE: Wir sind total heftig ineinander\n" + .string "verliebt. Deshalb lassen wir unsere\l" + .string "POKéMON auch gemeinsam kämpfen.$" Route109_Text_1BA114:: @ 81BA114 - .string "MEL: We’re, like, totally in love.\n" - .string "Our romance is heating up all of HOENN!$" + .string "GELI: Wir sind total ineinander verliebt.\n" + .string "Unsere Romanze wärmt ganz HOENN!$" Route109_Text_1BA15F:: @ 81BA15F - .string "MEL: We lost, and it’s my fault!\n" - .string "PAUL will hate me!$" + .string "GELI: Wir haben verloren. Das ist meine\n" + .string "Schuld. OLE wird mich hassen!$" Route109_Text_1BA193:: @ 81BA193 - .string "MEL: Um, PAUL, are you angry with me?\n" - .string "Please don’t be angry.$" + .string "GELI: Ähm, OLE, bist du böse auf mich?\n" + .string "Bitte sei nicht böse auf mich!$" Route109_Text_1BA1D0:: @ 81BA1D0 - .string "MEL: We’re, like, deeply and truly in love.\n" - .string "That’s why we make our POKéMON\l" - .string "battle together.$" + .string "GELI: Wir sind total heftig ineinander\n" + .string "verliebt. Daher kämpfen wir auch mit\l" + .string "unseren POKéMON zusammen.$" Route110_Text_1BA22C:: @ 81BA22C - .string "Whoa! Watch it!\n" - .string "I guess you’re not used to BIKE racing.$" + .string "Wow! Pass auf! Ich glaube, du hast\n" + .string "keine Übung im RAD-Rennen.$" Route110_Text_1BA264:: @ 81BA264 - .string "Whoa!\n" - .string "My brakes failed!$" + .string "Wow! Pass auf!\n" + .string "Meine Bremsen versagen!$" Route110_Text_1BA27C:: @ 81BA27C - .string "Flat tires and brake problems can\n" - .string "cause serious injury!\l" - .string "Inspect your BIKE for problems!$" + .string "Platte Reifen und schwache Bremsen\n" + .string "können zu Unfällen mit schweren Ver-\l" + .string "letzungen führen! Also: Prüfe dein RAD!$" Route110_Text_1BA2D4:: @ 81BA2D4 - .string "Yo, you!\n" - .string "Can you keep up with my speed?$" + .string "Hey, du!\n" + .string "Kannst du mit mir mithalten?$" Route110_Text_1BA2FC:: @ 81BA2FC - .string "Crash and burn!$" + .string "Du hast die Schallmauer durchbrochen!$" Route110_Text_1BA30C:: @ 81BA30C - .string "Speed alone won’t let me win at POKéMON.\n" - .string "I need to reconsider this...$" + .string "Geschwindigkeit alleine lässt mich nicht\n" + .string "gewinnen. Das darf ich nicht vergessen.$" Route110_Text_1BA352:: @ 81BA352 - .string "Don’t panic if your BIKE’s going fast!$" + .string "Nur keine Panik, wenn dein RAD immer\n" + .string "schneller wird!$" Route110_Text_1BA379:: @ 81BA379 - .string "I shouldn’t panic during POKéMON\n" - .string "battles...$" + .string "Ich muss während eines POKéMON-\n" + .string "Kampfes ruhig bleiben...$" Route110_Text_1BA3A5:: @ 81BA3A5 - .string "There’s no need to panic or stress.\n" - .string "Take it easy. There’s plenty of time.$" + .string "Kein Grund zur Panik. Nimm’s leicht.\n" + .string "Wir haben doch jede Menge Zeit.$" Route110_Text_1BA3EF:: @ 81BA3EF - .string "Aren’t you going a little too fast?\n" - .string "Take it easy and let’s battle.$" + .string "Bist du nicht ein wenig zu schnell? \n" + .string "Brems ab und lass uns kämpfen.$" Route110_Text_1BA432:: @ 81BA432 - .string "I didn’t panic, but I still lost...$" + .string "Ich war ganz ruhig und habe doch\n" + .string "verloren...$" Route110_Text_1BA456:: @ 81BA456 - .string "There’s no need to panic or stress.\n" - .string "Take it easy. There’s plenty of time.$" + .string "Kein Grund zur Panik. Nimm’s leicht.\n" + .string "Wir haben doch jede Menge Zeit.$" Route110_Text_1BA4A0:: @ 81BA4A0 - .string "The triathlon is hard in the extreme.\p" - .string "You have to complete the three events\n" - .string "of swimming, cycling, and running.$" + .string "Ein Triathlon ist extrem hart.\p" + .string "Du musst schwimmen, Rad fahren und\n" + .string "laufen.$" Route110_Text_1BA50F:: @ 81BA50F - .string "POKéMON battles are hard, too!$" + .string "POKéMON-Kämpfe sind auch hart.$" Route110_Text_1BA52E:: @ 81BA52E - .string "I’m exhausted, so I need a break.\n" - .string "It’s important to get proper rest.$" + .string "Ich bin erschöpft und brauche eine\n" + .string "Pause. Pausen sind extrem wichtig.$" Route110_Text_1BA573:: @ 81BA573 - .string "Isn’t it neat to hold a battle while\n" - .string "cycling?$" + .string "Gibt es etwas Eleganteres, als einen\n" + .string "Kampf während man Rad fährt?$" Route110_Text_1BA5A1:: @ 81BA5A1 .string "Wow...\n" - .string "How could you be so strong?$" + .string "Wie kann man nur so stark sein?$" Route110_Text_1BA5C4:: @ 81BA5C4 - .string "Were you going after a record?\p" - .string "I’m sorry if I held you up!$" + .string "Bist du auf der Jagd nach Rekorden?\p" + .string "Tut mir Leid, wenn ich dich dabei auf-\n" + .string "gehalten habe.$" Route110_Text_1BA5FF:: @ 81BA5FF - .string "I’ve been riding without stopping.\n" - .string "My thighs are like rocks!$" + .string "Ich radle ohne aufzuhören! Meine Ober-\n" + .string "schenkel sind hart wie Stein!$" Route110_Text_1BA63C:: @ 81BA63C - .string "I’m worried about muscle cramps...$" + .string "Muskelkrämpfe beunruhigen mich!$" Route110_Text_1BA65F:: @ 81BA65F - .string "Oh, you have some GYM BADGES?\n" - .string "No wonder you’re so strong!$" + .string "Oh, du besitzt einige ORDEN der ARENEN.\n" + .string "Kein Wunder, dass du so stark bist!$" Route110_Text_1BA699:: @ 81BA699 - .string "I have foreseen your intentions!\n" - .string "I cannot possibly lose!$" + .string "Ich habe deine Absichten vorherge-\n" + .string "sehen. Daher werde ich nicht verlieren!$" Route110_Text_1BA6D2:: @ 81BA6D2 - .string "I failed to prophesize my own demise!$" + .string "Ich konnte noch nicht einmal meine\n" + .string "eigene Niederlage vorhersehen.$" Route110_Text_1BA6F8:: @ 81BA6F8 - .string "I see your future...\p" + .string "Ich sehe deine Zukunft...\p" .string "Hmm...\n" - .string "I see a shining light...$" + .string "Ich sehe ein helles Licht...$" Route110_Text_1BA72D:: @ 81BA72D - .string "Ahahahaha!\n" - .string "I’ll dazzle you with my wonders!$" + .string "Ahahahahaha! Ich werde dich mit meinen\n" + .string "Wundern verwirren!$" Route110_Text_1BA759:: @ 81BA759 - .string "I wondrously lost!$" + .string "Ich habe ganz wunderlich verloren!$" Route110_Text_1BA76C:: @ 81BA76C - .string "You managed to win only because it was\n" - .string "a wonder! Yes, a wonder!\l" - .string "Don’t think you can win all the time!$" + .string "Du konntest nur gewinnen, weil eben das\n" + .string "das Wunder war! Ja, ein Wunder! Glaub ja\l" + .string "nicht, dass du immer gewinnen kannst!$" Route110_Text_1BA7D2:: @ 81BA7D2 - .string "Could I see your POKéMON?\n" - .string "Just one look, please?$" + .string "Zeigst du mir deine POKéMON?\n" + .string "Nur ganz kurz, ja?$" Route110_Text_1BA803:: @ 81BA803 - .string "I wanted to complete my\n" - .string "collection...$" + .string "Ich möchte meine Sammlung\n" + .string "vervollständigen...$" Route110_Text_1BA829:: @ 81BA829 - .string "When I see a POKéMON that I don’t know,\n" - .string "my passion as a collector is ignited!$" + .string "Wenn ich ein mir unbekanntes POKéMON\n" + .string "sehe, kommt der Sammler in mir durch!$" Route110_Text_1BA877:: @ 81BA877 - .string "Hi, have you caught any new POKéMON?\p" - .string "Could I see your POKéMON?\n" - .string "Just one look, please?$" + .string "Hi, hast du neue POKéMON gesammelt?\p" + .string "Ich möchte einen Blick auf deine\n" + .string "POKéMON werfen. Ganz kurz, bitte?$" Route110_Text_1BA8CD:: @ 81BA8CD - .string "Your POKéMON...\n" - .string "I envy you.$" + .string "Deine POKéMON...\n" + .string "Ich bin richtig neidisch!$" Route110_Text_1BA8E9:: @ 81BA8E9 - .string "Oh, I long to make all rare POKéMON\n" - .string "mine!$" + .string "Oh, ich möchte so gerne alle seltenen\n" + .string "POKéMON besitzen.$" Route110_Text_1BA913:: @ 81BA913 .string "Hey!\n" - .string "Don’t sneak up behind me like that!$" + .string "Schleich dich nicht so von hinten heran!$" Route110_Text_1BA93C:: @ 81BA93C - .string "I lost!\n" - .string "Drat!$" + .string "Ich habe verloren!\n" + .string "Verflixt!$" Route110_Text_1BA94A:: @ 81BA94A - .string "Fishing is all about concentration.\n" - .string "You have to focus on the floater.$" + .string "Angeln bedeutet höchste Konzentra-\n" + .string "tion. Immer auf den Blinker achten!$" Route110_Text_1BA990:: @ 81BA990 - .string "Ahahaha! I would go anywhere to show\n" - .string "off my delightful POKéMON.$" + .string "Ich würde überall hingehen, um meine\n" + .string "elysischen POKéMON zu präsentieren.$" Route110_Text_1BA9D0:: @ 81BA9D0 - .string "Oh, dear, this won’t do.$" + .string "Oh, Schönheit reicht nicht aus...$" Route110_Text_1BA9E9:: @ 81BA9E9 - .string "Perhaps I should groom my POKéMON for\n" - .string "CONTESTS rather than battles.$" + .string "Ich sollte mich mehr auf WETTBEWERBE\n" + .string "statt auf Kämpfe konzentrieren.$" Route110_Text_1BAA2D:: @ 81BAA2D - .string "Ahahahaha! I would be happy to show\n" - .string "off my POKéMON as often as you like!$" + .string "Ich zeige dir meine elysischen\n" + .string "POKéMON, sooft du willst!$" Route110_Text_1BAA76:: @ 81BAA76 - .string "Oh, dear, this won’t do.$" + .string "Oh, das war wieder nichts...$" Route110_Text_1BAA8F:: @ 81BAA8F - .string "CONTESTS are delightful, but I like\n" - .string "to battle, too.$" + .string "WETTBEWERBE sind wunderbar, aber ich\n" + .string "mag auch Kämpfe.$" Route110_Text_1BAAC3:: @ 81BAAC3 - .string "I found some cool POKéMON in the grass\n" - .string "around here!$" + .string "Ich habe hier im hohen Gras einige coole\n" + .string "POKéMON gefunden!$" Route110_Text_1BAAF7:: @ 81BAAF7 - .string "Being cool isn’t enough to win...$" + .string "Nur cool zu sein verhilft einem nicht\n" + .string "zum Sieg...$" Route110_Text_1BAB19:: @ 81BAB19 - .string "It’s hard to battle with POKéMON you\n" - .string "just caught.$" + .string "Mit POKéMON zu kämpfen, die man gerade\n" + .string "erst gefangen hat, ist verdammt schwer.$" Route111_Text_1BAB4B:: @ 81BAB4B - .string "Oh, hey! Those GO-GOGGLES suit you.\n" - .string "But I think they look better on me.\p" - .string "Let’s decide who they look better on\n" - .string "with a battle!$" + .string "Das WÜSTENGLAS steht dir gut. Aber\n" + .string "ich bin sicher, mir steht es besser!\p" + .string "Wir entscheiden das besser in einem\n" + .string "Kampf!$" Route111_Text_1BABC7:: @ 81BABC7 - .string "I couldn’t see what was happening at my\n" - .string "sides because of the GO-GOGGLES.$" + .string "Das WÜSTENGLAS hat meine Sicht\n" + .string "eingeschränkt.$" Route111_Text_1BAC10:: @ 81BAC10 - .string "The GO-GOGGLES make it possible to\n" - .string "get through sandstorms.\l" - .string "That makes me happy!$" + .string "Mit dem WÜSTENGLAS kann man durch\n" + .string "Sandstürme laufen.\l" + .string "Das macht mich richtig glücklich.$" Route111_Text_1BAC60:: @ 81BAC60 - .string "I’m having a picnic in the desert.\p" - .string "You can always find a TRAINER, so\n" - .string "I can enjoy a battle here, too!$" + .string "Ich mache ein Picknick in der Wüste.\p" + .string "Hier findet man überall TRAINER und so\n" + .string "kann ich hier auch Kämpfe genießen.$" Route111_Text_1BACC5:: @ 81BACC5 - .string "Ohhh! You’re mean!$" + .string "Oooh, du bist so gemein!$" Route111_Text_1BACD8:: @ 81BACD8 - .string "When you’re battling in a sandstorm,\n" - .string "watch out for your POKéMON’s HP.\p" - .string "It can faint if you don’t keep an eye\n" - .string "on it!$" + .string "Wenn du in einem Sandsturm kämpfst,\n" + .string "achte auf die KP deiner POKéMON.\p" + .string "Sie können vom Sandsturm verletzt\n" + .string "werden und KP verlieren.$" Route111_Text_1BAD4B:: @ 81BAD4B - .string "Wearing these GO-GOGGLES makes me\n" - .string "feel like a superhero.\l" - .string "Right now, nobody can beat me!$" + .string "Mit diesem WÜSTENGLAS fühle ich mich\n" + .string "wie ein Superheld. Im Moment kann\l" + .string "mich einfach niemand besiegen!$" Route111_Text_1BADA3:: @ 81BADA3 - .string "I can’t win on spirit alone...$" + .string "Ich kann doch nicht nur im Geiste\n" + .string "gewinnen...$" Route111_Text_1BADC2:: @ 81BADC2 - .string "I’m going to be a real hero one day.\n" - .string "I’m going to work harder to make me\l" - .string "and my POKéMON stronger.$" + .string "Eines Tages werde ich ein echter Held\n" + .string "sein. Ich arbeite daran, mich und meine\l" + .string "POKéMON richtig stark zu machen.$" Route111_Text_1BAE24:: @ 81BAE24 - .string "I heard there are fossils to be found\n" - .string "in the desert. Where could they be?$" + .string "Ich habe gehört, dass man in der Wüste\n" + .string "Fossilien finden kann. Aber wo?$" Route111_Text_1BAE6E:: @ 81BAE6E - .string "I came up short...$" + .string "Ich war in Gedanken bei den Fossilien...$" Route111_Text_1BAE81:: @ 81BAE81 - .string "If they can find fossils in the desert,\n" - .string "it must have been a sea before.$" + .string "Da man in der Wüste Fossilien finden\n" + .string "kann, war hier früher sicher ein Meer...$" Route111_Text_1BAEC9:: @ 81BAEC9 - .string "For thirty years I have searched for\n" - .string "ancient ruins!\l" - .string "I am to be challenged?$" + .string "Seit 30 Jahren suche ich nach antiken\n" + .string "Ruinen!\l" + .string "Werde ich jetzt herausgefordert?$" Route111_Text_1BAF14:: @ 81BAF14 - .string "While I have searched for ruins, I’ve\n" - .string "not searched for strong POKéMON.$" + .string "Ich habe nach Ruinen, aber leider nicht\n" + .string "nach starken POKéMON gesucht...$" Route111_Text_1BAF5B:: @ 81BAF5B - .string "For thirty years I have searched for\n" - .string "ancient ruins!\p" - .string "No, wait, was that forty years?\n" - .string "Which was it now?$" + .string "Seit 30 Jahren suche ich nach antiken\n" + .string "Ruinen!\p" + .string "Nee, warte... Seit 40 Jahren, oder? Oder\n" + .string "doch 30 Jahre? Ach, ich weiß nicht...$" Route111_Text_1BAFC1:: @ 81BAFC1 - .string "For thirty years I have searched for\n" - .string "ancient ruins!\p" - .string "No, wait, was that forty years?\n" - .string "Anyway, am I to be challenged?$" + .string "Seit 30 Jahren suche ich nach antiken\n" + .string "Ruinen!\p" + .string "Oder seit 40 Jahren???\n" + .string "Egal! Forderst du mich heraus?$" Route111_Text_1BB034:: @ 81BB034 - .string "I’ve found no ruins, nor have I found\n" - .string "any strong POKéMON...$" + .string "Ich habe keine Ruinen, und auch keine\n" + .string "starken POKéMON gefunden...$" Route111_Text_1BB070:: @ 81BB070 - .string "For thirty years I have searched for\n" - .string "ancient ruins!\p" - .string "No, wait, was that forty years I’ve\n" - .string "searched?\p" - .string "Hmm... It could even be fifty...\n" - .string "How long have I been at this?$" + .string "Seit 30 Jahren suche ich nach antiken\n" + .string "Ruinen!\p" + .string "Glaube ich... Es können auch schon\n" + .string "40 Jahre sein...\p" + .string "Hmm... Andererseits kämen 50 Jahre auch\n" + .string "hin... Mein Gedächtnis ist eine Ruine...$" Route111_Text_1BB111:: @ 81BB111 - .string "I’m full of pep!\n" - .string "And my POKéMON is peppy, too!$" + .string "Ich bin voller Schwung und Elan!\n" + .string "Und mein POKéMON nicht minder!$" Route111_Text_1BB140:: @ 81BB140 - .string "My POKéMON lost its pep...$" + .string "Mein POKéMON hat ausgeschwungen.$" Route111_Text_1BB15B:: @ 81BB15B - .string "When I see a TRAINER with a lot of pep,\n" - .string "I can’t help looking.$" + .string "Wenn ich einen TRAINER mit Schwung und\n" + .string "Elan sehe, muss ich ihn anstarren.$" Route111_Text_1BB199:: @ 81BB199 - .string "I don’t know where you’re going, but\n" - .string "would you like to battle?$" + .string "Ich weiß ja nicht, wo du hin willst, aber\n" + .string "was sagst du zu einem Kämpfchen?$" Route111_Text_1BB1D8:: @ 81BB1D8 - .string "Oh, you’re disgustingly good!$" + .string "Hui, du bist außergewöhnlich gut!$" Route111_Text_1BB1F6:: @ 81BB1F6 - .string "I’m thinking that I should go to\n" - .string "MT. CHIMNEY, but the view around\l" - .string "here is very nice, too.$" + .string "Ich denke, ich sollte zum SCHLOTBERG\n" + .string "gehen, aber hier ist es sooo schön...$" Route111_Text_1BB250:: @ 81BB250 - .string "To train myself, I challenge all\n" - .string "whom I meet!$" + .string "Ich trainiere ganz individuell: Ich for-\n" + .string "dere alle TRAINER, die ich sehe, heraus.$" Route111_Text_1BB27E:: @ 81BB27E - .string "Uncle! I give up!$" + .string "Ich gebe auf! Ich gebe auf!$" Route111_Text_1BB290:: @ 81BB290 - .string "All I can do is keep training until\n" - .string "I can defeat strong TRAINERS such\l" - .string "as yourself.$" + .string "Alles was ich tun kann, ist weiter\n" + .string "trainieren, bis ich starke TRAINER wie\l" + .string "dich besiegen kann.$" Route111_Text_1BB2E3:: @ 81BB2E3 - .string "Show me how much you’ve toughened\n" - .string "your POKéMON.$" + .string "Zeig mir, wie stark deine POKéMON\n" + .string "geworden sind.$" Route111_Text_1BB313:: @ 81BB313 - .string "I see, you’ve toughened them\n" - .string "considerably.$" + .string "Ich habe es zu spüren bekommen. Deine\n" + .string "POKéMON sind viel stärker geworden.$" Route111_Text_1BB33E:: @ 81BB33E - .string "POKéMON and TRAINERS learn much\n" - .string "through battling.\p" - .string "What’s important is to never give up\n" - .string "even if you lose.$" + .string "POKéMON und TRAINER lernen durch\n" + .string "Kämpfe sehr viel.\p" + .string "Wichtig ist, niemals aufzugeben, auch\n" + .string "wenn du verlierst.$" Route111_Text_1BB3A7:: @ 81BB3A7 - .string "We’re training here to elevate our\n" - .string "game to the next level.\l" - .string "Stay and train with us!$" + .string "Wir trainieren hier, um im Spiel einen\n" + .string "Level weiterzukommen.\l" + .string "Bleib hier und trainiere mit uns!$" Route111_Text_1BB3FA:: @ 81BB3FA - .string "Ooh, you’re decent!$" + .string "Ooh, du bist unglaublich!$" Route111_Text_1BB40E:: @ 81BB40E - .string "Since you’re that strong, you should\n" - .string "aim for the POKéMON LEAGUE.$" + .string "Da du so stark bist, solltest du dir die\n" + .string "POKéMON LIGA zum Ziel setzen.$" Route111_Text_1BB44F:: @ 81BB44F - .string "Oh, your POKéMON look like serious\n" - .string "actors.\l" - .string "I have to ask you for an engagement.$" + .string "Oh, deine POKéMON machen den Eindruck\n" + .string "ernsthafter Schauspieler.\l" + .string "Ich möchte sie gerne engagieren.$" Route111_Text_1BB49F:: @ 81BB49F - .string "They didn’t just look strong, they\n" - .string "are strong!$" + .string "Sie sehen nicht nur stark aus, sie sind\n" + .string "auch stark.$" Route111_Text_1BB4CE:: @ 81BB4CE - .string "I thought I was raising my POKéMON\n" - .string "diligently, but, oh no, there is still\l" - .string "much to be done.$" + .string "Ich war überzeugt, meine POKéMON sorg-\n" + .string "fältig aufgezogen zu haben. Aber nein,\l" + .string "ich muss mich noch mehr anstrengen.$" Route111_Text_1BB529:: @ 81BB529 - .string "You can make POKéMON stronger or\n" - .string "weaker depending on the moves you\l" - .string "teach them.\p" - .string "What kinds of moves do your POKéMON\n" - .string "know?$" + .string "Abhängig von den Attacken, die du ihnen\n" + .string "beibringst, sind deine POKéMON stärker\l" + .string "oder schwächer.\p" + .string "Welche Attacken haben deine POKéMON\n" + .string "auf Lager?$" Route111_Text_1BB5A2:: @ 81BB5A2 - .string "You’ve taught them good moves!$" + .string "Ihre Attacken sind wirklich gut.$" Route111_Text_1BB5C1:: @ 81BB5C1 - .string "Maybe I should have stopped my\n" - .string "POKéMON from evolving until they\l" - .string "learned better moves...$" + .string "Meine POKéMON sollten sich vielleicht\n" + .string "nicht eher entwickeln, bis sie wirklich\l" + .string "gute Attacken gelernt haben...$" Route112_Text_1BB619:: @ 81BB619 - .string "Hahahaha!\n" - .string "How about we have a battle?\l" - .string "You and me!\l" - .string "Hahahaha!$" + .string "Hahahahahaha!\n" + .string "Wie wäre es, wenn wir kämpfen?\l" + .string "Du und ich!\l" + .string "Hahahahahaha!$" Route112_Text_1BB655:: @ 81BB655 - .string "I lost!\n" - .string "Hahahaha!$" + .string "Ich habe verloren!\n" + .string "Hahahahahaha!$" Route112_Text_1BB667:: @ 81BB667 - .string "Hahahahaha! Something flew up my nose!\n" - .string "Hahahaha-hatchoo!$" + .string "Hahahahahaha! Irgendetwas ist mir in\n" + .string "die Nase geflogen! Hahahahahaaatschiii!$" Route112_Text_1BB6A0:: @ 81BB6A0 - .string "My legs are solid from pounding up\n" - .string "and down the mountains.\p" - .string "They’re not going to buckle easily,\n" - .string "friend!$" + .string "Meine Beine sind durch das Klettern in\n" + .string "den Bergen richtig muskulös geworden.\p" + .string "So leicht werden sie also nicht\n" + .string "einknicken, mein Freund!$" Route112_Text_1BB707:: @ 81BB707 - .string "Ouch! My legs cramped up!$" + .string "Aua! Ich habe Muskelkrämpfe!$" Route112_Text_1BB721:: @ 81BB721 - .string "Try hiking, and I mean really\n" - .string "pounding, on these mountain trails\l" - .string "with a heavy pack weighing dozens of\l" - .string "pounds.\p" - .string "That, my friend, will get your body\n" - .string "into serious shape.$" + .string "Versuche mal, in den Bergen zu wandern.\n" + .string "Und zwar mit richtig festem Schritt. Und\l" + .string "das mit einem schweren Rucksack von\l" + .string "mehreren Pfund Gewicht...\p" + .string "So, mein Freund, bringst du deinen\n" + .string "Körper richtig in Form.$" Route112_Text_1BB7C7:: @ 81BB7C7 - .string "I’ve been keeping fit by hiking.\n" - .string "Power, I have in spades!$" + .string "Ich halte mich mit Wandern fit!\n" + .string "Dadurch habe ich viele Kräfte im Ärmel!$" Route112_Text_1BB801:: @ 81BB801 - .string "I got trumped in power?$" + .string "Meine Ärmel waren wohl verknotet...$" Route112_Text_1BB819:: @ 81BB819 - .string "I hear there are some seriously tough\n" - .string "TRAINERS on top of MT. CHIMNEY.\p" - .string "I intend to get up there and give them\n" - .string "a challenge!$" + .string "Ich habe gehört, dass es am Gipfel vom\n" + .string "SCHLOTBERG viele starke TRAINER gibt.\p" + .string "Ich werde dort hochgehen und sie alle\n" + .string "herausfordern!$" Route112_Text_1BB893:: @ 81BB893 - .string "I’m strong.\n" - .string "I won’t cry if I lose.$" + .string "Ich bin stark. Ich weine bestimmt\n" + .string "nicht, wenn ich verliere.$" Route112_Text_1BB8B6:: @ 81BB8B6 - .string "Waaaah!$" + .string "Waaahaaa! Heul... Schluchz...$" Route112_Text_1BB8BE:: @ 81BB8BE - .string "I’m not crying because I miss my mommy!\n" - .string "Snivel...$" + .string "Ich weine, weil ich meine Maaaaamiiii\n" + .string "vermisse! Schluchz... Jammer...$" Route112_Text_1BB8F0:: @ 81BB8F0 - .string "When you’re out on a picnic, why, you\n" - .string "simply have to sing!\l" - .string "Come on, sing with me!$" + .string "Machst du ein Picknick, dann musst du\n" + .string "einfach vor Freude laut singen!\l" + .string "Komm, wir singen zusammen.$" Route112_Text_1BB942:: @ 81BB942 - .string "Oh, you’re so strong!$" + .string "Oh, du triffst die Töne besser als ich!$" Route112_Text_1BB958:: @ 81BB958 - .string "It doesn’t matter if you’re good or bad\n" - .string "at singing or POKéMON.\p" - .string "If you have the most fun, you win!$" + .string "Es ist egal, ob du besser singst oder\n" + .string "besser mit POKéMON kämpfen kannst.\p" + .string "Wenn du Spaß hast, hast du schon\n" + .string "gewonnen!$" Route113_Text_1BB9BA:: @ 81BB9BA - .string "Can you guess why it’s so cool\n" - .string "around here?$" + .string "Rate mal, warum es hier draußen so\n" + .string "kühl ist.$" Route113_Text_1BB9E6:: @ 81BB9E6 - .string "Peeuuw!\n" - .string "That stinks!$" + .string "Puuuh äääh!\n" + .string "Das stinkt!$" Route113_Text_1BB9FB:: @ 81BB9FB - .string "The volcanic ash blocks the sun, so it\n" - .string "doesn’t get very warm.\p" - .string "That’s good for me - I can’t stand heat!$" + .string "Die Vulkanasche lässt die Sonnen-\n" + .string "strahlen nicht durch. Es bleibt kalt.\p" + .string "Ich finde das angenehm, ich mag\n" + .string "Hitze nicht.$" Route113_Text_1BBA62:: @ 81BBA62 - .string "The volcano’s eruption is proof that\n" - .string "the earth is alive.$" + .string "Der Vulkanausbruch ist der eindeutige\n" + .string "Beweis, dass die Erde lebt.$" Route113_Text_1BBA9B:: @ 81BBA9B - .string "You’re some kind of strong!$" + .string "Du bist auf die eine oder andere\n" + .string "Weise stark!$" Route113_Text_1BBAB7:: @ 81BBAB7 - .string "Ouch! Owww! I can’t see!\n" - .string "I got ashes in my eyelashes!\p" - .string "Get it? Ashes and eyelashes?\p" - .string "Okay, that was bad, sorry...$" + .string "Aua! Au au au! Ich kann nichts sehen!\n" + .string "Ich habe ein Aschenauge!\p" + .string "Hast du verstanden? Asche und Auge?\p" + .string "Okay, blöder Witz, tut mir Leid...$" Route113_Text_1BBB27:: @ 81BBB27 - .string "I use this parasol to ward off this\n" - .string "filthy, yucky volcanic ash from my\l" - .string "dear NUMEL.$" + .string "Ich habe einen Sonnenschirm, um diese\n" + .string "staubige, widerliche Vulkanasche von\l" + .string "meinem niedlichen CAMAUB fernzuhalten.$" Route113_Text_1BBB7A:: @ 81BBB7A - .string "Huff, huff...\n" - .string "I am exhausted...$" + .string "Keuchl, pust...\n" + .string "Ich bin total außer Atem...$" Route113_Text_1BBB9A:: @ 81BBB9A - .string "You’re very good at this.\n" - .string "I must say I’m impressed!$" + .string "Du bist wirklich sehr gut. Ich muss\n" + .string "sagen, ich bin schwer beeindruckt.$" Route113_Text_1BBBCE:: @ 81BBBCE - .string "Oh, hello, hasn’t it been a while?\n" - .string "May I invite you to battle?$" + .string "Oh, hallo, wir haben uns ja ewig nicht ge-\n" + .string "sehen. Ich lade dich zu einem Kampf ein.$" Route113_Text_1BBC0D:: @ 81BBC0D - .string "Oh, how super!$" + .string "Oh, suuuuuper!$" Route113_Text_1BBC1C:: @ 81BBC1C - .string "You’ve remained very good at this.\n" - .string "I must say I’m impressed!$" + .string "Du bist immer noch sehr gut! Ich muss\n" + .string "sagen, ich bin immer noch beeindruckt.$" Route113_Text_1BBC59:: @ 81BBC59 - .string "From out of the ashes I leap! Hiyah!\n" - .string "I challenge thee!$" + .string "Aus den Aschen erhebe ich mich! Kiyaih!\n" + .string "Herausfordern tue ich dich! Kiyaih!$" Route113_Text_1BBC90:: @ 81BBC90 - .string "With honor I admit defeat!$" + .string "Eine Ehre, von dir besiegt zu werden!$" Route113_Text_1BBCAB:: @ 81BBCAB - .string "I must refine the art of concealment.\n" - .string "I bid thee farewell.$" + .string "Ich muss die Kunst des Versteckens\n" + .string "verbessern. Mein Reimen auch. Leb wohl.$" Route113_Text_1BBCE6:: @ 81BBCE6 - .string "From out of the ashes I leap! Hiyah!\n" - .string "I challenge thee!$" + .string "Erhebe ich mich aus den Aschen, hast du\n" + .string "nichts zu lachen. Kiyaih!$" Route113_Text_1BBD1D:: @ 81BBD1D - .string "With honor I admit defeat!$" + .string "Mein Versagen gereicht dir zur Ehre.$" Route113_Text_1BBD38:: @ 81BBD38 - .string "My flawless concealment was let down\n" - .string "by my immature battle skills...\p" - .string "I bid thee farewell.$" + .string "Mein Versteck ist so lausig wie mein\n" + .string "Kampfstil. Und meine Wortwahl erst...\p" + .string "Ich lasse das Reimen und sage Lebwohl.$" Route113_Text_1BBD92:: @ 81BBD92 - .string "Thanks for finding me!\n" - .string "But we still have to battle!$" + .string "Danke, dass du mich gefunden hast!\n" + .string "Aber nun müssen wir kämpfen!$" Route113_Text_1BBDC6:: @ 81BBDC6 - .string "I’ll use my ninjutsu on you...\n" - .string "“VOLCANIC ASH SWIRL CLOAK”!\p" - .string "...What? It’s already over?$" + .string "Ich werde mein Ninjutsu gegen dich\n" + .string "einsetzen...\p" + .string "“VULKANASCHEN WIRBLER”!\n" + .string "...Was? Es ist schon vorbei?$" Route113_Text_1BBE1D:: @ 81BBE1D - .string "You know what’s crummy about hiding?\n" - .string "It’s lonely if no one comes along.$" + .string "Weißt du, was Sch... am Verstecken ist?\n" + .string "Es ist einsam, wenn keiner vorbeikommt.$" Route113_Text_1BBE65:: @ 81BBE65 - .string "TORI: Both of us, we collect ashes.\n" - .string "We battle POKéMON, too.$" + .string "LI: Wir beide sammeln Asche.\n" + .string "Wir beide kämpfen auch mit POKéMON.$" Route113_Text_1BBEA1:: @ 81BBEA1 - .string "TORI: We lost... It’s boring, so I’m going\n" - .string "to get some more ashes.$" + .string "LI: Wir haben verloren... Mir ist lang-\n" + .string "weilig, daher sammle ich jetzt Asche.$" Route113_Text_1BBEE4:: @ 81BBEE4 - .string "TORI: How much ash do we have?\n" - .string "Enough for a WHITE FLUTE, I hope.$" + .string "LI: Wie viel Asche wir haben? Ich\n" + .string "hoffe, genug für eine WEISSE FLÖTE.$" Route113_Text_1BBF25:: @ 81BBF25 - .string "TORI: We want to battle 2-on-2.\n" - .string "If we didn’t, we would lose!$" + .string "LI: Wir wollen einen 2-gegen-2-Kampf.\n" + .string "Anderenfalls würden wir verlieren.$" Route113_Text_1BBF62:: @ 81BBF62 - .string "TIA: Both of us, we collect ashes.\n" - .string "We battle POKéMON, too.$" + .string "FLO: Wir beide sammeln Asche.\n" + .string "Wir beide kämpfen auch mit POKéMON.$" Route113_Text_1BBF9D:: @ 81BBF9D - .string "TIA: We couldn’t win... It’s boring,\n" - .string "so I’m getting some more ashes.$" + .string "FLO: Wir haben verloren... Mir ist lang-\n" + .string "weilig, daher sammle ich jetzt Asche.$" Route113_Text_1BBFE2:: @ 81BBFE2 - .string "TIA: We have a lot of ashes!\n" - .string "I think enough for a WHITE FLUTE!$" + .string "FLO: Wie viel Asche wir haben? Ich\n" + .string "hoffe, genug für eine WEISSE FLÖTE.$" Route113_Text_1BC021:: @ 81BC021 - .string "TIA: We want to battle 2-on-2.\n" - .string "If we don’t, we won’t win!$" + .string "FLO: Wir wollen einen 2-gegen-2-Kampf.\n" + .string "Anderenfalls würden wir verlieren.$" Route114_Text_1BC05B:: @ 81BC05B - .string "Yodelayhihoo!\p" + .string "Hollerididudljö!\p" .string "... ...\p" - .string "You’re supposed to shout\n" - .string "“yodelayhihoo” since it doesn’t\l" - .string "echo here!$" + .string "Du musst jetzt mit “Hollerididudljö!”\n" + .string "antworten, da es hier kein Echo gibt!$" Route114_Text_1BC0B5:: @ 81BC0B5 - .string "Yodelayhihoo!$" + .string "Hollerididudljö!$" Route114_Text_1BC0C3:: @ 81BC0C3 - .string "When I was a wee tyke, I believed there\n" - .string "was someone copying me and shouting\l" - .string "back, “Yodelayhihoo.”$" + .string "Als ich noch ein kleiner Lausbub war,\n" + .string "habe ich immer gedacht, da wäre jemand,\l" + .string "der mich ärgern will und \l" + .string "“Hollerididudljö” antwortet.$" Route114_Text_1BC125:: @ 81BC125 - .string "If you’re not prepared, you shouldn’t\n" - .string "be up in the mountains!$" + .string "Ohne eine gute Ausrüstung solltest du\n" + .string "dich nicht in die Berge wagen.$" Route114_Text_1BC163:: @ 81BC163 - .string "The mountains are unforgiving...$" + .string "Die Berge sind unerbittlich...$" Route114_Text_1BC184:: @ 81BC184 - .string "In the winter, mountains turn deadly\n" - .string "with blizzards and avalanches.$" + .string "Im Winter sind Berge lebensgefährlich,\n" + .string "wegen der Blizzards und Lawinen.$" Route114_Text_1BC1C8:: @ 81BC1C8 - .string "Camping’s fun! You can fish, roast\n" - .string "marshmallows, and tell spooky stories!\p" - .string "But the best of all are the POKéMON\n" - .string "battles!$" + .string "Campen macht Spaß! Du kannst angeln,\n" + .string "Würstchen braten und andere mit\l" + .string "Spukgeschichten zu Tode erschrecken!\p" + .string "Aber das Beste sind die POKéMON-\n" + .string "Kämpfe!$" Route114_Text_1BC23F:: @ 81BC23F - .string "Way too strong!$" + .string "Das war etwas zu schwer für mich!$" Route114_Text_1BC24F:: @ 81BC24F - .string "I think it’s great that I can go\n" - .string "camping with my POKéMON.$" + .string "Ich finde es großartig, dass ich mit\n" + .string "meinen POKéMON campen gehen kann.$" Route114_Text_1BC289:: @ 81BC289 - .string "I need to exercise after a meal.\n" - .string "Let’s have a match!$" + .string "Nach dem Essen muss ich Sport treiben.\n" + .string "Also lass uns kämpfen.$" Route114_Text_1BC2BE:: @ 81BC2BE - .string "Oh, no!$" + .string "Oh, nein!$" Route114_Text_1BC2C6:: @ 81BC2C6 - .string "I just had a tasty meal.\n" - .string "I’m getting drowsy...$" + .string "Ich hatte so ein leckeres Essen. Des-\n" + .string "halb bin ich jetzt pappsatt und müde.$" Route114_Text_1BC2F5:: @ 81BC2F5 - .string "Ufufufufufu...\n" - .string "Want to battle against my POKéMON?$" + .string "Hufhufhufhufhufhuf...\n" + .string "Komm, trete gegen mein POKéMON an.$" Route114_Text_1BC327:: @ 81BC327 - .string "M-My POKéMON...$" + .string "Mei... Mein POKéMON... hiiii...$" Route114_Text_1BC337:: @ 81BC337 - .string "A big body that’s all lumpy and hard,\n" - .string "enormous horns, and vicious fangs...\p" - .string "Ufufufufu...\n" - .string "I wish I had a POKéMON like that...$" + .string "Einen großen Körper, der plump und hart\n" + .string "ist, riesige Hörner und scharfe Fänge...\p" + .string "Hufhufhufhuf...\n" + .string "So ein POKéMON hätte ich gerne...$" Route114_Text_1BC3B3:: @ 81BC3B3 - .string "Ufufufufufu...\n" - .string "Come on, battle my POKéMON...$" + .string "Hufhufhufhufhuf...\n" + .string "Komm, mein POKéMON ist bereit.$" Route114_Text_1BC3E0:: @ 81BC3E0 - .string "I feel so lucky getting to see your\n" - .string "POKéMON...$" + .string "Ich bin so froh, dass ich deine POKéMON\n" + .string "sehen durfte...$" Route114_Text_1BC40F:: @ 81BC40F - .string "Ufufufufufu...\p" - .string "When I see POKéMON battling, I get all\n" - .string "shivery and shaky...$" + .string "Hufhufhufhufhuf...\p" + .string "Wenn ich POKéMON kämpfen sehe, fange\n" + .string "ich an zu zittern und zu schaudern...$" Route114_Text_1BC45A:: @ 81BC45A - .string "If you’re lighting a campfire, make\n" - .string "sure you have water handy.$" + .string "Wenn du ein Lagerfeuer entzündest,\n" + .string "muss immer Wasser in der Nähe sein.$" Route114_Text_1BC499:: @ 81BC499 - .string "Thanks for dousing my fire!$" + .string "Gut, du hast mein Feuer gelöscht.$" Route114_Text_1BC4B5:: @ 81BC4B5 - .string "You really do have to be careful with\n" - .string "any sort of fire in a forest.\p" - .string "Don’t ever underestimate the power\n" - .string "of fire.$" + .string "Du musst im Wald mit allen Arten von\n" + .string "Feuer wirklich sehr vorsichtig sein.\p" + .string "Unterschätze nie die Gefahr des\n" + .string "Feuers!$" Route114_Text_1BC525:: @ 81BC525 - .string "Have you learned to keep water handy\n" - .string "for campfires?$" + .string "Hast du gelernt, dass man immer Wasser\n" + .string "neben einem Lagerfeuer stehen hat?$" Route114_Text_1BC559:: @ 81BC559 - .string "I got hosed down before I could flare\n" - .string "up, I guess.$" + .string "Ich wurde schon gelöscht, bevor ich\n" + .string "überhaupt zur Flamme ansetzen konnte.$" Route114_Text_1BC58C:: @ 81BC58C - .string "You really do have to be careful with\n" - .string "any sort of fire in a forest.\p" - .string "Don’t ever underestimate the power\n" - .string "of fire.$" + .string "Du musst im Wald mit allen Arten von\n" + .string "Feuer wirklich sehr vorsichtig sein.\p" + .string "Unterschätze nie die Gefahr des\n" + .string "Feuers!$" Route114_Text_1BC5FC:: @ 81BC5FC - .string "If we were fishing, you wouldn’t stand\n" - .string "a chance against me.\l" - .string "So, bring on your POKéMON!$" + .string "Wenn wir angeln wären, hättest du nicht\n" + .string "den Hauch einer Chance gegen mich.\l" + .string "Also, dann zeig mal deine POKéMON.$" Route114_Text_1BC653:: @ 81BC653 - .string "If we were fishing, I would’ve won...$" + .string "Wären wir Angeln, hätte ich gewonnen!$" Route114_Text_1BC679:: @ 81BC679 - .string "I think I’ll try my luck at landing\n" - .string "a big one at METEOR FALLS.\p" - .string "There has to be something in there.\n" - .string "I just know it.$" + .string "Ich werde mein Glück bei METEORFÄLLE\n" + .string "versuchen und ein dickes Ding an Land\l" + .string "ziehen.\p" + .string "Da muss es etwas geben, das weiß ich\n" + .string "genau!$" Route114_Text_1BC6EC:: @ 81BC6EC - .string "I like to fish. But I also like to\n" - .string "battle!\p" - .string "If anyone challenges me, I’m there,\n" - .string "even if I’m fishing.$" + .string "Ich liebe das Angeln. Aber ich liebe auch\n" + .string "das Kämpfen!\p" + .string "Wenn mich jemand herausfordern will, ich\n" + .string "bin bereit. Auch wenn ich angle.$" Route114_Text_1BC750:: @ 81BC750 - .string "I like to battle, but that doesn’t\n" - .string "mean I’m good at it...$" + .string "Ich liebe Kämpfe, aber das heißt nicht,\n" + .string "dass ich gut darin bin...$" Route114_Text_1BC78A:: @ 81BC78A - .string "This time I’ll do it!\p" - .string "I always think that, so I can’t walk\n" - .string "away from fishing or POKéMON.$" + .string "Dieses Mal werde ich trainieren!\p" + .string "Das denke ich jedes Mal und dann\n" + .string "kann ich mich doch nicht von meiner\l" + .string "Angel und meinen POKéMON trennen.$" Route114_Text_1BC7E3:: @ 81BC7E3 - .string "TYRA: Well, sure.\n" - .string "I’m in the mood for it.\l" - .string "I’ll teach you a little about POKéMON.$" + .string "TYRA: Natürlich. Ich bin in der\n" + .string "richtigen Stimmung. Ich werde dir\l" + .string "etwas über POKéMON beibringen.$" Route114_Text_1BC834:: @ 81BC834 - .string "TYRA: What an amazing battle style!$" + .string "TYRA: Was für ein atemberaubender\n" + .string "Kampfstil.$" Route114_Text_1BC858:: @ 81BC858 - .string "TYRA: I was teaching my junior IVY\n" - .string "about POKéMON.$" + .string "TYRA: Ich bringe meiner Juniorin IVY\n" + .string "etwas über POKéMON bei.$" Route114_Text_1BC88A:: @ 81BC88A - .string "TYRA: Giggle...\n" - .string "If you want to battle with us, just one\l" - .string "POKéMON isn’t enough!$" + .string "TYRA: Kicher...\n" + .string "Wenn du mit uns kämpfen willst, reicht\l" + .string "ein POKéMON nicht aus.$" Route114_Text_1BC8D8:: @ 81BC8D8 - .string "IVY: Who taught you about POKéMON?$" + .string "IVY: Wer hat dir das alles über POKéMON\n" + .string "beigebracht?$" Route114_Text_1BC8FB:: @ 81BC8FB - .string "IVY: What an amazing battle style!$" + .string "IVY: Was für ein unglaublicher Kampfstil!$" Route114_Text_1BC91E:: @ 81BC91E - .string "IVY: I started training POKéMON\n" - .string "because TYRA, my student mentor,\l" - .string "taught me!$" + .string "IVY: Ich habe angefangen, POKéMON zu\n" + .string "trainieren, weil TYRA, meine Mentorin,\l" + .string "es mir beigebracht hat!$" Route114_Text_1BC96A:: @ 81BC96A - .string "IVY: Do you only have one POKéMON?\n" - .string "I think it must feel lonesome.$" + .string "IVY: Hast du nur ein POKéMON? Ich\n" + .string "glaube, das fühlt sich einsam!$" Route115_Text_1BC9AC:: @ 81BC9AC .string "Hm...\n" - .string "You seem rather capable...\l" - .string "Let me keep you company!$" + .string "Du siehst ganz kompetent aus...\l" + .string "Ich leiste dir Gesellschaft!$" Route115_Text_1BC9E6:: @ 81BC9E6 - .string "You’re much stronger than\n" - .string "I’d imagined!$" + .string "Du bist viel stärker, als ich mir das\n" + .string "vorgestellt hatte.$" Route115_Text_1BCA0E:: @ 81BCA0E - .string "There is no such thing as a born genius.\n" - .string "It all depends on effort!\l" - .string "That is what I believe...$" + .string "Man wird nicht als Genie geboren!\n" + .string "Alles basiert auf Anstrengung!\l" + .string "Das ist meine Meinung...$" Route115_Text_1BCA6B:: @ 81BCA6B - .string "Hm... As always, your agility speaks\n" - .string "for itself.\l" - .string "Come, keep me company!$" + .string "Hm... Deine Flinkheit spricht mal wieder\n" + .string "für sich.\l" + .string "Komm, leiste mir erneut Gesellschaft!$" Route115_Text_1BCAB3:: @ 81BCAB3 - .string "As strong as ever!$" + .string "Stark wie immer!$" Route115_Text_1BCAC6:: @ 81BCAC6 - .string "All it takes is effort!\p" - .string "I lost because I haven’t put in enough\n" - .string "effort!$" + .string "Alles verlangt ein Maß an Anstrengung!\p" + .string "Ich habe verloren, weil ich mich nicht\n" + .string "genügend angestrengt habe.$" Route115_Text_1BCB0D:: @ 81BCB0D - .string "You!\p" - .string "My MACHOP!\p" - .string "Demand a battle!$" + .string "Du!\p" + .string "Meine MACHOLLO!\p" + .string "Verlangen einen Kampf!$" Route115_Text_1BCB2E:: @ 81BCB2E - .string "Ouch, ouch, ouch!$" + .string "Aua aua aua aua!$" Route115_Text_1BCB40:: @ 81BCB40 - .string "My MACHOP crew!\p" - .string "So long as they seek power, I will\n" - .string "grow strong with them!$" + .string "Meine MACHOLLO haben gejauchzt!\p" + .string "Solange meine POKéMON nach Stärke\n" + .string "suchen, werde auch ich stärker!$" Route115_Text_1BCB8A:: @ 81BCB8A - .string "My strongest skill is busting bricks\n" - .string "with my forehead!$" + .string "Mein Talent ist, Ziegelsteine mit meiner\n" + .string "Stirn zu zertrümmern.$" Route115_Text_1BCBC1:: @ 81BCBC1 - .string "Ugwaaaah!\n" - .string "My head is busted!$" + .string "Uguaaah!\n" + .string "Mein Kopf wurde zertrümmert.$" Route115_Text_1BCBDE:: @ 81BCBDE - .string "I’ve been teaching my POKéMON karate.\p" - .string "It looks like they’ll get a lot better\n" - .string "than me. I’m excited about that.$" + .string "Ich bringe meinem POKéMON Karate bei.\p" + .string "Und es sieht so aus, als wäre es darin\n" + .string "viel besser als ich. Das freut mich.$" Route115_Text_1BCC4C:: @ 81BCC4C - .string "After you beat me, we trained hard to\n" - .string "improve our skills.\l" - .string "Come on, give us a rematch!$" + .string "Nachdem du uns besiegt hattest, haben\n" + .string "wir hart trainiert, um besser zu werden.\l" + .string "Heute fordern wir Revanche!$" Route115_Text_1BCCA2:: @ 81BCCA2 - .string "Ugwaaah!\n" - .string "We lost again!$" + .string "Uguaaah!\n" + .string "Wir haben schon wieder verloren!$" Route115_Text_1BCCBA:: @ 81BCCBA - .string "My POKéMON will grow stronger!\n" - .string "I’ll redouble my training!$" + .string "Meine POKéMON werden stärker! Ich\n" + .string "habe mein Trainingspensum verdoppelt.$" Route115_Text_1BCCF4:: @ 81BCCF4 - .string "This beach is my secret training spot!\n" - .string "Don’t come butting in!$" + .string "Dieser Strand ist mein geheimer\n" + .string "Trainingsort. Du hast mich gestört!$" Route115_Text_1BCD32:: @ 81BCD32 - .string "I haven’t trained enough!$" + .string "Ich habe nicht genug trainiert.$" Route115_Text_1BCD4C:: @ 81BCD4C - .string "The sand acts as a cushion to reduce\n" - .string "impact and prevent injury.\l" - .string "This is the perfect place to train.$" + .string "Der Sand ist wie ein Kissen, das den\n" + .string "Sturz abfängt und Verletzungen ver-\l" + .string "hindert. Der perfekte Trainingsort.$" Route115_Text_1BCDB0:: @ 81BCDB0 - .string "Okay, let’s get this battle on!$" + .string "Okay, lass uns weiter kämpfen.$" Route115_Text_1BCDD0:: @ 81BCDD0 - .string "I can battle but my POKéMON...$" + .string "Ich kann kämpfen, aber meine POKéMON...$" Route115_Text_1BCDEF:: @ 81BCDEF - .string "Even when I lose, I still get some\n" - .string "enjoyment out of it.\l" - .string "It must be that I love POKéMON.$" + .string "Sogar wenn ich verliere, habe ich meine\n" + .string "Freude an dem Kampf. Wahrscheinlich\l" + .string "weil ich die POKéMON liebe.$" UnknownString_81BCE47: @ 81BCE47 - .string "I have a rare POKéMON!\n" - .string "Would you like me to show you?$" + .string "Ich habe ein seltenes POKéMON.\n" + .string "Möchtest du das mal sehen?$" UnknownString_81BCE7D: @ 81BCE7D - .string "You...\n" - .string "You want my POKéMON, don’t you?$" + .string "Du...\n" + .string "Du willst mein POKéMON haben, oder?$" UnknownString_81BCEA4: @ 81BCEA4 - .string "I have this rare POKéMON.\n" - .string "It’s enough to keep me satisfied.$" + .string "Ich habe ein seltenes POKéMON. Das\n" + .string "reicht mir, um zufrieden zu sein.$" Route115_Text_1BCEE0:: @ 81BCEE0 - .string "I have a rare POKéMON!\n" - .string "Would you like me to show you?$" + .string "Ich habe ein seltenes POKéMON.\n" + .string "Willst du das mal sehen?$" Route115_Text_1BCF16:: @ 81BCF16 - .string "You...\n" - .string "You want my POKéMON, don’t you?$" + .string "Du... Du versuchst mir mein POKéMON\n" + .string "abspenstig zu machen, oder?$" Route115_Text_1BCF3D:: @ 81BCF3D - .string "I have this rare POKéMON.\n" - .string "It’s enough to keep me satisfied.$" + .string "Und ich habe immer noch mein seltenes\n" + .string "POKéMON, und damit bin ich zufrieden!$" Route116_Text_1BCF79:: @ 81BCF79 - .string "If the tunnel doesn’t go through, then\n" - .string "I’ll just go over the top.$" + .string "Wenn es keinen Tunnel gibt, dann\n" + .string "klettere ich eben über den Berg.$" Route116_Text_1BCFBB:: @ 81BCFBB - .string "Gasp... Gasp...\n" - .string "Losing made me tired...$" + .string "Hechel... Keuch...\n" + .string "Verlieren erschöpft mich...$" Route116_Text_1BCFE3:: @ 81BCFE3 - .string "It’s no big deal if there’s no tunnel.\n" - .string "To a HIKER, mountains are roads!$" + .string "Macht auch nichts, wenn es keinen\n" + .string "Tunnel gibt. Für WANDERER sind Berge\l" + .string "wie Straßen.$" Route116_Text_1BD02B:: @ 81BD02B - .string "My POKéMON rule!\n" - .string "Check them out!$" + .string "Meine POKéMON sind die Kings.\n" + .string "Überzeug dich selbst!$" Route116_Text_1BD04C:: @ 81BD04C - .string "Ouch! A scrape!\n" - .string "I have to put on a bandage!$" + .string "Auaaa! Ein Kratzer!\n" + .string "Ich brauche dringend einen Verband.$" Route116_Text_1BD078:: @ 81BD078 - .string "Bandages are signs of toughness!\n" - .string "I’ve got another one!$" + .string "Verbände sind Zeichen von Rauheit!\n" + .string "Ich brauche unbedingt einen weiteren!$" Route116_Text_1BD0AF:: @ 81BD0AF - .string "My BUG POKéMON are tough!\n" - .string "Let’s battle!$" + .string "Meine KÄFER-POKéMON sind stark!\n" + .string "Lass uns kämpfen!$" Route116_Text_1BD0D7:: @ 81BD0D7 - .string "I lost!\n" - .string "I thought I had you!$" + .string "Ich habe verloren! Ich dachte,\n" + .string "ich könnte dich am Kragen packen...$" Route116_Text_1BD0F4:: @ 81BD0F4 - .string "BUG POKéMON evolve quickly.\n" - .string "So they get strong quickly, too.$" + .string "KÄFER-POKéMON entwickeln sich schnell.\n" + .string "So werden sie auch schnell stark.$" Route116_Text_1BD131:: @ 81BD131 - .string "Let me teach you how strong my\n" - .string "adorable POKéMON is!$" + .string "Ich bringe dir bei, wie stark mein\n" + .string "geliebtes POKéMON ist!$" Route116_Text_1BD165:: @ 81BD165 - .string "You’re a notch above me...$" + .string "Du bist mir haushoch überlegen...$" Route116_Text_1BD180:: @ 81BD180 - .string "POKéMON that possess cuteness and\n" - .string "power, that’s ideal, I think.$" + .string "POKéMON, die Anmut und Stärke besitzen,\n" + .string "sind ideal, finde ich.$" Route116_Text_1BD1C0:: @ 81BD1C0 - .string "We learn all sorts of things at the\n" - .string "TRAINER’S SCHOOL.\p" - .string "I want to test things out for real!$" + .string "Wir lernen alle möglichen Sachen in der\n" + .string "TRAINERSCHULE.\p" + .string "Ich will einiges jetzt mal ausprobieren.$" Route116_Text_1BD21A:: @ 81BD21A - .string "I slacked off in school...\n" - .string "That’s why I lost.$" + .string "Ich habe in der Schule nicht aufge-\n" + .string "passt. Daher habe ich verloren.$" Route116_Text_1BD248:: @ 81BD248 - .string "I’ll have to redo some courses at the\n" - .string "TRAINER’S SCHOOL.\l" - .string "If I don’t, ROXANNE will be steamed.$" + .string "Ich muss einige Kurse in der TRAINER-\n" + .string "SCHULE wiederholen.\l" + .string "Sonst wird FELIZIA vor Wut schäumen.$" Route116_Text_1BD2A5:: @ 81BD2A5 - .string "I’ve been studying seriously at the\n" - .string "TRAINER’S SCHOOL.\l" - .string "I won’t lose like I did last time.$" + .string "Ich habe in der TRAINERSCHULE fleißig\n" + .string "gelernt. Ich werde dieses Mal also mit\l" + .string "Sicherheit nicht verlieren.$" Route116_Text_1BD2FE:: @ 81BD2FE - .string "Hunh?\n" - .string "I studied diligently.$" + .string "Waaas?\n" + .string "Aber ich habe doch so fleißig gelernt!$" Route116_Text_1BD31A:: @ 81BD31A - .string "I’ll have to redo some courses at the\n" - .string "TRAINER’S SCHOOL.\l" - .string "If I don’t, ROXANNE will be steamed.$" + .string "Ich muss wohl erneut einige Kurse in der\n" + .string "TRAINERSCHULE wiederholen.\l" + .string "Sonst kocht FELIZIA über.$" Route116_Text_1BD377:: @ 81BD377 - .string "I study at school, and I study on the\n" - .string "way home, too!$" + .string "Ich lerne in der Schule und auf dem\n" + .string "Heimweg lerne ich auch!$" Route116_Text_1BD3AC:: @ 81BD3AC - .string "I’m in shock - I lost?$" + .string "Ich bin geschockt! Ich habe verloren?!?$" Route116_Text_1BD3C3:: @ 81BD3C3 - .string "Awww, I’ll never become an elegant\n" - .string "TRAINER like ROXANNE this way!$" + .string "Argh, so werde ich nie so ein eleganter\n" + .string "TRAINER wie FELIZIA!$" Route116_Text_1BD405:: @ 81BD405 - .string "I studied a whole lot since I saw you.\n" - .string "You must see my achievements!$" + .string "Seit unserem letzten Kampf habe ich\n" + .string "viel gelernt. Das musst du dir ansehen!$" Route116_Text_1BD44A:: @ 81BD44A - .string "I’m in shock. I lost again?$" + .string "Ach, das gibt es doch nicht...$" Route116_Text_1BD466:: @ 81BD466 - .string "You’ve beaten ROXANNE?\n" - .string "I can’t beat you, then. Not yet.$" + .string "Du hast FELIZIA besiegt?!?\n" + .string "Dann kann ich dich nicht besiegen. Nee...$" Route117_Text_1BD49E:: @ 81BD49E - .string "Listen, could I get you to battle the\n" - .string "POKéMON I’m raising?$" + .string "Du? Würdest du gegen meine POKéMON\n" + .string "kämpfen?$" Route117_Text_1BD4D9:: @ 81BD4D9 - .string "You’ve raised yours superbly...$" + .string "Du hast einfach großartige POKéMON...$" Route117_Text_1BD4F9:: @ 81BD4F9 - .string "POKéMON isn’t all about power.\p" - .string "Polishing a unique aspect of one’s\n" - .string "character is another way of enjoying\l" - .string "POKéMON.$" + .string "POKéMON sind nicht nur durch Stärke\n" + .string "definiert.\p" + .string "Jedes POKéMON hat seinen eigenen\n" + .string "Charakter. Dadurch wird der Umgang\l" + .string "mit ihnen noch viel interessanter.$" Route117_Text_1BD569:: @ 81BD569 - .string "The POKéMON I’ve been raising are\n" - .string "looking good, just like before.$" + .string "Die POKéMON, die ich aufgezogen habe,\n" + .string "sehen gut aus. Genau wie immer.$" Route117_Text_1BD5AB:: @ 81BD5AB - .string "You know how to raise them properly.\n" - .string "You might have DAY CARE skills...$" + .string "Du weißt, wie man sie richtig aufzieht.\n" + .string "Du hast die Talente, die man in einer\l" + .string "PENSION braucht.$" Route117_Text_1BD5F2:: @ 81BD5F2 - .string "Your POKéMON are growing good!\n" - .string "You should enter them in CONTESTS.$" + .string "Deine POKéMON entwickeln sich gut.\n" + .string "Du solltest sie zu einem WETTBEWERB\l" + .string "anmelden!$" Route117_Text_1BD634:: @ 81BD634 - .string "Please, allow me to evaluate if you\n" - .string "have raised your POKéMON properly.$" + .string "Bitte lass mich überprüfen, ob du deine\n" + .string "POKéMON auch richtig aufgezogen hast.$" Route117_Text_1BD67B:: @ 81BD67B - .string "Yes, they are growing properly.$" + .string "Ja, sie sehen sehr gut aus...$" Route117_Text_1BD69B:: @ 81BD69B - .string "If you feed {POKEBLOCK}S to POKéMON, the\n" - .string "unique aspects of their character\l" - .string "will be enhanced.$" + .string "Wenn du deinen POKéMON {POKEBLOCK}\n" + .string "gibst, entwickeln sich ihre individuellen\l" + .string "Charaktereigenschaften.$" Route117_Text_1BD6F2:: @ 81BD6F2 - .string "Allow me to reevaluate if you have\n" - .string "raised your POKéMON properly.$" + .string "Erlaube mir, noch einmal zu prüfen, ob\n" + .string "du deine POKéMON richtig aufziehst.$" Route117_Text_1BD733:: @ 81BD733 - .string "They are growing admirably.$" + .string "Sie wurden sehr, sehr gut aufgezogen...$" Route117_Text_1BD74F:: @ 81BD74F - .string "POKéMON seem to like different kinds\n" - .string "of {POKEBLOCK}S, depending on their nature.$" + .string "POKéMON mögen, abhängig von ihrem\n" + .string "Wesen, die unterschiedlichsten {POKEBLOCK}.$" Route117_Text_1BD79A:: @ 81BD79A - .string "I’m in the middle of a triathlon, but,\n" - .string "whatever, let’s have a battle!$" + .string "Ich bin mitten in einem Triathlon. Aber\n" + .string "lass uns trotzdem kämpfen!$" Route117_Text_1BD7E0:: @ 81BD7E0 - .string "I ran out of energy!$" + .string "Ich habe keine Energie mehr!$" Route117_Text_1BD7F5:: @ 81BD7F5 - .string "I may have blown it...\p" - .string "I might have dropped to last during\n" - .string "that battle...$" + .string "Ich habe es wohl verpatzt...\p" + .string "Ich habe in meinem letzten Kampf\n" + .string "stark nachgelassen...$" Route117_Text_1BD83F:: @ 81BD83F - .string "I’m smack in the middle of a triathlon,\n" - .string "but I’m comfortably ahead.\l" - .string "Let’s make this a quick battle!$" + .string "Ich bin mitten in einem Triathlon, liege\n" + .string "aber weit an der Spitze. Lass uns zu\l" + .string "einem schnellen Kampf antreten.$" Route117_Text_1BD8A2:: @ 81BD8A2 - .string "I ran out of energy again!$" + .string "Ich habe schon wieder meine Energie\n" + .string "verloren!$" Route117_Text_1BD8BD:: @ 81BD8BD - .string "I was tops in swimming and cycling, but\n" - .string "I’m not quite that confident with\l" - .string "POKéMON yet.$" + .string "Im Schwimmen und im Radfahren bin ich\n" + .string "unschlagbar, aber meine Leistungen in\l" + .string "POKéMON-Kämpfen sind unbefriedigend.$" Route117_Text_1BD914:: @ 81BD914 - .string "I do my triathlon training with POKéMON,\n" - .string "so I’m pretty confident about my speed.$" + .string "Ich trainiere mit meinem POKéMON und\n" + .string "bin mit meinen Fähigkeiten echt\l" + .string "zufrieden.$" Route117_Text_1BD965:: @ 81BD965 - .string "I need to get more practices in,\n" - .string "I guess.$" + .string "Ich glaube, ich muss wirklich mehr üben.$" Route117_Text_1BD98F:: @ 81BD98F - .string "Training is meaningful only if you\n" - .string "keep it up regularly.\p" - .string "Okay! I’ll resume my training!\n" - .string "Tomorrow!$" + .string "Training zahlt sich nur aus, wenn man\n" + .string "regelmäßig trainiert.\p" + .string "Okay! Ich setze mein Training fort!\n" + .string "Morgen!$" Route117_Text_1BD9F1:: @ 81BD9F1 - .string "Are you keeping up with your training?\n" - .string "I sure am!\l" - .string "Let me show you the evidence!$" + .string "Trainierst du auch fleißig weiter?\n" + .string "Ich trainiere sehr fleißig!\l" + .string "Ich liefere dir den Beweis.$" Route117_Text_1BDA41:: @ 81BDA41 - .string "I need to get more practices in,\n" - .string "I guess.$" + .string "Ich muss, glaube ich, doch noch mehr\n" + .string "trainieren.$" Route117_Text_1BDA6B:: @ 81BDA6B - .string "I’ll resume training tomorrow.\n" - .string "Let’s battle again sometime!$" + .string "Ich werde mein Training morgen fort-\n" + .string "setzen. Lass uns bald wieder kämpfen!$" Route117_Text_1BDAA7:: @ 81BDAA7 - .string "Once a BUG CATCHER!\n" - .string "And now a BUG MANIAC!\p" - .string "But my love for POKéMON remains\n" - .string "unchanged!$" + .string "Einst war ich KÄFERSAMMLER.\n" + .string "Heute bin ich ein KÄFERFREAK!\p" + .string "Aber meine Liebe zu POKéMON hat sich\n" + .string "nicht verändert!$" Route117_Text_1BDAFC:: @ 81BDAFC - .string "My ineptitude also remains\n" - .string "unchanged...$" + .string "Meine Ungeschicktheit ist auch\n" + .string "ungebrochen...$" Route117_Text_1BDB24:: @ 81BDB24 - .string "All I did was follow my heart, and now\n" - .string "they call me a BUG MANIAC...\p" - .string "Still, I am an expert on BUG POKéMON,\n" - .string "so it’s only natural that they call me\l" - .string "a BUG MANIAC.$" + .string "Alles, was ich getan habe, war meinem\n" + .string "Herzen zu folgen, und nun nennen sie\l" + .string "mich den KÄFERFREAK...\p" + .string "Aber ich bin ein Experte für KÄFER-\n" + .string "POKéMON, daher ist es nur natürlich,\l" + .string "dass sie mich KÄFERFREAK nennen.$" Route117_Text_1BDBC3:: @ 81BDBC3 - .string "ANNA: I’m with my pretty junior student\n" - .string "partner. I have to do good!$" + .string "IRM: Ich bin hier mit meiner hübschen\n" + .string "Junior-Studentin. Ich muss gut sein!$" Route117_Text_1BDC07:: @ 81BDC07 - .string "ANNA: I’m with my pretty junior student\n" - .string "partner! Let me win!$" + .string "IRM: Ich bin mit meiner hübschen\n" + .string "Junior-Studentin hier. Ich wollte so\l" + .string "gerne gewinnen!$" Route117_Text_1BDC44:: @ 81BDC44 - .string "ANNA: Your POKéMON have some good\n" - .string "combinations.\p" - .string "I’d say you’re second only to us!$" + .string "IRM: Deine POKéMON haben einige gute\n" + .string "Kombinationen auf Lager.\p" + .string "Trotzdem bist du uns gegenüber nur\n" + .string "zweite Klasse.$" Route117_Text_1BDC96:: @ 81BDC96 - .string "ANNA: If you want to battle us, bring\n" - .string "two POKéMON with you.$" + .string "IRM: Wenn du gegen uns antreten willst,\n" + .string "bring zwei POKéMON mit.$" Route117_Text_1BDCD2:: @ 81BDCD2 - .string "MEG: I’m going to tag up with my super\n" - .string "senior student partner and beat you!$" + .string "IDA: Ich werde mich mit meiner Super-\n" + .string "Senior-Studentin verbünden und siegen!$" Route117_Text_1BDD1E:: @ 81BDD1E - .string "MEG: Oh, no!\n" - .string "I’m sorry, ANNA! I let you down...$" + .string "IDA: Oh, nein! Tut mir Leid, IRM.\n" + .string "Ich habe dich im Stich gelassen.$" Route117_Text_1BDD4E:: @ 81BDD4E - .string "MEG: I dragged ANNA down...\n" - .string "If I didn’t, she would have won!$" + .string "IDA: Ich habe IRM in eine Niederlage\n" + .string "gebracht. Ohne mich hätte sie gewonnen!$" Route117_Text_1BDD8B:: @ 81BDD8B - .string "MEG: Do you only have one POKéMON?\n" - .string "We can’t battle with you, then.\p" - .string "We want to have a 2-on-2 battle.$" + .string "IDA: Hast du nur ein POKéMON?\n" + .string "Dann können wir nicht mit dir kämpfen.\p" + .string "Wir wollen einen 2-gegen-2-Kampf.$" Route117_Text_1BDDEF:: @ 81BDDEF - .string "ANNA: I can’t keep losing in front of\n" - .string "my junior partner, right?$" + .string "IRM: Ich kann doch nicht ständig vor\n" + .string "meiner Junior-Partnerin verlieren...$" Route117_Text_1BDE2F:: @ 81BDE2F - .string "ANNA: I couldn’t get into the groove.$" + .string "IRM: Ich komme einfach nicht in Fahrt.$" Route117_Text_1BDE55:: @ 81BDE55 - .string "ANNA: Your POKéMON have some good\n" - .string "combinations.\p" - .string "I’d say you’re second only to us!$" + .string "IRM: Deine POKéMON haben einige gute\n" + .string "Kombinationen auf Lager.\p" + .string "Trotzdem bist du uns gegenüber nur\n" + .string "zweite Klasse.$" Route117_Text_1BDEA7:: @ 81BDEA7 - .string "ANNA: If you want to battle us, bring\n" - .string "two POKéMON with you.$" + .string "IRM: Wenn du gegen uns antreten willst,\n" + .string "brauchst du zwei POKéMON.$" Route117_Text_1BDEE3:: @ 81BDEE3 - .string "MEG: I’m going to tag up with my\n" - .string "senior partner and win this time!$" + .string "IDA: Ich werde mich mit meiner\n" + .string "Senior-Studentin verbünden und siegen!$" Route117_Text_1BDF26:: @ 81BDF26 - .string "MEG: Too strong!$" + .string "IDA: Viel zu stark!$" Route117_Text_1BDF37:: @ 81BDF37 - .string "MEG: I battled together with my\n" - .string "senior partner, but we lost...\p" - .string "That’s so discouraging...$" + .string "IDA: Ich habe mit meiner Senior-\n" + .string "Partnerin gekämpft. Wir haben verloren.\p" + .string "Das ist so entmutigend...$" Route117_Text_1BDF90:: @ 81BDF90 - .string "MEG: Do you only have one POKéMON?\n" - .string "We can’t battle with you, then.\p" - .string "We want to have a 2-on-2 battle.$" + .string "IDA: Besitzt du nur ein POKéMON?\n" + .string "Dann können wir nicht kämpfen.\p" + .string "Wir wollen einen 2-gegen-2-Kampf.$" Route118_Text_1BDFF4:: @ 81BDFF4 - .string "The aroma of flowers has a magical\n" - .string "power. It cleanses us body and soul.$" + .string "Der Duft von Blumen hat eine magische\n" + .string "Kraft. Er reinigt Körper und Geist.$" Route118_Text_1BE03C:: @ 81BE03C - .string "Oh, dear me.\n" - .string "I seem to have lost.$" + .string "Oh, du meine Güte.\n" + .string "Scheinbar habe ich verloren.$" Route118_Text_1BE05E:: @ 81BE05E - .string "Flowers, POKéMON...\n" - .string "I love whatever smells nice.\p" - .string "Stinky things...\n" - .string "I’ll pass.$" + .string "Blumen, POKéMON...\n" + .string "Ich liebe alles, was gut riecht.\p" + .string "Stinkende Dinge...\n" + .string "Bah, da muss ich passen.$" Route118_Text_1BE0AB:: @ 81BE0AB - .string "Were you drawn here by the sweet\n" - .string "aroma?$" + .string "Hat dich der süße Duft hierher\n" + .string "gebracht?$" Route118_Text_1BE0D3:: @ 81BE0D3 - .string "The power of aroma...\n" - .string "It didn’t seem to do much.$" + .string "Die Kraft des Duftes...\n" + .string "Sie scheint nichts zu bewirken.$" Route118_Text_1BE104:: @ 81BE104 - .string "If you use a sweet aroma properly,\n" - .string "POKéMON will be attracted by it.$" + .string "Wenn du einen süßen Duft richtig ein-\n" + .string "setzt, werden POKéMON davon\l" + .string "angezogen.$" Route118_Text_1BE148:: @ 81BE148 - .string "BIRD POKéMON that FLY elegantly in\n" - .string "the sky... They’re the best!$" + .string "VOGEL-POKéMON, die elegant durch die\n" + .string "Lüfte FLIEGEN... Sie sind die Besten!$" Route118_Text_1BE188:: @ 81BE188 - .string "Urgh... I crashed...$" + .string "Argh... Das war eine Bruchlandung...$" Route118_Text_1BE19D:: @ 81BE19D - .string "You’ve got great POKéMON.\n" - .string "I’ll have to train mine better.$" + .string "Du hast großartige POKéMON.\n" + .string "Ich muss meines besser trainieren.$" Route118_Text_1BE1D7:: @ 81BE1D7 - .string "Take flight!\n" - .string "My BIRD POKéMON!$" + .string "Erhebt euch!\n" + .string "Meine VOGEL-POKéMON!$" Route118_Text_1BE1F5:: @ 81BE1F5 - .string "They did take flight...$" + .string "Sie sind abgehoben...$" Route118_Text_1BE20D:: @ 81BE20D - .string "If they’d get stronger, they’d be able\n" - .string "to fly more freely...$" + .string "Wenn sie erst einmal stärker geworden\n" + .string "sind, können sie auch freier fliegen.$" Route118_Text_1BE24A:: @ 81BE24A - .string "I’m a FISHERMAN, but also a TRAINER.\n" - .string "I’m raising the POKéMON I caught.$" + .string "Ich bin ein ANGLER, aber auch ein\n" + .string "TRAINER. Ich ziehe die POKéMON auf,\l" + .string "die ich gefangen habe.$" Route118_Text_1BE291:: @ 81BE291 - .string "I thought I was doing okay in my\n" - .string "training...$" + .string "Ich dachte, ich wäre gut im Training...$" Route118_Text_1BE2BE:: @ 81BE2BE - .string "I couldn’t win by training POKéMON\n" - .string "while I fished...\p" - .string "Was I doing things in half measures?$" + .string "Ich kann nicht gewinnen, wenn ich\n" + .string "POKéMON trainiere, während ich angle.\p" + .string "Habe ich alles nur halb getan?$" Route118_Text_1BE318:: @ 81BE318 - .string "For FISHERMEN, equipment is the key.\p" - .string "But for TRAINERS, the key ingredients\n" - .string "are POKéMON and heart, of course!$" + .string "Für ANGLER ist die Ausrüstung\n" + .string "entscheidend.\p" + .string "Aber für TRAINER sind natürlich die\n" + .string "POKéMON und das Herz entscheidend!$" Route118_Text_1BE385:: @ 81BE385 - .string "I was beaten in heart?$" + .string "Ich wurde im Herzen geschlagen?$" Route118_Text_1BE39C:: @ 81BE39C - .string "Come to think of it, fishing is a battle\n" - .string "between a FISHERMAN and a POKéMON.$" + .string "Wenn ich so darüber nachdenke, komme\n" + .string "ich zu dem Schluss, dass Angeln ein\l" + .string "Kampf zwischen ANGLER und POKéMON ist.$" Route118_Text_1BE3E8:: @ 81BE3E8 - .string "Let my melody rock your soul!$" + .string "Meine Melodie wird deine Seele\n" + .string "erschüttern.$" Route118_Text_1BE406:: @ 81BE406 .string "La-lalala...$" Route118_Text_1BE413:: @ 81BE413 - .string "An electric guitar doesn’t always\n" - .string "have to be noisy...\p" - .string "It can be strummed to squeeze out\n" - .string "this heart-stirring melody...$" + .string "Eine E-Gitarre muss nicht immer laut\n" + .string "sein...\p" + .string "Sie kann auch so gespielt werden, dass\n" + .string "eine herzergreifende Melodie erklingt...$" Route118_Text_1BE489:: @ 81BE489 - .string "A melody from my POKéMON and me...\n" - .string "Let us deliver it to your soul.$" + .string "Eine Melodie von meinen POKéMON und mir.\n" + .string "Lass sie uns deiner Seele schenken.$" Route118_Text_1BE4CC:: @ 81BE4CC .string "La-lalala...$" Route118_Text_1BE4D9:: @ 81BE4D9 - .string "When I play, my emotions should reach\n" - .string "you through my electric guitar...$" + .string "Wenn ich spiele, sollten dich meine Ge-\n" + .string "fühle über meine E-Gitarre erreichen...$" Route119_Text_1BE521:: @ 81BE521 - .string "We’re the MIMIC CIRCLE!\n" - .string "We MIMIC what you do!$" + .string "Wir gehören zum Mimikry-Zirkel!\n" + .string "Wir ahmen nach, was du machst!$" Route119_Text_1BE54F:: @ 81BE54F - .string "Whoopsie!\n" - .string "I lost!$" + .string "Huupsie!\n" + .string "Ich habe verloren!$" Route119_Text_1BE561:: @ 81BE561 - .string "What’s so good about mimicry?\p" - .string "Fufufu...\n" - .string "You’ll never understand...$" + .string "Was so toll an Mimikry sein soll?\p" + .string "Hähähä...\n" + .string "Das wirst du nie verstehen...$" Route119_Text_1BE5A4:: @ 81BE5A4 - .string "So, we finally meet!\n" - .string "My BUG POKéMON will keep you company!$" + .string "So trifft man sich! Meine KÄFER-POKéMON\n" + .string "leisten dir Gesellschaft!$" Route119_Text_1BE5DF:: @ 81BE5DF - .string "I wish we’d never met...$" + .string "Ich wünschte, wir hätten uns nie\n" + .string "getroffen...$" Route119_Text_1BE5F8:: @ 81BE5F8 - .string "I want to MIMIC you some more.\p" - .string "Can you hurry up and move?$" + .string "Ich möchte noch Mimikry bei dir an-\n" + .string "wenden.\p" + .string "Kannst du dich mal ein bisschen\n" + .string "bewegen?$" Route119_Text_1BE632:: @ 81BE632 - .string "If you step forward, we step forward.\p" - .string "If you turn right, we turn, too...$" + .string "Trittst du einen Schritt vor, treten wir\n" + .string "auch einen Schritt vor.\p" + .string "Drehst du dich nach rechts, drehen wir\n" + .string "uns auch nach rechts...$" Route119_Text_1BE67B:: @ 81BE67B - .string "But if you win, I lose...$" + .string "Aber wenn du gewinnst, verliere ich...$" Route119_Text_1BE695:: @ 81BE695 - .string "I can’t MIMIC you winning the match.\n" - .string "That’s just impossible...\l" - .string "It’s burning me up...$" + .string "Ich kann nicht mit Mimikry nachahmen,\n" + .string "wie du den Kampf gewinnst. Unmöglich!\l" + .string "Das lässt mich kochen vor Wut.$" Route119_Text_1BE6EA:: @ 81BE6EA - .string "Yep, you’ve finally caught me!\n" - .string "Or were you trying to avoid me?$" + .string "Hey, geschafft! Du hast mich gefunden!\n" + .string "Oder wolltest du mir ausweichen?$" Route119_Text_1BE729:: @ 81BE729 - .string "Whoop, that was a great match!$" + .string "Hui, was für ein großartiger Kampf!$" Route119_Text_1BE748:: @ 81BE748 - .string "We’re the MIMIC CIRCLE!\n" - .string "I hope you enjoyed our performance.$" + .string "Wir sind der Mimikry-Zirkel! Ich\n" + .string "hoffe, dir gefiel unsere Vorstellung!$" Route119_Text_1BE784:: @ 81BE784 - .string "You don’t know who I am, do you?\p" - .string "But, I also don’t know you.\n" - .string "So, we’ll battle!$" + .string "Du weißt nicht, wer ich bin, stimmt’s?\p" + .string "Aber... Ich kenne dich auch nicht.\n" + .string "Lass uns kämpfen.$" Route119_Text_1BE7D3:: @ 81BE7D3 - .string "You’re pretty strong!$" + .string "Du bist ganz schön stark!$" Route119_Text_1BE7E9:: @ 81BE7E9 - .string "Until you go away somewhere, we’ll\n" - .string "keep on mimicking your every move.$" + .string "Solange du hier bist, werden wir jede\n" + .string "deiner Bewegungen nachahmen.$" Route119_Text_1BE82F:: @ 81BE82F - .string "The MIMIC CIRCLE was formed by people\n" - .string "who like to MIMIC.\p" - .string "A battle starts the instant we meet!$" + .string "Der Mimikry-Zirkel wurde von Leuten\n" + .string "gegründet, die die Mimikry lieben.\p" + .string "Der Kampf beginnt, sobald wir aufei-\n" + .string "nander treffen!$" Route119_Text_1BE88D:: @ 81BE88D - .string "I surrender!$" + .string "Ich gebe auf!$" Route119_Text_1BE89A:: @ 81BE89A - .string "Won’t you join our MIMIC CIRCLE?$" + .string "Möchtest du nicht dem Mimikry-Zirkel\n" + .string "beitreten?$" Route119_Text_1BE8BB:: @ 81BE8BB - .string "Who has the knowledge and the\n" - .string "technique for survival?\p" - .string "POKéMON RANGERS, that’s who!$" + .string "Wer besitzt das Wissen und die Technik,\n" + .string "um zu überleben?\p" + .string "Das sind die POKéMON-RANGER!$" Route119_Text_1BE90E:: @ 81BE90E - .string "I didn’t have enough POKéMON\n" - .string "know-how...$" + .string "Ich besitze nicht genügend Wissen über\n" + .string "POKéMON...$" Route119_Text_1BE937:: @ 81BE937 - .string "To break away from civilization and\n" - .string "awaken the wild spirit within!\p" - .string "That’s our vision.$" + .string "Aus der Zivilisation ausbrechen und die\n" + .string "wilde Natur in uns erwecken!\p" + .string "Das ist unsere Vision.$" Route119_Text_1BE98D:: @ 81BE98D - .string "I’m going to regain my wild spirit by\n" - .string "being together with POKéMON.$" + .string "Meine wilde Natur regt sich in mir, wenn\n" + .string "ich mit POKéMON zusammen bin.$" Route119_Text_1BE9D0:: @ 81BE9D0 - .string "You’ve remained strong!$" + .string "Du bist immer noch sehr stark!$" Route119_Text_1BE9E8:: @ 81BE9E8 - .string "Believe in your POKéMON.\n" - .string "Believe in yourself.\p" - .string "The road will reveal itself to you.$" + .string "Glaube an deine POKéMON.\n" + .string "Glaube an dich.\p" + .string "Dein Weg eröffnet sich von selbst.$" Route119_Text_1BEA3A:: @ 81BEA3A - .string "Oh? Look at you.\p" - .string "For someone on an adventure, you’re\n" - .string "traveling awfully light.$" + .string "Oh! Schau dich nur an!\p" + .string "Für einen Abenteurer hast du\n" + .string "sehr leichtes Gepäck dabei!$" Route119_Text_1BEA88:: @ 81BEA88 - .string "Accidents happen when you’re not\n" - .string "prepared!$" + .string "Unfälle passieren immer dann, wenn du\n" + .string "nicht damit rechnest!$" Route119_Text_1BEAB3:: @ 81BEAB3 - .string "You’re traveling light but you have\n" - .string "everything you need.\p" - .string "You’re on top of things mentally and\n" - .string "physically, too.$" + .string "Du hast leichtes Gepäck, aber alles, was\n" + .string "du brauchst dabei.\p" + .string "Du bist an der Spitze deiner geistigen\n" + .string "und körperlichen Kraft angekommen.$" Route119_Text_1BEB22:: @ 81BEB22 - .string "How’s your journey with POKéMON\n" - .string "going?$" + .string "Wie läuft es auf deiner Reise mit den\n" + .string "POKéMON?$" Route119_Text_1BEB49:: @ 81BEB49 - .string "I’m still missing something...$" + .string "Bei mir fehlt irgendetwas...$" Route119_Text_1BEB68:: @ 81BEB68 - .string "In the same way that you, as a TRAINER,\n" - .string "rely on your POKéMON, your POKéMON\l" - .string "rely on you.$" + .string "So wie du als TRAINER deinen POKéMON\n" + .string "vertraust, vertrauen dir deine POKéMON.$" Route119_Text_1BEBC0:: @ 81BEBC0 - .string "The vast sky holds untold promise!\p" - .string "Nothing can compare to the sheer\n" - .string "exhilaration of flight!$" + .string "Die Weiten des Himmels strahlen die Aura\n" + .string "unausgesprochener Versprechen ab.\p" + .string "Nichts ist vergleichbar mit dem\n" + .string "absoluten Glück des Fliegens!$" Route119_Text_1BEC1C:: @ 81BEC1C - .string "Down and out!$" + .string "Abgewürgt und abgestürzt.$" Route119_Text_1BEC2A:: @ 81BEC2A - .string "My BIRD POKéMON made my dreams of\n" - .string "flying come true!$" + .string "Meine VOGEL-POKéMON lassen den Traum\n" + .string "vom Fliegen für mich wahr werden!$" Route119_Text_1BEC5E:: @ 81BEC5E - .string "I’ll show you the true potential of me\n" - .string "and my BIRD POKéMON!$" + .string "Ich zeige dir meine wahre Stärke und\n" + .string "die meiner VOGEL-POKéMON!$" Route119_Text_1BEC9A:: @ 81BEC9A - .string "We lacked potential...$" + .string "Uns fehlt es an Potential...$" Route119_Text_1BECB1:: @ 81BECB1 - .string "Ever since I was a little kid, I always\n" - .string "admired BIRD POKéMON...$" + .string "Schon als kleines Kind habe ich VOGEL-\n" + .string "POKéMON geliebt...$" Route119_Text_1BECF1:: @ 81BECF1 - .string "To lurk in shadows, and live in\n" - .string "darkness... That is my destiny.\p" - .string "I emerge to challenge you!$" + .string "Ich lauere in den Schatten und lebe in\n" + .string "der Dunkelheit... Das ist mein Schicksal.\p" + .string "Ich tauche auf, um dich heraus-\n" + .string "zufordern!$" Route119_Text_1BED4C:: @ 81BED4C - .string "I admit defeat!$" + .string "Ich gestehe meine Niederlage ein.$" Route119_Text_1BED5C:: @ 81BED5C - .string "Those defeated in battle withdraw\n" - .string "quietly back into the shadows.\l" - .string "That, too, is destiny...$" + .string "Die, die im Kampf geschlagen wurden,\n" + .string "verschwinden lautlos in der Dunkelheit.\l" + .string "Auch das ist Schicksal...$" Route119_Text_1BEDB6:: @ 81BEDB6 - .string "If you’re not on your guard, you’re in\n" - .string "for some pain!$" + .string "Wenn du nicht auf deine Deckung auf-\n" + .string "passt, kommt der Schmerz zu dir!$" Route119_Text_1BEDEC:: @ 81BEDEC - .string "You’re surprisingly good!$" + .string "Du bist überraschend gut!$" Route119_Text_1BEE06:: @ 81BEE06 - .string "My surprise attack ended in\n" - .string "failure...$" + .string "Mein Überraschungsangriff endete in\n" + .string "einer Niederlage...$" Route119_Text_1BEE2D:: @ 81BEE2D - .string "To hide a tree, use a forest!$" + .string "Um einen Baum zu verstecken, nutze den\n" + .string "Wald!$" Route119_Text_1BEE4B:: @ 81BEE4B - .string "I bow to your superiority.$" + .string "Ich verneige mich vor deiner Stärke.$" Route119_Text_1BEE66:: @ 81BEE66 - .string "To hide a tree, use a forest!\n" - .string "To hide a POKéMON, use a POKéMON!\p" - .string "There is no deep, hidden meaning\n" - .string "to that.$" + .string "Um einen Baum zu verstecken, nutze den\n" + .string "Wald. Um ein POKéMON zu verstecken,\l" + .string "nutze ein POKéMON!\p" + .string "Dahinter steckt keine tiefere\n" + .string "Bedeutung.$" Route119_Text_1BEED0:: @ 81BEED0 - .string "You spoke to me...\n" - .string "So you want to challenge me!\p" - .string "Sure! I’ll try out the POKéMON I caught\n" - .string "while SURFING!$" + .string "Du hast mich angesprochen...\n" + .string "Also willst du mit mir kämpfen!\p" + .string "Sicher! Ich will das POKéMON einsetzen,\n" + .string "das ich gefangen habe, als ich SURFER\l" + .string "einsetzte.$" Route119_Text_1BEF37:: @ 81BEF37 - .string "I don’t have a clue about what it\n" - .string "takes to win.$" + .string "Ich habe keine Ahnung, was verlangt\n" + .string "wird, um zu gewinnen.$" Route119_Text_1BEF67:: @ 81BEF67 - .string "Go for a SURF on my POKéMON...\p" - .string "Then fish off its back...\p" - .string "It’s an indescribably luxuriant moment!$" + .string "Nutze ein POKéMON als SURFER...\p" + .string "Dann angle von seinem Rücken aus...\p" + .string "Ein äußerst angenehmer Zeitvertreib!$" Route120_Text_1BEFC8:: @ 81BEFC8 - .string "Do you have any moves that can strike\n" - .string "a flying POKéMON?$" + .string "Hast du Attacken auf Lager, die ein\n" + .string "fliegendes POKéMON schlagen können?$" Route120_Text_1BF000:: @ 81BF000 - .string "You soared above me!$" + .string "Du bist mir überlegen!$" Route120_Text_1BF015:: @ 81BF015 - .string "The move FLY is convenient, don’t\n" - .string "you think?\p" - .string "While the POKéMON is flying, almost\n" - .string "no moves can strike it.$" + .string "Die Attacke FLIEGEN ist sehr praktisch,\n" + .string "meinst du nicht auch?\p" + .string "Wenn ein POKéMON fliegt, kann ihm fast\n" + .string "keine Attacke Schaden zufügen.$" Route120_Text_1BF07E:: @ 81BF07E - .string "My POKéMON is strong!\n" - .string "How about yours?$" + .string "Mein POKéMON ist stark!\n" + .string "Wie sieht es mit deinen aus?$" Route120_Text_1BF0A5:: @ 81BF0A5 - .string "Your POKéMON were stronger...$" + .string "Deine POKéMON sind stärker...$" Route120_Text_1BF0C3:: @ 81BF0C3 - .string "A POKéMON that grows steadily is one\n" - .string "you can count on.$" + .string "Ein POKéMON, das beständig wächst, ist\n" + .string "absolut zuverlässig...$" Route120_Text_1BF0FA:: @ 81BF0FA - .string "A POKéMON that grows steadily is one\n" - .string "you can count on.$" + .string "Ein POKéMON, das beständig wächst, ist\n" + .string "absolut zuverlässig...$" Route120_Text_1BF131:: @ 81BF131 - .string "Your POKéMON are seriously strong.$" + .string "Deine POKéMON sind enorm stark.$" Route120_Text_1BF154:: @ 81BF154 - .string "My POKéMON are growing stronger.\n" - .string "I have to grow stronger, too.$" + .string "Meine POKéMON werden immer stärker.\n" + .string "Ich muss auch immer stärker werden.$" Route120_Text_1BF193:: @ 81BF193 - .string "I’ll check your POKéMON and see if\n" - .string "they’re fit for the outdoors.$" + .string "Ich prüfe deine POKéMON und schaue, ob\n" + .string "sie fit für das Leben im Freien sind.$" Route120_Text_1BF1D4:: @ 81BF1D4 - .string "With POKéMON that strong, you’re in\n" - .string "no danger of needing rescue!$" + .string "Mit solch starken POKéMON brauchst du\n" + .string "in der Natur keine Angst zu haben.$" Route120_Text_1BF215:: @ 81BF215 - .string "To travel wherever your heart desires\n" - .string "with POKéMON...\l" - .string "That’s the joy of being a TRAINER.$" + .string "Mit POKéMON dorthin zu reisen, wohin\n" + .string "man auch immer will... Das ist das\l" + .string "Schöne an einem Leben als TRAINER.$" Route120_Text_1BF26E:: @ 81BF26E - .string "How’s your physical fitness?\n" - .string "If you’re not fit, you could have a\l" - .string "rough time in critical situations.$" + .string "Wie sieht es mit deiner Fitness aus?\n" + .string "Wenn du nicht fit bist, könnten \l" + .string "harte Zeiten auf dich zukommen.$" Route120_Text_1BF2D2:: @ 81BF2D2 - .string "I’m totally fit, but...$" + .string "Ich bin fit wie ein Turnschuh, aber...$" Route120_Text_1BF2EA:: @ 81BF2EA - .string "Fitness training is in my routine.\n" - .string "I always run with my POKéMON.$" + .string "Fitnesstraining gehört zu meinem\n" + .string "Leben. Ich laufe mit meinen POKéMON.$" Route120_Text_1BF32B:: @ 81BF32B .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "Want to battle?$" + .string "Kampf gefällig?$" Route120_Text_1BF36B:: @ 81BF36B .string "... ... ... ... ... ...\n" - .string "I lost...$" + .string "Ich habe verloren...$" Route120_Text_1BF38D:: @ 81BF38D .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "I’ll try harder...$" + .string "Muss mich mehr anstrengen...$" Route120_Text_1BF3D0:: @ 81BF3D0 .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "Want to battle again?$" + .string "Noch ein Kampf gefällig?$" Route120_Text_1BF416:: @ 81BF416 .string "... ... ... ... ... ...\n" - .string "I lost again...$" + .string "Ich habe wieder verloren...$" Route120_Text_1BF43E:: @ 81BF43E .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "I’ll try harder...\l" - .string "For my precious BUG POKéMON...$" + .string "Ich werde mich mehr anstrengen...\l" + .string "Für meine kostbaren KÄFER-POKéMON...$" Route120_Text_1BF4A0:: @ 81BF4A0 - .string "POKéMON have many special abilities.\n" - .string "If you want to become a first-class\l" - .string "TRAINER, learn about them.$" + .string "POKéMON haben viele spezielle Fähig-\n" + .string "keiten. Wenn du ein klasse TRAINER\l" + .string "werden willst, lerne etwas darüber.$" Route120_Text_1BF504:: @ 81BF504 - .string "You’re obviously thinking.$" + .string "Du setzt offensichtlich dein Gehirn ein.$" Route120_Text_1BF51F:: @ 81BF51F - .string "The special abilities of POKéMON\n" - .string "will make battle styles change.$" + .string "Die speziellen Fähigkeiten eines\n" + .string "POKéMON bestimmen den Kampfstil.$" Route120_Text_1BF560:: @ 81BF560 - .string "Who might you be?\p" - .string "Are you perhaps searching for ancient\n" - .string "ruins that are rumored to possibly\l" - .string "exist according to legend?$" + .string "Wer magst du sein?\p" + .string "Suchst du etwa nach antiken Ruinen,\n" + .string "von denen die Legende sagt, sie\l" + .string "seien hier zu finden?$" Route120_Text_1BF5D6:: @ 81BF5D6 - .string "What a disgraceful setback...$" + .string "Was für ein erbärmlicher Rückschritt...$" Route120_Text_1BF5F4:: @ 81BF5F4 - .string "That giant rock... I would like to\n" - .string "believe it may indeed contain ancient\l" - .string "ruins. But I see no entrance.$" + .string "Dieser gigantische Felsen... Ich würde\n" + .string "zu gerne glauben, er enthielte antike\l" + .string "Schätze. Aber ich sehe keinen Eingang.$" Route120_Text_1BF65B:: @ 81BF65B - .string "Why am I carrying this parasol?\p" - .string "I’ll tell you if you can win against me.$" + .string "Warum ich diesen Schirm trage?\p" + .string "Das verrate ich dir, wenn du mich\n" + .string "besiegen kannst.$" Route120_Text_1BF6A4:: @ 81BF6A4 - .string "A parasol can’t ward off POKéMON\n" - .string "attacks...$" + .string "Ein Schirm kann nicht vor den Attacken\n" + .string "der POKéMON schützen...$" Route120_Text_1BF6D0:: @ 81BF6D0 - .string "I don’t think strong sunlight is good\n" - .string "for my POKéMON.\l" - .string "So I shield them with my parasol.$" + .string "Ich glaube nicht, dass starkes Sonnen-\n" + .string "licht gut für meine POKéMON ist.\l" + .string "Daher schütze ich sie mit meinem Schirm.$" Route120_Text_1BF728:: @ 81BF728 - .string "Me, POKéMON, and my parasol...\p" - .string "If any one of them is missing, the\n" - .string "picture of beauty will be ruined.$" + .string "Mein Schirm, mein POKéMON und ich...\p" + .string "Würde eines dieser Elemente fehlen,\n" + .string "wäre dieses Bild der Schönheit ruiniert.$" Route120_Text_1BF78C:: @ 81BF78C - .string "You’ve completely ruined my beauty...$" + .string "Du hast das Bild der Schönheit ruiniert!$" Route120_Text_1BF7B2:: @ 81BF7B2 - .string "A parasol wouldn’t suit you at all.\p" - .string "Why, something like this would only\n" - .string "get in your way.$" + .string "Mein Schirm würde dir überhaupt nicht\n" + .string "stehen.\p" + .string "Er wäre dir sogar hinderlich.$" Route120_Text_1BF80B:: @ 81BF80B - .string "I will adopt the movements of POKéMON\n" - .string "and create new ninja techniques.$" + .string "Ich werde die Techniken der POKéMON\n" + .string "übernehmen und neue Ninja-Techniken\l" + .string "daraus entwickeln.$" Route120_Text_1BF852:: @ 81BF852 - .string "The creation of new ninja techniques\n" - .string "is but a distant dream...$" + .string "Die Entwicklung neuer Ninja-Techniken\n" + .string "bleibt ein Traum...$" Route120_Text_1BF891:: @ 81BF891 - .string "Perhaps I ought to apprentice under\n" - .string "a ninja sensei.$" + .string "Vielleicht sollte ich unter einem Ninja-\n" + .string "Meister lernen...$" Route120_Text_1BF8C5:: @ 81BF8C5 - .string "We ninja conceal ourselves under our\n" - .string "camouflage cloaks.\l" - .string "I bet you didn’t know where I was!$" + .string "Wir Ninja verbergen uns unter unseren\n" + .string "Tarnmänteln. Ich wette, du wusstest\l" + .string "nicht, wo ich versteckt war!$" Route120_Text_1BF920:: @ 81BF920 - .string "I lost!\n" - .string "I should camouflage my shame!$" + .string "Ich habe verloren! Ich wünschte, mein\n" + .string "Tarnmantel würde meine Schande tarnen.$" Route120_Text_1BF946:: @ 81BF946 - .string "Our camouflage cloaks are all\n" - .string "handmade.$" + .string "Unsere Tarnmäntel sind alle handge-\n" + .string "arbeitet.$" Route121_Text_1BF96E:: @ 81BF96E - .string "Will you play with my delightfully\n" - .string "pretty POKéMON?$" + .string "Möchtest du mit meinem wunderhübschen\n" + .string "POKéMON spielen?$" Route121_Text_1BF9A1:: @ 81BF9A1 - .string "This isn’t what I meant!$" + .string "So habe ich das aber nicht gemeint!$" Route121_Text_1BF9BA:: @ 81BF9BA - .string "I’m going to a CONTEST in LILYCOVE.\p" - .string "My POKéMON should have no problem\n" - .string "sweeping the MASTER CLASS.$" + .string "Ich gehe zu einem WETTBEWERB in\n" + .string "SEEGRASULB CITY.\p" + .string "Mein POKéMON sollte kein Problem haben,\n" + .string "in der MASTER-KLASSE zu glänzen.$" Route121_Text_1BFA1B:: @ 81BFA1B - .string "With my POKéMON, I have traveled the\n" - .string "world’s four corners.\p" - .string "You might say I have some confidence\n" - .string "in my abilities.$" + .string "Mit meinem POKéMON habe ich alle vier\n" + .string "Ecken der Welt bereist.\p" + .string "Man könnte sagen, dass ich viel\n" + .string "Vertrauen in mein Können habe.$" Route121_Text_1BFA8C:: @ 81BFA8C - .string "Ah, well played.$" + .string "Ah, gut gespielt.$" Route121_Text_1BFA9D:: @ 81BFA9D - .string "I would like to circle the globe once\n" - .string "again with my POKéMON.$" + .string "Ich möchte noch einmal die Welt mit\n" + .string "meinem POKéMON umrunden.$" Route121_Text_1BFADA:: @ 81BFADA - .string "With my POKéMON, I have traveled the\n" - .string "world’s four corners.\p" - .string "You might say I have some confidence\n" - .string "in my abilities.$" + .string "Mit meinem POKéMON habe ich erneut die\n" + .string "vier Ecken der Welt bereist.\p" + .string "Ich habe noch größeres Vertrauen in\n" + .string "meine Fähigkeiten.$" Route121_Text_1BFB4B:: @ 81BFB4B - .string "Ah, well played.$" + .string "Ah, gut gespielt.$" Route121_Text_1BFB5C:: @ 81BFB5C - .string "Your POKéMON and you...\p" - .string "Your prowess together will be\n" - .string "considered strong, even overseas.$" + .string "Deine POKéMON und du...\p" + .string "Eure Fähigkeiten werden auch in\n" + .string "Übersee als außerordentlich angesehen.$" Route121_Text_1BFBB4:: @ 81BFBB4 - .string "There are powers beyond our\n" - .string "understanding in the world...$" + .string "Auf der Welt gibt es Dinge, die jenseits\n" + .string "deines Verständnisses liegen...$" Route121_Text_1BFBEE:: @ 81BFBEE - .string "I have lost...$" + .string "Ich habe verloren...$" Route121_Text_1BFBFD:: @ 81BFBFD - .string "MT. PYRE...\n" - .string "There is a mysterious power\l" - .string "at work there...$" + .string "PYROBERG...\n" + .string "Dort ist eine geheimnisvolle Kraft am\l" + .string "Werk...$" Route121_Text_1BFC36:: @ 81BFC36 - .string "KATE: Together, we’re fearless!\n" - .string "We’ll demonstrate how tough we are!$" + .string "EVA: Zusammen sind wir furchtlos!\n" + .string "Wir demonstrieren dir unsere Stärke!$" Route121_Text_1BFC7A:: @ 81BFC7A - .string "KATE: I blew it in front of my junior\n" - .string "student partner...$" + .string "EVA: Ich habe vor den Augen meiner\n" + .string "Juniorpartnerin versagt...$" Route121_Text_1BFCB3:: @ 81BFCB3 - .string "KATE: When someone’s relying on me,\n" - .string "I get this urge to look cool in front\l" - .string "of them...$" + .string "EVA: Wenn sich jemand auf mich\n" + .string "verlässt, versuche ich ihm gegenüber\l" + .string "immer cool aufzutreten...$" Route121_Text_1BFD08:: @ 81BFD08 - .string "KATE: If you’ve only got one POKéMON,\n" - .string "we can’t battle with you.\p" - .string "That would be bullying.$" + .string "EVA: Wenn du nur ein POKéMON hast,\n" + .string "können wir nicht mit dir kämpfen.\p" + .string "Das wäre äußerst unfair.$" Route121_Text_1BFD60:: @ 81BFD60 - .string "JOY: Together, we’re fearless!\n" - .string "We’ll demonstrate how tough we are!$" + .string "UTE: Zusammen sind wir furchtlos!\n" + .string "Wir demonstrieren dir unsere Stärke!$" Route121_Text_1BFDA3:: @ 81BFDA3 - .string "JOY: Please forgive me, KATE!$" + .string "UTE: Bitte vergib mir, EVA!$" Route121_Text_1BFDC1:: @ 81BFDC1 - .string "JOY: Ehehe, I’ll have to train with KATE,\n" - .string "my senior student partner, again.$" + .string "UTE: Ehehehe, ich muss wohl noch etwas\n" + .string "mit meiner Seniorpartnerin trainieren.$" Route121_Text_1BFE0D:: @ 81BFE0D - .string "JOY: You need at least two POKéMON\n" - .string "if you’re going to challenge us!$" + .string "UTE: Du brauchst mindestens zwei\n" + .string "POKéMON, um gegen uns zu kämpfen.$" Route121_Text_1BFE51:: @ 81BFE51 - .string "Stop! Have a good look at my precious\n" - .string "POKéMON!$" + .string "Stopp! Schau dir meine wunderbaren\n" + .string "POKéMON gut an!$" Route121_Text_1BFE80:: @ 81BFE80 - .string "Oh, how dare you!\n" - .string "Don’t take it so seriously!$" + .string "Oh, wie konntest du nur! Nimm die\n" + .string "Sache doch nicht gleich so ernst!$" Route121_Text_1BFEAE:: @ 81BFEAE - .string "Maybe I’ll go catch more POKéMON at\n" - .string "the SAFARI.$" + .string "Vielleicht werde ich in die SAFARI-ZONE\n" + .string "gehen und mehr POKéMON fangen!$" Route121_Text_1BFEDE:: @ 81BFEDE - .string "My precious POKéMON grew!\n" - .string "Have a good look!$" + .string "Meine wertvollen POKéMON sind ge-\n" + .string "wachsen! Schau mal!$" Route121_Text_1BFF0A:: @ 81BFF0A - .string "Oh, how dare you!\n" - .string "You still won’t take it easy!$" + .string "Oh, du hast es wieder getan!\n" + .string "Du nimmst es wirklich zu ernst!$" Route121_Text_1BFF3A:: @ 81BFF3A - .string "Maybe I’ll go catch more POKéMON at\n" - .string "the SAFARI.$" + .string "Ich werde wohl wieder in die SAFARI-\n" + .string "ZONE gehen und POKéMON fangen.$" Route123_Text_1BFF6A:: @ 81BFF6A - .string "Want to determine how strong you are?\n" - .string "I’ll be the test!$" + .string "Möchtest du wissen, wie stark du bist?\n" + .string "Ich werde dich testen!$" Route123_Text_1BFFA2:: @ 81BFFA2 - .string "You passed with flying colors!$" + .string "Du hast glänzend abgeschnitten!$" Route123_Text_1BFFC1:: @ 81BFFC1 - .string "To best even me...\n" - .string "Your strength is marvelous!$" + .string "Um gegen mich bestehen zu können...\n" + .string "Deine Stärke ist einfach unglaublich!$" Route123_Text_1BFFF0:: @ 81BFFF0 - .string "You seem to have a big collection\n" - .string "of GYM BADGES.\p" - .string "Let me see if you’re actually worthy of\n" - .string "those BADGES!$" + .string "Du hast da aber eine große Sammlung an\n" + .string "ORDEN der verschiedenen ARENEN!\p" + .string "Zeig mir, dass du diese ORDEN auch\n" + .string "zu Recht trägst!$" Route123_Text_1C0057:: @ 81C0057 - .string "Oh, you’re worthy, all right!$" + .string "Oh, du bist ihrer würdig, wirklich!$" Route123_Text_1C0075:: @ 81C0075 - .string "You did your BADGES proud in that\n" - .string "match!$" + .string "Du wurdest deinen ORDEN in diesem\n" + .string "Kampf mehr als gerecht.$" Route123_Text_1C009E:: @ 81C009E - .string "They say that good times are filled\n" - .string "with good aromas.$" + .string "Man sagt, dass gute Zeiten auch mit\n" + .string "guten Aromen erfüllt sind.$" Route123_Text_1C00D4:: @ 81C00D4 - .string "Oh...\n" - .string "I smell the bitter scent of misery...$" + .string "Oh... Ich rieche den bitteren Geruch\n" + .string "der Niederlage...$" Route123_Text_1C0100:: @ 81C0100 - .string "The BERRY MASTER’s garden is filled\n" - .string "with uplifting fragrances.$" + .string "Der Garten des BEERENMEISTERS ist\n" + .string "erfüllt mit den erhebendsten Aromen.$" Route123_Text_1C013F:: @ 81C013F - .string "Being a psychic is about willpower.\p" - .string "I’ve willed myself not to lose to\n" - .string "anyone. That makes me strong!$" + .string "Ein Psycho zu sein ist eine Frage des\n" + .string "Willens.\p" + .string "Mein Wille will gegen niemanden verlieren.\n" + .string "Das macht mich stark.$" Route123_Text_1C01A3:: @ 81C01A3 - .string "I feel sad...$" + .string "Mir ist schlecht...$" Route123_Text_1C01B1:: @ 81C01B1 - .string "Being a psychic is about willpower.\n" - .string "I thought I wouldn’t lose to you...$" + .string "Es ist alles eine Frage des Willens. Ich\n" + .string "dachte, ich würde gegen dich gewinnen.$" Route123_Text_1C01F9:: @ 81C01F9 - .string "I’ve convinced myself that I won’t\n" - .string "lose anymore. That makes me strong!$" + .string "Ich habe mich selbst davon überzeugt,\n" + .string "dass ich einfach nicht verlieren werde.$" Route123_Text_1C0240:: @ 81C0240 - .string "I feel sad...$" + .string "So überzeugend war das gar nicht...$" Route123_Text_1C024E:: @ 81C024E - .string "I should train at MT. PYRE...\n" - .string "I’ll never beat you this way...$" + .string "Ich sollte am PYROBERG trainieren...\n" + .string "So werde ich dich nie schlagen...$" Route123_Text_1C028C:: @ 81C028C - .string "Don’t be too happy if your POKéMON\n" - .string "develop psychic powers.\p" - .string "You need to refine those powers to\n" - .string "make them really useful.$" + .string "Sei nicht zu erfreut, wenn deine\n" + .string "POKéMON Psychokräfte entwickeln.\p" + .string "Du musst diese Kräfte modellieren,\n" + .string "um sie sinnvoll einsetzen zu können.$" Route123_Text_1C0303:: @ 81C0303 - .string "Astounding!$" + .string "Erstaunlich!$" Route123_Text_1C030F:: @ 81C030F - .string "We all have psychic powers.\n" - .string "We’ve just forgotten how to use them.$" + .string "Wir alle besitzen Psychokräfte. Wir\n" + .string "haben nur vergessen, sie zu nutzen.$" Route123_Text_1C0351:: @ 81C0351 - .string "Have you awoken the psychic powers\n" - .string "within you?$" + .string "Hast du die Psychokräfte in dir\n" + .string "erweckt?$" Route123_Text_1C0380:: @ 81C0380 - .string "Astounding!$" + .string "Erstaunlich!$" Route123_Text_1C038C:: @ 81C038C - .string "Your power with POKéMON...\n" - .string "That could be a psychic power, too.$" + .string "Dein Einfluss auf deine POKéMON...\n" + .string "Auch das sind Psychokräfte.$" Route123_Text_1C03CB:: @ 81C03CB - .string "MIU: Hello, TRAINER. I hope your\n" - .string "POKéMON won’t cry when they lose.$" + .string "LEA: Hallo, TRAINER. Ich hoffe, deine\n" + .string "POKéMON fangen nicht an zu weinen,\l" + .string "wenn sie verlieren.$" Route123_Text_1C040E:: @ 81C040E - .string "MIU: Uh-oh, we lost.$" + .string "LEA: Oh oh, wir haben verloren.$" Route123_Text_1C0423:: @ 81C0423 - .string "MIU: TRAINER, your POKéMON are\n" - .string "strong because you are friends.$" + .string "LEA: TRAINER, deine POKéMON sind stark,\n" + .string "weil ihr eine starke Freundschaft teilt.$" Route123_Text_1C0462:: @ 81C0462 - .string "MIU: It’s no fun to battle if you\n" - .string "don’t have two POKéMON.$" + .string "LEA: Es macht keinen Spaß, wenn du\n" + .string "weniger als zwei POKéMON hast.$" Route123_Text_1C049C:: @ 81C049C - .string "YUKI: Okay!\n" - .string "We’re beating the TRAINER’s POKéMON!$" + .string "GRIT: Okay!\n" + .string "Wir schlagen die POKéMON des TRAINERS.$" Route123_Text_1C04CD:: @ 81C04CD - .string "YUKI: Uh-oh, we lost.$" + .string "GRIT: Oh oh. Wir haben verloren...$" Route123_Text_1C04E3:: @ 81C04E3 - .string "YUKI: Why are you so strong?\n" - .string "We’ve never lost before.$" + .string "GRIT: Wieso bist du so stark?\n" + .string "Wir haben bisher noch nie verloren!$" Route123_Text_1C0519:: @ 81C0519 - .string "YUKI: It’s no fun to battle if you\n" - .string "don’t have two POKéMON.$" + .string "GRIT: Es macht keinen Spaß, wenn du\n" + .string "weniger als zwei POKéMON hast.$" Route123_Text_1C0554:: @ 81C0554 - .string "MT. PYRE...\n" - .string "Where the spirits of POKéMON sleep...\l" - .string "Will your POKéMON sleep?$" + .string "PYROBERG...\n" + .string "Wo die Geister der POKéMON ruhen...\l" + .string "Ruhen deine POKéMON auch?$" Route123_Text_1C059F:: @ 81C059F - .string "Overflowing with vitality...$" + .string "Überschäumend mit Leben...$" Route123_Text_1C05BC:: @ 81C05BC - .string "MT. PYRE...\n" - .string "Where the spirits of POKéMON sleep...\p" - .string "It must overflow with a power that\n" - .string "soothes spirits...$" + .string "PYROBERG...\n" + .string "Wo die Geister der POKéMON ruhen...\p" + .string "Dort muss es eine Kraft geben, die die\n" + .string "Geister beruhigt...$" Route124_Text_1C0624:: @ 81C0624 - .string "Hey, are you lost at sea?\p" - .string "If you can beat my POKéMON, I can\n" - .string "serve as your pilot.$" + .string "Hey, hast du etwa auf dem Meer die\n" + .string "Orientierung verloren?\p" + .string "Wenn du meine POKéMON besiegst, zeige\n" + .string "ich dir den richtigen Weg.$" Route124_Text_1C0675:: @ 81C0675 - .string "I lost my bearings in battle!$" + .string "Ich habe die Orientierung verloren...$" Route124_Text_1C0693:: @ 81C0693 - .string "Many people lose their bearings at sea.\p" - .string "If you’re that sort, you should refer\n" - .string "to the POKéNAV’s MAP.$" + .string "Viele Menschen verlieren auf dem Meer\n" + .string "die Orientierung.\p" + .string "Wenn du zu denen gehörst, solltest du\n" + .string "die KARTE des POKéNAV zu Hilfe nehmen.$" Route124_Text_1C06F7:: @ 81C06F7 - .string "Hm! You’re riding a POKéMON instead\n" - .string "of swimming yourself...\p" - .string "I am envious!$" + .string "Hm! Du sitzt auf einem POKéMON anstatt\n" + .string "selbst zu schwimmen...\p" + .string "Ich bin richtig neidisch!$" Route124_Text_1C0741:: @ 81C0741 .string "Oh!\n" - .string "I can’t...$" + .string "Ich kann doch nicht...$" Route124_Text_1C0750:: @ 81C0750 - .string "I’m getting chilled...\n" - .string "I’ve been in the water too long...\p" - .string "I wish I could ride a POKéMON like you...$" + .string "Langsam bekomme ich eine Gänsehaut.\n" + .string "Ich bin schon zu lange im Wasser.\p" + .string "Ich wollte, ich könnte auf einem\n" + .string "POKéMON reiten. So wie du!$" Route124_Text_1C07B4:: @ 81C07B4 - .string "If you just float in the sea like\n" - .string "this, POKéMON come around to play.$" + .string "Wenn du dich einfach nur im Meer treiben\n" + .string "lässt, kommen POKéMON, um zu spielen.$" Route124_Text_1C07F9:: @ 81C07F9 - .string "Oh...\n" - .string "Lost at sea...$" + .string "Oh.\n" + .string "Verschollen auf hoher See...$" Route124_Text_1C080E:: @ 81C080E - .string "While swimming, I noticed that some\n" - .string "POKéMON attack, and some just watch.\p" - .string "I guess POKéMON have personalities\n" - .string "of their own.$" + .string "Ich habe beim Schwimmen festgestellt,\n" + .string "dass einige POKéMON angreifen und\l" + .string "manche einen nur beobachten.\p" + .string "Ich glaube, POKéMON haben unter-\n" + .string "schiedliche Persönlichkeiten.$" Route124_Text_1C0888:: @ 81C0888 - .string "If you just float in the sea like this,\n" - .string "TRAINERS challenge you!$" + .string "Wenn du dich hier treiben lässt, triffst\n" + .string "du auf TRAINER, die kämpfen wollen.$" Route124_Text_1C08C8:: @ 81C08C8 - .string "That’s strange...\n" - .string "I lost again...$" + .string "Das ist sehr merkwürdig...\n" + .string "Ich habe schon wieder verloren...$" Route124_Text_1C08EA:: @ 81C08EA - .string "This has nothing to do with anything,\n" - .string "but maybe I’ll visit the TRICK HOUSE.$" + .string "Das hat zwar nichts damit zu tun, aber\n" + .string "ich glaube, ich besuche das RÄTSELHAUS.$" Route124_Text_1C0936:: @ 81C0936 - .string "I’m growing bored of swimming...\n" - .string "How about a battle?$" + .string "Ich fange an, mich beim Schwimmen zu\n" + .string "langweilen. Wie wär’s mit einem Kampf?$" Route124_Text_1C096B:: @ 81C096B - .string "I had no idea that you were\n" - .string "this strong!$" + .string "Ich hatte ja keine Ahnung, dass du so\n" + .string "stark bist!$" Route124_Text_1C0994:: @ 81C0994 - .string "All the effort you put in must have\n" - .string "made you this strong.$" + .string "Alles was du bisher erreicht hast, hat\n" + .string "dich so stark werden lassen.$" Route124_Text_1C09CE:: @ 81C09CE - .string "Fufufufu... I dive deep underwater\n" - .string "to go deep under cover.\l" - .string "Plumbing the depths is where I excel!$" + .string "Hähähä... Ich tauche tief hinab, um mich\n" + .string "tief und sicher zu verstecken.\l" + .string "Die Tiefen auszuloten ist meine Mission.$" Route124_Text_1C0A2F:: @ 81C0A2F - .string "Glub, glub, glub...\n" - .string "I’m sinking...$" + .string "Blubb, blubb, blubb...\n" + .string "So saufe ich ab...$" Route124_Text_1C0A52:: @ 81C0A52 - .string "I have it on good authority that\n" - .string "there’s a DIVE spot around here.\p" - .string "It gives me the urge to go deep\n" - .string "again...$" + .string "Aus zuverlässiger Quelle weiß ich, dass\n" + .string "es hier in der Nähe einen Platz zum\l" + .string "TAUCHEN gibt.\p" + .string "Das gibt mir das Verlangen, mich tief\n" + .string "fallen zu lassen...$" Route124_Text_1C0ABD:: @ 81C0ABD - .string "RITA: Sigh...\p" - .string "Here I am in the sea, but who’s with me?\n" - .string "My little brother!\p" - .string "Let’s battle so I won’t have to dwell\n" - .string "on that!$" + .string "UTA: Seufz...\p" + .string "Ich bin hier im Meer, aber wer ist bei\n" + .string "mir? Mein kleiner Bruder!\p" + .string "Lass uns kämpfen, dann brauche ich\n" + .string "nicht darüber nachzudenken.$" Route124_Text_1C0B36:: @ 81C0B36 - .string "RITA: SAM! It’s your fault we lost!\n" - .string "You’re in for it later!$" + .string "UTA: TOM! Es ist deine Schuld, dass wir\n" + .string "verloren haben! Das wirst du mir büßen!$" Route124_Text_1C0B72:: @ 81C0B72 - .string "RITA: Sigh...\p" - .string "If only it wasn’t my little brother\n" - .string "next to me, but a nice boyfriend...$" + .string "UTA: Seufz...\p" + .string "Wenn anstelle meines kleinen\n" + .string "Bruders ein hübscher Freund hier wäre...$" Route124_Text_1C0BC8:: @ 81C0BC8 - .string "RITA: You’re planning to battle us?\n" - .string "Not unless you have more POKéMON.$" + .string "UTA: Du willst gegen uns antreten?\n" + .string "Dann brauchst du aber mehr POKéMON.$" Route124_Text_1C0C0E:: @ 81C0C0E - .string "SAM: My big sister is tough at POKéMON!\p" - .string "Don’t cry when you lose!$" + .string "TOM: Meine Schwester ist stark!\p" + .string "Heul bloß nicht, wenn du verlierst!$" Route124_Text_1C0C4F:: @ 81C0C4F - .string "SAM: Uh-oh...\n" - .string "My big sister will chew me out...$" + .string "TOM: Oh oh...\n" + .string "Meine Schwester wird mich fressen...$" Route124_Text_1C0C7F:: @ 81C0C7F - .string "SAM: My big sister is really scary\n" - .string "when she gets angry.\p" - .string "That’s why she doesn’t have a\n" - .string "boyfriend.$" + .string "TOM: Meine Schwester wird richtig\n" + .string "unheimlich, wenn sie wütend ist.\p" + .string "Daher hat sie auch noch keinen Freund.$" Route124_Text_1C0CE0:: @ 81C0CE0 - .string "SAM: Did you want to battle us?\n" - .string "Bring some more POKéMON, then.$" + .string "TOM: Willst du gegen uns antreten?\n" + .string "Dann bring mehr POKéMON mit.$" Route124_Text_1C0D1F:: @ 81C0D1F - .string "RITA: Sigh...\p" - .string "Here I am in the sea, but who’s with me?\n" - .string "My little brother!\p" - .string "Oh, hi, it’s been a while. Let’s battle\n" - .string "so I won’t have to dwell on things!$" + .string "UTA: Megaseufz... Ich bin hier mitten\n" + .string "im Meer.\p" + .string "Und mit wem? Meinem kleinen Bruder!\n" + .string "Oh, dich habe ich lange nicht gesehen.\p" + .string "Lass uns kämpfen, dann muss ich nicht\n" + .string "länger über die Situation nachdenken.$" Route124_Text_1C0DB5:: @ 81C0DB5 - .string "RITA: SAM!\n" - .string "It’s your fault we lost again!\p" - .string "We’re having a training session later!$" + .string "UTA: TOM!!! Du hast schon wieder für\n" + .string "eine Niederlage gesorgt!\p" + .string "Ich werde dir gleich eine Lektion\n" + .string "erteilen!$" Route124_Text_1C0E06:: @ 81C0E06 - .string "RITA: Sigh...\p" - .string "If I had a nice boyfriend, we’d beat\n" - .string "anyone with lovely combinations...$" + .string "UTA: Seeeuuufz...\p" + .string "Wenn ich einen netten Freund hätte,\n" + .string "würden wir alle in Kombination schlagen.$" Route124_Text_1C0E5C:: @ 81C0E5C - .string "RITA: You’re planning to battle us?\n" - .string "Not unless you have more POKéMON.$" + .string "UTA: Du willst gegen uns antreten?\n" + .string "Dann bring mehr POKéMON mit.$" Route124_Text_1C0EA2:: @ 81C0EA2 - .string "SAM: If we lose, I’ll catch heck.\n" - .string "I’m going to go totally all out!$" + .string "TOM: Wenn wir verlieren, stecke ich tief\n" + .string "in der Klemme. Dann flippe ich aus!$" Route124_Text_1C0EE5:: @ 81C0EE5 - .string "SAM: Uh-oh...\n" - .string "My big sister will chew me out again.$" + .string "TOM: Oh oh...\n" + .string "Meine Schwester wird mich umbringen...$" Route124_Text_1C0F19:: @ 81C0F19 - .string "SAM: My big sister is really scary\n" - .string "when she gets angry.\p" - .string "She’s going to make me train really\n" - .string "hard with POKéMON later...$" + .string "TOM: Meine Schwester ist bizarr und\n" + .string "Furcht erregend, wenn sie wütend ist.\p" + .string "Sie wird mich später hart mit den\n" + .string "POKéMON trainieren lassen...$" Route124_Text_1C0F90:: @ 81C0F90 - .string "SAM: Did you want to battle us?\n" - .string "Bring some more POKéMON, then.$" + .string "TOM: Willst du gegen uns antreten?\n" + .string "Dann bring mehr POKéMON mit.$" Route125_Text_1C0FCF:: @ 81C0FCF - .string "I heard you approaching, so I hung\n" - .string "around for you!$" + .string "Ich habe dich kommen hören und\n" + .string "hier auf dich gewartet.$" Route125_Text_1C1002:: @ 81C1002 - .string "I beg for peace!$" + .string "Ich bitte um Frieden!$" Route125_Text_1C1013:: @ 81C1013 - .string "Sound travels faster in water than\n" - .string "it does through air.$" + .string "Der Schall bewegt sich im Wasser\n" + .string "schneller als in der Luft.$" Route125_Text_1C104B:: @ 81C104B - .string "Hey, there!\n" - .string "Check out my sweet POKéMON!$" + .string "Hey, du!\n" + .string "Schau dir mein süßes POKéMON an!$" Route125_Text_1C1073:: @ 81C1073 - .string "I floundered...$" + .string "Da habe ich aber rumgewurstelt...$" Route125_Text_1C1083:: @ 81C1083 - .string "I was blown away by HORSEA’s charm,\n" - .string "so I started swimming, too.$" + .string "SEEPERS Charme hat mich gefangen, so\n" + .string "habe ich angefangen zu schwimmen.$" Route125_Text_1C10C3:: @ 81C10C3 - .string "I’m tired of swimming.\n" - .string "Are you up for a battle with me?$" + .string "Das Schwimmen hat mich ermüdet.\n" + .string "Willst du mit mir kämpfen?$" Route125_Text_1C10FB:: @ 81C10FB - .string "You’re too much!$" + .string "Du bist mir eine Nummer zu groß.$" Route125_Text_1C110C:: @ 81C110C - .string "Whew...\n" - .string "Which way is it to MOSSDEEP CITY?$" + .string "Huuh... Wo geht es denn hier\n" + .string "nach MOOSBACH CITY?$" Route125_Text_1C1136:: @ 81C1136 - .string "How would you like to take on the\n" - .string "WATER-type POKéMON I raised?$" + .string "Wie willst du gegen meine WASSER-\n" + .string "POKéMON ankommen?$" Route125_Text_1C1175:: @ 81C1175 - .string "I lost...$" + .string "Ich habe verloren...$" Route125_Text_1C117F:: @ 81C117F - .string "Your power... You’re the real deal.\n" - .string "I’m amazed!$" + .string "Deine Kraft... Absolut unglaublich.\n" + .string "Ich bin begeistert!$" Route125_Text_1C11AF:: @ 81C11AF - .string "Ahoy! I’m a buff, tough SAILOR!\n" - .string "I’ve braved the world’s seas!$" + .string "Ahoi! Ich bin ein raubeiniger MATROSE!\n" + .string "Ich habe die Weltmeere umsegelt.$" Route125_Text_1C11ED:: @ 81C11ED - .string "Gwrroooar!\n" - .string "I couldn’t win!$" + .string "Grrrrooooaaar!\n" + .string "Ich konnte unmöglich gewinnen!$" Route125_Text_1C1208:: @ 81C1208 - .string "The tide ebbs and flows inside the\n" - .string "SHOAL CAVE.\p" - .string "By the way, it’s about six hours from\n" - .string "high tide to low tide. Did you know?$" + .string "Die Flut kommt und geht in der\n" + .string "KÜSTENHÖHLE.\p" + .string "Wusstest du eigentlich, dass zwischen\n" + .string "Flut und Ebbe immer 6 Stunden liegen?$" Route125_Text_1C1282:: @ 81C1282 - .string "It’s high time I get my payback\n" - .string "from you! Come on, we’re battling!$" + .string "Jetzt läuft die Flut ein und für dich ist\n" + .string "Zahltag! Komm, wir kämpfen.$" Route125_Text_1C12C5:: @ 81C12C5 - .string "I couldn’t win!\n" - .string "I flat out couldn’t win!$" + .string "Ich konnte nicht gewinnen!\n" + .string "Die Flut hat mich davongetragen!$" Route125_Text_1C12EE:: @ 81C12EE - .string "The SHOAL CAVE...\p" - .string "There are places you can and can’t\n" - .string "get to depending on the rise and fall\l" - .string "of the tide.\p" - .string "By the way, it’s about six hours from\n" - .string "high tide to low tide. Don’t forget!$" + .string "Die KÜSTENHÖHLE...\p" + .string "Es gibt Orte, die sind mal erreichbar und\n" + .string "mal nicht. Ganz abhängig von Ebbe\l" + .string "und Flut.\p" + .string "Übrigens: Vergiss nicht, dass zwischen\n" + .string "Flut und Ebbe sechs Stunden liegen!$" Route125_Text_1C13A1:: @ 81C13A1 - .string "KIM: A funny old man lives in the\n" - .string "SHOAL CAVE. Someone told me.\l" - .string "Are you going to see him, too?$" + .string "ZOE: Ein lustiger alter Mann lebt in der\n" + .string "KÜSTENHÖHLE. Das hat mir jemand\l" + .string "erzählt. Willst du ihn auch besuchen?$" Route125_Text_1C13FF:: @ 81C13FF - .string "KIM: I thought we would win.$" + .string "ZOE: Ich dachte, wir könnten gewinnen.$" Route125_Text_1C141C:: @ 81C141C - .string "KIM: A funny old man lives in the\n" - .string "SHOAL CAVE, doesn’t he?\p" - .string "Let’s go see him, IRIS!$" + .string "ZOE: Ein lustiger alter Mann lebt in der\n" + .string "KÜSTENHÖHLE, stimmt’s?\p" + .string "Komm, IRIS, wir besuchen ihn.$" Route125_Text_1C146E:: @ 81C146E - .string "KIM: No, no, no! You need two POKéMON,\n" - .string "or it’s just no good!$" + .string "ZOE: Nein, nein, nein! Du brauchst zwei\n" + .string "POKéMON oder es funktioniert nicht!$" Route125_Text_1C14AB:: @ 81C14AB - .string "IRIS: KIM, can you tell me what we’re\n" - .string "looking for out here?$" + .string "IRIS: ZOE, kannst du mir verraten, was\n" + .string "wir hier draußen überhaupt wollen?$" Route125_Text_1C14E7:: @ 81C14E7 - .string "IRIS: Oh, we came sort of close.$" + .string "IRIS: Oh, wir waren so nah dran.$" Route125_Text_1C1508:: @ 81C1508 - .string "IRIS: KIM, are we really going into\n" - .string "the SHOAL CAVE?\l" - .string "We’ll get all wet.$" + .string "IRIS: ZOE, gehen wir wirklich zur\n" + .string "KÜSTENHÖHLE?\l" + .string "Dann werden wir ja ganz nass.$" Route125_Text_1C154F:: @ 81C154F - .string "IRIS: Oh, we could never, ever do\n" - .string "anything like a 2-on-1 battle.$" + .string "IRIS: Oh, wir würden niemals einen\n" + .string "2-gegen-1-Kampf ausfechten! Niemals!$" Route126_Text_1C1590:: @ 81C1590 - .string "Swimming is a full-body workout!\n" - .string "You will get fit!$" + .string "Schwimmen verlangt vollen Körperein-\n" + .string "satz. Und so wird man fit!$" Route126_Text_1C15C3:: @ 81C15C3 - .string "I admit it! You win!$" + .string "Ich gebe es zu! Du hast gewonnen!$" Route126_Text_1C15D8:: @ 81C15D8 - .string "Thanks to my daily swimming routine...\n" - .string "Look! Feast your eyes on this physique!$" + .string "Dank meiner täglichen Schwimmrunden...\n" + .string "Guck mal! Schau dir diesen Körperbau an!$" Route126_Text_1C1627:: @ 81C1627 - .string "This towering white mountain of rock\n" - .string "is SOOTOPOLIS CITY.$" + .string "Dieser hohe weiße Berg dort ist\n" + .string "XENEROVILLE.$" Route126_Text_1C1660:: @ 81C1660 - .string "I was done in?$" + .string "Wie, das war’s schon?$" Route126_Text_1C166F:: @ 81C166F - .string "I can’t find the entrance to\n" - .string "SOOTOPOLIS. Where could it be?$" + .string "Ich kann den Eingang zu XENEROVILLE\n" + .string "nicht finden. Wo kann er sein?$" Route126_Text_1C16AB:: @ 81C16AB - .string "Ufufufufu!\n" - .string "I’m a mermaid!$" + .string "Hihihihihi!\n" + .string "Ich bin eine Meerjungfrau!$" Route126_Text_1C16C5:: @ 81C16C5 - .string "My fantasy burst as if it were a bubble!\n" - .string "Blub, blub, blub...$" + .string "Mein Traum platzt wie Seifenblasen!\n" + .string "Plopp, plopp, plopp...$" Route126_Text_1C1702:: @ 81C1702 - .string "You thrashed me... I want to\n" - .string "disappear in a wave of despair...$" + .string "Du hast mich geschlagen... Ich möchte im\n" + .string "Meer der Verzweiflung untergehen...$" Route126_Text_1C1741:: @ 81C1741 - .string "Hello, kiddo!\n" - .string "Want a battle with me?$" + .string "Hallo, Kindchen!\n" + .string "Willst du gegen mich antreten?$" Route126_Text_1C1766:: @ 81C1766 - .string "Oh, noooooh!$" + .string "Oh, neeeiiin!$" Route126_Text_1C1773:: @ 81C1773 - .string "I love frolicking with POKéMON in\n" - .string "the sea like this!$" + .string "Ich liebe es, einfach so mit meinen \n" + .string "POKéMON im Meer abzuhängen!$" Route127_Text_1C17A8:: @ 81C17A8 - .string "I can see it in your face. You want\n" - .string "to challenge me.$" + .string "Ich sehe es dir an. Du willst mich\n" + .string "herausfordern!$" Route127_Text_1C17DD:: @ 81C17DD - .string "Awawawawawa...$" + .string "Auauauauahahaha!$" Route127_Text_1C17EC:: @ 81C17EC - .string "A well-played match leaves me feeling\n" - .string "refreshed and serene.$" + .string "Ein gut gespieltes Match lässt immer ein\n" + .string "frisches und heiteres Gefühl zurück.$" Route127_Text_1C1828:: @ 81C1828 - .string "Do you have a rival whom you just\n" - .string "hate to lose against?$" + .string "Hast du auch einen Rivalen, gegen den\n" + .string "du es hasst zu verlieren?$" Route127_Text_1C1860:: @ 81C1860 - .string "Arrrgh! I hate losing!$" + .string "Aaargh! Ich hasse es, zu verlieren!$" Route127_Text_1C1877:: @ 81C1877 - .string "If you have a rival, don’t you get the\n" - .string "feeling that you have to keep getting\l" - .string "better?$" + .string "Wenn du einen Rivalen hast, willst du\n" + .string "dann nicht auch immer besser werden?$" Route127_Text_1C18CC:: @ 81C18CC - .string "Through fishing, I have attained a\n" - .string "state of becalmed serenity...\l" - .string "Please, allow me to demonstrate...$" + .string "Durch das Angeln habe ich eine\n" + .string "gelassene Heiterkeit entwickelt...\l" + .string "Bitte lass mich sie dir zeigen...$" Route127_Text_1C1930:: @ 81C1930 - .string "Though I have lost, my heart remains\n" - .string "calm...$" + .string "Auch wenn ich verloren habe, so bleibt\n" + .string "mein Herz doch ruhig...$" Route127_Text_1C195D:: @ 81C195D - .string "It matters not that I catch nothing.\n" - .string "The line remains in the water...$" + .string "Es macht nichts, wenn ich nichts fange.\n" + .string "Die Schnur bleibt im Wasser.$" Route127_Text_1C19A3:: @ 81C19A3 - .string "Whoops! Don’t tell me I snagged\n" - .string "a SURFING POKéMON?$" + .string "Hups! Jetzt sag nicht, dass ich ein\n" + .string "SURFENDES POKéMON am Haken habe?$" Route127_Text_1C19D6:: @ 81C19D6 - .string "I can’t keep up!$" + .string "Ich kann so nicht weitermachen!$" Route127_Text_1C19E7:: @ 81C19E7 - .string "Your POKéMON look pretty strong.\n" - .string "They’d be a handful if I hooked them!$" + .string "Deine POKéMON sehen stark aus! Und\n" + .string "doch wären sie nur ein Häppchen, wenn\l" + .string "ich sie als Köder am Haken hätte.$" Route127_Text_1C1A2E:: @ 81C1A2E - .string "Well, hey! This is a match between a\n" - .string "POKéMON fan and a fishing buff!$" + .string "Nun! Das ist ein Kampf zwischen einem\n" + .string "POKéMON-Fan und einem Angel-Fan.$" Route127_Text_1C1A73:: @ 81C1A73 - .string "No! My line’s all tangled!\n" - .string "The party’s over!$" + .string "Nein! Meine Schnur hat sich verheddert.\n" + .string "Die Party ist vorbei!$" Route127_Text_1C1AA0:: @ 81C1AA0 - .string "My fishing line’s doing a dance!\n" - .string "The tangle tango! Hahaha, snarl!$" + .string "Meine Angelschnur tanzt im Wasser!\n" + .string "Sie tanzt Tango! Hahahah, hiiiks!$" Route127_Text_1C1AE2:: @ 81C1AE2 - .string "What I learned at DEWFORD’s POKéMON\n" - .string "GYM, I will put into practice here.$" + .string "Das, was ich in der ARENA von\n" + .string "FAUSTAUHAVEN gelernt habe,\l" + .string "wende ich jetzt an.$" Route127_Text_1C1B2A:: @ 81C1B2A - .string "I was swamped!$" + .string "Ich wurde weggeschwemmt.$" Route127_Text_1C1B39:: @ 81C1B39 - .string "BRAWLY, DEWFORD’s GYM LEADER, used\n" - .string "to train with a guy named BRUNO in\l" - .string "KANTO, I’ve heard.$" + .string "KAMILLO, der ARENALEITER von\n" + .string "FAUSTAUHAVEN, soll mit einem Typen\l" + .string "namens BRUNO in KANTO trainiert haben.$" Route127_Text_1C1B92:: @ 81C1B92 - .string "BIRD POKéMON have excellent vision.\n" - .string "They spot prey from great heights.$" + .string "VOGEL-POKéMON haben exzellente Augen.\n" + .string "Sie erspähen Beute aus großer Höhe.$" Route127_Text_1C1BD9:: @ 81C1BD9 - .string "Whew... I give up.$" + .string "Huuh... Ich gebe auf.$" Route127_Text_1C1BEC:: @ 81C1BEC - .string "There’re lots of diving spots in the\n" - .string "sea around here.\p" - .string "You can spot them easily from the sky\n" - .string "because of their darker color.$" + .string "Hier gibt es viele Plätze, an denen man\n" + .string "sehr gut tauchen kann.\p" + .string "Aus der Luft sind sie leicht zu\n" + .string "erkennen, da sie dunkler sind.$" Route128_Text_1C1C67:: @ 81C1C67 - .string "EVER GRANDE CITY is still a long ways\n" - .string "away...$" + .string "PRACHTPOLIS CITY ist weit entfernt...$" Route128_Text_1C1C95:: @ 81C1C95 - .string "My first victory seems to be far\n" - .string "away, too...$" + .string "Mein erster Sieg scheint weit entfernt\n" + .string "zu sein...$" Route128_Text_1C1CC3:: @ 81C1CC3 - .string "My whole life has been about losing,\n" - .string "but I will never give up!$" + .string "Mein ganzes Leben ist eine einzige\n" + .string "Niederlage, aber ich gebe nicht auf!$" Route128_Text_1C1D02:: @ 81C1D02 - .string "I’m still feeling good. I’ll keep on\n" - .string "swimming to EVER GRANDE CITY.$" + .string "Ich fühle mich gut. Ich werde weiter\n" + .string "Richtung PRACHTPOLIS CITY schwimmen.$" Route128_Text_1C1D45:: @ 81C1D45 - .string "I’ve yet to taste my first victory...$" + .string "Ich möchte sehr gerne einmal vom Sieg\n" + .string "kosten...$" Route128_Text_1C1D6B:: @ 81C1D6B - .string "I’ll eventually reach EVER GRANDE CITY\n" - .string "where I can eventually win...$" + .string "Ich werde PRACHTPOLIS CITY eventuell\n" + .string "erreichen und dort eventuell gewinnen...$" Route128_Text_1C1DB0:: @ 81C1DB0 - .string "You have to swim, cycle, and then run\n" - .string "a marathon in a triathlon.\p" - .string "It’s a grueling race that consists\n" - .string "of three events.$" + .string "In einem Triathlon musst du schwimmen,\n" + .string "Rad fahren und einen Marathon laufen.\p" + .string "Es ist ein mörderisches Rennen, das aus\n" + .string "drei Disziplinen besteht.$" Route128_Text_1C1E25:: @ 81C1E25 - .string "A POKéMON battle is grueling, too...$" + .string "Ein POKéMON-Kampf ist auch mörderisch.$" Route128_Text_1C1E4A:: @ 81C1E4A - .string "I have to ride a BIKE next, but...\n" - .string "I’m about to throw in the towel...$" + .string "Ich muss als Nächstes mit dem RAD\n" + .string "fahren, aber... Ich möchte eigentlich\l" + .string "das Handtuch werfen.$" Route128_Text_1C1E90:: @ 81C1E90 - .string "A triathlon is long. But I guess the\n" - .string "road to become the POKéMON CHAMPION\l" - .string "is also a long and grueling one.$" + .string "Ein Triathlon ist lang. Aber ich glaube,\n" + .string "um POKéMON CHAMP zu werden, hat\l" + .string "man auch einen langen Weg vor sich.$" Route128_Text_1C1EFA:: @ 81C1EFA - .string "A POKéMON battle really is harsh\n" - .string "and unforgiving...$" + .string "Ein POKéMON-Kampf ist hart und \n" + .string "unbarmherzig...$" Route128_Text_1C1F2E:: @ 81C1F2E - .string "You should give serious thought to\n" - .string "challenges on VICTORY ROAD.$" + .string "Du solltest ernsthaft darüber nach-\n" + .string "denken, die SIEGESSTRASSE zu betreten.$" Route128_Text_1C1F6D:: @ 81C1F6D - .string "We’ve been working so hard to mount\n" - .string "a POKéMON LEAGUE challenge...\p" - .string "We can’t afford to lose now!$" + .string "Wir haben hart dafür gearbeitet, die\n" + .string "POKéMON LIGA herauszufordern...\p" + .string "Wir können es uns nicht erlauben,\n" + .string "jetzt zu verlieren!$" Route128_Text_1C1FCC:: @ 81C1FCC .string "Oh!\n" - .string "How could this happen?!$" + .string "Wie konnte das passieren?$" Route128_Text_1C1FE8:: @ 81C1FE8 - .string "After all I’ve done to get here, I won’t\n" - .string "give up after one setback.$" + .string "Ich bin so weit gekommen, ich gebe\n" + .string "jetzt bestimmt nicht auf.$" Route128_Text_1C202C:: @ 81C202C - .string "There is no stronger TRAINER than I!$" + .string "Es gibt keinen stärkeren TRAINER als\n" + .string "mich!$" Route128_Text_1C2051:: @ 81C2051 - .string "This can’t be!$" + .string "Das darf nicht wahr sein!$" Route128_Text_1C2060:: @ 81C2060 - .string "There probably is no stronger TRAINER\n" - .string "than you!$" + .string "Es gibt wohl keinen stärkeren TRAINER\n" + .string "als dich!$" Route128_Text_1C2090:: @ 81C2090 - .string "I want to visit EVER GRANDE, so I\n" - .string "caught myself a POKéMON that knows\l" - .string "the move WATERFALL to crest the falls.$" + .string "Ich will nach PRACHTPOLIS CITY, daher\n" + .string "habe ich ein POKéMON gefangen, das\p" + .string "weiß, wie man mit KASKADE den Wasserfall\n" + .string "erklimmt.$" Route128_Text_1C20FC:: @ 81C20FC - .string "I’m crestfallen!$" + .string "Ich bin abgestürzt.$" Route128_Text_1C210D:: @ 81C210D - .string "Awww, phooey!\p" - .string "My POKéMON know WATERFALL, but\n" - .string "I don’t have the SOOTOPOLIS GYM BADGE!$" + .string "Ooh, jeeeeh!\p" + .string "Mein POKéMON kennt KASKADE, aber mir\n" + .string "fehlt der ORDEN der ARENA von\l" + .string "XENEROVILLE!$" Route129_Text_1C2161:: @ 81C2161 - .string "This is my first triathlon.\n" - .string "I’m all tense and nervous!$" + .string "Das ist mein erster Triathlon.\n" + .string "Ich bin schon ganz hibbelig und nervös!$" Route129_Text_1C2198:: @ 81C2198 - .string "Wroooaaar!\n" - .string "I failed to win!$" + .string "Wooooaaaaaargh! Ich habe es\n" + .string "nicht geschafft, zu gewinnen.$" Route129_Text_1C21B4:: @ 81C21B4 - .string "If I’m all tensed up, I won’t be able to\n" - .string "give it my all.$" + .string "Wenn ich so hibbelig bin, kann ich nicht\n" + .string "alles geben.$" Route129_Text_1C21ED:: @ 81C21ED - .string "I’m in the middle of a triathlon, but,\n" - .string "sure, why don’t we battle?$" + .string "Ich bin mitten in einem Triathlon, aber\n" + .string "warum sollten wir nicht kämpfen?$" Route129_Text_1C222F:: @ 81C222F - .string "I was sure I’d win!$" + .string "Ich war sicher, ich würde gewinnen!$" Route129_Text_1C2243:: @ 81C2243 - .string "Do you know what’s the greatest thing\n" - .string "about triathlons?\p" - .string "Testing the limits of your own\n" - .string "strength and endurance against\l" - .string "Mother Nature!$" + .string "Weißt du, was das Beste am Triathlon\n" + .string "ist?\p" + .string "Man kommt an seine eigenen Grenzen und\n" + .string "zeigt seine Ausdauer gegenüber Mutter\l" + .string "Natur.$" Route129_Text_1C22C8:: @ 81C22C8 - .string "Say hey, hey!\n" - .string "Let’s get on with it!$" + .string "Sag: Hey, hey!\n" + .string "Los geht’s!$" Route129_Text_1C22EC:: @ 81C22EC - .string "Beat, I’m beaten.\n" - .string "That’s it, done!$" + .string "Geschlagen, ich wurde geschlagen.\n" + .string "Das war’s. Fertig!$" Route129_Text_1C230F:: @ 81C230F - .string "There’s nothing for a loser.\n" - .string "Time for me to beat it home.$" + .string "Hier gibt es für Verlierer nichts zu tun.\n" + .string "Zeit für mich, nach Hause zu gehen.$" Route129_Text_1C2349:: @ 81C2349 - .string "What’s the hurry?\n" - .string "Let’s take it slow and easy.$" + .string "Warum so eilig?\n" + .string "Immer mit der Ruhe...$" Route129_Text_1C2378:: @ 81C2378 - .string "Oh, my.\n" - .string "I wanted to relax a little more...$" + .string "Oh, meine Güte. Dabei wollte ich\n" + .string "nur ein bisschen entspannen.$" Route129_Text_1C23A3:: @ 81C23A3 - .string "Don’t you hate making mistakes when\n" - .string "you’re in a rush?\p" - .string "That’s why I try to take things\n" - .string "slowly.$" + .string "Hasst du es nicht auch, Fehler zu\n" + .string "machen, nur weil du es eilig hast?\p" + .string "Daher gehe ich alles langsam an.$" Route130_Text_1C2401:: @ 81C2401 - .string "What a surprise! I didn’t expect to\n" - .string "see a TRAINER out in the sea.\p" - .string "I think we should battle!$" + .string "Was für eine Überraschung! Ich habe im\n" + .string "Meer keinen TRAINER erwartet.\p" + .string "Ich denke, wir sollten kämpfen.$" Route130_Text_1C245D:: @ 81C245D - .string "This kid’s awfully tough...$" + .string "Dieses Kind ist unglaublich stark.$" Route130_Text_1C2479:: @ 81C2479 - .string "Your eyes have that look of someone\n" - .string "who’s experienced harsh challenges\l" - .string "and won. It suits you well!$" + .string "Deine Augen haben den Ausdruck eines\n" + .string "Menschen, der harte Herausforderungen\l" + .string "siegreich gemeistert hat. Das steht dir.$" Route130_Text_1C24DC:: @ 81C24DC - .string "In the deep blue sea,\n" - .string "my shattered blue heart finds\l" - .string "comfort among waves.$" + .string "Im tiefen, blauen Meer fand mein\n" + .string "schwermütiges Herz Trost in den\l" + .string "wogenden Wellen.$" Route130_Text_1C2525:: @ 81C2525 - .string "Like the vast blue sea,\n" - .string "the world of POKéMON spans\l" - .string "depths beyond belief.$" + .string "Wie das weite Meer umspannt auch die \n" + .string "Welt der POKéMON Weiten jenseits\l" + .string "unseres Erfahrungshorizontes.$" Route130_Text_1C256E:: @ 81C256E - .string "The world’s children dream\n" - .string "of one day becoming the\l" - .string "POKéMON CHAMPION.$" + .string "Die Kinder dieser Welt träumen davon,\n" + .string "eines Tages der POKéMON CHAMP zu\l" + .string "werden.$" Route131_Text_1C25B3:: @ 81C25B3 - .string "The sea is teeming with POKéMON.\n" - .string "It’s not easy swimming, I tell you.$" + .string "Das Meer wimmelt von POKéMON.\n" + .string "Es ist nicht leicht, hier zu schwimmen.$" Route131_Text_1C25F8:: @ 81C25F8 - .string "POKéMON raised by TRAINERS are\n" - .string "seriously tough...$" + .string "POKéMON, die von TRAINERN aufgezogen\n" + .string "wurden, sind sehr stark...$" Route131_Text_1C262A:: @ 81C262A - .string "Gasp... Gasp... I’m wiped out...\p" - .string "The going’s easy. It’s the leaving\n" - .string "that’s the hard part.\p" - .string "Will I have any energy left to make\n" - .string "the return trip?$" + .string "Keuch... Schnauf... Ich bin K.O.\p" + .string "Der Hinweg ist leicht. Der Heimweg umso\n" + .string "härter.\p" + .string "Ob ich genug Energie für die Heimreise\n" + .string "habe?$" Route131_Text_1C26B9:: @ 81C26B9 - .string "The sea... The sea... The sea...\n" - .string "The sea as far as these eyes can see!\l" - .string "I’m sick and tired of the sea!$" + .string "Die See... Die See... Die See...\n" + .string "Die See... So weit ich mit den Augen seh.\l" + .string "Das Meer macht mich krank und müde.$" Route131_Text_1C271F:: @ 81C271F - .string "Bleah!$" + .string "Bah!$" Route131_Text_1C2726:: @ 81C2726 - .string "Bored I am by the sea, but swim I must.\p" - .string "I’m a born swimmer!\n" - .string "That’s what I am.$" + .string "Gelangweilt bin ich von der See, aber\n" + .string "ich muss schwimmen.\p" + .string "Ich bin der geborene Schwimmer!\n" + .string "Das bin ich.$" Route131_Text_1C2774:: @ 81C2774 - .string "Hi, sweetie, wait!\n" - .string "We should battle, you and I!$" + .string "Hey, Engelchen, warte!\n" + .string "Wir sollten kämpfen, du und ich!$" Route131_Text_1C27A4:: @ 81C27A4 - .string "You’re tough in spite of the way\n" - .string "you look!$" + .string "Du bist stärker, als du aussiehst.$" Route131_Text_1C27CF:: @ 81C27CF - .string "Did you see a guy over there who whines\n" - .string "that he’s bored of the sea?\p" - .string "That’s all talk.\n" - .string "He’s hopelessly in love with the sea!$" + .string "Hast du einen Typen gesehen, der heult,\n" + .string "weil das Meer ihn langweilt?\p" + .string "Das ist nur Gerede.\n" + .string "Er liebt das Meer aus tiefstem Herzen!$" Route131_Text_1C284A:: @ 81C284A - .string "Why do men love bathing suits so much?\p" - .string "They all ogle me!$" + .string "Warum lieben Männer Bikinis nur so?\p" + .string "Sie starren alle meinen Bikini an.$" Route131_Text_1C2883:: @ 81C2883 - .string "I’m out of my depth!$" + .string "Ich bin erledigt.$" Route131_Text_1C2898:: @ 81C2898 - .string "Maybe it’s not my bathing suit that\n" - .string "makes men look. It must be my beauty!$" + .string "Vielleicht bewundern die Männer nicht\n" + .string "meinen Bikini, sondern mich!$" Route131_Text_1C28E2:: @ 81C28E2 - .string "RELI: We’ll work together as siblings\n" - .string "to take you on!$" + .string "UNA: Wir nehmen es als Geschwister mit\n" + .string "dir auf!$" Route131_Text_1C2918:: @ 81C2918 - .string "RELI: We couldn’t win even though we\n" - .string "worked together...$" + .string "UNA: Wir konnten nicht gewinnen. Trotz\n" + .string "unserer Zusammenarbeit.$" Route131_Text_1C2950:: @ 81C2950 - .string "RELI: The people of PACIFIDLOG are\n" - .string "together with the sea and POKéMON from\l" - .string "the time they are born.$" + .string "UNA: Die Menschen in FLOSSBRUNN\n" + .string "leben von Geburt an mit POKéMON\l" + .string "und dem Meer zusammen.$" Route131_Text_1C29B2:: @ 81C29B2 - .string "RELI: You don’t have two POKéMON?\n" - .string "We can’t enjoy a battle, then.$" + .string "UNA: Du hast keine zwei POKéMON?\n" + .string "Dann werden wir keinen Spaß haben!$" Route131_Text_1C29F3:: @ 81C29F3 - .string "IAN: I’m doing my best together with\n" - .string "my sis!$" + .string "TOBI: Ich gebe zusammen mit meiner\n" + .string "Schwester mein Bestes!$" Route131_Text_1C2A20:: @ 81C2A20 - .string "IAN: I did my best with my sis, but\n" - .string "we still couldn’t win...$" + .string "TOBI: Meine Schwester und ich gaben\n" + .string "unser Bestes und haben doch verloren.$" Route131_Text_1C2A5D:: @ 81C2A5D - .string "IAN: You know how PACIFIDLOG is\n" - .string "a floating town?\p" - .string "So, wherever there is the sea, that’s\n" - .string "a part of PACIFIDLOG!$" + .string "TOBI: Du weißt, dass FLOSSBRUNN\n" + .string "eine schwimmende Stadt ist?\p" + .string "Wo immer auch das Meer ist, ist es Teil\n" + .string "von FLOSSBRUNN!$" Route131_Text_1C2ACA:: @ 81C2ACA - .string "IAN: If you have two POKéMON, we’ll\n" - .string "take you on!$" + .string "TOBI: Wenn du zwei POKéMON mitbringst,\n" + .string "werden wir es mit dir aufnehmen!$" Route132_Text_1C2AFB:: @ 81C2AFB - .string "I used to catch colds all the time as\n" - .string "a kid, but I became totally fit after\l" - .string "I started swimming.$" + .string "Als Kind war ich andauernd erkältet,\n" + .string "aber seit ich mit dem Schwimmen\l" + .string "angefangen habe, bin ich fit.$" Route132_Text_1C2B5B:: @ 81C2B5B - .string "I crave more power...$" + .string "Ich bitte um mehr Kraft...$" Route132_Text_1C2B71:: @ 81C2B71 - .string "TRAINERS travel the fields and\n" - .string "mountains, so they must be fit, too.$" + .string "TRAINER reisen über Berg und Tal\n" + .string "und müssen deshalb auch fit sein.$" Route132_Text_1C2BB5:: @ 81C2BB5 - .string "I try not to swim where the currents\n" - .string "are too strong.$" + .string "Ich versuche, mich von den Strömungen\n" + .string "fern zu halten.$" Route132_Text_1C2BEA:: @ 81C2BEA - .string "Oh, please, no!$" + .string "Oh, bitte, nein!$" Route132_Text_1C2BFA:: @ 81C2BFA - .string "If I get swept away, I’ll lose all my\n" - .string "sense of place...$" + .string "Ich wurde weggespült. Ich habe voll-\n" + .string "ständig die Orientierung verloren.$" Route132_Text_1C2C32:: @ 81C2C32 - .string "Win or lose, you’ll never know until\n" - .string "you try!$" + .string "Sieg oder Niederlage. Das weiß man\n" + .string "erst, wenn man es ausprobiert hat.$" Route132_Text_1C2C60:: @ 81C2C60 - .string "Waah!\n" - .string "I sank in defeat!$" + .string "Aaah!\n" + .string "Ich versinke in einer Niederlage.$" Route132_Text_1C2C78:: @ 81C2C78 - .string "I never battle when I know I’ll win.\n" - .string "I like to battle at the razor’s edge of\l" - .string "victory and defeat!$" + .string "Ich kämpfe nie, wenn ich weiß, dass ich\n" + .string "gewinne. Ich liebe den Kampf an der\l" + .string "Grenze zwischen Sieg und Niederlage.$" Route132_Text_1C2CD9:: @ 81C2CD9 - .string "I contemplate POKéMON 24 hours a day.\n" - .string "How could you possibly beat me?$" + .string "Ich widme mich 24 Stunden am Tag den\n" + .string "POKéMON. Ob du mich besiegen kannst?$" Route132_Text_1C2D1F:: @ 81C2D1F - .string "I lose.\n" - .string "I will concede defeat.$" + .string "Ich habe verloren.\n" + .string "Ich gestehe die Niederlage ein.$" Route132_Text_1C2D3E:: @ 81C2D3E - .string "Urggh...\n" - .string "You’re a POKéMON fanatic, aren’t you?\p" - .string "You must contemplate POKéMON 24 hours\n" - .string "a day, don’t you?$" + .string "Aargh...\n" + .string "Du bist ein POKéMON-Fanatiker, oder?\p" + .string "Du widmest dich den POKéMON\n" + .string "24 Stunden am Tag, oder?$" Route133_Text_1C2DA5:: @ 81C2DA5 - .string "Did the currents carry you here, too?\n" - .string "This must have been fated. Let’s battle!$" + .string "Hat die Strömung dich hergebracht? Das\n" + .string "nenne ich Schicksal. Lass uns kämpfen!$" Route133_Text_1C2DF4:: @ 81C2DF4 - .string "Strong!\n" - .string "Too much so!$" + .string "Stark!\n" + .string "Viel zu stark!$" Route133_Text_1C2E09:: @ 81C2E09 - .string "It’s just my luck that a tough TRAINER\n" - .string "like you would drift here...\l" - .string "I must be cursed...$" + .string "Soll ich das jetzt Glück nennen, dass ich\n" + .string "auf einen so starken TRAINER wie dich\l" + .string "gestoßen bin? Ich bin verflucht...$" Route133_Text_1C2E61:: @ 81C2E61 - .string "I’ve led a life of woe and misery...\n" - .string "I’ve been cast away, and this is where\l" - .string "I’ve drifted...$" + .string "Ich führte ein Leben in Kummer und\n" + .string "Elend. Es hat mich hierher verschlagen\l" + .string "und hier bin ich gestrandet...$" Route133_Text_1C2EBD:: @ 81C2EBD - .string "Another loss...$" + .string "Eine weitere Niederlage...$" Route133_Text_1C2ECD:: @ 81C2ECD - .string "A life adrift...\n" - .string "I don’t want it anymore!$" + .string "Treibend auf dem Meer des Lebens...\n" + .string "Ich habe dazu keine Lust mehr!$" Route133_Text_1C2EF7:: @ 81C2EF7 - .string "Welcome!\n" - .string "I’ve been expecting you!$" + .string "Willkommen!\n" + .string "Ich habe dich schon erwartet!$" Route133_Text_1C2F19:: @ 81C2F19 - .string "No! Please!$" + .string "Nein! Bitte!$" Route133_Text_1C2F25:: @ 81C2F25 - .string "A strong child TRAINER...\n" - .string "That’s so annoying!$" + .string "Ein Kind als starker TRAINER...\n" + .string "Boh, ist das äääärgerlich!$" Route133_Text_1C2F53:: @ 81C2F53 - .string "I want to win like everyone else, but I\n" - .string "won’t raise POKéMON like everyone else.$" + .string "Ich möchte, wie jeder andere auch,\n" + .string "gewinnen, aber ich ziehe meine POKéMON\l" + .string "nicht auf wie jeder andere auch...$" Route133_Text_1C2FA3:: @ 81C2FA3 - .string "Darn it!\n" - .string "My way is still too slack!$" + .string "Mist!\n" + .string "Meine Art und Weise reicht nicht aus!$" Route133_Text_1C2FC7:: @ 81C2FC7 - .string "It’s way more fun to do things the way\n" - .string "I want than to be like everybody else.\l" - .string "I mean, that’s obvious!$" + .string "Es macht mehr Spaß, die Dinge auf meine\n" + .string "Art zu erledigen, als auf die Art aller\l" + .string "anderen. Das ist doch klar!$" Route133_Text_1C302D:: @ 81C302D - .string "I came all the way out here with my\n" - .string "BIRD POKéMON.$" + .string "Ich bin mit meinen VOGEL-POKéMON\n" + .string "hierher gekommen.$" Route133_Text_1C305F:: @ 81C305F - .string "You...\n" - .string "You’re stunningly cool!$" + .string "Du...\n" + .string "Du bist total cool!$" Route133_Text_1C307E:: @ 81C307E - .string "I’d like to go back to FORTREE, but I’ve\n" - .string "grown to like this place, too.$" + .string "Ich könnte nach BAUMHAUSEN CITY zu-\n" + .string "rückkehren, aber ich mag Orte wie diese.$" Route134_Text_1C30C6:: @ 81C30C6 - .string "Even those POKéMON that can swim are\n" - .string "carried along by the rapid currents.$" + .string "Selbst POKéMON, die schwimmen können,\n" + .string "werden oft von der Strömung erfasst.$" Route134_Text_1C3110:: @ 81C3110 .string "Aiyeeeeh!$" Route134_Text_1C311A:: @ 81C311A - .string "I think POKéMON enjoy the fast-running\n" - .string "currents around these parts.$" + .string "Ich glaube, POKéMON mögen diese\n" + .string "schnellen Strömungen hier sehr.$" Route134_Text_1C315E:: @ 81C315E - .string "My LUVDISC are looking for a fun\n" - .string "match. Will you join us?$" + .string "Meine LIEBISKUS möchten ihren Spaß\n" + .string "bei einem Kampf haben. Machst du mit?$" Route134_Text_1C3198:: @ 81C3198 - .string "Oopsie!$" + .string "Huupsie!$" Route134_Text_1C31A0:: @ 81C31A0 - .string "There’s a collector who’s after the\n" - .string "SCALES of LUVDISC.$" + .string "Es gibt da einen Sammler, der sich für \n" + .string "SCHUPPEN von LIEBISKUS interessiert.$" Route134_Text_1C31D7:: @ 81C31D7 - .string "Okeydokey! That’s enough rest, gang!\n" - .string "It’s time for a match!$" + .string "Okeydokey! Genug gerastet, Jungs!\n" + .string "Zeit für ein Kämpfchen!$" Route134_Text_1C3213:: @ 81C3213 - .string "Tuckered out again...$" + .string "Wir wurden wieder fertig gemacht.$" Route134_Text_1C3229:: @ 81C3229 - .string "My BIRD POKéMON get tired quickly after\n" - .string "a long flight...$" + .string "Mein VOGEL-POKéMON wird nach einem\n" + .string "langen Flug schnell müde...$" Route134_Text_1C3262:: @ 81C3262 - .string "You’re a POKéMON TRAINER.\n" - .string "No need for words. We battle now.$" + .string "Du bist ein POKéMON-TRAINER.\n" + .string "Worte sind da überflüssig. Wir kämpfen.$" Route134_Text_1C329E:: @ 81C329E .string "... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ...$" Route134_Text_1C32D6:: @ 81C32D6 - .string "It was I who challenged you, and yet\n" - .string "I lost. I am deeply shamed...$" + .string "Ich habe dich herausgefordert und\n" + .string "doch verloren. Ich bin tief beschämt.$" Route134_Text_1C3319:: @ 81C3319 - .string "The savage tide in this area serves to\n" - .string "make us stronger than ever.$" + .string "Die wilde Strömung in dieser Region hilft\n" + .string "uns dabei, stärker denn je zu werden.$" Route134_Text_1C335C:: @ 81C335C - .string "I concede defeat.$" + .string "Ich gebe meine Niederlage zu.$" Route134_Text_1C336E:: @ 81C336E - .string "We will return for more training at\n" - .string "METEOR FALLS.\p" - .string "If you’d like, you should go, too.\n" - .string "It will definitely toughen you up!$" + .string "Wir werden für weiteres Training nach\n" + .string "METEORFÄLLE zurückkehren.\p" + .string "Wenn du magst, komm doch auch mit.\n" + .string "Das wird auch dich stärker machen!$" diff --git a/data/text/tv.inc b/data/text/tv.inc index c27559abd..700f40db0 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -1,1050 +1,1085 @@ FallarborTown_ContestLobby_Text_1A6F7C:: @ 81A6F7C - .string "Oh, hello! You were in a POKéMON CONTEST,\n" - .string "weren’t you?\l" - .string "It’s easy to tell from your POKéMON.\p" - .string "I’m a reporter. I’m working on a story\n" - .string "on POKéMON CONTESTS.\p" - .string "If I may, would you be willing to answer\n" - .string "a few questions?$" + .string "Du hast an einem POKéMON WETTBEWERB\n" + .string "teilgenommen, stimmt’s?\p" + .string "Da kannst du mir doch etwas über\n" + .string "dein POKéMON erzählen.\p" + .string "Ich bin Reporter. Ich arbeite an einer\n" + .string "Geschichte über POKéMON WETTBEWERBE.\p" + .string "Würdest du mir wohl einige Fragen\n" + .string "beantworten?$" FallarborTown_ContestLobby_Text_1A704E:: @ 81A704E - .string "Oh, you will?\n" - .string "Thank you.\p" - .string "Briefly, how would you describe the\n" - .string "CONTEST you just entered?$" + .string "Oh, das machst du?\n" + .string "Herzlichen Dank.\p" + .string "Beschreibe mir doch kurz den WETTBE-\n" + .string "WERB, an dem du gerade teilgenommen\l" + .string "hast.$" FallarborTown_ContestLobby_Text_1A70A5:: @ 81A70A5 - .string "Ah, I see.\n" - .string "That’s a very edifying comment.\p" - .string "You get a good feel for what the\n" - .string "CONTEST was like.\p" - .string "I’ve got one last question.\p" - .string "When you hear the word “{STR_VAR_2},”\n" - .string "what image do you get?$" + .string "Ah, ich verstehe.\n" + .string "Das ist ein bewegender Kommentar.\p" + .string "Man bekommt ein gutes Bild davon,\n" + .string "wie dieser WETTBEWERB war.\p" + .string "Ich habe eine letzte Frage.\p" + .string "Wenn du das Wort “{STR_VAR_2}” hörst,\n" + .string "was für ein Bild hast du dann vor Augen?$" FallarborTown_ContestLobby_Text_1A7153:: @ 81A7153 - .string "I see!\p" - .string "So that’s how you imagine the concept\n" - .string "of “{STR_VAR_2}” to be.\p" - .string "Thank you!\n" - .string "You’ve given me some good ideas.\p" - .string "I think I can write a good story on\n" - .string "POKéMON CONTESTS now.\p" - .string "Maybe, just maybe, this story will even\n" - .string "make it to television.\l" - .string "I hope you’ll look forward to it!$" + .string "Oh, hm.\p" + .string "Das stellst du dir also unter dem\n" + .string "Begriff “{STR_VAR_2}” vor.\p" + .string "Danke schön!\n" + .string "Du hast mir einige gute Ideen geliefert.\p" + .string "Jetzt kann ich eine gute Geschichte\n" + .string "über die POKéMON-WETTBEWERBE\l" + .string "schreiben.\p" + .string "Vielleicht, aber nur vielleicht, findet\n" + .string "sie auch ihren Weg ins Fernsehen.\l" + .string "Ich hoffe, du schaltest dann ein!$" FallarborTown_ContestLobby_Text_1A7256:: @ 81A7256 - .string "Oh, too bad...\p" - .string "Well, if you come across a good story,\n" - .string "please do share it with me.$" + .string "Oh, das ist wirklich schade...\p" + .string "Nun, wenn du eine gute Geschichte auf\n" + .string "Lager hast, melde dich wieder bei mir.$" FallarborTown_ContestLobby_Text_1A72A8:: @ 81A72A8 - .string "I’ll be looking forward to your next\n" - .string "POKéMON CONTEST.$" + .string "Ich freue mich schon auf deinen\n" + .string "nächsten POKéMON-WETTBEWERB.$" gTVBravoTrainerText1:: @ 81A72DE .string "Yeah!\n" - .string "It’s BRAVO TRAINER time!\p" - .string "Today, we’re going to profile a POKéMON\n" - .string "belonging to {STR_VAR_1}.\p" - .string "Now, this POKéMON boasts a {STR_VAR_2}\n" - .string "rating in the {STR_VAR_3} Rank.$" + .string "Es ist BRAVO TRAINER Zeit!\p" + .string "Heute stellen wir ein POKéMON vor,\n" + .string "das zu {STR_VAR_1} gehört.\p" + .string "Dieses POKéMON hat eine {STR_VAR_2}-\n" + .string "Wertung in der {STR_VAR_3} Klasse bekommen.$" gTVBravoTrainerText2:: @ 81A736B - .string "Introducing {STR_VAR_2} the\n" - .string "{STR_VAR_1}!\p" - .string "The nickname {STR_VAR_2}...\p" - .string "Even the nickname exudes an air that\n" - .string "proclaims “{STR_VAR_3}”!$" + .string "Begrüßt {STR_VAR_2},\n" + .string "das {STR_VAR_1}!\p" + .string "Der Kosename {STR_VAR_2}...\p" + .string "Selbst dieser Kosename strahlt die\n" + .string "Aura von “{STR_VAR_3}” aus!$" gTVBravoTrainerText3:: @ 81A73CA - .string "Anyway, when the TRAINER {STR_VAR_1}\n" - .string "entered the POKéMON in a CONTEST,\l" - .string "we managed to get a few impassioned\l" - .string "quotes about the trusty partner.$" + .string "Als der TRAINER {STR_VAR_1} sein POKéMON\n" + .string "in einem WETTBEWERB antreten ließ,\l" + .string "haben wir es geschafft, einige leiden-\l" + .string "schaftliche Aussagen zu erhalten.$" gTVBravoTrainerText4:: @ 81A744D - .string "Asked about the CONTEST afterwards,\n" - .string "{STR_VAR_1} happily replied with a huge\l" - .string "grin, “{STR_VAR_2}!”\p" - .string "Well, sure, {STR_VAR_1}’s POKéMON came in\n" - .string "number {STR_VAR_3} in the CONTEST.\p" - .string "That line perfectly suits {STR_VAR_1}\n" - .string "right now, I’d say!$" + .string "Als {STR_VAR_1} nach dem WETTBEWERB über\n" + .string "diesen befragt wurde, bekamen wir ein\l" + .string "breites Grinsen und folgende Antwort:\l" + .string "“{STR_VAR_2}!”\p" + .string "Nun, sicher, das POKéMON von {STR_VAR_1}\n" + .string "kam auf Platz {STR_VAR_3} im WETTBEWERB.\p" + .string "Die Aussage passt absolut zu {STR_VAR_1},\n" + .string "das ist meine Meinung!$" gTVBravoTrainerText5:: @ 81A7508 - .string "Asked about the CONTEST afterwards,\n" - .string "{STR_VAR_1} replied with a tinge of\l" - .string "bitterness, “{STR_VAR_2}.”\p" - .string "Well, sure, {STR_VAR_1}’s POKéMON came in\n" - .string "number {STR_VAR_3} in the CONTEST.\p" - .string "{STR_VAR_1}’s disappointment comes across\n" - .string "loud and clear, I’d say!$" + .string "Als {STR_VAR_1} nach dem WETTBEWERB über\n" + .string "diesen befragt wurde, bekamen wir die\l" + .string "bittere Antwort: “{STR_VAR_2}!”\p" + .string "Nun, sicher, das POKéMON von {STR_VAR_1}\n" + .string "kam auf Platz {STR_VAR_3} im WETTBEWERB.\p" + .string "Die Enttäuschung von {STR_VAR_1} wird hier\n" + .string "mehr als deutlich, das ist meine Meinung.$" gTVBravoTrainerText6:: @ 81A75CE - .string "Wouldn’t you also like to know what\n" - .string "{STR_VAR_1} imagines {STR_VAR_2} to be?\p" - .string "You bet we did!\n" - .string "So we asked, of course!\p" - .string "The answer is all perfectly condensed:\n" + .string "Möchtet ihr auch wissen, was {STR_VAR_1}\n" + .string "sich unter {STR_VAR_2} vorstellt?\p" + .string "Ihr könnt darauf wetten, dass wir\n" + .string "danach gefragt haben! Natürlich!\p" + .string "Die Antwort war klipp und klar:\n" .string "“{STR_VAR_3}!”\p" - .string "That’s what the concept of {STR_VAR_2}\n" - .string "represents to {STR_VAR_1}!$" + .string "Das ist es, was {STR_VAR_2} für {STR_VAR_1}\n" + .string "repräsentiert!$" gTVBravoTrainerText7:: @ 81A768D - .string "The last move {STR_VAR_2} used by\n" - .string "the {STR_VAR_1} is entirely about\l" - .string "“{STR_VAR_3}”!$" + .string "Die letzte Attacke, {STR_VAR_2}, die\n" + .string "von {STR_VAR_1} eingesetzt wurde,\l" + .string "ist ganz klar “{STR_VAR_3}!”$" gTVBravoTrainerText8:: @ 81A76C5 .string "Bravo, {STR_VAR_1}!\n" .string "Bravo, {STR_VAR_2}!\p" - .string "I hope we can count on seeing\n" - .string "{STR_VAR_1} scale even greater heights!\p" - .string "That’s all the time we have!\n" - .string "Until next time, see you!$" + .string "Wir hoffen, dass {STR_VAR_1} noch höhere\n" + .string "Gipfel erklimmen wird!\p" + .string "Unsere Zeit ist mal wieder abgelaufen!\n" + .string "Bis zum nächsten Mal! Tschüss!$" gTVBravoTrainerText9:: @ 81A774F - .string "Introducing the TRAINER’s {STR_VAR_1}!$" + .string "Wir stellen vor: TRAINERS {STR_VAR_1}!$" BattleTower_Lobby_Text_1A776D:: @ 81A776D - .string "Hello! You’re the TRAINER who just had\n" - .string "a battle, right?\p" - .string "I’m gathering interviews with TRAINERS\n" - .string "all over the place.\p" - .string "May I get a few words from you about\n" - .string "your impressions on battling?$" + .string "Hallo! Du bist der TRAINER, der gerade\n" + .string "gekämpft hat, richtig?\p" + .string "Ich interviewe TRAINER in der ganzen\n" + .string "Welt.\p" + .string "Würdest du mir deine Eindrücke über\n" + .string "das Kämpfen schildern?$" BattleTower_Lobby_Text_1A7823:: @ 81A7823 - .string "You will? Really?\n" - .string "Thank you!\l" - .string "Then, uh...\p" - .string "How did things turn out in the BATTLE\n" - .string "TOWER today?\p" - .string "Were you satisfied with the battle?\n" - .string "Or are you unhappy?$" + .string "Ja? Wirklich?\n" + .string "Danke schön!\l" + .string "Dann, äh...\p" + .string "Wie war es heute im DUELLTURM?\p" + .string "Warst du mit dem Kampf zufrieden?\n" + .string "Oder bist du unzufrieden?$" BattleTower_Lobby_Text_1A78B7:: @ 81A78B7 .string "Oh...\n" - .string "Sorry we disturbed you.\p" - .string "Please give us an interview the next\n" - .string "time you visit the BATTLE TOWER.$" + .string "Tut mir Leid, dich zu stören.\p" + .string "Bitte gib uns ein Interview, wenn du\n" + .string "wieder im DUELLTURM kämpfst.$" BattleTower_Lobby_Text_1A791B:: @ 81A791B - .string "Well, of course!\p" - .string "That unmistakable look of satisfaction\n" - .string "on your face...\p" - .string "It’s obvious that you’ve had a great\n" - .string "battle.$" + .string "Ja, natürlich!\p" + .string "Da ist dieser untrügliche Ausdruck der\n" + .string "Zufriedenheit auf deinem Gesicht...\p" + .string "Ganz offensichtlich hattest du einen\n" + .string "großartigen Kampf!$" BattleTower_Lobby_Text_1A7990:: @ 81A7990 - .string "Oh, I see...\p" - .string "Well, it certainly is difficult to make a\n" - .string "battle turn out exactly as planned.$" + .string "Oh, ich verstehe...\p" + .string "Nun, es ist immer schwer, den Kampf so\n" + .string "zu beeinflussen, wie man es möchte.$" BattleTower_Lobby_Text_1A79EB:: @ 81A79EB - .string "Oh, oh, may I ask one more question?\p" - .string "If you were to describe your\n" - .string "impressions about this battle with one\l" - .string "saying, what would it be?$" + .string "Darf ich dir noch eine Frage stellen?\p" + .string "Wenn du deine Eindrücke über diesen\n" + .string "Kampf beschreiben müsstest, was\l" + .string "würdest du dann sagen?$" BattleTower_Lobby_Text_1A7A6E:: @ 81A7A6E - .string "Oh, that is stunningly cool!\p" - .string "That’s a great line!\n" - .string "I hope you’ll do great next time, too.\p" - .string "I hope to see you again!$" + .string "Das ist erstaunlich cool!\p" + .string "Eine großartige Sache! Ich wünsche dir\n" + .string "im nächsten Kampf genauso viel Glück!\p" + .string "Ich hoffe, wir treffen uns bald wieder!$" BattleTower_Lobby_Text_1A7AE0:: @ 81A7AE0 - .string "Oh, I see...\p" - .string "Still, being the silent type is also cool,\n" - .string "isn’t it?\p" - .string "I hope you’ll give me the opportunity to\n" - .string "share your thoughts again!$" + .string "Oh, ich verstehe...\p" + .string "Nun, auch die ruhigen Typen sind cool,\n" + .string "nicht wahr?\p" + .string "Ich hoffe, du gibst mir bald wieder die\n" + .string "Möglichkeit, deine Eindrücke\l" + .string "festzuhalten!$" BattleTower_Lobby_Text_1A7B66:: @ 81A7B66 - .string "I’ll be looking forward to your next\n" - .string "battle!$" + .string "Ich freue mich schon auf deinen\n" + .string "nächsten Kampf!$" gTVBravoTrainerBattleTowerText1:: @ 81A7B93 .string "Yeah!\n" - .string "It’s BRAVO TRAINER time!\p" - .string "Today, we’re going to profile {STR_VAR_1},\n" - .string "who took the BATTLE TOWER challenge!\p" - .string "For the challenge, {STR_VAR_1} entered one\n" - .string "wicked {STR_VAR_2}.$" + .string "Es ist BRAVO TRAINER Zeit!\p" + .string "Heute stellen wir {STR_VAR_1} vor. {STR_VAR_1}\n" + .string "hat sich der Herausforderung im\l" + .string "DUELLTURM gestellt!\p" + .string "Bei dieser Begegnung hat {STR_VAR_1}\n" + .string "das listige {STR_VAR_2} mitgebracht.$" gTVBravoTrainerBattleTowerText2:: @ 81A7C26 - .string "The pair set a new record of {STR_VAR_2} wins\n" - .string "in a row in Level {STR_VAR_1} competition!\l" - .string "Bravo, TRAINER!$" + .string "Das Paar stellte einen neuen Rekord von\n" + .string "{STR_VAR_2} Siegen in Folge in einer Level {STR_VAR_1}-\l" + .string "Konkurrenz auf! Bravo, TRAINER!$" gTVBravoTrainerBattleTowerText3:: @ 81A7C7D - .string "The twosome finally succumbed to\n" - .string "{STR_VAR_1} in match number {STR_VAR_2}.\l" - .string "Nice try, TRAINER!\p" - .string "But, hey, it’s just bad luck to run into\n" - .string "{STR_VAR_1} so early in the challenge.\p" - .string "We asked the TRAINER for impressions\n" - .string "on the match with {STR_VAR_1}.$" + .string "Die beiden scheiterten schließlich an\n" + .string "{STR_VAR_1} im Kampf Nummer {STR_VAR_2}.\l" + .string "Netter Versuch, TRAINER!\p" + .string "Es war einfach nur großes Pech, so\n" + .string "früh während dieser Herausforderung\l" + .string "auf {STR_VAR_1} zu treffen.\p" + .string "Wir fragten den TRAINER nach den\n" + .string "Eindrücken, die der Kampf gegen\l" + .string "{STR_VAR_1} hinterlassen hat.$" gTVBravoTrainerBattleTowerText4:: @ 81A7D4A - .string "The twosome won it all by defeating\n" - .string "{STR_VAR_1}’s {STR_VAR_2} thoroughly.\l" - .string "Bravo, TRAINER!\p" - .string "Knocking off even {STR_VAR_1}...\n" - .string "It defies belief! Simply astounding!\p" - .string "We asked the TRAINER for impressions\n" - .string "on the moment of glory.$" + .string "Die beiden haben gewonnen, indem sie\n" + .string "{STR_VAR_2} von {STR_VAR_1} klar\l" + .string "besiegt haben. Bravo, TRAINER!\p" + .string "Sogar {STR_VAR_1} wurde besiegt...\n" + .string "Das ist unglaublich! Einfach unglaublich!\p" + .string "Wir haben den TRAINER nach den\n" + .string "Eindrücken im Moment des Sieges\l" + .string "gefragt.$" gTVBravoTrainerBattleTowerText5:: @ 81A7E0C - .string "After a string of wins, the pair finally\n" - .string "succumbed to {STR_VAR_1}’s {STR_VAR_2},\l" - .string "their final hurdle.\p" - .string "Nice try, TRAINER!\p" - .string "Still, you have to give credit.\n" - .string "You don’t see many famous combinations\l" - .string "like {STR_VAR_1} and {STR_VAR_2}.\p" - .string "We asked the TRAINER for impressions\n" - .string "on battling the celebrity pair.$" + .string "Nach einer Reihe von Siegen musste sich\n" + .string "das Paar schließlich doch {STR_VAR_2}\l" + .string "von {STR_VAR_1} geschlagen geben.\p" + .string "Netter Versuch, TRAINER!\p" + .string "Man sieht nicht oft so ein wunderbares\n" + .string "Team wie {STR_VAR_1} und\l" + .string "{STR_VAR_2}. Das könnt ihr glauben!\p" + .string "Wir haben den TRAINER gefragt, wie es\n" + .string "war, gegen dieses Super-Paar zu\l" + .string "kämpfen.$" gTVBravoTrainerBattleTowerText6:: @ 81A7F0E - .string "This is what the TRAINER had to say:\n" - .string "“I’m satisfied!”\p" - .string "Now isn’t that a refreshing reply?\n" - .string "Bravo, TRAINER!\p" - .string "Isn’t it out-and-out awesome to be able\n" - .string "to battle to full satisfaction?\p" - .string "I found out exactly how satisfied\n" - .string "when I heard the TRAINER say this:$" + .string "Und das hat uns der TRAINER gesagt:\n" + .string "“Ich bin zufrieden!”\p" + .string "Ist das nicht eine erfrischend offene\n" + .string "Antwort? Bravo, TRAINER!\p" + .string "Aber ist ein so eingefleischter TRAINER\n" + .string "überhaupt in der Lage, mit einem Kampf\l" + .string "zufrieden zu sein?\p" + .string "Ich habe herausgefunden, wie zufrieden\n" + .string "der TRAINER war, als ich diese Worte\l" + .string "hörte:$" gTVBravoTrainerBattleTowerText7:: @ 81A8004 - .string "This is what the TRAINER had to say:\n" - .string "“I’m not satisfied...”\p" - .string "Our TRAINER was obviously a little down\n" - .string "when that was uttered.\p" - .string "Still, it’s not easy to be able to battle\n" - .string "with complete satisfaction, am I right?\p" - .string "Anyway, I found out how dissatisfied\n" - .string "our TRAINER was when I heard this:$" + .string "Und das hat uns der TRAINER verraten:\n" + .string "“Ich bin nicht zufrieden...”\p" + .string "Unser TRAINER war wohl gerade etwas\n" + .string "niedergeschlagen, als er das sagte.\p" + .string "Und es ist nicht immer leicht, nach einem\n" + .string "Kampf voll zufrieden zu sein, richtig?\p" + .string "Nun, wir haben nachgehakt und heraus-\n" + .string "gefunden, wie unzufrieden der TRAINER\l" + .string "tatsächlich war:$" gTVBravoTrainerBattleTowerText8:: @ 81A8119 - .string "None$" + .string "Nichts$" gTVBravoTrainerBattleTowerText9:: @ 81A811E - .string "None$" + .string "Nichts$" gTVBravoTrainerBattleTowerText10:: @ 81A8123 - .string "None$" + .string "Nichts$" gTVBravoTrainerBattleTowerText11:: @ 81A8128 - .string "None$" + .string "Nichts$" gTVBravoTrainerBattleTowerText12:: @ 81A812D - .string "“{STR_VAR_1}.”$" + .string "“{STR_VAR_1}”.$" gTVBravoTrainerBattleTowerText13:: @ 81A8133 - .string "“{STR_VAR_1}.”\n" - .string "Now isn’t that great?\p" - .string "It really expresses {STR_VAR_2}’s joy,\n" - .string "I’d say.\p" - .string "That battle with {STR_VAR_3} at the\n" - .string "end... It really was what you’d call\l" - .string "“{STR_VAR_1}”!$" + .string "“{STR_VAR_1}”.\n" + .string "Ist das nicht großartig?\p" + .string "Das drückt wahrhaftig {STR_VAR_2}s Freude\n" + .string "aus. Das würde ich doch sagen!\p" + .string "Am Ende noch der Kampf gegen\n" + .string "{STR_VAR_3}... Das war wirklich das, was\l" + .string "man “{STR_VAR_1}” nennt!$" gTVBravoTrainerBattleTowerText14:: @ 81A81BC - .string "“{STR_VAR_1}.”\n" - .string "Now isn’t that fitting?\p" - .string "That battle with {STR_VAR_3} at the\n" - .string "end... You can’t describe it as anything\l" - .string "else but “{STR_VAR_1}”!\p" - .string "{STR_VAR_2}’s disappointment comes across\n" - .string "loud and clear, I’d say!$" + .string "“{STR_VAR_1}”.\n" + .string "Eine treffende Aussage!\p" + .string "Das Ende des Kampfes gegen\n" + .string "{STR_VAR_3}... Man kann es nur\l" + .string "“{STR_VAR_1}” nennen!\p" + .string "Ich finde, die Enttäuschung von\n" + .string "{STR_VAR_2} wird mehr als deutlich.$" gTVBravoTrainerBattleTowerText15:: @ 81A8267 .string "Bravo, {STR_VAR_1}!\n" .string "Bravo, {STR_VAR_2}!\p" - .string "I hope we can count on seeing\n" - .string "{STR_VAR_1} scale even greater heights!\p" - .string "That’s all the time we have!\n" - .string "Until next time, see you!$" - + .string "Ich hoffe, wir sehen {STR_VAR_1} noch\n" + .string "höhere Gipfel erklimmen!\p" + .string "Das war’s für den Moment!\n" + .string "Bis zur nächsten Sendung!$" SlateportCity_PokemonFanClub_Text_1A82F1:: @ 81A82F1 .string "Wow!\p" - .string "It’s plain to see that you lavish your\n" - .string "love on your {STR_VAR_1}.\p" - .string "Okay, it’s named {STR_VAR_2}.\p" - .string "Can I ask you a favor?\p" - .string "I’m a TV reporter, and I’m running\n" - .string "a survey on POKéMON.\p" - .string "Would you be willing to answer a few\n" - .string "simple questions for me?$" + .string "Es ist ganz offensichtlich, dass du\n" + .string "deine Liebe {STR_VAR_1} schenkst.\p" + .string "Okay, es heißt {STR_VAR_2}.\p" + .string "Darf ich dich um einen Gefallen bitten?\p" + .string "Ich bin TV-Reporter und mache eine\n" + .string "Umfrage zum Thema POKéMON.\p" + .string "Würdest du mir bitte ein paar einfache\n" + .string "Fragen beantworten?$" SlateportCity_PokemonFanClub_Text_1A83D0:: @ 81A83D0 - .string "Great! Thank you!\p" - .string "Okay, here goes.\n" - .string "I just need quick answers, okay?$" + .string "Großartig! Danke schön!\p" + .string "Okay, los geht’s. Ich brauche\n" + .string "kurze, knappe Antworten, okay?$" SlateportCity_PokemonFanClub_Text_1A8414:: @ 81A8414 - .string "When you first met {STR_VAR_1}, what\n" - .string "did you feel?\p" - .string "How would you describe your feelings\n" - .string "at the time?$" + .string "Als du {STR_VAR_1} zum ersten Mal ge-\n" + .string "sehen hast, was war das für\l" + .string "ein Gefühl?\p" + .string "Wie würdest du die Gefühle zu dem\n" + .string "Zeitpunkt beschreiben?$" SlateportCity_PokemonFanClub_Text_1A8470:: @ 81A8470 - .string "Your {STR_VAR_1} is cared for lovingly.\p" - .string "If you were to liken it to something\n" - .string "that you like, what would it be?$" + .string "Du kümmerst dich liebevoll um\n" + .string "{STR_VAR_1}.\p" + .string "Wenn du es mit etwas vergleichen\n" + .string "würdest, das du magst, was wäre das?$" SlateportCity_PokemonFanClub_Text_1A84D5:: @ 81A84D5 - .string "This question also relates to your\n" - .string "beloved {STR_VAR_1}.\p" - .string "What was it about {STR_VAR_1} that\n" - .string "attracted you?$" + .string "Diese Frage bezieht sich auch auf dein\n" + .string "geliebtes {STR_VAR_1}.\p" + .string "Was hat dich an {STR_VAR_1} angezogen?$" SlateportCity_PokemonFanClub_Text_1A852D:: @ 81A852D - .string "Okay, that makes sense.\p" - .string "The next question might be a little\n" - .string "on the tough side.\p" - .string "Here goes...\p" - .string "What do POKéMON mean to you?$" + .string "Okay, das ergibt einen Sinn.\p" + .string "Diese Frage mag vielleicht etwas schwer\n" + .string "sein, um sie kurz zu beantworten.\p" + .string "Also...\p" + .string "Was bedeuten POKéMON für dich?$" SlateportCity_PokemonFanClub_Text_1A85A6:: @ 81A85A6 - .string "I see!\p" + .string "Ich verstehe!\p" .string "Hmhm...\p" - .string "Okay!\n" - .string "Thanks for helping me out.\p" - .string "It was fun and enlightening chatting\n" - .string "with you.\p" - .string "It’s possible that our interview will end\n" - .string "up on TV. Tune in and check!\p" - .string "Okay, that’s all.\n" - .string "Bye-bye!$" + .string "Das war’s! Danke, dass du mir deine\n" + .string "Zeit zur Verfügung gestellt hast!\p" + .string "Es hat mir viel Spaß gemacht, mich mit\n" + .string "dir zu unterhalten.\p" + .string "Vielleicht kannst du dieses Interview\n" + .string "bald im Fernsehen sehen. Achte darauf!\p" + .string "Okay, das ist alles.\n" + .string "Vielen Dank und leb wohl.$" SlateportCity_PokemonFanClub_Text_1A8667:: @ 81A8667 .string "Oh, okay...\p" - .string "Well, if you get the urge to tell me\n" - .string "about POKéMON, I’ll be here!$" + .string "Nun, wenn du mir doch etwas über\n" + .string "POKéMON erzählen willst, ich bin hier.$" SlateportCity_PokemonFanClub_Text_1A86B5:: @ 81A86B5 - .string "I enjoy this job - you get to learn so\n" - .string "much about POKéMON by doing\l" - .string "interviews.$" + .string "Ich liebe meinen Job - ich lerne so viel\n" + .string "über POKéMON während der Interviews.$" SlateportCity_PokemonFanClub_Text_1A8704:: @ 81A8704 - .string "Hi, you seem to be very close to your\n" - .string "{STR_VAR_1}.\p" - .string "Do you know what?\n" - .string "I’m a TV reporter.\p" - .string "I travel around interviewing people\n" - .string "about POKéMON.\p" - .string "I’m wondering if you’d be willing to tell\n" - .string "me a little abut your {STR_VAR_1}?$" + .string "Hallo, du scheinst deinem {STR_VAR_1}\n" + .string "sehr nahe zu stehen.\p" + .string "Weißt du was?\n" + .string "Ich bin ein TV-Reporter.\p" + .string "Ich reise herum und interviewe Leute,\n" + .string "befrage sie zu POKéMON.\p" + .string "Darf ich dich auch etwas über dein\n" + .string "{STR_VAR_1} fragen?$" SlateportCity_PokemonFanClub_Text_1A87CA:: @ 81A87CA - .string "Wow, thank you!\p" - .string "Okay, then, please tell me anything you’d\n" - .string "like about your {STR_VAR_1}.$" + .string "Wow, danke schön!\p" + .string "Dann erzähl mir doch einfach alles, was\n" + .string "dir an {STR_VAR_1} gefällt.$" SlateportCity_PokemonFanClub_Text_1A8818:: @ 81A8818 .string "Wow...\n" - .string "That’s an interesting account.\p" - .string "You really are tight with {STR_VAR_1},\n" - .string "aren’t you?\p" - .string "I get the feeling that your account\n" - .string "will make a great TV story.\p" - .string "I promise that I’ll turn this into\n" - .string "an entertaining show.\l" - .string "Keep your eyes out for it.\p" - .string "Okay, that’s all.\n" - .string "Bye-bye!$" + .string "Das ist ja ein interessanter Bericht.\p" + .string "Du stehst deinem {STR_VAR_1} sehr nahe,\n" + .string "nicht wahr?\p" + .string "Ich denke, dein Bericht wird sich\n" + .string "großartig im Fernsehen machen.\p" + .string "Ich verspreche, ich mache daraus eine\n" + .string "unterhaltsame Sendung. Die darfst\l" + .string "du nicht verpassen!\p" + .string "Okay, das war’s.\n" + .string "Danke und leb wohl.$" gTVFanClubOpinionsText1:: @ 81A8917 - .string "WE ARE THE POKéMON FAN CLUB!\p" - .string "We’re on the air!\p" - .string "On this program, we get your opinions,\n" - .string "and I shout them out on your behalf!\l" - .string "Isn’t it a fantastic program concept?\p" - .string "Today, we bring you this report from\n" - .string "our reporter, who we sent out to the\l" - .string "POKéMON FAN CLUB.\p" - .string "So, just who is today’s featured\n" - .string "POKéMON fan?\p" + .string "WIR SIND DER POKéMON-FANCLUB.\p" + .string "Wir sind live auf Sendung!\p" + .string "Hier ist eure Meinung gefragt und ich\n" + .string "spreche sie öffentlich laut für euch\l" + .string "aus. Ist das nicht fantastisch?\p" + .string "Heute bringen wir euch eine Reportage\n" + .string "unseres Reporters ins Haus, der im Auf-\l" + .string "trag des POKéMON-FANCLUBS unter-\l" + .string "wegs war.\p" + .string "Wer ist heute der glückliche\n" + .string "POKéMON-Fan, den wir hier vorstellen?\p" .string "... ... ... ... ... ... ... ...\p" .string "{STR_VAR_1}!\p" - .string "So, let’s hear what {STR_VAR_1} has to\n" - .string "say about {STR_VAR_3} the {STR_VAR_2}.\p" - .string "And, I will shout those words of love\n" - .string "out loud on TV!\p" - .string "Hoo-hah!\p" - .string "Let’s shout!$" + .string "So, was hat uns {STR_VAR_1} wohl über\n" + .string "{STR_VAR_3}, dem {STR_VAR_2},\l" + .string "zu sagen?\p" + .string "Und ich... Ich werde die Worte der Zu-\n" + .string "neigung laut im Fernsehen herausrufen!\p" + .string "Huuh-haa!\p" + .string "Lasst uns alle laut rufen!$" gTVFanClubOpinionsText2:: @ 81A8AE5 - .string "We asked {STR_VAR_1}, “When you first\n" - .string "laid eyes on your {STR_VAR_2}, what was\l" - .string "your initial thought?“\p" - .string "“{STR_VAR_3}!“\p" - .string "Yeahah! That’s a mighty fine shout!\p" - .string "Doesn’t it bring back memories of those\n" - .string "days long gone by?$" + .string "Wir haben {STR_VAR_1} gefragt: “Als du\n" + .string "{STR_VAR_2} das erste Mal gesehen hast,\l" + .string "was war das für ein Gefühl?”\p" + .string "“{STR_VAR_3}!”\p" + .string "Juhuhuu! Das ist eine super Aussage!\p" + .string "Bringt sie euch nicht auch Erinnerungen\n" + .string "an längst vergangene Zeiten wieder?$" gTVFanClubOpinionsText3:: @ 81A8B9D - .string "We asked {STR_VAR_1}, “If you were to\n" - .string "liken your {STR_VAR_2} to something,\l" - .string "it would be...”\p" + .string "Wir haben {STR_VAR_1} gefragt: “Wenn du\n" + .string "{STR_VAR_2} mit etwas vergleichen\l" + .string "würdest, das du magst, was wäre das?”\p" .string "... ... ... ... ... ... ... ...\p" .string "“{STR_VAR_3}!”\p" - .string "Whoah-oh, now that’s an original idea!\p" - .string "You sure can sense the intensity of\n" - .string "feeling the TRAINER has for\l" - .string "{STR_VAR_2}.$" + .string "Huhuhuuu! Was für ein origineller\n" + .string "Vergleich!\p" + .string "Man spürt gleich das intensive Gefühl,\n" + .string "das der TRAINER für {STR_VAR_2}\l" + .string "empfindet!$" gTVFanClubOpinionsText4:: @ 81A8C77 - .string "And let’s see...\n" - .string "What was it about that {STR_VAR_2}\l" - .string "that so attracted {STR_VAR_1}?\p" + .string "Sehen wir mal weiter...\n" + .string "Und was genau findet {STR_VAR_1} so\l" + .string "anziehend an {STR_VAR_2}?\p" .string "... ... ... ... ... ... ... ...\p" .string "“{STR_VAR_3}!”\p" - .string "Whoa! Such a spectacular declaration!\p" - .string "The love of this TRAINER for the\n" - .string "{STR_VAR_2} comes across loud and clear!$" + .string "Heiaaa! Was für eine spektakuläre\n" + .string "Erklärung!\p" + .string "Die Liebe dieses TRAINERS zu seinem\n" + .string "{STR_VAR_2} wird mehr als deutlich!$" gTVFanClubOpinionsText5:: @ 81A8D45 - .string "Hm? Oh, there’s still more.\n" - .string "Let’s check it out!\p" - .string "Let me see, now...\p" - .string "We asked {STR_VAR_1}, “What do POKéMON\n" - .string "mean to you?”\p" + .string "Hm? Oh, da gibt es noch mehr.\n" + .string "Dem müssen wir mal nachgehen.\p" + .string "Lasst uns mal sehen...\p" + .string "Wir haben {STR_VAR_1} gefragt: “Was be-\n" + .string "deuten dir POKéMON?”\p" .string "... ... ... ... ... ...\p" .string "“{STR_VAR_3}!”\p" .string "Bravo!\p" - .string "That’s the best shout I’ve had all day!\p" + .string "Das ist das Beste des heutigen Tages!\p" .string "“{STR_VAR_3}!”\p" - .string "It makes you want to shout it out loud\n" - .string "again and again!\p" - .string "Now that we’ve had a great shout, it’s\n" - .string "time to say good-bye until next time!\p" - .string "So, let’s all have one last shout!\n" - .string "All together now...\p" + .string "Man will das immer und immer wieder\n" + .string "laut herausrufen!\p" + .string "Nach diesem großartigen Ausruf ist es\n" + .string "auch schon wieder Zeit, sich zu\l" + .string "verabschieden!\p" + .string "Also rufen wir jetzt zum Abschluss\n" + .string "alle zusammen...\p" .string "“{STR_VAR_3}!”$" gTVFanClubText1:: @ 81A8EC9 - .string "WE ARE THE POKéMON FAN CLUB!\p" - .string "We’re on the air!\p" - .string "Today, we’ll get rolling with the POKéMON\n" - .string "SURVEY CORNER.\p" - .string "Out of all the tales woven by POKéMON\n" - .string "and TRAINERS, what startling new drama\l" - .string "will grab our attention today?\p" - .string "Let me see...\p" - .string "This one!\p" - .string "We’ll start with this letter!\p" - .string "It’s a letter from {STR_VAR_1} about a\n" - .string "beloved {STR_VAR_2}.\p" - .string "Let’s see how passionately our writer\n" - .string "can express love for the {STR_VAR_2}!\l" - .string "Hmhm...$" + .string "WIR SIND DER POKéMON-FANCLUB.\p" + .string "Wir sind live auf Sendung!\p" + .string "Heute steht unsere Sendung ganz im\n" + .string "Zeichen unserer POKéMON-UMFRAGE. \p" + .string "Welcher der Geschichten, die TRAINER\n" + .string "und POKéMON uns liefern, wird heute\l" + .string "unsere Aufmerksamkeit gehören?\p" + .string "Mal sehen...\p" + .string "Diese hier!\p" + .string "Wir fangen mit diesem Brief an!\p" + .string "Dies ist ein Brief von {STR_VAR_1} über\n" + .string "ein geliebtes {STR_VAR_2}.\p" + .string "Mal sehen, wie leidenschaftlich der\n" + .string "Schreiber seine Liebe zu {STR_VAR_2}\l" + .string "ausdrückt! Hmhm...$" gTVFanClubText2:: @ 81A9048 - .string "Whoah!\n" - .string "What an amazing letter!$" + .string "Hui!\n" + .string "Was für ein wunderbarer Brief!$" gTVFanClubText3:: @ 81A9067 - .string "I loved it, so here it is again!$" + .string "Ich liebe ihn, ich muss ihn nochmal lesen!$" gTVFanClubText4:: @ 81A9088 - .string "A great letter bears reading over\n" - .string "and over!$" + .string "Ein großartiger Brief, den man immer und\n" + .string "immer wieder lesen muss.$" gTVFanClubText5:: @ 81A90B4 - .string "The bit “{STR_VAR_3},” that really\n" - .string "accentuates emotional impact!\p" - .string "It’s a great letter that has real\n" - .string "heartfelt depth!$" + .string "Dieses kleine “{STR_VAR_3}!” zeigt\n" + .string "die unglaublich emotionale Bindung!\p" + .string "Ein großartiger Brief mit einer das Herz\n" + .string "erwärmenden Tiefe!$" gTVFanClubText6:: @ 81A911F - .string "Especially that “{STR_VAR_3}” bit!\p" - .string "I love how “{STR_VAR_3}” is used!$" + .string "Besonders das kleine “{STR_VAR_3}”!\p" + .string "Ich liebe es, wie “{STR_VAR_3}” hier\n" + .string "gebraucht wird!$" gTVFanClubText7:: @ 81A9152 - .string "By the way, and it’s not important,\n" - .string "but “{STR_VAR_3}” is a great saying.\p" - .string "I’ve been using “{STR_VAR_3}” a lot\n" - .string "in conversations lately.$" + .string "Übrigens, auch wenn es nicht wirklich\n" + .string "wichtig ist, “{STR_VAR_3}” ist\l" + .string "eine super Aussage.\p" + .string "Ich werde “{STR_VAR_3}” ab sofort in\n" + .string "meiner Konversation einsetzen.$" gTVFanClubText8:: @ 81A91C6 - .string "If I had to score this letter,\n" - .string "I’d give it {STR_VAR_3} points.\p" - .string "Next time, I’ll be expecting an even\n" - .string "better letter, {STR_VAR_1}!\p" - .string "A-whoops, will you look at the time?\n" - .string "Time to say good-bye until next time!$" + .string "Wenn ich diesen Brief bewerten müsste,\n" + .string "bekäme er {STR_VAR_3} Punkte von mir.\p" + .string "Und für das nächste Mal erwarte ich\n" + .string "einen noch besseren Brief, {STR_VAR_1}!\p" + .string "Hui je, schaut euch nur die Uhrzeit an!\n" + .string "Für heute sage ich Tschüss. Bis zum\l" + .string "nächsten Mal.$" SlateportCity_OceanicMuseum_1F_Text_1A927F:: @ 81A927F - .string "Oh?\n" - .string "Do you perhaps like POKéMON?\p" - .string "I’m on assignment with the TV network.\p" - .string "I’m gathering stories on POKéMON and\n" - .string "TRAINERS that occurred recently.\p" - .string "If you don’t mind, could you tell me\n" - .string "something about yourself?$" + .string "Ach!\n" + .string "Magst du vielleicht POKéMON?\p" + .string "Ich habe einen Vertrag mit einem Fern-\n" + .string "sehsender.\p" + .string "Ich sammle aktuelle Geschichten von\n" + .string "POKéMON und ihren TRAINERN.\p" + .string "Hättest du Lust, mir etwas von dir zu\n" + .string "erzählen?$" SlateportCity_OceanicMuseum_1F_Text_1A934C:: @ 81A934C - .string "I’m gathering stories on POKéMON and\n" - .string "TRAINERS that occurred recently.\p" - .string "If you don’t mind, could you tell me\n" - .string "something about yourself?$" + .string "Ich sammle aktuelle Geschichten von\n" + .string "POKéMON und ihren TRAINERN.\p" + .string "Hättest du Lust, mir etwas von dir zu\n" + .string "erzählen?$" SlateportCity_OceanicMuseum_1F_Text_1A93D1:: @ 81A93D1 - .string "Oh, you will?\n" - .string "Thank you!\p" - .string "Then, please, tell me anything of\n" - .string "interest that you experienced recently\l" - .string "involving POKéMON.$" + .string "Oh, du hast Lust dazu?!?\n" + .string "Wunderbar! Danke schön!\p" + .string "Dann erzähl mir doch bitte von\n" + .string "interessanten Begebenheiten, in denen\l" + .string "POKéMON eine Rolle spielen.$" SlateportCity_OceanicMuseum_1F_Text_1A9446:: @ 81A9446 - .string "Oh, I see...\p" - .string "Well, if you do have an interesting\n" - .string "story to tell, please let me know.$" + .string "Oh, ich versteh’ schon...\p" + .string "Nun, wenn du mir eine interessante\n" + .string "Geschichte erzählen kannst, sag es mir.$" SlateportCity_OceanicMuseum_1F_Text_1A949A:: @ 81A949A - .string "Oh, what an uplifting story!\p" - .string "I’ll be sure to get your story told\n" - .string "on television.\p" - .string "It should be aired sometime, I think,\n" - .string "so please look forward to it.$" + .string "Hach, eine erhebende Geschichte!\p" + .string "Ich bin sicher, deine Geschichte wird\n" + .string "im Fernsehen ausgestrahlt.\p" + .string "Irgendwann bestimmt. Also, verpasse\n" + .string "sie nicht!$" SlateportCity_OceanicMuseum_1F_Text_1A952E:: @ 81A952E - .string "Hmmm...\n" - .string "I’ve got a good story for a TV program.\p" - .string "I’d better write it up in a hurry!$" + .string "Hmmm... Da habe ich eine wirklich gute\n" + .string "Geschichte für das Fernsehprogramm.\p" + .string "Ich sollte sie schnell aufschreiben!$" gTVRecentHappeningsText1:: @ 81A9581 - .string "Hello, it’s time for RECENT HAPPENINGS.\p" - .string "For POKéMON TRAINERS, every day is\n" - .string "a storybook tale.\p" - .string "What we want to do is to introduce you\n" - .string "to some of these POKéMON tales.\p" - .string "Today, we bring you the story of the\n" + .string "Hallo, es ist Zeit für INTERESSANTE\n" + .string "GESCHICHTEN.\p" + .string "Für einen POKéMON-TRAINER ist jeder\n" + .string "Tag ein Tag voller Geschichten.\p" + .string "Wir möchten heute einige dieser \n" + .string "POKéMON-Geschichten erzählen.\p" + .string "Heute erzählen wir die Geschichte von\n" .string "TRAINER {STR_VAR_1}.\p" - .string "What did {STR_VAR_1} experience recently?\n" - .string "Let’s find out.\p" - .string "Let’s see...$" + .string "Was mag {STR_VAR_1} wohl erlebt haben?\n" + .string "Lasst es uns herausfinden.\p" + .string "Mal sehen...$" gTVRecentHappeningsText2:: @ 81A9694 - .string "Wasn’t that enlightening?\p" - .string "The story gives you a clear idea of what\n" - .string "{STR_VAR_1} has experienced recently.\l" - .string "It’s as if we were there as witnesses!$" + .string "War das nicht aufschlussreich?\p" + .string "Diese Geschichte gibt genau wieder, was\n" + .string "{STR_VAR_1} vor kurzem erlebt hat. So, als\l" + .string "hätten wir es selber erlebt.$" gTVRecentHappeningsText3:: @ 81A971B - .string "“{STR_VAR_3}.” That\n" - .string "accents the tale and gives it depth.$" + .string "“{STR_VAR_3}”. Das gibt\n" + .string "der Geschichte Akzente und Tiefe.$" gTVRecentHappeningsText4:: @ 81A974B - .string "“{STR_VAR_3}.”\n" - .string "That gives the tale a sense of place.\l" - .string "It lets us envision the tale’s setting.$" + .string "“{STR_VAR_3}.” Das gibt\n" + .string "uns einen Eindruck von dem Schauplatz.\l" + .string "Wir können uns alles besser vorstellen.$" gTVRecentHappeningsText5:: @ 81A979F - .string "The “{STR_VAR_3}”\n" - .string "section of the tale is very expressive.$" + .string "“{STR_VAR_3}” war die\n" + .string "eindrucksvollste Stelle der Geschichte.$" gTVRecentHappeningsText6:: @ 81A97D0 - .string "{STR_VAR_1} has recounted a wonderful\n" - .string "tale involving POKéMON.\p" - .string "And now {STR_VAR_1}’s tale is indelibly\n" - .string "etched into your soul, too.\p" - .string "That’s it for today.\n" - .string "Please tune in next time.$" - + .string "{STR_VAR_1} hat uns eine wundervolle Ge-\n" + .string "schichte mit POKéMON erzählt.\p" + .string "Und nun hat sich diese Geschichte tief\n" + .string "in unsere Seelen eingebrannt.\p" + .string "Das war es für heute. Bitte schaltet\n" + .string "auch nächstes Mal wieder ein.$" gTVPokemonOutbreakText:: @ 81A986F - .string "Greetings!\n" - .string "It’s time for POKéMON NEWS.\p" - .string "We’ve just received word of a very\n" - .string "rare occurrence.\p" - .string "There have been reports of a mass\n" - .string "outbreak of {STR_VAR_2} in the vicinity\l" - .string "of {STR_VAR_1}.\p" - .string "{STR_VAR_2}, as you’re probably aware,\n" - .string "is known as a POKéMON that’s rare\l" - .string "and hard to find.\p" - .string "It sounds like a rare opportunity to\n" - .string "see the mystifying outbreak of\l" - .string "{STR_VAR_2} in the wild.\p" - .string "That’s the news on POKéMON NEWS.$" + .string "Guten Tag, meine Damen und Herren!\n" + .string "Hier sind die POKéMON NACHRICHTEN.\p" + .string "Wir haben soeben von einem sehr\n" + .string "seltenen Ereignis erfahren.\p" + .string "Es wird berichtet, dass es in der Umge-\n" + .string "bung von {STR_VAR_1} zu einem Massen-\l" + .string "aufkommen der {STR_VAR_2} kam.\p" + .string "{STR_VAR_2}, das ist bestimmt jedem be-\n" + .string "kannt, ist ein seltenes POKéMON,\l" + .string "das nur sehr schwer zu finden ist.\p" + .string "Das scheint eine seltene Gelegenheit zu\n" + .string "sein, den Ausbruch von wilden\l" + .string "{STR_VAR_2} zu beobachten.\p" + .string "Das waren die POKéMON NACHRICHTEN.$" gTVNameRaterText1:: @ 81A99D9 - .string "And now, it’s time for...\n" - .string "THE NAME RATER SHOW.\p" - .string "I tell your POKéMON’s fortune from\n" - .string "the nickname you’ve bestowed.\p" - .string "Advice is what I have to give, and it is\n" - .string "helpful advice that I offer.\p" - .string "Today, I shall prophesize the nickname\n" - .string "{STR_VAR_3} of {STR_VAR_1}’s POKéMON\l" - .string "{STR_VAR_2}.\p" + .string "Und nun ist es wieder Zeit für...\n" + .string "DIE NAMENBEWERTER SHOW\p" + .string "Ich sage die Zukunft eures POKéMON\n" + .string "anhand seines Kosenamens vorher.\p" + .string "Ratschläge habe ich zu geben und\n" + .string "hilfreiche Ratschläge biete ich an.\p" + .string "Heute basiert meine Prophezeiung auf\n" + .string "dem Kosenamen {STR_VAR_3} von dem\l" + .string "POKéMON {STR_VAR_2} von {STR_VAR_1}.\p" .string "Hmhm...\p" .string "Hmm...\n" - .string "This nickname is...$" + .string "Dieser Kosename...$" gTVNameRaterText2:: @ 81A9AF0 - .string "A nickname that hints at talent in many\n" - .string "different ways.\p" - .string "I urge this TRAINER to take courage\n" - .string "and take on many challenges.$" + .string "Ein Kosename, der auf ein vielfältiges\n" + .string "Talent hindeutet.\p" + .string "Ich rate dem TRAINER, mutig zu sein\n" + .string "und sich vielen Herausforderungen\l" + .string "zu stellen.$" gTVNameRaterText3:: @ 81A9B69 - .string "A nickname that perfectly complements\n" - .string "{STR_VAR_1}, the TRAINER’s name.\p" - .string "It suggests that you will forge a fine\n" - .string "partnership with precise timing.$" + .string "Dieser Kosename passt perfekt\n" + .string "zu {STR_VAR_1}, dem Namen des TRAINERS!\p" + .string "Ich sehe eine starke Partnerschaft, in\n" + .string "der das Timing perfekt ist.$" gTVNameRaterText4:: @ 81A9BEF - .string "A nickname fit for a unique individual\n" - .string "of a POKéMON!\p" - .string "If raised properly, this POKéMON’s\n" - .string "uniqueness will bloom excessively!$" + .string "Dieser Kosename betont die einzig-\n" + .string "artige Persönlichkeit des POKéMON.\p" + .string "Wird das POKéMON gut aufgezogen, ent-\n" + .string "wickelt sich seine Einzigartigkeit voll.$" gTVNameRaterText5:: @ 81A9C6A - .string "A nickname that will nurture the caring\n" - .string "and compassionate side of POKéMON.\p" - .string "If raised properly, this POKéMON will\n" - .string "come to exhibit real warmth!$" + .string "Dieser Kosename zeigt die mitfühlende\n" + .string "und fürsorgliche Seite der POKéMON.\p" + .string "Wird dieses POKéMON gut aufgezogen,\n" + .string "wird es sehr warmherzig sein!$" gTVNameRaterText6:: @ 81A9CF8 - .string "A very fine nickname that hints at\n" - .string "greatness to come.\p" - .string "I am intrigued about what the future\n" - .string "holds in store for this POKéMON.$" + .string "Ein schöner Kosename, der auf die\n" + .string "zukünftige Größe hindeutet.\p" + .string "Mich würde es schon interessieren, was\n" + .string "die Zukunft für dieses POKéMON bringt.$" gTVNameRaterText7:: @ 81A9D74 - .string "A good nickname that should make the\n" - .string "POKéMON hale and hearty!\p" - .string "That POKéMON should remain fit and\n" - .string "robust for a long, long time.$" + .string "Dieser gute Kosename sollte das\n" + .string "POKéMON kräftig und herzlich\l" + .string "werden lassen!\p" + .string "Dieses POKéMON wird für lange, lange\n" + .string "Zeit gesund und fit sein.$" gTVNameRaterText8:: @ 81A9DF3 - .string "A good nickname that should make the\n" - .string "POKéMON very active!\p" - .string "I should think that this POKéMON will be\n" - .string "a strong performer in battles.$" + .string "Dieser gute Kosename sollte das\n" + .string "POKéMON sehr aktiv machen!\p" + .string "Ich denke, das POKéMON wird in\n" + .string "Kämpfen stark auftreten.$" gTVNameRaterText9:: @ 81A9E75 - .string "An appealing nickname that should make\n" - .string "the POKéMON very charming!\p" - .string "I don’t doubt that this POKéMON will be\n" - .string "quite the charmer in POKéMON CONTESTS.$" + .string "Ein ansprechender Kosename, der dem\n" + .string "POKéMON Charme verleihen wird!\p" + .string "Ich bezweifle nicht, dass das POKéMON\n" + .string "in einem POKéMON WETTBEWERB alle\l" + .string "mit seinem Charme betören wird!$" gTVNameRaterText10:: @ 81A9F06 - .string "The nickname {STR_VAR_1} is rooted by\n" - .string "the letter “{STR_VAR_3}.”\p" - .string "That letter is supported by the first\n" - .string "letter “{STR_VAR_2},” which gives it a solid sense\l" - .string "of presence as a nickname.$" + .string "Der Kosename {STR_VAR_1} wurzelt in\n" + .string "dem Buchstaben “{STR_VAR_3}”.\p" + .string "Der Buchstabe wird noch verstärkt\n" + .string "durch den Anfangsbuchstaben “{STR_VAR_2}”,\p" + .string "wodurch der Kosename eine starke\n" + .string "Ausstrahlung bekommt.$" gTVNameRaterText11:: @ 81A9F9F - .string "The nickname {STR_VAR_1} is very\n" - .string "shapely in a pleasing manner.\p" - .string "The presence of the letters “{STR_VAR_2}” and\n" - .string "“{STR_VAR_3}” - now that is remarkably good!$" + .string "Der Kosename {STR_VAR_1} ist auf \n" + .string "ansprechende Weise wohlklingend.\p" + .string "Die Ausstrahlung der Buchstaben “{STR_VAR_2}”\n" + .string "und “{STR_VAR_3}” - einfach bemerkenswert!$" gTVNameRaterText12:: @ 81AA01E - .string "The nickname {STR_VAR_1} - it has a\n" - .string "sublime, flowing feel to it.\p" - .string "The flow from the initial letter “{STR_VAR_2}” to\n" - .string "“{STR_VAR_3}” is especially wonderful.$" + .string "Der Kosename {STR_VAR_1} - er strahlt\n" + .string "ein sublimes, fließendes Gefühl aus.\p" + .string "Der Fluss des ersten Buchstaben “{STR_VAR_2}”\n" + .string "bis hin zum “{STR_VAR_3}” ist wunderbar.$" gTVNameRaterText13:: @ 81AA09D - .string "Let’s examine other examples of fine\n" - .string "nicknames, shall we?$" + .string "Lasst uns weitere Beispiele für gute\n" + .string "Kosenamen untersuchen.$" gTVNameRaterText14:: @ 81AA0D7 - .string "Try this example. Take a part of the\n" - .string "TRAINER name of {STR_VAR_1}, and end\l" - .string "up with the fine nickname {STR_VAR_2}{STR_VAR_3}.$" + .string "Nehmen wir zum Beispiel einen Teil des\n" + .string "Namens von TRAINER {STR_VAR_1}. Wir er-\l" + .string "halten den schönen Kosenamen {STR_VAR_2}{STR_VAR_3}.$" gTVNameRaterText15:: @ 81AA138 - .string "The nickname {STR_VAR_2}{STR_VAR_3} would also work\n" - .string "quite well.$" + .string "Natürlich wäre der Kosename {STR_VAR_2}{STR_VAR_3}\n" + .string "genauso schön.$" gTVNameRaterText16:: @ 81AA166 - .string "The POKéMON’s species name of\n" - .string "{STR_VAR_2} could be used as the basis\l" - .string "for making the nickname {STR_VAR_1}{STR_VAR_3}.$" + .string "Der Name der POKéMON-Kategorie\n" + .string "{STR_VAR_2} kann ebenfalls als Basis für\l" + .string "den Kosenamen {STR_VAR_1}{STR_VAR_3} dienen.$" gTVNameRaterText17:: @ 81AA1C0 - .string "{STR_VAR_1}{STR_VAR_3} would also be an effective\n" - .string "nickname.$" + .string "{STR_VAR_1}{STR_VAR_3} ist ebenfalls ein anziehender\n" + .string "Kosename.$" gTVNameRaterText18:: @ 81AA1EA - .string "What should always be avoided is using\n" - .string "another POKéMON species name.\p" - .string "For instance, avoid taking the name of\n" - .string "{STR_VAR_2} to make the nickname {STR_VAR_1}{STR_VAR_3}.\l" - .string "That is unacceptable.$" + .string "Man sollte niemals einem POKéMON die\n" + .string "Kategoriebezeichnung eines anderen\l" + .string "POKéMON als Kosenamen geben!\p" + .string "Zum Beispiel sollte der Name von\n" + .string "{STR_VAR_2} nicht für den Namen {STR_VAR_1}{STR_VAR_3}\l" + .string "verwendet werden.$" gTVNameRaterText19:: @ 81AA28A - .string "But I must say, {STR_VAR_2} has a most\n" - .string "remarkable flair for devising nicknames.\p" - .string "It is my hope that the TRAINER will\n" - .string "continue to treat {STR_VAR_1} with love.\p" - .string "That’s it for today’s show.\n" - .string "May we meet again.$" + .string "Aber ich gebe zu, {STR_VAR_2}\n" + .string "liegt die Vergabe der Namen geradezu\l" + .string "im Blut.\p" + .string "Und ich hoffe, dass der TRAINER\n" + .string "{STR_VAR_1} weiter liebevoll behandelt.\p" + .string "Das war unsere heutige Show.\n" + .string "Wir sehen uns hoffentlich bald wieder.$" gTVFishingGuruAdviceText1:: @ 81AA344 - .string "{STR_VAR_2} ANGLER\p" - .string "ANNOUNCER: Hello! Today, we’ll get tips\n" - .string "on fishing for {STR_VAR_2}.\p" - .string "GURU, what advice can you give for\n" - .string "catching {STR_VAR_2}?\p" - .string "GURU: Hm? Catching {STR_VAR_2}?\n" - .string "Well, let me tell you, be patient and wait.\l" - .string "That’s the bottom line.\p" - .string "Do you see {STR_VAR_1} over there?\n" - .string "That TRAINER makes a good example.\p" - .string "That TRAINER’s already had {STR_VAR_3}\n" - .string "POKéMON get away.\p" - .string "But there {STR_VAR_1} waits. No giving up.\n" - .string "That’s the law for catching {STR_VAR_2}.\p" - .string "ANNOUNCER: I see...\p" - .string "Oh! {STR_VAR_1} has finally landed an\n" - .string "elusive {STR_VAR_2}!\p" - .string "The TRAINER appears close to tears\n" - .string "out of sheer joy!\p" - .string "Seeing that elated look, I’m getting\n" - .string "the itch to go fishing, too!\p" - .string "Viewers, why not take this as a cue to\n" - .string "try some {STR_VAR_2} fishing?\p" - .string "Until our next broadcast, farewell and\n" - .string "good fishing to you all!$" + .string " {STR_VAR_2}-ANGLER\p" + .string "MODERATOR: Hallo! Heute gibt uns\n" + .string "{STR_VAR_2} Tipps zum Angeln.\p" + .string "GURU, welchen Ratschlag haben\n" + .string "Sie für uns?\p" + .string "GURU: Hm? Ein {STR_VAR_2} fangen?\n" + .string "Nun, zunächst sind Geduld und Ausdauer\l" + .string "gefragt. Das ist das Wichtigste.\p" + .string "Sehen Sie {STR_VAR_1} dort drüben?\n" + .string "Dieser TRAINER ist ein gutes Beispiel.\p" + .string "Der TRAINER hat bereits {STR_VAR_3}\n" + .string "POKéMON entkommen lassen.\p" + .string "Aber {STR_VAR_1} wartet ab. Gibt nicht auf.\n" + .string "Das ist die erste Regel beim Angeln von\l" + .string "{STR_VAR_2}.\p" + .string "MODERATOR: Ich verstehe...\p" + .string "Oh! {STR_VAR_1} hat endlich das extrem\n" + .string "schnelle {STR_VAR_2} gefangen!\p" + .string "Der TRAINER ist den Tränen nahe vor\n" + .string "Freude!\p" + .string "Wenn ich diesen begeisterten Ausdruck\n" + .string "sehe, möchte ich auch Angeln gehen.\p" + .string "Zuschauer, warum nutzen Sie nicht die\n" + .string "Chance, einige {STR_VAR_2} zu fischen?\p" + .string "Bis zur nächsten Sendung leben Sie wohl\n" + .string "und Petri heil!$" gTVFishingGuruAdviceText2:: @ 81AA5F3 - .string "{STR_VAR_2} ANGLER\p" - .string "ANNOUNCER: Hello! Today, we’ll get tips\n" - .string "on fishing for {STR_VAR_2}.\p" - .string "GURU, what advice can you give for\n" - .string "catching {STR_VAR_2}?\p" - .string "GURU: Hm? Catching {STR_VAR_2}?\n" - .string "Well, let me tell you, use your fishing\l" - .string "ROD with vigor!\p" - .string "Do you see {STR_VAR_1} over there?\n" - .string "See how the ROD is handled?\p" - .string "That TRAINER’s already caught\n" - .string "{STR_VAR_3} in a row.\p" - .string "ANNOUNCER: It’s incredible!\n" - .string "It looks like a storm...\p" - .string "Seeing technique of that caliber, I’m\n" - .string "getting the itch to go fishing, too.\p" - .string "Viewers, why not take this as a cue to\n" - .string "try some {STR_VAR_2} fishing?\p" - .string "Until our next broadcast, farewell and\n" - .string "good fishing to you all!$" + .string " {STR_VAR_2}-ANGLER\p" + .string "MODERATOR: Hallo! Heute gibt uns\n" + .string "{STR_VAR_2} Tipps für das Angeln.\p" + .string "GURU, welchen Ratschlag haben\n" + .string "Sie für uns?\p" + .string "GURU: Hm? {STR_VAR_2} fangen?\n" + .string "Nun, setzen Sie Ihre ANGEL mit viel\l" + .string "Kraft ein.\p" + .string "Sehen Sie {STR_VAR_1} dort drüben?\n" + .string "Wie hier die ANGEL gehandhabt wird?\p" + .string "Der TRAINER hat bereits {STR_VAR_3}\n" + .string "fangen können.\p" + .string "MODERATOR: Das ist unglaublich!\n" + .string "Es wirkt wie ein Sturm...\p" + .string "Wenn ich solche Techniken beobachte,\n" + .string "möchte ich auch sofort Angeln gehen.\p" + .string "Zuschauer, warum nutzen Sie nicht die\n" + .string "Chance, einige {STR_VAR_2} zu fischen?\p" + .string "Bis zur nächsten Sendung leben Sie wohl\n" + .string "und Petri heil!$" gTVPokemonTodayFailedCaptureText1:: @ 81AA814 - .string "Hello!\p" - .string "It’s time for POKéMON TODAY!\p" - .string "BIG SIS: Hi! Is everyone peachy and\n" - .string "perky today?\p" - .string "Today, we’re going to look at {STR_VAR_1}’s\n" - .string "POKéMON {STR_VAR_2}!\p" - .string "BIG BRO: Yeah! That’s what we’re going\n" - .string "to do!$" + .string "Hallo!\p" + .string "Willkommen bei POKéMON HEUTE!\p" + .string "SCHWESTER: Hallo! Alles gesund\n" + .string "und munter?\p" + .string "Heute werfen wir einen Blick auf das\n" + .string "POKéMON {STR_VAR_2} von {STR_VAR_1}!\p" + .string "BRUDER: Yeah! Genau das werden wir tun!$" gTVPokemonTodayFailedCaptureText2:: @ 81AA8C6 .string "Oh!\n" - .string "Speaking of {STR_VAR_1}...\p" - .string "BIG SIS, I saw the TRAINER with my very\n" - .string "own eyes!\p" - .string "BIG SIS: Oh, what did you see?\p" - .string "BIG BRO: Well, I had to go on a trip to\n" - .string "{STR_VAR_2}.\p" - .string "That’s when I happened to come across\n" - .string "{STR_VAR_1}, who was trying to catch the\l" - .string "POKéMON {STR_VAR_3}, but...$" + .string "Da wir gerade über {STR_VAR_1} sprechen...\p" + .string "SCHWESTER, ich habe den TRAINER mit\n" + .string "eigenen Augen gesehen!\p" + .string "SCHWESTER: Und was hast du\n" + .string "beobachtet?\p" + .string "BRUDER: Nun, ich war gerade unterwegs\n" + .string "nach {STR_VAR_2}.\p" + .string "Da sah ich, wie {STR_VAR_1} versuchte, das \n" + .string "POKéMON {STR_VAR_3} zu fangen, aber...$" gTVPokemonTodayFailedCaptureText3:: @ 81AA9B2 - .string "The POKéMON managed to get away!\p" - .string "It ended up wasting this many\n" - .string "POKé BALLS: {STR_VAR_2}!\p" - .string "You should have seen the expression\n" - .string "of frustration on {STR_VAR_1}’s face when\l" - .string "the POKéMON took off!$" + .string "Das POKéMON konnte flüchten!\p" + .string "Und wie viele POKéBÄLLE wurden am Ende\n" + .string "verbraucht? {STR_VAR_2}! Und das für nichts!\p" + .string "Du hättest den frustrierten Ausdruck\n" + .string "im Gesicht von {STR_VAR_1} sehen\p" + .string "sollen, als das POKéMON sich aus dem\n" + .string "Staub machte!$" gTVPokemonTodayFailedCaptureText4:: @ 81AAA5C - .string "But {STR_VAR_1} goofed and made the\n" - .string "POKéMON faint!\p" - .string "It ended up wasting this many\n" - .string "POKé BALLS: {STR_VAR_2}!\p" - .string "You should have seen the expression\n" - .string "of stunned dismay on {STR_VAR_1}’s face\l" - .string "when the POKéMON fainted!$" + .string "Aber {STR_VAR_1} hat zu lange daneben-\n" + .string "geworfen, bis das POKéMON\l" + .string "kampfunfähig wurde!\p" + .string "Und wie viele POKéBÄLLE wurden am Ende\n" + .string "verbraucht? {STR_VAR_2}! Und das für nichts!\p" + .string "Du hättest den Ausdruck fassungsloser\n" + .string "Bestürzung auf dem Gesicht von\l" + .string "{STR_VAR_1}\p" + .string "sehen sollen, als das POKéMON plötzlich\n" + .string "kampfunfähig wurde!$" gTVPokemonTodayFailedCaptureText5:: @ 81AAB11 - .string "BIG SIS: Hey, there!\n" - .string "That’s not nice!\p" - .string "You shouldn’t be laughing at other\n" - .string "people’s misfortune!\p" - .string "Oh, poor {STR_VAR_1}.\n" - .string "What a shame!\p" - .string "BIG BRO: That’s true!\n" - .string "Sorry for laughing.$" + .string "SCHWESTER: Hey, du da!\n" + .string "Das ist aber nicht nett!\p" + .string "Du solltest dich nicht über das Unglück\n" + .string "anderer lustig machen!\p" + .string "Oh, mir tut {STR_VAR_1} Leid.\n" + .string "Was für eine Schande!\p" + .string "BRUDER: Da hast du Recht!\n" + .string "Tut mir Leid, dass ich gelacht habe.$" gTVPokemonTodayFailedCaptureText6:: @ 81AABB4 - .string "BIG SIS: Bufufu...\p" - .string "BIG BRO: Hey!\n" - .string "You just laughed, too!\p" - .string "BIG SIS: Huh?!\p" - .string "I didn’t laugh!\n" - .string "Honestly, I didn’t!\p" - .string "Oh, poor {STR_VAR_1}.\n" - .string "What a shame!\p" - .string "BIG BRO: ...$" + .string "SCHWESTER: Räusper Haha Räusper Haha...\p" + .string "BRUDER: HEY!\n" + .string "Du lachst ja!\p" + .string "SCHWESTER: Ich???\p" + .string "Ich habe doch nicht gelacht!\n" + .string "Ehrlich nicht!\p" + .string "Mir tut {STR_VAR_1} echt Leid.\n" + .string "Was für eine Schande!\p" + .string "BRUDER: ...$" gTVPokemonTodayFailedCaptureText7:: @ 81AAC47 - .string "BIG SIS: That’s enough silliness!\n" - .string "Let’s look at today’s POKéMON...\p" - .string "Huh?\n" - .string "We’re out of time already?\p" - .string "Aww!\n" - .string "We couldn’t profile a POKéMON today!\p" - .string "BIG BRO: See you again next time!\p" - .string "BIG SIS: Hey, don’t end the show\n" - .string "without me!$" + .string "SCHWESTER: Schluss jetzt mit dem\n" + .string "Blödsinn! Lasst uns das heutige\l" + .string "POKéMON betrachten...\p" + .string "Wie?\n" + .string "Wir haben keine Zeit mehr dafür?\p" + .string "Oooh! Dann haben wir heute ja gar kein\n" + .string "POKéMON vorgestellt!\p" + .string "BRUDER: Also, bis zum nächsten Mal!\p" + .string "SCHWESTER: Hey, du kannst die Show\n" + .string "doch nicht einfach ohne mich beenden!$" gTVPokemonTodayText1:: @ 81AAD23 - .string "Hello!\p" - .string "It’s time for POKéMON TODAY!\p" - .string "BIG SIS: Hi! Is everyone peachy and\n" - .string "perky today?\p" - .string "Today, we’re going to look at {STR_VAR_1}’s\n" - .string "POKéMON {STR_VAR_2}!\p" - .string "BIG BRO: Yeah! That’s what we’re going\n" - .string "to do!$" + .string "Hallo!\p" + .string "Willkommen bei POKéMON HEUTE!\p" + .string "SCHWESTER: Hallo! Alles gesund\n" + .string "und munter?\p" + .string "Heute werfen wir einen Blick auf das\n" + .string "POKéMON {STR_VAR_2} von {STR_VAR_1}!\p" + .string "BRUDER: Yeah! Genau das werden wir tun!$" gTVPokemonTodayText2:: @ 81AADD5 - .string "BIG SIS: {STR_VAR_1} gave the nickname\n" - .string "{STR_VAR_3} to the {STR_VAR_2}!\p" - .string "It sounds like {STR_VAR_3} is getting\n" - .string "good, loving care!$" + .string "SCHWESTER: {STR_VAR_1} hat {STR_VAR_2} den\n" + .string "Kosenamen {STR_VAR_3} gegeben!\p" + .string "{STR_VAR_3} scheint wirklich liebevoll\n" + .string "behandelt zu werden.$" gTVPokemonTodayText3:: @ 81AAE31 - .string "BIG BRO: The TRAINER had to throw this\n" - .string "many BALLS to catch it: {STR_VAR_3}!\p" - .string "It finally took a single {STR_VAR_2}\n" - .string "to catch it!$" + .string "BRUDER: Und wie viele BÄLLE musste der\n" + .string "TRAINER werfen, um es zu fangen? {STR_VAR_3}!\p" + .string "Ein {STR_VAR_2} brachte den\n" + .string "gewünschten Erfolg!$" gTVPokemonTodayText4:: @ 81AAE9D - .string "BIG SIS: If it was that easy to catch,\n" - .string "it must have been destiny that brought\l" - .string "{STR_VAR_1} and the {STR_VAR_2} together!$" + .string "SCHWESTER: Wenn das Fangen so einfach\n" + .string "war, wollte das Schicksal {STR_VAR_1} und\l" + .string "{STR_VAR_2} wohl zusammenführen!$" gTVPokemonTodayText5:: @ 81AAF03 - .string "BIG SIS: Wow! That’s so neat!\p" - .string "But you know what they say, a POKéMON\n" - .string "that takes a lot of effort to catch\l" - .string "earns the love of its TRAINER!$" + .string "SCHWESTER: Wow! Wie aufregend!\p" + .string "Man sagt, dass ein POKéMON, das schwer\n" + .string "zu fangen ist, die Liebe seines\l" + .string "TRAINERS verdient!$" gTVPokemonTodayText6:: @ 81AAF8A - .string "BIG SIS: {STR_VAR_1}’s {STR_VAR_2} is a\n" - .string "memorable POKéMON because it took an\l" - .string "invaluable MASTER BALL to catch!\p" - .string "BIG BRO: Wow! That’s mega-awesome!\p" - .string "BIG SIS: {STR_VAR_1} must have really\n" - .string "wanted that {STR_VAR_2}, for sure!$" + .string "SCHWESTER: {STR_VAR_2} von {STR_VAR_1} ist\n" + .string "ein bemerkenswertes POKéMON, da\p" + .string "es nur mit dem unfehlbaren\n" + .string "MEISTERBALL gefangen werden konnte!\p" + .string "BRUDER: Wow! Das ist\n" + .string "mega-beeindruckend!\p" + .string "SCHWESTER: {STR_VAR_1} muss {STR_VAR_2} \n" + .string "wirklich gewollt haben! Mit Sicherheit!$" gTVPokemonTodayText7:: @ 81AB040 - .string "BIG BRO: Then to give the nickname\n" - .string "{STR_VAR_3} to that {STR_VAR_2}...\p" - .string "You really get a good idea about\n" - .string "{STR_VAR_1}’s TRAINER sense.\p" - .string "BIG SIS: I second that notion!$" + .string "BRUDER: Und dann erhält {STR_VAR_2}\n" + .string "auch noch den Kosenamen {STR_VAR_3}...\p" + .string "Das ermöglicht einen guten Einblick in\n" + .string "die Einstellung von TRAINER {STR_VAR_1}.\p" + .string "SCHWESTER: Das sehe ich auch so!$" gTVPokemonTodayText8:: @ 81AB0C8 - .string "If it were me, I’d give that\n" - .string "nickname to something like {STR_VAR_3}!\p" - .string "BIG BRO: Whoa! That could be the start\n" - .string "of something new!$" + .string "Ich würde diesen Kosenamen einem\n" + .string "{STR_VAR_3} geben!\p" + .string "BRUDER: Hui! Das wäre der Anfang von\n" + .string "etwas ganz Neuem.$" gTVPokemonTodayText9:: @ 81AB13D - .string "{STR_VAR_2} the {STR_VAR_1}?\n" - .string "Doesn’t that sound perfect?\p" - .string "The letters and everything - they sound\n" - .string "just right for the POKéMON {STR_VAR_1}!\p" - .string "BIG BRO: Yeah, true, that!$" + .string "{STR_VAR_2}, das {STR_VAR_1}?\n" + .string "Hört sich das nicht einfach perfekt an?\p" + .string "Die Buchstaben und alles - wie\n" + .string "geschaffen für das POKéMON\l" + .string "{STR_VAR_1}!\p" + .string "BRUDER: Yeah! Stimmt! Absolut!$" gTVPokemonTodayText10:: @ 81AB1C6 - .string "As far as I know, no TRAINER has ever\n" - .string "given the nickname {STR_VAR_2} to their\l" - .string "{STR_VAR_1}!\p" - .string "BIG BRO: That just goes to show what\n" - .string "great taste the TRAINER has in picking\l" - .string "nicknames!$" + .string "Soweit ich weiß, hat noch kein TRAINER\n" + .string "jemals seinem {STR_VAR_1} den\l" + .string "Kosenamen {STR_VAR_2} gegeben!\p" + .string "BRUDER: Das zeigt doch nur, welch einen\n" + .string "hervorragenden Geschmack der TRAINER\l" + .string "bei der Wahl des Kosenamens bewies!$" gTVPokemonTodayText11:: @ 81AB266 - .string "The next time I catch a POKéMON,\n" - .string "I should give it the name {STR_VAR_2}.\p" - .string "BIG BRO: Huh? Me, too!\n" - .string "I’ll use the nickname {STR_VAR_2}, too!$" + .string "Mein nächstes POKéMON bekommt den\n" + .string "Kosenamen {STR_VAR_2}.\p" + .string "BRUDER: Wie? Meines auch!\n" + .string "Ich werde es auch {STR_VAR_2} nennen!$" gTVPokemonTodayText12:: @ 81AB2DB - .string "BIG SIS: Oh, no!\n" - .string "Look at the time!\p" - .string "Well, gang, this is it for today.\n" - .string "See you again next time!\p" - .string "BIG BRO: Remember, it could be your\n" - .string "POKéMON in the spotlight next time!$" + .string "SCHWESTER: Oh je!\n" + .string "Schau dir nur die Uhrzeit an!\p" + .string "Nun, Freunde, das war es für heute.\n" + .string "Wir sehen uns das nächste Mal wieder!\p" + .string "BRUDER: Denkt daran, es könnte euer\n" + .string "POKéMON sein, das wir hier vorstellen!$" gTVSmartShopperText1:: @ 81AB381 - .string "Hello!\p" - .string "It’s time for TODAY’S SMART SHOPPER.\p" - .string "INTERVIEWER: How are you, viewers?\p" - .if REVISION >= 1 - .string "Today we’re visiting a shop\n" - .else - .string "Today we’re visiting the POKéMON MART\n" - .endif + .string "Hallo!\p" + .string "Zeit für den heutigen CLEVERKAUF!\p" + .string "INTERVIEWER: Wie geht es euch?\p" + .string "Heute besuchen wir ein Geschäft\n" .string "in {STR_VAR_2}.\p" - .string "Let’s check on what the hot sellers\n" - .string "have been recently.$" + .string "Schauen wir doch mal, welche Artikel\n" + .string "dort besonders begehrt sind.$" gTVSmartShopperText2:: @ 81AB435 - .string "Let’s interview the clerk to get the\n" - .string "lowdown.\p" - .string "Hi, how’s your business?\p" - .string "CLERK: Oh, we’re doing excellent.\p" - .string "Recently, {STR_VAR_2} has been selling\n" - .string "especially strongly.\p" - .string "Why, just the other day a TRAINER\n" - .string "named {STR_VAR_1} bought {STR_VAR_3}.$" + .string "Fragen wir doch einfach den Verkäufer\n" + .string "hier.\p" + .string "Hallo, wie läuft das Geschäft?\p" + .string "VERKÄUFER: Oh, ausgezeichnet!\p" + .string "Im Moment verkaufen wir {STR_VAR_2}\n" + .string "besonders gut.\p" + .string "Und gerade hat ein TRAINER namens\n" + .string "{STR_VAR_1} {STR_VAR_3} gekauft.$" gTVSmartShopperText3:: @ 81AB507 - .string "INTERVIEWER: The TRAINER bought\n" - .string "{STR_VAR_3} {STR_VAR_2}S? That’s a haul!\p" - .string "If I may say so, {STR_VAR_1} must have\n" - .string "been stocking up for a long journey\l" - .string "to far-off places.\p" - .string "For traveling, {STR_VAR_2}S are so\n" - .string "important!$" + .string "INTERVIEWER: Der TRAINER hat {STR_VAR_3}-mal\n" + .string "{STR_VAR_2} gekauft? Wow!\p" + .string "Mir scheint es, als ob {STR_VAR_1} sich\n" + .string "für eine längere Reise rüstet.\p" + .string "Auf Reisen ist {STR_VAR_2} einfach\n" + .string "unverzichtbar.$" gTVSmartShopperText4:: @ 81AB5B8 - .string "INTERVIEWER: Speaking of the item\n" - .string "{STR_VAR_2}, I just bought {STR_VAR_3} of\l" - .string "them recently.\p" - .string "After all, {STR_VAR_2}’s a great item!$" + .string "INTERVIEWER: Da wir gerade von\n" + .string "{STR_VAR_2} sprechen...\l" + .string "Ich habe {STR_VAR_3} gekauft.\p" + .string "{STR_VAR_2} ist ein großartiges Item!$" gTVSmartShopperText5:: @ 81AB61F - .string "INTERVIEWER: {STR_VAR_2}?!\n" - .string "But {STR_VAR_3} of them?!\p" - .string "I didn’t think there would be anyone\n" - .string "buying that many.\p" - .string "My goodness, I can only afford one or\n" - .string "two at a time...$" + .string "INTERVIEWER: {STR_VAR_2}?!?\n" + .string "Und gleich {STR_VAR_3} davon?!?\p" + .string "Ich hätte nicht gedacht, dass jemand\n" + .string "so viel davon kauft.\p" + .string "Meine Güte, ich könnte mir höchstens\n" + .string "ein oder zwei auf einmal davon leisten...$" gTVSmartShopperText6:: @ 81AB6B0 - .string "INTERVIEWER: One time, I bought\n" - .string "a whole lot of the item {STR_VAR_2}.\p" - .string "But it turned out to be too many.\n" - .string "I ended up regretting it...\p" - .string "Since then, I only buy strictly what\n" - .string "I absolutely need...\p" - .string "Oops!\p" - .string "There’s no point talking about me!$" + .string "INTERVIEWER: Ich habe erst ein Mal\n" + .string "sehr viel gekauft. Eine große\l" + .string "Stückzahl des Items {STR_VAR_2}.\p" + .string "Aber schließlich war auch das zu viel.\n" + .string "Ich habe es hinterher echt bereut...\p" + .string "Seitdem kaufe ich grundsätzlich nur\n" + .string "noch das, was ich wirklich brauche...\p" + .string "Huups!\p" + .string "Wir wollen doch hier nicht über mich\n" + .string "reden!$" gTVSmartShopperText7:: @ 81AB78D - .string "CLERK: {STR_VAR_1} also bought the item\n" - .string "{STR_VAR_2} in bulk, taking {STR_VAR_3}.\p" - .string "INTERVIEWER: Oh, that’s smart.\n" - .string "{STR_VAR_2}’s a very good item, too.$" + .string "VERKÄUFER: {STR_VAR_1} hat auch von dem\n" + .string "Item {STR_VAR_2} gleich {STR_VAR_3} Exemplare\l" + .string "gekauft.\p" + .string "INTERVIEWER: Oh, das ist clever.\n" + .string "{STR_VAR_2} ist ein sehr gutes Item...$" gTVSmartShopperText8:: @ 81AB7FE - .string "CLERK: And, the TRAINER also bought\n" - .string "{STR_VAR_3} of the item {STR_VAR_2}.$" + .string "VERKÄUFER: Und der TRAINER kaufte\n" + .string "von dem Item {STR_VAR_2} {STR_VAR_3}\l" + .string "Exemplare.$" gTVSmartShopperText9:: @ 81AB835 - .string "CLERK: Plus, it was during a big sale.\n" - .string "That’s smart shopping.$" + .string "VERKÄUFER: Und zwar als es im Sonder-\n" + .string "angebot war. Clever!!!$" gTVSmartShopperText10:: @ 81AB873 - .string "INTERVIEWER: Hmm... {STR_VAR_1} sounds like\n" - .string "quite the shrewd bargain hunter!\p" - .string "In total, {STR_VAR_1}’s purchases came to...\p" - .string "¥{STR_VAR_2}?!\n" - .string "What an amazing sum!\p" - .string "Oops! We’re out of time!\n" - .string "See you on our next broadcast!$" + .string "INTERVIEWER: Hmm... {STR_VAR_1} scheint ein\n" + .string "richtiger Schnäppchenjäger zu sein!\p" + .string "{STR_VAR_1} brauchte also für alles nur...\p" + .string "¥{STR_VAR_2} zu bezahlen?!?\n" + .string "Wie unglaublich günstig!\p" + .string "Oh! Wir sind am Ende unserer Sendung!\n" + .string "Bis zum nächsten Mal! Auf Wiedersehen!$" gTVSmartShopperText11:: @ 81AB92E - .string "CLERK: {STR_VAR_1} is a VIP customer,\n" - .string "no doubt about it.$" + .string "VERKÄUFER: {STR_VAR_1} ist ein VIP-Kunde,\n" + .string "daran besteht kein Zweifel.$" gTVSmartShopperText12:: @ 81AB95E - .string "Let’s interview the clerk to get the\n" - .string "lowdown.\p" - .string "Hi, how’s your business?\p" - .string "CLERK: Oh, we’re doing unbelievable\n" - .string "business. It’s almost overwhelming.\p" - .string "Recently, a TRAINER named {STR_VAR_1}\n" - .string "bought the item {STR_VAR_2}in bulk.\p" - .string "The TRAINER almost cleared out our\n" - .string "entire stock of {STR_VAR_2}S.\p" - .string "I never dreamt that any customer\n" - .string "would ever need so many {STR_VAR_2}S.\l" - .string "It’s just unheard of!\p" - .string "INTERVIEWER: So that would be like 100\n" - .string "or 200 sold?\p" - .string "CLERK: Oh, no, much more than that!\p" - .string "INTERVIEWER: Oh, my goodness!\n" - .string "{STR_VAR_1} must be a special shopper!\p" - .string "CLERK: {STR_VAR_1} is a VIP customer,\n" - .string "no doubt about it.$" + .string "Fragen wir doch mal den Verkäufer.\p" + .string "Hallo, wie läuft das Geschäft?\p" + .string "VERKÄUFER: Oh, es ist einfach un-\n" + .string "glaublich. Einfach überwältigend.\p" + .string "Vor kurzem hat ein TRAINER namens\n" + .string "{STR_VAR_1} das Item {STR_VAR_2}\l" + .string "in großer Stückzahl gekauft.\p" + .string "Er hat fast das ganze Regal mit\n" + .string "{STR_VAR_2} leergeräumt.\p" + .string "Ich hätte nie gedacht, dass es einen\n" + .string "TRAINER gibt, der {STR_VAR_2} \l" + .string "in so großen Mengen benötigt!\p" + .string "INTERVIEWER: Das waren dann ja 100\n" + .string "oder 200 Exemplare!?!\p" + .string "VERKÄUFER: Oh, nein. Viel, viel mehr!\p" + .string "INTERVIEWER: Du meine Güte! {STR_VAR_1}\n" + .string "muss ein ganz besonderer Kunde sein!\p" + .string "VERKÄUFER: {STR_VAR_1} ist ein VIP-Kunde,\n" + .string "daran besteht gar kein Zweifel!$" gTVSmartShopperText13:: @ 81ABB75 .string "INTERVIEWER: Hmm...\n" - .string "That is amazing.\p" - .string "But why would the TRAINER need to buy\n" - .string "so many?\p" + .string "Das ist unglaublich.\p" + .string "Aber warum hat der TRAINER wohl gleich\n" + .string "so viel auf einmal gekauft?\p" .string "... ...\p" - .string "The mystery deepens, but this is all\n" - .string "the time we have today.\l" - .string "See you on our next broadcast!\p" - .string "Still, {STR_VAR_1} is certainly an enigma...$" + .string "Ein Mysterium... Aber leider haben wir\n" + .string "keine Zeit mehr, hinter das Geheimnis\l" + .string "zu kommen. Bis zur nächsten Sendung!\p" + .string "{STR_VAR_1} muss ein Rätsel bleiben...$" gTVWorldOfMastersText1:: @ 81ABC51 - .string "THE WORLD OF MASTERS\p" - .string "Hello, viewers.\p" - .string "Perhaps you are aware of a TRAINER\n" - .string "named {STR_VAR_1}.\p" - .string "{STR_VAR_1} is famous as a master at\n" - .string "catching POKéMON.\p" - .string "{STR_VAR_1}’s quest for POKéMON depends\n" - .string "entirely on a careful search on foot.\p" - .string "On one memorable day, the TRAINER\n" - .string "walked some {STR_VAR_2} steps.\p" - .string "The total number of POKéMON caught\n" - .string "that day reached an impressive {STR_VAR_3}!$" + .string "DIE WELT DER MEISTER\p" + .string "Hallo, liebe Zuschauer.\p" + .string "Vielleicht ist Ihnen schon einmal der\n" + .string "TRAINER {STR_VAR_1} begegnet.\p" + .string "{STR_VAR_1} ist berühmt als Meister im\n" + .string "Fangen von POKéMON.\p" + .string "Der Erfolg von {STR_VAR_1} im Fangen von\n" + .string "POKéMON basiert auf einer gründlichen\l" + .string "Suche, die zu Fuß stattfindet.\p" + .string "Eines denkwürdigen Tages machte\n" + .string "der TRAINER {STR_VAR_2} Schritte.\p" + .string "Die Gesamtzahl der an diesem Tag\n" + .string "gefangenen POKéMON betrug {STR_VAR_3}!$" gTVWorldOfMastersText2:: @ 81ABD94 - .string "That remarkable feat must have been\n" - .string "possible because of the trust between\l" - .string "the TRAINER and {STR_VAR_1}.$" + .string "Diese bemerkenswerte Leistung war nur\n" + .string "möglich, weil zwischen dem TRAINER und\l" + .string "{STR_VAR_1} tiefes Vertrauen besteht.$" gTVWorldOfMastersText3:: @ 81ABDF2 - .string "The master caught the day’s last\n" - .string "{STR_VAR_3} near {STR_VAR_2}.\p" - .string "That POKéMON apparently enjoys\n" - .string "a special status as a record holder.\p" - .string "Skilled TRAINERS should be encouraged\n" - .string "to challenge this fine record.\p" - .string "That’s all for today.\n" - .string "Please tune in next time.$" + .string "Der Meister hat das letzte {STR_VAR_3}\n" + .string "an diesem Tage in der Nähe von\l" + .string "{STR_VAR_2} gefangen.\p" + .string "Dieses POKéMON kann sich nun an\n" + .string "dem besonderen Rang des Rekordhalters\l" + .string "erfreuen.\p" + .string "Talentierte TRAINER sollten versuchen,\n" + .string "diesen Rekord zu brechen.\p" + .string "Das war’s für heute.\n" + .string "Bis zum nächsten Mal.$" .include "data/text/gabby_and_ty.inc" .include "data/text/pokemon_news.inc" diff --git a/data/text/type_names.inc b/data/text/type_names.inc index 83e85e1e1..21245bcfe 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -1,19 +1,19 @@ gTypeNames:: @ 81F9870 .string "NORMAL$", 7 - .string "FIGHT$", 7 - .string "FLYING$", 7 - .string "POISON$", 7 - .string "GROUND$", 7 - .string "ROCK$", 7 - .string "BUG$", 7 - .string "GHOST$", 7 - .string "STEEL$", 7 + .string "KAMPF$", 7 + .string "FLUG$", 7 + .string "GIFT$", 7 + .string "BODEN$", 7 + .string "GEST.$", 7 + .string "KÄFER$", 7 + .string "GEIST$", 7 + .string "STAHL$", 7 .string "???$", 7 - .string "FIRE$", 7 - .string "WATER$", 7 - .string "GRASS$", 7 - .string "ELECTR$", 7 - .string "PSYCHC$", 7 - .string "ICE$", 7 - .string "DRAGON$", 7 - .string "DARK$", 7 + .string "FEUER$", 7 + .string "WASSER$", 7 + .string "PFLAN.$", 7 + .string "ELEK.$", 7 + .string "PSYCHO$", 7 + .string "EIS$", 7 + .string "DRA.$", 7 + .string "UNL.$", 7 diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png index 168689b6d..0713ec3de 100644 Binary files a/data/tilesets/primary/general/tiles.png and b/data/tilesets/primary/general/tiles.png differ diff --git a/data/tilesets/secondary/shop/metatiles.bin b/data/tilesets/secondary/shop/metatiles.bin index 474d535b1..fef6a7bc5 100644 Binary files a/data/tilesets/secondary/shop/metatiles.bin and b/data/tilesets/secondary/shop/metatiles.bin differ diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png index b5a0a4936..ea8d262d6 100644 Binary files a/data/tilesets/secondary/shop/tiles.png and b/data/tilesets/secondary/shop/tiles.png differ diff --git a/data/trainers.inc b/data/trainers.inc index be9ce1a81..39bfd9bfe 100644 --- a/data/trainers.inc +++ b/data/trainers.inc @@ -17,7 +17,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE - .string "ARCHIE$", 12 + .string "ADRIAN$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -29,7 +29,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -41,7 +41,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -53,7 +53,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -65,7 +65,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -77,7 +77,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -89,7 +89,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -101,7 +101,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -113,7 +113,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -125,7 +125,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -137,7 +137,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -149,7 +149,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -161,7 +161,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -173,7 +173,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -185,7 +185,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -197,7 +197,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -209,7 +209,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -221,7 +221,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -233,7 +233,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -245,7 +245,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -257,7 +257,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -269,7 +269,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -281,7 +281,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -293,7 +293,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -305,7 +305,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -317,7 +317,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -329,7 +329,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -341,7 +341,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -365,7 +365,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M - .string "MATT$", 12 + .string "WOLFGANG$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -377,7 +377,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M - .string "MATT$", 12 + .string "WOLFGANG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -389,7 +389,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F - .string "SHELLY$", 12 + .string "KORDULA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -401,7 +401,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F - .string "SHELLY$", 12 + .string "KORDULA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -413,7 +413,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE - .string "ARCHIE$", 12 + .string "ADRIAN$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -425,7 +425,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE - .string "ARCHIE$", 12 + .string "ADRIAN$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -437,7 +437,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "DAISY$", 12 + .string "MARGARETE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -449,7 +449,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 + .string "ROSEMARIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -461,7 +461,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "LILY$", 12 + .string "LILLY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -473,7 +473,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "VIOLET$", 12 + .string "ERIKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -485,7 +485,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 + .string "ROSEMARIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -497,7 +497,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 + .string "ROSEMARIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -509,7 +509,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 + .string "ROSEMARIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -521,7 +521,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSE$", 12 + .string "ROSEMARIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -533,7 +533,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 + .string "RÜDIGER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -545,7 +545,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "CHIP$", 12 + .string "RUPRECHT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -557,7 +557,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "FOSTER$", 12 + .string "RUBEN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -569,7 +569,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 + .string "RÜDIGER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -581,7 +581,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 + .string "RÜDIGER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -593,7 +593,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 + .string "RÜDIGER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -605,7 +605,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "DUSTY$", 12 + .string "RÜDIGER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -617,7 +617,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 + .string "PIA & UDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -629,7 +629,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 + .string "PIA & UDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -641,7 +641,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 + .string "PIA & UDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -653,7 +653,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 + .string "PIA & UDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -665,7 +665,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 + .string "PIA & UDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -677,7 +677,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "GABBY & TY$", 12 + .string "PIA & UDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -713,7 +713,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F - .string "GWEN $", 12 + .string "HILDE $", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -773,7 +773,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 + .string "GÜNTHER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -797,7 +797,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "CHARLIE$", 12 + .string "HILMAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -809,7 +809,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 + .string "GÜNTHER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -821,7 +821,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 + .string "GÜNTHER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -833,7 +833,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 + .string "GÜNTHER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -845,7 +845,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "RICKY$", 12 + .string "GÜNTHER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -857,7 +857,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "RANDALL$", 12 + .string "HUBERT$", 12 .2byte ITEM_X_SPEED, ITEM_X_SPEED, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -869,7 +869,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PARKER$", 12 + .string "PATRICK$", 12 .2byte ITEM_GUARD_SPEC, ITEM_GUARD_SPEC, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -881,7 +881,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "GEORGE$", 12 + .string "NILS$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -893,7 +893,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "BERKE$", 12 + .string "CHRISTIAN$", 12 .2byte ITEM_DIRE_HIT, ITEM_DIRE_HIT, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -905,7 +905,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "CLYDE$", 12 + .string "OSKAR$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -917,7 +917,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "VINCENT$", 12 + .string "OTFRIED$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -929,7 +929,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "LEROY$", 12 + .string "OTMAR$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -941,7 +941,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 + .string "PASCAL$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -965,7 +965,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "ALBERT$", 12 + .string "PABLO$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -977,7 +977,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "SAMUEL$", 12 + .string "RICHARD$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -989,7 +989,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "VITO$", 12 + .string "PAUL$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1001,7 +1001,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "OWEN$", 12 + .string "RAIMUND$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1013,7 +1013,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 + .string "PASCAL$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1025,7 +1025,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 + .string "PASCAL$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1037,7 +1037,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 + .string "PASCAL$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1049,7 +1049,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "WILTON$", 12 + .string "PASCAL$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1061,7 +1061,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "WARREN$", 12 + .string "MARKUS$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1073,7 +1073,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "MARY$", 12 + .string "YVONNE$", 12 .2byte ITEM_X_ACCURACY, ITEM_X_ACCURACY, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1085,7 +1085,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "LORI$", 12 + .string "RAMONA$", 12 .2byte ITEM_X_DEFEND, ITEM_X_DEFEND, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1097,7 +1097,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "JODY$", 12 + .string "ROSWITA$", 12 .2byte ITEM_X_ATTACK, ITEM_X_ATTACK, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -1109,7 +1109,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "WENDY$", 12 + .string "VIOLA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -1121,7 +1121,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "ELAINE$", 12 + .string "FRAUKE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -1133,7 +1133,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 + .string "VERONIKA$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1145,7 +1145,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "JENNIFER$", 12 + .string "MARIANNE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1157,7 +1157,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "HOPE$", 12 + .string "TRUDLINDE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1169,7 +1169,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "SHANNON$", 12 + .string "THERESA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1193,7 +1193,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "CAROLINE$", 12 + .string "KAROLINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1205,7 +1205,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "JULIE$", 12 + .string "MICHAELA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1217,7 +1217,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 + .string "VERONIKA$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1229,7 +1229,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 + .string "VERONIKA$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1241,7 +1241,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 + .string "VERONIKA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1253,7 +1253,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "BROOKE$", 12 + .string "VERONIKA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1265,7 +1265,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "PATRICIA$", 12 + .string "WALBURGA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1277,7 +1277,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "KINDRA$", 12 + .string "GUNDULA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1289,7 +1289,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "TAMMY$", 12 + .string "BRUNHILDE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1301,7 +1301,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 + .string "TABITHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1313,7 +1313,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "TASHA$", 12 + .string "PANDORA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1325,7 +1325,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 + .string "TABITHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1337,7 +1337,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 + .string "TABITHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1349,7 +1349,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 + .string "TABITHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1361,7 +1361,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "VALERIE$", 12 + .string "TABITHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1373,7 +1373,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "CINDY$", 12 + .string "PATRIZIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1397,7 +1397,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "BRIANNA$", 12 + .string "NATASCHA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1409,7 +1409,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "CINDY$", 12 + .string "PATRIZIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1421,7 +1421,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "BRIANNA$", 12 + .string "NATASCHA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1445,7 +1445,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "CINDY$", 12 + .string "PATRIZIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1457,7 +1457,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "CINDY$", 12 + .string "PATRIZIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1469,7 +1469,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "CINDY$", 12 + .string "PATRIZIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1481,7 +1481,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "CINDY$", 12 + .string "PATRIZIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1505,7 +1505,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "SHEILA$", 12 + .string "SYLVIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1517,7 +1517,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "SHIRLEY$", 12 + .string "MIRJAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1529,7 +1529,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 + .string "GERMAINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1541,7 +1541,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "CONNIE$", 12 + .string "FRANCESCA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1553,7 +1553,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "BRIDGET$", 12 + .string "SALMA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1565,7 +1565,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "OLIVIA$", 12 + .string "TIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1577,7 +1577,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "TIFFANY$", 12 + .string "DANIELA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1589,7 +1589,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 + .string "GERMAINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1601,7 +1601,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 + .string "GERMAINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1613,7 +1613,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 + .string "GERMAINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1625,7 +1625,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "JESSICA$", 12 + .string "GERMAINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1637,7 +1637,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 + .string "RENE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1661,7 +1661,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "GARRET$", 12 + .string "KAI$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1673,7 +1673,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 + .string "RENE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1685,7 +1685,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 + .string "RENE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1697,7 +1697,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 + .string "RENE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1709,7 +1709,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "WINSTON$", 12 + .string "RENE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1721,7 +1721,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 + .string "HIRO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1757,7 +1757,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "KENN$", 12 + .string "KLAUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1769,7 +1769,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 + .string "HIRO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1781,7 +1781,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 + .string "HIRO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1793,7 +1793,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 + .string "HIRO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1805,7 +1805,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "STEVE$", 12 + .string "HIRO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1817,7 +1817,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "LUIS$", 12 + .string "KONSTANTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1829,7 +1829,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "AUSTIN$", 12 + .string "GUIDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1841,7 +1841,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DOUGLAS$", 12 + .string "IGNAZ$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1853,7 +1853,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DARRIN$", 12 + .string "MANUEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1865,7 +1865,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 + .string "KEVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1877,7 +1877,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "JEROME$", 12 + .string "OSWALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1889,7 +1889,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "MATTHEW$", 12 + .string "UMBERTO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1901,7 +1901,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DAVID$", 12 + .string "WINFRIED$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1913,7 +1913,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "SPENCER$", 12 + .string "LEOPOLD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1925,7 +1925,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "ROLAND$", 12 + .string "THOMAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1937,7 +1937,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "CODY$", 12 + .string "TIMO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1949,7 +1949,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "STAN$", 12 + .string "BALTHASAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1961,7 +1961,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "BARRY$", 12 + .string "BASIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1973,7 +1973,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DEAN$", 12 + .string "DAGOBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1985,7 +1985,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "RODNEY$", 12 + .string "DIETER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1997,7 +1997,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "RICHARD$", 12 + .string "ENNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2009,7 +2009,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "HERMAN$", 12 + .string "BENNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2033,7 +2033,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "GILBERT$", 12 + .string "ERICH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2045,7 +2045,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "FRANKLIN$", 12 + .string "KASPER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2057,7 +2057,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DANNY$", 12 + .string "MARCEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2069,7 +2069,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "JACK$", 12 + .string "PEDRO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2081,7 +2081,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DUDLEY$", 12 + .string "THEODOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2093,7 +2093,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "CHAD$", 12 + .string "JANNIK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2105,7 +2105,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 + .string "KEVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2117,7 +2117,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 + .string "KEVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2129,7 +2129,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 + .string "KEVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2141,7 +2141,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "TONY$", 12 + .string "KEVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2153,7 +2153,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "HIDEKI$", 12 + .string "SATORU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2165,7 +2165,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "HITOSHI$", 12 + .string "SHIGERU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2177,7 +2177,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "KIYO$", 12 + .string "YU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2189,7 +2189,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "KOICHI$", 12 + .string "JUNICHI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2201,7 +2201,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 + .string "MINORU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2213,7 +2213,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 + .string "MINORU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2225,7 +2225,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 + .string "MINORU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2237,7 +2237,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 + .string "MINORU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2249,7 +2249,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "NOB$", 12 + .string "MINORU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2261,7 +2261,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "YUJI$", 12 + .string "HIDEO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2273,7 +2273,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "DAISUKE$", 12 + .string "KENJI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2285,7 +2285,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "ATSUSHI$", 12 + .string "HIROSHI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2297,7 +2297,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "KIRK$", 12 + .string "CHUCK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2309,7 +2309,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "SCOTT$", 12 + .string "TREY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2321,7 +2321,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "HARVEY$", 12 + .string "KERRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2333,7 +2333,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "SHAWN$", 12 + .string "REINHARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2345,7 +2345,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "RANDY$", 12 + .string "JEFF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2357,7 +2357,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 + .string "KIRK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2369,7 +2369,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 + .string "KIRK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2381,7 +2381,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 + .string "KIRK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2393,7 +2393,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 + .string "KIRK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2405,7 +2405,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "DALTON$", 12 + .string "KIRK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2417,7 +2417,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "COLE$", 12 + .string "HENDRIK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2429,7 +2429,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "FLINT$", 12 + .string "HEINZ$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2441,7 +2441,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "AXLE$", 12 + .string "HAGEN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2453,7 +2453,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "JAKE$", 12 + .string "HANNES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2465,7 +2465,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "ANDY$", 12 + .string "HARTMANN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2477,7 +2477,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 + .string "HASSO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2489,7 +2489,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 + .string "HASSO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2501,7 +2501,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 + .string "HASSO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2513,7 +2513,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 + .string "HASSO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2525,7 +2525,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "BERNIE$", 12 + .string "HASSO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2537,7 +2537,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "DREW$", 12 + .string "ISSIDOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2549,7 +2549,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "CLIFF$", 12 + .string "IVAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2561,7 +2561,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "LARRY$", 12 + .string "KAREL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2573,7 +2573,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "SHANE$", 12 + .string "KUNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2585,7 +2585,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "JUSTIN$", 12 + .string "LAURENZ$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2597,7 +2597,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 + .string "EWALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2609,7 +2609,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "JEFF$", 12 + .string "RAPHAEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2621,7 +2621,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "TRAVIS$", 12 + .string "RONALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2633,7 +2633,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 + .string "EWALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2645,7 +2645,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 + .string "EWALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2657,7 +2657,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 + .string "EWALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2669,7 +2669,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "ETHAN$", 12 + .string "EWALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2681,7 +2681,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRENT$", 12 + .string "ROMEO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2693,7 +2693,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "DONALD$", 12 + .string "TILL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2705,7 +2705,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "TAYLOR$", 12 + .string "URIEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2717,7 +2717,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRANDON$", 12 + .string "BRUNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2729,7 +2729,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "DEREK$", 12 + .string "BURKARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2741,7 +2741,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRANDON$", 12 + .string "BRUNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2753,7 +2753,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRANDON$", 12 + .string "BRUNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2765,7 +2765,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRANDON$", 12 + .string "BRUNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2777,7 +2777,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRANDON$", 12 + .string "BRUNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2789,7 +2789,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "EDWARD$", 12 + .string "WENDELIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2801,7 +2801,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "PRESTON$", 12 + .string "URBAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2813,7 +2813,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "VIRGIL$", 12 + .string "ZOLTAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2825,7 +2825,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "FRITZ$", 12 + .string "XAVER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2837,7 +2837,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "WILLIAM$", 12 + .string "WULF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2849,7 +2849,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "JOSHUA$", 12 + .string "JONAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2861,7 +2861,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 + .string "MAXIMILIAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2873,7 +2873,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 + .string "MAXIMILIAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2885,7 +2885,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 + .string "MAXIMILIAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2897,7 +2897,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 + .string "MAXIMILIAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2909,7 +2909,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "CAMERON$", 12 + .string "MAXIMILIAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2921,7 +2921,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "JACLYN$", 12 + .string "COSIMA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2957,7 +2957,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "MAURA$", 12 + .string "DOLORES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2969,7 +2969,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "KAYLA$", 12 + .string "CAMILLA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2993,7 +2993,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 + .string "KORNELIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3005,7 +3005,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 + .string "KORNELIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3017,7 +3017,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 + .string "KORNELIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3029,7 +3029,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 + .string "KORNELIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3041,7 +3041,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "JACKI$", 12 + .string "KORNELIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3053,7 +3053,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 + .string "ABRAHAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3065,7 +3065,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "TUCKER$", 12 + .string "CLAUDIO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3077,7 +3077,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "THOMAS$", 12 + .string "NIKOLAI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3089,7 +3089,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 + .string "ABRAHAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3101,7 +3101,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 + .string "ABRAHAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3113,7 +3113,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 + .string "ABRAHAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3125,7 +3125,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "WALTER$", 12 + .string "ABRAHAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3137,7 +3137,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_SIDNEY - .string "SIDNEY$", 12 + .string "ULRICH$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3149,7 +3149,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_PHOEBE - .string "PHOEBE$", 12 + .string "ANTONIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3161,7 +3161,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_GLACIA - .string "GLACIA$", 12 + .string "FROSINA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3173,7 +3173,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_DRAKE - .string "DRAKE$", 12 + .string "DRAGAN$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3185,7 +3185,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_ROXANNE - .string "ROXANNE$", 12 + .string "FELIZIA$", 12 .2byte ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3197,7 +3197,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRAWLY - .string "BRAWLY$", 12 + .string "KAMILLO$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3209,7 +3209,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WATTSON - .string "WATTSON$", 12 + .string "WALTER$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3221,7 +3221,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_FLANNERY - .string "FLANNERY$", 12 + .string "FLAVIA$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3245,7 +3245,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_WINONA - .string "WINONA$", 12 + .string "WIBKE$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3257,7 +3257,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_TATE_AND_LIZA - .string "TATE&LIZA$", 12 + .string "BEN&SVENJA$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -3269,7 +3269,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLACE - .string "WALLACE$", 12 + .string "WASSILI$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3281,7 +3281,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 + .string "ORLANDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3293,7 +3293,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "TED$", 12 + .string "RAMON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3305,7 +3305,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "PAUL$", 12 + .string "JÜRGEN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3317,7 +3317,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 + .string "ORLANDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3329,7 +3329,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 + .string "ORLANDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3341,7 +3341,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 + .string "ORLANDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3353,7 +3353,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "JERRY$", 12 + .string "ORLANDO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3365,7 +3365,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 + .string "KERSTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3377,7 +3377,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "GEORGIA$", 12 + .string "ARIANE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3389,7 +3389,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 + .string "KERSTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3401,7 +3401,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 + .string "KERSTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3413,7 +3413,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 + .string "KERSTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3425,7 +3425,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KAREN$", 12 + .string "KERSTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3437,7 +3437,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "KATE & JOY$", 12 + .string "EVA & UTE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3449,7 +3449,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 + .string "IRM & IDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3461,7 +3461,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 + .string "IRM & IDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3473,7 +3473,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 + .string "IRM & IDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3485,7 +3485,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 + .string "IRM & IDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3497,7 +3497,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "ANNA & MEG$", 12 + .string "IRM & IDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3509,7 +3509,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_WINSTRATE .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M - .string "VICTOR$", 12 + .string "VIKTOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3533,7 +3533,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M - .string "COLTON$", 12 + .string "ATTILA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3593,7 +3593,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F - .string "VICTORIA$", 12 + .string "VIKTORIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -3617,7 +3617,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F - .string "MARISSA$", 12 + .string "EVELYN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3689,7 +3689,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 + .string "THEOBALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3701,7 +3701,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 + .string "THEOBALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3713,7 +3713,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 + .string "THEOBALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3725,7 +3725,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 + .string "THEOBALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3737,7 +3737,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "TIMOTHY$", 12 + .string "THEOBALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3761,7 +3761,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 + .string "WALTRAUD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3773,7 +3773,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 + .string "WALTRAUD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3785,7 +3785,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 + .string "WALTRAUD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3797,7 +3797,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 + .string "WALTRAUD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3809,7 +3809,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "SHELBY$", 12 + .string "WALTRAUD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3821,7 +3821,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 + .string "ANSGAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3833,7 +3833,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "BILLY$", 12 + .string "FRIDOLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3845,7 +3845,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "JOSH$", 12 + .string "GASTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3857,7 +3857,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "TOMMY$", 12 + .string "DOMINIK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3869,7 +3869,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "JOEY$", 12 + .string "LUDGER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3881,7 +3881,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "BEN$", 12 + .string "EGON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3905,7 +3905,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "KEVIN$", 12 + .string "JULIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3917,7 +3917,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "NEAL$", 12 + .string "MORITZ$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3929,7 +3929,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "DILLON$", 12 + .string "SÖNCKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3941,7 +3941,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 + .string "ANSGAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3953,7 +3953,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 + .string "ANSGAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3965,7 +3965,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 + .string "ANSGAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3977,7 +3977,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "CALVIN$", 12 + .string "ANSGAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3989,7 +3989,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "EDDIE$", 12 + .string "HENRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4001,7 +4001,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ALLEN$", 12 + .string "HUGO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4013,7 +4013,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "TIMMY$", 12 + .string "FRIEDER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4025,7 +4025,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CHAMPION .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_STEVEN - .string "STEVEN$", 12 + .string "TROY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -4037,7 +4037,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ANDREW$", 12 + .string "ANSGAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4049,7 +4049,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "IVAN$", 12 + .string "ANGELO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4061,7 +4061,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "CLAUDE$", 12 + .string "ANSELM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4073,7 +4073,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 + .string "ALOIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4085,7 +4085,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "NED$", 12 + .string "ARTHUR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4097,7 +4097,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "DALE$", 12 + .string "ALBIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4109,7 +4109,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "NOLAN$", 12 + .string "AMADEUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4121,7 +4121,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "BARNY$", 12 + .string "ALBRECHT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4133,7 +4133,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "WADE$", 12 + .string "ALAIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4145,7 +4145,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "CARTER$", 12 + .string "ARMIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4157,7 +4157,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 + .string "ALOIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4169,7 +4169,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 + .string "ALOIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4181,7 +4181,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 + .string "ALOIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4193,7 +4193,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ELLIOT$", 12 + .string "ALOIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -4205,7 +4205,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "RONALD$", 12 + .string "ACHMED$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4217,7 +4217,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "JACOB$", 12 + .string "ROMAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4229,7 +4229,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "ANTHONY$", 12 + .string "EMIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4241,7 +4241,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 + .string "EGIDIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4253,7 +4253,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 + .string "EGIDIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4265,7 +4265,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 + .string "EGIDIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4277,7 +4277,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 + .string "EGIDIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4289,7 +4289,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "BENJAMIN$", 12 + .string "EGIDIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4301,7 +4301,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 + .string "IRMGARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4313,7 +4313,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "JASMINE$", 12 + .string "MARTHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4325,7 +4325,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 + .string "IRMGARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4337,7 +4337,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 + .string "IRMGARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4349,7 +4349,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 + .string "IRMGARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4361,7 +4361,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "ABIGAIL$", 12 + .string "IRMGARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4373,7 +4373,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 + .string "IGOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4385,7 +4385,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 + .string "IGOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4397,7 +4397,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 + .string "IGOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4409,7 +4409,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 + .string "IGOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4421,7 +4421,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "DYLAN$", 12 + .string "IGOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4433,7 +4433,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 + .string "JUTTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4445,7 +4445,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 + .string "JUTTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4457,7 +4457,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 + .string "JUTTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4469,7 +4469,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 + .string "JUTTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4481,7 +4481,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "MARIA$", 12 + .string "JUTTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4493,7 +4493,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "CALEB$", 12 + .string "OLEG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4517,7 +4517,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 + .string "KASPAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4541,7 +4541,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "CHASE$", 12 + .string "FERDINAND$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4553,7 +4553,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 + .string "KASPAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4565,7 +4565,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 + .string "KASPAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4577,7 +4577,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 + .string "KASPAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4589,7 +4589,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "ISAIAH$", 12 + .string "KASPAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4613,7 +4613,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "CONNOR$", 12 + .string "MIRA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4637,7 +4637,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 + .string "MECHTHILD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4649,7 +4649,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "ALLISON$", 12 + .string "LOTTE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4661,7 +4661,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 + .string "MECHTHILD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4673,7 +4673,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 + .string "MECHTHILD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4685,7 +4685,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 + .string "MECHTHILD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4697,7 +4697,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "KATELYN$", 12 + .string "MECHTHILD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4709,7 +4709,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 + .string "ALFONS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4721,7 +4721,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 + .string "ALFONS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4733,7 +4733,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 + .string "ALFONS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4745,7 +4745,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 + .string "ALFONS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4757,7 +4757,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "NICOLAS$", 12 + .string "ALFONS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4769,7 +4769,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "AARON$", 12 + .string "EDMUND$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4781,7 +4781,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "PERRY$", 12 + .string "JOSCHKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4793,7 +4793,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "HUGH$", 12 + .string "ENRICO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4805,7 +4805,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "PHIL$", 12 + .string "HENRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4817,7 +4817,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "JARED$", 12 + .string "HIOB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4841,7 +4841,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "TANNER$", 12 + .string "ANATOL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4853,7 +4853,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "WILL$", 12 + .string "BJÖRN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4865,7 +4865,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "COLIN$", 12 + .string "WIM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4877,7 +4877,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 + .string "FRITJOF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4889,7 +4889,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "BENNY$", 12 + .string "GENADI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4901,7 +4901,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "CHESTER$", 12 + .string "VITALI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4913,7 +4913,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 + .string "FRITJOF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4925,7 +4925,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 + .string "FRITJOF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4937,7 +4937,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 + .string "FRITJOF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4949,7 +4949,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ROBERT$", 12 + .string "FRITJOF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4961,7 +4961,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ALEX$", 12 + .string "ARNE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4973,7 +4973,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "BECK$", 12 + .string "VINCENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4985,7 +4985,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "YASU$", 12 + .string "VALENTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -4997,7 +4997,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "TAKASHI$", 12 + .string "EUGEN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -5009,7 +5009,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "MAKOTO$", 12 + .string "HERIBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5021,7 +5021,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "HIDEO$", 12 + .string "SAUL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5033,7 +5033,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 + .string "EDUARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5045,7 +5045,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "LUNG$", 12 + .string "ARND$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5057,7 +5057,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 + .string "EDUARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5069,7 +5069,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 + .string "EDUARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5081,7 +5081,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 + .string "EDUARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5093,7 +5093,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "LAO$", 12 + .string "EDUARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5105,7 +5105,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "TESSA$", 12 + .string "TAMARA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5129,7 +5129,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 + .string "ELFI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5141,7 +5141,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "CORA$", 12 + .string "THEA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5153,7 +5153,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "JILL$", 12 + .string "AGNES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5165,7 +5165,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 + .string "ELFI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5177,7 +5177,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 + .string "ELFI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5189,7 +5189,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 + .string "ELFI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5201,7 +5201,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "CYNDY$", 12 + .string "ELFI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5213,7 +5213,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 + .string "SASKIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5225,7 +5225,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "CLARISSA$", 12 + .string "GERDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5237,7 +5237,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "ANGELICA$", 12 + .string "MARIKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5249,7 +5249,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 + .string "SASKIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5261,7 +5261,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 + .string "SASKIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5273,7 +5273,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 + .string "SASKIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5285,7 +5285,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "MADELINE$", 12 + .string "SASKIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5297,7 +5297,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "BEVERLY$", 12 + .string "DAGMAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5309,7 +5309,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "DAWN$", 12 + .string "HEIDRUN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5345,7 +5345,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "BETH$", 12 + .string "ALMUT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5357,7 +5357,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "TARA$", 12 + .string "SIEGLINDE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5369,7 +5369,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "MISSY$", 12 + .string "MARION$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5393,7 +5393,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 + .string "MONIKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5405,7 +5405,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "GRACE$", 12 + .string "ILONA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5417,7 +5417,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "TANYA$", 12 + .string "EMILIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5429,7 +5429,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "SHARON$", 12 + .string "GUDRUN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5441,7 +5441,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "NIKKI$", 12 + .string "ASTRID$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5453,7 +5453,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "BRENDA$", 12 + .string "OTTILIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5465,7 +5465,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "KATIE$", 12 + .string "SENTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5477,7 +5477,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "SUSIE$", 12 + .string "JANKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5489,7 +5489,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "KARA$", 12 + .string "RENATE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5501,7 +5501,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "DANA$", 12 + .string "VICKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5513,7 +5513,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "ERIN$", 12 + .string "REBECCA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5525,7 +5525,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "DEBRA$", 12 + .string "ANJA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5537,7 +5537,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "LINDA$", 12 + .string "GISELA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5549,7 +5549,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "KAYLEE$", 12 + .string "PAOLA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5561,7 +5561,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "LAUREL$", 12 + .string "BIRTE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5573,7 +5573,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "DARCY$", 12 + .string "DOROTHEA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5585,7 +5585,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 + .string "MONIKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5597,7 +5597,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 + .string "MONIKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5609,7 +5609,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 + .string "MONIKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5621,7 +5621,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "JENNY$", 12 + .string "MONIKA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5633,7 +5633,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "HEIDI$", 12 + .string "JANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5645,7 +5645,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "BECKY$", 12 + .string "HEIDI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5657,7 +5657,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "CAROL$", 12 + .string "NATALIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5693,7 +5693,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 + .string "GWENDOLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5705,7 +5705,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "NINA$", 12 + .string "NADJA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5729,7 +5729,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 + .string "GWENDOLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5741,7 +5741,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 + .string "GWENDOLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5753,7 +5753,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 + .string "GWENDOLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5765,7 +5765,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "DIANA$", 12 + .string "GWENDOLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5777,7 +5777,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 + .string "NORA & JO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5789,7 +5789,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 + .string "NORA & JO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5813,7 +5813,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "MIU & YUKI$", 12 + .string "LEA & GRIT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5825,7 +5825,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 + .string "NORA & JO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5849,7 +5849,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 + .string "NORA & JO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5861,7 +5861,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 + .string "NORA & JO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5873,7 +5873,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "AMY & LIV$", 12 + .string "NORA & JO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5885,7 +5885,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "HUEY$", 12 + .string "TASSILO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5897,7 +5897,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "EDMOND$", 12 + .string "MONTY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5909,7 +5909,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 + .string "ELERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5921,7 +5921,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "DWAYNE$", 12 + .string "RETO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5933,7 +5933,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "PHILLIP$", 12 + .string "GUNNAR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5957,7 +5957,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "DUNCAN$", 12 + .string "PIERRE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5969,7 +5969,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 + .string "ELERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5981,7 +5981,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 + .string "ELERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5993,7 +5993,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 + .string "ELERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6005,7 +6005,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ERNEST$", 12 + .string "ELERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6053,7 +6053,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "SONNY$", 12 + .string "WENZEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6065,7 +6065,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "DONOVAN$", 12 + .string "STANISLAUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6089,7 +6089,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "KELVIN$", 12 + .string "AARON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6101,7 +6101,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "KODY$", 12 + .string "ALBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6113,7 +6113,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "TEVIN$", 12 + .string "ANDRE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6125,7 +6125,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "DAMON$", 12 + .string "AMON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6161,7 +6161,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR - .string "HECTOR$", 12 + .string "HEKTOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6173,7 +6173,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR - .string "HECTOR$", 12 + .string "HEKTOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6233,7 +6233,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 + .string "HEIKO$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6245,7 +6245,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6257,7 +6257,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6269,7 +6269,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6281,7 +6281,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6293,7 +6293,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6305,7 +6305,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6317,7 +6317,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6329,7 +6329,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6341,7 +6341,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6353,7 +6353,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6365,7 +6365,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6377,7 +6377,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6389,7 +6389,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6401,7 +6401,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6413,7 +6413,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6425,7 +6425,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6437,7 +6437,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6449,7 +6449,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6461,7 +6461,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 + .string "BLASIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6473,7 +6473,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "RILEY$", 12 + .string "CLIFF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6485,7 +6485,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "AIDAN$", 12 + .string "DARIO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6497,7 +6497,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 + .string "BLASIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6509,7 +6509,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 + .string "BLASIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6521,7 +6521,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 + .string "BLASIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6533,7 +6533,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "ISAAC$", 12 + .string "BLASIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6557,7 +6557,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "ALEXIA$", 12 + .string "DORIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6569,7 +6569,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "DANIELLE$", 12 + .string "DUNJA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6629,7 +6629,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 + .string "ECKBERT$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6641,7 +6641,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "CARLOS$", 12 + .string "EDWARD$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6653,7 +6653,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "SEBASTIAN$", 12 + .string "EILMAR$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6665,7 +6665,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 + .string "ECKBERT$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6677,7 +6677,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 + .string "ECKBERT$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6689,7 +6689,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 + .string "ECKBERT$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6701,7 +6701,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "JACKSON$", 12 + .string "ECKBERT$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6713,7 +6713,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 + .string "HANNELORE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6725,7 +6725,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "JENNA$", 12 + .string "INGEBORG$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6749,7 +6749,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 + .string "HANNELORE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6761,7 +6761,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 + .string "HANNELORE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6773,7 +6773,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 + .string "HANNELORE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6785,7 +6785,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "CATHERINE$", 12 + .string "HANNELORE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6797,7 +6797,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE - .string "MAXIE$", 12 + .string "MARC$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6809,7 +6809,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6821,7 +6821,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6833,7 +6833,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6845,7 +6845,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6857,7 +6857,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6869,7 +6869,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6881,7 +6881,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6893,7 +6893,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6905,7 +6905,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6917,7 +6917,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6929,7 +6929,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6941,7 +6941,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6953,7 +6953,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6965,7 +6965,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6977,7 +6977,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6989,7 +6989,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7001,7 +7001,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7013,7 +7013,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7025,7 +7025,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7037,7 +7037,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7049,7 +7049,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7061,7 +7061,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7073,7 +7073,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7085,7 +7085,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7097,7 +7097,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7109,7 +7109,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7121,7 +7121,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "GRUNT$", 12 + .string "RÜPEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7157,7 +7157,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M - .string "TABITHA$", 12 + .string "KALLE$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -7169,7 +7169,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M - .string "TABITHA$", 12 + .string "KALLE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7193,7 +7193,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F - .string "COURTNEY$", 12 + .string "JÖRDIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7205,7 +7205,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F - .string "COURTNEY$", 12 + .string "JÖRDIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -7217,7 +7217,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE - .string "MAXIE$", 12 + .string "MARC$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7229,7 +7229,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE - .string "MAXIE$", 12 + .string "MARC$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7241,7 +7241,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "TIANA$", 12 + .string "KARIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7253,7 +7253,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "HALEY$", 12 + .string "ELISA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7265,7 +7265,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "JANICE$", 12 + .string "RICARDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7277,7 +7277,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "VIVI$", 12 + .string "SIEGLINDE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7289,7 +7289,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "HALEY$", 12 + .string "ELISA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7301,7 +7301,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "HALEY$", 12 + .string "ELISA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7313,7 +7313,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "HALEY$", 12 + .string "ELISA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7325,7 +7325,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "HALEY$", 12 + .string "ELISA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7337,7 +7337,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "SALLY$", 12 + .string "FREDERIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7361,7 +7361,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "ANDREA$", 12 + .string "FRIEDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7373,7 +7373,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "CRISSY$", 12 + .string "ADELHEID$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7385,7 +7385,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "RICK$", 12 + .string "BALDUR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7397,7 +7397,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "LYLE$", 12 + .string "DETWIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7409,7 +7409,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "JOSE$", 12 + .string "EROS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7421,7 +7421,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "DOUG$", 12 + .string "EUSEBIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7433,7 +7433,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GREG$", 12 + .string "GANGOLF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7445,7 +7445,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "KENT$", 12 + .string "GERIT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7457,7 +7457,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 + .string "GERNOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7469,7 +7469,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 + .string "GERNOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7481,7 +7481,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 + .string "GERNOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7493,7 +7493,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 + .string "GERNOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7505,7 +7505,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "JAMES$", 12 + .string "GERNOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7517,7 +7517,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "BRICE$", 12 + .string "GISBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7529,7 +7529,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 + .string "HEIMKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7541,7 +7541,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "LENNY$", 12 + .string "JANNO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7553,7 +7553,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "LUCAS$", 12 + .string "KLODWIG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7565,7 +7565,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "ALAN$", 12 + .string "LANZELOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7577,7 +7577,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "CLARK$", 12 + .string "LUZIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7589,7 +7589,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "ERIC$", 12 + .string "MAURIZIO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7601,7 +7601,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "LUCAS$", 12 + .string "KLODWIG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7613,7 +7613,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "MIKE$", 12 + .string "MELVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7625,7 +7625,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "MIKE$", 12 + .string "MELVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7637,7 +7637,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 + .string "HEIMKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7649,7 +7649,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 + .string "HEIMKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7661,7 +7661,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 + .string "HEIMKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7673,7 +7673,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "TRENT$", 12 + .string "HEIMKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7685,7 +7685,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "DEZ & LUKE$", 12 + .string "INA & LEIF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7697,7 +7697,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "LEA & JED$", 12 + .string "LENA & UWE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7709,7 +7709,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "LOIS & HAL$", 12 + .string "GESA & PIT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7721,7 +7721,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "LOIS & HAL$", 12 + .string "GESA & PIT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7733,7 +7733,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "LOIS & HAL$", 12 + .string "GESA & PIT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7745,7 +7745,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "LOIS & HAL$", 12 + .string "GESA & PIT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7757,7 +7757,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "LOIS & HAL$", 12 + .string "GESA & PIT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7769,7 +7769,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "JOHANNA$", 12 + .string "CORDULA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7781,7 +7781,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "ZANE$", 12 + .string "OTBERT$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7793,7 +7793,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "VIVIAN$", 12 + .string "BÄRBEL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7805,7 +7805,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "SADIE$", 12 + .string "CHANTAL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7817,7 +7817,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "HIDEO$", 12 + .string "SAUL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -7829,7 +7829,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "KEIGO$", 12 + .string "NELSON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -7841,7 +7841,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "TSUNAO$", 12 + .string "NIKODEMUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -7853,7 +7853,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "TERRELL$", 12 + .string "NESTOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7865,7 +7865,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "KYLEE$", 12 + .string "MIREILLE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7877,7 +7877,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 + .string "HEIKO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7889,7 +7889,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 + .string "HEIKO$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7901,7 +7901,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 + .string "HEIKO$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7913,7 +7913,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 + .string "HEIKO$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7925,7 +7925,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "WALLY$", 12 + .string "HEIKO$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7937,7 +7937,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7949,7 +7949,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7961,7 +7961,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRENDAN$", 12 + .string "BRIX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7973,7 +7973,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7985,7 +7985,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7997,7 +7997,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAY$", 12 + .string "MAIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -8009,7 +8009,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "JONAH$", 12 + .string "OLOF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8021,7 +8021,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "HENRY$", 12 + .string "PIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8033,7 +8033,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ROGER$", 12 + .string "AMATUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8045,7 +8045,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "ALEXA$", 12 + .string "ANNABEL$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -8057,7 +8057,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "RUBEN$", 12 + .string "TRUTZ$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -8069,7 +8069,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "KOJI$", 12 + .string "REMIGIUS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8081,7 +8081,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "WAYNE$", 12 + .string "ALVARO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8093,7 +8093,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "BYRON$", 12 + .string "AMALRICH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8105,7 +8105,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "REED$", 12 + .string "ANDOLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8117,7 +8117,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "TISHA$", 12 + .string "IMKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8129,7 +8129,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "TORI & TIA$", 12 + .string "LI & FLO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8141,7 +8141,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "KIM & IRIS$", 12 + .string "ZOE & IRIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8165,7 +8165,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "MEL & PAUL$", 12 + .string "GELI & OLE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8177,7 +8177,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 + .string "URS & EVI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8189,7 +8189,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 + .string "URS & EVI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8201,7 +8201,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 + .string "URS & EVI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8213,7 +8213,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 + .string "URS & EVI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0xb @ AI flags @@ -8225,7 +8225,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "JOHN & JAY$", 12 + .string "URS & EVI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8237,7 +8237,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "RELI & IAN$", 12 + .string "TOBI & UNA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8249,7 +8249,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "RITA & SAM$", 12 + .string "TOM & UTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8261,7 +8261,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "RITA & SAM$", 12 + .string "TOM & UTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8273,7 +8273,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "RITA & SAM$", 12 + .string "TOM & UTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8285,7 +8285,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "RITA & SAM$", 12 + .string "TOM & UTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8297,7 +8297,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "RITA & SAM$", 12 + .string "TOM & UTA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8309,7 +8309,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "LISA & RAY$", 12 + .string "ERKO & BEA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8321,7 +8321,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "EUGENE$", 12 + .string "ABELKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags diff --git a/de_after.sh b/de_after.sh index 8c39f765a..60855b738 100755 --- a/de_after.sh +++ b/de_after.sh @@ -1 +1,2 @@ git checkout override.mk asm/ data/ graphics +rm data/ingame_trades.inc diff --git a/graphics/battle_interface/hpbar.png b/graphics/battle_interface/hpbar.png index f3a0314e4..c786ba339 100644 Binary files a/graphics/battle_interface/hpbar.png and b/graphics/battle_interface/hpbar.png differ diff --git a/graphics/battle_interface/status2.png b/graphics/battle_interface/status2.png index 97a344ae3..af0621c15 100644 Binary files a/graphics/battle_interface/status2.png and b/graphics/battle_interface/status2.png differ diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png index 3e5989d05..566e1b6f3 100644 Binary files a/graphics/battle_interface/status3.png and b/graphics/battle_interface/status3.png differ diff --git a/graphics/battle_interface/status4.png b/graphics/battle_interface/status4.png index d9769ad28..952c65050 100644 Binary files a/graphics/battle_interface/status4.png and b/graphics/battle_interface/status4.png differ diff --git a/graphics/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png index 0de1e3ad2..e5a9418b0 100644 Binary files a/graphics/battle_interface/status_brn.png and b/graphics/battle_interface/status_brn.png differ diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png index 3e1d534b5..42d4c74fb 100644 Binary files a/graphics/battle_interface/status_frz.png and b/graphics/battle_interface/status_frz.png differ diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png index 95869e572..e27a7fe75 100644 Binary files a/graphics/battle_interface/status_psn.png and b/graphics/battle_interface/status_psn.png differ diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png index b0eb5a250..a129e44a8 100644 Binary files a/graphics/battle_interface/status_slp.png and b/graphics/battle_interface/status_slp.png differ diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png index 2117967ec..ea5fc73d7 100644 Binary files a/graphics/battle_interface/window.png and b/graphics/battle_interface/window.png differ diff --git a/graphics/berry_blender/outer.png b/graphics/berry_blender/outer.png index d8040b022..451f5d3c0 100644 Binary files a/graphics/berry_blender/outer.png and b/graphics/berry_blender/outer.png differ diff --git a/graphics/contest/applause.png b/graphics/contest/applause.png index 32b1748a0..36d2f9b98 100644 Binary files a/graphics/contest/applause.png and b/graphics/contest/applause.png differ diff --git a/graphics/contest/contest_words.bin b/graphics/contest/contest_words.bin index 518b608c0..5b64b62ec 100644 Binary files a/graphics/contest/contest_words.bin and b/graphics/contest/contest_words.bin differ diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png index 536924daf..b784e7755 100644 Binary files a/graphics/contest/misc.png and b/graphics/contest/misc.png differ diff --git a/graphics/contest/misc_2.png b/graphics/contest/misc_2.png index 44a4a8295..8ff8ee043 100644 Binary files a/graphics/contest/misc_2.png and b/graphics/contest/misc_2.png differ diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/misc_2_tilemap_2.bin index b31126836..97baed987 100644 Binary files a/graphics/contest/misc_2_tilemap_2.bin and b/graphics/contest/misc_2_tilemap_2.bin differ diff --git a/graphics/contest/nextturn.png b/graphics/contest/nextturn.png index 747c4b5a7..49e6b1062 100644 Binary files a/graphics/contest/nextturn.png and b/graphics/contest/nextturn.png differ diff --git a/graphics/contest/nextturn_numbers.png b/graphics/contest/nextturn_numbers.png index 4386f822d..48ed89b20 100644 Binary files a/graphics/contest/nextturn_numbers.png and b/graphics/contest/nextturn_numbers.png differ diff --git a/graphics/contest/nextturn_random.png b/graphics/contest/nextturn_random.png index b92003823..3f5fd5914 100644 Binary files a/graphics/contest/nextturn_random.png and b/graphics/contest/nextturn_random.png differ diff --git a/graphics/fonts/font3_lat.png b/graphics/fonts/font3_lat.png index b1606aef6..36de83fd9 100644 Binary files a/graphics/fonts/font3_lat.png and b/graphics/fonts/font3_lat.png differ diff --git a/graphics/fonts/font4_lat.4bpp.bin b/graphics/fonts/font4_lat.4bpp.bin index e69de29bb..7317ab0a4 100644 Binary files a/graphics/fonts/font4_lat.4bpp.bin and b/graphics/fonts/font4_lat.4bpp.bin differ diff --git a/graphics/interface/bag_screen.png b/graphics/interface/bag_screen.png index 86b824bce..bde0158ef 100644 Binary files a/graphics/interface/bag_screen.png and b/graphics/interface/bag_screen.png differ diff --git a/graphics/interface/berry_tag.bin b/graphics/interface/berry_tag.bin index 1b75a6b1e..9ec4ebfb8 100644 Binary files a/graphics/interface/berry_tag.bin and b/graphics/interface/berry_tag.bin differ diff --git a/graphics/interface/check_berry.png b/graphics/interface/check_berry.png index 8a4ea695a..5b4e728c5 100644 Binary files a/graphics/interface/check_berry.png and b/graphics/interface/check_berry.png differ diff --git a/graphics/interface/money.png b/graphics/interface/money.png index 5ad533dbf..eab4da519 100644 Binary files a/graphics/interface/money.png and b/graphics/interface/money.png differ diff --git a/graphics/interface/outline_cursor_00.png b/graphics/interface/outline_cursor_00.png index 8e0be365b..39241e978 100644 Binary files a/graphics/interface/outline_cursor_00.png and b/graphics/interface/outline_cursor_00.png differ diff --git a/graphics/interface/outline_cursor_01.png b/graphics/interface/outline_cursor_01.png index 27bdb892d..3ce90161a 100644 Binary files a/graphics/interface/outline_cursor_01.png and b/graphics/interface/outline_cursor_01.png differ diff --git a/graphics/interface/outline_cursor_02.png b/graphics/interface/outline_cursor_02.png index 93b5e9e6a..5d2d69a45 100644 Binary files a/graphics/interface/outline_cursor_02.png and b/graphics/interface/outline_cursor_02.png differ diff --git a/graphics/interface/outline_cursor_03.png b/graphics/interface/outline_cursor_03.png index ef20425ec..68698063a 100644 Binary files a/graphics/interface/outline_cursor_03.png and b/graphics/interface/outline_cursor_03.png differ diff --git a/graphics/interface/outline_cursor_04.png b/graphics/interface/outline_cursor_04.png index 4d06da317..41d202407 100644 Binary files a/graphics/interface/outline_cursor_04.png and b/graphics/interface/outline_cursor_04.png differ diff --git a/graphics/interface/outline_cursor_05.png b/graphics/interface/outline_cursor_05.png index ba9e28bea..9f64769e1 100644 Binary files a/graphics/interface/outline_cursor_05.png and b/graphics/interface/outline_cursor_05.png differ diff --git a/graphics/interface/outline_cursor_06.png b/graphics/interface/outline_cursor_06.png index e68d42763..d7e0cb91c 100644 Binary files a/graphics/interface/outline_cursor_06.png and b/graphics/interface/outline_cursor_06.png differ diff --git a/graphics/interface/outline_cursor_07.png b/graphics/interface/outline_cursor_07.png index 6df7fd731..f92da0c26 100644 Binary files a/graphics/interface/outline_cursor_07.png and b/graphics/interface/outline_cursor_07.png differ diff --git a/graphics/interface/outline_cursor_08.png b/graphics/interface/outline_cursor_08.png index 006a0dc50..6164c9504 100644 Binary files a/graphics/interface/outline_cursor_08.png and b/graphics/interface/outline_cursor_08.png differ diff --git a/graphics/interface/outline_cursor_09.png b/graphics/interface/outline_cursor_09.png index f1db0963f..803f1c043 100644 Binary files a/graphics/interface/outline_cursor_09.png and b/graphics/interface/outline_cursor_09.png differ diff --git a/graphics/interface/outline_cursor_10.png b/graphics/interface/outline_cursor_10.png index a5356f083..401402c5a 100644 Binary files a/graphics/interface/outline_cursor_10.png and b/graphics/interface/outline_cursor_10.png differ diff --git a/graphics/interface/outline_cursor_11.png b/graphics/interface/outline_cursor_11.png index 4415fa553..9fed878ee 100644 Binary files a/graphics/interface/outline_cursor_11.png and b/graphics/interface/outline_cursor_11.png differ diff --git a/graphics/interface/outline_cursor_12.png b/graphics/interface/outline_cursor_12.png index 97c57da0b..4d95f925b 100644 Binary files a/graphics/interface/outline_cursor_12.png and b/graphics/interface/outline_cursor_12.png differ diff --git a/graphics/interface/outline_cursor_13.png b/graphics/interface/outline_cursor_13.png index 301956091..8b7beecac 100644 Binary files a/graphics/interface/outline_cursor_13.png and b/graphics/interface/outline_cursor_13.png differ diff --git a/graphics/interface/outline_cursor_14.png b/graphics/interface/outline_cursor_14.png index 336e4cdc6..b8ae2106b 100644 Binary files a/graphics/interface/outline_cursor_14.png and b/graphics/interface/outline_cursor_14.png differ diff --git a/graphics/interface/outline_cursor_15.png b/graphics/interface/outline_cursor_15.png index d9771c0be..8ea94e2b5 100644 Binary files a/graphics/interface/outline_cursor_15.png and b/graphics/interface/outline_cursor_15.png differ diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png index 5860ada9b..13613b9f9 100644 Binary files a/graphics/interface/party_menu_hpbar.png and b/graphics/interface/party_menu_hpbar.png differ diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png index 6ca98493b..c32a0a224 100644 Binary files a/graphics/interface/party_menu_misc.png and b/graphics/interface/party_menu_misc.png differ diff --git a/graphics/interface/party_menu_ordertext.png b/graphics/interface/party_menu_ordertext.png index 003af36d0..423ff273e 100644 Binary files a/graphics/interface/party_menu_ordertext.png and b/graphics/interface/party_menu_ordertext.png differ diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png index 646636365..c04cde98a 100644 Binary files a/graphics/interface/pokeblock_case_frame.png and b/graphics/interface/pokeblock_case_frame.png differ diff --git a/graphics/interface/pokemon_info.bin b/graphics/interface/pokemon_info.bin index a73c0fe94..fea2412da 100644 Binary files a/graphics/interface/pokemon_info.bin and b/graphics/interface/pokemon_info.bin differ diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png index f319d5566..55c07d220 100644 Binary files a/graphics/interface/status_icons.png and b/graphics/interface/status_icons.png differ diff --git a/graphics/interface/status_screen.bin b/graphics/interface/status_screen.bin index e5387571c..1ef3cd80b 100644 Binary files a/graphics/interface/status_screen.bin and b/graphics/interface/status_screen.bin differ diff --git a/graphics/interface/status_screen.png b/graphics/interface/status_screen.png index 3024a035c..2b3434b9e 100644 Binary files a/graphics/interface/status_screen.png and b/graphics/interface/status_screen.png differ diff --git a/graphics/interface/status_screen_battle_moves.bin b/graphics/interface/status_screen_battle_moves.bin index 46a3e9e55..d5cea0cc0 100644 Binary files a/graphics/interface/status_screen_battle_moves.bin and b/graphics/interface/status_screen_battle_moves.bin differ diff --git a/graphics/interface/status_screen_contest_moves.bin b/graphics/interface/status_screen_contest_moves.bin index cbb339c13..dbf92e246 100644 Binary files a/graphics/interface/status_screen_contest_moves.bin and b/graphics/interface/status_screen_contest_moves.bin differ diff --git a/graphics/interface/status_screen_pokemon_skills.bin b/graphics/interface/status_screen_pokemon_skills.bin index 745f3d2de..b4e6cac23 100644 Binary files a/graphics/interface/status_screen_pokemon_skills.bin and b/graphics/interface/status_screen_pokemon_skills.bin differ diff --git a/graphics/interface/wordgroup_frame.png b/graphics/interface/wordgroup_frame.png index 71a26aab4..ca1cc208d 100644 Binary files a/graphics/interface/wordgroup_frame.png and b/graphics/interface/wordgroup_frame.png differ diff --git a/graphics/interface/wordgroup_indicator.png b/graphics/interface/wordgroup_indicator.png index 9cf90dbf1..1d8313406 100644 Binary files a/graphics/interface/wordgroup_indicator.png and b/graphics/interface/wordgroup_indicator.png differ diff --git a/graphics/interface/wordgroup_layout.bin b/graphics/interface/wordgroup_layout.bin index d9fd80e43..787dcea1e 100644 Binary files a/graphics/interface/wordgroup_layout.bin and b/graphics/interface/wordgroup_layout.bin differ diff --git a/graphics/intro/copyright.bin b/graphics/intro/copyright.bin index 367991ff7..4a8309285 100644 Binary files a/graphics/intro/copyright.bin and b/graphics/intro/copyright.bin differ diff --git a/graphics/intro/copyright.png b/graphics/intro/copyright.png index 23d6dc2b4..a8304e57e 100644 Binary files a/graphics/intro/copyright.png and b/graphics/intro/copyright.png differ diff --git a/graphics/misc/clock.png b/graphics/misc/clock.png index 28780c1d1..73424016d 100644 Binary files a/graphics/misc/clock.png and b/graphics/misc/clock.png differ diff --git a/graphics/misc/condition_up_down.png b/graphics/misc/condition_up_down.png index 7d4049d86..02b3124de 100644 Binary files a/graphics/misc/condition_up_down.png and b/graphics/misc/condition_up_down.png differ diff --git a/graphics/misc/end_copyright.png b/graphics/misc/end_copyright.png index 57fc6114a..760d03e06 100644 Binary files a/graphics/misc/end_copyright.png and b/graphics/misc/end_copyright.png differ diff --git a/graphics/misc/hof.png b/graphics/misc/hof.png index b60489544..33acc2dcd 100644 Binary files a/graphics/misc/hof.png and b/graphics/misc/hof.png differ diff --git a/graphics/misc/interview_outline_cursor.png b/graphics/misc/interview_outline_cursor.png index c9ade7073..598b0d6f4 100644 Binary files a/graphics/misc/interview_outline_cursor.png and b/graphics/misc/interview_outline_cursor.png differ diff --git a/graphics/misc/trainer_card.png b/graphics/misc/trainer_card.png index 915ecdca2..fe5626f12 100644 Binary files a/graphics/misc/trainer_card.png and b/graphics/misc/trainer_card.png differ diff --git a/graphics/misc/wallclock_edit.bin b/graphics/misc/wallclock_edit.bin index 1c655c97b..7d51a7cff 100644 Binary files a/graphics/misc/wallclock_edit.bin and b/graphics/misc/wallclock_edit.bin differ diff --git a/graphics/misc/wallclock_view.bin b/graphics/misc/wallclock_view.bin index f75a23c80..444a57e60 100644 Binary files a/graphics/misc/wallclock_view.bin and b/graphics/misc/wallclock_view.bin differ diff --git a/graphics/naming_screen/back_button.png b/graphics/naming_screen/back_button.png index 39d69ba1a..812e39255 100644 Binary files a/graphics/naming_screen/back_button.png and b/graphics/naming_screen/back_button.png differ diff --git a/graphics/naming_screen/lower_text.png b/graphics/naming_screen/lower_text.png index 472e0abb0..08aebe26a 100644 Binary files a/graphics/naming_screen/lower_text.png and b/graphics/naming_screen/lower_text.png differ diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png index aae121e3e..78b0f6f23 100644 Binary files a/graphics/naming_screen/menu.png and b/graphics/naming_screen/menu.png differ diff --git a/graphics/naming_screen/ok_button.png b/graphics/naming_screen/ok_button.png index 2e9e9806d..e8bf68016 100644 Binary files a/graphics/naming_screen/ok_button.png and b/graphics/naming_screen/ok_button.png differ diff --git a/graphics/naming_screen/others_text.png b/graphics/naming_screen/others_text.png index ffd71701a..eafa76938 100644 Binary files a/graphics/naming_screen/others_text.png and b/graphics/naming_screen/others_text.png differ diff --git a/graphics/naming_screen/upper_text.png b/graphics/naming_screen/upper_text.png index 58bfbed35..cacd890e8 100644 Binary files a/graphics/naming_screen/upper_text.png and b/graphics/naming_screen/upper_text.png differ diff --git a/graphics/pokedex/area_unknown.png b/graphics/pokedex/area_unknown.png index 66d0382c3..1a92a2a1a 100644 Binary files a/graphics/pokedex/area_unknown.png and b/graphics/pokedex/area_unknown.png differ diff --git a/graphics/pokedex/cry_meter.png b/graphics/pokedex/cry_meter.png index ec6b0ed43..7862df796 100644 Binary files a/graphics/pokedex/cry_meter.png and b/graphics/pokedex/cry_meter.png differ diff --git a/graphics/pokedex/cry_meter_map.bin b/graphics/pokedex/cry_meter_map.bin index cd58849a4..92a8da3af 100644 Binary files a/graphics/pokedex/cry_meter_map.bin and b/graphics/pokedex/cry_meter_map.bin differ diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/menu.png index dd8ab63a7..7b2e814c7 100644 Binary files a/graphics/pokedex/menu.png and b/graphics/pokedex/menu.png differ diff --git a/graphics/pokedex/menu2.png b/graphics/pokedex/menu2.png index 27de53df0..408668f27 100644 Binary files a/graphics/pokedex/menu2.png and b/graphics/pokedex/menu2.png differ diff --git a/graphics/pokedex/menu3.pal b/graphics/pokedex/menu3.pal index 101b62b41..c35a1571f 100644 --- a/graphics/pokedex/menu3.pal +++ b/graphics/pokedex/menu3.pal @@ -31,7 +31,7 @@ JASC-PAL 16 0 0 172 156 139 82 82 57 -0 0 0 +255 255 255 0 0 0 123 131 0 0 0 0 @@ -52,7 +52,7 @@ JASC-PAL 123 131 0 0 0 0 0 0 0 -172 172 172 +205 205 205 172 172 172 98 98 115 57 57 57 @@ -63,5 +63,5 @@ JASC-PAL 32 32 32 172 156 139 82 82 57 -0 0 0 +205 205 205 0 0 0 diff --git a/graphics/pokedex/menu_search.png b/graphics/pokedex/menu_search.png index d1c4ae466..0ea5e2649 100644 Binary files a/graphics/pokedex/menu_search.png and b/graphics/pokedex/menu_search.png differ diff --git a/graphics/pokedex/noball.png b/graphics/pokedex/noball.png index 40acfbd7d..1be1668af 100644 Binary files a/graphics/pokedex/noball.png and b/graphics/pokedex/noball.png differ diff --git a/graphics/pokedex/pokedex_detail_layout.bin b/graphics/pokedex/pokedex_detail_layout.bin index debd15a94..673685f08 100644 Binary files a/graphics/pokedex/pokedex_detail_layout.bin and b/graphics/pokedex/pokedex_detail_layout.bin differ diff --git a/graphics/pokedex/pokedex_list_menu.bin b/graphics/pokedex/pokedex_list_menu.bin index 9cc6acb41..7bd0129db 100644 Binary files a/graphics/pokedex/pokedex_list_menu.bin and b/graphics/pokedex/pokedex_list_menu.bin differ diff --git a/graphics/pokedex/pokedex_listing_menu.bin b/graphics/pokedex/pokedex_listing_menu.bin index 00e63f3a9..ffa7d4df6 100644 Binary files a/graphics/pokedex/pokedex_listing_menu.bin and b/graphics/pokedex/pokedex_listing_menu.bin differ diff --git a/graphics/pokedex/pokedex_navbar.bin b/graphics/pokedex/pokedex_navbar.bin index 58da7b7b5..5b08e2205 100644 Binary files a/graphics/pokedex/pokedex_navbar.bin and b/graphics/pokedex/pokedex_navbar.bin differ diff --git a/graphics/pokedex/pokedex_navbar_3.bin b/graphics/pokedex/pokedex_navbar_3.bin index e32733737..45c4afe93 100644 Binary files a/graphics/pokedex/pokedex_navbar_3.bin and b/graphics/pokedex/pokedex_navbar_3.bin differ diff --git a/graphics/pokemon_storage/header.png b/graphics/pokemon_storage/header.png index f302ea41f..603e66042 100644 Binary files a/graphics/pokemon_storage/header.png and b/graphics/pokemon_storage/header.png differ diff --git a/graphics/pokemon_storage/misc1.png b/graphics/pokemon_storage/misc1.png index e2906d6af..bf6d8cdbc 100644 Binary files a/graphics/pokemon_storage/misc1.png and b/graphics/pokemon_storage/misc1.png differ diff --git a/graphics/pokenav/bottom_toolbar.bin b/graphics/pokenav/bottom_toolbar.bin index 84261404b..c925629f8 100644 Binary files a/graphics/pokenav/bottom_toolbar.bin and b/graphics/pokenav/bottom_toolbar.bin differ diff --git a/graphics/pokenav/condition_cancel.png b/graphics/pokenav/condition_cancel.png index db4734b15..c490fc7dc 100644 Binary files a/graphics/pokenav/condition_cancel.png and b/graphics/pokenav/condition_cancel.png differ diff --git a/graphics/pokenav/condition_menu.png b/graphics/pokenav/condition_menu.png index 8b682223e..a384b26bb 100644 Binary files a/graphics/pokenav/condition_menu.png and b/graphics/pokenav/condition_menu.png differ diff --git a/graphics/pokenav/condition_menu_header.png b/graphics/pokenav/condition_menu_header.png index 1a9c07273..9b7927a9d 100644 Binary files a/graphics/pokenav/condition_menu_header.png and b/graphics/pokenav/condition_menu_header.png differ diff --git a/graphics/pokenav/condition_menu_misc.png b/graphics/pokenav/condition_menu_misc.png index 3c87c867e..50f6b9dd5 100644 Binary files a/graphics/pokenav/condition_menu_misc.png and b/graphics/pokenav/condition_menu_misc.png differ diff --git a/graphics/pokenav/condition_menu_options.png b/graphics/pokenav/condition_menu_options.png index 588c3b92f..454799972 100644 Binary files a/graphics/pokenav/condition_menu_options.png and b/graphics/pokenav/condition_menu_options.png differ diff --git a/graphics/pokenav/condition_menu_options2.png b/graphics/pokenav/condition_menu_options2.png index f17160c56..d7bb157be 100644 Binary files a/graphics/pokenav/condition_menu_options2.png and b/graphics/pokenav/condition_menu_options2.png differ diff --git a/graphics/pokenav/condition_screen.bin b/graphics/pokenav/condition_screen.bin index 7dc6d6c32..672d4a7a3 100644 --- a/graphics/pokenav/condition_screen.bin +++ b/graphics/pokenav/condition_screen.bin @@ -1 +1 @@ -€"€"€"€"€"€"€"€"€"€"€"€"�"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"ƒ"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‡"ˆ"‰"Š"‡&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‹"Œ"�"Ž"‹&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"�"�"‘"’"“"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"”"•"–"—"˜"™"š"›"œ"�"ž"Ÿ" "¡"¢"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"£"¤"¥"¦"§"¨"¨"©"¨"¨"ª"«"¬"­"®"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"¯"°"±"²"³"´"©"µ"¶"·"¸"¹"º"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"»"¼"¨"¨"½"¾"¿"¨"À"Á"Â"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ã"Ä"¨"Å"Æ"Ç"¨"È"É"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ê"Ë"Ì"Í"¨"Î"Ï"Ð"Ñ"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ò"Ó"Ô"Õ"Ö"×"Ø"Ù"Ú"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"Û"Ü"Ý"Þ"ß"à"á"â"ã"ä"å"æ"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"ç"è"é"ê"…"…"…"ë"ì"í"î"ï"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"ð"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ò"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€" \ No newline at end of file +€"€"€"€"€"€"€"€"€"€"€"€"�"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"ƒ"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‡"ˆ"‰"Š"‡&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‹"Œ"�"Ž"‹&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"ý"þ"…"…"�"�"‘"’"“"…"…"ý"þ"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"”"•"–"—"˜"™"š"›"œ"�"ž"Ÿ" "¡"¢"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"£"¤"¥"¦"§"¨"¨"©"¨"¨"ª"«"¬"­"®"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"¯"°"±"²"³"´"©"µ"¶"·"¸"¹"º"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"»"¼"¨"¨"½"¾"¿"¨"À"Á"Â"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ã"Ä"¨"Å"Æ"Ç"¨"È"É"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ê"Ë"Ì"Í"¨"Î"Ï"Ð"Ñ"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ò"Ó"Ô"Õ"Ö"×"Ø"Ù"Ú"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"Û"Ü"Ý"Þ"ß"à"á"â"ã"ä"å"æ"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"ç"è"é"ê"…"…"…"ë"ì"í"î"ï"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"ð"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ò"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€" \ No newline at end of file diff --git a/graphics/pokenav/condition_search_beauty.png b/graphics/pokenav/condition_search_beauty.png index 8201ee306..9b6fd6519 100644 Binary files a/graphics/pokenav/condition_search_beauty.png and b/graphics/pokenav/condition_search_beauty.png differ diff --git a/graphics/pokenav/condition_search_cancel.png b/graphics/pokenav/condition_search_cancel.png index 9a612fff0..a2f49a507 100644 Binary files a/graphics/pokenav/condition_search_cancel.png and b/graphics/pokenav/condition_search_cancel.png differ diff --git a/graphics/pokenav/condition_search_cool.png b/graphics/pokenav/condition_search_cool.png index edf1a8770..7c8ea960e 100644 Binary files a/graphics/pokenav/condition_search_cool.png and b/graphics/pokenav/condition_search_cool.png differ diff --git a/graphics/pokenav/condition_search_cute.png b/graphics/pokenav/condition_search_cute.png index 0551a1c1a..141900e97 100644 Binary files a/graphics/pokenav/condition_search_cute.png and b/graphics/pokenav/condition_search_cute.png differ diff --git a/graphics/pokenav/condition_search_smart.png b/graphics/pokenav/condition_search_smart.png index bae400440..261be042f 100644 Binary files a/graphics/pokenav/condition_search_smart.png and b/graphics/pokenav/condition_search_smart.png differ diff --git a/graphics/pokenav/condition_search_tough.png b/graphics/pokenav/condition_search_tough.png index 85c0d107c..4eafca926 100644 Binary files a/graphics/pokenav/condition_search_tough.png and b/graphics/pokenav/condition_search_tough.png differ diff --git a/graphics/pokenav/condition_view.png b/graphics/pokenav/condition_view.png index d41c5794b..a5463c123 100644 Binary files a/graphics/pokenav/condition_view.png and b/graphics/pokenav/condition_view.png differ diff --git a/graphics/pokenav/mainmenu.png b/graphics/pokenav/mainmenu.png index 7908457cd..b7a5cb0c5 100644 Binary files a/graphics/pokenav/mainmenu.png and b/graphics/pokenav/mainmenu.png differ diff --git a/graphics/pokenav/map_header.png b/graphics/pokenav/map_header.png index 0b7d73130..c02157920 100644 Binary files a/graphics/pokenav/map_header.png and b/graphics/pokenav/map_header.png differ diff --git a/graphics/pokenav/map_misc2.png b/graphics/pokenav/map_misc2.png index 1118afaf8..3ee0872ba 100644 Binary files a/graphics/pokenav/map_misc2.png and b/graphics/pokenav/map_misc2.png differ diff --git a/graphics/pokenav/map_squares.png b/graphics/pokenav/map_squares.png index fb73235ff..4cf6aa78c 100644 Binary files a/graphics/pokenav/map_squares.png and b/graphics/pokenav/map_squares.png differ diff --git a/graphics/pokenav/menu_condition.png b/graphics/pokenav/menu_condition.png index e4d8f064f..84d366795 100644 Binary files a/graphics/pokenav/menu_condition.png and b/graphics/pokenav/menu_condition.png differ diff --git a/graphics/pokenav/menu_eyes.png b/graphics/pokenav/menu_eyes.png index bbc0869c1..6e1320dc7 100644 Binary files a/graphics/pokenav/menu_eyes.png and b/graphics/pokenav/menu_eyes.png differ diff --git a/graphics/pokenav/menu_hoennmap.png b/graphics/pokenav/menu_hoennmap.png index 06f7f5e7f..a0f3f22bc 100644 Binary files a/graphics/pokenav/menu_hoennmap.png and b/graphics/pokenav/menu_hoennmap.png differ diff --git a/graphics/pokenav/menu_off.png b/graphics/pokenav/menu_off.png index 8a753d0f1..39bf30aca 100644 Binary files a/graphics/pokenav/menu_off.png and b/graphics/pokenav/menu_off.png differ diff --git a/graphics/pokenav/menu_ribbons.png b/graphics/pokenav/menu_ribbons.png index 5426e24bb..ec546bd0b 100644 Binary files a/graphics/pokenav/menu_ribbons.png and b/graphics/pokenav/menu_ribbons.png differ diff --git a/graphics/pokenav/ribbons.png b/graphics/pokenav/ribbons.png index 75ec59d25..7fb46e705 100644 Binary files a/graphics/pokenav/ribbons.png and b/graphics/pokenav/ribbons.png differ diff --git a/graphics/pokenav/trainereyes.png b/graphics/pokenav/trainereyes.png index 250b4c27e..e470a7732 100644 Binary files a/graphics/pokenav/trainereyes.png and b/graphics/pokenav/trainereyes.png differ diff --git a/graphics/roulette/credit.png b/graphics/roulette/credit.png index 687d47934..4dceda07d 100644 Binary files a/graphics/roulette/credit.png and b/graphics/roulette/credit.png differ diff --git a/graphics/slot_machine/slots.png b/graphics/slot_machine/slots.png index 291f467c3..ac22fa099 100644 Binary files a/graphics/slot_machine/slots.png and b/graphics/slot_machine/slots.png differ diff --git a/graphics/slot_machine/slots_layout.bin b/graphics/slot_machine/slots_layout.bin index e7bc27a70..085b43424 100644 Binary files a/graphics/slot_machine/slots_layout.bin and b/graphics/slot_machine/slots_layout.bin differ diff --git a/graphics/summary_screen/text.png b/graphics/summary_screen/text.png index cd6b1e391..e69558972 100644 Binary files a/graphics/summary_screen/text.png and b/graphics/summary_screen/text.png differ diff --git a/graphics/title_screen/logo_ruby.pal b/graphics/title_screen/logo_ruby.pal index ea9820a4a..6bcffff32 100644 --- a/graphics/title_screen/logo_ruby.pal +++ b/graphics/title_screen/logo_ruby.pal @@ -3,28 +3,26 @@ JASC-PAL 224 0 0 0 0 0 0 +255 255 255 +246 222 24 255 238 16 -246 222 41 -246 238 246 255 246 24 -246 246 41 -246 246 246 246 255 255 -255 246 255 0 0 255 8 0 255 24 0 238 -246 222 24 246 222 32 +246 222 41 255 238 41 -255 238 49 +246 238 238 255 255 16 255 255 24 -255 255 246 -255 255 255 -0 0 0 -24 41 32 -32 32 74 +255 246 32 +255 255 32 +246 246 238 +246 246 246 +246 246 255 +8 0 8 32 0 230 32 0 238 32 0 246 @@ -33,16 +31,17 @@ JASC-PAL 255 230 24 246 230 41 246 238 41 -246 230 49 -246 238 49 -255 246 32 -255 246 41 -255 255 32 -255 255 41 -32 24 32 -32 32 41 -197 156 41 -197 164 41 +255 238 49 +246 246 41 +8 8 8 +24 16 16 +24 24 16 +32 16 16 +32 24 16 +24 16 24 +32 16 24 +24 24 24 +41 16 16 16 0 246 16 0 255 24 0 246 @@ -52,105 +51,78 @@ JASC-PAL 57 0 238 41 0 246 41 0 255 -8 8 197 246 230 24 246 230 32 255 238 24 255 238 32 -32 32 32 -32 41 32 -41 32 32 -41 41 32 -49 32 32 -49 41 32 -41 32 41 -49 32 41 -24 41 41 -32 32 90 -16 24 106 -24 32 98 +246 230 49 +246 238 49 +255 246 41 +255 255 41 +16 16 16 +32 24 24 +32 32 24 +32 41 57 +32 41 65 +41 24 16 +41 24 24 +49 16 16 +41 32 24 +57 32 24 41 32 82 41 32 98 -41 41 82 -41 41 98 -0 0 115 -8 8 131 -32 24 115 -32 24 131 -32 41 115 -41 41 115 -32 41 131 -41 41 131 -57 41 41 -57 41 49 -57 49 41 -57 57 57 -65 41 41 -74 41 41 -65 57 57 -74 57 57 -57 74 74 -65 65 74 -82 74 82 -82 57 131 -82 90 82 -90 90 90 -90 98 98 -98 98 106 -115 106 106 +74 65 74 +57 32 106 +82 82 82 +82 82 90 +98 90 90 +98 98 98 +115 90 123 131 98 115 -139 98 106 -139 115 98 180 139 57 172 131 65 -156 115 90 -156 131 82 -115 82 139 -123 82 131 -115 98 131 -131 98 123 -115 123 123 -123 123 131 -139 131 139 -148 123 131 -205 172 24 -213 172 16 +156 123 90 +164 123 82 +189 156 41 +197 164 41 +180 148 65 +189 164 65 +115 115 115 +115 115 123 +139 115 98 +131 123 123 +156 123 106 +156 139 115 +164 156 115 +180 164 98 205 164 32 -213 172 32 -222 189 24 -230 189 16 +205 172 24 +222 180 16 +213 172 24 213 189 32 -222 189 32 +222 189 24 230 205 24 -230 205 32 -230 213 32 -238 222 32 -180 148 57 -189 156 49 -180 148 74 -180 172 90 -156 148 123 -139 148 139 -164 148 115 -172 156 106 -197 156 49 +238 213 24 +205 164 41 +213 189 41 205 180 49 -197 172 90 205 189 82 -222 205 49 -230 222 49 -205 205 74 -222 213 65 +222 205 41 +230 213 41 +213 205 65 +230 222 57 49 0 230 49 0 238 49 0 246 49 0 255 57 0 246 57 0 255 -16 8 197 -16 16 189 +8 16 139 +16 16 139 +41 24 148 32 16 164 -41 16 164 +8 8 197 +16 16 189 32 16 180 41 16 189 8 8 205 @@ -177,51 +149,79 @@ JASC-PAL 41 16 230 49 16 230 49 8 238 -32 32 156 -24 32 172 -41 41 156 -41 32 164 -74 49 180 -82 49 172 -82 65 164 -90 74 164 -24 32 189 +41 32 139 +41 41 139 +24 32 164 +41 32 156 +74 49 164 +90 57 164 +98 82 139 +98 74 164 +24 32 180 57 41 189 41 32 213 57 32 213 -74 41 189 -90 57 189 -74 49 197 -74 41 205 -106 65 156 -123 106 156 +82 49 180 +98 74 180 +74 32 197 +82 49 197 +115 82 139 115 82 164 -106 82 172 +123 106 148 +139 123 139 +139 139 139 +148 139 139 148 148 156 -156 156 156 -164 164 156 -172 172 172 -180 189 180 +164 164 164 +180 180 180 +180 189 189 189 189 189 -197 189 189 197 197 197 -205 205 213 213 213 213 -222 230 230 +222 213 222 230 230 230 +238 238 238 +16 8 8 +16 8 16 +24 24 32 +24 32 32 +32 24 32 +32 32 32 +32 32 41 32 41 41 -32 49 41 +32 32 74 +32 32 82 +0 0 123 +8 8 123 +24 32 98 +24 24 115 +49 24 16 +49 24 24 +57 16 16 +57 24 16 +65 16 16 +65 24 24 +41 32 32 41 41 41 -49 41 41 -41 49 41 -49 49 41 -32 41 57 -41 41 49 -32 41 65 +49 32 32 +57 32 32 +49 41 49 +49 49 49 41 41 65 -32 49 49 -41 49 49 -32 57 57 -41 49 57 -32 41 82 -32 41 90 +49 49 57 +57 49 49 +57 57 57 +65 57 57 +74 65 65 +41 41 74 +49 49 82 +41 41 90 +49 41 98 +41 32 106 +49 32 115 +41 24 123 +49 32 123 +41 41 106 +41 49 106 +41 41 123 +41 49 123 diff --git a/graphics/title_screen/logo_sapphire.pal b/graphics/title_screen/logo_sapphire.pal index e733c6d2c..7b74308af 100644 --- a/graphics/title_screen/logo_sapphire.pal +++ b/graphics/title_screen/logo_sapphire.pal @@ -3,225 +3,225 @@ JASC-PAL 224 0 0 0 0 0 0 +246 222 24 255 238 16 -246 222 41 -246 238 246 255 246 24 +246 246 41 +246 246 246 +246 255 255 +255 246 246 +8 8 8 +16 8 8 0 0 255 -8 0 255 -24 0 238 -246 222 24 246 222 32 +246 222 41 255 238 41 -255 238 49 +246 238 238 255 255 16 255 255 24 -255 246 32 -255 255 32 -246 246 238 -246 246 246 -246 246 255 -246 255 246 -246 255 255 -255 246 246 -255 246 255 255 255 246 255 255 255 -0 0 0 -32 32 41 -32 0 230 -32 0 238 -32 0 246 -32 0 255 246 238 32 255 230 24 246 230 41 246 238 41 -246 230 49 -246 238 49 -246 246 41 -32 41 32 +255 238 49 +255 246 32 +255 246 41 +255 255 32 +255 255 41 +16 8 16 +24 16 16 +24 16 24 +24 24 16 +24 24 24 +32 24 24 +32 32 24 +24 24 32 +41 32 32 41 41 32 -49 32 32 -49 32 41 -197 156 41 -197 164 41 -16 0 246 -16 0 255 +90 82 82 +222 180 16 +0 0 131 +8 8 131 +16 8 230 +16 8 238 +8 0 255 24 0 246 24 0 255 -41 0 230 -41 0 238 -57 0 238 -41 0 246 -41 0 255 +24 8 246 +24 8 255 +8 16 246 +172 172 172 +189 180 189 +197 197 197 +213 213 213 +230 230 230 246 230 24 246 230 32 255 238 24 255 238 32 -255 246 41 -255 255 41 -32 32 24 +246 230 49 +246 238 49 +16 16 16 +16 16 24 +32 24 32 32 32 32 -41 32 24 -41 32 32 -49 41 24 -49 41 32 -24 41 41 -32 41 41 +24 24 41 +24 32 41 +32 24 41 +32 32 41 +24 32 57 +24 41 65 +32 32 57 +32 41 57 +24 41 74 +32 32 74 +0 0 115 +24 32 106 41 32 41 -41 32 49 41 41 41 -41 41 49 -41 49 41 -41 49 49 -8 16 115 -16 24 106 -32 32 90 -32 32 106 -0 0 123 -8 8 131 -24 24 123 -41 24 131 -32 41 65 -32 41 82 -41 49 74 -41 57 65 -32 41 98 -41 41 98 -32 41 123 -41 41 123 -57 41 41 -57 49 41 -57 41 49 -65 49 49 +49 41 49 +41 41 65 +41 32 82 +41 32 98 +41 41 82 +41 41 90 +41 32 106 +41 24 115 +41 41 115 +41 49 115 +57 49 49 +57 49 57 57 57 49 -57 65 57 65 57 57 -74 57 57 -65 65 74 -74 74 74 -82 74 82 -65 49 115 -90 90 82 -98 90 90 -98 98 98 -98 98 106 -115 98 98 -115 115 106 -131 98 106 -139 115 98 +65 57 65 +74 65 65 +74 65 74 +74 74 82 +90 82 90 +90 90 90 +106 98 98 +106 106 106 +123 98 115 +139 106 106 180 139 57 +189 148 49 172 131 65 -156 115 90 -156 131 82 -115 82 131 -115 90 131 -115 115 131 -115 123 123 -131 90 123 -139 115 131 -131 131 123 -139 131 131 -205 172 24 -213 172 16 +180 148 65 205 164 32 -213 172 32 -222 189 24 -230 189 16 +205 172 24 +197 164 41 +197 172 49 +123 123 123 +139 123 106 +164 123 82 +156 131 98 +172 139 82 +172 156 106 +189 172 98 +197 189 82 +213 172 24 +222 180 24 213 189 32 -222 189 32 +222 189 24 230 205 24 -230 205 32 -230 213 32 -238 222 32 -180 148 57 -172 148 65 -189 156 57 -189 164 57 -164 148 106 -156 148 123 -180 156 98 -189 172 90 -205 172 49 -213 197 49 -205 180 82 -205 197 74 -222 213 57 +238 213 24 +213 180 41 +222 197 41 +213 189 49 +213 197 74 +230 213 41 +230 222 41 213 213 65 -230 213 57 230 222 57 -49 0 230 -49 0 238 -49 0 246 -49 0 255 -57 0 246 -57 0 255 -16 24 148 -24 16 180 8 8 197 -16 16 189 -41 24 148 -32 16 164 -32 16 180 -41 16 189 -8 8 205 -8 16 205 +16 8 197 +32 8 205 +41 8 197 +16 8 213 +16 8 222 24 8 213 -24 16 205 +32 8 213 41 8 213 -41 16 213 +41 8 222 49 8 213 -57 16 213 -16 8 230 +57 8 213 +24 0 238 24 8 230 -24 16 230 -24 24 230 +32 0 230 +32 8 230 +41 0 230 +41 0 238 +41 8 230 +41 8 238 +49 0 230 +49 8 230 +57 0 238 +57 8 238 8 8 246 -8 16 246 +8 8 255 +16 0 246 +16 0 255 16 8 246 -16 16 246 -32 8 230 -32 16 230 -32 8 238 +16 8 255 +32 0 246 +32 0 255 32 8 246 -41 8 230 -41 16 230 -49 16 230 -49 8 238 -24 32 164 -24 49 172 +32 8 255 +41 0 246 +41 8 246 +49 0 246 +57 0 246 +8 16 131 +24 24 131 +16 24 148 +32 24 156 +41 24 131 +41 24 156 +41 41 131 41 41 148 -41 32 156 -82 57 172 -90 57 164 -90 74 156 -106 82 156 +16 16 180 +24 16 197 +24 24 180 24 32 180 -57 41 189 -41 32 213 +41 16 172 +41 16 189 +41 24 180 +49 32 189 +8 16 222 +16 16 213 +8 24 222 +16 24 222 +24 16 238 +16 16 246 +41 16 213 +41 24 213 +57 24 213 57 32 213 +32 16 230 +32 24 222 +57 24 222 +49 16 230 +90 65 164 +98 57 156 +98 74 156 +98 82 148 +115 82 131 +115 90 156 +123 106 148 +139 115 139 82 49 180 -98 74 180 -74 32 197 +82 57 172 +98 65 172 +106 82 172 +74 32 189 +74 32 205 +82 49 189 82 49 197 -123 90 156 -131 115 148 -139 148 148 -148 148 148 -156 156 148 -148 156 156 -164 156 156 -172 172 172 -180 189 180 -180 189 189 -197 189 197 -205 205 197 -205 213 213 -213 213 213 -230 222 213 -230 230 230 -32 41 49 -32 41 57 -32 49 49 -32 49 57 +123 131 131 +131 131 131 +139 131 131 +139 139 139 +156 131 131 +156 148 156 diff --git a/graphics/title_screen/pokemon_ruby.png b/graphics/title_screen/pokemon_ruby.png index 7d141ad67..691c02ce9 100644 Binary files a/graphics/title_screen/pokemon_ruby.png and b/graphics/title_screen/pokemon_ruby.png differ diff --git a/graphics/title_screen/pokemon_sapphire.png b/graphics/title_screen/pokemon_sapphire.png index 9363289df..2e451f746 100644 Binary files a/graphics/title_screen/pokemon_sapphire.png and b/graphics/title_screen/pokemon_sapphire.png differ diff --git a/graphics/title_screen/press_start.png b/graphics/title_screen/press_start.png index b38a4b58d..1800e4cc7 100644 Binary files a/graphics/title_screen/press_start.png and b/graphics/title_screen/press_start.png differ diff --git a/graphics/title_screen/rubyversion.png b/graphics/title_screen/rubyversion.png index d12eb7bfa..ba3f342aa 100644 Binary files a/graphics/title_screen/rubyversion.png and b/graphics/title_screen/rubyversion.png differ diff --git a/graphics/title_screen/sapphireversion.png b/graphics/title_screen/sapphireversion.png index 53b494d5e..3e3c31a09 100644 Binary files a/graphics/title_screen/sapphireversion.png and b/graphics/title_screen/sapphireversion.png differ diff --git a/graphics/trade/menu.png b/graphics/trade/menu.png index 54b00eb1c..8b5ee8eef 100644 Binary files a/graphics/trade/menu.png and b/graphics/trade/menu.png differ diff --git a/graphics/types/bug.png b/graphics/types/bug.png index c11629b21..3d9d27a7e 100644 Binary files a/graphics/types/bug.png and b/graphics/types/bug.png differ diff --git a/graphics/types/contest_beauty.png b/graphics/types/contest_beauty.png index b52fe3ca4..397b67748 100644 Binary files a/graphics/types/contest_beauty.png and b/graphics/types/contest_beauty.png differ diff --git a/graphics/types/contest_cool.png b/graphics/types/contest_cool.png index 813e91f80..5f11cbb3d 100644 Binary files a/graphics/types/contest_cool.png and b/graphics/types/contest_cool.png differ diff --git a/graphics/types/contest_cute.png b/graphics/types/contest_cute.png index ece852a9d..fa2cf308c 100644 Binary files a/graphics/types/contest_cute.png and b/graphics/types/contest_cute.png differ diff --git a/graphics/types/contest_smart.png b/graphics/types/contest_smart.png index 8e0d903f1..fff25c17f 100644 Binary files a/graphics/types/contest_smart.png and b/graphics/types/contest_smart.png differ diff --git a/graphics/types/contest_tough.png b/graphics/types/contest_tough.png index a76e9cba4..487579f85 100644 Binary files a/graphics/types/contest_tough.png and b/graphics/types/contest_tough.png differ diff --git a/graphics/types/dark.png b/graphics/types/dark.png index 3380297da..004f2da82 100644 Binary files a/graphics/types/dark.png and b/graphics/types/dark.png differ diff --git a/graphics/types/dragon.png b/graphics/types/dragon.png index 908073260..ffff9e15b 100644 Binary files a/graphics/types/dragon.png and b/graphics/types/dragon.png differ diff --git a/graphics/types/electric.png b/graphics/types/electric.png index 84db710b6..8e88a1dec 100644 Binary files a/graphics/types/electric.png and b/graphics/types/electric.png differ diff --git a/graphics/types/fight.png b/graphics/types/fight.png index 6431c9bba..00ccf7efd 100644 Binary files a/graphics/types/fight.png and b/graphics/types/fight.png differ diff --git a/graphics/types/fire.png b/graphics/types/fire.png index f6db950c8..911c5152f 100644 Binary files a/graphics/types/fire.png and b/graphics/types/fire.png differ diff --git a/graphics/types/flying.png b/graphics/types/flying.png index 144d0010b..5484c0a02 100644 Binary files a/graphics/types/flying.png and b/graphics/types/flying.png differ diff --git a/graphics/types/ghost.png b/graphics/types/ghost.png index 5820fe93a..682f47502 100644 Binary files a/graphics/types/ghost.png and b/graphics/types/ghost.png differ diff --git a/graphics/types/grass.png b/graphics/types/grass.png index 6d3e870ca..ab758504b 100644 Binary files a/graphics/types/grass.png and b/graphics/types/grass.png differ diff --git a/graphics/types/ground.png b/graphics/types/ground.png index 2872b1367..301190d2f 100644 Binary files a/graphics/types/ground.png and b/graphics/types/ground.png differ diff --git a/graphics/types/ice.png b/graphics/types/ice.png index a611d1f4a..3f0d5640a 100644 Binary files a/graphics/types/ice.png and b/graphics/types/ice.png differ diff --git a/graphics/types/poison.png b/graphics/types/poison.png index 2fab1ad53..f0ebb5e10 100644 Binary files a/graphics/types/poison.png and b/graphics/types/poison.png differ diff --git a/graphics/types/psychic.png b/graphics/types/psychic.png index 98f70406e..c8e4202c5 100644 Binary files a/graphics/types/psychic.png and b/graphics/types/psychic.png differ diff --git a/graphics/types/rock.png b/graphics/types/rock.png index e95b2a8ef..3d410ea7c 100644 Binary files a/graphics/types/rock.png and b/graphics/types/rock.png differ diff --git a/graphics/types/steel.png b/graphics/types/steel.png index b952031fd..47c778adb 100644 Binary files a/graphics/types/steel.png and b/graphics/types/steel.png differ diff --git a/graphics/types/water.png b/graphics/types/water.png index 19ae3ebe3..c2829c792 100644 Binary files a/graphics/types/water.png and b/graphics/types/water.png differ diff --git a/graphics/unknown/unknown_E953D0.bin b/graphics/unknown/unknown_E953D0.bin index 1c4ec2567..f19133fc8 100644 Binary files a/graphics/unknown/unknown_E953D0.bin and b/graphics/unknown/unknown_E953D0.bin differ diff --git a/graphics/unknown/unknown_E9ABB4.bin b/graphics/unknown/unknown_E9ABB4.bin index f09bb8ab3..887dfd287 100644 --- a/graphics/unknown/unknown_E9ABB4.bin +++ b/graphics/unknown/unknown_E9ABB4.bin @@ -1 +1 @@ -�2�2 2¡2¢2£2¤2¥2¦2§2¨2©2�2�2�2�2�2ª2«2¬2­2®2¯2�2�2�2�2�2�2�2�2�2°2±2²2³2´2µ2¶2·2�2�2�2�2�2�2�2¸2¹2º2»2¼2½2¾2¿2À2Á2�2�2�2 \ No newline at end of file +�2�2 2¡2¢2£2¤2¥2¦2§2¨2©2�2�2�2�2�2ª2«2¬2­2®2¯2°2±2²2³2´2�2�2�2�2µ2¶2·2¸2¹2º2»2¼2½2�2�2�2�2�2�2¾2¿2À2Á2Â2Ã2Ä2Å2Æ2Ç2�2�2�2 \ No newline at end of file diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin index aa15ea36e..716a93f2d 100644 Binary files a/graphics/unused/old_charmap.bin and b/graphics/unused/old_charmap.bin differ diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png index b5ea6e803..72ceffbf9 100644 Binary files a/graphics/unused/old_charmap.png and b/graphics/unused/old_charmap.png differ diff --git a/include/cable_club.h b/include/cable_club.h index a2fe46b30..2f509c9fc 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -20,5 +20,8 @@ void sub_8083B90(void); void sub_8083BDC(void); bool32 sub_8083BF4(u8 linkPlayerIndex); void sub_8083C50(u8 taskId); +#if DEBUG +void debug_sub_808B838(u8); +#endif #endif // GUARD_CABLE_CLUB_H diff --git a/include/clock.h b/include/clock.h index 4e6560c91..5772145d3 100644 --- a/include/clock.h +++ b/include/clock.h @@ -3,6 +3,7 @@ // TODO: time of day and seconds in a day defines +void InitTimeBasedEvents(void); void DoTimeBasedEvents(void); #endif diff --git a/include/constants/decorations.h b/include/constants/decorations.h index 2e3558721..c361ccdf1 100644 --- a/include/constants/decorations.h +++ b/include/constants/decorations.h @@ -123,4 +123,6 @@ #define DECOR_REGICE_DOLL 119 #define DECOR_REGISTEEL_DOLL 120 +#define DECOR_COUNT 121 + #endif // GUARD_CONSTANTS_DECORATIONS_H diff --git a/include/debug.h b/include/debug.h index f3ad8c401..8f9e84c24 100644 --- a/include/debug.h +++ b/include/debug.h @@ -3,5 +3,6 @@ // matsuda_debug_menu void sub_80AAF30(void); +void unref_sub_80AB084(const u8 *text); #endif // GUARD_DEBUG_H diff --git a/include/overworld.h b/include/overworld.h index 0954f1b63..50089593f 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -235,4 +235,6 @@ void CreateLinkPlayerSprite(u8); void SpriteCB_LinkPlayer(struct Sprite *); void sub_805465C(void); +void CB2_InitTestMenu(void); + #endif // GUARD_ROM4_H diff --git a/override.mk b/override.mk index e69de29bb..64a139efb 100644 --- a/override.mk +++ b/override.mk @@ -0,0 +1,25 @@ +# +# misc.mk +# +MENUGFXDIR := graphics/interface +INTROGFXDIR := graphics/intro +MISCGFXDIR := graphics/misc + +$(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png + $(GBAGFX) $< $@ -num_tiles 76 +$(MENUGFXDIR)/check_berry.4bpp: $(MENUGFXDIR)/check_berry.png + $(GBAGFX) $< $@ -num_tiles 97 + +$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png + $(GBAGFX) $< $@ -num_tiles 47 + +$(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png + $(GBAGFX) $< $@ -num_tiles 92 + +# +# tilesets.mk +# +TILESETDIR := data/tilesets + +$(TILESETDIR)/secondary/shop/tiles.4bpp: $(TILESETDIR)/secondary/shop/tiles.png + $(GBAGFX) $< $@ -num_tiles 503 diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 990535b4e..5212f5bdc 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -203,6 +203,231 @@ void sub_800E7C4(void) } } +#if DEBUG +__attribute__((naked)) +void InitBattle(void) +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x0\n" + " bl SetHBlankCallback\n" + " mov r0, #0x0\n" + " bl SetVBlankCallback\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x13\n" + " ldr r2, ._10\n" + " mov r0, sp\n" + " bl gScriptFuncs_End+0x3cb4\n" + " ldr r0, ._10 + 4\n" + " strh r4, [r0]\n" + " sub r0, r0, #0xc\n" + " mov r2, #0xf0\n" + " strh r2, [r0]\n" + " add r0, r0, #0x4\n" + " ldr r3, ._10 + 8\n" + " add r1, r3, #0\n" + " strh r1, [r0]\n" + " add r0, r0, #0x4\n" + " strh r4, [r0]\n" + " add r0, r0, #0x2\n" + " strh r4, [r0]\n" + " ldr r0, ._10 + 12\n" + " strh r2, [r0]\n" + " ldr r0, ._10 + 16\n" + " strh r1, [r0]\n" + " bl dp12_8087EA4\n" + " ldr r0, ._10 + 20\n" + " mov r3, #0xf0\n" + " mov r5, #0xf0\n" + " lsl r5, r5, #0x3\n" + " add r2, r0, r5\n" + " mov r1, #0x4f\n" + "._5:\n" + " strh r3, [r0]\n" + " strh r3, [r2]\n" + " add r2, r2, #0x2\n" + " add r0, r0, #0x2\n" + " sub r1, r1, #0x1\n" + " cmp r1, #0\n" + " bge ._5 @cond_branch\n" + " mov r1, #0x50\n" + " ldr r4, ._10 + 24\n" + " ldr r0, ._10 + 20\n" + " ldr r3, ._10 + 28\n" + " mov r5, #0x82\n" + " lsl r5, r5, #0x4\n" + " add r2, r0, r5\n" + " add r0, r0, #0xa0\n" + "._6:\n" + " strh r3, [r0]\n" + " strh r3, [r2]\n" + " add r2, r2, #0x2\n" + " add r0, r0, #0x2\n" + " add r1, r1, #0x1\n" + " cmp r1, #0x9f\n" + " ble ._6 @cond_branch\n" + " ldr r0, [r4]\n" + " ldr r1, [r4, #0x4]\n" + " ldr r2, [r4, #0x8]\n" + " bl sub_80895F8\n" + " ldr r4, ._10 + 32\n" + " add r0, r4, #0\n" + " bl SetUpWindowConfig\n" + " bl ResetPaletteFade\n" + " ldr r0, ._10 + 36\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 40\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 44\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 48\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 52\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 56\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 60\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 64\n" + " strh r1, [r0]\n" + " ldr r0, ._10 + 68\n" + " ldrb r1, [r0]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._7 @cond_branch\n" + " bl GetBattleTerrain\n" + " ldr r1, ._10 + 72\n" + " strb r0, [r1]\n" + "._7:\n" + " ldr r0, ._10 + 76\n" + " add r1, r4, #0\n" + " bl InitWindowFromConfig\n" + " ldr r0, ._10 + 80\n" + " ldr r1, ._10 + 84\n" + " bl InitWindowFromConfig\n" + " ldr r0, ._10 + 88\n" + " ldr r1, ._10 + 92\n" + " bl InitWindowFromConfig\n" + " bl sub_800D6D4\n" + " bl sub_800DAB8\n" + " bl ResetSpriteData\n" + " bl ResetTasks\n" + " bl sub_800E23C\n" + " bl FreeAllSpritePalettes\n" + " ldr r1, ._10 + 96\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r0, ._10 + 100\n" + " bl SetVBlankCallback\n" + " bl setup_poochyena_battle\n" + " ldr r0, ._10 + 104\n" + " ldrh r1, [r0]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._8 @cond_branch\n" + " ldr r0, ._10 + 108\n" + " bl SetMainCallback2\n" + " b ._9\n" + "._11:\n" + " .align 2, 0\n" + "._10:\n" + " .word 0x5006000\n" + " .word 0x400004c\n" + " .word 0x5051\n" + " .word gUnknown_030042C4\n" + " .word gUnknown_03004240\n" + " .word gUnknown_03004DE0\n" + " .word gUnknown_081F9674\n" + " .word 0xff10\n" + " .word gWindowConfig_81E6C58\n" + " .word gUnknown_030042A4\n" + " .word gUnknown_030042A0\n" + " .word gUnknown_030042C0\n" + " .word gUnknown_030041B4\n" + " .word gUnknown_03004288\n" + " .word gUnknown_03004280\n" + " .word gUnknown_030041B0\n" + " .word gUnknown_030041B8\n" + " .word gUnknown_02023A14+0x50\n" + " .word gBattleTerrain\n" + " .word gUnknown_03004210\n" + " .word gUnknown_030041D0\n" + " .word gWindowConfig_81E71D0\n" + " .word gUnknown_03004250\n" + " .word gWindowConfig_81E71EC\n" + " .word gReservedSpritePaletteCount\n" + " .word sub_800FCFC+1\n" + " .word gBattleTypeFlags\n" + " .word sub_800F298+1\n" + "._8:\n" + " ldr r0, ._15\n" + " bl SetMainCallback2\n" + "._9:\n" + " ldr r0, ._15 + 4\n" + " ldrh r1, [r0]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._13 @cond_branch\n" + " ldr r0, ._15 + 8\n" + " ldrb r1, [r0]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._13 @cond_branch\n" + " ldr r0, ._15 + 12\n" + " ldr r1, ._15 + 16\n" + " ldrh r1, [r1]\n" + " bl CreateNPCTrainerParty\n" + " bl SetWildMonHeldItem\n" + "._13:\n" + " ldr r0, ._15 + 20\n" + " ldr r1, ._15 + 24\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " mov r2, #0x2\n" + " orr r1, r1, r2\n" + " strb r1, [r0]\n" + " ldr r4, ._15 + 28\n" + " mov r3, #0xfa\n" + " lsl r3, r3, #0x1\n" + " add r5, r4, r3\n" + "._14:\n" + " add r0, r4, #0\n" + " mov r1, #0x3\n" + " bl AdjustFriendship\n" + " add r4, r4, #0x64\n" + " cmp r4, r5\n" + " ble ._14 @cond_branch\n" + " mov r1, #0x0\n" + " ldr r0, ._15 + 32\n" + " strb r1, [r0]\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._16:\n" + " .align 2, 0\n" + "._15:\n" + " .word sub_800EC9C+1\n" + " .word gBattleTypeFlags\n" + " .word gUnknown_02023A14+0x50\n" + " .word gEnemyParty\n" + " .word gTrainerBattleOpponent\n" + " .word gMain\n" + " .word 0x43d\n" + " .word gPlayerParty\n" + " .word gBattleCommunication\n" + "\n" + ); +} +#else void InitBattle(void) { s32 i; @@ -271,6 +496,7 @@ void InitBattle(void) AdjustFriendship(&gPlayerParty[i], 3); gBattleCommunication[0] = 0; } +#endif void sub_800E9EC(void) { @@ -379,6 +605,476 @@ void shedinja_something(struct Pokemon *pkmn) } } +#if DEBUG +__attribute__((naked)) +void sub_800EC9C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " bl RunTasks\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " bl GetMultiplayerId\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, ._55\n" + " ldr r1, ._55 + 4\n" + " add r0, r0, r1\n" + " strb r4, [r0]\n" + " mov r0, #0x1\n" + " add r5, r4, #0\n" + " eor r5, r5, r0\n" + " ldr r0, ._55 + 8\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x9\n" + " bls ._53 @cond_branch\n" + " b ._140\n" + "._53:\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._55 + 12\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._56:\n" + " .align 2, 0\n" + "._55:\n" + " .word +0x2000000\n" + " .word 0x160cb\n" + " .word gBattleCommunication\n" + " .word ._57\n" + "._57:\n" + " .word ._58\n" + " .word ._59\n" + " .word ._60\n" + " .word ._61\n" + " .word ._62\n" + " .word ._63\n" + " .word ._64\n" + " .word ._65\n" + " .word ._66\n" + " .word ._67\n" + "._58:\n" + " ldr r2, ._76\n" + " ldrh r1, [r2]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._68 @cond_branch\n" + " ldr r0, ._76 + 4\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._69 @cond_branch\n" + " b ._140\n" + "._69:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._71 @cond_branch\n" + " b ._140\n" + "._71:\n" + " ldr r1, ._76 + 8\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " strb r0, [r1, #0x1]\n" + " bl sub_800E9EC\n" + " bl sub_800EAAC\n" + " ldr r0, ._76 + 12\n" + " ldrb r1, [r0]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._73 @cond_branch\n" + " mov r3, #0x0\n" + " ldr r1, ._76 + 16\n" + " ldr r0, ._76 + 20\n" + "._74:\n" + " strh r3, [r0, #0x18]\n" + " str r1, [r0, #0x14]\n" + " add r0, r0, #0x1c\n" + " add r3, r3, #0x1\n" + " cmp r3, #0x1\n" + " ble ._74 @cond_branch\n" + "._73:\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._76 + 8\n" + " mov r2, #0x20\n" + " bl SendBlock\n" + " ldr r1, ._76 + 24\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " b ._140\n" + "._77:\n" + " .align 2, 0\n" + "._76:\n" + " .word gBattleTypeFlags\n" + " .word gReceivedRemoteLinkPlayers\n" + " .word +0x2000000\n" + " .word gUnknown_02023A14+0x50\n" + " .word 0x2211\n" + " .word gLinkPlayers\n" + " .word gBattleCommunication\n" + "._68:\n" + " mov r0, #0x4\n" + " orr r0, r0, r1\n" + " strh r0, [r2]\n" + " ldr r1, ._79\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " bl sub_800EB08\n" + " b ._140\n" + "._80:\n" + " .align 2, 0\n" + "._79:\n" + " .word gBattleCommunication\n" + "._59:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0x3\n" + " and r1, r1, r0\n" + " cmp r1, #0x3\n" + " beq ._81 @cond_branch\n" + " b ._140\n" + "._81:\n" + " bl ResetBlockReceivedFlags\n" + " mov r3, #0x0\n" + " ldr r0, ._86\n" + " ldrh r1, [r0]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._83 @cond_branch\n" + " cmp r4, #0\n" + " bne ._84 @cond_branch\n" + " ldr r0, ._86 + 4\n" + " ldrh r1, [r0]\n" + " mov r2, #0xc\n" + " b ._85\n" + "._87:\n" + " .align 2, 0\n" + "._86:\n" + " .word gBlockRecvBuffer\n" + " .word gBattleTypeFlags\n" + "._84:\n" + " ldr r0, ._92\n" + " ldrh r1, [r0]\n" + " mov r2, #0x8\n" + "._85:\n" + " orr r1, r1, r2\n" + " strh r1, [r0]\n" + " add r3, r3, #0x1\n" + "._83:\n" + " lsl r7, r5, #0x8\n" + " cmp r3, #0\n" + " bne ._94 @cond_branch\n" + " ldr r0, ._92 + 4\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x1\n" + " add r2, r0, r1\n" + " ldrh r1, [r0]\n" + " add r6, r0, #0\n" + " ldrh r2, [r2]\n" + " cmp r1, r2\n" + " bne ._89 @cond_branch\n" + " cmp r4, #0\n" + " bne ._90 @cond_branch\n" + " ldr r0, ._92\n" + " ldrh r1, [r0]\n" + " mov r2, #0xc\n" + " b ._91\n" + "._93:\n" + " .align 2, 0\n" + "._92:\n" + " .word gBattleTypeFlags\n" + " .word gBlockRecvBuffer\n" + "._90:\n" + " ldr r0, ._96\n" + " ldrh r1, [r0]\n" + " mov r2, #0x8\n" + "._91:\n" + " orr r1, r1, r2\n" + " strh r1, [r0]\n" + " add r3, r3, #0x1\n" + "._89:\n" + " lsl r7, r5, #0x8\n" + " cmp r3, #0\n" + " bne ._94 @cond_branch\n" + " ldrh r1, [r6]\n" + " ldr r0, ._96 + 4\n" + " ldr r2, ._96\n" + " b ._95\n" + "._97:\n" + " .align 2, 0\n" + "._96:\n" + " .word gBattleTypeFlags\n" + " .word 0x101\n" + "._100:\n" + " add r3, r3, #0x1\n" + " cmp r3, #0x1\n" + " bgt ._98 @cond_branch\n" + " lsl r0, r3, #0x8\n" + " add r0, r0, r6\n" + " ldrh r1, [r0]\n" + " ldr r0, ._103\n" + "._95:\n" + " cmp r1, r0\n" + " bls ._100 @cond_branch\n" + " cmp r3, r4\n" + " beq ._100 @cond_branch\n" + "._98:\n" + " cmp r3, #0x2\n" + " bne ._101 @cond_branch\n" + " ldrh r0, [r2]\n" + " mov r1, #0xc\n" + " b ._102\n" + "._104:\n" + " .align 2, 0\n" + "._103:\n" + " .word 0x101\n" + "._101:\n" + " ldrh r0, [r2]\n" + " mov r1, #0x8\n" + "._102:\n" + " orr r0, r0, r1\n" + " strh r0, [r2]\n" + "._94:\n" + " bl sub_800EB08\n" + " ldr r0, ._106\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._106 + 4\n" + " lsl r2, r0, #0x2\n" + " add r2, r2, r0\n" + " lsl r2, r2, #0x3\n" + " add r2, r2, r1\n" + " mov r1, #0x0\n" + " mov r0, #0x87\n" + " lsl r0, r0, #0x1\n" + " strh r0, [r2, #0xa]\n" + " mov r0, #0x5a\n" + " strh r0, [r2, #0xc]\n" + " strh r1, [r2, #0x12]\n" + " ldr r0, ._106 + 8\n" + " ldrb r1, [r0, #0x2]\n" + " ldrb r0, [r0, #0x3]\n" + " lsl r0, r0, #0x8\n" + " orr r1, r1, r0\n" + " strh r1, [r2, #0xe]\n" + " ldr r0, ._106 + 12\n" + " add r0, r0, #0x2\n" + " add r0, r7, r0\n" + " ldrh r0, [r0]\n" + " strh r0, [r2, #0x10]\n" + " b ._129\n" + "._107:\n" + " .align 2, 0\n" + "._106:\n" + " .word sub_800DE30+1\n" + " .word gTasks\n" + " .word +0x2000000\n" + " .word gBlockRecvBuffer\n" + "._60:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._108 @cond_branch\n" + " b ._140\n" + "._108:\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._111\n" + " mov r2, #0xc8\n" + " bl SendBlock\n" + " b ._129\n" + "._112:\n" + " .align 2, 0\n" + "._111:\n" + " .word gPlayerParty\n" + "._61:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0x3\n" + " and r1, r1, r0\n" + " cmp r1, #0x3\n" + " beq ._113 @cond_branch\n" + " b ._140\n" + "._113:\n" + " bl ResetBlockReceivedFlags\n" + " ldr r0, ._116\n" + " lsl r1, r5, #0x8\n" + " ldr r2, ._116 + 4\n" + " add r1, r1, r2\n" + " mov r2, #0xc8\n" + " bl gScriptFuncs_End+0x5bc4\n" + " b ._129\n" + "._117:\n" + " .align 2, 0\n" + "._116:\n" + " .word gEnemyParty\n" + " .word gBlockRecvBuffer\n" + "._62:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._118 @cond_branch\n" + " b ._140\n" + "._118:\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._121\n" + " mov r2, #0xc8\n" + " bl SendBlock\n" + " b ._129\n" + "._122:\n" + " .align 2, 0\n" + "._121:\n" + " .word gPlayerParty+0xc8\n" + "._63:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0x3\n" + " and r1, r1, r0\n" + " cmp r1, #0x3\n" + " beq ._123 @cond_branch\n" + " b ._140\n" + "._123:\n" + " bl ResetBlockReceivedFlags\n" + " ldr r0, ._126\n" + " lsl r1, r5, #0x8\n" + " ldr r2, ._126 + 4\n" + " add r1, r1, r2\n" + " mov r2, #0xc8\n" + " bl gScriptFuncs_End+0x5bc4\n" + " b ._129\n" + "._127:\n" + " .align 2, 0\n" + "._126:\n" + " .word gEnemyParty+0xc8\n" + " .word gBlockRecvBuffer\n" + "._64:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._140 @cond_branch\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._130\n" + " mov r2, #0xc8\n" + " bl SendBlock\n" + " b ._129\n" + "._131:\n" + " .align 2, 0\n" + "._130:\n" + " .word gPlayerParty+0x190\n" + "._65:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0x3\n" + " and r1, r1, r0\n" + " cmp r1, #0x3\n" + " bne ._140 @cond_branch\n" + " bl ResetBlockReceivedFlags\n" + " ldr r4, ._134\n" + " lsl r1, r5, #0x8\n" + " ldr r0, ._134 + 4\n" + " add r1, r1, r0\n" + " add r0, r4, #0\n" + " mov r2, #0xc8\n" + " bl gScriptFuncs_End+0x5bc4\n" + " ldr r1, ._134 + 8\n" + " add r0, r4, r1\n" + " bl shedinja_something\n" + " ldr r1, ._134 + 12\n" + " add r0, r4, r1\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " sub r0, r0, #0xc8\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " sub r0, r0, #0x64\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " add r0, r0, #0x64\n" + " bl shedinja_something\n" + "._129:\n" + " ldr r1, ._134 + 16\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._140\n" + "._135:\n" + " .align 2, 0\n" + "._134:\n" + " .word gEnemyParty+0x190\n" + " .word gBlockRecvBuffer\n" + " .word 0xfffffe70\n" + " .word 0xfffffed4\n" + " .word gBattleCommunication\n" + "._66:\n" + " bl sub_800B950\n" + " ldr r0, ._137\n" + " ldrb r1, [r0]\n" + " add r1, r1, #0x1\n" + " mov r2, #0x0\n" + " strb r1, [r0]\n" + " strb r2, [r0, #0x1]\n" + " strb r2, [r0, #0x2]\n" + " b ._140\n" + "._138:\n" + " .align 2, 0\n" + "._137:\n" + " .word gBattleCommunication\n" + "._67:\n" + " ldr r0, ._141\n" + " add r1, r0, #1\n" + " bl battle_load_something\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._140 @cond_branch\n" + " ldr r2, ._141 + 4\n" + " ldr r1, ._141 + 8\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " ldr r0, ._141 + 12\n" + " str r0, [r1]\n" + " ldr r0, ._141 + 16\n" + " bl SetMainCallback2\n" + " ldr r3, ._141 + 20\n" + " ldrh r2, [r3]\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._140 @cond_branch\n" + " ldr r1, ._141 + 24\n" + " mov r4, #0x80\n" + " lsl r4, r4, #0x4\n" + " add r0, r4, #0\n" + " strh r0, [r1]\n" + " mov r0, #0x20\n" + " orr r0, r0, r2\n" + " strh r0, [r3]\n" + "._140:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._142:\n" + " .align 2, 0\n" + "._141:\n" + " .word gUnknown_02024D1F\n" + " .word gPreBattleCallback1\n" + " .word gMain\n" + " .word debug_sub_80139E4+1\n" + " .word sub_800F808+1\n" + " .word gBattleTypeFlags\n" + " .word gTrainerBattleOpponent\n" + "\n" + ); +} +#else void sub_800EC9C(void) { u8 playerId; @@ -535,6 +1231,7 @@ void sub_800EC9C(void) break; } } +#endif void sub_800F02C(void) { @@ -561,6 +1258,236 @@ void sub_800F02C(void) memcpy(gSharedMem, gUnknown_02023A00, 0x60); } +#ifdef DEBUG +__attribute__((naked)) +void sub_800F104() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " bl GetMultiplayerId\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " ldr r0, ._151\n" + " ldr r2, ._151 + 4\n" + " add r1, r0, r2\n" + " strb r6, [r1]\n" + " ldr r1, ._151 + 8\n" + " add r1, r1, r0\n" + " mov r9, r1\n" + " sub r2, r2, #0x9\n" + " add r2, r2, r0\n" + " mov r8, r2\n" + " bl RunTasks\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " ldr r2, ._151 + 12\n" + " ldrb r0, [r2]\n" + " cmp r0, #0x1\n" + " beq ._147 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._148 @cond_branch\n" + " cmp r0, #0\n" + " beq ._149 @cond_branch\n" + " b ._183\n" + "._152:\n" + " .align 2, 0\n" + "._151:\n" + " .word +0x2000000\n" + " .word 0x160cb\n" + " .word 0x160c4\n" + " .word gBattleCommunication\n" + "._148:\n" + " cmp r0, #0x2\n" + " bne ._153 @cond_branch\n" + " b ._154\n" + "._153:\n" + " cmp r0, #0x3\n" + " bne ._155 @cond_branch\n" + " b ._156\n" + "._155:\n" + " b ._183\n" + "._149:\n" + " ldr r0, ._165\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._158 @cond_branch\n" + " b ._183\n" + "._158:\n" + " ldr r0, ._165 + 4\n" + " ldrb r1, [r0]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._160 @cond_branch\n" + " mov r4, #0x0\n" + " ldr r1, ._165 + 8\n" + " ldr r0, ._165 + 12\n" + "._161:\n" + " strh r4, [r0, #0x18]\n" + " str r1, [r0, #0x14]\n" + " add r0, r0, #0x1c\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x3\n" + " ble ._161 @cond_branch\n" + "._160:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._162 @cond_branch\n" + " b ._183\n" + "._162:\n" + " bl sub_800F02C\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._165 + 16\n" + " mov r2, #0x60\n" + " bl SendBlock\n" + " ldr r1, ._165 + 20\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._183\n" + "._166:\n" + " .align 2, 0\n" + "._165:\n" + " .word gReceivedRemoteLinkPlayers\n" + " .word gUnknown_02023A14+0x50\n" + " .word 0x2211\n" + " .word gLinkPlayers\n" + " .word +0x2000000\n" + " .word gBattleCommunication\n" + "._147:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0xf\n" + " and r1, r1, r0\n" + " cmp r1, #0xf\n" + " bne ._183 @cond_branch\n" + " bl ResetBlockReceivedFlags\n" + " mov r4, #0x0\n" + " lsl r0, r6, #0x3\n" + " sub r0, r0, r6\n" + " lsl r5, r0, #0x2\n" + " mov r7, #0x0\n" + "._175:\n" + " cmp r4, r6\n" + " beq ._174 @cond_branch\n" + " ldr r2, ._172\n" + " add r0, r7, r2\n" + " ldrh r1, [r0, #0x18]\n" + " mov r3, #0x1\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._169 @cond_branch\n" + " add r0, r5, r2\n" + " ldrh r1, [r0, #0x18]\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._170 @cond_branch\n" + " b ._174\n" + "._173:\n" + " .align 2, 0\n" + "._172:\n" + " .word gLinkPlayers\n" + "._169:\n" + " add r0, r5, r2\n" + " ldrh r1, [r0, #0x18]\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._174 @cond_branch\n" + "._170:\n" + " lsl r1, r4, #0x8\n" + " ldr r0, ._177\n" + " add r1, r1, r0\n" + " ldr r0, ._177 + 4\n" + " mov r2, #0x60\n" + " bl gScriptFuncs_End+0x5bc4\n" + "._174:\n" + " add r7, r7, #0x1c\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x3\n" + " ble ._175 @cond_branch\n" + " ldr r1, ._177 + 8\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._177 + 12\n" + " ldr r0, [r1, #0x8]\n" + " mov r2, r9\n" + " str r0, [r2]\n" + " ldr r0, ._177 + 16\n" + " ldrh r0, [r0]\n" + " mov r2, r8\n" + " strh r0, [r2]\n" + " ldr r0, ._177 + 20\n" + " str r0, [r1, #0x8]\n" + " mov r0, #0x5\n" + " mov r1, #0x0\n" + " bl OpenPartyMenu\n" + " b ._183\n" + "._178:\n" + " .align 2, 0\n" + "._177:\n" + " .word gBlockRecvBuffer\n" + " .word gUnknown_02023A00\n" + " .word gBattleCommunication\n" + " .word gMain\n" + " .word gBattleTypeFlags\n" + " .word sub_800F104+1\n" + "._154:\n" + " ldr r0, ._181\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._183 @cond_branch\n" + " mov r0, #0x3\n" + " strb r0, [r2]\n" + " bl sub_800832C\n" + " b ._183\n" + "._182:\n" + " .align 2, 0\n" + "._181:\n" + " .word gPaletteFade\n" + "._156:\n" + " ldr r0, ._184\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._183 @cond_branch\n" + " ldr r1, ._184 + 4\n" + " mov r2, r8\n" + " ldrh r0, [r2]\n" + " strh r0, [r1]\n" + " ldr r1, ._184 + 8\n" + " mov r2, r9\n" + " ldr r0, [r2]\n" + " str r0, [r1, #0x8]\n" + " ldr r0, ._184 + 12\n" + " bl SetMainCallback2\n" + "._183:\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._185:\n" + " .align 2, 0\n" + "._184:\n" + " .word gReceivedRemoteLinkPlayers\n" + " .word gBattleTypeFlags\n" + " .word gMain\n" + " .word InitBattle+1\n" + "\n" + ); +} +#else void sub_800F104(void) { u8 playerId; @@ -625,7 +1552,774 @@ void sub_800F104(void) break; } } +#endif +#ifdef DEBUG +__attribute__((naked)) +void sub_800F298() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " bl GetMultiplayerId\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " ldr r0, ._188\n" + " ldr r1, ._188 + 4\n" + " add r0, r0, r1\n" + " strb r6, [r0]\n" + " bl RunTasks\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " ldr r0, ._188 + 8\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x7\n" + " bls ._186 @cond_branch\n" + " b ._352\n" + "._186:\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._188 + 12\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._189:\n" + " .align 2, 0\n" + "._188:\n" + " .word +0x2000000\n" + " .word 0x160cb\n" + " .word gBattleCommunication\n" + " .word ._190\n" + "._190:\n" + " .word ._191\n" + " .word ._192\n" + " .word ._193\n" + " .word ._194\n" + " .word ._195\n" + " .word ._196\n" + " .word ._197\n" + " .word ._198\n" + "._191:\n" + " ldr r0, ._206\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._199 @cond_branch\n" + " b ._352\n" + "._199:\n" + " ldr r0, ._206 + 4\n" + " ldrb r1, [r0]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._201 @cond_branch\n" + " mov r4, #0x0\n" + " ldr r1, ._206 + 8\n" + " ldr r0, ._206 + 12\n" + "._202:\n" + " strh r4, [r0, #0x18]\n" + " str r1, [r0, #0x14]\n" + " add r0, r0, #0x1c\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x3\n" + " ble ._202 @cond_branch\n" + "._201:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._203 @cond_branch\n" + " b ._352\n" + "._203:\n" + " ldr r4, ._206 + 16\n" + " mov r0, #0x1\n" + " strb r0, [r4]\n" + " strb r0, [r4, #0x1]\n" + " bl sub_800E9EC\n" + " bl sub_800EAAC\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r1, r4, #0\n" + " mov r2, #0x20\n" + " bl SendBlock\n" + " b ._300\n" + "._207:\n" + " .align 2, 0\n" + "._206:\n" + " .word gReceivedRemoteLinkPlayers\n" + " .word gUnknown_02023A14+0x50\n" + " .word 0x2211\n" + " .word gLinkPlayers\n" + " .word +0x2000000\n" + "._192:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0xf\n" + " and r1, r1, r0\n" + " cmp r1, #0xf\n" + " beq ._208 @cond_branch\n" + " b ._352\n" + "._208:\n" + " bl ResetBlockReceivedFlags\n" + " mov r4, #0x0\n" + " ldr r0, ._213\n" + " ldrh r1, [r0]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._210 @cond_branch\n" + " cmp r6, #0\n" + " bne ._211 @cond_branch\n" + " ldr r0, ._213 + 4\n" + " ldrh r1, [r0]\n" + " mov r2, #0xc\n" + " b ._212\n" + "._214:\n" + " .align 2, 0\n" + "._213:\n" + " .word gBlockRecvBuffer\n" + " .word gBattleTypeFlags\n" + "._211:\n" + " ldr r0, ._221\n" + " ldrh r1, [r0]\n" + " mov r2, #0x8\n" + "._212:\n" + " orr r1, r1, r2\n" + " strh r1, [r0]\n" + " add r4, r4, #0x1\n" + "._210:\n" + " cmp r4, #0\n" + " bne ._223 @cond_branch\n" + " mov r2, #0x0\n" + " ldr r1, ._221 + 4\n" + " add r5, r1, #0\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x1\n" + "._217:\n" + " add r1, r1, r3\n" + " add r2, r2, #0x1\n" + " cmp r2, #0x3\n" + " bgt ._216 @cond_branch\n" + " ldrh r0, [r5]\n" + " ldrh r7, [r1]\n" + " cmp r0, r7\n" + " beq ._217 @cond_branch\n" + "._216:\n" + " cmp r2, #0x4\n" + " bne ._218 @cond_branch\n" + " cmp r6, #0\n" + " bne ._219 @cond_branch\n" + " ldr r0, ._221\n" + " ldrh r1, [r0]\n" + " mov r2, #0xc\n" + " b ._220\n" + "._222:\n" + " .align 2, 0\n" + "._221:\n" + " .word gBattleTypeFlags\n" + " .word gBlockRecvBuffer\n" + "._219:\n" + " ldr r0, ._233\n" + " ldrh r1, [r0]\n" + " mov r2, #0x8\n" + "._220:\n" + " orr r1, r1, r2\n" + " strh r1, [r0]\n" + " add r4, r4, #0x1\n" + "._218:\n" + " cmp r4, #0\n" + " bne ._223 @cond_branch\n" + " ldr r0, ._233 + 4\n" + " ldrh r2, [r0]\n" + " ldr r1, ._233 + 8\n" + " add r3, r0, #0\n" + " ldr r5, ._233\n" + " cmp r2, r1\n" + " beq ._224 @cond_branch\n" + "._230:\n" + " lsl r0, r4, #0x8\n" + " add r0, r0, r3\n" + " ldrh r0, [r0]\n" + " ldr r1, ._233 + 8\n" + " cmp r0, r1\n" + " bls ._225 @cond_branch\n" + " cmp r4, r6\n" + " bne ._227 @cond_branch\n" + "._225:\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x3\n" + " bgt ._227 @cond_branch\n" + " lsl r0, r4, #0x8\n" + " add r0, r0, r3\n" + " ldrh r0, [r0]\n" + " cmp r0, r1\n" + " bne ._230 @cond_branch\n" + "._224:\n" + " cmp r4, r6\n" + " beq ._230 @cond_branch\n" + " cmp r4, r6\n" + " bge ._230 @cond_branch\n" + "._227:\n" + " cmp r4, #0x4\n" + " bne ._231 @cond_branch\n" + " ldrh r0, [r5]\n" + " mov r1, #0xc\n" + " b ._232\n" + "._234:\n" + " .align 2, 0\n" + "._233:\n" + " .word gBattleTypeFlags\n" + " .word gBlockRecvBuffer\n" + " .word 0x101\n" + "._231:\n" + " ldrh r0, [r5]\n" + " mov r1, #0x8\n" + "._232:\n" + " orr r0, r0, r1\n" + " strh r0, [r5]\n" + "._223:\n" + " bl sub_800EB08\n" + " ldr r0, ._239\n" + " ldr r1, ._239 + 4\n" + " mov r2, #0x96\n" + " lsl r2, r2, #0x1\n" + " bl gScriptFuncs_End+0x5bc4\n" + " ldr r0, ._239 + 8\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._239 + 12\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " mov r2, #0x0\n" + " mov r0, #0x87\n" + " lsl r0, r0, #0x1\n" + " strh r0, [r1, #0xa]\n" + " mov r0, #0x5a\n" + " strh r0, [r1, #0xc]\n" + " strh r2, [r1, #0x12]\n" + " strh r2, [r1, #0xe]\n" + " strh r2, [r1, #0x10]\n" + " add r2, r1, #0\n" + " ldr r0, ._239 + 16\n" + " add r3, r0, #2\n" + " ldr r6, ._239 + 20\n" + " mov r5, #0x3f\n" + " mov r7, #0x80\n" + " lsl r7, r7, #0x1\n" + " mov r4, #0x3\n" + "._247:\n" + " ldrh r0, [r6, #0x18]\n" + " cmp r0, #0x1\n" + " beq ._235 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._236 @cond_branch\n" + " cmp r0, #0\n" + " beq ._237 @cond_branch\n" + " b ._246\n" + "._240:\n" + " .align 2, 0\n" + "._239:\n" + " .word +0x201d000\n" + " .word gPlayerParty\n" + " .word sub_800DE30+1\n" + " .word gTasks\n" + " .word gBlockRecvBuffer\n" + " .word gLinkPlayers\n" + "._236:\n" + " cmp r0, #0x2\n" + " beq ._241 @cond_branch\n" + " cmp r0, #0x3\n" + " beq ._242 @cond_branch\n" + " b ._246\n" + "._237:\n" + " ldrh r0, [r3]\n" + " add r1, r5, #0\n" + " and r1, r1, r0\n" + " b ._244\n" + "._235:\n" + " ldrh r0, [r3]\n" + " add r1, r5, #0\n" + " and r1, r1, r0\n" + " b ._245\n" + "._241:\n" + " ldrh r0, [r3]\n" + " add r1, r5, #0\n" + " and r1, r1, r0\n" + " lsl r1, r1, #0x6\n" + "._244:\n" + " ldrh r0, [r2, #0xe]\n" + " orr r1, r1, r0\n" + " strh r1, [r2, #0xe]\n" + " b ._246\n" + "._242:\n" + " ldrh r0, [r3]\n" + " add r1, r5, #0\n" + " and r1, r1, r0\n" + " lsl r1, r1, #0x6\n" + "._245:\n" + " ldrh r0, [r2, #0x10]\n" + " orr r1, r1, r0\n" + " strh r1, [r2, #0x10]\n" + "._246:\n" + " add r3, r3, r7\n" + " add r6, r6, #0x1c\n" + " sub r4, r4, #0x1\n" + " cmp r4, #0\n" + " bge ._247 @cond_branch\n" + " bl ZeroPlayerPartyMons\n" + " bl ZeroEnemyPartyMons\n" + " ldr r1, ._251\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._193:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._248 @cond_branch\n" + " b ._352\n" + "._248:\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._251 + 4\n" + " mov r2, #0xc8\n" + " bl SendBlock\n" + " b ._300\n" + "._252:\n" + " .align 2, 0\n" + "._251:\n" + " .word gBattleCommunication\n" + " .word +0x201d000\n" + "._194:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0xf\n" + " and r1, r1, r0\n" + " cmp r1, #0xf\n" + " beq ._253 @cond_branch\n" + " b ._352\n" + "._253:\n" + " bl ResetBlockReceivedFlags\n" + " mov r4, #0x0\n" + " lsl r0, r6, #0x3\n" + " sub r0, r0, r6\n" + " lsl r0, r0, #0x2\n" + " mov r8, r0\n" + " ldr r5, ._260\n" + " mov r7, #0x0\n" + "._294:\n" + " cmp r4, r6\n" + " bne ._255 @cond_branch\n" + " ldr r0, ._260 + 4\n" + " add r0, r7, r0\n" + " ldrh r0, [r0, #0x18]\n" + " cmp r0, #0x2\n" + " bgt ._256 @cond_branch\n" + " cmp r0, #0x1\n" + " bge ._257 @cond_branch\n" + " cmp r0, #0\n" + " beq ._258 @cond_branch\n" + " b ._291\n" + "._261:\n" + " .align 2, 0\n" + "._260:\n" + " .word gBlockRecvBuffer\n" + " .word gLinkPlayers\n" + "._256:\n" + " cmp r0, #0x3\n" + " bne ._291 @cond_branch\n" + "._258:\n" + " ldr r0, ._264\n" + " b ._283\n" + "._265:\n" + " .align 2, 0\n" + "._264:\n" + " .word gPlayerParty\n" + "._257:\n" + " ldr r0, ._267\n" + " b ._283\n" + "._268:\n" + " .align 2, 0\n" + "._267:\n" + " .word gPlayerParty+0x12c\n" + "._255:\n" + " ldr r2, ._272\n" + " add r0, r7, r2\n" + " ldrh r1, [r0, #0x18]\n" + " mov r3, #0x1\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._269 @cond_branch\n" + " mov r1, r8\n" + " add r0, r1, r2\n" + " ldrh r1, [r0, #0x18]\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._270 @cond_branch\n" + " b ._274\n" + "._273:\n" + " .align 2, 0\n" + "._272:\n" + " .word gLinkPlayers\n" + "._269:\n" + " mov r1, r8\n" + " add r0, r1, r2\n" + " ldrh r1, [r0, #0x18]\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._274 @cond_branch\n" + "._270:\n" + " add r0, r7, r2\n" + " ldrh r2, [r0, #0x18]\n" + " cmp r2, #0x2\n" + " bgt ._275 @cond_branch\n" + " cmp r2, #0x1\n" + " bge ._276 @cond_branch\n" + " cmp r2, #0\n" + " beq ._277 @cond_branch\n" + " b ._291\n" + "._275:\n" + " cmp r2, #0x3\n" + " bne ._291 @cond_branch\n" + "._277:\n" + " ldr r0, ._281\n" + " b ._283\n" + "._282:\n" + " .align 2, 0\n" + "._281:\n" + " .word gPlayerParty\n" + "._276:\n" + " ldr r0, ._284\n" + " b ._283\n" + "._285:\n" + " .align 2, 0\n" + "._284:\n" + " .word gPlayerParty+0x12c\n" + "._274:\n" + " add r0, r7, r2\n" + " ldrh r2, [r0, #0x18]\n" + " cmp r2, #0x2\n" + " bgt ._286 @cond_branch\n" + " cmp r2, #0x1\n" + " bge ._287 @cond_branch\n" + " cmp r2, #0\n" + " beq ._288 @cond_branch\n" + " b ._291\n" + "._286:\n" + " cmp r2, #0x3\n" + " bne ._291 @cond_branch\n" + "._288:\n" + " ldr r0, ._292\n" + "._283:\n" + " add r1, r5, #0\n" + " mov r2, #0xc8\n" + " bl gScriptFuncs_End+0x5bc4\n" + " b ._291\n" + "._293:\n" + " .align 2, 0\n" + "._292:\n" + " .word gEnemyParty\n" + "._287:\n" + " ldr r0, ._296\n" + " add r1, r5, #0\n" + " mov r2, #0xc8\n" + " bl gScriptFuncs_End+0x5bc4\n" + "._291:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " add r5, r5, r0\n" + " add r7, r7, #0x1c\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x3\n" + " ble ._294 @cond_branch\n" + " b ._300\n" + "._297:\n" + " .align 2, 0\n" + "._296:\n" + " .word gEnemyParty+0x12c\n" + "._195:\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._298 @cond_branch\n" + " b ._352\n" + "._298:\n" + " bl bitmask_all_link_players_but_self\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._301\n" + " mov r2, #0x64\n" + " bl SendBlock\n" + " b ._300\n" + "._302:\n" + " .align 2, 0\n" + "._301:\n" + " .word +0x201d0c8\n" + "._196:\n" + " bl GetBlockReceivedStatus\n" + " mov r1, #0xf\n" + " and r1, r1, r0\n" + " cmp r1, #0xf\n" + " beq ._303 @cond_branch\n" + " b ._352\n" + "._303:\n" + " bl ResetBlockReceivedFlags\n" + " mov r4, #0x0\n" + " lsl r0, r6, #0x3\n" + " sub r0, r0, r6\n" + " lsl r0, r0, #0x2\n" + " mov r8, r0\n" + " ldr r5, ._310\n" + " mov r7, #0x0\n" + "._344:\n" + " cmp r4, r6\n" + " bne ._305 @cond_branch\n" + " ldr r0, ._310 + 4\n" + " add r0, r7, r0\n" + " ldrh r0, [r0, #0x18]\n" + " cmp r0, #0x2\n" + " bgt ._306 @cond_branch\n" + " cmp r0, #0x1\n" + " bge ._307 @cond_branch\n" + " cmp r0, #0\n" + " beq ._308 @cond_branch\n" + " b ._341\n" + "._311:\n" + " .align 2, 0\n" + "._310:\n" + " .word gBlockRecvBuffer\n" + " .word gLinkPlayers\n" + "._306:\n" + " cmp r0, #0x3\n" + " bne ._341 @cond_branch\n" + "._308:\n" + " ldr r0, ._314\n" + " b ._333\n" + "._315:\n" + " .align 2, 0\n" + "._314:\n" + " .word gPlayerParty+0xc8\n" + "._307:\n" + " ldr r0, ._317\n" + " b ._333\n" + "._318:\n" + " .align 2, 0\n" + "._317:\n" + " .word gPlayerParty+0x1f4\n" + "._305:\n" + " ldr r2, ._322\n" + " add r0, r7, r2\n" + " ldrh r1, [r0, #0x18]\n" + " mov r3, #0x1\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._319 @cond_branch\n" + " mov r1, r8\n" + " add r0, r1, r2\n" + " ldrh r1, [r0, #0x18]\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._320 @cond_branch\n" + " b ._324\n" + "._323:\n" + " .align 2, 0\n" + "._322:\n" + " .word gLinkPlayers\n" + "._319:\n" + " mov r1, r8\n" + " add r0, r1, r2\n" + " ldrh r1, [r0, #0x18]\n" + " add r0, r3, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._324 @cond_branch\n" + "._320:\n" + " add r0, r7, r2\n" + " ldrh r2, [r0, #0x18]\n" + " cmp r2, #0x2\n" + " bgt ._325 @cond_branch\n" + " cmp r2, #0x1\n" + " bge ._326 @cond_branch\n" + " cmp r2, #0\n" + " beq ._327 @cond_branch\n" + " b ._341\n" + "._325:\n" + " cmp r2, #0x3\n" + " bne ._341 @cond_branch\n" + "._327:\n" + " ldr r0, ._331\n" + " b ._333\n" + "._332:\n" + " .align 2, 0\n" + "._331:\n" + " .word gPlayerParty+0xc8\n" + "._326:\n" + " ldr r0, ._334\n" + " b ._333\n" + "._335:\n" + " .align 2, 0\n" + "._334:\n" + " .word gPlayerParty+0x1f4\n" + "._324:\n" + " add r0, r7, r2\n" + " ldrh r2, [r0, #0x18]\n" + " cmp r2, #0x2\n" + " bgt ._336 @cond_branch\n" + " cmp r2, #0x1\n" + " bge ._337 @cond_branch\n" + " cmp r2, #0\n" + " beq ._338 @cond_branch\n" + " b ._341\n" + "._336:\n" + " cmp r2, #0x3\n" + " bne ._341 @cond_branch\n" + "._338:\n" + " ldr r0, ._342\n" + "._333:\n" + " add r1, r5, #0\n" + " mov r2, #0x64\n" + " bl gScriptFuncs_End+0x5bc4\n" + " b ._341\n" + "._343:\n" + " .align 2, 0\n" + "._342:\n" + " .word gEnemyParty+0xc8\n" + "._337:\n" + " ldr r0, ._346\n" + " add r1, r5, #0\n" + " mov r2, #0x64\n" + " bl gScriptFuncs_End+0x5bc4\n" + "._341:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " add r5, r5, r0\n" + " add r7, r7, #0x1c\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x3\n" + " ble ._344 @cond_branch\n" + " ldr r4, ._346 + 4\n" + " add r0, r4, #0\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " add r0, r0, #0x64\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " add r0, r0, #0xc8\n" + " bl shedinja_something\n" + " mov r1, #0x96\n" + " lsl r1, r1, #0x1\n" + " add r0, r4, r1\n" + " bl shedinja_something\n" + " mov r7, #0xc8\n" + " lsl r7, r7, #0x1\n" + " add r0, r4, r7\n" + " bl shedinja_something\n" + " mov r1, #0xfa\n" + " lsl r1, r1, #0x1\n" + " add r0, r4, r1\n" + " bl shedinja_something\n" + " ldr r4, ._346 + 8\n" + " add r0, r4, #0\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " add r0, r0, #0x64\n" + " bl shedinja_something\n" + " add r0, r4, #0\n" + " add r0, r0, #0xc8\n" + " bl shedinja_something\n" + " sub r7, r7, #0x64\n" + " add r0, r4, r7\n" + " bl shedinja_something\n" + " mov r1, #0xc8\n" + " lsl r1, r1, #0x1\n" + " add r0, r4, r1\n" + " bl shedinja_something\n" + " add r7, r7, #0xc8\n" + " add r0, r4, r7\n" + " bl shedinja_something\n" + "._300:\n" + " ldr r1, ._346 + 12\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._352\n" + "._347:\n" + " .align 2, 0\n" + "._346:\n" + " .word gEnemyParty+0x1f4\n" + " .word gPlayerParty\n" + " .word gEnemyParty\n" + " .word gBattleCommunication\n" + "._197:\n" + " bl sub_800B950\n" + " ldr r0, ._349\n" + " ldrb r1, [r0]\n" + " add r1, r1, #0x1\n" + " mov r2, #0x0\n" + " strb r1, [r0]\n" + " strb r2, [r0, #0x1]\n" + " strb r2, [r0, #0x2]\n" + " b ._352\n" + "._350:\n" + " .align 2, 0\n" + "._349:\n" + " .word gBattleCommunication\n" + "._198:\n" + " ldr r0, ._353\n" + " add r1, r0, #1\n" + " bl battle_load_something\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._352 @cond_branch\n" + " ldr r2, ._353 + 4\n" + " ldr r1, ._353 + 8\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " ldr r0, ._353 + 12\n" + " str r0, [r1]\n" + " ldr r0, ._353 + 16\n" + " bl SetMainCallback2\n" + " ldr r3, ._353 + 20\n" + " ldrh r2, [r3]\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._352 @cond_branch\n" + " ldr r1, ._353 + 24\n" + " mov r4, #0x80\n" + " lsl r4, r4, #0x4\n" + " add r0, r4, #0\n" + " strh r0, [r1]\n" + " mov r0, #0x20\n" + " orr r0, r0, r2\n" + " strh r0, [r3]\n" + "._352:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._354:\n" + " .align 2, 0\n" + "._353:\n" + " .word gUnknown_02024D1F\n" + " .word gPreBattleCallback1\n" + " .word gMain\n" + " .word debug_sub_80139E4+1\n" + " .word sub_800F808+1\n" + " .word gBattleTypeFlags\n" + " .word gTrainerBattleOpponent\n" + "\n" + ); +} +#else void sub_800F298(void) { u8 playerId; @@ -893,7 +2587,119 @@ void sub_800F298(void) break; } } +#endif +#if DEBUG +__attribute__((naked)) +void BattleMainCB2(void) +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " ldr r4, ._358\n" + " ldrh r2, [r4, #0x2c]\n" + " mov r1, #0x82\n" + " lsl r1, r1, #0x1\n" + " add r0, r1, #0\n" + " and r0, r0, r2\n" + " cmp r0, r1\n" + " bne ._357 @cond_branch\n" + " ldr r2, ._358 + 4\n" + " ldr r1, ._358 + 8\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x1\n" + " strh r0, [r2]\n" + " ldr r0, ._358 + 12\n" + " add r2, r4, r0\n" + " ldrb r1, [r2]\n" + " mov r0, #0x3\n" + " neg r0, r0\n" + " and r0, r0, r1\n" + " strb r0, [r2]\n" + " ldr r1, ._358 + 16\n" + " mov r0, #0x3\n" + " strb r0, [r1, #0x15]\n" + " ldr r0, ._358 + 20\n" + " ldr r0, [r0]\n" + " str r0, [r4]\n" + " bl ZeroEnemyPartyMons\n" + " mov r0, #0x5a\n" + " bl gScriptFuncs_End+0x148c\n" + " ldr r0, ._358 + 24\n" + " ldrh r1, [r0]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._356 @cond_branch\n" + " ldr r0, ._358 + 28\n" + " bl SetMainCallback2\n" + " b ._357\n" + "._359:\n" + " .align 2, 0\n" + "._358:\n" + " .word gMain\n" + " .word gScriptResult\n" + " .word gBattleOutcome\n" + " .word 0x43d\n" + " .word gUnknown_03004DC0\n" + " .word gPreBattleCallback1\n" + " .word gBattleTypeFlags\n" + " .word sub_805465C+1\n" + "._356:\n" + " ldr r0, [r4, #0x8]\n" + " bl SetMainCallback2\n" + "._357:\n" + " ldr r5, ._361\n" + " ldrh r1, [r5]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._360 @cond_branch\n" + " lsr r0, r1, #0x2\n" + " mov r4, #0x1\n" + " and r0, r0, r4\n" + " str r4, [sp]\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl debug_sub_8008264\n" + " ldrh r0, [r5]\n" + " lsr r0, r0, #0x2\n" + " and r0, r0, r4\n" + " str r4, [sp]\n" + " mov r1, #0x1\n" + " mov r2, #0x15\n" + " mov r3, #0x1\n" + " bl debug_sub_8008264\n" + " ldrh r0, [r5]\n" + " lsr r0, r0, #0x2\n" + " and r0, r0, r4\n" + " str r4, [sp]\n" + " mov r1, #0x1\n" + " mov r2, #0x29\n" + " mov r3, #0x1\n" + " bl debug_sub_8008264\n" + "._360:\n" + " ldr r0, ._361 + 4\n" + " bl sub_800374C\n" + " bl UpdatePaletteFade\n" + " bl RunTasks\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._362:\n" + " .align 2, 0\n" + "._361:\n" + " .word gBattleTypeFlags\n" + " .word gUnknown_03004210\n" + "\n" + ); +} +#else void BattleMainCB2(void) { AnimateSprites(); @@ -902,6 +2708,7 @@ void BattleMainCB2(void) UpdatePaletteFade(); RunTasks(); } +#endif void sub_800F828(struct Sprite *sprite) { @@ -1275,6 +3082,5525 @@ void c2_081284E0(void) } } +// A LOT of debug code! +#if DEBUG +__attribute__((naked)) +void debug_sub_8010800() +{ + asm( + " push {lr}\n" + " bl debug_sub_8010818\n" + " bl debug_sub_80108B8\n" + " ldr r1, ._496\n" + " mov r0, #0x0\n" + " str r0, [r1]\n" + " pop {r0}\n" + " bx r0\n" + "._497:\n" + " .align 2, 0\n" + "._496:\n" + " .word gBattleBuffersTransferData+0x100\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8010818() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " ldr r1, ._501\n" + " ldr r0, ._501 + 4\n" + " strh r0, [r1]\n" + " add r2, r1, #0\n" + " add r2, r2, #0x46\n" + " strh r0, [r2]\n" + " ldr r0, ._501 + 8\n" + " add r4, r1, #0\n" + " add r4, r4, #0x48\n" + " add r3, r0, #0\n" + " add r3, r3, #0x12\n" + " add r2, r1, #2\n" + " mov r1, #0x1d\n" + "._498:\n" + " ldrh r0, [r3]\n" + " strh r0, [r2]\n" + " strh r0, [r4]\n" + " add r4, r4, #0x2\n" + " add r3, r3, #0xa\n" + " add r2, r2, #0x2\n" + " sub r1, r1, #0x1\n" + " cmp r1, #0\n" + " bge ._498 @cond_branch\n" + " mov r1, #0x0\n" + " ldr r4, ._501 + 12\n" + " ldr r7, ._501 + 16\n" + " ldr r6, ._501 + 20\n" + " mov r0, #0x30\n" + " add r0, r0, r7\n" + " mov ip, r0\n" + "._500:\n" + " mov r0, #0x0\n" + " strb r0, [r4]\n" + " add r5, r1, #1\n" + " lsl r3, r1, #0x3\n" + "._499:\n" + " ldrb r2, [r4]\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r3\n" + " add r1, r1, r7\n" + " lsl r0, r2, #0x2\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r6\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " ldrb r2, [r4]\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r3\n" + " add r1, r1, ip\n" + " lsl r0, r2, #0x2\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r6\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " strb r0, [r4]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x3\n" + " bls ._499 @cond_branch\n" + " add r1, r5, #0\n" + " cmp r1, #0x5\n" + " ble ._500 @cond_branch\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._502:\n" + " .align 2, 0\n" + "._501:\n" + " .word gUnknown_02023A14+0x52\n" + " .word 0x115\n" + " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_030043A8\n" + " .word gUnknown_02023A14+0xde\n" + " .word UnkDebug0+0x1b4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80108B8() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " bl gScriptFuncs_End+0x19f4\n" + " mov r0, #0x0\n" + " bl SetHBlankCallback\n" + " mov r0, #0x0\n" + " bl SetVBlankCallback\n" + " mov r3, #0x0\n" + " str r3, [sp]\n" + " ldr r2, ._507\n" + " mov r0, sp\n" + " str r0, [r2]\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x13\n" + " str r1, [r2, #0x4]\n" + " ldr r0, ._507 + 4\n" + " str r0, [r2, #0x8]\n" + " ldr r0, [r2, #0x8]\n" + " ldr r2, ._507 + 8\n" + " mov r0, #0x1\n" + " strh r0, [r2]\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x13\n" + " mov r4, #0x9a\n" + " lsl r4, r4, #0x5\n" + " add r0, r4, #0\n" + " strh r0, [r2]\n" + " ldr r0, ._507 + 12\n" + " mov r5, #0x0\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 16\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 20\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 24\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 28\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 32\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 36\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 40\n" + " strh r3, [r0]\n" + " add r2, r2, #0x8\n" + " ldr r4, ._507 + 44\n" + " add r0, r4, #0\n" + " strh r0, [r2]\n" + " add r2, r2, #0x2\n" + " ldr r4, ._507 + 48\n" + " add r0, r4, #0\n" + " strh r0, [r2]\n" + " ldr r0, ._507 + 52\n" + " strh r3, [r0]\n" + " add r0, r0, #0x4\n" + " strh r3, [r0]\n" + " ldr r0, ._507 + 56\n" + " bl LZDecompressVram\n" + " ldr r0, ._507 + 60\n" + " ldr r1, ._507 + 64\n" + " bl sub_800D238\n" + " ldr r4, ._507 + 68\n" + " mov r1, #0xa0\n" + " lsl r1, r1, #0x13\n" + " add r0, r4, #0\n" + " bl LZDecompressVram\n" + " ldr r1, ._507 + 72\n" + " add r0, r4, #0\n" + " bl LZDecompressVram\n" + " bl gScriptFuncs_End+0x1a70\n" + " ldr r0, ._507 + 76\n" + " bl SetVBlankCallback\n" + " ldr r0, ._507 + 80\n" + " bl SetMainCallback2\n" + " bl ResetTasks\n" + " bl ResetSpriteData\n" + " bl remove_some_task\n" + " ldr r4, ._507 + 84\n" + " add r0, r4, #0\n" + " bl SetUpWindowConfig\n" + " ldr r0, ._507 + 88\n" + " add r1, r4, #0\n" + " bl InitWindowFromConfig\n" + " ldr r0, ._507 + 92\n" + " strb r5, [r0]\n" + " ldr r0, ._507 + 96\n" + " strb r5, [r0]\n" + " ldr r0, ._507 + 100\n" + " strb r5, [r0]\n" + " mov r4, #0x0\n" + "._503:\n" + " lsl r0, r4, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x1e\n" + " ble ._503 @cond_branch\n" + " ldr r1, ._507 + 104\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " add r4, r1, #0\n" + "._504:\n" + " bl debug_sub_8012294\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " strb r0, [r4]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x3\n" + " bls ._504 @cond_branch\n" + " ldr r0, ._507 + 100\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + " bl debug_sub_8012540\n" + " bl debug_nullsub_3\n" + " ldr r1, ._507 + 104\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " bl debug_sub_80125A0\n" + " ldr r0, ._507 + 108\n" + " add r0, r0, #0x44\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x8\n" + " bne ._505 @cond_branch\n" + " bl debug_sub_801174C\n" + " b ._506\n" + "._508:\n" + " .align 2, 0\n" + "._507:\n" + " .word 0x40000d4\n" + " .word 0x85006000\n" + " .word 0x4000200\n" + " .word gUnknown_030042A4\n" + " .word gUnknown_030042A0\n" + " .word gUnknown_030042C0\n" + " .word gUnknown_030041B4\n" + " .word gUnknown_03004288\n" + " .word gUnknown_03004280\n" + " .word gUnknown_030041B0\n" + " .word gUnknown_030041B8\n" + " .word 0x1f09\n" + " .word 0x4801\n" + " .word 0x4000050\n" + " .word gMonShinyPalette_CircledQuestionMark+0x18\n" + " .word gMonShinyPalette_CircledQuestionMark+0x834\n" + " .word +0x2000000\n" + " .word gMonShinyPalette_CircledQuestionMark+0xa8c\n" + " .word 0x50001e0\n" + " .word debug_sub_8011D40+1\n" + " .word debug_sub_8010CAC+1\n" + " .word gWindowConfig_81E6C3C\n" + " .word gUnknown_Debug_03004370\n" + " .word gUnknown_Debug_03004360\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_030043A8\n" + " .word gUnknown_02023A14+0x52\n" + "._505:\n" + " ldr r0, ._510\n" + " mov r1, #0x0\n" + " mov r4, #0x7\n" + " ldr r2, ._510 + 4\n" + " add r0, r0, r2\n" + "._509:\n" + " strb r1, [r0]\n" + " sub r0, r0, #0x1\n" + " sub r4, r4, #0x1\n" + " cmp r4, #0\n" + " bge ._509 @cond_branch\n" + "._506:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._511:\n" + " .align 2, 0\n" + "._510:\n" + " .word +0x2000000\n" + " .word 0x160bb\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8010A7C() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r2, r1, #0x18\n" + " mov r1, #0x0\n" + " ldr r5, ._514\n" + " cmp r1, r2\n" + " bge ._512 @cond_branch\n" + " add r3, r5, #0\n" + "._513:\n" + " add r0, r1, r3\n" + " strb r4, [r0]\n" + " add r1, r1, #0x1\n" + " cmp r1, r2\n" + " blt ._513 @cond_branch\n" + "._512:\n" + " add r1, r1, r5\n" + " mov r0, #0xff\n" + " strb r0, [r1]\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._515:\n" + " .align 2, 0\n" + "._514:\n" + " .word gBattleTextBuff1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8010AAC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov ip, r0\n" + " ldr r6, ._520\n" + " ldr r4, ._520 + 4\n" + " ldr r5, ._520 + 8\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x2\n" + " add r7, r0, r1\n" + " lsl r1, r7, #0x1\n" + " ldr r3, ._520 + 12\n" + " ldrb r2, [r3]\n" + " mov r0, #0x46\n" + " mul r2, r2, r0\n" + " add r1, r1, r2\n" + " add r1, r1, r4\n" + " mov r0, #0x0\n" + " ldsh r1, [r1, r0]\n" + " lsl r0, r1, #0x3\n" + " sub r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldrb r0, [r0, #0x10]\n" + " add r6, r3, #0\n" + " cmp r0, #0xfe\n" + " beq ._516 @cond_branch\n" + " cmp r0, #0xfe\n" + " bgt ._517 @cond_branch\n" + " cmp r0, #0\n" + " beq ._518 @cond_branch\n" + " b ._523\n" + "._521:\n" + " .align 2, 0\n" + "._520:\n" + " .word gBaseStats\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_03004360\n" + "._517:\n" + " cmp r0, #0xff\n" + " beq ._522 @cond_branch\n" + " b ._523\n" + "._518:\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r2\n" + " add r0, r0, r4\n" + " mov r1, #0x2\n" + " b ._528\n" + "._516:\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r2\n" + " add r0, r0, r4\n" + " mov r1, #0x3\n" + " b ._528\n" + "._522:\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r2\n" + " add r0, r0, r4\n" + " mov r1, #0x4\n" + " b ._528\n" + "._523:\n" + " ldrb r0, [r5]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " add r1, r1, #0x4\n" + " lsl r1, r1, #0x1\n" + " ldrb r0, [r6]\n" + " mov r3, #0x46\n" + " mul r0, r0, r3\n" + " add r1, r1, r0\n" + " add r1, r1, r4\n" + " ldrh r2, [r1]\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " strh r0, [r1]\n" + " mov r1, ip\n" + " cmp r1, #0\n" + " beq ._527 @cond_branch\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r0, #0x4\n" + " lsl r0, r0, #0x1\n" + " ldrb r1, [r6]\n" + " mul r1, r1, r3\n" + " add r0, r0, r1\n" + " add r0, r0, r4\n" + " ldrh r1, [r0]\n" + " mov r2, #0x1\n" + " eor r1, r1, r2\n" + " b ._528\n" + "._527:\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r0, #0x4\n" + " lsl r0, r0, #0x1\n" + " ldrb r1, [r6]\n" + " mul r1, r1, r3\n" + " add r0, r0, r1\n" + " add r0, r0, r4\n" + " mov r1, ip\n" + "._528:\n" + " strh r1, [r0]\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8010B80() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " mov r0, #0x0\n" + " mov ip, r0\n" + " ldr r4, ._534\n" + " ldr r1, ._534 + 4\n" + " mov r8, r1\n" + " ldr r5, ._534 + 8\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " mov r2, r8\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x1\n" + " ldr r3, ._534 + 12\n" + " ldrb r2, [r3]\n" + " mov r1, #0x46\n" + " mul r1, r1, r2\n" + " add r0, r0, r1\n" + " add r0, r0, r4\n" + " ldrb r7, [r0]\n" + " lsl r1, r7, #0x18\n" + " asr r0, r1, #0x18\n" + " mov r9, r4\n" + " add r2, r5, #0\n" + " add r4, r3, #0\n" + " cmp r0, #0x9\n" + " ble ._529 @cond_branch\n" + "._530:\n" + " mov r3, #0xf6\n" + " lsl r3, r3, #0x18\n" + " add r0, r1, r3\n" + " lsr r7, r0, #0x18\n" + " mov r1, ip\n" + " lsl r0, r1, #0x18\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x11\n" + " add r0, r0, r3\n" + " lsr r0, r0, #0x18\n" + " mov ip, r0\n" + " lsl r1, r7, #0x18\n" + " asr r0, r1, #0x18\n" + " cmp r0, #0x9\n" + " bgt ._530 @cond_branch\n" + "._529:\n" + " mov r0, #0x2\n" + " and r0, r0, r6\n" + " cmp r0, #0\n" + " beq ._531 @cond_branch\n" + " mov r0, #0x1\n" + " and r0, r0, r6\n" + " cmp r0, #0\n" + " beq ._532 @cond_branch\n" + " mov r1, ip\n" + " lsl r0, r1, #0x18\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x11\n" + " b ._533\n" + "._535:\n" + " .align 2, 0\n" + "._534:\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_03004360\n" + "._532:\n" + " mov r1, ip\n" + " lsl r0, r1, #0x18\n" + " mov r3, #0xff\n" + " lsl r3, r3, #0x18\n" + "._533:\n" + " add r0, r0, r3\n" + " lsr r0, r0, #0x18\n" + " mov ip, r0\n" + " mov r1, ip\n" + " lsl r0, r1, #0x18\n" + " cmp r0, #0\n" + " bge ._536 @cond_branch\n" + " mov r3, #0x9\n" + " mov ip, r3\n" + "._536:\n" + " mov r1, ip\n" + " lsl r0, r1, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, #0x9\n" + " ble ._542 @cond_branch\n" + " mov r3, #0x0\n" + " mov ip, r3\n" + " b ._542\n" + "._531:\n" + " mov r0, #0x1\n" + " and r0, r0, r6\n" + " cmp r0, #0\n" + " beq ._539 @cond_branch\n" + " lsl r0, r7, #0x18\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x11\n" + " add r0, r0, r1\n" + " b ._540\n" + "._539:\n" + " lsl r0, r7, #0x18\n" + " mov r3, #0xff\n" + " lsl r3, r3, #0x18\n" + " add r0, r0, r3\n" + "._540:\n" + " lsr r7, r0, #0x18\n" + " lsl r0, r7, #0x18\n" + " cmp r0, #0\n" + " bgt ._541 @cond_branch\n" + " mov r7, #0x9\n" + "._541:\n" + " lsl r0, r7, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, #0x9\n" + " ble ._542 @cond_branch\n" + " mov r7, #0x1\n" + "._542:\n" + " ldrb r0, [r2]\n" + " lsl r2, r0, #0x2\n" + " add r2, r2, r0\n" + " mov r0, r8\n" + " ldrb r0, [r0]\n" + " add r2, r2, r0\n" + " lsl r2, r2, #0x1\n" + " ldrb r1, [r4]\n" + " mov r0, #0x1\n" + " eor r0, r0, r1\n" + " mov r1, #0x46\n" + " add r3, r0, #0\n" + " mul r3, r3, r1\n" + " add r3, r2, r3\n" + " add r3, r3, r9\n" + " ldrb r0, [r4]\n" + " mul r0, r0, r1\n" + " add r2, r2, r0\n" + " add r2, r2, r9\n" + " mov r1, ip\n" + " lsl r0, r1, #0x18\n" + " asr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x1\n" + " lsl r0, r7, #0x18\n" + " asr r0, r0, #0x18\n" + " add r0, r0, r1\n" + " strh r0, [r2]\n" + " strh r0, [r3]\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8010CAC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffff0\n" + " ldr r4, ._553\n" + " ldrh r1, [r4, #0x28]\n" + " mov r0, #0x81\n" + " lsl r0, r0, #0x2\n" + " cmp r1, r0\n" + " bne ._543 @cond_branch\n" + " bl DoSoftReset\n" + "._543:\n" + " ldrh r0, [r4, #0x2a]\n" + " cmp r0, #0x4\n" + " beq ._544 @cond_branch\n" + " b ._559\n" + "._544:\n" + " ldr r0, ._553 + 4\n" + " ldrb r1, [r0]\n" + " mov r8, r0\n" + " cmp r1, #0x5\n" + " bhi ._546 @cond_branch\n" + " ldr r0, ._553 + 8\n" + " mov r1, #0x0\n" + " strb r1, [r0]\n" + " bl debug_sub_8012628\n" + " ldr r0, ._553 + 12\n" + " bl SetMainCallback2\n" + "._546:\n" + " ldr r0, ._553 + 16\n" + " ldrb r3, [r0]\n" + " cmp r3, #0\n" + " bne ._555 @cond_branch\n" + " mov r1, r8\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x6\n" + " bne ._555 @cond_branch\n" + " ldr r0, ._553 + 20\n" + " str r0, [r4, #0x8]\n" + " ldr r4, ._553 + 24\n" + " ldr r0, ._553 + 28\n" + " ldrh r1, [r0]\n" + " ldrb r2, [r0, #0x2]\n" + " str r3, [sp]\n" + " str r3, [sp, #0x4]\n" + " str r3, [sp, #0x8]\n" + " str r3, [sp, #0xc]\n" + " add r0, r4, #0\n" + " mov r3, #0x20\n" + " bl CreateMon\n" + " mov r5, #0x0\n" + " add r6, r4, #0\n" + "._549:\n" + " add r1, r5, #0\n" + " add r1, r1, #0xd\n" + " lsl r4, r5, #0x1\n" + " ldr r0, ._553 + 32\n" + " add r4, r4, r0\n" + " add r0, r6, #0\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " add r1, r5, #0\n" + " add r1, r1, #0x11\n" + " mov r2, #0x0\n" + " ldsh r0, [r4, r2]\n" + " lsl r2, r0, #0x1\n" + " add r2, r2, r0\n" + " lsl r2, r2, #0x2\n" + " ldr r0, ._553 + 36\n" + " add r2, r2, r0\n" + " add r0, r6, #0\n" + " bl SetMonData\n" + " add r5, r5, #0x1\n" + " cmp r5, #0x3\n" + " ble ._549 @cond_branch\n" + " ldr r2, ._553 + 28\n" + " mov r4, #0x3c\n" + " ldsh r0, [r2, r4]\n" + " cmp r0, #0x1\n" + " beq ._550 @cond_branch\n" + " cmp r0, #0x2\n" + " beq ._551 @cond_branch\n" + " b ._555\n" + "._554:\n" + " .align 2, 0\n" + "._553:\n" + " .word gMain\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_030043A8\n" + " .word debug_sub_8011498+1\n" + " .word gUnknown_Debug_030043A0\n" + " .word debug_sub_80108B8+1\n" + " .word gPlayerParty\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_02023A14+0xde\n" + " .word gBattleMoves+0x4\n" + "._550:\n" + " ldr r1, ._556\n" + " ldr r0, ._556 + 4\n" + " str r0, [r1]\n" + " ldr r0, ._556 + 8\n" + " ldrh r1, [r2, #0xa]\n" + " mov r2, #0x1\n" + " mov r3, #0x0\n" + " bl EvolutionScene\n" + " b ._555\n" + "._557:\n" + " .align 2, 0\n" + "._556:\n" + " .word gUnknown_03005E94\n" + " .word debug_sub_80108B8+1\n" + " .word gPlayerParty\n" + "._551:\n" + " bl debug_sub_8012688\n" + "._555:\n" + " ldr r0, ._565\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x1\n" + " bne ._559 @cond_branch\n" + " ldr r0, ._565 + 4\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x6\n" + " bne ._559 @cond_branch\n" + " ldr r3, ._565 + 8\n" + " ldrb r2, [r3, #0x15]\n" + " lsl r0, r2, #0x1d\n" + " lsr r5, r0, #0x1f\n" + " lsl r0, r2, #0x1f\n" + " lsr r0, r0, #0x1f\n" + " lsl r0, r0, #0x1\n" + " orr r5, r5, r0\n" + " add r5, r5, #0x1\n" + " cmp r5, #0x4\n" + " bne ._560 @cond_branch\n" + " mov r5, #0x0\n" + "._560:\n" + " mov r0, #0x1\n" + " add r1, r5, #0\n" + " and r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " mov r0, #0x5\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " mov r1, #0x2\n" + " and r5, r5, r1\n" + " lsr r2, r5, #0x1\n" + " sub r1, r1, #0x4\n" + " and r0, r0, r1\n" + " orr r0, r0, r2\n" + " strb r0, [r3, #0x15]\n" + " lsl r0, r0, #0x1f\n" + " lsr r0, r0, #0x1f\n" + " bl gScriptFuncs_End+0x2aa0\n" + " bl debug_nullsub_3\n" + "._559:\n" + " ldr r4, ._565 + 12\n" + " ldrh r0, [r4, #0x2a]\n" + " cmp r0, #0x8\n" + " bne ._561 @cond_branch\n" + " bl debug_sub_801174C\n" + "._561:\n" + " ldrh r0, [r4, #0x2a]\n" + " cmp r0, #0x40\n" + " bne ._562 @cond_branch\n" + " bl debug_sub_80125E4\n" + " ldr r1, ._565 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._563 @cond_branch\n" + " sub r0, r0, #0x1\n" + " b ._564\n" + "._566:\n" + " .align 2, 0\n" + "._565:\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gSaveBlock2\n" + " .word gMain\n" + "._563:\n" + " mov r0, #0x6\n" + "._564:\n" + " strb r0, [r1]\n" + " bl debug_sub_8011E74\n" + " ldr r0, ._570\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + " bl debug_sub_80125A0\n" + "._562:\n" + " ldr r0, ._570 + 4\n" + " ldrh r0, [r0, #0x2a]\n" + " cmp r0, #0x80\n" + " bne ._567 @cond_branch\n" + " bl debug_sub_80125E4\n" + " ldr r1, ._570\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x6\n" + " bne ._568 @cond_branch\n" + " mov r0, #0x0\n" + " b ._569\n" + "._571:\n" + " .align 2, 0\n" + "._570:\n" + " .word gUnknown_Debug_030043A4\n" + " .word gMain\n" + "._568:\n" + " add r0, r0, #0x1\n" + "._569:\n" + " strb r0, [r1]\n" + " bl debug_sub_8011E74\n" + " ldr r0, ._575\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + " bl debug_sub_80125A0\n" + "._567:\n" + " ldr r0, ._575 + 4\n" + " ldrh r0, [r0, #0x2a]\n" + " cmp r0, #0x20\n" + " bne ._572 @cond_branch\n" + " bl debug_sub_80125E4\n" + " ldr r2, ._575 + 8\n" + " ldrb r0, [r2]\n" + " add r1, r0, #0\n" + " cmp r1, #0\n" + " beq ._573 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r2]\n" + " b ._577\n" + "._576:\n" + " .align 2, 0\n" + "._575:\n" + " .word gUnknown_Debug_030043A4\n" + " .word gMain\n" + " .word gUnknown_Debug_030043A0\n" + "._573:\n" + " ldr r3, ._581\n" + " ldrb r0, [r3]\n" + " cmp r0, #0\n" + " beq ._577 @cond_branch\n" + " strb r1, [r3]\n" + " mov r0, #0x4\n" + " strb r0, [r2]\n" + " ldr r0, ._581 + 4\n" + " strh r1, [r0]\n" + " bl debug_sub_8011E5C\n" + " bl debug_sub_8011E74\n" + " ldr r0, ._581 + 8\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + "._577:\n" + " bl debug_sub_80125A0\n" + "._572:\n" + " ldr r0, ._581 + 12\n" + " ldrh r0, [r0, #0x2a]\n" + " cmp r0, #0x10\n" + " bne ._578 @cond_branch\n" + " bl debug_sub_80125E4\n" + " ldr r2, ._581 + 16\n" + " ldrb r0, [r2]\n" + " cmp r0, #0x4\n" + " beq ._579 @cond_branch\n" + " add r0, r0, #0x1\n" + " strb r0, [r2]\n" + " b ._583\n" + "._582:\n" + " .align 2, 0\n" + "._581:\n" + " .word gUnknown_Debug_03004360\n" + " .word gUnknown_030042C0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gMain\n" + " .word gUnknown_Debug_030043A0\n" + "._579:\n" + " ldr r3, ._587\n" + " ldrb r1, [r3]\n" + " cmp r1, #0\n" + " bne ._583 @cond_branch\n" + " mov r0, #0x1\n" + " strb r0, [r3]\n" + " strb r1, [r2]\n" + " ldr r1, ._587 + 4\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " bl debug_sub_8011E5C\n" + " bl debug_sub_8011E74\n" + " ldr r0, ._587 + 8\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + "._583:\n" + " bl debug_sub_80125A0\n" + "._578:\n" + " ldr r0, ._587 + 12\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._584 @cond_branch\n" + " b ._607\n" + "._584:\n" + " ldr r0, ._587 + 16\n" + " ldrb r2, [r0]\n" + " ldr r0, ._587 + 8\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r2, r0\n" + " sub r0, r0, #0x1e\n" + " cmp r0, #0x4\n" + " bhi ._586 @cond_branch\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._587 + 20\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._588:\n" + " .align 2, 0\n" + "._587:\n" + " .word gUnknown_Debug_03004360\n" + " .word gUnknown_030042C0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gMain\n" + " .word gUnknown_Debug_030043A0\n" + " .word ._589\n" + "._589:\n" + " .word ._590\n" + " .word ._591\n" + " .word ._592\n" + " .word ._593\n" + " .word ._594\n" + "._591:\n" + " bl debug_sub_8010818\n" + " b ._595\n" + "._592:\n" + " ldr r1, ._597\n" + " mov r0, #0x1f\n" + " mov r2, #0xec\n" + " bl debug_sub_80132C8\n" + "._595:\n" + " bl debug_sub_8011E5C\n" + " bl debug_sub_8011E74\n" + " bl debug_sub_8012540\n" + " bl debug_nullsub_3\n" + " ldr r0, ._597 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + " b ._607\n" + "._598:\n" + " .align 2, 0\n" + "._597:\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_030043A4\n" + "._593:\n" + " ldr r1, ._600\n" + " mov r0, #0x1f\n" + " mov r2, #0xec\n" + " bl debug_sub_8013294\n" + " b ._607\n" + "._601:\n" + " .align 2, 0\n" + "._600:\n" + " .word gUnknown_02023A14+0x52\n" + "._594:\n" + " ldr r3, ._604\n" + " add r2, r3, #0\n" + " add r2, r2, #0x44\n" + " ldrh r1, [r2]\n" + " mov r4, #0x0\n" + " ldsh r0, [r2, r4]\n" + " cmp r0, #0\n" + " beq ._602 @cond_branch\n" + " sub r0, r1, #1\n" + " strh r0, [r2]\n" + " add r1, r3, #0\n" + " add r1, r1, #0x8a\n" + " ldrh r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r1]\n" + " b ._603\n" + "._605:\n" + " .align 2, 0\n" + "._604:\n" + " .word gUnknown_02023A14+0x52\n" + "._602:\n" + " mov r1, #0x8\n" + " strh r1, [r2]\n" + " add r0, r3, #0\n" + " add r0, r0, #0x8a\n" + " strh r1, [r0]\n" + "._603:\n" + " bl debug_sub_8012540\n" + " b ._607\n" + "._590:\n" + " mov r0, #0x0\n" + " bl debug_sub_8010B80\n" + " ldr r2, ._608\n" + " ldr r0, ._608 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " b ._607\n" + "._609:\n" + " .align 2, 0\n" + "._608:\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + "._586:\n" + " cmp r2, #0x4\n" + " bne ._611 @cond_branch\n" + " cmp r1, #0x5\n" + " bhi ._611 @cond_branch\n" + " mov r0, #0x1\n" + " bl debug_sub_8010AAC\n" + " b ._613\n" + "._611:\n" + " ldr r6, ._618\n" + " ldr r5, ._618 + 4\n" + " ldr r4, ._618 + 8\n" + " ldrb r0, [r4]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " ldrb r0, [r5]\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x1\n" + " ldr r2, ._618 + 12\n" + " ldrb r0, [r2]\n" + " mov r3, #0x46\n" + " mul r0, r0, r3\n" + " add r1, r1, r0\n" + " add r1, r1, r6\n" + " ldrh r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r1]\n" + " ldrb r0, [r4]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " ldrb r5, [r5]\n" + " add r1, r1, r5\n" + " lsl r0, r1, #0x1\n" + " ldrb r2, [r2]\n" + " mul r2, r2, r3\n" + " add r0, r0, r2\n" + " add r3, r0, r6\n" + " mov r4, #0x0\n" + " ldsh r2, [r3, r4]\n" + " ldr r4, ._618 + 16\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r1, r0, #0x1\n" + " add r0, r4, #0\n" + " add r0, r0, #0x8\n" + " add r0, r1, r0\n" + " ldrh r0, [r0]\n" + " cmp r2, r0\n" + " bge ._613 @cond_branch\n" + " add r0, r4, #6\n" + " add r0, r1, r0\n" + " ldrh r0, [r0]\n" + " strh r0, [r3]\n" + "._613:\n" + " ldr r5, ._618 + 4\n" + " ldrb r0, [r5]\n" + " cmp r0, #0\n" + " bne ._614 @cond_branch\n" + " mov r0, #0x0\n" + " bl debug_sub_8010AAC\n" + " ldr r0, ._618 + 8\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r0, #0x4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + "._614:\n" + " ldr r4, ._618 + 8\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r5, [r5]\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + "._607:\n" + " ldr r0, ._618 + 20\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._615 @cond_branch\n" + " b ._638\n" + "._615:\n" + " ldr r0, ._618 + 4\n" + " ldrb r2, [r0]\n" + " ldr r0, ._618 + 8\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r2, r0\n" + " sub r0, r0, #0x1e\n" + " cmp r0, #0x4\n" + " bhi ._617 @cond_branch\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._618 + 24\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._619:\n" + " .align 2, 0\n" + "._618:\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_03004360\n" + " .word UnkDebug0+0x6c\n" + " .word gMain\n" + " .word ._620\n" + "._620:\n" + " .word ._621\n" + " .word ._622\n" + " .word ._623\n" + " .word ._624\n" + " .word ._625\n" + "._622:\n" + " bl debug_sub_8010818\n" + " b ._626\n" + "._623:\n" + " ldr r1, ._628\n" + " mov r0, #0x1f\n" + " mov r2, #0xec\n" + " bl debug_sub_80132C8\n" + "._626:\n" + " bl debug_sub_8011E5C\n" + " bl debug_sub_8011E74\n" + " bl debug_sub_8012540\n" + " bl debug_nullsub_3\n" + " ldr r0, ._628 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + " b ._638\n" + "._629:\n" + " .align 2, 0\n" + "._628:\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_030043A4\n" + "._624:\n" + " ldr r1, ._631\n" + " mov r0, #0x1f\n" + " mov r2, #0xec\n" + " bl debug_sub_8013294\n" + " b ._638\n" + "._632:\n" + " .align 2, 0\n" + "._631:\n" + " .word gUnknown_02023A14+0x52\n" + "._625:\n" + " ldr r3, ._635\n" + " add r2, r3, #0\n" + " add r2, r2, #0x44\n" + " ldrh r1, [r2]\n" + " mov r4, #0x0\n" + " ldsh r0, [r2, r4]\n" + " cmp r0, #0x7\n" + " bgt ._633 @cond_branch\n" + " add r0, r1, #1\n" + " strh r0, [r2]\n" + " add r1, r3, #0\n" + " add r1, r1, #0x8a\n" + " ldrh r0, [r1]\n" + " add r0, r0, #0x1\n" + " strh r0, [r1]\n" + " b ._634\n" + "._636:\n" + " .align 2, 0\n" + "._635:\n" + " .word gUnknown_02023A14+0x52\n" + "._633:\n" + " mov r1, #0x0\n" + " strh r1, [r2]\n" + " add r0, r3, #0\n" + " add r0, r0, #0x8a\n" + " strh r1, [r0]\n" + "._634:\n" + " bl debug_sub_8012540\n" + " b ._638\n" + "._621:\n" + " mov r0, #0x1\n" + " bl debug_sub_8010B80\n" + " ldr r2, ._639\n" + " ldr r0, ._639 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " b ._638\n" + "._640:\n" + " .align 2, 0\n" + "._639:\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + "._617:\n" + " cmp r2, #0x4\n" + " bne ._642 @cond_branch\n" + " cmp r1, #0x5\n" + " bhi ._642 @cond_branch\n" + " mov r0, #0x1\n" + " bl debug_sub_8010AAC\n" + " b ._644\n" + "._642:\n" + " ldr r6, ._650\n" + " ldr r5, ._650 + 4\n" + " ldr r4, ._650 + 8\n" + " ldrb r0, [r4]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " ldrb r0, [r5]\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x1\n" + " ldr r2, ._650 + 12\n" + " ldrb r0, [r2]\n" + " mov r3, #0x46\n" + " mul r0, r0, r3\n" + " add r1, r1, r0\n" + " add r1, r1, r6\n" + " ldrh r0, [r1]\n" + " add r0, r0, #0x1\n" + " strh r0, [r1]\n" + " ldrb r0, [r4]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " ldrb r5, [r5]\n" + " add r1, r1, r5\n" + " lsl r0, r1, #0x1\n" + " ldrb r2, [r2]\n" + " mul r2, r2, r3\n" + " add r0, r0, r2\n" + " add r3, r0, r6\n" + " mov r4, #0x0\n" + " ldsh r2, [r3, r4]\n" + " ldr r4, ._650 + 16\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r1, r0, #0x1\n" + " add r0, r4, #6\n" + " add r0, r1, r0\n" + " ldrh r0, [r0]\n" + " cmp r2, r0\n" + " ble ._644 @cond_branch\n" + " add r0, r4, #0\n" + " add r0, r0, #0x8\n" + " add r0, r1, r0\n" + " ldrh r0, [r0]\n" + " strh r0, [r3]\n" + "._644:\n" + " ldr r5, ._650 + 4\n" + " ldrb r0, [r5]\n" + " cmp r0, #0\n" + " bne ._645 @cond_branch\n" + " mov r0, #0x0\n" + " bl debug_sub_8010AAC\n" + " ldr r0, ._650 + 8\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r0, #0x4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + "._645:\n" + " ldr r4, ._650 + 8\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r5, [r5]\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + "._638:\n" + " ldr r0, ._650 + 20\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._646 @cond_branch\n" + " ldr r0, ._650 + 4\n" + " ldrb r1, [r0]\n" + " ldr r2, ._650 + 8\n" + " mov r8, r2\n" + " add r7, r0, #0\n" + " cmp r1, #0x4\n" + " bne ._648 @cond_branch\n" + " ldrb r0, [r2]\n" + " cmp r0, #0x5\n" + " bhi ._648 @cond_branch\n" + " mov r0, #0x1\n" + " bl debug_sub_8010AAC\n" + " b ._653\n" + "._651:\n" + " .align 2, 0\n" + "._650:\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_03004360\n" + " .word UnkDebug0+0x6c\n" + " .word gMain\n" + "._648:\n" + " mov r4, r8\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r1, [r7]\n" + " add r0, r0, r1\n" + " cmp r0, #0x1e\n" + " bne ._652 @cond_branch\n" + " mov r0, #0x2\n" + " bl debug_sub_8010B80\n" + " b ._653\n" + "._652:\n" + " ldr r4, ._655\n" + " lsl r1, r0, #0x1\n" + " ldr r3, ._655 + 4\n" + " ldrb r2, [r3]\n" + " mov r0, #0x46\n" + " mul r0, r0, r2\n" + " add r1, r1, r0\n" + " add r1, r1, r4\n" + " ldrh r0, [r1]\n" + " sub r0, r0, #0xa\n" + " strh r0, [r1]\n" + " add r6, r3, #0\n" + " ldr r5, ._655 + 8\n" + " b ._654\n" + "._656:\n" + " .align 2, 0\n" + "._655:\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_03004360\n" + " .word UnkDebug0+0x6c\n" + "._657:\n" + " add r0, r5, #6\n" + " add r0, r1, r0\n" + " ldrh r0, [r0]\n" + " ldrh r2, [r3]\n" + " add r0, r0, r2\n" + " strh r0, [r3]\n" + "._654:\n" + " mov r1, r8\n" + " ldrb r0, [r1]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " ldrb r2, [r7]\n" + " add r1, r1, r2\n" + " lsl r2, r1, #0x1\n" + " ldrb r3, [r6]\n" + " mov r0, #0x46\n" + " mul r0, r0, r3\n" + " add r2, r2, r0\n" + " add r3, r2, r4\n" + " mov r0, #0x0\n" + " ldsh r2, [r3, r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r1, r0, #0x1\n" + " add r0, r5, #0\n" + " add r0, r0, #0x8\n" + " add r0, r1, r0\n" + " ldrh r0, [r0]\n" + " cmp r2, r0\n" + " blt ._657 @cond_branch\n" + "._653:\n" + " ldr r5, ._663\n" + " ldrb r0, [r5]\n" + " cmp r0, #0\n" + " bne ._658 @cond_branch\n" + " mov r0, #0x0\n" + " bl debug_sub_8010AAC\n" + " ldr r0, ._663 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r0, #0x4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + "._658:\n" + " ldr r4, ._663 + 4\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r5, [r5]\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + "._646:\n" + " ldr r0, ._663 + 8\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._659 @cond_branch\n" + " ldr r0, ._663\n" + " ldrb r1, [r0]\n" + " ldr r2, ._663 + 4\n" + " mov r8, r2\n" + " add r7, r0, #0\n" + " cmp r1, #0x4\n" + " bne ._661 @cond_branch\n" + " ldrb r0, [r2]\n" + " cmp r0, #0x5\n" + " bhi ._661 @cond_branch\n" + " mov r0, #0x1\n" + " bl debug_sub_8010AAC\n" + " b ._666\n" + "._664:\n" + " .align 2, 0\n" + "._663:\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gMain\n" + "._661:\n" + " mov r4, r8\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r1, [r7]\n" + " add r0, r0, r1\n" + " cmp r0, #0x1e\n" + " bne ._665 @cond_branch\n" + " mov r0, #0x3\n" + " bl debug_sub_8010B80\n" + " b ._666\n" + "._665:\n" + " ldr r4, ._668\n" + " lsl r1, r0, #0x1\n" + " ldr r3, ._668 + 4\n" + " ldrb r2, [r3]\n" + " mov r0, #0x46\n" + " mul r0, r0, r2\n" + " add r1, r1, r0\n" + " add r1, r1, r4\n" + " ldrh r0, [r1]\n" + " add r0, r0, #0xa\n" + " strh r0, [r1]\n" + " add r6, r3, #0\n" + " ldr r5, ._668 + 8\n" + " b ._667\n" + "._669:\n" + " .align 2, 0\n" + "._668:\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_03004360\n" + " .word UnkDebug0+0x6c\n" + "._670:\n" + " ldrh r0, [r3]\n" + " sub r0, r0, r1\n" + " strh r0, [r3]\n" + "._667:\n" + " mov r2, r8\n" + " ldrb r0, [r2]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " ldrb r0, [r7]\n" + " add r1, r1, r0\n" + " lsl r2, r1, #0x1\n" + " ldrb r3, [r6]\n" + " mov r0, #0x46\n" + " mul r0, r0, r3\n" + " add r2, r2, r0\n" + " add r3, r2, r4\n" + " mov r0, #0x0\n" + " ldsh r2, [r3, r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x1\n" + " add r1, r5, #6\n" + " add r0, r0, r1\n" + " ldrh r1, [r0]\n" + " cmp r2, r1\n" + " bgt ._670 @cond_branch\n" + "._666:\n" + " ldr r5, ._672\n" + " ldrb r0, [r5]\n" + " cmp r0, #0\n" + " bne ._671 @cond_branch\n" + " mov r0, #0x0\n" + " bl debug_sub_8010AAC\n" + " ldr r0, ._672 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " add r0, r0, #0x4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + "._671:\n" + " ldr r4, ._672 + 4\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r5, [r5]\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " ldrb r1, [r4]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_80123D8\n" + "._659:\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " add sp, sp, #0x10\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._673:\n" + " .align 2, 0\n" + "._672:\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8011498() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " ldr r2, ._687\n" + " ldr r0, ._687 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r9, r0\n" + " ldr r4, ._687 + 8\n" + " ldrh r1, [r4, #0x28]\n" + " mov r0, #0x81\n" + " lsl r0, r0, #0x2\n" + " cmp r1, r0\n" + " bne ._674 @cond_branch\n" + " bl DoSoftReset\n" + "._674:\n" + " ldrh r0, [r4, #0x2a]\n" + " cmp r0, #0x4\n" + " bne ._675 @cond_branch\n" + " bl debug_sub_8012658\n" + " ldr r0, ._687 + 12\n" + " bl SetMainCallback2\n" + "._675:\n" + " ldrh r0, [r4, #0x2a]\n" + " cmp r0, #0x8\n" + " bne ._676 @cond_branch\n" + " bl debug_sub_801174C\n" + "._676:\n" + " ldrh r0, [r4, #0x2a]\n" + " cmp r0, #0x40\n" + " beq ._677 @cond_branch\n" + " cmp r0, #0x80\n" + " bne ._678 @cond_branch\n" + "._677:\n" + " bl debug_sub_8012658\n" + " ldr r0, ._687 + 16\n" + " ldrb r1, [r0]\n" + " mov r2, #0x2\n" + " eor r1, r1, r2\n" + " strb r1, [r0]\n" + " bl debug_sub_8012628\n" + "._678:\n" + " ldr r0, ._687 + 8\n" + " ldrh r0, [r0, #0x2a]\n" + " cmp r0, #0x20\n" + " beq ._679 @cond_branch\n" + " cmp r0, #0x10\n" + " bne ._680 @cond_branch\n" + "._679:\n" + " bl debug_sub_8012658\n" + " ldr r0, ._687 + 16\n" + " ldrb r1, [r0]\n" + " mov r2, #0x1\n" + " eor r1, r1, r2\n" + " strb r1, [r0]\n" + " bl debug_sub_8012628\n" + "._680:\n" + " ldr r0, ._687 + 8\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._681 @cond_branch\n" + " ldr r0, ._687 + 20\n" + " mov r8, r0\n" + " ldr r6, ._687 + 16\n" + " ldrb r4, [r6]\n" + " lsl r4, r4, #0x1\n" + " mov r0, r9\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x4358\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x15\n" + " add r4, r4, r0\n" + " ldr r5, ._687 + 24\n" + " ldrb r2, [r5]\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x4\n" + " add r4, r4, r1\n" + " add r4, r4, r8\n" + " ldrh r1, [r4]\n" + " sub r1, r1, #0x1\n" + " strh r1, [r4]\n" + " ldrb r3, [r6]\n" + " lsl r1, r3, #0x1\n" + " add r1, r1, r0\n" + " ldrb r2, [r5]\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x4\n" + " add r1, r1, r0\n" + " mov r0, r8\n" + " add r4, r1, r0\n" + " mov r0, #0x0\n" + " ldsh r1, [r4, r0]\n" + " ldr r5, ._687 + 28\n" + " lsl r0, r3, #0x2\n" + " add r0, r0, r3\n" + " lsl r2, r0, #0x1\n" + " add r0, r5, #0\n" + " add r0, r0, #0x8\n" + " add r0, r2, r0\n" + " ldrh r0, [r0]\n" + " cmp r1, r0\n" + " bge ._682 @cond_branch\n" + " add r0, r5, #6\n" + " add r0, r2, r0\n" + " ldrh r0, [r0]\n" + " strh r0, [r4]\n" + "._682:\n" + " bl debug_sub_8012294\n" + "._681:\n" + " ldr r0, ._687 + 8\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._683 @cond_branch\n" + " ldr r1, ._687 + 20\n" + " mov r8, r1\n" + " ldr r6, ._687 + 16\n" + " ldrb r4, [r6]\n" + " lsl r4, r4, #0x1\n" + " mov r0, r9\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x4358\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x15\n" + " add r4, r4, r0\n" + " ldr r5, ._687 + 24\n" + " ldrb r2, [r5]\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x4\n" + " add r4, r4, r1\n" + " add r4, r4, r8\n" + " ldrh r1, [r4]\n" + " add r1, r1, #0x1\n" + " strh r1, [r4]\n" + " ldrb r3, [r6]\n" + " lsl r1, r3, #0x1\n" + " add r1, r1, r0\n" + " ldrb r2, [r5]\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x4\n" + " add r1, r1, r0\n" + " mov r0, r8\n" + " add r4, r1, r0\n" + " mov r0, #0x0\n" + " ldsh r1, [r4, r0]\n" + " ldr r5, ._687 + 28\n" + " lsl r0, r3, #0x2\n" + " add r0, r0, r3\n" + " lsl r2, r0, #0x1\n" + " add r0, r5, #6\n" + " add r0, r2, r0\n" + " ldrh r0, [r0]\n" + " cmp r1, r0\n" + " ble ._684 @cond_branch\n" + " add r0, r5, #0\n" + " add r0, r0, #0x8\n" + " add r0, r2, r0\n" + " ldrh r0, [r0]\n" + " strh r0, [r4]\n" + "._684:\n" + " bl debug_sub_8012294\n" + "._683:\n" + " ldr r0, ._687 + 8\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._685 @cond_branch\n" + " ldr r6, ._687 + 20\n" + " ldr r5, ._687 + 16\n" + " ldrb r4, [r5]\n" + " lsl r4, r4, #0x1\n" + " mov r0, r9\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x4358\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x15\n" + " add r4, r4, r0\n" + " ldr r2, ._687 + 24\n" + " ldrb r1, [r2]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x4\n" + " add r4, r4, r0\n" + " add r4, r4, r6\n" + " ldrh r0, [r4]\n" + " sub r0, r0, #0xa\n" + " strh r0, [r4]\n" + " mov sl, r5\n" + " mov r8, r6\n" + " add r7, r2, #0\n" + " ldr r6, ._687 + 28\n" + " b ._686\n" + "._688:\n" + " .align 2, 0\n" + "._687:\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gMain\n" + " .word debug_sub_8010CAC+1\n" + " .word gUnknown_Debug_030043A8\n" + " .word gUnknown_02023A14+0xde\n" + " .word gUnknown_Debug_03004360\n" + " .word UnkDebug0+0x1ac\n" + "._689:\n" + " add r0, r6, #6\n" + " add r0, r2, r0\n" + " ldrh r0, [r0]\n" + " ldrh r1, [r4]\n" + " add r0, r0, r1\n" + " strh r0, [r4]\n" + "._686:\n" + " mov r0, sl\n" + " ldrb r5, [r0]\n" + " lsl r4, r5, #0x1\n" + " mov r0, r9\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x4358\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x15\n" + " add r4, r4, r0\n" + " ldrb r1, [r7]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x4\n" + " add r4, r4, r0\n" + " add r4, r4, r8\n" + " mov r0, #0x0\n" + " ldsh r1, [r4, r0]\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r2, r0, #0x1\n" + " add r0, r6, #0\n" + " add r0, r0, #0x8\n" + " add r0, r2, r0\n" + " ldrh r0, [r0]\n" + " cmp r1, r0\n" + " blt ._689 @cond_branch\n" + " bl debug_sub_8012294\n" + "._685:\n" + " ldr r0, ._692\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._690 @cond_branch\n" + " ldr r6, ._692 + 4\n" + " ldr r5, ._692 + 8\n" + " ldrb r4, [r5]\n" + " lsl r4, r4, #0x1\n" + " mov r0, r9\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x4358\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x15\n" + " add r4, r4, r0\n" + " ldr r2, ._692 + 12\n" + " ldrb r1, [r2]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x4\n" + " add r4, r4, r0\n" + " add r4, r4, r6\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0xa\n" + " strh r0, [r4]\n" + " mov sl, r5\n" + " mov r8, r6\n" + " add r7, r2, #0\n" + " ldr r6, ._692 + 16\n" + " b ._691\n" + "._693:\n" + " .align 2, 0\n" + "._692:\n" + " .word gMain\n" + " .word gUnknown_02023A14+0xde\n" + " .word gUnknown_Debug_030043A8\n" + " .word gUnknown_Debug_03004360\n" + " .word UnkDebug0+0x1ac\n" + "._694:\n" + " ldrh r0, [r4]\n" + " sub r0, r0, r1\n" + " strh r0, [r4]\n" + "._691:\n" + " mov r1, sl\n" + " ldrb r5, [r1]\n" + " lsl r4, r5, #0x1\n" + " mov r0, r9\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x4358\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x15\n" + " add r4, r4, r0\n" + " ldrb r1, [r7]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x4\n" + " add r4, r4, r0\n" + " add r4, r4, r8\n" + " mov r0, #0x0\n" + " ldsh r2, [r4, r0]\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x1\n" + " add r1, r6, #6\n" + " add r0, r0, r1\n" + " ldrh r1, [r0]\n" + " cmp r2, r1\n" + " bgt ._694 @cond_branch\n" + " bl debug_sub_8012294\n" + "._690:\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_801174C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xffffffe8\n" + " mov r0, #0x0\n" + " mov r9, r0\n" + " ldr r1, ._704\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " bl Random\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " mov r0, #0x3\n" + " and r4, r4, r0\n" + " lsl r4, r4, #0x18\n" + " lsr r6, r4, #0x18\n" + " ldr r5, ._704 + 4\n" + " lsl r1, r6, #0x1\n" + " add r1, r1, r6\n" + " lsl r1, r1, #0x1\n" + " ldr r0, ._704 + 8\n" + " add r1, r1, r0\n" + " add r0, r5, #0\n" + " bl StringCopy\n" + " lsr r4, r4, #0x19\n" + " strb r4, [r5, #0x8]\n" + " bl ZeroPlayerPartyMons\n" + " bl ZeroEnemyPartyMons\n" + " ldr r0, ._704 + 12\n" + " mov r1, #0x3c\n" + " ldsh r7, [r0, r1]\n" + " mov r2, r9\n" + " str r2, [sp, #0xc]\n" + " cmp r7, #0x9\n" + " ble ._695 @cond_branch\n" + " mov r0, #0x0\n" + "._696:\n" + " sub r7, r7, #0xa\n" + " add r0, r0, #0x1\n" + " cmp r7, #0x9\n" + " bgt ._696 @cond_branch\n" + " str r0, [sp, #0xc]\n" + "._695:\n" + " ldr r2, ._704 + 16\n" + " ldr r1, ._704 + 20\n" + " sub r0, r7, #1\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " ldrh r3, [r0]\n" + " strh r3, [r2]\n" + " ldr r1, ._704 + 24\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldr r1, ._704 + 28\n" + " add r0, sp, #0xc\n" + " ldrb r0, [r0]\n" + " strb r0, [r1]\n" + " mov r0, #0x80\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._697 @cond_branch\n" + " bl EnterSafariMode\n" + "._697:\n" + " ldr r5, ._704 + 12\n" + " ldrh r0, [r5, #0x3c]\n" + " sub r0, r0, #0x2\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0x2\n" + " bhi ._698 @cond_branch\n" + " ldr r4, ._704 + 32\n" + " bl Random\n" + " mov r1, #0x7\n" + " and r1, r1, r0\n" + " add r1, r1, #0x1\n" + " strh r1, [r4]\n" + "._698:\n" + " ldr r1, ._704 + 36\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " mov r7, #0x0\n" + "._745:\n" + " lsl r0, r7, #0x1\n" + " ldr r3, ._704 + 12\n" + " add r1, r0, r3\n" + " mov r2, #0x0\n" + " ldsh r1, [r1, r2]\n" + " add r2, r3, #0\n" + " mov r8, r0\n" + " add r3, r7, #5\n" + " mov sl, r3\n" + " cmp r1, #0\n" + " beq ._699 @cond_branch\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, #0\n" + " add r0, r0, r1\n" + " mov r3, #0x0\n" + " ldsh r0, [r0, r3]\n" + " cmp r0, #0x1\n" + " beq ._707 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._701 @cond_branch\n" + " cmp r0, #0\n" + " beq ._706 @cond_branch\n" + " b ._708\n" + "._705:\n" + " .align 2, 0\n" + "._704:\n" + " .word gUnknown_020297ED\n" + " .word gSaveBlock2\n" + " .word UnkDebug0+0x279\n" + " .word gUnknown_02023A14+0x52\n" + " .word gBattleTypeFlags\n" + " .word UnkDebug0+0x1e0\n" + " .word gUnknown_02023A14+0x50\n" + " .word gBattleTerrain\n" + " .word gTrainerBattleOpponent\n" + " .word gPlayerPartyCount\n" + "._701:\n" + " cmp r0, #0x2\n" + " beq ._706 @cond_branch\n" + " cmp r0, #0x3\n" + " beq ._707 @cond_branch\n" + " b ._708\n" + "._706:\n" + " mov r6, #0x0\n" + " b ._710\n" + "._707:\n" + " mov r6, #0xfe\n" + " b ._710\n" + "._708:\n" + " mov r6, #0xff\n" + "._710:\n" + " mov r1, r8\n" + " add r0, r1, r2\n" + " mov r3, #0x0\n" + " ldsh r0, [r0, r3]\n" + " add r1, r7, #5\n" + " mov sl, r1\n" + " cmp r0, #0xc9\n" + " bne ._712 @cond_branch\n" + " cmp r1, #0x1d\n" + " bgt ._712 @cond_branch\n" + " add r0, r7, #7\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r2\n" + " ldrb r0, [r0]\n" + " mov r9, r0\n" + " b ._713\n" + "._712:\n" + " mov r2, #0x0\n" + " mov r9, r2\n" + "._713:\n" + " add r0, r7, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x3d30\n" + " mov r3, #0x64\n" + " mul r0, r0, r3\n" + " ldr r1, ._719\n" + " add r0, r0, r1\n" + " ldr r1, ._719 + 4\n" + " add r1, r1, r8\n" + " ldrh r1, [r1]\n" + " add r2, r7, #1\n" + " lsl r2, r2, #0x1\n" + " ldr r3, ._719 + 4\n" + " add r2, r2, r3\n" + " ldrb r2, [r2]\n" + " str r6, [sp]\n" + " mov r3, #0x0\n" + " str r3, [sp, #0x4]\n" + " mov r3, r9\n" + " str r3, [sp, #0x8]\n" + " mov r3, #0x0\n" + " bl CreateMonWithGenderNatureLetter\n" + "._699:\n" + " add r0, r7, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x3d30\n" + " mov r2, #0x64\n" + " add r1, r0, #0\n" + " mul r1, r1, r2\n" + " ldr r0, ._719\n" + " add r5, r1, r0\n" + " ldr r4, ._719 + 8\n" + " mov r3, r8\n" + " add r6, r3, r4\n" + " add r0, r5, #0\n" + " mov r1, #0xc\n" + " add r2, r6, #0\n" + " bl SetMonData\n" + " sub r4, r4, #0x4\n" + " add r1, r7, #2\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r4\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " str r1, [sp, #0x10]\n" + " cmp r0, #0xb\n" + " bhi ._714 @cond_branch\n" + " add r0, r5, #0\n" + " mov r1, #0x26\n" + " add r2, r6, #0\n" + " bl SetMonData\n" + "._714:\n" + " add r1, r7, #3\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r4\n" + " mov r3, #0x0\n" + " ldsh r2, [r0, r3]\n" + " str r1, [sp, #0x14]\n" + " cmp r2, #0\n" + " beq ._716 @cond_branch\n" + " cmp r2, #0x3\n" + " beq ._716 @cond_branch\n" + " cmp r2, #0x2\n" + " bgt ._717 @cond_branch\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " sub r0, r0, #0x1\n" + " b ._718\n" + "._720:\n" + " .align 2, 0\n" + "._719:\n" + " .word gEnemyParty\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_02023A14+0x56\n" + "._717:\n" + " mov r2, #0x0\n" + " ldsh r0, [r0, r2]\n" + " sub r0, r0, #0x4\n" + "._718:\n" + " str r0, [sp, #0xc]\n" + " add r0, r7, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x3d30\n" + " mov r3, #0x64\n" + " mul r0, r0, r3\n" + " ldr r1, ._726\n" + " add r0, r0, r1\n" + " mov r1, #0x2e\n" + " add r2, sp, #0xc\n" + " bl SetMonData\n" + "._716:\n" + " ldr r1, ._726 + 4\n" + " add r1, r1, #0x46\n" + " mov r2, r8\n" + " add r0, r2, r1\n" + " mov r3, #0x0\n" + " ldsh r0, [r0, r3]\n" + " ldr r2, ._726 + 4\n" + " cmp r0, #0\n" + " beq ._721 @cond_branch\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x1\n" + " beq ._729 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._723 @cond_branch\n" + " cmp r0, #0\n" + " beq ._728 @cond_branch\n" + " b ._730\n" + "._727:\n" + " .align 2, 0\n" + "._726:\n" + " .word gEnemyParty\n" + " .word gUnknown_02023A14+0x52\n" + "._723:\n" + " cmp r0, #0x2\n" + " beq ._728 @cond_branch\n" + " cmp r0, #0x3\n" + " beq ._729 @cond_branch\n" + " b ._730\n" + "._728:\n" + " mov r6, #0x0\n" + " b ._732\n" + "._729:\n" + " mov r6, #0xfe\n" + " b ._732\n" + "._730:\n" + " mov r6, #0xff\n" + "._732:\n" + " add r1, r2, #0\n" + " add r1, r1, #0x46\n" + " mov r2, r8\n" + " add r0, r2, r1\n" + " mov r3, #0x0\n" + " ldsh r0, [r0, r3]\n" + " cmp r0, #0xc9\n" + " bne ._734 @cond_branch\n" + " mov r0, sl\n" + " cmp r0, #0x1d\n" + " bgt ._734 @cond_branch\n" + " add r0, r7, #7\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " mov r9, r0\n" + " b ._735\n" + "._734:\n" + " mov r1, #0x0\n" + " mov r9, r1\n" + "._735:\n" + " add r0, r7, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x3d30\n" + " mov r2, #0x64\n" + " mul r0, r0, r2\n" + " ldr r1, ._741\n" + " add r0, r0, r1\n" + " ldr r1, ._741 + 4\n" + " add r1, r1, r8\n" + " ldrh r1, [r1]\n" + " add r2, r7, #1\n" + " lsl r2, r2, #0x1\n" + " ldr r3, ._741 + 4\n" + " add r2, r2, r3\n" + " ldrb r2, [r2]\n" + " str r6, [sp]\n" + " mov r3, #0x0\n" + " str r3, [sp, #0x4]\n" + " mov r3, r9\n" + " str r3, [sp, #0x8]\n" + " mov r3, #0x0\n" + " bl CreateMonWithGenderNatureLetter\n" + " ldr r1, ._741 + 8\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._721:\n" + " add r0, r7, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x3d30\n" + " mov r2, #0x64\n" + " add r1, r0, #0\n" + " mul r1, r1, r2\n" + " ldr r0, ._741\n" + " add r4, r1, r0\n" + " ldr r0, ._741 + 12\n" + " mov r3, r8\n" + " add r5, r3, r0\n" + " add r0, r4, #0\n" + " mov r1, #0xc\n" + " add r2, r5, #0\n" + " bl SetMonData\n" + " ldr r1, [sp, #0x10]\n" + " lsl r0, r1, #0x1\n" + " ldr r2, ._741 + 16\n" + " add r0, r0, r2\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bhi ._736 @cond_branch\n" + " add r0, r4, #0\n" + " mov r1, #0x26\n" + " add r2, r5, #0\n" + " bl SetMonData\n" + "._736:\n" + " ldr r3, [sp, #0x14]\n" + " lsl r0, r3, #0x1\n" + " ldr r1, ._741 + 4\n" + " add r0, r0, r1\n" + " mov r2, #0x0\n" + " ldsh r1, [r0, r2]\n" + " cmp r1, #0\n" + " beq ._738 @cond_branch\n" + " cmp r1, #0x3\n" + " beq ._738 @cond_branch\n" + " cmp r1, #0x2\n" + " bgt ._739 @cond_branch\n" + " add r0, r1, #0\n" + " sub r0, r0, #0x1\n" + " b ._740\n" + "._742:\n" + " .align 2, 0\n" + "._741:\n" + " .word gPlayerParty\n" + " .word gUnknown_02023A14+0x98\n" + " .word gPlayerPartyCount\n" + " .word gUnknown_02023A14+0x9c\n" + " .word gUnknown_02023A14+0x52\n" + "._739:\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " sub r0, r0, #0x4\n" + "._740:\n" + " str r0, [sp, #0xc]\n" + " add r0, r7, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x3d30\n" + " mov r2, #0x64\n" + " mul r0, r0, r2\n" + " ldr r1, ._750\n" + " add r0, r0, r1\n" + " mov r1, #0x2e\n" + " add r2, sp, #0xc\n" + " bl SetMonData\n" + "._738:\n" + " ldr r3, [sp, #0x14]\n" + " lsl r0, r3, #0x1\n" + " ldr r1, ._750 + 4\n" + " add r0, r0, r1\n" + " mov r2, #0x0\n" + " ldsh r0, [r0, r2]\n" + " cmp r0, #0x2\n" + " ble ._743 @cond_branch\n" + " add r0, r7, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x3d30\n" + " mov r3, #0x64\n" + " mul r0, r0, r3\n" + " ldr r1, ._750\n" + " add r0, r0, r1\n" + " mov r1, #0x7\n" + " ldr r2, ._750 + 8\n" + " bl SetMonData\n" + " ldr r2, ._750 + 12\n" + " ldrb r0, [r2]\n" + " mov r1, #0x40\n" + " orr r0, r0, r1\n" + " strb r0, [r2]\n" + "._743:\n" + " mov r7, sl\n" + " cmp r7, #0x1d\n" + " bgt ._744 @cond_branch\n" + " b ._745\n" + "._744:\n" + " mov r0, #0x0\n" + " str r0, [sp, #0xc]\n" + " mov r0, #0x64\n" + " mov r8, r0\n" + " ldr r1, ._750 + 16\n" + " mov r9, r1\n" + " ldr r2, ._750\n" + " mov sl, r2\n" + "._747:\n" + " mov r7, #0x0\n" + "._746:\n" + " ldr r2, [sp, #0xc]\n" + " mov r0, r8\n" + " mul r0, r0, r2\n" + " ldr r3, ._750 + 20\n" + " add r0, r0, r3\n" + " add r5, r7, #0\n" + " add r5, r5, #0xd\n" + " lsl r2, r2, #0x3\n" + " lsl r4, r7, #0x1\n" + " mov r3, r9\n" + " add r1, r4, r3\n" + " add r2, r2, r1\n" + " add r1, r5, #0\n" + " bl SetMonData\n" + " ldr r1, [sp, #0xc]\n" + " mov r0, r8\n" + " mul r0, r0, r1\n" + " ldr r2, ._750 + 20\n" + " add r0, r0, r2\n" + " add r6, r7, #0\n" + " add r6, r6, #0x11\n" + " lsl r1, r1, #0x3\n" + " add r1, r4, r1\n" + " add r1, r1, r9\n" + " mov r3, #0x0\n" + " ldsh r1, [r1, r3]\n" + " lsl r2, r1, #0x1\n" + " add r2, r2, r1\n" + " lsl r2, r2, #0x2\n" + " ldr r1, ._750 + 24\n" + " add r2, r2, r1\n" + " add r1, r6, #0\n" + " bl SetMonData\n" + " ldr r2, [sp, #0xc]\n" + " mov r0, r8\n" + " mul r0, r0, r2\n" + " add r0, r0, sl\n" + " lsl r2, r2, #0x3\n" + " ldr r3, ._750 + 28\n" + " add r1, r4, r3\n" + " add r2, r2, r1\n" + " add r1, r5, #0\n" + " bl SetMonData\n" + " ldr r1, [sp, #0xc]\n" + " mov r0, r8\n" + " mul r0, r0, r1\n" + " add r0, r0, sl\n" + " lsl r1, r1, #0x3\n" + " add r4, r4, r1\n" + " ldr r1, ._750 + 28\n" + " add r4, r4, r1\n" + " mov r2, #0x0\n" + " ldsh r1, [r4, r2]\n" + " lsl r2, r1, #0x1\n" + " add r2, r2, r1\n" + " lsl r2, r2, #0x2\n" + " ldr r3, ._750 + 24\n" + " add r2, r2, r3\n" + " add r1, r6, #0\n" + " bl SetMonData\n" + " add r7, r7, #0x1\n" + " cmp r7, #0x3\n" + " ble ._746 @cond_branch\n" + " ldr r0, [sp, #0xc]\n" + " add r0, r0, #0x1\n" + " str r0, [sp, #0xc]\n" + " cmp r0, #0x5\n" + " ble ._747 @cond_branch\n" + " ldr r3, ._750 + 32\n" + " add r4, r3, #0\n" + " add r4, r4, #0x44\n" + " ldrh r1, [r4]\n" + " mov r2, #0x0\n" + " ldsh r0, [r4, r2]\n" + " cmp r0, #0x8\n" + " bne ._748 @cond_branch\n" + " ldr r0, ._750 + 12\n" + " ldrb r1, [r0]\n" + " mov r2, #0x80\n" + " b ._753\n" + "._751:\n" + " .align 2, 0\n" + "._750:\n" + " .word gPlayerParty\n" + " .word gUnknown_02023A14+0x98\n" + " .word UnkDebug0+0x291\n" + " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14+0xde\n" + " .word gEnemyParty\n" + " .word gBattleMoves+0x4\n" + " .word gUnknown_02023A14+0x10e\n" + " .word gUnknown_02023A14+0x52\n" + "._748:\n" + " cmp r0, #0x7\n" + " bne ._752 @cond_branch\n" + " ldr r0, ._754\n" + " ldrb r1, [r0]\n" + " mov r2, #0x20\n" + " b ._753\n" + "._755:\n" + " .align 2, 0\n" + "._754:\n" + " .word gUnknown_02023A14+0x50\n" + "._752:\n" + " cmp r0, #0x6\n" + " bne ._756 @cond_branch\n" + " ldr r2, ._759\n" + " ldrb r0, [r2]\n" + " mov r1, #0x10\n" + " orr r0, r0, r1\n" + " strb r0, [r2]\n" + " ldrh r1, [r3, #0x4]\n" + " mov r2, #0x4\n" + " ldsh r0, [r3, r2]\n" + " cmp r0, #0x5\n" + " ble ._757 @cond_branch\n" + " ldr r0, ._759 + 4\n" + " sub r1, r1, #0x2\n" + " ldr r3, ._759 + 8\n" + " add r0, r0, r3\n" + " b ._761\n" + "._760:\n" + " .align 2, 0\n" + "._759:\n" + " .word gUnknown_02023A14+0x50\n" + " .word +0x2000000\n" + " .word 0x160a3\n" + "._757:\n" + " ldr r0, ._762\n" + " ldr r2, ._762 + 4\n" + " add r0, r0, r2\n" + " b ._761\n" + "._763:\n" + " .align 2, 0\n" + "._762:\n" + " .word +0x2000000\n" + " .word 0x160a3\n" + "._756:\n" + " cmp r0, #0x5\n" + " bne ._764 @cond_branch\n" + " ldr r0, ._766\n" + " ldrb r1, [r0]\n" + " mov r2, #0x21\n" + "._753:\n" + " orr r1, r1, r2\n" + "._761:\n" + " strb r1, [r0]\n" + " bl sub_80408BC\n" + " b ._770\n" + "._767:\n" + " .align 2, 0\n" + "._766:\n" + " .word gUnknown_02023A14+0x50\n" + "._764:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._768 @cond_branch\n" + " bl sub_80408BC\n" + "._768:\n" + " ldrh r3, [r4]\n" + " mov r0, #0x2\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._769 @cond_branch\n" + " ldr r0, ._772\n" + " ldrb r1, [r0]\n" + " mov r2, #0x4\n" + " orr r1, r1, r2\n" + " strb r1, [r0]\n" + "._769:\n" + " mov r0, #0x4\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._770 @cond_branch\n" + " ldr r0, ._772\n" + " ldrb r1, [r0]\n" + " mov r2, #0x6\n" + " orr r1, r1, r2\n" + " strb r1, [r0]\n" + "._770:\n" + " ldr r0, ._772 + 4\n" + " ldr r1, ._772 + 8\n" + " str r1, [r0, #0x8]\n" + " ldr r0, ._772 + 12\n" + " bl SetMainCallback2\n" + " bl ClearBag\n" + " mov r0, #0x1\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x2\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x3\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x4\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x5\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x6\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x7\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x8\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x9\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0xa\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0xb\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0xc\n" + " mov r1, #0xa\n" + " bl AddBagItem\n" + " mov r0, #0x13\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x14\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x19\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x22\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x23\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x25\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x49\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x4a\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x4b\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x4c\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x4d\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x4e\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " mov r0, #0x50\n" + " mov r1, #0x63\n" + " bl AddBagItem\n" + " ldr r4, ._772 + 16\n" + " mov r7, #0xe\n" + "._771:\n" + " add r0, r4, #0\n" + " bl sub_810CA34\n" + " add r4, r4, #0x8\n" + " sub r7, r7, #0x1\n" + " cmp r7, #0\n" + " bge ._771 @cond_branch\n" + " add sp, sp, #0x18\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._773:\n" + " .align 2, 0\n" + "._772:\n" + " .word gUnknown_02023A14+0x50\n" + " .word gMain\n" + " .word debug_sub_80108B8+1\n" + " .word unref_sub_800D684+1\n" + " .word UnkDebug0+0x1f4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8011D40() +{ + asm( + " push {lr}\n" + " ldr r1, ._774\n" + " ldr r0, ._774 + 4\n" + " str r0, [r1]\n" + " ldr r0, ._774 + 8\n" + " str r0, [r1, #0x4]\n" + " ldr r0, ._774 + 12\n" + " str r0, [r1, #0x8]\n" + " ldr r0, [r1, #0x8]\n" + " sub r1, r1, #0xc4\n" + " ldr r0, ._774 + 16\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._774 + 20\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._774 + 24\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._774 + 28\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._774 + 32\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._774 + 36\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._774 + 40\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._774 + 44\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " bl LoadOam\n" + " bl ProcessSpriteCopyRequests\n" + " pop {r0}\n" + " bx r0\n" + "._775:\n" + " .align 2, 0\n" + "._774:\n" + " .word 0x40000d4\n" + " .word +0x2000000\n" + " .word 0x6004000\n" + " .word 0x80000800\n" + " .word gUnknown_030042A4\n" + " .word gUnknown_030042A0\n" + " .word gUnknown_030042C0\n" + " .word gUnknown_030041B4\n" + " .word gUnknown_03004288\n" + " .word gUnknown_03004280\n" + " .word gUnknown_030041B0\n" + " .word gUnknown_030041B8\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_nullsub_45() +{ + asm( + " bx lr\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8011DD4() +{ + asm( + " push {lr}\n" + " ldr r1, ._776\n" + " ldr r2, ._776 + 4\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x8\n" + " ldr r0, ._776 + 8\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._776 + 12\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._776 + 16\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._776 + 20\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._776 + 24\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._776 + 28\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._776 + 32\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r0, ._776 + 36\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + " bl LoadOam\n" + " bl ProcessSpriteCopyRequests\n" + " bl TransferPlttBuffer\n" + " bl sub_8089668\n" + " pop {r0}\n" + " bx r0\n" + "._777:\n" + " .align 2, 0\n" + "._776:\n" + " .word 0x4000008\n" + " .word 0x9803\n" + " .word gUnknown_030042A4\n" + " .word gUnknown_030042A0\n" + " .word gUnknown_030042C0\n" + " .word gUnknown_030041B4\n" + " .word gUnknown_03004288\n" + " .word gUnknown_03004280\n" + " .word gUnknown_030041B0\n" + " .word gUnknown_030041B8\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8011E5C() +{ + asm( + " push {r4, lr}\n" + " mov r4, #0x0\n" + "._778:\n" + " lsl r0, r4, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8011EA0\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x1e\n" + " ble ._778 @cond_branch\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8011E74() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r0, ._780\n" + " ldrb r5, [r0]\n" + " mov r1, #0x0\n" + " strb r1, [r0]\n" + " add r4, r0, #0\n" + "._779:\n" + " bl debug_sub_8012294\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " strb r0, [r4]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x3\n" + " bls ._779 @cond_branch\n" + " ldr r0, ._780\n" + " strb r5, [r0]\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._781:\n" + " .align 2, 0\n" + "._780:\n" + " .word gUnknown_Debug_030043A8\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8011EA0() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffff4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " cmp r7, #0x22\n" + " bls ._782 @cond_branch\n" + " b ._815\n" + "._782:\n" + " lsl r0, r7, #0x2\n" + " ldr r1, ._785\n" + " add r1, r0, r1\n" + " ldr r1, [r1]\n" + " str r0, [sp, #0x8]\n" + " mov pc, r1\n" + "._786:\n" + " .align 2, 0\n" + "._785:\n" + " .word ._784\n" + "._784:\n" + " .word ._812\n" + " .word ._817\n" + " .word ._814\n" + " .word ._815\n" + " .word ._816\n" + " .word ._812\n" + " .word ._817\n" + " .word ._814\n" + " .word ._815\n" + " .word ._816\n" + " .word ._812\n" + " .word ._817\n" + " .word ._814\n" + " .word ._815\n" + " .word ._816\n" + " .word ._812\n" + " .word ._817\n" + " .word ._814\n" + " .word ._815\n" + " .word ._816\n" + " .word ._812\n" + " .word ._817\n" + " .word ._814\n" + " .word ._815\n" + " .word ._816\n" + " .word ._812\n" + " .word ._817\n" + " .word ._814\n" + " .word ._815\n" + " .word ._816\n" + " .word ._817\n" + " .word ._848\n" + " .word ._848\n" + " .word ._848\n" + " .word ._848\n" + "._812:\n" + " mov r0, #0x0\n" + " mov r1, #0x14\n" + " bl debug_sub_8010A7C\n" + " ldr r6, ._823\n" + " ldr r2, ._823 + 4\n" + " ldr r0, [sp, #0x8]\n" + " add r1, r0, r7\n" + " lsl r1, r1, #0x1\n" + " add r0, r1, r2\n" + " ldrh r0, [r0]\n" + " str r0, [sp, #0x4]\n" + " add r0, r2, #2\n" + " add r0, r1, r0\n" + " ldrb r0, [r0]\n" + " mov r8, r0\n" + " add r2, r2, #0x4\n" + " add r1, r1, r2\n" + " ldrb r1, [r1]\n" + " mov r9, r1\n" + " str r1, [sp]\n" + " ldr r0, ._823 + 8\n" + " add r1, r6, #0\n" + " ldr r2, [sp, #0x4]\n" + " mov r3, r8\n" + " bl InitWindow\n" + " ldr r0, ._823 + 8\n" + " bl sub_8002F44\n" + " ldr r1, ._823 + 12\n" + " mov sl, r1\n" + " lsl r4, r7, #0x1\n" + " ldr r5, ._823 + 16\n" + " ldrb r0, [r5]\n" + " mov r7, #0x46\n" + " mul r0, r0, r7\n" + " add r0, r4, r0\n" + " add r0, r0, sl\n" + " mov r2, #0x0\n" + " ldsh r1, [r0, r2]\n" + " add r0, r6, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r2, #0xd3\n" + " lsl r2, r2, #0x1\n" + " ldrb r3, [r5]\n" + " lsl r3, r3, #0x5\n" + " add r3, r3, #0x19\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " ldr r0, ._823 + 8\n" + " add r1, r6, #0\n" + " bl InitWindow\n" + " ldr r0, ._823 + 8\n" + " bl sub_8002F44\n" + " mov r0, #0xff\n" + " strb r0, [r6]\n" + " ldrb r0, [r5]\n" + " mul r0, r0, r7\n" + " add r4, r4, r0\n" + " add r4, r4, sl\n" + " mov r0, #0x0\n" + " ldsh r1, [r4, r0]\n" + " mov r0, #0xb\n" + " mul r1, r1, r0\n" + " ldr r0, ._823 + 20\n" + " add r1, r1, r0\n" + " add r0, r6, #0\n" + " bl StringAppend\n" + " mov r1, r9\n" + " str r1, [sp]\n" + " ldr r0, ._823 + 8\n" + " add r1, r6, #0\n" + " ldr r2, [sp, #0x4]\n" + " mov r3, r8\n" + " bl InitWindow\n" + " ldr r0, ._823 + 8\n" + " bl sub_8002F44\n" + " b ._848\n" + "._824:\n" + " .align 2, 0\n" + "._823:\n" + " .word gBattleTextBuff1\n" + " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_03004370\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_03004360\n" + " .word gSpeciesNames\n" + "._817:\n" + " ldr r6, ._826\n" + " ldr r3, ._826 + 4\n" + " lsl r1, r7, #0x1\n" + " ldr r0, ._826 + 8\n" + " ldrb r2, [r0]\n" + " mov r0, #0x46\n" + " mul r0, r0, r2\n" + " add r1, r1, r0\n" + " add r1, r1, r3\n" + " mov r2, #0x0\n" + " ldsh r1, [r1, r2]\n" + " add r0, r6, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " b ._825\n" + "._827:\n" + " .align 2, 0\n" + "._826:\n" + " .word gBattleTextBuff1\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_03004360\n" + "._814:\n" + " mov r0, #0x0\n" + " mov r1, #0x18\n" + " bl debug_sub_8010A7C\n" + " ldr r6, ._830\n" + " ldr r1, ._830 + 4\n" + " mov sl, r1\n" + " ldr r4, ._830 + 8\n" + " ldr r2, [sp, #0x8]\n" + " add r1, r2, r7\n" + " lsl r1, r1, #0x1\n" + " add r0, r1, r4\n" + " ldrh r2, [r0]\n" + " add r0, r4, #2\n" + " add r0, r1, r0\n" + " ldrb r3, [r0]\n" + " add r4, r4, #0x4\n" + " add r1, r1, r4\n" + " ldrb r0, [r1]\n" + " str r0, [sp]\n" + " add r0, r6, #0\n" + " mov r1, sl\n" + " bl InitWindow\n" + " add r0, r6, #0\n" + " bl sub_8002F44\n" + " lsl r4, r7, #0x1\n" + " ldr r5, ._830 + 12\n" + " ldrb r0, [r5]\n" + " mov r1, #0x46\n" + " mul r0, r0, r1\n" + " add r0, r4, r0\n" + " ldr r2, ._830 + 16\n" + " add r0, r0, r2\n" + " mov r2, #0x0\n" + " ldsh r1, [r0, r2]\n" + " mov r0, sl\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r2, #0xd3\n" + " lsl r2, r2, #0x1\n" + " ldrb r3, [r5]\n" + " lsl r3, r3, #0x5\n" + " add r3, r3, #0x19\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " add r0, r6, #0\n" + " mov r1, sl\n" + " bl InitWindow\n" + " add r0, r6, #0\n" + " bl sub_8002F44\n" + " mov r0, #0xff\n" + " mov r1, sl\n" + " strb r0, [r1]\n" + " ldrb r0, [r5]\n" + " mov r2, #0x46\n" + " mul r0, r0, r2\n" + " add r4, r4, r0\n" + " ldr r0, ._830 + 16\n" + " add r4, r4, r0\n" + " mov r1, #0x0\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0\n" + " beq ._828 @cond_branch\n" + " ldrh r0, [r4]\n" + " bl ItemId_GetItem\n" + " add r1, r0, #0\n" + " mov r0, sl\n" + " bl StringAppend\n" + " b ._829\n" + "._831:\n" + " .align 2, 0\n" + "._830:\n" + " .word gUnknown_Debug_03004370\n" + " .word gBattleTextBuff1\n" + " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_03004360\n" + " .word gUnknown_02023A14+0x52\n" + "._828:\n" + " ldr r1, ._833\n" + " mov r0, sl\n" + " bl StringAppend\n" + "._829:\n" + " ldr r6, ._833 + 4\n" + " ldr r1, ._833 + 8\n" + " ldr r5, ._833 + 12\n" + " ldr r2, [sp, #0x8]\n" + " add r4, r2, r7\n" + " lsl r4, r4, #0x1\n" + " add r0, r4, r5\n" + " ldrh r2, [r0]\n" + " add r0, r5, #2\n" + " add r0, r4, r0\n" + " ldrb r3, [r0]\n" + " add r5, r5, #0x4\n" + " add r4, r4, r5\n" + " ldrb r0, [r4]\n" + " str r0, [sp]\n" + " add r0, r6, #0\n" + " bl InitWindow\n" + " add r0, r6, #0\n" + " bl sub_8002F44\n" + " b ._848\n" + "._834:\n" + " .align 2, 0\n" + "._833:\n" + " .word UnkDebug0+0x26c\n" + " .word gUnknown_Debug_03004370\n" + " .word gBattleTextBuff1\n" + " .word UnkDebug0+0x6c\n" + "._816:\n" + " mov r0, #0x0\n" + " mov r1, #0x4\n" + " bl debug_sub_8010A7C\n" + " ldr r5, ._839\n" + " ldr r6, ._839 + 4\n" + " ldr r4, ._839 + 8\n" + " ldr r0, [sp, #0x8]\n" + " add r1, r0, r7\n" + " lsl r1, r1, #0x1\n" + " add r0, r1, r4\n" + " ldrh r2, [r0]\n" + " add r0, r4, #2\n" + " add r0, r1, r0\n" + " ldrb r3, [r0]\n" + " add r4, r4, #0x4\n" + " add r1, r1, r4\n" + " ldrb r0, [r1]\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " add r1, r6, #0\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + " mov r4, #0x0\n" + " ldr r3, ._839 + 12\n" + " lsl r1, r7, #0x1\n" + " ldr r0, ._839 + 16\n" + " ldrb r2, [r0]\n" + " mov r0, #0x46\n" + " mul r0, r0, r2\n" + " add r1, r1, r0\n" + " add r1, r1, r3\n" + " mov r2, #0x0\n" + " ldsh r0, [r1, r2]\n" + " cmp r0, #0x1\n" + " beq ._835 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._836 @cond_branch\n" + " cmp r0, #0\n" + " beq ._837 @cond_branch\n" + " b ._843\n" + "._840:\n" + " .align 2, 0\n" + "._839:\n" + " .word gUnknown_Debug_03004370\n" + " .word gBattleTextBuff1\n" + " .word UnkDebug0+0x6c\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_03004360\n" + "._836:\n" + " cmp r0, #0x2\n" + " beq ._841 @cond_branch\n" + " cmp r0, #0x3\n" + " beq ._842 @cond_branch\n" + " b ._843\n" + "._837:\n" + " mov r0, #0xb5\n" + " b ._844\n" + "._835:\n" + " mov r0, #0xb6\n" + "._844:\n" + " strb r0, [r6]\n" + " mov r4, #0x1\n" + " b ._847\n" + "._841:\n" + " mov r0, #0xb5\n" + " b ._846\n" + "._842:\n" + " mov r0, #0xb6\n" + "._846:\n" + " strb r0, [r6]\n" + " strb r0, [r6, #0x1]\n" + " mov r4, #0x2\n" + " b ._847\n" + "._843:\n" + " ldr r2, ._849\n" + " add r1, r4, r2\n" + " mov r0, #0xac\n" + " strb r0, [r1]\n" + " add r4, r4, #0x1\n" + " add r6, r2, #0\n" + "._847:\n" + " add r1, r4, r6\n" + " mov r0, #0xff\n" + " strb r0, [r1]\n" + "._825:\n" + " ldr r5, ._849 + 4\n" + " ldr r4, ._849 + 8\n" + " ldr r0, [sp, #0x8]\n" + " add r1, r0, r7\n" + " lsl r1, r1, #0x1\n" + " add r0, r1, r4\n" + " ldrh r2, [r0]\n" + " add r0, r4, #2\n" + " add r0, r1, r0\n" + " ldrb r3, [r0]\n" + " add r4, r4, #0x4\n" + " add r1, r1, r4\n" + " ldrb r0, [r1]\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " add r1, r6, #0\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + " b ._848\n" + "._850:\n" + " .align 2, 0\n" + "._849:\n" + " .word gBattleTextBuff1\n" + " .word gUnknown_Debug_03004370\n" + " .word UnkDebug0+0x6c\n" + "._815:\n" + " ldr r6, ._851\n" + " ldr r3, ._851 + 4\n" + " lsl r1, r7, #0x1\n" + " ldr r0, ._851 + 8\n" + " ldrb r2, [r0]\n" + " mov r0, #0x46\n" + " mul r0, r0, r2\n" + " add r1, r1, r0\n" + " add r1, r1, r3\n" + " mov r2, #0x0\n" + " ldsh r1, [r1, r2]\n" + " add r0, r6, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r5, ._851 + 12\n" + " ldr r4, ._851 + 16\n" + " lsl r1, r7, #0x2\n" + " add r1, r1, r7\n" + " lsl r1, r1, #0x1\n" + " add r0, r1, r4\n" + " ldrh r2, [r0]\n" + " add r0, r4, #2\n" + " add r0, r1, r0\n" + " ldrb r3, [r0]\n" + " add r4, r4, #0x4\n" + " add r1, r1, r4\n" + " ldrb r0, [r1]\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " add r1, r6, #0\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + "._848:\n" + " add sp, sp, #0xc\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._852:\n" + " .align 2, 0\n" + "._851:\n" + " .word gBattleTextBuff1\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_03004360\n" + " .word gUnknown_Debug_03004370\n" + " .word UnkDebug0+0x6c\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012294() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " ldr r2, ._854\n" + " ldr r0, ._854 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x1d\n" + " bhi ._853 @cond_branch\n" + " mov r0, #0x0\n" + " mov r1, #0x18\n" + " bl debug_sub_8010A7C\n" + " ldr r0, ._854 + 8\n" + " mov sl, r0\n" + " ldr r1, ._854 + 12\n" + " mov r9, r1\n" + " ldr r2, ._854 + 16\n" + " mov r8, r2\n" + " ldr r7, ._854 + 20\n" + " ldrb r1, [r7]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x1\n" + " add r1, r0, r2\n" + " ldrh r2, [r1]\n" + " ldr r3, ._854 + 24\n" + " add r1, r0, r3\n" + " ldrb r3, [r1]\n" + " ldr r1, ._854 + 28\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, sl\n" + " mov r1, r9\n" + " bl InitWindow\n" + " mov r0, sl\n" + " bl sub_8002F44\n" + " ldrb r4, [r7]\n" + " lsl r4, r4, #0x1\n" + " add r0, r5, #0\n" + " mov r1, #0x5\n" + " bl gScriptFuncs_End+0x4358\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x15\n" + " add r4, r4, r5\n" + " ldr r6, ._854 + 32\n" + " ldrb r1, [r6]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x4\n" + " add r4, r4, r0\n" + " ldr r2, ._854 + 36\n" + " add r4, r4, r2\n" + " mov r3, #0x0\n" + " ldsh r1, [r4, r3]\n" + " mov r0, r9\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r2, #0xd3\n" + " lsl r2, r2, #0x1\n" + " ldrb r3, [r6]\n" + " lsl r3, r3, #0x5\n" + " add r3, r3, #0x19\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, sl\n" + " mov r1, r9\n" + " bl InitWindow\n" + " mov r0, sl\n" + " bl sub_8002F44\n" + " mov r0, #0xff\n" + " mov r1, r9\n" + " strb r0, [r1]\n" + " ldrb r1, [r7]\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r5\n" + " ldrb r2, [r6]\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r2, ._854 + 36\n" + " add r1, r1, r2\n" + " mov r3, #0x0\n" + " ldsh r1, [r1, r3]\n" + " mov r0, #0xd\n" + " mul r1, r1, r0\n" + " ldr r0, ._854 + 40\n" + " add r1, r1, r0\n" + " mov r0, r9\n" + " bl StringAppend\n" + " ldrb r1, [r7]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x1\n" + " add r8, r8, r0\n" + " mov r1, r8\n" + " ldrh r2, [r1]\n" + " ldr r3, ._854 + 24\n" + " add r1, r0, r3\n" + " ldrb r3, [r1]\n" + " ldr r1, ._854 + 28\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, sl\n" + " mov r1, r9\n" + " bl InitWindow\n" + " mov r0, sl\n" + " bl sub_8002F44\n" + "._853:\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._855:\n" + " .align 2, 0\n" + "._854:\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_03004370\n" + " .word gBattleTextBuff1\n" + " .word UnkDebug0+0x1ac\n" + " .word gUnknown_Debug_030043A8\n" + " .word UnkDebug0+0x1ae\n" + " .word UnkDebug0+0x1b0\n" + " .word gUnknown_Debug_03004360\n" + " .word gUnknown_02023A14+0xde\n" + " .word gMoveNames\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80123D8() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x1d\n" + " bhi ._856 @cond_branch\n" + " mov r0, #0x0\n" + " mov r1, #0x12\n" + " bl debug_sub_8010A7C\n" + " ldr r4, ._858\n" + " ldr r0, ._858 + 4\n" + " mov r8, r0\n" + " ldr r6, ._858 + 8\n" + " ldrh r1, [r6]\n" + " mov sl, r1\n" + " ldrb r7, [r6, #0x2]\n" + " ldrb r2, [r6, #0x4]\n" + " mov r9, r2\n" + " str r2, [sp]\n" + " add r0, r4, #0\n" + " mov r1, r8\n" + " mov r2, sl\n" + " add r3, r7, #0\n" + " bl InitWindow\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " lsl r5, r5, #0x1\n" + " ldr r1, ._858 + 12\n" + " ldrb r0, [r1]\n" + " mov r2, #0x46\n" + " mul r0, r0, r2\n" + " add r0, r5, r0\n" + " ldr r1, ._858 + 16\n" + " add r0, r0, r1\n" + " mov r2, #0x0\n" + " ldsh r1, [r0, r2]\n" + " lsl r0, r1, #0x3\n" + " sub r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._858 + 20\n" + " add r0, r0, r1\n" + " ldrb r0, [r0, #0x16]\n" + " mov r2, #0xd\n" + " add r1, r0, #0\n" + " mul r1, r1, r2\n" + " ldr r0, ._858 + 24\n" + " add r1, r1, r0\n" + " mov r0, r8\n" + " bl StringCopy\n" + " mov r1, r9\n" + " str r1, [sp]\n" + " add r0, r4, #0\n" + " mov r1, r8\n" + " mov r2, sl\n" + " add r3, r7, #0\n" + " bl InitWindow\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " mov r0, #0x0\n" + " mov r1, #0x12\n" + " bl debug_sub_8010A7C\n" + " ldrh r2, [r6, #0x6]\n" + " mov r9, r2\n" + " ldrb r0, [r6, #0x8]\n" + " mov sl, r0\n" + " ldrb r6, [r6, #0xa]\n" + " str r6, [sp]\n" + " add r0, r4, #0\n" + " mov r1, r8\n" + " mov r3, sl\n" + " bl InitWindow\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " ldr r1, ._858 + 12\n" + " ldrb r0, [r1]\n" + " mov r2, #0x46\n" + " mul r0, r0, r2\n" + " add r5, r5, r0\n" + " ldr r0, ._858 + 16\n" + " add r5, r5, r0\n" + " mov r2, #0x0\n" + " ldsh r1, [r5, r2]\n" + " lsl r0, r1, #0x3\n" + " sub r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._858 + 20\n" + " add r0, r0, r1\n" + " ldrb r0, [r0, #0x17]\n" + " mov r2, #0xd\n" + " add r1, r0, #0\n" + " mul r1, r1, r2\n" + " ldr r0, ._858 + 24\n" + " add r1, r1, r0\n" + " mov r0, r8\n" + " bl StringCopy\n" + " str r6, [sp]\n" + " add r0, r4, #0\n" + " mov r1, r8\n" + " mov r2, r9\n" + " mov r3, sl\n" + " bl InitWindow\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " b ._857\n" + "._859:\n" + " .align 2, 0\n" + "._858:\n" + " .word gUnknown_Debug_03004370\n" + " .word gBattleTextBuff1\n" + " .word UnkDebug0+0x1d4\n" + " .word gUnknown_Debug_03004360\n" + " .word gUnknown_02023A14+0x52\n" + " .word gBaseStats\n" + " .word gAbilityNames\n" + "._856:\n" + " ldr r6, ._860\n" + " ldr r1, ._860 + 4\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " ldr r5, ._860 + 8\n" + " ldr r4, ._860 + 12\n" + " ldrh r2, [r4]\n" + " ldrb r3, [r4, #0x2]\n" + " ldrb r0, [r4, #0x4]\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " add r1, r6, #0\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + " ldrh r2, [r4, #0x6]\n" + " ldrb r3, [r4, #0x8]\n" + " ldrb r0, [r4, #0xa]\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " add r1, r6, #0\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + "._857:\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._861:\n" + " .align 2, 0\n" + "._860:\n" + " .word gBattleTextBuff1\n" + " .word gAbilityNames\n" + " .word gUnknown_Debug_03004370\n" + " .word UnkDebug0+0x1d4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012540() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " ldr r5, ._862\n" + " ldr r0, ._862 + 4\n" + " add r0, r0, #0x44\n" + " mov r2, #0x0\n" + " ldsh r1, [r0, r2]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r4, ._862 + 8\n" + " ldr r1, ._862 + 12\n" + " mov r3, #0x9b\n" + " lsl r3, r3, #0x1\n" + " add r0, r1, r3\n" + " ldrh r2, [r0]\n" + " mov r6, #0x9c\n" + " lsl r6, r6, #0x1\n" + " add r0, r1, r6\n" + " ldrb r3, [r0]\n" + " add r6, r6, #0x2\n" + " add r0, r1, r6\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " add r0, r4, #0\n" + " add r1, r5, #0\n" + " bl InitWindow\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._863:\n" + " .align 2, 0\n" + "._862:\n" + " .word gBattleTextBuff1\n" + " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_03004370\n" + " .word UnkDebug0+0x6c\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_nullsub_3() +{ + asm( + " bx lr\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80125A0() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._864\n" + " ldr r3, ._864 + 4\n" + " ldr r2, ._864 + 8\n" + " ldr r0, ._864 + 12\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._864 + 16\n" + " ldrb r2, [r1]\n" + " mov r1, #0x8c\n" + " mul r1, r1, r2\n" + " add r0, r0, r1\n" + " add r0, r0, r3\n" + " ldr r0, [r0]\n" + " add r0, r0, r4\n" + " mov r1, #0x6d\n" + " strb r1, [r0]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._865:\n" + " .align 2, 0\n" + "._864:\n" + " .word +0x2000000\n" + " .word UnkDebug0+0x2c8\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_03004360\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80125E4() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._866\n" + " ldr r3, ._866 + 4\n" + " ldr r2, ._866 + 8\n" + " ldr r0, ._866 + 12\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._866 + 16\n" + " ldrb r2, [r1]\n" + " mov r1, #0x8c\n" + " mul r1, r1, r2\n" + " add r0, r0, r1\n" + " add r0, r0, r3\n" + " ldr r0, [r0]\n" + " add r0, r0, r4\n" + " mov r1, #0x81\n" + " strb r1, [r0]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._867:\n" + " .align 2, 0\n" + "._866:\n" + " .word +0x2000000\n" + " .word UnkDebug0+0x2c8\n" + " .word gUnknown_Debug_030043A0\n" + " .word gUnknown_Debug_030043A4\n" + " .word gUnknown_Debug_03004360\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012628() +{ + asm( + " ldr r3, ._868\n" + " ldr r2, ._868 + 4\n" + " ldr r0, ._868 + 8\n" + " ldrb r1, [r0]\n" + " lsl r1, r1, #0x2\n" + " ldr r0, ._868 + 12\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x4\n" + " add r1, r1, r0\n" + " add r1, r1, r2\n" + " ldr r0, [r1]\n" + " add r0, r0, r3\n" + " mov r1, #0x6d\n" + " strb r1, [r0]\n" + " bx lr\n" + "._869:\n" + " .align 2, 0\n" + "._868:\n" + " .word +0x2000000\n" + " .word UnkDebug0+0x3e0\n" + " .word gUnknown_Debug_030043A8\n" + " .word gUnknown_Debug_03004360\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012658() +{ + asm( + " ldr r3, ._870\n" + " ldr r2, ._870 + 4\n" + " ldr r0, ._870 + 8\n" + " ldrb r1, [r0]\n" + " lsl r1, r1, #0x2\n" + " ldr r0, ._870 + 12\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x4\n" + " add r1, r1, r0\n" + " add r1, r1, r2\n" + " ldr r0, [r1]\n" + " add r0, r0, r3\n" + " mov r1, #0x81\n" + " strb r1, [r0]\n" + " bx lr\n" + "._871:\n" + " .align 2, 0\n" + "._870:\n" + " .word +0x2000000\n" + " .word UnkDebug0+0x3e0\n" + " .word gUnknown_Debug_030043A8\n" + " .word gUnknown_Debug_03004360\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012688() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xfffffff4\n" + " mov r1, #0x0\n" + " mov r4, #0xcd\n" + " lsl r4, r4, #0x1\n" + " ldr r3, ._873\n" + " mov r2, #0x0\n" + "._872:\n" + " add r0, r1, r3\n" + " strb r2, [r0]\n" + " add r1, r1, #0x1\n" + " cmp r1, r4\n" + " ble ._872 @cond_branch\n" + " mov r0, #0x0\n" + " bl SetHBlankCallback\n" + " mov r0, #0x0\n" + " bl SetVBlankCallback\n" + " mov r5, #0x0\n" + " str r5, [sp, #0x8]\n" + " ldr r1, ._873 + 4\n" + " add r0, sp, #0x8\n" + " str r0, [r1]\n" + " mov r0, #0xc0\n" + " lsl r0, r0, #0x13\n" + " str r0, [r1, #0x4]\n" + " ldr r0, ._873 + 8\n" + " str r0, [r1, #0x8]\n" + " ldr r0, [r1, #0x8]\n" + " ldr r0, ._873 + 12\n" + " strh r5, [r0]\n" + " sub r0, r0, #0xc\n" + " strh r5, [r0]\n" + " add r0, r0, #0x4\n" + " strh r5, [r0]\n" + " sub r0, r0, #0x2\n" + " strh r5, [r0]\n" + " add r0, r0, #0x4\n" + " strh r5, [r0]\n" + " add r0, r0, #0x2\n" + " strh r5, [r0]\n" + " add r0, r0, #0x2\n" + " strh r5, [r0]\n" + " ldr r4, ._873 + 16\n" + " add r0, r4, #0\n" + " bl SetUpWindowConfig\n" + " bl ResetPaletteFade\n" + " ldr r0, ._873 + 20\n" + " strh r5, [r0]\n" + " ldr r1, ._873 + 24\n" + " mov r0, #0xa0\n" + " strh r0, [r1]\n" + " ldr r0, ._873 + 28\n" + " strh r5, [r0]\n" + " ldr r0, ._873 + 32\n" + " strh r5, [r0]\n" + " ldr r0, ._873 + 36\n" + " strh r5, [r0]\n" + " ldr r0, ._873 + 40\n" + " strh r5, [r0]\n" + " ldr r0, ._873 + 44\n" + " strh r5, [r0]\n" + " ldr r0, ._873 + 48\n" + " strh r5, [r0]\n" + " ldr r1, ._873 + 52\n" + " mov r0, #0x9\n" + " strb r0, [r1]\n" + " bl sub_800D6D4\n" + " bl sub_800DAB8\n" + " bl ResetSpriteData\n" + " bl ResetTasks\n" + " bl FreeAllSpritePalettes\n" + " ldr r1, ._873 + 56\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r6, ._873 + 60\n" + " mov r0, #0x1\n" + " strh r0, [r6]\n" + " ldr r0, ._873 + 64\n" + " add r1, r4, #0\n" + " bl InitWindowFromConfig\n" + " ldrh r2, [r6]\n" + " lsl r0, r2, #0x3\n" + " ldr r1, ._873 + 68\n" + " add r0, r0, r1\n" + " ldr r1, ._873 + 72\n" + " mov r8, r1\n" + " lsl r2, r2, #0x2\n" + " add r2, r2, r8\n" + " ldrb r1, [r2]\n" + " ldrb r2, [r2, #0x1]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x12\n" + " ldr r4, ._873 + 76\n" + " ldr r4, [r4, #0x4]\n" + " str r4, [sp]\n" + " ldrh r4, [r6]\n" + " str r4, [sp, #0x4]\n" + " bl DecompressPicFromTable_2\n" + " ldr r1, ._873 + 80\n" + " ldrh r0, [r6]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0x88\n" + " lsl r1, r1, #0x1\n" + " mov r2, #0x20\n" + " bl LoadCompressedPalette\n" + " ldrh r0, [r6]\n" + " mov r1, #0x1\n" + " bl GetMonSpriteTemplate_803C56C\n" + " ldr r0, ._873 + 84\n" + " ldrh r1, [r6]\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r8\n" + " ldrb r2, [r1, #0x1]\n" + " add r2, r2, #0x28\n" + " mov r1, #0xb0\n" + " mov r3, #0x28\n" + " bl CreateSprite\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r3, ._873 + 88\n" + " lsl r1, r4, #0x4\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x2\n" + " add r0, r3, #0\n" + " add r0, r0, #0x1c\n" + " add r0, r1, r0\n" + " ldr r2, ._873 + 92\n" + " str r2, [r0]\n" + " add r1, r1, r3\n" + " ldrb r2, [r1, #0x5]\n" + " mov r0, #0xf\n" + " and r0, r0, r2\n" + " mov r2, #0x10\n" + " orr r0, r0, r2\n" + " strb r0, [r1, #0x5]\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x13\n" + " mov r2, #0xfa\n" + " lsl r2, r2, #0x5\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, ._873 + 96\n" + " bl SetHBlankCallback\n" + " ldr r0, ._873 + 100\n" + " bl SetVBlankCallback\n" + " bl gScriptFuncs_End+0x14f4\n" + " ldr r0, ._873 + 104\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._873 + 108\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " strh r5, [r1, #0x8]\n" + " strh r4, [r1, #0xa]\n" + " ldr r0, ._873 + 112\n" + " bl SetMainCallback2\n" + " add sp, sp, #0xc\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._874:\n" + " .align 2, 0\n" + "._873:\n" + " .word gUnknown_02023A14+0x13e\n" + " .word 0x40000d4\n" + " .word 0x85006000\n" + " .word 0x400004c\n" + " .word gWindowConfig_81E6C58\n" + " .word gUnknown_030042A4\n" + " .word gUnknown_030042A0\n" + " .word gUnknown_030042C0\n" + " .word gUnknown_030041B4\n" + " .word gUnknown_03004288\n" + " .word gUnknown_03004280\n" + " .word gUnknown_030041B0\n" + " .word gUnknown_030041B8\n" + " .word gBattleTerrain\n" + " .word gReservedSpritePaletteCount\n" + " .word gCurrentMove\n" + " .word gUnknown_03004210\n" + " .word gMonFrontPicTable\n" + " .word gMonFrontPicCoords\n" + " .word gUnknown_081FAF4C\n" + " .word gMonPaletteTable\n" + " .word gUnknown_02024E8C\n" + " .word gSprites\n" + " .word nullsub_37+1\n" + " .word debug_nullsub_45+1\n" + " .word debug_sub_8011DD4+1\n" + " .word debug_sub_8012D10+1\n" + " .word gTasks\n" + " .word debug_sub_8012878+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012878() +{ + asm( + " push {lr}\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " ldr r0, ._876\n" + " bl sub_800374C\n" + " bl UpdatePaletteFade\n" + " bl RunTasks\n" + " ldr r0, ._876 + 4\n" + " ldrh r1, [r0, #0x2c]\n" + " mov r0, #0x82\n" + " lsl r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._875 @cond_branch\n" + " ldr r0, ._876 + 8\n" + " bl SetMainCallback2\n" + "._875:\n" + " pop {r0}\n" + " bx r0\n" + "._877:\n" + " .align 2, 0\n" + "._876:\n" + " .word gUnknown_03004210\n" + " .word gMain\n" + " .word debug_sub_80108B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80128B4() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x0\n" + " mov r1, #0x9\n" + " bl debug_sub_8010A7C\n" + " ldr r5, ._878\n" + " ldr r4, ._878 + 4\n" + " mov r0, #0x23\n" + " mov r8, r0\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " mov r2, #0x90\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + " ldr r6, ._878 + 8\n" + " ldrh r1, [r6]\n" + " add r0, r4, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0x0\n" + " strb r0, [r4, #0x3]\n" + " mov r0, #0xff\n" + " strb r0, [r4, #0x4]\n" + " ldrh r1, [r6]\n" + " mov r0, #0xb\n" + " mul r1, r1, r0\n" + " ldr r0, ._878 + 12\n" + " add r1, r1, r0\n" + " add r0, r4, #0\n" + " bl StringAppend\n" + " mov r0, r8\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " mov r2, #0x90\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + " add sp, sp, #0x4\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._879:\n" + " .align 2, 0\n" + "._878:\n" + " .word gUnknown_03004210\n" + " .word gBattleTextBuff1\n" + " .word gCurrentMove\n" + " .word gSpeciesNames\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012938() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, sl\n" + " mov r5, r9\n" + " mov r4, r8\n" + " push {r4, r5, r6}\n" + " add sp, sp, #0xfffffffc\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " mov r0, #0x0\n" + " mov r1, #0x7\n" + " bl debug_sub_8010A7C\n" + " ldr r6, ._880\n" + " ldr r4, ._880 + 4\n" + " mov r0, #0x25\n" + " mov r8, r0\n" + " str r0, [sp]\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " mov r2, #0xa2\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + " add r0, r6, #0\n" + " bl sub_8002F44\n" + " ldr r1, ._880 + 8\n" + " add r0, r4, #0\n" + " bl StringCopy\n" + " add r0, r4, #4\n" + " ldr r1, ._880 + 12\n" + " mov sl, r1\n" + " ldr r2, ._880 + 16\n" + " mov r9, r2\n" + " ldrh r1, [r2]\n" + " sub r1, r1, #0x1\n" + " add r1, r1, sl\n" + " ldrb r1, [r1]\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, r8\n" + " str r0, [sp]\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " mov r2, #0xa2\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + " add r0, r6, #0\n" + " bl sub_8002F44\n" + " ldr r2, ._880 + 20\n" + " ldr r1, ._880 + 24\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0xa\n" + " ldsh r0, [r0, r1]\n" + " lsl r1, r0, #0x4\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r2\n" + " mov r2, r9\n" + " ldrh r0, [r2]\n" + " sub r0, r0, #0x1\n" + " add r0, r0, sl\n" + " ldrb r0, [r0]\n" + " neg r0, r0\n" + " strh r0, [r1, #0x26]\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._881:\n" + " .align 2, 0\n" + "._880:\n" + " .word gUnknown_03004210\n" + " .word gBattleTextBuff1\n" + " .word UnkDebug0+0x400\n" + " .word gUnknown_02023A14+0x13e\n" + " .word gCurrentMove\n" + " .word gSprites\n" + " .word gTasks\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80129F8() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xfffffff8\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " ldr r6, ._882\n" + " ldrh r2, [r6]\n" + " lsl r0, r2, #0x3\n" + " ldr r1, ._882 + 4\n" + " add r0, r0, r1\n" + " ldr r1, ._882 + 8\n" + " mov r8, r1\n" + " lsl r2, r2, #0x2\n" + " add r2, r2, r8\n" + " ldrb r1, [r2]\n" + " ldrb r2, [r2, #0x1]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x12\n" + " ldr r4, ._882 + 12\n" + " ldr r4, [r4, #0x4]\n" + " str r4, [sp]\n" + " ldrh r4, [r6]\n" + " str r4, [sp, #0x4]\n" + " bl DecompressPicFromTable_2\n" + " ldr r1, ._882 + 16\n" + " ldrh r0, [r6]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0x88\n" + " lsl r1, r1, #0x1\n" + " mov r2, #0x20\n" + " bl LoadCompressedPalette\n" + " ldr r4, ._882 + 20\n" + " ldr r0, ._882 + 24\n" + " lsl r2, r5, #0x2\n" + " add r2, r2, r5\n" + " lsl r2, r2, #0x3\n" + " add r2, r2, r0\n" + " mov r1, #0xa\n" + " ldsh r0, [r2, r1]\n" + " lsl r1, r0, #0x4\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r4\n" + " ldrh r0, [r6]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r8\n" + " ldrb r0, [r0, #0x1]\n" + " add r0, r0, #0x28\n" + " strh r0, [r1, #0x22]\n" + " mov r1, #0xa\n" + " ldsh r0, [r2, r1]\n" + " lsl r1, r0, #0x4\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r4\n" + " ldr r3, ._882 + 28\n" + " ldrh r0, [r6]\n" + " sub r0, r0, #0x1\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " neg r0, r0\n" + " strh r0, [r1, #0x26]\n" + " mov r0, #0xa\n" + " ldsh r1, [r2, r0]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r4\n" + " mov r1, #0x0\n" + " bl StartSpriteAnim\n" + " add sp, sp, #0x8\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._883:\n" + " .align 2, 0\n" + "._882:\n" + " .word gCurrentMove\n" + " .word gMonFrontPicTable\n" + " .word gMonFrontPicCoords\n" + " .word gUnknown_081FAF4C\n" + " .word gMonPaletteTable\n" + " .word gSprites\n" + " .word gTasks\n" + " .word gUnknown_02023A14+0x13e\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012AC0() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r6, r1, #0x18\n" + " ldr r3, ._885\n" + " ldr r4, ._885 + 4\n" + " b ._884\n" + "._886:\n" + " .align 2, 0\n" + "._885:\n" + " .word gCurrentMove\n" + " .word gBaseStats\n" + "._890:\n" + " ldrb r0, [r1, #0x7]\n" + " cmp r0, #0x2\n" + " beq ._887 @cond_branch\n" + "._884:\n" + " add r2, r3, #0\n" + " lsl r0, r5, #0x18\n" + " asr r0, r0, #0x18\n" + " ldrh r1, [r2]\n" + " add r0, r0, r1\n" + " strh r0, [r2]\n" + " lsl r0, r0, #0x10\n" + " cmp r0, #0\n" + " bne ._888 @cond_branch\n" + " ldr r1, ._891\n" + " add r0, r1, #0\n" + " strh r0, [r2]\n" + "._888:\n" + " ldrh r1, [r2]\n" + " ldr r0, ._891\n" + " cmp r1, r0\n" + " bne ._889 @cond_branch\n" + " mov r0, #0x1\n" + " strh r0, [r2]\n" + "._889:\n" + " ldrh r0, [r3]\n" + " lsl r1, r0, #0x3\n" + " sub r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r4\n" + " ldrb r0, [r1, #0x6]\n" + " cmp r0, #0x2\n" + " bne ._890 @cond_branch\n" + "._887:\n" + " bl debug_sub_80128B4\n" + " add r0, r6, #0\n" + " bl debug_sub_8012938\n" + " add r0, r6, #0\n" + " bl debug_sub_80129F8\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._892:\n" + " .align 2, 0\n" + "._891:\n" + " .word 0x19b\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012B2C() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x11\n" + " ldr r1, ._893\n" + " add r2, r0, r1\n" + " mov r1, #0x1\n" + " strh r1, [r2]\n" + " ldr r1, ._893 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0x2\n" + " strh r1, [r0]\n" + " bx lr\n" + "._894:\n" + " .align 2, 0\n" + "._893:\n" + " .word 0x600c772\n" + " .word 0x600c7b2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012B4C() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x11\n" + " ldr r2, ._895\n" + " add r1, r0, r2\n" + " ldr r3, ._895 + 4\n" + " add r2, r3, #0\n" + " strh r2, [r1]\n" + " ldr r1, ._895 + 8\n" + " add r0, r0, r1\n" + " strh r2, [r0]\n" + " bx lr\n" + "._896:\n" + " .align 2, 0\n" + "._895:\n" + " .word 0x600c772\n" + " .word 0x1016\n" + " .word 0x600c7b2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012B70() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r6, r1, #0x18\n" + " cmp r6, #0\n" + " beq ._897 @cond_branch\n" + " mov r4, #0x1\n" + " str r4, [sp]\n" + " mov r0, #0x18\n" + " mov r1, #0x1c\n" + " mov r2, #0x1d\n" + " mov r3, #0x21\n" + " bl sub_802BBD4\n" + " bl debug_sub_80128B4\n" + " add r0, r5, #0\n" + " bl debug_sub_8012938\n" + " add r0, r5, #0\n" + " bl debug_sub_80129F8\n" + " ldr r1, ._899\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " strh r4, [r0, #0x8]\n" + " b ._898\n" + "._900:\n" + " .align 2, 0\n" + "._899:\n" + " .word gTasks\n" + "._897:\n" + " str r6, [sp]\n" + " mov r0, #0x18\n" + " mov r1, #0x1c\n" + " mov r2, #0x1d\n" + " mov r3, #0x21\n" + " bl sub_802BBD4\n" + " ldr r0, ._901\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " mov r0, #0x2\n" + " strh r0, [r4, #0x8]\n" + " ldr r5, ._901 + 4\n" + " ldr r1, ._901 + 8\n" + " mov r2, #0xa4\n" + " lsl r2, r2, #0x2\n" + " mov r0, #0x1d\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " mov r3, #0x1a\n" + " bl InitWindow\n" + " add r0, r5, #0\n" + " bl sub_8002F44\n" + " strh r6, [r4, #0xe]\n" + " mov r0, #0x0\n" + " bl debug_sub_8012B2C\n" + "._898:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._902:\n" + " .align 2, 0\n" + "._901:\n" + " .word gTasks\n" + " .word gUnknown_03004210\n" + " .word UnkDebug0+0x422\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012C08() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r1, #0\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " mov r0, #0x0\n" + " mov r1, #0x9\n" + " bl debug_sub_8010A7C\n" + " ldr r7, ._905\n" + " ldr r5, ._905 + 4\n" + " mov r0, #0x23\n" + " mov r8, r0\n" + " str r0, [sp]\n" + " add r0, r7, #0\n" + " add r1, r5, #0\n" + " mov r2, #0x90\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + " add r0, r7, #0\n" + " bl sub_8002F44\n" + " mov r0, #0x0\n" + " mov r1, #0x7\n" + " bl debug_sub_8010A7C\n" + " mov r0, #0x25\n" + " str r0, [sp]\n" + " add r0, r7, #0\n" + " add r1, r5, #0\n" + " mov r2, #0xa2\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + " add r0, r7, #0\n" + " bl sub_8002F44\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x18\n" + " mov r1, #0x1c\n" + " mov r2, #0x1d\n" + " mov r3, #0x21\n" + " bl sub_802BBD4\n" + " cmp r4, #0\n" + " beq ._903 @cond_branch\n" + " ldr r1, ._905 + 8\n" + " lsl r4, r6, #0x2\n" + " add r0, r4, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0x4\n" + " strh r1, [r0, #0x8]\n" + " ldr r1, ._905 + 12\n" + " mov r0, r8\n" + " str r0, [sp]\n" + " add r0, r7, #0\n" + " mov r2, #0x90\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + " b ._904\n" + "._906:\n" + " .align 2, 0\n" + "._905:\n" + " .word gUnknown_03004210\n" + " .word gBattleTextBuff1\n" + " .word gTasks\n" + " .word gUnknown_Debug_821F7F3\n" + "._903:\n" + " ldr r1, ._907\n" + " lsl r4, r6, #0x2\n" + " add r0, r4, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0x3\n" + " strh r1, [r0, #0x8]\n" + " ldr r1, ._907 + 4\n" + " mov r0, r8\n" + " str r0, [sp]\n" + " add r0, r7, #0\n" + " mov r2, #0x90\n" + " mov r3, #0x2\n" + " bl InitWindow\n" + "._904:\n" + " add r5, r4, #0\n" + " ldr r4, ._907 + 8\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " ldr r1, ._907 + 12\n" + " mov r2, #0xa4\n" + " lsl r2, r2, #0x2\n" + " mov r0, #0x1d\n" + " str r0, [sp]\n" + " add r0, r4, #0\n" + " mov r3, #0x1a\n" + " bl InitWindow\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " ldr r1, ._907\n" + " add r0, r5, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0x1\n" + " strh r1, [r0, #0xe]\n" + " mov r0, #0x1\n" + " bl debug_sub_8012B2C\n" + " add sp, sp, #0x4\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._908:\n" + " .align 2, 0\n" + "._907:\n" + " .word gTasks\n" + " .word UnkDebug0+0x432\n" + " .word gUnknown_03004210\n" + " .word gUnknown_08400D7A\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8012D10() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r1, ._911\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0x8\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x4\n" + " bls ._909 @cond_branch\n" + " b ._1067\n" + "._909:\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._911 + 4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._912:\n" + " .align 2, 0\n" + "._911:\n" + " .word gTasks\n" + " .word ._913\n" + "._913:\n" + " .word ._914\n" + " .word ._915\n" + " .word ._916\n" + " .word ._917\n" + " .word ._918\n" + "._914:\n" + " bl debug_sub_80128B4\n" + " add r0, r5, #0\n" + " bl debug_sub_8012938\n" + " ldr r4, ._920\n" + " ldr r1, ._920 + 4\n" + " mov r2, #0xc8\n" + " lsl r2, r2, #0x1\n" + " mov r0, #0x23\n" + " str r0, [sp]\n" + " add r0, r4, #0\n" + " mov r3, #0x13\n" + " bl InitWindow\n" + " add r0, r4, #0\n" + " bl sub_8002F44\n" + " ldr r1, ._920 + 8\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldrh r1, [r0, #0x8]\n" + " add r1, r1, #0x1\n" + " strh r1, [r0, #0x8]\n" + " ldrb r0, [r0, #0xc]\n" + " b ._919\n" + "._921:\n" + " .align 2, 0\n" + "._920:\n" + " .word gUnknown_03004210\n" + " .word UnkDebug0+0x405\n" + " .word gTasks\n" + "._915:\n" + " ldr r2, ._924\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._922 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._924 + 4\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xc]\n" + " bl nullsub_8\n" + " ldrh r1, [r4, #0xc]\n" + " mov r0, #0x3\n" + " neg r0, r0\n" + " and r0, r0, r1\n" + " b ._931\n" + "._925:\n" + " .align 2, 0\n" + "._924:\n" + " .word gMain\n" + " .word gTasks\n" + "._922:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._926 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._928\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xc]\n" + " bl nullsub_8\n" + " ldrh r1, [r4, #0xc]\n" + " mov r0, #0x2\n" + " b ._927\n" + "._929:\n" + " .align 2, 0\n" + "._928:\n" + " .word gTasks\n" + "._926:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._930 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._932\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xc]\n" + " bl nullsub_8\n" + " ldrh r1, [r4, #0xc]\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " and r0, r0, r1\n" + " b ._931\n" + "._933:\n" + " .align 2, 0\n" + "._932:\n" + " .word gTasks\n" + "._930:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._934 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._936\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xc]\n" + " bl nullsub_8\n" + " ldrh r1, [r4, #0xc]\n" + " mov r0, #0x1\n" + "._927:\n" + " orr r0, r0, r1\n" + "._931:\n" + " strh r0, [r4, #0xc]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + "._919:\n" + " mov r1, #0x0\n" + " bl sub_802E3E4\n" + " b ._1067\n" + "._937:\n" + " .align 2, 0\n" + "._936:\n" + " .word gTasks\n" + "._934:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r4, #0x1\n" + " add r0, r4, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._938 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._943\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r2, #0xc\n" + " ldsh r0, [r0, r2]\n" + " cmp r0, #0x1\n" + " beq ._939 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._940 @cond_branch\n" + " cmp r0, #0\n" + " beq ._941 @cond_branch\n" + " b ._1067\n" + "._944:\n" + " .align 2, 0\n" + "._943:\n" + " .word gTasks\n" + "._940:\n" + " cmp r0, #0x2\n" + " beq ._945 @cond_branch\n" + "._990:\n" + " cmp r0, #0x3\n" + " bne ._946 @cond_branch\n" + " b ._1014\n" + "._946:\n" + " b ._1067\n" + "._941:\n" + " ldr r1, ._952\n" + " ldr r0, ._952 + 4\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x1\n" + " add r1, r0, r1\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x3f\n" + " bls ._949 @cond_branch\n" + " b ._1067\n" + "._949:\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._1019\n" + "._953:\n" + " .align 2, 0\n" + "._952:\n" + " .word gUnknown_02023A14+0x13e\n" + " .word gCurrentMove\n" + "._939:\n" + " mov r0, #0x1\n" + " b ._997\n" + "._945:\n" + " ldr r1, ._957\n" + " ldrh r2, [r1]\n" + " mov r0, #0xcd\n" + " lsl r0, r0, #0x1\n" + " cmp r2, r0\n" + " bhi ._955 @cond_branch\n" + " add r0, r2, #1\n" + "._979:\n" + " strh r0, [r1]\n" + " b ._1025\n" + "._958:\n" + " .align 2, 0\n" + "._957:\n" + " .word gCurrentMove\n" + "._955:\n" + " strh r4, [r1]\n" + " b ._1025\n" + "._938:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._960 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._966\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0xc\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x1\n" + " bne ._961 @cond_branch\n" + " b ._1007\n" + "._961:\n" + " cmp r0, #0x1\n" + " bgt ._963 @cond_branch\n" + " cmp r0, #0\n" + " beq ._964 @cond_branch\n" + " b ._1067\n" + "._967:\n" + " .align 2, 0\n" + "._966:\n" + " .word gTasks\n" + "._963:\n" + " cmp r0, #0x2\n" + " beq ._968 @cond_branch\n" + " b ._990\n" + "._964:\n" + " ldr r1, ._973\n" + " ldr r0, ._973 + 4\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x1\n" + " add r1, r0, r1\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._970 @cond_branch\n" + " b ._1067\n" + "._970:\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._1019\n" + "._974:\n" + " .align 2, 0\n" + "._973:\n" + " .word gUnknown_02023A14+0x13e\n" + " .word gCurrentMove\n" + "._968:\n" + " ldr r1, ._977\n" + " ldrh r0, [r1]\n" + " cmp r0, #0x1\n" + " bls ._975 @cond_branch\n" + " sub r0, r0, #0x1\n" + " b ._979\n" + "._978:\n" + " .align 2, 0\n" + "._977:\n" + " .word gCurrentMove\n" + "._975:\n" + " ldr r2, ._980\n" + " add r0, r2, #0\n" + " b ._979\n" + "._981:\n" + " .align 2, 0\n" + "._980:\n" + " .word 0x19b\n" + "._960:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._982 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._987\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0xc\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x1\n" + " beq ._983 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._984 @cond_branch\n" + " cmp r0, #0\n" + " beq ._985 @cond_branch\n" + " b ._1067\n" + "._988:\n" + " .align 2, 0\n" + "._987:\n" + " .word gTasks\n" + "._984:\n" + " cmp r0, #0x2\n" + " beq ._989 @cond_branch\n" + " b ._990\n" + "._985:\n" + " ldr r3, ._995\n" + " ldr r2, ._995 + 4\n" + " ldrh r0, [r2]\n" + " sub r0, r0, #0x1\n" + " add r1, r0, r3\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x3f\n" + " bls ._991 @cond_branch\n" + " b ._1067\n" + "._991:\n" + " add r0, r0, #0x8\n" + " strb r0, [r1]\n" + " ldrh r0, [r2]\n" + " sub r0, r0, #0x1\n" + " add r1, r0, r3\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x40\n" + " bls ._1019 @cond_branch\n" + " mov r0, #0x40\n" + " strb r0, [r1]\n" + " b ._1019\n" + "._996:\n" + " .align 2, 0\n" + "._995:\n" + " .word gUnknown_02023A14+0x13e\n" + " .word gCurrentMove\n" + "._983:\n" + " mov r0, #0x1\n" + " b ._997\n" + "._989:\n" + " ldr r3, ._1000\n" + " ldrh r2, [r3]\n" + " add r1, r2, #0\n" + " add r1, r1, #0xa\n" + " ldr r0, ._1000 + 4\n" + " cmp r1, r0\n" + " bgt ._998 @cond_branch\n" + " strh r1, [r3]\n" + " b ._1025\n" + "._1001:\n" + " .align 2, 0\n" + "._1000:\n" + " .word gCurrentMove\n" + " .word 0x19b\n" + "._998:\n" + " ldr r1, ._1003\n" + " add r0, r2, r1\n" + " strh r0, [r3]\n" + " b ._1025\n" + "._1004:\n" + " .align 2, 0\n" + "._1003:\n" + " .word 0xfffffe70\n" + "._982:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._1005 @cond_branch\n" + " b ._1067\n" + "._1005:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._1011\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r2, #0xc\n" + " ldsh r3, [r0, r2]\n" + " cmp r3, #0x1\n" + " beq ._1007 @cond_branch\n" + " cmp r3, #0x1\n" + " bgt ._1008 @cond_branch\n" + " cmp r3, #0\n" + " beq ._1009 @cond_branch\n" + " b ._1067\n" + "._1012:\n" + " .align 2, 0\n" + "._1011:\n" + " .word gTasks\n" + "._1008:\n" + " cmp r3, #0x2\n" + " beq ._1013 @cond_branch\n" + " cmp r3, #0x3\n" + " beq ._1014 @cond_branch\n" + " b ._1067\n" + "._1009:\n" + " ldr r1, ._1020\n" + " ldr r0, ._1020 + 4\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x1\n" + " add r2, r0, r1\n" + " ldrb r0, [r2]\n" + " add r1, r0, #0\n" + " cmp r1, #0\n" + " bne ._1016 @cond_branch\n" + " b ._1067\n" + "._1016:\n" + " cmp r1, #0x8\n" + " bls ._1018 @cond_branch\n" + " sub r0, r0, #0x8\n" + " strb r0, [r2]\n" + " b ._1019\n" + "._1021:\n" + " .align 2, 0\n" + "._1020:\n" + " .word gUnknown_02023A14+0x13e\n" + " .word gCurrentMove\n" + "._1018:\n" + " strb r3, [r2]\n" + "._1019:\n" + " add r0, r5, #0\n" + " bl debug_sub_8012938\n" + " b ._1067\n" + "._1007:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + "._997:\n" + " add r1, r5, #0\n" + " bl debug_sub_8012AC0\n" + " b ._1067\n" + "._1013:\n" + " ldr r2, ._1026\n" + " ldrh r0, [r2]\n" + " add r1, r0, #0\n" + " sub r1, r1, #0xa\n" + " cmp r1, #0x1\n" + " ble ._1024 @cond_branch\n" + " strh r1, [r2]\n" + " b ._1025\n" + "._1027:\n" + " .align 2, 0\n" + "._1026:\n" + " .word gCurrentMove\n" + "._1024:\n" + " mov r1, #0xc8\n" + " lsl r1, r1, #0x1\n" + " add r0, r0, r1\n" + " strh r0, [r2]\n" + "._1025:\n" + " bl debug_sub_80128B4\n" + " add r0, r5, #0\n" + " bl debug_sub_8012938\n" + " add r0, r5, #0\n" + " bl debug_sub_80129F8\n" + " b ._1067\n" + "._1014:\n" + " add r0, r5, #0\n" + " mov r1, #0x0\n" + " bl debug_sub_8012B70\n" + " b ._1067\n" + "._916:\n" + " ldr r0, ._1032\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1030 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._1032 + 4\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xe]\n" + " bl debug_sub_8012B4C\n" + " mov r0, #0x0\n" + " b ._1055\n" + "._1033:\n" + " .align 2, 0\n" + "._1032:\n" + " .word gMain\n" + " .word gTasks\n" + "._1030:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._1046 @cond_branch\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1035 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._1037\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldrb r1, [r1, #0xe]\n" + " add r0, r5, #0\n" + " bl debug_sub_8012C08\n" + " b ._1067\n" + "._1038:\n" + " .align 2, 0\n" + "._1037:\n" + " .word gTasks\n" + "._1035:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._1039 @cond_branch\n" + " b ._1067\n" + "._1039:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " b ._1063\n" + "._917:\n" + " ldr r0, ._1044\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1042 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._1044 + 4\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xe]\n" + " bl debug_sub_8012B4C\n" + " mov r0, #0x0\n" + " b ._1055\n" + "._1045:\n" + " .align 2, 0\n" + "._1044:\n" + " .word gMain\n" + " .word gTasks\n" + "._1042:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._1046 @cond_branch\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1047 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._1050\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " mov r2, #0xe\n" + " ldsh r0, [r1, r2]\n" + " cmp r0, #0\n" + " bne ._1063 @cond_branch\n" + " ldr r1, ._1050 + 4\n" + " ldr r2, ._1050 + 8\n" + " mov r0, #0x1f\n" + " bl debug_sub_80132C8\n" + " b ._1063\n" + "._1051:\n" + " .align 2, 0\n" + "._1050:\n" + " .word gTasks\n" + " .word gUnknown_02023A14+0x13e\n" + " .word 0x19b\n" + "._1047:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1067 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " b ._1063\n" + "._918:\n" + " ldr r0, ._1056\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1054 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._1056 + 4\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xe]\n" + " bl debug_sub_8012B4C\n" + " mov r0, #0x0\n" + " b ._1055\n" + "._1057:\n" + " .align 2, 0\n" + "._1056:\n" + " .word gMain\n" + " .word gTasks\n" + "._1054:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1058 @cond_branch\n" + "._1046:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._1060\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " ldrb r0, [r4, #0xe]\n" + " bl debug_sub_8012B4C\n" + " mov r0, #0x1\n" + "._1055:\n" + " strh r0, [r4, #0xe]\n" + " bl debug_sub_8012B2C\n" + " b ._1067\n" + "._1061:\n" + " .align 2, 0\n" + "._1060:\n" + " .word gTasks\n" + "._1058:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1062 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._1065\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " mov r2, #0xe\n" + " ldsh r0, [r1, r2]\n" + " cmp r0, #0\n" + " bne ._1063 @cond_branch\n" + " ldr r1, ._1065 + 4\n" + " ldr r2, ._1065 + 8\n" + " mov r0, #0x1f\n" + " bl debug_sub_8013294\n" + "._1063:\n" + " add r0, r5, #0\n" + " mov r1, #0x1\n" + " bl debug_sub_8012B70\n" + " b ._1067\n" + "._1066:\n" + " .align 2, 0\n" + "._1065:\n" + " .word gTasks\n" + " .word gUnknown_02023A14+0x13e\n" + " .word 0x19b\n" + "._1062:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1067 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " add r0, r5, #0\n" + " mov r1, #0x1\n" + " bl debug_sub_8012B70\n" + "._1067:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8013240() +{ + asm( + " push {lr}\n" + " bl gScriptFuncs_End+0x2fec\n" + " lsl r0, r0, #0x10\n" + " cmp r0, #0\n" + " beq ._1068 @cond_branch\n" + " mov r0, #0x1\n" + " b ._1069\n" + "._1068:\n" + " mov r0, #0x0\n" + "._1069:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8013258() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r1, #0\n" + " add r5, r2, #0\n" + " b ._1070\n" + "._1072:\n" + " ldr r0, ._1074\n" + " add r5, r5, r0\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x5\n" + " add r6, r6, r0\n" + " add r0, r4, #1\n" + "._1070:\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl gScriptFuncs_End+0x2f60\n" + " cmp r0, #0\n" + " bne ._1071 @cond_branch\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x5\n" + " cmp r5, r0\n" + " bhi ._1072 @cond_branch\n" + " mov r0, #0x1\n" + " b ._1073\n" + "._1075:\n" + " .align 2, 0\n" + "._1074:\n" + " .word 0xfffff000\n" + "._1071:\n" + " mov r0, #0x0\n" + "._1073:\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8013294() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r5, r1, #0\n" + " add r6, r2, #0\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " bl debug_sub_8013240\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._1076 @cond_branch\n" + " bl gScriptFuncs_End+0x19f4\n" + " add r0, r4, #0\n" + " add r1, r5, #0\n" + " add r2, r6, #0\n" + " bl debug_sub_8013258\n" + " add r4, r0, #0\n" + " bl gScriptFuncs_End+0x1a70\n" + " add r0, r4, #0\n" + " b ._1077\n" + "._1076:\n" + " mov r0, #0x0\n" + "._1077:\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80132C8() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r5, r1, #0\n" + " add r6, r2, #0\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " bl debug_sub_8013240\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._1078 @cond_branch\n" + " add r0, r4, #0\n" + " mov r1, #0x0\n" + " add r2, r5, #0\n" + " add r3, r6, #0\n" + " bl gScriptFuncs_End+0x2d64\n" + "._1078:\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} +#endif + void oac_poke_opponent(struct Sprite *sprite) { sprite->callback = sub_8010278; @@ -1554,6 +8880,269 @@ void sub_8010800(void) gBattleMainFunc = bc_8012FAC; } +#if DEBUG +__attribute__((naked)) +void debug_sub_80138CC() +{ + asm( + " push {lr}\n" + " ldr r0, ._1167\n" + " ldrb r0, [r0]\n" + " bl GetBankSide\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._1163 @cond_branch\n" + " b ._1186\n" + "._1163:\n" + " ldr r1, ._1167 + 4\n" + " ldr r2, ._1167 + 8\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " add r2, r1, #0\n" + " cmp r0, #0x4\n" + " bls ._1165 @cond_branch\n" + " b ._1186\n" + "._1165:\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._1167 + 12\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._1168:\n" + " .align 2, 0\n" + "._1167:\n" + " .word gActiveBank\n" + " .word +0x2000000\n" + " .word 0x160fd\n" + " .word ._1169\n" + "._1169:\n" + " .word ._1170\n" + " .word ._1171\n" + " .word ._1172\n" + " .word ._1173\n" + " .word ._1174\n" + "._1170:\n" + " ldr r1, ._1177\n" + " ldr r0, ._1177 + 4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r1, [r0]\n" + " ldr r0, ._1177 + 8\n" + " cmp r1, r0\n" + " bne ._1186 @cond_branch\n" + " ldr r0, ._1177 + 12\n" + " add r1, r2, r0\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " b ._1187\n" + "._1178:\n" + " .align 2, 0\n" + "._1177:\n" + " .word gBattleBankFunc\n" + " .word gActiveBank\n" + " .word sub_802C098+1\n" + " .word 0x160fd\n" + "._1171:\n" + " ldr r1, ._1180\n" + " mov r0, #0x1\n" + " strh r0, [r1, #0x2c]\n" + " strh r0, [r1, #0x2e]\n" + " ldr r0, ._1180 + 4\n" + " add r1, r2, r0\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r0, ._1180 + 8\n" + " add r1, r2, r0\n" + " mov r0, #0x80\n" + " b ._1187\n" + "._1181:\n" + " .align 2, 0\n" + "._1180:\n" + " .word gMain\n" + " .word 0x160fd\n" + " .word 0x160fe\n" + "._1172:\n" + " ldr r0, ._1184\n" + " add r3, r2, r0\n" + " ldrb r0, [r3]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r3]\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._1186 @cond_branch\n" + " ldr r1, ._1184 + 4\n" + " mov r0, #0x1\n" + " strh r0, [r1, #0x2c]\n" + " strh r0, [r1, #0x2e]\n" + " ldr r0, ._1184 + 8\n" + " add r1, r2, r0\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x80\n" + " strb r0, [r3]\n" + " b ._1186\n" + "._1185:\n" + " .align 2, 0\n" + "._1184:\n" + " .word 0x160fe\n" + " .word gMain\n" + " .word 0x160fd\n" + "._1173:\n" + " ldr r0, ._1188\n" + " add r1, r2, r0\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._1186 @cond_branch\n" + " ldr r1, ._1188 + 4\n" + " mov r0, #0x1\n" + " strh r0, [r1, #0x2c]\n" + " strh r0, [r1, #0x2e]\n" + " ldr r0, ._1188 + 8\n" + " add r1, r2, r0\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " b ._1187\n" + "._1189:\n" + " .align 2, 0\n" + "._1188:\n" + " .word 0x160fe\n" + " .word gMain\n" + " .word 0x160fd\n" + "._1174:\n" + " ldr r0, ._1190\n" + " add r1, r2, r0\n" + " mov r0, #0x0\n" + "._1187:\n" + " strb r0, [r1]\n" + "._1186:\n" + " pop {r0}\n" + " bx r0\n" + "._1191:\n" + " .align 2, 0\n" + "._1190:\n" + " .word 0x160fd\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80139E4() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r0, ._1198\n" + " ldrb r1, [r0]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0\n" + " beq ._1192 @cond_branch\n" + " ldr r2, ._1198 + 4\n" + " mov r0, #0x0\n" + " strb r0, [r2]\n" + " ldr r1, ._1198 + 8\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._1193 @cond_branch\n" + " add r4, r2, #0\n" + " add r5, r1, #0\n" + "._1194:\n" + " bl debug_sub_80138CC\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " strb r0, [r4]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldrb r1, [r5]\n" + " cmp r0, r1\n" + " bcc ._1194 @cond_branch\n" + "._1193:\n" + " ldr r0, ._1198 + 12\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " ldr r1, ._1198 + 4\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " ldr r0, ._1198 + 8\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._1200 @cond_branch\n" + " ldr r5, ._1198 + 16\n" + " add r4, r1, #0\n" + "._1196:\n" + " ldrb r0, [r4]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r5\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " strb r0, [r4]\n" + " ldr r1, ._1198 + 8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldrb r1, [r1]\n" + " cmp r0, r1\n" + " bcc ._1196 @cond_branch\n" + " b ._1200\n" + "._1199:\n" + " .align 2, 0\n" + "._1198:\n" + " .word gUnknown_02023A14+0x50\n" + " .word gActiveBank\n" + " .word gNoOfAllBanks\n" + " .word gBattleMainFunc\n" + " .word gBattleBankFunc\n" + "._1192:\n" + " ldr r0, ._1202\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " ldr r1, ._1202 + 4\n" + " strb r4, [r1]\n" + " ldr r0, ._1202 + 8\n" + " ldrb r0, [r0]\n" + " cmp r4, r0\n" + " bcs ._1200 @cond_branch\n" + " ldr r5, ._1202 + 12\n" + " add r4, r1, #0\n" + "._1201:\n" + " ldrb r0, [r4]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r5\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " strb r0, [r4]\n" + " ldr r1, ._1202 + 8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldrb r1, [r1]\n" + " cmp r0, r1\n" + " bcc ._1201 @cond_branch\n" + "._1200:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._1203:\n" + " .align 2, 0\n" + "._1202:\n" + " .word gBattleMainFunc\n" + " .word gActiveBank\n" + " .word gNoOfAllBanks\n" + " .word gBattleBankFunc\n" + "\n" + ); +} +#endif + void sub_8010824(void) { gBattleMainFunc(); @@ -1562,6 +9151,380 @@ void sub_8010824(void) gBattleBankFunc[gActiveBank](); } +#if DEBUG +__attribute__((naked)) +void sub_8010874() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " mov r0, #0x0\n" + " bl TurnValuesCleanUp\n" + " bl SpecialStatusesClear\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " ldr r0, ._1215\n" + " mov sl, r0\n" + " ldr r1, ._1215 + 4\n" + " mov r9, r1\n" + " ldr r4, ._1215 + 8\n" + " mov r8, r4\n" + " ldr r0, ._1215 + 12\n" + " mov ip, r0\n" + " ldr r4, ._1215 + 16\n" + " mov r5, #0x0\n" + " ldr r7, ._1215 + 20\n" + " ldr r6, ._1215 + 24\n" + "._1205:\n" + " ldr r0, ._1215 + 28\n" + " add r0, r5, r0\n" + " str r3, [r0]\n" + " mov r1, #0x0\n" + "._1204:\n" + " add r0, r4, r1\n" + " strb r3, [r0]\n" + " add r1, r1, #0x1\n" + " cmp r1, #0x1b\n" + " bls ._1204 @cond_branch\n" + " mov r0, #0x2\n" + " strb r0, [r4, #0x16]\n" + " ldr r1, ._1215 + 32\n" + " add r0, r2, r1\n" + " strb r3, [r0]\n" + " mov r0, ip\n" + " strh r3, [r0]\n" + " mov r1, r8\n" + " strh r3, [r1]\n" + " mov r0, r9\n" + " strh r3, [r0]\n" + " mov r1, sl\n" + " strh r3, [r1]\n" + " ldr r0, ._1215 + 36\n" + " add r1, r2, r0\n" + " mov r0, #0xff\n" + " strb r0, [r1]\n" + " strh r3, [r6]\n" + " strh r3, [r7]\n" + " ldr r1, ._1215 + 40\n" + " add r0, r5, r1\n" + " str r3, [r0]\n" + " mov r0, #0x2\n" + " add sl, sl, r0\n" + " add r9, r9, r0\n" + " add r8, r8, r0\n" + " add ip, ip, r0\n" + " add r4, r4, #0x1c\n" + " add r5, r5, #0x4\n" + " add r7, r7, #0x2\n" + " add r6, r6, #0x2\n" + " add r2, r2, #0x1\n" + " cmp r2, #0x3\n" + " ble ._1205 @cond_branch\n" + " mov r5, #0x0\n" + " ldr r3, ._1215 + 44\n" + " ldr r4, ._1215 + 48\n" + " mov r2, #0x1\n" + "._1207:\n" + " strh r5, [r4]\n" + " mov r1, #0x0\n" + "._1206:\n" + " add r0, r3, r1\n" + " strb r5, [r0]\n" + " add r1, r1, #0x1\n" + " cmp r1, #0xb\n" + " bls ._1206 @cond_branch\n" + " add r3, r3, #0xc\n" + " add r4, r4, #0x2\n" + " sub r2, r2, #0x1\n" + " cmp r2, #0\n" + " bge ._1207 @cond_branch\n" + " mov r1, #0x0\n" + " ldr r2, ._1215 + 52\n" + " strb r1, [r2]\n" + " ldr r3, ._1215 + 56\n" + " strb r1, [r3]\n" + " ldr r4, ._1215 + 60\n" + " strh r1, [r4]\n" + " ldr r1, ._1215 + 64\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + "._1208:\n" + " add r0, r1, r2\n" + " strb r3, [r0]\n" + " add r2, r2, #0x1\n" + " cmp r2, #0x2b\n" + " bls ._1208 @cond_branch\n" + " mov r0, #0x0\n" + " ldr r1, ._1215 + 68\n" + " str r0, [r1]\n" + " ldr r2, ._1215 + 72\n" + " ldrh r1, [r2]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._1210 @cond_branch\n" + " ldr r3, ._1215 + 76\n" + " ldrb r1, [r3, #0x15]\n" + " mov r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._1210 @cond_branch\n" + " mov r0, #0x80\n" + " ldr r4, ._1215 + 68\n" + " str r0, [r4]\n" + "._1210:\n" + " ldr r1, ._1215 + 76\n" + " ldrb r0, [r1, #0x15]\n" + " lsl r0, r0, #0x1e\n" + " lsr r0, r0, #0x1f\n" + " ldr r3, ._1215 + 80\n" + " ldr r4, ._1215 + 84\n" + " add r2, r3, r4\n" + " mov r1, #0x0\n" + " strb r0, [r2]\n" + " ldr r0, ._1215 + 88\n" + " strb r1, [r0]\n" + " ldr r2, ._1215 + 92\n" + " strb r1, [r2]\n" + " ldr r3, ._1215 + 96\n" + " str r1, [r3]\n" + " mov r2, #0x0\n" + " ldr r4, ._1215 + 100\n" + " strh r1, [r4]\n" + " ldr r1, ._1215 + 80\n" + " ldr r3, ._1215 + 104\n" + " add r0, r1, r3\n" + " strb r2, [r0]\n" + " ldr r4, ._1215 + 108\n" + " add r0, r1, r4\n" + " strb r2, [r0]\n" + " ldr r1, ._1215 + 112\n" + " mov r2, #0x0\n" + " add r0, r1, #7\n" + "._1211:\n" + " strb r2, [r0]\n" + " sub r0, r0, #0x1\n" + " cmp r0, r1\n" + " bge ._1211 @cond_branch\n" + " mov r5, #0x0\n" + " ldr r0, ._1215 + 116\n" + " strh r5, [r0]\n" + " mov r0, #0x0\n" + " ldr r1, ._1215 + 120\n" + " str r0, [r1]\n" + " ldr r2, ._1215 + 124\n" + " strh r0, [r2]\n" + " ldr r4, ._1215 + 80\n" + " ldr r3, ._1215 + 128\n" + " add r0, r4, r3\n" + " strb r5, [r0]\n" + " ldr r1, ._1215 + 132\n" + " add r0, r4, r1\n" + " strb r5, [r0]\n" + " ldr r2, ._1215 + 136\n" + " strb r5, [r2]\n" + " ldr r3, ._1215 + 140\n" + " strb r5, [r3]\n" + " sub r1, r1, #0x29\n" + " add r0, r4, r1\n" + " strb r5, [r0]\n" + " ldr r2, ._1215 + 144\n" + " add r0, r4, r2\n" + " strb r5, [r0]\n" + " ldr r3, ._1215 + 148\n" + " add r0, r4, r3\n" + " strb r5, [r0]\n" + " ldr r0, ._1215 + 152\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " ldr r2, ._1215 + 156\n" + " lsl r1, r0, #0x3\n" + " sub r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r2\n" + " ldrb r1, [r1, #0x8]\n" + " mov r0, #0x64\n" + " mul r0, r0, r1\n" + " ldr r1, ._1215 + 160\n" + " bl gScriptFuncs_End+0x3d30\n" + " ldr r2, ._1215 + 164\n" + " add r1, r4, r2\n" + " strb r0, [r1]\n" + " ldr r3, ._1215 + 168\n" + " add r1, r4, r3\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + " ldr r1, ._1215 + 172\n" + " add r0, r4, r1\n" + " strb r5, [r0]\n" + " sub r2, r2, #0x33\n" + " add r1, r4, r2\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " mov r2, #0x0\n" + " mov r1, #0x0\n" + "._1212:\n" + " ldr r3, ._1215 + 176\n" + " add r0, r2, r3\n" + " add r0, r0, r4\n" + " strb r1, [r0]\n" + " add r3, r3, #0x20\n" + " add r0, r2, r3\n" + " add r0, r0, r4\n" + " strb r1, [r0]\n" + " add r3, r3, #0x1c\n" + " add r0, r2, r3\n" + " add r0, r0, r4\n" + " strb r1, [r0]\n" + " add r3, r3, #0x8\n" + " add r0, r2, r3\n" + " add r0, r0, r4\n" + " strb r1, [r0]\n" + " add r3, r3, #0x10\n" + " add r0, r2, r3\n" + " add r0, r0, r4\n" + " strb r1, [r0]\n" + " add r3, r3, #0x8\n" + " add r0, r2, r3\n" + " add r0, r0, r4\n" + " strb r1, [r0]\n" + " add r2, r2, #0x1\n" + " cmp r2, #0x7\n" + " ble ._1212 @cond_branch\n" + " ldr r4, ._1215 + 80\n" + " ldr r1, ._1215 + 180\n" + " add r0, r4, r1\n" + " mov r2, #0x0\n" + " mov r1, #0x6\n" + " strb r1, [r0]\n" + " sub r3, r3, #0x3f\n" + " add r0, r4, r3\n" + " strb r1, [r0]\n" + " ldr r1, ._1215 + 184\n" + " add r0, r4, r1\n" + " strb r2, [r0]\n" + " ldr r3, ._1215 + 188\n" + " mov r1, #0x0\n" + " mov r2, #0xa\n" + " add r0, r3, #0\n" + " add r0, r0, #0x40\n" + "._1213:\n" + " strb r1, [r0]\n" + " sub r0, r0, #0x1\n" + " sub r2, r2, #0x1\n" + " cmp r2, #0\n" + " bge ._1213 @cond_branch\n" + " mov r1, #0x0\n" + " strb r1, [r3, #0x13]\n" + " strb r1, [r3]\n" + " strb r1, [r3, #0x1]\n" + " strb r1, [r3, #0x2]\n" + " strb r1, [r3, #0x3]\n" + " strb r1, [r3, #0x4]\n" + " ldrb r2, [r3, #0x5]\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " mov r2, #0x3\n" + " neg r2, r2\n" + " and r0, r0, r2\n" + " strb r0, [r3, #0x5]\n" + " strh r1, [r3, #0x20]\n" + " strh r1, [r3, #0x22]\n" + " strh r1, [r3, #0x24]\n" + " strh r1, [r3, #0x6]\n" + " strh r1, [r3, #0x26]\n" + " strh r1, [r3, #0x28]\n" + " mov r2, #0x0\n" + " add r5, r3, #0\n" + " add r5, r5, #0x8\n" + " mov r4, #0x0\n" + " add r1, r3, #0\n" + " add r1, r1, #0x14\n" + "._1214:\n" + " add r0, r2, r5\n" + " strb r4, [r0]\n" + " strb r4, [r1]\n" + " strb r4, [r1, #0x16]\n" + " add r1, r1, #0x1\n" + " add r2, r2, #0x1\n" + " cmp r2, #0x9\n" + " ble ._1214 @cond_branch\n" + " ldr r2, ._1215 + 80\n" + " ldr r3, ._1215 + 192\n" + " add r0, r2, r3\n" + " mov r1, #0x0\n" + " strb r1, [r0]\n" + " ldr r4, ._1215 + 196\n" + " add r0, r2, r4\n" + " strb r1, [r0]\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._1216:\n" + " .align 2, 0\n" + "._1215:\n" + " .word gUnknown_02024C4C\n" + " .word gUnknown_02024C44\n" + " .word gMoveHitWith\n" + " .word gLastUsedMove\n" + " .word gDisableStructs\n" + " .word gUnknown_02024C2C\n" + " .word gLockedMove\n" + " .word gStatuses3\n" + " .word gUnknown_02024C70\n" + " .word gUnknown_02024C5C\n" + " .word +0x2017100\n" + " .word gSideTimer\n" + " .word gSideAffecting\n" + " .word gBankAttacker\n" + " .word gBankTarget\n" + " .word gBattleWeather\n" + " .word gWishFutureKnock\n" + " .word gHitMarker\n" + " .word gBattleTypeFlags\n" + " .word gSaveBlock2\n" + " .word +0x2000000\n" + " .word 0x16084\n" + " .word gMultiHitCounter\n" + " .word gBattleOutcome\n" + " .word gBattleExecBuffer\n" + " .word gPaydayMoney\n" + " .word 0x17130\n" + " .word 0x17160\n" + " .word gBattleCommunication\n" + " .word gPauseCounterBattle\n" + " .word gBattleMoveDamage\n" + " .word gUnknown_02024DE8\n" + " .word 0x16002\n" + " .word 0x160a1\n" + " .word gLeveledUpInBattle\n" + " .word gAbsentBankFlags\n" + " .word 0x16086\n" + " .word 0x16087\n" + " .word gEnemyParty\n" + " .word gBaseStats\n" + " .word 0x4fb\n" + " .word 0x16089\n" + " .word 0x16088\n" + " .word 0x1601b\n" + " .word 0x160ac\n" + " .word 0x160c8\n" + " .word 0x16113\n" + " .word gBattleResults\n" + " .word 0x1609e\n" + " .word 0x1609f\n" + "\n" + ); +} +#else void sub_8010874(void) { s32 i; @@ -1663,6 +9626,7 @@ void sub_8010874(void) gBattleResults.caughtNick[i] = 0; } } +#endif void SwitchInClearStructs(void) { diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 977e91f5c..613f2ebe0 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -289,6 +289,214 @@ void BattleAI_HandleItemUseBeforeAISetup(void) BattleAI_SetupAIData(); } +#if DEBUG +__attribute__((naked)) +void BattleAI_SetupAIData() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " ldr r2, ._16\n" + " mov r4, #0x0\n" + " ldr r3, ._16 + 4\n" + " mov r1, #0x0\n" + "._9:\n" + " add r0, r2, r4\n" + " strb r1, [r0]\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x1b\n" + " bls ._9 @cond_branch\n" + " ldr r0, ._16\n" + " mov r1, #0x64\n" + " mov r4, #0x3\n" + " add r0, r0, #0x7\n" + "._10:\n" + " strb r1, [r0]\n" + " sub r0, r0, #0x1\n" + " sub r4, r4, #0x1\n" + " cmp r4, #0\n" + " bge ._10 @cond_branch\n" + " ldrb r0, [r3]\n" + " mov r1, #0x0\n" + " mov r2, #0xff\n" + " bl sub_8015A98\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " mov r4, #0x0\n" + " ldr r0, ._16\n" + " add r5, r0, #4\n" + " ldr r6, ._16 + 8\n" + "._12:\n" + " ldr r0, [r6]\n" + " and r0, r0, r7\n" + " cmp r0, #0\n" + " beq ._11 @cond_branch\n" + " mov r0, #0x0\n" + " strb r0, [r5]\n" + "._11:\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0xf\n" + " and r0, r0, r1\n" + " mov r1, #0x64\n" + " sub r1, r1, r0\n" + " strb r1, [r5, #0x14]\n" + " add r5, r5, #0x1\n" + " add r6, r6, #0x4\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x3\n" + " ble ._12 @cond_branch\n" + " ldr r0, ._16 + 12\n" + " add r0, r0, #0x20\n" + " mov r1, #0x0\n" + " strb r1, [r0]\n" + " ldr r1, ._16 + 16\n" + " ldr r0, ._16 + 4\n" + " ldrb r2, [r0]\n" + " strb r2, [r1]\n" + " ldr r0, ._16 + 20\n" + " ldrh r1, [r0]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._13 @cond_branch\n" + " ldr r4, ._16 + 24\n" + " bl Random\n" + " mov r5, #0x2\n" + " and r0, r0, r5\n" + " strb r0, [r4]\n" + " ldr r0, ._16 + 28\n" + " ldrb r1, [r0]\n" + " ldr r2, ._16 + 8\n" + " ldrb r3, [r4]\n" + " lsl r0, r3, #0x2\n" + " add r0, r0, r2\n" + " ldr r0, [r0]\n" + " and r1, r1, r0\n" + " cmp r1, #0\n" + " beq ._15 @cond_branch\n" + " eor r3, r3, r5\n" + " strb r3, [r4]\n" + " b ._15\n" + "._17:\n" + " .align 2, 0\n" + "._16:\n" + " .word +0x2016800\n" + " .word gActiveBank\n" + " .word gBitTable\n" + " .word +0x2016c00\n" + " .word gBankAttacker\n" + " .word gBattleTypeFlags\n" + " .word gBankTarget\n" + " .word gAbsentBankFlags\n" + "._13:\n" + " ldr r0, ._20\n" + " mov r1, #0x1\n" + " eor r1, r1, r2\n" + " strb r1, [r0]\n" + "._15:\n" + " ldr r0, ._20 + 4\n" + " ldrh r1, [r0]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._18 @cond_branch\n" + " ldr r1, ._20 + 8\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x17\n" + " b ._27\n" + "._21:\n" + " .align 2, 0\n" + "._20:\n" + " .word gBankTarget\n" + " .word gBattleTypeFlags\n" + " .word +0x2016800\n" + "._18:\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x3\n" + " add r0, r2, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._22 @cond_branch\n" + " ldr r1, ._24\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x16\n" + " b ._27\n" + "._25:\n" + " .align 2, 0\n" + "._24:\n" + " .word +0x2016800\n" + "._22:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._26 @cond_branch\n" + " ldr r1, ._28\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x18\n" + " b ._27\n" + "._29:\n" + " .align 2, 0\n" + "._28:\n" + " .word +0x2016800\n" + "._26:\n" + " mov r0, #0x90\n" + " lsl r0, r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._30 @cond_branch\n" + " ldr r1, ._33\n" + " ldrh r0, [r1]\n" + " cmp r0, r2\n" + " bne ._31 @cond_branch\n" + "._30:\n" + " ldr r1, ._33 + 4\n" + " mov r0, #0x7\n" + "._27:\n" + " str r0, [r1, #0xc]\n" + " add r3, r1, #0\n" + " b ._32\n" + "._34:\n" + " .align 2, 0\n" + "._33:\n" + " .word gTrainerBattleOpponent\n" + " .word +0x2016800\n" + "._31:\n" + " ldr r3, ._36\n" + " ldr r2, ._36 + 4\n" + " ldrh r1, [r1]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x3\n" + " add r2, r2, #0x1c\n" + " add r0, r0, r2\n" + " ldr r0, [r0]\n" + " str r0, [r3, #0xc]\n" + "._32:\n" + " ldr r0, ._36 + 8\n" + " ldrb r1, [r0]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._35 @cond_branch\n" + " ldr r0, ._36 + 12\n" + " ldr r0, [r0]\n" + " str r0, [r3, #0xc]\n" + "._35:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._37:\n" + " .align 2, 0\n" + "._36:\n" + " .word +0x2016800\n" + " .word gTrainers\n" + " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14+0x4c\n" + "\n" + ); +} +#else void BattleAI_SetupAIData(void) { s32 i; @@ -342,6 +550,7 @@ void BattleAI_SetupAIData(void) else // otherwise, just set aiFlags to whatever flags the trainer has set in their data. AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent].aiFlags; } +#endif u8 BattleAI_GetAIActionToUse(void) { diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index 97568d254..f7734301c 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -79,8 +79,8 @@ extern const u16 gBattleInterfaceStatusIcons_DynPal[]; static void sub_8043D5C(struct Sprite *); static const void *sub_8043CDC(u8); -static void sub_8044210(u8, s16, u8); -static void draw_status_ailment_maybe(u8); +/*static*/ void sub_8044210(u8, s16, u8); +/*static*/ void draw_status_ailment_maybe(u8); extern void sub_8045180(struct Sprite *); static void sub_8045110(struct Sprite *); static void sub_8045048(struct Sprite *); @@ -651,7 +651,7 @@ void sub_8043F44(u8 a) #define CHAR_LV_SEPARATOR CHAR_PERIOD #endif -static void sub_8043FC0(u8 a, u8 b) +/*static*/ void sub_8043FC0(u8 a, u8 b) { u8 str[30]; void *const *r7; @@ -905,7 +905,7 @@ _0804420C: .4byte 0x04000008\n\ } #endif -static void sub_8044210(u8 a, s16 b, u8 c) +/*static*/ void sub_8044210(u8 a, s16 b, u8 c) { u8 str[0x14]; u8 *ptr; @@ -1277,6 +1277,353 @@ _08044548: .4byte 0x04000008\n\ } #endif +#if DEBUG +__attribute__((naked)) +void sub_804454C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x0\n" + " mov r8, r0\n" + " ldr r0, ._150\n" + " ldrb r0, [r0]\n" + " cmp r8, r0\n" + " blt ._133 @cond_branch\n" + " b ._164\n" + "._133:\n" + " ldr r1, ._150 + 4\n" + " mov r9, r1\n" + " mov r2, #0x64\n" + " mov sl, r2\n" + " ldr r7, ._150 + 8\n" + "._165:\n" + " ldr r0, ._150 + 12\n" + " mov r6, r8\n" + " add r5, r6, r0\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " mov r1, r9\n" + " add r1, r1, #0x1c\n" + " add r0, r0, r1\n" + " ldr r1, [r0]\n" + " ldr r0, ._150 + 16\n" + " cmp r1, r0\n" + " beq ._135 @cond_branch\n" + " b ._147\n" + "._135:\n" + " ldr r0, ._150 + 20\n" + " ldrb r0, [r0]\n" + " lsl r4, r6, #0x18\n" + " cmp r0, #0\n" + " bne ._138 @cond_branch\n" + " lsr r0, r4, #0x18\n" + " bl GetBankSide\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._138 @cond_branch\n" + " b ._147\n" + "._138:\n" + " bl IsDoubleBattle\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._141 @cond_branch\n" + " lsr r0, r4, #0x18\n" + " bl GetBankSide\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._141 @cond_branch\n" + " b ._147\n" + "._141:\n" + " mov r0, r8\n" + " lsl r3, r0, #0x2\n" + " ldr r0, ._150 + 24\n" + " add r3, r3, r0\n" + " ldr r0, [r3]\n" + " lsl r0, r0, #0x1b\n" + " lsr r0, r0, #0x1f\n" + " mov r2, #0x1\n" + " eor r2, r2, r0\n" + " lsl r2, r2, #0x4\n" + " ldrb r0, [r3]\n" + " mov r6, #0x11\n" + " neg r6, r6\n" + " add r1, r6, #0\n" + " and r0, r0, r1\n" + " orr r0, r0, r2\n" + " strb r0, [r3]\n" + " ldr r0, [r3]\n" + " lsl r0, r0, #0x1b\n" + " lsr r6, r0, #0x1f\n" + " lsr r0, r4, #0x18\n" + " bl GetBankSide\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._143 @cond_branch\n" + " bl IsDoubleBattle\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._144 @cond_branch\n" + " b ._147\n" + "._144:\n" + " ldr r0, ._150 + 28\n" + " ldrh r1, [r0]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " cmp r2, #0\n" + " beq ._146 @cond_branch\n" + " b ._147\n" + "._146:\n" + " cmp r6, #0x1\n" + " bne ._148 @cond_branch\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r9\n" + " ldrh r0, [r0, #0x38]\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " str r2, [sp]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r9\n" + " ldrh r1, [r0, #0x4]\n" + " lsl r1, r1, #0x16\n" + " lsr r1, r1, #0x11\n" + " ldr r0, ._150 + 32\n" + " add r1, r1, r0\n" + " mov r0, sp\n" + " ldr r2, ._150 + 36\n" + " bl gScriptFuncs_End+0x3cb4\n" + " ldrb r4, [r5]\n" + " ldrh r0, [r7]\n" + " mov r1, sl\n" + " mul r1, r1, r0\n" + " add r0, r1, #0\n" + " ldr r2, ._150 + 40\n" + " add r0, r0, r2\n" + " mov r1, #0x39\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " mov r2, #0x0\n" + " bl sub_8044210\n" + " ldrb r4, [r5]\n" + " ldrh r0, [r7]\n" + " mov r6, sl\n" + " mul r6, r6, r0\n" + " add r0, r6, #0\n" + " ldr r1, ._150 + 40\n" + " b ._149\n" + "._151:\n" + " .align 2, 0\n" + "._150:\n" + " .word gNoOfAllBanks\n" + " .word gSprites\n" + " .word gBattlePartyID\n" + " .word gHealthboxIDs\n" + " .word SpriteCallbackDummy+1\n" + " .word gUnknown_020297ED\n" + " .word +0x2017800\n" + " .word gBattleTypeFlags\n" + " .word 0x6010000\n" + " .word 0x5000040\n" + " .word gPlayerParty\n" + "._148:\n" + " ldrb r0, [r5]\n" + " bl draw_status_ailment_maybe\n" + " ldrb r0, [r5]\n" + " ldrh r1, [r7]\n" + " mov r2, sl\n" + " mul r2, r2, r1\n" + " add r1, r2, #0\n" + " ldr r6, ._153\n" + " add r1, r1, r6\n" + " mov r2, #0x5\n" + " bl sub_8045A5C\n" + " mov r0, #0x75\n" + " bl sub_8043CDC\n" + " ldrb r2, [r5]\n" + " lsl r1, r2, #0x4\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r9\n" + " ldrh r1, [r1, #0x4]\n" + " lsl r1, r1, #0x16\n" + " lsr r1, r1, #0x11\n" + " ldr r2, ._153 + 4\n" + " add r1, r1, r2\n" + " ldr r2, ._153 + 8\n" + " bl gScriptFuncs_End+0x3cb4\n" + " b ._163\n" + "._154:\n" + " .align 2, 0\n" + "._153:\n" + " .word gPlayerParty\n" + " .word 0x6010680\n" + " .word 0x4000008\n" + "._143:\n" + " cmp r6, #0x1\n" + " bne ._155 @cond_branch\n" + " ldr r0, ._158\n" + " ldrh r1, [r0]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " cmp r2, #0\n" + " beq ._156 @cond_branch\n" + " ldrb r0, [r5]\n" + " ldrh r1, [r7]\n" + " mov r6, sl\n" + " mul r6, r6, r1\n" + " add r1, r6, #0\n" + " ldr r2, ._158 + 4\n" + " add r1, r1, r2\n" + " bl sub_8044338\n" + " b ._163\n" + "._159:\n" + " .align 2, 0\n" + "._158:\n" + " .word gBattleTypeFlags\n" + " .word gEnemyParty\n" + "._156:\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r9\n" + " ldrh r0, [r0, #0x38]\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " str r2, [sp]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r9\n" + " ldrh r1, [r0, #0x4]\n" + " lsl r1, r1, #0x16\n" + " lsr r1, r1, #0x11\n" + " ldr r6, ._161\n" + " add r1, r1, r6\n" + " mov r0, sp\n" + " ldr r2, ._161 + 4\n" + " bl gScriptFuncs_End+0x3cb4\n" + " ldrb r4, [r5]\n" + " ldrh r0, [r7]\n" + " mov r1, sl\n" + " mul r1, r1, r0\n" + " add r0, r1, #0\n" + " ldr r2, ._161 + 8\n" + " add r0, r0, r2\n" + " mov r1, #0x39\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " mov r2, #0x0\n" + " bl sub_8044210\n" + " ldrb r4, [r5]\n" + " ldrh r0, [r7]\n" + " mov r6, sl\n" + " mul r6, r6, r0\n" + " add r0, r6, #0\n" + " ldr r1, ._161 + 8\n" + "._149:\n" + " add r0, r0, r1\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " bl sub_8044210\n" + " b ._163\n" + "._162:\n" + " .align 2, 0\n" + "._161:\n" + " .word 0x6010000\n" + " .word 0x5000040\n" + " .word gEnemyParty\n" + "._155:\n" + " ldrb r0, [r5]\n" + " bl draw_status_ailment_maybe\n" + " ldrb r0, [r5]\n" + " ldrh r1, [r7]\n" + " mov r6, #0x64\n" + " mul r1, r1, r6\n" + " ldr r4, ._166\n" + " add r1, r1, r4\n" + " mov r2, #0x5\n" + " bl sub_8045A5C\n" + " ldr r0, ._166 + 4\n" + " ldrh r1, [r0]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._163 @cond_branch\n" + " ldrb r0, [r5]\n" + " ldrh r1, [r7]\n" + " mul r1, r1, r6\n" + " add r1, r1, r4\n" + " mov r2, #0x4\n" + " bl sub_8045A5C\n" + "._163:\n" + " ldr r0, ._166 + 8\n" + " add r0, r0, r8\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r9\n" + " ldrh r1, [r0, #0x3c]\n" + " mov r2, #0x1\n" + " eor r1, r1, r2\n" + " strh r1, [r0, #0x3c]\n" + "._147:\n" + " add r7, r7, #0x2\n" + " mov r2, #0x1\n" + " add r8, r8, r2\n" + " ldr r0, ._166 + 12\n" + " ldrb r0, [r0]\n" + " cmp r8, r0\n" + " bge ._164 @cond_branch\n" + " b ._165\n" + "._164:\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._167:\n" + " .align 2, 0\n" + "._166:\n" + " .word gEnemyParty\n" + " .word gBattleTypeFlags\n" + " .word gHealthboxIDs\n" + " .word gNoOfAllBanks\n" + "\n" + ); +} +#else void sub_804454C(void) { s32 i; @@ -1344,6 +1691,7 @@ void sub_804454C(void) } } } +#endif // This function almost matches except for just two instructions around 0x08044B52 that are swapped. #ifdef NONMATCHING @@ -2359,7 +2707,7 @@ void sub_8045180(struct Sprite *sprite) sprite->pos2.y = gSprites[spriteId].pos2.y; } -static void sub_80451A0(u8 a, struct Pokemon *pkmn) +/*static*/ void sub_80451A0(u8 a, struct Pokemon *pkmn) { u8 nickname[POKEMON_NAME_LENGTH]; u8 gender; @@ -2507,7 +2855,7 @@ static void sub_8045458(u8 a, u8 b) } } -static void draw_status_ailment_maybe(u8 a) +/*static*/ void draw_status_ailment_maybe(u8 a) { s32 r4; s32 r4_2; @@ -2649,7 +2997,7 @@ static u8 sub_80457E8(u8 a, u8 b) return ret; } -static void sub_80458B0(u8 a) +/*static*/ void sub_80458B0(u8 a) { u8 *r6; u8 r8; @@ -2675,7 +3023,7 @@ static void sub_80458B0(u8 a) } -static void sub_8045998(u8 a) +/*static*/ void sub_8045998(u8 a) { u8 *r7; u8 status; @@ -2697,6 +3045,310 @@ static void sub_8045998(u8 a) } } +#ifdef DEBUG +__attribute__((naked)) +void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffff8\n" + " mov r9, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " lsl r2, r2, #0x18\n" + " lsr r7, r2, #0x18\n" + " ldr r1, ._429\n" + " lsl r0, r0, #0x4\n" + " add r0, r0, r8\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldrh r0, [r0, #0x3a]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov sl, r0\n" + " bl GetBankSide\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._410 @cond_branch\n" + " b ._411\n" + "._410:\n" + " cmp r7, #0x3\n" + " beq ._412 @cond_branch\n" + " cmp r7, #0\n" + " bne ._413 @cond_branch\n" + "._412:\n" + " mov r0, r9\n" + " mov r1, #0x38\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r0, r8\n" + " bl sub_8043FC0\n" + "._413:\n" + " cmp r7, #0x1\n" + " bhi ._414 @cond_branch\n" + " mov r0, r9\n" + " mov r1, #0x39\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " mov r0, r8\n" + " mov r2, #0x0\n" + " bl sub_80440EC\n" + "._414:\n" + " cmp r7, #0x2\n" + " beq ._415 @cond_branch\n" + " cmp r7, #0\n" + " bne ._416 @cond_branch\n" + "._415:\n" + " mov r0, r9\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " mov r0, r8\n" + " mov r2, #0x1\n" + " bl sub_80440EC\n" + "._416:\n" + " cmp r7, #0x5\n" + " beq ._417 @cond_branch\n" + " cmp r7, #0\n" + " bne ._418 @cond_branch\n" + "._417:\n" + " mov r0, #0x0\n" + " bl load_gfxc_health_bar\n" + " mov r0, r9\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r4, r0, #0\n" + " mov r0, r9\n" + " mov r1, #0x39\n" + " bl GetMonData\n" + " add r3, r0, #0\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, sl\n" + " mov r1, r8\n" + " add r2, r4, #0\n" + " bl sub_8043D84\n" + " mov r0, sl\n" + " mov r1, r8\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " bl sub_8045C78\n" + "._418:\n" + " bl IsDoubleBattle\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " str r0, [sp, #0x4]\n" + " cmp r0, #0\n" + " bne ._421 @cond_branch\n" + " cmp r7, #0x6\n" + " beq ._420 @cond_branch\n" + " cmp r7, #0\n" + " bne ._421 @cond_branch\n" + "._420:\n" + " mov r0, #0x3\n" + " bl load_gfxc_health_bar\n" + " mov r0, r9\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x10\n" + " lsr r5, r5, #0x10\n" + " mov r0, r9\n" + " mov r1, #0x38\n" + " bl GetMonData\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " mov r0, r9\n" + " mov r1, #0x19\n" + " bl GetMonData\n" + " add r3, r0, #0\n" + " ldr r6, ._429 + 4\n" + " lsl r1, r4, #0x2\n" + " ldr r2, ._429 + 8\n" + " lsl r0, r5, #0x3\n" + " sub r0, r0, r5\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldrb r2, [r0, #0x13]\n" + " mov r0, #0xca\n" + " lsl r0, r0, #0x1\n" + " mul r0, r0, r2\n" + " add r1, r1, r0\n" + " add r1, r1, r6\n" + " ldr r1, [r1]\n" + " sub r3, r3, r1\n" + " add r4, r4, #0x1\n" + " lsl r4, r4, #0x2\n" + " add r4, r4, r0\n" + " add r4, r4, r6\n" + " ldr r2, [r4]\n" + " sub r2, r2, r1\n" + " ldr r0, [sp, #0x4]\n" + " str r0, [sp]\n" + " mov r0, sl\n" + " mov r1, r8\n" + " bl sub_8043D84\n" + " mov r0, sl\n" + " mov r1, r8\n" + " mov r2, #0x1\n" + " mov r3, #0x0\n" + " bl sub_8045C78\n" + "._421:\n" + " cmp r7, #0x4\n" + " beq ._422 @cond_branch\n" + " cmp r7, #0\n" + " bne ._423 @cond_branch\n" + "._422:\n" + " mov r0, r8\n" + " mov r1, r9\n" + " bl sub_80451A0\n" + "._423:\n" + " cmp r7, #0x9\n" + " beq ._424 @cond_branch\n" + " cmp r7, #0\n" + " bne ._425 @cond_branch\n" + "._424:\n" + " mov r0, r8\n" + " bl draw_status_ailment_maybe\n" + "._425:\n" + " cmp r7, #0xa\n" + " bne ._426 @cond_branch\n" + " mov r0, r8\n" + " bl sub_80458B0\n" + "._426:\n" + " add r0, r7, #0\n" + " sub r0, r0, #0xa\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bhi ._442 @cond_branch\n" + " mov r0, r8\n" + " bl sub_8045998\n" + " b ._442\n" + "._430:\n" + " .align 2, 0\n" + "._429:\n" + " .word gSprites\n" + " .word gExperienceTables\n" + " .word gBaseStats\n" + "._411:\n" + " cmp r7, #0x3\n" + " beq ._431 @cond_branch\n" + " cmp r7, #0\n" + " bne ._432 @cond_branch\n" + "._431:\n" + " mov r0, r9\n" + " mov r1, #0x38\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r0, r8\n" + " bl sub_8043FC0\n" + "._432:\n" + " ldr r0, ._443\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x1\n" + " bne ._436 @cond_branch\n" + " cmp r7, #0x1\n" + " bhi ._434 @cond_branch\n" + " mov r0, r9\n" + " mov r1, #0x39\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " mov r0, r8\n" + " mov r2, #0x0\n" + " bl sub_80440EC\n" + "._434:\n" + " cmp r7, #0x2\n" + " beq ._435 @cond_branch\n" + " cmp r7, #0\n" + " bne ._436 @cond_branch\n" + "._435:\n" + " mov r0, r9\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " mov r0, r8\n" + " mov r2, #0x1\n" + " bl sub_80440EC\n" + "._436:\n" + " cmp r7, #0x5\n" + " beq ._437 @cond_branch\n" + " cmp r7, #0\n" + " bne ._438 @cond_branch\n" + "._437:\n" + " mov r0, #0x0\n" + " bl load_gfxc_health_bar\n" + " mov r0, r9\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r4, r0, #0\n" + " mov r0, r9\n" + " mov r1, #0x39\n" + " bl GetMonData\n" + " add r3, r0, #0\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, sl\n" + " mov r1, r8\n" + " add r2, r4, #0\n" + " bl sub_8043D84\n" + " mov r0, sl\n" + " mov r1, r8\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " bl sub_8045C78\n" + "._438:\n" + " cmp r7, #0x4\n" + " beq ._439 @cond_branch\n" + " cmp r7, #0\n" + " bne ._440 @cond_branch\n" + "._439:\n" + " mov r0, r8\n" + " mov r1, r9\n" + " bl sub_80451A0\n" + "._440:\n" + " cmp r7, #0x9\n" + " beq ._441 @cond_branch\n" + " cmp r7, #0\n" + " bne ._442 @cond_branch\n" + "._441:\n" + " mov r0, r8\n" + " bl draw_status_ailment_maybe\n" + "._442:\n" + " add sp, sp, #0x8\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._444:\n" + " .align 2, 0\n" + "._443:\n" + " .word gUnknown_020297ED\n" + "\n" + ); +} +#else void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) { u8 r10; @@ -2766,6 +3418,7 @@ void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) draw_status_ailment_maybe(a); } } +#endif s32 sub_8045C78(u8 a, u8 unused1, u8 c, u8 unused2) { diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index 4979760d7..a03a215fd 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -8,9 +8,35 @@ #include "strings2.h" #include "trainer_card.h" +struct DebugStruct1 +{ + u16 var0; + u8 var1[10]; +}; + extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; extern u8 gBattleOutcome; +#ifdef DEBUG +const struct DebugStruct1 gUnknown_Debug_4245CC[] = +{ + { 1, _("NUMBER1") }, + { 2, _("ナンバー2") }, + { 3, _("ナンバー3") }, + { 4, _("ナンバー4") }, + { 5, _("ナンバー5") }, + { 6, _("ナンバー6") }, + { 7, _("ナンバー7") }, +}; + +const u8 gUnknown_Debug_8424620[][4] = +{ + { 1, 1, 0, 0 }, + { 2, 1, 0, 0 }, + { 3, 1, 0, 0 }, +}; +#endif + static void InitLinkBattleRecord(struct LinkBattleRecord *record) { CpuFill16(0, record, sizeof(struct LinkBattleRecord)); @@ -240,7 +266,8 @@ static void PrintLinkBattleRecord(struct LinkBattleRecord *record, u8 y) } } -void ShowLinkBattleRecords(void) { +void ShowLinkBattleRecords(void) +{ s32 i; Menu_DrawStdWindowFrame(1, 0, 28, 18); sub_8072BD8(gOtherText_BattleResults, 0, 1, 240); diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c new file mode 100644 index 000000000..6f2734b08 --- /dev/null +++ b/src/debug/kagaya_debug_menu.c @@ -0,0 +1,420 @@ +#ifdef DEBUG +#include "global.h" +#include "menu.h" + +u8 KagayaDebugMenu_TrainerCard(); +u8 KagayaDebugMenu_CardToExchange(); +u8 KagayaDebugMenu_SlotMachine(); + +const u8 Str_83EBB34[] = _("Trainer’s card"); +const u8 Str_83EBB43[] = _("Card to exchange"); +const u8 Str_83EBB54[] = _("Slot machine"); + +const struct MenuAction _83EBB64[] = { + { Str_83EBB34, KagayaDebugMenu_TrainerCard }, + { Str_83EBB43, KagayaDebugMenu_CardToExchange }, + { Str_83EBB54, KagayaDebugMenu_SlotMachine }, +}; + +__attribute__((naked)) +void InitKagayaDebugMenu_A() +{ + asm( + " push {lr}\n" + " bl InitKagayaDebugMenu_B\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void InitKagayaDebugMenu_B() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xe\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._1\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xd\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl InitMenu\n" + " ldr r1, ._1 + 4\n" + " ldr r0, ._1 + 8\n" + " str r0, [r1]\n" + " add sp, sp, #0x8\n" + " pop {r0}\n" + " bx r0\n" + "._2:\n" + " .align 2, 0\n" + "._1:\n" + " .word _83EBB64\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_80B061C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80B061C() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._3 @cond_branch\n" + " mov r0, #0x0\n" + " b ._6\n" + "._3:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._5 @cond_branch\n" + " ldr r2, ._7\n" + " ldr r0, ._7 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._6\n" + "._8:\n" + " .align 2, 0\n" + "._7:\n" + " .word gCallback_03004AE8\n" + " .word _83EBB64\n" + "._5:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._6:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 KagayaDebugMenu_TrainerCard() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._9\n" + " ldr r0, ._9 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._10:\n" + " .align 2, 0\n" + "._9:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_80B068C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80B068C() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._11 @cond_branch\n" + " mov r0, #0x0\n" + " b ._12\n" + "._11:\n" + " ldr r0, ._13\n" + " bl debug_sub_80A0710\n" + " bl CloseMenu\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + "._12:\n" + " pop {r1}\n" + " bx r1\n" + "._14:\n" + " .align 2, 0\n" + "._13:\n" + " .word sub_805469C+1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 KagayaDebugMenu_CardToExchange() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._15\n" + " ldr r0, ._15 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._16:\n" + " .align 2, 0\n" + "._15:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_80B06E0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80B06E0() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._17 @cond_branch\n" + " mov r0, #0x0\n" + " b ._18\n" + "._17:\n" + " ldr r0, ._19\n" + " bl debug_sub_80A073C\n" + " bl CloseMenu\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + "._18:\n" + " pop {r1}\n" + " bx r1\n" + "._20:\n" + " .align 2, 0\n" + "._19:\n" + " .word sub_805469C+1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 KagayaDebugMenu_SlotMachine() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._21\n" + " ldr r0, ._21 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._22:\n" + " .align 2, 0\n" + "._21:\n" + " .word gCallback_03004AE8\n" + " .word Kagaya_80B0734+1\n" + "\n" + ); +} + +__attribute__((naked)) +void Kagaya_80B0734() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._23 @cond_branch\n" + " mov r0, #0x0\n" + " b ._24\n" + "._23:\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._25\n" + " bl debug_sub_811609C\n" + " bl CloseMenu\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + "._24:\n" + " pop {r1}\n" + " bx r1\n" + "._26:\n" + " .align 2, 0\n" + "._25:\n" + " .word sub_805469C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80B0770() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._30\n" + " ldrb r1, [r0]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0\n" + " bne ._27 @cond_branch\n" + " bl CloseMenu\n" + " bl IsPlayerFacingSurfableFishableWater\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._29 @cond_branch\n" + " ldr r0, ._30 + 4\n" + " str r4, [r0]\n" + " mov r0, #0x9\n" + " bl FieldEffectStart\n" + " b ._29\n" + "._31:\n" + " .align 2, 0\n" + "._30:\n" + " .word gPlayerAvatar\n" + " .word gUnknown_0202FF84\n" + "._27:\n" + " bl CloseMenu\n" + "._29:\n" + " mov r0, #0x1\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80B07B0() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._32\n" + " ldr r0, ._32 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._33:\n" + " .align 2, 0\n" + "._32:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_80B07DC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80B07DC() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._34 @cond_branch\n" + " mov r0, #0x0\n" + " b ._35\n" + "._34:\n" + " bl CloseMenu\n" + " ldr r0, ._36\n" + " bl SetMainCallback2\n" + " mov r0, #0x1\n" + "._35:\n" + " pop {r1}\n" + " bx r1\n" + "._37:\n" + " .align 2, 0\n" + "._36:\n" + " .word sub_80FC074+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80B0800() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl sub_8068F18\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0\n" + " beq ._38 @cond_branch\n" + " ldr r0, ._39\n" + " mov r1, #0x0\n" + " str r1, [r0]\n" + " sub r1, r2, #1\n" + " str r1, [r0, #0x4]\n" + " mov r0, #0x2c\n" + " bl FieldEffectStart\n" + "._38:\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._40:\n" + " .align 2, 0\n" + "._39:\n" + " .word gUnknown_0202FF84\n" + "\n" + ); +} + +#endif // DEBUG diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c new file mode 100644 index 000000000..48b6d91b8 --- /dev/null +++ b/src/debug/nakamura_debug_menu.c @@ -0,0 +1,5031 @@ +#ifdef DEBUG +#include "global.h" +#include "menu.h" + +EWRAM_DATA u8 _nakamuraData[0x10] = {0}; + +static u8 _nakamuraStatic[32] __attribute__((unused)); + +u8 debug_sub_815FC54(); +u8 debug_sub_815F2B4(); +u8 debug_sub_815FC94(); +u8 debug_sub_815FB1C(); +u8 debug_sub_815F2F4(); +u8 debug_sub_815F62C(); +u8 debug_sub_815FBE8(); +u8 debug_sub_815FE1C(); +u8 debug_sub_8160D98(); + +const u8 Str_843E36C[] = _("Berries"); +const u8 Str_843E374[] = _("Goods"); +const u8 Str_843E37A[] = _("{PKMN} list"); +const u8 Str_843E382[] = _("トラップ"); +const u8 Str_843E387[] = _("Move your base"); +const u8 Str_843E396[] = _("Moving {PKMN}"); +const u8 Str_843E3A0[] = _("Fishing points"); +const u8 Str_843E3AF[] = _("Set {POKEBLOCK}"); +const u8 Str_843E3B9[] = _("Make bases(to max)"); +const u8 Str_843E3CC[] = _("Base location"); + +const struct MenuAction _843E3DC[] = { + { Str_843E36C, debug_sub_815FC54 }, + { Str_843E37A, debug_sub_815F2B4 }, + { Str_843E374, debug_sub_815FC94 }, + { Str_843E387, debug_sub_815FB1C }, + { Str_843E3B9, debug_sub_815F2F4 }, + { Str_843E3CC, debug_sub_815F62C }, + { Str_843E396, debug_sub_815FBE8 }, + { Str_843E3A0, debug_sub_815FE1C }, + { Str_843E3AF, debug_sub_8160D98 }, +}; + +const u8 _843E424[][4] = { + { 1, 118, 47, 14 }, + { 2, 125, 53, 10 }, + { 3, 113, 49, 8 }, + { 0xB, 118, 67, 6 }, + { 0xC, 121, 40, 11 }, + { 0xD, 111, 35, 1 }, + { 0x15, 115, 20, 53 }, + { 0x16, 121, 18, 13 }, + { 0x17, 119, 26, 81 }, + { 0x1F, 127, 59, 67 }, + { 0x20, 125, 55, 11 }, + { 0x21, 111, 27, 27 }, + { 0x29, 114, 9, 47 }, + { 0x2A, 115, 32, 39 }, + { 0x2B, 115, 23, 8 }, + { 0x33, 114, 30, 51 }, + { 0x34, 115, 26, 15 }, + { 0x35, 115, 32, 46 }, + { 0x3D, 114, 11, 62 }, + { 0x3E, 115, 21, 18 }, + { 0x3F, 115, 25, 24 }, + { 0x47, 114, 19, 70 }, + { 0x48, 115, 32, 6 }, + { 0x49, 114, 32, 57 }, + { 0x51, 116, 71, 4 }, + { 0x52, 123, 47, 3 }, + { 0x53, 123, 57, 5 }, + { 0x5B, 116, 79, 11 }, + { 0x5C, 123, 49, 3 }, + { 0x5D, 120, 18, 12 }, + { 0x65, 120, 28, 62 }, + { 0x66, 116, 56, 6 }, + { 0x67, 119, 16, 81 }, + { 0x6F, 120, 30, 62 }, + { 0x70, 116, 55, 15 }, + { 0x71, 119, 16, 28 }, + { 0x79, 111, 33, 34 }, + { 0x7A, 118, 29, 5 }, + { 0x7B, 127, 45, 24 }, + { 0x83, 111, 24, 36 }, + { 0x84, 125, 7, 25 }, + { 0x85, 115, 8, 30 }, + { 0x8D, 111, 34, 50 }, + { 0x8E, 127, 59, 72 }, + { 0x8F, 127, 61, 21 }, + { 0x97, 127, 67, 63 }, + { 0x98, 125, 24, 32 }, + { 0x99, 111, 35, 31 }, + { 0xA1, 111, 13, 19 }, + { 0xA2, 121, 43, 7 }, + { 0xA3, 118, 47, 5 }, + { 0xA4, 111, 14, 19 }, + { 0xAB, 118, 46, 5 }, + { 0xAC, 121, 42, 7 }, + { 0xAD, 119, 19, 76 }, + { 0xAE, 115, 7, 20 }, + { 0xB5, 110, 16, 25 }, + { 0xB6, 114, 11, 27 }, + { 0xB7, 115, 8, 20 }, + { 0xBF, 110, 17, 25 }, + { 0xC0, 114, 12, 27 }, + { 0xC1, 119, 18, 76 }, + { 0xC9, 119, 5, 2 }, + { 0xCA, 119, 4, 89 }, + { 0xCB, 120, 38, 54 }, + { 0xCC, 120, 5, 76 }, + { 0xD3, 119, 5, 15 }, + { 0xD4, 119, 7, 101 }, + { 0xD5, 120, 31, 23 }, + { 0xDD, 119, 34, 24 }, + { 0xDE, 120, 26, 10 }, + { 0xDF, 119, 4, 15 }, + { 0xE7, 119, 31, 73 }, + { 0xE8, 120, 29, 85 }, + { 0xE9, 119, 6, 2 }, +}; + +const u8 Str_843E550[] = _("R"); +const u8 Str_843E552[] = _("X"); +const u8 Str_843E554[] = _("Y"); +const u8 Str_843E556[] = _( + "♂1\n" + "♂2\n" + "♂3\n" + "♂4\n" + "♂5\n" + "♀1\n" + "♀2\n" + "♀3\n" + "♀4\n" + "♀5"); +const u8 Str_843E574[] = _("ー"); +const u8 Str_843E576[] = _("あ"); +const u8 Str_843E578[] = _("ア"); +const u8 Str_843E57A[] = _("A"); +const u8 Str_843E57C[] = _("a"); +const u8 Str_843E57E[] = _("0"); +const u8 Str_843E580[] = _( + "ADD\n" + "DEL\n" + "EXIT"); +const u8 Str_843E58D[] = _( + "Fishing location R119\n" + " Y1\n" + " Y2\n" + " Y3\n" + "Encounter location\n" + "\n" + "\n" + "front of you"); +const u8 _843E5D1[] = {0x0F, 0x16, 0x19}; +const u8 Str_843E5D4[] = _( + "Aボタン {ESCAPE}\p" + "  Bボタン ー\n" + "START けってい"); +const u8 Str_843E5F0[] = _("?"); +const u8 Str_843E5F2[] = _("HP どりょくち"); +const u8 Str_843E5FB[] = _("こうげき どりょくち"); +const u8 Str_843E606[] = _("ぼうぎょ どりょくち"); +const u8 Str_843E611[] = _("すばやさ どりょくち"); +const u8 Str_843E61C[] = _("とくこう どりょくち"); +const u8 Str_843E627[] = _("とくぼう どりょくち"); +const u8 Str_843E632[] = _("なつきど"); +const u8 Str_843E637[] = _("どりょくち ごうけい"); +const u8 Str_843E642[] = _("ここから"); +const u8 Str_843E647[] = _("ここまで"); +const u8 Str_843E64C[] = _("かいすう"); +const u8 Str_843E651[] = _("けっか"); +const u8 Str_843E655[] = _("かい"); +const u8 Str_843E658[] = _("0"); +const u8 Str_843E65A[] = _("はんい"); + +__attribute__((naked)) +void debug_sub_815F1B8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0xe\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._1\n" + " mov r0, #0x10\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xe\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0xf\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " add sp, sp, #0x8\n" + " pop {r0}\n" + " bx r0\n" + "._2:\n" + " .align 2, 0\n" + "._1:\n" + " .word _843E3DC\n" + "\n" + ); +} + +__attribute__((naked)) +void InitNakamuraDebugMenu() +{ + asm( + " push {lr}\n" + " bl debug_sub_815F1B8\n" + " ldr r1, ._3\n" + " ldr r0, ._3 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_815F214+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F214() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._9\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._5 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + "._5:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._6 @cond_branch\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + "._6:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._7 @cond_branch\n" + " ldr r4, ._9 + 4\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x15\n" + " add r4, r4, #0x4\n" + " add r0, r0, r4\n" + " ldr r4, [r0]\n" + " bl HandleDestroyMenuCursors\n" + " bl _call_via_r4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._12\n" + "._10:\n" + " .align 2, 0\n" + "._9:\n" + " .word gMain\n" + " .word _843E3DC\n" + "._7:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._11 @cond_branch\n" + " mov r0, #0x0\n" + " b ._12\n" + "._11:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._12:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F284() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, ._14\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._13 @cond_branch\n" + " bl debug_sub_81381B4\n" + " mov r0, #0x5\n" + " mov r1, #0x0\n" + " bl OpenPartyMenu\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + "._13:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._15:\n" + " .align 2, 0\n" + "._14:\n" + " .word gPaletteFade\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815F2B4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " bl CloseMenu\n" + " bl MenuZeroFillScreen\n" + " ldr r1, ._16\n" + " ldr r0, ._16 + 4\n" + " str r0, [r1, #0x8]\n" + " ldr r0, ._16 + 8\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " mov r0, #0x1\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._17:\n" + " .align 2, 0\n" + "._16:\n" + " .word gMain\n" + " .word sub_805469C+1\n" + " .word debug_sub_815F284+1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815F2F4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " bl CloseMenu\n" + " mov r7, #0x1\n" + "._34:\n" + " lsl r1, r7, #0x2\n" + " add r0, r1, r7\n" + " lsl r2, r0, #0x5\n" + " ldr r3, ._24\n" + " add r0, r2, r3\n" + " ldr r5, ._24 + 4\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " mov r9, r1\n" + " add r1, r7, #1\n" + " str r1, [sp]\n" + " cmp r0, #0\n" + " beq ._18 @cond_branch\n" + " b ._19\n" + "._18:\n" + " mov r5, #0x0\n" + " ldr r6, ._24 + 8\n" + " add r4, r7, #0\n" + " sub r4, r4, #0x46\n" + " ldr r3, ._24 + 12\n" + "._21:\n" + " add r1, r5, r2\n" + " add r1, r1, r3\n" + " add r0, r5, r6\n" + " ldrb r0, [r0]\n" + " strb r0, [r1]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0xff\n" + " beq ._20 @cond_branch\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x6\n" + " bls ._21 @cond_branch\n" + "._20:\n" + " cmp r5, #0x7\n" + " bne ._22 @cond_branch\n" + " add r0, r2, #6\n" + " b ._23\n" + "._25:\n" + " .align 2, 0\n" + "._24:\n" + " .word gSaveBlock1\n" + " .word 0x1a08\n" + " .word gSaveBlock2\n" + " .word gSaveBlock1+0x1a0a\n" + "._22:\n" + " add r0, r5, r2\n" + "._23:\n" + " add r0, r0, r3\n" + " strb r4, [r0]\n" + " ldr r1, ._35\n" + " ldr r2, ._35 + 4\n" + " add r2, r2, r1\n" + " mov sl, r2\n" + " mov r3, r9\n" + " add r0, r3, r7\n" + " lsl r6, r0, #0x5\n" + " add r1, r6, r1\n" + " ldr r5, ._35 + 4\n" + " add r5, r5, r1\n" + " mov r8, r5\n" + "._30:\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0x4b\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0xe\n" + " ldr r1, ._35 + 8\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " mov r2, r8\n" + " strb r0, [r2]\n" + " mov r5, #0x0\n" + " cmp r5, r7\n" + " bcs ._28 @cond_branch\n" + " mov r3, sl\n" + " ldrb r3, [r3]\n" + " cmp r0, r3\n" + " beq ._28 @cond_branch\n" + " ldr r4, ._35\n" + " add r0, r6, r4\n" + " ldr r2, ._35 + 4\n" + " add r3, r0, r2\n" + "._29:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r7\n" + " bcs ._28 @cond_branch\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r4\n" + " add r0, r0, r2\n" + " ldrb r1, [r3]\n" + " ldrb r0, [r0]\n" + " cmp r1, r0\n" + " bne ._29 @cond_branch\n" + "._28:\n" + " cmp r5, r7\n" + " bne ._30 @cond_branch\n" + " bl Random\n" + " mov r5, r9\n" + " add r4, r5, r7\n" + " lsl r4, r4, #0x5\n" + " ldr r1, ._35\n" + " add r3, r4, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0x1\n" + " ldr r2, ._35 + 12\n" + " add r3, r3, r2\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x4\n" + " ldrb r1, [r3]\n" + " mov r5, #0x11\n" + " neg r5, r5\n" + " add r2, r5, #0\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strb r1, [r3]\n" + " mov r5, #0x0\n" + " ldr r6, ._35 + 16\n" + "._31:\n" + " bl Random\n" + " add r1, r5, r4\n" + " add r1, r1, r6\n" + " strb r0, [r1]\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x3\n" + " bls ._31 @cond_branch\n" + " mov r5, #0x0\n" + " mov r1, r9\n" + " add r0, r1, r7\n" + " lsl r4, r0, #0x5\n" + " ldr r3, ._35 + 20\n" + " mov r2, #0x0\n" + " add r6, r3, #0\n" + " add r6, r6, #0x10\n" + "._32:\n" + " add r1, r5, r4\n" + " add r0, r1, r3\n" + " strb r2, [r0]\n" + " add r1, r1, r6\n" + " strb r2, [r1]\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0xf\n" + " bls ._32 @cond_branch\n" + " add r0, r7, #0\n" + " bl unref_sub_80BCD7C\n" + "._19:\n" + " ldr r2, [sp]\n" + " lsl r0, r2, #0x18\n" + " lsr r7, r0, #0x18\n" + " cmp r7, #0x13\n" + " bhi ._33 @cond_branch\n" + " b ._34\n" + "._33:\n" + " mov r0, #0x1\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._36:\n" + " .align 2, 0\n" + "._35:\n" + " .word gSaveBlock1\n" + " .word 0x1a08\n" + " .word _843E424\n" + " .word 0x1a09\n" + " .word gSaveBlock1+0x1a11\n" + " .word gSaveBlock1+0x1a1a\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F470() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add r6, r0, #0\n" + " add r7, r1, #0\n" + " mov ip, r2\n" + " ldr r2, ._39\n" + " ldr r0, ._39 + 4\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r2\n" + " ldr r1, ._39 + 8\n" + " add r0, r0, r1\n" + " ldrb r4, [r0]\n" + " mov r2, #0x0\n" + " ldr r3, ._39 + 12\n" + " add r5, r3, #0\n" + "._41:\n" + " lsl r1, r2, #0x2\n" + " add r0, r1, r5\n" + " ldrb r0, [r0]\n" + " cmp r0, r4\n" + " bne ._37 @cond_branch\n" + " add r0, r1, #1\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " strb r0, [r6]\n" + " add r0, r1, #2\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " strb r0, [r7]\n" + " add r0, r1, #3\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " mov r1, ip\n" + " strb r0, [r1]\n" + " b ._38\n" + "._40:\n" + " .align 2, 0\n" + "._39:\n" + " .word gSaveBlock1\n" + " .word _nakamuraData\n" + " .word 0x1a08\n" + " .word _843E424\n" + "._37:\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x4a\n" + " bls ._41 @cond_branch\n" + "._38:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F4D8() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0xa\n" + " mov r3, #0xa\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r6, ._43\n" + " ldr r7, ._43 + 4\n" + " ldrb r1, [r7]\n" + " add r0, r6, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r2, ._43 + 8\n" + " ldrb r1, [r7]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r2\n" + " ldr r1, ._43 + 12\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._42 @cond_branch\n" + " mov r4, sp\n" + " add r4, r4, #0x1\n" + " mov r5, sp\n" + " add r5, r5, #0x2\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl debug_sub_815F470\n" + " ldrb r1, [r7]\n" + " add r0, r6, #0\n" + " bl sub_80BC190\n" + " add r0, r6, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r0, ._43 + 16\n" + " mov r1, #0x1\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, sp\n" + " ldrb r1, [r0]\n" + " add r0, r6, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldr r0, ._43 + 20\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldrb r1, [r4]\n" + " add r0, r6, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0x3\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r0, ._43 + 24\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " ldrb r1, [r5]\n" + " add r0, r6, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0x3\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + "._42:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._44:\n" + " .align 2, 0\n" + "._43:\n" + " .word gStringVar1\n" + " .word _nakamuraData\n" + " .word gSaveBlock1\n" + " .word 0x1a08\n" + " .word Str_843E550\n" + " .word Str_843E552\n" + " .word Str_843E554\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F5C4() +{ + asm( + " push {lr}\n" + " ldr r0, ._48\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " cmp r2, #0\n" + " beq ._45 @cond_branch\n" + " ldr r1, ._48 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._46 @cond_branch\n" + " mov r0, #0x13\n" + " b ._50\n" + "._49:\n" + " .align 2, 0\n" + "._48:\n" + " .word gMain\n" + " .word _nakamuraData\n" + "._46:\n" + " sub r0, r0, #0x1\n" + " b ._50\n" + "._45:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._51 @cond_branch\n" + " ldr r1, ._54\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x13\n" + " bne ._52 @cond_branch\n" + " strb r2, [r1]\n" + " b ._53\n" + "._55:\n" + " .align 2, 0\n" + "._54:\n" + " .word _nakamuraData\n" + "._52:\n" + " add r0, r0, #0x1\n" + "._50:\n" + " strb r0, [r1]\n" + "._53:\n" + " bl debug_sub_815F4D8\n" + " mov r0, #0x0\n" + " b ._58\n" + "._51:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._57 @cond_branch\n" + " mov r0, #0x0\n" + " b ._58\n" + "._57:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._58:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815F62C() +{ + asm( + " push {lr}\n" + " ldr r1, ._59\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " ldr r1, ._59 + 4\n" + " ldr r0, ._59 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xb\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " bl debug_sub_815F4D8\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._60:\n" + " .align 2, 0\n" + "._59:\n" + " .word _nakamuraData\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_815F5C4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F668() +{ + asm( + " push {r4, r5, r6, lr}\n" + " ldr r0, ._61\n" + " ldrb r0, [r0]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x5\n" + " ldr r0, ._61 + 4\n" + " add r1, r1, r0\n" + " ldrb r4, [r1, #0x3]\n" + " lsl r4, r4, #0x18\n" + " ldrb r0, [r1, #0x2]\n" + " lsl r0, r0, #0x10\n" + " orr r4, r4, r0\n" + " ldrb r0, [r1, #0x1]\n" + " lsl r0, r0, #0x8\n" + " orr r4, r4, r0\n" + " ldrb r0, [r1]\n" + " orr r4, r4, r0\n" + " ldr r5, ._61 + 8\n" + " ldr r6, ._61 + 12\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " add r0, r5, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl __umodsi3\n" + " add r1, r0, #0\n" + " add r0, r5, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r5, #0\n" + " mov r1, #0x7\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._62:\n" + " .align 2, 0\n" + "._61:\n" + " .word _nakamuraData\n" + " .word gSaveBlock1+0x1a11\n" + " .word gStringVar1\n" + " .word 0x186a0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F6E4() +{ + asm( + " push {r4, lr}\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0xb\n" + " mov r3, #0x4\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r4, ._63\n" + " ldr r0, ._63 + 4\n" + " ldrb r0, [r0]\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x5\n" + " ldr r0, ._63 + 8\n" + " add r1, r1, r0\n" + " add r0, r4, #0\n" + " mov r2, #0x7\n" + " bl StringCopyN\n" + " mov r1, #0xff\n" + " strb r1, [r0]\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._64:\n" + " .align 2, 0\n" + "._63:\n" + " .word gStringVar1\n" + " .word _nakamuraData\n" + " .word gSaveBlock1+0x1a0a\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F72C() +{ + asm( + " push {r4, r5, lr}\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0xb\n" + " mov r3, #0xa\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r4, ._66\n" + " ldr r5, ._66 + 4\n" + " ldrb r1, [r5]\n" + " add r0, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r2, ._66 + 8\n" + " ldrb r1, [r5]\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r2\n" + " ldr r1, ._66 + 12\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._65 @cond_branch\n" + " bl debug_sub_815F6E4\n" + " bl debug_sub_815F668\n" + "._65:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._67:\n" + " .align 2, 0\n" + "._66:\n" + " .word gStringVar1\n" + " .word _nakamuraData\n" + " .word gSaveBlock1\n" + " .word 0x1a08\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F788() +{ + asm( + " push {lr}\n" + " mov r0, #0x2\n" + " mov r1, #0x5\n" + " mov r2, #0xb\n" + " mov r3, #0x6\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r0, ._68\n" + " ldr r1, ._68 + 4\n" + " ldrb r1, [r1]\n" + " add r1, r1, #0x2\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " pop {r0}\n" + " bx r0\n" + "._69:\n" + " .align 2, 0\n" + "._68:\n" + " .word Str_843E574\n" + " .word _nakamuraData+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F7B4() +{ + asm( + " push {lr}\n" + " ldr r0, ._72\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._70 @cond_branch\n" + " mov r0, #0xb\n" + " mov r1, #0x1\n" + " mov r2, #0xb\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " b ._71\n" + "._73:\n" + " .align 2, 0\n" + "._72:\n" + " .word _nakamuraData+0x1\n" + "._70:\n" + " ldr r0, ._74\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x1\n" + " ldr r1, ._74 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xb\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + "._71:\n" + " pop {r0}\n" + " bx r0\n" + "._75:\n" + " .align 2, 0\n" + "._74:\n" + " .word _nakamuraData+0x3\n" + " .word Str_843E576\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F7F0() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r1, ._78\n" + " ldrb r2, [r1]\n" + " lsl r1, r2, #0x2\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x5\n" + " ldr r2, ._78 + 4\n" + " add r3, r1, r2\n" + " ldrb r1, [r3, #0x3]\n" + " lsl r2, r1, #0x18\n" + " ldrb r1, [r3, #0x2]\n" + " lsl r1, r1, #0x10\n" + " orr r2, r2, r1\n" + " ldrb r1, [r3, #0x1]\n" + " lsl r1, r1, #0x8\n" + " orr r2, r2, r1\n" + " ldrb r1, [r3]\n" + " orr r2, r2, r1\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r4, #0x9\n" + " ldr r0, ._78 + 8\n" + " ldrb r0, [r0]\n" + " cmp r4, r0\n" + " ble ._76 @cond_branch\n" + " add r5, r0, #0\n" + "._77:\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r1, r0, #0x1\n" + " lsl r0, r4, #0x18\n" + " mov r4, #0xff\n" + " lsl r4, r4, #0x18\n" + " add r0, r0, r4\n" + " lsr r4, r0, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, r5\n" + " bgt ._77 @cond_branch\n" + "._76:\n" + " add r2, r2, r1\n" + " lsr r0, r2, #0x18\n" + " strb r0, [r3, #0x3]\n" + " mov r0, #0xff\n" + " lsl r0, r0, #0x10\n" + " and r0, r0, r2\n" + " lsr r0, r0, #0x10\n" + " strb r0, [r3, #0x2]\n" + " mov r0, #0xff\n" + " lsl r0, r0, #0x8\n" + " and r0, r0, r2\n" + " lsr r0, r0, #0x8\n" + " strb r0, [r3, #0x1]\n" + " strb r2, [r3]\n" + " bl debug_sub_815F668\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._79:\n" + " .align 2, 0\n" + "._78:\n" + " .word _nakamuraData\n" + " .word gSaveBlock1+0x1a11\n" + " .word _nakamuraData+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F86C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " ldr r1, ._84\n" + " ldrb r2, [r1]\n" + " lsl r1, r2, #0x2\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x5\n" + " ldr r2, ._84 + 4\n" + " add r5, r1, r2\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " lsr r6, r0, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, #0x64\n" + " bne ._80 @cond_branch\n" + " ldr r0, ._84 + 8\n" + " ldrb r1, [r0]\n" + " cmp r1, #0x6\n" + " bhi ._100 @cond_branch\n" + " mov r2, #0xff\n" + "._82:\n" + " add r0, r5, r1\n" + " strb r2, [r0]\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " cmp r1, #0x6\n" + " bls ._82 @cond_branch\n" + " b ._100\n" + "._85:\n" + " .align 2, 0\n" + "._84:\n" + " .word _nakamuraData\n" + " .word gSaveBlock1+0x1a0a\n" + " .word _nakamuraData+0x2\n" + "._80:\n" + " ldr r0, ._87\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x4\n" + " bhi ._98 @cond_branch\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._87 + 4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._88:\n" + " .align 2, 0\n" + "._87:\n" + " .word _nakamuraData+0x3\n" + " .word ._89\n" + "._89:\n" + " .word ._90\n" + " .word ._91\n" + " .word ._92\n" + " .word ._93\n" + " .word ._94\n" + "._90:\n" + " mov r3, #0x1\n" + " mov r2, #0x50\n" + " b ._98\n" + "._91:\n" + " mov r3, #0x51\n" + " mov r2, #0xa0\n" + " b ._98\n" + "._92:\n" + " mov r3, #0xbb\n" + " mov r2, #0xd4\n" + " b ._98\n" + "._93:\n" + " mov r3, #0xd5\n" + " mov r2, #0xee\n" + " b ._98\n" + "._94:\n" + " mov r3, #0xa1\n" + " mov r2, #0xaa\n" + "._98:\n" + " ldr r4, ._101\n" + " ldrb r1, [r4]\n" + " add r1, r5, r1\n" + " ldrb r0, [r1]\n" + " add r0, r0, r6\n" + " strb r0, [r1]\n" + " ldrb r0, [r4]\n" + " add r1, r5, r0\n" + " ldrb r0, [r1]\n" + " cmp r0, r3\n" + " bcs ._99 @cond_branch\n" + " strb r2, [r1]\n" + "._99:\n" + " ldrb r0, [r4]\n" + " add r1, r5, r0\n" + " ldrb r0, [r1]\n" + " cmp r0, r2\n" + " bls ._100 @cond_branch\n" + " strb r3, [r1]\n" + "._100:\n" + " bl debug_sub_815F6E4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._102:\n" + " .align 2, 0\n" + "._101:\n" + " .word _nakamuraData+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815F930() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r0, ._107\n" + " ldrb r2, [r0]\n" + " mov r4, #0xa\n" + " cmp r2, #0\n" + " bne ._103 @cond_branch\n" + " mov r4, #0x7\n" + "._103:\n" + " ldr r5, ._107 + 4\n" + " ldrh r1, [r5, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._104 @cond_branch\n" + " cmp r2, #0\n" + " beq ._105 @cond_branch\n" + " mov r0, #0x1\n" + " bl debug_sub_815F7F0\n" + " b ._136\n" + "._108:\n" + " .align 2, 0\n" + "._107:\n" + " .word _nakamuraData+0x1\n" + " .word gMain\n" + "._105:\n" + " mov r0, #0x1\n" + " b ._113\n" + "._104:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._110 @cond_branch\n" + " cmp r2, #0\n" + " beq ._111 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl debug_sub_815F7F0\n" + " b ._136\n" + "._111:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " b ._113\n" + "._110:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r3, r0, #0x10\n" + " cmp r3, #0\n" + " beq ._114 @cond_branch\n" + " ldr r1, ._117\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._115 @cond_branch\n" + " sub r0, r4, #1\n" + " b ._116\n" + "._118:\n" + " .align 2, 0\n" + "._117:\n" + " .word _nakamuraData+0x2\n" + "._115:\n" + " sub r0, r0, #0x1\n" + "._116:\n" + " strb r0, [r1]\n" + "._125:\n" + " bl debug_sub_815F788\n" + " b ._136\n" + "._114:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._120 @cond_branch\n" + " ldr r2, ._123\n" + " ldrb r1, [r2]\n" + " sub r0, r4, #1\n" + " cmp r1, r0\n" + " bne ._121 @cond_branch\n" + " strb r3, [r2]\n" + " b ._125\n" + "._124:\n" + " .align 2, 0\n" + "._123:\n" + " .word _nakamuraData+0x2\n" + "._121:\n" + " add r0, r1, #1\n" + " strb r0, [r2]\n" + " b ._125\n" + "._120:\n" + " ldrh r1, [r5, #0x2e]\n" + " mov r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._126 @cond_branch\n" + " cmp r2, #0\n" + " bne ._127 @cond_branch\n" + " ldr r4, ._129\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " mov r1, #0x5\n" + " bl __modsi3\n" + " strb r0, [r4]\n" + "._127:\n" + " bl debug_sub_815F7B4\n" + " b ._136\n" + "._130:\n" + " .align 2, 0\n" + "._129:\n" + " .word _nakamuraData+0x3\n" + "._126:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._131 @cond_branch\n" + " mov r0, #0x2\n" + " mov r1, #0x5\n" + " mov r2, #0xb\n" + " mov r3, #0x6\n" + " bl MenuFillWindowRectWithBlankTile\n" + " mov r0, #0xb\n" + " mov r1, #0x1\n" + " mov r2, #0xb\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r1, ._133\n" + " ldr r0, ._133 + 4\n" + " str r0, [r1]\n" + " b ._136\n" + "._134:\n" + " .align 2, 0\n" + "._133:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_815FA38+1\n" + "._131:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._136 @cond_branch\n" + " cmp r2, #0\n" + " bne ._136 @cond_branch\n" + " mov r0, #0x64\n" + "._113:\n" + " bl debug_sub_815F86C\n" + "._136:\n" + " mov r0, #0x0\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815FA38() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._139\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._137 @cond_branch\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " b ._138\n" + "._140:\n" + " .align 2, 0\n" + "._139:\n" + " .word gMain\n" + "._137:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._141 @cond_branch\n" + " mov r0, #0x2\n" + "._138:\n" + " bl MoveMenuCursor\n" + "._161:\n" + " mov r0, #0x0\n" + " b ._142\n" + "._141:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " cmp r2, #0\n" + " beq ._143 @cond_branch\n" + " ldr r1, ._146\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._144 @cond_branch\n" + " mov r0, #0x13\n" + " b ._148\n" + "._147:\n" + " .align 2, 0\n" + "._146:\n" + " .word _nakamuraData\n" + "._144:\n" + " sub r0, r0, #0x1\n" + " b ._148\n" + "._143:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " cmp r4, #0\n" + " beq ._149 @cond_branch\n" + " ldr r1, ._152\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x13\n" + " bne ._150 @cond_branch\n" + " strb r2, [r1]\n" + " b ._151\n" + "._153:\n" + " .align 2, 0\n" + "._152:\n" + " .word _nakamuraData\n" + "._150:\n" + " add r0, r0, #0x1\n" + "._148:\n" + " strb r0, [r1]\n" + "._151:\n" + " bl debug_sub_815F72C\n" + " b ._161\n" + "._149:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._155 @cond_branch\n" + " ldr r1, ._159\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._161 @cond_branch\n" + " ldr r2, ._159 + 4\n" + " add r1, r0, #0\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r2\n" + " ldr r1, ._159 + 8\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._161 @cond_branch\n" + " bl GetMenuCursorPos\n" + " ldr r1, ._159 + 12\n" + " strb r0, [r1]\n" + " ldr r0, ._159 + 16\n" + " strb r4, [r0]\n" + " bl debug_sub_815F788\n" + " bl debug_sub_815F7B4\n" + " ldr r1, ._159 + 20\n" + " ldr r0, ._159 + 24\n" + " str r0, [r1]\n" + " b ._161\n" + "._160:\n" + " .align 2, 0\n" + "._159:\n" + " .word _nakamuraData\n" + " .word gSaveBlock1\n" + " .word 0x1a08\n" + " .word _nakamuraData+0x1\n" + " .word _nakamuraData+0x2\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_815F930+1\n" + "._155:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._161 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._142:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815FB1C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " ldr r0, ._162\n" + " mov r1, #0x0\n" + " strb r1, [r0]\n" + " ldr r0, ._162 + 4\n" + " strb r1, [r0]\n" + " ldr r1, ._162 + 8\n" + " ldr r0, ._162 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xc\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " bl debug_sub_815F72C\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xb\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x3\n" + " bl InitMenu\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._163:\n" + " .align 2, 0\n" + "._162:\n" + " .word _nakamuraData\n" + " .word _nakamuraData+0x3\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_815FA38+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815FB78() +{ + asm( + " push {lr}\n" + " ldr r0, ._166\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._164 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " b ._165\n" + "._167:\n" + " .align 2, 0\n" + "._166:\n" + " .word gMain\n" + "._164:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._168 @cond_branch\n" + " mov r0, #0x1\n" + "._165:\n" + " bl MoveMenuCursor\n" + " mov r0, #0x0\n" + " b ._177\n" + "._168:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._170 @cond_branch\n" + " bl CloseMenu\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._171 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._172 @cond_branch\n" + " b ._175\n" + "._171:\n" + " bl debug_sub_814A714\n" + " b ._175\n" + "._172:\n" + " bl ClearRoamerData\n" + " bl ClearRoamerLocationData\n" + " b ._175\n" + "._170:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._176 @cond_branch\n" + " mov r0, #0x0\n" + " b ._177\n" + "._176:\n" + " bl CloseMenu\n" + "._175:\n" + " mov r0, #0x1\n" + "._177:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815FBE8() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " ldr r1, ._178\n" + " ldr r0, ._178 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " ldr r4, ._178 + 8\n" + " add r0, r4, #0\n" + " bl debug_sub_814A73C\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xb\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " add r0, r4, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._178 + 12\n" + " mov r1, #0x2\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xa\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x3\n" + " bl InitMenu\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._179:\n" + " .align 2, 0\n" + "._178:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_815FB78+1\n" + " .word gStringVar1\n" + " .word Str_843E580\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815FC54() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r3, #0x0\n" + " ldr r7, ._181\n" + " mov r6, #0xe8\n" + " lsl r6, r6, #0x3\n" + " ldr r5, ._181 + 4\n" + " ldr r4, ._181 + 8\n" + "._180:\n" + " lsl r1, r3, #0x2\n" + " add r1, r1, r7\n" + " add r2, r3, #0\n" + " add r2, r2, #0x85\n" + " add r0, r1, r6\n" + " strh r2, [r0]\n" + " add r1, r1, r4\n" + " strh r5, [r1]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r3, r0, #0x10\n" + " cmp r3, #0x2a\n" + " bls ._180 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._182:\n" + " .align 2, 0\n" + "._181:\n" + " .word gSaveBlock1\n" + " .word 0x3e7\n" + " .word 0x742\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815FC94() +{ + asm( + " push {lr}\n" + " bl ClearDecorationInventories\n" + " bl debug_sub_814A3A8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815FCB4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " mov r7, #0x0\n" + " ldr r5, ._188\n" + " ldr r0, [r5]\n" + " ldr r0, [r0, #0x4]\n" + " mov r1, #0x3\n" + " bl __divsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " add r1, r0, #0\n" + " mul r1, r1, r4\n" + " lsl r1, r1, #0x10\n" + " lsr r6, r1, #0x10\n" + " add r0, r6, r0\n" + " mov r9, r5\n" + " cmp r6, r0\n" + " bge ._183 @cond_branch\n" + " mov r8, r0\n" + "._187:\n" + " mov r4, #0x0\n" + " mov r1, r9\n" + " ldr r0, [r1]\n" + " ldr r0, [r0]\n" + " add r5, r6, #1\n" + " cmp r4, r0\n" + " bge ._184 @cond_branch\n" + " ldr r0, ._188\n" + " mov r9, r0\n" + "._186:\n" + " add r0, r4, #7\n" + " add r1, r6, #7\n" + " bl MapGridGetMetatileBehaviorAt\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl sub_805759C\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._185 @cond_branch\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r7, r0, #0x10\n" + "._185:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " ldr r0, ._188\n" + " ldr r0, [r0]\n" + " ldr r0, [r0]\n" + " cmp r4, r0\n" + " blt ._186 @cond_branch\n" + "._184:\n" + " lsl r0, r5, #0x10\n" + " lsr r6, r0, #0x10\n" + " cmp r6, r8\n" + " blt ._187 @cond_branch\n" + "._183:\n" + " add r0, r7, #0\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._189:\n" + " .align 2, 0\n" + "._188:\n" + " .word gMapHeader\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815FD40() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r6, #0x0\n" + " mov r4, sp\n" + " add r4, r4, #0x2\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " bl GetXYCoordsOneStepInFrontOfPlayer\n" + " mov r1, sp\n" + " mov r0, sp\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x7\n" + " strh r0, [r1]\n" + " ldrh r0, [r4]\n" + " sub r0, r0, #0x7\n" + " strh r0, [r4]\n" + " mov r5, #0x0\n" + " ldr r1, ._192\n" + " ldr r0, [r1]\n" + " ldr r0, [r0, #0x4]\n" + " add r7, r4, #0\n" + " cmp r6, r0\n" + " bge ._190 @cond_branch\n" + "._199:\n" + " mov r4, #0x0\n" + " ldr r0, [r1]\n" + " b ._191\n" + "._193:\n" + " .align 2, 0\n" + "._192:\n" + " .word gMapHeader\n" + "._198:\n" + " add r0, r4, #7\n" + " add r1, r5, #7\n" + " bl MapGridGetMetatileBehaviorAt\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl sub_805759C\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._196 @cond_branch\n" + " add r0, r6, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r6, r0, #0x10\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, r4\n" + " bne ._196 @cond_branch\n" + " mov r1, #0x0\n" + " ldsh r0, [r7, r1]\n" + " cmp r0, r5\n" + " bne ._196 @cond_branch\n" + " add r0, r6, #0\n" + " b ._197\n" + "._196:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " ldr r0, ._200\n" + " ldr r0, [r0]\n" + "._191:\n" + " ldr r0, [r0]\n" + " cmp r4, r0\n" + " blt ._198 @cond_branch\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " ldr r1, ._200\n" + " ldr r0, [r1]\n" + " ldr r0, [r0, #0x4]\n" + " cmp r5, r0\n" + " blt ._199 @cond_branch\n" + "._190:\n" + " add r0, r6, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + "._197:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._201:\n" + " .align 2, 0\n" + "._200:\n" + " .word gMapHeader\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815FDE4() +{ + asm( + " push {lr}\n" + " ldr r0, ._205\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._202 @cond_branch\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._203 @cond_branch\n" + "._202:\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._204\n" + "._206:\n" + " .align 2, 0\n" + "._205:\n" + " .word gMain\n" + "._203:\n" + " mov r0, #0x0\n" + "._204:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_815FE1C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x10\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._210\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r6, ._210 + 4\n" + " mov r0, #0x0\n" + " bl debug_sub_815FCB4\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0x5\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " mov r0, #0x1\n" + " bl debug_sub_815FCB4\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0x5\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0x2\n" + " bl debug_sub_815FCB4\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0x5\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " bl debug_sub_8092344\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " mov r0, #0x1\n" + " bl debug_sub_8092344\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0x2\n" + " bl debug_sub_8092344\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r6, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r0, ._210 + 8\n" + " ldr r1, ._210 + 12\n" + " add r0, r0, r1\n" + " ldrh r0, [r0]\n" + " bl FeebasSeedRng\n" + " mov r0, #0x0\n" + " bl debug_sub_815FCB4\n" + " add r4, r0, #0\n" + " mov r0, #0x1\n" + " bl debug_sub_815FCB4\n" + " add r5, r0, #0\n" + " mov r0, #0x2\n" + " bl debug_sub_815FCB4\n" + " add r4, r4, r5\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x10\n" + " lsr r7, r0, #0x10\n" + " mov r5, #0x0\n" + "._209:\n" + " bl FeebasRandom\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " add r1, r7, #0\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r1, r0, #0x10\n" + " cmp r1, #0\n" + " bne ._207 @cond_branch\n" + " add r1, r7, #0\n" + "._207:\n" + " sub r0, r1, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0x2\n" + " bls ._208 @cond_branch\n" + " add r0, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r5, #0\n" + " mov r1, #0x3\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " lsl r4, r0, #0x2\n" + " add r4, r4, r0\n" + " add r4, r4, #0x2\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r5, #0\n" + " mov r1, #0x3\n" + " bl __udivsi3\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x19\n" + " mov r0, #0xb0\n" + " lsl r0, r0, #0x14\n" + " add r2, r2, r0\n" + " lsr r2, r2, #0x18\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " bl MenuPrint\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + "._208:\n" + " cmp r5, #0x6\n" + " bne ._209 @cond_branch\n" + " ldr r4, ._210 + 4\n" + " bl debug_sub_815FD40\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " ldr r1, ._210 + 16\n" + " ldr r0, ._210 + 20\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._211:\n" + " .align 2, 0\n" + "._210:\n" + " .word Str_843E58D\n" + " .word gStringVar1\n" + " .word gSaveBlock1\n" + " .word 0x2dd6\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_815FDE4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_815FFDC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " mov r0, #0xe\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x0\n" + " mov r1, #0xe\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._214\n" + " mov r1, #0x1\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " mov r5, #0x0\n" + " ldr r0, ._214 + 4\n" + " mov r8, r0\n" + "._216:\n" + " mov r0, #0x64\n" + " add r1, r5, #0\n" + " mul r1, r1, r0\n" + " ldr r0, ._214 + 8\n" + " add r6, r1, r0\n" + " add r0, r6, #0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " lsl r1, r5, #0x2\n" + " mov r2, r8\n" + " add r4, r1, r2\n" + " strh r0, [r4]\n" + " lsl r0, r0, #0x10\n" + " add r7, r1, #0\n" + " cmp r0, #0\n" + " beq ._212 @cond_branch\n" + " add r0, r6, #0\n" + " mov r1, #0x38\n" + " bl GetMonData\n" + " strb r0, [r4, #0x2]\n" + " add r0, r5, #0\n" + " bl debug_sub_816009C\n" + " add r0, r5, #0\n" + " bl debug_sub_81600D0\n" + " add r0, r5, #0\n" + " bl debug_sub_816013C\n" + " b ._213\n" + "._215:\n" + " .align 2, 0\n" + "._214:\n" + " .word Str_843E5D4\n" + " .word _nakamuraStatic\n" + " .word gPlayerParty\n" + "._212:\n" + " mov r0, #0x1\n" + " strb r0, [r4, #0x2]\n" + "._213:\n" + " mov r0, r8\n" + " add r1, r7, r0\n" + " mov r0, #0x0\n" + " strb r0, [r1, #0x3]\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x5\n" + " bls ._216 @cond_branch\n" + " ldr r1, ._217\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " mov r0, #0xf\n" + " mov r1, #0x1\n" + " mov r2, #0xff\n" + " bl unref_sub_80F924C\n" + " ldr r1, ._217 + 4\n" + " ldr r0, ._217 + 8\n" + " str r0, [r1]\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._218:\n" + " .align 2, 0\n" + "._217:\n" + " .word _nakamuraData+0x4\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8160498+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_816009C() +{ + asm( + " push {lr}\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " ldr r1, ._219\n" + " lsl r0, r2, #0x2\n" + " add r0, r0, r1\n" + " mov r3, #0x0\n" + " ldsh r1, [r0, r3]\n" + " mov r0, #0xb\n" + " mul r0, r0, r1\n" + " ldr r1, ._219 + 4\n" + " add r0, r0, r1\n" + " lsl r2, r2, #0x1\n" + " add r2, r2, #0x1\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r1, #0x10\n" + " bl MenuPrint\n" + " pop {r0}\n" + " bx r0\n" + "._220:\n" + " .align 2, 0\n" + "._219:\n" + " .word _nakamuraStatic\n" + " .word gSpeciesNames\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_81600D0() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " add r5, r4, #0\n" + " ldr r1, ._223\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " bl memcpy\n" + " mov r0, #0x64\n" + " mul r0, r0, r4\n" + " ldr r1, ._223 + 4\n" + " add r0, r0, r1\n" + " bl GetMonGender\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._221 @cond_branch\n" + " ldr r0, ._223 + 8\n" + " b ._222\n" + "._224:\n" + " .align 2, 0\n" + "._223:\n" + " .word Str_843E5F0\n" + " .word gPlayerParty\n" + " .word gOtherText_MaleSymbol2\n" + "._221:\n" + " cmp r0, #0xfe\n" + " bne ._225 @cond_branch\n" + " ldr r0, ._227\n" + "._222:\n" + " lsl r2, r4, #0x1\n" + " add r2, r2, #0x1\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r1, #0x17\n" + " bl MenuPrint\n" + " b ._226\n" + "._228:\n" + " .align 2, 0\n" + "._227:\n" + " .word gOtherText_FemaleSymbolAndLv\n" + "._225:\n" + " lsl r2, r5, #0x1\n" + " add r2, r2, #0x1\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r0, sp\n" + " mov r1, #0x17\n" + " bl MenuPrint\n" + "._226:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_816013C() +{ + asm( + " push {r4, r5, lr}\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r5, ._229\n" + " ldr r1, ._229 + 4\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r1\n" + " mov r1, #0x2\n" + " ldrsb r1, [r0, r1]\n" + " add r0, r5, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " lsl r4, r4, #0x1\n" + " add r4, r4, #0x1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r5, #0\n" + " mov r1, #0x1a\n" + " add r2, r4, #0\n" + " bl MenuPrint\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._230:\n" + " .align 2, 0\n" + "._229:\n" + " .word gStringVar1\n" + " .word _nakamuraStatic\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_816017C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " lsl r3, r4, #0x1\n" + " add r1, r3, #1\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r3, r3, #0x2\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0x10\n" + " mov r2, #0x1c\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r1, ._232\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0\n" + " beq ._231 @cond_branch\n" + " add r0, r4, #0\n" + " bl debug_sub_816009C\n" + " add r0, r4, #0\n" + " bl debug_sub_81600D0\n" + " add r0, r4, #0\n" + " bl debug_sub_816013C\n" + "._231:\n" + " mov r0, #0x5\n" + " bl debug_sub_81603B8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._233:\n" + " .align 2, 0\n" + "._232:\n" + " .word _nakamuraStatic\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_81601C8() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffff0\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r1, ._239\n" + " lsl r0, r5, #0x2\n" + " add r2, r0, r1\n" + " mov r4, #0x0\n" + " ldsh r0, [r2, r4]\n" + " cmp r0, #0\n" + " bne ._236 @cond_branch\n" + " ldrb r0, [r2, #0x3]\n" + " cmp r0, #0\n" + " bne ._236 @cond_branch\n" + " cmp r3, #0x1\n" + " bne ._236 @cond_branch\n" + " mov r0, #0x8a\n" + " lsl r0, r0, #0x1\n" + " strh r0, [r2]\n" + "._236:\n" + " lsl r0, r5, #0x2\n" + " add r4, r0, r1\n" + " lsl r0, r3, #0x18\n" + " asr r0, r0, #0x18\n" + " ldrh r1, [r4]\n" + " add r2, r0, r1\n" + " mov r3, #0x0\n" + " strh r2, [r4]\n" + " lsl r1, r2, #0x10\n" + " mov r0, #0xcd\n" + " lsl r0, r0, #0x11\n" + " cmp r1, r0\n" + " ble ._237 @cond_branch\n" + " ldr r1, ._239 + 4\n" + " add r0, r2, r1\n" + " strh r0, [r4]\n" + "._237:\n" + " ldrh r1, [r4]\n" + " mov r2, #0x0\n" + " ldsh r0, [r4, r2]\n" + " cmp r0, #0\n" + " bge ._238 @cond_branch\n" + " ldr r2, ._239 + 8\n" + " add r0, r1, r2\n" + " strh r0, [r4]\n" + "._238:\n" + " mov r0, #0x64\n" + " mul r0, r0, r5\n" + " ldr r1, ._239 + 12\n" + " add r0, r0, r1\n" + " ldrh r1, [r4]\n" + " ldrb r2, [r4, #0x2]\n" + " str r3, [sp]\n" + " str r3, [sp, #0x4]\n" + " str r3, [sp, #0x8]\n" + " str r3, [sp, #0xc]\n" + " mov r3, #0x20\n" + " bl CreateMon\n" + " mov r0, #0x1\n" + " strb r0, [r4, #0x3]\n" + " add sp, sp, #0x10\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._240:\n" + " .align 2, 0\n" + "._239:\n" + " .word _nakamuraStatic\n" + " .word 0xfffffe65\n" + " .word 0x19b\n" + " .word gPlayerParty\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160258() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " ldr r1, ._242\n" + " lsl r0, r2, #0x2\n" + " add r0, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0\n" + " beq ._241 @cond_branch\n" + " add r0, r2, #0\n" + " bl debug_sub_816062C\n" + "._241:\n" + " pop {r0}\n" + " bx r0\n" + "._243:\n" + " .align 2, 0\n" + "._242:\n" + " .word _nakamuraStatic\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_816027C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r4, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r2, r1, #0x18\n" + " ldr r1, ._247\n" + " lsl r0, r4, #0x2\n" + " add r3, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r3, r1]\n" + " cmp r0, #0\n" + " beq ._244 @cond_branch\n" + " lsl r0, r2, #0x18\n" + " asr r0, r0, #0x18\n" + " ldrb r1, [r3, #0x2]\n" + " add r0, r0, r1\n" + " strb r0, [r3, #0x2]\n" + " lsl r0, r0, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, #0x64\n" + " ble ._245 @cond_branch\n" + " mov r0, #0x1\n" + " strb r0, [r3, #0x2]\n" + "._245:\n" + " mov r0, #0x2\n" + " ldrsb r0, [r3, r0]\n" + " cmp r0, #0\n" + " bgt ._246 @cond_branch\n" + " mov r0, #0x64\n" + " strb r0, [r3, #0x2]\n" + "._246:\n" + " mov r0, #0x64\n" + " mul r4, r4, r0\n" + " ldr r0, ._247 + 4\n" + " add r4, r4, r0\n" + " ldr r2, ._247 + 8\n" + " mov r0, #0x0\n" + " ldsh r1, [r3, r0]\n" + " lsl r0, r1, #0x3\n" + " sub r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldrb r1, [r0, #0x13]\n" + " mov r0, #0xca\n" + " lsl r0, r0, #0x1\n" + " add r2, r1, #0\n" + " mul r2, r2, r0\n" + " mov r0, #0x2\n" + " ldrsb r0, [r3, r0]\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._247 + 12\n" + " add r0, r0, r1\n" + " add r2, r2, r0\n" + " add r0, r4, #0\n" + " mov r1, #0x19\n" + " bl SetMonData\n" + " add r0, r4, #0\n" + " bl debug_sub_803F55C\n" + "._244:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._248:\n" + " .align 2, 0\n" + "._247:\n" + " .word _nakamuraStatic\n" + " .word gPlayerParty\n" + " .word gBaseStats\n" + " .word gExperienceTables\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160308() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add sp, sp, #0xffffff8c\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " mov r2, #0x0\n" + "._252:\n" + " add r1, r2, #1\n" + " lsl r0, r1, #0x18\n" + " lsr r5, r0, #0x18\n" + " mov r8, r1\n" + " cmp r5, #0x5\n" + " bhi ._249 @cond_branch\n" + " mov r0, #0x64\n" + " mov r9, r0\n" + " mov r0, r9\n" + " mul r0, r0, r2\n" + " ldr r7, ._254\n" + " add r6, r0, r7\n" + "._251:\n" + " add r0, r6, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " bne ._250 @cond_branch\n" + " add r0, sp, #0x10\n" + " add r1, r6, #0\n" + " mov r2, #0x64\n" + " bl memcpy\n" + " mov r4, r9\n" + " mul r4, r4, r5\n" + " add r4, r4, r7\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " mov r2, #0x64\n" + " bl memcpy\n" + " add r0, r4, #0\n" + " add r1, sp, #0x10\n" + " mov r2, #0x64\n" + " bl memcpy\n" + "._250:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x5\n" + " bls ._251 @cond_branch\n" + "._249:\n" + " mov r1, r8\n" + " lsl r0, r1, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x4\n" + " bls ._252 @cond_branch\n" + " bl CalculatePlayerPartyCount\n" + " ldr r4, ._254 + 4\n" + " ldrb r1, [r4]\n" + " cmp r1, #0\n" + " bne ._253 @cond_branch\n" + " ldr r0, ._254\n" + " str r1, [sp]\n" + " str r1, [sp, #0x4]\n" + " str r1, [sp, #0x8]\n" + " str r1, [sp, #0xc]\n" + " mov r1, #0x1\n" + " mov r2, #0xa\n" + " mov r3, #0x20\n" + " bl CreateMon\n" + " mov r0, #0x1\n" + " strb r0, [r4]\n" + "._253:\n" + " add sp, sp, #0x74\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._255:\n" + " .align 2, 0\n" + "._254:\n" + " .word gPlayerParty\n" + " .word gPlayerPartyCount\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_81603B8() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r7, ._259\n" + " ldrb r4, [r7]\n" + " add r0, r4, #0\n" + " mov r1, #0x6\n" + " bl __udivsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " add r0, r4, #0\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, ._259 + 4\n" + " add r0, r5, r0\n" + " ldrb r2, [r0]\n" + " lsl r3, r4, #0x1\n" + " add r1, r3, #1\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r3, r3, #0x2\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " add r0, r2, #0\n" + " bl MenuFillWindowRectWithBlankTile\n" + " cmp r6, #0\n" + " bne ._256 @cond_branch\n" + " cmp r4, #0\n" + " beq ._257 @cond_branch\n" + " ldrb r0, [r7]\n" + " sub r0, r0, #0x1\n" + " b ._258\n" + "._260:\n" + " .align 2, 0\n" + "._259:\n" + " .word _nakamuraData+0x4\n" + " .word _843E5D1\n" + "._257:\n" + " lsl r0, r5, #0x1\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, #0x5\n" + "._258:\n" + " strb r0, [r7]\n" + "._256:\n" + " ldr r1, ._264\n" + " cmp r6, #0x1\n" + " bne ._261 @cond_branch\n" + " cmp r4, #0x5\n" + " beq ._262 @cond_branch\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " b ._263\n" + "._265:\n" + " .align 2, 0\n" + "._264:\n" + " .word _nakamuraData+0x4\n" + "._262:\n" + " lsl r0, r5, #0x1\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x1\n" + "._263:\n" + " strb r0, [r1]\n" + "._261:\n" + " cmp r6, #0x2\n" + " bne ._266 @cond_branch\n" + " cmp r5, #0\n" + " beq ._267 @cond_branch\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x6\n" + " b ._268\n" + "._267:\n" + " add r0, r4, #0\n" + " add r0, r0, #0xc\n" + "._268:\n" + " strb r0, [r1]\n" + "._266:\n" + " cmp r6, #0x3\n" + " bne ._271 @cond_branch\n" + " cmp r5, #0x2\n" + " beq ._270 @cond_branch\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x6\n" + " strb r0, [r1]\n" + " b ._271\n" + "._270:\n" + " strb r4, [r1]\n" + "._271:\n" + " ldrb r4, [r1]\n" + " add r0, r4, #0\n" + " mov r1, #0x6\n" + " bl __udivsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " add r0, r4, #0\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " ldr r0, ._272\n" + " add r0, r5, r0\n" + " ldrb r0, [r0]\n" + " lsr r1, r1, #0x17\n" + " add r1, r1, #0x1\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r2, #0xff\n" + " bl unref_sub_80F924C\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._273:\n" + " .align 2, 0\n" + "._272:\n" + " .word _843E5D1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160498() +{ + asm( + " push {r4, lr}\n" + " ldr r1, ._276\n" + " ldrh r2, [r1, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._274 @cond_branch\n" + " mov r0, #0x0\n" + " b ._281\n" + "._277:\n" + " .align 2, 0\n" + "._276:\n" + " .word gMain\n" + "._274:\n" + " mov r0, #0x80\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._278 @cond_branch\n" + " mov r0, #0x1\n" + " b ._281\n" + "._278:\n" + " mov r0, #0x20\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._280 @cond_branch\n" + " mov r0, #0x2\n" + " b ._281\n" + "._280:\n" + " mov r0, #0x10\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._282 @cond_branch\n" + " mov r0, #0x3\n" + "._281:\n" + " bl debug_sub_81603B8\n" + " mov r0, #0x0\n" + " b ._311\n" + "._282:\n" + " ldrh r1, [r1, #0x30]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._284 @cond_branch\n" + " ldr r4, ._289\n" + " ldrb r0, [r4]\n" + " cmp r0, #0x5\n" + " bhi ._285 @cond_branch\n" + " mov r1, #0x1\n" + " bl debug_sub_81601C8\n" + "._285:\n" + " ldrb r0, [r4]\n" + " sub r0, r0, #0x6\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x5\n" + " bhi ._286 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8160258\n" + "._286:\n" + " ldrb r0, [r4]\n" + " sub r0, r0, #0xc\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x5\n" + " bhi ._306 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " b ._300\n" + "._290:\n" + " .align 2, 0\n" + "._289:\n" + " .word _nakamuraData+0x4\n" + "._284:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._291 @cond_branch\n" + " ldr r4, ._294\n" + " ldrb r0, [r4]\n" + " cmp r0, #0x5\n" + " bhi ._304 @cond_branch\n" + " mov r1, #0x1\n" + " neg r1, r1\n" + " b ._293\n" + "._295:\n" + " .align 2, 0\n" + "._294:\n" + " .word _nakamuraData+0x4\n" + "._291:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._296 @cond_branch\n" + " ldr r4, ._301\n" + " ldrb r0, [r4]\n" + " cmp r0, #0x5\n" + " bhi ._297 @cond_branch\n" + " mov r1, #0xa\n" + " bl debug_sub_81601C8\n" + "._297:\n" + " ldrb r0, [r4]\n" + " sub r0, r0, #0x6\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x5\n" + " bhi ._298 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8160258\n" + "._298:\n" + " ldrb r0, [r4]\n" + " sub r0, r0, #0xc\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x5\n" + " bhi ._306 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " b ._300\n" + "._302:\n" + " .align 2, 0\n" + "._301:\n" + " .word _nakamuraData+0x4\n" + "._296:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._303 @cond_branch\n" + " ldr r4, ._308\n" + " ldrb r0, [r4]\n" + " cmp r0, #0x5\n" + " bhi ._304 @cond_branch\n" + " mov r1, #0xa\n" + " neg r1, r1\n" + "._293:\n" + " bl debug_sub_81601C8\n" + "._304:\n" + " ldrb r0, [r4]\n" + " sub r0, r0, #0x6\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x5\n" + " bhi ._305 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8160258\n" + "._305:\n" + " ldrb r0, [r4]\n" + " sub r0, r0, #0xc\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x5\n" + " bhi ._306 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " neg r1, r1\n" + "._300:\n" + " bl debug_sub_816027C\n" + "._306:\n" + " ldrb r0, [r4]\n" + " mov r1, #0x6\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_816017C\n" + " mov r0, #0x0\n" + " b ._311\n" + "._309:\n" + " .align 2, 0\n" + "._308:\n" + " .word _nakamuraData+0x4\n" + "._303:\n" + " mov r0, #0x8\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._310 @cond_branch\n" + " mov r0, #0x0\n" + " b ._311\n" + "._310:\n" + " bl debug_sub_8160308\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._311:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_816062C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add sp, sp, #0xfffffff0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " mov r0, #0x64\n" + " mov r4, r8\n" + " mul r4, r4, r0\n" + " ldr r0, ._316\n" + " add r4, r4, r0\n" + " add r0, r4, #0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " lsl r0, r0, #0x10\n" + " lsr r7, r0, #0x10\n" + " add r0, r4, #0\n" + " bl GetMonGender\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " ldr r1, ._316 + 4\n" + " lsl r0, r7, #0x3\n" + " sub r0, r0, r7\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldrb r6, [r0, #0x10]\n" + " cmp r6, #0\n" + " beq ._313 @cond_branch\n" + " cmp r6, #0xfe\n" + " beq ._313 @cond_branch\n" + " cmp r6, #0xff\n" + " bne ._314 @cond_branch\n" + "._313:\n" + " mov r0, #0x64\n" + " mov r1, r8\n" + " mul r1, r1, r0\n" + " add r0, r1, #0\n" + " ldr r1, ._316\n" + " add r0, r0, r1\n" + " bl GetMonGender\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._320\n" + "._317:\n" + " .align 2, 0\n" + "._316:\n" + " .word gPlayerParty\n" + " .word gBaseStats\n" + "._314:\n" + " cmp r2, #0\n" + " beq ._318 @cond_branch\n" + " cmp r2, #0xfe\n" + " beq ._319 @cond_branch\n" + " mov r0, #0x0\n" + " b ._320\n" + "._318:\n" + " mov r6, #0xfe\n" + " b ._321\n" + "._319:\n" + " mov r6, #0x0\n" + "._321:\n" + " mov r0, r8\n" + " lsl r0, r0, #0x2\n" + " mov r9, r0\n" + "._322:\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " orr r5, r5, r0\n" + " add r0, r7, #0\n" + " add r1, r5, #0\n" + " bl GetGenderFromSpeciesAndPersonality\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, r6\n" + " bne ._322 @cond_branch\n" + " mov r0, #0x64\n" + " mov r4, r8\n" + " mul r4, r4, r0\n" + " ldr r0, ._323\n" + " add r4, r4, r0\n" + " add r0, r4, #0\n" + " mov r1, #0x42\n" + " bl GetMonData\n" + " ldr r0, ._323 + 4\n" + " add r0, r0, r9\n" + " ldrh r1, [r0]\n" + " ldrb r2, [r0, #0x2]\n" + " mov r0, #0x1\n" + " str r0, [sp]\n" + " str r5, [sp, #0x4]\n" + " mov r0, #0x0\n" + " str r0, [sp, #0x8]\n" + " str r0, [sp, #0xc]\n" + " add r0, r4, #0\n" + " mov r3, #0x20\n" + " bl CreateMon\n" + " add r0, r6, #0\n" + "._320:\n" + " add sp, sp, #0x10\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._324:\n" + " .align 2, 0\n" + "._323:\n" + " .word gPlayerParty\n" + " .word _nakamuraStatic\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160714() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add sp, sp, #0xfffffff0\n" + " add r6, r0, #0\n" + " mov r9, r1\n" + " mov r7, #0x0\n" + " mov r0, #0x0\n" + " mov r8, r0\n" + " mov r2, #0x0\n" + " mov r5, #0x0\n" + "._329:\n" + " add r4, r5, #1\n" + " lsl r1, r4, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r0, r9\n" + " str r2, [sp, #0xc]\n" + " bl sub_810CA9C\n" + " add r1, r0, #0\n" + " lsl r0, r5, #0x1\n" + " add r0, r0, sp\n" + " strh r1, [r0]\n" + " ldr r2, [sp, #0xc]\n" + " cmp r5, #0x5\n" + " beq ._328 @cond_branch\n" + " lsl r0, r1, #0x10\n" + " asr r1, r0, #0x10\n" + " cmp r1, #0\n" + " ble ._326 @cond_branch\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._326:\n" + " cmp r1, #0\n" + " bge ._327 @cond_branch\n" + " mov r0, r8\n" + " add r0, r0, #0x1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + "._327:\n" + " cmp r1, #0\n" + " bne ._328 @cond_branch\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + "._328:\n" + " lsl r0, r4, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x5\n" + " bls ._329 @cond_branch\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x31\n" + " bgt ._333 @cond_branch\n" + " mov r0, sp\n" + " ldrh r0, [r0, #0x2]\n" + " lsl r0, r0, #0x10\n" + " asr r0, r0, #0x10\n" + " cmp r0, #0x31\n" + " bgt ._333 @cond_branch\n" + " mov r0, sp\n" + " mov r4, #0x4\n" + " ldsh r0, [r0, r4]\n" + " cmp r0, #0x31\n" + " bgt ._333 @cond_branch\n" + " mov r0, sp\n" + " mov r1, #0x6\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x31\n" + " bgt ._333 @cond_branch\n" + " mov r0, sp\n" + " mov r4, #0x8\n" + " ldsh r0, [r0, r4]\n" + " cmp r0, #0x31\n" + " ble ._334 @cond_branch\n" + "._333:\n" + " ldr r1, ._336\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0xe\n" + " b ._400\n" + "._337:\n" + " .align 2, 0\n" + "._336:\n" + " .word ContestStatsText_GoldPokeBlock\n" + "._334:\n" + " cmp r7, #0x4\n" + " bne ._338 @cond_branch\n" + " ldr r1, ._340\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0xd\n" + " b ._400\n" + "._341:\n" + " .align 2, 0\n" + "._340:\n" + " .word ContestStatsText_WhitePokeBlock\n" + "._338:\n" + " mov r3, #0x0\n" + " mov r5, #0x0\n" + "._343:\n" + " lsl r0, r5, #0x1\n" + " add r0, r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0x2\n" + " bne ._342 @cond_branch\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + "._342:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x4\n" + " bls ._343 @cond_branch\n" + " cmp r3, #0x3\n" + " beq ._345 @cond_branch\n" + " cmp r2, #0x5\n" + " beq ._345 @cond_branch\n" + " mov r4, r8\n" + " cmp r4, #0x4\n" + " bne ._346 @cond_branch\n" + "._345:\n" + " ldr r1, ._348\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0xc\n" + " b ._400\n" + "._349:\n" + " .align 2, 0\n" + "._348:\n" + " .word ContestStatsText_BlackPokeBlock\n" + "._346:\n" + " cmp r7, #0x3\n" + " bne ._350 @cond_branch\n" + " ldr r1, ._352\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0xb\n" + " b ._400\n" + "._353:\n" + " .align 2, 0\n" + "._352:\n" + " .word ContestStatsText_GrayPokeBlock\n" + "._350:\n" + " cmp r7, #0x2\n" + " beq ._354 @cond_branch\n" + " mov r0, r8\n" + " cmp r0, #0x2\n" + " bne ._377 @cond_branch\n" + "._354:\n" + " mov r3, #0x6\n" + " mov r2, #0x0\n" + " mov r5, #0x0\n" + "._359:\n" + " lsl r0, r5, #0x1\n" + " add r0, r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0\n" + " beq ._358 @cond_branch\n" + " cmp r3, #0x6\n" + " bne ._357 @cond_branch\n" + " add r3, r5, #0\n" + " b ._358\n" + "._357:\n" + " add r2, r5, #0\n" + "._358:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x4\n" + " bls ._359 @cond_branch\n" + " lsl r0, r3, #0x1\n" + " mov r4, sp\n" + " add r1, r4, r0\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, sp\n" + " mov r4, #0x0\n" + " ldsh r1, [r1, r4]\n" + " mov r4, #0x0\n" + " ldsh r0, [r0, r4]\n" + " cmp r1, r0\n" + " blt ._360 @cond_branch\n" + " add r2, r3, #0\n" + "._360:\n" + " cmp r2, #0\n" + " bne ._361 @cond_branch\n" + " ldr r1, ._363\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x6\n" + " b ._400\n" + "._364:\n" + " .align 2, 0\n" + "._363:\n" + " .word ContestStatsText_PurplePokeBlock\n" + "._361:\n" + " cmp r2, #0x1\n" + " bne ._365 @cond_branch\n" + " ldr r1, ._367\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x7\n" + " b ._400\n" + "._368:\n" + " .align 2, 0\n" + "._367:\n" + " .word ContestStatsText_IndigoPokeBlock\n" + "._365:\n" + " cmp r2, #0x2\n" + " bne ._369 @cond_branch\n" + " ldr r1, ._371\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x8\n" + " b ._400\n" + "._372:\n" + " .align 2, 0\n" + "._371:\n" + " .word ContestStatsText_BrownPokeBlock\n" + "._369:\n" + " cmp r2, #0x3\n" + " bne ._373 @cond_branch\n" + " ldr r1, ._375\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x9\n" + " b ._400\n" + "._376:\n" + " .align 2, 0\n" + "._375:\n" + " .word ContestStatsText_LiteBluePokeBlock\n" + "._373:\n" + " cmp r2, #0x4\n" + " bne ._377 @cond_branch\n" + " ldr r1, ._379\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0xa\n" + " b ._400\n" + "._380:\n" + " .align 2, 0\n" + "._379:\n" + " .word ContestStatsText_OlivePokeBlock\n" + "._377:\n" + " cmp r7, #0x1\n" + " beq ._381 @cond_branch\n" + " mov r0, r8\n" + " cmp r0, #0x1\n" + " bne ._399 @cond_branch\n" + "._381:\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0\n" + " beq ._383 @cond_branch\n" + " ldr r1, ._385\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x1\n" + " b ._400\n" + "._386:\n" + " .align 2, 0\n" + "._385:\n" + " .word ContestStatsText_RedPokeBlock\n" + "._383:\n" + " mov r0, sp\n" + " ldrh r0, [r0, #0x2]\n" + " cmp r0, #0\n" + " beq ._387 @cond_branch\n" + " ldr r1, ._389\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x2\n" + " b ._400\n" + "._390:\n" + " .align 2, 0\n" + "._389:\n" + " .word ContestStatsText_BluePokeBlock\n" + "._387:\n" + " mov r0, sp\n" + " mov r4, #0x4\n" + " ldsh r0, [r0, r4]\n" + " cmp r0, #0\n" + " beq ._391 @cond_branch\n" + " ldr r1, ._393\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x3\n" + " b ._400\n" + "._394:\n" + " .align 2, 0\n" + "._393:\n" + " .word ContestStatsText_PinkPokeBlock\n" + "._391:\n" + " mov r0, sp\n" + " mov r1, #0x6\n" + " ldsh r0, [r0, r1]\n" + " cmp r0, #0\n" + " beq ._395 @cond_branch\n" + " ldr r1, ._397\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x4\n" + " b ._400\n" + "._398:\n" + " .align 2, 0\n" + "._397:\n" + " .word ContestStatsText_GreenPokeBlock\n" + "._395:\n" + " mov r0, sp\n" + " mov r4, #0x8\n" + " ldsh r0, [r0, r4]\n" + " cmp r0, #0\n" + " beq ._399 @cond_branch\n" + " ldr r1, ._401\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x5\n" + " b ._400\n" + "._402:\n" + " .align 2, 0\n" + "._401:\n" + " .word ContestStatsText_YellowPokeBlock\n" + "._399:\n" + " ldr r1, ._403\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " mov r0, #0x0\n" + "._400:\n" + " add sp, sp, #0x10\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._404:\n" + " .align 2, 0\n" + "._403:\n" + " .word gOtherText_FiveQuestions\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_816097C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add r7, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r5, r1, #0x10\n" + " mov r6, #0x0\n" + " mov r1, #0x0\n" + "._405:\n" + " add r0, r7, r6\n" + " strb r1, [r0]\n" + " add r0, r6, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " cmp r6, #0x3\n" + " bls ._405 @cond_branch\n" + " mov r0, #0xff\n" + " strb r0, [r7, #0x4]\n" + " lsl r0, r5, #0x10\n" + " asr r0, r0, #0x10\n" + " cmp r0, #0\n" + " bne ._406 @cond_branch\n" + " mov r0, #0xa1\n" + " strb r0, [r7, #0x3]\n" + " b ._414\n" + "._406:\n" + " cmp r0, #0\n" + " ble ._408 @cond_branch\n" + " mov r4, #0x64\n" + " mov r0, #0x0\n" + " mov r8, r0\n" + " mov r6, #0x0\n" + "._412:\n" + " lsl r5, r5, #0x10\n" + " asr r0, r5, #0x10\n" + " lsl r4, r4, #0x10\n" + " asr r1, r4, #0x10\n" + " bl __divsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " mov r1, r8\n" + " cmp r1, #0\n" + " bne ._410 @cond_branch\n" + " cmp r6, #0x2\n" + " beq ._410 @cond_branch\n" + " cmp r2, #0\n" + " beq ._411 @cond_branch\n" + "._410:\n" + " add r1, r6, r7\n" + " add r0, r2, #0\n" + " sub r0, r0, #0x5f\n" + " strb r0, [r1, #0x1]\n" + " mov r0, #0x1\n" + " mov r8, r0\n" + "._411:\n" + " asr r0, r5, #0x10\n" + " asr r4, r4, #0x10\n" + " add r1, r4, #0\n" + " bl __modsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " add r0, r4, #0\n" + " mov r1, #0xa\n" + " bl __divsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " add r0, r6, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " cmp r6, #0x2\n" + " bls ._412 @cond_branch\n" + " b ._414\n" + "._408:\n" + " cmp r0, #0\n" + " bge ._414 @cond_branch\n" + " neg r0, r0\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " mov r4, #0x64\n" + " mov r1, #0x0\n" + " mov r8, r1\n" + " mov r6, #0x0\n" + "._419:\n" + " lsl r5, r5, #0x10\n" + " asr r0, r5, #0x10\n" + " lsl r4, r4, #0x10\n" + " asr r1, r4, #0x10\n" + " bl __divsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " mov r1, r8\n" + " lsl r0, r1, #0x10\n" + " add r3, r0, #0\n" + " cmp r3, #0\n" + " bne ._416 @cond_branch\n" + " cmp r6, #0x2\n" + " beq ._416 @cond_branch\n" + " cmp r2, #0\n" + " beq ._417 @cond_branch\n" + "._416:\n" + " add r1, r6, r7\n" + " add r0, r2, #0\n" + " sub r0, r0, #0x5f\n" + " strb r0, [r1, #0x1]\n" + " cmp r3, #0\n" + " bne ._418 @cond_branch\n" + " mov r0, #0xae\n" + " strb r0, [r1]\n" + "._418:\n" + " mov r0, #0x1\n" + " mov r8, r0\n" + "._417:\n" + " asr r0, r5, #0x10\n" + " asr r4, r4, #0x10\n" + " add r1, r4, #0\n" + " bl __modsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " add r0, r4, #0\n" + " mov r1, #0xa\n" + " bl __divsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " add r0, r6, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " cmp r6, #0x2\n" + " bls ._419 @cond_branch\n" + "._414:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160A80() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r2, r0, #0\n" + " ldr r1, ._422\n" + " cmp r0, #0\n" + " bne ._420 @cond_branch\n" + " ldr r4, ._422 + 4\n" + " ldrb r1, [r1, #0x1]\n" + " add r0, r4, #0\n" + " bl debug_sub_816097C\n" + " add r0, r4, #0\n" + " mov r1, #0x8\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " b ._440\n" + "._423:\n" + " .align 2, 0\n" + "._422:\n" + " .word _nakamuraStatic+0x18\n" + " .word gStringVar1\n" + "._420:\n" + " cmp r0, #0x1\n" + " bne ._424 @cond_branch\n" + " ldr r4, ._426\n" + " ldrb r1, [r1, #0x2]\n" + " add r0, r4, #0\n" + " bl debug_sub_816097C\n" + " add r0, r4, #0\n" + " mov r1, #0x8\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " b ._440\n" + "._427:\n" + " .align 2, 0\n" + "._426:\n" + " .word gStringVar1\n" + "._424:\n" + " cmp r0, #0x2\n" + " bne ._428 @cond_branch\n" + " ldr r4, ._430\n" + " ldrb r1, [r1, #0x3]\n" + " add r0, r4, #0\n" + " bl debug_sub_816097C\n" + " add r0, r4, #0\n" + " mov r1, #0x8\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " b ._440\n" + "._431:\n" + " .align 2, 0\n" + "._430:\n" + " .word gStringVar1\n" + "._428:\n" + " cmp r0, #0x3\n" + " bne ._432 @cond_branch\n" + " ldr r4, ._434\n" + " ldrb r1, [r1, #0x4]\n" + " add r0, r4, #0\n" + " bl debug_sub_816097C\n" + " add r0, r4, #0\n" + " mov r1, #0x8\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " b ._440\n" + "._435:\n" + " .align 2, 0\n" + "._434:\n" + " .word gStringVar1\n" + "._432:\n" + " cmp r0, #0x4\n" + " bne ._436 @cond_branch\n" + " ldr r4, ._438\n" + " ldrb r1, [r1, #0x5]\n" + " add r0, r4, #0\n" + " bl debug_sub_816097C\n" + " add r0, r4, #0\n" + " mov r1, #0x8\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " b ._440\n" + "._439:\n" + " .align 2, 0\n" + "._438:\n" + " .word gStringVar1\n" + "._436:\n" + " cmp r2, #0x5\n" + " bne ._440 @cond_branch\n" + " ldr r4, ._441\n" + " ldrb r1, [r1, #0x6]\n" + " add r0, r4, #0\n" + " bl debug_sub_816097C\n" + " add r0, r4, #0\n" + " mov r1, #0x8\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + "._440:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._442:\n" + " .align 2, 0\n" + "._441:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160B50() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r3, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r4, r1, #0\n" + " ldr r2, ._445\n" + " cmp r0, #0\n" + " bne ._443 @cond_branch\n" + " ldrb r0, [r2, #0x1]\n" + " add r0, r0, r1\n" + " strb r0, [r2, #0x1]\n" + " b ._455\n" + "._446:\n" + " .align 2, 0\n" + "._445:\n" + " .word _nakamuraStatic+0x18\n" + "._443:\n" + " cmp r0, #0x1\n" + " bne ._447 @cond_branch\n" + " ldrb r0, [r2, #0x2]\n" + " add r0, r0, r1\n" + " strb r0, [r2, #0x2]\n" + " b ._455\n" + "._447:\n" + " cmp r0, #0x2\n" + " bne ._449 @cond_branch\n" + " ldrb r0, [r2, #0x3]\n" + " add r0, r0, r1\n" + " strb r0, [r2, #0x3]\n" + " b ._455\n" + "._449:\n" + " cmp r0, #0x3\n" + " bne ._451 @cond_branch\n" + " ldrb r0, [r2, #0x4]\n" + " add r0, r0, r1\n" + " strb r0, [r2, #0x4]\n" + " b ._455\n" + "._451:\n" + " cmp r0, #0x4\n" + " bne ._453 @cond_branch\n" + " ldrb r0, [r2, #0x5]\n" + " add r0, r0, r1\n" + " strb r0, [r2, #0x5]\n" + " b ._455\n" + "._453:\n" + " cmp r3, #0x5\n" + " bne ._455 @cond_branch\n" + " ldrb r0, [r2, #0x6]\n" + " add r0, r0, r4\n" + " strb r0, [r2, #0x6]\n" + "._455:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160BB0() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r5, ._456\n" + " ldr r4, ._456 + 4\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " bl debug_sub_8160714\n" + " strb r0, [r4]\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x8\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._457:\n" + " .align 2, 0\n" + "._456:\n" + " .word gStringVar1\n" + " .word _nakamuraStatic+0x18\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160BE4() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xc\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " bl debug_sub_8160BB0\n" + " ldr r0, ._459\n" + " mov r1, #0x2\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r0, ._459 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldr r0, ._459 + 8\n" + " mov r1, #0x2\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r0, ._459 + 12\n" + " mov r1, #0x2\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " ldr r0, ._459 + 16\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " ldr r0, ._459 + 20\n" + " mov r1, #0x2\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " mov r4, #0x0\n" + "._458:\n" + " add r0, r4, #0\n" + " bl debug_sub_8160A80\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x5\n" + " bls ._458 @cond_branch\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xb\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._460:\n" + " .align 2, 0\n" + "._459:\n" + " .word gContestStatsText_Spicy\n" + " .word gContestStatsText_Dry\n" + " .word gContestStatsText_Sweet\n" + " .word gContestStatsText_Bitter\n" + " .word gContestStatsText_Sour\n" + " .word gContestStatsText_Tasty\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160C7C() +{ + asm( + " push {r4, lr}\n" + " ldr r2, ._469\n" + " mov r1, #0x0\n" + " ldrb r0, [r2]\n" + " cmp r0, #0xc\n" + " bne ._467 @cond_branch\n" + " ldrb r0, [r2, #0x1]\n" + " cmp r0, #0x2\n" + " bne ._462 @cond_branch\n" + " mov r1, #0x1\n" + "._462:\n" + " ldrb r0, [r2, #0x3]\n" + " cmp r0, #0x2\n" + " bne ._463 @cond_branch\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + "._463:\n" + " ldrb r0, [r2, #0x4]\n" + " cmp r0, #0x2\n" + " bne ._464 @cond_branch\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + "._464:\n" + " ldrb r0, [r2, #0x2]\n" + " cmp r0, #0x2\n" + " bne ._465 @cond_branch\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + "._465:\n" + " ldrb r0, [r2, #0x5]\n" + " cmp r0, #0x2\n" + " bne ._466 @cond_branch\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + "._466:\n" + " cmp r1, #0x3\n" + " beq ._467 @cond_branch\n" + " mov r0, #0x2\n" + " strb r0, [r2, #0x1]\n" + " strb r0, [r2, #0x3]\n" + " strb r0, [r2, #0x4]\n" + "._467:\n" + " add r0, r2, #0\n" + " bl sub_810CA34\n" + " bl debug_sub_8160BB0\n" + " mov r4, #0x0\n" + "._468:\n" + " add r0, r4, #0\n" + " bl debug_sub_8160A80\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x5\n" + " bls ._468 @cond_branch\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._470:\n" + " .align 2, 0\n" + "._469:\n" + " .word _nakamuraStatic+0x18\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160CF4() +{ + asm( + " push {lr}\n" + " ldr r2, ._473\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._471 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " b ._472\n" + "._474:\n" + " .align 2, 0\n" + "._473:\n" + " .word gMain\n" + "._471:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._475 @cond_branch\n" + " mov r0, #0x1\n" + "._472:\n" + " bl MoveMenuCursor\n" + " mov r0, #0x0\n" + " b ._484\n" + "._475:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._477 @cond_branch\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " neg r1, r1\n" + " b ._478\n" + "._477:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._479 @cond_branch\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + "._478:\n" + " bl debug_sub_8160B50\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl debug_sub_8160A80\n" + " bl debug_sub_8160BB0\n" + " mov r0, #0x0\n" + " b ._484\n" + "._479:\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._481 @cond_branch\n" + " bl debug_sub_8160C7C\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x0\n" + " b ._484\n" + "._481:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._483 @cond_branch\n" + " mov r0, #0x0\n" + " b ._484\n" + "._483:\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._484:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +u8 debug_sub_8160D98() +{ + asm( + " push {lr}\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " bl debug_sub_8160BE4\n" + " ldr r1, ._485\n" + " ldr r0, ._485 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._486:\n" + " .align 2, 0\n" + "._485:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8160CF4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160DC0() +{ + asm( + " push {lr}\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x16\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._487\n" + " mov r1, #0xb\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 8\n" + " mov r1, #0x2\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 12\n" + " mov r1, #0x2\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 16\n" + " mov r1, #0x2\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 20\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 24\n" + " mov r1, #0x2\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 28\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r0, ._487 + 32\n" + " mov r1, #0x2\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " pop {r0}\n" + " bx r0\n" + "._488:\n" + " .align 2, 0\n" + "._487:\n" + " .word gOtherText_Slash\n" + " .word Str_843E5F2\n" + " .word Str_843E5FB\n" + " .word Str_843E606\n" + " .word Str_843E611\n" + " .word Str_843E61C\n" + " .word Str_843E627\n" + " .word Str_843E637\n" + " .word Str_843E632\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8160E50() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0xa\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r5, ._489\n" + " add r0, r6, #0\n" + " mov r1, #0x2\n" + " add r2, r5, #0\n" + " bl GetMonData\n" + " add r0, r5, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r0, #0xc\n" + " mov r1, #0x1\n" + " mov r2, #0x15\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r6, #0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " mov r1, #0xb\n" + " mul r0, r0, r1\n" + " ldr r1, ._489 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xc\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x1a\n" + " bl GetMonData\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0x3\n" + " mov r2, #0x11\n" + " mov r3, #0x4\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x1b\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r4, r4, r1\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0x5\n" + " mov r2, #0x11\n" + " mov r3, #0x6\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x1c\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r4, r4, r1\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0x7\n" + " mov r2, #0x11\n" + " mov r3, #0x8\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x1d\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r4, r4, r1\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0x9\n" + " mov r2, #0x11\n" + " mov r3, #0xa\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x1e\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r4, r4, r1\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0xb\n" + " mov r2, #0x11\n" + " mov r3, #0xc\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x1f\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r4, r4, r1\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0xd\n" + " mov r2, #0x11\n" + " mov r3, #0xe\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0xf\n" + " mov r2, #0x11\n" + " mov r3, #0x10\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x20\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0xd\n" + " mov r1, #0x11\n" + " mov r2, #0x11\n" + " mov r3, #0x12\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0xd\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._490:\n" + " .align 2, 0\n" + "._489:\n" + " .word gStringVar1\n" + " .word gSpeciesNames\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8161028() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._491 @cond_branch\n" + " ldr r0, ._496\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._492 @cond_branch\n" + " mov r5, #0x5\n" + "._494:\n" + " lsl r0, r5, #0x10\n" + " asr r4, r0, #0x10\n" + " mov r0, #0x64\n" + " mul r0, r0, r4\n" + " ldr r1, ._496 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " bne ._493 @cond_branch\n" + " sub r0, r4, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " cmp r0, #0\n" + " bge ._494 @cond_branch\n" + "._492:\n" + " ldr r1, ._496\n" + " ldrb r0, [r1]\n" + " add r0, r0, r6\n" + " strb r0, [r1]\n" + " b ._506\n" + "._497:\n" + " .align 2, 0\n" + "._496:\n" + " .word _nakamuraData+0x5\n" + " .word gPlayerParty\n" + "._491:\n" + " cmp r1, #0x1\n" + " bne ._506 @cond_branch\n" + " ldr r4, ._501\n" + " ldrb r0, [r4]\n" + " add r0, r0, r6\n" + " strb r0, [r4]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x6\n" + " bne ._499 @cond_branch\n" + " mov r0, #0x0\n" + " b ._500\n" + "._502:\n" + " .align 2, 0\n" + "._501:\n" + " .word _nakamuraData+0x5\n" + "._493:\n" + " ldr r0, ._504\n" + " strb r5, [r0]\n" + " b ._506\n" + "._505:\n" + " .align 2, 0\n" + "._504:\n" + " .word _nakamuraData+0x5\n" + "._499:\n" + " ldrb r1, [r4]\n" + " mov r0, #0x64\n" + " mul r0, r0, r1\n" + " ldr r1, ._507\n" + " add r0, r0, r1\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " bne ._506 @cond_branch\n" + "._500:\n" + " strb r0, [r4]\n" + "._506:\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._508:\n" + " .align 2, 0\n" + "._507:\n" + " .word gPlayerParty\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_81610BC() +{ + asm( + " push {lr}\n" + " ldr r0, ._511\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._509 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " b ._510\n" + "._512:\n" + " .align 2, 0\n" + "._511:\n" + " .word gMain\n" + "._509:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._513 @cond_branch\n" + " mov r0, #0x1\n" + "._510:\n" + " bl debug_sub_8161028\n" + " ldr r0, ._515\n" + " ldrb r1, [r0]\n" + " mov r0, #0x64\n" + " mul r0, r0, r1\n" + " ldr r1, ._515 + 4\n" + " add r0, r0, r1\n" + " bl debug_sub_8160E50\n" + " mov r0, #0x0\n" + " b ._518\n" + "._516:\n" + " .align 2, 0\n" + "._515:\n" + " .word _nakamuraData+0x5\n" + " .word gPlayerParty\n" + "._513:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._517 @cond_branch\n" + " mov r0, #0x0\n" + " b ._518\n" + "._517:\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._518:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_EffortValues() +{ + asm( + " push {lr}\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " ldr r1, ._519\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " bl debug_sub_8160DC0\n" + " ldr r0, ._519 + 4\n" + " bl debug_sub_8160E50\n" + " ldr r1, ._519 + 8\n" + " ldr r0, ._519 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._520:\n" + " .align 2, 0\n" + "._519:\n" + " .word _nakamuraData+0x5\n" + " .word gPlayerParty\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_81610BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8161160() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " mov r7, #0x0\n" + " ldr r2, ._523\n" + " ldr r1, ._523 + 4\n" + " ldrh r0, [r2]\n" + " ldrh r3, [r1]\n" + " cmp r0, r3\n" + " bhi ._521 @cond_branch\n" + " add r6, r0, #0\n" + " ldrh r5, [r1]\n" + " b ._522\n" + "._524:\n" + " .align 2, 0\n" + "._523:\n" + " .word _nakamuraData+0x6\n" + " .word _nakamuraData+0x8\n" + "._521:\n" + " ldrh r6, [r1]\n" + " ldrh r5, [r2]\n" + "._522:\n" + " mov r4, #0x0\n" + " ldr r0, ._529\n" + " ldrh r0, [r0]\n" + " cmp r4, r0\n" + " bcs ._525 @cond_branch\n" + " ldr r0, ._529 + 4\n" + " mov r8, r0\n" + "._528:\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r2, r8\n" + " ldrh r1, [r2]\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, r6\n" + " bcc ._527 @cond_branch\n" + " cmp r0, r5\n" + " bhi ._527 @cond_branch\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r7, r0, #0x10\n" + "._527:\n" + " add r4, r4, #0x1\n" + " ldr r0, ._529\n" + " ldrh r0, [r0]\n" + " cmp r4, r0\n" + " bcc ._528 @cond_branch\n" + "._525:\n" + " add r0, r7, #0\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._530:\n" + " .align 2, 0\n" + "._529:\n" + " .word _nakamuraData+0xa\n" + " .word _nakamuraData+0xc\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_81611D8() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xf\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._531\n" + " mov r1, #0x2\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._531 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r0, ._531 + 8\n" + " mov r1, #0x2\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldr r0, ._531 + 12\n" + " mov r1, #0x2\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r0, ._531 + 16\n" + " mov r1, #0x2\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " ldr r0, ._531 + 20\n" + " mov r1, #0xd\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " ldr r4, ._531 + 24\n" + " add r0, r4, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xe\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._532:\n" + " .align 2, 0\n" + "._531:\n" + " .word Str_843E642\n" + " .word Str_843E647\n" + " .word Str_843E65A\n" + " .word Str_843E64C\n" + " .word Str_843E651\n" + " .word Str_843E655\n" + " .word Str_843E658\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8161290() +{ + asm( + " push {r4, lr}\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " ldr r4, ._533\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x8\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._534:\n" + " .align 2, 0\n" + "._533:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_81612B8() +{ + asm( + " push {r4, r5, lr}\n" + " add r4, r2, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " lsl r1, r1, #0x18\n" + " asr r1, r1, #0x18\n" + " ldrh r2, [r0]\n" + " add r1, r1, r2\n" + " strh r1, [r0]\n" + " ldr r5, ._535\n" + " ldrh r1, [r0]\n" + " add r0, r5, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r5, #0\n" + " mov r1, #0x8\n" + " add r2, r4, #0\n" + " bl MenuPrint\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._536:\n" + " .align 2, 0\n" + "._535:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_81612EC() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r2, ._540\n" + " ldrh r1, [r2, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " mov r5, #0x1\n" + " cmp r0, #0\n" + " beq ._537 @cond_branch\n" + " mov r5, #0x64\n" + "._537:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._538 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " b ._539\n" + "._541:\n" + " .align 2, 0\n" + "._540:\n" + " .word gMain\n" + "._538:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._542 @cond_branch\n" + " mov r0, #0x1\n" + "._539:\n" + " bl MoveMenuCursor\n" + "._565:\n" + " mov r0, #0x0\n" + " b ._543\n" + "._542:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._544 @cond_branch\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " asr r4, r0, #0x18\n" + " cmp r4, #0\n" + " bne ._545 @cond_branch\n" + " ldr r0, ._550\n" + " neg r1, r5\n" + " mov r2, #0x1\n" + " bl debug_sub_81612B8\n" + "._545:\n" + " cmp r4, #0x1\n" + " bne ._546 @cond_branch\n" + " ldr r0, ._550 + 4\n" + " neg r1, r5\n" + " mov r2, #0x3\n" + " bl debug_sub_81612B8\n" + "._546:\n" + " cmp r4, #0x2\n" + " bne ._547 @cond_branch\n" + " ldr r0, ._550 + 8\n" + " neg r1, r5\n" + " mov r2, #0x5\n" + " bl debug_sub_81612B8\n" + "._547:\n" + " cmp r4, #0x3\n" + " bne ._565 @cond_branch\n" + " ldr r0, ._550 + 12\n" + " neg r1, r5\n" + " mov r2, #0x7\n" + " bl debug_sub_81612B8\n" + " b ._565\n" + "._551:\n" + " .align 2, 0\n" + "._550:\n" + " .word _nakamuraData+0x6\n" + " .word _nakamuraData+0x8\n" + " .word _nakamuraData+0xc\n" + " .word _nakamuraData+0xa\n" + "._544:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._552 @cond_branch\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " asr r4, r0, #0x18\n" + " cmp r4, #0\n" + " bne ._553 @cond_branch\n" + " ldr r0, ._558\n" + " add r1, r5, #0\n" + " mov r2, #0x1\n" + " bl debug_sub_81612B8\n" + "._553:\n" + " cmp r4, #0x1\n" + " bne ._554 @cond_branch\n" + " ldr r0, ._558 + 4\n" + " add r1, r5, #0\n" + " mov r2, #0x3\n" + " bl debug_sub_81612B8\n" + "._554:\n" + " cmp r4, #0x2\n" + " bne ._555 @cond_branch\n" + " ldr r0, ._558 + 8\n" + " add r1, r5, #0\n" + " mov r2, #0x5\n" + " bl debug_sub_81612B8\n" + "._555:\n" + " cmp r4, #0x3\n" + " bne ._565 @cond_branch\n" + " ldr r0, ._558 + 12\n" + " add r1, r5, #0\n" + " mov r2, #0x7\n" + " bl debug_sub_81612B8\n" + " b ._565\n" + "._559:\n" + " .align 2, 0\n" + "._558:\n" + " .word _nakamuraData+0x6\n" + " .word _nakamuraData+0x8\n" + " .word _nakamuraData+0xc\n" + " .word _nakamuraData+0xa\n" + "._552:\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._560 @cond_branch\n" + " ldr r0, ._563\n" + " ldrh r0, [r0]\n" + " cmp r0, #0\n" + " beq ._565 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " bl debug_sub_8161160\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl debug_sub_8161290\n" + " b ._565\n" + "._564:\n" + " .align 2, 0\n" + "._563:\n" + " .word _nakamuraData+0xc\n" + "._560:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._565 @cond_branch\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._543:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_RandomNumberTest() +{ + asm( + " push {lr}\n" + " ldr r0, ._566\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " ldr r0, ._566 + 4\n" + " strh r1, [r0]\n" + " ldr r0, ._566 + 8\n" + " strh r1, [r0]\n" + " ldr r0, ._566 + 12\n" + " strh r1, [r0]\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " bl debug_sub_81611D8\n" + " ldr r1, ._566 + 16\n" + " ldr r0, ._566 + 20\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._567:\n" + " .align 2, 0\n" + "._566:\n" + " .word _nakamuraData+0x6\n" + " .word _nakamuraData+0x8\n" + " .word _nakamuraData+0xc\n" + " .word _nakamuraData+0xa\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_81612EC+1\n" + "\n" + ); +} + +#endif // DEBUG diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c new file mode 100644 index 000000000..b7e62481b --- /dev/null +++ b/src/debug/nohara_debug_menu.c @@ -0,0 +1,2316 @@ +#ifdef DEBUG +#include "global.h" + +#define BSS_DATA __attribute__((section(".bss"))) + +BSS_DATA u8 gDebug_03000724[4] = { 0 }; + +__attribute__((naked)) +void InitNoharaDebugMenu() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x13\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._1\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x12\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._1 + 4\n" + " ldr r0, ._1 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._2:\n" + " .align 2, 0\n" + "._1:\n" + " .word gUnknown_Debug_083C4938\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808F414+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F414() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._3 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " beq ._4 @cond_branch\n" + " ldr r2, ._6\n" + " ldr r0, ._6 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + "._3:\n" + " mov r0, #0x0\n" + " b ._5\n" + "._7:\n" + " .align 2, 0\n" + "._6:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C4938\n" + "._4:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._5:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_TV() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " ldr r1, ._8\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xa\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._8 + 4\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x9\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._8 + 8\n" + " ldr r0, ._8 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._9:\n" + " .align 2, 0\n" + "._8:\n" + " .word gDebug_03000724+0x2\n" + " .word gUnknown_Debug_083C4B8C\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808F4AC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F4AC() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._10 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " beq ._11 @cond_branch\n" + " ldr r2, ._13\n" + " ldr r0, ._13 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + "._10:\n" + " mov r0, #0x0\n" + " b ._12\n" + "._14:\n" + " .align 2, 0\n" + "._13:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C4B8C\n" + "._11:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._12:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F4EC() +{ + asm( + " push {lr}\n" + " bl debug_sub_808F6BC\n" + " ldr r0, ._15\n" + " bl sub_8071F40\n" + " mov r0, #0x3\n" + " mov r1, #0x3\n" + " mov r2, #0x1\n" + " bl DisplayYesNoMenu\n" + " ldr r1, ._15 + 4\n" + " ldr r0, ._15 + 8\n" + " str r0, [r1]\n" + " pop {r0}\n" + " bx r0\n" + "._16:\n" + " .align 2, 0\n" + "._15:\n" + " .word gUnknown_Debug_083C4980\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808F648+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F518() +{ + asm( + " push {r4, lr}\n" + " mov r2, #0x0\n" + " ldr r4, ._20\n" + " ldr r3, ._20 + 4\n" + "._19:\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x2\n" + " add r1, r0, r4\n" + " add r0, r1, r3\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x15\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x13\n" + " bhi ._18 @cond_branch\n" + " ldr r0, ._20 + 8\n" + " add r1, r1, r0\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._18 @cond_branch\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + "._18:\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x17\n" + " bls ._19 @cond_branch\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._21:\n" + " .align 2, 0\n" + "._20:\n" + " .word gSaveBlock1\n" + " .word 0x2738\n" + " .word 0x2739\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F560() +{ + asm( + " push {r4, lr}\n" + " mov r1, #0x0\n" + " ldr r4, ._23\n" + " ldr r3, ._23 + 4\n" + " mov r2, #0x0\n" + "._22:\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r4\n" + " add r0, r0, r3\n" + " strb r2, [r0]\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " cmp r1, #0x17\n" + " bls ._22 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._24:\n" + " .align 2, 0\n" + "._23:\n" + " .word gSaveBlock1\n" + " .word 0x2739\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F594() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r2, #0x0\n" + " ldr r6, ._27\n" + " ldr r5, ._27 + 4\n" + " ldr r4, ._27 + 8\n" + " mov r3, #0x1\n" + "._26:\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x2\n" + " add r1, r0, r6\n" + " add r0, r1, r5\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._25 @cond_branch\n" + " add r0, r1, r4\n" + " strb r3, [r0]\n" + "._25:\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x17\n" + " bls ._26 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._28:\n" + " .align 2, 0\n" + "._27:\n" + " .word gSaveBlock1\n" + " .word 0x2738\n" + " .word 0x2739\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F5D8() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " mov r4, #0x0\n" + " ldr r6, ._30\n" + " ldr r7, ._30 + 4\n" + " add r0, r7, #1\n" + " mov r8, r0\n" + "._29:\n" + " ldr r5, ._30 + 8\n" + " strh r4, [r5]\n" + " bl sub_810F424\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r6, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " lsl r0, r4, #0x1\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x2\n" + " add r1, r0, r7\n" + " ldrb r1, [r1]\n" + " add r0, r0, r8\n" + " ldrb r2, [r0]\n" + " add r0, r6, #0\n" + " bl MenuPrint\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0xb\n" + " bls ._29 @cond_branch\n" + " mov r0, #0x0\n" + " strh r0, [r5]\n" + " ldr r1, ._30 + 12\n" + " ldr r0, ._30 + 16\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._31:\n" + " .align 2, 0\n" + "._30:\n" + " .word gStringVar1\n" + " .word gUnknown_Debug_083C4BD4\n" + " .word gSpecialVar_0x8004\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090278+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F648() +{ + asm( + " push {lr}\n" + " ldr r0, ._35\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._32 @cond_branch\n" + " mov r0, #0xa\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xd\n" + " bl MenuZeroFillWindowRect\n" + " ldr r0, ._35 + 4\n" + " ldrb r1, [r0]\n" + " mov r2, #0x1\n" + " eor r1, r1, r2\n" + " strb r1, [r0]\n" + " cmp r1, #0\n" + " beq ._33 @cond_branch\n" + " bl debug_sub_808F7B4\n" + " b ._40\n" + "._36:\n" + " .align 2, 0\n" + "._35:\n" + " .word gMain\n" + " .word gDebug_03000724+0x2\n" + "._33:\n" + " bl debug_sub_808F6BC\n" + " b ._40\n" + "._32:\n" + " bl ProcessMenuInputNoWrap_\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._43 @cond_branch\n" + " cmp r1, r0\n" + " bgt ._39 @cond_branch\n" + " sub r0, r0, #0x1\n" + " cmp r1, r0\n" + " beq ._40 @cond_branch\n" + " b ._43\n" + "._39:\n" + " cmp r1, #0\n" + " beq ._42 @cond_branch\n" + " b ._43\n" + "._40:\n" + " mov r0, #0x0\n" + " b ._44\n" + "._42:\n" + " bl debug_sub_808F518\n" + "._43:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._44:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F6BC() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r4, #0x0\n" + " ldr r5, ._48\n" + " ldr r6, ._48 + 4\n" + "._45:\n" + " lsl r0, r4, #0x3\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldr r1, ._48 + 8\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xa0\n" + " lsl r0, r0, #0x14\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " bl MenuPrint\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x4\n" + " bls ._45 @cond_branch\n" + " mov r4, #0x5\n" + " ldr r5, ._48\n" + " ldr r6, ._48 + 4\n" + "._50:\n" + " lsl r0, r4, #0x3\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldr r1, ._48 + 8\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " cmp r4, #0xe\n" + " bhi ._46 @cond_branch\n" + " lsl r1, r4, #0x19\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " b ._47\n" + "._49:\n" + " .align 2, 0\n" + "._48:\n" + " .word gStringVar1\n" + " .word gSaveBlock1\n" + " .word 0x2738\n" + "._46:\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xec\n" + " lsl r0, r0, #0x18\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x6\n" + " bl MenuPrint\n" + "._47:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x17\n" + " bls ._50 @cond_branch\n" + " mov r4, #0x0\n" + " ldr r5, ._53\n" + "._55:\n" + " ldr r0, ._53 + 4\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r0\n" + " ldr r0, ._53 + 8\n" + " add r1, r1, r0\n" + " ldrb r1, [r1]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " cmp r4, #0x7\n" + " bhi ._51 @cond_branch\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xa0\n" + " lsl r0, r0, #0x14\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " b ._52\n" + "._54:\n" + " .align 2, 0\n" + "._53:\n" + " .word gStringVar1\n" + " .word gSaveBlock1\n" + " .word 0x2abc\n" + "._51:\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xfa\n" + " lsl r0, r0, #0x18\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0xc\n" + " bl MenuPrint\n" + "._52:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0xf\n" + " bls ._55 @cond_branch\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F7B4() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r4, #0x0\n" + " ldr r5, ._59\n" + " ldr r6, ._59 + 4\n" + "._56:\n" + " lsl r0, r4, #0x3\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldr r1, ._59 + 8\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xa0\n" + " lsl r0, r0, #0x14\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " bl MenuPrint\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x4\n" + " bls ._56 @cond_branch\n" + " mov r4, #0x5\n" + " ldr r5, ._59\n" + " ldr r6, ._59 + 4\n" + "._61:\n" + " lsl r0, r4, #0x3\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldr r1, ._59 + 8\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " cmp r4, #0xe\n" + " bhi ._57 @cond_branch\n" + " lsl r1, r4, #0x19\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " b ._58\n" + "._60:\n" + " .align 2, 0\n" + "._59:\n" + " .word gStringVar1\n" + " .word gSaveBlock1\n" + " .word 0x2739\n" + "._57:\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xec\n" + " lsl r0, r0, #0x18\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x6\n" + " bl MenuPrint\n" + "._58:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x17\n" + " bls ._61 @cond_branch\n" + " mov r4, #0x0\n" + " ldr r5, ._64\n" + "._66:\n" + " ldr r0, ._64 + 4\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r0\n" + " ldr r0, ._64 + 8\n" + " add r1, r1, r0\n" + " ldrb r1, [r1]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " cmp r4, #0x7\n" + " bhi ._62 @cond_branch\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xa0\n" + " lsl r0, r0, #0x14\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " b ._63\n" + "._65:\n" + " .align 2, 0\n" + "._64:\n" + " .word gStringVar1\n" + " .word gSaveBlock1\n" + " .word 0x2abd\n" + "._62:\n" + " lsl r1, r4, #0x19\n" + " mov r0, #0xfa\n" + " lsl r0, r0, #0x18\n" + " add r1, r1, r0\n" + " lsr r1, r1, #0x18\n" + " add r0, r5, #0\n" + " mov r2, #0xc\n" + " bl MenuPrint\n" + "._63:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0xf\n" + " bls ._66 @cond_branch\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F8AC() +{ + asm( + " push {lr}\n" + " ldr r0, ._67\n" + " bl FlagSet\n" + " ldr r0, ._67 + 4\n" + " bl FlagSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._68:\n" + " .align 2, 0\n" + "._67:\n" + " .word 0x832\n" + " .word 0x818\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F8CC() +{ + asm( + " push {r4, lr}\n" + " ldr r1, ._69\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " ldr r0, ._69 + 4\n" + " bl sub_8071F40\n" + " mov r0, #0xd\n" + " mov r1, #0x6\n" + " mov r2, #0x1a\n" + " mov r3, #0x8\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r0, ._69 + 8\n" + " ldr r0, [r0]\n" + " mov r1, #0xe\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " mov r0, #0x16\n" + " mov r1, #0x1\n" + " mov r2, #0x18\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r4, ._69 + 12\n" + " add r0, r4, #0\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x17\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r1, ._69 + 16\n" + " ldr r0, ._69 + 20\n" + " str r0, [r1]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._70:\n" + " .align 2, 0\n" + "._69:\n" + " .word gDebug_03000724\n" + " .word gUnknown_Debug_083C49CA\n" + " .word gUnknown_Debug_083C4ABD+0xf\n" + " .word gStringVar1\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808F93C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F93C() +{ + asm( + " push {r4, lr}\n" + " mov r2, #0x0\n" + " ldr r0, ._83\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._71 @cond_branch\n" + " ldr r1, ._83 + 4\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x18\n" + " bne ._72 @cond_branch\n" + " strb r2, [r1]\n" + "._72:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._71:\n" + " ldr r0, ._83\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._73 @cond_branch\n" + " ldr r1, ._83 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._74 @cond_branch\n" + " mov r0, #0x18\n" + " strb r0, [r1]\n" + "._74:\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._73:\n" + " ldr r0, ._83\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._75 @cond_branch\n" + " ldr r1, ._83 + 8\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0xc\n" + " bne ._76 @cond_branch\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + "._76:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._75:\n" + " ldr r0, ._83\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._77 @cond_branch\n" + " ldr r1, ._83 + 8\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._78 @cond_branch\n" + " mov r0, #0xc\n" + " strb r0, [r1]\n" + "._78:\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._77:\n" + " cmp r2, #0\n" + " beq ._79 @cond_branch\n" + " mov r0, #0xd\n" + " mov r1, #0x6\n" + " mov r2, #0x1a\n" + " mov r3, #0x8\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r1, ._83 + 12\n" + " ldr r0, ._83 + 8\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0xe\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " mov r0, #0x16\n" + " mov r1, #0x1\n" + " mov r2, #0x18\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r4, ._83 + 16\n" + " ldr r0, ._83 + 4\n" + " ldrb r1, [r0]\n" + " add r0, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x17\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + "._79:\n" + " ldr r4, ._83\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._80 @cond_branch\n" + " mov r0, #0x15\n" + " bl PlaySE\n" + " ldr r0, ._83 + 4\n" + " ldrb r0, [r0]\n" + " ldr r2, ._83 + 20\n" + " ldr r1, ._83 + 8\n" + " ldrb r1, [r1]\n" + " add r1, r1, r2\n" + " ldrb r1, [r1]\n" + " bl debug_sub_808FA88\n" + "._80:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._81 @cond_branch\n" + " mov r0, #0x0\n" + " b ._82\n" + "._84:\n" + " .align 2, 0\n" + "._83:\n" + " .word gMain\n" + " .word gDebug_03000724+0x1\n" + " .word gDebug_03000724\n" + " .word gUnknown_Debug_083C4ABD+0xf\n" + " .word gStringVar1\n" + " .word gUnknown_Debug_083C4ABD\n" + "._81:\n" + " ldr r0, ._85\n" + " bl sub_80BF588\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._82:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._86:\n" + " .align 2, 0\n" + "._85:\n" + " .word gSaveBlock1+0x2738\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808FA88() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add sp, sp, #0xffffffcc\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r7, r1, #0x18\n" + " bl GetLeadMonIndex\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r9, r0\n" + " ldr r3, ._92\n" + " lsl r4, r6, #0x3\n" + " add r2, r4, r6\n" + " lsl r2, r2, #0x2\n" + " add r0, r2, r3\n" + " ldr r5, ._92 + 4\n" + " add r1, r0, r5\n" + " strb r7, [r1]\n" + " ldr r1, ._92 + 8\n" + " add r0, r0, r1\n" + " mov r1, #0x1\n" + " strb r1, [r0]\n" + " mov r1, #0x0\n" + " ldr r0, ._92 + 12\n" + " add r5, r3, r0\n" + " mov r3, #0x1\n" + "._87:\n" + " add r0, r1, r2\n" + " add r0, r0, r5\n" + " strb r3, [r0]\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " cmp r1, #0x21\n" + " bls ._87 @cond_branch\n" + " add r0, r7, #0\n" + " bl sub_80BFB54\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r1, r0, #0\n" + " cmp r0, #0x3\n" + " beq ._88 @cond_branch\n" + " cmp r0, #0x3\n" + " bgt ._89 @cond_branch\n" + " cmp r0, #0x2\n" + " beq ._90 @cond_branch\n" + " b ._95\n" + "._93:\n" + " .align 2, 0\n" + "._92:\n" + " .word gSaveBlock1\n" + " .word 0x2738\n" + " .word 0x2739\n" + " .word 0x273a\n" + "._89:\n" + " cmp r1, #0x4\n" + " bne ._95 @cond_branch\n" + "._90:\n" + " add r0, r4, r6\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._96\n" + " add r0, r0, r1\n" + " bl sub_80BE160\n" + " b ._95\n" + "._97:\n" + " .align 2, 0\n" + "._96:\n" + " .word gSaveBlock1+0x2738\n" + "._88:\n" + " add r0, r4, r6\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._100\n" + " add r0, r0, r1\n" + " bl sub_80BE138\n" + "._95:\n" + " sub r0, r7, #1\n" + " cmp r0, #0x28\n" + " bls ._98 @cond_branch\n" + " b ._173\n" + "._98:\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._100 + 4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._101:\n" + " .align 2, 0\n" + "._100:\n" + " .word gSaveBlock1+0x2738\n" + " .word ._102\n" + "._102:\n" + " .word ._104\n" + " .word ._104\n" + " .word ._105\n" + " .word ._173\n" + " .word ._107\n" + " .word ._108\n" + " .word ._109\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._123\n" + " .word ._124\n" + " .word ._125\n" + " .word ._126\n" + " .word ._127\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._173\n" + " .word ._143\n" + "._104:\n" + " add r0, r4, r6\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._145\n" + " add r4, r0, r1\n" + " mov r2, #0x1\n" + " strh r2, [r4, #0x2]\n" + " add r1, r1, #0x10\n" + " add r0, r0, r1\n" + " ldr r1, ._145 + 4\n" + " bl StringCopy\n" + " mov r0, #0x5\n" + " strb r0, [r4, #0x18]\n" + " b ._173\n" + "._146:\n" + " .align 2, 0\n" + "._145:\n" + " .word gSaveBlock1+0x2738\n" + " .word gSaveBlock2\n" + "._105:\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r6, ._148\n" + " add r1, r4, r6\n" + " mov r8, r1\n" + " mov r0, #0x1\n" + " strh r0, [r1, #0x2]\n" + " add r0, r6, #5\n" + " add r0, r4, r0\n" + " ldr r1, ._148 + 4\n" + " bl StringCopy\n" + " mov r0, #0x64\n" + " mov r5, r9\n" + " mul r5, r5, r0\n" + " ldr r0, ._148 + 8\n" + " add r5, r5, r0\n" + " add r6, r6, #0x10\n" + " add r4, r4, r6\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " add r2, r4, #0\n" + " bl GetMonData\n" + " mov r0, #0x5\n" + " mov r1, r8\n" + " strb r0, [r1, #0xd]\n" + " add r0, r5, #0\n" + " mov r1, #0x3\n" + " bl GetMonData\n" + " mov r5, r8\n" + " strb r0, [r5, #0xe]\n" + " b ._173\n" + "._149:\n" + " .align 2, 0\n" + "._148:\n" + " .word gSaveBlock1+0x2738\n" + " .word gSaveBlock2\n" + " .word gPlayerParty\n" + "._107:\n" + " mov r0, #0x64\n" + " mov r1, r9\n" + " mul r1, r1, r0\n" + " mov r8, r1\n" + " ldr r0, ._151\n" + " add r8, r8, r0\n" + " mov r0, r8\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r5, ._151 + 4\n" + " add r6, r4, r5\n" + " strh r0, [r6, #0x2]\n" + " mov r0, #0x1\n" + " strh r0, [r6, #0x1c]\n" + " add r0, r5, #0\n" + " add r0, r0, #0xf\n" + " add r0, r4, r0\n" + " ldr r1, ._151 + 8\n" + " bl StringCopy\n" + " add r5, r5, #0x4\n" + " add r4, r4, r5\n" + " mov r0, r8\n" + " mov r1, #0x2\n" + " add r2, r4, #0\n" + " bl GetMonData\n" + " mov r0, #0x5\n" + " strb r0, [r6, #0x1e]\n" + " mov r0, r8\n" + " mov r1, #0x3\n" + " bl GetMonData\n" + " strb r0, [r6, #0x1f]\n" + " b ._173\n" + "._152:\n" + " .align 2, 0\n" + "._151:\n" + " .word gPlayerParty\n" + " .word gSaveBlock1+0x2738\n" + " .word gSaveBlock2\n" + "._108:\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r6, ._154\n" + " add r5, r4, r6\n" + " mov r8, r5\n" + " mov r0, #0x1\n" + " strh r0, [r5, #0x2]\n" + " add r0, r6, #0\n" + " add r0, r0, #0x16\n" + " add r0, r4, r0\n" + " ldr r1, ._154 + 4\n" + " bl StringCopy\n" + " mov r0, #0x64\n" + " mov r5, r9\n" + " mul r5, r5, r0\n" + " ldr r0, ._154 + 8\n" + " add r5, r5, r0\n" + " add r6, r6, #0x8\n" + " add r4, r4, r6\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " add r2, r4, #0\n" + " bl GetMonData\n" + " mov r0, #0x5\n" + " mov r1, r8\n" + " strb r0, [r1, #0x1e]\n" + " add r0, r5, #0\n" + " mov r1, #0x3\n" + " bl GetMonData\n" + " mov r5, r8\n" + " strb r0, [r5, #0x1f]\n" + " b ._173\n" + "._155:\n" + " .align 2, 0\n" + "._154:\n" + " .word gSaveBlock1+0x2738\n" + " .word gSaveBlock2\n" + " .word gPlayerParty\n" + "._109:\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r5, ._157\n" + " add r6, r4, r5\n" + " mov r0, #0x1\n" + " strh r0, [r6, #0xa]\n" + " strh r0, [r6, #0x14]\n" + " add r0, r5, #2\n" + " add r0, r4, r0\n" + " ldr r1, ._157 + 4\n" + " mov r8, r1\n" + " bl StringCopy\n" + " add r5, r5, #0xc\n" + " add r4, r4, r5\n" + " add r0, r4, #0\n" + " mov r1, r8\n" + " bl StringCopy\n" + " mov r0, #0x5\n" + " strb r0, [r6, #0x1d]\n" + " b ._173\n" + "._158:\n" + " .align 2, 0\n" + "._157:\n" + " .word gSaveBlock1+0x2738\n" + " .word gSaveBlock2\n" + "._143:\n" + " add r0, r4, r6\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._160\n" + " add r0, r0, r1\n" + " mov r1, #0x1\n" + " strh r1, [r0, #0xc]\n" + " strh r1, [r0, #0x16]\n" + " b ._173\n" + "._161:\n" + " .align 2, 0\n" + "._160:\n" + " .word gSaveBlock1+0x2738\n" + "._123:\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r0, ._163\n" + " add r4, r4, r0\n" + " ldr r1, ._163 + 4\n" + " mov r0, sp\n" + " mov r2, #0x8\n" + " bl memcpy\n" + " add r5, sp, #0x8\n" + " ldr r1, ._163 + 8\n" + " add r0, r5, #0\n" + " mov r2, #0xb\n" + " bl memcpy\n" + " mov r0, #0xff\n" + " strb r0, [r4, #0x12]\n" + " add r0, r4, #0\n" + " add r0, r0, #0x13\n" + " mov r1, sp\n" + " bl StringCopy\n" + " add r0, r4, #4\n" + " add r1, r5, #0\n" + " bl StringCopy\n" + " mov r0, #0xc\n" + " strb r0, [r4, #0xf]\n" + " mov r0, #0x28\n" + " strh r0, [r4, #0x10]\n" + " mov r0, #0x5\n" + " strb r0, [r4, #0x2]\n" + " strb r0, [r4, #0x3]\n" + " b ._173\n" + "._164:\n" + " .align 2, 0\n" + "._163:\n" + " .word gSaveBlock1+0x2738\n" + " .word gUnknown_Debug_083C4C64\n" + " .word gUnknown_Debug_083C4C6C\n" + "._124:\n" + " add r0, r4, r6\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._168\n" + " add r5, r0, r1\n" + " add r4, sp, #0x14\n" + " ldr r1, ._168 + 4\n" + " add r0, r4, #0\n" + " mov r2, #0x8\n" + " bl memcpy\n" + " add r1, r4, #0\n" + " mov r3, #0xfe\n" + " mov r2, #0x2\n" + " add r0, r5, #0\n" + " add r0, r0, #0x10\n" + "._165:\n" + " strh r3, [r0]\n" + " sub r0, r0, #0x2\n" + " sub r2, r2, #0x1\n" + " cmp r2, #0\n" + " bge ._165 @cond_branch\n" + " mov r0, #0x1\n" + " strb r0, [r5, #0x2]\n" + " mov r0, #0x28\n" + " strb r0, [r5, #0x12]\n" + " add r0, r5, #0\n" + " add r0, r0, #0x13\n" + " add r3, r5, #6\n" + " mov r6, #0x1e\n" + " add r2, r5, #0\n" + " add r2, r2, #0xa\n" + "._166:\n" + " strh r6, [r2]\n" + " sub r2, r2, #0x2\n" + " cmp r2, r3\n" + " bge ._166 @cond_branch\n" + " bl StringCopy\n" + " mov r0, #0x5\n" + " strb r0, [r5, #0x3]\n" + " b ._173\n" + "._169:\n" + " .align 2, 0\n" + "._168:\n" + " .word gSaveBlock1+0x2738\n" + " .word gUnknown_Debug_083C4C64\n" + "._125:\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r0, ._171\n" + " add r4, r4, r0\n" + " add r5, sp, #0x1c\n" + " ldr r1, ._171 + 4\n" + " add r0, r5, #0\n" + " mov r2, #0x8\n" + " bl memcpy\n" + " mov r0, #0x28\n" + " strh r0, [r4, #0xc]\n" + " strh r0, [r4, #0xe]\n" + " mov r0, #0x3\n" + " strb r0, [r4, #0x12]\n" + " mov r0, #0xff\n" + " strb r0, [r4, #0x10]\n" + " mov r0, #0x1\n" + " strb r0, [r4, #0x11]\n" + " add r0, r4, #0\n" + " add r0, r0, #0x13\n" + " add r1, r5, #0\n" + " bl StringCopy\n" + " mov r0, #0x5\n" + " strb r0, [r4, #0x2]\n" + " b ._173\n" + "._172:\n" + " .align 2, 0\n" + "._171:\n" + " .word gSaveBlock1+0x2738\n" + " .word gUnknown_Debug_083C4C64\n" + "._126:\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r0, ._174\n" + " add r4, r4, r0\n" + " add r5, sp, #0x24\n" + " ldr r1, ._174 + 4\n" + " add r0, r5, #0\n" + " mov r2, #0x8\n" + " bl memcpy\n" + " mov r0, #0xff\n" + " strb r0, [r4, #0x2]\n" + " mov r0, #0x0\n" + " strb r0, [r4, #0x3]\n" + " mov r0, #0x28\n" + " strh r0, [r4, #0x4]\n" + " add r0, r4, #0\n" + " add r0, r0, #0x13\n" + " add r1, r5, #0\n" + " bl StringCopy\n" + " mov r0, #0x5\n" + " strb r0, [r4, #0x6]\n" + " b ._173\n" + "._175:\n" + " .align 2, 0\n" + "._174:\n" + " .word gSaveBlock1+0x2738\n" + " .word gUnknown_Debug_083C4C64\n" + "._127:\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x2\n" + " ldr r0, ._176\n" + " add r4, r4, r0\n" + " add r5, sp, #0x2c\n" + " ldr r1, ._176 + 4\n" + " add r0, r5, #0\n" + " mov r2, #0x8\n" + " bl memcpy\n" + " ldr r0, ._176 + 8\n" + " strh r0, [r4, #0x2]\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " strh r0, [r4, #0x6]\n" + " mov r0, #0x28\n" + " strh r0, [r4, #0x4]\n" + " strh r0, [r4, #0x8]\n" + " mov r0, #0x3\n" + " strb r0, [r4, #0xa]\n" + " add r0, r4, #0\n" + " add r0, r0, #0x13\n" + " add r1, r5, #0\n" + " bl StringCopy\n" + " mov r0, #0x5\n" + " strb r0, [r4, #0xb]\n" + "._173:\n" + " add sp, sp, #0x34\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._177:\n" + " .align 2, 0\n" + "._176:\n" + " .word gSaveBlock1+0x2738\n" + " .word gUnknown_Debug_083C4C64\n" + " .word 0xffff\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808FEBC() +{ + asm( + " push {lr}\n" + " bl ClearTVShowData\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808FECC() +{ + asm( + " push {r4, lr}\n" + " ldr r1, ._178\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " ldr r0, ._178 + 4\n" + " bl sub_8071F40\n" + " mov r0, #0xd\n" + " mov r1, #0x6\n" + " mov r2, #0x17\n" + " mov r3, #0x8\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r0, ._178 + 8\n" + " ldr r0, [r0]\n" + " mov r1, #0xe\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " mov r0, #0x16\n" + " mov r1, #0x1\n" + " mov r2, #0x18\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r4, ._178 + 12\n" + " add r0, r4, #0\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x17\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r1, ._178 + 16\n" + " ldr r0, ._178 + 20\n" + " str r0, [r1]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._179:\n" + " .align 2, 0\n" + "._178:\n" + " .word gDebug_03000724\n" + " .word gUnknown_Debug_083C49CA\n" + " .word gUnknown_Debug_083C4B20+0x4\n" + " .word gStringVar1\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808FF3C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808FF3C() +{ + asm( + " push {r4, lr}\n" + " mov r2, #0x0\n" + " ldr r0, ._192\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._180 @cond_branch\n" + " ldr r1, ._192 + 4\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x10\n" + " bne ._181 @cond_branch\n" + " strb r2, [r1]\n" + "._181:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._180:\n" + " ldr r0, ._192\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._182 @cond_branch\n" + " ldr r1, ._192 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._183 @cond_branch\n" + " mov r0, #0x10\n" + " strb r0, [r1]\n" + "._183:\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._182:\n" + " ldr r0, ._192\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._184 @cond_branch\n" + " ldr r1, ._192 + 8\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x3\n" + " bne ._185 @cond_branch\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + "._185:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._184:\n" + " ldr r0, ._192\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._186 @cond_branch\n" + " ldr r1, ._192 + 8\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._187 @cond_branch\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + "._187:\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r2, #0x1\n" + "._186:\n" + " cmp r2, #0\n" + " beq ._188 @cond_branch\n" + " mov r0, #0xd\n" + " mov r1, #0x6\n" + " mov r2, #0x17\n" + " mov r3, #0x8\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r1, ._192 + 12\n" + " ldr r0, ._192 + 8\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0xe\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " mov r0, #0x16\n" + " mov r1, #0x1\n" + " mov r2, #0x18\n" + " mov r3, #0x2\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r4, ._192 + 16\n" + " ldr r0, ._192 + 4\n" + " ldrb r1, [r0]\n" + " add r0, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x17\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + "._188:\n" + " ldr r4, ._192\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._189 @cond_branch\n" + " mov r0, #0x15\n" + " bl PlaySE\n" + " ldr r0, ._192 + 4\n" + " ldrb r0, [r0]\n" + " ldr r2, ._192 + 20\n" + " ldr r1, ._192 + 8\n" + " ldrb r1, [r1]\n" + " add r1, r1, r2\n" + " ldrb r1, [r1]\n" + " bl debug_sub_8090080\n" + "._189:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._190 @cond_branch\n" + " mov r0, #0x0\n" + " b ._191\n" + "._193:\n" + " .align 2, 0\n" + "._192:\n" + " .word gMain\n" + " .word gDebug_03000724+0x1\n" + " .word gDebug_03000724\n" + " .word gUnknown_Debug_083C4B20+0x4\n" + " .word gStringVar1\n" + " .word gUnknown_Debug_083C4B20\n" + "._190:\n" + " bl sub_80BEC40\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._191:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090080() +{ + asm( + " lsl r0, r0, #0x18\n" + " ldr r2, ._194\n" + " lsr r0, r0, #0x16\n" + " add r0, r0, r2\n" + " ldr r3, ._194 + 4\n" + " add r2, r0, r3\n" + " strb r1, [r2]\n" + " ldr r1, ._194 + 8\n" + " add r2, r0, r1\n" + " mov r1, #0x1\n" + " strb r1, [r2]\n" + " add r3, r3, #0x2\n" + " add r0, r0, r3\n" + " mov r1, #0x4\n" + " strh r1, [r0]\n" + " bx lr\n" + "._195:\n" + " .align 2, 0\n" + "._194:\n" + " .word gSaveBlock1\n" + " .word 0x2abc\n" + " .word 0x2abd\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80900AC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " mov r7, #0x0\n" + " mov r5, #0x0\n" + " ldr r0, ._202\n" + " mov r8, r0\n" + "._198:\n" + " lsl r0, r5, #0x3\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x2\n" + " mov r1, r8\n" + " add r6, r0, r1\n" + " ldr r1, ._202 + 4\n" + " add r0, r6, r1\n" + " ldrb r4, [r0]\n" + " cmp r4, #0\n" + " bne ._196 @cond_branch\n" + " cmp r7, #0xc\n" + " bne ._197 @cond_branch\n" + " mov r7, #0x0\n" + "._197:\n" + " ldr r0, ._202 + 8\n" + " add r0, r7, r0\n" + " ldrb r1, [r0]\n" + " add r0, r5, #0\n" + " bl debug_sub_808FA88\n" + " ldr r1, ._202 + 12\n" + " add r0, r6, r1\n" + " strb r4, [r0]\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._196:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x17\n" + " bls ._198 @cond_branch\n" + " mov r7, #0x0\n" + " mov r5, #0x0\n" + "._201:\n" + " ldr r0, ._202\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r0\n" + " ldr r0, ._202 + 16\n" + " add r1, r1, r0\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._199 @cond_branch\n" + " cmp r7, #0x3\n" + " bne ._200 @cond_branch\n" + " mov r7, #0x0\n" + "._200:\n" + " ldr r0, ._202 + 20\n" + " add r0, r7, r0\n" + " ldrb r1, [r0]\n" + " add r0, r5, #0\n" + " bl debug_sub_8090080\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._199:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0xf\n" + " bls ._201 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._203:\n" + " .align 2, 0\n" + "._202:\n" + " .word gSaveBlock1\n" + " .word 0x2738\n" + " .word gUnknown_Debug_083C4ABD\n" + " .word 0x2739\n" + " .word 0x2abc\n" + " .word gUnknown_Debug_083C4B20\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_Fan() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xb\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._204\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xa\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._204 + 4\n" + " ldr r0, ._204 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._205:\n" + " .align 2, 0\n" + "._204:\n" + " .word gUnknown_Debug_083C4D28\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_80901A4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80901A4() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._206 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " beq ._207 @cond_branch\n" + " ldr r2, ._209\n" + " ldr r0, ._209 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + "._206:\n" + " mov r0, #0x0\n" + " b ._208\n" + "._210:\n" + " .align 2, 0\n" + "._209:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C4D28\n" + "._207:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._208:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80901E4() +{ + asm( + " push {lr}\n" + " bl ResetFanClub\n" + " bl sub_810FAA0\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80901F8() +{ + asm( + " push {lr}\n" + " bl sub_810FB9C\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._211\n" + " ldr r1, ._211 + 4\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x8\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldr r0, [r0]\n" + " mov r1, #0xe\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r1, ._211 + 8\n" + " ldr r0, ._211 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._212:\n" + " .align 2, 0\n" + "._211:\n" + " .word gUnknown_Debug_083C4CA8\n" + " .word gUnknown_083F8408\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090278+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090238() +{ + asm( + " push {lr}\n" + " bl sub_810FC18\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._213\n" + " ldr r1, ._213 + 4\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x8\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldr r0, [r0]\n" + " mov r1, #0xe\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r1, ._213 + 8\n" + " ldr r0, ._213 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._214:\n" + " .align 2, 0\n" + "._213:\n" + " .word gUnknown_Debug_083C4CA8\n" + " .word gUnknown_083F8410\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090278+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090278() +{ + asm( + " push {lr}\n" + " ldr r0, ._217\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._215 @cond_branch\n" + " mov r0, #0x0\n" + " b ._216\n" + "._218:\n" + " .align 2, 0\n" + "._217:\n" + " .word gMain\n" + "._215:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._216:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_809029C() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._219\n" + " ldr r0, ._219 + 4\n" + " ldr r1, ._219 + 8\n" + " add r0, r0, r1\n" + " ldrh r0, [r0]\n" + " mov r1, #0x7f\n" + " and r1, r1, r0\n" + " add r0, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x10\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r1, ._219 + 12\n" + " ldr r0, ._219 + 16\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._220:\n" + " .align 2, 0\n" + "._219:\n" + " .word gStringVar1\n" + " .word gSaveBlock1\n" + " .word 0x13c2\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090278+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80902E4() +{ + asm( + " push {lr}\n" + " ldr r1, ._221\n" + " ldrh r0, [r1, #0xe]\n" + " add r0, r0, #0x6\n" + " strh r0, [r1, #0xe]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._222:\n" + " .align 2, 0\n" + "._221:\n" + " .word gSaveBlock2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80902FC() +{ + asm( + " push {lr}\n" + " mov r0, #0x0\n" + " bl sub_810FB10\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090310() +{ + asm( + " push {lr}\n" + " mov r0, #0x1\n" + " bl sub_810FB10\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090324() +{ + asm( + " push {lr}\n" + " mov r0, #0x2\n" + " bl sub_810FB10\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090338() +{ + asm( + " push {lr}\n" + " mov r0, #0x3\n" + " bl sub_810FB10\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_BattleVSDad() +{ + asm( + " push {lr}\n" + " ldr r0, ._223\n" + " mov r1, #0x6\n" + " bl VarSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._224:\n" + " .align 2, 0\n" + "._223:\n" + " .word 0x4085\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_DadAfterBattle() +{ + asm( + " push {lr}\n" + " ldr r0, ._225\n" + " mov r1, #0x7\n" + " bl VarSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._226:\n" + " .align 2, 0\n" + "._225:\n" + " .word 0x4085\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_SootopolisCity() +{ + asm( + " push {lr}\n" + " mov r0, #0x81\n" + " bl FlagSet\n" + " mov r0, #0x71\n" + " bl FlagSet\n" + " ldr r0, ._227\n" + " bl FlagReset\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._228:\n" + " .align 2, 0\n" + "._227:\n" + " .word 0x32f\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_Embark() +{ + asm( + " push {lr}\n" + " ldr r0, ._229\n" + " bl FlagReset\n" + " ldr r0, ._229 + 4\n" + " mov r1, #0x1\n" + " bl VarSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._230:\n" + " .align 2, 0\n" + "._229:\n" + " .word 0x2e3\n" + " .word 0x4090\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_Yes9999() +{ + asm( + " push {lr}\n" + " ldr r0, ._231\n" + " ldr r1, ._231 + 4\n" + " bl VarSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._232:\n" + " .align 2, 0\n" + "._231:\n" + " .word 0x4048\n" + " .word 0x270f\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_LegendsFlagOn() +{ + asm( + " push {lr}\n" + " mov r0, #0xe4\n" + " bl FlagSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void NoharaDebugMenu_AddNumWinningStreaks() +{ + asm( + " push {lr}\n" + " ldr r0, ._235\n" + " ldr r1, ._235 + 4\n" + " add r2, r0, r1\n" + " ldrh r1, [r2]\n" + " cmp r1, #0x31\n" + " bhi ._233 @cond_branch\n" + " mov r0, #0x32\n" + " b ._244\n" + "._236:\n" + " .align 2, 0\n" + "._235:\n" + " .word gSaveBlock2\n" + " .word 0x572\n" + "._233:\n" + " cmp r1, #0x63\n" + " bhi ._237 @cond_branch\n" + " mov r0, #0x64\n" + " b ._244\n" + "._237:\n" + " ldr r0, ._241\n" + " cmp r1, r0\n" + " bhi ._239 @cond_branch\n" + " add r0, r0, #0x1\n" + " b ._244\n" + "._242:\n" + " .align 2, 0\n" + "._241:\n" + " .word 0x3e7\n" + "._239:\n" + " ldr r0, ._245\n" + " cmp r1, r0\n" + " bhi ._243 @cond_branch\n" + " ldr r0, ._245 + 4\n" + " b ._244\n" + "._246:\n" + " .align 2, 0\n" + "._245:\n" + " .word 0x1387\n" + " .word 0x2706\n" + "._243:\n" + " ldr r0, ._248\n" + " cmp r1, r0\n" + " bhi ._247 @cond_branch\n" + " add r0, r0, #0xa\n" + "._244:\n" + " strh r0, [r2]\n" + "._247:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._249:\n" + " .align 2, 0\n" + "._248:\n" + " .word 0x2705\n" + "\n" + ); +} + +#endif diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c new file mode 100644 index 000000000..4f9b588d8 --- /dev/null +++ b/src/debug/taya_debug_window.c @@ -0,0 +1,2122 @@ +#ifdef DEBUG +#include "global.h" + +EWRAM_DATA u8 unk_2030224[4] = { 0 }; + +__attribute__((naked)) +void TayaDebugMenu_Trend() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xffffffd8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1e\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r5, ._3\n" + " mov r7, #0x0\n" + " mov r0, #0x1\n" + " add r0, r0, sp\n" + " mov sl, r0\n" + " mov r9, sp\n" + " mov r0, #0x0\n" + " mov r8, r0\n" + " add r6, sp, #0x20\n" + "._2:\n" + " ldrb r1, [r5, #0x1]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " mov r1, #0xa1\n" + " cmp r0, #0\n" + " beq ._1 @cond_branch\n" + " mov r1, #0xa2\n" + "._1:\n" + " mov r0, r9\n" + " strb r1, [r0]\n" + " ldrh r1, [r5, #0x4]\n" + " add r0, r6, #0\n" + " bl sub_80EB3FC\n" + " mov r0, sl\n" + " add r1, r6, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x7\n" + " bl StringCopyPadded\n" + " add r4, r0, #0\n" + " ldrh r1, [r5, #0x6]\n" + " add r0, r6, #0\n" + " bl sub_80EB3FC\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x8\n" + " bl StringCopyPadded\n" + " add r4, r0, #0\n" + " ldrb r1, [r5]\n" + " lsl r1, r1, #0x19\n" + " lsr r1, r1, #0x19\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r4, r0, #0\n" + " mov r0, r8\n" + " strb r0, [r4]\n" + " add r4, r4, #0x1\n" + " ldrh r1, [r5]\n" + " lsl r1, r1, #0x12\n" + " lsr r1, r1, #0x19\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r4, r0, #0\n" + " mov r0, r8\n" + " strb r0, [r4]\n" + " add r4, r4, #0x1\n" + " ldrh r1, [r5, #0x2]\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " lsl r2, r7, #0x1\n" + " add r2, r2, #0x1\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r0, sp\n" + " mov r1, #0x1\n" + " bl MenuPrint\n" + " add r5, r5, #0x8\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r7, r0, #0x10\n" + " cmp r7, #0x4\n" + " bls ._2 @cond_branch\n" + " ldr r1, ._3 + 4\n" + " ldr r0, ._3 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x28\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word gSaveBlock1+0x2dd4\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090808+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090808() +{ + asm( + " push {lr}\n" + " ldr r0, ._7\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x3\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._5 @cond_branch\n" + " mov r0, #0x0\n" + " b ._6\n" + "._8:\n" + " .align 2, 0\n" + "._7:\n" + " .word gMain\n" + "._5:\n" + " bl MenuZeroFillScreen\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._6:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_TrendR() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r0, #0x0\n" + " ldr r7, ._11\n" + "._10:\n" + " mov r4, #0x0\n" + " lsl r5, r0, #0x3\n" + " add r6, r0, #1\n" + "._9:\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0x16\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl sub_80EB72C\n" + " lsl r1, r4, #0x1\n" + " add r1, r1, r5\n" + " add r1, r1, r7\n" + " strh r0, [r1]\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " cmp r4, #0x1\n" + " bls ._9 @cond_branch\n" + " lsl r0, r6, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0x4\n" + " bls ._10 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._12:\n" + " .align 2, 0\n" + "._11:\n" + " .word gSaveBlock1+0x2dd8\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090880() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._13 @cond_branch\n" + " mov r0, #0x0\n" + " b ._14\n" + "._13:\n" + " bl sub_80E60D8\n" + " mov r0, #0x1\n" + "._14:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_809089C() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._15 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._16 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._17\n" + "._16:\n" + " ldr r2, ._19\n" + " ldr r0, ._19 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " strh r0, [r2]\n" + " ldrh r0, [r2]\n" + " sub r0, r0, #0x5\n" + " cmp r0, #0x7\n" + " bhi ._27 @cond_branch\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._19 + 8\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._20:\n" + " .align 2, 0\n" + "._19:\n" + " .word gSpecialVar_0x8004\n" + " .word gUnknown_Debug_083C4EC0\n" + " .word ._21\n" + "._21:\n" + " .word ._29\n" + " .word ._27\n" + " .word ._29\n" + " .word ._29\n" + " .word ._27\n" + " .word ._27\n" + " .word ._29\n" + " .word ._29\n" + "._29:\n" + " ldr r0, ._30\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " ldr r0, ._30 + 4\n" + " strh r1, [r0]\n" + "._27:\n" + " mov r0, #0x1\n" + " mov r1, #0x0\n" + " bl fade_screen\n" + " ldr r1, ._30 + 8\n" + " ldr r0, ._30 + 12\n" + " str r0, [r1]\n" + "._15:\n" + " mov r0, #0x0\n" + "._17:\n" + " pop {r1}\n" + " bx r1\n" + "._31:\n" + " .align 2, 0\n" + "._30:\n" + " .word gSpecialVar_0x8005\n" + " .word gSpecialVar_0x8006\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090880+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_SimpleText() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xc\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._32\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xb\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._32 + 4\n" + " ldr r0, ._32 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._33:\n" + " .align 2, 0\n" + "._32:\n" + " .word gUnknown_Debug_083C4EC0\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_809089C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090984() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " bl ProcessMenuInput\n" + " lsl r2, r0, #0x18\n" + " asr r1, r2, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._34 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " beq ._46 @cond_branch\n" + " cmp r1, #0x4\n" + " bgt ._36 @cond_branch\n" + " lsr r0, r2, #0x18\n" + " bl debug_sub_810B32C\n" + " b ._46\n" + "._34:\n" + " mov r0, #0x0\n" + " b ._38\n" + "._36:\n" + " cmp r1, #0x5\n" + " bne ._39 @cond_branch\n" + " bl sub_80F7F30\n" + " b ._46\n" + "._39:\n" + " cmp r1, #0x6\n" + " bne ._41 @cond_branch\n" + " mov r4, #0x0\n" + " ldr r0, ._44\n" + " add r1, r0, #2\n" + " mov ip, r1\n" + " ldr r7, ._44 + 4\n" + " ldr r1, ._44 + 8\n" + " add r6, r0, r1\n" + " add r5, r0, #0\n" + " add r5, r5, #0xe\n" + "._42:\n" + " lsl r1, r4, #0x1\n" + " mov r0, ip\n" + " add r3, r1, r0\n" + " add r0, r1, r7\n" + " ldrh r2, [r0]\n" + " strh r2, [r3]\n" + " add r0, r1, r5\n" + " strh r2, [r0]\n" + " add r1, r6, r1\n" + " strh r2, [r1]\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " cmp r4, #0x2\n" + " bls ._42 @cond_branch\n" + " b ._46\n" + "._45:\n" + " .align 2, 0\n" + "._44:\n" + " .word gSaveBlock1+0x2d94\n" + " .word gUnknown_Debug_083C4F08\n" + " .word 0xfffffd94\n" + "._41:\n" + " cmp r1, #0x7\n" + " bne ._46 @cond_branch\n" + " mov r4, #0x0\n" + "._47:\n" + " lsl r0, r4, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl sub_80EB890\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " cmp r4, #0x20\n" + " bls ._47 @cond_branch\n" + "._46:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._38:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_OldMan() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xa\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._48\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x8\n" + " bl PrintMenuItems\n" + " bl GetCurrentMauvilleOldMan\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " str r0, [sp]\n" + " mov r0, #0x9\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " ldr r1, ._48 + 4\n" + " ldr r0, ._48 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._49:\n" + " .align 2, 0\n" + "._48:\n" + " .word gUnknown_Debug_083C4F54\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090984+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_LanettesPC() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " bl ShowPokemonStorageSystem\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_TownFlags() +{ + asm( + " push {lr}\n" + " ldr r0, ._50\n" + " bl FlagSet\n" + " mov r0, #0x81\n" + " lsl r0, r0, #0x4\n" + " bl FlagSet\n" + " ldr r0, ._50 + 4\n" + " bl FlagSet\n" + " ldr r0, ._50 + 8\n" + " bl FlagSet\n" + " ldr r0, ._50 + 12\n" + " bl FlagSet\n" + " ldr r0, ._50 + 16\n" + " bl FlagSet\n" + " ldr r0, ._50 + 20\n" + " bl FlagSet\n" + " ldr r0, ._50 + 24\n" + " bl FlagSet\n" + " ldr r0, ._50 + 28\n" + " bl FlagSet\n" + " ldr r0, ._50 + 32\n" + " bl FlagSet\n" + " ldr r0, ._50 + 36\n" + " bl FlagSet\n" + " ldr r0, ._50 + 40\n" + " bl FlagSet\n" + " ldr r0, ._50 + 44\n" + " bl FlagSet\n" + " ldr r0, ._50 + 48\n" + " bl FlagSet\n" + " ldr r0, ._50 + 52\n" + " bl FlagSet\n" + " ldr r0, ._50 + 56\n" + " bl FlagSet\n" + " ldr r0, ._50 + 60\n" + " bl FlagSet\n" + " ldr r0, ._50 + 64\n" + " bl FlagSet\n" + " ldr r0, ._50 + 68\n" + " bl FlagSet\n" + " ldr r0, ._50 + 72\n" + " bl FlagSet\n" + " ldr r0, ._50 + 76\n" + " bl FlagSet\n" + " ldr r0, ._50 + 80\n" + " bl FlagSet\n" + " ldr r0, ._50 + 84\n" + " bl FlagSet\n" + " ldr r0, ._50 + 88\n" + " bl FlagSet\n" + " ldr r0, ._50 + 92\n" + " bl FlagSet\n" + " ldr r0, ._50 + 96\n" + " bl FlagSet\n" + " ldr r0, ._50 + 100\n" + " bl FlagSet\n" + " ldr r0, ._50 + 104\n" + " bl FlagSet\n" + " ldr r0, ._50 + 108\n" + " bl FlagSet\n" + " ldr r0, ._50 + 112\n" + " bl FlagSet\n" + " ldr r0, ._50 + 116\n" + " bl FlagSet\n" + " ldr r0, ._50 + 120\n" + " bl FlagSet\n" + " mov r0, #0x84\n" + " lsl r0, r0, #0x4\n" + " bl FlagSet\n" + " ldr r0, ._50 + 124\n" + " bl FlagSet\n" + " ldr r0, ._50 + 128\n" + " bl FlagSet\n" + " ldr r0, ._50 + 132\n" + " bl FlagSet\n" + " ldr r0, ._50 + 136\n" + " bl FlagSet\n" + " ldr r0, ._50 + 140\n" + " bl FlagSet\n" + " ldr r0, ._50 + 144\n" + " bl FlagSet\n" + " ldr r0, ._50 + 148\n" + " bl FlagSet\n" + " ldr r0, ._50 + 152\n" + " bl FlagSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._51:\n" + " .align 2, 0\n" + "._50:\n" + " .word 0x80f\n" + " .word 0x811\n" + " .word 0x812\n" + " .word 0x813\n" + " .word 0x814\n" + " .word 0x815\n" + " .word 0x816\n" + " .word 0x817\n" + " .word 0x818\n" + " .word 0x819\n" + " .word 0x81a\n" + " .word 0x81b\n" + " .word 0x81c\n" + " .word 0x81d\n" + " .word 0x81e\n" + " .word 0x848\n" + " .word 0x849\n" + " .word 0x84a\n" + " .word 0x854\n" + " .word 0x855\n" + " .word 0x856\n" + " .word 0x857\n" + " .word 0x858\n" + " .word 0x859\n" + " .word 0x85a\n" + " .word 0x85b\n" + " .word 0x85c\n" + " .word 0x83c\n" + " .word 0x83d\n" + " .word 0x83e\n" + " .word 0x83f\n" + " .word 0x841\n" + " .word 0x842\n" + " .word 0x843\n" + " .word 0x844\n" + " .word 0x845\n" + " .word 0x846\n" + " .word 0x847\n" + " .word 0x83b\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_AwardARibbon() +{ + asm( + " push {lr}\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x10\n" + " mov r2, #0x0\n" + " bl BlendPalettes\n" + " ldr r0, ._52\n" + " bl SetMainCallback2\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._53:\n" + " .align 2, 0\n" + "._52:\n" + " .word debug_sub_80915BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090C44() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r4, ._54\n" + " sub r5, r4, #1\n" + " ldrh r1, [r5, #0x8]\n" + " add r0, r4, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x5\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0x0\n" + " mov r2, #0x5\n" + " bl StringFill\n" + " ldrb r0, [r5]\n" + " add r0, r0, r4\n" + " mov r1, #0x79\n" + " strb r1, [r0]\n" + " add r0, r4, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._55:\n" + " .align 2, 0\n" + "._54:\n" + " .word +0x2000001\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8090C88() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " mov r8, r0\n" + " ldr r2, ._59\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " add r3, r2, #0\n" + " cmp r0, #0\n" + " beq ._57 @cond_branch\n" + " ldr r1, ._59 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._57 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._62\n" + "._60:\n" + " .align 2, 0\n" + "._59:\n" + " .word gMain\n" + " .word +0x2000000\n" + "._67:\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._62\n" + "._77:\n" + " strh r1, [r7, #0x8]\n" + " b ._62\n" + "._79:\n" + " ldr r0, ._64\n" + " ldrh r0, [r0, #0x8]\n" + " bl SetLotteryNumber16_Unused\n" + "._78:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._63\n" + "._65:\n" + " .align 2, 0\n" + "._64:\n" + " .word +0x2000000\n" + "._57:\n" + " ldrh r1, [r3, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._66 @cond_branch\n" + " ldr r1, ._81\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x3\n" + " bls ._67 @cond_branch\n" + "._66:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._68 @cond_branch\n" + " ldr r0, ._81\n" + " ldrh r1, [r0, #0x8]\n" + " str r1, [r0, #0xc]\n" + " ldr r1, ._81 + 4\n" + " strh r1, [r0, #0x10]\n" + " mov r4, #0x0\n" + " ldrb r1, [r0]\n" + " add r7, r0, #0\n" + " cmp r4, r1\n" + " bcs ._69 @cond_branch\n" + " add r5, r7, #0\n" + " add r6, r1, #0\n" + "._70:\n" + " ldrh r0, [r5, #0x10]\n" + " mov r1, #0xa\n" + " str r3, [sp]\n" + " bl __udivsi3\n" + " strh r0, [r5, #0x10]\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r3, [sp]\n" + " cmp r4, r6\n" + " bcc ._70 @cond_branch\n" + "._69:\n" + " ldrh r1, [r7, #0x10]\n" + " ldr r0, [r7, #0xc]\n" + " add r0, r0, r1\n" + " str r0, [r7, #0xc]\n" + " ldr r1, ._81 + 8\n" + " cmp r0, r1\n" + " ble ._71 @cond_branch\n" + " str r1, [r7, #0xc]\n" + "._71:\n" + " ldrh r0, [r7, #0x8]\n" + " ldr r1, [r7, #0xc]\n" + " cmp r0, r1\n" + " bne ._77 @cond_branch\n" + "._68:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._73 @cond_branch\n" + " ldr r0, ._81\n" + " ldrh r1, [r0, #0x8]\n" + " str r1, [r0, #0xc]\n" + " ldr r1, ._81 + 4\n" + " strh r1, [r0, #0x10]\n" + " mov r4, #0x0\n" + " ldrb r1, [r0]\n" + " add r7, r0, #0\n" + " cmp r4, r1\n" + " bcs ._74 @cond_branch\n" + " add r5, r7, #0\n" + " add r6, r1, #0\n" + "._75:\n" + " ldrh r0, [r5, #0x10]\n" + " mov r1, #0xa\n" + " str r3, [sp]\n" + " bl __udivsi3\n" + " strh r0, [r5, #0x10]\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r3, [sp]\n" + " cmp r4, r6\n" + " bcc ._75 @cond_branch\n" + "._74:\n" + " add r2, r7, #0\n" + " ldrh r1, [r2, #0x10]\n" + " ldr r0, [r2, #0xc]\n" + " sub r0, r0, r1\n" + " str r0, [r2, #0xc]\n" + " cmp r0, #0\n" + " bge ._76 @cond_branch\n" + " mov r0, #0x0\n" + " str r0, [r2, #0xc]\n" + "._76:\n" + " ldrh r0, [r2, #0x8]\n" + " ldr r1, [r2, #0xc]\n" + " cmp r0, r1\n" + " bne ._77 @cond_branch\n" + "._73:\n" + " ldrh r2, [r3, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._78 @cond_branch\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._79 @cond_branch\n" + " mov r0, #0x0\n" + " mov r8, r0\n" + "._62:\n" + " mov r0, r8\n" + " cmp r0, #0\n" + " beq ._80 @cond_branch\n" + " bl debug_sub_8090C44\n" + "._80:\n" + " mov r0, #0x0\n" + "._63:\n" + " add sp, sp, #0x4\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._82:\n" + " .align 2, 0\n" + "._81:\n" + " .word +0x2000000\n" + " .word 0x2710\n" + " .word 0xffff\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_PKMNLottery() +{ + asm( + " push {lr}\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x6\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " bl RetrieveLotteryNumber\n" + " ldr r2, ._83\n" + " ldr r0, ._83 + 4\n" + " ldrh r0, [r0]\n" + " mov r1, #0x0\n" + " strh r0, [r2, #0x8]\n" + " strb r1, [r2]\n" + " bl debug_sub_8090C44\n" + " ldr r1, ._83 + 8\n" + " ldr r0, ._83 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._84:\n" + " .align 2, 0\n" + "._83:\n" + " .word +0x2000000\n" + " .word gScriptResult\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_8090C88+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_Trainer() +{ + asm( + " push {r4, r5, lr}\n" + " mov r4, #0x0\n" + " ldr r5, ._86\n" + "._85:\n" + " lsl r0, r4, #0x4\n" + " add r0, r0, r5\n" + " ldrh r0, [r0]\n" + " bl trainer_flag_set\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " cmp r4, #0x37\n" + " bls ._85 @cond_branch\n" + " ldr r0, ._86 + 4\n" + " bl trainer_flag_set\n" + " mov r0, #0x85\n" + " lsl r0, r0, #0x1\n" + " bl trainer_flag_set\n" + " ldr r0, ._86 + 8\n" + " bl trainer_flag_set\n" + " mov r0, #0x86\n" + " lsl r0, r0, #0x1\n" + " bl trainer_flag_set\n" + " ldr r0, ._86 + 12\n" + " bl trainer_flag_set\n" + " mov r0, #0x87\n" + " lsl r0, r0, #0x1\n" + " bl trainer_flag_set\n" + " ldr r0, ._86 + 16\n" + " bl trainer_flag_set\n" + " mov r0, #0x88\n" + " lsl r0, r0, #0x1\n" + " bl trainer_flag_set\n" + " ldr r0, ._86 + 20\n" + " bl trainer_flag_set\n" + " mov r0, #0x83\n" + " lsl r0, r0, #0x1\n" + " bl trainer_flag_set\n" + " ldr r0, ._86 + 24\n" + " bl trainer_flag_set\n" + " mov r0, #0x84\n" + " lsl r0, r0, #0x1\n" + " bl trainer_flag_set\n" + " ldr r0, ._86 + 28\n" + " bl trainer_flag_set\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "._87:\n" + " .align 2, 0\n" + "._86:\n" + " .word gTrainerEyeTrainers\n" + " .word 0x109\n" + " .word 0x10b\n" + " .word 0x10d\n" + " .word 0x10f\n" + " .word 0x105\n" + " .word 0x107\n" + " .word 0x14f\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_PokenavD() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xffffffe4\n" + " bl MenuDisplayMessageBox\n" + " mov r0, #0x0\n" + " mov sl, r0\n" + " mov r6, #0x1\n" + " mov r7, #0xff\n" + " mov r1, #0x3\n" + " mov r9, r1\n" + "._93:\n" + " ldr r4, ._94\n" + " add r0, r4, #0\n" + " ldr r1, ._94 + 4\n" + " bl StringCopy\n" + " mov r5, sl\n" + " add r5, r5, #0x1\n" + " add r1, r5, r4\n" + " mov r0, #0xff\n" + " strb r0, [r1]\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " mov r8, r0\n" + " str r5, [sp, #0x14]\n" + " mov r1, sl\n" + " lsl r1, r1, #0x2\n" + " str r1, [sp, #0x18]\n" + "._91:\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " add r0, r0, #0x1\n" + " str r0, [sp, #0x10]\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " add r0, r0, #0x1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " bl Random\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0xc1\n" + " lsl r1, r1, #0x1\n" + " bl __umodsi3\n" + " add r0, r0, #0x1\n" + " lsl r0, r0, #0x10\n" + " lsr r3, r0, #0x10\n" + " cmp r3, #0xfb\n" + " bls ._89 @cond_branch\n" + " add r0, r3, #0\n" + " add r0, r0, #0x19\n" + " lsl r0, r0, #0x10\n" + " lsr r3, r0, #0x10\n" + " ldr r0, ._94 + 8\n" + " cmp r3, r0\n" + " bls ._89 @cond_branch\n" + " mov r3, #0x1\n" + "._89:\n" + " ldr r0, [sp, #0x18]\n" + " add r0, r0, sl\n" + " lsl r4, r0, #0x4\n" + " sub r4, r4, r0\n" + " lsl r4, r4, #0x5\n" + " mov r1, r8\n" + " lsl r0, r1, #0x2\n" + " add r0, r0, r8\n" + " lsl r0, r0, #0x4\n" + " ldr r1, ._94 + 12\n" + " add r0, r0, r1\n" + " add r4, r4, r0\n" + " lsl r2, r5, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " str r0, [sp, #0x4]\n" + " str r6, [sp, #0x8]\n" + " ldr r0, [sp, #0x10]\n" + " str r0, [sp, #0xc]\n" + " add r0, r4, #0\n" + " add r1, r3, #0\n" + " mov r3, #0x20\n" + " bl CreateBoxMon\n" + " bl Random\n" + " add r1, r7, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x16\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r7, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x17\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r7, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x18\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r7, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x21\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r7, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x2f\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r7, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x30\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " mov r1, r9\n" + " and r1, r1, r0\n" + " add r1, r1, #0x1\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x32\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " mov r1, r9\n" + " and r1, r1, r0\n" + " add r1, r1, #0x1\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x33\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " mov r1, r9\n" + " and r1, r1, r0\n" + " add r1, r1, #0x1\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x34\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " mov r1, r9\n" + " and r1, r1, r0\n" + " add r1, r1, #0x1\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x36\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " mov r1, r9\n" + " and r1, r1, r0\n" + " add r1, r1, #0x1\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x35\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x43\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x44\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x45\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x46\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x47\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x48\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x49\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x4a\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x4b\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x4c\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x4d\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " bl Random\n" + " add r1, r6, #0\n" + " and r1, r1, r0\n" + " str r1, [sp, #0x10]\n" + " add r0, r4, #0\n" + " mov r1, #0x4e\n" + " add r2, sp, #0x10\n" + " bl SetBoxMonData\n" + " mov r0, r8\n" + " add r0, r0, #0x1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r8, r0\n" + " cmp r0, #0x1d\n" + " bhi ._90 @cond_branch\n" + " b ._91\n" + "._90:\n" + " ldr r1, [sp, #0x14]\n" + " lsl r0, r1, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov sl, r0\n" + " cmp r0, #0xd\n" + " bhi ._92 @cond_branch\n" + " b ._93\n" + "._92:\n" + " bl TayaDebugMenu_TownFlags\n" + " bl TayaDebugMenu_Trainer\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " add sp, sp, #0x1c\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._95:\n" + " .align 2, 0\n" + "._94:\n" + " .word +0x2000000\n" + " .word gUnknown_Debug_083C4F94\n" + " .word 0x19b\n" + " .word gPokemonStorage+0x4\n" + "\n" + ); +} + +__attribute__((naked)) +void TayaDebugMenu_8091190() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r3, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r3, r0\n" + " beq ._96 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r3, r0\n" + " beq ._97 @cond_branch\n" + " ldr r2, ._99\n" + " ldr r1, ._99 + 4\n" + " ldr r0, ._99 + 8\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x18\n" + " asr r0, r0, #0x18\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, [r0]\n" + " lsl r0, r3, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0, #0x4]\n" + " str r0, [r2]\n" + "._106:\n" + " mov r0, #0x0\n" + " b ._98\n" + "._100:\n" + " .align 2, 0\n" + "._99:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_83C5068\n" + " .word unk_2030224\n" + "._96:\n" + " ldr r3, ._107\n" + " ldrb r4, [r3]\n" + " ldr r2, ._107 + 4\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " add r5, r3, #0\n" + " cmp r0, #0\n" + " beq ._102 @cond_branch\n" + " sub r0, r4, #1\n" + " strb r0, [r5]\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bge ._102 @cond_branch\n" + " mov r0, #0x1\n" + " strb r0, [r5]\n" + "._102:\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._104 @cond_branch\n" + " ldrb r0, [r5]\n" + " add r0, r0, #0x1\n" + " strb r0, [r5]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bls ._104 @cond_branch\n" + " mov r0, #0x0\n" + " strb r0, [r5]\n" + "._104:\n" + " lsl r0, r4, #0x18\n" + " asr r0, r0, #0x18\n" + " mov r1, #0x0\n" + " ldrsb r1, [r5, r1]\n" + " cmp r0, r1\n" + " beq ._106 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xb\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r4, ._107 + 8\n" + " mov r0, #0x0\n" + " ldrsb r0, [r5, r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r4\n" + " ldrb r2, [r0, #0x4]\n" + " ldr r3, [r0]\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " ldrsb r0, [r5, r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r4\n" + " ldrb r3, [r0, #0x4]\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xa\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl InitMenu\n" + " b ._106\n" + "._108:\n" + " .align 2, 0\n" + "._107:\n" + " .word unk_2030224\n" + " .word gMain\n" + " .word gUnknown_Debug_83C5068\n" + "._97:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._98:\n" + " add sp, sp, #0x8\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void InitTayaDebugWindow() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " ldr r1, ._109\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xb\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._109 + 4\n" + " ldr r3, [r0]\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xa\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._109 + 8\n" + " ldr r0, ._109 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._110:\n" + " .align 2, 0\n" + "._109:\n" + " .word unk_2030224\n" + " .word gUnknown_Debug_83C5068\n" + " .word gCallback_03004AE8\n" + " .word TayaDebugMenu_8091190+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80912D8() +{ + asm( + " push {lr}\n" + " ldr r0, ._113\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._111 @cond_branch\n" + " mov r0, #0x0\n" + " b ._112\n" + "._114:\n" + " .align 2, 0\n" + "._113:\n" + " .word gPaletteFade\n" + "._111:\n" + " ldr r0, ._115\n" + " bl SetMainCallback2\n" + " mov r0, #0x1\n" + "._112:\n" + " pop {r1}\n" + " bx r1\n" + "._116:\n" + " .align 2, 0\n" + "._115:\n" + " .word debug_sub_8110F28+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8091300() +{ + asm( + " push {lr}\n" + " mov r0, #0x1\n" + " mov r1, #0x0\n" + " bl fade_screen\n" + " ldr r1, ._117\n" + " ldr r0, ._117 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._118:\n" + " .align 2, 0\n" + "._117:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_80912D8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8091320() +{ + asm( + " push {lr}\n" + " bl LoadOam\n" + " bl ProcessSpriteCopyRequests\n" + " bl TransferPlttBuffer\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8091334() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " ldr r3, ._123\n" + " add r0, r3, #0\n" + " add r0, r0, #0x52\n" + " ldrb r4, [r0]\n" + " cmp r4, #0\n" + " beq ._119 @cond_branch\n" + " cmp r4, #0x1\n" + " bne ._120 @cond_branch\n" + " b ._121\n" + "._120:\n" + " b ._162\n" + "._124:\n" + " .align 2, 0\n" + "._123:\n" + " .word +0x2000000\n" + "._119:\n" + " add r5, r3, #0\n" + " add r5, r5, #0x55\n" + " strb r4, [r5]\n" + " ldr r2, ._131\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " mov r9, r2\n" + " cmp r0, #0\n" + " beq ._126 @cond_branch\n" + " add r1, r3, #0\n" + " add r1, r1, #0x54\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._126 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x1\n" + " strb r0, [r5]\n" + "._126:\n" + " mov r0, r9\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " ldr r5, ._131 + 4\n" + " cmp r0, #0\n" + " beq ._133 @cond_branch\n" + " add r0, r5, #0\n" + " add r0, r0, #0x53\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x2\n" + " beq ._128 @cond_branch\n" + " add r1, r5, #0\n" + " add r1, r1, #0x54\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x4\n" + " bhi ._133 @cond_branch\n" + " b ._130\n" + "._132:\n" + " .align 2, 0\n" + "._131:\n" + " .word gMain\n" + " .word +0x2000000\n" + "._128:\n" + " add r1, r5, #0\n" + " add r1, r1, #0x54\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x3\n" + " bhi ._133 @cond_branch\n" + "._130:\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " add r1, r1, #0x1\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + "._133:\n" + " mov r2, r9\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._135 @cond_branch\n" + " add r1, r5, #0\n" + " add r1, r1, #0x53\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._135 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " add r1, r1, #0x2\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + "._135:\n" + " mov r3, r9\n" + " ldrh r1, [r3, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._140 @cond_branch\n" + " add r0, r5, #0\n" + " add r0, r0, #0x54\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x5\n" + " beq ._137 @cond_branch\n" + " add r1, r5, #0\n" + " add r1, r1, #0x53\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x1\n" + " bhi ._140 @cond_branch\n" + " b ._139\n" + "._137:\n" + " add r1, r5, #0\n" + " add r1, r1, #0x53\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._140 @cond_branch\n" + "._139:\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " add r1, r1, #0x2\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + "._140:\n" + " add r0, r5, #0\n" + " add r0, r0, #0x55\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._141 @cond_branch\n" + " mov r0, r9\n" + " ldrh r2, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._142 @cond_branch\n" + " ldr r2, ._145\n" + " add r3, r5, #0\n" + " add r3, r3, #0x53\n" + " add r0, r5, #0\n" + " add r0, r0, #0x54\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " ldrb r3, [r3]\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r2\n" + " ldrh r0, [r0, #0x4]\n" + " sub r0, r0, #0x32\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0x4\n" + " bhi ._143 @cond_branch\n" + " add r1, r5, #0\n" + " add r1, r1, #0x56\n" + " mov r0, #0x4\n" + " b ._144\n" + "._146:\n" + " .align 2, 0\n" + "._145:\n" + " .word gUnknown_Debug_083C50EC\n" + "._143:\n" + " add r1, r5, #0\n" + " add r1, r1, #0x56\n" + " mov r0, #0x1\n" + "._144:\n" + " strb r0, [r1]\n" + " add r1, r5, #0\n" + " add r1, r1, #0x52\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " b ._162\n" + "._142:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._148 @cond_branch\n" + " b ._162\n" + "._148:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x10\n" + " mov r2, #0x0\n" + " bl BlendPalettes\n" + " ldr r0, ._151\n" + " bl SetMainCallback2\n" + " b ._162\n" + "._152:\n" + " .align 2, 0\n" + "._151:\n" + " .word sub_80546F0+1\n" + "._121:\n" + " add r5, r3, #0\n" + " add r5, r5, #0x55\n" + " mov r0, #0x0\n" + " strb r0, [r5]\n" + " ldr r2, ._159\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " mov r9, r2\n" + " cmp r0, #0\n" + " beq ._154 @cond_branch\n" + " add r2, r3, #0\n" + " add r2, r2, #0x53\n" + " add r0, r3, #0\n" + " add r0, r0, #0x54\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " add r2, r0, r3\n" + " add r0, r3, #0\n" + " add r0, r0, #0x56\n" + " ldrb r1, [r2]\n" + " ldrb r0, [r0]\n" + " cmp r1, r0\n" + " bcs ._154 @cond_branch\n" + " add r0, r1, #1\n" + " strb r0, [r2]\n" + " strb r4, [r5]\n" + "._154:\n" + " mov r2, r9\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " ldr r5, ._159 + 4\n" + " cmp r0, #0\n" + " beq ._156 @cond_branch\n" + " add r2, r5, #0\n" + " add r2, r2, #0x53\n" + " add r0, r5, #0\n" + " add r0, r0, #0x54\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x1\n" + " add r0, r0, r1\n" + " ldrb r2, [r2]\n" + " add r0, r0, r2\n" + " add r1, r0, r5\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._156 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " add r1, r5, #0\n" + " add r1, r1, #0x55\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + "._156:\n" + " add r6, r5, #0\n" + " add r0, r6, #0\n" + " add r0, r0, #0x55\n" + " ldrb r7, [r0]\n" + " cmp r7, #0\n" + " beq ._157 @cond_branch\n" + "._141:\n" + " bl debug_sub_80916AC\n" + " b ._162\n" + "._160:\n" + " .align 2, 0\n" + "._159:\n" + " .word gMain\n" + " .word +0x2000000\n" + "._157:\n" + " mov r3, r9\n" + " ldrh r1, [r3, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._161 @cond_branch\n" + " ldr r0, ._164\n" + " ldr r1, ._164 + 4\n" + " mov ip, r1\n" + " mov r2, #0x53\n" + " add r2, r2, r6\n" + " mov r8, r2\n" + " add r4, r6, #0\n" + " add r4, r4, #0x54\n" + " ldrb r2, [r4]\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r2\n" + " mov r3, r8\n" + " ldrb r3, [r3]\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, ip\n" + " ldrh r1, [r1, #0x4]\n" + " bl GetMonData\n" + " ldrb r2, [r4]\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r2\n" + " mov r2, r8\n" + " ldrb r2, [r2]\n" + " add r1, r1, r2\n" + " add r1, r1, r6\n" + " strb r0, [r1]\n" + " bl debug_sub_80916AC\n" + " add r0, r6, #0\n" + " add r0, r0, #0x52\n" + " strb r7, [r0]\n" + "._161:\n" + " mov r3, r9\n" + " ldrh r1, [r3, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._162 @cond_branch\n" + " ldr r2, ._164 + 4\n" + " add r0, r6, #0\n" + " add r0, r0, #0x53\n" + " ldrb r4, [r0]\n" + " add r0, r0, #0x1\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x1\n" + " add r3, r0, r1\n" + " add r0, r3, r4\n" + " lsl r0, r0, #0x3\n" + " add r1, r0, r2\n" + " ldrh r0, [r1, #0x4]\n" + " cmp r0, #0\n" + " beq ._163 @cond_branch\n" + " ldr r0, ._164\n" + " ldrh r1, [r1, #0x4]\n" + " add r2, r4, r6\n" + " add r2, r3, r2\n" + " bl SetMonData\n" + "._163:\n" + " add r0, r5, #0\n" + " add r0, r0, #0x52\n" + " strb r7, [r0]\n" + "._162:\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._165:\n" + " .align 2, 0\n" + "._164:\n" + " .word gPlayerParty\n" + " .word gUnknown_Debug_083C50EC\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80915BC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " ldr r0, ._168\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " mov r1, #0x0\n" + " ldr r0, ._168 + 4\n" + " mov r8, r0\n" + " ldr r7, ._168 + 8\n" + "._171:\n" + " mov r4, #0x0\n" + " lsl r0, r1, #0x1\n" + " add r6, r1, #1\n" + " add r5, r0, r1\n" + "._170:\n" + " add r0, r5, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r8\n" + " ldrh r1, [r0, #0x4]\n" + " cmp r1, #0\n" + " beq ._166 @cond_branch\n" + " ldr r0, ._168 + 12\n" + " bl GetMonData\n" + " add r1, r4, r5\n" + " add r1, r1, r7\n" + " strb r0, [r1]\n" + " b ._167\n" + "._169:\n" + " .align 2, 0\n" + "._168:\n" + " .word 0x4000010\n" + " .word gUnknown_Debug_083C50EC\n" + " .word +0x2000000\n" + " .word gPlayerParty\n" + "._166:\n" + " add r0, r4, r5\n" + " add r0, r0, r7\n" + " strb r1, [r0]\n" + "._167:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x2\n" + " bls ._170 @cond_branch\n" + " lsl r0, r6, #0x18\n" + " lsr r1, r0, #0x18\n" + " cmp r1, #0x5\n" + " bls ._171 @cond_branch\n" + " ldr r4, ._172\n" + " add r0, r4, #0\n" + " bl SetUpWindowConfig\n" + " add r0, r4, #0\n" + " bl InitMenuWindow\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x3\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._172 + 4\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " mov r1, #0x4\n" + " mov r2, #0x1d\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x0\n" + " mov r1, #0x12\n" + " mov r2, #0x1d\n" + " mov r3, #0x15\n" + " bl MenuDrawTextWindow\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x13\n" + " mov r2, #0x8a\n" + " lsl r2, r2, #0x5\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r2, ._172 + 8\n" + " add r0, r2, #0\n" + " add r0, r0, #0x53\n" + " mov r1, #0x0\n" + " strb r1, [r0]\n" + " add r0, r0, #0x1\n" + " strb r1, [r0]\n" + " sub r0, r0, #0x2\n" + " strb r1, [r0]\n" + " bl debug_sub_80916AC\n" + " ldr r0, ._172 + 12\n" + " bl SetVBlankCallback\n" + " ldr r0, ._172 + 16\n" + " bl SetMainCallback2\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._173:\n" + " .align 2, 0\n" + "._172:\n" + " .word gWindowConfig_81E7224\n" + " .word gUnknown_Debug_083C517C\n" + " .word +0x2000000\n" + " .word debug_sub_8091320+1\n" + " .word debug_sub_8091334+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80916AC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " mov r6, #0x0\n" + " ldr r0, ._177\n" + " mov sl, r0\n" + " mov r1, #0x0\n" + " mov r8, r1\n" + "._182:\n" + " ldr r2, ._177 + 4\n" + " mov r5, #0x0\n" + " lsl r0, r6, #0x1\n" + " mov r9, r0\n" + " add r1, r6, #1\n" + " str r1, [sp]\n" + "._181:\n" + " mov r0, sl\n" + " add r0, r0, #0x53\n" + " ldrb r0, [r0]\n" + " cmp r0, r5\n" + " bne ._175 @cond_branch\n" + " ldr r1, ._177 + 8\n" + " ldrb r0, [r1]\n" + " cmp r0, r6\n" + " bne ._175 @cond_branch\n" + " mov r0, #0xef\n" + " b ._176\n" + "._178:\n" + " .align 2, 0\n" + "._177:\n" + " .word +0x2000000\n" + " .word +0x2000012\n" + " .word +0x2000054\n" + "._175:\n" + " mov r0, r8\n" + " strb r0, [r2]\n" + " add r2, r2, #0x1\n" + "._176:\n" + " strb r0, [r2]\n" + " add r2, r2, #0x1\n" + " mov r1, r9\n" + " add r4, r1, r6\n" + " add r0, r4, r5\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._183\n" + " add r0, r0, r1\n" + " ldr r1, [r0]\n" + " add r0, r2, #0\n" + " bl StringCopy\n" + " add r2, r0, #0\n" + " mov r0, r8\n" + " strb r0, [r2]\n" + " add r2, r2, #0x1\n" + " ldr r7, ._183 + 4\n" + " add r4, r5, r4\n" + " add r4, r4, r7\n" + " ldrb r1, [r4]\n" + " add r0, r2, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " add r2, r0, #0\n" + " mov r1, r8\n" + " strb r1, [r2]\n" + " add r2, r2, #0x1\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x2\n" + " bhi ._179 @cond_branch\n" + " cmp r6, #0x5\n" + " bne ._181 @cond_branch\n" + " cmp r5, #0x2\n" + " bne ._181 @cond_branch\n" + "._179:\n" + " sub r1, r2, #1\n" + " mov r0, #0xff\n" + " strb r0, [r1]\n" + " mov r2, r9\n" + " add r2, r2, #0x5\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " add r0, r7, #0\n" + " add r0, r0, #0x12\n" + " mov r1, #0x1\n" + " bl MenuPrint\n" + " ldr r1, [sp]\n" + " lsl r0, r1, #0x18\n" + " lsr r6, r0, #0x18\n" + " cmp r6, #0x5\n" + " bls ._182 @cond_branch\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._184:\n" + " .align 2, 0\n" + "._183:\n" + " .word gUnknown_Debug_083C50EC\n" + " .word +0x2000000\n" + "\n" + ); +} + +#endif diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c new file mode 100644 index 000000000..f745f2993 --- /dev/null +++ b/src/debug/tomomichi_debug_menu.c @@ -0,0 +1,8643 @@ +#ifdef DEBUG +#include "global.h" + +#define BSS_DATA __attribute__((section(".bss"))) + +BSS_DATA u8 gDebug_03000700[0x24] = { 0 }; + +__attribute__((naked)) +void InitTomomichiDebugWindow() +{ + asm( + " push {lr}\n" + " bl debug_sub_808B874\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808B868() +{ + asm( + " push {lr}\n" + " bl c2_exit_to_overworld_1_continue_scripts_restart_music\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808B874() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xd\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._1\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " ldr r0, ._1 + 4\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, #0xc\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._1 + 8\n" + " ldr r0, ._1 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._2:\n" + " .align 2, 0\n" + "._1:\n" + " .word gUnknown_Debug_083C0CBA\n" + " .word gDebug_03000700+0x1d\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808B8C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808B8C8() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._7\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._3 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + " ldr r1, ._7 + 4\n" + " strb r0, [r1]\n" + "._3:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._4 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + " ldr r1, ._7 + 4\n" + " strb r0, [r1]\n" + "._4:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._5 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._7 + 8\n" + " ldr r0, ._7 + 4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r1, r1, #0x4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " bl _call_via_r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._10\n" + "._8:\n" + " .align 2, 0\n" + "._7:\n" + " .word gMain\n" + " .word gDebug_03000700+0x1d\n" + " .word gUnknown_Debug_083C0CBA\n" + "._5:\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._9 @cond_branch\n" + " mov r0, #0x0\n" + " b ._10\n" + "._9:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._10:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_ContestGraphics() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x14\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._11\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r3, ._11 + 4\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0x4\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x13\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " ldr r1, ._11 + 8\n" + " ldr r0, ._11 + 12\n" + " str r0, [r1]\n" + " ldr r0, ._11 + 16\n" + " mov r2, #0x1\n" + " strh r2, [r0]\n" + " ldr r1, ._11 + 20\n" + " ldr r0, ._11 + 24\n" + " str r0, [r1]\n" + " ldr r0, ._11 + 28\n" + " str r4, [r0]\n" + " ldr r0, ._11 + 32\n" + " strb r2, [r0]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._12:\n" + " .align 2, 0\n" + "._11:\n" + " .word gUnknown_Debug_083C0CF4\n" + " .word gUnknown_Debug_083C0D2C\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808BC48+1\n" + " .word gDebug_03000700\n" + " .word gDebug_03000700+0x4\n" + " .word 0x6f33\n" + " .word gDebug_03000700+0x8\n" + " .word gDebug_03000700+0xc\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_ArtMusGraphics() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x14\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._13\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r3, ._13 + 4\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0x4\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x13\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " ldr r1, ._13 + 8\n" + " ldr r0, ._13 + 12\n" + " str r0, [r1]\n" + " ldr r0, ._13 + 16\n" + " mov r2, #0x1\n" + " strh r2, [r0]\n" + " ldr r1, ._13 + 20\n" + " ldr r0, ._13 + 24\n" + " str r0, [r1]\n" + " ldr r0, ._13 + 28\n" + " str r4, [r0]\n" + " ldr r0, ._13 + 32\n" + " strb r2, [r0]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._14:\n" + " .align 2, 0\n" + "._13:\n" + " .word gUnknown_Debug_083C0D4C\n" + " .word gUnknown_Debug_083C0D83\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808BCBC+1\n" + " .word gDebug_03000700\n" + " .word gDebug_03000700+0x4\n" + " .word 0x6f33\n" + " .word gDebug_03000700+0x8\n" + " .word gDebug_03000700+0xd\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_PreviewData() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x14\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._15\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r3, ._15 + 4\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0x4\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x13\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " ldr r1, ._15 + 8\n" + " ldr r0, ._15 + 12\n" + " str r0, [r1]\n" + " ldr r0, ._15 + 16\n" + " mov r2, #0x1\n" + " strh r2, [r0]\n" + " ldr r1, ._15 + 20\n" + " ldr r0, ._15 + 24\n" + " str r0, [r1]\n" + " ldr r0, ._15 + 28\n" + " str r4, [r0]\n" + " ldr r0, ._15 + 32\n" + " strb r2, [r0]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._16:\n" + " .align 2, 0\n" + "._15:\n" + " .word gUnknown_Debug_083C0DA4\n" + " .word gUnknown_Debug_083C0DD4\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808BD30+1\n" + " .word gDebug_03000700\n" + " .word gDebug_03000700+0x4\n" + " .word 0x6f33\n" + " .word gDebug_03000700+0x8\n" + " .word gDebug_03000700+0xe\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_TrickHouse() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._17\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r3, ._17 + 4\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " ldr r0, ._17 + 8\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._17 + 12\n" + " ldr r0, ._17 + 16\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._18:\n" + " .align 2, 0\n" + "._17:\n" + " .word gUnknown_Debug_083C0DF4\n" + " .word gUnknown_Debug_083C0E15\n" + " .word gDebug_03000700+0x1e\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808BDA4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_ControlEvents() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._19\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " ldr r0, ._19 + 4\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._19 + 8\n" + " ldr r0, ._19 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._20:\n" + " .align 2, 0\n" + "._19:\n" + " .word gUnknown_Debug_083C0E32\n" + " .word gDebug_03000700+0x1f\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808BE2C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_ControlFlags() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._21\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " ldr r0, ._21 + 4\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._21 + 8\n" + " ldr r0, ._21 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._22:\n" + " .align 2, 0\n" + "._21:\n" + " .word gUnknown_Debug_083C0E7F\n" + " .word gDebug_03000700+0x20\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808BEB4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_ControlWorks() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._23\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " ldr r0, ._23 + 4\n" + " ldrb r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r1, ._23 + 8\n" + " ldr r0, ._23 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._24:\n" + " .align 2, 0\n" + "._23:\n" + " .word gUnknown_Debug_083C0EF1\n" + " .word gDebug_03000700+0x21\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808BF3C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BC48() +{ + asm( + " push {r4, lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._25 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._26 @cond_branch\n" + " cmp r0, #0\n" + " beq ._27 @cond_branch\n" + " b ._32\n" + "._26:\n" + " cmp r0, #0x2\n" + " beq ._29 @cond_branch\n" + " b ._32\n" + "._27:\n" + " bl debug_sub_808ED0C\n" + " b ._32\n" + "._25:\n" + " bl debug_sub_808ED9C\n" + " b ._32\n" + "._29:\n" + " bl debug_sub_808EE3C\n" + "._32:\n" + " mov r0, #0x0\n" + " bl debug_sub_808EF8C\n" + " lsl r0, r4, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._36 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._34 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._35\n" + "._34:\n" + " cmp r1, #0x3\n" + " bne ._36 @cond_branch\n" + " ldr r0, ._37\n" + " ldr r1, ._37 + 4\n" + " ldr r1, [r1, #0x1c]\n" + " str r1, [r0]\n" + "._36:\n" + " mov r0, #0x0\n" + "._35:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._38:\n" + " .align 2, 0\n" + "._37:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C0D2C\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BCBC() +{ + asm( + " push {r4, lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._39 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._40 @cond_branch\n" + " cmp r0, #0\n" + " beq ._41 @cond_branch\n" + " b ._46\n" + "._40:\n" + " cmp r0, #0x2\n" + " beq ._43 @cond_branch\n" + " b ._46\n" + "._41:\n" + " bl debug_sub_808ED0C\n" + " b ._46\n" + "._39:\n" + " bl debug_sub_808ED9C\n" + " b ._46\n" + "._43:\n" + " bl debug_sub_808EE9C\n" + "._46:\n" + " mov r0, #0x1\n" + " bl debug_sub_808EF8C\n" + " lsl r0, r4, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._50 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._48 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._49\n" + "._48:\n" + " cmp r1, #0x3\n" + " bne ._50 @cond_branch\n" + " ldr r0, ._51\n" + " ldr r1, ._51 + 4\n" + " ldr r1, [r1, #0x1c]\n" + " str r1, [r0]\n" + "._50:\n" + " mov r0, #0x0\n" + "._49:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._52:\n" + " .align 2, 0\n" + "._51:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C0D83\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BD30() +{ + asm( + " push {r4, lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " asr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._53 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._54 @cond_branch\n" + " cmp r0, #0\n" + " beq ._55 @cond_branch\n" + " b ._60\n" + "._54:\n" + " cmp r0, #0x2\n" + " beq ._57 @cond_branch\n" + " b ._60\n" + "._55:\n" + " bl debug_sub_808ED0C\n" + " b ._60\n" + "._53:\n" + " bl debug_sub_808ED9C\n" + " b ._60\n" + "._57:\n" + " bl debug_sub_808EF14\n" + "._60:\n" + " mov r0, #0x2\n" + " bl debug_sub_808EF8C\n" + " lsl r0, r4, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._64 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._62 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._63\n" + "._62:\n" + " cmp r1, #0x3\n" + " bne ._64 @cond_branch\n" + " ldr r0, ._65\n" + " ldr r1, ._65 + 4\n" + " ldr r1, [r1, #0x1c]\n" + " str r1, [r0]\n" + "._64:\n" + " mov r0, #0x0\n" + "._63:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._66:\n" + " .align 2, 0\n" + "._65:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C0DD4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BDA4() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._71\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._67 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + " ldr r1, ._71 + 4\n" + " strb r0, [r1]\n" + "._67:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._68 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + " ldr r1, ._71 + 4\n" + " strb r0, [r1]\n" + "._68:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._69 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._71 + 8\n" + " ldr r0, ._71 + 4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r1, r1, #0x4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " bl _call_via_r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._74\n" + "._72:\n" + " .align 2, 0\n" + "._71:\n" + " .word gMain\n" + " .word gDebug_03000700+0x1e\n" + " .word gUnknown_Debug_083C0E15\n" + "._69:\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._73 @cond_branch\n" + " mov r0, #0x0\n" + " b ._74\n" + "._73:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._74:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BE2C() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._79\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._75 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + " ldr r1, ._79 + 4\n" + " strb r0, [r1]\n" + "._75:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._76 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + " ldr r1, ._79 + 4\n" + " strb r0, [r1]\n" + "._76:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._77 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._79 + 8\n" + " ldr r0, ._79 + 4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r1, r1, #0x4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " bl _call_via_r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._82\n" + "._80:\n" + " .align 2, 0\n" + "._79:\n" + " .word gMain\n" + " .word gDebug_03000700+0x1f\n" + " .word gUnknown_Debug_083C0E32\n" + "._77:\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._81 @cond_branch\n" + " mov r0, #0x0\n" + " b ._82\n" + "._81:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._82:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BEB4() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._87\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._83 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + " ldr r1, ._87 + 4\n" + " strb r0, [r1]\n" + "._83:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._84 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + " ldr r1, ._87 + 4\n" + " strb r0, [r1]\n" + "._84:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._85 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._87 + 8\n" + " ldr r0, ._87 + 4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r1, r1, #0x4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " bl _call_via_r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._90\n" + "._88:\n" + " .align 2, 0\n" + "._87:\n" + " .word gMain\n" + " .word gDebug_03000700+0x20\n" + " .word gUnknown_Debug_083C0E7F\n" + "._85:\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._89 @cond_branch\n" + " mov r0, #0x0\n" + " b ._90\n" + "._89:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._90:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BF3C() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._95\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._91 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + " ldr r1, ._95 + 4\n" + " strb r0, [r1]\n" + "._91:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._92 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + " ldr r1, ._95 + 4\n" + " strb r0, [r1]\n" + "._92:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._93 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._95 + 8\n" + " ldr r0, ._95 + 4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r1, r1, #0x4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " bl _call_via_r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._98\n" + "._96:\n" + " .align 2, 0\n" + "._95:\n" + " .word gMain\n" + " .word gDebug_03000700+0x21\n" + " .word gUnknown_Debug_083C0EF1\n" + "._93:\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._97 @cond_branch\n" + " mov r0, #0x0\n" + " b ._98\n" + "._97:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._98:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808BFC4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._99\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._99 + 4\n" + " ldr r0, ._99 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._100:\n" + " .align 2, 0\n" + "._99:\n" + " .word gUnknown_Debug_083C0F79\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C064+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C014() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._101\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r1, ._101 + 4\n" + " ldr r0, ._101 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._102:\n" + " .align 2, 0\n" + "._101:\n" + " .word gUnknown_Debug_083C0FFC\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C0A8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C064() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._103 @cond_branch\n" + " mov r0, #0x0\n" + " b ._106\n" + "._103:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._105 @cond_branch\n" + " ldr r2, ._107\n" + " ldr r0, ._107 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._106\n" + "._108:\n" + " .align 2, 0\n" + "._107:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C0F79\n" + "._105:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._106:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C0A8() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._109 @cond_branch\n" + " mov r0, #0x0\n" + " b ._112\n" + "._109:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._111 @cond_branch\n" + " ldr r2, ._113\n" + " ldr r0, ._113 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._112\n" + "._114:\n" + " .align 2, 0\n" + "._113:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C0FFC\n" + "._111:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._112:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C0EC() +{ + asm( + " push {lr}\n" + " ldr r0, ._115\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._116:\n" + " .align 2, 0\n" + "._115:\n" + " .word DebugScript_081C1CFE\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C104() +{ + asm( + " push {lr}\n" + " ldr r0, ._117\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._118:\n" + " .align 2, 0\n" + "._117:\n" + " .word DebugScript_081C1D07\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C11C() +{ + asm( + " push {lr}\n" + " ldr r0, ._119\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._120:\n" + " .align 2, 0\n" + "._119:\n" + " .word DebugScript_081C1D1E\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C134() +{ + asm( + " push {lr}\n" + " ldr r0, ._121\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._122:\n" + " .align 2, 0\n" + "._121:\n" + " .word DebugScript_081C1D24\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C14C() +{ + asm( + " push {lr}\n" + " ldr r0, ._123\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._124:\n" + " .align 2, 0\n" + "._123:\n" + " .word DebugScript_081C1D2A\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C164() +{ + asm( + " push {lr}\n" + " ldr r0, ._125\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._126:\n" + " .align 2, 0\n" + "._125:\n" + " .word DebugScript_081C1D35\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C17C() +{ + asm( + " push {lr}\n" + " ldr r0, ._127\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._128:\n" + " .align 2, 0\n" + "._127:\n" + " .word DebugScript_081C1D46\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C194() +{ + asm( + " push {lr}\n" + " ldr r0, ._129\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._130:\n" + " .align 2, 0\n" + "._129:\n" + " .word DebugScript_081C221F\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C1AC() +{ + asm( + " push {lr}\n" + " ldr r0, ._131\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._132:\n" + " .align 2, 0\n" + "._131:\n" + " .word DebugScript_081C23E2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C1C4() +{ + asm( + " push {lr}\n" + " ldr r0, ._133\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._134:\n" + " .align 2, 0\n" + "._133:\n" + " .word DebugScript_081C23E6\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C1DC() +{ + asm( + " push {lr}\n" + " ldr r0, ._135\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._136:\n" + " .align 2, 0\n" + "._135:\n" + " .word DebugScript_081C23F6\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C1F4() +{ + asm( + " push {lr}\n" + " ldr r0, ._137\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._138:\n" + " .align 2, 0\n" + "._137:\n" + " .word DebugScript_081C2482\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C20C() +{ + asm( + " push {lr}\n" + " ldr r0, ._139\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._140:\n" + " .align 2, 0\n" + "._139:\n" + " .word DebugScript_081C23FD\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C224() +{ + asm( + " push {lr}\n" + " ldr r0, ._141\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._142:\n" + " .align 2, 0\n" + "._141:\n" + " .word DebugScript_081C2518\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C23C() +{ + asm( + " push {lr}\n" + " ldr r0, ._143\n" + " bl ScriptContext1_SetupScript\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._144:\n" + " .align 2, 0\n" + "._143:\n" + " .word DebugScript_081C2507\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_ContestGraphics_Show() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._145\n" + " ldr r0, ._145 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._146:\n" + " .align 2, 0\n" + "._145:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C280+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C280() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._147 @cond_branch\n" + " mov r0, #0x0\n" + " b ._148\n" + "._147:\n" + " bl CloseMenu\n" + " mov r0, #0x0\n" + " bl debug_sub_808F168\n" + " ldr r0, ._149\n" + " bl SetMainCallback2\n" + " ldr r1, ._149 + 4\n" + " ldr r0, ._149 + 8\n" + " str r0, [r1, #0x8]\n" + " mov r0, #0x1\n" + "._148:\n" + " pop {r1}\n" + " bx r1\n" + "._150:\n" + " .align 2, 0\n" + "._149:\n" + " .word CB2_ContestPainting+1\n" + " .word gMain\n" + " .word debug_sub_808B868+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_MuseumGraphics_Show() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._151\n" + " ldr r0, ._151 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._152:\n" + " .align 2, 0\n" + "._151:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C2E4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C2E4() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._153 @cond_branch\n" + " mov r0, #0x0\n" + " b ._154\n" + "._153:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " bl debug_sub_808F168\n" + " ldr r0, ._155\n" + " bl SetMainCallback2\n" + " ldr r1, ._155 + 4\n" + " ldr r0, ._155 + 8\n" + " str r0, [r1, #0x8]\n" + " mov r0, #0x1\n" + "._154:\n" + " pop {r1}\n" + " bx r1\n" + "._156:\n" + " .align 2, 0\n" + "._155:\n" + " .word CB2_ContestPainting+1\n" + " .word gMain\n" + " .word debug_sub_808B868+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C31C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._157\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._157 + 4\n" + " ldr r0, ._157 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._158:\n" + " .align 2, 0\n" + "._157:\n" + " .word gUnknown_Debug_083C2828\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C36C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C36C() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._159 @cond_branch\n" + " mov r0, #0x0\n" + " b ._162\n" + "._159:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._161 @cond_branch\n" + " ldr r2, ._163\n" + " ldr r0, ._163 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._162\n" + "._164:\n" + " .align 2, 0\n" + "._163:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C2828\n" + "._161:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._162:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C3B0() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._165\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r0, ._165 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._165 + 8\n" + " ldr r0, ._165 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._166:\n" + " .align 2, 0\n" + "._165:\n" + " .word gUnknown_Debug_083C2938\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C408() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._167\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._167 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._167 + 8\n" + " ldr r0, ._167 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._168:\n" + " .align 2, 0\n" + "._167:\n" + " .word gUnknown_Debug_083C2A48\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C460() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._169\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._169 + 4\n" + " mov r0, #0x2\n" + " strb r0, [r1]\n" + " ldr r1, ._169 + 8\n" + " ldr r0, ._169 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._170:\n" + " .align 2, 0\n" + "._169:\n" + " .word gUnknown_Debug_083C2B4C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C4B8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._171\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._171 + 4\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + " ldr r1, ._171 + 8\n" + " ldr r0, ._171 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._172:\n" + " .align 2, 0\n" + "._171:\n" + " .word gUnknown_Debug_083C2C80\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C510() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._173\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._173 + 4\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r1, ._173 + 8\n" + " ldr r0, ._173 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._174:\n" + " .align 2, 0\n" + "._173:\n" + " .word gUnknown_Debug_083C2D8C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C568() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._175\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._175 + 4\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r1, ._175 + 8\n" + " ldr r0, ._175 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._176:\n" + " .align 2, 0\n" + "._175:\n" + " .word gUnknown_Debug_083C2EB0\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C5C0() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._177\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._177 + 4\n" + " mov r0, #0x6\n" + " strb r0, [r1]\n" + " ldr r1, ._177 + 8\n" + " ldr r0, ._177 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._178:\n" + " .align 2, 0\n" + "._177:\n" + " .word gUnknown_Debug_083C2FE0\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C618() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._179\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._179 + 4\n" + " mov r0, #0x7\n" + " strb r0, [r1]\n" + " ldr r1, ._179 + 8\n" + " ldr r0, ._179 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._180:\n" + " .align 2, 0\n" + "._179:\n" + " .word gUnknown_Debug_083C3100\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C670() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._181\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl InitMenu\n" + " ldr r1, ._181 + 4\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldr r1, ._181 + 8\n" + " ldr r0, ._181 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._182:\n" + " .align 2, 0\n" + "._181:\n" + " .word gUnknown_Debug_083C3194\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C6C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C6C8() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._186\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808C714\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808C764\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._183 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._184 @cond_branch\n" + "._183:\n" + " mov r0, #0x0\n" + " b ._185\n" + "._187:\n" + " .align 2, 0\n" + "._186:\n" + " .word gDebug_03000700+0xf\n" + "._184:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._185:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C714() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._191\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._190 @cond_branch\n" + " ldr r0, ._191 + 4\n" + " lsl r1, r2, #0x3\n" + " add r1, r1, r2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r0\n" + " ldrh r4, [r1]\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._189 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._190\n" + "._192:\n" + " .align 2, 0\n" + "._191:\n" + " .word gMain\n" + " .word gUnknown_Debug_083C31DC+0xa\n" + "._189:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + "._190:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C764() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._195\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._193 @cond_branch\n" + " ldr r0, ._195 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._194:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " neg r2, r0\n" + " orr r2, r2, r0\n" + " lsr r2, r2, #0x1f\n" + " mov r0, #0x1c\n" + " add r1, r4, #0\n" + " bl debug_sub_808F2E0\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._194 @cond_branch\n" + "._193:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._196:\n" + " .align 2, 0\n" + "._195:\n" + " .word gUnknown_Debug_083C31DC\n" + " .word gUnknown_Debug_083C31DC+0xa\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C7C8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._197\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._197 + 4\n" + " ldr r0, ._197 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._198:\n" + " .align 2, 0\n" + "._197:\n" + " .word gUnknown_Debug_083C1CE8\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808C818+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C818() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._199 @cond_branch\n" + " mov r0, #0x0\n" + " b ._202\n" + "._199:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._201 @cond_branch\n" + " ldr r2, ._203\n" + " ldr r0, ._203 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._202\n" + "._204:\n" + " .align 2, 0\n" + "._203:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C1CE8\n" + "._201:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._202:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C85C() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._205\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r0, ._205 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._205 + 8\n" + " ldr r0, ._205 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._206:\n" + " .align 2, 0\n" + "._205:\n" + " .word gUnknown_Debug_083C1E0C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C8B4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._207\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._207 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._207 + 8\n" + " ldr r0, ._207 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._208:\n" + " .align 2, 0\n" + "._207:\n" + " .word gUnknown_Debug_083C1F38\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C90C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._209\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._209 + 4\n" + " mov r0, #0x2\n" + " strb r0, [r1]\n" + " ldr r1, ._209 + 8\n" + " ldr r0, ._209 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._210:\n" + " .align 2, 0\n" + "._209:\n" + " .word gUnknown_Debug_083C206C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C964() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._211\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._211 + 4\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + " ldr r1, ._211 + 8\n" + " ldr r0, ._211 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._212:\n" + " .align 2, 0\n" + "._211:\n" + " .word gUnknown_Debug_083C2190\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808C9BC() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._213\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r1, ._213 + 4\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r1, ._213 + 8\n" + " ldr r0, ._213 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._214:\n" + " .align 2, 0\n" + "._213:\n" + " .word gUnknown_Debug_083C2264\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CA14() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._215\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._215 + 4\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r1, ._215 + 8\n" + " ldr r0, ._215 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._216:\n" + " .align 2, 0\n" + "._215:\n" + " .word gUnknown_Debug_083C2370\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CA6C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._217\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._217 + 4\n" + " mov r0, #0x6\n" + " strb r0, [r1]\n" + " ldr r1, ._217 + 8\n" + " ldr r0, ._217 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._218:\n" + " .align 2, 0\n" + "._217:\n" + " .word gUnknown_Debug_083C248C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CAC4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._219\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._219 + 4\n" + " mov r0, #0x7\n" + " strb r0, [r1]\n" + " ldr r1, ._219 + 8\n" + " ldr r0, ._219 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._220:\n" + " .align 2, 0\n" + "._219:\n" + " .word gUnknown_Debug_083C259C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CB1C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._221\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._221 + 4\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldr r1, ._221 + 8\n" + " ldr r0, ._221 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._222:\n" + " .align 2, 0\n" + "._221:\n" + " .word gUnknown_Debug_083C26C8\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CB74+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CB74() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._226\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808CBC0\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808CC10\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._223 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._224 @cond_branch\n" + "._223:\n" + " mov r0, #0x0\n" + " b ._225\n" + "._227:\n" + " .align 2, 0\n" + "._226:\n" + " .word gDebug_03000700+0xf\n" + "._224:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._225:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CBC0() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._231\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._230 @cond_branch\n" + " ldr r0, ._231 + 4\n" + " lsl r1, r2, #0x3\n" + " add r1, r1, r2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r0\n" + " ldrh r4, [r1]\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._229 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._230\n" + "._232:\n" + " .align 2, 0\n" + "._231:\n" + " .word gMain\n" + " .word gUnknown_Debug_083C2710+0xa\n" + "._229:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + "._230:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CC10() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._235\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._233 @cond_branch\n" + " ldr r0, ._235 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._234:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " neg r2, r0\n" + " orr r2, r2, r0\n" + " lsr r2, r2, #0x1f\n" + " mov r0, #0x1c\n" + " add r1, r4, #0\n" + " bl debug_sub_808F2E0\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._234 @cond_branch\n" + "._233:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._236:\n" + " .align 2, 0\n" + "._235:\n" + " .word gUnknown_Debug_083C2710\n" + " .word gUnknown_Debug_083C2710+0xa\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CC74() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._237\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl InitMenu\n" + " ldr r1, ._237 + 4\n" + " ldr r0, ._237 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._238:\n" + " .align 2, 0\n" + "._237:\n" + " .word gUnknown_Debug_083C1ADC\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CCC4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CCC4() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._239 @cond_branch\n" + " mov r0, #0x0\n" + " b ._242\n" + "._239:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._241 @cond_branch\n" + " ldr r2, ._243\n" + " ldr r0, ._243 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._242\n" + "._244:\n" + " .align 2, 0\n" + "._243:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C1ADC\n" + "._241:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._242:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CD08() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._245\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x8\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " ldr r0, ._245 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._245 + 8\n" + " ldr r0, ._245 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._246:\n" + " .align 2, 0\n" + "._245:\n" + " .word gUnknown_Debug_083C1B7C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CE10+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CD60() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._247\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x4\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " ldr r1, ._247 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._247 + 8\n" + " ldr r0, ._247 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._248:\n" + " .align 2, 0\n" + "._247:\n" + " .word gUnknown_Debug_083C1BF0\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CE10+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CDB8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x3\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._249\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl InitMenu\n" + " ldr r1, ._249 + 4\n" + " mov r0, #0x2\n" + " strb r0, [r1]\n" + " ldr r1, ._249 + 8\n" + " ldr r0, ._249 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._250:\n" + " .align 2, 0\n" + "._249:\n" + " .word gUnknown_Debug_083C1C2C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CE10+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CE10() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._254\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808CE5C\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808CEAC\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._251 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._252 @cond_branch\n" + "._251:\n" + " mov r0, #0x0\n" + " b ._253\n" + "._255:\n" + " .align 2, 0\n" + "._254:\n" + " .word gDebug_03000700+0xf\n" + "._252:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._253:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CE5C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._259\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._258 @cond_branch\n" + " ldr r0, ._259 + 4\n" + " lsl r1, r2, #0x3\n" + " add r1, r1, r2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r0\n" + " ldrh r4, [r1]\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._257 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._258\n" + "._260:\n" + " .align 2, 0\n" + "._259:\n" + " .word gMain\n" + " .word gUnknown_Debug_083C1C34+0x4\n" + "._257:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + "._258:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CEAC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._263\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._261 @cond_branch\n" + " ldr r0, ._263 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._262:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " neg r2, r0\n" + " orr r2, r2, r0\n" + " lsr r2, r2, #0x1f\n" + " mov r0, #0x1c\n" + " add r1, r4, #0\n" + " bl debug_sub_808F2E0\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._262 @cond_branch\n" + "._261:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._264:\n" + " .align 2, 0\n" + "._263:\n" + " .word gUnknown_Debug_083C1C34\n" + " .word gUnknown_Debug_083C1C34+0x4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CF10() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._265\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._265 + 4\n" + " ldr r0, ._265 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._266:\n" + " .align 2, 0\n" + "._265:\n" + " .word gUnknown_Debug_083C1330\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808CF60+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CF60() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._267 @cond_branch\n" + " mov r0, #0x0\n" + " b ._270\n" + "._267:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._269 @cond_branch\n" + " ldr r2, ._271\n" + " ldr r0, ._271 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._270\n" + "._272:\n" + " .align 2, 0\n" + "._271:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C1330\n" + "._269:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._270:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CFA4() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._273\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x8\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " ldr r0, ._273 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._273 + 8\n" + " ldr r0, ._273 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._274:\n" + " .align 2, 0\n" + "._273:\n" + " .word gUnknown_Debug_083C13D8\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808CFFC() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._275\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._275 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._275 + 8\n" + " ldr r0, ._275 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._276:\n" + " .align 2, 0\n" + "._275:\n" + " .word gUnknown_Debug_083C1465\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D054() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._277\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._277 + 4\n" + " mov r0, #0x2\n" + " strb r0, [r1]\n" + " ldr r1, ._277 + 8\n" + " ldr r0, ._277 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._278:\n" + " .align 2, 0\n" + "._277:\n" + " .word gUnknown_Debug_083C1503\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D0AC() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._279\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x4\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " ldr r1, ._279 + 4\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + " ldr r1, ._279 + 8\n" + " ldr r0, ._279 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._280:\n" + " .align 2, 0\n" + "._279:\n" + " .word gUnknown_Debug_083C158A\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D104() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._281\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._281 + 4\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r1, ._281 + 8\n" + " ldr r0, ._281 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._282:\n" + " .align 2, 0\n" + "._281:\n" + " .word gUnknown_Debug_083C1647\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D15C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._283\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._283 + 4\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r1, ._283 + 8\n" + " ldr r0, ._283 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._284:\n" + " .align 2, 0\n" + "._283:\n" + " .word gUnknown_Debug_083C1712\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D1B4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._285\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._285 + 4\n" + " mov r0, #0x6\n" + " strb r0, [r1]\n" + " ldr r1, ._285 + 8\n" + " ldr r0, ._285 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._286:\n" + " .align 2, 0\n" + "._285:\n" + " .word gUnknown_Debug_083C17F8\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D20C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._287\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._287 + 4\n" + " mov r0, #0x7\n" + " strb r0, [r1]\n" + " ldr r1, ._287 + 8\n" + " ldr r0, ._287 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._288:\n" + " .align 2, 0\n" + "._287:\n" + " .word gUnknown_Debug_083C18B8\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D264() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._289\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x5\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl InitMenu\n" + " ldr r1, ._289 + 4\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldr r1, ._289 + 8\n" + " ldr r0, ._289 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._290:\n" + " .align 2, 0\n" + "._289:\n" + " .word gDebug_0x83C1974\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D2BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D2BC() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._294\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808D308\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808D358\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._291 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._292 @cond_branch\n" + "._291:\n" + " mov r0, #0x0\n" + " b ._293\n" + "._295:\n" + " .align 2, 0\n" + "._294:\n" + " .word gDebug_03000700+0xf\n" + "._292:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._293:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D308() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._299\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._298 @cond_branch\n" + " ldr r0, ._299 + 4\n" + " lsl r1, r2, #0x3\n" + " add r1, r1, r2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r0\n" + " ldrh r4, [r1]\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._297 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._298\n" + "._300:\n" + " .align 2, 0\n" + "._299:\n" + " .word gMain\n" + " .word gUnknown_Debug_083C19C6\n" + "._297:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + "._298:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D358() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._303\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._301 @cond_branch\n" + " ldr r0, ._303 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._302:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " neg r2, r0\n" + " orr r2, r2, r0\n" + " lsr r2, r2, #0x1f\n" + " mov r0, #0x1c\n" + " add r1, r4, #0\n" + " bl debug_sub_808F2E0\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._302 @cond_branch\n" + "._301:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._304:\n" + " .align 2, 0\n" + "._303:\n" + " .word gUnknown_Debug_083C19BC\n" + " .word gUnknown_Debug_083C19C6\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D3BC() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._305\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._305 + 4\n" + " ldr r0, ._305 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._306:\n" + " .align 2, 0\n" + "._305:\n" + " .word gUnknown_Debug_083C105C\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D40C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D40C() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._307 @cond_branch\n" + " mov r0, #0x0\n" + " b ._310\n" + "._307:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._309 @cond_branch\n" + " ldr r2, ._311\n" + " ldr r0, ._311 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._310\n" + "._312:\n" + " .align 2, 0\n" + "._311:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C105C\n" + "._309:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._310:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D450() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._313\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r0, ._313 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._313 + 8\n" + " ldr r0, ._313 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._314:\n" + " .align 2, 0\n" + "._313:\n" + " .word gUnknown_Debug_083C10BD\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D500+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D4A8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._315\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._315 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._315 + 8\n" + " ldr r0, ._315 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._316:\n" + " .align 2, 0\n" + "._315:\n" + " .word gUnknown_Debug_083C1149\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D500+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D500() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._320\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808D54C\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808D59C\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._317 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._318 @cond_branch\n" + "._317:\n" + " mov r0, #0x0\n" + " b ._319\n" + "._321:\n" + " .align 2, 0\n" + "._320:\n" + " .word gDebug_03000700+0xf\n" + "._318:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._319:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D54C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._325\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._324 @cond_branch\n" + " ldr r0, ._325 + 4\n" + " lsl r1, r2, #0x3\n" + " add r1, r1, r2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r0\n" + " ldrh r4, [r1]\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._323 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._324\n" + "._326:\n" + " .align 2, 0\n" + "._325:\n" + " .word gMain\n" + " .word gUnknown_Debug_083C1194+0x2\n" + "._323:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + "._324:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D59C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._329\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._327 @cond_branch\n" + " ldr r0, ._329 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._328:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " neg r2, r0\n" + " orr r2, r2, r0\n" + " lsr r2, r2, #0x1f\n" + " mov r0, #0x1c\n" + " add r1, r4, #0\n" + " bl debug_sub_808F2E0\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._328 @cond_branch\n" + "._327:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._330:\n" + " .align 2, 0\n" + "._329:\n" + " .word gUnknown_Debug_083C1194\n" + " .word gUnknown_Debug_083C1194+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D600() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._331\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._331 + 4\n" + " ldr r0, ._331 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._332:\n" + " .align 2, 0\n" + "._331:\n" + " .word gUnknown_Debug_083C11CC\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D650+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D650() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._333 @cond_branch\n" + " mov r0, #0x0\n" + " b ._336\n" + "._333:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._335 @cond_branch\n" + " ldr r2, ._337\n" + " ldr r0, ._337 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._336\n" + "._338:\n" + " .align 2, 0\n" + "._337:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C11CC\n" + "._335:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._336:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D694() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._339\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r0, ._339 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._339 + 8\n" + " ldr r0, ._339 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._340:\n" + " .align 2, 0\n" + "._339:\n" + " .word gUnknown_Debug_083C1212\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D744+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D6EC() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._341\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._341 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._341 + 8\n" + " ldr r0, ._341 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._342:\n" + " .align 2, 0\n" + "._341:\n" + " .word gUnknown_Debug_083C1288\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D744+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D744() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._346\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808D790\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808D7E0\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._343 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._344 @cond_branch\n" + "._343:\n" + " mov r0, #0x0\n" + " b ._345\n" + "._347:\n" + " .align 2, 0\n" + "._346:\n" + " .word gDebug_03000700+0xf\n" + "._344:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._345:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D790() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._351\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._350 @cond_branch\n" + " ldr r0, ._351 + 4\n" + " lsl r1, r2, #0x3\n" + " add r1, r1, r2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r0\n" + " ldrh r4, [r1]\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._349 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._350\n" + "._352:\n" + " .align 2, 0\n" + "._351:\n" + " .word gMain\n" + " .word gUnknown_Debug_083C12D0+0x2\n" + "._349:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + "._350:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D7E0() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._355\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._353 @cond_branch\n" + " ldr r0, ._355 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._354:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " neg r2, r0\n" + " orr r2, r2, r0\n" + " lsr r2, r2, #0x1f\n" + " mov r0, #0x1c\n" + " add r1, r4, #0\n" + " bl debug_sub_808F2E0\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._354 @cond_branch\n" + "._353:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._356:\n" + " .align 2, 0\n" + "._355:\n" + " .word gUnknown_Debug_083C12D0\n" + " .word gUnknown_Debug_083C12D0+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D844() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1c\n" + " mov r3, #0x3\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._357\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1b\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl InitMenu\n" + " ldr r1, ._357 + 4\n" + " ldr r0, ._357 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._358:\n" + " .align 2, 0\n" + "._357:\n" + " .word gUnknown_Debug_083C1A78\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D894+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D894() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r3, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r3, r0\n" + " bne ._359 @cond_branch\n" + " mov r0, #0x0\n" + " b ._362\n" + "._359:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r3, r0\n" + " beq ._361 @cond_branch\n" + " ldr r2, ._363\n" + " ldr r1, ._363 + 4\n" + " lsl r0, r3, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0, #0x4]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._362\n" + "._364:\n" + " .align 2, 0\n" + "._363:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C1A78\n" + "._361:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._362:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D8D8() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._365\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r0, ._365 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._365 + 8\n" + " ldr r0, ._365 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._366:\n" + " .align 2, 0\n" + "._365:\n" + " .word gUnknown_Debug_083C1A9C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808D930+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D930() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._370\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808D97C\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808D9CC\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._367 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._368 @cond_branch\n" + "._367:\n" + " mov r0, #0x0\n" + " b ._369\n" + "._371:\n" + " .align 2, 0\n" + "._370:\n" + " .word gDebug_03000700+0xf\n" + "._368:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._369:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D97C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._375\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._374 @cond_branch\n" + " ldr r0, ._375 + 4\n" + " lsl r1, r2, #0x3\n" + " add r1, r1, r2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r0\n" + " ldrh r4, [r1]\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._373 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._374\n" + "._376:\n" + " .align 2, 0\n" + "._375:\n" + " .word gMain\n" + " .word gUnknown_Debug_083C1AAC+0x2\n" + "._373:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + "._374:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808D9CC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._379\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._377 @cond_branch\n" + " ldr r0, ._379 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._378:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " neg r2, r0\n" + " orr r2, r2, r0\n" + " lsr r2, r2, #0x1f\n" + " mov r0, #0x1c\n" + " add r1, r4, #0\n" + " bl debug_sub_808F2E0\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._378 @cond_branch\n" + "._377:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._380:\n" + " .align 2, 0\n" + "._379:\n" + " .word gUnknown_Debug_083C1AAC\n" + " .word gUnknown_Debug_083C1AAC+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DA30() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x3\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._381\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl InitMenu\n" + " ldr r1, ._381 + 4\n" + " ldr r0, ._381 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._382:\n" + " .align 2, 0\n" + "._381:\n" + " .word gUnknown_Debug_083C103A\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DA80+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DA80() +{ + asm( + " push {r4, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " bl debug_sub_808DAD4\n" + " bl debug_sub_808DABC\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._383 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._384 @cond_branch\n" + "._383:\n" + " mov r0, #0x0\n" + " b ._385\n" + "._384:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._385:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DABC() +{ + asm( + " push {lr}\n" + " ldr r0, ._386\n" + " ldrh r2, [r0]\n" + " mov r0, #0x18\n" + " mov r1, #0x1\n" + " bl debug_sub_808F31C\n" + " pop {r0}\n" + " bx r0\n" + "._387:\n" + " .align 2, 0\n" + "._386:\n" + " .word gScriptResult\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DAD4() +{ + asm( + " push {lr}\n" + " ldr r0, ._390\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._388 @cond_branch\n" + " mov r2, #0x1\n" + " b ._389\n" + "._391:\n" + " .align 2, 0\n" + "._390:\n" + " .word gMain\n" + "._388:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._392 @cond_branch\n" + " ldr r2, ._393\n" + "._389:\n" + " ldr r1, ._393 + 4\n" + " ldrh r0, [r1]\n" + " add r0, r2, r0\n" + " strh r0, [r1]\n" + "._392:\n" + " pop {r0}\n" + " bx r0\n" + "._394:\n" + " .align 2, 0\n" + "._393:\n" + " .word 0xffff\n" + " .word gScriptResult\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DB0C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._395\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._395 + 4\n" + " ldr r0, ._395 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._396:\n" + " .align 2, 0\n" + "._395:\n" + " .word gUnknown_Debug_083C3D08\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DB5C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DB5C() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._397 @cond_branch\n" + " mov r0, #0x0\n" + " b ._400\n" + "._397:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._399 @cond_branch\n" + " ldr r2, ._401\n" + " ldr r0, ._401 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._400\n" + "._402:\n" + " .align 2, 0\n" + "._401:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C3D08\n" + "._399:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._400:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DBA0() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._403\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x8\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " ldr r0, ._403 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._403 + 8\n" + " ldr r0, ._403 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._404:\n" + " .align 2, 0\n" + "._403:\n" + " .word gUnknown_Debug_083C432C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DBF8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._405\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._405 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._405 + 8\n" + " ldr r0, ._405 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._406:\n" + " .align 2, 0\n" + "._405:\n" + " .word gUnknown_Debug_083C436C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DC50() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._407\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._407 + 4\n" + " mov r0, #0x2\n" + " strb r0, [r1]\n" + " ldr r1, ._407 + 8\n" + " ldr r0, ._407 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._408:\n" + " .align 2, 0\n" + "._407:\n" + " .word gUnknown_Debug_083C43B4\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DCA8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._409\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._409 + 4\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + " ldr r1, ._409 + 8\n" + " ldr r0, ._409 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._410:\n" + " .align 2, 0\n" + "._409:\n" + " .word gUnknown_Debug_083C43FC\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DD00() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._411\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._411 + 4\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r1, ._411 + 8\n" + " ldr r0, ._411 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._412:\n" + " .align 2, 0\n" + "._411:\n" + " .word gUnknown_Debug_083C4444\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DD58() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._413\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._413 + 4\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r1, ._413 + 8\n" + " ldr r0, ._413 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._414:\n" + " .align 2, 0\n" + "._413:\n" + " .word gUnknown_Debug_083C448C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DDB0() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._415\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r1, ._415 + 4\n" + " mov r0, #0x6\n" + " strb r0, [r1]\n" + " ldr r1, ._415 + 8\n" + " ldr r0, ._415 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._416:\n" + " .align 2, 0\n" + "._415:\n" + " .word gUnknown_Debug_83C44C4\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DE08() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._417\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._417 + 4\n" + " mov r0, #0x7\n" + " strb r0, [r1]\n" + " ldr r1, ._417 + 8\n" + " ldr r0, ._417 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._418:\n" + " .align 2, 0\n" + "._417:\n" + " .word gUnknown_Debug_83C44EC\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DE60() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._419\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._419 + 4\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldr r1, ._419 + 8\n" + " ldr r0, ._419 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._420:\n" + " .align 2, 0\n" + "._419:\n" + " .word gUnknown_Debug_083C4534\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808DEB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DEB8() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._424\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808DF64\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808DF04\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._421 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._422 @cond_branch\n" + "._421:\n" + " mov r0, #0x0\n" + " b ._423\n" + "._425:\n" + " .align 2, 0\n" + "._424:\n" + " .word gDebug_03000700+0xf\n" + "._422:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._423:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DF04() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._428\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._426 @cond_branch\n" + " ldr r0, ._428 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._427:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl VarGet\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x10\n" + " lsr r2, r2, #0x10\n" + " mov r0, #0x18\n" + " add r1, r4, #0\n" + " bl debug_sub_808F31C\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._427 @cond_branch\n" + "._426:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._429:\n" + " .align 2, 0\n" + "._428:\n" + " .word gUnknown_Debug_083C457C\n" + " .word gUnknown_Debug_083C457C+0xa\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DF64() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._432\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._430 @cond_branch\n" + " mov r5, #0x1\n" + " b ._431\n" + "._433:\n" + " .align 2, 0\n" + "._432:\n" + " .word gMain\n" + "._430:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._434 @cond_branch\n" + " ldr r5, ._435\n" + "._431:\n" + " ldr r1, ._435 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " ldrh r4, [r0]\n" + " add r0, r4, #0\n" + " bl VarGet\n" + " add r1, r0, #0\n" + " add r1, r5, r1\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " bl VarSet\n" + "._434:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._436:\n" + " .align 2, 0\n" + "._435:\n" + " .word 0xffff\n" + " .word gUnknown_Debug_083C457C+0xa\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808DFC0() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._437\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r1, ._437 + 4\n" + " ldr r0, ._437 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._438:\n" + " .align 2, 0\n" + "._437:\n" + " .word gUnknown_Debug_083C377C\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E010+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E010() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._439 @cond_branch\n" + " mov r0, #0x0\n" + " b ._442\n" + "._439:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._441 @cond_branch\n" + " ldr r2, ._443\n" + " ldr r0, ._443 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._442\n" + "._444:\n" + " .align 2, 0\n" + "._443:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C377C\n" + "._441:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._442:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E054() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._445\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r0, ._445 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._445 + 8\n" + " ldr r0, ._445 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._446:\n" + " .align 2, 0\n" + "._445:\n" + " .word gUnknown_Debug_083C3AA0\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E264+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E0AC() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._447\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x5\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl InitMenu\n" + " ldr r1, ._447 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._447 + 8\n" + " ldr r0, ._447 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._448:\n" + " .align 2, 0\n" + "._447:\n" + " .word gUnknown_Debug_83C3AE0\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E264+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E104() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._449\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._449 + 4\n" + " mov r0, #0x2\n" + " strb r0, [r1]\n" + " ldr r1, ._449 + 8\n" + " ldr r0, ._449 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._450:\n" + " .align 2, 0\n" + "._449:\n" + " .word gUnknown_Debug_83C3B28\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E264+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E15C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._451\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._451 + 4\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + " ldr r1, ._451 + 8\n" + " ldr r0, ._451 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._452:\n" + " .align 2, 0\n" + "._451:\n" + " .word gUnknown_Debug_83C3B70\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E264+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E1B4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._453\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._453 + 4\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r1, ._453 + 8\n" + " ldr r0, ._453 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._454:\n" + " .align 2, 0\n" + "._453:\n" + " .word gUnknown_Debug_83C3BB8\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E264+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E20C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._455\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r1, ._455 + 4\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r1, ._455 + 8\n" + " ldr r0, ._455 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._456:\n" + " .align 2, 0\n" + "._455:\n" + " .word gUnknown_Debug_83C3C00\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E264+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E264() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._460\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808E310\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808E2B0\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._457 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._458 @cond_branch\n" + "._457:\n" + " mov r0, #0x0\n" + " b ._459\n" + "._461:\n" + " .align 2, 0\n" + "._460:\n" + " .word gDebug_03000700+0xf\n" + "._458:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._459:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E2B0() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._464\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._462 @cond_branch\n" + " ldr r0, ._464 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._463:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl VarGet\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x10\n" + " lsr r2, r2, #0x10\n" + " mov r0, #0x18\n" + " add r1, r4, #0\n" + " bl debug_sub_808F31C\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._463 @cond_branch\n" + "._462:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._465:\n" + " .align 2, 0\n" + "._464:\n" + " .word gUnknown_Debug_083C3C48\n" + " .word gUnknown_Debug_083C3C48+0x6\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E310() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._468\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._466 @cond_branch\n" + " mov r5, #0x1\n" + " b ._467\n" + "._469:\n" + " .align 2, 0\n" + "._468:\n" + " .word gMain\n" + "._466:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._470 @cond_branch\n" + " ldr r5, ._471\n" + "._467:\n" + " ldr r1, ._471 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " ldrh r4, [r0]\n" + " add r0, r4, #0\n" + " bl VarGet\n" + " add r1, r0, #0\n" + " add r1, r5, r1\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " bl VarSet\n" + "._470:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._472:\n" + " .align 2, 0\n" + "._471:\n" + " .word 0xffff\n" + " .word gUnknown_Debug_083C3C48+0x6\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E36C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._473\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x5\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl InitMenu\n" + " ldr r1, ._473 + 4\n" + " ldr r0, ._473 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._474:\n" + " .align 2, 0\n" + "._473:\n" + " .word gUnknown_Debug_083C32AC\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E3BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E3BC() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._475 @cond_branch\n" + " mov r0, #0x0\n" + " b ._478\n" + "._475:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._477 @cond_branch\n" + " ldr r2, ._479\n" + " ldr r0, ._479 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._478\n" + "._480:\n" + " .align 2, 0\n" + "._479:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C32AC\n" + "._477:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._478:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E400() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._481\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl InitMenu\n" + " ldr r0, ._481 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._481 + 8\n" + " ldr r0, ._481 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._482:\n" + " .align 2, 0\n" + "._481:\n" + " .word gUnknown_Debug_083C347C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E5B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E458() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._483\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._483 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._483 + 8\n" + " ldr r0, ._483 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._484:\n" + " .align 2, 0\n" + "._483:\n" + " .word gUnknown_Debug_083C3494\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E5B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E4B0() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._485\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x6\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x6\n" + " bl InitMenu\n" + " ldr r1, ._485 + 4\n" + " mov r0, #0x2\n" + " strb r0, [r1]\n" + " ldr r1, ._485 + 8\n" + " ldr r0, ._485 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._486:\n" + " .align 2, 0\n" + "._485:\n" + " .word gUnknown_Debug_083C34A4\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E5B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E508() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._487\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r1, ._487 + 4\n" + " mov r0, #0x3\n" + " strb r0, [r1]\n" + " ldr r1, ._487 + 8\n" + " ldr r0, ._487 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._488:\n" + " .align 2, 0\n" + "._487:\n" + " .word gUnknown_Debug_083C34D4\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E5B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E560() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._489\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x5\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x5\n" + " bl InitMenu\n" + " ldr r1, ._489 + 4\n" + " mov r0, #0x4\n" + " strb r0, [r1]\n" + " ldr r1, ._489 + 8\n" + " ldr r0, ._489 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._490:\n" + " .align 2, 0\n" + "._489:\n" + " .word gUnknown_Debug_083C351C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E5B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E5B8() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._494\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808E604\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808E660\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._491 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._492 @cond_branch\n" + "._491:\n" + " mov r0, #0x0\n" + " b ._493\n" + "._495:\n" + " .align 2, 0\n" + "._494:\n" + " .word gDebug_03000700+0xf\n" + "._492:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._493:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E604() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._498\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._496 @cond_branch\n" + " mov r5, #0x1\n" + " b ._497\n" + "._499:\n" + " .align 2, 0\n" + "._498:\n" + " .word gMain\n" + "._496:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._500 @cond_branch\n" + " ldr r5, ._501\n" + "._497:\n" + " ldr r1, ._501 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " ldrh r4, [r0]\n" + " add r0, r4, #0\n" + " bl VarGet\n" + " add r1, r0, #0\n" + " add r1, r5, r1\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " bl VarSet\n" + "._500:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._502:\n" + " .align 2, 0\n" + "._501:\n" + " .word 0xffff\n" + " .word gUnknown_Debug_083C3544+0x6\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E660() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._505\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._503 @cond_branch\n" + " ldr r0, ._505 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._504:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl VarGet\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x10\n" + " lsr r2, r2, #0x10\n" + " mov r0, #0x18\n" + " add r1, r4, #0\n" + " bl debug_sub_808F31C\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._504 @cond_branch\n" + "._503:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._506:\n" + " .align 2, 0\n" + "._505:\n" + " .word gUnknown_Debug_083C3544\n" + " .word gUnknown_Debug_083C3544+0x6\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E6C0() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._507\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._507 + 4\n" + " ldr r0, ._507 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._508:\n" + " .align 2, 0\n" + "._507:\n" + " .word gUnknown_Debug_083C4644\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E710+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E710() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._509 @cond_branch\n" + " mov r0, #0x0\n" + " b ._512\n" + "._509:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._511 @cond_branch\n" + " ldr r2, ._513\n" + " ldr r0, ._513 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._512\n" + "._514:\n" + " .align 2, 0\n" + "._513:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C4644\n" + "._511:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._512:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E754() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._515\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r0, ._515 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._515 + 8\n" + " ldr r0, ._515 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._516:\n" + " .align 2, 0\n" + "._515:\n" + " .word gUnknown_Debug_083C470C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E804+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E7AC() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._517\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._517 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._517 + 8\n" + " ldr r0, ._517 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._518:\n" + " .align 2, 0\n" + "._517:\n" + " .word gUnknown_Debug_083C4754C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E804+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E804() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._522\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808E850\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808E8AC\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._519 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._520 @cond_branch\n" + "._519:\n" + " mov r0, #0x0\n" + " b ._521\n" + "._523:\n" + " .align 2, 0\n" + "._522:\n" + " .word gDebug_03000700+0xf\n" + "._520:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._521:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E850() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._526\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._524 @cond_branch\n" + " mov r5, #0x1\n" + " b ._525\n" + "._527:\n" + " .align 2, 0\n" + "._526:\n" + " .word gMain\n" + "._524:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._528 @cond_branch\n" + " ldr r5, ._529\n" + "._525:\n" + " ldr r1, ._529 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " ldrh r4, [r0]\n" + " add r0, r4, #0\n" + " bl VarGet\n" + " add r1, r0, #0\n" + " add r1, r5, r1\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " bl VarSet\n" + "._528:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._530:\n" + " .align 2, 0\n" + "._529:\n" + " .word 0xffff\n" + " .word gUnknown_Debug_083C478C+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E8AC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._533\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._531 @cond_branch\n" + " ldr r0, ._533 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._532:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl VarGet\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x10\n" + " lsr r2, r2, #0x10\n" + " mov r0, #0x18\n" + " add r1, r4, #0\n" + " bl debug_sub_808F31C\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._532 @cond_branch\n" + "._531:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._534:\n" + " .align 2, 0\n" + "._533:\n" + " .word gUnknown_Debug_083C478C\n" + " .word gUnknown_Debug_083C478C+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E90C() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._535\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x2\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x17\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x2\n" + " bl InitMenu\n" + " ldr r1, ._535 + 4\n" + " ldr r0, ._535 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._536:\n" + " .align 2, 0\n" + "._535:\n" + " .word gUnknown_Debug_083C35C4\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808E95C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E95C() +{ + asm( + " push {lr}\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bne ._537 @cond_branch\n" + " mov r0, #0x0\n" + " b ._540\n" + "._537:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._539 @cond_branch\n" + " ldr r2, ._541\n" + " ldr r0, ._541 + 4\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " str r0, [r2]\n" + " mov r0, #0x0\n" + " b ._540\n" + "._542:\n" + " .align 2, 0\n" + "._541:\n" + " .word gCallback_03004AE8\n" + " .word gUnknown_Debug_083C35C4\n" + "._539:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._540:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E9A0() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._543\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl PrintMenuItems\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " ldr r0, ._543 + 4\n" + " strb r4, [r0]\n" + " ldr r1, ._543 + 8\n" + " ldr r0, ._543 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._544:\n" + " .align 2, 0\n" + "._543:\n" + " .word gUnknown_Debug_083C369C\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808EA50+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808E9F8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._545\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x1c\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x7\n" + " bl InitMenu\n" + " ldr r1, ._545 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._545 + 8\n" + " ldr r0, ._545 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._546:\n" + " .align 2, 0\n" + "._545:\n" + " .word gUnknown_Debug_083C36E4\n" + " .word gDebug_03000700+0xf\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808EA50+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EA50() +{ + asm( + " push {r4, r5, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " add r1, r0, #0\n" + " ldr r5, ._550\n" + " ldrb r0, [r5]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " bl debug_sub_808EAFC\n" + " ldrb r0, [r5]\n" + " bl debug_sub_808EA9C\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._547 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._548 @cond_branch\n" + "._547:\n" + " mov r0, #0x0\n" + " b ._549\n" + "._551:\n" + " .align 2, 0\n" + "._550:\n" + " .word gDebug_03000700+0xf\n" + "._548:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._549:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EA9C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " mov r5, #0x0\n" + " ldr r0, ._554\n" + " add r0, r1, r0\n" + " ldrb r2, [r0]\n" + " cmp r5, r2\n" + " bcs ._552 @cond_branch\n" + " ldr r0, ._554 + 4\n" + " mov r8, r0\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r7, r0, #0x1\n" + " add r6, r2, #0\n" + "._553:\n" + " lsl r0, r5, #0x1\n" + " add r4, r0, #1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " add r0, r0, r7\n" + " add r0, r0, r8\n" + " ldrh r0, [r0]\n" + " bl VarGet\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x10\n" + " lsr r2, r2, #0x10\n" + " mov r0, #0x18\n" + " add r1, r4, #0\n" + " bl debug_sub_808F31C\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, r6\n" + " bcc ._553 @cond_branch\n" + "._552:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._555:\n" + " .align 2, 0\n" + "._554:\n" + " .word gUnknown_Debug_083C371C\n" + " .word gUnknown_Debug_083C371C+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EAFC() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " ldr r0, ._558\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._556 @cond_branch\n" + " mov r5, #0x1\n" + " b ._557\n" + "._559:\n" + " .align 2, 0\n" + "._558:\n" + " .word gMain\n" + "._556:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._560 @cond_branch\n" + " ldr r5, ._561\n" + "._557:\n" + " ldr r1, ._561 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r1\n" + " ldrh r4, [r0]\n" + " add r0, r4, #0\n" + " bl VarGet\n" + " add r1, r0, #0\n" + " add r1, r5, r1\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r4, #0\n" + " bl VarSet\n" + "._560:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._562:\n" + " .align 2, 0\n" + "._561:\n" + " .word 0xffff\n" + " .word gUnknown_Debug_083C371C+0x2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EB58() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xc\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._563\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r3, ._563 + 4\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0x8\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xb\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " ldr r1, ._563 + 8\n" + " ldr r0, ._563 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._564:\n" + " .align 2, 0\n" + "._563:\n" + " .word gUnknown_Debug_083C47B2\n" + " .word gUnknown_Debug_083C47F0\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808EC10+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EBB4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xd\n" + " mov r3, #0xd\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._565\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r3, ._565 + 4\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0x5\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xc\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x5\n" + " bl InitMenu\n" + " ldr r1, ._565 + 8\n" + " ldr r0, ._565 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._566:\n" + " .align 2, 0\n" + "._565:\n" + " .word gUnknown_Debug_083C4830\n" + " .word gUnknown_Debug_083C4888\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808EC5C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EC10() +{ + asm( + " push {r4, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._568 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._568 @cond_branch\n" + " ldr r1, ._570\n" + " lsl r0, r2, #0x18\n" + " asr r0, r0, #0x18\n" + " ldr r2, ._570 + 4\n" + " add r1, r1, r2\n" + " strh r0, [r1]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._569\n" + "._571:\n" + " .align 2, 0\n" + "._570:\n" + " .word gSaveBlock1\n" + " .word 0x13c8\n" + "._568:\n" + " mov r0, #0x0\n" + "._569:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EC5C() +{ + asm( + " push {r4, lr}\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._573 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._573 @cond_branch\n" + " ldr r0, ._575\n" + " lsl r1, r1, #0x18\n" + " asr r1, r1, #0x8\n" + " lsr r1, r1, #0x10\n" + " bl VarSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._574\n" + "._576:\n" + " .align 2, 0\n" + "._575:\n" + " .word 0x40a7\n" + "._573:\n" + " mov r0, #0x0\n" + "._574:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808ECA4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._577\n" + " ldr r0, ._577 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x4\n" + " pop {r1}\n" + " bx r1\n" + "._578:\n" + " .align 2, 0\n" + "._577:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_808ECD0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808ECD0() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._579 @cond_branch\n" + " mov r0, #0x0\n" + " b ._580\n" + "._579:\n" + " bl CloseMenu\n" + " mov r0, #0x2\n" + " bl debug_sub_808F168\n" + " ldr r0, ._581\n" + " bl SetMainCallback2\n" + " ldr r1, ._581 + 4\n" + " ldr r0, ._581 + 8\n" + " str r0, [r1, #0x8]\n" + " mov r0, #0x1\n" + "._580:\n" + " pop {r1}\n" + " bx r1\n" + "._582:\n" + " .align 2, 0\n" + "._581:\n" + " .word CB2_ContestPainting+1\n" + " .word gMain\n" + " .word debug_sub_808B868+1\n" + "\n" + ); +} + +__attribute__((naked)) +void TomomichiDebugMenu_Config() +{ + asm( + " mov r0, #0x0\n" + " bx lr\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808ED0C() +{ + asm( + " push {lr}\n" + " ldr r2, ._590\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._584 @cond_branch\n" + " ldr r1, ._590 + 4\n" + " ldrh r0, [r1]\n" + " cmp r0, #0x1\n" + " beq ._584 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strh r0, [r1]\n" + "._584:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._586 @cond_branch\n" + " ldr r3, ._590 + 4\n" + " ldrh r1, [r3]\n" + " ldr r0, ._590 + 8\n" + " cmp r1, r0\n" + " beq ._586 @cond_branch\n" + " add r0, r1, #1\n" + " strh r0, [r3]\n" + "._586:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._587 @cond_branch\n" + " ldr r1, ._590 + 4\n" + " ldrh r0, [r1]\n" + " cmp r0, #0xa\n" + " bls ._588 @cond_branch\n" + " sub r0, r0, #0xa\n" + " b ._589\n" + "._591:\n" + " .align 2, 0\n" + "._590:\n" + " .word gMain\n" + " .word gDebug_03000700\n" + " .word 0x19b\n" + "._588:\n" + " mov r0, #0x1\n" + "._589:\n" + " strh r0, [r1]\n" + "._587:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._592 @cond_branch\n" + " ldr r2, ._595\n" + " ldrh r1, [r2]\n" + " ldr r0, ._595 + 4\n" + " cmp r1, r0\n" + " bhi ._593 @cond_branch\n" + " add r0, r1, #0\n" + " add r0, r0, #0xa\n" + " b ._594\n" + "._596:\n" + " .align 2, 0\n" + "._595:\n" + " .word gDebug_03000700\n" + " .word 0x191\n" + "._593:\n" + " ldr r1, ._597\n" + " add r0, r1, #0\n" + "._594:\n" + " strh r0, [r2]\n" + "._592:\n" + " pop {r0}\n" + " bx r0\n" + "._598:\n" + " .align 2, 0\n" + "._597:\n" + " .word 0x19b\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808ED9C() +{ + asm( + " push {lr}\n" + " ldr r2, ._606\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._600 @cond_branch\n" + " ldr r1, ._606 + 4\n" + " ldr r0, [r1]\n" + " cmp r0, #0\n" + " beq ._600 @cond_branch\n" + " sub r0, r0, #0x1\n" + " str r0, [r1]\n" + "._600:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._602 @cond_branch\n" + " ldr r3, ._606 + 4\n" + " ldr r1, [r3]\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._602 @cond_branch\n" + " add r0, r1, #1\n" + " str r0, [r3]\n" + "._602:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._603 @cond_branch\n" + " ldr r1, ._606 + 4\n" + " ldr r0, [r1]\n" + " cmp r0, #0xf\n" + " bls ._604 @cond_branch\n" + " sub r0, r0, #0x10\n" + " b ._605\n" + "._607:\n" + " .align 2, 0\n" + "._606:\n" + " .word gMain\n" + " .word gDebug_03000700+0x8\n" + "._604:\n" + " mov r0, #0x0\n" + "._605:\n" + " str r0, [r1]\n" + "._603:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._608 @cond_branch\n" + " ldr r3, ._611\n" + " ldr r1, [r3]\n" + " mov r0, #0x11\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " bhi ._609 @cond_branch\n" + " add r0, r1, #0\n" + " add r0, r0, #0x10\n" + " b ._610\n" + "._612:\n" + " .align 2, 0\n" + "._611:\n" + " .word gDebug_03000700+0x8\n" + "._609:\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + "._610:\n" + " str r0, [r3]\n" + "._608:\n" + " ldrh r2, [r2, #0x2e]\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x2\n" + " add r0, r1, #0\n" + " and r0, r0, r2\n" + " cmp r0, r1\n" + " bne ._613 @cond_branch\n" + " ldr r1, ._614\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " str r0, [r1]\n" + "._613:\n" + " pop {r0}\n" + " bx r0\n" + "._615:\n" + " .align 2, 0\n" + "._614:\n" + " .word gDebug_03000700+0x8\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EE3C() +{ + asm( + " push {lr}\n" + " ldr r2, ._622\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._617 @cond_branch\n" + " ldr r1, ._622 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x1\n" + " beq ._617 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._617:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._619 @cond_branch\n" + " ldr r1, ._622 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x5\n" + " beq ._619 @cond_branch\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._619:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._620 @cond_branch\n" + " ldr r1, ._622 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + "._620:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._621 @cond_branch\n" + " ldr r1, ._622 + 4\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + "._621:\n" + " pop {r0}\n" + " bx r0\n" + "._623:\n" + " .align 2, 0\n" + "._622:\n" + " .word gMain\n" + " .word gDebug_03000700+0xc\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EE9C() +{ + asm( + " push {lr}\n" + " ldr r2, ._631\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._625 @cond_branch\n" + " ldr r1, ._631 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x1\n" + " beq ._625 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._625:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._627 @cond_branch\n" + " ldr r1, ._631 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0xf\n" + " beq ._627 @cond_branch\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._627:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._628 @cond_branch\n" + " ldr r1, ._631 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0xa\n" + " bls ._629 @cond_branch\n" + " sub r0, r0, #0xa\n" + " b ._630\n" + "._632:\n" + " .align 2, 0\n" + "._631:\n" + " .word gMain\n" + " .word gDebug_03000700+0xd\n" + "._629:\n" + " mov r0, #0x0\n" + "._630:\n" + " strb r0, [r1]\n" + "._628:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._633 @cond_branch\n" + " ldr r1, ._636\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x5\n" + " bhi ._634 @cond_branch\n" + " add r0, r0, #0xa\n" + " b ._635\n" + "._637:\n" + " .align 2, 0\n" + "._636:\n" + " .word gDebug_03000700+0xd\n" + "._634:\n" + " mov r0, #0xf\n" + "._635:\n" + " strb r0, [r1]\n" + "._633:\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EF14() +{ + asm( + " push {lr}\n" + " ldr r2, ._645\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._639 @cond_branch\n" + " ldr r1, ._645 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x1\n" + " beq ._639 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._639:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._641 @cond_branch\n" + " ldr r1, ._645 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0xf\n" + " beq ._641 @cond_branch\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._641:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._642 @cond_branch\n" + " ldr r1, ._645 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0xa\n" + " bls ._643 @cond_branch\n" + " sub r0, r0, #0xa\n" + " b ._644\n" + "._646:\n" + " .align 2, 0\n" + "._645:\n" + " .word gMain\n" + " .word gDebug_03000700+0xe\n" + "._643:\n" + " mov r0, #0x0\n" + "._644:\n" + " strb r0, [r1]\n" + "._642:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._647 @cond_branch\n" + " ldr r1, ._650\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x5\n" + " bhi ._648 @cond_branch\n" + " add r0, r0, #0xa\n" + " b ._649\n" + "._651:\n" + " .align 2, 0\n" + "._650:\n" + " .word gDebug_03000700+0xe\n" + "._648:\n" + " mov r0, #0xf\n" + "._649:\n" + " strb r0, [r1]\n" + "._647:\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808EF8C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " cmp r6, #0x2\n" + " bgt ._653 @cond_branch\n" + " cmp r6, #0\n" + " blt ._653 @cond_branch\n" + " mov r3, #0x0\n" + " ldr r0, ._656\n" + " mov r8, r0\n" + " ldr r4, ._656 + 4\n" + " mov r7, #0x7\n" + " mov r5, #0xf\n" + "._658:\n" + " sub r0, r7, r3\n" + " lsl r0, r0, #0x2\n" + " mov r1, r8\n" + " ldr r2, [r1]\n" + " LSR r2, r0\n" + " and r2, r2, r5\n" + " cmp r2, #0x9\n" + " bhi ._654 @cond_branch\n" + " add r1, r3, r4\n" + " add r0, r2, #0\n" + " add r0, r0, #0xa1\n" + " b ._655\n" + "._657:\n" + " .align 2, 0\n" + "._656:\n" + " .word gDebug_03000700+0x8\n" + " .word gDebug_03000700+0x10\n" + "._654:\n" + " add r1, r3, r4\n" + " add r0, r2, #0\n" + " sub r0, r0, #0x4f\n" + "._655:\n" + " strb r0, [r1]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " cmp r3, #0x7\n" + " bls ._658 @cond_branch\n" + " ldr r0, ._666\n" + " mov r1, #0xff\n" + " strb r1, [r0, #0x8]\n" + " mov r1, #0xc\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + "._653:\n" + " mov r3, #0x0\n" + " ldr r7, ._666\n" + " ldr r5, ._666 + 4\n" + " ldr r2, ._666 + 8\n" + " mov r8, r2\n" + " add r4, r7, #0\n" + " mov r2, #0x0\n" + "._659:\n" + " add r1, r3, #1\n" + " add r0, r1, r4\n" + " strb r2, [r0]\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " cmp r3, #0x9\n" + " bls ._659 @cond_branch\n" + " mov r3, #0x0\n" + " ldrh r2, [r5]\n" + " mov r0, #0xb\n" + " add r1, r2, #0\n" + " mul r1, r1, r0\n" + " mov r2, r8\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._661 @cond_branch\n" + " ldr r0, ._666\n" + " mov ip, r0\n" + " mov r5, r8\n" + " add r4, r1, #0\n" + "._662:\n" + " add r1, r3, #1\n" + " mov r0, ip\n" + " add r2, r1, r0\n" + " add r0, r3, r4\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " strb r0, [r2]\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " add r0, r3, r4\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._661 @cond_branch\n" + " cmp r3, #0x9\n" + " bls ._662 @cond_branch\n" + "._661:\n" + " mov r0, #0xb1\n" + " strb r0, [r7]\n" + " mov r0, #0xb2\n" + " strb r0, [r7, #0xb]\n" + " mov r0, #0xff\n" + " strb r0, [r7, #0xc]\n" + " cmp r6, #0x2\n" + " bgt ._664 @cond_branch\n" + " cmp r6, #0\n" + " blt ._664 @cond_branch\n" + " add r0, r7, #0\n" + " mov r1, #0x8\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " b ._665\n" + "._667:\n" + " .align 2, 0\n" + "._666:\n" + " .word gDebug_03000700+0x10\n" + " .word gDebug_03000700\n" + " .word gSpeciesNames\n" + "._664:\n" + " ldr r0, ._672\n" + " mov r1, #0xc\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + "._665:\n" + " ldr r5, ._672\n" + " mov r0, #0xff\n" + " strb r0, [r5, #0x3]\n" + " ldr r4, ._672 + 4\n" + " ldrh r0, [r4]\n" + " mov r1, #0x64\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5]\n" + " ldrh r0, [r4]\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0xa\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x1]\n" + " ldrh r0, [r4]\n" + " mov r1, #0xa\n" + " bl __umodsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x2]\n" + " add r0, r5, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " cmp r6, #0x1\n" + " beq ._668 @cond_branch\n" + " cmp r6, #0x1\n" + " bgt ._669 @cond_branch\n" + " cmp r6, #0\n" + " beq ._670 @cond_branch\n" + " b ._679\n" + "._673:\n" + " .align 2, 0\n" + "._672:\n" + " .word gDebug_03000700+0x10\n" + " .word gDebug_03000700\n" + "._669:\n" + " cmp r6, #0x2\n" + " beq ._674 @cond_branch\n" + " b ._679\n" + "._670:\n" + " ldr r4, ._677\n" + " b ._676\n" + "._678:\n" + " .align 2, 0\n" + "._677:\n" + " .word gDebug_03000700+0xc\n" + "._668:\n" + " ldr r4, ._680\n" + "._676:\n" + " ldrb r0, [r4]\n" + " mov r1, #0x64\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5]\n" + " ldrb r0, [r4]\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0xa\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x1]\n" + " ldrb r0, [r4]\n" + " mov r1, #0xa\n" + " bl __umodsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x2]\n" + " add r0, r5, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " b ._679\n" + "._681:\n" + " .align 2, 0\n" + "._680:\n" + " .word gDebug_03000700+0xd\n" + "._674:\n" + " ldr r4, ._682\n" + " ldrb r0, [r4]\n" + " mov r1, #0x64\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5]\n" + " ldrb r0, [r4]\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0xa\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x1]\n" + " ldrb r0, [r4]\n" + " mov r1, #0xa\n" + " bl __umodsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x2]\n" + " add r0, r5, #0\n" + " mov r1, #0xc\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + "._679:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._683:\n" + " .align 2, 0\n" + "._682:\n" + " .word gDebug_03000700+0xe\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F168() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " ldr r4, ._686\n" + " ldr r0, ._686 + 4\n" + " ldrh r0, [r0]\n" + " strh r0, [r4, #0x8]\n" + " ldr r0, ._686 + 8\n" + " ldr r0, [r0]\n" + " str r0, [r4, #0x4]\n" + " ldr r0, ._686 + 12\n" + " ldr r0, [r0]\n" + " str r0, [r4]\n" + " cmp r1, #0x5\n" + " bls ._684 @cond_branch\n" + " b ._707\n" + "._684:\n" + " lsl r0, r1, #0x2\n" + " ldr r1, ._686 + 16\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._687:\n" + " .align 2, 0\n" + "._686:\n" + " .word +0x2015de0\n" + " .word gDebug_03000700\n" + " .word gDebug_03000700+0x4\n" + " .word gDebug_03000700+0x8\n" + " .word ._688\n" + "._688:\n" + " .word ._689\n" + " .word ._690\n" + " .word ._691\n" + " .word ._692\n" + " .word ._693\n" + " .word ._694\n" + "._689:\n" + " ldr r0, ._696\n" + " ldr r2, ._696 + 4\n" + " add r1, r0, r2\n" + " mov r2, #0x0\n" + " strb r2, [r1]\n" + " ldr r1, ._696 + 8\n" + " add r0, r0, r1\n" + " strb r2, [r0]\n" + " ldr r0, ._696 + 12\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r4, #0xa]\n" + " add r0, r4, #0\n" + " add r0, r0, #0x16\n" + " ldr r1, ._696 + 16\n" + " bl StringCopy\n" + " b ._704\n" + "._697:\n" + " .align 2, 0\n" + "._696:\n" + " .word +0x2000000\n" + " .word 0x15ddf\n" + " .word 0x15dde\n" + " .word gDebug_03000700+0xc\n" + " .word gUnknown_Debug_083C48BB\n" + "._690:\n" + " ldr r1, ._699\n" + " ldr r0, ._699 + 4\n" + " add r2, r1, r0\n" + " mov r0, #0x0\n" + " strb r0, [r2]\n" + " ldr r2, ._699 + 8\n" + " add r1, r1, r2\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldr r0, ._699 + 12\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x1\n" + " b ._698\n" + "._700:\n" + " .align 2, 0\n" + "._699:\n" + " .word +0x2000000\n" + " .word 0x15ddf\n" + " .word 0x15dde\n" + " .word gDebug_03000700+0xd\n" + "._691:\n" + " ldr r1, ._702\n" + " ldr r0, ._702 + 4\n" + " add r2, r1, r0\n" + " mov r0, #0x1\n" + " strb r0, [r2]\n" + " ldr r2, ._702 + 8\n" + " add r1, r1, r2\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldr r0, ._702 + 12\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r4, #0xa]\n" + " b ._707\n" + "._703:\n" + " .align 2, 0\n" + "._702:\n" + " .word +0x2000000\n" + " .word 0x15ddf\n" + " .word 0x15dde\n" + " .word gDebug_03000700+0xe\n" + "._692:\n" + " ldr r1, ._705\n" + " ldr r2, ._705 + 4\n" + " add r0, r1, r2\n" + " mov r2, #0x0\n" + " strb r2, [r0]\n" + " ldr r0, ._705 + 8\n" + " add r1, r1, r0\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " strb r2, [r4, #0xa]\n" + " b ._704\n" + "._706:\n" + " .align 2, 0\n" + "._705:\n" + " .word +0x2000000\n" + " .word 0x15ddf\n" + " .word 0x15dde\n" + "._693:\n" + " ldr r1, ._708\n" + " ldr r0, ._708 + 4\n" + " add r2, r1, r0\n" + " mov r0, #0x0\n" + " strb r0, [r2]\n" + " ldr r2, ._708 + 8\n" + " add r1, r1, r2\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " mov r0, #0x3\n" + "._698:\n" + " strb r0, [r4, #0xa]\n" + "._704:\n" + " add r0, r4, #0\n" + " add r0, r0, #0xb\n" + " ldr r1, ._708 + 12\n" + " bl StringCopy\n" + " b ._707\n" + "._709:\n" + " .align 2, 0\n" + "._708:\n" + " .word +0x2000000\n" + " .word 0x15ddf\n" + " .word 0x15dde\n" + " .word gUnknown_Debug_083C48B0\n" + "._694:\n" + " ldr r1, ._710\n" + " ldr r0, ._710 + 4\n" + " add r2, r1, r0\n" + " mov r0, #0x0\n" + " strb r0, [r2]\n" + " ldr r2, ._710 + 8\n" + " add r1, r1, r2\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " mov r0, #0x9\n" + " strb r0, [r4, #0xa]\n" + " add r0, r4, #0\n" + " add r0, r0, #0xb\n" + " ldr r1, ._710 + 12\n" + " bl StringCopy\n" + "._707:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._711:\n" + " .align 2, 0\n" + "._710:\n" + " .word +0x2000000\n" + " .word 0x15ddf\n" + " .word 0x15dde\n" + " .word gUnknown_Debug_083C48B0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F2E0() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " lsl r1, r1, #0x18\n" + " lsr r3, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " cmp r2, #0\n" + " bne ._712 @cond_branch\n" + " ldr r1, ._714\n" + " mov r0, #0xa1\n" + " b ._713\n" + "._715:\n" + " .align 2, 0\n" + "._714:\n" + " .word gDebug_03000700+0x10\n" + "._712:\n" + " ldr r1, ._716\n" + " mov r0, #0xa2\n" + "._713:\n" + " strb r0, [r1]\n" + " mov r0, #0xff\n" + " strb r0, [r1, #0x1]\n" + " add r0, r1, #0\n" + " add r1, r4, #0\n" + " add r2, r3, #0\n" + " bl MenuPrint\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._717:\n" + " .align 2, 0\n" + "._716:\n" + " .word gDebug_03000700+0x10\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_808F31C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6}\n" + " mov r8, r0\n" + " mov r9, r1\n" + " add r4, r2, #0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " mov r0, r9\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r9, r0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " ldr r5, ._718\n" + " ldr r6, ._718 + 4\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5]\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r6, #0xfa\n" + " lsl r6, r6, #0x2\n" + " add r1, r6, #0\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x1]\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0x64\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x2]\n" + " add r0, r4, #0\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0xa\n" + " bl __udivsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x3]\n" + " add r0, r4, #0\n" + " mov r1, #0xa\n" + " bl __umodsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r5, #0x4]\n" + " mov r0, #0xff\n" + " strb r0, [r5, #0x5]\n" + " add r0, r5, #0\n" + " mov r1, r8\n" + " mov r2, r9\n" + " bl MenuPrint\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._719:\n" + " .align 2, 0\n" + "._718:\n" + " .word gDebug_03000700+0x10\n" + " .word 0x2710\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_nullsub_66() +{ + asm( + " bx lr\n" + "\n" + ); +} + +#endif diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c new file mode 100644 index 000000000..fed5b4e52 --- /dev/null +++ b/src/debug/watanabe_debug_menu.c @@ -0,0 +1,9846 @@ +#ifdef DEBUG +#include "global.h" + +EWRAM_DATA u8 unk_debug_ewram_0[56] = { 0 }; + +u8 byte_3005E30[0x20]; + +__attribute__((naked)) +void debug_69() +{ + asm( + " bx lr\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C35DC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " bl SetVBlankCallback\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x13\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " add r0, r0, #0xe\n" + " strh r1, [r0]\n" + " sub r0, r0, #0x2\n" + " strh r1, [r0]\n" + " sub r0, r0, #0x2\n" + " strh r1, [r0]\n" + " sub r0, r0, #0x2\n" + " strh r1, [r0]\n" + " add r0, r0, #0x14\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " sub r0, r0, #0x6\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " sub r0, r0, #0x6\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " sub r0, r0, #0x6\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " mov r3, #0xc0\n" + " lsl r3, r3, #0x13\n" + " mov r4, #0xc0\n" + " lsl r4, r4, #0x9\n" + " add r0, sp, #0x4\n" + " mov r8, r0\n" + " mov r2, sp\n" + " mov r6, #0x0\n" + " ldr r1, ._2\n" + " mov r5, #0x80\n" + " lsl r5, r5, #0x5\n" + " ldr r7, ._2 + 4\n" + " mov r0, #0x81\n" + " lsl r0, r0, #0x18\n" + " mov ip, r0\n" + "._1:\n" + " strh r6, [r2]\n" + " mov r0, sp\n" + " str r0, [r1]\n" + " str r3, [r1, #0x4]\n" + " str r7, [r1, #0x8]\n" + " ldr r0, [r1, #0x8]\n" + " add r3, r3, r5\n" + " sub r4, r4, r5\n" + " cmp r4, r5\n" + " bhi ._1 @cond_branch\n" + " strh r6, [r2]\n" + " mov r2, sp\n" + " str r2, [r1]\n" + " str r3, [r1, #0x4]\n" + " lsr r0, r4, #0x1\n" + " mov r2, ip\n" + " orr r0, r0, r2\n" + " str r0, [r1, #0x8]\n" + " ldr r0, [r1, #0x8]\n" + " mov r0, #0xe0\n" + " lsl r0, r0, #0x13\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x3\n" + " mov r4, #0x0\n" + " str r4, [sp, #0x4]\n" + " ldr r2, ._2\n" + " mov r1, r8\n" + " str r1, [r2]\n" + " str r0, [r2, #0x4]\n" + " lsr r0, r3, #0x2\n" + " mov r1, #0x85\n" + " lsl r1, r1, #0x18\n" + " orr r0, r0, r1\n" + " str r0, [r2, #0x8]\n" + " ldr r0, [r2, #0x8]\n" + " mov r1, #0xa0\n" + " lsl r1, r1, #0x13\n" + " mov r0, sp\n" + " strh r4, [r0]\n" + " str r0, [r2]\n" + " str r1, [r2, #0x4]\n" + " lsr r3, r3, #0x1\n" + " mov r0, #0x81\n" + " lsl r0, r0, #0x18\n" + " orr r3, r3, r0\n" + " str r3, [r2, #0x8]\n" + " ldr r0, [r2, #0x8]\n" + " bl ResetPaletteFade\n" + " bl remove_some_task\n" + " bl ResetTasks\n" + " bl ResetSpriteData\n" + " bl ResetPaletteFade\n" + " bl FreeAllSpritePalettes\n" + " ldr r0, ._2 + 8\n" + " bl LoadSpriteSheet\n" + " ldr r0, ._2 + 12\n" + " bl LoadSpritePalette\n" + " ldr r0, ._2 + 16\n" + " bl SetUpWindowConfig\n" + " ldr r0, ._2 + 20\n" + " bl InitMenuWindow\n" + " add sp, sp, #0x8\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._3:\n" + " .align 2, 0\n" + "._2:\n" + " .word 0x40000d4\n" + " .word 0x81000800\n" + " .word stru_83F8828\n" + " .word stru_83F8838\n" + " .word gWindowConfig_81E6C3C\n" + " .word gWindowConfig_81E6CE4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C36F4() +{ + asm( + " push {lr}\n" + " bl RunTasks\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " bl UpdatePaletteFade\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C370C() +{ + asm( + " push {lr}\n" + " ldr r0, ._6\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._4 @cond_branch\n" + " ldr r0, ._6 + 4\n" + " bl SetMainCallback2\n" + " b ._5\n" + "._7:\n" + " .align 2, 0\n" + "._6:\n" + " .word gPaletteFade\n" + " .word debug_80C36F4+1\n" + "._4:\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " bl UpdatePaletteFade\n" + "._5:\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C373C() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl DestroyTask\n" + " bl ScriptContext2_Disable\n" + " ldr r0, ._8\n" + " bl SetMainCallback2\n" + " pop {r0}\n" + " bx r0\n" + "._9:\n" + " .align 2, 0\n" + "._8:\n" + " .word sub_80546F0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C3758() +{ + asm( + " push {lr}\n" + " bl LoadOam\n" + " bl ProcessSpriteCopyRequests\n" + " bl TransferPlttBuffer\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C376C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " lsl r1, r1, #0x18\n" + " lsr r7, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " lsr r6, r2, #0x18\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + "._10:\n" + " mov r3, sp\n" + " add r0, r3, r1\n" + " strb r2, [r0]\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " cmp r1, #0x2\n" + " bls ._10 @cond_branch\n" + " mov r1, sp\n" + " mov r0, #0xff\n" + " strb r0, [r1, #0x3]\n" + " mov r4, #0x0\n" + " add r0, r5, #0\n" + " mov r1, #0x64\n" + " bl __udivsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._11 @cond_branch\n" + " mov r1, sp\n" + " add r0, r0, #0xa1\n" + " strb r0, [r1]\n" + " mov r4, #0x1\n" + "._11:\n" + " add r0, r5, #0\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0xa\n" + " bl __udivsi3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._12 @cond_branch\n" + " cmp r4, #0\n" + " beq ._13 @cond_branch\n" + "._12:\n" + " mov r1, sp\n" + " add r0, r0, #0xa1\n" + " strb r0, [r1, #0x1]\n" + "._13:\n" + " mov r4, sp\n" + " add r0, r5, #0\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0xa\n" + " bl __umodsi3\n" + " add r0, r0, #0xa1\n" + " strb r0, [r4, #0x2]\n" + " mov r0, sp\n" + " add r1, r7, #0\n" + " add r2, r6, #0\n" + " bl MenuPrint\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C3800() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffff4\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " lsl r1, r1, #0x18\n" + " lsr r6, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " lsr r5, r2, #0x18\n" + " mov r3, #0x0\n" + " ldr r2, ._18\n" + " mov r1, #0x0\n" + "._14:\n" + " mov r7, sp\n" + " add r0, r7, r3\n" + " strb r1, [r0]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " cmp r3, #0x9\n" + " bls ._14 @cond_branch\n" + " add r1, r7, r3\n" + " mov r0, #0xff\n" + " strb r0, [r1]\n" + " mov r3, #0x0\n" + " mov r0, #0xb\n" + " add r1, r4, #0\n" + " mul r1, r1, r0\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._16 @cond_branch\n" + " add r4, r2, #0\n" + " add r2, r1, #0\n" + "._17:\n" + " mov r0, sp\n" + " add r1, r0, r3\n" + " add r0, r3, r2\n" + " add r0, r0, r4\n" + " ldrb r0, [r0]\n" + " strb r0, [r1]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " add r0, r3, r2\n" + " add r0, r0, r4\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._16 @cond_branch\n" + " cmp r3, #0x9\n" + " bls ._17 @cond_branch\n" + "._16:\n" + " mov r0, sp\n" + " add r1, r6, #0\n" + " add r2, r5, #0\n" + " bl MenuPrint\n" + " add sp, sp, #0xc\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._19:\n" + " .align 2, 0\n" + "._18:\n" + " .word gSpeciesNames\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C3878() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " cmp r0, #0\n" + " beq ._20 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._21 @cond_branch\n" + "._20:\n" + " cmp r1, #0x1\n" + " bls ._22 @cond_branch\n" + " sub r0, r1, #1\n" + " b ._23\n" + "._22:\n" + " ldr r1, ._25\n" + " b ._28\n" + "._26:\n" + " .align 2, 0\n" + "._25:\n" + " .word 0x19b\n" + "._21:\n" + " mov r0, #0xcd\n" + " lsl r0, r0, #0x1\n" + " cmp r1, r0\n" + " bhi ._27 @cond_branch\n" + " add r0, r1, #1\n" + "._23:\n" + " lsl r0, r0, #0x10\n" + " lsr r1, r0, #0x10\n" + " b ._28\n" + "._27:\n" + " mov r1, #0x1\n" + "._28:\n" + " add r0, r1, #0\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C38B4() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r1, r1, #0x10\n" + " lsr r0, r1, #0x10\n" + " cmp r2, #0\n" + " beq ._29 @cond_branch\n" + " cmp r2, #0x1\n" + " beq ._30 @cond_branch\n" + "._29:\n" + " cmp r0, #0\n" + " beq ._31 @cond_branch\n" + " sub r0, r0, #0x1\n" + " b ._32\n" + "._31:\n" + " mov r0, #0x52\n" + " b ._35\n" + "._30:\n" + " cmp r0, #0x51\n" + " bhi ._34 @cond_branch\n" + " add r0, r0, #0x1\n" + "._32:\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " b ._35\n" + "._34:\n" + " mov r0, #0x0\n" + "._35:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C38E4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r2, #0\n" + " add r5, r3, #0\n" + " ldr r6, [sp, #0x1c]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " lsl r1, r1, #0x18\n" + " lsr r7, r1, #0x18\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " lsl r6, r6, #0x18\n" + " lsr r6, r6, #0x18\n" + " ldr r1, ._37\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " bl memcpy\n" + " add r0, r7, #0\n" + " add r1, r4, #0\n" + " add r2, r7, #0\n" + " add r3, r5, #0\n" + " bl MenuFillWindowRectWithBlankTile\n" + " cmp r6, #0\n" + " beq ._36 @cond_branch\n" + " mov r0, sp\n" + " add r1, r7, #0\n" + " mov r2, r8\n" + " bl MenuPrint\n" + "._36:\n" + " add sp, sp, #0x4\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._38:\n" + " .align 2, 0\n" + "._37:\n" + " .word gUnknown_Debug_083F7FD4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C393C() +{ + asm( + " push {lr}\n" + " ldr r1, ._39\n" + " mov r0, #0x1e\n" + " bl ProgramFlashSectorAndVerify\n" + " pop {r0}\n" + " bx r0\n" + "._40:\n" + " .align 2, 0\n" + "._39:\n" + " .word gUnknown_Debug_083F7FD6\n" + "\n" + ); +} + +__attribute__((naked)) +void InitWatanabeDebugMenu() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._46\n" + " ldr r1, ._46 + 4\n" + " add r4, r0, r1\n" + " ldrb r0, [r4]\n" + " cmp r0, #0x1\n" + " beq ._41 @cond_branch\n" + " cmp r0, #0x1\n" + " ble ._42 @cond_branch\n" + " cmp r0, #0x2\n" + " beq ._43 @cond_branch\n" + " cmp r0, #0x3\n" + " beq ._44 @cond_branch\n" + "._42:\n" + " bl save_serialize_map\n" + " bl sub_8125E2C\n" + " mov r0, #0x1\n" + " strb r0, [r4]\n" + " b ._51\n" + "._47:\n" + " .align 2, 0\n" + "._46:\n" + " .word gMain\n" + " .word 0x43c\n" + "._41:\n" + " bl sub_8125E6C\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._51 @cond_branch\n" + " b ._49\n" + "._43:\n" + " mov r0, #0x37\n" + " bl PlaySE\n" + "._49:\n" + " ldrb r0, [r4]\n" + " add r0, r0, #0x1\n" + " strb r0, [r4]\n" + " b ._51\n" + "._44:\n" + " bl IsSEPlaying\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._51 @cond_branch\n" + " bl ScriptContext2_Disable\n" + " ldr r0, ._52\n" + " bl SetMainCallback2\n" + "._51:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._53:\n" + " .align 2, 0\n" + "._52:\n" + " .word sub_80546F0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void InitSizeComparison() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " bl debug_80C35DC\n" + " ldr r1, ._54\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r0, ._54 + 4\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x1\n" + " mov r2, #0x20\n" + " bl LoadPalette\n" + " ldr r3, ._54 + 8\n" + " ldrh r2, [r3]\n" + " mov r0, #0x0\n" + " strh r0, [r3]\n" + " ldr r4, ._54 + 12\n" + " ldrh r0, [r4]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " strh r0, [r4]\n" + " strh r2, [r3]\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x10\n" + " mov r3, #0x0\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._54 + 16\n" + " bl SetVBlankCallback\n" + " ldr r0, ._54 + 20\n" + " bl SetMainCallback2\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x13\n" + " mov r2, #0x8a\n" + " lsl r2, r2, #0x5\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, ._54 + 24\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._54 + 28\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " mov r0, #0xfc\n" + " strh r0, [r1, #0x8]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._55:\n" + " .align 2, 0\n" + "._54:\n" + " .word gReservedSpritePaletteCount\n" + " .word unk_debug_ewram_0\n" + " .word 0x4000208\n" + " .word 0x4000200\n" + " .word debug_80C3758+1\n" + " .word debug_80C370C+1\n" + " .word debug_80C3A50+1\n" + " .word gTasks\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C3A50() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xffffffd8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r1, ._56\n" + " lsl r2, r0, #0x2\n" + " add r0, r2, r0\n" + " lsl r0, r0, #0x3\n" + " add r7, r0, r1\n" + " ldrh r0, [r7, #0x8]\n" + " str r0, [sp, #0x4]\n" + " bl NationalPokedexNumToSpecies\n" + " mov r1, sp\n" + " strh r0, [r1, #0x8]\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x10\n" + " str r2, [sp, #0xc]\n" + " lsr r2, r2, #0x10\n" + " mov r9, r2\n" + " ldr r3, ._56 + 4\n" + " mov r8, r3\n" + " mov r0, #0x6\n" + " mov r1, #0x0\n" + " mov r2, #0x17\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x5\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " ldr r5, ._56 + 8\n" + " add r0, r5, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r4, ._56 + 12\n" + " add r0, r4, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0x18\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " add r0, r5, #0\n" + " mov r1, #0x19\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0x19\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " mov r1, #0xa\n" + " mov r2, #0xb\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._56 + 16\n" + " mov r1, #0x1\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " ldr r0, ._56 + 20\n" + " mov r1, #0x1\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " ldr r0, ._56 + 24\n" + " mov r1, #0x1\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r0, ._56 + 28\n" + " mov r1, #0x1\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " mov r0, #0xc\n" + " mov r1, #0xa\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._56 + 32\n" + " mov r1, #0xd\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " ldr r0, ._56 + 36\n" + " mov r1, #0xd\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " mov r0, #0xc\n" + " mov r1, #0x10\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._56 + 40\n" + " mov r1, #0xd\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " ldr r0, ._56 + 44\n" + " mov r1, #0x18\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " mov r0, r9\n" + " mov r1, #0x12\n" + " mov r2, #0x11\n" + " bl debug_80C3800\n" + " mov r1, r8\n" + " ldrb r0, [r1, #0x8]\n" + " mov r1, #0x98\n" + " mov r2, #0x28\n" + " mov r3, #0x0\n" + " bl sub_8091A4C\n" + " mov r2, sp\n" + " strh r0, [r2, #0x10]\n" + " add r3, r0, #0\n" + " lsl r3, r3, #0x10\n" + " str r3, [sp, #0x18]\n" + " lsr r0, r3, #0x10\n" + " str r0, [sp, #0x14]\n" + " lsl r4, r0, #0x4\n" + " add r4, r4, r0\n" + " lsl r4, r4, #0x2\n" + " ldr r1, ._56 + 48\n" + " add r4, r4, r1\n" + " ldrb r1, [r4, #0x1]\n" + " mov r2, #0x4\n" + " neg r2, r2\n" + " mov sl, r2\n" + " mov r0, sl\n" + " and r0, r0, r1\n" + " mov r3, #0x1\n" + " orr r0, r0, r3\n" + " strb r0, [r4, #0x1]\n" + " ldrb r1, [r4, #0x3]\n" + " mov r0, #0x3f\n" + " neg r0, r0\n" + " mov r9, r0\n" + " and r0, r0, r1\n" + " mov r1, #0x4\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0x3]\n" + " ldrb r1, [r4, #0x5]\n" + " sub r2, r2, #0x9\n" + " mov r8, r2\n" + " mov r0, r8\n" + " and r0, r0, r1\n" + " mov r3, #0xf\n" + " and r0, r0, r3\n" + " strb r0, [r4, #0x5]\n" + " mov r0, #0x0\n" + " bl GetSpritePaletteTagByPaletteNum\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl FreeSpritePaletteByTag\n" + " ldr r0, ._56 + 52\n" + " ldr r1, [sp, #0x4]\n" + " lsl r5, r1, #0x3\n" + " add r5, r5, r1\n" + " lsl r5, r5, #0x2\n" + " add r5, r5, r0\n" + " ldrh r6, [r5, #0x20]\n" + " strh r6, [r4, #0x26]\n" + " ldrh r4, [r5, #0x1e]\n" + " str r4, [sp]\n" + " mov r0, #0x2\n" + " add r1, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " bl SetOamMatrix\n" + " mov r2, sp\n" + " ldrh r2, [r2, #0x14]\n" + " strh r2, [r7, #0xe]\n" + " strh r6, [r7, #0x10]\n" + " strh r4, [r7, #0x14]\n" + " ldr r0, [sp, #0x4]\n" + " mov r1, #0x58\n" + " mov r2, #0x28\n" + " mov r3, #0x1\n" + " bl sub_80918EC\n" + " mov r3, sp\n" + " strh r0, [r3, #0x1c]\n" + " lsl r0, r0, #0x10\n" + " str r0, [sp, #0x24]\n" + " lsr r1, r0, #0x10\n" + " str r1, [sp, #0x20]\n" + " lsl r4, r1, #0x4\n" + " add r4, r4, r1\n" + " lsl r4, r4, #0x2\n" + " ldr r2, ._56 + 48\n" + " add r4, r4, r2\n" + " ldrb r0, [r4, #0x1]\n" + " mov r3, sl\n" + " and r3, r3, r0\n" + " mov r0, #0x1\n" + " orr r3, r3, r0\n" + " strb r3, [r4, #0x1]\n" + " ldrb r0, [r4, #0x3]\n" + " mov r1, r9\n" + " and r1, r1, r0\n" + " mov r0, #0x2\n" + " orr r1, r1, r0\n" + " strb r1, [r4, #0x3]\n" + " ldrb r0, [r4, #0x5]\n" + " mov r2, r8\n" + " and r2, r2, r0\n" + " mov r3, #0xf\n" + " and r2, r2, r3\n" + " strb r2, [r4, #0x5]\n" + " mov r0, #0x0\n" + " bl GetSpritePaletteTagByPaletteNum\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl FreeSpritePaletteByTag\n" + " ldrh r0, [r5, #0x1c]\n" + " mov r8, r0\n" + " strh r0, [r4, #0x26]\n" + " ldrh r4, [r5, #0x1a]\n" + " str r4, [sp]\n" + " mov r0, #0x1\n" + " add r1, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " bl SetOamMatrix\n" + " mov r1, sp\n" + " ldrh r1, [r1, #0x20]\n" + " strh r1, [r7, #0xc]\n" + " mov r2, r8\n" + " strh r2, [r7, #0x12]\n" + " strh r4, [r7, #0x16]\n" + " mov r3, #0x0\n" + " strh r3, [r7, #0x18]\n" + " strh r3, [r7, #0x1a]\n" + " ldr r1, ._56 + 56\n" + " ldr r2, ._56 + 60\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " mov r0, #0x1f\n" + " strh r0, [r1]\n" + " ldr r2, ._56 + 64\n" + " mov r3, #0x18\n" + " ldsh r1, [r7, r3]\n" + " lsl r1, r1, #0x6\n" + " add r0, r1, #0\n" + " add r0, r0, #0x38\n" + " lsl r0, r0, #0x8\n" + " add r1, r1, #0x78\n" + " add r0, r0, r1\n" + " strh r0, [r2]\n" + " ldr r1, ._56 + 68\n" + " ldr r2, ._56 + 72\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " sub r1, r1, #0x2\n" + " ldr r3, ._56 + 76\n" + " add r0, r3, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._56 + 80\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0xa\n" + " mov r0, #0xe1\n" + " strh r0, [r1]\n" + " ldr r0, ._56 + 84\n" + " mov r3, #0x0\n" + " strh r3, [r0]\n" + " add r1, r1, #0x4\n" + " mov r0, #0x7\n" + " strh r0, [r1]\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x13\n" + " ldrh r0, [r2]\n" + " mov r3, #0xc0\n" + " lsl r3, r3, #0x7\n" + " add r1, r3, #0\n" + " orr r0, r0, r1\n" + " strh r0, [r2]\n" + " ldr r0, ._56 + 88\n" + " str r0, [r7]\n" + " add sp, sp, #0x28\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._57:\n" + " .align 2, 0\n" + "._56:\n" + " .word gTasks\n" + " .word gSaveBlock2\n" + " .word gUnknown_Debug_083F7FD6+0x4\n" + " .word gUnknown_Debug_083F7FDE\n" + " .word gUnknown_Debug_083F7FE2\n" + " .word gUnknown_Debug_083F7FED\n" + " .word gUnknown_Debug_083F7FF6\n" + " .word gUnknown_Debug_083F8001\n" + " .word gUnknown_Debug_083F800C\n" + " .word gUnknown_Debug_083F8019\n" + " .word gUnknown_Debug_083F8022\n" + " .word gUnknown_Debug_083F8028\n" + " .word gSprites\n" + " .word gPokedexEntries\n" + " .word 0x4000048\n" + " .word 0x3f1f\n" + " .word 0x4000040\n" + " .word 0x4000044\n" + " .word 0x848\n" + " .word 0x31bf\n" + " .word 0x14f\n" + " .word 0x4000052\n" + " .word debug_80C3D2C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C3D2C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " add r7, r6, #0\n" + " ldr r4, ._60\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._58 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._60 + 4\n" + " bl SetMainCallback2\n" + " ldr r1, ._60 + 8\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._60 + 12\n" + " str r1, [r0]\n" + " b ._117\n" + "._61:\n" + " .align 2, 0\n" + "._60:\n" + " .word gMain\n" + " .word debug_80C370C+1\n" + " .word gTasks\n" + " .word debug_80C373C+1\n" + "._58:\n" + " mov r5, #0x1\n" + " add r0, r5, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._62 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._64\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldrh r1, [r0, #0x18]\n" + " mov r2, #0x1\n" + " eor r1, r1, r2\n" + " strh r1, [r0, #0x18]\n" + " b ._117\n" + "._65:\n" + " .align 2, 0\n" + "._64:\n" + " .word gTasks\n" + "._62:\n" + " ldrh r1, [r4, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._66 @cond_branch\n" + " ldr r1, ._70\n" + " lsl r2, r6, #0x2\n" + " add r0, r2, r6\n" + " lsl r0, r0, #0x3\n" + " add r3, r0, r1\n" + " mov r5, #0x18\n" + " ldsh r0, [r3, r5]\n" + " mov r8, r1\n" + " cmp r0, #0\n" + " beq ._67 @cond_branch\n" + " ldrh r1, [r4, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._68 @cond_branch\n" + " ldrh r0, [r3, #0x14]\n" + " add r0, r0, #0x10\n" + " b ._69\n" + "._71:\n" + " .align 2, 0\n" + "._70:\n" + " .word gTasks\n" + "._68:\n" + " ldrh r0, [r3, #0x14]\n" + " add r0, r0, #0x1\n" + "._69:\n" + " strh r0, [r3, #0x14]\n" + " add r0, r2, r7\n" + " lsl r0, r0, #0x3\n" + " mov r2, r8\n" + " add r1, r0, r2\n" + " ldrh r0, [r1, #0x14]\n" + " mov r6, #0x80\n" + " lsl r6, r6, #0x8\n" + " cmp r0, r6\n" + " bhi ._72 @cond_branch\n" + " b ._117\n" + "._72:\n" + " strh r6, [r1, #0x14]\n" + " b ._117\n" + "._67:\n" + " ldrh r1, [r4, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._75 @cond_branch\n" + " ldrh r0, [r3, #0x16]\n" + " add r0, r0, #0x10\n" + " b ._76\n" + "._75:\n" + " ldrh r0, [r3, #0x16]\n" + " add r0, r0, #0x1\n" + "._76:\n" + " strh r0, [r3, #0x16]\n" + " add r0, r2, r7\n" + " lsl r0, r0, #0x3\n" + " mov r4, r8\n" + " add r1, r0, r4\n" + " ldrh r0, [r1, #0x16]\n" + " mov r6, #0x80\n" + " lsl r6, r6, #0x8\n" + " cmp r0, r6\n" + " bhi ._77 @cond_branch\n" + " b ._117\n" + "._77:\n" + " strh r6, [r1, #0x16]\n" + " b ._117\n" + "._66:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._80 @cond_branch\n" + " ldr r1, ._84\n" + " lsl r2, r6, #0x2\n" + " add r0, r2, r6\n" + " lsl r0, r0, #0x3\n" + " add r3, r0, r1\n" + " mov r5, #0x18\n" + " ldsh r0, [r3, r5]\n" + " mov r8, r1\n" + " cmp r0, #0\n" + " beq ._81 @cond_branch\n" + " ldrh r1, [r4, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._82 @cond_branch\n" + " ldrh r0, [r3, #0x14]\n" + " sub r0, r0, #0x10\n" + " b ._83\n" + "._85:\n" + " .align 2, 0\n" + "._84:\n" + " .word gTasks\n" + "._82:\n" + " ldrh r0, [r3, #0x14]\n" + " sub r0, r0, #0x1\n" + "._83:\n" + " strh r0, [r3, #0x14]\n" + " add r0, r2, r7\n" + " lsl r0, r0, #0x3\n" + " mov r2, r8\n" + " add r1, r0, r2\n" + " mov r4, #0x14\n" + " ldsh r0, [r1, r4]\n" + " cmp r0, #0xff\n" + " ble ._86 @cond_branch\n" + " b ._117\n" + "._86:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " strh r0, [r1, #0x14]\n" + " b ._117\n" + "._81:\n" + " ldrh r1, [r4, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._89 @cond_branch\n" + " ldrh r0, [r3, #0x16]\n" + " sub r0, r0, #0x10\n" + " b ._90\n" + "._89:\n" + " ldrh r0, [r3, #0x16]\n" + " sub r0, r0, #0x1\n" + "._90:\n" + " strh r0, [r3, #0x16]\n" + " add r0, r2, r7\n" + " lsl r0, r0, #0x3\n" + " mov r5, r8\n" + " add r1, r0, r5\n" + " mov r2, #0x16\n" + " ldsh r0, [r1, r2]\n" + " cmp r0, #0xff\n" + " ble ._91 @cond_branch\n" + " b ._117\n" + "._91:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " strh r0, [r1, #0x16]\n" + " b ._117\n" + "._80:\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._94 @cond_branch\n" + " ldr r0, ._97\n" + " lsl r1, r6, #0x2\n" + " add r1, r1, r6\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " mov r4, #0x18\n" + " ldsh r0, [r1, r4]\n" + " cmp r0, #0\n" + " beq ._95 @cond_branch\n" + " ldrh r0, [r1, #0x10]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r1, #0x10]\n" + " b ._117\n" + "._98:\n" + " .align 2, 0\n" + "._97:\n" + " .word gTasks\n" + "._95:\n" + " ldrh r0, [r1, #0x12]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r1, #0x12]\n" + " b ._117\n" + "._94:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._100 @cond_branch\n" + " ldr r0, ._103\n" + " lsl r1, r6, #0x2\n" + " add r1, r1, r6\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " mov r5, #0x18\n" + " ldsh r0, [r1, r5]\n" + " cmp r0, #0\n" + " beq ._101 @cond_branch\n" + " ldrh r0, [r1, #0x10]\n" + " add r0, r0, #0x1\n" + " strh r0, [r1, #0x10]\n" + " b ._117\n" + "._104:\n" + " .align 2, 0\n" + "._103:\n" + " .word gTasks\n" + "._101:\n" + " ldrh r0, [r1, #0x12]\n" + " add r0, r0, #0x1\n" + " strh r0, [r1, #0x12]\n" + " b ._117\n" + "._100:\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._106 @cond_branch\n" + " ldr r2, ._109\n" + " lsl r3, r6, #0x2\n" + " add r0, r3, r6\n" + " lsl r0, r0, #0x3\n" + " add r6, r0, r2\n" + " ldrh r4, [r6, #0x8]\n" + " mov r0, #0x8\n" + " ldsh r1, [r6, r0]\n" + " ldr r0, ._109 + 4\n" + " mov r8, r2\n" + " add r2, r3, #0\n" + " cmp r1, r0\n" + " bgt ._107 @cond_branch\n" + " add r0, r4, #1\n" + " strh r0, [r6, #0x8]\n" + " b ._108\n" + "._110:\n" + " .align 2, 0\n" + "._109:\n" + " .word gTasks\n" + " .word 0x181\n" + "._107:\n" + " strh r5, [r6, #0x8]\n" + "._108:\n" + " add r4, r2, r7\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r8\n" + " mov r2, #0xc\n" + " ldsh r1, [r4, r2]\n" + " b ._111\n" + "._106:\n" + " mov r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._112 @cond_branch\n" + " ldr r1, ._115\n" + " lsl r2, r6, #0x2\n" + " add r0, r2, r6\n" + " lsl r0, r0, #0x3\n" + " add r3, r0, r1\n" + " ldrh r6, [r3, #0x8]\n" + " mov r4, #0x8\n" + " ldsh r0, [r3, r4]\n" + " mov r8, r1\n" + " cmp r0, #0x1\n" + " ble ._113 @cond_branch\n" + " sub r0, r6, #1\n" + " b ._114\n" + "._116:\n" + " .align 2, 0\n" + "._115:\n" + " .word gTasks\n" + "._113:\n" + " mov r0, #0xc1\n" + " lsl r0, r0, #0x1\n" + "._114:\n" + " strh r0, [r3, #0x8]\n" + " add r4, r2, r7\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r8\n" + " mov r5, #0xc\n" + " ldsh r1, [r4, r5]\n" + "._111:\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r5, ._118\n" + " add r0, r0, r5\n" + " bl DestroySprite\n" + " mov r0, #0xe\n" + " ldsh r1, [r4, r0]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r5\n" + " bl DestroySprite\n" + " ldr r0, ._118 + 4\n" + " str r0, [r4]\n" + " b ._117\n" + "._119:\n" + " .align 2, 0\n" + "._118:\n" + " .word gSprites\n" + " .word debug_80C3A50+1\n" + "._112:\n" + " ldr r0, ._120\n" + " lsl r5, r7, #0x2\n" + " add r5, r5, r7\n" + " lsl r5, r5, #0x3\n" + " add r5, r5, r0\n" + " ldrh r4, [r5, #0x16]\n" + " ldrh r6, [r5, #0x12]\n" + " str r4, [sp]\n" + " mov r0, #0x1\n" + " add r1, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " bl SetOamMatrix\n" + " add r0, r4, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " add r0, r6, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " ldr r2, ._120 + 4\n" + " mov r8, r2\n" + " mov r4, #0xc\n" + " ldsh r1, [r5, r4]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r8\n" + " strh r6, [r0, #0x26]\n" + " ldrh r4, [r5, #0x14]\n" + " ldrh r6, [r5, #0x10]\n" + " str r4, [sp]\n" + " mov r0, #0x2\n" + " add r1, r4, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " bl SetOamMatrix\n" + " add r0, r4, #0\n" + " mov r1, #0x19\n" + " mov r2, #0x3\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " add r0, r6, #0\n" + " mov r1, #0x19\n" + " mov r2, #0x7\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " mov r0, #0xe\n" + " ldsh r1, [r5, r0]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r8\n" + " strh r6, [r0, #0x26]\n" + " ldr r2, ._120 + 8\n" + " mov r4, #0x18\n" + " ldsh r1, [r5, r4]\n" + " lsl r1, r1, #0x6\n" + " add r0, r1, #0\n" + " add r0, r0, #0x38\n" + " lsl r0, r0, #0x8\n" + " add r1, r1, #0x78\n" + " add r0, r0, r1\n" + " strh r0, [r2]\n" + "._117:\n" + " add sp, sp, #0x4\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._121:\n" + " .align 2, 0\n" + "._120:\n" + " .word gTasks\n" + " .word gSprites\n" + " .word 0x4000040\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C405C() +{ + asm( + " push {r4, r5, lr}\n" + " add r4, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r5, r1, #0x10\n" + " mov r2, #0x0\n" + " mov r1, #0x0\n" + "._122:\n" + " add r0, r4, r2\n" + " strb r1, [r0]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x9\n" + " bls ._122 @cond_branch\n" + " add r0, r4, r2\n" + " mov r1, #0xff\n" + " strb r1, [r0]\n" + " mov r0, #0xae\n" + " strb r0, [r4]\n" + " cmp r5, #0\n" + " beq ._125 @cond_branch\n" + " mov r2, #0x0\n" + " ldr r3, ._127\n" + " mov r0, #0xb\n" + " add r1, r5, #0\n" + " mul r1, r1, r0\n" + " add r0, r1, r3\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._125 @cond_branch\n" + " add r5, r3, #0\n" + " add r3, r1, #0\n" + "._126:\n" + " add r1, r4, r2\n" + " add r0, r2, r3\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " strb r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " add r0, r2, r3\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._125 @cond_branch\n" + " cmp r2, #0x9\n" + " bls ._126 @cond_branch\n" + "._125:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._128:\n" + " .align 2, 0\n" + "._127:\n" + " .word gSpeciesNames\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C40C4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " mov r5, #0x0\n" + " mov r6, sp\n" + "._135:\n" + " cmp r7, #0\n" + " beq ._129 @cond_branch\n" + " mov r0, #0x64\n" + " add r1, r5, #0\n" + " mul r1, r1, r0\n" + " ldr r0, ._132\n" + " add r4, r1, r0\n" + " add r0, r4, #0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " beq ._134 @cond_branch\n" + " add r0, r4, #0\n" + " bl CalculateMonStats\n" + " add r0, r4, #0\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " strh r0, [r6]\n" + " add r0, r4, #0\n" + " mov r1, #0x39\n" + " mov r2, sp\n" + " bl SetMonData\n" + " b ._134\n" + "._133:\n" + " .align 2, 0\n" + "._132:\n" + " .word gEnemyParty\n" + "._129:\n" + " mov r0, #0x64\n" + " add r1, r5, #0\n" + " mul r1, r1, r0\n" + " ldr r0, ._136\n" + " add r4, r1, r0\n" + " add r0, r4, #0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " beq ._134 @cond_branch\n" + " add r0, r4, #0\n" + " bl CalculateMonStats\n" + " add r0, r4, #0\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " strh r0, [r6]\n" + " add r0, r4, #0\n" + " mov r1, #0x39\n" + " mov r2, sp\n" + " bl SetMonData\n" + "._134:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x5\n" + " bls ._135 @cond_branch\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._137:\n" + " .align 2, 0\n" + "._136:\n" + " .word gPlayerParty\n" + "\n" + ); +} + +__attribute__((naked)) +void InitBattleForDebug() +{ + asm( + " push {lr}\n" + " bl SavePlayerParty\n" + " ldr r1, ._138\n" + " ldr r0, ._138 + 4\n" + " ldrb r2, [r0, #0x8]\n" + " mov r0, #0x0\n" + " strb r2, [r1, #0xd]\n" + " strb r0, [r1]\n" + " strb r0, [r1, #0x1]\n" + " strb r0, [r1, #0x2]\n" + " strb r0, [r1, #0x3]\n" + " strb r0, [r1, #0x4]\n" + " strb r0, [r1, #0x5]\n" + " strb r0, [r1, #0x6]\n" + " strb r0, [r1, #0x7]\n" + " strb r0, [r1, #0x8]\n" + " strb r0, [r1, #0xc]\n" + " ldr r1, ._138 + 8\n" + " str r0, [r1]\n" + " bl ZeroPlayerPartyMons\n" + " bl ZeroEnemyPartyMons\n" + " mov r0, #0x0\n" + " bl debug_80C4214\n" + " ldr r0, ._138 + 12\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._139:\n" + " .align 2, 0\n" + "._138:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gSaveBlock2\n" + " .word byte_3005E30\n" + " .word debug_80C47BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C41A8() +{ + asm( + " push {lr}\n" + " ldr r1, ._140\n" + " mov r0, #0x0\n" + " strb r0, [r1, #0x1]\n" + " strb r0, [r1, #0x2]\n" + " bl ZeroPlayerPartyMons\n" + " bl ZeroEnemyPartyMons\n" + " mov r0, #0x0\n" + " bl debug_80C4214\n" + " ldr r0, ._140 + 4\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._141:\n" + " .align 2, 0\n" + "._140:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word debug_80C47BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C41D4() +{ + asm( + " push {lr}\n" + " mov r0, #0x0\n" + " bl debug_80C40C4\n" + " mov r0, #0x0\n" + " bl debug_80C4214\n" + " ldr r0, ._142\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._143:\n" + " .align 2, 0\n" + "._142:\n" + " .word debug_80C42B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C41F4() +{ + asm( + " push {lr}\n" + " mov r0, #0x1\n" + " bl debug_80C40C4\n" + " mov r0, #0x1\n" + " bl debug_80C4214\n" + " ldr r0, ._144\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._145:\n" + " .align 2, 0\n" + "._144:\n" + " .word debug_80C42B8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4214() +{ + asm( + " push {r4, r5, r6, lr}\n" + " bl debug_80C35DC\n" + " ldr r6, ._146\n" + " mov r4, #0x0\n" + " strh r4, [r6]\n" + " ldr r5, ._146 + 4\n" + " strh r4, [r5]\n" + " ldr r0, ._146 + 8\n" + " strh r4, [r0]\n" + " add r0, r0, #0x4\n" + " strh r4, [r0]\n" + " ldr r1, ._146 + 12\n" + " ldr r2, ._146 + 16\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " mov r0, #0x31\n" + " strh r0, [r1]\n" + " add r1, r1, #0x6\n" + " mov r0, #0xe1\n" + " strh r0, [r1]\n" + " ldr r0, ._146 + 20\n" + " strh r4, [r0]\n" + " add r1, r1, #0x4\n" + " mov r0, #0x7\n" + " strh r0, [r1]\n" + " ldr r3, ._146 + 24\n" + " ldrh r2, [r3]\n" + " strh r4, [r3]\n" + " ldr r4, ._146 + 28\n" + " ldrh r0, [r4]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " strh r0, [r4]\n" + " strh r2, [r3]\n" + " ldr r0, ._146 + 32\n" + " bl SetVBlankCallback\n" + " ldr r0, ._146 + 36\n" + " bl SetMainCallback2\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x13\n" + " ldr r2, ._146 + 40\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._146 + 44\n" + " add r0, r1, #0\n" + " strh r0, [r6]\n" + " ldr r2, ._146 + 48\n" + " add r0, r2, #0\n" + " strh r0, [r5]\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._147:\n" + " .align 2, 0\n" + "._146:\n" + " .word 0x4000040\n" + " .word 0x4000044\n" + " .word 0x4000042\n" + " .word 0x4000048\n" + " .word 0x1111\n" + " .word 0x4000052\n" + " .word 0x4000208\n" + " .word 0x4000200\n" + " .word debug_80C3758+1\n" + " .word debug_80C370C+1\n" + " .word 0x7140\n" + " .word 0x1ef\n" + " .word 0x819f\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C42B8() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xffffffe4\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r1, ._150\n" + " mov r0, sp\n" + " mov r2, #0xc\n" + " bl memcpy\n" + " add r4, sp, #0xc\n" + " ldr r1, ._150 + 4\n" + " add r0, r4, #0\n" + " mov r2, #0xd\n" + " bl memcpy\n" + " mov r0, #0x0\n" + " mov r1, #0x10\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r0, sp\n" + " mov r1, #0x1\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0x14\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " bl debug_80C4694\n" + " bl debug_80C4704\n" + " ldr r0, ._150 + 8\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._148 @cond_branch\n" + " ldr r0, ._150 + 12\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._150 + 16\n" + " b ._149\n" + "._151:\n" + " .align 2, 0\n" + "._150:\n" + " .word gUnknown_Debug_083F8194\n" + " .word gUnknown_Debug_083F81A0\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gTasks\n" + " .word debug_80C44EC+1\n" + "._148:\n" + " ldr r0, ._152\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._152 + 4\n" + "._149:\n" + " str r0, [r1]\n" + " add sp, sp, #0x1c\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._153:\n" + " .align 2, 0\n" + "._152:\n" + " .word gTasks\n" + " .word debug_80C4348+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4348() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r0, ._154\n" + " ldrb r0, [r0, #0x1]\n" + " lsl r0, r0, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r0, r0, r1\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " str r1, [sp]\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r1, ._154 + 4\n" + " ldr r2, ._154 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " add r2, r2, #0x8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._154 + 12\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._154 + 16\n" + " str r1, [r0]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._155:\n" + " .align 2, 0\n" + "._154:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word 0x4000042\n" + " .word 0x177\n" + " .word gTasks\n" + " .word debug_80C43A8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C43A8() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r1, ._158\n" + " ldrh r2, [r1, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " add r3, r1, #0\n" + " cmp r0, #0\n" + " beq ._156 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._158 + 4\n" + " ldrb r1, [r0, #0x1]\n" + " mov r0, #0x64\n" + " mul r0, r0, r1\n" + " ldr r1, ._158 + 8\n" + " add r0, r0, r1\n" + " ldr r1, ._158 + 12\n" + " bl debug_sub_80A433C\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + " b ._180\n" + "._159:\n" + " .align 2, 0\n" + "._158:\n" + " .word gMain\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gPlayerParty\n" + " .word debug_80C41D4+1\n" + "._156:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._160 @cond_branch\n" + " ldr r0, ._162\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._162 + 4\n" + " str r0, [r1]\n" + " b ._180\n" + "._163:\n" + " .align 2, 0\n" + "._162:\n" + " .word gTasks\n" + " .word debug_80C4F48+1\n" + "._160:\n" + " mov r0, #0x8\n" + " and r0, r0, r2\n" + " lsl r0, r0, #0x10\n" + " lsr r1, r0, #0x10\n" + " cmp r1, #0\n" + " beq ._164 @cond_branch\n" + " bl debug_80C4774\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._180 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " bl CalculatePlayerPartyCount\n" + " bl CalculateEnemyPartyCount\n" + " ldr r0, ._167\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._167 + 4\n" + " str r0, [r1]\n" + " b ._180\n" + "._168:\n" + " .align 2, 0\n" + "._167:\n" + " .word gTasks\n" + " .word debug_80C4D14+1\n" + "._164:\n" + " mov r0, #0x88\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._169 @cond_branch\n" + " str r1, [sp]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r0, ._171\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._171 + 4\n" + " str r0, [r1]\n" + " b ._180\n" + "._172:\n" + " .align 2, 0\n" + "._171:\n" + " .word gTasks\n" + " .word debug_80C44EC+1\n" + "._169:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._174 @cond_branch\n" + " ldr r1, ._176\n" + " ldrb r0, [r1, #0x1]\n" + " cmp r0, #0\n" + " beq ._174 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1, #0x1]\n" + " b ._175\n" + "._177:\n" + " .align 2, 0\n" + "._176:\n" + " .word unk_debug_ewram_0+0x20\n" + "._174:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._180 @cond_branch\n" + " ldr r5, ._181\n" + " ldrb r0, [r5, #0x1]\n" + " cmp r0, #0x4\n" + " bhi ._180 @cond_branch\n" + " add r1, r0, #0\n" + " mov r0, #0x64\n" + " mul r0, r0, r1\n" + " ldr r1, ._181 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " beq ._180 @cond_branch\n" + " ldrb r0, [r5, #0x1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r5, #0x1]\n" + "._175:\n" + " ldr r1, ._181 + 8\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._181 + 12\n" + " str r1, [r0]\n" + "._180:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._182:\n" + " .align 2, 0\n" + "._181:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gPlayerParty\n" + " .word gTasks\n" + " .word debug_80C4348+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C44EC() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r0, ._183\n" + " ldrb r0, [r0, #0x2]\n" + " lsl r0, r0, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r0, r0, r1\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " str r1, [sp]\n" + " mov r1, #0x10\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r1, ._183 + 4\n" + " ldr r2, ._183 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._183 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._183 + 16\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._183 + 20\n" + " str r1, [r0]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._184:\n" + " .align 2, 0\n" + "._183:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word 0x4000042\n" + " .word 0x79ef\n" + " .word 0x17f\n" + " .word gTasks\n" + " .word debug_80C4550+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4550() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r1, ._187\n" + " ldrh r2, [r1, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " add r3, r1, #0\n" + " cmp r0, #0\n" + " beq ._185 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r0, ._187 + 4\n" + " ldrb r1, [r0, #0x2]\n" + " mov r0, #0x64\n" + " mul r0, r0, r1\n" + " ldr r1, ._187 + 8\n" + " add r0, r0, r1\n" + " ldr r1, ._187 + 12\n" + " bl debug_sub_80A433C\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + " b ._209\n" + "._188:\n" + " .align 2, 0\n" + "._187:\n" + " .word gMain\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gEnemyParty\n" + " .word debug_80C41F4+1\n" + "._185:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._189 @cond_branch\n" + " ldr r0, ._191\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._191 + 4\n" + " str r0, [r1]\n" + " b ._209\n" + "._192:\n" + " .align 2, 0\n" + "._191:\n" + " .word gTasks\n" + " .word debug_80C4F48+1\n" + "._189:\n" + " mov r0, #0x8\n" + " and r0, r0, r2\n" + " lsl r0, r0, #0x10\n" + " lsr r1, r0, #0x10\n" + " cmp r1, #0\n" + " beq ._193 @cond_branch\n" + " bl debug_80C4774\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._209 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " bl CalculatePlayerPartyCount\n" + " bl CalculateEnemyPartyCount\n" + " ldr r0, ._196\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._196 + 4\n" + " str r0, [r1]\n" + " b ._209\n" + "._197:\n" + " .align 2, 0\n" + "._196:\n" + " .word gTasks\n" + " .word debug_80C4D14+1\n" + "._193:\n" + " mov r0, #0x88\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._198 @cond_branch\n" + " str r1, [sp]\n" + " mov r0, #0x0\n" + " mov r1, #0x10\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r0, ._200\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._200 + 4\n" + " str r0, [r1]\n" + " b ._209\n" + "._201:\n" + " .align 2, 0\n" + "._200:\n" + " .word gTasks\n" + " .word debug_80C4348+1\n" + "._198:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._203 @cond_branch\n" + " ldr r1, ._205\n" + " ldrb r0, [r1, #0x2]\n" + " cmp r0, #0\n" + " beq ._203 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1, #0x2]\n" + " b ._204\n" + "._206:\n" + " .align 2, 0\n" + "._205:\n" + " .word unk_debug_ewram_0+0x20\n" + "._203:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._209 @cond_branch\n" + " ldr r5, ._210\n" + " ldrb r0, [r5, #0x2]\n" + " cmp r0, #0x4\n" + " bhi ._209 @cond_branch\n" + " add r1, r0, #0\n" + " mov r0, #0x64\n" + " mul r0, r0, r1\n" + " ldr r1, ._210 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " beq ._209 @cond_branch\n" + " ldrb r0, [r5, #0x2]\n" + " add r0, r0, #0x1\n" + " strb r0, [r5, #0x2]\n" + "._204:\n" + " ldr r1, ._210 + 8\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._210 + 12\n" + " str r1, [r0]\n" + "._209:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._211:\n" + " .align 2, 0\n" + "._210:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gEnemyParty\n" + " .word gTasks\n" + " .word debug_80C44EC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4694() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xffffffe4\n" + " ldr r1, ._213\n" + " mov r0, sp\n" + " mov r2, #0xd\n" + " bl memcpy\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xe\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " mov r0, sp\n" + " mov r1, #0x2\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r4, #0x0\n" + " add r5, sp, #0x10\n" + "._212:\n" + " mov r0, #0x64\n" + " mul r0, r0, r4\n" + " ldr r1, ._213 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r5, #0\n" + " bl debug_80C405C\n" + " lsl r2, r4, #0x19\n" + " mov r0, #0xc0\n" + " lsl r0, r0, #0x12\n" + " add r2, r2, r0\n" + " lsr r2, r2, #0x18\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " bl MenuPrint\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x5\n" + " bls ._212 @cond_branch\n" + " add sp, sp, #0x1c\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._214:\n" + " .align 2, 0\n" + "._213:\n" + " .word gUnknown_Debug_083F81AD\n" + " .word gPlayerParty\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4704() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xffffffe4\n" + " ldr r1, ._216\n" + " mov r0, sp\n" + " mov r2, #0xd\n" + " bl memcpy\n" + " mov r0, #0xf\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " mov r0, sp\n" + " mov r1, #0x11\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r4, #0x0\n" + " add r5, sp, #0x10\n" + "._215:\n" + " mov r0, #0x64\n" + " mul r0, r0, r4\n" + " ldr r1, ._216 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r5, #0\n" + " bl debug_80C405C\n" + " lsl r2, r4, #0x19\n" + " mov r0, #0xc0\n" + " lsl r0, r0, #0x12\n" + " add r2, r2, r0\n" + " lsr r2, r2, #0x18\n" + " add r0, r5, #0\n" + " mov r1, #0x11\n" + " bl MenuPrint\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x5\n" + " bls ._215 @cond_branch\n" + " add sp, sp, #0x1c\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._217:\n" + " .align 2, 0\n" + "._216:\n" + " .word gUnknown_Debug_083F81BA\n" + " .word gEnemyParty\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4774() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._221\n" + " ldrb r0, [r0, #0xc]\n" + " sub r0, r0, #0x1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x64\n" + " add r4, r0, #0\n" + " mul r4, r4, r1\n" + " ldr r0, ._221 + 4\n" + " add r0, r4, r0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " beq ._219 @cond_branch\n" + " ldr r0, ._221 + 8\n" + " add r0, r4, r0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " beq ._219 @cond_branch\n" + " mov r0, #0x1\n" + " b ._220\n" + "._222:\n" + " .align 2, 0\n" + "._221:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gPlayerParty\n" + " .word gEnemyParty\n" + "._219:\n" + " mov r0, #0x0\n" + "._220:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C47BC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xffffffc0\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " ldr r1, ._224\n" + " mov r0, sp\n" + " mov r2, #0xf\n" + " bl memcpy\n" + " add r4, sp, #0x10\n" + " ldr r1, ._224 + 4\n" + " add r0, r4, #0\n" + " mov r2, #0xd\n" + " bl memcpy\n" + " add r6, sp, #0x20\n" + " ldr r1, ._224 + 8\n" + " add r0, r6, #0\n" + " mov r2, #0xf\n" + " bl memcpy\n" + " add r5, sp, #0x30\n" + " ldr r1, ._224 + 12\n" + " add r0, r5, #0\n" + " mov r2, #0x10\n" + " bl memcpy\n" + " mov r0, #0x0\n" + " mov r1, #0x10\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r0, sp\n" + " mov r1, #0x1\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0x14\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xe\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " add r0, r6, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r4, #0x0\n" + " ldr r6, ._224 + 16\n" + "._223:\n" + " lsl r0, r4, #0x3\n" + " add r0, r0, r6\n" + " ldr r0, [r0]\n" + " lsl r2, r4, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r2, r2, r1\n" + " lsr r2, r2, #0x18\n" + " mov r1, #0x2\n" + " bl MenuPrint\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x4\n" + " bls ._223 @cond_branch\n" + " mov r0, #0xf\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " add r0, r5, #0\n" + " mov r1, #0x11\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._224 + 20\n" + " ldrb r0, [r0, #0x4]\n" + " bl debug_80C4C44\n" + " ldr r1, ._224 + 24\n" + " lsl r0, r7, #0x2\n" + " add r0, r0, r7\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._224 + 28\n" + " str r1, [r0]\n" + " add sp, sp, #0x40\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._225:\n" + " .align 2, 0\n" + "._224:\n" + " .word gUnknown_Debug_083F81C7\n" + " .word gUnknown_Debug_083F81A0\n" + " .word gUnknown_Debug_083F81D6\n" + " .word gUnknown_Debug_083F81E5\n" + " .word gUnknown_Debug_083F8068\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gTasks\n" + " .word debug_80C48A0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C48A0() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r0, ._226\n" + " ldrb r0, [r0, #0x3]\n" + " lsl r0, r0, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r0, r0, r1\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " str r1, [sp]\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r1, ._226 + 4\n" + " ldr r2, ._226 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " add r2, r2, #0x8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._226 + 12\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._226 + 16\n" + " str r1, [r0]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._227:\n" + " .align 2, 0\n" + "._226:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word 0x4000042\n" + " .word 0x177\n" + " .word gTasks\n" + " .word debug_80C4900+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4900() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r1, ._230\n" + " ldrh r2, [r1, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " add r3, r1, #0\n" + " cmp r4, #0\n" + " beq ._228 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._230 + 4\n" + " bl SetMainCallback2\n" + " bl LoadPlayerParty\n" + " ldr r1, ._230 + 8\n" + " ldr r0, ._230 + 12\n" + " ldrb r0, [r0, #0xd]\n" + " strb r0, [r1, #0x8]\n" + " ldr r0, ._230 + 16\n" + " mov r1, #0x0\n" + " strh r4, [r0]\n" + " ldr r0, ._230 + 20\n" + " strb r1, [r0]\n" + " ldr r1, ._230 + 24\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._230 + 28\n" + " b ._229\n" + "._231:\n" + " .align 2, 0\n" + "._230:\n" + " .word gMain\n" + " .word debug_80C370C+1\n" + " .word gSaveBlock2\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gBattleTypeFlags\n" + " .word gUnknown_02023A14_50\n" + " .word gTasks\n" + " .word debug_80C373C+1\n" + "._228:\n" + " mov r0, #0x8\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._232 @cond_branch\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._233 @cond_branch\n" + "._232:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._236\n" + " ldr r3, ._236 + 4\n" + " ldr r2, ._236 + 8\n" + " ldrb r0, [r2, #0x3]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r3\n" + " ldrb r0, [r0, #0x4]\n" + " strh r0, [r1]\n" + " ldr r1, ._236 + 12\n" + " mov r0, #0x8\n" + " strb r0, [r1]\n" + " ldrb r0, [r2, #0x3]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r3\n" + " ldrb r0, [r0, #0x5]\n" + " strb r0, [r2, #0xc]\n" + " ldrb r0, [r2, #0x3]\n" + " sub r0, r0, #0x1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bhi ._234 @cond_branch\n" + " str r4, [sp]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r0, ._236 + 16\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._236 + 20\n" + " str r0, [r1]\n" + " b ._247\n" + "._237:\n" + " .align 2, 0\n" + "._236:\n" + " .word gBattleTypeFlags\n" + " .word gUnknown_Debug_083F8068\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_02023A14_50\n" + " .word gTasks\n" + " .word debug_80C4A60+1\n" + "._234:\n" + " ldr r0, ._239\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._239 + 4\n" + " str r0, [r1]\n" + " b ._247\n" + "._240:\n" + " .align 2, 0\n" + "._239:\n" + " .word gTasks\n" + " .word debug_80C4F48+1\n" + "._233:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._242 @cond_branch\n" + " ldr r1, ._244\n" + " ldrb r0, [r1, #0x3]\n" + " cmp r0, #0\n" + " beq ._242 @cond_branch\n" + " sub r0, r0, #0x1\n" + " b ._243\n" + "._245:\n" + " .align 2, 0\n" + "._244:\n" + " .word unk_debug_ewram_0+0x20\n" + "._242:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._247 @cond_branch\n" + " ldr r1, ._248\n" + " ldrb r0, [r1, #0x3]\n" + " cmp r0, #0x1\n" + " bhi ._247 @cond_branch\n" + " add r0, r0, #0x1\n" + "._243:\n" + " strb r0, [r1, #0x3]\n" + " ldr r1, ._248 + 4\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._248 + 8\n" + "._229:\n" + " str r1, [r0]\n" + "._247:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._249:\n" + " .align 2, 0\n" + "._248:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gTasks\n" + " .word debug_80C48A0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4A60() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r0, ._250\n" + " ldrb r0, [r0, #0x5]\n" + " lsl r0, r0, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r0, r0, r1\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " str r1, [sp]\n" + " mov r1, #0x10\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r1, ._250 + 4\n" + " ldr r2, ._250 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._250 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._250 + 16\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._250 + 20\n" + " str r1, [r0]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._251:\n" + " .align 2, 0\n" + "._250:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word 0x4000042\n" + " .word 0x79ef\n" + " .word 0x17f\n" + " .word gTasks\n" + " .word debug_80C4AC4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4AC4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " ldr r7, ._255\n" + " ldrb r0, [r7, #0x4]\n" + " mov ip, r0\n" + " ldrb r5, [r7, #0x5]\n" + " mov r1, ip\n" + " add r0, r1, r5\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " ldr r2, ._255 + 4\n" + " mov r8, r2\n" + " ldrh r2, [r2, #0x2e]\n" + " mov r3, #0x1\n" + " and r3, r3, r2\n" + " add r4, r7, #0\n" + " cmp r3, #0\n" + " beq ._252 @cond_branch\n" + " ldr r0, ._255 + 8\n" + " lsl r1, r1, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r1, [r1]\n" + " ldr r3, ._255 + 12\n" + " ldr r2, [r3]\n" + " add r0, r2, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._253 @cond_branch\n" + " ldr r0, ._255 + 16\n" + " eor r1, r1, r0\n" + " and r2, r2, r1\n" + " b ._254\n" + "._256:\n" + " .align 2, 0\n" + "._255:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gMain\n" + " .word gUnknown_Debug_083F80D8\n" + " .word byte_3005E30\n" + " .word 0xffff\n" + "._253:\n" + " orr r2, r2, r1\n" + "._254:\n" + " str r2, [r3]\n" + " ldrb r0, [r4, #0x4]\n" + " bl debug_80C4C44\n" + " ldr r1, ._258\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._258 + 4\n" + " str r1, [r0]\n" + " b ._274\n" + "._259:\n" + " .align 2, 0\n" + "._258:\n" + " .word gTasks\n" + " .word debug_80C4A60+1\n" + "._252:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " cmp r4, #0\n" + " beq ._260 @cond_branch\n" + " str r3, [sp]\n" + " mov r0, #0x0\n" + " mov r1, #0x10\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r0, ._262\n" + " lsl r1, r6, #0x2\n" + " add r1, r1, r6\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._262 + 4\n" + " b ._261\n" + "._263:\n" + " .align 2, 0\n" + "._262:\n" + " .word gTasks\n" + " .word debug_80C48A0+1\n" + "._260:\n" + " mov r0, #0x8\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._264 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._266\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x3\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._266 + 4\n" + " ldrb r2, [r1, #0x1]\n" + " mov r0, #0x11\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " strb r0, [r1, #0x1]\n" + " mov r0, #0xac\n" + " strb r0, [r1, #0x2]\n" + " mov r0, #0xff\n" + " strb r0, [r1, #0x3]\n" + " strb r4, [r1, #0x9]\n" + " strb r4, [r1, #0xa]\n" + " strb r4, [r1, #0xb]\n" + " strb r4, [r1, #0xc]\n" + " ldr r1, ._266 + 8\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._266 + 12\n" + " str r1, [r0]\n" + " b ._274\n" + "._267:\n" + " .align 2, 0\n" + "._266:\n" + " .word gTrainerBattleOpponent\n" + " .word +0x2017000\n" + " .word gTasks\n" + " .word debug_80C4F48+1\n" + "._264:\n" + " mov r0, r8\n" + " ldrh r1, [r0, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._268 @cond_branch\n" + " lsl r0, r5, #0x18\n" + " cmp r0, #0\n" + " beq ._269 @cond_branch\n" + " sub r0, r5, #1\n" + " strb r0, [r7, #0x5]\n" + " b ._277\n" + "._269:\n" + " mov r1, ip\n" + " lsl r0, r1, #0x18\n" + " cmp r0, #0\n" + " beq ._277 @cond_branch\n" + " mov r0, ip\n" + " sub r0, r0, #0x1\n" + " b ._272\n" + "._268:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._274 @cond_branch\n" + " lsl r0, r5, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x8\n" + " bhi ._274 @cond_branch\n" + " cmp r0, #0x4\n" + " bhi ._275 @cond_branch\n" + " add r0, r5, #1\n" + " strb r0, [r7, #0x5]\n" + " b ._277\n" + "._275:\n" + " mov r2, ip\n" + " lsl r0, r2, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x3\n" + " bhi ._277 @cond_branch\n" + " mov r0, ip\n" + " add r0, r0, #0x1\n" + "._272:\n" + " strb r0, [r7, #0x4]\n" + " ldrb r0, [r7, #0x4]\n" + " bl debug_80C4C44\n" + "._277:\n" + " ldr r0, ._278\n" + " lsl r1, r6, #0x2\n" + " add r1, r1, r6\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._278 + 4\n" + "._261:\n" + " str r0, [r1]\n" + "._274:\n" + " add sp, sp, #0x4\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._279:\n" + " .align 2, 0\n" + "._278:\n" + " .word gTasks\n" + " .word debug_80C4A60+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4C44() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffff0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov sl, r0\n" + " mov r2, #0x0\n" + " mov r5, sp\n" + "._290:\n" + " mov r0, sl\n" + " add r6, r2, r0\n" + " add r4, r6, #0\n" + " add r1, r2, #1\n" + " mov r8, r1\n" + " cmp r4, #0x9\n" + " bgt ._280 @cond_branch\n" + " mov r3, #0x0\n" + " ldr r1, ._288\n" + " lsl r0, r4, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " ldrb r0, [r0]\n" + " ldr r7, ._288 + 4\n" + " mov r9, r7\n" + " lsl r2, r2, #0x1\n" + " mov ip, r2\n" + " cmp r0, #0xff\n" + " beq ._282 @cond_branch\n" + " add r7, r1, #0\n" + "._283:\n" + " add r0, r3, #3\n" + " mov r1, sp\n" + " add r2, r1, r0\n" + " lsl r1, r6, #0x3\n" + " add r1, r1, r7\n" + " ldr r0, [r1]\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " strb r0, [r2]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " ldr r0, [r1]\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._282 @cond_branch\n" + " cmp r3, #0xb\n" + " bls ._283 @cond_branch\n" + "._282:\n" + " cmp r3, #0xb\n" + " bhi ._284 @cond_branch\n" + " mov r1, #0x0\n" + "._285:\n" + " add r0, r3, #3\n" + " add r0, r0, sp\n" + " strb r1, [r0]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " cmp r3, #0xb\n" + " bls ._285 @cond_branch\n" + "._284:\n" + " mov r0, #0xff\n" + " strb r0, [r5, #0xe]\n" + " mov r0, #0xfc\n" + " strb r0, [r5]\n" + " mov r2, #0x1\n" + " strb r2, [r5, #0x1]\n" + " add r1, r2, #0\n" + " LSL r1, r4\n" + " mov r3, r9\n" + " ldr r0, [r3]\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._286 @cond_branch\n" + " mov r0, #0x3\n" + " strb r0, [r5, #0x2]\n" + " b ._287\n" + "._289:\n" + " .align 2, 0\n" + "._288:\n" + " .word gUnknown_Debug_083F80D8\n" + " .word byte_3005E30\n" + "._286:\n" + " strb r2, [r5, #0x2]\n" + "._287:\n" + " mov r2, ip\n" + " add r2, r2, #0x3\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r0, sp\n" + " mov r1, #0x11\n" + " bl MenuPrint\n" + "._280:\n" + " mov r7, r8\n" + " lsl r0, r7, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x5\n" + " bls ._290 @cond_branch\n" + " add sp, sp, #0x10\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4D14() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xffffffd0\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r1, ._291\n" + " mov r0, sp\n" + " mov r2, #0xf\n" + " bl memcpy\n" + " add r5, sp, #0x10\n" + " ldr r1, ._291 + 4\n" + " add r0, r5, #0\n" + " mov r2, #0xd\n" + " bl memcpy\n" + " add r6, sp, #0x20\n" + " ldr r1, ._291 + 8\n" + " add r0, r6, #0\n" + " mov r2, #0xf\n" + " bl memcpy\n" + " mov r0, #0x0\n" + " mov r1, #0x10\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r0, sp\n" + " mov r1, #0x1\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " add r0, r5, #0\n" + " mov r1, #0x14\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xe\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " add r0, r6, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._291 + 12\n" + " ldrb r0, [r0, #0x6]\n" + " bl debug_80C4F00\n" + " mov r0, #0xf\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r1, ._291 + 16\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._291 + 20\n" + " str r1, [r0]\n" + " add sp, sp, #0x30\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._292:\n" + " .align 2, 0\n" + "._291:\n" + " .word gUnknown_Debug_083F81C7\n" + " .word gUnknown_Debug_083F81F5\n" + " .word gUnknown_Debug_083F8202\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gTasks\n" + " .word debug_80C4DB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4DB8() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r0, ._293\n" + " ldrb r0, [r0, #0x7]\n" + " lsl r0, r0, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r0, r0, r1\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " str r1, [sp]\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r1, ._293 + 4\n" + " ldr r2, ._293 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " add r2, r2, #0x8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._293 + 12\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._293 + 16\n" + " str r1, [r0]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._294:\n" + " .align 2, 0\n" + "._293:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word 0x4000042\n" + " .word 0x177\n" + " .word gTasks\n" + " .word debug_80C4E18+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4E18() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r5, ._297\n" + " ldrb r3, [r5, #0x6]\n" + " ldrb r2, [r5, #0x7]\n" + " add r0, r3, r2\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " ldr r7, ._297 + 4\n" + " ldrh r1, [r7, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._295 @cond_branch\n" + " ldr r0, ._297 + 8\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._297 + 12\n" + " b ._296\n" + "._298:\n" + " .align 2, 0\n" + "._297:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gMain\n" + " .word gTasks\n" + " .word debug_80C42B8+1\n" + "._295:\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._299 @cond_branch\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._300 @cond_branch\n" + "._299:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r2, ._302\n" + " ldr r1, ._302 + 4\n" + " lsl r0, r6, #0x3\n" + " add r0, r0, r1\n" + " ldrb r0, [r0, #0x4]\n" + " strb r0, [r2]\n" + " ldr r1, ._302 + 8\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._302 + 12\n" + " str r1, [r0]\n" + " b ._310\n" + "._303:\n" + " .align 2, 0\n" + "._302:\n" + " .word gBattleTerrain\n" + " .word gUnknown_Debug_083F814C\n" + " .word gTasks\n" + " .word debug_80C5158+1\n" + "._300:\n" + " ldrh r1, [r7, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._304 @cond_branch\n" + " lsl r0, r2, #0x18\n" + " cmp r0, #0\n" + " beq ._305 @cond_branch\n" + " sub r0, r2, #1\n" + " strb r0, [r5, #0x7]\n" + " b ._313\n" + "._305:\n" + " lsl r0, r3, #0x18\n" + " cmp r0, #0\n" + " beq ._313 @cond_branch\n" + " sub r0, r3, #1\n" + " b ._308\n" + "._304:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._310 @cond_branch\n" + " lsl r0, r2, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x7\n" + " bhi ._310 @cond_branch\n" + " cmp r0, #0x4\n" + " bhi ._311 @cond_branch\n" + " add r0, r2, #1\n" + " strb r0, [r5, #0x7]\n" + " b ._313\n" + "._311:\n" + " lsl r0, r3, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x2\n" + " bhi ._313 @cond_branch\n" + " add r0, r3, #1\n" + "._308:\n" + " strb r0, [r5, #0x6]\n" + " ldrb r0, [r5, #0x6]\n" + " bl debug_80C4F00\n" + "._313:\n" + " ldr r0, ._314\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._314 + 4\n" + "._296:\n" + " str r0, [r1]\n" + "._310:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._315:\n" + " .align 2, 0\n" + "._314:\n" + " .word gTasks\n" + " .word debug_80C4DB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4F00() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " mov r0, #0x1\n" + " mov r1, #0x3\n" + " mov r2, #0xd\n" + " mov r3, #0xe\n" + " bl MenuFillWindowRectWithBlankTile\n" + " mov r4, #0x0\n" + " ldr r6, ._318\n" + "._317:\n" + " cmp r4, #0x8\n" + " bhi ._316 @cond_branch\n" + " add r0, r4, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r6\n" + " ldr r0, [r0]\n" + " lsl r2, r4, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r2, r2, r1\n" + " lsr r2, r2, #0x18\n" + " mov r1, #0x2\n" + " bl MenuPrint\n" + "._316:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x5\n" + " bls ._317 @cond_branch\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._319:\n" + " .align 2, 0\n" + "._318:\n" + " .word gUnknown_Debug_083F814C\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C4F48() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6}\n" + " add sp, sp, #0xffffffc4\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r1, ._320\n" + " mov r0, sp\n" + " mov r2, #0x11\n" + " bl memcpy\n" + " add r6, sp, #0x14\n" + " ldr r1, ._320 + 4\n" + " add r0, r6, #0\n" + " mov r2, #0xd\n" + " bl memcpy\n" + " add r5, sp, #0x24\n" + " ldr r1, ._320 + 8\n" + " add r0, r5, #0\n" + " mov r2, #0xd\n" + " bl memcpy\n" + " add r0, sp, #0x34\n" + " mov r9, r0\n" + " ldr r1, ._320 + 12\n" + " mov r2, #0x4\n" + " bl memcpy\n" + " add r0, sp, #0x38\n" + " mov r8, r0\n" + " ldr r1, ._320 + 16\n" + " mov r2, #0x4\n" + " bl memcpy\n" + " mov r0, #0x0\n" + " mov r1, #0x10\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r0, sp\n" + " mov r1, #0x1\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " add r0, r6, #0\n" + " mov r1, #0x14\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xe\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r0, #0x1\n" + " mov r1, #0x3\n" + " mov r2, #0xd\n" + " mov r3, #0xe\n" + " bl MenuFillWindowRectWithBlankTile\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r0, r9\n" + " mov r1, #0x2\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " mov r0, r8\n" + " mov r1, #0x2\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0xf\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r1, ._320 + 20\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._320 + 24\n" + " str r1, [r0]\n" + " add sp, sp, #0x3c\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._321:\n" + " .align 2, 0\n" + "._320:\n" + " .word gUnknown_Debug_083F8211\n" + " .word gUnknown_Debug_083F81A0\n" + " .word gUnknown_Debug_083F8222\n" + " .word gUnknown_Debug_083F822F\n" + " .word gUnknown_Debug_083F8233\n" + " .word gTasks\n" + " .word debug_80C5038+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5038() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r0, ._322\n" + " ldrb r0, [r0, #0x8]\n" + " lsl r0, r0, #0x19\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x12\n" + " add r0, r0, r1\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " str r1, [sp]\n" + " mov r2, #0x1\n" + " mov r3, #0xe\n" + " bl debug_80C38E4\n" + " ldr r1, ._322 + 4\n" + " ldr r2, ._322 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " add r2, r2, #0x8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._322 + 12\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._322 + 16\n" + " str r1, [r0]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._323:\n" + " .align 2, 0\n" + "._322:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word 0x4000042\n" + " .word 0x177\n" + " .word gTasks\n" + " .word debug_80C5098+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5098() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r1, ._326\n" + " ldrh r2, [r1, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " add r3, r1, #0\n" + " cmp r0, #0\n" + " beq ._324 @cond_branch\n" + " ldr r0, ._326 + 4\n" + " lsl r1, r4, #0x2\n" + " add r1, r1, r4\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._326 + 8\n" + " str r0, [r1]\n" + " b ._339\n" + "._327:\n" + " .align 2, 0\n" + "._326:\n" + " .word gMain\n" + " .word gTasks\n" + " .word debug_80C47BC+1\n" + "._324:\n" + " mov r0, #0x8\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._328 @cond_branch\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._329 @cond_branch\n" + "._328:\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._331\n" + " ldr r0, ._331 + 4\n" + " ldrb r0, [r0, #0x8]\n" + " strb r0, [r1, #0x8]\n" + " ldr r1, ._331 + 8\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._331 + 12\n" + " b ._330\n" + "._332:\n" + " .align 2, 0\n" + "._331:\n" + " .word gSaveBlock2\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gTasks\n" + " .word debug_80C42B8+1\n" + "._329:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._334 @cond_branch\n" + " ldr r1, ._336\n" + " ldrb r0, [r1, #0x8]\n" + " cmp r0, #0\n" + " beq ._334 @cond_branch\n" + " sub r0, r0, #0x1\n" + " b ._335\n" + "._337:\n" + " .align 2, 0\n" + "._336:\n" + " .word unk_debug_ewram_0+0x20\n" + "._334:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._339 @cond_branch\n" + " ldr r1, ._340\n" + " ldrb r0, [r1, #0x8]\n" + " cmp r0, #0\n" + " bne ._339 @cond_branch\n" + " add r0, r0, #0x1\n" + "._335:\n" + " strb r0, [r1, #0x8]\n" + " ldr r1, ._340 + 4\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._340 + 8\n" + "._330:\n" + " str r1, [r0]\n" + "._339:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._341:\n" + " .align 2, 0\n" + "._340:\n" + " .word unk_debug_ewram_0+0x20\n" + " .word gTasks\n" + " .word debug_80C5038+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5158() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._342\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r0, ._342 + 4\n" + " str r0, [r1]\n" + " bx lr\n" + "._343:\n" + " .align 2, 0\n" + "._342:\n" + " .word gTasks\n" + " .word debug_80C5174+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5174() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._344\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r0, ._344 + 4\n" + " str r0, [r1]\n" + " bx lr\n" + "._345:\n" + " .align 2, 0\n" + "._344:\n" + " .word gTasks\n" + " .word debug_80C5190+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5190() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._346\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r0, ._346 + 4\n" + " str r0, [r1]\n" + " bx lr\n" + "._347:\n" + " .align 2, 0\n" + "._346:\n" + " .word gTasks\n" + " .word debug_80C51AC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C51AC() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._348\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r0, ._348 + 4\n" + " str r0, [r1]\n" + " bx lr\n" + "._349:\n" + " .align 2, 0\n" + "._348:\n" + " .word gTasks\n" + " .word debug_80C51C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C51C8() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._350\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r0, ._350 + 4\n" + " str r0, [r1]\n" + " bx lr\n" + "._351:\n" + " .align 2, 0\n" + "._350:\n" + " .word gTasks\n" + " .word debug_80C51E4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C51E4() +{ + asm( + " push {lr}\n" + " bl sub_80408BC\n" + " ldr r0, ._352\n" + " ldr r1, ._352 + 4\n" + " str r1, [r0, #0x8]\n" + " ldr r0, ._352 + 8\n" + " bl SetMainCallback2\n" + " pop {r0}\n" + " bx r0\n" + "._353:\n" + " .align 2, 0\n" + "._352:\n" + " .word gMain\n" + " .word debug_80C41A8+1\n" + " .word unref_sub_800D684+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5208() +{ + asm( + " push {r4, r5, r6, lr}\n" + " ldr r1, ._355\n" + " ldr r0, ._355 + 4\n" + " str r0, [r1]\n" + " mov r3, #0x0\n" + " add r6, r1, #0\n" + " ldr r4, ._355 + 8\n" + " add r5, r6, #0\n" + " mov r2, #0x0\n" + "._354:\n" + " ldr r0, [r5]\n" + " lsl r1, r3, #0x2\n" + " add r0, r0, #0x64\n" + " add r0, r0, r1\n" + " str r2, [r0]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r3, r0, #0x10\n" + " cmp r3, #0x3f\n" + " bls ._354 @cond_branch\n" + " ldr r2, [r6]\n" + " mov r0, #0xfc\n" + " str r0, [r2, #0x64]\n" + " ldrb r1, [r4, #0xa]\n" + " ldrb r0, [r4, #0xb]\n" + " lsl r0, r0, #0x8\n" + " orr r1, r1, r0\n" + " ldrb r0, [r4, #0xc]\n" + " lsl r0, r0, #0x10\n" + " orr r1, r1, r0\n" + " ldrb r0, [r4, #0xd]\n" + " lsl r0, r0, #0x18\n" + " orr r1, r1, r0\n" + " str r1, [r2, #0x70]\n" + " bl Random\n" + " add r4, r0, #0\n" + " bl Random\n" + " ldr r1, [r6]\n" + " lsl r4, r4, #0x10\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " orr r4, r4, r0\n" + " str r4, [r1, #0x74]\n" + " mov r0, #0x1\n" + " str r0, [r1, #0x68]\n" + " str r0, [r1, #0x6c]\n" + " bl debug_80C5C94\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._356:\n" + " .align 2, 0\n" + "._355:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word +0x2018000\n" + " .word gSaveBlock2\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C527C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add r6, r0, #0\n" + " mov r5, #0x0\n" + " ldr r7, ._359\n" + "._361:\n" + " mov r0, #0x64\n" + " add r1, r5, #0\n" + " mul r1, r1, r0\n" + " ldr r0, ._359 + 4\n" + " add r4, r1, r0\n" + " add r0, r4, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " cmp r0, #0\n" + " bne ._357 @cond_branch\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " mov r2, #0x64\n" + " bl memcpy\n" + " add r0, r5, #1\n" + " strb r0, [r7]\n" + " mov r0, #0x0\n" + " b ._358\n" + "._360:\n" + " .align 2, 0\n" + "._359:\n" + " .word gPlayerPartyCount\n" + " .word gPlayerParty\n" + "._357:\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x5\n" + " bls ._361 @cond_branch\n" + " ldr r0, ._362\n" + " ldr r0, [r0]\n" + " bl SendMonToPC\n" + " mov r0, #0x1\n" + "._358:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._363:\n" + " .align 2, 0\n" + "._362:\n" + " .word unk_debug_ewram_0+0x30\n" + "\n" + ); +} + +__attribute__((naked)) +void InitCreatePokemon() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xffffffd4\n" + " ldr r1, ._364\n" + " add r0, sp, #0x4\n" + " mov r2, #0x25\n" + " bl memcpy\n" + " bl debug_80C35DC\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r4, #0x0\n" + " str r4, [sp]\n" + " mov r1, #0x0\n" + " mov r2, #0x10\n" + " mov r3, #0x0\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._364 + 4\n" + " mov r5, #0x0\n" + " strh r4, [r0]\n" + " add r0, r0, #0x2\n" + " strh r4, [r0]\n" + " add r0, r0, #0x2\n" + " strh r4, [r0]\n" + " ldr r3, ._364 + 8\n" + " ldrh r2, [r3]\n" + " strh r4, [r3]\n" + " ldr r4, ._364 + 12\n" + " ldrh r0, [r4]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " strh r0, [r4]\n" + " strh r2, [r3]\n" + " ldr r2, ._364 + 16\n" + " ldrh r0, [r2]\n" + " mov r1, #0x8\n" + " orr r0, r0, r1\n" + " strh r0, [r2]\n" + " ldr r0, ._364 + 20\n" + " bl SetVBlankCallback\n" + " ldr r0, ._364 + 24\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x3\n" + " bl MenuDrawTextWindow\n" + " add r0, sp, #0x4\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " mov r1, #0x80\n" + " lsl r1, r1, #0x13\n" + " mov r2, #0x8a\n" + " lsl r2, r2, #0x5\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, ._364 + 28\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " bl debug_80C5208\n" + " ldr r1, ._364 + 32\n" + " ldr r0, [r1]\n" + " mov r2, #0xb4\n" + " lsl r2, r2, #0x1\n" + " add r0, r0, r2\n" + " strb r5, [r0]\n" + " ldr r0, [r1]\n" + " ldr r1, ._364 + 36\n" + " add r0, r0, r1\n" + " strb r5, [r0]\n" + " add sp, sp, #0x2c\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._365:\n" + " .align 2, 0\n" + "._364:\n" + " .word gUnknown_Debug_083F8733\n" + " .word 0x4000050\n" + " .word 0x4000208\n" + " .word 0x4000200\n" + " .word 0x4000004\n" + " .word debug_80C3758+1\n" + " .word debug_80C370C+1\n" + " .word debug_80C53A4+1\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C53A4() +{ + asm( + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._366\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r0, ._366 + 4\n" + " str r0, [r1]\n" + " bx lr\n" + "._367:\n" + " .align 2, 0\n" + "._366:\n" + " .word gTasks\n" + " .word debug_80C53C0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C53C0() +{ + asm( + " push {r4, lr}\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl debug_80C6384\n" + " mov r0, #0x0\n" + " bl debug_80C627C\n" + " ldr r1, ._368\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._368 + 4\n" + " str r1, [r0]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._369:\n" + " .align 2, 0\n" + "._368:\n" + " .word gTasks\n" + " .word debug_80C53F0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C53F0() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r0, ._372\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r2, #0x1\n" + " and r2, r2, r1\n" + " add r4, r0, #0\n" + " cmp r2, #0\n" + " beq ._370 @cond_branch\n" + " ldr r0, ._372 + 4\n" + " ldr r3, [r0]\n" + " mov r0, #0xb2\n" + " lsl r0, r0, #0x1\n" + " add r2, r3, r0\n" + " ldr r1, ._372 + 8\n" + " mov r4, #0xb4\n" + " lsl r4, r4, #0x1\n" + " add r0, r3, r4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r6, ._372 + 12\n" + " add r1, r3, r6\n" + " ldrb r1, [r1]\n" + " ldr r0, [r0]\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " lsl r1, r1, #0x2\n" + " add r0, r3, #0\n" + " add r0, r0, #0x64\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " str r0, [r2]\n" + " mov r0, #0xb5\n" + " lsl r0, r0, #0x1\n" + " add r1, r3, r0\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " bl debug_80C643C\n" + " ldr r1, ._372 + 16\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._372 + 20\n" + " b ._375\n" + "._373:\n" + " .align 2, 0\n" + "._372:\n" + " .word gMain\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_083F8698\n" + " .word 0x169\n" + " .word gTasks\n" + " .word debug_80C55E4+1\n" + "._370:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._374 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " str r2, [sp]\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._376\n" + " bl SetMainCallback2\n" + " ldr r1, ._376 + 4\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._376 + 8\n" + " b ._375\n" + "._377:\n" + " .align 2, 0\n" + "._376:\n" + " .word debug_80C370C+1\n" + " .word gTasks\n" + " .word debug_80C373C+1\n" + "._374:\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._378 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " bl debug_80C5FFC\n" + " ldr r0, ._381\n" + " ldr r0, [r0]\n" + " bl debug_80C527C\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " mov r0, #0x3\n" + " mov r1, #0x8\n" + " mov r2, #0x1a\n" + " mov r3, #0xb\n" + " bl MenuDrawTextWindow\n" + " cmp r4, #0\n" + " beq ._379 @cond_branch\n" + " ldr r0, ._381 + 4\n" + " mov r1, #0x4\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " b ._380\n" + "._382:\n" + " .align 2, 0\n" + "._381:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_083F872A\n" + "._379:\n" + " ldr r0, ._384\n" + " mov r1, #0x4\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + "._380:\n" + " ldr r0, ._384 + 4\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._384 + 8\n" + " str r0, [r1]\n" + " b ._400\n" + "._385:\n" + " .align 2, 0\n" + "._384:\n" + " .word gUnknown_Debug_083F8720\n" + " .word gTasks\n" + " .word debug_80C5708+1\n" + "._378:\n" + " mov r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._386 @cond_branch\n" + " ldr r0, ._388\n" + " ldr r0, [r0]\n" + " ldr r4, [r0, #0x64]\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " bl GetNationalPokedexFlag\n" + " add r0, r4, #0\n" + " mov r1, #0x3\n" + " bl GetNationalPokedexFlag\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " b ._400\n" + "._389:\n" + " .align 2, 0\n" + "._388:\n" + " .word unk_debug_ewram_0+0x30\n" + "._386:\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._390 @cond_branch\n" + " mov r0, #0x2\n" + " bl debug_80C627C\n" + " b ._400\n" + "._390:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r3, r0, #0x10\n" + " cmp r3, #0\n" + " beq ._392 @cond_branch\n" + " mov r0, #0x1\n" + " bl debug_80C627C\n" + " b ._400\n" + "._392:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._395 @cond_branch\n" + " ldr r2, ._397\n" + " ldr r0, [r2]\n" + " mov r6, #0xb4\n" + " lsl r6, r6, #0x1\n" + " add r1, r0, r6\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._395 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r0, [r2]\n" + " ldr r1, ._397 + 4\n" + " add r0, r0, r1\n" + " strb r3, [r0]\n" + " b ._396\n" + "._398:\n" + " .align 2, 0\n" + "._397:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + "._395:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._400 @cond_branch\n" + " ldr r3, ._401\n" + " ldr r0, [r3]\n" + " mov r4, #0xb4\n" + " lsl r4, r4, #0x1\n" + " add r2, r0, r4\n" + " ldrb r0, [r2]\n" + " cmp r0, #0x4\n" + " bhi ._400 @cond_branch\n" + " add r0, r0, #0x1\n" + " mov r1, #0x0\n" + " strb r0, [r2]\n" + " ldr r0, [r3]\n" + " ldr r6, ._401 + 4\n" + " add r0, r0, r6\n" + " strb r1, [r0]\n" + "._396:\n" + " ldr r1, ._401 + 8\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._401 + 12\n" + "._375:\n" + " str r1, [r0]\n" + "._400:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._402:\n" + " .align 2, 0\n" + "._401:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + " .word gTasks\n" + " .word debug_80C53C0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C55E4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " add r6, r3, #0\n" + " ldr r1, ._405\n" + " ldr r2, ._405 + 4\n" + " ldr r0, [r2]\n" + " mov ip, r0\n" + " mov r0, #0xb4\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, ip\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._405 + 8\n" + " add r1, r1, ip\n" + " ldrb r1, [r1]\n" + " ldr r0, [r0]\n" + " add r0, r0, r1\n" + " ldrb r5, [r0]\n" + " add r7, r5, #0\n" + " ldr r1, ._405 + 12\n" + " ldrh r4, [r1, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r4\n" + " mov r8, r2\n" + " add r2, r1, #0\n" + " cmp r0, #0\n" + " beq ._403 @cond_branch\n" + " ldr r0, ._405 + 16\n" + " lsl r1, r3, #0x2\n" + " add r1, r1, r3\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._405 + 20\n" + " str r0, [r1]\n" + " b ._422\n" + "._406:\n" + " .align 2, 0\n" + "._405:\n" + " .word gUnknown_Debug_083F8698\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + " .word gMain\n" + " .word gTasks\n" + " .word debug_80C53C0+1\n" + "._403:\n" + " mov r0, #0x2\n" + " and r0, r0, r4\n" + " cmp r0, #0\n" + " beq ._407 @cond_branch\n" + " lsl r1, r5, #0x2\n" + " mov r0, ip\n" + " add r0, r0, #0x64\n" + " add r0, r0, r1\n" + " mov r1, #0xb2\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, ip\n" + " ldr r1, [r1]\n" + " str r1, [r0]\n" + " ldr r1, ._409\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._409 + 4\n" + " str r1, [r0]\n" + " b ._422\n" + "._410:\n" + " .align 2, 0\n" + "._409:\n" + " .word gTasks\n" + " .word debug_80C53C0+1\n" + "._407:\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._411 @cond_branch\n" + " mov r0, #0x1\n" + " b ._412\n" + "._411:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._413 @cond_branch\n" + " mov r0, #0x2\n" + "._412:\n" + " bl debug_80C6544\n" + " bl debug_80C643C\n" + " b ._422\n" + "._413:\n" + " ldr r0, ._419\n" + " lsl r1, r7, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r1, [r1]\n" + " ldrb r0, [r1, #0x9]\n" + " cmp r0, #0xff\n" + " beq ._422 @cond_branch\n" + " mov r0, #0x20\n" + " and r0, r0, r4\n" + " cmp r0, #0\n" + " beq ._417 @cond_branch\n" + " mov r0, #0xb5\n" + " lsl r0, r0, #0x1\n" + " add ip, ip, r0\n" + " mov r0, ip\n" + " ldrb r3, [r0]\n" + " ldrb r0, [r1, #0x9]\n" + " sub r0, r0, #0x1\n" + " cmp r3, r0\n" + " bge ._417 @cond_branch\n" + " add r0, r3, #1\n" + " mov r1, ip\n" + " strb r0, [r1]\n" + " bl debug_80C643C\n" + " b ._422\n" + "._420:\n" + " .align 2, 0\n" + "._419:\n" + " .word gUnknown_Debug_083F8554\n" + "._417:\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._422 @cond_branch\n" + " mov r2, r8\n" + " ldr r0, [r2]\n" + " mov r2, #0xb5\n" + " lsl r2, r2, #0x1\n" + " add r1, r0, r2\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._422 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " bl debug_80C643C\n" + "._422:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5708() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " ldr r0, ._424\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._423 @cond_branch\n" + " ldr r0, ._424 + 4\n" + " lsl r1, r2, #0x2\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._424 + 8\n" + " str r0, [r1]\n" + "._423:\n" + " pop {r0}\n" + " bx r0\n" + "._425:\n" + " .align 2, 0\n" + "._424:\n" + " .word gMain\n" + " .word gTasks\n" + " .word debug_80C53C0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5738() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add r6, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r4, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r8, r2\n" + " cmp r4, #0xfe\n" + " bne ._426 @cond_branch\n" + " ldr r1, ._428\n" + " mov r2, #0x7\n" + " bl debug_80C689C\n" + " add r0, r6, #7\n" + " ldr r7, ._428 + 4\n" + " ldr r1, [r7]\n" + " add r1, r1, #0xf0\n" + " ldr r1, [r1]\n" + " mov r2, #0x3\n" + " mov r3, #0x1\n" + " bl debug_80C6678\n" + " mov r4, #0x0\n" + " strb r4, [r6, #0x13]\n" + " strb r4, [r6, #0x14]\n" + " add r0, r6, #0\n" + " add r0, r0, #0x15\n" + " ldr r1, ._428 + 8\n" + " mov r2, #0x7\n" + " bl debug_80C689C\n" + " add r0, r6, #0\n" + " add r0, r0, #0x1c\n" + " ldr r1, [r7]\n" + " add r1, r1, #0xf4\n" + " ldr r1, [r1]\n" + " mov r2, #0x3\n" + " mov r3, #0x1\n" + " bl debug_80C6678\n" + " add r0, r6, #0\n" + " add r0, r0, #0x28\n" + " strb r4, [r0]\n" + " add r0, r0, #0x1\n" + " strb r4, [r0]\n" + " add r0, r0, #0x1\n" + " ldr r1, ._428 + 12\n" + " mov r2, #0x9\n" + " bl debug_80C689C\n" + " add r0, r6, #0\n" + " add r0, r0, #0x31\n" + " ldr r1, [r7]\n" + " add r1, r1, #0xf8\n" + "._431:\n" + " ldr r1, [r1]\n" + " mov r2, #0x3\n" + " mov r3, #0x1\n" + " bl debug_80C6678\n" + " b ._517\n" + "._429:\n" + " .align 2, 0\n" + "._428:\n" + " .word gUnknown_Debug_083F850A\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_083F8514\n" + " .word gUnknown_Debug_083F851C\n" + "._426:\n" + " cmp r4, #0xfd\n" + " bne ._430 @cond_branch\n" + " ldr r1, ._432\n" + " add r0, r6, #0\n" + " mov r2, #0x9\n" + " bl debug_80C689C\n" + " add r0, r6, #0\n" + " add r0, r0, #0x9\n" + " ldr r7, ._432 + 4\n" + " ldr r1, [r7]\n" + " add r1, r1, #0xfc\n" + " ldr r1, [r1]\n" + " mov r2, #0x3\n" + " mov r3, #0x1\n" + " bl debug_80C6678\n" + " mov r4, #0x0\n" + " strb r4, [r6, #0x15]\n" + " strb r4, [r6, #0x16]\n" + " add r0, r6, #0\n" + " add r0, r0, #0x17\n" + " ldr r1, ._432 + 8\n" + " mov r2, #0x9\n" + " bl debug_80C689C\n" + " add r0, r6, #0\n" + " add r0, r0, #0x20\n" + " ldr r1, [r7]\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r1, r1, r2\n" + " ldr r1, [r1]\n" + " mov r2, #0x3\n" + " mov r3, #0x1\n" + " bl debug_80C6678\n" + " add r0, r6, #0\n" + " add r0, r0, #0x2c\n" + " strb r4, [r0]\n" + " add r0, r0, #0x1\n" + " strb r4, [r0]\n" + " add r0, r0, #0x1\n" + " ldr r1, ._432 + 12\n" + " mov r2, #0x9\n" + " bl debug_80C689C\n" + " add r0, r6, #0\n" + " add r0, r0, #0x37\n" + " ldr r1, [r7]\n" + " mov r3, #0x82\n" + " lsl r3, r3, #0x1\n" + " add r1, r1, r3\n" + " b ._431\n" + "._433:\n" + " .align 2, 0\n" + "._432:\n" + " .word gUnknown_Debug_083F8524\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_083F852D\n" + " .word gUnknown_Debug_083F8537\n" + "._430:\n" + " mov r1, #0x0\n" + " lsl r5, r4, #0x3\n" + " mov r2, #0x0\n" + "._434:\n" + " add r0, r6, r1\n" + " strb r2, [r0]\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r1, r0, #0x10\n" + " cmp r1, #0xb\n" + " bls ._434 @cond_branch\n" + " ldr r0, ._437\n" + " add r0, r5, r0\n" + " ldr r1, [r0]\n" + " add r0, r6, #0\n" + " mov r2, #0xb\n" + " bl debug_80C689C\n" + " mov r1, #0xc\n" + " mov r2, #0xff\n" + "._435:\n" + " add r0, r6, r1\n" + " strb r2, [r0]\n" + " add r0, r1, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r1, r0, #0x10\n" + " cmp r1, #0xff\n" + " bls ._435 @cond_branch\n" + " ldr r0, ._437\n" + " add r0, r0, #0x4\n" + " add r0, r5, r0\n" + " ldr r0, [r0]\n" + " ldrb r2, [r0, #0x9]\n" + " lsl r0, r2, #0x1a\n" + " lsr r5, r0, #0x18\n" + " cmp r4, #0x22\n" + " bhi ._436 @cond_branch\n" + " lsl r0, r4, #0x2\n" + " ldr r1, ._437 + 4\n" + " add r1, r0, r1\n" + " ldr r1, [r1]\n" + " add r7, r0, #0\n" + " mov pc, r1\n" + "._438:\n" + " .align 2, 0\n" + "._437:\n" + " .word gUnknown_Debug_083F8554\n" + " .word ._439\n" + "._439:\n" + " .word ._440\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._445\n" + " .word ._446\n" + " .word ._450\n" + " .word ._450\n" + " .word ._450\n" + " .word ._450\n" + " .word ._451\n" + " .word ._452\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._472\n" + " .word ._473\n" + " .word ._474\n" + "._436:\n" + " mov r0, #0xff\n" + " strb r0, [r6]\n" + " b ._517\n" + "._440:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r1, ._477\n" + " mov r9, r1\n" + " ldr r1, [r1]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldr r1, [r1]\n" + " mov r3, r8\n" + " bl debug_80C6678\n" + " add r1, r5, r6\n" + " mov r0, #0x0\n" + " strb r0, [r1, #0xa]\n" + " mov r0, #0xfc\n" + " strb r0, [r1, #0xb]\n" + " mov r0, #0x1\n" + " strb r0, [r1, #0xc]\n" + " mov r2, r8\n" + " strb r2, [r1, #0xd]\n" + " add r4, r5, #0\n" + " add r4, r4, #0xe\n" + " add r4, r6, r4\n" + " mov r3, r9\n" + " ldr r0, [r3]\n" + " add r0, r0, #0x64\n" + " add r0, r0, r7\n" + " ldrh r0, [r0]\n" + " bl NationalPokedexNumToSpecies\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r1, #0xb\n" + " mul r1, r1, r0\n" + " ldr r0, ._477 + 4\n" + " add r1, r1, r0\n" + " add r0, r4, #0\n" + " mov r2, #0xa\n" + " bl debug_80C689C\n" + " b ._517\n" + "._478:\n" + " .align 2, 0\n" + "._477:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gSpeciesNames\n" + "._445:\n" + " ldr r0, ._483\n" + " ldr r0, [r0]\n" + " add r0, r0, #0x64\n" + " add r0, r0, r7\n" + " ldr r0, [r0]\n" + " cmp r0, #0x1\n" + " beq ._479 @cond_branch\n" + " cmp r0, #0x1\n" + " bcc ._480 @cond_branch\n" + " cmp r0, #0x2\n" + " beq ._481 @cond_branch\n" + " b ._517\n" + "._484:\n" + " .align 2, 0\n" + "._483:\n" + " .word unk_debug_ewram_0+0x30\n" + "._480:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r1, ._486\n" + " b ._488\n" + "._487:\n" + " .align 2, 0\n" + "._486:\n" + " .word gUnknown_Debug_083F8546\n" + "._479:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r1, ._489\n" + " b ._488\n" + "._490:\n" + " .align 2, 0\n" + "._489:\n" + " .word gUnknown_Debug_083F8541\n" + "._481:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r1, ._492\n" + "._488:\n" + " mov r2, #0x2\n" + " bl debug_80C689C\n" + " b ._517\n" + "._493:\n" + " .align 2, 0\n" + "._492:\n" + " .word gUnknown_Debug_083F8544\n" + "._450:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r4, ._495\n" + " ldr r1, [r4]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldr r1, [r1]\n" + " mov r3, r8\n" + " bl debug_80C6678\n" + " add r1, r5, r6\n" + " mov r0, #0x0\n" + " strb r0, [r1, #0xa]\n" + " mov r0, #0xfc\n" + " strb r0, [r1, #0xb]\n" + " mov r0, #0x1\n" + " strb r0, [r1, #0xc]\n" + " mov r0, r8\n" + " strb r0, [r1, #0xd]\n" + " add r0, r5, #0\n" + " add r0, r0, #0xe\n" + " add r0, r6, r0\n" + " ldr r1, [r4]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldr r2, [r1]\n" + " mov r1, #0xd\n" + " mul r1, r1, r2\n" + " ldr r2, ._495 + 4\n" + " add r1, r1, r2\n" + " b ._494\n" + "._496:\n" + " .align 2, 0\n" + "._495:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gMoveNames\n" + "._451:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r4, ._499\n" + " ldr r1, [r4]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldr r1, [r1]\n" + " mov r3, r8\n" + " bl debug_80C6678\n" + " add r1, r5, r6\n" + " mov r0, #0x0\n" + " strb r0, [r1, #0xa]\n" + " mov r0, #0xfc\n" + " strb r0, [r1, #0xb]\n" + " mov r0, #0x1\n" + " strb r0, [r1, #0xc]\n" + " mov r2, r8\n" + " strb r2, [r1, #0xd]\n" + " ldr r0, [r4]\n" + " add r0, r0, #0x64\n" + " add r0, r0, r7\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._497 @cond_branch\n" + " add r4, r5, #0\n" + " add r4, r4, #0xe\n" + " add r4, r6, r4\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl ItemId_GetItem\n" + " add r1, r0, #0\n" + " add r0, r4, #0\n" + " b ._498\n" + "._500:\n" + " .align 2, 0\n" + "._499:\n" + " .word unk_debug_ewram_0+0x30\n" + "._497:\n" + " add r0, r5, #0\n" + " add r0, r0, #0xe\n" + " add r0, r6, r0\n" + " ldr r1, ._502\n" + "._498:\n" + " mov r2, #0x9\n" + " bl debug_80C689C\n" + " b ._517\n" + "._503:\n" + " .align 2, 0\n" + "._502:\n" + " .word gUnknown_Debug_083F8541\n" + "._452:\n" + " add r6, r6, #0xc\n" + " ldr r4, ._505\n" + " ldr r0, [r4]\n" + " ldr r0, [r0, #0x64]\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl NationalPokedexNumToSpecies\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " ldr r1, [r4]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldrb r1, [r1]\n" + " bl GetAbilityBySpecies\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0xd\n" + " mul r1, r1, r0\n" + " ldr r0, ._505 + 4\n" + " add r1, r1, r0\n" + " add r0, r6, #0\n" + "._494:\n" + " mov r2, #0xc\n" + " bl debug_80C689C\n" + " b ._517\n" + "._506:\n" + " .align 2, 0\n" + "._505:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gAbilityNames\n" + "._474:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r2, ._508\n" + " ldr r1, ._508 + 4\n" + " ldr r1, [r1]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldr r1, [r1]\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r1, [r1]\n" + " b ._514\n" + "._509:\n" + " .align 2, 0\n" + "._508:\n" + " .word gUnknown_Debug_083F86E8\n" + " .word unk_debug_ewram_0+0x30\n" + "._472:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xc\n" + " ldr r1, ._511\n" + " ldr r1, [r1]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldr r1, [r1]\n" + " mov r3, r8\n" + " bl debug_80C6678\n" + " b ._517\n" + "._512:\n" + " .align 2, 0\n" + "._511:\n" + " .word unk_debug_ewram_0+0x30\n" + "._473:\n" + " ldr r0, ._515\n" + " ldr r0, [r0]\n" + " add r0, r0, #0x64\n" + " add r0, r0, r7\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._513 @cond_branch\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r1, ._515 + 4\n" + " b ._514\n" + "._516:\n" + " .align 2, 0\n" + "._515:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_083F854A\n" + "._513:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r1, ._518\n" + "._514:\n" + " mov r2, #0x4\n" + " bl debug_80C689C\n" + " b ._517\n" + "._519:\n" + " .align 2, 0\n" + "._518:\n" + " .word gUnknown_Debug_083F854D\n" + "._446:\n" + " add r0, r6, #0\n" + " add r0, r0, #0xa\n" + " ldr r2, ._520\n" + " ldr r1, ._520 + 4\n" + " ldr r1, [r1]\n" + " add r1, r1, #0x64\n" + " add r1, r1, r7\n" + " ldr r1, [r1]\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r2\n" + " ldr r1, [r1]\n" + " mov r2, #0x5\n" + " bl debug_80C689C\n" + "._517:\n" + " mov r0, #0x0\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._521:\n" + " .align 2, 0\n" + "._520:\n" + " .word gNatureNames\n" + " .word unk_debug_ewram_0+0x30\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5B60() +{ + asm( + " lsl r0, r0, #0x18\n" + " ldr r1, ._522\n" + " ldr r1, [r1]\n" + " lsr r0, r0, #0x16\n" + " add r1, r1, #0x64\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " bx lr\n" + "._523:\n" + " .align 2, 0\n" + "._522:\n" + " .word unk_debug_ewram_0+0x30\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5B74() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r2, r1, #0x18\n" + " cmp r2, #0x18\n" + " bhi ._540 @cond_branch\n" + " lsl r0, r2, #0x2\n" + " ldr r1, ._526\n" + " add r1, r0, r1\n" + " ldr r1, [r1]\n" + " add r3, r0, #0\n" + " mov pc, r1\n" + "._527:\n" + " .align 2, 0\n" + "._526:\n" + " .word ._525\n" + "._525:\n" + " .word ._532\n" + " .word ._529\n" + " .word ._530\n" + " .word ._532\n" + " .word ._532\n" + " .word ._540\n" + " .word ._540\n" + " .word ._540\n" + " .word ._540\n" + " .word ._540\n" + " .word ._540\n" + " .word ._540\n" + " .word ._540\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + " .word ._552\n" + "._540:\n" + " ldr r0, ._554\n" + " ldr r0, [r0]\n" + " lsl r1, r2, #0x2\n" + " add r0, r0, #0x64\n" + " add r0, r0, r1\n" + " str r6, [r0]\n" + " b ._562\n" + "._555:\n" + " .align 2, 0\n" + "._554:\n" + " .word unk_debug_ewram_0+0x30\n" + "._532:\n" + " ldr r0, ._557\n" + " ldr r0, [r0]\n" + " add r0, r0, #0x64\n" + " add r0, r0, r3\n" + " str r6, [r0]\n" + " bl debug_80C5C94\n" + " b ._562\n" + "._558:\n" + " .align 2, 0\n" + "._557:\n" + " .word unk_debug_ewram_0+0x30\n" + "._529:\n" + " ldr r4, ._560\n" + " ldr r1, [r4]\n" + " add r0, r1, #0\n" + " add r0, r0, #0x64\n" + " add r0, r0, r3\n" + " str r6, [r0]\n" + " ldr r0, [r1, #0x64]\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl NationalPokedexNumToSpecies\n" + " ldr r5, [r4]\n" + " ldr r4, ._560 + 4\n" + " lsl r2, r6, #0x2\n" + " ldr r3, ._560 + 8\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " lsl r1, r0, #0x3\n" + " sub r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r3\n" + " ldrb r1, [r1, #0x13]\n" + " mov r0, #0xca\n" + " lsl r0, r0, #0x1\n" + " mul r0, r0, r1\n" + " add r2, r2, r0\n" + " add r2, r2, r4\n" + " ldr r0, [r2]\n" + " str r0, [r5, #0x6c]\n" + " bl debug_80C5C94\n" + " b ._562\n" + "._561:\n" + " .align 2, 0\n" + "._560:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gExperienceTables\n" + " .word gBaseStats\n" + "._530:\n" + " ldr r0, ._563\n" + " ldr r0, [r0]\n" + " add r0, r0, #0x64\n" + " add r0, r0, r3\n" + " str r6, [r0]\n" + " bl debug_80C5DEC\n" + " b ._562\n" + "._564:\n" + " .align 2, 0\n" + "._563:\n" + " .word unk_debug_ewram_0+0x30\n" + "._552:\n" + " ldr r0, ._565\n" + " ldr r0, [r0]\n" + " add r0, r0, #0x64\n" + " add r0, r0, r3\n" + " str r6, [r0]\n" + " bl debug_80C5EF4\n" + "._562:\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._566:\n" + " .align 2, 0\n" + "._565:\n" + " .word unk_debug_ewram_0+0x30\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5C94() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffff0\n" + " ldr r6, ._567\n" + " ldr r2, [r6]\n" + " add r0, r2, #0\n" + " add r0, r0, #0x98\n" + " ldr r4, [r0]\n" + " mov r1, #0x1f\n" + " and r4, r4, r1\n" + " add r0, r0, #0x8\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xa8\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0xa\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xb0\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0xf\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xb8\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x14\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xc0\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x19\n" + " orr r4, r4, r0\n" + " ldr r0, [r2, #0x64]\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl NationalPokedexNumToSpecies\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " ldr r0, [r6]\n" + " ldr r2, [r0, #0x68]\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " mov r5, #0x1\n" + " str r5, [sp]\n" + " ldr r3, [r0, #0x74]\n" + " str r3, [sp, #0x4]\n" + " str r5, [sp, #0x8]\n" + " ldr r3, [r0, #0x70]\n" + " str r3, [sp, #0xc]\n" + " add r3, r4, #0\n" + " bl CreateMon\n" + " ldr r0, [r6]\n" + " bl GetMonGender\n" + " ldr r1, [r6]\n" + " add r0, r0, #0x2\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " str r0, [r1, #0x78]\n" + " add r0, r1, #0\n" + " bl GetNature\n" + " ldr r1, [r6]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " str r0, [r1, #0x7c]\n" + " add r0, r1, #0\n" + " mov r1, #0xd\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x80\n" + " str r2, [r1]\n" + " mov r1, #0xe\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x84\n" + " str r2, [r1]\n" + " mov r1, #0xf\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x88\n" + " str r2, [r1]\n" + " mov r1, #0x10\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x8c\n" + " str r2, [r1]\n" + " mov r1, #0x19\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " ldr r0, [r6]\n" + " str r1, [r0, #0x6c]\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf0\n" + " str r2, [r1]\n" + " mov r1, #0x3b\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf4\n" + " str r2, [r1]\n" + " mov r1, #0x3c\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf8\n" + " str r2, [r1]\n" + " mov r1, #0x3d\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xfc\n" + " str r2, [r1]\n" + " mov r1, #0x3e\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r6]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x1\n" + " add r1, r0, r3\n" + " str r2, [r1]\n" + " mov r1, #0x3f\n" + " bl GetMonData\n" + " ldr r1, [r6]\n" + " mov r2, #0x82\n" + " lsl r2, r2, #0x1\n" + " add r1, r1, r2\n" + " str r0, [r1]\n" + " add sp, sp, #0x10\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._568:\n" + " .align 2, 0\n" + "._567:\n" + " .word unk_debug_ewram_0+0x30\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5DEC() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " ldr r4, ._569\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x6c\n" + " mov r1, #0x19\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " mov r1, #0xd\n" + " mov r2, sp\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " mov r1, #0xe\n" + " mov r2, sp\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " mov r1, #0xf\n" + " mov r2, sp\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " mov r1, #0x10\n" + " mov r2, sp\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " bl CalculateMonStats\n" + " ldr r0, [r4]\n" + " bl GiveMonInitialMoveset\n" + " ldr r0, [r4]\n" + " mov r1, #0x38\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " ldr r0, [r4]\n" + " str r1, [r0, #0x68]\n" + " mov r1, #0xd\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x80\n" + " str r2, [r1]\n" + " mov r1, #0xe\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x84\n" + " str r2, [r1]\n" + " mov r1, #0xf\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x88\n" + " str r2, [r1]\n" + " mov r1, #0x10\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0x8c\n" + " str r2, [r1]\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf0\n" + " str r2, [r1]\n" + " mov r1, #0x3b\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf4\n" + " str r2, [r1]\n" + " mov r1, #0x3c\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf8\n" + " str r2, [r1]\n" + " mov r1, #0x3d\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xfc\n" + " str r2, [r1]\n" + " mov r1, #0x3e\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x1\n" + " add r1, r0, r3\n" + " str r2, [r1]\n" + " mov r1, #0x3f\n" + " bl GetMonData\n" + " ldr r1, [r4]\n" + " mov r2, #0x82\n" + " lsl r2, r2, #0x1\n" + " add r1, r1, r2\n" + " str r0, [r1]\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._570:\n" + " .align 2, 0\n" + "._569:\n" + " .word unk_debug_ewram_0+0x30\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5EF4() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._571\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x98\n" + " mov r1, #0x27\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x9c\n" + " mov r1, #0x1a\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xa0\n" + " mov r1, #0x28\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xa4\n" + " mov r1, #0x1b\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xa8\n" + " mov r1, #0x29\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xac\n" + " mov r1, #0x1c\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xb0\n" + " mov r1, #0x2a\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xb4\n" + " mov r1, #0x1d\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xb8\n" + " mov r1, #0x2b\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xbc\n" + " mov r1, #0x1e\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xc0\n" + " mov r1, #0x2c\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xc4\n" + " mov r1, #0x1f\n" + " bl SetMonData\n" + " ldr r0, [r4]\n" + " bl CalculateMonStats\n" + " ldr r0, [r4]\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf0\n" + " str r2, [r1]\n" + " mov r1, #0x3b\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf4\n" + " str r2, [r1]\n" + " mov r1, #0x3c\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xf8\n" + " str r2, [r1]\n" + " mov r1, #0x3d\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xfc\n" + " str r2, [r1]\n" + " mov r1, #0x3e\n" + " bl GetMonData\n" + " add r2, r0, #0\n" + " ldr r0, [r4]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x1\n" + " add r1, r0, r3\n" + " str r2, [r1]\n" + " mov r1, #0x3f\n" + " bl GetMonData\n" + " ldr r1, [r4]\n" + " mov r2, #0x82\n" + " lsl r2, r2, #0x1\n" + " add r1, r1, r2\n" + " str r0, [r1]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._572:\n" + " .align 2, 0\n" + "._571:\n" + " .word unk_debug_ewram_0+0x30\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C5FFC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xffffffe0\n" + " ldr r1, ._578\n" + " add r0, sp, #0x10\n" + " mov r2, #0x4\n" + " bl memcpy\n" + " add r7, sp, #0x14\n" + " ldr r1, ._578 + 4\n" + " add r0, r7, #0\n" + " mov r2, #0x8\n" + " bl memcpy\n" + " ldr r5, ._578 + 8\n" + " ldr r2, [r5]\n" + " add r0, r2, #0\n" + " add r0, r0, #0x98\n" + " ldr r4, [r0]\n" + " mov r1, #0x1f\n" + " and r4, r4, r1\n" + " add r0, r0, #0x8\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xa8\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0xa\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xb0\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0xf\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xb8\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x14\n" + " orr r4, r4, r0\n" + " add r0, r2, #0\n" + " add r0, r0, #0xc0\n" + " ldr r0, [r0]\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x19\n" + " orr r4, r4, r0\n" + " ldr r0, [r2, #0x64]\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl NationalPokedexNumToSpecies\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " ldr r0, [r5]\n" + " ldr r2, [r0, #0x68]\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " mov r6, #0x1\n" + " str r6, [sp]\n" + " ldr r3, [r0, #0x74]\n" + " str r3, [sp, #0x4]\n" + " str r6, [sp, #0x8]\n" + " ldr r3, [r0, #0x70]\n" + " str r3, [sp, #0xc]\n" + " add r3, r4, #0\n" + " bl CreateMon\n" + " ldr r2, [r5]\n" + " add r0, r2, #0\n" + " add r0, r0, #0x80\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._573 @cond_branch\n" + " lsl r1, r0, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r2, #0\n" + " mov r2, #0x0\n" + " bl SetMonMoveSlot\n" + "._573:\n" + " ldr r2, [r5]\n" + " add r0, r2, #0\n" + " add r0, r0, #0x84\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._574 @cond_branch\n" + " lsl r1, r0, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r2, #0\n" + " mov r2, #0x1\n" + " bl SetMonMoveSlot\n" + "._574:\n" + " ldr r2, [r5]\n" + " add r0, r2, #0\n" + " add r0, r0, #0x88\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._575 @cond_branch\n" + " lsl r1, r0, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r2, #0\n" + " mov r2, #0x2\n" + " bl SetMonMoveSlot\n" + "._575:\n" + " ldr r2, [r5]\n" + " add r0, r2, #0\n" + " add r0, r0, #0x8c\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._576 @cond_branch\n" + " lsl r1, r0, #0x10\n" + " lsr r1, r1, #0x10\n" + " add r0, r2, #0\n" + " mov r2, #0x3\n" + " bl SetMonMoveSlot\n" + "._576:\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x6c\n" + " mov r1, #0x19\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x98\n" + " mov r1, #0x27\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x9c\n" + " mov r1, #0x1a\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xa0\n" + " mov r1, #0x28\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xa4\n" + " mov r1, #0x1b\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xa8\n" + " mov r1, #0x29\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xac\n" + " mov r1, #0x1c\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xb0\n" + " mov r1, #0x2a\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xb4\n" + " mov r1, #0x1d\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xb8\n" + " mov r1, #0x2b\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xbc\n" + " mov r1, #0x1e\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xc0\n" + " mov r1, #0x2c\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xc4\n" + " mov r1, #0x1f\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xc8\n" + " mov r1, #0x16\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xcc\n" + " mov r1, #0x17\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xd0\n" + " mov r1, #0x18\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xd4\n" + " mov r1, #0x21\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xd8\n" + " mov r1, #0x2f\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xdc\n" + " mov r1, #0x30\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xe0\n" + " mov r1, #0x20\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xe4\n" + " mov r1, #0x22\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x90\n" + " mov r1, #0xc\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0x94\n" + " mov r1, #0x2e\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r1, r0, #0\n" + " add r1, r1, #0xec\n" + " ldr r2, [r1]\n" + " lsl r2, r2, #0x3\n" + " ldr r1, ._578 + 12\n" + " add r2, r2, r1\n" + " mov r1, #0x37\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " add r2, r0, #0\n" + " add r2, r2, #0xe8\n" + " mov r1, #0x2d\n" + " bl SetMonData\n" + " ldr r1, [r5]\n" + " add r0, r1, #0\n" + " add r0, r0, #0xe8\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._577 @cond_branch\n" + " add r0, r1, #0\n" + " mov r1, #0x2\n" + " add r2, sp, #0x10\n" + " bl SetMonData\n" + " add r2, sp, #0x1c\n" + " strb r6, [r2]\n" + " ldr r0, [r5]\n" + " mov r1, #0x3\n" + " bl SetMonData\n" + "._577:\n" + " ldr r0, [r5]\n" + " mov r1, #0x7\n" + " add r2, r7, #0\n" + " bl SetMonData\n" + " mov r2, sp\n" + " add r2, r2, #0x1e\n" + " mov r0, #0xff\n" + " strh r0, [r2]\n" + " ldr r0, [r5]\n" + " mov r1, #0x23\n" + " bl SetMonData\n" + " ldr r0, [r5]\n" + " bl CalculateMonStats\n" + " add sp, sp, #0x20\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._579:\n" + " .align 2, 0\n" + "._578:\n" + " .word gUnknown_Debug_083F8758\n" + " .word gUnknown_Debug_083F875C\n" + " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_083F86E8+0x4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C627C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffff8\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " add r6, r4, #0\n" + " ldr r1, ._584\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " bl memcpy\n" + " add r5, sp, #0x4\n" + " ldr r1, ._584 + 4\n" + " add r0, r5, #0\n" + " mov r2, #0x2\n" + " bl memcpy\n" + " cmp r4, #0x1\n" + " beq ._580 @cond_branch\n" + " cmp r4, #0x1\n" + " bgt ._581 @cond_branch\n" + " cmp r4, #0\n" + " beq ._582 @cond_branch\n" + " b ._595\n" + "._585:\n" + " .align 2, 0\n" + "._584:\n" + " .word gUnknown_Debug_083F7FD4\n" + " .word gUnknown_Debug_083F8764\n" + "._581:\n" + " cmp r6, #0x2\n" + " beq ._586 @cond_branch\n" + " b ._595\n" + "._582:\n" + " ldr r0, ._589\n" + " ldr r0, [r0]\n" + " ldr r1, ._589 + 4\n" + " add r0, r0, r1\n" + " b ._588\n" + "._590:\n" + " .align 2, 0\n" + "._589:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + "._580:\n" + " ldr r4, ._593\n" + " ldr r3, [r4]\n" + " ldr r1, ._593 + 4\n" + " add r0, r3, r1\n" + " ldrb r2, [r0]\n" + " ldr r1, ._593 + 8\n" + " mov r6, #0xb4\n" + " lsl r6, r6, #0x1\n" + " add r0, r3, r6\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldrb r0, [r0, #0x4]\n" + " sub r0, r0, #0x1\n" + " cmp r2, r0\n" + " bge ._595 @cond_branch\n" + " lsl r2, r2, #0x19\n" + " mov r0, #0xa0\n" + " lsl r0, r0, #0x13\n" + " add r2, r2, r0\n" + " lsr r2, r2, #0x18\n" + " add r0, r5, #0\n" + " mov r1, #0x1\n" + " bl MenuPrint\n" + " ldr r0, [r4]\n" + " ldr r2, ._593 + 4\n" + " add r1, r0, r2\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r0, [r4]\n" + " add r0, r0, r2\n" + "._588:\n" + " ldrb r2, [r0]\n" + " lsl r2, r2, #0x19\n" + " mov r6, #0xa0\n" + " lsl r6, r6, #0x13\n" + " add r2, r2, r6\n" + " lsr r2, r2, #0x18\n" + " mov r0, sp\n" + " mov r1, #0x1\n" + " bl MenuPrint\n" + " b ._595\n" + "._594:\n" + " .align 2, 0\n" + "._593:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + " .word gUnknown_Debug_083F8698\n" + "._586:\n" + " ldr r4, ._596\n" + " ldr r0, [r4]\n" + " ldr r2, ._596 + 4\n" + " add r1, r0, r2\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._595 @cond_branch\n" + " add r2, r0, #0\n" + " lsl r2, r2, #0x19\n" + " mov r6, #0xa0\n" + " lsl r6, r6, #0x13\n" + " add r2, r2, r6\n" + " lsr r2, r2, #0x18\n" + " add r0, r5, #0\n" + " mov r1, #0x1\n" + " bl MenuPrint\n" + " ldr r0, [r4]\n" + " ldr r2, ._596 + 4\n" + " add r1, r0, r2\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r0, [r4]\n" + " add r0, r0, r2\n" + " ldrb r2, [r0]\n" + " lsl r2, r2, #0x19\n" + " add r2, r2, r6\n" + " lsr r2, r2, #0x18\n" + " mov r0, sp\n" + " mov r1, #0x1\n" + " bl MenuPrint\n" + "._595:\n" + " add sp, sp, #0x8\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._597:\n" + " .align 2, 0\n" + "._596:\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6384() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " mov r0, #0x0\n" + " mov r1, #0x4\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r5, #0x0\n" + " ldr r3, ._600\n" + " ldr r1, ._600 + 4\n" + " ldr r0, [r1]\n" + " mov r2, #0xb4\n" + " lsl r2, r2, #0x1\n" + " add r0, r0, r2\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r3\n" + " ldr r0, [r0]\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._598 @cond_branch\n" + " add r4, r1, #0\n" + " ldr r0, ._600 + 8\n" + " mov r9, r0\n" + " mov r8, r3\n" + " add r7, r2, #0\n" + " mov r6, #0x1\n" + "._599:\n" + " ldr r0, [r4]\n" + " add r0, r0, r9\n" + " mov r1, #0xfc\n" + " strb r1, [r0]\n" + " ldr r0, [r4]\n" + " add r1, r1, #0x70\n" + " add r0, r0, r1\n" + " strb r6, [r0]\n" + " ldr r0, [r4]\n" + " ldr r2, ._600 + 12\n" + " add r0, r0, r2\n" + " strb r6, [r0]\n" + " ldr r1, [r4]\n" + " add r2, r2, #0x1\n" + " add r0, r1, r2\n" + " add r1, r1, r7\n" + " ldrb r1, [r1]\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r8\n" + " ldr r1, [r1]\n" + " add r1, r1, r5\n" + " ldrb r1, [r1]\n" + " mov r2, #0x1\n" + " bl debug_80C5738\n" + " ldr r0, [r4]\n" + " add r0, r0, r9\n" + " lsl r2, r5, #0x19\n" + " mov r1, #0xa0\n" + " lsl r1, r1, #0x13\n" + " add r2, r2, r1\n" + " lsr r2, r2, #0x18\n" + " mov r1, #0x2\n" + " bl MenuPrint\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " ldr r0, [r4]\n" + " add r0, r0, r7\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r8\n" + " ldr r0, [r0]\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " bne ._599 @cond_branch\n" + "._598:\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._601:\n" + " .align 2, 0\n" + "._600:\n" + " .word gUnknown_Debug_083F8698\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x16b\n" + " .word 0x16d\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C643C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " mov r0, #0x2\n" + " mov r1, #0x5\n" + " mov r2, #0x1c\n" + " mov r3, #0x12\n" + " bl MenuFillWindowRectWithBlankTile\n" + " mov r5, #0x0\n" + " ldr r6, ._605\n" + " ldr r1, ._605 + 4\n" + " ldr r0, [r1]\n" + " mov r3, #0xb4\n" + " lsl r3, r3, #0x1\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r6\n" + " ldr r0, [r0]\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " beq ._602 @cond_branch\n" + " add r4, r1, #0\n" + " mov r0, #0x1\n" + " mov r8, r0\n" + "._607:\n" + " ldr r0, [r4]\n" + " ldr r7, ._605 + 8\n" + " add r2, r0, r7\n" + " mov r0, #0xfc\n" + " strb r0, [r2]\n" + " ldr r0, [r4]\n" + " mov r2, #0xb6\n" + " lsl r2, r2, #0x1\n" + " add r0, r0, r2\n" + " mov r7, r8\n" + " strb r7, [r0]\n" + " ldr r2, [r4]\n" + " ldr r7, ._605 + 12\n" + " add r0, r2, r7\n" + " ldrb r0, [r0]\n" + " cmp r5, r0\n" + " bne ._603 @cond_branch\n" + " ldr r0, ._605 + 16\n" + " add r2, r2, r0\n" + " mov r0, #0x2\n" + " strb r0, [r2]\n" + " ldr r1, [r1]\n" + " mov r2, #0xb7\n" + " lsl r2, r2, #0x1\n" + " add r0, r1, r2\n" + " add r1, r1, r3\n" + " ldrb r1, [r1]\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r6\n" + " ldr r1, [r1]\n" + " add r1, r1, r5\n" + " ldrb r1, [r1]\n" + " mov r2, #0x2\n" + " bl debug_80C5738\n" + " b ._604\n" + "._606:\n" + " .align 2, 0\n" + "._605:\n" + " .word gUnknown_Debug_083F8698\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x16b\n" + " .word 0x169\n" + " .word 0x16d\n" + "._603:\n" + " ldr r3, ._608\n" + " add r0, r2, r3\n" + " mov r7, r8\n" + " strb r7, [r0]\n" + " ldr r1, [r1]\n" + " mov r2, #0xb7\n" + " lsl r2, r2, #0x1\n" + " add r0, r1, r2\n" + " ldr r2, ._608 + 4\n" + " sub r3, r3, #0x5\n" + " add r1, r1, r3\n" + " ldrb r1, [r1]\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldr r1, [r1]\n" + " add r1, r1, r5\n" + " ldrb r1, [r1]\n" + " mov r2, #0x1\n" + " bl debug_80C5738\n" + "._604:\n" + " ldr r0, [r4]\n" + " ldr r7, ._608 + 8\n" + " add r0, r0, r7\n" + " lsl r2, r5, #0x19\n" + " mov r1, #0xa0\n" + " lsl r1, r1, #0x13\n" + " add r2, r2, r1\n" + " lsr r2, r2, #0x18\n" + " mov r1, #0x2\n" + " bl MenuPrint\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " ldr r6, ._608 + 4\n" + " add r1, r4, #0\n" + " ldr r0, [r4]\n" + " mov r3, #0xb4\n" + " lsl r3, r3, #0x1\n" + " add r0, r0, r3\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r6\n" + " ldr r0, [r0]\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " bne ._607 @cond_branch\n" + "._602:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._609:\n" + " .align 2, 0\n" + "._608:\n" + " .word 0x16d\n" + " .word gUnknown_Debug_083F8698\n" + " .word 0x16b\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6544() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r9, r0\n" + " ldr r0, ._614\n" + " mov r8, r0\n" + " ldr r6, ._614 + 4\n" + " ldr r1, [r6]\n" + " mov r5, #0xb4\n" + " lsl r5, r5, #0x1\n" + " add r0, r1, r5\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r8\n" + " ldr r4, ._614 + 8\n" + " add r1, r1, r4\n" + " ldrb r1, [r1]\n" + " ldr r0, [r0]\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " bl debug_80C5B60\n" + " add r7, r0, #0\n" + " ldr r2, ._614 + 12\n" + " ldr r3, [r6]\n" + " add r5, r3, r5\n" + " ldrb r0, [r5]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r8\n" + " add r4, r3, r4\n" + " ldrb r1, [r4]\n" + " ldr r0, [r0]\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r2, r2, #0x4\n" + " add r0, r0, r2\n" + " ldr r1, [r0]\n" + " ldr r5, [r1]\n" + " ldr r4, [r1, #0x4]\n" + " ldr r2, ._614 + 16\n" + " mov r6, #0xb5\n" + " lsl r6, r6, #0x1\n" + " add r0, r3, r6\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldr r3, [r0]\n" + " ldrb r0, [r1, #0x8]\n" + " cmp r0, #0\n" + " bne ._623 @cond_branch\n" + " mov r0, r9\n" + " cmp r0, #0x1\n" + " beq ._611 @cond_branch\n" + " cmp r0, #0x2\n" + " beq ._612 @cond_branch\n" + " b ._623\n" + "._615:\n" + " .align 2, 0\n" + "._614:\n" + " .word gUnknown_Debug_083F8698\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + " .word gUnknown_Debug_083F8554\n" + " .word gUnknown_Debug_083F8768\n" + "._611:\n" + " sub r0, r4, r3\n" + " cmp r7, r0\n" + " bcs ._616 @cond_branch\n" + " add r7, r7, r3\n" + " b ._623\n" + "._616:\n" + " cmp r7, r4\n" + " bcc ._622 @cond_branch\n" + " b ._619\n" + "._612:\n" + " add r0, r5, r3\n" + " cmp r7, r0\n" + " bls ._620 @cond_branch\n" + " sub r7, r7, r3\n" + " b ._623\n" + "._620:\n" + " cmp r7, r5\n" + " bls ._622 @cond_branch\n" + "._619:\n" + " add r7, r5, #0\n" + " b ._623\n" + "._622:\n" + " add r7, r4, #0\n" + "._623:\n" + " ldr r1, ._624\n" + " ldr r0, ._624 + 4\n" + " ldr r2, [r0]\n" + " mov r3, #0xb4\n" + " lsl r3, r3, #0x1\n" + " add r0, r2, r3\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r6, ._624 + 8\n" + " add r1, r2, r6\n" + " ldrb r1, [r1]\n" + " ldr r0, [r0]\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " add r0, r7, #0\n" + " bl debug_80C5B74\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._625:\n" + " .align 2, 0\n" + "._624:\n" + " .word gUnknown_Debug_083F8698\n" + " .word unk_debug_ewram_0+0x30\n" + " .word 0x169\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6630() +{ + asm( + " push {r4, r5, lr}\n" + " add r4, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0xfc\n" + " strb r0, [r4]\n" + " add r4, r4, #0x1\n" + " mov r0, #0x1\n" + " strb r0, [r4]\n" + " add r4, r4, #0x1\n" + " cmp r2, #0x2\n" + " bne ._626 @cond_branch\n" + " ldr r0, ._629\n" + " ldr r0, [r0]\n" + " mov r5, #0xb5\n" + " lsl r5, r5, #0x1\n" + " add r0, r0, r5\n" + " ldrb r0, [r0]\n" + " cmp r3, r0\n" + " beq ._627 @cond_branch\n" + " strb r2, [r4]\n" + " b ._628\n" + "._630:\n" + " .align 2, 0\n" + "._629:\n" + " .word unk_debug_ewram_0+0x30\n" + "._627:\n" + " mov r0, #0x4\n" + "._626:\n" + " strb r0, [r4]\n" + "._628:\n" + " add r0, r1, #0\n" + " add r0, r0, #0xa1\n" + " strb r0, [r4, #0x1]\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6678() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " mov r9, r0\n" + " add r6, r1, #0\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r8, r3\n" + " mov r7, #0x0\n" + " sub r0, r2, #1\n" + " cmp r0, #0x9\n" + " bhi ._644 @cond_branch\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._633\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._634:\n" + " .align 2, 0\n" + "._633:\n" + " .word ._632\n" + "._632:\n" + " .word ._635\n" + " .word ._636\n" + " .word ._637\n" + " .word ._638\n" + " .word ._639\n" + " .word ._640\n" + " .word ._641\n" + " .word ._642\n" + " .word ._643\n" + " .word ._644\n" + "._644:\n" + " mov r0, r9\n" + " add r4, r0, r7\n" + " ldr r5, ._645\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x9\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._643:\n" + " mov r1, r9\n" + " add r4, r1, r7\n" + " ldr r5, ._645 + 4\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x8\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._642:\n" + " mov r0, r9\n" + " add r4, r0, r7\n" + " ldr r5, ._645 + 8\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x7\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._641:\n" + " mov r1, r9\n" + " add r4, r1, r7\n" + " ldr r5, ._645 + 12\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x6\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._640:\n" + " mov r0, r9\n" + " add r4, r0, r7\n" + " ldr r5, ._645 + 16\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x5\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._639:\n" + " mov r1, r9\n" + " add r4, r1, r7\n" + " ldr r5, ._645 + 20\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x4\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._638:\n" + " mov r0, r9\n" + " add r4, r0, r7\n" + " mov r5, #0xfa\n" + " lsl r5, r5, #0x2\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x3\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._637:\n" + " mov r1, r9\n" + " add r4, r1, r7\n" + " add r0, r6, #0\n" + " mov r1, #0x64\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x2\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " mov r1, #0x64\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._636:\n" + " mov r0, r9\n" + " add r4, r0, r7\n" + " add r0, r6, #0\n" + " mov r1, #0xa\n" + " bl __udivsi3\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " mov r2, r8\n" + " mov r3, #0x1\n" + " bl debug_80C6630\n" + " add r0, r6, #0\n" + " mov r1, #0xa\n" + " bl __umodsi3\n" + " add r6, r0, #0\n" + " add r0, r7, #4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + "._635:\n" + " mov r1, r9\n" + " add r0, r1, r7\n" + " lsl r1, r6, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r2, r8\n" + " mov r3, #0x0\n" + " bl debug_80C6630\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._646:\n" + " .align 2, 0\n" + "._645:\n" + " .word 0x3b9aca00\n" + " .word 0x5f5e100\n" + " .word 0x989680\n" + " .word 0xf4240\n" + " .word 0x186a0\n" + " .word 0x2710\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C689C() +{ + asm( + " push {r4, r5, lr}\n" + " add r5, r0, #0\n" + " add r4, r1, #0\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r3, #0x0\n" + " ldrb r0, [r4]\n" + " b ._647\n" + "._649:\n" + " add r1, r5, r3\n" + " add r0, r4, r3\n" + " ldrb r0, [r0]\n" + " strb r0, [r1]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " add r0, r4, r3\n" + " ldrb r0, [r0]\n" + "._647:\n" + " cmp r0, #0xff\n" + " beq ._648 @cond_branch\n" + " cmp r3, r2\n" + " bcc ._649 @cond_branch\n" + "._648:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C68CC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffff8\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " lsl r1, r1, #0x18\n" + " lsr r6, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " lsr r5, r2, #0x18\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r2, #0x0\n" + " mov r1, #0x0\n" + "._650:\n" + " mov r7, sp\n" + " add r0, r7, r2\n" + " strb r1, [r0]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x3\n" + " bls ._650 @cond_branch\n" + " mov r1, sp\n" + " mov r0, #0xff\n" + " strb r0, [r1, #0x4]\n" + " cmp r3, #0x2\n" + " beq ._651 @cond_branch\n" + " cmp r3, #0x2\n" + " bgt ._652 @cond_branch\n" + " cmp r3, #0x1\n" + " beq ._653 @cond_branch\n" + " b ._654\n" + "._652:\n" + " cmp r3, #0x3\n" + " beq ._655 @cond_branch\n" + "._654:\n" + " mov r1, sp\n" + " lsr r0, r4, #0xc\n" + " strb r0, [r1]\n" + "._655:\n" + " mov r1, sp\n" + " mov r0, #0xf0\n" + " lsl r0, r0, #0x4\n" + " and r0, r0, r4\n" + " lsr r0, r0, #0x8\n" + " strb r0, [r1, #0x1]\n" + "._651:\n" + " mov r1, sp\n" + " mov r0, #0xf0\n" + " and r0, r0, r4\n" + " lsr r0, r0, #0x4\n" + " strb r0, [r1, #0x2]\n" + "._653:\n" + " mov r2, sp\n" + " mov r1, #0xf\n" + " add r0, r4, #0\n" + " and r0, r0, r1\n" + " strb r0, [r2, #0x3]\n" + " mov r2, #0x0\n" + "._658:\n" + " mov r0, sp\n" + " add r1, r0, r2\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x9\n" + " bhi ._656 @cond_branch\n" + " add r0, r0, #0xa1\n" + " b ._657\n" + "._656:\n" + " add r0, r0, #0xb1\n" + "._657:\n" + " strb r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x3\n" + " bls ._658 @cond_branch\n" + " mov r0, #0x4\n" + " sub r0, r0, r3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r0, r0, sp\n" + " add r1, r6, #0\n" + " add r2, r5, #0\n" + " bl MenuPrint\n" + " add sp, sp, #0x8\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void InitSeePokemonGraphics() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl debug_80C35DC\n" + " ldr r1, ._659\n" + " ldr r2, ._659 + 4\n" + " ldr r0, ._659 + 8\n" + " str r1, [r0]\n" + " str r2, [r0, #0x4]\n" + " ldr r1, ._659 + 12\n" + " str r1, [r0, #0x8]\n" + " ldr r0, [r0, #0x8]\n" + " ldr r0, ._659 + 16\n" + " mov r1, #0x80\n" + " mov r2, #0x60\n" + " bl LoadPalette\n" + " ldr r1, ._659 + 20\n" + " add r0, sp, #0x4\n" + " strh r1, [r0]\n" + " mov r1, #0x0\n" + " mov r2, #0x2\n" + " bl LoadPalette\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r5, #0x0\n" + " str r5, [sp]\n" + " mov r1, #0x0\n" + " mov r2, #0x10\n" + " mov r3, #0x0\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._659 + 24\n" + " mov r6, #0x0\n" + " strh r5, [r0]\n" + " add r0, r0, #0x4\n" + " strh r5, [r0]\n" + " sub r0, r0, #0x2\n" + " strh r5, [r0]\n" + " add r0, r0, #0x4\n" + " strh r5, [r0]\n" + " ldr r1, ._659 + 28\n" + " mov r0, #0x3f\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " mov r0, #0x1f\n" + " strh r0, [r1]\n" + " add r1, r1, #0x6\n" + " mov r0, #0xf1\n" + " strh r0, [r1]\n" + " ldr r0, ._659 + 32\n" + " strh r5, [r0]\n" + " add r1, r1, #0x4\n" + " mov r0, #0x7\n" + " strh r0, [r1]\n" + " ldr r3, ._659 + 36\n" + " ldrh r2, [r3]\n" + " strh r5, [r3]\n" + " ldr r4, ._659 + 40\n" + " ldrh r0, [r4]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " strh r0, [r4]\n" + " strh r2, [r3]\n" + " ldr r0, ._659 + 44\n" + " bl SetVBlankCallback\n" + " ldr r0, ._659 + 48\n" + " bl SetMainCallback2\n" + " bl sub_809D51C\n" + " ldr r1, ._659 + 52\n" + " ldr r2, ._659 + 56\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r2, ._659 + 60\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " sub r1, r1, #0xa\n" + " mov r2, #0xcd\n" + " lsl r2, r2, #0x6\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, ._659 + 64\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " ldr r1, ._659 + 68\n" + " ldr r0, ._659 + 72\n" + " str r0, [r1]\n" + " ldr r1, ._659 + 76\n" + " strh r1, [r0]\n" + " strb r6, [r0, #0x2]\n" + " strb r6, [r0, #0x3]\n" + " strb r6, [r0, #0x5]\n" + " strb r6, [r0, #0x7]\n" + " strb r6, [r0, #0xa]\n" + " strb r6, [r0, #0x8]\n" + " ldr r4, ._659 + 80\n" + " add r0, r4, #0\n" + " mov r1, #0x6c\n" + " mov r2, #0x74\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " ldr r6, ._659 + 84\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " strh r5, [r0, #0x2e]\n" + " mov r1, #0x0\n" + " bl StartSpriteAnim\n" + " add r0, r4, #0\n" + " mov r1, #0x6c\n" + " mov r2, #0x74\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " mov r1, #0x1\n" + " strh r1, [r0, #0x2e]\n" + " bl StartSpriteAnim\n" + " add r0, r4, #0\n" + " mov r1, #0x6c\n" + " mov r2, #0x74\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " mov r1, #0x2\n" + " strh r1, [r0, #0x2e]\n" + " bl StartSpriteAnim\n" + " add sp, sp, #0x8\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._660:\n" + " .align 2, 0\n" + "._659:\n" + " .word byte_83F88EC\n" + " .word 0x600e000\n" + " .word 0x40000d4\n" + " .word 0x80000400\n" + " .word word_83F888C\n" + " .word 0x7fff\n" + " .word 0x4000040\n" + " .word 0x4000048\n" + " .word 0x4000052\n" + " .word 0x4000208\n" + " .word 0x4000200\n" + " .word debug_80C3758+1\n" + " .word debug_80C370C+1\n" + " .word 0x4000008\n" + " .word 0x1f0b\n" + " .word 0x1e0a\n" + " .word debug_80C6B00+1\n" + " .word unk_debug_ewram_0+0x34\n" + " .word +0x2018000\n" + " .word 0x115\n" + " .word unk_83F8868+0xc\n" + " .word gSprites\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6B00() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xffffffec\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " ldr r1, ._666\n" + " mov r0, sp\n" + " mov r2, #0x12\n" + " bl memcpy\n" + " mov r0, #0xa\n" + " mov r1, #0x0\n" + " mov r2, #0xf\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x9\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x0\n" + " mov r1, #0xa\n" + " mov r2, #0x9\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x10\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._666 + 4\n" + " mov r1, #0x11\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._666 + 8\n" + " mov r1, #0x1b\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._666 + 12\n" + " mov r1, #0x11\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0xa\n" + " mov r1, #0x8\n" + " mov r2, #0x1d\n" + " mov r3, #0xc\n" + " bl MenuDrawTextWindow\n" + " mov r2, #0x0\n" + " ldr r4, ._666 + 16\n" + " ldr r0, ._666 + 20\n" + " add r3, r0, #0\n" + "._661:\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, r4\n" + " add r1, r2, r3\n" + " strh r1, [r0]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0xe\n" + " bls ._661 @cond_branch\n" + " mov r2, #0x0\n" + " ldr r5, ._666 + 24\n" + " lsl r6, r7, #0x2\n" + " mov r8, r6\n" + " ldr r4, ._666 + 28\n" + " ldr r0, ._666 + 32\n" + " add r3, r0, #0\n" + "._662:\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, r4\n" + " add r1, r2, r3\n" + " strh r1, [r0]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0xe\n" + " bls ._662 @cond_branch\n" + " add r0, r5, #0\n" + " mov r1, #0x14\n" + " mov r2, #0xa\n" + " bl MenuPrint\n" + " mov r0, #0xa\n" + " mov r1, #0xd\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r1, sp\n" + " mov r0, #0x23\n" + " strb r0, [r1]\n" + " mov r2, #0x0\n" + " ldr r4, ._666 + 36\n" + " mov r5, #0x93\n" + " lsl r5, r5, #0x8\n" + " add r3, r5, #0\n" + "._663:\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r4\n" + " mov r6, sp\n" + " add r0, r6, r2\n" + " ldrb r0, [r0]\n" + " add r0, r0, r3\n" + " strh r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x11\n" + " bls ._663 @cond_branch\n" + " mov r1, sp\n" + " mov r0, #0x24\n" + " strb r0, [r1]\n" + " mov r2, #0x0\n" + " ldr r5, ._666 + 40\n" + " ldr r4, ._666 + 44\n" + " mov r0, #0x93\n" + " lsl r0, r0, #0x8\n" + " add r3, r0, #0\n" + "._664:\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r4\n" + " mov r6, sp\n" + " add r0, r6, r2\n" + " ldrb r0, [r0]\n" + " add r0, r0, r3\n" + " strh r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x11\n" + " bls ._664 @cond_branch\n" + " mov r1, sp\n" + " mov r0, #0x25\n" + " strb r0, [r1]\n" + " mov r2, #0x0\n" + " ldr r4, ._666 + 48\n" + " mov r0, #0x93\n" + " lsl r0, r0, #0x8\n" + " add r3, r0, #0\n" + "._665:\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r4\n" + " mov r6, sp\n" + " add r0, r6, r2\n" + " ldrb r0, [r0]\n" + " add r0, r0, r3\n" + " strh r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x11\n" + " bls ._665 @cond_branch\n" + " add r0, r5, #0\n" + " mov r1, #0xf\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " ldr r1, ._666 + 52\n" + " ldr r2, ._666 + 56\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r5, ._666 + 60\n" + " add r0, r5, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._666 + 64\n" + " mov r6, r8\n" + " add r0, r6, r7\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._666 + 68\n" + " str r1, [r0]\n" + " add sp, sp, #0x14\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._667:\n" + " .align 2, 0\n" + "._666:\n" + " .word gUnknown_Debug_083F8815\n" + " .word gUnknown_Debug_083F87D0\n" + " .word gUnknown_Debug_083F87D8\n" + " .word gUnknown_Debug_083F87E0\n" + " .word 0x600fa56\n" + " .word 0xa311\n" + " .word gUnknown_Debug_083F87F4\n" + " .word 0x600f256\n" + " .word 0x8301\n" + " .word 0x600f396\n" + " .word gUnknown_Debug_083F8801\n" + " .word 0x600f3d6\n" + " .word 0x600f416\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x699f\n" + " .word gTasks\n" + " .word debug_80C6CB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6CB8() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffff4\n" + " mov sl, r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov sl, r0\n" + " ldr r5, ._668\n" + " ldr r4, [r5]\n" + " ldrh r2, [r4]\n" + " lsl r0, r2, #0x3\n" + " ldr r1, ._668 + 4\n" + " add r0, r0, r1\n" + " ldr r1, ._668 + 8\n" + " lsl r2, r2, #0x2\n" + " add r2, r2, r1\n" + " ldrb r1, [r2]\n" + " ldrb r2, [r2, #0x1]\n" + " ldr r3, ._668 + 12\n" + " mov r8, r3\n" + " ldr r6, [r3]\n" + " str r6, [sp, #0x8]\n" + " ldr r3, [r3, #0x4]\n" + " str r3, [sp]\n" + " ldrh r3, [r4]\n" + " str r3, [sp, #0x4]\n" + " add r3, r6, #0\n" + " bl DecompressPicFromTable_2\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r7, ._668 + 16\n" + " add r0, r0, r7\n" + " bl LoadCompressedObjectPalette\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x1\n" + " bl GetMonSpriteTemplate_803C56C\n" + " ldr r0, ._668 + 20\n" + " mov r1, #0x28\n" + " mov r2, #0x28\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " ldr r1, [r5]\n" + " strb r0, [r1, #0x2]\n" + " ldr r2, [r5]\n" + " ldrb r1, [r2, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._668 + 24\n" + " add r0, r0, r1\n" + " ldr r3, ._668 + 28\n" + " mov r9, r3\n" + " str r3, [r0]\n" + " ldrb r0, [r2, #0x2]\n" + " lsl r1, r0, #0x4\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " ldr r6, ._668 + 32\n" + " add r1, r1, r6\n" + " ldrb r2, [r1, #0x5]\n" + " mov r6, #0xd\n" + " neg r6, r6\n" + " add r0, r6, #0\n" + " and r0, r0, r2\n" + " strb r0, [r1, #0x5]\n" + " ldr r4, [r5]\n" + " ldrh r2, [r4]\n" + " lsl r0, r2, #0x3\n" + " ldr r1, ._668 + 36\n" + " add r0, r0, r1\n" + " ldr r1, ._668 + 40\n" + " lsl r2, r2, #0x2\n" + " add r2, r2, r1\n" + " ldrb r1, [r2]\n" + " ldrb r2, [r2, #0x1]\n" + " mov r7, r8\n" + " ldr r3, [r7, #0x8]\n" + " str r3, [sp]\n" + " ldrh r3, [r4]\n" + " str r3, [sp, #0x4]\n" + " ldr r3, [sp, #0x8]\n" + " bl DecompressPicFromTable_2\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._668 + 16\n" + " add r0, r0, r1\n" + " bl LoadCompressedObjectPalette\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x2\n" + " bl GetMonSpriteTemplate_803C56C\n" + " ldr r0, ._668 + 20\n" + " mov r1, #0x28\n" + " mov r2, #0x78\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " ldr r1, [r5]\n" + " strb r0, [r1, #0x3]\n" + " ldr r2, [r5]\n" + " ldrb r1, [r2, #0x3]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r3, ._668 + 24\n" + " add r0, r0, r3\n" + " mov r7, r9\n" + " str r7, [r0]\n" + " ldrb r1, [r2, #0x3]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._668 + 32\n" + " add r0, r0, r1\n" + " ldrb r1, [r0, #0x5]\n" + " and r6, r6, r1\n" + " strb r6, [r0, #0x5]\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " ldr r1, ._668 + 44\n" + " mov r2, #0x0\n" + " str r2, [sp]\n" + " str r2, [sp, #0x4]\n" + " mov r2, #0x68\n" + " mov r3, #0x2c\n" + " bl CreateMonIcon\n" + " ldr r1, [r5]\n" + " strb r0, [r1, #0x4]\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " bl SpeciesToNationalPokedexNum\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r2, #0xff\n" + " lsl r2, r2, #0x2\n" + " mov r1, #0x2\n" + " bl sub_8091738\n" + " ldr r1, ._668 + 48\n" + " ldr r3, ._668 + 52\n" + " add r0, r3, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r6, ._668 + 56\n" + " add r0, r6, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x3e\n" + " ldr r7, ._668 + 60\n" + " add r0, r7, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r2, ._668 + 64\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x11\n" + " mov r2, #0x3\n" + " bl debug_80C3800\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x1a\n" + " mov r2, #0x5\n" + " bl debug_80C376C\n" + " ldr r2, [r5]\n" + " ldrb r1, [r2, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r3, ._668 + 32\n" + " add r0, r0, r3\n" + " ldrb r0, [r0, #0x5]\n" + " lsr r0, r0, #0x4\n" + " strb r0, [r2, #0x6]\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " ldr r4, ._668 + 68\n" + " add r0, r0, r4\n" + " ldr r6, ._668 + 72\n" + " add r1, r4, r6\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r4\n" + " ldr r1, ._668 + 76\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r1, ._668 + 80\n" + " mov r7, sl\n" + " lsl r0, r7, #0x2\n" + " add r0, r0, sl\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._668 + 84\n" + " str r1, [r0]\n" + " ldr r0, [r5]\n" + " mov r1, #0x0\n" + " strb r1, [r0, #0x9]\n" + " bl StopCryAndClearCrySongs\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x0\n" + " bl PlayCry1\n" + " add sp, sp, #0xc\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._669:\n" + " .align 2, 0\n" + "._668:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gMonFrontPicTable\n" + " .word gMonFrontPicCoords\n" + " .word gUnknown_081FAF4C\n" + " .word gMonPaletteTable\n" + " .word gUnknown_02024E8C\n" + " .word gSprites+0x1c\n" + " .word debug_69+1\n" + " .word gSprites\n" + " .word gMonBackPicTable\n" + " .word gMonBackPicCoords\n" + " .word sub_809D62C+1\n" + " .word 0x600f858\n" + " .word 0xf3fc\n" + " .word 0xf3fd\n" + " .word 0xf3fe\n" + " .word 0xf3ff\n" + " .word gPlttBufferUnfaded+0x200\n" + " .word 0xffffff00\n" + " .word gPlttBufferFaded+0x100\n" + " .word gTasks\n" + " .word debug_80C6EE8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6EE8() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " lsl r6, r6, #0x18\n" + " lsr r6, r6, #0x18\n" + " ldr r4, ._670\n" + " ldr r5, ._670 + 4\n" + " ldr r1, [r5]\n" + " add r1, r1, #0x10\n" + " add r0, r4, #0\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, ._670 + 8\n" + " add r4, r4, r0\n" + " ldr r3, [r5]\n" + " ldrb r0, [r3, #0x7]\n" + " add r0, r0, #0x81\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r4\n" + " ldrh r4, [r0]\n" + " mov r1, #0x1f\n" + " and r1, r1, r4\n" + " ldrb r2, [r3, #0xc]\n" + " mov r0, #0x20\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r3, #0xc]\n" + " ldr r3, [r5]\n" + " mov r1, #0xf8\n" + " lsl r1, r1, #0x2\n" + " and r1, r1, r4\n" + " ldrh r2, [r3, #0xc]\n" + " ldr r0, ._670 + 12\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strh r0, [r3, #0xc]\n" + " mov r1, #0xf8\n" + " lsl r1, r1, #0x7\n" + " and r1, r1, r4\n" + " lsr r1, r1, #0x8\n" + " ldrb r2, [r3, #0xd]\n" + " mov r0, #0x7d\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r3, #0xd]\n" + " ldr r2, [r5]\n" + " ldrb r1, [r2, #0xd]\n" + " mov r0, #0x7f\n" + " and r0, r0, r1\n" + " strb r0, [r2, #0xd]\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x7]\n" + " add r0, r0, #0x1\n" + " mov r1, #0xb\n" + " mov r2, #0xa\n" + " mov r3, #0x2\n" + " bl debug_80C68CC\n" + " ldr r0, ._670 + 16\n" + " mov r1, #0xd\n" + " mov r2, #0xa\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0xe\n" + " mov r2, #0xa\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " ldr r1, ._670 + 20\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._670 + 24\n" + " str r1, [r0]\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._671:\n" + " .align 2, 0\n" + "._670:\n" + " .word gPlttBufferUnfaded+0x100\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0xffffff00\n" + " .word 0xfffffc1f\n" + " .word gUnknown_Debug_083F8813\n" + " .word gTasks\n" + " .word debug_80C6FA8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C6FA8() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " ldr r1, ._674\n" + " ldrh r2, [r1, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " add r4, r1, #0\n" + " cmp r0, #0\n" + " beq ._672 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._674 + 4\n" + " bl SetMainCallback2\n" + " ldr r1, ._674 + 8\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._674 + 12\n" + " str r1, [r0]\n" + " b ._703\n" + "._675:\n" + " .align 2, 0\n" + "._674:\n" + " .word gMain\n" + " .word debug_80C370C+1\n" + " .word gTasks\n" + " .word debug_80C373C+1\n" + "._672:\n" + " ldrh r1, [r4, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._676 @cond_branch\n" + " ldr r4, ._678\n" + " ldr r0, [r4]\n" + " ldrh r1, [r0]\n" + " mov r0, #0x0\n" + " b ._677\n" + "._679:\n" + " .align 2, 0\n" + "._678:\n" + " .word unk_debug_ewram_0+0x34\n" + "._676:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._680 @cond_branch\n" + " ldr r4, ._682\n" + " ldr r0, [r4]\n" + " ldrh r1, [r0]\n" + " mov r0, #0x1\n" + "._677:\n" + " bl debug_80C3878\n" + " ldr r1, [r4]\n" + " strh r0, [r1]\n" + " ldr r1, ._682 + 4\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._682 + 8\n" + " str r1, [r0]\n" + " b ._703\n" + "._683:\n" + " .align 2, 0\n" + "._682:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gTasks\n" + " .word debug_80C71FC+1\n" + "._680:\n" + " mov r3, #0x1\n" + " and r3, r3, r2\n" + " cmp r3, #0\n" + " beq ._684 @cond_branch\n" + " ldr r0, ._686\n" + " ldr r1, [r0]\n" + " mov r0, #0x1\n" + " strb r0, [r1, #0x5]\n" + " ldr r1, ._686 + 4\n" + " ldr r2, ._686 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._686 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._686 + 16\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._686 + 20\n" + " str r1, [r0]\n" + " b ._703\n" + "._687:\n" + " .align 2, 0\n" + "._686:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x4167\n" + " .word gTasks\n" + " .word debug_80C7294+1\n" + "._684:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._689 @cond_branch\n" + " ldr r1, ._691\n" + " ldr r2, [r1]\n" + " ldrb r0, [r2, #0x7]\n" + " cmp r0, #0xd\n" + " bhi ._689 @cond_branch\n" + " lsl r0, r0, #0x1\n" + " ldr r2, ._691 + 4\n" + " add r0, r0, r2\n" + " strh r3, [r0]\n" + " ldr r1, [r1]\n" + " ldrb r0, [r1, #0x7]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1, #0x7]\n" + " b ._695\n" + "._692:\n" + " .align 2, 0\n" + "._691:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x5000102\n" + "._689:\n" + " ldrh r1, [r4, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._694 @cond_branch\n" + " ldr r2, ._696\n" + " ldr r1, [r2]\n" + " ldrb r0, [r1, #0x7]\n" + " cmp r0, #0\n" + " beq ._694 @cond_branch\n" + " lsl r0, r0, #0x1\n" + " ldr r1, ._696 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " ldr r1, [r2]\n" + " ldrb r0, [r1, #0x7]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1, #0x7]\n" + " b ._695\n" + "._697:\n" + " .align 2, 0\n" + "._696:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x5000102\n" + "._694:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._698 @cond_branch\n" + " ldr r4, ._701\n" + " ldr r2, [r4]\n" + " ldrb r0, [r2, #0x9]\n" + " mov r1, #0x1\n" + " eor r0, r0, r1\n" + " strb r0, [r2, #0x9]\n" + " ldr r1, [r4]\n" + " ldrb r0, [r1, #0x9]\n" + " cmp r0, #0\n" + " beq ._699 @cond_branch\n" + " ldrh r0, [r1]\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " bl species_and_otid_get_pal\n" + " ldr r1, [r4]\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x14\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x11\n" + " add r1, r1, r2\n" + " lsr r1, r1, #0x10\n" + " mov r2, #0x20\n" + " bl LoadCompressedPalette\n" + " b ._700\n" + "._702:\n" + " .align 2, 0\n" + "._701:\n" + " .word unk_debug_ewram_0+0x34\n" + "._699:\n" + " ldrh r0, [r1]\n" + " mov r1, #0x0\n" + " mov r2, #0x9\n" + " bl species_and_otid_get_pal\n" + " ldr r1, [r4]\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x14\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x11\n" + " add r1, r1, r2\n" + " lsr r1, r1, #0x10\n" + " mov r2, #0x20\n" + " bl LoadCompressedPalette\n" + "._700:\n" + " ldr r5, ._704\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " ldr r4, ._704 + 4\n" + " add r0, r0, r4\n" + " ldr r2, ._704 + 8\n" + " add r1, r4, r2\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r4\n" + " ldr r1, ._704 + 12\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + "._695:\n" + " ldr r1, ._704 + 16\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._704 + 20\n" + " str r1, [r0]\n" + " b ._703\n" + "._705:\n" + " .align 2, 0\n" + "._704:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gPlttBufferUnfaded+0x200\n" + " .word 0xffffff00\n" + " .word gPlttBufferFaded+0x100\n" + " .word gTasks\n" + " .word debug_80C6EE8+1\n" + "._698:\n" + " mov r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._706 @cond_branch\n" + " bl StopCryAndClearCrySongs\n" + " ldr r0, ._707\n" + " ldr r0, [r0]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x0\n" + " bl PlayCry1\n" + "._706:\n" + " ldr r2, ._707\n" + " ldr r1, [r2]\n" + " ldrb r0, [r1, #0x8]\n" + " add r0, r0, #0x4\n" + " strb r0, [r1, #0x8]\n" + " ldr r3, [r2]\n" + " ldrb r1, [r3, #0x8]\n" + " mov r0, #0x1f\n" + " and r0, r0, r1\n" + " strb r0, [r3, #0x8]\n" + " ldr r0, [r2]\n" + " ldrb r1, [r0, #0x7]\n" + " lsl r1, r1, #0x1\n" + " ldr r2, ._707 + 4\n" + " add r1, r1, r2\n" + " ldr r2, ._707 + 8\n" + " ldrb r0, [r0, #0x8]\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r2\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + "._703:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._708:\n" + " .align 2, 0\n" + "._707:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x5000142\n" + " .word gUnknown_Debug_083F8790\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C71FC() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " ldr r6, ._709\n" + " ldr r4, ._709 + 4\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldrb r0, [r0, #0x5]\n" + " lsr r0, r0, #0x4\n" + " bl GetSpritePaletteTagByPaletteNum\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl FreeSpritePaletteByTag\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " bl DestroySprite\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x3]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldrb r0, [r0, #0x5]\n" + " lsr r0, r0, #0x4\n" + " bl GetSpritePaletteTagByPaletteNum\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl FreeSpritePaletteByTag\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x3]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " bl DestroySprite\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x4]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " bl sub_809D510\n" + " ldr r1, ._709 + 8\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._709 + 12\n" + " str r1, [r0]\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._710:\n" + " .align 2, 0\n" + "._709:\n" + " .word gSprites\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gTasks\n" + " .word debug_80C6CB8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C7294() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " ldr r0, ._713\n" + " ldrh r2, [r0, #0x2e]\n" + " mov r1, #0x1\n" + " and r1, r1, r2\n" + " add r3, r0, #0\n" + " cmp r1, #0\n" + " beq ._711 @cond_branch\n" + " ldr r0, ._713 + 4\n" + " ldr r1, [r0]\n" + " mov r0, #0x0\n" + " strb r0, [r1, #0x5]\n" + " ldr r1, ._713 + 8\n" + " ldr r2, ._713 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._713 + 16\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " b ._712\n" + "._714:\n" + " .align 2, 0\n" + "._713:\n" + " .word gMain\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x699f\n" + "._711:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._715 @cond_branch\n" + " ldr r6, ._717\n" + " ldr r0, [r6]\n" + " strb r1, [r0, #0x5]\n" + " ldr r1, ._717 + 4\n" + " ldr r2, ._717 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._717 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, [r6]\n" + " add r0, r0, #0x10\n" + " ldr r4, ._717 + 16\n" + " add r1, r4, #0\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, [r6]\n" + " add r0, r0, #0x10\n" + " ldr r5, ._717 + 20\n" + " add r1, r5, #0\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r1, [r6]\n" + " add r0, r1, #0\n" + " add r0, r0, #0x10\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x5\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r4, r4, r2\n" + " add r1, r1, r4\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r1, [r6]\n" + " add r0, r1, #0\n" + " add r0, r0, #0x10\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x5\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r5, r5, r2\n" + " add r1, r1, r5\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + "._712:\n" + " ldr r1, ._717 + 24\n" + " lsl r0, r7, #0x2\n" + " add r0, r0, r7\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._717 + 28\n" + " str r1, [r0]\n" + " b ._754\n" + "._718:\n" + " .align 2, 0\n" + "._717:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x699f\n" + " .word gPlttBufferUnfaded+0x100\n" + " .word gPlttBufferFaded+0x100\n" + " .word gTasks\n" + " .word debug_80C6EE8+1\n" + "._715:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._720 @cond_branch\n" + " ldr r0, ._722\n" + " ldr r1, [r0]\n" + " ldrb r0, [r1, #0xa]\n" + " cmp r0, #0x1\n" + " bhi ._720 @cond_branch\n" + " add r0, r0, #0x1\n" + " strb r0, [r1, #0xa]\n" + " b ._754\n" + "._723:\n" + " .align 2, 0\n" + "._722:\n" + " .word unk_debug_ewram_0+0x34\n" + "._720:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._725 @cond_branch\n" + " ldr r0, ._727\n" + " ldr r1, [r0]\n" + " ldrb r0, [r1, #0xa]\n" + " cmp r0, #0\n" + " beq ._725 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1, #0xa]\n" + " b ._754\n" + "._728:\n" + " .align 2, 0\n" + "._727:\n" + " .word unk_debug_ewram_0+0x34\n" + "._725:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._729 @cond_branch\n" + " ldr r0, ._734\n" + " ldr r2, [r0]\n" + " ldrb r0, [r2, #0xa]\n" + " cmp r0, #0x1\n" + " beq ._730 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._731 @cond_branch\n" + " cmp r0, #0\n" + " beq ._732 @cond_branch\n" + " b ._754\n" + "._735:\n" + " .align 2, 0\n" + "._734:\n" + " .word unk_debug_ewram_0+0x34\n" + "._731:\n" + " cmp r0, #0x2\n" + " beq ._736 @cond_branch\n" + " b ._754\n" + "._732:\n" + " ldrb r3, [r2, #0xc]\n" + " lsl r1, r3, #0x1b\n" + " lsr r0, r1, #0x1b\n" + " cmp r0, #0x1e\n" + " bhi ._761 @cond_branch\n" + " add r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " mov r1, #0x20\n" + " neg r1, r1\n" + " and r1, r1, r3\n" + " orr r1, r1, r0\n" + " strb r1, [r2, #0xc]\n" + " b ._761\n" + "._730:\n" + " ldrh r3, [r2, #0xc]\n" + " lsl r1, r3, #0x16\n" + " lsr r0, r1, #0x1b\n" + " cmp r0, #0x1e\n" + " bhi ._761 @cond_branch\n" + " add r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " ldr r1, ._742\n" + " and r1, r1, r3\n" + " orr r1, r1, r0\n" + " strh r1, [r2, #0xc]\n" + " b ._761\n" + "._743:\n" + " .align 2, 0\n" + "._742:\n" + " .word 0xfffffc1f\n" + "._736:\n" + " ldrb r3, [r2, #0xd]\n" + " lsl r1, r3, #0x19\n" + " lsr r0, r1, #0x1b\n" + " cmp r0, #0x1e\n" + " bhi ._761 @cond_branch\n" + " add r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " mov r1, #0x7d\n" + " neg r1, r1\n" + " and r1, r1, r3\n" + " orr r1, r1, r0\n" + " strb r1, [r2, #0xd]\n" + " b ._761\n" + "._729:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._754 @cond_branch\n" + " ldr r0, ._751\n" + " ldr r3, [r0]\n" + " ldrb r0, [r3, #0xa]\n" + " cmp r0, #0x1\n" + " beq ._747 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._748 @cond_branch\n" + " cmp r0, #0\n" + " beq ._749 @cond_branch\n" + " b ._754\n" + "._752:\n" + " .align 2, 0\n" + "._751:\n" + " .word unk_debug_ewram_0+0x34\n" + "._748:\n" + " cmp r0, #0x2\n" + " beq ._753 @cond_branch\n" + " b ._754\n" + "._749:\n" + " ldrb r2, [r3, #0xc]\n" + " mov r0, #0x1f\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._761 @cond_branch\n" + " lsl r0, r2, #0x1b\n" + " lsr r0, r0, #0x1b\n" + " sub r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " mov r1, #0x20\n" + " neg r1, r1\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strb r1, [r3, #0xc]\n" + " b ._761\n" + "._747:\n" + " ldrh r2, [r3, #0xc]\n" + " mov r0, #0xf8\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._761 @cond_branch\n" + " lsl r0, r2, #0x16\n" + " lsr r0, r0, #0x1b\n" + " sub r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " ldr r1, ._759\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strh r1, [r3, #0xc]\n" + " b ._761\n" + "._760:\n" + " .align 2, 0\n" + "._759:\n" + " .word 0xfffffc1f\n" + "._753:\n" + " ldrb r2, [r3, #0xd]\n" + " mov r0, #0x7c\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._761 @cond_branch\n" + " lsl r0, r2, #0x19\n" + " lsr r0, r0, #0x1b\n" + " sub r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " mov r1, #0x7d\n" + " neg r1, r1\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strb r1, [r3, #0xd]\n" + "._761:\n" + " ldr r0, ._762\n" + " lsl r1, r7, #0x2\n" + " add r1, r1, r7\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._762 + 4\n" + " str r0, [r1]\n" + "._754:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._763:\n" + " .align 2, 0\n" + "._762:\n" + " .word gTasks\n" + " .word debug_80C74E4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C74E4() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " ldr r0, ._764\n" + " ldr r3, [r0]\n" + " ldrb r0, [r3, #0xc]\n" + " lsl r0, r0, #0x1b\n" + " lsr r0, r0, #0x1b\n" + " ldrh r2, [r3, #0xc]\n" + " mov r1, #0xf8\n" + " lsl r1, r1, #0x2\n" + " and r1, r1, r2\n" + " add r0, r0, r1\n" + " ldrb r1, [r3, #0xd]\n" + " lsl r1, r1, #0x19\n" + " lsr r1, r1, #0x1b\n" + " lsl r1, r1, #0xa\n" + " add r0, r0, r1\n" + " ldr r6, ._764 + 4\n" + " ldrb r1, [r3, #0x7]\n" + " add r1, r1, #0x81\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r6\n" + " strh r0, [r1]\n" + " ldr r1, ._764 + 8\n" + " mov r8, r1\n" + " ldrb r1, [r3, #0x7]\n" + " add r1, r1, #0x81\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r8\n" + " strh r0, [r1]\n" + " ldrb r1, [r3, #0x6]\n" + " lsl r1, r1, #0x4\n" + " ldrb r2, [r3, #0x7]\n" + " ldr r4, ._764 + 12\n" + " add r2, r2, r4\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r6\n" + " strh r0, [r1]\n" + " ldrb r1, [r3, #0x6]\n" + " lsl r1, r1, #0x4\n" + " ldrb r2, [r3, #0x7]\n" + " add r2, r2, r4\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r8\n" + " strh r0, [r1]\n" + " mov r1, #0xe\n" + " mov r2, #0xa\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " ldr r1, ._764 + 16\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._764 + 20\n" + " str r1, [r0]\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._765:\n" + " .align 2, 0\n" + "._764:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gPlttBufferUnfaded\n" + " .word gPlttBufferFaded\n" + " .word 0x101\n" + " .word gTasks\n" + " .word debug_80C7294+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C7584() +{ + asm( + " push {r4, lr}\n" + " add r2, r0, #0\n" + " ldr r0, ._771\n" + " ldr r3, [r0]\n" + " ldrb r1, [r3, #0x5]\n" + " add r4, r0, #0\n" + " cmp r1, #0\n" + " beq ._766 @cond_branch\n" + " mov r1, #0x2e\n" + " ldsh r0, [r2, r1]\n" + " cmp r0, #0x1\n" + " beq ._767 @cond_branch\n" + " cmp r0, #0x1\n" + " ble ._768 @cond_branch\n" + " cmp r0, #0x2\n" + " beq ._769 @cond_branch\n" + "._768:\n" + " ldrb r0, [r3, #0xc]\n" + " lsl r0, r0, #0x1b\n" + " b ._773\n" + "._772:\n" + " .align 2, 0\n" + "._771:\n" + " .word unk_debug_ewram_0+0x34\n" + "._767:\n" + " ldrh r0, [r3, #0xc]\n" + " lsl r0, r0, #0x16\n" + " b ._773\n" + "._769:\n" + " ldrb r0, [r3, #0xd]\n" + " lsl r0, r0, #0x19\n" + "._773:\n" + " lsr r0, r0, #0x1b\n" + " lsl r0, r0, #0x2\n" + " strh r0, [r2, #0x24]\n" + " mov r1, #0x2e\n" + " ldsh r0, [r2, r1]\n" + " lsl r0, r0, #0x3\n" + " strh r0, [r2, #0x26]\n" + " ldrh r0, [r2, #0x30]\n" + " add r3, r0, #1\n" + " strh r3, [r2, #0x30]\n" + " mov r0, #0x2e\n" + " ldsh r1, [r2, r0]\n" + " ldr r0, [r4]\n" + " ldrb r0, [r0, #0xa]\n" + " cmp r1, r0\n" + " bne ._775 @cond_branch\n" + " mov r0, #0x8\n" + " and r3, r3, r0\n" + " cmp r3, #0\n" + " bne ._775 @cond_branch\n" + "._766:\n" + " add r0, r2, #0\n" + " add r0, r0, #0x3e\n" + " ldrb r1, [r0]\n" + " mov r2, #0x4\n" + " orr r1, r1, r2\n" + " strb r1, [r0]\n" + " b ._776\n" + "._775:\n" + " add r2, r2, #0x3e\n" + " ldrb r1, [r2]\n" + " mov r0, #0x5\n" + " neg r0, r0\n" + " and r0, r0, r1\n" + " strb r0, [r2]\n" + "._776:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void InitSeeTrainers() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " bl debug_80C35DC\n" + " ldr r1, ._777\n" + " ldr r2, ._777 + 4\n" + " ldr r0, ._777 + 8\n" + " str r1, [r0]\n" + " str r2, [r0, #0x4]\n" + " ldr r1, ._777 + 12\n" + " str r1, [r0, #0x8]\n" + " ldr r0, [r0, #0x8]\n" + " ldr r0, ._777 + 16\n" + " mov r1, #0x80\n" + " mov r2, #0x60\n" + " bl LoadPalette\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r5, #0x0\n" + " str r5, [sp]\n" + " mov r1, #0x0\n" + " mov r2, #0x10\n" + " mov r3, #0x0\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._777 + 20\n" + " mov r6, #0x0\n" + " strh r5, [r0]\n" + " add r0, r0, #0x4\n" + " strh r5, [r0]\n" + " sub r0, r0, #0x2\n" + " strh r5, [r0]\n" + " add r0, r0, #0x4\n" + " strh r5, [r0]\n" + " ldr r1, ._777 + 24\n" + " mov r0, #0x3f\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " mov r0, #0x1f\n" + " strh r0, [r1]\n" + " add r1, r1, #0x6\n" + " mov r0, #0xf1\n" + " strh r0, [r1]\n" + " ldr r0, ._777 + 28\n" + " strh r5, [r0]\n" + " add r1, r1, #0x4\n" + " mov r0, #0x7\n" + " strh r0, [r1]\n" + " ldr r3, ._777 + 32\n" + " ldrh r2, [r3]\n" + " strh r5, [r3]\n" + " ldr r4, ._777 + 36\n" + " ldrh r0, [r4]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " strh r0, [r4]\n" + " strh r2, [r3]\n" + " ldr r0, ._777 + 40\n" + " bl SetVBlankCallback\n" + " ldr r0, ._777 + 44\n" + " bl SetMainCallback2\n" + " ldr r1, ._777 + 48\n" + " ldr r2, ._777 + 52\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r2, ._777 + 56\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " sub r1, r1, #0xa\n" + " mov r2, #0xcd\n" + " lsl r2, r2, #0x6\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, ._777 + 60\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " ldr r1, ._777 + 64\n" + " ldr r0, ._777 + 68\n" + " str r0, [r1]\n" + " strh r5, [r0]\n" + " strb r6, [r0, #0x2]\n" + " strb r6, [r0, #0x3]\n" + " strb r6, [r0, #0x5]\n" + " strb r6, [r0, #0x7]\n" + " strb r6, [r0, #0xa]\n" + " strb r6, [r0, #0x8]\n" + " ldr r4, ._777 + 72\n" + " add r0, r4, #0\n" + " mov r1, #0x6c\n" + " mov r2, #0x74\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " ldr r6, ._777 + 76\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " strh r5, [r0, #0x2e]\n" + " mov r1, #0x0\n" + " bl StartSpriteAnim\n" + " add r0, r4, #0\n" + " mov r1, #0x6c\n" + " mov r2, #0x74\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " mov r1, #0x1\n" + " strh r1, [r0, #0x2e]\n" + " bl StartSpriteAnim\n" + " add r0, r4, #0\n" + " mov r1, #0x6c\n" + " mov r2, #0x74\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " mov r1, #0x2\n" + " strh r1, [r0, #0x2e]\n" + " bl StartSpriteAnim\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._778:\n" + " .align 2, 0\n" + "._777:\n" + " .word byte_83F88EC\n" + " .word 0x600e000\n" + " .word 0x40000d4\n" + " .word 0x80000400\n" + " .word word_83F888C\n" + " .word 0x4000040\n" + " .word 0x4000048\n" + " .word 0x4000052\n" + " .word 0x4000208\n" + " .word 0x4000200\n" + " .word debug_80C3758+1\n" + " .word debug_80C370C+1\n" + " .word 0x4000008\n" + " .word 0x1f0b\n" + " .word 0x1e0a\n" + " .word debug_80C777C+1\n" + " .word unk_debug_ewram_0+0x34\n" + " .word +0x2018000\n" + " .word unk_83F8868+0xc\n" + " .word gSprites\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C777C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xffffffec\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " ldr r1, ._784\n" + " mov r0, sp\n" + " mov r2, #0x12\n" + " bl memcpy\n" + " mov r0, #0x9\n" + " mov r1, #0x0\n" + " mov r2, #0xe\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x9\n" + " mov r3, #0x9\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x0\n" + " mov r1, #0xa\n" + " mov r2, #0x9\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0xe\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._784 + 4\n" + " mov r1, #0xf\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._784 + 8\n" + " mov r1, #0x19\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._784 + 12\n" + " mov r1, #0xf\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0xa\n" + " mov r1, #0x8\n" + " mov r2, #0x1d\n" + " mov r3, #0xc\n" + " bl MenuDrawTextWindow\n" + " mov r2, #0x0\n" + " ldr r4, ._784 + 16\n" + " ldr r0, ._784 + 20\n" + " add r3, r0, #0\n" + "._779:\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, r4\n" + " add r1, r2, r3\n" + " strh r1, [r0]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0xe\n" + " bls ._779 @cond_branch\n" + " mov r2, #0x0\n" + " ldr r5, ._784 + 24\n" + " lsl r6, r7, #0x2\n" + " mov r8, r6\n" + " ldr r4, ._784 + 28\n" + " ldr r0, ._784 + 32\n" + " add r3, r0, #0\n" + "._780:\n" + " lsl r0, r2, #0x1\n" + " add r0, r0, r4\n" + " add r1, r2, r3\n" + " strh r1, [r0]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0xe\n" + " bls ._780 @cond_branch\n" + " add r0, r5, #0\n" + " mov r1, #0x14\n" + " mov r2, #0xa\n" + " bl MenuPrint\n" + " mov r0, #0xa\n" + " mov r1, #0xd\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r1, sp\n" + " mov r0, #0x23\n" + " strb r0, [r1]\n" + " mov r2, #0x0\n" + " ldr r4, ._784 + 36\n" + " mov r5, #0x93\n" + " lsl r5, r5, #0x8\n" + " add r3, r5, #0\n" + "._781:\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r4\n" + " mov r6, sp\n" + " add r0, r6, r2\n" + " ldrb r0, [r0]\n" + " add r0, r0, r3\n" + " strh r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x11\n" + " bls ._781 @cond_branch\n" + " mov r1, sp\n" + " mov r0, #0x24\n" + " strb r0, [r1]\n" + " mov r2, #0x0\n" + " ldr r5, ._784 + 40\n" + " ldr r4, ._784 + 44\n" + " mov r0, #0x93\n" + " lsl r0, r0, #0x8\n" + " add r3, r0, #0\n" + "._782:\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r4\n" + " mov r6, sp\n" + " add r0, r6, r2\n" + " ldrb r0, [r0]\n" + " add r0, r0, r3\n" + " strh r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x11\n" + " bls ._782 @cond_branch\n" + " mov r1, sp\n" + " mov r0, #0x25\n" + " strb r0, [r1]\n" + " mov r2, #0x0\n" + " ldr r4, ._784 + 48\n" + " mov r0, #0x93\n" + " lsl r0, r0, #0x8\n" + " add r3, r0, #0\n" + "._783:\n" + " lsl r1, r2, #0x1\n" + " add r1, r1, r4\n" + " mov r6, sp\n" + " add r0, r6, r2\n" + " ldrb r0, [r0]\n" + " add r0, r0, r3\n" + " strh r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x11\n" + " bls ._783 @cond_branch\n" + " add r0, r5, #0\n" + " mov r1, #0xf\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " ldr r1, ._784 + 52\n" + " ldr r2, ._784 + 56\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r5, ._784 + 60\n" + " add r0, r5, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._784 + 64\n" + " mov r6, r8\n" + " add r0, r6, r7\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._784 + 68\n" + " str r1, [r0]\n" + " add sp, sp, #0x14\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._785:\n" + " .align 2, 0\n" + "._784:\n" + " .word gUnknown_Debug_083F8815\n" + " .word gUnknown_Debug_083F87D0\n" + " .word gUnknown_Debug_083F87D8\n" + " .word gUnknown_Debug_083F87E0\n" + " .word 0x600fa56\n" + " .word 0xa311\n" + " .word gUnknown_Debug_083F87F4\n" + " .word 0x600f256\n" + " .word 0x8301\n" + " .word 0x600f396\n" + " .word gUnknown_Debug_083F8801\n" + " .word 0x600f3d6\n" + " .word 0x600f416\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x699f\n" + " .word gTasks\n" + " .word debug_80C7934+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C7934() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xfffffff8\n" + " mov r8, r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " ldr r5, ._786\n" + " ldr r6, [r5]\n" + " ldrh r2, [r6]\n" + " lsl r0, r2, #0x3\n" + " ldr r1, ._786 + 4\n" + " add r0, r0, r1\n" + " ldr r1, ._786 + 8\n" + " lsl r2, r2, #0x2\n" + " add r2, r2, r1\n" + " ldrb r1, [r2]\n" + " ldrb r2, [r2, #0x1]\n" + " ldr r4, ._786 + 12\n" + " ldr r3, [r4]\n" + " ldr r4, [r4, #0x4]\n" + " str r4, [sp]\n" + " ldrh r4, [r6]\n" + " str r4, [sp, #0x4]\n" + " bl DecompressPicFromTable_2\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._786 + 16\n" + " add r0, r0, r1\n" + " bl LoadCompressedObjectPalette\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x1\n" + " bl GetMonSpriteTemplate_803C5A0\n" + " ldr r0, ._786 + 20\n" + " mov r1, #0x28\n" + " mov r2, #0x28\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " ldr r1, [r5]\n" + " mov r6, #0x0\n" + " strb r0, [r1, #0x2]\n" + " ldr r4, ._786 + 24\n" + " ldr r2, [r5]\n" + " ldrb r1, [r2, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r1, r4, #0\n" + " add r1, r1, #0x1c\n" + " add r0, r0, r1\n" + " ldr r1, ._786 + 28\n" + " str r1, [r0]\n" + " ldrb r0, [r2, #0x2]\n" + " lsl r1, r0, #0x4\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r4\n" + " ldrb r2, [r1, #0x5]\n" + " mov r0, #0xd\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " strb r0, [r1, #0x5]\n" + " ldr r0, [r5]\n" + " ldrh r0, [r0]\n" + " mov r1, #0x1a\n" + " mov r2, #0x5\n" + " bl debug_80C376C\n" + " ldr r2, [r5]\n" + " ldrb r1, [r2, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r4\n" + " ldrb r0, [r0, #0x5]\n" + " lsr r0, r0, #0x4\n" + " strb r0, [r2, #0x6]\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " ldr r4, ._786 + 32\n" + " add r0, r0, r4\n" + " ldr r2, ._786 + 36\n" + " add r1, r4, r2\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r4\n" + " ldr r1, ._786 + 40\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r1, ._786 + 44\n" + " mov r2, r8\n" + " lsl r0, r2, #0x2\n" + " add r0, r0, r8\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._786 + 48\n" + " str r1, [r0]\n" + " ldr r0, [r5]\n" + " strb r6, [r0, #0x9]\n" + " add sp, sp, #0x8\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._787:\n" + " .align 2, 0\n" + "._786:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gTrainerFrontPicTable\n" + " .word gTrainerFrontPicCoords\n" + " .word gUnknown_081FAF4C\n" + " .word gTrainerFrontPicPaletteTable\n" + " .word gUnknown_02024E8C\n" + " .word gSprites\n" + " .word debug_69+1\n" + " .word gPlttBufferUnfaded+0x200\n" + " .word 0xffffff00\n" + " .word gPlttBufferFaded+0x100\n" + " .word gTasks\n" + " .word debug_80C7A54+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C7A54() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " lsl r6, r6, #0x18\n" + " lsr r6, r6, #0x18\n" + " ldr r4, ._788\n" + " ldr r5, ._788 + 4\n" + " ldr r1, [r5]\n" + " add r1, r1, #0x10\n" + " add r0, r4, #0\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, ._788 + 8\n" + " add r4, r4, r0\n" + " ldr r3, [r5]\n" + " ldrb r0, [r3, #0x7]\n" + " add r0, r0, #0x81\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r4\n" + " ldrh r4, [r0]\n" + " mov r1, #0x1f\n" + " and r1, r1, r4\n" + " ldrb r2, [r3, #0xc]\n" + " mov r0, #0x20\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r3, #0xc]\n" + " ldr r3, [r5]\n" + " mov r1, #0xf8\n" + " lsl r1, r1, #0x2\n" + " and r1, r1, r4\n" + " ldrh r2, [r3, #0xc]\n" + " ldr r0, ._788 + 12\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strh r0, [r3, #0xc]\n" + " mov r1, #0xf8\n" + " lsl r1, r1, #0x7\n" + " and r1, r1, r4\n" + " lsr r1, r1, #0x8\n" + " ldrb r2, [r3, #0xd]\n" + " mov r0, #0x7d\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r3, #0xd]\n" + " ldr r2, [r5]\n" + " ldrb r1, [r2, #0xd]\n" + " mov r0, #0x7f\n" + " and r0, r0, r1\n" + " strb r0, [r2, #0xd]\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x7]\n" + " add r0, r0, #0x1\n" + " mov r1, #0xb\n" + " mov r2, #0xa\n" + " mov r3, #0x2\n" + " bl debug_80C68CC\n" + " ldr r0, ._788 + 16\n" + " mov r1, #0xd\n" + " mov r2, #0xa\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " mov r1, #0xe\n" + " mov r2, #0xa\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " ldr r1, ._788 + 20\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._788 + 24\n" + " str r1, [r0]\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._789:\n" + " .align 2, 0\n" + "._788:\n" + " .word gPlttBufferUnfaded+0x100\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0xffffff00\n" + " .word 0xfffffc1f\n" + " .word gUnknown_Debug_083F8813\n" + " .word gTasks\n" + " .word debug_80C7B14+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C7B14() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " ldr r1, ._792\n" + " ldrh r3, [r1, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r3\n" + " add r4, r1, #0\n" + " cmp r0, #0\n" + " beq ._790 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._792 + 4\n" + " bl SetMainCallback2\n" + " ldr r1, ._792 + 8\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._792 + 12\n" + " str r1, [r0]\n" + " b ._821\n" + "._793:\n" + " .align 2, 0\n" + "._792:\n" + " .word gMain\n" + " .word debug_80C370C+1\n" + " .word gTasks\n" + " .word debug_80C373C+1\n" + "._790:\n" + " ldrh r1, [r4, #0x30]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._794 @cond_branch\n" + " ldr r4, ._796\n" + " ldr r0, [r4]\n" + " ldrh r1, [r0]\n" + " mov r0, #0x0\n" + " b ._795\n" + "._797:\n" + " .align 2, 0\n" + "._796:\n" + " .word unk_debug_ewram_0+0x34\n" + "._794:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._798 @cond_branch\n" + " ldr r4, ._800\n" + " ldr r0, [r4]\n" + " ldrh r1, [r0]\n" + " mov r0, #0x1\n" + "._795:\n" + " bl debug_80C38B4\n" + " ldr r1, [r4]\n" + " strh r0, [r1]\n" + " ldr r1, ._800 + 4\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._800 + 8\n" + " str r1, [r0]\n" + " b ._821\n" + "._801:\n" + " .align 2, 0\n" + "._800:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gTasks\n" + " .word debug_80C7D44+1\n" + "._798:\n" + " mov r2, #0x1\n" + " and r2, r2, r3\n" + " cmp r2, #0\n" + " beq ._802 @cond_branch\n" + " ldr r0, ._804\n" + " ldr r1, [r0]\n" + " mov r0, #0x1\n" + " strb r0, [r1, #0x5]\n" + " ldr r1, ._804 + 4\n" + " ldr r2, ._804 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._804 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r1, ._804 + 16\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._804 + 20\n" + " str r1, [r0]\n" + " b ._821\n" + "._805:\n" + " .align 2, 0\n" + "._804:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x4167\n" + " .word gTasks\n" + " .word debug_80C7DDC+1\n" + "._802:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " ldr r3, ._809\n" + " cmp r0, #0\n" + " beq ._807 @cond_branch\n" + " ldr r1, [r3]\n" + " ldrb r0, [r1, #0x7]\n" + " cmp r0, #0xd\n" + " bhi ._807 @cond_branch\n" + " lsl r0, r0, #0x1\n" + " ldr r1, ._809 + 4\n" + " add r0, r0, r1\n" + " strh r2, [r0]\n" + " ldr r1, [r3]\n" + " ldrb r0, [r1, #0x7]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1, #0x7]\n" + " b ._813\n" + "._810:\n" + " .align 2, 0\n" + "._809:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x5000102\n" + "._807:\n" + " ldrh r1, [r4, #0x30]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._812 @cond_branch\n" + " ldr r1, [r3]\n" + " ldrb r0, [r1, #0x7]\n" + " cmp r0, #0\n" + " beq ._812 @cond_branch\n" + " lsl r0, r0, #0x1\n" + " ldr r2, ._814\n" + " add r0, r0, r2\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " ldr r1, [r3]\n" + " ldrb r0, [r1, #0x7]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1, #0x7]\n" + " b ._813\n" + "._815:\n" + " .align 2, 0\n" + "._814:\n" + " .word 0x5000102\n" + "._812:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._816 @cond_branch\n" + " ldr r4, ._819\n" + " ldr r2, [r4]\n" + " ldrb r0, [r2, #0x9]\n" + " mov r1, #0x1\n" + " eor r0, r0, r1\n" + " strb r0, [r2, #0x9]\n" + " ldr r1, [r4]\n" + " ldrb r0, [r1, #0x9]\n" + " cmp r0, #0\n" + " beq ._817 @cond_branch\n" + " ldrh r0, [r1]\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " bl species_and_otid_get_pal\n" + " ldr r1, [r4]\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x14\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x11\n" + " add r1, r1, r2\n" + " lsr r1, r1, #0x10\n" + " mov r2, #0x20\n" + " bl LoadCompressedPalette\n" + " b ._818\n" + "._820:\n" + " .align 2, 0\n" + "._819:\n" + " .word unk_debug_ewram_0+0x34\n" + "._817:\n" + " ldrh r0, [r1]\n" + " mov r1, #0x0\n" + " mov r2, #0x9\n" + " bl species_and_otid_get_pal\n" + " ldr r1, [r4]\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x14\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x11\n" + " add r1, r1, r2\n" + " lsr r1, r1, #0x10\n" + " mov r2, #0x20\n" + " bl LoadCompressedPalette\n" + "._818:\n" + " ldr r5, ._822\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " ldr r4, ._822 + 4\n" + " add r0, r0, r4\n" + " ldr r2, ._822 + 8\n" + " add r1, r4, r2\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, [r5]\n" + " ldrb r0, [r0, #0x6]\n" + " lsl r0, r0, #0x5\n" + " add r0, r0, r4\n" + " ldr r1, ._822 + 12\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + "._813:\n" + " ldr r1, ._822 + 16\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._822 + 20\n" + " str r1, [r0]\n" + " b ._821\n" + "._823:\n" + " .align 2, 0\n" + "._822:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gPlttBufferUnfaded+0x200\n" + " .word 0xffffff00\n" + " .word gPlttBufferFaded+0x100\n" + " .word gTasks\n" + " .word debug_80C7A54+1\n" + "._816:\n" + " ldr r1, [r3]\n" + " ldrb r0, [r1, #0x8]\n" + " add r0, r0, #0x4\n" + " strb r0, [r1, #0x8]\n" + " ldr r2, [r3]\n" + " ldrb r1, [r2, #0x8]\n" + " mov r0, #0x1f\n" + " and r0, r0, r1\n" + " strb r0, [r2, #0x8]\n" + " ldr r0, [r3]\n" + " ldrb r1, [r0, #0x7]\n" + " lsl r1, r1, #0x1\n" + " ldr r2, ._824\n" + " add r1, r1, r2\n" + " ldr r2, ._824 + 4\n" + " ldrb r0, [r0, #0x8]\n" + " lsl r0, r0, #0x1\n" + " add r0, r0, r2\n" + " ldrh r0, [r0]\n" + " strh r0, [r1]\n" + "._821:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._825:\n" + " .align 2, 0\n" + "._824:\n" + " .word 0x5000142\n" + " .word gUnknown_Debug_083F8790\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C7D44() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " ldr r6, ._826\n" + " ldr r4, ._826 + 4\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldrb r0, [r0, #0x5]\n" + " lsr r0, r0, #0x4\n" + " bl GetSpritePaletteTagByPaletteNum\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl FreeSpritePaletteByTag\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x2]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " bl DestroySprite\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x3]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldrb r0, [r0, #0x5]\n" + " lsr r0, r0, #0x4\n" + " bl GetSpritePaletteTagByPaletteNum\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl FreeSpritePaletteByTag\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x3]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " bl DestroySprite\n" + " ldr r0, [r4]\n" + " ldrb r1, [r0, #0x4]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " bl sub_809D510\n" + " ldr r1, ._826 + 8\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._826 + 12\n" + " str r1, [r0]\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._827:\n" + " .align 2, 0\n" + "._826:\n" + " .word gSprites\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gTasks\n" + " .word debug_80C7934+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C7DDC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " ldr r0, ._830\n" + " ldrh r2, [r0, #0x2e]\n" + " mov r1, #0x1\n" + " and r1, r1, r2\n" + " add r3, r0, #0\n" + " cmp r1, #0\n" + " beq ._828 @cond_branch\n" + " ldr r0, ._830 + 4\n" + " ldr r1, [r0]\n" + " mov r0, #0x0\n" + " strb r0, [r1, #0x5]\n" + " ldr r1, ._830 + 8\n" + " ldr r2, ._830 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._830 + 16\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " b ._829\n" + "._831:\n" + " .align 2, 0\n" + "._830:\n" + " .word gMain\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x699f\n" + "._828:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._832 @cond_branch\n" + " ldr r6, ._834\n" + " ldr r0, [r6]\n" + " strb r1, [r0, #0x5]\n" + " ldr r1, ._834 + 4\n" + " ldr r2, ._834 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x4\n" + " ldr r2, ._834 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " ldr r0, [r6]\n" + " add r0, r0, #0x10\n" + " ldr r4, ._834 + 16\n" + " add r1, r4, #0\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r0, [r6]\n" + " add r0, r0, #0x10\n" + " ldr r5, ._834 + 20\n" + " add r1, r5, #0\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r1, [r6]\n" + " add r0, r1, #0\n" + " add r0, r0, #0x10\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x5\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r4, r4, r2\n" + " add r1, r1, r4\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + " ldr r1, [r6]\n" + " add r0, r1, #0\n" + " add r0, r0, #0x10\n" + " ldrb r1, [r1, #0x6]\n" + " lsl r1, r1, #0x5\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r5, r5, r2\n" + " add r1, r1, r5\n" + " mov r2, #0x10\n" + " bl CpuSet\n" + "._829:\n" + " ldr r1, ._834 + 24\n" + " lsl r0, r7, #0x2\n" + " add r0, r0, r7\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._834 + 28\n" + " str r1, [r0]\n" + " b ._871\n" + "._835:\n" + " .align 2, 0\n" + "._834:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word 0x4000040\n" + " .word 0x51ef\n" + " .word 0x699f\n" + " .word gPlttBufferUnfaded+0x100\n" + " .word gPlttBufferFaded+0x100\n" + " .word gTasks\n" + " .word debug_80C7A54+1\n" + "._832:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._837 @cond_branch\n" + " ldr r0, ._839\n" + " ldr r1, [r0]\n" + " ldrb r0, [r1, #0xa]\n" + " cmp r0, #0x1\n" + " bhi ._837 @cond_branch\n" + " add r0, r0, #0x1\n" + " strb r0, [r1, #0xa]\n" + " b ._871\n" + "._840:\n" + " .align 2, 0\n" + "._839:\n" + " .word unk_debug_ewram_0+0x34\n" + "._837:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._842 @cond_branch\n" + " ldr r0, ._844\n" + " ldr r1, [r0]\n" + " ldrb r0, [r1, #0xa]\n" + " cmp r0, #0\n" + " beq ._842 @cond_branch\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1, #0xa]\n" + " b ._871\n" + "._845:\n" + " .align 2, 0\n" + "._844:\n" + " .word unk_debug_ewram_0+0x34\n" + "._842:\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._846 @cond_branch\n" + " ldr r0, ._851\n" + " ldr r2, [r0]\n" + " ldrb r0, [r2, #0xa]\n" + " cmp r0, #0x1\n" + " beq ._847 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._848 @cond_branch\n" + " cmp r0, #0\n" + " beq ._849 @cond_branch\n" + " b ._871\n" + "._852:\n" + " .align 2, 0\n" + "._851:\n" + " .word unk_debug_ewram_0+0x34\n" + "._848:\n" + " cmp r0, #0x2\n" + " beq ._853 @cond_branch\n" + " b ._871\n" + "._849:\n" + " ldrb r3, [r2, #0xc]\n" + " lsl r1, r3, #0x1b\n" + " lsr r0, r1, #0x1b\n" + " cmp r0, #0x1e\n" + " bhi ._878 @cond_branch\n" + " add r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " mov r1, #0x20\n" + " neg r1, r1\n" + " and r1, r1, r3\n" + " orr r1, r1, r0\n" + " strb r1, [r2, #0xc]\n" + " b ._878\n" + "._847:\n" + " ldrh r3, [r2, #0xc]\n" + " lsl r1, r3, #0x16\n" + " lsr r0, r1, #0x1b\n" + " cmp r0, #0x1e\n" + " bhi ._878 @cond_branch\n" + " add r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " ldr r1, ._859\n" + " and r1, r1, r3\n" + " orr r1, r1, r0\n" + " strh r1, [r2, #0xc]\n" + " b ._878\n" + "._860:\n" + " .align 2, 0\n" + "._859:\n" + " .word 0xfffffc1f\n" + "._853:\n" + " ldrb r3, [r2, #0xd]\n" + " lsl r1, r3, #0x19\n" + " lsr r0, r1, #0x1b\n" + " cmp r0, #0x1e\n" + " bhi ._878 @cond_branch\n" + " add r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " mov r1, #0x7d\n" + " neg r1, r1\n" + " and r1, r1, r3\n" + " orr r1, r1, r0\n" + " strb r1, [r2, #0xd]\n" + " b ._878\n" + "._846:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._871 @cond_branch\n" + " ldr r0, ._868\n" + " ldr r3, [r0]\n" + " ldrb r0, [r3, #0xa]\n" + " cmp r0, #0x1\n" + " beq ._864 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._865 @cond_branch\n" + " cmp r0, #0\n" + " beq ._866 @cond_branch\n" + " b ._871\n" + "._869:\n" + " .align 2, 0\n" + "._868:\n" + " .word unk_debug_ewram_0+0x34\n" + "._865:\n" + " cmp r0, #0x2\n" + " beq ._870 @cond_branch\n" + " b ._871\n" + "._866:\n" + " ldrb r2, [r3, #0xc]\n" + " mov r0, #0x1f\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._878 @cond_branch\n" + " lsl r0, r2, #0x1b\n" + " lsr r0, r0, #0x1b\n" + " sub r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " mov r1, #0x20\n" + " neg r1, r1\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strb r1, [r3, #0xc]\n" + " b ._878\n" + "._864:\n" + " ldrh r2, [r3, #0xc]\n" + " mov r0, #0xf8\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._878 @cond_branch\n" + " lsl r0, r2, #0x16\n" + " lsr r0, r0, #0x1b\n" + " sub r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x5\n" + " ldr r1, ._876\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strh r1, [r3, #0xc]\n" + " b ._878\n" + "._877:\n" + " .align 2, 0\n" + "._876:\n" + " .word 0xfffffc1f\n" + "._870:\n" + " ldrb r2, [r3, #0xd]\n" + " mov r0, #0x7c\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._878 @cond_branch\n" + " lsl r0, r2, #0x19\n" + " lsr r0, r0, #0x1b\n" + " sub r0, r0, #0x1\n" + " mov r1, #0x1f\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " mov r1, #0x7d\n" + " neg r1, r1\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strb r1, [r3, #0xd]\n" + "._878:\n" + " ldr r0, ._879\n" + " lsl r1, r7, #0x2\n" + " add r1, r1, r7\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " ldr r0, ._879 + 4\n" + " str r0, [r1]\n" + "._871:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._880:\n" + " .align 2, 0\n" + "._879:\n" + " .word gTasks\n" + " .word debug_80C802C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_80C802C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " ldr r0, ._881\n" + " ldr r3, [r0]\n" + " ldrb r0, [r3, #0xc]\n" + " lsl r0, r0, #0x1b\n" + " lsr r0, r0, #0x1b\n" + " ldrh r2, [r3, #0xc]\n" + " mov r1, #0xf8\n" + " lsl r1, r1, #0x2\n" + " and r1, r1, r2\n" + " add r0, r0, r1\n" + " ldrb r1, [r3, #0xd]\n" + " lsl r1, r1, #0x19\n" + " lsr r1, r1, #0x1b\n" + " lsl r1, r1, #0xa\n" + " add r0, r0, r1\n" + " ldr r6, ._881 + 4\n" + " ldrb r1, [r3, #0x7]\n" + " add r1, r1, #0x81\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r6\n" + " strh r0, [r1]\n" + " ldr r1, ._881 + 8\n" + " mov r8, r1\n" + " ldrb r1, [r3, #0x7]\n" + " add r1, r1, #0x81\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r8\n" + " strh r0, [r1]\n" + " ldrb r1, [r3, #0x6]\n" + " lsl r1, r1, #0x4\n" + " ldrb r2, [r3, #0x7]\n" + " ldr r4, ._881 + 12\n" + " add r2, r2, r4\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r6\n" + " strh r0, [r1]\n" + " ldrb r1, [r3, #0x6]\n" + " lsl r1, r1, #0x4\n" + " ldrb r2, [r3, #0x7]\n" + " add r2, r2, r4\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x1\n" + " add r1, r1, r8\n" + " strh r0, [r1]\n" + " mov r1, #0xe\n" + " mov r2, #0xa\n" + " mov r3, #0x4\n" + " bl debug_80C68CC\n" + " ldr r1, ._881 + 16\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._881 + 20\n" + " str r1, [r0]\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._882:\n" + " .align 2, 0\n" + "._881:\n" + " .word unk_debug_ewram_0+0x34\n" + " .word gPlttBufferUnfaded\n" + " .word gPlttBufferFaded\n" + " .word 0x101\n" + " .word gTasks\n" + " .word debug_80C7DDC+1\n" + "\n" + ); +} + +#endif diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 44d832e2b..03a64afc6 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -360,6 +360,10 @@ void sub_80831F8(u8 taskId) || sub_8082DF4(taskId) == TRUE) return; +#ifdef DEBUG + sub_8082D60(taskId, GetLinkPlayerCount_2()); +#endif + gSpecialVar_Result = sub_8082D9C(local1, local2); if (gSpecialVar_Result == 0) return; diff --git a/src/engine/clock.c b/src/engine/clock.c index 416aaa6bb..fceccdfcb 100644 --- a/src/engine/clock.c +++ b/src/engine/clock.c @@ -13,12 +13,11 @@ #include "tv.h" #include "wallclock.h" -static void InitTimeBasedEvents(void); static void UpdatePerDay(struct Time *time); static void UpdatePerMinute(struct Time *time); static void ReturnFromStartWallClock(void); -static void InitTimeBasedEvents(void) +void InitTimeBasedEvents(void) { FlagSet(FLAG_SYS_CLOCK_SET); RtcCalcLocalTime(); diff --git a/src/engine/link.c b/src/engine/link.c index 34016d607..502715116 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -1,4 +1,5 @@ #include "global.h" +#include "cable_club.h" #include "link.h" #include "battle.h" #include "berry.h" @@ -543,6 +544,9 @@ static void ProcessRecvCmds(u8 unusedParam) else { SetBlockReceivedFlag(i); +#ifdef DEBUG + debug_sub_808B838(i); +#endif } } break; @@ -975,6 +979,143 @@ static void PrintHex(u32 num, u8 x, u8 y, u8 maxDigits) } } +#ifdef DEBUG + +EWRAM_DATA u16 *debugCharacterBase = NULL; +EWRAM_DATA void *unk_20238C8 = NULL; +EWRAM_DATA u16 (*debugTileMap)[] = NULL; +EWRAM_DATA u32 unk_20238D0 = 0; + +void debug_sub_8008218(u16 *buffer, void *arg1, u16 (*arg2)[], u32 arg3) +{ + CpuSet(sLinkTestDigitTiles, buffer, 272); + debugCharacterBase = buffer; + unk_20238C8 = arg1; + debugTileMap = arg2; + unk_20238D0 = arg3; +} + +#ifdef NONMATCHING +void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0) +{ + u32 buffer[8]; + u32 *ptr; + + u16 *dest; + + int i; + + if (unk_20238D0 != sp0) + return; + + r3 = max(r3, 8); + + ptr = &buffer[0]; + dest = &(*debugTileMap)[left + top * 32]; + + for (i = r3; i != 0; i--) + { + *(ptr++) = value & 0xF; + value = value >> 4; + } + + ptr = &buffer[8 - r3]; + for (i = r3; i != 0; i--) + { + int charOffset = (((uintptr_t) debugCharacterBase) - ((uintptr_t) unk_20238C8)) / 32; + *dest = *ptr + charOffset + 1; + ptr--; + dest++; + } +} +#else +__attribute__((naked)) +void debug_sub_8008264() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xffffffe0\n" + " add r5, r0, #0\n" + " add r6, r1, #0\n" + " add r4, r3, #0\n" + " ldr r0, [sp, #0x38]\n" + " ldr r1, ._347\n" + " ldr r1, [r1]\n" + " cmp r1, r0\n" + " bne ._345 @cond_branch\n" + " cmp r4, #0x8\n" + " ble ._342 @cond_branch\n" + " mov r4, #0x8\n" + "._342:\n" + " mov r3, sp\n" + " ldr r0, ._347 + 4\n" + " mov r8, r0\n" + " lsl r2, r2, #0x6\n" + " mov ip, r2\n" + " lsl r6, r6, #0x1\n" + " lsl r7, r4, #0x2\n" + " cmp r4, #0\n" + " ble ._343 @cond_branch\n" + " mov r1, #0xf\n" + " add r2, r4, #0\n" + "._344:\n" + " add r0, r5, #0\n" + " and r0, r0, r1\n" + " stmia r3!, {r0}\n" + " lsr r5, r5, #0x4\n" + " sub r2, r2, #0x1\n" + " cmp r2, #0\n" + " bne ._344 @cond_branch\n" + "._343:\n" + " mov r1, r8\n" + " ldr r0, [r1]\n" + " add r0, r0, ip\n" + " add r5, r0, r6\n" + " mov r1, sp\n" + " add r0, r1, r7\n" + " sub r3, r0, #4\n" + " cmp r4, #0\n" + " ble ._345 @cond_branch\n" + " ldr r7, ._347 + 8\n" + " ldr r6, ._347 + 12\n" + " add r2, r4, #0\n" + "._346:\n" + " ldr r1, [r7]\n" + " ldr r0, [r6]\n" + " sub r1, r1, r0\n" + " lsr r1, r1, #0x5\n" + " ldr r0, [r3]\n" + " add r0, r0, r1\n" + " add r0, r0, #0x1\n" + " strh r0, [r5]\n" + " sub r3, r3, #0x4\n" + " add r5, r5, #0x2\n" + " sub r2, r2, #0x1\n" + " cmp r2, #0\n" + " bne ._346 @cond_branch\n" + "._345:\n" + " add sp, sp, #0x20\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._348:\n" + " .align 2, 0\n" + "._347:\n" + " .word unk_20238D0\n" + " .word debugTileMap\n" + " .word debugCharacterBase\n" + " .word unk_20238C8\n" + "\n" + ); +} +#endif + +#endif + static void LinkCB_RequestPlayerDataExchange(void) { // Only one request needs to be sent, so only the master sends it. diff --git a/src/engine/rtc.c b/src/engine/rtc.c index d73f943d2..a56fcd44e 100644 --- a/src/engine/rtc.c +++ b/src/engine/rtc.c @@ -268,6 +268,28 @@ void FormatHexDate(u8 *dest, s32 year, s32 month, s32 day) *dest = EOS; } +#ifdef DEBUG + +void debug_sub_800987C(u8 *dest) +{ + FormatHexDate(dest, sRtc.year, sRtc.month, sRtc.day); +} + +void debug_sub_8009894(u8 *dest) +{ + u16 dayCount; + + dayCount = RtcGetDayCount(&sRtc); + ConvertIntToDecimalStringN(dest, dayCount, STR_CONV_MODE_RIGHT_ALIGN, 4); +} + +void debug_sub_80098B8(u8 *dest) +{ + ConvertIntToHexStringN(dest, sRtc.status, STR_CONV_MODE_LEADING_ZEROS, 2); +} + +#endif + void RtcCalcTimeDifference(struct SiiRtcInfo *rtc, struct Time *result, struct Time *t) { u16 days = RtcGetDayCount(rtc); @@ -347,3 +369,10 @@ u32 RtcGetMinuteCount() RtcGetInfo(&sRtc); return (24 * 60) * RtcGetDayCount(&sRtc) + 60 * sRtc.hour + sRtc.minute; } + +#ifdef DEBUG +void debug_sub_8009A60() +{ + RtcGetRawInfo(&sRtc); +} +#endif diff --git a/src/engine/save.c b/src/engine/save.c index d5de2e408..8b045eaaa 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -574,6 +574,83 @@ u16 CalculateChecksum(void *data, u16 size) return ((checksum >> 16) + checksum); } +#ifdef DEBUG +__attribute__((naked)) +void sub_813B79C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " ldr r4, ._163\n" + " ldr r6, ._163 + 4\n" + " mov r5, #0x0\n" + "._161:\n" + " lsl r0, r5, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r1, r4, #0\n" + " bl DoReadFlashWholeSection\n" + " ldr r1, ._163 + 8\n" + " add r0, r4, r1\n" + " ldrh r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r6\n" + " ldrh r1, [r0, #0x4]\n" + " add r0, r4, #0\n" + " bl CalculateChecksum\n" + " ldr r2, ._163 + 12\n" + " add r1, r4, r2\n" + " strh r0, [r1]\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " bl gScriptFuncs_End+0x2f60\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " cmp r5, #0x1b\n" + " bls ._161 @cond_branch\n" + " ldr r6, ._163\n" + " ldr r7, ._163 + 16\n" + " mov r5, #0x0\n" + "._162:\n" + " add r4, r5, #0\n" + " add r4, r4, #0x1c\n" + " lsl r0, r4, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r1, r6, #0\n" + " bl DoReadFlashWholeSection\n" + " lsl r0, r5, #0x3\n" + " add r0, r0, r7\n" + " ldrh r1, [r0, #0x4]\n" + " add r0, r6, #0\n" + " bl CalculateChecksum\n" + " ldr r2, ._163 + 8\n" + " add r1, r6, r2\n" + " strh r0, [r1]\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl gScriptFuncs_End+0x2f60\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x10\n" + " lsr r5, r0, #0x10\n" + " cmp r5, #0x1\n" + " bls ._162 @cond_branch\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._164:\n" + " .align 2, 0\n" + "._163:\n" + " .word +0x2000000\n" + " .word gSaveSectionLocations\n" + " .word 0xff4\n" + " .word 0xff6\n" + " .word gHallOfFameSaveSectionLocations\n" + "\n" + ); +} +#endif + u8 HandleSavingData(u8 saveType) { u8 i; diff --git a/src/engine/sprite.c b/src/engine/sprite.c index cf35e12a3..cec3d0b3a 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -1,8 +1,10 @@ #include "global.h" +#include "debug.h" #include "sprite.h" #include "main.h" #include "menu_cursor.h" #include "palette.h" +#include "sprite.h" #define MAX_SPRITE_COPY_REQUESTS 64 @@ -822,6 +824,12 @@ static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct Spr gSpriteCopyRequests[gSpriteCopyRequestCount].size = images[index].size; gSpriteCopyRequestCount++; } +#ifdef DEBUG + else + { + unref_sub_80AB084(sDmaOverErrorMsg); + } +#endif } void RequestSpriteCopy(const void *src, u8 *dest, u16 size) @@ -833,6 +841,12 @@ void RequestSpriteCopy(const void *src, u8 *dest, u16 size) gSpriteCopyRequests[gSpriteCopyRequestCount].size = size; gSpriteCopyRequestCount++; } +#ifdef DEBUG + else + { + unref_sub_80AB084(sDmaOverErrorMsg); + } +#endif } // these two functions are unused. diff --git a/src/engine/task.c b/src/engine/task.c index 7bd2b5937..ed17d28bb 100644 --- a/src/engine/task.c +++ b/src/engine/task.c @@ -1,4 +1,5 @@ #include "global.h" +#include "debug.h" #include "task.h" #define ACTIVE_SENTINEL 0x10 @@ -11,8 +12,9 @@ struct Task gTasks[ACTIVE_SENTINEL]; static void InsertTask(u8 newTaskId); static u8 FindFirstActiveTask(); -// Unused string -const u8 sTaskOverString[] = _("TASK OVER\nタスクがオーバーしました"); +const u8 gError_NoTasksLeft[] = _( + "TASK OVER\n" + "タスクがオーバーしました"); void ResetTasks() { @@ -49,6 +51,10 @@ u8 CreateTask(TaskFunc func, u8 priority) } } +#ifdef DEBUG + unref_sub_80AB084(gError_NoTasksLeft); +#endif + return 0; } diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index 9d09575c8..daa513145 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -5,6 +5,7 @@ #include "field_effect.h" #include "graphics.h" #include "link.h" +#include "m4a.h" #include "main.h" #include "menu.h" #include "money.h" @@ -52,7 +53,6 @@ extern struct LinkPlayerMapObject gLinkPlayerMapObjects[]; EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0}; -extern const u8 gBadgesTiles[]; extern const u16 gUnknown_083B5F0C[]; extern const u16 gBadgesPalette[]; extern const u16 gUnknown_083B5F4C[]; @@ -63,6 +63,34 @@ const u8 gBadgesTiles[] = INCBIN_U8("graphics/trainer_card/badges.4bpp"); // XXX: what is this? u8 *const ewram_ = gSharedMem; +#ifdef DEBUG +const struct TrainerCard gUnknown_Debug_083E0448 = +{ + .gender = FEMALE, + .stars = 4, + .hasPokedex = TRUE, + .var_3 = TRUE, + .var_4 = TRUE, + .firstHallOfFameA = 999, + .firstHallOfFameB = 99, + .firstHallOfFameC = 99, + .pokedexSeen = 411, + .trainerId = 12345, + .playTimeHours = 99, + .playTimeMinutes = 99, + .linkBattleWins = 9999, + .linkBattleLosses = 9999, + .battleTowerWins = 9999, + .battleTowerLosses = 9999, + .contestsWithFriends = 999, + .pokeblocksWithFriends = 0xFFFF, + .pokemonTrades = 0xFFFF, + .money = 99999, + .var_28 = {1, 2, 3, 4}, + .playerName = _("てすと"), +}; +#endif + bool8 TrainerCard_Init(struct Task *); bool8 TrainerCard_WaitForFadeInToFinish(struct Task *); bool8 TrainerCard_WaitForKeys(struct Task *); @@ -176,8 +204,15 @@ static void TrainerCard_Back_PrintPokemonTrades_Label(void); static void TrainerCard_Back_PrintPokemonTrades(void); void unref_sub_8094588(u16 left, u16 top); +#ifdef DEBUG +static u8 gDebug_03000748; +#endif + void TrainerCard_ShowPlayerCard(Callback arg1) { +#ifdef DEBUG + gDebug_03000748 = 0; +#endif TrainerCard_InitScreenForPlayer(arg1); SetMainCallback2(sub_8093174); ewram0_2.language = GAME_LANGUAGE; @@ -185,11 +220,41 @@ void TrainerCard_ShowPlayerCard(Callback arg1) void TrainerCard_ShowLinkCard(u8 playerIndex, Callback arg2) { +#ifdef DEBUG + gDebug_03000748 = 0; +#endif TrainerCard_InitScreenForLinkPlayer(playerIndex, arg2); SetMainCallback2(sub_8093174); ewram0_2.language = gLinkPlayers[gLinkPlayerMapObjects[playerIndex].linkPlayerId].language; } +#ifdef DEBUG +void debug_sub_80A0710(Callback callback) +{ + gDebug_03000748 = TRUE; + TrainerCard_InitScreenForPlayer(callback); + SetMainCallback2(sub_8093174); + ewram0_2.language = GAME_LANGUAGE; +} + +void debug_sub_80A073C(Callback callback) +{ + memcpy(&gTrainerCards[0], &gUnknown_Debug_083E0448, sizeof(struct TrainerCard)); + gDebug_03000748=TRUE; + TrainerCard_InitScreenForLinkPlayer(0, callback); + SetMainCallback2(sub_8093174); + ewram0_2.language = GAME_LANGUAGE; +} + +void debug_sub_80A0780() +{ + int i; + + for (i = 0; i < 4; i++) + memcpy(&gTrainerCards[i], &gUnknown_Debug_083E0448, sizeof(struct TrainerCard)); +} +#endif + static void sub_8093174(void) { switch (gMain.state) @@ -553,6 +618,19 @@ static void TrainerCard_FillFlags(void) } } } + +#ifdef DEBUG + if (gDebug_03000748 != 0) + { + ewram0_2.showHallOfFame = TRUE; + ewram0_2.showLinkBattleStatus = TRUE; + ewram0_2.showBattleTowerStatus = TRUE; + ewram0_2.showContestRecord = TRUE; + ewram0_2.showMixingRecord = TRUE; + ewram0_2.showTradingRecord = TRUE; + memset(ewram0_2.ownedBadges, TRUE, sizeof(ewram0_2.ownedBadges)); + } +#endif } void sub_80937A4() @@ -645,6 +723,17 @@ bool8 TrainerCard_WaitForKeys(struct Task *task) } return TRUE; } +#ifdef DEBUG + else if (gDebug_03000748 && gMain.newKeys & R_BUTTON) + { + ewram0_2.starCount++; + ewram0_2.starCount %= 5; + TrainerCard_LoadPalettes(); + if (ewram0_2.backSideShown == 0) + TrainerCard_DrawStars(); + } +#endif + return FALSE; } @@ -1372,7 +1461,11 @@ static void TrainerCard_Front_PrintPokedexCount(void) { u8 buffer[16]; - if (!ewram0_2.showPokedexCount) + if ( +#ifdef DEBUG + gDebug_03000748 == 0 && +#endif + !ewram0_2.showPokedexCount) { TrainerCard_ClearPokedexLabel(); } diff --git a/src/field/berry.c b/src/field/berry.c index 088267ad0..7c6640dc8 100644 --- a/src/field/berry.c +++ b/src/field/berry.c @@ -999,6 +999,66 @@ extern u16 gSpecialVar_0x8006; static u8 CalcBerryYield(struct BerryTree *tree); static u16 GetStageDurationByBerryType(u8 berry); +#if DEBUG +__attribute__((naked)) +void debug_sub_80C2B04() +{ + asm( + " push {lr}\n" + " mov r0, #0x0\n" + " bl sub_80B47D8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._1\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldrh r0, [r1, #0x10]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r1, #0x10]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._2:\n" + " .align 2, 0\n" + "._1:\n" + " .word gTasks\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_80C2B30() +{ + asm( + " push {lr}\n" + " mov r0, #0x1\n" + " bl sub_80B47D8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._3\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r2\n" + " ldrh r0, [r1, #0x10]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r1, #0x10]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word gTasks\n" + "\n" + ); +} +#endif + // unused // this could be static, but making it so causes a compile-time warning. void ClearEnigmaBerries(void) @@ -1022,6 +1082,180 @@ void SetEnigmaBerry(u8 *src) gSaveBlock1.enigmaBerry.berry.description2 = gSaveBlock1.enigmaBerry.description2; } +#if DEBUG +__attribute__((naked)) +void debug_sub_80C2BD0() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " ldr r3, ._11\n" + " ldr r1, ._11 + 4\n" + " add r4, r3, r1\n" + " ldr r6, [r4]\n" + " add r1, r1, #0x4\n" + " add r2, r3, r1\n" + " ldr r7, [r2]\n" + " mov r1, #0x0\n" + " str r1, [r4]\n" + " str r1, [r2]\n" + " add r4, r0, #0\n" + " mov r2, #0x0\n" + " ldr r5, ._11 + 8\n" + "._10:\n" + " add r0, r4, r1\n" + " ldrb r0, [r0]\n" + " add r2, r2, r0\n" + " add r1, r1, #0x1\n" + " cmp r1, r5\n" + " bls ._10 @cond_branch\n" + " ldr r1, ._11 + 4\n" + " add r0, r3, r1\n" + " str r6, [r0]\n" + " add r1, r1, #0x4\n" + " add r0, r3, r1\n" + " str r7, [r0]\n" + " add r0, r2, #0\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._12:\n" + " .align 2, 0\n" + "._11:\n" + " .word gSaveBlock1\n" + " .word 0x316c\n" + " .word 0x52b\n" + "\n" + ); +} +#endif + +#if DEBUG +__attribute__((naked)) +u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add r3, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r9, r1\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r8, r2\n" + " ldr r4, ._16\n" + " ldr r1, ._16 + 4\n" + " add r0, r4, r1\n" + " add r2, r0, #0\n" + " ldr r1, ._16 + 8\n" + " ldmia r1!, {r5, r6, r7}\n" + " stmia r2!, {r5, r6, r7}\n" + " ldmia r1!, {r5, r6, r7}\n" + " stmia r2!, {r5, r6, r7}\n" + " ldr r1, [r1]\n" + " str r1, [r2]\n" + " add r1, r3, #0\n" + " bl StringCopy\n" + " ldr r0, ._16 + 12\n" + " add r6, r4, r0\n" + " ldr r1, ._16 + 16\n" + " add r0, r6, #0\n" + " bl StringCopy\n" + " ldr r1, ._16 + 20\n" + " add r5, r4, r1\n" + " ldr r1, ._16 + 24\n" + " add r0, r5, #0\n" + " bl StringCopy\n" + " ldr r2, ._16 + 28\n" + " add r0, r4, r2\n" + " str r6, [r0]\n" + " ldr r6, ._16 + 32\n" + " add r0, r4, r6\n" + " str r5, [r0]\n" + " mov r2, #0x0\n" + " ldr r6, ._16 + 36\n" + " ldr r7, ._16 + 40\n" + " add r5, r4, r7\n" + " ldr r3, ._16 + 44\n" + "._13:\n" + " add r0, r2, r5\n" + " add r1, r2, r3\n" + " ldrb r1, [r1]\n" + " strb r1, [r0]\n" + " add r2, r2, #0x1\n" + " cmp r2, r6\n" + " ble ._13 @cond_branch\n" + " ldr r0, ._16\n" + " ldr r3, ._16 + 48\n" + " ldr r2, ._16 + 52\n" + " add r1, r0, r2\n" + " mov r2, #0xf\n" + "._14:\n" + " ldrh r0, [r3]\n" + " strh r0, [r1]\n" + " add r3, r3, #0x2\n" + " add r1, r1, #0x2\n" + " sub r2, r2, #0x1\n" + " cmp r2, #0\n" + " bge ._14 @cond_branch\n" + " mov r2, #0x0\n" + " ldr r5, ._16 + 56\n" + " ldr r3, ._16 + 60\n" + "._15:\n" + " add r0, r2, r5\n" + " add r1, r2, r3\n" + " ldrb r1, [r1]\n" + " strb r1, [r0]\n" + " add r2, r2, #0x1\n" + " cmp r2, #0x11\n" + " ble ._15 @cond_branch\n" + " ldr r5, ._16 + 64\n" + " add r0, r4, r5\n" + " mov r6, r9\n" + " strb r6, [r0]\n" + " ldr r7, ._16 + 68\n" + " add r0, r4, r7\n" + " mov r1, r8\n" + " strb r1, [r0]\n" + " ldr r2, ._16 + 4\n" + " add r0, r4, r2\n" + " bl debug_sub_80C2BD0\n" + " add r5, r5, #0x4\n" + " add r1, r4, r5\n" + " str r0, [r1]\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._17:\n" + " .align 2, 0\n" + "._16:\n" + " .word gSaveBlock1\n" + " .word 0x3160\n" + " .word gBerries\n" + " .word 0x361c\n" + " .word gUnknown_Debug_083F7F84\n" + " .word 0x3649\n" + " .word gUnknown_Debug_083F7F90\n" + " .word 0x316c\n" + " .word 0x3170\n" + " .word 0x47f\n" + " .word 0x317c\n" + " .word gSpriteImage_83C172C+0x80\n" + " .word gSpriteImage_83C172C+0x500\n" + " .word 0x35fc\n" + " .word gSaveBlock1+0x3676\n" + " .word gUnknown_Debug_839B6CE\n" + " .word 0x3688\n" + " .word 0x3689\n" + "\n" + ); +} +#else static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) { const u8 *description1; @@ -1051,9 +1285,110 @@ static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) return checksum; } +#endif + +#if DEBUG +__attribute__((naked)) +void debug_sub_80C2D24() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " ldr r6, [sp, #0x18]\n" + " ldr r4, [sp, #0x1c]\n" + " mov r8, r4\n" + " ldr r5, ._18\n" + " ldr r7, ._18 + 4\n" + " add r4, r5, r7\n" + " strb r0, [r4]\n" + " ldr r4, ._18 + 8\n" + " add r0, r5, r4\n" + " strb r1, [r0]\n" + " add r7, r7, #0x2\n" + " add r0, r5, r7\n" + " strb r2, [r0]\n" + " ldr r1, ._18 + 12\n" + " add r0, r5, r1\n" + " strb r3, [r0]\n" + " add r4, r4, #0x3\n" + " add r0, r5, r4\n" + " strb r6, [r0]\n" + " add r7, r7, #0x3\n" + " add r0, r5, r7\n" + " mov r1, r8\n" + " strb r1, [r0]\n" + " sub r4, r4, #0x19\n" + " add r0, r5, r4\n" + " bl debug_sub_80C2BD0\n" + " ldr r7, ._18 + 16\n" + " add r5, r5, r7\n" + " str r0, [r5]\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._19:\n" + " .align 2, 0\n" + "._18:\n" + " .word gSaveBlock1\n" + " .word 0x3175\n" + " .word 0x3176\n" + " .word 0x3178\n" + " .word 0x368c\n" + "\n" + ); +} +#endif // due to e-reader scans being particularly volatile to failure, it is a requirement to check for // their integrity here due to scans possibly failing to produce the correct result. +#if DEBUG +__attribute__((naked)) +bool32 IsEnigmaBerryValid() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._24\n" + " ldr r1, ._24 + 4\n" + " add r0, r4, r1\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._22 @cond_branch\n" + " ldr r2, ._24 + 8\n" + " add r0, r4, r2\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._22 @cond_branch\n" + " ldr r1, ._24 + 12\n" + " add r0, r4, r1\n" + " bl debug_sub_80C2BD0\n" + " ldr r2, ._24 + 16\n" + " add r1, r4, r2\n" + " ldr r1, [r1]\n" + " cmp r0, r1\n" + " bne ._22 @cond_branch\n" + " mov r0, #0x1\n" + " b ._23\n" + "._25:\n" + " .align 2, 0\n" + "._24:\n" + " .word gSaveBlock1\n" + " .word 0x3174\n" + " .word 0x316a\n" + " .word 0x3160\n" + " .word 0x368c\n" + "._22:\n" + " mov r0, #0x0\n" + "._23:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} +#else bool32 IsEnigmaBerryValid(void) { if (gSaveBlock1.enigmaBerry.berry.stageDuration == 0) @@ -1064,6 +1399,7 @@ bool32 IsEnigmaBerryValid(void) return FALSE; return TRUE; } +#endif const struct Berry *GetBerryInfo(u8 berry) { @@ -1417,6 +1753,177 @@ bool8 PlayerHasBerries(void) return IsBagPocketNonEmpty(BAG_BERRIES); } +#if DEBUG +void debug_sub_80C33FC(u8 *buffer, s32 value, u8 n) +{ + StringAppend(gStringVar4, buffer); + ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEADING_ZEROS, n); + StringAppend(gStringVar4, gStringVar1); +} + +extern const u8 gUnknown_Debug_083F7F9D[]; +extern const u8 gUnknown_Debug_083F7FA2[]; +extern const u8 gUnknown_Debug_083F7FA9[]; +extern const u8 gUnknown_Debug_083F7FB0[]; +extern const u8 gUnknown_Debug_083F7FB7[]; +extern const u8 gUnknown_Debug_083F7FBE[]; +extern const u8 gUnknown_Debug_083F7FC5[]; +extern const u8 gUnknown_Debug_083F7FCC[]; +extern const u8 gUnknown_Debug_083F7FD3[]; +extern const u8 gUnknown_Debug_083F7FD3[]; +extern const u8 gUnknown_Debug_083F7FD3[]; + +#ifdef NONMATCHING +u8* DebugOpenBerryInfo(void) +{ + s32 i; + u8 berryTreeId; + struct BerryTree *berryTree; + + if (GetFieldObjectScriptPointerForComparison() != &BerryTreeScript) + return NULL; + + berryTreeId = FieldObjectGetBerryTreeId(gSelectedMapObject); + berryTree = GetBerryTreeInfo(berryTreeId); + + for (i = 0; i < 500; i++) + gStringVar4[i] |= 0xFF; + + debug_sub_80C33FC(gUnknown_Debug_083F7F9D, berryTreeId, 3); + debug_sub_80C33FC(gUnknown_Debug_083F7FA2, berryTree->berry, 2); + debug_sub_80C33FC(gUnknown_Debug_083F7FA9, berryTree->stage, 2); + debug_sub_80C33FC(gUnknown_Debug_083F7FB0, berryTree->secondsUntilNextStage, 5); + debug_sub_80C33FC(gUnknown_Debug_083F7FB7, berryTree->berryYield, 2); + debug_sub_80C33FC(gUnknown_Debug_083F7FBE, berryTree->regrowthCount, 3); + debug_sub_80C33FC(gUnknown_Debug_083F7FC5, berryTree->growthSparkle, 1); + debug_sub_80C33FC(gUnknown_Debug_083F7FCC, berryTree->watered1, 1); + debug_sub_80C33FC(gUnknown_Debug_083F7FD3, berryTree->watered2, 1); + debug_sub_80C33FC(gUnknown_Debug_083F7FD3, berryTree->watered3, 1); + debug_sub_80C33FC(gUnknown_Debug_083F7FD3, berryTree->watered4, 1); + + return gStringVar4; +} +#else +__attribute__((naked)) +void DebugOpenBerryInfo() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " bl GetFieldObjectScriptPointerForComparison\n" + " ldr r1, ._138\n" + " cmp r0, r1\n" + " beq ._136 @cond_branch\n" + " mov r0, #0x0\n" + " b ._137\n" + "._139:\n" + " .align 2, 0\n" + "._138:\n" + " .word BerryTreeScript\n" + "._136:\n" + " ldr r0, ._141\n" + " ldrb r0, [r0]\n" + " bl FieldObjectGetBerryTreeId\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " add r0, r6, #0\n" + " bl GetBerryTreeInfo\n" + " add r5, r0, #0\n" + " mov r2, #0x0\n" + " ldr r7, ._141 + 4\n" + " ldr r4, ._141 + 8\n" + " mov r3, #0xff\n" + "._140:\n" + " add r1, r2, r4\n" + " ldrb r0, [r1]\n" + " orr r0, r0, r3\n" + " strb r0, [r1]\n" + " add r2, r2, #0x1\n" + " cmp r2, r7\n" + " ble ._140 @cond_branch\n" + " ldr r0, ._141 + 12\n" + " add r1, r6, #0\n" + " mov r2, #0x3\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 16\n" + " ldrb r1, [r5]\n" + " mov r2, #0x2\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 20\n" + " ldrb r1, [r5, #0x1]\n" + " lsl r1, r1, #0x19\n" + " lsr r1, r1, #0x19\n" + " mov r2, #0x2\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 24\n" + " ldrh r1, [r5, #0x2]\n" + " mov r2, #0x5\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 28\n" + " ldrb r1, [r5, #0x4]\n" + " mov r2, #0x2\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 32\n" + " ldrb r1, [r5, #0x5]\n" + " lsl r1, r1, #0x1c\n" + " lsr r1, r1, #0x1c\n" + " mov r2, #0x3\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 36\n" + " ldrb r1, [r5, #0x1]\n" + " lsr r1, r1, #0x7\n" + " mov r2, #0x1\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 40\n" + " ldrb r1, [r5, #0x5]\n" + " lsl r1, r1, #0x1b\n" + " lsr r1, r1, #0x1f\n" + " mov r2, #0x1\n" + " bl debug_sub_80C33FC\n" + " ldr r4, ._141 + 44\n" + " ldrb r1, [r5, #0x5]\n" + " lsl r1, r1, #0x1a\n" + " lsr r1, r1, #0x1f\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " bl debug_sub_80C33FC\n" + " ldrb r1, [r5, #0x5]\n" + " lsl r1, r1, #0x19\n" + " lsr r1, r1, #0x1f\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " bl debug_sub_80C33FC\n" + " ldrb r1, [r5, #0x5]\n" + " lsr r1, r1, #0x7\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " bl debug_sub_80C33FC\n" + " ldr r0, ._141 + 8\n" + "._137:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._142:\n" + " .align 2, 0\n" + "._141:\n" + " .word gSelectedMapObject\n" + " .word 0x1f3\n" + " .word gStringVar4\n" + " .word gUnknown_Debug_083F7F9D\n" + " .word gUnknown_Debug_083F7FA2\n" + " .word gUnknown_Debug_083F7FA9\n" + " .word gUnknown_Debug_083F7FB0\n" + " .word gUnknown_Debug_083F7FB7\n" + " .word gUnknown_Debug_083F7FBE\n" + " .word gUnknown_Debug_083F7FC5\n" + " .word gUnknown_Debug_083F7FCC\n" + " .word gUnknown_Debug_083F7FD3\n" + "\n" + ); +} +#endif + +#endif + // whenever the player is not within view of the berry tree during its sparkle state, the // sparkle state will be reset. void ResetBerryTreeSparkleFlags(void) @@ -1445,3 +1952,17 @@ void ResetBerryTreeSparkleFlags(void) } } } + +#if DEBUG +static const u8 gUnknown_Debug_083F7F84[] = _("そとから きた きのみ"); +static const u8 gUnknown_Debug_083F7F90[] = _("ただいま かいはつちゅう"); +static const u8 gUnknown_Debug_083F7F9D[] = _("POS:"); +static const u8 gUnknown_Debug_083F7FA2[] = _("\nTYPE:"); +static const u8 gUnknown_Debug_083F7FA9[] = _("\nGROW:"); +static const u8 gUnknown_Debug_083F7FB0[] = _("\nTIME:"); +static const u8 gUnknown_Debug_083F7FB7[] = _("\nFCNT:"); +static const u8 gUnknown_Debug_083F7FBE[] = _("\nSCNT:"); +static const u8 gUnknown_Debug_083F7FC5[] = _("\nHOOK:"); +static const u8 gUnknown_Debug_083F7FCC[] = _("\nWBIT:"); +static const u8 gUnknown_Debug_083F7FD3[] = _(""); +#endif diff --git a/src/field/bike.c b/src/field/bike.c index 8db01b4b4..736dbc837 100644 --- a/src/field/bike.c +++ b/src/field/bike.c @@ -14,6 +14,11 @@ extern bool8 gBikeCyclingChallenge; extern u8 gBikeCollisions; extern u8 gUnusedBikeCameraAheadPanback; +#ifdef DEBUG +extern u8 gUnknown_020297ED; +u8 debug_sub_805F2B0(u8); +#endif + static void MovePlayerOnMachBike(u8, u16, u16); static u8 GetMachBikeTransition(u8 *); static void MachBikeTransition_FaceDirection(u8); @@ -126,6 +131,14 @@ static const struct BikeHistoryInputInfo gAcroBikeTricksList[] = void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys) { +#ifdef DEBUG + if (gUnknown_020297ED && debug_sub_805F2B0(direction)) + { + Bike_SetBikeStill(); + return; + } +#endif + if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MACH_BIKE) MovePlayerOnMachBike(direction, newKeys, heldKeys); else @@ -271,6 +284,14 @@ static void MachBikeTransition_TrySlowDown(u8 var) // the acro bike requires the input handler to be executed before the transition can. static void MovePlayerOnAcroBike(u8 newDirection, u16 newKeys, u16 heldKeys) { +#ifdef DEBUG + if (gUnknown_020297ED && debug_sub_805F2B0(newDirection)) + { + Bike_SetBikeStill(); + return; + } +#endif + sAcroBikeTransitions[CheckMovementInputAcroBike(&newDirection, newKeys, heldKeys)](newDirection); } diff --git a/src/field/choose_party.c b/src/field/choose_party.c index 3ba04e489..545c19dfa 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -527,6 +527,107 @@ static void BattleTowerEntryMenuCallback_Exit(u8 taskId) sub_81227FC(taskId); } +#if DEBUG +__attribute__((naked)) +void debug_sub_81381B4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " ldr r4, ._189\n" + " add r0, r4, #0\n" + " mov r1, #0x0\n" + " mov r2, #0x60\n" + " bl gScriptFuncs_End+0x5c24\n" + " mov r7, #0x0\n" + " mov r8, r4\n" + " mov r0, #0x4\n" + " add r0, r0, r8\n" + " mov r9, r0\n" + "._188:\n" + " mov r0, #0x64\n" + " add r1, r7, #0\n" + " mul r1, r1, r0\n" + " ldr r0, ._189 + 4\n" + " add r5, r1, r0\n" + " add r0, r5, #0\n" + " mov r1, #0x41\n" + " bl GetMonData\n" + " lsl r4, r7, #0x5\n" + " mov r1, r8\n" + " add r6, r4, r1\n" + " strh r0, [r6]\n" + " lsl r0, r0, #0x10\n" + " cmp r0, #0\n" + " beq ._187 @cond_branch\n" + " add r0, r5, #0\n" + " mov r1, #0x38\n" + " bl GetMonData\n" + " strb r0, [r6, #0xf]\n" + " add r0, r5, #0\n" + " mov r1, #0x39\n" + " bl GetMonData\n" + " strh r0, [r6, #0x10]\n" + " add r0, r5, #0\n" + " mov r1, #0x3a\n" + " bl GetMonData\n" + " strh r0, [r6, #0x12]\n" + " add r0, r5, #0\n" + " mov r1, #0x37\n" + " bl GetMonData\n" + " mov r1, r8\n" + " add r1, r1, #0x14\n" + " add r1, r4, r1\n" + " str r0, [r1]\n" + " add r0, r5, #0\n" + " mov r1, #0xc\n" + " bl GetMonData\n" + " strh r0, [r6, #0x2]\n" + " add r0, r5, #0\n" + " mov r1, #0x0\n" + " bl GetMonData\n" + " mov r1, r8\n" + " add r1, r1, #0x18\n" + " add r1, r4, r1\n" + " str r0, [r1]\n" + " add r0, r5, #0\n" + " bl GetMonGender\n" + " strb r0, [r6, #0x1c]\n" + " add r4, r4, r9\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " add r2, r4, #0\n" + " bl GetMonData\n" + " add r0, r4, #0\n" + " bl StripExtCtrlCodes\n" + " add r0, r5, #0\n" + " mov r1, #0x3\n" + " bl GetMonData\n" + " strb r0, [r6, #0x1d]\n" + "._187:\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " cmp r7, #0x2\n" + " bls ._188 @cond_branch\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._190:\n" + " .align 2, 0\n" + "._189:\n" + " .word gUnknown_02023A00\n" + " .word gPlayerParty+0x12c\n" + "\n" + ); +} +#endif + bool8 SetupLinkMultiBattlePartyMenu(void) { switch (ewram1B000_alt.setupState) diff --git a/src/field/decoration_inventory.c b/src/field/decoration_inventory.c index dd0e972aa..21ced1be8 100644 --- a/src/field/decoration_inventory.c +++ b/src/field/decoration_inventory.c @@ -164,3 +164,14 @@ u8 sub_81341D4(void) } return count; } + + +#ifdef DEBUG +void debug_sub_814A3A8(void) +{ + u8 decor; + + for (decor = 0; decor < DECOR_COUNT; decor++) + IsThereStorageSpaceForDecoration(decor); +} +#endif diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index 52e66f16e..dad2fb1d2 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -82,25 +82,25 @@ extern u8 gUnknown_081C6BDE[]; static void player_get_pos_to_and_height(struct MapPosition *); static void player_get_next_pos_and_height(struct MapPosition *); -static u16 cur_mapdata_block_role_at_player_pos(int); -static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c); +/*static*/ u16 cur_mapdata_block_role_at_player_pos(int); +/*static*/ bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c); static u8 *TryGetScriptOnPressingA(struct MapPosition *position, u8 b, u8 c); static u8 *sub_8068364(struct MapPosition *, u8, u8); static u8 *TryGetInvisibleMapObjectScript(struct MapPosition *, u8, u8 c); static u8 *sub_8068500(struct MapPosition *, u8, u8); static u8 *TryGetFieldMoveScript(struct MapPosition *, u8, u8); -static bool32 sub_8068770(void); -static bool32 sub_80687A4(void); -static bool8 sub_80687E4(struct MapPosition *, u16, u16); +/*static*/ bool32 sub_8068770(void); +/*static*/ bool32 sub_80687A4(void); +/*static*/ bool8 sub_80687E4(struct MapPosition *, u16, u16); static void happiness_algorithm_step(void); static bool8 overworld_poison_step(void); -static bool8 is_it_battle_time_3(u16); -static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *, u16, u8); +/*static*/ bool8 is_it_battle_time_3(u16); +/*static*/ bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *, u16, u8); static bool8 sub_8068B30(u16); static bool8 is_non_stair_warp_tile(u16, u8); static s8 map_warp_check_packed(struct MapHeader *, struct MapPosition *); static void sub_8068C30(struct MapHeader *, s8, struct MapPosition *); -static bool8 map_warp_consider_2_to_inside(struct MapPosition *, u16, u8); +/*static*/ bool8 map_warp_consider_2_to_inside(struct MapPosition *, u16, u8); static s8 map_warp_check(struct MapHeader *, u16, u16, u8); static u8 *mapheader_trigger_activate_at(struct MapHeader *, u16, u16, u8); static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *, u16, u16, u8); @@ -122,6 +122,230 @@ void FieldClearPlayerInput(struct FieldInput *input) input->dpadDirection = 0; } +#if DEBUG +__attribute__((naked)) +void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add r4, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " mov r8, r1\n" + " lsl r2, r2, #0x10\n" + " lsr r5, r2, #0x10\n" + " ldr r0, ._17\n" + " ldrb r6, [r0, #0x3]\n" + " ldrb r0, [r0, #0x2]\n" + " mov r9, r0\n" + " bl cur_mapdata_block_role_at_player_pos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl MetatileBehavior_IsMoveTile\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " cmp r6, #0x2\n" + " bne ._1 @cond_branch\n" + " cmp r7, #0\n" + " beq ._2 @cond_branch\n" + "._1:\n" + " cmp r6, #0\n" + " bne ._9 @cond_branch\n" + "._2:\n" + " bl GetPlayerSpeed\n" + " lsl r0, r0, #0x10\n" + " asr r0, r0, #0x10\n" + " cmp r0, #0x4\n" + " beq ._8 @cond_branch\n" + " mov r0, #0x8\n" + " mov r1, r8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._5 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x4\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + "._5:\n" + " mov r0, #0x4\n" + " mov r3, r8\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._6 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x8\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + "._6:\n" + " mov r0, #0x1\n" + " mov r1, r8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._7 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + "._7:\n" + " mov r0, #0x2\n" + " mov r3, r8\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._8 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x80\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + "._8:\n" + " mov r0, #0xf0\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._9 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x10\n" + " orr r0, r0, r1\n" + " mov r1, #0x20\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + "._9:\n" + " cmp r7, #0\n" + " bne ._14 @cond_branch\n" + " cmp r6, #0x2\n" + " bne ._12 @cond_branch\n" + " mov r0, r9\n" + " cmp r0, #0x2\n" + " bne ._12 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x40\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + "._12:\n" + " cmp r7, #0\n" + " bne ._14 @cond_branch\n" + " cmp r6, #0x2\n" + " bne ._14 @cond_branch\n" + " ldrb r0, [r4]\n" + " mov r1, #0x2\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + "._14:\n" + " mov r0, #0x40\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._15 @cond_branch\n" + " mov r0, #0x2\n" + " b ._22\n" + "._18:\n" + " .align 2, 0\n" + "._17:\n" + " .word gPlayerAvatar\n" + "._15:\n" + " mov r0, #0x80\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._19 @cond_branch\n" + " mov r0, #0x1\n" + " b ._22\n" + "._19:\n" + " mov r0, #0x20\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._21 @cond_branch\n" + " mov r0, #0x3\n" + " b ._22\n" + "._21:\n" + " mov r0, #0x10\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._23 @cond_branch\n" + " mov r0, #0x4\n" + "._22:\n" + " strb r0, [r4, #0x2]\n" + "._23:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._25 @cond_branch\n" + " ldrb r2, [r4]\n" + " mov r0, #0x4\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._25 @cond_branch\n" + " ldrb r0, [r4, #0x1]\n" + " mov r1, #0x4\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0x1]\n" + " mov r0, #0x5\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " strb r0, [r4]\n" + "._25:\n" + " ldr r0, ._30\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._29 @cond_branch\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._28 @cond_branch\n" + " ldrb r1, [r4, #0x1]\n" + " mov r0, #0x2\n" + " orr r1, r1, r0\n" + " strb r1, [r4, #0x1]\n" + " ldrb r0, [r4]\n" + " mov r2, #0x41\n" + " neg r2, r2\n" + " and r2, r2, r0\n" + " mov r0, #0x3\n" + " neg r0, r0\n" + " and r2, r2, r0\n" + " sub r0, r0, #0xe\n" + " and r2, r2, r0\n" + " sub r0, r0, #0x10\n" + " and r2, r2, r0\n" + " strb r2, [r4]\n" + " mov r0, #0x4\n" + " mov r3, r8\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._28 @cond_branch\n" + " mov r0, #0x1\n" + " orr r1, r1, r0\n" + " strb r1, [r4, #0x1]\n" + " mov r0, #0x9\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " strb r0, [r4]\n" + "._28:\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x2\n" + " and r0, r0, r5\n" + " cmp r0, #0\n" + " beq ._29 @cond_branch\n" + " ldrb r0, [r4, #0x1]\n" + " mov r1, #0x8\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0x1]\n" + "._29:\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._31:\n" + " .align 2, 0\n" + "._30:\n" + " .word gUnknown_020297ED\n" + "\n" + ); +} +#else void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) { u8 r6 = gPlayerAvatar.tileTransitionState; @@ -163,7 +387,222 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) else if (heldKeys & DPAD_RIGHT) input->dpadDirection = DIR_EAST; } +#endif +#if DEBUG +__attribute__((naked)) +int sub_8068024(struct FieldInput *input) +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffff8\n" + " add r5, r0, #0\n" + " bl player_get_direction_lower_nybble\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " mov r4, sp\n" + " mov r0, sp\n" + " bl player_get_pos_to_and_height\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " mov r2, #0x2\n" + " ldsh r1, [r4, r2]\n" + " bl MapGridGetMetatileBehaviorAt\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " ldrb r1, [r5, #0x1]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._33 @cond_branch\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " bl dive_warp\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._33 @cond_branch\n" + " b ._63\n" + "._33:\n" + " ldrb r1, [r5, #0x1]\n" + " mov r6, #0x2\n" + " add r0, r6, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._39 @cond_branch\n" + " bl CheckTrainers\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._36 @cond_branch\n" + " b ._63\n" + "._36:\n" + " ldrb r1, [r5, #0x1]\n" + " add r0, r6, #0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._39 @cond_branch\n" + " bl mapheader_run_first_tag2_script_list_match\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._39 @cond_branch\n" + " b ._63\n" + "._39:\n" + " ldrb r1, [r5]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._42 @cond_branch\n" + " bl sub_80687A4\n" + " cmp r0, #0x1\n" + " bne ._42 @cond_branch\n" + " b ._63\n" + "._42:\n" + " ldrb r1, [r5]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._44 @cond_branch\n" + " mov r0, #0x5\n" + " bl IncrementGameStat\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " add r2, r7, #0\n" + " bl sub_80687E4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._63 @cond_branch\n" + "._44:\n" + " ldrb r1, [r5]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._46 @cond_branch\n" + " add r0, r4, #0\n" + " bl is_it_battle_time_3\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._63 @cond_branch\n" + "._46:\n" + " ldrb r1, [r5]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._49 @cond_branch\n" + " ldrb r0, [r5, #0x2]\n" + " cmp r0, r7\n" + " bne ._49 @cond_branch\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " add r2, r7, #0\n" + " bl mapheader_run_first_tag2_script_list_match_conditionally\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._63 @cond_branch\n" + "._49:\n" + " mov r4, sp\n" + " mov r0, sp\n" + " bl player_get_next_pos_and_height\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " mov r2, #0x2\n" + " ldsh r1, [r4, r2]\n" + " bl MapGridGetMetatileBehaviorAt\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " ldrb r1, [r5]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._51 @cond_branch\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " add r2, r7, #0\n" + " bl sub_80681F0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._63 @cond_branch\n" + "._51:\n" + " ldrb r1, [r5]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._54 @cond_branch\n" + " ldrb r0, [r5, #0x2]\n" + " cmp r0, r7\n" + " bne ._54 @cond_branch\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " add r2, r7, #0\n" + " bl map_warp_consider_2_to_inside\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._63 @cond_branch\n" + "._54:\n" + " ldrb r1, [r5]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._56 @cond_branch\n" + " bl sub_8068770\n" + " cmp r0, #0x1\n" + " beq ._63 @cond_branch\n" + "._56:\n" + " ldrb r1, [r5]\n" + " mov r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._58 @cond_branch\n" + " mov r0, #0x6\n" + " bl PlaySE\n" + " bl sub_8071310\n" + " b ._63\n" + "._58:\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._60 @cond_branch\n" + " bl sub_80A6D1C\n" + " cmp r0, #0x1\n" + " beq ._63 @cond_branch\n" + "._60:\n" + " ldrb r1, [r5, #0x1]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._62 @cond_branch\n" + " bl debug_sub_80888D8\n" + " b ._63\n" + "._62:\n" + " mov r0, #0x4\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._64 @cond_branch\n" + " mov r0, #0x0\n" + " b ._65\n" + "._64:\n" + " mov r0, #0x6\n" + " bl PlaySE\n" + " bl DebugMenu_8077048\n" + "._63:\n" + " mov r0, #0x1\n" + "._65:\n" + " add sp, sp, #0x8\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} +#else int sub_8068024(struct FieldInput *input) { struct MapPosition position; @@ -213,6 +652,7 @@ int sub_8068024(struct FieldInput *input) return TRUE; return FALSE; } +#endif static void player_get_pos_to_and_height(struct MapPosition *position) { @@ -232,7 +672,7 @@ static void player_get_next_pos_and_height(struct MapPosition *position) position->height = 0; } -static u16 cur_mapdata_block_role_at_player_pos(int unused) +/*static*/ u16 cur_mapdata_block_role_at_player_pos(int unused) { s16 x, y; @@ -240,7 +680,7 @@ static u16 cur_mapdata_block_role_at_player_pos(int unused) return MapGridGetMetatileBehaviorAt(x, y); } -static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) +/*static*/ bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) { u8 *script = TryGetScriptOnPressingA(position, b, c); @@ -435,7 +875,7 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2) return NULL; } -static bool32 sub_8068770(void) +/*static*/ bool32 sub_8068770(void) { if (FlagGet(FLAG_BADGE07_GET) && sub_8068F18() == 2) { @@ -445,7 +885,7 @@ static bool32 sub_8068770(void) return FALSE; } -static bool32 sub_80687A4(void) +/*static*/ bool32 sub_80687A4(void) { if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1) { @@ -455,7 +895,7 @@ static bool32 sub_80687A4(void) return FALSE; } -static bool8 sub_80687E4(struct MapPosition *position, u16 b, u16 unused) +/*static*/ bool8 sub_80687E4(struct MapPosition *position, u16 b, u16 unused) { if (mapheader_trigger_activate_at__run_now(position) == TRUE) return TRUE; @@ -575,7 +1015,7 @@ void prev_quest_postbuffer_cursor_backup_reset(void) gUnknown_0202E8C0 = 0; } -static bool8 is_it_battle_time_3(u16 a) +/*static*/ bool8 is_it_battle_time_3(u16 a) { if (gUnknown_0202E8C0 < 4) { @@ -596,7 +1036,7 @@ static bool8 is_it_battle_time_3(u16 a) } } -static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *position, u16 b, u8 c) +/*static*/ bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *position, u16 b, u8 c) { s8 r6 = map_warp_check_packed(&gMapHeader, position); @@ -704,7 +1144,7 @@ static void sub_8068C30(struct MapHeader *unused, s8 b, struct MapPosition *posi } } -static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 b, u8 c) +/*static*/ bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 b, u8 c) { s8 r4; diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 77b4c8b5c..1c0cefacb 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -1917,6 +1917,40 @@ void npc_clear_ids_and_state(struct MapObject *mapObj) mapObj->mapobj_unk_1C = 0xFF; } +#if DEBUG +__attribute__((naked)) +void npcs_clear_ids_and_state() +{ + asm( + " push {r4, r5, lr}\n" + " mov r4, #0x0\n" + " ldr r5, ._2\n" + "._1:\n" + " lsl r0, r4, #0x3\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r5\n" + " bl npc_clear_ids_and_state\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0xf\n" + " bls ._1 @cond_branch\n" + " ldr r1, ._2 + 4\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._3:\n" + " .align 2, 0\n" + "._2:\n" + " .word gMapObjects\n" + " .word gUnknown_Debug_03004BC0\n" + "\n" + ); +} +#else void npcs_clear_ids_and_state(void) { u8 i; @@ -1924,6 +1958,7 @@ void npcs_clear_ids_and_state(void) for (i = 0; i < 16; i++) npc_clear_ids_and_state(&gMapObjects[i]); } +#endif void sub_805AA98(void) { @@ -2017,6 +2052,176 @@ u8 GetFieldObjectIdByLocalId(u8 localId) return 16; } +#if DEBUG +__attribute__((naked)) +u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 c) +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r9\n" + " mov r6, r8\n" + " push {r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " add r5, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r6, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " lsr r7, r2, #0x18\n" + " ldrb r0, [r5]\n" + " add r1, r6, #0\n" + " add r2, r7, #0\n" + " mov r3, sp\n" + " bl GetAvailableFieldObjectSlot\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._35 @cond_branch\n" + " mov r0, #0x10\n" + " b ._36\n" + "._35:\n" + " mov r0, sp\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._40\n" + " add r4, r0, r1\n" + " add r0, r4, #0\n" + " bl npc_clear_ids_and_state\n" + " ldrh r3, [r5, #0x4]\n" + " add r3, r3, #0x7\n" + " lsl r3, r3, #0x10\n" + " lsr r3, r3, #0x10\n" + " ldrh r2, [r5, #0x6]\n" + " add r2, r2, #0x7\n" + " lsl r2, r2, #0x10\n" + " lsr r2, r2, #0x10\n" + " ldrb r0, [r4]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " mov r1, #0x4\n" + " orr r0, r0, r1\n" + " strb r0, [r4]\n" + " ldrb r0, [r5, #0x1]\n" + " strb r0, [r4, #0x5]\n" + " ldrb r0, [r5, #0x9]\n" + " strb r0, [r4, #0x6]\n" + " ldrb r0, [r5]\n" + " strb r0, [r4, #0x8]\n" + " strb r6, [r4, #0x9]\n" + " strb r7, [r4, #0xa]\n" + " strh r3, [r4, #0xc]\n" + " strh r2, [r4, #0xe]\n" + " strh r3, [r4, #0x10]\n" + " strh r2, [r4, #0x12]\n" + " strh r3, [r4, #0x14]\n" + " strh r2, [r4, #0x16]\n" + " ldrb r0, [r5, #0x8]\n" + " mov r7, #0xf\n" + " add r1, r7, #0\n" + " and r1, r1, r0\n" + " ldrb r2, [r4, #0xb]\n" + " mov r0, #0x10\n" + " neg r0, r0\n" + " mov r8, r0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0xb]\n" + " ldrb r1, [r5, #0x8]\n" + " lsl r1, r1, #0x4\n" + " and r0, r0, r7\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0xb]\n" + " ldrb r1, [r5, #0xa]\n" + " lsl r1, r1, #0x1c\n" + " mov r0, #0xf\n" + " mov r9, r0\n" + " lsr r1, r1, #0x1c\n" + " ldrb r2, [r4, #0x19]\n" + " mov r0, r8\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0x19]\n" + " ldrb r1, [r5, #0xa]\n" + " lsr r1, r1, #0x4\n" + " lsl r1, r1, #0x4\n" + " and r0, r0, r7\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0x19]\n" + " ldrh r0, [r5, #0xc]\n" + " strb r0, [r4, #0x7]\n" + " ldrh r0, [r5, #0xe]\n" + " strb r0, [r4, #0x1d]\n" + " ldr r1, ._40 + 4\n" + " ldrb r0, [r5, #0x9]\n" + " add r0, r0, r1\n" + " ldrb r1, [r0]\n" + " add r0, r4, #0\n" + " add r0, r0, #0x20\n" + " strb r1, [r0]\n" + " ldrb r1, [r0]\n" + " add r0, r4, #0\n" + " bl FieldObjectSetDirection\n" + " add r0, r4, #0\n" + " bl FieldObjectHandleDynamicGraphicsId\n" + " ldr r1, ._40 + 8\n" + " ldrb r0, [r4, #0x6]\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._39 @cond_branch\n" + " ldrb r2, [r4, #0x19]\n" + " add r0, r7, #0\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._38 @cond_branch\n" + " lsl r0, r2, #0x1c\n" + " lsr r0, r0, #0x1c\n" + " add r0, r0, #0x1\n" + " mov r1, r9\n" + " and r0, r0, r1\n" + " mov r1, r8\n" + " and r1, r1, r2\n" + " orr r1, r1, r0\n" + " strb r1, [r4, #0x19]\n" + "._38:\n" + " ldrb r2, [r4, #0x19]\n" + " mov r0, #0xf0\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._39 @cond_branch\n" + " lsr r1, r2, #0x4\n" + " add r1, r1, #0x1\n" + " lsl r1, r1, #0x4\n" + " add r0, r7, #0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0x19]\n" + "._39:\n" + " ldr r1, ._40 + 12\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, sp\n" + " ldrb r0, [r0]\n" + "._36:\n" + " add sp, sp, #0x4\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._41:\n" + " .align 2, 0\n" + "._40:\n" + " .word gMapObjects\n" + " .word gUnknown_0836DC09\n" + " .word gUnknown_0836DBBC\n" + " .word gUnknown_Debug_03004BC0\n" + "\n" + ); +} +#else #ifdef NONMATCHING u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 c) { @@ -2227,6 +2432,7 @@ _0805ADD8: .4byte gUnknown_0836DBBC\n\ .syntax divided\n"); } #endif +#endif u8 sub_805ADDC(u8 localId) { @@ -2266,11 +2472,38 @@ u8 GetAvailableFieldObjectSlot(u16 a, u8 b, u8 c, u8 *d) return 0; } +#if DEBUG +__attribute__((naked)) +void RemoveFieldObject(struct MapObject *mapObject) +{ + asm( + " push {lr}\n" + " ldrb r2, [r0]\n" + " mov r1, #0x2\n" + " neg r1, r1\n" + " and r1, r1, r2\n" + " strb r1, [r0]\n" + " bl RemoveFieldObjectInternal\n" + " ldr r1, ._72\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " pop {r0}\n" + " bx r0\n" + "._73:\n" + " .align 2, 0\n" + "._72:\n" + " .word gUnknown_Debug_03004BC0\n" + "\n" + ); +} +#else void RemoveFieldObject(struct MapObject *mapObject) { mapObject->active = FALSE; RemoveFieldObjectInternal(mapObject); } +#endif void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { @@ -2303,6 +2536,226 @@ void npc_hide_all_but_player(void) } } +#if DEBUG +__attribute__((naked)) +u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, u8 c, u8 d, s16 e, s16 f) +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add r7, r1, #0\n" + " add r1, r2, #0\n" + " add r2, r3, #0\n" + " ldr r3, [sp, #0x20]\n" + " ldr r4, [sp, #0x24]\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " lsl r3, r3, #0x10\n" + " lsr r3, r3, #0x10\n" + " mov r9, r3\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " mov sl, r4\n" + " bl InitFieldObjectStateFromTemplate\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " cmp r0, #0x10\n" + " bne ._83 @cond_branch\n" + " mov r0, #0x10\n" + " b ._92\n" + "._83:\n" + " mov r0, r8\n" + " lsl r4, r0, #0x3\n" + " add r0, r4, r0\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._87\n" + " add r5, r0, r1\n" + " ldrb r0, [r5, #0x5]\n" + " bl GetFieldObjectGraphicsInfo\n" + " add r6, r0, #0\n" + " ldrb r1, [r6, #0xc]\n" + " mov r0, #0xf\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._85 @cond_branch\n" + " ldrh r0, [r6, #0x2]\n" + " lsl r1, r1, #0x1c\n" + " lsr r1, r1, #0x1c\n" + " bl npc_load_two_palettes__no_record\n" + " b ._89\n" + "._88:\n" + " .align 2, 0\n" + "._87:\n" + " .word gMapObjects\n" + "._85:\n" + " cmp r0, #0xa\n" + " bne ._89 @cond_branch\n" + " ldrh r0, [r6, #0x2]\n" + " lsl r1, r1, #0x1c\n" + " lsr r1, r1, #0x1c\n" + " bl npc_load_two_palettes__and_record\n" + "._89:\n" + " ldrb r0, [r5, #0x6]\n" + " cmp r0, #0x4c\n" + " bne ._90 @cond_branch\n" + " ldrb r0, [r5, #0x1]\n" + " mov r1, #0x20\n" + " orr r0, r0, r1\n" + " strb r0, [r5, #0x1]\n" + "._90:\n" + " ldr r1, ._93\n" + " add r0, r1, #0\n" + " strh r0, [r7, #0x2]\n" + " add r0, r7, #0\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " mov r3, #0x0\n" + " bl CreateSprite\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " cmp r7, #0x40\n" + " bne ._91 @cond_branch\n" + " ldr r1, ._93 + 4\n" + " ldrb r0, [r1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r0, ._93 + 8\n" + " mov r2, r8\n" + " add r1, r4, r2\n" + " lsl r1, r1, #0x2\n" + " add r1, r1, r0\n" + " ldrb r2, [r1]\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " strb r0, [r1]\n" + " mov r0, #0x10\n" + " b ._92\n" + "._94:\n" + " .align 2, 0\n" + "._93:\n" + " .word 0xffff\n" + " .word gUnknown_Debug_03004BC0\n" + " .word gMapObjects\n" + "._91:\n" + " lsl r0, r7, #0x4\n" + " add r0, r0, r7\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._96\n" + " add r4, r0, r1\n" + " mov r1, r9\n" + " lsl r0, r1, #0x10\n" + " asr r0, r0, #0x10\n" + " ldrh r2, [r5, #0x10]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x10\n" + " asr r0, r0, #0x10\n" + " mov r2, sl\n" + " lsl r1, r2, #0x10\n" + " asr r1, r1, #0x10\n" + " ldrh r2, [r5, #0x12]\n" + " add r1, r1, r2\n" + " lsl r1, r1, #0x10\n" + " asr r1, r1, #0x10\n" + " add r2, r4, #0\n" + " add r2, r2, #0x20\n" + " add r3, r4, #0\n" + " add r3, r3, #0x22\n" + " bl sub_8060388\n" + " ldrh r0, [r6, #0x8]\n" + " lsl r0, r0, #0x10\n" + " asr r0, r0, #0x11\n" + " neg r0, r0\n" + " add r1, r4, #0\n" + " add r1, r1, #0x28\n" + " strb r0, [r1]\n" + " ldrh r0, [r6, #0xa]\n" + " lsl r0, r0, #0x10\n" + " asr r0, r0, #0x11\n" + " neg r0, r0\n" + " add r2, r4, #0\n" + " add r2, r2, #0x29\n" + " strb r0, [r2]\n" + " ldrh r0, [r4, #0x20]\n" + " add r0, r0, #0x8\n" + " strh r0, [r4, #0x20]\n" + " ldrh r1, [r4, #0x22]\n" + " add r1, r1, #0x10\n" + " mov r0, #0x0\n" + " ldsb r0, [r2, r0]\n" + " add r0, r0, r1\n" + " strh r0, [r4, #0x22]\n" + " ldrb r1, [r6, #0xc]\n" + " lsl r1, r1, #0x1c\n" + " lsr r1, r1, #0x18\n" + " ldrb r2, [r4, #0x5]\n" + " mov r0, #0xf\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r4, #0x5]\n" + " add r2, r4, #0\n" + " add r2, r2, #0x3e\n" + " ldrb r0, [r2]\n" + " mov r1, #0x2\n" + " orr r0, r0, r1\n" + " strb r0, [r2]\n" + " mov r0, r8\n" + " strh r0, [r4, #0x2e]\n" + " strb r7, [r5, #0x4]\n" + " ldrb r1, [r6, #0xc]\n" + " lsl r1, r1, #0x19\n" + " lsr r1, r1, #0x1f\n" + " lsl r1, r1, #0x4\n" + " ldrb r2, [r5, #0x1]\n" + " mov r0, #0x11\n" + " neg r0, r0\n" + " and r0, r0, r2\n" + " orr r0, r0, r1\n" + " strb r0, [r5, #0x1]\n" + " lsl r0, r0, #0x1b\n" + " cmp r0, #0\n" + " blt ._95 @cond_branch\n" + " ldrb r0, [r5, #0x18]\n" + " lsl r0, r0, #0x1c\n" + " lsr r0, r0, #0x1c\n" + " bl FieldObjectDirectionToImageAnimId\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " add r0, r4, #0\n" + " bl StartSpriteAnim\n" + "._95:\n" + " ldrb r0, [r5, #0xb]\n" + " lsr r0, r0, #0x4\n" + " add r1, r4, #0\n" + " mov r2, #0x1\n" + " bl SetObjectSubpriorityByZCoord\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " bl sub_80634D0\n" + " mov r0, r8\n" + "._92:\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._97:\n" + " .align 2, 0\n" + "._96:\n" + " .word gSprites\n" + "\n" + ); +} +#else u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, u8 c, u8 d, s16 e, s16 f) { u8 mapObjectId; @@ -2352,6 +2805,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * sub_80634D0(mapObject, sprite); return mapObjectId; } +#endif u8 SpawnFieldObject(struct MapObjectTemplate *mapObjTemplate, u8 b, u8 c, s16 d, s16 e) { @@ -2574,6 +3028,66 @@ void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) void sub_805B75C(u8, s16, s16); +#if DEBUG +__attribute__((naked)) +void sub_805B710(u16 u161, u16 u162) +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add r4, r0, #0\n" + " add r5, r1, #0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " lsl r5, r5, #0x10\n" + " lsr r5, r5, #0x10\n" + " ldr r6, ._153\n" + " mov r0, #0x0\n" + " strb r0, [r6]\n" + " bl ClearPlayerAvatarInfo\n" + " mov r7, #0x0\n" + " ldr r0, ._153 + 4\n" + " mov r8, r0\n" + " lsl r4, r4, #0x10\n" + " lsl r5, r5, #0x10\n" + "._152:\n" + " lsl r0, r7, #0x3\n" + " add r0, r0, r7\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r8\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x1f\n" + " cmp r0, #0\n" + " beq ._151 @cond_branch\n" + " add r0, r7, #0\n" + " asr r1, r4, #0x10\n" + " asr r2, r5, #0x10\n" + " bl sub_805B75C\n" + " ldrb r0, [r6]\n" + " add r0, r0, #0x1\n" + " strb r0, [r6]\n" + "._151:\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " cmp r7, #0xf\n" + " bls ._152 @cond_branch\n" + " bl sub_805AAB0\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._154:\n" + " .align 2, 0\n" + "._153:\n" + " .word gUnknown_Debug_03004BC0\n" + " .word gMapObjects\n" + "\n" + ); +} +#else void sub_805B710(u16 a, u16 b) { u8 i; @@ -2586,6 +3100,7 @@ void sub_805B710(u16 a, u16 b) } sub_805AAB0(); } +#endif extern void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8); extern void sub_805B914(struct MapObject *); diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 9a29e2e92..747edf816 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -32,9 +32,9 @@ static void npc_clear_strange_bits(struct MapObject *a); static void MovePlayerAvatarUsingKeypadInput(u8 a, u16 b, u16 c); static void PlayerAllowForcedMovementIfMovingSameDirection(void); static bool8 TryDoMetatileBehaviorForcedMovement(void); -static u8 GetForcedMovementByMetatileBehavior(void); +/*static*/ u8 GetForcedMovementByMetatileBehavior(void); static void MovePlayerNotOnBike(u8 a, u16 b); -static u8 CheckMovementInputNotOnBike(u8 a); +/*static*/ u8 CheckMovementInputNotOnBike(u8 a); static u8 CheckForPlayerAvatarCollision(u8 a); static u8 sub_8058EF0(s16 a, s16 b, u8 c); static bool8 ShouldJumpLedge(s16 a, s16 b, u8 c); @@ -260,12 +260,59 @@ static void PlayerAllowForcedMovementIfMovingSameDirection(void) gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_5; } +#if DEBUG +__attribute__((naked)) +u8 TryDoMetatileBehaviorForcedMovement() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._27\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._25 @cond_branch\n" + " ldr r0, ._27 + 4\n" + " ldrh r1, [r0, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._25 @cond_branch\n" + " mov r0, #0x0\n" + " b ._26\n" + "._28:\n" + " .align 2, 0\n" + "._27:\n" + " .word gUnknown_020297ED\n" + " .word gMain\n" + "._25:\n" + " ldr r4, ._29\n" + " bl GetForcedMovementByMetatileBehavior\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x16\n" + " add r0, r0, r4\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + "._26:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._30:\n" + " .align 2, 0\n" + "._29:\n" + " .word gUnknown_0830FBA0\n" + "\n" + ); +} +#else static bool8 TryDoMetatileBehaviorForcedMovement(void) { return gUnknown_0830FBA0[GetForcedMovementByMetatileBehavior()](); } +#endif -static u8 GetForcedMovementByMetatileBehavior(void) +/*static*/ u8 GetForcedMovementByMetatileBehavior(void) { u8 i; @@ -436,12 +483,57 @@ bool8 ForcedMovement_MuddySlope(void) } } +#if DEBUG +__attribute__((naked)) +void MovePlayerNotOnBike(u8 u81, u16 u161) +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " add r5, r2, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r6, r1, #0x10\n" + " ldr r0, ._84\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._82 @cond_branch\n" + " add r0, r2, #0\n" + " bl debug_sub_805F2B0\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._83 @cond_branch\n" + "._82:\n" + " ldr r4, ._84 + 4\n" + " add r0, r5, #0\n" + " bl CheckMovementInputNotOnBike\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x16\n" + " add r0, r0, r4\n" + " ldr r2, [r0]\n" + " add r0, r5, #0\n" + " add r1, r6, #0\n" + " bl gScriptFuncs_End+0x3cfc\n" + "._83:\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._85:\n" + " .align 2, 0\n" + "._84:\n" + " .word gUnknown_020297ED\n" + " .word gUnknown_0830FBEC\n" + "\n" + ); +} +#else static void MovePlayerNotOnBike(u8 direction, u16 heldKeys) { gUnknown_0830FBEC[CheckMovementInputNotOnBike(direction)](direction, heldKeys); } +#endif -static u8 CheckMovementInputNotOnBike(u8 direction) +/*static*/ u8 CheckMovementInputNotOnBike(u8 direction) { if (direction == DIR_NONE) { diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 0a841eed1..1b53df6be 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -250,6 +250,87 @@ void SetupMauvilleOldMan(void) sub_80F83D0(); } +#ifdef DEBUG +__attribute__((naked)) +void debug_sub_810B32C() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x4\n" + " bhi ._37 @cond_branch\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._23\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._24:\n" + " .align 2, 0\n" + "._23:\n" + " .word ._22\n" + "._22:\n" + " .word ._25\n" + " .word ._26\n" + " .word ._27\n" + " .word ._28\n" + " .word ._29\n" + "._25:\n" + " bl sub_80F7A34\n" + " b ._37\n" + "._26:\n" + " mov r2, #0x0\n" + " ldr r3, ._34\n" + "._31:\n" + " mov r0, sp\n" + " add r1, r0, r2\n" + " add r0, r2, r3\n" + " ldrb r0, [r0]\n" + " strb r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x7\n" + " bls ._31 @cond_branch\n" + " bl sub_80F7A6C\n" + " mov r2, #0x0\n" + " ldr r3, ._34\n" + "._32:\n" + " add r1, r2, r3\n" + " mov r4, sp\n" + " add r0, r4, r2\n" + " ldrb r0, [r0]\n" + " strb r0, [r1]\n" + " add r0, r2, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " cmp r2, #0x7\n" + " bls ._32 @cond_branch\n" + " b ._37\n" + "._35:\n" + " .align 2, 0\n" + "._34:\n" + " .word gSaveBlock1+0x2d8c\n" + "._27:\n" + " bl sub_80F7A98\n" + " b ._37\n" + "._28:\n" + " bl sub_80F7A7C\n" + " b ._37\n" + "._29:\n" + " bl sub_80F7A88\n" + "._37:\n" + " bl sub_80F83D0\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} +#endif + static u8 GetCurrentMauvilleOldMan(void) { struct MauvilleManCommon *common = &gSaveBlock1.mauvilleMan.common; diff --git a/src/field/overworld.c b/src/field/overworld.c index 86b0a5dac..8346ce3f9 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -25,6 +25,7 @@ #include "link.h" #include "load_save.h" #include "main.h" +#include "m4a.h" #include "constants/maps.h" #include "map_name_popup.h" #include "menu.h" @@ -62,6 +63,7 @@ struct UnkTVStruct u32 tv_field_4; }; +extern u8 gUnknown_020297ED; extern u16 gUnknown_03004898; extern u16 gUnknown_0300489C; @@ -1106,6 +1108,68 @@ u8 sav1_map_get_battletype(void) return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum)->battleType; } +#if DEBUG + +void debug_sub_8076B68(void); + +void debug_sub_80589D8(void); + +void debug_sub_8058A50(void); + +void CB2_InitTestMenu(void) +{ + m4aSoundVSyncOff(); + SetVBlankCallback(NULL); + DmaFill32(3, 0, (void *) VRAM, VRAM_SIZE); + DmaFill32(3, 0, (void *) PLTT, PLTT_SIZE); + ResetPaletteFade(); + ResetSpriteData(); + ResetTasks(); + ScanlineEffect_Stop(); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); + debug_sub_8076B68(); + BeginNormalPaletteFade(-1, 0, 16, 0, 0); + REG_IE |= 1; + REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP; + m4aSoundVSyncOn(); + SetVBlankCallback(debug_sub_8058A50); + m4aSongNumStart(0x19D); + SetMainCallback2(debug_sub_80589D8); +} + +void debug_sub_80589D8(void) +{ + if (UpdatePaletteFade()) + return; + + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); +} + +void debug_sub_80589F4(void) +{ + if (UpdatePaletteFade()) + return; + + SetVBlankCallback(NULL); + + DmaFill32(3, 0, (void *) VRAM, VRAM_SIZE); + DmaFill32(3, 0, (void *) PLTT, PLTT_SIZE); + + SetMainCallback2(gMain.savedCallback); +} + +void debug_sub_8058A50(void) +{ + ProcessSpriteCopyRequests(); + LoadOam(); + TransferPlttBuffer(); +} + +#endif + void ResetSafariZoneFlag_(void) { ResetSafariZoneFlag(); @@ -1210,6 +1274,33 @@ void CB2_NewGame(void) SetMainCallback2(c2_overworld); } +#if DEBUG + +extern void (*gFieldCallback)(void); + +void debug_sub_8058C00(void) +{ + FieldClearVBlankHBlankCallbacks(); + StopMapMusic(); + ResetSafariZoneFlag_(); + player_avatar_init_params_reset(); + PlayTimeCounter_Start(); + ScriptContext1_Init(); + ScriptContext2_Disable(); + + if (gMain.heldKeys & R_BUTTON) + gFieldCallback = ExecuteTruckSequence; + else + gFieldCallback = sub_8080B60; + + do_load_map_stuff_loop(&gMain.state); + SetFieldVBlankCallback(); + set_callback1(c1_overworld); + SetMainCallback2(c2_overworld); +} + +#endif + void CB2_WhiteOut(void) { u8 val; @@ -1365,6 +1456,10 @@ void CB2_ContinueSavedGame(void) { FieldClearVBlankHBlankCallbacks(); StopMapMusic(); +#if DEBUG + if (gMain.heldKeys & R_BUTTON) + gUnknown_020297ED = TRUE; +#endif ResetSafariZoneFlag_(); LoadSaveblockMapHeader(); LoadSaveblockMapObjScripts(); diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 7d243f569..053368a0e 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -4022,6 +4022,10 @@ void TeachMonTMMove(u8 taskId, u16 move, TaskFunc func) CreateTask(Task_TeamMonTMMove, 5); } +#ifdef DEBUG +extern u8 gUnknown_020297ED; +#endif + void Task_TeamMonTMMove(u8 taskId) { GetMonNickname(ewram1C000.pokemon, gStringVar1); @@ -4036,7 +4040,11 @@ void Task_TeamMonTMMove(u8 taskId) } else { - if (!CanMonLearnTMHM(ewram1C000.pokemon, ewram1C000.unk6 - 33)) + if ( +#ifdef DEBUG + !gUnknown_020297ED && +#endif + !CanMonLearnTMHM(ewram1C000.pokemon, ewram1C000.unk6 - 33)) { StringExpandPlaceholders(gStringVar4, gOtherText_NotCompatible); sub_806E834(gStringVar4, 1); @@ -5514,9 +5522,13 @@ _08070F8A:\n\ } #endif // NONMATCHING + +// Maybe this goes in start_menu.c +#if !DEBUG void unref_sub_8070F90(void) { FlagSet(FLAG_SYS_POKEDEX_GET); FlagSet(FLAG_SYS_POKEMON_GET); FlagSet(FLAG_SYS_POKENAV_GET); } +#endif diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 7e8bdc2ce..73fa53d97 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -95,7 +95,8 @@ static const u8 *gUnknown_03000758; #define GFX_TAG_POKEBLOCK_CASE 14800 -const s8 gPokeblockFlavorCompatibilityTable[] = { +const s8 gPokeblockFlavorCompatibilityTable[] = +{ // Cool, Beauty, Cute, Smart, Tough 0, 0, 0, 0, 0, // Hardy 1, 0, 0, 0, -1, // Lonely @@ -124,14 +125,16 @@ const s8 gPokeblockFlavorCompatibilityTable[] = { 0, 0, 0, 0, 0 // Quirky }; -void (*const gUnknown_083F7EA8[])(void) = { +void (*const gUnknown_083F7EA8[])(void) = +{ sub_80A5B40, c2_exit_to_overworld_2_switch, sub_802E424, c2_exit_to_overworld_2_switch }; -const u8 *const gPokeblockNames[] = { +const u8 *const gPokeblockNames[] = +{ NULL, ContestStatsText_RedPokeBlock, ContestStatsText_BluePokeBlock, @@ -149,7 +152,8 @@ const u8 *const gPokeblockNames[] = { ContestStatsText_GoldPokeBlock }; -const struct MenuAction2 gUnknown_083F7EF4[] = { +const struct MenuAction2 gUnknown_083F7EF4[] = +{ {OtherText_Use, sub_810C508}, {OtherText_Toss, sub_810C5C0}, {gOtherText_CancelNoTerminator, sub_810C748}, @@ -165,21 +169,25 @@ const struct YesNoFuncTable gUnknown_083F7F24 = {sub_810C610, sub_810C668}; const u8 UnreferencedData_083F7F2C[] = {0x16, 0x17, 0x18, 0x21, 0x2f}; -const struct OamData gOamData_83F7F34 = { +const struct OamData gOamData_83F7F34 = +{ .size = 3, .priority = 2 }; -const union AnimCmd gSpriteAnim_83F7F3C[] = { +const union AnimCmd gSpriteAnim_83F7F3C[] = +{ ANIMCMD_FRAME(.imageValue = 0, .duration = 0), ANIMCMD_END }; -const union AnimCmd *const gSpriteAnimTable_83F7F44[] = { +const union AnimCmd *const gSpriteAnimTable_83F7F44[] = +{ gSpriteAnim_83F7F3C }; -const union AffineAnimCmd gSpriteAffineAnim_83F7F48[] = { +const union AffineAnimCmd gSpriteAffineAnim_83F7F48[] = +{ AFFINEANIMCMD_FRAME(0, 0, -2, 2), AFFINEANIMCMD_FRAME(0, 0, 2, 4), AFFINEANIMCMD_FRAME(0, 0, -2, 4), @@ -187,22 +195,26 @@ const union AffineAnimCmd gSpriteAffineAnim_83F7F48[] = { AFFINEANIMCMD_END }; -const union AffineAnimCmd *const gSpriteAffineAnimTable_83F7F70[] = { +const union AffineAnimCmd *const gSpriteAffineAnimTable_83F7F70[] = +{ gSpriteAffineAnim_83F7F48 }; -const struct CompressedSpriteSheet gUnknown_083F7F74 = { +const struct CompressedSpriteSheet gUnknown_083F7F74 = +{ gMenuPokeblockDevice_Gfx, 0x800, GFX_TAG_POKEBLOCK_CASE }; -const struct CompressedSpritePalette gUnknown_083F7F7C = { +const struct CompressedSpritePalette gUnknown_083F7F7C = +{ gMenuPokeblockDevice_Pal, GFX_TAG_POKEBLOCK_CASE }; -const struct SpriteTemplate gSpriteTemplate_83F7F84 = { +const struct SpriteTemplate gSpriteTemplate_83F7F84 = +{ GFX_TAG_POKEBLOCK_CASE, GFX_TAG_POKEBLOCK_CASE, &gOamData_83F7F34, @@ -212,7 +224,8 @@ const struct SpriteTemplate gSpriteTemplate_83F7F84 = { SpriteCallbackDummy }; -const struct Pokeblock gUnknown_083F7F9C[] = { +const struct Pokeblock gUnknown_083F7F9C[] = +{ { PBLOCK_CLR_RED, 20, 0, 0, 0, 0, 20}, { PBLOCK_CLR_BLUE, 0, 20, 0, 0, 0, 20}, { PBLOCK_CLR_PINK, 0, 0, 20, 0, 0, 20}, @@ -432,14 +445,13 @@ void OpenPokeblockCaseOnFeeder(void) SetMainCallback2(sub_810B96C); } -#ifdef DEBUG +#if DEBUG void debug_sub_8120F98(void) { u8 i; - for (i=0; i<40 && gUnknown_083F7F9C[i].color != 0; i++) - { + + for (i = 0; i < 40 && gUnknown_083F7F9C[i].color != 0; i++) gSaveBlock1.pokeblocks[i] = gUnknown_083F7F9C[i]; - } } #endif diff --git a/src/field/roamer.c b/src/field/roamer.c index 2eb26ef9d..16a42e9f1 100644 --- a/src/field/roamer.c +++ b/src/field/roamer.c @@ -1,7 +1,9 @@ #include "global.h" +#include "debug.h" #include "roamer.h" #include "pokemon.h" #include "random.h" +#include "region_map.h" #include "constants/species.h" #ifdef SAPPHIRE @@ -224,3 +226,20 @@ void GetRoamerLocation(u8 *mapGroup, u8 *mapNum) *mapGroup = sRoamerLocation[MAP_GRP]; *mapNum = sRoamerLocation[MAP_NUM]; } + +#ifdef DEBUG +void debug_sub_814A714(void) +{ + if (gSaveBlock1.location.mapGroup == 0) + { + CreateInitialRoamerMon(); + sRoamerLocation[0] = 0; + sRoamerLocation[1] = gSaveBlock1.location.mapNum; + } +} + +void debug_sub_814A73C(u8* str) +{ + GetMapSectionName(str, sRoamerLocation[1], 0); +} +#endif diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 9ff3a037c..e231f686d 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -17,7 +17,8 @@ #include "menu.h" #include "ewram.h" -struct UnkStruct1 { +struct UnkStruct1 +{ /*0x00*/ u8 unk00; /*0x01*/ u8 unk01; /*0x02*/ s16 unk02; @@ -2854,7 +2855,13 @@ static void sub_8104C5C(void) static void LoadSlotMachineWheelOverlay(void); -static void sub_8104CAC(u8 arg0) { +#ifdef DEBUG +// should be static +__attribute__((section(".bss"))) u8 unk_debug_bss_1[0xC] = { 0 }; +#endif + +static void sub_8104CAC(u8 arg0) +{ u8 i; struct Task *task; @@ -2875,9 +2882,7 @@ static void sub_8104CAC(u8 arg0) { #ifdef GERMAN if (arg0 == 5 && i <= 2) - { gSprites[spriteId].invisible = TRUE; - } #endif } } @@ -3966,7 +3971,8 @@ static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) { vram[16 * 32 + 1 + arg0] = arg4; } -static void sub_81065DC(void) { +static void sub_81065DC(void) +{ s16 y, x; u16 *screen; @@ -3982,7 +3988,1226 @@ static void sub_81065DC(void) { } } -static const u8 sReelSymbols[][21] = { +#if DEBUG +__attribute__((naked)) +void debug_sub_811B1C4() +{ + asm( + " ldr r1, ._1\n" + " ldrb r0, [r1]\n" + " mov r3, #0x2\n" + " orr r0, r0, r3\n" + " strb r0, [r1]\n" + " ldr r2, ._1 + 4\n" + " ldrb r1, [r2]\n" + " mov r0, #0x2\n" + " eor r1, r1, r0\n" + " neg r0, r1\n" + " orr r0, r0, r1\n" + " asr r0, r0, #0x1f\n" + " and r0, r0, r3\n" + " strb r0, [r2]\n" + " bx lr\n" + "._2:\n" + " .align 2, 0\n" + "._1:\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B1EC() +{ + asm( + " ldr r2, ._3\n" + " ldrb r0, [r2]\n" + " mov r1, #0x1\n" + " orr r0, r0, r1\n" + " strb r0, [r2]\n" + " ldr r2, ._3 + 4\n" + " ldrb r0, [r2]\n" + " mov r1, #0x1\n" + " eor r0, r0, r1\n" + " neg r0, r0\n" + " lsr r0, r0, #0x1f\n" + " strb r0, [r2]\n" + " bx lr\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B210() +{ + asm( + " ldr r1, ._5\n" + " ldrb r0, [r1]\n" + " mov r3, #0x4\n" + " orr r0, r0, r3\n" + " strb r0, [r1]\n" + " ldr r2, ._5 + 4\n" + " ldrb r1, [r2]\n" + " mov r0, #0x4\n" + " eor r1, r1, r0\n" + " neg r0, r1\n" + " orr r0, r0, r1\n" + " asr r0, r0, #0x1f\n" + " and r0, r0, r3\n" + " strb r0, [r2]\n" + " bx lr\n" + "._6:\n" + " .align 2, 0\n" + "._5:\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B238() +{ + asm( + " ldr r1, ._7\n" + " ldrb r0, [r1]\n" + " mov r3, #0x8\n" + " orr r0, r0, r3\n" + " strb r0, [r1]\n" + " ldr r2, ._7 + 4\n" + " ldrb r1, [r2]\n" + " mov r0, #0x8\n" + " eor r1, r1, r0\n" + " neg r0, r1\n" + " orr r0, r0, r1\n" + " asr r0, r0, #0x1f\n" + " and r0, r0, r3\n" + " strb r0, [r2]\n" + " bx lr\n" + "._8:\n" + " .align 2, 0\n" + "._7:\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B260() +{ + asm( + " ldr r1, ._9\n" + " ldrb r0, [r1]\n" + " mov r3, #0x10\n" + " orr r0, r0, r3\n" + " strb r0, [r1]\n" + " ldr r2, ._9 + 4\n" + " ldrb r1, [r2]\n" + " mov r0, #0x10\n" + " eor r1, r1, r0\n" + " neg r0, r1\n" + " orr r0, r0, r1\n" + " asr r0, r0, #0x1f\n" + " and r0, r0, r3\n" + " strb r0, [r2]\n" + " bx lr\n" + "._10:\n" + " .align 2, 0\n" + "._9:\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B288() +{ + asm( + " ldr r1, ._11\n" + " ldrb r0, [r1]\n" + " mov r3, #0x40\n" + " orr r0, r0, r3\n" + " strb r0, [r1]\n" + " ldr r2, ._11 + 4\n" + " ldrb r1, [r2]\n" + " mov r0, #0x40\n" + " eor r1, r1, r0\n" + " neg r0, r1\n" + " orr r0, r0, r1\n" + " asr r0, r0, #0x1f\n" + " and r0, r0, r3\n" + " strb r0, [r2]\n" + " bx lr\n" + "._12:\n" + " .align 2, 0\n" + "._11:\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B2B0() +{ + asm( + " ldr r1, ._13\n" + " ldrb r0, [r1]\n" + " mov r3, #0x80\n" + " orr r0, r0, r3\n" + " strb r0, [r1]\n" + " ldr r2, ._13 + 4\n" + " ldrb r1, [r2]\n" + " mov r0, #0x80\n" + " eor r1, r1, r0\n" + " neg r0, r1\n" + " orr r0, r0, r1\n" + " asr r0, r0, #0x1f\n" + " and r0, r0, r3\n" + " strb r0, [r2]\n" + " bx lr\n" + "._14:\n" + " .align 2, 0\n" + "._13:\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B2D8() +{ + asm( + " ldr r0, ._15\n" + " ldrb r1, [r0]\n" + " mov r2, #0x20\n" + " orr r1, r1, r2\n" + " strb r1, [r0]\n" + " bx lr\n" + "._16:\n" + " .align 2, 0\n" + "._15:\n" + " .word unk_debug_bss_1+0x3\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B2E8() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffffc\n" + " ldr r0, ._17\n" + " ldrb r1, [r0, #0x1]\n" + " add r1, r1, #0x1\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x6\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " add sp, sp, #0x4\n" + " pop {r0}\n" + " bx r0\n" + "._18:\n" + " .align 2, 0\n" + "._17:\n" + " .word +0x2000000\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B310() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " ldr r0, ._21\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 4\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 8\n" + " mov r1, #0x1\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 12\n" + " mov r1, #0x1\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 16\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 20\n" + " mov r1, #0x1\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 24\n" + " mov r1, #0x1\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 28\n" + " mov r1, #0x1\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 32\n" + " mov r1, #0x1\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 36\n" + " mov r1, #0xf\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 40\n" + " mov r1, #0xf\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 44\n" + " mov r1, #0xf\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 48\n" + " mov r1, #0xf\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 52\n" + " mov r1, #0xf\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 56\n" + " mov r1, #0xf\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 60\n" + " mov r1, #0xf\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 64\n" + " mov r1, #0xf\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 68\n" + " mov r1, #0xf\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " ldr r0, ._21 + 72\n" + " ldrb r0, [r0, #0x3]\n" + " cmp r0, #0\n" + " bne ._19 @cond_branch\n" + " ldr r0, ._21 + 76\n" + " mov r1, #0xa\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " b ._20\n" + "._22:\n" + " .align 2, 0\n" + "._21:\n" + " .word Str_841B1C4\n" + " .word Str_841B1CB\n" + " .word Str_841B1D4\n" + " .word Str_841B1DB\n" + " .word Str_841B1E2\n" + " .word Str_841B1E8\n" + " .word Str_841B1F3\n" + " .word Str_841B202\n" + " .word Str_841B24C\n" + " .word Str_841B211\n" + " .word Str_841B219\n" + " .word Str_841B220\n" + " .word Str_841B227\n" + " .word Str_841B22E\n" + " .word Str_841B235\n" + " .word Str_841B23B\n" + " .word Str_841B23F\n" + " .word Str_841B243\n" + " .word +0x2000000\n" + " .word Str_841B246\n" + "._19:\n" + " ldr r0, ._30\n" + " mov r1, #0xa\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + "._20:\n" + " ldr r4, ._30 + 4\n" + " ldr r1, [r4, #0x68]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0xa\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r1, [r4, #0x6c]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0xa\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " mov r0, #0x10\n" + " ldsh r1, [r4, r0]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0xa\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r1, [r4, #0x70]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r1, [r4, #0x74]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldr r1, [r4, #0x78]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0x7\n" + " bl MenuPrint\n" + " ldr r1, [r4, #0x7c]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " add r0, r0, #0x80\n" + " ldr r1, [r0]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0xb\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " add r0, r0, #0x84\n" + " ldr r1, [r0]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " add r0, r0, #0x88\n" + " ldr r1, [r0]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " add r0, r0, #0x8c\n" + " ldr r1, [r0]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0x14\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " ldr r1, ._30 + 8\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._23 @cond_branch\n" + " mov r2, #0x0\n" + " cmp r0, #0x8\n" + " beq ._24 @cond_branch\n" + " cmp r0, #0x8\n" + " bgt ._25 @cond_branch\n" + " cmp r0, #0x2\n" + " beq ._26 @cond_branch\n" + " cmp r0, #0x2\n" + " bgt ._27 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._28 @cond_branch\n" + " b ._45\n" + "._31:\n" + " .align 2, 0\n" + "._30:\n" + " .word Str_841B249\n" + " .word +0x2000000\n" + " .word unk_debug_bss_1\n" + "._27:\n" + " cmp r0, #0x4\n" + " beq ._32 @cond_branch\n" + " b ._45\n" + "._25:\n" + " cmp r0, #0x40\n" + " beq ._34 @cond_branch\n" + " cmp r0, #0x40\n" + " bgt ._35 @cond_branch\n" + " cmp r0, #0x10\n" + " beq ._36 @cond_branch\n" + " b ._45\n" + "._35:\n" + " cmp r0, #0x80\n" + " beq ._38 @cond_branch\n" + " b ._45\n" + "._26:\n" + " mov r2, #0x3\n" + " b ._45\n" + "._28:\n" + " mov r2, #0x5\n" + " b ._45\n" + "._32:\n" + " mov r2, #0x7\n" + " b ._45\n" + "._24:\n" + " mov r2, #0x9\n" + " b ._45\n" + "._36:\n" + " mov r2, #0xb\n" + " b ._45\n" + "._34:\n" + " mov r2, #0xd\n" + " b ._45\n" + "._38:\n" + " mov r2, #0xf\n" + "._45:\n" + " ldr r0, ._46\n" + " mov r1, #0x17\n" + " bl MenuPrint\n" + "._23:\n" + " bl debug_sub_811B2E8\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._47:\n" + " .align 2, 0\n" + "._46:\n" + " .word Str_841B26D\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B5B4() +{ + asm( + " push {lr}\n" + " add r2, r0, #0\n" + " ldr r0, [r2]\n" + " add r0, r0, r1\n" + " str r0, [r2]\n" + " ldr r1, ._49\n" + " cmp r0, r1\n" + " ble ._48 @cond_branch\n" + " str r1, [r2]\n" + "._48:\n" + " pop {r0}\n" + " bx r0\n" + "._50:\n" + " .align 2, 0\n" + "._49:\n" + " .word 0x270f\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B5D0() +{ + asm( + " ldr r0, ._51\n" + " mov r1, #0x0\n" + " strb r1, [r0]\n" + " ldr r0, ._51 + 4\n" + " strb r1, [r0]\n" + " ldr r0, ._51 + 8\n" + " strb r1, [r0]\n" + " ldr r0, ._51 + 12\n" + " strb r1, [r0]\n" + " ldr r2, ._51 + 16\n" + " mov r0, #0x0\n" + " str r0, [r2, #0x68]\n" + " str r0, [r2, #0x6c]\n" + " str r0, [r2, #0x70]\n" + " str r0, [r2, #0x74]\n" + " str r0, [r2, #0x78]\n" + " str r0, [r2, #0x7c]\n" + " add r1, r2, #0\n" + " add r1, r1, #0x80\n" + " str r0, [r1]\n" + " add r1, r1, #0x4\n" + " str r0, [r1]\n" + " add r1, r1, #0x4\n" + " str r0, [r1]\n" + " add r1, r1, #0x4\n" + " str r0, [r1]\n" + " add r1, r1, #0x4\n" + " str r0, [r1]\n" + " bx lr\n" + "._52:\n" + " .align 2, 0\n" + "._51:\n" + " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1+0x2\n" + " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1+0x4\n" + " .word +0x2000000\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B620() +{ + asm( + " push {lr}\n" + " ldr r0, ._53\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._54:\n" + " .align 2, 0\n" + "._53:\n" + " .word debug_sub_811B654+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B634() +{ + asm( + " push {lr}\n" + " ldr r0, ._57\n" + " bl FindTaskIdByFunc\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0xff\n" + " beq ._55 @cond_branch\n" + " mov r0, #0x0\n" + " b ._56\n" + "._58:\n" + " .align 2, 0\n" + "._57:\n" + " .word debug_sub_811B654+1\n" + "._55:\n" + " mov r0, #0x1\n" + "._56:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B654() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xfffffff8\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " lsl r0, r6, #0x2\n" + " add r0, r0, r6\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._63\n" + " add r5, r0, r1\n" + " mov r0, #0x8\n" + " ldsh r1, [r5, r0]\n" + " cmp r1, #0x1\n" + " beq ._59 @cond_branch\n" + " cmp r1, #0x1\n" + " bgt ._60 @cond_branch\n" + " cmp r1, #0\n" + " beq ._61 @cond_branch\n" + " b ._116\n" + "._64:\n" + " .align 2, 0\n" + "._63:\n" + " .word gTasks\n" + "._60:\n" + " cmp r1, #0x2\n" + " bne ._65 @cond_branch\n" + " b ._66\n" + "._65:\n" + " cmp r1, #0x3\n" + " bne ._67 @cond_branch\n" + " b ._68\n" + "._67:\n" + " b ._116\n" + "._61:\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x18\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " bl debug_sub_811B310\n" + " ldrh r0, [r5, #0x8]\n" + " add r0, r0, #0x1\n" + " strh r0, [r5, #0x8]\n" + " b ._116\n" + "._59:\n" + " ldr r7, ._76\n" + " ldrh r2, [r7, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._71 @cond_branch\n" + " b ._94\n" + "._71:\n" + " mov r0, #0x20\n" + " and r0, r0, r2\n" + " lsl r0, r0, #0x10\n" + " lsr r3, r0, #0x10\n" + " cmp r3, #0\n" + " beq ._73 @cond_branch\n" + " ldr r1, ._76 + 4\n" + " ldrb r0, [r1, #0x1]\n" + " sub r0, r0, #0x1\n" + " strb r0, [r1, #0x1]\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bge ._79 @cond_branch\n" + " mov r0, #0x5\n" + " strb r0, [r1, #0x1]\n" + " b ._79\n" + "._77:\n" + " .align 2, 0\n" + "._76:\n" + " .word gMain\n" + " .word +0x2000000\n" + "._73:\n" + " mov r0, #0x10\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._78 @cond_branch\n" + " ldr r1, ._81\n" + " ldrb r0, [r1, #0x1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1, #0x1]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x5\n" + " bls ._79 @cond_branch\n" + " strb r3, [r1, #0x1]\n" + "._79:\n" + " bl debug_sub_811B2E8\n" + " b ._116\n" + "._82:\n" + " .align 2, 0\n" + "._81:\n" + " .word +0x2000000\n" + "._78:\n" + " and r1, r1, r2\n" + " lsl r0, r1, #0x10\n" + " lsr r4, r0, #0x10\n" + " cmp r4, #0\n" + " beq ._83 @cond_branch\n" + " mov r0, #0x3\n" + " strh r0, [r5, #0x8]\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x9\n" + " mov r3, #0x5\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._85\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._85 + 4\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " b ._116\n" + "._86:\n" + " .align 2, 0\n" + "._85:\n" + " .word Str_841B25C\n" + " .word Str_841B264\n" + "._83:\n" + " mov r0, #0x4\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._87 @cond_branch\n" + " ldr r0, ._91\n" + " strb r4, [r0]\n" + " ldr r0, ._91 + 4\n" + " strb r4, [r0]\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xa\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._91 + 8\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r3, ._91 + 12\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " mov r2, #0x8\n" + " bl PrintMenuItems\n" + " str r4, [sp]\n" + " mov r0, #0x9\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " ldrh r0, [r5, #0x8]\n" + " add r0, r0, #0x1\n" + " strh r0, [r5, #0x8]\n" + "._87:\n" + " ldrh r1, [r7, #0x2e]\n" + " mov r0, #0x8\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._88 @cond_branch\n" + " b ._116\n" + "._88:\n" + " ldr r1, ._91 + 16\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " b ._94\n" + "._92:\n" + " .align 2, 0\n" + "._91:\n" + " .word unk_debug_bss_1+0x2\n" + " .word unk_debug_bss_1+0x3\n" + " .word Str_841B254\n" + " .word _841B270\n" + " .word unk_debug_bss_1+0x4\n" + "._66:\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r2, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r2, r0\n" + " beq ._116 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r2, r0\n" + " beq ._94 @cond_branch\n" + " ldr r1, ._96\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r0, ._96 + 4\n" + " lsl r1, r2, #0x3\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, [r1]\n" + " bl _call_via_r0\n" + "._94:\n" + " bl MenuZeroFillScreen\n" + " add r0, r6, #0\n" + " bl DestroyTask\n" + " b ._116\n" + "._97:\n" + " .align 2, 0\n" + "._96:\n" + " .word unk_debug_bss_1+0x2\n" + " .word _841B270\n" + "._68:\n" + " ldr r2, ._100\n" + " ldrh r1, [r2, #0x30]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._98 @cond_branch\n" + " ldr r2, ._100 + 4\n" + " ldrh r0, [r2, #0xc]\n" + " add r0, r0, #0x64\n" + " b ._99\n" + "._101:\n" + " .align 2, 0\n" + "._100:\n" + " .word gMain\n" + " .word +0x2000000\n" + "._98:\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._102 @cond_branch\n" + " ldr r1, ._104\n" + " ldrh r0, [r1, #0xc]\n" + " sub r0, r0, #0x64\n" + " b ._103\n" + "._105:\n" + " .align 2, 0\n" + "._104:\n" + " .word +0x2000000\n" + "._102:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._106 @cond_branch\n" + " ldr r1, ._109\n" + " ldr r2, ._109 + 4\n" + " add r0, r2, #0\n" + " ldrh r2, [r1, #0xc]\n" + " add r0, r0, r2\n" + "._103:\n" + " strh r0, [r1, #0xc]\n" + " lsl r0, r0, #0x10\n" + " cmp r0, #0\n" + " bgt ._116 @cond_branch\n" + " ldr r0, ._109 + 8\n" + " strh r0, [r1, #0xc]\n" + " b ._116\n" + "._110:\n" + " .align 2, 0\n" + "._109:\n" + " .word +0x2000000\n" + " .word 0xfffffc18\n" + " .word 0x270f\n" + "._106:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._111 @cond_branch\n" + " ldr r2, ._114\n" + " mov r1, #0xfa\n" + " lsl r1, r1, #0x2\n" + " add r0, r1, #0\n" + " ldrh r1, [r2, #0xc]\n" + " add r0, r0, r1\n" + "._99:\n" + " strh r0, [r2, #0xc]\n" + " lsl r0, r0, #0x10\n" + " asr r0, r0, #0x10\n" + " ldr r1, ._114 + 4\n" + " cmp r0, r1\n" + " ble ._116 @cond_branch\n" + " strh r1, [r2, #0xc]\n" + " b ._116\n" + "._115:\n" + " .align 2, 0\n" + "._114:\n" + " .word +0x2000000\n" + " .word 0x270f\n" + "._111:\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._116 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " add r0, r6, #0\n" + " bl DestroyTask\n" + "._116:\n" + " add sp, sp, #0x8\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_811B894() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " ldr r1, ._122\n" + " ldrh r2, [r1, #0x8]\n" + " mov r0, #0xc0\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r2\n" + " add r4, r1, #0\n" + " cmp r0, #0\n" + " beq ._117 @cond_branch\n" + " add r1, r1, #0x90\n" + " ldr r0, [r1]\n" + " add r0, r0, #0x1\n" + " str r0, [r1]\n" + " ldr r2, ._122 + 4\n" + " cmp r0, r2\n" + " ble ._118 @cond_branch\n" + " str r2, [r1]\n" + "._118:\n" + " add r0, r4, #0\n" + " add r0, r0, #0x88\n" + " ldr r1, [r1]\n" + " ldr r0, [r0]\n" + " cmp r1, r0\n" + " beq ._119 @cond_branch\n" + " ldr r0, ._122 + 8\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r1, ._122 + 12\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + "._119:\n" + " ldrb r1, [r4, #0x4]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0\n" + " bne ._126 @cond_branch\n" + " ldr r0, ._122 + 16\n" + " mov r1, #0x4\n" + " mov r2, #0x11\n" + " b ._121\n" + "._123:\n" + " .align 2, 0\n" + "._122:\n" + " .word +0x2000000\n" + " .word 0x270f\n" + " .word Str_841B2B0\n" + " .word unk_debug_bss_1+0x4\n" + " .word Str_841B2D3\n" + "._117:\n" + " lsl r0, r2, #0x10\n" + " cmp r0, #0\n" + " beq ._127 @cond_branch\n" + " ldrb r1, [r4, #0x4]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._126 @cond_branch\n" + " mov r4, #0x3\n" + " and r4, r4, r2\n" + " cmp r4, #0\n" + " bne ._126 @cond_branch\n" + " ldr r0, ._163\n" + " mov r1, #0x4\n" + " mov r2, #0x2\n" + "._121:\n" + " bl MenuPrint\n" + " ldr r0, ._163 + 4\n" + " strb r4, [r0]\n" + "._126:\n" + " ldr r0, ._163 + 8\n" + " ldrh r1, [r0, #0x8]\n" + " add r4, r0, #0\n" + " cmp r1, #0\n" + " beq ._127 @cond_branch\n" + " b ._162\n" + "._127:\n" + " mov r1, #0x12\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0x3\n" + " beq ._129 @cond_branch\n" + " b ._162\n" + "._129:\n" + " ldrb r1, [r4, #0x4]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._131 @cond_branch\n" + " b ._162\n" + "._131:\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " mov r0, #0x0\n" + " mov r1, #0x2\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " str r0, [sp]\n" + " mov r0, #0x0\n" + " mov r1, #0x3\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r9, r0\n" + " mov r0, #0x1\n" + " mov r1, #0x2\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " mov r0, #0x1\n" + " mov r1, #0x3\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov sl, r0\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " mov r0, #0x2\n" + " mov r1, #0x2\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " mov r0, #0x2\n" + " mov r1, #0x3\n" + " bl sub_8102BA4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r7, #0\n" + " bne ._134 @cond_branch\n" + " mov r1, r9\n" + " cmp r1, #0x1\n" + " bne ._134 @cond_branch\n" + " cmp r5, #0\n" + " beq ._159 @cond_branch\n" + "._134:\n" + " ldr r1, [sp]\n" + " cmp r1, #0\n" + " bne ._137 @cond_branch\n" + " cmp r4, #0x1\n" + " bne ._137 @cond_branch\n" + " mov r1, r8\n" + " cmp r1, #0\n" + " beq ._159 @cond_branch\n" + "._137:\n" + " cmp r6, #0\n" + " bne ._140 @cond_branch\n" + " mov r1, sl\n" + " cmp r1, #0x1\n" + " bne ._140 @cond_branch\n" + " cmp r0, #0\n" + " beq ._159 @cond_branch\n" + "._140:\n" + " cmp r7, #0\n" + " bne ._143 @cond_branch\n" + " cmp r4, #0x1\n" + " bne ._143 @cond_branch\n" + " cmp r0, #0\n" + " beq ._159 @cond_branch\n" + "._143:\n" + " cmp r6, #0\n" + " bne ._146 @cond_branch\n" + " cmp r4, #0x1\n" + " bne ._146 @cond_branch\n" + " cmp r5, #0\n" + " beq ._159 @cond_branch\n" + "._146:\n" + " cmp r7, #0x1\n" + " bne ._149 @cond_branch\n" + " mov r1, r9\n" + " cmp r1, #0\n" + " bne ._149 @cond_branch\n" + " cmp r5, #0x1\n" + " beq ._159 @cond_branch\n" + "._149:\n" + " ldr r1, [sp]\n" + " cmp r1, #0x1\n" + " bne ._152 @cond_branch\n" + " cmp r4, #0\n" + " bne ._152 @cond_branch\n" + " mov r1, r8\n" + " cmp r1, #0x1\n" + " beq ._159 @cond_branch\n" + "._152:\n" + " cmp r6, #0x1\n" + " bne ._155 @cond_branch\n" + " mov r1, sl\n" + " cmp r1, #0\n" + " bne ._155 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._159 @cond_branch\n" + "._155:\n" + " cmp r7, #0x1\n" + " bne ._158 @cond_branch\n" + " cmp r4, #0\n" + " bne ._158 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._159 @cond_branch\n" + "._158:\n" + " cmp r6, #0x1\n" + " bne ._162 @cond_branch\n" + " cmp r4, #0\n" + " bne ._162 @cond_branch\n" + " cmp r5, #0x1\n" + " bne ._162 @cond_branch\n" + "._159:\n" + " ldr r0, ._163 + 12\n" + " mov r1, #0x4\n" + " mov r2, #0x0\n" + " bl MenuPrint\n" + " ldr r1, ._163 + 4\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + "._162:\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._164:\n" + " .align 2, 0\n" + "._163:\n" + " .word Str_841B2E4\n" + " .word unk_debug_bss_1+0x4\n" + " .word +0x2000000\n" + " .word Str_841B2BF\n" + "\n" + ); +} +#endif + +static const u8 sReelSymbols[][21] = +{ { SLOT_MACHINE_TAG_7_RED, SLOT_MACHINE_TAG_CHERRY, diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 2f6f1e7dd..5e76d30a6 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -44,6 +44,11 @@ enum { MENU_ACTION_PLAYER_LINK }; +#ifdef DEBUG +static u32 _debugStartMenu_0 __attribute__((unused)); +static u32 _debugStartMenu_1 __attribute__((unused)); +#endif + static u8 (*saveDialogCallback)(void); static u8 saveDialogTimer; //Number of frames to keep the window on screen after save was completed static bool8 savingComplete; @@ -132,6 +137,304 @@ static bool32 sub_80719FC(u8 *ptr); static void sub_8071B54(void); static void Task_8071B64(u8 taskId); +#ifdef DEBUG +__attribute__((naked)) +void debug_sub_8075C30() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl debug_sub_8075D9C\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8075C40() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._5\n" + " add r5, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r5, r1]\n" + " cmp r0, #0x1\n" + " beq ._1 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._2 @cond_branch\n" + " cmp r0, #0\n" + " beq ._3 @cond_branch\n" + " b ._18\n" + "._6:\n" + " .align 2, 0\n" + "._5:\n" + " .word gTasks+0x8\n" + "._2:\n" + " cmp r0, #0x2\n" + " beq ._7 @cond_branch\n" + " cmp r0, #0x3\n" + " beq ._8 @cond_branch\n" + " b ._18\n" + "._3:\n" + " bl m4aSoundVSyncOff\n" + " b ._12\n" + "._1:\n" + " ldr r1, ._13\n" + " ldrh r0, [r1]\n" + " mov sl, r0\n" + " mov r0, #0x0\n" + " strh r0, [r1]\n" + " ldr r1, ._13 + 4\n" + " strh r0, [r1]\n" + " mov r0, #0x83\n" + " lsl r0, r0, #0x10\n" + " str r0, [r1]\n" + " ldr r4, ._13 + 8\n" + " mov r9, r4\n" + " ldr r2, ._13 + 12\n" + " ldr r0, ._13 + 16\n" + " mov ip, r0\n" + " ldr r1, ._13 + 20\n" + " mov r8, r1\n" + " ldr r7, ._13 + 24\n" + " mov r3, r9\n" + " add r3, r3, #0x1\n" + " ldr r6, ._13 + 28\n" + " ldr r4, ._13 + 32\n" + "._11:\n" + " mov r0, ip\n" + " str r0, [r2]\n" + " str r6, [r2, #0x4]\n" + " str r4, [r2, #0x8]\n" + " ldr r0, [r2, #0x8]\n" + " ldrh r1, [r2, #0xa]\n" + " mov r0, r8\n" + " and r0, r0, r1\n" + " strh r0, [r2, #0xa]\n" + " ldrh r1, [r2, #0xa]\n" + " add r0, r7, #0\n" + " and r0, r0, r1\n" + " strh r0, [r2, #0xa]\n" + " ldrh r0, [r2, #0xa]\n" + " sub r3, r3, #0x1\n" + " cmp r3, #0\n" + " bne ._11 @cond_branch\n" + " mov r3, r9\n" + " add r3, r3, #0x1\n" + " ldr r0, ._13 + 36\n" + " mov r2, #0x0\n" + " strh r2, [r0]\n" + " ldr r1, ._13 + 4\n" + " ldrh r0, [r1]\n" + " ldr r4, ._13 + 40\n" + " str r0, [r4]\n" + " strh r2, [r1]\n" + " ldr r0, ._13\n" + " mov r1, sl\n" + " strh r1, [r0]\n" + " ldr r4, ._13 + 44\n" + " str r3, [r4]\n" + " bl m4aSoundVSyncOn\n" + " b ._12\n" + "._14:\n" + " .align 2, 0\n" + "._13:\n" + " .word 0x4000208\n" + " .word 0x4000108\n" + " .word 0xc34f\n" + " .word 0x40000b0\n" + " .word gUnknown_03004DE0\n" + " .word 0xc5ff\n" + " .word 0x7fff\n" + " .word 0x4000040\n" + " .word 0xa2600001\n" + " .word 0x400010a\n" + " .word _debugStartMenu_0\n" + " .word _debugStartMenu_1\n" + "._7:\n" + " mov r0, #0x15\n" + " bl PlaySE\n" + " ldr r0, ._16\n" + " ldr r1, ._16 + 4\n" + " ldr r1, [r1]\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r0, ._16 + 8\n" + " ldr r1, ._16 + 12\n" + " ldr r1, [r1]\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl ConvertIntToDecimalStringN\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._16 + 16\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + "._12:\n" + " ldrh r0, [r5]\n" + " add r0, r0, #0x1\n" + " strh r0, [r5]\n" + " b ._18\n" + "._17:\n" + " .align 2, 0\n" + "._16:\n" + " .word gStringVar1\n" + " .word _debugStartMenu_1\n" + " .word gStringVar2\n" + " .word _debugStartMenu_0\n" + " .word gUnknown_Debug_839B6D8\n" + "._8:\n" + " ldr r0, ._19\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._18 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + "._18:\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._20:\n" + " .align 2, 0\n" + "._19:\n" + " .word gMain\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8075D9C() +{ + asm( + " push {lr}\n" + " ldr r0, ._21\n" + " mov r1, #0xa\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " pop {r0}\n" + " bx r0\n" + "._22:\n" + " .align 2, 0\n" + "._21:\n" + " .word debug_sub_8075C40+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8075DB4() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " add r5, r1, #0\n" + " add r4, r2, #0\n" + " add r0, r4, #0\n" + " mov r1, #0x4d\n" + " bl __umodsi3\n" + " strb r0, [r6, #0x1]\n" + " add r1, r6, #0\n" + " add r1, r1, #0xc\n" + " add r0, r4, #0\n" + " bl write_word_to_mem\n" + " add r0, r6, #4\n" + " add r1, r5, #0\n" + " bl StringCopy8\n" + " mov r3, #0x7\n" + " mov r4, #0x0\n" + " ldr r0, ._25\n" + " ldr r1, ._25 + 4\n" + " add r5, r0, r1\n" + " add r2, r6, #0\n" + " add r2, r2, #0x10\n" + " add r1, r6, #0\n" + " add r1, r1, #0x1c\n" + "._23:\n" + " ldrh r0, [r5]\n" + " strh r0, [r2]\n" + " strh r3, [r1]\n" + " add r0, r3, #6\n" + " strh r0, [r1, #0xc]\n" + " add r3, r3, #0x1\n" + " add r5, r5, #0x2\n" + " add r2, r2, #0x2\n" + " add r1, r1, #0x2\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x5\n" + " ble ._23 @cond_branch\n" + " mov r4, #0x0\n" + "._24:\n" + " mov r0, #0x64\n" + " mul r0, r0, r4\n" + " ldr r1, ._25 + 8\n" + " add r0, r0, r1\n" + " mov r1, #0x2c\n" + " mul r1, r1, r4\n" + " add r1, r1, #0x34\n" + " add r1, r6, r1\n" + " bl sub_803AF78\n" + " add r4, r4, #0x1\n" + " cmp r4, #0x2\n" + " ble ._24 @cond_branch\n" + " add r0, r6, #0\n" + " bl sub_8136088\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._26:\n" + " .align 2, 0\n" + "._25:\n" + " .word gSaveBlock1\n" + " .word 0x2b28\n" + " .word gPlayerParty\n" + "\n" + ); +} + +__attribute__((naked)) +void unref_sub_8070F90() +{ + asm( + " push {lr}\n" + " ldr r0, ._27\n" + " bl FlagSet\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x4\n" + " bl FlagSet\n" + " ldr r0, ._27 + 4\n" + " bl FlagSet\n" + " pop {r0}\n" + " bx r0\n" + "._28:\n" + " .align 2, 0\n" + "._27:\n" + " .word 0x801\n" + " .word 0x802\n" + "\n" + ); +} +#endif static void BuildStartMenuActions(void) { diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c index 4bf83cad8..08913f40d 100644 --- a/src/field/wild_encounter.c +++ b/src/field/wild_encounter.c @@ -3802,6 +3802,19 @@ static void FeebasSeedRng(u16 seed) sFeebasRngValue = seed; } +#if DEBUG +u16 debug_sub_8092344(u8 arg0) +{ + if (arg0 == 0) + return 131; + if (arg0 == 1) + return 167; + if (arg0 == 2) + return 149; + return 0; +} +#endif + static u8 ChooseWildMonIndex_Land(void) { u8 rand = Random() % 100; @@ -4042,6 +4055,24 @@ static bool8 DoWildEncounterRateDiceRoll(u16 encounterRate) return FALSE; } +#if DEBUG +u16 debug_sub_809283C(u16 attempts) +{ + u16 retval = 0; + u16 i = 0; + + while (i < attempts) + { + if (DoWildEncounterRateDiceRoll(320) == TRUE) + retval++; + + i++; + } + + return retval; +} +#endif + static bool8 DoWildEncounterTest(u32 encounterRate, bool8 ignoreAbility) { encounterRate *= 16; diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 921a3ad93..c652b9398 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -238,7 +238,7 @@ const struct MailLayout gUnknown_083E57A4[] = static u8 *const sSharedMemPtr = gSharedMem; static u8 sub_80F8A28(void); -static void sub_80F8D50(void); +/*static*/ void sub_80F8D50(void); static void sub_80F8DA0(void); static void sub_80F8E80(void); static void sub_80F8F18(void); @@ -247,6 +247,205 @@ static void sub_80F8F58(void); static void sub_80F8F78(void); static void sub_80F8FB4(void); + +#if DEBUG + +// should be static +__attribute__((section(".bss"))) u8 unk_debug_bss_2; + +__attribute__((naked)) +void HandleReadMail(struct MailStruct *aStruct, MainCallback callback, bool8 bool81) +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " add r6, r1, #0\n" + " lsl r2, r2, #0x18\n" + " lsr r5, r2, #0x18\n" + " ldr r0, ._3\n" + " ldrb r3, [r0]\n" + " cmp r3, #0\n" + " beq ._1 @cond_branch\n" + " ldr r2, ._3 + 4\n" + " add r1, r2, #0\n" + " add r1, r1, #0xff\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r0, ._3 + 8\n" + " ldrh r1, [r0]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x1\n" + " add r0, r2, r3\n" + " strb r1, [r0]\n" + " mov r0, #0x82\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, ._3 + 12\n" + " str r0, [r1]\n" + " add r3, r3, #0x8\n" + " add r1, r2, r3\n" + " ldr r0, ._3 + 16\n" + " str r0, [r1]\n" + " ldr r0, ._3 + 20\n" + " ldrh r1, [r0]\n" + " b ._2\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word gUnknown_03000748+0x4\n" + " .word +0x2000000\n" + " .word gSpecialVar_0x8004\n" + " .word EasyChat_GetWordText+1\n" + " .word ConvertEasyChatWordsToString+1\n" + " .word gSpecialVar_0x8006\n" + "._1:\n" + " ldr r2, ._7\n" + " add r1, r2, #0\n" + " add r1, r1, #0xff\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " add r0, r0, #0xfb\n" + " add r1, r2, r0\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x82\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, ._7 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x84\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, ._7 + 8\n" + " str r0, [r1]\n" + " ldrh r1, [r4, #0x20]\n" + " add r0, r1, #0\n" + " sub r0, r0, #0x79\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bhi ._5 @cond_branch\n" + " sub r1, r1, #0x79\n" + "._2:\n" + " add r0, r2, #0\n" + " add r0, r0, #0xfa\n" + " strb r1, [r0]\n" + " b ._6\n" + "._8:\n" + " .align 2, 0\n" + "._7:\n" + " .word +0x2000000\n" + " .word EasyChat_GetWordText+1\n" + " .word ConvertEasyChatWordsToString+1\n" + "._5:\n" + " add r0, r2, #0\n" + " add r0, r0, #0xfa\n" + " strb r3, [r0]\n" + " mov r5, #0x0\n" + "._6:\n" + " ldr r1, ._12\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq ._9 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._10 @cond_branch\n" + "._9:\n" + " mov r3, #0x86\n" + " lsl r3, r3, #0x1\n" + " add r2, r1, r3\n" + " add r0, r1, #0\n" + " add r0, r0, #0xfa\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._12 + 4\n" + " b ._11\n" + "._13:\n" + " .align 2, 0\n" + "._12:\n" + " .word +0x2000000\n" + " .word gUnknown_083E5730\n" + "._10:\n" + " mov r0, #0x86\n" + " lsl r0, r0, #0x1\n" + " add r2, r1, r0\n" + " add r0, r1, #0\n" + " add r0, r0, #0xfa\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._18\n" + "._11:\n" + " add r0, r0, r1\n" + " str r0, [r2]\n" + " ldrh r0, [r4, #0x1e]\n" + " mov r1, sp\n" + " bl MailSpeciesToSpecies\n" + " lsl r0, r0, #0x10\n" + " ldr r1, ._18 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xcd\n" + " lsl r1, r1, #0x11\n" + " cmp r0, r1\n" + " bhi ._14 @cond_branch\n" + " ldr r0, ._18 + 8\n" + " add r1, r0, #0\n" + " add r1, r1, #0xfa\n" + " ldrb r2, [r1]\n" + " add r1, r0, #0\n" + " cmp r2, #0x6\n" + " beq ._15 @cond_branch\n" + " cmp r2, #0x9\n" + " beq ._16 @cond_branch\n" + " b ._17\n" + "._19:\n" + " .align 2, 0\n" + "._18:\n" + " .word gUnknown_083E57A4\n" + " .word 0xffff0000\n" + " .word +0x2000000\n" + "._15:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x1\n" + " b ._21\n" + "._16:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x2\n" + " b ._21\n" + "._14:\n" + " ldr r1, ._22\n" + "._17:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x0\n" + "._21:\n" + " strb r0, [r2]\n" + " add r0, r1, #0\n" + " add r0, r0, #0xf4\n" + " str r4, [r0]\n" + " sub r0, r0, #0x8\n" + " str r6, [r0]\n" + " add r0, r0, #0xc\n" + " strb r5, [r0]\n" + " ldr r0, ._22 + 4\n" + " bl SetMainCallback2\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._23:\n" + " .align 2, 0\n" + "._22:\n" + " .word +0x2000000\n" + " .word sub_80F8D50+1\n" + "\n" + ); +} +#else void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { u16 mailDesign; @@ -310,6 +509,7 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) SetMainCallback2(sub_80F8D50); } +#endif #define RETURN_UP_STATE break #define RETURN_SKIP_STATE return FALSE @@ -456,7 +656,7 @@ static u8 sub_80F8A28(void) return FALSE; } -static void sub_80F8D50(void) +/*static*/ void sub_80F8D50(void) { do { @@ -573,6 +773,60 @@ static void sub_80F8F78(void) } } +#if DEBUG +__attribute__((naked)) +void sub_80F8FB4() +{ + asm( + " push {r4, lr}\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._135 @cond_branch\n" + " ldr r4, ._138\n" + " add r0, r4, #0\n" + " add r0, r0, #0xec\n" + " ldr r0, [r0]\n" + " bl SetMainCallback2\n" + " add r0, r4, #0\n" + " add r0, r0, #0xfb\n" + " ldrb r0, [r0]\n" + " cmp r0, #0x2\n" + " bgt ._137 @cond_branch\n" + " cmp r0, #0x1\n" + " blt ._137 @cond_branch\n" + " add r0, r4, #0\n" + " add r0, r0, #0xf4\n" + " ldr r0, [r0]\n" + " ldrh r0, [r0, #0x1e]\n" + " bl sub_809D4A8\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " bl sub_809D608\n" + " add r0, r4, #0\n" + " add r0, r0, #0xfc\n" + " ldrb r1, [r0]\n" + " lsl r0, r1, #0x4\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._138 + 4\n" + " add r0, r0, r1\n" + " bl sub_809D510\n" + "._137:\n" + " bl ResetPaletteFade\n" + "._135:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._139:\n" + " .align 2, 0\n" + "._138:\n" + " .word +0x2000000\n" + " .word gSprites\n" + "\n" + ); +} +#else static void sub_80F8FB4(void) { u16 local1; @@ -597,3 +851,1611 @@ static void sub_80F8FB4(void) memset(&ewram0_4, 0, 0x110); ResetPaletteFade(); } +#endif + +#if DEBUG +__attribute__((naked)) +void debug_sub_810C910() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, ._143\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._142 @cond_branch\n" + " ldr r1, ._143 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " bl Menu_EraseScreen\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + " ldr r2, ._143 + 8\n" + " ldr r0, ._143 + 12\n" + " ldrh r1, [r0]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r1, r0, #0x2\n" + " add r0, r1, r2\n" + " ldr r3, ._143 + 16\n" + " add r0, r0, r3\n" + " ldrh r0, [r0]\n" + " cmp r0, #0\n" + " bne ._141 @cond_branch\n" + " sub r3, r3, #0x20\n" + " add r0, r2, r3\n" + " add r0, r1, r0\n" + " ldr r1, ._143 + 20\n" + " mov r2, #0x0\n" + " bl HandleReadMail\n" + " b ._142\n" + "._144:\n" + " .align 2, 0\n" + "._143:\n" + " .word gPaletteFade\n" + " .word unk_debug_bss_2\n" + " .word gSaveBlock1\n" + " .word gSpecialVar_0x8005\n" + " .word 0x2b6c\n" + " .word debug_sub_810D388+1\n" + "._141:\n" + " ldr r3, ._145\n" + " add r0, r2, r3\n" + " add r0, r1, r0\n" + " ldr r1, ._145 + 4\n" + " mov r2, #0x1\n" + " bl HandleReadMail\n" + "._142:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._146:\n" + " .align 2, 0\n" + "._145:\n" + " .word 0x2b4c\n" + " .word debug_sub_810D388+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810C990() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " add r5, r4, #0\n" + " ldr r0, ._149\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0xa0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._147 @cond_branch\n" + " ldr r4, ._149 + 4\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0xb\n" + " b ._148\n" + "._150:\n" + " .align 2, 0\n" + "._149:\n" + " .word gMain\n" + " .word gSpecialVar_0x8006\n" + "._147:\n" + " mov r2, #0x50\n" + " and r2, r2, r1\n" + " cmp r2, #0\n" + " beq ._151 @cond_branch\n" + " ldr r4, ._153\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0x1\n" + "._148:\n" + " mov r1, #0xc\n" + " bl __modsi3\n" + " strh r0, [r4]\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0xa\n" + " mov r3, #0x4\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r1, ._153 + 4\n" + " ldrh r0, [r4]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0x2\n" + " mov r2, #0x2\n" + " bl Menu_PrintText\n" + " b ._159\n" + "._154:\n" + " .align 2, 0\n" + "._153:\n" + " .word gSpecialVar_0x8006\n" + " .word _84115C4\n" + "._151:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._155 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " str r2, [sp]\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._157\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._157 + 4\n" + " b ._156\n" + "._158:\n" + " .align 2, 0\n" + "._157:\n" + " .word gTasks\n" + " .word debug_sub_810C910+1\n" + "._155:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._159 @cond_branch\n" + " bl Menu_DisplayDialogueFrame\n" + " ldr r0, ._160\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + " ldr r1, ._160 + 4\n" + " ldr r0, ._160 + 8\n" + " ldrh r0, [r0]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0x2\n" + " mov r2, #0x2\n" + " bl Menu_PrintText\n" + " ldr r1, ._160 + 12\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._160 + 16\n" + "._156:\n" + " str r1, [r0]\n" + "._159:\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._161:\n" + " .align 2, 0\n" + "._160:\n" + " .word Str_8411540\n" + " .word _8411560\n" + " .word gSpecialVar_0x8004\n" + " .word gTasks\n" + " .word debug_sub_810CA7C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CA7C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r3, ._164\n" + " ldrh r1, [r3, #0x2e]\n" + " mov r2, #0xf0\n" + " and r2, r2, r1\n" + " cmp r2, #0\n" + " beq ._162 @cond_branch\n" + " ldr r2, ._164 + 4\n" + " ldrh r0, [r2]\n" + " mov r1, #0x1\n" + " eor r0, r0, r1\n" + " strh r0, [r2]\n" + " ldr r1, ._164 + 8\n" + " ldrh r0, [r2]\n" + " b ._163\n" + "._165:\n" + " .align 2, 0\n" + "._164:\n" + " .word gMain\n" + " .word gSpecialVar_0x8004\n" + " .word _8411560\n" + "._162:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._168 @cond_branch\n" + " ldrh r0, [r3, #0x34]\n" + " cmp r0, #0\n" + " beq ._167 @cond_branch\n" + " strh r2, [r3, #0x34]\n" + " bl Menu_DisplayDialogueFrame\n" + " ldr r0, ._169\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0xa\n" + " mov r3, #0x4\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r1, ._169 + 4\n" + " ldr r0, ._169 + 8\n" + " ldrh r0, [r0]\n" + "._163:\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0x2\n" + " mov r2, #0x2\n" + " bl Menu_PrintText\n" + " b ._168\n" + "._170:\n" + " .align 2, 0\n" + "._169:\n" + " .word Str_8411540\n" + " .word _8411560\n" + " .word gSpecialVar_0x8004\n" + "._167:\n" + " bl Menu_DisplayDialogueFrame\n" + " ldr r0, ._171\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0xa\n" + " mov r3, #0x4\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r1, ._171 + 4\n" + " ldr r0, ._171 + 8\n" + " ldrh r0, [r0]\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0x2\n" + " mov r2, #0x2\n" + " bl Menu_PrintText\n" + " ldr r1, ._171 + 12\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._171 + 16\n" + " str r1, [r0]\n" + "._168:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._172:\n" + " .align 2, 0\n" + "._171:\n" + " .word Str_8411568\n" + " .word _84115C4\n" + " .word gSpecialVar_0x8006\n" + " .word gTasks\n" + " .word debug_sub_810C990+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CB50() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xffffffec\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " ldr r1, ._175\n" + " mov r0, sp\n" + " mov r2, #0x6\n" + " bl memcpy\n" + " add r7, sp, #0x8\n" + " ldr r1, ._175 + 4\n" + " add r0, r7, #0\n" + " mov r2, #0x9\n" + " bl memcpy\n" + " mov r2, #0x0\n" + " ldr r0, ._175 + 8\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._173 @cond_branch\n" + " ldr r0, ._175 + 12\n" + " ldr r5, ._175 + 16\n" + " ldrh r1, [r5]\n" + " mov r2, #0x2\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r0, ._175 + 20\n" + " ldr r1, ._175 + 24\n" + " lsl r4, r6, #0x2\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r1\n" + " mov r1, #0x8\n" + " ldsh r2, [r4, r1]\n" + " mov r1, #0xb\n" + " mul r1, r1, r2\n" + " ldr r2, ._175 + 28\n" + " add r1, r1, r2\n" + " bl StringCopy\n" + " ldr r2, ._175 + 32\n" + " ldrh r1, [r5]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldrh r1, [r4, #0x8]\n" + " ldr r2, ._175 + 36\n" + " add r0, r0, r2\n" + " strh r1, [r0]\n" + " ldr r4, ._175 + 40\n" + " add r0, r4, #0\n" + " add r1, r7, #0\n" + " bl StringExpandPlaceholders\n" + " bl Menu_DisplayDialogueFrame\n" + " add r0, r4, #0\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + " add r0, r6, #0\n" + " bl DestroyTask\n" + " b ._174\n" + "._176:\n" + " .align 2, 0\n" + "._175:\n" + " .word Str_841160F\n" + " .word Str_841161A\n" + " .word gMain\n" + " .word gStringVar1\n" + " .word gSpecialVar_0x8005\n" + " .word gStringVar2\n" + " .word gTasks\n" + " .word gSpeciesNames\n" + " .word gSaveBlock1\n" + " .word 0x2b6a\n" + " .word gStringVar4\n" + "._173:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._177 @cond_branch\n" + " add r0, r6, #0\n" + " bl DestroyTask\n" + " bl Menu_EraseScreen\n" + "._174:\n" + " ldr r0, ._179\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " bl debug_sub_810D340\n" + " b ._186\n" + "._180:\n" + " .align 2, 0\n" + "._179:\n" + " .word debug_sub_810CE1C+1\n" + "._177:\n" + " mov r0, #0xa0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._181 @cond_branch\n" + " ldr r0, ._183\n" + " lsl r4, r6, #0x2\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " mov r1, #0x8\n" + " ldsh r0, [r4, r1]\n" + " ldr r2, ._183 + 4\n" + " add r0, r0, r2\n" + " mov r1, #0xce\n" + " lsl r1, r1, #0x1\n" + " bl __modsi3\n" + " strh r0, [r4, #0x8]\n" + " b ._182\n" + "._184:\n" + " .align 2, 0\n" + "._183:\n" + " .word gTasks\n" + " .word 0x19b\n" + "._181:\n" + " mov r0, #0x50\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._185 @cond_branch\n" + " ldr r0, ._187\n" + " lsl r4, r6, #0x2\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r0\n" + " mov r1, #0x8\n" + " ldsh r0, [r4, r1]\n" + " add r0, r0, #0x1\n" + " mov r1, #0xce\n" + " lsl r1, r1, #0x1\n" + " bl __modsi3\n" + " strh r0, [r4, #0x8]\n" + " mov r2, #0x1\n" + "._185:\n" + " cmp r2, #0\n" + " beq ._186 @cond_branch\n" + "._182:\n" + " ldr r0, ._187 + 4\n" + " ldr r1, ._187\n" + " lsl r4, r6, #0x2\n" + " add r4, r4, r6\n" + " lsl r4, r4, #0x3\n" + " add r4, r4, r1\n" + " mov r2, #0x8\n" + " ldsh r1, [r4, r2]\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r0, ._187 + 8\n" + " mov r1, #0x8\n" + " ldsh r2, [r4, r1]\n" + " mov r1, #0xb\n" + " mul r1, r1, r2\n" + " ldr r2, ._187 + 12\n" + " add r1, r1, r2\n" + " bl StringCopy\n" + " ldr r4, ._187 + 16\n" + " add r0, r4, #0\n" + " mov r1, sp\n" + " bl StringExpandPlaceholders\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xc\n" + " mov r3, #0x3\n" + " bl Menu_DrawStdWindowFrame\n" + " add r0, r4, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl Menu_PrintText\n" + "._186:\n" + " add sp, sp, #0x14\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._188:\n" + " .align 2, 0\n" + "._187:\n" + " .word gTasks\n" + " .word gStringVar1\n" + " .word gStringVar2\n" + " .word gSpeciesNames\n" + " .word gStringVar4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CCEC() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xffffffe4\n" + " add r5, r0, #0\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " ldr r1, ._189\n" + " mov r0, sp\n" + " mov r2, #0x11\n" + " bl memcpy\n" + " add r6, sp, #0x14\n" + " ldr r1, ._189 + 4\n" + " add r0, r6, #0\n" + " mov r2, #0x7\n" + " bl memcpy\n" + " ldr r0, ._189 + 8\n" + " mov r8, r0\n" + " ldr r0, ._189 + 12\n" + " ldrh r1, [r0]\n" + " mov r0, r8\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r4, ._189 + 16\n" + " add r0, r4, #0\n" + " mov r1, sp\n" + " bl StringExpandPlaceholders\n" + " bl Menu_DisplayDialogueFrame\n" + " add r0, r4, #0\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + " ldr r1, ._189 + 20\n" + " mov r0, r8\n" + " bl StringCopy\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl StringExpandPlaceholders\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xc\n" + " mov r3, #0x3\n" + " bl Menu_DrawStdWindowFrame\n" + " add r0, r6, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl Menu_PrintText\n" + " ldr r1, ._189 + 24\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r1, ._189 + 28\n" + " str r1, [r0]\n" + " add sp, sp, #0x1c\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._190:\n" + " .align 2, 0\n" + "._189:\n" + " .word Str_8411623\n" + " .word Str_8411634\n" + " .word gStringVar1\n" + " .word gSpecialVar_0x8005\n" + " .word gStringVar4\n" + " .word gSpeciesNames\n" + " .word gTasks\n" + " .word debug_sub_810CB50+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CD9C() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl ScriptContext1_Stop\n" + " bl ScriptContext2_Enable\n" + " ldr r1, ._191\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " ldr r3, ._191 + 4\n" + " ldr r2, ._191 + 8\n" + " ldr r1, ._191 + 12\n" + " mov r0, #0x0\n" + " strh r0, [r1]\n" + " strh r0, [r2]\n" + " strh r0, [r3]\n" + " ldr r0, ._191 + 16\n" + " bl SetMainCallback2\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._192:\n" + " .align 2, 0\n" + "._191:\n" + " .word unk_debug_bss_2\n" + " .word gSpecialVar_0x8004\n" + " .word gSpecialVar_0x8005\n" + " .word gSpecialVar_0x8006\n" + " .word debug_sub_810D388+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CDE0() +{ + asm( + " push {lr}\n" + " bl UpdatePaletteFade\n" + " bl RunTasks\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CDF0() +{ + asm( + " push {lr}\n" + " ldr r1, ._193\n" + " mov r0, #0x0\n" + " strh r0, [r1, #0x34]\n" + " strh r0, [r1, #0x36]\n" + " ldr r1, ._193 + 4\n" + " ldr r0, ._193 + 8\n" + " str r0, [r1]\n" + " ldr r0, ._193 + 12\n" + " bl SetMainCallback2\n" + " pop {r0}\n" + " bx r0\n" + "._194:\n" + " .align 2, 0\n" + "._193:\n" + " .word gMain\n" + " .word gFieldCallback\n" + " .word mapldr_default+1\n" + " .word c2_exit_to_overworld_2_switch+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CE1C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, ._196\n" + " ldr r0, [r0]\n" + " bl _call_via_r0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._195 @cond_branch\n" + " bl CloseMenu\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + "._195:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._197:\n" + " .align 2, 0\n" + "._196:\n" + " .word gCallback_03004AE8\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CE48() +{ + asm( + " push {r4, lr}\n" + " bl Menu_ProcessInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._198 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._199 @cond_branch\n" + " bl Menu_EraseScreen\n" + " bl debug_sub_810D340\n" + "._198:\n" + " mov r0, #0x0\n" + " b ._200\n" + "._199:\n" + " ldr r0, ._201\n" + " strh r1, [r0]\n" + " ldr r4, ._201 + 4\n" + " ldrh r0, [r4]\n" + " mov r1, #0xc\n" + " bl __umodsi3\n" + " strh r0, [r4]\n" + " ldr r0, ._201 + 8\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " ldr r1, ._201 + 12\n" + " mov r2, #0x0\n" + " mov r0, #0x1\n" + " strh r0, [r1, #0x34]\n" + " strh r2, [r1, #0x36]\n" + "._200:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._202:\n" + " .align 2, 0\n" + "._201:\n" + " .word gSpecialVar_0x8005\n" + " .word gSpecialVar_0x8006\n" + " .word debug_sub_810CA7C+1\n" + " .word gMain\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CEA4() +{ + asm( + " push {lr}\n" + " ldr r0, ._205\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._203 @cond_branch\n" + " mov r0, #0x0\n" + " b ._204\n" + "._206:\n" + " .align 2, 0\n" + "._205:\n" + " .word gPaletteFade\n" + "._203:\n" + " ldr r1, ._207\n" + " mov r0, #0x4\n" + " strh r0, [r1]\n" + " bl sub_80E60D8\n" + " mov r0, #0x1\n" + "._204:\n" + " pop {r1}\n" + " bx r1\n" + "._208:\n" + " .align 2, 0\n" + "._207:\n" + " .word gSpecialVar_0x8004\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CED0() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xffffffdc\n" + " ldr r1, ._212\n" + " mov r0, sp\n" + " mov r2, #0x23\n" + " bl memcpy\n" + " bl Menu_ProcessInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._215 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._210 @cond_branch\n" + " bl Menu_EraseScreen\n" + " b ._211\n" + "._213:\n" + " .align 2, 0\n" + "._212:\n" + " .word Str_841163B\n" + "._210:\n" + " ldr r5, ._216\n" + " strh r1, [r5]\n" + " ldr r6, ._216 + 4\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldr r1, ._216 + 8\n" + " add r0, r0, r1\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x79\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bls ._214 @cond_branch\n" + " ldrh r1, [r5]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r6\n" + " ldr r2, ._216 + 8\n" + " add r0, r0, r2\n" + " ldr r1, ._216 + 12\n" + " strh r1, [r0]\n" + " ldrh r1, [r5]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " sub r2, r2, #0xe\n" + " add r1, r6, r2\n" + " add r0, r0, r1\n" + " ldr r4, ._216 + 16\n" + " add r1, r4, #0\n" + " bl StringCopy\n" + " ldrh r1, [r5]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " ldr r2, ._216 + 20\n" + " add r1, r6, r2\n" + " add r0, r0, r1\n" + " add r4, r4, #0xa\n" + " ldr r1, [r4]\n" + " str r1, [r0]\n" + " ldr r1, ._216 + 24\n" + " ldr r0, ._216 + 28\n" + " str r0, [r1]\n" + " b ._215\n" + "._217:\n" + " .align 2, 0\n" + "._216:\n" + " .word gSpecialVar_0x8005\n" + " .word gSaveBlock1\n" + " .word 0x2b6c\n" + " .word 0xffff\n" + " .word gSaveBlock2\n" + " .word 0x2b66\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_810CEA4+1\n" + "._214:\n" + " bl Menu_EraseScreen\n" + " bl Menu_DisplayDialogueFrame\n" + " mov r0, sp\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + "._211:\n" + " bl debug_sub_810D340\n" + "._215:\n" + " mov r0, #0x0\n" + " add sp, sp, #0x24\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810CFA4() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xffffffe0\n" + " ldr r1, ._221\n" + " mov r0, sp\n" + " mov r2, #0x1f\n" + " bl memcpy\n" + " bl Menu_ProcessInput\n" + " lsl r0, r0, #0x18\n" + " asr r2, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r2, r0\n" + " beq ._218 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r2, r0\n" + " bne ._219 @cond_branch\n" + " bl Menu_EraseScreen\n" + " b ._220\n" + "._222:\n" + " .align 2, 0\n" + "._221:\n" + " .word Str_841165E\n" + "._219:\n" + " ldr r0, ._225\n" + " strh r2, [r0]\n" + " ldr r1, ._225 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldr r1, ._225 + 8\n" + " add r0, r0, r1\n" + " ldrh r0, [r0]\n" + " sub r0, r0, #0x79\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bls ._223 @cond_branch\n" + " ldr r0, ._225 + 12\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " mov r0, #0x1\n" + " b ._224\n" + "._226:\n" + " .align 2, 0\n" + "._225:\n" + " .word gSpecialVar_0x8005\n" + " .word gSaveBlock1\n" + " .word 0x2b6c\n" + " .word debug_sub_810CCEC+1\n" + "._223:\n" + " bl Menu_EraseScreen\n" + " bl Menu_DisplayDialogueFrame\n" + " mov r0, sp\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + "._220:\n" + " bl debug_sub_810D340\n" + "._218:\n" + " mov r0, #0x0\n" + "._224:\n" + " add sp, sp, #0x20\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810D030() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add sp, sp, #0xffffffcc\n" + " ldr r1, ._230\n" + " mov r0, sp\n" + " mov r2, #0x10\n" + " bl memcpy\n" + " add r5, sp, #0x10\n" + " ldr r1, ._230 + 4\n" + " add r0, r5, #0\n" + " mov r2, #0x21\n" + " bl memcpy\n" + " bl Menu_ProcessInput\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._227 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._228 @cond_branch\n" + " bl Menu_EraseScreen\n" + " b ._229\n" + "._231:\n" + " .align 2, 0\n" + "._230:\n" + " .word Str_841167D\n" + " .word Str_841168D\n" + "._228:\n" + " ldr r2, ._235\n" + " strh r1, [r2]\n" + " ldr r3, ._235 + 4\n" + " ldrh r1, [r2]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r3\n" + " ldr r1, ._235 + 8\n" + " add r0, r0, r1\n" + " ldrh r1, [r0]\n" + " ldr r0, ._235 + 12\n" + " add r4, r2, #0\n" + " cmp r1, r0\n" + " beq ._233 @cond_branch\n" + " cmp r1, #0\n" + " beq ._233 @cond_branch\n" + " bl Menu_EraseScreen\n" + " bl Menu_DisplayDialogueFrame\n" + " add r0, r5, #0\n" + " b ._234\n" + "._236:\n" + " .align 2, 0\n" + "._235:\n" + " .word gSpecialVar_0x8005\n" + " .word gSaveBlock1\n" + " .word 0x2b6c\n" + " .word 0xffff\n" + "._233:\n" + " ldrh r1, [r4]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r3\n" + " ldr r5, ._238\n" + " add r0, r0, r5\n" + " mov r2, #0x0\n" + " strh r2, [r0]\n" + " ldrh r1, [r4]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r3\n" + " ldr r1, ._238 + 4\n" + " add r0, r0, r1\n" + " strh r2, [r0]\n" + " ldrh r1, [r4]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r3\n" + " sub r5, r5, #0xe\n" + " add r0, r0, r5\n" + " mov r1, #0xff\n" + " strb r1, [r0]\n" + " ldrh r1, [r4]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r5, r5, #0x8\n" + " add r1, r3, r5\n" + " add r0, r0, r1\n" + " str r2, [r0]\n" + " mov r0, #0x0\n" + " ldr r1, ._238 + 8\n" + " mov ip, r1\n" + " sub r5, r5, #0x1a\n" + " add r7, r3, r5\n" + " add r6, r4, #0\n" + " ldr r1, ._238 + 12\n" + " add r5, r1, #0\n" + "._237:\n" + " lsl r1, r0, #0x18\n" + " asr r1, r1, #0x18\n" + " lsl r3, r1, #0x1\n" + " ldrh r2, [r6]\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x2\n" + " add r3, r3, r0\n" + " add r3, r3, r7\n" + " ldrh r0, [r3]\n" + " orr r0, r0, r5\n" + " strh r0, [r3]\n" + " add r1, r1, #0x1\n" + " lsl r1, r1, #0x18\n" + " lsr r0, r1, #0x18\n" + " asr r1, r1, #0x18\n" + " cmp r1, #0x8\n" + " ble ._237 @cond_branch\n" + " ldrh r1, [r4]\n" + " mov r0, ip\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r4, ._238 + 16\n" + " add r0, r4, #0\n" + " mov r1, sp\n" + " bl StringExpandPlaceholders\n" + " bl Menu_EraseScreen\n" + " bl Menu_DisplayDialogueFrame\n" + " add r0, r4, #0\n" + "._234:\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl Menu_PrintText\n" + "._229:\n" + " bl debug_sub_810D340\n" + "._227:\n" + " mov r0, #0x0\n" + " add sp, sp, #0x34\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._239:\n" + " .align 2, 0\n" + "._238:\n" + " .word 0x2b6c\n" + " .word 0x2b6a\n" + " .word gStringVar1\n" + " .word 0xffff\n" + " .word gStringVar4\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810D174() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffeec\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " ldr r1, ._242\n" + " add r0, sp, #0x8\n" + " mov r2, #0xc\n" + " bl memcpy\n" + " mov r5, #0x0\n" + " mov r0, sp\n" + " add r0, r0, #0x14\n" + " str r0, [sp, #0x110]\n" + " add r1, sp, #0xc8\n" + " mov r8, r1\n" + " add r2, sp, #0xcc\n" + " mov sl, r2\n" + " ldr r0, ._242 + 4\n" + " mov r9, r0\n" + "._248:\n" + " ldr r0, ._242 + 8\n" + " add r1, r5, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " lsl r1, r5, #0x3\n" + " add r0, r1, r5\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r9\n" + " ldr r2, ._242 + 12\n" + " add r4, r0, r2\n" + " ldrh r0, [r4]\n" + " add r6, r1, #0\n" + " ldr r1, ._242 + 16\n" + " cmp r0, r1\n" + " bne ._240 @cond_branch\n" + " ldr r0, ._242 + 20\n" + " mov r1, #0x1\n" + " b ._241\n" + "._243:\n" + " .align 2, 0\n" + "._242:\n" + " .word Str_84116AE\n" + " .word gSaveBlock1\n" + " .word gStringVar1\n" + " .word 0x2b6c\n" + " .word 0xffff\n" + " .word gStringVar2\n" + "._240:\n" + " sub r0, r0, #0x79\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bhi ._244 @cond_branch\n" + " ldr r0, ._246\n" + " mov r1, #0x2\n" + "._241:\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " b ._245\n" + "._247:\n" + " .align 2, 0\n" + "._246:\n" + " .word gStringVar2\n" + "._244:\n" + " ldr r0, ._253\n" + " mov r1, #0x0\n" + " mov r2, #0x1\n" + " mov r3, #0x1\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0x0\n" + " strh r0, [r4]\n" + "._245:\n" + " add r0, r6, r5\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r9\n" + " ldr r2, ._253 + 4\n" + " add r0, r0, r2\n" + " ldrh r1, [r0]\n" + " mov r0, #0xb\n" + " mul r1, r1, r0\n" + " ldr r0, ._253 + 8\n" + " add r1, r1, r0\n" + " ldr r0, ._253 + 12\n" + " bl StringCopy\n" + " lsl r4, r5, #0x2\n" + " add r4, r4, r5\n" + " lsl r4, r4, #0x2\n" + " ldr r0, [sp, #0x110]\n" + " add r4, r0, r4\n" + " add r0, r4, #0\n" + " add r1, sp, #0x8\n" + " bl StringExpandPlaceholders\n" + " mov r1, r8\n" + " add r0, r1, r6\n" + " str r4, [r0]\n" + " mov r2, sl\n" + " add r0, r2, r6\n" + " mov r4, #0x0\n" + " str r4, [r0]\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x8\n" + " bls ._248 @cond_branch\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x10\n" + " mov r3, #0x13\n" + " bl Menu_DrawStdWindowFrame\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " mov r3, r8\n" + " bl Menu_PrintItems\n" + " str r4, [sp]\n" + " mov r0, #0xf\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x9\n" + " bl InitMenu\n" + " cmp r7, #0x1\n" + " beq ._249 @cond_branch\n" + " cmp r7, #0x1\n" + " bgt ._250 @cond_branch\n" + " cmp r7, #0\n" + " beq ._251 @cond_branch\n" + " b ._257\n" + "._254:\n" + " .align 2, 0\n" + "._253:\n" + " .word gStringVar2\n" + " .word 0x2b6a\n" + " .word gSpeciesNames\n" + " .word gStringVar3\n" + "._250:\n" + " cmp r7, #0x2\n" + " beq ._255 @cond_branch\n" + " cmp r7, #0x3\n" + " beq ._256 @cond_branch\n" + " b ._257\n" + "._251:\n" + " ldr r1, ._259\n" + " ldr r0, ._259 + 4\n" + " b ._264\n" + "._260:\n" + " .align 2, 0\n" + "._259:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_810CE48+1\n" + "._249:\n" + " ldr r1, ._262\n" + " ldr r0, ._262 + 4\n" + " b ._264\n" + "._263:\n" + " .align 2, 0\n" + "._262:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_810CED0+1\n" + "._255:\n" + " ldr r1, ._265\n" + " ldr r0, ._265 + 4\n" + " b ._264\n" + "._266:\n" + " .align 2, 0\n" + "._265:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_810CFA4+1\n" + "._256:\n" + " ldr r1, ._267\n" + " ldr r0, ._267 + 4\n" + "._264:\n" + " str r0, [r1]\n" + "._257:\n" + " add sp, sp, #0x114\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._268:\n" + " .align 2, 0\n" + "._267:\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_810D030+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810D2F4() +{ + asm( + " push {lr}\n" + " bl Menu_ProcessInput\n" + " lsl r2, r0, #0x18\n" + " asr r1, r2, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._269 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r1, r0\n" + " bne ._270 @cond_branch\n" + " ldr r0, ._272\n" + " bl SetMainCallback2\n" + " b ._279\n" + "._273:\n" + " .align 2, 0\n" + "._272:\n" + " .word debug_sub_810CDF0+1\n" + "._270:\n" + " cmp r1, #0x1\n" + " beq ._278 @cond_branch\n" + " cmp r1, #0x1\n" + " bgt ._275 @cond_branch\n" + " cmp r1, #0\n" + " beq ._278 @cond_branch\n" + " b ._279\n" + "._275:\n" + " cmp r1, #0x2\n" + " beq ._278 @cond_branch\n" + " cmp r1, #0x3\n" + " bne ._279 @cond_branch\n" + "._278:\n" + " lsr r0, r2, #0x18\n" + " bl debug_sub_810D174\n" + "._269:\n" + " mov r0, #0x0\n" + " b ._280\n" + "._279:\n" + " mov r0, #0x1\n" + "._280:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810D340() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x9\n" + " mov r3, #0x9\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r3, ._281\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x4\n" + " bl Menu_PrintItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x8\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " ldr r1, ._281 + 4\n" + " ldr r0, ._281 + 8\n" + " str r0, [r1]\n" + " add sp, sp, #0x8\n" + " pop {r0}\n" + " bx r0\n" + "._282:\n" + " .align 2, 0\n" + "._281:\n" + " .word _84116BC\n" + " .word gCallback_03004AE8\n" + " .word debug_sub_810D2F4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_810D388() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " ldr r1, ._285\n" + " ldr r2, ._285 + 4\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " add r2, r1, #0\n" + " cmp r0, #0x8\n" + " bls ._283 @cond_branch\n" + " b ._320\n" + "._283:\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._285 + 8\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._286:\n" + " .align 2, 0\n" + "._285:\n" + " .word gMain\n" + " .word 0x43c\n" + " .word ._287\n" + "._287:\n" + " .word ._288\n" + " .word ._289\n" + " .word ._290\n" + " .word ._291\n" + " .word ._292\n" + " .word ._293\n" + " .word ._294\n" + " .word ._295\n" + " .word ._296\n" + "._288:\n" + " ldr r3, ._299\n" + " ldrb r4, [r3]\n" + " cmp r4, #0\n" + " beq ._297 @cond_branch\n" + " ldr r1, ._299 + 4\n" + " add r0, r2, r1\n" + " mov r2, #0x0\n" + " mov r1, #0x2\n" + " strb r1, [r0]\n" + " strb r2, [r3]\n" + " b ._320\n" + "._300:\n" + " .align 2, 0\n" + "._299:\n" + " .word unk_debug_bss_2\n" + " .word 0x43c\n" + "._297:\n" + " bl remove_some_task\n" + " bl ResetPaletteFade\n" + " ldr r0, ._302\n" + " bl SetVBlankCallback\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " str r4, [sp]\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " b ._321\n" + "._303:\n" + " .align 2, 0\n" + "._302:\n" + " .word sub_80F8F18+1\n" + "._289:\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._304 @cond_branch\n" + " b ._320\n" + "._304:\n" + " b ._321\n" + "._290:\n" + " mov r0, #0x0\n" + " bl SetVBlankCallback\n" + " ldr r0, ._308\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " add r0, r0, #0x4\n" + " strh r1, [r0]\n" + " sub r0, r0, #0x2\n" + " strh r1, [r0]\n" + " add r0, r0, #0x4\n" + " strh r1, [r0]\n" + " add r0, r0, #0x2\n" + " strh r1, [r0]\n" + " b ._321\n" + "._309:\n" + " .align 2, 0\n" + "._308:\n" + " .word 0x4000010\n" + "._291:\n" + " bl ResetSpriteData\n" + " bl ResetTasks\n" + " bl FreeAllSpritePalettes\n" + " b ._321\n" + "._292:\n" + " ldr r4, ._312\n" + " add r0, r4, #0\n" + " bl Text_LoadWindowTemplate\n" + " add r0, r4, #0\n" + " bl InitMenuWindow\n" + " bl Menu_EraseScreen\n" + " b ._321\n" + "._313:\n" + " .align 2, 0\n" + "._312:\n" + " .word gWindowTemplate_81E6CE4\n" + "._293:\n" + " ldr r4, ._315\n" + " ldr r0, [r4]\n" + " mov r1, #0x0\n" + " mov r2, #0x20\n" + " bl LoadPalette\n" + " ldr r0, [r4, #0x4]\n" + " mov r1, #0xc0\n" + " lsl r1, r1, #0x13\n" + " bl LZ77UnCompVram\n" + " add r1, sp, #0x4\n" + " mov r0, #0x1\n" + " strh r0, [r1]\n" + " ldr r1, ._315 + 4\n" + " add r2, sp, #0x4\n" + " str r2, [r1]\n" + " ldr r0, ._315 + 8\n" + " str r0, [r1, #0x4]\n" + " ldr r0, ._315 + 12\n" + " str r0, [r1, #0x8]\n" + " ldr r0, [r1, #0x8]\n" + " b ._321\n" + "._316:\n" + " .align 2, 0\n" + "._315:\n" + " .word gMailGraphicsTable\n" + " .word 0x40000d4\n" + " .word 0x6004000\n" + " .word 0x81000280\n" + "._294:\n" + " ldr r1, ._318\n" + " ldr r2, ._318 + 4\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x2\n" + " ldr r2, ._318 + 8\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " add r1, r1, #0x46\n" + " mov r0, #0x0\n" + " strh r0, [r1]\n" + " sub r1, r1, #0x50\n" + " mov r2, #0xd0\n" + " lsl r2, r2, #0x2\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " bl debug_sub_810D340\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x10\n" + " mov r3, #0x0\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._318 + 12\n" + " bl SetVBlankCallback\n" + " b ._321\n" + "._319:\n" + " .align 2, 0\n" + "._318:\n" + " .word 0x4000008\n" + " .word 0x9f08\n" + " .word 0x801\n" + " .word sub_80F8F18+1\n" + "._295:\n" + " bl UpdatePaletteFade\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._320 @cond_branch\n" + " b ._321\n" + "._296:\n" + " ldr r0, ._322\n" + " mov r1, #0x0\n" + " bl CreateTask\n" + " ldr r0, ._322 + 4\n" + " bl SetMainCallback2\n" + "._321:\n" + " ldr r1, ._322 + 8\n" + " ldr r0, ._322 + 12\n" + " add r1, r1, r0\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._320:\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._323:\n" + " .align 2, 0\n" + "._322:\n" + " .word debug_sub_810CE1C+1\n" + " .word debug_sub_810CDE0+1\n" + " .word gMain\n" + " .word 0x43c\n" + "\n" + ); +} +#endif \ No newline at end of file diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index 0242e7444..079bcf489 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -524,6 +524,328 @@ void CalculateMonStats(struct Pokemon *mon) SetMonData(mon, MON_DATA_HP, ¤tHP); } +#ifdef DEBUG +__attribute__((naked)) +void debug_sub_803F55C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xffffffc4\n" + " add r5, r0, #0\n" + " mov r1, #0x39\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x1c]\n" + " add r0, r5, #0\n" + " mov r1, #0x27\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " add r7, r0, #0\n" + " add r0, r5, #0\n" + " mov r1, #0x1a\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " add r4, r0, #0\n" + " add r0, r5, #0\n" + " mov r1, #0x28\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " mov r9, r0\n" + " add r0, r5, #0\n" + " mov r1, #0x1b\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " mov r8, r0\n" + " add r0, r5, #0\n" + " mov r1, #0x29\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x20]\n" + " add r0, r5, #0\n" + " mov r1, #0x1c\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " mov sl, r0\n" + " add r0, r5, #0\n" + " mov r1, #0x2a\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x24]\n" + " add r0, r5, #0\n" + " mov r1, #0x1d\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x28]\n" + " add r0, r5, #0\n" + " mov r1, #0x2b\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x2c]\n" + " add r0, r5, #0\n" + " mov r1, #0x1e\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x30]\n" + " add r0, r5, #0\n" + " mov r1, #0x2c\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x34]\n" + " add r0, r5, #0\n" + " mov r1, #0x1f\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " str r0, [sp, #0x38]\n" + " add r0, r5, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x0\n" + " bl GetMonData\n" + " lsl r0, r0, #0x10\n" + " lsr r6, r0, #0x10\n" + " add r0, r5, #0\n" + " bl GetLevelFromMonExp\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " str r0, [sp]\n" + " add r0, r5, #0\n" + " mov r1, #0x38\n" + " mov r2, sp\n" + " bl SetMonData\n" + " ldr r0, ._71\n" + " cmp r6, r0\n" + " bne ._69 @cond_branch\n" + " mov r0, #0x1\n" + " str r0, [sp, #0x4]\n" + " lsl r7, r6, #0x3\n" + " b ._70\n" + "._72:\n" + " .align 2, 0\n" + "._71:\n" + " .word 0x12f\n" + "._69:\n" + " ldr r1, ._80\n" + " lsl r2, r6, #0x3\n" + " sub r0, r2, r6\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x1\n" + " add r1, r0, r7\n" + " add r0, r4, #0\n" + " add r7, r2, #0\n" + " cmp r0, #0\n" + " bge ._73 @cond_branch\n" + " add r0, r0, #0x3\n" + "._73:\n" + " asr r0, r0, #0x2\n" + " add r0, r1, r0\n" + " ldr r4, [sp]\n" + " mul r0, r0, r4\n" + " mov r1, #0x64\n" + " bl gScriptFuncs_End+0x3d30\n" + " add r0, r0, r4\n" + " add r0, r0, #0xa\n" + " str r0, [sp, #0x4]\n" + "._70:\n" + " add r2, sp, #0x4\n" + " add r0, r5, #0\n" + " mov r1, #0x3a\n" + " bl SetMonData\n" + " ldr r1, ._80\n" + " sub r0, r7, r6\n" + " lsl r0, r0, #0x2\n" + " add r6, r0, r1\n" + " ldrb r0, [r6, #0x1]\n" + " lsl r0, r0, #0x1\n" + " mov r2, r9\n" + " add r1, r0, r2\n" + " mov r0, r8\n" + " cmp r0, #0\n" + " bge ._74 @cond_branch\n" + " add r0, r0, #0x3\n" + "._74:\n" + " asr r0, r0, #0x2\n" + " add r0, r1, r0\n" + " ldr r1, [sp]\n" + " mul r0, r0, r1\n" + " mov r1, #0x64\n" + " bl gScriptFuncs_End+0x3d30\n" + " add r0, r0, #0x5\n" + " str r0, [sp, #0x8]\n" + " add r0, r5, #0\n" + " bl GetNature\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r4, sp, #0x8\n" + " ldrh r1, [r4]\n" + " mov r2, #0x1\n" + " bl nature_stat_mod\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " str r0, [sp, #0x8]\n" + " add r0, r5, #0\n" + " mov r1, #0x3b\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " ldrb r0, [r6, #0x2]\n" + " lsl r0, r0, #0x1\n" + " ldr r2, [sp, #0x20]\n" + " add r1, r0, r2\n" + " mov r0, sl\n" + " cmp r0, #0\n" + " bge ._75 @cond_branch\n" + " add r0, r0, #0x3\n" + "._75:\n" + " asr r0, r0, #0x2\n" + " add r0, r1, r0\n" + " ldr r1, [sp]\n" + " mul r0, r0, r1\n" + " mov r1, #0x64\n" + " bl gScriptFuncs_End+0x3d30\n" + " add r0, r0, #0x5\n" + " str r0, [sp, #0xc]\n" + " add r0, r5, #0\n" + " bl GetNature\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r4, sp, #0xc\n" + " ldrh r1, [r4]\n" + " mov r2, #0x2\n" + " bl nature_stat_mod\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " str r0, [sp, #0xc]\n" + " add r0, r5, #0\n" + " mov r1, #0x3c\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " ldrb r0, [r6, #0x3]\n" + " lsl r0, r0, #0x1\n" + " ldr r2, [sp, #0x24]\n" + " add r1, r0, r2\n" + " ldr r0, [sp, #0x28]\n" + " cmp r0, #0\n" + " bge ._76 @cond_branch\n" + " add r0, r0, #0x3\n" + "._76:\n" + " asr r0, r0, #0x2\n" + " add r0, r1, r0\n" + " ldr r1, [sp]\n" + " mul r0, r0, r1\n" + " mov r1, #0x64\n" + " bl gScriptFuncs_End+0x3d30\n" + " add r0, r0, #0x5\n" + " str r0, [sp, #0x10]\n" + " add r0, r5, #0\n" + " bl GetNature\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r4, sp, #0x10\n" + " ldrh r1, [r4]\n" + " mov r2, #0x3\n" + " bl nature_stat_mod\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " str r0, [sp, #0x10]\n" + " add r0, r5, #0\n" + " mov r1, #0x3d\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " ldrb r0, [r6, #0x4]\n" + " lsl r0, r0, #0x1\n" + " ldr r2, [sp, #0x2c]\n" + " add r1, r0, r2\n" + " ldr r0, [sp, #0x30]\n" + " cmp r0, #0\n" + " bge ._77 @cond_branch\n" + " add r0, r0, #0x3\n" + "._77:\n" + " asr r0, r0, #0x2\n" + " add r0, r1, r0\n" + " ldr r1, [sp]\n" + " mul r0, r0, r1\n" + " mov r1, #0x64\n" + " bl gScriptFuncs_End+0x3d30\n" + " add r0, r0, #0x5\n" + " str r0, [sp, #0x14]\n" + " add r0, r5, #0\n" + " bl GetNature\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r4, sp, #0x14\n" + " ldrh r1, [r4]\n" + " mov r2, #0x4\n" + " bl nature_stat_mod\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " str r0, [sp, #0x14]\n" + " add r0, r5, #0\n" + " mov r1, #0x3e\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " ldrb r0, [r6, #0x5]\n" + " lsl r0, r0, #0x1\n" + " ldr r1, [sp, #0x34]\n" + " add r2, r0, r1\n" + " ldr r0, [sp, #0x38]\n" + " cmp r0, #0\n" + " bge ._78 @cond_branch\n" + " add r0, r0, #0x3\n" + "._78:\n" + " asr r0, r0, #0x2\n" + " add r0, r2, r0\n" + " ldr r1, [sp]\n" + " mul r0, r0, r1\n" + " mov r1, #0x64\n" + " bl gScriptFuncs_End+0x3d30\n" + " add r0, r0, #0x5\n" + " str r0, [sp, #0x18]\n" + " add r0, r5, #0\n" + " bl GetNature\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " add r4, sp, #0x18\n" + " ldrh r1, [r4]\n" + " mov r2, #0x5\n" + " bl nature_stat_mod\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " str r0, [sp, #0x18]\n" + " add r0, r5, #0\n" + " mov r1, #0x3f\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " ldr r1, [sp, #0x4]\n" + " ldr r0, [sp, #0x1c]\n" + " cmp r1, r0\n" + " bge ._79 @cond_branch\n" + " str r1, [sp, #0x1c]\n" + "._79:\n" + " add r2, sp, #0x1c\n" + " add r0, r5, #0\n" + " mov r1, #0x39\n" + " bl SetMonData\n" + " add sp, sp, #0x3c\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._81:\n" + " .align 2, 0\n" + "._80:\n" + " .word gBaseStats\n" + "\n" + ); +} +#endif + void sub_803B4B4(const struct BoxPokemon *src, struct Pokemon *dest) { u32 value = 0; diff --git a/src/rom3.c b/src/rom3.c index 11239a681..2b719d14a 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -67,6 +67,10 @@ void sub_800B858(void) } } +#ifdef DEBUG +extern u8 gUnknown_02023A14_50; +#endif + void setup_poochyena_battle(void) { s32 i; @@ -93,6 +97,16 @@ void setup_poochyena_battle(void) } gUnknown_020239FC = 0; gUnknown_02024C78 = 0; + +#ifdef DEBUG + if (gUnknown_02023A14_50 & 0x80) + { + ewram[0x160fd] = 0; + ewram[0x160fe] = 0; + ewram[0x160ff] = 0; + ((u32 *) gBattleBuffersTransferData)[64]++; + } +#endif } void sub_800B950(void) diff --git a/src/rom6.c b/src/rom6.c index e71484b0a..1c0654538 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -1,4 +1,6 @@ #include "global.h" +#include "constants/map_objects.h" +#include "constants/songs.h" #include "rom6.h" #include "braille_puzzles.h" #include "field_effect.h" @@ -8,7 +10,6 @@ #include "pokemon_menu.h" #include "overworld.h" #include "script.h" -#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" @@ -116,6 +117,21 @@ static void sub_810B4CC(u8 taskId) DestroyTask(taskId); } +#ifdef DEBUG +void debug_sub_8120968(void) +{ + if (npc_before_player_of_type(MAP_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + { + gLastFieldPokeMenuOpened = 0; + sub_810B53C(); + } + else + { + ScriptContext2_Disable(); + } +} +#endif + bool8 SetUpFieldMove_RockSmash(void) { if (npc_before_player_of_type(0x56) == TRUE) diff --git a/src/roulette.c b/src/roulette.c index 6d79f9d38..ce95bc1c9 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -308,7 +308,10 @@ extern const u16 gUnknown_083FA632[]; extern const s8 gUnknown_083FA64A[0x2]; extern const s8 gUnknown_083FA64C[0x8][0x2]; - +#if DEBUG +EWRAM_DATA u8 unk_203955C[4] = { 0 }; +EWRAM_DATA u8 unk_2039560[4] = { 0 }; +#endif void sub_81150FC(void) diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index d8e099130..4bf0cef09 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -6,6 +6,7 @@ #include "palette.h" #include "random.h" #include "main.h" +#include "menu.h" #include "script.h" #include "task.h" #include "sound.h" @@ -102,6 +103,31 @@ static void sub_81248AC(u8); // .rodata +#if DEBUG + +u8 debug_sub_8138D74(void); +u8 debug_sub_8138D8C(void); +u8 debug_sub_8138C14(void); +u8 debug_sub_8138C34(void); +u8 debug_sub_810CD9C(void); + +const u8 Str_842DBD0[] = _("CABLE CAR U"); +const u8 Str_842DBDC[] = _("CABLE CAR D"); +const u8 Str_842DBE8[] = _("ROULETTE1"); +const u8 Str_842DBF2[] = _("ROULETTE3"); +const u8 Str_842DBFC[] = _("View a MAIL"); + +const struct MenuAction gUnkDebug4Menu[] = +{ + {Str_842DBD0, debug_sub_8138D74}, + {Str_842DBDC, debug_sub_8138D8C}, + {Str_842DBE8, debug_sub_8138C14}, + {Str_842DBF2, debug_sub_8138C34}, + {Str_842DBFC, debug_sub_810CD9C}, +}; + +#endif + static const u8 gCableCarMtChimneyTilemap[] = INCBIN_U8("graphics/misc/cable_car_mt_chimney_map.bin.lz"); static const u8 gCableCarTreeTilemap[] = INCBIN_U8("graphics/misc/cable_car_tree_map.bin.lz"); @@ -182,6 +208,158 @@ static const struct SpriteTemplate gSpriteTemplate_8401D40[] = { // .text +#if DEBUG + +__attribute__((naked)) +u8 debug_sub_8138C14(void) +{ + asm("\n\ + push {lr}\n\ + ldr r0, ._1\n\ + mov r1, #0x1\n\ + strb r1, [r0]\n\ + ldr r0, ._1 + 4\n\ + bl ScriptContext1_SetupScript\n\ + bl CloseMenu\n\ + mov r0, #0x1\n\ + pop {r1}\n\ + bx r1\n\ +._2:\n\ + .align 2, 0\n\ +._1:\n\ + .word unk_203955C\n\ + .word MauvilleCity_GameCorner_EventScript_1C407E"); +} + +__attribute__((naked)) +u8 debug_sub_8138C34(void) +{ + asm("\n\ + push {lr}\n\ + ldr r0, ._3\n\ + mov r1, #0x1\n\ + strb r1, [r0]\n\ + ldr r0, ._3 + 4\n\ + bl ScriptContext1_SetupScript\n\ + bl CloseMenu\n\ + mov r0, #0x1\n\ + pop {r1}\n\ + bx r1\n\ +._4:\n\ + .align 2, 0\n\ +._3:\n\ + .word unk_203955C\n\ + .word MauvilleCity_GameCorner_EventScript_1C40AC"); +} + +__attribute__((naked)) +u8 debug_sub_8138C54(void) +{ + asm("\n\ + push {r4, lr}\n\ + ldr r4, ._10\n\ + ldrh r0, [r4, #0x2e]\n\ + cmp r0, #0x40\n\ + bne ._5 @cond_branch\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + bl Menu_MoveCursor\n\ +._5:\n\ + ldrh r0, [r4, #0x2e]\n\ + cmp r0, #0x80\n\ + bne ._6 @cond_branch\n\ + mov r0, #0x1\n\ + bl Menu_MoveCursor\n\ +._6:\n\ + ldrh r1, [r4, #0x2e]\n\ + cmp r1, #0x1\n\ + beq ._7 @cond_branch\n\ + ldr r0, ._10 + 4\n\ + cmp r1, r0\n\ + bne ._8 @cond_branch\n\ + ldr r1, ._10 + 8\n\ + mov r0, #0x1\n\ + strh r0, [r1]\n\ +._7:\n\ + ldr r4, ._10 + 12\n\ + bl Menu_GetCursorPos\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x15\n\ + add r4, r4, #0x4\n\ + add r0, r0, r4\n\ + ldr r0, [r0]\n\ + bl _call_via_r0\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + b ._13\n\ +._11:\n\ + .align 2, 0\n\ +._10:\n\ + .word gMain\n\ + .word 0x101\n\ + .word gSpecialVar_0x8004\n\ + .word gUnkDebug4Menu\n\ +._8:\n\ + cmp r1, #0x2\n\ + beq ._12 @cond_branch\n\ + mov r0, #0x0\n\ + b ._13\n\ +._12:\n\ + bl CloseMenu\n\ + mov r0, #0x1\n\ +._13:\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1"); +} + +__attribute__((naked)) +u8 debug_sub_8138CC4(void) +{ + asm("\n\ + push {lr}\n\ + add sp, sp, #0xfffffff8\n\ + ldr r1, ._14\n\ + mov r0, #0x0\n\ + strh r0, [r1]\n\ + bl Menu_EraseScreen\n\ + mov r0, #0x13\n\ + mov r1, #0x0\n\ + mov r2, #0x1d\n\ + mov r3, #0xc\n\ + bl Menu_DrawStdWindowFrame\n\ + ldr r3, ._14 + 4\n\ + mov r0, #0x14\n\ + mov r1, #0x1\n\ + mov r2, #0x5\n\ + bl Menu_PrintItems\n\ + mov r0, #0x0\n\ + str r0, [sp]\n\ + mov r0, #0x8\n\ + str r0, [sp, #0x4]\n\ + mov r0, #0x0\n\ + mov r1, #0x14\n\ + mov r2, #0x1\n\ + mov r3, #0x5\n\ + bl InitMenu\n\ + ldr r1, ._14 + 8\n\ + ldr r0, ._14 + 12\n\ + str r0, [r1]\n\ + mov r0, #0x0\n\ + add sp, sp, #0x8\n\ + pop {r1}\n\ + bx r1\n\ +._15:\n\ + .align 2, 0\n\ +._14:\n\ + .word gSpecialVar_0x8004\n\ + .word gUnkDebug4Menu\n\ + .word gCallback_03004AE8\n\ + .word debug_sub_8138C54+1"); +} + +#endif + static void CableCarTask1(u8 taskId) { if (!gPaletteFade.active) @@ -198,6 +376,46 @@ void CableCar(void) BeginNormalPaletteFade(-1, 0, 0, 16, 0); } +#if DEBUG + +__attribute__((naked)) +u8 debug_sub_8138D74(void) +{ + asm("\n\ + push {lr}\n\ + ldr r1, ._21\n\ + mov r0, #0x0\n\ + strh r0, [r1]\n\ + bl CloseMenu\n\ + bl CableCar\n\ + pop {r0}\n\ + bx r0\n\ +._22:\n\ + .align 2, 0\n\ +._21:\n\ + .word gSpecialVar_0x8004"); +} + +__attribute__((naked)) +u8 debug_sub_8138D8C(void) +{ + asm("\n\ + push {lr}\n\ + ldr r1, ._23\n\ + mov r0, #0x1\n\ + strh r0, [r1]\n\ + bl CloseMenu\n\ + bl CableCar\n\ + pop {r0}\n\ + bx r0\n\ +._24:\n\ + .align 2, 0\n\ +._23:\n\ + .word gSpecialVar_0x8004"); +} + +#endif + static void CableCarMainCallback_Setup(void) { u8 i; diff --git a/src/scene/new_game.c b/src/scene/new_game.c index 0279f99c6..d954fb3c8 100644 --- a/src/scene/new_game.c +++ b/src/scene/new_game.c @@ -1,4 +1,7 @@ #include "global.h" +#include "constants/maps.h" +#include "constants/species.h" +#include "clock.h" #include "new_game.h" #include "battle_records.h" #include "berry.h" @@ -20,6 +23,7 @@ #include "pokemon_storage_system.h" #include "random.h" #include "roamer.h" +#include "script_pokemon_80C4.h" #include "overworld.h" #include "rtc.h" #include "script.h" @@ -27,6 +31,10 @@ #include "text.h" #include "tv.h" +#ifdef DEBUG +extern u8 gUnknown_020297ED; +#endif + EWRAM_DATA u8 gDifferentSaveFile = 0; EWRAM_DATA u8 gUnknown_020297ED = 0; @@ -42,6 +50,18 @@ static const struct ContestWinner sEmptyMuseumPortrait = .trainerName = {EOS}, }; +#ifdef DEBUG +const s8 gUnknown_Debug_0823C788[][2] = +{ + { MAP_GROUP(INSIDE_OF_TRUCK), MAP_NUM(INSIDE_OF_TRUCK) }, + { MAP_GROUP(OLDALE_TOWN_POKEMON_CENTER_2F), MAP_NUM(OLDALE_TOWN_POKEMON_CENTER_2F) }, + { MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN) }, + { MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F) } +}; + +const u8 gUnknown_Debug_0823C790[] = _("KRÖTE"); +#endif + void write_word_to_mem(u32 var, u8 *dataPtr) { dataPtr[0] = var; @@ -94,6 +114,30 @@ void ZeroBattleTowerData(void) CpuFill32(0, &gSaveBlock2.battleTower, sizeof(gSaveBlock2.battleTower)); } +#ifdef DEBUG +void debug_sub_8052E04() +{ + u8 i; + + for (i = 0; i < 4; i++) + { + if (gUnknown_Debug_0823C788[i][0] == gSaveBlock1.location.mapGroup && + gUnknown_Debug_0823C788[i][1] == gSaveBlock1.location.mapNum) + { + break; + } + } + + i++; + if (i >= 4) + { + i = 0; + } + + Overworld_SetWarpDestination(gUnknown_Debug_0823C788[i][0], gUnknown_Debug_0823C788[i][1], -1, -1, -1); +} +#endif + void WarpToTruck(void) { Overworld_SetWarpDestination(25, 40, -1, -1, -1); // inside of truck @@ -109,6 +153,9 @@ void ClearSav2(void) void sub_8052E4C(void) { gDifferentSaveFile = 0; +#ifdef DEBUG + gUnknown_020297ED = 0; +#endif sub_808C0A0(); ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); @@ -161,3 +208,33 @@ void NewGameInitData(void) WarpToTruck(); ScriptContext2_RunNewScript(gUnknown_0819FA81); } + +#ifdef DEBUG +extern void debug_sub_80A3904(void); +extern void debug_sub_80A3714(void); +extern void debug_sub_8120F98(void); +extern void unref_sub_8070F90(void); + +void debug_sub_8057508(bool32 arg0) +{ + gUnknown_020297ED = 1; + NewGameInitData(); + gSaveBlock1.money = 999999; + FlagSet(FLAG_SYS_POKEMON_GET); + FlagSet(FLAG_SYS_POKEDEX_GET); + FlagSet(FLAG_SYS_POKENAV_GET); + FlagSet(FLAG_SYS_B_DASH); + ScriptGiveMon(SPECIES_TREECKO, 99, 0, 0, 0, 0); + + if (arg0 == TRUE) + SetMonData(&gPlayerParty[0], MON_DATA_NICKNAME, gUnknown_Debug_0823C790); + + debug_sub_80A3904(); + debug_sub_80A3714(); + debug_sub_8120F98(); + FlagSet(FLAG_SYS_HIPSTER_MEET); + sub_80EB8EC(); + unref_sub_8070F90(); + InitTimeBasedEvents(); +} +#endif diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index 202b752a6..8d5c4da13 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -8,6 +8,7 @@ #include "m4a.h" #include "main.h" #include "main_menu.h" +#include "overworld.h" #include "palette.h" #include "reset_rtc_screen.h" #include "sound.h" @@ -353,6 +354,7 @@ static void Task_TitleScreenPhase1(u8); static void Task_TitleScreenPhase2(u8); static void Task_TitleScreenPhase3(u8); static void CB2_GoToMainMenu(void); +static void CB2_GoToTestMenu(void); static void CB2_GoToClearSaveDataScreen(void); static void CB2_GoToResetRtcScreen(void); static void CB2_GoToCopyrightScreen(void); @@ -829,6 +831,13 @@ static void Task_TitleScreenPhase3(u8 taskId) BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); SetMainCallback2(CB2_GoToResetRtcScreen); } +#ifdef DEBUG + else if (gMain.heldKeys == SELECT_BUTTON) + { + BeginNormalPaletteFade(-1, 0, 0, 16, 0); + SetMainCallback2(CB2_GoToTestMenu); + } +#endif else { REG_BG2Y = 0; @@ -855,6 +864,14 @@ static void CB2_GoToMainMenu(void) SetMainCallback2(CB2_InitMainMenu); } +#ifdef DEBUG +static void CB2_GoToTestMenu(void) +{ + if (!UpdatePaletteFade()) + SetMainCallback2(CB2_InitTestMenu); +} +#endif + static void CB2_GoToCopyrightScreen(void) { if (!UpdatePaletteFade()) diff --git a/sym_ewram.txt b/sym_ewram.txt index dcbadf96e..2e4cf48e7 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -569,6 +569,8 @@ gUnknown_02039268: @ 2039268 gUnknown_0203926A: @ 203926A .space 0x2 + .include "src/roulette.o" + @ battle_message gAbilitiesPerBank: @ 203926C -- cgit v1.2.3 From 2f4f96ca5d62b4d18eb4d78eed71ea8073a385ff Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 16 Jan 2018 22:34:49 -0600 Subject: fuck you, git --- data/contest_opponents.inc | 224 +- data/event_scripts.s | 1271 ++----- data/field_move_scripts.inc | 74 +- data/maps/VictoryRoad_B1F/map.bin | 4 +- data/maps/VictoryRoad_B2F/map.bin | 2 +- data/strings2.s | 409 +-- data/text/ability_descriptions.inc | 156 +- data/text/ability_names.inc | 146 +- data/text/aqua_awakening.inc | 136 +- data/text/aqua_chimney.inc | 187 +- data/text/aqua_settled.inc | 17 +- data/text/aqua_summit.inc | 228 +- data/text/barboach.inc | 44 +- data/text/bard.inc | 38 +- data/text/berries.inc | 307 +- data/text/berry_tree.inc | 58 +- data/text/birch_speech.inc | 79 +- data/text/braille.inc | 229 +- data/text/cable_club.inc | 198 +- data/text/contest_hall.inc | 312 +- data/text/contest_strings.inc | 704 ++-- data/text/day_care.inc | 140 +- data/text/easy_chat/group_name_strings.inc | 34 +- data/text/easy_chat/groups/actions/order.inc | 114 +- data/text/easy_chat/groups/actions/words.inc | 152 +- data/text/easy_chat/groups/adjectives/order.inc | 52 +- data/text/easy_chat/groups/adjectives/words.inc | 72 +- data/text/easy_chat/groups/battle/order.inc | 88 +- data/text/easy_chat/groups/battle/words.inc | 124 +- data/text/easy_chat/groups/conditions/order.inc | 100 +- data/text/easy_chat/groups/conditions/words.inc | 136 +- data/text/easy_chat/groups/endings/order.inc | 90 +- data/text/easy_chat/groups/endings/words.inc | 134 +- data/text/easy_chat/groups/events/order.inc | 26 +- data/text/easy_chat/groups/events/words.inc | 34 +- data/text/easy_chat/groups/feelings/order.inc | 102 +- data/text/easy_chat/groups/feelings/words.inc | 138 +- data/text/easy_chat/groups/greetings/order.inc | 54 +- data/text/easy_chat/groups/greetings/words.inc | 72 +- data/text/easy_chat/groups/hobbies/order.inc | 58 +- data/text/easy_chat/groups/hobbies/words.inc | 84 +- data/text/easy_chat/groups/lifestyle/order.inc | 44 +- data/text/easy_chat/groups/lifestyle/words.inc | 72 +- data/text/easy_chat/groups/misc/order.inc | 58 +- data/text/easy_chat/groups/misc/words.inc | 84 +- data/text/easy_chat/groups/move_1/order.inc | 218 +- data/text/easy_chat/groups/move_2/order.inc | 270 +- data/text/easy_chat/groups/people/order.inc | 110 +- data/text/easy_chat/groups/people/words.inc | 146 +- data/text/easy_chat/groups/pokemon/order.inc | 226 +- data/text/easy_chat/groups/pokemon_2/order.inc | 284 +- data/text/easy_chat/groups/speech/order.inc | 88 +- data/text/easy_chat/groups/speech/words.inc | 116 +- data/text/easy_chat/groups/status/order.inc | 154 +- data/text/easy_chat/groups/status/words.inc | 204 +- data/text/easy_chat/groups/time/order.inc | 58 +- data/text/easy_chat/groups/time/words.inc | 86 +- data/text/easy_chat/groups/trainer/order.inc | 10 +- data/text/easy_chat/groups/trainer/words.inc | 24 +- data/text/easy_chat/groups/trendy_saying/order.inc | 42 +- data/text/easy_chat/groups/trendy_saying/words.inc | 58 +- data/text/easy_chat/groups/voices/order.inc | 54 +- data/text/easy_chat/groups/voices/words.inc | 74 +- data/text/easy_chat/words_by_letter.inc | 2782 ++++++++-------- data/text/eon_ticket.inc | 55 +- data/text/gabby_and_ty.inc | 327 +- data/text/giddy.inc | 16 +- data/text/gift_ribbon_descriptions.inc | 92 +- data/text/hipster.inc | 25 +- data/text/landmarks.inc | 74 +- data/text/lottery_corner.inc | 97 +- data/text/magma_awakening.inc | 136 +- data/text/magma_chimney.inc | 195 +- data/text/magma_settled.inc | 17 +- data/text/magma_summit.inc | 229 +- data/text/maps/AbandonedShip_CaptainsOffice.inc | 24 +- data/text/maps/AbandonedShip_Corridors_1F.inc | 15 +- data/text/maps/AbandonedShip_Corridors_B1F.inc | 35 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 3 +- data/text/maps/AbandonedShip_HiddenFloorRooms.inc | 36 +- data/text/maps/AbandonedShip_Rooms2_1F.inc | 78 +- data/text/maps/AbandonedShip_Rooms2_B1F.inc | 8 +- data/text/maps/AbandonedShip_Rooms_1F.inc | 6 +- data/text/maps/AbandonedShip_Rooms_B1F.inc | 8 +- data/text/maps/AquaHideout_1F.inc | 70 +- data/text/maps/AquaHideout_B1F.inc | 45 +- data/text/maps/AquaHideout_B2F.inc | 71 +- data/text/maps/BattleTower_BattleRoom.inc | 16 +- data/text/maps/BattleTower_Lobby.inc | 248 +- data/text/maps/BattleTower_Outside.inc | 51 +- data/text/maps/DewfordTown.inc | 215 +- data/text/maps/DewfordTown_Gym.inc | 141 +- data/text/maps/DewfordTown_Hall.inc | 244 +- data/text/maps/DewfordTown_House1.inc | 19 +- data/text/maps/DewfordTown_House2.inc | 43 +- data/text/maps/DewfordTown_PokemonCenter_1F.inc | 15 +- data/text/maps/EverGrandeCity.inc | 12 +- data/text/maps/EverGrandeCity_ChampionsRoom.inc | 135 +- data/text/maps/EverGrandeCity_DrakesRoom.inc | 50 +- data/text/maps/EverGrandeCity_GlaciasRoom.inc | 35 +- data/text/maps/EverGrandeCity_HallOfFame.inc | 20 +- data/text/maps/EverGrandeCity_PhoebesRoom.inc | 37 +- data/text/maps/EverGrandeCity_PokemonCenter_1F.inc | 18 +- data/text/maps/EverGrandeCity_PokemonLeague.inc | 20 +- data/text/maps/EverGrandeCity_SidneysRoom.inc | 30 +- data/text/maps/FallarborTown.inc | 55 +- data/text/maps/FallarborTown_ContestHall.inc | 28 +- data/text/maps/FallarborTown_ContestLobby.inc | 34 +- data/text/maps/FallarborTown_House1.inc | 67 +- data/text/maps/FallarborTown_House2.inc | 46 +- data/text/maps/FallarborTown_Mart.inc | 23 +- data/text/maps/FallarborTown_PokemonCenter_1F.inc | 48 +- data/text/maps/FortreeCity.inc | 78 +- data/text/maps/FortreeCity_DecorationShop.inc | 19 +- data/text/maps/FortreeCity_Gym.inc | 147 +- data/text/maps/FortreeCity_House1.inc | 46 +- data/text/maps/FortreeCity_House2.inc | 60 +- data/text/maps/FortreeCity_House3.inc | 27 +- data/text/maps/FortreeCity_House4.inc | 36 +- data/text/maps/FortreeCity_House5.inc | 17 +- data/text/maps/FortreeCity_Mart.inc | 20 +- data/text/maps/FortreeCity_PokemonCenter_1F.inc | 36 +- data/text/maps/GraniteCave_1F.inc | 32 +- data/text/maps/GraniteCave_StevensRoom.inc | 50 +- data/text/maps/InsideOfTruck.inc | 6 +- data/text/maps/JaggedPass.inc | 74 +- data/text/maps/LavaridgeTown.inc | 193 +- data/text/maps/LavaridgeTown_Gym_1F.inc | 184 +- data/text/maps/LavaridgeTown_HerbShop.inc | 29 +- data/text/maps/LavaridgeTown_House.inc | 11 +- data/text/maps/LavaridgeTown_Mart.inc | 16 +- data/text/maps/LavaridgeTown_PokemonCenter_1F.inc | 25 +- data/text/maps/LilycoveCity.inc | 424 ++- data/text/maps/LilycoveCity_ContestHall.inc | 282 +- data/text/maps/LilycoveCity_ContestLobby.inc | 232 +- data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc | 84 +- data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc | 66 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 36 +- data/text/maps/LilycoveCity_DepartmentStore_1F.inc | 32 +- data/text/maps/LilycoveCity_DepartmentStore_2F.inc | 17 +- data/text/maps/LilycoveCity_DepartmentStore_3F.inc | 26 +- data/text/maps/LilycoveCity_DepartmentStore_4F.inc | 25 +- data/text/maps/LilycoveCity_DepartmentStore_5F.inc | 20 +- data/text/maps/LilycoveCity_Harbor.inc | 58 +- data/text/maps/LilycoveCity_House1.inc | 8 +- data/text/maps/LilycoveCity_House2.inc | 12 +- data/text/maps/LilycoveCity_House3.inc | 110 +- data/text/maps/LilycoveCity_House4.inc | 14 +- data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc | 165 +- data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc | 148 +- data/text/maps/LilycoveCity_MoveDeletersHouse.inc | 36 +- data/text/maps/LilycoveCity_PokemonCenter_1F.inc | 37 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 350 +- data/text/maps/LittlerootTown.inc | 124 +- data/text/maps/LittlerootTown_BrendansHouse_1F.inc | 189 +- data/text/maps/LittlerootTown_BrendansHouse_2F.inc | 51 +- data/text/maps/LittlerootTown_MaysHouse_1F.inc | 46 +- data/text/maps/LittlerootTown_MaysHouse_2F.inc | 137 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 230 +- data/text/maps/MauvilleCity.inc | 240 +- data/text/maps/MauvilleCity_BikeShop.inc | 202 +- data/text/maps/MauvilleCity_GameCorner.inc | 167 +- data/text/maps/MauvilleCity_Gym.inc | 144 +- data/text/maps/MauvilleCity_House1.inc | 23 +- data/text/maps/MauvilleCity_House2.inc | 28 +- data/text/maps/MauvilleCity_Mart.inc | 22 +- data/text/maps/MauvilleCity_PokemonCenter_1F.inc | 28 +- data/text/maps/MauvilleCity_PokemonCenter_2F.inc | 13 +- data/text/maps/MeteorFalls_1F_1R.inc | 142 +- data/text/maps/MeteorFalls_1F_2R.inc | 148 +- data/text/maps/MossdeepCity.inc | 114 +- data/text/maps/MossdeepCity_GameCorner_1F.inc | 60 +- data/text/maps/MossdeepCity_Gym.inc | 227 +- data/text/maps/MossdeepCity_House1.inc | 19 +- data/text/maps/MossdeepCity_House2.inc | 17 +- data/text/maps/MossdeepCity_House3.inc | 29 +- data/text/maps/MossdeepCity_House4.inc | 21 +- data/text/maps/MossdeepCity_Mart.inc | 30 +- data/text/maps/MossdeepCity_PokemonCenter_1F.inc | 15 +- data/text/maps/MossdeepCity_PokemonCenter_2F.inc | 6 +- data/text/maps/MossdeepCity_SpaceCenter_1F.inc | 42 +- data/text/maps/MossdeepCity_SpaceCenter_2F.inc | 20 +- data/text/maps/MossdeepCity_StevensHouse.inc | 132 +- data/text/maps/MtChimney.inc | 115 +- data/text/maps/MtChimney_CableCarStation.inc | 8 +- data/text/maps/MtPyre_1F.inc | 25 +- data/text/maps/MtPyre_2F.inc | 78 +- data/text/maps/MtPyre_3F.inc | 31 +- data/text/maps/MtPyre_4F.inc | 12 +- data/text/maps/MtPyre_5F.inc | 18 +- data/text/maps/MtPyre_6F.inc | 20 +- data/text/maps/NewMauville_Entrance.inc | 8 +- data/text/maps/NewMauville_Inside.inc | 17 +- data/text/maps/OldaleTown.inc | 72 +- data/text/maps/OldaleTown_House1.inc | 12 +- data/text/maps/OldaleTown_House2.inc | 11 +- data/text/maps/OldaleTown_Mart.inc | 17 +- data/text/maps/OldaleTown_PokemonCenter_1F.inc | 31 +- data/text/maps/PacifidlogTown.inc | 25 +- data/text/maps/PacifidlogTown_House1.inc | 20 +- data/text/maps/PacifidlogTown_House2.inc | 58 +- data/text/maps/PacifidlogTown_House3.inc | 30 +- data/text/maps/PacifidlogTown_House4.inc | 29 +- data/text/maps/PacifidlogTown_House5.inc | 19 +- data/text/maps/PacifidlogTown_PokemonCenter_1F.inc | 23 +- data/text/maps/PetalburgCity.inc | 56 +- data/text/maps/PetalburgCity_Gym.inc | 569 ++-- data/text/maps/PetalburgCity_House1.inc | 25 +- data/text/maps/PetalburgCity_House2.inc | 17 +- data/text/maps/PetalburgCity_Mart.inc | 23 +- data/text/maps/PetalburgCity_PokemonCenter_1F.inc | 56 +- data/text/maps/PetalburgCity_WallysHouse.inc | 115 +- data/text/maps/PetalburgWoods.inc | 189 +- data/text/maps/Route101.inc | 49 +- data/text/maps/Route102.inc | 46 +- data/text/maps/Route103.inc | 86 +- data/text/maps/Route104.inc | 115 +- data/text/maps/Route104_MrBrineysHouse.inc | 98 +- data/text/maps/Route104_Prototype.inc | 118 +- .../Route104_PrototypePrettyPetalFlowerShop.inc | 10 +- data/text/maps/Route106.inc | 6 +- data/text/maps/Route109.inc | 112 +- data/text/maps/Route109_SeashoreHouse.inc | 104 +- data/text/maps/Route110.inc | 305 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 15 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 15 +- data/text/maps/Route110_TrickHouseEnd.inc | 156 +- data/text/maps/Route110_TrickHouseEntrance.inc | 143 +- data/text/maps/Route110_TrickHousePuzzle1.inc | 38 +- data/text/maps/Route110_TrickHousePuzzle2.inc | 39 +- data/text/maps/Route110_TrickHousePuzzle3.inc | 44 +- data/text/maps/Route110_TrickHousePuzzle4.inc | 41 +- data/text/maps/Route110_TrickHousePuzzle5.inc | 167 +- data/text/maps/Route110_TrickHousePuzzle6.inc | 45 +- data/text/maps/Route110_TrickHousePuzzle7.inc | 44 +- data/text/maps/Route110_TrickHousePuzzle8.inc | 34 +- data/text/maps/Route111.inc | 129 +- data/text/maps/Route111_OldLadysRestStop.inc | 24 +- data/text/maps/Route111_WinstrateFamilysHouse.inc | 70 +- data/text/maps/Route112.inc | 31 +- data/text/maps/Route112_CableCarStation.inc | 8 +- data/text/maps/Route113.inc | 34 +- data/text/maps/Route113_GlassWorkshop.inc | 116 +- data/text/maps/Route114.inc | 23 +- data/text/maps/Route114_FossilManiacsHouse.inc | 30 +- data/text/maps/Route114_FossilManiacsTunnel.inc | 42 +- data/text/maps/Route114_LanettesHouse.inc | 86 +- data/text/maps/Route115.inc | 15 +- data/text/maps/Route116.inc | 164 +- data/text/maps/Route116_TunnelersRestHouse.inc | 50 +- data/text/maps/Route117.inc | 25 +- data/text/maps/Route118.inc | 61 +- data/text/maps/Route119.inc | 137 +- data/text/maps/Route119_House.inc | 11 +- data/text/maps/Route119_WeatherInstitute_1F.inc | 67 +- data/text/maps/Route119_WeatherInstitute_2F.inc | 90 +- data/text/maps/Route120.inc | 89 +- data/text/maps/Route121.inc | 19 +- data/text/maps/Route123.inc | 27 +- data/text/maps/Route124.inc | 2 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 65 +- data/text/maps/Route128.inc | 92 +- data/text/maps/RustboroCity.inc | 242 +- data/text/maps/RustboroCity_CuttersHouse.inc | 48 +- data/text/maps/RustboroCity_DevonCorp_1F.inc | 50 +- data/text/maps/RustboroCity_DevonCorp_2F.inc | 130 +- data/text/maps/RustboroCity_DevonCorp_3F.inc | 150 +- data/text/maps/RustboroCity_Flat1_1F.inc | 6 +- data/text/maps/RustboroCity_Flat1_2F.inc | 14 +- data/text/maps/RustboroCity_Flat2_1F.inc | 6 +- data/text/maps/RustboroCity_Flat2_2F.inc | 17 +- data/text/maps/RustboroCity_Flat2_3F.inc | 8 +- data/text/maps/RustboroCity_Gym.inc | 163 +- data/text/maps/RustboroCity_House1.inc | 33 +- data/text/maps/RustboroCity_House2.inc | 12 +- data/text/maps/RustboroCity_House3.inc | 18 +- data/text/maps/RustboroCity_Mart.inc | 25 +- data/text/maps/RustboroCity_PokemonCenter_1F.inc | 24 +- data/text/maps/RustboroCity_PokemonSchool.inc | 144 +- data/text/maps/RusturfTunnel.inc | 149 +- data/text/maps/SSTidalCorridor.inc | 76 +- data/text/maps/SSTidalLowerDeck.inc | 28 +- data/text/maps/SSTidalRooms.inc | 123 +- data/text/maps/SeafloorCavern_Room1.inc | 22 +- data/text/maps/SeafloorCavern_Room3.inc | 35 +- data/text/maps/SeafloorCavern_Room4.inc | 11 +- data/text/maps/SecretBase_RedCave1.inc | 3 +- data/text/maps/ShoalCave_LowTideLowerRoom.inc | 14 +- data/text/maps/SlateportCity.inc | 409 ++- data/text/maps/SlateportCity_ContestHall.inc | 158 +- data/text/maps/SlateportCity_ContestLobby.inc | 38 +- data/text/maps/SlateportCity_Harbor.inc | 204 +- data/text/maps/SlateportCity_House1.inc | 60 +- data/text/maps/SlateportCity_House2.inc | 23 +- data/text/maps/SlateportCity_Mart.inc | 16 +- data/text/maps/SlateportCity_OceanicMuseum_1F.inc | 215 +- data/text/maps/SlateportCity_OceanicMuseum_2F.inc | 256 +- data/text/maps/SlateportCity_PokemonCenter_1F.inc | 21 +- data/text/maps/SlateportCity_PokemonFanClub.inc | 187 +- data/text/maps/SlateportCity_SternsShipyard_1F.inc | 119 +- data/text/maps/SlateportCity_SternsShipyard_2F.inc | 27 +- data/text/maps/SootopolisCity.inc | 307 +- data/text/maps/SootopolisCity_Gym_1F.inc | 242 +- data/text/maps/SootopolisCity_House1.inc | 12 +- data/text/maps/SootopolisCity_House2.inc | 16 +- data/text/maps/SootopolisCity_House3.inc | 27 +- data/text/maps/SootopolisCity_House4.inc | 21 +- data/text/maps/SootopolisCity_House5.inc | 11 +- data/text/maps/SootopolisCity_House6.inc | 21 +- data/text/maps/SootopolisCity_House7.inc | 22 +- data/text/maps/SootopolisCity_House8.inc | 125 +- data/text/maps/SootopolisCity_Mart.inc | 20 +- data/text/maps/SootopolisCity_PokemonCenter_1F.inc | 35 +- data/text/maps/Underwater_SeafloorCavern.inc | 12 +- data/text/maps/VerdanturfTown.inc | 91 +- data/text/maps/VerdanturfTown_ContestHall.inc | 39 +- data/text/maps/VerdanturfTown_ContestLobby.inc | 45 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 40 +- data/text/maps/VerdanturfTown_House.inc | 20 +- data/text/maps/VerdanturfTown_Mart.inc | 25 +- data/text/maps/VerdanturfTown_PokemonCenter_1F.inc | 13 +- data/text/maps/VerdanturfTown_WandasHouse.inc | 121 +- data/text/maps/VictoryRoad_1F.inc | 85 +- data/text/maps/VictoryRoad_B1F.inc | 38 +- data/text/maps/VictoryRoad_B2F.inc | 53 +- data/text/move_names.inc | 686 ++-- data/text/mystery_event_club.inc | 100 +- data/text/pokeblocks.inc | 140 +- data/text/pokedex_rating.inc | 114 +- data/text/pokemon_news.inc | 242 +- data/text/ribbon_descriptions.inc | 38 +- data/text/roulette.inc | 51 +- data/text/safari_zone.inc | 217 +- data/text/save.inc | 28 +- data/text/secret_power_tm.inc | 56 +- data/text/shoal_cave.inc | 67 +- data/text/species_names.inc | 550 +-- data/text/storyteller.inc | 640 ++-- data/text/surf.inc | 6 +- data/text/trader.inc | 62 +- data/text/trainer_class_names.inc | 100 +- data/text/trainer_eye_descriptions.inc | 552 +-- data/text/trainers.inc | 3502 ++++++++++---------- data/text/tv.inc | 1529 +++++---- data/text/type_names.inc | 32 +- data/tilesets/primary/general/tiles.png | Bin 7438 -> 7443 bytes data/tilesets/secondary/shop/metatiles.bin | Bin 4480 -> 4480 bytes data/tilesets/secondary/shop/tiles.png | Bin 3835 -> 3817 bytes data/trainers.inc | 1246 +++---- graphics/battle_interface/hpbar.png | Bin 222 -> 217 bytes graphics/battle_interface/status2.png | Bin 199 -> 198 bytes graphics/battle_interface/status3.png | Bin 200 -> 199 bytes graphics/battle_interface/status4.png | Bin 198 -> 197 bytes graphics/battle_interface/status_brn.png | Bin 174 -> 176 bytes graphics/battle_interface/status_frz.png | Bin 175 -> 176 bytes graphics/battle_interface/status_psn.png | Bin 175 -> 176 bytes graphics/battle_interface/status_slp.png | Bin 176 -> 177 bytes graphics/battle_interface/window.png | Bin 357 -> 360 bytes graphics/berry_blender/outer.png | Bin 1879 -> 1880 bytes graphics/contest/applause.png | Bin 289 -> 287 bytes graphics/contest/contest_words.bin | Bin 576 -> 512 bytes graphics/contest/misc.png | Bin 1774 -> 1735 bytes graphics/contest/misc_2.png | Bin 2048 -> 2853 bytes graphics/contest/misc_2_tilemap_2.bin | Bin 2048 -> 2048 bytes graphics/contest/nextturn.png | Bin 193 -> 199 bytes graphics/contest/nextturn_numbers.png | Bin 198 -> 200 bytes graphics/contest/nextturn_random.png | Bin 162 -> 161 bytes graphics/fonts/font3_lat.png | Bin 3649 -> 3689 bytes graphics/fonts/font4_lat.4bpp.bin | Bin 7040 -> 0 bytes graphics/interface/bag_screen.png | Bin 1547 -> 1634 bytes graphics/interface/berry_tag.bin | Bin 2048 -> 2048 bytes graphics/interface/check_berry.png | Bin 890 -> 1134 bytes graphics/interface/money.png | Bin 202 -> 201 bytes graphics/interface/outline_cursor_00.png | Bin 78 -> 75 bytes graphics/interface/outline_cursor_01.png | Bin 122 -> 115 bytes graphics/interface/outline_cursor_02.png | Bin 122 -> 115 bytes graphics/interface/outline_cursor_03.png | Bin 122 -> 115 bytes graphics/interface/outline_cursor_04.png | Bin 122 -> 115 bytes graphics/interface/outline_cursor_05.png | Bin 122 -> 115 bytes graphics/interface/outline_cursor_06.png | Bin 122 -> 115 bytes graphics/interface/outline_cursor_07.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_08.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_09.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_10.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_11.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_12.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_13.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_14.png | Bin 122 -> 114 bytes graphics/interface/outline_cursor_15.png | Bin 118 -> 112 bytes graphics/interface/party_menu_hpbar.png | Bin 222 -> 220 bytes graphics/interface/party_menu_misc.png | Bin 561 -> 546 bytes graphics/interface/party_menu_ordertext.png | Bin 764 -> 758 bytes graphics/interface/pokeblock_case_frame.png | Bin 532 -> 720 bytes graphics/interface/pokemon_info.bin | Bin 2048 -> 2048 bytes graphics/interface/status_icons.png | Bin 442 -> 449 bytes graphics/interface/status_screen.bin | Bin 2048 -> 2048 bytes graphics/interface/status_screen.png | Bin 1540 -> 2011 bytes graphics/interface/status_screen_battle_moves.bin | Bin 2048 -> 2048 bytes graphics/interface/status_screen_contest_moves.bin | Bin 2048 -> 2048 bytes .../interface/status_screen_pokemon_skills.bin | Bin 2048 -> 2048 bytes graphics/interface/wordgroup_frame.png | Bin 804 -> 705 bytes graphics/interface/wordgroup_indicator.png | Bin 491 -> 558 bytes graphics/interface/wordgroup_layout.bin | Bin 1280 -> 1280 bytes graphics/intro/copyright.bin | Bin 1280 -> 1280 bytes graphics/intro/copyright.png | Bin 597 -> 567 bytes graphics/misc/clock.png | Bin 1352 -> 1308 bytes graphics/misc/condition_up_down.png | Bin 246 -> 234 bytes graphics/misc/end_copyright.png | Bin 1005 -> 983 bytes graphics/misc/hof.png | Bin 435 -> 422 bytes graphics/misc/interview_outline_cursor.png | Bin 187 -> 186 bytes graphics/misc/trainer_card.png | Bin 1417 -> 1583 bytes graphics/misc/wallclock_edit.bin | Bin 1280 -> 1280 bytes graphics/misc/wallclock_view.bin | Bin 1280 -> 1280 bytes graphics/naming_screen/back_button.png | Bin 299 -> 301 bytes graphics/naming_screen/lower_text.png | Bin 183 -> 183 bytes graphics/naming_screen/menu.png | Bin 485 -> 541 bytes graphics/naming_screen/ok_button.png | Bin 278 -> 277 bytes graphics/naming_screen/others_text.png | Bin 180 -> 186 bytes graphics/naming_screen/upper_text.png | Bin 188 -> 183 bytes graphics/pokedex/area_unknown.png | Bin 378 -> 393 bytes graphics/pokedex/cry_meter.png | Bin 619 -> 673 bytes graphics/pokedex/cry_meter_map.bin | Bin 512 -> 160 bytes graphics/pokedex/menu.png | Bin 2494 -> 2798 bytes graphics/pokedex/menu2.png | Bin 898 -> 963 bytes graphics/pokedex/menu3.pal | 6 +- graphics/pokedex/menu_search.png | Bin 1054 -> 1222 bytes graphics/pokedex/noball.png | Bin 193 -> 189 bytes graphics/pokedex/pokedex_detail_layout.bin | Bin 1280 -> 1280 bytes graphics/pokedex/pokedex_list_menu.bin | Bin 768 -> 768 bytes graphics/pokedex/pokedex_listing_menu.bin | Bin 768 -> 768 bytes graphics/pokedex/pokedex_navbar.bin | Bin 192 -> 192 bytes graphics/pokedex/pokedex_navbar_3.bin | Bin 192 -> 192 bytes graphics/pokemon_storage/header.png | Bin 502 -> 498 bytes graphics/pokemon_storage/misc1.png | Bin 734 -> 799 bytes graphics/pokenav/bottom_toolbar.bin | Bin 512 -> 512 bytes graphics/pokenav/condition_cancel.png | Bin 183 -> 182 bytes graphics/pokenav/condition_menu.png | Bin 553 -> 557 bytes graphics/pokenav/condition_menu_header.png | Bin 280 -> 290 bytes graphics/pokenav/condition_menu_misc.png | Bin 430 -> 373 bytes graphics/pokenav/condition_menu_options.png | Bin 553 -> 539 bytes graphics/pokenav/condition_menu_options2.png | Bin 511 -> 397 bytes graphics/pokenav/condition_screen.bin | 2 +- graphics/pokenav/condition_search_beauty.png | Bin 291 -> 261 bytes graphics/pokenav/condition_search_cancel.png | Bin 281 -> 264 bytes graphics/pokenav/condition_search_cool.png | Bin 273 -> 223 bytes graphics/pokenav/condition_search_cute.png | Bin 238 -> 239 bytes graphics/pokenav/condition_search_smart.png | Bin 264 -> 256 bytes graphics/pokenav/condition_search_tough.png | Bin 280 -> 240 bytes graphics/pokenav/condition_view.png | Bin 1687 -> 1419 bytes graphics/pokenav/mainmenu.png | Bin 298 -> 300 bytes graphics/pokenav/map_header.png | Bin 470 -> 471 bytes graphics/pokenav/map_misc2.png | Bin 1252 -> 1180 bytes graphics/pokenav/map_squares.png | Bin 746 -> 692 bytes graphics/pokenav/menu_condition.png | Bin 298 -> 299 bytes graphics/pokenav/menu_eyes.png | Bin 283 -> 365 bytes graphics/pokenav/menu_hoennmap.png | Bin 335 -> 308 bytes graphics/pokenav/menu_off.png | Bin 334 -> 320 bytes graphics/pokenav/menu_ribbons.png | Bin 294 -> 298 bytes graphics/pokenav/ribbons.png | Bin 283 -> 278 bytes graphics/pokenav/trainereyes.png | Bin 265 -> 361 bytes graphics/roulette/credit.png | Bin 330 -> 325 bytes graphics/slot_machine/slots.png | Bin 2417 -> 2382 bytes graphics/slot_machine/slots_layout.bin | Bin 1280 -> 1280 bytes graphics/summary_screen/text.png | Bin 225 -> 223 bytes graphics/title_screen/logo_ruby.pal | 272 +- graphics/title_screen/logo_sapphire.pal | 354 +- graphics/title_screen/pokemon_ruby.png | Bin 4565 -> 4666 bytes graphics/title_screen/pokemon_sapphire.png | Bin 4558 -> 4558 bytes graphics/title_screen/press_start.png | Bin 493 -> 455 bytes graphics/title_screen/rubyversion.png | Bin 2160 -> 1915 bytes graphics/title_screen/sapphireversion.png | Bin 2321 -> 2199 bytes graphics/trade/menu.png | Bin 583 -> 539 bytes graphics/types/bug.png | Bin 229 -> 205 bytes graphics/types/contest_beauty.png | Bin 226 -> 224 bytes graphics/types/contest_cool.png | Bin 215 -> 212 bytes graphics/types/contest_cute.png | Bin 218 -> 216 bytes graphics/types/contest_smart.png | Bin 215 -> 223 bytes graphics/types/contest_tough.png | Bin 241 -> 217 bytes graphics/types/dark.png | Bin 203 -> 219 bytes graphics/types/dragon.png | Bin 205 -> 223 bytes graphics/types/electric.png | Bin 220 -> 227 bytes graphics/types/fight.png | Bin 229 -> 227 bytes graphics/types/fire.png | Bin 222 -> 216 bytes graphics/types/flying.png | Bin 214 -> 230 bytes graphics/types/ghost.png | Bin 231 -> 232 bytes graphics/types/grass.png | Bin 208 -> 229 bytes graphics/types/ground.png | Bin 227 -> 231 bytes graphics/types/ice.png | Bin 210 -> 207 bytes graphics/types/poison.png | Bin 218 -> 236 bytes graphics/types/psychic.png | Bin 234 -> 234 bytes graphics/types/rock.png | Bin 226 -> 220 bytes graphics/types/steel.png | Bin 219 -> 223 bytes graphics/types/water.png | Bin 231 -> 218 bytes graphics/unknown/unknown_E953D0.bin | Bin 1152 -> 1152 bytes graphics/unknown/unknown_E9ABB4.bin | 2 +- graphics/unused/old_charmap.bin | Bin 4096 -> 4096 bytes graphics/unused/old_charmap.png | Bin 1873 -> 1934 bytes override.mk | 25 - 498 files changed, 20053 insertions(+), 21512 deletions(-) diff --git a/data/contest_opponents.inc b/data/contest_opponents.inc index 1bdf7027e..8c9c76f1b 100644 --- a/data/contest_opponents.inc +++ b/data/contest_opponents.inc @@ -1,7 +1,7 @@ .align 2 gContestOpponents:: @ 83C9408 .2byte 286 @ SPECIES_ID - .string "FIFFI$", 11 @ POKE_NICKNAME + .string "POOCHY$", 11 @ POKE_NICKNAME .string "JIMMY$", 8 @ TRAINER_NAME .byte 7 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -12,8 +12,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 288 @ SPECIES_ID - .string "ZIGGY$", 11 @ POKE_NICKNAME - .string "KLARA$", 8 @ TRAINER_NAME + .string "ZIGOON$", 11 @ POKE_NICKNAME + .string "EDITH$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x82000fff @ FLAGS @@ -23,8 +23,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 294 @ SPECIES_ID - .string "DOXU$", 11 @ POKE_NICKNAME - .string "KARLO$", 8 @ TRAINER_NAME + .string "DUSTER$", 11 @ POKE_NICKNAME + .string "EVAN$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x21000fff @ FLAGS @@ -34,8 +34,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 298 @ SPECIES_ID - .string "SAMINI$", 11 @ POKE_NICKNAME - .string "TRUDI$", 8 @ TRAINER_NAME + .string "DOTS$", 11 @ POKE_NICKNAME + .string "KELSEY$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x20800fff @ FLAGS @@ -45,8 +45,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 304 @ SPECIES_ID - .string "SCHWALBI$", 11 @ POKE_NICKNAME - .string "HELENA$", 8 @ TRAINER_NAME + .string "TATAY$", 11 @ POKE_NICKNAME + .string "MADISON$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80400fff @ FLAGS @@ -56,8 +56,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 301 @ SPECIES_ID - .string "CADINJA$", 11 @ POKE_NICKNAME - .string "WILLI$", 8 @ TRAINER_NAME + .string "NINDA$", 11 @ POKE_NICKNAME + .string "RAYMOND$", 8 @ TRAINER_NAME .byte 44 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x10200fff @ FLAGS @@ -67,8 +67,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 306 @ SPECIES_ID - .string "KNILZLI$", 11 @ POKE_NICKNAME - .string "HARTMUT$", 8 @ TRAINER_NAME + .string "SMISH$", 11 @ POKE_NICKNAME + .string "GRANT$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x20100fff @ FLAGS @@ -78,8 +78,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 309 @ SPECIES_ID - .string "WINGI$", 11 @ POKE_NICKNAME - .string "CLAUDIA$", 8 @ TRAINER_NAME + .string "GULWEE$", 11 @ POKE_NICKNAME + .string "PAIGE$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08080fff @ FLAGS @@ -89,7 +89,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 364 @ SPECIES_ID - .string "BLUMPI$", 11 @ POKE_NICKNAME + .string "SLOKTH$", 11 @ POKE_NICKNAME .string "ALEC$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -100,8 +100,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 370 @ SPECIES_ID - .string "FLURMI$", 11 @ POKE_NICKNAME - .string "SILKE$", 8 @ TRAINER_NAME + .string "WHIRIS$", 11 @ POKE_NICKNAME + .string "SYDNEY$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -112,7 +112,7 @@ gContestOpponents:: @ 83C9408 .2byte 335 @ SPECIES_ID .string "MAHITA$", 11 @ POKE_NICKNAME - .string "PEER$", 8 @ TRAINER_NAME + .string "MORRIS$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08010fff @ FLAGS @@ -122,8 +122,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 382 @ SPECIES_ID - .string "STOLLI$", 11 @ POKE_NICKNAME - .string "MARIA$", 8 @ TRAINER_NAME + .string "RONAR$", 11 @ POKE_NICKNAME + .string "MARIAH$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08008fff @ FLAGS @@ -133,8 +133,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 41 @ SPECIES_ID - .string "BLUTBAT$", 11 @ POKE_NICKNAME - .string "RUDOLF$", 8 @ TRAINER_NAME + .string "ZUTZU$", 11 @ POKE_NICKNAME + .string "RUSSELL$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x90004fff @ FLAGS @@ -144,7 +144,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 367 @ SPECIES_ID - .string "SCHLUPPI$", 11 @ POKE_NICKNAME + .string "GULIN$", 11 @ POKE_NICKNAME .string "MELANIE$", 8 @ TRAINER_NAME .byte 6 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -155,8 +155,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 337 @ SPECIES_ID - .string "FRIZZZEL$", 11 @ POKE_NICKNAME - .string "BERTRAM$", 8 @ TRAINER_NAME + .string "RIKELEC$", 11 @ POKE_NICKNAME + .string "CHANCE$", 8 @ TRAINER_NAME .byte 15 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80001fff @ FLAGS @@ -166,7 +166,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 363 @ SPECIES_ID - .string "ROSALI$", 11 @ POKE_NICKNAME + .string "RELIA$", 11 @ POKE_NICKNAME .string "KARINA$", 8 @ TRAINER_NAME .byte 32 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -177,7 +177,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 84 @ SPECIES_ID - .string "DOLDI$", 11 @ POKE_NICKNAME + .string "DUODO$", 11 @ POKE_NICKNAME .string "BOBBY$", 8 @ TRAINER_NAME .byte 51 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -188,8 +188,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 332 @ SPECIES_ID - .string "KNACKI$", 11 @ POKE_NICKNAME - .string "JUDITH$", 8 @ TRAINER_NAME + .string "PINCHIN$", 11 @ POKE_NICKNAME + .string "CLAIRE$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x81000fff @ FLAGS @@ -199,8 +199,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 344 @ SPECIES_ID - .string "KOTUS$", 11 @ POKE_NICKNAME - .string "HELMUT$", 8 @ TRAINER_NAME + .string "NACAC$", 11 @ POKE_NICKNAME + .string "WILLIE$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80800fff @ FLAGS @@ -210,8 +210,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 27 @ SPECIES_ID - .string "SADAN$", 11 @ POKE_NICKNAME - .string "BRITTA$", 8 @ TRAINER_NAME + .string "SHRAND$", 11 @ POKE_NICKNAME + .string "CASSIDY$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x10400fff @ FLAGS @@ -221,8 +221,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 318 @ SPECIES_ID - .string "PUPPIBAL$", 11 @ POKE_NICKNAME - .string "TORBEN$", 8 @ TRAINER_NAME + .string "TOYBAL$", 11 @ POKE_NICKNAME + .string "MORGAN$", 8 @ TRAINER_NAME .byte 44 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08200fff @ FLAGS @@ -232,8 +232,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 339 @ SPECIES_ID - .string "CLAMAUK$", 11 @ POKE_NICKNAME - .string "BIANKA$", 8 @ TRAINER_NAME + .string "LENUM$", 11 @ POKE_NICKNAME + .string "SUMMER$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x10100fff @ FLAGS @@ -243,8 +243,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 308 @ SPECIES_ID - .string "SPIRRWIRR$", 11 @ POKE_NICKNAME - .string "ALEX$", 8 @ TRAINER_NAME + .string "SPININ$", 11 @ POKE_NICKNAME + .string "MILES$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80080fff @ FLAGS @@ -254,8 +254,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 358 @ SPECIES_ID - .string "BLUPPF$", 11 @ POKE_NICKNAME - .string "SABINE$", 8 @ TRAINER_NAME + .string "SWABY$", 11 @ POKE_NICKNAME + .string "AUDREY$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0xa0040fff @ FLAGS @@ -265,8 +265,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 289 @ SPECIES_ID - .string "DAKSIRAD$", 11 @ POKE_NICKNAME - .string "AUGUST$", 8 @ TRAINER_NAME + .string "NOONE$", 11 @ POKE_NICKNAME + .string "AVERY$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -276,7 +276,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 317 @ SPECIES_ID - .string "KECLI$", 11 @ POKE_NICKNAME + .string "KECON$", 11 @ POKE_NICKNAME .string "ARIANA$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -287,8 +287,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 118 @ SPECIES_ID - .string "GOLDINCHEN$", 11 @ POKE_NICKNAME - .string "TONI$", 8 @ TRAINER_NAME + .string "GOLDEN$", 11 @ POKE_NICKNAME + .string "ASHTON$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80008fff @ FLAGS @@ -298,8 +298,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 323 @ SPECIES_ID - .string "SCHMERBSE$", 11 @ POKE_NICKNAME - .string "SUSI$", 8 @ TRAINER_NAME + .string "BOBOACH$", 11 @ POKE_NICKNAME + .string "SANDRA$", 8 @ TRAINER_NAME .byte 6 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80004fff @ FLAGS @@ -309,8 +309,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 227 @ SPECIES_ID - .string "KREBSILI$", 11 @ POKE_NICKNAME - .string "CLEMENS$", 8 @ TRAINER_NAME + .string "CORPY$", 11 @ POKE_NICKNAME + .string "CARSON$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08002fff @ FLAGS @@ -320,8 +320,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 295 @ SPECIES_ID - .string "URLOTZO$", 11 @ POKE_NICKNAME - .string "KATRIN$", 8 @ TRAINER_NAME + .string "TADO$", 11 @ POKE_NICKNAME + .string "KATRINA$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x08001fff @ FLAGS @@ -331,8 +331,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 383 @ SPECIES_ID - .string "STROLLAK$", 11 @ POKE_NICKNAME - .string "ACHIM$", 8 @ TRAINER_NAME + .string "LAIRN$", 11 @ POKE_NICKNAME + .string "RONNIE$", 8 @ TRAINER_NAME .byte 55 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x84000fff @ FLAGS @@ -342,8 +342,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 299 @ SPECIES_ID - .string "BLASNI$", 11 @ POKE_NICKNAME - .string "GABI$", 8 @ TRAINER_NAME + .string "NUZLE$", 11 @ POKE_NICKNAME + .string "CLAUDIA$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x82000fff @ FLAGS @@ -353,8 +353,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 302 @ SPECIES_ID - .string "ASKINJA$", 11 @ POKE_NICKNAME - .string "ROLF$", 8 @ TRAINER_NAME + .string "NINAS$", 11 @ POKE_NICKNAME + .string "ELIAS$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x81000fff @ FLAGS @@ -364,8 +364,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 305 @ SPECIES_ID - .string "SCHWALLO$", 11 @ POKE_NICKNAME - .string "ELSE$", 8 @ TRAINER_NAME + .string "WELOW$", 11 @ POKE_NICKNAME + .string "JADE$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80800fff @ FLAGS @@ -375,8 +375,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 287 @ SPECIES_ID - .string "JÄNAGI$", 11 @ POKE_NICKNAME - .string "FRANK$", 8 @ TRAINER_NAME + .string "YENA$", 11 @ POKE_NICKNAME + .string "FRANCIS$", 8 @ TRAINER_NAME .byte 44 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80400fff @ FLAGS @@ -386,8 +386,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 292 @ SPECIES_ID - .string "PAPINILLI$", 11 @ POKE_NICKNAME - .string "ANNA$", 8 @ TRAINER_NAME + .string "TIFLY$", 11 @ POKE_NICKNAME + .string "ALISHA$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80200fff @ FLAGS @@ -397,8 +397,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 119 @ SPECIES_ID - .string "KINGOLA$", 11 @ POKE_NICKNAME - .string "KONRAD$", 8 @ TRAINER_NAME + .string "KINGSEA$", 11 @ POKE_NICKNAME + .string "SAUL$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80100fff @ FLAGS @@ -408,8 +408,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 340 @ SPECIES_ID - .string "ERUPTAM$", 11 @ POKE_NICKNAME - .string "LUISE$", 8 @ TRAINER_NAME + .string "ERUPAM$", 11 @ POKE_NICKNAME + .string "FELICIA$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80080fff @ FLAGS @@ -419,8 +419,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 66 @ SPECIES_ID - .string "OLLOMA$", 11 @ POKE_NICKNAME - .string "MICHAEL$", 8 @ TRAINER_NAME + .string "CHOPAM$", 11 @ POKE_NICKNAME + .string "EMILIO$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80040fff @ FLAGS @@ -430,8 +430,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 296 @ SPECIES_ID - .string "OMBRE$", 11 @ POKE_NICKNAME - .string "ANIKA$", 8 @ TRAINER_NAME + .string "LOMBE$", 11 @ POKE_NICKNAME + .string "KARLA$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -441,8 +441,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 379 @ SPECIES_ID - .string "PITISVI$", 11 @ POKE_NICKNAME - .string "DETLEF$", 8 @ TRAINER_NAME + .string "VIPES$", 11 @ POKE_NICKNAME + .string "DARRYL$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80010fff @ FLAGS @@ -452,8 +452,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 313 @ SPECIES_ID - .string "WAILA$", 11 @ POKE_NICKNAME - .string "XENIA$", 8 @ TRAINER_NAME + .string "MERAIL$", 11 @ POKE_NICKNAME + .string "SELENA$", 8 @ TRAINER_NAME .byte 22 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80008fff @ FLAGS @@ -463,8 +463,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 129 @ SPECIES_ID - .string "KARDORPA$", 11 @ POKE_NICKNAME - .string "FLORIAN$", 8 @ TRAINER_NAME + .string "KARPAG$", 11 @ POKE_NICKNAME + .string "NOEL$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80004fff @ FLAGS @@ -474,8 +474,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 348 @ SPECIES_ID - .string "LUNA$", 11 @ POKE_NICKNAME - .string "DIANA$", 8 @ TRAINER_NAME + .string "LUNONE$", 11 @ POKE_NICKNAME + .string "LACEY$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80002fff @ FLAGS @@ -485,8 +485,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 310 @ SPECIES_ID - .string "PEPE$", 11 @ POKE_NICKNAME - .string "LUTZ$", 8 @ TRAINER_NAME + .string "PELIPE$", 11 @ POKE_NICKNAME + .string "CORBIN$", 8 @ TRAINER_NAME .byte 39 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80001fff @ FLAGS @@ -496,8 +496,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 130 @ SPECIES_ID - .string "GARADI$", 11 @ POKE_NICKNAME - .string "JASMIN$", 8 @ TRAINER_NAME + .string "RADOS$", 11 @ POKE_NICKNAME + .string "JUSTINA$", 8 @ TRAINER_NAME .byte 32 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x84000fff @ FLAGS @@ -507,8 +507,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 371 @ SPECIES_ID - .string "KRAKEEL$", 11 @ POKE_NICKNAME - .string "GERT$", 8 @ TRAINER_NAME + .string "LOUDERD$", 11 @ POKE_NICKNAME + .string "RALPH$", 8 @ TRAINER_NAME .byte 21 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x82000fff @ FLAGS @@ -518,7 +518,7 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 316 @ SPECIES_ID - .string "ENEKOTO$", 11 @ POKE_NICKNAME + .string "CATTED$", 11 @ POKE_NICKNAME .string "ROSA$", 8 @ TRAINER_NAME .byte 8 @ TRAINER_SPRITE .2byte 0x0000 @padding @@ -529,8 +529,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 366 @ SPECIES_ID - .string "ASSIMAX$", 11 @ POKE_NICKNAME - .string "KURT$", 8 @ TRAINER_NAME + .string "SLING$", 11 @ POKE_NICKNAME + .string "KEATON$", 8 @ TRAINER_NAME .byte 11 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80800fff @ FLAGS @@ -540,8 +540,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 359 @ SPECIES_ID - .string "RIA$", 11 @ POKE_NICKNAME - .string "SONJA$", 8 @ TRAINER_NAME + .string "TARIA$", 11 @ POKE_NICKNAME + .string "MAYRA$", 8 @ TRAINER_NAME .byte 18 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80400fff @ FLAGS @@ -551,8 +551,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 393 @ SPECIES_ID - .string "EXUVINJA$", 11 @ POKE_NICKNAME - .string "SÖNKE$", 8 @ TRAINER_NAME + .string "SHEDJA$", 11 @ POKE_NICKNAME + .string "LAMAR$", 8 @ TRAINER_NAME .byte 15 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80200fff @ FLAGS @@ -562,8 +562,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 45 @ SPECIES_ID - .string "BLUMIEFT$", 11 @ POKE_NICKNAME - .string "MAGDA$", 8 @ TRAINER_NAME + .string "PLUMILE$", 11 @ POKE_NICKNAME + .string "AUBREY$", 8 @ TRAINER_NAME .byte 26 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80100fff @ FLAGS @@ -573,8 +573,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 361 @ SPECIES_ID - .string "WANDELBOLD$", 11 @ POKE_NICKNAME - .string "SASCHA$", 8 @ TRAINER_NAME + .string "KULLUSK$", 11 @ POKE_NICKNAME + .string "NIGEL$", 8 @ TRAINER_NAME .byte 31 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80080fff @ FLAGS @@ -584,8 +584,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 178 @ SPECIES_ID - .string "TUMANI$", 11 @ POKE_NICKNAME - .string "MILA$", 8 @ TRAINER_NAME + .string "UTAN$", 11 @ POKE_NICKNAME + .string "CAMILLE$", 8 @ TRAINER_NAME .byte 47 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80040fff @ FLAGS @@ -595,8 +595,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 331 @ SPECIES_ID - .string "HAITODO$", 11 @ POKE_NICKNAME - .string "KNUT$", 8 @ TRAINER_NAME + .string "PEDOS$", 11 @ POKE_NICKNAME + .string "DEON$", 8 @ TRAINER_NAME .byte 38 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80020fff @ FLAGS @@ -606,8 +606,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 325 @ SPECIES_ID - .string "KUSSLIEB$", 11 @ POKE_NICKNAME - .string "INCA$", 8 @ TRAINER_NAME + .string "LUVIS$", 11 @ POKE_NICKNAME + .string "JANELLE$", 8 @ TRAINER_NAME .byte 10 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80010fff @ FLAGS @@ -617,8 +617,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 214 @ SPECIES_ID - .string "SKARAB$", 11 @ POKE_NICKNAME - .string "FELIX$", 8 @ TRAINER_NAME + .string "HEROSS$", 11 @ POKE_NICKNAME + .string "HEATH$", 8 @ TRAINER_NAME .byte 33 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80008fff @ FLAGS @@ -628,8 +628,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 101 @ SPECIES_ID - .string "LEKBAL$", 11 @ POKE_NICKNAME - .string "DEBORA$", 8 @ TRAINER_NAME + .string "RODLECT$", 11 @ POKE_NICKNAME + .string "SASHA$", 8 @ TRAINER_NAME .byte 6 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80004fff @ FLAGS @@ -639,8 +639,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 172 @ SPECIES_ID - .string "DEIBEL$", 11 @ POKE_NICKNAME - .string "BORIS$", 8 @ TRAINER_NAME + .string "CHUPY$", 11 @ POKE_NICKNAME + .string "FRANKIE$", 8 @ TRAINER_NAME .byte 35 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80002fff @ FLAGS @@ -650,8 +650,8 @@ gContestOpponents:: @ 83C9408 .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED .2byte 202 @ SPECIES_ID - .string "WOHINGENAU$", 11 @ POKE_NICKNAME - .string "DELIA$", 8 @ TRAINER_NAME + .string "WOBET$", 11 @ POKE_NICKNAME + .string "HELEN$", 8 @ TRAINER_NAME .byte 16 @ TRAINER_SPRITE .2byte 0x0000 @padding .4byte 0x80001fff @ FLAGS diff --git a/data/event_scripts.s b/data/event_scripts.s index 4598e9f45..3b25ceab4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -863,20 +863,19 @@ EventScript_15F573: .include "data/text/maps/Route110_TrickHouseEntrance.inc" Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8 - .string "{PLAYER} findet eine Schriftrolle.$" + .string "{PLAYER} found a scroll.$" Route110_TrickHousePuzzle1_Text_19C1CB:: @ 819C1CB - .string "{PLAYER} lernt den geheimen Code, der\n" - .string "auf der Schriftrolle steht, auswendig.$" + .string "{PLAYER} memorized the secret code\n" + .string "written on the scroll.$" Route110_TrickHousePuzzle1_Text_19C1FF:: @ 819C1FF - .string "Dort steht ein geheimer Code.$" + .string "A secret code is written on it.$" UnknownString_819C21F: @ 819C21F - .string "Die Tür ist verschlossen.\p" - .string "Bei näherer Betrachtung findet sich\n" - .string "ein Hinweis. “Schreibe hier den\l" - .string "geheimen Code auf.”$" + .string "The door is locked.\p" + .string "...On closer inspection, this is written\n" + .string "on it: “Write the secret code here.”$" .include "data/text/maps/Route110_TrickHouseEnd.inc" .include "data/text/maps/Route110_TrickHousePuzzle1.inc" @@ -929,11 +928,6 @@ Std_5: @ 819F805 return -S_DoSaveDialog:: @ 819F806 -S_DoSaveDialog:: @ 819F806 -S_DoSaveDialog:: @ 819F806 -S_DoSaveDialog:: @ 819F806 -S_DoSaveDialog:: @ 819F806 S_DoSaveDialog:: @ 819F806 special ScrSpecial_DoSaveDialog waitstate @@ -1439,12 +1433,12 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO compare RESULT, YES - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FD7C + goto_if_eq do_heal_party compare RESULT, NO - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDC7 + goto_if_eq dont_heal_party end -OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C +do_heal_party:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage @@ -1468,7 +1462,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 waitmessage return -OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7 +dont_heal_party:: @ 819FDC7 message gText_NurseJoy_WeHopeToSeeYouAgain waitmessage return @@ -2939,72 +2933,74 @@ BlueprintScript:: @ 81A0891 end SampleMessage1:: @ 81A089A - .string "Dies ist Beispiel 1.\p" - .string "Willkommen in der Welt von\n" + .string "This is sample message 1.\p" + .string "Welcome to the world of\n" .string "POKéMON AGB!\l" - .string "Wir hoffen, dir gefällt es hier!$" + .string "We hope you enjoy this!$" SampleMessage2:: @ 81A08F1 - .string "Dies ist Beispiel 2.\p" - .string "Willkommen in der Welt von\n" + .string "This is sample message 2.\p" + .string "Welcome to the world of\n" .string "POKéMON AGB!\l" - .string "Wir hoffen, dir gefällt es hier!$" + .string "We hope you enjoy this!$" SampleMessage3:: @ 81A0948 - .string "Dies ist Beispiel 3.\p" - .string "Willkommen in der Welt von\n" + .string "This is sample message 3.\p" + .string "Welcome to the world of\n" .string "POKéMON AGB!\l" - .string "Wir hoffen, dir gefällt es hier!$" + .string "We hope you enjoy this!$" UnusedMixRecordsPromptText: @ 81A099F - .string "Möchtest du deine Rekorde mit\n" - .string "anderen TRAINERN austauschen?$" + .string "Would you like to mix records with other\n" + .string "TRAINERS?$" UnusedMixRecordsSeeYouAgainText: @ 81A09D2 - .string "Komm bald wieder!$" + .string "We hope to see you again!$" UnknownString_81A09EC: @ 81A09EC - .string "{PLAYER} schaltet den PC ein.$" + .string "{PLAYER} booted up the PC.$" gPCText_WhichPCShouldBeAccessed:: @ 81A0A01 - .string "Zugriff auf wessen PC?$" + .string "Which PC should be accessed?$" UnknownString_81A0A1E: @ 81A0A1E - .string "Verbindung zu jemandes PC hergestellt.$" + .string "Accessed someone’s PC.$" UnknownString_81A0A35: @ 81A0A35 - .string "POKéMON-Lagerungs-System geöffnet.$" + .string "POKéMON Storage System opened.$" UnknownString_81A0A54: @ 81A0A54 - .string "Verbindung mit PC von {PLAYER}.$" + .string "Accessed {PLAYER}’s PC.$" UnknownString_81A0A66: @ 81A0A66 - .string "Verbindung zu LANETTES PC hergestellt.$" + .string "Accessed LANETTE’s PC.$" gText_NurseJoy_Welcome:: @ 81A0A7D - .string "Willkommen im POKéMON-CENTER!\p" - .string "Wir heilen deine POKéMON und\n" - .string "machen sie wieder fit.\p" - .string "O.K. Wir benötigen deine POKéMON.$" + .string "Hello, and welcome to the POKéMON\n" + .string "CENTER.\p" + .string "We restore your tired POKéMON to\n" + .string "full health.\p" + .string "Would you like to rest your POKéMON?$" gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA - .string "Komm jederzeit wieder vorbei!$" + .string "We hope to see you again!$" gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 - .string "Danke!\p" - .string "Deine POKéMON sind wieder topfit!$" + .string "Thank you for waiting.\p" + .string "We’ve restored your POKéMON to\n" + .string "full health.$" UnknownString_81A0B57: @ 81A0B57 - .string "Willkommen im POKéMON KABEL-CLUB-\n" - .string "HANDELSCENTER.$" + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "TRADE CENTER.$" UnknownString_81A0B87: @ 81A0B87 - .string "Willkommen im POKéMON KABEL-CLUB-\n" - .string "KOLOSSEUM.$" + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "COLOSSEUM.$" UnknownString_81A0BB4: @ 81A0BB4 - .string "Willkommen in der POKéMON KABEL-CLUB-\n" - .string "ZEITKAPSEL.$" + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "TIME CAPSULE.$" EverGrandeCity_PokemonLeague_Text_1A0BE4:: @ 81A0BE4 FallarborTown_Mart_Text_1A0BE4:: @ 81A0BE4 @@ -3025,8 +3021,8 @@ SlateportCity_Mart_Text_1A0BE4:: @ 81A0BE4 SlateportCity_Text_1A0BE4:: @ 81A0BE4 SootopolisCity_Mart_Text_1A0BE4:: @ 81A0BE4 VerdanturfTown_Mart_Text_1A0BE4:: @ 81A0BE4 - .string "Willkommen!\p" - .string "Kann ich dir helfen?$" + .string "Welcome!\p" + .string "How may I serve you?$" EverGrandeCity_PokemonLeague_Text_1A0C02:: @ 81A0C02 FallarborTown_Mart_Text_1A0C02:: @ 81A0C02 @@ -3049,29 +3045,29 @@ SlateportCity_Mart_Text_1A0C02:: @ 81A0C02 SlateportCity_Text_1A0C02:: @ 81A0C02 SootopolisCity_Mart_Text_1A0C02:: @ 81A0C02 VerdanturfTown_Mart_Text_1A0C02:: @ 81A0C02 - .string "Bitte komm bald wieder!$" + .string "Please come again!$" UnknownString_81A0C15: @ 81A0C15 - .string "Willkommen!\p" - .string "Wir bieten heute Sonderangebote an!$" + .string "Welcome!\p" + .string "We’re having a discount sale today!$" Route104_PrettyPetalFlowerShop_Text_1A0C42:: @ 81A0C42 - .string "{PLAYER}{KUN}, willkommen!\p" - .string "Wie kann ich dir behilflich sein?$" + .string "{PLAYER}{KUN}, welcome!\p" + .string "What can I do for you?$" Message_ObtainedItem: @ 81A0C68 - .string "{STR_VAR_2} erhalten!$" + .string "Obtained the {STR_VAR_2}.$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C79:: @ 81A0C79 - .string "Der BEUTEL ist voll...$" + .string "The BAG is full...$" LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C:: @ 81A0C8C -Message_PutAwayItem: @ 81A0C8C - .string "{PLAYER} packt {STR_VAR_2} in die\n" - .string "{STR_VAR_3}-TASCHE.$" +Message_PutAwayItem: + .string "{PLAYER} put away the {STR_VAR_2}\n" + .string "in the {STR_VAR_3} POCKET.$" -Message_FoundOneItem: @ 81A0CB1 - .string "{PLAYER} hat {STR_VAR_2} gefunden!$" +Message_FoundOneItem: + .string "{PLAYER} found one {STR_VAR_2}!$" MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2 MauvilleCity_Text_1A0CC2:: @ 81A0CC2 @@ -3079,175 +3075,169 @@ MtChimney_Text_1A0CC2:: @ 81A0CC2 OldaleTown_Text_1A0CC2:: @ 81A0CC2 Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2 Message_BagFull: - .string "Zu schade!\n" - .string "Der BEUTEL ist voll...$" + .string "Too bad!\n" + .string "The BAG is full...$" Message_ObtainedDecoration: @ 81A0CDE - .string "{STR_VAR_2} erhalten.$" + .string "Obtained the {STR_VAR_2}.$" BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF Route114_LanettesHouse_Text_1A0CEF:: @ 81A0CEF SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF - .string "Zu schade! Es ist kein Platz für\n" - .string "{STR_VAR_2}...$" + .string "Too bad! There’s no room left for\n" + .string "another {STR_VAR_2}...$" Message_TransferredToPC: @ 81A0D1F - .string "{STR_VAR_2} wurde auf den PC\n" - .string "übertragen.$" + .string "The {STR_VAR_2} was transferred\n" + .string "to the PC.$" PetalburgCity_Text_1A0D41:: @ 81A0D41 - .string "“Ausgewählte Items für Ihren\n" - .string "Gebrauch!”\l" - .string "POKéMON-SUPERMARKT$" + .string "“Selected items for your convenience!”\n" + .string "POKéMON MART$" PetalburgCity_Text_1A0D75:: @ 81A0D75 - .string "“Erfrische deine müden Partner!”\n" - .string "POKéMON-CENTER$" + .string "“Rejuvenate your tired partners!”\n" + .string "POKéMON CENTER$" UnknownString_81A0DA6: @ 81A0DA6 - .string "Hahaha...$" + .string "Fufufu...$" UnknownString_81A0DB0: @ 81A0DB0 - .string "Murmel... Murmel...$" + .string "Mumble, mumble...$" UnknownString_81A0DC2: @ 81A0DC2 .string "Oh!$" UnknownString_81A0DC6: @ 81A0DC6 - .string "Heute geschlossen!$" + .string "Closed today!$" UnknownString_81A0DD4: @ 81A0DD4 - .string "Magst du {STR_VAR_3}-POKéMON, {STR_VAR_1}?$" + .string "You like the {STR_VAR_3}-type POKéMON\n" + .string "{STR_VAR_1}?$" UnknownString_81A0DF5: @ 81A0DF5 - .string "Er enthält ein POKéMON.$" + .string "It contains a POKéMON!$" UnknownString_81A0E0C: @ 81A0E0C - .string "Wir treffen Vorbereitungen.$" + .string "We’re making preparations.$" UnknownString_81A0E27: @ 81A0E27 - .string "Ich bin ein Pseudo-ARENALEITER für\n" - .string "Interviews.$" + .string "I’m a pseudo-GYM LEADER for\n" + .string "interviews.$" UnknownString_81A0E4F: @ 81A0E4F - .string "Bereit für einen Testkampf.$" + .string "Ready for a test battle.$" UnknownString_81A0E68: @ 81A0E68 - .string "{STR_VAR_1} würde dieses Programm gefallen.\p" + .string "{STR_VAR_1} might like this program.\n" .string "... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...\p" - .string "Ich beeile mich besser!$" + .string "Better get going!$" UnknownString_81A0ED6: @ 81A0ED6 - .string "Womit soll ich mir die Zeit vertreiben?$" + .string "What should I do for fun today?$" LilycoveCity_DepartmentStoreElevator_Text_1A0EF6:: @ 81A0EF6 - .string "Willkommen im SEEGRASULB CITY\n" - .string "EINKAUFSZENTRUM.\p" - .string "In welches Stockwerk möchtest du?$" + .string "Welcome to LILYCOVE DEPARTMENT STORE.\p" + .string "Which floor would you like?$" UnknownString_81A0F38: @ 81A0F38 - .string "Zum DUELLTURM warpen.$" + .string "Warp to BATTLE TOWER.$" UnknownString_81A0F4E: @ 81A0F4E - .string "Nach SEEGRASULB CITY warpen.$" + .string "Warp to LILYCOVE.$" UnknownString_81A0F60: @ 81A0F60 - .string "Es ist {STR_VAR_1} Uhr.$" + .string "The time is {STR_VAR_1}!$" UnknownString_81A0F70: @ 81A0F70 - .string "Zugang zur RUHMESHALLE genehmigt.$" + .string "The HALL OF FAME will be accessed.$" Route111_Text_1A0F93:: @ 81A0F93 - .string "Der Sandsturm ist zu stark.\n" - .string "Dagegen kann man nicht angehen!$" + .string "The sandstorm is vicious.\n" + .string "It’s impossible to keep going.$" Text_NoRegisteredItem: @ 81A0FCC - .string "Ein Basis-Item aus dem BEUTEL kann auf\n" - .string "SELECT gelegt werden. Sehr praktisch!$" + .string "An item in the BAG can be registered\n" + .string "on SELECT for convenience.$" LittlerootTown_BrendansHouse_2F_Text_1A100C:: @ 81A100C LittlerootTown_MaysHouse_2F_Text_1A100C:: @ 81A100C - .string "Da ist eine E-Mail von der POKéMON\n" - .string "TRAINERSCHULE.\p" + .string "There’s an e-mail from POKéMON TRAINER\n" + .string "SCHOOL.\p" .string "... ... ... ... ... ...\p" - .string "Ein POKéMON kann bis zu vier Attacken\n" - .string "lernen.\p" - .string "Die Fähigkeiten eines TRAINERS werden\n" - .string "durch die Attacken, die er seinen\l" - .string "POKéMON beibringt, erprobt.\p" + .string "A POKéMON may learn up to four moves.\p" + .string "A TRAINER’s expertise is tested on the\n" + .string "move sets chosen for POKéMON.\p" .string "... ... ... ... ... ...$" LittlerootTown_BrendansHouse_2F_Text_1A10D6:: @ 81A10D6 LittlerootTown_MaysHouse_2F_Text_1A10D6:: @ 81A10D6 - .string "{PLAYER} schaltet den PC ein.$" + .string "{PLAYER} booted up the PC.$" FallarborTown_ContestLobby_Text_1A10EB:: @ 81A10EB - .string "Die Verbindung wurde abgebrochen.$" + .string "The link was canceled.$" MossdeepCity_StevensHouse_Text_1A1102:: @ 81A1102 RustboroCity_DevonCorp_2F_Text_1A1102:: @ 81A1102 - .string "Möchtest du {STR_VAR_2} einen\n" - .string "Kosenamen geben?$" + .string "Want to give a nickname to the\n" + .string "{STR_VAR_2} you received?$" fieldPoisonText_PokemonFainted:: @ 81A1132 - .string "{STR_VAR_1} wurde besiegt...\p" - .string "$" + .string "{STR_VAR_1} fainted...\p$" UnknownString_81A1141: @ 81A1141 - .string "{PLAYER} hat kein kampffähiges POKéMON\n" - .string "mehr!\p" - .string "{PLAYER} wird ohnmächtig!$" + .string "{PLAYER} is out of useable POKéMON!\p" + .string "{PLAYER} whited out!$" SlateportCity_Text_1A116E:: @ 81A116E - .string "Kennst du die TM GEHEIMPOWER?\p" - .string "In unserer Gruppe mögen alle die TM\n" - .string "GEHEIMPOWER.\p" - .string "Eines unserer Mitglieder wird sie dir\n" - .string "geben. Sag mir, wenn du sie hast.\p" - .string "Wir werden dich dann als Mitglied auf-\n" - .string "nehmen und dir unter der Hand tolle\l" - .string "Sachen verkaufen.$" + .string "Do you know the TM SECRET POWER?\p" + .string "Our group, we love the TM SECRET\n" + .string "POWER.\p" + .string "One of our members will give it to you.\n" + .string "Come back and show me if you get it.\p" + .string "We’ll accept you as a member and sell\n" + .string "you good stuff in secrecy.$" gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245 - .string "Okay, ich nehme deine POKéMON für einen\n" - .string "Moment in meine Obhut.$" + .string "Okay, I’ll take your POKéMON for a\n" + .string "few seconds.$" gText_NurseJoy_Pokerus:: @ 81A1275 - .string "Dein POKéMON scheint von dem\n" - .string "POKéRUS befallen zu sein.\p" - .string "Über den POKéRUS ist bisher wenig be-\n" - .string "kannt, außer dass es Mikroorganismen\l" - .string "sind, die POKéMON befallen.\p" - .string "Sind deine POKéMON infiziert, wachsen\n" - .string "sie besonders gut.$" + .string "Your POKéMON may be infected with\n" + .string "POKéRUS.\p" + .string "Little is known about the POKéRUS\n" + .string "except that they are microscopic life-\l" + .string "forms that attach to POKéMON.\p" + .string "While infected, POKéMON are said to\n" + .string "grow exceptionally well.$" .include "data/text/surf.inc" SealedChamber_InnerRoom_Text_1A138B:: @ 81A138B - .string "Das hörte sich an, als würde irgendwo\n" - .string "eine Tür geöffnet.$" + .string "It sounded as if a door opened\n" + .string "somewhere far away.$" AncientTomb_Text_1A13BE:: @ 81A13BE DesertRuins_Text_1A13BE:: @ 81A13BE IslandCave_Text_1A13BE:: @ 81A13BE SealedChamber_OuterRoom_Text_1A13BE:: @ 81A13BE - .string "In der Wand ist ein großes Loch.$" + .string "There is a big hole in the wall.$" OldaleTown_PokemonCenter_2F_Text_1A13DF:: @ 81A13DF - .string "Tut mir schrecklich Leid. Das KOLOSSEUM\n" - .string "wird gerade renoviert.$" + .string "I’m terribly sorry. The COLOSSEUM\n" + .string "is undergoing adjustments.$" OldaleTown_PokemonCenter_2F_Text_1A141C:: @ 81A141C - .string "Tut mir schrecklich Leid. Das\n" - .string "HANDELSCENTER wird gerade renoviert.$" + .string "I’m terribly sorry. The TRADE CENTER\n" + .string "is undergoing inspections.$" OldaleTown_PokemonCenter_2F_Text_1A145C:: @ 81A145C - .string "Tut mir schrecklich Leid. Hier wird\n" - .string "für den STATISTIKTAUSCH renoviert.$" + .string "I’m terribly sorry. The RECORD CORNER\n" + .string "is under preparation.$" FallarborTown_House1_Text_1A1498:: @ 81A1498 - .string "{PLAYER} übergibt\n" + .string "{PLAYER} handed over the\n" .string "{STR_VAR_1}.$" Event_NoRegisteredItem:: @ 81A14AF @@ -3279,865 +3269,325 @@ PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC Route101_EventScript_1A14DC:: @ 81A14DC return -.if DEBUG - -DebugScript_081C1CFE:: @ 81C1CFE - setflag 0x804 - call 0x81C032D - end - -DebugScript_081C1D07:: @ 81C1D07 - checkitem ITEM_COIN_CASE, 1 - compare 0x800d, 1 - goto_if_eq DebugScript_081C1D1D - giveitem ITEM_COIN_CASE, 1 - end - -DebugScript_081C1D1D:: @ 81C1D1D - end - -DebugScript_081C1D1E:: @ 81C1D1E - goto 0x8167646 - -DebugScript_081C1D23:: @ 81C1D23 - end - -DebugScript_081C1D24:: @ 81C1D24 - setvar 0x40ba, 1 - end - -DebugScript_081C1D2A:: @ 81C1D2A - giveitem ITEM_SS_TICKET, 1 - goto DebugScript_081C1CFE - -DebugScript_081C1D34:: @ 81C1D34 - end - -DebugScript_081C1D35:: @ 81C1D35 - getpartysize - compare 0x800d, 6 - goto_if_eq DebugScript_081C1D45 - giveegg SPECIES_KYOGRE - end - -DebugScript_081C1D45:: @ 81C1D45 - end - -DebugScript_081C1D46:: @ 81C1D46 - giveitem ITEM_POTION, 99 - giveitem ITEM_ANTIDOTE, 99 - giveitem ITEM_BURN_HEAL, 99 - giveitem ITEM_ICE_HEAL, 99 - giveitem ITEM_AWAKENING, 99 - giveitem ITEM_PARALYZE_HEAL, 99 - giveitem ITEM_FULL_RESTORE, 99 - giveitem ITEM_MAX_POTION, 99 - giveitem ITEM_HYPER_POTION, 99 - giveitem ITEM_SUPER_POTION, 99 - giveitem ITEM_FULL_HEAL, 99 - giveitem ITEM_REVIVE, 99 - giveitem ITEM_MAX_REVIVE, 99 - giveitem ITEM_FRESH_WATER, 99 - giveitem ITEM_SODA_POP, 99 - giveitem ITEM_LEMONADE, 99 - giveitem ITEM_MOOMOO_MILK, 99 - giveitem ITEM_ENERGY_POWDER, 99 - giveitem ITEM_ENERGY_ROOT, 99 - giveitem ITEM_HEAL_POWDER, 99 - giveitem ITEM_ORANGE_MAIL, 92 - giveitem ITEM_RETRO_MAIL, 94 - giveitem ITEM_POTION, 89 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_ULTRA_BALL, 99 - giveitem ITEM_GREAT_BALL, 99 - giveitem ITEM_POKE_BALL, 99 - giveitem ITEM_NET_BALL, 99 - giveitem ITEM_DIVE_BALL, 99 - giveitem ITEM_NEST_BALL, 99 - giveitem ITEM_REPEAT_BALL, 99 - giveitem ITEM_TIMER_BALL, 99 - giveitem ITEM_LUXURY_BALL, 99 - giveitem ITEM_PREMIER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_GREAT_BALL, 79 - giveitem ITEM_ULTRA_BALL, 84 - giveitem ITEM_POKE_BALL, 89 - giveitem ITEM_MASTER_BALL, 74 - giveitem ITEM_TM01, 99 - giveitem ITEM_TM02, 99 - giveitem ITEM_TM03, 99 - giveitem ITEM_TM04, 99 - giveitem ITEM_TM05, 99 - giveitem ITEM_TM06, 99 - giveitem ITEM_TM07, 99 - giveitem ITEM_TM08, 99 - giveitem ITEM_TM09, 99 - giveitem ITEM_TM10, 99 - giveitem ITEM_TM11, 99 - giveitem ITEM_TM12, 99 - giveitem ITEM_TM13, 99 - giveitem ITEM_TM14, 99 - giveitem ITEM_TM15, 99 - giveitem ITEM_TM16, 99 - giveitem ITEM_TM17, 99 - giveitem ITEM_TM18, 99 - giveitem ITEM_TM19, 99 - giveitem ITEM_TM20, 99 - giveitem ITEM_TM21, 99 - giveitem ITEM_TM22, 99 - giveitem ITEM_TM23, 99 - giveitem ITEM_TM24, 99 - giveitem ITEM_TM25, 99 - giveitem ITEM_TM26, 99 - giveitem ITEM_TM27, 99 - giveitem ITEM_TM28, 99 - giveitem ITEM_TM29, 99 - giveitem ITEM_TM30, 99 - giveitem ITEM_TM31, 99 - giveitem ITEM_TM32, 99 - giveitem ITEM_TM33, 99 - giveitem ITEM_TM34, 99 - giveitem ITEM_TM35, 99 - giveitem ITEM_TM36, 99 - giveitem ITEM_TM37, 99 - giveitem ITEM_TM38, 99 - giveitem ITEM_TM39, 99 - giveitem ITEM_TM40, 99 - giveitem ITEM_TM41, 99 - giveitem ITEM_TM42, 99 - giveitem ITEM_TM43, 99 - giveitem ITEM_TM44, 99 - giveitem ITEM_TM45, 99 - giveitem ITEM_TM46, 99 - giveitem ITEM_TM47, 99 - giveitem ITEM_TM48, 99 - giveitem ITEM_TM49, 99 - giveitem ITEM_TM50, 99 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 199 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 199 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 199 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 199 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 199 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 199 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 199 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 199 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 199 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 199 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 199 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 199 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 199 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 199 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 199 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 199 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 199 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 199 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 199 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 199 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 199 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 199 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 199 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 199 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 199 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 199 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 199 - giveitem ITEM_MAGOST_BERRY, 999 - giveitem ITEM_RABUTA_BERRY, 999 - giveitem ITEM_NOMEL_BERRY, 999 - giveitem ITEM_SPELON_BERRY, 999 - giveitem ITEM_PAMTRE_BERRY, 999 - giveitem ITEM_WATMEL_BERRY, 999 - giveitem ITEM_DURIN_BERRY, 999 - giveitem ITEM_BELUE_BERRY, 999 - giveitem ITEM_LIECHI_BERRY, 999 - giveitem ITEM_GANLON_BERRY, 999 - giveitem ITEM_SALAC_BERRY, 999 - giveitem ITEM_PETAYA_BERRY, 999 - giveitem ITEM_APICOT_BERRY, 999 - giveitem ITEM_LANSAT_BERRY, 999 - giveitem ITEM_STARF_BERRY, 999 - giveitem ITEM_ENIGMA_BERRY, 999 - end - -DebugScript_081C221F:: @ 81C221F - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - end - -DebugScript_081C23E2:: @ 81C23E2 - givecoins 9999 - end - -DebugScript_081C23E6:: @ 81C23E6 - setflag 0x081 - setflag 0x071 - warp MAP_SOOTOPOLIS_CITY, 0xFF, 31, 33 - waitstate - end - -DebugScript_081C23F6:: @ 81C23F6 - takemoney 999999, 0x00 - end - -DebugScript_081C23FD:: @ 81C23FD - getpartysize - compare 0x800d, 1 - goto_if_eq DebugScript_081C2436 - compare 0x800d, 2 - goto_if_eq 0x81C2445 - compare 0x800d, 3 - goto_if_eq 0x81C2454 - compare 0x800d, 4 - goto_if_eq 0x81C2463 - compare 0x800d, 5 - goto_if_eq 0x81C2472 - end - -DebugScript_081C2436:: @ 81C2436 - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 - end - -DebugScript_081C2482:: @ 81C2482 - getpartysize - compare 0x800d, 1 - goto_if_eq 0x81C24BB - compare 0x800d, 2 - goto_if_eq 0x81C24CA - compare 0x800d, 3 - goto_if_eq 0x81C24D9 - compare 0x800d, 4 - goto_if_eq 0x81C24E8 - compare 0x800d, 5 - goto_if_eq 0x81C24F7 - end - -DebugScript_081C24BB:: @ 81C24BB - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 - end - -DebugScript_081C2507:: @ 81C2507 - getpartysize - compare 0x800d, 6 - goto_if_eq DebugScript_081C2517 - giveegg SPECIES_BARBOACH - end - -DebugScript_081C2517:: @ 81C2517 - end - -DebugScript_081C2518:: @ 81C2518 - getpartysize - compare 0x800d, 6 - goto_if_eq DebugScript_081C2528 - giveegg SPECIES_SHROOMISH - end - -DebugScript_081C2528:: @ 81C2528 - end - -.endif - .include "data/scripts/berry_tree.inc" .include "data/text/berry_tree.inc" UnknownString_81A1948: @ 81A1948 - .string "Wenn einige Äste herunterhängen, kann\n" - .string "man auf den Baum klettern.$" + .string "If some vines drop down, this tree can\n" + .string "be climbed.$" UnknownString_81A197B: @ 81A197B - .string "Wenn einige Äste herunterhängen, kann\n" - .string "man auf den Baum klettern.\p" - .string "Möchtest du GEHEIMPOWER einsetzen?$" + .string "If some vines drop down, this tree can\n" + .string "be climbed.\p" + .string "Use the SECRET POWER?$" UnknownString_81A19C4: @ 81A19C4 - .string "Ein dicker Ast fällt herunter!$" + .string "A thick vine dropped down!$" UnknownString_81A19DF: @ 81A19DF - .string "Möchtest du hier deine GEHEIMBASIS\n" - .string "einrichten?$" + .string "Want to make your SECRET BASE here?$" UnknownString_81A1A03: @ 81A1A03 - .string "Dieser Busch kann bewegt werden,\n" - .string "so dass man hineinklettern kann.$" + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.$" UnknownString_81A1A4B: @ 81A1A4B - .string "Dieser Busch kann bewegt werden,\n" - .string "so dass man hineinklettern kann.\p" - .string "Möchtest du GEHEIMPOWER einsetzen?$" + .string "If this clump of grass can be moved,\n" + .string "it might be possible to go inside.\p" + .string "Use the SECRET POWER?$" UnknownString_81A1AA9: @ 81A1AA9 - .string "Ein kleiner Eingang wird sichtbar.$" + .string "Discovered a small entrance!$" UnknownString_81A1AC6: @ 81A1AC6 - .string "Möchtest du hier deine GEHEIMBASIS\n" - .string "einrichten?$" + .string "Want to make your SECRET BASE here?$" SecretBase_RedCave1_Text_1A1AEA:: @ 81A1AEA - .string "Hast du dir schon eine GEHEIMBASIS\n" - .string "eingerichtet?\p" - .string "Ich bin hier und dort, überall hin-\n" - .string "gelaufen, bevor ich mich für diesen\l" - .string "Ort entschieden habe.\p" - .string "Da du schon mal hier bist... Hast du\n" - .string "Lust zu kämpfen?$" + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Since you’re already here, how would\n" + .string "you like to battle?$" SecretBase_RedCave1_Text_1A1B83:: @ 81A1B83 .string "Okay!\n" - .string "Jetzt kommen wir!$" + .string "Here we come!$" SecretBase_RedCave1_Text_1A1B97:: @ 81A1B97 - .string "Wie? Was? Wo?\n" - .string "Du kannst doch nicht...$" + .string "Hunh?\n" + .string "Oh, you can’t now...$" UnknownString_81A1BB2:: @ 81A1BB2 - .string "Ahaaargh! Du bist zu stark für mich! Ich\n" - .string "habe verloren, aber verrate das nicht!$" + .string "Waaargh! You’re too strong!\n" + .string "About me losing... Please keep it secret!$" SecretBase_RedCave1_Text_1A1BF8:: @ 81A1BF8 - .string "Was hältst du von meiner GEHEIMBASIS?\n" - .string "Komm mich doch morgen wieder besuchen!$" + .string "What do you think of my SECRET BASE?\n" + .string "Come visit me again tomorrow.$" SecretBase_RedCave1_Text_1A1C3B:: @ 81A1C3B - .string "Hast du dir schon eine GEHEIMBASIS\n" - .string "eingerichtet?\p" - .string "Ich bin hier und dort, überall hin-\n" - .string "gelaufen, bevor ich mich für diesen\l" - .string "Ort entschieden habe.\p" - .string "Schau dich ruhig in aller Ruhe um.$" + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Feel free to hang out!$" SecretBase_RedCave1_Text_1A1CB2:: @ 81A1CB2 - .string "Es gibt eine Menge Orte, an denen man\n" - .string "eine GEHEIMBASIS einrichten kann.\p" - .string "Aber dieser hier gefällt mir am besten.\n" - .string "Findest du es nicht auch nett hier?\p" - .string "Oh, hast du Lust auf einen Kampf?$" + .string "There’re a lot of places where you can\n" + .string "make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don’t you think it’s nice?\p" + .string "Oh, would you like to have a battle?$" SecretBase_RedCave1_Text_1A1D48:: @ 81A1D48 - .string "Okay, los geht’s!$" + .string "Okay, here goes!$" SecretBase_RedCave1_Text_1A1D59:: @ 81A1D59 .string "Oh...\n" - .string "Du hast gerade keine Zeit.$" + .string "You can’t now, okay.$" UnknownString_81A1D74:: @ 81A1D74 - .string "Hmm... Das ist unsere Niederlage...\n" - .string "Aber erzähl das bloß nicht weiter!\l" - .string "Das ist ein streng geheimes Geheimnis!$" + .string "Hmmm... It’s our loss...\n" + .string "But don’t tell anyone!\l" + .string "It’s a confidential secret!$" SecretBase_RedCave1_Text_1A1DC0:: @ 81A1DC0 - .string "Wenn du wieder mal in der Nähe bist,\n" - .string "komm mich doch besuchen!$" + .string "If you’re in this area again, I hope\n" + .string "you’ll visit me.$" SecretBase_RedCave1_Text_1A1DF6:: @ 81A1DF6 - .string "Es gibt eine Menge Orte, an denen man\n" - .string "eine GEHEIMBASIS einrichten kann.\p" - .string "Aber dieser hier gefällt mir am besten.\n" - .string "Findest du es nicht auch nett hier?$" + .string "There’re a lot of places where you can\n" + .string "make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don’t you think it’s nice?$" SecretBase_RedCave1_Text_1A1E67:: @ 81A1E67 - .string "Dies ist ein beliebter Platz.\n" - .string "Er ist eigentlich immer besetzt.\p" - .string "Ach, du wolltest dich hier auch\n" - .string "häuslich niederlassen?\p" - .string "Ich sag dir was: Du kannst den Platz\n" - .string "haben, wenn du mich besiegen kannst.$" + .string "This is a popular spot.\n" + .string "It’s always taken.\p" + .string "Oh! Were you thinking about taking this\n" + .string "spot, too?\p" + .string "I’ll tell you what, you can have this\n" + .string "spot if you can beat me.$" SecretBase_RedCave1_Text_1A1F04:: @ 81A1F04 - .string "Okay! Ich werde meine\n" - .string "GEHEIMBASIS verteidigen!$" + .string "Okay!\n" + .string "I’m going to defend my SECRET BASE!$" SecretBase_RedCave1_Text_1A1F2E:: @ 81A1F2E - .string "Was? Stimmt das? Du hast gar\n" - .string "kein Interesse an diesem Platz?!?$" + .string "Hunh? Is that right?\n" + .string "You’re not interested in this spot?$" UnknownString_81A1F67:: @ 81A1F67 - .string "Ich kann nicht mehr!\n" - .string "Ich gebe mich geschlagen!$" + .string "I can’t keep going!\n" + .string "I surrender!$" SecretBase_RedCave1_Text_1A1F88:: @ 81A1F88 - .string "Okay, wenn ich eines Tages von hier\n" - .string "fortziehe, kannst du den Platz haben.$" + .string "Okay, when I move one day, this place\n" + .string "will be yours!$" SecretBase_RedCave1_Text_1A1FBD:: @ 81A1FBD - .string "Dies ist ein beliebter Platz.\n" - .string "Er ist eigentlich immer besetzt.\p" - .string "Ich habe ewig gewartet, bis er wieder\n" - .string "frei wurde. Endlich ist es soweit!$" + .string "This is a popular spot.\n" + .string "It’s always taken.\p" + .string "I waited a long time for it to open.\n" + .string "I finally got to use it!$" SecretBase_RedCave1_Text_1A2026:: @ 81A2026 - .string "Willkommen in meinem POKéMON-LABOR.\p" - .string "Ich forsche, indem ich im Geheimen\n" - .string "kämpfe.\p" - .string "Möchtest du sehen, wie stark ich bin?$" + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.\p" + .string "Would you like to see how strong I am?$" SecretBase_RedCave1_Text_1A2095:: @ 81A2095 - .string "Das war ja wohl nichts!$" + .string "I’m going to go all out!$" SecretBase_RedCave1_Text_1A20AE:: @ 81A20AE .string "Oh.\n" - .string "Ein anderes Mal vielleicht...$" + .string "Some other time, then!$" UnknownString_81A20C9:: @ 81A20C9 - .string "Hm... Ich muss noch viel lernen.\n" - .string "Ich muss fleißiger studieren.$" + .string "Hmm... I’ve still got lots to learn.\n" + .string "I have to study some more.$" SecretBase_RedCave1_Text_1A2109:: @ 81A2109 - .string "Danke, dass du mit mir gekämpft hast.\n" - .string "Komm doch bitte morgen wieder.$" + .string "Thanks for battling with me.\n" + .string "Please come back again tomorrow.$" SecretBase_RedCave1_Text_1A2147:: @ 81A2147 - .string "Willkommen in meinem POKéMON-LABOR.\p" - .string "Ich forsche, indem ich im Geheimen\n" - .string "kämpfe.$" + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.$" SecretBase_RedCave1_Text_1A218F:: @ 81A218F - .string "Ein großes Anwesen ist natürlich auch\n" - .string "ganz nett, aber hier ist es schöner.\p" - .string "Viele Leute kommen mich besuchen.\p" - .string "So. Wie wäre es mit einem Kampf?$" + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.\p" + .string "So, how would you like a battle?$" SecretBase_RedCave1_Text_1A2220:: @ 81A2220 - .string "Genauso muss es laufen!$" + .string "That’s the way!$" SecretBase_RedCave1_Text_1A2230:: @ 81A2230 - .string "Wenn du bereit bist, sag Bescheid.$" + .string "When you’re ready, give me a shout!$" UnknownString_81A2254:: @ 81A2254 - .string "Ooch! Ich hab’s vergeigt!\n" - .string "Aber es hat sehr viel Spaß gemacht!$" + .string "Aww! Done in!\n" + .string "But it’s still fun to battle!$" SecretBase_RedCave1_Text_1A2280:: @ 81A2280 - .string "Egal. Ich sollte mir auf jeden Fall einige\n" - .string "Dekorationen und Möbel zulegen.\p" - .string "Ich möchte, dass sich auch andere in\n" - .string "meiner GEHEIMBASIS wohl fühlen.$" + .string "Well, anyway, I should go buy some\n" + .string "decorations and furniture.\p" + .string "I want my SECRET BASE to be a place\n" + .string "other people can enjoy.$" SecretBase_RedCave1_Text_1A22FA:: @ 81A22FA - .string "Ein großes Anwesen ist natürlich auch\n" - .string "ganz nett, aber hier ist es schöner.\p" - .string "Viele Leute kommen mich besuchen.$" + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.$" SecretBase_RedCave1_Text_1A236A:: @ 81A236A - .string "Ich liebe es, Dekorationen und Möbel\n" - .string "zu kaufen!!!\p" - .string "Ich liebe es genauso, POKéMON aufzu-\n" - .string "ziehen!\p" - .string "Wärest du so nett, mit meinen\n" - .string "POKéMON zu kämpfen?$" + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.\p" + .string "If you would be so kind, will you battle\n" + .string "with my POKéMON?$" SecretBase_RedCave1_Text_1A2405:: @ 81A2405 - .string "Danke schön.\n" - .string "Bist du bereit?$" + .string "Thank you.\n" + .string "Shall we begin?$" SecretBase_RedCave1_Text_1A2420:: @ 81A2420 .string "Oh.\n" - .string "Was für eine Enttäuschung.$" + .string "How disappointing...$" UnknownString_81A2439:: @ 81A2439 - .string "Ich kapituliere...$" + .string "I concede...$" SecretBase_RedCave1_Text_1A2446:: @ 81A2446 - .string "Das war vielleicht ein Spaß! Und nun\n" - .string "sollte ich mich dem Einkaufen widmen.$" + .string "That was all in good fun!\n" + .string "I should go enjoy shopping now.$" SecretBase_RedCave1_Text_1A2480:: @ 81A2480 - .string "Ich liebe es, Dekorationen und Möbel\n" - .string "zu kaufen!!!\p" - .string "Ich liebe es genauso, POKéMON aufzu-\n" - .string "ziehen!$" + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.$" SecretBase_RedCave1_Text_1A24E1:: @ 81A24E1 - .string "Einige Leute richten ihre GEHEIMBASIS\n" - .string "an gut versteckten Orten ein.\l" - .string "Wollen sie sich nicht mehr sehen lassen?\p" - .string "Da du mich gefunden hast, lass uns\n" - .string "doch gleich mal kämpfen.$" + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?\p" + .string "But since you found me, how about we\n" + .string "have a battle?$" SecretBase_RedCave1_Text_1A256F:: @ 81A256F - .string "Ich bin nicht einfach zu besiegen!$" + .string "I’m not going down easily!$" SecretBase_RedCave1_Text_1A258A:: @ 81A258A - .string "Oh. Sag bloß, du bist müde von der Suche\n" - .string "nach diesem Platz?$" + .string "Oh... Are you maybe tired from searching\n" + .string "for this place?$" UnknownString_81A25C3:: @ 81A25C3 - .string "Ich bin untergegangen...$" + .string "I went down...$" SecretBase_RedCave1_Text_1A25D2:: @ 81A25D2 - .string "Wo ist deine GEHEIMBASIS?\n" - .string "Ich sollte dich dort mal besuchen.$" + .string "Where’s your SECRET BASE?\n" + .string "I should go visit you there.$" SecretBase_RedCave1_Text_1A2609:: @ 81A2609 - .string "Einige Leute richten ihre GEHEIMBASIS\n" - .string "an gut versteckten Orten ein.\l" - .string "Wollen sie sich nicht mehr sehen lassen?$" + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?$" SecretBase_RedCave1_Text_1A2663:: @ 81A2663 - .string "Einige Leute haben mir erzählt, dass man\n" - .string "auf verschiedene Arten an Deko-\l" - .string "rationen kommen kann.\p" - .string "Wir sollten einen Wettbewerb veran-\n" - .string "stalten, wer die schönsten Dinge hat.\p" - .string "Aber zuerst lass uns kämpfen.$" + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!\p" + .string "In the meantime, want to battle?$" SecretBase_RedCave1_Text_1A2710:: @ 81A2710 - .string "Das ist meine GEHEIMBASIS.\n" - .string "Ich kann hier gar nicht verlieren!$" + .string "This is my SECRET BASE.\n" + .string "I can’t lose!$" SecretBase_RedCave1_Text_1A2736:: @ 81A2736 - .string "Ich kämpfe jederzeit mit dir.$" + .string "I’ll battle with you anytime.$" UnknownString_81A2754:: @ 81A2754 - .string "Wie?\n" - .string "Ich habe doch verloren?$" + .string "Huh?\n" + .string "Did I just lose?$" SecretBase_RedCave1_Text_1A276A:: @ 81A276A - .string "Ich werde den Wettbewerb um die\n" - .string "schönsten Dekorationen nicht ver-\l" - .string "lieren. Überzeuge dich selbst!$" + .string "I won’t lose at collecting decorations.\n" + .string "Come visit again!$" SecretBase_RedCave1_Text_1A27A4:: @ 81A27A4 - .string "Einige Leute haben mir erzählt, dass man\n" - .string "auf verschiedene Arten an Deko-\l" - .string "rationen kommen kann.\p" - .string "Wir sollten einen Wettbewerb veran-\n" - .string "stalten, wer die schönsten Dinge hat.$" + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!$" SecretBase_RedCave1_Text_1A2830:: @ 81A2830 - .string "Ich habe einen Ort gefunden, der mir\n" - .string "gefällt und den ich mit meinen Lieblings-\l" - .string "dekorationen ausgestattet habe.\p" - .string "Dort ziehe ich meine Lieblings-POKéMON\n" - .string "auf und werde mit ihnen stärker.\p" - .string "Genau das mache ich.\n" - .string "Möchtest du mit mir kämpfen?$" + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "That’s what I do.\n" + .string "Want to battle with me?$" SecretBase_RedCave1_Text_1A28D7:: @ 81A28D7 - .string "Zeig mir, aus welchem Holz du\n" - .string "geschnitzt bist.$" + .string "Show me what you’re made of!$" SecretBase_RedCave1_Text_1A28F4:: @ 81A28F4 - .string "Ich glaube, es gibt immer wieder Zeiten,\n" - .string "in denen man nicht so gut drauf ist.$" + .string "I guess there are times when you’re not\n" + .string "into it.$" UnknownString_81A2925:: @ 81A2925 - .string "Ich weiß jetzt genau, aus welchem Holz\n" - .string "du geschnitzt bist.$" + .string "I know exactly what you’re made of now.$" SecretBase_RedCave1_Text_1A294D:: @ 81A294D - .string "Wir können beide noch stärker werden!\n" - .string "Das macht doch Mut!$" + .string "We can both become stronger.\n" + .string "Let’s keep at it!$" SecretBase_RedCave1_Text_1A297C:: @ 81A297C - .string "Ich habe einen Ort gefunden, der mir\n" - .string "gefällt und den ich mit meinen Lieblings-\l" - .string "dekorationen ausgestattet habe.\p" - .string "Dort ziehe ich meine Lieblings-POKéMON\n" - .string "auf und werde mit ihnen stärker.\p" - .string "Jeder Tag ist mein Lieblingstag.$" + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "Every day is a great day.$" SecretBase_RedCave1_Text_1A2A13:: @ 81A2A13 - .string "Man lernt viel über den Geschmack und\n" - .string "den Stil von Menschen, wenn man sich\l" - .string "ihre Dekorationen und den Platz, auf\l" - .string "dem sie stehen, anschaut.\p" - .string "Wie findest du meinen Geschmack?\n" - .string "Bist du sprachlos? Hihihi...\p" - .string "Willst du mal meinen Kampfstil sehen?$" + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?\p" + .string "Want to see my taste in battling?$" SecretBase_RedCave1_Text_1A2AE2:: @ 81A2AE2 - .string "Es gibt kein Zurück mehr.$" + .string "There’s no holding back!$" SecretBase_RedCave1_Text_1A2AFB:: @ 81A2AFB - .string "Ich zeige dir gerne jederzeit wieder \n" - .string "meinen erlesenen Kampfstil!$" + .string "I’ll be happy to demonstrate my style\n" + .string "anytime.$" UnknownString_81A2B2A:: @ 81A2B2A - .string "Du bist hoch talentiert! Deine Stärke\n" - .string "scheint grenzenlos zu sein.$" + .string "You’re supremely talented!\n" + .string "Your power seems to be limitless...$" SecretBase_RedCave1_Text_1A2B69:: @ 81A2B69 - .string "Was hältst du von meinem Stil?\n" - .string "Ich muss ihn noch mehr aufpolieren.$" + .string "What did you think of my style?\n" + .string "I’ll keep on polishing it!$" SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 - .string "Man lernt viel über den Geschmack und\n" - .string "den Stil von Menschen, wenn man sich\l" - .string "ihre Dekorationen und den Platz, auf\l" - .string "dem sie stehen, anschaut.\p" - .string "Wie findest du meinen Geschmack?\n" - .string "Bist du sprachlos? Hihihi...$" + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?$" gUnknown_081A2C51:: @ 81A2C51 special sub_80BB70C @@ -4831,80 +4281,69 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A .include "data/scripts/secret_power_tm.inc" UnknownString_81A38FB: @ 81A38FB - .string "Alle Dekorationsgegenstände und das\n" - .string "Mobiliar aus deiner GEHEIMBASIS werden\l" - .string "auf deinen PC gesendet.\p" - .string "Einverstanden?$" + .string "All decorations and furniture in your\n" + .string "SECRET BASE will be returned to your PC.\p" + .string "Is that okay?$" UnknownString_81A3958: @ 81A3958 - .string "Möchtest du GEHEIMBASIS von\n" - .string "{STR_VAR_1} eintragen?$" + .string "Do you want to register\n" + .string "{STR_VAR_1}’s SECRET BASE?$" UnknownString_81A3982: @ 81A3982 - .string "Diese Daten wurden bereits\n" - .string "eingetragen. Möchtest du sie löschen?$" + .string "This data is already registered.\n" + .string "Would you like to delete it?$" UnknownString_81A39C0: @ 81A39C0 - .string "Bis zu 10 Orte können eingetragen\n" - .string "werden.\p" - .string "Lösche einen Ort, um einen neuen\n" - .string "eintragen zu können.$" + .string "Up to 10 locations can be registered.\p" + .string "Delete a location if you want to\n" + .string "register another location.$" UnknownString_81A3A22: @ 81A3A22 - .string "Registrierung abgeschlossen.$" + .string "Registration completed.$" UnknownString_81A3A3A: @ 81A3A3A - .string "Daten wurden aus der Registrierung\n" - .string "genommen.$" + .string "Data has been unregistered.$" UnknownString_81A3A56: @ 81A3A56 - .string "Es sind keine Dekorationen vorhanden.$" + .string "There are no decorations...$" UnknownString_81A3A72: @ 81A3A72 - .string "{PLAYER} schaltet den PC ein.$" + .string "{PLAYER} booted up the PC.$" UnknownString_81A3A87: @ 81A3A87 - .string "Was möchtest du tun?$" + .string "What would you like to do?$" UnknownString_81A3AA2: @ 81A3AA2 - .string "Die eingetragene GEHEIMBASIS bleibt\n" - .string "erhalten, bis der Eigentümer umzieht.\p" - .string "Wird sie aus dem Grundbuch ent-\n" - .string "fernt, kann eine andere GEHEIMBASIS\l" - .string "diesen Platz einnehmen.\p" - .string "Bis zu 10 Orte können eingetragen\n" - .string "werden.{0xFC}Ì$" + .string "The registered SECRET BASE will remain\n" + .string "unless the owner moves away.\p" + .string "If it is removed from the registry,\n" + .string "another SECRET BASE may take its place.\p" + .string "Up to ten locations can be registered.{PAUSE_UNTIL_PRESS}$" UnknownString_81A3B5B: @ 81A3B5B - .string "Ein Schild aus {STR_VAR_2}, welches zeigt,\n" - .string "dass {STR_VAR_1}-mal hintereinander im\l" - .string "DUELLTURM ein Kampf gewonnen wurde.$" + .string "A shield of {STR_VAR_2} that marks winning\n" + .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" UnknownString_81A3BA4: @ 81A3BA4 - .string "Ein sehr realistischer Spielzeug-\n" - .string "Fernseher. Man könnte ihn glatt mit\l" - .string "einem echten Gerät verwechseln.$" + .string "A realistic toy TV. It could be easily\n" + .string "mistaken for the real thing.$" UnknownString_81A3BE8: @ 81A3BE8 - .string "Ein Spielzeug-Fernseher, der aussieht\n" - .string "wie ein SAMURZEL. Er scheint von\l" - .string "alleine davonrollen zu wollen...$" + .string "A toy TV shaped like a SEEDOT.\n" + .string "It looks ready to roll away on its own...$" UnknownString_81A3C31: @ 81A3C31 - .string "Ein Spielzeug-Fernseher, der aussieht\n" - .string "wie ein ENECO. Es scheint, als wolle\l" - .string "er sich langsam davonschleichen ...$" + .string "A toy TV shaped like a SKITTY.\n" + .string "It looks ready to stroll away...$" UnknownString_81A3C71: @ 81A3C71 - .string "Du kannst dir nur eine GEHEIMBASIS\n" - .string "einrichten.\p" - .string "Möchtest du deine GEHEIMBASIS in der\n" - .string "Nähe von {STR_VAR_1} hierher\l" - .string "verlegen?$" + .string "You may only make one SECRET BASE.\p" + .string "Would you like to move from the SECRET\n" + .string "BASE near {STR_VAR_1}?$" UnknownString_81A3CC9: @ 81A3CC9 - .string "Umzug wurde abgeschlossen.\p" - .string "Möchtest du GEHEIMPOWER einsetzen?$" + .string "Moving completed.\p" + .string "Would you like to use the SECRET POWER?$" .include "data/scripts/cable_club.inc" .include "data/text/cable_club.inc" @@ -5326,7 +4765,7 @@ S_RepelWoreOff:: @ 81C33E6 end Text_RepelWoreOff: @ 81C33EF - .string "SCHUTZ wirkt nicht mehr...$" + .string "REPEL’s effect wore off...$" .include "data/scripts/safari_zone.inc" .include "data/text/safari_zone.inc" @@ -5370,32 +4809,32 @@ MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA .include "data/text/shoal_cave.inc" PictureBookShelfText: @ 81C6A69 - .string "Eine Sammlung von POKéMON-Büchern.$" + .string "There’s a set of POKéMON picture books.$" BookshelfText: @ 81C6A91 - .string "Hier stehen jede Menge Bücher.$" + .string "It’s filled with all sorts of books.$" PokemonCenterBookshelfText: @ 81C6AB6 - .string "POKéMON-Magazine!\n" - .string "DER POKéMON FREUND...\p" - .string "POKéMON HANDBUCH...\n" - .string "GELIEBTE POKéMON...$" + .string "POKéMON magazines!\n" + .string "POKéMON PAL...\p" + .string "POKéMON HANDBOOK...\n" + .string "ADORABLE POKéMON...$" VaseText: @ 81C6B00 - .string "Diese Vase sieht sehr teuer aus...\n" - .string "Schauen wir mal hinein...\p" - .string "Och, sie ist leer.$" + .string "This vase looks expensive...\n" + .string "Peered inside...\p" + .string "But, it was empty.$" TrashCanText: @ 81C6B41 - .string "Leer...$" + .string "It’s empty.$" ShopShelfText: @ 81C6B4D - .string "Die Regale biegen sich unter dem\n" - .string "Gewicht von POKéMON-Artikeln.$" + .string "The shelves brim with all sorts of\n" + .string "POKéMON merchandise.$" BlueprintText: @ 81C6B85 - .string "Sind das Blaupausen?\n" - .string "Die sind zu kompliziert zu lesen.$" + .string "A blueprint of some sort?\n" + .string "It’s too complicated!$" GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 86a4d1b24..f5ba25643 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -46,17 +46,14 @@ Cut_ChoseNo: @ 81B0E3C end UseCutPromptText: @ 81B0E3F - .string "Du kannst den ZERSCHNEIDER hier\n" - .string "einsetzen!\p" - .string "Möchtest du den ZERSCHNEIDER\n" - .string "einsetzen?$" + .string "This tree looks like it can be CUT down.\p" + .string "Would you like to CUT it?$" UsedCutRockSmashText: @ 81B0E82 - .string "{STR_VAR_1} setzt {STR_VAR_2} ein.$" + .string "{STR_VAR_1} used {STR_VAR_2}.$" CannotUseCutText: @ 81B0E8E - .string "Der ZERSCHNEIDER kann hier eingesetzt\n" - .string "werden.$" + .string "This tree looks like it can be CUT down.$" S_BreakableRock:: @ 81B0EB7 lockall @@ -117,12 +114,12 @@ RockSmash_ChoseNo: @ 81B0F48 end UseRockSmashPromptText: @ 81B0F4B - .string "Dieser Fels sieht zerbrechlich aus.\n" - .string "Soll ZERTRÜMMERER eingesetzt werden?$" + .string "This rock appears to be breakable.\n" + .string "Would you like to use ROCK SMASH?$" CannotUseRockSmashText: @ 81B0F90 - .string "Ein großer Felsen. Ein POKéMON könnte\n" - .string "ihn vielleicht zertrümmern.$" + .string "It’s a rugged rock, but a POKéMON\n" + .string "may be able to smash it.$" S_PushableBoulder:: @ 81B0FCB lockall @@ -170,22 +167,22 @@ Strength_ChoseNo: @ 81B103A end UseStrengthPromptText: @ 81B103D - .string "Ein POKéMON kann diesen Felsen\n" - .string "vielleicht bewegen.\p" - .string "Möchtest du STÄRKE einsetzen?$" + .string "It’s a big boulder, but a POKéMON\n" + .string "may be able to push it aside.\p" + .string "Would you like to use STRENGTH?$" UsedStrengthText: @ 81B109D - .string "{STR_VAR_1} setzt STÄRKE ein.\p" - .string "STÄRKE von {STR_VAR_1} ermöglicht es,\n" - .string "den Felsen zu bewegen.$" + .string "{STR_VAR_1} used STRENGTH.\p" + .string "{STR_VAR_1}’s STRENGTH made it possible\n" + .string "to move boulders around.$" CannotUseStrengthText: @ 81B10E7 - .string "Ein POKéMON kann diesen Felsen\n" - .string "vielleicht bewegen.$" + .string "It’s a big boulder, but a POKéMON\n" + .string "may be able to push it aside.$" AlreadyUsedStrengthText: @ 81B1127 - .string "STÄRKE ermöglicht es, Felsen zu\n" - .string "bewegen.$" + .string "STRENGTH made it possible to move\n" + .string "boulders around.$" S_UseWaterfall:: @ 81B115A lockall @@ -210,15 +207,15 @@ Waterfall_Done: @ 81B119D end CannotUseWaterfallText: @ 81B119F - .string "Das Wasser fällt steil wie eine Wand\n" - .string "brüllend in die Tiefe.$" + .string "A wall of water is crashing down with\n" + .string "a mighty roar.$" UseWaterfallPromptText: @ 81B11D4 - .string "Ein riesiger Wasserfall.\n" - .string "Möchtest du KASKADE einsetzen?$" + .string "It’s a large waterfall.\n" + .string "Would you like to use WATERFALL?$" UsedWaterfallText: @ 81B120D - .string "{STR_VAR_1} setzt KASKADE ein.$" + .string "{STR_VAR_1} used WATERFALL.$" UseDiveScript:: @ 81B1220 lockall @@ -273,32 +270,31 @@ UnderwaterDive_Done: @ 81B12BE end CannotUseDiveText: @ 81B12C0 - .string "Das Wasser ist hier tief. Ein POKéMON\n" - .string "könnte hier vielleicht tauchen.$" + .string "The sea is deep here. A POKéMON may be\n" + .string "able to go underwater here.$" UseDivePromptText: @ 81B1303 - .string "Das Meer ist an dieser Stelle sehr tief.\n" - .string "Möchtest du TAUCHER einsetzen?$" + .string "The sea is deep here.\n" + .string "Would you like to use DIVE?$" UsedDiveText: @ 81B1335 - .string "{STR_VAR_1} setzt TAUCHER ein.$" + .string "{STR_VAR_1} used DIVE.$" UnderwaterCannotUseDiveText: @ 81B1343 - .string "Licht schimmert von oben herab. Ein\n" - .string "POKéMON könnte hier auftauchen.$" + .string "Light is filtering down from above.\n" + .string "A POKéMON may be able to surface here.$" UnderwaterUseDivePromptText: @ 81B138E - .string "Licht schimmert von oben herab.\n" - .string "Möchtest du TAUCHER einsetzen?$" + .string "Light is filtering down from above.\n" + .string "Would you like to use DIVE?$" SurfacingBlockedText: @ 81B13CE - .string "An der Oberfläche ist irgendetwas im\n" - .string "Weg. TAUCHER kann nicht\l" - .string "eingesetzt werden.$" + .string "There is something in the way above.\n" + .string "DIVE can’t be used here.$" SweetScentNothingHereScript:: @ 81B140C msgbox SweetScentNothingHereText, 3 end SweetScentNothingHereText: @ 81B1415 - .string "Hier scheint nichts zu sein...$" + .string "There appears to be nothing here...$" diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/maps/VictoryRoad_B1F/map.bin index bd5f9065f..706c96974 100644 --- a/data/maps/VictoryRoad_B1F/map.bin +++ b/data/maps/VictoryRoad_B1F/map.bin @@ -13,8 +13,8 @@ 22228222#  22222 ##       ##  228222#   -22  B B#B #22R222 #B B B B¼B»B¼ò¼ò½B½BBBB222222622#    -22BBBBÄBÃBÄòÄòÅBÅBBBB222222222P222222222BBB2222222222R222 #2222BBB22#       +22  B B#B #22R222 #B B B B¼B»B¼ò¼ò½B½BBBB222P22622#    +22BBBBÄBÃBÄòÄòÅBÅBBBB2222222228222222222BBB2222222222R222 #2222BBB22#       2222222222#22BB #22#  2222#  2222#22BB22222#222#    #222BB22#22#  diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/maps/VictoryRoad_B2F/map.bin index 24c4f646a..682c31764 100644 --- a/data/maps/VictoryRoad_B2F/map.bin +++ b/data/maps/VictoryRoad_B2F/map.bin @@ -1 +1 @@ -€‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰�2�{{{{{{{{{{{{{{{{{{{{{{’2222�{{{{{{{{{{{{{{{{{{{{{{’22222222�{{{{{{{{{{{{{{{{{{{{{{’222222222�{{{{{TUUUV{{{{{{{{{{{{’22222222222W3W3W3y{’W3W3W3W3W3W3W3W3y{{{’222  "22222222222�{’22222222W3W3y{’ #B22#B"222222222222�{’222222222222�{’222222222222222�{’»³¼22222222222�{’¹¹¹222222222»³¼¹¹¹222222222¹¹¹€‰�222€Z[‰tuv‰‰‰‰�222222222¹¹¹�{’222�XY{{{{{{{{’22222222222€tuv‰‰‰‰‰˜{š‰‰‰˜{PQ{{{{{{{š‰‰�22222222�{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222¤¤UUUUV{{{{{{{{{TUUUUUUUUUUV{{’  2#2222222#     "¤V{{{TUUUU¤         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B»B»B»B¼ò¼ò¼ò½B½B½BB222222222BB»B»B»B»B¼ò¼ò¼ò»B»B»B B B B B#BBBBBBBÃBÃBÃBÄòÄòÄòÅBÅBÅBB2222BBÃBÃBÃBÃBÄòÄòÄòÃBÃBÃBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222222222222222222222222222222222222262222222222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file +€‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰‰�2�{{{{{{{{{{{{{{{{{{{{{{’2222�{{{{{{{{{{{{{{{{{{{{{{’22222222�{{{{{{{{{{{{{{{{{{{{{{’222222222�{{{{{TUUUV{{{{{{{{{{{{’22222222222W3W3W3y{’W3W3W3W3W3W3W3W3y{{{’222  "22222222222�{’22222222W3W3y{’ #B22#B"222222222222�{’222222222222�{’222222222222222�{’»³¼22222222222�{’¹¹¹222222222»³¼¹¹¹222222222¹¹¹€‰�222€Z[‰tuv‰‰‰‰�222222222¹¹¹�{’222�XY{{{{{{{{’22222222222€tuv‰‰‰‰‰˜{š‰‰‰˜{PQ{{{{{{{š‰‰�22222222�{{{{{{{{{{{{{{{{XY{{{{{{{{{{x  #222222###UUUV{{{{{{{{{TUUUUUUUUUUV{{’  2#2222222#     "¤V{{{TUUUU¤         "D2D2D22222222#2 2 2  B B"D2D2D2     #  B B B B B B»B»B»B¼ò¼ò¼ò½B½B½BB222222222BB»B»B»B»B¼ò¼ò¼ò»B»B»B B B B B#BBBBBBBÃBÃBÃBÄòÄòÄòÅBÅBÅBB2222BBÃBÃBÃBÃBÄòÄòÄòÃBÃBÃBBBBBBBBBBB222NRRRO222BBBBBBBB22222222222222222222222222222222Q222222222222229222222222222222222622222S2222222222222222222226#             ##              #6#               ##                  ##                                          ##                                            # \ No newline at end of file diff --git a/data/strings2.s b/data/strings2.s index 52e964938..f73aba76f 100644 --- a/data/strings2.s +++ b/data/strings2.s @@ -5,70 +5,64 @@ @ unused gOtherText_TopSpeed:: - .string "TEMPO$" + .string "TOP SPEED$" gMultiText_BerryBlenderMaxSpeedRecord:: @ 842C2E6 - .string "BEERENMIXER\n" - .string "MAXIMALTEMPO-REKORD!$" + .string "BERRY BLENDER\nMAXIMUM SPEED RECORD!$" gMultiText_2P3P4P:: @ 842C30A - .string "2 SPIELER\n" - .string "3 SPIELER\n" - .string "4 SPIELER$" + .string "2 PLAYERS\n3 PLAYERS\n4 PLAYERS$" gMultiText_Saving:: @ 842C328 - .string "SPEICHERVORGANG...\n" - .string "DAS GERÄT NICHT AUSSCHALTEN!$" + .string "SAVING...\nDON’T TURN OFF THE POWER.$" gMultiText_LinkError:: @ 842C34C - .string "{HIGHLIGHT TRANSPARENT}{COLOR WHITE2}Verbindungsfehler...\n" - .string "Die Kabelverbindungen überprüfen und\n" - .string "die Geräte aus- und wieder einschalten.$" + .string "{HIGHLIGHT TRANSPARENT}{COLOR WHITE2}Link error...\nCheck your Game Link cable connection,\nand turn the power off and on.$" gSystemText_OptionMenu:: @ 842C3A6 - .string "{PALETTE 9}OPTIONEN$" + .string "{PALETTE 9}OPTION$" gSystemText_TextSpeed:: @ 842C3B0 - .string "{PALETTE 9}TEXT-TEMPO$" + .string "{PALETTE 9}TEXT SPEED$" gSystemText_BattleScene:: @ 842C3BE - .string "{PALETTE 9}ANIMATION$" + .string "{PALETTE 9}BATTLE SCENE$" gSystemText_BattleStyle:: @ 842C3CE - .string "{PALETTE 9}KAMPFSTIL$" + .string "{PALETTE 9}BATTLE STYLE$" gSystemText_Sound:: @ 842C3DE - .string "{PALETTE 9}TON$" + .string "{PALETTE 9}SOUND$" gSystemText_Frame:: @ 842C3E7 - .string "{PALETTE 9}RAHMEN$" + .string "{PALETTE 9}FRAME$" gSystemText_Cancel:: @ 842C3F0 - .string "{PALETTE 9}ZURÜCK$" + .string "{PALETTE 9}CANCEL$" gSystemText_ButtonMode:: @ 842C3FA - .string "{PALETTE 9}KNOPFBELEGUNG$" + .string "{PALETTE 9}BUTTON MODE$" gSystemText_Slow:: @ 842C409 - .string "{PALETTE 15}1$" + .string "{PALETTE 15}SLOW$" gSystemText_Mid:: @ 842C411 - .string "{PALETTE 15}2$" + .string "{PALETTE 15}MID$" gSystemText_Fast:: @ 842C418 - .string "{PALETTE 15}3$" + .string "{PALETTE 15}FAST$" gSystemText_On:: @ 842C420 - .string "{PALETTE 15}EIN$" + .string "{PALETTE 15}ON$" gSystemText_Off:: @ 842C426 - .string "{PALETTE 15}AUS$" + .string "{PALETTE 15}OFF$" gSystemText_Shift:: @ 842C42D - .string "{PALETTE 15}WECHSEL$" + .string "{PALETTE 15}SHIFT$" gSystemText_Set:: @ 842C436 - .string "{PALETTE 15}FOLGE$" + .string "{PALETTE 15}SET$" gSystemText_Mono:: @ 842C43D .string "{PALETTE 15}MONO$" @@ -77,7 +71,7 @@ gSystemText_Stereo:: @ 842C445 .string "{PALETTE 15}STEREO$" gSystemText_Type:: @ 842C44F - .string "{PALETTE 15}MOTIV $" + .string "{PALETTE 15}TYPE$" gSystemText_Terminator:: @ 842C457 .string "{PALETTE 8}$" @@ -86,7 +80,7 @@ gSystemText_Normal:: @ 842C45B .string "{PALETTE 15}NORMAL$" gSystemText_LR:: @ 842C465 - .string "{PALETTE 15}L/R$" + .string "{PALETTE 15}LR$" gSystemText_LA:: @ 842C46B .string "{PALETTE 15}L=A$" @@ -96,111 +90,100 @@ SystemText_Pokedex:: SystemText_Pokemon:: .string "POKéMON$" SystemText_BAG:: - .string "BEUTEL$" + .string "BAG$" SystemText_Pokenav:: .string "POKéNAV$" SystemText_Player:: .string "{PLAYER}$" SystemText_Save:: - .string "SICHERN$" + .string "SAVE$" SystemText_Option:: - .string "OPTION.$" + .string "OPTION$" SystemText_Exit:: - .string "BEENDEN$" + .string "EXIT$" SystemText_Retire:: @ safari zone? - .string "SCHLUSS$" + .string "RETIRE$" gOtherText_SafariStock:: @ 842C4A9 - .string "SAFARIBÄLLE\n" - .string "Vorrat: {STR_VAR_1}$" + .string "SAFARI BALLS\nStock: {STR_VAR_1}$" gSystemText_LinkStandby:: @ 842C4C0 - .string "Verbindung...\n" - .string "... ... B-Knopf: Abbrechen$" + .string "Link standby...\n... ... B Button: Cancel$" gSystemText_LoadEventPressA:: @ 842C4E9 - .string "Lade Geschehen mit A-Knopf.\n" - .string "... ... B-Knopf: Abbrechen$" + .string "Press the A Button to load event.\n... ... B Button: Cancel$" gSystemText_LoadingEvent:: @ 842C524 - .string "Geschehen wird geladen.$" + .string "Loading event...$" gSystemText_DontCutLink:: @ 842C535 - .string "Verbindungskabel nicht entfernen!\n" - .string "Die Geräte nicht ausschalten!$" + .string "Don’t remove the Game Link cable.\nDon’t turn off the power.$" gSystemText_EventLoadSuccess:: @ 842C571 - .string "Geschehen ist erfolgreich geladen.$$" + .string "The event was safely loaded.$$" gSystemText_LoadingError:: @ 842C58F - .string "Fehler beim Laden!\n" - .string "Vorgang wird abgebrochen.$$$$$$$$" + .string "Loading error.\nEnding session.$$$$$$$$" gOtherText_Hoenn:: @ 842C5B5 .string "HOENN$" gOtherText_OhABite:: @ 842C5BB - .string "Oh! Da hat etwas angebissen!$" + .string "Oh! A bite!$" gOtherText_PokeOnHook:: @ 842C5C7 - .string "Du hast ein POKéMON am Haken!{PAUSE_UNTIL_PRESS}$" + .string "A POKéMON’s on the hook!{PAUSE_UNTIL_PRESS}$" gOtherText_NotEvenANibble:: @ 842C5E2 - .string "Nicht mal ein klitzekleines Knabbern...{PAUSE_UNTIL_PRESS}$" + .string "Not even a nibble...{PAUSE_UNTIL_PRESS}$" gOtherText_ItGotAway:: @ 842C5F9 - .string "Es ist entkommen...{PAUSE_UNTIL_PRESS}$$" + .string "It got away...{PAUSE_UNTIL_PRESS}$$" gTradeText_WillBeSent:: @ 842C60B - .string "{STR_VAR_2} wird {STR_VAR_1} zugesandt.$" + .string "{STR_VAR_2} will be sent to {STR_VAR_1}.$" gTradeText_ByeBye:: @ 842C622 - .string "Tschüss, {STR_VAR_2}!$" + .string "Bye-bye, {STR_VAR_2}!$" gTradeText_SentOverPoke:: @ 842C62F - .string "{STR_VAR_1} versandte {STR_VAR_3}.$" + .string "{STR_VAR_1} sent over {STR_VAR_3}.$" gTradeText_TakeGoodCare:: @ 842C640 - .string "Kümmere dich gut um {STR_VAR_3}!$" + .string "Take good care of {STR_VAR_3}!$" TradeText_Cancel:: - .string "ZUR.$" + .string "CANCEL$" TradeText_ChoosePoke:: - .string "Wähle ein POKéMON.$" + .string "Choose a POKéMON.$" TradeText_Summary1:: - .string "BERICHT$" + .string "SUMMARY$" TradeText_Trade1:: - .string "TAUSCH$" + .string "TRADE$" TradeText_CancelTradePrompt:: - .string "Tausch abbrechen?$" + .string "Cancel trade?$" TradeText_PressBToExit:: - .string "Mit B-Knopf beenden.$" + .string "Press the B Button to exit.$" TradeText_Summary2:: - .string "BERICHT$" + .string "SUMMARY$" TradeText_Trade2:: - .string "TAUSCH$" + .string "TRADE$" TradeText_LinkStandby:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Verbindung...\n" - .string "Bitte warten...$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Link standby...\nPlease wait.$" TradeText_TradeCancelled:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Der Tausch\n" - .string "wurde abgebrochen.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$" TradeText_OnlyPoke:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Das ist das einzige\n" - .string "POKéMON zum Kampf.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}That’s your only\nPOKéMON for battle.$" TradeText_NonTradablePoke:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Dein Freund kann\n" - .string "das nicht senden.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Your friend can’t\ntrade that one.$" TradeText_WaitingForFriend:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Dein Freund ist\n" - .string "noch nicht fertig...$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Waiting for your\nfriend to finish...$" TradeText_WantToTrade:: - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Dein Freund möchte\n" - .string "POKéMON tauschen.$" + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}Your friend wants\nto trade POKéMON.$" .string "$" gTradeText_TradeOkayPrompt:: @ 842C7B6 - .string "Ist der Tausch O.K.?$" + .string "Is this trade okay?$" gOtherText_Terminator2:: @ 842C7CA .string "$" @@ -208,7 +191,7 @@ gOtherText_Terminator2:: @ 842C7CA gOtherText_ControlAndMiscText:: @ 842C7CB .string "\n$" .string "/$" - .string "Lv.$" + .string "Lv$" .string "---$" gOtherText_FourQuestions:: @ 842C7D6 @@ -221,81 +204,79 @@ gOtherText_ThreeQuestions:: @ 842C890 .string "???$" gOtherText_From:: @ 842C894 - .string "Von $" + .string "From $" gOtherText_MixingRecordsWithFriend:: @ 842C89A - .string "Rekorddaten-Austausch...$" + .string "Mixing records...$" gOtherText_MixingComplete:: @ 842C8AC - .string "Rekorddaten-Austausch beendet.\n" - .string "Vielen Dank für deine Geduld.$" + .string "Record mixing completed.\nThank you for waiting.$" gOtherText_TrainersTrainerCard:: @ 842C8DC - .string "TRAINERPASS von {PLAYER}$" + .string "’s TRAINER CARD$" gOtherText_FirstHOF:: @ 842C8EC - .string "ERSTE RUHMESHALLE:$" + .string "FIRST HALL OF FAME$" gOtherText_LinkCableBattles:: @ 842C8FF - .string "KÄMPFE GG. FREUND/E S.: N.:$" + .string "LINK CABLE BATTLES W/ L/$" gOtherText_BattleTowerWinRecord:: @ 842C924 - .string "DUELLTURM-S.:{CLEAR_TO 114}&{CLEAR_TO 152} IN FOLGE$" + .string "BATTLE TOWER W/{CLEAR_TO 0x72}&{CLEAR_TO 0x98}STRAIGHT$" gOtherText_ContestRecord:: @ 842C943 - .string "WETTB. MIT FREUND/EN S.:$" + .string "CONTESTS W/FRIENDS W/$" gOtherText_MixingRecord:: @ 842C959 - .string "{POKEBLOCK} MIT FREUND/EN:$" + .string "{POKEBLOCK}S W/FRIENDS$" gOtherText_TradeRecord:: @ 842C96A - .string "POKéMON-TAUSCH:$" + .string "POKéMON TRADES$" gOtherText_Boy:: @ 842C979 - .string "JUNGE$" + .string "BOY$" gOtherText_Girl:: @ 842C97D - .string "MÄDEL$" + .string "GIRL$" .string "$" gOtherText_Player:: @ 842C983 - .string "SPIELER$" + .string "PLAYER$" gOtherText_Badges:: @ 842C98A - .string "ORDEN$" + .string "BADGES$" .string "$" gOtherText_Pokedex:: @ 842C992 .string "POKéDEX$" gOtherText_PlayTime:: @ 842C99A - .string "SPIELZEIT$" + .string "PLAY TIME$" gOtherText_SentToPC:: @ 842C9A4 - .string "{STR_VAR_1} wurde auf\n" - .string "den PC übertragen.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} was sent to\nthe PC.{PAUSE_UNTIL_PRESS}$" OtherText_YourName:: - .string "DEIN NAME?$" + .string "YOUR NAME?$" OtherText_BoxName:: - .string "NAME DER BOX?$" + .string "BOX NAME?$" OtherText_PokeName:: - .string "Kosename f. {STR_VAR_1}$" + .string "{STR_VAR_1}’s nickname?$" gOtherText_Marco:: @ 842C9E1 .string "MARCO$" @ polo gOtherText_Coins:: @ 842C9E7 - .string "{STR_VAR_1} MÜNZ.$" + .string "{STR_VAR_1} COINS$" gOtherText_BattleResults:: @ 842C9F0 - .string "KAMPFERGEBNISSE von {PLAYER}$" + .string "{PLAYER}’s BATTLE RESULTS$" gOtherText_WinRecord:: @ 842CA04 - .string "GESAMT-REKORD S.:{STR_VAR_1} N.:{STR_VAR_2} P.:{STR_VAR_3}$" + .string "TOTAL RECORD W/{STR_VAR_1} L/{STR_VAR_2} D/{STR_VAR_3}$" gOtherText_WinLoseDraw:: @ 842CA20 - .string "SIEG NIEDER. PATT$" + .string "WIN LOSE DRAW$" gOtherText_SevenDashes:: @ 842CA3C .string "-------$" @@ -304,318 +285,270 @@ gOtherText_FourDashes:: @ 842CA44 .string "----$" gOtherText_BattleTowerResults:: @ 842CA49 - .string "DUELLTURM-ERGEBNIS. von {PLAYER}$" + .string "{PLAYER}’s BATTLE TOWER RESULTS$" gOtherText_Lv50:: @ 842CA63 - .string "Lv. 50$" + .string "LV 50$" gOtherText_Lv100:: @ 842CA69 - .string "Lv. 100$" + .string "LV 100$" gOtherText_WinStreak:: @ 842CA70 - .string "{STR_VAR_1}S IN FOLGE$" + .string "{STR_VAR_1}W STREAK$" gOtherText_Current:: @ 842CA7B - .string "MOMENTAN$" + .string "CURRENT$" gOtherText_Record:: @ 842CA83 - .string "REKORD$" + .string "RECORD$" gOtherText_Prev:: @ 842CA8A - .string "VORHER$" + .string "PREV.$" gOtherText_QuitGamePrompt:: @ 842CA90 - .string "Spiel beenden?$" + .string "Quit the game?$" gOtherText_MaxCoins:: @ 842CA9F - .string "Du hast 9.999 MÜNZEN.$" + .string "You’ve got 9,999 COINS.$" gOtherText_OutOfCoins:: @ 842CAB7 - .string "Du hast keine MÜNZEN mehr.\n" - .string "Game over!$" + .string "You’ve run out of COINS.\nGame over!$" gOtherText_DontHaveThreeCoins:: @ 842CADB - .string "Du hast keine drei MÜNZEN.$" + .string "You don’t have three COINS.$" gOtherText_ReelTime:: @ 842CAF7 - .string "REEL TIME\n" - .string "Hier hast du die Chance, in\n" - .string "Blitzesschnelle zu gewinnen!\n" - .string "Die Glücksrunde wiederholt\n" - .string "sich, so oft die Zahl anzeigt.\n" - .string "Sie endet mit einem BIG BONUS!$" + .string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nThe Reel Time continues for\nas often as the drawn number.\nIt all ends on a Big Bonus.$" DaycareText_GetAlongVeryWell:: - .string "Die beiden scheinen sich sehr zu mögen.$" + .string "The two seem to get along very well.$" DaycareText_GetAlong:: - .string "Die beiden scheinen sich zu vertragen.$" + .string "The two seem to get along.$" DaycareText_DontLikeOther:: - .string "Die beiden mögen sich nicht sehr.$" + .string "The two don’t seem to like each other.$" DaycareText_PlayOther:: - .string "Die beiden spielen lieber mit anderen\n" - .string "POKéMON als miteinander.$" + .string "The two prefer to play with other\nPOKéMON than each other.$" gOtherText_NewLine2:: @ 842CC28 .string "\n$" gOtherText_CancelAndLv:: @ 842CC2A - .string "KEINES$" - .string "Lv.$" + .string "CANCEL$" + .string "LV$" gEggNickname:: @ 842CC34 - .string "EI$" + .string "EGG$" gOtherText_HatchedFromEgg:: @ 842CC38 - .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}{STR_VAR_1} schlüpfte aus dem EI!$" + .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}{STR_VAR_1} hatched from the EGG!$" gOtherText_NickHatchPrompt:: @ 842CC5A - .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}Möchtest du dem geschlüpften\n" - .string "{STR_VAR_1} einen Kosenamen geben?$" + .string "{COLOR WHITE2}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}Would you like to nickname the newly\nhatched {STR_VAR_1}?$" OtherText_Battle:: - .string "KAMPF$" + .string "BATTLE$" OtherText_Contest:: - .string "WETTB.$" + .string "CONTEST$" OtherText_Type:: - .string "TYP/$" + .string "TYPE/$" OtherText_PP:: - .string "AP/$" + .string "PP/$" OtherText_Power:: - .string "STÄRKE$" + .string "POWER$" OtherText_Accuracy:: - .string "GENAU.$" + .string "ACCURACY$" OtherText_Appeal:: - .string "AUSDRUCK$" + .string "APPEAL$" OtherText_Jam:: - .string "EINDRUCK$" + .string "JAM$" gOtherText_TeachWhichMove:: @ 842CCC7 - .string "{STR_VAR_1} welche Attacke beibr.?$" + .string "Teach which move to {STR_VAR_1}?$" gOtherText_TeachSpecificMove:: @ 842CCDF - .string "{STR_VAR_2} beibringen?$" + .string "Teach {STR_VAR_2}?$" gOtherText_PokeLearnedMove:: @ 842CCE9 - .string "{STR_VAR_1} erlernte {STR_VAR_2}.$" + .string "{STR_VAR_1} learned {STR_VAR_2}.$" gOtherText_DeleteOlderMove:: @ 842CCF8 - .string "{STR_VAR_1} versucht,\n" - .string "{STR_VAR_2} zu erlernen.\p" - .string "Aber {STR_VAR_1} kann nicht mehr\n" - .string "als vier Attacken erlernen.\p" - .string "Soll eine Attacke zu Gunsten von\n" - .string "{STR_VAR_2} vergessen werden?$" + .string "{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can’t learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?$" gOtherText_StopLearningMove:: @ 842CD65 - .string "{STR_VAR_2} nicht erlernen?$" + .string "Stop learning {STR_VAR_2}?$" gOtherText_ForgotMove123:: @ 842CD77 - .string "{PAUSE 32}1, {PAUSE 15}2 {PAUSE 15}...{PAUSE 15}...{PAUSE 15}...{PAUSE 15} {PLAY_SE 0x38 0x00} Schwupp!\p$" - -deuOtherText_ForgotAndLearned:: @ 843912f - .string "{STR_VAR_1} vergaß {STR_VAR_3}.\p" - .string "Und...\p" - .string "{STR_VAR_1} erlernt {STR_VAR_2}.$" + .string "{PAUSE 32}1, {PAUSE 15}2 {PAUSE 15}...{PAUSE 15}...{PAUSE 15}...{PAUSE 15} {PLAY_SE 0x0038}Poof!\p$" gOtherText_ForgotOrDidNotLearnMove:: @ 842CDA3 - .string "{STR_VAR_1} hat {STR_VAR_2}\n" - .string "nicht erlernt.$" + .string "{STR_VAR_1} forgot {STR_VAR_3}.\pAnd...\p{STR_VAR_1} learned {STR_VAR_2}.$" + .string "{STR_VAR_1} did not learn\n{STR_VAR_2}.$" gOtherText_GiveUpTeachingMove:: @ 842CDDC - .string "Soll {STR_VAR_1} keine neue Attacke\n" - .string "erlernen?$" + .string "Give up trying to teach a new move\nto {STR_VAR_1}?$" gOtherText_WhichMoveToForget:: @ 842CE06 - .string "Welche Attacke soll vergessen\n" - .string "werden?\p" - .string "$" + .string "Which move should be forgotten?\p$" gSystemText_ClearAllSaveDataPrompt:: @ 842CE27 - .string "Alle gesich. Datenbereiche löschen?$" + .string "Clear all save data areas?$" gSystemText_ClearingData:: @ 842CE42 - .string "Daten werden gelöscht...\n" - .string "Bitte warten...$" + .string "Clearing data...\nPlease wait.$" gContestText_AnnounceResults:: @ 842CE60 - .string "Bekanntgabe der Ergebnisse!$" + .string "Announcing the results!$" gContestText_PreliminaryResults:: @ 842CE78 - .string "Ergebnisse 1. Durchlauf!$" + .string "The preliminary results!$" gContestText_Round2Results:: @ 842CE91 - .string "Ergebnisse 2. Durchlauf!$" + .string "Round 2 results!$" gContestText_PokeWon:: @ 842CEA2 - .string "Sieger ist: {STR_VAR_2} von {STR_VAR_1}!$" + .string "{STR_VAR_1}’s {STR_VAR_2} won!$" gOtherText_LinkStandby:: @ 842CEAF - .string "Verbindung...$" + .string "Link standby...$" @ 842CEBF .include "data/text/landmarks.inc" gOtherText_Terminator4:: @ 842D0E6 - .string ", $" + .string "$" gOtherText_Nature:: @ 842D0E7 - .string "Wesen: $" + .string " nature, $" gOtherText_Comma:: @ 842D0F1 .string ",$" gOtherText_Met:: @ 842D0F3 - .string " (gef.)$" + .string " (met).$" gOtherText_Egg2:: @ 842D0FB - .string " (EI)$" + .string " (EGG).$" gOtherText_ObtainedInTrade:: @ 842D103 - .string "im Tausch erhalten.$" + .string "obtained in a trade.$" gOtherText_FatefulEncounter:: @ 842D118 - .string "schicksalhafte Begegnung.$" + .string "fateful encounter.$" gOtherText_Met2:: @ 842D12B - .string " (gef.)$" + .string " (met).$" gOtherText_EggDayCare:: @ 842D133 - .string "Seltsames POKéMON-EI, das\n" - .string "die PENSIONSLEITUNG fand.$" + .string "An odd POKéMON EGG found\nby the DAY CARE couple.$" gOtherText_EggNicePlace:: @ 842D164 - .string "Kurioses POKéMON-EI an\n" - .string "hübschem Ort erhalten.$" + .string "A peculiar POKéMON EGG\nobtained at the nice place.$" gOtherText_EggObtainedInTrade:: @ 842D197 - .string "Kurioses POKéMON-EI im\n" - .string "Tausch erhalten.$" + .string "A peculiar POKéMON EGG\nobtained in a trade.$" gOtherText_EggHotSprings:: @ 842D1C3 - .string "Ein POKéMON-EI an den\n" - .string "Heißen Quellen erhalten.$" + .string "A POKéMON EGG obtained\nat the hot springs.$" gOtherText_LinkStandby2:: @ 842D1EE - .string "Verbindung...$" + .string "Link standby...$" gOtherText_YesNoAndPlayer:: @ 842D1FE - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}JA\n" - .string "NEIN$" - - .string "{HIGHLIGHT TRANSPARENT}SPIELER$" - + .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}YES\nNO$" + .string "{HIGHLIGHT TRANSPARENT}PLAYER$" .string "{HIGHLIGHT TRANSPARENT}$" gOtherText_HoennDex:: @ 842D21C .string "HOENN$" gOtherText_NationalDex:: @ 842D222 - .string "NATIONALER$" + .string "NATIONAL$" gOtherText_DiplomaCertificationGameFreak:: @ 842D22B - .string "{HIGHLIGHT TRANSPARENT}Spieler: {CLEAR 16}{COLOR RED}{PLAYER}\n" - .string "\n" - .string "{COLOR DARK_GREY}{STR_VAR_1} POKéDEX\n" - .string "Dies Dokument bescheinigt\n" - .string "die erfolgreiche Vervoll-\n" - .string "ständigung des POKéDEX.\n" - .string "\n" - .string "{CLEAR_TO 66}{COLOR RED}GAME FREAK$" - + .string "{HIGHLIGHT TRANSPARENT}Player: {CLEAR 0x10}{COLOR RED}{PLAYER}\n\n{COLOR DARK_GREY}{STR_VAR_1} POKéDEX\nThis document certifies\nthat you have successfully\ncompleted your POKéDEX.\n\n{CLEAR_TO 0x42}{COLOR RED}GAME FREAK$" .string "{COLOR RED}{HIGHLIGHT TRANSPARENT}GAME FREAK$" gOtherText_PLink:: @ 842D2BC - .string "{STR_VAR_1}SP-LINK$" + .string "{STR_VAR_1}P LINK$" gOtherText_YesNoTerminating:: @ 842D2C5 - .string "JA\n" - .string "NEIN$" - - .string "Abbruch$" + .string "YES\nNO$" + .string "Terminating.$" gOtherText_LinkNotFound:: @ 842D2D9 - .string "Kein(e) Link-Partner gefunden.\n" - .string "Bitte erneut versuchen.\p$" + .string "Link partner(s) not found.\nPlease try again.\p$" gOtherText_BlenderChooseBerry:: @ 842D307 - .string "BEERENMIXER wird gestartet.\p" - .string "Wähle die BEERE aus dem BEUTEL,\n" - .string "die in den BEERENMIXER soll.\p$" + .string "Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p$" gOtherText_PokeBlockMade:: @ 842D368 - .string "{STR_VAR_1} wurde gemixt!$" + .string " was made!$" gOtherText_PressAToStart:: @ 842D373 - .string "Drücke A-Knopf zum Starten.$" + .string "Press the A Button to start.$" gOtherText_PleaseWait:: @ 842D390 - .string "Bitte hab noch ein wenig Geduld.$" + .string "Please wait a while.$" gOtherText_LinkStandby3:: @ 842D3A5 - .string "Verbindung...$" + .string "Link standby...$" gOtherText_BlendAnotherBerryPrompt:: @ 842D3B5 - .string "Möchtest du noch eine BEERE mixen?$" + .string "Would you like to blend another BERRY?$" gOtherText_OutOfBerries:: @ 842D3DC - .string "Du hast keine BEEREN mehr zum\n" - .string "Mixen im BEERENMIXER.\p" - .string "$" + .string "You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p$" gOtherText_CaseIsFull:: @ 842D41A - .string "Deine {POKEBLOCK}-BOX ist voll.\p$" + .string "Your {POKEBLOCK} CASE is full.\p$" gOtherText_NoBerriesForBlend:: @ 842D434 - .string "{PLAYER} hat keine BEEREN\n" - .string "für den BEERENMIXER.$" + .string " has no BERRIES to put in\nthe BERRY BLENDER.$" gOtherText_OtherCaseIsFull:: @ 842D461 - .string "{POKEBLOCK}-BOX von {PLAYER} \n" - .string "ist voll.\n$" + .string "’s {POKEBLOCK} CASE is full.\p$" gOtherText_ResultsOfBlending:: @ 842D479 - .string "MIX-RESULTATE$" - - .string "VERW. BEERE$" + .string "RESULTS OF BLENDING$" + .string "BERRY USED$" gOtherText_Berry:: @ 842D498 - .string "{STR_VAR_1}BEERE$" + .string " BERRY$" gOtherText_RequiredTime:: @ 842D49F - .string "ZEIT BENÖTIGT$" + .string "REQUIRED TIME$" gOtherText_Min:: @ 842D4AD .string "MIN.$" gOtherText_Sec:: @ 842D4B2 - .string "SEK.$" + .string "SEC.$" gOtherText_MaxSpeed:: @ 842D4B7 - .string "MAXIMALTEMPO$" + .string "MAXIMUM SPEED$" gOtherText_RPM:: @ 842D4C5 - .string " RPM$" - - .string ",$" + .string "RPM$" + .string ".$" gOtherText_Ranking:: @ 842D4CB - .string "STUFE$" + .string "RANKING$" gOtherText_BlockLevelIs:: @ 842D4D3 - .string "Der Level ist $" + .string "The level is $" gOtherText_BlockFeelIs:: @ 842D4E1 - .string " und die Würze ist $" + .string ", and the feel is $" gOtherText_Period:: @ 842D4F4 .string ".$" gOtherText_Day:: @ 842D4F6 - .string "TAG$" + .string "DAY$" .string ":$" gOtherText_OK:: @ 842D4FC - .string "O.K.$" + .string "OK$" gOtherText_CorrectTimePrompt:: @ 842D4FF - .string "Ist die Uhrzeit korrekt?$" + .string "Is this the correct time?$" diff --git a/data/text/ability_descriptions.inc b/data/text/ability_descriptions.inc index ef3162a9a..a57225a50 100644 --- a/data/text/ability_descriptions.inc +++ b/data/text/ability_descriptions.inc @@ -1,236 +1,236 @@ gAbilityDescription_None: @ 81F99CC - .string "Keine Spezial-Fähigkeit.$" + .string "No special ability.$" gAbilityDescription_Stench: @ 81F99E0 - .string "Wehrt wilde POKéMON ab.$" + .string "Helps repel wild POKéMON.$" gAbilityDescription_Drizzle: @ 81F99FA - .string "Ruft im Kampf Regen herbei.$" + .string "Summons rain in battle.$" gAbilityDescription_SpeedBoost: @ 81F9A12 - .string "Erhöht INIT. nach und nach.$" + .string "Gradually boosts SPEED.$" gAbilityDescription_BattleArmor: @ 81F9A2A - .string "Wehrt Volltreffer ab.$" + .string "Blocks critical hits.$" gAbilityDescription_Sturdy: @ 81F9A40 - .string "Keine 1-Treffer-K.O.-Att.$" + .string "Negates 1-hit KO attacks.$" gAbilityDescription_Damp: @ 81F9A5A - .string "Gegen Selbstzerstörung.$" + .string "Prevents self-destruction.$" gAbilityDescription_Limber: @ 81F9A75 - .string "Verhindert Paralyse.$" + .string "Prevents paralysis.$" gAbilityDescription_SandVeil: @ 81F9A89 - .string "Erh. Fluchtw. i. Sandsturm.$" + .string "Ups evasion in a sandstorm.$" gAbilityDescription_Static: @ 81F9AA5 - .string "Paralysiert bei Berührung.$" + .string "Paralyzes on contact.$" gAbilityDescription_VoltAbsorb: @ 81F9ABB - .string "Wandelt Elektriz. in KP um.$" + .string "Turns electricity into HP.$" gAbilityDescription_WaterAbsorb: @ 81F9AD6 - .string "Wandelt Wasser in KP um.$" + .string "Changes water into HP.$" gAbilityDescription_Oblivious: @ 81F9AED - .string "Verhindert Anziehung.$" + .string "Prevents attraction.$" gAbilityDescription_CloudNine: @ 81F9B02 - .string "Keine Wetter-Effekte.$" + .string "Negates weather effects.$" gAbilityDescription_CompoundEyes: @ 81F9B1B - .string "Steigert Genauigkeit.$" + .string "Raises accuracy.$" gAbilityDescription_Insomnia: @ 81F9B2C - .string "Verhindert Einschlafen.$" + .string "Prevents sleep.$" gAbilityDescription_ColorChange: @ 81F9B3C - .string "Ändert Att.-Typ d. Gegners.$" + .string "Changes type to foe’s move.$" gAbilityDescription_Immunity: @ 81F9B58 - .string "Verhindert Vergiftungen.$" + .string "Prevents poisoning.$" gAbilityDescription_FlashFire: @ 81F9B6C - .string "Steigt, wenn v. Feuer getr.$" + .string "Powers up if hit by fire.$" gAbilityDescription_ShieldDust: @ 81F9B86 - .string "Gegen Zusatz-Effekte.$" + .string "Prevents added effects.$" gAbilityDescription_OwnTempo: @ 81F9B9E - .string "Verhindert Verwirrung.$" + .string "Prevents confusion.$" gAbilityDescription_SuctionCups: @ 81F9BB2 - .string "Verankert den Körper.$" + .string "Firmly anchors the body.$" gAbilityDescription_Intimidate: @ 81F9BCB - .string "Senkt ANGR. des Gegners.$" + .string "Lowers the foe’s ATTACK.$" gAbilityDescription_ShadowTag: @ 81F9BE4 - .string "Hindert Gegner an Flucht.$" + .string "Prevents the foe’s escape.$" gAbilityDescription_RoughSkin: @ 81F9BFF - .string "Verletzt bei Berührung.$" + .string "Hurts to touch.$" gAbilityDescription_WonderGuard: @ 81F9C0F - .string "Nur sehr eff. Treff. schad.$" + .string "“Super effective” hits.$" gAbilityDescription_Levitate: @ 81F9C27 - .string "Kein Treffer b. BODEN-Att.$" + .string "Not hit by GROUND attacks.$" gAbilityDescription_EffectSpore: @ 81F9C42 - .string "Gibt bei Kontakt Sporen ab.$" + .string "Leaves spores on contact.$" gAbilityDescription_Synchronize: @ 81F9C5C - .string "Gibt Stat.-Probleme weiter.$" + .string "Passes on status problems.$" gAbilityDescription_ClearBody: @ 81F9C77 - .string "Verhindert Fähigk.-Reduk.$" + .string "Prevents ability reduction.$" gAbilityDescription_NaturalCure: @ 81F9C93 - .string "Heilt bei Austausch.$" + .string "Heals upon switching out.$" gAbilityDescription_LightningRod: @ 81F9CAD - .string "Zieht Elektro-Attacken an.$" + .string "Draws electrical moves.$" gAbilityDescription_SereneGrace: @ 81F9CC5 - .string "Verstärkt Zusatz-Effekte.$" + .string "Promotes added effects.$" gAbilityDescription_SwiftSwim: @ 81F9CDD - .string "Steigert INIT. bei Regen.$" + .string "Raises SPEED in rain.$" gAbilityDescription_Chlorophyll: @ 81F9CF3 - .string "INIT. + bei Sonnenschein.$" + .string "Raises SPEED in sunshine.$" gAbilityDescription_Illuminate: @ 81F9D0D - .string "Mehr PKMN-Begegnungen.$" + .string "Encounter rate increases.$" gAbilityDescription_Trace: @ 81F9D27 - .string "Kopiert Spezial-Attacke.$" + .string "Copies special ability.$" gAbilityDescription_HugePower: @ 81F9D3F - .string "Steigert ANGR.$" + .string "Raises ATTACK.$" gAbilityDescription_PoisonPoint: @ 81F9D4E - .string "Vergiftet bei Berührung.$" + .string "Poisons foe on contact.$" gAbilityDescription_InnerFocus: @ 81F9D66 - .string "Verhindert Zurückschreck.$" + .string "Prevents flinching.$" gAbilityDescription_MagmaArmor: @ 81F9D7A - .string "Verhindert Einfrieren.$" + .string "Prevents freezing.$" gAbilityDescription_WaterVeil: @ 81F9D8D - .string "Verhindert Verbrennungen.$" + .string "Prevents burns.$" gAbilityDescription_MagnetPull: @ 81F9D9D - .string "Fängt STAHL-POKéMON.$" + .string "Traps STEEL-type POKéMON.$" gAbilityDescription_Soundproof: @ 81F9DB7 - .string "Immun gg. Lärm-Attacken.$" + .string "Avoids sound-based moves.$" gAbilityDescription_RainDish: @ 81F9DD1 - .string "KP-Anstieg bei Regen.$" + .string "Slight HP recovery in rain.$" gAbilityDescription_SandStream: @ 81F9DED - .string "Erzeugt einen Sandsturm.$" + .string "Summons a sandstorm.$" gAbilityDescription_Pressure: @ 81F9E02 - .string "Steigert AP des Gegners.$" + .string "Raises foe’s PP usage.$" gAbilityDescription_ThickFat: @ 81F9E19 - .string "Schutz vor Hitze und Kälte.$" + .string "Heat-and-cold protection.$" gAbilityDescription_EarlyBird: @ 81F9E33 - .string "Schnelles Aufwachen.$" + .string "Awakens quickly from sleep.$" gAbilityDescription_FlameBody: @ 81F9E4F - .string "Verbrennt bei Berührung.$" + .string "Burns the foe on contact.$" gAbilityDescription_RunAway: @ 81F9E69 - .string "Erleichtert das Entkommen.$" + .string "Makes escaping easier.$" gAbilityDescription_KeenEye: @ 81F9E80 - .string "Verhindert Verl. d. Genauig.$" + .string "Prevents loss of accuracy.$" gAbilityDescription_HyperCutter: @ 81F9E9B - .string "Verhindert ANGR.-Reduz.$" + .string "Prevents ATTACK reduction.$" gAbilityDescription_Pickup: @ 81F9EB6 - .string "Kann Objekte aufnehmen.$" + .string "May pick up items.$" gAbilityDescription_Truant: @ 81F9EC9 - .string "Greift in jedem 2. Zug an.$" + .string "Moves only every two turns.$" gAbilityDescription_Hustle: @ 81F9EE5 - .string "Tauscht Genauigk. u. Kraft.$" + .string "Trades accuracy for power.$" gAbilityDescription_CuteCharm: @ 81F9F00 - .string "Wirkt bei Kontakt betörend.$" + .string "Infatuates on contact.$" gAbilityDescription_Plus: @ 81F9F17 - .string "Bildet ein Team mit MINUN.$" + .string "Powers up with MINUS.$" gAbilityDescription_Minus: @ 81F9F2D - .string "Bildet ein Team mit PLUSLE.$" + .string "Powers up with PLUS.$" gAbilityDescription_Forecast: @ 81F9F42 - .string "Ist vom Wetter abhängig.$" + .string "Changes with the weather.$" gAbilityDescription_StickyHold: @ 81F9F5C - .string "Verhindert ITEM-Diebstahl.$" + .string "Prevents item theft.$" gAbilityDescription_ShedSkin: @ 81F9F71 - .string "Heilt durch Häutung.$" + .string "Heals the body by shedding.$" gAbilityDescription_Guts: @ 81F9F8D - .string "Steigert ANGR. bei Leiden.$" + .string "Ups ATTACK if suffering.$" gAbilityDescription_MarvelScale: @ 81F9FA6 - .string "Steigert VERT. bei Leiden.$" + .string "Ups DEFENSE if suffering.$" gAbilityDescription_LiquidOoze: @ 81F9FC0 - .string "Saug-Attacken schädigen.$" + .string "Draining causes injury.$" gAbilityDescription_Overgrow: @ 81F9FD8 - .string "Erhöht PFL.-Att. i. d. Not.$" + .string "Ups GRASS moves in a pinch.$" gAbilityDescription_Blaze: @ 81F9FF4 - .string "Erhöht FEUER-Att. in Not.$" + .string "Ups FIRE moves in a pinch.$" gAbilityDescription_Torrent: @ 81FA00F - .string "Erhöht WASSER-Att. in Not.$" + .string "Ups WATER moves in a pinch.$" gAbilityDescription_Swarm: @ 81FA02B - .string "Erhöht KÄFER-Att. in Not.$" + .string "Ups BUG moves in a pinch.$" gAbilityDescription_RockHead: @ 81FA045 - .string "Verh. Rückstoß-Schaden.$" + .string "Prevents recoil damage.$" gAbilityDescription_Drought: @ 81FA05D - .string "Erzeugt Sonne im Kampf.$" + .string "Summons sunlight in battle.$" gAbilityDescription_ArenaTrap: @ 81FA079 - .string "Verhindert Flucht.$" + .string "Prevents fleeing.$" gAbilityDescription_VitalSpirit: @ 81FA08B - .string "Verhindert Einschlafen.$" + .string "Prevents sleep.$" gAbilityDescription_WhiteSmoke: @ 81FA09B - .string "Verhindert Fähigk.-Reduz.$" + .string "Prevents ability reduction.$" gAbilityDescription_PurePower: @ 81FA0B7 - .string "Steigert ANGR.$" + .string "Raises ATTACK.$" gAbilityDescription_ShellArmor: @ 81FA0C6 - .string "Wehrt Volltreffer ab.$" + .string "Blocks critical hits.$" gAbilityDescription_Cacophony: @ 81FA0DC - .string "Immun gg. Lärm-Attacken.$" + .string "Avoids sound-based moves.$" gAbilityDescription_AirLock: @ 81FA0F6 - .string "Kehrt Wetter-Effekte um.$" + .string "Negates weather effects.$" .align 2 gAbilityDescriptions:: @ 81FA110 diff --git a/data/text/ability_names.inc b/data/text/ability_names.inc index 6ed9dd033..ec0265fda 100644 --- a/data/text/ability_names.inc +++ b/data/text/ability_names.inc @@ -1,79 +1,79 @@ gAbilityNames:: @ 81FA248 .string "-------$", 13 - .string "DUFTNOTE$", 13 - .string "NIESEL$", 13 - .string "TEMPOSCHUB$", 13 - .string "KAMPFPANZER$", 13 - .string "ROBUSTHEIT$", 13 - .string "FEUCHTIGKEIT$", 13 - .string "FLEXIBILITÄT$", 13 - .string "SANDSCHLEIER$", 13 - .string "STATIK$", 13 - .string "VOLTABSORBER$", 13 - .string "H2O-ABSORBER$", 13 - .string "DÖSIGKEIT$", 13 - .string "WOLKE SIEBEN$", 13 - .string "FACETTENAUGE$", 13 + .string "STENCH$", 13 + .string "DRIZZLE$", 13 + .string "SPEED BOOST$", 13 + .string "BATTLE ARMOR$", 13 + .string "STURDY$", 13 + .string "DAMP$", 13 + .string "LIMBER$", 13 + .string "SAND VEIL$", 13 + .string "STATIC$", 13 + .string "VOLT ABSORB$", 13 + .string "WATER ABSORB$", 13 + .string "OBLIVIOUS$", 13 + .string "CLOUD NINE$", 13 + .string "COMPOUNDEYES$", 13 .string "INSOMNIA$", 13 - .string "FARBWECHSEL$", 13 - .string "IMMUNITÄT$", 13 - .string "FEUERFÄNGER$", 13 - .string "PUDERABWEHR$", 13 - .string "TEMPOMACHER$", 13 - .string "SAUGNAPF$", 13 - .string "BEDROHER$", 13 - .string "WEGSPERRE$", 13 - .string "RAUHAUT$", 13 - .string "WUNDERWACHE$", 13 - .string "SCHWEBE$", 13 - .string "SPORENWIRT$", 13 - .string "SYNCHRO$", 13 - .string "NEUTRALTORSO$", 13 - .string "INNERE KRAFT$", 13 - .string "BLITZFÄNGER$", 13 - .string "EDELMUT$", 13 - .string "WASSERTEMPO$", 13 + .string "COLOR CHANGE$", 13 + .string "IMMUNITY$", 13 + .string "FLASH FIRE$", 13 + .string "SHIELD DUST$", 13 + .string "OWN TEMPO$", 13 + .string "SUCTION CUPS$", 13 + .string "INTIMIDATE$", 13 + .string "SHADOW TAG$", 13 + .string "ROUGH SKIN$", 13 + .string "WONDER GUARD$", 13 + .string "LEVITATE$", 13 + .string "EFFECT SPORE$", 13 + .string "SYNCHRONIZE$", 13 + .string "CLEAR BODY$", 13 + .string "NATURAL CURE$", 13 + .string "LIGHTNINGROD$", 13 + .string "SERENE GRACE$", 13 + .string "SWIFT SWIM$", 13 .string "CHLOROPHYLL$", 13 - .string "ERLEUCHTUNG$", 13 - .string "FÄHRTE$", 13 - .string "KRAFTKOLOSS$", 13 - .string "GIFTDORN$", 13 - .string "KONZENTRATOR$", 13 - .string "MAGMAPANZER$", 13 - .string "AQUAHÜLLE$", 13 - .string "MAGNETFALLE$", 13 - .string "LÄRMSCHUTZ$", 13 - .string "REGENGENUSS$", 13 - .string "SANDSTURM$", 13 - .string "ERZWINGER$", 13 - .string "SPECKSCHICHT$", 13 - .string "FRÜHWECKER$", 13 - .string "FLAMMKÖRPER$", 13 - .string "ANGSTHASE$", 13 - .string "ADLERAUGE$", 13 - .string "SCHERENMACHT$", 13 - .string "MITNAHME$", 13 - .string "SCHNARCHNASE$", 13 - .string "ÜBEREIFER$", 13 - .string "CHARMEBOLZEN$", 13 + .string "ILLUMINATE$", 13 + .string "TRACE$", 13 + .string "HUGE POWER$", 13 + .string "POISON POINT$", 13 + .string "INNER FOCUS$", 13 + .string "MAGMA ARMOR$", 13 + .string "WATER VEIL$", 13 + .string "MAGNET PULL$", 13 + .string "SOUNDPROOF$", 13 + .string "RAIN DISH$", 13 + .string "SAND STREAM$", 13 + .string "PRESSURE$", 13 + .string "THICK FAT$", 13 + .string "EARLY BIRD$", 13 + .string "FLAME BODY$", 13 + .string "RUN AWAY$", 13 + .string "KEEN EYE$", 13 + .string "HYPER CUTTER$", 13 + .string "PICKUP$", 13 + .string "TRUANT$", 13 + .string "HUSTLE$", 13 + .string "CUTE CHARM$", 13 .string "PLUS$", 13 .string "MINUS$", 13 - .string "PROGNOSE$", 13 - .string "WERTEHALTER$", 13 - .string "EXPIDERMIS$", 13 - .string "ADRENALIN$", 13 - .string "NOTSCHUTZ$", 13 - .string "KLOAKENSOSSE$", 13 - .string "NOTDÜNGER$", 13 - .string "GROSSBRAND$", 13 - .string "STURZBACH$", 13 - .string "HEXAPLAGA$", 13 - .string "STEINHAUPT$", 13 - .string "DÜRRE$", 13 - .string "AUSWEGSLOS$", 13 - .string "MUNTERKEIT$", 13 - .string "PULVERRAUCH$", 13 - .string "MENTALKRAFT$", 13 - .string "PANZERHAUT$", 13 - .string "KAKOPHONY$", 13 - .string "KLIMASCHUTZ$", 13 + .string "FORECAST$", 13 + .string "STICKY HOLD$", 13 + .string "SHED SKIN$", 13 + .string "GUTS$", 13 + .string "MARVEL SCALE$", 13 + .string "LIQUID OOZE$", 13 + .string "OVERGROW$", 13 + .string "BLAZE$", 13 + .string "TORRENT$", 13 + .string "SWARM$", 13 + .string "ROCK HEAD$", 13 + .string "DROUGHT$", 13 + .string "ARENA TRAP$", 13 + .string "VITAL SPIRIT$", 13 + .string "WHITE SMOKE$", 13 + .string "PURE POWER$", 13 + .string "SHELL ARMOR$", 13 + .string "CACOPHONY$", 13 + .string "AIR LOCK$", 13 diff --git a/data/text/aqua_awakening.inc b/data/text/aqua_awakening.inc index 4e69277ca..bfe2d1d01 100644 --- a/data/text/aqua_awakening.inc +++ b/data/text/aqua_awakening.inc @@ -1,100 +1,96 @@ UnknownString_81B41B8: @ 81B41B8 - .string "ADRIAN: Bleib sofort stehen!$" + .string "ARCHIE: Hold it right there.$" UnknownString_81B41D5: @ 81B41D5 - .string "ADRIAN: Hahahaha...\n" - .string "Du warst das also die ganze Zeit.$" + .string "ARCHIE: Fufufu...\n" + .string "So it was you, after all.$" UnknownString_81B4201: @ 81B4201 - .string "ADRIAN: Schau nur, schau nur!\p" - .string "Schau, wie schön die schlafende Gestalt\n" - .string "des antiken POKéMON KYOGRE ist!\p" - .string "Ich habe so lange auf diesen Tag\n" - .string "gewartet...$" + .string "ARCHIE: Behold!\p" + .string "See how beautiful it is, the sleeping\n" + .string "form of the ancient POKéMON KYOGRE!\p" + .string "I have waited so long for this day to\n" + .string "come...$" UnknownString_81B4289: @ 81B4289 - .string "ADRIAN: Es überrascht mich, wie du es\n" - .string "geschafft hast, mir zu folgen.\p" - .string "Aber das ist nun alles Nebensache.\p" - .string "Damit meine Träume wahr werden, musst\n" - .string "du leider verschwinden!$" + .string "ARCHIE: It surprises me, how you’ve\n" + .string "managed to chase me here.\p" + .string "But that’s all over now.\p" + .string "For the realization of my dream,\n" + .string "you must disappear now!$" UnknownString_81B4319: @ 81B4319 - .string "Ich...\n" - .string "Ich habe wieder verloren?$" + .string "I...\n" + .string "I lost again?$" UnknownString_81B432C: @ 81B432C - .string "ADRIAN: Hahahaha...\p" - .string "Ich empfehle mich. Ich muss sagen, du\n" - .string "bist wirklich sehr talentiert.\p" - .string "Aber!\n" - .string "Ich habe dieses hier in meinem Besitz!\p" - .string "Mit dieser ROTEN KUGEL kann ich\n" - .string "KYOGRE...$" + .string "ARCHIE: Fufufu...\p" + .string "I commend you. I must recognize that\n" + .string "you are truly gifted.\p" + .string "But!\n" + .string "I have this in my possession!\p" + .string "With this RED ORB, I can make KYOGRE...$" UnknownString_81B43C4: @ 81B43C4 - .string "Die ROTE KUGEL beginnt plötzlich von\n" - .string "innen heraus zu leuchten!$" + .string "The RED ORB suddenly began shining\n" + .string "by itself!$" UnknownString_81B43F2: @ 81B43F2 - .string "ADRIAN: Was?!?\p" - .string "Ich habe doch gar nichts gemacht.\n" - .string "Die ROTE KUGEL... Warum...\p" - .string "Wo ist KYOGRE geblieben?$" + .string "ARCHIE: What?!\p" + .string "I didn’t do anything.\n" + .string "Why did the RED ORB...\p" + .string "Where did KYOGRE go?$" UnknownString_81B4443: @ 81B4443 - .string "ADRIAN: Hm? Dies ist eine Nachricht\n" - .string "unserer Mitglieder draußen...$" + .string "ARCHIE: Hm? It’s a message from our\n" + .string "members outside...$" UnknownString_81B447A: @ 81B447A - .string "ADRIAN: Ja, was ist denn jetzt los?\p" + .string "ARCHIE: Yes, what is it?\p" .string "Hm...\n" - .string "Es regnet? So heftig?\p" - .string "Gut... Genau darauf habe ich gewartet.\n" - .string "Deshalb haben wir KYOGRE erweckt.\l" - .string "Um TEAM AQUAS Vision von der Erweite-\l" - .string "rung der Meere zu realisieren.\p" - .string "Was?!?\p" - .string "Es regnet stärker, als wir es voraus-\n" - .string "gesagt haben? Wir sind in Gefahr?\p" - .string "Das kann nicht sein...\n" - .string "Das ist unmöglich...\p" - .string "Bleib wo du bist und behalte die\n" - .string "Situation im Auge!$" + .string "It’s raining heavily?\p" + .string "Good... That should have happened.\n" + .string "That is why we awakened KYOGRE,\l" + .string "to realize TEAM AQUA’s vision of\l" + .string "expanding the sea.\p" + .string "What?!\p" + .string "It’s raining far harder than we\n" + .string "envisioned? You’re in danger?\p" + .string "That can’t be...\n" + .string "That’s just not possible...\p" + .string "Hold your position and monitor the\n" + .string "situation!$" UnknownString_81B45C6: @ 81B45C6 - .string "ADRIAN: Irgendetwas stimmt da ganz und\n" - .string "gar nicht...\p" - .string "Die ROTE KUGEL sollte KYOGRE auf-\n" - .string "wecken und unter Kontrolle halten...\p" - .string "Aber... Warum?\n" - .string "Warum ist KYOGRE verschwunden?\p" - .string "Warum?!?$" + .string "ARCHIE: There’s something wrong...\p" + .string "The RED ORB is supposed to awaken\n" + .string "and control KYOGRE...\p" + .string "But... Why?\n" + .string "Why did KYOGRE disappear?\p" + .string "Why?!$" UnknownString_81B464D: @ 81B464D - .string "MARC: Was hast du da nur herauf-\n" - .string "beschworen?\p" - .string "ADRIAN... Du hast KYOGRE aufge-\n" - .string "weckt, stimmt’s?\p" - .string "Was wird nur aus der Welt, wenn es\n" - .string "bis in alle Ewigkeit regnen wird?\p" - .string "Das Land wird untergehen und im\n" - .string "Meer verschwinden...$" + .string "MAXIE: What have you wrought?\p" + .string "ARCHIE... You’ve finally awoken KYOGRE,\n" + .string "haven’t you?\p" + .string "What will happen to the world if this\n" + .string "downpour continues for all eternity?\p" + .string "The world’s landmass will drown in\n" + .string "the deepening sea...$" UnknownString_81B4723: @ 81B4723 - .string "ADRIAN: Was sagst du da?\p" - .string "Die ROTE KUGEL sollte mir die Kontrolle\n" - .string "über KYOGRE verschaffen...\l" - .string "Das kann einfach nicht wahr sein...$" + .string "ARCHIE: What are you saying?\p" + .string "The RED ORB should let me control\n" + .string "KYOGRE...\l" + .string "That can’t be possible...$" UnknownString_81B4786: @ 81B4786 - .string "MARC: Wir haben keine Zeit für\n" - .string "Diskussionen!\p" - .string "Geh nach draußen und sieh es dir\n" - .string "selber an!\p" - .string "Sieh, ob das, was du heraufbeschworen\n" - .string "hast, das ist, was du wolltest!$" + .string "MAXIE: We don’t have the time to\n" + .string "argue about it here!\p" + .string "Get outside and see for yourself!\p" + .string "See if what you’ve wrought is the\n" + .string "world that you desired!$" UnknownString_81B4818: @ 81B4818 - .string "MARC: {PLAYER}{KUN}, komm, du musst\n" - .string "ebenfalls von hier verschwinden!$" + .string "MAXIE: {PLAYER}{KUN}, come on, you have\n" + .string "to get out of here, too!$" diff --git a/data/text/aqua_chimney.inc b/data/text/aqua_chimney.inc index 1d7e39f81..2c8d94a0b 100644 --- a/data/text/aqua_chimney.inc +++ b/data/text/aqua_chimney.inc @@ -1,145 +1,142 @@ MtChimney_Text_1B2DEE:: @ 81B2DEE - .string "Die Kraft, die in diesem METEORITEN\n" - .string "steckt...\p" - .string "Wenn man diese Kraft mit dieser\n" - .string "Maschine verstärkt, kann man die\l" - .string "Aktivität des SCHLOTBERGs stoppen.\p" - .string "Hahaha... Und dann füllt sich der ausge-\n" - .string "kühlte Krater mit Regenwasser und gibt\l" - .string "den WASSER-POKéMON Lebensraum.$" + .string "The power contained in the\n" + .string "METEORITE...\p" + .string "By amplifying its power with this\n" + .string "machine, MT. CHIMNEY’s volcanic activity\l" + .string "will stop.\p" + .string "Fufufu... Eventually, the cooled-down\n" + .string "crater will fill with rainwater, giving\l" + .string "WATER POKéMON a place to live.$" MtChimney_Text_1B2ED9:: @ 81B2ED9 - .string "ADRIAN: Du schon wieder...\p" - .string "Hör gut zu.\n" - .string "Das Meer bringt alles Leben hervor.\p" - .string "Wasser bedeutet Leben!\n" - .string "Es besitzt absolute Priorität!\p" - .string "Daher widmet sich TEAM AQUA der Auf-\n" - .string "gabe, die Meere zu vergrößern.\p" - .string "So können sich neue POKéMON-Arten\n" - .string "entwickeln.\p" - .string "Wir wollen die Welt zum Wohle der\n" - .string "POKéMON umgestalten.\p" - .string "Das ist die große Vision von TEAM AQUA!\p" - .string "Ich kann einem sturen Kind wie dir nicht\n" - .string "erlauben, sich uns in den Weg zu stellen.\p" - .string "Ich, ADRIAN, werde dir zeigen, was\n" - .string "passiert, wenn du uns aufhalten willst!$" + .string "ARCHIE: You again...\p" + .string "Now listen.\n" + .string "All life depends on the sea.\p" + .string "The sea is everything!\n" + .string "Its importance is paramount!\p" + .string "That is why we of TEAM AQUA are\n" + .string "committed to expanding the sea.\p" + .string "Doing so will result in the emergence\n" + .string "of new POKéMON species.\p" + .string "We will return the world back to\n" + .string "nature for the good of POKéMON.\p" + .string "That is TEAM AQUA’s vision!\p" + .string "I can’t allow an ignorant child like\n" + .string "you to get in our way.\p" + .string "I, ARCHIE, will show you the\n" + .string "consequences of meddling!$" MtChimney_Text_1B3099:: @ 81B3099 - .string "Wie bitte?!?\p" - .string "Ich, ADRIAN, wurde ganz hinterhältig\n" - .string "besiegt?!?$" + .string "What?!\p" + .string "I, ARCHIE, was caught off guard?!$" MtChimney_Text_1B30C2:: @ 81B30C2 - .string "ADRIAN: Ach, was soll’s.\n" - .string "Ich werde für heute meine Pläne am\l" - .string "SCHLOTBERG vergessen. Für heute!\p" - .string "Niemand wird uns jemals stoppen!\n" - .string "TEAM AQUA wird siegen!!!\p" - .string "Vergiss das nicht!!!$" + .string "ARCHIE: Ah, whatever.\n" + .string "I will give up our plans for MT.\l" + .string "CHIMNEY for the time being...\p" + .string "But no one can ever stop us!\n" + .string "TEAM AQUA will prevail!\p" + .string "Don’t you ever forget that!$" MtChimney_Text_1B3168:: @ 81B3168 - .string "Hahahaha!\p" - .string "Hast du dich den ganzen Weg hier\n" - .string "heraufgequält?\p" - .string "So ein Jammer. Du kommst zu spät.\n" - .string "Ich habe den METEORITEN aus METEOR-\l" - .string "FÄLLE bereits unserem BOSS gegeben!$" + .string "Hehehe!\p" + .string "So you’ve come all the way here!\p" + .string "But you’re too late!\n" + .string "I’ve already delivered the METEORITE\l" + .string "from METEOR FALLS to the BOSS!$" MtChimney_Text_1B31EA:: @ 81B31EA - .string "Hahaha...\n" - .string "Da habe ich wohl verloren...\p" - .string "Gut, dass ich dich nicht schon in\n" - .string "METEORFÄLLE herausgefordert habe.$" + .string "Hehehe...\n" + .string "So I lost...\p" + .string "I’m sure glad I never took you on back\n" + .string "at METEOR FALLS.$" MtChimney_Text_1B3239:: @ 81B3239 - .string "Hahaha!\p" - .string "Du hast mich besiegt, aber gegen\n" - .string "unseren BOSS hast du keine Chance!\p" - .string "Wenn du dich jetzt leise aus dem Staub\n" - .string "machst, vermeidest du jede Menge Ärger.$" + .string "Hehehe!\p" + .string "You might have beaten me, but you don’t\n" + .string "stand a chance against the BOSS!\p" + .string "If you get lost now, you won’t have to\n" + .string "face a sound whipping!$" MtChimney_Text_1B32C8:: @ 81B32C8 - .string "Wir vom TEAM AQUA setzen unsere\n" - .string "Energie zum Wohle aller ein.\p" - .string "Wenn es mehr Wasser gibt, sind die\n" - .string "WASSER-POKéMON glücklicher und die\l" - .string "Menschen hätten mehr Platz zum\l" - .string "Schwimmen.$" + .string "We of TEAM AQUA are working hard for\n" + .string "everyone’s sake.\p" + .string "Like, if there’s more water around,\n" + .string "WATER POKéMON will be happy, and it’ll\l" + .string "give people more fun places to swim!$" MtChimney_Text_1B336E:: @ 81B336E - .string "Bitte?\n" - .string "Was heißt das? Ich habe verloren?$" + .string "Hunh?\n" + .string "What do you mean I lost?$" MtChimney_Text_1B338D:: @ 81B338D - .string "Unser BOSS sagt: “So wird jeder\n" - .string "glücklich sein...”\p" - .string "Aber warum versucht dann jeder, uns\n" - .string "aufzuhalten?$" + .string "Our BOSS says, “It will make everyone\n" + .string "happy.”\p" + .string "But why does everyone keep getting\n" + .string "in our way?$" MtChimney_Text_1B33EA:: @ 81B33EA - .string "Dieses nervtötende TEAM MAGMA! Jedes\n" - .string "Mal versuchen sie, uns zu stoppen!$" + .string "That annoying TEAM MAGMA...\n" + .string "They always mess with our plans!$" MtChimney_Text_1B3427:: @ 81B3427 - .string "METEORITEN stecken voller Energie.$" + .string "METEORITES pack amazing power!$" MtChimney_Text_1B3446:: @ 81B3446 - .string "Los! Stampfen wir TEAM MAGMA in den\n" - .string "Boden! Und vergrößern die Meere!$" + .string "Go! Stomp TEAM MAGMA!\n" + .string "And expand the sea!$" MtChimney_Text_1B3470:: @ 81B3470 - .string "Komm uns nicht in die Quere, okay?\p" - .string "Wir versuchen, das Meer zum Wohle aller\n" - .string "zu vergrößern!$" + .string "Stay out of our way, okay?\p" + .string "We’re trying to enlarge the sea for\n" + .string "the good of everybody!$" MtChimney_Text_1B34C6:: @ 81B34C6 .string "Yeah!\n" - .string "Jeder wird nass!$" + .string "Hose them down!$" MtChimney_Text_1B34DC:: @ 81B34DC - .string "Wir werden die Meere vergrößern.$" + .string "We’re going to keep expanding the sea!$" MtChimney_Text_1B3503:: @ 81B3503 .string "Bushaa!$" MtChimney_Text_1B350B:: @ 81B350B - .string "MARC: Oh, {PLAYER}{KUN}!\p" - .string "Bitte, halte TEAM AQUA für mich auf!\p" - .string "Sie versuchen, mit der Kraft des\n" - .string "gestohlenen METEORITEN den Vulkan\l" - .string "zu inaktivieren!$" + .string "MAXIE: Oh, {PLAYER}{KUN}!\p" + .string "Please, you must stop TEAM AQUA\n" + .string "for me!\p" + .string "They’re trying to make this volcano\n" + .string "inactive by using the stolen\l" + .string "METEORITE’s power!$" MtChimney_Text_1B3598:: @ 81B3598 - .string "MARC: Oh, {PLAYER}{KUN}!\p" - .string "Bitte, halte TEAM AQUA für mich auf!\p" - .string "Diese drei Schurken sind selbst für mich\n" - .string "eine harte Nuss!$" + .string "MAXIE: {PLAYER}{KUN}!\p" + .string "Please, you’ve got to stop TEAM AQUA\n" + .string "for me!\p" + .string "Dealing with these three thugs is\n" + .string "a lot, even for me!$" MtChimney_Text_1B3608:: @ 81B3608 - .string "MARC: {PLAYER}{KUN}!\p" - .string "Mit deiner Hilfe konnte ich die Pläne\n" - .string "von TEAM AQUA durchkreuzen!\p" - .string "Aber... Dieser Sieg bedeutet nicht, dass\n" - .string "sie ihre üblen Pläne aufgeben werden.\p" - .string "Wir werden ein wachsames Auge auf TEAM\n" - .string "AQUA haben und sie weiter verfolgen.\p" - .string "{PLAYER}{KUN}, wir werden uns wieder sehen!$" + .string "MAXIE: {PLAYER}{KUN}! Thank you!\p" + .string "With your help, we thwarted TEAM\n" + .string "AQUA’s destructive plan!\p" + .string "But... This victory doesn’t mean the\n" + .string "end of their evil plans.\p" + .string "We will remain vigilant and keep up\n" + .string "our pursuit of TEAM AQUA.\p" + .string "{PLAYER}{KUN}, we shall meet again!$" MtChimney_Text_1B36F1:: @ 81B36F1 - .string "Mist... TEAM AQUA ist uns zahlenmäßig\n" - .string "überlegen! Wir können es nicht mit ihnen\l" - .string "aufnehmen!$" + .string "Darn... TEAM AQUA outnumbers us!\n" + .string "We can’t keep up with them!$" MtChimney_Text_1B372E:: @ 81B372E - .string "Wenn sie die Meere vergrößern, gibt es\n" - .string "weniger Lebensraum für POKéMON und\l" - .string "Menschen!$" + .string "If they expand the sea, there’ll be less\n" + .string "habitats for POKéMON and people!$" MtChimney_Text_1B3778:: @ 81B3778 - .string "TEAM AQUA versucht, die Meere zu ver-\n" - .string "größern... Sind die krank im Hirn?$" + .string "TEAM AQUA wants to expand the sea...\n" + .string "How’s that for insane?$" MtChimney_Text_1B37B4:: @ 81B37B4 .string "Bufoh!$" diff --git a/data/text/aqua_settled.inc b/data/text/aqua_settled.inc index 0cf2c5ed4..13f503c41 100644 --- a/data/text/aqua_settled.inc +++ b/data/text/aqua_settled.inc @@ -1,17 +1,16 @@ UnknownString_81B4F03: @ 81B4F03 - .string "Die BLAUE KUGEL von {PLAYER}\n" - .string "beginnt plötzlich von innen\l" - .string "heraus zu leuchten!$" + .string "{PLAYER}’s BLUE ORB suddenly began\n" + .string "glowing!$" UnknownString_81B4F29: @ 81B4F29 - .string "KYOGRE wurde offensichtlich\n" - .string "wieder in Schlaf versetzt...$" + .string "KYOGRE appears to have settled\n" + .string "into sleep again...$" UnknownString_81B4F5C: @ 81B4F5C - .string "ADRIAN: Das...$" + .string "ARCHIE: This...$" UnknownString_81B4F6C: @ 81B4F6C - .string "ADRIAN: ... ... ... ... ... ...\n" + .string "ARCHIE: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das heißt wohl Goodbye. Das ist das\n" - .string "Letzte, was du von mir siehst.$" + .string "This is good-bye.\n" + .string "This is the last you’ve seen of me...$" diff --git a/data/text/aqua_summit.inc b/data/text/aqua_summit.inc index 501c4d435..696ef0084 100644 --- a/data/text/aqua_summit.inc +++ b/data/text/aqua_summit.inc @@ -1,164 +1,156 @@ UnknownString_81B50C3: @ 81B50C3 - .string "Ich zeige dir, wie unheimlich gruselig\n" - .string "TEAM AQUA sein kann!$" + .string "I’ll show you exactly how scary\n" + .string "TEAM AQUA can be!$" UnknownString_81B50F5: @ 81B50F5 - .string "Und du glaubst wirklich, du bist der\n" - .string "Stärke TEAM AQUAS gewachsen?!?$" + .string "So you think you can stand up alone\n" + .string "to TEAM AQUA’s might...$" UnknownString_81B5131: @ 81B5131 - .string "Ja, du bist ganz schön stark...\n" - .string "Aber wir sind viele...$" + .string "Yeah, so you are strong...\n" + .string "But there’re a lot of us!$" UnknownString_81B5166: @ 81B5166 - .string "Was ist los mit dir? Was kann ein\n" - .string "kleines Kind schon ausrichten?$" + .string "What’s up with you?\n" + .string "What does a single kid expect to do?$" UnknownString_81B519F: @ 81B519F - .string "Bumms...\n" - .string "Zu stark... Viel zu stark...$" + .string "Dang...\n" + .string "Too strong...$" UnknownString_81B51B5: @ 81B51B5 - .string "Du weißt doch gar nichts! Misch dich\n" - .string "besser nicht in unsere Sachen ein!$" + .string "You don’t know anything.\n" + .string "Quit messing around with us!$" UnknownString_81B51EB: @ 81B51EB - .string "Hey, ich kenne dich vom SCHLOTBERG!\n" - .string "Der Tag der Abrechnung ist gekommen!$" + .string "Hey, I remember you from MT. CHIMNEY!\n" + .string "It’s payback time!$" UnknownString_81B5224: @ 81B5224 - .string "Aaaaargh!\n" - .string "Schon wieder von einem Kind besiegt...$" + .string "Urgggh...\n" + .string "Beaten by some kid again!$" UnknownString_81B5248: @ 81B5248 - .string "Ach, das spielt keine Rolle.\n" - .string "Wir haben Zeit herausgeschlagen!\p" - .string "Der BOSS müsste mittlerweile haben, was\n" - .string "er besorgen wollte!$" + .string "Heh, it doesn’t matter!\n" + .string "We bought ourselves some time!\p" + .string "The BOSS should have snatched what\n" + .string "he was after!$" UnknownString_81B52B0: @ 81B52B0 - .string "ADRIAN: Nicht du schon wieder...\p" - .string "Du bist uns ja sehr schnell auf die Spur\n" - .string "gekommen, aber es ist schon zu spät.\p" - .string "Die ROTE KUGEL, die sich oben\n" - .string "auf dem PYROBERG befindet...\l" - .string "Ich, ADRIAN, sage, sie gehört mir!\p" - .string "Hahaha... Jetzt werden meine\n" - .string "Visionen Wirklichkeit!\p" - .string "Los, Mannschaft!\n" - .string "GRAPHITPORT CITY heißt unser Ziel.$" + .string "ARCHIE: Not you again...\p" + .string "You’ve impeded our plans repeatedly,\n" + .string "but this time you’re too late.\p" + .string "The RED ORB that rested atop\n" + .string "MT. PYRE...\l" + .string "I, ARCHIE, claim it as mine!\p" + .string "Fufufu... Finally, I can realize my\n" + .string "grand design...\p" + .string "Come on, crew!\n" + .string "It’s SLATEPORT next!$" UnknownString_81B53AB: @ 81B53AB - .string "Oh, neeeeiiinnn...\n" - .string "Das darf nicht wahr sein!\p" - .string "Wie konnten sie nur an die ROTE\n" - .string "KUGEL gelangen?!?\p" - .string "Die BLAUE KUGEL und die ROTE KUGEL\n" - .string "dürfen nie getrennt sein.\l" - .string "Sie gehören zusammen!!!\p" + .string "Oh, no...\n" + .string "This cannot happen...\p" + .string "How could they take the RED ORB?\p" + .string "The BLUE ORB and RED ORB must never\n" + .string "be separated. They belong together.\p" .string "... ... ... ... ... ... ... ...\n" .string "Hmm...\p" - .string "Gut! Nimm die verbliebene BLAUE\n" - .string "KUGEL an dich.\p" - .string "Bitte folge diesem Schurken und bring\n" - .string "die KUGEL zurück!$" + .string "Fine!\n" + .string "You take the remaining BLUE ORB.\p" + .string "Please take after that foul man and\n" + .string "get the other ORB back!$" UnknownString_81B54BE: @ 81B54BE - .string "Die BLAUE KUGEL, die dir anvertraut\n" - .string "wurde, und die gestohlene ROTE KUGEL...\p" - .string "Sie dürfen niemals getrennt werden...\n" - .string "Sonst passiert etwas Schreckliches!$" + .string "The BLUE ORB you have been entrusted\n" + .string "with and the stolen RED ORB...\p" + .string "They must never be apart...\n" + .string "Something terrible will happen...$" UnknownString_81B5540: @ 81B5540 .string "So...\n" - .string "KYOGRE wurde erweckt...\p" - .string "Von der wundersamen KUGEL sagt man,\n" - .string "dass sie das wütende KYOGRE beruhigt.\p" - .string "Es handelt sich um die BLAUE KUGEL,\n" - .string "die du bei dir trägst...\p" - .string "Diese ROTE KUGEL fand man in der\n" - .string "URZEITHÖHLE in XENEROVILLE...\p" - .string "Es gibt anscheinend eine Verbindung\n" - .string "zwischen KYOGRE und der \l" - .string "URZEITHÖHLE...$" + .string "KYOGRE has awoken...\p" + .string "The wondrous ORB that is said to have\n" + .string "becalmed the raging KYOGRE...\l" + .string "It is the BLUE ORB you bear.\p" + .string "That BLUE ORB was found buried inside\n" + .string "the CAVE OF ORIGIN in SOOTOPOLIS...\p" + .string "There is perhaps a link between\n" + .string "KYOGRE and the CAVE OF ORIGIN...$" UnknownString_81B5647: @ 81B5647 - .string "Dieser Mann - er hat die ROTE KUGEL\n" - .string "zurückgebracht.\p" - .string "Bringst du die BLAUE KUGEL auch an\n" - .string "ihren angestammten Platz zurück?$" + .string "That man, he returned the RED ORB.\p" + .string "Are you going to return the BLUE ORB\n" + .string "to its rightful place, too?$" UnknownString_81B56AB: @ 81B56AB - .string "Was soll das?\p" - .string "Wenn das Gleichgewicht nicht wiederher-\n" - .string "gestellt wird, weiß niemand, was\l" - .string "passieren wird!\p" - .string "Du wirst die BLAUE KUGEL an ihren Platz\n" - .string "zurückbringen, ja?$" + .string "What’s that?!\p" + .string "If the balance is not restored, there\n" + .string "is no telling what could happen.\p" + .string "You will return the BLUE ORB to its\n" + .string "rightful place, yes?$" UnknownString_81B5739: @ 81B5739 - .string "{PLAYER} gibt der alten Frau die\n" - .string "BLAUE KUGEL.$" + .string "{PLAYER} handed the BLUE ORB to the\n" + .string "old woman.$" UnknownString_81B5762: @ 81B5762 - .string "Ja...\n" - .string "Die beiden KUGELN müssen hier bleiben.\p" - .string "So soll es sein, zum Wohle aller in HOENN.$" + .string "Yes...\n" + .string "The two ORBS should remain here.\p" + .string "It is how it should be for the good\n" + .string "of all HOENN...$" UnknownString_81B57BE: @ 81B57BE - .string "Der Geist des Meeres...\p" - .string "Das, so heißt es, ist KYOGRE in\n" - .string "POKéMON-Gestalt...\p" - .string "So wie wir und die POKéMON leben, ist\n" - .string "auch das Meer lebendig...\p" - .string "KYOGRE hat uns das gelehrt.$" + .string "The spirit of the sea...\p" + .string "That is what KYOGRE is said to be in\n" + .string "POKéMON form...\p" + .string "In the same manner that we and POKéMON\n" + .string "have life, the sea is alive...\p" + .string "KYOGRE has taught us that...$" UnknownString_81B586F: @ 81B586F - .string "Am PYROBERG legen wir die Geister der\n" - .string "POKéMON, die von uns gegangen sind, zur\l" - .string "Ruhe...\p" - .string "Von hier aus hat man einen Ausblick über\n" - .string "die ganze Region von HOENN...\p" - .string "Die körperlosen Geister der POKéMON\n" - .string "finden hier ihre Ruhe...\p" - .string "Es ist Fügung, dass du jetzt hier bist...\p" - .string "Möchtest du meine Geschichte hören?\n" - .string "Eine lange, sehr alte Geschichte der\l" - .string "HOENN-Region?$" + .string "MT. PYRE is where we calm the spirits\n" + .string "of POKéMON that have passed on...\p" + .string "This is a high place where one can\n" + .string "see all of HOENN...\p" + .string "The disembodied spirits of POKéMON\n" + .string "must find solace here...\p" + .string "Is it coincidence that you are here...\p" + .string "Will you hear out my tale? A tale long\n" + .string "told in the HOENN region?$" UnknownString_81B5992: @ 81B5992 - .string "Es geschah vor langer, langer Zeit...\p" - .string "Die Welt erbebte unter der Auseinander-\n" - .string "setzung der POKéMON des Meeres mit den\l" - .string "POKéMON des Landes...\p" - .string "Die POKéMON des Meeres erschufen hohe\n" - .string "Wellen und tiefe Meeresbecken...\p" - .string "Die POKéMON des Landes erschufen\n" - .string "Berge und Kontinente...\p" - .string "Das Duell wütete ohne absehbares Ende.\p" - .string "Die Welt wurde von erbarmungslosen\n" - .string "Stürmen und unglaublichen Infernos\l" - .string "heimgesucht.\p" - .string "Die BLAUE und die ROTE KUGEL setzten\n" - .string "schließlich diesem Kampf ein Ende.\p" - .string "Licht strahlte von den beiden KUGELN\n" - .string "und beruhigte die Kontrahenten.\p" - .string "Die beruhigten POKéMON verbargen sich\n" - .string "in den Tiefen des Meeres und der Erde\l" - .string "und eines Tages verschwanden sie.$" + .string "It happened long, long ago...\p" + .string "The world was wracked by a ferocious\n" + .string "clash between the POKéMON of the sea\l" + .string "and the POKéMON of the land...\p" + .string "The POKéMON of the sea raised huge\n" + .string "waves and carved out oceans...\p" + .string "The POKéMON of the land raised\n" + .string "mountains and created continents...\p" + .string "Their fierce duel raged without end.\p" + .string "The world was engulfed in massive\n" + .string "infernos and vicious storms.\p" + .string "The BLUE ORB and the RED ORB brought\n" + .string "an end to the calamity.\p" + .string "Light poured from the two ORBS and\n" + .string "becalmed the enraged adversaries.\p" + .string "The pair, made docile, dove deep into\n" + .string "the sea where eventually they\l" + .string "disappeared...$" UnknownString_81B5BD7: @ 81B5BD7 - .string "Ich verstehe...\n" - .string "Nun, das ist auch in Ordnung...$" + .string "I see...\n" + .string "Well, that, too, is fine...$" UnknownString_81B5BFC: @ 81B5BFC - .string "ADRIAN: Du...\n" - .string "Du hast KYOGRE aufgehalten...\p" - .string "Das sollte mich nicht überraschen...\p" - .string "Nun habe ich verstanden, dass es nicht\n" - .string "an den Menschen ist, das Gleichgewicht\l" - .string "zwischen Land und Meer zu stören...\p" - .string "Daher bin ich hier, um die ROTE KUGEL\n" - .string "zurückzubringen...\p" - .string "Ich glaube nicht, dass wir uns wieder\n" - .string "sehen werden... Leb wohl...$" + .string "ARCHIE: You...\n" + .string "So you stopped KYOGRE...\p" + .string "I shouldn’t be surprised...\p" + .string "I understand now that humans cannot\n" + .string "freely control the balance between\l" + .string "the land and the sea...\p" + .string "So I have come to return the\n" + .string "RED ORB...\p" + .string "I doubt that we will cross paths again...\n" + .string "Farewell...$" diff --git a/data/text/barboach.inc b/data/text/barboach.inc index 98807cc3c..b78603286 100644 --- a/data/text/barboach.inc +++ b/data/text/barboach.inc @@ -1,38 +1,36 @@ UnknownString_81C426C: @ 81C426C - .string "Ich bin sehr interessiert an einer\n" - .string "großen {STR_VAR_1}. Je größer, desto\l" - .string "besser.\p" - .string "Was? Du hast ein {STR_VAR_1}?\n" - .string "B-b-bitte zeig es mir!!!$" + .string "I’m very interested in big {STR_VAR_1}.\n" + .string "The bigger the better.\p" + .string "Huh? Do you have a {STR_VAR_1}?\n" + .string "P-p-please, show me!$" UnknownString_81C42CE: @ 81C42CE - .string "Oh, du liebe Zeit, ist das groß!\n" - .string "Das ist eine große {STR_VAR_1}!\p" - .string "Danke, dass du es mir gezeigt hast.\n" - .string "Dies ist mein Dankeschön!$" + .string "Oh, my gosh, this is a big one!\n" + .string "This is a grand {STR_VAR_1}!\p" + .string "Thanks for showing me.\n" + .string "This is my thanks!$" UnknownString_81C432C: @ 81C432C - .string "{PLAYER} erhält {STR_VAR_2}.$" + .string "{PLAYER} received one {STR_VAR_2}.$" UnknownString_81C4340: @ 81C4340 - .string "Wie? Wo? Was?\n" - .string "Dein BEUTEL ist megavoll.$" + .string "Hunh?\n" + .string "Your BAG is crammed full.$" UnknownString_81C4360: @ 81C4360 - .string "Hmm... Ich habe schon größere\n" - .string "{STR_VAR_1} als dieses gesehen!$" + .string "Hmm... I’ve seen a bigger {STR_VAR_1}\n" + .string "than this one.$" UnknownString_81C438C: @ 81C438C - .string "Och, das ist schon ganz ansehnlich...\n" - .string "Aber das ist kein {STR_VAR_1}!$" + .string "Oh, now this is quite something...\n" + .string "But it’s not a {STR_VAR_1}!$" UnknownString_81C43C2: @ 81C43C2 - .string "Du hast kein großes {STR_VAR_1}?\n" - .string "Das ist aber schade...\p" - .string "Sobald du ein großes {STR_VAR_1}\n" - .string "besitzt, zeig es mir bitte.$" + .string "You don’t have a big {STR_VAR_1}?\n" + .string "That’s too bad...\p" + .string "If you get a big {STR_VAR_1},\n" + .string "please come show me.$" UnknownString_81C4417: @ 81C4417 - .string "Das größte {STR_VAR_1} in der Ge-\n" - .string "schichte! Der {STR_VAR_3} cm Koloss\l" - .string "von {STR_VAR_2}!$" + .string "The biggest {STR_VAR_1} in history!\n" + .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!$" diff --git a/data/text/bard.inc b/data/text/bard.inc index dbfb7d400..bd22c97a3 100644 --- a/data/text/bard.inc +++ b/data/text/bard.inc @@ -1,38 +1,38 @@ gTextBard_BardTesting: @ 81B0A83 - .string "BARDEN Test.$" + .string "BARD testing!$" gTextBard_HiImTheBard:: @ 81B0A91 - .string "Hallo, ich bin der BARDE.\n" - .string "Möchtest du meinem Lied lauschen?$" + .string "Hi, I’m the BARD.\n" + .string "Would you like to hear my song?$" gTextBard_OhYouveLeftMe:: @ 81B0AC3 .string "Oh...\n" - .string "Du überlässt mich meinem Blues?$" + .string "You’ve left me feeling the blues...$" gTextBard_OhWhatAMovingSong:: @ 81B0AED - .string "Hach, was für ein bewegendes Lied...\n" - .string "Ich wünschte, ich könnte es für\l" - .string "andere spielen...$" + .string "Oh, what a moving song...\n" + .string "I wish I could play it for others...$" gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C .string "So?\n" - .string "Wie fandest du mein Lied?\p" - .string "Ich bin noch nicht ganz zufrieden mit\n" - .string "dem Text.\p" - .string "Hast du nicht Lust, den Text für mich\n" - .string "neu zu schreiben?$" + .string "How do you like my song?\p" + .string "But I’m none too happy about the\n" + .string "lyrics.\p" + .string "How would you like to write some new\n" + .string "lyrics for me?$" gTextBard_OhYouveLeftMe2:: @ 81B0BA6 - .string "Oh... Und wieder werde ich meinem\n" - .string "Blues überlassen.$" + .string "Oh...\n" + .string "You’ve left me feeling the blues...$" gTextBard_ThankYouKindly:: @ 81B0BD0 - .string "Vielen herzlichen Dank!\n" - .string "Ich möchte für dich singen.$" + .string "Thank you kindly!\n" + .string "Let me sing it for you.$" gTextBard_WasThatHowYouWanted:: @ 81B0BFA - .string "Hast du dir dein Lied so vorgestellt?$" + .string "Was that how you wanted your song\n" + .string "to go?$" gTextBard_OkayThatsIt:: @ 81B0C23 - .string "Okay! Das ist es! Dieses Lied werde\n" - .string "ich nun für eine Weile singen.$" + .string "Okay! That’s it, then.\n" + .string "I’ll sing this song for a while.$" diff --git a/data/text/berries.inc b/data/text/berries.inc index 34afb1a69..8a5abad2c 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -1,240 +1,235 @@ PetalburgCity_Gym_Text_1C5570:: @ 81C5570 - .string "VATER: Hallo, {PLAYER}!\p" - .string "Ich habe gerade eine sehr seltene\n" - .string "BEERE erhalten. Die schenke ich dir.$" + .string "DAD: Hi, {PLAYER}!\p" + .string "I just received a very rare BERRY.\n" + .string "I’d like you to have it.$" Route104_Text_1C55B9:: @ 81C55B9 - .string "Wenn du BEEREN siehst, die im Lehmboden\n" - .string "wachsen, pflücke sie ruhig.\p" - .string "Aber pflanze eine neue BEERE an der\n" - .string "Stelle. Das ist einfache Höflichkeit.\p" - .string "Hier, das ist für dich.$" + .string "If you see BERRIES growing in loamy\n" + .string "soil, feel free to take them.\p" + .string "But make sure you plant a BERRY in the\n" + .string "same spot. That’s common courtesy.\p" + .string "Here, I’ll share this with you.$" Route104_Text_1C5665:: @ 81C5665 - .string "Du siehst aus wie ein TRAINER. Du\n" - .string "bist auch einer, stimmt’s?\p" - .string "TRAINER geben ihren POKéMON manchmal\n" - .string "BEEREN zu tragen.\p" - .string "Es liegt an dir, ob du BEEREN pflanzt\n" - .string "oder verwendest.$" + .string "The way you look, you must be a\n" + .string "TRAINER, no?\p" + .string "TRAINERS often make POKéMON hold\n" + .string "BERRIES.\p" + .string "It’s up to you whether to grow BERRIES\n" + .string "or use them.$" Route111_Text_1C56F0:: @ 81C56F0 - .string "Ich habe meine Pflanzen sehr oft ge-\n" - .string "wässert! Sie trugen sehr viele Blüten.\p" - .string "Und dann wuchsen auf einmal viele\n" - .string "BEEREN!\p" - .string "Hier, bitte!\n" - .string "Die schenke ich dir!$" + .string "I watered my plants lots and lots!\n" + .string "A whole bunch of flowers bloomed!\p" + .string "And then a whole bunch of BERRIES\n" + .string "appeared!\p" + .string "Here you go!\n" + .string "You can have this!$" Route111_Text_1C5781:: @ 81C5781 - .string "Ich werde mich anstrengen und einige\n" - .string "rote {POKEBLOCK} herstellen!\p" - .string "Ich hoffe, du strengst dich auch an.$" + .string "I’m going to try really hard and make\n" + .string "some RED {POKEBLOCK}S!\p" + .string "I hope you try hard, too!$" Route111_Text_1C57D2:: @ 81C57D2 - .string "Ich frage mich, welche BEEREN-Farbe ich\n" - .string "heute wählen soll.$" + .string "I wonder what color BERRIES I’ll look\n" + .string "for today?$" Route114_Text_1C5803:: @ 81C5803 - .string "Ich sammle BEEREN, damit ich einen\n" - .string "POKéMON WETTBEWERB gewinnen kann.\p" - .string "Wenn du magst, gebe ich dir eine ab.$" + .string "I’m gathering BERRIES so I can win a\n" + .string "POKéMON CONTEST.\p" + .string "If you’d like, I’ll share one with you.$" Route114_Text_1C5861:: @ 81C5861 - .string "Dir auch viel Glück!$" + .string "Good luck to you, too!$" Route114_Text_1C5878:: @ 81C5878 - .string "Welche BEEREN soll ich heute pflanzen?\n" - .string "Welche Farben sollen die {POKEBLOCK} haben?\p" - .string "Darüber nachzudenken, macht irre Spaß.$" + .string "What BERRIES should I plant today?\n" + .string "What color {POKEBLOCK}S should I make?\p" + .string "Fretting over stuff like that is fun\n" + .string "in its own way.$" Route120_Text_1C58F1:: @ 81C58F1 - .string "Gib dieser Box einen Stoß und ein\n" - .string "{POKEBLOCK} kommt heraus...\p" - .string "Und dieser {POKEBLOCK} wird von einem\n" - .string "POKéMON gefressen...\p" - .string "Es ist ein Ausdruck der Liebe, richtig?$" + .string "Give the case a shake, and out pops\n" + .string "a {POKEBLOCK}...\p" + .string "And that {POKEBLOCK} is caught and eaten\n" + .string "by a POKéMON...\p" + .string "It’s an expression of love, isn’t it?$" Route120_Text_1C5979:: @ 81C5979 - .string "Ja, ja.\n" - .string "Du verstehst, was ich meine.\p" - .string "Das hier ist für dich.$" + .string "Yes, yes.\n" + .string "You understand what I mean.\p" + .string "You should take this.$" Route120_Text_1C59B5:: @ 81C59B5 - .string "Oh... Aber es ist wichtig, dass man sich\n" - .string "einen eigenen Eindruck verschafft...\p" - .string "Hier. Das kannst du haben.$" + .string "Oh... But it is important to make your\n" + .string "own impressions, I guess...\p" + .string "You can have this.$" Route120_Text_1C5A0B:: @ 81C5A0B - .string "Dies ist eine seltene BEERE. Ich hoffe,\n" - .string "du gehst sorgfältig mit ihr um.$" + .string "I think that BERRY is rare.\n" + .string "I hope you raise it with loving care.$" Route120_Text_1C5A4D:: @ 81C5A4D - .string "Ich habe einige BEEREN vom\n" - .string "BEERENMEISTER erhalten.$" + .string "I’ll get more BERRIES from the\n" + .string "BERRY MASTER.$" LilycoveCity_Text_1C5A7A:: @ 81C5A7A - .string "Also, im Grunde ist es so...\p" - .string "Ein Anzug passt zu mir wie die\n" - .string "Brise zum Meer - perfekt!\p" - .string "Und bei dir... Eine BEERE passt zu\n" - .string "“T”...\p" - .string "Warum ist das so?$" + .string "When it gets right down to it...\p" + .string "The same way suits suit me perfectly,\n" + .string "a crisp breeze suits the sea.\p" + .string "And you, a BERRY suits you to a “T”...\p" + .string "Why should that be so?$" LilycoveCity_Text_1C5B1D:: @ 81C5B1D - .string "Also, im Grunde ist es so...\p" - .string "Weil du ein TRAINER bist.$" + .string "When it gets right down to it...\p" + .string "It’s because you’re a TRAINER!$" LilycoveCity_Text_1C5B5D:: @ 81C5B5D - .string "Grundsätzlich verhält es sich so...\p" - .string "So wie die würdevolle Einfachheit mich\n" - .string "ziert, zieren {POKEBLOCK} POKéMON.$" + .string "When it gets right down to it...\p" + .string "The way dignified simplicity suits me,\n" + .string "{POKEBLOCK}S perfectly suit POKéMON.$" Route123_BerryMastersHouse_Text_1C5BC4:: @ 81C5BC4 - .string "Du kannst mich BEERENMEISTER\n" - .string "nennen.\p" - .string "Ich träume davon, die Welt mit hübschen\n" - .string "Blumen zu bereichern, daher züchte ich\l" - .string "BEEREN und gebe sie an andere weiter.\p" - .string "Du hast dir auch eine verdient!$" + .string "You may call me the BERRY MASTER.\p" + .string "I dream of filling the world with\n" + .string "beautiful flowers, so I raise BERRIES\l" + .string "and hand them out to everyone.\p" + .string "You’re deserving of one!$" Route123_BerryMastersHouse_Text_1C5C66:: @ 81C5C66 - .string "Sei nicht so schüchtern.\n" - .string "Nimm dir noch eine!$" + .string "Why be stingy?\n" + .string "Take another!$" Route123_BerryMastersHouse_Text_1C5C83:: @ 81C5C83 - .string "Besuch unbedingt den BLÜTENTRAUM\n" - .string "BLUMENLADEN bei METAROST CITY.\p" - .string "Lasst die Welt in Blumen schwelgen.$" + .string "Be sure to visit the PRETTY PETAL\n" + .string "flower shop near RUSTBORO.\p" + .string "Let flowers fill the world!$" Route123_BerryMastersHouse_Text_1C5CDC:: @ 81C5CDC - .string "Für heute bin ich fertig.\n" - .string "Komm ein anderes Mal wieder.\p" - .string "Lasst die Welt in Blumen schwelgen!$" + .string "I’m done for today.\n" + .string "Come again another day.\p" + .string "Let flowers fill the world!$" Route123_BerryMastersHouse_Text_1C5D24:: @ 81C5D24 - .string "Mein Mann züchtet BEEREN. Er ist be-\n" - .string "stimmt der beste Züchter der Welt.\p" - .string "Er macht mich unglaublich stolz.\p" - .string "Sag mal, Kind, du kennst nicht zufällig\n" - .string "einen guten Spruch?$" + .string "The way my husband grows BERRIES,\n" + .string "oh, he’s the best in the world.\p" + .string "He makes me proud, that he does.\p" + .string "Incidentally, child, have you heard\n" + .string "a good saying lately?$" Route123_BerryMastersHouse_Text_1C5DC1:: @ 81C5DC1 - .string "Ah! Was für ein wunderbarer Spruch!\n" - .string "So inspirierend!\p" - .string "Das hier möchte ich dir schenken.$" + .string "Ah! What a remarkable saying!\n" + .string "Inspirational, it is!\p" + .string "I want you to have this.$" Route123_BerryMastersHouse_Text_1C5E0E:: @ 81C5E0E - .string "Oh! Das ist ein guter Spruch!\n" - .string "Du bist bemerkenswert!\p" - .string "Das hier möchte ich dir schenken.$" + .string "Oh! A good saying it is.\n" + .string "You’re quite remarkable.\p" + .string "I want you to have this.$" Route123_BerryMastersHouse_Text_1C5E59:: @ 81C5E59 - .string "Unsere vier Enkelkinder sollten noch\n" - .string "begabter als mein Mann werden.\p" - .string "Das Leben erfüllt einen immer wieder mit\n" - .string "Freude!$" + .string "Our four grandchildren should become\n" + .string "more accomplished than my husband.\p" + .string "Joy never goes out of my life!$" Route123_BerryMastersHouse_Text_1C5EC0:: @ 81C5EC0 .string "Ah...$" Route104_PrettyPetalFlowerShop_Text_1C5EC6:: @ 81C5EC6 - .string "Hallo!\p" - .string "Dies ist der BLÜTENTRAUM BLUMENLADEN.\n" - .string "Verwandelt die Welt in ein Blumenmeer!$" + .string "Hello!\p" + .string "This is the PRETTY PETAL flower shop.\n" + .string "Spreading flowers throughout the world!$" Route104_PrettyPetalFlowerShop_Text_1C5F1B:: @ 81C5F1B - .string "{PLAYER}{KUN}, möchtest du etwas über\n" - .string "BEEREN lernen?$" + .string "{PLAYER}{KUN}, would you like to learn about\n" + .string "BERRIES?$" Route104_PrettyPetalFlowerShop_Text_1C5F48:: @ 81C5F48 - .string "Wie heißt du?\p" + .string "Your name is?\p" .string "{PLAYER}{KUN}.\n" - .string "Das ist aber ein hübscher Name.\p" - .string "Möchtest du etwas über BEEREN lernen?$" + .string "That’s a nice name.\p" + .string "{PLAYER}{KUN}, would you like to learn about\n" + .string "BERRIES?$" Route104_PrettyPetalFlowerShop_Text_1C5F9D:: @ 81C5F9D - .string "BEEREN wachsen an Bäumen, die nur in\n" - .string "dunklem Lehmboden gedeihen.\p" - .string "Wenn du BEEREN pflückst, pflanze\n" - .string "immer neue in den Boden ein.\p" - .string "Eine gepflanzte BEERE wird bald an-\n" - .string "fangen zu sprießen, dann mit einer\p" - .string "wunderhübschen Blüte erblühen, die bald\n" - .string "zu einer BEERE wird.\p" - .string "Ich würde die ganze Welt am liebsten mit\n" - .string "wunderhübschen Blüten bedeckt sehen.\l" - .string "Das ist mein Traum.\p" - .string "Bitte, hilf mir, {PLAYER}{KUN}. Pflanze BEEREN\n" - .string "und bring so Blüten in die Welt.$" + .string "BERRIES grow on trees that thrive\n" + .string "only in dark, loamy soil.\p" + .string "If you take some BERRIES, be sure to\n" + .string "plant one in the loamy soil again.\p" + .string "A planted BERRY will soon sprout,\n" + .string "grow into a plant, flower beautifully,\l" + .string "then grow BERRIES again.\p" + .string "I want to see the whole wide world\n" + .string "filled with beautiful flowers.\l" + .string "That’s my dream.\p" + .string "Please help me, {PLAYER}{KUN}. Plant BERRIES\n" + .string "and bring more flowers into the world.$" Route104_PrettyPetalFlowerShop_Text_1C6121:: @ 81C6121 - .string "Blumen erfreuen jedes Herz, nicht\n" - .string "wahr?$" + .string "Flowers bring so much happiness to\n" + .string "people, don’t they?$" Route104_PrettyPetalFlowerShop_Text_1C6158:: @ 81C6158 - .string "Hallo!\p" - .string "Je mehr du dich um die Blumen kümmerst,\n" - .string "desto schöner werden sie blühen.\p" - .string "Auch du hast Blumen gerne.\n" - .string "Das weiß ich genau. Das ist für dich.$" + .string "Hello!\p" + .string "The more attention you give to flowers,\n" + .string "the more beautifully they bloom.\p" + .string "You’ll like tending flowers. I’m sure\n" + .string "of it. You can have this.$" Route104_PrettyPetalFlowerShop_Text_1C61E8:: @ 81C61E8 - .string "Nachdem du die BEEREN eingepflanzt\n" - .string "hast, musst du sie mit der\l" - .string "WAILMERKANNE wässern.\p" - .string "Oh, und noch etwas!\p" - .string "Wenn die BEEREN nicht gepflückt werden,\n" - .string "fallen sie zu Boden. Aber sie werden\l" - .string "wieder nachwachsen.\p" - .string "Ist das nicht unglaublich? Es ist, als\n" - .string "hätten sie den Willen zu leben.$" + .string "While BERRY plants are growing,\n" + .string "water them with the WAILMER PAIL.\p" + .string "Oh, another thing.\p" + .string "If you don’t pick BERRIES for a while,\n" + .string "they’ll drop off onto the ground.\l" + .string "But they’ll sprout again.\p" + .string "Isn’t that awesome?\n" + .string "It’s like they have the will to live.$" Route104_PrettyPetalFlowerShop_Text_1C62DA:: @ 81C62DA - .string "Ich versuche, so zu sein wie meine große\n" - .string "Schwester. Ich züchte auch Blumen!\p" - .string "Hier, das ist für dich!$" + .string "I’m trying to be like my big sisters.\n" + .string "I’m growing flowers, too!\p" + .string "Here you go! It’s for you!$" Route104_PrettyPetalFlowerShop_Text_1C6335:: @ 81C6335 - .string "Du kannst eine BEERE pflanzen und sie\n" - .string "wachsen lassen, oder du gibst sie einem\l" - .string "POKéMON zum Tragen.\p" - .string "Und neuerdings gibt es eine Maschine,\n" - .string "mit der kann man die verschiedensten\l" - .string "BEEREN mixen und Süßigkeiten für die\l" - .string "POKéMON daraus machen.\p" - .string "Ich möchte auch Süßigkeiten haben.$" + .string "You can plant a BERRY and grow it big,\n" + .string "or you can make a POKéMON hold it.\p" + .string "But now they have a machine that mixes\n" + .string "up different BERRIES and makes candies\l" + .string "for POKéMON.\p" + .string "I want some candy, too.$" SootopolisCity_Text_1C63F2:: @ 81C63F2 - .string "Hi, wie heißt du?\p" - .string "... ... ... ... ... ... ... ... ...\n" - .string "Okay. Netter Name!\p" - .string "Ich heiße BERTA.\p" - .string "Meine Eltern haben mich so genannt,\n" - .string "damit ich gesund und warmherzig werde.\l" - .string "Das war ihr Wunsch.\p" - .string "Hier, das schenke ich dir.$" + .string "Hi, what’s your name?\p" + .string "... ... ... ... ... ... ... ... ...\n" + .string "Okay. That’s nice!\p" + .string "My name is KIRI.\p" + .string "My mommy and daddy named me that so\n" + .string "I would grow healthy and warmhearted.\l" + .string "That’s what they wished.\p" + .string "You can have one of these.$" SootopolisCity_Text_1C64D0:: @ 81C64D0 - .string "BERTA will dir auch diese BEERE geben.\n" - .string "Ich mag sie sehr!$" + .string "KIRI will give you this BERRY, too!\n" + .string "I really like it lots!$" SootopolisCity_Text_1C650B:: @ 81C650B - .string "Ich frage mich, welcher Wunsch in deinem\n" - .string "Namen verborgen ist.$" + .string "I wonder what kind of wish is included\n" + .string "in your name.$" SootopolisCity_Text_1C6540:: @ 81C6540 - .string "Frühling, Sommer, Herbst und Winter.\p" - .string "Wenn du im Frühling geboren bist, magst\n" - .string "du dann den Frühling? Wenn du im Sommer\l" - .string "geboren bist, magst du den Sommer?$" + .string "Spring, summer, autumn, and winter.\p" + .string "If you’re born in springtime, do you like\n" + .string "the spring, and if you’re born in the\l" + .string "summer, do you like the summer?$" SootopolisCity_Text_1C65D4:: @ 81C65D4 - .string "Dann wurde BERTA im Herbst geboren,\n" - .string "denn ich liebe den Herbst!\p" - .string "Welche Jahreszeit hast du am liebsten?$" + .string "Then KIRI was born in the autumn,\n" + .string "so I love the autumn!\p" + .string "Which season do you like?$" SootopolisCity_Text_1C6626:: @ 81C6626 .string "Oh...\n" - .string "Das macht nichts...\p" - .string "Es gibt so viel, was ich wissen möchte...$" + .string "It doesn’t matter...\p" + .string "There’s so much that I want to know...$" diff --git a/data/text/berry_tree.inc b/data/text/berry_tree.inc index 12179d9b2..4ffbf51c4 100644 --- a/data/text/berry_tree.inc +++ b/data/text/berry_tree.inc @@ -1,69 +1,67 @@ Route102_Text_1A16B6:: @ 81A16B6 - .string "Das ist weicher Lehmboden.$" + .string "It’s soft, loamy soil.$" Route102_Text_1A16CD:: @ 81A16CD - .string "Das ist weicher Lehmboden.\n" - .string "Möchtest du eine BEERE pflanzen?$" + .string "It’s soft, loamy soil.\n" + .string "Want to plant a BERRY?$" Route102_Text_1A16FB:: @ 81A16FB - .string "{PLAYER} pflanzt eine\n" - .string "{STR_VAR_1}BEERE in den Lehmboden.$" + .string "{PLAYER} planted one {STR_VAR_1} BERRY in\n" + .string "the soft, loamy soil.$" Route102_Text_1A172C:: @ 81A172C - .string "Eine {STR_VAR_1}BEERE wurde\n" - .string "hier gepflanzt.$" + .string "One {STR_VAR_1} BERRY was planted here.$" Route102_Text_1A174B:: @ 81A174B - .string "{STR_VAR_1} blüht auf.$" + .string "{STR_VAR_1} has sprouted.$" Route102_Text_1A175C:: @ 81A175C - .string "Die {STR_VAR_1}pflanze wächst.$" + .string "This {STR_VAR_1} plant is growing taller.$" Route102_Text_1A177D:: @ 81A177D - .string "Diese {STR_VAR_1}blumen sind\n" + .string "These {STR_VAR_1} flowers are blooming\n" .string "{STR_VAR_2}.$" Route102_Text_1A179F:: @ 81A179F - .string "wunderschön$" + .string "very beautifully$" Route102_Text_1A17B0:: @ 81A17B0 - .string "zierlich$" + .string "cutely$" Route102_Text_1A17B7:: @ 81A17B7 - .string "hübsch$" + .string "prettily$" Route102_Text_1A17C0:: @ 81A17C0 - .string "{STR_VAR_2} {STR_VAR_1}BEERE/N!\p" - .string "Möchtest du die {STR_VAR_1}BEERE/N\n" - .string "pflücken?$" + .string "There are {STR_VAR_2} {STR_VAR_1} BERRIES!\p" + .string "Do you want to pick the\n" + .string "{STR_VAR_1} BERRIES?$" Route102_Text_1A17FD:: @ 81A17FD - .string "{PLAYER} pflückt die {STR_VAR_2}\n" - .string "{STR_VAR_1}BEERE/N.$" + .string "{PLAYER} picked the {STR_VAR_2} {STR_VAR_1} BERRIES.$" Route102_Text_1A181A:: @ 81A181A - .string "{PLAYER} packt die {STR_VAR_1}BEERE/N\n" - .string "in die BEERENTASCHE des BEUTELS.\p" - .string "Der Boden ist wieder weich und lehmig.$" + .string "{PLAYER} put away the {STR_VAR_1} BERRIES\n" + .string "in the BAG’s BERRIES POCKET.\p" + .string "The soil returned to its soft and\n" + .string "loamy state.$" Route102_Text_1A1881:: @ 81A1881 - .string "Die BEERENTASCHE des BEUTELS ist voll.\p" - .string "Die {STR_VAR_1}BEERE/N können nicht\n" - .string "mitgenommen werden.$" + .string "The BAG’s BERRIES POCKET is full.\p" + .string "The {STR_VAR_1} BERRIES couldn’t be taken.$" Route102_Text_1A18C5:: @ 81A18C5 - .string "{PLAYER} pflückt keine\n" - .string "{STR_VAR_1}BEEREN.$" + .string "{PLAYER} left the {STR_VAR_1} BERRIES\n" + .string "unpicked.$" Route102_Text_1A18E6:: @ 81A18E6 - .string "Möchtest du die {STR_VAR_1} mit der\n" - .string "WAILMERKANNE gießen?$" + .string "Want to water the {STR_VAR_1} with the\n" + .string "WAILMER PAIL?$" Route102_Text_1A1912:: @ 81A1912 - .string "{PLAYER} gießt die {STR_VAR_1}.$" + .string "{PLAYER} watered the {STR_VAR_1}.$" Route102_Text_1A1925:: @ 81A1925 - .string "Die Pflanze scheint sich zu freuen.$" + .string "The plant seems to be delighted.$" Route102_Text_1A1946:: @ 81A1946 .string "!$" diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc index 08967e28f..be9c03588 100644 --- a/data/text/birch_speech.inc +++ b/data/text/birch_speech.inc @@ -1,60 +1,55 @@ gBirchSpeech_Welcome:: @ 81C6D78 - .string "Sorry, dass du warten musstest.\p" - .string "Willkommen in der Welt der POKéMON!\p" - .string "Mein Name ist BIRK.\p" - .string "Aber jeder nennt mich nur\n" - .string "PROFESSOR POKéMON.\p" - .string "$" + .string "Hi! Sorry to keep you waiting!\p" + .string "Welcome to the world of POKéMON!\p" + .string "My name is BIRCH.\p" + .string "But everyone calls me the POKéMON\n" + .string "PROFESSOR.\p$" gBirchSpeech_ThisIsPokemon:: @ 81C6DF8 - .string "Das nennen wir ein “POKéMON”.$" + .string "This is what we call a “POKéMON.”$" gBirchSpeech_WorldInhabitedByPokemon:: @ 81C6E1A - .string "Auf dieser Welt leben Wesen,\n" - .string "die uns als POKéMON bekannt sind.\p" - .string "Wir Menschen leben Seite an Seite\n" - .string "mit ihnen, als Freunde oder als\l" - .string "Arbeitskollegen.\p" - .string "Und manchmal schließen wir uns mit\n" - .string "ihnen zusammen und tragen Kämpfe\l" - .string "gegen andere von uns aus.\p" - .string "Doch obwohl wir den POKéMON so\n" - .string "nahe stehen, wissen wir noch nicht\l" - .string "alles über sie.\p" - .string "Es gibt noch viele, viele Geheim-\n" - .string "nisse über die POKéMON.\p" - .string "Um die Mysterien der POKéMON\n" - .string "aufzudecken, widme ich mich der\l" - .string "Forschung. Genau das tue ich.\p" - .string "$" + .string "This world is widely inhabited by\n" + .string "creatures known as POKéMON.\p" + .string "We humans live alongside POKéMON,\n" + .string "at times as friendly playmates, and\l" + .string "at times as cooperative workmates.\p" + .string "And sometimes, we band together\n" + .string "and battle others like us.\p" + .string "But despite our closeness, we don’t\n" + .string "know everything about POKéMON.\p" + .string "In fact, there are many, many\n" + .string "secrets surrounding POKéMON.\p" + .string "To unravel POKéMON mysteries,\n" + .string "I’ve been undertaking research.\l" + .string "That’s what I do.\p$" gBirchSpeech_AndYouAre:: @ 81C6FCB - .string "Und wer bist du?$" + .string "And you are?$" gBirchSpeech_AreYouBoyOrGirl:: @ 81C6FD8 - .string "Bist du ein Junge?\n" - .string "Oder bist du ein Mädchen?$" + .string "Are you a boy?\n" + .string "Or are you a girl?$" gBirchSpeech_WhatsYourName:: @ 81C6FFA - .string "Fein!\n" - .string "Und wie heißt du?$" + .string "All right.\n" + .string "What’s your name?$" gBirchSpeech_SoItsPlayer:: @ 81C7017 - .string "Ah, du bist also {PLAYER}{KUN}?$" + .string "So it’s {PLAYER}{KUN}?$" gBirchSpeech_AhOkayYouArePlayer:: @ 81C7025 .string "Ah, okay!\p" - .string "Jetzt habe ich es! Du heißt {PLAYER}{KUN}\n" - .string "und bist gerade nach WURZELHEIM,\l" - .string "meinem Heimatort, gezogen!$" + .string "You’re {PLAYER}{KUN} who’s moving to my\n" + .string "hometown of LITTLEROOT.\l" + .string "I get it now!$" gBirchSpeech_AreYouReady:: @ 81C7074 - .string "Gut, bist du bereit?\p" - .string "Dein eigenes Abenteuer wird\n" - .string "nun beginnen.\p" - .string "Hab nur Mut und stürze dich in die\n" - .string "Welt der POKéMON, wo Abenteuer,\l" - .string "Träume und Freundschaft warten.\p" - .string "Komm später in mein POKéMON-LABOR,\n" - .string "ich erwarte dich dort.\p" - .string "$" + .string "All right, are you ready?\p" + .string "Your very own adventure is about\n" + .string "to unfold.\p" + .string "Take courage, and leap into the\n" + .string "world of POKéMON where dreams,\l" + .string "adventure, and friendships await!\p" + .string "Well, I’ll be expecting you later.\n" + .string "Come see me in my POKéMON LAB.\p$" diff --git a/data/text/braille.inc b/data/text/braille.inc index 071657502..66b6438a6 100644 --- a/data/text/braille.inc +++ b/data/text/braille.inc @@ -1,92 +1,223 @@ Underwater_SealedChamber_Braille_1C533D:: @ 81C533D - .string "ÀÉëÒÂÌÒÉÌë ÒÉéÀ{0x31}Ê{0x3F}Œ$" + .byte 3 + .byte 6 + .byte 27 + .byte 13 + .byte 5 + .byte 9 + .braille "GO UP HERE.$" SealedChamber_OuterRoom_Braille_1C534F:: @ 81C534F - .string "ÊÉßÒÎÌÀÈÂÎ$" + .byte 9 + .byte 6 + .byte 19 + .byte 13 + .byte 12 + .byte 9 + .braille "ABC$" SealedChamber_OuterRoom_Braille_1C5359:: @ 81C5359 - .string "ÊÉßÒÎÌÉÓÙß$" + .byte 9 + .byte 6 + .byte 19 + .byte 13 + .byte 12 + .byte 9 + .braille "GHI$" SealedChamber_OuterRoom_Braille_1C5363:: @ 81C5363 - .string "ÊÉßÒÎÌ{0x1F}ëàì$" + .byte 9 + .byte 6 + .byte 19 + .byte 13 + .byte 12 + .byte 9 + .braille "MNO$" SealedChamber_OuterRoom_Braille_1C536D:: @ 81C536D - .string "ÌÉÛÒÒÌ{0x3B}{0x39}$" + .byte 9 + .byte 6 + .byte 19 + .byte 13 + .byte 12 + .byte 9 + .braille "TUV$" SealedChamber_OuterRoom_Braille_1C5377:: @ 81C5377 - .string "ÊÉßÒÎÌÌÊÔÒ$" + .byte 9 + .byte 6 + .byte 19 + .byte 13 + .byte 12 + .byte 9 + .braille "DEF$" SealedChamber_OuterRoom_Braille_1C5381:: @ 81C5381 - .string "ÊÉßÒÎÌÛéçá$" + .byte 9 + .byte 6 + .byte 19 + .byte 13 + .byte 12 + .byte 9 + .braille "JKL$" SealedChamber_OuterRoom_Braille_1C538B:: @ 81C538B - .string "ÊÉßÒÎÌ{0x31}=+{0x33}$" + .byte 7 + .byte 6 + .byte 21 + .byte 13 + .byte 11 + .byte 9 + .braille "PQRS$" SealedChamber_OuterRoom_Braille_1C5396:: @ 81C5396 - .string "ÌÉÛÒÒÌ{0x3F}Œ$" + .byte 10 + .byte 6 + .byte 18 + .byte 13 + .byte 14 + .byte 9 + .braille ".$" SealedChamber_OuterRoom_Braille_1C539E:: @ 81C539E - .string "ËÉÑÒÏÌèù&$" + .byte 7 + .byte 6 + .byte 21 + .byte 13 + .byte 11 + .byte 9 + .braille "WXYZ$" SealedChamber_OuterRoom_Braille_1C53A9:: @ 81C53A9 - .string "ÌÉÛÒÒÌ{0x3F}Ç$" + .byte 10 + .byte 6 + .byte 18 + .byte 13 + .byte 14 + .byte 9 + .braille ",$" SealedChamber_OuterRoom_Braille_1C53B1:: @ 81C53B1 - .string "ÉÇ{0x18}ÔËÊàÂÒÀ{0x31}ÊßÌ\n" - .string "ÒÉÌë{0x3F}Œ$" + .byte 5 + .byte 6 + .byte 25 + .byte 13 + .byte 7 + .byte 9 + .braille "DIG HERE.$" SealedChamber_InnerRoom_Braille_1C53C1:: @ 81C53C1 - .string "È çÛÊÂëÌßÉÂÀéìÒ\n" - .string "{0x39}{0x31}Ìëàì{0x3F}Ç\n" - .string "+ÀÉßçëÎ\n" - .string "{0x39}{0x31}ßÌì{0x39}ì{0x3F}Œ$" + .byte 3 + .byte 0 + .byte 27 + .byte 19 + .byte 5 + .byte 3 + .braille "FIRST COMES\n" + .braille "RELICANTH.\n" + .braille "LAST COMES\n" + .braille "WAILORD.$" SealedChamber_InnerRoom_Braille_1C53F2:: @ 81C53F2 - .string "ÁÁêÙÇÈÉé ÎÉÌàÌë\n" - .string "ÒùÒßÌ ÒÀÈÌé\n" - .string "+Éë ÔÌßÌÈì{0x3F}Œ$" + .byte 6 + .byte 0 + .byte 22 + .byte 19 + .byte 8 + .byte 3 + .braille "IN THIS\n" + .braille "CAVE WE\n" + .braille "HAVE\n" + .braille "LIVED.$" SealedChamber_InnerRoom_Braille_1C5414:: @ 81C5414 - .string "ÀÁëÙÂÈ+Éë =ÌëÎÀéÙÌé\n" - .string "ÀßßÌà ÎÌé\n" - .string "áçÙÌÛçé{0x3F}Ç$" + .byte 4 + .byte 2 + .byte 26 + .byte 17 + .byte 6 + .byte 5 + .braille "WE OWE ALL\n" + .braille "TO THE\n" + .braille "POKEMON.$" SealedChamber_InnerRoom_Braille_1C5435:: @ 81C5435 - .string "Á êÛÇÂÎÌééçÂÒ\n" - .string "àáÌëëìÌé +Éë\n" - .string "ÎÉÌ áçÙÌÛçé\n" - .string "+ÌÔ{0x3F}Œ$" + .byte 3 + .byte 0 + .byte 25 + .byte 19 + .byte 5 + .byte 3 + .braille "BUT, WE\n" + .braille "SEALED THE\n" + .braille "POKEMON\n" + .braille "AWAY.$" SealedChamber_InnerRoom_Braille_1C545C:: @ 81C545C - .string "ÇÇèÔÉÊ+Éë ÒÀììÌé\n" - .string "ÀéÔàì{0x3F}Œ$" + .byte 1 + .byte 6 + .byte 29 + .byte 13 + .byte 3 + .byte 9 + .braille "WE FEARED IT.$" SealedChamber_InnerRoom_Braille_1C5470:: @ 81C5470 - .string " ëÛÀÂÎÌéÓÌéÉÔÌé{0x3F}Ç\n" - .string "ÎÉÌ ÒçÊÊÌé {0x31}éÎ\n" - .string "Û{0x31}ìÉÔ àÉéÎ{0x3F}Ç\n" - .string "+ÉëÎ àÉÂÒ$" + .byte 4 + .byte 0 + .byte 26 + .byte 19 + .byte 6 + .byte 3 + .braille "THOSE WITH\n" + .braille "COURAGE,\n" + .braille "THOSE WITH\n" + .braille "HOPE.$" SealedChamber_InnerRoom_Braille_1C549B:: @ 81C549B - .string "Á êÛÇÂÌÉéÌ ì&ëÌ {0x39}{0x31}\n" - .string "ÌÉéÌÛ Ì+ÉÔÌé\n" - .string "áçÙÌÛçé\n" - .string "ùÊÊéÌé{0x3F}Œ$" + .byte 2 + .byte 0 + .byte 28 + .byte 19 + .byte 4 + .byte 3 + .braille "OPEN A DOOR.\n" + .braille "AN ETERNAL\n" + .braille "POKEMON\n" + .braille "WAITS.$" DesertRuins_Braille_1C54C8:: @ 81C54C8 - .string " ëÛÀÂ{0x39}+ÌÉÛÀß ëÌÂÒìà\n" - .string "{0x31}éÎ {0x39}+ÌÉ\n" - .string "ÒÉé{0x31}éìÌë{0x3F}Ç\n" - .string "ÎÀéé àìèëÙÌ{0x3F}Œ$" + .byte 0 + .byte 0 + .byte 29 + .byte 19 + .byte 2 + .byte 3 + .braille "RIGHT, RIGHT,\n" + .braille "DOWN, DOWN.\n" + .braille "THEN, USE\n" + .braille "STRENGTH.$" IslandCave_Braille_1C54FC:: @ 81C54FC - .string " éÛÈÂ+ÀëìÌ{0x3F}Ç ÈÉà\n" - .string "ÎÉÌ {0x39}ÌÉì\n" - .string "{0x39}+ÌÉÛÀß\n" - .string "Î{0x31}ëÂÒ Éàì{0x3F}Œ$" + .byte 3 + .byte 0 + .byte 27 + .byte 19 + .byte 5 + .byte 3 + .braille "STOP AND\n" + .braille "WAIT. WAIT\n" + .braille "FOR TIME TO\n" + .braille "PASS TWICE.$" AncientTomb_Braille_1C552E:: @ 81C552E - .string " ëÛÀÂéÌ{0x31}Ì {0x39}ÌÉì{0x3F}Ç\n" - .string "ÒçÊÊé{0x31}éÔ {0x31}éÎ\n" - .string "ßÉÌÈÌ àÉéÎ ÎÉÌ\n" - .string "ÒÉÛÛÌßàÛÉììÌ{0x3F}Œ$" + .byte 0 + .byte 0 + .byte 29 + .byte 19 + .byte 1 + .byte 3 + .braille "WITH NEW TIME,\n" + .braille "HOPE AND LOVE,\n" + .braille "AIM TO THE SKY\n" + .braille "IN THE MIDDLE.$" diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc index 4cadd759a..a4c8bc7c0 100644 --- a/data/text/cable_club.inc +++ b/data/text/cable_club.inc @@ -1,178 +1,176 @@ OldaleTown_PokemonCenter_2F_Text_1A4510:: @ 81A4510 - .string "Willkommen im POKéMON KABEL-CLUB-\n" - .string "KOLOSSEUM.\p" - .string "Hier kannst du mit deinen Freunden\n" - .string "kämpfen.\p" - .string "Möchtest du jetzt kämpfen?$" + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "COLOSSEUM.\p" + .string "You may battle with your friends here.\p" + .string "Would you like to battle?$" OldaleTown_PokemonCenter_2F_Text_1A457E:: @ 81A457E - .string "Willkommen im POKéMON KABEL-CLUB-\n" - .string "HANDELSCENTER.\p" - .string "Hier kannst du mit deinen Freunden\n" - .string "POKéMON tauschen.\p" - .string "Möchtest du jetzt POKéMON tauschen?$" + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "TRADE CENTER.\p" + .string "You may trade your POKéMON here\n" + .string "with a friend.\p" + .string "Would you like to trade POKéMON?$" OldaleTown_PokemonCenter_2F_Text_1A45FE:: @ 81A45FE - .string "Willkommen beim POKéMON KABEL-CLUB-\n" - .string "STATISTIKTAUSCH.\p" - .string "Hier kannst du mit deinen Freunden\n" - .string "die Rekorde als TRAINER austauschen.\p" - .string "Möchtest du Rekorde austauschen?$" + .string "Welcome to the POKéMON CABLE CLUB\n" + .if REVISION >= 1 + .string "RECORD CORNER.\p" + .else + .string "RECORD CENTER.\p" + .endif + .string "You may mix your records as a TRAINER\n" + .string "with the records of your friends.\p" + .string "Would you like to mix records?$" OldaleTown_PokemonCenter_2F_Text_1A4696:: @ 81A4696 - .string "Es gibt drei Arten des Kampfes\n" - .string "via Verbindungskabel.\p" - .string "EINZELKAMPF ist für zwei TRAINER, die\n" - .string "jeder ein oder mehrere POKéMON\l" - .string "besitzen.\p" - .string "Jeder TRAINER schickt pro Runde\n" - .string "ein POKéMON in den Kampf.\p" - .string "DOPPELKAMPF ist für zwei TRAINER mit\n" - .string "zwei oder mehr POKéMON.\p" - .string "Jeder TRAINER schickt pro Runde zwei\n" - .string "POKéMON in den Kampf.\p" - .string "MULTIKÄMPFE sind für vier TRAINER mit\n" - .string "einem oder mehr POKéMON.\p" - .string "Jeder TRAINER schickt pro Runde ein\n" - .string "POKéMON in den Kampf.$" + .string "There are three link battle modes.\p" + .string "SINGLE BATTLE is for two TRAINERS\n" + .string "with one or more POKéMON each.\p" + .string "Each TRAINER can have one POKéMON\n" + .string "in battle at a time.\p" + .string "DOUBLE BATTLE is for two TRAINERS\n" + .string "with two or more POKéMON each.\p" + .string "Each TRAINER will send out two\n" + .string "POKéMON in battle at a time.\p" + .string "MULTI BATTLE is for four TRAINERS\n" + .string "with one or more POKéMON each.\p" + .string "Each TRAINER can have one POKéMON\n" + .string "in battle at a time.$" OldaleTown_PokemonCenter_2F_Text_1A4826:: @ 81A4826 - .string "Möchtest du kämpfen?$" + .string "Would you like to battle?$" OldaleTown_PokemonCenter_2F_Text_1A4840:: @ 81A4840 - .string "Welche Art des Kampfes?$" + .string "Which Battle Mode would you like\n" + .string "to play?$" OldaleTown_PokemonCenter_2F_Text_1A486A:: @ 81A486A - .string "Für einen DOPPELKAMPF brauchst du\n" - .string "mindestens zwei POKéMON.$" + .string "For a DOUBLE BATTLE, you must have\n" + .string "at least two POKéMON.$" OldaleTown_PokemonCenter_2F_Text_1A48A3:: @ 81A48A3 - .string "Für einen Tausch musst du mindestens\n" - .string "zwei POKéMON bei dir haben.$" + .string "For trading, you must have at least\n" + .string "two POKéMON with you.$" OldaleTown_PokemonCenter_2F_Text_1A48DD:: @ 81A48DD - .string "Dein POKéMON trägt eine {STR_VAR_1}-\n" - .string "BEERE und kann nicht getauscht werden.$" + .string "Your {STR_VAR_1} BERRY-holding POKéMON\n" + .string "can’t be traded.$" -OldaleTown_PokemonCenter_2F_Text_1A490C:: @ 81A490C gUnknown_081A490C:: @ 81A490C - .string "Bitte warten.\n" - .string "... ... B-Knopf: Abbruch$" +OldaleTown_PokemonCenter_2F_Text_1A490C:: @ 81A490C + .string "Please wait.\n" + .string "... ... B Button: Cancel$" -UnknownString_81A4932: @ 81A4932 gUnknown_081A4932:: @ 81A4932 - .string "Wenn die Spieler bereit sind...\n" - .string "A-Knopf: Bestätigen B-Knopf: Abbruch$" +UnknownString_81A4932: @ 81A4932 + .string "When all players are ready...\n" + .string "A Button: Confirm B Button: Cancel$" -UnknownString_81A4975: @ 81A4975 gUnknown_081A4975:: @ 81A4975 - .string "Verbindung für {STR_VAR_1} Spieler aufbauen.\n" - .string "A-Knopf: Bestätigen B-Knopf: Abbruch$" +UnknownString_81A4975: @ 81A4975 + .string "Start link with {STR_VAR_1} players.\n" + .string "A Button: Confirm B Button: Cancel$" -UnknownString_81A49B6: @ 81A49B6 gUnknown_081A49B6:: @ 81A49B6 - .string "Verbindungsaufbau...\n" - .string "... ... B-Knopf: Abbruch$" +UnknownString_81A49B6: @ 81A49B6 + .string "Awaiting linkup...\n" + .string "... ... B Button: Cancel$" UnknownString_81A49E2: @ 81A49E2 - .string "Dein Spiel muss vor Verbindungsaufbau\n" - .string "gespeichert werden. Speichern?$" + .string "Your progress must be saved before\n" + .string "linking. Is it okay to save?$" OldaleTown_PokemonCenter_2F_Text_1A4A22:: @ 81A4A22 - .string "Bitte eintreten.$" + .string "Please enter.$" FallarborTown_ContestLobby_Text_1A4A30:: @ 81A4A30 OldaleTown_PokemonCenter_2F_Text_1A4A30:: @ 81A4A30 - .string "Ein Spieler ist noch nicht bereit\n" - .string "für den Link.\p" - .string "Bitte kommt wieder, wenn jeder seine\n" - .string "Vorbereitungen getroffen hat.$" + .string "Someone is not ready to link.\p" + .string "Please come back after everyone has\n" + .string "made preparations.$" FallarborTown_ContestLobby_Text_1A4A85:: @ 81A4A85 OldaleTown_PokemonCenter_2F_Text_1A4A85:: @ 81A4A85 - .string "Verbindungsfehler...\n" - .string "Die Kabelverbindungen überprüfen und\l" - .string "die Geräte aus- und wieder einschalten.$" + .string "Sorry, we have a transmission error...\n" + .string "Please reset and try again.$" OldaleTown_PokemonCenter_2F_Text_1A4AC8:: @ 81A4AC8 - .string "Tut uns Leid. Hier liegt ein Über-\n" - .string "tragungsfehler vor. Rekorde können\l" - .string "nicht in unterschiedlichen Sprachen\l" - .string "ausgetauscht werden.$" + .string "Sorry, we have a transmission error.\n" + .string "You may not mix records in different\l" + .string "languages.$" FallarborTown_ContestLobby_Text_1A4B1D:: @ 81A4B1D OldaleTown_PokemonCenter_2F_Text_1A4B1D:: @ 81A4B1D - .string "Die Link-Partner haben eine unter-\n" - .string "schiedliche Auswahl getroffen.$" + .string "The link partners appear to have made\n" + .string "different selections.$" OldaleTown_PokemonCenter_2F_Text_1A4B59:: @ 81A4B59 - .string "Bitte komm bald wieder.$" + .string "Please come again.$" OldaleTown_PokemonCenter_2F_Text_1A4B6C:: @ 81A4B6C - .string "Die Anzahl der Teilnehmer ist nicht\n" - .string "korrekt.$" + .string "The number of participants is\n" + .string "incorrect.$" OldaleTown_PokemonCenter_2F_Text_1A4B95:: @ 81A4B95 - .string "Ein EINZELKAMPF kann nicht von\n" - .string "{STR_VAR_1} Spielern geführt werden.$" + .string "The SINGLE Battle Mode cannot be\n" + .string "played by {STR_VAR_1} players.$" OldaleTown_PokemonCenter_2F_Text_1A4BCC:: @ 81A4BCC - .string "Ein DOPPELKAMPF kann nicht von\n" - .string "{STR_VAR_1} Spielern geführt werden.$" + .string "The DOUBLE Battle Mode cannot be\n" + .string "played by {STR_VAR_1} players.$" OldaleTown_PokemonCenter_2F_Text_1A4C03:: @ 81A4C03 - .string "Für diesen Kampfmodus werden vier\n" - .string "Spieler benötigt.$" + .string "There must be four players to play\n" + .string "this Battle Mode.$" OldaleTown_PokemonCenter_2F_Text_1A4C38:: @ 81A4C38 - .string "Bitte überprüfe die Anzahl der Spieler\n" - .string "und fange noch einmal an.$" + .string "Please confirm the number of players\n" + .string "and start again.$" TradeRoom_WillLinkBeTerminated: @ 81A4C6E - .string "Wenn du den Raum verlässt, wird die Ver-\n" - .string "bindung abgebrochen. Einverstanden?$" + .string "The link will be terminated if you\n" + .string "leave the room. Is that okay?$" TradeRoom_TerminatingLink: @ 81A4CAF - .string "Verbindung wird abgebrochen... Du wirst\n" - .string "aus dem Raum begleitet. Bitte warten.$" + .string "Terminating link... You will be\n" + .string "escorted out of the room. Please wait.$" CableClub_TooBusyToNotice: @ 81A4CF6 - .string "Dieser TRAINER ist zu beschäftigt...$" + .string "This TRAINER is too busy to notice...$" CableClub_LookAtTrainerCard1: @ 81A4D1C - .string "Hey! Schau dir mal den TRAINERPASS\n" - .string "von {STR_VAR_1} an!$" + .string "Score! Got to look at {STR_VAR_1}’s\n" + .string "TRAINER CARD!$" CableClub_LookAtTrainerCard2: @ 81A4D45 - .string "Hey! Schau dir mal den TRAINERPASS\n" - .string "von {STR_VAR_1} an! Es ist ein\l" - .string "{STR_VAR_2}PASS.$" + .string "Score! Got to look at {STR_VAR_1}’s\n" + .string "TRAINER CARD! It’s a {STR_VAR_2} card!$" SingleBattleColosseum_Text_1A4D7E:: @ 81A4D7E - .string "Bitte geh in Position und beginne mit\n" - .string "dem Kampf.$" + .string "Please take your seat and start\n" + .string "your battle.$" TradeCenter_Text_1A4DAB:: @ 81A4DAB - .string "Bitte geh in Position und beginne mit\n" - .string "dem Tausch.$" + .string "Please take your seat and start\n" + .string "your trade.$" RecordCorner_Text_1A4DD7:: @ 81A4DD7 - .string "Bitte geh in Position und warte.$" + .string "Please take your seat and wait.$" RecordCorner_Text_1A4DF7:: @ 81A4DF7 - .string "Danke für den Besuch!$" + .string "Thanks for coming.$" UnknownString_81A4E0A: @ 81A4E0A - .string "Bitte wähle die POKéMON für den\n" - .string "MULTIKAMPF.$" + .string "Please choose your POKéMON for the\n" + .string "MULTI BATTLE.$" RecordCorner_Text_1A4E3B:: @ 81A4E3B - .string "{STR_VAR_1} hat ein {STR_VAR_2}\n" - .string "versendet.$" + .string "{STR_VAR_1} sent over one\n" + .string "{STR_VAR_2}.$" OldaleTown_PokemonCenter_2F_Text_1A4E50:: @ 81A4E50 - .string "Der Eintrag auf dem TRAINERPASS wird\n" - .string "geändert.$" + .string "The TRAINER CARD data will\n" + .string "be rewritten.$" OldaleTown_PokemonCenter_2F_Text_1A4E79:: @ 81A4E79 - .string "Ich hoffe, du kommst bald wieder vorbei.$" + .string "I hope to see you again!$" diff --git a/data/text/contest_hall.inc b/data/text/contest_hall.inc index 7e05a9a2d..3a8682208 100644 --- a/data/text/contest_hall.inc +++ b/data/text/contest_hall.inc @@ -1,246 +1,238 @@ FallarborTown_ContestLobby_Text_1A5DFC:: @ 81A5DFC - .string "Hallo! Wir nehmen Anmeldungen für die\n" - .string "{STR_VAR_1}-KLASSE POKéMON\l" - .string "WETTBEWERBE entgegen.$" + .string "Hello, there!\p" + .string "We’re accepting registrations for\n" + .string "{STR_VAR_1} Rank POKéMON CONTESTS.$" FallarborTown_ContestLobby_Text_1A5E46:: @ 81A5E46 - .string "Soll eines deiner POKéMON an einem der\n" - .string "WETTBEWERBE teilnehmen?$" + .string "Would you like to enter your POKéMON\n" + .string "in our CONTESTS?$" FallarborTown_ContestLobby_Text_1A5E7C:: @ 81A5E7C - .string "Welches Thema möchtest du dir ansehen?$" + .string "Which topic would you like?$" FallarborTown_ContestLobby_Text_1A5E98:: @ 81A5E98 - .string "In einem POKéMON WETTBEWERB zeigen\n" - .string "4 TRAINER jeweils eines ihrer POKéMON\l" - .string "einer Jury.\p" - .string "Der WETTBEWERB besteht aus zwei\n" - .string "Durchläufen.\p" - .string "Im ersten Durchlauf wird geprüft, wie\n" - .string "gut das POKéMON beim Publikum ankommt.\p" - .string "Im zweiten Durchlauf muss das POKéMON\n" - .string "mit der Ausdruckskraft seiner Attacken\l" - .string "überzeugen.\p" - .string "Die Attacken müssen sorgfältig gewählt\n" - .string "werden, damit sie dem JUROR ins Auge\l" - .string "fallen und das Publikum begeistern. Ver-\l" - .string "suche, die Attacken gut zu platzieren.\p" - .string "Am Ende werden die Ergebnisse beider\n" - .string "Durchläufe addiert.\p" - .string "Das POKéMON mit dem besten Ergebnis\n" - .string "wird zum Gewinner erklärt.$" + .string "A POKéMON CONTEST involves four\n" + .string "TRAINERS entering one POKéMON each\l" + .string "in competitive judging.\p" + .string "A CONTEST has two stages of judging,\n" + .string "primary and secondary.\p" + .string "Primary judging is a popularity poll\n" + .string "involving the audience.\p" + .string "Secondary judging features appeals\n" + .string "by the POKéMON using their moves.\p" + .string "Plan appeals carefully to earn the\n" + .string "most attention of the JUDGE and\l" + .string "excite the audience.\l" + .string "Do your best to stand out.\p" + .string "The primary and secondary scores are\n" + .string "added at the end.\p" + .string "The POKéMON garnering the highest\n" + .string "score is declared the winner.$" FallarborTown_ContestLobby_Text_1A609B:: @ 81A609B - .string "Es gibt fünf verschiedene WETTBEWERBE.\p" - .string "COOLNESS, SCHÖNHEIT, ANMUT, KLUGHEIT\n" - .string "und STÄRKE heißen die Kategorien.\p" - .string "Wähle einen WETTBEWERB, der deinem\n" - .string "POKéMON am besten liegt.$" + .string "There are five kinds of CONTESTS.\p" + .string "COOL, BEAUTY, CUTE, SMART, and\n" + .string "TOUGH are the five categories.\p" + .string "Choose the CONTEST that is right for\n" + .string "the POKéMON you plan to enter.$" FallarborTown_ContestLobby_Text_1A613F:: @ 81A613F - .string "Die POKéMON WETTBEWERBE sind in vier\n" - .string "Klassen aufgeteilt.\p" - .string "NORMAL, SUPER, HYPER und MASTER.\p" - .string "In der NORMAL-KLASSE kann jedes\n" - .string "POKéMON antreten.\p" - .string "Jedes POKéMON, das die NORMAL-KLASSE\n" - .string "gewonnen hat, kann in der SUPER-KLASSE\l" - .string "derselben Kategorie antreten.\p" - .string "Genauso kann das POKéMON, das in der\n" - .string "SUPER-KLASSE gewonnen hat, in der\l" - .string "HYPER-KLASSE und nach einem Sieg\p" - .string "dort in der MASTER-KLASSE antreten.\n" - .string "Immer in derselben Kategorie.\p" - .string "Ein POKéMON, das in der MASTER-KLASSE\n" - .string "gewonnen hat, kann sooft es sein\l" - .string "TRAINER mag, wieder dort antreten.$" + .string "There are four ranks of POKéMON\n" + .string "CONTESTS.\p" + .string "NORMAL, SUPER, HYPER and MASTER\n" + .string "are the four ranks.\p" + .string "In the NORMAL Rank, any POKéMON may\n" + .string "enter.\p" + .string "Any POKéMON that won a NORMAL Rank\n" + .string "CONTEST may move up the SUPER Rank in\l" + .string "the same category.\p" + .string "In the same way, a SUPER Rank winner\n" + .string "can move up to the HYPER Rank, and a\l" + .string "HYPER Rank winner can advance to the\l" + .string "MASTER Rank in the same category.\p" + .string "A POKéMON that won in the MASTER Rank\n" + .string "may compete in the MASTER Rank as\l" + .string "often as its TRAINER wants.$" FallarborTown_ContestLobby_Text_1A6319:: @ 81A6319 - .string "Welches POKéMON soll teilnehmen?$" + .string "Which POKéMON would you like to enter?$" FallarborTown_ContestLobby_Text_1A6340:: @ 81A6340 - .string "Jeder, der eine WETTBEWERBSKARTE\n" - .string "besitzt, darf teilnehmen.\p" - .string "Du bekommst die WETTBEWERBSKARTE\n" - .string "kostenlos in der WETTBEWERBSHALLE für\l" - .string "die NORMAL-KLASSE in WIESENFLUR.\p" - .string "Bitte hol dir die KARTE dort ab und komm\n" - .string "dann wieder.$" + .string "Anyone with a CONTEST PASS may enter.\p" + .string "You may obtain a CONTEST PASS at the\n" + .string "NORMAL RANK CONTEST HALL in\l" + .string "VERDANTURF TOWN free of charge.\p" + .string "Please obtain a CONTEST PASS and\n" + .string "come again.$" LilycoveCity_ContestLobby_Text_1A63F4:: @ 81A63F4 - .string "Ich akzeptiere nur Anmeldungen von\n" - .string "vier Spielern, die via Link verbunden\l" - .string "sind und am POKéMON WETTBEWERB\l" - .string "teilnehmen wollen.\p" - .string "Jeder, der eine WETTBEWERBSKARTE\n" - .string "besitzt, darf teilnehmen.\p" - .string "Du bekommst die WETTBEWERBSKARTE\n" - .string "kostenlos in der WETTBEWERBSHALLE für\l" - .string "die NORMAL-KLASSE in WIESENFLUR.\p" - .string "Bitte hol dir die KARTE dort ab und komm\n" - .string "dann wieder.$" + .string "I accept registrations only from four\n" + .string "linked players for a POKéMON CONTEST.\p" + .string "Anyone with a CONTEST PASS may enter.\p" + .string "You may obtain a CONTEST PASS at the\n" + .string "NORMAL RANK CONTEST HALL in\l" + .string "VERDANTURF TOWN free of charge.\p" + .string "Please obtain a CONTEST PASS and\n" + .string "come again.$" FallarborTown_ContestLobby_Text_1A64F4:: @ 81A64F4 - .string "Jeder, der eine WETTBEWERBSKARTE\n" - .string "besitzt, darf teilnehmen.\p" - .string "Wenn du keine hast, kann ich dir sofort\n" - .string "eine ausstellen.\p" - .string "Möchtest du eine WETTBEWERBSKARTE\n" - .string "haben?$" + .string "Anyone with a CONTEST PASS may enter.\p" + .string "If you don’t have one, I can issue one\n" + .string "for you right now.\p" + .string "Would you like me to issue you a\n" + .string "CONTEST PASS?$" FallarborTown_ContestLobby_Text_1A6583:: @ 81A6583 - .string "Bitte schön!$" + .string "Here you go!$" FallarborTown_ContestLobby_Text_1A6590:: @ 81A6590 - .string "Oh!\p" - .string "Aber du besitzt ja bereits eine WETT-\n" - .string "BEWERBSKARTE, {PLAYER}.\p" - .string "Bitte bring die KARTE das nächste Mal\n" - .string "mit.$" + .string "Oh?\p" + .string "We’ve already issued you a CONTEST\n" + .string "PASS, {PLAYER}.\p" + .string "Please come back with your CONTEST\n" + .string "PASS.$" FallarborTown_ContestLobby_Text_1A65EA:: @ 81A65EA - .string "Bitte komm vorbei, wann immer du an\n" - .string "einem WETTBEWERB teilnehmen möchtest.$" + .string "Please visit whenever you would like\n" + .string "to enter a CONTEST.$" FallarborTown_ContestLobby_Text_1A6623:: @ 81A6623 - .string "An welchem WETTBEWERB möchtest du\n" - .string "teilnehmen?$" + .string "Which CONTEST would you like to enter?$" FallarborTown_ContestLobby_Text_1A664A:: @ 81A664A LilycoveCity_ContestLobby_Text_1A664A:: @ 81A664A - .string "Tut mir schrecklich Leid, aber dein\n" - .string "POKéMON kann hier noch nicht\l" - .string "antreten...$" + .string "I’m terribly sorry, but your POKéMON\n" + .string "is not qualified to compete at this\l" + .string "Rank yet...$" FallarborTown_ContestLobby_Text_1A669F:: @ 81A669F LilycoveCity_ContestLobby_Text_1A669F:: @ 81A669F - .string "Tut mit Leid, aber ein EI kann nicht an\n" - .string "einem WETTBEWERB teilnehmen.$" + .string "I’m sorry, but an EGG cannot take part\n" + .string "in a POKéMON CONTEST.$" FallarborTown_ContestLobby_Text_1A66DC:: @ 81A66DC LilycoveCity_ContestLobby_Text_1A66DC:: @ 81A66DC - .string "Dein POKéMON ist nicht in der Lage, an\n" - .string "einem WETTBEWERB teilzunehmen...$" + .string "Your POKéMON appears to be in no\n" + .string "condition to take part in a CONTEST...$" FallarborTown_ContestLobby_Text_1A6724:: @ 81A6724 - .string "Oh, aber das BAND...\p" - .string "Dein POKéMON hat diesen WETTBEWERB\n" - .string "schon einmal gewonnen, oder?\p" - .string "Möchtest du es trotzdem für diesen\n" - .string "WETTBEWERB anmelden?$" + .string "Oh, but that RIBBON...\p" + .string "Your POKéMON has won this CONTEST\n" + .string "before, hasn’t it?\p" + .string "Would you like to enter it in this\n" + .string "CONTEST anyway?$" FallarborTown_ContestLobby_Text_1A67A3:: @ 81A67A3 LilycoveCity_ContestLobby_Text_1A67A3:: @ 81A67A3 - .string "Ist das dein WETTBEWERBS-POKéMON?$" + .string "Is that your CONTEST POKéMON?$" FallarborTown_ContestLobby_Text_1A67C1:: @ 81A67C1 - .string "Okay, dein POKéMON wird an diesem\n" - .string "WETTBEWERB teilnehmen.\p" - .string "Dein POKéMON ist die Nummer 4.\n" - .string "Der WETTBEWERB wird in Kürze starten.$" + .string "Okay, your POKéMON will be entered\n" + .string "in this CONTEST.\p" + .string "Your POKéMON is Entry No. 4.\n" + .string "The CONTEST will begin shortly.$" FallarborTown_ContestLobby_Text_1A6832:: @ 81A6832 LilycoveCity_ContestLobby_Text_1A6832:: @ 81A6832 SlateportCity_ContestLobby_Text_1A6832:: @ 81A6832 VerdanturfTown_ContestLobby_Text_1A6832:: @ 81A6832 - .string "Bitte folge mir, und viel Glück!$" + .string "Please come in through here.\n" + .string "Good luck!$" FallarborTown_ContestLobby_Text_1A685A:: @ 81A685A - .string "Herzlichen Glückwunsch! Dein POKéMON\n" - .string "hat den WETTBEWERB gewonnen!\p" - .string "Und hier haben wir deinen Preis.\n" - .string "Bitte, komm hier herüber!$" + .string "Congratulations! Your POKéMON is the\n" + .string "CONTEST winner!\p" + .string "We have your prize right here.\n" + .string "Please, right this way!$" FallarborTown_ContestLobby_Text_1A68C6:: @ 81A68C6 - .string "Bitte hole deinen Preis später ab.$" + .string "Please come back for your prize\n" + .string "later on.$" LinkContestRoom1_Text_1A68F0:: @ 81A68F0 - .string "MC: Hallo! Wir fangen nun mit einem \n" - .string "{STR_VAR_3}-KLASSE POKéMON {STR_VAR_2}-\l" - .string "WETTBEWERB an!\p" - .string "Die folgenden TRAINER und ihre POKéMON\n" - .string "nehmen teil:$" + .string "MC: Hello! We’re just getting started\n" + .string "with a {STR_VAR_3} Rank POKéMON\l" + .string "{STR_VAR_2} CONTEST!\p" + .string "The participating TRAINERS and their\n" + .string "POKéMON are as follows:$" LinkContestRoom1_Text_1A6976:: @ 81A6976 - .string "MC: Hallo! Wir fangen nun mit einem \n" - .string "4-Spieler POKéMON {STR_VAR_2}-\l" - .string "WETTBEWERB via Link an!\p" - .string "Die folgenden TRAINER und ihre POKéMON\n" - .string "nehmen teil:$" + .string "MC: Hello! We’re just getting started\n" + .string "with a 4-player linked POKéMON\l" + .string "{STR_VAR_2} CONTEST!\p" + .string "The participating TRAINERS and their\n" + .string "POKéMON are as follows:$" LinkContestRoom1_Text_1A6A04:: @ 81A6A04 - .string "MC: Teilnehmer Nr. {STR_VAR_2}!\n" - .string "{STR_VAR_3} von {STR_VAR_1}!$" + .string "MC: Entry No. {STR_VAR_2}!\n" + .string "{STR_VAR_1}’s {STR_VAR_3}!$" LinkContestRoom1_Text_1A6A1F:: @ 81A6A1F - .string "MC: Nun haben wir alle vier teilnehmenden\n" - .string "POKéMON gesehen.\p" - .string "Zeit für die erste Bewertung!\p" - .string "Das Publikum entscheidet, welches\n" - .string "POKéMON am besten gefällt.\p" - .string "Und ohne weitere Verzögerung kommen\n" - .string "wir zu der Bewertung!$" + .string "MC: We’ve just seen the four POKéMON\n" + .string "contestants.\p" + .string "Now it’s time for primary judging!\p" + .string "The audience will vote on their\n" + .string "favorite POKéMON contestants.\p" + .string "Without any further ado, let the\n" + .string "voting begin!$" LinkContestRoom1_Text_1A6AE1:: @ 81A6AE1 - .string "Bewertung läuft...$" + .string "Voting under way...$" LinkContestRoom1_Text_1A6AF5:: @ 81A6AF5 - .string "Die Bewertung ist nun abgeschlossen!\p" - .string "Während diese ausgewertet wird, kommen\n" - .string "wir zum zweiten Durchlauf!\p" - .string "Im zweiten Durchlauf zeigen uns die\n" - .string "Kontrahenten die Ausdruckskraft\l" - .string "ihrer Attacken!\p" - .string "Hoffen wir, dass sie uns mit ihren Vor-\n" - .string "führungen den Atem rauben!\p" - .string "Hoffen wir auf Enthusiasmus!\n" - .string "Lasst die Vorführung beginnen!$" + .string "Voting is now complete!\p" + .string "While the votes are being tallied,\n" + .string "let’s move on to secondary judging!\p" + .string "The second stage of judging is the\n" + .string "much anticipated appeal time!\p" + .string "May the contestants amaze us with\n" + .string "superb appeals of dazzling moves!\p" + .string "Let’s see a little enthusiasm!\n" + .string "Let’s appeal!$" LinkContestRoom1_Text_1A6C06:: @ 81A6C06 - .string "MC: Die Bewertung ist auch hier beendet!$" + .string "MC: That’s it for judging!$" LinkContestRoom1_Text_1A6C21:: @ 81A6C21 - .string "Herzlichen Dank an die Teilnehmer für\n" - .string "ihre wunderbare Vorführung!\p" - .string "Damit ist die Bewertung abgeschlossen!\n" - .string "Vielen Dank für alles!$" + .string "Thank you all for a most wonderful\n" + .string "display of quality appeals!\p" + .string "This concludes all judging!\n" + .string "Thank you for your fine efforts!$" LinkContestRoom1_Text_1A6C9D:: @ 81A6C9D - .string "Kommen wir nun zu dem, was unseren Puls\n" - .string "höher schlagen lässt: Die Bekanntgabe\l" - .string "der Gewinner.\p" - .string "Der JUROR scheint für die Bekanntgabe\n" - .string "bereit zu sein!$" + .string "Now, all that remains is the pulse-\n" + .string "pounding proclamation of the winner.\p" + .string "The JUDGE looks ready to make the\n" + .string "announcement!$" LinkContestRoom1_Text_1A6D16:: @ 81A6D16 - .string "JUROR: Ich werde nun den Sieger\n" - .string "bekannt geben!$" + .string "JUDGE: I will now declare the winner!$" LinkContestRoom1_Text_1A6D3C:: @ 81A6D3C - .string "MC: Teilnehmer Nr. {STR_VAR_2}!\p" - .string "{STR_VAR_3} und {STR_VAR_1}!\n" - .string "Herzlichen Glückwunsch!$" + .string "MC: Entry No. {STR_VAR_2}!\p" + .string "{STR_VAR_3} and {STR_VAR_1},\n" + .string "congratulations!$" LinkContestRoom1_Text_1A6D6A:: @ 81A6D6A - .string "Wir überreichen dir hiermit dieses BAND\n" - .string "als Zeichen deines Sieges!$" + .string "We confer on you this RIBBON as your\n" + .string "prize!$" LinkContestRoom1_Text_1A6D96:: @ 81A6D96 - .string "{PLAYER} erhält ein BAND.$" + .string "{PLAYER} received a RIBBON.$" LinkContestRoom1_Text_1A6DAC:: @ 81A6DAC - .string "{PLAYER} steckt {STR_VAR_1} das\n" - .string "BAND an.$" + .string "{PLAYER} put the RIBBON on\n" + .string "{STR_VAR_1}.$" LinkContestRoom1_Text_1A6DC5:: @ 81A6DC5 - .string "MC: Bitte schön!\n" - .string "Bitte, dies ist dein Preis!$" + .string "MC: Here you are!\n" + .string "Please accept your prize!$" LinkContestRoom1_Text_1A6DF1:: @ 81A6DF1 - .string "MC: Herzlichen Glückwunsch!\n" - .string "Komm bald wieder!$" + .string "MC: Congratulations!\n" + .string "Please do compete again!$" LinkContestRoom1_Text_1A6E1F:: @ 81A6E1F - .string "Bitte hole deinen Preis später an der\n" - .string "Rezeption ab.\l" - .string "Und nimm bald wieder teil!$" + .string "Please pick up your prize at the\n" + .string "reception counter later.\l" + .string "Please do compete again!$" diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 02264880e..5c9fdf0db 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -1,151 +1,99 @@ -ContestString_DescHighlyAppealing: @ 83CA4EC - .string "Eine sehr ansprechende\n" - .string "Vorführung.$" -ContestString_DescStartled1: @ 83CA505 - .string "Einsatz der Attacke macht\n" - .string "PKMN leichter irritierbar.$" -ContestString_DescGreatLock: @ 83CA538 - .string "Großartiger Ausdruck, der\n" - .string "sich nicht steigern lässt.$" -ContestString_DescRepeatable: @ 83CA56D - .string "Langweilt den JUROR auch\n" - .string "bei Wiederholung nicht.$" -ContestString_DescStartled2: @ 83CA59E - .string "Kann Irritation durch\n" - .string "andere einmal verhindern.$" -ContestString_DescStartled3: @ 83CA5C7 - .string "Kann Irritation durch\n" - .string "andere verhindern.$" -ContestString_DescStartled4: @ 83CA5EB - .string "Kann Irritation durch an-\n" - .string "dere ein wenig eindämmen.$" -ContestString_DescStartled5: @ 83CA618 - .string "Einsatz der Attacke dämmt\n" - .string "danach Irritation ein.$" -ContestString_DescStartled6: @ 83CA651 - .string "Irritiert das vordere\n" - .string "POKéMON ein wenig.$" -ContestString_DescStartled7: @ 83CA679 - .string "Irritiert die POKéMON ein\n" - .string "wenig, die schon auftraten.$" -ContestString_DescStartled8: @ 83CA6A9 - .string "Irritiert das POKéMON, das\n" - .string "vorher aufgetreten ist.$" -ContestString_DescStartled9: @ 83CA6DD - .string "Irritiert alle POKéMON,\n" - .string "die bisher auftraten.$" -ContestString_DescStartled10: @ 83CA710 - .string "Irritiert das vordere\n" - .string "POKéMON sehr stark.$" -ContestString_DescStartled11: @ 83CA735 - .string "Irritiert die POKéMON, die\n" - .string "schon aufgetreten sind.$" -ContestString_DescStartled12: @ 83CA762 - .string "Irritiert das POKéMON, das\n" - .string "vorher aufgetreten ist.$" -ContestString_DescStartled13: @ 83CA796 - .string "Irritiert alle POKéMON, die\n" - .string "vorher aufgetreten sind.$" -ContestString_DescAttentionShift: @ 83CA7CA - .string "Lenkt den JUROR von den\n" - .string "anderen POKéMON ab.$" -ContestString_DescStartled14: @ 83CA7F4 - .string "Irritiert PKMN, bes. die,\n" - .string "auf die der JUROR achtet.$" -ContestString_DescJamOthersMissTurn: @ 83CA829 - .string "Stört die anderen und An-\n" - .string "wender setzt 1 Runde aus.$" -ContestString_DescStartled15: @ 83CA85A - .string "Irritiert PKMN, bes. die, die\n" - .string "Ausdruck gl. Typs zeigten.$" -ContestString_DescStartled16: @ 83CA889 - .string "Irritiert PKMN, die Ausdrck.\n" - .string "des Typs COOL vorführten.$" -ContestString_DescStartled17: @ 83CA8B8 - .string "Irritiert PKMN, die Ausdrck.\n" - .string "des Typs SCHÖN vorführten.$" -ContestString_DescStartled18: @ 83CA8E9 - .string "Irritiert PKMN, die Ausdrck.\n" - .string "des Typs ANMUT vorführten.$" -ContestString_DescStartled19: @ 83CA918 - .string "Irritiert PKMN, die Ausdrck.\n" - .string "des Typs KLUG vorführten.$" -ContestString_DescStartled20: @ 83CA948 - .string "Irritiert PKMN, die Ausdrck.\n" - .string "des Typs STARK vorführten.$" - -ContestString_DescNervousOne: @ 83CA978 - .string "Macht nachfolgendes\n" - .string "POKéMON nervös.$" - -ContestString_DescNervousAllAfter: @ 83CA9A2 - .string "Macht alle nachfolgenden\n" - .string "POKéMON nervös.$" - -ContestString_DescConditionWorseBefore: @ 83CA9CC - .string "Schwächt Kondition der\n" - .string "PKMN, die bisher auftraten.$" - -ContestString_DescStartled21: @ 83CA9FE - .string "Irritiert POKéMON, die eine\n" - .string "gute Kondition haben.$" -ContestString_DescGreatWhenFirst: @ 83CAA28 - .string "Ausdruck gelingt sehr gut,\n" - .string "wenn als Erster vorgeführt.$" -ContestString_DescGreatWhenLast: @ 83CAA53 - .string "Ausdruck gelingt sehr gut,\n" - .string "wenn zuletzt vorgeführt.$" -ContestString_DescAppealGoodBeforeAll: @ 83CAA7D - .string "Ausdruck gelingt so gut\n" - .string "wie die der Vorgänger.$" -ContestString_DescAppealGoodBeforeOne: @ 83CAAAA - .string "Ausdruck gelingt so gut\n" - .string "wie der des Vorgängers.$" -ContestString_DescBetterWhenLater: @ 83CAAD9 - .string "Je später der Auftritt,\n" - .string "desto besser der Ausdruck.$" -ContestString_DescAffectedByTiming: @ 83CAB0C - .string "Die Qualität des Ausdrucks\n" - .string "hängt vom Timing ab.$" -ContestString_DescBetterWhenSameType: @ 83CAB41 - .string "Gelingt gut, wenn vom\n" - .string "selben Typ wie der vorige.$" -ContestString_DescBetterWhenDiffType: @ 83CAB75 - .string "Gelingt gut, wenn vom\n" - .string "anderen Typ als der vorige.$" -ContestString_DescAffectedByFront: @ 83CABAA - .string "Hängt von Qualität des Aus-\n" - .string "drucks des Vorgängers ab.$" -ContestString_DescConditionUp: @ 83CABD9 - .string "Verbessert die Kondition\n" - .string "und verhindert Nervosität.$" -ContestString_DescAffectedByCondition: @ 83CAC0E - .string "Ausdruck gelingt gut, wenn\n" - .string "Kondition des PKMN gut ist.$" -ContestString_DescAppealEarlier: @ 83CAC45 - .string "Der nächste Ausdruck kann\n" - .string "früher vorgeführt werden.$" -ContestString_DescAppealLater: @ 83CAC74 - .string "Der nächste Ausdruck kann\n" - .string "später vorgeführt werden.$" -ContestString_DescRandomOrderEasier: @ 83CACA1 - .string "Ändert die Reihenfolge der\n" - .string "nächst. Auftritte leichter.$" -ContestString_DescRandomOrder: @ 83CACD4 - .string "Ändert die Reihenfolge der\n" - .string "nächsten Auftritte.$" -ContestString_DescAnyExcitement: @ 83CAD05 - .string "Verzückt das Publikum in \n" - .string "jedem WETTBEWERB.$" -ContestString_DescStartled22: @ 83CAD39 - .string "Irritiert alle POKéMON,\n" - .string "deren Ausdruck gut war.$" -ContestString_DescScaleWithExcitement: @ 83CAD6C - .string "Gelingt am besten, wenn\n" - .string "das Publikum gespannt ist.$" -ContestString_DescStopExcitement: @ 83CADA1 - .string "Bremst zeitweise Begeis-\n" - .string "terung des Publikums.$" +ContestString_DescHighlyAppealing: + .string "A highly appealing move.$" +ContestString_DescStartled1: + .string "After this move, the user is\nmore easily startled.$" +ContestString_DescGreatLock: + .string "Makes a great appeal, but\nallows no more to the end.$" +ContestString_DescRepeatable: + .string "Can be repeatedly used\nwithout boring the JUDGE.$" +ContestString_DescStartled2: + .string "Can avoid being startled\nby others once.$" +ContestString_DescStartled3: + .string "Can avoid being startled\nby others.$" +ContestString_DescStartled4: + .string "Can avoid being startled\nby others a little.$" +ContestString_DescStartled5: + .string "After this move, the user is\nless likely to be startled.$" +ContestString_DescStartled6: + .string "Slightly startles the\nPOKéMON in front.$" +ContestString_DescStartled7: + .string "Slightly startles those\nthat have made appeals.$" +ContestString_DescStartled8: + .string "Startles the POKéMON that\nappealed before the user.$" +ContestString_DescStartled9: + .string "Startles all POKéMON that\nhave done their appeals.$" +ContestString_DescStartled10: + .string "Badly startles the\nPOKéMON in front.$" +ContestString_DescStartled11: + .string "Badly startles those that\nhave made appeals.$" +ContestString_DescStartled12: + .string "Startles the POKéMON that\nappealed before the user.$" +ContestString_DescStartled13: + .string "Startles all POKéMON that\nappealed before the user.$" +ContestString_DescAttentionShift: + .string "Shifts the JUDGE’s\nattention from others.$" +ContestString_DescStartled14: + .string "Startles the POKéMON that\nhas the JUDGE’s attention.$" +ContestString_DescJamOthersMissTurn: + .string "Jams the others, and misses\none turn of appeals.$" +ContestString_DescStartled15: + .string "Startles POKéMON that\nmade a same-type appeal.$" +ContestString_DescStartled16: + .string "Badly startles POKéMON\nthat made COOL appeals.$" +ContestString_DescStartled17: + .string "Badly startles POKéMON\nthat made BEAUTY appeals.$" +ContestString_DescStartled18: + .string "Badly startles POKéMON\nthat made CUTE appeals.$" +ContestString_DescStartled19: + .string "Badly startles POKéMON\nthat made SMART appeals.$" +ContestString_DescStartled20: + .string "Badly startles POKéMON\nthat made TOUGH appeals.$" +ContestString_DescNervousOne: + .string "Makes one POKéMON after\nthe user nervous.$" +ContestString_DescNervousAllAfter: + .string "Makes all POKéMON after\nthe user nervous.$" +ContestString_DescConditionWorseBefore: + .string "Worsens the condition of\nthose that made appeals.$" +ContestString_DescStartled21: + .string "Badly startles POKéMON in\ngood condition.$" +ContestString_DescGreatWhenFirst: + .string "The appeal works great if\nperformed first.$" +ContestString_DescGreatWhenLast: + .string "The appeal works great if\nperformed last.$" +ContestString_DescAppealGoodBeforeAll: + .string "Makes the appeal as good\nas those before it.$" +ContestString_DescAppealGoodBeforeOne: + .string "Makes the appeal as good\nas the one before it.$" +ContestString_DescBetterWhenLater: + .string "The appeal works better\nthe later it is performed.$" +ContestString_DescAffectedByTiming: + .string "The appeal’s quality varies\ndepending on its timing.$" +ContestString_DescBetterWhenSameType: + .string "Works well if it’s the same\ntype as the one before.$" +ContestString_DescBetterWhenDiffType: + .string "Works well if different in\ntype than the one before.$" +ContestString_DescAffectedByFront: + .string "Affected by how well the\nappeal in front goes.$" +ContestString_DescConditionUp: + .string "Ups the user’s condition.\nHelps prevent nervousness.$" +ContestString_DescAffectedByCondition: + .string "The appeal works well if the\nuser’s condition is good.$" +ContestString_DescAppealEarlier: + .string "The next appeal can be made\nearlier next turn.$" +ContestString_DescAppealLater: + .string "The next appeal can be made\nlater next turn.$" +ContestString_DescRandomOrderEasier: + .string "Makes the next turn’s order\nmore easily scrambled.$" +ContestString_DescRandomOrder: + .string "Scrambles the order of\nappeals on the next turn.$" +ContestString_DescAnyExcitement: + .string "An appeal that excites the\naudience in any CONTEST.$" +ContestString_DescStartled22: + .string "Badly startles all POKéMON\nthat made good appeals.$" +ContestString_DescScaleWithExcitement: + .string "The appeal works best the\nmore the crowd is excited.$" +ContestString_DescStopExcitement: + .string "Temporarily stops the\ncrowd from growing excited.$" .align 2 gContestEffectStrings:: @ 83CADD4 @@ -198,32 +146,32 @@ gContestEffectStrings:: @ 83CADD4 .4byte ContestString_DescScaleWithExcitement .4byte ContestString_DescStopExcitement -ContestString_MoveRainDance: @ 83CAE94 - .string "REGENTANZ$" -ContestString_MoveRage: @ 83CAE9F - .string "RASEREI$" -ContestString_MoveFocusEnergy: @ 83CAEA4 - .string "ENERGIEFOKUS$" -ContestString_MoveHypnosis: @ 83CAEB1 - .string "HYPNOSE$" -ContestString_MoveSoftboiled: @ 83CAEBA - .string "WEICHEI$" -ContestString_MoveHornAttack: @ 83CAEC5 - .string "HORNATTACKE$" -ContestString_MoveSwordsDance: @ 83CAED1 - .string "SCHWERTTANZ$" -ContestString_MoveConversion: @ 83CAEDE - .string "UMWANDLUNG$" -ContestString_MoveSunnyDay: @ 83CAEE9 - .string "SONNENTAG$" -ContestString_MoveRest: @ 83CAEF3 - .string "ERHOLUNG$" -ContestString_MoveVicegrip: @ 83CAEF8 - .string "KLAMMER$" -ContestString_MoveDefenseCurl: @ 83CAF01 - .string "EINIGLER$" -ContestString_MoveLockOn: @ 83CAF0E - .string "ZIELSCHUSS$" +ContestString_MoveRainDance: + .string "RAIN DANCE$" +ContestString_MoveRage: + .string "RAGE$" +ContestString_MoveFocusEnergy: + .string "FOCUS ENERGY$" +ContestString_MoveHypnosis: + .string "HYPNOSIS$" +ContestString_MoveSoftboiled: + .string "SOFTBOILED$" +ContestString_MoveHornAttack: + .string "HORN ATTACK$" +ContestString_MoveSwordsDance: + .string "SWORDS DANCE$" +ContestString_MoveConversion: + .string "CONVERSION$" +ContestString_MoveSunnyDay: + .string "SUNNY DAY$" +ContestString_MoveRest: + .string "REST$" +ContestString_MoveVicegrip: + .string "VICEGRIP$" +ContestString_MoveDefenseCurl: + .string "DEFENSE CURL$" +ContestString_MoveLockOn: + .string "LOCK-ON$" .align 2 .4byte ContestString_MoveRainDance @@ -242,15 +190,15 @@ ContestString_MoveLockOn: @ 83CAF0E .4byte ContestString_MoveLockOn ContestString_Cool: - .string "COOL.$" + .string "COOL$" ContestString_Beauty: - .string "SCHÖN.$" + .string "BEAUTY$" ContestString_Cute: - .string "ANMUT$" + .string "CUTE$" ContestString_Smart: - .string "KLUG.$" + .string "SMART$" ContestString_Tough: - .string "STÄRKE$" + .string "TOUGH$" .align 2 gUnknown_083CAF70:: @ 83CAF70 @@ -261,70 +209,47 @@ gUnknown_083CAF70:: @ 83CAF70 .4byte ContestString_Tough gText_Contest_WhichMoveWillBePlayed:: @ 83CAF84 - .string "Ausdruck {NAME_END}! Welche\n" - .string "Attacke wird gezeigt?$" + .string "Appeal no. {NAME_END}!\nWhich move will be played?$" gText_Contest_ButItCantParticipate:: @ 83CAFAE - .string "Ausdruck {NAME_END}! Aber es\n" - .string "kann nicht teilnehmen!$" + .string "Appeal no. {NAME_END}!\nBut it can’t participate!$" gUnknown_083CAFD7:: @ 83CAFD7 - .string "{STR_VAR_1} führt\n" - .string "{STR_VAR_2} vor!$" - - .string "Die anderen POKéMON\n" - .string "zeigten ihre Attacken!$" + .string "{STR_VAR_1} appealed with\n{STR_VAR_2}!$" + .string "The other POKéMON\nmade moves.{PAUSE 60}$" gUnknown_083CB00D:: @ 83CB00D - .string "{STR_VAR_1} beobachtet\n" - .string "die anderen.{PAUSE 60}$" + .string "{STR_VAR_1} was watching\nthe others.{PAUSE 60}$" gUnknown_083CB02C:: @ 83CB02C - .string "Soweit zur\n" - .string "Ausdruckskraft!{PAUSE 60}$" - - .string "{STR_VAR_3}-\n" - .string "Att. {STR_VAR_2}\n" - .string "von {STR_VAR_1}!$" - + .string "We’re all out of\nAppeal Time!{PAUSE 60}$" + .string "{STR_VAR_1}’s {STR_VAR_3}\nmove {STR_VAR_2}!{PAUSE 60}$" .string "TRICK$" - - .string "SPEZIAL$" - + .string "SPECIAL$" ContestString_AppealJammed: - .string "Der Auftritt\n" - .string "wurde gestört.$" + .string "But the appeal was\njammed.$" ContestString_FollowLead: - .string "Es folgte einem\n" - .string "anderen POKéMON.$" + .string "It followed another\nPOKéMON’s lead.$" ContestString_MessedUp: - .string "Es scheiterte.$" + .string "But it messed up.$" ContestString_BetterUsual: - .string "Das lief besser\n" - .string "als sonst.$" + .string "It went better than\nusual.$" ContestString_JudgeLookAway: - .string "Der JUROR war\n" - .string "irgendwie abgelenkt.$" + .string "The JUDGE looked away\nfor some reason.$" ContestString_WorkHard: - .string "Es strengte sich an,\n" - .string "Fehler auszubügeln.$" + .string "It worked hard to build on\npast mistakes.$" ContestString_NoMoreMoves: - .string "Es kann keine Attacken\n" - .string "mehr ausführen.$" + .string "It can’t make any more\nmoves.$" ContestString_WorkReallyWell: - .string "Das lief unheimlich gut.$" + .string "It worked frighteningly\nwell.$" ContestString_WorkHardStandout: - .string "Es strengte sich genauso\n" - .string "wie das beste POKéMON an.$" + .string "It worked as hard as the\nstandout POKéMON.$" ContestString_JudgeExpectantly: - .string "Der JUROR schaute es\n" - .string "besonders aufmerksam an.$" + .string "The JUDGE looked on\nexpectantly.$" ContestString_WorkRatherWell: - .string "Das lief bedeutend\n" - .string "besser.$" + .string "It worked rather well.$" ContestString_WorkBetter: - .string "Es lief etwas besser\n" - .string "als sonst.$" + .string "It worked a little better\nthan usual.$" .align 2 .4byte ContestString_AppealJammed @@ -342,23 +267,17 @@ ContestString_WorkBetter: .4byte ContestString_WorkBetter ContestString_StandOutNone: - .string "{STR_VAR_1} stach\n" - .string "überhaupt nicht hervor...{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} failed to\nstand out at all...{PAUSE_UNTIL_PRESS}$" ContestString_StandOutNotMuch: - .string "{STR_VAR_1} stach nicht\n" - .string "besonders hervor...{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} didn’t stand\nout very much...{PAUSE_UNTIL_PRESS}$" ContestString_StandOutLittle: - .string "{STR_VAR_1} erregte ein\n" - .string "wenig Aufmerksamkeit.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} caught a\nlittle attention.{PAUSE_UNTIL_PRESS}$" ContestString_StandOutLot: - .string "{STR_VAR_1} erregte eine\n" - .string "Menge Aufmerksamkeit.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} attracted a\nlot of attention.{PAUSE_UNTIL_PRESS}$" ContestString_StandOutTotal: - .string "{STR_VAR_1} erhielt die\n" - .string "volle Aufmerksamkeit.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} commanded\ntotal attention.{PAUSE_UNTIL_PRESS}$" ContestString_StandOutDidnt: - .string "{STR_VAR_1} konnte\n" - .string "keinen Ausdruck zeigen.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} hasn’t made\nits appeal.{PAUSE_UNTIL_PRESS}$" .align 2 gContestStandOutStrings:: @ 83CB2F0 @@ -370,82 +289,57 @@ gContestStandOutStrings:: @ 83CB2F0 .4byte ContestString_StandOutDidnt ContestString_AppealAnticipation3: - .string "Heiß ersehnt: Der Aus-\n" - .string "druck von {STR_VAR_1}.$" + .string "Anticipation swelled for\n{STR_VAR_1}’s appeal next.$" ContestString_JudgeSatisfied: - .string "Der JUROR war sehr\n" - .string "zufrieden.$" + .string "The JUDGE was very\nsatisfied.$" ContestString_Terminator: .string "$" ContestString_JudgeHeldFirm: - .string "Der JUROR behält\n" - .string "{STR_VAR_1} fest im Blick.$" + .string "The JUDGE ’s views on\n{STR_VAR_1} held firm.$" ContestString_ChangedPerceptions: - .string "{STR_VAR_3} von {STR_VAR_1}\n" - .string "ändert die Wahrnehmung.$" + .string "{STR_VAR_1}’s {STR_VAR_3}\nchanged perceptions.$" ContestString_AppealWoreOff: - .string "Wirkung von {STR_VAR_1}\n" - .string "lässt nach.$" + .string "{STR_VAR_1}’s appeal\neffect wore off.$" ContestString_AppealWoreOff2: - .string "Die besondere Wirkung\n" - .string "lässt nach.$" + .string "The special appeal’s\neffect wore off.$" ContestString_AppealLookSame: - .string "Jeder Ausdruck wird sich\n" - .string "nun gleichen.$" + .string "Everyone’s appeals were\nmade to look the same.$" ContestString_AppealCheapened: - .string "Ausdruck von {STR_VAR_2}\n" - .string "wurde abgewertet.$" + .string "{STR_VAR_2}’s appeal was\ncheapened.$" ContestString_AppealCheapened2: - .string "Es wertete die Ausdrücke\n" - .string "der anderen PKMN ab.$" + .string "It cheapened the appeal\nof those ahead.$" ContestString_AppealAttentionStolen: - .string "Es stahl {STR_VAR_2} die\n" - .string "Aufmerksamkeit.$" + .string "It stole attention away\nfrom {STR_VAR_2}.$" ContestString_AppealCheapened3: - .string "Es wertete Ausdruck\n" - .string "von {STR_VAR_2} ab.$" + .string "It cheapened\n{STR_VAR_2}’s appeal.$" ContestString_AppealCheapened4: - .string "Es wertete die Ausdrücke\n" - .string "der anderen stark ab.$" + .string "It severely cheapened\nother appeals.$" ContestString_AppealAnticipation: - .string "Alle warten sehnsüchtig\n" - .string "auf {STR_VAR_1}.$" + .string "Anticipation swelled for\n{STR_VAR_1}’s appeal next.$" ContestString_AppealCheapened5: - .string "Es wertete den Ausdruck\n" - .string "der PKMN vor ihm ab.$" + .string "It cheapened the appeal\nof those ahead.$" ContestString_AppealCheapened6: - .string "Es wertete den Lieblings-\n" - .string "ausdruck des JURORS ab.$" + .string "It cheapened the JUDGE’s\nfavorite appeal.$" ContestString_AppealCheapened7: - .string "Der Ausdruckswert der\n" - .string "anderen wurde halbiert.$" + .string "The appeals of others\nwere cheapened by half.$" ContestString_JammedStoodOut: - .string "Es macht sich bereit, die\n" - .string "anderen zu beeindrucken.$" + .string "It stood out to make up\nfor being jammed.$" ContestString_AppealNoMore: - .string "Es kann an keiner Vor-\n" - .string "führung mehr teilnehmen.$" + .string "It can’t participate in\nappeals any more.$" ContestString_AppealTouched: - .string "Der fantastische Aus-\n" - .string "druck berührte den JUROR.$" + .string "It touched the JUDGE for\na fantastic appeal.$" ContestString_AppealAnticipation2: - .string "Die Erwartung für die fol-\n" - .string "genden Ausdrücke steigt.$" + .string "Anticipation rose for\nupcoming appeals.$" ContestString_AppealStoodOut2: - .string "Es war so beeindruckend\n" - .string "wie ein Spezialausdruck.$" + .string "It stood out as much as\nspecial appeals.$" ContestString_AppealStoodOut3: - .string "Es war so beeindruckend\n" - .string "wie {STR_VAR_1}.$" + .string "It stood out as much as\n{STR_VAR_1}.$" ContestString_JammedAppealsNotice: - .string "Ein Ausdruck, der gestört\n" - .string "wurde, ist unauffälliger.$" + .string "Jammed appeals were made\neven less noticeable.$" ContestString_AppealSame: - .string "Jeder Teilnehmer hat nun\n" - .string "den gleichen Ausdruck.$" + .string "Everyone’s appeals were\nmade the same.$" ContestString_AppealFullWorse: - .string "{STR_VAR_1} ist voll. Der\n" - .string "Ausdruck wird schlechter.$" + .string "Its {STR_VAR_1} is full.\nIt worsened its appeal.$" .align 2 .4byte ContestString_JudgeHeldFirm @@ -475,237 +369,169 @@ ContestString_AppealFullWorse: .4byte ContestString_JammedAppealsNotice .4byte ContestString_AppealSame ContestString_MoreConscious: - .string "Es wird sich der anderen\n" - .string "PKMN mehr bewusst.{PAUSE 60}$" + .string "It became more conscious\nof the other POKéMON.{PAUSE 60}$" ContestString_NoAppeal: - .string "{STR_VAR_1} kann danach\n" - .string "keinen Ausdruck zeigen.{PAUSE 60}$" + .string "{STR_VAR_1} can’t make an\nappeal after this.{PAUSE 60}$" ContestString_SettleDown: - .string "Es kommt ein wenig\n" - .string "zur Ruhe.{PAUSE 60}$" + .string "It settled down just a\nlittle bit.{PAUSE 60}$" ContestString_ObliviousToOthers: - .string "Die anderen PKMN nehmen\n" - .string "es überhaupt nicht wahr.{PAUSE 60}$" + .string "It became oblivious to\nthe other POKéMON.{PAUSE 60}$" ContestString_LessAware: - .string "Es ist sich der anderen\n" - .string "PKMN kaum bewusst.{PAUSE 60}$" + .string "It became less aware of\nthe other POKéMON.{PAUSE 60}$" ContestString_StoppedCaring: - .string "Es kümmert sich nicht\n" - .string "mehr viel um andere PKMN.{PAUSE 60}$" + .string "It stopped caring about\nother POKéMON much.{PAUSE 60}$" ContestString_StartleAttempt: - .string "Es versucht, die anderen\n" - .string "PKMN zu erschrecken.{PAUSE 60}$" + .string "It tried to startle the\nother POKéMON.{PAUSE 60}$" ContestString_DazzleAttempt: - .string "Es versucht, die anderen\n" - .string "PKMN zu blenden.{PAUSE 60}$" + .string "It tried to dazzle the\nothers.{PAUSE 60}$" ContestString_JudgeLookAway2: - .string "Der JUROR schaut\n" - .string "{STR_VAR_1} nicht mehr an.{PAUSE 60}$" + .string "The JUDGE looked away\nfrom {STR_VAR_1}.{PAUSE 60}$" ContestString_UnnerveAttempt: - .string "Es versucht, die folgenden\n" - .string "PKMN zu entnerven.{PAUSE 60}$" + .string "It tried to unnerve the\nnext POKéMON.{PAUSE 60}$" ContestString_Nervous: - .string "{STR_VAR_1} wird\n" - .string "nervös.{PAUSE 60}$" + .string "{STR_VAR_1} became\nnervous.{PAUSE 60}$" ContestString_UnnerveWaiting: - .string "Dieser Ausdruck soll die\n" - .string "anderen PKMN entnerven.{PAUSE 60}$" + .string "The appeal tried to\nunnerve waiting POKéMON.{PAUSE 60}$" ContestString_TauntWell: - .string "Es verhöhnt die\n" - .string "besseren PKMN.{PAUSE 60}$" + .string "It taunted POKéMON\ndoing well.{PAUSE 60}$" ContestString_RegainedForm: - .string "{STR_VAR_1} findet zu\n" - .string "seiner Form zurück.{PAUSE 60}$" + .string "{STR_VAR_1} regained its\nform.{PAUSE 60}$" ContestString_JamWell: - .string "Es versucht, die besseren\n" - .string "PKMN zu beeindrucken.{PAUSE 60}$" + .string "It tried to jam POKéMON\ndoing well.{PAUSE 60}$" ContestString_HustleStandout: - .string "{STR_VAR_1} an der Spitze\n" - .string "engagiert sich noch mehr.{PAUSE 60}$" + .string "The standout {STR_VAR_1}\nhustled even more.{PAUSE 60}$" ContestString_WorkHardUnnoticed: - .string "Das bisher unauffällige\n" - .string "{STR_VAR_1} gibt alles.$" + .string "The largely unnoticed\n{STR_VAR_1} worked hard.{PAUSE 60}$" ContestString_WorkBefore: - .string "Es strengt sich genauso\n" - .string "an wie die PKMN vor ihm.{PAUSE 60}$" + .string "It worked as much as\nPOKéMON before it.{PAUSE 60}$" ContestString_AppealNotWell: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Kam nicht gut an.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal did\nnot go well.{PAUSE 60}$" ContestString_WorkPreceding: - .string "Es strengt sich an wie die\n" - .string "vorangegangenen PKMN.{PAUSE 60}$" + .string "It worked as much as the\npreceding POKéMON.{PAUSE 60}$" ContestString_AppealNotWell2: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Verlief nicht so gut.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal did\nnot go well.{PAUSE 60}$" ContestString_AppealNotShownWell: - .string "Ausdruck v. {STR_VAR_1}: \n" - .string "Wurde gestört.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\ncouldn’t be shown well.{PAUSE 60}$" ContestString_AppealSlightlyWell: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Verlief ganz gut.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\nwent slightly well.{PAUSE 60}$" ContestString_AppealPrettyWell: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Kam ganz gut an.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\nwent pretty well.{PAUSE 60}$" ContestString_AppealExcellently: - .string "{STR_VAR_1} führte seinen\n" - .string "Ausdruck exzellent vor.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\nwent excellently.{PAUSE 60}$" ContestString_AppealDud: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Er war absolut mies.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal was\na dud.{PAUSE 60}$" ContestString_AppealNotVeryWell: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Er war nicht so gut.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal did\nnot work very well.{PAUSE 60}$" ContestString_AppealSlightlyWell2: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Er war nicht schlecht.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\nwent slightly well.{PAUSE 60}$" ContestString_AppealPrettyWell2: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Er war recht gut.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\nwent pretty well.{PAUSE 60}$" ContestString_AppealVeryWell: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Er war sehr gut.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\nwent very well.{PAUSE 60}$" ContestString_AppealExcellently2: - .string "Ausdruck von {STR_VAR_1}:\n" - .string "Er war exzellent.{PAUSE 60}$" + .string "{STR_VAR_1}’s appeal\nwent excellently.{PAUSE 60}$" ContestString_SameTypeGood: - .string "Der gleiche Typ wie das\n" - .string "vorhergehende PKMN - gut!{PAUSE 60}$" + .string "It’s the same type as the\nPOKéMON before - good!{PAUSE 60}$" ContestString_DiffTypeGood: - .string "Nicht der gleiche Typ wie\n" - .string "das vorherige PKMN - gut!{PAUSE 60}$" + .string "It’s not the same type as\nthe one before - good!{PAUSE 60}$" ContestString_StoodOutAsMuch: - .string "Es ist viel besser als die\n" - .string "vorhergehenden PKMN.{PAUSE 60}$" + .string "It stood out much more\nthan the POKéMON before.{PAUSE 60}$" ContestString_NotAsWell: - .string "Es war nicht so gut wie\n" - .string "das PKMN vor ihm.{PAUSE 60}$" + .string "It didn’t do as well as the\nPOKéMON before.{PAUSE 60}$" ContestString_ConditionRose: - .string "Die Kondition von\n" - .string "{STR_VAR_1} stieg.{PAUSE 60}$" + .string "{STR_VAR_1}’s condition\nrose above usual.{PAUSE 60}$" ContestString_HotStatus: - .string "Status von {STR_VAR_1}:\n" - .string "Bewirkt guten Ausdruck!{PAUSE 60}$" + .string "{STR_VAR_1}’s hot status\nmade it a great appeal!{PAUSE 60}$" ContestString_MoveUpLine: - .string "Es steigt in der Reihen-\n" - .string "folge auf.{PAUSE 60}$" + .string "It moved up in line for\nthe next appeal.{PAUSE 60}$" ContestString_MoveBackLine: - .string "Es fällt in der Reihen-\n" - .string "folge zurück.{PAUSE 60}$" + .string "It moved back in line once\nfor the next appeal.{PAUSE 60}$" ContestString_ScrambleOrder: - .string "Es bringt die Reihenfolge\n" - .string "durcheinander.{PAUSE 60}$" + .string "It scrambled up the\norder for the next turn.{PAUSE 60}$" gUnknown_083CBD52:: @ 83CBD52 ContestString_JudgeExpectantly2:: - .string "Der JUROR betrachtet\n" - .string "{STR_VAR_1} interessiert.{PAUSE 60}$" + .string "The JUDGE looked at\n{STR_VAR_1} expectantly.{PAUSE 60}$" gUnknown_083CBD79:: @ 83CBD79 ContestString_WentOverWell:: - .string "Die Combo der Ausdrücke\n" - .string "kam gut an.{PAUSE 60}$" + .string "The appeal combo went\nover well.{PAUSE 60}$" gUnknown_083CBD9D:: @ 83CBD9D ContestString_WentOverVeryWell:: - .string "Die Combo der Ausdrücke\n" - .string "kam sehr gut an.{PAUSE 60}$" + .string "The appeal combo went\nover very well.{PAUSE 60}$" gUnknown_083CBDC6:: @ 83CBDC6 ContestString_AppealComboExcellently:: - .string "Die Combo der Ausdrücke\n" - .string "kam exzellent an.{PAUSE 60}$" + .string "The appeal combo went\nover excellently.{PAUSE 60}$" ContestString_AvertGaze: - .string "{STR_VAR_1} gelingt es,\n" - .string "den Blick abzuwenden.{PAUSE 60}$" + .string "{STR_VAR_1} managed to\navert its gaze.{PAUSE 60}$" ContestString_AvoidSeeing: - .string "{STR_VAR_1} wandte den\n" - .string "Blick erfolgreich ab.{PAUSE 60}$" + .string "{STR_VAR_1} managed to\navoid seeing it.{PAUSE 60}$" ContestString_NotFazed: - .string "{STR_VAR_1} lässt sich\n" - .string "davon nicht ablenken.{PAUSE 60}$" + .string "{STR_VAR_1} isn’t fazed\nby that sort of thing.{PAUSE 60}$" ContestString_LittleDistracted: - .string "{STR_VAR_1} wurde etwas\n" - .string "unruhig.{PAUSE 60}$" + .string "{STR_VAR_1} became a\nlittle distracted.{PAUSE 60}$" ContestString_AttemptStartle: - .string "Es versucht, die anderen\n" - .string "PKMN zu verschrecken.{PAUSE 60}$" + .string "It tried to startle the\nother POKéMON.{PAUSE 60}$" ContestString_LookedDown: - .string "{STR_VAR_1} blickt\n" - .string "irritiert zu Boden.{PAUSE 60}$" + .string "{STR_VAR_1} looked down\nout of distraction.{PAUSE 60}$" ContestString_TurnedBack: - .string "{STR_VAR_1} dreht sich\n" - .string "irritiert um.{PAUSE 60}$" + .string "{STR_VAR_1} turned back\nout of distraction.{PAUSE 60}$" ContestString_UtterCry: - .string "{STR_VAR_1} kann einen \n" - .string "Laut nicht unterdrücken.{PAUSE 60}$" + .string "{STR_VAR_1} couldn’t help\nuttering a cry.{PAUSE 60}$" ContestString_LeaptUp: - .string "{STR_VAR_1} kann nicht\n" - .string "anders und springt auf.{PAUSE 60}$" + .string "{STR_VAR_1} couldn’t help\nleaping up.{PAUSE 60}$" ContestString_TrippedOver: - .string "{STR_VAR_1} ist so irri-\n" - .string "tiert, dass es stolpert.{PAUSE 60}$" + .string "{STR_VAR_1} tripped over\nout of distraction.{PAUSE 60}$" gUnknown_083CBF60:: @ 83CBF60 ContestString_TooNervous: - .string "{STR_VAR_1} ist zu nervös,\n" - .string "um etwas vorzuführen.{PAUSE 60}$" + .string "{STR_VAR_1} was too\nnervous to move.{PAUSE 60}$" ContestString_MessedUp2: - .string "Es hatte keinen Erfolg.{PAUSE 60}$" + .string "But it messed up.{PAUSE 60}$" ContestString_FailedTargetNervous: - .string "Es konnte keine\n" - .string "Nervosität erzeugen.{PAUSE 60}$" + .string "But it failed to make\nthe target nervous.{PAUSE 60}$" ContestString_FailedAnyoneNervous: - .string "Aber es konnte niemanden\n" - .string "nervös machen.{PAUSE 60}$" + .string "But it failed to make\nanyone nervous.{PAUSE 60}$" ContestString_Ignored: - .string "Es wurde ignoriert...{PAUSE 60}$" + .string "But it was ignored...{PAUSE 60}$" ContestString_NoConditionImprove: - .string "Es konnte seinen Aus-\n" - .string "druck nicht verstärken...{PAUSE 60}$" + .string "But it couldn’t improve\nits condition...{PAUSE 60}$" ContestString_BadConditionWeakAppeal: - .string "Schwacher Ausdruck we-\n" - .string "gen schlechter Konditon.{PAUSE 60}$" + .string "Its bad condition\nresulted in a weak appeal.{PAUSE 60}$" ContestString_Unaffected: - .string "{STR_VAR_1} blieb\n" - .string "unbeeindruckt.{PAUSE 60}$" + .string "{STR_VAR_1} was\nunaffected.{PAUSE 60}$" gUnknown_083CC075:: @ 83CC075 ContestString_DissapointedRepeat:: - .string "{STR_VAR_1} enttäuscht\n" - .string "durch Wiederholung.{PAUSE 60}$" + .string "{STR_VAR_1} disappointed\nby repeating an appeal.{PAUSE 60}$" gUnknown_083CC0A0:: @ 83CC0A0 ContestString_WentOverGreat:: - .string "Die {STR_VAR_3} von\n" - .string "{STR_VAR_1} war sehr gut.{PAUSE 60}$" + .string "{STR_VAR_1}’s {STR_VAR_3}\nwent over great.{PAUSE 60}$" gUnknown_083CC0BC:: @ 83CC0BC ContestString_DidntGoWell:: - .string "Die {STR_VAR_3} von\n" - .string "{STR_VAR_1} war nicht gut.{PAUSE 60}$" + .string "{STR_VAR_1}’s {STR_VAR_3}\ndidn’t go over well here...{PAUSE 60}$" gUnknown_083CC0E3:: @ 83CC0E3 ContestString_GotCrowdGoing:: - .string "{STR_VAR_1} begeistert\n" - .string "Publikum mit {STR_VAR_3}.{PAUSE 60}$" + .string "{STR_VAR_1}’s {STR_VAR_3}\ngot the crowd going.{PAUSE 60}$" gUnknown_083CC103:: @ 83CC103 ContestString_CantAppealNextTurn:: - .string "{STR_VAR_1} setzt in der \n" - .string "folgenden Runde aus.{PAUSE 60}$" + .string "{STR_VAR_1} can’t appeal\nnext turn...{PAUSE 60}$" ContestString_AttractedAttention:: - .string "Die Aufmerksamkeit des\n" - .string "Publikums liegt auf ihm.{PAUSE 60}$" + .string "It attracted the crowd’s\nattention.{PAUSE 60}$" gUnknown_083CC14A:: @ 83CC14A ContestString_CrowdWatches:: - .string "Das Publikum beobachtet\n" - .string "weiterhin {STR_VAR_3}.{PAUSE 60}$" + .string "The crowd continues to\nwatch {STR_VAR_3}.{PAUSE 60}$" gUnknown_083CC16E:: @ 83CC16E ContestString_Ignored2:: - .string "{STR_VAR_2} von\n" - .string "{STR_VAR_1} ist ignoriert.{PAUSE 60}$" + .string "{STR_VAR_1}’s\n{STR_VAR_2} is ignored.{PAUSE 60}$" .align 2 gUnknown_083CC188:: @ 83CC188 @@ -773,30 +599,30 @@ gUnknown_083CC188:: @ 83CC188 .4byte ContestString_AttractedAttention gText_Contest_Shyness:: @ 83CC280 - .string "Scheu$" + .string "shyness$" gText_Contest_Anxiety:: @ 83CC288 - .string "Besorgnis$" + .string "anxiety$" gText_Contest_Laziness:: @ 83CC290 - .string "Faulheit$" + .string "laziness$" gText_Contest_Hesitancy:: @ 83CC299 - .string "Zögern$" + .string "hesitancy$" gText_Contest_Fear:: @ 83CC2A3 - .string "Furcht$" + .string "fear$" ContestString_Coolness: - .string "Coolness$" + .string "coolness$" ContestString_Beauty2: - .string "Schönheit$" + .string "beauty$" ContestString_Cuteness: - .string "Anmut$" + .string "cuteness$" ContestString_Smartness: - .string "Klugheit$" + .string "smartness$" ContestString_Toughness: - .string "Stärke$" + .string "toughness$" .align 2 gContestCategoryStrings:: @ 83CC2D8 @@ -807,22 +633,22 @@ gContestCategoryStrings:: @ 83CC2D8 .4byte ContestString_Toughness gUnknown_083CC2EC:: @ 83CC2EC - .string "SPANNUNG:$" + .string "TENSION:$" ContestString_CoolMove: - .string "COOLE Att.$" + .string "COOL Move$" ContestString_BeautyMove: - .string "SCHÖNE Att.$" + .string "BEAUTY Move$" ContestString_CuteMove: - .string "ANMUT-Att.$" + .string "CUTE Move$" ContestString_SmartMove: - .string "KLUGE Att.$" + .string "SMART Move$" ContestString_ToughMove: - .string "STARKE Att.$" + .string "TOUGH Move$" ContestString_UnknownMoveType: .string "???$" @@ -838,6 +664,6 @@ gUnknown_083CC330:: @ 83CC330 @ unused? ContestString_Rank: - .string "KLASSE$" + .string "RANK$" .string "{HIGHLIGHT TRANSPARENT}{COLOR MAGENTA} $" diff --git a/data/text/day_care.inc b/data/text/day_care.inc index bf97f0e34..8f8e31266 100644 --- a/data/text/day_care.inc +++ b/data/text/day_care.inc @@ -1,136 +1,132 @@ Route117_Text_1B25CB:: @ 81B25CB - .string "Ich bin der PENSIONSLEITER.\p" - .string "Ich kümmere mich um die wertvollen\n" - .string "POKéMON der TRAINER.\p" - .string "Wenn ich eines deiner POKéMON auf-\n" - .string "ziehen soll, sprich mit meiner Frau.$" + .string "I’m the DAY-CARE MAN.\p" + .string "I help take care of the precious\n" + .string "POKéMON of TRAINERS.\p" + .string "If you’d like me to raise your POKéMON,\n" + .string "have a word with my wife.$" Route117_Text_1B2659:: @ 81B2659 - .string "Ach, du bist es!\p" - .string "Wir haben deine POKéMON aufgezogen\n" - .string "und wurden überrascht!\p" - .string "Deine POKéMON haben nun ein EI!\p" - .string "Wir wissen nicht, wie das passiert ist,\n" - .string "aber deine POKéMON haben es.\p" - .string "Möchtest du es haben?$" + .string "Ah, it’s you!\p" + .string "We were raising your POKéMON, and my\n" + .string "goodness, were we surprised!\p" + .string "Your POKéMON had an EGG!\p" + .string "We don’t know how it got there,\n" + .string "but your POKéMON had it.\p" + .string "You do want it, yes?$" Route117_Text_1B2710:: @ 81B2710 - .string "Ach, du bist es! Schön, dich zu sehen.\n" - .string "Deinem {STR_VAR_1} geht es sehr gut.$" + .string "Ah, it’s you! Good to see you.\n" + .string "Your {STR_VAR_1}’s doing fine.$" Route117_Text_1B2745:: @ 81B2745 - .string "Ich werde es behalten.$" + .string "Well then, I’ll keep it.\n" + .string "Thanks!$" Route117_Text_1B2766:: @ 81B2766 - .string "Du hast keinen Platz dafür... Komm\n" - .string "wieder, wenn du Platz geschaffen hast.$" + .string "You have no room for it...\n" + .string "Come back when you’ve made room.$" Route117_Text_1B27A2:: @ 81B27A2 - .string "{PLAYER} erhält das EI vom\n" - .string "PENSIONSLEITER.$" + .string "{PLAYER} received the EGG from\n" + .string "the DAY-CARE MAN.$" Route117_Text_1B27CD:: @ 81B27CD - .string "Kümmere dich gut darum.$" + .string "Take good care of it.$" Route117_Text_1B27E3:: @ 81B27E3 - .string "Übrigens, dein {STR_VAR_1} scheint sich\n" - .string "gut mit dem {STR_VAR_3} von {STR_VAR_2} \l" - .string "zu verstehen.\p" - .string "Ich habe gesehen, wie sie einen BRIEF\n" - .string "ausgetauscht haben...$" + .string "By the way, about your {STR_VAR_1},\n" + .string "it seemed to be friendly with\l" + .string "{STR_VAR_2}’s {STR_VAR_3}.\p" + .string "I may even have seen it receiving\n" + .string "a piece of MAIL.$" UnknownString_81B2858: @ 81B2858 - .string "Wenn du deine POKéMON zurückhaben\n" - .string "möchtest, sprich doch mit meiner Frau.$" + .string "If you want to pick up your POKéMON,\n" + .string "have a word with my wife.$" Route117_Text_1B2897:: @ 81B2897 - .string "Ah, du bist es! Deine POKéMON\n" - .string "{STR_VAR_1} und {STR_VAR_2} entwickeln\l" - .string "sich prächtig.$" + .string "Ah, it’s you! Your {STR_VAR_1} and\n" + .string "{STR_VAR_2} are doing fine.$" Route117_Text_1B28C4:: @ 81B28C4 - .string "Ich werde es behalten.\n" - .string "Oder möchtest du es haben?$" + .string "I really will keep it.\n" + .string "You do want this, yes?$" Route117_PokemonDayCare_Text_1B28F2:: @ 81B28F2 - .string "Ich bin die PENSIONSLEITERIN.\p" - .string "Wir ziehen POKéMON für dich auf.\p" - .string "Sollen wir eins für dich aufziehen?$" + .string "I’m the DAY-CARE LADY.\p" + .string "We can raise POKéMON for you.\p" + .string "Would you like us to raise one?$" Route117_PokemonDayCare_Text_1B2947:: @ 81B2947 - .string "Welches POKéMON sollen wir für dich\n" - .string "aufziehen?$" + .string "Which POKéMON should we raise for you?$" Route117_PokemonDayCare_Text_1B296E:: @ 81B296E - .string "Fein, dann nehmen wir dein {STR_VAR_1}\n" - .string "für eine Weile in Pflege.\p" - .string "Schau später mal nach ihm.$" + .string "Fine, we’ll raise your {STR_VAR_1} for\n" + .string "a while.\p" + .string "Come back for it later.$" Route117_PokemonDayCare_Text_1B29AD:: @ 81B29AD - .string "Wir können zwei deiner POKéMON nehmen.\n" - .string "Möchtest du noch eins in Pflege geben?$" + .string "We can raise two of your POKéMON.\n" + .string "Would you like us to raise one more?$" Route117_PokemonDayCare_Text_1B29F4:: @ 81B29F4 - .string "Mein Mann hat dich schon gesucht.$" + .string "My husband was looking for you.$" Route117_PokemonDayCare_Text_1B2A14:: @ 81B2A14 - .string "Oh, gut.\n" - .string "Komm bald wieder.$" + .string "Oh, fine, then.\n" + .string "Come again.$" Route117_PokemonDayCare_Text_1B2A30:: @ 81B2A30 - .string "Du hast nicht genug Geld...$" + .string "You don’t have enough money...$" Route117_PokemonDayCare_Text_1B2A4F:: @ 81B2A4F - .string "Möchtest du das andere auch wieder\n" - .string "mitnehmen?$" + .string "Will you take back the other one, too?$" Route117_PokemonDayCare_Text_1B2A76:: @ 81B2A76 - .string "Gut.\n" - .string "Komm bald wieder.$" + .string "Fine.\n" + .string "Come again.$" Route117_PokemonDayCare_Text_1B2A88:: @ 81B2A88 - .string "Ach, du bist es! Schön dich zu sehen.\n" - .string "Deinen POKéMON kann es einfach\l" - .string "nur gut gehen!$" + .string "Ah, it’s you! Good to see you.\n" + .string "Your POKéMON can only be doing good!$" Route117_PokemonDayCare_Text_1B2ACC:: @ 81B2ACC - .string "Dein {STR_VAR_1} ist um {STR_VAR_2} Level\n" - .string "gewachsen.$" + .string "By level, your {STR_VAR_1} has grown\n" + .string "by {STR_VAR_2}.$" Route117_PokemonDayCare_Text_1B2AEF:: @ 81B2AEF - .string "Dein POKéMON-Team ist vollzählig.\n" - .string "Schaffe Platz und komm dann wieder.$" + .string "Your POKéMON team is full.\n" + .string "Make room, then come see me.$" UnknownString_81B2B27: @ 81B2B27 - .string "Welches POKéMON nimmst du wieder mit?$" + .string "Which POKéMON will you take back?$" Route117_PokemonDayCare_Text_1B2B49:: @ 81B2B49 - .string "Wenn du dein {STR_VAR_1}\n" - .string "mitnehmen willst, kostet das ¥{STR_VAR_2}.$" + .string "If you want your {STR_VAR_1} back,\n" + .string "it will cost ¥{STR_VAR_2}.$" Route117_PokemonDayCare_Text_1B2B75:: @ 81B2B75 - .string "Sehr schön!\n" - .string "Hier ist dein POKéMON!$" + .string "Perfect!\n" + .string "Here’s your POKéMON.$" Route117_PokemonDayCare_Text_1B2B93:: @ 81B2B93 - .string "{PLAYER} hat {STR_VAR_1} von der\n" - .string "PENSIONSLEITERIN zurückerhalten.$" + .string "{PLAYER} took back {STR_VAR_1} from\n" + .string "the DAY-CARE LADY.$" Route117_PokemonDayCare_Text_1B2BBB:: @ 81B2BBB - .string "Oh! Du hast aber nur ein POKéMON.\p" - .string "Komm einfach später wieder.$" + .string "Oh? But you have just one POKéMON.\p" + .string "Come back another time.$" Route117_PokemonDayCare_Text_1B2BF6:: @ 81B2BF6 - .string "Möchtest du dein POKéMON wieder\n" - .string "mitnehmen?$" + .string "Will you take your POKéMON back?$" Route117_PokemonDayCare_Text_1B2C17:: @ 81B2C17 - .string "Wenn du das POKéMON hier lässt, womit\n" - .string "willst du denn dann kämpfen?\p" - .string "Komm einfach später wieder.$" + .string "If you leave me that POKéMON,\n" + .string "what will you battle with?\p" + .string "Come back another time.$" UnknownString_81B2C68: @ 81B2C68 - .string "Wie?$" + .string "Huh?$" @ XXX JP .string "\p" diff --git a/data/text/easy_chat/group_name_strings.inc b/data/text/easy_chat/group_name_strings.inc index 1c9edac38..3d5e3a158 100644 --- a/data/text/easy_chat/group_name_strings.inc +++ b/data/text/easy_chat/group_name_strings.inc @@ -8,31 +8,31 @@ gEasyChatGroupName_Status:: @ 842C7EB .string "STATUS$" gEasyChatGroupName_Battle:: @ 842C7F2 - .string "KAMPF$" + .string "BATTLE$" gEasyChatGroupName_Greetings:: @ 842C7F9 - .string "EMPFANG$" + .string "GREETINGS$" gEasyChatGroupName_People:: @ 842C803 - .string "PERSONEN$" + .string "PEOPLE$" gEasyChatGroupName_Voices:: @ 842C80A - .string "AUSRUFE$" + .string "VOICES$" gEasyChatGroupName_Speech:: @ 842C811 - .string "STILMITTEL$" + .string "SPEECH$" gEasyChatGroupName_Endings:: @ 842C818 - .string "VERKNÜPFUNG$" + .string "ENDINGS$" gEasyChatGroupName_Feelings:: @ 842C820 - .string "GEFÜHLE$" + .string "FEELINGS$" gEasyChatGroupName_Conditions:: @ 842C829 - .string "KONDITIONEN$" + .string "CONDITIONS$" gEasyChatGroupName_Actions:: @ 842C834 - .string "AKTIONEN$" + .string "ACTIONS$" gEasyChatGroupName_Lifestyle:: @ 842C83C .string "LIFESTYLE$" @@ -41,25 +41,25 @@ gEasyChatGroupName_Hobbies:: @ 842C846 .string "HOBBIES$" gEasyChatGroupName_Time:: @ 842C84E - .string "ZEIT$" + .string "TIME$" gEasyChatGroupName_Misc:: @ 842C853 - .string "POSITIONEN$" + .string "MISC.$" gEasyChatGroupName_Adjectives:: @ 842C859 - .string "GERÄUSCHE$" + .string "ADJECTIVES$" gEasyChatGroupName_Events:: @ 842C864 - .string "MISCHMASCH$" + .string "EVENT.$" gEasyChatGroupName_Move1:: @ 842C86B - .string "ATTACKEN 1$" + .string "MOVE 1$" gEasyChatGroupName_Move2:: @ 842C872 - .string "ATTACKEN 2$" + .string "MOVE 2$" gEasyChatGroupName_TrendySaying:: @ 842C879 - .string "HIPPER SPRUCH$" + .string "TRENDY SAYING$" gEasyChatGroupName_Pokemon2:: @ 842C887 - .string "POKéMON 2$" + .string "POKéMON2$" diff --git a/data/text/easy_chat/groups/actions/order.inc b/data/text/easy_chat/groups/actions/order.inc index 1e0201db1..ffe2ec4e0 100644 --- a/data/text/easy_chat/groups/actions/order.inc +++ b/data/text/easy_chat/groups/actions/order.inc @@ -1,81 +1,81 @@ .align 1 gEasyChatGroupOrder_Actions: @ 83DF6A0 - .2byte 36 - .2byte 58 - .2byte 14 - .2byte 12 - .2byte 76 - .2byte 70 - .2byte 17 - .2byte 38 .2byte 72 + .2byte 14 .2byte 48 .2byte 75 - .2byte 71 - .2byte 46 - .2byte 53 - .2byte 2 - .2byte 42 - .2byte 43 - .2byte 24 - .2byte 3 - .2byte 10 .2byte 39 - .2byte 40 - .2byte 22 - .2byte 31 - .2byte 23 - .2byte 37 - .2byte 41 + .2byte 36 .2byte 28 - .2byte 77 + .2byte 46 + .2byte 31 + .2byte 19 + .2byte 26 + .2byte 6 .2byte 27 + .2byte 1 .2byte 45 - .2byte 35 - .2byte 15 - .2byte 16 + .2byte 47 + .2byte 54 + .2byte 41 + .2byte 76 + .2byte 77 + .2byte 73 + .2byte 74 + .2byte 2 + .2byte 3 + .2byte 24 + .2byte 37 + .2byte 32 + .2byte 33 + .2byte 22 .2byte 18 - .2byte 64 + .2byte 23 + .2byte 67 .2byte 30 - .2byte 59 - .2byte 60 + .2byte 0 + .2byte 65 + .2byte 70 + .2byte 4 + .2byte 5 + .2byte 17 + .2byte 64 + .2byte 63 + .2byte 34 + .2byte 53 .2byte 56 .2byte 55 - .2byte 1 - .2byte 9 .2byte 11 - .2byte 6 - .2byte 67 + .2byte 9 + .2byte 29 + .2byte 69 + .2byte 68 + .2byte 66 + .2byte 61 .2byte 52 - .2byte 62 .2byte 51 - .2byte 57 - .2byte 68 - .2byte 50 - .2byte 5 - .2byte 4 + .2byte 40 + .2byte 62 + .2byte 35 .2byte 20 - .2byte 69 - .2byte 29 + .2byte 71 + .2byte 60 + .2byte 59 + .2byte 15 + .2byte 16 + .2byte 38 + .2byte 49 .2byte 25 - .2byte 0 - .2byte 54 - .2byte 65 - .2byte 73 - .2byte 74 - .2byte 47 - .2byte 61 .2byte 21 + .2byte 42 + .2byte 43 .2byte 44 - .2byte 63 + .2byte 12 .2byte 13 - .2byte 26 .2byte 7 .2byte 8 - .2byte 19 - .2byte 34 - .2byte 33 - .2byte 49 - .2byte 32 - .2byte 66 + .2byte 10 + .2byte 58 + .2byte 57 + .2byte 50 diff --git a/data/text/easy_chat/groups/actions/words.inc b/data/text/easy_chat/groups/actions/words.inc index 28822dd64..39f10f896 100644 --- a/data/text/easy_chat/groups/actions/words.inc +++ b/data/text/easy_chat/groups/actions/words.inc @@ -1,80 +1,80 @@ gEasyChatGroupWords_Actions: @ 83DD26E - .string "TRIFFT$" - .string "RESIGNIEREN$" - .string "GEBEN$" - .string "GIBT$" - .string "SPIELTE$" - .string "SPIELT$" - .string "SAMMELN$" - .string "WANDERN$" - .string "WANDERT$" - .string "SAGT$" - .string "GING$" - .string "SAGTE$" - .string "AUFWACHEN$" - .string "WACHT AUF$" - .string "ÄRGERT$" - .string "LEHREN$" - .string "LEHRT$" - .string "BITTE$" - .string "LERNE$" - .string "WECHSELN$" + .string "MEETS$" + .string "CONCEDE$" + .string "GIVE$" + .string "GIVES$" + .string "PLAYED$" + .string "PLAYS$" + .string "COLLECT$" + .string "WALKING$" + .string "WALKS$" + .string "SAYS$" + .string "WENT$" + .string "SAID$" + .string "WAKE UP$" + .string "WAKES UP$" + .string "ANGERS$" + .string "TEACH$" + .string "TEACHES$" + .string "PLEASE$" + .string "LEARN$" + .string "CHANGE$" .string "STORY$" - .string "VERTRAUEN$" - .string "GROSSZÜGIG$" - .string "HÖRT$" - .string "GEHÖRT$" - .string "TRAINIERT$" - .string "WÄHLEN$" - .string "KOMMEN$" - .string "KAM$" - .string "SUCHE$" - .string "MACHEN$" - .string "GRUND$" - .string "WISSEN$" - .string "WEISS$" - .string "WEIGERN$" - .string "LAGERT$" - .string "ANGEBEN$" + .string "TRUST$" + .string "LAVISH$" + .string "LISTENS$" + .string "HEARING$" + .string "TRAINS$" + .string "CHOOSE$" + .string "COME$" + .string "CAME$" + .string "SEARCH$" + .string "MAKE$" + .string "CAUSE$" + .string "KNOW$" + .string "KNOWS$" + .string "REFUSE$" + .string "STORES$" + .string "BRAG$" .string "IGNORANT$" - .string "DENKT$" - .string "GLAUBE$" - .string "GLEITEN$" - .string "ISST$" - .string "GEBRAUCHEN$" - .string "GEBRAUCHT$" - .string "VERWENDEN$" - .string "KÖNNEN NICHT$" - .string "FÄHIG$" - .string "VERSCHWINDE$" - .string "ERSCHEINEN$" - .string "WERFEN$" - .string "SORGE$" - .string "SCHLIEF$" - .string "SCHLAF$" - .string "FREILASSEN$" - .string "TRINKT$" - .string "RENNT$" - .string "RENNEN$" - .string "SEHEN$" - .string "ARBEITEN$" - .string "REDEN$" - .string "REDET$" - .string "VERSENKEN$" - .string "SCHLAG$" - .string "VORTÄUSCHEN$" - .string "LOBEN$" - .string "ÜBERTREIBEN$" - .string "ZEIGEN$" - .string "SCHAUT$" - .string "SIEHT$" - .string "STREBEN NACH$" - .string "BESITZEN$" - .string "ERTRAGEN$" - .string "ERLAUBEN$" - .string "VERGESSEN$" - .string "VERGISST$" - .string "ERSCHEINT$" - .string "BESIEGEN$" - .string "KAMPFUNFÄHIG$" + .string "THINKS$" + .string "BELIEVE$" + .string "SLIDE$" + .string "EATS$" + .string "USE$" + .string "USES$" + .string "USING$" + .string "COULDN’T$" + .string "CAPABLE$" + .string "DISAPPEAR$" + .string "APPEAR$" + .string "THROW$" + .string "WORRY$" + .string "SLEPT$" + .string "SLEEP$" + .string "RELEASE$" + .string "DRINKS$" + .string "RUNS$" + .string "RUN$" + .string "WORKS$" + .string "WORKING$" + .string "TALKING$" + .string "TALK$" + .string "SINK$" + .string "SMACK$" + .string "PRETEND$" + .string "PRAISE$" + .string "OVERDO$" + .string "SHOW$" + .string "LOOKS$" + .string "SEES$" + .string "SEEK$" + .string "OWN$" + .string "TAKE$" + .string "ALLOW$" + .string "FORGET$" + .string "FORGETS$" + .string "APPEARS$" + .string "FAINT$" + .string "FAINTED$" .string "$" diff --git a/data/text/easy_chat/groups/adjectives/order.inc b/data/text/easy_chat/groups/adjectives/order.inc index bbd816f48..886d6e466 100644 --- a/data/text/easy_chat/groups/adjectives/order.inc +++ b/data/text/easy_chat/groups/adjectives/order.inc @@ -1,39 +1,39 @@ .align 1 gEasyChatGroupOrder_Adjectives: @ 83DF8B0 - .2byte 24 - .2byte 28 - .2byte 17 - .2byte 18 .2byte 35 .2byte 23 + .2byte 20 + .2byte 31 + .2byte 14 .2byte 15 - .2byte 5 - .2byte 19 - .2byte 4 - .2byte 0 - .2byte 8 - .2byte 9 - .2byte 3 - .2byte 21 + .2byte 32 .2byte 34 - .2byte 13 - .2byte 30 .2byte 12 - .2byte 27 - .2byte 31 - .2byte 14 - .2byte 20 - .2byte 6 - .2byte 22 + .2byte 3 + .2byte 29 + .2byte 9 .2byte 33 + .2byte 1 + .2byte 27 + .2byte 2 .2byte 11 + .2byte 22 .2byte 26 - .2byte 16 - .2byte 2 - .2byte 1 - .2byte 7 - .2byte 29 + .2byte 28 .2byte 10 - .2byte 32 + .2byte 18 + .2byte 17 + .2byte 7 + .2byte 16 + .2byte 19 + .2byte 8 + .2byte 5 + .2byte 4 + .2byte 6 + .2byte 13 + .2byte 21 + .2byte 0 + .2byte 24 .2byte 25 + .2byte 30 diff --git a/data/text/easy_chat/groups/adjectives/words.inc b/data/text/easy_chat/groups/adjectives/words.inc index 2912989c5..ca1762a5b 100644 --- a/data/text/easy_chat/groups/adjectives/words.inc +++ b/data/text/easy_chat/groups/adjectives/words.inc @@ -1,38 +1,38 @@ gEasyChatGroupWords_Adjectives: @ 83DD96C - .string "LATSCH$" - .string "WACKEL$" - .string "STEINHART$" - .string "MAGENKNURR$" - .string "KNURSCHP$" - .string "KILLE KILLE$" - .string "SCHLEUDER$" - .string "WIRBEL$" - .string "LECHZ$" - .string "LÜMMEL RÄKEL$" - .string "WUSCHEL$" - .string "SCHNÜFF$" - .string "OOCH$" - .string "MÜLL$" - .string "SABBER$" - .string "JIPP! JIPP!$" - .string "SCHWABBEL$" - .string "GLATT$" - .string "GLIBBER$" - .string "KLAPPER$" - .string "SCHEPPER$" - .string "MAMPF FRESS$" - .string "SCHMEISS$" - .string "IRRE$" - .string "ANGST BIBBER$" - .string "ZITTER$" - .string "SCHÜTTEL$" - .string "RATSCH$" - .string "FETZ$" - .string "WURGS$" - .string "NÖÖÖ$" - .string "RUMMS BERST$" - .string "ZISCH FACKEL$" - .string "SCHNUCKELIG$" - .string "MEGAGRINS$" - .string "GRINS HOFF$" + .string "WANDERING$" + .string "RICKETY$" + .string "ROCK-SOLID$" + .string "HUNGRY$" + .string "TIGHT$" + .string "TICKLISH$" + .string "TWIRLING$" + .string "SPIRALING$" + .string "THIRSTY$" + .string "LOLLING$" + .string "SILKY$" + .string "SADLY$" + .string "HOPELESS$" + .string "USELESS$" + .string "DROOLING$" + .string "EXCITING$" + .string "THICK$" + .string "SMOOTH$" + .string "SLIMY$" + .string "THIN$" + .string "BREAK$" + .string "VORACIOUS$" + .string "SCATTER$" + .string "AWESOME$" + .string "WIMPY$" + .string "WOBBLY$" + .string "SHAKY$" + .string "RIPPED$" + .string "SHREDDED$" + .string "INCREASING$" + .string "YET$" + .string "DESTROYED$" + .string "FIERY$" + .string "LOVEY-DOVEY$" + .string "HAPPILY$" + .string "ANTICIPATION$" .string "$" diff --git a/data/text/easy_chat/groups/battle/order.inc b/data/text/easy_chat/groups/battle/order.inc index 1419e5e87..f47f4b43e 100644 --- a/data/text/easy_chat/groups/battle/order.inc +++ b/data/text/easy_chat/groups/battle/order.inc @@ -1,66 +1,66 @@ .align 1 gEasyChatGroupOrder_Battle: @ 83DF2A4 - .2byte 52 .2byte 53 + .2byte 39 .2byte 18 - .2byte 62 - .2byte 45 - .2byte 42 + .2byte 40 + .2byte 11 + .2byte 10 + .2byte 31 + .2byte 17 .2byte 3 .2byte 14 - .2byte 19 - .2byte 55 - .2byte 44 + .2byte 56 .2byte 38 - .2byte 28 + .2byte 41 + .2byte 29 .2byte 35 .2byte 36 - .2byte 6 - .2byte 8 - .2byte 5 - .2byte 7 - .2byte 0 - .2byte 31 - .2byte 4 - .2byte 40 - .2byte 41 - .2byte 11 - .2byte 17 - .2byte 30 - .2byte 59 - .2byte 37 - .2byte 56 - .2byte 60 + .2byte 45 .2byte 1 + .2byte 34 + .2byte 50 .2byte 20 - .2byte 16 + .2byte 47 + .2byte 8 + .2byte 54 + .2byte 60 + .2byte 37 + .2byte 4 + .2byte 49 + .2byte 46 + .2byte 48 + .2byte 24 + .2byte 0 + .2byte 62 + .2byte 12 .2byte 2 .2byte 26 - .2byte 24 .2byte 51 .2byte 43 + .2byte 30 + .2byte 59 + .2byte 55 + .2byte 52 + .2byte 42 .2byte 61 + .2byte 27 + .2byte 44 .2byte 23 - .2byte 34 - .2byte 57 .2byte 13 - .2byte 25 - .2byte 10 - .2byte 9 - .2byte 27 - .2byte 32 .2byte 22 - .2byte 29 + .2byte 32 + .2byte 19 + .2byte 16 .2byte 21 - .2byte 15 - .2byte 54 - .2byte 12 - .2byte 47 - .2byte 49 - .2byte 48 - .2byte 46 - .2byte 50 - .2byte 39 - .2byte 58 .2byte 33 + .2byte 58 + .2byte 15 + .2byte 28 + .2byte 25 + .2byte 57 + .2byte 9 + .2byte 6 + .2byte 5 + .2byte 7 diff --git a/data/text/easy_chat/groups/battle/words.inc b/data/text/easy_chat/groups/battle/words.inc index a68df0ba4..cdea8c7b8 100644 --- a/data/text/easy_chat/groups/battle/words.inc +++ b/data/text/easy_chat/groups/battle/words.inc @@ -1,65 +1,65 @@ gEasyChatGroupWords_Battle: @ 83DC53C - .string "HARMONIEREN$" - .string "LOS$" - .string "NR. 1$" - .string "ENTSCHEIDEN$" - .string "ICH SIEGE!$" - .string "GEWINNEN$" - .string "GEWINNE$" - .string "GEWONNEN$" - .string "GEWINNE ICH$" - .string "SIEGE ICH$" - .string "SIEG UNMÖGL.$" - .string "KANN SIEGEN$" - .string "UNTERLEGEN$" - .string "SEELE$" - .string "ENTSCHIEDEN$" - .string "TRUMPFKARTE$" - .string "NIMM DAS$" - .string "KOMM SCHON$" - .string "ANGRIFF$" - .string "ERGEBEN$" - .string "MUTIG$" - .string "TALENTIERT$" - .string "STRATEGIE$" - .string "SCHLAGEN$" - .string "PARTIE$" - .string "SIEG$" - .string "OFFENSIV$" - .string "SINN$" - .string "GEGEN$" - .string "STREITEN$" - .string "KRAFT$" - .string "HERAUSFORDRG$" - .string "STARKEN$" - .string "ZU STARK$" - .string "SCHONEN$" - .string "GEGNER$" - .string "GENIE$" - .string "LEGENDE$" - .string "FLUCHT$" - .string "ZIEL$" - .string "KÄMPFE$" - .string "KÄMPFEN$" - .string "BELEBEN$" - .string "PUNKTE$" - .string "ERNSTHAFT$" - .string "AUFGEBEN$" - .string "VERLUST$" - .string "VERLIERE ICH$" - .string "VERLOREN$" - .string "VERLIEREN$" - .string "WACHE$" + .string "MATCH UP$" + .string "GO$" + .string "NO. 1$" + .string "DECIDE$" + .string "LET ME WIN$" + .string "WINS$" + .string "WIN$" + .string "WON$" + .string "IF I WIN$" + .string "WHEN I WIN$" + .string "CAN’T WIN$" + .string "CAN WIN$" + .string "NO MATCH$" + .string "SPIRIT$" + .string "DECIDED$" + .string "TRUMP CARD$" + .string "TAKE THAT$" + .string "COME ON$" + .string "ATTACK$" + .string "SURRENDER$" + .string "GUTSY$" + .string "TALENT$" + .string "STRATEGY$" + .string "SMITE$" + .string "MATCH$" + .string "VICTORY$" + .string "OFFENSIVE$" + .string "SENSE$" + .string "VERSUS$" + .string "FIGHTS$" + .string "POWER$" + .string "CHALLENGE$" + .string "STRONG$" + .string "TOO STRONG$" + .string "GO EASY$" + .string "FOE$" + .string "GENIUS$" + .string "LEGEND$" + .string "ESCAPE$" + .string "AIM$" + .string "BATTLE$" + .string "FIGHT$" + .string "RESUSCITATE$" + .string "POINTS$" + .string "SERIOUS$" + .string "GIVE UP$" + .string "LOSS$" + .string "IF I LOSE$" + .string "LOST$" + .string "LOSE$" + .string "GUARD$" .string "PARTNER$" - .string "ABLEHNEN$" - .string "AKZEPTIEREN$" - .string "UNSCHLAGBAR$" - .string "ERHALTEN$" - .string "LEICHT$" - .string "SCHWACH$" - .string "ZU SCHWACH$" - .string "LAPPALIE$" - .string "LEITER$" - .string "REGEL$" - .string "ATTACKE$" + .string "REJECT$" + .string "ACCEPT$" + .string "INVINCIBLE$" + .string "RECEIVED$" + .string "EASY$" + .string "WEAK$" + .string "TOO WEAK$" + .string "PUSHOVER$" + .string "LEADER$" + .string "RULE$" + .string "MOVE$" .string "$" diff --git a/data/text/easy_chat/groups/conditions/order.inc b/data/text/easy_chat/groups/conditions/order.inc index b1fae35b7..6705f9ff6 100644 --- a/data/text/easy_chat/groups/conditions/order.inc +++ b/data/text/easy_chat/groups/conditions/order.inc @@ -1,72 +1,72 @@ .align 1 gEasyChatGroupOrder_Conditions: @ 83DF616 - .2byte 46 .2byte 13 .2byte 55 .2byte 23 - .2byte 36 - .2byte 10 + .2byte 3 + .2byte 54 + .2byte 68 + .2byte 50 + .2byte 14 .2byte 60 - .2byte 15 - .2byte 66 - .2byte 31 - .2byte 1 + .2byte 19 + .2byte 56 + .2byte 10 + .2byte 21 + .2byte 30 + .2byte 38 + .2byte 41 + .2byte 22 + .2byte 36 + .2byte 24 .2byte 28 + .2byte 2 + .2byte 1 + .2byte 37 .2byte 35 - .2byte 62 - .2byte 59 - .2byte 5 - .2byte 58 - .2byte 57 + .2byte 52 + .2byte 12 .2byte 8 - .2byte 56 - .2byte 3 - .2byte 43 - .2byte 17 - .2byte 65 - .2byte 27 - .2byte 19 + .2byte 5 .2byte 4 + .2byte 27 .2byte 0 + .2byte 39 .2byte 63 - .2byte 26 - .2byte 30 - .2byte 47 - .2byte 40 + .2byte 59 + .2byte 20 + .2byte 6 .2byte 61 - .2byte 18 + .2byte 53 .2byte 51 - .2byte 16 - .2byte 68 - .2byte 34 - .2byte 42 - .2byte 21 + .2byte 62 + .2byte 7 + .2byte 33 + .2byte 58 .2byte 49 - .2byte 48 - .2byte 53 + .2byte 15 + .2byte 18 .2byte 45 + .2byte 47 + .2byte 48 + .2byte 34 .2byte 25 - .2byte 38 - .2byte 22 + .2byte 46 + .2byte 26 + .2byte 31 + .2byte 57 .2byte 67 - .2byte 64 - .2byte 54 - .2byte 52 - .2byte 7 - .2byte 14 - .2byte 20 - .2byte 37 + .2byte 66 + .2byte 43 + .2byte 17 + .2byte 40 + .2byte 16 + .2byte 42 + .2byte 11 .2byte 44 - .2byte 2 - .2byte 29 - .2byte 39 - .2byte 24 .2byte 32 + .2byte 29 + .2byte 65 .2byte 9 - .2byte 41 - .2byte 33 - .2byte 12 - .2byte 6 - .2byte 50 - .2byte 11 + .2byte 64 diff --git a/data/text/easy_chat/groups/conditions/words.inc b/data/text/easy_chat/groups/conditions/words.inc index 7822d0381..fd9b9a29d 100644 --- a/data/text/easy_chat/groups/conditions/words.inc +++ b/data/text/easy_chat/groups/conditions/words.inc @@ -1,71 +1,71 @@ gEasyChatGroupWords_Conditions: @ 83DD07D - .string "HEISS$" - .string "EXISTIERT$" - .string "ÜBERMÄSSIG$" - .string "GENEHMIGT$" - .string "HAT$" - .string "FEIN$" - .string "WENIGER$" - .string "SCHWUNG$" - .string "GEHEN$" - .string "VERRÜCKT$" - .string "BESCHÄFTIGT$" - .string "ZUSAMMEN$" - .string "VOLL$" - .string "ABWESEND$" - .string "SEINE$" - .string "BRAUCHE$" - .string "LECKER$" - .string "GESCHICKT$" - .string "LAUT$" - .string "GROSS$" - .string "SPÄT$" - .string "NAHE BEI$" - .string "SANFTMÜTIG$" - .string "AMÜSANT$" - .string "UNTERHALTSAM$" - .string "PERFEKTION$" - .string "HÜBSCH$" - .string "GESUND$" - .string "EXZELLENT$" - .string "UMGEDREHT$" - .string "KALT$" - .string "ERFRISCHEND$" - .string "UNVERMEIDBAR$" - .string "VIELE$" - .string "MITREISSEND$" - .string "FABELHAFT$" - .string "ANDERES$" - .string "TEUER$" - .string "RICHTIG$" - .string "UNMÖGLICH$" - .string "KLEIN$" - .string "VERSCHIEDENE$" - .string "MÜDE$" - .string "GESCHICK$" + .string "HOT$" + .string "EXISTS$" + .string "EXCESS$" + .string "APPROVED$" + .string "HAS$" + .string "GOOD$" + .string "LESS$" + .string "MOMENTUM$" + .string "GOING$" + .string "WEIRD$" + .string "BUSY$" + .string "TOGETHER$" + .string "FULL$" + .string "ABSENT$" + .string "BEING$" + .string "NEED$" + .string "TASTY$" + .string "SKILLED$" + .string "NOISY$" + .string "BIG$" + .string "LATE$" + .string "CLOSE$" + .string "DOCILE$" + .string "AMUSING$" + .string "ENTERTAINING$" + .string "PERFECTION$" + .string "PRETTY$" + .string "HEALTHY$" + .string "EXCELLENT$" + .string "UPSIDE DOWN$" + .string "COLD$" + .string "REFRESHING$" + .string "UNAVOIDABLE$" + .string "MUCH$" + .string "OVERWHELMING$" + .string "FABULOUS$" + .string "ELSE$" + .string "EXPENSIVE$" + .string "CORRECT$" + .string "IMPOSSIBLE$" + .string "SMALL$" + .string "DIFFERENT$" + .string "TIRED$" + .string "SKILL$" .string "TOP$" - .string "NONSTOP$" - .string "ABSURD$" - .string "KEIN$" - .string "NICHTS$" - .string "NATÜRLICH$" - .string "WIRD$" - .string "LAUWARM$" - .string "SCHNELL$" - .string "NIEDRIG$" - .string "SCHLIMM$" - .string "ALLEINE$" - .string "GELANGWEILT$" - .string "GEHEIMNIS$" - .string "GEHEIM$" - .string "FEHLT$" - .string "BESTES$" - .string "LAUSIG$" - .string "FEHLER$" - .string "HÖFLICH$" - .string "SCHLECHT$" - .string "GESCHWÄCHT$" - .string "EINFACH$" - .string "SCHEINBAR$" - .string "MIES$" + .string "NON-STOP$" + .string "PREPOSTEROUS$" + .string "NONE$" + .string "NOTHING$" + .string "NATURAL$" + .string "BECOMES$" + .string "LUKEWARM$" + .string "FAST$" + .string "LOW$" + .string "AWFUL$" + .string "ALONE$" + .string "BORED$" + .string "SECRET$" + .string "MYSTERY$" + .string "LACKS$" + .string "BEST$" + .string "LOUSY$" + .string "MISTAKE$" + .string "KIND$" + .string "WELL$" + .string "WEAKENED$" + .string "SIMPLE$" + .string "SEEMS$" + .string "BADLY$" .string "$" diff --git a/data/text/easy_chat/groups/endings/order.inc b/data/text/easy_chat/groups/endings/order.inc index c2d5af8e1..403a02523 100644 --- a/data/text/easy_chat/groups/endings/order.inc +++ b/data/text/easy_chat/groups/endings/order.inc @@ -1,72 +1,72 @@ .align 1 gEasyChatGroupOrder_Endings: @ 83DF502 - .2byte 58 - .2byte 42 - .2byte 66 - .2byte 44 - .2byte 14 - .2byte 57 - .2byte 56 - .2byte 45 - .2byte 54 - .2byte 49 - .2byte 15 - .2byte 35 .2byte 32 + .2byte 39 + .2byte 63 + .2byte 42 .2byte 33 - .2byte 52 - .2byte 67 - .2byte 41 - .2byte 5 - .2byte 43 - .2byte 53 + .2byte 68 + .2byte 15 .2byte 46 + .2byte 54 + .2byte 6 + .2byte 64 + .2byte 53 + .2byte 49 + .2byte 22 + .2byte 21 + .2byte 8 .2byte 59 + .2byte 60 + .2byte 24 + .2byte 25 + .2byte 61 + .2byte 23 + .2byte 50 + .2byte 43 .2byte 7 .2byte 30 .2byte 31 .2byte 55 - .2byte 68 .2byte 11 + .2byte 5 .2byte 19 - .2byte 50 - .2byte 21 - .2byte 22 - .2byte 8 + .2byte 12 + .2byte 41 .2byte 13 - .2byte 24 - .2byte 61 - .2byte 48 - .2byte 63 - .2byte 23 - .2byte 60 + .2byte 58 + .2byte 9 + .2byte 38 .2byte 34 - .2byte 12 + .2byte 52 + .2byte 45 .2byte 36 + .2byte 44 + .2byte 67 .2byte 2 - .2byte 62 - .2byte 6 + .2byte 14 + .2byte 56 + .2byte 40 .2byte 51 - .2byte 18 .2byte 37 - .2byte 29 - .2byte 25 - .2byte 40 - .2byte 39 - .2byte 9 - .2byte 38 - .2byte 64 - .2byte 65 + .2byte 66 + .2byte 35 + .2byte 18 + .2byte 3 + .2byte 47 + .2byte 57 .2byte 16 .2byte 28 + .2byte 17 + .2byte 29 .2byte 27 + .2byte 65 .2byte 26 - .2byte 20 .2byte 0 .2byte 1 + .2byte 48 + .2byte 62 + .2byte 20 .2byte 4 .2byte 10 - .2byte 17 - .2byte 3 - .2byte 47 diff --git a/data/text/easy_chat/groups/endings/words.inc b/data/text/easy_chat/groups/endings/words.inc index bf4c2cec3..e7ca49996 100644 --- a/data/text/easy_chat/groups/endings/words.inc +++ b/data/text/easy_chat/groups/endings/words.inc @@ -1,71 +1,71 @@ gEasyChatGroupWords_Endings: @ 83DCD23 - .string "WERDEN$" - .string "WIRD DA SEIN$" - .string "ODER$" - .string "ZEITEN$" - .string "WUNDER$" - .string "ES IST$" - .string "SEI$" - .string "GIB MIR$" - .string "KÖNNTE$" - .string "VERMUTLICH$" - .string "WÜRDE$" - .string "IST$" - .string "NICHT WAHR?$" - .string "LASS UNS$" - .string "ANDERE$" - .string "BIST$" - .string "WAR$" - .string "WURDEN$" - .string "SIND$" - .string "IST KEIN$" - .string "WERDE NICHT$" - .string "KANNST$" - .string "KÖNNEN$" - .string "NICHT$" - .string "MACHE$" - .string "TUT$" - .string "WEM$" - .string "WELCHE$" - .string "WAR NICHT$" - .string "SOLLTEN$" - .string "HABE$" - .string "HABEN NICHT$" - .string "EIN$" - .string "EINE$" - .string "NICHT NUR$" - .string "DA$" - .string "O.K.?$" - .string "SO$" - .string "VIELLEICHT$" - .string "UMHER$" - .string "ÜBER$" - .string "ES$" - .string "ALLE$" - .string "FÜR$" + .string "WILL$" + .string "WILL BE HERE$" + .string "OR$" + .string "TIMES$" + .string "WONDER$" + .string "IS IT?$" + .string "BE$" + .string "GIMME$" + .string "COULD$" + .string "LIKELY TO$" + .string "WOULD$" + .string "IS$" + .string "ISN’T IT?$" + .string "LET’S$" + .string "OTHER$" + .string "ARE$" + .string "WAS$" + .string "WERE$" + .string "THOSE$" + .string "ISN’T$" + .string "WON’T$" + .string "CAN’T$" + .string "CAN$" + .string "DON’T$" + .string "DO$" + .string "DOES$" + .string "WHOM$" + .string "WHICH$" + .string "WASN’T$" + .string "WEREN’T$" + .string "HAVE$" + .string "HAVEN’T$" + .string "A$" .string "AN$" - .string "AUS$" - .string "GENAUSO$" - .string "ZU$" - .string "MIT$" - .string "BESSER$" - .string "JEMALS$" - .string "SEIT$" - .string "EINEN$" - .string "GEHÖRT ZU$" - .string "BEI$" + .string "NOT$" + .string "THERE$" + .string "OK?$" + .string "SO$" + .string "MAYBE$" + .string "ABOUT$" + .string "OVER$" + .string "IT$" + .string "ALL$" + .string "FOR$" + .string "ON$" + .string "OFF$" + .string "AS$" + .string "TO$" + .string "WITH$" + .string "BETTER$" + .string "EVER$" + .string "SINCE$" + .string "OF$" + .string "BELONGS TO$" + .string "AT$" .string "IN$" - .string "AUF$" - .string "AUCH$" - .string "ÄHNLICH$" - .string "GETAN$" - .string "NICHT GETAN$" - .string "MACHT$" - .string "OHNE$" - .string "NACH$" - .string "VORHER$" - .string "WÄHREND$" - .string "ALS$" - .string "EINMAL$" - .string "IRGENDWO$" + .string "OUT$" + .string "TOO$" + .string "LIKE$" + .string "DID$" + .string "DIDN’T$" + .string "DOESN’T$" + .string "WITHOUT$" + .string "AFTER$" + .string "BEFORE$" + .string "WHILE$" + .string "THAN$" + .string "ONCE$" + .string "ANYWHERE$" .string "$" diff --git a/data/text/easy_chat/groups/events/order.inc b/data/text/easy_chat/groups/events/order.inc index d1555c2a6..0b48d0f0b 100644 --- a/data/text/easy_chat/groups/events/order.inc +++ b/data/text/easy_chat/groups/events/order.inc @@ -2,24 +2,24 @@ gEasyChatGroupOrder_Events: @ 83DF8F8 .2byte 0 - .2byte 2 - .2byte 21 - .2byte 3 - .2byte 8 + .2byte 14 .2byte 12 - .2byte 10 + .2byte 3 + .2byte 17 + .2byte 4 .2byte 1 - .2byte 16 + .2byte 10 + .2byte 9 + .2byte 15 .2byte 11 .2byte 6 - .2byte 14 - .2byte 20 .2byte 13 - .2byte 5 .2byte 19 - .2byte 17 + .2byte 5 .2byte 18 - .2byte 9 + .2byte 20 + .2byte 21 + .2byte 16 + .2byte 8 + .2byte 2 .2byte 7 - .2byte 15 - .2byte 4 diff --git a/data/text/easy_chat/groups/events/words.inc b/data/text/easy_chat/groups/events/words.inc index 1e4b52fb1..6bfe9c296 100644 --- a/data/text/easy_chat/groups/events/words.inc +++ b/data/text/easy_chat/groups/events/words.inc @@ -1,24 +1,24 @@ gEasyChatGroupWords_Events: @ 83DDA8D - .string "AUSDRUCK$" + .string "APPEAL$" .string "EVENTS$" - .string "BABYSITTEN$" - .string "BEERE$" - .string "WETTBEWERB$" + .string "STAY-AT-HOME$" + .string "BERRY$" + .string "CONTEST$" .string "MC$" - .string "JUROR$" + .string "JUDGE$" .string "SUPER$" - .string "BÜHNE$" - .string "RUHMESHALLE$" - .string "ENTWICKLUNG$" + .string "STAGE$" + .string "HALL OF FAME$" + .string "EVOLUTION$" .string "HYPER$" - .string "DUELLTURM$" - .string "LEITER$" - .string "KAMPFRAUM$" - .string "VERSTECKTE$" - .string "GEHEIMBASIS$" - .string "MIXEN$" + .string "BATTLE TOWER$" + .string "LEADERS$" + .string "BATTLE ROOM$" + .string "HIDDEN$" + .string "SECRET BASE$" + .string "BLEND$" .string "{POKEBLOCK}$" - .string "MEISTER$" - .string "KLASSE$" - .string "BAND$" + .string "MASTER$" + .string "RANK$" + .string "RIBBON$" .string "$" diff --git a/data/text/easy_chat/groups/feelings/order.inc b/data/text/easy_chat/groups/feelings/order.inc index 40027cbe8..0570ae7dc 100644 --- a/data/text/easy_chat/groups/feelings/order.inc +++ b/data/text/easy_chat/groups/feelings/order.inc @@ -1,72 +1,72 @@ .align 1 gEasyChatGroupOrder_Feelings: @ 83DF58C - .2byte 35 - .2byte 7 - .2byte 29 + .2byte 40 + .2byte 39 + .2byte 24 + .2byte 23 + .2byte 46 + .2byte 63 + .2byte 36 + .2byte 37 + .2byte 38 + .2byte 61 + .2byte 31 .2byte 62 + .2byte 27 + .2byte 12 + .2byte 13 .2byte 41 - .2byte 2 - .2byte 26 + .2byte 22 + .2byte 35 + .2byte 60 .2byte 32 - .2byte 13 - .2byte 12 + .2byte 51 .2byte 44 - .2byte 60 - .2byte 66 - .2byte 28 - .2byte 18 - .2byte 27 - .2byte 53 - .2byte 61 - .2byte 3 .2byte 42 .2byte 43 + .2byte 7 + .2byte 53 + .2byte 9 + .2byte 29 + .2byte 4 + .2byte 11 + .2byte 3 + .2byte 10 + .2byte 64 .2byte 6 .2byte 5 - .2byte 64 - .2byte 39 - .2byte 17 - .2byte 10 - .2byte 11 + .2byte 47 .2byte 19 - .2byte 57 - .2byte 55 - .2byte 36 - .2byte 9 - .2byte 49 - .2byte 54 + .2byte 17 + .2byte 2 + .2byte 8 + .2byte 33 + .2byte 28 + .2byte 45 + .2byte 34 + .2byte 26 + .2byte 0 + .2byte 21 .2byte 59 - .2byte 50 - .2byte 22 .2byte 30 - .2byte 65 - .2byte 33 - .2byte 46 - .2byte 63 - .2byte 48 - .2byte 47 - .2byte 4 - .2byte 58 - .2byte 37 - .2byte 38 + .2byte 50 .2byte 1 + .2byte 66 + .2byte 58 + .2byte 65 .2byte 14 - .2byte 51 - .2byte 52 + .2byte 56 .2byte 25 + .2byte 57 + .2byte 49 + .2byte 52 + .2byte 48 + .2byte 18 + .2byte 16 .2byte 15 - .2byte 45 - .2byte 31 - .2byte 40 - .2byte 21 .2byte 67 .2byte 68 - .2byte 16 - .2byte 34 - .2byte 0 - .2byte 8 + .2byte 55 + .2byte 54 .2byte 20 - .2byte 24 - .2byte 23 - .2byte 56 diff --git a/data/text/easy_chat/groups/feelings/words.inc b/data/text/easy_chat/groups/feelings/words.inc index 5ee8571fa..510d285c2 100644 --- a/data/text/easy_chat/groups/feelings/words.inc +++ b/data/text/easy_chat/groups/feelings/words.inc @@ -1,71 +1,71 @@ gEasyChatGroupWords_Feelings: @ 83DCE9B - .string "WEINEN$" - .string "SPIELEN$" - .string "EILIG$" - .string "GEHT$" - .string "SCHWINDELIG$" - .string "GLÜCKLICH$" - .string "GLÜCK$" - .string "BEGEISTERN$" - .string "WICHTIG$" - .string "LUSTIG$" - .string "HABEN$" - .string "HEIMGEHEN$" - .string "ENTTÄUSCHT$" - .string "ENTTÄUSCHEN$" - .string "TRAURIG$" - .string "UNZUFRIEDEN$" - .string "VERSUCHT$" - .string "GUTE LAUNE$" - .string "FRÖHLICH$" - .string "HÖREN$" - .string "WILL$" - .string "VERHÖRT$" - .string "NICHT MÖGEN$" - .string "WÜTEND$" - .string "WUT$" - .string "UNHEIMLICH$" - .string "EINSAM$" - .string "FRUSTRIERT$" - .string "FREUDE$" - .string "BEKOMMT$" - .string "NIE$" - .string "VERDAMMT$" - .string "ENTMUTIGT$" - .string "SAGENHAFT$" - .string "VORLIEBEN$" - .string "ABNEIGUNG$" - .string "LANGWEILIG$" - .string "SORGEN$" - .string "SORGT$" - .string "GUT$" - .string "VERGÖTTERN$" - .string "DESASTER$" - .string "GENIESSEN$" - .string "GENIESST$" - .string "ESSEN$" - .string "UNZUREICHEND$" - .string "SCHLECHTE$" - .string "SCHWER$" - .string "SCHRECKLICH$" - .string "MIESE LAUNE$" - .string "NETT$" - .string "TRINKEN$" - .string "ÜBERRASCHUNG$" - .string "FURCHT$" - .string "MÖCHTE$" - .string "LANGEWEILE$" - .string "ZUFRIEDEN$" - .string "LACHEN$" - .string "SELTEN$" - .string "NEGATIV$" - .string "FERTIG$" - .string "GEFAHR$" - .string "BESIEGT$" - .string "SCHLUG$" - .string "GROSSARTIG$" - .string "ROMANTISCH$" - .string "FRAGE$" - .string "VERSTEHEN$" - .string "VERSTEHT$" + .string "MEET$" + .string "PLAY$" + .string "HURRIED$" + .string "GOES$" + .string "GIDDY$" + .string "HAPPY$" + .string "HAPPINESS$" + .string "EXCITE$" + .string "IMPORTANT$" + .string "FUNNY$" + .string "GOT$" + .string "GO HOME$" + .string "DISAPPOINTED$" + .string "DISAPPOINTS$" + .string "SAD$" + .string "TRY$" + .string "TRIES$" + .string "HEARS$" + .string "THINK$" + .string "HEAR$" + .string "WANTS$" + .string "MISHEARD$" + .string "DISLIKE$" + .string "ANGRY$" + .string "ANGER$" + .string "SCARY$" + .string "LONESOME$" + .string "DISAPPOINT$" + .string "JOY$" + .string "GETS$" + .string "NEVER$" + .string "DARN$" + .string "DOWNCAST$" + .string "INCREDIBLE$" + .string "LIKES$" + .string "DISLIKES$" + .string "BORING$" + .string "CARE$" + .string "CARES$" + .string "ALL RIGHT$" + .string "ADORE$" + .string "DISASTER$" + .string "ENJOY$" + .string "ENJOYS$" + .string "EAT$" + .string "LACKING$" + .string "BAD$" + .string "HARD$" + .string "TERRIBLE$" + .string "SHOULD$" + .string "NICE$" + .string "DRINK$" + .string "SURPRISE$" + .string "FEAR$" + .string "WANT$" + .string "WAIT$" + .string "SATISFIED$" + .string "SEE$" + .string "RARE$" + .string "NEGATIVE$" + .string "DONE$" + .string "DANGER$" + .string "DEFEATED$" + .string "BEAT$" + .string "GREAT$" + .string "ROMANTIC$" + .string "QUESTION$" + .string "UNDERSTAND$" + .string "UNDERSTANDS$" .string "$" diff --git a/data/text/easy_chat/groups/greetings/order.inc b/data/text/easy_chat/groups/greetings/order.inc index b02a5d0f7..8310ebd07 100644 --- a/data/text/easy_chat/groups/greetings/order.inc +++ b/data/text/easy_chat/groups/greetings/order.inc @@ -1,45 +1,45 @@ .align 1 gEasyChatGroupOrder_Greetings: @ 83DF322 + .2byte 12 + .2byte 25 + .2byte 32 .2byte 40 - .2byte 7 - .2byte 33 - .2byte 21 - .2byte 0 - .2byte 17 + .2byte 9 + .2byte 41 + .2byte 20 .2byte 22 - .2byte 35 + .2byte 13 .2byte 10 - .2byte 9 + .2byte 24 + .2byte 16 .2byte 15 + .2byte 2 + .2byte 3 + .2byte 4 .2byte 34 .2byte 14 .2byte 26 - .2byte 3 - .2byte 4 - .2byte 2 - .2byte 36 + .2byte 30 .2byte 37 + .2byte 8 + .2byte 28 .2byte 18 - .2byte 1 - .2byte 39 - .2byte 38 + .2byte 36 + .2byte 33 .2byte 29 - .2byte 23 + .2byte 7 .2byte 19 - .2byte 25 - .2byte 13 + .2byte 21 + .2byte 35 .2byte 11 - .2byte 30 - .2byte 20 - .2byte 32 - .2byte 16 - .2byte 12 - .2byte 27 - .2byte 24 - .2byte 8 - .2byte 28 + .2byte 17 + .2byte 0 .2byte 6 + .2byte 23 + .2byte 27 + .2byte 38 .2byte 5 .2byte 31 - .2byte 41 + .2byte 1 + .2byte 39 diff --git a/data/text/easy_chat/groups/greetings/words.inc b/data/text/easy_chat/groups/greetings/words.inc index 96a48e9fe..b283168ca 100644 --- a/data/text/easy_chat/groups/greetings/words.inc +++ b/data/text/easy_chat/groups/greetings/words.inc @@ -1,44 +1,44 @@ gEasyChatGroupWords_Greetings: @ 83DC70F - .string "DANK$" - .string "JA$" - .string "HIER KOMMT$" - .string "HIER BIN ICH$" - .string "HIER IST ES$" + .string "THANKS$" + .string "YES$" + .string "HERE GOES$" + .string "HERE I COME$" + .string "HERE IT IS$" .string "YEAH$" - .string "WILLKOMMEN$" - .string "AU$" - .string "WIE$" - .string "GLÜCKWUNSCH$" - .string "GIB$" + .string "WELCOME$" + .string "OI$" + .string "HOW DO$" + .string "CONGRATS$" + .string "GIVE ME$" .string "SORRY$" - .string "VERZEIHUNG$" - .string "SCHON GUT$" - .string "HEY DA$" - .string "HALLO$" - .string "TSCHÜSS$" - .string "DANKE SCHÖN$" - .string "ICH BIN DA$" + .string "APOLOGIZE$" + .string "FORGIVE$" + .string "HEY, THERE$" + .string "HELLO$" + .string "GOOD-BYE$" + .string "THANK YOU$" + .string "I’VE ARRIVED$" .string "PARDON$" - .string "TAGCHEN$" - .string "BIS DANN$" - .string "ENTSCHULDIGE$" - .string "NUN, DANN$" - .string "WEITER SO$" - .string "SCHÄTZEN$" + .string "EXCUSE$" + .string "SEE YA$" + .string "EXCUSE ME$" + .string "WELL, THEN$" + .string "GO AHEAD$" + .string "APPRECIATE$" .string "HEY?$" - .string "WAS IST LOS?$" - .string "WIE?$" - .string "NEIN$" - .string "TAG AUCH$" + .string "WHAT’S UP?$" + .string "HUH?$" + .string "NO$" + .string "HI$" .string "YEAH, YEAH$" - .string "TSCHAU$" - .string "BIS BALD$" + .string "BYE-BYE$" + .string "MEET YOU$" .string "HEY$" - .string "GERUCH$" - .string "HÖR ZU$" - .string "HUH HAH$" - .string "JUCHUU$" - .string "JEPP$" - .string "ACH, KOMM$" - .string "ZÄHLEN AUF$" + .string "SMELL$" + .string "LISTENING$" + .string "HOO-HAH$" + .string "YAHOO$" + .string "YO$" + .string "COME OVER$" + .string "COUNT ON$" .string "$" diff --git a/data/text/easy_chat/groups/hobbies/order.inc b/data/text/easy_chat/groups/hobbies/order.inc index 7ed127e1e..41ced1099 100644 --- a/data/text/easy_chat/groups/hobbies/order.inc +++ b/data/text/easy_chat/groups/hobbies/order.inc @@ -2,56 +2,56 @@ gEasyChatGroupOrder_Hobbies: @ 83DF796 .2byte 43 - .2byte 32 .2byte 1 - .2byte 53 .2byte 45 - .2byte 12 - .2byte 38 + .2byte 21 .2byte 44 .2byte 46 + .2byte 11 + .2byte 9 + .2byte 30 + .2byte 5 + .2byte 6 + .2byte 17 .2byte 48 + .2byte 18 + .2byte 29 + .2byte 33 .2byte 34 - .2byte 10 - .2byte 50 - .2byte 21 - .2byte 49 + .2byte 26 + .2byte 42 .2byte 47 - .2byte 3 - .2byte 11 + .2byte 32 + .2byte 38 + .2byte 15 .2byte 14 .2byte 39 .2byte 41 - .2byte 31 .2byte 22 + .2byte 49 .2byte 0 - .2byte 9 - .2byte 6 - .2byte 18 - .2byte 27 .2byte 35 + .2byte 53 .2byte 19 - .2byte 42 + .2byte 31 + .2byte 3 .2byte 8 - .2byte 26 - .2byte 4 .2byte 40 .2byte 37 - .2byte 5 + .2byte 50 .2byte 36 - .2byte 28 .2byte 16 - .2byte 17 - .2byte 51 + .2byte 10 .2byte 24 .2byte 2 .2byte 25 - .2byte 20 - .2byte 15 - .2byte 7 + .2byte 13 .2byte 23 - .2byte 29 + .2byte 4 + .2byte 7 + .2byte 28 + .2byte 27 + .2byte 51 .2byte 52 - .2byte 33 - .2byte 30 - .2byte 13 + .2byte 12 + .2byte 20 diff --git a/data/text/easy_chat/groups/hobbies/words.inc b/data/text/easy_chat/groups/hobbies/words.inc index 5ef66eac7..3aa4f2887 100644 --- a/data/text/easy_chat/groups/hobbies/words.inc +++ b/data/text/easy_chat/groups/hobbies/words.inc @@ -2,55 +2,55 @@ gEasyChatGroupWords_Hobbies: @ 83DD5B1 .string "IDOL$" .string "ANIME$" .string "SONG$" - .string "FILM$" - .string "NASCHEN$" - .string "PLAUDERN$" - .string "KINDERSPIEL$" - .string "SPIELZEUG$" - .string "MUSIK$" - .string "KARTENSPIELE$" - .string "EINKAUFEN$" - .string "FOTOS$" - .string "BESICHTIGUNG$" - .string "ZUSCHAUER$" + .string "MOVIE$" + .string "SWEETS$" + .string "CHAT$" + .string "CHILD’S PLAY$" + .string "TOYS$" + .string "MUSIC$" + .string "CARDS$" + .string "SHOPPING$" + .string "CAMERA$" + .string "VIEWING$" + .string "SPECTATOR$" .string "GOURMET$" - .string "SPIEL$" + .string "GAME$" .string "RPG$" - .string "SAMMLUNG$" - .string "KOMPLETT$" - .string "MAGAZIN$" - .string "SPAZIEREN$" - .string "FAHRRAD$" + .string "COLLECTION$" + .string "COMPLETE$" + .string "MAGAZINE$" + .string "WALK$" + .string "BIKE$" .string "HOBBY$" - .string "SPORT$" + .string "SPORTS$" .string "SOFTWARE$" .string "SONGS$" - .string "NAHRUNG$" - .string "KOSTBARKEIT$" - .string "REISEN$" - .string "TANZEN$" - .string "WASSERSPORT$" - .string "HERSTELLUNG$" - .string "ANGELN$" - .string "VERABREDUNG$" + .string "DIET$" + .string "TREASURE$" + .string "TRAVEL$" + .string "DANCE$" + .string "CHANNEL$" + .string "MAKING$" + .string "FISHING$" + .string "DATE$" .string "DESIGN$" - .string "LOKOMOTIVEN$" - .string "PLÜSCHPUPPEN$" + .string "LOCOMOTIVE$" + .string "PLUSH DOLL$" .string "PC$" - .string "BLUMEN$" - .string "HELD$" - .string "NICKERCHEN$" - .string "HELDIN$" - .string "MODE$" - .string "ABENTEUER$" - .string "BRETTSPIELE$" + .string "FLOWERS$" + .string "HERO$" + .string "NAP$" + .string "HEROINE$" + .string "FASHION$" + .string "ADVENTURE$" + .string "BOARD$" .string "BALL$" - .string "BÜCHER$" - .string "FESTIVALS$" + .string "BOOK$" + .string "FESTIVAL$" .string "COMICS$" - .string "FERIEN$" - .string "ETWAS PLANEN$" - .string "SCHICKIMICKI$" - .string "URLAUB$" - .string "AUSSEHEN$" + .string "HOLIDAY$" + .string "PLANS$" + .string "TRENDY$" + .string "VACATION$" + .string "LOOK$" .string "$" diff --git a/data/text/easy_chat/groups/lifestyle/order.inc b/data/text/easy_chat/groups/lifestyle/order.inc index e21269bb5..c0aff2d7b 100644 --- a/data/text/easy_chat/groups/lifestyle/order.inc +++ b/data/text/easy_chat/groups/lifestyle/order.inc @@ -1,48 +1,48 @@ .align 1 gEasyChatGroupOrder_Lifestyle: @ 83DF73C - .2byte 13 + .2byte 3 .2byte 4 - .2byte 22 - .2byte 24 - .2byte 27 + .2byte 0 + .2byte 16 .2byte 7 - .2byte 2 - .2byte 23 .2byte 5 - .2byte 8 + .2byte 26 + .2byte 24 + .2byte 39 + .2byte 23 .2byte 9 + .2byte 8 .2byte 1 .2byte 18 .2byte 29 - .2byte 26 .2byte 40 - .2byte 11 + .2byte 17 + .2byte 22 .2byte 41 .2byte 19 - .2byte 20 - .2byte 16 - .2byte 34 .2byte 35 - .2byte 43 + .2byte 36 .2byte 37 + .2byte 2 .2byte 30 .2byte 31 .2byte 33 - .2byte 0 + .2byte 28 .2byte 32 - .2byte 36 + .2byte 38 .2byte 42 + .2byte 43 .2byte 6 .2byte 12 + .2byte 11 + .2byte 34 .2byte 14 - .2byte 3 - .2byte 28 + .2byte 20 + .2byte 27 .2byte 25 - .2byte 15 - .2byte 39 .2byte 21 - .2byte 17 - .2byte 38 - .2byte 44 + .2byte 15 .2byte 10 + .2byte 13 + .2byte 44 diff --git a/data/text/easy_chat/groups/lifestyle/words.inc b/data/text/easy_chat/groups/lifestyle/words.inc index 526ff4b17..64cc1cd86 100644 --- a/data/text/easy_chat/groups/lifestyle/words.inc +++ b/data/text/easy_chat/groups/lifestyle/words.inc @@ -1,47 +1,47 @@ gEasyChatGroupWords_Lifestyle: @ 83DD468 - .string "PFLICHTEN$" - .string "HEIM$" - .string "GELD$" - .string "TASCHENGELD$" - .string "BAD$" - .string "GESPRÄCH$" - .string "SCHULE$" - .string "GEDENKEN$" - .string "GEWOHNHEIT$" - .string "GRUPPE$" - .string "WORT$" - .string "LAGER$" + .string "CHORES$" + .string "HOME$" + .string "MONEY$" + .string "ALLOWANCE$" + .string "BATH$" + .string "CONVERSATION$" + .string "SCHOOL$" + .string "COMMEMORATE$" + .string "HABIT$" + .string "GROUP$" + .string "WORD$" + .string "STORE$" .string "SERVICE$" - .string "ARBEIT$" + .string "WORK$" .string "SYSTEM$" - .string "TRAINIEREN$" - .string "LEKTION$" - .string "UNTERRICHT$" + .string "TRAIN$" + .string "CLASS$" + .string "LESSONS$" .string "INFORMATION$" - .string "LEBENDIG$" - .string "LEHRER$" - .string "TURNIER$" - .string "BRIEF$" - .string "GESCHEHEN$" - .string "DIGITALES$" + .string "LIVING$" + .string "TEACHER$" + .string "TOURNAMENT$" + .string "LETTER$" + .string "EVENT$" + .string "DIGITAL$" .string "TEST$" - .string "KAUFHAUS$" - .string "FERNSEHER$" - .string "TELEFON$" + .string "DEPT. STORE$" + .string "TELEVISION$" + .string "PHONE$" .string "ITEM$" .string "NAME$" - .string "NEUIGKEITEN$" - .string "POPULÄR$" + .string "NEWS$" + .string "POPULAR$" .string "PARTY$" - .string "LERNEN$" - .string "MASCHINE$" - .string "POST$" - .string "MITTEILUNG$" - .string "VERSPRECHEN$" - .string "TRAUM$" + .string "STUDY$" + .string "MACHINE$" + .string "MAIL$" + .string "MESSAGE$" + .string "PROMISE$" + .string "DREAM$" .string "KINDERGARTEN$" - .string "LEBEN$" + .string "LIFE$" .string "RADIO$" - .string "MIETE$" - .string "WELT$" + .string "RENTAL$" + .string "WORLD$" .string "$" diff --git a/data/text/easy_chat/groups/misc/order.inc b/data/text/easy_chat/groups/misc/order.inc index 8e8a529f1..95184c8fb 100644 --- a/data/text/easy_chat/groups/misc/order.inc +++ b/data/text/easy_chat/groups/misc/order.inc @@ -1,45 +1,45 @@ .align 1 gEasyChatGroupOrder_Misc: @ 83DF85C - .2byte 2 - .2byte 16 - .2byte 12 - .2byte 20 - .2byte 14 - .2byte 23 + .2byte 7 .2byte 24 - .2byte 25 - .2byte 15 - .2byte 17 - .2byte 18 - .2byte 5 .2byte 30 - .2byte 39 - .2byte 22 - .2byte 33 - .2byte 10 - .2byte 3 + .2byte 8 + .2byte 6 + .2byte 13 + .2byte 28 + .2byte 38 + .2byte 35 .2byte 19 + .2byte 16 + .2byte 29 + .2byte 26 + .2byte 10 .2byte 9 .2byte 0 .2byte 11 .2byte 40 + .2byte 1 .2byte 31 - .2byte 13 - .2byte 27 - .2byte 7 + .2byte 39 + .2byte 12 + .2byte 3 .2byte 41 + .2byte 36 + .2byte 20 + .2byte 25 + .2byte 23 + .2byte 17 + .2byte 18 + .2byte 5 .2byte 4 + .2byte 15 + .2byte 14 .2byte 21 - .2byte 36 - .2byte 35 - .2byte 1 - .2byte 6 - .2byte 38 - .2byte 26 - .2byte 28 - .2byte 37 + .2byte 22 + .2byte 2 + .2byte 27 .2byte 34 - .2byte 29 + .2byte 33 .2byte 32 - .2byte 8 + .2byte 37 diff --git a/data/text/easy_chat/groups/misc/words.inc b/data/text/easy_chat/groups/misc/words.inc index e9025bcf5..9e52baf07 100644 --- a/data/text/easy_chat/groups/misc/words.inc +++ b/data/text/easy_chat/groups/misc/words.inc @@ -1,44 +1,44 @@ gEasyChatGroupWords_Misc: @ 83DD860 - .string "HÖHEN$" - .string "TIEFEN$" - .string "ÄH$" - .string "HINTEN$" - .string "SACHEN$" - .string "DING$" - .string "UNTERHALB$" - .string "OBERHALB$" - .string "ZURÜCK$" - .string "HOCH$" - .string "HIER$" - .string "INNEN$" - .string "AUSSEN$" - .string "NEBEN$" - .string "DAS IST ES!$" - .string "DIES$" - .string "ALLES$" - .string "DIESE$" - .string "DIESE WAREN$" - .string "HINUNTER$" - .string "DAS$" - .string "SCHON$" - .string "GENUG$" - .string "DAS IST’S!$" - .string "DAS SIND$" - .string "DAS WAR$" - .string "VORNE$" - .string "OBEN$" - .string "WAHL$" - .string "WEIT$" - .string "FORT$" - .string "NAHE$" - .string "WO$" - .string "GLEICH$" - .string "WAS$" - .string "TIEF$" - .string "SEICHT$" - .string "WARUM$" - .string "VERWIRRT$" - .string "GEGENÜBER$" - .string "LINKS$" - .string "RECHTS$" + .string "HIGHS$" + .string "LOWS$" + .string "UM$" + .string "REAR$" + .string "THINGS$" + .string "THING$" + .string "BELOW$" + .string "ABOVE$" + .string "BACK$" + .string "HIGH$" + .string "HERE$" + .string "INSIDE$" + .string "OUTSIDE$" + .string "BESIDE$" + .string "THIS IS IT!$" + .string "THIS$" + .string "EVERY$" + .string "THESE$" + .string "THESE WERE$" + .string "DOWN$" + .string "THAT$" + .string "THOSE ARE$" + .string "THOSE WERE$" + .string "THAT’S IT!$" + .string "AM$" + .string "THAT WAS$" + .string "FRONT$" + .string "UP$" + .string "CHOICE$" + .string "FAR$" + .string "AWAY$" + .string "NEAR$" + .string "WHERE$" + .string "WHEN$" + .string "WHAT$" + .string "DEEP$" + .string "SHALLOW$" + .string "WHY$" + .string "CONFUSED$" + .string "OPPOSITE$" + .string "LEFT$" + .string "RIGHT$" .string "$" diff --git a/data/text/easy_chat/groups/move_1/order.inc b/data/text/easy_chat/groups/move_1/order.inc index 73fa0c69c..08a250dab 100644 --- a/data/text/easy_chat/groups/move_1/order.inc +++ b/data/text/easy_chat/groups/move_1/order.inc @@ -2,155 +2,155 @@ gEasyChatGroupOrder_Move1: @ 83DF924 .2byte 71 + .2byte 177 .2byte 97 - .2byte 324 - .2byte 207 + .2byte 314 .2byte 246 .2byte 312 - .2byte 253 + .2byte 310 .2byte 62 - .2byte 203 - .2byte 50 + .2byte 117 + .2byte 20 .2byte 44 + .2byte 280 .2byte 145 - .2byte 141 - .2byte 219 + .2byte 268 .2byte 204 - .2byte 87 - .2byte 85 - .2byte 9 + .2byte 128 + .2byte 109 + .2byte 132 + .2byte 322 + .2byte 68 + .2byte 152 + .2byte 238 + .2byte 242 + .2byte 15 + .2byte 91 + .2byte 50 .2byte 104 - .2byte 175 - .2byte 114 + .2byte 38 .2byte 3 - .2byte 280 - .2byte 231 - .2byte 329 - .2byte 196 - .2byte 116 .2byte 89 - .2byte 310 - .2byte 81 + .2byte 227 + .2byte 283 + .2byte 203 + .2byte 326 + .2byte 245 .2byte 263 - .2byte 317 - .2byte 120 - .2byte 325 + .2byte 313 + .2byte 90 + .2byte 175 .2byte 172 .2byte 53 + .2byte 260 .2byte 19 - .2byte 259 - .2byte 323 - .2byte 301 - .2byte 37 - .2byte 209 - .2byte 67 - .2byte 281 - .2byte 117 - .2byte 179 - .2byte 105 - .2byte 90 - .2byte 47 + .2byte 116 + .2byte 264 + .2byte 266 .2byte 202 .2byte 320 - .2byte 184 - .2byte 180 + .2byte 74 + .2byte 288 + .2byte 16 .2byte 258 .2byte 106 - .2byte 327 - .2byte 143 - .2byte 315 - .2byte 212 + .2byte 114 + .2byte 29 + .2byte 215 .2byte 95 - .2byte 261 + .2byte 301 + .2byte 196 + .2byte 231 .2byte 2 - .2byte 20 - .2byte 13 - .2byte 242 - .2byte 109 - .2byte 68 - .2byte 29 - .2byte 322 - .2byte 152 - .2byte 103 - .2byte 238 - .2byte 268 - .2byte 221 - .2byte 220 - .2byte 230 - .2byte 177 + .2byte 134 + .2byte 141 + .2byte 122 + .2byte 142 + .2byte 67 + .2byte 212 .2byte 262 .2byte 319 - .2byte 311 + .2byte 309 + .2byte 170 + .2byte 119 + .2byte 54 .2byte 234 - .2byte 166 - .2byte 288 - .2byte 171 .2byte 267 - .2byte 283 + .2byte 171 .2byte 190 - .2byte 110 - .2byte 147 - .2byte 264 + .2byte 316 + .2byte 200 + .2byte 315 + .2byte 220 + .2byte 181 + .2byte 60 .2byte 244 .2byte 94 - .2byte 134 - .2byte 60 .2byte 149 - .2byte 181 + .2byte 228 .2byte 99 - .2byte 108 .2byte 240 - .2byte 265 - .2byte 38 + .2byte 229 + .2byte 13 + .2byte 105 .2byte 216 - .2byte 39 + .2byte 179 + .2byte 157 + .2byte 249 + .2byte 88 + .2byte 317 + .2byte 205 + .2byte 221 + .2byte 219 .2byte 328 - .2byte 201 .2byte 28 + .2byte 201 + .2byte 184 + .2byte 103 + .2byte 120 + .2byte 247 + .2byte 325 .2byte 159 - .2byte 91 - .2byte 122 - .2byte 163 - .2byte 260 - .2byte 128 - .2byte 173 - .2byte 316 + .2byte 329 + .2byte 324 .2byte 318 + .2byte 47 + .2byte 166 + .2byte 285 + .2byte 143 + .2byte 327 + .2byte 163 + .2byte 265 .2byte 123 + .2byte 108 + .2byte 173 .2byte 76 - .2byte 326 - .2byte 321 - .2byte 119 + .2byte 49 + .2byte 209 .2byte 169 - .2byte 266 - .2byte 247 - .2byte 78 + .2byte 180 + .2byte 147 .2byte 70 - .2byte 157 - .2byte 88 - .2byte 309 - .2byte 129 + .2byte 81 + .2byte 78 + .2byte 66 .2byte 162 + .2byte 207 + .2byte 230 + .2byte 129 .2byte 235 - .2byte 142 - .2byte 313 - .2byte 229 - .2byte 245 - .2byte 66 + .2byte 39 + .2byte 37 + .2byte 87 + .2byte 85 + .2byte 9 + .2byte 321 + .2byte 259 + .2byte 253 .2byte 233 - .2byte 49 - .2byte 132 - .2byte 228 - .2byte 215 - .2byte 74 - .2byte 205 - .2byte 54 - .2byte 285 + .2byte 323 + .2byte 311 .2byte 250 - .2byte 170 - .2byte 314 - .2byte 16 - .2byte 200 - .2byte 15 - .2byte 249 - .2byte 227 + .2byte 261 + .2byte 110 + .2byte 281 diff --git a/data/text/easy_chat/groups/move_2/order.inc b/data/text/easy_chat/groups/move_2/order.inc index 918bd0116..114d799b1 100644 --- a/data/text/easy_chat/groups/move_2/order.inc +++ b/data/text/easy_chat/groups/move_2/order.inc @@ -1,197 +1,197 @@ .align 1 gEasyChatGroupOrder_Move2: @ 83DFA56 - .2byte 194 - .2byte 195 - .2byte 282 + .2byte 51 + .2byte 151 .2byte 332 .2byte 133 - .2byte 213 - .2byte 55 - .2byte 352 .2byte 292 - .2byte 278 + .2byte 274 + .2byte 213 + .2byte 140 .2byte 112 + .2byte 226 + .2byte 251 .2byte 187 - .2byte 178 - .2byte 286 - .2byte 343 - .2byte 186 - .2byte 80 - .2byte 148 - .2byte 192 + .2byte 299 .2byte 59 - .2byte 61 - .2byte 36 + .2byte 335 .2byte 34 - .2byte 65 - .2byte 46 - .2byte 297 - .2byte 164 - .2byte 84 - .2byte 86 + .2byte 125 + .2byte 198 + .2byte 155 + .2byte 340 + .2byte 61 + .2byte 339 + .2byte 331 + .2byte 347 + .2byte 293 + .2byte 4 + .2byte 93 + .2byte 160 + .2byte 176 + .2byte 178 + .2byte 343 + .2byte 306 + .2byte 174 + .2byte 111 + .2byte 194 + .2byte 197 + .2byte 291 + .2byte 146 .2byte 24 - .2byte 131 .2byte 337 .2byte 349 .2byte 82 - .2byte 167 - .2byte 41 - .2byte 73 + .2byte 225 + .2byte 138 + .2byte 65 + .2byte 223 .2byte 121 - .2byte 111 - .2byte 334 - .2byte 8 - .2byte 58 - .2byte 255 - .2byte 156 + .2byte 52 .2byte 284 .2byte 153 - .2byte 27 - .2byte 350 - .2byte 299 - .2byte 225 - .2byte 7 + .2byte 185 + .2byte 252 + .2byte 206 + .2byte 297 .2byte 126 + .2byte 7 .2byte 83 - .2byte 185 - .2byte 174 - .2byte 17 + .2byte 148 + .2byte 193 .2byte 218 .2byte 31 - .2byte 347 - .2byte 290 - .2byte 69 - .2byte 217 - .2byte 193 + .2byte 210 + .2byte 154 + .2byte 248 .2byte 137 - .2byte 77 - .2byte 342 - .2byte 40 - .2byte 139 - .2byte 305 - .2byte 52 - .2byte 12 - .2byte 287 .2byte 45 + .2byte 12 .2byte 257 + .2byte 270 + .2byte 136 + .2byte 237 .2byte 30 .2byte 32 - .2byte 254 + .2byte 336 .2byte 56 .2byte 63 .2byte 158 - .2byte 222 - .2byte 146 - .2byte 336 - .2byte 127 - .2byte 11 - .2byte 198 - .2byte 125 - .2byte 155 - .2byte 4 - .2byte 107 - .2byte 93 - .2byte 276 - .2byte 237 - .2byte 10 - .2byte 154 - .2byte 331 + .2byte 304 + .2byte 58 + .2byte 8 + .2byte 286 + .2byte 275 + .2byte 334 + .2byte 26 + .2byte 282 .2byte 348 - .2byte 330 - .2byte 189 - .2byte 341 - .2byte 300 + .2byte 73 + .2byte 43 .2byte 113 + .2byte 199 + .2byte 295 + .2byte 183 .2byte 277 - .2byte 188 + .2byte 345 + .2byte 222 .2byte 96 - .2byte 5 - .2byte 25 .2byte 72 + .2byte 25 + .2byte 5 + .2byte 224 .2byte 232 .2byte 118 .2byte 208 .2byte 102 - .2byte 252 + .2byte 107 + .2byte 243 + .2byte 296 .2byte 236 + .2byte 341 + .2byte 300 + .2byte 189 + .2byte 330 + .2byte 302 .2byte 101 + .2byte 6 + .2byte 64 + .2byte 195 + .2byte 80 .2byte 42 - .2byte 346 - .2byte 296 - .2byte 302 + .2byte 305 + .2byte 139 + .2byte 40 + .2byte 342 + .2byte 77 .2byte 1 - .2byte 150 - .2byte 339 - .2byte 251 - .2byte 22 + .2byte 217 + .2byte 182 + .2byte 98 .2byte 75 - .2byte 168 - .2byte 270 + .2byte 278 .2byte 115 + .2byte 287 + .2byte 156 + .2byte 279 + .2byte 46 + .2byte 350 .2byte 272 - .2byte 335 - .2byte 98 - .2byte 51 - .2byte 151 - .2byte 197 + .2byte 27 + .2byte 10 + .2byte 290 + .2byte 69 + .2byte 351 .2byte 130 - .2byte 304 - .2byte 295 + .2byte 303 + .2byte 21 .2byte 79 .2byte 214 .2byte 124 - .2byte 64 - .2byte 351 - .2byte 182 - .2byte 294 - .2byte 14 - .2byte 248 - .2byte 43 - .2byte 21 - .2byte 241 - .2byte 243 - .2byte 340 - .2byte 26 + .2byte 188 + .2byte 289 + .2byte 135 + .2byte 131 .2byte 191 - .2byte 226 + .2byte 255 + .2byte 150 .2byte 211 - .2byte 140 + .2byte 254 .2byte 23 + .2byte 165 + .2byte 164 + .2byte 241 + .2byte 276 .2byte 48 .2byte 57 + .2byte 256 + .2byte 186 + .2byte 14 .2byte 33 - .2byte 303 - .2byte 293 - .2byte 291 + .2byte 294 + .2byte 36 + .2byte 269 .2byte 298 .2byte 100 - .2byte 183 + .2byte 168 + .2byte 86 + .2byte 84 .2byte 92 - .2byte 138 - .2byte 271 - .2byte 161 - .2byte 206 - .2byte 136 - .2byte 289 - .2byte 160 - .2byte 176 - .2byte 279 - .2byte 269 - .2byte 275 - .2byte 256 - .2byte 165 - .2byte 224 .2byte 144 - .2byte 135 - .2byte 35 + .2byte 161 + .2byte 271 + .2byte 167 + .2byte 41 .2byte 239 + .2byte 11 + .2byte 22 + .2byte 55 + .2byte 352 + .2byte 346 + .2byte 127 .2byte 18 - .2byte 223 + .2byte 17 .2byte 273 - .2byte 6 - .2byte 345 - .2byte 306 - .2byte 199 - .2byte 210 - .2byte 274 + .2byte 35 + .2byte 192 diff --git a/data/text/easy_chat/groups/people/order.inc b/data/text/easy_chat/groups/people/order.inc index 2934f8339..6144d7ba3 100644 --- a/data/text/easy_chat/groups/people/order.inc +++ b/data/text/easy_chat/groups/people/order.inc @@ -1,78 +1,78 @@ .align 1 gEasyChatGroupOrder_People: @ 83DF376 - .2byte 14 - .2byte 50 - .2byte 49 - .2byte 4 - .2byte 3 - .2byte 5 - .2byte 22 - .2byte 2 - .2byte 6 - .2byte 7 - .2byte 18 - .2byte 26 - .2byte 30 .2byte 13 - .2byte 58 - .2byte 72 + .2byte 52 + .2byte 31 + .2byte 17 + .2byte 22 + .2byte 62 + .2byte 12 + .2byte 14 + .2byte 34 + .2byte 28 + .2byte 54 .2byte 23 - .2byte 0 - .2byte 36 + .2byte 11 .2byte 51 - .2byte 71 - .2byte 57 - .2byte 63 - .2byte 46 - .2byte 32 - .2byte 16 + .2byte 21 .2byte 9 - .2byte 35 + .2byte 16 + .2byte 26 + .2byte 30 + .2byte 24 + .2byte 72 + .2byte 25 + .2byte 29 .2byte 1 .2byte 41 - .2byte 42 .2byte 38 - .2byte 25 - .2byte 55 - .2byte 24 - .2byte 44 - .2byte 12 + .2byte 42 + .2byte 49 .2byte 33 - .2byte 34 - .2byte 21 + .2byte 50 .2byte 19 - .2byte 40 - .2byte 45 .2byte 20 - .2byte 37 .2byte 8 - .2byte 10 - .2byte 27 + .2byte 35 + .2byte 36 + .2byte 40 + .2byte 37 + .2byte 0 + .2byte 64 + .2byte 18 .2byte 53 + .2byte 27 .2byte 66 - .2byte 15 - .2byte 29 .2byte 69 - .2byte 60 - .2byte 74 .2byte 73 - .2byte 68 - .2byte 59 .2byte 70 + .2byte 32 + .2byte 15 + .2byte 74 + .2byte 44 + .2byte 4 + .2byte 58 + .2byte 55 .2byte 56 - .2byte 31 - .2byte 17 - .2byte 28 - .2byte 54 - .2byte 64 - .2byte 11 - .2byte 52 - .2byte 62 + .2byte 59 + .2byte 60 + .2byte 71 + .2byte 39 + .2byte 57 + .2byte 63 + .2byte 46 + .2byte 10 + .2byte 61 + .2byte 65 + .2byte 67 .2byte 43 .2byte 48 + .2byte 45 .2byte 47 - .2byte 61 - .2byte 67 - .2byte 65 - .2byte 39 + .2byte 68 + .2byte 2 + .2byte 6 + .2byte 7 + .2byte 5 + .2byte 3 diff --git a/data/text/easy_chat/groups/people/words.inc b/data/text/easy_chat/groups/people/words.inc index c7f499be6..89f370251 100644 --- a/data/text/easy_chat/groups/people/words.inc +++ b/data/text/easy_chat/groups/people/words.inc @@ -1,77 +1,77 @@ gEasyChatGroupWords_People: @ 83DC85A - .string "FEIND$" - .string "ICH$" - .string "DU$" - .string "DEINE$" - .string "DEIN$" - .string "DEINER$" - .string "DU BIST$" - .string "DU HAST$" - .string "MUTTER$" - .string "GROSSVATER$" - .string "ONKEL$" - .string "VATER$" - .string "JUNGE$" - .string "ERWACHSENER$" - .string "BRUDER$" - .string "SCHWESTER$" - .string "GROSSMUTTER$" - .string "TANTE$" - .string "ELTERN$" + .string "OPPONENT$" + .string "I$" + .string "YOU$" + .string "YOURS$" + .string "SON$" + .string "YOUR$" + .string "YOU’RE$" + .string "YOU’VE$" + .string "MOTHER$" + .string "GRANDFATHER$" + .string "UNCLE$" + .string "FATHER$" + .string "BOY$" + .string "ADULT$" + .string "BROTHER$" + .string "SISTER$" + .string "GRANDMOTHER$" + .string "AUNT$" + .string "PARENT$" .string "MAN$" - .string "MICH$" - .string "MÄDCHEN$" - .string "DICH$" - .string "FAMILIE$" - .string "IHR$" - .string "IHM$" - .string "ER$" - .string "ORT$" - .string "TOCHTER$" - .string "SEIN$" - .string "ER IST$" - .string "SIND NICHT$" - .string "GESCHWISTER$" - .string "KINDCHEN$" - .string "KINDER$" - .string "HERR$" - .string "FRAU$" - .string "MIR$" - .string "ICH WAR$" - .string "ZU MIR$" - .string "MEIN$" - .string "ICH BIN$" - .string "ICH HABE$" - .string "WER$" - .string "JEMAND$" - .string "MEINE$" - .string "FÜR WEN$" - .string "WESSEN$" - .string "WER IST$" - .string "DAS IST$" - .string "DAME$" - .string "FREUND$" - .string "VERBÜNDETER$" + .string "ME$" + .string "GIRL$" + .string "BABE$" + .string "FAMILY$" + .string "HER$" + .string "HIM$" + .string "HE$" + .string "PLACE$" + .string "DAUGHTER$" + .string "HIS$" + .string "HE’S$" + .string "AREN’T$" + .string "SIBLINGS$" + .string "KID$" + .string "CHILDREN$" + .string "MR.$" + .string "MRS.$" + .string "MYSELF$" + .string "I WAS$" + .string "TO ME$" + .string "MY$" + .string "I AM$" + .string "I’VE$" + .string "WHO$" + .string "SOMEONE$" + .string "WHO WAS$" + .string "TO WHOM$" + .string "WHOSE$" + .string "WHO IS$" + .string "IT’S$" + .string "LADY$" + .string "FRIEND$" + .string "ALLY$" .string "PERSON$" - .string "TYPE$" - .string "IHNEN$" - .string "SIE WAREN$" - .string "FÜR SIE$" - .string "EUCH$" - .string "SIE SIND$" - .string "SIE HABEN$" - .string "WIR$" - .string "WAREN$" - .string "FÜR UNS$" - .string "UNSER$" - .string "WIR SIND$" - .string "RIVALE$" - .string "WIR HABEN$" - .string "SIE KONNTEN$" - .string "SIE$" - .string "SIE WAR$" - .string "FÜR ALLE$" - .string "EURE$" - .string "SIE IST$" - .string "SIE HATTE$" + .string "DUDE$" + .string "THEY$" + .string "THEY WERE$" + .string "TO THEM$" + .string "THEIR$" + .string "THEY’RE$" + .string "THEY’VE$" + .string "WE$" + .string "BEEN$" + .string "TO US$" + .string "OUR$" + .string "WE’RE$" + .string "RIVAL$" + .string "WE’VE$" + .string "WOMAN$" + .string "SHE$" + .string "SHE WAS$" + .string "TO HER$" + .string "HER’S$" + .string "SHE IS$" + .string "SOME$" .string "$" diff --git a/data/text/easy_chat/groups/pokemon/order.inc b/data/text/easy_chat/groups/pokemon/order.inc index 3afe49659..b39d5bd28 100644 --- a/data/text/easy_chat/groups/pokemon/order.inc +++ b/data/text/easy_chat/groups/pokemon/order.inc @@ -1,205 +1,205 @@ .align 1 gEasyChatGroupOrder_Pokemon: @ 83DF010 - .2byte 374 .2byte 63 .2byte 376 + .2byte 384 + .2byte 65 .2byte 359 .2byte 390 .2byte 391 + .2byte 382 .2byte 184 .2byte 350 + .2byte 395 + .2byte 318 .2byte 378 - .2byte 328 - .2byte 299 + .2byte 323 + .2byte 292 + .2byte 398 .2byte 182 - .2byte 397 - .2byte 364 - .2byte 339 + .2byte 282 + .2byte 307 + .2byte 344 + .2byte 345 .2byte 340 + .2byte 330 + .2byte 293 + .2byte 385 + .2byte 411 + .2byte 170 + .2byte 373 + .2byte 319 + .2byte 281 + .2byte 326 .2byte 222 + .2byte 389 + .2byte 327 + .2byte 169 + .2byte 316 .2byte 410 .2byte 85 .2byte 84 .2byte 232 - .2byte 396 - .2byte 44 - .2byte 315 - .2byte 316 - .2byte 54 - .2byte 55 - .2byte 286 - .2byte 347 - .2byte 280 - .2byte 174 - .2byte 355 - .2byte 370 - .2byte 385 + .2byte 362 + .2byte 361 + .2byte 294 .2byte 337 - .2byte 130 - .2byte 277 - .2byte 311 - .2byte 75 - .2byte 76 - .2byte 289 - .2byte 279 - .2byte 45 + .2byte 101 + .2byte 372 + .2byte 328 + .2byte 334 + .2byte 394 + .2byte 74 .2byte 203 + .2byte 347 + .2byte 44 .2byte 42 .2byte 118 - .2byte 119 - .2byte 352 + .2byte 55 + .2byte 76 + .2byte 375 + .2byte 75 + .2byte 88 .2byte 405 - .2byte 394 + .2byte 278 + .2byte 352 + .2byte 367 + .2byte 130 .2byte 336 - .2byte 283 - .2byte 169 + .2byte 214 + .2byte 116 + .2byte 374 + .2byte 174 .2byte 387 - .2byte 360 + .2byte 39 .2byte 409 - .2byte 281 .2byte 64 - .2byte 330 - .2byte 307 - .2byte 297 - .2byte 129 .2byte 317 - .2byte 395 + .2byte 230 .2byte 393 - .2byte 74 - .2byte 332 - .2byte 306 - .2byte 40 - .2byte 371 - .2byte 372 - .2byte 326 - .2byte 327 + .2byte 109 .2byte 404 - .2byte 170 + .2byte 383 .2byte 171 .2byte 407 .2byte 408 - .2byte 101 - .2byte 319 - .2byte 366 - .2byte 334 - .2byte 325 .2byte 388 - .2byte 282 + .2byte 289 .2byte 296 .2byte 295 + .2byte 371 + .2byte 297 .2byte 348 - .2byte 66 + .2byte 325 .2byte 68 + .2byte 67 + .2byte 66 .2byte 219 - .2byte 287 + .2byte 129 .2byte 81 .2byte 82 .2byte 335 + .2byte 338 .2byte 183 - .2byte 67 + .2byte 284 .2byte 312 + .2byte 355 .2byte 357 .2byte 356 .2byte 400 .2byte 399 + .2byte 287 .2byte 329 .2byte 354 - .2byte 284 - .2byte 365 - .2byte 43 - .2byte 320 + .2byte 283 + .2byte 89 .2byte 177 .2byte 301 + .2byte 38 .2byte 302 - .2byte 303 - .2byte 345 - .2byte 411 - .2byte 308 - .2byte 293 - .2byte 227 - .2byte 292 + .2byte 320 + .2byte 339 + .2byte 299 + .2byte 43 .2byte 310 - .2byte 373 .2byte 231 .2byte 172 .2byte 25 .2byte 127 .2byte 353 - .2byte 294 - .2byte 39 - .2byte 318 - .2byte 321 + .2byte 286 + .2byte 54 .2byte 26 + .2byte 392 .2byte 406 .2byte 402 .2byte 401 .2byte 403 .2byte 381 - .2byte 278 - .2byte 111 .2byte 112 + .2byte 111 .2byte 363 - .2byte 375 - .2byte 298 - .2byte 28 + .2byte 322 + .2byte 397 .2byte 27 + .2byte 28 + .2byte 279 + .2byte 117 + .2byte 119 + .2byte 342 + .2byte 298 + .2byte 379 + .2byte 331 + .2byte 303 + .2byte 396 + .2byte 300 + .2byte 306 + .2byte 377 .2byte 291 - .2byte 368 - .2byte 367 - .2byte 323 + .2byte 227 + .2byte 315 + .2byte 366 + .2byte 364 .2byte 218 .2byte 346 - .2byte 304 - .2byte 305 - .2byte 230 - .2byte 342 - .2byte 117 - .2byte 341 - .2byte 116 - .2byte 380 - .2byte 377 - .2byte 65 - .2byte 214 - .2byte 88 - .2byte 89 - .2byte 110 - .2byte 109 .2byte 349 + .2byte 341 + .2byte 308 .2byte 351 .2byte 121 .2byte 120 - .2byte 384 - .2byte 383 - .2byte 382 + .2byte 311 + .2byte 358 + .2byte 368 .2byte 285 - .2byte 398 - .2byte 300 + .2byte 305 + .2byte 304 .2byte 72 .2byte 73 - .2byte 331 - .2byte 392 + .2byte 280 + .2byte 321 + .2byte 332 + .2byte 277 .2byte 369 - .2byte 344 .2byte 333 - .2byte 379 + .2byte 365 + .2byte 45 .2byte 386 - .2byte 338 .2byte 100 - .2byte 38 .2byte 37 - .2byte 358 .2byte 313 .2byte 314 .2byte 343 - .2byte 290 + .2byte 110 .2byte 324 - .2byte 389 + .2byte 370 + .2byte 40 .2byte 309 .2byte 202 + .2byte 290 + .2byte 360 .2byte 178 + .2byte 380 .2byte 288 - .2byte 322 .2byte 41 - .2byte 362 - .2byte 361 diff --git a/data/text/easy_chat/groups/pokemon_2/order.inc b/data/text/easy_chat/groups/pokemon_2/order.inc index ce515d7b1..219e7dfb0 100644 --- a/data/text/easy_chat/groups/pokemon_2/order.inc +++ b/data/text/easy_chat/groups/pokemon_2/order.inc @@ -3,33 +3,42 @@ gEasyChatGroupOrder_Pokemon2: @ 83DFC1C .2byte 63 .2byte 142 - .2byte 93 - .2byte 138 - .2byte 139 + .2byte 190 + .2byte 65 .2byte 181 - .2byte 134 .2byte 24 - .2byte 168 .2byte 59 + .2byte 168 .2byte 144 - .2byte 91 .2byte 184 - .2byte 211 + .2byte 153 .2byte 15 - .2byte 3 - .2byte 2 - .2byte 1 - .2byte 135 .2byte 182 - .2byte 48 - .2byte 225 + .2byte 69 + .2byte 9 + .2byte 242 + .2byte 1 + .2byte 12 + .2byte 10 .2byte 251 .2byte 113 + .2byte 6 + .2byte 4 + .2byte 5 + .2byte 152 + .2byte 170 + .2byte 36 + .2byte 35 + .2byte 173 + .2byte 91 .2byte 222 - .2byte 234 - .2byte 248 + .2byte 169 + .2byte 159 + .2byte 104 + .2byte 155 + .2byte 225 + .2byte 87 .2byte 50 - .2byte 51 .2byte 132 .2byte 85 .2byte 84 @@ -37,217 +46,208 @@ gEasyChatGroupOrder_Pokemon2: @ 83DFC1C .2byte 148 .2byte 149 .2byte 147 - .2byte 44 + .2byte 96 + .2byte 51 .2byte 206 - .2byte 239 + .2byte 133 + .2byte 23 .2byte 125 - .2byte 152 + .2byte 101 + .2byte 239 .2byte 244 - .2byte 54 - .2byte 55 - .2byte 133 - .2byte 235 - .2byte 194 - .2byte 155 + .2byte 196 + .2byte 102 + .2byte 103 + .2byte 83 + .2byte 22 + .2byte 160 + .2byte 180 .2byte 136 - .2byte 79 - .2byte 174 .2byte 205 - .2byte 58 - .2byte 78 - .2byte 130 + .2byte 162 + .2byte 92 .2byte 94 - .2byte 75 - .2byte 76 - .2byte 45 + .2byte 74 .2byte 203 - .2byte 4 - .2byte 6 - .2byte 5 + .2byte 207 + .2byte 44 .2byte 42 .2byte 118 - .2byte 119 + .2byte 55 + .2byte 76 .2byte 210 - .2byte 190 - .2byte 21 - .2byte 242 + .2byte 75 + .2byte 88 + .2byte 58 + .2byte 130 + .2byte 93 + .2byte 214 + .2byte 107 + .2byte 106 + .2byte 237 .2byte 250 .2byte 163 .2byte 187 - .2byte 13 - .2byte 188 + .2byte 116 .2byte 229 .2byte 228 .2byte 97 - .2byte 22 - .2byte 201 - .2byte 156 - .2byte 169 - .2byte 160 - .2byte 87 - .2byte 86 + .2byte 174 + .2byte 2 + .2byte 39 + .2byte 135 + .2byte 189 + .2byte 124 .2byte 140 .2byte 141 .2byte 64 + .2byte 14 .2byte 115 - .2byte 237 - .2byte 158 - .2byte 129 - .2byte 221 - .2byte 106 + .2byte 230 .2byte 99 - .2byte 74 - .2byte 69 - .2byte 105 - .2byte 40 - .2byte 103 - .2byte 14 + .2byte 109 .2byte 98 - .2byte 198 - .2byte 238 - .2byte 80 - .2byte 170 .2byte 171 .2byte 131 .2byte 246 - .2byte 199 - .2byte 146 .2byte 166 .2byte 165 - .2byte 101 - .2byte 153 + .2byte 108 .2byte 249 - .2byte 66 .2byte 68 + .2byte 67 + .2byte 66 .2byte 240 .2byte 219 + .2byte 129 .2byte 126 .2byte 81 .2byte 82 + .2byte 56 .2byte 226 + .2byte 179 .2byte 183 - .2byte 67 - .2byte 52 + .2byte 105 .2byte 154 - .2byte 56 + .2byte 52 + .2byte 11 .2byte 151 .2byte 150 .2byte 241 - .2byte 185 - .2byte 195 - .2byte 90 - .2byte 43 - .2byte 197 + .2byte 200 + .2byte 146 + .2byte 122 + .2byte 89 + .2byte 198 .2byte 177 - .2byte 92 .2byte 34 .2byte 31 .2byte 29 .2byte 32 .2byte 30 .2byte 33 - .2byte 107 + .2byte 38 .2byte 164 .2byte 224 - .2byte 49 + .2byte 43 + .2byte 138 + .2byte 139 .2byte 95 - .2byte 102 - .2byte 122 - .2byte 227 - .2byte 189 .2byte 46 .2byte 47 + .2byte 53 .2byte 231 .2byte 172 - .2byte 35 - .2byte 173 + .2byte 18 + .2byte 17 + .2byte 16 .2byte 25 + .2byte 221 + .2byte 204 .2byte 127 - .2byte 36 + .2byte 186 + .2byte 60 + .2byte 61 + .2byte 62 .2byte 77 - .2byte 83 .2byte 137 .2byte 233 - .2byte 213 - .2byte 196 - .2byte 39 + .2byte 57 + .2byte 54 .2byte 247 - .2byte 62 - .2byte 60 - .2byte 61 - .2byte 186 - .2byte 220 - .2byte 236 + .2byte 195 + .2byte 156 + .2byte 211 .2byte 26 .2byte 243 - .2byte 57 - .2byte 19 + .2byte 78 .2byte 20 - .2byte 10 - .2byte 143 + .2byte 19 .2byte 223 - .2byte 23 - .2byte 111 .2byte 112 - .2byte 124 - .2byte 11 - .2byte 28 + .2byte 111 .2byte 27 - .2byte 71 + .2byte 28 .2byte 212 - .2byte 7 - .2byte 8 - .2byte 108 - .2byte 218 - .2byte 230 - .2byte 117 - .2byte 116 .2byte 123 - .2byte 65 - .2byte 214 - .2byte 207 - .2byte 88 - .2byte 89 - .2byte 12 - .2byte 110 - .2byte 109 + .2byte 117 + .2byte 119 + .2byte 86 + .2byte 161 + .2byte 90 + .2byte 213 + .2byte 227 + .2byte 188 + .2byte 80 + .2byte 199 + .2byte 79 + .2byte 218 + .2byte 235 + .2byte 238 .2byte 215 - .2byte 53 + .2byte 143 .2byte 209 - .2byte 192 - .2byte 191 - .2byte 208 + .2byte 21 + .2byte 167 + .2byte 7 + .2byte 234 .2byte 121 .2byte 120 + .2byte 208 + .2byte 185 .2byte 245 + .2byte 192 + .2byte 191 + .2byte 220 .2byte 114 - .2byte 204 - .2byte 17 - .2byte 18 - .2byte 16 .2byte 128 .2byte 216 .2byte 72 .2byte 73 .2byte 175 .2byte 176 + .2byte 158 .2byte 157 - .2byte 104 - .2byte 96 - .2byte 200 - .2byte 9 - .2byte 159 - .2byte 70 + .2byte 248 + .2byte 236 + .2byte 197 + .2byte 201 .2byte 217 - .2byte 179 + .2byte 134 + .2byte 49 + .2byte 48 + .2byte 3 + .2byte 71 + .2byte 45 .2byte 100 - .2byte 38 .2byte 37 - .2byte 180 - .2byte 167 - .2byte 162 - .2byte 161 + .2byte 8 + .2byte 13 + .2byte 70 + .2byte 110 + .2byte 40 .2byte 202 + .2byte 194 .2byte 178 .2byte 193 .2byte 145 diff --git a/data/text/easy_chat/groups/speech/order.inc b/data/text/easy_chat/groups/speech/order.inc index 6b8d64fea..c2cd47835 100644 --- a/data/text/easy_chat/groups/speech/order.inc +++ b/data/text/easy_chat/groups/speech/order.inc @@ -1,63 +1,63 @@ .align 1 gEasyChatGroupOrder_Speech: @ 83DF48A - .2byte 10 - .2byte 49 - .2byte 41 - .2byte 37 - .2byte 48 - .2byte 6 - .2byte 30 - .2byte 14 - .2byte 53 - .2byte 13 - .2byte 20 - .2byte 51 - .2byte 44 .2byte 19 - .2byte 5 - .2byte 56 - .2byte 46 + .2byte 18 + .2byte 27 + .2byte 20 + .2byte 41 + .2byte 40 + .2byte 21 + .2byte 57 .2byte 23 - .2byte 38 - .2byte 24 + .2byte 49 + .2byte 43 + .2byte 52 + .2byte 10 .2byte 12 + .2byte 17 + .2byte 31 .2byte 59 .2byte 9 + .2byte 56 .2byte 34 - .2byte 52 - .2byte 4 - .2byte 2 + .2byte 8 + .2byte 16 .2byte 15 - .2byte 57 - .2byte 39 .2byte 11 - .2byte 50 + .2byte 25 + .2byte 58 + .2byte 36 + .2byte 30 + .2byte 4 .2byte 3 + .2byte 0 + .2byte 2 + .2byte 14 + .2byte 53 + .2byte 50 .2byte 54 .2byte 32 + .2byte 33 + .2byte 6 .2byte 1 - .2byte 47 - .2byte 29 .2byte 22 - .2byte 40 .2byte 42 - .2byte 17 - .2byte 36 - .2byte 26 - .2byte 43 - .2byte 58 - .2byte 16 - .2byte 31 - .2byte 21 - .2byte 35 - .2byte 33 - .2byte 18 - .2byte 8 - .2byte 45 - .2byte 27 - .2byte 25 - .2byte 28 + .2byte 24 .2byte 7 + .2byte 51 + .2byte 37 + .2byte 44 + .2byte 5 + .2byte 46 + .2byte 39 + .2byte 38 + .2byte 29 + .2byte 13 .2byte 55 - .2byte 0 + .2byte 47 + .2byte 45 + .2byte 35 + .2byte 48 + .2byte 26 + .2byte 28 diff --git a/data/text/easy_chat/groups/speech/words.inc b/data/text/easy_chat/groups/speech/words.inc index 28db99df1..becfd03d0 100644 --- a/data/text/easy_chat/groups/speech/words.inc +++ b/data/text/easy_chat/groups/speech/words.inc @@ -1,62 +1,62 @@ gEasyChatGroupWords_Speech: @ 83DCB82 - .string "ZUHÖREN$" - .string "NICHT SEHR$" - .string "GEMEIN$" - .string "LÜGEN$" - .string "GELOGEN$" - .string "EMPFOHLEN$" - .string "BLÖDKOPF$" - .string "WIRKLICH$" - .string "VON$" - .string "FÜHLEN$" - .string "ABER$" - .string "JEDOCH$" - .string "FALL$" - .string "DER$" - .string "DANEBEN$" - .string "GENAU WIE$" - .string "TREFFER$" - .string "REICHT AUS$" - .string "VIEL$" - .string "EIN BISSCHEN$" - .string "DIE$" - .string "UND$" - .string "NUR$" - .string "ETWA$" - .string "EVENTUELL$" - .string "WENN$" - .string "SEHR$" - .string "WENIG$" + .string "LISTEN$" + .string "NOT VERY$" + .string "MEAN$" + .string "LIE$" + .string "LAY$" + .string "RECOMMEND$" + .string "NITWIT$" + .string "QUITE$" + .string "FROM$" + .string "FEELING$" + .string "BUT$" + .string "HOWEVER$" + .string "CASE$" + .string "THE$" + .string "MISS$" + .string "HOW$" + .string "HIT$" + .string "ENOUGH$" + .string "A LOT$" + .string "A LITTLE$" + .string "ABSOLUTELY$" + .string "AND$" + .string "ONLY$" + .string "AROUND$" + .string "PROBABLY$" + .string "IF$" + .string "VERY$" + .string "A TINY BIT$" .string "WILD$" - .string "NOCH MAL$" - .string "BLOSS$" - .string "TROTZDEM$" - .string "MUSS$" - .string "VERSTÄNDLICH$" - .string "FÜR NUN$" - .string "VERSTANDEN$" - .string "SCHERZEN$" - .string "BEREIT$" - .string "ETWAS$" - .string "IRGENDWIE$" - .string "OBWOHL$" + .string "THAT’S$" + .string "JUST$" + .string "EVEN SO,$" + .string "MUST BE$" + .string "NATURALLY$" + .string "FOR NOW,$" + .string "UNDERSTOOD$" + .string "JOKING$" + .string "READY$" + .string "SOMETHING$" + .string "SOMEHOW$" + .string "ALTHOUGH$" .string "ALSO$" - .string "PERFEKT$" - .string "SO VIEL WIE$" - .string "EHRLICH$" - .string "WAHRHAFTIG$" - .string "ERNST$" - .string "NOCH$" - .string "BIS$" - .string "ALS OB$" - .string "LAUNE$" - .string "EHER$" - .string "FURCHTBAR$" - .string "DENKE$" - .string "MEHR$" - .string "ZU SPÄT$" - .string "ENDLICH$" - .string "IRGENDEIN$" - .string "STATT$" - .string "FANTASTISCH$" + .string "PERFECT$" + .string "AS MUCH AS$" + .string "REALLY$" + .string "TRULY$" + .string "SERIOUSLY$" + .string "TOTALLY$" + .string "UNTIL$" + .string "AS IF$" + .string "MOOD$" + .string "RATHER$" + .string "AWFULLY$" + .string "MODE$" + .string "MORE$" + .string "TOO LATE$" + .string "FINALLY$" + .string "ANY$" + .string "INSTEAD$" + .string "FANTASTIC$" .string "$" diff --git a/data/text/easy_chat/groups/status/order.inc b/data/text/easy_chat/groups/status/order.inc index 01efb3917..1f1c32fd5 100644 --- a/data/text/easy_chat/groups/status/order.inc +++ b/data/text/easy_chat/groups/status/order.inc @@ -1,112 +1,112 @@ .align 1 gEasyChatGroupOrder_Status: @ 83DF1CA - .2byte 47 - .2byte 33 + .2byte 13 .2byte 9 - .2byte 66 - .2byte 25 - .2byte 24 - .2byte 96 .2byte 5 - .2byte 6 - .2byte 77 - .2byte 38 - .2byte 99 + .2byte 23 + .2byte 11 + .2byte 12 + .2byte 101 + .2byte 97 .2byte 106 + .2byte 29 + .2byte 68 + .2byte 8 + .2byte 86 + .2byte 78 .2byte 21 .2byte 22 - .2byte 64 + .2byte 24 + .2byte 99 + .2byte 25 + .2byte 37 + .2byte 0 .2byte 62 - .2byte 1 + .2byte 4 .2byte 76 - .2byte 59 - .2byte 32 + .2byte 72 + .2byte 88 .2byte 57 - .2byte 71 - .2byte 84 - .2byte 53 - .2byte 78 - .2byte 63 - .2byte 8 - .2byte 86 - .2byte 37 + .2byte 16 .2byte 90 - .2byte 104 .2byte 91 - .2byte 39 + .2byte 104 .2byte 75 - .2byte 72 + .2byte 58 .2byte 31 - .2byte 10 - .2byte 60 - .2byte 61 - .2byte 101 - .2byte 56 - .2byte 98 + .2byte 28 + .2byte 38 + .2byte 33 + .2byte 54 + .2byte 73 + .2byte 15 + .2byte 32 + .2byte 71 .2byte 100 - .2byte 36 + .2byte 48 .2byte 81 - .2byte 97 - .2byte 16 - .2byte 23 - .2byte 13 + .2byte 6 + .2byte 47 + .2byte 82 + .2byte 77 + .2byte 39 .2byte 85 - .2byte 18 - .2byte 19 - .2byte 48 - .2byte 54 - .2byte 87 .2byte 94 .2byte 40 - .2byte 107 + .2byte 79 .2byte 92 - .2byte 102 - .2byte 105 - .2byte 103 - .2byte 29 - .2byte 4 + .2byte 36 .2byte 69 + .2byte 64 .2byte 43 - .2byte 79 - .2byte 35 - .2byte 28 - .2byte 83 + .2byte 93 + .2byte 103 + .2byte 102 .2byte 89 - .2byte 58 + .2byte 83 + .2byte 60 + .2byte 61 + .2byte 84 .2byte 14 - .2byte 108 - .2byte 41 - .2byte 34 + .2byte 107 .2byte 3 - .2byte 26 - .2byte 46 + .2byte 10 + .2byte 7 + .2byte 34 + .2byte 66 .2byte 45 - .2byte 27 + .2byte 46 + .2byte 59 + .2byte 17 + .2byte 53 + .2byte 35 + .2byte 108 .2byte 74 - .2byte 15 - .2byte 65 - .2byte 11 - .2byte 12 - .2byte 82 - .2byte 2 - .2byte 88 + .2byte 18 + .2byte 19 + .2byte 87 + .2byte 20 + .2byte 49 .2byte 70 + .2byte 1 + .2byte 67 + .2byte 26 + .2byte 27 + .2byte 98 + .2byte 44 + .2byte 42 + .2byte 2 + .2byte 30 .2byte 51 .2byte 52 - .2byte 49 - .2byte 7 - .2byte 30 - .2byte 42 - .2byte 93 - .2byte 20 + .2byte 63 + .2byte 65 .2byte 50 - .2byte 73 - .2byte 0 + .2byte 105 .2byte 55 .2byte 95 - .2byte 44 - .2byte 17 - .2byte 67 - .2byte 68 + .2byte 56 + .2byte 96 + .2byte 41 .2byte 80 diff --git a/data/text/easy_chat/groups/status/words.inc b/data/text/easy_chat/groups/status/words.inc index de6758036..28109b361 100644 --- a/data/text/easy_chat/groups/status/words.inc +++ b/data/text/easy_chat/groups/status/words.inc @@ -1,111 +1,111 @@ gEasyChatGroupWords_Status: @ 83DC152 - .string "UNLICHT$" - .string "DUFTNOTE$" - .string "SPECKSCHICHT$" - .string "REGENGENUSS$" - .string "NIESEL$" - .string "AUSWEGLOS$" - .string "BEDROHER$" - .string "STEINHAUPT$" - .string "FARBE$" - .string "ALT. FARBE$" - .string "GESTEIN$" - .string "SCHÖN$" - .string "SCHÖNHEIT$" - .string "KLIMASCHUTZ$" - .string "PSYCHO$" - .string "SCHERENMACHT$" - .string "KAMPF$" - .string "WEGSPERRE$" - .string "KLUG$" - .string "KLUGHEIT$" - .string "TEMPOSCHUB$" + .string "DARK$" + .string "STENCH$" + .string "THICK FAT$" + .string "RAIN DISH$" + .string "DRIZZLE$" + .string "ARENA TRAP$" + .string "INTIMIDATE$" + .string "ROCK HEAD$" + .string "COLOR$" + .string "ALT. COLOR$" + .string "ROCK$" + .string "BEAUTIFUL$" + .string "BEAUTY$" + .string "AIR LOCK$" + .string "PSYCHIC$" + .string "HYPER CUTTER$" + .string "FIGHTING$" + .string "SHADOW TAG$" + .string "SMART$" + .string "SMARTNESS$" + .string "SPEED BOOST$" .string "COOL$" .string "COOLNESS$" - .string "KAMPFPANZER$" - .string "ANMUTIG$" - .string "ANMUT$" - .string "ROBUSTHEIT$" - .string "SAUGNAPF$" - .string "PFLANZE$" - .string "NEUTRALTORSO$" - .string "STURZBACH$" - .string "GEIST$" - .string "EIS$" - .string "ADRENALIN$" - .string "RAUHAUT$" - .string "PANZERHAUT$" - .string "INNERE KRAFT$" - .string "FEUCHTIGKEIT$" - .string "BODEN$" - .string "FLEXIBILITÄT$" - .string "MAGNETFALLE$" - .string "PULVERRAUCH$" - .string "SYNCHRO$" - .string "NOTDÜNGER$" - .string "WASSERTEMPO$" - .string "SANDSTURM$" - .string "SANDSCHLEIER$" - .string "ADLERAUGE$" - .string "KONZENTRATOR$" - .string "STATIK$" - .string "TYP$" - .string "STARK$" - .string "STÄRKE$" - .string "EXPIDERMIS$" - .string "KRAFTKOLOSS$" - .string "VOLTABSORBER$" - .string "H2O-ABSORBER$" - .string "ELEKTRO$" - .string "PROGNOSE$" - .string "EDELMUT$" - .string "GIFT$" - .string "GIFTDORN$" - .string "DRACHEN$" - .string "FÄHRTE$" - .string "DÖSIGKEIT$" - .string "SCHNARCHNASE$" - .string "ANGSTHASE$" - .string "WERTEHALTER$" - .string "WOLKE SIEBEN$" + .string "BATTLE ARMOR$" + .string "CUTE$" + .string "CUTENESS$" + .string "STURDY$" + .string "SUCTION CUPS$" + .string "GRASS$" + .string "CLEAR BODY$" + .string "TORRENT$" + .string "GHOST$" + .string "ICE$" + .string "GUTS$" + .string "ROUGH SKIN$" + .string "SHELL ARMOR$" + .string "NATURAL CURE$" + .string "DAMP$" + .string "GROUND$" + .string "LIMBER$" + .string "MAGNET PULL$" + .string "WHITE SMOKE$" + .string "SYNCHRONIZE$" + .string "OVERGROW$" + .string "SWIFT SWIM$" + .string "SAND STREAM$" + .string "SAND VEIL$" + .string "KEEN EYE$" + .string "INNERFOCUS$" + .string "STATIC$" + .string "TYPE$" + .string "TOUGH$" + .string "TOUGHNESS$" + .string "SHED SKIN$" + .string "HUGE POWER$" + .string "VOLT ABSORB$" + .string "WATER ABSORB$" + .string "ELECTRIC$" + .string "FORECAST$" + .string "SERENE GRACE$" + .string "POISON$" + .string "POISON POINT$" + .string "DRAGON$" + .string "TRACE$" + .string "OBLIVIOUS$" + .string "TRUANT$" + .string "RUN AWAY$" + .string "STICKY HOLD$" + .string "CLOUD NINE$" .string "NORMAL$" - .string "STAHL$" - .string "ERLEUCHTUNG$" - .string "FRÜHWECKER$" - .string "ÜBEREIFER$" - .string "SCHEINEN$" - .string "FLIEGEN$" - .string "DÜRRE$" - .string "BLITZFÄNGER$" - .string "FACETTENAUGE$" - .string "NOTSCHUTZ$" - .string "WUNDERWACHE$" + .string "STEEL$" + .string "ILLUMINATE$" + .string "EARLY BIRD$" + .string "HUSTLE$" + .string "SHINE$" + .string "FLYING$" + .string "DROUGHT$" + .string "LIGHTNINGROD$" + .string "COMPOUNDEYES$" + .string "MARVEL SCALE$" + .string "WONDER GUARD$" .string "INSOMNIA$" - .string "SCHWEBE$" + .string "LEVITATE$" .string "PLUS$" - .string "ERZWINGER$" - .string "KLOAKENSOSSE$" - .string "FARBWECHSEL$" - .string "LÄRMSCHUTZ$" - .string "SPORENWIRT$" - .string "POKéRUS$" - .string "FEUER$" - .string "FLAMMKÖRPER$" + .string "PRESSURE$" + .string "LIQUID OOZE$" + .string "COLOR CHANGE$" + .string "SOUNDPROOF$" + .string "EFFECT SPORE$" + .string "{PK}RS$" + .string "FIRE$" + .string "FLAME BODY$" .string "MINUS$" - .string "TEMPOMACHER$" - .string "MAGMAPANZER$" - .string "WASSER$" - .string "AQUAHÜLLE$" - .string "KÄFER$" - .string "HEXAPLAGA$" - .string "CHARMEBOLZEN$" - .string "IMMUNITÄT$" - .string "GROSSBRAND$" - .string "MITNAHME$" - .string "MUSTER$" - .string "FEUERFÄNGER$" - .string "MUNTERKEIT$" + .string "OWN TEMPO$" + .string "MAGMA ARMOR$" + .string "WATER$" + .string "WATER VEIL$" + .string "BUG$" + .string "SWARM$" + .string "CUTE CHARM$" + .string "IMMUNITY$" + .string "BLAZE$" + .string "PICKUP$" + .string "PATTERN$" + .string "FLASH FIRE$" + .string "VITAL SPIRIT$" .string "CHLOROPHYLL$" - .string "MENTALKRAFT$" - .string "PUDERABWEHR$" + .string "PURE POWER$" + .string "SHIELD DUST$" .string "$" diff --git a/data/text/easy_chat/groups/time/order.inc b/data/text/easy_chat/groups/time/order.inc index 5cf8225c5..c8be7bc3b 100644 --- a/data/text/easy_chat/groups/time/order.inc +++ b/data/text/easy_chat/groups/time/order.inc @@ -2,47 +2,47 @@ gEasyChatGroupOrder_Time: @ 83DF802 .2byte 29 + .2byte 39 + .2byte 6 .2byte 18 .2byte 33 - .2byte 22 - .2byte 40 - .2byte 42 - .2byte 38 - .2byte 11 - .2byte 41 + .2byte 7 + .2byte 37 + .2byte 4 + .2byte 9 + .2byte 35 + .2byte 17 .2byte 10 + .2byte 0 + .2byte 27 + .2byte 20 .2byte 8 - .2byte 39 .2byte 14 - .2byte 17 - .2byte 34 - .2byte 12 - .2byte 0 - .2byte 13 - .2byte 6 - .2byte 5 - .2byte 26 .2byte 3 - .2byte 27 - .2byte 21 - .2byte 7 - .2byte 24 + .2byte 16 .2byte 15 + .2byte 24 .2byte 1 + .2byte 40 .2byte 28 .2byte 43 + .2byte 42 + .2byte 26 + .2byte 38 .2byte 30 - .2byte 20 - .2byte 31 - .2byte 32 - .2byte 16 + .2byte 5 + .2byte 22 + .2byte 34 .2byte 23 .2byte 25 - .2byte 4 - .2byte 9 - .2byte 35 - .2byte 37 + .2byte 31 + .2byte 32 + .2byte 41 + .2byte 19 + .2byte 13 .2byte 2 - .2byte 36 + .2byte 11 + .2byte 21 .2byte 44 - .2byte 19 + .2byte 36 + .2byte 12 diff --git a/data/text/easy_chat/groups/time/words.inc b/data/text/easy_chat/groups/time/words.inc index 43389bbc6..4048d3714 100644 --- a/data/text/easy_chat/groups/time/words.inc +++ b/data/text/easy_chat/groups/time/words.inc @@ -1,47 +1,47 @@ gEasyChatGroupWords_Time: @ 83DD72D - .string "HERBST$" - .string "MORGEN$" - .string "ÜBERMORGEN$" - .string "LETZTE(N)$" - .string "TAG$" - .string "IRGENDWANN$" - .string "IMMER$" - .string "MOMENTAN$" - .string "EWIG$" - .string "TAGE$" - .string "ENDE$" - .string "DIENSTAG$" - .string "GESTERN$" - .string "HEUTE$" - .string "FREITAG$" - .string "MONTAG$" - .string "SPÄTER$" - .string "FRÜHER$" - .string "AM ANDEREN$" - .string "ZEIT$" - .string "SCHLUSS$" - .string "MITTWOCH$" - .string "BALD$" + .string "FALL$" + .string "MORNING$" + .string "TOMORROW$" + .string "LAST$" + .string "DAY$" + .string "SOMETIME$" + .string "ALWAYS$" + .string "CURRENT$" + .string "FOREVER$" + .string "DAYS$" + .string "END$" + .string "TUESDAY$" + .string "YESTERDAY$" + .string "TODAY$" + .string "FRIDAY$" + .string "MONDAY$" + .string "LATER$" + .string "EARLIER$" + .string "ANOTHER$" + .string "TIME$" + .string "FINISH$" + .string "WEDNESDAY$" + .string "SOON$" .string "START$" - .string "MONAT$" - .string "STOPP$" - .string "JETZT$" - .string "LETZTER$" - .string "NÄCHSTES$" - .string "ALTER$" - .string "SAMSTAG$" - .string "SOMMER$" - .string "SONNTAG$" - .string "ANFANG$" - .string "FRÜHLING$" - .string "TAGESZEIT$" + .string "MONTH$" + .string "STOP$" + .string "NOW$" + .string "FINAL$" + .string "NEXT$" + .string "AGE$" + .string "SATURDAY$" + .string "SUMMER$" + .string "SUNDAY$" + .string "BEGINNING$" + .string "SPRING$" + .string "DAYTIME$" .string "WINTER$" - .string "TÄGLICH$" - .string "DAMALS$" - .string "FAST$" - .string "BEINAHE$" - .string "DONNERSTAG$" - .string "BETTZEIT$" - .string "NACHT$" - .string "WOCHE$" + .string "DAILY$" + .string "OLDEN$" + .string "ALMOST$" + .string "NEARLY$" + .string "THURSDAY$" + .string "NIGHTTIME$" + .string "NIGHT$" + .string "WEEK$" .string "$" diff --git a/data/text/easy_chat/groups/trainer/order.inc b/data/text/easy_chat/groups/trainer/order.inc index 98ef9a29e..4238e578a 100644 --- a/data/text/easy_chat/groups/trainer/order.inc +++ b/data/text/easy_chat/groups/trainer/order.inc @@ -1,22 +1,22 @@ .align 1 gEasyChatGroupOrder_Trainer: @ 83DF1A4 - .2byte 15 .2byte 7 - .2byte 0 .2byte 8 - .2byte 4 .2byte 5 - .2byte 10 + .2byte 4 + .2byte 15 .2byte 1 + .2byte 0 .2byte 18 .2byte 9 + .2byte 6 .2byte 16 .2byte 14 .2byte 13 .2byte 17 .2byte 3 + .2byte 10 .2byte 2 .2byte 11 .2byte 12 - .2byte 6 diff --git a/data/text/easy_chat/groups/trainer/words.inc b/data/text/easy_chat/groups/trainer/words.inc index 93f862f20..8a1a40c76 100644 --- a/data/text/easy_chat/groups/trainer/words.inc +++ b/data/text/easy_chat/groups/trainer/words.inc @@ -1,21 +1,21 @@ -gEasyChatGroupWords_Trainer: - .string "DU BIST DRAN$" - .string "HAB DICH$" - .string "TAUSCH$" - .string "SAPHIR$" - .string "ENTWICKELN$" - .string "ENZYKLOPÄDIE$" - .string "WESEN$" +gEasyChatGroupWords_Trainer: @ 83DC0C0 + .string "I CHOOSE YOU$" + .string "GOTCHA$" + .string "TRADE$" + .string "SAPPHIRE$" + .string "EVOLVE$" + .string "ENCYCLOPEDIA$" + .string "NATURE$" .string "CENTER$" - .string "EI$" + .string "EGG$" .string "LINK$" - .string "FÄHIGKEIT$" + .string "SP. ABILITY$" .string "TRAINER$" .string "VERSION$" .string "POKéNAV$" .string "POKéMON$" - .string "BEKOMMEN$" + .string "GET$" .string "POKéDEX$" - .string "RUBIN$" + .string "RUBY$" .string "LEVEL$" .string "$" diff --git a/data/text/easy_chat/groups/trendy_saying/order.inc b/data/text/easy_chat/groups/trendy_saying/order.inc index 4ba916489..5b4cd031a 100644 --- a/data/text/easy_chat/groups/trendy_saying/order.inc +++ b/data/text/easy_chat/groups/trendy_saying/order.inc @@ -1,36 +1,36 @@ .align 1 gEasyChatGroupOrder_TrendySaying: @ 83DFBDA - .2byte 32 - .2byte 24 + .2byte 7 .2byte 2 - .2byte 1 .2byte 28 - .2byte 17 - .2byte 19 + .2byte 22 + .2byte 9 + .2byte 3 + .2byte 8 + .2byte 26 .2byte 11 - .2byte 27 .2byte 15 - .2byte 7 - .2byte 16 + .2byte 24 .2byte 29 - .2byte 4 - .2byte 5 - .2byte 31 - .2byte 8 - .2byte 26 - .2byte 25 + .2byte 16 + .2byte 12 .2byte 23 + .2byte 0 .2byte 13 + .2byte 14 .2byte 6 .2byte 20 - .2byte 9 - .2byte 30 + .2byte 4 .2byte 10 + .2byte 30 .2byte 18 + .2byte 17 .2byte 21 - .2byte 12 - .2byte 22 - .2byte 0 - .2byte 3 - .2byte 14 + .2byte 32 + .2byte 19 + .2byte 27 + .2byte 25 + .2byte 5 + .2byte 1 + .2byte 31 diff --git a/data/text/easy_chat/groups/trendy_saying/words.inc b/data/text/easy_chat/groups/trendy_saying/words.inc index dbe6ff4da..d69a5213c 100644 --- a/data/text/easy_chat/groups/trendy_saying/words.inc +++ b/data/text/easy_chat/groups/trendy_saying/words.inc @@ -1,35 +1,35 @@ gEasyChatGroupWords_TrendySaying: @ 83DDDF2 - .string "VOKUHILA$" - .string "AYE, AYE!$" - .string "AVANTGARDE$" - .string "YUPPIES$" - .string "IHR DIENER!$" - .string "JIIHAAH$" + .string "KTHX, BYE.$" + .string "YES, SIR!$" + .string "AVANT GARDE$" + .string "COUPLE$" + .string "MUCH OBLIGED$" + .string "YEEHAW!$" .string "MEGA$" - .string "GUMMIPUNKT$" - .string "KARMA$" - .string "NDW$" - .string "POPPER$" - .string "ERDBEERTEE$" - .string "SCHOFEL$" + .string "1-HIT KO!$" + .string "DESTINY$" + .string "CANCEL$" + .string "NEW$" + .string "FLATTEN$" + .string "KIDDING$" .string "LOSER$" - .string "ZOFF$" - .string "GIMMICK$" - .string "HIP UND$" - .string "BANANENSHAKE$" - .string "ROCK’N’ROLL$" - .string "DUFTE$" + .string "LOSING$" + .string "HAPPENING$" + .string "HIP AND$" + .string "SHAKE$" + .string "SHADY$" + .string "UPBEAT$" .string "MODERN$" - .string "RÜBENNASE$" - .string "STULPEN$" - .string "LICHT AUS...$" - .string "AUFSTAND$" - .string "LEUCHTKEKS$" - .string "KÖRPERHITZE$" - .string "GERNEGROSS$" + .string "SMELL YA$" + .string "BANG$" + .string "KNOCKOUT$" + .string "HASSLE$" + .string "WINNER$" + .string "FEVER$" + .string "WANNABE$" .string "BABY$" - .string "HOLDE$" - .string "OLL$" - .string "JUNG$" - .string "ÄTZEND$" + .string "HEART$" + .string "OLD$" + .string "YOUNG$" + .string "UGLY$" .string "$" diff --git a/data/text/easy_chat/groups/voices/order.inc b/data/text/easy_chat/groups/voices/order.inc index f8ab2dac7..563abcb09 100644 --- a/data/text/easy_chat/groups/voices/order.inc +++ b/data/text/easy_chat/groups/voices/order.inc @@ -10,57 +10,57 @@ gEasyChatGroupOrder_Voices: @ 83DF40C .2byte 6 .2byte 3 .2byte 2 - .2byte 52 + .2byte 23 .2byte 11 .2byte 41 - .2byte 14 - .2byte 35 - .2byte 44 - .2byte 56 + .2byte 52 + .2byte 59 + .2byte 22 + .2byte 25 + .2byte 32 + .2byte 24 + .2byte 26 .2byte 43 - .2byte 31 + .2byte 19 .2byte 33 .2byte 61 .2byte 34 .2byte 38 - .2byte 24 - .2byte 37 .2byte 40 - .2byte 26 .2byte 48 + .2byte 37 .2byte 47 - .2byte 53 .2byte 42 .2byte 15 - .2byte 46 .2byte 49 - .2byte 30 - .2byte 32 - .2byte 58 - .2byte 39 - .2byte 60 - .2byte 19 + .2byte 46 .2byte 57 - .2byte 51 + .2byte 44 .2byte 54 + .2byte 53 .2byte 13 .2byte 29 - .2byte 9 + .2byte 51 .2byte 28 + .2byte 55 .2byte 12 .2byte 27 - .2byte 55 - .2byte 16 - .2byte 45 - .2byte 23 - .2byte 25 - .2byte 22 + .2byte 56 + .2byte 30 + .2byte 31 .2byte 20 + .2byte 45 .2byte 36 - .2byte 59 .2byte 50 + .2byte 9 .2byte 21 + .2byte 14 .2byte 10 .2byte 62 - .2byte 17 + .2byte 35 + .2byte 16 .2byte 18 + .2byte 60 + .2byte 17 + .2byte 58 + .2byte 39 diff --git a/data/text/easy_chat/groups/voices/words.inc b/data/text/easy_chat/groups/voices/words.inc index 65341a6b9..1dde075b9 100644 --- a/data/text/easy_chat/groups/voices/words.inc +++ b/data/text/easy_chat/groups/voices/words.inc @@ -1,6 +1,6 @@ gEasyChatGroupWords_Voices: @ 83DCA20 .string "!$" - .string "!!!$" + .string "!!$" .string "?!$" .string "?$" .string "…$" @@ -8,58 +8,58 @@ gEasyChatGroupWords_Voices: @ 83DCA20 .string "………$" .string "-$" .string "- - -$" - .string "OH OH$" + .string "UH-OH$" .string "WAAAH$" - .string "AHAHAHA$" + .string "AHAHA$" .string "OH?$" - .string "NÖ$" - .string "ARGH$" + .string "NOPE$" + .string "URGH$" .string "HMM$" - .string "OOOH$" - .string "WOOOAR$" + .string "WHOAH$" + .string "WROOOAAR!$" .string "WOW$" - .string "KICHER$" - .string "SEUFZ$" - .string "UNGLAUBLICH$" - .string "SCHREIT$" - .string "RICHTIG!$" - .string "HÄH?$" - .string "SCHREI$" - .string "HÄHÄHÄ$" - .string "OJE OJE$" + .string "GIGGLE$" + .string "SIGH$" + .string "UNBELIEVABLE$" + .string "CRIES$" + .string "AGREE$" + .string "EH?$" + .string "CRY$" + .string "EHEHE$" + .string "OI, OI, OI$" .string "OH, YEAH$" .string "OH$" - .string "HUPS$" - .string "GESCHOCKT$" - .string "IGITT$" + .string "OOPS$" + .string "SHOCKED$" + .string "EEK$" .string "GRAAAH$" .string "GWAHAHAHA$" - .string "ART$" - .string "TSE$" - .string "HÄHÄ$" + .string "WAY$" + .string "TCH$" + .string "HEHE$" .string "HAH$" - .string "JAJAJA$" + .string "YUP$" .string "HAHAHA$" .string "AIYEEH$" .string "HIYAH$" - .string "FÖFÖFÖ$" - .string "BRÜLL LACH$" - .string "PRUST$" - .string "HMPF$" + .string "FUFUFU$" + .string "LOL$" + .string "SNORT$" + .string "HUMPH$" .string "HEHEHE$" .string "HEH$" .string "HOHOHO$" - .string "UI UI$" - .string "MEINE GÜTE$" - .string "AARRGH$" - .string "HIHIHI$" - .string "MMMH$" + .string "UH-HUH$" + .string "OH, DEAR$" + .string "ARRGH$" + .string "MUFUFU$" + .string "MMM$" + .string "OH-KAY$" .string "OKAY$" - .string "DURCHSCHNITT$" .string "LALALA$" - .string "JAHA$" - .string "UFF$" - .string "JUCHEE$" - .string "GRRR$" + .string "YAY$" + .string "AWW$" + .string "WOWEE$" + .string "GWAH$" .string "WAHAHAHA$" .string "$" diff --git a/data/text/easy_chat/words_by_letter.inc b/data/text/easy_chat/words_by_letter.inc index 4850009bb..3c7f5bafc 100644 --- a/data/text/easy_chat/words_by_letter.inc +++ b/data/text/easy_chat/words_by_letter.inc @@ -8,573 +8,575 @@ gEasyChatWordsByLetter_Others: .2byte EC_WORD_ELLIPSIS .2byte EC_WORD_ELLIPSIS_EXCL .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS + .2byte EC_WORD_1_HIT_KO_EXCL .2byte EC_WORD_QUES .2byte EC_WORD_QUES_EXCL gEasyChatWordsByLetter_A: - .2byte EC_POKEMON(HUNTAIL) - .2byte EC_WORD_ARRGH - .2byte EC_WORD_ADVENTURE - .2byte EC_WORD_BUT - .2byte EC_MOVE2(DESTINY_BOND) - .2byte EC_MOVE2(PERISH_SONG) - .2byte EC_WORD_REJECT - .2byte EC_WORD_DISLIKES + .2byte EC_WORD_A + .2byte EC_WORD_A_LITTLE + .2byte EC_WORD_A_LOT + .2byte EC_WORD_A_TINY_BIT + .2byte EC_WORD_ABOUT + .2byte EC_WORD_ABOVE ec_duplicates 2 .2byte EC_POKEMON(ABRA) .2byte EC_POKEMON2(ABRA) - .2byte EC_MOVE2(KNOCK_OFF) + .2byte EC_WORD_ABSENT .2byte EC_POKEMON(ABSOL) + .2byte EC_WORD_ABSOLUTELY .2byte EC_MOVE(ABSORB) - .2byte EC_WORD_PREPOSTEROUS - .2byte EC_WORD_ABSENT - .2byte EC_WORD_COME_OVER - .2byte EC_WORD_KEEN_EYE - .2byte EC_WORD_GUTS + .2byte EC_WORD_ACCEPT + .2byte EC_MOVE2(ACID) + .2byte EC_MOVE2(ACID_ARMOR) + .2byte EC_WORD_ADORE + .2byte EC_WORD_ADULT + .2byte EC_WORD_ADVENTURE .2byte EC_MOVE2(AERIAL_ACE) + .2byte EC_MOVE(AEROBLAST) .2byte EC_POKEMON2(AERODACTYL) + .2byte EC_WORD_AFTER + .2byte EC_WORD_AGE + .2byte EC_POKEMON(AGGRON) .2byte EC_MOVE(AGILITY) - .2byte EC_WORD_UM + .2byte EC_WORD_AGREE .2byte EC_WORD_AHAHA - .2byte EC_WORD_LIKE + .2byte EC_WORD_AIM + .2byte EC_POKEMON2(AIPOM) + .2byte EC_MOVE(AIR_CUTTER) + .2byte EC_WORD_AIR_LOCK .2byte EC_WORD_AIYEEH - .2byte EC_WORD_ACCEPT + ec_duplicates 2 + .2byte EC_POKEMON(ALAKAZAM) + .2byte EC_POKEMON2(ALAKAZAM) .2byte EC_WORD_ALL + .2byte EC_WORD_ALL_RIGHT + .2byte EC_WORD_ALLOW + .2byte EC_WORD_ALLOWANCE + .2byte EC_WORD_ALLY + .2byte EC_WORD_ALMOST .2byte EC_WORD_ALONE - .2byte EC_WORD_EVERY - .2byte EC_POKEMON2(HAUNTER) - .2byte EC_WORD_THAN - .2byte EC_WORD_AS_IF .2byte EC_WORD_ALSO .2byte EC_WORD_ALT_COLOR .2byte EC_POKEMON(ALTARIA) - .2byte EC_WORD_AGE - .2byte EC_WORD_ANOTHER + .2byte EC_WORD_ALTHOUGH + .2byte EC_WORD_ALWAYS + .2byte EC_WORD_AM .2byte EC_MOVE2(AMNESIA) - .2byte EC_POKEMON2(OMANYTE) - .2byte EC_POKEMON2(OMASTAR) - .2byte EC_MOVE(SIGNAL_BEAM) .2byte EC_POKEMON2(AMPHAROS) .2byte EC_WORD_AMUSING - .2byte EC_WORD_ON - .2byte EC_WORD_OTHER - .2byte EC_WORD_ELSE - .2byte EC_WORD_BEGINNING - .2byte EC_WORD_BRAG - .2byte EC_MOVE(SWAGGER) - .2byte EC_WORD_FISHING - .2byte EC_WORD_ATTACK - .2byte EC_WORD_WIMPY - .2byte EC_WORD_RUN_AWAY + .2byte EC_WORD_AN + .2byte EC_MOVE(ANCIENT_POWER) + .2byte EC_WORD_AND + .2byte EC_WORD_ANGER + .2byte EC_WORD_ANGERS + .2byte EC_WORD_ANGRY .2byte EC_WORD_ANIME - .2byte EC_WORD_CUTENESS - .2byte EC_WORD_CUTE .2byte EC_POKEMON(ANORITH) - .2byte EC_MOVE(ANCIENT_POWER) - .2byte EC_MOVE2(ATTRACT) - .2byte EC_WORD_WATER_VEIL - .2byte EC_MOVE2(WATER_GUN) - .2byte EC_POKEMON2(VAPOREON) - .2byte EC_MOVE2(WATER_PULSE) - .2byte EC_WORD_WORK - .2byte EC_WORD_WORKING + .2byte EC_WORD_ANOTHER + .2byte EC_WORD_ANTICIPATION + .2byte EC_WORD_ANY + .2byte EC_WORD_ANYWHERE + .2byte EC_WORD_APOLOGIZE + .2byte EC_WORD_APPEAL + .2byte EC_WORD_APPEAR + .2byte EC_WORD_APPEARS + .2byte EC_WORD_APPRECIATE + .2byte EC_WORD_APPROVED .2byte EC_POKEMON2(ARBOK) - .2byte EC_WORD_ANGERS - .2byte EC_WORD_URGH - .2byte EC_POKEMON2(ARIADOS) .2byte EC_POKEMON2(ARCANINE) - .2byte EC_POKEMON2(ARTICUNO) - .2byte EC_POKEMON(ARMALDO) + .2byte EC_WORD_ARE + .2byte EC_WORD_AREN_T + .2byte EC_WORD_ARENA_TRAP + .2byte EC_POKEMON2(ARIADOS) .2byte EC_MOVE2(ARM_THRUST) + .2byte EC_POKEMON(ARMALDO) .2byte EC_MOVE(AROMATHERAPY) - .2byte EC_WORD_WAY - .2byte EC_WORD_MOVE - .2byte EC_WORD_UGLY - .2byte EC_WORD_OI - .2byte EC_WORD_TOO - .2byte EC_WORD_OUT - .2byte EC_MOVE2(RECYCLE) - .2byte EC_WORD_GIVE_UP - .2byte EC_MOVE(UPROAR) - .2byte EC_WORD_HASSLE - .2byte EC_WORD_WAKE_UP + .2byte EC_POKEMON(ARON) + .2byte EC_WORD_AROUND + .2byte EC_WORD_ARRGH + .2byte EC_POKEMON2(ARTICUNO) + .2byte EC_WORD_AS + .2byte EC_WORD_AS_IF + .2byte EC_WORD_AS_MUCH_AS + .2byte EC_MOVE2(ASSIST) + .2byte EC_MOVE(ASTONISH) + .2byte EC_WORD_AT + .2byte EC_WORD_ATTACK + .2byte EC_MOVE2(ATTRACT) + .2byte EC_WORD_AUNT .2byte EC_MOVE(AURORA_BEAM) - .2byte EC_WORD_OFF - .2byte EC_MOVE(ENDURE) - .2byte EC_WORD_APPEAL - .2byte EC_WORD_LOOK - .2byte EC_WORD_OUTSIDE - .2byte EC_MOVE(DISABLE) - .2byte EC_POKEMON2(CLOYSTER) - .2byte EC_WORD_ARENA_TRAP .2byte EC_WORD_AVANT_GARDE - .2byte EC_WORD_YES_SIR_EXCL + .2byte EC_WORD_AWAY + .2byte EC_WORD_AWESOME + .2byte EC_WORD_AWFUL + .2byte EC_WORD_AWFULLY + .2byte EC_WORD_AWW ec_duplicates 2 .2byte EC_POKEMON(AZUMARILL) .2byte EC_POKEMON2(AZUMARILL) .2byte EC_POKEMON(AZURILL) gEasyChatWordsByLetter_B: + .2byte EC_WORD_BABE .2byte EC_WORD_BABY - .2byte EC_WORD_STAY_AT_HOME - .2byte EC_WORD_BATH - .2byte EC_WORD_SOON - .2byte EC_POKEMON2(QWILFISH) + .2byte EC_WORD_BACK + .2byte EC_WORD_BAD + .2byte EC_WORD_BADLY + .2byte EC_POKEMON(BAGON) .2byte EC_WORD_BALL - .2byte EC_WORD_SHAKE - .2byte EC_WORD_RIBBON + .2byte EC_POKEMON(BALTOY) .2byte EC_POKEMON(BANETTE) + .2byte EC_WORD_BANG + .2byte EC_POKEMON(BARBOACH) + .2byte EC_MOVE2(BARRAGE) .2byte EC_MOVE2(BARRIER) - .2byte EC_POKEMON(FEEBAS) + .2byte EC_WORD_BATH + .2byte EC_MOVE2(BATON_PASS) + .2byte EC_WORD_BATTLE + .2byte EC_WORD_BATTLE_ARMOR + .2byte EC_WORD_BATTLE_ROOM + .2byte EC_WORD_BATTLE_TOWER + .2byte EC_POKEMON2(BAYLEEF) + .2byte EC_WORD_BE + .2byte EC_WORD_BEAT + .2byte EC_MOVE2(BEAT_UP) + .2byte EC_POKEMON(BEAUTIFLY) + .2byte EC_WORD_BEAUTIFUL + .2byte EC_WORD_BEAUTY + .2byte EC_WORD_BECOMES + .2byte EC_POKEMON2(BEEDRILL) + .2byte EC_WORD_BEEN + .2byte EC_WORD_BEFORE + .2byte EC_WORD_BEGINNING + .2byte EC_WORD_BEING + .2byte EC_POKEMON(BELDUM) + .2byte EC_WORD_BELIEVE + ec_duplicates 2 + .2byte EC_POKEMON(BELLOSSOM) + .2byte EC_POKEMON2(BELLOSSOM) + .2byte EC_POKEMON2(BELLSPROUT) .2byte EC_MOVE2(BELLY_DRUM) - .2byte EC_MOVE2(COTTON_SPORE) - .2byte EC_WORD_INTIMIDATE + .2byte EC_WORD_BELONGS_TO + .2byte EC_WORD_BELOW .2byte EC_WORD_BERRY - .2byte EC_WORD_EXCITE - .2byte EC_MOVE2(IMPRISON) - .2byte EC_WORD_AT - .2byte EC_WORD_NEARLY - .2byte EC_WORD_GET - .2byte EC_WORD_GETS - .2byte EC_WORD_RESUSCITATE - .2byte EC_WORD_READY - .2byte EC_WORD_BUSY - .2byte EC_WORD_VIEWING - .2byte EC_WORD_FAINT - .2byte EC_WORD_DEFEATED - .2byte EC_WORD_OWN - .2byte EC_WORD_BETTER + .2byte EC_WORD_BESIDE .2byte EC_WORD_BEST - .2byte EC_WORD_NIGHTTIME - .2byte EC_MOVE2(COVET) - .2byte EC_POKEMON2(BEEDRILL) - .2byte EC_WORD_UNTIL - .2byte EC_WORD_MEET_YOU - .2byte EC_WORD_SEE_YA - .2byte EC_POKEMON2(VENUSAUR) - .2byte EC_POKEMON2(IVYSAUR) - .2byte EC_POKEMON2(BULBASAUR) + .2byte EC_WORD_BETTER + .2byte EC_MOVE(BIDE) + .2byte EC_WORD_BIG + .2byte EC_WORD_BIKE + .2byte EC_MOVE(BIND) .2byte EC_MOVE(BITE) - .2byte EC_WORD_ARE - .2byte EC_WORD_PLEASE - .2byte EC_MOVE2(SWEET_KISS) - .2byte EC_POKEMON(NUZLEAF) - .2byte EC_MOVE2(PETAL_DANCE) - .2byte EC_MOVE2(FLASH) - .2byte EC_POKEMON2(JOLTEON) - .2byte EC_WORD_LIGHTNINGROD - .2byte EC_MOVE2(ZAP_CANNON) + .2byte EC_POKEMON2(BLASTOISE) + .2byte EC_WORD_BLAZE + .2byte EC_MOVE2(BLAZE_KICK) + .2byte EC_POKEMON(BLAZIKEN) + .2byte EC_WORD_BLEND + .2byte EC_POKEMON2(BLISSEY) .2byte EC_MOVE2(BLIZZARD) - .2byte EC_WORD_NITWIT - .2byte EC_WORD_JUST + .2byte EC_MOVE2(BLOCK) + .2byte EC_WORD_BOARD + .2byte EC_MOVE2(BODY_SLAM) + .2byte EC_MOVE2(BONE_CLUB) + .2byte EC_MOVE2(BONE_RUSH) + .2byte EC_MOVE2(BONEMERANG) + .2byte EC_WORD_BOOK + .2byte EC_WORD_BORED + .2byte EC_WORD_BORING + .2byte EC_MOVE2(BOUNCE) + .2byte EC_WORD_BOY + .2byte EC_WORD_BRAG + .2byte EC_WORD_BREAK + .2byte EC_POKEMON(BRELOOM) + .2byte EC_MOVE(BRICK_BREAK) + .2byte EC_WORD_BROTHER .2byte EC_MOVE(BUBBLE) .2byte EC_MOVE2(BUBBLE_BEAM) - ec_duplicates 2 - .2byte EC_POKEMON(BELLOSSOM) - .2byte EC_POKEMON2(BELLOSSOM) - .2byte EC_WORD_FLOWERS - .2byte EC_MOVE(LEECH_LIFE) - .2byte EC_POKEMON2(VENONAT) - .2byte EC_WORD_GROUND - .2byte EC_MOVE2(TAKE_DOWN) - .2byte EC_MOVE(SAFEGUARD) - .2byte EC_MOVE2(BODY_SLAM) - .2byte EC_MOVE2(DRILL_PECK) - .2byte EC_POKEMON2(DELIBIRD) - .2byte EC_WORD_NEED - .2byte EC_WORD_BOARD - .2byte EC_WORD_LETTER - .2byte EC_WORD_BROTHER - .2byte EC_WORD_LOL - .2byte EC_MOVE2(ROAR) - .2byte EC_POKEMON(SALAMENCE) - .2byte EC_WORD_BOOK - .2byte EC_WORD_STAGE - .2byte EC_POKEMON(SLAKOTH) + .2byte EC_WORD_BUG + .2byte EC_POKEMON2(BULBASAUR) + .2byte EC_MOVE2(BULK_UP) + .2byte EC_MOVE2(BULLET_SEED) + .2byte EC_WORD_BUSY + .2byte EC_WORD_BUT + .2byte EC_POKEMON2(BUTTERFREE) + .2byte EC_WORD_BYE_BYE gEasyChatWordsByLetter_C: - .2byte EC_POKEMON(NUMEL) + .2byte EC_POKEMON(CACNEA) + .2byte EC_POKEMON(CACTURNE) + .2byte EC_MOVE2(CALM_MIND) + .2byte EC_WORD_CAME + .2byte EC_WORD_CAMERA .2byte EC_POKEMON(CAMERUPT) + .2byte EC_MOVE2(CAMOUFLAGE) + .2byte EC_WORD_CAN + .2byte EC_WORD_CAN_WIN + .2byte EC_WORD_CAN_T + .2byte EC_WORD_CAN_T_WIN + .2byte EC_WORD_CANCEL + .2byte EC_WORD_CAPABLE + .2byte EC_WORD_CARDS + .2byte EC_WORD_CARE + .2byte EC_WORD_CARES + .2byte EC_POKEMON(CARVANHA) + .2byte EC_POKEMON(CASCOON) + .2byte EC_WORD_CASE + .2byte EC_POKEMON(CASTFORM) + .2byte EC_POKEMON2(CATERPIE) + .2byte EC_WORD_CAUSE .2byte EC_POKEMON2(CELEBI) .2byte EC_WORD_CENTER + .2byte EC_WORD_CHALLENGE + .2byte EC_WORD_CHANGE + .2byte EC_WORD_CHANNEL .2byte EC_POKEMON2(CHANSEY) + .2byte EC_MOVE(CHARGE) + .2byte EC_POKEMON2(CHARIZARD) .2byte EC_MOVE(CHARM) - .2byte EC_WORD_CUTE_CHARM + .2byte EC_POKEMON2(CHARMANDER) + .2byte EC_POKEMON2(CHARMELEON) + .2byte EC_WORD_CHAT + .2byte EC_POKEMON2(CHIKORITA) + .2byte EC_WORD_CHILD_S_PLAY + .2byte EC_WORD_CHILDREN + .2byte EC_POKEMON(CHIMECHO) + ec_duplicates 2 + .2byte EC_POKEMON(CHINCHOU) + .2byte EC_POKEMON2(CHINCHOU) .2byte EC_WORD_CHLOROPHYLL + .2byte EC_WORD_CHOICE + .2byte EC_WORD_CHOOSE + .2byte EC_WORD_CHORES + .2byte EC_MOVE(CLAMP) + .2byte EC_POKEMON(CLAMPERL) + .2byte EC_WORD_CLASS + .2byte EC_POKEMON(CLAYDOL) + .2byte EC_WORD_CLEAR_BODY + .2byte EC_POKEMON2(CLEFABLE) + .2byte EC_POKEMON2(CLEFAIRY) + .2byte EC_POKEMON2(CLEFFA) + .2byte EC_WORD_CLOSE + .2byte EC_WORD_CLOUD_NINE + .2byte EC_POKEMON2(CLOYSTER) + .2byte EC_WORD_COLD + .2byte EC_WORD_COLLECT + .2byte EC_WORD_COLLECTION + .2byte EC_WORD_COLOR + .2byte EC_WORD_COLOR_CHANGE + .2byte EC_POKEMON(COMBUSKEN) + .2byte EC_WORD_COME + .2byte EC_WORD_COME_ON + .2byte EC_WORD_COME_OVER + .2byte EC_MOVE2(COMET_PUNCH) .2byte EC_WORD_COMICS + .2byte EC_WORD_COMMEMORATE + .2byte EC_WORD_COMPLETE + .2byte EC_WORD_COMPOUNDEYES + .2byte EC_WORD_CONCEDE + .2byte EC_MOVE(CONFUSE_RAY) + .2byte EC_WORD_CONFUSED + .2byte EC_MOVE2(CONFUSION) + .2byte EC_WORD_CONGRATS + .2byte EC_MOVE(CONSTRICT) + .2byte EC_WORD_CONTEST + .2byte EC_WORD_CONVERSATION + .2byte EC_MOVE2(CONVERSION) + .2byte EC_MOVE2(CONVERSION_2) .2byte EC_WORD_COOL .2byte EC_WORD_COOLNESS + .2byte EC_POKEMON(CORPHISH) + .2byte EC_WORD_CORRECT ec_duplicates 2 .2byte EC_POKEMON(CORSOLA) .2byte EC_POKEMON2(CORSOLA) + .2byte EC_MOVE(COSMIC_POWER) + .2byte EC_MOVE2(COTTON_SPORE) + .2byte EC_WORD_COULD + .2byte EC_WORD_COULDN_T + .2byte EC_WORD_COUNT_ON + .2byte EC_MOVE(COUNTER) + .2byte EC_WORD_COUPLE + .2byte EC_MOVE2(COVET) + .2byte EC_MOVE(CRABHAMMER) + .2byte EC_POKEMON(CRADILY) + .2byte EC_POKEMON(CRAWDAUNT) + .2byte EC_WORD_CRIES + ec_duplicates 2 + .2byte EC_POKEMON(CROBAT) + .2byte EC_POKEMON2(CROBAT) + .2byte EC_POKEMON2(CROCONAW) + .2byte EC_MOVE(CROSS_CHOP) + .2byte EC_MOVE(CRUNCH) + .2byte EC_MOVE2(CRUSH_CLAW) + .2byte EC_WORD_CRY + .2byte EC_POKEMON2(CUBONE) + .2byte EC_WORD_CURRENT + .2byte EC_MOVE2(CURSE) + .2byte EC_MOVE(CUT) + .2byte EC_WORD_CUTE + .2byte EC_WORD_CUTE_CHARM + .2byte EC_WORD_CUTENESS + .2byte EC_POKEMON2(CYNDAQUIL) gEasyChatWordsByLetter_D: - .2byte EC_WORD_THERE - .2byte EC_WORD_OLDEN - .2byte EC_WORD_LADY - .2byte EC_POKEMON2(STANTLER) - .2byte EC_WORD_MISS - .2byte EC_WORD_THANKS - .2byte EC_WORD_THANK_YOU - .2byte EC_WORD_THAT - .2byte EC_WORD_IT_S - .2byte EC_WORD_THIS_IS_IT_EXCL - .2byte EC_WORD_THAT_S_IT_EXCL - .2byte EC_WORD_AM - .2byte EC_WORD_THAT_WAS - .2byte EC_MOVE2(FEATHER_DANCE) - .2byte EC_WORD_SON - .2byte EC_WORD_YOURS - .2byte EC_WORD_YOUR - .2byte EC_MOVE2(SUBSTITUTE) - .2byte EC_WORD_MODE - .2byte EC_WORD_THINKS + .2byte EC_WORD_DAILY + .2byte EC_WORD_DAMP + .2byte EC_WORD_DANCE + .2byte EC_WORD_DANGER + .2byte EC_WORD_DARK + .2byte EC_WORD_DARN + .2byte EC_WORD_DATE + .2byte EC_WORD_DAUGHTER + .2byte EC_WORD_DAY + .2byte EC_WORD_DAYS + .2byte EC_WORD_DAYTIME + .2byte EC_WORD_DECIDE + .2byte EC_WORD_DECIDED + .2byte EC_WORD_DEEP + .2byte EC_WORD_DEFEATED + .2byte EC_MOVE2(DEFENSE_CURL) + .2byte EC_POKEMON(DELCATTY) + .2byte EC_POKEMON2(DELIBIRD) .2byte EC_POKEMON(DEOXYS) - .2byte EC_WORD_THE - .2byte EC_WORD_DISASTER + .2byte EC_WORD_DEPT_STORE .2byte EC_WORD_DESIGN - .2byte EC_POKEMON2(TYRANITAR) - .2byte EC_WORD_BABE - .2byte EC_WORD_ABSOLUTELY - .2byte EC_WORD_TUESDAY - .2byte EC_WORD_THIS - .2byte EC_WORD_THESE - .2byte EC_WORD_THESE_WERE - .2byte EC_POKEMON2(DIGLETT) - .2byte EC_POKEMON2(DUGTRIO) + .2byte EC_WORD_DESTINY + .2byte EC_MOVE2(DESTINY_BOND) + .2byte EC_WORD_DESTROYED + .2byte EC_MOVE2(DETECT) + .2byte EC_POKEMON2(DEWGONG) + .2byte EC_WORD_DID + .2byte EC_WORD_DIDN_T + .2byte EC_WORD_DIET + .2byte EC_WORD_DIFFERENT + .2byte EC_MOVE(DIG) .2byte EC_WORD_DIGITAL - .2byte EC_WORD_THING + .2byte EC_POKEMON2(DIGLETT) + .2byte EC_MOVE(DISABLE) + .2byte EC_WORD_DISAPPEAR + .2byte EC_WORD_DISAPPOINT + .2byte EC_WORD_DISAPPOINTED + .2byte EC_WORD_DISAPPOINTS + .2byte EC_WORD_DISASTER + .2byte EC_WORD_DISLIKE + .2byte EC_WORD_DISLIKES .2byte EC_POKEMON2(DITTO) + .2byte EC_MOVE2(DIVE) + .2byte EC_MOVE2(DIZZY_PUNCH) + .2byte EC_WORD_DO + .2byte EC_WORD_DOCILE ec_duplicates 2 .2byte EC_POKEMON(DODRIO) .2byte EC_POKEMON2(DODRIO) ec_duplicates 2 .2byte EC_POKEMON(DODUO) .2byte EC_POKEMON2(DODUO) - .2byte EC_MOVE(THUNDER) - .2byte EC_MOVE(THUNDERBOLT) - .2byte EC_MOVE(THUNDER_PUNCH) - .2byte EC_MOVE2(THUNDER_SHOCK) - .2byte EC_WORD_THURSDAY - .2byte EC_MOVE2(THUNDER_WAVE) + .2byte EC_WORD_DOES + .2byte EC_WORD_DOESN_T + .2byte EC_WORD_DON_T + .2byte EC_WORD_DONE ec_duplicates 2 .2byte EC_POKEMON(DONPHAN) .2byte EC_POKEMON2(DONPHAN) .2byte EC_MOVE2(DOUBLE_KICK) .2byte EC_MOVE(DOUBLE_TEAM) - .2byte EC_MOVE2(SPIKE_CANNON) - .2byte EC_WORD_OBLIVIOUS + .2byte EC_MOVE(DOUBLE_EDGE) + .2byte EC_MOVE(DOUBLE_SLAP) + .2byte EC_WORD_DOWN + .2byte EC_WORD_DOWNCAST .2byte EC_WORD_DRAGON .2byte EC_MOVE2(DRAGON_CLAW) .2byte EC_MOVE2(DRAGON_DANCE) .2byte EC_MOVE2(DRAGON_RAGE) .2byte EC_POKEMON2(DRAGONAIR) + .2byte EC_MOVE2(DRAGON_BREATH) .2byte EC_POKEMON2(DRAGONITE) - .2byte EC_POKEMON(SHELGON) .2byte EC_POKEMON2(DRATINI) - .2byte EC_MOVE2(TRIPLE_KICK) - .2byte EC_MOVE(FLAIL) - .2byte EC_WORD_YOU - .2byte EC_WORD_YOU_RE - .2byte EC_WORD_I_CHOOSE_YOU - .2byte EC_WORD_YOU_VE - .2byte EC_WORD_BATTLE_TOWER - ec_duplicates 2 - .2byte EC_POKEMON(GLOOM) - .2byte EC_POKEMON2(GLOOM) - .2byte EC_WORD_UPBEAT - .2byte EC_WORD_STENCH - .2byte EC_POKEMON2(DUNSPARCE) - .2byte EC_MOVE(HAZE) - .2byte EC_MOVE2(TWINEEDLE) - .2byte EC_MOVE(DOUBLE_SLAP) - .2byte EC_MOVE(BRICK_BREAK) - .2byte EC_WORD_OKAY + .2byte EC_WORD_DREAM + .2byte EC_MOVE2(DREAM_EATER) + .2byte EC_MOVE2(DRILL_PECK) + .2byte EC_WORD_DRINK + .2byte EC_WORD_DRINKS + .2byte EC_WORD_DRIZZLE + .2byte EC_WORD_DROOLING .2byte EC_WORD_DROUGHT + .2byte EC_POKEMON2(DROWZEE) + .2byte EC_WORD_DUDE + .2byte EC_POKEMON2(DUGTRIO) + .2byte EC_POKEMON2(DUNSPARCE) + .2byte EC_POKEMON(DUSCLOPS) + .2byte EC_POKEMON(DUSKULL) + .2byte EC_POKEMON(DUSTOX) + .2byte EC_MOVE2(DYNAMIC_PUNCH) gEasyChatWordsByLetter_E: - .2byte EC_WORD_SERENE_GRACE - .2byte EC_MOVE2(LEECH_SEED) - .2byte EC_WORD_RATHER - .2byte EC_WORD_REALLY + .2byte EC_WORD_EARLIER + .2byte EC_WORD_EARLY_BIRD + .2byte EC_MOVE(EARTHQUAKE) + .2byte EC_WORD_EASY + .2byte EC_WORD_EAT + .2byte EC_WORD_EATS + .2byte EC_WORD_EEK + .2byte EC_POKEMON2(EEVEE) + .2byte EC_WORD_EFFECT_SPORE .2byte EC_WORD_EGG .2byte EC_MOVE2(EGG_BOMB) - .2byte EC_WORD_HURRIED - .2byte EC_WORD_A - .2byte EC_WORD_A_LITTLE - .2byte EC_WORD_AN - .2byte EC_WORD_OF - .2byte EC_WORD_SIMPLE - .2byte EC_MOVE2(DEFENSE_CURL) - .2byte EC_WORD_SHOPPING - .2byte EC_WORD_ONCE - .2byte EC_WORD_LONESOME - .2byte EC_WORD_ICE - .2byte EC_MOVE2(IRON_DEFENSE) - .2byte EC_MOVE(IRON_TAIL) - .2byte EC_MOVE(SHEER_COLD) - .2byte EC_MOVE2(ICE_PUNCH) - .2byte EC_MOVE2(ICE_BEAM) - .2byte EC_MOVE(ICY_WIND) - .2byte EC_POKEMON2(ELEKID) + .2byte EC_WORD_EH_QUES + .2byte EC_WORD_EHEHE + .2byte EC_POKEMON2(EKANS) .2byte EC_POKEMON2(ELECTABUZZ) .2byte EC_WORD_ELECTRIC - .2byte EC_WORD_PARENT - .2byte EC_WORD_RECOMMEND - .2byte EC_WORD_END - .2byte EC_POKEMON2(CHIKORITA) - .2byte EC_WORD_FINALLY - .2byte EC_POKEMON(SKITTY) - .2byte EC_POKEMON(DELCATTY) - .2byte EC_MOVE(FOCUS_ENERGY) - .2byte EC_POKEMON2(ENTEI) - .2byte EC_MOVE2(SPIT_UP) - .2byte EC_WORD_DOWNCAST - ec_duplicates 2 - .2byte EC_POKEMON(PSYDUCK) - .2byte EC_POKEMON2(PSYDUCK) + .2byte EC_POKEMON(ELECTRIKE) ec_duplicates 2 - .2byte EC_POKEMON(GOLDUCK) - .2byte EC_POKEMON2(GOLDUCK) - .2byte EC_WORD_DECIDE - .2byte EC_WORD_DECIDED - .2byte EC_WORD_EXCUSE_ME - .2byte EC_WORD_DISAPPOINTS - .2byte EC_WORD_DISAPPOINTED - .2byte EC_WORD_EVOLVE - .2byte EC_WORD_EVOLUTION + .2byte EC_POKEMON(ELECTRODE) + .2byte EC_POKEMON2(ELECTRODE) + .2byte EC_POKEMON2(ELEKID) + .2byte EC_WORD_ELSE + .2byte EC_MOVE2(EMBER) + .2byte EC_MOVE(ENCORE) .2byte EC_WORD_ENCYCLOPEDIA - .2byte EC_WORD_HE - .2byte EC_WORD_HE_S - .2byte EC_MOVE(EARTHQUAKE) - .2byte EC_WORD_FLATTEN - .2byte EC_WORD_REFRESHING - .2byte EC_WORD_SURRENDER - .2byte EC_WORD_RECEIVED - .2byte EC_MOVE2(REST) - .2byte EC_WORD_ALLOW - .2byte EC_WORD_ILLUMINATE - .2byte EC_WORD_SERIOUSLY - .2byte EC_WORD_SERIOUS - .2byte EC_WORD_APPEAR - .2byte EC_WORD_APPEARS - .2byte EC_MOVE(ASTONISH) - .2byte EC_WORD_TAKE + .2byte EC_WORD_END + .2byte EC_MOVE(ENDEAVOR) + .2byte EC_MOVE(ENDURE) + .2byte EC_WORD_ENJOY + .2byte EC_WORD_ENJOYS + .2byte EC_WORD_ENOUGH + .2byte EC_POKEMON2(ENTEI) + .2byte EC_WORD_ENTERTAINING .2byte EC_MOVE2(ERUPTION) - .2byte EC_WORD_ADULT - .2byte EC_WORD_PRESSURE - .2byte EC_WORD_IT - .2byte EC_WORD_IS_IT_QUES - .2byte EC_WORD_EAT - .2byte EC_WORD_AROUND - .2byte EC_WORD_SOMETHING - .2byte EC_WORD_PLANS - .2byte EC_WORD_THEIR - .2byte EC_WORD_HERS + .2byte EC_WORD_ESCAPE + .2byte EC_POKEMON2(ESPEON) + .2byte EC_WORD_EVEN_SO + .2byte EC_WORD_EVENT .2byte EC_WORD_EVENTS - .2byte EC_WORD_PROBABLY - .2byte EC_POKEMON2(EEVEE) - .2byte EC_WORD_FOREVER + .2byte EC_WORD_EVER + .2byte EC_WORD_EVERY + .2byte EC_WORD_EVOLUTION + .2byte EC_WORD_EVOLVE + .2byte EC_WORD_EXCELLENT + .2byte EC_WORD_EXCESS + .2byte EC_WORD_EXCITE + .2byte EC_WORD_EXCITING + .2byte EC_WORD_EXCUSE + .2byte EC_WORD_EXCUSE_ME + .2byte EC_POKEMON2(EXEGGCUTE) + .2byte EC_POKEMON2(EXEGGUTOR) .2byte EC_WORD_EXISTS - .2byte EC_WORD_SHED_SKIN + .2byte EC_WORD_EXPENSIVE .2byte EC_MOVE2(EXPLOSION) - .2byte EC_WORD_EXCELLENT + .2byte EC_POKEMON(EXPLOUD) + .2byte EC_MOVE(EXTRASENSORY) + .2byte EC_MOVE(EXTREME_SPEED) gEasyChatWordsByLetter_F: .2byte EC_WORD_FABULOUS - .2byte EC_WORD_COMPOUNDEYES - .2byte EC_MOVE(STRING_SHOT) - .2byte EC_WORD_CAPABLE - .2byte EC_WORD_SP_ABILITY - .2byte EC_WORD_BIKE - .2byte EC_WORD_TRACE - .2byte EC_WORD_CASE + .2byte EC_MOVE(FACADE) + .2byte EC_WORD_FAINT + .2byte EC_MOVE2(FAINT_ATTACK) + .2byte EC_WORD_FAINTED + .2byte EC_MOVE2(FAKE_OUT) + .2byte EC_MOVE(FAKE_TEARS) + .2byte EC_WORD_FALL + .2byte EC_MOVE2(FALSE_SWIPE) .2byte EC_WORD_FAMILY .2byte EC_WORD_FANTASTIC - .2byte EC_WORD_COLOR - .2byte EC_POKEMON2(SMEARGLE) - .2byte EC_WORD_COLOR_CHANGE - .2byte EC_MOVE(FACADE) - .2byte EC_WORD_ALMOST - .2byte EC_MOVE2(ROLLING_KICK) - .2byte EC_WORD_MISTAKE - .2byte EC_WORD_LACKS - .2byte EC_WORD_GOOD - .2byte EC_WORD_OPPONENT - .2byte EC_POKEMON2(WOOPER) - .2byte EC_MOVE(ROCK_TOMB) - .2byte EC_MOVE2(ROCK_BLAST) - .2byte EC_WORD_HOLIDAY - .2byte EC_WORD_TELEVISION - .2byte EC_WORD_DONE + .2byte EC_WORD_FAR + .2byte EC_POKEMON2(FARFETCHD) + .2byte EC_WORD_FASHION + .2byte EC_WORD_FAST + .2byte EC_WORD_FATHER + .2byte EC_WORD_FEAR + .2byte EC_POKEMON2(FEAROW) + .2byte EC_MOVE2(FEATHER_DANCE) + .2byte EC_POKEMON(FEEBAS) + .2byte EC_WORD_FEELING + .2byte EC_POKEMON2(FERALIGATR) .2byte EC_WORD_FESTIVAL - .2byte EC_WORD_SHREDDED - .2byte EC_WORD_DAMP + .2byte EC_WORD_FEVER + .2byte EC_WORD_FIERY + .2byte EC_WORD_FIGHT + .2byte EC_WORD_FIGHTING + .2byte EC_WORD_FIGHTS + .2byte EC_WORD_FINAL + .2byte EC_WORD_FINALLY + .2byte EC_WORD_FINISH .2byte EC_WORD_FIRE - .2byte EC_WORD_FLASH_FIRE - .2byte EC_MOVE2(BLAZE_KICK) - .2byte EC_MOVE2(DRAGON_BREATH) - .2byte EC_MOVE2(FIRE_PUNCH) .2byte EC_MOVE2(FIRE_BLAST) + .2byte EC_MOVE2(FIRE_PUNCH) .2byte EC_MOVE2(FIRE_SPIN) - .2byte EC_POKEMON2(CYNDAQUIL) - .2byte EC_POKEMON(POOCHYENA) - .2byte EC_WORD_MOVIE - .2byte EC_MOVE(SELF_DESTRUCT) - .2byte EC_MOVE(SHADOW_PUNCH) - .2byte EC_MOVE2(FAINT_ATTACK) - .2byte EC_POKEMON(GLALIE) - .2byte EC_POKEMON2(FLAREON) + .2byte EC_WORD_FISHING + .2byte EC_MOVE(FISSURE) + .2byte EC_POKEMON2(FLAAFFY) + .2byte EC_MOVE(FLAIL) + .2byte EC_WORD_FLAME_BODY .2byte EC_MOVE(FLAME_WHEEL) .2byte EC_MOVE(FLAMETHROWER) - .2byte EC_WORD_FLAME_BODY - .2byte EC_POKEMON2(SLOWPOKE) - .2byte EC_POKEMON(TORCHIC) - .2byte EC_WORD_LIMBER - ec_duplicates 2 - .2byte EC_WORD_FLYING + .2byte EC_POKEMON2(FLAREON) + .2byte EC_MOVE2(FLASH) + .2byte EC_WORD_FLASH_FIRE + .2byte EC_WORD_FLATTEN + .2byte EC_MOVE(FLATTER) + .2byte EC_WORD_FLOWERS .2byte EC_MOVE(FLY) - .2byte EC_MOVE2(CURSE) - .2byte EC_WORD_ESCAPE - ec_duplicates 2 - .2byte EC_POKEMON(IGGLYBUFF) - .2byte EC_POKEMON2(IGGLYBUFF) - .2byte EC_MOVE2(WING_ATTACK) - .2byte EC_POKEMON(MAWILE) - .2byte EC_POKEMON(WHISMUR) - .2byte EC_WORD_FUFUFU - .2byte EC_MOVE(TORMENT) - .2byte EC_MOVE(WATER_SPOUT) - .2byte EC_POKEMON(CASTFORM) + .2byte EC_POKEMON(FLYGON) + .2byte EC_WORD_FLYING + .2byte EC_MOVE(FOCUS_ENERGY) + .2byte EC_MOVE(FOCUS_PUNCH) + .2byte EC_WORD_FOE + .2byte EC_MOVE(FOLLOW_ME) + .2byte EC_WORD_FOR + .2byte EC_WORD_FOR_NOW + .2byte EC_WORD_FORECAST + .2byte EC_MOVE2(FORESIGHT) + .2byte EC_WORD_FOREVER + .2byte EC_WORD_FORGET + .2byte EC_WORD_FORGETS + .2byte EC_WORD_FORGIVE .2byte EC_POKEMON2(FORRETRESS) - .2byte EC_WORD_AWAY - .2byte EC_WORD_CAMERA - .2byte EC_WORD_QUESTION - .2byte EC_WORD_MRS - .2byte EC_WORD_RELEASE .2byte EC_WORD_FRIDAY - .2byte EC_WORD_JOY .2byte EC_WORD_FRIEND - .2byte EC_POKEMON(ELECTRIKE) - .2byte EC_WORD_THINK - .2byte EC_MOVE(ICE_BALL) - .2byte EC_WORD_EARLIER - .2byte EC_WORD_SPRING - .2byte EC_WORD_EARLY_BIRD + .2byte EC_WORD_FROM + .2byte EC_WORD_FRONT .2byte EC_MOVE2(FRUSTRATION) - .2byte EC_WORD_DISAPPOINT - .2byte EC_MOVE(THRASH) - .2byte EC_WORD_FEELING - .2byte EC_POKEMON2(GROWLITHE) - .2byte EC_MOVE(SPARK) - .2byte EC_WORD_FOR - .2byte EC_WORD_TO_HER - .2byte EC_WORD_FOR_NOW - .2byte EC_WORD_TO_THEM - .2byte EC_WORD_TO_US - .2byte EC_WORD_TO_WHOM - .2byte EC_WORD_FEAR - .2byte EC_WORD_AWFULLY + .2byte EC_WORD_FUFUFU + .2byte EC_WORD_FULL + .2byte EC_WORD_FUNNY + .2byte EC_POKEMON2(FURRET) .2byte EC_MOVE2(FURY_ATTACK) - .2byte EC_MOVE(LOW_KICK) + .2byte EC_MOVE2(FURY_CUTTER) + .2byte EC_MOVE2(FURY_SWIPES) + .2byte EC_MOVE2(FUTURE_SIGHT) gEasyChatWordsByLetter_G: - .2byte EC_MOVE(YAWN) - .2byte EC_POKEMON2(RAPIDASH) - ec_duplicates 2 - .2byte EC_POKEMON(GYARADOS) - .2byte EC_POKEMON2(GYARADOS) - .2byte EC_WORD_GIVE - .2byte EC_WORD_USE - .2byte EC_WORD_USES - .2byte EC_POKEMON(TREECKO) - .2byte EC_MOVE2(CALM_MIND) - .2byte EC_WORD_COMMEMORATE - .2byte EC_MOVE(BIDE) - .2byte EC_WORD_DANGER - .2byte EC_WORD_VERSUS - .2byte EC_MOVE(REVERSAL) - .2byte EC_WORD_OPPOSITE - .2byte EC_WORD_FOE - .2byte EC_WORD_MYSTERY - .2byte EC_WORD_SECRET_BASE - .2byte EC_WORD_SECRET - .2byte EC_MOVE2(SECRET_POWER) - .2byte EC_WORD_GOING - .2byte EC_WORD_HEARING - .2byte EC_WORD_BELONGS_TO - .2byte EC_WORD_GOES - .2byte EC_POKEMON(SURSKIT) - .2byte EC_WORD_GHOST - .2byte EC_WORD_BORED - .2byte EC_WORD_MONEY - .2byte EC_WORD_LAY - .2byte EC_WORD_MEAN - .2byte EC_WORD_HOW - .2byte EC_WORD_AS - .2byte EC_WORD_APPROVED - .2byte EC_MOVE(RECOVER) + .2byte EC_WORD_GAME + .2byte EC_POKEMON(GARDEVOIR) + .2byte EC_POKEMON2(GASTLY) .2byte EC_POKEMON2(GENGAR) .2byte EC_WORD_GENIUS - .2byte EC_WORD_ENJOY - .2byte EC_WORD_ENJOYS - .2byte EC_WORD_THOSE_WERE - .2byte EC_MOVE(FISSURE) ec_duplicates 2 - .2byte EC_POKEMON(GRAVELER) - .2byte EC_POKEMON2(GRAVELER) + .2byte EC_POKEMON(GEODUDE) + .2byte EC_POKEMON2(GEODUDE) + .2byte EC_WORD_GET + .2byte EC_WORD_GETS + .2byte EC_WORD_GHOST + .2byte EC_WORD_GIDDY + .2byte EC_MOVE(GIGA_DRAIN) + .2byte EC_WORD_GIGGLE + .2byte EC_WORD_GIMME ec_duplicates 2 - .2byte EC_POKEMON(GOLEM) - .2byte EC_POKEMON2(GOLEM) - .2byte EC_MOVE2(SEISMIC_TOSS) - .2byte EC_POKEMON(LINOONE) - .2byte EC_WORD_WANNABE - .2byte EC_WORD_SMELL - .2byte EC_MOVE(SING) - .2byte EC_WORD_EVENT - .2byte EC_MOVE2(PRESENT) - .2byte EC_WORD_SKILL - .2byte EC_WORD_SKILLED - .2byte EC_WORD_SHOCKED - .2byte EC_WORD_WEAKENED - .2byte EC_WORD_SIBLINGS - .2byte EC_MOVE2(FORESIGHT) - .2byte EC_WORD_CONVERSATION - .2byte EC_WORD_ROCK - .2byte EC_WORD_YESTERDAY - .2byte EC_WORD_HEALTHY - .2byte EC_WORD_DID - .2byte EC_POKEMON(SCEPTILE) - .2byte EC_WORD_WIN - .2byte EC_WORD_IF_I_WIN - .2byte EC_WORD_WINS - .2byte EC_WORD_HABIT - .2byte EC_WORD_WON + .2byte EC_POKEMON(GIRAFARIG) + .2byte EC_POKEMON2(GIRAFARIG) + .2byte EC_WORD_GIRL + .2byte EC_WORD_GIVE .2byte EC_WORD_GIVE_ME - .2byte EC_WORD_GIMME + .2byte EC_WORD_GIVE_UP .2byte EC_WORD_GIVES - ec_duplicates 2 - .2byte EC_POKEMON(VILEPLUME) - .2byte EC_POKEMON2(VILEPLUME) - .2byte EC_WORD_POISON + .2byte EC_POKEMON(GLALIE) .2byte EC_MOVE2(GLARE) - .2byte EC_WORD_POISON_POINT - .2byte EC_MOVE2(POISON_POWDER) - .2byte EC_MOVE2(POISON_TAIL) - .2byte EC_MOVE2(POISON_STING) - .2byte EC_MOVE2(POISON_GAS) - .2byte EC_MOVE2(POISON_FANG) - .2byte EC_MOVE(GIGA_DRAIN) - .2byte EC_WORD_HAPPENING - .2byte EC_WORD_WENT + .2byte EC_POKEMON2(GLIGAR) ec_duplicates 2 - .2byte EC_POKEMON(GIRAFARIG) - .2byte EC_POKEMON2(GIRAFARIG) - .2byte EC_WORD_SMOOTH - .2byte EC_WORD_BELIEVE - .2byte EC_WORD_WHEN - .2byte EC_WORD_SLIDE - .2byte EC_WORD_SLIMY - .2byte EC_WORD_HAPPINESS - .2byte EC_WORD_HAPPY - .2byte EC_WORD_CONGRATS - .2byte EC_POKEMON2(CHARMANDER) - .2byte EC_POKEMON2(CHARIZARD) - .2byte EC_MOVE2(EMBER) - .2byte EC_POKEMON2(CHARMELEON) + .2byte EC_POKEMON(GLOOM) + .2byte EC_POKEMON2(GLOOM) + .2byte EC_WORD_GO + .2byte EC_WORD_GO_AHEAD + .2byte EC_WORD_GO_EASY + .2byte EC_WORD_GO_HOME + .2byte EC_WORD_GOES + .2byte EC_WORD_GOING ec_duplicates 2 .2byte EC_POKEMON(GOLBAT) .2byte EC_POKEMON2(GOLBAT) @@ -582,1316 +584,1310 @@ gEasyChatWordsByLetter_G: .2byte EC_POKEMON(GOLDEEN) .2byte EC_POKEMON2(GOLDEEN) ec_duplicates 2 - .2byte EC_POKEMON(SEAKING) - .2byte EC_POKEMON2(SEAKING) + .2byte EC_POKEMON(GOLDUCK) + .2byte EC_POKEMON2(GOLDUCK) + ec_duplicates 2 + .2byte EC_POKEMON(GOLEM) + .2byte EC_POKEMON2(GOLEM) + .2byte EC_WORD_GOOD + .2byte EC_WORD_GOOD_BYE + .2byte EC_POKEMON(GOREBYSS) + .2byte EC_WORD_GOT + .2byte EC_WORD_GOTCHA .2byte EC_WORD_GOURMET .2byte EC_WORD_GRAAAH .2byte EC_POKEMON2(GRANBULL) + .2byte EC_WORD_GRANDFATHER + .2byte EC_WORD_GRANDMOTHER + .2byte EC_WORD_GRASS .2byte EC_MOVE(GRASS_WHISTLE) - .2byte EC_POKEMON2(AIPOM) - .2byte EC_MOVE(SCARY_FACE) - .2byte EC_WORD_ANTICIPATION - .2byte EC_POKEMON(GRUMPIG) - .2byte EC_MOVE(SPITE) - .2byte EC_WORD_BIG + ec_duplicates 2 + .2byte EC_POKEMON(GRAVELER) + .2byte EC_POKEMON2(GRAVELER) .2byte EC_WORD_GREAT - .2byte EC_WORD_BLAZE - .2byte EC_WORD_GRANDMOTHER - .2byte EC_WORD_GRANDFATHER - .2byte EC_WORD_LAVISH + ec_duplicates 2 + .2byte EC_POKEMON(GRIMER) + .2byte EC_POKEMON2(GRIMER) .2byte EC_POKEMON(GROUDON) - .2byte EC_WORD_GWAH - .2byte EC_WORD_CAUSE + .2byte EC_WORD_GROUND .2byte EC_WORD_GROUP - .2byte EC_POKEMON(GARDEVOIR) + .2byte EC_POKEMON(GROVYLE) + .2byte EC_MOVE2(GROWL) + .2byte EC_POKEMON2(GROWLITHE) + .2byte EC_MOVE(GROWTH) + .2byte EC_MOVE(GRUDGE) + .2byte EC_POKEMON(GRUMPIG) + .2byte EC_WORD_GUARD .2byte EC_MOVE2(GUILLOTINE) - .2byte EC_WORD_1_HIT_KO_EXCL - .2byte EC_WORD_ALL_RIGHT - .2byte EC_WORD_HEARS + .2byte EC_POKEMON(GULPIN) + .2byte EC_MOVE(GUST) + .2byte EC_WORD_GUTS + .2byte EC_WORD_GUTSY + .2byte EC_WORD_GWAH .2byte EC_WORD_GWAHAHAHA + ec_duplicates 2 + .2byte EC_POKEMON(GYARADOS) + .2byte EC_POKEMON2(GYARADOS) gEasyChatWordsByLetter_H: - .2byte EC_WORD_WATER_ABSORB - .2byte EC_WORD_GOTCHA - .2byte EC_WORD_HAVE - .2byte EC_WORD_GOT - .2byte EC_WORD_HAVEN_T - .2byte EC_POKEMON2(SPEAROW) - .2byte EC_MOVE(HAIL) + .2byte EC_WORD_HABIT .2byte EC_WORD_HAH - .2byte EC_WORD_EH_QUES - .2byte EC_WORD_HEHE .2byte EC_WORD_HAHAHA - .2byte EC_WORD_EHEHE - .2byte EC_WORD_HELLO - .2byte EC_POKEMON(HARIYAMA) - .2byte EC_WORD_MATCH_UP + .2byte EC_MOVE(HAIL) + .2byte EC_WORD_HALL_OF_FAME + .2byte EC_WORD_HAPPENING + .2byte EC_WORD_HAPPILY + .2byte EC_WORD_HAPPINESS + .2byte EC_WORD_HAPPY + .2byte EC_WORD_HARD .2byte EC_MOVE(HARDEN) + .2byte EC_POKEMON(HARIYAMA) .2byte EC_WORD_HAS + .2byte EC_WORD_HASSLE + .2byte EC_POKEMON2(HAUNTER) + .2byte EC_WORD_HAVE + .2byte EC_WORD_HAVEN_T + .2byte EC_MOVE(HAZE) + .2byte EC_WORD_HE + .2byte EC_WORD_HE_S + .2byte EC_MOVE(HEADBUTT) + .2byte EC_MOVE(HEAL_BELL) + .2byte EC_WORD_HEALTHY + .2byte EC_WORD_HEAR + .2byte EC_WORD_HEARING + .2byte EC_WORD_HEARS + .2byte EC_WORD_HEART + .2byte EC_MOVE2(HEAT_WAVE) .2byte EC_WORD_HEH + .2byte EC_WORD_HEHE .2byte EC_WORD_HEHEHE - .2byte EC_MOVE2(REFRESH) - .2byte EC_WORD_HOME - .2byte EC_WORD_GO_HOME - .2byte EC_WORD_HOT - .2byte EC_POKEMON2(BLISSEY) + .2byte EC_WORD_HELLO + .2byte EC_MOVE2(HELPING_HAND) + .2byte EC_WORD_HER + .2byte EC_WORD_HERS + ec_duplicates 2 + .2byte EC_POKEMON(HERACROSS) + .2byte EC_POKEMON2(HERACROSS) + .2byte EC_WORD_HERE + .2byte EC_WORD_HERE_GOES + .2byte EC_WORD_HERE_I_COME + .2byte EC_WORD_HERE_IT_IS .2byte EC_WORD_HERO .2byte EC_WORD_HEROINE - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_FALL - .2byte EC_WORD_MR - .2byte EC_WORD_MAKING - .2byte EC_MOVE2(GROWL) - .2byte EC_WORD_TODAY - .2byte EC_WORD_SWARM .2byte EC_WORD_HEY .2byte EC_WORD_HEY_THERE .2byte EC_WORD_HEY_QUES - .2byte EC_WORD_HERE - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_HERE_IT_IS - .2byte EC_WORD_HERE_GOES - .2byte EC_WORD_MUFUFU - .2byte EC_MOVE(SKY_UPPERCUT) - .2byte EC_MOVE(SKY_ATTACK) - .2byte EC_WORD_REAR - .2byte EC_WORD_DOWN + .2byte EC_WORD_HI + .2byte EC_MOVE2(HI_JUMP_KICK) + .2byte EC_WORD_HIDDEN + .2byte EC_MOVE2(HIDDEN_POWER) + .2byte EC_WORD_HIGH + .2byte EC_WORD_HIGHS + .2byte EC_WORD_HIM .2byte EC_WORD_HIP_AND - .2byte EC_MOVE(OVERHEAT) - .2byte EC_MOVE2(HEAT_WAVE) + .2byte EC_WORD_HIS + .2byte EC_WORD_HIT + .2byte EC_POKEMON2(HITMONCHAN) + .2byte EC_POKEMON2(HITMONLEE) + .2byte EC_POKEMON2(HITMONTOP) .2byte EC_WORD_HIYAH .2byte EC_WORD_HMM - .2byte EC_WORD_HUMPH .2byte EC_POKEMON2(HO_OH) .2byte EC_WORD_HOBBY - .2byte EC_WORD_HIGH - .2byte EC_WORD_KIND - .2byte EC_WORD_HIGHS .2byte EC_WORD_HOHOHO - .2byte EC_WORD_HEART + .2byte EC_WORD_HOLIDAY + .2byte EC_WORD_HOME + .2byte EC_WORD_HOO_HAH .2byte EC_POKEMON2(HOOTHOOT) + .2byte EC_WORD_HOPELESS .2byte EC_POKEMON2(HOPPIP) - .2byte EC_WORD_LISTENING - .2byte EC_WORD_HEAR .2byte EC_MOVE2(HORN_ATTACK) .2byte EC_MOVE2(HORN_DRILL) - .2byte EC_POKEMON2(WEEDLE) - .2byte EC_MOVE(MEAN_LOOK) - .2byte EC_WORD_LISTENS - .2byte EC_MOVE2(STOCKPILE) - .2byte EC_POKEMON2(SKIPLOOM) - .2byte EC_WORD_PRETTY - .2byte EC_WORD_HOO_HAH + ec_duplicates 2 + .2byte EC_POKEMON(HORSEA) + .2byte EC_POKEMON2(HORSEA) + .2byte EC_WORD_HOT .2byte EC_POKEMON2(HOUNDOOM) .2byte EC_POKEMON2(HOUNDOUR) - .2byte EC_WORD_OOPS - .2byte EC_POKEMON(MUDKIP) + .2byte EC_WORD_HOW + .2byte EC_WORD_HOW_DO + .2byte EC_WORD_HOWEVER + .2byte EC_MOVE2(HOWL) + .2byte EC_WORD_HUGE_POWER + .2byte EC_WORD_HUH_QUES + .2byte EC_WORD_HUMPH + .2byte EC_WORD_HUNGRY + .2byte EC_POKEMON(HUNTAIL) + .2byte EC_WORD_HURRIED + .2byte EC_WORD_HUSTLE .2byte EC_MOVE2(HYDRO_PUMP) .2byte EC_WORD_HYPER .2byte EC_MOVE2(HYPER_BEAM) + .2byte EC_WORD_HYPER_CUTTER .2byte EC_MOVE2(HYPER_FANG) + .2byte EC_MOVE2(HYPER_VOICE) .2byte EC_POKEMON2(HYPNO) .2byte EC_MOVE(HYPNOSIS) gEasyChatWordsByLetter_I: - .2byte EC_POKEMON2(FEAROW) .2byte EC_WORD_I .2byte EC_WORD_I_AM - .2byte EC_WORD_I_VE_ARRIVED - .2byte EC_WORD_I_VE - .2byte EC_WORD_LET_ME_WIN + .2byte EC_WORD_I_CHOOSE_YOU .2byte EC_WORD_I_WAS - .2byte EC_POKEMON2(UNOWN) + .2byte EC_WORD_I_VE + .2byte EC_WORD_I_VE_ARRIVED + .2byte EC_WORD_ICE + .2byte EC_MOVE(ICE_BALL) + .2byte EC_MOVE2(ICE_BEAM) + .2byte EC_MOVE2(ICE_PUNCH) + .2byte EC_MOVE(ICY_WIND) .2byte EC_WORD_IDOL - .2byte EC_POKEMON2(QUILAVA) - .2byte EC_WORD_EEK - .2byte EC_WORD_IGNORANT - .2byte EC_WORD_HIM - .2byte EC_WORD_THEY - .2byte EC_WORD_HER - .2byte EC_WORD_MUCH_OBLIGED + .2byte EC_WORD_IF + .2byte EC_WORD_IF_I_LOSE + .2byte EC_WORD_IF_I_WIN ec_duplicates 2 - .2byte EC_POKEMON(CROBAT) - .2byte EC_POKEMON2(CROBAT) + .2byte EC_POKEMON(IGGLYBUFF) + .2byte EC_POKEMON2(IGGLYBUFF) + .2byte EC_WORD_IGNORANT + .2byte EC_WORD_ILLUMINATE .2byte EC_POKEMON(ILLUMISE) - .2byte EC_WORD_ALWAYS .2byte EC_WORD_IMMUNITY - .2byte EC_POKEMON2(FERALIGATR) + .2byte EC_WORD_IMPORTANT + .2byte EC_WORD_IMPOSSIBLE + .2byte EC_MOVE2(IMPRISON) .2byte EC_WORD_IN + .2byte EC_WORD_INCREASING + .2byte EC_WORD_INCREDIBLE .2byte EC_WORD_INFORMATION + .2byte EC_MOVE2(INGRAIN) + .2byte EC_WORD_INNER_FOCUS .2byte EC_WORD_INSIDE - .2byte EC_WORD_NATURAL_CURE .2byte EC_WORD_INSOMNIA - .2byte EC_MOVE2(MAGNITUDE) - .2byte EC_WORD_ANY - .2byte EC_WORD_SOMETIME - .2byte EC_WORD_SOMEHOW - .2byte EC_WORD_ANYWHERE - .2byte EC_WORD_AWESOME - .2byte EC_MOVE(WILL_O_WISP) - .2byte EC_MOVE2(DIZZY_PUNCH) - .2byte EC_POKEMON(WYNAUT) - .2byte EC_WORD_EATS + .2byte EC_WORD_INSTEAD + .2byte EC_WORD_INTIMIDATE + .2byte EC_WORD_INVINCIBLE + .2byte EC_MOVE2(IRON_DEFENSE) + .2byte EC_MOVE(IRON_TAIL) .2byte EC_WORD_IS + .2byte EC_WORD_IS_IT_QUES .2byte EC_WORD_ISN_T + .2byte EC_WORD_ISN_T_IT_QUES + .2byte EC_WORD_IT + .2byte EC_WORD_IT_S .2byte EC_WORD_ITEM + .2byte EC_POKEMON2(IVYSAUR) gEasyChatWordsByLetter_J: - .2byte EC_WORD_YES - .2byte EC_WORD_YAY - .2byte EC_WORD_YUP - .2byte EC_MOVE2(HOWL) - .2byte EC_WORD_HOWEVER - .2byte EC_WORD_EVER - .2byte EC_WORD_SOMEONE - .2byte EC_WORD_YO - .2byte EC_WORD_NOW - .2byte EC_WORD_YEEHAW_EXCL - .2byte EC_WORD_EXCITING + ec_duplicates 2 + .2byte EC_POKEMON(JIGGLYPUFF) + .2byte EC_POKEMON2(JIGGLYPUFF) .2byte EC_POKEMON(JIRACHI) - .2byte EC_WORD_WOWEE - .2byte EC_WORD_YAHOO - .2byte EC_POKEMON2(DEWGONG) - .2byte EC_WORD_YOUNG - .2byte EC_WORD_BOY - .2byte EC_POKEMON(COMBUSKEN) - .2byte EC_POKEMON2(SEEL) + .2byte EC_WORD_JOKING + .2byte EC_POKEMON2(JOLTEON) + .2byte EC_WORD_JOY .2byte EC_WORD_JUDGE + .2byte EC_MOVE2(JUMP_KICK) + .2byte EC_POKEMON2(JUMPLUFF) + .2byte EC_WORD_JUST + .2byte EC_POKEMON2(JYNX) gEasyChatWordsByLetter_K: .2byte EC_POKEMON2(KABUTO) .2byte EC_POKEMON2(KABUTOPS) ec_duplicates 2 .2byte EC_POKEMON(KADABRA) .2byte EC_POKEMON2(KADABRA) - .2byte EC_WORD_BUG - .2byte EC_WORD_COLD - .2byte EC_WORD_CAME - .2byte EC_WORD_FIGHTING - .2byte EC_WORD_BATTLE - .2byte EC_WORD_FIGHT - .2byte EC_WORD_BATTLE_ARMOR - .2byte EC_WORD_BATTLE_ROOM - .2byte EC_WORD_FAINTED + .2byte EC_POKEMON2(KAKUNA) .2byte EC_POKEMON2(KANGASKHAN) - .2byte EC_POKEMON(CARVANHA) - .2byte EC_WORD_CAN_WIN - .2byte EC_WORD_CAN_T - .2byte EC_POKEMON(BRELOOM) - .2byte EC_POKEMON2(HITMONTOP) - .2byte EC_POKEMON(LUDICOLO) .2byte EC_MOVE(KARATE_CHOP) - .2byte EC_WORD_DESTINY - .2byte EC_POKEMON2(TOTODILE) - ec_duplicates 2 - .2byte EC_POKEMON(MAGIKARP) - .2byte EC_POKEMON2(MAGIKARP) - .2byte EC_WORD_CARDS - .2byte EC_MOVE2(WATERFALL) - .2byte EC_WORD_DEPT_STORE .2byte EC_POKEMON(KECLEON) - .2byte EC_POKEMON2(PILOSWINE) - .2byte EC_WORD_NONE - .2byte EC_WORD_GIGGLE - .2byte EC_POKEMON2(HITMONLEE) - .2byte EC_WORD_TICKLISH + .2byte EC_WORD_KEEN_EYE .2byte EC_WORD_KID - .2byte EC_WORD_CHILDREN + .2byte EC_WORD_KIDDING + .2byte EC_WORD_KIND .2byte EC_WORD_KINDERGARTEN - .2byte EC_WORD_CHILD_S_PLAY - .2byte EC_POKEMON(BAGON) + .2byte EC_MOVE(KINESIS) + ec_duplicates 2 + .2byte EC_POKEMON(KINGDRA) + .2byte EC_POKEMON2(KINGDRA) .2byte EC_POKEMON2(KINGLER) .2byte EC_POKEMON(KIRLIA) - .2byte EC_MOVE2(VICE_GRIP) - .2byte EC_MOVE(BIND) - .2byte EC_WORD_THIN - .2byte EC_WORD_RANK - .2byte EC_WORD_SMALL - ec_duplicates 2 - .2byte EC_POKEMON(GEODUDE) - .2byte EC_POKEMON2(GEODUDE) - .2byte EC_WORD_AIR_LOCK - .2byte EC_MOVE(RAZOR_WIND) - .2byte EC_WORD_LIQUID_OOZE - .2byte EC_WORD_SMART - .2byte EC_WORD_SMARTNESS - .2byte EC_POKEMON(TRAPINCH) - .2byte EC_POKEMON(SHROOMISH) - .2byte EC_MOVE(CRUNCH) - .2byte EC_MOVE2(BONE_RUSH) - .2byte EC_MOVE2(BONE_CLUB) - .2byte EC_MOVE2(BONEMERANG) - .2byte EC_POKEMON2(BELLSPROUT) - .2byte EC_POKEMON2(MAROWAK) - ec_duplicates 2 - .2byte EC_POKEMON(WIGGLYTUFF) - .2byte EC_POKEMON2(WIGGLYTUFF) - .2byte EC_WORD_TIGHT - .2byte EC_POKEMON2(EXEGGUTOR) - .2byte EC_POKEMON2(KAKUNA) - .2byte EC_MOVE2(COMET_PUNCH) - .2byte EC_WORD_COME_ON - .2byte EC_WORD_COME - .2byte EC_WORD_COMPLETE - .2byte EC_MOVE2(MINIMIZE) - .2byte EC_MOVE2(CONFUSION) - .2byte EC_MOVE(CONFUSE_RAY) - .2byte EC_WORD_CAN - .2byte EC_WORD_COULDN_T - .2byte EC_WORD_COULD - .2byte EC_MOVE(COUNTER) - .2byte EC_WORD_INNER_FOCUS - .2byte EC_MOVE(HEADBUTT) - .2byte EC_WORD_FEVER - .2byte EC_MOVE(COSMIC_POWER) - .2byte EC_WORD_TREASURE - .2byte EC_MOVE(CRABHAMMER) - .2byte EC_POKEMON2(KRABBY) - .2byte EC_WORD_POWER + .2byte EC_MOVE2(KNOCK_OFF) + .2byte EC_WORD_KNOCKOUT + .2byte EC_WORD_KNOW + .2byte EC_WORD_KNOWS ec_duplicates 2 - .2byte EC_WORD_HUGE_POWER - .2byte EC_MOVE2(SUPERPOWER) - .2byte EC_MOVE2(HIDDEN_POWER) - .2byte EC_POKEMON(LOUDRED) - .2byte EC_POKEMON2(MURKROW) - .2byte EC_MOVE2(SCRATCH) - .2byte EC_MOVE2(FURY_SWIPES) - .2byte EC_POKEMON(EXPLOUD) - .2byte EC_POKEMON(CORPHISH) - .2byte EC_POKEMON(CRAWDAUNT) - .2byte EC_MOVE(SCREECH) - .2byte EC_MOVE(CROSS_CHOP) - .2byte EC_MOVE2(BULLET_SEED) - .2byte EC_POKEMON2(SMOOCHUM) + .2byte EC_POKEMON(KOFFING) + .2byte EC_POKEMON2(KOFFING) + .2byte EC_POKEMON2(KRABBY) + .2byte EC_WORD_KTHX_BYE .2byte EC_POKEMON(KYOGRE) gEasyChatWordsByLetter_L: - .2byte EC_WORD_SEE - .2byte EC_MOVE(CHARGE) - .2byte EC_WORD_STORE - .2byte EC_WORD_STORES - .2byte EC_POKEMON2(SLOWBRO) + .2byte EC_WORD_LACKING + .2byte EC_WORD_LACKS + .2byte EC_WORD_LADY + .2byte EC_POKEMON(LAIRON) .2byte EC_WORD_LALALA ec_duplicates 2 - .2byte EC_POKEMON(CHINCHOU) - .2byte EC_POKEMON2(CHINCHOU) - .2byte EC_WORD_WAIT - .2byte EC_WORD_BORING - ec_duplicates 2 .2byte EC_POKEMON(LANTURN) .2byte EC_POKEMON2(LANTURN) - .2byte EC_WORD_PUSHOVER .2byte EC_POKEMON2(LAPRAS) - .2byte EC_WORD_SOUNDPROOF .2byte EC_POKEMON2(LARVITAR) - .2byte EC_POKEMON2(SLOWKING) - .2byte EC_WORD_LET_S + .2byte EC_WORD_LAST + .2byte EC_WORD_LATE + .2byte EC_WORD_LATER .2byte EC_POKEMON(LATIAS) .2byte EC_POKEMON(LATIOS) - .2byte EC_WORD_WANDERING + .2byte EC_WORD_LAVISH + .2byte EC_WORD_LAY + .2byte EC_WORD_LEADER + .2byte EC_WORD_LEADERS .2byte EC_MOVE2(LEAF_BLADE) - .2byte EC_WORD_MOOD - .2byte EC_WORD_LOUSY - .2byte EC_WORD_NOISY - .2byte EC_MOVE(SACRED_FIRE) - .2byte EC_WORD_LUKEWARM - .2byte EC_POKEMON2(MOLTRES) - .2byte EC_WORD_LIFE - .2byte EC_WORD_LIVING - .2byte EC_WORD_THIRSTY - .2byte EC_WORD_TASTY + .2byte EC_WORD_LEARN .2byte EC_POKEMON2(LEDIAN) .2byte EC_POKEMON2(LEDYBA) + .2byte EC_MOVE(LEECH_LIFE) + .2byte EC_MOVE2(LEECH_SEED) + .2byte EC_MOVE2(LEER) + .2byte EC_WORD_LEFT .2byte EC_WORD_LEGEND - .2byte EC_MOVE2(MUDDY_WATER) - .2byte EC_MOVE2(MUD_SLAP) - .2byte EC_MOVE2(MUD_SHOT) - .2byte EC_MOVE2(MUD_SPORT) - .2byte EC_WORD_TEACH - .2byte EC_WORD_TEACHER - .2byte EC_WORD_TEACHES - .2byte EC_WORD_EASY - .2byte EC_MOVE(PAIN_SPLIT) - ec_duplicates 2 - .2byte EC_WORD_LEADER - .2byte EC_WORD_LEADERS - .2byte EC_WORD_CLASS - ec_duplicates 2 - .2byte EC_POKEMON(ELECTRODE) - .2byte EC_POKEMON2(ELECTRODE) - .2byte EC_POKEMON(CLAYDOL) - .2byte EC_WORD_LEARN - .2byte EC_WORD_STUDY - .2byte EC_POKEMON(SLAKING) - .2byte EC_WORD_LAST - .2byte EC_WORD_FINAL - .2byte EC_WORD_WINNER + .2byte EC_WORD_LESS + .2byte EC_WORD_LESSONS + .2byte EC_WORD_LET_ME_WIN + .2byte EC_WORD_LET_S + .2byte EC_WORD_LETTER .2byte EC_WORD_LEVEL - .2byte EC_POKEMON(FLYGON) - .2byte EC_WORD_KNOCKOUT + .2byte EC_WORD_LEVITATE + .2byte EC_MOVE(LICK) + .2byte EC_POKEMON2(LICKITUNG) + .2byte EC_WORD_LIE + .2byte EC_WORD_LIFE .2byte EC_MOVE2(LIGHT_SCREEN) - .2byte EC_POKEMON(LUVDISC) + .2byte EC_WORD_LIGHTNINGROD + .2byte EC_WORD_LIKE + .2byte EC_WORD_LIKELY_TO + .2byte EC_WORD_LIKES .2byte EC_POKEMON(LILEEP) + .2byte EC_WORD_LIMBER .2byte EC_WORD_LINK - .2byte EC_WORD_LEFT - .2byte EC_WORD_PRAISE - .2byte EC_MOVE(SWEET_SCENT) - .2byte EC_POKEMON(BLAZIKEN) + .2byte EC_POKEMON(LINOONE) + .2byte EC_WORD_LIQUID_OOZE + .2byte EC_WORD_LISTEN + .2byte EC_WORD_LISTENING + .2byte EC_WORD_LISTENS + .2byte EC_WORD_LIVING + .2byte EC_MOVE2(LOCK_ON) .2byte EC_WORD_LOCOMOTIVE + .2byte EC_WORD_LOL + .2byte EC_WORD_LOLLING .2byte EC_POKEMON(LOMBRE) - .2byte EC_POKEMON2(BAYLEEF) - .2byte EC_WORD_GO + .2byte EC_WORD_LONESOME + .2byte EC_WORD_LOOK + .2byte EC_WORD_LOOKS + .2byte EC_WORD_LOSE .2byte EC_WORD_LOSER + .2byte EC_WORD_LOSING + .2byte EC_WORD_LOSS + .2byte EC_WORD_LOST .2byte EC_POKEMON(LOTAD) - .2byte EC_MOVE(AEROBLAST) - .2byte EC_WORD_LIE + .2byte EC_POKEMON(LOUDRED) + .2byte EC_WORD_LOUSY + .2byte EC_MOVE(LOVELY_KISS) + .2byte EC_WORD_LOVEY_DOVEY + .2byte EC_WORD_LOW + .2byte EC_MOVE(LOW_KICK) + .2byte EC_WORD_LOWS + .2byte EC_POKEMON(LUDICOLO) .2byte EC_POKEMON2(LUGIA) - .2byte EC_WORD_LOLLING + .2byte EC_WORD_LUKEWARM .2byte EC_POKEMON(LUNATONE) - .2byte EC_WORD_FUNNY + .2byte EC_MOVE2(LUSTER_PURGE) + .2byte EC_POKEMON(LUVDISC) gEasyChatWordsByLetter_M: - .2byte EC_WORD_DO - .2byte EC_WORD_MAKE - ec_duplicates 2 - .2byte EC_POKEMON(MACHOP) - .2byte EC_POKEMON2(MACHOP) + .2byte EC_MOVE2(MACH_PUNCH) ec_duplicates 2 .2byte EC_POKEMON(MACHAMP) .2byte EC_POKEMON2(MACHAMP) - .2byte EC_WORD_DOESN_T - .2byte EC_WORD_GIRL + .2byte EC_WORD_MACHINE + ec_duplicates 2 + .2byte EC_POKEMON(MACHOKE) + .2byte EC_POKEMON2(MACHOKE) + ec_duplicates 2 + .2byte EC_POKEMON(MACHOP) + .2byte EC_POKEMON2(MACHOP) .2byte EC_WORD_MAGAZINE .2byte EC_POKEMON2(MAGBY) ec_duplicates 2 .2byte EC_POKEMON(MAGCARGO) .2byte EC_POKEMON2(MAGCARGO) - .2byte EC_WORD_HUNGRY .2byte EC_MOVE2(MAGIC_COAT) + .2byte EC_MOVE2(MAGICAL_LEAF) + ec_duplicates 2 + .2byte EC_POKEMON(MAGIKARP) + .2byte EC_POKEMON2(MAGIKARP) .2byte EC_WORD_MAGMA_ARMOR .2byte EC_POKEMON2(MAGMAR) - .2byte EC_POKEMON(MIGHTYENA) - .2byte EC_WORD_MAGNET_PULL ec_duplicates 2 .2byte EC_POKEMON(MAGNEMITE) .2byte EC_POKEMON2(MAGNEMITE) + .2byte EC_WORD_MAGNET_PULL ec_duplicates 2 .2byte EC_POKEMON(MAGNETON) .2byte EC_POKEMON2(MAGNETON) + .2byte EC_MOVE2(MAGNITUDE) + .2byte EC_WORD_MAIL + .2byte EC_WORD_MAKE + .2byte EC_WORD_MAKING .2byte EC_POKEMON(MAKUHITA) - .2byte EC_WORD_VORACIOUS .2byte EC_WORD_MAN + .2byte EC_POKEMON(MANECTRIC) + .2byte EC_POKEMON2(MANKEY) .2byte EC_POKEMON2(MANTINE) + .2byte EC_POKEMON2(MAREEP) ec_duplicates 2 .2byte EC_POKEMON(MARILL) .2byte EC_POKEMON2(MARILL) - .2byte EC_WORD_MACHINE - ec_duplicates 2 - .2byte EC_POKEMON(MACHOKE) - .2byte EC_POKEMON2(MACHOKE) + .2byte EC_POKEMON2(MAROWAK) + .2byte EC_POKEMON(MARSHTOMP) + .2byte EC_WORD_MARVEL_SCALE .2byte EC_POKEMON(MASQUERAIN) - .2byte EC_MOVE2(SLUDGE_BOMB) - .2byte EC_POKEMON2(MEOWTH) + .2byte EC_WORD_MASTER + .2byte EC_WORD_MATCH + .2byte EC_WORD_MATCH_UP + .2byte EC_POKEMON(MAWILE) + .2byte EC_WORD_MAYBE .2byte EC_WORD_MC + .2byte EC_WORD_ME + .2byte EC_WORD_MEAN + .2byte EC_MOVE(MEAN_LOOK) .2byte EC_POKEMON(MEDICHAM) .2byte EC_MOVE2(MEDITATE) .2byte EC_POKEMON(MEDITITE) + .2byte EC_WORD_MEET + .2byte EC_WORD_MEET_YOU + .2byte EC_WORD_MEETS .2byte EC_WORD_MEGA - .2byte EC_WORD_HAPPILY - .2byte EC_MOVE2(MEGA_PUNCH) + .2byte EC_MOVE2(MEGA_DRAIN) .2byte EC_MOVE2(MEGA_KICK) + .2byte EC_MOVE2(MEGA_PUNCH) + .2byte EC_MOVE2(MEGAHORN) .2byte EC_POKEMON2(MEGANIUM) - .2byte EC_MOVE2(MEGA_DRAIN) - .2byte EC_WORD_MORE - .2byte EC_WORD_MY - .2byte EC_WORD_WHO_WAS - .2byte EC_WORD_OH_DEAR - .2byte EC_WORD_MASTER .2byte EC_MOVE(MEMENTO) - .2byte EC_POKEMON2(MANKEY) - .2byte EC_WORD_PURE_POWER + .2byte EC_POKEMON2(MEOWTH) + .2byte EC_WORD_MESSAGE .2byte EC_POKEMON(METAGROSS) .2byte EC_MOVE2(METAL_CLAW) .2byte EC_MOVE(METAL_SOUND) .2byte EC_POKEMON(METANG) - .2byte EC_MOVE(WEATHER_BALL) + .2byte EC_POKEMON2(METAPOD) + .2byte EC_MOVE(METEOR_MASH) .2byte EC_MOVE2(METRONOME) .2byte EC_POKEMON2(MEW) .2byte EC_POKEMON2(MEWTWO) - .2byte EC_WORD_ME - .2byte EC_WORD_BADLY - .2byte EC_WORD_SHOULD - .2byte EC_WORD_RENTAL + .2byte EC_POKEMON(MIGHTYENA) .2byte EC_MOVE2(MILK_DRINK) .2byte EC_POKEMON(MILOTIC) .2byte EC_POKEMON2(MILTANK) .2byte EC_MOVE2(MIMIC) + .2byte EC_MOVE(MIND_READER) + .2byte EC_MOVE2(MINIMIZE) .2byte EC_POKEMON(MINUN) .2byte EC_WORD_MINUS - .2byte EC_WORD_MYSELF - .2byte EC_WORD_WITH - .2byte EC_WORD_PICKUP - .2byte EC_WORD_OVERWHELMING - .2byte EC_WORD_MESSAGE - .2byte EC_WORD_WEDNESDAY - .2byte EC_WORD_BLEND + .2byte EC_MOVE2(MIRROR_COAT) + .2byte EC_MOVE(MIRROR_MOVE) + .2byte EC_POKEMON2(MISDREAVUS) + .2byte EC_WORD_MISHEARD + .2byte EC_WORD_MISS + .2byte EC_MOVE(MIST) + .2byte EC_MOVE2(MIST_BALL) + .2byte EC_WORD_MISTAKE .2byte EC_WORD_MMM - .2byte EC_WORD_WANT - .2byte EC_WORD_FASHION + .2byte EC_WORD_MODE .2byte EC_WORD_MODERN - .2byte EC_POKEMON2(SUDOWOODO) - .2byte EC_MOVE2(FAKE_OUT) - .2byte EC_WORD_CURRENT + .2byte EC_POKEMON2(MOLTRES) + .2byte EC_WORD_MOMENTUM + .2byte EC_WORD_MONDAY + .2byte EC_WORD_MONEY .2byte EC_WORD_MONTH + .2byte EC_WORD_MOOD .2byte EC_MOVE2(MOONLIGHT) - .2byte EC_WORD_MONDAY - .2byte EC_POKEMON(MARSHTOMP) + .2byte EC_WORD_MORE .2byte EC_WORD_MORNING .2byte EC_MOVE(MORNING_SUN) - .2byte EC_POKEMON2(QUAGSIRE) - .2byte EC_WORD_TIRED - .2byte EC_WORD_USELESS - .2byte EC_WORD_VITAL_SPIRIT - .2byte EC_POKEMON(VIGOROTH) - .2byte EC_POKEMON2(SHELLDER) - .2byte EC_WORD_MUSIC - .2byte EC_WORD_MUST_BE - .2byte EC_WORD_PATTERN - .2byte EC_WORD_GUTSY .2byte EC_WORD_MOTHER + .2byte EC_WORD_MOVE + .2byte EC_WORD_MOVIE + .2byte EC_WORD_MR + .2byte EC_POKEMON2(MR_MIME) + .2byte EC_WORD_MRS + .2byte EC_WORD_MUCH + .2byte EC_WORD_MUCH_OBLIGED + .2byte EC_MOVE2(MUD_SHOT) + .2byte EC_MOVE2(MUD_SPORT) + .2byte EC_MOVE2(MUD_SLAP) + .2byte EC_MOVE2(MUDDY_WATER) + .2byte EC_POKEMON(MUDKIP) + .2byte EC_WORD_MUFUFU ec_duplicates 2 - .2byte EC_POKEMON(ODDISH) - .2byte EC_POKEMON2(ODDISH) + .2byte EC_POKEMON(MUK) + .2byte EC_POKEMON2(MUK) + .2byte EC_POKEMON2(MURKROW) + .2byte EC_WORD_MUSIC + .2byte EC_WORD_MUST_BE + .2byte EC_WORD_MY + .2byte EC_WORD_MYSELF + .2byte EC_WORD_MYSTERY gEasyChatWordsByLetter_N: - .2byte EC_WORD_AFTER - .2byte EC_MOVE(SKETCH) - .2byte EC_MOVE(GRUDGE) - .2byte EC_WORD_NEXT - .2byte EC_WORD_NIGHT - .2byte EC_POKEMON2(UMBREON) - .2byte EC_MOVE(NIGHTMARE) - .2byte EC_MOVE2(NIGHT_SHADE) - .2byte EC_MOVE2(PIN_MISSILE) - .2byte EC_WORD_NEAR - .2byte EC_WORD_CLOSE - .2byte EC_WORD_DIET .2byte EC_WORD_NAME - .2byte EC_WORD_SWEETS - .2byte EC_POKEMON(NOSEPASS) - .2byte EC_MOVE2(WATER_SPORT) + .2byte EC_WORD_NAP ec_duplicates 2 .2byte EC_POKEMON(NATU) .2byte EC_POKEMON2(NATU) - .2byte EC_MOVE(NATURE_POWER) .2byte EC_WORD_NATURAL - .2byte EC_WORD_CANCEL - .2byte EC_MOVE2(MIST_BALL) - .2byte EC_WORD_BESIDE - .2byte EC_POKEMON2(GASTLY) + .2byte EC_WORD_NATURAL_CURE + .2byte EC_WORD_NATURALLY + .2byte EC_WORD_NATURE + .2byte EC_MOVE(NATURE_POWER) + .2byte EC_WORD_NEAR + .2byte EC_WORD_NEARLY + .2byte EC_WORD_NEED + .2byte EC_MOVE2(NEEDLE_ARM) .2byte EC_WORD_NEGATIVE - .2byte EC_WORD_NO - .2byte EC_WORD_NICE + .2byte EC_WORD_NEVER + .2byte EC_WORD_NEW .2byte EC_WORD_NEWS - .2byte EC_WORD_CLEAR_BODY - .2byte EC_WORD_DON_T - .2byte EC_WORD_DIDN_T - .2byte EC_WORD_DISLIKE - .2byte EC_WORD_NOT - .2byte EC_WORD_NOT_VERY - .2byte EC_WORD_ISN_T_IT_QUES - .2byte EC_WORD_NOTHING - .2byte EC_WORD_NAP + .2byte EC_WORD_NEXT + .2byte EC_WORD_NICE .2byte EC_POKEMON2(NIDOKING) .2byte EC_POKEMON2(NIDOQUEEN) .2byte EC_POKEMON2(NIDORAN_F) .2byte EC_POKEMON2(NIDORAN_M) .2byte EC_POKEMON2(NIDORINA) .2byte EC_POKEMON2(NIDORINO) - .2byte EC_WORD_NEVER - .2byte EC_WORD_LOW - .2byte EC_WORD_DRIZZLE - .2byte EC_MOVE2(NEEDLE_ARM) - .2byte EC_WORD_TAKE_THAT + .2byte EC_WORD_NIGHT + .2byte EC_MOVE2(NIGHT_SHADE) + .2byte EC_MOVE(NIGHTMARE) + .2byte EC_WORD_NIGHTTIME .2byte EC_POKEMON(NINCADA) + ec_duplicates 2 + .2byte EC_POKEMON(NINETALES) + .2byte EC_POKEMON2(NINETALES) .2byte EC_POKEMON(NINJASK) - .2byte EC_POKEMON(SHEDINJA) - .2byte EC_WORD_NOPE - .2byte EC_WORD_TOTALLY - .2byte EC_WORD_THAT_S - .2byte EC_POKEMON2(HITMONCHAN) + .2byte EC_WORD_NITWIT + .2byte EC_WORD_NO + .2byte EC_WORD_NO_MATCH + .2byte EC_WORD_NO_1 .2byte EC_POKEMON2(NOCTOWL) - .2byte EC_POKEMON(CACTURNE) + .2byte EC_WORD_NOISY .2byte EC_WORD_NON_STOP - .2byte EC_WORD_YET + .2byte EC_WORD_NONE + .2byte EC_WORD_NOPE .2byte EC_WORD_NORMAL - .2byte EC_WORD_OVERGROW - .2byte EC_WORD_MARVEL_SCALE - .2byte EC_MOVE(ENDEAVOR) - .2byte EC_WORD_NO_1 - .2byte EC_WORD_WELL_THEN - .2byte EC_WORD_ONLY + .2byte EC_POKEMON(NOSEPASS) + .2byte EC_WORD_NOT + .2byte EC_WORD_NOT_VERY + .2byte EC_WORD_NOTHING + .2byte EC_WORD_NOW + .2byte EC_POKEMON(NUMEL) + .2byte EC_POKEMON(NUZLEAF) gEasyChatWordsByLetter_O: - .2byte EC_WORD_OK_QUES - .2byte EC_WORD_UP - .2byte EC_WORD_ABOVE - .2byte EC_WORD_ALTHOUGH + .2byte EC_WORD_OBLIVIOUS .2byte EC_MOVE(OCTAZOOKA) .2byte EC_POKEMON2(OCTILLERY) - .2byte EC_WORD_OR + ec_duplicates 2 + .2byte EC_POKEMON(ODDISH) + .2byte EC_POKEMON2(ODDISH) + .2byte EC_MOVE(ODOR_SLEUTH) + .2byte EC_WORD_OF + .2byte EC_WORD_OFF .2byte EC_WORD_OFFENSIVE .2byte EC_WORD_OH - .2byte EC_WORD_UH_OH + .2byte EC_WORD_OH_DEAR .2byte EC_WORD_OH_YEAH + .2byte EC_WORD_OH_KAY .2byte EC_WORD_OH_QUES - .2byte EC_WORD_WITHOUT + .2byte EC_WORD_OI .2byte EC_WORD_OI_OI_OI - .2byte EC_WORD_OH_KAY + .2byte EC_WORD_OK_QUES + .2byte EC_WORD_OKAY .2byte EC_WORD_OLD - .2byte EC_POKEMON2(VENOMOTH) + .2byte EC_WORD_OLDEN + .2byte EC_POKEMON2(OMANYTE) + .2byte EC_POKEMON2(OMASTAR) + .2byte EC_WORD_ON + .2byte EC_WORD_ONCE .2byte EC_POKEMON2(ONIX) - .2byte EC_WORD_UNCLE - .2byte EC_WORD_HOPELESS - .2byte EC_WORD_WHOAH - .2byte EC_WORD_PLACE - .2byte EC_POKEMON2(EXEGGCUTE) + .2byte EC_WORD_ONLY + .2byte EC_WORD_OOPS + .2byte EC_WORD_OPPONENT + .2byte EC_WORD_OPPOSITE + .2byte EC_WORD_OR + .2byte EC_WORD_OTHER + .2byte EC_WORD_OUR + .2byte EC_WORD_OUT + .2byte EC_MOVE(OUTRAGE) + .2byte EC_WORD_OUTSIDE + .2byte EC_WORD_OVER + .2byte EC_WORD_OVERDO + .2byte EC_WORD_OVERGROW + .2byte EC_MOVE(OVERHEAT) + .2byte EC_WORD_OVERWHELMING + .2byte EC_WORD_OWN + .2byte EC_WORD_OWN_TEMPO gEasyChatWordsByLetter_P: - .2byte EC_POKEMON(CHIMECHO) - .2byte EC_POKEMON(SPINDA) - .2byte EC_POKEMON(CASCOON) - .2byte EC_POKEMON2(MR_MIME) - ec_duplicates 2 - .2byte EC_POKEMON(SKARMORY) - .2byte EC_POKEMON2(SKARMORY) - .2byte EC_WORD_SHELL_ARMOR - .2byte EC_MOVE(WITHDRAW) - .2byte EC_POKEMON(BEAUTIFLY) - .2byte EC_POKEMON2(JUMPLUFF) + .2byte EC_MOVE(PAIN_SPLIT) .2byte EC_POKEMON2(PARAS) .2byte EC_POKEMON2(PARASECT) .2byte EC_WORD_PARDON - .2byte EC_WORD_MATCH + .2byte EC_WORD_PARENT .2byte EC_WORD_PARTNER .2byte EC_WORD_PARTY + .2byte EC_WORD_PATTERN + .2byte EC_MOVE2(PAY_DAY) .2byte EC_WORD_PC + .2byte EC_MOVE2(PECK) .2byte EC_POKEMON(PELIPPER) .2byte EC_WORD_PERFECT .2byte EC_WORD_PERFECTION - .2byte EC_POKEMON(CLAMPERL) + .2byte EC_MOVE2(PERISH_SONG) + .2byte EC_POKEMON2(PERSIAN) .2byte EC_WORD_PERSON - .2byte EC_WORD_GRASS - .2byte EC_WORD_CHORES - .2byte EC_MOVE2(POUND) + .2byte EC_MOVE2(PETAL_DANCE) ec_duplicates 2 .2byte EC_POKEMON(PHANPY) .2byte EC_POKEMON2(PHANPY) + .2byte EC_WORD_PHONE ec_duplicates 2 .2byte EC_POKEMON(PICHU) .2byte EC_POKEMON2(PICHU) - .2byte EC_POKEMON2(CLEFAIRY) - .2byte EC_POKEMON2(CLEFFA) + .2byte EC_WORD_PICKUP + .2byte EC_POKEMON2(PIDGEOT) + .2byte EC_POKEMON2(PIDGEOTTO) + .2byte EC_POKEMON2(PIDGEY) ec_duplicates 2 .2byte EC_POKEMON(PIKACHU) .2byte EC_POKEMON2(PIKACHU) - .2byte EC_MOVE(SPORE) + .2byte EC_POKEMON2(PILOSWINE) + .2byte EC_MOVE2(PIN_MISSILE) + .2byte EC_POKEMON2(PINECO) ec_duplicates 2 .2byte EC_POKEMON(PINSIR) .2byte EC_POKEMON2(PINSIR) - .2byte EC_POKEMON2(CLEFABLE) - .2byte EC_MOVE2(SPLASH) - .2byte EC_WORD_CHAT + .2byte EC_WORD_PKRS + .2byte EC_WORD_PLACE + .2byte EC_WORD_PLANS + .2byte EC_WORD_PLAY + .2byte EC_WORD_PLAYED + .2byte EC_WORD_PLAYS + .2byte EC_WORD_PLEASE .2byte EC_WORD_PLUS .2byte EC_WORD_PLUSH_DOLL .2byte EC_POKEMON(PLUSLE) + .2byte EC_WORD_POINTS + .2byte EC_WORD_POISON + .2byte EC_MOVE2(POISON_FANG) + .2byte EC_MOVE2(POISON_GAS) + .2byte EC_WORD_POISON_POINT + .2byte EC_MOVE2(POISON_STING) + .2byte EC_MOVE2(POISON_TAIL) + .2byte EC_MOVE2(POISON_POWDER) + .2byte EC_WORD_POKEBLOCK .2byte EC_WORD_POKEDEX .2byte EC_WORD_POKEMON .2byte EC_WORD_POKENAV - .2byte EC_WORD_POKEBLOCK - .2byte EC_WORD_PKRS + .2byte EC_POKEMON2(POLITOED) + .2byte EC_POKEMON2(POLIWAG) + .2byte EC_POKEMON2(POLIWHIRL) + .2byte EC_POKEMON2(POLIWRATH) .2byte EC_POKEMON2(PONYTA) - .2byte EC_WORD_NEW + .2byte EC_POKEMON(POOCHYENA) .2byte EC_WORD_POPULAR - .2byte EC_POKEMON2(FARFETCHD) .2byte EC_POKEMON2(PORYGON) .2byte EC_POKEMON2(PORYGON2) - .2byte EC_WORD_MAIL - .2byte EC_POKEMON2(SHUCKLE) - .2byte EC_MOVE(FOCUS_PUNCH) - .2byte EC_WORD_FORECAST - .2byte EC_MOVE2(BULK_UP) - .2byte EC_MOVE2(BEAT_UP) - .2byte EC_WORD_SNORT - .2byte EC_POKEMON2(ESPEON) - .2byte EC_WORD_PSYCHIC + .2byte EC_MOVE2(POUND) + .2byte EC_MOVE(POWDER_SNOW) + .2byte EC_WORD_POWER + .2byte EC_WORD_PRAISE + .2byte EC_WORD_PREPOSTEROUS + .2byte EC_MOVE2(PRESENT) + .2byte EC_WORD_PRESSURE + .2byte EC_WORD_PRETEND + .2byte EC_WORD_PRETTY + .2byte EC_POKEMON2(PRIMEAPE) + .2byte EC_WORD_PROBABLY + .2byte EC_WORD_PROMISE + .2byte EC_MOVE2(PROTECT) + .2byte EC_MOVE(PSYBEAM) .2byte EC_MOVE(PSYCH_UP) + ec_duplicates 2 + .2byte EC_WORD_PSYCHIC .2byte EC_MOVE(PSYCHIC) - .2byte EC_MOVE(KINESIS) - .2byte EC_MOVE(PSYBEAM) - .2byte EC_MOVE(PSYWAVE) - .2byte EC_WORD_SHIELD_DUST - .2byte EC_POKEMON(DUSTOX) - .2byte EC_WORD_WHITE_SMOKE - .2byte EC_MOVE(POWDER_SNOW) ec_duplicates 2 - .2byte EC_POKEMON(JIGGLYPUFF) - .2byte EC_POKEMON2(JIGGLYPUFF) - .2byte EC_WORD_POINTS + .2byte EC_POKEMON(PSYDUCK) + .2byte EC_POKEMON2(PSYDUCK) + .2byte EC_MOVE(PSYWAVE) .2byte EC_POKEMON2(PUPITAR) - .2byte EC_POKEMON(BALTOY) + .2byte EC_WORD_PURE_POWER + .2byte EC_MOVE(PURSUIT) + .2byte EC_WORD_PUSHOVER gEasyChatWordsByLetter_Q: - .2byte EC_POKEMON2(POLIWRATH) - .2byte EC_POKEMON2(POLIWAG) - .2byte EC_POKEMON2(POLIWHIRL) - .2byte EC_POKEMON2(POLITOED) - .2byte EC_POKEMON2(SWINUB) - .2byte EC_POKEMON(TORKOAL) + .2byte EC_POKEMON2(QUAGSIRE) + .2byte EC_WORD_QUESTION + .2byte EC_MOVE2(QUICK_ATTACK) + .2byte EC_POKEMON2(QUILAVA) + .2byte EC_WORD_QUITE + .2byte EC_POKEMON2(QWILFISH) gEasyChatWordsByLetter_R: - .2byte EC_POKEMON2(TYROGUE) .2byte EC_WORD_RADIO + .2byte EC_MOVE(RAGE) ec_duplicates 2 .2byte EC_POKEMON(RAICHU) .2byte EC_POKEMON2(RAICHU) .2byte EC_POKEMON2(RAIKOU) - .2byte EC_MOVE2(VINE_WHIP) - .2byte EC_POKEMON2(PRIMEAPE) - .2byte EC_MOVE(RAGE) - .2byte EC_MOVE2(RAZOR_LEAF) - .2byte EC_WORD_RIPPED - .2byte EC_POKEMON2(RATTATA) + .2byte EC_MOVE(RAIN_DANCE) + .2byte EC_WORD_RAIN_DISH + .2byte EC_POKEMON(RALTS) + .2byte EC_WORD_RANK + .2byte EC_MOVE(RAPID_SPIN) + .2byte EC_POKEMON2(RAPIDASH) + .2byte EC_WORD_RARE + .2byte EC_WORD_RATHER .2byte EC_POKEMON2(RATICATE) - .2byte EC_MOVE2(THIEF) - .2byte EC_MOVE(SMOKESCREEN) - .2byte EC_WORD_ROUGH_SKIN - .2byte EC_POKEMON2(CATERPIE) + .2byte EC_POKEMON2(RATTATA) .2byte EC_POKEMON(RAYQUAZA) - .2byte EC_MOVE2(HELPING_HAND) - .2byte EC_WORD_RIGHT - .2byte EC_WORD_TALKING - .2byte EC_WORD_TALK + .2byte EC_MOVE2(RAZOR_LEAF) + .2byte EC_MOVE(RAZOR_WIND) + .2byte EC_WORD_READY + .2byte EC_WORD_REALLY + .2byte EC_WORD_REAR + .2byte EC_WORD_RECEIVED + .2byte EC_WORD_RECOMMEND + .2byte EC_MOVE(RECOVER) + .2byte EC_MOVE2(RECYCLE) .2byte EC_MOVE2(REFLECT) - .2byte EC_WORD_RULE - .2byte EC_WORD_RAIN_DISH - .2byte EC_MOVE(RAIN_DANCE) + .2byte EC_MOVE2(REFRESH) + .2byte EC_WORD_REFRESHING + .2byte EC_WORD_REFUSE .2byte EC_POKEMON(REGICE) .2byte EC_POKEMON(REGIROCK) .2byte EC_POKEMON(REGISTEEL) - .2byte EC_WORD_ENOUGH - .2byte EC_WORD_TRAVEL - .2byte EC_POKEMON2(SNORLAX) + .2byte EC_WORD_REJECT + .2byte EC_WORD_RELEASE .2byte EC_POKEMON(RELICANTH) .2byte EC_POKEMON2(REMORAID) - .2byte EC_WORD_RUN - .2byte EC_WORD_RUNS - .2byte EC_POKEMON(GROVYLE) - .2byte EC_WORD_CONCEDE - .2byte EC_POKEMON2(EKANS) - .2byte EC_WORD_CORRECT - .2byte EC_WORD_AGREE - .2byte EC_MOVE(SMELLING_SALT) + .2byte EC_WORD_RENTAL + .2byte EC_MOVE2(REST) + .2byte EC_WORD_RESUSCITATE + .2byte EC_MOVE(RETURN) + .2byte EC_MOVE2(REVENGE) + .2byte EC_MOVE(REVERSAL) + ec_duplicates 2 + .2byte EC_POKEMON(RHYDON) + .2byte EC_POKEMON2(RHYDON) ec_duplicates 2 .2byte EC_POKEMON(RHYHORN) .2byte EC_POKEMON2(RHYHORN) - .2byte EC_MOVE(DOUBLE_EDGE) + .2byte EC_WORD_RIBBON + .2byte EC_WORD_RICKETY + .2byte EC_WORD_RIGHT + .2byte EC_WORD_RIPPED .2byte EC_WORD_RIVAL - ec_duplicates 2 - .2byte EC_POKEMON(RHYDON) - .2byte EC_POKEMON2(RHYDON) - .2byte EC_WORD_STURDY - .2byte EC_WORD_SHADY + .2byte EC_MOVE2(ROAR) + .2byte EC_WORD_ROCK + .2byte EC_MOVE2(ROCK_BLAST) + .2byte EC_WORD_ROCK_HEAD + .2byte EC_MOVE(ROCK_SLIDE) + .2byte EC_MOVE(ROCK_SMASH) + .2byte EC_MOVE(ROCK_THROW) + .2byte EC_MOVE(ROCK_TOMB) + .2byte EC_WORD_ROCK_SOLID .2byte EC_MOVE2(ROLE_PLAY) + .2byte EC_MOVE2(ROLLING_KICK) + .2byte EC_MOVE(ROLLOUT) .2byte EC_WORD_ROMANTIC .2byte EC_POKEMON(ROSELIA) - .2byte EC_POKEMON2(JYNX) + .2byte EC_WORD_ROUGH_SKIN .2byte EC_WORD_RPG - .2byte EC_WORD_SMELL_YA .2byte EC_WORD_RUBY - .2byte EC_MOVE2(BLOCK) - .2byte EC_MOVE(RETURN) - .2byte EC_MOVE2(QUICK_ATTACK) - .2byte EC_WORD_HALL_OF_FAME - .2byte EC_WORD_DESTROYED - .2byte EC_MOVE(TAIL_WHIP) + .2byte EC_WORD_RULE + .2byte EC_WORD_RUN + .2byte EC_WORD_RUN_AWAY + .2byte EC_WORD_RUNS gEasyChatWordsByLetter_S: - .2byte EC_WORD_DROOLING - .2byte EC_WORD_THINGS - .2byte EC_POKEMON2(METAPOD) - .2byte EC_POKEMON(GOREBYSS) - .2byte EC_WORD_INCREDIBLE - .2byte EC_WORD_SAYS + .2byte EC_POKEMON(SABLEYE) + .2byte EC_MOVE(SACRED_FIRE) + .2byte EC_WORD_SAD + .2byte EC_WORD_SADLY + .2byte EC_MOVE(SAFEGUARD) .2byte EC_WORD_SAID - .2byte EC_WORD_COLLECT - .2byte EC_WORD_COLLECTION - .2byte EC_WORD_SATURDAY - .2byte EC_POKEMON(SEEDOT) - ec_duplicates 2 - .2byte EC_POKEMON(SANDSLASH) - .2byte EC_POKEMON2(SANDSLASH) + .2byte EC_POKEMON(SALAMENCE) + .2byte EC_WORD_SAND_STREAM + .2byte EC_MOVE(SAND_TOMB) + .2byte EC_WORD_SAND_VEIL + .2byte EC_MOVE(SAND_ATTACK) ec_duplicates 2 .2byte EC_POKEMON(SANDSHREW) .2byte EC_POKEMON2(SANDSHREW) - .2byte EC_MOVE(SAND_TOMB) - .2byte EC_WORD_SAND_VEIL ec_duplicates 2 - .2byte EC_WORD_SAND_STREAM + .2byte EC_POKEMON(SANDSLASH) + .2byte EC_POKEMON2(SANDSLASH) .2byte EC_MOVE(SANDSTORM) - .2byte EC_MOVE(SAND_ATTACK) - .2byte EC_WORD_DOCILE .2byte EC_WORD_SAPPHIRE - .2byte EC_POKEMON2(VICTREEBEL) - .2byte EC_WORD_SUCTION_CUPS - .2byte EC_MOVE2(ACID) - .2byte EC_MOVE2(ACID_ARMOR) - .2byte EC_MOVE2(DETECT) - .2byte EC_MOVE2(SKULL_BASH) - .2byte EC_MOVE2(HYPER_VOICE) - .2byte EC_POKEMON(SILCOON) - .2byte EC_MOVE(SHARPEN) - .2byte EC_WORD_APPRECIATE - .2byte EC_MOVE(DIG) - .2byte EC_WORD_LOOKS - .2byte EC_WORD_SEEMS - .2byte EC_WORD_SHINE - .2byte EC_MOVE2(LUSTER_PURGE) - .2byte EC_WORD_BREAK - .2byte EC_WORD_HYPER_CUTTER - .2byte EC_POKEMON2(SCIZOR) - .2byte EC_WORD_JOKING - .2byte EC_WORD_TRENDY - .2byte EC_POKEMON2(SQUIRTLE) - .2byte EC_POKEMON2(WARTORTLE) - .2byte EC_WORD_SLEEP - .2byte EC_MOVE2(SLEEP_POWDER) - .2byte EC_MOVE2(SLEEP_TALK) - .2byte EC_WORD_SMACK - .2byte EC_WORD_SMITE - .2byte EC_MOVE2(SLUDGE) - .2byte EC_WORD_WELL - .2byte EC_WORD_BAD - .2byte EC_MOVE(LICK) - .2byte EC_WORD_TWIRLING - .2byte EC_WORD_SLEPT - .2byte EC_WORD_AWFUL - .2byte EC_MOVE(SLASH) - .2byte EC_WORD_BEAT - .2byte EC_POKEMON(SWALOT) - .2byte EC_POKEMON(GULPIN) - .2byte EC_POKEMON2(LICKITUNG) - .2byte EC_WORD_FINISH - .2byte EC_MOVE(FLATTER) + .2byte EC_WORD_SATISFIED + .2byte EC_WORD_SATURDAY + .2byte EC_WORD_SAYS + .2byte EC_WORD_SCARY + .2byte EC_MOVE(SCARY_FACE) .2byte EC_WORD_SCATTER - .2byte EC_POKEMON(BARBOACH) - .2byte EC_MOVE2(PECK) - .2byte EC_MOVE(CLAMP) - .2byte EC_MOVE(SNORE) - .2byte EC_WORD_TRUANT - ec_duplicates 2 - .2byte EC_POKEMON(SLUGMA) - .2byte EC_POKEMON2(SLUGMA) - .2byte EC_WORD_FAST - .2byte EC_POKEMON(SNORUNT) - .2byte EC_WORD_LOVEY_DOVEY - .2byte EC_WORD_SADLY - .2byte EC_MOVE(ODOR_SLEUTH) - .2byte EC_MOVE2(SHOCK_WAVE) - .2byte EC_WORD_KIDDING - .2byte EC_WORD_THOSE_ARE - .2byte EC_WORD_BEAUTIFUL - .2byte EC_WORD_FORGIVE - .2byte EC_WORD_GO_EASY - .2byte EC_WORD_BEAUTY - .2byte EC_WORD_TERRIBLE - .2byte EC_WORD_CRY - .2byte EC_WORD_CRIES + .2byte EC_POKEMON(SCEPTILE) .2byte EC_WORD_SCHOOL - .2byte EC_WORD_SHAKY - .2byte EC_MOVE2(PROTECT) - .2byte EC_WORD_THICK - .2byte EC_WORD_WEAK - .2byte EC_POKEMON(TAILLOW) - .2byte EC_POKEMON(SWELLOW) - .2byte EC_WORD_LEVITATE - .2byte EC_MOVE2(TAIL_GLOW) - .2byte EC_WORD_HARD - .2byte EC_MOVE2(SWORDS_DANCE) - .2byte EC_WORD_SISTER - .2byte EC_WORD_GIDDY - .2byte EC_WORD_MOMENTUM - ec_duplicates 2 - .2byte EC_POKEMON(KINGDRA) - .2byte EC_POKEMON2(KINGDRA) - .2byte EC_POKEMON(SEALEO) - .2byte EC_WORD_SPIRIT + .2byte EC_POKEMON2(SCIZOR) + .2byte EC_MOVE2(SCRATCH) + .2byte EC_MOVE(SCREECH) + .2byte EC_POKEMON2(SCYTHER) ec_duplicates 2 .2byte EC_POKEMON(SEADRA) .2byte EC_POKEMON2(SEADRA) - .2byte EC_POKEMON(SPHEAL) ec_duplicates 2 - .2byte EC_POKEMON(HORSEA) - .2byte EC_POKEMON2(HORSEA) - .2byte EC_WORD_WORKS - .2byte EC_MOVE2(FUTURE_SIGHT) - .2byte EC_WORD_VERY - .2byte EC_WORD_BE - .2byte EC_WORD_SHALLOW - .2byte EC_WORD_HIS - .2byte EC_WORD_BEING - .2byte EC_WORD_SINCE - .2byte EC_WORD_RARE - .2byte EC_POKEMON(ZANGOOSE) + .2byte EC_POKEMON(SEAKING) + .2byte EC_POKEMON2(SEAKING) + .2byte EC_POKEMON(SEALEO) + .2byte EC_WORD_SEARCH + .2byte EC_WORD_SECRET + .2byte EC_WORD_SECRET_BASE + .2byte EC_MOVE2(SECRET_POWER) + .2byte EC_WORD_SEE + .2byte EC_WORD_SEE_YA + .2byte EC_POKEMON(SEEDOT) + .2byte EC_WORD_SEEK + .2byte EC_POKEMON2(SEEL) + .2byte EC_WORD_SEEMS + .2byte EC_WORD_SEES + .2byte EC_MOVE2(SEISMIC_TOSS) + .2byte EC_MOVE(SELF_DESTRUCT) + .2byte EC_WORD_SENSE + .2byte EC_POKEMON2(SENTRET) + .2byte EC_WORD_SERENE_GRACE + .2byte EC_WORD_SERIOUS + .2byte EC_WORD_SERIOUSLY .2byte EC_WORD_SERVICE - .2byte EC_WORD_SIGH - .2byte EC_POKEMON(SHUPPET) - .2byte EC_POKEMON2(SCYTHER) + .2byte EC_POKEMON(SEVIPER) + .2byte EC_MOVE(SHADOW_BALL) + .2byte EC_MOVE(SHADOW_PUNCH) + .2byte EC_WORD_SHADOW_TAG + .2byte EC_WORD_SHADY + .2byte EC_WORD_SHAKE + .2byte EC_WORD_SHAKY + .2byte EC_WORD_SHALLOW + .2byte EC_POKEMON(SHARPEDO) + .2byte EC_MOVE(SHARPEN) .2byte EC_WORD_SHE - .2byte EC_WORD_THEY_VE - .2byte EC_WORD_SOME .2byte EC_WORD_SHE_IS - .2byte EC_WORD_WOMAN - .2byte EC_WORD_THEY_RE .2byte EC_WORD_SHE_WAS - .2byte EC_WORD_THEY_WERE - .2byte EC_WORD_VICTORY - .2byte EC_WORD_CAN_T_WIN - .2byte EC_WORD_WHEN_I_WIN - .2byte EC_WORD_SEES - .2byte EC_MOVE2(LEER) + .2byte EC_WORD_SHED_SKIN + .2byte EC_POKEMON(SHEDINJA) + .2byte EC_MOVE(SHEER_COLD) + .2byte EC_POKEMON(SHELGON) + .2byte EC_WORD_SHELL_ARMOR + .2byte EC_POKEMON2(SHELLDER) + .2byte EC_WORD_SHIELD_DUST + .2byte EC_POKEMON(SHIFTRY) + .2byte EC_WORD_SHINE + .2byte EC_MOVE2(SHOCK_WAVE) + .2byte EC_WORD_SHOCKED + .2byte EC_WORD_SHOPPING + .2byte EC_WORD_SHOULD + .2byte EC_WORD_SHOW + .2byte EC_WORD_SHREDDED + .2byte EC_POKEMON(SHROOMISH) + .2byte EC_POKEMON2(SHUCKLE) + .2byte EC_POKEMON(SHUPPET) + .2byte EC_WORD_SIBLINGS + .2byte EC_WORD_SIGH + .2byte EC_MOVE(SIGNAL_BEAM) + .2byte EC_POKEMON(SILCOON) + .2byte EC_WORD_SILKY .2byte EC_MOVE(SILVER_WIND) + .2byte EC_WORD_SIMPLE + .2byte EC_WORD_SINCE + .2byte EC_MOVE(SING) + .2byte EC_WORD_SINK + .2byte EC_WORD_SISTER ec_duplicates 2 - .2byte EC_POKEMON(ALAKAZAM) - .2byte EC_POKEMON2(ALAKAZAM) - .2byte EC_WORD_THOSE - .2byte EC_WORD_AREN_T - .2byte EC_WORD_SENSE - ec_duplicates 2 - .2byte EC_POKEMON(HERACROSS) - .2byte EC_POKEMON2(HERACROSS) - .2byte EC_POKEMON2(GLIGAR) + .2byte EC_POKEMON(SKARMORY) + .2byte EC_POKEMON2(SKARMORY) + .2byte EC_MOVE(SKETCH) + .2byte EC_WORD_SKILL + .2byte EC_MOVE(SKILL_SWAP) + .2byte EC_WORD_SKILLED + .2byte EC_POKEMON2(SKIPLOOM) + .2byte EC_POKEMON(SKITTY) + .2byte EC_MOVE2(SKULL_BASH) + .2byte EC_MOVE(SKY_ATTACK) + .2byte EC_MOVE(SKY_UPPERCUT) + .2byte EC_MOVE2(SLACK_OFF) + .2byte EC_POKEMON(SLAKING) + .2byte EC_POKEMON(SLAKOTH) .2byte EC_MOVE2(SLAM) + .2byte EC_MOVE(SLASH) + .2byte EC_WORD_SLEEP + .2byte EC_MOVE2(SLEEP_POWDER) + .2byte EC_MOVE2(SLEEP_TALK) + .2byte EC_WORD_SLEPT + .2byte EC_WORD_SLIDE + .2byte EC_WORD_SLIMY + .2byte EC_POKEMON2(SLOWBRO) + .2byte EC_POKEMON2(SLOWKING) + .2byte EC_POKEMON2(SLOWPOKE) + .2byte EC_MOVE2(SLUDGE) + .2byte EC_MOVE2(SLUDGE_BOMB) ec_duplicates 2 - .2byte EC_POKEMON(GRIMER) - .2byte EC_POKEMON2(GRIMER) - ec_duplicates 2 - .2byte EC_POKEMON(MUK) - .2byte EC_POKEMON2(MUK) - .2byte EC_POKEMON2(BUTTERFREE) + .2byte EC_POKEMON(SLUGMA) + .2byte EC_POKEMON2(SLUGMA) + .2byte EC_WORD_SMACK + .2byte EC_WORD_SMALL + .2byte EC_WORD_SMART + .2byte EC_WORD_SMARTNESS + .2byte EC_POKEMON2(SMEARGLE) + .2byte EC_WORD_SMELL + .2byte EC_WORD_SMELL_YA + .2byte EC_MOVE(SMELLING_SALT) + .2byte EC_WORD_SMITE .2byte EC_MOVE(SMOG) - ec_duplicates 2 - .2byte EC_POKEMON(WEEZING) - .2byte EC_POKEMON2(WEEZING) - ec_duplicates 2 - .2byte EC_POKEMON(KOFFING) - .2byte EC_POKEMON2(KOFFING) + .2byte EC_MOVE(SMOKESCREEN) + .2byte EC_POKEMON2(SMOOCHUM) + .2byte EC_WORD_SMOOTH + .2byte EC_MOVE2(SNATCH) .2byte EC_POKEMON2(SNEASEL) - .2byte EC_POKEMON2(PERSIAN) + .2byte EC_MOVE(SNORE) + .2byte EC_POKEMON2(SNORLAX) + .2byte EC_WORD_SNORT + .2byte EC_POKEMON(SNORUNT) .2byte EC_POKEMON2(SNUBBULL) .2byte EC_WORD_SO - .2byte EC_WORD_AS_MUCH_AS + .2byte EC_MOVE2(SOFT_BOILED) .2byte EC_WORD_SOFTWARE .2byte EC_MOVE(SOLAR_BEAM) - .2byte EC_WORD_WEREN_T - .2byte EC_WORD_SUMMER - .2byte EC_MOVE(EXTRASENSORY) + .2byte EC_POKEMON(SOLROCK) + .2byte EC_WORD_SOME + .2byte EC_WORD_SOMEHOW + .2byte EC_WORD_SOMEONE + .2byte EC_WORD_SOMETHING + .2byte EC_WORD_SOMETIME + .2byte EC_WORD_SON .2byte EC_WORD_SONG .2byte EC_WORD_SONGS - .2byte EC_MOVE2(SUNNY_DAY) - .2byte EC_POKEMON(SOLROCK) - .2byte EC_POKEMON2(SUNFLORA) - .2byte EC_POKEMON2(SUNKERN) - .2byte EC_WORD_SUNDAY - .2byte EC_WORD_WORRY - .2byte EC_WORD_CARE - .2byte EC_WORD_CARES + .2byte EC_MOVE(SONIC_BOOM) + .2byte EC_WORD_SOON .2byte EC_WORD_SORRY - .2byte EC_MOVE(TICKLE) - .2byte EC_WORD_LATE - .2byte EC_WORD_LATER - .2byte EC_WORD_WALK - .2byte EC_WORD_THICK_FAT - .2byte EC_MOVE2(MIRROR_COAT) - .2byte EC_MOVE(MIRROR_MOVE) - .2byte EC_WORD_GAME - .2byte EC_WORD_PLAY - .2byte EC_WORD_PLAYS - .2byte EC_WORD_PLAYED - .2byte EC_WORD_TOYS + .2byte EC_WORD_SOUNDPROOF + .2byte EC_WORD_SP_ABILITY + .2byte EC_MOVE(SPARK) + .2byte EC_POKEMON2(SPEAROW) + .2byte EC_WORD_SPECTATOR + .2byte EC_WORD_SPEED_BOOST + .2byte EC_POKEMON(SPHEAL) .2byte EC_MOVE(SPIDER_WEB) + .2byte EC_MOVE2(SPIKE_CANNON) + .2byte EC_MOVE2(SPIKES) + .2byte EC_POKEMON2(SPINARAK) + .2byte EC_POKEMON(SPINDA) + .2byte EC_WORD_SPIRALING + .2byte EC_WORD_SPIRIT + .2byte EC_MOVE2(SPIT_UP) + .2byte EC_MOVE(SPITE) + .2byte EC_MOVE2(SPLASH) .2byte EC_POKEMON(SPOINK) - .2byte EC_WORD_EFFECT_SPORE + .2byte EC_MOVE(SPORE) .2byte EC_WORD_SPORTS - .2byte EC_MOVE(FOLLOW_ME) - .2byte EC_MOVE2(BOUNCE) - .2byte EC_MOVE2(JUMP_KICK) - .2byte EC_MOVE(SHADOW_BALL) - .2byte EC_MOVE(STUN_SPORE) - .2byte EC_MOVE2(SPIKES) - .2byte EC_MOVE2(BATON_PASS) - .2byte EC_WORD_STEEL - .2byte EC_MOVE2(STEEL_WING) - .2byte EC_POKEMON2(STEELIX) - .2byte EC_MOVE2(BARRAGE) - .2byte EC_MOVE2(STOMP) - .2byte EC_WORD_TOUGH - ec_duplicates 2 - .2byte EC_WORD_TOUGHNESS - .2byte EC_MOVE(STRENGTH) - .2byte EC_WORD_STRONG + .2byte EC_WORD_SPRING + .2byte EC_POKEMON2(SQUIRTLE) + .2byte EC_WORD_STAGE + .2byte EC_POKEMON2(STANTLER) ec_duplicates 2 .2byte EC_POKEMON(STARMIE) .2byte EC_POKEMON2(STARMIE) .2byte EC_WORD_START - .2byte EC_WORD_STATIC - .2byte EC_WORD_INSTEAD - .2byte EC_MOVE(ROCK_SLIDE) - .2byte EC_WORD_ROCK_SOLID - .2byte EC_WORD_ROCK_HEAD - .2byte EC_MOVE(ROCK_THROW) ec_duplicates 2 .2byte EC_POKEMON(STARYU) .2byte EC_POKEMON2(STARYU) - .2byte EC_MOVE(METEOR_MASH) - .2byte EC_MOVE(SWIFT) - .2byte EC_POKEMON(AGGRON) - .2byte EC_POKEMON(LAIRON) - .2byte EC_POKEMON(ARON) + .2byte EC_WORD_STATIC + .2byte EC_WORD_STAY_AT_HOME + .2byte EC_WORD_STEEL + .2byte EC_MOVE2(STEEL_WING) + .2byte EC_POKEMON2(STEELIX) + .2byte EC_WORD_STENCH + .2byte EC_WORD_STICKY_HOLD + .2byte EC_MOVE2(STOCKPILE) + .2byte EC_MOVE2(STOMP) .2byte EC_WORD_STOP + .2byte EC_WORD_STORE + .2byte EC_WORD_STORES .2byte EC_WORD_STORY .2byte EC_WORD_STRATEGY - .2byte EC_WORD_SEEK - .2byte EC_WORD_FIGHTS - .2byte EC_WORD_BANG - .2byte EC_WORD_TORRENT - .2byte EC_WORD_SEARCH + .2byte EC_MOVE(STRENGTH) + .2byte EC_MOVE(STRING_SHOT) + .2byte EC_WORD_STRONG + .2byte EC_MOVE2(STRUGGLE) + .2byte EC_WORD_STUDY + .2byte EC_MOVE(STUN_SPORE) + .2byte EC_WORD_STURDY + .2byte EC_MOVE(SUBMISSION) + .2byte EC_MOVE2(SUBSTITUTE) + .2byte EC_WORD_SUCTION_CUPS + .2byte EC_POKEMON2(SUDOWOODO) .2byte EC_POKEMON2(SUICUNE) + .2byte EC_WORD_SUMMER + .2byte EC_WORD_SUNDAY + .2byte EC_POKEMON2(SUNFLORA) + .2byte EC_POKEMON2(SUNKERN) + .2byte EC_MOVE2(SUNNY_DAY) + .2byte EC_WORD_SUPER + .2byte EC_MOVE(SUPER_FANG) + .2byte EC_MOVE2(SUPERPOWER) + .2byte EC_MOVE2(SUPERSONIC) + .2byte EC_MOVE2(SURF) + .2byte EC_WORD_SURPRISE + .2byte EC_WORD_SURRENDER + .2byte EC_POKEMON(SURSKIT) + .2byte EC_POKEMON(SWABLU) + .2byte EC_MOVE(SWAGGER) + .2byte EC_MOVE2(SWALLOW) + .2byte EC_POKEMON(SWALOT) .2byte EC_POKEMON(SWAMPERT) - .2byte EC_WORD_SUPER - .2byte EC_MOVE2(SUPERSONIC) - .2byte EC_MOVE(SUPER_FANG) - .2byte EC_MOVE2(SURF) + .2byte EC_WORD_SWARM + .2byte EC_MOVE2(SWEET_KISS) + .2byte EC_MOVE(SWEET_SCENT) + .2byte EC_WORD_SWEETS + .2byte EC_POKEMON(SWELLOW) + .2byte EC_MOVE(SWIFT) + .2byte EC_WORD_SWIFT_SWIM + .2byte EC_POKEMON2(SWINUB) + .2byte EC_MOVE2(SWORDS_DANCE) .2byte EC_WORD_SYNCHRONIZE .2byte EC_MOVE(SYNTHESIS) .2byte EC_WORD_SYSTEM gEasyChatWordsByLetter_T: .2byte EC_MOVE2(TACKLE) - .2byte EC_WORD_DAY - .2byte EC_WORD_HI - .2byte EC_WORD_EXCUSE - .2byte EC_WORD_DAYS - .2byte EC_MOVE2(SLACK_OFF) - .2byte EC_WORD_DAYTIME - .2byte EC_WORD_DAILY + .2byte EC_MOVE2(TAIL_GLOW) + .2byte EC_MOVE(TAIL_WHIP) + .2byte EC_POKEMON(TAILLOW) + .2byte EC_WORD_TAKE + .2byte EC_MOVE2(TAKE_DOWN) + .2byte EC_WORD_TAKE_THAT .2byte EC_WORD_TALENT + .2byte EC_WORD_TALK + .2byte EC_WORD_TALKING .2byte EC_POKEMON2(TANGELA) - .2byte EC_POKEMON(BELDUM) - .2byte EC_POKEMON2(PINECO) - .2byte EC_WORD_AUNT - .2byte EC_WORD_DANCE - .2byte EC_MOVE2(CAMOUFLAGE) - .2byte EC_WORD_ALLOWANCE - .2byte EC_POKEMON2(PIDGEOTTO) - .2byte EC_POKEMON2(PIDGEOT) - .2byte EC_POKEMON2(PIDGEY) - .2byte EC_MOVE2(DIVE) - .2byte EC_MOVE2(TEETER_DANCE) + .2byte EC_WORD_TASTY + .2byte EC_MOVE2(TAUNT) .2byte EC_POKEMON2(TAUROS) - .2byte EC_WORD_TRADE + .2byte EC_WORD_TCH + .2byte EC_WORD_TEACH + .2byte EC_WORD_TEACHER + .2byte EC_WORD_TEACHES .2byte EC_POKEMON2(TEDDIURSA) - .2byte EC_WORD_PHONE + .2byte EC_MOVE2(TEETER_DANCE) .2byte EC_MOVE2(TELEPORT) - .2byte EC_MOVE2(MACH_PUNCH) - .2byte EC_WORD_OWN_TEMPO - .2byte EC_WORD_SPEED_BOOST - .2byte EC_POKEMON(SHIFTRY) + .2byte EC_WORD_TELEVISION ec_duplicates 2 .2byte EC_POKEMON(TENTACOOL) .2byte EC_POKEMON2(TENTACOOL) ec_duplicates 2 .2byte EC_POKEMON(TENTACRUEL) .2byte EC_POKEMON2(TENTACRUEL) + .2byte EC_WORD_TERRIBLE .2byte EC_WORD_TEST - .2byte EC_WORD_EXPENSIVE - .2byte EC_WORD_DEEP - .2byte EC_WORD_LOWS - .2byte EC_WORD_DAUGHTER - .2byte EC_MOVE(LOVELY_KISS) + .2byte EC_WORD_THAN + .2byte EC_WORD_THANK_YOU + .2byte EC_WORD_THANKS + .2byte EC_WORD_THAT + .2byte EC_WORD_THAT_WAS + .2byte EC_WORD_THAT_S + .2byte EC_WORD_THAT_S_IT_EXCL + .2byte EC_WORD_THE + .2byte EC_WORD_THEIR + .2byte EC_WORD_THERE + .2byte EC_WORD_THESE + .2byte EC_WORD_THESE_WERE + .2byte EC_WORD_THEY + .2byte EC_WORD_THEY_WERE + .2byte EC_WORD_THEY_RE + .2byte EC_WORD_THEY_VE + .2byte EC_WORD_THICK + .2byte EC_WORD_THICK_FAT + .2byte EC_MOVE2(THIEF) + .2byte EC_WORD_THIN + .2byte EC_WORD_THING + .2byte EC_WORD_THINGS + .2byte EC_WORD_THINK + .2byte EC_WORD_THINKS + .2byte EC_WORD_THIRSTY + .2byte EC_WORD_THIS + .2byte EC_WORD_THIS_IS_IT_EXCL + .2byte EC_WORD_THOSE + .2byte EC_WORD_THOSE_ARE + .2byte EC_WORD_THOSE_WERE + .2byte EC_MOVE(THRASH) + .2byte EC_WORD_THROW + .2byte EC_MOVE(THUNDER) + .2byte EC_MOVE2(THUNDER_WAVE) + .2byte EC_MOVE(THUNDERBOLT) + .2byte EC_MOVE(THUNDER_PUNCH) + .2byte EC_MOVE2(THUNDER_SHOCK) + .2byte EC_WORD_THURSDAY + .2byte EC_MOVE(TICKLE) + .2byte EC_WORD_TICKLISH + .2byte EC_WORD_TIGHT + .2byte EC_WORD_TIME + .2byte EC_WORD_TIMES + .2byte EC_WORD_TIRED + .2byte EC_WORD_TO + .2byte EC_WORD_TO_HER + .2byte EC_WORD_TO_ME + .2byte EC_WORD_TO_THEM + .2byte EC_WORD_TO_US + .2byte EC_WORD_TO_WHOM + .2byte EC_WORD_TODAY .2byte EC_POKEMON2(TOGEPI) + .2byte EC_WORD_TOGETHER .2byte EC_POKEMON2(TOGETIC) - .2byte EC_POKEMON(SHARPEDO) + .2byte EC_WORD_TOMORROW + .2byte EC_WORD_TOO + .2byte EC_WORD_TOO_LATE + .2byte EC_WORD_TOO_STRONG + .2byte EC_WORD_TOO_WEAK .2byte EC_WORD_TOP - .2byte EC_POKEMON2(TYPHLOSION) + .2byte EC_POKEMON(TORCHIC) + .2byte EC_POKEMON(TORKOAL) + .2byte EC_MOVE(TORMENT) + .2byte EC_WORD_TORRENT + .2byte EC_WORD_TOTALLY + .2byte EC_POKEMON2(TOTODILE) + .2byte EC_WORD_TOUGH + .2byte EC_WORD_TOUGHNESS + .2byte EC_WORD_TOURNAMENT .2byte EC_MOVE2(TOXIC) - .2byte EC_POKEMON2(CUBONE) - .2byte EC_WORD_TRAINER + .2byte EC_WORD_TOYS + .2byte EC_WORD_TRACE + .2byte EC_WORD_TRADE .2byte EC_WORD_TRAIN + .2byte EC_WORD_TRAINER .2byte EC_WORD_TRAINS - .2byte EC_POKEMON(RALTS) - .2byte EC_WORD_DREAM - .2byte EC_POKEMON2(DROWZEE) - .2byte EC_MOVE2(DREAM_EATER) - .2byte EC_POKEMON2(MISDREAVUS) - .2byte EC_WORD_SAD - .2byte EC_WORD_HIT - .2byte EC_MOVE2(TRICK) - .2byte EC_WORD_MEETS - .2byte EC_WORD_DRINK - .2byte EC_WORD_DRINKS + .2byte EC_MOVE2(TRANSFORM) + .2byte EC_POKEMON(TRAPINCH) + .2byte EC_WORD_TRAVEL + .2byte EC_WORD_TREASURE + .2byte EC_POKEMON(TREECKO) + .2byte EC_WORD_TRENDY .2byte EC_MOVE2(TRI_ATTACK) + .2byte EC_MOVE2(TRICK) + .2byte EC_WORD_TRIES + .2byte EC_MOVE2(TRIPLE_KICK) .2byte EC_POKEMON(TROPIUS) - .2byte EC_WORD_EVEN_SO - .2byte EC_MOVE2(FALSE_SWIPE) - .2byte EC_MOVE(FAKE_TEARS) + .2byte EC_WORD_TRUANT + .2byte EC_WORD_TRULY .2byte EC_WORD_TRUMP_CARD - .2byte EC_WORD_BYE_BYE - .2byte EC_WORD_GOOD_BYE - .2byte EC_WORD_TCH - .2byte EC_MOVE(RAPID_SPIN) - .2byte EC_MOVE(EXTREME_SPEED) - .2byte EC_MOVE2(HI_JUMP_KICK) - .2byte EC_WORD_TOURNAMENT - .2byte EC_POKEMON2(BLASTOISE) - .2byte EC_POKEMON(CACNEA) - .2byte EC_WORD_DOES + .2byte EC_WORD_TRUST + .2byte EC_WORD_TRY + .2byte EC_WORD_TUESDAY + .2byte EC_MOVE2(TWINEEDLE) + .2byte EC_WORD_TWIRLING + .2byte EC_MOVE2(TWISTER) .2byte EC_WORD_TYPE - .2byte EC_WORD_DUDE - .2byte EC_POKEMON2(CROCONAW) + .2byte EC_POKEMON2(TYPHLOSION) + .2byte EC_POKEMON2(TYRANITAR) + .2byte EC_POKEMON2(TYROGUE) gEasyChatWordsByLetter_U: - .2byte EC_WORD_OVER - .2byte EC_WORD_HUSTLE - .2byte EC_WORD_EXCESS - .2byte EC_WORD_TOMORROW - .2byte EC_MOVE2(SNATCH) - .2byte EC_WORD_SURPRISE - .2byte EC_MOVE(SUBMISSION) - .2byte EC_WORD_OVERDO - .2byte EC_MOVE(VITAL_THROW) - .2byte EC_WORD_AWW + .2byte EC_WORD_UGLY .2byte EC_WORD_UH_HUH - .2byte EC_MOVE(SONIC_BOOM) - .2byte EC_POKEMON2(WEEPINBELL) - .2byte EC_WORD_UPSIDE_DOWN - .2byte EC_WORD_ABOUT - .2byte EC_MOVE(CONSTRICT) - .2byte EC_MOVE2(CONVERSION) - .2byte EC_MOVE2(CONVERSION_2) - .2byte EC_WORD_AND - .2byte EC_WORD_UNBELIEVABLE - .2byte EC_WORD_SCARY - .2byte EC_WORD_DARK - .2byte EC_WORD_IMPOSSIBLE - .2byte EC_WORD_INVINCIBLE - .2byte EC_WORD_OUR - .2byte EC_WORD_BELOW - .2byte EC_WORD_ENTERTAINING - .2byte EC_WORD_NO_MATCH - .2byte EC_WORD_LESSONS + .2byte EC_WORD_UH_OH + .2byte EC_WORD_UM + .2byte EC_POKEMON2(UMBREON) .2byte EC_WORD_UNAVOIDABLE - .2byte EC_WORD_TRY - .2byte EC_WORD_LACKING - .2byte EC_WORD_VACATION - .2byte EC_POKEMON2(URSARING) -gEasyChatWordsByLetter_V: - .2byte EC_WORD_FATHER - .2byte EC_WORD_DATE - .2byte EC_WORD_ALLY - .2byte EC_WORD_DARN - .2byte EC_MOVE(PURSUIT) - .2byte EC_MOVE2(REVENGE) - .2byte EC_WORD_FORGET - .2byte EC_WORD_FORGETS - .2byte EC_WORD_ADORE - .2byte EC_MOVE2(TAUNT) - .2byte EC_WORD_MISHEARD - .2byte EC_WORD_IF_I_LOSE - .2byte EC_WORD_LOSE - .2byte EC_WORD_LOST - .2byte EC_WORD_LOSS - .2byte EC_WORD_LIKELY_TO - .2byte EC_WORD_WEIRD - .2byte EC_WORD_DIFFERENT - .2byte EC_WORD_DISAPPEAR - .2byte EC_WORD_SINK - .2byte EC_WORD_VERSION - .2byte EC_WORD_PROMISE - .2byte EC_WORD_UNDERSTOOD - .2byte EC_WORD_NATURALLY - .2byte EC_WORD_HIDDEN + .2byte EC_WORD_UNBELIEVABLE + .2byte EC_WORD_UNCLE .2byte EC_WORD_UNDERSTAND .2byte EC_WORD_UNDERSTANDS - .2byte EC_WORD_TRIES - .2byte EC_WORD_TRUST + .2byte EC_WORD_UNDERSTOOD + .2byte EC_POKEMON2(UNOWN) + .2byte EC_WORD_UNTIL + .2byte EC_WORD_UP + .2byte EC_WORD_UPBEAT + .2byte EC_MOVE(UPROAR) + .2byte EC_WORD_UPSIDE_DOWN + .2byte EC_WORD_URGH + .2byte EC_POKEMON2(URSARING) + .2byte EC_WORD_USE + .2byte EC_WORD_USELESS + .2byte EC_WORD_USES .2byte EC_WORD_USING - .2byte EC_WORD_CONFUSED - .2byte EC_MOVE2(INGRAIN) - .2byte EC_MOVE2(SWALLOW) - .2byte EC_WORD_APOLOGIZE - .2byte EC_MOVE2(STRUGGLE) +gEasyChatWordsByLetter_V: + .2byte EC_WORD_VACATION + .2byte EC_POKEMON2(VAPOREON) + .2byte EC_POKEMON2(VENOMOTH) + .2byte EC_POKEMON2(VENONAT) + .2byte EC_POKEMON2(VENUSAUR) + .2byte EC_WORD_VERSION + .2byte EC_WORD_VERSUS + .2byte EC_WORD_VERY .2byte EC_POKEMON(VIBRAVA) - .2byte EC_WORD_A_LOT - .2byte EC_WORD_MUCH - .2byte EC_MOVE2(MEGAHORN) - .2byte EC_WORD_MAYBE - .2byte EC_POKEMON(SEVIPER) - .2byte EC_MOVE(HEAL_BELL) - .2byte EC_WORD_KTHX_BYE + .2byte EC_MOVE2(VICE_GRIP) + .2byte EC_WORD_VICTORY + .2byte EC_POKEMON2(VICTREEBEL) + .2byte EC_WORD_VIEWING + .2byte EC_POKEMON(VIGOROTH) + ec_duplicates 2 + .2byte EC_POKEMON(VILEPLUME) + .2byte EC_POKEMON2(VILEPLUME) + .2byte EC_MOVE2(VINE_WHIP) + .2byte EC_WORD_VITAL_SPIRIT + .2byte EC_MOVE(VITAL_THROW) .2byte EC_POKEMON(VOLBEAT) - .2byte EC_WORD_FULL .2byte EC_WORD_VOLT_ABSORB - .2byte EC_POKEMON(MANECTRIC) - .2byte EC_POKEMON2(MAREEP) ec_duplicates 2 .2byte EC_POKEMON(VOLTORB) .2byte EC_POKEMON2(VOLTORB) - .2byte EC_WORD_FROM - .2byte EC_WORD_BEFORE - .2byte EC_WORD_LIKES - .2byte EC_WORD_FRONT - .2byte EC_WORD_PRETEND - ec_duplicates 2 - .2byte EC_POKEMON(NINETALES) - .2byte EC_POKEMON2(NINETALES) + .2byte EC_WORD_VORACIOUS ec_duplicates 2 .2byte EC_POKEMON(VULPIX) .2byte EC_POKEMON2(VULPIX) gEasyChatWordsByLetter_W: .2byte EC_WORD_WAAAH - .2byte EC_POKEMON2(FLAAFFY) - .2byte EC_POKEMON(SWABLU) - .2byte EC_WORD_GUARD - .2byte EC_MOVE(GROWTH) - .2byte EC_WORD_WAKES_UP - .2byte EC_WORD_RICKETY .2byte EC_WORD_WAHAHAHA - .2byte EC_WORD_CHOICE - .2byte EC_WORD_CHOOSE - .2byte EC_WORD_WHILE - .2byte EC_WORD_TRULY .2byte EC_POKEMON(WAILMER) .2byte EC_POKEMON(WAILORD) - .2byte EC_POKEMON(WALREIN) - .2byte EC_MOVE(ROLLOUT) + .2byte EC_WORD_WAIT + .2byte EC_WORD_WAKE_UP + .2byte EC_WORD_WAKES_UP + .2byte EC_WORD_WALK .2byte EC_WORD_WALKING .2byte EC_WORD_WALKS - .2byte EC_MOVE2(TRANSFORM) + .2byte EC_POKEMON(WALREIN) + .2byte EC_WORD_WANDERING + .2byte EC_WORD_WANNABE + .2byte EC_WORD_WANT + .2byte EC_WORD_WANTS + .2byte EC_POKEMON2(WARTORTLE) .2byte EC_WORD_WAS .2byte EC_WORD_WASN_T - .2byte EC_WORD_BEEN - .2byte EC_WORD_WHY + .2byte EC_WORD_WATER + .2byte EC_WORD_WATER_ABSORB + .2byte EC_MOVE2(WATER_GUN) + .2byte EC_MOVE2(WATER_PULSE) + .2byte EC_MOVE2(WATER_SPORT) + .2byte EC_MOVE(WATER_SPOUT) + .2byte EC_WORD_WATER_VEIL + .2byte EC_MOVE2(WATERFALL) + .2byte EC_WORD_WAY + .2byte EC_WORD_WE + .2byte EC_WORD_WE_RE + .2byte EC_WORD_WE_VE + .2byte EC_WORD_WEAK + .2byte EC_WORD_WEAKENED + .2byte EC_MOVE(WEATHER_BALL) + .2byte EC_WORD_WEDNESDAY + .2byte EC_POKEMON2(WEEDLE) + .2byte EC_WORD_WEEK + .2byte EC_POKEMON2(WEEPINBELL) + ec_duplicates 2 + .2byte EC_POKEMON(WEEZING) + .2byte EC_POKEMON2(WEEZING) + .2byte EC_WORD_WEIRD + .2byte EC_WORD_WELCOME + .2byte EC_WORD_WELL + .2byte EC_WORD_WELL_THEN + .2byte EC_WORD_WENT + .2byte EC_WORD_WERE + .2byte EC_WORD_WEREN_T .2byte EC_WORD_WHAT .2byte EC_WORD_WHAT_S_UP_QUES - .2byte EC_WORD_WATER - .2byte EC_WORD_CHANNEL - .2byte EC_WORD_SWIFT_SWIM - .2byte EC_POKEMON(WURMPLE) - .2byte EC_POKEMON2(SPINARAK) - .2byte EC_WORD_CHANGE - .2byte EC_WORD_SHADOW_TAG - .2byte EC_MOVE2(SOFT_BOILED) - .2byte EC_WORD_REFUSE - .2byte EC_WORD_MEET - .2byte EC_WORD_KNOWS - .2byte EC_MOVE(MIST) - .2byte EC_WORD_FAR - .2byte EC_WORD_GO_AHEAD + .2byte EC_WORD_WHEN + .2byte EC_WORD_WHEN_I_WIN + .2byte EC_WORD_WHERE .2byte EC_WORD_WHICH + .2byte EC_WORD_WHILE + .2byte EC_MOVE(WHIRLPOOL) + .2byte EC_MOVE2(WHIRLWIND) .2byte EC_POKEMON(WHISCASH) - .2byte EC_WORD_WORLD - .2byte EC_WORD_WHOM - .2byte EC_WORD_A_TINY_BIT - .2byte EC_WORD_LESS - .2byte EC_WORD_IF + .2byte EC_POKEMON(WHISMUR) + .2byte EC_WORD_WHITE_SMOKE .2byte EC_WORD_WHO .2byte EC_WORD_WHO_IS - .2byte EC_WORD_WON_T - .2byte EC_WORD_WILL - .2byte EC_WORD_THROW - .2byte EC_WORD_STICKY_HOLD - .2byte EC_MOVE(SKILL_SWAP) - .2byte EC_WORD_NATURE + .2byte EC_WORD_WHO_WAS + .2byte EC_WORD_WHOAH + .2byte EC_WORD_WHOM .2byte EC_WORD_WHOSE - .2byte EC_WORD_CONTEST - .2byte EC_MOVE(WHIRLPOOL) - .2byte EC_WORD_IMPORTANT - .2byte EC_MOVE2(WRAP) - .2byte EC_WORD_HOW_DO - .2byte EC_WORD_HUH_QUES - .2byte EC_POKEMON(CRADILY) - .2byte EC_POKEMON2(FURRET) - .2byte EC_POKEMON2(SENTRET) + .2byte EC_WORD_WHY + ec_duplicates 2 + .2byte EC_POKEMON(WIGGLYTUFF) + .2byte EC_POKEMON2(WIGGLYTUFF) .2byte EC_WORD_WILD - .2byte EC_WORD_WANTS - .2byte EC_MOVE(MIND_READER) - .2byte EC_WORD_WELCOME - .2byte EC_MOVE2(TWISTER) - .2byte EC_MOVE(AIR_CUTTER) - .2byte EC_MOVE(GUST) + .2byte EC_WORD_WILL + .2byte EC_WORD_WILL_BE_HERE + .2byte EC_MOVE(WILL_O_WISP) + .2byte EC_WORD_WIMPY + .2byte EC_WORD_WIN + .2byte EC_MOVE2(WING_ATTACK) .2byte EC_POKEMON(WINGULL) + .2byte EC_WORD_WINNER + .2byte EC_WORD_WINS .2byte EC_WORD_WINTER - .2byte EC_WORD_WE - .2byte EC_WORD_WE_VE - .2byte EC_WORD_WE_RE - .2byte EC_WORD_SPIRALING - .2byte EC_MOVE2(WHIRLWIND) - .2byte EC_WORD_BECOMES - .2byte EC_WORD_WILL_BE_HERE - .2byte EC_WORD_QUITE - .2byte EC_WORD_KNOW - .2byte EC_WORD_WHERE - .2byte EC_WORD_WEEK + .2byte EC_MOVE2(WISH) + .2byte EC_WORD_WITH + .2byte EC_MOVE(WITHDRAW) + .2byte EC_WORD_WITHOUT + .2byte EC_WORD_WOBBLY ec_duplicates 2 .2byte EC_POKEMON(WOBBUFFET) .2byte EC_POKEMON2(WOBBUFFET) - .2byte EC_WORD_CLOUD_NINE - .2byte EC_WORD_WROOOAAR_EXCL - .2byte EC_WORD_WORD - .2byte EC_WORD_WOW - .2byte EC_MOVE2(DYNAMIC_PUNCH) + .2byte EC_WORD_WOMAN + .2byte EC_WORD_WON + .2byte EC_WORD_WON_T .2byte EC_WORD_WONDER .2byte EC_WORD_WONDER_GUARD - .2byte EC_MOVE2(WISH) + .2byte EC_POKEMON2(WOOPER) + .2byte EC_WORD_WORD + .2byte EC_WORD_WORK + .2byte EC_WORD_WORKING + .2byte EC_WORD_WORKS + .2byte EC_WORD_WORLD + .2byte EC_WORD_WORRY .2byte EC_WORD_WOULD - .2byte EC_WORD_WERE - .2byte EC_WORD_INCREASING - .2byte EC_WORD_SILKY - .2byte EC_WORD_ANGER - .2byte EC_MOVE(OUTRAGE) - .2byte EC_WORD_ANGRY + .2byte EC_WORD_WOW + .2byte EC_WORD_WOWEE + .2byte EC_MOVE2(WRAP) + .2byte EC_WORD_WROOOAAR_EXCL + .2byte EC_POKEMON(WURMPLE) + .2byte EC_POKEMON(WYNAUT) gEasyChatWordsByLetter_X: ec_duplicates 2 .2byte EC_POKEMON(XATU) .2byte EC_POKEMON2(XATU) gEasyChatWordsByLetter_Y: + .2byte EC_WORD_YAHOO .2byte EC_POKEMON2(YANMA) + .2byte EC_MOVE(YAWN) + .2byte EC_WORD_YAY .2byte EC_WORD_YEAH .2byte EC_WORD_YEAH_YEAH - .2byte EC_WORD_COUPLE + .2byte EC_WORD_YEEHAW_EXCL + .2byte EC_WORD_YES + .2byte EC_WORD_YES_SIR_EXCL + .2byte EC_WORD_YESTERDAY + .2byte EC_WORD_YET + .2byte EC_WORD_YO + .2byte EC_WORD_YOU + .2byte EC_WORD_YOU_RE + .2byte EC_WORD_YOU_VE + .2byte EC_WORD_YOUNG + .2byte EC_WORD_YOUR + .2byte EC_WORD_YOURS + .2byte EC_WORD_YUP gEasyChatWordsByLetter_Z: - .2byte EC_WORD_COUNT_ON - .2byte EC_MOVE2(PAY_DAY) + .2byte EC_POKEMON(ZANGOOSE) + .2byte EC_MOVE2(ZAP_CANNON) .2byte EC_POKEMON2(ZAPDOS) - .2byte EC_MOVE2(MAGICAL_LEAF) - .2byte EC_WORD_SHOW - .2byte EC_WORD_TIME - .2byte EC_WORD_TIMES - .2byte EC_MOVE2(CRUSH_CLAW) - .2byte EC_MOVE(CUT) - .2byte EC_MOVE(ROCK_SMASH) - .2byte EC_WORD_AIM - .2byte EC_MOVE2(LOCK_ON) .2byte EC_POKEMON(ZIGZAGOON) - .2byte EC_WORD_FIERY - .2byte EC_WORD_WOBBLY - .2byte EC_POKEMON(SABLEYE) - .2byte EC_WORD_LOSING - .2byte EC_MOVE2(FURY_CUTTER) - .2byte EC_WORD_TO - .2byte EC_WORD_TO_ME - .2byte EC_WORD_TOO_WEAK - .2byte EC_WORD_TOO_LATE - .2byte EC_WORD_TOO_STRONG ec_duplicates 2 .2byte EC_POKEMON(ZUBAT) .2byte EC_POKEMON2(ZUBAT) - .2byte EC_WORD_SATISFIED - .2byte EC_MOVE(ENCORE) - .2byte EC_WORD_LISTEN - .2byte EC_WORD_BACK - .2byte EC_WORD_TOGETHER - .2byte EC_WORD_SPECTATOR - .2byte EC_MOVE2(ASSIST) - .2byte EC_POKEMON(DUSCLOPS) - .2byte EC_POKEMON(DUSKULL) gEasyChatWordsByLetter_End: .align 1 diff --git a/data/text/eon_ticket.inc b/data/text/eon_ticket.inc index b979f472e..0da9317af 100644 --- a/data/text/eon_ticket.inc +++ b/data/text/eon_ticket.inc @@ -1,45 +1,44 @@ UnknownString_81C5033: @ 81C5033 - .string "VATER: {PLAYER}! Schön, dich zu sehen!\n" - .string "Hier habe ich einen Brief für dich.$" + .string "DAD: {PLAYER}! Good to see you!\n" + .string "There’s a letter here for you, {PLAYER}.$" UnknownString_81C5070: @ 81C5070 - .string "VATER: Das muss ein FAHRSCHEIN\n" - .string "für ein Schiff sein. Aber für welches?\p" - .string "In SEEGRASULB CITY kann dir bestimmt\n" - .string "jemand mehr dazu sagen.$" + .string "DAD: I guess this is a PASS for a ship.\n" + .string "But I’ve never seen this ship before.\p" + .string "You should find out what this is about\n" + .string "in LILYCOVE.$" LilycoveCity_Harbor_Text_1C50F2:: @ 81C50F2 - .string "Die Fähre nach GRAPHITPORT CITY ist...\p" - .string "Oh!\n" - .string "Der FAHRSCHEIN...$" + .string "The ferry to SLATEPORT is...\p" + .string "Oh?\n" + .string "That PASS...$" LilycoveCity_Harbor_Text_1C5120:: @ 81C5120 - .string "Aye, Maat, hast du den alten FAHRSCHEIN\n" - .string "mitgebracht?\p" - .string "Ich sage dir, du bist auf dem Weg zu\n" - .string "einer briefmarkengroßen Insel im Süden.\p" - .string "Niemand kann sagen, was uns dort er-\n" - .string "warten wird, aye. Und das erschüttert\l" - .string "meine alten Knochen!\p" - .string "Alle Mann an Bord!$" + .string "Aye, mate, are you the one who brought\n" + .string "that mighty odd PASS?\p" + .string "I’ll tell you, you’re trying to reach a\n" + .string "tiny spit of an island far in the south.\p" + .string "There’s no telling what we’ll encounter\n" + .string "once we reach there, aye.\l" + .string "That shivers my timbers!\p" + .string "All aboard!$" SouthernIsland_Exterior_Text_1C5215:: @ 81C5215 - .string "Aye, Maat, auf dieser gottverlassenen\n" - .string "Insel gibt’s nichts zu sehen und zu tun.\p" - .string "Sollen wir nicht nach SEEGRASULB CITY\n" - .string "zurücksegeln?$" + .string "Aye, mate, there’s nothing here to\n" + .string "see or do on this forgettable island.\p" + .string "What say we sail back to LILYCOVE?$" SouthernIsland_Exterior_Text_1C5281:: @ 81C5281 - .string "Aye, alles klar!\n" - .string "Segeln wir nach Hause!$" + .string "Aye, right, then!\n" + .string "Sail home we will!$" SouthernIsland_Exterior_Text_1C52A6:: @ 81C52A6 - .string "Aye, ganz wie du willst.$" + .string "Aye, right, as you like, then.$" SouthernIsland_Interior_Text_1C52C5:: @ 81C52C5 - .string "“Alle Träume sind nur eine andere\n" - .string "Realität. Vergiss das nicht...”$" + .string "“All dreams are but another reality.\n" + .string "Never forget...”$" SouthernIsland_Exterior_Text_1C52FB:: @ 81C52FB - .string "“Die, denen die Erinnerung verblasst,\n" - .string "versuchen sie im Herzen zu halten.”$" + .string "“Those whose memories fade seek to\n" + .string "carve them in their hearts...”$" diff --git a/data/text/gabby_and_ty.inc b/data/text/gabby_and_ty.inc index a1a65459d..d0eb413be 100644 --- a/data/text/gabby_and_ty.inc +++ b/data/text/gabby_and_ty.inc @@ -1,247 +1,244 @@ Route111_Text_1ABED8:: @ 81ABED8 - .string "PIA: Oh! Wir haben hier viele stark\n" - .string "aussehende TRAINER gesehen!\p" - .string "Okay, Kamera ab!\n" - .string "Interviewen wir jemanden!$" + .string "GABBY: Oh! We’ve just spotted a tough-\n" + .string "looking TRAINER here of all places!\p" + .string "Okay, roll camera!\n" + .string "Let’s get this interview.$" Route111_Text_1ABF50:: @ 81ABF50 Route118_Text_1ABF50:: @ 81ABF50 Route120_Text_1ABF50:: @ 81ABF50 - .string "PIA: Oh! Du bist {PLAYER}! Hallo!\n" - .string "Erinnerst du dich an uns?\p" - .string "Zeigst du uns, wie stark du geworden\n" - .string "bist? Okay, das war das Stichwort.$" + .string "GABBY: Oh! You’re {PLAYER}! Hi!\n" + .string "Do you remember us from last time?\p" + .string "Can you show us how much stronger\n" + .string "you’ve become? Okay, cue interview!$" Route111_Text_1ABFD3:: @ 81ABFD3 - .string "PIA: Mein Gefühl hat nicht getrogen.\n" - .string "Der TRAINER ist wirklich erstaunlich.$" + .string "GABBY: My eyes didn’t lie!\n" + .string "I did discover an astonishing TRAINER!$" Route111_Text_1AC015:: @ 81AC015 - .string "PIA: Erstaunlich! Erstaunlich!\n" - .string "Wer bist du?!?\p" - .string "Ich wusste, wir erleben etwas Außer-\n" - .string "gewöhnliches, als ich dich gesehen habe.\p" - .string "Oh, ich schulde dir eine Erklärung. Wir\n" - .string "reisen durch das Land und führen mit\l" - .string "TRAINERN Interviews.\p" - .string "Würdest du uns auch etwas von deiner\n" - .string "Zeit zur Verfügung stellen?$" + .string "GABBY: Awesome! Awesome!\n" + .string "Who are you?!\p" + .string "I knew we were onto something wild\n" + .string "when we spotted you!\p" + .string "Oh, please let me explain. We travel\n" + .string "around everywhere interviewing all\l" + .string "sorts of TRAINERS.\p" + .string "So, would you give us a bit of your time\n" + .string "for an interview?$" Route111_Text_1AC10A:: @ 81AC10A - .string "PIA: “{STR_VAR_1}!”\p" - .string "Erinnerst du dich? Das hast du uns das\n" - .string "letzte Mal nach einem Kampf gesagt.\p" - .string "So etwas vergesse ich nie!$" + .string "GABBY: “{STR_VAR_1}!”\p" + .string "Do you remember? That’s the quote you\n" + .string "gave us as the battle clincher last time.\p" + .string "I never, ever forget stuff like that!$" Route111_Text_1AC18D:: @ 81AC18D - .string "Als wir das letzte Mal kämpften, hast du\n" - .string "uns in den Boden gerammt, bevor wir\l" - .string "etwas dagegen tun konnten...\p" - .string "Und wie sieht es heute aus? Dürfen\n" - .string "wir dich noch einmal interviewen?$" + .string "The last time we battled, you stomped\n" + .string "us before we could brace ourselves...\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" Route111_Text_1AC219:: @ 81AC219 - .string "Hast du bei unserem letzten Kampf nicht\n" - .string "einen POKéBALL nach uns geworfen?\p" - .string "Wir waren geschockt! Daher haben wir\n" - .string "das jedem, wirklich jedem, erzählt!\p" - .string "Was meinst du? Dürfen wir dich noch\n" - .string "einmal interviewen?$" + .string "The last time we battled, didn’t you\n" + .string "throw a POKé BALL at us?\p" + .string "We were shocked! So we told everyone,\n" + .string "just everyone, about it!\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" Route111_Text_1AC2D6:: @ 81AC2D6 - .string "Bei unserem letzten Kampf hast du uns\n" - .string "mit dem Einsatz der Items geschlagen.\p" - .string "Was meinst du? Dürfen wir dich noch\n" - .string "einmal interviewen?$" + .string "The last time we battled, your item\n" + .string "skills cleverly did us in.\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" Route111_Text_1AC355:: @ 81AC355 - .string "In unserem letzten Kampf haben wir uns\n" - .string "bemüht, nicht ganz so übel auszusehen.\p" - .string "Was meinst du? Dürfen wir dich noch\n" - .string "einmal interviewen?$" + .string "The last time we battled, we managed\n" + .string "to look respectable.\p" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" Route111_Text_1AC3CF:: @ 81AC3CF - .string "Was meinst du? Dürfen wir dich noch\n" - .string "einmal interviewen?$" + .string "Anyway, what do you think?\n" + .string "Do you want to be interviewed again?$" Route111_Text_1AC40F:: @ 81AC40F - .string "Ja?\n" - .string "Wunderbar! Danke!\p" - .string "Okay. Wie würdest du deine Gefühle\n" - .string "hinsichtlich unseres Kampfes\l" - .string "beschreiben? Kurz und nett, bitte.$" + .string "You will?\n" + .string "Thank you!\p" + .string "Okay, I need you to describe your\n" + .string "feelings about our battle, but it\l" + .string "has to be short and sweet. Go!$" Route111_Text_1AC487:: @ 81AC487 - .string "PIA: Mmm, yeah!\n" - .string "Das ist das perfekte Schlagwort!\p" - .string "Ich bin überzeugt, dass dies eine groß-\n" - .string "artige TV-Sendung wäre!\p" - .string "Vielleicht strahlen sie dies im Fern-\n" - .string "sehen aus, also achte auf das Programm!\p" + .string "GABBY: Mmm, yeah!\n" + .string "That’s the perfect clincher!\p" + .string "I get the feeling that this will make\n" + .string "a great TV show.\p" + .string "There’s a chance that they’ll air this\n" + .string "on TV, so make sure to look for us!\p" .string "Okay!\n" - .string "Man sieht sich!$" + .string "We’ll be seeing you!$" Route111_Text_1AC553:: @ 81AC553 - .string "PIA: Oh...\p" - .string "Okay, aber gib nicht auf!\n" - .string "Wir werden dich weiter im Auge behalten!$" + .string "GABBY: Oh...\p" + .string "Okay, but don’t give up!\n" + .string "We’ll be keeping an eye out for you!$" Route111_Text_1AC59E:: @ 81AC59E Route118_Text_1AC59E:: @ 81AC59E Route120_Text_1AC59E:: @ 81AC59E - .string "PIA: Wir werden dich im Auge behalten!$" + .string "GABBY: We’ll be keeping an eye out\n" + .string "for you!$" Route111_Text_1AC5CA:: @ 81AC5CA Route118_Text_1AC5CA:: @ 81AC5CA Route120_Text_1AC5CA:: @ 81AC5CA - .string "PIA: Gibt es irgendwo einen starken\n" - .string "TRAINER mit vielen POKéMON?$" + .string "GABBY: Is there a strong TRAINER\n" + .string "anywhere with a lot of POKéMON?$" Route111_Text_1AC60B:: @ 81AC60B - .string "PIA: Wow, das war was!\p" - .string "Seit unserem letzten Kampf bist du\n" - .string "stärker geworden - viel stärker.\p" - .string "Unser Gefühl, du würdest ein heißer\n" - .string "TRAINER werden, hat uns Recht gegeben.\p" - .string "Was meinst du? Dürfen wir dich noch\n" - .string "einmal interviewen?$" + .string "GABBY: Wow, you are something!\p" + .string "You’ve gotten a lot stronger - a lot -\n" + .string "since we last battled.\p" + .string "We were right about you when we\n" + .string "spotted you as a hot TRAINER.\p" + .string "So, anyway, what do you think?\n" + .string "Are you willing to give us an interview\l" + .string "this time?$" Route111_Text_1AC6F8:: @ 81AC6F8 Route118_Text_1AC6F8:: @ 81AC6F8 Route120_Text_1AC6F8:: @ 81AC6F8 - .string "PIA: Das war aber ein intensiver\n" - .string "Kampf! Hast du alles aufgezeichnet?!?$" + .string "GABBY: That was an intense battle!\n" + .string "Did you get all that on camera?$" Route111_Text_1AC73B:: @ 81AC73B - .string "UDO: Hey, guck mal! Ein stark\n" - .string "aussehender TRAINER! Und das hier\l" - .string "an diesem Ort! Kamera ab!$" + .string "TY: Hey, lookie here! A tough-looking\n" + .string "TRAINER here, of all places!\l" + .string "Camera’s rolling!$" Route111_Text_1AC790:: @ 81AC790 Route118_Text_1AC790:: @ 81AC790 Route120_Text_1AC790:: @ 81AC790 - .string "UDO: Da schau her!\n" - .string "Ich erinnere mich an dich!\p" - .string "Ich werde den ganzen Kampf mit der\n" - .string "Kamera aufnehmen!$" + .string "TY: Hey, lookie here!\n" + .string "I remember you!\p" + .string "I’ll get this battle all on this\n" + .string "here camera!$" Route111_Text_1AC7E4:: @ 81AC7E4 Route118_Text_1AC7E4:: @ 81AC7E4 Route120_Text_1AC7E4:: @ 81AC7E4 - .string "UDO: Du bist ein Naturtalent!\n" - .string "Du gibst mir erstklassiges Bildmaterial!$" + .string "TY: You’re a natural!\n" + .string "Got me some prime footage right here!$" Route111_Text_1AC820:: @ 81AC820 Route118_Text_1AC820:: @ 81AC820 Route120_Text_1AC820:: @ 81AC820 - .string "UDO: Du hast nur ein POKéMON?\n" - .string "Mehr nicht?\p" - .string "Wenn du mehr POKéMON hättest, wäre\n" - .string "das Bildmaterial viel, viel besser!$" + .string "TY: Do you only have the one POKéMON\n" + .string "and that’s it?\p" + .string "If you had more POKéMON, it’d make for\n" + .string "better footage, but...$" Route111_Text_1AC892:: @ 81AC892 - .string "UDO: Wir haben tatsächlich einen\n" - .string "starken TRAINER entdeckt.\l" - .string "Das ist unser Durchbruch.$" + .string "TY: Yep, we sure spotted a hot TRAINER.\n" + .string "This is a huge scoop for us!$" Route111_Text_1AC8D7:: @ 81AC8D7 Route118_Text_1AC8D7:: @ 81AC8D7 Route120_Text_1AC8D7:: @ 81AC8D7 - .string "UDO: Ja, alles im Kasten!\n" - .string "Der ganze Kampf ist auf Band!$" + .string "TY: Yep, I got it all.\n" + .string "That whole battle’s on camera.$" gTVGabbyAndTyText1:: @ 81AC90D - .string "AUF DER SUCHE NACH TRAINERN...\p" - .string "PIA: Hallo! Heute besuche ich ein Ge-\n" - .string "biet in der Nähe von {STR_VAR_1}.\p" - .string "Wir versuchen, ein neues, großes\n" - .string "Talent zu finden.\p" - .string "Unsere Kamera ruht daher auf dem\n" + .string "IN SEARCH OF TRAINERS...\p" + .string "GABBY: Hi! Today I’m visiting an area\n" + .string "near {STR_VAR_1}.\p" + .string "We’re trying to spot some up-and-coming\n" + .string "new talent in the field.\p" + .string "Today, we turned our lens on the\n" .string "TRAINER {PLAYER}.\p" - .string "Etwas an diesem TRAINER hat unser\n" - .string "Interesse geweckt...$" + .string "There’s something about this TRAINER\n" + .string "that piqued our interest.$" gTVGabbyAndTyText2:: @ 81ACA02 - .string "Wir sind schon früher gegen {PLAYER}\n" - .string "angetreten, und wir versichern, dass\l" - .string "der TRAINER viel stärker geworden ist!\p" - .string "Ich wusste sofort, dass wir hier einen\n" - .string "ganz besonderen TRAINER vor uns haben.$" + .string "We’ve battled {PLAYER} before, but we\n" + .string "can attest that the TRAINER has most\l" + .string "definitely improved from before.\p" + .string "I knew we were onto someone special\n" + .string "when we spotted this TRAINER!$" gTVGabbyAndTyText3:: @ 81ACAAA - .string "Die beste Art, das Können eines\n" - .string "TRAINERS festzustellen, ist...\p" - .string "Das Tempo des Kampfes anzuheben.\n" - .string "Und das haben wir gemacht.\p" + .string "The best way to determine how strong\n" + .string "a TRAINER is...\p" + .string "Well, the fastest way is to battle.\n" + .string "And so we began our investigation!\p" .string "... ...\p" - .string "Und so endete schließlich der Kampf\n" - .string "gegen {PLAYER}.\p" - .string "Seine dominierende Vorstellung schlug\n" - .string "uns vernichtend, zerknüllte uns und\l" - .string "warf uns weg.\p" - .string "{PLAYER} ist einfach unglaublich stark...\p" - .string "Gehen wir etwas näher auf den Kampf\n" - .string "ein.$" + .string "That’s how we ended up in battle\n" + .string "with {PLAYER}.\p" + .string "In a dominating performance, we were\n" + .string "flattened, rolled up, and tossed aside!\p" + .string "{PLAYER} is ruthlessly strong...\p" + .string "We asked the TRAINER for a succinct\n" + .string "summation of the battle we shared.$" gTVGabbyAndTyText4:: @ 81ACC07 - .string "Die Kombination von {STR_VAR_1} und\n" - .string "{STR_VAR_3} war einfach göttlich!\p" - .string "Schon die Ausstrahlung der beiden ließ\n" - .string "erkennen, dass sie sich gegenseitig un-\l" - .string "eingeschränkt unterstützen würden.\p" - .string "Einfach eine unglaubliche Atmosphäre!\p" - .string "Der TRAINER setzte als letzte Attacke\n" - .string "{STR_VAR_2} ein.\p" - .string "Die Attacke {STR_VAR_2} ist das\n" - .string "Zeichen der Freundschaft zwischen\l" - .string "{STR_VAR_1} und {STR_VAR_3}.$" + .string "The combination of {STR_VAR_1} and\n" + .string "{STR_VAR_3} was divine!\p" + .string "The sight of them - {STR_VAR_1} and\n" + .string "{STR_VAR_3} - selflessly supporting\l" + .string "each other in the thick of battle...\p" + .string "It was a marvelous sight to behold!\p" + .string "{STR_VAR_2} was the move the TRAINER\n" + .string "used last in our battle.\p" + .string "The move {STR_VAR_2} is {STR_VAR_1}\n" + .string "and {STR_VAR_3}’s sign of friendship!$" gTVGabbyAndTyText5:: @ 81ACD13 - .string "So geht mein ganzes Selbstbewusstsein\n" - .string "dahin... Die Folge unserer Entdeckung.\p" - .string "Wir wurden geschlagen, bevor wir\n" - .string "überhaupt eine einzige Attacke ein-\l" - .string "setzen konnten. Oooh... Schnüff...\p" - .string "Allein das macht die Kämpfe von\n" - .string "{PLAYER} schon sehenswert.\p" - .string "Ich fordere mutige TRAINER auf, sich\n" - .string "mit {PLAYER} zu messen!$" + .string "...I lost confidence in myself as\n" + .string "a result of our encounter.\p" + .string "We were beaten before we could launch\n" + .string "a single attack.\l" + .string "Ohhh... Snivel...\p" + .string "In spite of that, {PLAYER}’s battles\n" + .string "are worth seeing.\p" + .string "I recommend confident TRAINERS to\n" + .string "challenge {PLAYER}.$" gTVGabbyAndTyText6:: @ 81ACDFA - .string "Dazu gibt es nur eines zu sagen.\n" - .string "Wage es nicht, während eines Kampfes\l" - .string "einen POKéBALL zu werfen!\p" - .string "{PLAYER} mag ein starker Kämpfer sein,\n" - .string "aber die Regeln kennt er nicht.\p" - .string "Ich gebe unseren Zuschauern\n" - .string "einen Tipp.\p" - .string "Wenn ihr {PLAYER} seht, dann weist den\n" - .string "TRAINER zurecht!$" + .string "There’s only one thing to be said.\n" + .string "Don’t you dare throw a POKé BALL during\l" + .string "a TRAINER battle!\p" + .string "{PLAYER} is certainly strong, but has\n" + .string "no clue about the basic rules.\p" + .string "To our TV audience, I have a request.\p" + .string "If you see {PLAYER}, please caution\n" + .string "the TRAINER!$" gTVGabbyAndTyText7:: @ 81ACEE7 - .string "{PLAYER} hat ein Talent dafür, das Vor-\n" - .string "gehen seines Gegners vorherzusehen.\p" - .string "Das Item wurde erstaunlicherweise \n" - .string "genau zum richtigen Zeitpunkt benutzt!$" + .string "{PLAYER} is adept at reading the\n" + .string "opponent’s actions.\p" + .string "The timing of item usage was remarkably\n" + .string "effective!$" gTVGabbyAndTyText8:: @ 81ACF49 - .string "Ehrlich gesagt, bin ich davon ausge-\n" - .string "gangen, dass ich sehr gut bin.\p" - .string "Auch wenn wir verloren hätten, dann\n" - .string "wäre der Kampf heiß gewesen!\p" - .string "Wenn du es mit uns aufnehmen willst,\n" - .string "{PLAYER}, musst du noch viel trainieren!$" + .string "Honestly speaking, I thought that\n" + .string "I might even be pretty good.\p" + .string "While we did end up losing, we did have\n" + .string "a hotly contested battle.\p" + .string "But if you’re struggling against me,\n" + .string "you have a ways to go, {PLAYER}!$" gTVGabbyAndTyText9:: @ 81AD00A - .string "Nach dem Kampf baten wir {PLAYER}\n" - .string "um eine kurze Stellungnahme.\p" - .string "Der TRAINER sagte: “{STR_VAR_1}”.\p" - .string "Die POKéMON {STR_VAR_2} und\n" - .string "{STR_VAR_3} von {PLAYER}...\l" - .string "Und “{STR_VAR_1}”...\p" - .string "Mmh! Sehr tiefsinnig! Da liegt ein\n" - .string "tieferer Sinn in dieser Aussage!\p" - .string "Kein Wunder! Ein bedeutender TRAINER\n" - .string "wird auch bedeutende Worte sagen!\p" - .string "Das war’s für heute!\n" - .string "Bis zur nächsten Sendung!$" + .string "After our battle, we asked {PLAYER} for\n" + .string "a succinct summary.\p" + .string "The TRAINER replied, “{STR_VAR_1}.”\p" + .string "{PLAYER}’s POKéMON {STR_VAR_2} and\n" + .string "{STR_VAR_3}...\l" + .string "And “{STR_VAR_1}”...\p" + .string "Mmm! That’s deep! There’s deep\n" + .string "significance behind that quote!\p" + .string "It’s no surprise - a good TRAINER has\n" + .string "good things to say.\p" + .string "That’s all for today!\n" + .string "See you again on our next broadcast!$" diff --git a/data/text/giddy.inc b/data/text/giddy.inc index 8bc5bebda..a763776bf 100644 --- a/data/text/giddy.inc +++ b/data/text/giddy.inc @@ -1,16 +1,16 @@ gTextGiddy_Introduction:: @ 81B092A - .string "Ich bin MÄRCHEN-MAN! Ich habe eine sehr\n" - .string "geistreiche Geschichte für dich!\p" - .string "Soll ich sie dir erzählen?$" + .string "I’m GIDDY!\n" + .string "I have a scintillating story for you!\p" + .string "Would you like to hear my story?$" gTextGiddy_YouveDeflatedMe:: @ 81B097C .string "Oh...\n" - .string "Du hast mir die Luft rausgelassen...$" + .string "You’ve deflated me...$" gTextGiddy_AlsoIWasThinking:: @ 81B0998 - .string "Und ich war in Gedanken vertieft...$" + .string "Also, I was thinking...$" gTextGiddy_ByeBye:: @ 81B09B0 - .string "Das wäre alles, glaube ich...\p" - .string "Wir sollten bald wieder ein Schwätzchen\n" - .string "halten! Tschüss!$" + .string "That’s about it, I think...\p" + .string "We should chat again!\n" + .string "Bye-bye!$" diff --git a/data/text/gift_ribbon_descriptions.inc b/data/text/gift_ribbon_descriptions.inc index 8cd5416e8..798d291b9 100644 --- a/data/text/gift_ribbon_descriptions.inc +++ b/data/text/gift_ribbon_descriptions.inc @@ -1,143 +1,143 @@ gGiftRibbonDescriptionPart1_2003RegionalTourney: - .string "REGIONALTURNIER 2003$" + .string "2003 REGIONAL TOURNEY$" gGiftRibbonDescriptionPart2_Champion: - .string "BAND des CHAMPS$" + .string "CHAMPION RIBBON$" gGiftRibbonDescriptionPart1_2003NationalTourney: - .string "NATIONALTURNIER 2003$" + .string "2003 NATIONAL TOURNEY$" gGiftRibbonDescriptionPart1_2003GlobalCup: - .string "WELTPOKAL 2003$" + .string "2003 GLOBAL CUP$" gGiftRibbonDescriptionPart2_RunnerUp: - .string "BAND für Platzierungen$" + .string "Runner-up RIBBON$" gGiftRibbonDescriptionPart2_Semifinalist: - .string "BAND für Halbfinalisten$" + .string "Semifinalist RIBBON$" gGiftRibbonDescriptionPart1_2004RegionalTourney: - .string "REGIONALTURNIER 2004$" + .string "2004 REGIONAL TOURNEY$" gGiftRibbonDescriptionPart1_2004NationalTourney: - .string "NATIONALTURNIER 2004$" + .string "2004 NATIONAL TOURNEY$" gGiftRibbonDescriptionPart1_2004GlobalCup: - .string "WELTPOKAL 2004$" + .string "2004 GLOBAL CUP$" gGiftRibbonDescriptionPart1_2005RegionalTourney: - .string "REGIONALTURNIER 2005$" + .string "2005 REGIONAL TOURNEY$" gGiftRibbonDescriptionPart1_2005NationalTourney: - .string "NATIONALTURNIER 2005$" + .string "2005 NATIONAL TOURNEY$" gGiftRibbonDescriptionPart1_2005GlobalCup: - .string "WELTPOKAL 2005$" + .string "2005 GLOBAL CUP$" gGiftRibbonDescriptionPart1_PokemonBattleCup: - .string "POKéMON-KAMPF-POKAL$" + .string "POKéMON BATTLE CUP$" gGiftRibbonDescriptionPart2_Participation: - .string "Teilnehmer-BAND$" + .string "Participation RIBBON$" gGiftRibbonDescriptionPart1_PokemonLeague: - .string "POKéMON LIGA$" + .string "POKéMON LEAGUE$" gGiftRibbonDescriptionPart1_AdvanceCup: - .string "TALENTPOKAL$" + .string "ADVANCE CUP$" gGiftRibbonDescriptionPart1_PokemonTournament: - .string "POKéMON-Turnier$" + .string "POKéMON Tournament$" gGiftRibbonDescriptionPart2_Participation2: - .string "Teilnehmer-BAND$" + .string "Participation RIBBON$" gGiftRibbonDescriptionPart1_PokemonEvent: - .string "POKéMON-Wettkampf$" + .string "POKéMON Event$" gGiftRibbonDescriptionPart1_PokemonFestival: - .string "POKéMON-Festival$" + .string "POKéMON Festival$" gGiftRibbonDescriptionPart1_DifficultyClearing: - .string "Schw.-Grad-Abschl.$" + .string "Difficulty-clearing$" gGiftRibbonDescriptionPart2_Commemorative: - .string "Gedenk-BAND$" + .string "Commemorative RIBBON$" gGiftRibbonDescriptionPart1_ClearingAllDifficulties: - .string "BAND für erf. Abschluss$" + .string "RIBBON awarded for$" gGiftRibbonDescriptionPart2_ClearingAllDifficulties: - .string "aller Schwierigk.-Grade.$" + .string "clearing all difficulties.$" gGiftRibbonDescriptionPart1_100StraightWin: - .string "100. Sieg in Folge$" + .string "100-straight Win$" gGiftRibbonDescriptionPart1_DarknessTower: - .string "APOKELIPSE-TURM fertig$" + .string "DARKNESS TOWER Clear$" gGiftRibbonDescriptionPart1_RedTower: - .string "ROTER TURM fertig$" + .string "RED TOWER Clear$" gGiftRibbonDescriptionPart1_BlackironTower: - .string "EISERNER TURM fertig$" + .string "BLACKIRON TOWER Clear$" gGiftRibbonDescriptionPart1_FinalTower: - .string "FINAL-TURM-Abschluss$" + .string "FINAL TOWER Clear$" gGiftRibbonDescriptionPart1_LegendMaking: - .string "Legendäres$" + .string "Legend-making$" gGiftRibbonDescriptionPart1_PokemonCenterTokyo: - .string "POKéMON-CENTER TOKIO$" + .string "POKéMON CENTER TOKYO$" gGiftRibbonDescriptionPart1_PokemonCenterOsaka: - .string "POKéMON-CENTER OSAKA$" + .string "POKéMON CENTER OSAKA$" gGiftRibbonDescriptionPart1_PokemonCenterNagoya: - .string "POKéMON-CENTER NAGOYA$" + .string "POKéMON CENTER NAGOYA$" gGiftRibbonDescriptionPart1_PokemonCenterNY: - .string "POKéMON-CENTER N. Y.$" + .string "POKéMON CENTER NY$" gGiftRibbonDescriptionPart1_SummerHolidays: - .string "Sommerferien-BAND$" + .string "Summer Holidays RIBBON$" gGiftRibbonDescriptionPart2_EmptyString: .string "$" gGiftRibbonDescriptionPart1_WinterHolidays: - .string "Weihnachtsferien-BAND$" + .string "Winter Holidays RIBBON$" gGiftRibbonDescriptionPart1_SpringHolidays: - .string "Osterferien-BAND$" + .string "Spring Holidays RIBBON$" gGiftRibbonDescriptionPart1_Evergreen: - .string "Evergreen-BAND$" + .string "Evergreen RIBBON$" gGiftRibbonDescriptionPart1_SpecialHoliday: - .string "Sonderurlaubs-BAND$" + .string "Special Holiday RIBBON$" gGiftRibbonDescriptionPart1_HardWorker: - .string "Fleiß-BAND$" + .string "Hard Worker RIBBON$" gGiftRibbonDescriptionPart1_LotsOfFriends: - .string "Beliebtheits-BAND$" + .string "Lots of Friends RIBBON$" gGiftRibbonDescriptionPart1_FullOfEnergy: - .string "Energie-BAND$" + .string "Full of Energy RIBBON$" gGiftRibbonDescriptionPart1_LovedPokemon: - .string "Ein Gedenk-BAND für ein$" + .string "A commemorative RIBBON$" gGiftRibbonDescriptionPart2_LovedPokemon: - .string "beliebtes POKéMON.$" + .string "for a loved POKéMON.$" gGiftRibbonDescriptionPart1_LoveForPokemon: - .string "Ein BAND für POKéMON-$" + .string "RIBBON that shows$" gGiftRibbonDescriptionPart2_LoveForPokemon: - .string "Freunde.$" + .string "love for POKéMON.$" .align 2 gGiftRibbonDescriptions:: @ 83E158C diff --git a/data/text/hipster.inc b/data/text/hipster.inc index 8801b05fd..630db02b2 100644 --- a/data/text/hipster.inc +++ b/data/text/hipster.inc @@ -1,19 +1,20 @@ gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B - .string "Hey, yo! Man nennt mich TRENDWIG. Ich\n" - .string "zeige dir, was hip ist und abgeht.$" + .string "Hey, yo! They call me the HIPSTER.\n" + .string "I’ll teach you what’s hip and happening.$" gTextHipster_TaughtYouAlready:: @ 81B0CA7 - .string "Aber, hey, ich habe dir doch schon ge-\n" - .string "zeigt, was hip ist und abgeht.\p" - .string "Ich will das auch anderen mitteilen.$" + .string "But, hey, I taught you what’s hip and\n" + .string "happening already.\p" + .string "I’d like to spread the good word to\n" + .string "other folks.$" gTextHipster_YouAlreadyKnowALot:: @ 81B0D11 - .string "Aber, hey, ich habe dir doch schon ge-\n" - .string "zeigt, was hip ist und abgeht.\p" - .string "Ich habe nichts mehr in petto.$" + .string "But, hey, you already know a lot about\n" + .string "what’s hip and happening.\p" + .string "I’ve got nothing new to teach you!$" gTextHipster_HaveYouHeardAbout:: @ 81B0D75 - .string "Hast du schon von\n" - .string "“{STR_VAR_1}” gehört?\p" - .string "Was das heißt? Ähäm...\n" - .string "Frag mal deinen Papi oder deine Mami, ja?$" + .string "Hey, have you heard about\n" + .string "“{STR_VAR_1}”?\p" + .string "What’s it mean? Well...\n" + .string "Ask your daddy or mommy, okay?$" diff --git a/data/text/landmarks.inc b/data/text/landmarks.inc index 8d78c37db..72d5398bd 100644 --- a/data/text/landmarks.inc +++ b/data/text/landmarks.inc @@ -1,110 +1,110 @@ gLandmarkName_FlowerShop:: - .string "BLUMENLADEN$" + .string "FLOWER SHOP$" gLandmarkName_PetalburgWoods:: - .string "BLÜTENBURGWALD$" + .string "PETALBURG WOODS$" gLandmarkName_MrBrineysCottage:: - .string "MR. BRACKS HÜTTE$" + .string "MR. BRINEY’S COTTAGE$" gLandmarkName_AbandonedShip:: - .string "SCHIFFSWRACK$" + .string "ABANDONED SHIP$" gLandmarkName_SeashoreHouse:: - .string "STRANDHAUS$" + .string "SEASHORE HOUSE$" gLandmarkName_SlateportBeach:: - .string "GRAPHITPORTSTRAND$" + .string "SLATEPORT BEACH$" gLandmarkName_CyclingRoad:: - .string "RADWEG$" + .string "CYCLING ROAD$" gLandmarkName_NewMauville:: - .string "NEU MALVENFROH$" + .string "NEW MAUVILLE$" gLandmarkName_TrickHouse:: - .string "RÄTSELHAUS$" + .string "TRICK HOUSE$" gLandmarkName_OldLadysRestShop:: - .string "HOTEL DER ALTEN DAME$" + .string "OLD LADY’S REST STOP$" gLandmarkName_Desert:: - .string "WÜSTE$" + .string "DESERT$" gLandmarkName_WinstrateFamily:: - .string "FAMILIE SIHGERS$" + .string "THE WINSTRATE FAMILY$" gLandmarkName_CableCar:: - .string "SEILBAHN$" + .string "CABLE CAR$" gLandmarkName_GlassWorkshop:: - .string "GLASWERKSTATT$" + .string "GLASS WORKSHOP$" gLandmarkName_WeatherInstitute:: - .string "KLIMA-INSTITUT$" + .string "WEATHER INSTITUTE$" gLandmarkName_MeteorFalls:: - .string "METEORFÄLLE$" + .string "METEOR FALLS$" gLandmarkName_TunnelersRestHouse:: - .string "BERGRASTHAUS$" + .string "TUNNELER’S REST HOUSE$" gLandmarkName_RusturfTunnel:: - .string "METAFLURTUNNEL$" + .string "RUSTURF TUNNEL$" gLandmarkName_PokemonDayCare:: - .string "POKéMON-PENSION$" + .string "POKéMON DAY CARE$" gLandmarkName_SafariZoneEntrance:: - .string "EINGANG SAFARI-ZONE$" + .string "SAFARI ZONE ENTRANCE$" gLandmarkName_MtPyre:: - .string "PYROBERG$" + .string "MT. PYRE$" gLandmarkName_ShoalCave:: - .string "KÜSTENHÖHLE$" + .string "SHOAL CAVE$" gLandmarkName_SeafloorCavern:: - .string "TIEFSEEHÖHLE$" + .string "SEAFLOOR CAVERN$" gLandmarkName_GraniteCave:: - .string "GRANITHÖHLE$" + .string "GRANITE CAVE$" gLandmarkName_OceanCurrent:: - .string "MEERESSTRÖMUNG$" + .string "OCEAN CURRENT$" gLandmarkName_LanettesHouse:: - .string "LANETTES HAUS$" + .string "LANETTE’S HOUSE$" gLandmarkName_FieryPath:: - .string "FEURIGER PFAD$" + .string "FIERY PATH$" gLandmarkName_JaggedPass:: - .string "STEILPASS$" + .string "JAGGED PASS$" gLandmarkName_SkyPillar:: - .string "HIMMELTURM$" + .string "SKY PILLAR$" gLandmarkName_BerryMastersHouse:: - .string "BEERENMEISTER-VILLA$" + .string "BERRY MASTER’S HOUSE$" gLandmarkName_IslandCave:: - .string "INSELHÖHLE$" + .string "ISLAND CAVE$" gLandmarkName_DesertRuins:: - .string "WÜSTENRUINE$" + .string "DESERT RUINS$" gLandmarkName_ScorchedSlab:: - .string "SONNENGROTTE$" + .string "SCORCHED SLAB$" gLandmarkName_AncientTomb:: - .string "GRABMAL$" + .string "ANCIENT TOMB$" gLandmarkName_SealedChamber:: - .string "SIEGELKAMMER$" + .string "SEALED CHAMBER$" gLandmarkName_FossilManiacsHouse:: - .string "FOSSILMANIACS HAUS$" + .string "FOSSIL MANIAC’S HOUSE$" gLandmarkName_HuntersHouse:: - .string "HAUS DES TAUCHERS$" + .string "HUNTER’S HOUSE$" diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc index b38a328d4..6fb3f1e91 100644 --- a/data/text/lottery_corner.inc +++ b/data/text/lottery_corner.inc @@ -1,82 +1,81 @@ LilycoveCity_DepartmentStore_1F_Text_1C4B5E:: @ 81C4B5E - .string "Dies ist die POKéMON-LOTTERIE.\p" - .string "Alle Besucher des EINKAUFSZENTRUMS\n" - .string "können einen POKéMON-LOTTOSCHEIN\l" - .string "ziehen.\p" - .string "Wenn die Nummer des LOTTOSCHEINS mit\n" - .string "der ID-Nummer eines deiner POKéMON\l" - .string "übereinstimmt, gewinnst du einen Preis.\p" - .string "Möchtest du einen\n" - .string "POKéMON-LOTTOSCHEIN ziehen?$" + .string "This is the POKéMON LOTTERY CORNER.\p" + .string "All shoppers visiting our DEPARTMENT\n" + .string "STORE get to draw a POKéMON LOTO\l" + .string "TICKET.\p" + .string "If the LOTO TICKET’s number matches\n" + .string "the ID number of any of your POKéMON,\l" + .string "you will receive a fabulous gift.\p" + .string "Would you like to draw a POKéMON\n" + .string "LOTO TICKET?$" LilycoveCity_DepartmentStore_1F_Text_1C4C6A:: @ 81C4C6A - .string "Bitte, komme morgen wieder.$" + .string "Please come back tomorrow.$" LilycoveCity_DepartmentStore_1F_Text_1C4C85:: @ 81C4C85 - .string "Bitte, besuche uns bald wieder.$" + .string "Please do visit us again.$" UnknownString_81C4C9F: @ 81C4C9F - .string "Bitte, ziehe einen LOTTOSCHEIN.\n" + .string "Please pick a LOTO TICKET.\n" .string "... ... ...$" LilycoveCity_DepartmentStore_1F_Text_1C4CC6:: @ 81C4CC6 - .string "Bitte, ziehe einen LOTTOSCHEIN.\n" - .string "...{0xFC}Ë{0x39} ...{0xFC}Ë{0x39} ...{0xFC}Ë{0x39}$" + .string "Please pick a LOTO TICKET.\n" + .string "...{PAUSE}{0x39} ...{PAUSE}{0x39} ...{PAUSE}{0x39}$" LilycoveCity_DepartmentStore_1F_Text_1C4CF6:: @ 81C4CF6 - .string "Der LOTTOSCHEIN hat die Nummer {STR_VAR_1}.\p" - .string "Ich muss diese Nummer jetzt prüfen,\n" - .string "um zu sehen, ob sie mit der ID-Nummer\l" - .string "eines deiner POKéMON übereinstimmt.$" + .string "The LOTO TICKET number is {STR_VAR_1}.\p" + .string "I need to run a check on this number\n" + .string "to see if it matches any of your\l" + .string "POKéMON’s ID numbers. Please wait.$" LilycoveCity_DepartmentStore_1F_Text_1C4D7D:: @ 81C4D7D - .string "Herzlichen Glückwunsch!\p" - .string "Die ID-Nummer deines {STR_VAR_1} im\n" - .string "Team stimmt mit der des LOTTO-\l" - .string "SCHEINS überein!$" + .string "Congratulations!\p" + .string "The ID number of your team’s\n" + .string "{STR_VAR_1} matches your LOTO TICKET’s\l" + .string "number!$" LilycoveCity_DepartmentStore_1F_Text_1C4DD1:: @ 81C4DD1 - .string "Herzlichen Glückwunsch!\p" - .string "Die ID-Nummer deines {STR_VAR_1} in\n" - .string "der Box des PCs stimmt mit der des\l" - .string "LOTTOSCHEINS überein!$" + .string "Congratulations!\p" + .string "The ID number of your PC-boxed\n" + .string "{STR_VAR_1} matches your LOTO TICKET’s\l" + .string "number!$" LilycoveCity_DepartmentStore_1F_Text_1C4E27:: @ 81C4E27 - .string "Tut mir Leid.\n" - .string "Keine der Nummern stimmt überein.$" + .string "I’m sorry.\n" + .string "None of the numbers matched.$" LilycoveCity_DepartmentStore_1F_Text_1C4E4F:: @ 81C4E4F - .string "Zwei Ziffern stimmen überein,\n" - .string "daher bekommst du den dritten Preis!\l" - .string "Du gewinnst {STR_VAR_1}!$" + .string "Two digits matched, so you win the\n" + .string "third prize!\l" + .string "You’ve won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4E92:: @ 81C4E92 - .string "Drei Ziffern stimmen überein,\n" - .string "daher bekommst du den zweiten Preis!\l" - .string "Du gewinnst {STR_VAR_1}!$" + .string "Three digits matched, so you win the\n" + .string "second prize!\l" + .string "You’ve won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4ED8:: @ 81C4ED8 - .string "Vier Ziffern stimmen überein,\n" - .string "daher bekommst du den ersten Preis!\l" - .string "Du gewinnst {STR_VAR_1}!$" + .string "Four digits matched, so you win the\n" + .string "first prize!\l" + .string "You’ve won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4F1C:: @ 81C4F1C - .string "Meine Güte! Alle fünf Ziffern stimmen\n" - .string "überein!\p" - .string "Du hast den Jackpot geknackt!\n" - .string "Du gewinnst {STR_VAR_1}!$" + .string "Oh, my goodness, all five digits matched!\p" + .string "You’ve won the jackpot prize!\n" + .string "You’ve won the {STR_VAR_1}!$" LilycoveCity_DepartmentStore_1F_Text_1C4F77:: @ 81C4F77 - .string "Oh! Du scheinst keinen Platz\n" - .string "dafür zu haben.\p" - .string "Wenn du wieder Platz in deinem BEUTEL\n" - .string "hast, lass es mich wissen.$" + .string "Oh?\n" + .string "You seem to have no room for this.\p" + .string "Please make room in your BAG and\n" + .string "let me know.$" LilycoveCity_DepartmentStore_1F_Text_1C4FCC:: @ 81C4FCC .string "{PLAYER}?\n" - .string "Ja, ich habe dich schon erwartet.\p" - .string "Diesen Preis habe ich für dich\n" - .string "aufbewahrt.$" + .string "Yes, I’ve been expecting you.\p" + .string "This is the prize we’ve been holding\n" + .string "for you.$" LilycoveCity_DepartmentStore_1F_Text_1C501C:: @ 81C501C - .string "Bitte, besuche uns bald wieder.$" + .string "Please do visit again.$" diff --git a/data/text/magma_awakening.inc b/data/text/magma_awakening.inc index e42444437..c64b35543 100644 --- a/data/text/magma_awakening.inc +++ b/data/text/magma_awakening.inc @@ -1,101 +1,97 @@ SeafloorCavern_Room9_Text_1B4850:: @ 81B4850 - .string "MARC: Bleib sofort stehen!$" + .string "MAXIE: Hold it right there.$" SeafloorCavern_Room9_Text_1B486C:: @ 81B486C - .string "MARC: Hahahaha...\n" - .string "Du warst das also die ganze Zeit!$" + .string "MAXIE: Fufufu...\n" + .string "So it was you, after all.$" SeafloorCavern_Room9_Text_1B4897:: @ 81B4897 - .string "MARC: Schau nur, schau nur!\p" - .string "Schau, wie schön die schlafende Gestalt\n" - .string "des antiken POKéMON GROUDON ist!\p" - .string "Ich habe so lange auf diesen Tag\n" - .string "gewartet...$" + .string "MAXIE: Behold!\p" + .string "See how beautiful it is, the sleeping\n" + .string "form of the ancient POKéMON GROUDON!\p" + .string "I have waited so long for this day to\n" + .string "come...$" SeafloorCavern_Room9_Text_1B491F:: @ 81B491F - .string "MARC: Es überrascht mich, wie du es ge-\n" - .string "schafft hast, mir zu folgen.\p" - .string "Aber das ist nun alles Nebensache.\p" - .string "Damit meine Träume wahr werden, musst\n" - .string "du leider verschwinden!$" + .string "MAXIE: It surprises me, how you’ve\n" + .string "managed to chase me here.\p" + .string "But that’s all over now.\p" + .string "For the realization of my dream,\n" + .string "you must disappear now!$" SeafloorCavern_Room9_Text_1B49AE:: @ 81B49AE - .string "Ich...\n" - .string "Ich habe wieder verloren?$" + .string "I...\n" + .string "I lost again?$" SeafloorCavern_Room9_Text_1B49C1:: @ 81B49C1 - .string "MARC: Kicher...\p" - .string "Ich empfehle mich. Ich muss sagen, du\n" - .string "bist wirklich sehr talentiert.\p" - .string "Aber!\n" - .string "Ich habe dieses hier in meinem Besitz!\p" - .string "Mit dieser BLAUEN KUGEL kann ich\n" + .string "MAXIE: Fufufu...\p" + .string "I commend you. I must recognize that\n" + .string "you are truly gifted.\p" + .string "But!\n" + .string "I have this in my possession!\p" + .string "With this BLUE ORB, I can make\n" .string "GROUDON...$" SeafloorCavern_Room9_Text_1B4A5A:: @ 81B4A5A - .string "Die BLAUE KUGEL beginnt plötzlich von\n" - .string "innen heraus zu leuchten!$" + .string "The BLUE ORB suddenly began shining\n" + .string "by itself!$" SeafloorCavern_Room9_Text_1B4A89:: @ 81B4A89 - .string "MARC: Was?!?\p" - .string "Ich habe doch gar nichts gemacht.\n" - .string "Die BLAUE KUGEL... Warum...\p" - .string "Wo ist GROUDON geblieben?$" + .string "MAXIE: What?!\p" + .string "I didn’t do anything.\n" + .string "Why did the BLUE ORB...\p" + .string "Where did GROUDON go?$" SeafloorCavern_Room9_Text_1B4ADB:: @ 81B4ADB - .string "MARC: Hm? Dies ist eine Nachricht\n" - .string "unserer Mitglieder draußen...$" + .string "MAXIE: Hm? It’s a message from our\n" + .string "members outside...$" SeafloorCavern_Room9_Text_1B4B11:: @ 81B4B11 - .string "MARC: Ja, was ist denn jetzt los?\p" + .string "MAXIE: Yes, what is it?\p" .string "Hm...\n" - .string "Die Sonne scheint? So extrem?\p" - .string "Gut... Genau darauf habe ich gewartet.\n" - .string "Deshalb haben wir GROUDON erweckt.\l" - .string "Um TEAM MAGMAS Vision von der Erweite-\l" - .string "rung der Landmassen zu realisieren.\p" - .string "Was?!?\p" - .string "Es ist heißer, als wir es vorausgesagt\n" - .string "haben? Die Hitze ist sogar gefährlich?\p" - .string "Das kann nicht sein...\n" - .string "Das ist unmöglich...\p" - .string "Bleib wo du bist und behalte die\n" - .string "Situation im Auge!$" + .string "The sun is burning brightly?\p" + .string "Good... That should have happened.\n" + .string "That is why we awakened GROUDON,\l" + .string "to realize TEAM MAGMA’s vision of\l" + .string "expanding the world’s landmass.\p" + .string "What?!\p" + .string "It’s far hotter than we envisioned?\n" + .string "It’s so hot that it’s dangerous?\p" + .string "That can’t be...\n" + .string "That’s just not possible...\p" + .string "Hold your position and monitor the\n" + .string "situation!$" SeafloorCavern_Room9_Text_1B4C79:: @ 81B4C79 - .string "MARC: Irgendetwas stimmt da ganz und\n" - .string "gar nicht...\p" - .string "Die BLAUE KUGEL sollte GROUDON auf-\n" - .string "wecken und unter Kontrolle halten...\p" - .string "Aber... Warum?\n" - .string "Warum ist GROUDON verschwunden?\p" - .string "Warum?!?$" + .string "MAXIE: There’s something wrong...\p" + .string "The BLUE ORB is supposed to awaken\n" + .string "and control GROUDON...\p" + .string "But... Why?\n" + .string "Why did GROUDON disappear?\p" + .string "Why?!$" SeafloorCavern_Room9_Text_1B4D02:: @ 81B4D02 - .string "ADRIAN: Was hast du da nur herauf-\n" - .string "beschworen?\p" - .string "MARC... Du hast GROUDON aufge-\n" - .string "weckt, stimmt’s?\p" - .string "Was wird nur aus der Welt, wenn die\n" - .string "Sonne bis in alle Ewigkeit mit dieser\l" - .string "Kraft scheint?\p" - .string "Die Meere werden austrocknen und\n" - .string "verschwinden...$" + .string "ARCHIE: What have you wrought?\p" + .string "MAXIE... You’ve finally awoken GROUDON,\n" + .string "haven’t you?\p" + .string "What will happen to the world if this\n" + .string "sunshine continues for all eternity?\p" + .string "The world’s seas will all dry up and\n" + .string "disappear...$" SeafloorCavern_Room9_Text_1B4DD3:: @ 81B4DD3 - .string "MARC: Was sagst du da?\p" - .string "Die BLAUE KUGEL sollte mir die Kontrolle\n" - .string "über GROUDON verschaffen...\l" - .string "Das kann einfach nicht wahr sein...$" + .string "MAXIE: What are you saying?\p" + .string "The BLUE ORB should let me control\n" + .string "GROUDON...\l" + .string "That can’t be possible...$" SeafloorCavern_Room9_Text_1B4E37:: @ 81B4E37 - .string "ADRIAN: Wir haben keine Zeit für\n" - .string "Diskussionen!\p" - .string "Geh nach draußen und sieh es dir\n" - .string "selber an!\p" - .string "Sieh, ob das, was du heraufbeschworen\n" - .string "hast, das ist, was du wolltest!$" + .string "ARCHIE: We don’t have the time to\n" + .string "argue about it here!\p" + .string "Get outside and see for yourself!\p" + .string "See if what you’ve wrought is the\n" + .string "world that you desired!$" SeafloorCavern_Room9_Text_1B4ECA:: @ 81B4ECA - .string "ADRIAN: {PLAYER}{KUN}, komm, du musst\n" - .string "ebenfalls von hier verschwinden!$" + .string "ARCHIE: {PLAYER}{KUN}, come on, you have\n" + .string "to get out of here, too!$" diff --git a/data/text/magma_chimney.inc b/data/text/magma_chimney.inc index 15d953e9e..cdfde2ef2 100644 --- a/data/text/magma_chimney.inc +++ b/data/text/magma_chimney.inc @@ -1,150 +1,143 @@ MtChimney_Text_1B37BB:: @ 81B37BB - .string "Die Kraft, die in dem METEORITEN\n" - .string "steckt...\p" - .string "Wenn man die mit dieser Maschine\n" - .string "verstärkt, würde die Aktivität des\l" - .string "SCHLOTBERGS enorm verstärkt...\p" - .string "Hahaha... Der Vulkan würde ausbrechen,\n" - .string "Lava würde erkalten und hart werden.\l" - .string "Und so entsteht neues Land...$" + .string "The power contained in the METEORITE...\p" + .string "By amplifying its power with this\n" + .string "machine, MT. CHIMNEY’s volcanic activity\l" + .string "will instantly intensify...\p" + .string "Fufufu... The volcano will erupt, spewing\n" + .string "lava that will cool and harden.\l" + .string "It will expand the landmass...$" MtChimney_Text_1B38B3:: @ 81B38B3 - .string "MARC: Du schon wieder...\p" - .string "Hör gut zu.\n" - .string "Wir Menschen sind an Land groß\l" - .string "geworden.\p" - .string "Land bedeutet Leben!\n" - .string "Es besitzt absolute Priorität!\p" - .string "Daher widmet sich TEAM MAGMA der Auf-\n" - .string "gabe, die Landmassen zu vergrößern.\p" - .string "So entsteht mehr Raum für neue Arten\n" - .string "von POKéMON.\p" - .string "Und die Menschheit erhält mehr Raum,\n" - .string "sich zu entwickeln.\p" - .string "Das ist die große Vision von TEAM MAGMA!\p" - .string "Ich kann einem sturen Kind wie dir nicht\n" - .string "erlauben, sich uns in den Weg zu stellen.\p" - .string "Ich, MARC, werde dir zeigen, was\n" - .string "passiert, wenn du uns aufhalten willst!$" + .string "MAXIE: You again...\p" + .string "Now listen.\n" + .string "We humans have grown on dry land.\p" + .string "The land is everything!\n" + .string "Its importance is paramount!\p" + .string "That is why we of TEAM MAGMA are\n" + .string "committed to expanding the landmass.\p" + .string "It will create space for new species\n" + .string "of POKéMON to evolve.\p" + .string "It will give us humans more space to\n" + .string "advance.\p" + .string "That is TEAM MAGMA’s vision!\p" + .string "I can’t allow an ignorant child like\n" + .string "you to get in our way.\p" + .string "I, MAXIE, will show you the\n" + .string "consequences of meddling!$" MtChimney_Text_1B3A68:: @ 81B3A68 - .string "Wie bitte?!?\p" - .string "Ich, MARC, wurde ganz hinterhältig\n" - .string "besiegt?!?$" + .string "What?!\p" + .string "I, MAXIE, was caught off guard?!$" MtChimney_Text_1B3A90:: @ 81B3A90 - .string "MARC: Ach, was soll’s.\n" - .string "Ich werde für heute meine Pläne am\l" - .string "SCHLOTBERG vergessen. Für heute!\p" - .string "Niemand wird uns jemals stoppen!\n" - .string "TEAM MAGMA wird siegen!!!\p" - .string "Vergiss das nicht!!!$" + .string "MAXIE: Ah, whatever.\n" + .string "I will give up our plans for MT. CHIMNEY\l" + .string "for the time being...\p" + .string "But no one can ever stop us!\n" + .string "TEAM MAGMA will prevail!\p" + .string "Don’t you ever forget that!$" MtChimney_Text_1B3B36:: @ 81B3B36 - .string "Hahahahaha!\p" - .string "Da bist du also den weiten Weg hier\n" - .string "hoch gelatscht.\p" - .string "Tja, du kommst leider zu spät. Ich habe\n" - .string "den METEORITEN aus METEORFÄLLE\l" - .string "bereits bei meinem BOSS abgeliefert!$" + .string "Hehehe!\p" + .string "So you’ve come all the way here!\p" + .string "But you’re too late!\n" + .string "I’ve already delivered the METEORITE\l" + .string "from METEOR FALLS to the BOSS!$" MtChimney_Text_1B3BB8:: @ 81B3BB8 - .string "Hahahaha...\n" - .string "Da hab ich wohl verloren...\p" - .string "Ich kann nur froh sein, dass ich mich\n" - .string "nicht in METEORFÄLLE mit dir einge-\l" - .string "lassen habe!$" + .string "Hehehe...\n" + .string "So I lost...\p" + .string "I’m sure glad I never took you on back\n" + .string "at METEOR FALLS.$" MtChimney_Text_1B3C07:: @ 81B3C07 - .string "Hahaha...\p" - .string "Du hast mich vielleicht besiegt, aber\n" - .string "gegen unseren BOSS hast du keine\l" - .string "Schnitte!\p" - .string "Wenn du dich jetzt verkrümelst, ent-\n" - .string "gehst du einer saftigen Tracht Prügel!$" + .string "Hehehe!\p" + .string "You might have beaten me, but you don’t\n" + .string "stand a chance against the BOSS!\p" + .string "If you get lost now, you won’t have to\n" + .string "face a sound whipping!$" MtChimney_Text_1B3C96:: @ 81B3C96 - .string "Wir vom TEAM MAGMA setzen alles daran,\n" - .string "zum Wohle aller zu handeln.\p" - .string "Wenn es mehr Land gibt, gibt es auch\n" - .string "mehr Platz zum Leben.\l" - .string "Und jeder wäre glücklich!$" + .string "We of TEAM MAGMA are working hard for\n" + .string "everyone’s sake.\p" + .string "Like, if there’s more land, there’d be\n" + .string "more places to live.\l" + .string "Everyone’d be happy!$" MtChimney_Text_1B3D1E:: @ 81B3D1E - .string "Bitte?\n" - .string "Was sagst du? Ich habe verloren???$" + .string "Hunh?\n" + .string "What do you mean I lost?$" MtChimney_Text_1B3D3D:: @ 81B3D3D - .string "Unser BOSS sagt: “Jeder wird glücklich\n" - .string "sein.”\p" - .string "Aber warum will uns dann jeder\n" - .string "aufhalten?$" + .string "Our BOSS says, “It will make everyone\n" + .string "happy.”\p" + .string "But why does everyone keep getting\n" + .string "in our way?$" MtChimney_Text_1B3D9A:: @ 81B3D9A - .string "Dieses lästige TEAM AQUA... Sie ver-\n" - .string "suchen alles, unsere Pläne zu vereiteln.$" + .string "That annoying TEAM AQUA...\n" + .string "They always mess with our plans!$" MtChimney_Text_1B3DD6: @ 81B3DD6 - .string "METEORITEN stecken voller Energie.$" + .string "METEORITES pack amazing power!$" MtChimney_Text_1B3DF5:: @ 81B3DF5 - .string "Los! Stampfen wir TEAM AQUA in den\n" - .string "Boden! Und vergrößern die Landmassen!$" + .string "Go! Stomp TEAM AQUA!\n" + .string "And expand the land!$" MtChimney_Text_1B3E1F:: @ 81B3E1F - .string "Geh uns aus dem Weg, okay?\p" - .string "Wir wollen die Landmassen zum Wohle\n" - .string "aller vergrößern!$" + .string "Stay out of our way, okay?\p" + .string "We’re trying to enlarge the landmass\n" + .string "for the good of everybody!$" MtChimney_Text_1B3E7A:: @ 81B3E7A .string "Yeah!\n" - .string "Taucht sie ins Feuer!$" + .string "Douse them in fire!$" UnknownString_81B3E94: @ 81B3E94 - .string "Wir werden weiter für mehr Land sorgen!$" + .string "We’re going to keep making more land!$" MtChimney_Text_1B3EBA:: @ 81B3EBA - .string "Hahoh!$" + .string "Bufoh!$" MtChimney_Text_1B3EC1:: @ 81B3EC1 - .string "ADRIAN: Oh, {PLAYER}{KUN}!\p" - .string "Bitte, hilf mir, TEAM MAGMA zu stoppen!\p" - .string "Sie wollen den Vulkan mit Hilfe der Kraft\n" - .string "des gestohlenen METEORITEN zum\l" - .string "Ausbruch bringen!\p" - .string "Das gehört alles zu ihrem Plan, die Land-\n" - .string "massen der Welt zu vergrößern!$" + .string "ARCHIE: Oh, {PLAYER}{KUN}!\p" + .string "Please, you must stop TEAM MAGMA\n" + .string "for me!\p" + .string "They’re trying to make this volcano\n" + .string "erupt by using the stolen METEORITE’s\l" + .string "power!\p" + .string "It’s all a part of their plans to\n" + .string "expand the world’s landmass!$" MtChimney_Text_1B3F8C:: @ 81B3F8C - .string "ADRIAN: {PLAYER}{KUN}!\p" - .string "Bitte, hilf mir TEAM MAGMA zu stoppen!\p" - .string "Sich mit diesen drei Schurken aus-\n" - .string "einander zu setzen, ist selbst für mich\l" - .string "kaum zu schaffen!$" + .string "ARCHIE: {PLAYER}{KUN}!\p" + .string "Please, you’ve got to stop TEAM MAGMA\n" + .string "for me!\p" + .string "Dealing with these three thugs is\n" + .string "a lot, even for me!$" MtChimney_Text_1B3FFE:: @ 81B3FFE - .string "ADRIAN: {PLAYER}{KUN}!\p" - .string "Mit deiner Hilfe konnte ich die Pläne\n" - .string "von TEAM MAGMA durchkreuzen!\p" - .string "Aber... Dieser Sieg bedeutet nicht, dass\n" - .string "es seine üblen Pläne aufgeben wird.\p" - .string "Wir werden ein wachsames Auge auf TEAM\n" - .string "MAGMA haben und es weiter verfolgen.\p" - .string "{PLAYER}{KUN}, wir werden uns wieder sehen!$" + .string "ARCHIE: {PLAYER}{KUN}! Thank you!\p" + .string "With your help, we thwarted TEAM\n" + .string "MAGMA’s destructive plan!\p" + .string "But... This victory doesn’t mean the\n" + .string "end of their evil plans.\p" + .string "We will remain vigilant and keep up\n" + .string "our pursuit of TEAM MAGMA.\p" + .string "{PLAYER}{KUN}, we shall meet again!$" MtChimney_Text_1B40EA:: @ 81B40EA - .string "Mist... TEAM MAGMA ist uns zahlenmäßig\n" - .string "überlegen! Wir können es nicht mit ihm\l" - .string "aufnehmen!$" + .string "Darn... TEAM MAGMA outnumbers us!\n" + .string "We can’t keep up with them!$" MtChimney_Text_1B4128:: @ 81B4128 - .string "Wenn sie die Landmassen vergrößern,\n" - .string "gibt es weniger Lebensraum für\l" - .string "WASSER-POKéMON!$" + .string "If they expand the land, there’ll be\n" + .string "less habitats for WATER POKéMON!$" MtChimney_Text_1B416E:: @ 81B416E - .string "TEAM MAGMA will die Landmassen ver-\n" - .string "größern... Wie krank sind die eigentlich?$" + .string "TEAM MAGMA wants to expand the\n" + .string "landmass... How’s that for insane?$" MtChimney_Text_1B41B0:: @ 81B41B0 .string "Bushaa!$" diff --git a/data/text/magma_settled.inc b/data/text/magma_settled.inc index 0bd5ddcd4..073f6540f 100644 --- a/data/text/magma_settled.inc +++ b/data/text/magma_settled.inc @@ -1,17 +1,16 @@ CaveOfOrigin_B4F_Text_1B4FE4:: @ 81B4FE4 - .string "Die ROTE KUGEL von {PLAYER}\n" - .string "beginnt plötzlich von innen\l" - .string "heraus zu leuchten!$" + .string "{PLAYER}’s RED ORB suddenly began\n" + .string "glowing!$" CaveOfOrigin_B4F_Text_1B5009:: @ 81B5009 - .string "GROUDON wurde offensichtlich\n" - .string "wieder in Schlaf versetzt...$" + .string "GROUDON appears to have settled\n" + .string "into sleep again...$" UnknownString_81B503D: @ 81B503D - .string "MARC: Das...$" + .string "MAXIE: This...$" UnknownString_81B504C: @ 81B504C - .string "MARC: ... ... ... ... ... ...\n" + .string "MAXIE: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das heißt wohl Goodbye. Das ist das\n" - .string "Letzte, was du von mir siehst.$" + .string "This is good-bye.\n" + .string "This is the last you’ve seen of me...$" diff --git a/data/text/magma_summit.inc b/data/text/magma_summit.inc index 48d97614f..8e17fe87d 100644 --- a/data/text/magma_summit.inc +++ b/data/text/magma_summit.inc @@ -1,165 +1,156 @@ MtPyre_Summit_Text_1B5CFD:: @ 81B5CFD - .string "Ich werde dir zeigen, wie unheimlich\n" - .string "gruselig TEAM MAGMA sein kann!$" + .string "I’ll show you exactly how scary\n" + .string "TEAM MAGMA can be!$" MtPyre_Summit_Text_1B5D30:: @ 81B5D30 - .string "Und du glaubst wirklich, du bist der\n" - .string "Stärke TEAM MAGMAS gewachsen?!?$" + .string "So you think you can stand up alone\n" + .string "to TEAM MAGMA’s might...$" MtPyre_Summit_Text_1B5D6D:: @ 81B5D6D - .string "Ja, du bist ganz schön stark...\n" - .string "Aber wir sind viele...$" + .string "Yeah, so you are strong...\n" + .string "But there’re a lot of us!$" MtPyre_Summit_Text_1B5DA2:: @ 81B5DA2 - .string "Was ist los mit dir? Was kann ein kleines\n" - .string "Kind schon gegen uns ausrichten?$" + .string "What’s up with you?\n" + .string "What does a single kid expect to do?$" MtPyre_Summit_Text_1B5DDB:: @ 81B5DDB - .string "Bumms...\n" - .string "Zu stark... Viel zu stark...$" + .string "Dang...\n" + .string "Too strong...$" MtPyre_Summit_Text_1B5DF1:: @ 81B5DF1 - .string "Du weißt doch gar nichts! Misch dich\n" - .string "besser nicht in unsere Sachen ein!$" + .string "You don’t know anything.\n" + .string "Quit messing around with us!$" MtPyre_Summit_Text_1B5E27:: @ 81B5E27 - .string "Hey, ich kenne dich vom SCHLOTBERG!\n" - .string "Der Tag der Abrechnung ist gekommen!$" + .string "Hey, I remember you from MT. CHIMNEY!\n" + .string "It’s payback time!$" MtPyre_Summit_Text_1B5E60:: @ 81B5E60 - .string "Aaaaargh!\n" - .string "Schon wieder von einem Kind besiegt...$" + .string "Urgggh...\n" + .string "Beaten by some kid again!$" MtPyre_Summit_Text_1B5E84:: @ 81B5E84 - .string "Ach, das spielt keine Rolle.\n" - .string "Wir haben Zeit herausgeschlagen!\p" - .string "Der BOSS müsste mittlerweile haben, was\n" - .string "er besorgen wollte!$" + .string "Heh, it doesn’t matter!\n" + .string "We bought ourselves some time!\p" + .string "The BOSS should have snatched what\n" + .string "he was after!$" MtPyre_Summit_Text_1B5EEC:: @ 81B5EEC - .string "MARC: Nicht du schon wieder!\p" - .string "Du bist uns ja sehr schnell auf die Spur\n" - .string "gekommen, aber es ist schon zu spät.\p" - .string "Die BLAUE KUGEL, die sich oben\n" - .string "auf dem PYROBERG befindet...\l" - .string "Ich, MARC, sage, sie gehört mir!\p" - .string "Hahaha... Jetzt werden meine\n" - .string "Visionen Wirklichkeit!\p" - .string "Los, Mannschaft!\n" - .string "GRAPHITPORT CITY heißt unser Ziel.$" + .string "MAXIE: Not you again...\p" + .string "You’ve impeded our plans repeatedly,\n" + .string "but this time you’re too late.\p" + .string "The BLUE ORB that rested atop\n" + .string "MT. PYRE...\l" + .string "I, MAXIE, claim it as mine!\p" + .string "Fufufu... Finally, I can realize my\n" + .string "grand design...\p" + .string "Come on, crew!\n" + .string "It’s SLATEPORT next!$" MtPyre_Summit_Text_1B5FE6:: @ 81B5FE6 - .string "Oh, neeeeiiinnn...\n" - .string "Das darf nicht wahr sein!\p" - .string "Wie konnten sie nur an die\n" - .string "BLAUE KUGEL gelangen?!?\p" - .string "Die BLAUE und die ROTE KUGEL dürfen nie\n" - .string "getrennt sein. Sie gehören zusammen!!!\p" + .string "Oh, no...\n" + .string "This cannot happen...\p" + .string "How could they take the BLUE ORB?\p" + .string "The BLUE ORB and RED ORB must never\n" + .string "be separated. They belong together.\p" .string "... ... ... ... ... ... ... ...\n" .string "Hmm...\p" - .string "Gut! Nimm die verbliebene\n" - .string "ROTE KUGEL an dich.\p" - .string "Bitte folge diesem Schurken und bring\n" - .string "die KUGEL zurück!$" + .string "Fine!\n" + .string "You take the remaining RED ORB.\p" + .string "Please take after that foul man and\n" + .string "get the other ORB back!$" MtPyre_Summit_Text_1B60F9:: @ 81B60F9 - .string "Die ROTE KUGEL, die dir anvertraut\n" - .string "wurde, und die gestohlene\l" - .string "BLAUE KUGEL...\p" - .string "Sie dürfen niemals getrennt werden...\n" - .string "Sonst passiert etwas Schreckliches!$" + .string "The RED ORB you have been entrusted\n" + .string "with and the stolen BLUE ORB...\p" + .string "They must never be apart...\n" + .string "Something terrible will happen...$" MtPyre_Summit_Text_1B617B:: @ 81B617B .string "So...\n" - .string "GROUDON wurde erweckt...\p" - .string "Von der wundersamen KUGEL sagt\n" - .string "man, dass sie das wütende GROUDON\l" - .string "beruhigt.\p" - .string "Es handelt sich um die ROTE KUGEL,\n" - .string "die du bei dir trägst...\p" - .string "Diese ROTE KUGEL fand man in der\n" - .string "URZEITHÖHLE in XENEROVILLE...\p" - .string "Es gibt anscheinend eine Verbindung\n" - .string "zwischen GROUDON und der\l" - .string "URZEITHÖHLE...$" + .string "GROUDON has awoken...\p" + .string "The wondrous ORB that is said to have\n" + .string "becalmed the raging GROUDON...\l" + .string "It is the RED ORB you bear.\p" + .string "That RED ORB was found buried inside\n" + .string "the CAVE OF ORIGIN in SOOTOPOLIS...\p" + .string "There is perhaps a link between\n" + .string "GROUDON and the CAVE OF ORIGIN...$" MtPyre_Summit_Text_1B6283:: @ 81B6283 - .string "Dieser Mann - er hat die BLAUE KUGEL\n" - .string "zurückgebracht.\p" - .string "Bringst du die ROTE KUGEL auch an ihren\n" - .string "angestammten Platz zurück?$" + .string "That man, he returned the BLUE ORB.\p" + .string "Are you going to return the RED ORB\n" + .string "to its rightful place, too?$" MtPyre_Summit_Text_1B62E7:: @ 81B62E7 - .string "Was soll das?\p" - .string "Wenn das Gleichgewicht nicht wiederher-\n" - .string "gestellt wird, weiß niemand, was\l" - .string "passieren wird!\p" - .string "Du wirst die ROTE KUGEL an ihren Platz\n" - .string "zurückbringen, ja?$" + .string "What’s that?!\p" + .string "If the balance is not restored, there\n" + .string "is no telling what could happen.\p" + .string "You will return the RED ORB to its\n" + .string "rightful place, yes?$" UnknownString_81B6374: @ 81B6374 - .string "{PLAYER} gibt der alten Frau die\n" - .string "ROTE KUGEL.$" + .string "{PLAYER} handed the RED ORB to the\n" + .string "old woman.$" MtPyre_Summit_Text_1B639C:: @ 81B639C - .string "Ja...\n" - .string "Die beiden KUGELN müssen hier bleiben.\p" - .string "So soll es sein, zum Wohle aller in HOENN.$" + .string "Yes...\n" + .string "The two ORBS should remain here.\p" + .string "It is how it should be for the good\n" + .string "of all HOENN...$" MtPyre_Summit_Text_1B63F8:: @ 81B63F8 - .string "Der Geist des Landes...\p" - .string "Das, so heißt es, ist GROUDON in\n" - .string "POKéMON-Gestalt...\p" - .string "So wie wir und die POKéMON leben, ist\n" - .string "auch dieses Land lebendig...\p" - .string "GROUDON hat uns das gelehrt.$" + .string "The spirit of the land...\p" + .string "That is what GROUDON is said to be in\n" + .string "POKéMON form...\p" + .string "In the same manner that we and POKéMON\n" + .string "have life, this very land is alive...\p" + .string "GROUDON has taught us that...$" MtPyre_Summit_Text_1B64B3:: @ 81B64B3 - .string "Am PYROBERG legen wir die Geister der\n" - .string "POKéMON, die von uns gegangen sind, zur\l" - .string "Ruhe...\p" - .string "Von hier aus hat man einen Ausblick über\n" - .string "die ganze Region von HOENN...\p" - .string "Die körperlosen Geister der POKéMON\n" - .string "finden hier ihre Ruhe...\p" - .string "Es ist Fügung, dass du jetzt hier bist...\p" - .string "Möchtest du meine Geschichte hören?\n" - .string "Eine lange, sehr alte Geschichte der\l" - .string "HOENN-Region?$" + .string "MT. PYRE is where we calm the spirits\n" + .string "of POKéMON that have passed on...\p" + .string "This is a high place where one can\n" + .string "see all of HOENN...\p" + .string "The disembodied spirits of POKéMON\n" + .string "must find solace here...\p" + .string "Is it coincidence that you are here...\p" + .string "Will you hear out my tale? A tale long\n" + .string "told in the HOENN region?$" MtPyre_Summit_Text_1B65D6:: @ 81B65D6 - .string "Es geschah vor langer, langer Zeit...\p" - .string "Die Welt erbebte unter der Auseinander-\n" - .string "setzung der POKéMON des Landes mit den\l" - .string "POKéMON des Meeres...\p" - .string "Die POKéMON des Landes erschufen\n" - .string "Berge und Kontinente...\p" - .string "Die POKéMON des Meeres erschufen hohe\n" - .string "Wellen und tiefe Meeresbecken...\p" - .string "Das Duell wütete ohne absehbares Ende.\p" - .string "Die Welt wurde von erbarmungslosen\n" - .string "Stürmen und unglaublichen Infernos\l" - .string "heimgesucht.\p" - .string "Die BLAUE und die ROTE KUGEL setzten\n" - .string "schließlich diesem Kampf ein Ende.\p" - .string "Licht strahlte von den beiden KUGELN\n" - .string "und beruhigte die Kontrahenten.\p" - .string "Die beruhigten POKéMON verbargen sich\n" - .string "in den Tiefen des Meeres und der Erde,\l" - .string "und eines Tages verschwanden sie.$" + .string "It happened long, long ago...\p" + .string "The world was wracked by a ferocious\n" + .string "clash between the POKéMON of the land\l" + .string "and the POKéMON of the sea...\p" + .string "The POKéMON of the land raised\n" + .string "mountains and created continents...\p" + .string "The POKéMON of the sea raised huge\n" + .string "waves and carved out oceans...\p" + .string "Their fierce duel raged without end.\p" + .string "The world was engulfed in vicious\n" + .string "storms and massive infernos.\p" + .string "The RED ORB and the BLUE ORB brought\n" + .string "an end to the calamity.\p" + .string "Light poured from the two ORBS and\n" + .string "becalmed the enraged adversaries.\p" + .string "The pair, made docile, burrowed deep\n" + .string "under the ground where eventually\l" + .string "they disappeared...$" MtPyre_Summit_Text_1B6823:: @ 81B6823 - .string "Ich verstehe...\n" - .string "Nun, das ist auch in Ordnung...$" + .string "I see...\n" + .string "Well, that, too, is fine...$" MtPyre_Summit_Text_1B6848:: @ 81B6848 - .string "MARC: Du...\n" - .string "Du hast GROUDON aufgehalten...\p" - .string "Das sollte mich nicht überraschen...\p" - .string "Nun habe ich verstanden, dass es nicht\n" - .string "an den Menschen ist, das Gleichgewicht\l" - .string "zwischen Land und Meer zu stören...\p" - .string "Daher bin ich hier, um die\n" - .string "BLAUE KUGEL zurückzubringen...\p" - .string "Ich glaube nicht, dass wir uns wieder\n" - .string "sehen werden... Leb wohl...$" + .string "MAXIE: You...\n" + .string "So you stopped GROUDON...\p" + .string "I shouldn’t be surprised...\p" + .string "I understand now that humans cannot\n" + .string "freely control the balance between\l" + .string "the land and the sea...\p" + .string "So I have come to return the\n" + .string "BLUE ORB...\p" + .string "I doubt that we will cross paths again...\n" + .string "Farewell...$" diff --git a/data/text/maps/AbandonedShip_CaptainsOffice.inc b/data/text/maps/AbandonedShip_CaptainsOffice.inc index 8d5c30655..bdd2057c4 100644 --- a/data/text/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/text/maps/AbandonedShip_CaptainsOffice.inc @@ -1,18 +1,16 @@ AbandonedShip_CaptainsOffice_Text_198C85:: @ 8198C85 - .string "Ich untersuche das Schiff im Auftrag\n" - .string "von KAPT. BRIGG.\p" - .string "Er hat mich auch beauftragt, einen\n" - .string "SCANNER zu finden, aber ich habe \l" - .string "ihn noch nicht gefunden.$" + .string "I’m investigating this ship on behalf\n" + .string "of CAPT. STERN.\p" + .string "He also asked me to find a SCANNER,\n" + .string "but I haven’t had any success...$" AbandonedShip_CaptainsOffice_Text_198D00:: @ 8198D00 - .string "Oh! Das ist der SCANNER!\p" - .string "Würdest du den bitte für mich zu\n" - .string "KAPT. BRIGG bringen? Das wäre nett.\p" - .string "Ich möchte das Schiff noch weiter\n" - .string "untersuchen.$" + .string "Oh! That’s a SCANNER!\p" + .string "Listen, can I get you to deliver that\n" + .string "to CAPT. STERN?\p" + .string "I want to investigate this ship a\n" + .string "little more.$" AbandonedShip_CaptainsOffice_Text_198D7B:: @ 8198D7B - .string "Dieses Schiff heißt MS CACTUS. Es\n" - .string "scheint aus einer früheren Epoche zu\l" - .string "stammen.$" + .string "This ship is called S.S. CACTUS.\n" + .string "It seems to be from an earlier era.$" diff --git a/data/text/maps/AbandonedShip_Corridors_1F.inc b/data/text/maps/AbandonedShip_Corridors_1F.inc index 90091e04f..2df1c32b2 100644 --- a/data/text/maps/AbandonedShip_Corridors_1F.inc +++ b/data/text/maps/AbandonedShip_Corridors_1F.inc @@ -1,15 +1,14 @@ AbandonedShip_Corridors_1F_Text_19843D:: @ 819843D - .string "Was ist so lustig daran, dass ich meinen\n" - .string "Schwimmreifen mit an Bord habe?$" + .string "What’s so funny about having my inner\n" + .string "tube aboard the ship?$" AbandonedShip_Corridors_1F_Text_198479:: @ 8198479 - .string "Hui, du hast mir die Luft rausgelassen!$" + .string "Whoa, you overwhelmed me!$" AbandonedShip_Corridors_1F_Text_198493:: @ 8198493 - .string "Es ist gar nicht so einfach, POKéBÄLLE\n" - .string "zu werfen, wenn man einen Schwimmreifen\l" - .string "trägt!$" + .string "It’s not easy throwing POKé BALLS\n" + .string "while hanging on to an inner tube!$" AbandonedShip_Corridors_1F_Text_1984D8:: @ 81984D8 - .string "Hier ist es doch wirklich lustig, nicht\n" - .string "wahr? Ich bin total aufgeregt.$" + .string "Isn’t it fun here?\n" + .string "I get excited just being here!$" diff --git a/data/text/maps/AbandonedShip_Corridors_B1F.inc b/data/text/maps/AbandonedShip_Corridors_B1F.inc index 56edc9491..887a6c11a 100644 --- a/data/text/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/text/maps/AbandonedShip_Corridors_B1F.inc @@ -1,28 +1,29 @@ AbandonedShip_Corridors_B1F_Text_19856F:: @ 819856F - .string "Wenn wir zur See fahren, nehmen wir\n" - .string "MATROSEN immer unsere POKéMON mit.\l" - .string "Wie wäre es mit einem schnellen Kampf?$" + .string "When we go out to sea, we SAILORS\n" + .string "always bring our POKéMON.\l" + .string "How about a quick battle?$" AbandonedShip_Corridors_B1F_Text_1985C5:: @ 81985C5 - .string "Huups, da bin ich abgesoffen.$" + .string "Whoops, I’m sunk!$" AbandonedShip_Corridors_B1F_Text_1985D7:: @ 81985D7 - .string "Der Schiffsrumpf liegt tief unter der\n" - .string "Wasserlinie.\p" - .string "Wenn ein POKéMON wissen würde, wie\n" - .string "man taucht, würden wir Fortschritte\l" - .string "machen.$" + .string "The ship’s bottom has sunk into the\n" + .string "depths.\p" + .string "If a POKéMON knew how to go underwater,\n" + .string "we might make some progress...$" AbandonedShip_Corridors_B1F_Text_19864A:: @ 819864A - .string "Jahaa!\n" - .string "Ein Schiff!$" + .string "Yay!\n" + .string "It’s a ship!$" AbandonedShip_Corridors_B1F_Text_19865C:: @ 819865C - .string "Die Tür ist verschlossen.\p" - .string "“LAGER” steht auf dem Schild.$" + .string "The door is locked.\p" + .string "“STORAGE” is painted on the door.$" AbandonedShip_Corridors_B1F_Text_198692:: @ 8198692 - .string "{PLAYER} steckt den SCHLÜSSEL zum\n" - .string "LAGER ins Schlüsselloch und dreht ihn.\p" - .string "Der SCHLÜSSEL ist schwergängig, aber\n" - .string "das Schloss lässt sich öffnen.$" + .string "{PLAYER} inserted and turned the\n" + .string "STORAGE KEY.\p" + .string "The inserted KEY stuck fast, but the\n" + .string "door opened.$" + +AbandonedShip_Corridors_B1F_Text_1986EC:: @ 81986EC diff --git a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc index af957c711..4e7c2014f 100644 --- a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -1,3 +1,2 @@ -AbandonedShip_Corridors_B1F_Text_1986EC:: @ 81986EC AbandonedShip_HiddenFloorCorridors_Text_1986EC:: @ 81986EC - .string "Die Tür ist offen.$" + .string "The door is open.$" diff --git a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc b/data/text/maps/AbandonedShip_HiddenFloorRooms.inc index a2e40f5a5..1be9f8f02 100644 --- a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/text/maps/AbandonedShip_HiddenFloorRooms.inc @@ -1,35 +1,35 @@ AbandonedShip_HiddenFloorCorridors_Text_198DC0:: @ 8198DC0 - .string "Die Tür ist verschlossen.\p" - .string "“K. 1” steht auf der Tür.$" + .string "The door is locked.\p" + .string "“RM. 1” is painted on the door.$" AbandonedShip_HiddenFloorCorridors_Text_198DF4:: @ 8198DF4 - .string "Die Tür ist verschlossen.\p" - .string "“K. 2” steht auf der Tür.$" + .string "The door is locked.\p" + .string "“RM. 2” is painted on the door.$" AbandonedShip_HiddenFloorCorridors_Text_198E28:: @ 8198E28 - .string "Die Tür ist verschlossen.\p" - .string "“K. 4” steht auf der Tür.$" + .string "The door is locked.\p" + .string "“RM. 4” is painted on the door.$" AbandonedShip_HiddenFloorCorridors_Text_198E5C:: @ 8198E5C - .string "Die Tür ist verschlossen.\p" - .string "“K. 6” steht auf der Tür.$" + .string "The door is locked.\p" + .string "“RM. 6” is painted on the door.$" AbandonedShip_HiddenFloorCorridors_Text_198E90:: @ 8198E90 - .string "{PLAYER} steckt den SCHLÜSSEL ins\n" - .string "Schloss und dreht ihn um.\p" - .string "Der SCHLÜSSEL ist schwergängig, aber\n" - .string "die Tür öffnet sich.$" + .string "{PLAYER} inserted and turned the\n" + .string "KEY.\p" + .string "The inserted KEY stuck fast, but the\n" + .string "door opened.$" AbandonedShip_HiddenFloorRooms_Text_198EE2:: @ 8198EE2 - .string "Es ist hell und glänzend!\n" - .string "Aber es ist trotzdem nur Müll...$" + .string "It’s bright and shiny!\n" + .string "But it’s just trash...$" UnknownString_8198F10: @ 8198F10 - .string "In der Wand ist eine kleine Einkerbung.$" + .string "There’s a small indent in the wall.$" UnknownString_8198F34: @ 8198F34 - .string "In der Wand ist eine kleine Einkerbung.\p" - .string "Möchtest du GEHEIMPOWER einsetzen?$" + .string "There’s a small indent in the wall.\p" + .string "Use the SECRET POWER?$" UnknownString_8198F6E: @ 8198F6E - .string "Eine kleine Höhle wird sichtbar.$" + .string "Discovered a small cavern!$" diff --git a/data/text/maps/AbandonedShip_Rooms2_1F.inc b/data/text/maps/AbandonedShip_Rooms2_1F.inc index 39c1dd614..3acf542fc 100644 --- a/data/text/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/text/maps/AbandonedShip_Rooms2_1F.inc @@ -1,70 +1,70 @@ AbandonedShip_Rooms2_1F_Text_1987C1:: @ 81987C1 - .string "PIT: Wir haben nach Schätzen gesucht\n" - .string "- und einen TRAINER gefunden!$" + .string "HAL: While searching for treasures,\n" + .string "we discovered a TRAINER!$" AbandonedShip_Rooms2_1F_Text_1987FE:: @ 81987FE - .string "PIT: Wir konnten nicht gewinnen, obwohl\n" - .string "wir zusammengearbeitet haben...$" + .string "HAL: We couldn’t win even though\n" + .string "we worked together...$" AbandonedShip_Rooms2_1F_Text_198835:: @ 8198835 - .string "PIT: Wir konnten keine Schätze finden.\n" - .string "Ob uns jemand zuvorgekommen ist?$" + .string "HAL: We can’t find any treasures...\n" + .string "I wonder if someone got them already?$" AbandonedShip_Rooms2_1F_Text_19887F:: @ 819887F - .string "PIT: Du hast keine zwei POKéMON.\n" - .string "So kannst du nicht gegen uns antreten.$" + .string "HAL: You don’t even have two POKéMON.\n" + .string "You can’t expect to beat us like that.$" AbandonedShip_Rooms2_1F_Text_1988CC:: @ 81988CC - .string "GESA: Oh? Wir haben nach Schätzen\n" - .string "gesucht und einen TRAINER gefunden.$" + .string "LOIS: Oh? We were looking for some\n" + .string "treasure, but we only found a TRAINER.$" AbandonedShip_Rooms2_1F_Text_198916:: @ 8198916 - .string "GESA: Oh, wow, bist du stark!$" + .string "LOIS: Oh, wow, you’re strong!$" AbandonedShip_Rooms2_1F_Text_198934:: @ 8198934 - .string "GESA: Ich frage mich, wo die Schätze\n" - .string "versteckt sind...\p" - .string "Ich weiß, was ich mir alles kaufen\n" - .string "würde, wenn ich reich wäre...$" + .string "LOIS: I wonder where the treasures\n" + .string "are hidden?\p" + .string "I already know what I’m going to buy\n" + .string "when I find them!$" AbandonedShip_Rooms2_1F_Text_19899A:: @ 819899A - .string "GESA: Hast du keine zwei POKéMON?\n" - .string "Dann können wir jetzt nicht kämpfen.$" + .string "LOIS: Don’t you have two POKéMON?\n" + .string "We’ll have to battle another time!$" AbandonedShip_Rooms2_1F_Text_1989DF:: @ 81989DF - .string "PIT: Wir haben die ganze Zeit nur nach\n" - .string "Schätzen gesucht.\p" - .string "Aber unsere POKéMON sind auch stärker\n" - .string "geworden. Dürfen wir dir das zeigen?$" + .string "HAL: We’ve been searching for\n" + .string "treasures all this time.\p" + .string "Our POKéMON have grown stronger, too.\n" + .string "Let us show you, okay?$" AbandonedShip_Rooms2_1F_Text_198A53:: @ 8198A53 - .string "PIT: Du bist stark wie immer.$" + .string "HAL: You’re strong as usual!$" AbandonedShip_Rooms2_1F_Text_198A70:: @ 8198A70 - .string "PIT: Wir haben keine Schätze gefunden,\n" - .string "sondern gegen POKéMON verloren...\p" - .string "Ich will nach Hause... Aber wenn ich das\n" - .string "laut sage, wird sie sauer auf mich.$" + .string "HAL: We can’t find any treasures,\n" + .string "we lose at POKéMON...\p" + .string "I want to go home... But if I say that,\n" + .string "she gets all angry with me...$" AbandonedShip_Rooms2_1F_Text_198AEE:: @ 8198AEE - .string "PIT: Du hast keine zwei POKéMON.\n" - .string "So können wir nicht kämpfen.$" + .string "HAL: You don’t even have two POKéMON.\n" + .string "You can’t expect to beat us like that.$" AbandonedShip_Rooms2_1F_Text_198B3B:: @ 8198B3B - .string "GESA: Oh, da bist du ja wieder!\p" - .string "Genau wie wir, hast du die Suche nach\n" - .string "Schätzen auch nicht aufgegeben, was?\p" - .string "Wie wäre es mit einem Kampf? Und der\n" - .string "Verlierer gibt die Suche auf?$" + .string "LOIS: Oh, hi, we meet again!\p" + .string "Just like us, you haven’t given up\n" + .string "searching for treasures!\p" + .string "How about we battle, and the loser has\n" + .string "to give up looking?$" AbandonedShip_Rooms2_1F_Text_198BCF:: @ 8198BCF - .string "GESA: Ach, wir haben wieder verloren...$" + .string "LOIS: Oh, we lost again...$" AbandonedShip_Rooms2_1F_Text_198BEA:: @ 8198BEA - .string "GESA: Wir müssen unsere POKéMON mehr\n" - .string "trainieren.\p" - .string "Wir gehen nicht ohne Schatz nach Hause!$" + .string "LOIS: We’ll raise our POKéMON more.\p" + .string "We’re not going home until we find our\n" + .string "treasures!$" AbandonedShip_Rooms2_1F_Text_198C40:: @ 8198C40 - .string "GESA: Hast du keine zwei POKéMON?\n" - .string "Dann müssen wir später kämpfen.$" + .string "LOIS: Don’t you have two POKéMON?\n" + .string "We’ll have to battle another time!$" diff --git a/data/text/maps/AbandonedShip_Rooms2_B1F.inc b/data/text/maps/AbandonedShip_Rooms2_B1F.inc index 1eeb3c110..11e505abd 100644 --- a/data/text/maps/AbandonedShip_Rooms2_B1F.inc +++ b/data/text/maps/AbandonedShip_Rooms2_B1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_B1F_Text_198759:: @ 8198759 - .string "Ein perfekter Ort, auf Erkundungstour\n" - .string "zu gehen. Es ist aufregend hier!\p" - .string "Ich wette, hier sind wertvolle Schätze\n" - .string "versteckt...$" + .string "This is a perfect place to go exploring!\n" + .string "It’s exciting here!\p" + .string "I bet there’re amazing treasures on\n" + .string "board.$" diff --git a/data/text/maps/AbandonedShip_Rooms_1F.inc b/data/text/maps/AbandonedShip_Rooms_1F.inc index 8e5c0f910..67b67ca4c 100644 --- a/data/text/maps/AbandonedShip_Rooms_1F.inc +++ b/data/text/maps/AbandonedShip_Rooms_1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_1F_Text_19850A:: @ 819850A - .string "Schiffe dieser Art sind sehr selten,\n" - .string "daher schaue ich mich hier gut um.\p" + .string "Ships of this sort are rare, so I’m\n" + .string "taking a look around.\p" .string "Hmhm...\n" - .string "Da sind die anderen Kabinen...$" + .string "There appear to be other cabins...$" diff --git a/data/text/maps/AbandonedShip_Rooms_B1F.inc b/data/text/maps/AbandonedShip_Rooms_B1F.inc index 6bf155e54..45df47d60 100644 --- a/data/text/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/text/maps/AbandonedShip_Rooms_B1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F_Text_1986FE:: @ 81986FE - .string "Bööörps...\p" - .string "Mir wird schon übel, sobald ich ein\n" - .string "Schiff nur betrete...\p" - .string "Es bewegt sich zwar nicht, aber...$" + .string "Urrrrppp...\p" + .string "I’m getting queasy just being aboard\n" + .string "this ship...\p" + .string "It’s not even moving, but...$" diff --git a/data/text/maps/AquaHideout_1F.inc b/data/text/maps/AquaHideout_1F.inc index 5d702b1c9..6c003d308 100644 --- a/data/text/maps/AquaHideout_1F.inc +++ b/data/text/maps/AquaHideout_1F.inc @@ -1,53 +1,51 @@ AquaHideout_1F_Text_196AFD:: @ 8196AFD - .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" - .string "schaffen?\p" - .string "Unser BOSS ist nicht hier! Er ist dabei,\n" - .string "sich etwas sehr Wichtiges unter den\l" - .string "Nagel zu reißen.\p" + .string "What? What? What do you want with \n" + .string "TEAM {EVIL_TEAM}?\p" + .string "Our BOSS isn’t here! He’s gone off to\n" + .string "snatch something important!\p" .string "... ...\n" - .string "Wo er hin ist?\p" - .string "Uahahaha! Du glaubst doch nicht im\n" - .string "Ernst, dass ich dir das verrate!?!$" + .string "Where did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" AquaHideout_1F_Text_196BC5:: @ 8196BC5 - .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" - .string "schaffen?\p" - .string "Unser BOSS ist nicht hier! Er ist dabei,\n" - .string "sich ein U-Boot unter den Nagel zu\l" - .string "reißen.\p" + .string "What? What? What do you want with \n" + .string "TEAM {EVIL_TEAM}?\p" + .string "Our BOSS isn’t here!\n" + .string "He’s gone off to jack a submarine!\p" .string "... ...\n" - .string "Wo er hin ist?\p" - .string "Uahahaha! Du glaubst doch nicht im\n" - .string "Ernst, dass ich dir das verrate!?!$" + .string "Where did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" AquaHideout_1F_Text_196C83:: @ 8196C83 - .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" - .string "schaffen?\p" - .string "Unser BOSS ist nicht hier! Er ist auf dem\n" - .string "Weg nach PYROBERG auf der ROUTE 122!\p" + .string "What? What? What do you want with \n" + .string "TEAM {EVIL_TEAM}?\p" + .string "Our BOSS isn’t here! He’s on his way to\n" + .string "MT. PYRE on ROUTE 122!\p" .string "... ...\n" - .string "Warum er dorthin ist?\p" - .string "Uahahaha! Du glaubst doch nicht im\n" - .string "Ernst, dass ich dir das verrate!?!$" + .string "Why did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" AquaHideout_1F_Text_196D46:: @ 8196D46 - .string "Was? Wie? Was hast du mit TEAM {EVIL_TEAM} zu\n" - .string "schaffen?\p" - .string "Unser BOSS ist nicht hier! Er ist auf dem\n" - .string "Weg nach GRAPHITPORT CITY!\p" + .string "What? What? What do you want with\n" + .string "TEAM {EVIL_TEAM}?\p" + .string "Our BOSS isn’t here!\n" + .string "He’s on his way to SLATEPORT CITY!\p" .string "... ...\n" - .string "Warum er dorthin ist?\p" - .string "Uahahaha! Du glaubst doch nicht im\n" - .string "Ernst, dass ich dir das verrate!?!$" + .string "Why did he go?\p" + .string "Wahaha! Do you really think I’d tell\n" + .string "you something that crucial?$" AquaHideout_1F_Text_196E01:: @ 8196E01 - .string "Huhuuhuhuu!\n" - .string "Verdächtige Person gesichtet!$" + .string "Ayiyiyi!\n" + .string "Suspicious character spotted!$" AquaHideout_1F_Text_196E28:: @ 8196E28 - .string "Grrr...\n" - .string "Ich habe verloren!$" + .string "Grrrrr...\n" + .string "I lost it!$" AquaHideout_1F_Text_196E3D:: @ 8196E3D - .string "Nun hat das TEAM verloren, aber ich habe\n" - .string "meinen Job gemacht...$" + .string "I took the loss for the TEAM, but\n" + .string "I did my job...$" diff --git a/data/text/maps/AquaHideout_B1F.inc b/data/text/maps/AquaHideout_B1F.inc index 7a8ea0395..605a98b8b 100644 --- a/data/text/maps/AquaHideout_B1F.inc +++ b/data/text/maps/AquaHideout_B1F.inc @@ -1,40 +1,39 @@ AquaHideout_B1F_Text_196E6F:: @ 8196E6F - .string "Wenn du das Geheimnis unseres\n" - .string "VERSTECKS erfahren willst, musst du\l" - .string "mich besiegen!$" + .string "If you want to know the secret about\n" + .string "our HIDEOUT, you have me to beat!$" AquaHideout_B1F_Text_196EB6:: @ 8196EB6 - .string "Ich kann anscheinend nicht gewinnen...$" + .string "I can’t win at all...$" AquaHideout_B1F_Text_196ECC:: @ 8196ECC - .string "Das Geheimnis unseres VERSTECKS?\p" - .string "Nun, sagen wir mal soooo...\n" - .string "Am Ende befindet sich ein U-Boot!\p" - .string "Aber, im Moment...\n" - .string "Hehehehe...$" + .string "Our HIDEOUT’s secret?\p" + .string "Well, let’s just say...\n" + .string "There’s a submarine at the far end!\p" + .string "But, by now...\n" + .string "Kekekeke...$" AquaHideout_B1F_Text_196F39:: @ 8196F39 - .string "Tankbefüllung... OKAY!\n" - .string "Proviant... OKAY!\p" - .string "Nichts anderes mehr zu tun, als eine\n" - .string "Nervensäge aus dem Weg zu räumen.$" + .string "Fuel supply loaded A-OK!\n" + .string "In-cruise snacks loaded A-OK!\p" + .string "Nothing left to do but KO a pesky\n" + .string "meddler!$" AquaHideout_B1F_Text_196F9B:: @ 8196F9B - .string "Das war ein Schuss vor den Bug.$" + .string "I took a serious licking!$" AquaHideout_B1F_Text_196FB5:: @ 8196FB5 - .string "Pah!\n" - .string "Meine Niederlage war geplant.\p" - .string "Ich sollte dich eh nur aufhalten!$" + .string "Humph!\n" + .string "This was supposed to happen!\p" + .string "My mission was to just hold you up!$" AquaHideout_B1F_Text_196FFD:: @ 8196FFD - .string "Gääähn... Hier im VERSTECK Wache zu\n" - .string "stehen, ist ermüdend. Ich muss kämpfen.$" + .string "Yawn... Keeping watch over the\n" + .string "HIDEOUT bores me. I’ll take you on.$" AquaHideout_B1F_Text_197040:: @ 8197040 - .string "Gähn...\n" - .string "Oh, da habe ich wohl verloren...$" + .string "Yawn...\n" + .string "Oh, I lost...$" AquaHideout_B1F_Text_197056:: @ 8197056 - .string "Wenn du weiter hier herumschleichst, \n" - .string "schnappt dich das TEAM {EVIL_TEAM}.$" + .string "If you scurry too much, other TEAM\n" + .string "{EVIL_TEAM} members might get you.$" diff --git a/data/text/maps/AquaHideout_B2F.inc b/data/text/maps/AquaHideout_B2F.inc index 649d33696..f4b7dd035 100644 --- a/data/text/maps/AquaHideout_B2F.inc +++ b/data/text/maps/AquaHideout_B2F.inc @@ -1,59 +1,58 @@ AquaHideout_B2F_Text_197093:: @ 8197093 - .string "Hehehehe... Du hast es tatsächlich\n" - .string "bis hierher geschafft?\p" - .string "Da haben wir dich wohl etwas\n" - .string "unterschätzt!\p" - .string "Aber hier geht es für dich nicht weiter!\p" - .string "Ich bin besser als die anderen RÜPEL,\n" - .string "die dir bisher begegnet sind.\p" - .string "Ich schinde keine Zeit heraus. Ich\n" - .string "werde dich pulverisieren!$" + .string "Hehehe...\p" + .string "Got here already, did you?\n" + .string "We underestimated you!\p" + .string "But this is it!\p" + .string "I’m a cut above the GRUNTS you’ve seen\n" + .string "so far.\p" + .string "I’m not stalling for time. I’m going\n" + .string "to pulverize you!$" AquaHideout_B2F_Text_197145:: @ 8197145 .string "Hehehe...\n" - .string "Dann habe ich eben auch verloren. Pöh.$" + .string "So, I lost, too...$" AquaHideout_B2F_Text_197162:: @ 8197162 .string "Hehehe!\p" - .string "Während ich mit dir gespielt habe, hat\n" - .string "sich unser BOSS vorbereitet!$" + .string "While I was toying with you, our BOSS\n" + .string "got through his preparations!$" AquaHideout_B2F_Text_1971AE:: @ 81971AE .string "Hehehe!\p" - .string "Unser BOSS ist schon unterwegs zu\n" - .string "einer Unterwasserhöhle!\p" - .string "Falls du ihn verfolgen willst, suche doch\n" - .string "mal die Tiefsee in der Region um\l" - .string "SEEGRASULB CITY ab.\p" - .string "Aber ob du ihn dort auch finden wirst?\n" - .string "Hehehehehehe...$" + .string "Our BOSS has already gone on his way to\n" + .string "some cave under the sea!\p" + .string "If you’re going to give chase, you’d\n" + .string "better search the big, wide sea beyond\l" + .string "LILYCOVE.\p" + .string "But will you find it then?\n" + .string "Hehehe!$" AquaHideout_B2F_Text_197270:: @ 8197270 - .string "Wahahahah, ich bin müde vom Warten!\n" - .string "Du schuldest mir einen Kampf!$" + .string "Wahahah, I grew weary of waiting!\n" + .string "You owe me a battle, too!$" AquaHideout_B2F_Text_1972AC:: @ 81972AC - .string "Des Wartens müde...\n" - .string "Gedöst und verloren...$" + .string "Tired of waiting...\n" + .string "Lost and dazed...$" AquaHideout_B2F_Text_1972D2:: @ 81972D2 .string "BOSS...\n" - .string "Reicht das aus?$" + .string "Is this good enough?$" AquaHideout_B2F_Text_1972EF:: @ 81972EF - .string "Teleporter... Der ganze Stolz des\n" - .string "VERSTECKS!\p" - .string "Du weißt gar nicht mehr, wo du gerade\n" - .string "bist, stimmt’s? Kicher...\p" - .string "Den Gegner verwirren, ermüden und dann\n" - .string "auf ihn mit Gebrüll! Das ist der Plan!$" + .string "Warp panels, the HIDEOUT’s pride\n" + .string "and joy!\p" + .string "You’re clueless about where you are,\n" + .string "aren’t you?\p" + .string "Fluster and tire out the enemy, then\n" + .string "lower the boom! That’s our plan!$" AquaHideout_B2F_Text_197390:: @ 8197390 - .string "Was stimmt nicht mit dir?\n" - .string "Du bist ja überhaupt nicht müde!$" + .string "What’s wrong with you?\n" + .string "You’re not tired at all!$" AquaHideout_B2F_Text_1973C0:: @ 81973C0 - .string "Da fällt mir ein... Wo habe ich nur den\n" - .string "MEISTERBALL hingelegt?\p" - .string "Wenn ich den verloren habe, zieht mir\n" - .string "der BOSS die Ohren lang...$" + .string "That reminds me... I can’t remember\n" + .string "where I put the MASTER BALL.\p" + .string "If I fail to guard it, our BOSS will\n" + .string "chew me out...$" diff --git a/data/text/maps/BattleTower_BattleRoom.inc b/data/text/maps/BattleTower_BattleRoom.inc index 0c1714f08..9f72d8971 100644 --- a/data/text/maps/BattleTower_BattleRoom.inc +++ b/data/text/maps/BattleTower_BattleRoom.inc @@ -1,15 +1,15 @@ BattleTower_BattleRoom_Text_19ACDC:: @ 819ACDC - .string "Wir heilen deine POKéMON und machen\n" - .string "sie wieder fit!$" + .string "We will restore your POKéMON to\n" + .string "full health.$" BattleTower_BattleRoom_Text_19AD09:: @ 819AD09 - .string "Nun wirst du dich Gegner Nr. {STR_VAR_1} stellen\n" - .string "müssen. Bist du bereit?$" + .string "You will be facing opponent no. {STR_VAR_1}.\n" + .string "Are you ready?$" BattleTower_BattleRoom_Text_19AD3C:: @ 819AD3C - .string "Möchtest du das Spiel speichern und\n" - .string "beenden?$" + .string "Would you like to save and\n" + .string "quit the game?$" BattleTower_BattleRoom_Text_19AD66:: @ 819AD66 - .string "Möchtest du die Herausforderung im\n" - .string "KAMPFRAUM abbrechen?$" + .string "Would you like to cancel your BATTLE\n" + .string "ROOM challenge?$" diff --git a/data/text/maps/BattleTower_Lobby.inc b/data/text/maps/BattleTower_Lobby.inc index 6b2a8431b..db94f1bce 100644 --- a/data/text/maps/BattleTower_Lobby.inc +++ b/data/text/maps/BattleTower_Lobby.inc @@ -1,200 +1,192 @@ BattleTower_Lobby_Text_199F2C:: @ 8199F2C - .string "Willkommen im DUELLTURM!\p" - .string "Bitte registriere dich bei mir, um einen\n" - .string "KAMPFRAUM betreten zu können.$" + .string "Welcome to the BATTLE TOWER!\p" + .string "Please register with me to enter\n" + .string "a BATTLE ROOM.$" BattleTower_Lobby_Text_199F79:: @ 8199F79 - .string "Möchtest du jemanden in einem\n" - .string "KAMPFRAUM herausfordern?$" + .string "Would you like to make a BATTLE ROOM\n" + .string "challenge?$" BattleTower_Lobby_Text_199FA9:: @ 8199FA9 - .string "Wir freuen uns auf deine nächste\n" - .string "Herausforderung.$" + .string "We’ll be looking forward to your\n" + .string "next challenge.$" BattleTower_Lobby_Text_199FDA:: @ 8199FDA - .string "Bevor du einen KAMPFRAUM betrittst,\n" - .string "musst du dein Spiel speichern. Okay?$" + .string "Before entering a BATTLE ROOM, your\n" + .string "progress must be saved. Is that okay?$" BattleTower_Lobby_Text_19A024:: @ 819A024 - .string "Es gibt hier zwei KAMPFRÄUME, Level 50\n" - .string "und Level 100.\l" - .string "In welchem möchtest du antreten?$" + .string "There are two BATTLE ROOMS,\n" + .string "Level 50 and Level 100.\l" + .string "Which would you like to challenge?$" BattleTower_Lobby_Text_19A07B:: @ 819A07B - .string "Bitte wähle die POKéMON aus, die\n" - .string "antreten sollen.$" + .string "Please select the POKéMON you wish\n" + .string "to enter.$" BattleTower_Lobby_Text_19A0A8:: @ 819A0A8 - .string "Ich bringe dich nun zum KAMPFRAUM.$" + .string "I’ll direct you to your BATTLE ROOM now.$" BattleTower_Lobby_Text_19A0D1:: @ 819A0D1 - .string "Der DUELLTURM ist ein Gebäude, das\n" - .string "für POKéMON-Kämpfe gebaut wurde.\p" - .string "Im TURM gibt es viele KAMPFRÄUME.\p" - .string "In jedem KAMPFRAUM warten sieben\n" - .string "TRAINER auf einen Herausforderer.\p" - .string "Besiege alle sieben und du gewinnst\n" - .string "einen wunderbaren Preis.\p" - .string "Du kannst auch pausieren, indem du\n" - .string "deinen Fortschritt speicherst.\p" - .string "Vergewissere dich, dass du ordentlich\n" - .string "abspeicherst, denn du kannst sonst\l" - .string "nach einer Pause den Kampf nicht\l" - .string "fortsetzen.$" + .string "The BATTLE TOWER is a facility made\n" + .string "especially for POKéMON battles.\p" + .string "Within the TOWER are many BATTLE ROOMS.\p" + .string "In each BATTLE ROOM, seven TRAINERS\n" + .string "await your challenge.\p" + .string "Beat all seven, and you will be rewarded\n" + .string "with a fabulous prize.\p" + .string "You may also take a break from your\n" + .string "challenge by saving your progress.\p" + .string "Make sure you save properly or you\n" + .string "won’t be able to resume your challenge.$" BattleTower_Lobby_Text_19A249:: @ 819A249 - .string "Entschuldigung!\p" - .string "Aber deine POKéMON sind nicht\n" - .string "teilnahmeberechtigt.\p" - .string "Du brauchst drei verschiedene\n" - .string "POKéMON von Level 50 oder weniger.\p" - .string "Jedes muss außerdem ein anderes Item\n" - .string "halten.\p" - .string "EIER{STR_VAR_1} nicht zugelassen.\p" - .string "Bitte komm wieder, wenn du bereit bist.$" + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "You must have three different POKéMON\n" + .string "of Level 50 or less to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" BattleTower_Lobby_Text_19A32D:: @ 819A32D - .string "Entschuldigung!\p" - .string "Aber deine POKéMON sind nicht\n" - .string "teilnahmeberechtigt.\p" - .string "Du brauchst drei verschiedene\n" - .string "POKéMON.\p" - .string "Jedes muss außerdem ein anderes Item\n" - .string "halten.\p" - .string "EIER{STR_VAR_1} nicht zugelassen.\p" - .string "Bitte komm wieder, wenn du bereit bist.$" + .string "Excuse me!\p" + .string "You don’t have three eligible POKéMON.\p" + .string "You must have three different POKéMON\n" + .string "to enter.\p" + .string "They also must be holding different\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Please come see me when you are ready.$" BattleTower_Lobby_Text_19A3FD:: @ 819A3FD - .string "Entschuldigung!\p" - .string "Du hast, bevor du die Herausforderung\n" - .string "abgebrochen hast, nicht gespeichert.\p" - .string "Daher wirst du für diese Herausforde-\n" - .string "rung disqualifiziert. Schade!$" + .string "Excuse me!\p" + .string "You didn’t save before you quit your\n" + .string "challenge last time.\p" + .string "Because of that, your challenge so far\n" + .string "has been disqualified. Sorry!$" BattleTower_Lobby_Text_19A487:: @ 819A487 - .string "Herzlichen Glückwunsch!\n" - .string "Du hast alle 7 TRAINER besiegt!\p" + .string "Congratulations!\n" + .string "You’ve beaten all seven TRAINERS!\p" .string "$" BattleTower_Lobby_Text_19A4BB:: @ 819A4BB - .string "Da du 7 TRAINER in Folge besiegt hast,\n" - .string "gewinnst du einen wunderbaren Preis!\p" + .string "For beating seven TRAINERS in a row,\n" + .string "you have earned this fabulous prize!\p" .string "$" BattleTower_Lobby_Text_19A506:: @ 819A506 - .string "{PLAYER} gewinnt\n" + .string "{PLAYER} received the prize\n" .string "{STR_VAR_1}.$" BattleTower_Lobby_Text_19A520:: @ 819A520 - .string "Oh, dein BEUTEL ist voll.\p" - .string "Bitte schaffe Platz in deinem BEUTEL\n" - .string "und komme dann wieder.$" + .string "Oh, your BAG appears to be full.\p" + .string "Please make room in your BAG, then come\n" + .string "see me.$" BattleTower_Lobby_Text_19A571:: @ 819A571 - .string "Vielen Dank für die Teilnahme!\p" + .string "Thank you for playing!\p" .string "$" BattleTower_Lobby_Text_19A589:: @ 819A589 - .string "Dein Erfolg wird gespeichert.\n" - .string "Bitte warten...$" + .string "Your record will be saved.\n" + .string "Please wait.$" BattleTower_Lobby_Text_19A5B1:: @ 819A5B1 - .string "Wir haben schon auf dich gewartet!\p" + .string "We’ve been waiting for you!\p" .string "$" BattleTower_Lobby_Text_19A5CE:: @ 819A5CE - .string "Bevor du einen KAMPFRAUM betrittst,\n" - .string "wird dein Spiel gespeichert.\l" - .string "Bitte warten...$" + .string "Before entering a BATTLE ROOM, your\n" + .string "progress will be saved. Please wait.$" BattleTower_Lobby_Text_19A617:: @ 819A617 - .string "Und nun wartet der 50. TRAINER auf\n" - .string "deine Herausforderung.\p" - .string "Jedes Mal, wenn du von jetzt an 7\n" - .string "TRAINER in Folge besiegst, wird deinen\l" - .string "POKéMON ein BAND verliehen.\p" - .string "Viel Glück!$" + .string "You’re finally about to face the\n" + .string "50th TRAINER.\p" + .string "From here on, every time you beat seven\n" + .string "TRAINERS in a row, your POKéMON will\l" + .string "receive a commemorative RIBBON.\p" + .string "Good luck!$" BattleTower_Lobby_Text_19A6BE:: @ 819A6BE - .string "Dies sind einige BÄNDER für den erfolg-\n" - .string "reichen Kampf gegen 7 TRAINER in Folge.\p" - .string "{PLAYER} erhält einige BÄNDER!$" + .string "Here are some RIBBONS for beating\n" + .string "seven tough TRAINERS in a row.\p" + .string "{PLAYER} received some RIBBONS!$" BattleTower_Lobby_Text_19A719:: @ 819A719 - .string "{PLAYER} steckt den herausfordernden\n" - .string "POKéMON die BÄNDER an.$" + .string "{PLAYER} put the RIBBONS on the\n" + .string "challenger POKéMON.$" BattleTower_Lobby_Text_19A747:: @ 819A747 - .string "Hallo, hallo!\n" - .string "Du willst hier kämpfen, richtig?\p" - .string "Verrätst du mir, was du jetzt, während\n" - .string "der Kampfvorbereitungen, denkst?$" + .string "Hello, hello!\n" + .string "You’re going to battle here, right?\p" + .string "Can you tell me what’s going through\n" + .string "your mind as you prepare for battle?$" BattleTower_Lobby_Text_19A7C3:: @ 819A7C3 - .string "Ja? Du verrätst es mir?\n" - .string "Toll! Also, wie lautet deine Antwort?$" + .string "Oh, wow, you’ll tell me?\n" + .string "Great! Then, what’s your answer?$" BattleTower_Lobby_Text_19A7FD:: @ 819A7FD - .string "Ach, so viel denkst du gar nicht darüber\n" - .string "nach? Bist du aber cool!$" + .string "Oh, so you don’t think much about it?\n" + .string "You’re one cool customer.$" BattleTower_Lobby_Text_19A83D:: @ 819A83D - .string "Wie? Du hast deine Meinung geändert?\n" - .string "Meine Güte, bist du aber launisch!$" + .string "Hunh? You changed your mind?\n" + .string "I guess you’re fickle.$" BattleTower_Lobby_Text_19A871:: @ 819A871 - .string "Ach? So fühlst du dich? Das ist\n" - .string "aber eine originelle Beschreibung.\p" - .string "Danke!$" + .string "Okay, so that’s how you feel?\n" + .string "That’s quite original.\p" + .string "Thanks!$" BattleTower_Lobby_Text_19A8AE:: @ 819A8AE - .string "Die Anzahl der in Folge gewonnenen\n" - .string "Kämpfe wird hier aufgezeichnet.\p" - .string "Die Erfolge werden dann neben dem\n" - .string "Registrierungsschalter ausgehängt.\p" - .string "Sie stehen auch auf der Rückseite\n" - .string "deines TRAINERPASSES.$" + .string "The number of matches you win in a row\n" + .string "is recorded.\p" + .string "The record is posted beside the\n" + .string "registration counter.\p" + .string "It’s also on the back of your\n" + .string "TRAINER’S CARD.$" BattleTower_Lobby_Text_19A946:: @ 819A946 - .string "Sobald du den DUELLTURM offiziell be-\n" - .string "treten hast, kannst du ihn nicht eher\l" - .string "verlassen, bis du gegen 7 TRAINER\l" - .string "entweder verloren oder gewonnen hast.\p" - .string "Überlege also gut, bevor du als\n" - .string "Herausforderer antrittst.$" + .string "Once you’ve entered the BATTLE TOWER,\n" + .string "you can’t leave until you either lose\l" + .string "or you beat seven TRAINERS in a row.\p" + .string "You’d best be certain that you’re up\n" + .string "to the challenge.$" BattleTower_Lobby_Text_19A9EE:: @ 819A9EE - .string "Hahaha! Absolut großartig!\n" - .string "Wirklich einfach großartig!\p" - .string "Bist du dir bewusst, was du geschafft\n" - .string "hast? Du hast 50 TRAINER in Folge\l" - .string "besiegt!\p" - .string "Ja, der pure Wahnsinn!!!\p" - .string "Als EIGENTÜMER dieses DUELLTURMS\n" - .string "überreiche ich dir hiermit ein Andenken!$" + .string "Hahahaha! Pure magnificence!\n" + .string "Pure magnificence indeed!\p" + .string "Do you realize what you’ve achieved?\n" + .string "You’ve beaten 50 TRAINERS in a row!\p" + .string "Yes, purely magnificent!\p" + .string "As the OWNER of the BATTLE TOWER,\n" + .string "let me give you a memento!$" BattleTower_Lobby_Text_19AAC4:: @ 819AAC4 - .string "Hahaha! Absolut großartig!\n" - .string "Wirklich einfach großartig!\p" - .string "Bist du dir bewusst, was du geschafft\n" - .string "hast? Du hast 100 TRAINER in Folge\l" - .string "besiegt!\p" - .string "Ja, der pure Wahnsinn!!!\p" - .string "Als EIGENTÜMER dieses DUELLTURMS\n" - .string "überreiche ich dir hiermit ein Andenken.$" + .string "Wahahaha! Pure magnificence!\n" + .string "Absolutely pure magnificence indeed!\p" + .string "Do you realize what you’ve achieved?\n" + .string "You’ve beaten 100 TRAINERS in a row!\p" + .string "Yes, absolutely magnificent!\p" + .string "As the OWNER of the BATTLE TOWER,\n" + .string "let me give you a memento!$" BattleTower_Lobby_Text_19ABAA:: @ 819ABAA - .string "Ich vermute, du willst es hier auf-\n" - .string "hängen. Das findet sicher Beachtung!$" + .string "I suggest you keep it displayed.\n" + .string "It will surely attract attention.$" BattleTower_Lobby_Text_19ABED:: @ 819ABED - .string "Ach!\n" - .string "Auf deinem PC ist kein Platz mehr dafür.\p" - .string "Aber deshalb sollten wir es nicht weg-\n" - .string "werfen! Bitte regle das und komm wieder.$" + .string "Oh?\n" + .string "Your PC has no room for this...\p" + .string "But it would be a shame to waste this...\n" + .string "Please come back for this!$" BattleTower_Lobby_Text_19AC55:: @ 819AC55 - .string "Ich bin einfach überwältigt von deiner\n" - .string "großartigen Leistung!\p" - .string "TRAINER wie du geben dem DUELLTURM\n" - .string "seinen wahren Sinn.$" + .string "I’m overwhelmed with satisfaction after\n" + .string "seeing your magnificent performance.\p" + .string "It makes the building of the BATTLE\n" + .string "TOWER all worthwhile!$" diff --git a/data/text/maps/BattleTower_Outside.inc b/data/text/maps/BattleTower_Outside.inc index 3be50176f..934ebca36 100644 --- a/data/text/maps/BattleTower_Outside.inc +++ b/data/text/maps/BattleTower_Outside.inc @@ -1,49 +1,48 @@ BattleTower_Outside_Text_199C6F:: @ 8199C6F - .string "DUELLTURM\n" - .string "“Besiege alle und werde der beste\l" - .string "TRAINER!”$" + .string "BATTLE TOWER\n" + .string "“Win it all and be the best, TRAINERS!”$" BattleTower_Outside_Text_199CA4:: @ 8199CA4 - .string "Dies ist der DUELLTURM.\p" - .string "TRAINER tragen mit ihren besten\n" - .string "POKéMON Ausscheidungskämpfe aus.$" + .string "This is the BATTLE TOWER.\p" + .string "TRAINERS bring their best-raised\n" + .string "POKéMON for elimination-style matches.$" BattleTower_Outside_Text_199D06:: @ 8199D06 - .string "Hallo! Möchtest du mit der Fähre fahren?\n" - .string "Darf ich bitte dein TICKET sehen?$" + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" BattleTower_Outside_Text_199D40:: @ 8199D40 - .string "{PLAYER} hat kein TICKET...\p" - .string "Es tut mir schrecklich Leid.\p" - .string "Du brauchst ein TICKET, um mit der\n" - .string "Fähre fahren zu dürfen.$" + .string "{PLAYER} doesn’t have the TICKET...\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" BattleTower_Outside_Text_199D9D:: @ 8199D9D - .string "{PLAYER} zeigt das TICKET.\p" - .string "Wunderbar! Das ist gut!\p" - .string "Und wohin möchtest du reisen?$" + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" BattleTower_Outside_Text_199DF2:: @ 8199DF2 - .string "Also nach GRAPHITPORT CITY, richtig?$" + .string "SLATEPORT CITY it is, then!$" BattleTower_Outside_Text_199E0E:: @ 8199E0E - .string "Also nach SEEGRASULB CITY, richtig?$" + .string "LILYCOVE CITY it is, then!$" BattleTower_Outside_Text_199E29:: @ 8199E29 - .string "Bitte beehre uns bald wieder!$" + .string "Please sail with us another time!$" BattleTower_Outside_Text_199E4B:: @ 8199E4B - .string "Bitte geh auf die Fähre. Wir legen in\n" - .string "Kürze ab.$" + .string "Please board the ferry and wait for\n" + .string "departure.$" BattleTower_Outside_Text_199E7A:: @ 8199E7A - .string "Und? Wo soll die Reise hingehen?$" + .string "Then, where would you like to go?$" BattleTower_Outside_Text_199E9C:: @ 8199E9C - .string "Ich gehe nicht eher hier weg, bis ich 35\n" - .string "TRAINER in Folge besiegt habe!$" + .string "I’m not leaving until I’ve beaten 35\n" + .string "TRAINERS in a row!$" BattleTower_Outside_Text_199ED4:: @ 8199ED4 - .string "Hui, sind das aber viele stark\n" - .string "aussehende TRAINER... Ich bin\l" - .string "nicht gut genug, hier anzutreten...$" + .string "Gee, there’re a lot of tough-looking\n" + .string "TRAINERS here.\l" + .string "I’m not good enough to enter yet...$" diff --git a/data/text/maps/DewfordTown.inc b/data/text/maps/DewfordTown.inc index 65eba572d..efdbfbff6 100644 --- a/data/text/maps/DewfordTown.inc +++ b/data/text/maps/DewfordTown.inc @@ -1,170 +1,167 @@ DewfordTown_Text_16B23B:: @ 816B23B - .string "FAUSTAUHAVEN ist eine kleine\n" - .string "Inselgemeinschaft. Wenn hier etwas in\l" - .string "Mode kommt, will jeder es haben.$" + .string "DEWFORD TOWN is a tiny island community.\n" + .string "If something gets trendy here,\l" + .string "everyone picks up on it right away.$" DewfordTown_Text_16B2A7:: @ 816B2A7 - .string "FAUSTAUHAVEN\n" - .string "“Eine kleine Insel im blauen Meer.”$" + .string "DEWFORD TOWN\n" + .string "“A tiny island in the blue sea.”$" DewfordTown_Text_16B2D5:: @ 816B2D5 - .string "POKéMON ARENA von FAUSTAUHAVEN\n" - .string "LEITER: KAMILLO\l" - .string "“Eine große Welle des Kampfes!”$" + .string "DEWFORD TOWN POKéMON GYM\n" + .string "LEADER: BRAWLY\l" + .string "“A big wave in fighting!”$" DewfordTown_Text_16B317:: @ 816B317 - .string "FAUSTAUHAVEN HALLE\n" - .string "“Die Informationsbörse für jedermann!”$" + .string "DEWFORD HALL\n" + .string "“Everyone’s information exchange!”$" Route104_Text_16B347:: @ 816B347 - .string "MR. BRACK: Ahoi! Wir haben in\n" - .string "FAUSTAUHAVEN Anker geworfen.\p" - .string "Ich vermute, du wirst diesen BRIEF\n" - .string "jetzt diesem... TROY bringen!?!$" + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve hit land in DEWFORD.\p" + .string "I suppose you’re off to deliver that\n" + .string "LETTER to, who was it now, STEVEN!$" DewfordTown_Text_16B3BC:: @ 816B3BC - .string "MR. BRACK: Hast du den BRIEF\n" - .string "überbracht?\p" - .string "Oder meinst du, wir müssen zurück\n" - .string "nach BLÜTENBURG CITY segeln?$" + .string "MR. BRINEY: Have you delivered your\n" + .string "LETTER?\p" + .string "Or were you meaning to sail back to\n" + .string "PETALBURG?$" DewfordTown_Text_16B417:: @ 816B417 - .string "MR. BRACK: BLÜTENBURG CITY...\n" - .string "In Ordnung.\p" - .string "Anker gelichtet!\n" - .string "PECKO, mein Schatz, wir setzen Segel!$" + .string "MR. BRINEY: PETALBURG it is, then!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" DewfordTown_Text_16B471:: @ 816B471 - .string "MR. BRACK: Dann bring den BRIEF zu\n" - .string "seinem Empfänger. Ich warte hier.$" + .string "MR. BRINEY: Then you go on and deliver\n" + .string "the LETTER. I’ll be waiting.$" Route104_Text_16B4B5:: @ 816B4B5 Route109_Text_16B4B5:: @ 816B4B5 - .string "MR. BRACK: Ahoi! Wir haben in\n" - .string "FAUSTAUHAVEN Anker geworfen!\p" - .string "Komm, wenn wir wieder Segel\n" - .string "setzen sollen.$" + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve hit land in DEWFORD!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail again!$" DewfordTown_Text_16B522:: @ 816B522 - .string "MR. BRACK: Ahoi! Für dich segle ich zu\n" - .string "jeder Zeit überall hin.\p" - .string "Nun, mein Freund, wohin soll es gehen?$" + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" DewfordTown_Text_16B57D:: @ 816B57D - .string "MR. BRACK: BLÜTENBURG CITY soll es sein?\p" - .string "Anker gelichtet!\n" - .string "PECKO, mein Schatz, wir setzen Segel!$" + .string "MR. BRINEY: PETALBURG, is it?\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" DewfordTown_Text_16B5D2:: @ 816B5D2 - .string "MR. BRACK: GRAPHITPORT CITY soll\n" - .string "es sein?\p" - .string "Anker gelichtet!\n" - .string "PECKO, mein Schatz, wir setzen Segel!$" + .string "MR. BRINEY: SLATEPORT, is it?\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" DewfordTown_Text_16B627:: @ 816B627 - .string "MR. BRACK: Sag mir, wenn wir wieder\n" - .string "Segel setzen sollen.$" + .string "MR. BRINEY: Just tell me whenever you\n" + .string "want to set sail again.$" DewfordTown_Text_16B665:: @ 816B665 - .string "Dies ist ein berühmter Angelplatz.\n" - .string "Hast du Lust zu angeln?$" + .string "This is a renowned fishing spot.\n" + .string "Are you getting the itch to fish?$" DewfordTown_Text_16B6A8:: @ 816B6A8 - .string "Ich habe dir genau zugehört und mir\n" - .string "gefällt, was du gesagt hast!\p" - .string "Ich werde dir eine meiner ANGELN\n" - .string "geben.$" + .string "I hear you, and I like what\n" + .string "you’re saying!\p" + .string "I’ll give you one of my fishing RODS.$" DewfordTown_Text_16B6F9:: @ 816B6F9 - .string "Und, als kleine Zugabe, gebe ich dir noch\n" - .string "einige Tipps zum Angeln!\p" - .string "Schau dir zuerst das Wasser an und dann\n" - .string "benutze deine ANGEL.\p" - .string "Konzentriere dich... Wenn etwas anbeißt,\n" - .string "hol die ANGEL ein.\p" - .string "Manchmal kannst du mit einem Mal etwas\n" - .string "Großes fangen, manchmal musst du\l" - .string "immer wieder kurz die ANGEL anheben,\l" - .string "um etwas an Land zu ziehen.$" + .string "And, as an added bonus, I’ll even throw\n" + .string "in a little fishing advice!\p" + .string "First, you want to face the water,\n" + .string "then use the ROD.\p" + .string "Focus your mind...\n" + .string "If you get a bite, pull on the ROD.\p" + .string "Sometimes you can snag something\n" + .string "immediately, but with bigger catches,\l" + .string "you need to time the pulls on your ROD\l" + .string "to haul them in.$" DewfordTown_Text_16B828:: @ 816B828 - .string "Oh, wirklich?\n" - .string "Das ist aber schade.$" + .string "Oh, is that so?\n" + .string "That’s too bad, then.$" DewfordTown_Text_16B84E:: @ 816B84E - .string "Yeah!\n" - .string "Wie steht’s mit deinen Angelkünsten?$" + .string "Yo!\n" + .string "How’s your fishing?$" DewfordTown_Text_16B866:: @ 816B866 - .string "Also, wenn das stimmt... Das wäre\n" - .string "großartig! Petri heil!$" + .string "Is that right! That’s great!\n" + .string "Haul in some big ones!$" DewfordTown_Text_16B89A:: @ 816B89A - .string "Hey, lass den Kopf nicht hängen! Ich\n" - .string "gebe dir einige Tipps zum Angeln!\p" - .string "Schau dir zuerst das Wasser an\n" - .string "und dann benutze deine ANGEL.\p" - .string "Konzentriere dich... Wenn etwas\n" - .string "anbeißt, hol die ANGEL ein.\p" - .string "Manchmal kannst du mit einem Mal etwas\n" - .string "Großes fangen, manchmal musst du\l" - .string "immer wieder kurz die ANGEL anheben,\l" - .string "um etwas an Land zu ziehen.$" + .string "Oh, hey, don’t get down on yourself!\n" + .string "I’ll give you a little fishing advice.\p" + .string "First, you want to face the water,\n" + .string "then use the ROD.\p" + .string "Focus your mind...\n" + .string "If you get a bite, pull the ROD.\p" + .string "Sometimes you can snag something\n" + .string "immediately, but with bigger catches,\l" + .string "you need to time the pulls on your ROD\l" + .string "to haul them in.$" DewfordTown_Text_16B9CE:: @ 816B9CE - .string "Ich mag, was hip, aufregend und modern\n" - .string "ist. So etwas probiere ich immer aus.\p" - .string "Hast du schon einmal was von\n" - .string "“{STR_VAR_1}” gehört?\p" - .string "Wusste ich es doch!\n" - .string "Natürlich hast du schon davon gehört!\p" - .string "Oh, meine Güte,\n" + .string "I like what’s hip, happening, and trendy.\n" + .string "I’m always checking it out.\p" + .string "Listen, have you heard about this new\n" + .string "“{STR_VAR_1}”?\p" + .string "That’s right!\n" + .string "Of course you know!\p" + .string "I mean, sheesh,\n" .string "“{STR_VAR_1}”...\l" - .string "Das ist das Coolste überhaupt!\p" - .string "Wo immer du auch herkommst,\n" + .string "It’s the hottest thing in cool!\p" + .string "Wherever you’re from,\n" .string "“{STR_VAR_1}”\l" - .string "ist das Aufregendste überhaupt!$" + .string "is the biggest happening thing, right?$" DewfordTown_Text_16BADC:: @ 816BADC - .string "Wie bitte?\n" - .string "Es ist nicht hip und aufregend?\p" - .string "Nun, hey, dann verrate mir aber, was\n" - .string "wirklich cool und “in” ist?$" + .string "Hunh?\n" + .string "It’s not the hip and happening thing?\p" + .string "Well, hey, you have to tell me,\n" + .string "what’s new and what’s “in”?$" DewfordTown_Text_16BB44:: @ 816BB44 - .string "Was?\n" + .string "Hunh?\n" .string "“{STR_VAR_2}”?\p" .string "... ...\p" - .string "...Hm... Äh... Yeah! Das stimmt!\n" - .string "Yeah, ich wusste das! Schon lange!\p" - .string "Natürlich weiß ich das!\n" - .string "“{STR_VAR_2}”, richtig?\p" - .string "Yeah, das ist es, das ist es!\n" - .string "Ist “{STR_VAR_2}”\l" - .string "nicht das Coolste?\p" - .string "Das ist die hippeste Sache überhaupt.\n" - .string "Und du dachtest, ich wüsste das nicht?\p" + .string "...Uh... Yeah! That’s right!\n" + .string "Yeah, I knew that! Knew it all along!\p" + .string "Of course I know about that!\n" + .string "“{STR_VAR_2},” right?\p" + .string "Yeah, that’s it, it’s there!\n" + .string "Isn’t “{STR_VAR_2}”\l" + .string "the coolest, or what?\p" + .string "It’s the hippest thing in hip.\n" + .string "You think I’d not know about it?\p" .string "“{STR_VAR_1}”...\n" - .string "Das ist doch schon uralt und unmodern.\p" - .string "“{STR_VAR_2}” ist das,\n" - .string "was vital und zeitgemäß ist!$" + .string "It’s, like, so five minutes ago.\p" + .string "Now, “{STR_VAR_2}” is\n" + .string "what’s vital and in tune with the times!$" DewfordTown_Text_16BCA2:: @ 816BCA2 .string "Hmm...\n" - .string "“{STR_VAR_2}”, oder?\p" - .string "Aber ich persönlich finde,\n" + .string "“{STR_VAR_2},” huh?\p" + .string "But personally, I think\n" .string "“{STR_VAR_1}”\l" - .string "ist das Coolste überhaupt!$" + .string "is what’s real in cool.$" DewfordTown_Text_16BCE9:: @ 816BCE9 - .string "Wenn du irgendetwas über neue, auf-\n" - .string "regende Sachen hörst, erzähl mir davon!$" + .string "Well, if you hear of any happening new\n" + .string "trends, come share them with me, okay?$" DewfordTown_Text_16BD37:: @ 816BD37 - .string "Yeah, absolut richtig!\p" - .string "“{STR_VAR_1}” ist die\n" - .string "Definition von “in”.$" + .string "Yeah, absolutely right!\p" + .string "“{STR_VAR_1}” is the\n" + .string "definition of “in” right now.$" DewfordTown_Text_16BD79: @ 816BD79 - .string "“{STR_VAR_2}” ist\n" - .string "die Spitze der Coolness im Moment.$" + .string "“{STR_VAR_2}” is at\n" + .string "the pinnacle of cool right now.$" diff --git a/data/text/maps/DewfordTown_Gym.inc b/data/text/maps/DewfordTown_Gym.inc index 3cc2fb9f4..24d90ec6c 100644 --- a/data/text/maps/DewfordTown_Gym.inc +++ b/data/text/maps/DewfordTown_Gym.inc @@ -1,110 +1,107 @@ DewfordTown_Gym_Text_174D98:: @ 8174D98 - .string "Na, wie sieht es aus, auf dem Weg zum\n" - .string "CHAMP, {PLAYER}?\p" - .string "FAUSTAUHAVENS ARENALEITER KAMILLO\n" - .string "besitzt KAMPF-POKéMON.\p" - .string "Wenn du dort NORMAL-POKéMON antreten\n" - .string "lässt, sind Probleme vorprogrammiert!\p" - .string "KAMPF-POKéMON schlagen die NORMALEN\n" - .string "POKéMON einfach nieder. Pass gut auf!\p" - .string "Und das Schlimme ist: Die ARENA ist\n" - .string "dunkel wie die Tiefsee!\p" - .string "Aber mit jedem TRAINER, den du auf dem\n" - .string "Weg zum ARENALEITER besiegst, wird sie\l" - .string "heller!\p" - .string "Also, dann leg mal los!$" + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "DEWFORD’s GYM LEADER BRAWLY commands\n" + .string "FIGHTING-type POKéMON.\p" + .string "Going against him with NORMAL-type\n" + .string "POKéMON is asking for trouble.\p" + .string "FIGHTING POKéMON will lay a serious\n" + .string "smack down on NORMAL POKéMON,\l" + .string "so be careful!\p" + .string "What’s worse, the GYM is as dark as\n" + .string "the ocean floor.\p" + .string "But it will get brighter after defeating\n" + .string "the TRAINERS in your way.\p" + .string "Hey, okay, go for it!$" DewfordTown_Gym_Text_174F1E:: @ 8174F1E - .string "Huuh! Das ist mir hier aber schon zu hell!\p" - .string "Deine Zukunft wird strahlend hell sein!$" + .string "Whoah! It’s turned too bright in here!\p" + .string "Your future is bright, too!$" DewfordTown_Gym_Text_174F61:: @ 8174F61 - .string "Die Macht bestimmt alles!\n" - .string "Komm schon!$" + .string "Might is right!\n" + .string "Come on!$" DewfordTown_Gym_Text_174F7A:: @ 8174F7A - .string "Nicht genug Macht...$" + .string "Not enough power...$" DewfordTown_Gym_Text_174F8E:: @ 8174F8E - .string "Gegen dein Talent ist meine Macht\n" - .string "machtlos. Deine Technik ist super!$" + .string "Your skill overcame my strength!\n" + .string "Your technique is commendable!$" DewfordTown_Gym_Text_174FCE:: @ 8174FCE - .string "Man muss doch KAMILLO nicht mit so\n" - .string "etwas Nichtigem belästigen!\p" - .string "Ich mache dich fertig!$" + .string "There’s no need for BRAWLY to be\n" + .string "involved!\p" + .string "I’ll crush you!$" DewfordTown_Gym_Text_175009:: @ 8175009 - .string "Aber... Wie...?\n" - .string "Wie konnte ich nur so schnell verlieren?$" + .string "But... How?\n" + .string "How could I lose so easily?$" DewfordTown_Gym_Text_175031:: @ 8175031 - .string "Ich werde diese Niederlage nicht ab-\n" - .string "haken. Sie wird mich beim Training\l" - .string "motivieren!\p" - .string "Eines Tages werde ich auch ein\n" - .string "ARENALEITER sein!\p" - .string "Nein! Ich werde der CHAMP der\n" - .string "POKéMON LIGA!$" + .string "I’m not going to waste this loss.\n" + .string "I’ll use it to motivate me to train!\p" + .string "One day I’ll become a GYM LEADER...\p" + .string "No, I’ll become the POKéMON LEAGUE\n" + .string "CHAMPION!$" DewfordTown_Gym_Text_1750C9:: @ 81750C9 - .string "Du forderst mich heraus? Dann wundere\n" - .string "dich nicht, wenn du weinst wie ein Baby!$" + .string "Don’t you dare brush me off!\n" + .string "It’s not my fault if you cry!$" DewfordTown_Gym_Text_175104:: @ 8175104 - .string "Waaaaahaaaaaa!\n" - .string "Schluchz! Schnief! Ich habe verloooren!$" + .string "Waaaaaaah!\n" + .string "I lost!$" DewfordTown_Gym_Text_175117:: @ 8175117 - .string "Ich kämpfe im Dunkeln, das macht mich\n" - .string "mutiger und trainiert mein Herz.\p" - .string "Weil es hier so dunkel ist, habe ich noch\n" - .string "nie das Gesicht von KAMILLO gesehen.$" + .string "I battle in the dark to make my heart\n" + .string "stronger.\p" + .string "But because it’s so dark, I can never\n" + .string "see BRAWLY’s face...$" DewfordTown_Gym_Text_175182:: @ 8175182 - .string "Ich bin KAMILLO!\n" - .string "Der ARENALEITER von FAUSTAUHAVEN!\p" - .string "Ich habe die wilden Strudel dieser\n" - .string "Gegend gemeistert und bin in dieser\l" - .string "pechschwarzen Höhle stark geworden.\p" - .string "Du willst mich wirklich herausfordern?\n" - .string "Dann zeig mir, woraus du gemacht bist!$" + .string "I’m BRAWLY!\n" + .string "DEWFORD’s GYM LEADER!\p" + .string "I’ve been churned in the rough waves\n" + .string "of these parts, and I’ve grown tough\l" + .string "in the pitch-black cave!\p" + .string "So you wanted to challenge me?\n" + .string "Let me see what you’re made of!$" DewfordTown_Gym_Text_175246:: @ 8175246 - .string "Huihuihui! Du hast eine größere Welle\n" - .string "produziert, als ich dir zugetraut hätte.\p" - .string "Du hast mich absaufen lassen!\p" - .string "Okay, du hast mich erwischt!\n" - .string "Nimm den ORDEN dieser ARENA!$" + .string "Whoah, wow! You made a much bigger\n" + .string "splash than I expected!\p" + .string "You swamped me!\p" + .string "Okay, you’ve got me.\n" + .string "Take this GYM BADGE!$" DewfordTown_Gym_Text_1752BB:: @ 81752BB - .string "{PLAYER} erhält den KNÖCHELORDEN von\n" - .string "KAMILLO.$" + .string "{PLAYER} received the KNUCKLE BADGE\n" + .string "from BRAWLY.$" DewfordTown_Gym_Text_1752E6:: @ 81752E6 - .string "Dank des KNÖCHELORDENS werden dir alle\n" - .string "POKéMON bis Level 30 gehorchen, auch\l" - .string "die, die du durch Tausch erhalten hast.\p" - .string "Und du kannst die VM BLITZ auch\n" - .string "außerhalb eines Kampfes anwenden.\p" - .string "Und wenn du magst, kannst du auch diese\n" - .string "TECHNISCHE MASCHINE anwenden.$" + .string "The KNUCKLE BADGE makes all POKéMON\n" + .string "up to Level 30, even those you get in\l" + .string "trades, obey without question.\p" + .string "And, you’ll be able to use the HM move\n" + .string "FLASH outside of battle.\p" + .string "If you’d like, use this TECHNICAL\n" + .string "MACHINE, too.$" DewfordTown_Gym_Text_1753BF:: @ 81753BF - .string "Die TM08 enthält PROTZER.\p" - .string "Diese Attacke hebt den Status des\n" - .string "ANGRIFFS und der VERTEIDIGUNG.$" + .string "That TM08 contains BULK UP.\p" + .string "It’s a move that raises both ATTACK\n" + .string "and DEFENSE stats.$" DewfordTown_Gym_Text_175412:: @ 8175412 - .string "Ich sehe in dir ein Talent, das eines\n" - .string "Tages zu einer riesigen Welle wird und\l" - .string "einen Sturm des Erstaunens bei anderen\l" - .string "TRAINERN entfachen wird!$" + .string "I can see your talent becoming a giant\n" + .string "wave to cause a storm of astonishment\l" + .string "among TRAINERS one day!$" DewfordTown_Gym_Text_175477:: @ 8175477 - .string "POKéMON ARENA von FAUSTAUHAVEN$" + .string "DEWFORD TOWN POKéMON GYM$" DewfordTown_Gym_Text_175490:: @ 8175490 - .string "POKéMON ARENA von FAUSTAUHAVEN\p" - .string "KAMILLOS ANERKANNTE TRAINER:\n" + .string "DEWFORD TOWN POKéMON GYM\p" + .string "BRAWLY’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/DewfordTown_Hall.inc b/data/text/maps/DewfordTown_Hall.inc index 4921793d7..6b9f4337e 100644 --- a/data/text/maps/DewfordTown_Hall.inc +++ b/data/text/maps/DewfordTown_Hall.inc @@ -1,189 +1,183 @@ DewfordTown_Hall_Text_1754C9:: @ 81754C9 - .string "Was in ist? Nun, mit Sicherheit\n" + .string "What’s in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" - .string "Ich kann mir ein Leben ohne\n" - .string "“{STR_VAR_1}” nicht\l" - .string "vorstellen!$" + .string "I can’t imagine what life would be like\n" + .string "without “{STR_VAR_1}”!$" DewfordTown_Hall_Text_175528:: @ 8175528 - .string "Was in ist? Nun, mit Sicherheit\n" + .string "What’s in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" - .string "Aber so langsam langweilt es mich.\p" - .string "Ich sollte mich nach neuen Sachen\n" - .string "umsehen.$" + .string "But I’m getting kind of bored with it.\p" + .string "I should look for the next big thing.$" DewfordTown_Hall_Text_17559E:: @ 817559E - .string "Ich bringe meinen POKéMON etwas über\n" - .string "“{STR_VAR_1}” bei,\l" - .string "aber es klappt nicht so recht.\p" - .string "Scheinbar sind sie damit überfordert.$" + .string "I’m teaching my POKéMON about\n" + .string "“{STR_VAR_1},”\l" + .string "but it’s not going well.\p" + .string "It’s a bit too much, I think.$" DewfordTown_Hall_Text_1755F9:: @ 81755F9 - .string "Ich vertiefe mich gerade in ein hippes\n" - .string "“{STR_VAR_1}”.\p" - .string "Gibt es eine enge Verbindung\n" - .string "zwischen “{STR_VAR_1}”\l" - .string "und “{STR_VAR_2}”?$" + .string "I’m studying up on the hip and trendy\n" + .string "“{STR_VAR_1}” now.\p" + .string "Is it true that there’s a deep link\n" + .string "between “{STR_VAR_1}”\l" + .string "and “{STR_VAR_2}”?$" DewfordTown_Hall_Text_175664:: @ 8175664 .string "Oh!\n" - .string "Da lag ich ja absolut richtig!\p" - .string "Ich bin einen Schritt weiter in meinen\n" - .string "Bemühungen, hip und aufregend zu sein!$" + .string "So, my hunch was right!\p" + .string "I’m one step closer to being hip and\n" + .string "happening, yowza!$" DewfordTown_Hall_Text_1756B7:: @ 81756B7 - .string "Was?!?\n" - .string "Wirklich?!?\p" - .string "Für einen alten Menschen ist es gar\n" - .string "nicht so leicht, mit der Mode zu gehen!$" + .string "What?!\n" + .string "Is that so?!\p" + .string "It’s not easy for an older fellow like\n" + .string "me to keep up with trends!$" DewfordTown_Hall_Text_17570D:: @ 817570D - .string "Diese ganze Sache mit\n" + .string "This whole business about\n" .string "“{STR_VAR_1}”...\l" - .string "Gibt es da nicht eine Sendung drüber?$" + .string "Isn’t there a TV show on it?$" DewfordTown_Hall_Text_17574C:: @ 817574C - .string "Jenseits des Meeres...\p" - .string "Ist dort “{STR_VAR_1}”\n" - .string "noch beliebter?$" + .string "Across the sea...\p" + .string "Is “{STR_VAR_1}”\n" + .string "even more popular?$" DewfordTown_Hall_Text_175779:: @ 8175779 - .string "Ich sammle lizenzierte\n" - .string "“{STR_VAR_1}”-\l" - .string "Artikel.\p" - .string "Ich habe die offiziellen\n" - .string "“{STR_VAR_1}”-Puppen.\p" - .string "Offizielle\n" - .string "“{STR_VAR_1}”-\l" - .string "Kleidung...\p" - .string "Und die offiziellen\n" - .string "“{STR_VAR_1}”-\l" - .string "Bilderbücher.\p" - .string "Hähähä, das besitze ich alles!\n" - .string "Und ich gebe dir nichts ab! Ätsch!$" + .string "I collect official\n" + .string "“{STR_VAR_1}”\l" + .string "licensed merchandise.\p" + .string "I have official\n" + .string "“{STR_VAR_1}” dolls...\p" + .string "Official “{STR_VAR_1}”\n" + .string "brand clothing...\p" + .string "And officially licensed\n" + .string "“{STR_VAR_1}”\l" + .string "picture books.\p" + .string "Heheh, I own!\n" + .string "I’m not sharing anything with you!$" DewfordTown_Hall_Text_175842:: @ 8175842 - .string "GUTE “{STR_VAR_1}” &\n" - .string "SCHLECHTE\l" - .string "“{STR_VAR_1}”...\p" - .string "DAS BAND ZWISCHEN\n" - .string "“{STR_VAR_1}”\l" - .string "UND POKéMON...\p" - .string "HILFREICHE\n" + .string "IDENTIFYING GOOD\n" + .string "“{STR_VAR_1}” &\l" + .string "BAD “{STR_VAR_1}”...\p" + .string "THE LINK BETWEEN\n" + .string "“{STR_VAR_1}” AND\l" + .string "POKéMON...\p" + .string "USEFUL\n" .string "“{STR_VAR_1}”...\p" - .string "Es ist total vollgestopft mit Büchern\n" - .string "über “{STR_VAR_1}”.$" + .string "It’s neatly jammed with books about\n" + .string "“{STR_VAR_1}.”$" DewfordTown_Hall_Text_1758C4:: @ 81758C4 - .string "“DER RUF VON\n" - .string "{STR_VAR_1}”\l" - .string "ist der Titel.$" + .string "“{STR_VAR_1}’S\n" + .string "SCREAM” is the title.$" DewfordTown_Hall_Text_1758E0:: @ 81758E0 - .string "“DAS LÄCHELN VON\n" - .string "{STR_VAR_1}”\l" - .string "ist der Titel.$" + .string "“{STR_VAR_1}’S\n" + .string "SMILE” is the title.$" DewfordTown_Hall_Text_1758FB:: @ 81758FB - .string "Es heißt “DAS LETZTE\n" + .string "It’s titled “THE LAST\n" .string "{STR_VAR_1}”.$" DewfordTown_Hall_Text_175916:: @ 8175916 - .string "Es heißt “DIE GEBURT EINES\n" + .string "It’s titled “THE BIRTH OF\n" .string "{STR_VAR_1}”.$" DewfordTown_Hall_Text_175935:: @ 8175935 - .string "Ich habe “{STR_VAR_1}”\n" - .string "gesehen! Cool, was?\p" - .string "Das Coolste überhaupt, würde ich sagen!\p" - .string "Es war unglaublich!\n" - .string "Das war das absolut Wahre, oh yeah!$" + .string "I saw “{STR_VAR_1}”!\n" + .string "Cool, huh?\p" + .string "It’s, like, the coolest thing going!\p" + .string "It was awesome!\n" + .string "It was the real thing, oh yeah!$" DewfordTown_Hall_Text_1759A1:: @ 81759A1 - .string "Oh, nein, nein, nein.\p" - .string "Das vermeintliche\n" - .string "“{STR_VAR_1}”,\l" - .string "das du gesehen hast - war nicht echt.\p" - .string "Das echte ist...\n" - .string "Wie soll ich sagen?\l" - .string "Ist spitzer und wohlgeformter!\p" - .string "Aber egal. Es ist erstaunlich!$" + .string "Oh, no, no, no.\p" + .string "That alleged\n" + .string "“{STR_VAR_1}”\l" + .string "you claim to have seen - it’s not.\p" + .string "The authentic article is much...\n" + .string "How should I say it?\l" + .string "Sharper, yet more mellifluous!\p" + .string "Ah, no matter. It’s astonishing!$" DewfordTown_Hall_Text_175A5C:: @ 8175A5C - .string "Hey, hör zu! Ich habe ein Leitmotiv\n" - .string "für “{STR_VAR_1}”\l" - .string "komponiert.\p" + .string "Hey, listen, I composed a theme song\n" + .string "for “{STR_VAR_1}.”\p" .string "“{STR_VAR_1}”\n" - .string "ist gerade sehr populär.\p" - .string "Okay, hör zu!\n" + .string "is really popular right now.\p" + .string "Okay, listen!\n" .string "... ...\p" .string "Oh!\n" .string "{STR_VAR_1}!\p" - .string "Wundervolles\n" + .string "Wonderful\n" .string "{STR_VAR_1}!$" DewfordTown_Hall_Text_175AD9:: @ 8175AD9 .string "... ...\p" - .string "Ich würde sagen, du solltest erst einmal\n" - .string "Gesangsunterricht nehmen, bevor du es\l" - .string "mit “{STR_VAR_1}”\l" - .string "aufnimmst.$" + .string "I dare say, chap, it would pay for you\n" + .string "to work on your singing before you\l" + .string "trifle yourself with\l" + .string "“{STR_VAR_1}.”$" DewfordTown_Hall_Text_175B46:: @ 8175B46 - .string "Wie ich vorhin schon sagte, sollten wir\n" - .string "uns zusammentun und eine\l" - .string "“{STR_VAR_1}”-Party\l" - .string "auf der Insel veranstalten.$" + .string "Anyway, as I was saying earlier, we\n" + .string "should get together and organize a\l" + .string "“{STR_VAR_1}” party\l" + .string "on the island.$" DewfordTown_Hall_Text_175BA7:: @ 8175BA7 - .string "Oh, was für eine gute Idee!\p" - .string "Nun stellen wir ein für alle Mal fest, wer\n" - .string "der Beste in\l" - .string "“{STR_VAR_1}” ist.\l" - .string "Brillant, wirklich!\p" - .string "Von heute an dreht sich unser Leben\n" - .string "um “{STR_VAR_1}”!$" + .string "Oh, a smashing good idea!\p" + .string "It will settle once and for all\n" + .string "who is the best at\l" + .string "“{STR_VAR_1}.”\l" + .string "Brilliant, indeed!\p" + .string "Starting today, our lives will revolve\n" + .string "around “{STR_VAR_1}”!$" DewfordTown_Hall_Text_175C41:: @ 8175C41 - .string "Ich habe nachgedacht...\p" - .string "Stimmst du mir zu, dass\n" - .string "“{STR_VAR_1}” von\l" - .string "etwas Modernem zu einem Teil unseres\l" - .string "Lebens geworden ist?$" + .string "I was thinking, though...\p" + .string "Wouldn’t you agree that\n" + .string "“{STR_VAR_1}” has\l" + .string "grown from being something trendy to\l" + .string "being a part of our daily lives?$" DewfordTown_Hall_Text_175CC2:: @ 8175CC2 - .string "Bitte?\n" - .string "So dominant?\p" - .string "Nun ja, natürlich bestimmt\n" - .string "“{STR_VAR_1}” auch\l" - .string "unsere Gedanken, im Wachen und\l" - .string "im Schlafen.\p" - .string "Du bist mit Sicherheit der\n" - .string "“{STR_VAR_1}”-\l" - .string "PROFESSOR!$" + .string "Beg pardon?\n" + .string "That much, what?\p" + .string "However, it’s true that\n" + .string "“{STR_VAR_1}”\l" + .string "weighs heavily on your mind, whether\l" + .string "you’re awake or asleep.\p" + .string "Absolutely, you’re the\n" + .string "“{STR_VAR_1}”\l" + .string "PROFESSOR, old sport!$" DewfordTown_Hall_Text_175D6B:: @ 8175D6B - .string "Wenn du und ich ein Team bilden,\n" - .string "sind wir unverwundbar gegen\l" - .string "“{STR_VAR_1}”!$" + .string "If you and me team up as a combo,\n" + .string "we’ll be invincible when it comes to all\l" + .string "things “{STR_VAR_1}”!$" DewfordTown_Hall_Text_175DC3:: @ 8175DC3 - .string "Licht an, mein Freund!\p" - .string "Wir sind das\n" - .string "“{STR_VAR_1}”-DUO!\p" - .string "Ist das nicht eine irre Vorstellung?\n" - .string "Hahahaha!$" + .string "Spot on, my friend!\p" + .string "We shall be the\n" + .string "“{STR_VAR_1}” DUO!\p" + .string "Isn’t that a ripe image?\n" + .string "Hahahah!$" DewfordTown_Hall_Text_175E13:: @ 8175E13 - .string "Für mich ist MATSCHBOMBE das absolut\n" - .string "Größte!\p" - .string "Wie? Du willst mir doch nicht weismachen,\n" - .string "dass du MATSCHBOMBE nicht kennst?\p" - .string "Das ist aber jammerschade.\n" - .string "Ich werde dir eine geben.$" + .string "For me, SLUDGE BOMB is at the peak\n" + .string "of popularity. It’s the one.\p" + .string "Hunh? You’re telling me that you don’t\n" + .string "know about SLUDGE BOMB?\p" + .string "That’s outright pitiful.\n" + .string "I’ll give you one.$" DewfordTown_Hall_Text_175EBE:: @ 8175EBE - .string "Ich liebe MATSCHBOMBE.\p" - .string "Aber POKéMON, die die Attacke\n" - .string "“{STR_VAR_1}” kennen,\l" - .string "sind auch absolut angesagt.$" + .string "I love SLUDGE BOMB.\p" + .string "But POKéMON with the\n" + .string "“{STR_VAR_1}”\l" + .string "move are in, too.$" diff --git a/data/text/maps/DewfordTown_House1.inc b/data/text/maps/DewfordTown_House1.inc index fa93711e4..d004acf7f 100644 --- a/data/text/maps/DewfordTown_House1.inc +++ b/data/text/maps/DewfordTown_House1.inc @@ -1,15 +1,14 @@ DewfordTown_House1_Text_174BA5:: @ 8174BA5 - .string "Über das harmonische Leben mit den\n" - .string "POKéMON und der Familie auf diesem\l" - .string "kleinen Eiland ließe sich viel erzählen.$" + .string "There’s a lot to be said for living on\n" + .string "a small island like this in harmony with\l" + .string "POKéMON and the family.$" DewfordTown_House1_Text_174C0D:: @ 8174C0D - .string "Bevor ich meinen Mann geheiratet habe,\n" - .string "lebte ich in der großen Hafenstadt\l" - .string "GRAPHITPORT CITY.\p" - .string "Hier auf der Insel verläuft das Leben\n" - .string "geruhsamer. Vom wunderbaren Meer um-\l" - .string "geben - das ist die pure Glückseligkeit!$" + .string "I came from the large port of SLATEPORT\n" + .string "CITY when I married my husband here.\p" + .string "Life goes by slowly on this little\n" + .string "island. But being surrounded by the\l" + .string "beautiful sea - that’s happiness, too.$" DewfordTown_House1_Text_174CC8:: @ 8174CC8 - .string "ZIGZACHS: Guguuh!$" + .string "ZIGZAGOON: Guguuh!$" diff --git a/data/text/maps/DewfordTown_House2.inc b/data/text/maps/DewfordTown_House2.inc index 8f3c5218a..b37456112 100644 --- a/data/text/maps/DewfordTown_House2.inc +++ b/data/text/maps/DewfordTown_House2.inc @@ -1,29 +1,28 @@ DewfordTown_House2_Text_175EFE:: @ 8175EFE - .string "Wirf dein Auge mal hierauf!\p" - .string "Das ist ein SEIDENSCHAL. Das ist\n" - .string "der letzte Schrei in der Mode. Yeah!\p" - .string "Oh, deine Augen blitzen.\n" - .string "Du magst meinen Stil, nicht wahr?\p" - .string "Hihi, du machst mir eine Freude!\n" - .string "Hier, das möchte ich dir schenken!$" + .string "Gorge your eyes on this!\p" + .string "It’s a SILK SCARF. It’s right at the\n" + .string "cutting edge of fashion, yeah!\p" + .string "Oh, I can see your eyes twinkling!\n" + .string "You appreciate my dazzling style!\p" + .string "Oh, you’re a delight!\n" + .string "Here you go. I want you to have it!$" DewfordTown_House2_Text_175FDA:: @ 8175FDA - .string "Och, du hast ja gar keinen Platz mehr.\p" - .string "Nun, hör gut zu... Diesen SCHAL musst\n" - .string "du einfach haben! Ich würde alle meine\l" - .string "Items verkaufen, um ihn zu bekommen!$" + .string "Oh, you don’t have room?\p" + .string "Now, listen tight, this SCARF is a must-\n" + .string "have! Why, I would sell all my items\l" + .string "in order to get it!$" DewfordTown_House2_Text_176055:: @ 8176055 - .string "Dieser SEIDENSCHAL steigert die Stärke\n" - .string "der NORMALEN Attacken.\p" - .string "Dieser wunderbare SCHAL passt einfach\n" - .string "zu fast allen POKéMON!$" + .string "The SILK SCARF raises the power of\n" + .string "NORMAL-type moves.\p" + .string "It’s a marvelous SCARF that will go\n" + .string "with almost all POKéMON!$" DewfordTown_House2_Text_1760C8:: @ 81760C8 - .string "Wow, du hast die beschwerliche Reise\n" - .string "über das Meer auf dich genommen, um\l" - .string "nach FAUSTAUHAVEN zu gelangen?\p" - .string "Bist du hier, weil du von KAMILLO\n" - .string "gehört hast?\p" - .string "Er ist sooo cool...\n" - .string "Er ist ein Idol für jeden!$" + .string "Wow, you bothered to cross the sea\n" + .string "to visit DEWFORD?\p" + .string "Did you maybe come here because you\n" + .string "heard about BRAWLY?\p" + .string "He’s so cool...\n" + .string "Everyone idolizes him.$" diff --git a/data/text/maps/DewfordTown_PokemonCenter_1F.inc b/data/text/maps/DewfordTown_PokemonCenter_1F.inc index 5d7b555f0..9c4a6f41c 100644 --- a/data/text/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/text/maps/DewfordTown_PokemonCenter_1F.inc @@ -1,11 +1,10 @@ DewfordTown_PokemonCenter_1F_Text_174CDB:: @ 8174CDB - .string "Am Rande des Ortes befindet sich eine\n" - .string "steinerne Höhle.\p" - .string "Dort soll man seltene Steine finden\n" - .string "können.$" + .string "There’s a stone cavern at the edge\n" + .string "of town.\p" + .string "I’ve heard you can find rare stones\n" + .string "there.$" DewfordTown_PokemonCenter_1F_Text_174D32:: @ 8174D32 - .string "Auch wenn in deinem Team ein kampf-\n" - .string "unfähiges POKéMON ist, kann es außer-\p" - .string "halb des Kampfes eine Versteckte\n" - .string "Maschine, eine VM, anwenden.$" + .string "Even if a POKéMON faints and can’t\n" + .string "battle, it can still use a move learned\l" + .string "from a Hidden Machine, HM.$" diff --git a/data/text/maps/EverGrandeCity.inc b/data/text/maps/EverGrandeCity.inc index 6d1a09d16..f468bf3b7 100644 --- a/data/text/maps/EverGrandeCity.inc +++ b/data/text/maps/EverGrandeCity.inc @@ -1,11 +1,11 @@ EverGrandeCity_Text_16A74D:: @ 816A74D - .string "SIE BETRETEN DIE SIEGESSTRASSE$" + .string "ENTERING VICTORY ROAD$" EverGrandeCity_Text_16A763:: @ 816A763 - .string "SIE ERREICHEN DEN EINGANG ZUR\n" - .string "POKéMON LIGA$" + .string "ENTERING POKéMON LEAGUE\n" + .string "CENTER GATE$" EverGrandeCity_Text_16A787:: @ 816A787 - .string "PRACHTPOLIS CITY\p" - .string "“Das Paradies der Blumen, des Meeres\n" - .string "und der POKéMON.”$" + .string "EVER GRANDE CITY\p" + .string "“The paradise of flowers, the sea,\n" + .string "and POKéMON.”$" diff --git a/data/text/maps/EverGrandeCity_ChampionsRoom.inc b/data/text/maps/EverGrandeCity_ChampionsRoom.inc index d8787a895..c7c63e208 100644 --- a/data/text/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/text/maps/EverGrandeCity_ChampionsRoom.inc @@ -1,99 +1,100 @@ EverGrandeCity_ChampionsRoom_Text_190F9C:: @ 8190F9C - .string "TROY: Willkommen, {PLAYER}{KUN}!\p" - .string "Ich habe schon darauf gewartet, dich\n" - .string "eines Tages hier zu sehen.\p" - .string "Und? Was hast du alles auf deiner Reise\n" - .string "mit den POKéMON erlebt?\p" - .string "Was hast du gefühlt, als du auf so viele\n" - .string "andere TRAINER getroffen bist?\p" - .string "Was wurde in dir erweckt? Ich will, dass\n" - .string "du all das im Kampf gegen mich einsetzt!\p" - .string "Nun, zeig es mir!$" + .string "STEVEN: Welcome, {PLAYER}{KUN}.\p" + .string "I was looking forward to seeing you\n" + .string "here one day.\p" + .string "You... What did you see on your\n" + .string "journey with POKéMON?\p" + .string "What did you feel, meeting so many\n" + .string "other TRAINERS like you?\p" + .string "What has awoken in you?\n" + .string "I want you to hit me with it all!\p" + .string "Now, bring it!$" EverGrandeCity_ChampionsRoom_Text_1910A0:: @ 81910A0 - .string "Ich, der CHAMP, habe verloren...\p" - .string "Dir gebührt alle Ehre, {PLAYER}{KUN}!\p" - .string "Du bist wahrhaft ein edler POKéMON-\n" + .string "I, the CHAMPION, fall in defeat...\p" + .string "Kudos to you, {PLAYER}{KUN}!\p" + .string "You are a truly noble POKéMON\n" .string "TRAINER!$" EverGrandeCity_ChampionsRoom_Text_1910FE:: @ 81910FE - .string "TROY: Herzlichen Glückwunsch!\p" - .string "Die Gefühle, die du deinen POKéMON\n" - .string "entgegenbringst...\p" - .string "Und die POKéMON, die auf diese Gefühle\n" - .string "mit all ihrer Kraft antworten...\p" - .string "Sie werden eins und bringen eine weit\n" - .string "größere Stärke hervor.\p" - .string "Und so gehört der Sieg heute dir!\p" - .string "Du bist mit Recht HOENNS neuer...$" + .string "STEVEN: Congratulations!\p" + .string "The feelings you have for your\n" + .string "POKéMON...\p" + .string "And the POKéMON that responded to\n" + .string "those feelings with all their might...\p" + .string "They came together as one, and created\n" + .string "an even greater power.\p" + .string "And thus, you were able to grasp\n" + .string "victory today!\p" + .string "You are rightfully the HOENN region’s\n" + .string "new...$" EverGrandeCity_ChampionsRoom_Text_191225:: @ 8191225 - .string "MAIKE: {PLAYER}{KUN}!\p" - .string "Ich muss dir unbedingt einen Rat geben,\n" - .string "bevor du gegen den CHAMP antrittst!$" + .string "MAY: {PLAYER}{KUN}!\p" + .string "Here’s some advice before you challenge\n" + .string "the CHAMPION...$" EverGrandeCity_ChampionsRoom_Text_191268:: @ 8191268 - .string "MAIKE: Wie? Waswaswas?\p" + .string "MAY: Huh? What, what, what?\p" .string "{PLAYER}{KUN}...\n" - .string "Das kann nicht sein...\l" - .string "Es ist schon vorbei?$" + .string "Could it be that...\l" + .string "It’s already over?$" EverGrandeCity_ChampionsRoom_Text_1912B3:: @ 81912B3 - .string "BRIX: {PLAYER}!\p" - .string "Möchtest du nicht ein paar Tipps, bevor\n" - .string "du den CHAMP herausforderst?$" + .string "BRENDAN: {PLAYER}!\p" + .string "How would you like some advice before\n" + .string "you challenge the CHAMPION?...$" EverGrandeCity_ChampionsRoom_Text_191305:: @ 8191305 - .string "BRIX: {PLAYER}!\p" - .string "Willst du mir etwa sagen...\n" - .string "Du hast den CHAMP besiegt?!?!?!$" + .string "BRENDAN: {PLAYER}...\p" + .string "Are you trying to tell me...\n" + .string "You’ve beaten the CHAMPION?$" EverGrandeCity_ChampionsRoom_Text_19134D:: @ 819134D - .string "PROF. BIRK: Siehst du?\n" - .string "Was habe ich dir gesagt, {RIVAL}?\p" - .string "Ich wusste, du brauchst dir keine\n" - .string "Sorgen um {PLAYER}{KUN} zu machen!\p" + .string "PROF. BIRCH: See?\n" + .string "What did I tell you, {RIVAL}?\p" + .string "Didn’t I tell you that you don’t need\n" + .string "to worry about {PLAYER}{KUN}?\p" .string "... ... ... ... ... ... ... ...\n" - .string "{PLAYER}{KUN}, du hast es geschafft.\p" - .string "Als ich hörte, dass du deinen Vater in\n" - .string "der ARENA von BLÜTENBURG CITY\p" - .string "besiegt hast, wusste ich, dass du eine\n" - .string "Chance hast...\p" - .string "Aber, dass du dann sogar CHAMP\n" - .string "geworden bist!\p" - .string "Oh, ja!\p" - .string "Was ist aus deinem POKéDEX geworden?\n" - .string "Lass mich mal sehen...$" + .string "{PLAYER}{KUN}, you’ve finally done it.\p" + .string "When I heard that you defeated your\n" + .string "own father at the PETALBURG GYM,\l" + .string "I thought perhaps you had a chance...\p" + .string "But to think you’ve actually become\n" + .string "the CHAMPION!\p" + .string "Ah, yes!\p" + .string "What became of your POKéDEX?\n" + .string "Here, let me see.$" EverGrandeCity_ChampionsRoom_Text_1914C6:: @ 81914C6 - .string "PROF. BIRK: Also, dann sage ich:\n" - .string "Herzlichen Glückwunsch!\p" - .string "Nun kannst du mit Stolz den letzten\n" - .string "Raum betreten!$" + .string "PROF. BIRCH: Anyways,\n" + .string "congratulations!\p" + .string "Now, go proudly into the final room!$" EverGrandeCity_ChampionsRoom_Text_191512:: @ 8191512 - .string "TROY: {PLAYER}{KUN}...\p" - .string "Nein! Neuer CHAMP!\p" - .string "Komm mit mir.$" + .string "STEVEN: {PLAYER}{KUN}...\p" + .string "No, the new CHAMPION!\p" + .string "Come with me.$" EverGrandeCity_ChampionsRoom_Text_191546:: @ 8191546 - .string "TROY: Tut mir Leid, aber...\p" - .string "Diesen Raum dürfen nur TRAINER\n" - .string "betreten, die CHAMPS geworden sind.\p" - .string "Warte bitte draußen mit dem PROFESSOR.$" + .string "STEVEN: I’m sorry, but...\p" + .string "From here on, only those TRAINERS who\n" + .string "have become CHAMPIONS may enter.\p" + .string "You’ll have to wait outside with the\n" + .string "PROFESSOR.$" EverGrandeCity_ChampionsRoom_Text_1915D7:: @ 81915D7 - .string "MAIKE: Grummel...\p" + .string "MAY: Groan...\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Ich mache nur Spaß! Ist schon okay!\n" - .string "So sind die Regeln!\p" + .string "I’m just joking! That’s okay!\n" + .string "That’s the rule!\p" .string "{PLAYER}{KUN}!\n" - .string "Ehrlich. Herzlichen Glückwunsch!$" + .string "Honestly, congratulations!$" EverGrandeCity_ChampionsRoom_Text_191675:: @ 8191675 - .string "BRIX: ... ... ... ... ... ...\n" + .string "BRENDAN: ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Na, wenn es die Regeln so bestimmen...\p" - .string "{PLAYER}, das ist dein Tag!\n" - .string "Herzlichen Glückwunsch!$" + .string "It can’t be helped if that’s the rule.\p" + .string "{PLAYER}, way to go!\n" + .string "Congratulations!$" diff --git a/data/text/maps/EverGrandeCity_DrakesRoom.inc b/data/text/maps/EverGrandeCity_DrakesRoom.inc index 484aefc14..ed89c22bf 100644 --- a/data/text/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/text/maps/EverGrandeCity_DrakesRoom.inc @@ -1,32 +1,28 @@ EverGrandeCity_DrakesRoom_Text_190CEB:: @ 8190CEB - .string "Ich bin der letzte der TOP VIER in der\n" - .string "POKéMON LIGA, DRAGAN der\l" - .string "DRACHEN-Meister!\p" - .string "Von Natur aus sind POKéMON wild.\n" - .string "Sie sind frei.\p" - .string "Manchmal behindern sie uns.\n" - .string "Manchmal helfen sie uns.\p" - .string "Weißt du, was es bedeutet, mit POKéMON\n" - .string "als gleichwertigen Partnern\l" - .string "zu kämpfen?\p" - .string "Weißt du, was verlangt wird?\p" - .string "Wenn du das nicht weißt, wirst du\n" - .string "hier an dieser Stelle scheitern!$" + .string "I am the last of the POKéMON LEAGUE\n" + .string "ELITE FOUR, DRAKE the DRAGON master!\p" + .string "In their natural state, POKéMON are\n" + .string "wild living things. They are free.\p" + .string "At times, they hinder us.\n" + .string "At times, they help us.\p" + .string "For us to battle with POKéMON as\n" + .string "partners, do you know what it takes?\p" + .string "Do you know what is needed?\p" + .string "If you don’t, then you will never\n" + .string "prevail over me!$" EverGrandeCity_DrakesRoom_Text_190E42:: @ 8190E42 - .string "Hervorragend! Das muss man sagen.$" + .string "Superb, it should be said.$" EverGrandeCity_DrakesRoom_Text_190E5D:: @ 8190E5D - .string "Dir gebührt wahre Ehre, da du als\n" - .string "TRAINER der POKéMON so weit\l" - .string "gekommen bist.\p" - .string "Du weißt, was verlangt wird.\p" - .string "Ja, ein TRAINER braucht ein ehrliches\n" - .string "Herz.\p" - .string "POKéMON berühren das Gute im Herzen\n" - .string "des TRAINERS und lernen, zwischen gut\l" - .string "und schlecht zu unterscheiden.\p" - .string "Sie berühren die guten Herzen der\n" - .string "TRAINER und wachsen daran.\p" - .string "Geh! Geh weiter!\n" - .string "Der CHAMP erwartet dich!$" + .string "You deserve every credit for coming\n" + .string "this far as a TRAINER of POKéMON.\p" + .string "You do seem to know what is needed.\p" + .string "Yes, what a TRAINER needs is a\n" + .string "virtuous heart.\p" + .string "POKéMON touch the good hearts of\n" + .string "TRAINERS and learn good from wrong.\p" + .string "They touch the good hearts of\n" + .string "TRAINERS and grow strong.\p" + .string "Go! Go onwards!\n" + .string "The CHAMPION is waiting!$" diff --git a/data/text/maps/EverGrandeCity_GlaciasRoom.inc b/data/text/maps/EverGrandeCity_GlaciasRoom.inc index 8bb9b3427..88fa1e664 100644 --- a/data/text/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/text/maps/EverGrandeCity_GlaciasRoom.inc @@ -1,23 +1,22 @@ EverGrandeCity_GlaciasRoom_Text_190AF9:: @ 8190AF9 - .string "Willkommen. Mein Name ist FROSINA\n" - .string "von den TOP VIER.\p" - .string "Ich bin von weit her nach HOENN gereist,\n" - .string "um meine eisigen Talente zu trainieren.\p" - .string "Aber bisher haben mich nur lausige\n" - .string "TRAINER mit noch lausigeren POKéMON\l" - .string "herausgefordert.\p" - .string "Wie sieht es mit dir aus?\p" - .string "Es würde mich überaus freuen, wenn du\n" - .string "mich zwingst, alles zu geben!$" + .string "Welcome, my name is GLACIA of the\n" + .string "ELITE FOUR.\p" + .string "I’ve traveled from afar to HOENN so\n" + .string "that I may hone my ice skills.\p" + .string "But all I have seen are challenges by\n" + .string "weak TRAINERS and their POKéMON.\p" + .string "What about you?\p" + .string "It would please me to no end if I could\n" + .string "go all out against you!$" EverGrandeCity_GlaciasRoom_Text_190C01:: @ 8190C01 - .string "Du und deine POKéMON...\n" - .string "Euer Zusammenhalt verbrennt alles!\p" - .string "Diese Hitze besiegt jeden.\p" - .string "Kein Wunder, dass mein eisiges Talent\n" - .string "dahinschmolz und dir nicht schadete.$" + .string "You and your POKéMON...\n" + .string "How hot your spirits burn!\p" + .string "The all-consuming heat overwhelms.\p" + .string "It’s no surprise that my icy skills\n" + .string "failed to harm you.$" EverGrandeCity_GlaciasRoom_Text_190C8F:: @ 8190C8F - .string "Geh weiter in den nächsten Raum.\p" - .string "Und dort wirst du die schrecklichste\n" - .string "Seite der POKéMON LIGA kennen lernen.$" + .string "Advance to the next room.\p" + .string "And there, confirm the truly fearsome\n" + .string "side of the POKéMON LEAGUE.$" diff --git a/data/text/maps/EverGrandeCity_HallOfFame.inc b/data/text/maps/EverGrandeCity_HallOfFame.inc index 4806915c9..c684dcb72 100644 --- a/data/text/maps/EverGrandeCity_HallOfFame.inc +++ b/data/text/maps/EverGrandeCity_HallOfFame.inc @@ -1,13 +1,13 @@ EverGrandeCity_HallOfFame_Text_191841:: @ 8191841 - .string "TROY: Dieser Raum...\p" - .string "Hier verzeichnen wir die POKéMON, die\n" - .string "siegreich aus harten Kämpfen hervorge-\l" - .string "gangen sind.\p" - .string "Hier werden die CHAMPS der POKéMON\n" - .string "LIGA geehrt.$" + .string "STEVEN: This room...\p" + .string "This is where we keep records of\n" + .string "POKéMON that prevailed through\l" + .string "harsh battles.\p" + .string "It is here that the LEAGUE CHAMPIONS\n" + .string "are honored.$" EverGrandeCity_HallOfFame_Text_1918D7:: @ 81918D7 - .string "TROY: Komm, schreiben wir deinen\n" - .string "Namen nieder, als ein TRAINER, der über\l" - .string "die POKéMON LIGA triumphiert hat - und\l" - .string "die Namen deiner Partner ebenfalls.$" + .string "STEVEN: Come on, let’s record your\n" + .string "name as a TRAINER who triumphed over\l" + .string "the POKéMON LEAGUE, and the names of\l" + .string "the partners who battled with you.$" diff --git a/data/text/maps/EverGrandeCity_PhoebesRoom.inc b/data/text/maps/EverGrandeCity_PhoebesRoom.inc index e844262c2..e77a7d31a 100644 --- a/data/text/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/text/maps/EverGrandeCity_PhoebesRoom.inc @@ -1,24 +1,23 @@ EverGrandeCity_PhoebesRoom_Text_1908F5:: @ 81908F5 - .string "Ahahahahaha!\p" - .string "Ich bin ANTONIA von den TOP VIER.\n" - .string "Ich habe am PYROBERG trainiert.\p" - .string "Während des Trainings habe ich die\n" - .string "Fähigkeit erworben, mit GEIST-POKéMON\l" - .string "zu kommunizieren.\p" - .string "In der Tat ist das Band zwischen mir und\n" - .string "den POKéMON sehr stark.\p" - .string "Komm und schau, ob du irgendetwas\n" - .string "gegen meine POKéMON ausrichten kannst.$" + .string "Ahahaha!\p" + .string "I’m PHOEBE of the ELITE FOUR.\n" + .string "I did my training on MT. PYRE.\p" + .string "While I trained, I gained the ability\n" + .string "to commune with GHOST-type POKéMON.\p" + .string "Yes, the bond I developed with POKéMON\n" + .string "is extremely tight.\p" + .string "So, come on, just try and see if you can\n" + .string "even inflict damage on my POKéMON!$" EverGrandeCity_PhoebesRoom_Text_190A0C:: @ 8190A0C - .string "Oh, verdammt.\n" - .string "Aus und vorbei. Verloren.$" + .string "Oh, darn.\n" + .string "I’ve gone and lost.$" EverGrandeCity_PhoebesRoom_Text_190A2A:: @ 8190A2A - .string "Das Band zwischen dir und deinen\n" - .string "POKéMON ist ebenfalls sehr stark.\p" - .string "Das habe ich gar nicht bemerkt, daher\n" - .string "konnte ich nur verlieren.\p" - .string "Ja, jetzt möchte ich sehen, wie weit\n" - .string "dieses Band euch bringt.\p" - .string "Geh und betrete den nächsten Raum.$" + .string "There’s a definite bond between you\n" + .string "and your POKéMON, too.\p" + .string "I didn’t recognize it, so it’s only\n" + .string "natural that I lost.\p" + .string "Yup, I’d like to see how far your bond\n" + .string "will carry you.\p" + .string "Go ahead, move on to the next room.$" diff --git a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc index 6bf6c9803..18594308a 100644 --- a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -1,12 +1,12 @@ EverGrandeCity_PokemonCenter_1F_Text_191967:: @ 8191967 - .string "Die POKéMON LIGA triffst du kurz hinter\n" - .string "der SIEGESSTRASSE.\p" - .string "Wenn du schon so weit gekommen bist,\n" - .string "musst du einfach weitergehen.$" + .string "The POKéMON LEAGUE is only a short\n" + .string "distance after the VICTORY ROAD.\p" + .string "If you’ve come this far, what choice\n" + .string "do you have but to keep going?$" EverGrandeCity_PokemonCenter_1F_Text_1919EF:: @ 81919EF - .string "Die lange und qualvolle SIEGESSTRASSE...\p" - .string "Es ist fast so, als würde man sein\n" - .string "ganzes Leben noch einmal leben...\p" - .string "Glaube an deine POKéMON und gib\n" - .string "dein Bestes!$" + .string "The long and harrowing VICTORY ROAD...\p" + .string "It’s like reliving the path one has\n" + .string "traveled in life...\p" + .string "Believe in your POKéMON and give it\n" + .string "your very best!$" diff --git a/data/text/maps/EverGrandeCity_PokemonLeague.inc b/data/text/maps/EverGrandeCity_PokemonLeague.inc index b2e8a76f1..89971022c 100644 --- a/data/text/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/text/maps/EverGrandeCity_PokemonLeague.inc @@ -1,15 +1,15 @@ EverGrandeCity_PokemonLeague_Text_1916FD:: @ 81916FD - .string "Ab hier haben nur die TRAINER, die alle\n" - .string "ORDEN der ARENEN erhalten haben,\l" - .string "Zutritt.\p" - .string "TRAINER, lass uns sicherstellen, dass\n" - .string "du auch alle ORDEN hast.$" + .string "Beyond this point, only those TRAINERS\n" + .string "who have collected all the GYM BADGES\l" + .string "are permitted to enter.\p" + .string "TRAINER, let us confirm that you have\n" + .string "all the GYM BADGES.$" EverGrandeCity_PokemonLeague_Text_19179C:: @ 819179C - .string "Du hast noch nicht alle ORDEN erhalten.\p" - .string "Wenn du zur POKéMON LIGA willst,\n" - .string "musst du alle ORDEN vorweisen können.$" + .string "You haven’t obtained all the BADGES.\p" + .string "If you’re bound for the POKéMON\n" + .string "LEAGUE, you must return with them.$" EverGrandeCity_PokemonLeague_Text_191804:: @ 8191804 - .string "TRAINER! Glaube an dich und deine\n" - .string "POKéMON und gehe weiter!$" + .string "TRAINER! Believe in yourself and your\n" + .string "POKéMON, and go forth!$" diff --git a/data/text/maps/EverGrandeCity_SidneysRoom.inc b/data/text/maps/EverGrandeCity_SidneysRoom.inc index 76871909d..84d1dddf5 100644 --- a/data/text/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/text/maps/EverGrandeCity_SidneysRoom.inc @@ -1,20 +1,20 @@ EverGrandeCity_SidneysRoom_Text_190728:: @ 8190728 - .string "Willkommen, Herausforderer!\n" - .string "Ich bin ULRICH von den TOP VIER.\p" - .string "Ich mag deinen herausfordernden Blick.\n" - .string "Ich denke, das wird ein guter Kampf.\l" - .string "Gut! Das sieht gut aus!\p" - .string "Schön! Dann lass uns beide einen Kampf\n" - .string "erleben, wie man ihn nur hier in der\l" - .string "POKéMON LIGA erleben kann!$" + .string "Welcome, challenger!\n" + .string "I’m SIDNEY of the ELITE FOUR.\p" + .string "I like that look you’re giving me.\n" + .string "I guess you’ll give me a good match.\l" + .string "That’s good! Looking real good!\p" + .string "All right! You and me, let’s enjoy a\n" + .string "battle that can only be staged here\l" + .string "in the POKéMON LEAGUE!$" EverGrandeCity_SidneysRoom_Text_190823:: @ 8190823 - .string "Ich habe verloren! Ich, ULRICH von den\n" - .string "TOP VIER. Macht nichts, es war lustig.$" + .string "Well, how do you like that? I lost!\n" + .string "Eh, it was fun, so it doesn’t matter.$" EverGrandeCity_SidneysRoom_Text_19086D:: @ 819086D - .string "Nun, hör dir an, was dieser Verlierer\n" - .string "zu sagen hat.\p" - .string "Du bist bestens ausgerüstet.\n" - .string "Daher solltest du nun in den nächsten\l" - .string "Raum gehen - zum nächsten Kampf.$" + .string "Well, listen to what this loser has\n" + .string "to say.\p" + .string "You’ve got what it takes to go far.\n" + .string "Now, go on to the next room and enjoy\l" + .string "your next battle!$" diff --git a/data/text/maps/FallarborTown.inc b/data/text/maps/FallarborTown.inc index a695f5d83..1483272de 100644 --- a/data/text/maps/FallarborTown.inc +++ b/data/text/maps/FallarborTown.inc @@ -1,46 +1,41 @@ FallarborTown_Text_16C7FF:: @ 816C7FF - .string "Was ist los? Was ist los?\p" - .string "Ich habe eine zwielichtige Gestalt aus\n" - .string "dem LABOR von PROF. KOSMO flitzen\l" - .string "sehen.$" + .string "What’s up, what’s up?\p" + .string "I saw a shady fellow scuttling in and\n" + .string "out of PROF. COZMO’s LAB.$" FallarborTown_Text_16C855:: @ 816C855 - .string "Diese Region ist schon seit Urzeiten\n" - .string "für ihre Meteoritenschauer bekannt.\p" - .string "Man sagt, METEORFÄLLE sei durch\n" - .string "den Aufprall eines METEORITEN\l" - .string "entstanden.$" + .string "This region’s been known for meteors\n" + .string "since the olden days.\p" + .string "They say METEOR FALLS was gouged out\n" + .string "by a falling meteorite long ago.$" FallarborTown_Text_16C8D6:: @ 816C8D6 - .string "Schau mal! Guck doch mal!\n" - .string "Das ist mein süßes AZURILL!\p" - .string "Es ist glatt, weich und plüschig!$" + .string "See! Take a look!\n" + .string "This is my precious AZURILL!\p" + .string "It’s slick and smooth and plushy, too!$" FallarborTown_Text_16C92C:: @ 816C92C .string "AZURILL: Rooreelooo.$" FallarborTown_Text_16C941:: @ 816C941 - .string "Hast du schon FLAVIA, die LEITERIN\n" - .string "der ARENA von BAD LAVASTADT,\l" - .string "herausgefordert?\p" - .string "Ihr Großvater ist sehr berühmt.\n" - .string "Er war einer der TOP VIER in der\l" - .string "POKéMON LIGA.\p" - .string "Es würde mich gar nicht wundern, wenn\n" - .string "FLAVIA ebenfalls ein großer TRAINER\l" - .string "wird.$" + .string "Have you already challenged FLANNERY,\n" + .string "the LEADER of LAVARIDGE GYM?\p" + .string "The girl’s grandfather was famous.\n" + .string "He was one of the ELITE FOUR in the\l" + .string "POKéMON LEAGUE at one point.\p" + .string "It wouldn’t surprise me to see FLANNERY\n" + .string "become a great TRAINER in her own\l" + .string "right.$" FallarborTown_Text_16CA39:: @ 816CA39 - .string "POKéMON WETTBEWERBE\n" - .string "SUPER-KLASSE REGISTRIERUNGEN\p" - .string "“Brecht in die POKéMON-Szene\n" - .string "ein!”$" + .string "POKéMON CONTESTS\n" + .string "SUPER RANK REGISTRATION\p" + .string "“Burst on to the POKéMON scene!”$" FallarborTown_Text_16CA83:: @ 816CA83 - .string "LAUBWECHSELFELD\n" - .string "“Eine Gemeinschaft von Farmern mit\l" - .string "kleinen Gärten.”$" + .string "FALLARBOR TOWN\n" + .string "“A farm community with small gardens.”$" FallarborTown_Text_16CAB9:: @ 816CAB9 - .string "HAUS des ATTACKEN-HELFERS\n" - .string "“Neue Attacken für deine POKéMON.”$" + .string "MOVE TUTOR’S HOUSE\n" + .string "“New moves taught to POKéMON.”$" diff --git a/data/text/maps/FallarborTown_ContestHall.inc b/data/text/maps/FallarborTown_ContestHall.inc index 43c34e295..5db8766c5 100644 --- a/data/text/maps/FallarborTown_ContestHall.inc +++ b/data/text/maps/FallarborTown_ContestHall.inc @@ -1,21 +1,21 @@ FallarborTown_ContestHall_Text_177335:: @ 8177335 - .string "Im 1. Durchlauf schneiden wir immer\n" - .string "gut ab, aber im 2. Durchlauf...\p" - .string "Vielleicht sollte ich beobachten, was\n" - .string "die anderen Teilnehmer machen...$" + .string "We do all right in the preliminary round,\n" + .string "but we can never win the appeals...\p" + .string "Maybe it means I have to watch what\n" + .string "other contestants are doing...$" FallarborTown_ContestHall_Text_1773C6:: @ 81773C6 - .string "Schau mal! Mein POKéMON hat all\n" - .string "diese BÄNDER gewonnen!\p" - .string "Besitzen deine POKéMON auch BÄNDER?\n" - .string "Du kannst das im POKéNAV überprüfen.$" + .string "See!\n" + .string "My POKéMON won all these RIBBONS!\p" + .string "Have your POKéMON earned any RIBBONS?\n" + .string "You can check them on your POKéNAV.$" FallarborTown_ContestHall_Text_177437:: @ 8177437 - .string "Ich kann ARENALEITER nicht besiegen...\p" - .string "Ich kann keine WETTBEWERBE gewinnen...\p" - .string "Ich war schon hier und dort und überall,\n" - .string "aber immer vergebens.$" + .string "I can’t beat GYM LEADERS...\p" + .string "I can’t win any CONTESTS...\p" + .string "I’ve been here, there, and everywhere,\n" + .string "and it’s all for naught...$" FallarborTown_ContestHall_Text_1774B1:: @ 81774B1 - .string "POKéMON-WETTBEWERBE\n" - .string "BÜHNE für die SUPER-KLASSE!$" + .string "POKéMON CONTESTS\n" + .string "SUPER RANK STAGE!$" diff --git a/data/text/maps/FallarborTown_ContestLobby.inc b/data/text/maps/FallarborTown_ContestLobby.inc index 085d43e7d..5d4305f8c 100644 --- a/data/text/maps/FallarborTown_ContestLobby.inc +++ b/data/text/maps/FallarborTown_ContestLobby.inc @@ -1,25 +1,23 @@ FallarborTown_ContestLobby_Text_177141:: @ 8177141 - .string "Dort hing mal eine Zeichnung von meinem\n" - .string "POKéMON, aber nun hängt dort die\l" - .string "Zeichnung eines anderen POKéMON.\p" - .string "Ich werde mein HANA am WETTBEWERB\n" - .string "teilnehmen lassen, dann gibt es eine\l" - .string "neue Zeichnung von ihm!$" + .string "They had a sketch of my POKéMON up\n" + .string "on the wall over there, but they\l" + .string "changed it with a new one already.\p" + .string "I’m going to enter my HANA in CONTESTS\n" + .string "so we can get her sketch up again!$" FallarborTown_ContestLobby_Text_1771F2:: @ 81771F2 - .string "Hallo, willst du {POKEBLOCK} herstellen?\p" - .string "Dann komm doch mal wieder vorbei und\n" - .string "bring genug BEEREN mit.$" + .string "Hi, are you making any {POKEBLOCK}S?\p" + .string "You should come by with a bunch of\n" + .string "BERRIES sometime.$" FallarborTown_ContestLobby_Text_177246:: @ 8177246 - .string "Siehst du, wie sie hier die Zeichnungen\n" - .string "des Sieger-POKéMON aushängen?\p" - .string "Ich bin der Zeichner dieser Werke!\p" - .string "Sobald eines deiner POKéMON einen\n" - .string "WETTBEWERB gewinnt, werde ich es mit\l" - .string "Vergnügen zeichnen!$" + .string "You see how they display a sketch of\n" + .string "a CONTEST winner here?\p" + .string "I sketch them!\p" + .string "If any of your POKéMON wins a CONTEST,\n" + .string "I’d gladly make a sketch of it!$" FallarborTown_ContestLobby_Text_1772D8:: @ 81772D8 - .string "Hallo und herzlichen Glückwunsch!\p" - .string "Ich habe eine Zeichnung deines POKéMON\n" - .string "hier aufgehängt, damit jeder es sieht.$" + .string "Hello! Congratulations!\p" + .string "I’ve put up a sketch of your POKéMON\n" + .string "right here for everyone to see!$" diff --git a/data/text/maps/FallarborTown_House1.inc b/data/text/maps/FallarborTown_House1.inc index c19ee545d..c882bc9b7 100644 --- a/data/text/maps/FallarborTown_House1.inc +++ b/data/text/maps/FallarborTown_House1.inc @@ -1,52 +1,51 @@ FallarborTown_House1_Text_177755:: @ 8177755 - .string "PROF. KOSMO: Oh...\n" - .string "Ich hätte mich nie dazu verleiten\l" - .string "lassen dürfen, TEAM {EVIL_TEAM} zu verraten,\l" - .string "wo METEORITEN zu finden sind...\p" - .string "Der METEORIT von METEORFÄLLE...\n" - .string "Nun wird er niemals mir gehören...$" + .string "PROF. COZMO: Oh...\n" + .string "I never should have let myself be\l" + .string "conned into telling TEAM {EVIL_TEAM} where\l" + .string "you can find METEORITES...\p" + .string "That METEORITE from METEOR FALLS...\n" + .string "It’s never going to be mine now...$" FallarborTown_House1_Text_17780E:: @ 817780E .string "Oh!\n" - .string "Oooh?\p" - .string "Dieses Item...\p" - .string "Kann es sein?\p" - .string "Ist das der METEORIT, den TEAM {EVIL_TEAM}\n" - .string "aus METEORFÄLLE entwendet hat?\p" - .string "Bitte, darf ich den haben?\p" - .string "Du bekommst auch etwas dafür.\n" - .string "Was hältst du von dieser TM?$" + .string "Hah?\p" + .string "That item...\p" + .string "Could it be?\p" + .string "Is it the METEORITE that TEAM {EVIL_TEAM}\n" + .string "took from METEOR FALLS?\p" + .string "Please, may I have it?\p" + .string "I’m not asking for it for free.\n" + .string "How about in exchange for this TM?$" FallarborTown_House1_Text_1778C4:: @ 81778C4 - .string "PROF. KOSMO: Mit dieser TM möchte ich\n" - .string "dir meine Dankbarkeit ausdrücken.\l" - .string "Bitte, nimm sie an!$" + .string "PROF. COZMO: This TM, it represents\n" + .string "my feeling of gratitude.\l" + .string "Please use it!$" FallarborTown_House1_Text_177910:: @ 8177910 - .string "PROF. KOSMO: Oh, ich kann es einfach\n" - .string "nicht glauben! Das ist nett! So nett!!!\p" - .string "Das wird mir bei meinen Forschungen\n" - .string "enorm weiterhelfen!$" + .string "PROF. COZMO: Oh, I can’t believe it.\n" + .string "This is really, really great!\p" + .string "This is really going to help my research!$" FallarborTown_House1_Text_17797D:: @ 817797D - .string "PROF. KOSMO: Oh, aber...\n" - .string "Das enttäuscht mich jetzt maßlos...$" + .string "PROF. COZMO: Oh, but...\n" + .string "I’m crushed with disappointment...$" FallarborTown_House1_Text_1779B8:: @ 81779B8 - .string "PROF. KOSMO: Bitte, darf ich den\n" - .string "METEORITEN haben?\p" - .string "Ich möchte ihn nicht umsonst haben! Wie\n" - .string "wäre es mit dieser TM im Tausch dafür?$" + .string "PROF. COZMO: Please, may I have that\n" + .string "METEORITE?\p" + .string "I’m not asking for it for free.\n" + .string "How about in exchange for this TM?$" FallarborTown_House1_Text_177A2B:: @ 8177A2B - .string "PROF. KOSMO ist unterwegs zu\n" - .string "METEORFÄLLE an der ROUTE 114. Einige\l" - .string "Leute von TEAM {EVIL_TEAM} begleiten ihn.$" + .string "PROF. COZMO went off to METEOR FALLS\n" + .string "on ROUTE 114 with some people from\l" + .string "TEAM {EVIL_TEAM}.$" FallarborTown_House1_Text_177A7C:: @ 8177A7C - .string "Armer PROF. KOSMO...\n" - .string "Er ist so deprimiert... Er tut mir Leid.$" + .string "Poor PROF. COZMO...\n" + .string "He’s so depressed... I feel sorry for him.$" FallarborTown_House1_Text_177ABB:: @ 8177ABB - .string "Schau dir nur PROF. KOSMO an...\n" - .string "Er ist so glücklich! Richtig niedlich.$" + .string "Look at PROF. COZMO...\n" + .string "He’s so happy! I think it’s cute.$" diff --git a/data/text/maps/FallarborTown_House2.inc b/data/text/maps/FallarborTown_House2.inc index b0450c136..de6d63fad 100644 --- a/data/text/maps/FallarborTown_House2.inc +++ b/data/text/maps/FallarborTown_House2.inc @@ -1,38 +1,38 @@ FallarborTown_House2_Text_177AF4:: @ 8177AF4 - .string "Ich bin der ATTACKEN-HELFER.\p" - .string "Ich kenne alle Attacken, die ein\n" - .string "POKéMON lernen kann - und ich kann sie\l" - .string "ihnen beibringen.\p" - .string "Ich kann auch deinen POKéMON neue\n" - .string "Attacken beibringen, wenn du magst.\p" - .string "Als Gegenleistung hätte ich gerne eine\n" - .string "HERZSCHUPPE. Die sammle ich nämlich.$" + .string "I’m the MOVE TUTOR.\p" + .string "I know all the moves that POKéMON\n" + .string "learn - every one of them - and I can\l" + .string "teach POKéMON those moves.\p" + .string "I can teach a move to a POKéMON\n" + .string "of yours if you’d like.\p" + .string "I’ll do it for a HEART SCALE.\n" + .string "I’m collecting those now.$" FallarborTown_House2_Text_177BDB:: @ 8177BDB - .string "Oh! Das ist es! Das ist ehrlich und\n" - .string "wahrhaftig eine HERZSCHUPPE!\p" - .string "Lass mich raten... Ich soll einem POKéMON\n" - .string "eine neue Attacke beibringen?!?$" + .string "Oh! That’s it! That’s an honest to\n" + .string "goodness HEART SCALE!\p" + .string "Let me guess, you want me to teach\n" + .string "a move?$" FallarborTown_House2_Text_177C3F:: @ 8177C3F - .string "Welches POKéMON soll sie lernen?$" + .string "Which POKéMON needs tutoring?$" FallarborTown_House2_Text_177C5D:: @ 8177C5D - .string "Welche Attacke soll ich es lehren?$" + .string "Which move should I teach?$" FallarborTown_House2_Text_177C78:: @ 8177C78 - .string "Tut mir Leid...\p" - .string "Scheinbar gibt es keine Attacke, die ich\n" - .string "diesem POKéMON beibringen kann.$" + .string "Sorry...\p" + .string "It doesn’t appear as if I have any move\n" + .string "I can teach that POKéMON.$" FallarborTown_House2_Text_177CC3:: @ 8177CC3 - .string "{PLAYER} tauscht eine HERZSCHUPPE ein.$" + .string "{PLAYER} handed over one HEART SCALE\n" + .string "in exchange.$" FallarborTown_House2_Text_177CEF:: @ 8177CEF - .string "Falls deine POKéMON neue Attacken\n" - .string "lernen sollen, komm mit einer\l" - .string "HERZSCHUPPE wieder.$" + .string "If your POKéMON need to learn a move,\n" + .string "come back with a HEART SCALE.$" FallarborTown_House2_Text_177D33:: @ 8177D33 - .string "Bitte? Ich kann einem EI nicht eine\n" - .string "einzige Attacke beibringen!$" + .string "Hunh? There isn’t a single move that\n" + .string "I can teach an EGG.$" diff --git a/data/text/maps/FallarborTown_Mart.inc b/data/text/maps/FallarborTown_Mart.inc index 6f6ebef5c..bc8b3fb32 100644 --- a/data/text/maps/FallarborTown_Mart.inc +++ b/data/text/maps/FallarborTown_Mart.inc @@ -1,17 +1,16 @@ FallarborTown_Mart_Text_176FF0:: @ 8176FF0 - .string "Ich habe lange überlegt, ob sich mein\n" - .string "ENECO entwickeln soll oder nicht.\p" - .string "Ich müsste nur diesen MONDSTEIN ein-\n" - .string "setzen, aber das ist eine schwere\l" - .string "Entscheidung...\p" - .string "Würde es sich entwickeln, wäre es viel\n" - .string "stärker.\p" - .string "Aber es würde auch anders aussehen.$" + .string "I’m having a hard time deciding if I\n" + .string "should make my SKITTY evolve or not.\p" + .string "I only have to use this MOON STONE,\n" + .string "but it’s so hard to decide...\p" + .string "If I make it evolve, it will become\n" + .string "much stronger.\p" + .string "But it will look so different, too.$" FallarborTown_Mart_Text_1770D3:: @ 81770D3 - .string "ENECO: Miyao?$" + .string "SKITTY: Miyao?$" FallarborTown_Mart_Text_1770E2:: @ 81770E2 - .string "Ich habe hier ein NUGGET gefunden...\n" - .string "Das werde ich wohl verkaufen. Was soll\l" - .string "ich sonst damit machen?$" + .string "This NUGGET I found here...\n" + .string "I suppose I’ll have to sell it, seeing\l" + .string "as how it has no other use.$" diff --git a/data/text/maps/FallarborTown_PokemonCenter_1F.inc b/data/text/maps/FallarborTown_PokemonCenter_1F.inc index 66a21c458..a626ff1e9 100644 --- a/data/text/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/text/maps/FallarborTown_PokemonCenter_1F.inc @@ -1,31 +1,27 @@ FallarborTown_PokemonCenter_1F_Text_1774D4:: @ 81774D4 - .string "Oh, hallo.\n" - .string "Wer bist du?\p" - .string "Du heißt {PLAYER}{KUN}?\n" - .string "Ich sehe schon, du bist ein TRAINER.\p" - .string "Und das bedeutet, du nutzt das\n" - .string "POKéMON-Lagerungs-System, das ich\l" - .string "entwickelt habe.\p" - .string "Ich bin durch simple Deduktion zu\n" - .string "diesem Schluss gekommen.\p" - .string "Du hast mich angesprochen, weil du\n" - .string "mit diesem PC arbeiten willst.\p" - .string "Ach, ich habe mich gar nicht vorgestellt.\n" - .string "Ich bin LANETTE.\p" - .string "Ich bin ehrlich erfreut, dich kennen zu\n" - .string "lernen. Und ich freue mich, dass du das\l" - .string "Lagerungs-System benutzt.\p" - .string "Wenn du magst, besuche mich doch mal.\n" - .string "Ich wohne an der ROUTE 114.$" + .string "Oh, hello.\n" + .string "You are?\p" + .string "Okay, your name’s {PLAYER}{KUN}.\n" + .string "I can see that you’re a TRAINER.\p" + .string "So that means you use the POKéMON\n" + .string "Storage System I developed.\p" + .string "How I arrived at that conclusion is\n" + .string "a simple deductive process.\p" + .string "You spoke to me because you wanted\n" + .string "to access something on this PC.\p" + .string "Oh, I’m sorry. I’m LANETTE.\p" + .string "Honestly, I’m glad to meet you - it’s\n" + .string "great you’re using the Storage System.\p" + .string "If you could, please visit me at home.\n" + .string "My house is on ROUTE 114.$" FallarborTown_PokemonCenter_1F_Text_17768C:: @ 817768C - .string "Ich frage mich, wie die POKéMON wohl\n" - .string "vor langer, langer Zeit aussahen.\p" - .string "Vielleicht kann mir der FOSSILMANIAC\n" - .string "am Ortsrand etwas dazu sagen.$" + .string "I wonder what POKéMON looked like\n" + .string "long, long ago?\p" + .string "Maybe the FOSSIL MANIAC at the edge\n" + .string "of town will know.$" FallarborTown_PokemonCenter_1F_Text_1776F5:: @ 81776F5 - .string "Auf den Feldern von LAUBWECHSELFELD\n" - .string "haben wir widerstandsfähige Bäume\p" - .string "gepflanzt, die auch in der Vulkanasche\n" - .string "gedeihen.$" + .string "In the fields of FALLARBOR, we plant\n" + .string "seedlings of hardy trees that thrive\l" + .string "even in volcanic ash.$" diff --git a/data/text/maps/FortreeCity.inc b/data/text/maps/FortreeCity.inc index 9f12b016e..8640fada7 100644 --- a/data/text/maps/FortreeCity.inc +++ b/data/text/maps/FortreeCity.inc @@ -1,62 +1,62 @@ FortreeCity_Text_167577:: @ 8167577 - .string "Schnüffel...\n" - .string "Äh... Du, uh... riechst angesengt.\p" - .string "Warst du auf einem Vulkan oder so?$" + .string "Sniff...\n" + .string "Um... You, uh...smell singed.\p" + .string "Were you at a volcano or something?$" FortreeCity_Text_1675C2:: @ 81675C2 - .string "Ich wollte zur POKéMON ARENA, aber\n" - .string "irgendetwas blockiert den Weg.\p" - .string "Und das, nachdem ich auf der ROUTE 120\n" - .string "so fleißig trainiert habe...$" + .string "I want to go to the POKéMON GYM, but\n" + .string "something’s blocking the way.\p" + .string "After all the bother I went through\n" + .string "training on ROUTE 120...$" FortreeCity_Text_167642:: @ 8167642 - .string "Dieses POKéMON ist mein ganzer Stolz!\n" - .string "Diesmal werde ich WIBKE besiegen!$" + .string "I’ve got my pride-and-joy POKéMON\n" + .string "with me. This time, I’ll beat WINONA.$" FortreeCity_Text_16768A:: @ 816768A - .string "Der Boden nimmt das Regenwasser auf,\n" - .string "die Bäume trinken es und wachsen...\p" - .string "Unser BAUMHAUSEN CITY existiert, weil\n" - .string "es genügend Wasser und Boden gibt.$" + .string "The ground absorbs rainwater, and\n" + .string "trees grow by drinking that water...\p" + .string "Our FORTREE CITY exists because\n" + .string "there’s both water and soil.$" FortreeCity_Text_16770E:: @ 816770E - .string "Die STADT besteht aus Häusern, die auf\n" - .string "Bäumen gebaut sind.\p" - .string "Aufgrund dieser Lebensweise ist jeder\n" - .string "hier gesund und munter.\p" - .string "Und auch ich fühle mich, als sei ich\n" - .string "30 Jahre jünger geworden.$" + .string "The CITY consists of homes built on\n" + .string "trees.\p" + .string "Perhaps because of that lifestyle,\n" + .string "everyone is healthy and lively.\p" + .string "Why, even myself - I feel as if I’ve\n" + .string "grown thirty years younger.$" FortreeCity_Text_1677BD:: @ 81677BD - .string "Auf Bäumen zu leben ist klasse.\p" - .string "Aber manchmal kommen KÄFER-POKéMON\n" - .string "durch die Fenster herein.\l" - .string "Das kann einen ganz schön erschrecken.$" + .string "Living on top of trees is okay.\p" + .string "But sometimes BUG POKéMON come in\n" + .string "through windows.\l" + .string "It can be really startling.$" FortreeCity_Text_16782C:: @ 816782C - .string "Manche POKéMON entwickeln sich, wenn\n" - .string "sie durch ein Verbindungskabel laufen.$" + .string "Some POKéMON evolve when they go\n" + .string "through a Game Link cable.$" FortreeCity_Text_167868:: @ 8167868 - .string "Etwas Unsichtbares blockiert den Weg.$" + .string "Something unseeable is in the way.$" FortreeCity_Text_16788B:: @ 816788B - .string "Etwas Unsichtbares blockiert den Weg.\p" - .string "Willst du das DEVON-SCOPE einsetzen?$" + .string "Something unseeable is in the way.\p" + .string "Want to use the DEVON SCOPE?$" FortreeCity_Text_1678CB:: @ 81678CB - .string "{PLAYER} setzt das DEVON-SCOPE ein.\p" - .string "Ein unsichtbares POKéMON ist sichtbar\n" - .string "geworden!\p" - .string "Das erschrockene POKéMON flieht!$" + .string "{PLAYER} used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON fled!$" FortreeCity_Text_16792F:: @ 816792F - .string "BAUMHAUSEN CITY\n" - .string "“Die Stadt in den Baumkronen,\l" - .string "verbrüdert mit der Natur.”$" + .string "FORTREE CITY\n" + .string "“The treetop city that frolics with\l" + .string "nature.”$" FortreeCity_Text_167969:: @ 8167969 - .string "POKéMON ARENA von BAUMHAUSEN CITY\n" - .string "LEITERIN: WIBKE\p" - .string "“Die Vogel-Liebhaberin hebt ab zum\n" - .string "Flug in die Welt.”$" + .string "FORTREE CITY POKéMON GYM\n" + .string "LEADER: WINONA\p" + .string "“The bird user taking flight into\n" + .string "the world.”$" diff --git a/data/text/maps/FortreeCity_DecorationShop.inc b/data/text/maps/FortreeCity_DecorationShop.inc index 07c3b3379..7809f10ff 100644 --- a/data/text/maps/FortreeCity_DecorationShop.inc +++ b/data/text/maps/FortreeCity_DecorationShop.inc @@ -1,13 +1,12 @@ FortreeCity_DecorationShop_Text_186A61:: @ 8186A61 - .string "Die Artikel, die du hier kaufst, werden\n" - .string "sofort auf deinen PC gesendet.\p" - .string "Das ist großartig! Ich wünschte, ich\n" - .string "könnte mich so auch nach Hause\l" - .string "senden lassen.$" + .string "Merchandise you buy here is sent to\n" + .string "your own PC.\p" + .string "That’s fantastic! I wish they could\n" + .string "also deliver me home like that.$" FortreeCity_DecorationShop_Text_186AD6:: @ 8186AD6 - .string "Ich kaufe mir einen schönen Tisch, auf\n" - .string "den ich meine PUPPEN setze.\p" - .string "Wenn ich das nicht tue, werden meine\n" - .string "PUPPEN schmutzig, wenn ich damit meine\l" - .string "GEHEIMBASIS dekoriere.$" + .string "I’m buying a pretty desk and I’m\n" + .string "putting my cute DOLLS on it.\p" + .string "If I don’t, when I decorate my\n" + .string "SECRET BASE, my DOLLS will get\l" + .string "dirty or poked with splinters.$" diff --git a/data/text/maps/FortreeCity_Gym.inc b/data/text/maps/FortreeCity_Gym.inc index 5c1696822..036cacd50 100644 --- a/data/text/maps/FortreeCity_Gym.inc +++ b/data/text/maps/FortreeCity_Gym.inc @@ -1,119 +1,116 @@ FortreeCity_Gym_Text_18589C:: @ 818589C - .string "Na, wie sieht es aus, auf dem Weg zum\n" - .string "CHAMP, {PLAYER}?\p" - .string "Die LEITERIN der ARENA von BAUMHAUSEN\n" - .string "CITY, WIBKE, ist eine Meisterin der\l" - .string "FLUG-POKéMON.\p" - .string "Sie wartet hinten in der ARENA auf dich,\n" - .string "hinter den Drehtüren.\p" - .string "Sie wartet auf neue Herausforderer,\n" - .string "denen sie die Flügel stutzen kann!\p" - .string "Okay, dann viel Glück!$" + .string "Yo, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "FORTREE GYM LEADER WINONA is a\n" + .string "master of FLYING-type POKéMON.\p" + .string "She’s waiting at the back of this GYM,\n" + .string "behind the rotating doors.\p" + .string "She’s waiting for new challengers who\n" + .string "are trying to take wing!\p" + .string "Okay, go for it!$" FortreeCity_Gym_Text_185994:: @ 8185994 - .string "Du hast es geschafft!\n" - .string "Du hast Startfreigabe!$" + .string "You did it!\n" + .string "You’ve achieved liftoff!$" FortreeCity_Gym_Text_1859B9:: @ 81859B9 - .string "Bewundere den eleganten Kampfstil der\n" - .string "VOGEL-POKéMON!$" + .string "Behold the elegant battle style of\n" + .string "BIRD POKéMON!$" FortreeCity_Gym_Text_1859EA:: @ 81859EA - .string "Du...\n" - .string "Du bist stark...$" + .string "You...\n" + .string "You’re strong...$" FortreeCity_Gym_Text_185A02:: @ 8185A02 - .string "Ein TRAINER muss clever genug sein, mit\n" - .string "den Wendungen im Kampf fertig zu\l" - .string "werden.\p" - .string "Mal sehen, ob du clever genug bist, bis\n" - .string "zu unserer LEITERIN vorzudringen.$" + .string "A TRAINER has to be smart to keep\n" + .string "up with unexpected turns of events.\p" + .string "Let’s see if you have the smarts to\n" + .string "get to our LEADER?$" FortreeCity_Gym_Text_185A7F:: @ 8185A7F - .string "Liebhaber von VOGEL-POKéMON streben\n" - .string "danach, dieser ARENA beizutreten.\p" - .string "Als Mitglied der ARENA von BAUMHAUSEN\n" - .string "CITY darf ich nicht verlieren!$" + .string "The lovers of BIRD POKéMON aspire\n" + .string "to join this GYM.\p" + .string "As a member of the FORTREE GYM,\n" + .string "I’m not allowed to lose!$" FortreeCity_Gym_Text_185AEC:: @ 8185AEC - .string "Das war doch etwas zu schwer für mich\n" - .string "zu tragen...$" + .string "It was too much of a load for me\n" + .string "to bear...$" FortreeCity_Gym_Text_185B18:: @ 8185B18 - .string "Die Welt ist groß und es gibt zahlreiche\n" - .string "starke TRAINER.\p" - .string "Ich werde weiter trainieren und so\n" - .string "immer stärker werden!$" + .string "The world is huge, and there are\n" + .string "countless tough TRAINERS.\p" + .string "I’m going to keep training and make\n" + .string "myself even stronger.$" FortreeCity_Gym_Text_185B8D:: @ 8185B8D - .string "Es gibt keinen Grund, dass WIBKE,\n" - .string "unsere ARENALEITERIN, sich mit dir\l" - .string "abgibt!\p" - .string "Ich bin schon stark genug für dich!$" + .string "There’s no need for WINONA, our GYM\n" + .string "LEADER, to deal with you!\p" + .string "I’m plenty good enough for you!$" FortreeCity_Gym_Text_185BEB:: @ 8185BEB - .string "WIBKE... Ich...\n" - .string "Ich habe verlooooren!$" + .string "WINONA, I...\n" + .string "I lost!$" FortreeCity_Gym_Text_185C00:: @ 8185C00 - .string "WIBKE ist süß, aber auch stark.\n" - .string "Sie ist die ultimative LEITERIN!\p" - .string "Hups... Wie peinlich. Ich werde nicht rot!$" + .string "WINONA is cute and she’s strong.\n" + .string "She’s the ultimate LEADER!\p" + .string "Blush...$" FortreeCity_Gym_Text_185C45:: @ 8185C45 - .string "WIBKE hat mich persönlich geschult!\n" - .string "Du wirst kein leichtes Spiel haben!$" + .string "WINONA taught me personally!\n" + .string "You can’t beat me easily!$" FortreeCity_Gym_Text_185C7C:: @ 8185C7C - .string "Ich wurde geschlagen...$" + .string "I was beaten...$" FortreeCity_Gym_Text_185C8C:: @ 8185C8C - .string "Dank WIBKE leben die Einwohner von\n" - .string "BAUMHAUSEN CITY ohne Furcht.$" + .string "Thanks to WINONA, the people of\n" + .string "FORTREE can live without fear.$" FortreeCity_Gym_Text_185CCB:: @ 8185CCB - .string "Ich bin WIBKE, die LEITERIN der ARENA\n" - .string "von BAUMHAUSEN CITY.\p" - .string "Ich wurde das mit Hilfe meiner VOGEL-\n" - .string "POKéMON und habe den Himmel berührt.\p" - .string "Wie anstrengend der Kampf auch war, wir\n" - .string "haben mit Grazie gewonnen...\p" - .string "Werde Zeuge der eleganten Choreo-\n" - .string "graphie meiner VOGEL-POKéMON!$" + .string "I am WINONA. I am the LEADER of the\n" + .string "FORTREE POKéMON GYM.\p" + .string "I have become one with BIRD POKéMON\n" + .string "and have soared the skies...\p" + .string "However grueling the battle, we have\n" + .string "triumphed with grace...\p" + .string "Witness the elegant choreography\n" + .string "of BIRD POKéMON and I!$" FortreeCity_Gym_Text_185DBA:: @ 8185DBA - .string "Ich habe noch nie einen TRAINER ge-\n" - .string "sehen, der seine POKéMON mit mehr\l" - .string "Grazie trainiert als ich...\p" - .string "In Anbetracht deiner Fähigkeiten\n" - .string "überreiche ich dir diesen ARENAORDEN.$" + .string "Never before have I seen a TRAINER\n" + .string "command POKéMON with more grace\l" + .string "than I...\p" + .string "In recognition of your prowess,\n" + .string "I present to you this GYM BADGE.$" FortreeCity_Gym_Text_185E48:: @ 8185E48 - .string "{PLAYER} erhält den FEDERORDEN von\n" - .string "WIBKE.$" + .string "{PLAYER} received the FEATHER BADGE\n" + .string "from WINONA.$" FortreeCity_Gym_Text_185E73:: @ 8185E73 - .string "Mit dem FEDERORDEN gehorchen dir alle\n" - .string "POKéMON bis Lv. 70, auch die, die du\l" - .string "durch Tausch bekommen hast.\p" - .string "Außerdem kannst du nun die VM FLIEGEN\n" - .string "außerhalb eines Kampfes einsetzen.\p" - .string "Und dies...\n" - .string "Dies ist ein Geschenk von mir.$" + .string "With the FEATHER BADGE, all POKéMON up\n" + .string "to LV 70, even those received through\l" + .string "trades, will obey your every command.\p" + .string "You will also be able to use the\n" + .string "HM move FLY outside of battle.\p" + .string "And this...\n" + .string "This is a gift from me.$" FortreeCity_Gym_Text_185F4A:: @ 8185F4A - .string "TM40 enthält AERO-ASS.\p" - .string "Diese Geschwindigkeit...\n" - .string "Kein POKéMON kann ihr entgehen.$" + .string "TM40 contains AERIAL ACE.\p" + .string "Its speed...\n" + .string "No POKéMON should be able to avoid it.$" FortreeCity_Gym_Text_185F98:: @ 8185F98 - .string "Auch wenn ich gegen dich verloren habe,\n" - .string "gehört meine Liebe den VOGEL-POKéMON.$" + .string "Though I fell to you, I will remain\n" + .string "devoted to BIRD POKéMON.$" FortreeCity_Gym_Text_185FD5:: @ 8185FD5 - .string "POKéMON ARENA von BAUMHAUSEN CITY$" + .string "FORTREE CITY POKéMON GYM$" FortreeCity_Gym_Text_185FEE:: @ 8185FEE - .string "POKéMON ARENA von BAUMHAUSEN CITY\p" - .string "WIBKES ANERKANNTE TRAINER:\n" + .string "FORTREE CITY POKéMON GYM\p" + .string "WINONA’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/FortreeCity_House1.inc b/data/text/maps/FortreeCity_House1.inc index 0f22af768..0d94fcd27 100644 --- a/data/text/maps/FortreeCity_House1.inc +++ b/data/text/maps/FortreeCity_House1.inc @@ -1,37 +1,35 @@ FortreeCity_House1_Text_18568C:: @ 818568C - .string "Hi! Da gibt es dieses POKéMON, nach\n" - .string "dem ich suche.\p" - .string "Ich möchte ein {STR_VAR_1} haben.\n" - .string "Hast du eines?\p" - .string "Würdest du es gegen mein {STR_VAR_2}\n" - .string "tauschen?$" + .string "Hi, there’s this POKéMON that I’m\n" + .string "looking for.\p" + .string "I want a {STR_VAR_1}.\n" + .string "Do you have one?\p" + .string "Would you trade it for my {STR_VAR_2}?$" FortreeCity_House1_Text_1856F7:: @ 81856F7 - .string "Danke schön!\p" - .string "Ich werde gut zu deinem {STR_VAR_1}\n" - .string "sein, also sei auch gut zu meinem\l" - .string "{STR_VAR_2}!$" + .string "Thank you!\p" + .string "I’ll be good to your {STR_VAR_1},\n" + .string "so please be nice to my {STR_VAR_2}!$" FortreeCity_House1_Text_185737:: @ 8185737 - .string "Warte!\n" - .string "Das ist kein {STR_VAR_1}.\p" - .string "Ich glaube, du willst gar nicht mit mir\n" - .string "tauschen.$" + .string "Wait!\n" + .string "That POKéMON isn’t a {STR_VAR_1}.\p" + .string "I guess you don’t want to trade\n" + .string "with me.$" FortreeCity_House1_Text_18577F:: @ 818577F - .string "Oh, okay. Wenn du es dir anders über-\n" - .string "legst, komm wieder vorbei.\p" - .string "Ich werde hier warten!$" + .string "Oh, okay. If you change your mind,\n" + .string "please come see me.\p" + .string "I’ll be waiting!$" FortreeCity_House1_Text_1857C7:: @ 81857C7 - .string "Danke, dass du mit mir getauscht hast!\p" - .string "Dieses POKéMON habe ich mir schon lange\n" - .string "gewünscht. Bei mir wird’s ihm gut gehen!$" + .string "Thank you for trading with me!\p" + .string "I really wanted this POKéMON, so\n" + .string "I promise to take good care of it!$" FortreeCity_House1_Text_18582A:: @ 818582A - .string "Mit anderen sein POKéMON tauschen...\p" - .string "Das ist, als ob du die Erinnerungen mit\n" - .string "anderen Menschen teilst.$" + .string "Trading POKéMON with others...\p" + .string "It’s as if you’re trading your own\n" + .string "memories with other people.$" FortreeCity_House1_Text_185888:: @ 8185888 - .string "ZIGZACHS: Gumomoh?$" + .string "ZIGZAGOON: Gumomoh?$" diff --git a/data/text/maps/FortreeCity_House2.inc b/data/text/maps/FortreeCity_House2.inc index c257d6c5b..8b78e1ae8 100644 --- a/data/text/maps/FortreeCity_House2.inc +++ b/data/text/maps/FortreeCity_House2.inc @@ -1,45 +1,45 @@ FortreeCity_House2_Text_186306:: @ 8186306 - .string "Menschen... POKéMON...\p" - .string "Ihre versteckten Kräfte werden durch\n" - .string "das Leben in der Natur geweckt.$" + .string "People... POKéMON...\p" + .string "Their hidden powers are aroused by\n" + .string "living in natural environments...$" FortreeCity_House2_Text_186360:: @ 8186360 - .string "Lass diese alte Frau mal sehen, ob deine\n" - .string "versteckten Kräfte erwacht sind...\p" - .string "Ich halte eine Münze in meiner Hand.\p" - .string "Nun? In welcher Hand halte ich sie?\n" - .string "In der linken oder rechten Hand?$" + .string "Let this old woman see if your hidden\n" + .string "power has awoken...\p" + .string "I hold a coin in my hand.\p" + .string "Now, tell me, have I palmed it in the\n" + .string "right hand? Or in the left?$" FortreeCity_House2_Text_1863F6:: @ 81863F6 - .string "Oh! Das stimmt!\p" - .string "Versuchen wir es noch einmal.\p" - .string "In welcher Hand halte ich die Münze?\n" - .string "Rechts oder links?$" + .string "Oh! Yes, correct!\p" + .string "We shall try again.\p" + .string "In which hand have I palmed the coin?\n" + .string "The right or left?$" FortreeCity_House2_Text_186455:: @ 8186455 - .string "Oh! Schon wieder richtig!\p" - .string "Probieren wir es noch einmal.\p" - .string "In welcher Hand ist die Münze nun?\n" - .string "In der linken oder der rechten Hand?$" + .string "Oh! Yes, correct again!\p" + .string "We shall try once more.\p" + .string "In which hand have I palmed the coin?\n" + .string "The right or left? Choose!$" FortreeCity_House2_Text_1864C6:: @ 81864C6 - .string "Oh! Hervorragend!\n" - .string "Deine versteckten Kräfte sind erwacht!\p" - .string "Hier, das ist für dich. Wecke damit die\n" - .string "versteckten Kräfte deiner POKéMON.$" + .string "Oh! Splendid!\n" + .string "Your hidden power has awoken!\p" + .string "Here, take this and awaken the hidden\n" + .string "power of your POKéMON.$" FortreeCity_House2_Text_18652F:: @ 818652F - .string "KRAFTRESERVE ist eine Attacke, die je\n" - .string "nach POKéMON anders aussieht.$" + .string "HIDDEN POWER is a move that changes\n" + .string "with the POKéMON.$" FortreeCity_House2_Text_186565:: @ 8186565 - .string "Och, zu schade!\n" - .string "Du hast falsch geraten.$" + .string "No, too bad.\n" + .string "You guessed wrong.$" UnknownString_8186585: @ 8186585 - .string "Das Gebiet um BAUMHAUSEN CITY\n" - .string "ist wie ein Dschungel.\p" - .string "Man ermüdet schnell, wenn man alles\n" - .string "erkunden will.\p" - .string "Deshalb benutze ich FLIEGEN, um von\n" - .string "einem Ort zum anderen zu kommen.$" + .string "The area around FORTREE CITY is like\n" + .string "a jungle.\p" + .string "It gets awfully tiring walking around\n" + .string "this city.\p" + .string "That’s why I use FLY to instantly go to\n" + .string "any city I’ve visited.$" diff --git a/data/text/maps/FortreeCity_House3.inc b/data/text/maps/FortreeCity_House3.inc index 8370d6692..6b0b254f6 100644 --- a/data/text/maps/FortreeCity_House3.inc +++ b/data/text/maps/FortreeCity_House3.inc @@ -1,18 +1,17 @@ FortreeCity_House3_Text_186624:: @ 8186624 - .string "Da wir gerade vom POKéDEX reden... Ich\n" - .string "erinnere mich...\p" - .string "Ich habe diesen TRAINER, TROY,\n" - .string "getroffen, als ich seltene Steine\l" - .string "suchte.\p" - .string "Oh Junge, der hatte vielleicht\n" - .string "interessante POKéMON bei sich!\p" - .string "Die waren nicht nur selten, sondern\n" - .string "auch ausgesprochen gut trainiert!\p" - .string "Er ist bestimmt stärker als die ARENA-\n" - .string "LEITERIN in diesem Ort...$" + .string "Speaking of POKéDEXES, I remembered\n" + .string "something.\p" + .string "I met this TRAINER, STEVEN, when\n" + .string "I was searching for rare stones.\p" + .string "Hoo, boy, he had some amazing POKéMON\n" + .string "with him.\p" + .string "They weren’t just rare, they were\n" + .string "trained to terrifying extremes!\p" + .string "He might even be stronger than the\n" + .string "GYM LEADER in this town...$" FortreeCity_House3_Text_186745:: @ 8186745 - .string "Was ist das da? Was hast du da?\p" + .string "What’s that thing you have there?\p" .string "... ... ... ... ... ...\p" - .string "Oh, das ist also ein POKéDEX?\n" - .string "Der ist aber wirklich klasse!$" + .string "Oh, it’s called a POKéDEX?\n" + .string "It’s really awesome!$" diff --git a/data/text/maps/FortreeCity_House4.inc b/data/text/maps/FortreeCity_House4.inc index c1491ae96..9389ec4aa 100644 --- a/data/text/maps/FortreeCity_House4.inc +++ b/data/text/maps/FortreeCity_House4.inc @@ -1,30 +1,30 @@ FortreeCity_House4_Text_1867AF:: @ 81867AF - .string "Wenn sie mit POKéMON zusammen sind,\n" - .string "finden die Menschen schnell Freunde.\p" - .string "Und so rücken die Menschen weltweit\n" - .string "näher zusammen. Wunderbar, nicht wahr?$" + .string "By being together with POKéMON,\n" + .string "people make more and more friends.\p" + .string "And that brings the world closer\n" + .string "together. I think it’s wonderful!$" FortreeCity_House4_Text_186835:: @ 8186835 - .string "Fertig!\n" - .string "Los, VOGEL-POKéMON!$" + .string "There!\n" + .string "Go, BIRD POKéMON!$" FortreeCity_House4_Text_18684E:: @ 818684E - .string "Hähähä, mein WINGULL macht\n" - .string "Besorgungen für mich.$" + .string "Heheh, I asked my WINGULL to run an\n" + .string "errand for me.$" FortreeCity_House4_Text_186881:: @ 8186881 - .string "Gut!\n" - .string "Komm zurück, WINGULL!\p" - .string "Huch! Was ist das?\n" - .string "Was trägt es denn da?\p" - .string "Ein MENTALKRAUT?\n" - .string "Das muss es irgendwo gefunden haben.\p" - .string "Aber, ich bin kein TRAINER, daher kannst\n" - .string "du es haben.$" + .string "Good!\n" + .string "Welcome back, WINGULL!\p" + .string "Huh? What is this?\n" + .string "What is it holding?\p" + .string "A MENTAL HERB?\n" + .string "It must have picked it up somewhere.\p" + .string "But I’m not a TRAINER, so you can\n" + .string "have it.$" FortreeCity_House4_Text_186924:: @ 8186924 - .string "Dank meines WINGULL habe ich Freunde,\n" - .string "die sehr weit weg von hier wohnen.$" + .string "Thanks to my WINGULL, I have friends\n" + .string "who live far away.$" FortreeCity_House4_Text_18695C:: @ 818695C .string "WINGULL: Pihyoh!$" diff --git a/data/text/maps/FortreeCity_House5.inc b/data/text/maps/FortreeCity_House5.inc index 26c5b21ad..711b9579e 100644 --- a/data/text/maps/FortreeCity_House5.inc +++ b/data/text/maps/FortreeCity_House5.inc @@ -1,14 +1,13 @@ FortreeCity_House5_Text_18696D:: @ 818696D - .string "Die Baumhäuser von BAUMHAUSEN\n" - .string "CITY sind fantastisch!\p" - .string "Ich glaube, es ist der beste Platz, um\n" - .string "mit seinen POKéMON zusammenzuleben.$" + .string "The tree houses of FORTREE are great!\p" + .string "I think it’s the number one town for\n" + .string "living together with POKéMON.$" FortreeCity_House5_Text_1869D6:: @ 81869D6 - .string "POKéMON und Menschen sind auf die\n" - .string "Natur angewiesen, um zu überleben.\p" - .string "Es gibt überhaupt keinen Grund, die\n" - .string "Natur nach unserem Willen zu formen.$" + .string "POKéMON and people have adapted to\n" + .string "nature to survive.\p" + .string "There’s no need to make nature\n" + .string "conform to the way we want to live.$" FortreeCity_House5_Text_186A4F:: @ 8186A4F - .string "ZIGZACHS: Bufuu!$" + .string "ZIGZAGOON: Bufuu!$" diff --git a/data/text/maps/FortreeCity_Mart.inc b/data/text/maps/FortreeCity_Mart.inc index da371d141..c8c2c4f0f 100644 --- a/data/text/maps/FortreeCity_Mart.inc +++ b/data/text/maps/FortreeCity_Mart.inc @@ -1,15 +1,15 @@ FortreeCity_Mart_Text_1861EF:: @ 81861EF - .string "SUPERSCHUTZ hält lange an, und ist auch\n" - .string "äußerst nützlich.\p" - .string "Es ist viel besser als normaler SCHUTZ.$" + .string "SUPER REPEL lasts a long time, and\n" + .string "it gets the job done.\p" + .string "It’s much better than an ordinary\n" + .string "REPEL.$" FortreeCity_Mart_Text_186251:: @ 8186251 - .string "Ich horte immer mehr Items, als ich\n" - .string "eigentlich benötige.\p" - .string "Man weiß ja nie, was einem passieren\n" - .string "kann. Vorsicht ist die Mutter der\l" - .string "Porzellankiste!$" + .string "I always stock up on more items than\n" + .string "I’m sure I’ll need.\p" + .string "You never know what might happen.\n" + .string "Better to be safe than sorry!$" FortreeCity_Mart_Text_1862CA:: @ 81862CA - .string "Ein SONDERBONBON erhöht den Level\n" - .string "eines POKéMON sofort um 1.$" + .string "A RARE CANDY makes a POKéMON grow\n" + .string "immediately by one level.$" diff --git a/data/text/maps/FortreeCity_PokemonCenter_1F.inc b/data/text/maps/FortreeCity_PokemonCenter_1F.inc index f38a010bc..d5ffb8a61 100644 --- a/data/text/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/text/maps/FortreeCity_PokemonCenter_1F.inc @@ -1,24 +1,22 @@ FortreeCity_PokemonCenter_1F_Text_186027:: @ 8186027 - .string "Na, Kindchen, arbeitest du an einem\n" - .string "POKéDEX?\p" - .string "Hmm... Ich an deiner Stelle würde mal\n" - .string "die SAFARI-ZONE auf der ROUTE 121\l" - .string "besuchen.$" + .string "Listen, kid, are you working\n" + .string "on a POKéDEX?\p" + .string "Hmm... Go to the SAFARI ZONE.\n" + .string "That’s my suggestion.$" FortreeCity_PokemonCenter_1F_Text_186086:: @ 8186086 - .string "Hast du schon mal eine\n" - .string "STATISTIK GETAUSCHT?\p" - .string "Sehr nützliche Einrichtung! Die Erfolge\n" - .string "eines jeden TRAINERS werden dort\l" - .string "gespeichert und miteinander verglichen.\p" - .string "Ich weiß zwar nicht, wie das passiert,\n" - .string "aber es ist einfach irre. Und aufregend!$" + .string "Have you done anything at the\n" + .string "RECORD CORNER?\p" + .string "It’s pretty neat. It mixes and matches\n" + .string "the records of TRAINERS.\p" + .string "I don’t know quite how it works,\n" + .string "but it’s cool. It’s exciting, even!$" FortreeCity_PokemonCenter_1F_Text_186138:: @ 8186138 - .string "Hey, du hast einen POKéNAV!\n" - .string "Ich habe auch so einen.\p" - .string "Schau dir mal die TRAINER an.\p" - .string "Dort kannst du sehen, welche TRAINER\n" - .string "erneut gegen dich antreten möchten.\p" - .string "Ist das nicht einfach super?\n" - .string "Das muss man DEVON wirklich lassen!$" + .string "Hey, you’ve got a POKéNAV!\n" + .string "It’s the same as mine.\p" + .string "Check out the TRAINER’S EYES on it.\p" + .string "It shows you TRAINERS who want a\n" + .string "rematch with you.\p" + .string "Isn’t it great?\n" + .string "You have to hand it to DEVON!$" diff --git a/data/text/maps/GraniteCave_1F.inc b/data/text/maps/GraniteCave_1F.inc index 16c943455..3344f76d9 100644 --- a/data/text/maps/GraniteCave_1F.inc +++ b/data/text/maps/GraniteCave_1F.inc @@ -1,19 +1,19 @@ GraniteCave_1F_Text_194917:: @ 8194917 - .string "Hey, du!\n" - .string "Hier ist es schrecklich dunkel.\l" - .string "Eine Erforschung wird damit schwierig.\p" - .string "Der Typ, der vorher schon mal hier war...\n" - .string "TROY heißt er, glaube ich...\p" - .string "Der weiß, wie man BLITZ einsetzt, daher\n" - .string "wird es ihm wohl gut gehen, aber...\p" - .string "Das Motto unter uns WANDERERN heißt:\n" - .string "Jedem aus der Klemme helfen.\p" - .string "Deshalb bekommst du dies von mir.$" + .string "Hey, you.\n" + .string "It gets awfully dark ahead.\l" + .string "It’ll be tough trying to explore.\p" + .string "That guy who came by earlier...\n" + .string "STEVEN, I think it was.\p" + .string "He knew how to use FLASH, so he ought\n" + .string "to be all right, but...\p" + .string "Well, for us HIKERS, helping out those\n" + .string "that we meet is our motto.\p" + .string "Here you go, I’ll pass this on to you.$" GraniteCave_1F_Text_194A3E:: @ 8194A3E - .string "Bringe einem POKéMON die VM BLITZ\n" - .string "bei und setze sie ein.\p" - .string "Damit wird selbst die dunkelste Höhle\n" - .string "von Licht erfüllt.\p" - .string "Aber um das zu können, brauchst du den\n" - .string "ORDEN der ARENA von FAUSTAUHAVEN.$" + .string "Teach that hidden move FLASH to a\n" + .string "POKéMON and use it.\p" + .string "It lights up even the inky darkness\n" + .string "of caves.\p" + .string "But, to use it, you need the GYM BADGE\n" + .string "from DEWFORD’s POKéMON GYM.$" diff --git a/data/text/maps/GraniteCave_StevensRoom.inc b/data/text/maps/GraniteCave_StevensRoom.inc index 19d4ac0ca..873acea22 100644 --- a/data/text/maps/GraniteCave_StevensRoom.inc +++ b/data/text/maps/GraniteCave_StevensRoom.inc @@ -1,33 +1,33 @@ GraniteCave_StevensRoom_Text_194AE5:: @ 8194AE5 - .string "Dieses Ding, das du da trägst...\n" - .string "Das ist ein POKéNAV.\p" - .string "Wenn TRAINER, die einen POKéNAV be-\n" - .string "sitzen, gegeneinander kämpfen, wird das\l" - .string "Ergebnis hier gespeichert.\p" - .string "Oh, entschuldige. Ich habe mich gar\n" - .string "nicht vorgestellt. Mein Name ist TROY.\p" - .string "Ich sammle seltene Steine, daher gehe\n" - .string "ich immer mal wieder auf Reisen.\p" + .string "That device you have there...\n" + .string "It’s a POKéNAV.\p" + .string "When TRAINERS that have POKéNAVS\n" + .string "battle, it keeps a record of how\l" + .string "things went, I think.\p" + .string "Oh, pardon me.\n" + .string "My name is STEVEN.\p" + .string "I’m interested in rare stones, so\n" + .string "I travel here and there.\p" .string "Oh?\n" - .string "Ein BRIEF? Für mich?$" + .string "A LETTER for me?$" GraniteCave_StevensRoom_Text_194BDD:: @ 8194BDD - .string "TROY: Okay, danke schön.\p" - .string "Du hast all die Beschwerlichkeiten auf\n" - .string "dich genommen, um ihn mir zu bringen.\p" - .string "Ich muss mich bedanken. Ehrlich.\n" - .string "Ich werde dir diese TM geben.\p" - .string "Sie enthält meine Lieblingsattacke,\n" - .string "STAHLFLÜGEL.$" + .string "STEVEN: Okay, thank you.\p" + .string "You went through all this trouble to\n" + .string "deliver that. I need to thank you.\p" + .string "Let me see...\n" + .string "I’ll give you this TM.\p" + .string "It contains my favorite move,\n" + .string "STEEL WING.$" GraniteCave_StevensRoom_Text_194C8D:: @ 8194C8D - .string "TROY: Deine POKéMON sehen recht\n" - .string "talentiert aus.\p" - .string "Wenn du fleißig trainierst, wirst du\n" - .string "vielleicht eines Tages der CHAMP der\l" - .string "POKéMON LIGA. Das ist meine Meinung.\p" - .string "Nun muss ich mich aber wirklich beeilen.$" + .string "STEVEN: Your POKéMON appear quite\n" + .string "capable.\p" + .string "If you keep training, you could even\n" + .string "become the CHAMPION of the POKéMON\l" + .string "LEAGUE one day. That’s what I think.\p" + .string "Now, I’ve got to hurry along.$" GraniteCave_StevensRoom_Text_194D43:: @ 8194D43 - .string "Oh, dein BEUTEL ist voll.\n" - .string "Das ist aber wirklich schade.$" + .string "Oh, your BAG is full...\n" + .string "That’s too bad, then.$" diff --git a/data/text/maps/InsideOfTruck.inc b/data/text/maps/InsideOfTruck.inc index 3c92c3cc0..19166c481 100644 --- a/data/text/maps/InsideOfTruck.inc +++ b/data/text/maps/InsideOfTruck.inc @@ -1,4 +1,4 @@ InsideOfTruck_Text_198FAD:: @ 8198FAD - .string "Auf der Kiste ist ein POKéMON-Logo.\p" - .string "Es ist ein Umzugs- und Lieferservice\n" - .string "einer POKéMON-Firma.$" + .string "The box is printed with a POKéMON logo.\p" + .string "It’s a POKéMON brand moving and\n" + .string "delivery service.$" diff --git a/data/text/maps/JaggedPass.inc b/data/text/maps/JaggedPass.inc index 4411ff4f1..23216b12b 100644 --- a/data/text/maps/JaggedPass.inc +++ b/data/text/maps/JaggedPass.inc @@ -1,69 +1,63 @@ JaggedPass_Text_195DAC:: @ 8195DAC - .string "SCHLOTBERG STEILPASS...\p" - .string "Davon habe ich immer geträumt, wenn ich\n" - .string "in den Bergen unterwegs war.\p" - .string "Zerklüftete Massive...\n" - .string "Das bringt meine Seele zum Erbeben.$" + .string "MT. CHIMNEY’s JAGGED PASS...\p" + .string "Now this is what I’ve always wanted\n" + .string "in a mountain.\p" + .string "This jagged bumpiness...\n" + .string "It rocks my soul!$" JaggedPass_Text_195E27:: @ 8195E27 - .string "Verlieren ist bitter.$" + .string "Losing left me bitter!$" JaggedPass_Text_195E3E:: @ 8195E3E - .string "Ja, ich bin im Umgang mit POKéMON nicht\n" - .string "gerade talentiert.\p" - .string "Aber wenn es um die Leidenschaft für\n" - .string "die Berge geht, stecke ich dich locker\l" - .string "in die Tasche!$" + .string "Yes, I did lose at POKéMON...\p" + .string "But, when it comes to the love of\n" + .string "the mountains, I have you beat!$" JaggedPass_Text_195E9E:: @ 8195E9E - .string "Dich habe ich hier noch nie gesehen.\n" - .string "Dieser Platz eignet sich nicht für ein\l" - .string "Picknick.$" + .string "This place isn’t your casual hike.\n" + .string "It’s not suited for a picnic.$" JaggedPass_Text_195EDF:: @ 8195EDF - .string "Oooh, nein!\n" - .string "Das liegt am Boden. Er ist zu uneben!$" + .string "Ohhh, no!\n" + .string "The ground is too bumpy...$" JaggedPass_Text_195F04:: @ 8195F04 - .string "Stell dir mal vor!\p" - .string "Einige fahren tatsächlich mit ihren\n" - .string "Fahrrädern diesen zerklüfteten Pass\l" - .string "hinauf.$" + .string "Did you know?\p" + .string "Some people cleverly ride their\n" + .string "bicycles up this horribly bumpy pass.$" JaggedPass_Text_195F58:: @ 8195F58 - .string "Picknicke machen überall und immer Spaß.\n" - .string "Und PKMN leisten mir dabei Gesellschaft!$" + .string "Picnics are fun wherever you go.\n" + .string "Just like POKéMON!$" JaggedPass_Text_195F8C:: @ 8195F8C - .string "Ich habe nur verloren, weil der Boden\n" - .string "wirklich sehr uneben ist.$" + .string "I only lost because the ground is\n" + .string "too bumpy!$" JaggedPass_Text_195FB9:: @ 8195FB9 - .string "Ich werde meine Niederlage einfach\n" - .string "vergessen und mit dem Rad den Pass\l" - .string "entlangdüsen.$" + .string "I’ll forget about losing and just\n" + .string "enjoy this bumpy hike.$" JaggedPass_Text_195FF2:: @ 8195FF2 - .string "Der STEILPASS ist sehr schwer zu Fuß\n" - .string "zu meistern. Aber ein guter Ort zum\l" - .string "Trainieren.$" + .string "JAGGED PASS is hard to walk on.\n" + .string "It’s a good place for training.$" JaggedPass_Text_196032:: @ 8196032 - .string "Schon vorbei? Ich habe überhaupt\n" - .string "keinen sicheren Stand gehabt.$" + .string "It was all over while we were still\n" + .string "trying to find a good footing...$" JaggedPass_Text_196077:: @ 8196077 - .string "Wenn ich ein KUNSTRAD hätte, könnte\n" - .string "ich die Abhänge einfach überspringen.$" + .string "If I had an ACRO BIKE, I’d be able to\n" + .string "jump ledges.$" JaggedPass_Text_1960AA:: @ 81960AA - .string "Ich habe mich an die Unebenheiten ge-\n" - .string "wöhnt. Ich singe beim Klettern.$" + .string "I got used to this bumpiness.\n" + .string "I sing while I climb now.$" JaggedPass_Text_1960E2:: @ 81960E2 - .string "Auf diesem unebenen Boden ist es wirk-\n" - .string "lich nicht leicht, gut zu kämpfen.$" + .string "It’s still not easy to battle on this\n" + .string "bumpy ground...$" JaggedPass_Text_196118:: @ 8196118 - .string "Ich sollte mir ein KUNSTRAD von RADLA\n" - .string "in MALVENFROH CITY besorgen...$" + .string "I should get an ACRO BIKE from RYDEL\n" + .string "in MAUVILLE CITY...$" diff --git a/data/text/maps/LavaridgeTown.inc b/data/text/maps/LavaridgeTown.inc index 3fa8668e5..308548510 100644 --- a/data/text/maps/LavaridgeTown.inc +++ b/data/text/maps/LavaridgeTown.inc @@ -1,138 +1,129 @@ LavaridgeTown_Text_16BDA4:: @ 816BDA4 - .string "MAIKE: {PLAYER}{KUN}! Wir haben uns lange\n" - .string "nicht gesehen!\p" - .string "Oh? Als ich die Heißen Quellen aufge-\n" - .string "sucht habe, habe ich den ORDEN der\p" - .string "ARENA von BAD LAVASTADT erhalten.\n" - .string "Du hast anscheinend viele POKéMON\p" - .string "gefangen... Äh, ich meine, du hast ja\n" - .string "schon einige POKéMON aufgezogen. \p" - .string "Ich denke, das hier wirst du gut\n" - .string "gebrauchen können.$" + .string "MAY: {PLAYER}{KUN}! Long time no see!\p" + .string "Oh? While I was visiting the hot springs,\n" + .string "you got the LAVARIDGE GYM BADGE.\p" + .string "You must have caught good POKéMON...\n" + .string "No, I guess you raised some.\p" + .string "I guess it would be okay for you to\n" + .string "have this.$" LavaridgeTown_Text_16BE7D:: @ 816BE7D - .string "MAIKE: Mit diesem WÜSTENGLAS wirst du\n" - .string "keine Probleme haben, durch die Wüste in\l" - .string "der Nähe von ROUTE 111 zu gehen.\p" - .string "Aber, wow, {PLAYER}{KUN}...\n" - .string "In ARENEN antreten...\p" - .string "Du strengst dich bestimmt sehr an, weil\n" - .string "du nicht gegen mich verlieren willst!\p" - .string "{PLAYER}{KUN}, ich glaube, ich sollte deinen\n" - .string "Vater in der ARENA von BLÜTENBURG\l" - .string "CITY herausfordern.\p" - .string "{PLAYER}{KUN}, man sieht sich!$" + .string "MAY: With those GO-GOGGLES, you’ll\n" + .string "have no trouble getting through the\l" + .string "desert near ROUTE 111.\p" + .string "But, wow, {PLAYER}{KUN}...\n" + .string "Challenging GYMS...\p" + .string "You’re trying hard because you don’t\n" + .string "want to lose to me, I bet!\p" + .string "{PLAYER}{KUN}, I think I should challenge\n" + .string "your dad in PETALBURG GYM.\p" + .string "{PLAYER}{KUN}, see you again!$" LavaridgeTown_Text_16BF92:: @ 816BF92 - .string "BRIX: {PLAYER}, wie geht es dir?\p" - .string "Hmm... Das ist eine beachtliche\n" - .string "Sammlung von ORDEN.\p" - .string "Also gut.\n" - .string "Hier, dies schenke ich dir.$" + .string "BRENDAN: {PLAYER}, hey, it’s been a while.\n" + .string "How’s it going?\p" + .string "Hmm...\n" + .string "That’s a decent collection of BADGES.\p" + .string "All right, then.\n" + .string "You may as well have this.$" LavaridgeTown_Text_16C020:: @ 816C020 - .string "BRIX: Nimm das mit, wenn du in die\n" - .string "Wüste in der Nähe von ROUTE 111 willst.\p" - .string "Da sollten sich einige POKéMON fangen\n" - .string "lassen, die Wüstenbewohner sind. Schau\l" - .string "dich nach ihnen um.\p" - .string "Und ich...\n" - .string "Ich werde wohl NORMAN, den ARENALEITER\l" - .string "in BLÜTENBURG CITY herausfordern.\p" - .string "Im Gegensatz zu dir, macht dein Vater\n" - .string "einen sehr starken Eindruck.\p" - .string "Man sieht sich!$" + .string "BRENDAN: Keep those with you if you’re\n" + .string "planning on going into that desert near\l" + .string "ROUTE 111.\p" + .string "There should be some POKéMON that\n" + .string "are exclusively desert-dwellers.\l" + .string "You might look around for those.\p" + .string "As for me...\n" + .string "I’m considering challenging NORMAN,\l" + .string "the GYM LEADER of PETALBURG.\p" + .string "Unlike you, {PLAYER}, your dad looks like\n" + .string "he really is tough.\p" + .string "See you around!$" LavaridgeTown_Text_16C174:: @ 816C174 - .string "Ich habe hier ein EI.\p" - .string "Ich dachte, ich könnte es ausbrüten,\n" - .string "indem ich es in den heißen Sand bei den\p" - .string "Heißen Quellen vergrabe. Aber das reicht\n" - .string "offensichtlich nicht aus.\p" - .string "Jemand erzählte mir, dass man es\n" - .string "zusammen mit den POKéMON tragen\l" - .string "soll.\p" - .string "Du bist ein TRAINER, nicht wahr? Und\n" - .string "deine POKéMON strahlen Vitalität aus.\p" - .string "So, was meinst du? Wirst du das EI mit-\n" - .string "nehmen und zum Ausschlüpfen bringen?$" + .string "I have here an EGG.\p" + .string "I’d hoped to hatch it by covering it in\n" + .string "hot sand by the hot springs.\l" + .string "But that doesn’t seem to be enough...\p" + .string "I’ve heard it would be best if it were\n" + .string "kept together with POKéMON and\l" + .string "carried about.\p" + .string "You are a TRAINER, yes?\n" + .string "And your POKéMON radiate vitality.\p" + .string "So, what say you?\n" + .string "Will you take this EGG to hatch?$" LavaridgeTown_Text_16C2B6:: @ 816C2B6 - .string "Gut! Ich hoffe, du hast mehr Glück\n" - .string "mit diesem EI!$" + .string "Good! I hope you’ll walk plenty with\n" + .string "this here EGG!$" LavaridgeTown_Text_16C2EA:: @ 816C2EA - .string "{PLAYER} erhält ein EI.$" + .string "{PLAYER} received the EGG.$" LavaridgeTown_Text_16C2FF:: @ 816C2FF - .string "Oh! Du hast zu viele POKéMON dabei.\n" - .string "Du hast keinen Platz für das EI...$" + .string "Oh? You’ve too many POKéMON.\n" + .string "There’s no room for this EGG...$" LavaridgeTown_Text_16C33C:: @ 816C33C - .string "Ganz, wie du willst...\p" - .string "Wenn dein Herz sich anders entscheidet\n" - .string "und das EI haben möchte, ich bin hier.$" + .string "As you wish, then...\p" + .string "If you have a change of heart about\n" + .string "hatching this EGG, I will be here.$" LavaridgeTown_Text_16C398:: @ 816C398 - .string "Von Zeit zu Zeit findet man in der\n" - .string "PENSION ein EI.\p" - .string "So zumindest erzählt man es sich.$" + .string "Every so often, an EGG will be found at\n" + .string "the POKéMON DAY CARE.\p" + .string "Or at least that’s how the rumor goes.$" LavaridgeTown_Text_16C3FD:: @ 816C3FD - .string "Wir nehmen uns so viel heißes Wasser,\n" - .string "wie wir brauchen, und trotzdem trocknen\l" - .string "die Heißen Quellen nicht aus.\p" - .string "Ist das nicht schon fast Magie?\p" - .string "Diese Heißen Quellen bilden sich in der\n" - .string "Nähe von aktiven Vulkanen. Wasseradern\l" - .string "im Boden werden durch das Magma\l" - .string "erhitzt und kommen als heiße Quellen\l" - .string "an die Erdoberfläche.$" + .string "We draw as much hot water as we need,\n" + .string "and yet the hot springs never run dry.\p" + .string "Isn’t it magical?\p" + .string "These hot springs appear near active\n" + .string "volcanoes. Veins of water under the\l" + .string "ground are heated by magma to well up\l" + .string "as hot springs.$" LavaridgeTown_Text_16C4DB:: @ 816C4DB - .string "Hier im heißen Sand vergraben zu sein,\n" - .string "ist... Seufz...\p" - .string "So warm und einfach himmlisch... Seufz...\p" - .string "Äh? Gyaah! Aua!\p" - .string "Ein POKéMON hat meinen Rücken ange-\n" - .string "knabbert!$" + .string "Being buried in this hot sand is...\n" + .string "Sigh...\p" + .string "So warm and heavenly...\p" + .string "Eh? Gyaah! Ouch!\p" + .string "A POKéMON nipped my backside!$" LavaridgeTown_Text_16C54E:: @ 816C54E - .string "Ach, du magst auch heiße Quellen?\p" - .string "Das ist überraschend bei einem so\n" - .string "jungen Menschen wie dir.$" + .string "Oh, you like hot springs, do you?\p" + .string "That’s surprising for one as young\n" + .string "as you.$" LavaridgeTown_Text_16C59B:: @ 816C59B - .string "Ich bade jeden Tag in den\n" - .string "Heißen Quellen.\p" - .string "Ich will ein wunderschöner und starker\n" - .string "ARENALEITER wie FLAVIA werden.$" + .string "I bathe in the hot springs every day.\p" + .string "I want to become a beautiful and strong\n" + .string "GYM LEADER like FLANNERY.$" LavaridgeTown_Text_16C603:: @ 816C603 - .string "Wenn Leute ihre POKéMON in die Heißen\n" - .string "Quellen setzen, ist das schon\l" - .string "merkwürdig.\p" - .string "Nun, es könnte auch ein Bad in\n" - .string "Elektrizität, ein Schaumbad oder sogar\l" - .string "ein Bad in Lava sein...$" + .string "If people put POKéMON in hot springs,\n" + .string "it might be seriously strange.\p" + .string "Why, it might be an electric bath, or\n" + .string "a bubble bath, or even a lava bath...$" LavaridgeTown_Text_16C694:: @ 816C694 - .string "Man sagt, diese Heißen Quellen seien gut\n" - .string "gegen nervöse Anspannungen, gegen\l" - .string "Muskelkrämpfe, sie sollen bei roman-\l" - .string "tischen Problemen helfen und auch bei\l" - .string "Geldsorgen...$" + .string "They’re claiming that these hot springs\n" + .string "are good for calming nervous tension,\l" + .string "relieving aching muscles, solving\l" + .string "romantic problems, and attracting\l" + .string "money...$" LavaridgeTown_Text_16C72F:: @ 816C72F - .string "BAD LAVASTADT\p" - .string "“POKéMON-CENTER - HEISSE QUELLEN\n" - .string "Der ideale Ort zum Entspannen!”$" + .string "LAVARIDGE TOWN\p" + .string "“POKéMON CENTER HOT SPRINGS\n" + .string "An excellent place for relaxing!”$" LavaridgeTown_Text_16C77C:: @ 816C77C - .string "POKéMON ARENA von BAD LAVASTADT\n" - .string "LEITERIN: FLAVIA\l" - .string "“Die mit der brennenden Leidenschaft!”$" + .string "LAVARIDGE TOWN POKéMON GYM\n" + .string "LEADER: FLANNERY\l" + .string "“One with a fiery passion that burns!”$" LavaridgeTown_Text_16C7CF:: @ 816C7CF - .string "POKéMON KRÄUTERLADEN\n" - .string "“Bitterer Geschmack - Bessere Kur!”$" + .string "POKéMON HERB SHOP\n" + .string "“Bitter taste - better cure!”$" diff --git a/data/text/maps/LavaridgeTown_Gym_1F.inc b/data/text/maps/LavaridgeTown_Gym_1F.inc index cb2eca809..87ec05632 100644 --- a/data/text/maps/LavaridgeTown_Gym_1F.inc +++ b/data/text/maps/LavaridgeTown_Gym_1F.inc @@ -1,144 +1,140 @@ LavaridgeTown_Gym_1F_Text_176312:: @ 8176312 - .string "Na, wie sieht es aus, auf dem Weg zum\n" - .string "CHAMP, {PLAYER}?\p" - .string "Die ARENALEITERIN von BAD LAVA-\n" - .string "STADT, FLAVIA, setzt FEUER-POKéMON\l" - .string "ein.\p" - .string "Ihre Leidenschaft für POKéMON brennt\n" - .string "heißer und stärker als ein Vulkan.\p" - .string "Komm ihr nicht zu nahe - du verbrennst\n" - .string "dich! Lösche die Glut mit Wasser und\l" - .string "dann besiege sie!$" + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "LAVARIDGE’s GYM LEADER FLANNERY\n" + .string "uses FIRE-type POKéMON.\p" + .string "Her passion for POKéMON burns stronger\n" + .string "and hotter than a volcano.\p" + .string "Don’t get too close to her - you’ll burn!\n" + .string "Hose her down with water and then\l" + .string "go for it!$" LavaridgeTown_Gym_1F_Text_17640C:: @ 817640C - .string "Hui! Das war ein glühend heißer Kampf!$" + .string "Yow! That was a scorching hot battle!$" LavaridgeTown_Gym_1F_Text_176432:: @ 8176432 - .string "Auauauauau!\n" - .string "Hach, ist das heiß!$" + .string "Owowowowow!\n" + .string "Yikes, it’s hot!$" LavaridgeTown_Gym_1F_Text_17644F:: @ 817644F - .string "Der Schweiß lief mir in die Augen...$" + .string "I’m blinded by sweat in my eyes...$" LavaridgeTown_Gym_1F_Text_176472:: @ 8176472 - .string "Ein Bad im heißen Sand regt den\n" - .string "Kreislauf an.\p" - .string "Auch Gelenkschmerzen lassen sich damit\n" - .string "kurieren.$" + .string "Being buried in hot sand promotes\n" + .string "circulation.\p" + .string "It’s effective for healing pain in\n" + .string "your joints.$" LavaridgeTown_Gym_1F_Text_1764D1:: @ 81764D1 - .string "Ich versuche, Stress abzubauen.\n" - .string "Komm her. Ich will mich abreagieren.$" + .string "I’m trying to relieve my stress.\n" + .string "Don’t come along and stress me out!$" LavaridgeTown_Gym_1F_Text_176516:: @ 8176516 - .string "Ich hoffe, FLAVIA wird dich rösten!$" + .string "I hope FLANNERY flames you good!$" LavaridgeTown_Gym_1F_Text_176537:: @ 8176537 - .string "Haaah... Huuuuh...\p" - .string "Bleibt man zu lange im heißen Sand,\n" - .string "macht einen das ganz schön fertig.$" + .string "Haaah... Whew...\p" + .string "If you spend too much time buried in\n" + .string "hot sand, it tuckers you out...$" LavaridgeTown_Gym_1F_Text_17658D:: @ 817658D - .string "Du musst ganz schön müde sein.\n" - .string "Willst du dich nicht hier im heißen\l" - .string "Sand ausruhen?\p" - .string "Aber du solltest wissen, dass\n" - .string "Willenskraft ganz wichtig für einen\l" - .string "TRAINER ist.$" + .string "You must be getting tired by now.\n" + .string "You’d like to rest in the hot sand,\l" + .string "wouldn’t you?\p" + .string "But you should know that maintaining\n" + .string "your willpower is an important ability\l" + .string "for all TRAINERS.$" LavaridgeTown_Gym_1F_Text_17663F:: @ 817663F - .string "Spiele mit Feuer und du verbrennst dich.$" + .string "Play with fire, and be burned...$" LavaridgeTown_Gym_1F_Text_176660:: @ 8176660 - .string "Dein Können ist gut... Aber unsere\n" - .string "LEITERIN FLAVIA ist stark.\p" - .string "Wenn du nicht aufpasst, verbrennst\n" - .string "du dich ernsthaft.$" + .string "Your skill is real...\n" + .string "But our LEADER FLANNERY is strong.\p" + .string "If you don’t watch yourself, you’ll be\n" + .string "burned seriously.$" LavaridgeTown_Gym_1F_Text_1766D2:: @ 81766D2 - .string "Kann dein POKéMON 200 Grad aushalten?$" + .string "Can your POKéMON withstand\n" + .string "392-degree heat?$" LavaridgeTown_Gym_1F_Text_1766FE:: @ 81766FE - .string "Die Hitze war nicht stark genug...$" + .string "It didn’t burn hotly enough...$" LavaridgeTown_Gym_1F_Text_17671D:: @ 817671D - .string "Die Temperatur von Magma beträgt\n" - .string "über 200 Grad.\p" - .string "Deine POKéMON haben mich besiegt, sie\n" - .string "sollten auch in Magma überleben können.$" + .string "The temperature of magma is\n" + .string "392 degrees.\p" + .string "Your POKéMON beat me, so they should\n" + .string "easily survive in magma.$" LavaridgeTown_Gym_1F_Text_176784:: @ 8176784 - .string "Ähm...\n" - .string "Okay, ich kämpfe mit dir.$" + .string "Um...\n" + .string "Okay, I’ll battle with you.$" LavaridgeTown_Gym_1F_Text_1767A6:: @ 81767A6 - .string "Oh, du bist zu stark.$" + .string "Oh, but you’re too strong.$" LavaridgeTown_Gym_1F_Text_1767C1:: @ 81767C1 - .string "Ich will einmal so eine starke TRAINERIN\n" - .string "werden wie FLAVIA.$" + .string "I’m going to be a pretty and strong\n" + .string "TRAINER just like FLANNERY.$" LavaridgeTown_Gym_1F_Text_176801:: @ 8176801 - .string "Willkommen... Halt, warte!\p" - .string "Hallo, du Winzling von TRAINER, wie\n" - .string "schön, dich hier zu sehen!\p" - .string "Ich bin verantwortlich für, äh...\n" - .string "Nein, warte.\p" - .string "Ich bin FLAVIA und ich bin die ARENA-\n" - .string "LEITERIN hier!\p" - .string "Äh... Du solltest mich nicht\n" - .string "unterschätzen, nur weil ich noch nicht\l" - .string "so lange LEITERIN bin!\p" - .string "Ich habe das Talent meines Großvaters\n" - .string "geerbt und daher... äh... kann ich dir die\l" - .string "heißen Attacken zeigen, die wir hier\l" - .string "entwickelt haben!$" + .string "Welcome... No, wait.\p" + .string "Puny TRAINER, how good to see you’ve\n" + .string "made it here!\p" + .string "I have been entrusted with the...\n" + .string "No, wait.\p" + .string "I am FLANNERY, and I’m the GYM\n" + .string "LEADER here!\p" + .string "Uh...\n" + .string "Dare not underestimate me, though\l" + .string "I have been LEADER only a short time!\p" + .string "With skills inherited from my grand-\n" + .string "father, I shall, uh...demonstrate the\l" + .string "hot moves we have honed on this land!$" LavaridgeTown_Gym_1F_Text_176960:: @ 8176960 - .string "Äh...\n" - .string "Ich glaube, ich habe es übertrieben...\p" - .string "Ich... Ich bin ja auch noch nicht lange\n" - .string "ARENALEITERIN!\p" - .string "Ich habe zu sehr versucht, jemand zu\n" - .string "sein, der ich gar nicht bin.\p" - .string "Ich muss die Dinge auf meine eigene Art\n" - .string "angehen. Sonst verwirre ich nur meine\l" - .string "POKéMON.\p" - .string "Danke, dass du mich das gelehrt hast!\n" - .string "Du hast dir das hier wohl verdient!$" + .string "Oh...\n" + .string "I guess I was trying too hard...\p" + .string "I... I’ve only recently become a GYM\n" + .string "LEADER.\p" + .string "I tried too hard to be someone I’m not.\p" + .string "I have to do things my natural way.\n" + .string "If I don’t, my POKéMON will be confused.\p" + .string "Thanks for teaching me that.\n" + .string "For that, you deserve this.$" LavaridgeTown_Gym_1F_Text_176A62:: @ 8176A62 - .string "{PLAYER} erhält den HITZEORDEN\n" - .string "von FLAVIA.$" + .string "{PLAYER} received the HEAT BADGE\n" + .string "from FLANNERY.$" LavaridgeTown_Gym_1F_Text_176A8C:: @ 8176A8C - .string "Mit dem HITZEORDEN gehorchen dir alle\n" - .string "POKéMON bis Level 50, auch die, die du\l" - .string "durch Tausch erhalten hast.\p" - .string "Und du kannst ab sofort STÄRKE auch\n" - .string "außerhalb eines Kampfes einsetzen.\p" - .string "Dies ist das Zeichen meiner\n" - .string "Anerkennung. Nimm es ruhig an!$" + .string "If you have a HEAT BADGE, all POKéMON\n" + .string "up to Level 50, even those you get in\l" + .string "trades from other people, will obey\l" + .string "you completely.\p" + .string "And, it lets POKéMON use the HM move\n" + .string "STRENGTH outside of battle.\p" + .string "This is a token of my appreciation.\n" + .string "Don’t be shy about taking it!$" LavaridgeTown_Gym_1F_Text_176B8F:: @ 8176B8F - .string "Die TM50 enthält HITZEKOLLER.\p" - .string "Diese Attacke richtet beim Gegner\n" - .string "großen Schaden an.\p" - .string "Aber gleichzeitig wird der SP. ANG.\n" - .string "des POKéMON, das die Attacke\p" - .string "anwendet, herabgesetzt. Für längere\n" - .string "Kämpfe ist sie daher nicht geeignet.$" + .string "That TM50 contains OVERHEAT.\p" + .string "That move inflicts serious damage on\n" + .string "the opponent.\p" + .string "But it also sharply cuts the SP. ATK\n" + .string "of the POKéMON using it. It might not\l" + .string "be suitable for longer battles.$" LavaridgeTown_Gym_1F_Text_176C4A:: @ 8176C4A - .string "Deine Stärke erinnert mich an\n" - .string "jemanden...\p" - .string "Jetzt weiß ich’s! Du kämpfst wie NORMAN,\n" - .string "der ARENALEITER von BLÜTENBURG CITY.$" + .string "Your power reminds me of someone...\p" + .string "Oh! I know! You battle like NORMAN,\n" + .string "the GYM LEADER of PETALBURG.$" LavaridgeTown_Gym_1F_Text_176CAF:: @ 8176CAF - .string "POKéMON ARENA von BAD LAVASTADT$" + .string "LAVARIDGE TOWN POKéMON GYM$" LavaridgeTown_Gym_1F_Text_176CCA:: @ 8176CCA - .string "POKéMON ARENA von BAD LAVASTADT\p" - .string "FLAVIAS ANERKANNTE TRAINER:\n" + .string "LAVARIDGE TOWN POKéMON GYM\p" + .string "FLANNERY’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/LavaridgeTown_HerbShop.inc b/data/text/maps/LavaridgeTown_HerbShop.inc index 612d4e9a4..893d3399f 100644 --- a/data/text/maps/LavaridgeTown_HerbShop.inc +++ b/data/text/maps/LavaridgeTown_HerbShop.inc @@ -1,21 +1,22 @@ LavaridgeTown_HerbShop_Text_17615C:: @ 817615C - .string "Willkommen im KRÄUTERLADEN! Dem Heim\n" - .string "wirkungsvoller und preiswerter Medizin!$" + .string "Welcome to the HERB SHOP, home of\n" + .string "effective and inexpensive medicine!$" LavaridgeTown_HerbShop_Text_1761A2:: @ 81761A2 - .string "Du kommst nach BAD LAVASTADT, um\n" - .string "Kräutermedizin zu kaufen?\p" - .string "Das ist lobenswert!\p" - .string "Ich finde dich nett! Hier, für dich!$" + .string "You’ve come to look at herbal medicine\n" + .string "in LAVARIDGE?\p" + .string "That’s rather commendable.\p" + .string "I like you! Take this!$" LavaridgeTown_HerbShop_Text_176209:: @ 8176209 - .string "Mit dieser HOLZKOHLE wird die Kräuter-\n" - .string "medizin hergestellt.\p" - .string "Sie wirkt auch Wunder, wenn sie von\n" - .string "einem POKéMON getragen wird.\p" - .string "Sie verstärkt FEUER-Attacken.$" + .string "That CHARCOAL I gave you, it’s used\n" + .string "for making herbal medicine.\p" + .string "It also does wonders when held by\n" + .string "a POKéMON.\p" + .string "It intensifies the power of FIRE-type\n" + .string "moves.$" LavaridgeTown_HerbShop_Text_1762A3:: @ 81762A3 - .string "Kräutermedizin ist erstaunlich\n" - .string "wirkungsvoll. Aber deine POKéMON mögen\l" - .string "sie nicht. Sie schmeckt bitter...$" + .string "Herbal medicine works impressively well.\n" + .string "But your POKéMON will dislike you for it.\l" + .string "It must be horribly bitter!$" diff --git a/data/text/maps/LavaridgeTown_House.inc b/data/text/maps/LavaridgeTown_House.inc index 6a6a3663c..9710d9398 100644 --- a/data/text/maps/LavaridgeTown_House.inc +++ b/data/text/maps/LavaridgeTown_House.inc @@ -1,9 +1,8 @@ LavaridgeTown_House_Text_176D07:: @ 8176D07 - .string "Meine Frau wärmt ein EI in den Heißen\n" - .string "Quellen. So hat sie es mir jedenfalls\l" - .string "gesagt.\p" - .string "Sie hat zwei POKéMON in der PENSION\n" - .string "abgegeben und heraus kam ein EI...$" + .string "My wife’s warming an EGG in the hot\n" + .string "springs. This is what she told me.\p" + .string "She left two POKéMON with the DAY CARE.\n" + .string "And they discovered that EGG!$" LavaridgeTown_House_Text_176D94:: @ 8176D94 - .string "ZIGZACHS: Pshoo!$" + .string "ZIGZAGOON: Pshoo!$" diff --git a/data/text/maps/LavaridgeTown_Mart.inc b/data/text/maps/LavaridgeTown_Mart.inc index fc957492c..db79bd321 100644 --- a/data/text/maps/LavaridgeTown_Mart.inc +++ b/data/text/maps/LavaridgeTown_Mart.inc @@ -1,12 +1,10 @@ LavaridgeTown_Mart_Text_176DA6:: @ 8176DA6 - .string "Mit X-TEMPO kannst du die INITIATIVE\n" - .string "im Kampf erhöhen.\p" - .string "So kann man eventuell den ersten\n" - .string "Angriff ausführen - ein entscheidender\l" - .string "Vorteil!$" + .string "Use X SPEED to add to a POKéMON’s\n" + .string "SPEED in battle.\p" + .string "That will help it get in the first\n" + .string "strike - a decided advantage!$" LavaridgeTown_Mart_Text_176E1A:: @ 8176E1A - .string "Auf dem Gipfel des SCHLOTBERGS wird\n" - .string "eine lokale Spezialität angeboten.\p" - .string "Gib sie einem POKéMON und es wird\n" - .string "begeistert sein.$" + .string "On MT. CHIMNEY’s peak, there’s a local\n" + .string "specialty that you can buy only there.\p" + .string "Give it to a POKéMON - it will be elated.$" diff --git a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc index e0425c1ee..c66d6df8a 100644 --- a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -1,18 +1,17 @@ LavaridgeTown_PokemonCenter_1F_Text_176E92:: @ 8176E92 - .string "Ich denke, die POKéMON fühlen sich\n" - .string "ihrem TRAINER mehr verbunden, wenn sie\l" - .string "viel Zeit miteinander verbringen.\p" - .string "Je länger, desto besser.\n" - .string "Das ist meine Meinung.$" + .string "I think POKéMON get closer to their\n" + .string "TRAINERS if they spend time together.\p" + .string "The longer the better.\n" + .string "That’s what I think.$" LavaridgeTown_PokemonCenter_1F_Text_176F08:: @ 8176F08 - .string "Ich habe meinem POKéMON einen {POKEBLOCK}\n" - .string "ROT gegeben. Seitdem ist es cooler.\p" - .string "Hmm... Vielleicht sollte ich auch einen\n" - .string "{POKEBLOCK} ROT essen...$" + .string "I gave a RED {POKEBLOCK} to my POKéMON.\n" + .string "It looks a lot cooler all of a sudden.\p" + .string "Hmm...\n" + .string "Maybe I ought to eat a RED {POKEBLOCK}.$" LavaridgeTown_PokemonCenter_1F_Text_176F7A:: @ 8176F7A - .string "Hohoho! Hey, Kindchen, du kannst von\n" - .string "hier die Heißen Quellen erreichen.\p" - .string "Wenn POKéMON ausruhen, sollten sich\n" - .string "ihre TRAINER auch ausruhen.$" + .string "Hohoho! Hey, kid, you can reach\n" + .string "the hot springs from here.\p" + .string "If POKéMON are getting rest, so too\n" + .string "should their TRAINERS.$" diff --git a/data/text/maps/LilycoveCity.inc b/data/text/maps/LilycoveCity.inc index eb11d39b5..0f9b45c1d 100644 --- a/data/text/maps/LilycoveCity.inc +++ b/data/text/maps/LilycoveCity.inc @@ -1,313 +1,301 @@ LilycoveCity_Text_1679BF:: @ 81679BF - .string "MAIKE: Oh, hey?\n" - .string "{PLAYER}{KUN}, bist du auch am Einkaufen?\p" - .string "Ich habe eine Menge PUPPEN und POSTER\n" - .string "gekauft.\p" - .string "Natürlich habe ich auch POKéMON\n" - .string "gefangen und die ziehe ich geradezu\l" - .string "vorbildlich auf.\p" - .string "Ich habe eher Bedenken, dass du dich um\n" - .string "deine POKéMON nicht richtig kümmerst.\p" - .string "Ich werde gegen dich kämpfen, dann\n" - .string "sehe ich, ob du sie gut behandelst.$" + .string "MAY: Oh, hey?\n" + .string "{PLAYER}{KUN}, are you shopping, too?\p" + .string "I bought a whole bunch of DOLLS and\n" + .string "POSTERS.\p" + .string "Of course, I’ve also caught a lot of\n" + .string "POKéMON, and I’m raising them\l" + .string "properly, too.\p" + .string "Actually, I’m more worried if you’re\n" + .string "raising POKéMON properly, {PLAYER}{KUN}.\p" + .string "I’ll battle with you, so you can show\n" + .string "me your POKéMON, {PLAYER}{KUN}.$" LilycoveCity_Text_167AEB:: @ 8167AEB - .string "MAIKE: Oh, hui. Hast du dich denn nicht\n" - .string "um deine POKéMON gekümmert, {PLAYER}{KUN}?\p" - .string "Als Trainer machst du wirklich keinen\n" - .string "guten Eindruck!$" + .string "MAY: Oh, why? {PLAYER}{KUN}, haven’t you\n" + .string "been raising your POKéMON?\p" + .string "That’s not a very good showing as a\n" + .string "TRAINER...$" LilycoveCity_Text_167B55:: @ 8167B55 - .string "MAIKE: Komm, kämpfe mit mir, dann kann\n" - .string "ich deine POKéMON beurteilen.$" + .string "MAY: Come on, battle with me, so I can\n" + .string "check out your POKéMON!$" LilycoveCity_Text_167B94:: @ 8167B94 - .string "MAIKE: Die POKéMON, die ich aufgezogen\n" - .string "habe, sind mit Sicherheit unbesiegbar.$" + .string "MAY: The POKéMON I raised won’t be\n" + .string "beaten by your POKéMON, {PLAYER}{KUN}!$" LilycoveCity_Text_167BD5:: @ 8167BD5 .string "... ... ... ... ... ... ... ...\p" - .string "Ich kann mich noch gut an unseren\n" - .string "Kampf auf der ROUTE 103 erinnern,\l" - .string "{PLAYER}{KUN}.\p" - .string "Dieser Kampf hat dir enorm geholfen,\n" - .string "stärker zu werden, oder?$" + .string "I remember the battle I had with you,\n" + .string "{PLAYER}{KUN}, on ROUTE 103.\p" + .string "That battle helped you become this\n" + .string "strong, {PLAYER}{KUN}, didn’t it?$" LilycoveCity_Text_167C6B:: @ 8167C6B - .string "MAIKE: Ich überlege, ob ich bald nach\n" - .string "WURZELHEIM zurückgehe.\p" - .string "Ich habe eine anständige Gruppe von\n" - .string "POKéMON gefangen und mein POKéDEX\p" - .string "sieht immer besser aus. Ich gehe nach\n" - .string "Hause und zeige das meinem Papa.$" + .string "MAY: I’m thinking of going back to\n" + .string "LITTLEROOT soon.\p" + .string "I’ve caught a decent group of POKéMON,\n" + .string "and my POKéDEX is coming along, so\l" + .string "I’m going home to show my dad.$" LilycoveCity_Text_167D08:: @ 8167D08 - .string "{PLAYER}{KUN}, was wirst du machen?\p" - .string "Alle ORDEN der ARENEN sammeln und die\n" - .string "POKéMON LIGA herausfordern?\p" - .string "Nun, während du deine ORDEN sammelst,\n" - .string "werde ich weiter an meinem POKéDEX\l" - .string "arbeiten. Ich werde ihn eher vollständig\l" - .string "haben als du, wetten?\p" - .string "Bis dann!$" + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Collect all the GYM BADGES and take\n" + .string "the POKéMON LEAGUE challenge?\p" + .string "Well, while you’re collecting BADGES,\n" + .string "{PLAYER}{KUN}, I’m going to work on my\l" + .string "POKéDEX. I’ll complete it before you!\p" + .string "See you!$" LilycoveCity_Text_167DDD:: @ 8167DDD - .string "Und, {PLAYER}{KUN}, was wirst du machen?\p" - .string "Wirst du die POKéMON LIGA heraus-\n" - .string "fordern?\p" - .string "Oder wirst du deinen POKéDEX vervoll-\n" - .string "ständigen?\p" - .string "Ich habe gegen dich verloren, aber den\n" - .string "POKéDEX werde ich eher vollständig\l" - .string "haben als du!!\p" - .string "Man sieht sich!$" + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Are you taking the POKéMON LEAGUE\n" + .string "challenge?\p" + .string "Or, are you going to complete your\n" + .string "POKéDEX?\p" + .string "I might’ve lost to you in battling,\n" + .string "but I’ll finish my POKéDEX before you!\p" + .string "See you!$" LilycoveCity_Text_167EAA:: @ 8167EAA - .string "Und, {PLAYER}{KUN}, was wirst du machen?\p" - .string "Wirst du im DUELLTURM antreten?\p" - .string "Oder wirst du deinen POKéDEX vervoll-\n" - .string "ständigen?\p" - .string "Ich habe gegen dich verloren, aber den\n" - .string "POKéDEX werde ich eher vollständig\l" - .string "haben als du!\p" - .string "Man sieht sich!$" + .string "{PLAYER}{KUN}, what are you going to do?\p" + .string "Are you taking the BATTLE TOWER\n" + .string "challenge?\p" + .string "Or, are you going to complete your\n" + .string "POKéDEX?\p" + .string "I might’ve lost to you in battling,\n" + .string "but I’ll finish my POKéDEX before you!\p" + .string "See you!$" LilycoveCity_Text_167F75:: @ 8167F75 - .string "BRIX: Oh, du bist es, {PLAYER}.\p" - .string "Ich mache Besorgungen für meinen\n" - .string "Vater. Nein, ich kaufe keine PUPPEN!\p" - .string "Wir haben uns lange nicht mehr gesehen.\p" - .string "Sollen wir kämpfen, um zu sehen, wer\n" - .string "seine POKéMON besser trainiert?$" + .string "BRENDAN: Oh, hey, it’s {PLAYER}.\p" + .string "I’m running an errand for my dad.\n" + .string "No, I’m not buying any DOLLS.\p" + .string "Anyways, it’s been a while.\p" + .string "Want to have a battle to see who’s been\n" + .string "raising POKéMON better?$" LilycoveCity_Text_16802C:: @ 816802C - .string "BRIX: Oh, hast du ein Problem? Nicht\n" - .string "genügend Selbstbewusstsein, was?$" + .string "BRENDAN: Oh, what’s the matter?\n" + .string "Don’t have the confidence?$" LilycoveCity_Text_168067:: @ 8168067 - .string "BRIX: Sollen wir kämpfen, um zu\n" - .string "sehen, wer seine POKéMON besser\l" - .string "trainiert?$" + .string "BRENDAN: Want to battle to see who’s\n" + .string "been raising POKéMON better?$" LilycoveCity_Text_1680A9:: @ 81680A9 - .string "BRIX: Aah, ich werde doch nicht\n" - .string "gegen {PLAYER} verlieren! Niemals!$" + .string "BRENDAN: Aww, but you know I’m not\n" + .string "going to lose to no {PLAYER}.$" LilycoveCity_Text_1680E4:: @ 81680E4 - .string "Ach...\n" - .string "Du hast dich stark verbessert.\p" - .string "Das schmerzt - und dabei hatte ich als\n" - .string "TRAINER sogar einen Vorsprung...$" + .string "Humph...\n" + .string "You’ve done a lot of raising.\p" + .string "That stings a bit - I had a head start\n" + .string "on you as a TRAINER...$" LilycoveCity_Text_168149:: @ 8168149 - .string "BRIX: Ich...\n" - .string "Ich gehe nach Hause, nach WURZELHEIM.\p" - .string "Weißt du, ich helfe meinem Vater bei dem\n" - .string "POKéDEX. Es geht ganz anständig voran\l" - .string "und ich sollte ihm das mal zeigen.$" + .string "BRENDAN: I...\n" + .string "I plan on going home to LITTLEROOT.\p" + .string "You know I’m helping out my dad on his\n" + .string "POKéDEX. It’s coming together pretty\l" + .string "decently, so I should go show him.$" LilycoveCity_Text_1681EA:: @ 81681EA - .string "Und, {PLAYER}, was wirst du tun?\p" - .string "Wirst du alle ORDEN der ARENEN sammeln\n" - .string "und die POKéMON LIGA herausfordern?\p" - .string "Vielleicht werde ich das auch machen...\p" - .string "Gut, bleib am Ball!$" + .string "{PLAYER}, what are you going to do?\p" + .string "Collect all the GYM BADGES and take\n" + .string "the POKéMON LEAGUE challenge?\p" + .string "Maybe I’ll do that, too...\p" + .string "Well, anyway, hang in there!$" LilycoveCity_Text_168282:: @ 8168282 - .string "Und, {PLAYER}, was wirst du tun?\p" - .string "Da du so stark geworden bist, wirst du\n" - .string "die POKéMON LIGA herausfordern?\p" - .string "Hey, ich habe meine POKéMON bestimmt\n" - .string "viel besser trainiert und sollte\l" - .string "eigentlich stärker sein als du...\p" - .string "Nun ja, bleib am Ball!$" + .string "{PLAYER}, what are you going to do?\p" + .string "Since you’re that strong, are you\n" + .string "taking the POKéMON LEAGUE challenge?\p" + .string "Heh, even me - if I trained my POKéMON\n" + .string "a bit more, I should be stronger than\l" + .string "you, {PLAYER}.\p" + .string "Well, anyway, hang in there!$" LilycoveCity_Text_16835A:: @ 816835A - .string "Und, {PLAYER}, was machst du nun?\p" - .string "Da du so stark geworden bist, wirst du\n" - .string "zum DUELLTURM gehen?\p" - .string "Ich habe meine POKéMON viel besser\n" - .string "trainiert und sollte eigentlich stärker\l" - .string "sein als du...\l" - .string "Vielleicht gehe ich zum DUELLTURM...\p" - .string "Nun, bleib am Ball!$" + .string "{PLAYER}, what are you going to do?\p" + .string "Since you’re that strong, are you\n" + .string "taking the BATTLE TOWER challenge?\p" + .string "Heh, even me - if I trained my POKéMON\n" + .string "a bit more, I should be stronger than\l" + .string "you, {PLAYER}.\l" + .string "Maybe I will go to the BATTLE TOWER.\p" + .string "Well, anyway, hang in there!$" LilycoveCity_Text_168455:: @ 8168455 - .string "Hähähä...\p" - .string "Heute haben wir noch mehr Beute in\n" - .string "unser VERSTECK gebracht...\p" - .string "We...wer bist du denn??? Ich... äh, habe\n" - .string "mit mir selbst gesprochen!$" + .string "Fufufu...\p" + .string "We moved more loot into our secret\n" + .string "HIDEOUT today...\p" + .string "Wh-who are you?!\n" + .string "I was just talking to myself!$" LilycoveCity_Text_1684C2:: @ 81684C2 - .string "Ich bin nur ein RÜPEL, ich weiß nicht,\n" - .string "was unser BOSS so vorhat...\p" - .string "Aber als Mitglied vom TEAM {EVIL_TEAM} habe\n" - .string "ich die Möglichkeit, große Dinge zu tun!\p" - .string "Ww...wer bist du denn??? I-Ich... hähähä,\n" - .string "habe nur mit mir selber gesprochen!$" + .string "I’m just a GRUNT, so I don’t know what\n" + .string "the BOSS is thinking...\p" + .string "But being on TEAM {EVIL_TEAM}, I know I’ll get\n" + .string "the chance to do big things!\p" + .string "Wh-who are you?!\n" + .string "I was just talking to myself!$" LilycoveCity_Text_168573:: @ 8168573 - .string "Hey, du da!\p" - .string "Komm bloß nicht in die Nähe der Höhle in\n" - .string "der Bucht!\p" - .string "Warum nicht? Das geht dich nichts an!\n" - .string "Ich bin ein Erwachsener, also gehorche!$" + .string "Hey, you!\p" + .string "Don’t go near the cave in the cove!\p" + .string "Why? You don’t need a reason why!\n" + .string "I’m an adult, so you just listen to me!$" LilycoveCity_Text_1685EB:: @ 81685EB - .string "Wenn die ganze Welt erst einmal uns\n" - .string "gehört, dem TEAM {EVIL_TEAM}, dann wird sie\l" - .string "ein besserer Ort für POKéMON sein.$" + .string "If this whole wide world becomes ours,\n" + .string "TEAM {EVIL_TEAM}’s, it will be a happier\l" + .string "place for POKéMON, too.$" LilycoveCity_Text_16864A:: @ 816864A - .string "Hier, WAILMER!!!\n" - .string "Springt aus dem Wasser!$" + .string "There! WAILMER!\n" + .string "Leap out of the water now!$" LilycoveCity_Text_168675:: @ 8168675 - .string "Häh? Was willst du?\p" - .string "Du störst uns beim Training, also würde\n" - .string "ich vorschlagen, du verschwindest!$" + .string "Hunh? What do you want?\p" + .string "You’re messing up our training, so can\n" + .string "you, like, get lost?$" LilycoveCity_Text_1686C9:: @ 81686C9 - .string "Die POKéMON, die in diese WETTBEWERBS-\n" - .string "HALLE kommen, sind alle preisgekrönt.\l" - .string "Sie kommen aus dem ganzen Land.\p" - .string "Mein Herz strömt über vor Begeisterung!$" + .string "The POKéMON that come to this CONTEST\n" + .string "HALL are all prizewinners.\l" + .string "They come from all over the country.\p" + .string "My heart swells with excitement!$" LilycoveCity_Text_168750:: @ 8168750 - .string "Hast du die seltsame Höhle in der Bucht\n" - .string "am Ende des Ortes gesehen?$" + .string "Have you seen that strange cave in\n" + .string "the cove at the edge of town?$" LilycoveCity_Text_168791:: @ 8168791 - .string "Ich werde meinem POKéMON einige neue\n" - .string "Attacken für den WETTBEWERB\l" - .string "beibringen.\p" - .string "Daher werde ich den ATTACKEN-\n" - .string "VERLERNER besuchen, damit einige\l" - .string "VM verlernt werden.$" + .string "I’m going to teach my POKéMON some new\n" + .string "moves for entering a CONTEST.\p" + .string "So, I’m going to see the MOVE DELETER\n" + .string "and make it forget HM moves.$" LilycoveCity_Text_168819:: @ 8168819 - .string "Ich komme aus KANTO.\p" - .string "Die HOENN-Region ist wunderschön mit\n" - .string "all dem Wasser und dem Grün.\p" - .string "Hey, warte mal!\p" - .string "Ob es seltene POKéMON gibt, die nur in\n" - .string "dieser Region leben???$" + .string "I came from KANTO.\p" + .string "The HOENN region is beautiful with\n" + .string "all its water and verdant nature.\p" + .string "Hunh? Wait a second...\p" + .string "Could there be rare POKéMON that live\n" + .string "only in this area?$" LilycoveCity_Text_1688C1:: @ 81688C1 - .string "TEAM {EVIL_TEAM} trainieren ihre WAILMER\n" - .string "drüben in der Bucht.\p" - .string "Wir MATROSEN können nicht auslaufen,\n" - .string "da sie uns im Weg sind.$" + .string "TEAM {EVIL_TEAM}’s been training their\n" + .string "WAILMER in the cove.\p" + .string "We SAILORS can’t get our boats out\n" + .string "to sea with them in the way!$" LilycoveCity_Text_168934:: @ 8168934 - .string "Ahoi, hast du das mitbekommen?\p" - .string "Jemand hat für uns TEAM {EVIL_TEAM} aus\n" - .string "unserer Fahrrinne verjagt!\p" - .string "Die WAILMER befinden sich nicht mehr in\n" - .string "der Bucht und wir haben freie Fahrt.$" + .string "Ahoy, did you know?\p" + .string "Someone punted TEAM {EVIL_TEAM} out of the\n" + .string "way for us!\p" + .string "That got the WAILMER out of the cove,\n" + .string "so we can get our boats out again.$" LilycoveCity_Text_1689BF:: @ 81689BF - .string "Ich habe ein entspannendes Nickerchen\n" - .string "im Gasthof am Meer gehalten. Das\l" - .string "Rauschen der Wellen war so angenehm.\p" - .string "Und da hat mir jemand mein POKéMON\n" - .string "gestohlen!\p" - .string "Wer ist der schändliche Dieb?\n" - .string "TEAM {EVIL_TEAM}? Es war TEAM {EVIL_TEAM}?!?$" + .string "I was taking a relaxing snooze at the\n" + .string "seaside inn to the sound of waves...\p" + .string "When someone stole my POKéMON!\p" + .string "Who’s the abductor?\n" + .string "TEAM {EVIL_TEAM}? Is it TEAM {EVIL_TEAM}?$" LilycoveCity_Text_168A55:: @ 8168A55 - .string "Mein gestohlenes POKéMON...\n" - .string "Es kam zurück, ohne dass ich es merkte.$" + .string "My missing POKéMON...\n" + .string "It came back without me noticing!$" LilycoveCity_Text_168A8D:: @ 8168A8D - .string "Ich bin ein KUNSTHÄNDLER.\p" - .string "Ich kaufe und verkaufe Kunstgegen-\n" - .string "stände. Vorzugsweise Gemälde.\p" - .string "Ich habe gehört, dass das hiesige\n" - .string "MUSEUM ständig erstklassige Werke\l" - .string "ausstellt.$" + .string "I’m an ART DEALER.\p" + .string "I am a buyer and seller of fine art,\n" + .string "especially paintings.\p" + .string "I’ve heard that the MUSEUM here has\n" + .string "magnificent works on exhibit...$" LilycoveCity_Text_168B1F:: @ 8168B1F - .string "Auch wenn ich alt und grau werde, das\n" - .string "Meer wird immer jung und voll von Leben\l" - .string "sein...\p" - .string "Hahahahaha... Haaahahahaha...$" + .string "Even as we grow old and wrinkled, the\n" + .string "sea remains forever young with the\l" + .string "vivid brilliance of life...\p" + .string "Fwohoho fwohohohoho...$" LilycoveCity_Text_168B9B:: @ 8168B9B - .string "Vor 60 Jahren hat mein Mann hier um\n" - .string "meine Hand angehalten. Und das Meer\l" - .string "ist immer noch genauso schön.\p" - .string "Hahahahaha... Haaahahahaha...$" + .string "It was sixty years ago that my husband\n" + .string "proposed to me here.\l" + .string "The sea remains as beautiful as ever.\p" + .string "Mufufufu mufufufufufu...$" LilycoveCity_Text_168C16:: @ 8168C16 - .string "Hm, kennst du diese besondere Höhle in\n" - .string "der Bucht?\p" - .string "Das ist eine natürlich Formation, aber\n" - .string "TEAM {EVIL_TEAM} kam und hat das Aussehen\l" - .string "verändert.\p" - .string "Sie nennen sich selber “Naturliebendes\n" + .string "Hm, you know of the peculiar cavern\n" + .string "in this cove?\p" + .string "That had been a natural formation, but\n" + .string "then that TEAM {EVIL_TEAM} lot came along\l" + .string "and made their renovations.\p" + .string "They call themselves the “nature-loving\n" .string "TEAM {EVIL_TEAM}”!\p" - .string "Aber was sie sagen und was sie tun,\n" - .string "passt überhaupt nicht zusammen!$" + .string "But what they do and what they say\n" + .string "don’t match at all!$" LilycoveCity_Text_168D15:: @ 8168D15 - .string "Die Höhle in der Bucht...\n" - .string "Jemand scheint den Eingang versiegelt\l" - .string "zu haben, niemand kommt hinein.\p" - .string "TEAM {EVIL_TEAM} muss verschwunden sein.$" + .string "That cave in the cove...\n" + .string "It seems someone sealed the entrance,\l" + .string "so no one can enter it anymore.\p" + .string "That TEAM {EVIL_TEAM} lot, they must\n" + .string "have gone away for good.$" LilycoveCity_Text_168DA9:: @ 8168DA9 - .string "SEEGRASULB CITY\p" - .string "“Wo das Land endet und das\n" - .string "Meer beginnt.”$" + .string "LILYCOVE CITY\p" + .string "“Where the land ends and the\n" + .string "sea begins.”$" LilycoveCity_Text_168DE1:: @ 8168DE1 - .string "POKéMON WETTBEWERB\n" - .string "MASTER-KLASSE REGISTRIERUNGEN\p" - .string "“Nimm mit deinen FREUNDEN am\n" - .string "WETTBEWERB teil!”$" + .string "POKéMON CONTESTS\n" + .string "MASTER RANK REGISTRATION\p" + .string "“Enter CONTESTS with your friends!”$" LilycoveCity_Text_168E2F:: @ 8168E2F - .string "GRASSEE MOTEL\p" - .string "“Behalte uns als Rose der\n" - .string "SEEGRASULB CITY in Erinnerung.”$" + .string "COVE LILY MOTEL\p" + .string "“Remember us as COVE LILY of\n" + .string "LILYCOVE.”$" LilycoveCity_Text_168E67:: @ 8168E67 - .string "SEEGRASULB CITY MUSEUM\p" - .string "“Ausstellung von\n" - .string "POKéMON-Meisterwerken!”$" + .string "LILYCOVE MUSEUM\p" + .string "“POKéMON Masterpiece Collection\n" + .string "on exhibit!”$" LilycoveCity_Text_168EA4:: @ 8168EA4 - .string "SEEGRASULB CITY MUSEUM\p" - .string "“Aktuelle Ausstellung:\n" - .string "Die POKéMON-Sammlung von {PLAYER}!”$" + .string "LILYCOVE MUSEUM\p" + .string "“{PLAYER}’s POKéMON Collection\n" + .string "on exhibit!”$" LilycoveCity_Text_168EDA:: @ 8168EDA - .string "HAFEN SEEGRASULB CITY\p" - .string "“Die Fähre MS TIDE wird momentan\n" - .string "in der WERFT gebaut.\p" - .string "Die Fähre wird so bald wie möglich ihren\n" - .string "Dienst aufnehmen.”$" + .string "LILYCOVE CITY HARBOR\p" + .string "“The ferry S.S. TIDAL is under\n" + .string "construction in SLATEPORT CITY.\p" + .string "“Service is scheduled to begin\n" + .string "shortly.”$" LilycoveCity_Text_168F57:: @ 8168F57 - .string "HAFEN SEEGRASULB CITY\p" - .string "“Genießen Sie die entspannende Fahrt\n" - .string "mit der Fähre MS TIDE.”$" + .string "LILYCOVE CITY HARBOR\p" + .string "“Enjoy a delightful cruise on the\n" + .string "ferry S.S. TIDAL.”$" LilycoveCity_Text_168FA1:: @ 8168FA1 - .string "POKéMON TRAINER-FANCLUB\p" - .string "Die Namen von TRAINERN sind auf dem\n" - .string "Schild eingeritzt...$" + .string "POKéMON TRAINER FAN CLUB\p" + .string "The names of TRAINERS are scribbled\n" + .string "all over the sign...$" LilycoveCity_Text_168FF3:: @ 8168FF3 - .string "SEEGRASULB CITY EINKAUFSZENTRUM\p" - .string "“Ein Überfluss an Waren und\n" - .string "Überraschungen!\p" - .string "Ein Ort, an dem man alles findet, was\n" - .string "das Herz begehrt!”$" + .string "LILYCOVE DEPARTMENT STORE\p" + .string "“Overflowing with great merchandise\n" + .string "and excitement!\p" + .string "“A great place to find that something\n" + .string "you need!”$" LilycoveCity_Text_169072:: @ 8169072 - .string "HAUS des ATTACKEN-VERLERNERS\p" - .string "“Hier werden POKéMON-Attacken\n" - .string "verlernt.”$" + .string "MOVE DELETER’S HOUSE\p" + .string "“Unwanted POKéMON moves deleted.”$" diff --git a/data/text/maps/LilycoveCity_ContestHall.inc b/data/text/maps/LilycoveCity_ContestHall.inc index 11b422ec7..96507b770 100644 --- a/data/text/maps/LilycoveCity_ContestHall.inc +++ b/data/text/maps/LilycoveCity_ContestHall.inc @@ -1,222 +1,206 @@ LilycoveCity_ContestHall_Text_1890D4:: @ 81890D4 - .string "Dieses POKéMON hat den vorherigen\n" - .string "SCHÖNHEITSWETTBEWERB gewonnen.\p" - .string "Weißt du was? Heute werde ich den\n" - .string "KLUGHEITS-WETTBEWERB gewinnen!\p" - .string "Meine Fähigkeiten erstaunen sogar\n" - .string "mich...$" + .string "This POKéMON won the BEAUTY CONTEST\n" + .string "here before.\p" + .string "Well, guess what? Today, I made it\n" + .string "win a SMARTNESS CONTEST!\p" + .string "My abilities scare even me...$" LilycoveCity_ContestHall_Text_18915F:: @ 818915F - .string "Ich habe einige WETTBEWERBE mitge-\n" - .string "macht, weil ich wissen wollte, wie\l" - .string "das so läuft.\p" - .string "Wenn du an einem COOLNESS-WETTBEWERB\n" - .string "teilnimmst, zählen coole Attacken.\p" - .string "Anmutige oder kluge Attacken sind\n" - .string "dagegen nicht so angesagt.$" + .string "I’ve entered a bunch of CONTESTS,\n" + .string "so I’m seeing how things work.\p" + .string "If you’re in a COOLNESS CONTEST,\n" + .string "cool moves go over as appeals.\p" + .string "But smart moves and cute moves\n" + .string "don’t go over well, for instance.$" LilycoveCity_ContestHall_Text_189221:: @ 8189221 - .string "Der junge Mann, der vor kurzem hier ge-\n" - .string "wonnen hat, hatte viele verschiedene\l" - .string "{POKEBLOCK} bei sich.\p" - .string "Ob man gewinnt, wenn man genug dieser\n" - .string "Items dabei hat?$" + .string "That young man who won earlier had\n" + .string "a whole bunch of different {POKEBLOCK}S.\p" + .string "Can you win if you had that many\n" + .string "of those things?$" LilycoveCity_ContestHall_Text_189299:: @ 8189299 - .string "Wow, dieser Ort ist einfach riesig!\p" - .string "Diese Spannung in der Luft... Das ist\n" - .string "kein Vergleich zu einer WETTBEWERBS-\l" - .string "HALLE in der tiefsten Provinz.$" + .string "Whoa, isn’t this place humongous!\p" + .string "The tension in the air... It’s not\n" + .string "like a CONTEST hall in the sticks.$" LilycoveCity_ContestHall_Text_189301:: @ 8189301 - .string "MC: Okay, KLUGE POKéMON und TRAINER.\n" - .string "Seid ihr bereit?!?\p" - .string "Gebt euer Bestes!\n" - .string "Es geht um den Ausdruck!$" + .string "MC: Okay, SMART POKéMON and their\n" + .string "TRAINERS, are you ready?!\p" + .string "Give it your best showing!\n" + .string "Let’s appeal!$" LilycoveCity_ContestHall_Text_189366:: @ 8189366 - .string "JUROR: Gefällt euch dieser\n" - .string "WETTBEWERB?\p" - .string "Komm mit drei Freunden wieder her,\n" - .string "dann könnt ihr alle gemeinsam am\l" - .string "WETTBEWERB teilnehmen.$" + .string "JUDGE: Are you enjoying this CONTEST?\p" + .string "Come back with three friends, and\n" + .string "all of you may enter a CONTEST!$" LilycoveCity_ContestHall_Text_1893CE:: @ 81893CE - .string "Eieieiei...\n" - .string "Ich habe am falschen WETTBEWERB teil-\l" - .string "genommen. Hach...\p" - .string "Ich habe dieses starke POKéMON in\n" - .string "einen KLUGHEITS-WETTBEWERB geschickt.\p" - .string "Los, beeindrucke mit einem\n" - .string "klugen ZERTRÜMMERER.$" + .string "Ayayayay...\n" + .string "I entered the wrong CONTEST.\p" + .string "I entered this tough POKéMON in the\n" + .string "SMARTNESS CONTEST...\p" + .string "Come on, wow them with a smart-looking\n" + .string "ROCK SMASH.$" LilycoveCity_ContestHall_Text_189463:: @ 8189463 - .string "Ich habe viele Jahre und all meine\n" - .string "Weisheit gebraucht, um dieses POKéMON\l" - .string "klug zu machen.\p" - .string "Damit mache ich es den jungen Spunden\n" - .string "nicht leicht, mein POKéMON zu über-\l" - .string "trumpfen.\p" - .string "Mein holdes Weib, siehst du das?$" + .string "I’ve spent many a year, and all my\n" + .string "wisdom besides, raising this POKéMON\l" + .string "to be smart.\p" + .string "It won’t be easily bested by some\n" + .string "young pup’s POKéMON.\p" + .string "My dear wife, are you seeing this?$" LilycoveCity_ContestHall_Text_189512:: @ 8189512 - .string "Das ist es!\p" - .string "Wenn mein POKéMON eine kluge Attacke\n" - .string "vorführt, wird das Publikum ausflippen\l" - .string "vor Begeisterung!$" + .string "There it is!\p" + .string "If my POKéMON pulls a smart move next,\n" + .string "the audience’s excitement will peak!$" LilycoveCity_ContestHall_Text_18956B:: @ 818956B - .string "Oh, du liebe Güte, nein!\p" - .string "Der BLUTSAUGER meines ZUBAT ist\n" - .string "wirklich anmutig, daher setze ich ihn\l" - .string "immer wieder ein!\p" - .string "Aber diese gemeinen Leute wissen das\n" - .string "überhaupt nicht zu schätzen!$" + .string "Oh, dear, no!\p" + .string "My darling ZUBAT’s LEECH LIFE is so\n" + .string "cute I kept using it over and over!\p" + .string "But these mean people don’t appreciate\n" + .string "it at all!$" LilycoveCity_ContestHall_Text_1895F3:: @ 81895F3 - .string "Kiaaayh! Du bist wunderbar, Opa!$" + .string "Kiyaaah! You’re beautiful, Grandpa!$" LilycoveCity_ContestHall_Text_189617:: @ 8189617 - .string "Selbst wenn die TRAINER die gleichen\n" - .string "POKéMON einsetzen, so führen sie doch\l" - .string "unterschiedliche Attacken vor.\p" - .string "Das ist so wie bei den Kämpfen: Jeder\n" - .string "hat seinen eigenen Stil.$" + .string "Even when TRAINERS enter the same\n" + .string "kind of POKéMON, they all seem to use\l" + .string "different moves for appeals.\p" + .string "It’s just like the way people have\n" + .string "different styles for battling.$" LilycoveCity_ContestHall_Text_1896BE:: @ 81896BE - .string "Ich denke, die POKéMON machen einen\n" - .string "klügeren Eindruck als ihre TRAINER.$" + .string "I think the POKéMON look smarter\n" + .string "than their TRAINERS. By a lot.$" LilycoveCity_ContestHall_Text_1896FE:: @ 81896FE - .string "Jetzt, wo alles vorbei ist, liebe ich\n" - .string "KLUGHEITS-WETTBEWERBE noch immer.\p" - .string "Diese intellektuelle, grüne Farbe...\n" - .string "Das ist so... so... so cooool!$" + .string "When all’s said and done, I still love\n" + .string "SMARTNESS CONTESTS.\p" + .string "That intellectual green color...\n" + .string "It’s so... So... Cool.$" LilycoveCity_ContestHall_Text_189771:: @ 8189771 - .string "MC: Nimmst du auch am SCHÖNHEITS-\n" - .string "WETTBEWERB teil? Viel Glück!$" + .string "MC: Are you entering the BEAUTY\n" + .string "CONTEST, too? Good luck!$" LilycoveCity_ContestHall_Text_1897AA:: @ 81897AA - .string "JUROR: Ah, jedes POKéMON ist ein\n" - .string "Beispiel makelloser Schönheit!\p" - .string "Huch, fast hätte ich vergessen, sie zu\n" - .string "bewerten...$" + .string "JUDGE: Ah, every POKéMON here is a\n" + .string "model of pristine beauty!\p" + .string "Why, I almost forgot to score them!$" LilycoveCity_ContestHall_Text_18980B:: @ 818980B - .string "Ein POKéMON von dieser Schönheit...\n" - .string "Es gibt keines wie dieses.\p" - .string "Jedem werden die Augen übergehen, wenn\n" - .string "er diese Schönheit betrachtet.$" + .string "A POKéMON this beautiful...\n" + .string "There isn’t another one like it.\p" + .string "Everyone’s eyes will be glued to\n" + .string "my beauty.$" LilycoveCity_ContestHall_Text_189874:: @ 8189874 - .string "Aaaaargh!\p" - .string "Ich habe mein POKéMON für diesen WETT-\n" - .string "BEWERB sorgfältig gebürstet und\l" - .string "gestriegelt.\p" - .string "Dabei habe ich wohl übertrieben...\n" - .string "Das Fell meines POKéMON ist nun ganz\l" - .string "voller Fusseln...\p" - .string "Was soll ich jetzt nur tun?$" + .string "Waaaah!\p" + .string "I brushed and groomed my POKéMON\n" + .string "carefully for this CONTEST...\p" + .string "But I overdid it...\n" + .string "My POKéMON’s coat turned all scraggly...\p" + .string "What should I do?$" LilycoveCity_ContestHall_Text_18990A:: @ 818990A - .string "Der AURORASTRAHL ist eine so blendende\n" - .string "Erscheinung, dass der JUROR sie nicht\l" - .string "sehen wird.\p" - .string "Äh, einen Moment mal...\n" - .string "Dann ist sie ja völlig sinnlos...$" + .string "This AURORA BEAM is so dazzling,\n" + .string "the JUDGE won’t be able to see it.\p" + .string "Uh, wait a second...\n" + .string "That’ll be meaningless, then!$" LilycoveCity_ContestHall_Text_189981:: @ 8189981 - .string "Dieses hübsche POKéMON sieht genau\n" - .string "aus wie ich, als ich jünger war.\p" - .string "Als ich das zu meinem Mann sagte, hat er\n" - .string "den Kaffee, den er trank, ausgespuckt.\p" - .string "Was ist daran so lustig?$" + .string "This pretty POKéMON looks just like\n" + .string "me when I was younger.\p" + .string "Right when I said that, my husband\n" + .string "spewed the coffee he was drinking.\p" + .string "Did I say something funny?$" LilycoveCity_ContestHall_Text_189A1D:: @ 8189A1D - .string "Natürlich, als Frau wäre ich überglück-\n" - .string "lich, wenn ich den SCHÖNHEITS-\l" - .string "WETTBEWERB gewinnen würde.$" + .string "You know, as a woman, if I win at a\n" + .string "BEAUTY CONTEST, sure it makes me\l" + .string "happy. More than usual, anyway.$" LilycoveCity_ContestHall_Text_189A82:: @ 8189A82 - .string "Ahahahahaha!\p" - .string "Wirf mal einen Blick auf all diese\n" - .string "schönen POKéMON!\l" - .string "Ich liebe diesen Liebreiz!$" + .string "Wahahahah!\p" + .string "Will you take a gander at all those\n" + .string "pretty POKéMON!\l" + .string "I just love this sort of glitz!$" LilycoveCity_ContestHall_Text_189AE1:: @ 8189AE1 - .string "Du kannst nicht immer nur aufgrund von\n" - .string "Schönheit gewinnen.\p" - .string "Du musst dein POKéMON striegeln, damit\n" - .string "es so schön und glänzend ist wie meines.$" + .string "You can’t always win on just beauty\n" + .string "alone.\p" + .string "You have to groom your POKéMON so\n" + .string "it’s nice and glossy like mine.$" LilycoveCity_ContestHall_Text_189B4E:: @ 8189B4E - .string "MC: Oh oh! Hallo!\n" - .string "Wir sind mitten in einem WETTBEWERB!\p" - .string "Lass dich bitte zuerst am Schalter\n" - .string "registrieren und komm dann wieder, ja?$" + .string "MC: Uh-oh! Hello!\n" + .string "We’re in the middle of a CONTEST!\p" + .string "Please enter at our registration\n" + .string "counter and come out, okay?$" LilycoveCity_ContestHall_Text_189BBF:: @ 8189BBF - .string "JUROR: Oh, was für reizende und\n" - .string "anmutige Ausdrücke!\p" - .string "Oh, meine Güte! Was für ein perfekter\n" - .string "NASSMACHER-Ausdruck!$" + .string "JUDGE: Oh, such charming and cute\n" + .string "appeals!\p" + .string "Oh, my goodness! What a perfectly\n" + .string "adorable WATER SPORT appeal!$" LilycoveCity_ContestHall_Text_189C29:: @ 8189C29 - .string "Oh, nein... Mein AZURILL wurde von\n" - .string "einem anderen POKéMON abgelenkt.$" + .string "Oh, no... My sweet AZURILL was\n" + .string "distracted by another POKéMON.$" LilycoveCity_ContestHall_Text_189C67:: @ 8189C67 - .string "Mein POKéMON hat noch nie einen Kampf\n" - .string "gewonnen. Aber geh mit ihm in einen\l" - .string "WETTBEWERB und pass auf, was passiert.$" + .string "My POKéMON has never won in a battle,\n" + .string "but put it in a CONTEST and look out!$" LilycoveCity_ContestHall_Text_189CB3:: @ 8189CB3 - .string "Der BLÄTTERTANZ meines POKéMON ist der\n" - .string "Inbegriff von Eleganz.\p" - .string "Ich lasse es nicht zu, dass irgend-\n" - .string "jemand es dabei stört.$" + .string "My POKéMON’s PETAL DANCE is a marvel\n" + .string "of elegance.\p" + .string "I won’t let anyone disturb its\n" + .string "performance.$" LilycoveCity_ContestHall_Text_189D11:: @ 8189D11 - .string "All diese POKéMON sind anmutig.\p" - .string "Aber, wenn mein POKéMON einen\n" - .string "anmutigen Ausdruck vorführt...\p" - .string "Ich bin sicher, dass es dann anmutiger\n" - .string "als all die anderen POKéMON sein wird.$" + .string "Everyone’s POKéMON are very cute.\p" + .string "However, if my POKéMON were to make\n" + .string "a cute appeal...\p" + .string "I’m sure that it would be so much \n" + .string "cuter than the others.$" LilycoveCity_ContestHall_Text_189DA2:: @ 8189DA2 - .string "Mein Kind nimmt an diesem WETTBEWERB\n" - .string "teil.\p" - .string "Los, mein Schatz! Zeig es ihnen!\n" - .string "Dein POKéMON ist das Beste!$" + .string "My child is in this CONTEST.\p" + .string "Come on, dear. Go for it!\n" + .string "Your POKéMON is the best!$" LilycoveCity_ContestHall_Text_189DF3:: @ 8189DF3 - .string "Ich finde, das Mädchen dort drüben ist\n" - .string "das anmutigste Geschöpf von allen.\p" - .string "Wie bitte? Sie bewerten die POKéMON\n" - .string "nach ihrer Anmut?!?$" + .string "I think that girl over there is the\n" + .string "cutest of the lot.\p" + .string "What’s that? They’re judging\n" + .string "POKéMON by their looks?$" LilycoveCity_ContestHall_Text_189E5F:: @ 8189E5F - .string "Oooh, all diese anmutigen POKéMON!\n" - .string "Ich möchte auch gerne eines haben!\p" - .string "Ich werde mir jetzt eines fangen.$" + .string "Ohh, seeing all these cute POKéMON,\n" + .string "they make we want to get my own!\p" + .string "I’m going to go catch some!$" UnknownString_8189EC0: @ 8189EC0 - .string "BÜHNE des COOLNESS-WETTBEWERBS\n" - .string "ERZITTERE VOR DEN COOLEN POKéMON!$" + .string "COOLNESS CONTEST STAGE\n" + .string "BE CHILLED BY COOL POKéMON!$" LilycoveCity_ContestHall_Text_189EF3:: @ 8189EF3 - .string "BÜHNE des SCHÖNHEITSWETTBEWERBS\n" - .string "SEI GEBLENDET VON SCHÖNEN POKéMON!$" + .string "BEAUTY CONTEST STAGE\n" + .string "BE ALLURED BY BEAUTIFUL POKéMON!$" LilycoveCity_ContestHall_Text_189F29:: @ 8189F29 - .string "BÜHNE des ANMUT-WETTBEWERBS\n" - .string "SEI GEFESSELT VON ANMUTIGEN POKéMON!$" + .string "CUTENESS CONTEST STAGE\n" + .string "BE CHARMED BY CUTE POKéMON!$" LilycoveCity_ContestHall_Text_189F5C:: @ 8189F5C - .string "BÜHNE des KLUGHEITS-WETTBEWERBS\n" - .string "SEI BEEINDRUCKT VON KLUGEN POKéMON!$" + .string "SMARTNESS CONTEST STAGE\n" + .string "BE IMPRESSED BY SMART POKéMON!$" UnknownString_8189F93: @ 8189F93 - .string "BÜHNE des STÄRKEWETTBEWERBS\n" - .string "FÜRCHTE DICH VOR STARKEN POKéMON!$" + .string "TOUGHNESS CONTEST STAGE\n" + .string "BE THRILLED BY TOUGH POKéMON!$" diff --git a/data/text/maps/LilycoveCity_ContestLobby.inc b/data/text/maps/LilycoveCity_ContestLobby.inc index aca01301b..d173519e8 100644 --- a/data/text/maps/LilycoveCity_ContestLobby.inc +++ b/data/text/maps/LilycoveCity_ContestLobby.inc @@ -1,192 +1,186 @@ LilycoveCity_ContestLobby_Text_18848C:: @ 818848C - .string "Nur vier Spieler können sich für den\n" - .string "POKéMON WETTBEWERB registrieren.\p" - .string "Wenn die anderen drei Spieler via\n" - .string "Link hinzukommen, können alle\l" - .string "an dem gleichen WETTBEWERB teilnehmen.\p" - .string "Möchtest du auch teilnehmen?$" + .string "I only register four players for\n" + .string "POKéMON CONTESTS.\p" + .string "If three other players link up, all\n" + .string "four may enter the same CONTEST.\p" + .string "Would you like to take part?$" LilycoveCity_ContestLobby_Text_188521:: @ 8188521 - .string "Bevor du an einem WETTBEWERB teil-\n" - .string "nimmst, wird dein Spiel gespeichert.$" + .string "Before entering a CONTEST, your\n" + .string "progress will be saved.$" FallarborTown_ContestLobby_Text_188559:: @ 8188559 LilycoveCity_ContestLobby_Text_188559:: @ 8188559 - .string "Wir hoffen, du nimmst ein anderes Mal\n" - .string "teil.$" + .string "We hope you will participate another\n" + .string "time.$" LilycoveCity_ContestLobby_Text_188584:: @ 8188584 - .string "Möchtest du am WETTBEWERB teilnehmen?$" + .string "Would you like to enter a CONTEST?$" LilycoveCity_ContestLobby_Text_1885A7:: @ 81885A7 - .string "Wenn die vier Spieler bereit sind,\n" - .string "verbindet euch via Verbindungskabel\l" - .string "und registriert euch bitte bei mir.\p" - .string "Bitte wähle den gleichen WETTBEWERB\n" - .string "wie deine vier Mitspieler.\p" - .string "Der WETTBEWERB beginnt, sobald \n" - .string "alle Spieler registriert wurden.\p" - .string "Danach werden die üblichen Regeln\n" - .string "des WETTBEWERBS erklärt.$" + .string "When four players are ready, connect\n" + .string "over a Game Link cable, and register\l" + .string "with me, please.\p" + .string "Please choose the same CONTEST\n" + .string "as your fellow contestants.\p" + .string "The CONTEST begins as soon as all\n" + .string "players register their entry.\p" + .string "After that, the usual CONTEST rules\n" + .string "apply.$" UnknownString_81886A8: @ 81886A8 - .string "Sobald ihr per Link verbunden seid,\n" - .string "wählt bitte den WETTBEWERB aus.$" + .string "Once you have linked up, please choose\n" + .string "the CONTEST.$" LilycoveCity_ContestLobby_Text_1886DC:: @ 81886DC - .string "An welchem WETTBEWERB möchtest du\n" - .string "teilnehmen?$" + .string "Which CONTEST would you like to enter?$" LilycoveCity_ContestLobby_Text_188703:: @ 8188703 - .string "Welches POKéMON soll teilnehmen?$" + .string "Which POKéMON would you like to enter?$" LilycoveCity_ContestLobby_Text_18872A:: @ 818872A - .string "Übertragung... $" + .string "Transmitting...$" LilycoveCity_ContestLobby_Text_18873A:: @ 818873A - .string "Übertragungsfehler.$" + .string "Transmission error...$" LilycoveCity_ContestLobby_Text_188750:: @ 8188750 - .string "Du hast wohl einen anderen WETTBEWERB\n" - .string "gewählt als ein anderer Teilnehmer.$" + .string "You may have chosen a different\n" + .string "CONTEST than another player.$" LilycoveCity_ContestLobby_Text_18878D:: @ 818878D - .string "Du hast wohl eine andere Entscheidung\n" - .string "getroffen als ein anderer Teilnehmer.$" + .string "You may have made a different\n" + .string "choice than another player.$" LilycoveCity_ContestLobby_Text_1887C7:: @ 81887C7 - .string "Bitte warten.\n" - .string "Drücke den B-Knopf, um abzubrechen...$" + .string "Please wait.\n" + .string "Press the B Button to cancel...$" LilycoveCity_ContestLobby_Text_1887F4:: @ 81887F4 - .string "Wir hoffen, du nimmst ein anderes Mal\n" - .string "teil.$" + .string "We hope you will participate\n" + .string "another time.$" LilycoveCity_ContestLobby_Text_18881F:: @ 818881F - .string "Übertragungsfehler.\n" - .string "Bitte versuche es erneut.$" + .string "Transmission error.\n" + .string "Please try again.$" LilycoveCity_ContestLobby_Text_188845:: @ 8188845 - .string "Dein POKéMON wird an dem WETTBEWERB\n" - .string "teilnehmen.\p" - .string "Dein POKéMON hat die Nummer {STR_VAR_2}.$" + .string "Your POKéMON will be entered in\n" + .string "the CONTEST.\p" + .string "Your POKéMON is Entry No. {STR_VAR_2}.$" UnknownString_8188890: @ 8188890 - .string "Nummer {STR_VAR_2} hat diese Farbe für\n" - .string "den WETTBEWERB zugewiesen bekommen.$" + .string "Entry No. {STR_VAR_2} is assigned this color\n" + .string "for this CONTEST.$" LilycoveCity_ContestLobby_Text_1888C6:: @ 81888C6 - .string "Der WETTBEWERB wird bald beginnen.$" + .string "The CONTEST will begin shortly.$" UnknownString_81888E6: @ 81888E6 - .string "Bitte hier entlang.\n" - .string "Viel Glück!$" + .string "Please come through this way.\n" + .string "Good luck!$" LilycoveCity_ContestLobby_Text_18890F:: @ 818890F - .string "Herzlichen Glückwunsch!\p" - .string "Ich habe dein POKéMON gezeichnet, zum\n" - .string "Andenken an seinen Sieg...\p" - .string "Nun, der Auftritt deines POKéMON war so\n" - .string "fantastisch, dass er mich zu einer\l" - .string "künstlerischen Hochleistung anspornte.\l" - .string "Siehst du?$" + .string "Congratulations!\p" + .string "I did a painting of your POKéMON to\n" + .string "commemorate its victory...\p" + .string "Well, your POKéMON’s appeals were\n" + .string "so fantastic, it spurred me into\l" + .string "painting better than I usually do.\l" + .string "Look, see?$" UnknownString_81889D0: @ 81889D0 - .string "Das Gemälde wird auf den Bildschirm\n" - .string "gerufen.$" + .string "The screen switches to display the\n" + .string "painting.$" LilycoveCity_ContestLobby_Text_1889FD:: @ 81889FD - .string "Was meinst du? Ich bin mit meiner Arbeit\n" - .string "zufrieden, aber gefällt sie auch dir?\p" - .string "Eine Arbeit dieses Formats würde sich\n" - .string "bestimmt gut in einem Museum machen.\p" - .string "Ach? Es gibt ein Museum, das nach neuen\n" - .string "Gemälden sucht?\p" - .string "Meinst du, ich sollte das Bild anbieten?$" + .string "What do you think? I’m confident in\n" + .string "what I’ve done, but do you like it?\p" + .string "A work of this caliber, it wouldn’t look\n" + .string "out of place in an art museum.\p" + .string "Huh? An art museum really is looking\n" + .string "for paintings?\p" + .string "Do you think I should take this there?$" LilycoveCity_ContestLobby_Text_188AE8:: @ 8188AE8 - .string "Nein, wirklich? Dann werde ich das Bild\n" - .string "natürlich sofort dort hinbringen.\p" - .string "Ich werde ihm einen angemessenen Titel\n" - .string "geben.\p" - .string "Ich hoffe, es gefällt ihnen, und sie\n" - .string "werden es ausstellen.\p" - .string "Bitte, schau es dir mal an, wenn sie es\n" - .string "ausgestellt haben. Vielen, vielen Dank!$" + .string "What, really? Then, sure, I will take\n" + .string "this painting there right now.\p" + .string "I’ll give it a proper title, too.\p" + .string "I hope they’ll like it and consider\n" + .string "exhibiting this.\p" + .string "Please check if they did accept this.\n" + .string "Thank you!$" LilycoveCity_ContestLobby_Text_188BB5:: @ 8188BB5 - .string "Oh, richtig!\p" - .string "Da ich dein POKéMON malen durfte,\n" - .string "möchte ich dir dies gerne geben.$" + .string "Oh, that’s right!\p" + .string "As a memento of me painting your\n" + .string "POKéMON, please take this.$" LilycoveCity_ContestLobby_Text_188C03:: @ 8188C03 - .string "{PLAYER} erhält ein BAND.$" + .string "{PLAYER} received a RIBBON.$" LilycoveCity_ContestLobby_Text_188C19:: @ 8188C19 - .string "{PLAYER} befestigt das BAND an\n" + .string "{PLAYER} put the RIBBON on\n" .string "{STR_VAR_1}.$" LilycoveCity_ContestLobby_Text_188C32:: @ 8188C32 - .string "Okay, man sieht sich!$" + .string "Okay, see you!$" LilycoveCity_ContestLobby_Text_188C41:: @ 8188C41 - .string "Oh... Ich glaube, dann nehme ich das mit\n" - .string "zu mir nach Hause...\p" - .string "Aber weißt du, eigentlich möchte ich das\n" - .string "viel lieber einem Kunstmuseum\l" - .string "schenken... Ja?$" + .string "Oh... Then, I guess I’ll just take\n" + .string "this home with me...\p" + .string "But, you know, I would like to take\n" + .string "this to the art museum... Okay?$" LilycoveCity_ContestLobby_Text_188CBD:: @ 8188CBD - .string "Oh, fein. Genauso soll es sein.\n" - .string "Ich hänge das bei mir zu Hause auf.\p" - .string "Nächstes Mal muss ich mir mehr Mühe\n" - .string "geben. Bis bald mal.$" + .string "Oh, fine, that’s the way it is.\n" + .string "I will hang this in my own house.\p" + .string "I’ll just have to try harder next time.\n" + .string "Well, be seeing you.$" LilycoveCity_ContestLobby_Text_188D3C:: @ 8188D3C - .string "Hoo, Junge. WETTBEWERB der\n" - .string "MASTER-KLASSE, jetzt komme ich.\p" - .string "Bald wird die Welt wissen, dass mein\n" - .string "POKéMON das niedlichste aller POKéMON\l" - .string "ist. Die Zeit ist reif!\l" - .string "Ahahahaha.$" + .string "Hoo, boy... Master Rank CONTESTS,\n" + .string "here I come.\p" + .string "The world will know that my dearest\n" + .string "POKéMON is the cutest being in all\l" + .string "existence. The time has come!\l" + .string "Uheheheh.$" LilycoveCity_ContestLobby_Text_188DDA:: @ 8188DDA - .string "Hier sieht man eine ganze Reihe der\n" - .string "unterschiedlichsten POKéMON.\p" - .string "Daher mache ich hier jeden Tag eine\n" - .string "kurze Stippvisite.$" + .string "You can see a whole variety of\n" + .string "POKéMON here.\p" + .string "That’s why I make this place a regular\n" + .string "part of my daily stroll.$" LilycoveCity_ContestLobby_Text_188E47:: @ 8188E47 - .string "Oh, du liebe Güte! Sie haben dir noch\n" - .string "keine WETTBEWERBSKARTE gegeben?\p" - .string "Du solltest sofort nach WIESENFLUR\n" - .string "gehen. Dort bekommst du eine.\p" - .string "Es ist unwahrscheinlich aufregend,\n" - .string "anderen ein POKéMON zu präsentieren,\l" - .string "das man mit Liebe aufgezogen hat.$" + .string "Oh, dear! They still haven’t given\n" + .string "you a CONTEST PASS?\p" + .string "You should go get one in VERDANTURF\n" + .string "TOWN right away.\p" + .string "It’s such a thrill having others see\n" + .string "POKéMON that you’ve raised with care\l" + .string "and love.$" LilycoveCity_ContestLobby_Text_188F07:: @ 8188F07 - .string "Wenn du erstmals am WETTBEWERB\n" - .string "der MASTER-KLASSE teilnimmst, wirst du\l" - .string "POKéMON sehen, die schreien geradezu\l" - .string "danach, gemalt zu werden.$" + .string "When you get up to the Master Rank\n" + .string "CONTESTS, you get your eyes opened\l" + .string "to striking POKéMON that just scream\l" + .string "to be painted.$" LilycoveCity_ContestLobby_Text_188F81:: @ 8188F81 - .string "Der WETTBEWERB der STÄRKE ist tierisch\n" - .string "hart!\p" - .string "Dieses Muskelspiel... Schweiß, der\n" - .string "rinnt... Da fall ich glatt in Ohnmacht!$" + .string "The TOUGHNESS CONTEST is like\n" + .string "extreme, man!\p" + .string "Those muscular appeals...\n" + .string "Cascading sweat... I swoon!$" LilycoveCity_ContestLobby_Text_188FE3:: @ 8188FE3 - .string "Tag für Tag habe ich dieses POKéMON mit\n" - .string "meiner Liebe und Fürsorge überhäuft.\p" - .string "Seine Kondition ist einfach unver-\n" - .string "gleichbar. Heute gehört der Sieg uns!$" + .string "Day in and day out, I lavished my care\n" + .string "on this POKéMON.\p" + .string "Its condition is peaking.\n" + .string "Today, victory is mine!$" LilycoveCity_ContestLobby_Text_18904D:: @ 818904D - .string "Ich habe {POKEBLOCK} mit Mama, Papa und\n" - .string "meiner Schwester gemacht. Sie sind\l" - .string "sehr gut geworden!\p" - .string "Ich glaube, je mehr Leute dir bei der\n" - .string "Herstellung von {POKEBLOCK} helfen, desto\l" - .string "besser ist die Qualität.$" + .string "I made {POKEBLOCK}S with Mom, Dad and\n" + .string "Big Sister. They turned out great!\p" + .string "I bet you can make smoother, better\n" + .string "{POKEBLOCK}S if you have more people.$" diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc index 3bce2592b..7d6e4942f 100644 --- a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -1,57 +1,53 @@ LilycoveCity_CoveLilyMotel_1F_Text_186B71:: @ 8186B71 - .string "Hm, so haben sie also die Anzahl der\n" - .string "Gäste verdoppelt. Indem sie POKéMON\l" - .string "als Attraktion präsentieren?\p" - .string "Hm, vielleicht sollte ich ein niedliches\n" - .string "POKéMON zum Maskottchen meines\l" - .string "Gasthofes machen...\p" - .string "Ich frage mich, ob ich so mehr\n" - .string "Gäste hätte?$" + .string "Hm, so they doubled the guests by\n" + .string "using POKéMON as attractions?\p" + .string "Hm, well, maybe I should make a cute\n" + .string "POKéMON our inn’s mascot.\p" + .string "I wonder if that will attract more\n" + .string "guests to stay with us?$" LilycoveCity_CoveLilyMotel_1F_Text_186C2B:: @ 8186C2B - .string "Oh, tut mir Leid, tut mir Leid!\n" - .string "Ich habe so konzentriert ferngesehen!\p" - .string "Seit TEAM {EVIL_TEAM} in diesem Ort ist,\n" - .string "bleiben die Gäste aus.$" + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV!\p" + .string "Since that TEAM {EVIL_TEAM} came to town,\n" + .string "the tourists have been staying away.$" LilycoveCity_CoveLilyMotel_1F_Text_186CA6:: @ 8186CA6 - .string "Hey, geh weg da!\n" - .string "Du bist doch nicht aus Glas!$" + .string "Hey, down in front!\n" + .string "I can’t see the TV!$" LilycoveCity_CoveLilyMotel_1F_Text_186CCE:: @ 8186CCE - .string "Interessant! Du sagst, ein POKéMON\n" - .string "hat ein Item gefunden, das jemand ver-\l" - .string "loren hat?\p" - .string "Das ist ja was! Wenn wir auch so clevere\n" - .string "POKéMON hätten...\p" - .string "Dann könnten wir alles wiederfinden, was\n" - .string "unsere Gäste verloren haben.$" + .string "Amazing! You’re telling me a POKéMON\n" + .string "found someone’s lost item?\p" + .string "That’s something. If we had some smart\n" + .string "POKéMON like that...\p" + .string "We could recover anything that our\n" + .string "guests mislaid...$" LilycoveCity_CoveLilyMotel_1F_Text_186D7F:: @ 8186D7F - .string "Oh, tut mir Leid, tut mir Leid!\n" - .string "Ich habe so konzentriert ferngesehen!\p" - .string "Ich habe gehört, dass jemand das VER-\n" - .string "STECK von TEAM {EVIL_TEAM} auffliegen ließ.\p" - .string "Gut! Dadurch haben wir endlich Gäste.\n" - .string "Eine ganze Gruppe hat reserviert!\p" - .string "Das sind Angestellte einer Firma... Äh...\n" - .string "GAME irgendwas...$" + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV!\p" + .string "I heard that someone busted the\n" + .string "TEAM {EVIL_TEAM} HIDEOUT.\p" + .string "Thanks to that, we just booked a\n" + .string "reservation from a big group.\p" + .string "It was a company called... Uh...\n" + .string "GAME something...$" LilycoveCity_CoveLilyMotel_1F_Text_186E57:: @ 8186E57 - .string "Irre! Ein POKéMON, das das Haus be-\n" - .string "wachte, hat Einbrecher geschnappt?\p" - .string "Klasse! Wir sollten auch über einen\n" - .string "Wachschutz durch POKéMON nachdenken.\p" - .string "Dadurch könnten wir unseren Gästen\n" - .string "viel mehr Sicherheit bieten.$" + .string "Amazing! A house-sitting POKéMON\n" + .string "caught a burglar?\p" + .string "That’s something. If we had a tough\n" + .string "POKéMON as a security guard...\p" + .string "We would be able to provide our guests\n" + .string "with greater safety.$" LilycoveCity_CoveLilyMotel_1F_Text_186F09:: @ 8186F09 - .string "Oh, tut mir Leid, tut mir Leid!\n" - .string "Ich habe so konzentriert ferngesehen!\p" - .string "Oh, ja. Eine große Gruppe von Gästen\n" - .string "ist vor kurzem hier eingetroffen.\p" - .string "Sie haben sich als GAME FREAK einge-\n" - .string "tragen. Ich denke, sie entwickeln\l" - .string "Spiele.\p" - .string "Oh oh, ich sollte mich besser um ihr\n" - .string "Abendessen kümmern!$" + .string "Oh, sorry, sorry!\n" + .string "I was too involved in watching TV.\p" + .string "Oh, yes. A big group of guests arrived\n" + .string "a little while ago.\p" + .string "They booked in as GAME FREAK, so I\n" + .string "guess they must make games.\p" + .string "Uh-oh, I’d better get working on\n" + .string "their dinner!$" diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc index 648e1d684..0306db9e9 100644 --- a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,47 +1,45 @@ LilycoveCity_CoveLilyMotel_2F_Text_186FE7:: @ 8186FE7 - .string "Ich bin der GAME DESIGNER.\p" - .string "Oh, wirklich?\n" - .string "Du arbeitest an einem POKéDEX?\p" - .string "Es ist schwer, ihn zu vervollständigen,\n" - .string "aber du darfst nicht aufgeben.\p" - .string "Sobald du ihn vervollständigt hast,\n" - .string "komm mich wieder besuchen.$" + .string "I’m the GAME DESIGNER.\p" + .string "Oh, is that right?\n" + .string "You’re working on a POKéDEX?\p" + .string "It’s tough trying to complete it,\n" + .string "but don’t give up.\p" + .string "If you do complete it, please come\n" + .string "show me.$" LilycoveCity_CoveLilyMotel_2F_Text_18708F:: @ 818708F - .string "Wow! Das ist beeindruckend!\n" - .string "Wirklich äußerst beeindruckend!\p" - .string "Dein POKéDEX ist absolut vollständig!\n" - .string "Du musst die POKéMON wirklich lieben!\p" - .string "Ich bin echt beeindruckt!\p" - .string "Ich möchte dir als Zeichen meiner Aner-\n" - .string "kennung gerne etwas schenken!$" + .string "Wow! That’s awesome!\n" + .string "Yep, it’s totally awesome!\p" + .string "This POKéDEX is completely filled!\n" + .string "You really must love POKéMON!\p" + .string "I’m so impressed!\p" + .string "Let me give you something in\n" + .string "recognition of your feat!$" LilycoveCity_CoveLilyMotel_2F_Text_187149:: @ 8187149 - .string "Ich? Sprichst du mit mir?\n" - .string "Ich bin der PROGRAMMIERER.\p" - .string "Ich frage mich, wie die EINARMIGEN\n" - .string "BANDITEN hier wohl so sind.$" + .string "Me? You’re talking to me?\n" + .string "I’m the PROGRAMMER.\p" + .string "I wonder what the SLOTS are\n" + .string "like here.$" LilycoveCity_CoveLilyMotel_2F_Text_18719E:: @ 818719E - .string "Ich bin der GRAPHIC ARTIST! Sind die\n" - .string "POKéMON in der Region von HOENN\l" - .string "nicht interessant?$" + .string "I’m the GRAPHIC ARTIST! Aren’t the\n" + .string "POKéMON of HOENN interesting?$" LilycoveCity_CoveLilyMotel_2F_Text_1871DF:: @ 81871DF - .string "Die MÄDCHEN mit den SCHWIMMREIFEN\n" - .string "sind total niedlich, meinst du nicht?\l" - .string "Ein Kampf gegen so niedliche Mädchen...\p" - .string "Huuh, das ist vielleicht ein Spaß!\p" - .string "Und die ZWILLINGE erst! Sind die süß!?!\n" - .string "Ein 2-gegen-2 Kampf mit ZWILLINGEN...\p" - .string "Huuh, einfach unglaublicher Spaß!$" + .string "The girl TUBERS, they’re cute, hey?\n" + .string "To battle against a cute TUBER...\p" + .string "Whoop, it drives me wild!\p" + .string "And the TWINS! Aren’t they cute?\n" + .string "A 2-on-2 battle with TWINS...\p" + .string "Whoop, it’s unbearably fun!$" LilycoveCity_CoveLilyMotel_2F_Text_18729A:: @ 818729A - .string "Die frische Seebrise berührt mein Herz.\n" - .string "Es ist einfach wundervoll hier.$" + .string "The sea breeze tickles my heart.\n" + .string "It feels wonderful here!$" LilycoveCity_CoveLilyMotel_2F_Text_1872D4:: @ 81872D4 - .string "Du kannst nie vorhersagen, wann und wo\n" - .string "die Leute dich herausfordern.\p" - .string "Daher gehe ich niemals ohne meinen GAME\n" - .string "BOY ADVANCE aus dem Haus.$" + .string "You never know when and where\n" + .string "people will challenge you.\p" + .string "That’s why I never leave home without\n" + .string "my GAME BOY ADVANCE.$" diff --git a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc index f09c4aa08..62eb03bc1 100644 --- a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,33 +1,33 @@ LilycoveCity_DepartmentStoreRooftop_Text_18C61F:: @ 818C61F - .string "Haben sie noch nicht bekannt gegeben,\n" - .string "wann sie den Ausverkauf starten?\p" - .string "Ich achte immer auf die Werbung im\n" - .string "Fernsehen, aber bisher war da nichts.$" + .string "Don’t they have set dates for their\n" + .string "clear-out sales?\p" + .string "I watch TV, but they never show any\n" + .string "commercials.$" LilycoveCity_DepartmentStoreRooftop_Text_18C685:: @ 818C685 - .string "Ja! Ich habe schon lange auf diesen\n" - .string "Ausverkauf gewartet.\p" - .string "Hier gibt es Items, die findest du sonst\n" - .string "nirgends. Ich decke mich damit ein!$" + .string "Yes! I’ve been waiting a long time for\n" + .string "this clear-out sale.\p" + .string "They have items that you can only get\n" + .string "here. I’m going to load up, that I am!$" LilycoveCity_DepartmentStoreRooftop_Text_18C70E:: @ 818C70E - .string "Ooh... Ich bin am Verdursten!$" + .string "Ohh... I’m bone-dry thirsty!$" LilycoveCity_DepartmentStoreRooftop_Text_18C72B:: @ 818C72B - .string "Das ist ein GETRÄNKEAUTOMAT.\n" - .string "Möchtest du etwas trinken?$" + .string "It’s a VENDING MACHINE.\n" + .string "Which drink would you like?$" LilycoveCity_DepartmentStoreRooftop_Text_18C75F:: @ 818C75F - .string "Deng!\p" - .string "Eine Dose {STR_VAR_1} fällt heraus.$" + .string "Clang!\p" + .string "A can of {STR_VAR_1} dropped down.$" LilycoveCity_DepartmentStoreRooftop_Text_18C780:: @ 818C780 - .string "Deng!\p" - .string "Treffer! Eine weitere Dose\n" - .string "{STR_VAR_1} fällt heraus!$" + .string "Clang!\p" + .string "Score! An extra can of {STR_VAR_1}\n" + .string "dropped down!$" LilycoveCity_DepartmentStoreRooftop_Text_18C7AF:: @ 818C7AF - .string "Nicht genug Geld...$" + .string "Not enough money...$" LilycoveCity_DepartmentStoreRooftop_Text_18C7C3:: @ 818C7C3 - .string "Es wird kein Getränk gekauft.$" + .string "Decided against buying a drink.$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc b/data/text/maps/LilycoveCity_DepartmentStore_1F.inc index fb4d5b589..45cf3686d 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_1F.inc @@ -1,29 +1,27 @@ LilycoveCity_DepartmentStore_1F_Text_18BFB5:: @ 818BFB5 - .string "Willkommen im EINKAUFSZENTRUM von\n" - .string "SEEGRASULB CITY.$" + .string "Welcome to LILYCOVE DEPARTMENT STORE.$" LilycoveCity_DepartmentStore_1F_Text_18BFDB:: @ 818BFDB - .string "Immer wenn ich in das EINKAUFSZENTRUM\n" - .string "gehe, endet das damit, dass ich tausend\l" - .string "Dinge kaufe, weil es so viel Spaß macht.$" + .string "Whenever I come to the DEPARTMENT\n" + .string "STORE, I always end up buying all sorts\l" + .string "of things because it’s so fun.$" LilycoveCity_DepartmentStore_1F_Text_18C044:: @ 818C044 - .string "Heute wird mir meine Mama ein paar\n" - .string "schöne Möbel kaufen.$" + .string "Today, my mom is going to buy me some\n" + .string "nice furniture.$" LilycoveCity_DepartmentStore_1F_Text_18C07A:: @ 818C07A - .string "Ich kaufe etwas Schönes für mein\n" - .string "AZUMARILL, weil es einen WETTBEWERB\l" - .string "gewonnen hat.$" + .string "I’m buying something for my AZUMARILL\n" + .string "as a reward for winning a CONTEST.$" LilycoveCity_DepartmentStore_1F_Text_18C0C3:: @ 818C0C3 .string "AZUMARILL: Maririroo!$" LilycoveCity_DepartmentStore_1F_Text_18C0D9:: @ 818C0D9 - .string "EG: INFORMATION\n" - .string " LOTTERIE\p" - .string "1S: ALLES FÜR DEN TRAINER\p" - .string "2S: ALLES FÜR DEN KAMPF\p" - .string "3S: TM\p" - .string "4S: POKéPUPPEN\p" - .string "DACH: DACHTERRASSE$" + .string "1F: SERVICE COUNTER\n" + .string " LOTTERY CORNER\p" + .string "2F: TRAINER’S ZONE\p" + .string "3F: BATTLE COLLECTION\p" + .string "4F: TM CORNER\p" + .string "5F: POKé DOLL FLOOR\p" + .string "ROOFTOP: ROOFTOP PLAZA$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc b/data/text/maps/LilycoveCity_DepartmentStore_2F.inc index 721974796..e9a52bbee 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_2F.inc @@ -1,16 +1,15 @@ LilycoveCity_DepartmentStore_2F_Text_18C162:: @ 818C162 - .string "Lerne, mit Items vernünftig umzugehen.\n" - .string "Das ist essentiell. Ehrlich.$" + .string "Learn to use items properly.\n" + .string "That’s basic, really.$" LilycoveCity_DepartmentStore_2F_Text_18C195:: @ 818C195 - .string "Mein Mann wartet zu Hause auf mich.\n" - .string "Was wäre wohl ein passendes Geschenk\l" - .string "für ihn?$" + .string "My husband is waiting at home.\n" + .string "What would make a good gift for him?$" LilycoveCity_DepartmentStore_2F_Text_18C1D9:: @ 818C1D9 - .string "Ich werde bald auf eine lange Reise\n" - .string "gehen. Ich muss daher Items kaufen.$" + .string "I’m leaving on a long journey soon.\n" + .string "I need to stock up on items.$" UnknownString_818C21A: @ 818C21A - .string "FÜR DEINE REISEBEGLEITER\n" - .string "1S: ALLES FÜR DEN TRAINER$" + .string "FOR YOUR TRAVELING COMPANIONS\n" + .string "2F: TRAINER’S ZONE$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc b/data/text/maps/LilycoveCity_DepartmentStore_3F.inc index eb430e21c..8777fd1f3 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_3F.inc @@ -1,21 +1,19 @@ LilycoveCity_DepartmentStore_3F_Text_18C24B:: @ 818C24B - .string "Um POKéMON schnell stärker zu machen,\n" - .string "eignen sich Items hervorragend.\p" - .string "PROTEIN steigert den ANGRIFF und\n" - .string "KALZIUM den SPEZ. ANGRIFF.$" + .string "For quickly toughening up POKéMON,\n" + .string "items are the best.\p" + .string "PROTEIN boosts ATTACK, and CALCIUM\n" + .string "raises SP. ATK.$" LilycoveCity_DepartmentStore_3F_Text_18C2B5:: @ 818C2B5 - .string "Ich möchte, dass mein POKéMON mehr\n" - .string "Ausdauer hat.\p" - .string "Ich frage mich, ob ich lieber die\n" - .string "VERTEIDIGUNG mit EISEN oder die SPEZ.\l" - .string "VER. mit ZINK steigern soll.$" + .string "I want my POKéMON to have more\n" + .string "endurance.\p" + .string "I’m trying to decide whether to raise\n" + .string "DEFENSE with IRON, or SP. DEF with ZINC.$" LilycoveCity_DepartmentStore_3F_Text_18C32E:: @ 818C32E - .string "Ich habe meinem POKéMON CARBON\n" - .string "gegeben, um die INIT. zu erhöhen.$" + .string "I gave a CARBOS to my POKéMON and its\n" + .string "SPEED went up.$" UnknownString_818C363: @ 818C363 - .string "UNVERZICHTBARES FÜR UNBESIEGBARE\n" - .string "TRAINER\l" - .string "2S: ALLES FÜR DEN KAMPF$" + .string "ESSENTIALS FOR UNBEATABLE TRAINERS\n" + .string "3F: BATTLE COLLECTION$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc b/data/text/maps/LilycoveCity_DepartmentStore_4F.inc index 86a1438a2..b26962a8f 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_4F.inc @@ -1,21 +1,20 @@ LilycoveCity_DepartmentStore_4F_Text_18C39C:: @ 818C39C .string "Hmm...\p" - .string "Eine offensive Attacke...\n" - .string "Oder defensive Attacke...\p" - .string "Es ist nicht einfach, zu entscheiden,\n" - .string "welche TM ein POKéMON lernen soll.$" + .string "An attacking move...\n" + .string "Or a defensive move...\p" + .string "It’s no easy matter to decide which TM\n" + .string "moves should be taught to POKéMON...$" LilycoveCity_DepartmentStore_4F_Text_18C41B:: @ 818C41B - .string "Es gibt so viele verschiedene Arten von\n" - .string "TMs.\p" - .string "In einem Katalog habe ich gelesen, dass\n" - .string "es 50 verschiedene Arten gibt.$" + .string "There are so many different kinds of\n" + .string "TM moves.\p" + .string "A catalog I read said there are fifty\n" + .string "different kinds.$" LilycoveCity_DepartmentStore_4F_Text_18C481:: @ 818C481 - .string "Ich hätte gerne all die unterschied-\n" - .string "lichen TMs, aber ein POKéMON kann nur\l" - .string "vier Attacken lernen.$" + .string "I’d like to get all the different TMs,\n" + .string "but a POKéMON learns only four moves.$" UnknownString_818C4CE: @ 818C4CE - .string "EINE ABKÜRZUNG ZUR POKéMON LIGA\n" - .string "3S: TM$" + .string "A SHORTCUT TO POKéMON LEAGUE\n" + .string "4F: TM CORNER$" diff --git a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc b/data/text/maps/LilycoveCity_DepartmentStore_5F.inc index 821a85431..8b1d81c2e 100644 --- a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/text/maps/LilycoveCity_DepartmentStore_5F.inc @@ -1,17 +1,17 @@ LilycoveCity_DepartmentStore_5F_Text_18C4F9:: @ 818C4F9 - .string "Hier gibt es viele niedliche PUPPEN.\p" - .string "Ich sollte lieber mir selbst welche\n" - .string "kaufen, anstatt immer für meine Kinder.$" + .string "This place is full of cute DOLLS.\p" + .string "I should buy some for me, instead of\n" + .string "just for my children.$" LilycoveCity_DepartmentStore_5F_Text_18C556:: @ 818C556 - .string "Ich bin noch zu klein, um POKéMON auf-\n" - .string "zuziehen, daher bekomme ich eine PUPPE.$" + .string "I’m not big enough to raise POKéMON,\n" + .string "so I’m getting a cute DOLL instead.$" LilycoveCity_DepartmentStore_5F_Text_18C59F:: @ 818C59F - .string "Sie verkaufen viele hübsche MATTEN.\p" - .string "Welche soll ich nur kaufen?\n" - .string "Ich sollte sie alle kaufen...$" + .string "They sell many cute MATS here.\p" + .string "I wonder which one I should get?\n" + .string "Maybe I’ll buy them all...$" UnknownString_818C5FA: @ 818C5FA - .string "ANBETUNGSWÜRDIGE FREUNDE\n" - .string "4S: POKéPUPPEN$" + .string "ADORABLE FRIENDS\n" + .string "5F: POKé DOLL FLOOR$" diff --git a/data/text/maps/LilycoveCity_Harbor.inc b/data/text/maps/LilycoveCity_Harbor.inc index 1282cb3b9..0f31f697b 100644 --- a/data/text/maps/LilycoveCity_Harbor.inc +++ b/data/text/maps/LilycoveCity_Harbor.inc @@ -1,51 +1,49 @@ LilycoveCity_Harbor_Text_18B306:: @ 818B306 - .string "Bitte?\n" - .string "Du suchst ein Schiff?\p" - .string "Tut mir Leid, aber die Fähre ist\n" - .string "momentan nicht in Betrieb...$" + .string "I beg your pardon?\n" + .string "You’re looking for a ship?\p" + .string "I’m sorry, the ferry service isn’t\n" + .string "available at present...$" LilycoveCity_Harbor_Text_18B36F:: @ 818B36F - .string "Hallo, du willst mit der Fähre fahren?\n" - .string "Zeigst du mir dann bitte dein TICKET?$" + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" LilycoveCity_Harbor_Text_18B3A9:: @ 818B3A9 - .string "{PLAYER} besitzt kein TICKET.\p" - .string "Das tut mir Leid!\p" - .string "Du benötigst ein TICKET, um mit der\n" - .string "Fähre fahren zu können.$" + .string "{PLAYER} doesn’t have the TICKET...\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" LilycoveCity_Harbor_Text_18B406:: @ 818B406 - .string "{PLAYER} zeigt das TICKET.\p" - .string "Perfekt! Das ist alles, was du brauchst!\p" - .string "Und wo soll die Reise hingehen?$" + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" LilycoveCity_Harbor_Text_18B45B:: @ 818B45B - .string "Bitte fahre bald mit uns!$" + .string "Please sail with us another time!$" LilycoveCity_Harbor_Text_18B47D:: @ 818B47D - .string "Nach GRAPHITPORT CITY, einverstanden?$" + .string "SLATEPORT CITY it is, then!$" LilycoveCity_Harbor_Text_18B499:: @ 818B499 - .string "Zum DUELLTURM, einverstanden?$" + .string "BATTLE TOWER it is, then!$" LilycoveCity_Harbor_Text_18B4B3:: @ 818B4B3 - .string "Bitte komm an Bord. Wir legen bald ab.$" + .string "Please board the ferry and wait for\n" + .string "departure.$" LilycoveCity_Harbor_Text_18B4E2:: @ 818B4E2 - .string "Und? Wo soll die Reise hingehen?$" + .string "Then, where would you like to go?$" LilycoveCity_Harbor_Text_18B504:: @ 818B504 - .string "Solange die Fähre noch nicht see-\n" - .string "tüchtig ist, haben wir Seeleute\l" - .string "nichts zu tun...\p" - .string "Ich wünschte, sie würden sich ein\n" - .string "bisschen beeilen - die Leute von der\l" - .string "WERFT von GRAPHITPORT CITY.$" + .string "Until they finish making the ferry, we\n" + .string "sailors have nothing to do...\p" + .string "I wish they’d get a move on, the folks\n" + .string "at the SHIPYARD in SLATEPORT.$" LilycoveCity_Harbor_Text_18B58E:: @ 818B58E - .string "Die Fähre MS TIDE ist endlich in\n" - .string "Betrieb.\p" - .string "Die Leute von der WERFT in\n" - .string "GRAPHITPORT CITY müssen wirklich\l" - .string "hart gearbeitet haben.\p" - .string "Nun, jetzt ist meine Arbeit gefragt!$" + .string "The ferry S.S. TIDAL is finally in\n" + .string "operation.\p" + .string "The folks at the SHIPYARD in SLATEPORT\n" + .string "must’ve worked extra hard.\p" + .string "Well, it’s my turn to get busy now!$" diff --git a/data/text/maps/LilycoveCity_House1.inc b/data/text/maps/LilycoveCity_House1.inc index c374ed813..a937ff64d 100644 --- a/data/text/maps/LilycoveCity_House1.inc +++ b/data/text/maps/LilycoveCity_House1.inc @@ -1,8 +1,8 @@ LilycoveCity_House1_Text_18B7B0:: @ 818B7B0 - .string "POKéMON sind die Partner der Menschen.\n" - .string "Sie sind nicht unser Spielzeug!\p" - .string "Leider gibt es immer wieder Menschen,\n" - .string "die das nicht begreifen.$" + .string "POKéMON are partners to people.\n" + .string "They aren’t our tools.\p" + .string "Unfortunately, there are some people\n" + .string "who fail to understand that...$" LilycoveCity_House1_Text_18B82B:: @ 818B82B .string "KECLEON: Ruroro?$" diff --git a/data/text/maps/LilycoveCity_House2.inc b/data/text/maps/LilycoveCity_House2.inc index f5aae781d..0e037a65f 100644 --- a/data/text/maps/LilycoveCity_House2.inc +++ b/data/text/maps/LilycoveCity_House2.inc @@ -1,9 +1,9 @@ LilycoveCity_House2_Text_18B83C:: @ 818B83C - .string "Huch? Was? Wie?\p" - .string "Ich bin noch nicht ganz wach...\n" - .string "Hier, das kannst du haben...$" + .string "Huh? What? What’s that?\p" + .string "I’m not near awake yet...\n" + .string "You can have this...$" LilycoveCity_House2_Text_18B883:: @ 818B883 - .string "Gääähn...\p" - .string "Schlaf ist wichtig für die Gesundheit...\n" - .string "Schlafe und erhole dich...$" + .string "Yawn...\p" + .string "Sleep is essential for good health...\n" + .string "Sleep and regain health...$" diff --git a/data/text/maps/LilycoveCity_House3.inc b/data/text/maps/LilycoveCity_House3.inc index b9f243868..03db4920f 100644 --- a/data/text/maps/LilycoveCity_House3.inc +++ b/data/text/maps/LilycoveCity_House3.inc @@ -1,72 +1,68 @@ LilycoveCity_House3_Text_18B8CC:: @ 818B8CC - .string "Ach, du liebes bisschen! Reist du ganz\n" - .string "alleine? Aber du bist so jung! Gut!\p" - .string "Ich bin sicher, meine Kinder könnten\n" - .string "das eine oder andere von dir lernen!\p" - .string "Ich? Ich bin die Expertin der {POKEBLOCK}.\p" - .string "Wenn ich es mir recht überlege, dann\n" - .string "könnte ich ein paar {POKEBLOCK} zaubern.\p" - .string "Möchtest du das von mir, der Expertin\n" - .string "der {POKEBLOCK}, lernen?$" + .string "Oh, my, my! Are you traveling alone?\n" + .string "But you’re so young! Good for you!\p" + .string "I’m sure my kids could learn a thing\n" + .string "or two from you!\p" + .string "Me? I’m a master of {POKEBLOCK}S.\p" + .string "If I get serious just a little, why, I\n" + .string "can concoct great {POKEBLOCK}S.\p" + .string "Would you like to learn from me, a\n" + .string "master of {POKEBLOCK}S?$" LilycoveCity_House3_Text_18B9DC:: @ 818B9DC - .string "Oh? Ganz sicher?\p" - .string "Du solltest nicht immer versuchen, alles\n" - .string "alleine zu meistern, mein Kind.$" + .string "Oh? Are you sure?\p" + .string "You shouldn’t always try to do\n" + .string "everything by yourself, dear!$" LilycoveCity_House3_Text_18BA2B:: @ 818BA2B - .string "Oh, schön! Du bist clever! Das\n" - .string "wird eine lange Erklärung. Hör gut zu.\p" - .string "Bist du bereit?\p" - .string "Wenn du einen {POKEBLOCK} betrachtest,\n" - .string "siehst du, dass er danach bewertet\l" - .string "wird, wie würzig er ist.\p" - .string "Je niedriger dieser Wert ist, desto\n" - .string "besser ist das. Vergiss das nicht!\p" - .string "Ein guter {POKEBLOCK} hat einen niedrigen\n" - .string "Würzwert und einen hohen Level.\p" - .string "Ein POKéMON kann mehr gute {POKEBLOCK}\n" - .string "essen als durchschnittliche.\p" - .string "Und das ist wichtig.\p" - .string "Wenn du weiche {POKEBLOCK} herstellen\n" - .string "willst, benutze verschiedene BEEREN.\p" - .string "Sei nicht geizig - die Art der BEEREN\n" - .string "beeinflusst die Weichheit der {POKEBLOCK}.\p" - .string "Und noch etwas.\p" - .string "Je mehr Leute BEEREN mixen,\n" - .string "desto weicher werden die {POKEBLOCK}.\p" - .string "Daher solltest du andere Leute an-\n" - .string "sprechen und mit ihnen zusammen\l" - .string "{POKEBLOCK} herstellen.\p" - .string "Das ist alles, was du wissen musst, um\n" - .string "gute {POKEBLOCK} herstellen zu können.\p" - .string "Wenn jeder POKéMON hätte, die er liebt,\n" - .string "weiche {POKEBLOCK} und eine liebevolle\p" - .string "Familie, sähe es auf der Welt viel\n" - .string "besser aus.\p" - .string "Lass dich nicht unterkriegen, Schatz!$" + .string "Oh, good! You’re a smart soul!\n" + .string "This is a bit long, so listen up!\p" + .string "Are you ready?\p" + .string "If you look at {POKEBLOCK}S, you should see\n" + .string "that they are rated on how they feel.\p" + .string "The lower the feel rating,\n" + .string "the better it is. Don’t forget this!\p" + .string "A good {POKEBLOCK} has a low feel\n" + .string "rating and a high level.\p" + .string "A POKéMON can eat more good\n" + .string "{POKEBLOCK}S than ordinary ones, too.\p" + .string "And this is important.\p" + .string "If you want to make smooth {POKEBLOCK}S,\n" + .string "use different kinds of BERRIES.\p" + .string "Don’t be stingy - the kinds of BERRIES\n" + .string "affect the smoothness of {POKEBLOCK}S.\p" + .string "And another thing.\p" + .string "The more people blending BERRIES, the\n" + .string "smoother the {POKEBLOCK}S.\p" + .string "That’s why you should talk to other\n" + .string "people and make {POKEBLOCK}S together.\p" + .string "That’s about all you need to know to\n" + .string "make good {POKEBLOCK}S.\p" + .string "If everyone had POKéMON they love,\n" + .string "smooth {POKEBLOCK}S, and a loving family,\l" + .string "the world would be a happier place.\p" + .string "Don’t give up, dear!$" LilycoveCity_House3_Text_18BD64:: @ 818BD64 - .string "Als meine Frau Vierlinge zur Welt\n" - .string "brachte, war ich zuerst geschockt.\p" - .string "Aber wenn ich sie jetzt zusammen\n" - .string "spielen sehe, bin ich richtig glücklich.$" + .string "When my wife gave birth to quadruplets,\n" + .string "you bet I was shocked.\p" + .string "But, now, seeing them play together,\n" + .string "it makes me happy.$" LilycoveCity_House3_Text_18BDDB:: @ 818BDDB - .string "Wir üben MULTIKÄMPFE aus, aber ich\n" - .string "weiß, dass ich gewinnen werde.$" + .string "We’re having MULTI BATTLES, but I know\n" + .string "I’m going to win.$" LilycoveCity_House3_Text_18BE14:: @ 818BE14 - .string "Wir lieben es, Sachen beim STATISTIK-\n" - .string "TAUSCH durcheinander zu würfeln.\p" - .string "Aber, was kann man durcheinander\n" - .string "würfeln?$" + .string "We like mixing stuff at the RECORD\n" + .string "CORNER.\p" + .string "But what gets mixed up?$" LilycoveCity_House3_Text_18BE57:: @ 818BE57 - .string "Wir wollen super {POKEBLOCK}\n" - .string "im BEERENMIXER machen!$" + .string "We’re going to make super {POKEBLOCK}S\n" + .string "with a BERRY BLENDER!$" LilycoveCity_House3_Text_18BE8E:: @ 818BE8E - .string "Ich möchte damit angeben, wie stark\n" - .string "mein POKéMON ist, daher werden wir\l" - .string "an einem WETTBEWERB teilnehmen.$" + .string "I want to brag about how tough my\n" + .string "POKéMON is, so we’re going to enter a\l" + .string "CONTEST together.$" diff --git a/data/text/maps/LilycoveCity_House4.inc b/data/text/maps/LilycoveCity_House4.inc index ee6b0fa8b..ebfd5ae71 100644 --- a/data/text/maps/LilycoveCity_House4.inc +++ b/data/text/maps/LilycoveCity_House4.inc @@ -1,11 +1,9 @@ LilycoveCity_House4_Text_18BEE8:: @ 818BEE8 - .string "Das größte Geheimnis dieses Planeten\n" - .string "hütet der Meeresboden.\p" - .string "Das hat mal jemand gesagt, aber ich\n" - .string "weiß nicht...$" + .string "This planet’s biggest mysteries are\n" + .string "at the bottom of the sea.\p" + .string "Somebody said that, but I don’t know...$" LilycoveCity_House4_Text_18BF4E:: @ 818BF4E - .string "Zwischen MOOSBACH CITY und\n" - .string "XENEROVILLE befindet sich ein\l" - .string "tiefer Unterwassergraben.\p" - .string "Das hat mir jemand erzählt.$" + .string "There’s a deep underwater trench\n" + .string "between MOSSDEEP and SOOTOPOLIS.\p" + .string "That’s what someone told me, anyway.$" diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc index 93f9d2f7e..b60e0e50d 100644 --- a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,131 +1,130 @@ LilycoveCity_LilycoveMuseum_1F_Text_187348:: @ 8187348 - .string "Willkommen im MUSEUM von\n" - .string "SEEGRASULB CITY.\p" - .string "Bitte nimm dir die Zeit, unsere Sammlung\n" - .string "wunderbarer Kunstwerke zum Thema\l" - .string "POKéMON zu betrachten.$" + .string "Welcome to LILYCOVE MUSEUM.\p" + .string "Please take the time to enjoy our\n" + .string "collection of fantastic artwork\l" + .string "featuring POKéMON.$" LilycoveCity_LilycoveMuseum_1F_Text_1873B9:: @ 81873B9 - .string "Ich bin der KURATOR dieses MUSEUMS der\n" - .string "schönen Künste.\p" - .string "Es freut mich immer wieder, junge\n" - .string "Menschen wie dich im MUSEUM zu treffen.\p" - .string "Hast du dir schon unsere Gemäldesamm-\n" - .string "lung angesehen?$" + .string "I’m the CURATOR of this MUSEUM of\n" + .string "fine arts.\p" + .string "It’s heartening to see someone so\n" + .string "young as you in our MUSEUM.\p" + .string "Have you viewed our collection of\n" + .string "paintings already?$" LilycoveCity_LilycoveMuseum_1F_Text_187459:: @ 8187459 - .string "Ah, dann möchte ich dich nicht länger\n" - .string "aufhalten. Bitte, nimm dir Zeit.$" + .string "Ah, then let me not disturb you.\n" + .string "Please, do take your time.$" LilycoveCity_LilycoveMuseum_1F_Text_187495:: @ 8187495 - .string "Oh? Ich glaube, du bist ein POKéMON-\n" - .string "TRAINER.\p" - .string "Bist du auch an Gemälden interessiert?$" + .string "Oh? I do believe that you seem to\n" + .string "be a POKéMON TRAINER.\p" + .string "Have you an interest in paintings,\n" + .string "too?$" LilycoveCity_LilycoveMuseum_1F_Text_1874F5:: @ 81874F5 - .string "Ich verstehe...\p" - .string "Ich fühle mich geehrt, dass du uns\n" - .string "trotzdem besuchst.$" + .string "I see...\p" + .string "I’m honored that you would visit\n" + .string "us in spite of that.$" LilycoveCity_LilycoveMuseum_1F_Text_187534:: @ 8187534 - .string "Ah, exzellent!\n" - .string "Du magst Gemälde!\p" - .string "Dann möchte ich dir gerne etwas zeigen.$" + .string "Ah, excellent!\n" + .string "You do like paintings!\p" + .string "Then, may I ask you to come with me?$" LilycoveCity_LilycoveMuseum_1F_Text_18757F:: @ 818757F - .string "Dies ist ein sehr altes Gemälde.\n" - .string "Die Farbe blättert hier und da schon ab.$" + .string "It’s a very old painting.\n" + .string "The paint is peeling here and there.$" LilycoveCity_LilycoveMuseum_1F_Text_1875BE:: @ 81875BE - .string "Eine merkwürdige Landschaft mit\n" - .string "bizarren und fantastischen Details.$" + .string "It’s an odd landscape with bizarre\n" + .string "and fantastic scenery.$" LilycoveCity_LilycoveMuseum_1F_Text_1875F8:: @ 81875F8 - .string "Das Bildnis einer hübschen, lächelnden\n" - .string "Frau mit einem POKéMON auf dem Schoß.$" + .string "It’s a painting of a beautiful, smiling\n" + .string "woman with a POKéMON on her lap.$" LilycoveCity_LilycoveMuseum_1F_Text_187641:: @ 8187641 - .string "Das Bild eines legendären POKéMON aus\n" - .string "längst vergangener Zeit.\p" - .string "Der Künstler hat dies aus der\n" - .string "Vorstellung heraus gemalt.$" + .string "It’s a painting of a legendary POKéMON\n" + .string "from long ago.\p" + .string "The artist painted this from\n" + .string "imagination.$" LilycoveCity_LilycoveMuseum_1F_Text_1876A1:: @ 81876A1 - .string "PFLANZEN-POKéMON, die sich im\n" - .string "Wind wiegen.\p" - .string "Es scheint, als genießen sie das zarte\n" - .string "Streicheln des Windes.$" + .string "It’s a painting of GRASS POKéMON\n" + .string "swaying in a breeze.\p" + .string "They appear to be enjoying the wind’s\n" + .string "gentle caress.$" LilycoveCity_LilycoveMuseum_1F_Text_18770C:: @ 818770C - .string "BEEREN. Sie sehen äußerst delikat aus.\p" - .string "Das Bild kann einen hungrig machen!$" + .string "It’s a delicious-looking painting\n" + .string "of BERRIES.\p" + .string "This painting could make you hungry!$" LilycoveCity_LilycoveMuseum_1F_Text_18775F:: @ 818775F - .string "Ein Replikat einer berühmten Skulptur.\p" - .string "Es zeigt ein antikes VOGEL-POKéMON.$" + .string "It’s a replica of a famous sculpture.\p" + .string "It depicts an ancient BIRD POKéMON.$" LilycoveCity_LilycoveMuseum_1F_Text_1877A9:: @ 81877A9 - .string "Ein großer POKéBALL aus schwarzem\n" - .string "Stein gehauen.\p" - .string "In früheren Zeiten wurde er zu\n" - .string "Festlichkeiten ausgestellt.$" + .string "It’s a big POKé BALL carved from a\n" + .string "black stone.\p" + .string "It was apparently used in festivals\n" + .string "in the olden days.$" LilycoveCity_LilycoveMuseum_1F_Text_187810:: @ 8187810 - .string "Eine große Steintafel, auf der POKéMON\n" - .string "und eng gesetzte, kleine Schrift-\l" - .string "zeichen einer alten unverständlichen\l" - .string "Sprache eingraviert sind.$" + .string "It’s a huge stone tablet inscribed\n" + .string "with POKéMON and dense text in the\l" + .string "small characters of an ancient,\l" + .string "unreadable language.$" UnknownString_818788B: @ 818788B .string "Hmmm...\n" - .string "Was für eine große Pracht...$" + .string "What works of great magnificence...$" LilycoveCity_LilycoveMuseum_1F_Text_1878B7:: @ 81878B7 - .string "Die Kämpfe mit POKéMON machen schon\n" - .string "Spaß, das gebe ich zu.\p" - .string "Aber man darf darüber nicht seine Liebe\n" - .string "zu den schönen Künsten vergessen.$" + .string "Battling with POKéMON is fun,\n" + .string "I’ll grant you that.\p" + .string "But one mustn’t forget our love for\n" + .string "the fine arts.$" LilycoveCity_LilycoveMuseum_1F_Text_18791D:: @ 818791D - .string "Dieses KUNSTMUSEUM... Hier bekommst du\n" - .string "viele fantastische Gemälde zu sehen.\p" - .string "Und der KURATOR ist einfach wunderbar.\p" - .string "Unter Künstlern wie mir ist dieses\n" - .string "MUSEUM einfach eine Inspiration.$" + .string "This ART MUSEUM... Well, you could\n" + .string "see many fantastic paintings.\p" + .string "And the CURATOR is a wonderful person.\p" + .string "Among artists like myself, this MUSEUM\n" + .string "is an inspiration.$" LilycoveCity_LilycoveMuseum_1F_Text_1879BF:: @ 81879BF - .string "Diese Frau ist hübsch!\n" - .string "Genau wie meine Mama!$" + .string "This lady is pretty!\n" + .string "She’s like Mommy!$" LilycoveCity_LilycoveMuseum_1F_Text_1879E6:: @ 81879E6 - .string "Dieses POKéMON ist anbetungswürdig!\n" - .string "Genau wie unser kleiner Sohn!$" + .string "This POKéMON is adorable!\n" + .string "Just like our little boy!$" LilycoveCity_LilycoveMuseum_1F_Text_187A1A:: @ 8187A1A - .string "Ich habe gehört, dass das KUNSTMUSEUM\n" - .string "einige neue Gemälde erhalten hat.\p" - .string "Die will ich mir natürlich sofort\n" - .string "anschauen.\p" - .string "Befinden sich die neuen Gemälde im\n" - .string "zweiten Stockwerk?$" + .string "I’d heard that this ART MUSEUM got\n" + .string "in some new paintings.\p" + .string "So, naturally I hurried over.\p" + .string "Are the new paintings up on the\n" + .string "second floor?$" LilycoveCity_LilycoveMuseum_1F_Text_187AA0:: @ 8187AA0 - .string "In letzter Zeit war der KURATOR außer-\n" - .string "gewöhnlich gut gelaunt.\p" - .string "Ich wette, er hat etwas Tolles erlebt.\n" - .string "Mit Sicherheit!$" + .string "Lately, the CURATOR has been\n" + .string "unusually cheerful.\p" + .string "I bet something good happened for him.\n" + .string "Definitely.$" LilycoveCity_LilycoveMuseum_1F_Text_187B04:: @ 8187B04 - .string "Ich will mir hier viele große Werke an-\n" - .string "schauen und von ihnen lernen.\p" - .string "Ich träume davon, eines Tages hier\n" - .string "meine eigene Ausstellung zu haben.$" + .string "I aim to see many great paintings\n" + .string "here and learn from them.\p" + .string "I have this dream of one day having\n" + .string "my artwork exhibited here.$" LilycoveCity_LilycoveMuseum_1F_Text_187B7F:: @ 8187B7F - .string "Das KUNSTMUSEUM ist zu einem\n" - .string "beliebten Ziel für Touristen geworden.\p" - .string "Das ist großartig für SEEGRASULB CITY.\n" - .string "Nein, großartig für die ganze HOENN-\l" - .string "Region!\p" - .string "Ein einziger TRAINER soll all die Gemälde\n" - .string "im oberen Stockwerk beschafft haben.$" + .string "The ART MUSEUM has become a favorite\n" + .string "tourist destination.\p" + .string "It’s great for LILYCOVE...\n" + .string "No, great for the HOENN region!\p" + .string "This is what I’ve heard - a lone TRAINER\n" + .string "procured all the paintings upstairs.$" diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc index 4fc29ee73..067cc335f 100644 --- a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,114 +1,114 @@ LilycoveCity_LilycoveMuseum_2F_Text_187C42:: @ 8187C42 - .string "Dies ist unser besonderer Ausstellungs-\n" - .string "raum.$" + .string "This is our special exhibit hall.$" LilycoveCity_LilycoveMuseum_2F_Text_187C64:: @ 8187C64 - .string "Wie du klar erkennen kannst, gibt es\n" - .string "hier nicht ein einziges Gemälde.\p" - .string "Ich möchte hier auch nicht einfach die\n" - .string "Gemälde der so genannten Klassiker\l" - .string "ausstellen.\p" - .string "Hier soll Kunst zu sehen sein, die\n" - .string "weit von den Klassikern entfernt ist.\p" - .string "Kunst ist doch nicht nur auf alte,\n" - .string "berühmte Werke begrenzt!\p" - .string "In diesem Ausstellungsraum will ich...\p" - .string "Moderne und lebendige Kunst über\n" - .string "POKéMON sehen, die bereit sind, in\l" - .string "ein ruhmreiches Leben zu treten!$" + .string "As you can plainly see, there is not a\n" + .string "single painting on exhibit.\p" + .string "Here, I don’t wish to exhibit works of\n" + .string "so-called classical art.\p" + .string "Such classical works you can see on\n" + .string "our ground floor.\p" + .string "I wish to exhibit work that is far\n" + .string "different from the classics.\p" + .string "Art, after all, is not restricted to old,\n" + .string "famous works!\p" + .string "This exhibit hall, I wish to fill it with...\p" + .string "Modern and vibrant artworks of\n" + .string "POKéMON seemingly ready to spring\l" + .string "forth into glorious life!$" LilycoveCity_LilycoveMuseum_2F_Text_187E1D:: @ 8187E1D - .string "Oh, entschuldige. Ich wollte dich nicht\n" - .string "mit meinen Monologen langweilen.\p" - .string "Nun, du bist jung und offensichtlich\n" - .string "weit gereist...\p" - .string "Du hast bestimmt schon viele POKéMON\n" - .string "gesehen und Bilder, die sie darstellen.\p" - .string "Wenn du ein solches Bild siehst, kannst\n" - .string "du den Künstler bitte fragen, ob wir\l" - .string "sein Werk hier ausstellen dürfen?$" + .string "I beg your pardon. I didn’t intend\n" + .string "to monopolize the conversation.\p" + .string "Now, as you are young, and yet\n" + .string "obviously well traveled...\p" + .string "You must encounter lively POKéMON\n" + .string "and works of art depicting them.\p" + .string "If you were to come across such a\n" + .string "painting, may we ask you to obtain\l" + .string "the artist’s permission to exhibit\l" + .string "it here?$" LilycoveCity_LilycoveMuseum_2F_Text_187F4E:: @ 8187F4E - .string "Ich möchte diesen Ausstellungsraum mit\n" - .string "modernen und lebendigen Gemälden von\l" - .string "POKéMON füllen.$" + .string "I wish to fill this exhibit hall with\n" + .string "modern and vibrant paintings of\l" + .string "POKéMON.$" LilycoveCity_LilycoveMuseum_2F_Text_187F9D:: @ 8187F9D - .string "Dank dir konnten wir ein neues Gemälde\n" - .string "für unsere Kollektion erwerben!\p" - .string "Ich habe gehört, es stellt dein POKéMON\n" - .string "dar. Wirklich einzigartig!\p" - .string "Vielen, vielen Dank!$" + .string "Thanks to you, we’ve added a new\n" + .string "painting to our collection!\p" + .string "I’ve heard it depicts your POKéMON.\n" + .string "Truly magnificent!\p" + .string "Thank you so very, very much!$" LilycoveCity_LilycoveMuseum_2F_Text_18802F:: @ 818802F - .string "Ah! Du bist es!\n" + .string "Ah! It’s you!\n" .string "{PLAYER}!$" LilycoveCity_LilycoveMuseum_2F_Text_188041:: @ 8188041 - .string "Ist das nicht fantastisch?\n" - .string "Diese Sammlung von Gemälden!\p" - .string "Jedes einzelne makellos!\n" - .string "Keines besser als das andere!\p" - .string "Diese Gemälde ziehen viele neue\n" - .string "Besucher für unser KUNSTMUSEUM an.\p" - .string "Ehrlich, ich danke dir, {PLAYER}.\n" - .string "Mein Traum ist wahr geworden!$" + .string "Isn’t this marvelous?\n" + .string "This collection of paintings!\p" + .string "Each one of them flawless!\n" + .string "None better than another!\p" + .string "These paintings have attracted\n" + .string "more guests to our ART MUSEUM.\p" + .string "Sincerely, I thank you, {PLAYER}.\n" + .string "This is my dream come true!$" LilycoveCity_LilycoveMuseum_2F_Text_188120:: @ 8188120 - .string "Dies ist nur ein kleines Dankeschön.$" + .string "This is merely a token of my gratitude.$" UnknownString_8188148: @ 8188148 - .string "{PLAYER} erhält das GLASORNAMENT.$" + .string "{PLAYER} received a GLASS ORNAMENT.$" LilycoveCity_LilycoveMuseum_2F_Text_188166:: @ 8188166 - .string "Ich werde das für dich aufbewahren, bis\n" - .string "wir uns wieder sehen.$" + .string "I will keep this for you until we\n" + .string "meet again.$" LilycoveCity_LilycoveMuseum_2F_Text_188194:: @ 8188194 - .string "Ah, schön dich zu sehen, {PLAYER}!\p" - .string "Es ist eine Ehre für uns, dass du uns\n" - .string "trotz deiner vielen Aufgaben besuchst.\p" - .string "Bitte, entspanne dich und genieße\n" - .string "deinen Besuch bei uns.$" + .string "Ah, so good to see you, {PLAYER}!\p" + .string "It’s an honor to have you visit us\n" + .string "on your busy journeys.\p" + .string "Please, relax and do enjoy your\n" + .string "visit with us.$" LilycoveCity_LilycoveMuseum_2F_Text_188219:: @ 8188219 - .string "Ein Bilderrahmen mit pinkfarbenen\n" - .string "Verzierungen.$" + .string "It’s a picture frame with pink-colored\n" + .string "adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_18824C:: @ 818824C - .string "Ein Bilderrahmen mit gelben\n" - .string "Verzierungen.$" + .string "It’s a picture frame with yellow-colored\n" + .string "adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_188281:: @ 8188281 - .string "Ein Bilderrahmen mit blauen\n" - .string "Verzierungen.$" + .string "It’s a picture frame with blue-colored\n" + .string "adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_1882B4:: @ 81882B4 - .string "Ein Bilderrahmen mit roten\n" - .string "Verzierungen.$" + .string "It’s a picture frame with red-colored\n" + .string "adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_1882E6:: @ 81882E6 - .string "Ein Bilderrahmen mit grünen\n" - .string "Verzierungen.$" + .string "It’s a picture frame with green-colored\n" + .string "adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_18831A:: @ 818831A - .string "Ein Bild eines POKéMON.$" + .string "It’s a painting of POKéMON.$" LilycoveCity_LilycoveMuseum_2F_Text_188336:: @ 8188336 - .string "Ich war eine Weile nicht hier, daher\n" - .string "haben mich die neuen Gemälde über-\l" - .string "rascht.\p" - .string "Ich wünschte, jemand würde mein\n" - .string "POKéMON so wunderbar porträtieren.$" + .string "I’ve been away awhile, so the new\n" + .string "paintings up here surprised me.\p" + .string "I wish someone would paint my POKéMON\n" + .string "this pretty.$" LilycoveCity_LilycoveMuseum_2F_Text_1883AB:: @ 81883AB - .string "Nun... Hier stellen sie also Werke zum\n" - .string "Thema POKéMON aus.\p" - .string "Ich sehe schon. Die Gemälde sind\n" - .string "wirklich amüsant.$" + .string "Well... So this is where they show the\n" + .string "topical POKéMON paintings.\p" + .string "I see, these new paintings are indeed\n" + .string "rather amusing.$" LilycoveCity_LilycoveMuseum_2F_Text_188423:: @ 8188423 - .string "Wow, ehrlich?\n" - .string "Das sind Gemälde deiner POKéMON?\p" - .string "Ist das nicht die absolute Freude für\n" - .string "einen TRAINER?$" + .string "Wow, is that right?\n" + .string "These paintings are of your POKéMON.\p" + .string "Isn’t that just the ultimate joy for\n" + .string "a TRAINER?$" diff --git a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc b/data/text/maps/LilycoveCity_MoveDeletersHouse.inc index 0898d7e2a..1e2181aca 100644 --- a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/text/maps/LilycoveCity_MoveDeletersHouse.inc @@ -1,34 +1,32 @@ LilycoveCity_MoveDeletersHouse_Text_18B622:: @ 818B622 - .string "Äh...\n" - .string "Oh, ja. Ich bin der ATTACKEN-VERLERNER.\p" - .string "Ich sorge dafür, dass die POKéMON ihre\n" - .string "Attacken vergessen.\p" - .string "Möchtest du, dass ich dir helfe?$" + .string "Uh...\n" + .string "Oh, yes, I’m the MOVE DELETER.\p" + .string "I can make POKéMON forget their moves.\p" + .string "Would you like me to do that?$" LilycoveCity_MoveDeletersHouse_Text_18B68C:: @ 818B68C - .string "Welches POKéMON soll eine Attacke\n" - .string "vergessen?$" + .string "Which POKéMON should forget a move?$" LilycoveCity_MoveDeletersHouse_Text_18B6B0:: @ 818B6B0 - .string "Welche Attacke soll vergessen werden?$" + .string "Which move should be forgotten?$" LilycoveCity_MoveDeletersHouse_Text_18B6D0:: @ 818B6D0 - .string "{STR_VAR_1} kennt scheinbar nur eine\n" - .string "einzige Attacke...$" + .string "{STR_VAR_1} seems to know only one\n" + .string "move...$" LilycoveCity_MoveDeletersHouse_Text_18B6F2:: @ 818B6F2 - .string "Hm! {STR_VAR_2} von {STR_VAR_1}?\n" - .string "Diese Attacke soll vergessen werden?$" + .string "Hm! {STR_VAR_1}’s {STR_VAR_2}?\n" + .string "That move should be forgotten?$" LilycoveCity_MoveDeletersHouse_Text_18B71E:: @ 818B71E - .string "Das klappte doch perfekt!\p" - .string "{STR_VAR_1} hat {STR_VAR_2}\n" - .string "komplett vergessen.$" + .string "It worked to perfection!\p" + .string "{STR_VAR_1} has forgotten\n" + .string "{STR_VAR_2} completely.$" LilycoveCity_MoveDeletersHouse_Text_18B757:: @ 818B757 - .string "Komm wieder, wenn es andere Attacken\n" - .string "gibt, die vergessen werden sollen.$" + .string "Come again if there are other moves\n" + .string "to be forgotten.$" LilycoveCity_MoveDeletersHouse_Text_18B78C:: @ 818B78C - .string "Was?\n" - .string "Ein EI kennt doch keine Attacken!$" + .string "What?\n" + .string "No EGG should know any moves.$" diff --git a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc b/data/text/maps/LilycoveCity_PokemonCenter_1F.inc index b1f676671..c0cbb7436 100644 --- a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/text/maps/LilycoveCity_PokemonCenter_1F.inc @@ -1,29 +1,26 @@ LilycoveCity_PokemonCenter_1F_Text_189FC9:: @ 8189FC9 - .string "Ich frage mich, wie viele Arten von\n" - .string "POKéMON es in der Welt wohl gibt?\p" - .string "Es muss toll sein, die Meere zu über-\n" - .string "queren und POKéMON mit Leuten zu\l" - .string "tauschen, die weit weg leben.$" + .string "I wonder how many kinds of POKéMON\n" + .string "there are in the world?\p" + .string "It’d be great to cross seas and\n" + .string "trade POKéMON with people far away.$" LilycoveCity_PokemonCenter_1F_Text_18A048:: @ 818A048 - .string "Ich habe von einigen Schurken gehört,\n" - .string "die POKéMON stehlen und METEORITEN\l" - .string "klauen.$" + .string "I’ve been hearing about some rotten\n" + .string "scoundrels who steal POKéMON and rip\l" + .string "off METEORITES.$" LilycoveCity_PokemonCenter_1F_Text_18A0A1:: @ 818A0A1 - .string "Diese verkommenen Schurken, die\n" - .string "POKéMON stehlen und METEORITEN\l" - .string "klauen...\p" - .string "Ich habe sie in letzter Zeit nicht\n" - .string "gesehen.$" + .string "Those rotten scoundrels who steal\n" + .string "POKéMON and rip off METEORITES...\p" + .string "I haven’t seen them around recently.$" UnknownString_818A10A: @ 818A10A - .string "Ich besorge mir X-ANGRIFF, um meine\n" - .string "ATTACKEN im Kampf zu verstärken.\p" - .string "Auf diese Weise gewinne ich garantiert.$" + .string "I’m going to get X ATTACK to raise\n" + .string "ATTACK during battle.\p" + .string "That way, I’ll be guaranteed to win!$" UnknownString_818A168: @ 818A168 - .string "HYPERHEILER ist etwas teuer, aber sehr\n" - .string "nützlich.\p" - .string "Einer davon kann alle Statusprobleme\n" - .string "eines POKéMON heilen.$" + .string "FULL HEAL is a little expensive,\n" + .string "but it is convenient.\p" + .string "Just one of these can cure any\n" + .string "POKéMON status problem.$" diff --git a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc index 09b4d59b5..fbfbf4353 100644 --- a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -1,261 +1,251 @@ LilycoveCity_PokemonTrainerFanClub_Text_18A1D6:: @ 818A1D6 .string "Oh, wow!\n" - .string "Das ist {PLAYER}!$" + .string "It’s {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18A1E8:: @ 818A1E8 - .string "Ich habe die Neuigkeit schon gehört.\n" - .string "Du bist wirklich stark, nicht wahr?\p" - .string "Wir diskutieren immer darüber, wer hier\n" - .string "der stärkste TRAINER ist.\p" - .string "Als ich von dir gehört habe, beschloss\n" - .string "ich, dein Fan zu werden!\p" - .string "Ich hoffe, du wirst auch weiterhin\n" - .string "gegen starke TRAINER antreten.\p" - .string "So kommen wir auch weiterhin in den\n" - .string "Genuss deiner megaheißen Kämpfe.\p" - .string "Dann sehen auch die anderen hier, wie\n" - .string "stark du wirklich bist!\p" - .string "Denk dran: Ich jubele dir zu,\n" + .string "I’ve heard the news!\n" + .string "You’re really strong, aren’t you?\p" + .string "We always argue about who is the\n" + .string "strongest of all TRAINERS here.\p" + .string "So when I heard about you, I decided\n" + .string "to be your fan!\p" + .string "I hope you’ll keep on battling other\n" + .string "tough TRAINERS.\p" + .string "That way, we’ll be able to see more\n" + .string "of your hot, hot battles.\p" + .string "That will make the others here see\n" + .string "exactly how great you are.\p" + .string "Remember, I’m cheering for you,\n" .string "{PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18A36A:: @ 818A36A - .string "Ja, {PLAYER}!\n" - .string "Dich wollen wir als Sieger sehen!$" + .string "Yo, {PLAYER}!\n" + .string "You’re the one we want to win!$" LilycoveCity_PokemonTrainerFanClub_Text_18A391:: @ 818A391 - .string "Die anderen wissen gar nicht, dass du\n" - .string "besser bist als alle anderen!\p" - .string "Das stimmt doch, oder {PLAYER}?\n" - .string "Zeig ihnen, was du drauf hast!$" + .string "The others, they don’t know that\n" + .string "you’re the best of the best!\p" + .string "Isn’t that right, {PLAYER}?\n" + .string "Show them you’ve got guts!$" LilycoveCity_PokemonTrainerFanClub_Text_18A400:: @ 818A400 - .string "Ich sage es ja nicht gerne, aber der\n" - .string "TRAINER, über den alle sprechen, ist\l" - .string "{STR_VAR_1}, keine Frage!\p" - .string "Die Stärke dieses TRAINERS...\n" - .string "Ganz außergewöhnlich.$" + .string "I hate to say this, but the TRAINER\n" + .string "everybody’s talking about is\l" + .string "{STR_VAR_1}, no question about it!\p" + .string "That TRAINER’s power...\n" + .string "It’s out of the ordinary.$" LilycoveCity_PokemonTrainerFanClub_Text_18A48D:: @ 818A48D - .string "Mist... Ich sage jedem, dass {STR_VAR_1}\n" - .string "der Beste von allen ist.\p" - .string "Aber niemand hört mir zu...$" + .string "Darn it... I’ve been telling people\n" + .string "that {STR_VAR_1} is the best now...\p" + .string "But no one wants to listen...$" LilycoveCity_PokemonTrainerFanClub_Text_18A4EA:: @ 818A4EA - .string "Ich habe etwas über einen neuen,\n" - .string "starken TRAINER gehört.\p" - .string "Dieser TRAINER wird bestimmt auch die\n" - .string "ARENALEITER besiegen.\p" - .string "Weißt du irgendwas über diesen neuen\n" - .string "TRAINER?$" + .string "I’ve been hearing things about a\n" + .string "tough new TRAINER.\p" + .string "This TRAINER’s supposed to be beating\n" + .string "GYM LEADERS, even.\p" + .string "Do you know anything about this\n" + .string "new TRAINER?$" LilycoveCity_PokemonTrainerFanClub_Text_18A584:: @ 818A584 .string "Oh!\n" .string "{PLAYER}!\p" - .string "Los!\n" - .string "Ich drücke dir die Daumen!$" + .string "Go for it!\n" + .string "I’m pulling for you!$" LilycoveCity_PokemonTrainerFanClub_Text_18A5AC:: @ 818A5AC - .string "Seufz...\n" - .string "KAMILLO...\p" - .string "Oh, nein! Warte mal!\n" - .string "Das stimmt gar nicht! Nein, nein!\p" - .string "Ich bin dein größter Fan!\p" - .string "Also mach mich stolz!\n" - .string "Los!$" + .string "Sigh...\n" + .string "BRAWLY...\p" + .string "Oh, no! Wait!\n" + .string "That’s not right! No, no, no!\p" + .string "I’m your fan through and through!\p" + .string "So make me proud!\n" + .string "Go for it!$" LilycoveCity_PokemonTrainerFanClub_Text_18A629:: @ 818A629 - .string "Ich kann mir nicht helfen, aber ich\n" - .string "finde nur KAMILLO klasse...$" + .string "I can’t help it, I can only get to\n" + .string "like BRAWLY...$" LilycoveCity_PokemonTrainerFanClub_Text_18A65B:: @ 818A65B - .string "Niemand erkennt den Charme von\n" - .string "KAMILLO...\p" - .string "Mir doch egal!\p" - .string "Auch wenn keiner ihm zujubelt, ICH\n" - .string "unterstütze KAMILLO!$" + .string "Nobody understands the charm of\n" + .string "BRAWLY...\p" + .string "I don’t care!\p" + .string "Even if I’m the only one, I’m going\n" + .string "to keep cheering for BRAWLY!$" LilycoveCity_PokemonTrainerFanClub_Text_18A6D4:: @ 818A6D4 - .string "Egal, was die anderen sagen, der ARENA-\n" - .string "LEITER von FAUSTAUHAVEN, KAMILLO,\l" - .string "ist mein Favorit!$" + .string "Whatever anyone says, my favorite\n" + .string "TRAINER is DEWFORD’s GYM LEADER\l" + .string "BRAWLY!$" LilycoveCity_PokemonTrainerFanClub_Text_18A71E:: @ 818A71E - .string "Du hast deinen Vater in jeder Hinsicht\n" - .string "übertroffen!\p" - .string "Das sag ich dir. Und da gibt es\n" - .string "überhaupt keinen Zweifel dran!$" + .string "You’ve surpassed your own father in\n" + .string "every regard!\p" + .string "I’m telling you, so there’s no question\n" + .string "about it at all!$" LilycoveCity_PokemonTrainerFanClub_Text_18A789:: @ 818A789 - .string "Selbst in scheinbar aussichtslosen\n" - .string "Situationen gibt dein Vater nicht auf.\p" - .string "Ich weiß, dass das stimmt!\p" - .string "Und du verhältst dich genauso.\n" - .string "Also, kämpfe fleißig weiter.$" + .string "Even when things turned bleak, your\n" + .string "father never gave up.\p" + .string "This I know to be true.\p" + .string "You never give up even if you lose!\n" + .string "So keep on battling!$" LilycoveCity_PokemonTrainerFanClub_Text_18A814:: @ 818A814 - .string "NORMAN hat im Kampf mehr Kraft, \n" - .string "Charisma und Darbietungstalent\l" - .string "gezeigt als du.\p" - .string "Auch wenn die Leute sagen, dass du\n" - .string "stark bist...\p" - .string "Du hast noch einen weiten Weg vor dir,\n" - .string "wenn du so werden willst wie dein Vater.$" + .string "NORMAN battled with more power,\n" + .string "charisma, and showmanship than you.\p" + .string "Even though people may say that\n" + .string "you’re strong...\p" + .string "You’ve still got a long way to go\n" + .string "compared to your father.$" LilycoveCity_PokemonTrainerFanClub_Text_18A8C4:: @ 818A8C4 - .string "Du bekommst langsam auch die Aura von\n" - .string "Autorität, die NORMAN umgibt.\p" - .string "Aber es gibt einen gewaltigen\n" - .string "Unterschied zwischen dir und NORMAN.\p" - .string "Aber ich kann dir nicht sagen, was das\n" - .string "ist. Du musst es selbst herausfinden.$" + .string "You’re beginning to get the same\n" + .string "air of awe NORMAN exudes.\p" + .string "But there’s something conclusively\n" + .string "different between you and NORMAN.\p" + .string "I can’t tell you what that is.\n" + .string "You’ll have to find it yourself.$" LilycoveCity_PokemonTrainerFanClub_Text_18A984:: @ 818A984 - .string "Jeder hier ist ein großer Fan von\n" - .string "POKéMON-Kämpfen.\p" - .string "Wir diskutieren gerade, welcher\n" - .string "TRAINER der stärkste ist.\p" - .string "Wenn du berühmt wirst, werden wir\n" - .string "vielleicht deine Fans!$" + .string "Everyone here, we’re all huge fans\n" + .string "of POKéMON battles.\p" + .string "We discuss who we consider to be\n" + .string "the strongest of all TRAINERS.\p" + .string "If you were to become famous, we\n" + .string "might even become your fans!$" LilycoveCity_PokemonTrainerFanClub_Text_18AA39:: @ 818AA39 - .string "KREISCH! Das ist {PLAYER}!\n" - .string "Wirklich und wahrhaftig!!!\p" - .string "Bitte, schüttle mir die Hand! Biiitte!!!$" + .string "Oh, woweee! It’s {PLAYER}!\n" + .string "For real, too!\p" + .string "Please, shake my hand, shake my hand!$" LilycoveCity_PokemonTrainerFanClub_Text_18AA83:: @ 818AA83 - .string "Ich juble dir ständig zu, {PLAYER}!\n" - .string "Immer! Iiimmer!\p" - .string "Ich möchte dich niemals als Verlierer\n" - .string "sehen, {PLAYER}.\p" - .string "Ich weiß, dass du sehr, sehr, sehr stark\n" - .string "bist, {PLAYER}!$" + .string "I’ll always cheer for you, {PLAYER}!\n" + .string "Always, always!\p" + .string "I don’t want to see you lose ever,\n" + .string "{PLAYER}.\p" + .string "Because I know you’re really, really\n" + .string "strong, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18AB0A:: @ 818AB0A - .string "{STR_VAR_1} ist wirklich megacool...\p" - .string "Jeder denkt das, stimmt’s? Stimmt’s?!?$" + .string "{STR_VAR_1} is really cool...\p" + .string "Everyone thinks so, right, right?$" LilycoveCity_PokemonTrainerFanClub_Text_18AB41:: @ 818AB41 - .string "{STR_VAR_1} ist cooool, meinst du nicht\n" - .string "auch?\p" - .string "Selbst ein Würstchen wie ich jubelt\n" - .string "seinem favorisierten TRAINER zu.$" + .string "{STR_VAR_1} really is cool, don’t\n" + .string "you think so?\p" + .string "Even if it’s just me, I’m going to keep\n" + .string "cheering my favorite TRAINER.$" LilycoveCity_PokemonTrainerFanClub_Text_18ABAE:: @ 818ABAE - .string "Mein Lieblings-TRAINER muss...\p" - .string "cool...\p" - .string "stark...\p" - .string "und total nett sein...\p" - .string "Ich wollte, es gäbe so einen TRAINER...$" + .string "My favorite TRAINER is...\p" + .string "Cool...\p" + .string "Strong...\p" + .string "And really nice...\p" + .string "I wish there was a TRAINER like that...$" LilycoveCity_PokemonTrainerFanClub_Text_18AC15:: @ 818AC15 - .string "Hui! Das ist {PLAYER}!\n" - .string "Wahnsinn!\p" - .string "Wenn ich groß bin, möchte ich auch so\n" - .string "stark sein wie du, {PLAYER}!$" + .string "Whoa! It’s {PLAYER}!\n" + .string "Wicked!\p" + .string "When I grow up, I want to be strong\n" + .string "like you, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18AC5E:: @ 818AC5E - .string "Auch wenn ich dein einziger Fan bin...\p" - .string "Ich werde dir immer zujubeln, du bist\n" - .string "mein Favorit, {PLAYER}!\p" - .string "Denn ich glaube an dich, {PLAYER}!$" + .string "Even if I’m the only one...\p" + .string "You’ll always be the only one I\n" + .string "cheer for, {PLAYER}!\p" + .string "Because I believe in you, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_18ACC7:: @ 818ACC7 - .string "{STR_VAR_1} ist so unverschämt cool...\n" - .string "Ich möchte meinem Held die Hand\l" - .string "schütteln.$" + .string "{STR_VAR_1} is so wickedly cool...\n" + .string "I want to shake hands with my hero.$" LilycoveCity_PokemonTrainerFanClub_Text_18AD05:: @ 818AD05 - .string "Auch wenn ich der einzige Fan bin...\p" - .string "Ich werde niemals aufhören,\n" - .string "ein Fan von {STR_VAR_1} zu sein!\p" - .string "Denn ich habe gehört, dass {STR_VAR_1}\n" - .string "niemals verliert!$" + .string "Even if I’m the only one...\p" + .string "I’m never going to stop being\n" + .string "{STR_VAR_1}’s fan!\p" + .string "Because I’ve heard, {STR_VAR_1}\n" + .string "never loses!$" LilycoveCity_PokemonTrainerFanClub_Text_18AD6D:: @ 818AD6D .string "{PLAYER}!\n" - .string "Du bist wirklich unglaublich!\p" - .string "Schon als ich dich das erste Mal gesehen\n" - .string "habe, habe ich deine Einzigartigkeit\l" - .string "bemerkt.\p" - .string "Scheinbar täuschen mich meine Augen\n" - .string "nie.$" + .string "You are amazing after all!\p" + .string "Ever since I set eyes on you, I knew\n" + .string "that you were great.\p" + .string "It looks like my eyes didn’t deceive me.$" LilycoveCity_PokemonTrainerFanClub_Text_18ADEF:: @ 818ADEF - .string "Wen kümmern schon die anderen?\n" - .string "Ich bin auf deiner Seite!\p" - .string "Keine Sorge. Geh da raus und kämpfe\n" - .string "wie immer.$" + .string "Who cares about the others.\n" + .string "I’m in your corner!\p" + .string "You don’t need to worry. Just get\n" + .string "out there and battle like always.$" LilycoveCity_PokemonTrainerFanClub_Text_18AE63:: @ 818AE63 - .string "Du bist ein anständiger TRAINER.\n" - .string "Das ist meine Meinung.\p" - .string "Aber ich denke, {STR_VAR_1} ist im\n" - .string "Moment die Nummer eins.\p" - .string "Das ist jedenfalls meine Auffassung.\n" - .string "Aber lass dir darüber keine grauen\l" - .string "Haare wachsen.$" + .string "You’re a pretty decent TRAINER,\n" + .string "I think.\p" + .string "But I also think that {STR_VAR_1}\n" + .string "is number one right now.\p" + .string "That’s just my opinion.\n" + .string "Don’t worry about it too much.$" LilycoveCity_PokemonTrainerFanClub_Text_18AEF5:: @ 818AEF5 - .string "Wow, du bist wirklich sehr stark.\n" - .string "Vielleicht sogar stärker als\l" - .string "{STR_VAR_1}.\p" - .string "Aber {STR_VAR_1} braucht mich.\p" - .string "Wenn ich {STR_VAR_1} nicht zujuble, wer\n" - .string "wird es dann tun?$" + .string "Wow, you really are strong.\n" + .string "Maybe even stronger than {STR_VAR_1}.\p" + .string "But {STR_VAR_1} needs me.\p" + .string "If I don’t cheer for {STR_VAR_1},\n" + .string "who will?$" LilycoveCity_PokemonTrainerFanClub_Text_18AF62:: @ 818AF62 - .string "Du hast mich überzeugt.\n" - .string "Du bist stark, nicht wahr?\p" - .string "Würdest du mir bitte erzählen, wie\n" - .string "du so stark geworden bist?$" + .string "You’ve changed my mind!\n" + .string "You are strong, aren’t you?\p" + .string "I’d like you to tell me how you managed\n" + .string "to get so strong!$" LilycoveCity_PokemonTrainerFanClub_Text_18AFD0:: @ 818AFD0 - .string "Je schwieriger die Lage, desto\n" - .string "ästhetischer wird dein Kampf.\p" - .string "Ich kann deinen nächsten Kampf gar\n" - .string "nicht erwarten!$" + .string "The tougher the situation, the more\n" + .string "attractively you battle.\p" + .string "I can’t wait for your next battle!$" LilycoveCity_PokemonTrainerFanClub_Text_18B030:: @ 818B030 - .string "Unter den wirklich heißen TRAINERN\n" - .string "hebt sich {STR_VAR_1} besonders hervor.\p" - .string "Diese Stärke. Das ist nicht normal.\p" - .string "Du kämpfst auch sehr gut, aber du\n" - .string "gehörst nicht in die gleiche Klasse\l" - .string "wie {STR_VAR_1}.$" + .string "Among the recently hot TRAINERS,\n" + .string "{STR_VAR_1} is the standout.\p" + .string "That toughness, it’s simply not normal.\p" + .string "You’re doing okay, but you’re not in\n" + .string "the same class as {STR_VAR_1}.$" LilycoveCity_PokemonTrainerFanClub_Text_18B0C8:: @ 818B0C8 - .string "Du bist sehr populär...\p" - .string "Du bist stark und du sorgst gut für\n" - .string "deine POKéMON.\p" - .string "Aber, weißt du, ich glaube an\n" - .string "{STR_VAR_1}.\p" - .string "{STR_VAR_1} ist definitiv stärker!\n" - .string "Ich bin mir da sicher!$" + .string "You are really popular...\p" + .string "You’re strong, and you’re caring to\n" + .string "POKéMON. No one can knock you.\p" + .string "But, you know, I believe in {STR_VAR_1}.\p" + .string "{STR_VAR_1} is definitely stronger!\n" + .string "I’m positive!$" LilycoveCity_PokemonTrainerFanClub_Text_18B16E:: @ 818B16E - .string "Du...\p" - .string "Beeindruckend!$" + .string "You...\p" + .string "Impressive!$" LilycoveCity_PokemonTrainerFanClub_Text_18B181:: @ 818B181 - .string "Dein wahrer Wert... Es ist gut, wenn\n" - .string "nur ich ihn erkenne.\p" - .string "Ich glaube nicht, dass die anderen die\n" - .string "versteckten Kräfte verstehen würden.$" + .string "Your true worth, it is fine if only\n" + .string "I recognized it.\p" + .string "The others I doubt will understand\n" + .string "the hidden power that beats within.$" LilycoveCity_PokemonTrainerFanClub_Text_18B1FD:: @ 818B1FD - .string "Ja, deine Augen spiegeln deine Stärke\n" - .string "wider.\p" - .string "Aber!\p" - .string "Du hast dein eigenes Potential noch\n" - .string "nicht erkannt.$" + .string "Yes, I see strength in your eyes.\p" + .string "But!\p" + .string "You still haven’t realized your\n" + .string "potential.$" LilycoveCity_PokemonTrainerFanClub_Text_18B24F:: @ 818B24F - .string "Es stimmt, du agierst wirklich sehr\n" - .string "kraftvoll.\p" - .string "Aber!\n" - .string "Ich sage dir was!\p" - .string "Diese Kraft kann noch nicht als wahre\n" - .string "Stärke betrachtet werden!\p" - .string "Wahre Stärke ist...\n" + .string "It is true that you are tremendously\n" + .string "powerful.\p" + .string "But!\n" + .string "I can tell...\p" + .string "That strength cannot be considered\n" + .string "true strength yet!\p" + .string "True strength is...!\n" .string "... ...\p" - .string "Äh, eigentlich weiß ich das auch nicht...$" + .string "Actually, I have no idea, either.$" diff --git a/data/text/maps/LittlerootTown.inc b/data/text/maps/LittlerootTown.inc index e41038b1c..1e23d584f 100644 --- a/data/text/maps/LittlerootTown.inc +++ b/data/text/maps/LittlerootTown.inc @@ -1,100 +1,94 @@ LittlerootTown_Text_16A7C9:: @ 816A7C9 - .string "MUTTER: {PLAYER}, wir sind da, Schatz!\p" - .string "Die Fahrt im Umzugswagen zwischen all\n" - .string "unseren Sachen war bestimmt ermüdend.\p" - .string "Nun, wir sind in WURZELHEIM.\p" - .string "Wie gefällt es dir?\n" - .string "Dies ist unser neues Zuhause!\p" - .string "Ist das idyllisch! Man kann hier sicher\n" - .string "wunderbar leben, meinst du nicht?\p" - .string "Und... Du bekommst dein eigenes\n" - .string "Zimmer, {PLAYER}! Lass uns hineingehen!$" + .string "MOM: {PLAYER}, we’re here, honey!\p" + .string "It must be tiring riding with our things\n" + .string "in the moving truck.\p" + .string "Well, this is LITTLEROOT TOWN.\p" + .string "How do you like it?\n" + .string "This is our new home!\p" + .string "It has a quaint feel, but it seems to be\n" + .string "an easy place to live, don’t you think?\p" + .string "And, you get your own room, {PLAYER}!\n" + .string "Let’s go inside.$" LittlerootTown_Text_16A8EE:: @ 816A8EE - .string "MUTTER: Warte, {PLAYER}!$" + .string "MOM: Wait, {PLAYER}!$" LittlerootTown_Text_16A8FD:: @ 816A8FD - .string "MUTTER: {PLAYER}! Hast du dich schon\n" - .string "PROF. BIRK vorgestellt?\p" - .string "Oh! Was für ein hübsches POKéMON! Du\n" - .string "hast es von PROF. BIRK erhalten? Toll!\p" - .string "Du bist das Kind deines Vaters! Wunder-\n" - .string "bar. Du siehst gut aus mit deinem\l" - .string "POKéMON!\p" - .string "Hier, Liebling! Für eine Abenteuerreise\n" - .string "sind diese TURBOTRETER wie geschaffen.\p" - .string "Sie werden deinen Schritt\n" - .string "beschleunigen!$" + .string "MOM: {PLAYER}! {PLAYER}! Did you\n" + .string "introduce yourself to PROF. BIRCH?\p" + .string "Oh! What an adorable POKéMON!\n" + .string "You got it from PROF. BIRCH. How nice!\p" + .string "You’re your father’s child, all right.\n" + .string "You look good together with POKéMON!\p" + .string "Here, honey! If you’re going out on an\n" + .string "adventure, wear these RUNNING SHOES.\p" + .string "They’ll put a zip in your step!$" LittlerootTown_Text_16AA32:: @ 816AA32 - .string "{PLAYER} zieht die TURBOTRETER an.$" + .string "{PLAYER} switched shoes with the\n" + .string "RUNNING SHOES.$" LittlerootTown_Text_16AA5C:: @ 816AA5C - .string "MUTTER: {PLAYER}, für diese Schuhe gibt\n" - .string "es eine Bedienungsanleitung.\p" - .string "“Halte den B-Knopf gedrückt,\n" - .string "wenn du diese TURBOTRETER anhast,\l" - .string "um zu rennen!\p" - .string "Schlüpf in diese TURBOTRETER und\n" - .string "erobere die Welt da draußen!”$" + .string "MOM: {PLAYER}, those shoes came with\n" + .string "instructions.\p" + .string "“Press the B Button while wearing these\n" + .string "RUNNING SHOES to run extra-fast!\p" + .string "“Slip on these RUNNING SHOES and race\n" + .string "in the great outdoors!”$" LittlerootTown_Text_16AB10:: @ 816AB10 .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Sich vorzustellen, dass du nun dein\n" - .string "eigenes POKéMON besitzt...\l" - .string "Dein Vater wird überglücklich sein.\p" - .string "...Aber sei bitte vorsichtig.\n" - .string "Sollte etwas passieren, komm wieder\l" - .string "nach Hause.\p" - .string "Lauf, schnapp’ sie dir alle, Schatz!$" + .string "To think that you have your very own\n" + .string "POKéMON now...\l" + .string "Your father will be overjoyed.\p" + .string "...But please be careful.\n" + .string "If anything happens, you can come home.\p" + .string "Go on, go get them, honey!$" LittlerootTown_Text_16AC00:: @ 816AC00 - .string "Wenn du einen PC benutzt, kannst du\n" - .string "dort Items und POKéMON lagern.\p" - .string "Die Kraft der Wissenschaft ist\n" - .string "atemberaubend!$" + .string "If you use a PC, you can store items\n" + .string "and POKéMON.\p" + .string "The power of science is staggering!$" LittlerootTown_Text_16AC56:: @ 816AC56 - .string "PROF. BIRK verbringt seine Tage in\n" - .string "seinem LABOR, dann rennt er plötzlich\l" - .string "nach draußen in die Wildnis, um zu\l" - .string "forschen...\p" - .string "Wann ist PROF. BIRK eigentlich mal\n" - .string "zu Hause?$" + .string "PROF. BIRCH spends days in his LAB\n" + .string "studying, then he’ll suddenly go out in\l" + .string "the wild to do more research...\p" + .string "When does PROF. BIRCH spend time\n" + .string "at home?$" LittlerootTown_Text_16ACEB:: @ 816ACEB - .string "Wenn du in das hohe Gras am Seitenrand\n" - .string "der Pfade gehst, triffst du auf\l" - .string "wilde POKéMON.$" + .string "If you go in the tall grass at the sides\n" + .string "of this road, wild POKéMON will appear.$" LittlerootTown_Text_16AD3C:: @ 816AD3C - .string "Hast du keine POKéMON dabei, ist es\n" - .string "dort sehr gefährlich.$" + .string "It’s not safe to go out there if you\n" + .string "don’t have any POKéMON with you.$" LittlerootTown_Text_16AD82:: @ 816AD82 - .string "Ich kann am Ende dieser Straße\n" - .string "jemanden schreien hören.\p" - .string "Was soll ich tun? Was sollen wir tun?\n" - .string "Jemand muss doch helfen...$" + .string "I can hear someone shouting down the\n" + .string "road here.\p" + .string "What should I do? What should we do?\n" + .string "Somebody has to go help...$" LittlerootTown_Text_16ADF2:: @ 816ADF2 - .string "Junge, bin ich froh, dass du den\n" - .string "PROFESSOR gerettet hast!$" + .string "Boy, am I glad you went and rescued\n" + .string "the PROFESSOR.$" LittlerootTown_Text_16AE25:: @ 816AE25 - .string "Gehst du POKéMON fangen?\n" - .string "Viel Glück!$" + .string "Are you going to catch POKéMON?\n" + .string "Good luck!$" LittlerootTown_Text_16AE50:: @ 816AE50 - .string "WURZELHEIM\n" - .string "“Ein Ort, wie es ihn nur einmal gibt.”$" + .string "LITTLEROOT TOWN\n" + .string "“A town that can’t be shaded any hue.”$" LittlerootTown_Text_16AE87:: @ 816AE87 - .string "PROF. BIRKS POKéMON-LABOR$" + .string "PROF. BIRCH’S POKéMON LAB$" LittlerootTown_Text_16AEA1:: @ 816AEA1 - .string "HAUS von {PLAYER}$" + .string "{PLAYER}’s HOUSE$" LittlerootTown_Text_16AEAC:: @ 816AEAC - .string "PROF. BIRKS HAUS$" + .string "PROF. BIRCH’S HOUSE$" diff --git a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc b/data/text/maps/LittlerootTown_BrendansHouse_1F.inc index 9952028d1..888fc8973 100644 --- a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/text/maps/LittlerootTown_BrendansHouse_1F.inc @@ -1,76 +1,73 @@ LittlerootTown_BrendansHouse_1F_Text_172429:: @ 8172429 - .string "MUTTER: Siehst du, {PLAYER}?\n" - .string "Hier ist es doch auch schön, oder nicht?$" + .string "MOM: See, {PLAYER}?\n" + .string "Isn’t it nice in here, too?$" LittlerootTown_BrendansHouse_1F_Text_172453:: @ 8172453 - .string "Die POKéMON machen für uns den Umzug,\n" - .string "räumen alles ein und machen sauber.\l" - .string "Das ist doch so etwas von praktisch!\p" - .string "{PLAYER}, dein Zimmer ist oben.\n" - .string "Schau es dir doch mal an, Spatz!\p" - .string "VATI hat dir eine neue Uhr zur\n" - .string "Begrüßung geschenkt.\l" - .string "Vergiss nicht, sie einzustellen!$" + .string "The mover’s POKéMON do all the work\n" + .string "of moving us in and cleaning up after.\l" + .string "This is so convenient!\p" + .string "{PLAYER}, your room is upstairs.\n" + .string "Go check it out, dear!\p" + .string "DAD bought you a new clock to mark\n" + .string "our move here.\l" + .string "Don’t forget to set it!$" LittlerootTown_BrendansHouse_1F_Text_172531:: @ 8172531 - .string "MUTTER: Nun, {PLAYER}?\p" - .string "Bist du nicht neugierig, dein neues\n" - .string "Zimmer zu sehen?$" + .string "MOM: Well, {PLAYER}?\p" + .string "Aren’t you interested in seeing your\n" + .string "very own room?$" LittlerootTown_BrendansHouse_1F_Text_172574:: @ 8172574 LittlerootTown_MaysHouse_1F_Text_172574:: @ 8172574 - .string "MUTTER: {PLAYER}, Schatz!\p" - .string "Stell bitte die Uhr in deinem Zimmer ein.$" + .string "MOM: {PLAYER}.\p" + .string "Go set the clock in your room, honey.$" LittlerootTown_BrendansHouse_1F_Text_1725A3:: @ 81725A3 - .string "MUTTER: Oh! {PLAYER}! {PLAYER}!\n" - .string "Schnell! Komm schnell her!$" + .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" + .string "Quick! Come quickly!$" LittlerootTown_BrendansHouse_1F_Text_1725C9:: @ 81725C9 LittlerootTown_MaysHouse_1F_Text_1725C9:: @ 81725C9 - .string "MUTTER: Da! Da ist die ARENA von BLÜTEN-\n" - .string "BURG CITY! Ich glaube, VATI ist im\l" - .string "Fernsehen!$" + .string "MOM: Look! It’s PETALBURG GYM!\n" + .string "Maybe DAD will be on!$" LittlerootTown_BrendansHouse_1F_Text_1725FE:: @ 81725FE LittlerootTown_MaysHouse_1F_Text_1725FE:: @ 81725FE - .string "MUTTER: Oh... Schon vorbei.\p" - .string "Ich glaube, VATI war im Fernsehen und\n" - .string "wir haben ihn verpasst. Schade!$" + .string "MOM: Oh... It’s over.\p" + .string "I think DAD was on, but we missed him.\n" + .string "Too bad.$" LittlerootTown_BrendansHouse_1F_Text_172644:: @ 8172644 LittlerootTown_MaysHouse_1F_Text_172644:: @ 8172644 - .string "Ach ja.\n" - .string "Einer von VATIS Freunden lebt hier.\p" - .string "PROF. BIRK ist sein Name.\p" - .string "Er lebt gleich nebenan, daher solltest\n" - .string "du hinübergehen und dich vorstellen.$" + .string "Oh, yes.\n" + .string "One of DAD’s friends lives in town.\p" + .string "PROF. BIRCH is his name.\p" + .string "He lives right next door, so you should\n" + .string "go over and introduce yourself.$" LittlerootTown_BrendansHouse_1F_Text_1726D2:: @ 81726D2 - .string "MUTTER: Bis später, Spatz!$" + .string "MOM: See you, honey!$" LittlerootTown_BrendansHouse_1F_Text_1726E7:: @ 81726E7 - .string "MUTTER: Hast du dich bei PROF. BIRK\n" - .string "vorgestellt?$" + .string "MOM: Did you introduce yourself to\n" + .string "PROF. BIRCH?$" LittlerootTown_BrendansHouse_1F_Text_172717:: @ 8172717 - .string "MUTTER: Wie geht es dir, {PLAYER}?\n" - .string "Du siehst müde aus.\p" - .string "Ich denke, du solltest dich etwas\n" - .string "ausruhen.$" + .string "MOM: How are you doing, {PLAYER}?\n" + .string "You look a little tired.\p" + .string "I think you should rest a bit.$" LittlerootTown_BrendansHouse_1F_Text_17276B:: @ 817276B - .string "MUTTER: Pass auf dich auf, Schatz!$" + .string "MOM: Take care, honey!$" LittlerootTown_BrendansHouse_1F_Text_172782:: @ 8172782 - .string "MUTTER: Oh! Hat VATI dir den ORDEN\n" - .string "gegeben?\p" - .string "Dann ist das hier von deiner MUTTI!$" + .string "MOM: Oh? Did DAD give you that BADGE?\p" + .string "Then here’s something from your MOM!$" LittlerootTown_BrendansHouse_1F_Text_1727CD:: @ 81727CD - .string "Überanstreng dich nicht, Liebes.\n" - .string "Du kannst jederzeit nach Hause kommen.\p" - .string "Und jetzt nichts wie los, Schatz!$" + .string "Don’t push yourself too hard, dear.\n" + .string "You can always come home.\p" + .string "Go for it, honey!$" LittlerootTown_BrendansHouse_1F_Text_17281D:: @ 817281D .string "Gyao, gyao gyaoh...$" @@ -79,81 +76,71 @@ LittlerootTown_BrendansHouse_1F_Text_172831:: @ 8172831 .string "Gwagwah gwah...$" LittlerootTown_BrendansHouse_1F_Text_172841:: @ 8172841 - .string "INTERVIEWER: Das war unsere Reportage\n" - .string "über die ARENA in BLÜTENBURG CITY.$" + .string "INTERVIEWER: ...We brought you this\n" + .string "report from in front of PETALBURG GYM.$" UnknownString_817288C: @ 817288C - .string "Da läuft gerade ein Film.\p" - .string "Zwei Männer tanzen auf riesengroßen\n" - .string "Klaviertasten.\p" - .string "Aber es wird Zeit aufzubrechen!$" + .string "There is a movie on TV.\p" + .string "Two men are dancing on a big piano\n" + .string "keyboard.\p" + .string "Better get going!$" UnknownString_81728E3: @ 81728E3 - .string "Das ist die Bedienungsanleitung für\n" - .string "die TURBOTRETER.\p" - .string "“Halte den B-Knopf gedrückt, um\n" - .string "zu rennen, während du deine\l" - .string "TURBOTRETER anhast.\p" - .string "Binde dir die TURBOTRETER zu und wirble\n" - .string "den Staub der Straße auf!”$" + .string "It’s the instruction booklet for the\n" + .string "RUNNING SHOES.\p" + .string "“Press the B Button to run while\n" + .string "wearing your RUNNING SHOES.\p" + .string "“Lace up your RUNNING SHOES and hit\n" + .string "the road running!”$" LittlerootTown_BrendansHouse_1F_Text_17298B:: @ 817298B - .string "VATER: Hm?\p" - .string "Hey, das ist ja {PLAYER}!\p" - .string "Du hast uns ja schon lange nicht mehr\n" - .string "besucht... Du siehst irgendwie\l" - .string "stärker aus.\p" - .string "Das ist zumindest mein Eindruck. Aber\n" - .string "dein alter Herr gibt noch nicht auf.\p" - .string "Oh, ich habe hier etwas für dich.\n" - .string "Das soll ich dir von einem MR. BRACK\l" - .string "geben.$" + .string "DAD: Hm?\p" + .string "Hey, it’s {PLAYER}!\p" + .string "It’s been a while since I saw you,\n" + .string "but you look...stronger, somehow.\p" + .string "That’s the impression I get.\n" + .string "But your old man hasn’t given up yet!\p" + .string "Oh, yes, I have something for you.\n" + .string "This came to you from someone named\l" + .string "MR. BRINEY.$" LittlerootTown_BrendansHouse_1F_Text_172A7D:: @ 8172A7D - .string "VATER: Hm, ein TICKET für eine Fähre?\p" - .string "Ich weiß, dass es in GRAPHITPORT CITY\n" - .string "und SEEGRASULB CITY Anlegestellen für\l" - .string "Fähren gibt.\p" - .string "{PLAYER}, wenn du den Ehrgeiz eines\n" - .string "TRAINERS hast, dann geh zum DUELLTURM.\p" - .string "Dort wirst du lernen, dass der Weg eines\n" - .string "TRAINERS niemals ein Ende findet.$" + .string "DAD: Hm, a TICKET for a ferry?\p" + .string "If I recall, there are ferry ports in\n" + .string "SLATEPORT and LILYCOVE.\p" + .string "{PLAYER}, if you have ambition as a\n" + .string "TRAINER, go to the BATTLE TOWER.\p" + .string "It should teach you that there is\n" + .string "no end to a TRAINER’s chosen path.$" LittlerootTown_BrendansHouse_1F_Text_172B5E:: @ 8172B5E - .string "Ich muss jetzt wieder in die ARENA von\n" - .string "BLÜTENBURG CITY.\p" - .string "Ich danke dir, dass du dich während\n" - .string "meiner Abwesenheit um das Haus\l" - .string "kümmerst.$" + .string "I’d better get back to PETALBURG GYM.\p" + .string "MOM, thanks for looking after the house\n" + .string "while I’m away.$" LittlerootTown_BrendansHouse_1F_Text_172BBC:: @ 8172BBC - .string "MUTTER: Das ist wieder typisch dein\n" - .string "VATER...\p" - .string "Da kommt er das erste Mal nach ewigen\n" - .string "Zeiten nach Hause und spricht nur über\l" - .string "POKéMON.\p" - .string "Er sollte sich lieber ausruhen und etwas\n" - .string "hier bleiben!$" + .string "MOM: That DAD of yours...\p" + .string "He comes home for the first time in a\n" + .string "while, but all he talks about is POKéMON.\p" + .string "He should relax and stay a little longer.$" UnknownString_8172C50: @ 8172C50 - .string "Hier sind die Sondernachrichten.\p" - .string "Wir haben die Meldung erhalten, dass in\n" - .string "der HOENN-Region ein blaues FLIEGENDES\l" - .string "POKéMON gesichtet wurde.\p" - .string "Die Identität des POKéMON konnte\n" - .string "bisher nicht festgestellt werden.\p" - .string "Und damit schalten wir wieder um in\n" - .string "unser laufendes Programm.$" + .string "We bring you a special news bulletin.\p" + .string "We’ve received reports of a blue FLYING\n" + .string "POKéMON in various HOENN locales.\p" + .string "The identity of this POKéMON has not\n" + .string "yet been determined.\p" + .string "We now return you to your regular\n" + .string "movie presentation.$" UnknownString_8172D30: @ 8172D30 - .string "Hier sind die Sondernachrichten.\p" - .string "Wir haben die Meldung erhalten, dass in\n" - .string "der HOENN-Region ein rotes FLIEGENDES\l" - .string "POKéMON gesichtet wurde.\p" - .string "Die Identität des POKéMON konnte\n" - .string "bisher nicht festgestellt werden.\p" - .string "Und damit schalten wir wieder um in\n" - .string "unser laufendes Programm.$" + .string "We bring you a special news bulletin.\p" + .string "We’ve received reports of a red FLYING\n" + .string "POKéMON in various HOENN locales.\p" + .string "The identity of this POKéMON has not\n" + .string "yet been determined.\p" + .string "We now return you to your regular\n" + .string "movie presentation.$" UnknownString_8172E0F: @ 8172E0F .string "Gau gau!$" diff --git a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc b/data/text/maps/LittlerootTown_BrendansHouse_2F.inc index 102eb6664..06206caaa 100644 --- a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/text/maps/LittlerootTown_BrendansHouse_2F.inc @@ -1,39 +1,38 @@ LittlerootTown_BrendansHouse_2F_Text_172E18:: @ 8172E18 - .string "Die Uhr ist stehen geblieben...\p" - .string "Stelle sie besser ein und ziehe sie auf.$" + .string "The clock is stopped...\p" + .string "Better set it and start it!$" LittlerootTown_BrendansHouse_2F_Text_172E4C:: @ 8172E4C - .string "MUTTER: {PLAYER}, wie gefällt dir dein\n" - .string "neues Zimmer?\p" - .string "Gut! Alles ist wunderbar aufgeräumt!\p" - .string "Auch im Erdgeschoss ist alles\n" - .string "komplett eingerichtet.\p" - .string "POKéMON-Umzugshelfer sind so\n" - .string "praktisch.\p" - .string "Oh, du solltest prüfen, ob dein Schreib-\n" - .string "tisch vollständig eingeräumt ist!$" + .string "MOM: {PLAYER}, how do you like your\n" + .string "new room?\p" + .string "Good! Everything’s put away neatly!\p" + .string "They finished moving everything in\n" + .string "downstairs, too.\p" + .string "POKéMON movers are so convenient!\p" + .string "Oh, you should make sure that\n" + .string "everything’s all there on your desk.$" UnknownString_8172F31: @ 8172F31 - .string "Im Regal stehen Bücher über POKéMON.\n" - .string "Das ist die wertvolle Sammlung\l" - .string "von {PLAYER}.$" + .string "The bookshelf is lined entirely with\n" + .string "books on POKéMON.\p" + .string "It’s {PLAYER}’s prized collection.$" UnknownString_8172F85: @ 8172F85 - .string "{PLAYER} schaltet den PC ein.$" + .string "{PLAYER} booted up the PC.$" LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A - .string "{PLAYER} schlägt das Notizbuch auf.\p" - .string "REGEL NR. 1 FÜR ABENTEURER\n" - .string "Öffne das MENÜ mit START.\p" - .string "REGEL NR. 2 FÜR ABENTEURER\n" - .string "Speichere den Fortschritt mit SICHERN.\p" - .string "Die übrigen Seiten sind leer.$" + .string "{PLAYER} flipped open the notebook.\p" + .string "ADVENTURE RULE NO. 1\n" + .string "Open the MENU with START.\p" + .string "ADVENTURE RULE NO. 2\n" + .string "Record your progress with SAVE.\p" + .string "The remaining pages are blank...$" UnknownString_817303D: @ 817303D - .string "{PLAYER} schaut sich die Karte der\n" - .string "HOENN-Region genauer an.$" + .string "{PLAYER} took a closer look at the\n" + .string "HOENN region map.$" LittlerootTown_BrendansHouse_2F_Text_17306C:: @ 817306C - .string "Das ist ein Nintendo GameCube.\p" - .string "Ein Game Boy Advance ist angeschlossen\n" - .string "und dient als Controller.$" + .string "It’s a Nintendo GameCube.\p" + .string "A Game Boy Advance is connected to\n" + .string "serve as the Controller.$" diff --git a/data/text/maps/LittlerootTown_MaysHouse_1F.inc b/data/text/maps/LittlerootTown_MaysHouse_1F.inc index a4fab5261..aef905854 100644 --- a/data/text/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/text/maps/LittlerootTown_MaysHouse_1F.inc @@ -1,36 +1,34 @@ LittlerootTown_BrendansHouse_1F_Text_1730C2:: @ 81730C2 LittlerootTown_MaysHouse_1F_Text_1730C2:: @ 81730C2 - .string "Oh, hallo. Wer bist du?\p" + .string "Oh, hello. And you are?\p" .string "... ... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ... ...\p" - .string "Oh, du bist {PLAYER}{KUN}, unser neuer\n" - .string "Nachbar! Hallo!\p" - .string "Wir haben ein Kind in deinem Alter.\p" - .string "Mein/e {STR_VAR_1} freut sich schon\n" - .string "darauf, mit dir Freundschaft zu\l" - .string "schließen.\p" - .string "Lauf doch mal die Treppe hoch...$" + .string "Oh, you’re {PLAYER}{KUN}, our new next-door\n" + .string "neighbor! Hi!\p" + .string "We have a {STR_VAR_1} about the same\n" + .string "age as you.\p" + .string "Our {STR_VAR_1} was excited about making\n" + .string "a new friend.\p" + .string "Our {STR_VAR_1} is upstairs, I think.$" LittlerootTown_BrendansHouse_1F_Text_1731C6:: @ 81731C6 - .string "Mein/e {STR_VAR_1} ist oben.$" + .string "Our {STR_VAR_1} is upstairs, I think.$" LittlerootTown_BrendansHouse_1F_Text_1731E3:: @ 81731E3 - .string "Wo ist denn nur mein Mann? Und gerade\n" - .string "jetzt, wo {PLAYER}{KUN} uns besucht...\p" - .string "Dieser Mann kann einfach nicht\n" - .string "entspannen... Er ist wohl im LABOR.$" + .string "Where has my husband gone?\n" + .string "Just when {PLAYER}{KUN} is visiting, too...\p" + .string "That man can never sit still for long...\n" + .string "He might be at his LAB.$" LittlerootTown_BrendansHouse_1F_Text_173262:: @ 8173262 - .string "Oh, {RIVAL} ist irgendwohin gegangen.\p" - .string "Wie der Vater, so das Kind.\n" - .string "{RIVAL} kann einfach nicht stillsitzen\l" - .string "oder zu Hause bleiben.$" + .string "Oh, {RIVAL} has gone out somewhere.\p" + .string "Like father, like child.\n" + .string "{RIVAL} can’t stay quietly at home.$" LittlerootTown_BrendansHouse_1F_Text_1732B9:: @ 81732B9 - .string "Ich glaube, es ist wunderbar für Leute,\n" - .string "mit ihren POKéMON zu reisen.\p" - .string "Aber du solltest öfter nach Hause\n" - .string "gehen und deiner Mutter zeigen, dass es\l" - .string "dir gut geht.\p" - .string "Sie lässt es sich nicht anmerken, aber\n" - .string "sie macht sich bestimmt Sorgen!$" + .string "I think it’s wonderful for people to\n" + .string "travel with POKéMON.\p" + .string "But you should go home every so often\n" + .string "to let your mother know you’re okay.\p" + .string "She might not say it, but I’m sure she\n" + .string "worries about you, {PLAYER}{KUN}.$" diff --git a/data/text/maps/LittlerootTown_MaysHouse_2F.inc b/data/text/maps/LittlerootTown_MaysHouse_2F.inc index 6cad66063..313095c8d 100644 --- a/data/text/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/text/maps/LittlerootTown_MaysHouse_2F.inc @@ -1,91 +1,86 @@ LittlerootTown_BrendansHouse_2F_Text_17337E:: @ 817337E - .string "POKéMON: Bei guter Gesundheit!\n" - .string "Items: Verstaut. Fehlt noch... Was?$" + .string "POKéMON fully restored!\n" + .string "Items ready, and... Huh?$" LittlerootTown_BrendansHouse_2F_Text_1733AF:: @ 81733AF - .string "Was?\n" - .string "Wer... Wer bist du denn?\p" + .string "Huh?\n" + .string "Who... Who are you?\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Ach, du bist {PLAYER}{KUN}!\n" - .string "Du bist heute hierher gezogen.\p" - .string "Ähm... Ich bin MAIKE.\n" - .string "Schön, dich kennen zu lernen.\p" - .string "Ich... Ich habe diesen Traum...\n" - .string "Mit POKéMON in der ganzen Welt\l" - .string "Freundschaft zu schließen.\p" - .string "Ich... Ich habe schon von dir gehört.\n" - .string "Mein Vater, PROF. BIRK, hat mir von\l" - .string "dir erzählt.\p" - .string "Ich habe gehofft, dass du nett bist,\n" - .string "{PLAYER}{KUN}, und wir Freunde werden.\p" - .string "Ist das nicht albern? Ich... Ich habe\n" - .string "dich doch gerade erst kennen gelernt.\p" - .string "Hihihihi...\p" - .string "Oh, nein! Das habe ich ja total\n" - .string "vergessen!\p" - .string "Ich sollte Vati doch helfen, ein paar\n" - .string "wilde POKéMON zu fangen!\p" - .string "{PLAYER}{KUN}, wir treffen uns später!$" + .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "So your move was today.\p" + .string "Um... I’m MAY.\n" + .string "Glad to meet you!\p" + .string "I...\n" + .string "I have this dream of becoming friends\l" + .string "with POKéMON all over the world.\p" + .string "I... I heard about you, {PLAYER}{KUN}, from\n" + .string "my dad, PROF. BIRCH.\p" + .string "I was hoping that you would be nice,\n" + .string "{PLAYER}{KUN}, and that we could be friends.\p" + .string "Oh, this is silly, isn’t it?\n" + .string "I... I’ve just met you, {PLAYER}{KUN}.\p" + .string "Eheheh...\p" + .string "Oh, no! I forgot!\p" + .string "I was supposed to go help Dad catch\n" + .string "some wild POKéMON!\p" + .string "{PLAYER}{KUN}, I’ll catch you later!$" LittlerootTown_BrendansHouse_2F_Text_1735C9:: @ 81735C9 - .string "POKéMON: Bei guter Gesundheit!\n" - .string "Items: Verstaut. Fehlt noch... Was?$" + .string "POKéMON fully restored...\n" + .string "Items all packed, and...$" LittlerootTown_BrendansHouse_2F_Text_1735FC:: @ 81735FC .string "Hey!\n" - .string "Du...\p" - .string "Wer bist du denn?\p" - .string "Ach ja, du bist {PLAYER}, richtig?\n" - .string "Du bist nebenan eingezogen, stimmt’s?\p" - .string "Ich wusste nicht, dass du ein Mädchen\n" - .string "bist.\p" - .string "Vater, PROF. BIRK, hat mir erzählt, dass\n" - .string "nebenan das Kind eines ARENALEITERS\p" - .string "einzieht und irgendwie habe ich\n" - .string "gedacht, du seiest ein Junge.\p" - .string "Ich heiße übrigens BRIX.\n" - .string "Also: Hallo, Nachbarin!\p" - .string "Was? {PLAYER}, du hast kein einziges\n" - .string "POKéMON?\p" - .string "Soll ich eines für dich fangen?\p" - .string "Ach, Mist, das habe ich ganz vergessen...\p" - .string "Ich muss meinem Vater helfen, einige\n" - .string "wilde POKéMON zu fangen.\p" - .string "Ein anderes Mal, okay?$" + .string "You...\p" + .string "Who are you?\p" + .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Moved in next door, right?\p" + .string "I didn’t know that you’re a girl.\p" + .string "Dad, PROF. BIRCH, said that our new\n" + .string "next-door neighbor is a GYM LEADER’s\l" + .string "kid, so I assumed you’d be a guy.\p" + .string "My name’s BRENDAN.\n" + .string "So, hi, neighbor!\p" + .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "a POKéMON?\p" + .string "Do you want me to go catch you one?\p" + .string "Aw, darn, I forgot...\p" + .string "I’m supposed to go help my dad catch\n" + .string "some wild POKéMON.\p" + .string "Some other time, okay?$" LittlerootTown_BrendansHouse_2F_Text_1737AE:: @ 81737AE - .string "MAIKE: {PLAYER}{KUN}!\p" - .string "Ich prüfe gerade meinen POKéDEX.\p" - .string "Es gibt eine Menge POKéMON, die ich\n" - .string "gesehen, aber nicht gefangen habe.\p" - .string "Und es gibt viele, von denen ich\n" - .string "annehme, dass sie sich bald entwickeln.\p" - .string "Jetzt überlege ich, wo ich hingehen soll,\n" - .string "um weitere POKéMON zu fangen.$" + .string "MAY: {PLAYER}{KUN}!\p" + .string "I was just checking my POKéDEX.\p" + .string "There’s still a lot of POKéMON that\n" + .string "I’ve seen but haven’t caught.\p" + .string "And there are many others that\n" + .string "I think will evolve.\p" + .string "I wonder where I should go catch\n" + .string "some POKéMON next?$" LittlerootTown_BrendansHouse_2F_Text_173883:: @ 8173883 - .string "MAIKE: Ich überlege, wo ich hingehen\n" - .string "soll, um weitere POKéMON zu fangen.\p" - .string "Wäre es nicht lustig, wenn wir uns dabei\n" - .string "über den Weg laufen würden?$" + .string "MAY: I wonder where I should go catch\n" + .string "some POKéMON next?\p" + .string "Wouldn’t it be funny if we ran into each\n" + .string "other, {PLAYER}{KUN}?$" LittlerootTown_BrendansHouse_2F_Text_1738F2:: @ 81738F2 - .string "BRIX: Hey, {PLAYER}!\p" - .string "Ich prüfe gerade meinen POKéDEX.\p" - .string "Es gibt noch viele POKéMON, die ich\n" - .string "fangen muss, aber er sieht schon sehr\l" - .string "gut aus.\p" - .string "Immer wenn ich den POKéDEX betrachte,\n" - .string "bekomme ich Lust zum Reisen.$" + .string "BRENDAN: Hey, it’s {PLAYER}.\p" + .string "I was just checking out my POKéDEX.\p" + .string "There are still many POKéMON that\n" + .string "I need to catch, I know, but this\l" + .string "is looking pretty good.\p" + .string "Checking this POKéDEX out gives me\n" + .string "the urge to hit the road again.$" LittlerootTown_BrendansHouse_2F_Text_1739CC:: @ 81739CC - .string "BRIX: Ich habe lange überlegt, wo ich\n" - .string "hingehen soll, um weitere POKéMON\l" - .string "zu fangen.\p" - .string "Hey, {PLAYER}, wenn ich dich auf meiner\n" - .string "Suche treffe, können wir ja einen\l" - .string "POKéMON-Kampf austragen.$" + .string "BRENDAN: I’m having a hard time deciding\n" + .string "where I should catch POKéMON next.\p" + .string "Hey, {PLAYER}, if I see you while I’m out\n" + .string "catching POKéMON, I can pitch you a\l" + .string "battle if you’d like.$" UnknownString_8173A76: @ 8173A76 - .string "Dort stehen POKéMON-Bücher.$" + .string "It’s lined with POKéMON picture books.$" diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc index a142a3b2f..dd470ef08 100644 --- a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -1,169 +1,163 @@ UnknownString_8173A9D: @ 8173A9D - .string "POKéMON & IHRE LEBENSRÄUME...\n" - .string "DIE KOEXISTENZ VON MENSCH & POKéMON...\l" - .string "POKéMONOLOGIE FÜR ANFÄNGER...\p" - .string "Es biegt sich unter der Last der Bücher,\n" - .string "die PROF. BIRK geschrieben hat.$" + .string "POKéMON SPECIES & HABITATS...\n" + .string "HUMAN & POKéMON COEXISTENCE...\l" + .string "POKéMONOLOGY FOR BEGINNERS...\p" + .string "It’s brimming with books written by\n" + .string "PROF. BIRCH.$" LittlerootTown_ProfessorBirchsLab_Text_173B29:: @ 8173B29 - .string "Wie? PROF. BIRK?\p" - .string "Der PROF arbeitet an einer Feld-Studie.\n" - .string "Also ist er nicht hier.\p" - .string "Oh, ich erkläre dir, was eine Feld-Studie\n" - .string "in diesem Falle ist:\p" - .string "Man beobachtet und studiert Dinge in\n" - .string "ihrem natürlichen Umfeld. In Feldern\l" - .string "oder auf Bergen, anstatt im Labor.\p" - .string "Der PROF ist kein Typ, der am Schreib-\n" - .string "tisch arbeiten kann. Er muss einfach\l" - .string "draußen in der freien Natur die Dinge\l" - .string "beobachten und studieren.$" + .string "Hunh? PROF. BIRCH?\p" + .string "The PROF’s away on fieldwork.\n" + .string "Ergo, he isn’t here.\p" + .string "Oh, let me explain what fieldwork is.\p" + .string "It is to study things in the natural\n" + .string "environment, like fields and mountains,\l" + .string "instead of a laboratory.\p" + .string "The PROF isn’t one for doing desk work.\n" + .string "He’s the type of person who would\l" + .string "rather go outside and experience\l" + .string "things than read about them here.$" LittlerootTown_ProfessorBirchsLab_Text_173C88:: @ 8173C88 - .string "Der PROF ist kein Typ, der am Schreib-\n" - .string "tisch arbeiten kann. Er muss einfach\l" - .string "draußen in der freien Natur die Dinge\l" - .string "beobachten und studieren.$" + .string "The PROF isn’t one for doing desk work.\n" + .string "He’s the type of person who would\l" + .string "rather go outside and experience\l" + .string "things than read about them here.$" LittlerootTown_ProfessorBirchsLab_Text_173D15:: @ 8173D15 - .string "PROF. BIRK studiert den Lebensraum\n" - .string "und die Verbreitung von POKéMON.\p" - .string "Der PROF freut sich über die Mitarbeit\n" - .string "von {RIVAL}. Da spürt man Zuneigung!$" + .string "PROF. BIRCH is studying the habitats\n" + .string "and distribution of POKéMON.\p" + .string "The PROF enjoys {RIVAL}’s help, too.\n" + .string "There’s a lot of love there.$" LittlerootTown_ProfessorBirchsLab_Text_173D94:: @ 8173D94 - .string "PROF. BIRK: Du bist also {PLAYER}{KUN}!\p" - .string "Dein Vater hat mir schon viel von dir\n" - .string "erzählt.\p" - .string "Ich habe auch erfahren, dass du noch\n" - .string "kein eigenes POKéMON besitzt.\p" - .string "Aber wie du eben gekämpft hast...\n" - .string "Diese Gelassenheit...\p" - .string "In deinen Adern fließt wirklich das Blut\n" - .string "deines Vaters!\p" - .string "Als Dank dafür, dass du mich gerettet\n" - .string "hast, möchte ich dir das POKéMON\l" - .string "schenken, das du dabei benutzt hast.\p" - .string "{PLAYER} erhält {STR_VAR_1}!$" + .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" + .string "I’ve heard so much about you from\n" + .string "your father.\p" + .string "I’ve heard that you don’t have your\n" + .string "own POKéMON yet.\p" + .string "But the way you battled earlier,\n" + .string "you pulled it off with aplomb!\p" + .string "I guess you have your father’s blood\n" + .string "in your veins after all!\p" + .string "Oh, yes. As thanks for rescuing me,\n" + .string "I’d like you to have the POKéMON you\l" + .string "used earlier.\p" + .string "{PLAYER} received the {STR_VAR_1}!$" LittlerootTown_ProfessorBirchsLab_Text_173EF8:: @ 8173EF8 - .string "PROF. BIRK: Willst du dem\n" - .string "{STR_VAR_1} einen Kosenamen geben?$" + .string "PROF. BIRCH: While you’re at it, why not\n" + .string "give a nickname to that {STR_VAR_1}?$" LittlerootTown_ProfessorBirchsLab_Text_173F3D:: @ 8173F3D - .string "PROF. BIRK: Wenn du dich erst einmal\n" - .string "mit POKéMON beschäftigst und Er-\l" - .string "fahrungen sammelst, wirst du bestimmt\l" - .string "ein verdammt guter TRAINER!\p" - .string "Mein Nachwuchs, {RIVAL}, studiert an\n" - .string "der ROUTE 103 POKéMON.\p" - .string "Hast du nicht Lust, {RIVAL} dort\n" - .string "zu suchen?$" + .string "PROF. BIRCH: If you work at POKéMON\n" + .string "and gain experience, I think you’ll make\l" + .string "a darn good TRAINER.\p" + .string "My kid, {RIVAL}, is out on ROUTE 103\n" + .string "studying POKéMON.\p" + .string "It might not be a bad idea for you to\n" + .string "go see {RIVAL}. What do you think?$" LittlerootTown_ProfessorBirchsLab_Text_174015:: @ 8174015 - .string "PROF. BIRK: Großartig!\n" - .string "{RIVAL} wird sich auch sehr freuen.\p" - .string "{RIVAL} soll dir beibringen, was es\n" - .string "bedeutet, ein TRAINER zu sein.$" + .string "PROF. BIRCH: Great!\n" + .string "{RIVAL} should be happy, too.\p" + .string "Get {RIVAL} to teach you what it\n" + .string "means to be a TRAINER.$" LittlerootTown_ProfessorBirchsLab_Text_174075:: @ 8174075 - .string "PROF. BIRK: Ach, sei doch nicht so!\n" - .string "Du solltest dich wirklich mit meinem\l" - .string "Sprössling treffen!$" + .string "PROF. BIRCH: Oh, don’t be that way.\n" + .string "You should go meet my kid.$" LittlerootTown_ProfessorBirchsLab_Text_1740B4:: @ 81740B4 - .string "PROF. BIRK: {RIVAL} muss irgendwo\n" - .string "auf der ROUTE 103 zu finden sein.\p" - .string "Falls du müde bist - oder deine\n" - .string "POKéMON - ruh dich zu Hause aus.$" + .string "PROF. BIRCH: {RIVAL} should be on\n" + .string "ROUTE 103 somewhere.\p" + .string "If you or your POKéMON get tired,\n" + .string "get some rest at home.$" LittlerootTown_ProfessorBirchsLab_Text_17411F:: @ 817411F - .string "PROF. BIRK: Oh, hallo, {PLAYER}{KUN}!\p" - .string "Ich habe gehört, du hast {RIVAL} \n" - .string "besiegt! Super! Das war dein erster\l" - .string "Kampf gegen einen TRAINER!\p" - .string "{RIVAL} hilft mir schon sehr lange bei\n" - .string "meinen Forschungen.\p" - .string "{RIVAL} besitzt eine respektable\n" - .string "Geschichte als TRAINER.\p" - .string "Hier, das hilft mir bei meinen For-\n" - .string "schungen. Aber ich denke, du kannst\l" - .string "den POKéDEX auch gebrauchen.$" + .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" + .string "I heard you beat {RIVAL} on\n" + .string "your first try. That’s excellent!\p" + .string "{RIVAL}’s been helping with my research\n" + .string "for a long time.\p" + .string "{RIVAL} has an extensive history as\n" + .string "a TRAINER already.\p" + .string "Here, {PLAYER}{KUN}, I ordered this for my\n" + .string "research, but I think you should have\l" + .string "this POKéDEX.$" LittlerootTown_ProfessorBirchsLab_Text_17422F:: @ 817422F - .string "{PLAYER} erhält den POKéDEX!$" + .string "{PLAYER} received the POKéDEX!$" LittlerootTown_ProfessorBirchsLab_Text_174248:: @ 8174248 - .string "PROF. BIRK: Der POKéDEX ist ein hoch\n" - .string "entwickeltes, technisches Gerät, das\l" - .string "automatisch jedes POKéMON, das du\l" - .string "siehst oder fängst, registriert.\p" - .string "{RIVAL} geht nie ohne ihn aus dem Haus.\p" - .string "Immer wenn mein Kind ein seltenes\n" - .string "POKéMON fängt, kommt es und\l" - .string "zeigt mir den Eintrag im POKéDEX,\l" - .string "während ich draußen forsche.$" + .string "PROF. BIRCH: The POKéDEX is a high-tech\n" + .string "tool that automatically makes a record\l" + .string "of any POKéMON you meet or catch.\p" + .string "My kid, {RIVAL}, goes everywhere\n" + .string "with it.\p" + .string "Whenever my kid catches a rare POKéMON\n" + .string "and records its data in the POKéDEX,\l" + .string "why, {RIVAL} looks for me while I’m out\l" + .string "doing fieldwork, and shows me.$" LittlerootTown_ProfessorBirchsLab_Text_17436C:: @ 817436C - .string "PROF. BIRK: Unzählige POKéMON erwarten\n" - .string "dich bereits.\p" - .string "Hach, ich muss jetzt auch dringend\n" - .string "wieder meinen Forschungen nachgehen.$" + .string "PROF. BIRCH: Countless POKéMON await\n" + .string "you!\p" + .string "Argh, I’m getting the itch to get out\n" + .string "and do fieldwork again!$" LittlerootTown_ProfessorBirchsLab_Text_1743D4:: @ 81743D4 - .string "MAIKE: Oh, wow, {PLAYER}{KUN}!\n" - .string "Jetzt hast du auch einen POKéDEX!\p" - .string "Das ist ja toll! Genau wie ich!\n" - .string "Ich habe hier etwas für dich!$" + .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" + .string "You got a POKéDEX, too!\p" + .string "That’s great! Just like me!\n" + .string "I’ve got something for you, too!$" LittlerootTown_ProfessorBirchsLab_Text_17443D:: @ 817443D - .string "MAIKE: Es macht unheimlich viel Spaß, all\n" - .string "die verschiedenen POKéMON zu fangen!\p" - .string "Ich schaue mich wirklich überall um, denn\n" - .string "ich will die unterschiedlichsten POKéMON\l" - .string "fangen.\p" - .string "Sobald ich niedliche POKéMON entdecke,\n" - .string "fange ich sie mit POKéBÄLLEN.$" + .string "MAY: It’s fun if you can get a lot of\n" + .string "POKéMON!\p" + .string "I’m going to look all over the place\n" + .string "because I want different POKéMON.\p" + .string "If I find any cute POKéMON, I’ll catch\n" + .string "them with POKé BALLS!$" LittlerootTown_ProfessorBirchsLab_Text_1744F0:: @ 81744F0 - .string "Oh! Dein BEUTEL ist voll.$" + .string "Oh? Your BAG’s full.$" LittlerootTown_ProfessorBirchsLab_Text_174505:: @ 8174505 - .string "MAIKE: Ich frage mich, wo ich jetzt nach\n" - .string "weiteren POKéMON suchen soll.$" + .string "MAY: I wonder where I should go look\n" + .string "for POKéMON next?$" LittlerootTown_ProfessorBirchsLab_Text_17453C:: @ 817453C - .string "BRIX: Ach...\n" - .string "Du hast auch einen POKéDEX.\p" - .string "Na, dann.\n" - .string "Ich gebe dir dies.$" + .string "BRENDAN: Huh...\n" + .string "So you got a POKéDEX, too.\p" + .string "Well then, here.\n" + .string "I’ll give you this.$" LittlerootTown_ProfessorBirchsLab_Text_17458C:: @ 817458C - .string "BRIX: Weißt du, je mehr POKéMON du\n" - .string "besitzt, desto mehr Spaß macht es.\p" - .string "Ich reise viel umher, um die unter-\n" - .string "schiedlichsten POKéMON zu finden.\p" - .string "Und wenn ich ein cooles POKéMON sehe,\n" - .string "versuche ich natürlich, es zu fangen.$" + .string "BRENDAN: You know it’s more fun to\n" + .string "have a whole bunch of POKéMON.\p" + .string "I’m going to explore all over the place\n" + .string "to find different POKéMON.\p" + .string "If I find any cool POKéMON, you bet\n" + .string "I’ll try to get them with POKé BALLS.$" LittlerootTown_ProfessorBirchsLab_Text_17465B:: @ 817465B - .string "Hey, dein BEUTEL ist voll.$" + .string "Hey, your BAG’s full.$" LittlerootTown_ProfessorBirchsLab_Text_174671:: @ 8174671 - .string "BRIX: Und wo soll ich jetzt mal nach\n" - .string "POKéMON suchen?$" + .string "BRENDAN: Where should I look for\n" + .string "POKéMON next...$" LittlerootTown_ProfessorBirchsLab_Text_1746A2:: @ 81746A2 - .string "Das ist eine kompliziert aussehende\n" - .string "Maschine. Der PROF wird sie für seine\l" - .string "Forschungen brauchen...$" + .string "It’s a serious-looking machine.\n" + .string "The PROF must use this for research.$" LittlerootTown_ProfessorBirchsLab_Text_1746E7:: @ 81746E7 - .string "Ein PC, der in der Forschung eingesetzt\n" - .string "wird. Besser nicht damit spielen!$" + .string "It’s a PC used for research.\n" + .string "Better not mess around with it.$" LittlerootTown_ProfessorBirchsLab_Text_174724:: @ 8174724 - .string "Es ist voll mit Büchern über POKéMON.$" + .string "It’s crammed with books on POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_174748:: @ 8174748 - .string "Dieses Buch ist viel zu kompliziert...$" + .string "It’s a book that’s too hard to read.$" diff --git a/data/text/maps/MauvilleCity.inc b/data/text/maps/MauvilleCity.inc index 4a06fff34..8080d10d9 100644 --- a/data/text/maps/MauvilleCity.inc +++ b/data/text/maps/MauvilleCity.inc @@ -1,178 +1,174 @@ MauvilleCity_Text_165B76:: @ 8165B76 - .string "ONKEL: Ich glaube, es liegt an dem\n" - .string "POKéMON, dass dieser Junge mehr Pep\l" - .string "hat. Aber er hat zu viel Pep...$" + .string "UNCLE: It’s because of POKéMON that\n" + .string "this boy’s got more pep, I suppose...\l" + .string "But he’s become a bit too peppy...$" MauvilleCity_Text_165BE3:: @ 8165BE3 - .string "HEIKO: Oooch, bitte, ONKEL, bitte!\p" - .string "Ich möchte in dieser ARENA antreten,\n" - .string "um zu sehen, wie gut ich bin.\p" - .string "Bitte! Darf ich? Biiiitte!$" + .string "WALLY: Aww, UNCLE, please?\p" + .string "I want to challenge this GYM and see\n" + .string "how much better I’ve become.\p" + .string "Please? May I, please?$" MauvilleCity_Text_165C57:: @ 8165C57 - .string "ONKEL: Nun hör mal auf, HEIKO.\p" - .string "Seit du mit POKéMON zusammenlebst, bist\n" - .string "du viel stärker geworden.\p" - .string "Aber - du überforderst dich, wenn du\n" - .string "plötzlich in einer ARENA antrittst.$" + .string "UNCLE: Now hold on, WALLY.\p" + .string "Since you started living with POKéMON,\n" + .string "you have grown quite a lot stronger.\p" + .string "But don’t you think you’re pushing it\n" + .string "to suddenly challenge a GYM?$" MauvilleCity_Text_165D01:: @ 8165D01 - .string "HEIKO: Ich bin nicht überfordert!\p" - .string "Wenn ich die Kräfte von TRASLA\n" - .string "kombiniere, besiege ich jeden!$" + .string "WALLY: I’m not pushing it.\p" + .string "If I combine forces with RALTS,\n" + .string "we can beat anyone!$" MauvilleCity_Text_165D50:: @ 8165D50 - .string "HEIKO: Oh! Hi, {PLAYER}!\p" - .string "Seit wir uns das letzte Mal gesehen\n" - .string "haben, bin ich viel stärker geworden.\p" - .string "{PLAYER}, ich möchte von dir und auch\n" - .string "von meinem ONKEL verstanden werden.\p" - .string "{PLAYER}, bitte, würdest du gegen mich\n" - .string "kämpfen?$" + .string "WALLY: Oh! Hi, {PLAYER}!\p" + .string "I’ve gotten a lot stronger since we\n" + .string "met.\p" + .string "{PLAYER}, I want you and my UNCLE to\n" + .string "understand that.\p" + .string "{PLAYER}, please, will you have a\n" + .string "battle with me?$" MauvilleCity_Text_165DE8:: @ 8165DE8 - .string "HEIKO: Oh... Wenn du nicht gegen mich an-\n" - .string "treten willst, {PLAYER}, wird mein ONKEL\l" - .string "nie erkennen, wie stark ich schon bin.$" + .string "WALLY: Oh... If you won’t battle me,\n" + .string "{PLAYER}, my UNCLE won’t know that I’ve\l" + .string "become really strong.$" MauvilleCity_Text_165E45:: @ 8165E45 - .string "ONKEL: {PLAYER}{KUN}, richtig?\n" - .string "Darf ich dich um HEIKOS Willen bitten,\l" - .string "dieses eine Mal gegen ihn zu kämpfen?\p" - .string "Ich glaube nicht, dass er mir im Moment\n" - .string "überhaupt zuhören will...$" + .string "UNCLE: {PLAYER}{KUN}, was it?\n" + .string "On WALLY’s behalf, can I ask you to\l" + .string "battle with him just this once?\p" + .string "I don’t think he’s going to listen to\n" + .string "any reason the way he is now.$" MauvilleCity_Text_165EE2:: @ 8165EE2 - .string "HEIKO: {PLAYER}, bitte!\n" - .string "Kämpfe gegen mich! Biiiitte!$" + .string "WALLY: {PLAYER}, please!\n" + .string "Battle with me, please.$" MauvilleCity_Text_165F0D:: @ 8165F0D - .string "HEIKO: {PLAYER}, vielen Dank!\p" - .string "Okay... Jetzt komme ich!$" + .string "WALLY: {PLAYER}, thank you.\p" + .string "Okay... Here I come!$" MauvilleCity_Text_165F38:: @ 8165F38 - .string "HEIKO: ... ... ... ... ... ... ...\p" + .string "WALLY: ... ... ... ... ... ... ...\p" .string "... ... ... ... ... ... ... ...\p" - .string "Ich habe verloren...$" + .string "I lost...$" MauvilleCity_Text_165F85:: @ 8165F85 - .string "HEIKO: ONKEL...\n" - .string "Ich gehe zurück nach WIESENFLUR...$" + .string "WALLY: UNCLE...\n" + .string "I’ll go back to VERDANTURF...$" MauvilleCity_Text_165FB3:: @ 8165FB3 - .string "{PLAYER}, herzlichen Dank! TRAINER zu\n" - .string "sein verlangt viel von einem, oder?\p" - .string "Man besitzt nicht einfach nur POKéMON\n" - .string "und lässt sie kämpfen. Um ein richtiger\l" - .string "TRAINER zu sein, braucht es mehr.$" + .string "{PLAYER}, thank you.\n" + .string "Being a TRAINER is tough, isn’t it?\p" + .string "It’s not enough just to have POKéMON\n" + .string "and make them battle. That isn’t what\l" + .string "being a real TRAINER is about.$" MauvilleCity_Text_166050:: @ 8166050 - .string "ONKEL: HEIKO, du brauchst deshalb nicht\n" - .string "so niedergeschlagen zu sein.\p" - .string "Was hält dich davon ab, stärker und\n" - .string "stärker zu werden? Nichts!\p" - .string "Komm, gehen wir nach Hause.\n" - .string "Da warten sie alle schon auf dich.$" + .string "UNCLE: WALLY, there’s no need to be so\n" + .string "down on yourself.\p" + .string "Why, what’s keeping you from becoming\n" + .string "stronger and stronger?\p" + .string "Come on, let’s go home.\n" + .string "Everyone’s waiting for you.$" MauvilleCity_Text_1660FA:: @ 81660FA - .string "ONKEL: {PLAYER}{KUN}, mir dämmert es so\n" - .string "langsam. Du musst der TRAINER sein, der\l" - .string "sich damals um HEIKO gekümmert hat, als\l" - .string "er sein erstes POKéMON fing.\p" - .string "Warum besuchst du uns nicht irgendwann\n" - .string "in WIESENFLUR? Ich bin sicher,\l" - .string "HEIKO würde sich sehr freuen.$" + .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" + .string "that you must be the TRAINER who kept\l" + .string "an eye out for WALLY when he caught\l" + .string "his POKéMON.\p" + .string "Why don’t you visit us in VERDANTURF\n" + .string "sometime?\l" + .string "I’m sure WALLY would enjoy it.$" MauvilleCity_Text_1661C1:: @ 81661C1 - .string "WALTER: Oh, {PLAYER}{KUN}!\n" - .string "Du siehst aus, als hättest du Mumm!\l" - .string "Das ist sehr gut, hähähähähä...\p" - .string "Gut! Ich habe es entschieden!\n" - .string "Du tust mir einen Gefallen, {PLAYER}{KUN}!\p" - .string "MALVENFROH CITY hat einen unter-\n" - .string "irdischen Bereich, der NEU MALVENFROH\l" - .string "heißt.\p" - .string "{PLAYER}{KUN}, ich schicke dich jetzt da\n" - .string "hinunter, damit du den GENERATOR aus-\l" - .string "schaltest.\p" - .string "Der GENERATOR ist kurz davor, \n" - .string "heißzulaufen. Das ist sehr gefährlich.\p" - .string "Hier hast du den SCHLÜSSEL für\n" - .string "NEU MALVENFROH.$" + .string "WATTSON: Oh, {PLAYER}{KUN}!\n" + .string "You look like you have a lot of zip!\l" + .string "That’s a good thing, wahahahaha!\p" + .string "Fine! I’ve decided!\n" + .string "I need a favor, {PLAYER}{KUN}!\p" + .string "MAUVILLE CITY has an underground\n" + .string "sector called NEW MAUVILLE.\p" + .string "{PLAYER}{KUN}, I’d like you to go there and\n" + .string "switch off the GENERATOR.\p" + .string "The GENERATOR has been running a bit\n" + .string "haywire. It’s getting unsafe.\p" + .string "Here, this is the KEY to get into NEW\n" + .string "MAUVILLE.$" MauvilleCity_Text_166331:: @ 8166331 - .string "WALTER: Mach dir keine Sorgen. Man\n" - .string "kann das nicht gerade eine Heraus-\l" - .string "forderung nennen.\p" - .string "Der Eingang zu NEU MALVENFROH\n" - .string "ist eine kurze SURF-Strecke von\l" - .string "ROUTE 110 entfernt.\p" - .string "Das ist alles. Du kannst mir vertrauen!\n" - .string "Wahahahahahaha!$" + .string "WATTSON: Don’t you worry about it.\n" + .string "It won’t be a challenge to you.\p" + .string "The entrance to NEW MAUVILLE is just\n" + .string "a short SURF away from ROUTE 110.\p" + .string "That’s it, then, you have my trust!\n" + .string "Wahahahaha!$" MauvilleCity_Text_1663EB:: @ 81663EB - .string "WALTER: Wahahahahaha!\p" - .string "Ich wusste es, {PLAYER}{KUN}! Ich wusste, ich\n" - .string "habe die richtige Person herausgepickt!\p" - .string "Hier, das ist mein Dankeschön - eine TM,\n" - .string "die DONNERBLITZ enthält!\p" - .string "Nimm! Du hast sie dir wirklich verdient!$" + .string "WATTSON: Wahahahaha!\p" + .string "I knew it, {PLAYER}{KUN}! I knew I’d made\n" + .string "the right choice asking you!\p" + .string "This is my thanks - a TM containing\n" + .string "THUNDERBOLT!\p" + .string "Go on, you’ve earned it!$" MauvilleCity_Text_166488:: @ 8166488 - .string "WALTER: Wahahahahaha!\p" - .string "Es freut mich zu sehen, wie energetisch\n" - .string "sich die jungen Leute heute entwickeln!$" + .string "WATTSON: Wahahahaha!\p" + .string "It pleases me to no end to see the\n" + .string "young step up and take charge!$" MauvilleCity_Text_1664DF:: @ 81664DF - .string "Weißt du, es ist cool, dass es POKéMON-\n" - .string "Kämpfe und all das Zeugs gibt...\p" - .string "Aber wenn dein POKéMON verletzt wird,\n" - .string "dann musst du es gesund pflegen.$" + .string "You know, it’s cool to have POKéMON\n" + .string "battles and stuff...\p" + .string "But if your POKéMON gets hurt, you\n" + .string "have to nurse it back to health.$" MauvilleCity_Text_16655C:: @ 816655C - .string "Die Straßen dieses Ortes führen nach\n" - .string "Norden, Süden, nach Westen und Osten.\p" - .string "Daher reisen hier auch so viele ver-\n" - .string "schiedene Leute durch.$" + .string "The roads of this town stretch north\n" + .string "and south, and east and west.\p" + .string "Because of that, we get all sorts of\n" + .string "people coming through.$" MauvilleCity_Text_1665DB:: @ 81665DB - .string "Warst du schon in RADLAS RADLADEN?\p" - .string "RADLA, der Eigentümer, ist ein sehr\n" - .string "großzügiger Mann.$" + .string "Have you been to RYDEL’S CYCLES yet?\p" + .string "RYDEL, the owner, is a very generous\n" + .string "man.$" MauvilleCity_Text_16662A:: @ 816662A - .string "Selbst wenn du mit dem RAD fährst,\n" - .string "können dich POKéMON anspringen.$" + .string "Even if you’re riding a BIKE, wild\n" + .string "POKéMON could jump you.$" MauvilleCity_Text_166665:: @ 8166665 - .string "MALVENFROH CITY\n" - .string "“Die strahlende Stadt der Freude!”$" + .string "MAUVILLE CITY\n" + .string "“The bright and shiny city of fun!”$" MauvilleCity_Text_166697:: @ 8166697 - .string "POKéMON ARENA von MALVENFROH CITY\n" - .string "LEITER: WALTER\l" - .string "“Der Mann, der Spannung entlädt!”$" + .string "MAUVILLE CITY POKéMON GYM\n" + .string "LEADER: WATTSON\l" + .string "“The cheerfully electrifying man!”$" MauvilleCity_Text_1666E4:: @ 81666E4 - .string "“Fahre im Kies und lass dich durch-\n" - .string "schütteln!”\l" - .string "RADLAS RÄDER$" + .string "“Ride in gravel and shake up your\n" + .string "soul!”\l" + .string "RYDEL’S CYCLES$" MauvilleCity_Text_16671C:: @ 816671C - .string "“Der Ort für alle Spieler!”\n" - .string "MALVENFROH CITY SPIELHALLE$" + .string "“The play spot for all!”\n" + .string "MAUVILLE GAME CORNER$" MauvilleCity_Text_16674A:: @ 816674A - .string "Hi, hast du in letzter Zeit ferngesehen?\p" - .string "Da gibt es jetzt jede Menge coole, neue\n" - .string "Shows.\p" - .string "Fernsehen ist so cool. Plötzlich habe\n" - .string "ich meine Freunde im Fernsehen gesehen.\p" - .string "Und manchmal, da zeigen sie dich im\n" - .string "Fernsehen und du weißt es gar nicht.\p" - .string "Ich möchte auch mal im Fernsehen sein.\p" - .string "Du solltest immer mal wieder den\n" - .string "Fernseher einschalten...$" + .string "Hi, do you check out TV at all?\p" + .string "They’ve added a bunch of cool new\n" + .string "shows recently.\p" + .string "TV is so cool. I’ve seen my friends on\n" + .string "TV just out of the blue.\p" + .string "And, sometimes, they even put you on TV\n" + .string "without telling you.\p" + .string "I wish I would be on TV sometime.\p" + .string "That’s why I think you should check\n" + .string "out TVs whenever you can.$" MauvilleCity_Text_166879:: @ 8166879 - .string "Hi, hast du in letzter Zeit ferngesehen?$" + .string "Hi, have you been checking out TVs?$" diff --git a/data/text/maps/MauvilleCity_BikeShop.inc b/data/text/maps/MauvilleCity_BikeShop.inc index 6587535ef..3fbdffc09 100644 --- a/data/text/maps/MauvilleCity_BikeShop.inc +++ b/data/text/maps/MauvilleCity_BikeShop.inc @@ -1,146 +1,144 @@ MauvilleCity_BikeShop_Text_180F9F:: @ 8180F9F - .string "Nun, was haben wir denn hier?\n" - .string "Einen höchst energetischen Kunden!\p" - .string "Ich? Du kannst RADLA zu mir sagen.\n" - .string "Ich bin der Besitzer des Fahrrad-Shops.$" + .string "Well, well, what have we here?\n" + .string "A most energetic customer!\p" + .string "Me? You may call me RYDEL.\n" + .string "I’m the owner of this cycle shop.$" MauvilleCity_BikeShop_Text_181016:: @ 8181016 - .string "RADLA: Deine TURBOTRETER...\n" - .string "Die sehen ja wirklich schmuddelig aus...\p" - .string "Kommst du von weit her?$" + .string "RYDEL: Your RUNNING SHOES...\n" + .string "They’re awfully filthy.\p" + .string "Did you come from far away?$" MauvilleCity_BikeShop_Text_181067:: @ 8181067 - .string "RADLA: Stimmt das wirklich?\p" - .string "Dann kannst du, glaube ich, keines\n" - .string "meiner Fahrräder gebrauchen.$" + .string "RYDEL: Is that right?\p" + .string "Then, I guess you have no need for\n" + .string "any of my BIKES.$" MauvilleCity_BikeShop_Text_1810B1:: @ 81810B1 - .string "RADLA: Hm, hm... ... ... ... ...\n" + .string "RYDEL: Hm, hm... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Du kommst den ganzen Weg von\n" - .string "WURZELHEIM her?\p" - .string "Meine Güte!\n" - .string "Das ist unwahrscheinlich weit weg!\p" - .string "Wenn du eines meiner RÄDER\n" - .string "hättest, könntest du leicht überall hin\l" - .string "und den Wind in den Haaren spüren!\p" - .string "Ich sag dir was!\n" - .string "Ich werde dir ein RAD geben!\p" - .string "Oh, eine Sekunde!\p" - .string "Ich sollte dir sagen, dass es zwei\n" - .string "verschiedene RÄDER gibt!\p" - .string "Das EILRAD und das KUNSTRAD!\p" - .string "EILRÄDER für Leute, die den Wind in\n" - .string "den Haaren spüren wollen!\p" - .string "KUNSTRÄDER für Leute, die die\n" - .string "Techniken des Radfahrens\l" - .string "beherrschen wollen!\p" - .string "Da ich ein richtig weiches Herz habe,\n" - .string "darfst du dir eines aussuchen!\p" - .string "Welches möchtest du haben?$" + .string "You’re saying that you came all this\n" + .string "way from LITTLEROOT?\p" + .string "My goodness!\n" + .string "That’s ridiculously far!\p" + .string "If you had one of my BIKES, you could\n" + .string "go anywhere easily while feeling the\l" + .string "gentle caress of the wind!\p" + .string "I’ll tell you what!\n" + .string "I’ll give you a BIKE!\p" + .string "Oh, wait a second!\p" + .string "I forgot to tell you that there are\n" + .string "two kinds of BIKES!\p" + .string "They are the MACH BIKE and the\n" + .string "ACRO BIKE!\p" + .string "MACH BIKE is for cyclists who want\n" + .string "to feel the wind with their bodies!\p" + .string "And an ACRO BIKE is for those who\n" + .string "prefer technical rides!\p" + .string "I’m a real sweetheart, so you can\n" + .string "have whichever one you like!\p" + .string "Which one will you choose?$" MauvilleCity_BikeShop_Text_181332:: @ 8181332 - .string "{PLAYER} wählt das EILRAD.$" + .string "{PLAYER} chose the MACH BIKE.$" MauvilleCity_BikeShop_Text_18134A:: @ 818134A - .string "{PLAYER} wählt das KUNSTRAD.$" + .string "{PLAYER} chose the ACRO BIKE.$" MauvilleCity_BikeShop_Text_181362:: @ 8181362 - .string "RADLA: Wenn du die RÄDER tauschen\n" - .string "möchtest, komm einfach wieder vorbei!$" + .string "RYDEL: If you get the urge to switch\n" + .string "BIKES, just come see me!$" MauvilleCity_BikeShop_Text_1813A0:: @ 81813A0 - .string "RADLA: Oh. Du möchtest die RÄDER\n" - .string "tauschen?$" + .string "RYDEL: Oh? Were you thinking about\n" + .string "switching BIKES?$" MauvilleCity_BikeShop_Text_1813D4:: @ 81813D4 - .string "RADLA: Kein Problem!\n" - .string "Ich tausche die RÄDER für dich aus!$" + .string "RYDEL: Okay, no problem!\n" + .string "I’ll switch BIKES for you!$" MauvilleCity_BikeShop_Text_181408:: @ 8181408 - .string "{PLAYER} bekommt für das EILRAD ein\n" - .string "KUNSTRAD.$" + .string "{PLAYER} got the MACH BIKE exchanged\n" + .string "for an ACRO BIKE.$" MauvilleCity_BikeShop_Text_181439:: @ 8181439 - .string "{PLAYER} bekommt für das KUNSTRAD ein\n" - .string "EILRAD.$" + .string "{PLAYER} got the ACRO BIKE exchanged\n" + .string "for a MACH BIKE.$" MauvilleCity_BikeShop_Text_181469:: @ 8181469 - .string "RADLA: Wunderbar!\n" - .string "Ich freue mich, dass es dir gefällt!$" + .string "RYDEL: Good, good!\n" + .string "I’m happy that you like it!$" MauvilleCity_BikeShop_Text_181498:: @ 8181498 - .string "Oh? Was ist mit dem RAD geschehen,\n" - .string "das ich dir gegeben habe?\p" - .string "Ach so, du hast es in deinem PC gelagert.\p" - .string "Nun, hol es heraus und ich werde es mit\n" - .string "Freuden gegen ein anderes tauschen!\p" - .string "Möge der Wind dir stets im Rücken sein\n" - .string "bei deinem Abenteuer!$" + .string "Oh? What happened to that BIKE I\n" + .string "gave you?\p" + .string "Oh, I get it, you stored it using your PC.\p" + .string "Well, take it out of PC storage,\n" + .string "and I’ll be happy to exchange it!\p" + .string "May the wind always be at your back\n" + .string "on your adventure!$" MauvilleCity_BikeShop_Text_181568:: @ 8181568 - .string "Ich lerne etwas über RÄDER,\n" - .string "während ich hier arbeite.\p" - .string "Wenn du eine Anleitung brauchst, wie\n" - .string "man RAD fährt - da vorne findest du\l" - .string "einige Handbücher.$" + .string "I’m learning about BIKES while\n" + .string "I work here.\p" + .string "If you need advice on how to ride your\n" + .string "BIKE, there’re a couple handbooks in\l" + .string "the back.$" MauvilleCity_BikeShop_Text_1815EA:: @ 81815EA - .string "Ein Handbuch zum EILRAD.\p" - .string "Welche Seite möchtest du lesen?$" + .string "It’s a handbook on the MACH BIKE.\p" + .string "Which page do you want to read?$" MauvilleCity_BikeShop_Text_18162C:: @ 818162C - .string "Mit Hilfe des + Steuerkreuzes lässt\n" - .string "sich das RAD lenken.\p" - .string "Es wird immer schneller, wenn es\n" - .string "einmal fährt.\p" - .string "Lass das Steuerkreuz los, um das\n" - .string "RAD anzuhalten.\p" - .string "Eine andere Seite lesen?$" + .string "A BIKE moves in the direction that\n" + .string "the + Control Pad is pressed.\p" + .string "It will speed up once it gets rolling.\p" + .string "To stop, release the + Control Pad.\n" + .string "The BIKE will slow to a stop.\p" + .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_1816F5:: @ 81816F5 - .string "Ein EILRAD ist sehr schnell und kann\n" - .string "nicht schnell gestoppt werden.\p" - .string "Das Kurvenfahren ist sehr schwierig.\p" - .string "Lasse das + Steuerkreuz etwas los und\n" - .string "bremse, bevor du an eine Kurve kommst.\p" - .string "Eine andere Seite lesen?$" + .string "A MACH BIKE is speedy, but it can’t\n" + .string "stop very quickly.\p" + .string "It gets a little tricky to get around\n" + .string "a corner.\p" + .string "Release the + Control Pad a little\n" + .string "before the corner and slow down.\p" + .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_1817BF:: @ 81817BF - .string "In der ganzen HOENN-Region gibt es\n" - .string "sandige Gefälle.\p" - .string "Der lose Sand erlaubt es nicht, diese\n" - .string "Gefälle normal zu erklettern.\p" - .string "Aber mit einem EILRAD können auch\n" - .string "diese Gefälle gemeistert werden.\p" - .string "Eine andere Seite lesen?$" + .string "There are small sandy slopes throughout\n" + .string "the HOENN region.\p" + .string "The loose, crumbly sand makes it\n" + .string "impossible to climb normally.\p" + .string "But if you have a MACH BIKE, you can\n" + .string "zip up a sandy slope.\p" + .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_181892:: @ 8181892 - .string "Ein Handbuch zum KUNSTRAD.\p" - .string "Welche Seite möchtest du lesen?$" + .string "It’s a handbook on the ACRO BIKE.\p" + .string "Which page do you want to read?$" MauvilleCity_BikeShop_Text_1818D4:: @ 81818D4 - .string "Drücke während des Fahrens den\n" - .string "B-Knopf, um das Vorderrad anzuheben.\p" - .string "Ist das Vorderrad angehoben, können\n" - .string "mit Hilfe des Steuerkreuzes Sprünge\l" - .string "ausgeführt werden.\p" - .string "Diese Technik nennt sich Wheelie.\p" - .string "Eine andere Seite lesen?$" + .string "Press the B Button while riding, and the\n" + .string "front wheel lifts up.\p" + .string "You can zip around with the front\n" + .string "wheel up using the + Control Pad.\p" + .string "This technique is called a wheelie.\p" + .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_18199A:: @ 818199A - .string "Wird der B-Knopf gedrückt, kann auf der\n" - .string "Stelle gehüpft werden.\p" - .string "Diese Technik nennt sich Hoppeln.\p" - .string "Dabei kann gleichzeitig gefahren\n" - .string "werden.\p" - .string "Eine andere Seite lesen?$" + .string "Keeping the B Button pressed, your\n" + .string "BIKE can hop on the spot.\p" + .string "This technique is called a bunny hop.\p" + .string "You can ride while hopping, too.\p" + .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_181A3D:: @ 8181A3D - .string "Drücke gleichzeitig den B-Knopf und das\n" - .string "Steuerkreuz, um zu springen.\p" - .string "Drücke das + Steuerkreuz seitlich, um\n" - .string "einen seitlichen Sprung auszuführen.\p" - .string "Drücke es nach hinten, um die Richtung\n" - .string "zu ändern.\p" - .string "Eine andere Seite lesen?$" + .string "Press the B Button and the + Control\n" + .string "Pad at the same time to jump.\p" + .string "Press the + Control Pad to the side\n" + .string "to jump sideways.\p" + .string "Press it backwards to make the BIKE\n" + .string "change directions while jumping.\p" + .string "Want to read a different page?$" diff --git a/data/text/maps/MauvilleCity_GameCorner.inc b/data/text/maps/MauvilleCity_GameCorner.inc index a8756771a..f367c3cf2 100644 --- a/data/text/maps/MauvilleCity_GameCorner.inc +++ b/data/text/maps/MauvilleCity_GameCorner.inc @@ -1,152 +1,147 @@ MauvilleCity_GameCorner_Text_181C35:: @ 8181C35 - .string "Willkommen in unserer SPIELHALLE.$" + .string "This is MAUVILLE GAME CORNER.$" MauvilleCity_GameCorner_Text_181C53:: @ 8181C53 - .string "Okay, du möchtest MÜNZEN für die\n" - .string "Spiele haben?\p" - .string "Aber du hast keinen MÜNZKORB für die\n" - .string "MÜNZEN.$" + .string "Okay, you wanted some COINS for\n" + .string "the games?\p" + .string "But you don’t have a COIN CASE for\n" + .string "stowing the COINS.$" MauvilleCity_GameCorner_Text_181CB4:: @ 8181CB4 - .string "Suchst du nach MÜNZEN?\p" - .string "Das macht ¥1000 für 50 MÜNZEN.\n" - .string "Möchtest du welche haben?$" + .string "Were you looking for COINS?\p" + .string "It’s ¥1000 for 50 COINS.\n" + .string "Would you like some?$" MauvilleCity_GameCorner_Text_181CFE:: @ 8181CFE - .string "Vielen Dank!\n" - .string "Hier sind deine MÜNZEN!$" + .string "Thank you very much!\n" + .string "Here are your COINS!$" MauvilleCity_GameCorner_Text_181D28:: @ 8181D28 - .string "Ähm... Es scheint, du hast nicht\n" - .string "genügend Geld dabei...$" + .string "Um... You don’t appear to have\n" + .string "enough money...$" MauvilleCity_GameCorner_Text_181D57:: @ 8181D57 .string "Oh?\n" - .string "Dein MÜNZKORB ist voll.$" + .string "Your COIN CASE is full.$" MauvilleCity_GameCorner_Text_181D73:: @ 8181D73 - .string "Oh... Dann brauchst du keine MÜNZEN?\n" - .string "Viel Glück bei deinem Abenteuer!$" + .string "Oh... You don’t need COINS, then?\n" + .string "Good luck on your adventure!$" UnknownString_8181DB2: @ 8181DB2 - .string "Das macht ¥1000 für 50 MÜNZEN.\n" - .string "Möchtest du welche haben?$" + .string "It’s ¥1,000 for 50 COINS.\n" + .string "Would you like some?$" MauvilleCity_GameCorner_Text_181DE1:: @ 8181DE1 - .string "Willkommen.\p" - .string "Hier kannst du deine MÜNZEN gegen\n" - .string "Preise eintauschen.$" + .string "Welcome.\p" + .string "You can exchange your COINS for\n" + .string "prizes here.$" MauvilleCity_GameCorner_Text_181E17:: @ 8181E17 - .string "Welchen Preis hättest du gerne?$" + .string "Which prize would you like?$" MauvilleCity_GameCorner_Text_181E33:: @ 8181E33 - .string "Du möchtest also {STR_VAR_1}?$" + .string "So your choice is {STR_VAR_1}?$" MauvilleCity_GameCorner_Text_181E49:: @ 8181E49 - .string "Danke!\n" - .string "Wir senden das auf deinen PC.$" + .string "Thank you!\n" + .string "We’ll send it to your PC at home.$" MauvilleCity_GameCorner_Text_181E76:: @ 8181E76 - .string "Du hast nicht genügend MÜNZEN.$" + .string "You don’t have enough COINS.$" UnknownString_8181E93: @ 8181E93 - .string "Du hast nicht genügend Platz, um\n" - .string "{STR_VAR_1} zu lagern.$" + .string "There isn’t any room available for\n" + .string "placing {STR_VAR_1}.$" MauvilleCity_GameCorner_Text_181EC2:: @ 8181EC2 - .string "Oh, wirklich?\n" - .string "Du musst einige MÜNZEN sparen, bevor\l" - .string "du wiederkommst.$" + .string "Oh, is that so? \n" + .string "You need to save some COINS before\l" + .string "coming back here.$" MauvilleCity_GameCorner_Text_181F08:: @ 8181F08 - .string "Bitte schön!$" + .string "Here you go!$" UnknownString_8181F15: @ 8181F15 - .string "Oh, du kannst nicht mehr tragen.$" + .string "Oh, you can’t carry any more than that.$" MauvilleCity_GameCorner_Text_181F3D:: @ 8181F3D - .string "Ich habe mich vertan und zweimal die\n" - .string "gleiche PUPPE genommen.\p" - .string "Möchtest du eine davon haben?$" + .string "I made a mistake and got two of the\n" + .string "same DOLLS.\p" + .string "Would you like one of them?$" MauvilleCity_GameCorner_Text_181F89:: @ 8181F89 - .string "Bitte schön!$" + .string "There you go!$" MauvilleCity_GameCorner_Text_181F97:: @ 8181F97 - .string "Bitte?\n" - .string "Du möchtest sie, aber nicht jetzt???$" + .string "Huh?\n" + .string "You want it, but not right now?$" MauvilleCity_GameCorner_Text_181FBC:: @ 8181FBC - .string "Oh, sei doch nicht so negativ drauf!\n" - .string "Du kannst sie wirklich gerne haben!$" + .string "Oh, don’t be so negative!\n" + .string "You can have this!$" MauvilleCity_GameCorner_Text_181FE9:: @ 8181FE9 - .string "Es gibt einen Preis, den ich haben\n" - .string "möchte, aber ich kann den Jackpot\l" - .string "nicht knacken.$" + .string "There’s a prize I want, but I can’t win\n" + .string "the jackpot.$" MauvilleCity_GameCorner_Text_18201E:: @ 818201E - .string "Hey, Kindchen, wenn du hier spielen\n" - .string "willst, brauchst du einen MÜNZKORB.\p" - .string "Ich glaube, die junge Dame nebenan hat\n" - .string "einen. Besuche sie mal!$" + .string "Hey, kid, if you want to play here,\n" + .string "you need a COIN CASE.\p" + .string "I think the young lady next door\n" + .string "had one. Go see her!$" MauvilleCity_GameCorner_Text_18208E:: @ 818208E - .string "Mein Glück wird nicht immer anhalten.\n" - .string "Das ist zu viel für mich.\l" - .string "Hier, nimm die MÜNZEN!$" + .string "My luck can only last so long.\n" + .string "This is too much for me.\l" + .string "Here, take some COINS!$" MauvilleCity_GameCorner_Text_1820DD:: @ 81820DD - .string "Immer wenn ich in MALVENFROH CITY bin,\n" - .string "gehe ich in die SPIELHALLE.\p" - .string "MALVENFROH CITY bringt mir einfach\n" - .string "Glück.$" + .string "MAUVILLE has something for\n" + .string "everyone.\p" + .string "For me, it’s the GAME CORNER.$" MauvilleCity_GameCorner_Text_182120:: @ 8182120 - .string "Beim ROULETTE gibt es verschiedene\n" - .string "Einsatzhöhen.\p" - .string "Überprüf deine MÜNZEN, bevor du dich\n" - .string "für einen Tisch entscheidest.$" + .string "The ROULETTE tables have different\n" + .string "rates.\p" + .string "Check your COINS if you’re going to\n" + .string "pick a table.$" MauvilleCity_GameCorner_Text_18217C:: @ 818217C - .string "Hier kann man leicht die Zeit vergessen.\n" - .string "Ich sollte wieder an die Arbeit gehen.$" + .string "It’s easy to lose track of time in here. \n" + .string "I should get back to work.$" MauvilleCity_GameCorner_Text_1821C1:: @ 81821C1 - .string "MÜNZEN werden gebraucht, um hier in der\n" - .string "SPIELHALLE spielen zu können.$" + .string "COINS are needed to play here in the\n" + .string "GAME CORNER.$" MauvilleCity_GameCorner_Text_1821F3:: @ 81821F3 - .string "Dieses ROULETTE-Dingens...\n" - .string "Es ist ziemlich anstrengend.\p" - .string "Ich versuche, zu gewinnen. Aber ich\n" - .string "verliere immer. Doch ich gebe nicht auf.$" + .string "This ROULETTE thing...\n" + .string "It’s rather demanding.\p" + .string "Win or lose, it’s only by luck.$" MauvilleCity_GameCorner_Text_182241:: @ 8182241 - .string "Bis zu drei MÜNZEN können an den EIN-\n" - .string "ARMIGEN BANDITEN eingesetzt werden.\p" - .string "Je mehr Münzen du einsetzt, desto\n" - .string "höher ist deine Chance auf den Jackpot.$" + .string "Up to three COINS can be used to play\n" + .string "the SLOTS.$" MauvilleCity_GameCorner_Text_182272:: @ 8182272 - .string "Kannst du es genau bei “7” stoppen?\p" - .string "Wenn es bei “7” stoppt,\n" - .string "während ein REEL TIME gespielt wird,\l" - .string "erhältst du Extra-MÜNZEN.$" + .string "It’s very difficult to make it stop\n" + .string "right on “7.”\p" + .string "If it stops on “7” during the REEL TIME\n" + .string "bonus game, you’ll receive extra COINS.$" MauvilleCity_GameCorner_Text_1822F4:: @ 81822F4 - .string "Ich kann dir einige nützliche Tipps zu\n" - .string "den EINARMIGEN BANDITEN geben.\p" - .string "Je mehr Blitze du anhältst, desto größer\n" - .string "die Chance auf ein REEL TIME, eine\l" - .string "Glücksrunde!\p" - .string "In einem Spiel mit fünf möglichen\n" - .string "Glücksrunden...\p" - .string "Ist es möglich, vier reguläre Boni und\n" - .string "dann einen Big Bonus zu gewinnen.\p" - .string "Der Big Bonus bringt 660 MÜNZEN,\n" - .string "aber der ist sehr schwer zu gewinnen.$" + .string "Here’s some information for you\n" + .string "about the SLOTS.\p" + .string "The more lightning bolts you stock, the\n" + .string "more REEL TIME chances you get.\p" + .string "In a game with the maximum five REEL\n" + .string "TIME chances...\p" + .string "It is possible to receive four regular\n" + .string "bonuses, then a big bonus.\p" + .string "The big bonus is 660 COINS, but it’s\n" + .string "very difficult to get.$" MauvilleCity_GameCorner_Text_182420:: @ 8182420 - .string "Du kannst ohne MÜNZKORB nicht spielen.$" + .string "You can’t play if you don’t have a\n" + .string "COIN CASE.$" diff --git a/data/text/maps/MauvilleCity_Gym.inc b/data/text/maps/MauvilleCity_Gym.inc index 9d002ba9e..5ae43f880 100644 --- a/data/text/maps/MauvilleCity_Gym.inc +++ b/data/text/maps/MauvilleCity_Gym.inc @@ -1,122 +1,116 @@ MauvilleCity_Gym_Text_180815:: @ 8180815 - .string "Hey, wie sieht es aus, auf dem Weg zum\n" - .string "CHAMP, {PLAYER}?\p" - .string "WALTER, der ARENALEITER von\n" - .string "MALVENFROH CITY, setzt\l" - .string "ELEKTRO-POKéMON ein.\p" - .string "Wenn du ihn mit WASSER-POKéMON\n" - .string "angreifst, macht er sie fertig! Britzel!\p" - .string "Und die Türen lassen sich nur mit\n" - .string "Schaltern öffnen! Wahnsinn!\p" - .string "Nun, dann mal los!$" + .string "Hey, how’s it going, the CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "WATTSON, the LEADER of MAUVILLE\n" + .string "GYM, uses ELECTRIC-type POKéMON.\p" + .string "If you challenge him with WATER-type\n" + .string "POKéMON, he’ll zap them! Bzzt!\p" + .string "And, he’s put in switch-controlled doors\n" + .string "all over his GYM! Eccentric!\p" + .string "Hey, go for it!$" MauvilleCity_Gym_Text_18091D:: @ 818091D - .string "Aah, du bist elektrifizierend!\n" - .string "Du hast die Tür offen gezwungen!$" + .string "Whoa, you’re electrifying!\n" + .string "You’ve powered the door open!$" MauvilleCity_Gym_Text_180956:: @ 8180956 - .string "Die Spannung meiner Seele, sie setzt\n" - .string "alle deine Träume unter Strom! Ja-haha!$" + .string "My electric soul, it’ll shatter your\n" + .string "dreams whole, whoah-yeahah!$" MauvilleCity_Gym_Text_180997:: @ 8180997 - .string "Da wurde der Stromkreis geschlossen\n" - .string "und bis zum Kurzschluss belastet!$" + .string "That was plugged in, amped up,\n" + .string "over-driven electric, man!$" MauvilleCity_Gym_Text_1809D1:: @ 81809D1 - .string "POKéMON und Rock... Alles, was ins Herz\n" - .string "trifft, boh yeah!$" + .string "POKéMON and rock, it’s all about heart,\n" + .string "whoah yeah!$" MauvilleCity_Gym_Text_180A05:: @ 8180A05 - .string "Ich habe unter WALTER trainiert!\n" - .string "So einfach verliere ich nicht.$" + .string "I trained under WATTSON!\n" + .string "There ain’t no way I’d lose easily!$" MauvilleCity_Gym_Text_180A42:: @ 8180A42 - .string "Stecker raus und ausgeschaltet...$" + .string "Unplugged and turned off...$" MauvilleCity_Gym_Text_180A5E:: @ 8180A5E - .string "WALTER, unser ARENALEITER, ist schon\n" - .string "sehr sehr lange hier ansässig.\p" - .string "Er kämpfte schon, da war dein Vater\n" - .string "noch nicht geboren.$" + .string "WATTSON, our GYM LEADER, has been\n" + .string "around for a long, long time.\p" + .string "He was battling even before your\n" + .string "daddy was born, that tough coot.$" MauvilleCity_Gym_Text_180AE0:: @ 8180AE0 - .string "Diese ARENA stellt dir eine Knobel-\n" - .string "aufgabe. Ist das nicht lustig?$" + .string "This GYM’s got puzzles!\n" + .string "Isn’t it fun?$" MauvilleCity_Gym_Text_180B06:: @ 8180B06 - .string "Verlieren ist gar nicht lustig...$" + .string "It’s no fun to lose...$" MauvilleCity_Gym_Text_180B1D:: @ 8180B1D - .string "WALTER sagt, er liebt es, Fallen mit\n" - .string "Schaltern zu installieren.$" + .string "WATTSON says he likes setting up\n" + .string "little traps with switches.$" MauvilleCity_Gym_Text_180B5A:: @ 8180B5A - .string "Mein Charme und die Attacken meiner\n" - .string "POKéMON werden dich schocken!$" + .string "With my charm and my POKéMON’s moves,\n" + .string "you’ll be shocked!$" MauvilleCity_Gym_Text_180B93:: @ 8180B93 - .string "Ich bin geschockt von deiner Stärke!$" + .string "I’m shocked by your power!$" MauvilleCity_Gym_Text_180BAE:: @ 8180BAE - .string "Ich habe gehört, dass MALVENFROH CITY\n" - .string "von WALTER gegründet wurde.\p" - .string "Er war TRAINER, lange bevor wir geboren\n" - .string "wurden. Er muss ein umfangreiches\l" - .string "Wissen besitzen.$" + .string "I’ve heard that MAUVILLE was founded\n" + .string "by WATTSON.\p" + .string "He was a TRAINER long before we\n" + .string "became TRAINERS.\l" + .string "He must know all sorts of things!$" MauvilleCity_Gym_Text_180C32:: @ 8180C32 - .string "Ich habe es aufgegeben, die Stadt\n" - .string "umpolen zu wollen.\p" - .string "Stattdessen verwende ich meine Energie\n" - .string "lieber auf das Installieren von Fallen in\l" - .string "meiner Arena.\p" - .string "Oh? Was machst du denn hier?\p" - .string "Was ist das? Du hast es geschafft, alle\n" - .string "meine Schalter zu finden?\p" - .string "Uahahahaha!\n" - .string "Das ist wirklich amüsant!\p" - .string "Dann ist es nun an mir - dem\n" - .string "ARENALEITER von MALVENFROH CITY\l" - .string "- dich unter Spannung zu setzen!$" + .string "I’ve given up on my plans to convert\n" + .string "the city, I have.\p" + .string "And so, I put my time into making\n" + .string "door traps in my GYM.\p" + .string "Oh? Now, what are you doing here?\p" + .string "What’s that? You say you’ve gotten\n" + .string "past all my rigged doors?\p" + .string "Wahahahah!\n" + .string "Now, that is amusing!\p" + .string "Then, I, WATTSON, the LEADER of\n" + .string "MAUVILLE GYM, shall electrify you!$" MauvilleCity_Gym_Text_180D64:: @ 8180D64 - .string "Uahahahaha!\n" - .string "Schön, ich habe verloren!\p" - .string "Du hast es geschafft, meinen Strom-\n" - .string "kreis zu unterbrechen! Nimm diesen\l" - .string "ORDEN!$" + .string "Wahahahah!\n" + .string "Fine, I lost!\p" + .string "You ended up giving me a thrill!\n" + .string "Take this BADGE!$" MauvilleCity_Gym_Text_180DAF:: @ 8180DAF - .string "{PLAYER} hat den DYNAMO-ORDEN von\n" - .string "WALTER erhalten.$" + .string "{PLAYER} received the DYNAMO BADGE\n" + .string "from WATTSON.$" MauvilleCity_Gym_Text_180DDA:: @ 8180DDA - .string "Mit dem DYNAMO-ORDEN können POKéMON\n" - .string "ZERTRÜMMERER auch außerhalb eines\l" - .string "Kampfes einsetzen.\p" - .string "Und außerdem werden deine POKéMON ein\n" - .string "kleines bisschen schneller.\p" + .string "With the DYNAMO BADGE, POKéMON can\n" + .string "use ROCK SMASH out of battle.\p" + .string "And, it will make your POKéMON a little\n" + .string "bit faster, too.\p" .string "Hmm...\n" - .string "Dies hier solltest du auch nehmen!$" + .string "You should take this, too!$" MauvilleCity_Gym_Text_180E76:: @ 8180E76 - .string "Dies ist TM34 - SCHOCKWELLE.\p" - .string "Eine verlässliche Attacke, die niemals\n" - .string "daneben geht! Verlass dich drauf!$" + .string "That TM34 there contains SHOCK WAVE.\p" + .string "It’s a trustworthy move that never\n" + .string "misses! You can count on it!$" MauvilleCity_Gym_Text_180EDB:: @ 8180EDB - .string "Optimismus erfüllt mich, wenn ich einen\n" - .string "so viel versprechenden TRAINER wie dich\l" - .string "sehe!$" + .string "I swell with optimism, seeing a promising\n" + .string "young TRAINER like you!$" MauvilleCity_Gym_Text_180F1D:: @ 8180F1D - .string "Ahahahaha!\n" - .string "Mach weiter so, streng dich an, Kind!$" + .string "Wahahahah!\n" + .string "Go forth and endeavor, youngster!$" MauvilleCity_Gym_Text_180F4A:: @ 8180F4A - .string "POKéMON ARENA von MALVENFROH CITY$" + .string "MAUVILLE CITY POKéMON GYM$" MauvilleCity_Gym_Text_180F64:: @ 8180F64 - .string "POKéMON ARENA von MALVENFROH CITY\p" - .string "WALTERS ANERKANNTE TRAINER:\n" + .string "MAUVILLE CITY POKéMON GYM\p" + .string "WATTSON’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/MauvilleCity_House1.inc b/data/text/maps/MauvilleCity_House1.inc index 2f0067526..c5eec210e 100644 --- a/data/text/maps/MauvilleCity_House1.inc +++ b/data/text/maps/MauvilleCity_House1.inc @@ -1,17 +1,16 @@ MauvilleCity_House1_Text_181B1A:: @ 8181B1A - .string "Woohoo, deine POKéMON sehen wirklich\n" - .string "sehr stark aus.\p" - .string "Das sehe ich gerne!\n" - .string "Hier, nimm diese VM!$" + .string "Woohoo, your POKéMON look pretty\n" + .string "strong.\p" + .string "I like that!\n" + .string "Here, take this HM!$" MauvilleCity_House1_Text_181B64:: @ 8181B64 - .string "Diese VM enthält ZERTRÜMMERER.\p" - .string "Wenn du unterwegs auf große\n" - .string "Felsbrocken stößt...\p" - .string "Dann nutze diese VM, um dir den Weg\n" - .string "freizumachen.$" + .string "That HM contains ROCK SMASH.\p" + .string "If you come across large boulders\n" + .string "that block your path...\p" + .string "Well, use that HM move and smash\n" + .string "it right out of your way!$" MauvilleCity_House1_Text_181BF6:: @ 8181BF6 - .string "Oh ja, wenn du einen Felsen\n" - .string "zertrümmerst, könnte ein POKéMON\l" - .string "zum Vorschein kommen.$" + .string "Oh, yes, if you smash a rock, a POKéMON\n" + .string "could come flying out.$" diff --git a/data/text/maps/MauvilleCity_House2.inc b/data/text/maps/MauvilleCity_House2.inc index 6de1ff1d9..50cdf1fa7 100644 --- a/data/text/maps/MauvilleCity_House2.inc +++ b/data/text/maps/MauvilleCity_House2.inc @@ -1,24 +1,22 @@ MauvilleCity_House2_Text_18244E:: @ 818244E - .string "Wenn ich doch nur ein RAD hätte...\n" - .string "Dann könnte ich nach GRAPHITPORT\l" - .string "CITY zum Einkaufen fahren.\p" - .string "Dort würde ich mir dann einen HAFEN-\n" - .string "BRIEF im PKMN-SUPERMARKT kaufen...$" + .string "If I had a BIKE, it’d be easy to cycle to\n" + .string "SLATEPORT for some shopping.\p" + .string "I’d be able to buy HARBOR MAIL at the\n" + .string "POKéMON MART in SLATEPORT...$" MauvilleCity_House2_Text_1824D8:: @ 81824D8 - .string "Oh! Du besitzt einen HAFENBRIEF!!!\n" - .string "Würdest du den gegen einen MÜNZKORB\l" - .string "tauschen?$" + .string "Oh! You have HARBOR MAIL?\n" + .string "Will you trade it for a COIN CASE?$" MauvilleCity_House2_Text_182515:: @ 8182515 - .string "Oh, ich bin so glücklich!\n" - .string "Okay, ich gebe dir diesen MÜNZKORB!$" + .string "Oh, I’m so happy!\n" + .string "Okay, I’ll trade you a COIN CASE!$" MauvilleCity_House2_Text_182549:: @ 8182549 - .string "Diesen MÜNZKORB brauchst du in der\n" - .string "SPIELHALLE.$" + .string "That COIN CASE can be used at the\n" + .string "GAME CORNER.$" MauvilleCity_House2_Text_182578:: @ 8182578 - .string "Oh, das ist schade.\p" - .string "In der SPIELHALLE benötigt man einen\n" - .string "MÜNZKORB.$" + .string "Oh, that’s disappointing.\p" + .string "A COIN CASE is needed for the\n" + .string "GAME CORNER.$" diff --git a/data/text/maps/MauvilleCity_Mart.inc b/data/text/maps/MauvilleCity_Mart.inc index b8bf2ebb5..6b8f6c002 100644 --- a/data/text/maps/MauvilleCity_Mart.inc +++ b/data/text/maps/MauvilleCity_Mart.inc @@ -1,15 +1,13 @@ MauvilleCity_Mart_Text_1827D3:: @ 81827D3 - .string "Es gibt Items, die den Status eines\n" - .string "POKéMON kurzzeitig erhöhen.\p" - .string "Ich weiß, dass man X-ANGRIFF und\n" - .string "X-VERTEIDIGUNG im Kampf einsetzen\l" - .string "kann...\p" - .string "Ich glaube, es gibt aber auch noch\n" - .string "andere.$" + .string "There are items that temporarily\n" + .string "elevate the stats of POKéMON.\p" + .string "The ones I know you use in battle\n" + .string "are X ATTACK and X DEFEND...\p" + .string "I do believe that there are others\n" + .string "like them.$" MauvilleCity_Mart_Text_18287F:: @ 818287F - .string "Setze eine bestimmte Attacke ein,\n" - .string "oder stattdessen ein Item...\p" - .string "Ich glaube, die Entscheidungen des\n" - .string "TRAINERS bestimmen, wie ein Kampf\l" - .string "verläuft.$" + .string "Use a certain move, or use an item\n" + .string "instead...\p" + .string "The TRAINER’s decisions determine how\n" + .string "battles turn out, I think.$" diff --git a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc b/data/text/maps/MauvilleCity_PokemonCenter_1F.inc index bb09903b0..c4287cda3 100644 --- a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/text/maps/MauvilleCity_PokemonCenter_1F.inc @@ -1,20 +1,18 @@ MauvilleCity_PokemonCenter_1F_Text_1825BD:: @ 81825BD - .string "Der Mann dort drüben, der sagt\n" - .string "vielleicht verrückte Dinge!\p" - .string "Auf seltsame Weise ist er aber amüsant.\n" - .string "Den werde ich wohl nicht vergessen!$" + .string "That man over there, he says weird\n" + .string "things!\p" + .string "He’s funny in a weird way.\n" + .string "I doubt I’ll forget about him!$" MauvilleCity_PokemonCenter_1F_Text_182622:: @ 8182622 - .string "Wenn ich auf STATISTIKTAUSCH Zugriff\n" - .string "nehme, werden die neuesten Nachrichten\l" - .string "aus FAUSTAUHAVEN hochgeladen.\p" - .string "Diese Daten decken sich nun mit denen\n" - .string "meines Freundes!$" + .string "When I accessed the RECORD CORNER,\n" + .string "the data for what’s hot in DEWFORD\l" + .string "got updated.\p" + .string "Now that bit of data is the same\n" + .string "as my friend’s!$" MauvilleCity_PokemonCenter_1F_Text_1826A6:: @ 81826A6 - .string "Im oberen Stockwerk des POKéMON-\n" - .string "CENTERS wurde die Möglichkeit des\l" - .string "STATISTIKTAUSCHES eingerichtet.\p" - .string "Ich weiß nicht genau, was das ist. Aber\n" - .string "das werde ich herausfinden! Ist\l" - .string "bestimmt lustig!$" + .string "A RECORD CORNER opened upstairs in\n" + .string "the POKéMON CENTER.\p" + .string "I don’t know what it’s about, but it\n" + .string "sounds fun. I’ll go check it out!$" diff --git a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc b/data/text/maps/MauvilleCity_PokemonCenter_2F.inc index 27f3ae66e..1e67948a5 100644 --- a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc +++ b/data/text/maps/MauvilleCity_PokemonCenter_2F.inc @@ -1,8 +1,7 @@ MauvilleCity_PokemonCenter_2F_Text_182724:: @ 8182724 - .string "Wusstest du, dass du von hier aus via\n" - .string "Link Kämpfe im KOLOSSEUM ausfechten\l" - .string "kannst?\p" - .string "Deine Ergebnisse werden dann an der\n" - .string "Wand ausgehängt, wo sie jeder sieht.\p" - .string "Es ist schon peinlich, wenn man öfter\n" - .string "verliert als gewinnt...$" + .string "Did you know that you can link battle\n" + .string "at the COLOSSEUM here?\p" + .string "They put up your record on the wall\n" + .string "for everyone to see.\p" + .string "It’s embarrassing if you lose more\n" + .string "often than you win...$" diff --git a/data/text/maps/MeteorFalls_1F_1R.inc b/data/text/maps/MeteorFalls_1F_1R.inc index 3efe7ff39..ad19e3e0b 100644 --- a/data/text/maps/MeteorFalls_1F_1R.inc +++ b/data/text/maps/MeteorFalls_1F_1R.inc @@ -1,99 +1,93 @@ MeteorFalls_1F_1R_Text_193237:: @ 8193237 - .string "Hähähä!\p" - .string "Mit diesem METEORITEN wird\n" - .string "SCHLOTBERG...$" + .string "Hehehe!\p" + .string "With this METEORITE, MT. CHIMNEY\n" + .string "will...$" MeteorFalls_1F_1R_Text_193268:: @ 8193268 - .string "Häh?\p" - .string "Ich weiß zwar nicht, wer du bist. Aber\n" - .string "wenn du dich TEAM {EVIL_TEAM} in den Weg\l" - .string "stellst, erwarte keine Gnade!$" + .string "Heh?\p" + .string "I don’t know who you are, but if you get\n" + .string "in the way of TEAM {EVIL_TEAM}, don’t\l" + .string "expect any mercy!$" MeteorFalls_1F_1R_Text_1932C5:: @ 81932C5 - .string "Bleibt sofort stehen, TEAM {EVIL_TEAM}!\p" - .string "Wir, TEAM {GOOD_TEAM}, lassen euch nicht so \n" - .string "einfach mit euren Missetaten davon-\l" - .string "kommen.$" + .string "Hold it right there, TEAM {EVIL_TEAM}!\p" + .string "We, TEAM {GOOD_TEAM}, won’t allow you to\n" + .string "get away with your misdeeds!$" MeteorFalls_1F_1R_Text_193320:: @ 8193320 - .string "Hähähä!\n" - .string "Sogar TEAM {GOOD_TEAM} leistet uns\l" - .string "Gesellschaft!\p" - .string "Aber es ist viel zu anstrengend, sich\n" - .string "mit allen auseinander zu setzen...\p" - .string "Hey, das spielt auch keine Rolle!\p" - .string "Wir haben den METEORITEN und so\n" - .string "machen wir uns auf zum SCHLOTBERG!\p" - .string "Hähähä! Wir sehen uns, ihr Würstchen\n" - .string "vom TEAM {GOOD_TEAM}!$" + .string "Hehehe!\n" + .string "Even TEAM {GOOD_TEAM} joins us!\p" + .string "But it’s too much trouble to deal with\n" + .string "you all...\p" + .string "Heh, it doesn’t matter!\p" + .string "We’ve got the METEORITE, so off to\n" + .string "MT. CHIMNEY we go!\p" + .string "Hehehe! Be seeing you, you TEAM\n" + .string "{GOOD_TEAM} dingbats!$" MeteorFalls_1F_1R_Text_1933EC:: @ 81933EC - .string "Und du bist?\p" + .string "And you are?\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Schön, du bist also {PLAYER}{KUN}.\p" - .string "Ich bin MARC. Als Kopf vom TEAM MAGMA\n" - .string "widme ich mich hingebungsvoll der\l" - .string "Aufgabe, die gefährlichen Pläne von\l" - .string "TEAM AQUA zu durchkreuzen.\p" - .string "Warum? Weil TEAM AQUA unser aller\n" - .string "Sargnagel ist, deshalb!\p" - .string "Sie haben schon etliche gefährliche\n" - .string "Dinge unternommen, um die Meere zu\l" - .string "vergrößern.\p" - .string "Wir, TEAM MAGMA, lieben trockenes Land\n" - .string "über alles! TEAM AQUA? Unser Erzfeind!$" + .string "Fine, so you are {PLAYER}{KUN}.\p" + .string "I am MAXIE. As the head of TEAM MAGMA,\n" + .string "I have dedicated myself to thwarting\l" + .string "the dangerous plans of TEAM AQUA.\p" + .string "Why? Because TEAM AQUA is a grave\n" + .string "threat to us all.\p" + .string "They have committed many destructive\n" + .string "acts in their bid to enlarge the sea.\p" + .string "We, TEAM MAGMA, love dry land above\n" + .string "all! TEAM AQUA is our sworn enemy!$" MeteorFalls_1F_1R_Text_193584:: @ 8193584 - .string "Wer bist du denn???\p" + .string "Who might you be?\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Ah ja, du bist {PLAYER}{KUN}.\p" - .string "Ich bin ADRIAN. Als Kopf von TEAM AQUA\n" - .string "setze ich alles daran, die gefährlichen\l" - .string "Pläne von TEAM MAGMA zu vereiteln.\p" - .string "Warum? Weil TEAM MAGMA uns alle noch\n" - .string "zugrunde richtet!\p" - .string "Sie führen waghalsige und gefährliche\n" - .string "Pläne aus, um die Landmassen zu\l" - .string "vergrößern.\p" - .string "Wir, TEAM AQUA, lieben das Meer über\n" - .string "alles. TEAM MAGMA ist unser Erzfeind!$" + .string "Ah, so you are {PLAYER}{KUN}.\p" + .string "I am ARCHIE. As the head of TEAM AQUA,\n" + .string "I have dedicated myself to thwarting\l" + .string "the dangerous plans of TEAM MAGMA.\p" + .string "Why? Because TEAM MAGMA is a grave\n" + .string "threat to us all.\p" + .string "They have committed many destructive\n" + .string "acts in their bid to expand the land.\p" + .string "We, TEAM AQUA, love the sea above\n" + .string "all! TEAM MAGMA is our sworn enemy!$" MeteorFalls_1F_1R_Text_193720:: @ 8193720 - .string "{GOOD_LEADER}, wir sollten TEAM {EVIL_TEAM}\n" - .string "verfolgen...$" + .string "{GOOD_LEADER}, we should give chase to\n" + .string "TEAM {EVIL_TEAM}...$" MeteorFalls_1F_1R_Text_193747:: @ 8193747 - .string "{GOOD_LEADER}: Ja, ja. Das müssen wir!\n" - .string "Wir müssen uns beeilen.\p" - .string "Nicht auszudenken, was TEAM {EVIL_TEAM} am\n" - .string "SCHLOTBERG anrichten will!$" + .string "{GOOD_LEADER}: Yes, yes, we must!\n" + .string "We’ve got to hurry.\p" + .string "There’s no telling what TEAM {EVIL_TEAM}\n" + .string "will do at MT. CHIMNEY!$" MeteorFalls_1F_1R_Text_1937AA:: @ 81937AA - .string "{GOOD_LEADER}: {PLAYER}{KUN}, du solltest\n" - .string "TEAM {EVIL_TEAM} im Auge behalten.\p" - .string "Leb wohl!$" + .string "{GOOD_LEADER}: {PLAYER}{KUN}, you should keep\n" + .string "an eye out for TEAM {EVIL_TEAM}, too.\p" + .string "Farewell!$" MeteorFalls_1F_1R_Text_1937EB:: @ 81937EB - .string "Ich... Ich bin KOSMO...\n" - .string "Ich bin Professor...\p" - .string "Eigentlich studiere ich METEORITEN in\n" - .string "LAUBWECHSELFELD...\p" - .string "Dann haben mich einige Typen vom\n" - .string "TEAM {EVIL_TEAM} überredet, sie zu METEOR-\l" - .string "FÄLLE zu führen...\p" - .string "Sie haben mir versprochen, für mich\n" - .string "einen METEORITEN auszugraben...\p" - .string "Aber ich...\n" - .string "TEAM {EVIL_TEAM} hat mich hereingelegt...\p" - .string "Oh... Dieser METEORIT... Der wird\n" - .string "jetzt wohl nie mehr mir gehören...\p" - .string "Aber TEAM {EVIL_TEAM}...\p" - .string "Was haben sie mit dem METEORITEN am\n" - .string "SCHLOTBERG vor?$" + .string "I... I’m COZMO...\n" + .string "I’m a PROFESSOR...\p" + .string "I usually study METEORITES in\n" + .string "FALLARBOR TOWN...\p" + .string "Then some people from TEAM {EVIL_TEAM}\n" + .string "made me guide them to METEOR FALLS...\p" + .string "They promised me that they would\n" + .string "excavate METEORITES for me...\p" + .string "But, I...\n" + .string "TEAM {EVIL_TEAM} tricked me...\p" + .string "Oh... That METEORITE...\n" + .string "It will never be mine now...\p" + .string "But that TEAM {EVIL_TEAM}...\p" + .string "What are they going to do with that\n" + .string "METEORITE at MT. CHIMNEY?$" MeteorFalls_1F_1R_Text_19396A:: @ 819396A - .string "PROF. KOSMO: Dieses TEAM {EVIL_TEAM}...\p" - .string "Was haben sie mit dem METEORITEN am\n" - .string "SCHLOTBERG vor?$" + .string "PROF. COZMO: That TEAM {EVIL_TEAM}...\p" + .string "What are they going to do with that\n" + .string "METEORITE at MT. CHIMNEY?$" diff --git a/data/text/maps/MeteorFalls_1F_2R.inc b/data/text/maps/MeteorFalls_1F_2R.inc index ee685eb0c..35b60d662 100644 --- a/data/text/maps/MeteorFalls_1F_2R.inc +++ b/data/text/maps/MeteorFalls_1F_2R.inc @@ -1,121 +1,113 @@ MeteorFalls_1F_2R_Text_1939C5:: @ 81939C5 - .string "Dort trainieren wir DRACHEN-Besitzer...\p" - .string "Auch der CHAMP kommt manchmal vorbei.\n" - .string "Verstehst du nun, dass dies ein\l" - .string "besonderer Ort ist?$" + .string "This is where we DRAGON users do our\n" + .string "training.\p" + .string "The CHAMPION even visits.\n" + .string "Now do you see how special it is here?$" MeteorFalls_1F_2R_Text_193A35:: @ 8193A35 - .string "Argh!\n" - .string "Ich hätte nicht gedacht, dass du so\l" - .string "stark bist!$" + .string "Urgh!\n" + .string "I didn’t expect you to be so strong!$" MeteorFalls_1F_2R_Text_193A60:: @ 8193A60 - .string "Der Weg vor mir ist lang und\n" - .string "beschwerlich.\p" - .string "Wann werden meine POKéMON und ich\n" - .string "zu den Besten gehören?$" + .string "The road ahead remains long and harsh.\p" + .string "When will my POKéMON and I become the\n" + .string "best?$" MeteorFalls_1F_2R_Text_193AB3:: @ 8193AB3 - .string "Seit wir uns das letzte Mal gesehen\n" - .string "haben, haben wir hart trainiert ver-\l" - .string "glichen mit unserem ersten Kampf.\p" - .string "Hilf uns, herauszufinden, wie stark wir\n" - .string "wirklich sind.$" + .string "Since we met, we have trained hard\n" + .string "with our sights on number one.\p" + .string "Help us see how much stronger we’ve\n" + .string "become!$" MeteorFalls_1F_2R_Text_193B21:: @ 8193B21 - .string "Argh!\n" - .string "Wie kannst du nur so stark sein?$" + .string "Urgh!\n" + .string "I didn’t expect you to be so strong!$" MeteorFalls_1F_2R_Text_193B4C:: @ 8193B4C - .string "Du hast uns bei unserem Training\n" - .string "wirklich sehr geholfen.\p" - .string "Solange du stärker wirst, kann auch\n" - .string "ich stärker werden.$" + .string "You’ve obviously kept up your\n" + .string "POKéMON training.\p" + .string "So long as you remain strong, I, too,\n" + .string "can become stronger!$" MeteorFalls_1F_2R_Text_193BB7:: @ 8193BB7 - .string "URS: Wir haben immer in trauter Zwei-\n" - .string "samkeit mit unseren POKéMON gegen\l" - .string "andere gekämpft. Wir werden siegen!$" + .string "JOHN: We’ve always battled POKéMON\n" + .string "together as a twosome.\l" + .string "We’ve confidence in ourselves.$" MeteorFalls_1F_2R_Text_193C10:: @ 8193C10 - .string "URS: O weh.\n" - .string "Wir haben verloren, liebstes Weib.$" + .string "JOHN: Oh, my.\n" + .string "We’ve lost, dear wife.$" MeteorFalls_1F_2R_Text_193C35:: @ 8193C35 - .string "URS: Wir sind seit 50 Jahren glücklich\n" - .string "verheiratet.\p" - .string "Und denk mal, ich habe es noch nie ge-\n" - .string "schafft, meine Frau zu besiegen.$" + .string "JOHN: We’ve been married for\n" + .string "fifty years.\p" + .string "Come to think of it, I’ve yet to beat\n" + .string "my dear wife in a battle.$" MeteorFalls_1F_2R_Text_193C9F:: @ 8193C9F - .string "URS: Nun, was für ein junger TRAINER!\p" - .string "Möchtest du mit uns kämpfen? Wenn ja,\n" - .string "dann musst du dir noch mehr POKéMON\l" - .string "besorgen.$" + .string "JOHN: Well, well, what a young TRAINER!\p" + .string "Will you battle with us? If so, you’ll\n" + .string "have to return with more POKéMON.$" MeteorFalls_1F_2R_Text_193D10:: @ 8193D10 - .string "EVI: Wir sind seit 50 Jahren glücklich\n" - .string "verheiratet.\p" - .string "Das Band, das uns verbindet, kann\n" - .string "niemand durchtrennen.$" + .string "JAY: We’ve been married for\n" + .string "fifty years.\p" + .string "The bond we share as a couple could\n" + .string "never be broken.$" MeteorFalls_1F_2R_Text_193D6E:: @ 8193D6E - .string "EVI: O weh.\n" - .string "Wir haben verloren, mein Lieber.$" + .string "JAY: Oh, dear.\n" + .string "We’ve lost, my dear husband.$" MeteorFalls_1F_2R_Text_193D9A:: @ 8193D9A - .string "EVI: 50 Jahre verheiratet...\p" - .string "Immer wenn wir uneinig sind, ent-\n" - .string "scheiden wir es mit einem POKéMON-\l" - .string "Kampf.$" + .string "JAY: Fifty years of marriage...\p" + .string "If we ever argued, we always settled\n" + .string "it with a POKéMON battle...$" MeteorFalls_1F_2R_Text_193DFB:: @ 8193DFB - .string "EVI: Hmm... Bist du nicht ein bisschen zu\n" - .string "klein für einen TRAINER?\p" - .string "Möchtest du mit uns kämpfen? Dann\n" - .string "musst du dir noch mehr POKéMON\l" - .string "besorgen.$" + .string "JAY: Well, well, aren’t you a young\n" + .string "TRAINER?\p" + .string "If you’d care to battle with us, you’ll\n" + .string "have to come back with more POKéMON.$" MeteorFalls_1F_2R_Text_193E75:: @ 8193E75 - .string "URS: Wir haben immer in trauter Zwei-\n" - .string "samkeit mit unseren POKéMON gegen\l" - .string "andere gekämpft. Wir werden siegen!$" + .string "JOHN: We’ve always battled POKéMON\n" + .string "together as a twosome.\l" + .string "We’ve confidence in ourselves.$" MeteorFalls_1F_2R_Text_193ECE:: @ 8193ECE - .string "URS: O weh.\n" - .string "Wir haben verloren, liebstes Weib.$" + .string "JOHN: Oh, my.\n" + .string "We’ve lost, dear wife.$" MeteorFalls_1F_2R_Text_193EF3:: @ 8193EF3 - .string "URS: 50 Jahre verheiratet...\p" - .string "Rückblickend kann man sagen: Meine Frau\n" - .string "und ich haben Tag für Tag miteinander\l" - .string "gekämpft...$" + .string "JOHN: Married for fifty years...\p" + .string "On reflection, the dear wife and I,\n" + .string "we battled day in and day out...$" MeteorFalls_1F_2R_Text_193F59:: @ 8193F59 - .string "URS: Nun, was für ein junger TRAINER!\p" - .string "Möchtest du mit uns kämpfen? Wenn ja,\n" - .string "dann musst du dir noch mehr POKéMON\l" - .string "besorgen.$" + .string "JOHN: Well, well, what a young\n" + .string "TRAINER!\p" + .string "Will you battle with us? If so, you’ll\n" + .string "have to return with more POKéMON.$" MeteorFalls_1F_2R_Text_193FCA:: @ 8193FCA - .string "EVI: Wir sind seit 50 Jahren\n" - .string "verheiratet.\p" - .string "Wir haben uns immer gegenseitig unter-\n" - .string "stützt. Das hat uns stark gemacht.$" + .string "JAY: We’ve been married for\n" + .string "fifty years.\p" + .string "We’ve supported each other all that\n" + .string "time. We’ve made ourselves strong.$" MeteorFalls_1F_2R_Text_19403A:: @ 819403A - .string "EVI: O weh.\n" - .string "Wir haben verloren, mein Lieber.$" + .string "JAY: Oh, dear.\n" + .string "We’ve lost, my dear husband.$" MeteorFalls_1F_2R_Text_194066:: @ 8194066 - .string "EVI: 50 Jahre verheiratet...\n" - .string "Vieles ist in dieser Zeit passiert.\p" - .string "Ich hoffe, wir werden noch lange unsere\n" - .string "Erinnerungen miteinander teilen können.$" + .string "JAY: Fifty years of marriage...\n" + .string "Many things have happened.\p" + .string "I hope that we will continue to make\n" + .string "happy memories together.$" MeteorFalls_1F_2R_Text_1940DF:: @ 81940DF - .string "EVI: Hmm... Bist du nicht ein bisschen zu\n" - .string "klein für einen TRAINER?\p" - .string "Möchtest du gegen uns kämpfen? Dann\n" - .string "musst du dir noch mehr POKéMON\l" - .string "besorgen.$" + .string "JAY: Well, well, aren’t you a young\n" + .string "TRAINER?\p" + .string "If you’d care to battle with us, you’ll\n" + .string "have to come back with more POKéMON.$" diff --git a/data/text/maps/MossdeepCity.inc b/data/text/maps/MossdeepCity.inc index 48d0e95d0..9bdcf3b3c 100644 --- a/data/text/maps/MossdeepCity.inc +++ b/data/text/maps/MossdeepCity.inc @@ -1,88 +1,84 @@ MossdeepCity_Text_1690A9:: @ 81690A9 - .string "Ich habe das von TROY bekommen, weiß\n" - .string "aber nicht, was ich damit machen soll.\p" - .string "Ich glaube, es heißt KING-STEIN.\n" - .string "Möchtest du das haben?$" + .string "I got this from STEVEN, but I don’t\n" + .string "know what it’s good for.\p" + .string "I think it’s called KING’S ROCK.\n" + .string "Do you want it?$" MossdeepCity_Text_169117:: @ 8169117 - .string "Warum willst du das haben?\n" - .string "Du bist komisch.\p" - .string "Du kannst es behalten, aber erzähle\n" - .string "es nicht TROY.$" + .string "Why would you want it?\n" + .string "You’re weird.\p" + .string "You can keep it, but keep it a secret\n" + .string "from STEVEN.$" MossdeepCity_Text_16916F:: @ 816916F - .string "Macht es wirklich so viel Spaß, Steine zu\n" - .string "sammeln? Kann ich gar nicht verstehen.$" + .string "Is it really that fun collecting\n" + .string "rocks? I don’t get it.$" MossdeepCity_Text_1691A7:: @ 81691A7 - .string "Ach, du denkst das auch! Was soll man\n" - .string "auch mit komischen Steinen anfangen?$" + .string "Yeah, you think so, too! What are you\n" + .string "supposed to do with some weird rock?$" MossdeepCity_Text_1691F2:: @ 81691F2 - .string "In der Nähe von MOOSBACH CITY\n" - .string "kann man wilde WAILMER sehen.\p" - .string "Das nennt man, äh...\n" - .string "Nennt man... äh... ähm...\p" - .string "WAI..., WAI..., WAI...\p" - .string "WAILMER Watching!$" + .string "Around MOSSDEEP, you can see wild\n" + .string "WAILMER.\p" + .string "It’s called, uh...\n" + .string "What was it now...\p" + .string "WAI, WAI, WAI...\p" + .string "WAILMER watching!$" MossdeepCity_Text_169266:: @ 8169266 - .string "Am RAUMFAHRTZENTRUM auf der Insel\n" - .string "werden große Raketen gestartet.$" + .string "The island’s SPACE CENTER has been\n" + .string "launching huge rockets.$" MossdeepCity_Text_1692A1:: @ 81692A1 - .string "Ich habe von Freunden in SEEGRA-\n" - .string "SULB gehört, dass eine Herde WAILMER\l" - .string "verschwunden ist.\p" - .string "Was mag da wohl passiert sein?$" + .string "I’d heard from my mates in LILYCOVE\n" + .string "that the herd of WAILMER has\l" + .string "disappeared.\p" + .string "What went down over there, I wonder?$" MossdeepCity_Text_169314:: @ 8169314 - .string "Wäre das nicht schön?\p" - .string "Wenn die ganze Welt so mit Blumen und\n" - .string "Pflanzen bewachsen wäre wie diese\l" - .string "Insel?$" + .string "Wouldn’t it be nice?\p" + .string "If the whole world was covered in\n" + .string "plants and flowers like this island?$" MossdeepCity_Text_169370:: @ 8169370 - .string "Alle Lebewesen brauchen das Meer, um\n" - .string "leben zu können, auch wenn sie an Land\l" - .string "leben.\p" - .string "Am Ende seiner Reise wird aus dem\n" - .string "Lebenden Erde und er kehrt zurück\l" - .string "zum Land.\p" - .string "Und das Meer steht immer in Verbindung\n" - .string "zum Land.\p" - .string "Genau wie dieses Ufer hier.$" + .string "All life needs the sea to live, even\n" + .string "though it makes its home on the land.\p" + .string "Life, having run its course, becomes\n" + .string "soil and returns to the land.\p" + .string "And the sea is always connected to\n" + .string "the land.\p" + .string "Yes, like the very shoreline here.$" MossdeepCity_Text_16944E:: @ 816944E - .string "Eine Reise auf einem Schiff ist toll.\p" - .string "Aber das Meer auf einem POKéMON zu\n" - .string "überqueren, das SURFER einsetzt...\p" - .string "Das ist wirklich eine aufregende Sache.\n" - .string "Meinst du nicht auch, Kindchen?$" + .string "A voyage on a ship is fine.\p" + .string "But crossing the sea with POKéMON\n" + .string "using SURF...\p" + .string "Now that’s an exhilarating trip!\n" + .string "Wouldn’t you agree, youngster?$" MossdeepCity_Text_1694DA:: @ 81694DA - .string "Dieser Felsen hat eine ganz besondere\n" - .string "Bedeutung für das RAUMFAHRTZENTRUM.\p" - .string "Sie haben ihn hier hingesetzt als\n" - .string "Glücksbringer für den sicheren Flug der\l" - .string "Raketen.\p" - .string "Wenn du dir etwas wünschst, was machst\n" - .string "du dann? Sternschnuppen beobachten?\p" - .string "Ich benutze ein Wunschkärtchen.\n" - .string "Genau das mache ich.$" + .string "This rock has a special meaning to\n" + .string "the people at the SPACE CENTER.\p" + .string "They put it here as their wish for\n" + .string "their rockets to fly safely.\p" + .string "When you make a wish, what do you use?\n" + .string "Do you wish upon a star?\p" + .string "I use a wish tag to make it happen.\n" + .string "That’s what I do.$" MossdeepCity_Text_1695D3:: @ 81695D3 - .string "Ein weißer Felsen.$" + .string "It’s a white rock.$" MossdeepCity_Text_1695E6:: @ 81695E6 - .string "POKéMON ARENA von MOOSBACH CITY \n" - .string "LEITER: SVENJA & BEN\p" - .string "“Die mystische Kombination!”$" + .string "MOSSDEEP CITY POKéMON GYM\n" + .string "LEADERS: LIZA & TATE\p" + .string "“The mystic combination!”$" MossdeepCity_Text_16962F:: @ 816962F - .string "MOOSBACH CITY\n" - .string "“Unser Motto: Liebe POKéMON!”$" + .string "MOSSDEEP CITY\n" + .string "“Our slogan: Cherish POKéMON!”$" MossdeepCity_Text_16965C:: @ 816965C - .string "MOOSBACH CITY RAUMFAHRTZENTRUM\n" - .string "“Der letzte Ort vor dem All.”$" + .string "MOSSDEEP SPACE CENTER\n" + .string "“The closest place to space.”$" diff --git a/data/text/maps/MossdeepCity_GameCorner_1F.inc b/data/text/maps/MossdeepCity_GameCorner_1F.inc index 277f8008a..7324999c8 100644 --- a/data/text/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/text/maps/MossdeepCity_GameCorner_1F.inc @@ -1,61 +1,59 @@ MossdeepCity_GameCorner_1F_Text_18E59A:: @ 818E59A - .string "Als ich noch jung war, bin ich als\n" - .string "POKéMON-TRAINER durch die Welt\l" - .string "gereist.\p" - .string "Nun, da ich ein alter Knabe geworden bin,\n" - .string "beobachte ich mit Freuden die jungen\l" - .string "TRAINER bei ihren Kämpfen.$" + .string "When I was young, I traveled the world\n" + .string "as a POKéMON TRAINER.\p" + .string "Now that I’ve become an old buzzard,\n" + .string "my only amusement is watching young\l" + .string "TRAINERS battle.$" MossdeepCity_GameCorner_1F_Text_18E631:: @ 818E631 - .string "Diese Tür ist verschlossen.$" + .string "The door appears to be locked.$" MossdeepCity_GameCorner_1F_Text_18E650:: @ 818E650 - .string "Ein TRAINER namens {STR_VAR_1} ist bei\n" - .string "mir zu Besuch.\p" - .string "Möchtest du einmal gegen {STR_VAR_1}\n" - .string "antreten?$" + .string "A TRAINER named {STR_VAR_1} is\n" + .string "visiting my home.\p" + .string "Would you like to challenge\n" + .string "{STR_VAR_1}?$" MossdeepCity_GameCorner_1F_Text_18E698:: @ 818E698 - .string "Du möchtest nicht kämpfen? Es ent-\n" - .string "täuscht mich, dass ich dich nicht\l" - .string "kämpfen sehen kann.$" + .string "You won’t battle? I’m disappointed\n" + .string "that I can’t see you battle...$" MossdeepCity_GameCorner_1F_Text_18E6DA:: @ 818E6DA - .string "Oh, sehr gut!\p" - .string "Aber mein Haus ist nicht sehr stabil.\p" - .string "Könntet ihr einen 3-gegen-3-Kampf\n" - .string "ausfechten?$" + .string "Oh, good, good!\p" + .string "But my house isn’t all that sturdy.\p" + .string "Could I ask you to keep it down to\n" + .string "a 3-on-3 match?$" MossdeepCity_GameCorner_1F_Text_18E741:: @ 818E741 - .string "Bevor ihr gegeneinander antretet,\n" - .string "solltet ihr eure Spiele speichern!$" + .string "Before you two battle, you should\n" + .string "save your progress.$" MossdeepCity_GameCorner_1F_Text_18E777:: @ 818E777 - .string "Ich hoffe, einen guten Kampf zu sehen!$" + .string "I hope to see a good match!$" UnknownString_818E793: @ 818E793 .string "{STR_VAR_1}$" MossdeepCity_GameCorner_B1F_Text_18E796:: @ 818E796 - .string "Der Kampf endet unentschieden.$" + .string "The match ended up a draw.$" MossdeepCity_GameCorner_1F_Text_18E7B1:: @ 818E7B1 - .string "So, also ist es ein Unentschieden.\p" - .string "Ein brillanter Kampf, in dem niemand\n" - .string "auch nur einen Schritt ausgewichen ist.$" + .string "So, it became a standoff.\p" + .string "It was a brilliant match in which\n" + .string "neither side conceded a step!$" UnknownString_818E80B: @ 818E80B .string "{STR_VAR_1}$" MossdeepCity_GameCorner_1F_Text_18E80E:: @ 818E80E - .string "Das war absolute Spitzenklasse!\p" - .string "Ich habe mich wieder erkannt - mich in\n" - .string "meinen jungen Jahren!$" + .string "That was superlative!\p" + .string "Why, it was like seeing myself in my\n" + .string "youth again!$" UnknownString_818E856: @ 818E856 .string "{STR_VAR_1}$" MossdeepCity_GameCorner_1F_Text_18E859:: @ 818E859 - .string "Ach, wie bedauerlich für dich!\p" - .string "Aber es war ein guter Kampf.\n" - .string "Ich hoffe, das nächste Mal gewinnst du.$" + .string "Ah, too bad for you!\p" + .string "But it was a good match.\n" + .string "I hope you can win next time.$" diff --git a/data/text/maps/MossdeepCity_Gym.inc b/data/text/maps/MossdeepCity_Gym.inc index a5b692603..5ff5f6554 100644 --- a/data/text/maps/MossdeepCity_Gym.inc +++ b/data/text/maps/MossdeepCity_Gym.inc @@ -1,177 +1,168 @@ MossdeepCity_Gym_Text_18C7E3:: @ 818C7E3 - .string "Na, wie sieht es aus, auf dem Weg zum\n" - .string "CHAMP, {PLAYER}?\p" - .string "Die ARENALEITER hier setzen PSYCHO-\n" - .string "POKéMON ein.\p" - .string "Setzt du KAMPF- oder GIFT-POKéMON ein,\n" - .string "werden diese großen Schaden nehmen!\p" - .string "Und außerdem wirst du dich gegen eine\n" - .string "außergewöhnliche Kombination von\l" - .string "Attacken behaupten müssen.\p" - .string "Wenn du gewinnen willst, musst du ihnen\n" - .string "beweisen, wie sehr du mit deinen\l" - .string "POKéMON verbunden bist! Und nun los!$" + .string "Yo, how’s it going, CHAMPION-bound\n" + .string "{PLAYER}?\p" + .string "The GYM LEADERS here use PSYCHIC-type\n" + .string "POKéMON.\p" + .string "If you go up against them with\n" + .string "FIGHTING- or POISON-type POKéMON,\l" + .string "they’ll inflict horrible damage!\p" + .string "Plus, they’ll come at you with\n" + .string "outstanding combination attacks.\p" + .string "If you want to win, you’ll need to show\n" + .string "them how tight you are with your\l" + .string "POKéMON. Go for it!$" MossdeepCity_Gym_Text_18C938:: @ 818C938 - .string "Wow, du bist erstaunlich!\n" - .string "Du bist ein großartiger TRAINER!$" + .string "Wow, you’re astounding!\n" + .string "You’re one great TRAINER!$" MossdeepCity_Gym_Text_18C96A:: @ 818C96A - .string "Kämpfe hängen von der Stärke deines\n" - .string "Geistes ab! Die mit schwachem Geist\l" - .string "werden niemals gewinnen.$" + .string "Battles hinge on the strength of your\n" + .string "spirit! The weak-spirited will never win!$" MossdeepCity_Gym_Text_18C9BA:: @ 818C9BA - .string "Ich habe verloren! Ich muss meinen\n" - .string "Geist stärken!$" + .string "I lost! I must temper my spirit again!$" MossdeepCity_Gym_Text_18C9E1:: @ 818C9E1 - .string "Eine nichtssagende Niederlage.\n" - .string "Das war doch nur eine Warnung an dich.$" + .string "The indecisive lose.\n" + .string "That’s my warning to you.$" MossdeepCity_Gym_Text_18CA10:: @ 818CA10 - .string "Zeig mir, ob du Talent hast.$" + .string "Let me see your talent!$" MossdeepCity_Gym_Text_18CA28:: @ 818CA28 - .string "Du besitzt offensichtlich Talent.$" + .string "You possess spectacular talent!$" MossdeepCity_Gym_Text_18CA48:: @ 818CA48 - .string "Wenn es überhaupt Wunderkinder gibt, \n" - .string "dann sind es unsere ARENALEITER.\p" - .string "Aber du scheinst doch talentierter\n" - .string "als sie zu sein...$" + .string "If there are prodigies in the world,\n" + .string "then our GYM LEADERS are them!\p" + .string "However, you may be even more talented\n" + .string "than them...$" MossdeepCity_Gym_Text_18CAC0:: @ 818CAC0 - .string "Hihihihi... Achtung! Ich lasse meinen\n" - .string "POKéBALL durch Telekinese schweben!\p" - .string "Wuhuuuuuuuhuiii!\n" + .string "Fufufufu... Watch me levitate a POKé\n" + .string "BALL telekinetically!\p" + .string "Wrooooooooaaaar!\n" .string "... ... ... ... ... ... ...\p" - .string "Äh, manchmal fehlt es mir etwas an\n" - .string "Balance...$" + .string "Sometimes, I’m out of sync...$" MossdeepCity_Gym_Text_18CB46:: @ 818CB46 - .string "Meine POKéMON kämpften nicht synchron!$" + .string "My POKéMON battling skills are out\n" + .string "of sync, too!$" MossdeepCity_Gym_Text_18CB77:: @ 818CB77 - .string "Ein POKéBALL ist doch etwas zu schwer,\n" - .string "um ihn schweben zu lassen!\l" - .string "Aber ein Staubknäuel...\p" - .string "Wuhuuuuuuuhu!\n" - .string "... ... ... ... ... ... ...\p" - .string "Das ist kein Trick!\n" - .string "Da ist kein Luftstrom! Ehrlich!$" + .string "A POKé BALL was too heavy to lift\n" + .string "psychically. But this dust bunny...\p" + .string "Whoooooooooooooooh!\n" + .string "... ... ... ... ... ...\p" + .string "No, I’m not cheating!\n" + .string "I didn’t blow on it! Honestly!$" MossdeepCity_Gym_Text_18CC1E:: @ 818CC1E - .string "Solltest du gegen mich verlieren, darfst\n" - .string "du dir das nicht so zu Herzen nehmen.\p" - .string "Du bist nicht zu schwach - ich bin nur\n" - .string "zu stark für dich!$" + .string "When you lose to me, don’t be too hard\n" + .string "on yourself.\p" + .string "It’s not that you’re weak - I’m just\n" + .string "too strong!$" MossdeepCity_Gym_Text_18CC83:: @ 818CC83 - .string "Du bist nur zu stark für mich!$" + .string "You’re just too strong!$" MossdeepCity_Gym_Text_18CC9B:: @ 818CC9B - .string "Ich lasse mich von dieser Niederlage\n" - .string "nicht herunterziehen. Ich werde härter\l" - .string "trainieren.\p" - .string "Positives Denken - das ist meine\n" - .string "Stärke!$" + .string "I’m not going to get down on myself for\n" + .string "losing. I just need to train harder.\p" + .string "Positive thinking - that’s my strong\n" + .string "point!$" MossdeepCity_Gym_Text_18CD14:: @ 818CD14 - .string "Ich kann sie sehen...\n" - .string "Ich sehe deine Zukunft...\p" - .string "Wenn du mich besiegen kannst, sage ich\n" - .string "dir deine Zukunft voraus.$" + .string "I see it...\n" + .string "I see your future...\p" + .string "If you can beat me, I will tell you\n" + .string "your future!$" MossdeepCity_Gym_Text_18CD66:: @ 818CD66 - .string "Ich ergebe mich!$" + .string "I surrender!$" MossdeepCity_Gym_Text_18CD73:: @ 818CD73 - .string "Du wirst einen irrsinnigen Kampf gegen\n" - .string "unsere ARENALEITER führen...\p" - .string "Der Ausgang dieses Kampfes...\n" - .string "Meine Lippen sind versiegelt.$" + .string "You will wage a terrifically intense\n" + .string "battle with our GYM LEADERS...\p" + .string "The result...\n" + .string "You won’t hear it from me!$" MossdeepCity_Gym_Text_18CDE0:: @ 818CDE0 - .string "Die Straßen, die du gewandert bist...\n" - .string "Das, was du erfahren hast...\p" - .string "Leg mir alles, was du gelernt hast,\n" - .string "zu Füßen.$" + .string "The roads you have traveled...\n" + .string "What you have experienced...\p" + .string "Come at me with everything you’ve\n" + .string "learned!$" MossdeepCity_Gym_Text_18CE47:: @ 818CE47 - .string "Du wandelst auf dem Pfad der Größe!$" + .string "You’ve traveled a path of greatness!$" MossdeepCity_Gym_Text_18CE6C:: @ 818CE6C - .string "Eine glänzende Zukunft erwartet die,\n" - .string "die fleißig sind.\p" - .string "Die, die dem Müßiggang frönen, erwartet\n" - .string "am Ende des Weges nur die Verzweiflung.\p" - .string "Man erntet das, was man sät.$" + .string "A bright future awaits those who have\n" + .string "worked diligently.\p" + .string "For those who lazed idly, there is\n" + .string "only despair at the end.\p" + .string "What goes around comes around...$" MossdeepCity_Gym_Text_18CF02:: @ 818CF02 - .string "BEN: Hähähä... Bist du überrascht?\p" - .string "SVENJA: Hihihi... Bist du überrascht?\p" - .string "BEN: Dass es hier 2 ARENALEITER gibt?\n" - .string "SVENJA: Dass es hier 2 ARENALEITER\l" - .string "gibt?\p" - .string "BEN: Wir sind Zwillinge!\n" - .string "SVENJA: Wir sind Zwillinge!\p" - .string "BEN: Wir brauchen nicht zu sprechen...\n" - .string "SVENJA: Wir wissen, was...\p" - .string "BEN: Der andere gerade denkt...\n" - .string "SVENJA: Gedankenübertragung!\p" - .string "BEN: Diese doppelte Stärke...\n" - .string "SVENJA: Kannst du sie besiegen?$" + .string "TATE: Hehehe... Were you surprised?\p" + .string "LIZA: Fufufu... Were you surprised?\p" + .string "TATE: That there are two GYM LEADERS?\n" + .string "LIZA: That there are two GYM LEADERS?\p" + .string "TATE: We’re twins!\n" + .string "LIZA: We’re twins!\p" + .string "TATE: We don’t need to talk because...\n" + .string "LIZA: We can each determine what...\p" + .string "TATE: The other is thinking...\n" + .string "LIZA: All in our minds!\p" + .string "TATE: This combination of ours...\n" + .string "LIZA: Can you beat it?$" MossdeepCity_Gym_Text_18D077:: @ 818D077 - .string "BEN: Was?!? Unsere Kombination...\n" - .string "SVENJA: Wurde auseinander gerissen!\p" - .string "BEN: So sieht’s aus. Du hast gewonnen.\n" - .string "SVENJA: Daher überreichen wir dir dies.$" + .string "TATE: What?! Our combination...\n" + .string "LIZA: Was shattered!\p" + .string "TATE: It can’t be helped. You’ve won...\n" + .string "LIZA: So, in recognition, take this.$" MossdeepCity_Gym_Text_18D0F9:: @ 818D0F9 - .string "{PLAYER} erhält den MENTALORDEN von\n" - .string "SVENJA und BEN.$" + .string "{PLAYER} received the MIND BADGE\n" + .string "from LIZA and TATE.$" MossdeepCity_Gym_Text_18D128:: @ 818D128 - .string "BEN: Der MENTALORDEN erhöht den SP.\n" - .string "ANG. und die SP. VER. von POKéMON.\p" - .string "SVENJA: Und du kannst damit die VM\n" - .string "TAUCHER außerhalb eines Kampfes\l" - .string "einsetzen.\p" - .string "BEN: Dies ist ebenfalls für dich.$" + .string "TATE: The MIND BADGE enhances the\n" + .string "SP. ATK and SP. DEF of POKéMON.\p" + .string "LIZA: It also lets you use the HM move\n" + .string "DIVE outside of battle.\p" + .string "TATE: You should also take this, too.$" MossdeepCity_Gym_Text_18D1CF:: @ 818D1CF - .string "BEN: TM04 enthält...\n" - .string "SVENJA: GEDANKENGUT!\p" - .string "BEN: Dies erhöht den SP. ANG. und...\n" - .string "SVENJA: Erhöht die SP. VER.!\p" - .string "BEN: Eine Attacke, die perfekt...\n" - .string "SVENJA: Für PSYCHO-POKéMON ist!$" + .string "TATE: That TM04 contains...\n" + .string "LIZA: CALM MIND!\p" + .string "TATE: It raises SP. ATK and...\n" + .string "LIZA: It raises SP. DEF!\p" + .string "TATE: It’s a move that’s perfect...\n" + .string "LIZA: For PSYCHIC POKéMON!$" MossdeepCity_Gym_Text_18D273:: @ 818D273 - .string "BEN: Es scheint, als sei das Band\n" - .string "zwischen dir und deinen POKéMON viel\l" - .string "stärker als zwischen uns Zwillingen.\p" - .string "SVENJA: Und du wirst noch stärker\n" - .string "werden! Wir haben gegen dich gekämpft,\l" - .string "daher können wir das vorhersagen.$" + .string "TATE: Looks like the bond between you\n" + .string "and your POKéMON is far stronger than\l" + .string "the bond that we share as twins.\p" + .string "LIZA: You will become even stronger!\n" + .string "We’ve battled you, so we know.$" MossdeepCity_Gym_Text_18D324:: @ 818D324 - .string "BEN: Hähähä... Bist du überrascht?\p" - .string "SVENJA: Dass es hier 2 ARENALEITER\n" - .string "gibt?\p" - .string "BEN: Hups, du hast nur ein...\n" - .string "SVENJA: POKéMON für den Kampf.\p" - .string "BEN: So können wir nicht kämpfen!\p" - .string "SVENJA: Wenn du uns herausfordern\n" - .string "willst, dann musst du mehr POKéMON\l" - .string "haben.$" + .string "TATE: Hehehe... Were you surprised?\p" + .string "LIZA: That there are two GYM LEADERS?\p" + .string "TATE: Oops, you have only one...\n" + .string "LIZA: POKéMON that can battle.\p" + .string "TATE: We can’t battle that way!\p" + .string "LIZA: If you want to challenge us,\n" + .string "bring some more POKéMON.$" MossdeepCity_Gym_Text_18D40A:: @ 818D40A - .string "POKéMON ARENA von MOOSBACH CITY$" + .string "MOSSDEEP CITY POKéMON GYM$" MossdeepCity_Gym_Text_18D424:: @ 818D424 - .string "POKéMON ARENA von MOOSBACH CITY\p" - .string "SVENJA UND BENS ANERKANNTE TRAINER:\n" + .string "MOSSDEEP CITY POKéMON GYM\p" + .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/MossdeepCity_House1.inc b/data/text/maps/MossdeepCity_House1.inc index bb6520f6f..0572ba260 100644 --- a/data/text/maps/MossdeepCity_House1.inc +++ b/data/text/maps/MossdeepCity_House1.inc @@ -1,18 +1,17 @@ MossdeepCity_House1_Text_18D465:: @ 818D465 .string "Hmm!\n" - .string "Dein {STR_VAR_1}...$" + .string "Your {STR_VAR_1}...$" MossdeepCity_House1_Text_18D475:: @ 818D475 - .string "Es mag {STR_VAR_1},\n" - .string "nicht wahr?\p" - .string "Nein, ich bin mir sicher. Es mag mit\n" - .string "Sicherheit {STR_VAR_1}!$" + .string "It likes {STR_VAR_1}S,\n" + .string "doesn’t it?\p" + .string "No, I’m positive of it! It definitely\n" + .string "likes {STR_VAR_1}S!$" MossdeepCity_House1_Text_18D4C0:: @ 818D4C0 - .string "Es scheint {POKEBLOCK}\n" - .string "weder zu lieben noch abzulehnen.$" + .string "It doesn’t appear to like or dislike\n" + .string "any {POKEBLOCK}S.$" MossdeepCity_House1_Text_18D4F1:: @ 818D4F1 - .string "Mein Mann weiß auf den ersten Blick,\n" - .string "welche Art von {POKEBLOCK}\l" - .string "ein POKéMON mag und welche nicht.$" + .string "My husband can tell what kind of\n" + .string "{POKEBLOCK}S a POKéMON likes at a glance.$" diff --git a/data/text/maps/MossdeepCity_House2.inc b/data/text/maps/MossdeepCity_House2.inc index 2a3774ad7..ae4b11cb6 100644 --- a/data/text/maps/MossdeepCity_House2.inc +++ b/data/text/maps/MossdeepCity_House2.inc @@ -1,15 +1,14 @@ MossdeepCity_House2_Text_18D536:: @ 818D536 - .string "Meine kleine Schwester tauscht immer\n" - .string "BRIEFE mit ihrem Freund in BAUMHAUSEN\l" - .string "CITY aus.\p" - .string "Ich beneide sie kein bisschen darum.$" + .string "My little sister exchanges MAIL with\n" + .string "her boyfriend in FORTREE.\p" + .string "I don’t envy her one bit at all.$" MossdeepCity_House2_Text_18D596:: @ 818D596 - .string "Auch wenn ich meinen Freund in\n" - .string "BAUMHAUSEN CITY nicht sehen kann...\l" - .string "Mein POKéMON bringt uns unsere BRIEFE.\p" - .string "Ich bin nicht einsam, auch wenn wir\n" - .string "getrennt sind.$" + .string "Even though I can’t see my friend in\n" + .string "FORTREE, my POKéMON carries MAIL back\l" + .string "and forth for us.\p" + .string "I’m not lonesome, even though we’re\n" + .string "apart.$" MossdeepCity_House2_Text_18D61E:: @ 818D61E .string "WINGULL: Pihyoh!$" diff --git a/data/text/maps/MossdeepCity_House3.inc b/data/text/maps/MossdeepCity_House3.inc index c4dc6f0d3..270457172 100644 --- a/data/text/maps/MossdeepCity_House3.inc +++ b/data/text/maps/MossdeepCity_House3.inc @@ -1,24 +1,23 @@ MossdeepCity_House3_Text_18D909:: @ 818D909 - .string "Hey, du da! TRAINER!\n" - .string "Eine SUPERANGEL ist wirklich super!\p" - .string "Man kann sagen, was man will, aber mit\n" - .string "diesem Baby kann man POKéMON vom\l" - .string "Meeresboden weg fangen!\p" - .string "Na? Du würdest doch zu gerne auch so\n" - .string "eine Angel haben, oder?$" + .string "Hey there, TRAINER!\n" + .string "A SUPER ROD really is super!\p" + .string "Say all you want, but this baby can\n" + .string "catch POKéMON off the seafloor!\p" + .string "What do you think?\n" + .string "You want it, don’t you?$" MossdeepCity_House3_Text_18D9A9:: @ 818D9A9 - .string "Sicher, sicher!\n" - .string "Schließlich ist eine SUPERANGEL super!$" + .string "You bet, you bet!\n" + .string "After all, a SUPER ROD is really super!$" MossdeepCity_House3_Text_18D9E3:: @ 818D9E3 - .string "Stehst du am Wasser, dann wirf die\n" - .string "ANGEL aus und schau, was anbeißt!$" + .string "If there’s any water, try dropping in\n" + .string "your ROD and see what bites!$" MossdeepCity_House3_Text_18DA26:: @ 818DA26 - .string "Was???\n" - .string "Liebst du das Angeln nicht?$" + .string "Hunh?\n" + .string "Don’t you like to fish?$" MossdeepCity_House3_Text_18DA44:: @ 818DA44 - .string "Mit deiner SUPERANGEL kannst du die\n" - .string "POKéMON am Meeresboden fangen.$" + .string "Go after the seafloor POKéMON with\n" + .string "your SUPER ROD.$" diff --git a/data/text/maps/MossdeepCity_House4.inc b/data/text/maps/MossdeepCity_House4.inc index 0738d9563..e612a8018 100644 --- a/data/text/maps/MossdeepCity_House4.inc +++ b/data/text/maps/MossdeepCity_House4.inc @@ -1,20 +1,19 @@ MossdeepCity_House4_Text_18E0E3:: @ 818E0E3 - .string "Mein kleiner Bruder liebt es, die GEHEIM-\n" - .string "BASEN der anderen zu finden.$" + .string "My little brother says he likes to go\n" + .string "find people’s SECRET BASES.$" MossdeepCity_House4_Text_18E125:: @ 818E125 - .string "Mein kleiner Bruder sagt, er liebt es, die\n" - .string "GEHEIMBASEN der anderen zu finden und\l" - .string "Kämpfe mit POKéMON auszutragen.$" + .string "My little brother says he likes to\n" + .string "visit people’s SECRET BASES and have\l" + .string "POKéMON battles.$" MossdeepCity_House4_Text_18E17E:: @ 818E17E - .string "Hast du dir eine GEHEIMBASIS in\n" - .string "{STR_VAR_1} eingerichtet?$" + .string "Was it you who made a SECRET BASE in\n" + .string "{STR_VAR_1}?$" MossdeepCity_House4_Text_18E1A7:: @ 818E1A7 - .string "Solltest du dir irgendwo eine GEHEIM-\n" - .string "BASIS einrichten, werde ich sie sicher\l" - .string "finden.$" + .string "You should make a SECRET BASE\n" + .string "somewhere. I’ll go find it!$" MossdeepCity_House4_Text_18E1E1:: @ 818E1E1 - .string "ENEKORO: Miyaan?$" + .string "DELCATTY: Miyaan?$" diff --git a/data/text/maps/MossdeepCity_Mart.inc b/data/text/maps/MossdeepCity_Mart.inc index 7f1761efc..cdce8c48c 100644 --- a/data/text/maps/MossdeepCity_Mart.inc +++ b/data/text/maps/MossdeepCity_Mart.inc @@ -1,21 +1,19 @@ MossdeepCity_Mart_Text_18D758:: @ 818D758 - .string "BELEBER ist einfach fantastisch!\p" - .string "Gib es einem besiegten POKéMON und\n" - .string "es ist wieder fit.\p" - .string "Aber Vorsicht! BELEBER füllt nicht die\n" - .string "verbrauchten AP neu auf!$" + .string "REVIVE is fantastic!\p" + .string "Give it to a fainted POKéMON, and the\n" + .string "POKéMON will arise.\p" + .string "But be careful, REVIVE doesn’t restore\n" + .string "the used-up PP of moves.$" MossdeepCity_Mart_Text_18D7E7:: @ 818D7E7 - .string "TOP-SCHUTZ hält alle schwachen POKéMON\n" - .string "auf Distanz.\p" - .string "Von allen SCHUTZ-Sprays hält dieses am\n" - .string "längsten an.$" + .string "MAX REPEL keeps all weak POKéMON away.\p" + .string "Out of all the REPEL sprays, it lasts\n" + .string "the longest.$" MossdeepCity_Mart_Text_18D841:: @ 818D841 - .string "Der NETZ- und der TAUCHBALL sind\n" - .string "seltene POKéBÄLLE, die in\l" - .string "MOOSBACH CITY hergestellt werden.\p" - .string "Ein NETZBALL ist höchst wirkungsvoll\n" - .string "bei KÄFER- und WASSER-POKéMON.\p" - .string "Der TAUCHBALL ist wirkungsvoll bei\n" - .string "POKéMON, die in der Tiefsee leben.$" + .string "The NET and DIVE BALLS are rare POKé\n" + .string "BALLS that are only made in MOSSDEEP.\p" + .string "A NET BALL is effective against\n" + .string "BUG-type and WATER-type POKéMON.\p" + .string "A DIVE BALL works best on POKéMON at\n" + .string "the bottom of the sea.$" diff --git a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc b/data/text/maps/MossdeepCity_PokemonCenter_1F.inc index 397b90178..5f345613e 100644 --- a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/text/maps/MossdeepCity_PokemonCenter_1F.inc @@ -1,11 +1,10 @@ MossdeepCity_PokemonCenter_1F_Text_18D62F:: @ 818D62F - .string "Die ARENALEITER dieses Ortes sind ein\n" - .string "ausgezeichnetes Team.\p" - .string "Die Kombination ihrer Attacken ist\n" - .string "einfach exzellent und... wow!$" + .string "The GYM LEADERS in this town are a\n" + .string "formidable duo.\p" + .string "Their combination attacks are, like,\n" + .string "excellent and wow!$" MossdeepCity_PokemonCenter_1F_Text_18D69A:: @ 818D69A - .string "Abhängig von den speziellen Fähigkeiten\n" - .string "eines POKéMON, werden einige Attacken\p" - .string "in ihrer Wirkung verändert oder\n" - .string "sogar wirkungslos.$" + .string "Depending on the special abilities of\n" + .string "POKéMON, some moves might change\l" + .string "or not work at all.$" diff --git a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc b/data/text/maps/MossdeepCity_PokemonCenter_2F.inc index 3e8f190e9..66bba2421 100644 --- a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc +++ b/data/text/maps/MossdeepCity_PokemonCenter_2F.inc @@ -1,4 +1,4 @@ MossdeepCity_PokemonCenter_2F_Text_18D6F5:: @ 818D6F5 - .string "Wenn ich eine Menge Kämpfe via Link\n" - .string "gewinne und jedem zeige, wie gut ich bin,\l" - .string "dann bekomme ich sicher auch Fans!$" + .string "If I win a whole lot of link battles\n" + .string "and show everyone how good I am,\l" + .string "I might get a fan following!$" diff --git a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc b/data/text/maps/MossdeepCity_SpaceCenter_1F.inc index 4c5703222..a94d343bc 100644 --- a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/text/maps/MossdeepCity_SpaceCenter_1F.inc @@ -1,35 +1,33 @@ MossdeepCity_SpaceCenter_1F_Text_18E1F3:: @ 818E1F3 - .string "Die Rakete wird in Kürze starten.$" + .string "The rocket’s launch is imminent!$" MossdeepCity_SpaceCenter_1F_Text_18E214:: @ 818E214 - .string "Die Rakete ist sicher gestartet!\n" - .string "Das war der erfolgreiche Start Nr. {STR_VAR_1}!$" + .string "The rocket launched safely!\n" + .string "That’s successful launch no. {STR_VAR_1}!$" MossdeepCity_SpaceCenter_1F_Text_18E251:: @ 818E251 - .string "Jeder Raketenstart verlangt\n" - .string "sorgfältige Vorbereitungen. Die Fehler-\l" - .string "quote darf nicht einmal 1% betragen.\p" - .string "Selbst wenn 99% perfekt sind, kann 1%\n" - .string "schon für ein Misslingen sorgen.\p" - .string "Trotzdem versuchen wir es immer wieder.\n" - .string "Warum? Weil es ein ewiger Traum ist.$" + .string "A rocket launch demands perfection.\n" + .string "Not even a 1% margin of error is allowed.\p" + .string "Even if it’s 99% okay, the whole thing\n" + .string "is useless if 1% happens to be no good.\p" + .string "Despite that, we never stop trying.\n" + .string "Why? It’s a dream that never ends.$" MossdeepCity_SpaceCenter_1F_Text_18E335:: @ 818E335 - .string "Ich schlenderte am Strand entlang, da\n" - .string "habe ich dieses hier gefunden.\p" - .string "Ich kann damit nichts anfangen, daher\n" - .string "kannst du es haben.$" + .string "I was taking a stroll down the beach\n" + .string "when I found this.\p" + .string "It’s not anything I need, so you can\n" + .string "have it.$" MossdeepCity_SpaceCenter_1F_Text_18E39B:: @ 818E39B - .string "Die HOENN-Region ist bekannt für die\n" - .string "Häufigkeit der Meteoriteneinschläge.$" + .string "The HOENN region has been famous for \n" + .string "its meteor showers for a long time.$" MossdeepCity_SpaceCenter_1F_Text_18E3E5:: @ 818E3E5 - .string "Einige Menschen nehmen an, dass die\n" - .string "POKéMON aus dem Weltall kommen. Ob das\l" - .string "stimmt?$" + .string "Some people claim that POKéMON came\n" + .string "from space. Could it be true?$" MossdeepCity_SpaceCenter_1F_Text_18E427:: @ 818E427 - .string "Ein gigantischer Brocken Metall durch-\n" - .string "bricht den Himmel und fliegt ins All...\p" - .string "Das übersteigt jede Vorstellungskraft.$" + .string "A giant chunk of metal bursts through\n" + .string "the skies and flies into space...\p" + .string "It boggles my mind!$" diff --git a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc b/data/text/maps/MossdeepCity_SpaceCenter_2F.inc index e6b42eef1..0c8159423 100644 --- a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/text/maps/MossdeepCity_SpaceCenter_2F.inc @@ -1,15 +1,15 @@ MossdeepCity_SpaceCenter_2F_Text_18E483:: @ 818E483 - .string "MOOSBACH CITY hat meistens sonniges\n" - .string "Wetter und einen beständigen Wind.\p" - .string "Ein idealer Ort, um Raketen ins All zu\n" - .string "schicken.$" + .string "MOSSDEEP has mainly sunny weather,\n" + .string "and its winds are stable.\p" + .string "It’s an ideal location for launching\n" + .string "rockets.$" MossdeepCity_SpaceCenter_2F_Text_18E4EE:: @ 818E4EE - .string "Wenn ich jünger wäre, würde ich mit\n" - .string "Sicherheit Astronaut...\p" - .string "Nein... Dazu ist es nie zu spät!\n" - .string "Ich werde es versuchen!!!$" + .string "If only I was a little younger, I would\n" + .string "have liked being an astronaut...\p" + .string "No... It’s not too late!\n" + .string "I can and will try!$" MossdeepCity_SpaceCenter_2F_Text_18E564:: @ 818E564 - .string "Ich wünschte, auch normale Leute\n" - .string "könnten eines Tages ins All reisen...$" + .string "I wish ordinary people could go into\n" + .string "space one day...$" diff --git a/data/text/maps/MossdeepCity_StevensHouse.inc b/data/text/maps/MossdeepCity_StevensHouse.inc index abf80ddda..6f5b9b9b8 100644 --- a/data/text/maps/MossdeepCity_StevensHouse.inc +++ b/data/text/maps/MossdeepCity_StevensHouse.inc @@ -1,91 +1,83 @@ MossdeepCity_StevensHouse_Text_18DA77:: @ 818DA77 - .string "TROY: {PLAYER}{KUN}?\p" - .string "Ja, das ist mein Zuhause. Peinlich, wie\n" - .string "kahl die Räume hier sind.\p" - .string "Oh, hier, nimm diese VM.\p" - .string "Sie enthält TAUCHER. Ich habe das\n" - .string "meinen POKéMON schon beigebracht.$" + .string "STEVEN: {PLAYER}{KUN}?\p" + .string "Yes, this is my place. It’s a little\n" + .string "embarrassing how empty it is here.\p" + .string "Oh, here, you should take this HM.\p" + .string "It contains DIVE.\n" + .string "I’ve already taught my POKéMON.$" MossdeepCity_StevensHouse_Text_18DB22:: @ 818DB22 - .string "TROY: Wenn du SURFER einsetzt und\n" - .string "über das Meer gleitest, wirst du dunkle\l" - .string "Stellen im Wasser bemerken können.\p" - .string "Setze hier TAUCHER ein und du kannst\n" - .string "hinabtauchen bis zum Meeresboden.\p" - .string "Wenn du wieder auftauchen möchtest,\n" - .string "setze ebenfalls TAUCHER ein.\p" - .string "An manchen Stellen ist das Auftauchen\n" - .string "allerdings nicht möglich.$" + .string "STEVEN: While you’re using SURF, you\n" + .string "should notice dark patches of water.\p" + .string "Use DIVE if you come to deep water\n" + .string "like it. You’ll drop to the seafloor.\p" + .string "When you want to come back up, use\n" + .string "DIVE again.\p" + .string "In some places, it won’t be possible\n" + .string "for you to surface, though.$" MossdeepCity_StevensHouse_Text_18DC25:: @ 818DC25 - .string "TROY: Zwischen MOOSBACH CITY und\n" - .string "XENEROVILLE gibt es eine Unterwasser-\l" - .string "höhle.\p" - .string "Die, die KAPT. BRIGG auf seiner\n" - .string "Expedition entdeckt hat, weißt du.\p" - .string "Eine Unterwasserhöhle...\p" - .string "Da gibt es bestimmt einige seltene\n" - .string "Steine zu finden... Ich sollte auch\l" - .string "einmal TAUCHER einsetzen...$" + .string "STEVEN: Apparently, there’s an\n" + .string "underwater cavern between\l" + .string "MOSSDEEP and SOOTOPOLIS.\p" + .string "You know, the one that CAPT. STERN\n" + .string "found in his submarine.\p" + .string "An underwater cavern...\p" + .string "There might be some rare stones down\n" + .string "there... I should go for a DIVE...$" MossdeepCity_StevensHouse_Text_18DD12:: @ 818DD12 - .string "{PLAYER} überprüft den POKéBALL.\p" - .string "Er enthält das POKéMON\n" - .string "TANHEL.\p" - .string "Den POKéBALL nehmen?$" + .string "{PLAYER} checked the POKé BALL.\p" + .string "It contained the POKéMON\n" + .string "BELDUM.\p" + .string "Take the POKé BALL?$" MossdeepCity_StevensHouse_Text_18DD61:: @ 818DD61 - .string "{PLAYER} hat TANHEL erhalten.$" + .string "{PLAYER} obtained a BELDUM.$" MossdeepCity_StevensHouse_Text_18DD77:: @ 818DD77 - .string "Es ist nicht genug Platz vorhanden für\n" - .string "ein weiteres POKéMON.$" + .string "There is no space for another POKéMON.$" MossdeepCity_StevensHouse_Text_18DD9E:: @ 818DD9E - .string "{PLAYER} legt den POKéBALL zurück.$" + .string "{PLAYER} left the POKé BALL where\n" + .string "it was.$" MossdeepCity_StevensHouse_Text_18DDC2:: @ 818DDC2 - .string "Das ist ein Brief.\p" - .string "\n" + .string "It’s a letter.\p" .string "... ... ... ... ... ...\p" - .string "An {PLAYER}{KUN}...\p" - .string "Ich habe mich dazu entschlossen, etwas\n" - .string "Mentaltraining zu machen und auf der\l" - .string "Straße zu trainieren.\p" - .string "Ich werde für einige Zeit nicht nach\n" - .string "Hause kommen.\p" - .string "Ich möchte dich um einen Gefallen\n" - .string "bitten.\p" - .string "Ich möchte, dass du den POKéBALL\n" - .string "nimmst, der auf dem Tisch liegt.\p" - .string "Er enthält mein Lieblings-POKéMON\n" - .string "TANHEL.\p" - .string "Ich verlasse mich auf dich.\p" - .string "Mögen wir uns eines Tages wieder sehen.\p" - .string "TROY TRUMM$" + .string "To {PLAYER}{KUN}...\p" + .string "I’ve decided to do a little soul-\n" + .string "searching and train on the road.\p" + .string "I don’t plan to return home for some\n" + .string "time.\p" + .string "I have a favor to ask of you.\p" + .string "I want you to take the POKé BALL on\n" + .string "the desk.\p" + .string "Inside it is a BELDUM, my favorite\n" + .string "POKéMON.\p" + .string "I’m counting on you.\p" + .string "May our paths cross some day.\p" + .string "STEVEN STONE$" MossdeepCity_StevensHouse_Text_18DF1A:: @ 818DF1A - .string "Das ist ein Brief.\p" - .string "\n" + .string "It’s a letter.\p" .string "... ... ... ... ... ...\p" - .string "An {PLAYER}{KUN}...\p" - .string "Ich habe mich dazu entschlossen, etwas\n" - .string "Mentaltraining zu machen und auf der\l" - .string "Straße zu trainieren.\p" - .string "Ich werde für einige Zeit nicht nach\n" - .string "Hause kommen.\p" - .string "Ich möchte dich um einen Gefallen\n" - .string "bitten.\p" - .string "Ich möchte, dass du den POKéBALL\n" - .string "nimmst, der auf dem Tisch liegt.\p" - .string "Er enthält mein Lieblings-POKéMON\n" - .string "TANHEL.\p" - .string "Ich verlasse mich auf dich.\p" - .string "Wenn du magst, nimm dir auch die VM\n" - .string "TAUCHER.\p" - .string "Mögen wir uns eines Tages wieder sehen.\p" - .string "TROY TRUMM$" + .string "To {PLAYER}{KUN}...\p" + .string "I’ve decided to do a little soul-\n" + .string "searching and train on the road.\p" + .string "I don’t plan to return home for some\n" + .string "time.\p" + .string "I have a favor to ask of you.\p" + .string "I want you to take the POKé BALL on\n" + .string "the desk.\p" + .string "Inside it is a BELDUM, my favorite\n" + .string "POKéMON.\p" + .string "I’m counting on you.\p" + .string "If you’d like, you should also take\n" + .string "the HM DIVE.\p" + .string "May our paths cross some day.\p" + .string "STEVEN STONE$" MossdeepCity_StevensHouse_Text_18E0A3:: @ 818E0A3 - .string "Eine Kollektion seltener Steine,\n" - .string "zusammengetragen von TROY.$" + .string "It’s a collection of rare rocks and\n" + .string "stones assembled by STEVEN.$" diff --git a/data/text/maps/MtChimney.inc b/data/text/maps/MtChimney.inc index 949a74ffd..8641bde00 100644 --- a/data/text/maps/MtChimney.inc +++ b/data/text/maps/MtChimney.inc @@ -1,106 +1,107 @@ MtChimney_Text_195760:: @ 8195760 - .string "LAVAKEKSE sind die Spezialität am\n" - .string "SCHLOTBERG.\p" - .string "Nimm einen. Er kostet nur ¥200.$" + .string "LAVA COOKIES are MT. CHIMNEY’s local\n" + .string "specialty.\p" + .string "Try one. It’s just ¥200.$" MtChimney_Text_1957A9:: @ 81957A9 - .string "Vielen Dank, Herzchen!$" + .string "Thank you, dear!$" MtChimney_Text_1957BA:: @ 81957BA - .string "Oh je. Du kannst nichts kaufen, wenn\n" - .string "du nicht genug Geld bei dir hast.$" + .string "Oh, dear. You can’t buy a thing if\n" + .string "you’ve not got the money.$" MtChimney_Text_1957F7:: @ 81957F7 - .string "Oh, ist gut.$" + .string "Oh, fine then.$" MtChimney_Text_195806:: @ 8195806 - .string "Ein METEORIT steckt in dieser\n" - .string "mysteriösen Vorrichtung...\p" - .string "Die Maschine scheint den METEORITEN\n" - .string "mit Energie zu versorgen.$" + .string "A METEORITE is fitted on a mysterious\n" + .string "machine...\p" + .string "The machine seems to be storing\n" + .string "energy in the METEORITE.$" MtChimney_Text_195870:: @ 8195870 - .string "Ein METEORIT steckt in dieser\n" - .string "mysteriösen Vorrichtung...\p" - .string "Willst du den METEORITEN nehmen?$" + .string "A METEORITE is fitted on a mysterious\n" + .string "machine...\p" + .string "Do you want to remove the METEORITE?$" MtChimney_Text_1958C6:: @ 81958C6 - .string "{PLAYER} entfernt den METEORITEN aus\n" - .string "der mysteriösen Vorrichtung.$" + .string "{PLAYER} removed the METEORITE from\n" + .string "the mysterious machine.$" MtChimney_Text_1958FC:: @ 81958FC - .string "{PLAYER} fasst den METEORITEN nicht an.$" + .string "{PLAYER} left the METEORITE where\n" + .string "it was.$" MtChimney_Text_195920:: @ 8195920 - .string "Diese mysteriöse Vorrichtung...\n" - .string "Sie reagiert in keinster Weise.$" + .string "This mysterious machine...\n" + .string "It makes no response whatsoever.$" MtChimney_Text_19595C:: @ 819595C - .string "{DOWN_ARROW} STEILPASS\n" - .string "BAD LAVASTADT GERADEAUS$" + .string "{0x7A} JAGGED PATH\n" + .string "LAVARIDGE TOWN AHEAD$" MtChimney_Text_19597F:: @ 819597F - .string "Ich war bei den Heißen Quellen und habe\n" - .string "meine müden Knochen erfrischt.\l" - .string "Jetzt fühle ich mich richtig stark!$" + .string "I’ve been to the hot springs and\n" + .string "refreshed my tired bones.\l" + .string "Right now I’m feeling strong!$" MtChimney_Text_1959D8:: @ 81959D8 - .string "Oh, du meine Güte!\n" - .string "Wer bist du denn?!?$" + .string "Oh, my goodness.\n" + .string "Now, aren’t you something!$" MtChimney_Text_195A04:: @ 8195A04 - .string "Nun, ich habe verloren. Ich darf mich\n" - .string "nun nicht mehr EXPERTE nennen, oder?$" + .string "Well, well, I’ve lost. I can’t call\n" + .string "myself an EXPERT now, can I?$" MtChimney_Text_195A45:: @ 8195A45 - .string "Wenn du in deinem Herzen Platz für deine\n" - .string "POKéMON hast, dann kannst du auch\l" - .string "große Dinge erreichen.$" + .string "If you can mesh your heart with those\n" + .string "of your POKéMON, why, you should be\l" + .string "able to achieve great things.$" MtChimney_Text_195AAD:: @ 8195AAD - .string "Oh, du meine Güte!\n" - .string "Wer bist du denn!$" + .string "Oh, my goodness.\n" + .string "Now, aren’t you something!$" MtChimney_Text_195AD9:: @ 8195AD9 - .string "Vielleicht schlägt dein Herz im Gleich-\n" - .string "klang mit den POKéMON.$" + .string "Perhaps your heart has become one\n" + .string "with the hearts of your POKéMON.$" MtChimney_Text_195B1C:: @ 8195B1C - .string "Ich habe Feuer in mir, Baby.\n" - .string "Ich halt’s nicht aus! Ich muss kämpfen!$" + .string "I’ve got the fire in me, baby.\n" + .string "I can’t stand it! I have to battle!$" MtChimney_Text_195B5F:: @ 8195B5F - .string "Oh, was für ein kochend heißer Kampf!$" + .string "Ooh, that was a scorching-hot match!$" MtChimney_Text_195B84:: @ 8195B84 - .string "Die Hitze vom SCHLOTBERG bringt mein\n" - .string "Feuer in Gang.$" + .string "The heat of MT. CHIMNEY lights my\n" + .string "fire, baby!$" MtChimney_Text_195BB2:: @ 8195BB2 - .string "Endlich bin ich am SCHLOTBERG ange-\n" - .string "kommen. Jetzt will ich kämpfen!!!$" + .string "I’ve finally made it to MT. CHIMNEY.\n" + .string "I want to make my POKéMON battle!$" MtChimney_Text_195BF9:: @ 8195BF9 - .string "Wie du kämpfst...\n" - .string "Als würde der SCHLOTBERG ausbrechen!$" + .string "The way you battle...\n" + .string "It’s like a MT. CHIMNEY eruption!$" MtChimney_Text_195C31:: @ 8195C31 - .string "Wie ich schon sagte, endlich bin ich am\n" - .string "SCHLOTBERG. Wäre doch blödsinnig, wenn\l" - .string "ich nur zum Sightseeing hier wäre...\p" - .string "Ich will ein bisschen kämpfen und KEKSE\n" - .string "als Andenken kaufen.$" + .string "Like I said, I’ve finally made it to\n" + .string "MT. CHIMNEY. It would be a shame if\l" + .string "I only do a little sightseeing...\p" + .string "I want to get in some battles and buy\n" + .string "COOKIES as souvenirs.$" MtChimney_Text_195CD8:: @ 8195CD8 - .string "Seit ich in den Heißen Quellen gebadet\n" - .string "habe, fühle ich mich großartig!\l" - .string "Ich bin sicher, ich werde gewinnen!$" + .string "Since I bathed in the hot springs,\n" + .string "I’ve been feeling great!\l" + .string "I’m sure I’m going to win!$" MtChimney_Text_195D2F:: @ 8195D2F - .string "Huaah!\n" - .string "Außerhalb des Wassers ist es saukalt.$" + .string "Yowch!\n" + .string "I’m getting a chill out of the water.$" MtChimney_Text_195D5C:: @ 8195D5C - .string "Ich werde mich wieder in die Heiße\n" - .string "Quelle setzen. Kommst du mit?\p" - .string "Kleiner Scherz am Rande... Hähähä.$" + .string "I’ll have to take another dip in the\n" + .string "hot springs. Want to join me?\p" + .string "Just joking!$" diff --git a/data/text/maps/MtChimney_CableCarStation.inc b/data/text/maps/MtChimney_CableCarStation.inc index 38393fb2d..03e2f7a2a 100644 --- a/data/text/maps/MtChimney_CableCarStation.inc +++ b/data/text/maps/MtChimney_CableCarStation.inc @@ -1,10 +1,10 @@ MtChimney_CableCarStation_Text_19256A:: @ 819256A - .string "Die SEILBAHN fährt gleich hinab.\n" - .string "Möchtest du mit?$" + .string "The CABLE CAR is ready to go down.\n" + .string "Would you like to be on it?$" MtChimney_CableCarStation_Text_1925A9:: @ 81925A9 Route112_CableCarStation_Text_1925A9:: @ 81925A9 - .string "Bitte hier entlang.$" + .string "Please step this way.$" MtChimney_CableCarStation_Text_1925BF:: @ 81925BF - .string "Dann fahre bitte später mit uns.$" + .string "Please ride with us another time.$" diff --git a/data/text/maps/MtPyre_1F.inc b/data/text/maps/MtPyre_1F.inc index 27402c5c7..84e1cef07 100644 --- a/data/text/maps/MtPyre_1F.inc +++ b/data/text/maps/MtPyre_1F.inc @@ -1,20 +1,19 @@ MtPyre_1F_Text_196151:: @ 8196151 - .string "Auf den Pfaden des PYROBERG kreucht\n" - .string "und fleucht alles Mögliche...\p" - .string "Niemand kann sagen, was passieren wird.\n" - .string "Dies ist für dich, es wird dir helfen.$" + .string "All sorts of beings wander the slopes\n" + .string "of MT. PYRE...\p" + .string "There is no telling what may happen.\n" + .string "Take this. It’s for your own good.$" MtPyre_1F_Text_1961CE:: @ 81961CE - .string "Lass ein POKéMON das SCHUTZBAND\n" - .string "tragen.\p" - .string "Das hilft, wilde POKéMON fern zu halten.$" + .string "Have a POKéMON hold that\n" + .string "CLEANSE TAG.\p" + .string "It will help ward off wild POKéMON.$" MtPyre_1F_Text_196218:: @ 8196218 - .string "Bist du hier, um den verstorbenen\n" - .string "POKéMON deinen Respekt zu zollen?\p" - .string "Du musst immer sehr fürsorglich zu\n" - .string "deinen POKéMON sein.$" + .string "Did you come to pay your respect\n" + .string "to the spirits of departed POKéMON?\p" + .string "You must care for your POKéMON a lot.$" MtPyre_1F_Text_196283:: @ 8196283 - .string "Hier ruht mein ZIGZACHS. Ich habe\n" - .string "es wirklich sehr geliebt...$" + .string "This is the final resting place of my\n" + .string "ZIGZAGOON. I cherished it...$" diff --git a/data/text/maps/MtPyre_2F.inc b/data/text/maps/MtPyre_2F.inc index 88d5a5546..28c57d0ba 100644 --- a/data/text/maps/MtPyre_2F.inc +++ b/data/text/maps/MtPyre_2F.inc @@ -1,65 +1,63 @@ MtPyre_2F_Text_1962C6:: @ 81962C6 - .string "LEIF: Wir machen hier eine Mutprobe.\p" - .string "Hähä, wenn ich zeige, wie cool ich bin,\n" - .string "wird sie sich sicher in mich verlieben!\p" - .string "Besser: Ich werde dich vernichtend\n" - .string "schlagen. Dann bin ich echt cool!$" + .string "LUKE: We’re here on a dare.\p" + .string "Heheh, if I show her how cool I am,\n" + .string "she’ll fall for me. I know it!\p" + .string "I know! I’ll cream you and show her\n" + .string "how cool I am!$" MtPyre_2F_Text_196358:: @ 8196358 - .string "LEIF: Huups!$" + .string "LUKE: Whoopsie!$" MtPyre_2F_Text_196368:: @ 8196368 - .string "LEIF: Wir haben verloren, aber das macht\n" - .string "nichts! Solange ich nur bei ihr bin. Wir\l" - .string "werden diese Mutprobe bestehen!$" + .string "LUKE: Well, we lost but that’s okay!\n" + .string "I’m right here by your side.\l" + .string "We’ll make it through this dare!$" MtPyre_2F_Text_1963CB:: @ 81963CB - .string "LEIF: Wenn du es mit mir aufnehmen\n" - .string "willst, brauchst du mehr POKéMON.\p" - .string "Hast du die nicht, kann ich meiner An-\n" - .string "gebeteten nicht beweisen, wie cool ich\l" - .string "bin!$" + .string "LUKE: If you want to take me on, bring\n" + .string "some more POKéMON.\p" + .string "If you don’t, I won’t be able to show\n" + .string "off how cool I am to my girl!$" MtPyre_2F_Text_196449:: @ 8196449 - .string "INA: Ich bin hier, um mit meinem Freund\n" - .string "eine Mutprobe zu bestehen.\p" - .string "Es ist unheimlich hier, aber zusammen\n" - .string "mit meinem Freund ist es schon okay.\p" - .string "Ich hab’s: Mein Freund soll zeigen, wie\n" - .string "cool er ist, indem er dich besiegt!$" + .string "DEZ: I came here on a dare with my\n" + .string "boyfriend.\p" + .string "It’s really scary, but I’m with my\n" + .string "boyfriend. It’s okay.\p" + .string "I know! I’ll get my boyfriend to look\n" + .string "cool by beating you!$" MtPyre_2F_Text_1964EB:: @ 81964EB - .string "INA: Uuuaaa! Ich habe Angst.$" + .string "DEZ: Waaaah! I’m scared!$" MtPyre_2F_Text_196504:: @ 8196504 - .string "INA: Wir sind ineinander verliebt, daher\n" - .string "stört uns eine Niederlage nicht.$" + .string "DEZ: We’re lovey-dovey, so we don’t\n" + .string "care if we lose!$" MtPyre_2F_Text_196539:: @ 8196539 - .string "INA: Wenn du gegen uns antreten willst,\n" - .string "solltest du mindestens zwei POKéMON\l" - .string "besitzen.\p" - .string "Mein Freund ist stark. Daher wirst du\n" - .string "mit einem POKéMON nichts ausrichten.$" + .string "DEZ: If you want to challenge us, you\n" + .string "should bring at least two POKéMON.\p" + .string "My boyfriend’s strong.\n" + .string "Just one POKéMON won’t do at all.$" MtPyre_2F_Text_1965BB:: @ 81965BB - .string "Die Erinnerungen an meinen Liebling\n" - .string "ENECO... Ich könnte weinen...$" + .string "Memories of my darling SKITTY...\n" + .string "My eyes overflow thinking about it.$" MtPyre_2F_Text_196600:: @ 8196600 - .string "Au au au au... Der Boden hat an einigen\n" - .string "Stellen Löcher.\p" - .string "Ich habe das nicht gesehen und bin ins\n" - .string "untere Stockwerk gefallen. Autsch, aua.$" + .string "Ooch, ouch... There are holes in the\n" + .string "ground here and there.\p" + .string "I didn’t notice and took a tumble from\n" + .string "the floor above.$" MtPyre_2F_Text_196674:: @ 8196674 - .string "Hey! Suchst du nach POKéMON? Du bist\n" - .string "mir hinterhergeschlichen! Fiesling!$" + .string "Hey! Are you searching for POKéMON?\n" + .string "You came along after me! You’re rude!$" MtPyre_2F_Text_1966BE:: @ 81966BE - .string "Oweiowei.\n" - .string "Tut mir Leid. Entschuldige bitte!$" + .string "Ayieeeeh!\n" + .string "I’m sorry, forgive me, please!$" MtPyre_2F_Text_1966E7:: @ 81966E7 - .string "Hier sind nie viele Leute. Daher soll es\n" - .string "hier seltene POKéMON geben.$" + .string "People don’t come here often, so\n" + .string "I thought there’d be rare POKéMON.$" diff --git a/data/text/maps/MtPyre_3F.inc b/data/text/maps/MtPyre_3F.inc index c1fa592e1..c714c97a0 100644 --- a/data/text/maps/MtPyre_3F.inc +++ b/data/text/maps/MtPyre_3F.inc @@ -1,26 +1,27 @@ MtPyre_3F_Text_19672B:: @ 819672B - .string "Die unglaubliche Atmosphäre der Berge\n" - .string "hat meine psychischen Kräfte gestärkt!\p" - .string "Ein kleines Kind wie du...\n" - .string "Du willst gewinnen? Träum weiter!$" + .string "The rich atmosphere of the mountain\n" + .string "has elevated my psychic power!\p" + .string "A mere child like you...\n" + .string "You dream of winning?$" MtPyre_3F_Text_19679D:: @ 819679D - .string "Ich vertiefe mich in Selbstmitleid.$" + .string "I drown in self-pity...$" MtPyre_3F_Text_1967B5:: @ 81967B5 - .string "Meine psychischen Kräfte sind mit\n" - .string "Sicherheit stärker geworden, aber...$" + .string "My psychic powers have surely\n" + .string "grown several times, but...$" MtPyre_3F_Text_1967EF:: @ 81967EF - .string "Ahahahahaha!!!!!\p" - .string "Dies ist kein Platz für einen kleinen\n" - .string "Hosenscheißer wie dich!$" + .string "Ahahahaha!\p" + .string "This is no place for children, least\n" + .string "of all you!$" MtPyre_3F_Text_19682B:: @ 819682B - .string "Oh, ich habe mir in die Hose gemacht.$" + .string "I lost that cleanly...$" MtPyre_3F_Text_196842:: @ 8196842 - .string "Mein Training reicht also nicht aus...\p" - .string "Ich muss mein Training auf die Spitze\n" - .string "treiben...\p" - .string "Ich darf keine Zeit verlieren!$" + .string "This means my training is still not\n" + .string "enough...\p" + .string "I’ve got to keep working toward the\n" + .string "summit...\p" + .string "Go, me!$" diff --git a/data/text/maps/MtPyre_4F.inc b/data/text/maps/MtPyre_4F.inc index 46ec64d44..275b6f5ac 100644 --- a/data/text/maps/MtPyre_4F.inc +++ b/data/text/maps/MtPyre_4F.inc @@ -1,11 +1,11 @@ MtPyre_4F_Text_1968A6:: @ 81968A6 - .string "Mein Lehrer...\n" - .string "Bitte achtet auf meine Fortschritte!$" + .string "Teacher...\n" + .string "Please watch over my progress!$" MtPyre_4F_Text_1968D0:: @ 81968D0 - .string "Mein Lehrer...\n" - .string "Bitte verzeiht mir!$" + .string "Teacher...\n" + .string "Please forgive me!$" MtPyre_4F_Text_1968EE:: @ 81968EE - .string "Wenn ich nicht besser werde, wird mein\n" - .string "Lehrer, der hier ruht, keine Ruhe finden.$" + .string "Until I improve, my teacher, who rests\n" + .string "here, will never find true peace...$" diff --git a/data/text/maps/MtPyre_5F.inc b/data/text/maps/MtPyre_5F.inc index d42949f30..c70211067 100644 --- a/data/text/maps/MtPyre_5F.inc +++ b/data/text/maps/MtPyre_5F.inc @@ -1,14 +1,14 @@ MtPyre_5F_Text_196939:: @ 8196939 - .string "Ich mag gruselige Horrordinge...\n" - .string "Es ist wie eine Sucht...\p" - .string "Sobald ich hier bin...\n" - .string "Stehen mir die Haare zu Berge.$" + .string "I love all things horrifying...\n" + .string "It’s like a disease...\p" + .string "When I’m here...\n" + .string "I shiver with fear...$" MtPyre_5F_Text_196997:: @ 8196997 - .string "Ich hasse Niederlagen...$" + .string "Losing, I dislike...$" MtPyre_5F_Text_1969AC:: @ 81969AC - .string "Ich will unheimliche Dinge sehen...\n" - .string "Ich kann nicht weggehen...\p" - .string "Muss bleiben...\n" - .string "Willst du nicht bei mir bleiben?$" + .string "I want to see dreadful things...\n" + .string "I can’t leave...\p" + .string "Stay...\n" + .string "Won’t you stay with me?$" diff --git a/data/text/maps/MtPyre_6F.inc b/data/text/maps/MtPyre_6F.inc index 50419c363..711c87570 100644 --- a/data/text/maps/MtPyre_6F.inc +++ b/data/text/maps/MtPyre_6F.inc @@ -1,21 +1,21 @@ MtPyre_6F_Text_1969FE:: @ 81969FE - .string "Wenn ich hier bin... Dann durchströmt\n" - .string "mich eine seltsame Macht...$" + .string "When I’m here...\n" + .string "A curious power flows into me...$" MtPyre_6F_Text_196A30:: @ 8196A30 - .string "Die Macht ebbt ab...$" + .string "The power is ebbing away...$" MtPyre_6F_Text_196A4C:: @ 8196A4C - .string "Die Geister der hier ruhenden POKéMON\n" - .string "erfüllen mich mit ihrer Macht...$" + .string "Perhaps the power is from the spirits\n" + .string "of POKéMON in fitful sleep here...$" MtPyre_6F_Text_196A95:: @ 8196A95 - .string "Hinter dir...\n" - .string "W... Was ist das?$" + .string "Behind you...\n" + .string "What is it...$" MtPyre_6F_Text_196AB1:: @ 8196AB1 - .string "Etwas war da und verschwand...$" + .string "Something faded away...$" MtPyre_6F_Text_196AC9:: @ 8196AC9 - .string "Die POKéMON, die hier ruhen...\n" - .string "Manchmal spielen sie...$" + .string "The POKéMON at rest here...\n" + .string "Sometimes, they play...$" diff --git a/data/text/maps/NewMauville_Entrance.inc b/data/text/maps/NewMauville_Entrance.inc index f6f8ad75f..36739ec3e 100644 --- a/data/text/maps/NewMauville_Entrance.inc +++ b/data/text/maps/NewMauville_Entrance.inc @@ -1,9 +1,9 @@ NewMauville_Entrance_Text_1982C0:: @ 81982C0 - .string "Die Tür ist geschlossen.$" + .string "The door is closed.$" NewMauville_Entrance_Text_1982D4:: @ 81982D4 - .string "Den KELLERÖFFNER benutzen?$" + .string "Use the BASEMENT KEY?$" NewMauville_Entrance_Text_1982EA:: @ 81982EA - .string "{PLAYER} benutzt den KELLERÖFFNER.\p" - .string "Die Tür öffnet sich.$" + .string "{PLAYER} used the BASEMENT KEY.\p" + .string "The door opened!$" diff --git a/data/text/maps/NewMauville_Inside.inc b/data/text/maps/NewMauville_Inside.inc index 2c7325674..c18354294 100644 --- a/data/text/maps/NewMauville_Inside.inc +++ b/data/text/maps/NewMauville_Inside.inc @@ -1,15 +1,16 @@ NewMauville_Inside_Text_198315:: @ 8198315 - .string "Der Generator strahlt eine Hitze ab, die\n" - .string "sogar aus der Entfernung zu spüren ist.\p" - .string "Man sollte ihn so schnell wie möglich\n" - .string "abschalten.$" + .string "The generator is radiating heat that\n" + .string "can be felt even at a distance.\p" + .string "It looks like it should be turned off\n" + .string "as soon as possible.$" NewMauville_Inside_Text_198395:: @ 8198395 - .string "Der Generator ist ausgeschaltet.$" + .string "The generator quieted down.$" NewMauville_Inside_Text_1983B1:: @ 81983B1 - .string "{PLAYER} stellt sich auf den Schalter.\p" - .string "Klick.\p" + .string "{PLAYER} stepped on the switch.\p" + .string "Click...\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Der Generator ist ausgeschaltet...$" + .string "The generator appears to have\n" + .string "stopped...$" diff --git a/data/text/maps/OldaleTown.inc b/data/text/maps/OldaleTown.inc index 39d3f8142..2d0b31a44 100644 --- a/data/text/maps/OldaleTown.inc +++ b/data/text/maps/OldaleTown.inc @@ -1,57 +1,55 @@ OldaleTown_Text_16AEC0:: @ 816AEC0 - .string "Ich möchte eine Pause einlegen, daher\n" - .string "speichere ich mein Spiel.$" + .string "I want to take a rest, so I’m saving my\n" + .string "progress.$" OldaleTown_Text_16AEF2:: @ 816AEF2 .string "Hi!\n" - .string "Ich arbeite in einem PKMN-SUPERMARKT.\p" - .string "Kommst du bitte einmal mit mir?$" + .string "I work at a POKéMON MART.\p" + .string "Can I get you to come with me?$" OldaleTown_Text_16AF2F:: @ 816AF2F - .string "Dies ist ein PKMN-SUPERMARKT.\n" - .string "Er ist an dem blauen Dach erkennbar.\p" - .string "Wir verkaufen eine Menge nützlicher\n" - .string "Dinge, wie POKéBÄLLE, mit denen man\l" - .string "POKéMON fängt.\p" - .string "Hier, dies ist ein Item, quasi als Werbe-\n" - .string "geschenk für dich.$" + .string "This is a POKéMON MART.\n" + .string "Just look for our blue roof.\p" + .string "We sell a variety of goods including\n" + .string "POKé BALLS for catching POKéMON.\p" + .string "Here, I’d like you to have this as a\n" + .string "promotional item.$" OldaleTown_Text_16AFE1:: @ 816AFE1 - .string "Ein TRANK kann zu jeder Zeit eingesetzt\n" - .string "werden, daher ist er in manchen\l" - .string "Situationen wertvoller als ein POKéMON-\l" - .string "CENTER.$" + .string "A POTION can be used anytime, so it’s\n" + .string "even more useful than a POKéMON CENTER\l" + .string "in certain situations.$" OldaleTown_Text_16B045:: @ 816B045 - .string "Aaaah! Warte!\n" - .string "Bitte nicht dort entlang laufen!\p" - .string "Ich habe dort die Fußspuren eines\n" - .string "seltenen POKéMON gesehen!\p" - .string "Warte bis ich fertig bin, sie\n" - .string "abzuzeichnen, okay?$" + .string "Aaaaah! Wait!\n" + .string "Please don’t come in here.\p" + .string "I just discovered the footprints of\n" + .string "a rare POKéMON!\p" + .string "Wait until I finish sketching\n" + .string "them, okay?$" OldaleTown_Text_16B0CC:: @ 816B0CC - .string "Ich habe dort die Fußspuren eines\n" - .string "seltenen POKéMON gesehen!\p" - .string "Warte, bis ich fertig bin, sie\n" - .string "abzuzeichnen, okay?$" + .string "I just discovered the footprints of\n" + .string "a rare POKéMON!\p" + .string "Wait until I finish sketching\n" + .string "them, okay?$" OldaleTown_Text_16B12A:: @ 816B12A - .string "Ich habe die Fußspuren eines seltenen\n" - .string "POKéMON abgezeichnet.\p" - .string "Aber hinterher habe ich festgestellt,\n" - .string "dass es meine eigenen Spuren waren...$" + .string "I finished sketching the footprints of\n" + .string "a rare POKéMON.\p" + .string "But it turns out they were only my\n" + .string "own footprints...$" OldaleTown_Text_16B196:: @ 816B196 - .string "MAIKE: {PLAYER}{KUN}!\n" - .string "Hier entlang!\l" - .string "Lass uns nach Hause gehen!$" + .string "MAY: {PLAYER}{KUN}!\n" + .string "Over here!\l" + .string "Let’s hurry home!$" OldaleTown_Text_16B1BE:: @ 816B1BE - .string "BRIX: Ich gehe nun in das LABOR\n" - .string "meines Vaters.\l" - .string "{PLAYER}, du solltest auch zurücklaufen.$" + .string "BRENDAN: I’m heading back to my dad’s\n" + .string "LAB now.\l" + .string "{PLAYER}, you should hustle back, too.$" OldaleTown_Text_16B20E:: @ 816B20E - .string "ROSALTSTADT\n" - .string "“Wo Dinge selten ihren Anfang nehmen.”$" + .string "OLDALE TOWN\n" + .string "“Where things start off scarce.”$" diff --git a/data/text/maps/OldaleTown_House1.inc b/data/text/maps/OldaleTown_House1.inc index d12e86fb7..943003b97 100644 --- a/data/text/maps/OldaleTown_House1.inc +++ b/data/text/maps/OldaleTown_House1.inc @@ -1,7 +1,7 @@ OldaleTown_House1_Text_17476D:: @ 817476D - .string "Das POKéMON auf der linken Seite der\n" - .string "Liste tritt im Kampf als Erstes an.\p" - .string "Hast du mehrere POKéMON in deinem Team,\n" - .string "stelle sie so der Reihe nach auf, wie es\l" - .string "für den Kampf am günstigsten ist.\p" - .string "Das kann ein Vorteil für dich sein.$" + .string "When a POKéMON battle starts, the one\n" + .string "at the left of the list goes out first.\p" + .string "So, when you get more POKéMON in your\n" + .string "party, try switching around the order\l" + .string "of your POKéMON.\p" + .string "It could give you an advantage.$" diff --git a/data/text/maps/OldaleTown_House2.inc b/data/text/maps/OldaleTown_House2.inc index c14c3803a..54a6547b4 100644 --- a/data/text/maps/OldaleTown_House2.inc +++ b/data/text/maps/OldaleTown_House2.inc @@ -1,9 +1,8 @@ OldaleTown_House2_Text_174838:: @ 8174838 - .string "Während eines Kampfes können POKéMON\n" - .string "manchmal einen Level dazugewinnen und\l" - .string "stärker werden.$" + .string "When POKéMON battle, they eventually\n" + .string "level up and become stronger.$" OldaleTown_House2_Text_17487B:: @ 817487B - .string "Sobald deine Team-POKéMON stärker\n" - .string "geworden sind, kannst du auch andere\l" - .string "Orte bereisen.$" + .string "If the POKéMON with you become\n" + .string "stronger, you’ll be able to go farther\l" + .string "away from here.$" diff --git a/data/text/maps/OldaleTown_Mart.inc b/data/text/maps/OldaleTown_Mart.inc index 19e1e600f..5abb0cb9b 100644 --- a/data/text/maps/OldaleTown_Mart.inc +++ b/data/text/maps/OldaleTown_Mart.inc @@ -1,14 +1,13 @@ OldaleTown_Mart_Text_174A8A:: @ 8174A8A - .string "Der Verkäufer sagt, es sei alles ausver-\n" - .string "kauft. Jetzt stehe ich ohne\l" - .string "POKéBÄLLE da.$" + .string "The clerk says they’re all sold out.\n" + .string "I can’t buy any POKé BALLS.$" OldaleTown_Mart_Text_174ACB:: @ 8174ACB - .string "Ich will mir viele POKéBÄLLE kaufen und\n" - .string "damit genauso viele POKéMON fangen!$" + .string "I’m going to buy a bunch of POKé BALLS\n" + .string "and catch a bunch of POKéMON!$" OldaleTown_Mart_Text_174B10:: @ 8174B10 - .string "Wird ein POKéMON verletzt und verliert\n" - .string "alle KP, so ist es kampfunfähig.\p" - .string "Um das zu vermeiden, solltest du die KP\n" - .string "bei Bedarf mit einem TRANK auffüllen.$" + .string "If a POKéMON gets hurt and loses its HP\n" + .string "and faints, it won’t be able to battle.\p" + .string "To prevent your POKéMON from fainting,\n" + .string "restore its HP with a POTION.$" diff --git a/data/text/maps/OldaleTown_PokemonCenter_1F.inc b/data/text/maps/OldaleTown_PokemonCenter_1F.inc index 4396e8638..4fa7f4d9b 100644 --- a/data/text/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/text/maps/OldaleTown_PokemonCenter_1F.inc @@ -1,23 +1,22 @@ OldaleTown_PokemonCenter_1F_Text_1748D1:: @ 81748D1 - .string "Der PC dort in der Ecke ist für alle\n" - .string "POKéMON-TRAINER.\p" - .string "Das heißt, dass auch du ihn benutzen\n" - .string "darfst.$" + .string "That PC in the corner there is\n" + .string "for any POKéMON TRAINER to use.\p" + .string "Naturally, that means you’re welcome\n" + .string "to use it, too.$" OldaleTown_PokemonCenter_1F_Text_174945:: @ 8174945 - .string "POKéMON-CENTER sind eine großartige\n" - .string "Einrichtung!\p" - .string "Du kannst ihren Service sooft du willst\n" - .string "in Anspruch nehmen - kostenlos! Daher\l" - .string "kannst du unbeschwert umherreisen.$" + .string "POKéMON CENTERS are great!\p" + .string "You can use their services as much\n" + .string "as you like, and it’s all for free.\l" + .string "You never have to worry!$" OldaleTown_PokemonCenter_1F_Text_1749C0:: @ 81749C0 - .string "Der POKéMON KABEL-CLUB im zweiten\n" - .string "Stock wurde erst kürzlich eröffnet.\p" - .string "Und sie sind immer noch nicht ganz\n" - .string "fertig mit dem Einrichten.$" + .string "The POKéMON CABLE CLUB on the second\n" + .string "floor was built recently.\p" + .string "But they say they’re still making\n" + .string "adjustments.$" OldaleTown_PokemonCenter_1F_Text_174A2E:: @ 8174A2E - .string "Der POKéMON KABEL-CLUB im zweiten\n" - .string "Stock wurde erst kürzlich eröffnet.\p" - .string "Ich habe schon POKéMON getauscht!$" + .string "The POKéMON CABLE CLUB on the second\n" + .string "floor was built recently.\p" + .string "I traded POKéMON right away.$" diff --git a/data/text/maps/PacifidlogTown.inc b/data/text/maps/PacifidlogTown.inc index f9cf80a48..f598c566a 100644 --- a/data/text/maps/PacifidlogTown.inc +++ b/data/text/maps/PacifidlogTown.inc @@ -1,20 +1,19 @@ PacifidlogTown_Text_16CFC5:: @ 816CFC5 - .string "Im Meer zwischen FLOSSBRUNN und\n" - .string "GRAPHITPORT CITY befinden sich\l" - .string "reißende Strömungen.\p" - .string "Wenn du dort SURFER einsetzt, kann es\n" - .string "sein, dass du fortgetrieben wirst.$" + .string "The sea between PACIFIDLOG and\n" + .string "SLATEPORT has a fast-running tide.\p" + .string "If you decide to SURF, you could end\n" + .string "up swept away somewhere else.$" PacifidlogTown_Text_16D04A:: @ 816D04A - .string "Schau mal. Ist das nicht hübsch?\n" - .string "Die Häuser stehen auf dem Wasser.\p" - .string "Ich wurde hier geboren.$" + .string "See, isn’t it neat?\n" + .string "These houses are on water!\p" + .string "I was born here!$" PacifidlogTown_Text_16D08A:: @ 816D08A - .string "Das Volk von FLOSSBRUNN fischt und\n" - .string "taucht. Das gehört zu ihrem Leben.$" + .string "The folks of PACIFIDLOG all fish and\n" + .string "dive as part of the lifestyle.$" PacifidlogTown_Text_16D0CE:: @ 816D0CE - .string "FLOSSBRUNN\p" - .string "“Wo die Morgensonne ein Lächeln auf\n" - .string "das Meer zaubert.”$" + .string "PACIFIDLOG TOWN\p" + .string "“Where the morning sun smiles upon\n" + .string "the waters.”$" diff --git a/data/text/maps/PacifidlogTown_House1.inc b/data/text/maps/PacifidlogTown_House1.inc index deed4a0f6..5d2f5a2c9 100644 --- a/data/text/maps/PacifidlogTown_House1.inc +++ b/data/text/maps/PacifidlogTown_House1.inc @@ -1,13 +1,13 @@ PacifidlogTown_House1_Text_178F9F:: @ 8178F9F - .string "In der HOENN-Region gibt es drei\n" - .string "POKéMON, die die Stärke von Gestein,\l" - .string "Eis und Stahl repräsentieren.\p" - .string "Man sagt, sie verstecken sich in\n" - .string "Höhlen vor den Augen der Menschen.\p" - .string "Diese Geschichte wurde mir als Kind\n" - .string "erzählt.$" + .string "In the HOENN region, there are three\n" + .string "POKéMON that represent the power of\l" + .string "rock, ice, and steel.\p" + .string "Each of them is said to hide away deep\n" + .string "inside caves.\p" + .string "That’s the story I heard when I was\n" + .string "just a little kid.$" PacifidlogTown_House1_Text_17906A:: @ 817906A - .string "“Sechs Punkte öffnen drei Türen.”\p" - .string "Mein Großvater sagte das immer, aber\n" - .string "ich habe keine Ahnung, was es bedeutet.$" + .string "“Six dots open three doors.”\p" + .string "Grandpa used to say that, but I don’t\n" + .string "know what he meant.$" diff --git a/data/text/maps/PacifidlogTown_House2.inc b/data/text/maps/PacifidlogTown_House2.inc index d5d93ae24..5c669dc98 100644 --- a/data/text/maps/PacifidlogTown_House2.inc +++ b/data/text/maps/PacifidlogTown_House2.inc @@ -1,54 +1,54 @@ PacifidlogTown_House2_Text_1790C1:: @ 81790C1 - .string "Ähhäm!\p" - .string "Ich bin die wichtigste Person des\n" - .string "POKéMON-FANCLUBS, ich bin der kleine\l" - .string "Bruder des VORSITZENDEN.\p" - .string "Ich genieße hier die Ferien mit meinen\n" - .string "POKéMON. Ja, das tue ich.$" + .string "Er-hem!\p" + .string "I am the POKéMON FAN CLUB’s most\n" + .string "important person, the CHAIRMAN’s\l" + .string "younger brother.\p" + .string "I’m here enjoying my vacation with\n" + .string "POKéMON, yes, indeed.$" PacifidlogTown_House2_Text_179155:: @ 8179155 .string "Ah!\n" - .string "Dein POKéMON...$" + .string "Your POKéMON...$" PacifidlogTown_House2_Text_179169:: @ 8179169 - .string "Es mag dich offensichtlich sehr.\p" - .string "Ein derart liebevolles und wunderbares\n" - .string "POKéMON verdient eine TM wie diese!$" + .string "It clearly likes you very much.\p" + .string "A POKéMON that adoring and adorable\n" + .string "deserves a TM like this, no?$" PacifidlogTown_House2_Text_1791CA:: @ 81791CA .string "Hmm...\n" - .string "Nicht schlecht... Aber auch nicht gut.\p" - .string "Du musst dich als TRAINER mehr\n" - .string "anstrengen.$" + .string "It’s not bad, but it’s also not good.\p" + .string "You, as the TRAINER, need to put in\n" + .string "some more effort.$" PacifidlogTown_House2_Text_17922D:: @ 817922D - .string "Es hat einen bösartigen Blick.\p" - .string "Ein Furcht erregendes POKéMON wie\n" - .string "dieses verdient eine TM wie diese!$" + .string "It has a vicious look to it.\p" + .string "A frightening POKéMON like that\n" + .string "deserves a TM like this.$" PacifidlogTown_House2_Text_179283:: @ 8179283 - .string "Wenn ein POKéMON dich sehr mag, wird die\n" - .string "Kraft von RÜCKKEHR verstärkt.\p" - .string "Wenn es dich nicht mag, wird die Kraft\n" - .string "von FRUSTRATION verstärkt.$" + .string "If a POKéMON likes you a lot, RETURN’s\n" + .string "power is enhanced.\p" + .string "If it doesn’t like you, FRUSTRATION’s\n" + .string "power goes up.$" PacifidlogTown_House2_Text_1792F2:: @ 81792F2 - .string "Oh, ja. In {STR_VAR_1} Tag/en müsste\n" - .string "ich eine gute TM bekommen haben.\p" - .string "Komm doch dann wieder vorbei.\n" - .string "Ich werde dir dann eine TM geben, die\l" - .string "wunderbar zu deinem POKéMON passt.$" + .string "Oh, yes. In about {STR_VAR_1} or so days,\n" + .string "I should be getting a good TM or two.\p" + .string "You should come see me then.\n" + .string "I’ll give you a TM that’s suitable for\l" + .string "your POKéMON.$" PacifidlogTown_House2_Text_17938B:: @ 817938B .string "AZURILL: Rurii.$" PacifidlogTown_House2_Text_17939B:: @ 817939B - .string "Es scheint freundschaftlich mit dem\n" - .string "TRAINER umzugehen.$" + .string "It appears to be very friendly with the\n" + .string "TRAINER.$" PacifidlogTown_House2_Text_1793CC:: @ 81793CC .string "AZURILL: Rururi!$" PacifidlogTown_House2_Text_1793DD:: @ 81793DD - .string "Es scheint den TRAINER nicht\n" - .string "sonderlich zu mögen.$" + .string "It doesn’t appear to like the TRAINER\n" + .string "very much.$" diff --git a/data/text/maps/PacifidlogTown_House3.inc b/data/text/maps/PacifidlogTown_House3.inc index 2e0e34d9e..1aabc9578 100644 --- a/data/text/maps/PacifidlogTown_House3.inc +++ b/data/text/maps/PacifidlogTown_House3.inc @@ -1,27 +1,27 @@ PacifidlogTown_House3_Text_17940E:: @ 817940E - .string "Hallo, TRAINER. Würdest du POKéMON\n" - .string "mit mir tauschen?\p" - .string "Da ich in FLOSSBRUNN lebe, kann ich nur\n" - .string "bestimmte POKéMON fangen.\p" - .string "{STR_VAR_1}? Hast du das POKéMON?\n" - .string "Ich gebe dir mein {STR_VAR_2} dafür.$" + .string "Hello, TRAINER. Would you do me a favor\n" + .string "and trade POKéMON with me?\p" + .string "Living in PACIFIDLOG, I can only catch\n" + .string "certain kinds of POKéMON.\p" + .string "{STR_VAR_1}? Do you have one?\n" + .string "I’ll trade you my {STR_VAR_2} for it.$" PacifidlogTown_House3_Text_1794C4:: @ 81794C4 .string "Wow!\n" - .string "Das {STR_VAR_1} ist so weich!$" + .string "This {STR_VAR_1} is so fluffy!$" PacifidlogTown_House3_Text_1794DF:: @ 81794DF - .string "Das ist kein {STR_VAR_1}.$" + .string "That’s no {STR_VAR_1}.$" PacifidlogTown_House3_Text_1794ED:: @ 81794ED - .string "Ich bin ein bisschen enttäuscht.$" + .string "I’m a little disappointed...$" PacifidlogTown_House3_Text_17950A:: @ 817950A - .string "Seit wir POKéMON getauscht haben, sind\n" - .string "wir Freunde, nicht wahr?$" + .string "Since we traded, you and me,\n" + .string "we’re friends, aren’t we?$" PacifidlogTown_House3_Text_179541:: @ 8179541 - .string "Ist das ein POKéDEX?\p" - .string "Hast du schon viele verschiedene\n" - .string "POKéMON getroffen?\p" - .string "Ich wollte, ich wäre wie du.$" + .string "Is that a POKéDEX?\p" + .string "Did you get to meet a lot of different\n" + .string "POKéMON?\p" + .string "I wish I was like you.$" diff --git a/data/text/maps/PacifidlogTown_House4.inc b/data/text/maps/PacifidlogTown_House4.inc index 6e1dfb1db..3ca9e5cca 100644 --- a/data/text/maps/PacifidlogTown_House4.inc +++ b/data/text/maps/PacifidlogTown_House4.inc @@ -1,24 +1,23 @@ PacifidlogTown_House4_Text_17959B:: @ 817959B - .string "Die Menschen sagen, sie hätten ein \n" - .string "POKéMON über HOENN FLIEGEN sehen.\p" - .string "FLIEGT es die ganze Zeit über herum?\n" - .string "Muss es sich nicht ausruhen?$" + .string "People were saying they saw a POKéMON\n" + .string "FLYING high above HOENN.\p" + .string "Is it FLYING around all the time?\n" + .string "Doesn’t it need to rest somewhere?$" PacifidlogTown_House4_Text_17961F:: @ 817961F - .string "Ein Himmels-POKéMON!\n" - .string "Ein Himmels-POKéMON!$" + .string "A sky POKéMON!\n" + .string "A sky POKéMON!$" PacifidlogTown_House4_Text_17963D:: @ 817963D - .string "Woher kommst du?$" + .string "Where did you come from?$" PacifidlogTown_House4_Text_179656:: @ 8179656 - .string "Ja?\n" - .string "JA-Stadt???\p" - .string "Davon habe ich ja noch nie gehört!$" + .string "Yes?\n" + .string "YES TOWN?\p" + .string "I’ve never heard of a place like that.$" PacifidlogTown_House4_Text_17968C:: @ 817968C - .string "Nein? Das ergibt doch gar keinen Sinn.\n" - .string "Du musst doch von irgendwo herkommen!\p" - .string "Oh! Warte! Du willst doch nicht etwa be-\n" - .string "haupten, du wärest in den Tiefen des\l" - .string "Meeres geboren???$" + .string "No? That doesn’t make any sense.\n" + .string "You have to come from somewhere.\p" + .string "Oh! Wait! You’re not going to say you\n" + .string "were born at the bottom of the sea?$" diff --git a/data/text/maps/PacifidlogTown_House5.inc b/data/text/maps/PacifidlogTown_House5.inc index eaba254c7..5fc9ca5c5 100644 --- a/data/text/maps/PacifidlogTown_House5.inc +++ b/data/text/maps/PacifidlogTown_House5.inc @@ -1,15 +1,14 @@ PacifidlogTown_House5_Text_179718:: @ 8179718 - .string "Ich kann WUNDEREILAND heute\n" - .string "nicht sehen...$" + .string "I can’t see MIRAGE ISLAND today...$" PacifidlogTown_House5_Text_17973B:: @ 817973B - .string "Oh! Oh! Heute kann ich WUNDEREILAND\n" - .string "sehen!$" + .string "Oh! Oh my!\n" + .string "I can see MIRAGE ISLAND today!$" PacifidlogTown_House5_Text_179765:: @ 8179765 - .string "WUNDEREILAND...\p" - .string "Die Insel ist sichtbar oder nicht\n" - .string "sichtbar. Das hängt vom Wetter ab, das\l" - .string "Fata Morganen möglich macht oder nicht.\p" - .string "Oder verschwindet die Insel tatsächlich\n" - .string "manchmal?$" + .string "MIRAGE ISLAND...\p" + .string "It must become visible and invisible\n" + .string "depending on the weather conditions\l" + .string "that make mirages appear.\p" + .string "Or is it really appearing and\n" + .string "disappearing?$" diff --git a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc index 648c562fe..9f87c6a54 100644 --- a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -1,16 +1,17 @@ PacifidlogTown_PokemonCenter_1F_Text_178E47:: @ 8178E47 - .string "Welche Farbe hat dein TRAINERPASS?\n" - .string "Meiner ist kupferrot.$" + .string "What color is your TRAINER’S CARD?\n" + .string "Mine’s copper!$" PacifidlogTown_PokemonCenter_1F_Text_178E79:: @ 8178E79 - .string "FLOSSBRUNN schwimmt auf einer\n" - .string "Kolonie von CORASONN.\p" - .string "Glaubst du mir das?$" + .string "PACIFIDLOG TOWN floats on top of\n" + .string "a colony of CORSOLA.\p" + .string "If I told you that, would you believe me?$" PacifidlogTown_PokemonCenter_1F_Text_178ED9:: @ 8178ED9 - .string "Man sagt, die Vorfahren der Menschen in\n" - .string "FLOSSBRUNN wurden an Bord von\l" - .string "Schiffen geboren, lebten und starben\l" - .string "auch dort.\p" - .string "Diese Lebensart ist verständlich, denn\n" - .string "sie waren auf der Suche nach etwas.$" + .string "The ancestors of the people in\n" + .string "PACIFIDLOG were said to have been\l" + .string "born on boats and then lived and died \l" + .string "aboard them.\p" + .string "I understand that they lived that way\n" + .string "because they were searching for\l" + .string "something.$" diff --git a/data/text/maps/PetalburgCity.inc b/data/text/maps/PetalburgCity.inc index 2e8d02124..fbe00df96 100644 --- a/data/text/maps/PetalburgCity.inc +++ b/data/text/maps/PetalburgCity.inc @@ -1,46 +1,44 @@ PetalburgCity_Text_16433E:: @ 816433E - .string "Wohin ist unser HEIKO nur gegangen?\p" - .string "Wir müssen doch bald nach WIESENFLUR\n" - .string "aufbrechen...$" + .string "Where has our WALLY gone?\p" + .string "We have to leave for VERDANTURF TOWN\n" + .string "very soon...$" PetalburgCity_Text_16438A:: @ 816438A - .string "He da! Bist du vielleicht...\n" - .string "Ein Anfänger unter den TRAINERN?\p" - .string "Weißt du, was POKéMON-TRAINER machen,\n" - .string "wenn sie in einen neuen Ort kommen?\p" - .string "Sie sehen sich als Erstes die ARENA\n" - .string "im Ort an.$" + .string "Hiya! Are you maybe...\n" + .string "A rookie TRAINER?\p" + .string "Do you know what POKéMON TRAINERS\n" + .string "do when they reach a new town?\p" + .string "They first check what kind of GYM\n" + .string "is in the town.$" PetalburgCity_Text_164426:: @ 8164426 - .string "Schau. Das ist die ARENA von\n" - .string "BLÜTENBURG CITY.$" + .string "See? This is PETALBURG CITY’s GYM.$" PetalburgCity_Text_164449:: @ 8164449 - .string "Das ist das Logo der ARENA. Daran\n" - .string "kannst du immer eine ARENA erkennen.$" + .string "This is the GYM’s sign. Look for it\n" + .string "whenever you’re looking for a GYM.$" PetalburgCity_Text_164490:: @ 8164490 - .string "Mein Gesicht spiegelt sich im Wasser...\p" - .string "Ein schimmerndes Lächeln der Hoffnung.\p" - .string "Oder ist es der Ausdruck düsterer\n" - .string "Stille, an der die Angst nagt...\p" - .string "Was siehst du in deinem Spiegelbild?$" + .string "My face is reflected in the water.\p" + .string "It’s a shining grin full of hope...\p" + .string "Or it could be a look of somber silence\n" + .string "struggling with fear...\p" + .string "What do you see reflected in your face?$" PetalburgCity_Text_16453F:: @ 816453F - .string "Nehmen wir an, du hättest 6 POKéMON.\n" - .string "Wenn du jetzt ein weiteres fängst...\p" - .string "wird es automatisch in das POKéMON-\n" - .string "LAGERUNGS-SYSTEM gesendet.$" + .string "Let’s say you have six POKéMON.\n" + .string "If you catch another one...\p" + .string "It is automatically sent to a STORAGE\n" + .string "BOX over a PC connection.$" PetalburgCity_Text_1645BB:: @ 81645BB - .string "POKéMON ARENA von BLÜTENBURG CITY\n" - .string "LEITER: NORMAN\l" - .string "“Ein Mann, der nach Stärke strebt!”$" + .string "PETALBURG CITY POKéMON GYM\n" + .string "LEADER: NORMAN\l" + .string "“A man in pursuit of power!”$" PetalburgCity_Text_164602:: @ 8164602 - .string "BLÜTENBURG CITY\n" - .string "“Wo Menschen Hand in Hand\l" - .string "mit der Natur gehen.”$" + .string "PETALBURG CITY\n" + .string "“Where people mingle with nature.”$" PetalburgCity_Text_164634:: @ 8164634 - .string "HEIKOS HAUS$" + .string "WALLY’S HOUSE$" diff --git a/data/text/maps/PetalburgCity_Gym.inc b/data/text/maps/PetalburgCity_Gym.inc index 1d1ca9db7..bbd072564 100644 --- a/data/text/maps/PetalburgCity_Gym.inc +++ b/data/text/maps/PetalburgCity_Gym.inc @@ -1,430 +1,411 @@ PetalburgCity_Gym_Text_179DF6:: @ 8179DF6 - .string "VATER: Hm?\p" - .string "Na, wenn das nicht {PLAYER} ist!\n" - .string "Dann habt ihr also den Umzug beendet?\p" - .string "Ich bin überrascht, dass du ganz\n" - .string "alleine hierher gefunden hast.\p" - .string "Oh, so ist das.\n" - .string "Du bist in POKéMON-Begleitung.\p" - .string "Ich glaube, du wirst einmal in meine Fuß-\n" - .string "stapfen als TRAINER treten, {PLAYER}.\p" - .string "Das sind großartige Aussichten!\n" - .string "Ich kann es kaum erwarten!$" + .string "DAD: Hm?\p" + .string "Well, if it isn’t {PLAYER}!\n" + .string "So you’re all finished moving in?\p" + .string "I’m surprised that you managed to\n" + .string "get here by yourself.\p" + .string "Oh, I see.\n" + .string "You’re with your POKéMON.\p" + .string "Hm... Then I guess you’re going to\n" + .string "become a TRAINER like me, {PLAYER}.\p" + .string "That’s great news!\n" + .string "I’ll be looking forward to it!$" PetalburgCity_Gym_Text_179F07:: @ 8179F07 - .string "Äh... Ich... Ich hätte so gerne ein\n" - .string "POKéMON. Bitte...$" + .string "Um... I... I’d like to get a\n" + .string "POKéMON, please...$" PetalburgCity_Gym_Text_179F37:: @ 8179F37 - .string "VATER: Wie? Du... Ach... Gut.\n" - .string "Du bist HEIKO, nicht wahr?$" + .string "DAD: Hm? You’re... Uh... Oh, right.\n" + .string "You’re WALLY, right?$" PetalburgCity_Gym_Text_179F70:: @ 8179F70 - .string "HEIKO: Ich werde meine Verwandten\n" - .string "in WIESENFLUR besuchen.\p" - .string "Ich glaube, ich werde mich da doch\n" - .string "einsam fühlen, daher würde ich gerne ein\l" - .string "POKéMON mitnehmen.\p" - .string "Aber ich habe noch nie eines gefangen.\n" - .string "Ich weiß nicht, wie das geht...$" + .string "WALLY: I’m going to go stay with my\n" + .string "relatives in VERDANTURF TOWN.\p" + .string "I thought I would be lonely by myself,\n" + .string "so I wanted to take a POKéMON along.\p" + .string "But I’ve never caught a POKéMON before.\n" + .string "I don’t know how...$" PetalburgCity_Gym_Text_17A03A:: @ 817A03A - .string "VATER: Oh, ich verstehe...$" + .string "DAD: Hm. I see.$" PetalburgCity_Gym_Text_17A04A:: @ 817A04A - .string "VATER: {PLAYER}, hast du das gehört?\p" - .string "Hilf doch bitte HEIKO dabei,\n" - .string "ein POKéMON zu fangen.$" + .string "DAD: {PLAYER}, you heard that,\n" + .string "right?\p" + .string "Go with WALLY and make sure that he\n" + .string "safely catches a POKéMON.$" PetalburgCity_Gym_Text_17A0A8:: @ 817A0A8 - .string "HEIKO, hier, ich leihe dir mein\n" - .string "POKéMON.\p" - .string "HEIKO hat ein ZIGZACHS erhalten.$" + .string "WALLY, here, I’ll loan you my POKéMON.\p" + .string "WALLY received a ZIGZAGOON!$" PetalburgCity_Gym_Text_17A0EB:: @ 817A0EB - .string "HEIKO: Oh, wow!!!\n" - .string "Ein POKéMON!\p" - .string "VATER: Hm. Ich gebe dir auch diesen\n" - .string "POKéBALL. Dann leg los!\p" - .string "HEIKO erhält einen POKéBALL!$" + .string "WALLY: Oh, wow!\n" + .string "A POKéMON!\p" + .string "DAD: Hm. I’ll give you a POKé BALL, too.\n" + .string "Go for it!\p" + .string "WALLY received a POKé BALL!$" PetalburgCity_Gym_Text_17A156:: @ 817A156 - .string "HEIKO: Oh, wow!!!\n" - .string "Danke schön!$" + .string "WALLY: Oh, wow!\n" + .string "Thank you!$" PetalburgCity_Gym_Text_17A171:: @ 817A171 - .string "{PLAYER}... Kommst du wirklich mit mir???$" + .string "{PLAYER}... Would you really come\n" + .string "with me?$" PetalburgCity_Gym_Text_17A196:: @ 817A196 - .string "VATER: Und? Hat es geklappt?$" + .string "DAD: So, did it work out?$" PetalburgCity_Gym_Text_17A1B0:: @ 817A1B0 - .string "HEIKO: Danke. Ja, wunderbar.\n" - .string "Hier haben Sie Ihr POKéMON zurück.\p" - .string "Danke, {PLAYER}, dass du mit mir\n" - .string "gegangen bist.\p" - .string "Euch beiden habe ich es zu verdanken,\n" - .string "dass ich mein erstes POKéMON fangen\l" - .string "konnte.\p" - .string "Ich verspreche, ich werde mich gut\n" - .string "darum kümmern!\p" - .string "Oh! Meine Mama wartet sicher schon auf\n" - .string "mich! Ich muss nach Hause!\p" - .string "Bis bald, {PLAYER}!$" + .string "WALLY: Thank you, yes, it did.\n" + .string "Here’s your POKéMON back.\p" + .string "{PLAYER}, thank you for coming along\n" + .string "with me.\p" + .string "You two are why I was able to catch\n" + .string "my POKéMON.\p" + .string "I promise I’ll take really good\n" + .string "care of it.\p" + .string "Oh! My mom’s waiting for me, so I\n" + .string "have to go!\p" + .string "Bye, {PLAYER}!$" PetalburgCity_Gym_Text_17A2A4:: @ 817A2A4 - .string "VATER: Nun...\p" - .string "{PLAYER}, wenn du ein guter TRAINER\n" - .string "werden willst - hier ist mein Rat.\p" - .string "Gehe nach METAROST CITY, gleich hinter\n" - .string "diesem Ort.\p" - .string "Dort solltest du die ARENALEITERIN\n" - .string "FELIZIA herausfordern.\p" - .string "Danach suche die anderen POKéMON\n" - .string "ARENEN auf und besiege die LEITER.\p" - .string "Sammle die ORDEN der verschiedenen\n" - .string "ARENEN, verstehst du?\p" - .string "Ich bin natürlich auch ein ARENALEITER.\n" - .string "Auch wir werden eines Tages\l" - .string "gegeneinander antreten.\p" - .string "Aber erst, wenn du stärker geworden\n" - .string "bist, {PLAYER}.$" + .string "DAD: Now...\p" + .string "{PLAYER}, if you want to become a\n" + .string "strong TRAINER, here’s my advice.\p" + .string "Head for RUSTBORO CITY beyond this\n" + .string "town.\p" + .string "There, you should challenge the GYM\n" + .string "LEADER, ROXANNE.\p" + .string "After her, go on to other POKéMON\n" + .string "GYMS and defeat their LEADERS.\p" + .string "Collect BADGES from them,\n" + .string "understood?\p" + .string "Of course, I’m a GYM LEADER, too.\n" + .string "We’ll battle one day, {PLAYER}.\p" + .string "But that’s only after you become\n" + .string "stronger, {PLAYER}.$" PetalburgCity_Gym_Text_17A41E:: @ 817A41E - .string "VATER: Hm? Wolltest du nicht zur\n" - .string "POKéMON ARENA in METAROST CITY?\p" - .string "Für mich ist es keine Herausforderung,\n" - .string "gegen einen Grünschnabel anzutreten.\p" - .string "{PLAYER}, ich möchte, dass du mich he-\n" - .string "rausforderst, sobald du stärker bist.\p" - .string "Ich werde gegen dich kämpfen, {PLAYER},\n" - .string "sobald du vier ORDEN erhalten hast, ja?$" + .string "DAD: Hm? Aren’t you going to the\n" + .string "POKéMON GYM in RUSTBORO CITY?\p" + .string "There’s no challenge for me to\n" + .string "battle a greenhorn TRAINER.\p" + .string "{PLAYER}, I want you to challenge me\n" + .string "when you become a lot stronger.\p" + .string "I’ll battle you, {PLAYER}, when you\n" + .string "can show me four GYM BADGES, okay?$" PetalburgCity_Gym_Text_17A518:: @ 817A518 - .string "VATER: Oh, ich sehe schon... Du hast die\n" - .string "ARENALEITERIN in METAROST CITY\l" - .string "besiegt.\p" - .string "Aber es gibt weitere TRAINER, die\n" - .string "stärker sind als du, {PLAYER}.\p" - .string "Wenn du das Meer überquerst, kommst du\n" - .string "nach FAUSTAUHAVEN. Dort triffst du auf\l" - .string "den ARENALEITER KAMILLO.\p" - .string "Du solltest ihn wirklich herausfordern...$" + .string "DAD: I see... So, you’ve beaten the\n" + .string "GYM LEADER in RUSTBORO CITY.\p" + .string "But there are many more TRAINERS\n" + .string "who are stronger than you, {PLAYER}.\p" + .string "Across the sea in DEWFORD TOWN is a\n" + .string "GYM LEADER named BRAWLY.\p" + .string "You should go challenge him.$" PetalburgCity_Gym_Text_17A5F3:: @ 817A5F3 - .string "VATER: Hm... {PLAYER}, du bist stärker\n" - .string "geworden.\p" - .string "Das sehe ich an der Anzahl der ORDEN,\n" - .string "die du dir verdient hast.$" + .string "DAD: Hm... {PLAYER}, you have gotten\n" + .string "stronger.\p" + .string "I can tell by the number of BADGES\n" + .string "that you’ve earned.$" PetalburgCity_Gym_Text_17A653:: @ 817A653 - .string "VATER: Hm...\n" - .string "Du besitzt vier ORDEN.\p" - .string "Fein. Wie versprochen werden wir nun\n" - .string "einen POKéMON-Kampf ausfechten.\p" + .string "DAD: Hm...\n" + .string "So, you did get four GYM BADGES.\p" + .string "Fine, as I promised, we will have a\n" + .string "POKéMON battle.\p" .string "{PLAYER}...\p" - .string "Ich bin so glücklich, dass mein eigenes\n" - .string "Kind stark genug ist, gegen\l" - .string "mich zu kämpfen!\p" - .string "Aber: Kampf ist Kampf!\p" - .string "Ich werde als ARENALEITER alles tun, um\n" - .string "diesen Kampf zu gewinnen!\p" - .string "{PLAYER}, du solltest ebenfalls dein\n" - .string "Bestes geben!$" + .string "I’m so happy that I can have a \n" + .string "real battle with my own child.\p" + .string "But, a battle is a battle!\p" + .string "I will do everything in my power as\n" + .string "a GYM LEADER to win.\p" + .string "{PLAYER}, you’d better give it your\n" + .string "best shot, too!$" PetalburgCity_Gym_Text_17A77A:: @ 817A77A .string "...\p" - .string "Ich... Ich kann es nicht...\p" - .string "Ich kann es nicht glauben, {PLAYER}...\p" - .string "Ich habe gegen {PLAYER} verloren?\p" - .string "Nun, Regeln sind Regeln!\n" - .string "Hier, das ist für dich.$" + .string "I... I can’t...\p" + .string "I can’t believe it. {PLAYER}...\p" + .string "I lost to {PLAYER}?\p" + .string "But, rules are rules!\n" + .string "Here, take this.$" PetalburgCity_Gym_Text_17A7DD:: @ 817A7DD - .string "{PLAYER} hat den BALANCEORDEN vom\n" - .string "VATER erhalten!$" + .string "{PLAYER} received the BALANCE BADGE\n" + .string "from DAD!$" PetalburgCity_Gym_Text_17A805:: @ 817A805 - .string "VATER: Mit diesem ORDEN erhöht sich die\n" - .string "VERTEIDIGUNG all deiner POKéMON.\p" - .string "POKéMON, die die VM SURFER erlernt\n" - .string "haben, können diese auch zum Reisen\l" - .string "über das Wasser einsetzen.\p" - .string "{PLAYER}, das ist mein Geschenk für\n" - .string "dich. Ich bin sicher, du wirst es gut\l" - .string "nutzen.$" + .string "DAD: With that BADGE, the DEFENSE\n" + .string "of all your POKéMON will increase.\p" + .string "POKéMON that know the HM move SURF\n" + .string "will be able to travel over water.\p" + .string "This is my gift to you. {PLAYER}, I’m\n" + .string "sure you can use it correctly.$" PetalburgCity_Gym_Text_17A8CF:: @ 817A8CF - .string "VATER: TM42 enthält FASSADE.\p" - .string "Sie verdoppelt die Stärke der Attacken,\n" - .string "wenn das POKéMON vergiftet,\l" - .string "paralysiert oder verbrannt wurde.\p" - .string "So kann eine vermeintlich aussichtslose\n" - .string "Situation vielleicht gerettet werden.$" + .string "DAD: TM42 contains FACADE.\p" + .string "It doubles the power of moves if\n" + .string "the POKéMON is poisoned, paralyzed,\l" + .string "or burned.\p" + .string "It might be able to turn a bad\n" + .string "situation into an advantage.$" PetalburgCity_Gym_Text_17A976:: @ 817A976 - .string "VATER: Als ARENALEITER kann ich gar\n" - .string "nicht sagen, wie bestürzt ich bin...\p" - .string "Als Vater macht es mich einerseits sehr\n" - .string "stolz, andererseits aber auch traurig...$" + .string "DAD: As the GYM LEADER, I can’t\n" + .string "express how upset I am...\p" + .string "But as a father, it makes me both\n" + .string "happy and a little sad. It’s odd...$" PetalburgCity_Gym_Text_17A9F6:: @ 817A9F6 - .string "VATER: Oh, ja...\p" - .string "Die Eltern von HEIKO sind vor\n" - .string "kurzem hier gewesen.\p" - .string "Sie sagten, dass sie dir etwas schenken\n" - .string "möchten, {PLAYER}.$" + .string "DAD: Oh, yes...\p" + .string "WALLY’s parents came calling\n" + .string "earlier.\p" + .string "They said that they had something\n" + .string "they wanted to give you, {PLAYER}.$" PetalburgCity_Gym_Text_17AA6B:: @ 817AA6B - .string "VATER: {PLAYER}, du solltest deine\n" - .string "Mutter öfter mal besuchen.\p" - .string "Ich bleibe hier und werde mein Training\n" - .string "verdoppeln.\p" - .string "Als TRAINER lässt es mir keine Ruhe. Ich\n" - .string "möchte irgendwann gegen dich gewinnen.$" + .string "DAD: {PLAYER}, you should go visit\n" + .string "your mother every so often.\p" + .string "I’m going to stay here and redouble\n" + .string "my training.\p" + .string "It would bother me as a TRAINER to\n" + .string "not avenge my loss to you, {PLAYER}!$" PetalburgCity_Gym_Text_17AB17:: @ 817AB17 - .string "VATER: {PLAYER}! Wie geht es dir?\p" - .string "Die Welt der POKéMON ist vielfältig.\p" - .string "Ich bin überzeugt, dass selbst das \n" - .string "härteste Training dieser Vielfalt nicht\l" - .string "gerecht wird.$" + .string "DAD: {PLAYER}, how are things going?\p" + .string "The world of POKéMON is deep.\p" + .string "I honestly think that no amount of\n" + .string "training would ever be enough.$" PetalburgCity_Gym_Text_17AB96:: @ 817AB96 - .string "Na, wie sieht es aus, auf dem Weg zum\n" - .string "CHAMP, {PLAYER}?\p" - .string "Die Türen dieser ARENA öffnen sich,\n" - .string "wenn du die einzelnen TRAINER besiegst.\p" - .string "Huups! Die Türen in diesem Raum sind ja\n" - .string "schon offen, greif mich bitte nicht an!\p" - .string "Die TRAINER der ARENA von BLÜTENBURG\n" - .string "CITY setzen die verschiedensten\l" - .string "Items ein.\p" - .string "Die Tür auf der linken Seite führt in den\n" - .string "INIT.-RAUM.\p" - .string "Die Tür auf der rechten Seite führt in\n" - .string "den RAUM der GENAUIGKEIT.\p" - .string "Die Türen sind beschriftet, lies genau\n" - .string "und treffe eine überlegte Wahl.\p" - .string "Hast du dich für eine Tür entschieden...\n" - .string "Nun, ähm, genug der Worte!$" + .string "Hey, how’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "The doors in this GYM open when you\n" + .string "beat the awaiting TRAINERS.\p" + .string "Whoops! The doors in this room are\n" + .string "already open, so don’t attack me!\p" + .string "The TRAINERS of PETALBURG GYM use\n" + .string "all kinds of items.\p" + .string "The door at the left leads to the\n" + .string "SPEED ROOM.\p" + .string "The door at the right leads to the\n" + .string "ACCURACY ROOM.\p" + .string "The room’s name will be on the\n" + .string "door, so choose carefully.\p" + .string "Once you’ve chosen the door...\n" + .string "Well, hey, go for it!$" PetalburgCity_Gym_Text_17AD49:: @ 817AD49 - .string "{PLAYER}! Hui! Du hast sogar deinen\n" - .string "eigenen Vater besiegt!\p" - .string "Wie... Unglaublich!\n" - .string "Die Ereignisse überschlagen sich!$" + .string "{PLAYER}! Whoa! You’ve overcome even\n" + .string "your own father!\p" + .string "Like, whoa!\n" + .string "What a stunning turn of events!$" PetalburgCity_Gym_Text_17ADA5:: @ 817ADA5 - .string "Die Fähigkeit, dem Gegner mit einer\n" - .string "Attacke zuvorzukommen...\p" - .string "Das alleine gibt einem doch schon einen\n" - .string "enormen Vorteil, meinst du nicht auch?$" + .string "The ability to attack before the\n" + .string "opponent...\p" + .string "Just that alone puts me at a great\n" + .string "advantage, don’t you agree?$" PetalburgCity_Gym_Text_17AE11:: @ 817AE11 - .string "Das war ein unglaublicher Kampf!$" + .string "That was a magnificent battle!$" PetalburgCity_Gym_Text_17AE30:: @ 817AE30 - .string "Geh weiter in den nächsten Raum, wo\n" - .string "eine neue Herausforderung wartet.\p" - .string "Auf der linken Seite befindet sich der\n" - .string "KP-SAUGER-RAUM.\p" - .string "Auf der rechten Seite findest du den\n" - .string "RAUM der VERTEIDIGUNG.$" + .string "Go on to the next room where a new\n" + .string "challenge awaits you.\p" + .string "At the left is the ZERO REDUCTION\n" + .string "ROOM.\p" + .string "The right door leads to the DEFENSE\n" + .string "ROOM.$" PetalburgCity_Gym_Text_17AEBB:: @ 817AEBB - .string "Ob du siegst oder verlierst... Du darfst\n" - .string "dein Training und das deiner POKéMON\l" - .string "auf keinen Fall vernachlässigen.\p" - .string "Das macht für mich einen wahren\n" - .string "ARENALEITER aus.$" + .string "Whomever you beat, and whomever you\n" + .string "may lose to, you never shirk from\l" + .string "training yourself and your POKéMON.\p" + .string "That’s what I think being a\n" + .string "GYM LEADER is all about.$" PetalburgCity_Gym_Text_17AF5A:: @ 817AF5A - .string "Verschwende deine kostbare Zeit nicht\n" - .string "damit, die Fähigkeiten meines POKéMON\l" - .string "zu blockieren!$" + .string "Don’t waste your time trying to\n" + .string "lower my POKéMON’s abilities!$" PetalburgCity_Gym_Text_17AF98:: @ 817AF98 - .string "Die Fähigkeiten meines POKéMON wurden\n" - .string "nicht blockiert, und doch habe ich\l" - .string "verloren...$" + .string "My POKéMON’s abilities weren’t\n" + .string "harmed, but I still lost...$" PetalburgCity_Gym_Text_17AFD3:: @ 817AFD3 - .string "Der nächste Raum ist der RAUM der\n" - .string "STÄRKE. Kommst du gegen pure\l" - .string "Gewalt an?$" + .string "The next room is the STRENGTH ROOM.\n" + .string "Can you withstand brute force?$" PetalburgCity_Gym_Text_17B016:: @ 817B016 - .string "Nachdem du unseren ARENALEITER be-\n" - .string "siegt hast, wurde unser Training härter.$" + .string "After you beat our LEADER, the\n" + .string "training has become a lot tougher.$" PetalburgCity_Gym_Text_17B058:: @ 817B058 - .string "Immer, wenn du den Sieg in greifbarer\n" - .string "Nähe siehst, füllt dein Gegner KP auf...\p" - .string "Kannst du dir vorstellen, wie man sich in\n" - .string "so einer Situation fühlt?\p" - .string "Ich werde dir so eine Situation\n" - .string "demonstrieren!$" + .string "Just when you think you’re going to\n" + .string "win, your opponent restores HP...\p" + .string "Can you just imagine how awful that\n" + .string "must feel?\p" + .string "I’ll show you exactly how awful it\n" + .string "feels!$" PetalburgCity_Gym_Text_17B0F7:: @ 817B0F7 - .string "Ich konnte nicht genügend KP\n" - .string "auffüllen... Welch eine ANGRIFFskraft...$" + .string "I couldn’t restore HP enough...\n" + .string "What ATTACK power...$" PetalburgCity_Gym_Text_17B12C:: @ 817B12C - .string "Ich hatte vom Kind unseres ARENA-\n" - .string "LEITERS nichts anderes erwartet!\p" - .string "Nein! Die Fähigkeiten eines TRAINERS\n" - .string "entwickeln sich mit dem Training.\p" - .string "Ich habe mich offensichtlich nicht\n" - .string "genug angestrengt.\p" - .string "Geh! Der nächste Raum ist der K.O.-\n" - .string "TREFFER-RAUM.$" + .string "I should have expected no less from\n" + .string "our LEADER’s kid.\p" + .string "No, wait! A TRAINER’s abilities are\n" + .string "earned only through effort.\p" + .string "I lost because my own efforts\n" + .string "weren’t enough.\p" + .string "Go on! The ONE-HIT KO ROOM is next.$" PetalburgCity_Gym_Text_17B1F4:: @ 817B1F4 - .string "Ich werde auch weiterhin in den ARENEN\n" - .string "trainieren. Und ARENALEITER werden!$" + .string "I’m going to keep training at GYMS.\n" + .string "One day, I’ll become a LEADER.$" PetalburgCity_Gym_Text_17B237:: @ 817B237 - .string "Ich werde es dir nicht leicht machen,\n" - .string "nur weil du das Kind unseres LEITERS\l" - .string "bist.\p" - .string "Ich werde dir beibringen, was es für ein\n" - .string "POKéMON bedeutet, einen kritischen\l" - .string "Schlag zu erhalten.$" + .string "I’m not going to take it easy just\n" + .string "because you’re our LEADER’s kid.\p" + .string "I’ll show you how horrid it is for\n" + .string "a POKéMON to take a critical hit!$" PetalburgCity_Gym_Text_17B2C0:: @ 817B2C0 - .string "Deine Stärke...\n" - .string "Du kämpfst großartig!$" + .string "Your power...\n" + .string "You’re the real deal.$" PetalburgCity_Gym_Text_17B2E4:: @ 817B2E4 - .string "Dein Vater ist stark. Als TRAINER\n" - .string "erweise ich ihm den größten Respekt.\p" - .string "Und ich sehe, dass die gleiche Stärke\n" - .string "auch in dir ruht.\p" - .string "Ich fühle, dass du dich nun einem\n" - .string "Kampf mit deinem Vater stellen kannst.$" + .string "Your father really is strong. He’s\n" + .string "a TRAINER worth my respect.\p" + .string "And, I sense the same glow coming\n" + .string "from you as your father.\p" + .string "I hope that you’ll stage a terrific\n" + .string "battle with your father!$" PetalburgCity_Gym_Text_17B39B:: @ 817B39B - .string "Seit dein Vater der LEITER der ARENA\n" - .string "von BLÜTENBURG CITY ist, sind die\l" - .string "TRAINER dort viel stärker geworden.$" + .string "Since your dad became the LEADER,\n" + .string "the TRAINERS of PETALBURG CITY have\l" + .string "become a lot tougher.$" PetalburgCity_Gym_Text_17B3F7:: @ 817B3F7 - .string "Kicher...\n" - .string "Dies ist der RAUM der GENAUIGKEIT.\p" - .string "Es ist schon ziemlich fies, wenn jede\n" - .string "Attacke ein Treffer ist.$" + .string "Giggle...\n" + .string "This is the ACCURACY ROOM.\p" + .string "It’s pretty nasty when every attack\n" + .string "lands without fail.$" PetalburgCity_Gym_Text_17B454:: @ 817B454 - .string "Du bist ein bisschen stärker als ich...$" + .string "You were a cut above me...$" PetalburgCity_Gym_Text_17B46F:: @ 817B46F - .string "Es warten noch weitaus stärkere\n" - .string "TRAINER auf dich.\p" - .string "Der linke ist der RAUM der VERTEIDIGUNG\n" - .string "und der rechte der RAUM der ERHOLUNG.\p" - .string "Die ATTACKEN deiner POKéMON werden\n" - .string "in beiden Räumen auf die Probe gestellt.$" + .string "There are some even stronger\n" + .string "TRAINERS waiting for you.\p" + .string "The left is the DEFENSE ROOM, and\n" + .string "the right is the RECOVERY ROOM.\p" + .string "Your POKéMON’s ATTACK power will be\n" + .string "on trial either way.$" PetalburgCity_Gym_Text_17B521:: @ 817B521 - .string "Weißt du, wonach wir als TRAINER\n" - .string "streben?\p" - .string "Wir streben danach, die Seelenfreunde\n" - .string "unserer POKéMON zu werden.$" + .string "Do you know what we’re trying to\n" + .string "achieve as TRAINERS?\p" + .string "We’re striving to become soul mates\n" + .string "with our POKéMON.$" PetalburgCity_Gym_Text_17B58D:: @ 817B58D - .string "Je stärker die VERTEIDIGUNG ist, desto\n" - .string "rücksichtsloser kann ich angreifen.$" + .string "The higher the DEFENSE, the more\n" + .string "reckless I can be in attack.$" PetalburgCity_Gym_Text_17B5CB:: @ 817B5CB - .string "Unsere Verteidigung reichte nicht aus...$" + .string "Our defenses weren’t enough...$" PetalburgCity_Gym_Text_17B5EA:: @ 817B5EA - .string "Ich denke, du hast mir eine wertvolle\n" - .string "Lektion erteilt.\p" - .string "Nun, geh weiter. Die linke Tür führt in\n" - .string "den RAUM der STÄRKE.\p" - .string "Die rechte Tür öffnet den K.O.-TREFFER-\n" - .string "RAUM.\p" - .string "In beiden warten äußerst talentierte\n" - .string "TRAINER.$" + .string "I think you’ve taught me a valuable\n" + .string "lesson here.\p" + .string "Now, go on! The left door goes to\n" + .string "the STRENGTH ROOM.\p" + .string "The right door opens to the\n" + .string "ONE-HIT KO ROOM.\p" + .string "Both of them have TRAINERS who are\n" + .string "offensively skilled.$" PetalburgCity_Gym_Text_17B6B5:: @ 817B6B5 - .string "Hallo! Hast du mal SURFER ausprobiert?$" + .string "Hi! Have you tried using SURF?$" PetalburgCity_Gym_Text_17B6D4:: @ 817B6D4 - .string "Unser ARENALEITER hat uns angewiesen,\n" - .string "alles zu geben und dich zu besiegen.\p" - .string "Auch wenn du das Kind des LEITERS bist!$" + .string "Our GYM LEADER told us to go all out\n" + .string "and beat you.\p" + .string "Even if you happen to be the\n" + .string "LEADER’s kid!$" PetalburgCity_Gym_Text_17B732:: @ 817B732 - .string "Aber... Das war wohl nichts!$" + .string "But... I went all out!$" PetalburgCity_Gym_Text_17B749:: @ 817B749 - .string "Wie du deine POKéMON einsetzt...\n" - .string "Du bist wie dein Vater.\p" - .string "Geh weiter! Der ARENALEITER, dein\n" - .string "Vater, erwartet dich bereits!$" + .string "The way you use your POKéMON...\n" + .string "It’s like your father’s style.\p" + .string "Go on through! The GYM LEADER, your\n" + .string "father, is waiting!$" PetalburgCity_Gym_Text_17B7C0:: @ 817B7C0 - .string "Sicher, es ist immer von Vorteil, die\n" - .string "POKéMON stärker werden zu lassen.\p" - .string "Aber was macht einen Gewinner aus?\p" - .string "Nun, das sind die Gefühle, die ein\n" - .string "TRAINER seinen POKéMON entgegen-\l" - .string "bringt.$" + .string "Sure, it’s fine to make your POKéMON\n" + .string "stronger.\p" + .string "But what decides the winner?\p" + .string "Why, it’s the feelings TRAINERS have for\n" + .string "their POKéMON.$" PetalburgCity_Gym_Text_17B844:: @ 817B844 - .string "Die Tür ist noch verschlossen...$" + .string "This door appears to be locked\n" + .string "right now...$" PetalburgCity_Gym_Text_17B870:: @ 817B870 - .string "“INITIATIVE-RAUM” steht auf\n" - .string "dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“SPEED ROOM,” the sign says.\p" + .string "Do you want to go through?$" UnknownString_817B8A8: @ 817B8A8 - .string "Die Tür ist noch verschlossen...$" + .string "This door appears to be locked\n" + .string "right now...$" PetalburgCity_Gym_Text_17B8D4:: @ 817B8D4 - .string "“RAUM der GENAUIGKEIT” steht\n" - .string "auf dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“ACCURACY ROOM,” the sign says.\p" + .string "Do you want to go through?$" PetalburgCity_Gym_Text_17B90F:: @ 817B90F - .string "“KP-SAUGER-RAUM”\n" - .string "steht auf dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“ZERO REDUCTION ROOM,” the sign\n" + .string "says.\p" + .string "Do you want to go through?$" PetalburgCity_Gym_Text_17B950:: @ 817B950 - .string "“RAUM der VERTEIDIGUNG” steht\n" - .string "auf dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“DEFENSE ROOM,” the sign says.\p" + .string "Do you want to go through?$" PetalburgCity_Gym_Text_17B98A:: @ 817B98A - .string "“RAUM der ERHOLUNG” steht auf\n" - .string "dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“RECOVERY ROOM,” the sign says.\p" + .string "Do you want to go through?$" PetalburgCity_Gym_Text_17B9C5:: @ 817B9C5 - .string "“RAUM der STÄRKE” steht auf\n" - .string "dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“STRENGTH ROOM,” the sign says.\p" + .string "Do you want to go through?$" PetalburgCity_Gym_Text_17BA00:: @ 817BA00 - .string "“K.O.-TREFFER-RAUM”\n" - .string "steht auf dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“ONE-HIT KO ROOM,” the sign says.\p" + .string "Do you want to go through?$" PetalburgCity_Gym_Text_17BA3D:: @ 817BA3D - .string "“ARENALEITER”\p" - .string "“Sieh selbst, welche POKéMON dich\n" - .string "erwarten!” steht auf dem Schild.\p" - .string "Möchtest du die Tür öffnen?$" + .string "“GYM LEADER’S ROOM\p" + .string "“See for yourself what POKéMON await\n" + .string "you!” the sign says.\p" + .string "Do you want to go through?$" PetalburgCity_Gym_Text_17BAA5:: @ 817BAA5 - .string "POKéMON ARENA von BLÜTENBURG CITY$" + .string "PETALBURG CITY POKéMON GYM$" PetalburgCity_Gym_Text_17BAC0:: @ 817BAC0 - .string "POKéMON ARENA von BLÜTENBURG CITY\p" - .string "NORMANS ANERKANNTE TRAINER:\n" + .string "PETALBURG CITY POKéMON GYM\p" + .string "NORMAN’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/PetalburgCity_House1.inc b/data/text/maps/PetalburgCity_House1.inc index 84bc33fed..d41fadd1f 100644 --- a/data/text/maps/PetalburgCity_House1.inc +++ b/data/text/maps/PetalburgCity_House1.inc @@ -1,15 +1,16 @@ PetalburgCity_House1_Text_17BAFB:: @ 817BAFB - .string "Reisen ist einfach wundervoll!\p" - .string "Als ich noch jung war, waren die See und\n" - .string "die Berge mein Zuhause.$" + .string "Traveling is wonderful!\p" + .string "When I was young, I roamed the seas\n" + .string "and the mountains!$" PetalburgCity_House1_Text_17BB4A:: @ 817BB4A - .string "Seufz...\p" - .string "Ich wünschte, ich könnte mit einigen\n" - .string "POKéMON auf Abenteuerreise gehen...\p" - .string "Sich durch hohes Gras schleichen...\n" - .string "Steile, zerklüftete Berge erklimmen...\p" - .string "Das tosende Meer überqueren...\n" - .string "Dunkle Höhlen erforschen...\p" - .string "Und manchmal ein wenig Heimweh haben...\p" - .string "Reisen muss einfach toll sein!$" + .string "Sigh...\p" + .string "I wish I could go on an adventure\n" + .string "with some POKéMON...\p" + .string "Crawl through some damp grass...\n" + .string "Climb rocky, rugged mountains...\p" + .string "Cross the raging seas...\n" + .string "Wander about in dark caves...\p" + .string "And, sometimes, even get a little\n" + .string "homesick...\p" + .string "It must be fabulous to travel!$" diff --git a/data/text/maps/PetalburgCity_House2.inc b/data/text/maps/PetalburgCity_House2.inc index 35af2bb8b..426dac360 100644 --- a/data/text/maps/PetalburgCity_House2.inc +++ b/data/text/maps/PetalburgCity_House2.inc @@ -1,11 +1,12 @@ PetalburgCity_House2_Text_17BC4F:: @ 817BC4F - .string "NORMAN ist unser neuer ARENALEITER.\p" - .string "Ich glaube, er ist mit seiner Familie aus\n" - .string "der JOHTO-Region hier hergezogen.$" + .string "NORMAN became our town’s new GYM\n" + .string "LEADER.\p" + .string "I think he called his family over from\n" + .string "the JOHTO region.$" PetalburgCity_House2_Text_17BCB1:: @ 817BCB1 - .string "Ich bin erst einmal gegen NORMAN\n" - .string "angetreten. Wow, war der stark!\p" - .string "Wie soll ich es sagen?\p" - .string "Ich habe den Eindruck, er lebt für\n" - .string "seine POKéMON.$" + .string "I battled NORMAN once, but, whew,\n" + .string "he was way too strong.\p" + .string "How would I put it?\p" + .string "I just got the feeling that he\n" + .string "lives for POKéMON.$" diff --git a/data/text/maps/PetalburgCity_Mart.inc b/data/text/maps/PetalburgCity_Mart.inc index 988502492..d6fcc6fff 100644 --- a/data/text/maps/PetalburgCity_Mart.inc +++ b/data/text/maps/PetalburgCity_Mart.inc @@ -1,16 +1,17 @@ PetalburgCity_Mart_Text_17BFFD:: @ 817BFFD - .string "Auch wenn ein POKéMON jetzt noch\n" - .string "schwach ist - es wird ständig stärker.\p" - .string "Das Schlüsselwort heißt Liebe!\n" - .string "Liebe für deine POKéMON!$" + .string "Even if a POKéMON is weak now,\n" + .string "it will grow stronger.\p" + .string "The most important thing is love!\n" + .string "Love for your POKéMON!$" PetalburgCity_Mart_Text_17C06C:: @ 817C06C - .string "Setzt du SCHUTZ ein?\n" - .string "Das hält POKéMON fern und ist sehr\l" - .string "nützlich, wenn du es eilig hast.$" + .string "Do you use REPEL?\n" + .string "It keeps POKéMON away, so it’s\l" + .string "useful when you’re in a hurry.$" PetalburgCity_Mart_Text_17C0BC:: @ 817C0BC - .string "Hast du etwas GEGENGIFT dabei?\p" - .string "Ein vergiftetes POKéMON verliert\n" - .string "ständig KP, bis es kampfunfähig wird.\l" - .string "Halte deshalb stets GEGENGIFT bereit!$" + .string "Do you have any ANTIDOTES with\n" + .string "you?\p" + .string "If you walk around with a poisoned\n" + .string "POKéMON, it will lose HP until it faints.\l" + .string "Take some ANTIDOTES with you.$" diff --git a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc b/data/text/maps/PetalburgCity_PokemonCenter_1F.inc index 15235279a..1c4689672 100644 --- a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/text/maps/PetalburgCity_PokemonCenter_1F.inc @@ -1,39 +1,39 @@ PetalburgCity_PokemonCenter_1F_Text_17BD30:: @ 817BD30 - .string "Computerbasiertes POKéMON-Lagerungs-\n" - .string "System...\p" - .string "Wer auch immer dies entwickelt hat, muss\n" - .string "ein wahrer Zauberer sein!$" + .string "That PC-based POKéMON storage\n" + .string "system...\p" + .string "Whoever made it must be some kind\n" + .string "of a scientific wizard!$" PetalburgCity_PokemonCenter_1F_Text_17BD92:: @ 817BD92 - .string "Als mein POKéMON eine SINELBEERE\n" - .string "aß, wurden seine KP aufgefüllt!$" + .string "When my POKéMON ate an\n" + .string "ORAN BERRY, it regained HP!$" PetalburgCity_PokemonCenter_1F_Text_17BDC5:: @ 817BDC5 - .string "Es gibt viele Typen von POKéMON.\p" - .string "Jeder Typ hat seine Stärken und\n" - .string "Schwächen gegenüber anderen Typen.\p" - .string "Je nach Typ des POKéMON kann der\n" - .string "Kampf leicht oder schwer sein.$" + .string "There are many types of POKéMON.\p" + .string "All types have their strengths and\n" + .string "weaknesses against other types.\p" + .string "Depending on the types of POKéMON,\n" + .string "a battle could be easy or hard.$" PetalburgCity_PokemonCenter_1F_Text_17BE6C:: @ 817BE6C - .string "Dein GECKARBOR ist beispielsweise ein\n" - .string "PFLANZEN-Typ.\p" - .string "Es ist stark gegenüber dem WASSER-\n" - .string "und BODEN-Typ.\p" - .string "Aber es ist schwach gegenüber den\n" - .string "FEUER-POKéMON.$" + .string "For example, your TREECKO is a\n" + .string "GRASS type.\p" + .string "It’s strong against the WATER and\n" + .string "GROUND types.\p" + .string "But, it’s weak against FIRE-type\n" + .string "POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_17BEF1:: @ 817BEF1 - .string "Dein FLEMMLI ist beispielsweise ein\n" - .string "FEUER-Typ.\p" - .string "Es ist stark gegenüber dem PFLANZEN-\n" - .string "und KÄFER-Typ.\p" - .string "Aber es ist schwach gegenüber den\n" - .string "WASSER-POKéMON.$" + .string "For example, your TORCHIC is a\n" + .string "FIRE type.\p" + .string "It’s strong against the GRASS and\n" + .string "BUG types.\p" + .string "But, it’s weak against WATER-type\n" + .string "POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_17BF73:: @ 817BF73 - .string "Dein HYDROPI ist beispielsweise ein\n" - .string "WASSER-Typ.\p" - .string "Es ist stark gegenüber dem FEUER-Typ.\p" - .string "Aber es ist schwach gegenüber den\n" - .string "PFLANZEN- und ELEKTRO-POKéMON.$" + .string "For example, your MUDKIP is a\n" + .string "WATER type.\p" + .string "It’s strong against the FIRE type.\p" + .string "But, it’s weak against GRASS-type\n" + .string "and ELECTRIC-type POKéMON.$" diff --git a/data/text/maps/PetalburgCity_WallysHouse.inc b/data/text/maps/PetalburgCity_WallysHouse.inc index 6eade6f20..888dfbc91 100644 --- a/data/text/maps/PetalburgCity_WallysHouse.inc +++ b/data/text/maps/PetalburgCity_WallysHouse.inc @@ -1,77 +1,72 @@ PetalburgCity_WallysHouse_Text_179805:: @ 8179805 - .string "Du...\n" - .string "Ach, du bist bestimmt {PLAYER}{KUN}, richtig?\p" - .string "Danke, dass du dich um HEIKO gekümmert\n" - .string "hast.\p" - .string "Er war schon als Baby immer zart und\n" - .string "kränklich.\p" - .string "Wir haben ihn für eine Weile zu\n" - .string "Verwandten nach WIESENFLUR\l" - .string "geschickt.\p" - .string "Die Luft ist dort viel sauberer als hier.\p" - .string "Was heißt das? Wo ist HEIKO?\n" - .string "Er ist fort, unser HEIKO?\p" - .string "Ich frage mich, wo er jetzt wohl sein\n" - .string "mag?$" + .string "You’re...\n" + .string "Ah, you must be {PLAYER}{KUN}, right?\p" + .string "Thank you for playing with WALLY a\n" + .string "little while ago.\p" + .string "He’s been frail and sickly ever\n" + .string "since he was a baby.\p" + .string "We’ve sent him to stay with my relatives\n" + .string "in VERDANTURF TOWN for a while.\p" + .string "The air is a lot cleaner there\n" + .string "than it is here.\p" + .string "What’s that? Where’s WALLY?\n" + .string "He’s already left, our WALLY.\p" + .string "I wonder where he could have\n" + .string "gotten by now?$" PetalburgCity_WallysHouse_Text_179975:: @ 8179975 - .string "Ich frage mich, wie es unserem\n" - .string "HEIKO geht.$" + .string "I wonder how our WALLY is doing?$" PetalburgCity_WallysHouse_Text_179996:: @ 8179996 - .string "Hallo, {PLAYER}{KUN}!\p" - .string "Unser HEIKO ist viel robuster ge-\n" - .string "worden, seit er in WIESENFLUR ist.\p" - .string "Das verdanken wir allein dir!\p" - .string "Als HEIKO den Ort verließ, hast du\n" - .string "ihm geholfen, ein POKéMON zu fangen,\l" - .string "stimmt’s?\p" - .string "Ich glaube, das hat HEIKO richtig\n" - .string "glücklich gemacht.\p" - .string "Und nicht nur HEIKO. Auch mich als\n" - .string "Vater hat es sehr glücklich gemacht.\p" - .string "Glücklich darüber, dass er einen Freund\n" - .string "wie dich gefunden hat.\p" - .string "Das soll jetzt keine Bestechung sein!\n" - .string "Aber ich möchte dir dies schenken.$" + .string "Hi there, {PLAYER}{KUN}!\p" + .string "Our WALLY’s become very healthy\n" + .string "since he went to VERDANTURF TOWN.\p" + .string "We owe it all to you!\p" + .string "When WALLY left town, you helped\n" + .string "him catch a POKéMON, right?\p" + .string "I think that made WALLY really\n" + .string "happy.\p" + .string "Actually, not just WALLY.\n" + .string "It made me, his father, happy too.\p" + .string "Happy that he’s got such a great\n" + .string "friend as you.\p" + .string "This isn’t a bribe or anything, but\n" + .string "I’d really like you to have this.$" PetalburgCity_WallysHouse_Text_179B14:: @ 8179B14 - .string "Wenn dein POKéMON SURFER beherrscht,\n" - .string "kannst du viele neue Orte bereisen.$" + .string "If your POKéMON can SURF, you’ll be\n" + .string "able to go to all sorts of places.$" PetalburgCity_WallysHouse_Text_179B5B:: @ 8179B5B - .string "HEIKO wird bald wieder nach Hause\n" - .string "kommen. Ich freue mich schon so.$" + .string "WALLY’s coming home soon.\n" + .string "I’m looking forward to that.$" PetalburgCity_WallysHouse_Text_179B92:: @ 8179B92 - .string "Oh! Du hast HEIKO in PRACHTPOLIS CITY\n" - .string "getroffen?\p" - .string "Ach, {PLAYER}{KUN}, du willst mich auf den Arm\n" - .string "nehmen!\p" - .string "Er mag sich gesundheitlich erholt haben,\n" - .string "aber er wird nicht alleine so weit fort-\l" - .string "gegangen sein!$" + .string "Oh? You met WALLY in EVER GRANDE\n" + .string "CITY?\p" + .string "Oh, {PLAYER}{KUN}, don’t be silly.\p" + .string "He may have gotten healthy, but he\n" + .string "can’t go somewhere far away like\l" + .string "that all by himself.$" PetalburgCity_WallysHouse_Text_179C2C:: @ 8179C2C - .string "HEIKO war richtig glücklich, als er\n" - .string "uns erzählte, dass er ein POKéMON\l" - .string "gefangen habe.\p" - .string "Ich habe ihn schon seit Ewigkeiten\n" - .string "nicht mehr so glücklich erlebt!$" + .string "WALLY was really happy when he told\n" + .string "us that he caught a POKéMON.\p" + .string "It’s been ages since I’ve seen him\n" + .string "smile like that.$" PetalburgCity_WallysHouse_Text_179CA1:: @ 8179CA1 - .string "Oh, hallo {PLAYER}! Wir haben hier etwas,\n" - .string "das wir dir gerne schenken möchten.\p" - .string "Mein Mann hat es. Sprich doch mal mit\n" - .string "ihm, Liebes.$" + .string "Oh, hello, {PLAYER}! We’ve got\n" + .string "something we want you to have.\p" + .string "My husband has it, so please have a\n" + .string "word with him, dear.$" PetalburgCity_WallysHouse_Text_179D12:: @ 8179D12 - .string "Ich muss das vor meinem Mann\n" - .string "verheimlichen...\p" - .string "Aber unser HEIKO hat WIESENFLUR\n" - .string "verlassen, ohne jemandem davon zu\l" - .string "erzählen.\p" - .string "Weißt du, HEIKO ist nicht kräftig,\n" - .string "besitzt aber einen starken Willen.\p" - .string "Ich bin sicher, er wird gesund und wohl-\n" - .string "behalten wieder nach Hause kommen.$" + .string "I want you to keep this a secret\n" + .string "from my husband...\p" + .string "But our WALLY left VERDANTURF TOWN\n" + .string "without telling anyone.\p" + .string "You know, WALLY is frail, but\n" + .string "he’s surprisingly strong-willed.\p" + .string "I’m sure that he’ll come back safe\n" + .string "and sound one day!$" diff --git a/data/text/maps/PetalburgWoods.inc b/data/text/maps/PetalburgWoods.inc index da1f43b40..21a04dcc8 100644 --- a/data/text/maps/PetalburgWoods.inc +++ b/data/text/maps/PetalburgWoods.inc @@ -1,152 +1,145 @@ PetalburgWoods_Text_194D71:: @ 8194D71 .string "Hmmm...\n" - .string "Kein Einziges zu finden.$" + .string "Not a one to be found...$" PetalburgWoods_Text_194D92:: @ 8194D92 - .string "Hallo, du hast nicht zufällig einige\n" - .string "POKéMON namens KNILZ hier\p" - .string "gesehen? Ich liebe diese POKéMON.$" + .string "Hello, have you seen any POKéMON\n" + .string "called SHROOMISH around here?\p" + .string "I really love that POKéMON.$" PetalburgWoods_Text_194DED:: @ 8194DED - .string "Ich wollte dich eigentlich aus dem\n" - .string "Hinterhalt angreifen, aber du trödelst\l" - .string "wohl auf ewig im BLÜTENBURGWALD\l" - .string "herum, oder?\p" - .string "Das Warten machte mich ganz krank.\n" - .string "Also, hier bin ich.$" + .string "I was going to ambush you, but you\n" + .string "had to dawdle in PETALBURG WOODS\l" + .string "forever, didn’t you?\p" + .string "I got sick of waiting, so here I am!$" PetalburgWoods_Text_194E6B:: @ 8194E6B - .string "He, du! FORSCHER von DEVON!\p" - .string "Gib sofort die Papiere her!$" + .string "You! DEVON RESEARCHER!\p" + .string "Hand over those papers!$" PetalburgWoods_Text_194E9A:: @ 8194E9A - .string "Attackeee!\p" - .string "Du bist ein POKéMON-TRAINER, oder?\n" - .string "Du musst mir bitte helfen!$" + .string "Aiyeeeh!\p" + .string "You’re a POKéMON TRAINER, aren’t you?\n" + .string "You’ve got to help me, please!$" PetalburgWoods_Text_194EE8:: @ 8194EE8 - .string "Huch. Was machst du da eigentlich???\n" - .string "Was?!? Du schützt ihn???\p" - .string "Niemand, der sich TEAM {EVIL_TEAM} in den Weg\n" - .string "stellt, kann auf Gnade hoffen. Niemand!\p" - .string "Los, kämpfe gegen uns!$" + .string "Hunh? What do you think you’re doing?\n" + .string "What, you’re going to protect him?\p" + .string "No one who crosses TEAM {EVIL_TEAM}\n" + .string "gets any mercy, not even a kid!\p" + .string "Come on and battle me!$" PetalburgWoods_Text_194F83:: @ 8194F83 - .string "Du hast mich geleimt! Du bist stark!$" + .string "You’re kidding me! You’re tough!$" PetalburgWoods_Text_194FA4:: @ 8194FA4 - .string "Grrr... Du hast vielleicht Nerven, dich\n" - .string "mit TEAM {EVIL_TEAM} anzulegen!\l" - .string "Los, kämpfen wir noch einmal!\p" - .string "Hm, das würde ich jetzt zu gerne sagen,\n" - .string "aber ich habe keine POKéMON mehr...\p" - .string "Außerdem sind wir, TEAM {EVIL_TEAM}, auf dem\n" - .string "Weg nach METAROST CITY.\p" - .string "Für heute lasse ich dich gehen.$" + .string "Grrr... You’ve got some nerve\n" + .string "meddling with TEAM {EVIL_TEAM}!\l" + .string "Come on and battle me again!\p" + .string "I wish I could say that, but I’m out of\n" + .string "POKéMON...\p" + .string "And, hey, we of TEAM {EVIL_TEAM} are also\n" + .string "after something in RUSTBORO.\p" + .string "I’ll let you go today!$" PetalburgWoods_Text_19507E:: @ 819507E - .string "Huuuh...\n" - .string "Das war aber mehr als knapp!\p" - .string "Dank dir konnte er mir diese\n" - .string "wichtigen Papiere nicht rauben.\p" - .string "Ich weiß! Ich gebe dir diesen\n" - .string "SUPERBALL als Dankeschön!$" + .string "Whew...\n" + .string "That was awfully close!\p" + .string "Thanks to you, he didn’t rob me of\n" + .string "these important papers.\p" + .string "I know, I’ll give you a GREAT BALL as\n" + .string "my thanks!$" PetalburgWoods_Text_19510A:: @ 819510A - .string "Hat dieser Schuft von TEAM {EVIL_TEAM} nicht\n" - .string "gesagt, dass sie irgendetwas in\l" - .string "METAROST CITY erledigen wollen?$" + .string "Didn’t that TEAM {EVIL_TEAM} thug say\n" + .string "they were after something in\l" + .string "RUSTBORO, too?$" PetalburgWoods_Text_195153:: @ 8195153 - .string "Oh oh! Das ist ein Notfall!\n" - .string "Ich darf keine Zeit verlieren!$" + .string "Uh-oh! It’s a crisis!\n" + .string "I can’t be wasting time!$" PetalburgWoods_Text_195182:: @ 8195182 - .string "Du bist mit Items überfrachtet.\n" - .string "Ich kann dir den SUPERBALL nicht geben.$" + .string "You’re loaded with items.\n" + .string "I can’t give you this GREAT BALL.$" PetalburgWoods_Text_1951BE:: @ 81951BE - .string "Ich habe eine Menge POKéMON gefangen!\p" - .string "Los, los, los!\n" - .string "Mein KÄFER-POKéMON Team!$" + .string "I caught a whole bunch of POKéMON!\p" + .string "Go, go, go!\n" + .string "My BUG POKéMON team!$" PetalburgWoods_Text_195202:: @ 8195202 - .string "Ich habe all diese POKéMON, aber ich\n" - .string "konnte doch nicht gewinnen...$" + .string "I have all these POKéMON, but I\n" + .string "couldn’t win...$" PetalburgWoods_Text_195232:: @ 8195232 - .string "Ich habe eine Menge POKéMON gefangen.\n" - .string "Nun habe ich keine POKéBÄLLE mehr.$" + .string "I caught a bunch of POKéMON.\n" + .string "Now I’m out of POKé BALLS.$" PetalburgWoods_Text_19526A:: @ 819526A - .string "Wenn du ein KÄFER-POKéMON mit zur\n" - .string "Schule bringst, bist du sofort beliebt.$" + .string "If you take BUG POKéMON to school,\n" + .string "you get to be instantly popular!$" PetalburgWoods_Text_1952AE:: @ 81952AE - .string "Wenn ich verliere, kann ich nicht\n" - .string "beliebt werden.$" + .string "I can’t be popular if I lose.$" PetalburgWoods_Text_1952CC:: @ 81952CC - .string "Hast du ein großes KÄFER-POKéMON,\n" - .string "werden die Leute dich respektieren.$" + .string "If you have a big BUG POKéMON, people\n" + .string "respect you for it.$" PetalburgWoods_Text_195306:: @ 8195306 - .string "Meine KÄFER-POKéMON sind gewachsen.\n" - .string "Ich werde wieder beliebt sein.$" + .string "My BUG POKéMON have grown.\n" + .string "I’ll be popular again.$" PetalburgWoods_Text_195338:: @ 8195338 - .string "Ich werde nie beliebt, wenn ich\n" - .string "immer verliere.$" + .string "I can’t be popular if I lose.$" PetalburgWoods_Text_195356:: @ 8195356 - .string "Du wirst beliebt, wenn du starke\n" - .string "POKéMON besitzt, oder?\l" - .string "Daher trainiere ich bis zum Umfallen.$" + .string "You get to be popular if you have\n" + .string "strong POKéMON, right?\l" + .string "So, I’ve been training hard.$" PetalburgWoods_Text_1953AC:: @ 81953AC - .string "Hey, du!\n" - .string "Geht es deinen POKéMON gut?\p" - .string "Wenn deine POKéMON schwach sind und\n" - .string "du Kämpfe vermeiden willst, solltest du\l" - .string "dich von hohem Gras fernhalten.$" + .string "Yo, there!\n" + .string "Your POKéMON doing okay?\p" + .string "If your POKéMON are weak and you want\n" + .string "to avoid battles, you should stay out\l" + .string "of tall grass.$" PetalburgWoods_Text_19542B:: @ 819542B - .string "Manchmal liegen auf dem Boden Dinge, die\n" - .string "einem auf Anhieb gar nicht auffallen.\p" - .string "Daher schaue ich mich bei jedem Schritt\n" - .string "sorgfältig um.$" + .string "Sometimes, there are things on the\n" + .string "ground even if you can’t see them.\p" + .string "That’s why I always check where I’m\n" + .string "walking.$" PetalburgWoods_Text_19549E:: @ 819549E - .string "Oh, hübsch! Das ist der ORDEN\n" - .string "der ARENA in METAROST CITY!\p" - .string "Du siehst wie ein TRAINER aus. Dann\n" - .string "musst du dieses Item ausprobieren.$" + .string "Oh, neat!\n" + .string "That’s the BADGE from RUSTBORO GYM!\p" + .string "You must be a TRAINER.\n" + .string "You should try using this item.$" PetalburgWoods_Text_195503:: @ 8195503 - .string "Das ist WUNDERSAAT.\n" - .string "Wenn ein POKéMON sie trägt, werden\l" - .string "die PFLANZEN-Attacken stärker.\p" - .string "Neben der WUNDERSAAT gibt es bestimmt\n" - .string "noch andere nützliche Items, die von\l" - .string "POKéMON getragen werden können.$" + .string "It’s a MIRACLE SEED.\n" + .string "If a POKéMON holds that item, its\l" + .string "GRASS-type moves become stronger.\p" + .string "Besides MIRACLE SEED, I think there are\n" + .string "other convenient items for POKéMON\l" + .string "to hold.$" PetalburgWoods_Text_1955B0:: @ 81955B0 - .string "TIPPS für TRAINER\p" - .string "Jedes POKéMON, das am Kampf teilnimmt,\n" - .string "erhält ERFAHRUNGSPUNKTE, auch wenn es\l" - .string "nur ganz kurz dabei ist.\p" - .string "Setze eines deiner schwachen POKéMON\n" - .string "daher an die Spitze der Liste.\p" - .string "Sobald der Kampf beginnt, wechselst du\n" - .string "es aus. Es wird E-Punkte bekommen und\l" - .string "bleibt trotzdem immer unbeschadet.$" + .string "TRAINER TIPS\p" + .string "Any POKéMON that appears even once\n" + .string "in a battle is awarded EXP Points.\p" + .string "To raise a weak POKéMON, put it at the\n" + .string "top of the team list.\p" + .string "As soon as a battle starts, switch it\n" + .string "out. It will earn EXP Points without\l" + .string "being exposed to any harm.$" PetalburgWoods_Text_1956A6:: @ 81956A6 - .string "TIPPS für TRAINER\p" - .string "Neben den Kraftpunkten (KP) besitzt\n" - .string "ein POKéMON auch Angriffspunkte (AP),\l" - .string "die für die Attacken im Kampf gebraucht\l" - .string "werden.\p" - .string "Wenn ein POKéMON keine AP mehr besitzt,\n" - .string "muss es in ein POKéMON-CENTER gebracht\l" - .string "werden.$" + .string "TRAINER TIPS\p" + .string "In addition to Hit Points (HP), POKéMON\n" + .string "have Power Points (PP) that are used to\l" + .string "make moves during battle.\p" + .string "If a POKéMON runs out of PP, it must be\n" + .string "taken to a POKéMON CENTER.$" diff --git a/data/text/maps/Route101.inc b/data/text/maps/Route101.inc index bbdbb034d..3bfa1ef6e 100644 --- a/data/text/maps/Route101.inc +++ b/data/text/maps/Route101.inc @@ -1,40 +1,39 @@ Route101_Text_16D10E:: @ 816D10E - .string "HI... HIIIILFE!!!$" + .string "H-help me!$" Route101_Text_16D119:: @ 816D119 - .string "HILFE!!! Du dort drüben!\n" - .string "Bitte! HILFE!!!\p" - .string "In meinem BEUTEL...\n" - .string "Da findest du einen POKéBALL!$" + .string "Hello! You over there!\n" + .string "Please! Help!\p" + .string "In my BAG!\n" + .string "There’s a POKé BALL!$" Route101_Text_16D15E:: @ 816D15E - .string "Wo-Wo wi-willst du hin?\n" - .string "Lass mich nicht im Stich!!!$" + .string "Wh-Where are you going?!\n" + .string "Don’t leave me like this!$" Route101_Text_16D191:: @ 816D191 - .string "PROF. BIRK: Puuuh...\p" - .string "Ich habe im hohen Gras POKéMON\n" - .string "studiert, als ich angesprungen wurde.\p" - .string "Du hast mich gerettet.\n" - .string "Vielen, vielen Dank!\p" + .string "PROF. BIRCH: Whew...\p" + .string "I was in the tall grass studying wild\n" + .string "POKéMON when I was jumped.\p" + .string "You saved me.\n" + .string "Thanks a lot!\p" .string "Oh?\p" - .string "Hi, du bist doch {PLAYER}{KUN}!\p" - .string "Aber dies ist nicht der Ort für ein\n" - .string "Schwätzchen, komm doch mit \l" - .string "in mein POKéMON-LABOR, okay?$" + .string "Hi, you’re {PLAYER}{KUN}!\p" + .string "This is not the place to chat, so come\n" + .string "by my POKéMON LAB later, okay?$" Route101_Text_16D25E:: @ 816D25E - .string "Sind deine POKéMON müde, bring sie in\n" - .string "ein POKéMON-CENTER.\p" - .string "In ROSALTSTADT, gleich hier um die\n" - .string "Ecke, gibt es ein POKéMON-CENTER.$" + .string "If POKéMON get tired, take them to\n" + .string "a POKéMON CENTER.\p" + .string "There’s a POKéMON CENTER in OLDALE\n" + .string "TOWN right close by.$" Route101_Text_16D2CB:: @ 816D2CB - .string "Wilde POKéMON springen dich in hohem\n" - .string "Gras gerne an.\p" - .string "Wenn du POKéMON fangen willst, musst\n" - .string "du ins hohe Gras gehen und sie suchen.$" + .string "Wild POKéMON will jump out at you in\n" + .string "tall grass.\p" + .string "If you want to catch POKéMON, you have\n" + .string "to go into the tall grass and search.$" Route101_Text_16D349:: @ 816D349 .string "ROUTE 101\n" - .string "{UP_ARROW} ROSALTSTADT$" + .string "{0x79} OLDALE TOWN$" diff --git a/data/text/maps/Route102.inc b/data/text/maps/Route102.inc index c544db7d5..cf367edc2 100644 --- a/data/text/maps/Route102.inc +++ b/data/text/maps/Route102.inc @@ -1,43 +1,43 @@ PetalburgCity_Text_16D361:: @ 816D361 - .string "HEIKO: {PLAYER}...\n" - .string "POKéMON verstecken sich in hohem Gras\l" - .string "wie diesem hier, oder?\p" - .string "Bitte bleib hier und schau, ob ich sie\n" - .string "auch richtig fange.\p" + .string "WALLY: {PLAYER}...\n" + .string "POKéMON hide in tall grass like this,\l" + .string "don’t they?\p" + .string "Please watch me and see if I can\n" + .string "catch one properly.\p" .string "...Whoa!$" PetalburgCity_Text_16D3DE:: @ 816D3DE - .string "HEIKO: Ich habe es geschafft... Es\n" - .string "gehört mir... Mein POKéMON!!!$" + .string "WALLY: I did it... It’s my...\n" + .string "My POKéMON!$" PetalburgCity_Text_16D408:: @ 816D408 - .string "{PLAYER}, danke schön!\n" - .string "Lass uns zurück zur ARENA gehen!$" + .string "{PLAYER}, thank you!\n" + .string "Let’s go back to the GYM!$" Route102_Text_16D431:: @ 816D431 - .string "Ich... bin nicht groß, ich versinke im\n" - .string "hohen Gras.\p" - .string "Das Gras erreicht meine Nase und...\n" - .string "Hahahaha...\p" - .string "Haaatschiiii!$" + .string "I’m...not very tall, so I sink right\n" + .string "into tall grass.\p" + .string "The grass goes up my nose and...\n" + .string "Fwafwafwafwafwa...\p" + .string "Fwatchoo!$" UnknownString_816D4A5: @ 816D4A5 - .string "Hähähä...\n" - .string "Beobachte mich gut.$" + .string "Fufufufu...\n" + .string "Watch me.$" UnknownString_816D4BB: @ 816D4BB - .string "Ta-daaaaah! Unglaublich, oder?\p" - .string "Es gibt einige Absätze, die man nicht\n" - .string "hochklettern, aber von denen man\l" - .string "herunterspringen kann.$" + .string "Ta-daaaah! Awesome, huh?\p" + .string "There are some ledges that you can’t\n" + .string "climb up, but you can jump down.$" Route102_Text_16D51A:: @ 816D51A - .string "Ich werde jede Menge POKéMON fangen!$" + .string "I’m going to catch a whole bunch of\n" + .string "POKéMON!$" Route102_Text_16D547:: @ 816D547 .string "ROUTE 102\n" - .string "{RIGHT_ARROW} ROSALTSTADT$" + .string "{0x7C} OLDALE TOWN$" Route102_Text_16D55F:: @ 816D55F .string "ROUTE 102\n" - .string "{LEFT_ARROW} BLÜTENBURG CITY$" + .string "{0x7B} PETALBURG CITY$" diff --git a/data/text/maps/Route103.inc b/data/text/maps/Route103.inc index e6e6481b3..ebdedea82 100644 --- a/data/text/maps/Route103.inc +++ b/data/text/maps/Route103.inc @@ -1,66 +1,64 @@ Route103_Text_16D57A:: @ 816D57A - .string "MAIKE: Mal seh’n... Das POKéMON von\n" - .string "ROUTE 103 besitzt...$" + .string "MAY: Let’s see... The POKéMON found\n" + .string "on ROUTE 103 include...$" Route103_Text_16D5B6:: @ 816D5B6 - .string "Oh, hi {PLAYER}{KUN}!\p" - .string "...Oh... Ich seh’ schon. Mein Vater hat dir\n" - .string "ein POKéMON geschenkt.\p" - .string "Wenn wir schon mal hier sind, lass uns\n" - .string "doch kämpfen!\p" - .string "Ich gebe dir einen Vorgeschmack auf\n" - .string "das Leben als TRAINER.$" + .string "Oh, hi, {PLAYER}{KUN}!\p" + .string "...Oh, I see, my dad gave you a\n" + .string "POKéMON as a gift.\p" + .string "Since we’re here, let’s have a quick\n" + .string "battle!\p" + .string "I’ll give you a taste of what being a\n" + .string "TRAINER is like.$" Route103_Text_16D65B:: @ 816D65B - .string "Wow! Das war spitze!\n" - .string "{PLAYER}{KUN}, du bist ein Naturtalent!$" + .string "Wow! That’s great!\n" + .string "{PLAYER}{KUN}, you’re pretty good!$" Route103_Text_16D688:: @ 816D688 - .string "MAIKE: Ich glaube, ich weiß jetzt, warum\n" - .string "mein Vater dich ausgesucht hat.\p" - .string "Ich meine, du hast dein POKéMON erst\n" - .string "sehr kurze Zeit und es mag dich bereits.\p" - .string "Du wirst es einfach haben, dich mit\n" - .string "jeder Art von POKéMON anzufreunden.\p" - .string "Nun wird es aber Zeit, zurück ins LABOR\n" - .string "zu gehen!$" + .string "MAY: I think I know why my dad has an\n" + .string "eye out for you now.\p" + .string "I mean, you just got that POKéMON but\n" + .string "it already likes you.\p" + .string "You might be able to befriend any\n" + .string "kind of POKéMON easily.\p" + .string "Well, it’s time to head back to the\n" + .string "LAB.$" Route103_Text_16D762:: @ 816D762 - .string "BRIX: So... Dieses und dieses lebt an\n" - .string "der ROUTE 103...$" + .string "BRENDAN: Okay, so it’s this one and\n" + .string "that one that live on ROUTE 103...$" Route103_Text_16D7A9:: @ 816D7A9 - .string "Hey, da ist ja {PLAYER}!\p" - .string "...Oh ja. Mein Vater hat dir ein POKéMON\n" - .string "geschenkt, nicht wahr?\p" - .string "Wenn wir schon mal hier sind, lass uns\n" - .string "doch einen kleinen Kampf austragen.\p" - .string "Ich bringe dir bei, was ein TRAINER\n" - .string "wissen muss.$" + .string "Hey, it’s {PLAYER}!\p" + .string "...Oh, yeah, Dad gave you a POKéMON.\p" + .string "Since we’re here, how about a little\n" + .string "battle?\p" + .string "I’ll teach you what being a TRAINER’s\n" + .string "about!$" Route103_Text_16D836:: @ 816D836 - .string "Hey, {PLAYER}, das war gar nicht so übel.$" + .string "Huh, {PLAYER}, you’re not too shabby.$" Route103_Text_16D856:: @ 816D856 - .string "BRIX: Ich denke, ich habe es kapiert.\n" - .string "Ich weiß jetzt, warum mein Vater dich\l" - .string "ausgesucht hat.\p" - .string "Du hast dein POKéMON noch nicht lange,\n" - .string "und doch mag es dich schon.\p" - .string "{PLAYER}, ich glaube, du kannst mit jedem\n" - .string "POKéMON Freundschaft schließen.\p" - .string "Wir sollten nun zurück zum LABOR gehen.$" + .string "BRENDAN: I think I get it.\n" + .string "I think I know why my dad has his eye\l" + .string "out for you now.\p" + .string "Look, your POKéMON already likes you,\n" + .string "even though you just got it.\p" + .string "{PLAYER}, I get the feeling that you\n" + .string "could befriend any POKéMON with ease.\p" + .string "We should head back to the LAB.$" Route103_Text_16D950:: @ 816D950 - .string "Mein POKéMON ist unglaublich müde...\n" - .string "Ich hätte einen TRANK mitnehmen sollen.$" + .string "My POKéMON is staggeringly tired...\n" + .string "I should have brought a POTION...$" Route103_Text_16D996:: @ 816D996 - .string "Wenn du von hier das Meer überquerst,\n" - .string "nimmst du eine Abkürzung nach\l" - .string "ROSALTSTADT.\p" - .string "Hahaha, ist das kein praktischer Tipp?$" + .string "If you cross the sea from here,\n" + .string "it’ll be a shortcut to OLDALE TOWN.\p" + .string "Fufufu, that’s useful, isn’t it?$" Route103_Text_16D9FB:: @ 816D9FB .string "ROUTE 103\n" - .string "{DOWN_ARROW} ROSALTSTADT$" + .string "{0x7A} OLDALE TOWN$" diff --git a/data/text/maps/Route104.inc b/data/text/maps/Route104.inc index e8378ca4b..95f70a7ec 100644 --- a/data/text/maps/Route104.inc +++ b/data/text/maps/Route104.inc @@ -1,88 +1,81 @@ Route104_Text_16DA13:: @ 816DA13 - .string "In dieser Hütte am Meer lebt MR. BRACK.\p" - .string "Er war einst ein stolzer Seemann, der\n" - .string "niemals Angst vor dem Meer hatte.$" + .string "That seaside cottage is where\n" + .string "MR. BRINEY lives.\p" + .string "He was once a mighty sailor who never\n" + .string "feared the sea, however stormy.$" Route104_Text_16DA89:: @ 816DA89 - .string "Das Meer, was?\p" - .string "Ich möchte zu gerne wissen, wie es auf\n" - .string "dem Meeresgrund aussieht...$" + .string "The sea, huh?\p" + .string "I wonder what it’s like at the bottom\n" + .string "of the sea?$" Route104_Text_16DAC9:: @ 816DAC9 - .string "Bevor du einen POKéBALL wirfst,\n" - .string "schwäche das POKéMON erst.\p" - .string "Wenn es vergiftet ist, eine Verbrennung\n" - .string "hat oder schläft, kann es leichter\l" - .string "gefangen werden.$" + .string "If you’re going to throw a POKé BALL,\n" + .string "weaken the wild POKéMON first.\p" + .string "It will be easier to catch if it’s been\n" + .string "poisoned, burned, or lulled to sleep.$" Route104_Text_16DB5C:: @ 816DB5C - .string "Du bist ein gemeiner Dieb, wenn du ver-\n" - .string "suchst, das POKéMON eines anderen zu\l" - .string "stehlen.\p" - .string "Du solltest deine POKéBÄLLE nur auf\n" - .string "wilde POKéMON werfen.$" + .string "You’re a thief if you try to steal\n" + .string "someone else’s POKéMON.\p" + .string "You should throw POKé BALLS only at\n" + .string "wild POKéMON.$" Route104_Text_16DBC9:: @ 816DBC9 - .string "Oh, nein, ich bin kein TRAINER.\p" - .string "Aber es stimmt schon, wenn TRAINER sich\n" - .string "in die Augen schauen, ist das eine\l" - .string "Herausforderung zum Kampf.\p" - .string "Willst du nicht kämpfen, weiche ihren\n" - .string "Blicken aus.$" + .string "Oh, no, I’m not a TRAINER.\p" + .string "But that’s right, if TRAINERS lock eyes,\n" + .string "it’s a challenge to battle.\p" + .string "If you don’t want to battle, stay out\n" + .string "of their sight.$" Route104_Text_16DC5F:: @ 816DC5F - .string "Ich liebe es, meinen Mund voller\n" - .string "Saatkörner zu nehmen und sie dann in\l" - .string "hohem Bogen auszuspucken.\p" - .string "Du kannst dies hier haben, versuch es\n" - .string "einfach mal!\p" - .string "Wende es an einem POKéMON an und es\n" - .string "wird lernen, in schneller Folge\l" - .string "Saatkörner auszuspucken.$" + .string "I like filling my mouth with seeds,\n" + .string "then spitting them out fast!\p" + .string "You can have this, so you try it out!\p" + .string "Use it on a POKéMON, and it will learn\n" + .string "a move for firing seeds rapidly.$" Route104_Text_16DD0E:: @ 816DD0E - .string "Ein Hinweis noch!\p" - .string "Eine TM, eine TECHNISCHE MASCHINE,\n" - .string "kann nur einmal beigebracht werden.\p" - .string "Einmal verwendet, ist sie weg. Denke\n" - .string "zweimal nach, bevor du eine TM nutzt.$" + .string "A word of advice!\p" + .string "A TM, TECHNICAL MACHINE, is good only\n" + .string "for one-time use.\p" + .string "Once you use it, it’s gone.\n" + .string "Think twice before using it!$" Route104_Text_16DD91:: @ 816DD91 - .string "Der BLUMENLADEN verkauft seit kurzem\n" - .string "junge Bäume.\p" - .string "Das macht mich so glücklich, dass ich\n" - .string "ganz viele gekauft habe. Dieses SCHLOH-\l" - .string "KRAUT brauche ich nicht, das schenke\l" - .string "ich dir.$" + .string "This FLOWER SHOP started selling\n" + .string "saplings recently.\p" + .string "It made me so happy, I went overboard\n" + .string "shopping. I don’t need this WHITE HERB\l" + .string "anymore. Would you take it, please?$" Route104_Text_16DE36:: @ 816DE36 - .string "Der BLUMENLADEN verkauft seit kurzem\n" - .string "junge Bäume.\p" - .string "Das macht mich so glücklich, dass ich\n" - .string "ganz viele gekauft habe. Wohin damit?$" + .string "This FLOWER SHOP started selling\n" + .string "saplings recently.\p" + .string "It made me so happy, I went overboard\n" + .string "shopping. Where should I put them?$" Route104_Text_16DEB3:: @ 816DEB3 - .string "MR. BRACKS HÜTTE$" + .string "MR. BRINEY’S COTTAGE$" Route104_Text_16DEC8:: @ 816DEC8 - .string "ROUTE 104\n" - .string "{RIGHT_ARROW} BLÜTENBURG CITY$" + .string "ROUTE 1O4\n" + .string "{0x7C} PETALBURG CITY$" Route104_Text_16DEE3:: @ 816DEE3 - .string "ROUTE 104\n" - .string "{UP_ARROW} METAROST CITY$" + .string "ROUTE 1O4\n" + .string "{0x79} RUSTBORO CITY$" Route104_Text_16DEFD:: @ 816DEFD - .string "BLÜTENTRAUM BLUMENLADEN$" + .string "PRETTY PETAL FLOWER SHOP$" Route104_Text_16DF16:: @ 816DF16 - .string "TIPPS für TRAINER\p" - .string "In der HOENN-Region gibt es Paare von\n" - .string "TRAINERN, die andere zu einem\l" - .string "2-gegen-2 POKéMON-Kampf, einem\l" - .string "DOPPELKAMPF, herausfordern.\p" - .string "In einem DOPPELKAMPF muss der TRAINER\n" - .string "zwei POKéMON antreten lassen. Das \l" - .string "POKéMON links neben der Liste und das\l" - .string "an der Spitze der Liste. Achte also auf\l" - .string "die Reihenfolge der POKéMON.$" + .string "TRAINER TIPS\p" + .string "In the HOENN region there are pairs\n" + .string "of TRAINERS who challenge others\l" + .string "for 2-on-2 POKéMON battles called\l" + .string "DOUBLE BATTLES.\p" + .string "In a DOUBLE BATTLE, the TRAINER must\n" + .string "send out two POKéMON, the one at the\l" + .string "left of the list and the top one.\l" + .string "Watch how POKéMON are lined up.$" diff --git a/data/text/maps/Route104_MrBrineysHouse.inc b/data/text/maps/Route104_MrBrineysHouse.inc index 8d3e36750..37fd0c0e1 100644 --- a/data/text/maps/Route104_MrBrineysHouse.inc +++ b/data/text/maps/Route104_MrBrineysHouse.inc @@ -1,71 +1,67 @@ Route104_MrBrineysHouse_Text_191A82:: @ 8191A82 - .string "MR. BRACK: Warte, Mädchen!\n" - .string "Immer langsam, PECKO!$" + .string "MR. BRINEY: Hold on, lass!\n" + .string "Wait up, PEEKO!$" Route104_MrBrineysHouse_Text_191AAD:: @ 8191AAD - .string "Hm? Du bist {PLAYER}{KUN}!\n" - .string "Du hast meinen Liebling PECKO gerettet!\l" - .string "Wir verdanken dir sehr viel!\p" - .string "Wie bitte?\n" - .string "Du möchtest mit mir segeln?\p" + .string "Hm? You’re {PLAYER}{KUN}!\n" + .string "You saved my darling PEEKO!\l" + .string "We owe so much to you!\p" + .string "What’s that?\n" + .string "You want to sail with me?\p" .string "Hmhm...\p" - .string "Du musst einen BRIEF in FAUSTAUHAVEN\n" - .string "und ein Paket in GRAPHITPORT CITY\l" - .string "abgeben?\p" - .string "Da bist du aber gut beschäftigt!\p" - .string "Aber deine Bitte ist überhaupt kein\n" - .string "Problem für mich.\p" - .string "Bei mir bist du richtig! Wir setzen\n" - .string "Segel Richtung FAUSTAUHAVEN!$" + .string "You have a LETTER bound for DEWFORD\n" + .string "and a package for SLATEPORT, then?\p" + .string "Quite the busy life you must lead!\p" + .string "But, certainly, what you’re asking is\n" + .string "no problem at all.\p" + .string "You’ve come to the right man!\n" + .string "We’ll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_191BFD:: @ 8191BFD - .string "MR. BRACK: FAUSTAUHAVEN, wir kommen!\p" - .string "Anker gelichtet!\n" - .string "PECKO, mein Liebling, wir setzen Segel!$" + .string "MR. BRINEY: DEWFORD, here we come!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" Route104_MrBrineysHouse_Text_191C57:: @ 8191C57 - .string "MR. BRACK: Wirklich?\n" - .string "Deine Besorgungen können warten?\p" - .string "Lass dir Zeit. Ein Wort genügt und wir\n" - .string "setzen Segel.$" + .string "MR. BRINEY: Is that so?\n" + .string "Your deliveries can wait?\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" Route104_MrBrineysHouse_Text_191CC3:: @ 8191CC3 - .string "MR. BRACK: Ahoi! Ich weiß genau,\n" - .string "was du jetzt sagen willst!\p" - .string "Du musst einen BRIEF in FAUSTAUHAVEN\n" - .string "und ein Paket in GRAPHITPORT CITY\l" - .string "abgeben.\p" - .string "Nun, ich bin der richtige Mann für\n" - .string "diesen Job!\p" - .string "Dann segeln wir zuerst Richtung\n" - .string "FAUSTAUHAVEN.$" + .string "MR. BRINEY: Ahoy!\n" + .string "I know exactly what you want to say!\p" + .string "You’re to deliver a LETTER to DEWFORD\n" + .string "and a package to SLATEPORT.\p" + .string "What you need me to do is no problem\n" + .string "at all - I’m the man for the job!\p" + .string "First, we’ll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_191DA6:: @ 8191DA6 - .string "MR. BRACK: Ahoi! Ich weiß genau,\n" - .string "was du jetzt sagen willst!\p" - .string "Du musst KAPT. BRIGG in\n" - .string "GRAPHITPORT CITY ein Paket bringen.\p" - .string "Nun, ich bin der richtige Mann für\n" - .string "diesen Job!\p" - .string "Dann segeln wir zuerst Richtung\n" - .string "FAUSTAUHAVEN.$" + .string "MR. BRINEY: Ahoy!\n" + .string "I know exactly what you want to say!\p" + .string "You’re to deliver a package to\n" + .string "CAPT. STERN in SLATEPORT.\p" + .string "What you need me to do is no problem\n" + .string "at all - I’m the man for the job!\p" + .string "First, we’ll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_191E80:: @ 8191E80 - .string "MR. BRACK: Ahoi! Für dich fahre ich\n" - .string "jederzeit wieder raus!\p" - .string "Nun, wo soll es hingehen?$" + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" Route104_MrBrineysHouse_Text_191EDB:: @ 8191EDB - .string "MR. BRACK: Wirklich?\n" - .string "Nun, PECKO verdankt dir ihr Leben.\p" - .string "Lass dir Zeit. Ein Wort genügt und wir\n" - .string "setzen Segel.$" + .string "MR. BRINEY: Is that so?\n" + .string "Well, PEEKO owes her life to you.\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" UnknownString_8191F4F: @ 8191F4F - .string "MR. BRACK: Ahoi!\n" - .string "Wir haben in BLÜTENBURG CITY angelegt.\p" - .string "Lass dir Zeit. Ein Wort genügt und wir\n" - .string "setzen Segel.$" + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve made land in PETALBURG!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail!$" Route104_MrBrineysHouse_Text_191FB9:: @ 8191FB9 - .string "PECKO: Pii pihyoroo!$" + .string "PEEKO: Pii pihyoroo!$" diff --git a/data/text/maps/Route104_Prototype.inc b/data/text/maps/Route104_Prototype.inc index 447d6a1ea..7ce19f609 100644 --- a/data/text/maps/Route104_Prototype.inc +++ b/data/text/maps/Route104_Prototype.inc @@ -1,115 +1,115 @@ Route104_Prototype_Text_19AD9B:: @ 819AD9B - .string "Oh! Du siehst wie ein guter TRAINER aus.\n" - .string "Schaust du dir mal meine POKéMON an?$" + .string "Oh? You look like a good TRAINER.\n" + .string "Will you look at my POKéMON?$" Route104_Prototype_Text_19ADDA:: @ 819ADDA - .string "Ich bin nicht gut genug für dich.$" + .string "I’m not good enough for you.$" Route104_Prototype_Text_19ADF7:: @ 819ADF7 - .string "Ich habe den Kampf richtig genossen.\n" - .string "Bitte kämpfe bald wieder mit mir.$" + .string "I enjoyed our battle very much.\n" + .string "Please battle with me some other time.$" Route104_Prototype_Text_19AE3E:: @ 819AE3E - .string "Los!\n" - .string "Los, POKéMON!$" + .string "Go!\n" + .string "Go, our POKéMON!$" Route104_Prototype_Text_19AE53:: @ 819AE53 - .string "Oh... Wir hatten keine Chance.$" + .string "Oh... We couldn’t win.$" Route104_Prototype_Text_19AE6A:: @ 819AE6A - .string "Überrascht es dich, dass zwei POKéMON\n" - .string "zur gleichen Zeit kämpften?$" + .string "Did it surprise you that two POKéMON\n" + .string "battled at the same time?$" Route104_Prototype_Text_19AEA9:: @ 819AEA9 - .string "Du kannst nicht mit uns kämpfen, wenn\n" - .string "du nur ein POKéMON hast. Warum nicht?\l" - .string "Nun, weil wir stark sind!$" + .string "You can’t battle with us if you have\n" + .string "only one POKéMON.\l" + .string "Why? Because we’re strong!$" Route104_Prototype_Text_19AEFB:: @ 819AEFB - .string "Hey, hey! Das ist seit langer Zeit mein\n" - .string "erster Kampf. Ich gebe mein Bestes!$" + .string "Hey, hey! This is my first battle in\n" + .string "a while. I’ll give it my all!$" Route104_Prototype_Text_19AF3E:: @ 819AF3E - .string "Ich habe doch mein Bestes gegeben...$" + .string "But I gave it my all...$" Route104_Prototype_Text_19AF56:: @ 819AF56 - .string "Du bist viel zu stark!\n" - .string "Du musst ein großer TRAINER sein!$" + .string "You’re far too strong!\n" + .string "You must be a great TRAINER!$" Route104_Prototype_Text_19AF8A:: @ 819AF8A - .string "Meine POKéMON sind sehr niedlich und\n" - .string "sehr stark.\l" - .string "Das möchte ich dir gerne zeigen.$" + .string "My POKéMON are extremely cute and\n" + .string "extremely strong.\l" + .string "Please allow me to show you.$" Route104_Prototype_Text_19AFDB:: @ 819AFDB - .string "Ich gebe mich geschlagen.\n" - .string "Du bist wirklich stark.$" + .string "I must concede defeat.\n" + .string "After all, you are strong.$" Route104_Prototype_Text_19B00D:: @ 819B00D - .string "Wenn wir uns das nächste Mal treffen, \n" - .string "werden meine POKéMON stärker sein!\p" - .string "Und erwarte dann keine Gnade!$" + .string "The next time we meet, I will have raised\n" + .string "my POKéMON much more.\p" + .string "Don’t expect mercy then!$" Route104_Prototype_Text_19B066:: @ 819B066 - .string "Wir WANDERER sind stets voller Energie!\n" - .string "Auch meine POKéMON sind voller Energie!\l" - .string "Wir sind stets auf einen Kampf aus!$" + .string "We HIKERS are always full of energy!\n" + .string "My POKéMON are also full of energy, too.\l" + .string "We’re always itching for a battle!$" Route104_Prototype_Text_19B0D7:: @ 819B0D7 - .string "Uns ist die Energie ausgegangen...$" + .string "We ran out of energy...$" Route104_Prototype_Text_19B0EF:: @ 819B0EF - .string "Hahahaha! Natürlich, wir haben verloren.\n" - .string "Aber es war ein toller Kampf, oder?\l" - .string "Wir sind jedenfalls zufrieden damit!$" + .string "Wahahah! Sure, we lost!\n" + .string "But we had a great battle, didn’t we?\l" + .string "We’re satisfied with that!$" Route104_Prototype_Text_19B148:: @ 819B148 - .string "Du siehst wie ein starker TRAINER aus,\n" - .string "aber kannst du uns auch schlagen?$" + .string "You look like a strong TRAINER,\n" + .string "but can you beat us?$" Route104_Prototype_Text_19B17D:: @ 819B17D .string "Waaah!\n" - .string "Wir haben verloren!$" + .string "We lost!$" Route104_Prototype_Text_19B18D:: @ 819B18D - .string "Wenn zwei POKéMON zur gleichen Zeit\n" - .string "kämpfen können, ist alles möglich.$" + .string "If two POKéMON can battle at the same\n" + .string "time, all sorts of new things can happen.$" Route104_Prototype_Text_19B1DD:: @ 819B1DD - .string "Hast du nur ein POKéMON, das\n" - .string "kämpfen kann?\p" - .string "Dann können wir nicht mit dir kämpfen.$" + .string "Do you only have one POKéMON that can\n" + .string "battle?\p" + .string "Then we can’t battle with you yet.$" Route104_Prototype_Text_19B22E:: @ 819B22E - .string "Hast du versucht, alle anderen TRAINER\n" - .string "im Kampf zu besiegen?$" + .string "Have you tried beating all the other\n" + .string "TRAINERS in battle?$" Route104_Prototype_Text_19B267:: @ 819B267 - .string "Danke, dass du heute gekommen bist!\p" - .string "Ich hoffe, du freust dich auch auf das\n" - .string "Erscheinen dieses Spiels!$" + .string "Thanks for coming today!\p" + .string "I hope you’re looking forward to this\n" + .string "game’s release!$" Route104_Prototype_Text_19B2B6:: @ 819B2B6 - .string "Was? Du bist schon gegen alle TRAINER\n" - .string "angetreten?$" + .string "Huh? Did you battle with all the\n" + .string "TRAINERS already?$" Route104_Prototype_Text_19B2E9:: @ 819B2E9 - .string "Danke, dass du heute gekommen bist!\p" - .string "Ich hoffe, du freust dich auch auf das\n" - .string "Erscheinen dieses Spiels!$" + .string "Thank you for coming today!\p" + .string "I hope you’re looking forward to this\n" + .string "game’s release!$" Route104_Prototype_Text_19B33B:: @ 819B33B - .string "POKéMON, wie du sie hast, habe ich noch\n" - .string "nie gesehen. Ich bin richtig neidisch!$" + .string "I’ve never seen the POKéMON you have.\n" + .string "It makes me envious a little.$" Route104_Prototype_Text_19B37F:: @ 819B37F - .string "Schau dir all diese TRAINER an! Sie\n" - .string "haben alle die unterschiedlichsten\l" - .string "POKéMON. Und sie warten alle auf dich!$" + .string "Look at all those TRAINERS!\n" + .string "They have different POKéMON, too.\l" + .string "And they’re all waiting for you!$" Route104_Prototype_Text_19B3DE:: @ 819B3DE - .string "Willkommen in der Welt der POKéMON!$" + .string "Welcome to the World of POKéMON!$" Route104_Prototype_Text_19B3FF:: @ 819B3FF - .string "Mögen alle POKéMON-Kämpfe strahlend,\n" - .string "unterhaltsam und wild sein!$" + .string "May all POKéMON battles be bright,\n" + .string "fun, and ferocious!$" diff --git a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc index 240f903cc..3ec76ff55 100644 --- a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc +++ b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc @@ -1,6 +1,6 @@ Route104_PrototypePrettyPetalFlowerShop_Text_19B436:: @ 819B436 - .string "Ich muss heute zu Hause bleiben.\p" - .string "Meine großen Schwestern sind wegge-\n" - .string "gangen. Sie wollen alles vorbereiten.\p" - .string "Im Herbst eröffnen wir einen Blumen-\n" - .string "laden. Ich hoffe, du schaust mal vorbei.$" + .string "I have to stay home today.\p" + .string "My big sisters had to go out.\n" + .string "They said it was for preparations.\p" + .string "In the autumn, we’re going to start\n" + .string "a flower shop. Please wait for it!$" diff --git a/data/text/maps/Route106.inc b/data/text/maps/Route106.inc index c40321971..38e92c65d 100644 --- a/data/text/maps/Route106.inc +++ b/data/text/maps/Route106.inc @@ -1,4 +1,4 @@ Route106_Text_16E026:: @ 816E026 - .string "TIPPS für TRAINER\p" - .string "Hinweis zum Fangen von POKéMON mit der\n" - .string "ANGEL: Drücke A, wenn eines anbeißt.$" + .string "TRAINER TIPS\p" + .string "Advice on catching POKéMON with a ROD:\n" + .string "Press the A Button if you get a bite.$" diff --git a/data/text/maps/Route109.inc b/data/text/maps/Route109.inc index 61e48788c..a86efa2c4 100644 --- a/data/text/maps/Route109.inc +++ b/data/text/maps/Route109.inc @@ -1,88 +1,86 @@ DewfordTown_Text_16E080:: @ 816E080 - .string "MR. BRACK: Ahoi!\n" - .string "Wir haben in GRAPHITPORT CITY angelegt.\p" - .string "Ich vermute, du gehst jetzt zu KAPT.\n" - .string "BRIGG und bringst ihm die DEVON-\l" - .string "WAREN?$" + .string "MR. BRINEY: Ahoy!\n" + .string "We’ve made land in SLATEPORT!\p" + .string "I suppose you’re going to visit CAPT.\n" + .string "STERN and deliver the DEVON GOODS?$" Route109_Text_16E0F9:: @ 816E0F9 - .string "MR. BRACK: Überbringst du nicht die\n" - .string "DEVON-WAREN?\p" - .string "Heißt das, du willst nach FAUSTAUHAVEN\n" - .string "zurücksegeln?$" + .string "MR. BRINEY: Aren’t you delivering the\n" + .string "DEVON GOODS?\p" + .string "Or were you meaning to sail back to\n" + .string "DEWFORD?$" Route109_Text_16E159:: @ 816E159 - .string "MR. BRACK: Also, auf nach FAUSTAUHAVEN!\p" - .string "Anker gelichtet!\n" - .string "PECKO, wir setzen Segel, mein Liebling!$" + .string "MR. BRINEY: DEWFORD it is, then!\p" + .string "Anchors aweigh!\n" + .string "PEEKO, we’re setting sail, my darling!$" Route109_Text_16E1B1:: @ 816E1B1 - .string "MR. BRACK: Dann geh und überbringe die\n" - .string "DEVON-WAREN. Ich warte hier.$" + .string "MR. BRINEY: Then you go on and deliver\n" + .string "the DEVON GOODS. I’ll be waiting.$" DewfordTown_Text_16E1FA:: @ 816E1FA - .string "MR. BRACK: Ahoi! Wir haben in\n" - .string "GRAPHITPORT CITY angelegt!\p" - .string "Wann immer du magst, können wir wieder\n" - .string "die Segel setzen.$" + .string "MR. BRINEY: Ahoy! We’ve made land in\n" + .string "SLATEPORT!\p" + .string "You just go on and tell me whenever\n" + .string "you want to set sail again!$" Route109_Text_16E26A:: @ 816E26A - .string "MR. BRACK: Ahoi! Für dich fahre ich\n" - .string "jederzeit wieder raus!\p" - .string "Nun, wo soll es hingehen?$" + .string "MR. BRINEY: Ahoy!\n" + .string "For you, I’ll go out to sea anytime!\p" + .string "Now, my friend, where are we bound?$" Route109_Text_16E2C5:: @ 816E2C5 - .string "MR. BRACK: Sag mir einfach Bescheid,\n" - .string "wenn wir wieder Segel setzen sollen.$" + .string "MR. BRINEY: You just tell me whenever\n" + .string "you need to set sail again!$" Route109_Text_16E307:: @ 816E307 - .string "Yo, TRAINER!\n" - .string "Seid ihr in Eile,\l" - .string "müsst wieder fort,\l" - .string "erfrischt euch doch an Papas Ort!$" + .string "Yo, TRAINERS!\n" + .string "Whether you’re hot to trot,\l" + .string "or cool cat not,\l" + .string "chill at my papa’s spot!$" Route109_Text_16E35B:: @ 816E35B - .string "Kleine Kinder sind blitzschnell und flink.\p" - .string "Du darfst sie nicht eine Sekunde aus\n" - .string "den Augen lassen. Das strengt an.\p" - .string "Meine Kinder sind mit meinen POKéMON\n" - .string "zusammen, da sind sie gut aufgehoben.$" + .string "Little kids can dart around so quickly...\p" + .string "You don’t dare take your eyes off them\n" + .string "for an instant. It’s very taxing.\p" + .string "Mine’s with my POKéMON, so they should\n" + .string "be okay, but...$" Route109_Text_16E405:: @ 816E405 - .string "Wir brauchen ganz lange, um unsere\n" - .string "Sandburg zu bauen.$" + .string "Our sand castle’s taking a long time\n" + .string "to make.$" Route109_Text_16E433:: @ 816E433 - .string "Das schenk ich dir!$" + .string "You can have this!$" Route109_Text_16E446:: @ 816E446 - .string "Wir nehmen allen Sand vom Strand\n" - .string "und bauen damit eine gaaanz große Burg.\p" - .string "Und dann sind wir Königin und König!\p" - .string "Und du darfst unser Diener sein.$" + .string "We’re going to get all the sand from\n" + .string "the beach and make a big castle!\p" + .string "And then we’re going to be a king and\n" + .string "queen.\p" + .string "We’ll let you be a servant.$" Route109_Text_16E4D5:: @ 816E4D5 - .string "Das Wasser in diesen Breiten ist sauber.\p" - .string "Aber ich sammle zusammen mit meinem\n" - .string "ZIGZACHS den Müll am Ufer auf.\p" - .string "Verschmutztes Wasser wird zu Regen und\n" - .string "gelangt in die Flüsse, aus denen wir\l" - .string "unser Trinkwasser gewinnen...\p" - .string "Verschmutzen wir das Meer, bekommen\n" - .string "wir den Schmutz wieder zurück.$" + .string "The water around these parts is clean.\p" + .string "But, I get my ZIGZAGOON to pick up\n" + .string "litter from the shoreline at times.\p" + .string "Dirty water becomes rain and joins our\n" + .string "rivers, which we drink from...\p" + .string "If we pollute the sea, it all comes\n" + .string "back to haunt us eventually.$" Route109_Text_16E5CA:: @ 816E5CA - .string "ZIGZACHS: Guguu?$" + .string "ZIGZAGOON: Guguu?$" Route109_Text_16E5DC:: @ 816E5DC - .string "STRANDHAUS\p" - .string "“Mögen heiße Kämpfe im heißen Sand\n" - .string "stattfinden! Heiße TRAINER willkommen!”$" + .string "SEASHORE HOUSE\p" + .string "“May hot battles rage on hot sands!\n" + .string "The place for hot TRAINERS!”$" Route109_Text_16E62C:: @ 816E62C - .string "TIPPS für TRAINER\p" - .string "POKéMON mit gleichem Level haben nicht\n" - .string "unbedingt identische Statuswerte.\p" - .string "POKéMON, die von TRAINERN aufgezogen\n" - .string "werden, wachsen schneller als wilde\l" - .string "POKéMON.$" + .string "TRAINER TIPS\p" + .string "POKéMON at the same level may not\n" + .string "always have identical stats.\p" + .string "POKéMON raised by TRAINERS are said\n" + .string "to grow stronger than wild POKéMON.$" diff --git a/data/text/maps/Route109_SeashoreHouse.inc b/data/text/maps/Route109_SeashoreHouse.inc index 7d830c12c..ebd6f05e5 100644 --- a/data/text/maps/Route109_SeashoreHouse.inc +++ b/data/text/maps/Route109_SeashoreHouse.inc @@ -1,94 +1,92 @@ Route109_SeashoreHouse_Text_19B4D9:: @ 819B4D9 - .string "Ich bin der Besitzer des STRANDHAUSES.\n" - .string "Du kannst MR. MARE zu mir sagen.\p" - .string "Heißen POKéMON-Kämpfen zuzusehen\n" - .string "liebe ich über alles!\p" - .string "Zeig mir, wie heiß dein Herz lodert!\p" - .string "Wenn du alle TRAINER besiegen kannst,\n" - .string "werde ich dich belohnen!$" + .string "I’m the owner of the SEASHORE HOUSE.\n" + .string "But you can call me MR. SEA!\p" + .string "What I love above all is to see hot\n" + .string "POKéMON battles.\p" + .string "Let me see that your heart burns hot!\p" + .string "If you can defeat all the TRAINERS\n" + .string "here, I’ll reward your efforts.$" Route109_SeashoreHouse_Text_19B5B9:: @ 819B5B9 - .string "Zeig mir heiße Kämpfe!\p" - .string "Nur für diese habe ich das STRANDHAUS\n" - .string "überhaupt geöffnet!$" + .string "Show me some hot matches!\p" + .string "I run this SEASHORE HOUSE just for\n" + .string "that reason alone!$" Route109_SeashoreHouse_Text_19B609:: @ 819B609 - .string "Du bist brandheiß!\n" - .string "Die Kämpfe glühen geradezu!\l" - .string "Ich bin mehr als zufrieden!\p" - .string "Du hast deine Fertigkeiten bewiesen.\n" - .string "Zum Dank schenke ich dir etwas.\p" - .string "Es sind sechs Flaschen SPRUDEL!$" + .string "You’re scorching hot!\n" + .string "Those battles blazed!\l" + .string "I’m more than just satisfied!\p" + .string "As thanks for showing me your hot\n" + .string "streak, I want you to take these.\p" + .string "It’s half a dozen bottles of SODA POP!$" Route109_SeashoreHouse_Text_19B6BE:: @ 819B6BE - .string "Aber dein BEUTEL ist ja gerammelt voll.\n" - .string "Ich werde sie für dich aufbewahren.$" + .string "Oh, but hey, your BAG’s jammed full.\n" + .string "I’ll hang on to these for you.$" Route109_SeashoreHouse_Text_19B702:: @ 819B702 - .string "Möchtest du etwas SPRUDEL kaufen?\n" - .string "POKéMON lieben ihn!\p" - .string "Nur ¥300 pro Flasche!\n" - .string "Kauf doch welchen!$" + .string "Want to buy some SODA POP?\n" + .string "POKéMON love it!\p" + .string "Just ¥300 a bottle!\n" + .string "Buy some!$" Route109_SeashoreHouse_Text_19B74C:: @ 819B74C - .string "Hier, bitte schön!$" + .string "Here you go!$" Route109_SeashoreHouse_Text_19B759:: @ 819B759 - .string "Du hast nicht genügend Geld.$" + .string "You don’t have the money.$" Route109_SeashoreHouse_Text_19B773:: @ 819B773 - .string "Nein?\n" - .string "Das ist aber wirklich schade.$" + .string "No?\n" + .string "That’s too bad.$" UnknownString_819B787: @ 819B787 - .string "SPRUDEL! POKéMONs Liebling!\n" - .string "Nur ¥300 pro Flasche! Möchtest du eine?$" + .string "SODA POP! The POKéMON favorite!\n" + .string "Just ¥300 a bottle! Want one?$" UnknownString_819B7C5: @ 819B7C5 - .string "Hier, bitte schön!$" + .string "Here you go!$" UnknownString_819B7D2: @ 819B7D2 - .string "Oh je!\n" - .string "Du hast nicht genügend Geld.$" + .string "Oh, dear!\n" + .string "You don’t have enough money.$" UnknownString_819B7F9: @ 819B7F9 - .string "Das ist wirklich sehr schade.$" + .string "That’s too bad.$" Route109_SeashoreHouse_Text_19B809:: @ 819B809 - .string "Wenn du Lust auf einen heißen Kampf\n" - .string "auf hoher See hast, findest du keinen\l" - .string "lodernderen TRAINER als mich!$" + .string "If you’re looking for a battle on the\n" + .string "high seas, you’ll find no hotter \l" + .string "TRAINER than me, matey!$" Route109_SeashoreHouse_Text_19B869:: @ 819B869 - .string "Das war ein heißer Kampf!\n" - .string "Ich kann die Niederlage verkraften!$" + .string "That was a hot battle!\n" + .string "I can accept that loss, matey!$" Route109_SeashoreHouse_Text_19B89F:: @ 819B89F - .string "Immer wenn ich in GRAPHITPORT CITY bin,\n" - .string "genieße ich heiße Kämpfe und\l" - .string "eisgekühlten SPRUDEL!$" + .string "Whenever I’m in SLATEPORT, I enjoy\n" + .string "hot battles and ice-cold SODA POP!$" Route109_SeashoreHouse_Text_19B8E5:: @ 819B8E5 - .string "Langweilige Kämpfe lohnen sich nicht.\p" - .string "Feurig heiße Kämpfe aber stählen\n" - .string "TRAINER und POKéMON.$" + .string "Boring battles aren’t worth the effort.\p" + .string "Fiery hot battles are what toughen up\n" + .string "TRAINERS and POKéMON!$" Route109_SeashoreHouse_Text_19B949:: @ 819B949 - .string "Das war brandheiß!$" + .string "That’s hot!$" Route109_SeashoreHouse_Text_19B955:: @ 819B955 - .string "Puh, ich bin am Verdursten.\n" - .string "Ich sollte SPRUDEL trinken.$" + .string "Whew, I’m all thirsty.\n" + .string "Maybe I’ll have a SODA POP.$" Route109_SeashoreHouse_Text_19B988:: @ 819B988 - .string "Ich werde dir zeigen, wie toll meine\n" - .string "POKéMON sind. Aber heul bloß nicht los!$" + .string "I’m going to show you how great my\n" + .string "POKéMON are, but don’t cry!$" Route109_SeashoreHouse_Text_19B9C7:: @ 819B9C7 - .string "Ich habe verloren. Aber ich heule nicht!$" + .string "...I lost, but I won’t cry...$" Route109_SeashoreHouse_Text_19B9E5:: @ 819B9E5 - .string "Wenn doch nur eines meiner POKéMON\n" - .string "wüsste, wie es mich über das Wasser\l" - .string "tragen kann. Dann wäre ich den\l" - .string "ollen Schwimmreifen los.$" + .string "If one of my POKéMON knew the move\n" + .string "for carrying me across water on its\l" + .string "back, I could get rid of this inner tube.$" diff --git a/data/text/maps/Route110.inc b/data/text/maps/Route110.inc index 9ebf3507b..78be8d595 100644 --- a/data/text/maps/Route110.inc +++ b/data/text/maps/Route110.inc @@ -1,251 +1,236 @@ Route110_Text_16E6C0:: @ 816E6C0 - .string "TEAM {EVIL_TEAM}S Aktivitäten müssen im\n" - .string "Moment geheim bleiben!$" + .string "TEAM {EVIL_TEAM}’s activities must be kept\n" + .string "secret for now.$" Route110_Text_16E6F2:: @ 816E6F2 - .string "Ich würde liebend gerne nach\n" - .string "GRAPHITPORT CITY gehen und ein\l" - .string "bisschen Krawall machen.$" + .string "I want to get going to SLATEPORT and\n" + .string "kick up a ruckus!$" Route110_Text_16E729:: @ 816E729 - .string "Das ist mein erster Job, seit ich dem\n" - .string "TEAM {EVIL_TEAM} beigetreten bin. Ich bin\l" - .string "ganz tatterig.$" + .string "This is my first job after joining\n" + .string "TEAM {EVIL_TEAM}. I’ve got the shakes!$" Route110_Text_16E76A:: @ 816E76A - .string "TEAM {EVIL_TEAM}S Aktionen zaubern ein\n" - .string "Lächeln auf jedes Gesicht!$" + .string "TEAM {EVIL_TEAM}’s actions will put a smile\n" + .string "on everyone’s face!$" Route110_Text_16E7A1:: @ 816E7A1 - .string "MAIKE: Hi, {PLAYER}{KUN}, wir haben uns ja\n" - .string "lange nicht gesehen!\p" - .string "Während ich auf der Suche nach\n" - .string "weiteren POKéMON war, sind meine\l" - .string "POKéMON stärker geworden.\p" - .string "Daher...\n" - .string "Wie wäre es mit einem kleinen Kampf?$" + .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" + .string "While I was searching for other\n" + .string "POKéMON, my POKéMON grew stronger.\p" + .string "So...\n" + .string "How about a little battle?$" Route110_Text_16E826:: @ 816E826 - .string "AchDuSchande!\n" - .string "Du bist besser als ich gedacht habe.$" + .string "Yikes!\n" + .string "You’re better than I expected!$" Route110_Text_16E84C:: @ 816E84C - .string "MAIKE: {PLAYER}{KUN}, du hast auch fleißig\n" - .string "trainiert, nicht wahr?\p" - .string "Ich denke, du verdienst eine Belohnung!\n" - .string "Hier, dies ist von mir für dich!$" + .string "MAY: {PLAYER}{KUN}, you’ve been busy\n" + .string "training, too, haven’t you?\p" + .string "I think you deserve a reward!\n" + .string "This is from me!$" Route110_Text_16E8B3:: @ 816E8B3 - .string "MAIKE: Das ist ein DETEKTOR.\p" - .string "Probier ihn mal aus. Wenn irgendwo ein\n" - .string "Item versteckt ist, gibt er ein\l" - .string "Geräusch von sich.\p" - .string "Bis zum nächsten Mal, {PLAYER}{KUN}.\p" - .string "Es hört sich aus meinem Munde zwar blöd\n" - .string "an, aber bis dahin solltest du viel mehr\l" - .string "trainiert haben.$" + .string "MAY: That’s an ITEMFINDER.\p" + .string "Try it out. If there is an item that’s\n" + .string "not visible, it emits a sound.\p" + .string "Okay, {PLAYER}{KUN}, let’s meet again!\p" + .string "I know it’s a little silly coming from\n" + .string "me, but I think you should train a lot\l" + .string "harder for the next time.$" Route110_Text_16E99A:: @ 816E99A - .string "BRIX: Hey, {PLAYER}.\n" - .string "Hier treibst du dich also herum.\l" - .string "Wie geht es?\p" - .string "Hast du deine POKéMON gut aufgezogen?\n" - .string "Ich werde das für dich überprüfen.$" + .string "BRENDAN: Hey, {PLAYER}.\n" + .string "So this is where you were.\l" + .string "How’s it going?\p" + .string "Have you been raising your POKéMON?\n" + .string "I’ll check for you.$" Route110_Text_16EA0F:: @ 816EA0F .string "Hmm...\n" - .string "Du bist sehr gut.$" + .string "You’re pretty good.$" Route110_Text_16EA2A:: @ 816EA2A - .string "BRIX: {PLAYER}, du hast trainiert,\n" - .string "ohne dass ich etwas davon\l" - .string "mitbekommen habe...\p" - .string "Aber genug!\n" - .string "Hier, das ist für dich!$" + .string "BRENDAN: {PLAYER}, you’ve trained\n" + .string "without me noticing...\p" + .string "Good enough!\n" + .string "Here, take this.$" Route110_Text_16EA7B:: @ 816EA7B - .string "BRIX: Das ist ein DETEKTOR.\p" - .string "Probier ihn mal aus. \p" - .string "Ist irgendwo ein Item versteckt, gibt\n" - .string "er ein Geräusch von sich.\p" - .string "Wie auch immer, ich suche jetzt weiter\n" - .string "nach POKéMON.$" + .string "BRENDAN: That’s an ITEMFINDER.\p" + .string "Use it to root around for items that\n" + .string "aren’t visible.\p" + .string "If it senses something, it emits a\n" + .string "sound.\p" + .string "Anyway, I’m off to look for new\n" + .string "POKéMON.$" Route110_Text_16EB22:: @ 816EB22 - .string "Wäre das nicht ein Spaß, mit einem FAHR-\n" - .string "RAD volle Pulle den RADWEG\l" - .string "entlangzudüsen?$" + .string "Wouldn’t it be great to ride a BIKE\n" + .string "at full speed on CYCLING ROAD?$" Route110_Text_16EB65:: @ 816EB65 - .string "Gefällt es dir, wie mein raben-\n" - .string "schwarzes Haar im Wind weht?\p" - .string "Ich habe nur deshalb die Haare wachsen\n" - .string "lassen!$" + .string "How do you like the way my raven-\n" + .string "colored hair streams behind me?\p" + .string "I grew my hair out just for that.$" Route110_Text_16EBC9:: @ 816EBC9 - .string "Oh, hey, du hast ein RAD von RADLA!\p" - .string "Oh, das ist mehr als offensichtlich.\n" - .string "Es steht ja dort geschrieben...\p" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\n" - .string "RADLA, RADLA, RADLA, RADLA, RADLA,\p" - .string "RADLA, RADLA, RADLA, RADLA, RADLA...\n" - .string "Der Name steht überall.\p" - .string "Du solltest damit überall herumfahren,\n" - .string "eine bessere Werbung gibt es nicht!$" + .string "Oh, hey, you got that BIKE from RYDEL!\p" + .string "Oh, it’s glaringly obvious.\n" + .string "It says right on your bike...\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" + .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL...\n" + .string "That name’s everywhere.\p" + .string "You should ride it around all over\n" + .string "the place - it’s good advertising!$" Route110_Text_16EDC5:: @ 816EDC5 - .string "Zwei Straßen, eine oben, eine unten...\p" - .string "Eine Straße für Menschen und eine für\n" - .string "POKéMON. Das ist nur recht und billig.$" + .string "The two roads, one above, one below...\p" + .string "A road each for people and POKéMON.\n" + .string "Perhaps that is right and fair.$" Route110_Text_16EE30:: @ 816EE30 - .string "Ich habe kein RAD, ich werde gemüt-\n" - .string "lich über die untere Straße schlendern.$" + .string "I don’t have a BIKE, so I’ll take a\n" + .string "leisurely walk on the low road.$" Route110_Text_16EE74:: @ 816EE74 - .string "Neue Techniken zu lernen, geben dem\n" - .string "Radfahren erst die richtige Würze.\p" - .string "Einige Orte kannst du nur erreichen,\n" - .string "wenn du die richtige Technik anwendest.$" + .string "Learning techniques will make BIKE\n" + .string "riding even more fun.\p" + .string "There are some places that you can\n" + .string "reach only by using a BIKE technique.$" Route110_Text_16EEF6:: @ 816EEF6 - .string "Was soll ich tun?\p" - .string "Schnurstracks über den RADWEG nach\n" - .string "MALVENFROH CITY fahren oder die untere\p" - .string "Straße nehmen und nach POKéMON\n" - .string "suchen?$" + .string "Which should I choose?\p" + .string "Make a beeline for MAUVILLE on\n" + .string "CYCLING ROAD, or take the low road\l" + .string "and look for POKéMON?$" Route110_Text_16EF65:: @ 816EF65 - .string "Anzahl der Zusammenstöße:\n" + .string "Number of collisions:\n" .string "... ... {STR_VAR_1}!\p" - .string "Zeit:\n" + .string "Total time:\n" .string "... ... {STR_VAR_2}!$" Route110_Text_16EF9F:: @ 816EF9F - .string "Bravo! Eine hervorragende Leistung!\p" - .string "Ich glaube, dein Talent zum Radfahren\n" - .string "kommt tief aus deinem innersten Herzen.\l" - .string "Du hast mich bis in die Seele getroffen!$" + .string "Bravo! Splendid showing!\p" + .string "Your love of cycling comes from deep\n" + .string "within your heart.\l" + .string "You’ve shaken me to my very soul!$" Route110_Text_16F012:: @ 816F012 - .string "Deine Technik ist bemerkenswert.\p" - .string "Achte stets darauf, dass du nicht zu\n" - .string "schnell fährst und mit niemandem zu-\l" - .string "sammenstößt.$" + .string "Your technique is remarkable.\p" + .string "I suggest you slow down just enough\n" + .string "to avoid collisions.$" Route110_Text_16F069:: @ 816F069 - .string "Ich rate dir, weiter zu üben.\p" - .string "Und ich wünsche dir, dass du das Ver-\n" - .string "gnügen des Radfahrens nie vergisst.$" + .string "I would consider you a work in\n" + .string "progress.\p" + .string "Still, I hope you don’t forget the\n" + .string "sheer pleasure of cycling.$" Route110_Text_16F0D0:: @ 816F0D0 - .string "Ich sage... Dein Talent zum Radfahren\n" - .string "ist einfach miserabel.\p" - .string "Du brauchst wirklich noch viel mehr\n" - .string "Übung im Radfahren.$" + .string "My word... Your cycling skills border\n" + .string "on terrifying.\p" + .string "Most certainly, you need much more\n" + .string "practice riding.$" Route110_Text_16F139:: @ 816F139 - .string "...Ich bin entgeistert...\p" - .string "Du hast wirklich kein Talent zum\n" - .string "Radfahren.\p" - .string "Du solltest ernsthaft darüber nach-\n" - .string "denken, dein RAD bei RADLA\l" - .string "zurückzugeben.$" + .string "...I am aghast...\p" + .string "You’re perhaps not cut out for this\n" + .string "unfortunate cycling business.\p" + .string "You ought to give serious thought to\n" + .string "returning that BIKE to RYDEL.$" Route110_Text_16F1D0:: @ 816F1D0 - .string "Dies ist der RADWEG.\p" - .string "Wenn du mit einem EILRAD von MALVEN-\n" - .string "FROH CITY nach GRAPHITPORT CITY\p" - .string "fährst, wirst du nach der Anzahl der\n" - .string "Zusammenstöße und deiner Zeit\l" - .string "bewertet.$" + .string "This is CYCLING ROAD.\p" + .string "If you were to ride from MAUVILLE to\n" + .string "SLATEPORT on a MACH BIKE, you would\l" + .string "be rated for the number of collisions\l" + .string "and your total time.$" Route110_Text_16F26A:: @ 816F26A - .string "Unabhängig von den Resultaten möchte\n" - .string "ich mehr Herausforderungen von dir\l" - .string "sehen. Immer das höchste Ziel im Auge\l" - .string "behalten!$" + .string "Regardless of the results, I count on\n" + .string "seeing more challenges from you.\l" + .string "Always aim higher!$" Route110_Text_16F2C4:: @ 816F2C4 - .string "Auf diesem RADWEG werden die, die\n" - .string "EILRÄDER fahren, nach ihren Zu-\l" - .string "sammenstößen und ihrer Zeit bewertet.\p" - .string "KUNSTRÄDER nehmen nicht an der\n" - .string "Qualifikation teil. Sie sind zu einfach\l" - .string "zu lenken.$" + .string "On this CYCLING ROAD, those riding\n" + .string "MACH BIKES are rated for their number\l" + .string "of collisions and their total times.\p" + .string "ACRO BIKES do not qualify for rating.\n" + .string "They are easy to turn, so it’s not fair.$" Route110_Text_16F381:: @ 816F381 .string "ROUTE 110\n" - .string "{DOWN_ARROW} GRAPHITPORT CITY$" + .string "{0x7A} SLATEPORT CITY$" Route110_Text_16F39C:: @ 816F39C - .string "KÜSTENRADWEG$" + .string "SEASIDE CYCLING ROAD$" Route110_Text_16F3B1:: @ 816F3B1 - .string "“TEAM {EVIL_TEAM} HÄRRSCHD!”\p" - .string "Das hat jemand auf das Schild\n" - .string "gekritzelt...$" + .string "“TEAM {EVIL_TEAM} RULEZ!”\p" + .string "Somebody scribbled that on the sign...$" Route110_Text_16F3E9:: @ 816F3E9 .string "ROUTE 110\n" - .string "{LEFT_ARROW} ROUTE 103$" + .string "{0x7B} ROUTE 103$" Route110_Text_16F3FF:: @ 816F3FF - .string "KÜSTENPARKPLATZ$" + .string "SEASIDE PARKING$" Route110_Text_16F40F:: @ 816F40F .string "ROUTE 110\n" - .string "{UP_ARROW} MALVENFROH CITY$" + .string "{0x79} MAUVILLE CITY$" Route110_Text_16F429:: @ 816F429 - .string "TIPPS für TRAINER\p" - .string "Der Gegner kann paralysiert oder\n" - .string "in Schlaf versetzt werden und ist damit\l" - .string "wehrlos.\p" - .string "Das sind wichtige Techniken in einem\n" - .string "POKéMON-Kampf.$" + .string "TRAINER TIPS\p" + .string "The foe can be made helpless by\n" + .string "paralyzing it or causing it to sleep.\p" + .string "It is an important technique for\n" + .string "POKéMON battles.$" Route110_Text_16F4AE:: @ 816F4AE - .string "TIPPS für TRAINER\p" - .string "Die Items in dem BEUTEL können mit\n" - .string "SELECT neu geordnet werden.$" + .string "TRAINER TIPS\p" + .string "The items in the BAG can be reorganized\n" + .string "by pressing SELECT.$" Route110_Text_16F4F7:: @ 816F4F7 - .string "“Drei Schritte {RIGHT_ARROW} und zwei Schritte {UP_ARROW}\n" - .string "und du erreichst das wundersame\l" - .string "RÄTSELHAUS.”$" + .string "“Three steps {0x7C} and two steps {0x79}\n" + .string "to reach the wondrous TRICK HOUSE.”$" Route110_Text_16F53A:: @ 816F53A - .string "DAS BESTE ERGEBNIS...\p" - .string "Anzahl der Zusammenstöße: {STR_VAR_1}\p" - .string "Zeit: {STR_VAR_2}$" + .string "THE BEST RECORD TO DATE...\p" + .string "No. of collisions: {STR_VAR_1}\p" + .string "Elapsed time: {STR_VAR_2}$" Route110_Text_16F57C:: @ 816F57C - .string "DAS BESTE ERGEBNIS...\p" - .string "Niemand scheint sich bis jetzt der He-\n" - .string "rausforderung gestellt zu haben...$" + .string "THE BEST RECORD TO DATE...\p" + .string "No one seems to have taken the\n" + .string "challenge. There is no record...$" UnknownString_816F5D7: @ 816F5D7 - .string "Ich gieße die Pflanzen jeden Tag.\n" - .string "Dann bekommen sie viele Blüten.\p" - .string "Und daraus werden dann viele BEEREN.\p" - .string "Hier, die ist für dich.\n" - .string "Du kannst sie haben.$" + .string "I watered the plants every day.\n" + .string "They grew lots of flowers.\p" + .string "And they gave me lots of BERRIES, too.\p" + .string "Here you go!\n" + .string "You can have it!$" UnknownString_816F657: @ 816F657 - .string "Ich versuche {POKEBLOCK} ROT zu machen!\n" - .string "Ich hoffe, das versuchst du auch!$" + .string "I’m trying to make RED {POKEBLOCK}S!\n" + .string "I hope you do, too!$" UnknownString_816F68A: @ 816F68A - .string "Deine BEEREN-TASCHE ist voll.\p" - .string "Ich gebe sie dir ein anderes Mal.$" + .string "Your BAG’s BERRIES POCKET is full.\p" + .string "I’ll give it to you another time.$" UnknownString_816F6CF: @ 816F6CF - .string "Ich suche nach roten BEEREN, um\n" - .string "{POKEBLOCK} ROT herzustellen.$" + .string "I’m going to look for red BERRIES to\n" + .string "make RED {POKEBLOCK}S.$" diff --git a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 1179fa0ce..8d5a0433e 100644 --- a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -1,11 +1,10 @@ Route110_SeasideCyclingRoadNorthEntrance_Text_19E406:: @ 819E406 - .string "Auf dem RADWEG kannst du so\n" - .string "schnell fahren, wie du willst.\p" - .string "Schnell fahren macht Spaß, pass aber\n" - .string "auf, dass du mit niemandem\l" - .string "zusammenstößt.$" + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" UnknownString_819E48D: @ 819E48D - .string "Tut mir Leid, aber auf dem RADWEG\n" - .string "sind Fußgänger nicht gestattet.\p" - .string "Das ist gefährlich. Bring dein RAD mit...$" + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" diff --git a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index d2cd1bd34..77bf90751 100644 --- a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -1,12 +1,11 @@ Route110_SeasideCyclingRoadSouthEntrance_Text_19E326:: @ 819E326 - .string "Auf dem RADWEG kannst du so\n" - .string "schnell fahren, wie du willst.\p" - .string "Schnell fahren macht Spaß, pass aber\n" - .string "auf, dass du mit niemandem\l" - .string "zusammenstößt.$" + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD:: @ 819E3AD Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD:: @ 819E3AD - .string "Tut mir Leid, aber auf dem RADWEG\n" - .string "sind Fußgänger nicht gestattet.\p" - .string "Das ist gefährlich. Bring dein RAD mit...$" + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" diff --git a/data/text/maps/Route110_TrickHouseEnd.inc b/data/text/maps/Route110_TrickHouseEnd.inc index 508e52b85..03f2252fd 100644 --- a/data/text/maps/Route110_TrickHouseEnd.inc +++ b/data/text/maps/Route110_TrickHouseEnd.inc @@ -1,120 +1,110 @@ Route110_TrickHouseEnd_Text_19C281:: @ 819C281 - .string "Argh!\n" - .string "Du hast mich gefunden?\l" - .string "Hmmm... Du bist verdammt clever!$" + .string "Aak!\n" + .string "You’ve made it to me?\l" + .string "Hmmm... You’re sharp!$" Route110_TrickHouseEnd_Text_19C2B2:: @ 819C2B2 - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "all die Bäume zu pflanzen...\p" - .string "Du bist meiner Größe fast ebenbürtig,\n" - .string "bis auf ein, zwei, drei, vier, fünf, sechs\l" - .string "Punkte!$" + .string "It took me all night to plant all those\n" + .string "trees...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four, five, six places!$" Route110_TrickHouseEnd_Text_19C333:: @ 819C333 - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "das Labyrinth anzulegen...\p" - .string "Du bist meiner Größe fast ebenbürtig,\n" - .string "bis auf ein, zwei, drei, vier, fünf \l" - .string "Punkte!$" + .string "It took me all night to make the maze...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four, five places!$" Route110_TrickHouseEnd_Text_19C3A7:: @ 819C3A7 - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "die Felsen zu platzieren...\p" - .string "Du bist meiner Größe fast ebenbürtig,\n" - .string "bis auf ein, zwei, drei, vier Punkte!$" + .string "It took me all night to bring in those\n" + .string "boulders...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three, four places!$" Route110_TrickHouseEnd_Text_19C41F:: @ 819C41F - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "die Felsen hin- und herzuschieben...\p" - .string "Du bist meiner Größe fast ebenbürtig,\n" - .string "bis auf ein, zwei, drei Punkte!$" + .string "It took me all night to shove in those\n" + .string "boulders...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two, three places!$" Route110_TrickHouseEnd_Text_19C491:: @ 819C491 - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "die ROBOPUPPEN zu konstruieren und\l" - .string "mir das Quiz auszudenken...\p" - .string "Du bist meiner Größe fast ebenbürtig,\n" - .string "bis auf ein oder zwei Punkte!$" + .string "It took me all night to make MECHADOLLS\n" + .string "and another to think up the quiz...\p" + .string "You’re almost my equal in greatness by\n" + .string "one, two places!$" Route110_TrickHouseEnd_Text_19C515:: @ 819C515 - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "die Türen zu installieren...\p" - .string "Du bist meiner Größe fast ebenbürtig!$" + .string "It took me all night to install\n" + .string "the doors...\p" + .string "You’re almost my equal in greatness!$" Route110_TrickHouseEnd_Text_19C567:: @ 819C567 - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "die Pfeile anzubringen.\p" - .string "Du bist meiner Größe ebenbürtig!$" + .string "It took me all night setting up arrows...\p" + .string "You’re my equal in greatness!$" Route110_TrickHouseEnd_Text_19C5AF:: @ 819C5AF - .string "Ich habe die ganze Nacht gebraucht,\n" - .string "den Boden zu polieren...\p" - .string "Du bist mir weit überlegen!\n" - .string "Unmöglich...$" + .string "It took me all night polishing floors...\p" + .string "You’re above me in greatness!\n" + .string "Possibly...$" Route110_TrickHouseEnd_Text_19C602:: @ 819C602 - .string "Was soll ich nur tun?\n" - .string "Die Quelle der Ideen für meine Tricks\l" - .string "ist trocken gelegt...\p" - .string "Vielleicht ist es an der Zeit, durch die\n" - .string "Lande zu reisen und mich für neue\l" - .string "Tricks inspirieren zu lassen...$" + .string "Wh-what should I do?\n" + .string "My fountain of ideas for tricks has\l" + .string "run dry...\p" + .string "Perhaps it is time I toured the country\n" + .string "on a quest to devise new tricks...$" Route110_TrickHouseEnd_Text_19C691:: @ 819C691 - .string "Ich hasse es, zuzugeben, dass ich be-\n" - .string "siegt wurde. Du hast mich geschlagen!\p" - .string "Mein Charisma muss dich gefangen\n" - .string "genommen haben, da du immer wieder\l" - .string "herkommst. Ja, so muss es sein!\p" - .string "Aber das hat nichts mit meiner\n" - .string "Niederlage zu tun!\p" - .string "Als Zeichen der Freundschaft zwischen\n" - .string "dir, dem Aufstrebenden und mir, dem\l" - .string "Genie, überreiche ich dir dieses\l" - .string "Andenken!$" + .string "I hate to admit defeat, but you have\n" + .string "bested me!\p" + .string "Still, you must have been reeled in by\n" + .string "my charisma for you to visit me again\l" + .string "and again. Yes, you must have!\p" + .string "But that has nothing to do with my\n" + .string "losing!\p" + .string "In recognition of the friendship\n" + .string "between you, the driven, and the genius\l" + .string "that is myself, I demand that you take\l" + .string "this keepsake!$" Route110_TrickHouseEnd_Text_19C7D7:: @ 819C7D7 - .string "Was? Du hast keinen Platz im PC?\n" - .string "Und was soll ich jetzt damit machen?\p" - .string "Sei froh, dass ich so nett und rück-\n" - .string "sichtsvoll bin. Ich verwahre es für\l" - .string "dich. Komm einfach später wieder.$" + .string "What? No room in your PC?\n" + .string "What am I to make of that?\p" + .string "I wish I could say that, but I am much\n" + .string "too kind and caring, so come back later!$" Route110_TrickHouseEnd_Text_19C85C:: @ 819C85C .string "... ... ... ... ... ...\p" - .string "Ich gehe jetzt auf eine Entdeckungs-\n" - .string "reise. Auf die Suche nach neuen Tricks.\p" - .string "Ich hoffe, du besuchst mich eines\n" - .string "Tages wieder und unterhältst mich.\p" - .string "Für heute lebe wohl!$" + .string "I am leaving on a journey of discovery.\n" + .string "A quest in search of new tricks.\p" + .string "I wish that you will one day visit and\n" + .string "entertain me again.\p" + .string "And now, farewell!$" Route110_TrickHouseEnd_Text_19C90B:: @ 819C90B - .string "Gut!\n" - .string "Du hast dir diese Belohnung verdient!$" + .string "Fine!\n" + .string "You have earned this reward!$" Route110_TrickHouseEnd_Text_19C92E:: @ 819C92E - .string "Was? Du hast keinen Platz dafür?\n" - .string "Wie viele Items schleppst du denn mit?\p" - .string "Aber du kannst dir deine Belohnung\n" - .string "auch später bei mir abholen.$" + .string "What? Have you no room for this?\n" + .string "What manner of items do you carry?\p" + .string "But fine, since you’ve reached me,\n" + .string "your reward will be with me till later.$" Route110_TrickHouseEnd_Text_19C9BD:: @ 819C9BD - .string "Putz dir das selbstgefällige Grinsen von\n" - .string "der Backe! Noch hast du nicht gewonnen!\p" - .string "Ich werde neue Tricks erfinden, die\n" - .string "dich zu Fall bringen werden. Zum Grinsen\p" - .string "hast du erst Grund, wenn du es\n" - .string "geschafft hast.\p" - .string "Komm wieder, wenn ich die nächste\n" - .string "interessante Installation fertig habe.$" + .string "Scrub that smug smirk from your face!\n" + .string "It’s much too early to think you’ve won!\p" + .string "I’ll make new tricks to stump you, I will.\n" + .string "You may mock me only when you’re done.\p" + .string "Come back for the next exciting\n" + .string "installment!$" Route110_TrickHouseEnd_Text_19CA8B:: @ 819CA8B - .string "Nun, nun! Du ignorierst mich?\n" - .string "Das bricht mir glatt das Herz!$" + .string "Now, now! You’re ignoring me now?\n" + .string "Now that, I consider heartbreaking!$" UnknownString_819CAD1: @ 819CAD1 - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“RÄTSELMEISTER ist sagenhaft.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is fabulous.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHouseEntrance.inc b/data/text/maps/Route110_TrickHouseEntrance.inc index 5d218bc1a..fe39a4441 100644 --- a/data/text/maps/Route110_TrickHouseEntrance.inc +++ b/data/text/maps/Route110_TrickHouseEntrance.inc @@ -1,114 +1,111 @@ Route110_TrickHouseEntrance_Text_19BA56:: @ 819BA56 - .string "Du wirst beobachtet...$" + .string "You’re being watched...$" Route110_TrickHouseEntrance_Text_19BA6E:: @ 819BA6E - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich unter\n" - .string "dem Tisch versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "beneath this desk? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BAC0:: @ 819BAC0 - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich hinter\n" - .string "dem Baum versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "behind this tree? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BB11:: @ 819BB11 - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich in\n" - .string "der Kommode versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "in this dresser? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BB61:: @ 819BB61 - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich über\n" - .string "dem Fenster versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "beyond this window? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BBB4:: @ 819BBB4 - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich in\n" - .string "der Pflanze versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "in this planter? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BC04:: @ 819BC04 - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich\n" - .string "im Schrank versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "in this cupboard? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BC55:: @ 819BC55 - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich hinter\n" - .string "dem Fenster versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "behind this window? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BCA8:: @ 819BCA8 - .string "Was? Grrrr...\p" - .string "Woher wusstest du, dass ich mich unter\n" - .string "dem Kissen versteckt hatte? Clever!$" + .string "Hah? Grrr...\p" + .string "How did you know I concealed myself\n" + .string "beneath this cushion? You’re sharp!$" Route110_TrickHouseEntrance_Text_19BCFD:: @ 819BCFD - .string "Sehe und staune!\p" - .string "Ich bin das größte lebende menschliche\n" - .string "Mysterium in ganz HOENN!\l" - .string "Man nennt mich...\p" - .string "RÄTSELMEISTER!\n" - .string "Hahaha! Erfreut dich kennen zu lernen!$" + .string "Behold!\p" + .string "For I am the greatest living mystery\n" + .string "of a man in all of HOENN!\l" + .string "They call me...\p" + .string "The TRICK MASTER!\n" + .string "Wahahaha! Glad to meet you!$" Route110_TrickHouseEntrance_Text_19BD82:: @ 819BD82 - .string "Du, du bist hier, um mein RÄTSELHAUS\n" - .string "herauszufordern, oder?\p" - .string "Deshalb bist du doch hier?\n" - .string "Ja, ja, so muss es sein!\p" - .string "Betrachte deine Herausforderung als\n" - .string "angenommen!\p" - .string "Trete hinter diese Schriftrolle und\n" - .string "die Herausforderung beginnt!\p" - .string "Ich warte im hinteren Bereich!$" + .string "You, you’ve come to challenge my\n" + .string "TRICK HOUSE, haven’t you?\p" + .string "That’s why you’re here, isn’t it?\n" + .string "Yes, it is!\p" + .string "Consider your challenge accepted!\p" + .string "Enter through the scroll there,\n" + .string "and let your challenge commence!\p" + .string "I shall be waiting in the back!$" Route110_TrickHouseEntrance_Text_19BE6E:: @ 819BE6E - .string "Das ist eine Schriftrolle.$" + .string "It’s a scroll.$" Route110_TrickHouseEntrance_Text_19BE7D:: @ 819BE7D - .string "Hinter der Schriftrolle ist ein Loch!\p" - .string "Möchtest du hindurchgehen?$" + .string "There is a big hole behind the scroll!\p" + .string "Want to go in?$" Route110_TrickHouseEntrance_Text_19BEB3:: @ 819BEB3 - .string "Auf der Schriftrolle steht etwas...\p" - .string "“Ich bin auf eine Reise gegangen.\n" - .string "Sucht mich nicht. RÄTSELMEISTER”$" + .string "There is a note affixed to the scroll...\p" + .string "“I am leaving on a journey.\n" + .string "Don’t look for me. TRICK MASTER”$" Route110_TrickHouseEntrance_Text_19BF19:: @ 819BF19 - .string "Nächstes Mal nehme ich diesen Trick,\n" - .string "nach diesem Schema und mit List und...\p" - .string "Ähähähä... Ich muss sagen, ich habe mich\n" - .string "in meiner Brillanz mal wieder selbst\l" - .string "übertroffen!$" + .string "For the next time, I’ll use this trick,\n" + .string "and that scheme, and those ruses...\p" + .string "Mufufufu... If I may say so, it’s\n" + .string "brilliantly difficult, even for me!$" Route110_TrickHouseEntrance_Text_19BFAB:: @ 819BFAB - .string "Hah! Was???\n" - .string "Ach, du bist das!\p" - .string "Ich bin gerade dabei, mir neue Tricks\n" - .string "und Herausforderungen auszudenken!\p" - .string "Es ist doch nicht zu viel verlangt, mir\n" - .string "noch etwas Zeit zum Nachdenken zu\l" - .string "geben, oder? Das ist mir doch gegönnt,\l" - .string "oder? Danke. Komm später wieder!$" + .string "Hah? What?!\n" + .string "Oh, it’s you!\p" + .string "I’m in the midst of devising new tricky\n" + .string "challenges!\p" + .string "It’s not too much to ask for a bit more\n" + .string "time for me to think, is it now?\l" + .string "You wouldn’t begrudge me that?\l" + .string "Come back in a little while!$" Route110_TrickHouseEntrance_Text_19C07E:: @ 819C07E - .string "Ah, du bist es! Du willst dir deine\n" - .string "Belohnung von eben abholen, habe ich\l" - .string "Recht? Natürlich habe ich Recht!\p" - .string "Hier!\n" - .string "Das ist für dich!$" + .string "Ah, it’s you! You’re here to accept the\n" + .string "reward from before, isn’t that right?\l" + .string "Yes, right I am!\p" + .string "Here!\n" + .string "I’ll give it to you now!$" Route110_TrickHouseEntrance_Text_19C0FC:: @ 819C0FC - .string "Was? Du kommst nicht, um deine\n" - .string "Belohnung abzuholen?$" + .string "Hah?\n" + .string "Did you not come to claim your reward?$" Route110_TrickHouseEntrance_Text_19C128:: @ 819C128 - .string "ROBOPUPPE 5 BIN ICH!\n" - .string "HOLST DU DIE BELOHNUNG NICHT AB,\l" - .string "DANN KANNST DU RÄTSELMEISTER NICHT\l" - .string "FOLGEN!$" + .string "MECHADOLL 5 I AM!\n" + .string "IF REWARD IS NOT TAKEN BY YOU,\l" + .string "THEN TRICK MASTER YOU CANNOT FOLLOW.$" Route110_TrickHouseEntrance_Text_19C17E:: @ 819C17E - .string "DANN LEBE WOHL.$" + .string "THEN FAREWELL.$" Route110_TrickHouseEntrance_Text_19C18D:: @ 819C18D - .string "PC-STATUS: WIEDER VOLL.\n" - .string "GEMEIN DU BIST.$" + .string "YOUR PC STATUS: FULL AGAIN.\n" + .string "MEAN, YOU ARE.$" diff --git a/data/text/maps/Route110_TrickHousePuzzle1.inc b/data/text/maps/Route110_TrickHousePuzzle1.inc index 96eb9115e..84208ead5 100644 --- a/data/text/maps/Route110_TrickHousePuzzle1.inc +++ b/data/text/maps/Route110_TrickHousePuzzle1.inc @@ -1,40 +1,38 @@ Route110_TrickHousePuzzle1_Text_19CB4F:: @ 819CB4F - .string "Ich habe mir den Weg zum Sieg mit dem\n" - .string "ZERSCHNEIDER, den wir gerade gelernt\l" - .string "haben, gebahnt.$" + .string "I’ll hack and slash my way to victory\n" + .string "with the CUT we just learned!$" Route110_TrickHousePuzzle1_Text_19CB93:: @ 819CB93 - .string "Warum nimmst du das so ernst?$" + .string "Why are you so serious?$" Route110_TrickHousePuzzle1_Text_19CBAB:: @ 819CBAB - .string "Ich werde des Hackens und\n" - .string "Schneidens nie müde!$" + .string "I never get tired of hacking\n" + .string "and slashing!$" Route110_TrickHousePuzzle1_Text_19CBD6:: @ 819CBD6 - .string "Ich bin nur zufällig in diesem\n" - .string "verrückten Haus gelandet...$" + .string "I wandered into this weird house\n" + .string "by accident...$" Route110_TrickHousePuzzle1_Text_19CC06:: @ 819CC06 - .string "Und nun habe ich verloren...$" + .string "And now I’ve lost...$" Route110_TrickHousePuzzle1_Text_19CC1B:: @ 819CC1B - .string "Ich bin vom Weg abgekommen, ich habe\n" - .string "verloren und bin verloren. Ich finde den\l" - .string "Ausgang nicht mehr...$" + .string "I lost my way, I lost a battle, and I’m\n" + .string "even more lost... I can’t get out...$" Route110_TrickHousePuzzle1_Text_19CC68:: @ 819CC68 - .string "Wer ist dieser RÄTSELMEISTER bloß?$" + .string "Just who is the TRICK MASTER?$" Route110_TrickHousePuzzle1_Text_19CC86:: @ 819CC86 - .string "Ich verlor ganz gedankenverloren.$" + .string "I lost while I was lost in thought!$" Route110_TrickHousePuzzle1_Text_19CCAA:: @ 819CCAA - .string "Du bist stark!\n" - .string "Wer bist du eigentlich?$" + .string "You’re strong!\n" + .string "Just who are you?$" UnknownString_819CCCB: @ 819CCCB - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“RÄTSELMEISTER ist gewieft.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is smart.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHousePuzzle2.inc b/data/text/maps/Route110_TrickHousePuzzle2.inc index a737ec0cf..cb64f04d8 100644 --- a/data/text/maps/Route110_TrickHousePuzzle2.inc +++ b/data/text/maps/Route110_TrickHousePuzzle2.inc @@ -1,40 +1,39 @@ Route110_TrickHousePuzzle2_Text_19CD46:: @ 819CD46 - .string "Welcher Schalter schließt welches Loch?$" + .string "Which switch closes which hole?$" Route110_TrickHousePuzzle2_Text_19CD66:: @ 819CD66 - .string "Nach diesem Kampf bin ich nur noch\n" - .string "verwirrter!$" + .string "After that battle, I’m even more\n" + .string "confused!$" Route110_TrickHousePuzzle2_Text_19CD91:: @ 819CD91 - .string "Kannst du nicht alle Schalter für mich\n" - .string "betätigen?$" + .string "Can I get you to push all the buttons\n" + .string "for me?$" Route110_TrickHousePuzzle2_Text_19CDBF:: @ 819CDBF - .string "Oh! Du forderst das RÄTSELHAUS schon\n" - .string "zum zweiten Mal heraus!?!$" + .string "Oh! You’re on your second TRICK HOUSE\n" + .string "challenge!$" Route110_TrickHousePuzzle2_Text_19CDF0:: @ 819CDF0 - .string "Du bist auch im Kämpfen so gut!?!$" + .string "You’re good at battling too?$" Route110_TrickHousePuzzle2_Text_19CE0D:: @ 819CE0D - .string "Der RÄTSELMEISTER tüftelt alle Tricks\n" - .string "in diesem Haus selber aus.$" + .string "The TRICK MASTER rigged all the tricks\n" + .string "in this house all by himself.$" Route110_TrickHousePuzzle2_Text_19CE52:: @ 819CE52 - .string "Eines Tages gründe ich meine eigene\n" - .string "ARENA. Und hier studiere ich die Fallen.$" + .string "I want to make my own GYM one day.\n" + .string "So, I’m studying how to set traps.$" Route110_TrickHousePuzzle2_Text_19CE98:: @ 819CE98 - .string "Ich habe das Kämpfen nicht genug\n" - .string "studiert!$" + .string "I didn’t study battling enough!$" Route110_TrickHousePuzzle2_Text_19CEB8:: @ 819CEB8 - .string "Du bist stark, nicht wahr?\n" - .string "Stark genug, ein ARENALEITER zu sein.$" + .string "You’re strong, aren’t you?\n" + .string "Maybe even enough to be a GYM LEADER!$" UnknownString_819CEF9: @ 819CEF9 - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“RÄTSELMEISTER ist gefragt.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is coveted.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHousePuzzle3.inc b/data/text/maps/Route110_TrickHousePuzzle3.inc index de3c0116d..01287a068 100644 --- a/data/text/maps/Route110_TrickHousePuzzle3.inc +++ b/data/text/maps/Route110_TrickHousePuzzle3.inc @@ -1,43 +1,41 @@ Route110_TrickHousePuzzle3_Text_19CF76:: @ 819CF76 - .string "Ich laufe und laufe und lande immer\n" - .string "wieder hier.$" + .string "I keep coming back to this same place!$" Route110_TrickHousePuzzle3_Text_19CF9D:: @ 819CF9D - .string "Ich habe eh schon Probleme und dann\n" - .string "musst du mich auch noch besiegen? Pfui.$" + .string "I’m already having trouble, and then\n" + .string "you have to beat me? It’s not fair!$" Route110_TrickHousePuzzle3_Text_19CFE6:: @ 819CFE6 - .string "Hier sieht man vor lauter Türen den Aus-\n" - .string "gang nicht! Ich bin total verwirrt...$" + .string "It’s full of doors here!\n" + .string "It’s too small and dark in here! Help!$" Route110_TrickHousePuzzle3_Text_19D026:: @ 819D026 - .string "Ich weiß nicht, was hier vorgeht.\n" - .string "Ich habe ein ganz schlechtes Gefühl...$" + .string "I don’t know what’s going on here.\n" + .string "I’m starting to feel sad...$" Route110_TrickHousePuzzle3_Text_19D065:: @ 819D065 - .string "Du... Du bist furchtbar!$" + .string "You... You’re awful!$" Route110_TrickHousePuzzle3_Text_19D07A:: @ 819D07A - .string "Ich weiß, ich bin schwach! Ich weiß\n" - .string "nicht, in welche Richtung es weitergeht.$" + .string "I know I’m weak!\n" + .string "And, I have no sense of direction!$" Route110_TrickHousePuzzle3_Text_19D0AE:: @ 819D0AE - .string "Ich verstehe es nicht. Was macht einer\n" - .string "mit so einem bizarren Haus???$" + .string "I don’t get it. What would anyone want\n" + .string "with a house this bizarre?$" Route110_TrickHousePuzzle3_Text_19D0F0:: @ 819D0F0 - .string "Ich verstehe es wieder nicht.\n" - .string "Wie konnte ich jetzt verlieren?$" + .string "I don’t get it.\n" + .string "How did I lose?$" Route110_TrickHousePuzzle3_Text_19D110:: @ 819D110 - .string "Ich habe absolut keine Ahnung...\n" - .string "Wie viele Fallen gibt es in diesem Haus?\p" - .string "Du kannst mir das bestimmt\n" - .string "beantworten!$" + .string "I don’t get it.\n" + .string "How many traps are in this house?\p" + .string "You may be the one to solve that.$" UnknownString_819D164: @ 819D164 - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“RÄTSELMEISTER ist cool.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is cool.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHousePuzzle4.inc b/data/text/maps/Route110_TrickHousePuzzle4.inc index 126a27eab..293e5ab93 100644 --- a/data/text/maps/Route110_TrickHousePuzzle4.inc +++ b/data/text/maps/Route110_TrickHousePuzzle4.inc @@ -1,41 +1,40 @@ Route110_TrickHousePuzzle4_Text_19D1DE:: @ 819D1DE - .string "Ich habe keine Zeit, das zu verstehen.\n" - .string "Ich will nur kämpfen!$" + .string "It’s too much bother to think this out.\n" + .string "I only wanted to battle!$" Route110_TrickHousePuzzle4_Text_19D21F:: @ 819D21F - .string "Auch wenn ich verloren habe, liebe ich\n" - .string "das Kämpfen.$" + .string "Even though I lost, I still like battling\n" + .string "the best!$" Route110_TrickHousePuzzle4_Text_19D253:: @ 819D253 - .string "Stimmst du mir zu? Du würdest überall\n" - .string "hingehen, wo man TRAINER findet.$" + .string "Wouldn’t you agree? You would go\n" + .string "anywhere if TRAINERS were there.$" Route110_TrickHousePuzzle4_Text_19D295:: @ 819D295 - .string "Hey! Felsen wie diese räume ich mit\n" - .string "dem kleinen Finger aus dem Weg.$" + .string "Heh! Boulders like this, I can brush\n" + .string "aside with one finger!$" Route110_TrickHousePuzzle4_Text_19D2D1:: @ 819D2D1 - .string "Ich kann Felsen bewegen, aber ein\n" - .string "Rätsel zu lösen ist mir zu schwer...$" + .string "I can push boulders, but I can’t solve\n" + .string "the puzzle...$" Route110_TrickHousePuzzle4_Text_19D306:: @ 819D306 - .string "Muskeln alleine sind nicht alles... Auch\n" - .string "Gehirnschmalz ist wichtig. Sei helle!$" + .string "It’s not good enough to be brawny...\n" + .string "You have to use your head. Be brainy!$" Route110_TrickHousePuzzle4_Text_19D351:: @ 819D351 - .string "Das RÄTSELHAUS wird immer\n" - .string "verrätselter... äh, komplizierter, oder?$" + .string "The TRICK HOUSE is getting trickier,\n" + .string "isn’t it?$" Route110_TrickHousePuzzle4_Text_19D380:: @ 819D380 - .string "Aaaak!$" + .string "Aaak!$" Route110_TrickHousePuzzle4_Text_19D386:: @ 819D386 - .string "Hat es jemand schon mal bis zum\n" - .string "Ende geschafft?$" + .string "Has anyone made it to the end?$" UnknownString_819D3A5: @ 819D3A5 - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“RÄTSELMEISTER ist ein Genie.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is a genius.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHousePuzzle5.inc b/data/text/maps/Route110_TrickHousePuzzle5.inc index 69870f2c8..8cddc3f65 100644 --- a/data/text/maps/Route110_TrickHousePuzzle5.inc +++ b/data/text/maps/Route110_TrickHousePuzzle5.inc @@ -1,144 +1,141 @@ Route110_TrickHousePuzzle5_Text_19D423:: @ 819D423 - .string "KLICK-KLACK...\n" - .string "ROBOPUPPE 1 ICH BIN!\p" - .string "GIBST DU IM QUIZ RICHTIGE ANTWORTEN,\n" - .string "ERREICHST DU BALD ROBOPUPPE 5.\l" - .string "DORT ERHÄLTST DU DEN GEHEIMEN CODE.$" + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 1 AM I!\p" + .string "IF YOU ANSWER QUIZZES CORRECTLY,\n" + .string "THEN YOU WILL GO TO MECHADOLL 5.\l" + .string "THEN YOU CAN OBTAIN THE SECRET CODE.$" Route110_TrickHousePuzzle5_Text_19D4AE:: @ 819D4AE - .string "ROBOPUPPE 1 QUIZ.\p" - .string "Eines dieser POKéMON kann man nicht\n" - .string "auf der ROUTE 103 finden. Welches?$" + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON is not found\n" + .string "on ROUTE 103. Which one is it?$" Route110_TrickHousePuzzle5_Text_19D501:: @ 819D501 - .string "ROBOPUPPE 1 QUIZ.\p" - .string "Eines dieser POKéMON ist kein\n" - .string "PFLANZEN-POKéMON. Welches?$" + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON is not of the\n" + .string "GRASS type. Which one is it?$" Route110_TrickHousePuzzle5_Text_19D553:: @ 819D553 - .string "ROBOPUPPE 1 QUIZ.\p" - .string "Eines dieser POKéMON setzt\n" - .string "KRATZER ein. Welches?$" + .string "MECHADOLL 1 QUIZ.\p" + .string "One of these POKéMON uses SCRATCH.\n" + .string "Which one is it?$" Route110_TrickHousePuzzle5_Text_19D599:: @ 819D599 - .string "GLÜCKWUNSCH! RICHTIG.\n" - .string "GEHE HINDURCH. BITTE.$" + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" Route110_TrickHousePuzzle5_Text_19D5CF:: @ 819D5CF - .string "BZZZT. ENTTÄUSCHEND.\n" - .string "FEHLER.$" + .string "BZZZT. DISAPPOINTMENT.\n" + .string "ERROR.$" Route110_TrickHousePuzzle5_Text_19D5ED:: @ 819D5ED .string "WAHAHAHAHA! WAHAHAHAHA!\n" - .string "KLICK-KLACK!$" + .string "CLICKETY-CLACK!$" Route110_TrickHousePuzzle5_Text_19D615:: @ 819D615 - .string "DEINE NÄCHSTE HERAUSFORDERUNG WIR\n" - .string "ERWARTEN.$" + .string "YOUR NEXT CHALLENGE WE WAIT FOR.$" Route110_TrickHousePuzzle5_Text_19D636:: @ 819D636 - .string "KLICK-KLACK...\n" - .string "ROBOPUPPE 2 ICH BIN!\p" - .string "ROBOPUPPE 1 QUIZ-SCHWIERIGKEITS-\n" - .string "GRAD IST ZU NIEDRIG.$" + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 2 AM I!\p" + .string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n" + .string "IS SET TOO LOW.$" Route110_TrickHousePuzzle5_Text_19D68E:: @ 819D68E - .string "ROBOPUPPE 2 QUIZ.\p" - .string "In PROF. BIRKS Beutel befanden sich\n" - .string "drei POKéMON. Welches lag ganz rechts?$" + .string "MECHADOLL 2 QUIZ.\p" + .string "In PROF. BIRCH’s bag, there were three\n" + .string "POKéMON. Which one was at the right?$" Route110_TrickHousePuzzle5_Text_19D6EC:: @ 819D6EC - .string "ROBOPUPPE 2 QUIZ.\p" - .string "Welches POKéMON wurde in der POKéMON\n" - .string "TRAINERSCHULE zum Tausch angeboten?$" + .string "MECHADOLL 2 QUIZ.\p" + .string "Which POKéMON was offered for a trade\n" + .string "at the POKéMON TRAINER’S SCHOOL?$" Route110_TrickHousePuzzle5_Text_19D745:: @ 819D745 - .string "ROBOPUPPE 2 QUIZ.\p" - .string "Welches POKéMON hat der FORSCHER von\n" - .string "DEVON im BLÜTENBURGWALD gesucht?$" + .string "MECHADOLL 2 QUIZ.\p" + .string "The DEVON RESEARCHER was looking for\n" + .string "what POKéMON in PETALBURG WOODS?$" UnknownString_819D79D: @ 819D79D - .string "GLÜCKWUNSCH! RICHTIG.\n" - .string "GEHE HINDURCH. BITTE.$" + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" Route110_TrickHousePuzzle5_Text_19D7D3:: @ 819D7D3 - .string "KLICK-KLACK...\n" - .string "ROBOPUPPE 3 ICH BIN!\p" - .string "FÜR MICH ZÄHLT NUR GELD.$" + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 3 AM I!\p" + .string "MATTERS OF MONEY ARE MY SOLE FOCUS.$" Route110_TrickHousePuzzle5_Text_19D81B:: @ 819D81B - .string "ROBOPUPPE 3 QUIZ.\p" - .string "Was ist teurer?\n" - .string "Drei POKéBÄLLE oder ein SUPERTRANK?$" + .string "MECHADOLL 3 QUIZ.\p" + .string "Which costs more?\n" + .string "Three POKé BALLS or one SUPER POTION?$" Route110_TrickHousePuzzle5_Text_19D865:: @ 819D865 - .string "ROBOPUPPE 3 QUIZ.\p" - .string "Verkaufe ein FLUCHTSEIL und kaufe ein\n" - .string "GEGENGIFT. Wie viel Geld bleibt übrig?$" + .string "MECHADOLL 3 QUIZ.\p" + .string "Sell one ESCAPE ROPE and buy\n" + .string "one ANTIDOTE. How much money remains?$" Route110_TrickHousePuzzle5_Text_19D8BA:: @ 819D8BA - .string "ROBOPUPPE 3 QUIZ.\p" - .string "Kosten ein HYPERHEILER und ein\n" - .string "SUPERBALL mehr als ein BELEBER?$" + .string "MECHADOLL 3 QUIZ.\p" + .string "Do one FULL HEAL and GREAT BALL\n" + .string "cost more than one REVIVE?$" UnknownString_819D907: @ 819D907 - .string "GLÜCKWUNSCH! RICHTIG.\n" - .string "GEHE HINDURCH. BITTE.$" + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" Route110_TrickHousePuzzle5_Text_19D93D:: @ 819D93D - .string "KLICK-KLACK...\n" - .string "ROBOPUPPE 4 ICH BIN!\p" - .string "ICH INTERESSIERE MICH FÜR SCHÖNES.$" + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 4 THAT IS ME!\p" + .string "MY QUIZ IS AN OBJECT OF BEAUTY.$" Route110_TrickHousePuzzle5_Text_19D987:: @ 819D987 - .string "ROBOPUPPE 4 QUIZ.\p" - .string "ARENALEITERIN FELIZIA in METAROST\n" - .string "CITY kämpft mit KLEINSTEIN. Ist es\l" - .string "männlich oder weiblich?$" + .string "MECHADOLL 4 QUIZ.\p" + .string "RUSTBORO GYM LEADER ROXANNE used a\n" + .string "GEODUDE. Was it male or female?$" Route110_TrickHousePuzzle5_Text_19D9DC:: @ 819D9DC - .string "ROBOPUPPE 4 QUIZ.\p" - .string "Befanden sich in der FAUSTAUHAVEN\n" - .string "HALLE mehr Männer oder mehr Frauen?$" + .string "MECHADOLL 4 QUIZ.\p" + .string "In DEWFORD HALL, were there more men\n" + .string "or women?$" Route110_TrickHousePuzzle5_Text_19DA1D:: @ 819DA1D - .string "ROBOPUPPE 4 QUIZ.\p" - .string "Der erste TRAINER in der ARENA von\n" - .string "FAUSTAUHAVEN, war der männlich oder\l" - .string "weiblich?$" + .string "MECHADOLL 4 QUIZ.\p" + .string "The first TRAINER in DEWFORD GYM was\n" + .string "male or female?$" UnknownString_819DA64: @ 819DA64 - .string "GLÜCKWUNSCH! RICHTIG.\n" - .string "GEHE HINDURCH. BITTE.$" + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" Route110_TrickHousePuzzle5_Text_19DA9A:: @ 819DA9A - .string "KLICK-KLACK...\n" - .string "ROBOPUPPE 5 ICH BIN!\p" - .string "DES MEISTERS BESTE UND STOLZESTE\n" - .string "ERFINDUNG ICH BIN.$" + .string "CLICKETY-CLACK...\n" + .string "MECHADOLL 5 AM I!\p" + .string "THE MASTER’S BEST AND PROUDEST\n" + .string "ACHIEVEMENT AM I.$" Route110_TrickHousePuzzle5_Text_19DAEF:: @ 819DAEF - .string "ROBOPUPPE 5 QUIZ.\p" - .string "Wie viele RÄDER stehen bei\n" - .string "RADLA vor dem Laden?$" + .string "MECHADOLL 5 QUIZ.\p" + .string "How many BIKES does RYDEL have on\n" + .string "display outside his cycle shop?$" Route110_TrickHousePuzzle5_Text_19DB43:: @ 819DB43 - .string "ROBOPUPPE 5 QUIZ.\p" - .string "Von wie vielen Leuten bekommst du im\n" - .string "BLÜTENTRAUM BLUMENLADEN BEEREN?$" + .string "MECHADOLL 5 QUIZ.\p" + .string "How many people give you BERRIES at the\n" + .string "PRETTY PETAL flower shop?$" Route110_TrickHousePuzzle5_Text_19DB97:: @ 819DB97 - .string "ROBOPUPPE 5 QUIZ.\p" - .string "Wie viele Schilder gibt es in\n" - .string "SEEGRASULB CITY?$" + .string "MECHADOLL 5 QUIZ.\p" + .string "How many signs are there in\n" + .string "LILYCOVE CITY?$" UnknownString_819DBD4: @ 819DBD4 - .string "GLÜCKWUNSCH! RICHTIG.\n" - .string "GEHE HINDURCH. BITTE.$" + .string "CONGRATULATIONS. CORRECT YOU ARE.\n" + .string "GO THROUGH. PLEASE.$" UnknownString_819DC0A: @ 819DC0A - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“RÄTSELMEISTER ist mein Leben.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is my life.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHousePuzzle6.inc b/data/text/maps/Route110_TrickHousePuzzle6.inc index 0bf347297..7fb5aa914 100644 --- a/data/text/maps/Route110_TrickHousePuzzle6.inc +++ b/data/text/maps/Route110_TrickHousePuzzle6.inc @@ -1,43 +1,42 @@ Route110_TrickHousePuzzle6_Text_19DC87:: @ 819DC87 - .string "Als ich von dem seltsamen Haus hörte,\n" - .string "musste ich mir das sofort ansehen.$" + .string "When I heard there was a strange\n" + .string "house, I had to check it out.$" Route110_TrickHousePuzzle6_Text_19DCC6:: @ 819DCC6 - .string "Ich habe einen starken TRAINER\n" - .string "entdeckt!$" + .string "I’ve discovered a tough TRAINER!$" Route110_TrickHousePuzzle6_Text_19DCE7:: @ 819DCE7 - .string "Es hat viel Spaß gemacht, diesen Ort zu\n" - .string "erforschen.\p" - .string "Eine Herausforderung, die ich gerne\n" - .string "wiederholen möchte!$" + .string "I’m sure having a good time checking\n" + .string "this place out.\p" + .string "It’s a challenge I’ve found worth\n" + .string "repeating!$" Route110_TrickHousePuzzle6_Text_19DD49:: @ 819DD49 - .string "Vielleicht kann mein VOGEL-POKéMON\n" - .string "über die Mauer fliegen...$" + .string "Maybe I could get my BIRD POKéMON\n" + .string "to fly over the wall...$" Route110_TrickHousePuzzle6_Text_19DD83:: @ 819DD83 - .string "Uaah! Ich hab’s vermasselt!$" + .string "Gwaaah! I blew it!$" Route110_TrickHousePuzzle6_Text_19DD96:: @ 819DD96 - .string "Hihihihi... Ich habe doch nur verloren,\n" - .string "weil ich bescheißen wollte.$" + .string "Ehehehe... I guess I lost because I\n" + .string "was trying to cheat.$" Route110_TrickHousePuzzle6_Text_19DDCF:: @ 819DDCF - .string "Mir wird ganz schwindelig von diesen\n" - .string "rotierenden Türen... Huuh...$" + .string "I’m getting dizzy from these rotating\n" + .string "doors...$" Route110_TrickHousePuzzle6_Text_19DDFE:: @ 819DDFE - .string "Bei mir dreht sich alles. Mir wird übel.\n" - .string "Ich kann nicht mehr...$" + .string "Everything’s spinning around and\n" + .string "around. I can’t take this anymore...$" Route110_TrickHousePuzzle6_Text_19DE44:: @ 819DE44 - .string "Dir scheint das gar nichts auszumachen.\n" - .string "Oder ist das nur Show?$" + .string "You don’t seem to be affected at all.\n" + .string "Or do you have your poker face on?$" UnknownString_819DE8D: @ 819DE8D - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“RÄTSELMEISTER ist riesig.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER is huggable.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHousePuzzle7.inc b/data/text/maps/Route110_TrickHousePuzzle7.inc index 3111fcb65..e8ce4b3a4 100644 --- a/data/text/maps/Route110_TrickHousePuzzle7.inc +++ b/data/text/maps/Route110_TrickHousePuzzle7.inc @@ -1,42 +1,42 @@ Route110_TrickHousePuzzle7_Text_19DF0B:: @ 819DF0B - .string "Der RÄTSELMEISTER verschwindet immer\n" - .string "wie Rauch. Wie macht er das nur?$" + .string "The TRICK MASTER always vanishes\n" + .string "like smoke. How does he do it?$" Route110_TrickHousePuzzle7_Text_19DF4B:: @ 819DF4B - .string "Aiijeeh! Du bist viel zu stark!\n" - .string "Wie machst du das nur?$" + .string "Aiyeeeh! You’re much too strong!\n" + .string "How do you do it?$" Route110_TrickHousePuzzle7_Text_19DF7E:: @ 819DF7E - .string "Ich wollte, ich könnte mich auch wie\n" - .string "Rauch in Luft auflösen...$" + .string "I wish I could appear and disappear as\n" + .string "if I were smoke, too.$" Route110_TrickHousePuzzle7_Text_19DFBB:: @ 819DFBB - .string "Immer am gleichen Ort herumgeistern...\n" - .string "Das bringt Unglück...$" + .string "Going around the same spot...\n" + .string "It begets ill fortune...$" Route110_TrickHousePuzzle7_Text_19DFF2:: @ 819DFF2 - .string "Besiegt!\n" - .string "Das ist ein schlechtes Omen...$" + .string "Defeated!\n" + .string "It’s a bad sign...$" Route110_TrickHousePuzzle7_Text_19E00F:: @ 819E00F - .string "Ich bin nun schon zehn Mal an diesem Ort\n" - .string "herumgegeistert. Daher hatte ich Pech!$" + .string "I’ve circled the same spot over ten\n" + .string "times now... It’s ill fortune...$" Route110_TrickHousePuzzle7_Text_19E054:: @ 819E054 - .string "Ich glaube, der Sieger wird der erste\n" - .string "Gewinner an diesem Ort überhaupt sein.$" + .string "Whoever wins will get through here\n" + .string "first. That’s the feeling I get.$" Route110_TrickHousePuzzle7_Text_19E098:: @ 819E098 - .string "Ah!\n" - .string "Dann geh hurtig weiter!$" + .string "Oh!\n" + .string "Well, go ahead, then!$" Route110_TrickHousePuzzle7_Text_19E0B2:: @ 819E0B2 - .string "Ich glaube, du wirst alle Rätsel in\n" - .string "diesem RÄTSELHAUS lösen!$" + .string "You’re solving all the puzzles in the\n" + .string "TRICK HOUSE. That’s the feeling I get.$" UnknownString_819E0FF: @ 819E0FF - .string "{PLAYER} hat den geheimen Code auf die\n" - .string "Tür geschrieben.\p" - .string "“Ich liebe den RÄTSELMEISTER.”\n" + .string "{PLAYER} wrote down the secret code\n" + .string "on the door.\p" + .string "“TRICK MASTER I love.”\n" .string "... ... ... ... ... ... ... ...\p" - .string "Das Schloss geht klickend auf.$" + .string "The lock clicked open!$" diff --git a/data/text/maps/Route110_TrickHousePuzzle8.inc b/data/text/maps/Route110_TrickHousePuzzle8.inc index 74a7c868b..8b0025bfb 100644 --- a/data/text/maps/Route110_TrickHousePuzzle8.inc +++ b/data/text/maps/Route110_TrickHousePuzzle8.inc @@ -1,34 +1,34 @@ Route110_TrickHousePuzzle8_Text_19E178:: @ 819E178 - .string "Nicht viele TRAINER haben es bis\n" - .string "hierher geschafft.$" + .string "Not many TRAINERS have made it\n" + .string "this far.$" Route110_TrickHousePuzzle8_Text_19E1A1:: @ 819E1A1 - .string "Das bedeutet, dass du sehr stark bist...$" + .string "That must mean you’re tough, too...$" Route110_TrickHousePuzzle8_Text_19E1C5:: @ 819E1C5 - .string "Du hast den CHAMP der POKéMON LIGA\n" - .string "besiegt? Das ist zu viel für mich!$" + .string "You’ve beaten the POKéMON LEAGUE\n" + .string "CHAMPION? That’s too much!$" Route110_TrickHousePuzzle8_Text_19E201:: @ 819E201 - .string "Sieh es als Glücksfall an, dass du gegen\n" - .string "mich antreten darfst.$" + .string "Consider yourself lucky to be\n" + .string "battling me!$" Route110_TrickHousePuzzle8_Text_19E22C:: @ 819E22C - .string "Das ist nicht korrekt!\n" - .string "Ich darf nicht verlieren!$" + .string "This isn’t right!\n" + .string "I can’t lose!$" Route110_TrickHousePuzzle8_Text_19E24C:: @ 819E24C - .string "Nur ein Wunder hat dir zu diesem Sieg\n" - .string "verholfen. Prahl doch damit...$" + .string "It’s a miracle that you beat me.\n" + .string "You can brag about it.$" Route110_TrickHousePuzzle8_Text_19E284:: @ 819E284 - .string "Du schleichst hier auch durch das\n" - .string "RÄTSELHAUS?$" + .string "You’ve been slugging through the TRICK\n" + .string "HOUSE challenge, too.$" Route110_TrickHousePuzzle8_Text_19E2C1:: @ 819E2C1 - .string "Ich verstehe...\n" - .string "Du hast einen außergewöhnlichen Stil.$" + .string "I see...\n" + .string "You possess an extraordinary style.$" Route110_TrickHousePuzzle8_Text_19E2EE:: @ 819E2EE - .string "Dein Anblick wird den RÄTSELMEISTER\n" - .string "bestimmt erfreuen.$" + .string "Seeing someone like you should please\n" + .string "the TRICK MASTER.$" diff --git a/data/text/maps/Route111.inc b/data/text/maps/Route111.inc index fc7eba19a..24bcc1008 100644 --- a/data/text/maps/Route111.inc +++ b/data/text/maps/Route111.inc @@ -1,120 +1,119 @@ Route111_Text_16F705:: @ 816F705 - .string "Hallo! Ich hab’s, du bist ein Reisender.\p" - .string "Was hältst du davon? Du trittst mit\n" - .string "deinen POKéMON gegen alle vier Familien-\l" - .string "mitglieder hintereinander an?$" + .string "Hello! I take it you’re a traveler.\p" + .string "How’s this? What do you say to taking\n" + .string "on our family of four in a series of\l" + .string "POKéMON battles?$" Route111_Text_16F785:: @ 816F785 - .string "Ach, wirklich? Nun, wenn du deine\n" - .string "Meinung änderst, komm einfach wieder.$" + .string "Is that so?\n" + .string "Drop in, if you change your mind!$" Route111_Text_16F7B3:: @ 816F7B3 - .string "Das nenne ich Kampfgeist! Ich mag dich!$" + .string "That’s the spirit! I like you!$" Route111_Text_16F7D2:: @ 816F7D2 .string "Aiyah!\n" - .string "Du bist stärker, als ich dachte.$" + .string "You’re a lot tougher than I expected!$" Route111_Text_16F7FF:: @ 816F7FF - .string "Hey, ihr! Ich habe einen starken\n" - .string "TRAINER gefunden!$" + .string "Hey, all!\n" + .string "I’ve found a pretty strong TRAINER!$" Route111_Text_16F82D:: @ 816F82D - .string "Oh, du meine Güte! Bist du jung!\p" - .string "Du musst ein sehr guter TRAINER sein,\n" - .string "wenn du meinen Mann besiegen konntest.\p" - .string "Nun bin ich an der Reihe.$" + .string "Oh, my goodness! Aren’t you young?\p" + .string "You must be quite the TRAINER to beat\n" + .string "my husband, though.\p" + .string "It’s my turn to battle now!$" Route111_Text_16F8A6:: @ 816F8A6 - .string "Ach, nein! Ich komme nicht darüber\n" - .string "hinweg, wie stark du bist!$" + .string "Oh, gosh!\n" + .string "I can’t get over how strong you are!$" Route111_Text_16F8D5:: @ 816F8D5 - .string "Hier draußen ist ein starker TRAINER!\n" - .string "Ein wirklich starker, sage ich euch!$" + .string "There’s a strong TRAINER here!\n" + .string "This one’s really strong!$" Route111_Text_16F90E:: @ 816F90E - .string "Du bist stärker als Mami? Wow!\p" - .string "Aber ich bin auch stark!\n" - .string "Wirklich! Ganz ehrlich!$" + .string "You’re stronger than Mommy? Wow!\p" + .string "But I’m strong, too!\n" + .string "Really! Honestly!$" Route111_Text_16F956:: @ 816F956 - .string "Was? Habe ich verloren?$" + .string "Huh? Did I just lose?$" Route111_Text_16F96C:: @ 816F96C - .string "Das ist gemein...\p" - .string "...Schluchz... Heul... Omaaaaa... Schluchz...$" + .string "This stinks...\p" + .string "...Snivel... Grandma!$" Route111_Text_16F991:: @ 816F991 - .string "Wie konntest du nur meine Enkelin zum\n" - .string "Weinen bringen? Schäm dich!\p" - .string "Dafür werde ich dich in Grund und Boden\n" - .string "stampfen. Mach dich auf was gefasst!$" + .string "How dare you make my granddaughter\n" + .string "cry!\p" + .string "For that, I’m going to smack you!\n" + .string "Prepare to lose!$" Route111_Text_16F9EC:: @ 816F9EC - .string "Uaah! Du bist stark...\n" - .string "Meine Enkelin hatte Recht...$" + .string "Kwah! You are strong...\n" + .string "My granddaughter was right...$" Route111_Text_16FA22:: @ 816FA22 - .string "Wenn du es nicht allzu eilig hast,\n" - .string "besuche uns doch mal wieder!$" + .string "If you’re not in any hurry, visit with\n" + .string "us awhile.$" Route111_Text_16FA54:: @ 816FA54 - .string "Du hast das WURZELFOSSIL gefunden.\p" - .string "Wenn du dieses FOSSIL nimmst,\n" - .string "versinkt das andere im Sand...\p" - .string "Willst du das WURZELFOSSIL nehmen?$" + .string "You found the ROOT FOSSIL.\p" + .string "If this FOSSIL is taken, the other\n" + .string "one will sink into the sand...\p" + .string "Take the ROOT FOSSIL anyway?$" Route111_Text_16FACE:: @ 816FACE - .string "{PLAYER} lässt das WURZELFOSSIL liegen.$" + .string "{PLAYER} left the ROOT FOSSIL alone.$" Route111_Text_16FAED:: @ 816FAED - .string "Du hast das KLAUENFOSSIL gefunden.\p" - .string "Wenn du dieses FOSSIL nimmst,\n" - .string "versinkt das andere im Sand...\p" - .string "Willst du das KLAUENFOSSIL nehmen?$" + .string "You found the CLAW FOSSIL.\p" + .string "If this FOSSIL is taken, the other\n" + .string "one will sink into the sand...\p" + .string "Take the CLAW FOSSIL anyway?$" Route111_Text_16FB67:: @ 816FB67 - .string "{PLAYER} lässt das KLAUENFOSSIL liegen.$" + .string "{PLAYER} left the CLAW FOSSIL alone.$" Route111_Text_16FB86:: @ 816FB86 - .string "Wenn du deine POKéMON nicht ein\n" - .string "bisschen besser trainierst, wird es\l" - .string "schwer, sich hier durchzukämpfen.\p" - .string "Ich habe gehört, dass die TOP VIER der\n" - .string "POKéMON LIGA um einiges schwerer zu\l" - .string "besiegen sind als die ARENALEITER.$" + .string "If you don’t raise your POKéMON some\n" + .string "more, it could be tough to keep winning\l" + .string "up through the ranks.\p" + .string "I’ve heard the POKéMON LEAGUE’s\n" + .string "ELITE FOUR are far stronger than\l" + .string "any GYM LEADER.$" Route111_Text_16FC3A:: @ 816FC3A - .string "Ich habe die Familie SIHGERS heraus-\n" - .string "gefordert und viermal hintereinander\l" - .string "gekämpft... Hinterher war ich kaputt...$" + .string "I challenged the WINSTRATE family,\n" + .string "but four matches in a row is tough\l" + .string "going... They destroyed me.$" Route111_Text_16FC9C:: @ 816FC9C .string "ROUTE 111\n" - .string "{DOWN_ARROW} MALVENFROH CITY$" + .string "{0x7A} MAUVILLE CITY$" Route111_Text_16FCB6:: @ 816FCB6 - .string "“Die Herzen unserer Familie schlagen im\n" - .string "Einklang!”\l" - .string "DAS HAUS DER SIHGERS$" + .string "“Our family’s hearts beat as one!”\n" + .string "THE WINSTRATE’S HOUSE$" Route111_Text_16FCEF:: @ 816FCEF .string "ROUTE 111\n" - .string "{LEFT_ARROW} ROUTE 112$" + .string "{0x7B} ROUTE 112$" Route111_Text_16FD05:: @ 816FD05 .string "ROUTE 111\n" - .string "{LEFT_ARROW} ROUTE 113$" + .string "{0x7B} ROUTE 113$" Route111_Text_16FD1B:: @ 816FD1B - .string "HOTEL DER ALTEN DAME\n" - .string "“Komm, ruh deine müden Knochen aus.”$" + .string "OLD LADY’S REST STOP\n" + .string "“Come in and rest your tired bones.”$" Route111_Text_16FD55:: @ 816FD55 - .string "TIPPS für TRAINER\p" - .string "Ein Indikator für die Stärke eines\n" - .string "POKéMON ist der SP. ANG. Das steht\l" - .string "für “SPEZIAL ANGRIFF”.\p" - .string "SP. VER. steht für “SPEZIAL\n" - .string "VERTEIDIGUNG”.$" + .string "TRAINER TIPS\p" + .string "One of the indicators of a POKéMON’s\n" + .string "powerfulness is SP. ATK. It stands for\l" + .string "“SPECIAL ATTACK.”\p" + .string "Likewise, SP. DEF stands for “SPECIAL\n" + .string "DEFENSE.”$" diff --git a/data/text/maps/Route111_OldLadysRestStop.inc b/data/text/maps/Route111_OldLadysRestStop.inc index e65bb57e7..aeef47a32 100644 --- a/data/text/maps/Route111_OldLadysRestStop.inc +++ b/data/text/maps/Route111_OldLadysRestStop.inc @@ -1,19 +1,19 @@ Route111_OldLadysRestStop_Text_1923AF:: @ 81923AF - .string "Oh, du meine Güte.\n" - .string "Sind deine POKéMON nicht erschöpft?\p" - .string "Wenn du magst, ruhe dich doch hier aus.\n" - .string "Das ist doch eine gute Idee, oder?$" + .string "Oh, dear, dear.\n" + .string "Aren’t your POKéMON exhausted?\p" + .string "If you’d like, rest up here.\n" + .string "That’s a fine idea! You should do that.$" Route111_OldLadysRestStop_Text_192423:: @ 8192423 - .string "Genau.\n" - .string "Nimm dir Zeit und ruhe dich aus.$" + .string "That’s right.\n" + .string "Take your time and rest up!$" Route111_OldLadysRestStop_Text_19244D:: @ 819244D - .string "Oh, du meine Güte.\n" - .string "Sind deine POKéMON immer noch müde?\p" - .string "Dann solltest du dich noch länger hier\n" - .string "ausruhen. Was meinst du?$" + .string "Oh, dear, dear.\n" + .string "Are your POKéMON still tired?\p" + .string "You should take another rest here.\n" + .string "That’s a fine idea. You should do that.$" Route111_OldLadysRestStop_Text_1924C6:: @ 81924C6 - .string "Ach so. Na, das macht doch nichts!\n" - .string "Besuche mich bald wieder.$" + .string "Is that so?\n" + .string "You don’t need to be shy about it.$" diff --git a/data/text/maps/Route111_WinstrateFamilysHouse.inc b/data/text/maps/Route111_WinstrateFamilysHouse.inc index b7342721a..e1986320b 100644 --- a/data/text/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/text/maps/Route111_WinstrateFamilysHouse.inc @@ -1,49 +1,43 @@ Route111_WinstrateFamilysHouse_Text_191FCE:: @ 8191FCE - .string "Ich habe noch nie einen TRAINER ge-\n" - .string "sehen, der seine POKéMON so meister-\l" - .string "haft einsetzt wie du.\p" - .string "Aber, ich muss dir auch sagen... Mein\n" - .string "Sohn ist stärker als du.\p" - .string "Er hat sogar die POKéMON LIGA heraus-\n" - .string "gefordert. Das solltest du wissen.$" + .string "You’re the first TRAINER I’ve seen who\n" + .string "deploys POKéMON so masterfully.\p" + .string "But, I should tell you - my son is\n" + .string "stronger than you.\p" + .string "He even took the POKéMON LEAGUE\n" + .string "challenge, I’ll have you know.$" Route111_WinstrateFamilysHouse_Text_19208A:: @ 819208A - .string "Wir benutzen dieses MACHOBAND, um die\n" - .string "POKéMON im Training noch mehr\l" - .string "zu stärken.\p" - .string "Da du unsere gesamte Familie besiegt\n" - .string "hast, brauchst du es vielleicht gar\l" - .string "nicht. Aber wir möchten dir dieses\l" - .string "MACHOBAND trotzdem gerne schenken.$" + .string "We use this MACHO BRACE to more\n" + .string "effectively strengthen our POKéMON\l" + .string "in training.\p" + .string "Since you’ve beaten our entire family,\n" + .string "I don’t know if you need it, but we\l" + .string "would like you to have our MACHO BRACE.$" Route111_WinstrateFamilysHouse_Text_19214D:: @ 819214D - .string "Wenn es um POKéMON-Kämpfe geht, ist\n" - .string "die ganze Familie sehr leidenschaftlich.$" + .string "When it comes to POKéMON battles,\n" + .string "we tend to be pretty passionate.$" Route111_WinstrateFamilysHouse_Text_192190:: @ 8192190 - .string "Mami ist stärker als Papi.\p" - .string "Ich bin stärker als Mami.\p" - .string "Und Omi ist stärker als ich!\p" - .string "Und mein großer Bruder ist noch\n" - .string "stärker als Omi!$" + .string "Mommy is stronger than Daddy.\p" + .string "I’m stronger than Mommy.\p" + .string "And Grandma’s stronger than me!\p" + .string "But my big brother is even stronger\n" + .string "than Grandma.$" Route111_WinstrateFamilysHouse_Text_192219:: @ 8192219 - .string "Es steht außer Frage, dass du stark\n" - .string "bist.\p" - .string "Aber wenn du gegen meinen Enkel an-\n" - .string "treten willst, bringt dir das nur Tränen\l" - .string "der Frustration ein.\p" - .string "Er ist viel stärker als jeder TRAINER,\n" - .string "den unsere Familie kennt.\p" - .string "Er müsste jetzt gerade eigentlich dabei\n" - .string "sein, die POKéMON LIGA\l" - .string "herauszufordern.\p" - .string "Wie ich meinen Enkel kenne, ist er\n" - .string "mittlerweile bestimmt schon der CHAMP!$" + .string "There’s no question that you’re strong.\p" + .string "But if you were to battle my grandson,\n" + .string "you’d end up crying in frustration.\p" + .string "He’s much stronger than any TRAINER\n" + .string "our family knows.\p" + .string "He must be challenging the POKéMON\n" + .string "LEAGUE CHAMPION by now.\p" + .string "Knowing my grandson, he could be the\n" + .string "CHAMPION already!$" Route111_WinstrateFamilysHouse_Text_192334:: @ 8192334 - .string "Mein Enkel müsste jetzt gerade dabei\n" - .string "sein, die POKéMON LIGA\l" - .string "herauszufordern.\p" - .string "Wie ich meinen Enkel kenne, ist er\n" - .string "mittlerweile bestimmt schon der CHAMP!$" + .string "My grandson must be challenging the\n" + .string "POKéMON LEAGUE CHAMPION by now.\p" + .string "Knowing my grandson, he could be the\n" + .string "CHAMPION already!$" diff --git a/data/text/maps/Route112.inc b/data/text/maps/Route112.inc index dfda876ce..c967c562c 100644 --- a/data/text/maps/Route112.inc +++ b/data/text/maps/Route112.inc @@ -1,28 +1,27 @@ Route112_Text_16FDF0:: @ 816FDF0 - .string "Grummel...\p" - .string "Wo bleiben nur die anderen, die in LAUB-\n" - .string "WECHSELFELD waren? Sie sind spät dran.$" + .string "Grumble...\p" + .string "What happened to the others who went\n" + .string "to FALLARBOR? They’re late...$" Route112_Text_16FE3E:: @ 816FE3E - .string "Grummel...\p" - .string "Ich möchte auch mit der SEILBAHN nach\n" - .string "oben auf den Gipfel fahren...$" + .string "Grumble...\p" + .string "I’d like to ride the CABLE CAR to the\n" + .string "top, too..$" Route112_Text_16FE7A:: @ 816FE7A - .string "Ich würde gerne nach MALVENFROH CITY,\n" - .string "aber wenn ich diese Stufen hinunter-\p" - .string "gehe, komme ich kaum wieder nach\n" - .string "BAD LAVASTADT.$" + .string "Eh, I’d like to get to MAUVILLE, but if\n" + .string "I went down these ledges, it’d be no\l" + .string "easy matter to get back to LAVARIDGE.$" Route112_Text_16FEED:: @ 816FEED - .string "SEILBAHN ZUM SCHLOTBERG\n" - .string "“Ein kurzer Weg nach {UP_ARROW}!”$" + .string "MT. CHIMNEY CABLE CAR\n" + .string "“A short walk {0x79} way!”$" Route112_Text_16FF19:: @ 816FF19 - .string "SCHLOTBERG\p" - .string "“BAD LAVASTADT oder den Gipfel\n" - .string "erreichen Sie mit der SEILBAHN.”$" + .string "MT. CHIMNEY\p" + .string "“For LAVARIDGE TOWN or the summit,\n" + .string "please take the CABLE CAR.”$" Route112_Text_16FF64:: @ 816FF64 .string "ROUTE 112\n" - .string "{LEFT_ARROW} BAD LAVASTADT$" + .string "{0x7B} LAVARIDGE TOWN$" diff --git a/data/text/maps/Route112_CableCarStation.inc b/data/text/maps/Route112_CableCarStation.inc index bce76d721..245172542 100644 --- a/data/text/maps/Route112_CableCarStation.inc +++ b/data/text/maps/Route112_CableCarStation.inc @@ -1,9 +1,9 @@ Route112_CableCarStation_Text_1924F5:: @ 81924F5 - .string "Die SEILBAHN fährt gleich hinauf.\n" - .string "Möchtest du mit?$" + .string "The CABLE CAR is ready to go up.\n" + .string "Would you like to be on it?$" UnknownString_8192532: @ 8192532 - .string "Bitte hier entlang.$" + .string "Please step this way.$" Route112_CableCarStation_Text_192548:: @ 8192548 - .string "Dann fahre bitte später mit uns.$" + .string "Please ride with us another time.$" diff --git a/data/text/maps/Route113.inc b/data/text/maps/Route113.inc index e9b3abeb5..2ce41fda9 100644 --- a/data/text/maps/Route113.inc +++ b/data/text/maps/Route113.inc @@ -1,30 +1,30 @@ Route113_Text_16FF7F:: @ 816FF7F - .string "Wahahaha! Die heutige Technologie ist\n" - .string "schon eine wundersame Sache!\p" - .string "Nimm zum Beispiel diese Vulkanasche\n" - .string "hier. Aus ihr kann man Glas machen!$" + .string "Wahahaha! Today’s technology is a\n" + .string "wondrous thing!\p" + .string "Take this volcanic ash here.\n" + .string "It can be fashioned into glass.$" Route113_Text_16FFEE:: @ 816FFEE - .string "Es macht Spaß, durch die Vulkanasche zu\n" - .string "laufen, über Boden und Gras.\p" - .string "Du kannst genau erkennen, wo du her-\n" - .string "gelaufen bist - total klasse!$" + .string "It’s fun walking through the volcano’s\n" + .string "ashes on the ground and grass.\p" + .string "You can see where you walked - it’s\n" + .string "really neat!$" Route113_Text_170065:: @ 8170065 .string "ROUTE 113\n" - .string "{RIGHT_ARROW} ROUTE 111$" + .string "{0x7C} ROUTE 111$" Route113_Text_17007B:: @ 817007B .string "ROUTE 113\n" - .string "{LEFT_ARROW} LAUBWECHSELFELD$" + .string "{0x7B} FALLARBOR TOWN$" Route113_Text_170096:: @ 8170096 - .string "TIPPS für TRAINER\p" - .string "Du kannst eines deiner BASIS-ITEMS in\n" - .string "deinem BEUTEL auf SELECT legen.\p" - .string "Durch Drücken von SELECT kannst du\n" - .string "so ganz bequem das Item einsetzen.$" + .string "TRAINER TIPS\p" + .string "You may register one of the KEY ITEMS\n" + .string "in your BAG as SELECT.\p" + .string "Simply press SELECT to use the\n" + .string "registered item conveniently.$" Route113_Text_17011D:: @ 817011D - .string "GLASWERKSTATT\n" - .string "“Glasdekor aus Vulkanasche.”$" + .string "GLASS WORKSHOP\n" + .string "“Turning Volcanic Ash into Glass Items”$" diff --git a/data/text/maps/Route113_GlassWorkshop.inc b/data/text/maps/Route113_GlassWorkshop.inc index 37fa22f70..2923255a4 100644 --- a/data/text/maps/Route113_GlassWorkshop.inc +++ b/data/text/maps/Route113_GlassWorkshop.inc @@ -1,88 +1,86 @@ Route113_GlassWorkshop_Text_19E4E6:: @ 819E4E6 - .string "Diese Region ist mit Vulkanasche\n" - .string "bedeckt! Schnauf, keuch...\p" - .string "Ich habe ein besonderes Talent.\n" - .string "Schnauf, keuch...\p" - .string "Ich mache aus der Asche Glas und stelle\n" - .string "daraus Items her. Schnauf, keuch...\p" - .string "Hiermit kannst du Asche sammeln.\n" - .string "Schnauf, keuch...$" + .string "This area is covered in volcanic ash,\n" + .string "huff-puff!\p" + .string "I’m specially gifted, huff-puff.\p" + .string "I make glass out of volcanic ash\n" + .string "and make items, huff-puff.\p" + .string "Go collect ashes with this, huff-puff.$" Route113_GlassWorkshop_Text_19E59B:: @ 819E59B - .string "Nimm diese ASCHETASCHE und lauf durch\n" - .string "die Asche. Schnauf, keuch...\p" - .string "Damit füllst du die ASCHETASCHE mit\n" - .string "Asche. Schnauf, keuch...\p" - .string "Und wenn du meinst, du hast genug ge-\n" - .string "sammelt, komm zu mir. Schnauf, keuch...$" + .string "Just take that SOOT SACK and walk\n" + .string "through piles of ash, huff-puff.\p" + .string "And it will fill up with the volcanic ash,\n" + .string "huff-puff.\p" + .string "Once you think you’ve collected a good\n" + .string "amount, come see me, huff-puff.$" Route113_GlassWorkshop_Text_19E65B:: @ 819E65B - .string "Hast du Asche gesammelt? Schnauf,\n" - .string "keuch. Zeig mal her. Schnauf, keuch...$" + .string "Have you collected ashes, huff-puff?\n" + .string "Let me see, huff-puff.$" Route113_GlassWorkshop_Text_19E697:: @ 819E697 - .string "Hmmm... Das reicht aber nicht.\n" - .string "Schnauf, keuch. Daraus kann ich\l" - .string "kein Glas machen. Schnauf, keuch...\p" - .string "Mal sehen... Du musst noch {STR_VAR_1} Schritt/e\n" - .string "gehen, damit ich eine BLAUE FLÖTE her-\l" - .string "stellen kann. Schnauf, keuch...$" + .string "Hmmm...\n" + .string "There’s not enough ash here, huff-puff.\l" + .string "I can’t make glass with this, huff-puff.\p" + .string "Let’s see... {STR_VAR_1} is the number of steps\n" + .string "you’ll need to walk for me to make you\l" + .string "a BLUE FLUTE, huff-puff.$" Route113_GlassWorkshop_Text_19E757:: @ 819E757 - .string "Oh! Du hast aber viel Asche gesammelt.\n" - .string "Schnauf, keuch...\p" - .string "Ich mache dir ein Item aus Glas daraus.\n" - .string "Welches möchtest du? Schnauf, keuch...$" + .string "Oh!\n" + .string "You’ve got a lot of ashes, huff-puff!\p" + .string "I’ll make you a glass item, huff-puff!\n" + .string "Which one would you like, huff-puff?$" Route113_GlassWorkshop_Text_19E7CD:: @ 819E7CD - .string "Eine {STR_VAR_1}? Schnauf, keuch...\n" - .string "Das möchtest du haben? Schnauf, keuch.$" + .string "A {STR_VAR_1}, huff-puff?\n" + .string "Is that the one for you, huff-puff?$" Route113_GlassWorkshop_Text_19E802:: @ 819E802 - .string "Was möchtest du haben? Schnauf, keuch.$" + .string "Which one would you like, huff-puff?$" Route113_GlassWorkshop_Text_19E827:: @ 819E827 - .string "Eine {STR_VAR_1}? Schnauf, keuch...\p" - .string "O.K. Wird erledigt. Schnauf, keuch. Einen\n" - .string "Moment Geduld bitte. Schnauf, keuch...$" + .string "A {STR_VAR_1} it is, then, huff-puff!\p" + .string "Okay! I’ll make it for you, huff-puff.\n" + .string "Just wait a little while, huff-puff.$" Route113_GlassWorkshop_Text_19E890:: @ 819E890 - .string "{STR_VAR_1}? Schnauf, keuch...\p" - .string "Du hast nicht genug Asche für dieses\n" - .string "Item mitgebracht. Schnauf, keuch...\p" - .string "Mal sehen... Du musst noch {STR_VAR_2}\n" - .string "Schritt/e gehen, damit ich dieses Item\l" - .string "herstellen kann. Schnauf, keuch.\p" - .string "Was möchtest du stattdessen haben?\n" - .string "Schnauf, keuch...$" + .string "A {STR_VAR_1}, huff-puff?\p" + .string "There’s not enough ash here to make\n" + .string "that, though, huff-puff.\p" + .string "Let’s see... {STR_VAR_2} is the number of steps\n" + .string "you’ll need to walk through volcanic ash\l" + .string "for me to make that item, huff-puff.\p" + .string "Which item would you rather have me\n" + .string "make instead, huff-puff?$" Route113_GlassWorkshop_Text_19E990:: @ 819E990 - .string "Du hast all die Asche gesammelt und\n" - .string "willst nichts haben? Schnauf, keuch...$" + .string "You’ve collected all that ash, but you\n" + .string "don’t want anything, huff-puff?$" Route113_GlassWorkshop_Text_19E9D7:: @ 819E9D7 - .string "So, hier ist ein/e {STR_VAR_1} für\n" - .string "dich. Hier, für dich. Schnauf, keuch...$" + .string "Ah, I’ve finished your {STR_VAR_1}.\n" + .string "Take it, huff-puff.$" Route113_GlassWorkshop_Text_19EA06:: @ 819EA06 - .string "Oh. In deinem BEUTEL ist kein Platz\n" - .string "dafür. Schnauf, keuch...\p" - .string "Ich verwahre es für dich. Hol es dir\n" - .string "einfach später ab. Schnauf, keuch...$" + .string "Oh?\n" + .string "You’ve no room in your BAG, huff-puff.\p" + .string "I’ll hold on to it, so come back later,\n" + .string "huff-puff.$" Route113_GlassWorkshop_Text_19EA64:: @ 819EA64 - .string "Oh. Du hast keinen Platz auf deinem PC.\n" - .string "Schnauf, keuch...\p" - .string "Ich verwahre es für dich. Hol es dir\n" - .string "einfach später ab. Schnauf, keuch...$" + .string "Oh?\n" + .string "You’ve no room in your PC, huff-puff?\p" + .string "I’ll hold on to it, so come back later,\n" + .string "huff-puff.$" Route113_GlassWorkshop_Text_19EAC1:: @ 819EAC1 - .string "Oh. Du hast die ASCHETASCHE nicht\n" - .string "dabei? Schnauf, keuch...\p" - .string "Du musst sie aber dabei haben, um Asche\n" - .string "sammeln zu können! Schnauf, keuch...$" + .string "Hah? You haven’t got your SOOT SACK\n" + .string "with you, huff-puff.\p" + .string "You have to keep it with you to collect\n" + .string "volcanic ash, huff-puff.$" Route113_GlassWorkshop_Text_19EB3B:: @ 819EB3B - .string "Es macht Spaß, das Glas zu einer Flöte\n" - .string "zu blasen, wenn der Boss redet.\p" - .string "Schnauf, keuch! Pust, pust!$" + .string "It’s fun to blow a glass flute while my\n" + .string "boss is talking.\p" + .string "Huff-huff! Puff-puff!$" diff --git a/data/text/maps/Route114.inc b/data/text/maps/Route114.inc index 059389be3..9a46954da 100644 --- a/data/text/maps/Route114.inc +++ b/data/text/maps/Route114.inc @@ -1,24 +1,23 @@ Route114_Text_170154:: @ 8170154 - .string "Alles was mein POKéMON von sich gibt, ist\n" - .string "BRÜLLER... Niemand wagt sich nah heran...\p" - .string "Seufz... Wenn du magst, dann nimm mir\n" - .string "diese Bürde... äh, diese TM ab...$" + .string "All my POKéMON does is ROAR...\n" + .string "No one dares to come near me...\p" + .string "Sigh... If you would, please take\n" + .string "this TM away...$" Route114_Text_1701C5:: @ 81701C5 - .string "TM05 enthält BRÜLLER.\n" - .string "Ein BRÜLLER schlägt POKéMON in\l" - .string "die Flucht.$" + .string "TM05 contains ROAR.\n" + .string "A ROAR sends POKéMON scurrying.$" Route114_Text_1701F9:: @ 81701F9 .string "Bow! Bowwow!$" Route114_Text_170206:: @ 8170206 - .string "METEORFÄLLE\n" - .string "HIER ENTLANG NACH METAROST CITY$" + .string "METEOR FALLS\n" + .string "RUSTBORO CITY THROUGH HERE$" Route114_Text_17022E:: @ 817022E - .string "FOSSILMANIAC\n" - .string "“Fossilien gesucht!”$" + .string "FOSSIL MANIAC’S HOUSE\n" + .string "“Fossils gratefully accepted!”$" Route114_Text_170263:: @ 8170263 - .string "LANETTES HAUS$" + .string "LANETTE’S HOUSE$" diff --git a/data/text/maps/Route114_FossilManiacsHouse.inc b/data/text/maps/Route114_FossilManiacsHouse.inc index afc141338..4515a161a 100644 --- a/data/text/maps/Route114_FossilManiacsHouse.inc +++ b/data/text/maps/Route114_FossilManiacsHouse.inc @@ -1,23 +1,21 @@ Route114_FossilManiacsHouse_Text_1925E1:: @ 81925E1 - .string "Mein großer Bruder ist ein FOSSIL-\n" - .string "MANIAC... Er ist ein netter Kerl, der\l" - .string "Fossilien liebt...\p" - .string "Er liebt es auch, Löcher zu graben...\n" - .string "Dieses Loch hat er alleine gegraben!\p" - .string "Hier, das kannst du haben. Damit kannst\n" - .string "du Löcher graben, wie mein Bruder...$" + .string "My big brother’s the FOSSIL MANIAC...\n" + .string "He’s a nice guy who loves fossils...\p" + .string "He loves digging holes, too...\n" + .string "He dug this hole by himself...\p" + .string "You can have this, so you can DIG\n" + .string "holes just like my big brother...$" Route114_FossilManiacsHouse_Text_1926AE:: @ 81926AE - .string "Wenn ein POKéMON in einer Höhle\n" - .string "SCHAUFLER einsetzt, kommst du zum\l" - .string "Eingang zurück.$" + .string "If you make a POKéMON DIG inside a\n" + .string "cave, you’re returned to the entrance...$" Route114_FossilManiacsHouse_Text_1926FA:: @ 81926FA - .string "Steine in den unterschiedlichsten\n" - .string "Formen liegen im Glasschaukasten.$" + .string "Rocks in peculiar shapes fill the\n" + .string "display case$" Route114_FossilManiacsHouse_Text_192729:: @ 8192729 - .string "DIE ZUSAMMENSETZUNG DER ERDSCHICHT...\n" - .string "WIE REGEN DAS LAND FORMT...\l" - .string "STEINE, BODEN UND FELSEN...\p" - .string "Gerammelt voll mit Büchern.$" + .string "THE COMPOSITION OF STRATA...\n" + .string "HOW RAIN SHAPES THE LAND...\l" + .string "STONES, SOIL, AND ROCK...\p" + .string "It’s crammed with books.$" diff --git a/data/text/maps/Route114_FossilManiacsTunnel.inc b/data/text/maps/Route114_FossilManiacsTunnel.inc index 82bd7cb5f..cbcd6172d 100644 --- a/data/text/maps/Route114_FossilManiacsTunnel.inc +++ b/data/text/maps/Route114_FossilManiacsTunnel.inc @@ -1,26 +1,26 @@ Route114_FossilManiacsTunnel_Text_192795:: @ 8192795 - .string "Ich bin der FOSSILMANIAC... Ich bin\n" - .string "ein netter Typ, der Fossilien liebt...\p" - .string "Möchtest du ein Fossil haben?\p" - .string "Die Fossilien in dieser Gegend gehören\n" - .string "allerdings alle mir! Keines ist für dich...\p" - .string "Wenn du unbedingt ein Fossil haben\n" - .string "möchtest, geh in die Wüste bei\l" - .string "ROUTE 111...\p" - .string "Ich habe gehört, dass dort Fossilien,\n" - .string "die im Boden versteckt liegen, manchmal\l" - .string "durch Sandstürme freigelegt werden.$" + .string "I’m the FOSSIL MANIAC...\n" + .string "I’m a nice guy who loves fossils...\p" + .string "Do you want a fossil?\p" + .string "But the fossils around these parts all\n" + .string "belong to me... None for you...\p" + .string "If you can’t go without a fossil, go to\n" + .string "the desert on ROUTE 111...\p" + .string "From what I’ve heard, fossils that were\n" + .string "buried in the sand sometimes rise to\l" + .string "the surface from sandstorms...$" Route114_FossilManiacsTunnel_Text_1928DE:: @ 81928DE - .string "Du hast ein FOSSIL gefunden, stimmt’s?\n" - .string "Das ist schön... Traumhaft...\p" - .string "Was wirst du mit dem FOSSIL machen?\p" - .string "Ich habe gehört, dass DEVON versucht,\n" - .string "aus den FOSSILIEN POKéMON zum\l" - .string "Leben zu erwecken...\p" - .string "Ich liebe FOSSILIEN, daher würde ich\n" - .string "so etwas niemals machen...$" + .string "You found a FOSSIL, didn’t you?\n" + .string "That’s so nice... It’s so dreamy...\p" + .string "What are you going to do with that\n" + .string "FOSSIL?\p" + .string "From what I’ve heard, DEVON is doing\n" + .string "research on reviving POKéMON from\l" + .string "FOSSILS...\p" + .string "I love my FOSSILS, so I would never\n" + .string "do anything like that...$" Route114_FossilManiacsTunnel_Text_1929DC:: @ 81929DC - .string "FOSSILIEN sind so... Wundervoll...\n" - .string "Einfach traumhaft...$" + .string "FOSSILS are so... Wonderful...\n" + .string "It’s so dreamy...$" diff --git a/data/text/maps/Route114_LanettesHouse.inc b/data/text/maps/Route114_LanettesHouse.inc index d4f0e155d..5d6747895 100644 --- a/data/text/maps/Route114_LanettesHouse.inc +++ b/data/text/maps/Route114_LanettesHouse.inc @@ -1,62 +1,56 @@ Route114_LanettesHouse_Text_192A0D:: @ 8192A0D .string "LANETTE: Oh! {PLAYER}{KUN}!\p" - .string "Entschuldige, dass es hier so chaotisch\n" - .string "aussieht. Immer, wenn ich forsche,\l" - .string "vergesse ich aufzuräumen...\p" - .string "Das ist echt peinlich... Erzähl das bloß\n" - .string "niemandem! Ich gebe dir auch dies hier...$" + .string "I’m sorry everything is so cluttered...\n" + .string "When I get engrossed in research,\l" + .string "things end up this way...\p" + .string "This is embarrassing... Please keep\n" + .string "this a secret in exchange for this.$" Route114_LanettesHouse_Text_192ACC:: @ 8192ACC - .string "Soll ich dir einige Hinweise zum POKéMON-\n" - .string "Lagerungs-System geben?\p" - .string "Du solltest deine BOXEN gut verwalten,\n" - .string "damit du weißt, welche POKéMON sich \l" - .string "in welcher BOX befinden...$" + .string "May I offer advice about my POKéMON\n" + .string "Storage System?\p" + .string "You should organize your BOXES so you\n" + .string "can tell which POKéMON are in them.$" Route114_LanettesHouse_Text_192B4A:: @ 8192B4A - .string "LANETTES Forschungs-Aufzeichnungen.\n" - .string "Das sind Informationen zu den BOXEN.\p" - .string "Es sollten BOXEN eingerichtet werden,\n" - .string "die jeweils 30 POKéMON aufnehmen\l" - .string "können.\p" - .string "Jeder TRAINER sollte in der Lage sein,\n" - .string "420 POKéMON im PC-System zu lagern.\p" - .string "Weiterlesen?$" + .string "It’s LANETTE’s research notes.\n" + .string "There’s information about BOXES.\p" + .string "Design BOXES to hold 30 POKéMON each.\p" + .string "Each TRAINER should be able to store\n" + .string "420 POKéMON on the PC system.\p" + .string "Keep reading?$" Route114_LanettesHouse_Text_192C01:: @ 8192C01 - .string "Es muss ein Markierungssystem einge-\n" - .string "richtet werden, mit dem man eine gute\l" - .string "Übersicht über die POKéMON bekommt.\p" - .string "Der Name und der Hintergrund jeder BOX\n" - .string "lässt sich verändern, zur Freude der\l" - .string "darin gelagerten POKéMON.\p" - .string "Weiterlesen?$" + .string "A marking system should be added to\n" + .string "make POKéMON easier to organize.\p" + .string "The name and wallpaper design of each\n" + .string "BOX will be made changeable to please\l" + .string "the stored POKéMON.\p" + .string "Keep reading?$" Route114_LanettesHouse_Text_192CB4:: @ 8192CB4 - .string "Immer, wenn ein POKéMON gelagert wird,\n" - .string "wird es in der BOX gelagert, die als\l" - .string "Letzte geöffnet wurde.\p" - .string "Ist diese BOX voll, wird das POKéMON in\n" - .string "der nächsten BOX gelagert.\p" - .string "Mit anderen Worten, die zuletzt ge-\n" - .string "öffnete BOX wird automatisch gewählt,\l" - .string "um ein POKéMON zu lagern.$" + .string "When storing a POKéMON, it should be\n" + .string "sent to the BOX inspected last.\p" + .string "If that BOX is full, the received\n" + .string "POKéMON is stored in the next BOX.\p" + .string "In other words, when a BOX is examined,\n" + .string "it is automatically selected as the BOX\l" + .string "to which POKéMON are sent.$" Route114_LanettesHouse_Text_192DA9:: @ 8192DA9 - .string "{PLAYER} schließt das Notizbuch.$" + .string "{PLAYER} closed the notebook.$" Route114_LanettesHouse_Text_192DC1:: @ 8192DC1 - .string "Da ist eine E-Mail von jemandem\n" - .string "auf dem PC.\p" + .string "There’s an e-mail from someone on\n" + .string "the PC.\p" .string "“... ... ... ... ... ... ...\p" - .string "Dein Lagerungs-System bietet viel mehr\n" - .string "Komfort als meines.\p" - .string "Es besitzt viele anwenderfreundliche\n" - .string "Features, die nützlich sind und Spaß\l" - .string "machen.\p" - .string "Es macht mich stolz, dass ich Teil\n" - .string "dieser Entwicklung war.\p" - .string "Ich hoffe sehr, du setzt deine For-\n" - .string "schungen in diesem Bereich weiter fort.\p" - .string "BILL\n" + .string "“Your Storage System offers more\n" + .string "convenience than mine.\p" + .string "“It has a lot of user-friendly features\n" + .string "that make it fun and useful, too.\p" + .string "“It makes me proud that I played\n" + .string "a part in its development.\p" + .string "“Here’s hoping that you’ll continue\n" + .string "research in Storage Systems.\p" + .string "“From BILL\n" .string "... ... ... ... ... ... ... ...”$" diff --git a/data/text/maps/Route115.inc b/data/text/maps/Route115.inc index d7b8bb4b2..f5fc22b0d 100644 --- a/data/text/maps/Route115.inc +++ b/data/text/maps/Route115.inc @@ -1,14 +1,13 @@ Route115_Text_170273:: @ 8170273 - .string "Höhlenforschung ist nicht mit einem\n" - .string "Spaziergang auf einer Straße zu\l" - .string "vergleichen.\p" - .string "Du weißt nie, wann ein wildes POKéMON\n" - .string "auftaucht. Du bist immer angespannt.$" + .string "Exploring a cave isn’t like walking\n" + .string "on a road.\p" + .string "You never know when wild POKéMON will\n" + .string "appear. It’s full of suspense.$" Route115_Text_1702E7:: @ 81702E7 .string "ROUTE 115\n" - .string "{DOWN_ARROW} METAROST CITY$" + .string "{0x7A} RUSTBORO CITY$" Route115_Text_170301:: @ 8170301 - .string "METEORFÄLLE\n" - .string "LAUBWECHSELFELD HIER ENTLANG$" + .string "METEOR FALLS\n" + .string "FALLARBOR TOWN THROUGH HERE$" diff --git a/data/text/maps/Route116.inc b/data/text/maps/Route116.inc index 286879807..64694199d 100644 --- a/data/text/maps/Route116.inc +++ b/data/text/maps/Route116.inc @@ -1,123 +1,119 @@ Route116_Text_17032A:: @ 817032A - .string "Oooh, was mache ich nur?!?\p" - .string "PECKO und ich waren auf einem Spazier-\n" - .string "gang und da kam so ein Schlägertyp...\p" - .string "Der Schurke hat mir meinen Liebling\n" - .string "PECKO geklaut!\p" - .string "Ooooooooooooaaaargh! PECKO!$" + .string "Ohhh, what am I to do?\p" + .string "We were on our walk, PEEKO and I, when\n" + .string "we were jumped by an odd thug...\p" + .string "The scoundrel made off with my\n" + .string "darling PEEKO!\p" + .string "Wrrrooooooaaaar! PEEKO!$" Route116_Text_1703CF:: @ 81703CF - .string "Nnn... Brüll!\p" - .string "Ich will diesen vermaledeiten Tunnel\n" - .string "graben!$" + .string "Nnn... Roar!\p" + .string "I want to dig that tunnel!$" Route116_Text_1703F7:: @ 81703F7 - .string "Nnn... Brüll!\n" - .string "Was ist hier los?\p" - .string "Ich war dabei, einen Tunnel ohne Werk-\n" - .string "zeug zu graben, als so ein Idiot mich\l" - .string "verjagt hat!\p" - .string "Dieser Tunnel ist voller POKéMON, die\n" - .string "sensibel auf Lärm reagieren. Sie können\l" - .string "einen Aufruhr veranstalten.\p" - .string "Daher arbeiten wir ohne schwere\n" - .string "Maschinen an dem Tunnel...\p" - .string "Ich befürchte, dieser Idiot wird\n" - .string "irgendetwas Dummes tun und die\l" - .string "POKéMON in Aufruhr versetzen.$" + .string "Nnn... Roar!\n" + .string "What’s going on?\p" + .string "I was digging the tunnel without any\n" + .string "tools when some goon ordered me out!\p" + .string "That tunnel’s filled with POKéMON\n" + .string "that react badly to loud noises.\l" + .string "They could cause an uproar.\p" + .string "That’s why we stopped using heavy\n" + .string "equipment for tunneling...\p" + .string "I’m worried that the goon will do\n" + .string "something stupid and startle the\l" + .string "POKéMON into an uproar.$" Route116_Text_170556:: @ 8170556 - .string "Nnn... Brüll!\p" - .string "Dieser dämliche Idiot ist aus dem Tunnel\n" - .string "abgehauen. Ich kann weitergraben!$" + .string "Nnn... Roar!\p" + .string "That goofy goon hightailed it out of\n" + .string "the tunnel! I can go back to digging!$" Route116_Text_1705AE:: @ 81705AE - .string "Oh! Du bist das!\p" - .string "Du hast mir nicht nur im BLÜTEN-\n" - .string "BURGWALD geholfen, sondern auch\l" - .string "mein gestohlenes Paket zurückgeholt\l" - .string "und nach GRAPHITPORT CITY gebracht!\p" - .string "KAPT. BRIGG hat uns über die Ankunft\n" - .string "des Paketes unterrichtet!\p" - .string "Vielen, vielen Dank!\p" - .string "Wäre ich ein Meer, würde ich\n" - .string "dich in Dankbarkeit baden und als\l" - .string "Held auf meinen Wellen tragen!\p" - .string "Ich habe für dich, den wunderbarsten\n" - .string "TRAINER, gute Nachrichten!\p" - .string "Unsere Firma hat vor kurzem eine\n" - .string "neue Art von POKéBALL entwickelt...\p" - .string "Als Zeichen meiner Dankbarkeit\n" - .string "schenke ich ihn dem wunderbarsten\l" - .string "TRAINER!$" + .string "Oh! It’s you!\p" + .string "You’re that person who not only helped\n" + .string "me in PETALBURG WOODS, but also got\l" + .string "back my stolen package and then even\l" + .string "graciously delivered it to SLATEPORT!\p" + .string "CAPT. STERN informed us that the\n" + .string "package arrived, too!\p" + .string "I thank you very, very much!\p" + .string "Why, if I were a rain cloud, I would\n" + .string "shower you with gratitude and hail\l" + .string "you as a hero!\p" + .string "For you, the most wonderful TRAINER,\n" + .string "I bear good news!\p" + .string "Recently, our company developed a new\n" + .string "kind of POKé BALL.\p" + .string "As a token of our appreciation, this\n" + .string "is our gift to our wonderful TRAINER!$" Route116_Text_1707B8:: @ 81707B8 - .string "Unser neuer POKéBALL wird im PKMN-\n" - .string "MARKT in METAROST CITY erhältlich sein.\p" - .string "Bitte, probiere ihn aus!\n" - .string "Vielen Dank und Lebewohl.$" + .string "Our new POKé BALL will be available\n" + .string "at the POKéMON MART in RUSTBORO.\p" + .string "Please do try it out!\n" + .string "Thank you and bye-bye!$" Route116_Text_17082A:: @ 817082A - .string "Dein BEUTEL ist brechend voll.\n" - .string "Ich kann dir diesen WIEDERBALL nicht\l" - .string "geben.$" + .string "Your BAG is jam-packed.\n" + .string "I can’t give you this REPEAT BALL.$" Route116_Text_170865:: @ 8170865 - .string "Als Zeichen unseres Dankes für die\n" - .string "Überbringung unseres Paketes, habe ich\l" - .string "eine neue Art von POKéBALL für dich.\l" - .string "Für unseren wunderbarsten TRAINER!$" + .string "As a token of our appreciation for\n" + .string "your delivering our package, I have a\l" + .string "gift of a new kind of POKé BALL for our\l" + .string "most wonderful TRAINER!$" Route116_Text_1708EE:: @ 81708EE - .string "Ich habe meine Brille fallen lassen...\n" - .string "Kannst du mir helfen, sie zu finden?$" + .string "I dropped my glasses...\n" + .string "Can you help me find them?$" Route116_Text_170921:: @ 8170921 - .string "Deine Brille...\n" - .string "Darf ich sie mal kurz ausprobieren?$" + .string "Those glasses!\n" + .string "May I see them for a second?$" Route116_Text_17094D:: @ 817094D .string "Hmm...\n" - .string "Das ist ein SCHATTENGLAS.\l" - .string "Das habe ich nicht gesucht...\p" - .string "Vielleicht ist meine Brille gar nicht hier\n" - .string "zu finden...$" + .string "These are BLACKGLASSES.\l" + .string "They’re not what I’m looking for...\p" + .string "Maybe my glasses aren’t around\n" + .string "here...$" Route116_Text_1709B7:: @ 81709B7 .string "Hmm...\n" - .string "Ich kann meine Brille nirgends finden...\l" - .string "Vielleicht liegt sie gar nicht hier...$" + .string "I can’t find my glasses anywhere...\l" + .string "Maybe they’re not around here...$" Route116_Text_170A03:: @ 8170A03 .string "Hmm...\n" - .string "Das ist ein SCHATTENGLAS.\l" - .string "Das habe ich nicht gesucht...$" + .string "These are BLACKGLASSES.\l" + .string "They’re not what I’m looking for...$" Route116_Text_170A46:: @ 8170A46 .string "ROUTE 116\n" - .string "{LEFT_ARROW} METAROST CITY$" + .string "{0x7B} RUSTBORO CITY$" Route116_Text_170A60:: @ 8170A60 - .string "METAFLURTUNNEL\n" - .string "“Verbindet METAROST CITY und\p" - .string "WIESENFLUR.\n" - .string "Das Tunnelprojekt wurde abgebrochen.”$" + .string "RUSTURF TUNNEL\n" + .string "“Linking RUSTBORO and VERDANTURF\p" + .string "“The tunnel project has been\n" + .string "canceled.”$" Route116_Text_170AB8:: @ 8170AB8 - .string "BERGRASTHAUS$" + .string "TUNNELER’S REST HOUSE$" Route116_Text_170ACE:: @ 8170ACE - .string "TIPPS für TRAINER\p" - .string "Wenn du die Entwicklung eines POKéMON\n" - .string "stoppen willst, musst du den B-Knopf\l" - .string "drücken, während es sich entwickeln will.\l" - .string "Das POKéMON entwickelt sich dann nicht.\p" - .string "Das nennt man Entwicklungsstopp.$" + .string "TRAINER TIPS\p" + .string "If you want to stop a POKéMON from\n" + .string "evolving, press the B Button while it\l" + .string "is trying to evolve.\l" + .string "The startled POKéMON will stop.\p" + .string "This is called an evolution cancel.$" Route116_Text_170B7D:: @ 8170B7D - .string "TIPPS für TRAINER\p" - .string "Dein BEUTEL hat mehrere TASCHEN.\p" - .string "Items werden automatisch in die dafür\n" - .string "vorgesehene TASCHE gelegt.\p" - .string "Kein TRAINER kann auf einen eigenen\n" - .string "BEUTEL verzichten.$" + .string "TRAINER TIPS\p" + .string "Your BAG has several POCKETS.\p" + .string "Items you obtain are automatically\n" + .string "placed in the appropriate POCKETS.\p" + .string "No TRAINER can afford to be without\n" + .string "a BAG of their own.$" diff --git a/data/text/maps/Route116_TunnelersRestHouse.inc b/data/text/maps/Route116_TunnelersRestHouse.inc index 2245b81ff..d777ff0c8 100644 --- a/data/text/maps/Route116_TunnelersRestHouse.inc +++ b/data/text/maps/Route116_TunnelersRestHouse.inc @@ -1,33 +1,31 @@ Route116_TunnelersRestHouse_Text_192F33:: @ 8192F33 - .string "Der METAFLURTUNNEL...\p" - .string "Zunächst hatten wir ein großes Team,\n" - .string "das mit schweren Maschinen durch den\l" - .string "Felsen brechen sollte. Dann mussten wir\l" - .string "die Arbeit stoppen.\p" - .string "Es stellte sich heraus, dass sich unsere\n" - .string "Arbeit negativ auf die wilden\l" - .string "POKéMON in dieser Gegend auswirkte.\p" - .string "Und daher haben wir nun nichts mehr zu\n" - .string "tun, außer hier faul herumzuhängen.$" + .string "That RUSTURF TUNNEL there...\p" + .string "At first, we had a huge work crew boring\n" + .string "through rock with the latest machinery.\l" + .string "But, we had to stop.\p" + .string "It turns out that we would have had\n" + .string "a negative effect on wild POKéMON in\l" + .string "the area.\p" + .string "So, we’ve got nothing to do but loll\n" + .string "around here doing nothing.$" Route116_TunnelersRestHouse_Text_193049:: @ 8193049 - .string "Da ist ein Mann, der sich ganz alleine\n" - .string "seinen Weg nach WIESENFLUR gräbt. Er\l" - .string "versucht verzweifelt durchzukommen.\p" - .string "Er sagt, wenn er Schritt für Schritt\n" - .string "ohne laute Maschinen gräbt, werden die\l" - .string "POKéMON nicht gestört und ihr natür-\l" - .string "licher Lebensraum bleibt erhalten.$" + .string "There’s a man digging his way to\n" + .string "VERDANTURF all by his lonesome.\l" + .string "He’s desperate to get through.\p" + .string "He says that if he digs little by little\n" + .string "without using machines, he won’t\l" + .string "disturb POKéMON, and he’ll avoid harming\l" + .string "the natural environment.$" Route116_TunnelersRestHouse_Text_193135:: @ 8193135 - .string "Um ohne diesen Tunnel nach WIESENFLUR\n" - .string "zu kommen, muss man das Meer bei\p" - .string "FAUSTAUHAVEN überqueren, nach\n" - .string "GRAPHITPORT CITY segeln und durch\l" - .string "MALVENFROH CITY reisen.$" + .string "To get to VERDANTURF without using\n" + .string "this TUNNEL, you’d have to cross the\l" + .string "sea to DEWFORD, sail on to SLATEPORT,\l" + .string "then travel through MAUVILLE.$" Route116_TunnelersRestHouse_Text_1931C1:: @ 81931C1 - .string "Hast du schon gehört!?! Der TUNNEL bei\n" - .string "WIESENFLUR ist fertig!\p" - .string "Wenn man nur fest an seine Träume\n" - .string "glaubt, werden sie irgendwann wahr.$" + .string "Did you hear? The TUNNEL to VERDANTURF\n" + .string "has gone through!\p" + .string "Sometimes, if you hope strongly enough,\n" + .string "dreams do come true.$" diff --git a/data/text/maps/Route117.inc b/data/text/maps/Route117.inc index f115fe782..deadb8f5d 100644 --- a/data/text/maps/Route117.inc +++ b/data/text/maps/Route117.inc @@ -1,26 +1,25 @@ Route117_Text_170C26:: @ 8170C26 - .string "Ich habe mein POKéMON in der PENSION\n" - .string "abgegeben.\p" - .string "Als ich es wieder abholte, kannte es\n" - .string "eine Attacke, die ich ihm nicht beige-\l" - .string "bracht habe. Ich war total überrascht.$" + .string "I left my POKéMON at the DAY CARE.\p" + .string "When I got it back, it had a new move\n" + .string "that I didn’t teach it.\l" + .string "I was really, really surprised.$" Route117_Text_170CA7:: @ 8170CA7 - .string "Was meinst du?\n" - .string "Sind diese Blumen nicht wunderhübsch?\p" - .string "Ich habe sie alle selber gepflanzt.$" + .string "What do you think?\n" + .string "Aren’t these flowers pretty?\p" + .string "I planted them all!$" Route117_Text_170CEB:: @ 8170CEB - .string "Die Luft hier ist wunderbar frisch.$" + .string "The air is tasty here!$" Route117_Text_170D02:: @ 8170D02 .string "ROUTE 117\n" - .string "{LEFT_ARROW} WIESENFLUR$" + .string "{0x7B} VERDANTURF TOWN$" Route117_Text_170D1E:: @ 8170D1E .string "ROUTE 117\n" - .string "{RIGHT_ARROW} MALVENFROH CITY$" + .string "{0x7C} MAUVILLE CITY$" Route117_Text_170D38:: @ 8170D38 - .string "POKéMON-PENSION\n" - .string "“Lass uns deine POKéMON aufziehen.”$" + .string "POKéMON DAY CARE\n" + .string "“Let us raise your POKéMON.”$" diff --git a/data/text/maps/Route118.inc b/data/text/maps/Route118.inc index 5ff87f473..649efe3f0 100644 --- a/data/text/maps/Route118.inc +++ b/data/text/maps/Route118.inc @@ -1,56 +1,55 @@ Route118_Text_170D66:: @ 8170D66 - .string "TROY: Hi!\p" - .string "Du bist der TRAINER, den ich in\n" - .string "FAUSTAUHAVEN getroffen habe!\p" + .string "STEVEN: Hi!\p" + .string "You’re that TRAINER I met in DEWFORD!\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Oh, okay, du bist {PLAYER}{KUN}.\n" - .string "Ich erinnere mich.\p" + .string "Oh, okay, you’re {PLAYER}{KUN}.\n" + .string "I’ll remember it.\p" .string "{PLAYER}{KUN}.\p" - .string "In dieser großen Welt gibt es viele ver-\n" - .string "schiedene Arten von POKéMON mit\l" - .string "vielen verschiedenen Elementklassen.\p" - .string "Ziehst du verschiedene Elementklassen\n" - .string "auf? Oder nur POKéMON einer bestimmten\l" - .string "Elementklasse?\p" - .string "Was denkst du als TRAINER darüber?\p" - .string "Tut mir Leid, ich bombardiere dich hier\n" - .string "mit Fragen...\p" - .string "Nun, ich hoffe wir sehen uns bald wieder.$" + .string "In this vast world, there are many\n" + .string "kinds of POKéMON.\l" + .string "They come in many types.\p" + .string "Do you raise different types?\n" + .string "Or do you raise only POKéMON of a\l" + .string "certain type?\p" + .string "What do you think as a TRAINER?\p" + .string "Sorry, it’s not my place to ask, is it?\p" + .string "Well, anyway, I hope to see you\n" + .string "again.$" Route118_Text_170F12:: @ 8170F12 .string "Hmm!\n" - .string "Eine PROFIANGEL ist wirklich gut!\p" - .string "Meinst du nicht auch?$" + .string "A GOOD ROD is really good!\p" + .string "Wouldn’t you agree?$" Route118_Text_170F46:: @ 8170F46 .string "Hmm!\n" - .string "Da sind wir ja der gleichen Meinung!\p" + .string "We’re of identical minds!\p" .string "Hmm!\n" - .string "Ich schenke dir diese PROFIANGEL!$" + .string "Take this GOOD ROD!$" Route118_Text_170F7E:: @ 8170F7E - .string "Wo immer du Wasser findest, versuche\n" - .string "dein Glück mit Angeln.$" + .string "Wherever there’s water, try your luck\n" + .string "at fishing.$" Route118_Text_170FB0:: @ 8170FB0 - .string "Magst du keinen Fisch?$" + .string "Don’t you like to fish?$" Route118_Text_170FC8:: @ 8170FC8 - .string "Versuche, alle möglichen Arten von\n" - .string "POKéMON mit der PROFIANGEL zu fangen.$" + .string "Try catching all sorts of POKéMON\n" + .string "with your GOOD ROD.$" Route118_Text_170FFE:: @ 8170FFE - .string "Auch wenn gerade kein Schiff in der\n" - .string "Nähe ist, kannst du mit einem POKéMON,\l" - .string "das SURFER kennt, das Meer überqueren.\p" - .string "Auf POKéMON kann man sich immer\n" - .string "verlassen!$" + .string "Even if there isn’t a boat, you can\n" + .string "cross rivers and the sea if you have\l" + .string "a POKéMON that knows SURF.\p" + .string "POKéMON can be counted on to do so\n" + .string "much!$" Route118_Text_17108B:: @ 817108B .string "ROUTE 118\n" - .string "{LEFT_ARROW} MALVENFROH CITY$" + .string "{0x7B} MAUVILLE CITY$" Route118_Text_1710A5:: @ 81710A5 .string "ROUTE 118\n" - .string "{UP_ARROW} ROUTE 119$" + .string "{0x79} ROUTE 119$" diff --git a/data/text/maps/Route119.inc b/data/text/maps/Route119.inc index 81df1b8ea..489ca053d 100644 --- a/data/text/maps/Route119.inc +++ b/data/text/maps/Route119.inc @@ -1,103 +1,102 @@ Route119_Text_1710BB:: @ 81710BB - .string "MAIKE: {PLAYER}{KUN}! Wo warst du?\n" - .string "Ich habe dich schon gesucht!\p" - .string "Wie stark bist du geworden?\n" - .string "Lass mich das für dich herausfinden!\p" - .string "Bereit? Du und deine POKéMON?\n" - .string "Natürlich seid ihr das! Los!$" + .string "MAY: {PLAYER}{KUN}!\n" + .string "Where were you? I was looking for you!\p" + .string "How much stronger have you gotten?\n" + .string "Let me check for you!\p" + .string "Ready with your POKéMON?\n" + .string "Of course you are! Go!$" Route119_Text_171156:: @ 8171156 .string "Achah!\n" - .string "{PLAYER}{KUN}, du bist stark!\p" - .string "Ich hatte schon befürchtet, du\n" - .string "hättest im Training nachgelassen.$" + .string "{PLAYER}{KUN}, you’re strong!\p" + .string "I was worried that you might be\n" + .string "struggling with your training.$" Route119_Text_1711B1:: @ 81711B1 - .string "MAIKE: Aber ich hätte mir absolut keine\n" - .string "Sorgen zu machen brauchen! Weiter so!\p" - .string "Und hier! Dies ist ein Geschenk für dich!$" + .string "MAY: But I had absolutely nothing to\n" + .string "worry about! Keep it up!\p" + .string "And, here! I have a present for you.$" Route119_Text_171214:: @ 8171214 - .string "MAIKE: Setze FLIEGEN ein und deine\n" - .string "POKéMON bringen dich an jeden Ort, an\l" - .string "dem du schon einmal warst.\p" - .string "Aber um FLIEGEN einsetzen zu können,\n" - .string "brauchst du erst den ORDEN der ARENA\l" - .string "von BAUMHAUSEN CITY. Vergiss das nicht!\p" - .string "Du solltest mal nach WURZELHEIM\n" - .string "FLIEGEN.\p" - .string "Ich wette, deine Mutter macht sich\n" - .string "schon Sorgen um dich, {PLAYER}{KUN}.\p" - .string "Nun, wir treffen uns sicher bald wieder!$" + .string "MAY: Use FLY, and your POKéMON will\n" + .string "instantly carry you to any town you’ve\l" + .string "already visited.\p" + .string "But, to use FLY, you have to get the\n" + .string "GYM BADGE from FORTREE CITY.\l" + .string "That’s important, so don’t forget.\p" + .string "You should FLY home and visit\n" + .string "LITTLEROOT for a change.\p" + .string "I bet your mom’s worried about you,\n" + .string "{PLAYER}{KUN}.\p" + .string "Well, let’s meet again somewhere!$" Route119_Text_171358:: @ 8171358 - .string "BRIX: {PLAYER}! Hier schaust du dich\n" - .string "also nach POKéMON um?\p" - .string "Zeig mir, wie gut du geworden bist.\n" - .string "Ich werde dich jetzt testen!\p" - .string "Nun!\n" - .string "Das ist ein Kampf, also kämpfen wir!$" + .string "BRENDAN: {PLAYER}! So this is where\n" + .string "you’ve been looking for POKéMON?\p" + .string "Let me see how good you got.\n" + .string "I’ll test you!\p" + .string "Now!\n" + .string "It’s a battle, so battle!$" Route119_Text_1713E2:: @ 81713E2 .string "Hmm...\n" - .string "Du bist verdammt gut geworden.$" + .string "You’ve gotten pretty darn decent.$" Route119_Text_17140B:: @ 817140B - .string "BRIX: Ich sage, du bist so gut, dass\n" - .string "du überall nach POKéMON suchen kannst.\p" - .string "Hier, das ist für dich.\n" - .string "Probier es aus.$" + .string "BRENDAN: I’d say you’re good enough\n" + .string "to search for POKéMON anywhere.\p" + .string "Here, I’ll give you this.\n" + .string "Try it out.$" Route119_Text_171475:: @ 8171475 - .string "BRIX: Setze es ein, und deine\n" - .string "POKéMON FLIEGEN dich sofort an jeden\l" - .string "Ort, an dem du schon einmal warst.\p" - .string "Aber du brauchst den ORDEN der ARENA\n" - .string "von BAUMHAUSEN CITY dafür.\p" - .string "Nun ja, ich muss jetzt weiter. Bis bald.$" + .string "BRENDAN: Use FLY, and your POKéMON\n" + .string "instantly carries you to any town\l" + .string "you’ve already visited.\p" + .string "But you need the FORTREE GYM BADGE \n" + .string "to do that.\p" + .string "Anyway, I have to move along.$" Route119_Text_171520:: @ 8171520 - .string "Wir stehen hier Wache.\p" - .string "Hey, du! Halt dich bloß von dem KLIMA-\n" - .string "INSTITUT fern. Da ist es nicht sicher!$" + .string "We’re standing lookout here.\p" + .string "Hey, you! Stay away from the WEATHER\n" + .string "INSTITUTE. It’s not safe.$" Route119_Text_17157C:: @ 817157C - .string "Wache schieben ist langweilig.\p" - .string "Hey, du! Komm nicht in die Nähe des\n" - .string "KLIMA-INSTITUTS.$" + .string "Lookout duty is surprisingly boring.\p" + .string "Hey, you! Please don’t go near the\n" + .string "WEATHER INSTITUTE.$" Route119_Text_1715D7:: @ 81715D7 - .string "Ich dachte, FLIEGEN könnte man, indem\n" - .string "man viele VOGEL-POKéMON fängt, sie\p" - .string "zusammenbindet und sich dann\n" - .string "dranhängt.\p" - .string "Aber es gibt tatsächlich eine VM, die\n" - .string "FLIEGEN heißt!\p" - .string "Wenn ich das doch nur eher gewusst\n" - .string "hätte...$" + .string "I thought you FLY by catching a whole\n" + .string "flock of BIRD POKéMON, and then\l" + .string "hanging on to them somehow.\p" + .string "But it turns out there’s an HM move\n" + .string "called FLY!\p" + .string "I wish I’d known about that a long\n" + .string "time ago...$" Route119_Text_171698:: @ 8171698 - .string "Tse... So geht es nicht weiter...\p" - .string "Das hohe Gras verfängt sich in den \n" - .string "Speichen des RADS...$" + .string "Tch... It’s a no-go...\p" + .string "The tall grass snares BIKE tires.\n" + .string "There’s no way you can cycle here.$" Route119_Text_1716F4:: @ 81716F4 - .string "Kann dein POKéMON GEHEIMPOWER an\n" - .string "einem Berg von Gras einsetzen und eine\l" - .string "GEHEIMBASIS einrichten?$" + .string "Can your POKéMON use its SECRET POWER\n" + .string "on a big pile of grass and make a\l" + .string "SECRET BASE?$" Route119_Text_171749:: @ 8171749 .string "ROUTE 119\n" - .string "{RIGHT_ARROW} BAUMHAUSEN CITY$" + .string "{0x7C} FORTREE CITY$" Route119_Text_171762:: @ 8171762 - .string "KLIMA-INSTITUT$" + .string "WEATHER INSTITUTE$" Route119_Text_171774:: @ 8171774 - .string "TIPPS für TRAINER\p" - .string "In der GEHEIMBASIS können bis zu 16\n" - .string "Dekorationen und Möbel untergebracht\l" - .string "werden.\p" - .string "Nimm deine Lieblingsitems und richte dir\n" - .string "deine GEHEIMBASIS ganz nach deinem\l" - .string "Geschmack ein.$" + .string "TRAINER TIPS\p" + .string "Up to sixteen decorations and\n" + .string "furniture items can be placed in\l" + .string "a SECRET BASE.\p" + .string "Pick your favorite items and create\n" + .string "your very own SECRET BASE exactly the\l" + .string "way you want.$" diff --git a/data/text/maps/Route119_House.inc b/data/text/maps/Route119_House.inc index 33fa9fe32..fe069c1ed 100644 --- a/data/text/maps/Route119_House.inc +++ b/data/text/maps/Route119_House.inc @@ -1,10 +1,9 @@ Route119_House_Text_19F371:: @ 819F371 - .string "Es soll eine Höhle geben - die\n" - .string "URZEITHÖHLE.\p" - .string "Die Menschen erzählen sich, dass dort\n" - .string "die Geister der POKéMON wieder zum\l" - .string "Leben erweckt werden.\l" - .string "Ob das tatsächlich möglich ist?$" + .string "I heard about a cave called the CAVE\n" + .string "OF ORIGIN.\p" + .string "People rumor that the spirits of\n" + .string "POKéMON are revived there.\l" + .string "Could something like that really happen?$" Route119_House_Text_19F406:: @ 819F406 .string "WINGULL: Pihyo?$" diff --git a/data/text/maps/Route119_WeatherInstitute_1F.inc b/data/text/maps/Route119_WeatherInstitute_1F.inc index d2c2165cb..1f7fff794 100644 --- a/data/text/maps/Route119_WeatherInstitute_1F.inc +++ b/data/text/maps/Route119_WeatherInstitute_1F.inc @@ -1,55 +1,54 @@ Route119_WeatherInstitute_1F_Text_19EB8A:: @ 819EB8A - .string "Der BOSS hat Interesse an den \n" - .string "Forschungen gezeigt, daher hat er uns\l" - .string "hergeschickt.\p" - .string "Stör uns gefälligst nicht!$" + .string "The BOSS got interested in the\n" + .string "research they have going here, so he\l" + .string "sent us out.\p" + .string "You quit meddling!$" Route119_WeatherInstitute_1F_Text_19EBEE:: @ 819EBEE - .string "So ein Mist...\n" - .string "Besiegt... Von einem Kind!$" + .string "Blast it...\n" + .string "Blasted by a kid...$" Route119_WeatherInstitute_1F_Text_19EC0E:: @ 819EC0E - .string "Unser BOSS weiß alles.\p" - .string "Ich bin nur ein RÜPEL. Woher soll ich\n" - .string "wissen, was er denkt?$" + .string "Our BOSS knows everything.\p" + .string "But I’m just a GRUNT. What would I know\n" + .string "about what he’s thinking?$" Route119_WeatherInstitute_1F_Text_19EC6B:: @ 819EC6B - .string "Wie?\n" - .string "Was macht denn das Kind hier?$" + .string "Huh?\n" + .string "What’s a kid doing here?$" Route119_WeatherInstitute_1F_Text_19EC89:: @ 819EC89 - .string "Wie?\n" - .string "Ich habe verloren?!?$" + .string "Huh?\n" + .string "I lost?!$" Route119_WeatherInstitute_1F_Text_19EC97:: @ 819EC97 - .string "Oh. Ich werde mir etwas anhören müssen,\n" - .string "weil ich gegen ein Kind verloren habe...\p" - .string "Ich muss mich jetzt dringend hinlegen...$" + .string "Oh, no...\n" + .string "I’ll catch an earful for losing to a kid...\p" + .string "I should just take a nap in the bed...$" Route119_WeatherInstitute_1F_Text_19ECF4:: @ 819ECF4 - .string "Als ich schlief, schlich sich jemand\n" - .string "nach oben!$" + .string "While I was sleeping, everyone went\n" + .string "upstairs!$" Route119_WeatherInstitute_1F_Text_19ED22:: @ 819ED22 - .string "Wow! Bist du aber stark!\p" - .string "Ich wäre auch gerne ein POKéMON-\n" - .string "TRAINER wie du!$" + .string "Wow, you’re really strong!\p" + .string "I wish I could be a POKéMON TRAINER\n" + .string "like you!$" Route119_WeatherInstitute_1F_Text_19ED6B:: @ 819ED6B - .string "Der PROFESSOR liebt den Regen.\n" - .string "Das ist eine Tatsache.\p" - .string "Aber wenn es noch lange so regnet,\n" - .string "wird das zu Problemen führen. Das ist\l" - .string "die andere Seite der Medaille.\p" - .string "Und daher erforscht der PROFESSOR,\n" - .string "wie man den Regen positiv nutzen kann.$" + .string "The PROFESSOR loves rain.\n" + .string "That’s a fact.\p" + .string "But if it keeps raining, people will be in\n" + .string "trouble. That’s another fact.\p" + .string "And thus, the PROFESSOR is studying\n" + .string "if the rain can be put to good use.$" Route119_WeatherInstitute_1F_Text_19EE25:: @ 819EE25 - .string "Hallo! Dein beherztes Eingreifen hat\n" - .string "uns gerettet!\p" - .string "Ich verstehe nur nicht, was die {EVIL_TEAM}S\n" - .string "von uns wollten...$" + .string "Hello!\n" + .string "We’ve been saved by your actions!\p" + .string "What I don’t understand is what on\n" + .string "earth the {EVIL_TEAM}S were up to.$" Route119_WeatherInstitute_1F_Text_19EE8B:: @ 819EE8B - .string "Da steht ein Bett...\n" - .string "Eine Pause wäre willkommen.$" + .string "There’s a bed...\n" + .string "Let’s take a rest.$" diff --git a/data/text/maps/Route119_WeatherInstitute_2F.inc b/data/text/maps/Route119_WeatherInstitute_2F.inc index 27dabca33..f2854f6d0 100644 --- a/data/text/maps/Route119_WeatherInstitute_2F.inc +++ b/data/text/maps/Route119_WeatherInstitute_2F.inc @@ -1,73 +1,71 @@ Route119_WeatherInstitute_2F_Text_19EEAF:: @ 819EEAF - .string "Das INSTITUT hat ein POKéMON ent-\n" - .string "wickelt, das irgendwas mit dem Wetter zu\l" - .string "tun hat. Das müssen wir kriegen!$" + .string "The INSTITUTE created a type of\n" + .string "POKéMON that has something to do with\l" + .string "the weather. We’re here to take them!$" Route119_WeatherInstitute_2F_Text_19EF1B:: @ 819EF1B - .string "Ein Kind hat unsere Pläne durchkreuzt?$" + .string "Our plan’s being spoiled by a kid?$" Route119_WeatherInstitute_2F_Text_19EF3E:: @ 819EF3E - .string "Wenn sie hier tatsächlich ein POKéMON\n" - .string "entwickelt haben, das das Wetter kon-\l" - .string "trollieren kann, müssen wir vom TEAM\l" - .string "{EVIL_TEAM} es in unsere Gewalt bringen!$" + .string "If the POKéMON they made here can\n" + .string "control the weather freely, then we of\l" + .string "TEAM {EVIL_TEAM} definitely need it!$" Route119_WeatherInstitute_2F_Text_19EFA3:: @ 819EFA3 - .string "Wir sind TEAM {EVIL_TEAM}!\n" - .string "Wir sind überall dort, wo Raritäten\l" - .string "gefunden wurden!$" + .string "We’re TEAM {EVIL_TEAM}!\n" + .string "We appear wherever anything rare is\l" + .string "found!$" Route119_WeatherInstitute_2F_Text_19EFDD:: @ 819EFDD - .string "Das war’s dann wohl!$" + .string "You got me!$" Route119_WeatherInstitute_2F_Text_19EFE9:: @ 819EFE9 - .string "Du hast doch gar keine Ahnung, was wir\n" - .string "vom TEAM {EVIL_TEAM} vorbereiten!\l" - .string "Geh uns gefälligst aus dem Weg!$" + .string "You don’t have any idea what we of\n" + .string "TEAM {EVIL_TEAM} are working towards!\l" + .string "You stay out of our way!$" Route119_WeatherInstitute_2F_Text_19F042:: @ 819F042 - .string "Ahahahahaha!!!\p" - .string "Du willst dich allen Ernstes in die Ange-\n" - .string "legenheiten von TEAM {EVIL_TEAM} einmischen?\p" - .string "Dann bist du entweder furchtlos oder\n" - .string "einfach dumm! Oder beides?\p" - .string "Du bist ja so niedlich. Einfach widerlich!\n" - .string "Ich mach dich fertig, du Baby!$" + .string "Ahahahaha!\p" + .string "You’re going to meddle in TEAM {EVIL_TEAM}’s\n" + .string "affairs?\p" + .string "You’re either absolutely fearless,\n" + .string "simply ignorant, or both!\p" + .string "You’re so cute, you’re disgusting!\n" + .string "I’ll put you down, kiddy!$" Route119_WeatherInstitute_2F_Text_19F0F4:: @ 819F0F4 - .string "Ahahahahaha!!!!!\n" - .string "Du bist einfach widerlich... stark!$" + .string "Ahahahaha!\n" + .string "You’re disgustingly strong!$" Route119_WeatherInstitute_2F_Text_19F11B:: @ 819F11B - .string "Ahahahahaha! Wir wurden von\n" - .string "Unvorhergesehenem gestört!\p" - .string "Wir haben keine Möglichkeiten mehr. Wir\n" - .string "müssen uns aus dem Schlamassel ziehen.\p" - .string "Aber das ist nicht das Letzte, was du\n" - .string "von TEAM {EVIL_TEAM} siehst! Wir werden\l" - .string "andere Pläne entwickeln. Merk dir das!$" + .string "Ahahahaha!\n" + .string "We got meddled with unexpectedly!\p" + .string "We’re out of options.\n" + .string "We’ll have to pull out.\p" + .string "But this isn’t the last you’ll see of\n" + .string "TEAM {EVIL_TEAM}! We have other plans!\l" + .string "Don’t you forget it!$" Route119_WeatherInstitute_2F_Text_19F1CF:: @ 819F1CF - .string "Danke!\n" - .string "Vielen Dank! Nun sind wir in Sicherheit!\p" - .string "Es ist vielleicht eine seltsame Art\n" - .string "danke zu sagen, aber dieses POKéMON\l" - .string "ist für dich!$" + .string "Thanks!\n" + .string "Thanks to you, we’re safe!\p" + .string "It might be an odd way of thanking you,\n" + .string "but take this POKéMON.$" Route119_WeatherInstitute_2F_Text_19F231:: @ 819F231 - .string "Oh! Du hast keinen Platz für dieses\n" - .string "POKéMON.$" + .string "Hm? You don’t seem to have any room\n" + .string "for this POKéMON.$" Route119_WeatherInstitute_2F_Text_19F267:: @ 819F267 - .string "{PLAYER} erhält FORMEO!$" + .string "{PLAYER} received CASTFORM!$" Route119_WeatherInstitute_2F_Text_19F27D:: @ 819F27D - .string "Dieses POKéMON ändert seine Gestalt\n" - .string "abhängig vom jeweiligen Wetter.\p" - .string "Hier im INSTITUT gibt es sehr viele\n" - .string "davon - du kannst es ruhig annehmen.$" + .string "That POKéMON changes shape according\n" + .string "to the weather conditions.\p" + .string "There’re plenty of them in the\n" + .string "INSTITUTE - go ahead and take it.$" Route119_WeatherInstitute_2F_Text_19F2FE:: @ 819F2FE - .string "Seit Jahren erforsche ich den Regen,\n" - .string "aber zu denken, dass Menschen das\l" - .string "Wetter frei bestimmen können, ist dumm.$" + .string "I’ve been researching rain for many\n" + .string "years, but it’s ridiculous to think that\l" + .string "humans can freely change the weather.$" diff --git a/data/text/maps/Route120.inc b/data/text/maps/Route120.inc index e19a22949..adaf369b1 100644 --- a/data/text/maps/Route120.inc +++ b/data/text/maps/Route120.inc @@ -1,70 +1,69 @@ Route120_Text_171827:: @ 8171827 - .string "TROY: Hm? {PLAYER}{KUN}, hi.\n" - .string "Es ist lange her...\p" - .string "Hier ist etwas, das du nicht sehen\n" - .string "kannst, richtig?\p" - .string "Also, wenn ich dieses Gerät bei einem\n" - .string "unsichtbaren Objekt benutzen würde...\p" - .string "Nein, nein. Statt es zu beschreiben,\n" - .string "zeige ich es dir lieber.\l" - .string "Das macht mehr Spaß.\p" - .string "{PLAYER}{KUN}, sind deine POKéMON bereit\n" - .string "für einen Kampf?$" + .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" + .string "It’s been a while.\p" + .string "There’s something here that you can’t\n" + .string "see, right?\p" + .string "Now, if I were to use this device on\n" + .string "the invisible obstacle...\p" + .string "No, no. Rather than describing it,\n" + .string "I should just show you.\l" + .string "That would be more fun.\p" + .string "{PLAYER}{KUN}, are your POKéMON ready for\n" + .string "battle?$" Route120_Text_17193D:: @ 817193D - .string "TROY: Nein?\p" - .string "Ich warte hier, dann kannst du sie vor-\n" - .string "bereiten.$" + .string "STEVEN: No?\p" + .string "I’ll wait here, so you can get ready.$" Route120_Text_17196F:: @ 817196F - .string "TROY: {PLAYER}{KUN}, sind deine\n" - .string "POKéMON bereit für einen Kampf?$" + .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" + .string "ready for battle?$" Route120_Text_1719A0:: @ 81719A0 - .string "TROY: {PLAYER}{KUN}, zeig mir deine\n" - .string "wahre Stärke als TRAINER!$" + .string "STEVEN: {PLAYER}{KUN}, show me your true\n" + .string "power as a TRAINER!$" Route120_Text_1719D4:: @ 81719D4 - .string "TROY setzt das DEVON-SCOPE ein.\p" - .string "Ein unsichtbares POKéMON wird sichtbar!\p" - .string "Das erschreckte POKéMON greift an!$" + .string "STEVEN used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON attacked!$" Route120_Text_171A40:: @ 8171A40 - .string "TROY: Bemerkenswert... Dein\n" - .string "Kampfstil ist wirklich bemerkenswert.\p" - .string "Deine POKéMON sind offensichtlich sehr\n" - .string "gewachsen, seit wir uns das erste Mal in\l" - .string "FAUSTAUHAVEN getroffen haben.\p" - .string "Ich möchte dir dieses DEVON-SCOPE\n" - .string "geben.\p" - .string "Wer weiß, es gibt bestimmt noch andere\n" - .string "verborgene POKéMON.$" + .string "STEVEN: I see...\n" + .string "Your battle style is intriguing.\p" + .string "Your POKéMON have obviously grown\n" + .string "since I first met you in DEWFORD.\p" + .string "I’d like you to have this\n" + .string "DEVON SCOPE.\p" + .string "Who knows, there may be other\n" + .string "concealed POKéMON.$" Route120_Text_171B0E:: @ 8171B0E - .string "TROY: {PLAYER}{KUN}.\p" - .string "Ich liebe es, TRAINER und POKéMON zu\n" - .string "sehen, die fest zusammenhalten.\p" - .string "Ich finde, du machst das großartig.\p" - .string "Nun, mach’s gut. Wir sehen uns!$" + .string "STEVEN: {PLAYER}{KUN}.\p" + .string "I enjoy seeing POKéMON and TRAINERS\n" + .string "who strive together.\p" + .string "I think you’re doing great.\p" + .string "Well, let’s meet again somewhere.$" Route119_Text_171B93:: @ 8171B93 Route120_Text_171B93:: @ 8171B93 - .string "Etwas Unsichtbares blockiert den Weg.$" + .string "Something unseeable is in the way.$" Route119_Text_171BB6:: @ 8171BB6 - .string "Etwas Unsichtbares blockiert den Weg.\p" - .string "Möchtest du das DEVON-SCOPE\n" - .string "einsetzen?$" + .string "Something unseeable is in the way.\p" + .string "Want to use the DEVON SCOPE?$" Route119_Text_171BF6:: @ 8171BF6 - .string "{PLAYER} setzt DEVON-SCOPE ein.\p" - .string "Ein unsichtbares POKéMON wird sichtbar!\p" - .string "Das erschreckte POKéMON greift an!$" + .string "{PLAYER} used the DEVON SCOPE.\p" + .string "An invisible POKéMON became completely\n" + .string "visible!\p" + .string "The startled POKéMON attacked!$" Route120_Text_171C5E:: @ 8171C5E .string "ROUTE 120\n" - .string "{LEFT_ARROW} BAUMHAUSEN CITY$" + .string "{0x7B} FORTREE CITY$" Route120_Text_171C77:: @ 8171C77 - .string "{RIGHT_ARROW} ROUTE 121\n" - .string "{LEFT_ARROW} ROUTE 120$" + .string "{0x7C} ROUTE 121\n" + .string "{0x7B} ROUTE 120$" diff --git a/data/text/maps/Route121.inc b/data/text/maps/Route121.inc index 61a70040c..7861b1744 100644 --- a/data/text/maps/Route121.inc +++ b/data/text/maps/Route121.inc @@ -1,18 +1,17 @@ Route121_Text_171C8F:: @ 8171C8F .string "Okay!\n" - .string "Wir sind auf dem Weg zum PYROBERG!$" + .string "We’re to move out to MT. PYRE!$" Route121_Text_171CB4:: @ 8171CB4 - .string "Vor uns erhebt sich der PYROBERG...\p" - .string "Er ist das natürlich gewachsene\n" - .string "Monument der Geister der von uns\l" - .string "gegangenen POKéMON.$" + .string "Ahead looms MT. PYRE...\p" + .string "It is a natural monument to the spirits \n" + .string "of departed POKéMON...$" Route121_Text_171D0C:: @ 8171D0C - .string "PIER AM PYROBERG\p" - .string "...Das Schild ist alt und verwittert.\n" - .string "Die Worte sind kaum noch lesbar...$" + .string "MT. PYRE PIER\p" + .string "...The sign is old and worn out.\n" + .string "The words are barely legible...$" Route121_Text_171D5B:: @ 8171D5B - .string "“Hier sind seltene POKéMON zu Hause!”\n" - .string "SAFARI-ZONE$" + .string "“Filled with rare POKéMON!”\n" + .string "SAFARI ZONE$" diff --git a/data/text/maps/Route123.inc b/data/text/maps/Route123.inc index fca4e9d2d..911915f9e 100644 --- a/data/text/maps/Route123.inc +++ b/data/text/maps/Route123.inc @@ -1,26 +1,25 @@ Route123_Text_171D83:: @ 8171D83 - .string "Ich liebe PFLANZEN-POKéMON!\p" - .string "Hast du einige PFLANZEN-POKéMON?$" + .string "I love GRASS-type POKéMON!\p" + .string "Do you have any GRASS-type POKéMON?$" Route123_Text_171DC2:: @ 8171DC2 .string "Oh?\p" - .string "Du magst PFLANZEN-POKéMON auch sehr\n" - .string "gerne, habe ich Recht?\p" - .string "Das freut mich sehr. Ich schenke dir \n" - .string "ein Zeichen unserer Freundschaft.$" + .string "You like GRASS-type POKéMON, too,\n" + .string "don’t you?\p" + .string "I’m so happy, you can have this!\n" + .string "It’s a token of our friendship.$" Route123_Text_171E34:: @ 8171E34 - .string "Ich prüfe die Bäume mit Hilfe meiner\n" - .string "PFLANZEN-POKéMON. Ich bin so etwas wie\l" - .string "ein Baumdoktor.$" + .string "I check trees with my GRASS-type\n" + .string "POKéMON. I’m like a tree doctor.$" Route123_Text_171E76:: @ 8171E76 - .string "{RIGHT_ARROW} ROUTE 123\n" - .string "{LEFT_ARROW} ROUTE 118$" + .string "{0x7C} ROUTE 123\n" + .string "{0x7B} ROUTE 118$" Route123_Text_171E8E:: @ 8171E8E - .string "{UP_ARROW} PYROBERG\n" - .string "“Für Zaghafte verboten.”$" + .string "{0x79} MT. PYRE\n" + .string "“Forbidden to the faint of heart.”$" Route123_Text_171EBC:: @ 8171EBC - .string "VILLA DES BEERENMEISTERS$" + .string "BERRY MASTER’S HOUSE$" diff --git a/data/text/maps/Route124.inc b/data/text/maps/Route124.inc index a349672ed..6f33d40b7 100644 --- a/data/text/maps/Route124.inc +++ b/data/text/maps/Route124.inc @@ -1,2 +1,2 @@ Route124_Text_171ED1:: @ 8171ED1 - .string "HAUS DES SCHATZTAUCHERS$" + .string "HUNTER’S HOUSE$" diff --git a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc b/data/text/maps/Route124_DivingTreasureHuntersHouse.inc index ac9b18a23..3eda96254 100644 --- a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/text/maps/Route124_DivingTreasureHuntersHouse.inc @@ -1,54 +1,53 @@ Route124_DivingTreasureHuntersHouse_Text_19F416:: @ 819F416 - .string "Ich bin der SCHATZTAUCHER!\p" - .string "Ich bin der Typ, der in der Tiefsee\n" - .string "taucht und nach Schätzen am Meeres-\l" - .string "grund sucht.$" + .string "I’m the DIVING TREASURE HUNTER!\p" + .string "I’m the awesome dude who makes\n" + .string "deep-sea dives to gather treasures\l" + .string "resting at the bottom.$" Route124_DivingTreasureHuntersHouse_Text_19F48F:: @ 819F48F - .string "Sag, hast du SCHERBEN antiker\n" - .string "Werkzeuge gesehen?$" + .string "Tell me, have you seen any SHARDS of\n" + .string "tools made in ancient times?$" Route124_DivingTreasureHuntersHouse_Text_19F4D1:: @ 819F4D1 - .string "Du hast keinerlei Schätze für mich...\p" - .string "Wenn du Stücke findest, besonders\n" - .string "PURPURSTÜCKE, tausche sie mit mir!$" + .string "You haven’t got any treasures\n" + .string "for me...\p" + .string "If you see any SHARDS, like the RED\n" + .string "SHARD, you’ve got to trade it with me!$" Route124_DivingTreasureHuntersHouse_Text_19F544:: @ 819F544 - .string "Oh, hey! Das... Das ist eine\n" - .string "Scherbe! Genau die suche ich!\p" - .string "Oh, du musst unbedingt mit mir\n" - .string "tauschen! Ich gebe dir etwas\l" - .string "Gutes dafür!$" + .string "Oh, hey! That...\n" + .string "That’s a SHARD! I’m looking for those!\p" + .string "Oh, man, you’ve got to trade that\n" + .string "with me! I’ll give you something good!$" Route124_DivingTreasureHuntersHouse_Text_19F5C5:: @ 819F5C5 - .string "Was möchtest du tauschen?$" + .string "What do you want to trade?$" Route124_DivingTreasureHuntersHouse_Text_19F5E0:: @ 819F5E0 - .string "Du tauschst dein {STR_VAR_1} gegen\n" - .string "mein {STR_VAR_2}?$" + .string "You’ll trade your {STR_VAR_1} for\n" + .string "my {STR_VAR_2}, then?$" Route124_DivingTreasureHuntersHouse_Text_19F606:: @ 819F606 - .string "Das ist ein guter Tausch!\n" - .string "Setze es wohl überlegt ein!$" + .string "It’s a done deal!\n" + .string "Use that wisely!$" Route124_DivingTreasureHuntersHouse_Text_19F629:: @ 819F629 - .string "Möchtest du noch etwas tauschen?$" + .string "Do you want to trade something else?$" Route124_DivingTreasureHuntersHouse_Text_19F64E:: @ 819F64E - .string "Hups, dein BEUTEL ist voll.\n" - .string "Schaffe Platz, mein Freund!$" + .string "Whoops, your BAG’s full.\n" + .string "Get rid of some items, friend!$" Route124_DivingTreasureHuntersHouse_Text_19F686:: @ 819F686 - .string "Nein? Das ist niederschmetternd.\n" - .string "Wenn du deine Meinung änderst, ich\l" - .string "bin hier!$" + .string "No? That’s a downer.\n" + .string "Well, if you change your mind, come back.$" Route124_DivingTreasureHuntersHouse_Text_19F6C5:: @ 819F6C5 - .string "Gesuchtes Item Item zum Tausch\n" - .string " PURPURSTÜCK {LEFT_ARROW}{RIGHT_ARROW} FEUERSTEIN\p" - .string "Gesuchtes Item Item zum Tausch\n" - .string " GELBSTÜCK {LEFT_ARROW}{RIGHT_ARROW} DONNERSTEIN\p" - .string "Gesuchtes Item Item zum Tausch\n" - .string " INDIGOSTÜCK {LEFT_ARROW}{RIGHT_ARROW} WASSERSTEIN\p" - .string "Gesuchtes Item Item zum Tausch\n" - .string " GRÜNSTÜCK {LEFT_ARROW}{RIGHT_ARROW} BLATTSTEIN$" + .string "Wanted item Trade item\n" + .string " RED SHARD {0x7B}{0x7C} FIRE STONE\p" + .string "Wanted item Trade item\n" + .string " YELLOW SHARD {0x7B}{0x7C} THUNDERSTONE\p" + .string "Wanted item Trade item\n" + .string " BLUE SHARD {0x7B}{0x7C} WATER STONE\p" + .string "Wanted item Trade item\n" + .string " GREEN SHARD {0x7B}{0x7C} LEAF STONE$" diff --git a/data/text/maps/Route128.inc b/data/text/maps/Route128.inc index bf2e5b424..da813609b 100644 --- a/data/text/maps/Route128.inc +++ b/data/text/maps/Route128.inc @@ -1,69 +1,65 @@ Route128_Text_171EE0:: @ 8171EE0 - .string "{EVIL_LEADER}: Was ist passiert... Was für\n" - .string "ein Furcht erregendes Szenario...\p" - .string "Habe ich... einen schrecklichen Fehler\n" - .string "begangen?$" + .string "{EVIL_LEADER}: What happened...\n" + .string "What is this wretched scene...\p" + .string "Did I...make a horrible mistake?$" Route128_Text_171F35:: @ 8171F35 - .string "Ich...\n" - .string "Ich wollte doch nur...$" + .string "I...\n" + .string "I only wanted...$" Route128_Text_171F4B:: @ 8171F4B - .string "{GOOD_LEADER}: Begreifst du es nun,\n" + .string "{GOOD_LEADER}: Do you understand now,\n" .string "{EVIL_LEADER}?\p" - .string "Begreifst du nun die schrecklichen\n" - .string "Folgen deines katastrophalen Traums?\p" - .string "Wir müssen uns beeilen! Wir müssen etwas\n" - .string "unternehmen, bevor die Situation völlig\l" - .string "außer Kontrolle gerät!$" + .string "Do you finally see how disastrous\n" + .string "your dream turned out to be?\p" + .string "We have to hurry! We have to do\n" + .string "something before the situation goes\l" + .string "completely out of control!$" Route128_Text_172008:: @ 8172008 .string "{GOOD_LEADER}: {PLAYER}{KUN}...\p" - .string "Wir, TEAM {GOOD_TEAM}, verfolgen TEAM {EVIL_TEAM}\n" - .string "schon lange, weil wir dies verhindern\l" - .string "wollten.\p" - .string "Du warst uns eine große Hilfe, aber ich\n" - .string "fürchte, das Schlimmste ist passiert...\p" - .string "Für ein Kind wie dich ist die Sache viel\n" - .string "zu weit gegangen...\p" - .string "Überlass die Sache uns und lauf weg,\n" - .string "solange es noch geht!$" + .string "We, TEAM {GOOD_TEAM}, had been pursuing TEAM\n" + .string "{EVIL_TEAM} to prevent this from happening.\p" + .string "You’ve been very helpful, but I fear\n" + .string "the worst has happened...\p" + .string "It’s gone too far for a child like you\n" + .string "to manage...\p" + .string "Leave things to us, and get out of\n" + .string "here while you still can!$" Route128_Text_17210B:: @ 817210B - .string "{GOOD_LEADER}: Das ist ja unglaublich...\p" - .string "Ein super-antikes POKéMON...\p" - .string "Seine Kraft ist unglaublich. Es hat\n" - .string "das Gleichgewicht der Natur verändert.$" + .string "{GOOD_LEADER}: This defies belief...\p" + .string "A super-ancient POKéMON...\p" + .string "Its power is unbelievable.\n" + .string "It has upset the balance of nature...$" Route128_Text_172181:: @ 8172181 - .string "TROY: {PLAYER}{KUN}!\n" - .string "Was geht hier vor?$" + .string "STEVEN: {PLAYER}{KUN}!\n" + .string "What is happening?$" Route128_Text_1721A2:: @ 81721A2 - .string "Das ist schrecklich...\p" - .string "Wenn das nicht aufhört, wird ganz\n" - .string "HOENN... Nein, die ganze Welt wird\l" - .string "untergehen.\p" - .string "Diese riesige Regenwolke kommt\n" - .string "aus Richtung XENEROVILLE?\p" - .string "Was um Himmels Willen geht dort vor?\p" - .string "Es bleibt keine Zeit für Spekulationen...\n" - .string "In XENEROVILLE erfahren wir mehr...$" + .string "This is terrible...\p" + .string "If this doesn’t stop, all HOENN...\n" + .string "No, the whole world will drown.\p" + .string "This huge rain cloud is spreading\n" + .string "from above SOOTOPOLIS?\p" + .string "What in the world is taking place there?\p" + .string "There’s no point arguing here...\n" + .string "SOOTOPOLIS should provide answers...$" Route128_Text_1722A1:: @ 81722A1 - .string "Das ist schrecklich...\p" - .string "Wenn das nicht aufhört, wird ganz\n" - .string "HOENN... Nein, die ganze Welt wird\l" - .string "vertrocknen.\p" - .string "Die strahlende Sonne steht über\n" - .string "XENEROVILLE?\p" - .string "Was um Himmels Willen geht dort vor?\p" - .string "Es bleibt keine Zeit für Spekulationen...\n" - .string "In XENEROVILLE erfahren wir mehr...$" + .string "This is terrible...\p" + .string "If this doesn’t stop, all of HOENN...\n" + .string "No, the whole world will be parched.\p" + .string "The cause of this calamity, the blazing\n" + .string "sun, is in the sky above SOOTOPOLIS...\p" + .string "What in the world is taking place there?\p" + .string "There’s no point arguing here...\n" + .string "SOOTOPOLIS should provide answers...$" Route128_Text_1723BE:: @ 81723BE .string "{PLAYER}{KUN}...\n" - .string "Ich weiß nicht, was du vorhast, aber tue\l" - .string "nichts Unüberlegtes.\p" + .string "I don’t know what you intend to do,\l" + .string "but don’t do anything reckless.\p" .string "Okay.\n" - .string "Ich gehe nach XENEROVILLE.$" + .string "I’m going to SOOTOPOLIS.$" diff --git a/data/text/maps/RustboroCity.inc b/data/text/maps/RustboroCity.inc index 6248b9e30..4f2954f35 100644 --- a/data/text/maps/RustboroCity.inc +++ b/data/text/maps/RustboroCity.inc @@ -1,188 +1,178 @@ RustboroCity_Text_16689D:: @ 816689D - .string "Die DEVON CORPORATION...\n" - .string "Wir nennen sie kurz DEVON.\p" - .string "Die Firma stellt viele praktische\n" - .string "Dinge her.$" + .string "The DEVON CORPORATION...\n" + .string "We all just shorten it to DEVON.\p" + .string "That company makes all sorts of\n" + .string "convenient products.$" RustboroCity_Text_16690C:: @ 816690C - .string "Hm? Ein verschlagen wirkender Mann?\p" - .string "Wenn ich so darüber nachdenke, fällt mir\n" - .string "ein, dass ich einen zwielichtigen Typen\l" - .string "eben hier an der Ecke gesehen habe.$" + .string "Hm? A sneaky-looking man?\p" + .string "Come to think of it, yes, a shady-\n" + .string "looking guy went around the corner.$" RustboroCity_Text_16696D:: @ 816696D - .string "Hast du schon die Herausforderung der\n" - .string "POKéMON ARENA angenommen?\p" - .string "Ich glaube, wenn sie den glänzenden\n" - .string "ORDEN der ARENA in der Hand halten, wird\l" - .string "den TRAINERN klar, was von ihnen\l" - .string "verlangt wird.$" + .string "Have you taken the POKéMON GYM\n" + .string "challenge?\p" + .string "When you get that shiny GYM BADGE\n" + .string "in hand, I guess TRAINERS begin to\l" + .string "realize what is required of them.$" RustboroCity_Text_1669FE:: @ 81669FE - .string "Hey, das ist der ORDEN der ARENA von\n" - .string "METAROST CITY!\p" - .string "Von allen ARENA-ORDEN ist der von\n" - .string "METAROST CITY der coolste, sage ich dir.$" + .string "Hey, that’s RUSTBORO’s GYM BADGE!\p" + .string "Out of all the POKéMON GYM BADGES,\n" + .string "RUSTBORO’s is the coolest, I’d say.$" RustboroCity_Text_166A67:: @ 8166A67 - .string "Oh? Wer magst du wohl sein?\n" - .string "Ein neues Gesicht in dieser Gegend.\p" - .string "Bist du gerade in die POKéMON TRAINER-\n" - .string "SCHULE gekommen?$" + .string "Oh? Who might you be?\n" + .string "You’re a new face around these parts.\p" + .string "Have you just transferred into the\n" + .string "POKéMON TRAINER’S SCHOOL?$" RustboroCity_Text_166AE0:: @ 8166AE0 - .string "Ich habe den ARENALEITER heraus-\n" - .string "gefordert, aber...\p" - .string "Es ist nicht einfach, mit meinen FEUER-\n" - .string "POKéMON zu gewinnen...\p" - .string "FEUER-POKéMON haben keinen guten\n" - .string "Stand gegenüber GESTEINS-POKéMON.$" + .string "I challenged the GYM LEADER, but...\p" + .string "It’s not going to be easy winning with\n" + .string "my FIRE-type POKéMON...\p" + .string "FIRE-type POKéMON don’t match up\n" + .string "well against ROCK-type POKéMON...$" RustboroCity_Text_166B86:: @ 8166B86 - .string "Der alte Seebär MR. BRACK lebt in einer\n" - .string "Hütte am Meer.\p" - .string "Er geht sehr oft in dem Tunnel\n" - .string "spazieren.$" + .string "The old sailor MR. BRINEY lives in a\n" + .string "cottage by the sea.\p" + .string "He goes for walks in the tunnel every\n" + .string "so often.$" RustboroCity_Text_166BEF:: @ 8166BEF - .string "Der alte Seebär MR. BRACK lebt in einer\n" - .string "Hütte am Meer.\p" - .string "Er sagt, er wäre in GRAPHITPORT CITY\n" - .string "gewesen, um etwas für sein Haustier,\l" - .string "PECKO, zu kaufen.\p" - .string "Der alte Seebär muss sein PECKO wirklich\n" - .string "sehr lieben.$" + .string "The old sailor MR. BRINEY lives in a\n" + .string "cottage by the sea.\p" + .string "He said he was going shopping in\n" + .string "SLATEPORT for his pet, PEEKO.\p" + .string "That old seadog, he must really love\n" + .string "that PEEKO.$" RustboroCity_Text_166C98:: @ 8166C98 - .string "Wow, du hast ja auch POKéMON dabei.\p" - .string "Wenn ich größer bin, werde ich auch\n" - .string "immer POKéMON dabeihaben.$" + .string "Wow, you have POKéMON with you, too.\p" + .string "When I get bigger, I’m going to go\n" + .string "places with POKéMON, too.$" RustboroCity_Text_166CFA:: @ 8166CFA - .string "POKéMON TRAINERSCHULE!\p" - .string "Wenn ich in diese Schule gehe, werde ich\n" - .string "später seltene POKéMON fangen können?$" + .string "POKéMON TRAINER’S SCHOOL!\p" + .string "If I go to this school, will I be able\n" + .string "to catch rare POKéMON easily?$" RustboroCity_Text_166D59:: @ 8166D59 - .string "Wenn ein POKéMON Erfahrungen im Kampf\n" - .string "sammelt, kann es vorkommen, dass es\l" - .string "irgendwann sein Aussehen verändert.$" + .string "If a POKéMON gains experience in\n" + .string "battles, it can sometimes change in\l" + .string "the way it looks.$" RustboroCity_Text_166DB0:: @ 8166DB0 - .string "Ein POKéMON verändert sein Aussehen?!?\n" - .string "Wenn es das tun würde, wäre ich zu Tode\l" - .string "erschrocken!$" + .string "A POKéMON changes shape?\n" + .string "If one did that, I would be shocked!$" RustboroCity_Text_166DEE:: @ 8166DEE - .string "Ein POKéMON, das du durch Tausch\n" - .string "erhältst, wächst schnell.\p" - .string "Aber wenn dir ORDEN von bestimmten\n" - .string "ARENEN fehlen, wird es dir eventuell\l" - .string "nicht gehorchen.$" + .string "A POKéMON you get in a trade from\n" + .string "someone grows fast.\p" + .string "But if you don’t have certain GYM\n" + .string "BADGES, it may not obey you...$" RustboroCity_Text_166E65:: @ 8166E65 - .string "Geh weg! Aus dem Weg!!!$" + .string "Get out! Out of the way!$" RustboroCity_Text_166E7E:: @ 8166E7E - .string "Warte! Waaaaarte doch! Bitte!\p" - .string "Du kannst doch nicht einfach meine\n" - .string "WAREN stehlen!!!$" + .string "Wait! Pleeeaaase!\p" + .string "Don’t take my GOODS!$" RustboroCity_Text_166EA5:: @ 8166EA5 - .string "Oh, du bist das!\p" - .string "Du bist dieser großartige TRAINER, der\n" - .string "mir im BLÜTENBURGWALD geholfen hat.\p" - .string "Hilf mir! Das TEAM {EVIL_TEAM} hat mich aus-\n" - .string "geraubt! Ich muss die DEVON-WAREN\l" - .string "zurückbekommen.\p" - .string "Wenn ich sie nicht bekomme...\n" - .string "Dann habe ich ein riesiges Problem.$" + .string "Oh, it’s you!\p" + .string "You’re that fantastic TRAINER who\n" + .string "helped me in PETALBURG WOODS!\p" + .string "Help me! I was robbed by TEAM {EVIL_TEAM}!\n" + .string "I have to get the DEVON GOODS back!\p" + .string "If I don’t...\n" + .string "I’m going to be in serious trouble.$" RustboroCity_Text_166F6B:: @ 8166F6B - .string "Ich glaube, dieser zwielichtige Typ ist\n" - .string "in Richtung Tunnel gelaufen.$" + .string "That shady character, I think he took\n" + .string "off towards the tunnel over there.$" RustboroCity_Text_166FB4:: @ 8166FB4 - .string "Oh! Und? Wie sieht es aus?\n" - .string "Die DEVON-WAREN?\p" - .string "Du hast es geschafft!\n" - .string "Du hast sie zurückbekommen!\p" - .string "Du bist wirklich ein großer TRAINER!\n" - .string "Ich weiß! Ich werde dir zum Dank einen\l" - .string "weiteren SUPERBALL schenken!$" + .string "Oh! How did it go?\n" + .string "The DEVON GOODS?\p" + .string "You did!\n" + .string "You got them back!\p" + .string "You really are a great TRAINER!\p" + .string "I know! As my thanks, I’ll give you\n" + .string "another GREAT BALL!$" RustboroCity_Text_16704C:: @ 816704C - .string "Dein BEUTEL ist voll.\n" - .string "Ich kann dir den SUPERBALL nicht geben.$" + .string "Your BAG’s full.\n" + .string "I can’t give you this GREAT BALL.$" RustboroCity_Text_16707F:: @ 816707F - .string "Bitte entschuldige!\n" - .string "Würdest du mir bitte folgen?$" + .string "Excuse me, please!\n" + .string "Please come with me!$" RustboroCity_Text_1670A7:: @ 81670A7 - .string "MAIKE: Oh, hi {PLAYER}{KUN}!\n" - .string "Wie geht es mit deinem POKéDEX voran?\p" - .string "Meiner sieht schon ganz anständig aus.\p" - .string "Ich habe im BLÜTENBURGWALD\n" - .string "POKéMON gefangen, bis ich keine\l" - .string "POKéBÄLLE mehr hatte.$" + .string "MAY: Oh, hi, {PLAYER}{KUN}!\n" + .string "How’s your POKéDEX coming along?\p" + .string "Mine’s looking pretty decent.\p" + .string "I caught POKéMON in PETALBURG WOODS\n" + .string "until I ran out of POKé BALLS.$" RustboroCity_Text_16713C:: @ 816713C - .string "MAIKE: Ach, übrigens. Ich habe MR.\n" - .string "BRACK im BLÜTENBURGWALD gesehen.\p" - .string "Ich glaube, er ist auf dem Weg zu seiner\n" - .string "Hütte am Meer.\p" - .string "{PLAYER}{KUN}, du bist gerade hierher\n" - .string "gezogen, daher kannst du das nicht\l" - .string "wissen, aber MR. BRACK war Seefahrer.$" + .string "MAY: Oh, by the way, I passed MR. BRINEY\n" + .string "in PETALBURG WOODS.\p" + .string "I guess he’s on his way home to his\n" + .string "cottage by the sea.\p" + .string "{PLAYER}{KUN}, you just moved here so you\n" + .string "might not know this, but MR. BRINEY\l" + .string "was once a revered seafarer.$" RustboroCity_Text_167213:: @ 8167213 - .string "BRIX: {PLAYER}, wie sieht es mit\n" - .string "deinem POKéDEX aus?\p" - .string "Meiner ist eine Wucht.\p" - .string "Ich habe im BLÜTENBURGWALD jede\n" - .string "Menge POKéMON gefangen, bis ich keine\l" - .string "POKéBÄLLE mehr hatte.$" + .string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n" + .string "Have you filled in any pages yet?\p" + .string "Mine rules.\p" + .string "I went on a POKéMON-catching frenzy\n" + .string "in PETALBURG WOODS until I ran out\l" + .string "of POKé BALLS.$" RustboroCity_Text_1672B8:: @ 81672B8 - .string "BRIX: Übrigens habe ich dort auch\n" - .string "MR. BRACK gesehen.\p" - .string "Ich wette, er ist auf dem Weg zu seiner\n" - .string "Hütte am Meer.\p" - .string "Und ich wette, du weißt nicht, dass er\n" - .string "immer ein POKéMON bei sich hat.$" + .string "BRENDAN: By the way, I walked by MR.\n" + .string "BRINEY in PETALBURG WOODS.\p" + .string "I bet he was on his way home to his\n" + .string "cottage by the sea.\p" + .string "I bet you didn’t know this, but he’s\n" + .string "always got a POKéMON with him.$" RustboroCity_Text_167374:: @ 8167374 - .string "“Tunnel zur Abkürzung steht vor\n" - .string "Fertigstellung!”\p" - .string "...Das steht auf dem Schild, aber darüber\n" - .string "wurde ein “X” in roter Farbe gemalt...$" + .string "“Timesaving tunnel nearing\n" + .string "completion!”\p" + .string "...Is what it says on the sign, but\n" + .string "there’s also a big “X” splashed\l" + .string "across it in red paint...$" RustboroCity_Text_1673FA:: @ 81673FA .string "DEVON CORPORATION\p" - .string "“Alles, was man im Leben braucht - \n" - .string "wir stellen es her.”$" + .string "“For all your living needs, we make\n" + .string "it all.”$" RustboroCity_Text_167439:: @ 8167439 - .string "POKéMON ARENA von METAROST CITY\n" - .string "LEITER: FELIZIA\p" - .string "“GESTEINS-Liebhaberin und\n" - .string "ihre Schüler!”$" + .string "RUSTBORO CITY POKéMON GYM\n" + .string "LEADER: ROXANNE\p" + .string "“The ROCK-loving honors student!”$" RustboroCity_Text_167485: @ 8167485 - .string "DEVON CORP. FILIALE\p" - .string "“Zutritt nur für Angestellte von DEVON\n" - .string "und autorisierte Personen.”$" + .string "DEVON CORP. BRANCH OFFICE\p" + .string "“Access limited to DEVON employees\n" + .string "and authorized personnel.”$" RustboroCity_Text_1674DD:: @ 81674DD - .string "METAROST CITY\p" - .string "“Diese Stadt steht im Zeichen der Inte-\n" - .string "gration von Natur und Wissenschaften.”$" + .string "RUSTBORO CITY\p" + .string "“The city probing the integration of\n" + .string "nature and science.”$" RustboroCity_Text_167525:: @ 8167525 - .string "POKéMON TRAINERSCHULE\p" - .string "“Wir bringen dir alles über die\n" - .string "POKéMON bei!”$" + .string "POKéMON TRAINER’S SCHOOL\p" + .string "“We’ll teach you anything about\n" + .string "POKéMON!”$" RustboroCity_Text_167568:: @ 8167568 - .string "HAUS DES ZERSCHNEIDERS$" + .string "CUTTER’S HOUSE$" diff --git a/data/text/maps/RustboroCity_CuttersHouse.inc b/data/text/maps/RustboroCity_CuttersHouse.inc index 7e8448070..8b4c237f5 100644 --- a/data/text/maps/RustboroCity_CuttersHouse.inc +++ b/data/text/maps/RustboroCity_CuttersHouse.inc @@ -1,31 +1,27 @@ RustboroCity_CuttersHouse_Text_18509C:: @ 818509C - .string "Diese Entschlossenheit...\n" - .string "Deine Beweglichkeit...\l" - .string "Deine Hingabe für POKéMON...\p" - .string "Du bist wirklich ein talentierter\n" - .string "TRAINER!\p" - .string "Nein, warte. Sag jetzt nichts.\n" - .string "Ich brauche dich nur anzuschauen.\p" - .string "Ich bin mir sicher, dass du mit dieser\n" - .string "VM sehr gut umgehen wirst.\p" - .string "Kein Grund, so schüchtern zu sein.\n" - .string "Hier, nimm sie!$" + .string "That determined expression...\n" + .string "That limber way you move...\l" + .string "And your well-trained POKéMON...\p" + .string "You’re obviously a skilled TRAINER!\p" + .string "No, wait, don’t say a word.\n" + .string "I can tell just by looking at you.\p" + .string "I’m sure that you will be capable\n" + .string "of putting this HM to good use.\p" + .string "No need to be modest or shy.\n" + .string "Go on, take it!$" RustboroCity_CuttersHouse_Text_1851C9:: @ 81851C9 - .string "Diese VM, sie enthält ZERSCHNEIDER.\p" - .string "Eine VM ist eine Attacke, die auch\n" - .string "außerhalb des Kampfes von einem\l" - .string "POKéMON angewandt werden kann.\p" - .string "Jedes POKéMON, das diese Attacke\n" - .string "gelernt hat, kann Bäume damit\p" - .string "zerschneiden, wenn der TRAINER den\n" - .string "STEINORDEN besitzt.\p" - .string "Und, im Gegensatz zur TM, kann eine VM\n" - .string "mehrfach gelehrt werden.$" + .string "That HM, it’s CUT.\p" + .string "An HM move is one that can be used\n" + .string "by POKéMON out of a battle.\p" + .string "Any POKéMON that’s learned CUT can\n" + .string "chop down thin trees if the TRAINER\l" + .string "has earned the STONE BADGE.\p" + .string "And, unlike a TM, an HM doesn’t break\n" + .string "after one use.$" RustboroCity_CuttersHouse_Text_1852B3:: @ 81852B3 - .string "Als sie die Stadt METAROST CITY\n" - .string "vergrößert haben, hat mein Vater ihnen\l" - .string "geholfen.\p" - .string "Seine POKéMON fällten die Bäume mit\n" - .string "ZERSCHNEIDER.$" + .string "When they were expanding the city of\n" + .string "RUSTBORO, my dad helped out.\p" + .string "He made his POKéMON use CUT to clear\n" + .string "the land of trees.$" diff --git a/data/text/maps/RustboroCity_DevonCorp_1F.inc b/data/text/maps/RustboroCity_DevonCorp_1F.inc index c7b4b4028..209fd049c 100644 --- a/data/text/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/text/maps/RustboroCity_DevonCorp_1F.inc @@ -1,42 +1,38 @@ RustboroCity_DevonCorp_1F_Text_1828EE:: @ 81828EE - .string "Hallo und Willkommen in der\n" - .string "DEVON CORPORATION.\p" - .string "Wir sind die stolzen Entwickler von\n" - .string "Medizin und Items, die das Leben\l" - .string "bereichern.$" + .string "Hello and welcome to the DEVON\n" + .string "CORPORATION.\p" + .string "We’re proud producers of items and\n" + .string "medicine that enhance your life.$" RustboroCity_DevonCorp_1F_Text_18295E:: @ 818295E - .string "Einem Mitglied unseres Forschungsteams\n" - .string "ist blöderweise ein wichtiges Paket\l" - .string "gestohlen worden.$" + .string "One of our research staff stupidly\n" + .string "got robbed of an important parcel.$" RustboroCity_DevonCorp_1F_Text_1829A4:: @ 81829A4 - .string "Hey, diese TURBOTRETER!\n" - .string "Die haben wir auch entwickelt!\p" - .string "Ich freue mich immer, wenn ich jemanden\n" - .string "treffe, der eines unserer Produkte\l" - .string "benutzt.$" + .string "Hey, those RUNNING SHOES!\n" + .string "They’re one of our products!\p" + .string "It makes me happy when I see someone\n" + .string "using something we made.$" RustboroCity_DevonCorp_1F_Text_182A19:: @ 8182A19 - .string "Das gestohlene Paket...\p" - .string "Nun, es ist natürlich sehr wichtig, aber\n" - .string "mit dem Inhalt kann niemand etwas\l" - .string "anfangen.\p" - .string "Meiner Einschätzung nach ist der Dieb\n" - .string "wirklich nicht sehr schlau gewesen...$" + .string "That stolen parcel...\p" + .string "Well, sure it’s important, but it’s not\n" + .string "anything that anyone can use.\p" + .string "In my estimation, that robber must not\n" + .string "have been very bright.$" RustboroCity_DevonCorp_1F_Text_182AB3:: @ 8182AB3 - .string "Klingt, als hätten wir die gestohlenen\n" - .string "DEVON-WAREN zurückerhalten.$" + .string "It sounds like they’ve recovered\n" + .string "the ripped-off DEVON GOODS.$" RustboroCity_DevonCorp_1F_Text_182AF0:: @ 8182AF0 - .string "Tut mir Leid, aber nur autorisierte\n" - .string "Personen haben hier Zutritt.$" + .string "I’m sorry, only authorized people\n" + .string "are allowed to enter here.$" RustboroCity_DevonCorp_1F_Text_182B2D:: @ 8182B2D - .string "Das ist mehr als blöd.\n" - .string "Wie konnten wir nur ausgeraubt werden?$" + .string "It’s beyond stupid.\n" + .string "How could we get robbed?$" RustboroCity_DevonCorp_1F_Text_182B5A:: @ 8182B5A - .string "Hi, du da!\n" - .string "Du bist hier jederzeit willkommen!$" + .string "Hi, there!\n" + .string "You’re always welcome here!$" diff --git a/data/text/maps/RustboroCity_DevonCorp_2F.inc b/data/text/maps/RustboroCity_DevonCorp_2F.inc index 3e672ab46..a6a6bb6c2 100644 --- a/data/text/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/text/maps/RustboroCity_DevonCorp_2F.inc @@ -1,98 +1,88 @@ RustboroCity_DevonCorp_2F_Text_182B81:: @ 8182B81 - .string "Wir wollen ein Gerät entwickeln, mit dem\n" - .string "wir mit POKéMON reden können.\p" - .string "Aber bisher waren wir nicht sehr\n" - .string "erfolgreich...$" + .string "We’re developing a device for talking\n" + .string "with POKéMON.\p" + .string "But we haven’t had much success...$" RustboroCity_DevonCorp_2F_Text_182BD8:: @ 8182BD8 - .string "Ich entwickle neue Arten von\n" - .string "POKéBÄLLEN...\p" - .string "Aber noch bin ich nicht sonderlich weit\n" - .string "mit der Entwicklung gekommen...$" + .string "I’m developing new kinds of\n" + .string "POKé BALLS...\p" + .string "But I haven’t made much headway...$" RustboroCity_DevonCorp_2F_Text_182C25:: @ 8182C25 - .string "Wir haben endlich neue POKéBÄLLE\n" - .string "entwickelt!\p" - .string "Mit dem WIEDERBALL lassen sich\n" - .string "POKéMON leichter fangen, die du\l" - .string "vorher schon mal gefangen hattest.\p" - .string "Mit dem TIMERBALL lassen sich POKéMON\n" - .string "umso leichter fangen, je länger der\l" - .string "Kampf dauert.\p" - .string "Beide werden voller Stolz von der\n" - .string "DEVON CORPORATION präsentiert.\p" - .string "Probiere sie bitte unbedingt aus!$" + .string "We finally made new kinds of POKé BALLS!\p" + .string "The REPEAT BALL makes it easier to\n" + .string "catch POKéMON you’d caught before.\p" + .string "The TIMER BALL gets better at catching\n" + .string "POKéMON the longer a battle runs.\p" + .string "Both are proudly developed by the\n" + .string "DEVON CORPORATION.\p" + .string "Please give them a try!$" RustboroCity_DevonCorp_2F_Text_182D2A:: @ 8182D2A - .string "Ich habe den POKéNAV entwickelt!\p" - .string "Als Ingenieur erfüllt es mich mit Stolz,\n" - .string "so etwas Großartiges entwickelt zu\l" - .string "haben.$" + .string "I made the POKéNAV!\p" + .string "As an engineer, I feel blessed to have\n" + .string "made something so great!$" RustboroCity_DevonCorp_2F_Text_182D7E:: @ 8182D7E .string "Oh, wow!\n" - .string "Das ist ein POKéNAV!\p" - .string "Er ist das Resultat der Wissbegierde\n" - .string "unseres PRÄSIDENTEN, der etwas über\l" - .string "die Gefühle der POKéMON lernen möchte.\p" - .string "Soll ich dir die Funktionen im Einzelnen\n" - .string "erklären?\p" - .string "Ach was, du findest sie schon ganz\n" - .string "alleine heraus.$" + .string "That’s a POKéNAV!\p" + .string "It came about as a result of our\n" + .string "PRESIDENT’s desire to learn about\l" + .string "the feelings of POKéMON.\p" + .string "Would you like me to describe its\n" + .string "features in detail?\p" + .string "No, no. I think you’ll find out just by\n" + .string "trying the POKéNAV out.$" RustboroCity_DevonCorp_2F_Text_182E6B:: @ 8182E6B - .string "Ich arbeite an einer Vorrichtung, die\n" - .string "die Träume der POKéMON visualisieren\l" - .string "kann...\p" - .string "Aber so richtig geht es nicht voran.$" + .string "I’m trying to develop a device that\n" + .string "visually reproduces the dreams of\l" + .string "POKéMON...\p" + .string "But it’s not going well.$" RustboroCity_DevonCorp_2F_Text_182ED5:: @ 8182ED5 - .string "Ich arbeite an einer Vorrichtung, die\n" - .string "POKéMON aus Fossilien wieder zum Leben\l" - .string "erweckt.\p" - .string "Und... Es klappt!!!$" + .string "I’ve been trying to develop a device\n" + .string "that resurrects POKéMON from fossils...\p" + .string "And, it’s working!$" RustboroCity_DevonCorp_2F_Text_182F35:: @ 8182F35 - .string "Warte! Das Teil dort...\n" - .string "Ist das ein POKéMON-Fossil?\p" - .string "Möchtest du das POKéMON wieder zum\n" - .string "Leben erwecken?\p" - .string "Ich kann dir mit meiner neuesten Ent-\n" - .string "wicklung, dem FOSSIL-REGENERATOR,\l" - .string "dabei helfen.$" + .string "Wait! That thing you have there...\n" + .string "Is that a POKéMON fossil?\p" + .string "Would you like to bring that POKéMON\n" + .string "back to life?\p" + .string "I can with my newly developed\n" + .string "FOSSIL REGENERATOR.$" RustboroCity_DevonCorp_2F_Text_182FD7:: @ 8182FD7 - .string "Ehrlich?\p" - .string "DEVON besitzt einen hervorragenden\n" - .string "Ruf in Sachen Technik. \l" - .string "Das versichere ich dir!$" + .string "Oh, is that so?\p" + .string "DEVON’s technological expertise\n" + .string "is outstanding, I tell you.$" RustboroCity_DevonCorp_2F_Text_183023:: @ 8183023 - .string "Exzellent!\n" - .string "Dann lass uns sofort zur Tat schreiten.\p" - .string "{PLAYER} gibt dem FORSCHER von DEVON\n" - .string "{STR_VAR_1}.$" + .string "Excellent!\n" + .string "Let’s do this right away.\p" + .string "{PLAYER} handed the {STR_VAR_1} to\n" + .string "the DEVON RESEARCHER.$" RustboroCity_DevonCorp_2F_Text_183072:: @ 8183072 - .string "Der FOSSIL-REGENERATOR, den ich ent-\n" - .string "wickelt habe, ist einfach unglaublich.\p" - .string "Aber einen Nachteil gibt es: Es dauert\n" - .string "eine Weile, bis der Prozess\l" - .string "abgeschlossen ist.\p" - .string "Also, äh... Warum schaust du dich in der\n" - .string "Zeit nicht ein wenig um?$" + .string "The FOSSIL REGENERATOR, which I made,\n" + .string "is incredible.\p" + .string "But it has one drawback - it takes\n" + .string "a long time to work.\p" + .string "So, uh... How about you go for a stroll\n" + .string "and look around for a while?$" RustboroCity_DevonCorp_2F_Text_183124:: @ 8183124 - .string "Danke für deine Geduld!\p" - .string "Dein fossiles POKéMON wurde zu neuem\n" - .string "Leben erweckt!\p" - .string "Das Fossil war ein altertümliches\n" - .string "POKéMON. Ein {STR_VAR_2}!$" + .string "Thanks for waiting!\p" + .string "Your fossilized POKéMON has been\n" + .string "brought back to life!\p" + .string "The fossil was an ancient POKéMON.\n" + .string "{STR_VAR_2}, it was!$" RustboroCity_DevonCorp_2F_Text_18319E:: @ 818319E - .string "{PLAYER} erhält das {STR_VAR_2} vom\n" - .string "FORSCHER von DEVON.$" + .string "{PLAYER} received {STR_VAR_2} from\n" + .string "the DEVON RESEARCHER.$" RustboroCity_DevonCorp_2F_Text_1831C8:: @ 81831C8 - .string "Oh oh, du hast zu viele POKéMON bei dir.\n" - .string "Du hast keinen Platz für dieses hier.$" + .string "Uh-oh, you’ve got too many POKéMON.\n" + .string "You have no room for this one.$" diff --git a/data/text/maps/RustboroCity_DevonCorp_3F.inc b/data/text/maps/RustboroCity_DevonCorp_3F.inc index 01bca10d4..c868a4836 100644 --- a/data/text/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/text/maps/RustboroCity_DevonCorp_3F.inc @@ -1,106 +1,98 @@ RustboroCity_DevonCorp_3F_Text_18320B:: @ 818320B - .string "Ich bin MR. TRUMM, der PRÄSIDENT der\n" - .string "DEVON CORPORATION.\p" - .string "Ich muss etwas mit dir besprechen!\p" - .string "Du hast unseren Mitarbeitern nicht\n" - .string "nur einmal, sondern zweimal aus\l" - .string "der Klemme geholfen!\p" - .string "Du bist so außergewöhnlich, dass ich\n" - .string "dich gerne um einen Gefallen\l" - .string "bitten möchte.\p" - .string "Ich weiß, dass du ein Paket zur WERFT in\n" - .string "GRAPHITPORT CITY bringen willst.\p" - .string "Könntest du auf dem Weg nicht\n" - .string "auch in FAUSTAUHAVEN Halt machen?\p" - .string "Und TROY in FAUSTAUHAVEN einen BRIEF\n" - .string "von mir überbringen?$" + .string "I’m MR. STONE, the PRESIDENT of\n" + .string "the DEVON CORPORATION.\p" + .string "I’d just got word about you!\p" + .string "You saved our staff not just once,\n" + .string "but twice!\p" + .string "I have a favor to ask of an amazing\n" + .string "person like you.\p" + .string "I understand that you’re delivering\n" + .string "a package to SLATEPORT’s SHIPYARD.\p" + .string "Well, on the way, could you stop off in\n" + .string "DEWFORD TOWN?\p" + .string "I was hoping that you’d deliver a LETTER\n" + .string "to STEVEN in DEWFORD.$" RustboroCity_DevonCorp_3F_Text_18337E:: @ 818337E - .string "MR. TRUMM: Nun, du sollst wissen, dass\n" - .string "ich ein einflussreicher PRÄSIDENT bin.\p" - .string "Und daher würde ich dich nie um einen\n" - .string "Gefallen bitten, ohne eine\l" - .string "Gegenleistung zu erbringen!\p" - .string "Deshalb möchte ich dir dies hier geben.$" + .string "MR. STONE: Now, you should know that\n" + .string "I am a great PRESIDENT.\p" + .string "So, I’d never be so cheap as to ask\n" + .string "a favor for nothing in return.\p" + .string "That’s why I want you to have this!$" RustboroCity_DevonCorp_3F_Text_183422:: @ 8183422 - .string "{PLAYER} erhält den POKéNAV.$" + .string "{PLAYER} received a POKéNAV.$" RustboroCity_DevonCorp_3F_Text_183439:: @ 8183439 - .string "MR. TRUMM: Dieses Gerät...\p" - .string "Es ist ein POKéMON NAVIGATOR - oder\n" - .string "kurz ein POKéNAV.\p" - .string "Ein unentbehrliches Hilfsmittel für\n" - .string "jeden TRAINER auf Abenteuerreise.\p" - .string "Er enthält die Karte von HOENN.\p" - .string "So kannst du ganz leicht herausfinden,\n" - .string "wo die Orte FAUSTAUHAVEN und\l" - .string "GRAPHITPORT CITY liegen.$" + .string "MR. STONE: That device...\p" + .string "It’s a POKéMON NAVIGATOR, or POKéNAV\n" + .string "for short.\p" + .string "It’s an indispensable tool for any\n" + .string "TRAINER on an adventure.\p" + .string "It has a map of the HOENN region.\p" + .string "You can check the locations of\n" + .string "DEWFORD and SLATEPORT easily!$" RustboroCity_DevonCorp_3F_Text_18351E:: @ 818351E - .string "MR. TRUMM: Ich verlasse mich auf dich!$" + .string "MR. STONE: I’m counting on you!$" RustboroCity_DevonCorp_3F_Text_18353E:: @ 818353E - .string "MR. TRUMM: Du hast meinen BRIEF\n" - .string "überbracht? Herzlichen Dank!\p" - .string "Dies ist ein Dankeschön von mir.\n" - .string "Es wird dir als TRAINER sicher helfen.$" + .string "MR. STONE: You delivered my LETTER?\n" + .string "Thank you kindly!\p" + .string "This is my way of thanking you.\n" + .string "It should help you, a TRAINER.$" RustboroCity_DevonCorp_3F_Text_1835B3:: @ 81835B3 - .string "MR. TRUMM: Trägt ein POKéMON den EP-\n" - .string "TEILER, so erhält es in jedem Kampf\l" - .string "Erfahrungspunkte.\p" - .string "Auch wenn es gar nicht am Kampf\n" - .string "teilnimmt.\p" - .string "Ich würde sagen, der EP-TEILER ist sehr\n" - .string "nützlich, um schwache POKéMON aufzu-\l" - .string "ziehen.$" + .string "MR. STONE: A POKéMON holding that\n" + .string "EXP. SHARE will be given some of the\l" + .string "EXP Points from battle.\p" + .string "It will get EXP Points even if it didn’t\n" + .string "actually battle.\p" + .string "I would say EXP. SHARE is quite useful\n" + .string "for raising weak POKéMON.$" RustboroCity_DevonCorp_3F_Text_18368D:: @ 818368D - .string "MR. TRUMM: Schon in meiner Jugend habe\n" - .string "ich mich voll auf die Arbeit\l" - .string "konzentriert.\p" - .string "Deshalb weiß ich auch nicht unbedingt,\n" - .string "was gerade im Trend liegt.\p" - .string "Wollen alle jungen Leute TRAINER in der\n" - .string "POKéMON LIGA werden?$" + .string "MR. STONE: Since my youth, I’ve immersed\n" + .string "myself in work.\p" + .string "Consequently, I’m not familiar with\n" + .string "trends and that sort of thing.\p" + .string "But do young people all want to be\n" + .string "TRAINERS in the POKéMON LEAGUE?$" RustboroCity_DevonCorp_3F_Text_18374C:: @ 818374C - .string "Dies ist die zweite Etage der DEVON\n" - .string "CORPORATION.\p" - .string "Hier befindet sich das BÜRO des\n" - .string "PRÄSIDENTEN.\p" - .string "Nun ja, ich kann dir gar nicht sagen, wie\n" - .string "dankbar ich dir für deine Taten bin.\p" - .string "Ähm... Äh, das Paket, das du uns\n" - .string "zurückgebracht hast...\p" - .string "Darf ich dich bitten, es zur WERFT\n" - .string "in GRAPHITPORT CITY zu bringen?\p" - .string "Es wäre fürchterlich, wenn es den\n" - .string "Dieben erneut in die Hände fallen würde.\p" - .string "Äh... Hehehe, also, äh, kann ich auch\n" - .string "dieses Mal wieder mit dir rechnen?\p" - .string "Ach, da fällt mir ein... Würdest du mich\n" - .string "einen Moment entschuldigen?$" + .string "This is the DEVON CORPORATION’s\n" + .string "third floor.\p" + .string "Our PRESIDENT’s OFFICE is on this floor.\p" + .string "Anyway, I can’t tell you how much I’m\n" + .string "grateful for what you’ve done.\p" + .string "Um... By the way, that parcel you got\n" + .string "back for us...\p" + .string "Could I get you to deliver that to the\n" + .string "SHIPYARD in SLATEPORT?\p" + .string "It would be awful if those robbers\n" + .string "tried to take it again.\p" + .string "Uh... Hehehe, so, uh, could I count\n" + .string "on you to do that for me?\p" + .string "Oh, that’s right.\n" + .string "Could you wait here a second?$" RustboroCity_DevonCorp_3F_Text_183903:: @ 8183903 - .string "Unser PRÄSIDENT würde gerne kurz mit\n" - .string "dir sprechen.\p" - .string "Komm bitte mit mir.$" + .string "Our PRESIDENT would like to have\n" + .string "a word with you.\p" + .string "Please come with me.$" RustboroCity_DevonCorp_3F_Text_18394A:: @ 818394A - .string "Bitte, hier entlang.$" + .string "Please, go ahead.$" RustboroCity_DevonCorp_3F_Text_18395C:: @ 818395C - .string "Wenn du die WERFT in GRAPHITPORT CITY\n" - .string "besuchst, solltest du mit KAPT. BRIGG\l" - .string "sprechen.$" + .string "If you visit the SHIPYARD in SLATEPORT,\n" + .string "you should go see CAPT. STERN.$" RustboroCity_DevonCorp_3F_Text_1839A3:: @ 81839A3 - .string "DEVONS neue Produkte, der WIEDERBALL\n" - .string "und der TIMERBALL, sind mittlerweile\l" - .string "sehr populär unter den TRAINERN.$" + .string "DEVON’s new products, the REPEAT BALL\n" + .string "and TIMER BALL, have become hugely\l" + .string "popular among TRAINERS.$" RustboroCity_DevonCorp_3F_Text_183A04:: @ 8183A04 - .string "Eine Kollektion seltener Steine und\n" - .string "Mineralien - gesammelt vom PRÄSIDENTEN.$" + .string "It’s a collection of rare rocks and\n" + .string "stones assembled by the PRESIDENT.$" diff --git a/data/text/maps/RustboroCity_Flat1_1F.inc b/data/text/maps/RustboroCity_Flat1_1F.inc index 44a6d8800..4721931e4 100644 --- a/data/text/maps/RustboroCity_Flat1_1F.inc +++ b/data/text/maps/RustboroCity_Flat1_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_Text_184DB4:: @ 8184DB4 - .string "Jedes POKéMON besitzt eine spezielle\n" - .string "Begabung, die es einsetzen kann.$" + .string "Every POKéMON has a special ability\n" + .string "that it can use.$" RustboroCity_Flat1_1F_Text_184DE9:: @ 8184DE9 - .string "POKéMON sind sehr seltsame Geschöpfe.$" + .string "POKéMON are such strange creatures.$" diff --git a/data/text/maps/RustboroCity_Flat1_2F.inc b/data/text/maps/RustboroCity_Flat1_2F.inc index d744b8484..7ddb678bf 100644 --- a/data/text/maps/RustboroCity_Flat1_2F.inc +++ b/data/text/maps/RustboroCity_Flat1_2F.inc @@ -1,8 +1,8 @@ RustboroCity_Flat1_2F_Text_184E0D:: @ 8184E0D - .string "Oh, jeden Tag wird es schwerer...\p" - .string "Was so schwer ist?\n" - .string "Das fragst du noch?\p" - .string "Herauszufinden, was ich jeden Tag\n" - .string "kochen soll, natürlich!\p" - .string "Es ist nicht einfach, jeden Tag eine\n" - .string "Mahlzeit auf den Tisch zu bringen.$" + .string "Oh, it’s so hard every day...\p" + .string "What’s hard?\n" + .string "You need to ask?\p" + .string "It’s trying to figure out what to\n" + .string "make for meals every day.\p" + .string "It really isn’t easy coming up with\n" + .string "meals every day.$" diff --git a/data/text/maps/RustboroCity_Flat2_1F.inc b/data/text/maps/RustboroCity_Flat2_1F.inc index d6cb53734..d949a0ab8 100644 --- a/data/text/maps/RustboroCity_Flat2_1F.inc +++ b/data/text/maps/RustboroCity_Flat2_1F.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_Text_1853DD:: @ 81853DD - .string "Die Angestellten der DEVON CORPORATION\n" - .string "leben in diesem Haus.$" + .string "DEVON CORPORATION’s workers live in\n" + .string "this building.$" RustboroCity_Flat2_1F_Text_185410:: @ 8185410 - .string "ENECO: Gyaaaah!$" + .string "SKITTY: Gyaaaah!$" diff --git a/data/text/maps/RustboroCity_Flat2_2F.inc b/data/text/maps/RustboroCity_Flat2_2F.inc index 13d9b9f93..8a3d52fda 100644 --- a/data/text/maps/RustboroCity_Flat2_2F.inc +++ b/data/text/maps/RustboroCity_Flat2_2F.inc @@ -1,14 +1,13 @@ RustboroCity_Flat2_2F_Text_185421:: @ 8185421 - .string "Vor langer, langer Zeit war DEVON eine\n" - .string "kleine, überschaubare Firma.$" + .string "Way back in the old days, DEVON was just\n" + .string "a teeny, tiny company.$" RustboroCity_Flat2_2F_Text_185461:: @ 8185461 - .string "Mein Papa arbeitet für die CORPORATION.\p" - .string "Mein Papa hat dies gemacht! Ich kann\n" - .string "damit aber nichts anfangen, daher\l" - .string "schenke ich es dir.$" + .string "My daddy’s working at the CORPORATION.\p" + .string "My daddy made this!\n" + .string "But I can’t use it, so you can have it.$" RustboroCity_Flat2_2F_Text_1854C4:: @ 81854C4 - .string "Mein Papa arbeitet für die CORPORATION.\p" - .string "Wenn ich groß bin, werde ich auch für\n" - .string "DEVON arbeiten.$" + .string "My daddy’s working at the CORPORATION.\p" + .string "When I grow up, I’m going to work for\n" + .string "DEVON, too.$" diff --git a/data/text/maps/RustboroCity_Flat2_3F.inc b/data/text/maps/RustboroCity_Flat2_3F.inc index 3bb2affc0..9f95ce92e 100644 --- a/data/text/maps/RustboroCity_Flat2_3F.inc +++ b/data/text/maps/RustboroCity_Flat2_3F.inc @@ -1,7 +1,7 @@ RustboroCity_Flat2_3F_Text_18551D:: @ 818551D - .string "Der PRÄSIDENT von DEVON sammelt\n" - .string "leidenschaftlich gerne seltene Steine.$" + .string "DEVON’s PRESIDENT likes to collect\n" + .string "rare stones.$" RustboroCity_Flat2_3F_Text_18554D:: @ 818554D - .string "Ich glaube, der Sohn des PRÄSIDENTEN\n" - .string "sammelt auch seltene Steine.$" + .string "I think the PRESIDENT’s son also\n" + .string "collects rare stones.$" diff --git a/data/text/maps/RustboroCity_Gym.inc b/data/text/maps/RustboroCity_Gym.inc index 88e0e01f2..7bb737097 100644 --- a/data/text/maps/RustboroCity_Gym.inc +++ b/data/text/maps/RustboroCity_Gym.inc @@ -1,118 +1,111 @@ RustboroCity_Gym_Text_183A4B:: @ 8183A4B - .string "Hi, wie geht’s?\p" - .string "Hör zu, mein Freund!\n" - .string "Würdest du gerne CHAMP werden?\p" - .string "Ich bin kein TRAINER. Ich nicht. Aber\n" - .string "ich kann dir trotzdem einen nützlichen\l" - .string "Rat geben.\p" - .string "Also, abgemacht! Wir werden zusammen\n" - .string "nach der POKéMON MEISTERSCHAFT\l" - .string "streben!\p" - .string "Als TRAINER musst du die ORDEN der\n" - .string "ARENEN sammeln, habe ich Recht?\p" - .string "Aber die ARENALEITER sind nicht gerade\n" - .string "einfach zu besiegen!\p" - .string "Und hier komme ich ins Spiel!\n" - .string "Ich werde dir einen Expertentipp geben!\p" - .string "FELIZIA, die ARENALEITERIN, setzt\n" - .string "GESTEINS-POKéMON ein.\p" - .string "Ein GESTEINS-POKéMON ist sehr zäh,\n" - .string "hat aber gegen WASSER- und PFLANZEN-\l" - .string "Attacken keine Chance.\p" - .string "Komm wieder vorbei, wenn du die ARENA-\n" - .string "LEITERIN besiegt hast.\p" - .string "Nun zeig, was du drauf hast!$" + .string "Yo, how’s it going?\p" + .string "Listen, my friend!\n" + .string "Would you like to become the CHAMPION?\p" + .string "I’m no TRAINER, not me, but I can\n" + .string "sure give you winning advice.\p" + .string "That’s settled, then! We’ll aim for the\n" + .string "POKéMON CHAMPIONSHIP together!\p" + .string "It’s your job as a TRAINER to collect\n" + .string "GYM BADGES, am I right?\p" + .string "But GYM LEADERS aren’t pushovers!\p" + .string "And that’s where I come in!\n" + .string "I’m here to provide expert advice!\p" + .string "ROXANNE, the GYM LEADER, is a user\n" + .string "of ROCK-type POKéMON.\p" + .string "The ROCK type is very durable, but\n" + .string "it can’t stand WATER-type and\l" + .string "GRASS-type moves.\p" + .string "Come see me afterwards, if you beat\n" + .string "the GYM LEADER.\p" + .string "Well, go for it!$" RustboroCity_Gym_Text_183C90:: @ 8183C90 - .string "Hui! Was für ein atemberaubender Sieg!\n" - .string "Meine Zurufe müssen gewirkt haben!\p" - .string "Großartig!\n" - .string "Schau mal auf deinen TRAINERPASS.\p" - .string "Der STEINORDEN, den du gerade bekommen\n" - .string "hast, müsste dort schon vermerkt sein.\p" - .string "Nun hast du den ersten Schritt zur\n" - .string "MEISTERSCHAFT schon erfolgreich\l" - .string "hinter dir!\p" - .string "Ein großartiges Gefühl!$" + .string "Whoa! What a breathtaking victory!\n" + .string "My cheering must’ve worked!\p" + .string "Great!\n" + .string "Check your TRAINER CARD.\p" + .string "The STONE BADGE you got should be\n" + .string "properly recorded on it.\p" + .string "In other words...\p" + .string "You’ve climbed the first step on\n" + .string "the stairs to the CHAMPIONSHIP!\p" + .string "That’s got to feel awesome!$" RustboroCity_Gym_Text_183D99:: @ 8183D99 - .string "Unterschätze die TRAINER einer ARENA\n" - .string "nicht! Ich zeige dir, warum wir die\l" - .string "Besten sind!$" + .string "Don’t take us GYM TRAINERS lightly!\n" + .string "I’ll show you why we’re better!$" RustboroCity_Gym_Text_183DDD:: @ 8183DDD - .string "Du warst viel zu gut für mich...$" + .string "You were too good for me...$" RustboroCity_Gym_Text_183DF9:: @ 8183DF9 - .string "Du hast noch gar nicht gesehen, was\n" - .string "GESTEINS-POKéMON alles können.$" + .string "You haven’t seen anything of the ROCK\n" + .string "type’s terrifying power!$" RustboroCity_Gym_Text_183E38:: @ 8183E38 - .string "Wenn du mich nicht besiegen kannst,\n" - .string "hast du keine Chance gegen FELIZIA.$" + .string "If you can’t beat me, you won’t stand\n" + .string "a chance against ROXANNE!$" RustboroCity_Gym_Text_183E78:: @ 8183E78 - .string "Wow! Du hast wirklich Talent!$" + .string "Wow! You’ve got some potential!$" RustboroCity_Gym_Text_183E98:: @ 8183E98 - .string "FELIZIA ist um ein Vielfaches stärker\n" - .string "als ich.\p" - .string "Du solltest dich besser wappnen!$" + .string "ROXANNE is stronger than me by\n" + .string "several times.\p" + .string "You’d better be on your guard!$" RustboroCity_Gym_Text_183EE5:: @ 8183EE5 - .string "Hallo, ich bin FELIZIA, die LEITERIN der\n" - .string "ARENA von METAROST CITY.\p" - .string "Ich wurde ARENALEITERIN, um mein\n" - .string "Wissen, das ich in der POKéMON TRAINER-\l" - .string "SCHULE erworben habe, umzusetzen.\p" - .string "Würdest du mir bitte zeigen, wie du\n" - .string "kämpfst und mit welchen POKéMON?$" + .string "Hello, I am ROXANNE, the RUSTBORO\n" + .string "POKéMON GYM LEADER.\p" + .string "I became a GYM LEADER so that I may\n" + .string "apply what I learned at the POKéMON\l" + .string "TRAINER’S SCHOOL in battle.\p" + .string "Would you kindly demonstrate how you\n" + .string "battle, and with which POKéMON?$" RustboroCity_Gym_Text_183FC4:: @ 8183FC4 .string "So...\n" - .string "Ich habe verloren...\p" - .string "Es scheint, ich muss noch eine ganze\n" - .string "Menge lernen...\p" - .string "Ich verstehe schon.\p" - .string "Die Regeln der POKéMON LIGA schreiben\n" - .string "vor, dass TRAINER, die einen ARENA-\l" - .string "LEITER besiegt haben, dieses erhalten.\p" - .string "Bitte nimm den offiziellen POKéMON LIGA\n" - .string "STEINORDEN an!$" + .string "I lost...\p" + .string "It seems that I still have much more\n" + .string "to learn...\p" + .string "I understand.\p" + .string "The POKéMON LEAGUE’s rules state\n" + .string "that TRAINERS are to be given this\l" + .string "if they defeat a GYM LEADER.\p" + .string "Please accept the official POKéMON\n" + .string "LEAGUE STONE BADGE.$" RustboroCity_Gym_Text_1840AB:: @ 81840AB - .string "{PLAYER} hat den STEINORDEN von\n" - .string "FELIZIA erhalten.$" + .string "{PLAYER} received the STONE BADGE\n" + .string "from ROXANNE.$" RustboroCity_Gym_Text_1840D5:: @ 81840D5 - .string "Der STEINORDEN erhöht die Kraft der\n" - .string "ATTACKEN deiner POKéMON.\p" - .string "Außerdem sind sie nun in der Lage, die\n" - .string "VM ZERSCHNEIDER auch außerhalb eines\l" - .string "Kampfes einzusetzen.\p" - .string "Dies möchte ich dir auch noch geben.$" + .string "The STONE BADGE heightens the ATTACK\n" + .string "power of your POKéMON.\p" + .string "It also enables them to use the HM move\n" + .string "CUT outside of battle.\p" + .string "Please take this with you, too.$" RustboroCity_Gym_Text_184170:: @ 8184170 - .string "Diese TM39 enthält FELSGRAB.\p" - .string "Sie richtet nicht nur durch das Fallen\n" - .string "von Steinen Schaden an, sondern\l" - .string "reduziert auch die INITIATIVE.\p" - .string "Sobald du eine TM aktivierst, wird die\n" - .string "Attacke einem POKéMON beigebracht.\p" - .string "Aber vergiss nicht, dass eine TM nur\n" - .string "einmal beigebracht werden kann. Ihr\l" - .string "Einsatz will also überlegt sein.$" + .string "That TM39 contains ROCK TOMB.\p" + .string "It not only inflicts damage by dropping\n" + .string "rocks, it also lowers SPEED.\p" + .string "If you use a TM, it instantly teaches\n" + .string "the move to a POKéMON.\p" + .string "Remember, a TM can be used only once,\n" + .string "so think before you use it.$" RustboroCity_Gym_Text_184252:: @ 8184252 - .string "Da du so stark bist, solltest du auch die\n" - .string "anderen ARENALEITER herausfordern.\p" - .string "Du lernst wertvolle Dinge dazu, wenn du\n" - .string "gegen viele TRAINER antrittst.$" + .string "Since you are so strong, you should\n" + .string "challenge other GYM LEADERS.\p" + .string "By battling many TRAINERS, you should\n" + .string "learn many things.$" RustboroCity_Gym_Text_1842CC:: @ 81842CC - .string "POKéMON ARENA von METAROST CITY$" + .string "RUSTBORO CITY POKéMON GYM$" RustboroCity_Gym_Text_1842E6:: @ 81842E6 - .string "POKéMON ARENA von METAROST CITY\p" - .string "FELIZIAS ANERKANNTE TRAINER:\n" + .string "RUSTBORO CITY POKéMON GYM\p" + .string "ROXANNE’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/RustboroCity_House1.inc b/data/text/maps/RustboroCity_House1.inc index e47e4a727..6427aa326 100644 --- a/data/text/maps/RustboroCity_House1.inc +++ b/data/text/maps/RustboroCity_House1.inc @@ -1,28 +1,27 @@ RustboroCity_House1_Text_184EBA:: @ 8184EBA - .string "Gibst du deinen POKéMON Kosenamen?\n" - .string "Ich habe meinem einen coolen Namen\l" - .string "gegeben.\p" - .string "Aber wenn ich es nun beim Namen rufe,\n" - .string "rollen sich die Leute vor Lachen ab...\p" - .string "Hast du Lust, dein {STR_VAR_1} gegen\n" - .string "mein {STR_VAR_2} zu tauschen?$" + .string "Do you nickname your POKéMON?\n" + .string "I gave a cool name to mine.\p" + .string "But when I call my POKéMON by that\n" + .string "name, people laugh at me...\p" + .string "If it’s okay with you, want to trade\n" + .string "your {STR_VAR_1} for my {STR_VAR_2}?$" RustboroCity_House1_Text_184F6B:: @ 8184F6B - .string "Hihihihihi, oooh, ist das aufregend!$" + .string "Eheheheh, ooh, this is so exciting!$" RustboroCity_House1_Text_184F8F:: @ 8184F8F - .string "Aber das ist kein {STR_VAR_1}.\n" - .string "Tse, wie enttäuschend.$" + .string "But that’s no {STR_VAR_1}.\n" + .string "Tch, that’s so disappointing...$" RustboroCity_House1_Text_184FC1:: @ 8184FC1 - .string "Ooh, das ist ein gutes POKéMON...$" + .string "Aww, it’s a good POKéMON...$" RustboroCity_House1_Text_184FDD:: @ 8184FDD - .string "Willst du nicht wissen, wie andere\n" - .string "Leute ihre POKéMON nennen?$" + .string "Don’t you get curious about what other\n" + .string "people named their POKéMON?$" RustboroCity_House1_Text_185020:: @ 8185020 - .string "An allen Orten gibt es alle Sorten von\n" - .string "POKéMON und Menschen.\p" - .string "Ich finde das faszinierend, daher\n" - .string "besuche ich alle möglichen Orte.$" + .string "In all sorts of places, there are all\n" + .string "sorts of POKéMON and people.\p" + .string "I find that fascinating, so I go to all\n" + .string "sorts of places.$" diff --git a/data/text/maps/RustboroCity_House2.inc b/data/text/maps/RustboroCity_House2.inc index 2d9e4ab4d..7a1d9c706 100644 --- a/data/text/maps/RustboroCity_House2.inc +++ b/data/text/maps/RustboroCity_House2.inc @@ -1,9 +1,9 @@ RustboroCity_House2_Text_18532D:: @ 818532D - .string "Die TRAINERSCHULE ist hervorragend.\p" - .string "Wenn du dort lernst, kannst du später\n" - .string "sogar ARENALEITER werden.$" + .string "The TRAINER’S SCHOOL is excellent.\p" + .string "If you study there, you could even\n" + .string "become a GYM LEADER.$" RustboroCity_House2_Text_185388:: @ 8185388 - .string "FELIZIA, die ARENALEITERIN, weiß\n" - .string "wirklich eine Menge über POKéMON.\p" - .string "Und sie ist sehr stark!$" + .string "ROXANNE, the GYM LEADER, really knows\n" + .string "a lot about POKéMON.\p" + .string "She’s really strong, too!$" diff --git a/data/text/maps/RustboroCity_House3.inc b/data/text/maps/RustboroCity_House3.inc index 1da0876d9..43a3f6ff0 100644 --- a/data/text/maps/RustboroCity_House3.inc +++ b/data/text/maps/RustboroCity_House3.inc @@ -1,16 +1,14 @@ RustboroCity_House3_Text_185584:: @ 8185584 - .string "Meinen eigenen POKéMON habe ich\n" - .string "perfekt passende Kosenamen gegeben!\p" - .string "Das ist mein Ausdruck von... äh...\n" - .string "Originalität. Genau! Originalität!$" + .string "For my own POKéMON, I give them\n" + .string "perfectly suited nicknames!\p" + .string "It’s my expression of, uh...\n" + .string "originality, yes, that’s it!$" RustboroCity_House3_Text_1855FA:: @ 81855FA - .string "Aber ein PIKACHU einfach PEKACHU zu\n" - .string "nennen? Das haut einen nicht gerade\l" - .string "vom Hocker.\p" - .string "Ich glaube ja auch, man sollte einen\n" - .string "leicht verständlichen Kosenamen wählen,\l" - .string "aber irgendwie...$" + .string "But giving the name PEKACHU to a\n" + .string "PIKACHU? It seems pointless.\p" + .string "I suppose it is good to use a name\n" + .string "that’s easy to understand, but...$" RustboroCity_House3_Text_18567D:: @ 818567D .string "PEKACHU: Peka!$" diff --git a/data/text/maps/RustboroCity_Mart.inc b/data/text/maps/RustboroCity_Mart.inc index 5288402dc..f11395b68 100644 --- a/data/text/maps/RustboroCity_Mart.inc +++ b/data/text/maps/RustboroCity_Mart.inc @@ -1,18 +1,17 @@ RustboroCity_Mart_Text_184C76:: @ 8184C76 - .string "Ich habe einige PARA-HEILER und\n" - .string "etwas GEGENGIFT gekauft.\p" - .string "Nur für den Fall, dass mir ein\n" - .string "KNILZ im BLÜTENBURGWALD\l" - .string "über den Weg läuft.$" + .string "I’m buying some PARLYZ HEALS and\n" + .string "ANTIDOTES.\p" + .string "Just in case I run into SHROOMISH\n" + .string "in PETALBURG WOODS.$" RustboroCity_Mart_Text_184CD8:: @ 8184CD8 - .string "Mein POKéMON hat sich entwickelt.\n" - .string "Es hat jetzt sehr viele KP.\p" - .string "Ich sollte nun einige SUPERTRÄNKE\n" - .string "anstelle der normalen TRÄNKE kaufen.$" + .string "My POKéMON evolved.\n" + .string "It has a lot of HP now.\p" + .string "I should buy SUPER POTIONS for it\n" + .string "instead of ordinary POTIONS.$" RustboroCity_Mart_Text_184D43:: @ 8184D43 - .string "Ich habe ein FLUCHTSEIL besorgt, falls\n" - .string "ich mich mal in einer Höhle verlaufe.\p" - .string "Damit kann ich zurück zum Eingang der\n" - .string "Höhle gelangen.$" + .string "I’m getting an ESCAPE ROPE just in\n" + .string "case I get lost in a cave.\p" + .string "I just need to use it to get back to the\n" + .string "entrance.$" diff --git a/data/text/maps/RustboroCity_PokemonCenter_1F.inc b/data/text/maps/RustboroCity_PokemonCenter_1F.inc index 8c73d883e..0265f0363 100644 --- a/data/text/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/text/maps/RustboroCity_PokemonCenter_1F.inc @@ -1,18 +1,16 @@ RustboroCity_PokemonCenter_1F_Text_184B37:: @ 8184B37 - .string "Mein POKéMON hat ein NAIVES\n" - .string "Wesen und das meines Freundes ein\l" - .string "FRÖHLICHES.\p" - .string "Es ist faszinierend, dass POKéMON\n" - .string "unterschiedliche Persönlichkeiten\l" - .string "haben.$" + .string "My POKéMON has a NAIVE nature, and my\n" + .string "friend’s has a JOLLY nature.\p" + .string "It’s fascinating how POKéMON have\n" + .string "personalities!$" RustboroCity_PokemonCenter_1F_Text_184BAB:: @ 8184BAB - .string "Es gibt männliche und weibliche POKéMON.\p" - .string "Aber niemand kann sagen, worin der\n" - .string "eigentliche Unterschied liegt.$" + .string "Just like people, there are male and\n" + .string "female POKéMON.\p" + .string "But no one seems to have any idea how\n" + .string "they’re different.$" RustboroCity_PokemonCenter_1F_Text_184C19:: @ 8184C19 - .string "Der Mann nebenan hat mir eine VM\n" - .string "gegeben!\p" - .string "Ich habe meinem POKéMON beigebracht,\n" - .string "damit kleinere Bäume zu ZERSCHNEIDEN.$" + .string "The man next door gave me an HM!\p" + .string "I used it to teach my POKéMON how to\n" + .string "CUT down skinny trees.$" diff --git a/data/text/maps/RustboroCity_PokemonSchool.inc b/data/text/maps/RustboroCity_PokemonSchool.inc index 9e477deaa..e12349bd2 100644 --- a/data/text/maps/RustboroCity_PokemonSchool.inc +++ b/data/text/maps/RustboroCity_PokemonSchool.inc @@ -1,101 +1,101 @@ RustboroCity_PokemonSchool_Text_184321:: @ 8184321 - .string "Auf der Tafel sind die Statusverände-\n" - .string "rungen von POKéMON aufgelistet.$" + .string "The blackboard lists status changes\n" + .string "that may affect POKéMON in battle.$" RustboroCity_PokemonSchool_Text_184368:: @ 8184368 - .string "Welches Thema möchtest du lesen?$" + .string "Which topic do you want to read?$" RustboroCity_PokemonSchool_Text_184389:: @ 8184389 - .string "Wenn ein POKéMON vergiftet wurde, wird\n" - .string "es ständig KP verlieren.\p" - .string "Die Auswirkungen des Giftes halten\n" - .string "auch nach dem Kampf an.\p" - .string "Die KP eines vergifteten POKéMON\n" - .string "werden auch unterwegs weiter sinken.\p" - .string "Mit einem GEGENGIFT kann das POKéMON\n" - .string "geheilt werden.$" + .string "If a POKéMON is poisoned, it will\n" + .string "steadily lose HP.\p" + .string "The effects of poison remain after\n" + .string "a battle.\p" + .string "A poisoned POKéMON’s HP will drop\n" + .string "while it is traveling.\p" + .string "Heal a poisoning using an ANTIDOTE.$" RustboroCity_PokemonSchool_Text_184447:: @ 8184447 - .string "Wurde ein POKéMON paralysiert, sinkt\n" - .string "seine INITIATIVE.\p" - .string "Es kann passieren, dass es während des\n" - .string "Kampfes bewegungsunfähig wird.\p" - .string "Die Paralyse hält auch nach dem Kampf\n" - .string "an. Heile das POKéMON mit PARA-HEILER.$" + .string "If a POKéMON becomes paralyzed,\n" + .string "its SPEED drops.\p" + .string "It may also not be able to move while\n" + .string "it is in battle.\p" + .string "Paralysis remains after battle.\n" + .string "Cure it using a PARLYZ HEAL.$" RustboroCity_PokemonSchool_Text_1844EC:: @ 81844EC - .string "Wenn ein POKéMON einschläft, kann es\n" - .string "nicht mehr angreifen.\p" - .string "Das POKéMON wird vielleicht von selber\n" - .string "wieder wach, aber wenn der Kampf endet\l" - .string "und es noch schläft, schläft es weiter.\p" - .string "Wecke es mit AUFWECKER auf.$" + .string "If a POKéMON falls asleep, it will be\n" + .string "unable to attack.\p" + .string "A POKéMON may wake up on its own,\n" + .string "but if a battle ends while it is sleeping,\l" + .string "it will stay asleep.\p" + .string "Wake it up using an AWAKENING.$" RustboroCity_PokemonSchool_Text_1845A5:: @ 81845A5 - .string "Eine Verbrennung senkt die Kraft des\n" - .string "ANGRIFFS. Die KP nehmen ständig ab.\p" - .string "Eine Verbrennung hält auch nach dem\n" - .string "Kampf an. Setze FEUERHEILER ein!$" + .string "A burn reduces ATTACK power, and it\n" + .string "steadily reduces the victim’s HP.\p" + .string "A burn lingers after battle.\n" + .string "Cure a burn using a BURN HEAL.$" RustboroCity_PokemonSchool_Text_184627:: @ 8184627 - .string "Wurde ein POKéMON eingefroren, so ist\n" - .string "es völlig hilflos.\p" - .string "Auch nach dem Kampf hält der Zustand\n" - .string "an. Setze dann EISHEILER ein.$" + .string "If a POKéMON is frozen, it becomes\n" + .string "completely helpless.\p" + .string "It will remain frozen after battle.\n" + .string "Thaw it out using an ICE HEAL.$" RustboroCity_PokemonSchool_Text_1846A2:: @ 81846A2 - .string "Schüler, die nicht aufpassen, bekommen\n" - .string "meine FLINKKLAUE zu spüren.\p" - .string "Wie du dieses Item einsetzt, zeigt,\n" - .string "ob du ein guter Schüler bist oder nicht.$" + .string "Students who don’t study get a little\n" + .string "taste of my QUICK CLAW.\p" + .string "Whether or not you are a good student \n" + .string "will be evident from the way you use\l" + .string "this item.$" RustboroCity_PokemonSchool_Text_184737:: @ 8184737 - .string "Ein POKéMON, das die FLINKKLAUE trägt,\n" - .string "steigert seine Schnelligkeit und greift\l" - .string "eventuell schneller an als sein Gegner.\p" - .string "Es gibt noch viele andere Items, die von\n" - .string "einem POKéMON getragen werden können.\p" - .string "Du kannst also noch viel lernen.$" + .string "A POKéMON holding the QUICK CLAW will\n" + .string "occasionally speed up and get to move\l" + .string "before its opponent.\p" + .string "There are many other items that are\n" + .string "meant to be held by POKéMON.\p" + .string "Just those alone will give you many\n" + .string "topics to study!$" RustboroCity_PokemonSchool_Text_18480E:: @ 818480E - .string "Ich tausche gerade mit meinem Freund\n" - .string "POKéMON.$" + .string "I’m trading POKéMON with my friend\n" + .string "right now.$" RustboroCity_PokemonSchool_Text_18483C:: @ 818483C - .string "Ich wollte schon immer ein SAMURZEL\n" - .string "haben - und endlich habe ich eines!$" + .string "I always wanted a SEEDOT, and\n" + .string "I’m finally getting one!$" RustboroCity_PokemonSchool_Text_184873:: @ 8184873 - .string "POKéMON können Items tragen, aber sie\n" - .string "wissen nicht, was sie mit Items von\l" - .string "Menschen wie TRANK oder GEGENGIFT\l" - .string "machen sollen.$" + .string "POKéMON can hold items, but they\n" + .string "don’t know what to do with man-made\l" + .string "items like POTION and ANTIDOTE.$" RustboroCity_PokemonSchool_Text_1848D8:: @ 81848D8 - .string "Weißt du, wie man mit einigen POKéMON-\n" - .string "Attacken ein POKéMON verwirren kann?\p" - .string "Ein verwirrtes POKéMON wird manchmal\n" - .string "sich selber verletzen, ohne es zu wollen.\p" - .string "Aber sobald es aus dem Kampf genommen\n" - .string "wird, ist es wieder normal.$" + .string "You know how some POKéMON moves can\n" + .string "confuse a POKéMON?\p" + .string "A confused POKéMON will sometimes\n" + .string "attack itself without meaning to.\p" + .string "But once it leaves battle, it will\n" + .string "return to normal.$" RustboroCity_PokemonSchool_Text_184988:: @ 8184988 - .string "Ein POKéMON, das eine BEERE trägt, wird\n" - .string "sich selber heilen...\p" - .string "Es gibt viele Items, die ein POKéMON\n" - .string "tragen kann...\p" - .string "Junge, Junge, ist das alles schwer\n" - .string "zu merken...$" + .string "A POKéMON holding a BERRY will heal\n" + .string "itself...\p" + .string "There are many kinds of items that\n" + .string "POKéMON can hold...\p" + .string "Boy, it sure is hard taking notes\n" + .string "down...$" RustboroCity_PokemonSchool_Text_184A17:: @ 8184A17 - .string "Das ist das Heft eines Schülers...\p" - .string "POKéMON werden mit POKéBÄLLEN\n" - .string "gefangen.\p" - .string "Bis zu sechs POKéMON können den\n" - .string "TRAINER begleiten.\p" - .string "Ein TRAINER ist jemand, der POKéMON\n" - .string "fängt, sie aufzieht, und mit ihnen\l" - .string "kämpft.\p" - .string "Die Aufgabe eines TRAINERS ist es, die\n" - .string "starken TRAINER, die ihn in den ARENEN\l" - .string "erwarten, zu besiegen.$" + .string "It’s this student’s notebook...\p" + .string "POKéMON are to be caught using\n" + .string "POKé BALLS.\p" + .string "Up to six POKéMON can accompany\n" + .string "a TRAINER.\p" + .string "A TRAINER is someone who catches\n" + .string "POKéMON, raises them, and battles\l" + .string "with them.\p" + .string "A TRAINER’s mission is to defeat the\n" + .string "strong TRAINERS who await challengers\l" + .string "in POKéMON GYMS.$" diff --git a/data/text/maps/RusturfTunnel.inc b/data/text/maps/RusturfTunnel.inc index 1335318b3..3403808fd 100644 --- a/data/text/maps/RusturfTunnel.inc +++ b/data/text/maps/RusturfTunnel.inc @@ -1,112 +1,105 @@ RusturfTunnel_Text_194159:: @ 8194159 - .string "Was? Du willst gegen uns antreten?\n" - .string "Na, dann hol dir eine Tracht Prügel.$" + .string "What, are you coming?\n" + .string "Come and get some, then!$" RusturfTunnel_Text_194188:: @ 8194188 - .string "PECKO: Pii pihyoh!$" + .string "PEEKO: Pii pihyoh!$" RusturfTunnel_Text_19419B:: @ 819419B - .string "Grrr, man sollte sie alle kielholen.\p" - .string "Das als Geisel genommene POKéMON hat\n" - .string "sich als völlig wertlos erwiesen!\p" - .string "Und dafür habe ich nun einen Flucht-\n" - .string "weg in diesem Tunnel nach Nirgendwo\l" - .string "gegraben!\p" - .string "Hey! Du!\n" - .string "Forderst du mich etwa heraus?$" + .string "Grah, keelhaul it all!\p" + .string "That hostage POKéMON turned out to\n" + .string "be worthless!\p" + .string "And to think I made a getaway...\n" + .string "In this tunnel to nowhere!\p" + .string "Hey! You!\n" + .string "So you want to battle me?$" RusturfTunnel_Text_194243:: @ 8194243 - .string "Aargh! Und so läuft eine viel ver-\n" - .string "sprechende kriminelle Karriere in eine\l" - .string "Sackgasse!$" + .string "Urrrggh! My career in crime comes to\n" + .string "a dead end!$" RusturfTunnel_Text_194274:: @ 8194274 - .string "Das ist einfach nicht fair...\p" - .string "Der BOSS hat doch gesagt, der Job sei\n" - .string "ein wahres Kinderspiel.\p" - .string "Alles was ich zu tun hatte, war ein\n" - .string "Paket von DEVON zu stehlen.\p" - .string "Tse! Wenn du es so dringend wieder-\n" - .string "haben willst, dann nimm es halt!$" + .string "This is plain not right...\p" + .string "The BOSS told me this would be a\n" + .string "slick-and-easy job to pull.\p" + .string "All I had to do was steal some package\n" + .string "from DEVON.\p" + .string "Tch!\n" + .string "You want it back that badly, take it!$" RusturfTunnel_Text_19432A:: @ 819432A - .string "PECKO! Bin ich froh, dass du unversehrt\n" - .string "wieder bei mir bist.$" + .string "PEEKO! Am I glad to see you’re safe!$" RusturfTunnel_Text_19434F:: @ 819434F - .string "PECKO verdankt dir ihr Leben!\p" - .string "Man nennt mich MR. BRACK.\n" - .string "Und du bist...\p" + .string "PEEKO owes her life to you!\p" + .string "They call me MR. BRINEY.\n" + .string "And, you are?\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Ah, du bist also {PLAYER}{KUN}!\n" - .string "Ich danke dir von ganzem Herzen!\p" - .string "Wenn du irgendein Problem hast, zögere\n" - .string "nicht, mich um Hilfe zu bitten!\p" - .string "Ich wohne in dem kleinen Haus am Meer\n" - .string "in der Nähe des BLÜTENBURGWALDS.\p" - .string "Komm, PECKO, wir sollten uns auf den\n" - .string "Heimweg machen.\p" - .string "PECKO: Pihyoh!$" + .string "Ah, so you are {PLAYER}{KUN}!\n" + .string "I sincerely thank you!\p" + .string "Now, if there’s anything that troubles\n" + .string "you, don’t hesitate to tell me!\p" + .string "You can usually find me in my cottage\n" + .string "by the sea near PETALBURG WOODS.\p" + .string "Come, PEEKO, we should make our way\n" + .string "home.\p" + .string "PEEKO: Pihyoh!$" RusturfTunnel_Text_1944C5:: @ 81944C5 .string "... ...\p" - .string "Warum graben sie nicht weiter?\n" - .string "Ist das Gestein zu hart?\p" - .string "Meine Geliebte wartet in WIESENFLUR\n" - .string "auf mich, gleich hinter diesen\l" - .string "Felsen...\p" - .string "Wenn METAROST CITY und WIESENFLUR\n" - .string "durch diesen Tunnel verbunden wären,\l" - .string "könnte ich sie jeden Tag besuchen!\p" - .string "Aber so...\n" - .string "Was soll ich nur machen?$" + .string "Why can’t they keep digging?\n" + .string "Is the bedrock too hard?\p" + .string "My beloved awaits me in VERDANTURF\n" + .string "TOWN just beyond here...\p" + .string "If RUSTBORO and VERDANTURF were\n" + .string "joined by this tunnel, I could visit\l" + .string "her every day...\p" + .string "But this...\n" + .string "What am I to do?$" RusturfTunnel_Text_1945B2:: @ 81945B2 - .string "Um von METAROST CITY nach WIESENFLUR\n" - .string "zu gelangen, muss man nach FAUSTAU-\l" - .string "HAVEN und dann über GRAPHITPORT CITY\l" - .string "und MALVENFROH CITY reisen...$" + .string "To get from RUSTBORO to VERDANTURF,\n" + .string "you need to go to DEWFORD, then pass\l" + .string "through SLATEPORT and MAUVILLE...$" RusturfTunnel_Text_19461D:: @ 819461D - .string "Wow! Du hast den Felsen, der den Weg\n" - .string "blockierte, einfach zertrümmert.\p" - .string "Darüber bin ich überglücklich und daher\n" - .string "möchte ich dir diese VM geben.$" + .string "Wow! You shattered that boulder\n" + .string "blocking the way.\p" + .string "To show you how much I appreciate it,\n" + .string "I’d like you to have this HM.$" RusturfTunnel_Text_194693:: @ 8194693 - .string "Diese VM enthält STÄRKE.\p" - .string "Wenn ein kräftiges POKéMON diese VM\n" - .string "lernt, ist es in der Lage, sogar die\l" - .string "schwersten Felsen zu bewegen.$" + .string "That HM contains STRENGTH.\p" + .string "If a muscular POKéMON were to learn\n" + .string "that, it would be able to move even\l" + .string "large boulders.$" RusturfTunnel_Text_194706:: @ 8194706 - .string "HEIKE!\n" - .string "Nun kann ich dich jederzeit besuchen!\p" - .string "HEIKE: Das ist... wunderbar.\p" - .string "Bitte, ruh dich ein bisschen in meinem\n" - .string "Haus aus.$" + .string "WANDA!\n" + .string "Now I can see you anytime!\p" + .string "WANDA: That’s...wonderful.\p" + .string "Please, take some rest at my home.$" RusturfTunnel_Text_194766:: @ 8194766 - .string "Auf der anderen Seite dieses Felsens\n" - .string "wartet mein Freund.\p" - .string "Er... Er gräbt den Tunnel nicht nur, um\n" - .string "mich zu sehen.\p" - .string "Er reißt sich die Hände auf zum Wohle\n" - .string "aller.$" + .string "On the other side of this rock...\n" + .string "My boyfriend is there.\p" + .string "He... He’s not just digging the tunnel\n" + .string "to come see me.\p" + .string "He works his hands raw and rough\n" + .string "for the benefit of everyone.$" RusturfTunnel_Text_194814:: @ 8194814 - .string "Wie nennt man einen ungestümen Mann\n" - .string "hoch im Gebirge? Einen Bergfreund.\p" - .string "So, warum nennt man dann nicht auch ein\n" - .string "POKéMON in den Bergen ein Berg-\l" - .string "POKéMON?$" + .string "What do you call a wild man up in the\n" + .string "mountains? A mountain man, right?\p" + .string "So why don’t they call a POKéMON in the\n" + .string "mountains a mountain POKéMON?$" RusturfTunnel_Text_1948A2:: @ 81948A2 - .string "Meine POKéMON...\n" - .string "Haben alle Energie verloren...$" + .string "My POKéMON...\n" + .string "Ran out of power...$" RusturfTunnel_Text_1948C4:: @ 81948C4 - .string "Sie haben das Projekt hier einge-\n" - .string "stellt, um die POKéMON zu schützen,\l" - .string "nicht wahr? Eine rührende Story.$" + .string "They halted development here to\n" + .string "protect POKéMON, right?\l" + .string "There’s a feel-good story!$" diff --git a/data/text/maps/SSTidalCorridor.inc b/data/text/maps/SSTidalCorridor.inc index bb6922229..530ff6c55 100644 --- a/data/text/maps/SSTidalCorridor.inc +++ b/data/text/maps/SSTidalCorridor.inc @@ -1,71 +1,67 @@ SSTidalCorridor_Text_199007:: @ 8199007 SSTidalRooms_Text_199007:: @ 8199007 - .string "Diese Fähre ist so konstruiert, dass sie\n" - .string "auch durch starke Strömungen\l" - .string "fahren kann.\p" - .string "Wir hoffen, du genießt die Reise mit\n" - .string "uns. Schau dich ruhig auf dem Schiff um.$" + .string "This ferry is built to plow through\n" + .string "fast-running currents.\p" + .string "We hope you enjoy your voyage with us.\n" + .string "Feel free to explore the ship.$" SSTidalCorridor_Text_199088:: @ 8199088 - .string "Wir hoffen, du genießt die Reise mit\n" - .string "uns. Schau dich ruhig auf dem Schiff um.$" + .string "We hope you enjoy your voyage on\n" + .string "our ferry.$" SSTidalCorridor_Text_1990B4:: @ 81990B4 SSTidalRooms_Text_1990B4:: @ 81990B4 - .string "Wir gehen in GRAPHITPORT CITY vor\n" - .string "Anker. Danke, dass du mit uns gefahren\l" - .string "bist.$" + .string "We have made land in SLATEPORT CITY.\n" + .string "Thank you for sailing with us.$" SSTidalRooms_Text_1990F8:: @ 81990F8 - .string "Wir gehen in SEEGRASULB CITY vor Anker.\n" - .string "Danke, dass du mit uns gefahren bist.$" + .string "We have made land in LILYCOVE CITY.\n" + .string "Thank you for sailing with us.$" SSTidalCorridor_Text_19913B:: @ 819913B - .string "Ich schätze, es wird einige Zeit dauern,\n" - .string "bis wir an Land gehen.\p" - .string "Du kannst dich in deiner Kabine aus-\n" - .string "ruhen. Du hast Kabine 2.\p" - .string "Das Bett ist weich und gemütlich. Das\n" - .string "habe ich bereits überprüft!$" + .string "It’ll be some time before we make land,\n" + .string "I reckon.\p" + .string "You can rest up in your cabin if you’d\n" + .string "like. Your cabin’s No. 2.\p" + .string "The bed in there is soft and plushy.\n" + .string "I can attest to how comfy it is!$" SSTidalCorridor_Text_1991F4:: @ 81991F4 - .string "Wir sind angekommen!$" + .string "We’ve arrived!$" SSTidalCorridor_Text_199203:: @ 8199203 - .string "Schau dir ruhig die anderen Kabinen an.\n" - .string "TRAINER langweilen sich auf der Über-\l" - .string "fahrt und werden sicher gerne kämpfen.$" + .string "Go visit other cabins.\n" + .string "TRAINERS bored of the boat trip will\l" + .string "be itching to battle.$" SSTidalCorridor_Text_199255:: @ 8199255 - .string "Genieße die Überfahrt.$" + .string "Enjoy your cruise!$" SSTidalCorridor_Text_199268:: @ 8199268 - .string "Durch das Bullauge sieht man\n" - .string "den Horizont.$" + .string "The horizon spreads beyond the\n" + .string "porthole.$" SSTidalCorridor_Text_199291:: @ 8199291 - .string "MR. BRACK: Willkommen an Bord, {PLAYER}{KUN}!\p" - .string "Ich bin jetzt der Kapitän der\n" - .string "MS TIDE!\p" - .string "Du kannst mich ab sofort\n" - .string "KAPITÄN BRACK nennen.\p" - .string "Ich war zwar schon in Rente gegangen,\n" - .string "aber als ich dieses majestätische\l" - .string "Schiff gesehen habe...\p" - .string "Lass es mich so sagen: Es weckte die\n" - .string "schlafende Seele des Seemannes in mir.$" + .string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p" + .string "They made me honorary captain of the\n" + .string "S.S. TIDAL!\p" + .string "You can call me CAPTAIN BRINEY now!\p" + .string "You know, I retired once before, but\n" + .string "when I saw this majestic ship...\p" + .string "Let me just say, it stirred my sleeping\n" + .string "soul as a sailor!$" SSTidalCorridor_Text_199388:: @ 8199388 - .string "PECKO: Pihyo pihyohyo...$" + .string "PEEKO: Pihyo pihyohyo...$" SSTidalCorridor_Text_1993A1:: @ 81993A1 - .string "Kabine 1$" + .string "Cabin 1$" SSTidalCorridor_Text_1993A9:: @ 81993A9 - .string "Kabine 2$" + .string "Cabin 2$" SSTidalCorridor_Text_1993B1:: @ 81993B1 - .string "Kabine 3$" + .string "Cabin 3$" SSTidalCorridor_Text_1993B9:: @ 81993B9 - .string "Kabine 4$" + .string "Cabin 4$" diff --git a/data/text/maps/SSTidalLowerDeck.inc b/data/text/maps/SSTidalLowerDeck.inc index 2341734dd..2c54d743c 100644 --- a/data/text/maps/SSTidalLowerDeck.inc +++ b/data/text/maps/SSTidalLowerDeck.inc @@ -1,25 +1,25 @@ SSTidalLowerDeck_Text_1993C1:: @ 81993C1 - .string "Arrgh! Ich habe die Schnauze voll und\n" - .string "bin hundemüde vom Putzen.\p" - .string "Ein Kampf ist jetzt genau das Richtige!$" + .string "Arrrgh! I’m fed up and dog-tired of\n" + .string "cleaning this huge place!\p" + .string "Let’s have a quick battle!$" SSTidalLowerDeck_Text_19941A:: @ 819941A - .string "Brüderchen, ich habe verloren!$" + .string "Little bro, I lost!$" SSTidalLowerDeck_Text_19942E:: @ 819942E - .string "Wir sind die GEBRÜDER SAUBERMANN!\p" - .string "Der Ältere verteilt die Schmierseife und\n" - .string "der Jüngere schrubbt das Deck!$" + .string "We’re the CLEANUP BROTHERS!\p" + .string "The old one dumps the detergent,\n" + .string "and the young one does the scrubbing!$" SSTidalLowerDeck_Text_199491:: @ 8199491 - .string "Dies ist der untere Bereich des Schiffs.\n" - .string "Hier gibt es sehr viel Platz.\l" - .string "Genau richtig für einen POKéMON-Kampf.$" + .string "This is the bottom of the ship’s hull.\n" + .string "There’s plenty of room.\l" + .string "It’ll be alright for a POKéMON battle.$" SSTidalLowerDeck_Text_1994F7:: @ 81994F7 - .string "Oh, großer Bruder. Ich habe verloren.$" + .string "Big bro, I lost!$" SSTidalLowerDeck_Text_199508:: @ 8199508 - .string "Wir sind die GEBRÜDER SAUBERMANN!\p" - .string "Der Ältere verteilt die Schmierseife und\n" - .string "der Jüngere schrubbt das Deck!$" + .string "We’re the CLEANUP BROTHERS!\p" + .string "The old one dumps the detergent,\n" + .string "and the young one does the scrubbing!$" diff --git a/data/text/maps/SSTidalRooms.inc b/data/text/maps/SSTidalRooms.inc index 72f9a0b48..a0f9000d3 100644 --- a/data/text/maps/SSTidalRooms.inc +++ b/data/text/maps/SSTidalRooms.inc @@ -1,114 +1,111 @@ SSTidalRooms_Text_19956B:: @ 819956B - .string "Ein warmes, weiches Bett...\n" - .string "Machen wir doch ein kleines Schläfchen.$" + .string "It’s a bed.\n" + .string "Let’s take a rest.$" SSTidalRooms_Text_19958A:: @ 819958A - .string "Ich pendle ständig zwischen\n" - .string "SEEGRASULB CITY und GRAPHITPORT CITY.\p" - .string "Das ist mein Hobby - ich gehe von Stadt\n" - .string "zu Stadt und nehme an POKéMON\l" - .string "WETTBEWERBEN teil.$" + .string "Go back and forth between LILYCOVE\n" + .string "and SLATEPORT, that’s what I do.\p" + .string "It’s my hobby - going from port to port\n" + .string "to take in POKéMON CONTESTS.$" SSTidalRooms_Text_199613:: @ 8199613 - .string "Das war ein wunderbarer Kampf!$" + .string "That was an enjoyable match!$" SSTidalRooms_Text_199630:: @ 8199630 - .string "Ich bin schon ganz aufgeregt, wenn ich\n" - .string "mir vorstelle, welche POKéMON ich im\l" - .string "nächsten WETTBEWERB sehen werde!$" + .string "I get so excited imagining what kinds\n" + .string "of POKéMON I’ll get to see in the next\l" + .string "CONTEST. The anticipation of it thrills!$" SSTidalRooms_Text_1996A6:: @ 81996A6 - .string "Sind deine Freunde stark?$" + .string "Are your friends strong?$" SSTidalRooms_Text_1996BF:: @ 81996BF - .string "Deine Freunde sind in der Tat stark.$" + .string "Your friends are, indeed, strong.$" SSTidalRooms_Text_1996E1:: @ 81996E1 - .string "Freunde müssen nicht unbedingt\n" - .string "menschlich sein. Für mich sind\l" - .string "POKéMON die besten Freunde.$" + .string "Friends need not be human.\n" + .string "For me, POKéMON are treasured friends!$" SSTidalRooms_Text_199723:: @ 8199723 - .string "Kind...\n" - .string "Hast du an der Tür geklopft?$" + .string "Child...\n" + .string "Did you knock on the door?$" SSTidalRooms_Text_199747:: @ 8199747 - .string "Eine Niederlage muss mit aufrechtem\n" - .string "Kopf akzeptiert werden.$" + .string "A loss is to be accepted without haste\n" + .string "or panic.$" SSTidalRooms_Text_199778:: @ 8199778 - .string "In jeder Situation die absolute Ruhe zu\n" - .string "bewahren, ist die Devise des GENTLEMAN.$" + .string "To be never ruffled in any situation is\n" + .string "the GENTLEMAN’s code of conduct.$" SSTidalRooms_Text_1997C1:: @ 81997C1 - .string "UWE: Eigentlich bin ich ja schüchtern...\n" - .string "Aber die Liebe gibt einem Kraft!$" + .string "JED: I feel a little shy about this, but...\n" + .string "We’ll show you our lovey-dovey power!$" SSTidalRooms_Text_199813:: @ 8199813 - .string "UWE: Seufz...$" + .string "JED: Sigh...$" SSTidalRooms_Text_199820:: @ 8199820 - .string "UWE: Zum ersten Mal war unsere Kraft\n" - .string "der Liebe unterlegen!\l" - .string "Du bist ein unglaublicher TRAINER!$" + .string "JED: It’s the first time that our lovey-\n" + .string "dovey power couldn’t prevail!\l" + .string "You must be an awesome TRAINER!$" SSTidalRooms_Text_199887:: @ 8199887 - .string "UWE: Du hast nur ein POKéMON?\n" - .string "Fühlt es sich nicht sehr einsam?$" + .string "JED: You only have one POKéMON?\n" + .string "Isn’t that just too lonesome?$" SSTidalRooms_Text_1998C5:: @ 81998C5 - .string "LENA: Ich fühle mich etwas albern,\n" - .string "aber... Aber die Liebe gibt mir Kraft!$" + .string "LEA: I feel a little silly, but...\n" + .string "We’ll show you our lovey-dovey power!$" SSTidalRooms_Text_19990E:: @ 819990E - .string "LENA: Oh, buuuuh!$" + .string "LEA: Oh, boo!$" SSTidalRooms_Text_19991C:: @ 819991C - .string "LENA: Ich kann es einfach nicht fassen!\n" - .string "Die Kraft unserer Liebe reichte nicht...\l" - .string "Du bist ein unglaublicher TRAINER!$" + .string "LEA: I can’t believe it!\n" + .string "Our lovey-dovey power failed...\l" + .string "You must be an awesome TRAINER!$" SSTidalRooms_Text_199975:: @ 8199975 - .string "LENA: Ich möchte kämpfen...\n" - .string "Aber du hast nur ein POKéMON...$" + .string "LEA: I wanted to battle...\n" + .string "But you don’t even have two POKéMON...$" SSTidalRooms_Text_1999B7:: @ 81999B7 - .string "Ah, du kommst gerade rechtzeitig.\p" - .string "Ich langweile mich schrecklich.\n" - .string "Du musst mich jetzt unterhalten.$" + .string "Ah, you’ve come just in time.\p" + .string "I’m bored, you see.\n" + .string "You may entertain me.$" SSTidalRooms_Text_1999FF:: @ 81999FF - .string "...Das reicht.$" + .string "...That will do.$" SSTidalRooms_Text_199A10:: @ 8199A10 - .string "Ich muss meinen Vater unbedingt\n" - .string "fragen, ob er mir eine Yacht schenkt.\l" - .string "Eine Yacht für mich und meine POKéMON!$" + .string "Perhaps I shall get Father to acquire\n" + .string "a yacht for me.\l" + .string "A yacht for me and POKéMON!$" SSTidalRooms_Text_199A62:: @ 8199A62 - .string "Oh, du bist so ein wunderbarer TRAINER.\n" - .string "Möchtest du eine Tasse Tee?\l" - .string "Oder möchtest du lieber kämpfen?$" + .string "Oh, you’re such an adorable TRAINER.\n" + .string "Would you like to have tea?\l" + .string "Or would you rather battle?$" SSTidalRooms_Text_199ABF:: @ 8199ABF - .string "Ich verstehe.\n" - .string "Du bist eher der aktive Typ.$" + .string "I see.\n" + .string "You’re the active sort.$" SSTidalRooms_Text_199ADE:: @ 8199ADE - .string "Eine Weltreise auf einem Luxusliner hat\n" - .string "etwas für sich, das muss ich sagen...\p" - .string "Aber auch eine Fahrt auf der Fähre\n" - .string "durch HOENN hat etwas.$" + .string "A world cruise on a luxury liner has its\n" + .string "charms, I must say...\p" + .string "But, I will admit there is an appealing\n" + .string "side to touring HOENN by ferry.$" SSTidalRooms_Text_199B65:: @ 8199B65 - .string "Äh... Hallo! Ich... Ich verhalte mich über-\n" - .string "haupt nicht verdächtig! Äh... hier, das\l" - .string "ist für dich! Es kostet dich nichts!\p" - .string "Es... Ehrlich! Ich habe es nicht von\n" - .string "jemandem ÜBERNOMMEN! Das würde ich\l" - .string "nie tun! Es ist sauber! Nimm es ruhig!$" + .string "Uh... Hi! I... I’m not acting suspicious!\n" + .string "Uh... You can have this! For free!\p" + .string "It... Honestly, I didn’t SNATCH it from\n" + .string "someone! I’d never do such a thing!\l" + .string "It’s clean! You can use it!$" SSTidalRooms_Text_199C1A:: @ 8199C1A - .string "ÜBERNAHME raubt die nächste Attacke\n" - .string "eines POKéMON und setzt sie dann\l" - .string "gegen diesen Gegner ein.$" + .string "SNATCH steals the foe’s move in\n" + .string "advance, and then uses the snatched\l" + .string "move on the foe.$" diff --git a/data/text/maps/SeafloorCavern_Room1.inc b/data/text/maps/SeafloorCavern_Room1.inc index 0b46a9267..da6e207ae 100644 --- a/data/text/maps/SeafloorCavern_Room1.inc +++ b/data/text/maps/SeafloorCavern_Room1.inc @@ -1,22 +1,22 @@ SeafloorCavern_Room1_Text_1974BA:: @ 81974BA - .string "Wir können hier keine Kinder\n" - .string "gebrauchen! Geh nach Hause! Sofort!$" + .string "We don’t need a kid around!\n" + .string "Go on home already!$" SeafloorCavern_Room1_Text_1974EA:: @ 81974EA - .string "Ich will nach Hause zu meiner Mami...$" + .string "I want to go home...$" SeafloorCavern_Room1_Text_1974FF:: @ 81974FF - .string "Ich möchte befördert werden, dann kann\n" - .string "ich all die RÜPEL herumkommandieren!$" + .string "I want to get a promotion so I can\n" + .string "boss around the GRUNTS...$" SeafloorCavern_Room1_Text_19753C:: @ 819753C - .string "Dieses U-Boot... Es ist sehr eng.\n" - .string "Ich habe deshalb überall blaue Flecken.$" + .string "That submarine... It’s tiny inside.\n" + .string "I’m sore all over!$" SeafloorCavern_Room1_Text_197573:: @ 8197573 - .string "Verlieren verursacht mir Muskelkater!$" + .string "Losing makes me sore!$" SeafloorCavern_Room1_Text_197589:: @ 8197589 - .string "Das U-Boot, das wir aufgetrieben haben,\n" - .string "ist fürchterlich eng. Brutal eng, sage\l" - .string "ich. Man stößt sich überall den Kopf.$" + .string "That submarine we jacked, man, it’s\n" + .string "brutal as a ride.\l" + .string "It’s way too tight in there!$" diff --git a/data/text/maps/SeafloorCavern_Room3.inc b/data/text/maps/SeafloorCavern_Room3.inc index 896ef9e06..07187b142 100644 --- a/data/text/maps/SeafloorCavern_Room3.inc +++ b/data/text/maps/SeafloorCavern_Room3.inc @@ -1,23 +1,24 @@ SeafloorCavern_Room3_Text_1975DC:: @ 81975DC - .string "Ahahahahaha!\p" - .string "Wie bist du uns ohne U-Boot gefolgt?\n" - .string "Was für ein bemerkenswertes Kind!\p" - .string "Aber... Das berechtigt dich nicht, hier\n" - .string "herumzuschnüffeln!\p" - .string "Jetzt kann ich dir die Sache vom\n" - .string "KLIMA-INSTITUT heimzahlen...\p" - .string "Ich gebe dir eine Lektion in Sachen\n" - .string "Schmerz! Pass gut auf!$" + .string "Ahahahaha!\p" + .string "How did you manage to get here without\n" + .string "a submarine?\l" + .string "What an impressive child!\p" + .string "But... It won’t do to have you\n" + .string "meddling about here.\p" + .string "And, I do want payback for what\n" + .string "happened at the WEATHER INSTITUTE...\p" + .string "I’m going to give you a little taste\n" + .string "of pain! Resign yourself to it!$" SeafloorCavern_Room3_Text_1976F3:: @ 81976F3 - .string "Ahahahahaha!\p" - .string "Auuuaaa!$" + .string "Ahahahaha!\p" + .string "Ouch!$" SeafloorCavern_Room3_Text_197704:: @ 8197704 .string "Ahahahaha!\n" - .string "Du bist unglaublich stark!\p" - .string "Es ist verdammt schade, dass du kein\n" - .string "Mitglied vom TEAM {EVIL_TEAM} bist!\p" - .string "So könntest du an der wunderbaren,\n" - .string "neuen Welt, die unser BOSS seinen\l" - .string "Leuten versprochen hat, teilhaben...$" + .string "You’re so darn strong.\p" + .string "It’s terribly disappointing that you’re\n" + .string "not a TEAM {EVIL_TEAM} member.\p" + .string "You could have enjoyed the fabulous\n" + .string "world our BOSS has promised to one\l" + .string "of our own...$" diff --git a/data/text/maps/SeafloorCavern_Room4.inc b/data/text/maps/SeafloorCavern_Room4.inc index 3b54317da..ca0600450 100644 --- a/data/text/maps/SeafloorCavern_Room4.inc +++ b/data/text/maps/SeafloorCavern_Room4.inc @@ -1,11 +1,10 @@ SeafloorCavern_Room4_Text_1977B9:: @ 81977B9 - .string "Wer bist du?\n" - .string "Woher kommst du?$" + .string "Who are you?\n" + .string "Where did you come in from?$" SeafloorCavern_Room4_Text_1977E2:: @ 81977E2 - .string "Verloren...$" + .string "Lost it...$" SeafloorCavern_Room4_Text_1977ED:: @ 81977ED - .string "Ich finde den Ausgang nicht mehr!\p" - .string "Ich bin nicht verzweifelt. Denk das\n" - .string "bloß nicht!$" + .string "I can’t find the way out!\p" + .string "I’m not afraid. Don’t get me wrong!$" diff --git a/data/text/maps/SecretBase_RedCave1.inc b/data/text/maps/SecretBase_RedCave1.inc index ffe6c4d04..efb2c8fdb 100644 --- a/data/text/maps/SecretBase_RedCave1.inc +++ b/data/text/maps/SecretBase_RedCave1.inc @@ -1,3 +1,2 @@ SecretBase_RedCave1_Text_198F89:: @ 8198F89 - .string "Möchtest du hier deine GEHEIMBASIS\n" - .string "einrichten?$" + .string "Want to make your SECRET BASE here?$" diff --git a/data/text/maps/ShoalCave_LowTideLowerRoom.inc b/data/text/maps/ShoalCave_LowTideLowerRoom.inc index 1522dc019..c9d4337de 100644 --- a/data/text/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/text/maps/ShoalCave_LowTideLowerRoom.inc @@ -1,11 +1,9 @@ ShoalCave_LowTideLowerRoom_Text_198200:: @ 8198200 - .string "Die eisige Kälte in dieser Gegend ist\n" - .string "ein gewaltiges Hindernis beim Training.\p" - .string "Aber wenn man sich konzentriert, kann\n" - .string "man doch gewinnen!\p" - .string "Mit diesem FOKUS-BAND kannst du dich\n" - .string "besser konzentrieren und der Kälte\l" - .string "widerstehen.$" + .string "The penetrating cold around these\n" + .string "parts is an impediment to training.\p" + .string "But with focus, one can overcome!\p" + .string "With this FOCUS BAND, buckle down and\n" + .string "withstand the cold!$" ShoalCave_LowTideLowerRoom_Text_1982A2:: @ 81982A2 - .string "Alles hängt von der Konzentration ab!$" + .string "Everything starts with focus!$" diff --git a/data/text/maps/SlateportCity.inc b/data/text/maps/SlateportCity.inc index b65cf82a4..3ff5d51bf 100644 --- a/data/text/maps/SlateportCity.inc +++ b/data/text/maps/SlateportCity.inc @@ -1,336 +1,321 @@ SlateportCity_Text_164642:: @ 8164642 - .string "Ich bin der STATUSWERTE GURU!\n" - .string "Ich werde dir verkaufen, was du\l" - .string "brauchst!$" + .string "I’m the ENERGY GURU!\n" + .string "I’ll go for it and sell you what you need!$" SlateportCity_Text_164682:: @ 8164682 .string "Oh?\n" - .string "Dein {STR_VAR_1}...$" + .string "Your {STR_VAR_1}...$" SlateportCity_Text_164691:: @ 8164691 - .string "Es hat sich enorm angestrengt!\p" - .string "Gib ihm als Belohnung bitte dieses\n" - .string "FLEISS-BAND.$" + .string "Went for it stupendously!\p" + .string "As its reward, please give it this\n" + .string "EFFORT RIBBON.$" SlateportCity_Text_1646DD:: @ 81646DD - .string "{PLAYER} erhält das FLEISS-BAND.$" + .string "{PLAYER} received the EFFORT RIBBON.$" SlateportCity_Text_1646FC:: @ 81646FC - .string "{PLAYER} steckt {STR_VAR_1} das\n" - .string "FLEISS-BAND an.$" + .string "{PLAYER} put the EFFORT RIBBON\n" + .string "on {STR_VAR_1}.$" SlateportCity_Text_16471C:: @ 816471C - .string "Du musst dich mehr anstrengen.\p" - .string "Dann gebe ich dir und deinen POKéMON\n" - .string "ein schönes Geschenk.$" + .string "You have to go for it a little harder.\p" + .string "If you do, I’ll give your POKéMON\n" + .string "something nice.$" SlateportCity_Text_164775:: @ 8164775 - .string "Oh! Dein {STR_VAR_1} sieht gut mit dem\n" - .string "FLEISS-BAND aus!$" + .string "Oh! Your {STR_VAR_1}, that EFFORT\n" + .string "RIBBON looks good on it!$" SlateportCity_Text_1647A7:: @ 81647A7 - .string "Das Licht dieses Leuchtturms sieht man\n" - .string "dutzende von Kilometern weit.\p" - .string "Ich frage mich, ob es nicht die POKéMON\n" - .string "im Meer verwirrt.$" + .string "The light of the lighthouse reaches\n" + .string "dozens of miles away.\p" + .string "I wonder if it doesn’t startle POKéMON\n" + .string "in the sea.$" SlateportCity_Text_164814:: @ 8164814 - .string "Ooh, schau dir das an!\p" - .string "Das Seegras hier in dieser Gegend sieht\n" - .string "frisch und fast lebendig aus.\p" - .string "Es sieht aus, als könne es sich auf-\n" - .string "richten und angreifen!$" + .string "Ooh, look at this!\p" + .string "The seaweed you can get around these\n" + .string "parts is fresh and full of life.\p" + .string "Why, it looks like it can even rear up\n" + .string "and attack!$" SlateportCity_Text_1648A0:: @ 81648A0 - .string "Wo das Wasser sauber ist, geben die\n" - .string "Früchte eine reiche Ernte.\p" - .string "Und wo es eine reiche Ernte gibt, gibt\n" - .string "es auch bald einen Markt.\p" - .string "So entsteht und wächst eine Stadt.$" + .string "Where the water is clean, the fruits\n" + .string "of bountiful harvest gather.\p" + .string "And where people gather, a market\n" + .string "soon starts.\p" + .string "That is how a town is born and grows.$" SlateportCity_Text_164937:: @ 8164937 - .string "Einkaufen, wo man die salzige Luft des\n" - .string "Meeres einatmen kann...\p" - .string "GRAPHITPORT CITY ist so ein toller Ort!$" + .string "Shopping where you can breathe the\n" + .string "scent of the ocean...\p" + .string "SLATEPORT is such a wonderful place!$" SlateportCity_Text_164995:: @ 8164995 - .string "Wenn du PUPPEN oder KISSEN einfach auf\n" - .string "den Boden legst, werden sie schmutzig.\p" - .string "Ich kaufe mir einige BACKSTEINE, auf\n" - .string "die ich meine PUPPEN und KISSEN lege.\l" - .string "So bleiben sie schön sauber.$" + .string "If you put DOLLS or CUSHIONS on the\n" + .string "floor, they’ll get dirty.\p" + .string "I’m going to buy some BRICKS so my\n" + .string "DOLLS and CUSHIONS won’t get dirty\l" + .string "when I leave them out.$" SlateportCity_Text_164A30:: @ 8164A30 - .string "Yeah! Darauf habe ich lange gewartet!\n" - .string "WETTBEWERBE für POKéMON!\l" - .string "Ich werde mit Sicherheit teilnehmen!\p" - .string "Aber vorher muss ich mir einige\n" - .string "POKéMON fangen!$" + .string "Yeah! I’ve waited so long for this!\n" + .string "POKéMON CONTESTS!\l" + .string "I’m going to enter!\p" + .string "But before I do, I have to catch some\n" + .string "POKéMON!$" SlateportCity_Text_164AA9:: @ 8164AA9 - .string "Puuuh... Ich bin fix und fertig...\p" - .string "Ich komme aus MALVENFROH CITY. Diese\n" - .string "Stadt ist vielleicht groß! Riesengroß!\p" - .string "Hätte ich das gewusst, wäre ich mit dem\n" - .string "RAD gekommen.$" + .string "Whew... I’m just bushed...\p" + .string "I hiked over from MAUVILLE CITY.\n" + .string "But, boy, this city’s huge.\p" + .string "If I’d known this, I would’ve ridden\n" + .string "my BIKE here.$" SlateportCity_Text_164B34:: @ 8164B34 - .string "Der Typ, der das MUSEUM gebaut\n" - .string "hat, ist auch der Leiter eines Teams zur\l" - .string "Erforschung der Tiefsee.\p" - .string "Daher nennt ihn jeder KAPT. BRIGG.$" + .string "STERN, the fellow who built the\n" + .string "MUSEUM, also happens to be the leader\l" + .string "of an undersea exploration team.\p" + .string "So, everyone calls him CAPT. STERN.$" SlateportCity_Text_164BBF:: @ 8164BBF - .string "Was ist das dort drüben?\n" - .string "Diese Menschenansammlung...$" + .string "What is that over there?\n" + .string "That long line...$" SlateportCity_Text_164BEA:: @ 8164BEA - .string "Als ich noch ein Kind war, war ich oft in\n" - .string "dem MUSEUM.\p" - .string "Ich habe danach immer von den\n" - .string "Mysterien des Meeres geträumt.$" + .string "When I was a child, I visited the\n" + .string "MUSEUM often.\p" + .string "I used to dream about the mysteries of\n" + .string "the sea after seeing the exhibits.$" SlateportCity_Text_164C64:: @ 8164C64 - .string "Hey, du da! Hör auf zu drängeln!\n" - .string "Wir stehen hier ordentlich an!$" + .string "Hey, there! Quit pushing!\n" + .string "This is the line, can’t you see?$" SlateportCity_Text_164C9F:: @ 8164C9F - .string "TEAM {EVIL_TEAM} verfolgt die Strategie des\n" - .string "Versammelns und Verteilens.$" + .string "TEAM {EVIL_TEAM} has a policy of\n" + .string "assembling and dispersing at the\l" + .string "operation site.$" SlateportCity_Text_164CE8:: @ 8164CE8 - .string "Unser BOSS ist brillant.\p" - .string "Wozu er jetzt wohl Interesse am\n" - .string "MUSEUM zeigt?$" + .string "Our BOSS is brilliant.\p" + .string "What would he want to do with a\n" + .string "MUSEUM now?$" SlateportCity_Text_164D2B:: @ 8164D2B - .string "Was hat diese neue Masche zu bedeuten?\p" - .string "Unser BOSS ist richtig Furcht ein-\n" - .string "flößend, wenn er so abgedreht ist. Ich\l" - .string "halte lieber Abstand und frage nicht...$" + .string "What’s the new scheme, I wonder?\p" + .string "Our BOSS is scary when he’s mad, so\n" + .string "I’d better not screw things up...$" SlateportCity_Text_164D92:: @ 8164D92 - .string "Wenn es im MUSEUM etwas Brauchbares\n" - .string "gibt, dann müssen wir das an uns nehmen!$" + .string "If there’s something we need in the\n" + .string "MUSEUM, we should take it all!$" SlateportCity_Text_164DD5:: @ 8164DD5 - .string "Hey, du! Du willst dich doch wohl\n" - .string "nicht vordrängeln!?!$" + .string "Hey, you there!\n" + .string "Don’t butt in!$" SlateportCity_Text_164DF4:: @ 8164DF4 - .string "Eine lange Schlange, was?\p" - .string "Erinnert mich an die Zeiten, als ich\n" - .string "Ewigkeiten anstand, um mir die neuesten\l" - .string "brandheißen Spiele zu kaufen...$" + .string "A long line, huh?\p" + .string "It reminds me of the times I lined up to\n" + .string "buy smash-hit games...$" SlateportCity_Text_164E46:: @ 8164E46 - .string "Warum stehen wir hier eigentlich an und\n" - .string "bezahlen? Wir sollten einfach\l" - .string "hineingehen.$" + .string "Why are we even lining up and paying?\n" + .string "We should just march in!$" SlateportCity_Text_164E85:: @ 8164E85 - .string "Das Meer ist wirklich überwältigend...\p" - .string "Ob es durch die vergossenen Tränen der\n" - .string "POKéMON entstanden ist?$" + .string "The sea is just so vast...\p" + .string "Could the sea have been made by the\n" + .string "tears shed by POKéMON?$" SlateportCity_Text_164EDB:: @ 8164EDB - .string "Weißt du, was mit alten, nicht mehr\n" - .string "seetüchtigen Schiffen gemacht wird?\p" - .string "Sie werden im Meer versenkt und so\n" - .string "zu Lebensraum für die POKéMON.$" + .string "Do you know what they do with old\n" + .string "ships that become too creaky to sail?\p" + .string "They sink them in the sea so they\n" + .string "become habitats for POKéMON.$" SlateportCity_Text_164F62:: @ 8164F62 - .string "Immer wenn ich hier herkomme, vergesse\n" - .string "ich mich und kaufe wie bescheuert ein.$" + .string "Whenever I visit here, I get carried\n" + .string "away and buy too much.$" SlateportCity_Text_164F9E:: @ 8164F9E - .string "Wenn du die Kosenamen deiner POKéMON\n" - .string "ändern willst, solltest du den NAMEN-\l" - .string "BEWERTER um Hilfe bitten.$" + .string "If you want to change your POKéMON’s\n" + .string "nickname, you’ll have to get the NAME\l" + .string "RATER to help you.$" SlateportCity_Text_164FFC:: @ 8164FFC - .string "Erhältst du ein POKéMON durch Tausch,\n" - .string "kannst du den Kosenamen nicht ändern.\p" - .string "Die Liebe des ursprünglichen TRAINERS\n" - .string "drückt sich in dem Kosenamen aus.$" + .string "Any POKéMON you get in a trade, you\n" + .string "can’t change its nickname.\p" + .string "The original TRAINER’s love for that\n" + .string "POKéMON is in the nickname.$" SlateportCity_Text_16507C:: @ 816507C - .string "Eine WETTBEWERBSHALLE für POKéMON\n" - .string "wurde kürzlich in GRAPHITPORT CITY\l" - .string "eröffnet.\p" - .string "Ich plane dort hinzugehen, wenn ich\n" - .string "meine POKéMON besser trainiert habe.$" + .string "A POKéMON CONTEST HALL opened in\n" + .string "SLATEPORT recently.\p" + .string "I plan on entering after I improve the\n" + .string "condition of my POKéMON.$" SlateportCity_Text_1650F1:: @ 81650F1 - .string "Hast du schon mal etwas über den\n" - .string "BEERENMIXER gehört?$" + .string "Do you know about the machine\n" + .string "BERRY BLENDER?$" SlateportCity_Text_16511E:: @ 816511E - .string "Man muss mit anderen zusammenarbeiten,\n" - .string "um ihn schneller drehen zu können.\p" - .string "Ich habe gehört, je schneller man ihn\n" - .string "dreht, desto besser werden die {POKEBLOCK}.$" + .string "People have to work together to get it\n" + .string "to spin faster.\p" + .string "The faster you can make it spin, the\n" + .string "better {POKEBLOCK}S you can get, I’ve heard.$" SlateportCity_Text_1651A1:: @ 81651A1 - .string "Damit stellt man eine Leckerei her, die\n" - .string "{POKEBLOCK} genannt wird.\p" - .string "Wenn du einem POKéMON einen guten\n" - .string "{POKEBLOCK} gibst, verbessern sich seine\l" - .string "Eigenschaften.$" + .string "It’s used for making a kind of candy\n" + .string "called a {POKEBLOCK}.\p" + .string "If you give a good {POKEBLOCK} to a POKéMON,\n" + .string "its condition will improve by a lot.$" SlateportCity_Text_165222:: @ 8165222 - .string "Ich habe gehofft, es wäre ein berühmter\n" - .string "Star. Dann hätte ich mir ein Autogramm\l" - .string "geben lassen.\p" - .string "Aber wer wird denn da interviewt?\n" - .string "Ist das nicht KAPT. BRIGG?$" + .string "I was hoping that it was a famous star\n" + .string "so I could get an autograph.\p" + .string "But who’s that being interviewed?\n" + .string "Isn’t that CAPT. STERN?$" SlateportCity_Text_1652A0:: @ 81652A0 - .string "Die Interviewerin ist so cool und\n" - .string "hübsch.\p" - .string "Wenn ich groß bin, werde ich ein\n" - .string "weltberühmter Journalist.$" + .string "That lady interviewer is so cool and\n" + .string "pretty.\p" + .string "When I grow up, I’m going to be an\n" + .string "international journalist!$" SlateportCity_Text_16530A:: @ 816530A - .string "KAPT. BRIGG sagt, sie hätten etwas auf\n" - .string "dem Meeresgrund entdeckt.\p" - .string "Ich frage mich, was das wohl ist.\n" - .string "Was könnte das sein???$" + .string "CAPT. STERN says they discovered\n" + .string "something at the bottom of the sea.\p" + .string "I wonder what it is?\n" + .string "What could it be?$" SlateportCity_Text_165376:: @ 8165376 - .string "Was ist denn hier los?\p" - .string "Hat KAPT. BRIGG etwa einen Riesen-\n" - .string "fisch vom Meeresgrund mitgebracht?$" + .string "What’s going on here?\p" + .string "Did the good CAPTAIN come back with\n" + .string "a big fish from the ocean floor?$" SlateportCity_Text_1653D1:: @ 81653D1 - .string "Hey! Nimmst du mich auf?\n" - .string "Komm ich jetzt ins Fernsehen?$" + .string "Hey! Are you watching?\n" + .string "Am I on TV?$" SlateportCity_Text_1653F4:: @ 81653F4 - .string "Ein TV-Interview! Hier!!!\n" - .string "Der KAPITÄN ist ein Star!$" + .string "A TV interview! Here!\n" + .string "The CAPTAIN’s a celebrity!$" SlateportCity_Text_165425:: @ 8165425 - .string "UDO: Okay, KAPT. BRIGG, schenken Sie\n" - .string "unserer Kamera Ihr schönstes Lächeln!$" + .string "TY: Okay, CAPT. STERN, a big smile\n" + .string "for the camera!$" SlateportCity_Text_165458:: @ 8165458 - .string "PIA: Ich verstehe, ich verstehe. Sie\n" - .string "haben eine unschätzbare Entdeckung\l" - .string "gemacht...$" + .string "GABBY: I see, I see. You’ve had a most\n" + .string "invaluable experience...$" SlateportCity_Text_165498:: @ 8165498 - .string "KAPT. BRIGG: Ja, genau. Wir haben vor,\n" - .string "unsere Expedition weiter fortzuführen.$" + .string "CAPT. STERN: Yes, indeed. We intend to\n" + .string "move ahead with our exploration.$" SlateportCity_Text_1654E0:: @ 81654E0 - .string "PIA: Das ist wunderbar, KAPT. BRIGG!\n" - .string "Vielen Dank, dass Sie trotz Ihres vollen\l" - .string "Terminkalenders Zeit für uns gefunden\l" - .string "haben!\p" - .string "Wir hoffen, Sie bald wieder zu neuen\n" - .string "aufregenden Funden interviewen zu\l" - .string "dürfen!$" + .string "GABBY: That’s wonderful, CAPT. STERN!\n" + .string "Thank you for taking the time from\l" + .string "your busy schedule to talk to us.\p" + .string "We hope we can interview you again\n" + .string "with news of more discoveries!$" SlateportCity_Text_16558D:: @ 816558D - .string "KAPT. BRIGG: Puuh...\p" - .string "Das war das erste Mal, dass ich für eine\n" - .string "Fernsehsendung interviewt wurde. Ich\l" - .string "war vielleicht nervööös!$" + .string "CAPT. STERN: Whew...\p" + .string "That was my first time to be filmed for\n" + .string "TV. That was nerve wracking.$" SlateportCity_Text_1655E7:: @ 81655E7 .string "Oh! {PLAYER}{KUN}!\n" - .string "Gut siehst du aus!\p" - .string "Wir haben bei unserer letzten Tiefsee-\n" - .string "Expedition eine großartige Entdeckung\l" - .string "gemacht.\p" - .string "Wir haben auf der ROUTE 128 eine Unter-\n" - .string "wasserhöhle entdeckt.\p" - .string "Wir glauben, es ist die Höhle eines\n" - .string "POKéMON, das schon lange ausge-\l" - .string "storben ist.$" + .string "You’re looking great!\p" + .string "We made a huge discovery on our last\n" + .string "seafloor exploration.\p" + .string "We found an underwater cavern on\n" + .string "ROUTE 128.\p" + .string "We think it’s the habitat of a POKéMON\n" + .string "that’s said to have been long extinct.$" SlateportCity_Text_1656BC:: @ 81656BC - .string "Hähähä...\n" - .string "KAPT. BRIGG, nehme ich an.\p" - .string "Wir vom TEAM {EVIL_TEAM} werden das U-Boot\n" - .string "in unsere Gewalt nehmen!\p" - .string "Eure Einwände sind bedeutungslos!\n" - .string "Wir erwarten absolute Kooperation!\p" - .string "Hähähä...\n" - .string "Mal sehen, was ihr zu den Plänen von\l" - .string "TEAM {EVIL_TEAM} sagt!$" + .string "Fufufu...\n" + .string "CAPT. STERN, I presume.\p" + .string "We of TEAM {EVIL_TEAM} will assume\n" + .string "control of your submarine!\p" + .string "Your objections are meaningless!\n" + .string "We expect your total cooperation!\p" + .string "Fufufu...\n" + .string "Just watch and learn what TEAM\l" + .string "{EVIL_TEAM} has planned!$" SlateportCity_Text_16578F:: @ 816578F - .string "KAPT. BRIGG: Was soll das Ganze?\p" - .string "Sieht aus, als benutze jemand ein\n" - .string "Megaphon...\p" - .string "Wo kommt das her?$" + .string "CAPT. STERN: What was that all about?\p" + .string "It sounded like someone using a\n" + .string "megaphone...\p" + .string "Where did it come from?$" SlateportCity_Text_1657FA:: @ 81657FA - .string "Das kommt von der Anlegestelle!\p" - .string "Das U-Boot!\n" - .string "Jemand versucht, es zu stehlen!$" + .string "It’s from the HARBOR!\p" + .string "The submarine!\n" + .string "They’re trying to take it!$" SlateportCity_Text_16583A:: @ 816583A .string "{PLAYER}{KUN}!\n" - .string "Bitte, komm mit mir!$" + .string "Please, come with me!$" SlateportCity_Text_165856:: @ 8165856 - .string "POKéMON WETTBEWERBE\n" - .string "HYPER-KLASSE REGISTRIERUNGEN\l" - .string "“Lasst es krachen! POKéMON-\l" - .string "TRAINER!”$" + .string "POKéMON CONTESTS\n" + .string "HYPER RANK REGISTRATION\l" + .string "“Let it burn! POKéMON TRAINERS!”$" SlateportCity_Text_1658A0:: @ 81658A0 - .string "BRIGGWERFT\p" - .string "“Gesucht: Ein erfahrener Seemann,\n" - .string "der die Gefahr nicht scheut.”$" + .string "STERN’S SHIPYARD\p" + .string "“Wanted: A sailor capable of sailing\n" + .string "in all currents.”$" SlateportCity_Text_1658E8:: @ 81658E8 - .string "BRIGGWERFT\p" - .string "“Die Fähre MS TIDE wird bald fertig\n" - .string "gestellt sein und die Häfen von\l" - .string "GRAPHITPORT CITY und SEEGRASULB CITY\l" - .string "bedienen.”$" + .string "STERN’S SHIPYARD\p" + .string "“The ferry S.S. TIDAL nears\n" + .string "completion for serving the ports of\l" + .string "SLATEPORT and LILYCOVE.”$" SlateportCity_Text_165952:: @ 8165952 - .string "BRIGGWERFT\p" - .string "“Bordkarten für die GRAPHITPORT CITY-\n" - .string "SEEGRASULB CITY Fähre MS TIDE werden\l" - .string "am HAFEN ausgegeben.”$" + .string "STERN’S SHIPYARD\p" + .string "“Boarding of the SLATEPORT-LILYCOVE\n" + .string "ferry S.S. TIDAL is handled at the\l" + .string "HARBOR.”$" SlateportCity_Text_1659B3:: @ 81659B3 - .string "POKéMON-FANCLUB\n" - .string "“Wir rufen alle Fans der POKéMON!”$" + .string "POKéMON FAN CLUB\n" + .string "“Calling all fans of POKéMON!”$" SlateportCity_Text_1659E3:: @ 81659E3 - .string "“Das unendliche Meer erhält\n" - .string "alles Leben.”\p" - .string "OZEANMUSEUM$" + .string "“The endless sea sustains\n" + .string "all life.”\p" + .string "OCEANIC MUSEUM$" SlateportCity_Text_165A17:: @ 8165A17 - .string "GRAPHITPORT CITY\p" - .string "“Der Hafen, an dem sich Menschen\n" - .string "und POKéMON begegnen.”$" + .string "SLATEPORT CITY\p" + .string "“The port where people and POKéMON\n" + .string "cross paths.”$" SlateportCity_Text_165A57:: @ 8165A57 - .string "GRAPHITPORT CITY MARKT\n" - .string "“Einzigartige Items, die es\l" - .string "nirgendwo sonst gibt!”$" + .string "SLATEPORT MARKET\n" + .string "“Unique items found nowhere else!”$" SlateportCity_Text_165A8B:: @ 8165A8B - .string "HAFEN GRAPHITPORT CITY\p" - .string "“Die Fähre MS TIDE wird momentan\n" - .string "in der WERFT gebaut.\p" - .string "Die Fähre wird so bald wie möglich ihren\n" - .string "Dienst aufnehmen.”$" + .string "SLATEPORT HARBOR\p" + .string "“The ferry S.S. TIDAL is under\n" + .string "construction in the SHIPYARD.\p" + .string "“Service is scheduled to begin\n" + .string "shortly.”$" SlateportCity_Text_165B02:: @ 8165B02 - .string "HAFEN GRAPHITPORT CITY\p" - .string "“Genießen Sie die entspannende Fahrt\n" - .string "mit der Fähre MS TIDE.”$" + .string "SLATEPORT HARBOR\p" + .string "“Enjoy a delightful cruise on the\n" + .string "ferry S.S. TIDAL.”$" SlateportCity_Text_165B48:: @ 8165B48 - .string "HAUS DES NAMENBEWERTERS\n" - .string "“Bewertung von POKéMON-Kosenamen.”$" + .string "NAME RATER’S HOUSE\n" + .string "“POKéMON nicknames rated.”$" diff --git a/data/text/maps/SlateportCity_ContestHall.inc b/data/text/maps/SlateportCity_ContestHall.inc index 7a52c4a13..6199157fb 100644 --- a/data/text/maps/SlateportCity_ContestHall.inc +++ b/data/text/maps/SlateportCity_ContestHall.inc @@ -1,111 +1,105 @@ SlateportCity_ContestHall_Text_17CB71:: @ 817CB71 - .string "Soll ich dir einen klitzekleinen Tipp für\n" - .string "den WETTBEWERB geben?\p" - .string "Wenn du eine besondere Attacke nach\n" - .string "einer bestimmten Attacke einsetzt,\l" - .string "weckst du besondere Aufmerksamkeit.\p" - .string "Solange du genau weißt, was du wie zu\n" - .string "tun hast, wirst du erfolgreich sein.\p" - .string "Natürlich werden die Mitstreiter\n" - .string "versuchen, deinem POKéMON die Show zu\l" - .string "stehlen.$" + .string "Want a tasty little bit of advice\n" + .string "for CONTESTS?\p" + .string "Using a certain move after another\n" + .string "certain kind of move sometimes gets\l" + .string "you extra attention.\p" + .string "If you know what you’re doing, you\n" + .string "can score big in appeal.\p" + .string "Of course, your opponents might try\n" + .string "disrupting your POKéMON’s showing.$" SlateportCity_ContestHall_Text_17CC80:: @ 817CC80 - .string "Mein Papa ist ein JUROR des\n" - .string "WETTBEWERBS.\p" - .string "Ich frage mich, was ich mal werden soll:\n" - .string "Ein JUROR oder ein ARENALEITER?$" + .string "My papa, he’s a CONTEST JUDGE.\p" + .string "I wonder what I should be when I\n" + .string "grow up, a JUDGE or a GYM LEADER?$" SlateportCity_ContestHall_Text_17CCE2:: @ 817CCE2 - .string "Hey, also, das ist wohl Künstlerpech,\n" - .string "Mann. Ich will einfach wissen, warum\l" - .string "mein POKéMON nie gewinnt.\l" - .string "Weißt du, Mann?\p" - .string "Daher, Mann, habe ich dem JUROR meinen\n" - .string "Senf dazugegeben.\p" - .string "Und der hat nicht einmal zugehört, Mann!\n" - .string "Das ist vielleicht eine Niete.\p" - .string "Hey! Zieh dir das mal rein!\n" - .string "Hier, Mann, das ist für dich!$" + .string "Hey, man, I’m like majorly cheesed,\n" + .string "you know. Like, you know, I just\l" + .string "wanted to know why my POKéMON\l" + .string "never won, you know, like, hey?\p" + .string "So, like, I gave the JUDGE my two\n" + .string "cents, you know, they’re free.\p" + .string "And he wouldn’t hear me out, like, hey!\n" + .string "So, like, total bummer, man!\p" + .string "Hey, like, you! Zip it, you know?\n" + .string "Just, you know, take this!$" SlateportCity_ContestHall_Text_17CE28:: @ 817CE28 - .string "Das ist die TM41, weißt du?\n" - .string "Hey, das ist FOLTERKNECHT, sag ich dir.\p" - .string "Der Gegner wird so daran gehindert, eine\n" - .string "Attacke zweimal hintereinander\l" - .string "auszuführen.\p" - .string "Aber nun hör mir gut zu. Ich würde NIE\n" - .string "FOLTERKNECHT gegen dich einsetzen.$" + .string "That’s, like, TM41, you know?\n" + .string "Hey, it’s TORMENT, you hearing me?\p" + .string "Like, it won’t let the other guy\n" + .string "use the same move twice in a row, see?\p" + .string "Hey, now, you listen here, like,\n" + .string "I’m not laying a torment on you!$" SlateportCity_ContestHall_Text_17CEF3:: @ 817CEF3 - .string "MC: Oh, meine Güte!\n" - .string "Ist das nicht ein Dandy von POKéMON?\p" - .string "Bitte! Tritt näher und nimm an unserem\n" - .string "großartigen WETTBEWERB teil!\p" - .string "Ich bin sicher, du wirst hervorragend\n" - .string "abschneiden. Meine Augen täuschen\l" - .string "mich nie!$" + .string "MC: Oh, my, my!\n" + .string "Now isn’t that a dandy of a POKéMON?\p" + .string "Please! Do step right up and take\n" + .string "part in our splendid CONTESTS!\p" + .string "You’ll do well! I’m sure of it!\n" + .string "My eyes have never failed me!$" SlateportCity_ContestHall_Text_17CFA7:: @ 817CFA7 - .string "JUROR: Hallo, du da!\n" - .string "Wie ich sehe, bist du ein TRAINER!\p" - .string "Nun, dann kannst du es dir eigentlich\n" - .string "nicht leisten, einen WETTBEWERB zu\l" - .string "verpassen!\p" - .string "Hol dir in WIESENFLUR eine\n" - .string "WETTBEWERBSKARTE und nimm teil!$" + .string "JUDGE: Well, hello there!\n" + .string "I see that you’re a TRAINER!\p" + .string "Then, it just wouldn’t do for you\n" + .string "to miss a POKéMON CONTEST!\p" + .string "Get a CONTEST PASS in VERDANTURF\n" + .string "CITY and enter anytime!$" SlateportCity_ContestHall_Text_17D054:: @ 817D054 - .string "Showtime!\n" - .string "Womit soll ich beginnen?$" + .string "It’s appeal time!\n" + .string "What should I lead with?$" SlateportCity_ContestHall_Text_17D07F:: @ 817D07F - .string "Der Auftritt meines POKéMON fand\n" - .string "nicht viel Beachtung...\p" - .string "Männo, der Juror hat wohl Tomaten auf\n" - .string "den Augen!?!$" + .string "They didn’t pay much attention to\n" + .string "my POKéMON’s appeal...\p" + .string "Humph, that JUDGE, he doesn’t know\n" + .string "a good thing when he sees it.$" SlateportCity_ContestHall_Text_17D0F9:: @ 817D0F9 - .string "Oh, hi! Du musst ein wirklich großer Fan\n" - .string "sein, wenn du so nah herangehst.\p" - .string "Ich belohne deinen Enthusiasmus mit\n" - .string "einem weisen Rat.\p" - .string "Wenn eine Attacke wirklich gut gelingt,\n" - .string "ist das Publikum begeistert.\p" - .string "Wenn alle begeistert sind, hat das\n" - .string "POKéMON einen tollen Auftritt gehabt.\p" - .string "Dann weißt du, dass etwas Tolles\n" - .string "passieren wird!$" + .string "Oh, hi! You must be a serious fan to get\n" + .string "this close to the action.\p" + .string "I’ll reward your enthusiasm with this\n" + .string "sage advice.\p" + .string "If a move goes over really well,\n" + .string "the audience will get excited.\p" + .string "The POKéMON that makes its appeal\n" + .string "right when everyone’s excited...\p" + .string "Well, you’d think something good has\n" + .string "to happen!$" SlateportCity_ContestHall_Text_17D222:: @ 817D222 - .string "Ich kann es einfach nicht! Ich bin\n" - .string "nervöser als mein POKéMON.\p" - .string "Ich zittere und mein Herz rast!$" + .string "I can’t do this! I’m more freaked out\n" + .string "than my POKéMON.\p" + .string "I’m shivering and my heart is racing!$" SlateportCity_ContestHall_Text_17D27F:: @ 817D27F - .string "Ein Kampf und ein WETTBEWERB sind nicht\n" - .string "dasselbe, aber sie sind sich ähnlich.\p" - .string "Du musst hart arbeiten und an die\n" - .string "POKéMON, die du aufziehst, glauben.$" + .string "A battle and a CONTEST aren’t the\n" + .string "same, but they are alike, too.\p" + .string "You need to work hard and believe\n" + .string "in the POKéMON you’ve raised.$" SlateportCity_ContestHall_Text_17D300:: @ 817D300 - .string "Dieses POKéMON scheint an der Spitze\n" - .string "zu stehen, was?\p" - .string "Ein POKéMON, das im zweiten Durchgang\n" - .string "gut abschneidet, wird im Wettbewerb\l" - .string "viel ruhiger auftreten.$" + .string "That POKéMON looks like it’s on top\n" + .string "of its game, huh?\p" + .string "A POKéMON that does good in the\n" + .string "secondary judging seems to be more\l" + .string "relaxed when it’s doing appeals.$" SlateportCity_ContestHall_Text_17D39A:: @ 817D39A - .string "Guck dir mal diese jämmerlichen\n" - .string "Gestalten an.\p" - .string "Mein POKéMON ist viel, viel besser als\n" - .string "dieser Haufen!$" + .string "Will you look at that sorry sight?\p" + .string "Heh, my POKéMON’s absolutely better\n" + .string "than that lot!$" SlateportCity_ContestHall_Text_17D3F0:: @ 817D3F0 - .string "Geht es dir nicht auch so? Wenn ein\n" - .string "POKéMON all seine Energie in eine\l" - .string "Attacke steckt, bewegt mich das enorm.$" + .string "Don’t you get the urge to move with\n" + .string "POKéMON if they’re putting on an\l" + .string "energetic appeal?$" SlateportCity_ContestHall_Text_17D447:: @ 817D447 - .string "POKéMON WETTBEWERBE\n" - .string "BÜHNE für die HYPER-KLASSE!$" + .string "POKéMON CONTESTS\n" + .string "HYPER RANK STAGE!$" diff --git a/data/text/maps/SlateportCity_ContestLobby.inc b/data/text/maps/SlateportCity_ContestLobby.inc index 24d4c8529..7c32cd8ac 100644 --- a/data/text/maps/SlateportCity_ContestLobby.inc +++ b/data/text/maps/SlateportCity_ContestLobby.inc @@ -1,29 +1,27 @@ SlateportCity_ContestLobby_Text_17C937:: @ 817C937 - .string "Ich möchte ein POKéMON aufziehen, das\n" - .string "im Kampf und im WETTBEWERB\l" - .string "“unbesiegbar” ist.\p" - .string "Es ist schon verwirrend, herauszu-\n" - .string "finden, welche Attacken es lernen soll.$" + .string "I want to raise a POKéMON that’s\n" + .string "the ultimate in “great” for both\l" + .string "battles and CONTESTS.\p" + .string "It’s vexing, trying to figure out\n" + .string "which moves I should make it learn.$" SlateportCity_ContestLobby_Text_17C9D5:: @ 817C9D5 - .string "Haben einige deiner Freunde BEEREN?\p" - .string "Du kannst den BEERENMIXER benutzen\n" - .string "und zusammen mit ihnen {POKEBLOCK}\l" - .string "herstellen.\p" - .string "Das macht sehr viel Spaß!$" + .string "Do any of your friends have any\n" + .string "BERRIES?\p" + .string "You can use that BERRY BLENDER and\n" + .string "make {POKEBLOCK}S with your friends!\p" + .string "You should try it - it’s a lot of fun!$" SlateportCity_ContestLobby_Text_17CA67:: @ 817CA67 - .string "Ich habe zwei. Du kannst eine haben.$" + .string "I have two, so you can have one!$" SlateportCity_ContestLobby_Text_17CA88:: @ 817CA88 - .string "Stelle {POKEBLOCK} her und verstaue sie\n" - .string "darin.\p" - .string "Wenn ihr einen {POKEBLOCK} herstellt, muss\n" - .string "jeder eine andere BEERE einsetzen.$" + .string "Make {POKEBLOCK}S and put them in there.\p" + .string "When you make a {POKEBLOCK}, everyone\n" + .string "has to put in a different BERRY.$" SlateportCity_ContestLobby_Text_17CAEC:: @ 817CAEC - .string "Wenn du einen WETTBEWERB gewinnst,\n" - .string "wird ein Bild deines POKéMON an die\l" - .string "Wand gehängt.\p" - .string "Das Porträt deines POKéMON wird\n" - .string "außerdem mit deinem Namen versehen.$" + .string "If you win a CONTEST, they put up a\n" + .string "poster of your POKéMON on the wall.\p" + .string "It will have a portrait of your\n" + .string "POKéMON and both your names.$" diff --git a/data/text/maps/SlateportCity_Harbor.inc b/data/text/maps/SlateportCity_Harbor.inc index 930375a5f..187dfe07c 100644 --- a/data/text/maps/SlateportCity_Harbor.inc +++ b/data/text/maps/SlateportCity_Harbor.inc @@ -1,154 +1,148 @@ SlateportCity_Harbor_Text_17FA0A:: @ 817FA0A - .string "Verzeihung?\n" - .string "Du suchst nach einem Schiff?\p" - .string "Oh, das tut mir Leid, aber die Fähre\n" - .string "steht momentan nicht zur Verfügung...$" + .string "I beg your pardon?\n" + .string "You’re looking for a ship?\p" + .string "I’m sorry, the ferry service isn’t\n" + .string "available at present...$" SlateportCity_Harbor_Text_17FA73:: @ 817FA73 - .string "Hallo! Möchtest du mit der Fähre fahren?\n" - .string "Zeigst du mir bitte dein TICKET?$" + .string "Hello, are you here for the ferry?\n" + .string "May I see your TICKET?$" SlateportCity_Harbor_Text_17FAAD:: @ 817FAAD - .string "{PLAYER} hat kein TICKET...\p" - .string "Das tut mir schrecklich Leid.\p" - .string "Nur mit einem TICKET kannst du mit der\n" - .string "Fähre fahren.$" + .string "{PLAYER} doesn’t have the TICKET...\p" + .string "I’m terribly sorry.\p" + .string "You must have a TICKET to board\n" + .string "the ferry.$" SlateportCity_Harbor_Text_17FB0A:: @ 817FB0A - .string "{PLAYER} zückt das TICKET.\p" - .string "Perfekt! Damit kannst du an Bord!\p" - .string "Und wo soll die Reise hingehen?$" + .string "{PLAYER} flashed the TICKET.\p" + .string "Perfect! That’s all you need!\p" + .string "And where would you like to go?$" SlateportCity_Harbor_Text_17FB5F:: @ 817FB5F - .string "Bitte komm später noch einmal wieder!$" + .string "Please sail with us another time!$" SlateportCity_Harbor_Text_17FB81:: @ 817FB81 - .string "Nach SEEGRASULB CITY?$" + .string "LILYCOVE CITY it is, then!$" SlateportCity_Harbor_Text_17FB9C:: @ 817FB9C - .string "Zum DUELLTURM?$" + .string "BATTLE TOWER it is, then!$" SlateportCity_Harbor_Text_17FBB6:: @ 817FBB6 - .string "Bitte komm an Bord. Wir legen bald ab.$" + .string "Please board the ferry and wait for\n" + .string "departure.$" SlateportCity_Harbor_Text_17FBE5:: @ 817FBE5 - .string "Und wo soll die Reise hingehen?$" + .string "Then, where would you like to go?$" SlateportCity_Harbor_Text_17FC07:: @ 817FC07 - .string "Eine Reise zum Meeresboden...\n" - .string "Ich frage mich, wie es dort wohl ist?\p" - .string "Eines Tages möchte ich auch einmal so\n" - .string "tief unter Wasser reisen.$" + .string "A journey to the bottom of the sea...\n" + .string "I wonder what it’d be like?\p" + .string "I’d love to go deep underwater like\n" + .string "that some day.$" SlateportCity_Harbor_Text_17FC7C:: @ 817FC7C - .string "Ich wäre gerne mit KAPT. BRIGG auf die\n" - .string "Expedition zum Meeresboden gegangen.\p" - .string "Aber das U-Boot ist zu klein für mich.\p" - .string "Ich könnte mich ja reinquetschen, aber\n" - .string "dann hätte der KAPITÄN keinen Platz\l" - .string "mehr...$" + .string "I wanted to go with CAPT. STERN on\n" + .string "the ocean floor exploration.\p" + .string "But the sub’s too small for me.\p" + .string "If I squeezed in, there wouldn’t be\n" + .string "any room for the CAPTAIN...$" SlateportCity_Harbor_Text_17FD1C:: @ 817FD1C - .string "KAPT. BRIGG: Diese Schlägertypen...\p" - .string "Das sind die gleichen Typen, die\n" - .string "versucht haben, die DEVON-WAREN aus\l" - .string "dem MUSEUM zu stehlen.$" + .string "CAPT. STERN: Those thugs...\p" + .string "They’re the same lot who tried to rob\n" + .string "the DEVON GOODS at the MUSEUM.$" SlateportCity_Harbor_Text_17FD7D:: @ 817FD7D - .string "{EVIL_LEADER}: Ahahahahaha!!!!!\n" - .string "Du tust mir ja so Leid!\p" - .string "All die Mühen, um mir vom PYROBERG\n" - .string "bis hierher zu folgen...\p" - .string "Und nun...\n" - .string "Niemand kann uns stoppen! Niemand!!!\p" - .string "Oder willst du uns etwa in unser VER-\n" - .string "STECK in SEEGRASULB CITY folgen?\p" - .string "Ahahahahaha!!!!!$" + .string "{EVIL_LEADER}: Fwahahaha...\n" + .string "I commiserate with you!\p" + .string "All that effort you spent following\n" + .string "me here all the way from MT. PYRE.\p" + .string "But now...\n" + .string "No one can stop us! No one!\p" + .string "Or, will you follow us back to our\n" + .string "HIDEOUT in LILYCOVE CITY?\p" + .string "Fwahahahaha...$" SlateportCity_Harbor_Text_17FE60:: @ 817FE60 - .string "KAPT. BRIGG: Warum...\p" - .string "Warum sollte TEAM {EVIL_TEAM} mein TIEF-\n" - .string "SEE-FORSCHUNGSBOOT 1 stehlen wollen?\p" - .string "Sie können doch nicht hinter dem\n" - .string "schlafenden POKéMON am Meeresgrund\l" - .string "her sein...\p" - .string "Selbst wenn ich sie verfolgen würde...\n" - .string "Ich hätte keine Chance gegen sie...$" + .string "CAPT. STERN: Why...\p" + .string "Why would TEAM {EVIL_TEAM} steal my\n" + .string "SUBMARINE EXPLORER 1?\p" + .string "They can’t be after the slumbering\n" + .string "POKéMON at the bottom of the sea...\p" + .string "But even if I were to chase them,\n" + .string "I don’t stand a chance against them...$" SlateportCity_Harbor_Text_17FF35:: @ 817FF35 - .string "KAPT. BRIGG: Oh, {PLAYER}{KUN}...\p" - .string "Okay... Du konntest TEAM {EVIL_TEAM} nicht\n" - .string "aufhalten...\p" - .string "Oh, nein, mach dir bitte keine Vorwürfe!\n" - .string "Die Schuld liegt nicht bei dir.\p" - .string "Ein U-Boot zu verfolgen und aufzu-\n" - .string "halten ist für die meisten Menschen\l" - .string "unmöglich.\p" - .string "Du benötigst ein POKéMON, das weiß, wie\n" - .string "man TAUCHER ausführt...\p" - .string "Vielleicht, wenn du dich nach\n" - .string "MOOSBACH CITY begibst...\p" - .string "Dort trifft man auf viele Taucher.\n" - .string "Vielleicht kann dir einer das\l" - .string "beibringen...$" + .string "CAPT. STERN: Oh, {PLAYER}{KUN}...\p" + .string "Okay... So TEAM {EVIL_TEAM} left before you\n" + .string "could stop them...\p" + .string "Oh, no, don’t blame yourself.\n" + .string "You’re not responsible for this.\p" + .string "Trying to catch a submarine...\n" + .string "It’s impossible for most people.\p" + .string "You would need a POKéMON that knows\n" + .string "how to DIVE...\p" + .string "Perhaps if you went out to\n" + .string "MOSSDEEP CITY...\p" + .string "A lot of divers live out there, so\n" + .string "someone might teach you...$" SlateportCity_Harbor_Text_1800A0:: @ 81800A0 - .string "KAPT. BRIGG: Ein U-Boot einzuholen und\n" - .string "aufzuhalten... Das ist unmöglich.\p" - .string "Du benötigst ein POKéMON, das weiß, wie\n" - .string "man TAUCHER ausführt...\p" - .string "Vielleicht, wenn du dich nach\n" - .string "MOOSBACH CITY begibst...\p" - .string "Dort trifft man auf viele Taucher, \n" - .string "vielleicht kann dir einer das bei-\l" - .string "bringen...$" + .string "CAPT. STERN: Trying to catch a\n" + .string "submarine... It’s impossible.\p" + .string "You would need a POKéMON that knows\n" + .string "how to DIVE...\p" + .string "Perhaps if you went out to\n" + .string "MOSSDEEP CITY...\p" + .string "A lot of divers live out there, so\n" + .string "someone might teach you...$" SlateportCity_Harbor_Text_18017B:: @ 818017B - .string "KAPT. BRIGG: Oh, ja.\n" - .string "MR. BRACK kam in unsere WERFT.\p" - .string "Nun dauert es nicht mehr lange, bis wir\n" - .string "unsere Fähre fertig stellen!$" + .string "CAPT. STERN: Oh, yes.\n" + .string "MR. BRINEY came to our SHIPYARD.\p" + .string "It won’t be long now before we finish\n" + .string "making the ferry!$" SlateportCity_Harbor_Text_1801EA:: @ 81801EA - .string "KAPT. BRIGG: {PLAYER}{KUN}!\p" - .string "Wir haben die Fähre MS TIDE endlich\n" - .string "fertig gestellt.\p" - .string "Ohne die Hilfe deines Freundes MR.\n" - .string "BRACK hätten wir das nicht geschafft.\p" - .string "Bitte, nimm an einer kurzen Fahrt teil!$" + .string "CAPT. STERN: {PLAYER}{KUN}!\p" + .string "We finally finished making the ferry\n" + .string "S.S. TIDAL!\p" + .string "We couldn’t have done it without your\n" + .string "friend MR. BRINEY.\p" + .string "Please go for a short cruise on it!$" SlateportCity_Harbor_Text_18028B:: @ 818028B - .string "KAPT. BRIGG: Oh?\n" - .string "{PLAYER}{KUN}, das Item, das du da hast...\p" - .string "Das ist ein SCANNER! Der würde uns\n" - .string "sicher bei unseren Forschungen helfen.\p" - .string "{PLAYER}{KUN}, würdest du ihn gegen etwas\n" - .string "anderes eintauschen?\p" - .string "Zum Beispiel gegen einen ABYSSZAHN\n" - .string "oder eine ABYSSPLATTE?$" + .string "CAPT. STERN: Oh?\n" + .string "{PLAYER}{KUN}, that item you have...\p" + .string "That’s a SCANNER! That would sure\n" + .string "help us on our explorations.\p" + .string "{PLAYER}{KUN}, would you trade your\n" + .string "SCANNER for something?\p" + .string "Like say a DEEPSEATOOTH or a\n" + .string "DEEPSEASCALE that I have?$" SlateportCity_Harbor_Text_180360:: @ 8180360 - .string "KAPT. BRIGG: Bist du sicher? Aber damit\n" - .string "kannst du doch nichts anfangen...\p" - .string "Also gut. Wenn du aber den SCANNER doch\n" - .string "noch gegen etwas anderes tauschen\l" - .string "willst, dann lass es mich wissen!$" + .string "CAPT. STERN: Are you certain?\n" + .string "It’s useless to you, {PLAYER}{KUN}...\p" + .string "Well, okay, then. If you want to trade\n" + .string "your SCANNER, let me know.$" SlateportCity_Harbor_Text_1803DD:: @ 81803DD - .string "KAPT. BRIGG: Du möchtest den\n" - .string "ABYSSZAHN dafür haben?$" + .string "CAPT. STERN: So you’ll trade it for\n" + .string "my DEEPSEATOOTH?$" SlateportCity_Harbor_Text_180412:: @ 8180412 - .string "KAPT. BRIGG: Du möchtest die\n" - .string "ABYSSPLATTE dafür haben?$" + .string "CAPT. STERN: So you’ll trade it for\n" + .string "my DEEPSEASCALE?$" SlateportCity_Harbor_Text_180447:: @ 8180447 - .string "KAPT. BRIGG: Was hättest du gerne?$" + .string "CAPT. STERN: Which one do you want?$" SlateportCity_Harbor_Text_18046B:: @ 818046B - .string "{PLAYER} gibt KAPT. BRIGG den SCANNER.$" + .string "{PLAYER} handed the SCANNER to\n" + .string "CAPT. STERN.$" SlateportCity_Harbor_Text_180491:: @ 8180491 - .string "KAPT. BRIGG: Danke, {PLAYER}{KUN}!\n" - .string "Das wird unsere Forschungen weiter-\l" - .string "bringen!$" + .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" + .string "This will help our research a lot!$" diff --git a/data/text/maps/SlateportCity_House1.inc b/data/text/maps/SlateportCity_House1.inc index 1a5f503dd..c711aec2f 100644 --- a/data/text/maps/SlateportCity_House1.inc +++ b/data/text/maps/SlateportCity_House1.inc @@ -1,47 +1,47 @@ SlateportCity_House1_Text_17D46A:: @ 817D46A - .string "Hallo! Ich bin der NAMENBEWERTER!\n" - .string "Ich bin das Orakel der Namen!\p" - .string "Ich würde mich freuen, die Kosenamen\n" - .string "deiner POKéMON bewerten zu dürfen.$" + .string "Hi, hi! I’m the NAME RATER!\n" + .string "I’m the fortune-teller of names!\p" + .string "I shall be pleased to rate your\n" + .string "POKéMON’s nickname.$" SlateportCity_House1_Text_17D4DB:: @ 817D4DB - .string "Für welches POKéMON soll ich den\n" - .string "Kosenamen bewerten?$" + .string "Which POKéMON’s nickname should\n" + .string "I divine?$" SlateportCity_House1_Text_17D505:: @ 817D505 - .string "Hmmm... {STR_VAR_1}, nicht wahr? Da hast\n" - .string "du aber einen schönen Namen verliehen.\p" - .string "Aber! Was hältst du davon, wenn ich ihm\n" - .string "einen etwas besseren Namen gebe?$" + .string "Hmmm... {STR_VAR_1}, is it? That is\n" + .string "quite a fine name you bestowed.\p" + .string "But! What say you, if I were to\n" + .string "suggest a slightly better name?$" SlateportCity_House1_Text_17D580:: @ 817D580 - .string "Sehr schön! Und wie soll der neue\n" - .string "Kosename lauten?$" + .string "Ah, good. Then, what shall the new\n" + .string "nickname be?$" SlateportCity_House1_Text_17D5B0:: @ 817D5B0 - .string "Fertig! Von nun an heißt dein POKéMON\n" - .string "{STR_VAR_1}!\p" - .string "Das ist ein besserer Name als der\n" - .string "vorherige. Welch ein Glück für dich!$" + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It is a better name than before!\n" + .string "How fortunate for you!$" SlateportCity_House1_Text_17D61E:: @ 817D61E - .string "Ich verstehe.\n" - .string "Komm mich mal wieder besuchen.$" + .string "I see.\n" + .string "Do come visit again.$" SlateportCity_House1_Text_17D63A:: @ 817D63A - .string "Fertig! Von nun an heißt dein POKéMON\n" - .string "{STR_VAR_1}!\p" - .string "Eigentlich unterscheidet sich der Name\n" - .string "nicht von dem vorherigen, und doch ist\l" - .string "er um einiges besser! Welch ein Glück!$" + .string "Done! From now on, this POKéMON\n" + .string "shall be known as {STR_VAR_1}!\p" + .string "It looks no different from before,\n" + .string "and yet, this is vastly superior!\l" + .string "How fortunate for you!$" SlateportCity_House1_Text_17D6CC:: @ 817D6CC - .string "Hmmm... {STR_VAR_1}!\p" - .string "Das ist ein wundervoller Kosename!\n" - .string "Ein Name ohne Fehl und Tadel!\p" - .string "Du tust gut daran, {STR_VAR_1} auch\n" - .string "weiterhin liebevoll zu behandeln!$" + .string "Hmmm... {STR_VAR_1} it is!\p" + .string "This is a magnificent nickname!\n" + .string "It is impeccably beyond reproach!\p" + .string "You’ll do well to cherish your\n" + .string "{STR_VAR_1} now and beyond.$" SlateportCity_House1_Text_17D752:: @ 817D752 - .string "Mhm, mhm...\n" - .string "Das ist eigentlich ein EI!$" + .string "Now, now.\n" + .string "That is merely an EGG!$" diff --git a/data/text/maps/SlateportCity_House2.inc b/data/text/maps/SlateportCity_House2.inc index 360e4c1a7..c3d8346bc 100644 --- a/data/text/maps/SlateportCity_House2.inc +++ b/data/text/maps/SlateportCity_House2.inc @@ -1,17 +1,16 @@ SlateportCity_House2_Text_1804CF:: @ 81804CF - .string "Mein POKéMON hat ein HASTIGES Wesen.\p" - .string "Seine INITIATIVE ist im Vergleich\n" - .string "zu meinen anderen POKéMON höher.\p" - .string "Vielleicht hat ihr Wesen etwas mit den\n" - .string "Statusvorteilen der POKéMON zu tun.$" + .string "My POKéMON has a HASTY nature.\p" + .string "It has higher SPEED compared to my\n" + .string "other POKéMON.\p" + .string "Maybe their nature has something to\n" + .string "do with the stat gains of POKéMON.$" SlateportCity_House2_Text_180567:: @ 8180567 - .string "Um an dem WETTBEWERB teilnehmen zu\n" - .string "können, brauchst du eine\l" - .string "WETTBEWERBSKARTE.\p" - .string "Die bekommst du leicht. Jeder, der ein\n" - .string "POKéMON hat, bekommt eine.$" + .string "You need a CONTEST PASS to enter a\n" + .string "CONTEST.\p" + .string "It’s easy to get. They give it to\n" + .string "anyone who has POKéMON.$" SlateportCity_House2_Text_1805CD:: @ 81805CD - .string "Oh, eine WETTBEWERBSKARTE!\n" - .string "Bist du auch ein Bewerber?$" + .string "Oh, a CONTEST PASS!\n" + .string "You’re going to be a contestant?$" diff --git a/data/text/maps/SlateportCity_Mart.inc b/data/text/maps/SlateportCity_Mart.inc index 8c09f7874..b5243d406 100644 --- a/data/text/maps/SlateportCity_Mart.inc +++ b/data/text/maps/SlateportCity_Mart.inc @@ -1,11 +1,11 @@ SlateportCity_Mart_Text_180730:: @ 8180730 - .string "Der MARKT bietet einige interessante\n" - .string "Merchandising-Artikel an.\p" - .string "Aber einige Sachen wirst du nur in einem\n" - .string "POKéMON-SUPERMARKT finden.$" + .string "The MARKET does have some interesting\n" + .string "merchandise.\p" + .string "But there are some items you can only\n" + .string "get at a POKé MART.$" SlateportCity_Mart_Text_18079D:: @ 818079D - .string "Ein SUPERBALL eignet sich besser zum\n" - .string "Fangen von POKéMON als ein POKéBALL.\p" - .string "Hiermit sollte ich in der Lage sein, das\n" - .string "begehrte POKéMON zu überlisten.$" + .string "A GREAT BALL is better than a POKé BALL\n" + .string "at catching POKéMON.\p" + .string "With this, I should be able to get that\n" + .string "elusive POKéMON...$" diff --git a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc b/data/text/maps/SlateportCity_OceanicMuseum_1F.inc index 5087f3278..0d3d1eec6 100644 --- a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/text/maps/SlateportCity_OceanicMuseum_1F.inc @@ -1,164 +1,157 @@ SlateportCity_OceanicMuseum_1F_Text_17E18D:: @ 817E18D - .string "Willkommen im OZEANMUSEUM.\p" - .string "Der Eintritt kostet ¥50.\n" - .string "Hast du Interesse?$" + .string "Welcome to the OCEANIC MUSEUM.\p" + .string "The entrance fee is ¥50.\n" + .string "Would you like to enter?$" SlateportCity_OceanicMuseum_1F_Text_17E1DE:: @ 817E1DE - .string "Viel Vergnügen!$" + .string "Please enjoy yourself.$" SlateportCity_OceanicMuseum_1F_Text_17E1F5:: @ 817E1F5 - .string "Oh. Tut mir Leid, aber du hast\n" - .string "anscheinend nicht genug Geld bei dir.$" + .string "Oh? I’m sorry, but you don’t seem to\n" + .string "have enough money.$" SlateportCity_OceanicMuseum_1F_Text_17E22D:: @ 817E22D - .string "Oh. Du gehörst zu der Gruppe, die gerade\n" - .string "hineingegangen ist?\p" - .string "Sie sind alle schon drin. Beeil dich,\n" - .string "sonst verlierst du die Gruppe.$" + .string "Oh? You’re with that group that\n" + .string "went in earlier?\p" + .string "You’re the only one who’s late.\n" + .string "You’d better go catch up to them!$" UnknownString_817E2A0: @ 817E2A0 - .string "Bitte komm ein anderes Mal wieder!$" + .string "Please visit another time!$" SlateportCity_OceanicMuseum_1F_Text_17E2BB:: @ 817E2BB - .string "Wir, TEAM {EVIL_TEAM}, bestehen zum Besten\n" - .string "für alle!$" + .string "We, TEAM {EVIL_TEAM}, exist for the good\n" + .string "of all!$" SlateportCity_OceanicMuseum_1F_Text_17E2E3:: @ 817E2E3 - .string "Uns wurde befohlen, uns hier zu\n" - .string "versammeln. Das taten wir, aber...\p" - .string "Unser BOSS, der Galgenvogel, ist nicht\n" - .string "hier.$" + .string "We were told to assemble here, so\n" + .string "we did, but...\p" + .string "Our BOSS, the lynchpin, isn’t here.$" SlateportCity_OceanicMuseum_1F_Text_17E338:: @ 817E338 - .string "Wenn ich diese ganzen Sachen an mich\n" - .string "reißen würde, wäre ich dann reich?$" + .string "If I ripped off the stuff here,\n" + .string "would it make me rich?$" SlateportCity_OceanicMuseum_1F_Text_17E36F:: @ 817E36F - .string "Was ich hier lerne, kann ich für meine\n" - .string "ruchlosen Taten gut gebrauchen...$" + .string "What I learn here, I can put to use on\n" + .string "nefarious deeds...$" SlateportCity_OceanicMuseum_1F_Text_17E3A9:: @ 817E3A9 - .string "Wenn dieser Idiot die Sache in\n" - .string "METAROST CITY nicht vermasselt hätte,\l" - .string "wären wir jetzt nicht hier.$" + .string "If our goons didn’t bungle things\n" + .string "in RUSTBORO, we wouldn’t be here!$" SlateportCity_OceanicMuseum_1F_Text_17E3ED:: @ 817E3ED - .string "Ich hatte keine ¥50, daher habe ich\n" - .string "Ewigkeiten gebraucht, an der Rezeption\l" - .string "vorbeizukommen.$" + .string "I didn’t have ¥50, so it took a long\n" + .string "time getting by the receptionist.$" SlateportCity_OceanicMuseum_1F_Text_17E434:: @ 817E434 - .string "Ich möchte etwas über das Meer lernen\n" - .string "und dieses Wissen in Kämpfen einsetzen.$" + .string "I want to learn about the sea and\n" + .string "use that knowledge for battling.$" SlateportCity_OceanicMuseum_1F_Text_17E477:: @ 817E477 - .string "Mir wird ganz schwindelig und rühr-\n" - .string "selig, wenn ich das Meer erblicke!\p" - .string "Für mich ist KAPT. BRIGG das absolute\n" - .string "Vorbild!$" + .string "I get all giddy and gooey when I\n" + .string "see the sea!\p" + .string "For me, CAPT. STERN is the number\n" + .string "one role model!$" SlateportCity_OceanicMuseum_1F_Text_17E4D7:: @ 817E4D7 - .string "Das Meer ist erbarmungslos rau und\n" - .string "unendlich tief...\p" - .string "In ihm müssen viele POKéMON leben, die\n" - .string "wir bisher noch nicht kennen.$" + .string "The sea is vast without end, and\n" + .string "infinitely deep...\p" + .string "There must be many POKéMON that we\n" + .string "don’t know about.$" SlateportCity_OceanicMuseum_1F_Text_17E540:: @ 817E540 - .string "Ich möchte ein POKéMON aus dem Meer\n" - .string "haben.\p" - .string "Wenn man das umarmt, ist es bestimmt\n" - .string "schön kalt und wunderbar glitschig.$" + .string "I want a sea POKéMON.\p" + .string "I think it would feel cool and nice\n" + .string "to hug.$" SlateportCity_OceanicMuseum_1F_Text_17E582:: @ 817E582 - .string "Aiyeeh!\n" - .string "Was machst du hier?\p" - .string "Ich? Ich bin vom TEAM {EVIL_TEAM}. Du hast\n" - .string "mich in den Boden gestampft. Erinnerst\l" - .string "du dich?\p" - .string "Hier, das ist für dich!\n" - .string "Vergeben und vergessen!$" + .string "Aiyeeeh!\n" + .string "What are you doing here?\p" + .string "Me? I’m the TEAM {EVIL_TEAM} member you\n" + .string "thumped before, remember?\p" + .string "Here, take this!\n" + .string "You have to forgive me!$" SlateportCity_OceanicMuseum_1F_Text_17E606:: @ 817E606 - .string "Au, verdammt!\n" - .string "Du hast unsere Pläne zunichte gemacht!\p" - .string "Ich wollte als Ausgleich etwas mitgehen\n" - .string "lassen, aber...\p" - .string "Warte!\n" - .string "Du bekommst deine Belohnung auch noch!$" + .string "Aww, darn it!\n" + .string "You so screwed up our plans!\p" + .string "I was going to rip off something\n" + .string "to make up for it, but...\p" + .string "Just you wait!\n" + .string "You’ll get yours one day!$" SlateportCity_OceanicMuseum_1F_Text_17E695:: @ 817E695 - .string "Oooch, komm schon!\n" - .string "Nimm es und lass mich gehen!$" + .string "Awww, come on!\n" + .string "You have to take this and let me go!$" SlateportCity_OceanicMuseum_1F_Text_17E6C9:: @ 817E6C9 - .string "Eine blaue Flüssigkeit bewegt sich\n" - .string "spiralförmig in einem Glasgefäß.\p" - .string "“Dies ist ein Experiment, das einen\n" - .string "künstlichen WHIRLPOOL mit Hilfe von\l" - .string "Wind erzeugt.”$" + .string "A blue fluid is spiraling inside a\n" + .string "glass vessel.\p" + .string "“This is an experiment to create a\n" + .string "WHIRLPOOL artificially using wind.”$" SlateportCity_OceanicMuseum_1F_Text_17E741:: @ 817E741 - .string "Ein roter Ball hüpft in dem Glasgefäß\n" - .string "auf und ab.\p" - .string "“Dies ist ein Experiment, das eine\n" - .string "künstliche KASKADE mit Hilfe des\l" - .string "Ballauftriebs erzeugt.”$" + .string "A red ball is bobbing up and down\n" + .string "inside a glass vessel.\p" + .string "“This is an experiment simulating a\n" + .string "WATERFALL using the ball’s buoyancy.”$" SlateportCity_OceanicMuseum_1F_Text_17E7C4:: @ 817E7C4 - .string "Dies ist eine Probe vom Meeresboden.\p" - .string "“Über viele Jahre haben sich die Spuren\n" - .string "allen Lebens als Sedimente auf dem\l" - .string "Grund des Meeres abgelagert.\p" - .string "Analysen dieser Proben geben einen\n" - .string "Einblick in längst vergangenes Leben.”$" + .string "It’s a sample of soil from the ocean\n" + .string "floor.\p" + .string "“Over many years, the remains of\n" + .string "life-forms settle at the bottom of\l" + .string "the sea making sedimentary layers.\p" + .string "“By analyzing these layers, the\n" + .string "ancient past is revealed.”$" SlateportCity_OceanicMuseum_1F_Text_17E892:: @ 817E892 - .string "Dies ist eine Probe vom Sand der Küste.\p" - .string "“Die Gesteinsschichten der Berge\n" - .string "wurden im Laufe der Jahre durch Wasser\l" - .string "abgetragen und am Boden abgelagert.\p" - .string "Nun sind sie nur noch kleine Körnchen,\n" - .string "die den Sand an der Küste bilden.”$" + .string "It’s a sample of beach sand.\p" + .string "“Stones from mountains are washed\n" + .string "down by rivers where they are\l" + .string "chipped and ground down.\p" + .string "“They are reduced to grains and end\n" + .string "up as sand on beaches.”$" SlateportCity_OceanicMuseum_1F_Text_17E944:: @ 817E944 - .string "“MEERESKUNDE FAKT 1”\n" - .string "Warum ist das Wasser im Meer blau?\p" - .string "“Licht setzt sich aus vielen\n" - .string "Farben zusammen.\p" - .string "Scheint das Licht durch Wasser, so\n" - .string "gehen einige Farben verloren.\p" - .string "Der Blauanteil des Lichts bleibt aber\n" - .string "erhalten, das Wasser erscheint blau.”$" + .string "“OCEANIC MINI FACT 1\n" + .string "Why is seawater blue?\p" + .string "“Light is composed of many colors.\p" + .string "“When light passes through water,\n" + .string "most kinds of light lose color.\p" + .string "“However, blue light retains its\n" + .string "color, making the sea appear blue.”$" SlateportCity_OceanicMuseum_1F_Text_17EA19:: @ 817EA19 - .string "“MEERESKUNDE FAKT 2”\n" - .string "Warum ist das Meer salzig?\p" - .string "“Meerwasser enthält gelöste Salzionen\n" - .string "in Form von Natrium und Chlorid.\p" - .string "Diese Ionen wurden durch den Regen\n" - .string "aus Gesteinsschichten herausgespült.\p" - .string "Die Konzentration des aufgelösten\n" - .string "Salzes macht das Meer salzig.”$" + .string "“OCEANIC MINI FACT 2\n" + .string "Why is the sea salty?\p" + .string "“Seawater contains dissolved salt in\n" + .string "the form of sodium and chlorine ions.\p" + .string "“These ions leach out of rocks and are\n" + .string "carried out to sea by rain.\p" + .string "“The concentration of dissolved salt\n" + .string "makes the sea salty.”$" SlateportCity_OceanicMuseum_1F_Text_17EB0D:: @ 817EB0D - .string "“MEERESKUNDE FAKT 3”\n" - .string "Was ist größer? Das Meer oder das Land?\p" - .string "“Die Erde ist zu 70% von Wasser\n" - .string "bedeckt, der Rest ist Land.\p" - .string "Das Meer ist also mehr als doppelt\n" - .string "so groß wie das Land.”$" + .string "“OCEANIC MINI FACT 3\n" + .string "Which is bigger? The sea or land?\p" + .string "“The sea covers about 70% of the\n" + .string "planet, and the rest is land.\p" + .string "“The sea is therefore more than twice\n" + .string "the size of land.”$" SlateportCity_OceanicMuseum_1F_Text_17EBBC:: @ 817EBBC - .string "Das ist ein Fossil mit vielen Furchen.\p" - .string "“Das Erdreich des Meeresbodens wird\n" - .string "durch die Gezeiten abgetragen.\p" - .string "Die Bewegungen des Wassers zeichnen\n" - .string "Rillen und Wellen in den Meeresboden.\p" - .string "Wenn der Meeresboden versteinert, wird\n" - .string "ein Bodenrelief sichtbar.”$" + .string "It’s a fossil with wavy ridges on it.\p" + .string "“Soil on the ocean floor gets scoured\n" + .string "by the tide.\p" + .string "“The flowing seawater marks the soil\n" + .string "with small ridges and valleys.\p" + .string "“If this soil becomes fossilized, it is\n" + .string "called a ripple mark.”$" SlateportCity_OceanicMuseum_1F_Text_17EC98:: @ 817EC98 - .string "Eine seltsame Vorrichtung rotiert unter\n" - .string "einer Glaskuppel.\p" - .string "Vielleicht misst sie die Tiefe von\n" - .string "irgendetwas...$" + .string "A strange machine is rotating under\n" + .string "a glass dome.\p" + .string "Maybe it’s for measuring the depth\n" + .string "of something...$" diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc b/data/text/maps/SlateportCity_OceanicMuseum_2F.inc index 9f5c3eeab..a3c624f0c 100644 --- a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/text/maps/SlateportCity_OceanicMuseum_2F.inc @@ -1,190 +1,176 @@ SlateportCity_OceanicMuseum_2F_Text_17ECFD:: @ 817ECFD - .string "Ja? Wenn du BRIGG suchst... Der\n" - .string "bin ich.\p" - .string "Ah! Das müssen die Stücke sein, die ich\n" - .string "bei MR. TRUMM von DEVON bestellt habe.\p" - .string "Danke schön! Das ist großartig!\n" - .string "Nun können wir unsere Expedition\l" - .string "vorbereiten.$" + .string "Yes? If you’re looking for STERN,\n" + .string "that would be me.\p" + .string "Ah! That must be the part I\n" + .string "ordered from MR. STONE of DEVON.\p" + .string "Thank you! That’s great!\n" + .string "We can prepare for our expedition now.$" SlateportCity_OceanicMuseum_2F_Text_17EDAE:: @ 817EDAE - .string "Hähähähä! Wartet! Das ist doch viel zu\n" - .string "schwer für euch! Wir nehmen das an uns!$" + .string "Hehehe, hold it!\n" + .string "We’ll take those parts!$" SlateportCity_OceanicMuseum_2F_Text_17EDD7:: @ 817EDD7 - .string "KAPT. BRIGG: W... Was?\n" - .string "Wer seid ihr?$" + .string "CAPT. STERN: Wh-what?\n" + .string "Who are you people?$" SlateportCity_OceanicMuseum_2F_Text_17EE01:: @ 817EE01 - .string "Wir sind TEAM {EVIL_TEAM}!\p" - .string "Unser BOSS will diese Dinge haben!\n" - .string "Also hört auf zu labern und lasst die\l" - .string "Teile rüberwachsen!$" + .string "We’re TEAM {EVIL_TEAM}!\p" + .string "Our BOSS wants those parts!\n" + .string "Shut your yap and fork them over!$" SlateportCity_OceanicMuseum_2F_Text_17EE4E:: @ 817EE4E - .string "Oooaaah!\n" - .string "Geschlagen von einem KIND!$" + .string "Awaaaah!\n" + .string "A kid beat me!$" SlateportCity_OceanicMuseum_2F_Text_17EE66:: @ 817EE66 - .string "Oh, Mann! Was für ein Desaster...\n" - .string "Der BOSS wird verdammt wütend sein...$" + .string "Oh, man, what a disaster...\n" + .string "The BOSS is going to be furious...$" SlateportCity_OceanicMuseum_2F_Text_17EEA5:: @ 817EEA5 - .string "Pah, du Waschlappen!\n" - .string "Ich werde das Ding schon schaukeln!$" + .string "Humph, sniveling wimp!\n" + .string "Let me take care of this!$" SlateportCity_OceanicMuseum_2F_Text_17EED6:: @ 817EED6 - .string "Was?!?\n" - .string "Ich habe auch verloren?!?$" + .string "What?!\n" + .string "I lost, too!$" SlateportCity_OceanicMuseum_2F_Text_17EEEA:: @ 817EEEA - .string "Und nun? Wenn wir die Stücke nicht\n" - .string "bekommen, können wir uns auf etwas\l" - .string "gefasst machen!\p" - .string "Argh, ich hatte nicht damit gerechnet,\n" - .string "dass ein nervendes Kind meine Nerven\l" - .string "nervt.$" + .string "Now what? If we don’t get the parts,\n" + .string "we’re in for it!\p" + .string "Arrgh, I didn’t count on being meddled\n" + .string "with by some meddling kid!$" SlateportCity_OceanicMuseum_2F_Text_17EF62:: @ 817EF62 - .string "Ich bin gekommen, um zu sehen, warum ihr\n" - .string "so lange braucht. Und was sehe ich? Ihr\l" - .string "Idioten lasst euch von einem kleinen\l" - .string "Kind die Suppe versalzen!$" + .string "I came to see what was taking so\n" + .string "long to snatch some parts, and you\l" + .string "simps are held up by a mere child?$" SlateportCity_OceanicMuseum_2F_Text_17EFC9:: @ 817EFC9 - .string "Ich bin ADRIAN vom TEAM AQUA.\p" - .string "Kannst du mir verraten, warum du dich in\n" - .string "die ehrbaren Pläne von TEAM AQUA ein-\l" - .string "mischst?\p" - .string "POKéMON, Menschen - alles Leben\n" - .string "basiert auf den Kräften des Meeres.\p" - .string "Daher setzt TEAM AQUA sich für die\n" - .string "Ausweitung des Meeres ein.\p" - .string "Meinst du nicht auch, dass wir uns eine\n" - .string "großartige Aufgabe gestellt haben?\p" - .string "Mhm...\n" - .string "Du bist wahrscheinlich noch zu klein.\p" - .string "Du kannst unsere Ideale einfach noch\n" - .string "nicht verstehen.\p" - .string "Aber: Wenn du dich jemals wieder gegen\n" - .string "uns stellst, wirst du die Konsequenzen\l" - .string "zu spüren bekommen!\p" - .string "Das ist eine Warnung!\n" - .string "Leb wohl!$" + .string "I am TEAM AQUA’s ARCHIE.\p" + .string "Tell me, why do you meddle in the\n" + .string "noble affairs of TEAM AQUA?\p" + .string "POKéMON, people, all life depends on\n" + .string "the sea.\p" + .string "So, TEAM AQUA is dedicated to the\n" + .string "expansion of the sea.\p" + .string "Don’t you agree? What we are doing\n" + .string "is a magnificent undertaking.\p" + .string "Ah, fine...\n" + .string "You’re still too young.\p" + .string "It can’t be helped that you do not\n" + .string "understand our ideals.\p" + .string "But, if you ever oppose us again,\n" + .string "there will be consequences!\p" + .string "Heed my warning!\n" + .string "Farewell!$" SlateportCity_OceanicMuseum_2F_Text_17F17E:: @ 817F17E - .string "Ich bin MARC vom TEAM MAGMA.\p" - .string "Himmel noch mal! Warum mischst du dich in\n" - .string "die Pläne von TEAM MAGMA ein?\p" - .string "POKéMON, Menschen - alles lebt an Land...\p" - .string "Deshalb versucht TEAM MAGMA, die Land-\n" - .string "massen der Welt zu vergrößern.\p" - .string "Meinst du nicht auch, dass wir wirklich\n" - .string "etwas Großartiges vorhaben?\p" - .string "Nun, wie auch immer...\n" - .string "Du bist noch sehr jung.\p" - .string "Daher kannst du unsere noblen Ideale\n" - .string "noch nicht verstehen. Da kann man\l" - .string "nichts machen...\p" - .string "Aber, solltest du uns noch einmal in\n" - .string "die Quere kommen, werden wir keine\l" - .string "Rücksicht nehmen!\p" - .string "Das solltest du nicht vergessen!\n" - .string "Leb wohl!$" + .string "I am TEAM MAGMA’s MAXIE.\p" + .string "Why on earth do you feel compelled\n" + .string "to mess up TEAM MAGMA’s plans?\p" + .string "POKéMON, people, all life exists on land...\p" + .string "That’s why TEAM MAGMA is trying to\n" + .string "expand the world’s landmass.\p" + .string "Don’t you agree? What we are doing\n" + .string "is a magnificent undertaking.\p" + .string "Well, no matter...\n" + .string "You’re young.\p" + .string "Your inability to understand our\n" + .string "noble cause can’t be helped...\p" + .string "But, if you were to impede us ever\n" + .string "again, you’ll see no mercy from us!\p" + .string "Keep that firmly in mind!\n" + .string "Farewell!$" SlateportCity_OceanicMuseum_2F_Text_17F352:: @ 817F352 - .string "KAPT. BRIGG: Du bist...\n" - .string "Aah, du bist {PLAYER}{KUN}...\p" - .string "Wow, das war eine kritische Situation!\n" - .string "Danke, dass du uns gerettet hast!\p" - .string "Oh, fast hätte ich vergessen, dass du\n" - .string "uns die Teile von DEVON gebracht hast!$" + .string "CAPT. STERN: You’re...\n" + .string "Ah, okay, you’re {PLAYER}{KUN}...\p" + .string "Anyway, that was a tense situation!\n" + .string "Thank you for saving us!\p" + .string "Oh, yes, I almost forgot that you\n" + .string "even brought the parts from DEVON!$" UnknownString_817F404: @ 817F404 - .string "{PLAYER} gibt die DEVON-WAREN an\n" - .string "KAPT. BRIGG.$" + .string "{PLAYER} handed over the DEVON GOODS\n" + .string "to CAPT. STERN.$" SlateportCity_OceanicMuseum_2F_Text_17F433:: @ 817F433 - .string "KAPT. BRIGG: Hoppla!\n" - .string "Wir dürfen keine Zeit mehr verlieren!\p" - .string "Wir müssen so schnell wie möglich zur Ex-\n" - .string "pedition zum Meeresgrund aufbrechen.\p" - .string "Danke! Und entschuldige mich nun!$" + .string "CAPT. STERN: Whoops!\n" + .string "There’s no time to lose!\p" + .string "We have to set out on our ocean floor\n" + .string "expedition really soon.\p" + .string "Thanks, and excuse me!$" SlateportCity_OceanicMuseum_2F_Text_17F4B6:: @ 817F4B6 - .string "Ich habe hier ein Schiffsmodell\n" - .string "gesehen.\p" - .string "Es erinnert mich an das SCHIFFSWRACK\n" - .string "in der Nähe von FAUSTAUHAVEN...$" + .string "I saw a model of a ship here.\p" + .string "It reminded me of the ABANDONED SHIP\n" + .string "near DEWFORD TOWN...$" SlateportCity_OceanicMuseum_2F_Text_17F50E:: @ 817F50E - .string "Es ist strikt verboten, im MUSEUM\n" - .string "zu rennen!$" + .string "Don’t you dare run around inside\n" + .string "the MUSEUM!$" SlateportCity_OceanicMuseum_2F_Text_17F53B:: @ 817F53B - .string "Wow, das U-Boot ist der helle Wahnsinn!\n" - .string "Damit würde ich gerne auf Fahrt gehen!$" + .string "Wow, the submarine’s awesome!\n" + .string "I want to go for a ride!$" SlateportCity_OceanicMuseum_2F_Text_17F572:: @ 817F572 - .string "“KANTO WASSERQUALITÄT”\n" - .string "steht auf dem Schild.\p" - .string "Das Meer ist grenzübergreifend, aber\n" - .string "das Wasser scheint in jeder Region eine\l" - .string "andere Qualität zu haben.$" + .string "“KANTO WATER QUALITY SAMPLE,” the\n" + .string "label says.\p" + .string "The sea is all connected, but the\n" + .string "water seems to differ by region.$" SlateportCity_OceanicMuseum_2F_Text_17F5E3:: @ 817F5E3 - .string "“JOHTO WASSERQUALITÄT”\n" - .string "steht auf dem Schild.\p" - .string "Anscheinend ist der Salzgehalt in jeder\n" - .string "Region anders.$" + .string "“JOHTO WATER QUALITY SAMPLE,” the\n" + .string "label says.\p" + .string "Maybe the water’s saltiness differs\n" + .string "from one region to another...$" SlateportCity_OceanicMuseum_2F_Text_17F653:: @ 817F653 - .string "Ein Gummiball wird größer und kleiner.\p" - .string "“Im Meer sorgt das Gewicht des Wassers\n" - .string "für ständigen Druck.\p" - .string "In seichtem Wasser ist der Druck nicht\n" - .string "sehr hoch.\p" - .string "In extrem tiefem Wasser kann der\n" - .string "Druck zehntausende von Tonnen inner-\l" - .string "halb eines kleinen Bereiches betragen.”$" + .string "A rubber ball is expanding and shrinking.\p" + .string "“In the sea, the weight of water itself\n" + .string "exerts pressure.\p" + .string "“In shallow water, the pressure is not\n" + .string "very heavy.\p" + .string "“However, in extremely deep water,\n" + .string "the pressure can reach even tens of\l" + .string "thousands of tons on a small area.”$" SlateportCity_OceanicMuseum_2F_Text_17F754:: @ 817F754 - .string "“MODELL DER HOENN-REGION”\p" - .string "Ein Diorama der HOENN-Region.\p" - .string "Wo liegt hier WURZELHEIM?$" + .string "“MODEL OF HOENN REGION”\p" + .string "It’s a miniature diorama of the\n" + .string "HOENN region.\p" + .string "Where is LITTLEROOT TOWN on this?$" SlateportCity_OceanicMuseum_2F_Text_17F7BC:: @ 817F7BC - .string "Dies ist eine Anzeige der Meeres-\n" - .string "strömungen.\p" - .string "“In der Nähe des Meeresbodens sind die\n" - .string "Strömungen abhängig von Faktoren wie\l" - .string "Temperatur und Salzgehalt.”$" + .string "It’s a display on the flow of seawater.\p" + .string "“Near the bottom of the sea, water\n" + .string "flows due to differences in such\l" + .string "factors as temperature and salinity.”$" SlateportCity_OceanicMuseum_2F_Text_17F84E:: @ 817F84E - .string "Dies ist eine Anzeige der Meeres-\n" - .string "strömungen.\p" - .string "“An der Oberfläche sind die Strömungen\n" - .string "abhängig vom Einfluss des Windes.”$" + .string "It’s a display on the flow of\n" + .string "seawater.\p" + .string "“Toward the surface, seawater flows\n" + .string "as currents driven by the winds.”$" SlateportCity_OceanicMuseum_2F_Text_17F8BC:: @ 817F8BC - .string "“DIE FÄHRE MS TIDE”\p" - .string "“Ein maßstabsgetreues Modell eines\n" - .string "Schiffes unter Konstruktion in der\l" - .string "BRIGGWERFT.”$" + .string "“THE FERRY S.S. TIDAL\p" + .string "“A scale replica of the ship under\n" + .string "construction at STERN’S SHIPYARD.”$" SlateportCity_OceanicMuseum_2F_Text_17F918:: @ 817F918 - .string "“TIEFSEE-FORSCHUNGSBOOT 1”\p" - .string "“Ein Replikat des Hochleistungs-\n" - .string "U-Bootes zur Erforschung des\l" - .string "Meeresbodens.”$" + .string "“SUBMARINE EXPLORER 1\p" + .string "“A replica of the high-performance\n" + .string "ocean floor exploration submarine.”$" SlateportCity_OceanicMuseum_2F_Text_17F975:: @ 817F975 - .string "“TAUCHBOOT”\p" - .string "“Ein Replikat eines kompakten,\n" - .string "unbemannten Spezial-U-Bootes zur Er-\l" - .string "forschung des Meeresbodens.”$" + .string "“SUBMERSIBLE POD\p" + .string "“A replica of a compact, unmanned\n" + .string "pod for seafloor exploration.”$" SlateportCity_OceanicMuseum_2F_Text_17F9C7:: @ 817F9C7 - .string "“MS ANNE”\p" - .string "“Ein Replikat eines Luxusliners, der\n" - .string "um den Globus kreuzt.”$" + .string "“S.S. ANNE\p" + .string "“A replica of the luxury liner that\n" + .string "circles the globe.”$" diff --git a/data/text/maps/SlateportCity_PokemonCenter_1F.inc b/data/text/maps/SlateportCity_PokemonCenter_1F.inc index 291a0212d..2a87ffa93 100644 --- a/data/text/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/text/maps/SlateportCity_PokemonCenter_1F.inc @@ -1,14 +1,13 @@ SlateportCity_PokemonCenter_1F_Text_180602:: @ 8180602 - .string "Möchtest du einen Tipp?\p" - .string "Ich sage dir, es ist wichtig, die unter-\n" - .string "schiedlichsten POKéMON zu trainieren.\p" - .string "Gleichmäßigkeit ist wichtig. Ein\n" - .string "einzelnes starkes POKéMON reicht nicht.\p" - .string "Wenn es vom Typ her Nachteile besitzt,\n" - .string "kann auch ein sehr starkes POKéMON\l" - .string "einen Kampf verlieren.$" + .string "Want a tip for battling?\p" + .string "I’d say it’s raising different kinds\n" + .string "of POKéMON in a balanced manner.\p" + .string "It’s no good to make just one\n" + .string "POKéMON strong.\p" + .string "If it has a type disadvantage, it\n" + .string "might not stand a chance.$" SlateportCity_PokemonCenter_1F_Text_1806CB:: @ 81806CB - .string "Ich tausche mit Freunden POKéMON.\p" - .string "Und wenn ein getauschtes POKéMON ein\n" - .string "Item trägt, bin ich umso glücklicher!$" + .string "I trade POKéMON with my friends.\p" + .string "If a traded POKéMON is holding an\n" + .string "item, it makes me twice as happy!$" diff --git a/data/text/maps/SlateportCity_PokemonFanClub.inc b/data/text/maps/SlateportCity_PokemonFanClub.inc index e3dfa27c8..eab516c2b 100644 --- a/data/text/maps/SlateportCity_PokemonFanClub.inc +++ b/data/text/maps/SlateportCity_PokemonFanClub.inc @@ -1,138 +1,131 @@ SlateportCity_PokemonFanClub_Text_17D773:: @ 817D773 - .string "Äh-hm. Ich bin der VORSITZENDE des\n" - .string "POKéMON-FANCLUBS!\p" - .string "Als VORSITZENDER bin ich natürlich die\n" - .string "wichtigste Person hier!\p" - .string "Keiner kann mir im Umgang mit POKéMON\n" - .string "das Wasser reichen! Keiner!!!\p" - .string "Und in jedem WETTBEWERB bin ich\n" - .string "natürlich der Sieger!\p" - .string "Aber dadurch enthalte ich den anderen\n" - .string "ihr Vergnügen vor.\p" - .string "Und deshalb beschränke ich mich darauf,\n" - .string "die POKéMON der anderen zu beurteilen.\p" - .string "Es ist toll, zu sehen, wie andere ihre\n" - .string "POKéMON aufziehen.\p" - .string "Die zufriedenen Gesichter der POKéMON,\n" - .string "die gut behandelt werden...\p" - .string "Die fürsorgliche und liebevolle Art ihrer\n" - .string "Trainer...\p" - .string "Mein Herz geht über vor Freude - da\n" - .string "gibt es so viel Glück.\p" - .string "Oh je! Entschuldige, ich schwatze hier\n" - .string "die ganze Zeit vor mich hin!\p" - .string "Bitte, erlaube mir einen Blick auf deine\n" - .string "POKéMON. Wie sind sie gewachsen?$" + .string "Er-hem! I am the CHAIRMAN of the\n" + .string "POKéMON FAN CLUB!\p" + .string "Being the CHAIRMAN, I am naturally\n" + .string "the most important!\p" + .string "No one could best me when it comes\n" + .string "to raising POKéMON. No one!\p" + .string "In any CONTEST, my victory is a\n" + .string "foregone conclusion!\p" + .string "But, that would deprive others of\n" + .string "their enjoyment.\p" + .string "So, I now while away my time\n" + .string "examining the POKéMON of others.\p" + .string "It is marvelous to witness how\n" + .string "others have raised POKéMON.\p" + .string "The contented faces of properly\n" + .string "raised POKéMON...\p" + .string "The kind and loving gazes of their\n" + .string "TRAINERS...\p" + .string "My heart is overwhelmed - there is\n" + .string "so much happiness.\p" + .string "Oh, my! Excuse me! I seem to have\n" + .string "nattered on far too long!\p" + .string "Please, do allow me to examine your\n" + .string "POKéMON and see how it’s grown.$" SlateportCity_PokemonFanClub_Text_17DA14:: @ 817DA14 - .string "Wie sehen deine POKéMON aus? Wie sind\n" - .string "sie gewachsen? Erlaube mir einen Blick!$" + .string "How is your POKéMON growing?\n" + .string "Allow me to examine it.$" SlateportCity_PokemonFanClub_Text_17DA49:: @ 817DA49 .string "Hm, hm...\n" - .string "Verstehe...$" + .string "I see...$" SlateportCity_PokemonFanClub_Text_17DA5C:: @ 817DA5C - .string "Hmmm... Das ist weder gut noch\n" - .string "schlecht...\p" - .string "Du bist der TRAINER. Streng dich bei der\n" - .string "Aufzucht dieses POKéMON mehr an!\p" - .string "Dürfte ich vorschlagen, ihm mehr\n" - .string "{POKEBLOCK} zu geben?$" + .string "Hmmm... It’s not bad, but it’s not\n" + .string "good, either...\p" + .string "You, the TRAINER, must put more\n" + .string "effort into raising this POKéMON!\p" + .string "For instance, may I suggest that\n" + .string "you give it more {POKEBLOCK}S?$" SlateportCity_PokemonFanClub_Text_17DB0B:: @ 817DB0B - .string "Oh, hey...\p" - .string "Dein POKéMON macht einen guten Ein-\n" - .string "druck. Ich möchte dir eine Belohnung\l" - .string "geben.\p" - .string "Leider hast du in deinem BEUTEL nicht\n" - .string "mehr genügend Platz.$" + .string "Oh, my...\p" + .string "Your POKéMON is growing quite well,\n" + .string "so you deserve a reward.\p" + .string "Unfortunately, you have no space for\n" + .string "this in your BAG.$" SlateportCity_PokemonFanClub_Text_17DB89:: @ 817DB89 - .string "Dein {STR_VAR_1} ist wirklich sehr\n" - .string "beeindruckend! Das ist wirklich ein\l" - .string "wunderbares Exemplar!\p" - .string "Und wenn du ihm dies gibst, wird\n" - .string "es noch besser wachsen! Wirklich!$" + .string "Your {STR_VAR_1}, it is growing in\n" + .string "a most impressive manner!\l" + .string "It is one fine specimen!\p" + .string "But! If you were to give it this,\n" + .string "it would grow even better! Indeed!$" SlateportCity_PokemonFanClub_Text_17DC1B:: @ 817DC1B - .string "Lass ein POKéMON einen ROTEN SCHAL\n" - .string "tragen.\p" - .string "Dadurch wird die Coolness deines\n" - .string "POKéMON unübersehbar!$" + .string "Let a POKéMON hold that RED SCARF.\p" + .string "Everyone will recognize the coolness\n" + .string "of that POKéMON!$" SlateportCity_PokemonFanClub_Text_17DC74:: @ 817DC74 - .string "Lass ein POKéMON einen BLAUEN SCHAL\n" - .string "tragen.\p" - .string "Dadurch wird die Schönheit deines\n" - .string "POKéMON unübersehbar!$" + .string "Let a POKéMON hold that BLUE SCARF.\p" + .string "Its beauty will be accentuated much\n" + .string "more than now!$" SlateportCity_PokemonFanClub_Text_17DCCB:: @ 817DCCB - .string "Lass ein POKéMON einen ROSA SCHAL\n" - .string "tragen.\p" - .string "Dadurch wird die Anmut deines\n" - .string "POKéMON unübersehbar!$" + .string "Let a POKéMON hold that PINK SCARF.\p" + .string "It will draw out the cuteness of\n" + .string "the POKéMON some more!$" SlateportCity_PokemonFanClub_Text_17DD27:: @ 817DD27 - .string "Lass ein POKéMON einen GRÜNEN SCHAL\n" - .string "tragen.\p" - .string "Dadurch wird die Klugheit deines\n" - .string "POKéMON unübersehbar!$" + .string "Let a POKéMON hold that GREEN SCARF.\p" + .string "That will enhance the\n" + .string "smartness of POKéMON!$" SlateportCity_PokemonFanClub_Text_17DD78:: @ 817DD78 - .string "Lass ein POKéMON einen GELBEN SCHAL\n" - .string "tragen.\p" - .string "Dadurch wird die Stärke deines\n" - .string "POKéMON unübersehbar!$" + .string "Let a POKéMON hold that YELLOW SCARF.\p" + .string "It will bolster your POKéMON’s\n" + .string "toughness so much more!$" SlateportCity_PokemonFanClub_Text_17DDD5:: @ 817DDD5 - .string "Tut mir Leid, mehr kann ich dir leider\n" - .string "nicht geben! Ich habe nichts mehr!\p" - .string "Aber du besitzt etwas viel Wertvolleres:\n" - .string "Das Talent, POKéMON ohne Zuhilfenahme\l" - .string "von Items perfekt aufzuziehen!$" + .string "I’m sorry, but I’ve nothing else to\n" + .string "give you! None at all!\p" + .string "After all, you’re blessed with the gift\n" + .string "of raising POKéMON without resorting\l" + .string "to any items!$" SlateportCity_PokemonFanClub_Text_17DE6B:: @ 817DE6B - .string "Ich freue mich immer, POKéMON zu sehen,\n" - .string "die ihre TRAINER lieben.\p" - .string "POKéMON haben ein sensibles Gespür\n" - .string "für die Gefühle ihrer TRAINER.\p" - .string "Wenn du einem POKéMON Liebe und\n" - .string "Achtung entgegenbringst, werden die\l" - .string "Gefühle erwidert.\p" - .string "Sobald dein POKéMON dich liebt, komm und\n" - .string "besuche mich nochmals.$" + .string "I love seeing POKéMON that love\n" + .string "their TRAINERS.\p" + .string "POKéMON are very sensitive to the\n" + .string "feelings of their TRAINERS.\p" + .string "If you treat your POKéMON with love\n" + .string "and care, they’ll love you back.\p" + .string "When your POKéMON grow to love you,\n" + .string "please come show me.$" SlateportCity_PokemonFanClub_Text_17DF57:: @ 817DF57 - .string "Dein POKéMON betet dich geradezu an.\p" - .string "Für einen so mitfühlenden TRAINER\n" - .string "hat der FANCLUB ein Geschenk!$" + .string "Your POKéMON really adores you.\p" + .string "For you, a most compassionate\n" + .string "TRAINER, a gift from the FAN CLUB!$" SlateportCity_PokemonFanClub_Text_17DFB8:: @ 817DFB8 - .string "POKéMON haben ein sensibles Gespür\n" - .string "für die Gefühle ihrer TRAINER.\p" - .string "Wenn du einem POKéMON Liebe und\n" - .string "Achtung entgegenbringst, werden die\l" - .string "Gefühle erwidert.$" + .string "POKéMON are very sensitive to the\n" + .string "feelings of their TRAINERS.\p" + .string "If you treat your POKéMON with love\n" + .string "and care, they’ll love you back.$" SlateportCity_PokemonFanClub_Text_17E03B:: @ 817E03B - .string "Wenn ein POKéMON in einem Kampf besiegt\n" - .string "wird, nimmt es das übel.\p" - .string "Und bald wird es dem TRAINER weniger\n" - .string "Vertrauen schenken.\p" - .string "Mit anderen Worten: Es wird dich nicht\n" - .string "mehr so sehr mögen.$" + .string "If you keep letting a POKéMON faint\n" + .string "in battle, it’ll come to resent it.\p" + .string "Soon, it will become less trusting\n" + .string "of the TRAINER.\p" + .string "In other words, it certainly won’t\n" + .string "like you very much.$" SlateportCity_PokemonFanClub_Text_17E0ED:: @ 817E0ED - .string "Mögen POKéMON Items?\p" - .string "Mein POKéMON hat sich sehr gefreut,\n" - .string "als ich ihm PROTEIN gegeben habe.$" + .string "Do POKéMON enjoy having items used\n" + .string "on them?\p" + .string "Mine acted really happy when I gave\n" + .string "it some PROTEIN.$" SlateportCity_PokemonFanClub_Text_17E14E:: @ 817E14E - .string "ENECO: Fffnyaaaah...$" + .string "SKITTY: Fffnyaaaah...$" SlateportCity_PokemonFanClub_Text_17E164:: @ 817E164 - .string "ZIGZACHS: Kyuuu...$" + .string "ZIGZAGOON: Kyuuu...$" SlateportCity_PokemonFanClub_Text_17E178:: @ 817E178 .string "AZUMARILL: Marimari?$" diff --git a/data/text/maps/SlateportCity_SternsShipyard_1F.inc b/data/text/maps/SlateportCity_SternsShipyard_1F.inc index d38e4b7ae..8a08a15ae 100644 --- a/data/text/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/text/maps/SlateportCity_SternsShipyard_1F.inc @@ -1,80 +1,79 @@ SlateportCity_SternsShipyard_1F_Text_17C14B:: @ 817C14B - .string "Ähmm... Wenn das hierhin gehört und das\n" - .string "dahin...\p" - .string "Wo gehört dieses dann hin?\n" - .string "Und was ist mit diesem Dingsbums?\p" - .string "Aaargh! Ich werde daraus einfach nicht\n" - .string "schlau!$" + .string "Umm... If this goes here, and that\n" + .string "goes over there...\p" + .string "Then where does this thing go?\n" + .string "And what about that doohickey?\p" + .string "Aaargh! I can’t make heads or tails\n" + .string "of this!$" SlateportCity_SternsShipyard_1F_Text_17C1EC:: @ 817C1EC .string "Hm?\n" - .string "Hallo, ich bin BOOTMAR.\p" - .string "KAPT. BRIGG hat mich damit\n" - .string "beauftragt, eine Fähre zu konstruieren.\p" - .string "Oh! Das da...\n" - .string "Sind das DEVON-WAREN?\p" - .string "Aber, ähm... Das ist ein ungünstiger\n" - .string "Zeitpunkt...\p" - .string "KAPT. BRIGG ist irgendwohin ge-\n" - .string "gangen. Er sagte, er müsse was\l" - .string "erledigen.\p" - .string "Kann ich dich bitten, KAPT. BRIGG zu\n" - .string "suchen und ihm das Paket zu bringen?$" + .string "Hi, I’m DOCK.\p" + .string "CAPT. STERN commissioned me to\n" + .string "design a ferry.\p" + .string "Oh! That there...\n" + .string "Are they DEVON GOODS?\p" + .string "But, hmm...\n" + .string "This won’t do...\p" + .string "CAPT. STERN went off somewhere.\n" + .string "He said he had some work to do.\p" + .string "Could I get you to go find CAPT.\n" + .string "STERN and deliver that to him?$" SlateportCity_SternsShipyard_1F_Text_17C2F2:: @ 817C2F2 - .string "BOOTMAR: Wo könnte KAPT. BRIGG wohl\n" - .string "hingegangen sein?\p" - .string "Kannst du bitte KAPT. BRIGG suchen und\n" - .string "ihm die Waren übergeben?$" + .string "DOCK: Where could CAPT. STERN have\n" + .string "gone off to?\p" + .string "Could you go find CAPT. STERN and\n" + .string "deliver that parcel to him?$" SlateportCity_SternsShipyard_1F_Text_17C360:: @ 817C360 - .string "BOOTMAR: Der Schiffsbau ist eine Kunst.\p" - .string "Manche Dinge lassen sich auch durch\n" - .string "Berechnungen nicht vorhersehen.\p" - .string "Jemand, der das Meer kennt wie seine\n" - .string "Westentasche, müsste mir helfen...$" + .string "DOCK: Shipbuilding is an art.\p" + .string "A lot of things can’t be figured out\n" + .string "just by calculating.\p" + .string "I really could use advice from a veteran\n" + .string "who knows the seas...$" SlateportCity_SternsShipyard_1F_Text_17C3F7:: @ 817C3F7 - .string "BOOTMAR: Hallo! MR. BRACK hat sich bereit\n" - .string "erklärt, uns zu helfen.\p" - .string "Dank dieses erfahrenen Seemannes\n" - .string "kommen wir zügig voran.$" + .string "DOCK: Hi! MR. BRINEY’s joined us to\n" + .string "lend us his help.\p" + .string "Thanks to the veteran sailor, the\n" + .string "ferry is steadily coming together.$" SlateportCity_SternsShipyard_1F_Text_17C472:: @ 817C472 - .string "BOOTMAR: Die Fähre ist bald fertig!\p" - .string "Die neue MS TIDE ist ein wahres\n" - .string "Technikwunder!\p" - .string "Aber ich denke doch, dass wir noch\n" - .string "einiges besser machen können.\p" - .string "Weißt du, die technische Entwicklung\n" - .string "wird niemals abgeschlossen sein.$" + .string "DOCK: The ferry is finally ready!\p" + .string "The new S.S. TIDAL is truly a marvel\n" + .string "of technology!\p" + .string "But, I get the feeling that we can\n" + .string "make something even better.\p" + .string "You know, there’s never an end to\n" + .string "technology’s march.$" SlateportCity_SternsShipyard_1F_Text_17C53D:: @ 817C53D - .string "MR. BRACK: Ah, {PLAYER}{KUN}!\n" - .string "Es ist schon lange her!\p" - .string "Aye, seit ich dich kennen gelernt habe,\n" - .string "bin ich wieder voller Tatendrang.\p" - .string "Also habe ich mich entschlossen,\n" - .string "BOOTMAR beim Bau der Fähre zu helfen.\p" - .string "Aye, so wie es aussieht, wird die Fähre\n" - .string "viele Passagiere befördern können.\p" - .string "Aber, weißt du, BOOTMAR ist wirklich\n" - .string "eine besondere Persönlichkeit.\p" - .string "Mit seinem technischen Wissen und\n" - .string "meiner Erfahrung auf See werden wir\l" - .string "ein ganz besonderes Schiff bauen, aye.$" + .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" + .string "It’s been too long!\p" + .string "Aye, since I met you, this old seadog’s\n" + .string "been feeling frisky!\p" + .string "So I’ve decided to help DOCK make a\n" + .string "ferry.\p" + .string "Aye, after all, a ferry would be able\n" + .string "to carry a lot of people.\p" + .string "But, you know, that DOCK is really\n" + .string "something special.\p" + .string "With his knack for technology and\n" + .string "my experience, I’m sure that we can\l" + .string "build one great ship, aye!$" UnknownString_817C6A6: @ 817C6A6 - .string "PECKO: Pii piihyoro!$" + .string "PEEKO: Pii piihyoro!$" SlateportCity_SternsShipyard_1F_Text_17C6BB:: @ 817C6BB - .string "Die Jahreszeit, das Wetter, der Mond,\n" - .string "der vom Himmel herabstrahlt...\p" - .string "Das sind die Bedingungen, die die See\n" - .string "so wechselhaft machen.\p" - .string "Ganz genau!\n" - .string "Die See ist wie ein lebendiges Wesen!$" + .string "The seasons, the weather, where the\n" + .string "moon sits in the sky...\p" + .string "These and other conditions make the\n" + .string "sea change its expression.\p" + .string "That’s right!\n" + .string "The sea is like a living thing!$" SlateportCity_SternsShipyard_1F_Text_17C764:: @ 817C764 - .string "Ich werde sehr schnell seekrank.\n" - .string "Deshalb helfe ich lieber hier aus.$" + .string "I get seasick real easily.\n" + .string "So I get to help out here instead.$" diff --git a/data/text/maps/SlateportCity_SternsShipyard_2F.inc b/data/text/maps/SlateportCity_SternsShipyard_2F.inc index d2a0dbd4c..0bf4e27e0 100644 --- a/data/text/maps/SlateportCity_SternsShipyard_2F.inc +++ b/data/text/maps/SlateportCity_SternsShipyard_2F.inc @@ -1,19 +1,18 @@ SlateportCity_SternsShipyard_2F_Text_17C7A2:: @ 817C7A2 - .string "Die Konstruktion eines großen Schiffes\n" - .string "ist eher vergleichbar mit der eines\l" - .string "Gebäudes, als eines Transportmittels.$" + .string "Designing a large ship is more like\n" + .string "making a big building than putting\l" + .string "together a transportation vehicle.$" SlateportCity_SternsShipyard_2F_Text_17C80C:: @ 817C80C - .string "Findest du es nicht auch seltsam, dass\n" - .string "ein Schiff aus Eisen gebaut wird?\p" - .string "Es schwimmt aufgrund des so genannten\n" - .string "Auftriebs.$" + .string "Don’t you think it’s strange that a\n" + .string "ship made of heavy iron floats?\p" + .string "It floats because of a principle\n" + .string "called buoyancy.$" UnknownString_817C882: @ 817C882 - .string "Die See zwischen GRAPHITPORT CITY und\n" - .string "FLOSSBRUNN hat einen starken Ge- \l" - .string "zeitenwechsel.\p" - .string "Normale Schiffe können dort nicht\n" - .string "fahren.\p" - .string "Man braucht einen starken Antrieb,\n" - .string "um diese Wasser befahren zu können...$" + .string "The sea between SLATEPORT and\n" + .string "PACIFIDLOG has a fast-running tide.\p" + .string "Ordinary ships can’t make headway\n" + .string "through there.\p" + .string "You’d need substantial propulsion\n" + .string "to plow through those waters...$" diff --git a/data/text/maps/SootopolisCity.inc b/data/text/maps/SootopolisCity.inc index 7ae79d654..cc89d86bd 100644 --- a/data/text/maps/SootopolisCity.inc +++ b/data/text/maps/SootopolisCity.inc @@ -1,222 +1,215 @@ ClosedSootopolisGymDoorText: @ 8169690 - .string "Die Tür ist zu.$" + .string "The door is closed.$" SootopolisCity_Text_1696A4:: @ 81696A4 - .string "Wer bist du denn wohl?\p" - .string "Dies ist die URZEITHÖHLE.\p" - .string "Die Geister der POKéMON, zur Ruhe\n" - .string "gebettet am PYROBERG, erwachen\l" - .string "hier zum Leben, sagt man.\p" - .string "Bitte verlasse diesen Ort.$" + .string "Who might you be?\p" + .string "This is the CAVE OF ORIGIN.\p" + .string "The spirits of POKéMON, becalmed at\n" + .string "MT. PYRE, are said to be revived here.\p" + .string "Please leave.$" SootopolisCity_Text_16972B:: @ 816972B - .string "Im Meer tauchen. Treppenstufen auf und\n" - .string "ab rennen...\p" - .string "Wenn du in diesem Ort lebst, wirst du\n" - .string "körperlich fit.$" + .string "Diving in the sea. Climbing up and\n" + .string "down stairs all the time...\p" + .string "If you live in this town, you end up\n" + .string "getting physically fit.$" SootopolisCity_Text_1697A7:: @ 81697A7 - .string "Ich... Ich war noch nie außerhalb der\n" - .string "Stadt.\p" - .string "Ich frage mich, wie die Welt hinter\n" - .string "diesem Horizont aussieht?$" + .string "I... I’ve never been out of this city.\p" + .string "I wonder what the world is like on the\n" + .string "other side of this round sky?$" SootopolisCity_Text_169813:: @ 8169813 - .string "Hm! Du bist den ganzen Weg nach\n" - .string "XENEROVILLE gekommen? Du bist\l" - .string "kein normaler Tourist.\p" - .string "Aber das macht dich auch nicht zu einem\n" - .string "außergewöhnlichen Touristen.$" + .string "Hm!\n" + .string "You’ve come all the way to SOOTOPOLIS?\l" + .string "You’re no ordinary tourist.\p" + .string "But I suppose that doesn’t make you an\n" + .string "extraordinary tourist, either.$" SootopolisCity_Text_1698A0:: @ 81698A0 - .string "XENEROVILLE entwickelte sich im Krater\n" - .string "eines Vulkans.\p" - .string "Wenn du in den Himmel schaust, kannst\n" - .string "du den Rand des Kraters über dir\l" - .string "erkennen. Der Himmel wird zum Kreis.\p" - .string "Aber das macht den Himmel über\n" - .string "XENEROVILLE zum schönsten Himmel.$" + .string "SOOTOPOLIS sprang up as a town in the\n" + .string "crater of a volcano.\p" + .string "If you look up at the sky, the lip of\n" + .string "the crater is also visible.\l" + .string "So, all you see is the sky in a circle.\p" + .string "But that’s what makes the sky above\n" + .string "SOOTOPOLIS the most beautiful.$" SootopolisCity_Text_169988:: @ 8169988 - .string "TROY: {PLAYER}{KUN}, du bist auch hier?\n" - .string "Bei diesem schrecklichen Regen...\p" - .string "Oh, ja, kannst du verstehen, was mein\n" - .string "Freund gerade sagt?$" + .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" + .string "In this terrible rainstorm, yet...\p" + .string "Oh, yes, can you hear out what my\n" + .string "friend has to say?$" SootopolisCity_Text_1699FD:: @ 81699FD - .string "Mein Name ist WASSILI.\n" - .string "Ich bin der hiesige ARENALEITER.\p" - .string "Ich bin auch damit beauftragt, die\n" - .string "URZEITHÖHLE zu schützen.\p" - .string "Diese Regenschauer werden durch eine\n" - .string "Kraft in der Höhle verursacht.$" + .string "My name is WALLACE.\n" + .string "I’m this town’s GYM LEADER.\p" + .string "I’ve also been entrusted with the\n" + .string "protection of the CAVE OF ORIGIN.\p" + .string "This downpour is caused by a power\n" + .string "emanating from the CAVE OF ORIGIN.$" SootopolisCity_Text_169AB7:: @ 8169AB7 - .string "Das... Das ist die BLAUE KUGEL.\p" - .string "Ich verstehe.\n" - .string "Folge mir.$" + .string "That... That is the BLUE ORB.\p" + .string "I see.\n" + .string "Follow me.$" SootopolisCity_Text_169AE7:: @ 8169AE7 - .string "TROY: Dieser Regen...\p" - .string "Menschen und POKéMON brauchen\n" - .string "Wasser zum Leben...\p" - .string "Aber warum verursacht dieser Regen\n" - .string "so viele Probleme?\p" - .string "Immer mehr Regenwolken werden sich\n" - .string "über XENEROVILLE bilden und sich über\l" - .string "die ganze HOENN-Region ausbreiten.$" + .string "STEVEN: This rain...\p" + .string "People and POKéMON need water to live...\p" + .string "But why does this rain fill us with\n" + .string "so much dread?\p" + .string "The rain clouds over SOOTOPOLIS will\n" + .string "keep building and soon extend all\l" + .string "over HOENN...\p" + .string "If that were to happen...$" SootopolisCity_Text_169BC7:: @ 8169BC7 - .string "WASSILI: Die URZEITHÖHLE ist dort\n" - .string "drüben.\p" - .string "Niemandem in XENEROVILLE ist es\n" - .string "erlaubt, die URZEITHÖHLE zu betreten.\p" - .string "Aber du musst hineingehen.\n" - .string "Zusammen mit der BLAUEN KUGEL.\p" - .string "Du musst gehen, egal was dich im Inneren\n" - .string "der Höhle erwartet...$" + .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" + .string "No one from SOOTOPOLIS is permitted\n" + .string "to enter the CAVE OF ORIGIN.\p" + .string "But you must go.\n" + .string "Together with your BLUE ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" SootopolisCity_Text_169C99:: @ 8169C99 - .string "TROY: {PLAYER}{KUN}, ich hätte nie ver-\n" - .string "mutet, dass du die BLAUE KUGEL bei dir\l" - .string "hast.\p" - .string "Dir wird nichts passieren. Mit deinen\n" - .string "POKéMON an deiner Seite schaffst du es.\p" - .string "Davon bin ich überzeugt!$" + .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" + .string "to be holding the BLUE ORB.\p" + .string "You’ll be okay. With your POKéMON,\n" + .string "you’ll get things done no matter what.\p" + .string "I’m convinced of it!$" SootopolisCity_Text_169D37:: @ 8169D37 - .string "WASSILI: Du musst deine BLAUE KUGEL\n" - .string "mitnehmen.\p" - .string "Du musst gehen, egal was dich im Inneren\n" - .string "der HÖHLE erwartet...$" + .string "WALLACE: You must go together with\n" + .string "your BLUE ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" SootopolisCity_Text_169DA6:: @ 8169DA6 - .string "TROY: Dir wird nichts passieren.\n" - .string "Mit deinen POKéMON an deiner Seite\l" - .string "schaffst du es.\p" - .string "Davon bin ich überzeugt!$" + .string "STEVEN: You’ll be okay. With your\n" + .string "POKéMON, you’ll get things done\l" + .string "whatever happens.\p" + .string "I’m convinced of it!$" SootopolisCity_Text_169E0F:: @ 8169E0F - .string "TROY: {PLAYER}{KUN}, du bist auch hier?\n" - .string "Bei diesem heißen Sonnenschein...\p" - .string "Oh, ja, kannst du verstehen, was mein\n" - .string "Freund gerade sagt?$" + .string "STEVEN: {PLAYER}{KUN}, you came, too?\n" + .string "Under this scorching sun, yet...\p" + .string "Oh, yes, can you hear out what my\n" + .string "friend has to say?$" SootopolisCity_Text_169E82:: @ 8169E82 - .string "Mein Name ist WASSILI.\n" - .string "Ich bin der hiesige ARENALEITER.\p" - .string "Ich bin auch damit beauftragt, die\n" - .string "URZEITHÖHLE zu schützen.\p" - .string "Dieser Sonnenschein wird durch eine\n" - .string "Kraft in der Höhle verursacht.$" + .string "My name is WALLACE.\n" + .string "I’m this town’s GYM LEADER.\p" + .string "I’ve also been entrusted with the\n" + .string "protection of the CAVE OF ORIGIN.\p" + .string "This sunshine is caused by a power\n" + .string "emanating from the CAVE OF ORIGIN.$" SootopolisCity_Text_169F3C:: @ 8169F3C - .string "Das... Das ist die ROTE KUGEL.\p" - .string "Ich verstehe.\n" - .string "Folge mir.$" + .string "That... That is the RED ORB.\p" + .string "I see.\n" + .string "Follow me.$" SootopolisCity_Text_169F6B:: @ 8169F6B - .string "TROY: Dieser Sonnenschein...\p" - .string "Menschen und POKéMON brauchen\n" - .string "Sonnenlicht zum Leben...\p" - .string "Aber warum verursacht dieses Licht\n" - .string "so viele Probleme?\p" - .string "Die Sonnenstrahlen über XENEROVILLE\n" - .string "werden immer intensiver und bald\l" - .string "wird es in ganz HOENN zu heiß.\p" - .string "Und wenn das passiert...$" + .string "STEVEN: This sunlight...\p" + .string "People and POKéMON need sunlight\n" + .string "to live...\p" + .string "But why does this sunlight fill us\n" + .string "with so much dread?\p" + .string "The blazing sun over SOOTOPOLIS is\n" + .string "intensifying... Soon, all of HOENN\l" + .string "will be under its withering glare...\p" + .string "If that were to happen...$" SootopolisCity_Text_16A06C:: @ 816A06C - .string "WASSILI: Die URZEITHÖHLE ist dort\n" - .string "drüben.\p" - .string "Niemandem in XENEROVILLE ist es\n" - .string "erlaubt, die URZEITHÖHLE zu betreten.\p" - .string "Aber du musst hineingehen.\n" - .string "Zusammen mit der ROTEN KUGEL.\p" - .string "Du musst gehen, egal was dich im Inneren\n" - .string "der Höhle erwartet...$" + .string "WALLACE: The CAVE OF ORIGIN is ahead.\p" + .string "No one from SOOTOPOLIS is permitted\n" + .string "to enter the CAVE OF ORIGIN.\p" + .string "But you must go. \n" + .string "Together with your RED ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" SootopolisCity_Text_16A13E:: @ 816A13E - .string "TROY: {PLAYER}{KUN}, ich hätte nie ver-\n" - .string "mutet, dass du die ROTE KUGEL bei dir\l" - .string "hast.\p" - .string "Dir wird nichts passieren. Mit deinen\n" - .string "POKéMON an deiner Seite schaffst du es.\p" - .string "Davon bin ich überzeugt!$" + .string "STEVEN: {PLAYER}{KUN}, I never expected you\n" + .string "to be holding the RED ORB.\p" + .string "You’ll be okay. With your POKéMON,\n" + .string "you’ll get things done no matter what.\p" + .string "I’m convinced of it!$" SootopolisCity_Text_16A1DB:: @ 816A1DB - .string "WASSILI: Du musst deine ROTE KUGEL\n" - .string "mitnehmen.\p" - .string "Du musst gehen, egal was dich im Inneren\n" - .string "der Höhle erwartet...$" + .string "WALLACE: You must go together with\n" + .string "your RED ORB.\p" + .string "You must go regardless of what awaits\n" + .string "you inside the CAVE...$" SootopolisCity_Text_16A249:: @ 816A249 - .string "TROY: Dir wird nichts passieren. Mit\n" - .string "deinen POKéMON an deiner Seite\l" - .string "schaffst du es.\p" - .string "Davon bin ich überzeugt!$" + .string "STEVEN: You’ll be okay. With your\n" + .string "POKéMON, you’ll get things done\l" + .string "whatever happens.\p" + .string "I’m convinced of it!$" SootopolisCity_Text_16A2B2:: @ 816A2B2 - .string "Die Legende, die der alte Mann am PYRO-\n" - .string "BERG erzählt hat... war kein Märchen.$" + .string "The legend told by the old man on\n" + .string "MT. PYRE... It wasn’t a made-up story.$" SootopolisCity_Text_16A2FB:: @ 816A2FB - .string "Das natürliche Gleichgewicht von HOENN\n" - .string "verändert sich dramatisch...$" + .string "The natural balance of HOENN is going\n" + .string "through a wrenching shift...$" SootopolisCity_Text_16A33E:: @ 816A33E - .string "TROY: {PLAYER}{KUN}, dir verdanken\n" - .string "wir alles.\p" - .string "Der Himmel über XENEROVILLE ist\n" - .string "wieder normal. Dafür dankt dir auch\l" - .string "WASSILI.\p" - .string "Und genau dieser WASSILI\n" - .string "erwartet dich dort drinnen.\p" - .string "Er ist stark. Aber auf dem Weg, auf dem\n" - .string "du dich jetzt befindest, solltest du\l" - .string "keine Probleme haben, ihn zu besiegen.\p" - .string "Gib dein Bestes.$" + .string "STEVEN: {PLAYER}{KUN}, we owe it all to you.\p" + .string "The sky above SOOTOPOLIS has returned\n" + .string "to normal. For that, WALLACE sends his\l" + .string "thanks, too.\p" + .string "And, that same WALLACE is waiting for\n" + .string "you inside.\p" + .string "He’s strong.\n" + .string "But the way you are now, you should be\l" + .string "on equal footing with him.\p" + .string "Give it your best shot.$" SootopolisCity_Text_16A455:: @ 816A455 - .string "Alles Leben beginnt in der URZEITHÖHLE\n" - .string "und endet am PYROBERG...\p" - .string "Woher kommen die Menschen und\n" - .string "POKéMON? Wohin gehen wir?$" + .string "All life starts at the CAVE OF ORIGIN,\n" + .string "and it all ends on MT. PYRE...\p" + .string "Where do people and POKéMON come\n" + .string "from? Where are we bound?$" SootopolisCity_Text_16A4D6:: @ 816A4D6 - .string "Lass mich raten! Du wirst WASSILI\n" - .string "herausfordern?!?\p" - .string "Wirklich?\n" - .string "Du bist wirklich mutig!$" + .string "Let me guess, you’re going to challenge\n" + .string "WALLACE?\p" + .string "Oh, you are really?\n" + .string "You’re awfully brave!$" SootopolisCity_Text_16A531:: @ 816A531 - .string "Lass mich raten! Du hast WASSILI\n" - .string "besiegt!?! Wirklich!?!\p" - .string "Dann werde ich vielleicht dein Fan!$" + .string "Let me guess, you’ve beaten WALLACE!\n" + .string "Oh, you did, really?\p" + .string "Maybe I’ll become your fan!$" SootopolisCity_Text_16A587:: @ 816A587 - .string "Hm! Du bist den ganzen Weg nach\n" - .string "XENEROVILLE gekommen? Du bist\l" - .string "kein gewöhnlicher Tourist.\p" - .string "Aber das macht dich auch nicht zu einem\n" - .string "außergewöhnlichen Touristen.$" + .string "Hm!\n" + .string "You’ve come all the way to SOOTOPOLIS?\l" + .string "You’re no ordinary tourist.\p" + .string "But I suppose that doesn’t make you an\n" + .string "extraordinary tourist, either.$" SootopolisCity_Text_16A614:: @ 816A614 - .string "Ein Stück des Nachthimmels, umgeben\n" - .string "vom Rund des Vulkankraters...\p" - .string "Und in diesem runden Stück Himmel\n" - .string "strahlen und blinken die Sterne, als\l" - .string "wären sie lebendig. Ich liebe das...$" + .string "A circle of a night sky framed by the\n" + .string "crater of a volcano...\p" + .string "And in that ring, stars flicker and\n" + .string "blink as if they were alive...\l" + .string "It’s my favorite scenery.$" SootopolisCity_Text_16A6AE:: @ 816A6AE - .string "Huch! Wo ist mein Haus?$" + .string "Hunh? Where is my house?$" SootopolisCity_Text_16A6C7:: @ 816A6C7 - .string "POKéMON ARENA von XENEROVILLE\n" - .string "LEITER: WASSILI\p" - .string "“Künstler und Liebhaber des WASSERS.”$" + .string "SOOTOPOLIS CITY POKéMON GYM\n" + .string "LEADER: WALLACE\p" + .string "“Artist, and lover of WATER.”$" SootopolisCity_Text_16A711:: @ 816A711 - .string "XENEROVILLE\p" - .string "“Die mystische Stadt, in der die\n" - .string "Geschichte stillsteht.”$" + .string "SOOTOPOLIS CITY\p" + .string "“The mystical city where history\n" + .string "slumbers.”$" diff --git a/data/text/maps/SootopolisCity_Gym_1F.inc b/data/text/maps/SootopolisCity_Gym_1F.inc index 3216ea0c9..1047a5326 100644 --- a/data/text/maps/SootopolisCity_Gym_1F.inc +++ b/data/text/maps/SootopolisCity_Gym_1F.inc @@ -1,194 +1,192 @@ SootopolisCity_Gym_1F_Text_18E8A5:: @ 818E8A5 - .string "Na, wie sieht es aus, auf dem Weg zum\n" - .string "CHAMP, {PLAYER}?\p" - .string "ARENALEITER WASSILI in XENEROVILLE\n" - .string "ist der Meister der WASSER-POKéMON.\p" - .string "Und auf dem Weg zu ihm wirst du auf\n" - .string "gefrorenem Boden ins Rutschen kommen.\p" - .string "Tut mir Leid, aber mehr kann ich dir dazu\n" - .string "auch nicht sagen.\p" - .string "Den Rest des Weges musst du alleine\n" - .string "meistern.$" + .string "Yo! How’s it going, CHAMPION-\n" + .string "bound {PLAYER}?\p" + .string "SOOTOPOLIS’s GYM LEADER WALLACE is\n" + .string "a master of WATER-type POKéMON.\p" + .string "And, to get to WALLACE, an icy floor\n" + .string "will hamper your progress...\p" + .string "Listen, I’m sorry, but that’s all the\n" + .string "advice that I have for you.\p" + .string "The rest of the way, you have to\n" + .string "go for it yourself!$" SootopolisCity_Gym_1F_Text_18E9C9:: @ 818E9C9 - .string "Hui! Du hast WASSILI besiegt, von dem\n" - .string "man sagt, er sei der beste TRAINER in\l" - .string "der HOENN-Region.\p" - .string "Okay! Schau auf deinem\n" - .string "TRAINERPASS nach.\p" - .string "Wenn du alle ORDEN erhalten hast,\n" - .string "kannst du die POKéMON LIGA\l" - .string "herausfordern!$" + .string "Yow! You’ve beaten even WALLACE, who\n" + .string "was supposedly the best in all HOENN!\p" + .string "Okay! Check out your TRAINER’s CARD.\p" + .string "If you’ve gotten all the BADGES, you’re\n" + .string "set for the POKéMON LEAGUE challenge!$" SootopolisCity_Gym_B1F_Text_18EA87:: @ 818EA87 - .string "Ich zeige dir die sublimen Techniken,\n" - .string "die ich vom ARENALEITER WASSILI\l" - .string "gelernt habe.$" + .string "I’ll show you the sublime techniques\n" + .string "I learned from our LEADER WALLACE!$" SootopolisCity_Gym_B1F_Text_18EACF:: @ 818EACF - .string "Bitte verzeih mir, WASSILI...$" + .string "Please forgive me, WALLACE...$" SootopolisCity_Gym_B1F_Text_18EAED:: @ 818EAED - .string "Pass auf, was passiert, wenn du alle\n" - .string "Bodenfliesen betreten hast...$" + .string "Watch what happens if you crack all\n" + .string "the floor tiles.$" SootopolisCity_Gym_B1F_Text_18EB22:: @ 818EB22 - .string "Du bist den ganzen Weg hierher ge-\n" - .string "kommen, aber bis zu WASSILI dringst\l" - .string "du nicht vor.\p" - .string "Weil du gegen mich verlieren wirst!$" + .string "You came all the way here, but you won’t\n" + .string "get to see WALLACE.\p" + .string "Not if you lose to me, you won’t!$" SootopolisCity_Gym_B1F_Text_18EB81:: @ 818EB81 - .string "Du bist stark! Ich habe mich durch dein\n" - .string "unschuldiges Aussehen täuschen lassen.$" + .string "You’re strong!\n" + .string "I was fooled by your cute looks!$" SootopolisCity_Gym_B1F_Text_18EBB1:: @ 818EBB1 - .string "Du bist gut genug, um nicht sofort von\n" - .string "WASSILI besiegt zu werden.$" + .string "You might be good enough to avoid\n" + .string "being wiped out in one hit by WALLACE.$" SootopolisCity_Gym_B1F_Text_18EBFA:: @ 818EBFA - .string "Die Art, wie WASSILI kämpft...\p" - .string "Dieser wunderbare Anblick hat mich dazu\n" - .string "inspiriert, TRAINER zu werden.$" + .string "The sight of WALLACE conducting a\n" + .string "battle...\p" + .string "The very beauty of it compelled me to\n" + .string "become a TRAINER.$" SootopolisCity_Gym_B1F_Text_18EC5E:: @ 818EC5E - .string "Du kämpfst mit mehr Anmut als ich...$" + .string "You battled with more beauty than\n" + .string "I could muster...$" SootopolisCity_Gym_B1F_Text_18EC92:: @ 818EC92 - .string "Die Ästhetik, die du in den Kampf ein-\n" - .string "bringst, ist unbeschreiblich.\p" - .string "Oh... Ich bin so glücklich, dass ich mich\n" - .string "für POKéMON entschieden habe.$" + .string "The grace you bring to battle is\n" + .string "fabulous.\p" + .string "Oh... I’m so fortunate to have found\n" + .string "POKéMON.$" SootopolisCity_Gym_B1F_Text_18ECEB:: @ 818ECEB - .string "Ich werde dir beibringen, dass Kämpfe\n" - .string "kein Zuckerschlecken sind!$" + .string "I should teach you how harsh battles\n" + .string "can be.$" SootopolisCity_Gym_B1F_Text_18ED18:: @ 818ED18 .string "Oh.\n" - .string "Du bist stark.$" + .string "You’re strong.$" SootopolisCity_Gym_B1F_Text_18ED2B:: @ 818ED2B - .string "Ich verrate dir etwas.\p" - .string "Wenn du zu WASSILI willst, dann darfst\n" - .string "du auf jede Fliese nur ein Mal treten.$" + .string "I’ll tell you something good.\p" + .string "If you want to reach WALLACE, you\n" + .string "need to walk on each floor tile once.$" SootopolisCity_Gym_B1F_Text_18ED91:: @ 818ED91 - .string "Die POKéMON ARENA mit den höchsten\n" - .string "Anforderungen in der HOENN-Region...\p" - .string "Das ist die ARENA von XENEROVILLE.$" + .string "The POKéMON GYM of the highest level\n" + .string "in the HOENN region...\p" + .string "That’s the SOOTOPOLIS GYM.$" SootopolisCity_Gym_B1F_Text_18EDE8:: @ 818EDE8 - .string "Du kämpfst aber auf einem hohen Niveau!$" + .string "What a high level you are!$" SootopolisCity_Gym_B1F_Text_18EE03:: @ 818EE03 - .string "Statt damit zufrieden zu sein, zur\n" - .string "besten ARENA zu gehören, würde ich\l" - .string "gerne auch an anderen Orten trainieren.\l" - .string "Aber hier ist es so lustig!$" + .string "Rather than being satisfied by being\n" + .string "in a strong GYM, I imagine training in\l" + .string "other places will make you stronger.\l" + .string "But above all, it looks more fun.$" SootopolisCity_Gym_B1F_Text_18EE96:: @ 818EE96 - .string "Ich trainiere meine POKéMON zusammen\n" - .string "mit WASSILI.\p" - .string "Ich bin nicht leicht zu nehmen!$" + .string "I train my POKéMON together with\n" + .string "WALLACE.\p" + .string "Don’t think I’m a pushover.$" SootopolisCity_Gym_B1F_Text_18EEDC:: @ 818EEDC - .string "Da wurde ich glatt überrollt...$" + .string "I was bowled right over...$" SootopolisCity_Gym_B1F_Text_18EEF7:: @ 818EEF7 - .string "Ich denke, du hast durchaus Potential.\n" - .string "Warum bleibst du nicht bei uns?$" + .string "I think you have potential.\n" + .string "Why don’t you stay and train with us?$" SootopolisCity_Gym_B1F_Text_18EF39:: @ 818EF39 - .string "Anmutig über das Eis zu gleiten, ohne\n" - .string "die Linien zu berühren...\p" - .string "Ein TRAINER, der das beherrscht, wird\n" - .string "auch in anderen Dingen elegant wirken.$" + .string "A graceful glide across the ice while\n" + .string "crossing no lines...\p" + .string "A TRAINER putting on that performance\n" + .string "would be elegantly beautiful!$" SootopolisCity_Gym_B1F_Text_18EFB8:: @ 818EFB8 - .string "Äh, entschuldige mich...$" + .string "Well, excuse me?!$" SootopolisCity_Gym_B1F_Text_18EFCA:: @ 818EFCA - .string "Es ist offensichtlich: Die Stärke eines\n" - .string "TRAINERS hat nichts mit seinem Alter\l" - .string "zu tun!$" + .string "This is really obvious, but how strong\n" + .string "you are as a TRAINER has nothing to do\l" + .string "with how young or old you are.$" SootopolisCity_Gym_B1F_Text_18F037:: @ 818F037 - .string "Wenn ich mit meinen POKéMON zusammen\n" - .string "bin, vergeht die Zeit so schnell, dass\l" - .string "ich noch nicht mal “Uuups” sagen kann.$" + .string "When I’m with my POKéMON, the time\n" + .string "flies by before you can say, “Oops!”$" SootopolisCity_Gym_B1F_Text_18F07F:: @ 818F07F - .string "Uuups!$" + .string "Oops!$" SootopolisCity_Gym_B1F_Text_18F085:: @ 818F085 - .string "Ich wollte, ich könnte meine Niederlagen\n" - .string "vergessen, bevor ich “Uuups”\l" - .string "ausgesprochen habe.$" + .string "I wish I can forget about lost causes\n" + .string "before I can manage an “Oops!”$" SootopolisCity_Gym_1F_Text_18F0CA:: @ 818F0CA - .string "Erlaube mir, mich kurz vorzustellen.\p" - .string "Ich bin WASSILI.\n" - .string "Der ARENALEITER von XENEROVILLE.\p" - .string "Irgendetwas fällt mir an dir auf...\n" - .string "Da ist etwas in deinem Auftreten...\p" - .string "Ich denke, ich spüre etwas in dir.\p" - .string "Das, was in der URZEITHÖHLE\n" - .string "passierte und was du getan hast, all das\l" - .string "werde ich im Kampf mit dir lesen können.\p" - .string "Gib mir die Gelegenheit dazu. Zeig mir,\n" - .string "wie du deine POKéMON im Kampf führst.\p" - .string "Und als Gegenleistung zeige ich dir eine\n" - .string "Illusion im Wasser. Dargeboten von mir\l" - .string "und meinen POKéMON.$" + .string "Allow me to formally introduce\n" + .string "myself.\p" + .string "I am WALLACE.\n" + .string "The GYM LEADER of SOOTOPOLIS.\p" + .string "There’s something about you...\n" + .string "A difference in your demeanor.\p" + .string "I think I sense that in you.\p" + .string "What happened inside the CAVE OF\n" + .string "ORIGIN, and what you did, I will likely\l" + .string "learn through our upcoming battle.\p" + .string "Now, show me. Show me the power you\n" + .string "wield with your POKéMON.\p" + .string "And I, in turn, shall present you with\n" + .string "a performance of illusions in water\l" + .string "by me and my POKéMON!$" SootopolisCity_Gym_1F_Text_18F282:: @ 818F282 .string "Bravo.\p" - .string "Jetzt erkenne ich, welch ein groß-\n" - .string "artiger POKéMON-TRAINER vor mir steht.\p" - .string "Es hat mir viel Freude gemacht, dich und\n" - .string "deine POKéMON kennen gelernt zu haben.\p" - .string "Du verdienst zu Recht den\n" - .string "SCHAUERORDEN. Bitte nimm ihn an.$" + .string "I realize now your authenticity and\n" + .string "magnificence as a POKéMON TRAINER.\p" + .string "I find much joy in having met you and\n" + .string "your POKéMON.\p" + .string "You have proven yourself worthy of\n" + .string "the RAIN BADGE. Accept it.$" SootopolisCity_Gym_1F_Text_18F342:: @ 818F342 - .string "{PLAYER} erhält den SCHAUERORDEN\n" - .string "von WASSILI.$" + .string "{PLAYER} received the RAIN BADGE\n" + .string "from WALLACE.$" SootopolisCity_Gym_1F_Text_18F36B:: @ 818F36B - .string "Dieser ORDEN sorgt dafür, dass dir alle\n" - .string "deine POKéMON gehorchen.\p" - .string "Der ORDEN befähigt dich außerdem dazu,\n" - .string "mit der VM KASKADE Wasserfälle in jede\l" - .string "Richtung zu passieren.\p" - .string "Und damit du unseren Kampf stets in\n" - .string "Erinnerung behältst, gebe ich dir dies...$" + .string "Having that BADGE assures you the\n" + .string "full obedience of all your POKéMON to\l" + .string "every command you make.\p" + .string "The BADGE also allows the use of the\n" + .string "HM move WATERFALL to scale walls\l" + .string "of cascading water.\p" + .string "And, so that you never forget the\n" + .string "battle we shared, take this...$" SootopolisCity_Gym_1F_Text_18F466:: @ 818F466 - .string "Diese TM enthält AQUAWELLE.\p" - .string "Damit kann das gegnerische POKéMON\n" - .string "mit Ultraschallwellen verwirrt werden.$" + .string "The TM I handed you contains\n" + .string "WATER PULSE.\p" + .string "In use, it will occasionally confuse\n" + .string "the target with ultrasonic waves.$" SootopolisCity_Gym_1F_Text_18F4D7:: @ 818F4D7 - .string "TRAINER, die alle ORDEN der ARENEN in\n" - .string "HOENN erhalten haben, sollten sich...\p" - .string "Auf den Weg zur ultimativen Heraus-\n" - .string "forderung machen. Der POKéMON LIGA!\p" - .string "Reise zu den östlichsten Gebieten von\n" - .string "HOENN, zur Insel PRACHTPOLIS CITY. Dort\l" - .string "findest du die POKéMON LIGA.$" + .string "TRAINERS who have gathered all the\n" + .string "GYM BADGES of HOENN should make way\l" + .string "for the ultimate destination.\p" + .string "The POKéMON LEAGUE.\p" + .string "Travel to the easternmost reaches\n" + .string "of HOENN, to the island EVER GRANDE.\l" + .string "The POKéMON LEAGUE is there.$" SootopolisCity_Gym_1F_Text_18F5B4:: @ 818F5B4 - .string "In HOENN gibt es nur noch einen ORDEN\n" - .string "zu verdienen.\p" - .string "Wenn du die POKéMON LIGA herausfordern\n" - .string "willst, musst du zuerst den ORDEN der\l" - .string "ARENA in BAUMHAUSEN CITY bekommen.$" + .string "There remains but one BADGE to\n" + .string "obtain in HOENN.\p" + .string "If you wish to challenge the POKéMON\n" + .string "LEAGUE, you must obtain the last\l" + .string "BADGE from the GYM in FORTREE.$" SootopolisCity_Gym_1F_Text_18F649:: @ 818F649 - .string "POKéMON ARENA von XENEROVILLE$" + .string "SOOTOPOLIS CITY POKéMON GYM$" SootopolisCity_Gym_1F_Text_18F665:: @ 818F665 - .string "POKéMON ARENA von XENEROVILLE\p" - .string "WASSILIS ANERKANNTE TRAINER:\n" + .string "SOOTOPOLIS CITY POKéMON GYM\p" + .string "WALLACE’S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" diff --git a/data/text/maps/SootopolisCity_House1.inc b/data/text/maps/SootopolisCity_House1.inc index b028594a8..78e8454e5 100644 --- a/data/text/maps/SootopolisCity_House1.inc +++ b/data/text/maps/SootopolisCity_House1.inc @@ -1,12 +1,12 @@ SootopolisCity_House1_Text_18F991:: @ 818F991 - .string "Seit 30 Jahren lebe ich in XENEROVILLE\n" - .string "und verbessere meine Fähigkeiten.\p" - .string "Ich habe eine alles erschütternde TM\n" - .string "entwickelt. Die schenke ich dir!$" + .string "For thirty years I’ve remained in\n" + .string "SOOTOPOLIS honing my skills.\p" + .string "I developed a shattering TM.\n" + .string "I bequeath it to you!$" SootopolisCity_House1_Text_18FA03:: @ 818FA03 - .string "TM31 enthält DURCHBRUCH! Eine schier\n" - .string "unbeschreibliche Attacke. Horror!$" + .string "TM31 contains BRICK BREAK! It’s a move\n" + .string "so horrible that I can’t describe it.$" SootopolisCity_House1_Text_18FA50:: @ 818FA50 .string "KECLEON: Puu puhyaah.$" diff --git a/data/text/maps/SootopolisCity_House2.inc b/data/text/maps/SootopolisCity_House2.inc index b19b34275..e132b20f7 100644 --- a/data/text/maps/SootopolisCity_House2.inc +++ b/data/text/maps/SootopolisCity_House2.inc @@ -1,13 +1,13 @@ SootopolisCity_House2_Text_18FA66:: @ 818FA66 - .string "PYROBERG...\p" - .string "Auf seiner Spitze sind 2 Kugeln neben-\n" - .string "einander angebracht. Wusstest du das?$" + .string "MT. PYRE...\p" + .string "At its peak are two orbs placed side\n" + .string "by side. Did you know?$" SootopolisCity_House2_Text_18FAAE:: @ 818FAAE - .string "Ja, genau. 2 Kugeln nebeneinander...\p" - .string "Der Anblick dieser beiden...\n" - .string "Irgendwie wirkt er beruhigend...$" + .string "Yes, two orbs side by side...\p" + .string "The sight of them together...\n" + .string "It is somehow soothing...$" SootopolisCity_House2_Text_18FB04:: @ 818FB04 - .string "Ehrlich?\n" - .string "Du solltest dir das mal selber ansehen...$" + .string "Is that so?\n" + .string "Perhaps you ought to visit and see...$" diff --git a/data/text/maps/SootopolisCity_House3.inc b/data/text/maps/SootopolisCity_House3.inc index 338881d2e..b67e0a4dc 100644 --- a/data/text/maps/SootopolisCity_House3.inc +++ b/data/text/maps/SootopolisCity_House3.inc @@ -1,21 +1,20 @@ SootopolisCity_House3_Text_18FB36:: @ 818FB36 - .string "Du bist ein POKéMON-TRAINER, oder?\p" - .string "Der ARENALEITER von XENEROVILLE, \n" - .string "WASSILI, hat viele Fans.\l" - .string "Hast du auch Fans?$" + .string "You’re a POKéMON TRAINER, aren’t you?\p" + .string "SOOTOPOLIS’s GYM LEADER WALLACE has\n" + .string "many fans.\l" + .string "Do you have any?$" SootopolisCity_House3_Text_18FB9C:: @ 818FB9C - .string "Oh, dann musst du aber sehr stark sein.$" + .string "Oh, then you must be pretty strong.$" SootopolisCity_House3_Text_18FBC0:: @ 818FBC0 - .string "Oh, meine Güte...\n" - .string "Dann stehst du ja ganz alleine da.\p" - .string "Streng dich einfach mehr an, dann\n" - .string "bekommst du auch einen Fan.$" + .string "Oh, dear...\n" + .string "That’s a little lonesome.\p" + .string "Try working a little harder to get a\n" + .string "fan following.$" SootopolisCity_House3_Text_18FC1A:: @ 818FC1A - .string "Die Fans strömen sogar aus KANTO und\n" - .string "JOHTO herbei.\p" - .string "Ich habe den TRAINER-FANCLUB in\n" - .string "SEEGRASULB CITY besucht.\l" - .string "Verrückte Sache...$" + .string "Dedicated fans come over from even\n" + .string "KANTO and JOHTO.\p" + .string "It was really wild when I went to the\n" + .string "TRAINER FAN CLUB in LILYCOVE.$" diff --git a/data/text/maps/SootopolisCity_House4.inc b/data/text/maps/SootopolisCity_House4.inc index d603808da..277e2e060 100644 --- a/data/text/maps/SootopolisCity_House4.inc +++ b/data/text/maps/SootopolisCity_House4.inc @@ -1,16 +1,17 @@ SootopolisCity_House4_Text_18FC92:: @ 818FC92 - .string "Hör mir zu und ich verrate dir etwas.\p" - .string "Unter Wasser soll sich eine antike\n" - .string "Ruine befinden.\p" - .string "Da gibt es bestimmt Schätze, die nur\n" - .string "darauf warten, gehoben zu werden.$" + .string "Listen up, and I’ll tell you something\n" + .string "good.\p" + .string "There’s supposed to be an ancient\n" + .string "ruin in the sea around here.\p" + .string "There could be treasures just waiting\n" + .string "to be discovered down there.$" SootopolisCity_House4_Text_18FD41:: @ 818FD41 - .string "Antike Schätze...\p" - .string "Wäre das schön, wenn es die tatsächlich\n" - .string "gäbe. Aber auch ohne Schätze wäre eine\p" - .string "Reise unter Wasser zusammen mit\n" - .string "meinen POKéMON herrlich.$" + .string "Ancient treasures...\p" + .string "It would be nice if they existed, but\n" + .string "even if they didn’t, it would be so\l" + .string "beautiful to take an underwater\l" + .string "stroll with my POKéMON.$" SootopolisCity_House4_Text_18FDD8:: @ 818FDD8 .string "AZUMARILL: Marurii.$" diff --git a/data/text/maps/SootopolisCity_House5.inc b/data/text/maps/SootopolisCity_House5.inc index ca22756e3..c5887ffe2 100644 --- a/data/text/maps/SootopolisCity_House5.inc +++ b/data/text/maps/SootopolisCity_House5.inc @@ -1,9 +1,8 @@ SootopolisCity_House5_Text_18FDEC:: @ 818FDEC - .string "Es muss eine Verbindung zwischen\n" - .string "XENEROVILLE und dem PYROBERG geben.\p" - .string "Meine Freunde und ich haben ein\n" - .string "bisschen nachgeforscht - im Labor,\l" - .string "in dem wir gearbeitet haben.$" + .string "There appears to be some connection\n" + .string "between SOOTOPOLIS and MT. PYRE.\p" + .string "My friends and I did some research on\n" + .string "it at the lab where I used to work.$" SootopolisCity_House5_Text_18FE7B:: @ 818FE7B - .string "Mein großer Bruder studiert das Meer.$" + .string "My big brother used to study the sea.$" diff --git a/data/text/maps/SootopolisCity_House6.inc b/data/text/maps/SootopolisCity_House6.inc index ca1c6236b..c8547b412 100644 --- a/data/text/maps/SootopolisCity_House6.inc +++ b/data/text/maps/SootopolisCity_House6.inc @@ -1,20 +1,19 @@ SootopolisCity_House6_Text_18FEA1:: @ 818FEA1 - .string "Hallo! Du bist nach langer Zeit der erste\n" - .string "Gast, den ich begrüße.\p" - .string "Du hast mir den Tag gerettet, daher\n" - .string "möchte ich dir diese WAILMER-PUPPE\l" - .string "schenken.$" + .string "Hello! You’re our first guest in a\n" + .string "good while.\p" + .string "You’ve brightened up my day, so I’ll\n" + .string "give you a big WAILMER DOLL.$" SootopolisCity_House6_Text_18FF12:: @ 818FF12 - .string "Pass gut auf sie auf!$" + .string "Take good care of it!$" SootopolisCity_House6_Text_18FF28:: @ 818FF28 - .string "Oh, du möchtest sie zwar haben, aber\n" - .string "nicht sofort? Dann hebe ich sie dir auf.$" + .string "Oh, you want it, but not right now?\n" + .string "Okay, then I’ll hold it for you.$" SootopolisCity_House6_Text_18FF6D:: @ 818FF6D - .string "Bist du sicher?\n" - .string "Du möchtest diese PUPPE wirklich nicht?$" + .string "Are you sure?\n" + .string "You don’t want this DOLL?$" SootopolisCity_House6_Text_18FF95:: @ 818FF95 - .string "Ich liiiiebe Plüsch-PUPPEN!$" + .string "I love plush DOLLS!$" diff --git a/data/text/maps/SootopolisCity_House7.inc b/data/text/maps/SootopolisCity_House7.inc index e58e57222..756a96a1b 100644 --- a/data/text/maps/SootopolisCity_House7.inc +++ b/data/text/maps/SootopolisCity_House7.inc @@ -1,14 +1,14 @@ SootopolisCity_House7_Text_18FFA9:: @ 818FFA9 - .string "Ein Unterwasservulkan brach aus\n" - .string "und schob sich an die Oberfläche.\p" - .string "Der Krater lag über der Meeresober-\n" - .string "fläche und konnte sich so mit Regen-\p" - .string "wasser füllen.\n" - .string "Und so entstand XENEROVILLE.$" + .string "An underwater volcano erupted and\n" + .string "forced itself up from the depths.\p" + .string "Its crater emerged from the sea and\n" + .string "became filled with rainwater.\p" + .string "That’s how SOOTOPOLIS CITY came into\n" + .string "being.$" SootopolisCity_House7_Text_19005B:: @ 819005B - .string "Die Höhle, die XENEROVILLE mit der Welt\n" - .string "verbindet...\p" - .string "Sie sollte ursprünglich wohl etwas\n" - .string "in der Stadt festhalten.\p" - .string "Oder bilde ich mir das nur ein?$" + .string "The cave that links SOOTOPOLIS and\n" + .string "the outside world...\p" + .string "It seems as if the cave was made to\n" + .string "keep something from getting out.\p" + .string "Or am I just imagining things?$" diff --git a/data/text/maps/SootopolisCity_House8.inc b/data/text/maps/SootopolisCity_House8.inc index 0ea3dff9b..4efc111cc 100644 --- a/data/text/maps/SootopolisCity_House8.inc +++ b/data/text/maps/SootopolisCity_House8.inc @@ -1,93 +1,90 @@ SootopolisCity_House8_Text_1900F7:: @ 81900F7 - .string "Kennst du das POKéMON KNILZ?\n" - .string "In XENEROVILLE wird es kaum gesehen.\p" - .string "Aber ich liebe große KNILZ.\n" - .string "Je größer, desto besser.\p" - .string "Aber mein jüngerer Bruder sagt, dass\n" - .string "SCHMERBE größer ist.\p" - .string "Verrückt! KNILZ muss einfach\n" - .string "größer sein!\p" - .string "Wie? Du hast ein KNILZ dabei???\n" - .string "B-b-bitte zeig es mir!$" + .string "Do you know the POKéMON SHROOMISH?\n" + .string "It’s hardly ever seen in SOOTOPOLIS.\p" + .string "Anyway, I love big SHROOMISH.\n" + .string "The bigger the better.\p" + .string "But my younger brother, he says that\n" + .string "BARBOACH is bigger.\p" + .string "That’s silly. SHROOMISH has to be\n" + .string "bigger than that!\p" + .string "Huh? Do you have a SHROOMISH with you?\n" + .string "P-p-please, show me!$" SootopolisCity_House8_Text_19021D:: @ 819021D - .string "{STR_VAR_2}cm!\n" - .string "Meine Güte, ist das aber groß!\p" - .string "Das wird sogar größer als das SCHMERBE\n" - .string "sein, das mein Bruder gesehen hat!\p" - .string "Danke, dass du es mir gezeigt hast.\n" - .string "Hier, ein kleines Dankeschön!$" + .string "{STR_VAR_2} inches!\n" + .string "Oh, my gosh, this is a big one!\p" + .string "It might even beat the big BARBOACH\n" + .string "my younger brother saw!\p" + .string "Thanks for showing me.\n" + .string "This is my thanks!$" UnknownString_81902AE: @ 81902AE - .string "{PLAYER} erhält einen TRANK.$" + .string "{PLAYER} received a POTION.$" SootopolisCity_House8_Text_1902C4:: @ 81902C4 - .string "Huch.\n" - .string "Dein BEUTEL ist ja randvoll.$" + .string "Hunh?\n" + .string "Your BAG is crammed full.$" SootopolisCity_House8_Text_1902E4:: @ 81902E4 - .string "{STR_VAR_2}cm, nicht wahr?\p" - .string "Hmm... Ich habe schon größere\n" - .string "KNILZ als dieses gesehen.$" + .string "{STR_VAR_2} inches, is it?\p" + .string "Hmm... I’ve seen a bigger SHROOMISH\n" + .string "than this one.$" SootopolisCity_House8_Text_190329:: @ 8190329 - .string "Na, das ist doch schon ganz ordentlich...\n" - .string "Aber das ist kein KNILZ!$" + .string "Oh, now this is quite something...\n" + .string "But it’s not a SHROOMISH!$" SootopolisCity_House8_Text_190366:: @ 8190366 - .string "Du hast gar kein großes KNILZ?\n" - .string "Och, wie schade...\p" - .string "Wenn du ein großes KNILZ hast,\n" - .string "dann komm bitte wieder und zeig es mir.$" + .string "You don’t have a big SHROOMISH?\n" + .string "That’s too bad...\p" + .string "If you get a big SHROOMISH, please\n" + .string "come show me.$" SootopolisCity_House8_Text_1903C9:: @ 81903C9 - .string "Das größte KNILZ aller Zeiten!\n" - .string "Der {STR_VAR_3}cm-Gigant von {STR_VAR_2}!\p" - .string "Ein KNILZ so groß, wie ein\n" - .string "SCHMERBE gerne sein würde!$" + .string "The biggest SHROOMISH in history!\n" + .string "{STR_VAR_2}’s {STR_VAR_3}-inch giant!\p" + .string "A SHROOMISH bigger than a BARBOACH\n" + .string "always wanted!$" SootopolisCity_House8_Text_190431:: @ 8190431 - .string "Kennst du das POKéMON SCHMERBE?\n" - .string "Das ist bisher selten in XENEROVILLE\l" - .string "aufgetaucht.\p" - .string "Ich liebe große SCHMERBE.\p" - .string "Mein großer Bruder sagt, dass\n" - .string "KNILZ größer ist.\p" - .string "Aber das stimmt gar nicht! Jeder weiß\n" - .string "doch, dass SCHMERBE viel größer\l" - .string "ist.\p" - .string "Wie? Oh, du hast ein SCHMERBE?\n" - .string "Bitte, bitte zeig es mir!$" + .string "Do you know the POKéMON BARBOACH?\n" + .string "It’s rarely seen in SOOTOPOLIS.\p" + .string "I love, I mean love, big BARBOACH!\p" + .string "My big brother says that SHROOMISH is\n" + .string "bigger.\p" + .string "But that’s wrong! Everyone knows that\n" + .string "BARBOACH is a lot bigger.\p" + .string "Hunh? Do you have a BARBOACH?\n" + .string "P-p-please show me!$" SootopolisCity_House8_Text_190536:: @ 8190536 - .string "{STR_VAR_2}cm!\n" - .string "Wow, das ist aber groß!\p" - .string "Das ist bestimmt größer als das\n" - .string "KNILZ, das mein Bruder gesehen\l" - .string "hat.\p" - .string "Danke, dass ich es anschauen durfte.\n" - .string "Hier, ein kleines Dankeschön!$" + .string "{STR_VAR_2} inches!\n" + .string "Wow, that is big!\p" + .string "It might be even bigger than the huge\n" + .string "SHROOMISH my big brother saw.\p" + .string "Thanks for showing me!\n" + .string "This is my thanks!$" SootopolisCity_House8_Text_1905C1:: @ 81905C1 - .string "Huups, dein BEUTEL ist voll.$" + .string "Whoops, looks like your BAG is full.$" SootopolisCity_House8_Text_1905E6:: @ 81905E6 - .string "{STR_VAR_2}cm?\p" - .string "Ach... Da habe ich aber schon ein\n" - .string "größeres SCHMERBE gesehen.$" + .string "{STR_VAR_2} inches?\p" + .string "Hmm... I’ve seen a bigger BARBOACH\n" + .string "than this one here.$" SootopolisCity_House8_Text_190628:: @ 8190628 - .string "Nun, das ist ganz stattlich.\n" - .string "Aber es ist kein SCHMERBE!$" + .string "Well, isn’t this something!\n" + .string "But it’s no BARBOACH!$" SootopolisCity_House8_Text_19065A:: @ 819065A - .string "Hast du kein großes SCHMERBE?\n" - .string "Och, wie enttäuschend...\p" - .string "Wenn du ein großes SCHMERBE hast,\n" - .string "dann komm bitte wieder her.$" + .string "Don’t you have a big BARBOACH?\n" + .string "How disappointing...\p" + .string "If you get a big BARBOACH, please\n" + .string "come show me!$" SootopolisCity_House8_Text_1906BE:: @ 81906BE - .string "Das größte SCHMERBE aller Zeiten!\n" - .string "Der {STR_VAR_3}cm-Koloss von {STR_VAR_2}!\p" - .string "Ein SCHMERBE so groß, wie ein\n" - .string "KNILZ gerne sein würde.$" + .string "The biggest BARBOACH in history!\n" + .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" + .string "A BARBOACH bigger than a SHROOMISH\n" + .string "always wanted!$" diff --git a/data/text/maps/SootopolisCity_Mart.inc b/data/text/maps/SootopolisCity_Mart.inc index 74db2bcd9..858d1530d 100644 --- a/data/text/maps/SootopolisCity_Mart.inc +++ b/data/text/maps/SootopolisCity_Mart.inc @@ -1,17 +1,17 @@ SootopolisCity_Mart_Text_18F890:: @ 818F890 - .string "AP-PLUS ist sehr nützlich!\p" - .string "Es steigert die ANGRIFFSPUNKTE, die AP\n" - .string "einer POKéMON-Attacke.$" + .string "PP UP is great!\p" + .string "It raises the POWER POINTS, the PP,\n" + .string "of a POKéMON move.$" SootopolisCity_Mart_Text_18F8D7:: @ 818F8D7 - .string "Was... Was ist passiert?$" + .string "What... What is happening?$" SootopolisCity_Mart_Text_18F8F2:: @ 818F8F2 - .string "Kennst du TOP-GENESUNG?\p" - .string "Alle KP werden aufgefüllt!\n" - .string "Alle Statusprobleme werden aufgehoben!\p" - .string "Ein wundervolles Item!$" + .string "Do you know FULL RESTORE?\p" + .string "Full restoration of HP!\n" + .string "Eradication of all status problems!\p" + .string "It’s truly an item of your dreams!$" SootopolisCity_Mart_Text_18F96B:: @ 818F96B - .string "Dieses Wetter...\n" - .string "Wurde etwas aufgeweckt?$" + .string "This weather...\n" + .string "Did something awaken?$" diff --git a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc b/data/text/maps/SootopolisCity_PokemonCenter_1F.inc index 034b51f4d..fd078ad0c 100644 --- a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/text/maps/SootopolisCity_PokemonCenter_1F.inc @@ -1,25 +1,24 @@ SootopolisCity_PokemonCenter_1F_Text_18F6A2:: @ 818F6A2 - .string "WASSILI, der ARENALEITER dieses Ortes,\n" - .string "ist ein mächtiger TRAINER.\p" - .string "Man sagt, er sei der beste TRAINER der\n" - .string "ganzen HOENN-Region.\p" - .string "Aber die TOP VIER...\p" - .string "Man sagt, sie seien stärker als WASSILI.\n" - .string "Wie stark müssen sie dann erst sein?$" + .string "WALLACE, this town’s GYM LEADER, is a\n" + .string "powerful TRAINER.\p" + .string "He’s rumored to be the best in the\n" + .string "whole HOENN region.\p" + .string "But the ELITE FOUR...\p" + .string "They’re said to be even stronger than\n" + .string "WALLACE. How strong could they be?$" SootopolisCity_PokemonCenter_1F_Text_18F770:: @ 818F770 - .string "Jeder im Ort hat sich zurückgezogen in\n" - .string "sein Haus und bleibt auch dort.\p" - .string "Dieses Wetter...\n" - .string "Ob dies die Ouvertüre von etwas ist?$" + .string "Everyone in town has taken refuge\n" + .string "and won’t come out of their homes.\p" + .string "This weather..\n" + .string "Could it be the prelude to something?$" SootopolisCity_PokemonCenter_1F_Text_18F7EA:: @ 818F7EA - .string "Was auch immer wann oder wo passiert,\n" - .string "meine Freundschaft zu den POKéMON\l" - .string "leidet darunter bestimmt nicht!\p" - .string "Ich liebe es, mit POKéMON zusammen\n" - .string "zu sein.$" + .string "Whenever, wherever, and whatever\n" + .string "happens, I will always be friends with\l" + .string "POKéMON.\p" + .string "Because it’s fun to be with POKéMON!$" SootopolisCity_PokemonCenter_1F_Text_18F860:: @ 818F860 - .string "Ich weiß nicht, warum...\n" - .string "Aber... Ich habe richtig Angst...$" + .string "I don’t know why...\n" + .string "But... I’m really scared...$" diff --git a/data/text/maps/Underwater_SeafloorCavern.inc b/data/text/maps/Underwater_SeafloorCavern.inc index c638a26d0..8df6cb492 100644 --- a/data/text/maps/Underwater_SeafloorCavern.inc +++ b/data/text/maps/Underwater_SeafloorCavern.inc @@ -1,7 +1,7 @@ Underwater_SeafloorCavern_Text_197435:: @ 8197435 - .string "“TIEFSEE-FORSCHUNGSBOOT 1” steht auf\n" - .string "der Außenhülle.\p" - .string "Das ist das U-Boot, das TEAM {EVIL_TEAM} in\n" - .string "GRAPHITPORT CITY gestohlen hat!\p" - .string "TEAM {EVIL_TEAM} muss hier also an Land\n" - .string "gegangen sein.$" + .string "“SUBMARINE EXPLORER 1” is painted\n" + .string "on the hull.\p" + .string "This is the submarine TEAM {EVIL_TEAM}\n" + .string "stole in SLATEPORT!\p" + .string "TEAM {EVIL_TEAM} must have gone\n" + .string "ashore here.$" diff --git a/data/text/maps/VerdanturfTown.inc b/data/text/maps/VerdanturfTown.inc index a1a394ac7..a3ccdd34e 100644 --- a/data/text/maps/VerdanturfTown.inc +++ b/data/text/maps/VerdanturfTown.inc @@ -1,67 +1,62 @@ VerdanturfTown_Text_16CAEB:: @ 816CAEB - .string "Mein Papa hat mir das erzählt.\p" - .string "Er sagt, der Tunnel sei voller scheuer\n" - .string "POKéMON.\p" - .string "Sie haben Angst vor lauten Geräuschen\n" - .string "und machen einen Aufruhr.\p" - .string "Daher musste das Tunnelprojekt\n" - .string "gestoppt werden.\p" - .string "Aber es gibt da einen Mann. Der ver-\n" - .string "sucht, den Tunnel alleine zu graben.$" + .string "My papa told me.\p" + .string "He says this tunnel is full of\n" + .string "timid POKéMON.\p" + .string "They get all scared of loud noise and\n" + .string "make a big uproar.\p" + .string "So they had to stop the big tunnel\n" + .string "project.\p" + .string "But there’s one man.\n" + .string "He’s trying to dig the tunnel by himself!$" VerdanturfTown_Text_16CBCE:: @ 816CBCE - .string "Da war ein Mann, der hat den Tunnel\n" - .string "ganz alleine für die Frau seines Herzens\l" - .string "gegraben.\p" - .string "Ich habe das nie so ganz verstanden.\n" - .string "Aber, hey, ich finde es trotzdem klasse.$" + .string "There was a man who dug a tunnel for\n" + .string "a lady he loved.\p" + .string "I don’t really get it, but hey!$" VerdanturfTown_Text_16CC24:: @ 816CC24 - .string "Der Wind steht immer so günstig, dass\n" - .string "die Asche vom Vulkan nie hierher\l" - .string "geweht wird.\p" - .string "Die Luft ist sauber und klar.\n" - .string "Hier zu leben hilft auch den schwachen\l" - .string "und kränklichen Menschen.$" + .string "The way the winds blow, volcanic ash\n" + .string "is never blown in this direction.\p" + .string "The air is clean and delicious here.\n" + .string "Living here should do wonders for even\l" + .string "frail and sickly people.$" VerdanturfTown_Text_16CCD0:: @ 816CCD0 - .string "Ich bin doch zufrieden mit der Anmut\n" - .string "meiner POKéMON.\p" - .string "Ich möchte hier zum ersten Mal an einem\n" - .string "WETTBEWERB teilnehmen.$" + .string "I’m feeling a little confident about the\n" + .string "cuteness of my POKéMON.\p" + .string "I wanted to make its CONTEST debut,\n" + .string "so that’s why I’m here.$" VerdanturfTown_Text_16CD4D:: @ 816CD4D - .string "Siehst du die Höhle neben dem PKMN-\n" - .string "SUPERMARKT?\p" - .string "Da ist ein Typ drin, der die Felsbrocken\n" - .string "sprengen will, damit er auf die andere\l" - .string "Seite gehen kann.\p" - .string "Wäre das toll, wenn ich auch dort durch-\n" - .string "gehen könnte... Ein Besuch in\l" - .string "METAROST CITY wäre dann ganz einfach.$" + .string "Did you see the cave next to the\n" + .string "POKéMON MART?\p" + .string "There’s a guy in there who’s trying to\n" + .string "bust up boulders so he can bust out\l" + .string "through to the other side.\p" + .string "It’d be great if we could go through...\n" + .string "It’ll make it easy to visit RUSTBORO.$" VerdanturfTown_Text_16CE30:: @ 816CE30 - .string "Die Höhle neben dem PKMN-SUPERMARKT\n" - .string "ist nun ein Tunnel zur anderen Seite.\p" - .string "Das ist toll! Jetzt kommt man ganz\n" - .string "einfach nach METAROST CITY, um\l" - .string "DEVON-WAREN zu kaufen.$" + .string "That cave next to the POKéMON MART\n" + .string "is now a tunnel to the other side.\p" + .string "It’s great - it’s easy to go shop for new\n" + .string "DEVON products in RUSTBORO now.$" VerdanturfTown_Text_16CEC0:: @ 816CEC0 - .string "WIESENFLUR\p" - .string "“Das vom Wind gestreichelte Hoch-\n" - .string "land mit dem süßen Duft des Grases.”$" + .string "VERDANTURF TOWN\p" + .string "“The windswept highlands with the\n" + .string "sweet fragrance of grass.”$" VerdanturfTown_Text_16CF0D:: @ 816CF0D - .string "HEIKES HAUS$" + .string "WANDA’S HOUSE$" VerdanturfTown_Text_16CF1B:: @ 816CF1B - .string "POKéMON WETTBEWERBE\n" - .string "NORMAL-KLASSE REGISTRIERUNGEN\p" - .string "“Kommt her, all ihr POKéMON-TRAINER!”$" + .string "POKéMON CONTESTS\n" + .string "NORMAL RANK REGISTRATION\p" + .string "“Gather here, all ye POKéMON TRAINERS!”$" VerdanturfTown_Text_16CF6D:: @ 816CF6D - .string "METAFLURTUNNEL\n" - .string "“Die Verbindung zwischen\l" - .string "METAROST CITY und WIESENFLUR.\p" - .string "Das Tunnelprojekt wurde abgebrochen.”$" + .string "RUSTURF TUNNEL\n" + .string "“Linking RUSTBORO and VERDANTURF\p" + .string "“The tunnel project has been\n" + .string "canceled.”$" diff --git a/data/text/maps/VerdanturfTown_ContestHall.inc b/data/text/maps/VerdanturfTown_ContestHall.inc index 4fd58f853..2bf97f1de 100644 --- a/data/text/maps/VerdanturfTown_ContestHall.inc +++ b/data/text/maps/VerdanturfTown_ContestHall.inc @@ -1,27 +1,26 @@ VerdanturfTown_ContestHall_Text_177FB4:: @ 8177FB4 - .string "An welchem WETTBEWERB nimmst du teil?\n" - .string "Darf ich dir einen Rat geben?\p" - .string "In jedem WETTBEWERB, zum Beispiel im\n" - .string "WETTBEWERB für ANMUT, bewerten sie im\l" - .string "ersten Durchlauf nicht nur die Anmut.\p" - .string "Du solltest daher Wege finden, deine\n" - .string "POKéMON besser aufzuziehen.$" + .string "Which CONTEST are you entering?\n" + .string "Want a piece of advice?\p" + .string "In any CONTEST, for example, a CUTE\n" + .string "CONTEST, I don’t think they judge you\l" + .string "only on cuteness in the first round.\p" + .string "You need to work out ways for raising\n" + .string "POKéMON better.$" VerdanturfTown_ContestHall_Text_178091:: @ 8178091 - .string "Ich habe meine POKéMON zur Anmut\n" - .string "erzogen.\p" - .string "Man kann seine POKéMON an einem WETT-\n" - .string "BEWERB für ANMUT teilnehmen lassen!\p" - .string "Ich bin so froh, dass ich meine POKéMON\n" - .string "liebevoll aufgezogen habe.$" + .string "I raised my POKéMON to be cute.\p" + .string "I found out you can put POKéMON in\n" + .string "a CONTEST for cuteness!\p" + .string "I’m so glad I raised my POKéMON with\n" + .string "loving care...$" VerdanturfTown_ContestHall_Text_178120:: @ 8178120 - .string "Mein POKéMON ist der Kracher!\p" - .string "Es ist cool, stark, schön, anmutig und\n" - .string "klug. Alles in einem!\p" - .string "Ich werde mit ihm sämtliche\n" - .string "WETTBEWERBE gewinnen!$" + .string "My POKéMON rules!\p" + .string "It’s cool, tough yet beautiful, cute,\n" + .string "and smart. It’s complete!\p" + .string "I may as well go for wins in every\n" + .string "single CONTEST.$" VerdanturfTown_ContestHall_Text_1781A5:: @ 81781A5 - .string "POKéMON WETTBEWERBE\n" - .string "BÜHNE für die NORMAL-KLASSE!$" + .string "POKéMON CONTESTS\n" + .string "NORMAL RANK STAGE!$" diff --git a/data/text/maps/VerdanturfTown_ContestLobby.inc b/data/text/maps/VerdanturfTown_ContestLobby.inc index 9f8326613..2f9121c52 100644 --- a/data/text/maps/VerdanturfTown_ContestLobby.inc +++ b/data/text/maps/VerdanturfTown_ContestLobby.inc @@ -1,31 +1,28 @@ VerdanturfTown_ContestLobby_Text_177D6C:: @ 8177D6C - .string "Ich bin hineingegangen und habe mich\n" - .string "ein bisschen in der WETTBEWERBSHALLE\l" - .string "umgeschaut.\p" - .string "Wenn man da oben auf der riesigen Bühne\n" - .string "steht... Das muss Aufregung pur sein!$" + .string "I went in through the entrance and\n" + .string "took a look around the CONTEST hall.\p" + .string "Getting up on that big stage...\n" + .string "It’s going to be tense!$" VerdanturfTown_ContestLobby_Text_177DEC:: @ 8177DEC - .string "Oh, die Liebe zu meinen POKéMON...\n" - .string "Diese Anziehungskraft...\p" - .string "Hups!\n" - .string "Das war gar nicht für deine Ohren\l" - .string "bestimmt! Nun, wie auch immer...\p" - .string "Wenn du an einem WETTBEWERB teil-\n" - .string "nimmst, probiere mal diese Attacke aus.$" + .string "Oh, my love for POKéMON...\n" + .string "The attraction they evoke in me...\p" + .string "Whoops!\n" + .string "You weren’t meant to see that!\l" + .string "Well, anyway.\p" + .string "If you’re entering a CONTEST, try this\n" + .string "move on for size.$" VerdanturfTown_ContestLobby_Text_177E98:: @ 8177E98 - .string "Meine Gefühle für POKéMON...\n" - .string "Oh, POKéMON ziehen mich so an...$" + .string "My feelings for POKéMON...\n" + .string "Oh, they attract me so...$" VerdanturfTown_ContestLobby_Text_177ECD:: @ 8177ECD - .string "An welchem WETTBEWERB planst du teil-\n" - .string "zunehmen?\p" - .string "Wenn du an einem COOLNESS-WETTBE-\n" - .string "WERB teilnehmen willst, muss das\l" - .string "POKéMON cool sein!\p" - .string "Wähle immer das POKéMON aus, das am\n" - .string "besten zur Kategorie des WETTBE-\l" - .string "WERBS passt und die passenden\l" - .string "Attacken kennt.\p" - .string "Das ist das Wesentliche!$" + .string "Which CONTEST are you planning on\n" + .string "entering?\p" + .string "If you’re entering a COOL CONTEST,\n" + .string "a cool POKéMON has to be the one!\p" + .string "Pick a POKéMON worthy of the CONTEST\n" + .string "theme, and make sure it has the\l" + .string "right set of moves to match.\p" + .string "That’s fundamental!$" diff --git a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc index 39b1b5f4c..e6e7f9730 100644 --- a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -1,39 +1,39 @@ VerdanturfTown_FriendshipRatersHouse_Text_178A9C:: @ 8178A9C - .string "Zeig mir doch mal dein POKéMON.\n" - .string "Ich prüfe, wie sehr es dich mag.\p" + .string "Let me see your POKéMON.\n" + .string "I’ll check to see how much it likes you.\p" .string "Oh.\n" - .string "Dein POKéMON...$" + .string "Your POKéMON...$" VerdanturfTown_FriendshipRatersHouse_Text_178AF2:: @ 8178AF2 - .string "Es liebt dich über alles.\n" - .string "Mehr lieben könnte es dich gar nicht.\l" - .string "Das zu sehen, macht mich glücklich.$" + .string "It adores you.\n" + .string "It can’t possibly love you any more.\l" + .string "I even feel happy seeing it.$" VerdanturfTown_FriendshipRatersHouse_Text_178B43:: @ 8178B43 - .string "Es scheint sehr glücklich zu sein.\n" - .string "Es mag dich wirklich sehr.$" + .string "It seems to be very happy.\n" + .string "It obviously likes you a whole lot.$" VerdanturfTown_FriendshipRatersHouse_Text_178B82:: @ 8178B82 - .string "Es mag dich.\n" - .string "Es möchte von dir verwöhnt werden.$" + .string "It likes you quite a lot.\n" + .string "It seems to want to be babied a little.$" VerdanturfTown_FriendshipRatersHouse_Text_178BC4:: @ 8178BC4 - .string "Es gewöhnt sich langsam an dich.\n" - .string "Es glaubt an dich.$" + .string "It’s getting used to you.\n" + .string "It seems to believe in you.$" VerdanturfTown_FriendshipRatersHouse_Text_178BFA:: @ 8178BFA - .string "Es hat sich noch nicht an dich gewöhnt.\n" - .string "Weder liebt es dich, noch hasst es dich.$" + .string "It’s not very used to you yet.\n" + .string "It neither loves nor hates you.$" VerdanturfTown_FriendshipRatersHouse_Text_178C39:: @ 8178C39 - .string "Es schwankt in seinen Gefühlen.\n" - .string "Es hat eine beängstigende Bösartigkeit\l" - .string "in den Augen. Es mag dich nicht.$" + .string "It’s very wary.\n" + .string "It has scary viciousness in its eyes.\l" + .string "It doesn’t like you much at all.$" VerdanturfTown_FriendshipRatersHouse_Text_178C90:: @ 8178C90 - .string "Es fällt mir schwer, das zu sagen...\p" - .string "Dein POKéMON hasst dich. Das ist nicht\n" - .string "gerade angenehm für dich, oder?$" + .string "This is a little hard for me to say...\p" + .string "Your POKéMON simply detests you.\n" + .string "Doesn’t that make you uncomfortable?$" VerdanturfTown_FriendshipRatersHouse_Text_178CFD:: @ 8178CFD .string "PIKACHU: Pika pika!$" diff --git a/data/text/maps/VerdanturfTown_House.inc b/data/text/maps/VerdanturfTown_House.inc index 0e6b1eaf1..8db1656ee 100644 --- a/data/text/maps/VerdanturfTown_House.inc +++ b/data/text/maps/VerdanturfTown_House.inc @@ -1,13 +1,13 @@ VerdanturfTown_House_Text_178D11:: @ 8178D11 - .string "Weit von hier, in PRACHTPOLIS CITY,\n" - .string "findest du die POKéMON LIGA.\p" - .string "Die TRAINER dort sind alle geradezu\n" - .string "Furcht erregend talentiert.$" + .string "Far away, deep in EVER GRANDE CITY,\n" + .string "is the POKéMON LEAGUE.\p" + .string "The TRAINERS who gather there are\n" + .string "all frighteningly well skilled.$" VerdanturfTown_House_Text_178D8E:: @ 8178D8E - .string "In der POKéMON LIGA musst du die TOP\n" - .string "VIER hintereinander besiegen. Das\l" - .string "sagen die Regeln.\p" - .string "Wenn du gegen einen dieser TRAINER\n" - .string "verlierst, musst du die Herausforderung\l" - .string "von vorne beginnen.$" + .string "In the POKéMON LEAGUE, I think the\n" + .string "rules say that you have to battle the\l" + .string "ELITE FOUR all in a row.\p" + .string "If you lose to any of them, you have\n" + .string "to begin your challenge again from the\l" + .string "first one.$" diff --git a/data/text/maps/VerdanturfTown_Mart.inc b/data/text/maps/VerdanturfTown_Mart.inc index 35f88e2f1..fbd655f08 100644 --- a/data/text/maps/VerdanturfTown_Mart.inc +++ b/data/text/maps/VerdanturfTown_Mart.inc @@ -1,18 +1,17 @@ VerdanturfTown_Mart_Text_1781C9:: @ 81781C9 - .string "X-SPEZIAL ist für jeden POKéMON-Kampf\n" - .string "äußerst wichtig.\p" - .string "Es erhöht die Stärke mancher Attacken.\n" - .string "Aber leider nur für einen Kampf.$" + .string "For any POKéMON match, X SPECIAL\n" + .string "is crucial.\p" + .string "It jacks up the power of some moves\n" + .string "even though it’s only for one battle.$" VerdanturfTown_Mart_Text_178240:: @ 8178240 - .string "Sie verkaufen keine Items, mit denen\n" - .string "man einen WETTBEWERB gewinnen kann...\p" - .string "Und das bedeutet, dass du deine\n" - .string "POKéMON mit äußerster Sorgfalt\l" - .string "aufziehen musst.$" + .string "They don’t sell any items that will let\n" + .string "you win CONTESTS...\p" + .string "It means you have to raise POKéMON\n" + .string "diligently on an everyday basis.$" VerdanturfTown_Mart_Text_1782C0:: @ 81782C0 - .string "Der NESTBALL ist bei schwächeren\n" - .string "POKéMON hervorragend geeignet.\p" - .string "Den kannst du nur in WIESENFLUR\n" - .string "kaufen.$" + .string "The NEST BALL works better on\n" + .string "weakened POKéMON.\p" + .string "VERDANTURF is the only place you can\n" + .string "buy it.$" diff --git a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc index 33b100c01..e79898ead 100644 --- a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -1,10 +1,9 @@ VerdanturfTown_PokemonCenter_1F_Text_17831D:: @ 817831D - .string "Ich wage zu behaupten, ein TRAINER ist\n" - .string "nicht qualifiziert, wenn seine POKéMON\p" - .string "nicht freundlich sind und sich wohl-\n" - .string "fühlen. Hast du ihnen {POKEBLOCK} gegeben?$" + .string "I daresay a TRAINER isn’t qualified if\n" + .string "POKéMON aren’t settled and friendly.\l" + .string "Have you given them any {POKEBLOCK}S?$" VerdanturfTown_PokemonCenter_1F_Text_178389:: @ 8178389 - .string "Lass mich raten, warum du in WIESENFLUR\n" - .string "bist... Wegen des WETTBEWERBS!\p" - .string "Hier ist die Wiege aller WETTBEWERBE.$" + .string "Let me hazard a guess why you’re in\n" + .string "VERDANTURF. The reason: CONTESTS.\p" + .string "All CONTEST challenges originate here.$" diff --git a/data/text/maps/VerdanturfTown_WandasHouse.inc b/data/text/maps/VerdanturfTown_WandasHouse.inc index 85028a3c4..d8aae2958 100644 --- a/data/text/maps/VerdanturfTown_WandasHouse.inc +++ b/data/text/maps/VerdanturfTown_WandasHouse.inc @@ -1,84 +1,83 @@ VerdanturfTown_WandasHouse_Text_1783F6:: @ 81783F6 - .string "HEIKO: Ich habe gegen dich verloren,\n" - .string "{PLAYER}. Aber das betrübt mich nicht.\p" - .string "Ich habe ein neues Ziel in meinem Leben.\n" - .string "Zusammen mit meinem TRASLA mache\p" - .string "ich mich auf, die ARENEN herauszu-\n" - .string "fordern und ein großer TRAINER zu\l" - .string "werden.\p" - .string "Behalte mich ruhig im Auge, {PLAYER}.\n" - .string "Bald bin ich stärker als du!\p" - .string "Und dann werde ich dich zu einem neuen\n" - .string "Kampf herausfordern.$" + .string "WALLY: I lost to you, {PLAYER}, but I’m\n" + .string "not feeling down anymore.\p" + .string "Because I have a new purpose in life.\n" + .string "Together with my RALTS, I’m going\l" + .string "to challenge POKéMON GYMS and become\l" + .string "a great TRAINER.\p" + .string "Please watch me, {PLAYER}.\n" + .string "I’m going to be stronger than you.\p" + .string "When I do, I’m going to challenge you\n" + .string "to another battle.$" VerdanturfTown_WandasHouse_Text_178521:: @ 8178521 - .string "HEIKO: Behalte mich ruhig im Auge,\n" - .string "{PLAYER}. Bald bin ich stärker als du!\p" - .string "Und dann werde ich dich zu einem neuen\n" - .string "Kampf herausfordern.$" + .string "WALLY: Please watch me, {PLAYER}.\n" + .string "I’m going to get stronger than you.\p" + .string "When I do, I’m going to challenge you\n" + .string "to another battle.$" VerdanturfTown_WandasHouse_Text_17859A:: @ 817859A - .string "ONKEL: Oh! {PLAYER}{KUN}!\n" - .string "Du findest HEIKO nebenan.\p" - .string "Aber es gibt etwas, das ich dir sagen\n" - .string "muss.\p" - .string "Diese natürliche Umgebung hat Wunder\n" - .string "gewirkt bei HEIKOS Gesundheit.\p" - .string "Und nicht nur die natürliche Umgebung!\n" - .string "Ich denke, auch die Freundschaft zu\l" - .string "den POKéMON hat ihm geholfen...$" + .string "UNCLE: Oh! {PLAYER}{KUN}!\n" + .string "WALLY’s next door.\p" + .string "But, boy, there’s something I have to\n" + .string "tell you.\p" + .string "This natural environment is doing\n" + .string "wonders for WALLY’s health.\p" + .string "Maybe it’s not just the environment.\n" + .string "It could be POKéMON that are giving the\l" + .string "boy hope.$" VerdanturfTown_WandasHouse_Text_178683:: @ 8178683 - .string "HEIKO ist weggegangen...\n" - .string "Er ist nun auf seinem eigenen Weg...$" + .string "WALLY’s gone away...\n" + .string "He slipped off on his own...$" VerdanturfTown_WandasHouse_Text_1786B5:: @ 81786B5 - .string "ONKEL: Stimmt das?\n" - .string "HEIKO ist ganz alleine in die Welt\l" - .string "hinausgezogen...\p" - .string "Ich sollte ihn unterstützen - er ist der\n" - .string "Sohn meines kleinen Bruders...$" + .string "UNCLE: Is that right?\n" + .string "WALLY’s gone away that far all by\l" + .string "himself...\p" + .string "Well, I have to give him credit - he is\n" + .string "my little brother’s son.$" VerdanturfTown_WandasHouse_Text_178739:: @ 8178739 - .string "HEIKE: Wer bist du?\n" - .string "Oh, ja, ich weiß schon...\p" - .string "Du bist {PLAYER}. HEIKO hat mir schon\n" - .string "viel von dir erzählt.\p" - .string "Ich bin HEIKOS Cousine.\n" - .string "Nett, dich kennen zu lernen!\p" - .string "Ich finde, seit HEIKO hier lebt, ist er\n" - .string "viel gesünder und lebendiger geworden.$" + .string "WANDA: You are?\n" + .string "Oh, right, I get it!\p" + .string "You’re the {PLAYER} who WALLY was\n" + .string "telling me about.\p" + .string "I’m WALLY’s cousin.\n" + .string "Glad to meet you!\p" + .string "I think WALLY’s become a lot more lively\n" + .string "and healthy since he came here.$" VerdanturfTown_WandasHouse_Text_1787FB:: @ 81787FB - .string "HEIKE: Mach dir keine Sorgen um HEIKO.\n" - .string "Ihm geht es mit Sicherheit gut.\p" - .string "Ich kenne doch meinen kleinen Vetter.\n" - .string "Außerdem hat er sein POKéMON dabei.$" + .string "WANDA: Don’t worry about WALLY.\n" + .string "He’ll be just fine.\p" + .string "I know my little cousin, and he has\n" + .string "POKéMON with him, too.$" VerdanturfTown_WandasHouse_Text_17886A:: @ 817886A - .string "Dank dir kann ich meine Freundin jetzt\n" - .string "jeden Tag sehen. Ob ich glücklich bin?\l" - .string "Darauf kannst du wetten!$" + .string "Thanks to you, I can see my girlfriend\n" + .string "every day.\l" + .string "Happy? You bet I am!$" VerdanturfTown_WandasHouse_Text_1788B1:: @ 81788B1 - .string "Der Freund meiner Tochter besitzt viel\n" - .string "Schwung und Energie.\p" - .string "Er gräbt ununterbrochen einen Tunnel,\n" - .string "damit er meine Tochter sehen kann.\p" - .string "Meine Tochter ist etwas besorgt des-\n" - .string "wegen und schaut jeden Tag nach ihm.$" + .string "My daughter’s boyfriend is a very\n" + .string "driven and passionate sort of person.\p" + .string "He’s been digging a tunnel nonstop\n" + .string "just so he can see my daughter.\p" + .string "My daughter’s a little concerned,\n" + .string "so she goes out to the tunnel a lot.$" VerdanturfTown_WandasHouse_Text_178983:: @ 8178983 - .string "Es ist unglaublich! Der Freund meiner \n" - .string "Tochter hat den Tunnel\p" - .string "von Hand gegraben! Einfach sagenhaft!$" + .string "It’s amazing. My daughter’s boyfriend\n" + .string "was digging the tunnel by hand!\p" + .string "It’s so incredible!$" VerdanturfTown_WandasHouse_Text_1789DD:: @ 81789DD - .string "Sollte HEIKO irgendetwas passieren,\n" - .string "könnte ich seinen Eltern in BLÜTENBURG\l" - .string "CITY nicht mehr in die Augen schauen...$" + .string "If anything were to happen to WALLY,\n" + .string "I would never be able to look his\l" + .string "parents in PETALBURG in the eye...$" VerdanturfTown_WandasHouse_Text_178A47:: @ 8178A47 - .string "HEIKO war in PRACHTPOLIS CITY?\p" - .string "Seine Eltern in BLÜTENBURG CITY werden\n" - .string "erstaunt sein, das zu hören.$" + .string "WALLY was in EVER GRANDE?\p" + .string "His parents in PETALBURG would be\n" + .string "astonished to hear that!$" diff --git a/data/text/maps/VictoryRoad_1F.inc b/data/text/maps/VictoryRoad_1F.inc index 770e75b3b..2f52e5cd4 100644 --- a/data/text/maps/VictoryRoad_1F.inc +++ b/data/text/maps/VictoryRoad_1F.inc @@ -1,75 +1,72 @@ VictoryRoad_1F_Text_19782B:: @ 819782B - .string "HEIKO: Hallo, {PLAYER}!\p" - .string "Du bist bestimmt überrascht, mich hier\n" - .string "zu treffen!\p" - .string "Ich habe es bis hierher geschafft und\n" - .string "das verdanke ich dir!\p" - .string "{PLAYER}, meine Niederlage gegen dich\n" - .string "hat mich viel stärker gemacht!\p" - .string "Ich werde nie wieder verlieren!\p" - .string "Ich werde gewinnen! Für die POKéMON,\n" - .string "die mir Mut und Kraft gegeben haben!\p" - .string "Okay... Jetzt komme ich!$" + .string "WALLY: Hi! {PLAYER}!\p" + .string "I bet you’re surprised to see me here!\p" + .string "I made it all the way here, and it’s\n" + .string "all thanks to you!\p" + .string "{PLAYER}, losing to you that time\n" + .string "made me stronger!\p" + .string "But I’m not going to lose anymore!\p" + .string "I’m going to win! For the POKéMON who\n" + .string "gave me courage and strength!\p" + .string "Okay... Here I come!$" VictoryRoad_1F_Text_197943:: @ 8197943 .string "Wow!\n" - .string "{PLAYER}, du wirst immer stärker!$" + .string "{PLAYER}, you are strong, after all!$" VictoryRoad_1F_Text_197967:: @ 8197967 - .string "HEIKO: Ich konnte dich heute nicht be-\n" - .string "siegen, aber eines Tages werde ich es\l" - .string "mit dir aufnehmen!$" + .string "WALLY: I couldn’t beat you today,\n" + .string "{PLAYER}, but one of these days, I’ll\l" + .string "catch up to you!$" VictoryRoad_1F_Text_1979BA:: @ 81979BA - .string "HEIKO: Hallo, {PLAYER}!\p" - .string "Ich bin viel stärker geworden! Das\n" - .string "möchte ich dir zeigen, {PLAYER}!\p" - .string "Okay... Jetzt komme ich!$" + .string "WALLY: Hi! {PLAYER}!\p" + .string "I’ve gotten stronger since that last\n" + .string "time! I wanted to show you, {PLAYER}!\p" + .string "Okay... Here I come!$" VictoryRoad_1F_Text_197A23:: @ 8197A23 .string "Wow!\n" - .string "{PLAYER}, du bist immer noch zu stark!$" + .string "{PLAYER}, you are strong, after all!$" VictoryRoad_1F_Text_197A47:: @ 8197A47 - .string "HEIKO: Ich konnte dich wieder nicht\n" - .string "besiegen... Aber eines Tages, {PLAYER},\l" - .string "eines Tages...\p" - .string "Da werde ich sogar die POKéMON LIGA\n" - .string "herausfordern!$" + .string "WALLY: I couldn’t beat you this time,\n" + .string "too... But one of these days, {PLAYER},\l" + .string "I’m going to catch up to you...\p" + .string "And challenge the POKéMON LEAGUE!$" VictoryRoad_1F_Text_197AD1:: @ 8197AD1 - .string "Ich habe es innerhalb kürzester Zeit\n" - .string "bis hierher geschafft, aber das letzte\l" - .string "Stück zieht sich wie Kaugummi...$" + .string "I’ve made it this far a couple times,\n" + .string "but the last stretch is so long...$" VictoryRoad_1F_Text_197B1A:: @ 8197B1A - .string "Hier enden meine Träume...$" + .string "My dream ends here again...$" VictoryRoad_1F_Text_197B36:: @ 8197B36 - .string "Du bist weit gekommen. Lasse nicht nach\n" - .string "und versuche, der CHAMP zu werden!\l" - .string "Wenn einer das kann, dann du!$" + .string "You’ve made it this far. Keep the\n" + .string "momentum going and become the\l" + .string "CHAMPION! If anyone can, it’s you!$" VictoryRoad_1F_Text_197B99:: @ 8197B99 - .string "Ich bin nicht hierher gekommen, um zu\n" - .string "verlieren. Diese Option existiert nicht!$" + .string "I didn’t come all this way to lose now.\n" + .string "That possibility doesn’t exist!$" VictoryRoad_1F_Text_197BE1:: @ 8197BE1 - .string "Unmöglich...\n" - .string "Ich habe verloren???$" + .string "Impossible...\n" + .string "I lost?$" VictoryRoad_1F_Text_197BF7:: @ 8197BF7 - .string "Ich habe hier verloren...\p" - .string "Das heißt, mir fehlt noch eine Menge,\n" - .string "um CHAMP werden zu können.$" + .string "I lost here...\p" + .string "That means I lack the qualifications\n" + .string "to become the CHAMPION...$" VictoryRoad_1F_Text_197C45:: @ 8197C45 - .string "Diese unendliche, raue Straße wird\n" - .string "ihrem Namen - SIEG - gerecht.$" + .string "This seemingly infinite and harsh road\n" + .string "lives up to its name of VICTORY.$" VictoryRoad_1F_Text_197C8D:: @ 8197C8D - .string "Dein Kampfstil ist fantastisch...$" + .string "Your battle style is fantastic...$" VictoryRoad_1F_Text_197CAF:: @ 8197CAF - .string "Du hast wirklich das Potential, der\n" - .string "CHAMP zu werden.$" + .string "You seem to have the potential for\n" + .string "becoming the CHAMPION.$" diff --git a/data/text/maps/VictoryRoad_B1F.inc b/data/text/maps/VictoryRoad_B1F.inc index 2261fceff..d820a5c31 100644 --- a/data/text/maps/VictoryRoad_B1F.inc +++ b/data/text/maps/VictoryRoad_B1F.inc @@ -1,37 +1,35 @@ VictoryRoad_B1F_Text_197CE9:: @ 8197CE9 - .string "Der Gedanke, dass ich der POKéMON LIGA\n" - .string "immer näher komme...\p" - .string "Ich bekomme Lampenfieber...$" + .string "The thought that I’m getting closer to\n" + .string "the POKéMON LEAGUE...\p" + .string "I’m getting stage fright...$" VictoryRoad_B1F_Text_197D42:: @ 8197D42 - .string "Ich konnte gar nichts machen...$" + .string "I couldn’t do a thing...$" VictoryRoad_B1F_Text_197D5B:: @ 8197D5B - .string "Die POKéMON LIGA rückt in weite Ferne...\n" - .string "Was für eine Enttäuschung...$" + .string "The POKéMON LEAGUE became distant\n" + .string "again... What a letdown...$" VictoryRoad_B1F_Text_197D98:: @ 8197D98 - .string "Um dich siegreich durch die POKéMON\n" - .string "LIGA zu kämpfen, brauchst du das\l" - .string "Vertrauen deiner POKéMON.$" + .string "To win your way through the POKéMON\n" + .string "LEAGUE, you need the trust of your\l" + .string "POKéMON.$" VictoryRoad_B1F_Text_197DE8:: @ 8197DE8 - .string "Eure Beziehung ist auf solidem\n" - .string "Vertrauen aufgebaut.$" + .string "Your relationship is based on\n" + .string "solid trust.$" VictoryRoad_B1F_Text_197E13:: @ 8197E13 - .string "Das Vertrauen zwischen POKéMON und\n" - .string "TRAINER wächst beständig, da sie immer\l" - .string "zusammen sind.$" + .string "By being together all the time, trust\n" + .string "grows between POKéMON and TRAINERS.$" VictoryRoad_B1F_Text_197E5D:: @ 8197E5D - .string "Das ist nicht das Ziel. Nur eine\n" - .string "Zwischenstation auf dem Weg zur\l" - .string "POKéMON LIGA.$" + .string "This isn’t the goal. It’s only a place\n" + .string "on the way to the POKéMON LEAGUE.$" VictoryRoad_B1F_Text_197EA6:: @ 8197EA6 - .string "Das ist der Weg!$" + .string "That’s the way!$" VictoryRoad_B1F_Text_197EB6:: @ 8197EB6 - .string "Du wirst dich sehr gut schlagen, das ist\n" - .string "sicher. Deine POKéMON lieben dich!$" + .string "You’ll do fine, for sure!\n" + .string "Your POKéMON are all eager to go!$" diff --git a/data/text/maps/VictoryRoad_B2F.inc b/data/text/maps/VictoryRoad_B2F.inc index 2d3301d39..760a732ff 100644 --- a/data/text/maps/VictoryRoad_B2F.inc +++ b/data/text/maps/VictoryRoad_B2F.inc @@ -1,50 +1,49 @@ VictoryRoad_B2F_Text_197EF2:: @ 8197EF2 - .string "Ich habe mit meiner Familie trainiert,\n" - .string "mit jedem einzelnen Mitglied!\l" - .string "Ich verliere gegen niemanden!$" + .string "I trained together with my whole family,\n" + .string "every one of us!\l" + .string "I’m not losing to anyone!$" VictoryRoad_B2F_Text_197F46:: @ 8197F46 - .string "Besser als meine Familie?\n" - .string "Ist das möglich?$" + .string "Better than my family?!\n" + .string "Is that possible?!$" VictoryRoad_B2F_Text_197F71:: @ 8197F71 - .string "Ich war besser als jeder andere aus\n" - .string "meiner Familie. Ich habe nie verloren!\p" - .string "Ich habe mein Selbstvertrauen ver-\n" - .string "loren. Ich gehe nach Hause...$" + .string "I was better than everyone in my\n" + .string "family. I’ve never lost before...\p" + .string "I’ve lost my confidence...\n" + .string "Maybe I’ll go home...$" VictoryRoad_B2F_Text_197FE5:: @ 8197FE5 - .string "Ich habe gehört, dass sich hier ein sehr\n" - .string "starkes Kind herumtreibt. Bist du das?$" + .string "I’d heard that there was a tough\n" + .string "little kid around. Do they mean you?$" VictoryRoad_B2F_Text_19802B:: @ 819802B - .string "Diese kleine Kröte ist echt stark!$" + .string "The little shrimp is tough!$" VictoryRoad_B2F_Text_198047:: @ 8198047 - .string "Das Gerücht sagt, das Kind käme aus\n" - .string "BLÜTENBURG CITY.$" + .string "The rumors I heard, that tough little\n" + .string "kid is from PETALBURG CITY.$" VictoryRoad_B2F_Text_198089:: @ 8198089 - .string "Du musst doch langsam mal müde werden.$" + .string "You must be getting a little tired.$" VictoryRoad_B2F_Text_1980AD:: @ 81980AD - .string "Keine Anzeichen von Müdigkeit...$" + .string "No signs of tiring at all!$" VictoryRoad_B2F_Text_1980C8:: @ 81980C8 - .string "Die SIEGESSTRASSE und die POKéMON\n" - .string "LIGA sind große und langwierige Heraus-\l" - .string "forderungen. Werde bloß nicht müde!!!$" + .string "VICTORY ROAD and the POKéMON LEAGUE\n" + .string "are long and grueling challenges.\l" + .string "Beware of fatigue!$" VictoryRoad_B2F_Text_198121:: @ 8198121 - .string "Du solltest nicht selbstzufrieden\n" - .string "werden, nur weil du viele ORDEN der\l" - .string "ARENEN besitzt.\p" - .string "Es wird immer jemanden geben, der\n" - .string "besser ist als du!$" + .string "You shouldn’t get complacent just\n" + .string "because you have a lot of GYM BADGES.\p" + .string "There’s always going to be someone\n" + .string "who’s better than you!$" VictoryRoad_B2F_Text_1981A3:: @ 81981A3 - .string "Du bist besser als ich!$" + .string "You’re better than me!$" VictoryRoad_B2F_Text_1981BA:: @ 81981BA - .string "Schau dir deine ORDEN an - erinnere dich\n" - .string "an die TRAINER, die du getroffen hast.$" + .string "Gaze on your collected BADGES and\n" + .string "remember the TRAINERS you’ve faced.$" diff --git a/data/text/move_names.inc b/data/text/move_names.inc index 94a189b89..e4895646c 100644 --- a/data/text/move_names.inc +++ b/data/text/move_names.inc @@ -1,356 +1,356 @@ gMoveNames:: @ 81F8320 .string "-$$$$$$$", 13 - .string "PFUND$", 13 - .string "KARATESCHLAG$", 13 - .string "DUPLEXHIEB$", 13 - .string "KOMETENHIEB$", 13 - .string "MEGAHIEB$", 13 - .string "ZAHLTAG$", 13 - .string "FEUERSCHLAG$", 13 - .string "EISHIEB$", 13 - .string "DONNERSCHLAG$", 13 - .string "KRATZER$", 13 - .string "KLAMMER$", 13 + .string "POUND$", 13 + .string "KARATE CHOP$", 13 + .string "DOUBLESLAP$", 13 + .string "COMET PUNCH$", 13 + .string "MEGA PUNCH$", 13 + .string "PAY DAY$", 13 + .string "FIRE PUNCH$", 13 + .string "ICE PUNCH$", 13 + .string "THUNDERPUNCH$", 13 + .string "SCRATCH$", 13 + .string "VICEGRIP$", 13 .string "GUILLOTINE$", 13 - .string "KLINGENSTURM$", 13 - .string "SCHWERTTANZ$", 13 - .string "ZERSCHNEIDER$", 13 - .string "WINDSTOSS$", 13 - .string "FLÜGELSCHLAG$", 13 - .string "WIRBELWIND$", 13 - .string "FLIEGEN$", 13 - .string "KLAMMERGRIFF$", 13 + .string "RAZOR WIND$", 13 + .string "SWORDS DANCE$", 13 + .string "CUT$", 13 + .string "GUST$", 13 + .string "WING ATTACK$", 13 + .string "WHIRLWIND$", 13 + .string "FLY$", 13 + .string "BIND$", 13 .string "SLAM$", 13 - .string "RANKENHIEB$", 13 - .string "STAMPFER$", 13 - .string "DOPPELKICK$", 13 - .string "MEGAKICK$", 13 - .string "SPRUNGKICK$", 13 - .string "FEGEKICK$", 13 - .string "SANDWIRBEL$", 13 - .string "KOPFNUSS$", 13 - .string "HORNATTACKE$", 13 - .string "FURIENSCHLAG$", 13 - .string "HORNBOHRER$", 13 + .string "VINE WHIP$", 13 + .string "STOMP$", 13 + .string "DOUBLE KICK$", 13 + .string "MEGA KICK$", 13 + .string "JUMP KICK$", 13 + .string "ROLLING KICK$", 13 + .string "SAND-ATTACK$", 13 + .string "HEADBUTT$", 13 + .string "HORN ATTACK$", 13 + .string "FURY ATTACK$", 13 + .string "HORN DRILL$", 13 .string "TACKLE$", 13 - .string "BODYSLAM$", 13 - .string "WICKEL$", 13 - .string "BODYCHECK$", 13 - .string "FUCHTLER$", 13 - .string "RISIKOTACKLE$", 13 - .string "RUTENSCHLAG$", 13 - .string "GIFTSTACHEL$", 13 - .string "DUONADEL$", 13 - .string "NADELRAKETE$", 13 - .string "SILBERBLICK$", 13 - .string "BISS$", 13 - .string "HEULER$", 13 - .string "BRÜLLER$", 13 - .string "GESANG$", 13 - .string "SUPERSCHALL$", 13 - .string "ULTRASCHALL$", 13 - .string "AUSSETZER$", 13 - .string "SÄURE$", 13 - .string "GLUT$", 13 - .string "FLAMMENWURF$", 13 - .string "WEISSNEBEL$", 13 - .string "AQUAKNARRE$", 13 - .string "HYDROPUMPE$", 13 - .string "SURFER$", 13 - .string "EISSTRAHL$", 13 + .string "BODY SLAM$", 13 + .string "WRAP$", 13 + .string "TAKE DOWN$", 13 + .string "THRASH$", 13 + .string "DOUBLE-EDGE$", 13 + .string "TAIL WHIP$", 13 + .string "POISON STING$", 13 + .string "TWINEEDLE$", 13 + .string "PIN MISSILE$", 13 + .string "LEER$", 13 + .string "BITE$", 13 + .string "GROWL$", 13 + .string "ROAR$", 13 + .string "SING$", 13 + .string "SUPERSONIC$", 13 + .string "SONICBOOM$", 13 + .string "DISABLE$", 13 + .string "ACID$", 13 + .string "EMBER$", 13 + .string "FLAMETHROWER$", 13 + .string "MIST$", 13 + .string "WATER GUN$", 13 + .string "HYDRO PUMP$", 13 + .string "SURF$", 13 + .string "ICE BEAM$", 13 .string "BLIZZARD$", 13 - .string "PSYSTRAHL$", 13 - .string "BLUBBSTRAHL$", 13 - .string "AURORASTRAHL$", 13 - .string "HYPERSTRAHL$", 13 - .string "SCHNABEL$", 13 - .string "BOHRSCHNABEL$", 13 - .string "ÜBERROLLER$", 13 - .string "FUSSKICK$", 13 - .string "KONTER$", 13 - .string "GEOWURF$", 13 - .string "STÄRKE$", 13 - .string "ABSORBER$", 13 - .string "MEGASAUGER$", 13 - .string "EGELSAMEN$", 13 - .string "WACHSTUM$", 13 - .string "RASIERBLATT$", 13 - .string "SOLARSTRAHL$", 13 - .string "GIFTPUDER$", 13 - .string "STACHELSPORE$", 13 - .string "SCHLAFPUDER$", 13 - .string "BLÄTTERTANZ$", 13 - .string "FADENSCHUSS$", 13 - .string "DRACHENWUT$", 13 - .string "FEUERWIRBEL$", 13 - .string "DONNERSCHOCK$", 13 - .string "DONNERBLITZ$", 13 - .string "DONNERWELLE$", 13 - .string "DONNER$", 13 - .string "STEINWURF$", 13 - .string "ERDBEBEN$", 13 - .string "GEOFISSUR$", 13 - .string "SCHAUFLER$", 13 - .string "TOXIN$", 13 - .string "KONFUSION$", 13 - .string "PSYCHOKINESE$", 13 - .string "HYPNOSE$", 13 - .string "MEDITATION$", 13 - .string "AGILITÄT$", 13 - .string "RUCKZUCKHIEB$", 13 - .string "RASEREI$", 13 + .string "PSYBEAM$", 13 + .string "BUBBLEBEAM$", 13 + .string "AURORA BEAM$", 13 + .string "HYPER BEAM$", 13 + .string "PECK$", 13 + .string "DRILL PECK$", 13 + .string "SUBMISSION$", 13 + .string "LOW KICK$", 13 + .string "COUNTER$", 13 + .string "SEISMIC TOSS$", 13 + .string "STRENGTH$", 13 + .string "ABSORB$", 13 + .string "MEGA DRAIN$", 13 + .string "LEECH SEED$", 13 + .string "GROWTH$", 13 + .string "RAZOR LEAF$", 13 + .string "SOLARBEAM$", 13 + .string "POISONPOWDER$", 13 + .string "STUN SPORE$", 13 + .string "SLEEP POWDER$", 13 + .string "PETAL DANCE$", 13 + .string "STRING SHOT$", 13 + .string "DRAGON RAGE$", 13 + .string "FIRE SPIN$", 13 + .string "THUNDERSHOCK$", 13 + .string "THUNDERBOLT$", 13 + .string "THUNDER WAVE$", 13 + .string "THUNDER$", 13 + .string "ROCK THROW$", 13 + .string "EARTHQUAKE$", 13 + .string "FISSURE$", 13 + .string "DIG$", 13 + .string "TOXIC$", 13 + .string "CONFUSION$", 13 + .string "PSYCHIC$", 13 + .string "HYPNOSIS$", 13 + .string "MEDITATE$", 13 + .string "AGILITY$", 13 + .string "QUICK ATTACK$", 13 + .string "RAGE$", 13 .string "TELEPORT$", 13 - .string "NACHTNEBEL$", 13 - .string "MIMIKRY$", 13 - .string "KREIDESCHREI$", 13 - .string "DOPPELTEAM$", 13 - .string "GENESUNG$", 13 - .string "HÄRTNER$", 13 - .string "KOMPRIMATOR$", 13 - .string "RAUCHWOLKE$", 13 - .string "KONFUSTRAHL$", 13 - .string "PANZERSCHUTZ$", 13 - .string "EINIGLER$", 13 - .string "BARRIERE$", 13 - .string "LICHTSCHILD$", 13 - .string "DUNKELNEBEL$", 13 - .string "REFLEKTOR$", 13 - .string "ENERGIEFOKUS$", 13 - .string "GEDULD$", 13 - .string "METRONOM$", 13 - .string "SPIEGELTRICK$", 13 - .string "FINALE$", 13 - .string "EIERBOMBE$", 13 - .string "SCHLECKER$", 13 + .string "NIGHT SHADE$", 13 + .string "MIMIC$", 13 + .string "SCREECH$", 13 + .string "DOUBLE TEAM$", 13 + .string "RECOVER$", 13 + .string "HARDEN$", 13 + .string "MINIMIZE$", 13 + .string "SMOKESCREEN$", 13 + .string "CONFUSE RAY$", 13 + .string "WITHDRAW$", 13 + .string "DEFENSE CURL$", 13 + .string "BARRIER$", 13 + .string "LIGHT SCREEN$", 13 + .string "HAZE$", 13 + .string "REFLECT$", 13 + .string "FOCUS ENERGY$", 13 + .string "BIDE$", 13 + .string "METRONOME$", 13 + .string "MIRROR MOVE$", 13 + .string "SELFDESTRUCT$", 13 + .string "EGG BOMB$", 13 + .string "LICK$", 13 .string "SMOG$", 13 - .string "SCHLAMMBAD$", 13 - .string "KNOCHENKEULE$", 13 - .string "FEUERSTURM$", 13 - .string "KASKADE$", 13 - .string "SCHNAPPER$", 13 - .string "STERNSCHAUER$", 13 - .string "SCHÄDELWUMME$", 13 - .string "DORNKANONE$", 13 - .string "UMKLAMMERUNG$", 13 - .string "AMNESIE$", 13 - .string "PSYKRAFT$", 13 - .string "WEICHEI$", 13 - .string "TURMKICK$", 13 - .string "GIFTBLICK$", 13 - .string "TRAUMFRESSER$", 13 - .string "GIFTWOLKE$", 13 - .string "STAKKATO$", 13 - .string "BLUTSAUGER$", 13 - .string "TODESKUSS$", 13 - .string "HIMMELSFEGER$", 13 - .string "WANDLER$", 13 - .string "BLUBBER$", 13 - .string "IRRSCHLAG$", 13 - .string "PILZSPORE$", 13 - .string "BLITZ$", 13 - .string "PSYWELLE$", 13 - .string "PLATSCHER$", 13 - .string "SÄUREPANZER$", 13 - .string "KRABBHAMMER$", 13 + .string "SLUDGE$", 13 + .string "BONE CLUB$", 13 + .string "FIRE BLAST$", 13 + .string "WATERFALL$", 13 + .string "CLAMP$", 13 + .string "SWIFT$", 13 + .string "SKULL BASH$", 13 + .string "SPIKE CANNON$", 13 + .string "CONSTRICT$", 13 + .string "AMNESIA$", 13 + .string "KINESIS$", 13 + .string "SOFTBOILED$", 13 + .string "HI JUMP KICK$", 13 + .string "GLARE$", 13 + .string "DREAM EATER$", 13 + .string "POISON GAS$", 13 + .string "BARRAGE$", 13 + .string "LEECH LIFE$", 13 + .string "LOVELY KISS$", 13 + .string "SKY ATTACK$", 13 + .string "TRANSFORM$", 13 + .string "BUBBLE$", 13 + .string "DIZZY PUNCH$", 13 + .string "SPORE$", 13 + .string "FLASH$", 13 + .string "PSYWAVE$", 13 + .string "SPLASH$", 13 + .string "ACID ARMOR$", 13 + .string "CRABHAMMER$", 13 .string "EXPLOSION$", 13 - .string "KRATZFURIE$", 13 - .string "KNOCHMERANG$", 13 - .string "ERHOLUNG$", 13 - .string "STEINHAGEL$", 13 - .string "HYPERZAHN$", 13 - .string "SCHÄRFER$", 13 - .string "UMWANDLUNG$", 13 - .string "TRIPLETTE$", 13 - .string "SUPERZAHN$", 13 - .string "SCHLITZER$", 13 - .string "DELEGATOR$", 13 - .string "VERZWEIFLER$", 13 - .string "NACHAHMER$", 13 - .string "DREIFACHKICK$", 13 - .string "RAUB$", 13 - .string "SPINNENNETZ$", 13 - .string "WILLENSLESER$", 13 - .string "NACHTMAHR$", 13 - .string "FLAMMENRAD$", 13 - .string "SCHNARCHER$", 13 - .string "FLUCH$", 13 - .string "DRESCHFLEGEL$", 13 - .string "UMWANDLUNG2$", 13 - .string "LUFTSTOSS$", 13 - .string "BAUMWOLLSAAT$", 13 - .string "GEGENSCHLAG$", 13 - .string "GROLL$", 13 - .string "PULVERSCHNEE$", 13 - .string "SCHUTZSCHILD$", 13 - .string "TEMPOHIEB$", 13 - .string "GRIMASSE$", 13 - .string "FINTE$", 13 - .string "BITTERKUSS$", 13 - .string "BAUCHTROMMEL$", 13 - .string "MATSCHBOMBE$", 13 - .string "LEHMSCHELLE$", 13 + .string "FURY SWIPES$", 13 + .string "BONEMERANG$", 13 + .string "REST$", 13 + .string "ROCK SLIDE$", 13 + .string "HYPER FANG$", 13 + .string "SHARPEN$", 13 + .string "CONVERSION$", 13 + .string "TRI ATTACK$", 13 + .string "SUPER FANG$", 13 + .string "SLASH$", 13 + .string "SUBSTITUTE$", 13 + .string "STRUGGLE$", 13 + .string "SKETCH$", 13 + .string "TRIPLE KICK$", 13 + .string "THIEF$", 13 + .string "SPIDER WEB$", 13 + .string "MIND READER$", 13 + .string "NIGHTMARE$", 13 + .string "FLAME WHEEL$", 13 + .string "SNORE$", 13 + .string "CURSE$", 13 + .string "FLAIL$", 13 + .string "CONVERSION 2$", 13 + .string "AEROBLAST$", 13 + .string "COTTON SPORE$", 13 + .string "REVERSAL$", 13 + .string "SPITE$", 13 + .string "POWDER SNOW$", 13 + .string "PROTECT$", 13 + .string "MACH PUNCH$", 13 + .string "SCARY FACE$", 13 + .string "FAINT ATTACK$", 13 + .string "SWEET KISS$", 13 + .string "BELLY DRUM$", 13 + .string "SLUDGE BOMB$", 13 + .string "MUD-SLAP$", 13 .string "OCTAZOOKA$", 13 - .string "STACHLER$", 13 - .string "BLITZKANONE$", 13 - .string "GESICHTE$", 13 - .string "ABGANGSBUND$", 13 - .string "ABGESANG$", 13 - .string "EISSTURM$", 13 - .string "SCANNER$", 13 - .string "KNOCHENHATZ$", 13 - .string "ZIELSCHUSS$", 13 - .string "WUTANFALL$", 13 - .string "SANDSTURM$", 13 - .string "GIGASAUGER$", 13 - .string "AUSDAUER$", 13 - .string "CHARME$", 13 - .string "WALZER$", 13 - .string "TRUGSCHLAG$", 13 - .string "ANGEBEREI$", 13 - .string "MILCHGETRÄNK$", 13 - .string "FUNKENSPRUNG$", 13 - .string "ZORNKLINGE$", 13 - .string "STAHLFLÜGEL$", 13 - .string "HORRORBLICK$", 13 - .string "ANZIEHUNG$", 13 - .string "SCHLAFREDE$", 13 - .string "VITALGLOCKE$", 13 - .string "RÜCKKEHR$", 13 - .string "GESCHENK$", 13 + .string "SPIKES$", 13 + .string "ZAP CANNON$", 13 + .string "FORESIGHT$", 13 + .string "DESTINY BOND$", 13 + .string "PERISH SONG$", 13 + .string "ICY WIND$", 13 + .string "DETECT$", 13 + .string "BONE RUSH$", 13 + .string "LOCK-ON$", 13 + .string "OUTRAGE$", 13 + .string "SANDSTORM$", 13 + .string "GIGA DRAIN$", 13 + .string "ENDURE$", 13 + .string "CHARM$", 13 + .string "ROLLOUT$", 13 + .string "FALSE SWIPE$", 13 + .string "SWAGGER$", 13 + .string "MILK DRINK$", 13 + .string "SPARK$", 13 + .string "FURY CUTTER$", 13 + .string "STEEL WING$", 13 + .string "MEAN LOOK$", 13 + .string "ATTRACT$", 13 + .string "SLEEP TALK$", 13 + .string "HEAL BELL$", 13 + .string "RETURN$", 13 + .string "PRESENT$", 13 .string "FRUSTRATION$", 13 - .string "BODYGUARD$", 13 - .string "LEIDTEILER$", 13 - .string "LÄUTERFEUER$", 13 - .string "INTENSITÄT$", 13 - .string "WUCHTSCHLAG$", 13 - .string "VIELENDER$", 13 - .string "FEUERODEM$", 13 - .string "STAFFETTE$", 13 - .string "ZUGABE$", 13 - .string "VERFOLGUNG$", 13 - .string "TURBODREHER$", 13 - .string "LOCKDUFT$", 13 - .string "EISENSCHWEIF$", 13 - .string "METALLKLAUE$", 13 - .string "ÜBERWURF$", 13 - .string "MORGENGRAUEN$", 13 - .string "SYNTHESE$", 13 - .string "MONDSCHEIN$", 13 - .string "KRAFTRESERVE$", 13 - .string "KREUZHIEB$", 13 - .string "WINDHOSE$", 13 - .string "REGENTANZ$", 13 - .string "SONNENTAG$", 13 - .string "KNIRSCHER$", 13 - .string "SPIEGELCAPE$", 13 - .string "PSYCHO-PLUS$", 13 - .string "TURBOTEMPO$", 13 - .string "ANTIK-KRAFT$", 13 - .string "SPUKBALL$", 13 - .string "SEHER$", 13 - .string "ZERTRÜMMERER$", 13 + .string "SAFEGUARD$", 13 + .string "PAIN SPLIT$", 13 + .string "SACRED FIRE$", 13 + .string "MAGNITUDE$", 13 + .string "DYNAMICPUNCH$", 13 + .string "MEGAHORN$", 13 + .string "DRAGONBREATH$", 13 + .string "BATON PASS$", 13 + .string "ENCORE$", 13 + .string "PURSUIT$", 13 + .string "RAPID SPIN$", 13 + .string "SWEET SCENT$", 13 + .string "IRON TAIL$", 13 + .string "METAL CLAW$", 13 + .string "VITAL THROW$", 13 + .string "MORNING SUN$", 13 + .string "SYNTHESIS$", 13 + .string "MOONLIGHT$", 13 + .string "HIDDEN POWER$", 13 + .string "CROSS CHOP$", 13 + .string "TWISTER$", 13 + .string "RAIN DANCE$", 13 + .string "SUNNY DAY$", 13 + .string "CRUNCH$", 13 + .string "MIRROR COAT$", 13 + .string "PSYCH UP$", 13 + .string "EXTREMESPEED$", 13 + .string "ANCIENTPOWER$", 13 + .string "SHADOW BALL$", 13 + .string "FUTURE SIGHT$", 13 + .string "ROCK SMASH$", 13 .string "WHIRLPOOL$", 13 - .string "PRÜGLER$", 13 - .string "MOGELHIEB$", 13 - .string "AUFRUHR$", 13 - .string "HORTER$", 13 - .string "ENTFESSLER$", 13 - .string "VERZEHRER$", 13 - .string "HITZEWELLE$", 13 - .string "HAGELSTURM$", 13 - .string "FOLTERKNECHT$", 13 - .string "SCHMEICHLER$", 13 - .string "IRRLICHT$", 13 - .string "MEMENTO-MORI$", 13 - .string "FASSADE$", 13 - .string "POWER-PUNCH$", 13 - .string "RIECHSALZ$", 13 - .string "SPOTLIGHT$", 13 - .string "NATUR-KRAFT$", 13 - .string "LADEVORGANG$", 13 - .string "VERHÖHNER$", 13 - .string "RECHTE HAND$", 13 - .string "TRICKBETRUG$", 13 - .string "ROLLENTAUSCH$", 13 - .string "WUNSCHTRAUM$", 13 - .string "ZUSCHUSS$", 13 - .string "VERWURZLER$", 13 - .string "KRAFTKOLOSS$", 13 - .string "MAGIEMANTEL$", 13 - .string "AUFBEREITUNG$", 13 - .string "VERGELTUNG$", 13 - .string "DURCHBRUCH$", 13 - .string "GÄHNER$", 13 - .string "ABSCHLAG$", 13 - .string "NOTSITUATION$", 13 + .string "BEAT UP$", 13 + .string "FAKE OUT$", 13 + .string "UPROAR$", 13 + .string "STOCKPILE$", 13 + .string "SPIT UP$", 13 + .string "SWALLOW$", 13 + .string "HEAT WAVE$", 13 + .string "HAIL$", 13 + .string "TORMENT$", 13 + .string "FLATTER$", 13 + .string "WILL-O-WISP$", 13 + .string "MEMENTO$", 13 + .string "FACADE$", 13 + .string "FOCUS PUNCH$", 13 + .string "SMELLINGSALT$", 13 + .string "FOLLOW ME$", 13 + .string "NATURE POWER$", 13 + .string "CHARGE$", 13 + .string "TAUNT$", 13 + .string "HELPING HAND$", 13 + .string "TRICK$", 13 + .string "ROLE PLAY$", 13 + .string "WISH$", 13 + .string "ASSIST$", 13 + .string "INGRAIN$", 13 + .string "SUPERPOWER$", 13 + .string "MAGIC COAT$", 13 + .string "RECYCLE$", 13 + .string "REVENGE$", 13 + .string "BRICK BREAK$", 13 + .string "YAWN$", 13 + .string "KNOCK OFF$", 13 + .string "ENDEAVOR$", 13 .string "ERUPTION$", 13 - .string "WERTEWECHSEL$", 13 - .string "BEGRENZER$", 13 - .string "HEILUNG$", 13 - .string "NACHSPIEL$", 13 - .string "ÜBERNAHME$", 13 - .string "GEHEIMPOWER$", 13 - .string "TAUCHER$", 13 - .string "ARMSTOSS$", 13 - .string "TARNUNG$", 13 - .string "SCHWEIFGLANZ$", 13 - .string "SCHEINWERFER$", 13 - .string "NEBELBALL$", 13 - .string "DAUNENREIGEN$", 13 - .string "TAUMELTANZ$", 13 - .string "FEUERFEGER$", 13 - .string "LEHMSUHLER$", 13 - .string "FROSTBEULE$", 13 - .string "NIETENRANKE$", 13 - .string "TAGEDIEB$", 13 - .string "SCHALLWELLE$", 13 - .string "GIFTZAHN$", 13 - .string "ZERMALMKLAUE$", 13 - .string "LOHEKANONADE$", 13 - .string "AQUAHAUBITZE$", 13 - .string "STERNENHIEB$", 13 - .string "ERSTAUNER$", 13 - .string "METEOROLOGE$", 13 - .string "AROMAKUR$", 13 - .string "TRUGTRÄNE$", 13 - .string "WINDSCHNITT$", 13 - .string "HITZEKOLLER$", 13 - .string "SCHNÜFFLER$", 13 - .string "FELSGRAB$", 13 - .string "SILBERHAUCH$", 13 - .string "METALLSOUND$", 13 - .string "GRASFLÖTE$", 13 - .string "SPASSKANONE$", 13 - .string "KOSMIK-KRAFT$", 13 - .string "FONTRÄNEN$", 13 - .string "AMPELLEUCHTE$", 13 - .string "FINSTERFAUST$", 13 - .string "SONDERSENSOR$", 13 - .string "HIMMELHIEB$", 13 - .string "SANDGRAB$", 13 - .string "EISESKÄLTE$", 13 - .string "LEHMBRÜHE$", 13 - .string "KUGELSAAT$", 13 - .string "AERO-ASS$", 13 - .string "EISSPEER$", 13 - .string "EISENABWEHR$", 13 - .string "RÜCKENTZUG$", 13 - .string "JAULER$", 13 - .string "DRACHENKLAUE$", 13 - .string "FAUNA-STATUE$", 13 - .string "PROTZER$", 13 - .string "SPRUNGFEDER$", 13 - .string "LEHMSCHUSS$", 13 - .string "GIFTSCHWEIF$", 13 - .string "BEZIRZER$", 13 - .string "VOLTTACKLE$", 13 - .string "ZAUBERBLATT$", 13 - .string "NASSMACHER$", 13 - .string "GEDANKENGUT$", 13 - .string "LAUBKLINGE$", 13 - .string "DRACHENTANZ$", 13 - .string "FELSWURF$", 13 - .string "SCHOCKWELLE$", 13 - .string "AQUAWELLE$", 13 - .string "KISMETWUNSCH$", 13 - .string "PSYSCHUB$", 13 + .string "SKILL SWAP$", 13 + .string "IMPRISON$", 13 + .string "REFRESH$", 13 + .string "GRUDGE$", 13 + .string "SNATCH$", 13 + .string "SECRET POWER$", 13 + .string "DIVE$", 13 + .string "ARM THRUST$", 13 + .string "CAMOUFLAGE$", 13 + .string "TAIL GLOW$", 13 + .string "LUSTER PURGE$", 13 + .string "MIST BALL$", 13 + .string "FEATHERDANCE$", 13 + .string "TEETER DANCE$", 13 + .string "BLAZE KICK$", 13 + .string "MUD SPORT$", 13 + .string "ICE BALL$", 13 + .string "NEEDLE ARM$", 13 + .string "SLACK OFF$", 13 + .string "HYPER VOICE$", 13 + .string "POISON FANG$", 13 + .string "CRUSH CLAW$", 13 + .string "BLAST BURN$", 13 + .string "HYDRO CANNON$", 13 + .string "METEOR MASH$", 13 + .string "ASTONISH$", 13 + .string "WEATHER BALL$", 13 + .string "AROMATHERAPY$", 13 + .string "FAKE TEARS$", 13 + .string "AIR CUTTER$", 13 + .string "OVERHEAT$", 13 + .string "ODOR SLEUTH$", 13 + .string "ROCK TOMB$", 13 + .string "SILVER WIND$", 13 + .string "METAL SOUND$", 13 + .string "GRASSWHISTLE$", 13 + .string "TICKLE$", 13 + .string "COSMIC POWER$", 13 + .string "WATER SPOUT$", 13 + .string "SIGNAL BEAM$", 13 + .string "SHADOW PUNCH$", 13 + .string "EXTRASENSORY$", 13 + .string "SKY UPPERCUT$", 13 + .string "SAND TOMB$", 13 + .string "SHEER COLD$", 13 + .string "MUDDY WATER$", 13 + .string "BULLET SEED$", 13 + .string "AERIAL ACE$", 13 + .string "ICICLE SPEAR$", 13 + .string "IRON DEFENSE$", 13 + .string "BLOCK$", 13 + .string "HOWL$", 13 + .string "DRAGON CLAW$", 13 + .string "FRENZY PLANT$", 13 + .string "BULK UP$", 13 + .string "BOUNCE$", 13 + .string "MUD SHOT$", 13 + .string "POISON TAIL$", 13 + .string "COVET$", 13 + .string "VOLT TACKLE$", 13 + .string "MAGICAL LEAF$", 13 + .string "WATER SPORT$", 13 + .string "CALM MIND$", 13 + .string "LEAF BLADE$", 13 + .string "DRAGON DANCE$", 13 + .string "ROCK BLAST$", 13 + .string "SHOCK WAVE$", 13 + .string "WATER PULSE$", 13 + .string "DOOM DESIRE$", 13 + .string "PSYCHO BOOST$", 13 diff --git a/data/text/mystery_event_club.inc b/data/text/mystery_event_club.inc index 05662c2e8..cfe8c4947 100644 --- a/data/text/mystery_event_club.inc +++ b/data/text/mystery_event_club.inc @@ -1,77 +1,75 @@ PetalburgCity_PokemonCenter_1F_Text_1B1C97:: @ 81B1C97 - .string "Hallo, du! TRAINER!\n" - .string "Du hast ein wundervolles Lächeln.\p" - .string "Ich habe ein Hobby: Ich sammle die\n" - .string "Profile von POKéMON-TRAINERN.$" + .string "Hello there, TRAINER!\n" + .string "You’ve got a wonderful smile, there.\p" + .string "I have a hobby - collecting the profiles\n" + .string "of POKéMON TRAINERS.$" PetalburgCity_PokemonCenter_1F_Text_1B1D10:: @ 81B1D10 - .string "Nun, wie sieht es aus?\n" - .string "Darf ich dein Profil sehen?$" + .string "So, how about it?\n" + .string "May I see your profile?$" PetalburgCity_PokemonCenter_1F_Text_1B1D3A:: @ 81B1D3A - .string "Du erstellst dir dein eigenes Profil,\n" - .string "indem du 4 Worte oder Phrasen\l" - .string "zusammenstellst.\p" - .string "Ich gebe dir ein Beispiel für ein Profil\n" - .string "mit vier Begriffen.\p" - .string "Du kannst diese vier Begriffe mit\n" - .string "anderen Begriffen tauschen, ganz\l" - .string "so, wie du dein Profil haben möchtest.\p" - .string "Dir stehen sehr viele Begriffe\n" - .string "zur Verfügung.\p" - .string "Sie sind nach Gruppen sortiert, wie\n" - .string "POKéMON, Lifestyle und Hobbies. So\l" - .string "hast du einen besseren Überblick.\p" - .string "Wähle zunächst eine Gruppe aus, um\n" - .string "eine Liste entsprechender Begriffe\p" - .string "zu öffnen. Dann triffst du deine Wahl.\p" - .string "Suche dir beliebige Begriffe aus den\n" - .string "Gruppen aus, um dein ganz persönliches\l" - .string "Profil zu erstellen.$" + .string "You make your own profile by putting\n" + .string "together four words or phrases.\p" + .string "Here, I’ll show you an example of a\n" + .string "profile using four pieces of text.\p" + .string "You can switch those four pieces with\n" + .string "other text pieces any which way you\l" + .string "like to make your own profile.\p" + .string "There are a lot of text pieces that you\n" + .string "can use.\p" + .string "They are arranged in groups like\n" + .string "POKéMON, lifestyles, and hobbies so\l" + .string "it is easier to look them up.\p" + .string "So, first, choose the group of text\n" + .string "pieces to display a list of choices.\p" + .string "Then, pick the choice you want.\p" + .string "Repeat for the remaining text choices,\n" + .string "and you’ll have your very own profile.$" UnknownString_81B1F7A: @ 81B1F7A .string "$" PetalburgCity_PokemonCenter_1F_Text_1B1F7B:: @ 81B1F7B - .string "Ja! Danke schön!\n" - .string "Zeigst du mir jetzt dein Profil?$" + .string "Yes! Thank you!\n" + .string "May I see your profile?$" PetalburgCity_PokemonCenter_1F_Text_1B1FA3:: @ 81B1FA3 - .string "Oh, nein, ehrlich?\p" - .string "Ich dachte, jemand wie du hätte ein\n" - .string "wundervolles Profil...$" + .string "Oh, no, really?\p" + .string "I imagine someone like you would have\n" + .string "a wonderful profile...$" PetalburgCity_PokemonCenter_1F_Text_1B1FF0:: @ 81B1FF0 - .string "Oh! Du bist noch nicht so weit?\p" - .string "Nun, dann zeig es mir doch später!$" + .string "Oh? You’re not into it right now?\p" + .string "Well, anytime is good by me!$" PetalburgCity_PokemonCenter_1F_Text_1B202F:: @ 81B202F - .string "Hallo, da drüben! TRAINER!\p" - .string "Du hast ein wundervolles Lächeln.$" + .string "Hello there, TRAINER!\n" + .string "You’ve got a wonderful smile.$" PetalburgCity_PokemonCenter_1F_Text_1B2063:: @ 81B2063 - .string "Darf ich dein neues Profil sehen?$" + .string "May I see your new profile?$" PetalburgCity_PokemonCenter_1F_Text_1B207F:: @ 81B207F - .string "Ja? Danke schön!\p" - .string "Ich hoffe, das Profil ist besser als das\n" - .string "vorhergehende.$" + .string "Yes! Thank you!\p" + .string "I hope it’s even better than the profile\n" + .string "you showed me before.$" PetalburgCity_PokemonCenter_1F_Text_1B20CE:: @ 81B20CE - .string "Oh, du magst dein Profil, wie es ist?\p" - .string "Ich mache dir keine Vorwürfe - so, wie\n" - .string "es jetzt ist, ist das Profil wunderbar.$" + .string "Oh, you like your profile the way it is.\p" + .string "I don’t blame you - it’s a wonderful\n" + .string "profile the way it is now.$" PetalburgCity_PokemonCenter_1F_Text_1B2137:: @ 81B2137 - .string "Fa-fantastisch!\p" - .string "Dein Profil... Einfach wunderbar!\n" - .string "Es sagt wirklich alles über dich aus.\p" - .string "Jeder, der dieses Profil sieht, wird\n" - .string "von dir entzückt sein!\p" - .string "Danke schön.$" + .string "F-fantastic!\p" + .string "Your profile, it’s wonderful!\n" + .string "It really says what you’re about.\p" + .string "Why, anyone hearing this profile would\n" + .string "be captivated by you!\p" + .string "Thank you!$" PetalburgCity_PokemonCenter_1F_Text_1B21CC:: @ 81B21CC - .string "Oh!\n" - .string "Du kennst die Losung!!\p" - .string "Das bedeutet, dass du ein Mitglied des\n" - .string "CLUB des GEHEIMGESCHEHENS bist!$" + .string "Oh?\n" + .string "You know the secret saying!\p" + .string "That means you’re now a fellow member\n" + .string "of the MYSTERY EVENT CLUB!$" diff --git a/data/text/pokeblocks.inc b/data/text/pokeblocks.inc index f137c8fb5..e73a74cc0 100644 --- a/data/text/pokeblocks.inc +++ b/data/text/pokeblocks.inc @@ -1,129 +1,125 @@ FallarborTown_ContestLobby_Text_1B6E63:: @ 81B6E63 - .string "Oh? Möchtest du mit diesem alten Herrn\n" - .string "ein paar {POKEBLOCK} herstellen?$" + .string "Oh? Did you want to make some {POKEBLOCK}S\n" + .string "with this old-timer?$" FallarborTown_ContestLobby_Text_1B6E9D:: @ 81B6E9D - .string "Ausgezeichnet!$" + .string "Excellent!$" FallarborTown_ContestLobby_Text_1B6EA8:: @ 81B6EA8 .string "Oh...\n" - .string "Das macht diesen alten Herrn traurig.$" + .string "You’ve made this old-timer sad...$" FallarborTown_ContestLobby_Text_1B6ED0:: @ 81B6ED0 - .string "Weißt du, wie man {POKEBLOCK} herstellt?$" + .string "Do you know how to make a {POKEBLOCK}?$" FallarborTown_ContestLobby_Text_1B6EF1:: @ 81B6EF1 - .string "Dann lass uns loslegen!\p" - .string "Lass uns BEEREN MIXEN!$" + .string "Let’s get started, then!\p" + .string "Let’s BERRY BLENDER!$" FallarborTown_ContestLobby_Text_1B6F1F:: @ 81B6F1F - .string "Okay, ich gebe dir eine kurze Erklärung.\p" - .string "Keine Angst, es ist ganz einfach.\p" - .string "Erreicht der rotierende Pfeil deine\n" - .string "Markierung, dann drücke den A-Knopf.\p" - .string "Das ist schon alles. Probier es mal, du\n" - .string "wirst sehen, wie einfach das ist.$" + .string "Okay, a little explanation, then.\p" + .string "Oh, don’t worry, it’s quite simple.\p" + .string "When the BLENDER’s arrow comes to\n" + .string "your marker, just press the A Button.\p" + .string "That’s all you have to do.\n" + .string "You’ll see how easy it is when you try.$" FallarborTown_ContestLobby_Text_1B6FF0:: @ 81B6FF0 - .string "Oh!\n" - .string "Du hast keine BEEREN dabei?\p" - .string "Wenn du keine BEEREN hast, kannst du\n" - .string "keine {POKEBLOCK} machen.$" + .string "Oh?\n" + .string "You don’t have any BERRIES?\p" + .string "If you don’t have any BERRIES,\n" + .string "you can’t make any {POKEBLOCK}S.$" FallarborTown_ContestLobby_Text_1B704A:: @ 81B704A - .string "Nun, das hilft uns jetzt nicht weiter.\p" - .string "Wenn du nichts gegen Reste hast,\n" - .string "kannst du diese BEERE haben.\p" - .string "Dann können wir mit dem BEERENMIXER\n" - .string "{POKEBLOCK} herstellen.$" + .string "Well, that won’t do at all now, will it?\p" + .string "If you don’t mind leftovers, you can\n" + .string "have one of my BERRIES.\p" + .string "That way, we could make some {POKEBLOCK}S\n" + .string "together using the BERRY BLENDER.$" FallarborTown_ContestLobby_Text_1B70F6:: @ 81B70F6 - .string "Hätte ich BEEREN übrig, würde ich dir\n" - .string "gerne eine abgeben...\p" - .string "Aber heute habe ich keine übrig. Wir\n" - .string "müssen das ein anderes Mal machen.$" + .string "If I had some BERRIES left over,\n" + .string "I’d gladly give you one...\p" + .string "But, I don’t have any to spare today.\n" + .string "We’ll have to do this another time.$" FallarborTown_ContestLobby_Text_1B717C:: @ 81B717C - .string "Aber deine {POKEBLOCK}BOX ist voll.\p" - .string "Du solltest einige {POKEBLOCK} verwenden\n" - .string "und dann wiederkommen.$" + .string "But your {POKEBLOCK} CASE is full.\p" + .string "You should use some {POKEBLOCK}S before\n" + .string "you come see me again.$" FallarborTown_ContestLobby_Text_1B71D2:: @ 81B71D2 - .string "Aber du hast keine {POKEBLOCK}BOX.\p" - .string "Besorg dir eine {POKEBLOCK}BOX und\n" - .string "komm dann wieder.$" + .string "But you don’t have a {POKEBLOCK} CASE.\p" + .string "You should get a {POKEBLOCK} CASE and then\n" + .string "come see me.$" LilycoveCity_ContestLobby_Text_1B7225:: @ 81B7225 SlateportCity_ContestLobby_Text_1B7225:: @ 81B7225 - .string "Dann lass uns mal mixen.$" + .string "Let’s get blending already!$" LilycoveCity_ContestLobby_Text_1B7241:: @ 81B7241 - .string "Ich bin mal gespannt, welchen {POKEBLOCK}\n" - .string "ich bekomme. Das ist ja total aufregend!$" + .string "I wonder what kind of {POKEBLOCK} I’ll get?\n" + .string "This is so exciting!$" FallarborTown_ContestLobby_Text_1B727C:: @ 81B727C - .string "{POKEBLOCK} können mit Hilfe deiner Freunde\n" - .string "im BEERENMIXER aus BEEREN gemacht\l" - .string "werden.\p" - .string "Soll das Spiel gespeichert werden, bevor\n" - .string "du dich mit Freunden verbindest?$" + .string "{POKEBLOCK}S will be made with your friends \n" + .string "from BERRIES in the BERRY BLENDER.\p" + .string "Is it okay to save the game before\n" + .string "linking with your friends?$" FallarborTown_ContestLobby_Text_1B7304:: @ 81B7304 - .string "Verbindung zu Freunden wird aufgebaut.\n" - .string "...B-Knopf: Abbruch$" + .string "Searching for your friends...\n" + .string "... ... B Button: Cancel$" FallarborTown_ContestLobby_Text_1B733B:: @ 81B733B - .string "{STR_VAR_1} ist eingetroffen.$" + .string "{STR_VAR_1} arrived.$" FallarborTown_ContestLobby_Text_1B7347:: @ 81B7347 - .string "{STR_VAR_1} und {STR_VAR_2} sind\n" - .string "eingetroffen.$" + .string "{STR_VAR_1} and {STR_VAR_2} arrived.$" FallarborTown_ContestLobby_Text_1B735A:: @ 81B735A - .string "{STR_VAR_1}, {STR_VAR_2} und\n" - .string "{STR_VAR_3} sind eingetroffen.$" + .string "{STR_VAR_1}, {STR_VAR_2}, and\n" + .string "{STR_VAR_3} arrived.$" UnknownString_81B7372: @ 81B7372 - .string "Keiner da...$" + .string "Nobody came...$" FallarborTown_ContestLobby_Text_1B7381:: @ 81B7381 - .string "Du hast keine BEEREN. Du kannst\n" - .string "den BEERENMIXER nicht benutzen.$" + .string "You have no BERRIES.\n" + .string "The BERRY BLENDER can’t be used.$" FallarborTown_ContestLobby_Text_1B73B7:: @ 81B73B7 - .string "Deine {POKEBLOCK}BOX ist voll. Du kannst\n" - .string "den BEERENMIXER nicht benutzen.$" + .string "Your {POKEBLOCK} CASE is full.\n" + .string "The BERRY BLENDER can’t be used.$" FallarborTown_ContestLobby_Text_1B73F1:: @ 81B73F1 - .string "Du hast keine {POKEBLOCK}BOX und\n" - .string "kannst den BEERENMIXER nicht nutzen.$" + .string "You don’t have a {POKEBLOCK} CASE.\n" + .string "The BERRY BLENDER can’t be used.$" FallarborTown_ContestLobby_Text_1B742F:: @ 81B742F - .string "Ich liebe es, {POKEBLOCK}\n" - .string "herzustellen!\p" - .string "Ich habe immer einige BEEREN dabei.$" + .string "I love making {POKEBLOCK}S.\p" + .string "I always have some BERRIES with me.$" FallarborTown_ContestLobby_Text_1B7469:: @ 81B7469 - .string "Wenn du magst, können wir einige\n" - .string "{POKEBLOCK} zusammen am BEERENMIXER\l" - .string "herstellen.$" + .string "If you’d like, we could make some\n" + .string "{POKEBLOCK}S together using the\l" + .string "BERRY BLENDER.$" FallarborTown_ContestLobby_Text_1B74B4:: @ 81B74B4 .string "Oh?\n" - .string "Du hast keine BEEREN?\p" - .string "Na, dann klappt das dieses Mal nicht.\p" - .string "Aber... Wenn du nichts gegen Reste\n" - .string "einzuwenden hast, dann kannst du eine\l" - .string "meiner BEEREN haben.$" + .string "You don’t have any BERRIES?\p" + .string "Well, that won’t do at all now, will it?\p" + .string "If you don’t mind leftovers, you can\n" + .string "have one of my BERRIES.$" FallarborTown_ContestLobby_Text_1B753A:: @ 81B753A - .string "Aus den BEEREN stellen wir im\n" - .string "BEERENMIXER {POKEBLOCK} her.$" + .string "We’ll use it to make {POKEBLOCK}S together\n" + .string "using the BERRY BLENDER.$" FallarborTown_ContestLobby_Text_1B7578:: @ 81B7578 .string "Oh?\n" - .string "Du hast keine BEEREN?\p" - .string "Wenn ich welche übrig hätte, würde ich\n" - .string "dir gerne eine abgeben...\p" - .string "Aber leider habe ich heute keine übrig.\n" - .string "Das tut mir echt Leid.$" + .string "You don’t have any BERRIES?\p" + .string "If I had some left over, I’d gladly\n" + .string "give you one...\p" + .string "But, I don’t have any to spare today.\n" + .string "Sorry about that.$" diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index fa3507866..bcf57eb5b 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,110 +1,106 @@ Route101_Text_1C4449:: @ 81C4449 - .string "PROF. BIRK: Ah, {PLAYER}{KUN}!\p" - .string "Möchtest du mir deine Fortschritte mit\n" - .string "dem POKéDEX zeigen?$" + .string "PROF. BIRCH: Ah, {PLAYER}{KUN}!\p" + .string "Have you come to show me how your\n" + .string "POKéDEX is coming along?$" Route101_Text_1C449B:: @ 81C449B - .string "Ach? Du hast erst so wenige POKéMON\n" - .string "gefangen, dass es sich nicht lohnt,\l" - .string "ihn mir zu zeigen?$" + .string "Hm? Oh, you haven’t caught enough\n" + .string "POKéMON to make it worthwhile.$" Route101_Text_1C44DC:: @ 81C44DC .string "Hmhm...\p" - .string "Oh, du hast {STR_VAR_1} POKéMON gesehen\n" - .string "und {STR_VAR_2} POKéMON gefangen...$" + .string "So, you’ve seen {STR_VAR_1} POKéMON,\n" + .string "and you’ve caught {STR_VAR_2} POKéMON...$" gBirchDexRatingText_LessThan10:: @ 81C4520 - .string "Du solltest mehr ins hohe Gras gehen\n" - .string "und mehr auf POKéMON achten.$" + .string "You should go into grassy areas more\n" + .string "and look for POKéMON more carefully.$" gBirchDexRatingText_LessThan20:: @ 81C456A - .string "So langsam bekommst du den Bogen raus.\n" - .string "Aber es wird immer schwieriger werden!$" + .string "I guess you’re getting the hang of it.\n" + .string "But, it gets harder from here.$" gBirchDexRatingText_LessThan30:: @ 81C45B0 - .string "Einige POKéMON tauchen nur in be-\n" - .string "stimmten Regionen auf. Hab nur Geduld.$" + .string "Some POKéMON only appear in certain\n" + .string "areas. You’ll need to be persistent.$" gBirchDexRatingText_LessThan40:: @ 81C45F9 - .string "Nun, er könnte mehr Einträge enthalten,\n" - .string "aber es sieht schon eher nach einem\l" - .string "POKéDEX aus.$" + .string "Well, it could use more quantity, but\n" + .string "this is looking more like a POKéDEX now.$" gBirchDexRatingText_LessThan50:: @ 81C4648 - .string "Das läuft doch wunderbar.\n" - .string "Mach weiter so.$" + .string "This is coming along pretty good.\n" + .string "Keep up the effort.$" gBirchDexRatingText_LessThan60:: @ 81C467E - .string "Verwendest du irgendwelche ANGELN?\n" - .string "Hier gibt es viele POKéMON im Meer.$" + .string "Are you using any RODS?\n" + .string "There are many POKéMON in the sea.$" gBirchDexRatingText_LessThan70:: @ 81C46B9 - .string "Statt die POKéMON nur zu fangen, wie\n" - .string "wäre es, sie sich entwickeln zu lassen?$" + .string "Instead of just catching POKéMON,\n" + .string "how about making them evolve, too?$" gBirchDexRatingText_LessThan80:: @ 81C46FE - .string "Der POKéDEX wird einfach fantastisch.\n" - .string "Das habe ich im Gefühl...$" + .string "This is going to be a fantastic POKéDEX.\n" + .string "That’s the feeling I’m getting.$" gBirchDexRatingText_LessThan90:: @ 81C4747 - .string "Du hast so viele gefangen...\n" - .string "Du hast ein außergewöhnliches Talent!$" + .string "You’ve collected this many...\n" + .string "Your talent is remarkable!$" gBirchDexRatingText_LessThan100:: @ 81C4780 - .string "Warst du schon mal in der SAFARI-ZONE?\p" - .string "Ich habe gehört, es gibt POKéMON,\n" - .string "die man nur dort finden kann.$" + .string "Have you visited the SAFARI ZONE?\p" + .string "I hear there are some POKéMON that\n" + .string "can only be caught there.$" gBirchDexRatingText_LessThan110:: @ 81C47DF - .string "Du hast die 100er Marke überschritten!\n" - .string "Das ist ein beeindruckender POKéDEX!$" + .string "You’ve finally reached the 100-kind\n" + .string "mark. This is an impressive POKéDEX!$" gBirchDexRatingText_LessThan120:: @ 81C4828 - .string "Es gibt auch POKéMON, die man durch den\n" - .string "Einsatz von ZERTRÜMMERER findet.$" + .string "There might be POKéMON that can be\n" + .string "found using ROCK SMASH.$" gBirchDexRatingText_LessThan130:: @ 81C4863 - .string "Du solltest einige POKéMON fangen und\n" - .string "sie mit anderen tauschen.$" + .string "You should get some more POKéMON by\n" + .string "trading with others.$" gBirchDexRatingText_LessThan140:: @ 81C489C - .string "Ich habe von POKéMON gehört, die sich\n" - .string "entwickeln, wenn sie ihren TRAINER sehr\l" - .string "lieben.$" + .string "I’ve heard of POKéMON that evolve when\n" + .string "they come to fully love their TRAINERS.$" gBirchDexRatingText_LessThan150:: @ 81C48EB - .string "Ich hatte keine Ahnung, dass es in der\n" - .string "HOENN-Region so viele verschiedene\l" - .string "POKéMON-Arten gibt.$" + .string "I had no idea that there were so many\n" + .string "POKéMON species in the HOENN region.$" gBirchDexRatingText_LessThan160:: @ 81C4936 - .string "Manchmal erscheinen einige POKéMON in\n" - .string "großer Anzahl, wie bei einem Ausbruch.\l" - .string "Das solltest du nicht verpassen!$" + .string "On occasion, some POKéMON appear in\n" + .string "large numbers like wild outbreaks.\l" + .string "Don’t miss opportunities like those.$" gBirchDexRatingText_LessThan170:: @ 81C49A2 - .string "Dein POKéDEX liefert einen erstaunlich\n" - .string "guten Einblick in die POKéMON der\l" - .string "HOENN-Region!$" + .string "One can get a very good idea about the\n" + .string "POKéMON of the HOENN region by looking\l" + .string "through your POKéDEX.$" gBirchDexRatingText_LessThan180:: @ 81C4A06 - .string "Ich sage, du hast dich bereits als\n" - .string "guter POKéMON-PROFESSOR qualifiziert.$" + .string "I’d say you already qualify as a POKéMON\n" + .string "PROFESSOR, and a good one, too!$" gBirchDexRatingText_LessThan190:: @ 81C4A4F - .string "Mit diesem POKéDEX, der schon so weit\n" - .string "gediehen ist, bist du ein echter Profi.$" + .string "With a POKéDEX this complete, you’re\n" + .string "a real professional at this!$" gBirchDexRatingText_LessThan200:: @ 81C4A91 - .string "Du bist sehr nahe dran, den POKéDEX zu\n" - .string "vervollständigen. Das fühle ich einfach.$" + .string "You’re very close to completing this\n" + .string "POKéDEX. I can feel it in my bones!$" gBirchDexRatingText_DexCompleted:: @ 81C4ADA - .string "Herzlichen Glückwunsch!\n" - .string "Dein POKéDEX ist vollständig!$" + .string "Congratulations!\n" + .string "Your POKéDEX is complete!$" Route101_Text_1C4B05:: @ 81C4B05 .string "Hmhm...\n" - .string "Auf nationaler Ebene...\p" - .string "Hast du {STR_VAR_1} POKéMON gesehen\n" - .string "und {STR_VAR_2} POKéMON gefangen...$" + .string "On a nationwide basis...\p" + .string "You’ve seen {STR_VAR_1} POKéMON,\n" + .string "and you’ve caught {STR_VAR_2} POKéMON...$" diff --git a/data/text/pokemon_news.inc b/data/text/pokemon_news.inc index 1de2ce817..95bb0888a 100644 --- a/data/text/pokemon_news.inc +++ b/data/text/pokemon_news.inc @@ -1,152 +1,146 @@ gTVNewsText_EnergyGuru1:: @ 81AD135 - .string "Guten Tag, meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Heute berichten wir über GRAPHITPORT\n" - .string "CITYS bekanntesten Typen, den\l" - .string "STATUSWERTE GURU!\p" - .string "Er werde sich: “Enorm ins Zeug legen\n" - .string "in den nächsten {STR_VAR_1} Tag/en!”\p" - .string "Er wollte uns nicht verraten, wofür er\n" - .string "sich ins Zeug legt. Stattdessen gab\p" - .string "er uns den Rat: “Spart euer\n" - .string "Geld. Das wäre gut...”\p" - .string "GRAPHITPORT CITY ist eine Reise wert!\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "SLATEPORT’s most popular kind of guy,\n" + .string "the ENERGY GURU, is in the news again!\p" + .string "He promises to, “Stupendously go for\n" + .string "it in just this many days: {STR_VAR_1}!”\p" + .string "While he refused to elaborate on what\n" + .string "he will stupendously go for, the\l" + .string "ENERGY GURU advised, “Save up your\l" + .string "money. That’ll be good...”\p" + .string "It sounds like a trip to SLATEPORT\n" + .string "would be well worth your while that day.\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_EnergyGuru2:: @ 81AD2E0 - .string "Guten Tag, meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Auf diese Nachrichten haben Sie\n" - .string "alle schon sehnsüchtig gewartet!\p" - .string "GRAPHITPORT CITYS STATUSWERTE GURU\n" - .string "legt sich im MARKT enorm ins Zeug!\p" - .string "Er verspricht uns unschlagbare Preise\n" - .string "zum Beispiel für KALZIUM und PROTEIN!\p" - .string "GRAPHITPORT CITY ist also eine Reise\n" - .string "wert. Also: Schauen Sie vorbei und\l" - .string "kaufen Sie, was das Herz begehrt.\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "SLATEPORT’S ENERGY GURU is going\n" + .string "for it stupendously in the MARKET!\p" + .string "He promises unbeatable bargain\n" + .string "prices on CALCIUM and PROTEIN!\p" + .string "A trip to SLATEPORT CITY sounds\n" + .string "worthwhile. Why not visit and shop\l" + .string "to your heart’s content?\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_EnergyGuru3:: @ 81AD434 - .string "Guten Tag, meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Auf diese Nachrichten haben Sie\n" - .string "alle schon sehnsüchtig gewartet!\p" - .string "GRAPHITPORT CITYS STATUSWERTE GURU\n" - .string "legt sich im MARKT enorm ins Zeug!\p" - .string "Er verspricht uns unschlagbare Preise\n" - .string "für KALZIUM und PROTEIN!\p" - .string "Aber der STATUSWERTE GURU weist\n" - .string "auch darauf hin, dass noch viele\l" - .string "Packungen vorhanden sind.\p" - .string "Also: Auf nach GRAPHITPORT CITY und\n" - .string "genießen Sie den Einkauf!\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "SLATEPORT’S ENERGY GURU is going\n" + .string "for it stupendously in the MARKET!\p" + .string "He promises unbeatable bargain\n" + .string "prices on CALCIUM and PROTEIN!\p" + .string "According to the ENERGY GURU, he\n" + .string "still has ample merchandise left.\p" + .string "Why not visit SLATEPORT CITY for\n" + .string "a most enjoyable shopping trip?\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_GameCorner1:: @ 81AD5B0 - .string "Guten Tag meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Bald ist es so weit!\n" - .string "Bald ist der Tag gekommen!\p" - .string "In {STR_VAR_1} Tagen erleben wir ihn, den\n" - .string "Tag der SPIELHALLE!\p" - .string "Selbst diejenigen, die nie Glück haben,\n" - .string "werden ihr Glück nicht fassen können!\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "It’s approaching!\n" + .string "It’s finally coming!\p" + .string "The GAME CORNER’s service day will be\n" + .string "here in just this many days: {STR_VAR_1}!\p" + .string "Even those who are usually unlucky\n" + .string "may be lucky on this particular day!\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_GameCorner2:: @ 81AD6AE - .string "Guten Tag meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Endlich ist es so weit!\n" - .string "Endlich ist der Tag gekommen!\p" - .string "Heute erleben wir ihn, den Tag der\n" - .string "SPIELHALLE!\p" - .string "Fordern Sie Ihr Glück beim ROULETTE\n" - .string "oder den EINARMIGEN BANDITEN heraus.\p" - .string "Das Stichwort heißt: MALVENFROH CITY!\n" - .string "Dort finden Sie Ihr Glück!\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "It’s here!\n" + .string "It’s finally arrived!\p" + .string "GAME CORNER’s service day has finally\n" + .string "arrived!\p" + .string "Could you be lucky at the SLOTS \n" + .string "and ROULETTE?\p" + .string "The location is MAUVILLE CITY.\n" + .string "This is the place!\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_GameCorner3:: @ 81AD7A7 - .string "Guten Tag, meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Endlich ist es so weit!\n" - .string "Endlich ist der Tag gekommen!\p" - .string "Heute erleben wir ihn, den Tag der\n" - .string "SPIELHALLE!\p" - .string "Fordern Sie Ihr Glück beim ROULETTE\n" - .string "oder den EINARMIGEN BANDITEN heraus.\p" - .string "Beeilen Sie sich, denn auch dieser Tag\n" - .string "hat nur 24 Stunden. MALVENFROH CITY\l" - .string "ruft!\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "It’s here!\n" + .string "It’s finally arrived!\p" + .string "GAME CORNER’s service day has finally\n" + .string "arrived!\p" + .string "Could you be lucky at the SLOTS\n" + .string "and ROULETTE?\p" + .string "Time is limited and has almost run out.\n" + .string "The location is MAUVILLE CITY.\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_LilycoveDepartment1:: @ 81AD8B4 - .string "Guten Tag meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Soeben erreichen uns wundervolle Nach-\n" - .string "richten vom SEEGRASULB CITY\l" - .string "EINKAUFSZENTRUM.\p" - .string "In {STR_VAR_1} Tag/en findet dort ein totaler\n" - .string "Ausverkauf statt!\p" - .string "Das Dingsbums und das Dingsda, welches\n" - .string "Sie schon immer haben wollten, kann\l" - .string "Ihnen gehören.\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "We’ve just received wonderful news\n" + .string "from LILYCOVE DEPARTMENT STORE.\p" + .string "The DEPARTMENT STORE’s clear-out sale\n" + .string "will be in just this many days: {STR_VAR_1}!\p" + .string "That thingamajig or that doodad that\n" + .string "you’ve always wanted could be yours!\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_LilycoveDepartment2:: @ 81AD9D3 - .string "Guten Tag meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Auf diese Nachricht haben Sie schon\n" - .string "sehnsüchtig gewartet!\p" - .string "Im SEEGRASULB CITY EINKAUFSZENTRUM\n" - .string "findet heute ein totaler Ausverkauf\l" - .string "statt!\p" - .string "Das Dingsbums und das Dingsda, welches\n" - .string "Sie schon immer haben wollten...\p" - .string "Sie können sie dort finden!\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" + .string "sale has finally arrived!\p" + .string "All the thingamajigs and doodads that\n" + .string "you’ve always dreamt about...\p" + .string "You may be in for fateful encounters\n" + .string "with them all!\p" + .string "That’s the news on POKéMON NEWS.$" gTVNewsText_LilycoveDepartment3:: @ 81ADB01 - .string "Guten Tag, meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Auf diese Nachricht haben Sie schon\n" - .string "sehnsüchtig gewartet!\p" - .string "Im SEEGRASULB CITY EINKAUFSZENTRUM\n" - .string "findet heute ein totaler Ausverkauf\l" - .string "statt!\p" - .string "Das Dingsbums und das Dingsda, welches\n" - .string "Sie schon immer haben wollten...\p" - .string "Sie können sie dort finden!\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "This is the news you’ve all been\n" + .string "waiting for!\p" + .string "LILYCOVE DEPARTMENT STORE’s clear-out\n" + .string "sale has finally arrived!\p" + .string "All the thingamajigs and doodads that\n" + .string "you’ve always dreamt about...\p" + .string "You may be in for fateful encounters\n" + .string "with them all!\p" + .string "That’s the news on POKéMON NEWS.$" @ all text advertisements below are unused. gTVUnusedText_DevonCorporation:: @ 81ADC2F - .string "Diese Sendung wurde Ihnen präsentiert\n" - .string "von der DEVON CORPORATION.$" + .string "This program has been brought to you\n" + .string "by the DEVON CORPORATION.$" gTVUnusedText_Contests:: @ 81ADC6E - .string "Das Wichtigste ist Liebe zu den\n" - .string "POKéMON!\p" - .string "Was man braucht ist Mut.\p" - .string "Stelle die geliebten POKéMON in den\n" - .string "Mittelpunkt! POKéMON WETTBEWERB!$" + .string "What’s important is love for POKéMON.\p" + .string "What you need is a little courage.\p" + .string "Let your cherished POKéMON take\n" + .string "center stage! POKéMON CONTESTS!$" gTVUnusedText_DayCare:: @ 81ADCF7 - .string "Wir ziehen deine geliebten POKéMON mit\n" - .string "all unserer Hingabe auf!\p" - .string "Alles was deine POKéMON zum Wachsen\n" - .string "brauchen: Die PENSION an der ROUTE 117.$" + .string "We raise your beloved POKéMON with\n" + .string "all of our love!\p" + .string "For all your POKéMON-training needs,\n" + .string "visit our DAY CARE on ROUTE 117.$" gTVUnusedText_LavaridgeSpa:: @ 81ADD71 - .string "Im Schoß der Freude und Entspannung!\n" - .string "KURORT BAD LAVASTADT.$" + .string "The cauldron of good times and laughs!\n" + .string "LAVARIDGE SPA.$" gTVUnusedText_LilycoveDepartment:: @ 81ADDA7 - .string "Ein Überfluss an Waren und\n" - .string "Überraschungen!\p" - .string "Ein Ort, an dem man alles findet, was\n" - .string "das Herz begehrt!\p" - .string "Einkaufen im EINKAUFSZENTRUM\n" - .string "von SEEGRASULB CITY, dem\l" - .string "Einkaufsparadies!$" + .string "Overflowing with great merchandise\n" + .string "and excitement!\p" + .string "A great place to find that something\n" + .string "you need!\p" + .string "Visit LILYCOVE DEPARTMENT STORE for\n" + .string "all your shopping needs!$" diff --git a/data/text/ribbon_descriptions.inc b/data/text/ribbon_descriptions.inc index 0450d8db5..ebbfc34ff 100644 --- a/data/text/ribbon_descriptions.inc +++ b/data/text/ribbon_descriptions.inc @@ -1,59 +1,59 @@ gRibbonDescriptionPart1_Champion: - .string "BAND für unschlagbare$" + .string "CHAMPION-beating, HALL$" gRibbonDescriptionPart2_Champion: - .string "RUHMESHALLE-Mitglieder$" + .string "OF FAME Member RIBBON$" gRibbonDescriptionPart1_CoolContest: - .string "COOLNESS-WETTBEWERB$" + .string "COOL CONTEST$" gRibbonDescriptionPart1_BeautyContest: - .string "SCHÖNHEITSWETTBEWERB$" + .string "BEAUTY CONTEST$" gRibbonDescriptionPart1_CuteContest: - .string "ANMUT-WETTBEWERB$" + .string "CUTE CONTEST$" gRibbonDescriptionPart1_SmartContest: - .string "KLUGHEITSWETTBEWERB$" + .string "SMART CONTEST$" gRibbonDescriptionPart1_ToughContest: - .string "STÄRKE-WETTBEWERB$" + .string "TOUGH CONTEST$" gRibbonDescriptionPart2_NormalRank: - .string "Sieger in Normal-Klasse!$" + .string "Normal Rank winner!$" gRibbonDescriptionPart2_SuperRank: - .string "Sieger in Super-Klasse!$" + .string "Super Rank winner!$" gRibbonDescriptionPart2_HyperRank: - .string "Sieger in Hyper-Klasse!$" + .string "Hyper Rank winner!$" gRibbonDescriptionPart2_MasterRank: - .string "Sieger in Master-Klasse!$" + .string "Master Rank winner!$" gRibbonDescriptionPart1_Winning: - .string "BAND für Lv. 50-Erfolg$" + .string "RIBBON for clearing LV50$" gRibbonDescriptionPart2_Winning: - .string "im DUELLTURM.$" + .string "at the BATTLE TOWER.$" gRibbonDescriptionPart1_Victory: - .string "Für Erfolg in Lv. 100$" + .string "Won for clearing LV100$" gRibbonDescriptionPart2_Victory: - .string "im DUELLTURM.$" + .string "at the BATTLE TOWER.$" gRibbonDescriptionPart1_Artist: - .string "Band für auserwählte$" + .string "RIBBON for being chosen$" gRibbonDescriptionPart2_Artist: - .string "Porträt-Modelle.$" + .string "as a super sketch model.$" gRibbonDescriptionPart1_Effort: - .string "BAND für$" + .string "RIBBON awarded for$" gRibbonDescriptionPart2_Effort: - .string "fleißige Arbeiter.$" + .string "being a hard worker.$" .align 2 gRibbonDescriptions:: @ 83E113C diff --git a/data/text/roulette.inc b/data/text/roulette.inc index bcabbd012..f228cf779 100644 --- a/data/text/roulette.inc +++ b/data/text/roulette.inc @@ -1,51 +1,52 @@ gUnknown_081C40DF:: @ 81C40DF - .string "Der Einsatz an diesem Tisch ist\n" - .string "{STR_VAR_1}. Möchtest du spielen?$" +UnknownString_81C40DF: @ 81C40DF + .string "The minimum wager at this table is {STR_VAR_1}. \n" + .string "Do you want to play?$" -UnknownString_81C411C: @ 81C411C gUnknown_081C411C:: @ 81C411C - .string "Du hast nicht genug MÜNZEN.$" +UnknownString_81C411C: @ 81C411C + .string "You don’t have enough COINS.$" -UnknownString_81C4139: @ 81C4139 gUnknown_081C4139:: @ 81C4139 - .string "Und nun eine Bonusrunde!$" +UnknownString_81C4139: @ 81C4139 + .string "Special rate table right now!$" gUnknown_081C4157:: @ 81C4157 - .string "Mache deinen Einsatz mit dem + Steuer-\n" - .string "kreuz und drücke dann den A-Knopf.$" + .string "Place your wager with the + Control Pad,\n" + .string "then press the A Button.$" -UnknownString_81C4199: @ 81C4199 gUnknown_081C4199:: @ 81C4199 - .string "Ein Treffer!$" +UnknownString_81C4199: @ 81C4199 + .string "It’s a hit!$" -UnknownString_81C41A5: @ 81C41A5 gUnknown_081C41A5:: @ 81C41A5 +UnknownString_81C41A5: @ 81C41A5 .string "Jackpot!$" -UnknownString_81C41AE: @ 81C41AE gUnknown_081C41AE:: @ 81C41AE - .string "Das war nichts!$" +UnknownString_81C41AE: @ 81C41AE + .string "Nothing doing!$" -UnknownString_81C41BD: @ 81C41BD gUnknown_081C41BD:: @ 81C41BD - .string "Du hast {STR_VAR_1} MÜNZEN gewonnen!$" +UnknownString_81C41BD: @ 81C41BD + .string "You’ve won {STR_VAR_1} COINS!$" -UnknownString_81C41D2: @ 81C41D2 gUnknown_081C41D2:: @ 81C41D2 - .string "Nicht mehr genug MÜNZEN übrig...$" +UnknownString_81C41D2: @ 81C41D2 + .string "No COINS left...$" -UnknownString_81C41E3: @ 81C41E3 gUnknown_081C41E3:: @ 81C41E3 - .string "Weiterspielen?$" +UnknownString_81C41E3: @ 81C41E3 + .string "Keep playing?$" -UnknownString_81C41F1: @ 81C41F1 gUnknown_081C41F1:: @ 81C41F1 - .string "Der ROULETTE-Tisch wird abgeräumt.$" +UnknownString_81C41F1: @ 81C41F1 + .string "The ROULETTE board will be cleared.$" UnknownString_81C4215: @ 81C4215 - .string "Du hast keinen MÜNZKORB.$" + .string "You don’t have a COIN CASE.$" -UnknownString_81C4231: @ 81C4231 gUnknown_081C4231:: @ 81C4231 - .string "Dein MÜNZKORB ist voll! Münzen können\n" - .string "gegen Preise eingetauscht werden.$" +UnknownString_81C4231: @ 81C4231 + .string "Your COIN CASE is full!\n" + .string "Coins can be exchanged for prizes.$" diff --git a/data/text/safari_zone.inc b/data/text/safari_zone.inc index 8dfbdeed2..34966b9d1 100644 --- a/data/text/safari_zone.inc +++ b/data/text/safari_zone.inc @@ -1,183 +1,176 @@ UnknownString_81C34B2: @ 81C34B2 - .string "Möchtest du die SAFARI-ZONE jetzt\n" - .string "verlassen?$" + .string "Would you like to exit the SAFARI ZONE\n" + .string "right now?$" UnknownString_81C34E4: @ 81C34E4 - .string "Ding Dong! Die Zeit ist abgelaufen!\n" - .string "Dein SAFARI-Spiel ist vorbei.$" + .string "Ding-dong! Time’s up!\n" + .string "Your SAFARI Game is over.$" UnknownString_81C3514: @ 81C3514 - .string "Du hast keine SAFARIBÄLLE mehr.\n" - .string "Dein SAFARI-Spiel ist vorbei.$" + .string "You’ve run out of SAFARI BALLS.\n" + .string "Your SAFARI Game is over.$" UnknownString_81C354E: @ 81C354E - .string "Möchtest du einen {POKEBLOCK} in den\n" - .string "{POKEBLOCK}NAPF legen?$" + .string "Would you like to place a {POKEBLOCK}\n" + .string "on the {POKEBLOCK} FEEDER?$" UnknownString_81C3583: @ 81C3583 - .string "Dein {STR_VAR_1} befindet sich\n" - .string "noch in unserer Obhut.$" + .string "The {STR_VAR_1} you left\n" + .string "before is still here.$" UnknownString_81C35A9: @ 81C35A9 - .string "{STR_VAR_1} wurde in den {POKEBLOCK}-\n" - .string "NAPF gelegt.$" + .string "The {STR_VAR_1} was placed\n" + .string "on the {POKEBLOCK} FEEDER.$" Route121_SafariZoneEntrance_Text_1C35D0:: @ 81C35D0 - .string "Willkommen in der SAFARI-ZONE!\p" - .string "Hier bekommst du viele POKéMON zu\n" - .string "Gesicht, die sehr selten in der HOENN-\l" - .string "Region sind.\p" - .string "Du kannst sie in ihrer ganzen Wildheit\n" - .string "und ungezähmt in ihrer natürlichen\l" - .string "Umgebung beobachten.\p" - .string "Wir haben unsere Tore für die POKéMON-\n" - .string "TRAINER geöffnet.\p" - .string "Fangt euch POKéMON. Und behaltet sie!\p" - .string "Kommt und genießt die Welt der\n" - .string "SAFARI-ZONE!$" + .string "Welcome to the SAFARI ZONE!\p" + .string "Here, you may witness many kinds of\n" + .string "POKéMON rarely seen in HOENN.\p" + .string "And, you’ll see them in their wild,\n" + .string "untamed state in natural habitats.\p" + .string "What’s more, we’ve thrown open the\n" + .string "gates to POKéMON TRAINERS.\p" + .string "You’re encouraged to catch POKéMON\n" + .string "for keeps!\p" + .string "Come in and enjoy the SAFARI ZONE!$" Route121_SafariZoneEntrance_Text_1C3704:: @ 81C3704 - .string "Willkommen in der SAFARI-ZONE!\n" - .string "Bist du zum ersten Mal hier?$" + .string "Welcome to the SAFARI ZONE!\n" + .string "Is it your first time here?$" Route121_SafariZoneEntrance_Text_1C373C:: @ 81C373C - .string "Komm und genieße die SAFARI-ZONE!$" + .string "Come in and enjoy the SAFARI ZONE!$" Route121_SafariZoneEntrance_Text_1C375F:: @ 81C375F - .string "Sobald du die SAFARI-ZONE betrittst,\n" - .string "stehen dir 30 SAFARIBÄLLE zur Ver-\l" - .string "fügung, um POKéMON zu fangen.\p" - .string "Das SAFARI-Spiel ist vorbei, sobald du\n" - .string "deine SAFARIBÄLLE verbraucht oder\l" - .string "500 Schritte gemacht hast.\p" - .string "Komm und genieße die SAFARI-ZONE!$" + .string "When you enter the SAFARI ZONE, you\n" + .string "start with 30 SAFARI BALLS for\l" + .string "catching POKéMON.\p" + .string "The SAFARI Game is over when you run\n" + .string "out of SAFARI BALLS, or when you’ve\l" + .string "walked 500 steps.\p" + .string "Come in and enjoy the SAFARI ZONE!$" Route121_SafariZoneEntrance_Text_1C3832:: @ 81C3832 - .string "Willkommen in der SAFARI-ZONE!\p" - .string "Alles, was du fangen kannst für nur\n" - .string "¥500! Möchtest du es einmal probieren?$" + .string "Welcome to the SAFARI ZONE!\p" + .string "All you can catch for just ¥500!\n" + .string "Would you like to play a SAFARI Game?$" Route121_SafariZoneEntrance_Text_1C3895:: @ 81C3895 .string "Okay.\n" - .string "Bitte beehre uns doch später einmal.$" + .string "Please play another time!$" Route121_SafariZoneEntrance_Text_1C38B5:: @ 81C38B5 - .string "Du hast nicht genug Geld dabei.\n" - .string "Tut mir Leid.$" + .string "You don’t have enough money.\n" + .string "Sorry.$" Route121_SafariZoneEntrance_Text_1C38D9:: @ 81C38D9 - .string "Das macht dann ¥500, bitte.$" + .string "That will be ¥500, please.$" Route121_SafariZoneEntrance_Text_1C38F4:: @ 81C38F4 - .string "Hier sind deine SAFARIBÄLLE.$" + .string "Here are your SAFARI BALLS.$" Route121_SafariZoneEntrance_Text_1C3910:: @ 81C3910 - .string "{PLAYER} erhält 30 SAFARIBÄLLE.$" + .string "{PLAYER} received 30 SAFARI BALLS.$" Route121_SafariZoneEntrance_Text_1C392D:: @ 81C392D - .string "Wir geben dir Bescheid, wenn das Spiel\n" - .string "vorbei ist.\p" - .string "Bis dahin wünschen wir viel Spaß!\n" - .string "Und auf geht’s in die Wildnis!$" + .string "We’ll let you know when your game\n" + .string "is over.\p" + .string "So, until then, enjoy yourself, please!\n" + .string "Off you go on your wild excursion!$" Route121_SafariZoneEntrance_Text_1C39A3:: @ 81C39A3 - .string "Entschuldigung!\n" - .string "Deine PC-BOXEN sind voll.$" + .string "Excuse me!\n" + .string "Your PC BOX is full.$" Route121_SafariZoneEntrance_Text_1C39C3:: @ 81C39C3 - .string "Entschuldigung!\n" - .string "Du besitzt keine {POKEBLOCK}BOX.\p" - .string "Dein SAFARI-Spiel wäre viel erfolg-\n" - .string "reicher, wenn du {POKEBLOCK} benutzen\l" - .string "würdest.\p" - .string "Bitte besorge dir doch eine {POKEBLOCK}BOX.$" + .string "Excuse me!\n" + .string "You seem to be without a {POKEBLOCK} CASE.\p" + .string "Your SAFARI Game will be much more\n" + .string "fruitful if you use {POKEBLOCK}S.\p" + .string "Please come back with a {POKEBLOCK} CASE.$" SafariZone_Southeast_Text_1C3A56:: @ 81C3A56 - .string "Du hast noch Zeit übrig. Möchtest du\n" - .string "die SAFARI-ZONE jetzt verlassen?$" + .string "You still have time left. Would you like\n" + .string "to exit the SAFARI ZONE now?$" SafariZone_Southeast_Text_1C3A9C:: @ 81C3A9C - .string "Viel Vergnügen bei dem Rest deines\n" - .string "wilden Abenteuers!$" + .string "Please enjoy the rest of your wild\n" + .string "adventure!$" SafariZone_Southeast_Text_1C3ACA:: @ 81C3ACA .string "Okay.\p" - .string "Ich nehme die verbleibenden\n" - .string "SAFARIBÄLLE zurück.\p" - .string "Vielen Dank für deine Teilnahme.\n" - .string "Komm bald wieder!$" + .string "I’ll take back your remaining SAFARI\n" + .string "BALLS.\p" + .string "Thank you for playing.\n" + .string "We hope to see you again.$" SafariZone_Southeast_Text_1C3B2D:: @ 81C3B2D - .string "Viel Glück!\p" - .string "Wenn du irgendetwas brauchst, zögere\n" - .string "nicht, mich anzusprechen!$" + .string "Good luck!\p" + .string "If you need anything, don’t hesitate\n" + .string "to tell me, please!$" SafariZone_Southeast_Text_1C3B71:: @ 81C3B71 - .string "Weißt du was?\p" - .string "Wenn du einen {POKEBLOCK} in diese Kiste\n" - .string "dort legst, werden POKéMON angelockt.$" + .string "Did you know?\p" + .string "If you put a {POKEBLOCK} in that square box,\n" + .string "POKéMON gather around.$" SafariZone_Southeast_Text_1C3BBD:: @ 81C3BBD - .string "Ich wollte noch weiter hinein, aber\n" - .string "ich habe mein RAD vergessen.\p" - .string "Irgendetwas sagt mir, dass in den abge-\n" - .string "legenen Gegenden seltene POKéMON\l" - .string "leben.$" + .string "I want to keep going deeper, but I\n" + .string "forgot to bring a BIKE.\p" + .string "Something tells me that rare POKéMON\n" + .string "live in the outlying areas.$" SafariZone_Southwest_Text_1C3C39:: @ 81C3C39 - .string "Manchmal, wenn ich einem POKéMON einen\n" - .string "{POKEBLOCK} zuwerfe, ignoriert es das total.\p" - .string "Ob POKéMON auch manche Dinge mögen\n" - .string "und manche nicht? Wie wir Menschen?$" + .string "Sometimes, when I toss a {POKEBLOCK} at \n" + .string "POKéMON, it gets ignored.\p" + .string "Do POKéMON have likes and dislikes\n" + .string "about what they eat?$" SafariZone_Northwest_Text_1C3CAE:: @ 81C3CAE - .string "Hechel... Keuch...\n" - .string "Ich... bin hierher gekommen... aber...\p" - .string "Ich bin erschöpft... Japs... Ich habe\n" - .string "keine Energie, ein POKéMON zu fangen.$" + .string "Gasp... Gasp...\n" + .string "I...made it out here...but...\p" + .string "I’m exhausted... I don’t have the\n" + .string "energy to catch POKéMON...$" SafariZone_Northeast_Text_1C3D19:: @ 81C3D19 - .string "Ich habe eine Mission. Ich will WASSER-\n" - .string "POKéMON fangen, die es in HOENN nicht\l" - .string "gibt.\p" - .string "Weißt du zufällig, wo hier der See ist?$" + .string "I’m on a mission to find WATER POKéMON\n" + .string "you don’t see in HOENN.\p" + .string "Do you have any idea where the lake is?$" SafariZone_Northeast_Text_1C3D80:: @ 81C3D80 - .string "Ich will viele seltene POKéMON fangen\n" - .string "und mit meinen Freunden tauschen.$" + .string "I’m going to catch a lot of rare POKéMON\n" + .string "here and trade them with my friends!$" SafariZone_Southeast_Text_1C3DCE:: @ 81C3DCE - .string "Ich habe einen {POKEBLOCK} in den {POKEBLOCK}-\n" - .string "NAPF gelegt. Er ist verschwunden.\p" - .string "Ein POKéMON muss ihn gefuttert haben,\n" - .string "ohne dass ich das gemerkt habe.$" + .string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n" + .string "But it seems to have disappeared.\p" + .string "I guess POKéMON must have eaten it\n" + .string "without me noticing.$" Route121_SafariZoneEntrance_Text_1C3E4B:: @ 81C3E4B - .string "TIPP für TRAINER in der SAFARI-ZONE!\p" - .string "Wirf POKéMON {POKEBLOCK} zu, dann ergreifen\n" - .string "sie nicht so schnell die Flucht.$" + .string "SAFARI ZONE TRAINER TIP!\p" + .string "Throw {POKEBLOCK}S at wild POKéMON to make\n" + .string "them less likely to flee.$" SafariZone_Southwest_Text_1C3EA3:: @ 81C3EA3 - .string "“Erhole deine gemarterten Füße.”\n" - .string "RASTHAUS$" + .string "“Relieve your tired feet.”\n" + .string "REST HOUSE$" SafariZone_RestHouse_Text_1C3EC9:: @ 81C3EC9 - .string "Ich habe keine {POKEBLOCK}, aber ich habe\n" - .string "trotzdem viele POKéMON gefangen.\p" - .string "Du kannst deine Chancen erhöhen, indem\n" - .string "du näher an das POKéMON herangehst,\l" - .string "bevor du den SAFARIBALL wirfst.$" + .string "I don’t have any {POKEBLOCK}S, but I caught\n" + .string "a good number of POKéMON.\p" + .string "You can improve your chances of making\n" + .string "a catch by getting closer to them\l" + .string "before throwing a SAFARI BALL.$" SafariZone_RestHouse_Text_1C3F71:: @ 81C3F71 - .string "POKéMON fliehen nicht so schnell, wenn\n" - .string "man ihnen {POKEBLOCK} zuwirft.\p" - .string "POKéMON, die von Natur aus nicht schnell\n" - .string "fliehen, braucht man sie nicht\l" - .string "unbedingt zuzuwerfen.$" + .string "If you use {POKEBLOCK}S, wild POKéMON won’t\n" + .string "be so quick to run away.\p" + .string "It’s not much use to give {POKEBLOCK}S to\n" + .string "POKéMON that don’t flee easily.$" SafariZone_RestHouse_Text_1C3FF4:: @ 81C3FF4 - .string "Wird ein {POKEBLOCK} in den NAPF gelegt,\n" - .string "werden POKéMON angelockt.\p" - .string "Ich glaube, POKéMON mit der gleichen\n" - .string "Wesensart werden von ähnlichen {POKEBLOCK}N\l" - .string "angezogen.$" + .string "If you put a {POKEBLOCK} on the FEEDER,\n" + .string "POKéMON are attracted to it.\p" + .string "I think POKéMON with the same sort of\n" + .string "nature are drawn by a certain {POKEBLOCK}.$" diff --git a/data/text/save.inc b/data/text/save.inc index dec291fac..c35432540 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -1,24 +1,26 @@ gSaveText_WouldYouLikeToSave:: @ 81C6C85 - .string "Möchtest du das Spiel speichern?$" +UnknownString_81C6C85: @ 81C6C85 + .string "Would you like to save the game?$" -UnknownString_81C6CA6: @ 81C6CA6 gSaveText_ThereIsAlreadyAFile:: @ 81C6CA6 - .string "Es gibt bereits einen Spielstand.\n" - .string "Spielstand überschreiben?$" +UnknownString_81C6CA6: @ 81C6CA6 + .string "There is already a saved file.\n" + .string "Is it okay to overwrite it?$" -BattleTower_BattleRoom_Text_1C6CE1:: @ 81C6CE1 gSaveText_DontTurnOff:: @ 81C6CE1 - .string "SPEICHERN...\n" - .string "BITTE DAS GERÄT NICHT AUSSCHALTEN.$" +BattleTower_BattleRoom_Text_1C6CE1:: @ 81C6CE1 + .string "SAVING...\n" + .string "DON’T TURN OFF THE POWER.$" -BattleTower_BattleRoom_Text_1C6D05:: @ 81C6D05 gSaveText_PlayerSavedTheGame:: @ 81C6D05 - .string "{PLAYER} hat das Spiel gespeichert.$" +BattleTower_BattleRoom_Text_1C6D05:: @ 81C6D05 + .string "{PLAYER} saved the game.$" UnknownString_81C6D18: @ 81C6D18 - .string "Fehler beim Speichern...$" + .string "Save error...$" -UnknownString_81C6D26: @ 81C6D26 gSaveText_ThereIsADifferentFile:: @ 81C6D26 - .string "Es gibt schon einen anderen Spielstand.\p" - .string "Soll er überschrieben werden?$" +UnknownString_81C6D26: @ 81C6D26 + .string "There is a different game file that is\n" + .string "already saved.\p" + .string "Is it okay to overwrite it?$" diff --git a/data/text/secret_power_tm.inc b/data/text/secret_power_tm.inc index 1c8cdab7e..88e9bc2e8 100644 --- a/data/text/secret_power_tm.inc +++ b/data/text/secret_power_tm.inc @@ -1,36 +1,34 @@ Route111_Text_1A3520:: @ 81A3520 - .string "Was das ist?\n" - .string "Was ich hier mache?\p" - .string "Ich überlege, ob ich mir hier mein\n" - .string "eigenes Refugium mit Hilfe einer\l" - .string "POKéMON-Attacke einrichte.\p" - .string "Genau! Ich gebe dir diese TM. Richte\n" - .string "dir damit auch dein eigenes Reich ein!$" + .string "What’s that?\n" + .string "What am I doing?\p" + .string "I’m thinking about making my own room\n" + .string "here using a POKéMON move.\p" + .string "I know! I’ll give you this TM.\n" + .string "Will you use it to make your own room?$" Route111_Text_1A35C5:: @ 81A35C5 - .string "Suche dir einen Baum, der aussieht, als\n" - .string "ob er einige Äste verlieren würde.\p" - .string "Setze davor GEHEIMPOWER ein. Einige\n" - .string "Äste werden sich öffnen und du\l" - .string "kannst dann den Baum hinaufklettern.\p" - .string "Du findest dort einen großen Raum, den\n" - .string "du nach eigenem Geschmack einrichten\l" - .string "kannst.\p" - .string "Das ist dein eigener geheimer Raum...\n" - .string "Eine GEHEIMBASIS!\p" - .string "Du solltest dir auch eine einrichten.\p" - .string "Du musst dir deine GEHEIMBASIS nicht\n" - .string "unbedingt in einem Baum einrichten.\p" - .string "Setze GEHEIMPOWER an steinigen\n" - .string "Wänden ein, die Einkerbungen haben.\p" - .string "Ich schaue mich jetzt nach weiteren\n" - .string "Orten um. Tschüss!$" + .string "Find a big tree that looks like it might\n" + .string "drop some vines.\p" + .string "Use SECRET POWER in front of the tree.\n" + .string "Some vines should get free and drop\l" + .string "down, so you can climb the tree.\p" + .string "You’ll find a lot of space for putting\n" + .string "your favorite things.\p" + .string "It’ll be your own secret room...\n" + .string "A SECRET BASE!\p" + .string "You should make one, too.\p" + .string "Another thing, you don’t always have\n" + .string "to make your SECRET BASE in a tree.\p" + .string "Try using SECRET POWER on rock walls\n" + .string "that have small indents in them.\p" + .string "I’m going to look for other places, too.\n" + .string "Okay, bye!$" Route111_Text_1A37B5:: @ 81A37B5 - .string "Oh, das willst du nicht haben? Wenn du\n" - .string "deine Meinung änderst, sag Bescheid.$" + .string "Oh, you don’t want this?\n" + .string "If you change your mind, tell me, okay?$" Route111_Text_1A37F6:: @ 81A37F6 - .string "Oh, dafür hast du keinen Platz mehr.\p" - .string "Ich verwahre es für dich. Hol es dir\n" - .string "später ab, einverstanden?$" + .string "Oh, you don’t have any room for this.\p" + .string "I’ll hold on to it, so come back for it\n" + .string "another time, okay?$" diff --git a/data/text/shoal_cave.inc b/data/text/shoal_cave.inc index 280eb6bc8..c786e1f4a 100644 --- a/data/text/shoal_cave.inc +++ b/data/text/shoal_cave.inc @@ -1,54 +1,55 @@ ShoalCave_LowTideEntranceRoom_Text_1C6668:: @ 81C6668 - .string "Hast du vor, tiefer hineinzugehen?\p" - .string "Würdest du mir bitte KÜSTENSALZ\n" - .string "und KÜSTENSCHALEN mitbringen?\p" - .string "Ich kann dir daraus etwas Wunderbares\n" - .string "anfertigen.$" + .string "Are you planning on going deep in\n" + .string "there?\p" + .string "How about bringing me back some\n" + .string "SHOAL SALT and SHOAL SHELLS?\p" + .string "I can make you something good if\n" + .string "you bring me the ingredients.$" ShoalCave_LowTideEntranceRoom_Text_1C670D:: @ 81C670D - .string "Wenn du mir jeweils viermal KÜSTENSALZ\n" - .string "und KÜSTENSCHALE mitbringst, fertige\l" - .string "ich dir SEEGESANG daraus an.\p" - .string "Jeder Tag ist ein guter Tag, die Zutaten\n" - .string "dafür zu finden...$" + .string "If you bring me four each of the\n" + .string "SHOAL SALT and SHOAL SHELLS,\l" + .string "I can make you a SHELL BELL...\p" + .string "You can get those ingredients\n" + .string "every day.$" ShoalCave_LowTideEntranceRoom_Text_1C6793:: @ 81C6793 - .string "Oh, hey! KÜSTENSALZ und KÜSTENSCHALE!\n" - .string "Und davon auch noch so viele!\p" - .string "Soll ich dir daraus SEEGESANG\n" - .string "anfertigen?$" + .string "Oh, hey! SHOAL SALT and SHOAL\n" + .string "SHELLS! And enough of them, too!\p" + .string "Would you like me to make you a\n" + .string "SHELL BELL with them?$" ShoalCave_LowTideEntranceRoom_Text_1C6808:: @ 81C6808 - .string "Sehr schön! Ich werde dir sofort\n" - .string "SEEGESANG anfertigen.\p" + .string "All righty, then! I’ll make you a\n" + .string "SHELL BELL right away.\p" .string "... ... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ... ...\p" - .string "Fertig! Bitte schön!$" + .string "There! Done!$" ShoalCave_LowTideEntranceRoom_Text_1C688E:: @ 81C688E - .string "Gib das einem POKéMON zum Tragen.\n" - .string "Es wird das lieben, das garantiere ich!\p" - .string "Der Klang von SEEGESANG...\n" - .string "Er ist einfach vollendet!\p" - .string "Die Zutaten kannst du jeden Tag finden,\n" - .string "daher kann ich dir mehrere machen.$" + .string "Have a POKéMON hold on to that.\n" + .string "It’ll love it, that’s for certain.\p" + .string "Why, the SHELL BELL’s chime...\n" + .string "It’s simply sublime!\p" + .string "You can get its ingredients every\n" + .string "day, so I can make you more.$" ShoalCave_LowTideEntranceRoom_Text_1C6944:: @ 81C6944 - .string "Oh... Wirklich?\n" - .string "Ich wollte SEEGESANG anfertigen...$" + .string "Oh... Is that so...\n" + .string "I wanted to make a SHELL BELL...$" ShoalCave_LowTideInnerRoom_Text_1C6979:: @ 81C6979 ShoalCave_LowTideLowerRoom_Text_1C6979:: @ 81C6979 ShoalCave_LowTideStairsRoom_Text_1C6979:: @ 81C6979 - .string "Hier gab es mal KÜSTENSALZ.\n" - .string "Aber jetzt ist nichts mehr davon da.$" + .string "There was some SHOAL SALT here.\n" + .string "But, there’s nothing here now.$" ShoalCave_LowTideInnerRoom_Text_1C69B8:: @ 81C69B8 - .string "Hier gab es mal eine KÜSTENSCHALE.\n" - .string "Aber jetzt gibt es keine mehr.$" + .string "There was a SHOAL SHELL here.\n" + .string "But, there’s nothing here now.$" ShoalCave_LowTideEntranceRoom_Text_1C69F5:: @ 81C69F5 - .string "In deinem BEUTEL ist nicht genügend\n" - .string "Platz für das neue Item.\p" - .string "Schaffe Platz und hole dir dann\n" - .string "SEEGESANG bei mir ab.$" + .string "You don’t have space in your BAG\n" + .string "if I were to make it for you.\p" + .string "You should make room and come back\n" + .string "for a SHELL BELL.$" diff --git a/data/text/species_names.inc b/data/text/species_names.inc index 70bd91e7f..8a387eb38 100644 --- a/data/text/species_names.inc +++ b/data/text/species_names.inc @@ -1,253 +1,253 @@ gSpeciesNames:: @ 81F716C .string "??????????$", 11 - .string "BISASAM$", 11 - .string "BISAKNOSP$", 11 - .string "BISAFLOR$", 11 - .string "GLUMANDA$", 11 - .string "GLUTEXO$", 11 - .string "GLURAK$", 11 - .string "SCHIGGY$", 11 - .string "SCHILLOK$", 11 - .string "TURTOK$", 11 - .string "RAUPY$", 11 - .string "SAFCON$", 11 - .string "SMETTBO$", 11 - .string "HORNLIU$", 11 - .string "KOKUNA$", 11 - .string "BIBOR$", 11 - .string "TAUBSI$", 11 - .string "TAUBOGA$", 11 - .string "TAUBOSS$", 11 - .string "RATTFRATZ$", 11 - .string "RATTIKARL$", 11 - .string "HABITAK$", 11 - .string "IBITAK$", 11 - .string "RETTAN$", 11 + .string "BULBASAUR$", 11 + .string "IVYSAUR$", 11 + .string "VENUSAUR$", 11 + .string "CHARMANDER$", 11 + .string "CHARMELEON$", 11 + .string "CHARIZARD$", 11 + .string "SQUIRTLE$", 11 + .string "WARTORTLE$", 11 + .string "BLASTOISE$", 11 + .string "CATERPIE$", 11 + .string "METAPOD$", 11 + .string "BUTTERFREE$", 11 + .string "WEEDLE$", 11 + .string "KAKUNA$", 11 + .string "BEEDRILL$", 11 + .string "PIDGEY$", 11 + .string "PIDGEOTTO$", 11 + .string "PIDGEOT$", 11 + .string "RATTATA$", 11 + .string "RATICATE$", 11 + .string "SPEAROW$", 11 + .string "FEAROW$", 11 + .string "EKANS$", 11 .string "ARBOK$", 11 .string "PIKACHU$", 11 .string "RAICHU$", 11 - .string "SANDAN$", 11 - .string "SANDAMER$", 11 + .string "SANDSHREW$", 11 + .string "SANDSLASH$", 11 .string "NIDORAN♀$", 11 .string "NIDORINA$", 11 .string "NIDOQUEEN$", 11 .string "NIDORAN♂$", 11 .string "NIDORINO$", 11 .string "NIDOKING$", 11 - .string "PIEPI$", 11 - .string "PIXI$", 11 + .string "CLEFAIRY$", 11 + .string "CLEFABLE$", 11 .string "VULPIX$", 11 - .string "VULNONA$", 11 - .string "PUMMELUFF$", 11 - .string "KNUDDELUFF$", 11 + .string "NINETALES$", 11 + .string "JIGGLYPUFF$", 11 + .string "WIGGLYTUFF$", 11 .string "ZUBAT$", 11 .string "GOLBAT$", 11 - .string "MYRAPLA$", 11 - .string "DUFLOR$", 11 - .string "GIFLOR$", 11 + .string "ODDISH$", 11 + .string "GLOOM$", 11 + .string "VILEPLUME$", 11 .string "PARAS$", 11 - .string "PARASEK$", 11 - .string "BLUZUK$", 11 - .string "OMOT$", 11 - .string "DIGDA$", 11 - .string "DIGDRI$", 11 - .string "MAUZI$", 11 - .string "SNOBILIKAT$", 11 - .string "ENTON$", 11 - .string "ENTORON$", 11 - .string "MENKI$", 11 - .string "RASAFF$", 11 - .string "FUKANO$", 11 - .string "ARKANI$", 11 - .string "QUAPSEL$", 11 - .string "QUAPUTZI$", 11 - .string "QUAPPO$", 11 + .string "PARASECT$", 11 + .string "VENONAT$", 11 + .string "VENOMOTH$", 11 + .string "DIGLETT$", 11 + .string "DUGTRIO$", 11 + .string "MEOWTH$", 11 + .string "PERSIAN$", 11 + .string "PSYDUCK$", 11 + .string "GOLDUCK$", 11 + .string "MANKEY$", 11 + .string "PRIMEAPE$", 11 + .string "GROWLITHE$", 11 + .string "ARCANINE$", 11 + .string "POLIWAG$", 11 + .string "POLIWHIRL$", 11 + .string "POLIWRATH$", 11 .string "ABRA$", 11 .string "KADABRA$", 11 - .string "SIMSALA$", 11 - .string "MACHOLLO$", 11 - .string "MASCHOCK$", 11 - .string "MACHOMEI$", 11 - .string "KNOFENSA$", 11 - .string "ULTRIGARIA$", 11 - .string "SARZENIA$", 11 - .string "TENTACHA$", 11 - .string "TENTOXA$", 11 - .string "KLEINSTEIN$", 11 - .string "GEOROK$", 11 - .string "GEOWAZ$", 11 - .string "PONITA$", 11 - .string "GALLOPA$", 11 - .string "FLEGMON$", 11 - .string "LAHMUS$", 11 - .string "MAGNETILO$", 11 + .string "ALAKAZAM$", 11 + .string "MACHOP$", 11 + .string "MACHOKE$", 11 + .string "MACHAMP$", 11 + .string "BELLSPROUT$", 11 + .string "WEEPINBELL$", 11 + .string "VICTREEBEL$", 11 + .string "TENTACOOL$", 11 + .string "TENTACRUEL$", 11 + .string "GEODUDE$", 11 + .string "GRAVELER$", 11 + .string "GOLEM$", 11 + .string "PONYTA$", 11 + .string "RAPIDASH$", 11 + .string "SLOWPOKE$", 11 + .string "SLOWBRO$", 11 + .string "MAGNEMITE$", 11 .string "MAGNETON$", 11 - .string "PORENTA$", 11 - .string "DODU$", 11 - .string "DODRI$", 11 - .string "JUROB$", 11 - .string "JUGONG$", 11 - .string "SLEIMA$", 11 - .string "SLEIMOK$", 11 - .string "MUSCHAS$", 11 - .string "AUSTOS$", 11 - .string "NEBULAK$", 11 - .string "ALPOLLO$", 11 + .string "FARFETCH’D$", 11 + .string "DODUO$", 11 + .string "DODRIO$", 11 + .string "SEEL$", 11 + .string "DEWGONG$", 11 + .string "GRIMER$", 11 + .string "MUK$", 11 + .string "SHELLDER$", 11 + .string "CLOYSTER$", 11 + .string "GASTLY$", 11 + .string "HAUNTER$", 11 .string "GENGAR$", 11 .string "ONIX$", 11 - .string "TRAUMATO$", 11 + .string "DROWZEE$", 11 .string "HYPNO$", 11 .string "KRABBY$", 11 .string "KINGLER$", 11 - .string "VOLTOBAL$", 11 - .string "LEKTROBAL$", 11 - .string "OWEI$", 11 - .string "KOKOWEI$", 11 - .string "TRAGOSSO$", 11 - .string "KNOGGA$", 11 - .string "KICKLEE$", 11 - .string "NOCKCHAN$", 11 - .string "SCHLURP$", 11 - .string "SMOGON$", 11 - .string "SMOGMOG$", 11 - .string "RIHORN$", 11 - .string "RIZEROS$", 11 - .string "CHANEIRA$", 11 + .string "VOLTORB$", 11 + .string "ELECTRODE$", 11 + .string "EXEGGCUTE$", 11 + .string "EXEGGUTOR$", 11 + .string "CUBONE$", 11 + .string "MAROWAK$", 11 + .string "HITMONLEE$", 11 + .string "HITMONCHAN$", 11 + .string "LICKITUNG$", 11 + .string "KOFFING$", 11 + .string "WEEZING$", 11 + .string "RHYHORN$", 11 + .string "RHYDON$", 11 + .string "CHANSEY$", 11 .string "TANGELA$", 11 - .string "KANGAMA$", 11 - .string "SEEPER$", 11 - .string "SEEMON$", 11 - .string "GOLDINI$", 11 - .string "GOLKING$", 11 - .string "STERNDU$", 11 + .string "KANGASKHAN$", 11 + .string "HORSEA$", 11 + .string "SEADRA$", 11 + .string "GOLDEEN$", 11 + .string "SEAKING$", 11 + .string "STARYU$", 11 .string "STARMIE$", 11 - .string "PANTIMOS$", 11 - .string "SICHLOR$", 11 - .string "ROSSANA$", 11 - .string "ELEKTEK$", 11 + .string "MR. MIME$", 11 + .string "SCYTHER$", 11 + .string "JYNX$", 11 + .string "ELECTABUZZ$", 11 .string "MAGMAR$", 11 .string "PINSIR$", 11 .string "TAUROS$", 11 - .string "KARPADOR$", 11 - .string "GARADOS$", 11 + .string "MAGIKARP$", 11 + .string "GYARADOS$", 11 .string "LAPRAS$", 11 .string "DITTO$", 11 - .string "EVOLI$", 11 - .string "AQUANA$", 11 - .string "BLITZA$", 11 - .string "FLAMARA$", 11 + .string "EEVEE$", 11 + .string "VAPOREON$", 11 + .string "JOLTEON$", 11 + .string "FLAREON$", 11 .string "PORYGON$", 11 - .string "AMONITAS$", 11 - .string "AMOROSO$", 11 + .string "OMANYTE$", 11 + .string "OMASTAR$", 11 .string "KABUTO$", 11 .string "KABUTOPS$", 11 .string "AERODACTYL$", 11 - .string "RELAXO$", 11 - .string "ARKTOS$", 11 + .string "SNORLAX$", 11 + .string "ARTICUNO$", 11 .string "ZAPDOS$", 11 - .string "LAVADOS$", 11 + .string "MOLTRES$", 11 .string "DRATINI$", 11 - .string "DRAGONIR$", 11 - .string "DRAGORAN$", 11 - .string "MEWTU$", 11 + .string "DRAGONAIR$", 11 + .string "DRAGONITE$", 11 + .string "MEWTWO$", 11 .string "MEW$", 11 - .string "ENDIVIE$", 11 - .string "LORBLATT$", 11 - .string "MEGANIE$", 11 - .string "FEURIGEL$", 11 - .string "IGELAVAR$", 11 - .string "TORNUPTO$", 11 - .string "KARNIMANI$", 11 - .string "TYRACROC$", 11 - .string "IMPERGATOR$", 11 - .string "WIESOR$", 11 - .string "WIESENIOR$", 11 + .string "CHIKORITA$", 11 + .string "BAYLEEF$", 11 + .string "MEGANIUM$", 11 + .string "CYNDAQUIL$", 11 + .string "QUILAVA$", 11 + .string "TYPHLOSION$", 11 + .string "TOTODILE$", 11 + .string "CROCONAW$", 11 + .string "FERALIGATR$", 11 + .string "SENTRET$", 11 + .string "FURRET$", 11 .string "HOOTHOOT$", 11 - .string "NOCTUH$", 11 + .string "NOCTOWL$", 11 .string "LEDYBA$", 11 .string "LEDIAN$", 11 - .string "WEBARAK$", 11 + .string "SPINARAK$", 11 .string "ARIADOS$", 11 - .string "IKSBAT$", 11 - .string "LAMPI$", 11 + .string "CROBAT$", 11 + .string "CHINCHOU$", 11 .string "LANTURN$", 11 .string "PICHU$", 11 - .string "PII$", 11 - .string "FLUFFELUFF$", 11 + .string "CLEFFA$", 11 + .string "IGGLYBUFF$", 11 .string "TOGEPI$", 11 .string "TOGETIC$", 11 .string "NATU$", 11 .string "XATU$", 11 - .string "VOLTILAMM$", 11 - .string "WAATY$", 11 + .string "MAREEP$", 11 + .string "FLAAFFY$", 11 .string "AMPHAROS$", 11 - .string "BLUBELLA$", 11 + .string "BELLOSSOM$", 11 .string "MARILL$", 11 .string "AZUMARILL$", 11 - .string "MOGELBAUM$", 11 - .string "QUAXO$", 11 - .string "HOPPSPROSS$", 11 - .string "HUBELUPF$", 11 - .string "PAPUNGHA$", 11 - .string "GRIFFEL$", 11 - .string "SONNKERN$", 11 - .string "SONNFLORA$", 11 + .string "SUDOWOODO$", 11 + .string "POLITOED$", 11 + .string "HOPPIP$", 11 + .string "SKIPLOOM$", 11 + .string "JUMPLUFF$", 11 + .string "AIPOM$", 11 + .string "SUNKERN$", 11 + .string "SUNFLORA$", 11 .string "YANMA$", 11 - .string "FELINO$", 11 - .string "MORLORD$", 11 - .string "PSIANA$", 11 - .string "NACHTARA$", 11 - .string "KRAMURX$", 11 - .string "LASCHOKING$", 11 - .string "TRAUNFUGIL$", 11 - .string "ICOGNITO$", 11 - .string "WOINGENAU$", 11 + .string "WOOPER$", 11 + .string "QUAGSIRE$", 11 + .string "ESPEON$", 11 + .string "UMBREON$", 11 + .string "MURKROW$", 11 + .string "SLOWKING$", 11 + .string "MISDREAVUS$", 11 + .string "UNOWN$", 11 + .string "WOBBUFFET$", 11 .string "GIRAFARIG$", 11 - .string "TANNZA$", 11 - .string "FORSTELLKA$", 11 - .string "DUMMISEL$", 11 - .string "SKORGLA$", 11 - .string "STAHLOS$", 11 + .string "PINECO$", 11 + .string "FORRETRESS$", 11 + .string "DUNSPARCE$", 11 + .string "GLIGAR$", 11 + .string "STEELIX$", 11 .string "SNUBBULL$", 11 .string "GRANBULL$", 11 - .string "BALDORFISH$", 11 - .string "SCHEROX$", 11 - .string "POTTROTT$", 11 - .string "SKARABORN$", 11 - .string "SNIEBEL$", 11 + .string "QWILFISH$", 11 + .string "SCIZOR$", 11 + .string "SHUCKLE$", 11 + .string "HERACROSS$", 11 + .string "SNEASEL$", 11 .string "TEDDIURSA$", 11 .string "URSARING$", 11 - .string "SCHNECKMAG$", 11 + .string "SLUGMA$", 11 .string "MAGCARGO$", 11 - .string "QUIEKEL$", 11 - .string "KEIFEL$", 11 - .string "CORASONN$", 11 + .string "SWINUB$", 11 + .string "PILOSWINE$", 11 + .string "CORSOLA$", 11 .string "REMORAID$", 11 .string "OCTILLERY$", 11 - .string "BOTOGEL$", 11 - .string "MANTAX$", 11 - .string "PANZAERON$", 11 - .string "HUNDUSTER$", 11 - .string "HUNDEMON$", 11 - .string "SEEDRAKING$", 11 + .string "DELIBIRD$", 11 + .string "MANTINE$", 11 + .string "SKARMORY$", 11 + .string "HOUNDOUR$", 11 + .string "HOUNDOOM$", 11 + .string "KINGDRA$", 11 .string "PHANPY$", 11 .string "DONPHAN$", 11 .string "PORYGON2$", 11 - .string "DAMHIRPLEX$", 11 - .string "FARBEAGLE$", 11 - .string "RABAUZ$", 11 - .string "KAPOERA$", 11 - .string "KUSSILLA$", 11 + .string "STANTLER$", 11 + .string "SMEARGLE$", 11 + .string "TYROGUE$", 11 + .string "HITMONTOP$", 11 + .string "SMOOCHUM$", 11 .string "ELEKID$", 11 .string "MAGBY$", 11 .string "MILTANK$", 11 - .string "HEITEIRA$", 11 + .string "BLISSEY$", 11 .string "RAIKOU$", 11 .string "ENTEI$", 11 .string "SUICUNE$", 11 .string "LARVITAR$", 11 .string "PUPITAR$", 11 - .string "DESPOTAR$", 11 + .string "TYRANITAR$", 11 .string "LUGIA$", 11 .string "HO-OH$", 11 .string "CELEBI$", 11 @@ -276,128 +276,128 @@ gSpeciesNames:: @ 81F716C .string "?$", 11 .string "?$", 11 .string "?$", 11 - .string "GECKARBOR$", 11 - .string "REPTAIN$", 11 - .string "GEWALDRO$", 11 - .string "FLEMMLI$", 11 - .string "JUNGGLUT$", 11 - .string "LOHGOCK$", 11 - .string "HYDROPI$", 11 - .string "MOORABBEL$", 11 - .string "SUMPEX$", 11 - .string "FIFFYEN$", 11 - .string "MAGNAYEN$", 11 - .string "ZIGZACHS$", 11 - .string "GERADAKS$", 11 - .string "WAUMPEL$", 11 - .string "SCHALOKO$", 11 - .string "PAPINELLA$", 11 - .string "PANEKON$", 11 - .string "PUDOX$", 11 - .string "LOTURZEL$", 11 - .string "LOMBRERO$", 11 - .string "KAPPALORES$", 11 - .string "SAMURZEL$", 11 - .string "BLANAS$", 11 - .string "TENGULIST$", 11 + .string "TREECKO$", 11 + .string "GROVYLE$", 11 + .string "SCEPTILE$", 11 + .string "TORCHIC$", 11 + .string "COMBUSKEN$", 11 + .string "BLAZIKEN$", 11 + .string "MUDKIP$", 11 + .string "MARSHTOMP$", 11 + .string "SWAMPERT$", 11 + .string "POOCHYENA$", 11 + .string "MIGHTYENA$", 11 + .string "ZIGZAGOON$", 11 + .string "LINOONE$", 11 + .string "WURMPLE$", 11 + .string "SILCOON$", 11 + .string "BEAUTIFLY$", 11 + .string "CASCOON$", 11 + .string "DUSTOX$", 11 + .string "LOTAD$", 11 + .string "LOMBRE$", 11 + .string "LUDICOLO$", 11 + .string "SEEDOT$", 11 + .string "NUZLEAF$", 11 + .string "SHIFTRY$", 11 .string "NINCADA$", 11 .string "NINJASK$", 11 - .string "NINJATOM$", 11 - .string "SCHWALBINI$", 11 - .string "SCHWALBOSS$", 11 - .string "KNILZ$", 11 - .string "KAPILZ$", 11 - .string "PANDIR$", 11 + .string "SHEDINJA$", 11 + .string "TAILLOW$", 11 + .string "SWELLOW$", 11 + .string "SHROOMISH$", 11 + .string "BRELOOM$", 11 + .string "SPINDA$", 11 .string "WINGULL$", 11 .string "PELIPPER$", 11 - .string "GEHWEIHER$", 11 - .string "MASKEREGEN$", 11 + .string "SURSKIT$", 11 + .string "MASQUERAIN$", 11 .string "WAILMER$", 11 .string "WAILORD$", 11 - .string "ENECO$", 11 - .string "ENEKORO$", 11 + .string "SKITTY$", 11 + .string "DELCATTY$", 11 .string "KECLEON$", 11 - .string "PUPPANCE$", 11 - .string "LEPUMENTAS$", 11 - .string "NASGNET$", 11 - .string "QURTEL$", 11 - .string "ZOBIRIS$", 11 - .string "SCHMERBE$", 11 - .string "WELSAR$", 11 - .string "LIEBISKUS$", 11 - .string "KREBSCORPS$", 11 - .string "KREBUTACK$", 11 - .string "BARSCHWA$", 11 + .string "BALTOY$", 11 + .string "CLAYDOL$", 11 + .string "NOSEPASS$", 11 + .string "TORKOAL$", 11 + .string "SABLEYE$", 11 + .string "BARBOACH$", 11 + .string "WHISCASH$", 11 + .string "LUVDISC$", 11 + .string "CORPHISH$", 11 + .string "CRAWDAUNT$", 11 + .string "FEEBAS$", 11 .string "MILOTIC$", 11 - .string "KANIVANHA$", 11 - .string "TOHAIDO$", 11 - .string "KNACKLION$", 11 + .string "CARVANHA$", 11 + .string "SHARPEDO$", 11 + .string "TRAPINCH$", 11 .string "VIBRAVA$", 11 - .string "LIBELLDRA$", 11 + .string "FLYGON$", 11 .string "MAKUHITA$", 11 .string "HARIYAMA$", 11 - .string "FRIZELBLIZ$", 11 - .string "VOLTENSO$", 11 - .string "CAMAUB$", 11 + .string "ELECTRIKE$", 11 + .string "MANECTRIC$", 11 + .string "NUMEL$", 11 .string "CAMERUPT$", 11 - .string "SEEMOPS$", 11 - .string "SEEJONG$", 11 - .string "WALRAISA$", 11 - .string "TUSKA$", 11 - .string "NOKTUSKA$", 11 - .string "SCHNEPPKE$", 11 - .string "FIRNONTOR$", 11 - .string "LUNASTEIN$", 11 - .string "SONNFEL$", 11 + .string "SPHEAL$", 11 + .string "SEALEO$", 11 + .string "WALREIN$", 11 + .string "CACNEA$", 11 + .string "CACTURNE$", 11 + .string "SNORUNT$", 11 + .string "GLALIE$", 11 + .string "LUNATONE$", 11 + .string "SOLROCK$", 11 .string "AZURILL$", 11 .string "SPOINK$", 11 - .string "GROINK$", 11 + .string "GRUMPIG$", 11 .string "PLUSLE$", 11 .string "MINUN$", 11 - .string "FLUNKIFER$", 11 - .string "MEDITIE$", 11 - .string "MEDITALIS$", 11 - .string "WABLU$", 11 + .string "MAWILE$", 11 + .string "MEDITITE$", 11 + .string "MEDICHAM$", 11 + .string "SWABLU$", 11 .string "ALTARIA$", 11 - .string "ISSO$", 11 - .string "ZWIRRLICHT$", 11 - .string "ZWIRRKLOP$", 11 + .string "WYNAUT$", 11 + .string "DUSKULL$", 11 + .string "DUSCLOPS$", 11 .string "ROSELIA$", 11 - .string "BUMMELZ$", 11 - .string "MUNTIER$", 11 - .string "LETARKING$", 11 - .string "SCHLUPPUCK$", 11 - .string "SCHLUKWECH$", 11 + .string "SLAKOTH$", 11 + .string "VIGOROTH$", 11 + .string "SLAKING$", 11 + .string "GULPIN$", 11 + .string "SWALOT$", 11 .string "TROPIUS$", 11 - .string "FLURMEL$", 11 - .string "KRAKEELO$", 11 - .string "KRAWUMMS$", 11 - .string "PERLU$", 11 - .string "AALABYSS$", 11 - .string "SAGANABYSS$", 11 + .string "WHISMUR$", 11 + .string "LOUDRED$", 11 + .string "EXPLOUD$", 11 + .string "CLAMPERL$", 11 + .string "HUNTAIL$", 11 + .string "GOREBYSS$", 11 .string "ABSOL$", 11 .string "SHUPPET$", 11 .string "BANETTE$", 11 - .string "VIPITIS$", 11 - .string "SENGO$", 11 + .string "SEVIPER$", 11 + .string "ZANGOOSE$", 11 .string "RELICANTH$", 11 - .string "STOLLUNIOR$", 11 - .string "STOLLRAK$", 11 - .string "STOLLOSS$", 11 - .string "FORMEO$", 11 + .string "ARON$", 11 + .string "LAIRON$", 11 + .string "AGGRON$", 11 + .string "CASTFORM$", 11 .string "VOLBEAT$", 11 .string "ILLUMISE$", 11 - .string "LILIEP$", 11 - .string "WIELIE$", 11 + .string "LILEEP$", 11 + .string "CRADILY$", 11 .string "ANORITH$", 11 .string "ARMALDO$", 11 - .string "TRASLA$", 11 + .string "RALTS$", 11 .string "KIRLIA$", 11 - .string "GUARDEVOIR$", 11 - .string "KINDWURM$", 11 - .string "DRASCHEL$", 11 - .string "BRUTALANDA$", 11 - .string "TANHEL$", 11 + .string "GARDEVOIR$", 11 + .string "BAGON$", 11 + .string "SHELGON$", 11 + .string "SALAMENCE$", 11 + .string "BELDUM$", 11 .string "METANG$", 11 .string "METAGROSS$", 11 .string "REGIROCK$", 11 @@ -410,4 +410,4 @@ gSpeciesNames:: @ 81F716C .string "LATIOS$", 11 .string "JIRACHI$", 11 .string "DEOXYS$", 11 - .string "PALIMPALIM$", 11 + .string "CHIMECHO$", 11 diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc index abcc8a4a8..437a1fa21 100644 --- a/data/text/storyteller.inc +++ b/data/text/storyteller.inc @@ -1,562 +1,554 @@ gTextStoryteller_Introduction:: @ 81AECC6 - .string "Ich bin der GESCHICHTENERZÄHLER.\n" - .string "Ich erzähle dir die Geschichten von\l" - .string "legendären TRAINERN.\p" - .string "Soll ich dir etwas erzählen?$" + .string "I’m the STORYTELLER.\n" + .string "I’ll tell you tales of legendary\l" + .string "TRAINERS.\p" + .string "Will you hear my tale?$" gTextStoryteller_OhIFeelStifled:: @ 81AED1D .string "Oh...\n" - .string "Keiner mag mich...$" + .string "I feel stifled...$" gTextStoryteller_WhichTale:: @ 81AED35 - .string "Ich kenne viele dieser Legenden.\n" - .string "Welche möchtest du hören?$" + .string "I know of these legends.\n" + .string "Which tale will you have me tell?$" gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70 - .string "Aber ich weiß nichts über legendäre\n" - .string "TRAINER. Also habe ich keine Ge-\l" - .string "schichte auf Lager.\p" - .string "Wo findet man wohl einen TRAINER, der\n" - .string "einer lebenden Legende gleicht?$" + .string "But, I know of no legendary TRAINERS.\n" + .string "Hence, I know no tales.\p" + .string "Where does one find a TRAINER worthy\n" + .string "of a legendary tale?$" gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8 - .string "Was ist?\n" - .string "Du... Du...\p" + .string "What’s that?!\n" + .string "You... You...\p" .string "{STR_VAR_2}\n" - .string "{STR_VAR_1}-mal?\p" - .string "Das ist einfach großartig!\n" - .string "Die Geburt einer neuen Legende!$" + .string "{STR_VAR_1} time(s)?!\p" + .string "That is indeed magnificent!\n" + .string "It’s the birth of a new legend!$" gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50 - .string "Ich überlege, ob es nicht noch andere\n" - .string "TRAINER gibt, die mir beeindruckende\l" - .string "Geschichten erzählen können.$" + .string "It gets me thinking, could there be\n" + .string "other TRAINERS with more impressive\l" + .string "legends awaiting discovery?$" gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4 - .string "Bist du ein TRAINER?\p" - .string "Dann sag mir, ob du Geschichten\n" - .string "für mich hast, die legendär sind?$" + .string "Are you a TRAINER?\p" + .string "Then tell me, have you any tales that\n" + .string "are even remotely legendary?$" gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A - .string "Übrigens... Möchtest du eine weitere\n" - .string "legendäre Geschichte hören?$" + .string "Incidentally... Would you care to hear\n" + .string "another legendary tale?$" gTextStoryteller_ImNotSatisfied:: @ 81AEF49 .string "Hmm...\n" - .string "Ich bin nicht zufrieden...\p" - .string "Ich wünschte, du würdest mir Neuig-\n" - .string "keiten erzählen, die den Titel Legende\l" - .string "verdienen.$" + .string "I’m not satisfied...\p" + .string "I wish you would bring me news worthy\n" + .string "of being called a legend.$" gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5 - .string "Ich wollte, mehr Leute würden sich für\n" - .string "meine epischen Geschichten über\l" - .string "legendäre TRAINER interessieren.$" + .string "I wish more people would be interested\n" + .string "in hearing my epic tales of legendary\l" + .string "TRAINERS.$" gTextStoryteller_Story1Title:: @ 81AEFFC - .string "Der speicherfreudige TRAINER$" + .string "The Save-Happy TRAINER$" gTextStoryteller_Story1Action:: @ 81AF013 - .string "Hast das Spiel gespeichert?$" + .string "Saved the game$" gTextStoryteller_Story1Text:: @ 81AF022 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat das Spiel\n" - .string "{STR_VAR_1}-mal gespeichert!\p" - .string "Einen vorsichtigeren TRAINER als\n" - .string "{STR_VAR_3} wird man nicht finden!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER saved the game\n" + .string "{STR_VAR_1} times!\p" + .string "A more cautious TRAINER than\n" + .string "{STR_VAR_3} one will never find!$" gTextStoryteller_Story2Title:: @ 81AF0A3 - .string "Der TRAINER als Trendsetter$" + .string "The Trendsetter TRAINER$" gTextStoryteller_Story2Action:: @ 81AF0BB - .string "Hast Trends gesetzt?$" + .string "Started trends$" gTextStoryteller_Story2Text:: @ 81AF0CA - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "neue Trends gesetzt!\p" - .string "{STR_VAR_3} setzt den Trend für alle - in\n" - .string "der ganzen HOENN-Region!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER started new trends\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} is setting trends for all\n" + .string "the HOENN region!$" gTextStoryteller_Story3Title:: @ 81AF149 - .string "Der BEEREN pflanzende TRAINER$" + .string "The BERRY-Planting TRAINER$" gTextStoryteller_Story3Action:: @ 81AF164 - .string "Hast BEEREN gepflanzt?$" + .string "Planted BERRIES$" gTextStoryteller_Story3Text:: @ 81AF174 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "BEEREN gepflanzt!\p" - .string "{STR_VAR_3} ist ein legendärer Lieb-\n" - .string "haber von BEEREN!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER planted BERRIES\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} is a legendary lover of\n" + .string "BERRIES!$" gTextStoryteller_Story4Title:: @ 81AF1E5 - .string "Der RAD verrückte TRAINER$" + .string "The BIKE-Loving TRAINER$" gTextStoryteller_Story4Action:: @ 81AF1FD - .string "Hast RÄDER getauscht?$" + .string "Traded BIKES$" gTextStoryteller_Story4Text:: @ 81AF20A - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "das RAD getauscht!\p" - .string "{STR_VAR_3} ist ein TRAINER, dessen\n" - .string "Passion das RADfahren ist!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER swapped BIKES\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must love BIKES deeply\n" + .string "and passionately!$" gTextStoryteller_Story5Title:: @ 81AF281 - .string "Der Interviews gebende TRAINER$" + .string "The Interviewed TRAINER$" gTextStoryteller_Story5Action:: @ 81AF299 - .string "Hast Interviews gegeben?$" + .string "Got interviewed$" gTextStoryteller_Story5Text:: @ 81AF2A9 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER wurde {STR_VAR_1}-mal\n" - .string "interviewt!\p" - .string "{STR_VAR_3} ist ein TRAINER, der überall\n" - .string "Aufmerksamkeit erregt!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER got interviewed\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be a TRAINER who’s\n" + .string "attracting much attention!$" gTextStoryteller_Story6Title:: @ 81AF32C - .string "Der kampfliebende TRAINER$" + .string "The Battle-Happy TRAINER$" gTextStoryteller_Story6Action:: @ 81AF345 - .string "Hast oft gekämpft?$" + .string "Battled$" gTextStoryteller_Story6Text:: @ 81AF34D - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "gekämpft!\p" - .string "{STR_VAR_3} ist ein TRAINER, der zu\n" - .string "einem Kampf nicht nein sagt!$" + .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!$" gTextStoryteller_Story7Title:: @ 81AF3D0 - .string "Der POKéMON fangende TRAINER$" + .string "The POKéMON-Catching TRAINER$" gTextStoryteller_Story7Action:: @ 81AF3ED - .string "Hast POKéMON gefangen?$" + .string "Caught POKéMON$" gTextStoryteller_Story7Text:: @ 81AF3FC - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}\n" - .string "POKéMON gefangen!\p" - .string "{STR_VAR_3} ist ein legendärer Fänger\n" - .string "von POKéMON!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER caught\n" + .string "{STR_VAR_1} POKéMON!\p" + .string "{STR_VAR_3} is a legendary catcher of\n" + .string "wild POKéMON!$" gTextStoryteller_Story8Title:: @ 81AF46D - .string "Der angelnde TRAINER$" + .string "The Fishing TRAINER$" gTextStoryteller_Story8Action:: @ 81AF481 - .string "Hast POKéMON mit einer ANGEL gefangen?$" + .string "Caught POKéMON with a ROD$" gTextStoryteller_Story8Text:: @ 81AF49B - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}\n" - .string "POKéMON beim Angeln gefangen!\p" - .string "{STR_VAR_3} ist ein legendärer Angel-\n" - .string "experte!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER caught\n" + .string "{STR_VAR_1} POKéMON while fishing!\p" + .string "{STR_VAR_3} is a legendary fishing\n" + .string "expert!$" gTextStoryteller_Story9Title:: @ 81AF511 - .string "Der EIER wärmende TRAINER$" + .string "The EGG-Warming TRAINER$" gTextStoryteller_Story9Action:: @ 81AF529 - .string "Hast EIER ausgebrütet?$" + .string "Hatched EGGS$" gTextStoryteller_Story9Text:: @ 81AF536 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Es passierte {STR_VAR_1}-mal, dass der TRAINER\n" - .string "ein POKéMON aus einem EI schlüpfen ließ!\p" - .string "{STR_VAR_3} ist ein legendärer Pfleger\n" - .string "von EIERN!$" + .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" + .string "from EGGS!\p" + .string "{STR_VAR_3} is a legendary warmer\n" + .string "of EGGS!$" gTextStoryteller_Story10Title:: @ 81AF5A9 - .string "Der TRAINER der Entwicklungen$" + .string "The Evolver TRAINER$" gTextStoryteller_Story10Action:: @ 81AF5BD - .string "Hast POKéMON sich entwickeln lassen?$" + .string "Evolved POKéMON$" gTextStoryteller_Story10Text:: @ 81AF5CD - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}\n" - .string "POKéMON zur Entwicklung gebracht!\p" - .string "{STR_VAR_3} ist der ultimative Ent-\n" - .string "wickler von POKéMON!$" + .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" + .string "evolve!\p" + .string "{STR_VAR_3} is the ultimate evolver\n" + .string "of POKéMON!$" gTextStoryteller_Story11Title:: @ 81AF63F - .string "Der PKMN-CENTER liebende TRAINER$" + .string "The POKéMON CENTER-Loving TRAINER$" gTextStoryteller_Story11Action:: @ 81AF661 - .string "Gingst in ein POKéMON-CENTER?$" + .string "Used POKéMON CENTERS$" gTextStoryteller_Story11Text:: @ 81AF676 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat POKéMON\n" - .string "{STR_VAR_1}-mal in einem POKéMON-CENTER\l" - .string "heilen lassen!\p" - .string "Es gibt keinen größeren Fan der\n" - .string "POKéMON-CENTER als {STR_VAR_3}!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER healed POKéMON\n" + .string "{STR_VAR_1} times at POKéMON CENTERS!\p" + .string "There could be no greater lover of\n" + .string "POKéMON CENTERS than {STR_VAR_3}!$" gTextStoryteller_Story12Title:: @ 81AF711 - .string "Der gastfreundliche TRAINER$" + .string "The Homebody TRAINER$" gTextStoryteller_Story12Action:: @ 81AF726 - .string "POKéMON haben sich bei dir erholt?$" + .string "Rested POKéMON at home$" gTextStoryteller_Story12Text:: @ 81AF73D - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat POKéMON\n" - .string "{STR_VAR_1}-mal bei sich zu Hause ausruhen\l" - .string "und heilen lassen.\p" - .string "Kein TRAINER ist so gastfreundlich\n" - .string "wie {STR_VAR_3}!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER healed POKéMON\n" + .string "{STR_VAR_1} times at home!\p" + .string "There could be no more of a homebody\n" + .string "than {STR_VAR_3}!$" gTextStoryteller_Story13Title:: @ 81AF7BF - .string "Der SAFARI liebende TRAINER$" + .string "The SAFARI-Loving TRAINER$" gTextStoryteller_Story13Action:: @ 81AF7D9 - .string "Bist in die SAFARI-ZONE gegangen?$" + .string "Entered the SAFARI ZONE$" gTextStoryteller_Story13Text:: @ 81AF7F1 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER ist {STR_VAR_1}-mal in die\n" - .string "SAFARI-ZONE gegangen!\p" - .string "{STR_VAR_3} ist ein TRAINER, dessen\n" - .string "wilde Seite in der SAFARI-ZONE zum\l" - .string "Vorschein kommt!$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER went into the SAFARI ZONE\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} is a TRAINER whose wild side\n" + .string "must come out in the SAFARI ZONE!$" gTextStoryteller_Story14Title:: @ 81AF88A - .string "Der TRAINER als ZERSCHNEIDER$" + .string "The CUT-Frenzy TRAINER$" gTextStoryteller_Story14Action:: @ 81AF8A1 - .string "Hast ZERSCHNEIDER eingesetzt?$" + .string "Used CUT$" gTextStoryteller_Story14Text:: @ 81AF8AA - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "ZERSCHNEIDER eingesetzt!\p" - .string "{STR_VAR_3} ist ein TRAINER, der es\n" - .string "liebt, etwas zu ZERSCHNEIDEN.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER used CUT\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} is a TRAINER who just must\n" + .string "love to CUT!$" gTextStoryteller_Story15Title:: @ 81AF91B - .string "Der TRAINER als ZERTRÜMMERER$" + .string "The ROCK-SMASHING TRAINER$" gTextStoryteller_Story15Action:: @ 81AF935 - .string "Hast Felsen ZERTRÜMMERT?$" + .string "Smashed rocks$" gTextStoryteller_Story15Text:: @ 81AF943 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "ZERTRÜMMERER eingesetzt!\p" - .string "{STR_VAR_3} ist ein TRAINER, der keinen\n" - .string "Felsen unbeschädigt lassen kann.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER used ROCK SMASH\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be a TRAINER who\n" + .string "can’t leave a stone unsmashed!$" gTextStoryteller_Story16Title:: @ 81AF9C8 - .string "Der Umzüge liebende TRAINER$" + .string "The Move-Loving TRAINER$" gTextStoryteller_Story16Action:: @ 81AF9E0 - .string "Bist du mit der GEHEIMBASIS umgezogen?$" + .string "Moved the SECRET BASE$" gTextStoryteller_Story16Text:: @ 81AF9F6 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER ist {STR_VAR_1}-mal mit\n" - .string "seiner GEHEIMBASIS umgezogen!\p" - .string "{STR_VAR_3} ist ein TRAINER, der es\n" - .string "liebt, sich ein neues Haus einzurichten.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER moved the SECRET BASE\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} is a TRAINER who loves\n" + .string "to move houses often!$" gTextStoryteller_Story17Title:: @ 81AFA79 - .string "Der PLATSCHER des TRAINERS$" + .string "The SPLASH-Happy TRAINER$" gTextStoryteller_Story17Action:: @ 81AFA92 - .string "Hast PLATSCHER eingesetzt?$" + .string "Used SPLASH$" gTextStoryteller_Story17Text:: @ 81AFA9E - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "PLATSCHER eingesetzt!\p" - .string "{STR_VAR_3} ist ein TRAINER, der es\n" - .string "liebt, zu PLATSCHEN.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER used SPLASH\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} is a TRAINER who must love\n" + .string "SPLASHING around!$" gTextStoryteller_Story18Title:: @ 81AFB17 - .string "Der verbissene TRAINER$" + .string "The Tenacious TRAINER$" gTextStoryteller_Story18Action:: @ 81AFB2D - .string "Hast VERZWEIFLER angewendet?$" + .string "Resorted to using STRUGGLE$" gTextStoryteller_Story18Text:: @ 81AFB48 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat sich {STR_VAR_1}-mal\n" - .string "auf VERZWEIFLER verlassen!\p" - .string "{STR_VAR_3}... Ein verbissener TRAINER,\n" - .string "der auch in der Not nicht aufgibt.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER had to rely on STRUGGLE\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} is a tenacious TRAINER\n" + .string "who never gives in to adversity!$" gTextStoryteller_Story19Title:: @ 81AFBD8 - .string "Der König der EINARMIGEN BANDITEN$" + .string "The SLOT Champ$" gTextStoryteller_Story19Action:: @ 81AFBE7 - .string "Hast den EINARMIGEN BANDITEN besiegt?$" + .string "Won the jackpot on the SLOTS$" gTextStoryteller_Story19Text:: @ 81AFC04 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "am EINARMIGEN BANDITEN gewonnen!\p" - .string "{STR_VAR_3}... Ein TRAINER, der am\n" - .string "EINARMIGEN BANDITEN Glück hat.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER won the jackpot on\n" + .string "the SLOTS {STR_VAR_1} times.\p" + .string "{STR_VAR_3} is a TRAINER who was lucky\n" + .string "on the SLOTS!$" gTextStoryteller_Story20Title:: @ 81AFC8A - .string "Der König des ROULETTES$" + .string "The ROULETTE Champ$" gTextStoryteller_Story20Action:: @ 81AFC9D - .string "Hast in Folge beim ROULETTE gewonnen,$" + .string "Had consecutive ROULETTE wins of$" gTextStoryteller_Story20Text:: @ 81AFCBE - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal in Folge\n" - .string "beim ROULETTE gewonnen!\p" - .string "{STR_VAR_3}... Ein TRAINER, dem die Kugel\n" - .string "beim ROULETTE gehorcht.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER won in ROULETTE\n" + .string "{STR_VAR_1} times in a row.\p" + .string "{STR_VAR_3} was lucky when the ball\n" + .string "bounced in ROULETTE!$" gTextStoryteller_Story21Title:: @ 81AFD44 - .string "Der Herausforderer im DUELLTURM$" + .string "The BATTLE TOWER Challenger$" gTextStoryteller_Story21Action:: @ 81AFD60 - .string "Hast Gegner im DUELLTURM gefordert?$" + .string "Took the BATTLE TOWER challenge$" gTextStoryteller_Story21Text:: @ 81AFD80 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal Gegner\n" - .string "im DUELLTURM herausgefordert!\p" - .string "{STR_VAR_3}... Ein TRAINER, der im DUELL-\n" - .string "TURM nach Perfektion strebt.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER took the BATTLE TOWER\n" + .string "challenge {STR_VAR_1} times!\p" + .string "{STR_VAR_3} is a TRAINER who aspires\n" + .string "for excellence in the BATTLE TOWER!$" gTextStoryteller_Story22Title:: @ 81AFE1D - .string "Der mixende TRAINER$" + .string "The Blend-Loving TRAINER$" gTextStoryteller_Story22Action:: @ 81AFE36 - .string "Hast {POKEBLOCK} hergestellt?$" + .string "Made {POKEBLOCK}S$" gTextStoryteller_Story22Text:: @ 81AFE42 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "{POKEBLOCK} hergestellt!\p" - .string "Niemand bedient den BEERENMIXER\n" - .string "besser als {STR_VAR_3}.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER made {POKEBLOCK}S\n" + .string "{STR_VAR_1} times!\p" + .string "There is none better at using a BERRY\n" + .string "BLENDER than {STR_VAR_3}!$" gTextStoryteller_Story23Title:: @ 81AFEC2 - .string "Der Fan der WETTBEWERBE$" + .string "The CONTEST-Loving TRAINER$" gTextStoryteller_Story23Action:: @ 81AFEDD - .string "Hast an WETTBEWERBEN teilgenommen?$" + .string "Entered CONTESTS$" gTextStoryteller_Story23Text:: @ 81AFEEE - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "an einem WETTBEWERB teilgenommen!\p" - .string "{STR_VAR_3} liebt es, anderen seine\n" - .string "POKéMON zu zeigen.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER entered CONTESTS\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must love showing off\n" + .string "POKéMON to others!$" gTextStoryteller_Story24Title:: @ 81AFF68 - .string "Der Meister der WETTBEWERBE$" + .string "The CONTEST Master$" gTextStoryteller_Story24Action:: @ 81AFF7B - .string "Hast WETTBEWERBE gewonnen?$" + .string "Won CONTESTS$" gTextStoryteller_Story24Text:: @ 81AFF88 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "einen WETTBEWERB gewonnen!\p" - .string "{STR_VAR_3} ist ein unvergleichlicher\n" - .string "Meister der WETTBEWERBE.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER won CONTESTS\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be an incredible\n" + .string "CONTEST master!$" gTextStoryteller_Story25Title:: @ 81AFFFB - .string "Der glückliche Einkäufer$" + .string "The Happy Shopper$" gTextStoryteller_Story25Action:: @ 81B000D - .string "Bist einkaufen gegangen?$" + .string "Shopped$" gTextStoryteller_Story25Text:: @ 81B0015 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "in einem Geschäft Items gekauft!\p" - .string "{STR_VAR_3} ein geborener Einkäufer.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER bought items in shops\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be one of those\n" + .string "people who are born to shop.$" gTextStoryteller_Story26Title:: @ 81B009D - .string "Der TRAINER, der Items findet$" + .string "The Item-Finding TRAINER$" gTextStoryteller_Story26Action:: @ 81B00B6 - .string "Hast den DETEKTOR eingesetzt?$" + .string "Used an ITEMFINDER$" gTextStoryteller_Story26Text:: @ 81B00C9 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "den DETEKTOR eingesetzt!\p" - .string "{STR_VAR_3} liebt es, den Boden nach\n" - .string "verborgenen Items abzusuchen.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER used an ITEMFINDER\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must enjoy scouring the\n" + .string "ground for hidden items!$" gTextStoryteller_Story27Title:: @ 81B014D - .string "Der regennasse TRAINER$" + .string "The Rain-Soaked TRAINER$" gTextStoryteller_Story27Action:: @ 81B0165 - .string "Wurdest nass geregnet?$" + .string "Got rained on$" gTextStoryteller_Story27Text:: @ 81B0173 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER wurde {STR_VAR_1}-mal\n" - .string "nass geregnet!\p" - .string "Das Charisma von {STR_VAR_3} zieht\n" - .string "sogar den Regen an.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER got soaked by rain\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3}’s charisma must even\n" + .string "attract rain!$" gTextStoryteller_Story28Title:: @ 81B01E9 - .string "Der passionierte POKéDEX-Leser$" + .string "The Avid POKéDEX Reader$" gTextStoryteller_Story28Action:: @ 81B0201 - .string "Hast im POKéDEX nachgeschlagen?$" + .string "Checked a POKéDEX$" gTextStoryteller_Story28Text:: @ 81B0213 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "im POKéDEX nachgeschlagen!\p" - .string "{STR_VAR_3} liebt es, alles über\n" - .string "POKéMON im POKéDEX nachzulesen.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER checked a POKéDEX\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must love inspecting\n" + .string "POKéMON in a POKéDEX!$" gTextStoryteller_Story29Title:: @ 81B0290 - .string "Der Sammler der BÄNDER$" + .string "The RIBBON Collector$" gTextStoryteller_Story29Action:: @ 81B02A5 - .string "Hast BÄNDER erhalten?$" + .string "Received RIBBONS$" gTextStoryteller_Story29Text:: @ 81B02B6 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}\n" - .string "BÄNDER erhalten!\p" - .string "{STR_VAR_3} ist ein TRAINER, der es\n" - .string "liebt, BÄNDER zu sammeln.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER received RIBBONS\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be a TRAINER who\n" + .string "loves to collect RIBBONS!$" gTextStoryteller_Story30Title:: @ 81B0337 - .string "Der springende TRAINER$" + .string "The Ledge-Jumping TRAINER$" gTextStoryteller_Story30Action:: @ 81B0351 - .string "Bist Absätze heruntergesprungen?$" + .string "Jumped down ledges$" gTextStoryteller_Story30Text:: @ 81B0364 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER ist {STR_VAR_1}-mal\n" - .string "einen Absatz hinabgesprungen!\p" - .string "Sobald er an einen Absatz kommt, muss\n" - .string "TRAINER {STR_VAR_3} einfach hinab-\l" - .string "springen.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER jumped down ledges\n" + .string "{STR_VAR_1} times!\p" + .string "If there’s a ledge to be jumped,\n" + .string "{STR_VAR_3} can’t ignore it!$" gTextStoryteller_Story31Title:: @ 81B03E9 - .string "Der legendäre Fernsehzuschauer$" + .string "The Legendary TV Viewer$" gTextStoryteller_Story31Action:: @ 81B0401 - .string "Hast ferngeschaut?$" + .string "Watched TV$" gTextStoryteller_Story31Text:: @ 81B040C - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "Fernsehen geschaut!\p" - .string "{STR_VAR_3} liebt es, fernzusehen.$" + .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!$" gTextStoryteller_Story32Title:: @ 81B046E - .string "Der zeitbewusste TRAINER$" + .string "The Time-Conscious TRAINER$" gTextStoryteller_Story32Action:: @ 81B0489 - .string "Hast nach der Uhrzeit gesehen?$" + .string "Checked the time$" gTextStoryteller_Story32Text:: @ 81B049A - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "nach der Uhrzeit geschaut!\p" - .string "{STR_VAR_3} ist ein pünktlicher\n" - .string "TRAINER, der sich der Zeit bewusst ist.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER checked the time\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be a punctual TRAINER\n" + .string "who’s conscious of the time.$" gTextStoryteller_Story33Title:: @ 81B0523 - .string "Der Zauberer der POKéMON-LOTTERIE$" + .string "The POKéMON LOTTERY Wizard$" gTextStoryteller_Story33Action:: @ 81B053E - .string "Hast in der LOTTERIE gewonnen?$" + .string "Won POKéMON LOTTERIES$" gTextStoryteller_Story33Text:: @ 81B0554 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "in der POKéMON-LOTTERIE gewonnen!\p" - .string "TRAINER {STR_VAR_3} hat viele Freunde,\n" - .string "die mit ihm POKéMON tauschen.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER won POKéMON LOTTERIES\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must have many friends\n" + .string "to trade POKéMON with!$" gTextStoryteller_Story34Title:: @ 81B05D8 - .string "Der TRAINER und die PENSION$" + .string "The DAY CARE-Using Trainer$" gTextStoryteller_Story34Action:: @ 81B05F3 - .string "Hast POKéMON in die PENSION gebracht?$" + .string "Left POKéMON at the DAY CARE$" gTextStoryteller_Story34Text:: @ 81B0610 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "seine POKéMON in die PENSION gegeben!\p" - .string "{STR_VAR_3} ist ein Ellenbogentyp, der\n" - .string "alles für die Entwicklung seiner\l" - .string "POKéMON tut.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER left POKéMON with the\n" + .string "DAY CARE {STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be a real go-getter\n" + .string "who raises POKéMON aggressively!$" gTextStoryteller_Story35Title:: @ 81B06A9 - .string "Der SEILBAHN verrückte TRAINER$" + .string "The CABLE CAR-Loving TRAINER$" gTextStoryteller_Story35Action:: @ 81B06C6 - .string "Bist mit der SEILBAHN gefahren?$" + .string "Rode the CABLE CAR$" gTextStoryteller_Story35Text:: @ 81B06D9 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER ist {STR_VAR_1}-mal\n" - .string "mit der SEILBAHN gefahren!\p" - .string "{STR_VAR_3} ein sehr beschäftigter\n" - .string "TRAINER, der ständig rauf und runter\l" - .string "fährt.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER rode the CABLE CAR\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be a busy TRAINER\n" + .string "who’s up and down all the time!$" gTextStoryteller_Story36Title:: @ 81B0763 - .string "Der Liebhaber der Heißen Quellen$" + .string "The Hot Spring-Loving TRAINER$" gTextStoryteller_Story36Action:: @ 81B0781 - .string "Hast in den Heißen Quellen gebadet?$" + .string "Bathed in hot springs$" gTextStoryteller_Story36Text:: @ 81B0797 - .string "Dies ist die Geschichte eines TRAINERS\n" - .string "namens {STR_VAR_3}.\p" - .string "Dieser TRAINER hat {STR_VAR_1}-mal\n" - .string "in den Heißen Quellen gebadet!\p" - .string "{STR_VAR_3} wird eine babyweiche Haut\n" - .string "haben.$" + .string "This is a tale of a TRAINER\n" + .string "named {STR_VAR_3}.\p" + .string "This TRAINER bathed in hot springs\n" + .string "{STR_VAR_1} times!\p" + .string "{STR_VAR_3} must be a TRAINER with\n" + .string "baby-smooth skin!$" diff --git a/data/text/surf.inc b/data/text/surf.inc index 161923726..e9e3e9026 100644 --- a/data/text/surf.inc +++ b/data/text/surf.inc @@ -1,6 +1,6 @@ UseSurfPromptText: @ 81A1344 - .string "Das Wasser ist tiefblau.\n" - .string "Möchtest du SURFER einsetzen?$" + .string "The water is dyed a deep blue...\n" + .string "Would you like to SURF?$" UsedSurfText: @ 81A137D - .string "{STR_VAR_1} setzt SURFER ein.$" + .string "{STR_VAR_1} used SURF!$" diff --git a/data/text/trader.inc b/data/text/trader.inc index dae453e8b..599344091 100644 --- a/data/text/trader.inc +++ b/data/text/trader.inc @@ -1,60 +1,58 @@ gTextTrader_Introduction:: @ 81AE88F - .string "Hallo! Ich bin der HÄNDLER. Möchtest\n" - .string "du Dekorationen mit mir tauschen?$" + .string "Hi, I’m the TRADER.\n" + .string "Want to trade decorations with me?$" gTextTrader_FeelUnwanted1:: @ 81AE8C6 .string "Oh...\n" - .string "Ich fühle mich überflüssig...$" + .string "I feel unwanted...$" gTextTrader_TradedAlready:: @ 81AE8DF - .string "Aber wir beide haben doch bereits\n" - .string "Dekorationen ausgetauscht.$" + .string "But we’ve traded decorations already,\n" + .string "you and I.$" gTextTrader_MenuPrompt:: @ 81AE910 - .string "Wenn du etwas Dekoratives siehst, das\n" - .string "du haben möchtest, lass es mich wissen.$" + .string "If you see any decorative item that\n" + .string "you want of mine, speak up.$" gTextTrader_DontWantAnything:: @ 81AE950 - .string "Du möchtest nichts haben?\n" - .string "Ich fühle mich so überflüssig...$" + .string "You don’t want anything?\n" + .string "I feel unwanted...$" gTextTrader_ItemOnceBelongedTo:: @ 81AE97C - .string "Das dekorative Item gehörte einst\n" - .string "{STR_VAR_1}.\p" - .string "Möchtest du es haben?$" + .string "That decorative item once belonged\n" + .string "to {STR_VAR_1}.\p" + .string "Do you want it?$" gTextTrader_YouDontHaveDecorations:: @ 81AE9B6 - .string "Äh... Warte eine Sekunde. Du hast über-\n" - .string "haupt kein dekoratives Item!$" + .string "Uh... Wait a second. You don’t have a\n" + .string "single piece of decoration!$" gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8 - .string "Okay, wähle die Dekoration aus, die du\n" - .string "mit mir tauschen willst.$" + .string "Okay, pick the decoration that you’ll\n" + .string "trade to me.$" gTextTrader_FeelUnwanted2:: @ 81AEA2B - .string "Du willst nicht mit mir tauschen?\n" - .string "Ich fühle mich überflüssig...$" + .string "You won’t trade with me?\n" + .string "I feel unwanted...$" gTextTrader_NoRoomForThis:: @ 81AEA57 - .string "Du hast keinen Platz mehr für eine/n\n" - .string "{STR_VAR_2}.$" + .string "You’ve got all the {STR_VAR_2}S that can\n" + .string "be stored. You’ve no room for this.$" gTextTrader_SoWellTrade:: @ 81AEA9B - .string "Okay, dann lass uns tauschen:\n" - .string "{STR_VAR_3} gegen\l" - .string "{STR_VAR_2}!$" + .string "Okay, so we’ll trade my {STR_VAR_3}\n" + .string "for your {STR_VAR_2}?$" gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3 - .string "Dieses Dekorationsstück ist im Ge-\n" - .string "brauch. Das kannst du nicht tauschen.$" + .string "That piece of decoration is in use.\n" + .string "You can’t trade it.$" gTextTrader_ThenWellTrade:: @ 81AEAFB - .string "Dann lass uns tauschen! Ich werde meine\n" - .string "Dekorationen auf deinen PC senden.$" + .string "Then we’ll trade!\n" + .string "I’ll send my decoration to your PC.$" gTextTrader_ICantTradeThatOneAway:: @ 81AEB31 - .string "Huups! Tut mir Leid!\n" - .string "Das ist ein ganz seltenes Stück!\l" - .string "Das kann ich nicht tauschen!\p" - .string "Kann ich dich für etwas anderes\n" - .string "begeistern?$" + .string "Oops! Sorry!\n" + .string "That’s a really rare piece of decoration.\l" + .string "I can’t trade that one away!\p" + .string "Can I interest you in something else?$" diff --git a/data/text/trainer_class_names.inc b/data/text/trainer_class_names.inc index 94ab2078b..8678a29a6 100644 --- a/data/text/trainer_class_names.inc +++ b/data/text/trainer_class_names.inc @@ -1,59 +1,59 @@ gTrainerClassNames:: @ 81F0208 - .string "{PKMN}-TRAINER$", 13 - .string "{PKMN}-TRAINER$", 13 - .string "AQUA BOSS$", 13 + .string "{PKMN} TRAINER$", 13 + .string "{PKMN} TRAINER$", 13 + .string "AQUA LEADER$", 13 .string "TEAM AQUA$", 13 - .string "AQUA VORS.$", 13 - .string "AROMALADY$", 13 - .string "RUINENMANIAC$", 13 + .string "AQUA ADMIN$", 13 + .string "AROMA LADY$", 13 + .string "RUIN MANIAC$", 13 .string "INTERVIEWER$", 13 - .string "PLANSCHER$", 13 @ うきわガール (Inner Tube Girl) in Japanese - .string "PLANSCHER$", 13 @ うきわボーイ (Inner Tube Boy) in Japanese - .string "ASS-TRAINER$", 13 - .string "HEXE$", 13 + .string "TUBER$", 13 @ うきわガール (Inner Tube Girl) in Japanese + .string "TUBER$", 13 @ うきわボーイ (Inner Tube Boy) in Japanese + .string "COOLTRAINER$", 13 + .string "HEX MANIAC$", 13 .string "LADY$", 13 - .string "SCHÖNHEIT$", 13 - .string "SCHNÖSEL$", 13 + .string "BEAUTY$", 13 + .string "RICH BOY$", 13 .string "POKéMANIAC$", 13 - .string "SCHWIMMER$", 13 - .string "SCHWARZGURT$", 13 - .string "GITARRIST$", 13 - .string "HITZKOPF$", 13 + .string "SWIMMER♂$", 13 + .string "BLACK BELT$", 13 + .string "GUITARIST$", 13 + .string "KINDLER$", 13 .string "CAMPER$", 13 - .string "KÄFERMANIAC$", 13 - .string "PSYCHO$", 13 + .string "BUG MANIAC$", 13 + .string "PSYCHIC$", 13 .string "GENTLEMAN$", 13 - .string "TOP VIER$", 13 - .string "LEITER$", 13 - .string "SCHULKIND$", 13 - .string "SEN. & JUN.$", 13 - .string "SIHGERS,$", 13 + .string "ELITE FOUR$", 13 + .string "LEADER$", 13 + .string "SCHOOL KID$", 13 + .string "SR. AND JR.$", 13 + .string "WINSTRATE$", 13 .string "POKéFAN$", 13 - .string "EXPERTE$", 13 - .string "TEENAGER$", 13 - .string "CHAMP$", 13 - .string "ANGLER$", 13 - .string "TRIATHLET$", 13 - .string "DRACHENPROFI$", 13 - .string "VOGELFÄNGER$", 13 - .string "NINJAJUNGE$", 13 - .string "KÄMPFERIN$", 13 - .string "SCHIRMDAME$", 13 - .string "SCHWIMMERIN$", 13 - .string "PICKNICKER$", 13 - .string "ZWIL.$", 13 - .string "MATROSE$", 13 - .string "SNOWBOARDER$", 13 - .string "{PKMN}-SAMMLER$", 13 - .string "{PKMN}-TRAINER$", 13 - .string "{PKMN}-ZÜCHTER$", 13 - .string "{PKMN}-RANGER$", 13 - .string "MAGMA BOSS$", 13 + .string "EXPERT$", 13 + .string "YOUNGSTER$", 13 + .string "CHAMPION$", 13 + .string "FISHERMAN$", 13 + .string "TRIATHLETE$", 13 + .string "DRAGON TAMER$", 13 + .string "BIRD KEEPER$", 13 + .string "NINJA BOY$", 13 + .string "BATTLE GIRL$", 13 + .string "PARASOL LADY$", 13 + .string "SWIMMER♀$", 13 + .string "PICNICKER$", 13 + .string "TWINS$", 13 + .string "SAILOR$", 13 + .string "BOARDER$", 13 + .string "COLLECTOR$", 13 + .string "{PKMN} TRAINER$", 13 + .string "{PKMN} BREEDER$", 13 + .string "{PKMN} RANGER$", 13 + .string "MAGMA LEADER$", 13 .string "TEAM MAGMA$", 13 - .string "MAGMA VORS.$", 13 - .string "GÖRE$", 13 - .string "KÄFERSAMMLER$", 13 - .string "WANDERER$", 13 - .string "JUNGES GLÜCK$", 13 - .string "ALTES PAAR$", 13 - .string "GESCHWISTER$", 13 + .string "MAGMA ADMIN$", 13 + .string "LASS$", 13 + .string "BUG CATCHER$", 13 + .string "HIKER$", 13 + .string "YOUNG COUPLE$", 13 + .string "OLD COUPLE$", 13 + .string "SIS AND BRO$", 13 diff --git a/data/text/trainer_eye_descriptions.inc b/data/text/trainer_eye_descriptions.inc index ee4285401..c0b3f2399 100644 --- a/data/text/trainer_eye_descriptions.inc +++ b/data/text/trainer_eye_descriptions.inc @@ -1,348 +1,348 @@ TrainerEyeDescription_0: - .string "Emotionen beruhigen.$" - .string "Duftende PFLANZEN-PKMN.$" - .string "Beruhigende Aromen reini-$" - .string "gen Körper und Geist.$" + .string "Becalm fighting emotions.$" + .string "Fragrant GRASS POKéMON$" + .string "Soothing aromas make the$" + .string "body and mind healthy.$" TrainerEyeDescription_1: - .string "Durch Stärke überzeugen!$" - .string "Felsige GESTEINS-PKMN.$" - .string "Während des Studiums der$" - .string "Antike sehe ich die Welt.$" + .string "Overwhelm with power!$" + .string "Craggy ROCK POKéMON$" + .string "In search of ancient lore,$" + .string "I travel the world.$" TrainerEyeDescription_2: - .string "Ich strenge mich stets an!$" - .string "PKMN, die gut schwimmen.$" - .string "Ich würde gerne ohne den$" - .string "Reifen schwimmen können.$" + .string "I’m going to try hard!$" + .string "Good swimmer POKéMON$" + .string "I wish I could swim without$" + .string "using an inner tube.$" TrainerEyeDescription_3: - .string "Ich versuche einfach alles.$" - .string "WASSER-PKMN sind Kumpel.$" - .string "Ich kann schwimmen! Ich$" - .string "mag halt den Schwimmreifen!$" + .string "I don’t know. I’ll try hard.$" + .string "WATER POKéMON are buddies.$" + .string "It’s not like I can’t swim.$" + .string "I just like my inner tube.$" TrainerEyeDescription_4: - .string "Wir teilen die Arbeit auf.$" - .string "Wir lieben freundliche PKMN.$" - .string "Wir teilen die Liebe zu den$" - .string "PKMN. Wir sind Geschwister!$" + .string "We split our duties.$" + .string "We like friendly POKéMON.$" + .string "We enjoy POKéMON together$" + .string "as sister and brother.$" TrainerEyeDescription_5: - .string "Schwächen erkennen.$" - .string "Gleichgewicht ist wichtig.$" - .string "Mein Ziel ist es, der$" - .string "PKMN-CHAMP zu werden.$" + .string "Exploit the foe’s weakness.$" + .string "Balance is crucial.$" + .string "My goal is to become the$" + .string "POKéMON CHAMPION.$" TrainerEyeDescription_6: - .string "Den Gegner umwerfen.$" - .string "Der PKMN-Typ ist unwichtig.$" - .string "Ich bin der beste Schüler$" - .string "der PKMN TRAINERSCHULE.$" + .string "Upset the opponent.$" + .string "Type doesn’t matter.$" + .string "I’m a top student at the$" + .string "TRAINER’S SCHOOL.$" TrainerEyeDescription_7: - .string "Langsames Niederringen.$" - .string "Nachts Furcht einflößend.$" - .string "Ich sehe Dinge, die den$" - .string "anderen verborgen sind...$" + .string "Slow, steady suffering$" + .string "Scary to meet at night.$" + .string "I see things that others$" + .string "can’t see...$" TrainerEyeDescription_8: - .string "Alles, was zum Sieg führt.$" - .string "Hinreißende Wesen!$" - .string "Ich habe zu Hause einen$" - .string "Pool für meine PKMN.$" + .string "Anything to win.$" + .string "Gorgeous type!$" + .string "I have a pool specially for$" + .string "my POKéMON at home.$" TrainerEyeDescription_9: - .string "Ich bringe dich vom Weg ab.$" - .string "Niedlich, natürlich!$" - .string "Ich liebe die SAFARI-ZONE,$" - .string "dort werde ich bleiben.$" + .string "I’ll lead you astray.$" + .string "Cute, of course.$" + .string "I love the SAFARI ZONE.$" + .string "I seem to end up there.$" TrainerEyeDescription_10: - .string "Wer braucht Strategie?!?$" - .string "Alle, die gut und teuer sind.$" - .string "Ich bin reich. Und daher$" - .string "besitze ich ein PKMN-Bett.$" + .string "Strategy? Who needs it?$" + .string "I spent big money on it!$" + .string "I, being rich, sleep in a$" + .string "custom POKéMON bed.$" TrainerEyeDescription_11: - .string "Durch Stärke gewinnen!$" - .string "Habe sie nachts gefangen...$" - .string "Große, kräftige und zähe$" - .string "POKéMON sind die besten...$" + .string "Wrestle down with power.$" + .string "Took all night to catch...$" + .string "Big, burly, and buff$" + .string "POKéMON are the best...$" TrainerEyeDescription_12: - .string "Volle Pulle zuschlagen!$" - .string "Funky WASSER-PKMN!$" - .string "Wenn ich nicht schwimme,$" - .string "stemme ich Gewichte!$" + .string "Ram at full speed!$" + .string "Funky WATER type!$" + .string "If I can’t be out swimming,$" + .string "I’ll be pumping weights.$" TrainerEyeDescription_13: - .string "Immer gewinnen!$" - .string "KAMPF-PKMN!$" - .string "Ohne zu prahlen: Ich kann$" - .string "10 Ziegel zerschmettern!$" + .string "Grand slam pummeling!$" + .string "FIGHTING type$" + .string "Not to brag, but I can bust$" + .string "ten roof tiles!$" TrainerEyeDescription_14: - .string "Ich elektrisiere dich!$" - .string "Es sind ELEKTRO-PKMN.$" - .string "Ich bringe die Menschen mit$" - .string "meinen Liedern zum Weinen.$" + .string "I’ll electrify you!$" + .string "They’re ELECTRIC!$" + .string "I want to make people cry$" + .string "with songs from my heart.$" TrainerEyeDescription_15: - .string "Alles niederbrennen!$" - .string "Feuergefährliche POKéMON!$" - .string "Neben einem Lagerfeuer$" - .string "sollte stets Wasser stehen!$" + .string "Burn it all down!$" + .string "Burn-inducing POKéMON$" + .string "When you light a campfire,$" + .string "be sure there’s some water.$" TrainerEyeDescription_16: - .string "Man muss hartnäckig sein.$" - .string "Jede Art von POKéMON.$" - .string "PKMN, die in der Wildnis auf-$" - .string "wachsen, werden stark!$" + .string "Hang in and be tenacious!$" + .string "I’ll raise any POKéMON.$" + .string "POKéMON raised in the wild$" + .string "grow strong!$" TrainerEyeDescription_17: - .string "Unsere Liebe schlägt alles.$" - .string "Wir haben sie seit Jahren.$" - .string "In 50 Jahren Ehe waren$" - .string "wir den PKMN immer treu.$" + .string "Our love lets us prevail.$" + .string "We’ve had them for years.$" + .string "Married 50 years, we’ve$" + .string "devotedly raised POKéMON.$" TrainerEyeDescription_18: - .string "Wellenförmiger Angriff!$" - .string "KÄFER-PKMN sind cool!$" - .string "Ich gehe jeden Tag in den$" - .string "Wald, KÄFER-PKMN fangen.$" + .string "Attack in waves!$" + .string "BUG POKéMON are cool.$" + .string "I go into the forest every$" + .string "day to catch BUG POKéMON.$" TrainerEyeDescription_19: - .string "Schwächen und verwirren!$" - .string "Solche mit irren Kräften.$" - .string "Ich kann deine Gedanken$" - .string "klar und deutlich lesen.$" + .string "Daze and confuse!$" + .string "Ones with weird powers.$" + .string "I can see through exactly$" + .string "what you’re thinking!$" TrainerEyeDescription_20: - .string "Mit vollem Einsatz kämpfen.$" - .string "Geheimnisvolle POKéMON.$" - .string "Wenn ich spreche,$" - .string "setze ich Telepathie ein.$" + .string "Battle at full power.$" + .string "POKéMON of many mysteries$" + .string "When we spoke, I was really$" + .string "using telepathy.$" TrainerEyeDescription_21: - .string "Ruhig, gesammelt vorgehen.$" - .string "Ganz verschiedene PKMN.$" - .string "Wir genießen die tägliche$" - .string "Tasse Tee.$" + .string "Calm and collected.$" + .string "POKéMON of distinction$" + .string "We enjoy a spot of tea$" + .string "every day. It’s imported.$" TrainerEyeDescription_22: - .string "Ich kämpfe mit Köpfchen.$" - .string "Ich liebe jedes PKMN.$" - .string "Schreibe ich gute Noten,$" - .string "gibt Papi mir Geld.$" + .string "I use my head to battle.$" + .string "I love any kind of POKéMON!$" + .string "My daddy gives me spending$" + .string "money if I ace a test.$" TrainerEyeDescription_23: - .string "Mein Wissen ist Macht!$" - .string "Jedes clevere PKMN.$" - .string "Ich will später ein großer$" - .string "PKMN-Forscher werden.$" + .string "My knowledge rules!$" + .string "Any smart POKéMON!$" + .string "I want to be a POKéMON$" + .string "researcher in the future.$" TrainerEyeDescription_24: - .string "Wir sprechen uns ab.$" - .string "PKMN, die wir beide mögen.$" - .string "Wir sind Senior und Junior$" - .string "im Studium der PKMN.$" + .string "We talk it over first.$" + .string "POKéMON that we both like.$" + .string "We’re senior and junior$" + .string "students into POKéMON!$" TrainerEyeDescription_25: - .string "Los geht’s, meine Lieben!$" - .string "Ich mag sie alle!$" - .string "Auch beim Einkaufen lasse$" - .string "ich keinen Kampf aus!$" + .string "Go for it, my dears!$" + .string "I have no likes or dislikes.$" + .string "While out shopping for$" + .string "supper, I battle too.$" TrainerEyeDescription_26: - .string "Ich kämpfe mit dem Herzen.$" - .string "PKMN, die Liebe erfahren!$" - .string "PKMN und Menschen müssen$" - .string "Vertrauen aufbauen!$" + .string "I battle with love!$" + .string "A POKéMON raised with love!$" + .string "It’s important to build$" + .string "trust with your POKéMON.$" TrainerEyeDescription_27: - .string "Ich durchschaue Gegner!$" - .string "Die Basis des Kampfes.$" - .string "Ich bin noch nicht bereit,$" - .string "Jüngeren Platz zu machen.$" + .string "I see through your moves!$" + .string "The essence of FIGHTING.$" + .string "I’m not ready to give way$" + .string "to the young yet!$" TrainerEyeDescription_28: - .string "Angriff als Verteidigung!$" - .string "KAMPF-PKMN!$" - .string "Ich bin alt und habe daher$" - .string "meinen eigenen Stil.$" + .string "Attack while defending$" + .string "The FIGHTING type$" + .string "Being old, I have my own$" + .string "style of battling.$" TrainerEyeDescription_29: - .string "Ich tue, was ich kann.$" - .string "Verschiedene Arten.$" - .string "Ich will irgendwann einen$" - .string "ARENALEITER besiegen!$" + .string "I do what I can.$" + .string "I use different types.$" + .string "I’m going to keep working$" + .string "until I beat a GYM LEADER.$" TrainerEyeDescription_30: - .string "Geduld und Spucke.$" - .string "WASSER-PKMN!$" - .string "Niemand vor mir hat je$" - .string "etwas Größeres gefangen!$" + .string "I battle patiently.$" + .string "WATER POKéMON to battle!$" + .string "I’m the world’s only guy to$" + .string "catch a huge POKéMON!$" TrainerEyeDescription_31: - .string "Verteidigung ist die Basis.$" - .string "Kraftvolle PKMN!$" - .string "Dies war als Diät gedacht,$" - .string "jetzt ist es mein Hobby.$" + .string "Defense is crucial.$" + .string "My POKéMON is solid.$" + .string "I started this for dieting,$" + .string "but I got right into it.$" TrainerEyeDescription_32: - .string "Weiter, immer weiter!$" - .string "Die Stärke von STAHL...$" - .string "Wenn du schwitzt, musst du$" - .string "regelmäßig etwas trinken!$" + .string "Push and push again!$" + .string "The strength of STEEL$" + .string "If you’re sweating, get$" + .string "fluids into you regularly.$" TrainerEyeDescription_33: - .string "Die Umgebung erforschen.$" - .string "WASSER-PKMN!$" - .string "Ich lasse mich nicht von$" - .string "Strandhäschen besiegen.$" + .string "Exploit the environment!$" + .string "All hail the WATER type!$" + .string "I won’t be beaten by some$" + .string "beach bum SWIMMER!$" TrainerEyeDescription_34: - .string "Stets Offensive zeigen!$" - .string "Nur WASSER-PKMN...$" - .string "Ich muss jeden Tag$" - .string "10 Kilometer schwimmen.$" + .string "All-out offensive!$" + .string "WATER POKéMON rule!$" + .string "I must swim over 6 miles$" + .string "every day.$" TrainerEyeDescription_35: - .string "Geschwindigkeit ist alles!$" - .string "Ich liebe schnelle PKMN.$" - .string "Beim Marathon forderst du$" - .string "dich selbst heraus.$" + .string "Speed above all!$" + .string "I use a speedy POKéMON.$" + .string "A marathon is a challenge$" + .string "against your own self.$" TrainerEyeDescription_36: - .string "Schneller als andere sein.$" - .string "Ein rasend schnelles PKMN!$" - .string "Rennt man rasend schnell,$" - .string "wird man eins mit dem Wind.$" + .string "Strike before stricken!$" + .string "A fast-running POKéMON!$" + .string "If you ran and ran, you’d$" + .string "become one with the wind.$" TrainerEyeDescription_37: - .string "Die Stärke der PKMN nutzen.$" - .string "Sieh die Macht der DRACHEN!$" - .string "Eines Tages werde ich zur$" - .string "Legende!!!$" + .string "It’s about POKéMON power!$" + .string "See the power of DRAGONS!$" + .string "I’ll become legendary as the$" + .string "strongest one day!$" TrainerEyeDescription_38: - .string "Ich zeige dir die Technik!$" - .string "Elegant kreisende VÖGEL.$" - .string "Meine VOGEL-PKMN bringen$" - .string "dem Mädchen meine Liebe!$" + .string "I’ll show you my technique!$" + .string "Elegantly wheeling BIRDS$" + .string "My BIRD POKéMON, deliver my$" + .string "love to that girl!$" TrainerEyeDescription_39: - .string "Du wirst Gift schmecken!$" - .string "Giftige PKMN.$" - .string "Ich trainiere hart, um ein$" - .string "Ninja zu werden.$" + .string "You’ll suffer from poison!$" + .string "Poisonous POKéMON$" + .string "I undertake training so$" + .string "that I may become a ninja.$" TrainerEyeDescription_40: - .string "Der Erstschlag siegt!$" - .string "Schnelle KAMPF-PKMN.$" - .string "Wenn mein PKMN verliert,$" - .string "kämpfe ich doch weiter.$" + .string "The first strike wins!$" + .string "Speedy FIGHTING type$" + .string "If my POKéMON lose,$" + .string "I’ll carry on the fight!$" TrainerEyeDescription_41: - .string "Los, los, meine PKMN!$" - .string "Ich mag alle PKMN.$" - .string "UV-Strahlen sind die Feinde$" - .string "der Haut. Creme dich ein!$" + .string "Go, go, my POKéMON!$" + .string "I’ll raise anything.$" + .string "UV rays are your skin’s$" + .string "enemy. Get protected.$" TrainerEyeDescription_42: - .string "Keine Gnade!$" - .string "Niedliche WASSER-PKMN.$" - .string "Ich habe zu viele Fans, ich$" - .string "war nämlich im Fernsehen.$" + .string "No mercy!$" + .string "Cute WATER POKéMON$" + .string "I have too many fans.$" + .string "I was interviewed on TV.$" TrainerEyeDescription_43: - .string "Ich probiere dies und das.$" - .string "Ich liebe alle PKMN.$" - .string "Was liegt hinter diesem$" - .string "hohen Berg dort?$" + .string "I think about this & that.$" + .string "I like all POKéMON.$" + .string "What lies beyond that$" + .string "yonder hill?$" TrainerEyeDescription_44: - .string "Wir kämpfen zusammen!$" - .string "Wir trainieren zusammen!$" - .string "Wir lieben die gleichen PKMN$" - .string "und verschiedene Desserts.$" + .string "We battle together!$" + .string "We train together!$" + .string "We like the same POKéMON,$" + .string "but different desserts.$" TrainerEyeDescription_45: - .string "Ich setze Stärke ein.$" - .string "WASSER- und KAMPF-PKMN.$" - .string "Matrosen sind raue Typen!$" - .string "Irgendwelche Einwände?$" + .string "I force things with power!$" + .string "WATER and FIGHTING types$" + .string "Seamen are rough spirits!$" + .string "Any complaints?$" TrainerEyeDescription_46: - .string "PKMN vor Schaden bewahren.$" - .string "Ich liebe seltene PKMN.$" - .string "Ich möchte seltene PKMN$" - .string "aus aller Welt sammeln.$" + .string "Protect POKéMON from harm.$" + .string "I love rare POKéMON.$" + .string "I want to collect all the$" + .string "world’s rare POKéMON.$" TrainerEyeDescription_47: - .string "Meine Stärke...$" - .string "PKMN sind meine Kinder.$" - .string "Man benötigt Wissen und$" - .string "Liebe im Umgang mit PKMN.$" + .string "I count on power.$" + .string "POKéMON are my children.$" + .string "It takes knowledge and$" + .string "love to raise POKéMON.$" TrainerEyeDescription_48: - .string "Angriff aus vollen Rohren!$" - .string "Jedes PKMN kommt in Frage.$" - .string "Ich gebe ihnen {POKEBLOCK}, um$" - .string "in WETTBEWERBEN zu siegen.$" + .string "Full-on attack!$" + .string "Anything. I’ll raise it.$" + .string "I give them {POKEBLOCK}S for$" + .string "going after CONTEST titles.$" TrainerEyeDescription_49: - .string "Ich glaube an meine PKMN.$" - .string "Ich liebe starke PKMN.$" - .string "Ich bilde meine PKMN zu$" - .string "einem Rettungsteam aus.$" + .string "I believe in my POKéMON.$" + .string "I like strong POKéMON.$" + .string "I’m training for rescue$" + .string "work with my POKéMON.$" TrainerEyeDescription_50: - .string "Ich greife in Etappen an.$" - .string "Verschiedene Arten.$" - .string "Umweltverschmutzern darf$" - .string "man niemals vergeben!$" + .string "I attack in waves.$" + .string "Different types$" + .string "Those who destroy nature$" + .string "must never be forgiven!$" TrainerEyeDescription_51: - .string "Ich zeige meinen Mut.$" - .string "Ich liebe niedliche PKMN!$" - .string "Nach einem Kampf gehe ich$" - .string "mit meinen PKMN schwimmen.$" + .string "I’ll show you some guts!$" + .string "Cute POKéMON are my faves!$" + .string "After a battle, I always$" + .string "bathe with my POKéMON.$" TrainerEyeDescription_52: - .string "Blitzschnelle Attacken.$" - .string "KÄFER-PKMN sind das Beste!$" - .string "Um KÄFER-PKMN zu fangen,$" - .string "musst du früh aufstehen.$" + .string "Lightning-fast attack!$" + .string "BUG POKéMON are number 1!$" + .string "If you want to catch BUG$" + .string "POKéMON, wake up early.$" TrainerEyeDescription_53: - .string "Ich kämpfe mit Stärke.$" - .string "PKMN mit hartem Körper.$" - .string "Ich habe diese Wanderung$" - .string "einen Monat vorbereitet.$" + .string "I battle with power.$" + .string "Hard-bodied POKéMON$" + .string "I’ve been planning a month$" + .string "for today’s hike.$" TrainerEyeDescription_54: - .string "Liebevolle Strategie!$" - .string "Liebevolle PKMN!$" - .string "Wir sind liebevoll!$" - .string "Immer liebevoll!$" + .string "Lovey-dovey strategy!$" + .string "Lovey-dovey POKéMON!$" + .string "We’re lovey-dovey!$" + .string "Forever lovey-dovey!$" TrainerEyeDescription_55: - .string "Wir lassen alles raus.$" - .string "Das 1. PKMN, das ich fing.$" - .string "Die PKMN und ich sind$" - .string "zusammen gewachsen.$" + .string "We let it all hang out.$" + .string "The 1st POKéMON I caught.$" + .string "POKéMON and I have grown$" + .string "stronger together.$" TrainerEyeDescription_56: - .string "Steinharte Attacken.$" - .string "Steinharte PKMN...$" - .string "Ich möchte durch Kämpfe$" - .string "alles über PKMN lernen.$" + .string "ROCK-type power attack$" + .string "Rock-solid types are good.$" + .string "Through battling, I want to$" + .string "learn all about POKéMON.$" TrainerEyeDescription_57: - .string "Direkte physische Attacke.$" - .string "Ich baue auf KAMPF-PKMN.$" - .string "Die Welt erwartet mich, als$" - .string "neuen, starken Kämpfer.$" + .string "Direct physical action!$" + .string "FIGHTING POKéMON rule!$" + .string "The world awaits me as the$" + .string "next big wave!$" TrainerEyeDescription_58: - .string "Elektrisieren... Britzel...$" - .string "Elektrizität bestimmt alles.$" - .string "Hahahahaha! Lachen hält$" - .string "gesund und jung!$" + .string "I choose to electrify.$" + .string "Get shocked by electricity!$" + .string "Wahahahaha! The secret to$" + .string "health is laughter!$" TrainerEyeDescription_59: - .string "Aggressiv kämpfen.$" - .string "Brennen vor Leidenschaft!$" - .string "Spül die tägliche Müdigkeit$" - .string "in den Heißen Quellen ab.$" + .string "Battle aggressively.$" + .string "Burn with passion!$" + .string "Wash away daily fatigue in$" + .string "hot springs completely!$" TrainerEyeDescription_60: - .string "Mein Stil ist flexibel.$" - .string "Gleichmäßig gewachsen.$" - .string "PKMN sind mein Leben. Mein$" - .string "Weg des Lebens ist steinig.$" + .string "I flexibly adapt my style.$" + .string "Grown in a balanced manner.$" + .string "POKéMON are my life.$" + .string "My chosen path is harsh...$" TrainerEyeDescription_61: - .string "Ich nutze die Initiative.$" - .string "Anmutige Himmelstänzer.$" - .string "Ich sehe das Auf und Ab$" - .string "der Winde.$" + .string "I take advantage of speed.$" + .string "Graceful sky dancers$" + .string "I can see the ebb and flow$" + .string "of the winds.$" TrainerEyeDescription_62: - .string "Wir kämpfen zusammen.$" - .string "Immer freundliche PKMN.$" - .string "Wir verstehen uns.$" - .string "Und wir verstehen andere.$" + .string "We battle in cooperation.$" + .string "Always friendly POKéMON.$" + .string "We understand each other,$" + .string "and we understand others.$" TrainerEyeDescription_63: - .string "Würde und Respekt.$" - .string "Ich liebe anmutige PKMN.$" - .string "Wasserillusionen unter-$" - .string "streichen meinen Stil.$" + .string "Dignity and respect$" + .string "I prefer POKéMON of grace.$" + .string "Aquatic illusions best suit$" + .string "my distinctive elegance.$" TrainerEyeDescription_64: - .string "Offensive vor Defensive.$" - .string "Das Schöne des UNLICHTS.$" - .string "Du kannst sagen, was du$" - .string "willst, Macht ist alles!$" + .string "Offense over defense$" + .string "The DARK side’s beauties$" + .string "You can talk all you want -$" + .string "might is right!$" TrainerEyeDescription_65: - .string "Verwirrend verwirren.$" - .string "Keine besondere Vorliebe.$" - .string "Wie es wohl meiner Oma am$" - .string "PYROBERG geht?$" + .string "Confuse and confound$" + .string "There’s nothing definite.$" + .string "I wonder how my grandma at$" + .string "MT. PYRE is doing?$" TrainerEyeDescription_66: - .string "Ich setze Items ein.$" - .string "Flammendes Inferno in Eis.$" - .string "Der EIS-Typ entwickelt$" - .string "sich gut an warmen Orten.$" + .string "I use items for help.$" + .string "Flaming passion in icy cold!$" + .string "The ICE type can be better$" + .string "trained in this hot land.$" TrainerEyeDescription_67: - .string "Starke Fähigkeiten nutzen.$" - .string "Die rohe Kraft der DRACHEN.$" - .string "Beim täglichen Kampf lerne$" - .string "ich alles über PKMN.$" + .string "Harness strong abilities.$" + .string "The raw power of DRAGONS!$" + .string "I live to battle every day$" + .string "to learn about POKéMON.$" TrainerEyeDescription_68: - .string "Die gegn. Schwäche nutzen.$" - .string "Das ultimative STAHL-PKMN.$" - .string "Wenn es drauf ankommt,$" - .string "bin ich am stärksten!$" + .string "Pick on the foe’s weakness.$" + .string "The ultimate STEEL POKéMON$" + .string "When it comes down to it,$" + .string "I’m still the strongest!$" .align 2 gTrainerEyeDescriptions:: @ 83E309C diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 175091d6f..1bdd5be29 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -1,3418 +1,3350 @@ Route102_Text_1B79C3:: @ 81B79C3 - .string "Wenn du POKéMON bei dir hast, bist du\n" - .string "offiziell ein POKéMON-TRAINER! Daher\l" - .string "kannst du meine Herausforderung nicht\l" - .string "ablehnen!$" + .string "If you have POKéMON with you, then\n" + .string "you’re an official POKéMON TRAINER!\l" + .string "You can’t say no to my challenge!$" Route102_Text_1B7A2C:: @ 81B7A2C - .string "Aargh, ich habe verloren... Ich\n" - .string "hätte fleißiger trainieren sollen.$" + .string "Arrgh, I lost...\n" + .string "I should have trained mine more...$" Route102_Text_1B7A60:: @ 81B7A60 - .string "Hör mal! Du hättest mir vorher sagen\n" - .string "sollen, dass du so stark bist.$" + .string "Listen, you. If you’re strong, you\n" + .string "should have told me before!$" Route102_Text_1B7A9F:: @ 81B7A9F - .string "Seit ich gegen dich verloren habe,\n" - .string "trainiere ich verzweifelt meine\l" - .string "POKéMON. Sag nicht nein zu einem Kampf!$" + .string "Ever since I lost to you, I desperately\n" + .string "trained my POKéMON.\l" + .string "You can’t say no to my challenge!$" Route102_Text_1B7AFD:: @ 81B7AFD - .string "Aaaah, ich habe schon wieder verloren...\n" - .string "Ob ich nicht richtig trainiere?$" + .string "Arrgh, I lost...\n" + .string "Is my training method not right?$" Route102_Text_1B7B2F:: @ 81B7B2F - .string "Wenn du stärker wirst, werde ich auch\n" - .string "stärker.$" + .string "If you’re going to get stronger, I’ll\n" + .string "get stronger, too.$" Route102_Text_1B7B68:: @ 81B7B68 - .string "Bist du gerade erst TRAINER geworden?\n" - .string "Dann sind wir ja beide Anfänger.$" + .string "Did you just become a TRAINER?\n" + .string "We’re both beginners!$" Route102_Text_1B7B9D:: @ 81B7B9D - .string "Ich habe dich angesprochen, weil ich\n" - .string "dachte, ich könnte dich besiegen.$" + .string "I called you because I thought I\n" + .string "could beat you...$" Route102_Text_1B7BD0:: @ 81B7BD0 - .string "Ich habe noch nicht ein Mal gewonnen...\n" - .string "Ich hoffe, ich werde bald gewinnen!$" + .string "I haven’t won once yet...\n" + .string "I wish I would win soon...$" Route102_Text_1B7C05:: @ 81B7C05 - .string "Haha! Unsere Augen haben sich\n" - .string "getroffen! Ich kämpfe mit meinen\l" - .string "KÄFER-POKéMON gegen dich!$" + .string "Hahah! Our eyes met!\n" + .string "I’ll take you on with my BUG POKéMON!$" Route102_Text_1B7C40:: @ 81B7C40 - .string "Auaaa! Besiegt und verloren!$" + .string "Ow! Down and out!$" Route102_Text_1B7C52:: @ 81B7C52 - .string "Wenn du einem TRAINER in die Augen\n" - .string "schaust, forderst du ihn heraus! Das\l" - .string "ist die Regel!$" + .string "If you lock eyes with a TRAINER,\n" + .string "you have to challenge! It’s a rule!$" Route102_Text_1B7C97:: @ 81B7C97 - .string "Mein Ziel? Stets gewinnen und der beste\n" - .string "TRAINER aller Zeiten werden.\p" - .string "Hilf mir bei meiner Karriere!$" + .string "I’m going to keep winning and aim\n" + .string "to be the best TRAINER.\p" + .string "Help me further my career!$" Route102_Text_1B7CEC:: @ 81B7CEC - .string "Da habe ich wohl deine Karriere\n" - .string "angekurbelt.$" + .string "I ended up furthering your career...$" Route102_Text_1B7D11:: @ 81B7D11 - .string "Um auf der Straße der Sieger laufen zu\n" - .string "können, brauche ich mehr POKéMON.$" + .string "To keep winning my way up, I see that\n" + .string "I have to catch more POKéMON.$" Route103_Text_1B7D55:: @ 81B7D55 - .string "Spürst du die wohlige Berührung\n" - .string "unseres wohltuenden Wohlgeruches?$" + .string "Did you feel the tug of our soul-\n" + .string "soothing fragrance?$" Route103_Text_1B7D8B:: @ 81B7D8B - .string "Du hast dich vom Duft nicht ablenken\n" - .string "lassen...$" + .string "You weren’t led astray by our aroma...$" Route103_Text_1B7DB2:: @ 81B7DB2 - .string "Aromatherapie ist eine Form der\n" - .string "mentalen Kur, die mit Düften arbeitet.$" + .string "Aromatherapy is a form of mental\n" + .string "healing that works with fragrances.$" Route103_Text_1B7DF7:: @ 81B7DF7 - .string "NORA: Hallo, ich bin NORA.\n" - .string "Und das ist meine kleine Schwester JO.\l" - .string "Wir kämpfen stets zusammen!$" + .string "AMY: I’m AMY.\n" + .string "And this is my little sister LIV.\l" + .string "We battle together!$" Route103_Text_1B7E3B:: @ 81B7E3B - .string "NORA: Oh, wir haben verloren.$" + .string "AMY: Uh-oh, we lost.$" Route103_Text_1B7E50:: @ 81B7E50 - .string "NORA: Du musst auf alles Mögliche\n" - .string "achten, wenn du gegen zwei TRAINER\l" - .string "antrittst.$" + .string "AMY: You have to think about all\n" + .string "kinds of things when you’re battling\l" + .string "against two TRAINERS.$" Route103_Text_1B7EAC:: @ 81B7EAC - .string "NORA: Oh oh, du hast nur ein POKéMON\n" - .string "dabei. Damit kannst du nicht gegen uns\l" - .string "beide antreten.$" + .string "AMY: Uh-oh, you have only one\n" + .string "POKéMON with you.\l" + .string "You can’t battle us like that.$" Route103_Text_1B7EFB:: @ 81B7EFB - .string "JO: Wir kämpfen als Team...$" + .string "LIV: We battle together as one\n" + .string "team.$" Route103_Text_1B7F20:: @ 81B7F20 - .string "JO: Schwesterherz, wir haben verloren.$" + .string "LIV: Oh, we lost, big sister...$" Route103_Text_1B7F40:: @ 81B7F40 - .string "JO: Wir arbeiten sehr gut zusammen, ich\n" - .string "und meine große Schwester...\p" - .string "Aber wir haben verloren...$" + .string "LIV: We work perfectly together, me\n" + .string "and my big sister...\p" + .string "But we still lost...$" Route103_Text_1B7F8E:: @ 81B7F8E - .string "JO: Wenn du gegen uns kämpfen willst,\n" - .string "brauchst du zwei POKéMON. Hast du die\l" - .string "nicht, wäre der Kampf unfair!$" + .string "LIV: If you want to battle us, you\n" + .string "have to have two POKéMON!\l" + .string "It’s not fair if you don’t!$" Route103_Text_1B7FE7:: @ 81B7FE7 - .string "NORA: Hallo, weißt du noch? Ich bin NORA.\n" - .string "Und das ist meine kleine Schwester JO.\l" - .string "Wir kämpfen stets zusammen!$" + .string "AMY: I’m AMY.\n" + .string "And this is my little sister LIV.\l" + .string "We battle together!$" Route103_Text_1B802B:: @ 81B802B - .string "NORA: Aahaaa, buuuh!\n" - .string "Wir haben es nicht geschafft...$" + .string "AMY: Aww, boo!\n" + .string "We couldn’t win again...$" Route103_Text_1B8053:: @ 81B8053 - .string "NORA: Du musst auf alles Mögliche\n" - .string "achten, wenn du gegen zwei TRAINER\l" - .string "antrittst. Erwähnte ich das schon?$" + .string "AMY: You have to think about all\n" + .string "kinds of things when you’re battling\l" + .string "against two TRAINERS.$" Route103_Text_1B80AF:: @ 81B80AF - .string "NORA: Oh oh, du hast nur ein POKéMON\n" - .string "dabei. Damit kannst du nicht gegen uns\l" - .string "beide antreten.$" + .string "AMY: Uh-oh, you have only one\n" + .string "POKéMON with you.\l" + .string "You can’t battle us like that.$" Route103_Text_1B80FE:: @ 81B80FE - .string "JO: Wir kämpfen als Team...$" + .string "LIV: We battle together as one\n" + .string "team.$" Route103_Text_1B8123:: @ 81B8123 - .string "JO: Heul... Große Schwester, wir haben\n" - .string "schon wieder verloren.$" + .string "LIV: Awww, we lost again...\n" + .string "Big sister...$" Route103_Text_1B814D:: @ 81B814D - .string "JO: Wir haben wieder perfekt zusammen-\n" - .string "gearbeitet, ich und meine Schwester...\p" - .string "Warum haben wir wieder verloren?$" + .string "LIV: We work perfectly together, me\n" + .string "and my big sister...\p" + .string "But why did we lose again?$" Route103_Text_1B81A1:: @ 81B81A1 - .string "JO: Wenn du gegen uns kämpfen willst,\n" - .string "brauchst du zwei POKéMON. Hast du die\l" - .string "nicht, wäre der Kampf unfair!$" + .string "LIV: If you want to battle us, you\n" + .string "have to have two POKéMON!\l" + .string "It’s not fair if you don’t!$" Route103_Text_1B81FA:: @ 81B81FA - .string "Ach! Meine Angelschnur hat sich ver-\n" - .string "heddert! Jetzt bin ich frustriert und\l" - .string "wütend! So! Und du darfst es ausbaden!$" + .string "Gah! My fishing line’s all snarled up!\n" + .string "I’m getting frustrated and mean!\l" + .string "That’s it! Battle me!$" Route103_Text_1B8258:: @ 81B8258 - .string "Ach! Verloren!\n" - .string "Nun bin ich noch wütender...$" + .string "Gah! Lost it!\n" + .string "I’m even more annoyed now!$" Route103_Text_1B8281:: @ 81B8281 - .string "Ach! Ich koche vor Wut, Mann...\n" - .string "Grrrr...$" + .string "Gah, I’m still boiling mad...\n" + .string "Grrrrr...$" Route103_Text_1B82A9:: @ 81B82A9 - .string "Mein POKéMON ist einfach anbetungs-\n" - .string "würdig. Nur keine Scheu, ich zeig’s dir.$" + .string "My POKéMON is delightfully adorable!\n" + .string "Don’t be shy - I’ll show you!$" Route103_Text_1B82EC:: @ 81B82EC - .string "Oh, so was aber auch!\n" - .string "Mein geliebtes POKéMON!$" + .string "Oh, my gosh!\n" + .string "My darling POKéMON!$" Route103_Text_1B830D:: @ 81B830D - .string "Mein wunderbares POKéMON sieht sogar\n" - .string "besiegt noch wunderbar aus.$" + .string "My delightful POKéMON looks darling\n" + .string "even when it’s fainted!$" Route103_Text_1B8349:: @ 81B8349 - .string "Hey, du! Mein anbetungswürdiges\n" - .string "POKéMON ist noch anbetungswürdiger\l" - .string "geworden.$" + .string "Hi, you! My delightfully adorable\n" + .string "POKéMON has become more darling!$" Route103_Text_1B838C:: @ 81B838C .string "Oh!\n" - .string "Mein geliebtes POKéMON.$" + .string "My darling POKéMON!$" Route103_Text_1B83A4:: @ 81B83A4 - .string "Je mehr Zeit ich mit ihm verbringe,\n" - .string "desto anbetungswürdiger wird es.$" + .string "The more I spend time with it, the\n" + .string "more adorable my POKéMON becomes.$" Route104_Text_1B83E9:: @ 81B83E9 - .string "GINA: Okay, dann lass uns mit unseren\n" - .string "POKéMON kämpfen.$" + .string "GINA: Okay, let’s battle with our\n" + .string "POKéMON!$" Route104_Text_1B8414:: @ 81B8414 - .string "GINA: Wenn ich verliere, bin ich sauer.$" + .string "GINA: Losing upsets me!$" Route104_Text_1B842C:: @ 81B842C - .string "GINA: Du bist stark!\n" - .string "Wir müssen doch mehr trainieren!$" + .string "GINA: {STR_VAR_1} is strong!\n" + .string "We have to train lots more!$" Route104_Text_1B845C:: @ 81B845C - .string "GINA: Oh, nur ein POKéMON?\n" - .string "Dann können wir nicht kämpfen.\p" - .string "Wenn du nur ein POKéMON hast, wird es\n" - .string "sich einsam fühlen. Das ist nicht gut.$" + .string "GINA: Oh? Only one POKéMON?\n" + .string "Then, we don’t battle with you.\p" + .string "If there’s only one POKéMON, it will\n" + .string "be lonesome. That’s not nice.$" Route104_Text_1B84DB:: @ 81B84DB - .string "MIA: Wir sind Zwillinge und kämpfen auch\n" - .string "mit unseren POKéMON zusammen.$" + .string "MIA: We are twins, so we battle\n" + .string "POKéMON together.$" Route104_Text_1B850D:: @ 81B850D - .string "MIA: Wir haben zusammen gekämpft und\n" - .string "auch zusammen verloren.$" + .string "MIA: We battled together, but we\n" + .string "both lost...$" Route104_Text_1B853B:: @ 81B853B - .string "MIA: Wir werden unsere POKéMON\n" - .string "trainieren. Und dann gewinnen wir!$" + .string "MIA: We will train our POKéMON more\n" + .string "and be strong like you.$" Route104_Text_1B8577:: @ 81B8577 - .string "MIA: Du willst gegen uns kämpfen?\p" - .string "Ein dickes NEIN - da du weniger als zwei\n" - .string "POKéMON bei dir hast. Wir sind zu\l" - .string "stark für dich!$" + .string "MIA: You want to battle with us?\p" + .string "It’s a big no-no if you don’t have two\n" + .string "POKéMON with you.\l" + .string "We’re too strong for you!$" Route104_Text_1B85EB:: @ 81B85EB - .string "Warum soll ich ein Geheimnis daraus\n" - .string "machen? Ich bin der...\p" - .string "WASSER-POKéMON-Experte!\n" - .string "Wie?!? Du kennst mich nicht?!?$" + .string "Why keep it a secret?\n" + .string "I’m the WATER POKéMON expert!\p" + .string "Huh?\n" + .string "You don’t know me?$" Route104_Text_1B8637:: @ 81B8637 - .string "Ich dachte, ich wäre gar nicht so\n" - .string "schlecht. Aber... Ach, Mist...$" + .string "I thought I wasn’t too bad, if I may\n" + .string "say so, but I guess not... Bleah...$" Route104_Text_1B8680:: @ 81B8680 - .string "Über das Angeln habe ich glatt das\n" - .string "Training meiner POKéMON vergessen.$" + .string "I got too into fishing.\n" + .string "I forgot I had to raise my POKéMON...$" Route104_Text_1B86BE:: @ 81B86BE - .string "Spuren im Sand zu hinterlassen ist total\n" - .string "lustig!$" + .string "Leaving footprints in the sand is\n" + .string "so fun!$" Route104_Text_1B86E8:: @ 81B86E8 - .string "Igitt! Ich habe Sand in den Schuhen!\n" - .string "Das ist vielleicht unangenehm!$" + .string "Waah! I got sand in my runners!\n" + .string "They’re all gritty!$" Route104_Text_1B871C:: @ 81B871C - .string "Ich will meine Fußspuren im Sand hinter-\n" - .string "lassen, aber sie verschwinden viel zu\l" - .string "schnell wieder...$" + .string "I want to leave my footprints in the\n" + .string "sand everywhere, but they disappear\l" + .string "quickly...$" Route104_Text_1B8770:: @ 81B8770 - .string "Soll ich...\n" - .string "Oder soll ich nicht?\p" - .string "Okay, natürlich kämpfe ich!$" + .string "Should I...\n" + .string "Or shouldn’t I?\p" + .string "Okay, sure, I will battle!$" Route104_Text_1B87A7:: @ 81B87A7 - .string "Ich hätte doch nicht kämpfen sollen...$" + .string "I shouldn’t have battled...$" Route104_Text_1B87C3:: @ 81B87C3 - .string "Wenn du vor einer Entscheidung stehst\n" - .string "und einen anderen für dich entscheiden\l" - .string "lässt, wirst du es bereuen. Egal, was\l" - .string "dabei am Ende herauskommt.$" + .string "If you’re faced with a decision and\n" + .string "you let someone else choose for you,\l" + .string "you will regret it, however things\l" + .string "turn out.$" Route104_Text_1B8839:: @ 81B8839 - .string "Komm schon, kämpf mit mir!$" + .string "Come on, battle with me!$" Route104_Text_1B8852:: @ 81B8852 - .string "Oohh...\n" - .string "Ich dachte, ich könnte gewinnen...$" + .string "Ohh...\n" + .string "I thought I could win...$" Route104_Text_1B8872:: @ 81B8872 - .string "Ich kann diesen Verlust der Würde\n" - .string "akzeptieren. Doch, doch...\p" - .string "Aber trotzdem bin ich stinkig deswegen.$" + .string "I made the decision to battle, so I\n" + .string "can accept this loss in grace.\p" + .string "I am still upset about losing!$" Route104_Text_1B88D4:: @ 81B88D4 - .string "Oh, natürlich nehme ich die Heraus-\n" - .string "forderung an! Ich habe eine Menge Geld.$" + .string "Oh, sure, I’ll accept your challenge.\n" + .string "I have a lot of money.$" Route104_Text_1B8911:: @ 81B8911 - .string "Warum konnte ich nicht gewinnen?$" + .string "Why couldn’t I win?$" Route104_Text_1B8925:: @ 81B8925 - .string "Manche Dinge kann man für Geld nicht\n" - .string "kaufen. Das sind POKéMON...$" + .string "There are some things money can’t buy.\n" + .string "That’s POKéMON...$" Route104_Text_1B895E:: @ 81B895E - .string "Nachdem ich gegen dich verloren hatte,\n" - .string "habe ich viel über POKéMON gelernt.$" + .string "After I lost to you, I learned a bunch\n" + .string "of things about POKéMON.$" Route104_Text_1B899E:: @ 81B899E - .string "Ich habe schon wieder verloren???\n" - .string "Warum... kann... ich... nicht... gewinnen?$" + .string "I lost again?\n" + .string "Why couldn’t I win?$" Route104_Text_1B89C0:: @ 81B89C0 - .string "Ich bin unsagbar reich, aber einen\n" - .string "Kampf kann ich nicht gewinnen...\p" - .string "Sie ist so tiefgründig, die Welt der\n" - .string "POKéMON.$" + .string "I’m fabulously wealthy, but I can’t\n" + .string "seem to win at POKéMON...\p" + .string "It’s so deep, the world of POKéMON...$" Route104_Text_1B8A24:: @ 81B8A24 - .string "Das Schicksal hat uns zusammengeführt.\n" - .string "Darf ich um einen Kampf bitten?$" + .string "We must have been fated to meet.\n" + .string "May I ask you for a battle?$" Route104_Text_1B8A61:: @ 81B8A61 - .string "Oh, meine Güte!$" + .string "Oh, my!$" Route104_Text_1B8A69:: @ 81B8A69 - .string "“Hallo” ist der Anfang von\n" - .string "“Leb wohl.”\l" - .string "Ich hoffe, wir sehen uns wieder.$" + .string "“Hello” is the beginning of “good-bye.”\n" + .string "I hope we meet again.$" Route104_Text_1B8AA7:: @ 81B8AA7 - .string "Hallo, so treffen wir uns wieder.\n" - .string "Darf ich dich um einen Kampf bitten?$" + .string "Hello, we meet again.\n" + .string "May I ask you for a battle?$" Route104_Text_1B8AD9:: @ 81B8AD9 - .string "Oh je...\n" - .string "Ich habe mein Bestes gegeben...$" + .string "Oh, my...\n" + .string "I did the best that I could...$" Route104_Text_1B8B02:: @ 81B8B02 - .string "“Hallo” ist der Anfang von\n" - .string "“Leb wohl.”\l" - .string "Ich hoffe, wir sehen uns wieder.$" + .string "“Hello” is the beginning of “good-bye.”\n" + .string "I hope we meet again.$" Route105_Text_1B8B40:: @ 81B8B40 - .string "Hier in der Gegend soll es einen\n" - .string "mystischen Felsen geben. Weißt\l" - .string "du etwas darüber?$" + .string "There’s supposed to be a mystical\n" + .string "rock around here.\l" + .string "Do you know anything about it?$" Route105_Text_1B8B93:: @ 81B8B93 - .string "Ich habe zu sehr über den Felsen nach-\n" - .string "gedacht, so dass meine POKéMON schwach\l" - .string "blieben...$" + .string "I was thinking too much about that\n" + .string "rock, while my POKéMON remained weak...$" Route105_Text_1B8BDE:: @ 81B8BDE - .string "Ich kann Stunden damit verbringen,\n" - .string "einen Felsen anzustarren, ohne dass\l" - .string "mir langweilig wird.$" + .string "I can spend hours and hours staring\n" + .string "at a nice rock without growing bored.$" Route105_Text_1B8C28:: @ 81B8C28 - .string "Puuh! Als ich dich sah, habe ich zuerst\n" - .string "gedacht, ein Kind würde ertrinken.\p" - .string "Dir scheint nichts zu fehlen. Wie wäre\n" - .string "es deshalb mit einem kleinen Kampf?$" + .string "Whew! I was worried that a kid was\n" + .string "drowning when I saw you.\p" + .string "You seem to be okay, so what do you\n" + .string "say to a battle?$" Route105_Text_1B8C99:: @ 81B8C99 - .string "Blubb... blubbb... blubb...$" + .string "Glub... Glub...$" Route105_Text_1B8CA9:: @ 81B8CA9 - .string "Wenn du zu ertrinken drohst, musst du\n" - .string "mit einem Arm in Richtung Strand winken.$" + .string "If you are drowning, the signal is to\n" + .string "wave one arm toward the beach.$" Route105_Text_1B8CEE:: @ 81B8CEE - .string "Im tiefen, blauen Meer schwimmen...\n" - .string "Das ist das Größte überhaupt!$" + .string "Swimming the deep blue sea...\n" + .string "It feels the greatest!$" Route105_Text_1B8D23:: @ 81B8D23 - .string "Ich bin abgesoffen...$" + .string "I lost...\n" + .string "Now I’m feeling blue...$" Route105_Text_1B8D45:: @ 81B8D45 - .string "Warum ist das Meer blau?\p" - .string "Im MUSEUM in GRAPHITPORT CITY habe ich\n" - .string "etwas dazu gelernt, habe es aber\l" - .string "vergessen.$" + .string "Why is the sea blue?\p" + .string "I learned about that at the MUSEUM in\n" + .string "SLATEPORT, but I forgot.$" Route105_Text_1B8D99:: @ 81B8D99 - .string "Mein Körper fühlt sich im Wasser\n" - .string "so leicht an, als hätte ich abgenommen.$" + .string "My body feels lighter in the water.\n" + .string "It’s as if I’ve gotten slimmer!$" Route105_Text_1B8DDD:: @ 81B8DDD - .string "Ich lasse mich treiben...$" + .string "I’m floating...$" Route105_Text_1B8DED:: @ 81B8DED - .string "Dein Körpergewicht reduziert sich auf\n" - .string "10 Prozent, wenn du im Wasser bist.\p" - .string "Dann würde ich nur... Huups! Ich verrate\n" - .string "dir doch nicht mein Gewicht!$" + .string "Your body weight is reduced to just\n" + .string "one tenth in the water.\p" + .string "That would make me...\n" + .string "Whoops! I’m not telling you my weight!$" Route105_Text_1B8E66:: @ 81B8E66 - .string "Der blaue, blaue Himmel...\n" - .string "Das unendliche Meer...\l" - .string "Es ist so friedlich...$" + .string "The blue, blue sky...\n" + .string "The vast sea...\l" + .string "It’s so peaceful...$" Route105_Text_1B8EA0:: @ 81B8EA0 - .string "Ich habe verloren, weil ich hier nur\n" - .string "herumhänge...$" + .string "I lost while I was lounging!$" Route105_Text_1B8EBD:: @ 81B8EBD - .string "So war der Kampf mit mir wenigstens\n" - .string "entspannend. Kicher...$" + .string "I want to be told I’m relaxing to be\n" + .string "with. Giggle.$" Route106_Text_1B8EF0:: @ 81B8EF0 - .string "Was bevorzugst du? Fischen im\n" - .string "Meer oder im Fluss?$" + .string "Which do you prefer, fishing in the\n" + .string "sea or a stream?$" Route106_Text_1B8F25:: @ 81B8F25 - .string "Wie beim Tiefseefischen habe ich auch\n" - .string "hier geradezu spektakulär verloren.$" + .string "Like in deep-sea fishing, I lost\n" + .string "spectacularly!$" Route106_Text_1B8F55:: @ 81B8F55 - .string "Angeln ist das Größte, egal ob im Meer\n" - .string "oder im Fluss. Stimmst du mir zu?$" + .string "Fishing is the greatest whether it’s\n" + .string "in the sea or a stream.\l" + .string "You agree with me, right?$" Route106_Text_1B8FAC:: @ 81B8FAC - .string "Ich habe beim Angeln eine Menge\n" - .string "POKéMON gefangen. Ich zeige sie dir!$" + .string "I caught a bunch of POKéMON fishing.\n" + .string "I’ll show you an impressive battle!$" Route106_Text_1B8FF5:: @ 81B8FF5 - .string "Ich habe wieder ganz famos verloren!$" + .string "I lost again spectacularly!$" Route106_Text_1B9011:: @ 81B9011 - .string "Gewinnen, verlieren, POKéMON sind groß-\n" - .string "artig! Stimmst du mir zu?$" + .string "Win or lose, POKéMON are the greatest!\n" + .string "You agree with me, right?$" Route106_Text_1B9052:: @ 81B9052 - .string "Was machen Angler, wenn sie mal auf die\n" - .string "Toilette müssen?\p" - .string "Ich gehe nicht. Niemals! In der Zeit\n" - .string "könnte ja etwas anbeißen.$" + .string "What do people do if they need to go\n" + .string "to a washroom?\p" + .string "What if my ROD hooks a big one while\n" + .string "I’m in the washroom? I just can’t go...$" Route106_Text_1B90D3:: @ 81B90D3 - .string "Ich habe verloren, weil ich nicht auf die\n" - .string "Toilette gegangen bin.$" + .string "I lost because I’m trying to not go\n" + .string "to the washroom...$" Route106_Text_1B910A:: @ 81B910A - .string "Oh! Ich habe das Gefühl, bald\n" - .string "etwas Großes zu fangen.$" + .string "Oh, no! I’ve got this feeling I’ll hook\n" + .string "a big one!$" Route106_Text_1B913D:: @ 81B913D - .string "Hahaha! Ich bin ein lausiger Läufer,\n" - .string "aber im Wasser fängst du mich nicht!$" + .string "Hahahah! I’m a lousy runner, but in\n" + .string "the water you can’t catch me!$" Route106_Text_1B917F:: @ 81B917F - .string "Ich gebe auf!$" + .string "I give up!$" Route106_Text_1B918A:: @ 81B918A - .string "Beim Wettschwimmen wäre ich der Sieger!$" + .string "I wouldn’t lose in a swim race...$" Route106_Text_1B91AC:: @ 81B91AC - .string "Das Meer ist mein Garten. Ich werde es\n" - .string "dir nicht leicht machen, Kind!$" + .string "The sea is my backyard. I’m not going\n" + .string "to take it easy because you’re a kid!$" Route106_Text_1B91F8:: @ 81B91F8 - .string "Konntest du es mir nicht leicht machen?$" + .string "Did you take it easy on me by any\n" + .string "chance?$" Route106_Text_1B9222:: @ 81B9222 - .string "Sich auf den Wellen treiben lassen...\n" - .string "Ich liebe das! Versuch es doch auch mal!$" + .string "Drifting along with the waves...\n" + .string "I love it! Why don’t you give it a try?$" Route107_Text_1B926B:: @ 81B926B - .string "Gäähn...\p" - .string "Ich muss wohl eingeschlafen sein, als\n" - .string "ich mich auf den Wellen treiben ließ.$" + .string "Yawn...\p" + .string "I must have drifted off to sleep while\n" + .string "I was drifting in the waves.$" Route107_Text_1B92B7:: @ 81B92B7 - .string "Ahahaha, ich habe verloren...\n" - .string "Ich mache jetzt ein Nickerchen...$" + .string "Ahaha, I lost...\n" + .string "I’ll take a snooze, I think...$" Route107_Text_1B92E7:: @ 81B92E7 - .string "Sich treiben und von den Wellen\n" - .string "schaukeln lassen - als ob man in einem\l" - .string "weichen, bequemen Bett schläft.$" + .string "Floating and being rocked by the\n" + .string "waves - it’s like sleeping in a plush,\l" + .string "comfy bed.$" Route107_Text_1B933A:: @ 81B933A - .string "Das Meer ist wie mein Garten.\n" - .string "Lass uns kämpfen.$" + .string "The sea is like my backyard.\n" + .string "Let’s battle!$" Route107_Text_1B9365:: @ 81B9365 - .string "Ich habe in meinem eigenen Garten ver-\n" - .string "loren... Ich bin geschockt!$" + .string "I lost on my home field...\n" + .string "I’m in shock!$" Route107_Text_1B938E:: @ 81B938E - .string "Ich schwimme im Meer, das Herz voller\n" - .string "Träume...\p" - .string "Das ist ein Lied!\n" - .string "Wie auch immer, ich schwimme weiter.$" + .string "I swim the seas with a heart full of\n" + .string "dreams...\p" + .string "It’s a song!\n" + .string "Anyways, I’m swimming some more.$" Route107_Text_1B93EB:: @ 81B93EB - .string "Durch das Schwimmen im Meer ist\n" - .string "mein POKéMON stärker geworden!$" + .string "Swimming in the big, wide sea, my\n" + .string "POKéMON has grown stronger!$" Route107_Text_1B9429:: @ 81B9429 - .string "Was für ein Schock!\p" - .string "Mein POKéMON ist stärker geworden,\n" - .string "aber ich bin ein Weichei von TRAINER.$" + .string "What a shock!\p" + .string "My POKéMON has gotten stronger, but\n" + .string "I stayed weak as a TRAINER!$" Route107_Text_1B9477:: @ 81B9477 - .string "Das, was du im Kampf lernst, macht dich\n" - .string "zu einem starken TRAINER.\l" - .string "Das haben mir die Wellen beigebracht.$" + .string "What you learn in battle makes you a\n" + .string "stronger TRAINER.\l" + .string "The waves taught me that.$" Route107_Text_1B94C8:: @ 81B94C8 - .string "Kennst du einen kleinen Ort namens\n" - .string "FAUSTAUHAVEN?$" + .string "Do you know a little town called\n" + .string "DEWFORD?$" Route107_Text_1B94F2:: @ 81B94F2 - .string "Ich hasse das!$" + .string "I hate this!$" Route107_Text_1B94FF:: @ 81B94FF - .string "Verrücktheiten zu erzählen ist der neue\n" - .string "Trend in der FAUSTAUHAVEN HALLE.$" + .string "A weird saying is getting really\n" + .string "trendy at DEWFORD HALL.$" Route107_Text_1B9538:: @ 81B9538 - .string "Willst du gegen mich kämpfen?\n" - .string "Natürlich trete ich gegen dich an!$" + .string "Did you want to battle me?\n" + .string "Sure, I’ll go with you!$" Route107_Text_1B956B:: @ 81B956B - .string "Ich war nicht gut genug für dich.$" + .string "I wasn’t good enough for you.$" Route107_Text_1B9589:: @ 81B9589 - .string "Ich denke, du wirst dich bemühen, noch\n" - .string "besser zu werden. Das tue ich auch!$" + .string "I think you’re going to keep getting\n" + .string "better. I’ll go for it, too!$" Route107_Text_1B95CB:: @ 81B95CB - .string "BEA: Wir fordern dich als Bruder und\n" - .string "Schwester heraus!$" + .string "LISA: We challenge you as a sister\n" + .string "and brother!$" Route107_Text_1B95FB:: @ 81B95FB - .string "BEA: Unglaublich.\n" - .string "Du bist in einer anderen Stärke-Klasse.$" + .string "LISA: Awesome.\n" + .string "You’re in a different class of tough.$" Route107_Text_1B9630:: @ 81B9630 - .string "BEA: Hast du Freunde, die mit dir an den\n" - .string "Strand gehen würden?$" + .string "LISA: Do you have any friends who\n" + .string "would go to the beach with you?$" Route107_Text_1B9672:: @ 81B9672 - .string "BEA: Wenn du gegen uns kämpfen willst,\n" - .string "bring mehr POKéMON mit.$" + .string "LISA: If you want to battle with us,\n" + .string "bring more POKéMON.$" Route107_Text_1B96AB:: @ 81B96AB - .string "ERKO: Wir kämpfen immer mit POKéMON,\n" - .string "meine Schwester und ich.\p" - .string "Ich alleine verliere ständig, aber wir\n" - .string "können dich 2-gegen-2 schlagen!$" + .string "RAY: We always battle POKéMON, me\n" + .string "and my sister.\p" + .string "I always lose, but we can beat you\n" + .string "2-on-2!$" Route107_Text_1B9707:: @ 81B9707 - .string "ERKO: Huiuiui! Du kämpfst auf einem viel\n" - .string "höheren Level als wir!$" + .string "RAY: Wowee, you’re at a higher level\n" + .string "than us!$" Route107_Text_1B9735:: @ 81B9735 - .string "ERKO: Meine Schwester hat mir mein\n" - .string "POKéMON gegeben und nun ist es mein\l" - .string "Partner!$" + .string "RAY: My sister gave me my POKéMON.\n" + .string "I raised it, and now it’s my important\l" + .string "partner!$" Route107_Text_1B9788:: @ 81B9788 - .string "ERKO: Wenn du gegen uns antreten willst,\n" - .string "bring mehr POKéMON mit.$" + .string "RAY: If you want to battle us, go\n" + .string "bring some more POKéMON!$" Route108_Text_1B97C3:: @ 81B97C3 - .string "Mein Traum ist es, durch die sieben\n" - .string "Weltmeere zu schwimmen.$" + .string "My dream is to swim the world’s seven\n" + .string "seas!$" Route108_Text_1B97EF:: @ 81B97EF - .string "So werde ich niemals in der Lage sein,\n" - .string "die sieben Weltmeere zu durchschwimmen.$" + .string "I won’t be able to swim the seven seas\n" + .string "like this...$" Route108_Text_1B9823:: @ 81B9823 - .string "Mit maritimen POKéMON zu spielen, ist\n" - .string "eine der Freuden beim Schwimmen.$" + .string "Playing with marine POKéMON is one of\n" + .string "the pleasures of swimming!$" Route108_Text_1B9864:: @ 81B9864 - .string "Ahoi, da! Willst du auch zum\n" - .string "SCHIFFSWRACK?$" + .string "Ahoy, there! Are you going out to the\n" + .string "ABANDONED SHIP, too?$" Route108_Text_1B989F:: @ 81B989F - .string "Ich gehe unter!\n" - .string "Blubb... blubb... blubb...$" + .string "I’m sinking!\n" + .string "Glub... Glub...$" Route108_Text_1B98BC:: @ 81B98BC - .string "Einige Leute gehen sogar in das\n" - .string "SCHIFFSWRACK hinein!$" + .string "Some people even go inside that\n" + .string "ABANDONED SHIP.$" Route108_Text_1B98EC:: @ 81B98EC - .string "Mein Freund, dieser Lügner, sagt,\n" - .string "ich sähe klasse in dem Bikini aus...$" + .string "My liar of a boyfriend told me that\n" + .string "I look great in a bikini...$" Route108_Text_1B992C:: @ 81B992C - .string "Oh, buuuh!$" + .string "Oh, boo!$" Route108_Text_1B9935:: @ 81B9935 - .string "Auch wenn es eine Lüge ist, liebe ich es,\n" - .string "Komplimente zu bekommen.\l" - .string "Wir Mädchen sind so komplex...$" + .string "Even if it’s a lie, I love being told\n" + .string "I look great...\l" + .string "We girls are so complex...$" Route108_Text_1B9986:: @ 81B9986 - .string "Ich liebe das Meer! Ich vergesse all\n" - .string "meine Probleme, wenn ich schwimme.$" + .string "I love the sea!\n" + .string "I forget all my worries when I swim!$" Route108_Text_1B99BB:: @ 81B99BB - .string "Wenn ich verliere, bin ich total\n" - .string "gestresst!$" + .string "When I lose a battle, I get all\n" + .string "stressed out!$" Route108_Text_1B99E9:: @ 81B99E9 - .string "Baue Stress durch Schwimmen ab.\n" - .string "Das ist sehr gesund!$" + .string "Work off your stress by swimming!\n" + .string "It’s so healthy!$" Route109_Text_1B9A1C:: @ 81B9A1C - .string "Hiya! Schau dir meine gemeißelten \n" - .string "Vollmatrosen an! Das nennt\l" - .string "man einen “Schnitt”!$" + .string "Hiyah! Look at my chiseled abs!\n" + .string "This is what you call “cut”!$" Route109_Text_1B9A59:: @ 81B9A59 .string "Aiyah!\n" - .string "Ausgerutscht.$" + .string "Flubbed out!$" Route109_Text_1B9A6D:: @ 81B9A6D .string "Hiyah!\p" - .string "Meine gemeißelten Vollmatrosen haben\n" - .string "nichts mit meinen Kämpfen zu tun!$" + .string "My sculpted abs have nothing to do\n" + .string "with POKéMON battles!$" Route109_Text_1B9AAD:: @ 81B9AAD - .string "Hast du dich auch gut mit Sonnenmilch\n" - .string "eingerieben?$" + .string "Are you properly protected against\n" + .string "the sun?$" Route109_Text_1B9AD9:: @ 81B9AD9 - .string "Aua, aua, aua.$" + .string "Ouch, ouch, ouch!$" Route109_Text_1B9AEB:: @ 81B9AEB - .string "An den Wangen bekommt man als Erstes\n" - .string "einen Sonnenbrand.$" + .string "Cheeks are the most prone to burning!$" Route109_Text_1B9B11:: @ 81B9B11 - .string "Ich habe meinen Anker in vielen Häfen\n" - .string "der Welt geworfen, aber GRAPHITPORT\l" - .string "CITY ist der schönste Hafen.$" + .string "I’ve laid anchor in ports around the\n" + .string "world, but SLATEPORT’s the best.$" Route109_Text_1B9B57:: @ 81B9B57 - .string "Du bist der Beste!$" + .string "You’re the best!$" Route109_Text_1B9B68:: @ 81B9B68 - .string "Im besten Hafen gibt es auch den\n" - .string "besten TRAINER...$" + .string "In the best port was the best\n" + .string "TRAINER...$" Route109_Text_1B9B91:: @ 81B9B91 .string "Urrrrppp...\n" - .string "Kämpfen? Mit mir?$" + .string "Battle? With me?$" Route109_Text_1B9BAE:: @ 81B9BAE - .string "Böör... Ooooooohhhhhh...\n" - .string "Bööörrppp...$" + .string "Urp... Ooooooohhhhhh...\n" + .string "Urrrrpppp...$" Route109_Text_1B9BD3:: @ 81B9BD3 - .string "Normalerweise bin ich viel stärker!\n" - .string "Ich bin seekrank!\p" - .string "Ich bin MATROSE, aber...$" + .string "I’m usually stronger than this!\n" + .string "I’m just seasick as a dog!\p" + .string "I’m a SAILOR, but...$" Route109_Text_1B9C23:: @ 81B9C23 - .string "Ich bin durstig... Ich könnte im\n" - .string "STRANDHAUS etwas SPRUDEL kaufen...$" + .string "I’m thirsty... I could go for a SODA POP\n" + .string "at the SEASHORE HOUSE...$" Route109_Text_1B9C65:: @ 81B9C65 - .string "Grummel...$" + .string "Groan...$" Route109_Text_1B9C6E:: @ 81B9C6E - .string "Ich bin am Verhungern... Mein Schwimm-\n" - .string "reifen sieht aus wie ein Schmalzkringel.$" + .string "I’m getting famished... My inner tube\n" + .string "looks like a giant doughnut...$" Route109_Text_1B9CB3:: @ 81B9CB3 - .string "Ich habe tierischen Hunger, aber ich\n" - .string "habe genug Kraft für einen Kampf!$" + .string "I’m hungry, but I’ve got enough pep in\n" + .string "me for a battle!$" Route109_Text_1B9CEB:: @ 81B9CEB - .string "Ich habe verloren...\n" - .string "Und das nur, weil ich so hungrig bin...$" + .string "I lost...\n" + .string "It’s because I’m hungry...$" Route109_Text_1B9D10:: @ 81B9D10 - .string "Wenn man am Strand sitzt und isst,\n" - .string "schmeckt alles gleich viel besser.$" + .string "When you eat on a beach, everything\n" + .string "seems to taste a little better.$" Route109_Text_1B9D54:: @ 81B9D54 - .string "So ein Sonnenschirm sieht doch aus wie\n" - .string "eine riesige Blume, findest du nicht?$" + .string "Doesn’t a beach umbrella look like\n" + .string "a giant flower?$" Route109_Text_1B9D87:: @ 81B9D87 - .string "Maaaami!$" + .string "Mommy!$" Route109_Text_1B9D8E:: @ 81B9D8E - .string "Ein Strand sieht aus der Luft be-\n" - .string "trachtet wie ein Blumengarten aus.$" + .string "If you look at the beach from the sky,\n" + .string "it looks like a big flower garden!$" Route109_Text_1B9DD8:: @ 81B9DD8 - .string "Ich verliere nicht wieder gegen dich!\n" - .string "Schließlich habe ich einen Schwimm-\l" - .string "reifen um!$" + .string "I’m not losing to you again!\n" + .string "That’s why I have my inner tube!$" Route109_Text_1B9E16:: @ 81B9E16 - .string "Maaaaaaaaaaamiiiii!$" + .string "Mommy!$" Route109_Text_1B9E1D:: @ 81B9E1D - .string "Sobald ich den Schwimmreifen trage,\n" - .string "sehen meine POKéMON und ich noch\l" - .string "niedlicher aus!$" + .string "If I have an inner tube, me and my\n" + .string "POKéMON’s cuteness goes way up!$" Route109_Text_1B9E60:: @ 81B9E60 - .string "Ohne Schwimmreifen kann ich nicht\n" - .string "schwimmen, aber im Kampf siege ich.$" + .string "I can’t swim without my inner tube,\n" + .string "but I won’t lose at POKéMON!$" Route109_Text_1B9EA1:: @ 81B9EA1 - .string "Habe ich verloren, weil ich einen\n" - .string "Schwimmreifen trage?$" + .string "Did I lose because I have an inner\n" + .string "tube?$" Route109_Text_1B9ECA:: @ 81B9ECA - .string "Mein Schwimmreifen ist voll in Mode. Ohne\n" - .string "ihn kann ich mich nicht sehen lassen!$" + .string "My inner tube is a fashion item.\n" + .string "I can’t be seen without it.$" Route109_Text_1B9F07:: @ 81B9F07 - .string "Hey, großer TRAINER!\n" - .string "Kämpfst du mit mir?$" + .string "Hi, big TRAINER.\n" + .string "Will you battle with me?$" Route109_Text_1B9F31:: @ 81B9F31 - .string "Oh, bist du aber stark!$" + .string "Oh, you’re strong.$" Route109_Text_1B9F44:: @ 81B9F44 - .string "Wie bist du so stark geworden?$" + .string "How did you get to be so strong?$" Route109_Text_1B9F65:: @ 81B9F65 - .string "Hahaha! Dieser Kerl hier wird jetzt\n" - .string "einen großen Fang machen!$" + .string "Wahahah! This dude’s going to catch\n" + .string "himself a big one!$" Route109_Text_1B9F9C:: @ 81B9F9C - .string "Dieser Kerl hier hat ganz groß verloren.$" + .string "This dude just lost one...$" Route109_Text_1B9FB7:: @ 81B9FB7 - .string "Dieser Kerl hier denkt, dass du ganz\n" - .string "groß bist. Nein, ein Gernegroß bist!$" + .string "This dude thinks you’re a big one.\n" + .string "No, you’re a big-one-to-be!$" Route109_Text_1B9FF6:: @ 81B9FF6 - .string "OLE: Nun, das ist ein Stimmungstöter!\p" - .string "Ich wünschte, du würdest uns nicht \n" - .string "unsere kostbare Zeit rauben!$" + .string "PAUL: Well, this is a mood-breaker.\p" + .string "I wish you wouldn’t disturb our\n" + .string "precious time together.$" Route109_Text_1BA052:: @ 81BA052 - .string "OLE: Nun, ich gebe mich geschlagen.$" + .string "PAUL: Well, I give up.$" Route109_Text_1BA069:: @ 81BA069 - .string "OLE: Nun, sag niemandem, dass wir\n" - .string "hier sind. Das ist unsere kleine, private\l" - .string "Welt!$" + .string "PAUL: Well, don’t tell anyone that\n" + .string "we’re here.\l" + .string "This is just our private world of two!$" Route109_Text_1BA0BF:: @ 81BA0BF - .string "OLE: Wir sind total heftig ineinander\n" - .string "verliebt. Deshalb lassen wir unsere\l" - .string "POKéMON auch gemeinsam kämpfen.$" + .string "PAUL: We’re totally, deeply in love.\n" + .string "That’s why we make our POKéMON battle\l" + .string "together.$" Route109_Text_1BA114:: @ 81BA114 - .string "GELI: Wir sind total ineinander verliebt.\n" - .string "Unsere Romanze wärmt ganz HOENN!$" + .string "MEL: We’re, like, totally in love.\n" + .string "Our romance is heating up all of HOENN!$" Route109_Text_1BA15F:: @ 81BA15F - .string "GELI: Wir haben verloren. Das ist meine\n" - .string "Schuld. OLE wird mich hassen!$" + .string "MEL: We lost, and it’s my fault!\n" + .string "PAUL will hate me!$" Route109_Text_1BA193:: @ 81BA193 - .string "GELI: Ähm, OLE, bist du böse auf mich?\n" - .string "Bitte sei nicht böse auf mich!$" + .string "MEL: Um, PAUL, are you angry with me?\n" + .string "Please don’t be angry.$" Route109_Text_1BA1D0:: @ 81BA1D0 - .string "GELI: Wir sind total heftig ineinander\n" - .string "verliebt. Daher kämpfen wir auch mit\l" - .string "unseren POKéMON zusammen.$" + .string "MEL: We’re, like, deeply and truly in love.\n" + .string "That’s why we make our POKéMON\l" + .string "battle together.$" Route110_Text_1BA22C:: @ 81BA22C - .string "Wow! Pass auf! Ich glaube, du hast\n" - .string "keine Übung im RAD-Rennen.$" + .string "Whoa! Watch it!\n" + .string "I guess you’re not used to BIKE racing.$" Route110_Text_1BA264:: @ 81BA264 - .string "Wow! Pass auf!\n" - .string "Meine Bremsen versagen!$" + .string "Whoa!\n" + .string "My brakes failed!$" Route110_Text_1BA27C:: @ 81BA27C - .string "Platte Reifen und schwache Bremsen\n" - .string "können zu Unfällen mit schweren Ver-\l" - .string "letzungen führen! Also: Prüfe dein RAD!$" + .string "Flat tires and brake problems can\n" + .string "cause serious injury!\l" + .string "Inspect your BIKE for problems!$" Route110_Text_1BA2D4:: @ 81BA2D4 - .string "Hey, du!\n" - .string "Kannst du mit mir mithalten?$" + .string "Yo, you!\n" + .string "Can you keep up with my speed?$" Route110_Text_1BA2FC:: @ 81BA2FC - .string "Du hast die Schallmauer durchbrochen!$" + .string "Crash and burn!$" Route110_Text_1BA30C:: @ 81BA30C - .string "Geschwindigkeit alleine lässt mich nicht\n" - .string "gewinnen. Das darf ich nicht vergessen.$" + .string "Speed alone won’t let me win at POKéMON.\n" + .string "I need to reconsider this...$" Route110_Text_1BA352:: @ 81BA352 - .string "Nur keine Panik, wenn dein RAD immer\n" - .string "schneller wird!$" + .string "Don’t panic if your BIKE’s going fast!$" Route110_Text_1BA379:: @ 81BA379 - .string "Ich muss während eines POKéMON-\n" - .string "Kampfes ruhig bleiben...$" + .string "I shouldn’t panic during POKéMON\n" + .string "battles...$" Route110_Text_1BA3A5:: @ 81BA3A5 - .string "Kein Grund zur Panik. Nimm’s leicht.\n" - .string "Wir haben doch jede Menge Zeit.$" + .string "There’s no need to panic or stress.\n" + .string "Take it easy. There’s plenty of time.$" Route110_Text_1BA3EF:: @ 81BA3EF - .string "Bist du nicht ein wenig zu schnell? \n" - .string "Brems ab und lass uns kämpfen.$" + .string "Aren’t you going a little too fast?\n" + .string "Take it easy and let’s battle.$" Route110_Text_1BA432:: @ 81BA432 - .string "Ich war ganz ruhig und habe doch\n" - .string "verloren...$" + .string "I didn’t panic, but I still lost...$" Route110_Text_1BA456:: @ 81BA456 - .string "Kein Grund zur Panik. Nimm’s leicht.\n" - .string "Wir haben doch jede Menge Zeit.$" + .string "There’s no need to panic or stress.\n" + .string "Take it easy. There’s plenty of time.$" Route110_Text_1BA4A0:: @ 81BA4A0 - .string "Ein Triathlon ist extrem hart.\p" - .string "Du musst schwimmen, Rad fahren und\n" - .string "laufen.$" + .string "The triathlon is hard in the extreme.\p" + .string "You have to complete the three events\n" + .string "of swimming, cycling, and running.$" Route110_Text_1BA50F:: @ 81BA50F - .string "POKéMON-Kämpfe sind auch hart.$" + .string "POKéMON battles are hard, too!$" Route110_Text_1BA52E:: @ 81BA52E - .string "Ich bin erschöpft und brauche eine\n" - .string "Pause. Pausen sind extrem wichtig.$" + .string "I’m exhausted, so I need a break.\n" + .string "It’s important to get proper rest.$" Route110_Text_1BA573:: @ 81BA573 - .string "Gibt es etwas Eleganteres, als einen\n" - .string "Kampf während man Rad fährt?$" + .string "Isn’t it neat to hold a battle while\n" + .string "cycling?$" Route110_Text_1BA5A1:: @ 81BA5A1 .string "Wow...\n" - .string "Wie kann man nur so stark sein?$" + .string "How could you be so strong?$" Route110_Text_1BA5C4:: @ 81BA5C4 - .string "Bist du auf der Jagd nach Rekorden?\p" - .string "Tut mir Leid, wenn ich dich dabei auf-\n" - .string "gehalten habe.$" + .string "Were you going after a record?\p" + .string "I’m sorry if I held you up!$" Route110_Text_1BA5FF:: @ 81BA5FF - .string "Ich radle ohne aufzuhören! Meine Ober-\n" - .string "schenkel sind hart wie Stein!$" + .string "I’ve been riding without stopping.\n" + .string "My thighs are like rocks!$" Route110_Text_1BA63C:: @ 81BA63C - .string "Muskelkrämpfe beunruhigen mich!$" + .string "I’m worried about muscle cramps...$" Route110_Text_1BA65F:: @ 81BA65F - .string "Oh, du besitzt einige ORDEN der ARENEN.\n" - .string "Kein Wunder, dass du so stark bist!$" + .string "Oh, you have some GYM BADGES?\n" + .string "No wonder you’re so strong!$" Route110_Text_1BA699:: @ 81BA699 - .string "Ich habe deine Absichten vorherge-\n" - .string "sehen. Daher werde ich nicht verlieren!$" + .string "I have foreseen your intentions!\n" + .string "I cannot possibly lose!$" Route110_Text_1BA6D2:: @ 81BA6D2 - .string "Ich konnte noch nicht einmal meine\n" - .string "eigene Niederlage vorhersehen.$" + .string "I failed to prophesize my own demise!$" Route110_Text_1BA6F8:: @ 81BA6F8 - .string "Ich sehe deine Zukunft...\p" + .string "I see your future...\p" .string "Hmm...\n" - .string "Ich sehe ein helles Licht...$" + .string "I see a shining light...$" Route110_Text_1BA72D:: @ 81BA72D - .string "Ahahahahaha! Ich werde dich mit meinen\n" - .string "Wundern verwirren!$" + .string "Ahahahaha!\n" + .string "I’ll dazzle you with my wonders!$" Route110_Text_1BA759:: @ 81BA759 - .string "Ich habe ganz wunderlich verloren!$" + .string "I wondrously lost!$" Route110_Text_1BA76C:: @ 81BA76C - .string "Du konntest nur gewinnen, weil eben das\n" - .string "das Wunder war! Ja, ein Wunder! Glaub ja\l" - .string "nicht, dass du immer gewinnen kannst!$" + .string "You managed to win only because it was\n" + .string "a wonder! Yes, a wonder!\l" + .string "Don’t think you can win all the time!$" Route110_Text_1BA7D2:: @ 81BA7D2 - .string "Zeigst du mir deine POKéMON?\n" - .string "Nur ganz kurz, ja?$" + .string "Could I see your POKéMON?\n" + .string "Just one look, please?$" Route110_Text_1BA803:: @ 81BA803 - .string "Ich möchte meine Sammlung\n" - .string "vervollständigen...$" + .string "I wanted to complete my\n" + .string "collection...$" Route110_Text_1BA829:: @ 81BA829 - .string "Wenn ich ein mir unbekanntes POKéMON\n" - .string "sehe, kommt der Sammler in mir durch!$" + .string "When I see a POKéMON that I don’t know,\n" + .string "my passion as a collector is ignited!$" Route110_Text_1BA877:: @ 81BA877 - .string "Hi, hast du neue POKéMON gesammelt?\p" - .string "Ich möchte einen Blick auf deine\n" - .string "POKéMON werfen. Ganz kurz, bitte?$" + .string "Hi, have you caught any new POKéMON?\p" + .string "Could I see your POKéMON?\n" + .string "Just one look, please?$" Route110_Text_1BA8CD:: @ 81BA8CD - .string "Deine POKéMON...\n" - .string "Ich bin richtig neidisch!$" + .string "Your POKéMON...\n" + .string "I envy you.$" Route110_Text_1BA8E9:: @ 81BA8E9 - .string "Oh, ich möchte so gerne alle seltenen\n" - .string "POKéMON besitzen.$" + .string "Oh, I long to make all rare POKéMON\n" + .string "mine!$" Route110_Text_1BA913:: @ 81BA913 .string "Hey!\n" - .string "Schleich dich nicht so von hinten heran!$" + .string "Don’t sneak up behind me like that!$" Route110_Text_1BA93C:: @ 81BA93C - .string "Ich habe verloren!\n" - .string "Verflixt!$" + .string "I lost!\n" + .string "Drat!$" Route110_Text_1BA94A:: @ 81BA94A - .string "Angeln bedeutet höchste Konzentra-\n" - .string "tion. Immer auf den Blinker achten!$" + .string "Fishing is all about concentration.\n" + .string "You have to focus on the floater.$" Route110_Text_1BA990:: @ 81BA990 - .string "Ich würde überall hingehen, um meine\n" - .string "elysischen POKéMON zu präsentieren.$" + .string "Ahahaha! I would go anywhere to show\n" + .string "off my delightful POKéMON.$" Route110_Text_1BA9D0:: @ 81BA9D0 - .string "Oh, Schönheit reicht nicht aus...$" + .string "Oh, dear, this won’t do.$" Route110_Text_1BA9E9:: @ 81BA9E9 - .string "Ich sollte mich mehr auf WETTBEWERBE\n" - .string "statt auf Kämpfe konzentrieren.$" + .string "Perhaps I should groom my POKéMON for\n" + .string "CONTESTS rather than battles.$" Route110_Text_1BAA2D:: @ 81BAA2D - .string "Ich zeige dir meine elysischen\n" - .string "POKéMON, sooft du willst!$" + .string "Ahahahaha! I would be happy to show\n" + .string "off my POKéMON as often as you like!$" Route110_Text_1BAA76:: @ 81BAA76 - .string "Oh, das war wieder nichts...$" + .string "Oh, dear, this won’t do.$" Route110_Text_1BAA8F:: @ 81BAA8F - .string "WETTBEWERBE sind wunderbar, aber ich\n" - .string "mag auch Kämpfe.$" + .string "CONTESTS are delightful, but I like\n" + .string "to battle, too.$" Route110_Text_1BAAC3:: @ 81BAAC3 - .string "Ich habe hier im hohen Gras einige coole\n" - .string "POKéMON gefunden!$" + .string "I found some cool POKéMON in the grass\n" + .string "around here!$" Route110_Text_1BAAF7:: @ 81BAAF7 - .string "Nur cool zu sein verhilft einem nicht\n" - .string "zum Sieg...$" + .string "Being cool isn’t enough to win...$" Route110_Text_1BAB19:: @ 81BAB19 - .string "Mit POKéMON zu kämpfen, die man gerade\n" - .string "erst gefangen hat, ist verdammt schwer.$" + .string "It’s hard to battle with POKéMON you\n" + .string "just caught.$" Route111_Text_1BAB4B:: @ 81BAB4B - .string "Das WÜSTENGLAS steht dir gut. Aber\n" - .string "ich bin sicher, mir steht es besser!\p" - .string "Wir entscheiden das besser in einem\n" - .string "Kampf!$" + .string "Oh, hey! Those GO-GOGGLES suit you.\n" + .string "But I think they look better on me.\p" + .string "Let’s decide who they look better on\n" + .string "with a battle!$" Route111_Text_1BABC7:: @ 81BABC7 - .string "Das WÜSTENGLAS hat meine Sicht\n" - .string "eingeschränkt.$" + .string "I couldn’t see what was happening at my\n" + .string "sides because of the GO-GOGGLES.$" Route111_Text_1BAC10:: @ 81BAC10 - .string "Mit dem WÜSTENGLAS kann man durch\n" - .string "Sandstürme laufen.\l" - .string "Das macht mich richtig glücklich.$" + .string "The GO-GOGGLES make it possible to\n" + .string "get through sandstorms.\l" + .string "That makes me happy!$" Route111_Text_1BAC60:: @ 81BAC60 - .string "Ich mache ein Picknick in der Wüste.\p" - .string "Hier findet man überall TRAINER und so\n" - .string "kann ich hier auch Kämpfe genießen.$" + .string "I’m having a picnic in the desert.\p" + .string "You can always find a TRAINER, so\n" + .string "I can enjoy a battle here, too!$" Route111_Text_1BACC5:: @ 81BACC5 - .string "Oooh, du bist so gemein!$" + .string "Ohhh! You’re mean!$" Route111_Text_1BACD8:: @ 81BACD8 - .string "Wenn du in einem Sandsturm kämpfst,\n" - .string "achte auf die KP deiner POKéMON.\p" - .string "Sie können vom Sandsturm verletzt\n" - .string "werden und KP verlieren.$" + .string "When you’re battling in a sandstorm,\n" + .string "watch out for your POKéMON’s HP.\p" + .string "It can faint if you don’t keep an eye\n" + .string "on it!$" Route111_Text_1BAD4B:: @ 81BAD4B - .string "Mit diesem WÜSTENGLAS fühle ich mich\n" - .string "wie ein Superheld. Im Moment kann\l" - .string "mich einfach niemand besiegen!$" + .string "Wearing these GO-GOGGLES makes me\n" + .string "feel like a superhero.\l" + .string "Right now, nobody can beat me!$" Route111_Text_1BADA3:: @ 81BADA3 - .string "Ich kann doch nicht nur im Geiste\n" - .string "gewinnen...$" + .string "I can’t win on spirit alone...$" Route111_Text_1BADC2:: @ 81BADC2 - .string "Eines Tages werde ich ein echter Held\n" - .string "sein. Ich arbeite daran, mich und meine\l" - .string "POKéMON richtig stark zu machen.$" + .string "I’m going to be a real hero one day.\n" + .string "I’m going to work harder to make me\l" + .string "and my POKéMON stronger.$" Route111_Text_1BAE24:: @ 81BAE24 - .string "Ich habe gehört, dass man in der Wüste\n" - .string "Fossilien finden kann. Aber wo?$" + .string "I heard there are fossils to be found\n" + .string "in the desert. Where could they be?$" Route111_Text_1BAE6E:: @ 81BAE6E - .string "Ich war in Gedanken bei den Fossilien...$" + .string "I came up short...$" Route111_Text_1BAE81:: @ 81BAE81 - .string "Da man in der Wüste Fossilien finden\n" - .string "kann, war hier früher sicher ein Meer...$" + .string "If they can find fossils in the desert,\n" + .string "it must have been a sea before.$" Route111_Text_1BAEC9:: @ 81BAEC9 - .string "Seit 30 Jahren suche ich nach antiken\n" - .string "Ruinen!\l" - .string "Werde ich jetzt herausgefordert?$" + .string "For thirty years I have searched for\n" + .string "ancient ruins!\l" + .string "I am to be challenged?$" Route111_Text_1BAF14:: @ 81BAF14 - .string "Ich habe nach Ruinen, aber leider nicht\n" - .string "nach starken POKéMON gesucht...$" + .string "While I have searched for ruins, I’ve\n" + .string "not searched for strong POKéMON.$" Route111_Text_1BAF5B:: @ 81BAF5B - .string "Seit 30 Jahren suche ich nach antiken\n" - .string "Ruinen!\p" - .string "Nee, warte... Seit 40 Jahren, oder? Oder\n" - .string "doch 30 Jahre? Ach, ich weiß nicht...$" + .string "For thirty years I have searched for\n" + .string "ancient ruins!\p" + .string "No, wait, was that forty years?\n" + .string "Which was it now?$" Route111_Text_1BAFC1:: @ 81BAFC1 - .string "Seit 30 Jahren suche ich nach antiken\n" - .string "Ruinen!\p" - .string "Oder seit 40 Jahren???\n" - .string "Egal! Forderst du mich heraus?$" + .string "For thirty years I have searched for\n" + .string "ancient ruins!\p" + .string "No, wait, was that forty years?\n" + .string "Anyway, am I to be challenged?$" Route111_Text_1BB034:: @ 81BB034 - .string "Ich habe keine Ruinen, und auch keine\n" - .string "starken POKéMON gefunden...$" + .string "I’ve found no ruins, nor have I found\n" + .string "any strong POKéMON...$" Route111_Text_1BB070:: @ 81BB070 - .string "Seit 30 Jahren suche ich nach antiken\n" - .string "Ruinen!\p" - .string "Glaube ich... Es können auch schon\n" - .string "40 Jahre sein...\p" - .string "Hmm... Andererseits kämen 50 Jahre auch\n" - .string "hin... Mein Gedächtnis ist eine Ruine...$" + .string "For thirty years I have searched for\n" + .string "ancient ruins!\p" + .string "No, wait, was that forty years I’ve\n" + .string "searched?\p" + .string "Hmm... It could even be fifty...\n" + .string "How long have I been at this?$" Route111_Text_1BB111:: @ 81BB111 - .string "Ich bin voller Schwung und Elan!\n" - .string "Und mein POKéMON nicht minder!$" + .string "I’m full of pep!\n" + .string "And my POKéMON is peppy, too!$" Route111_Text_1BB140:: @ 81BB140 - .string "Mein POKéMON hat ausgeschwungen.$" + .string "My POKéMON lost its pep...$" Route111_Text_1BB15B:: @ 81BB15B - .string "Wenn ich einen TRAINER mit Schwung und\n" - .string "Elan sehe, muss ich ihn anstarren.$" + .string "When I see a TRAINER with a lot of pep,\n" + .string "I can’t help looking.$" Route111_Text_1BB199:: @ 81BB199 - .string "Ich weiß ja nicht, wo du hin willst, aber\n" - .string "was sagst du zu einem Kämpfchen?$" + .string "I don’t know where you’re going, but\n" + .string "would you like to battle?$" Route111_Text_1BB1D8:: @ 81BB1D8 - .string "Hui, du bist außergewöhnlich gut!$" + .string "Oh, you’re disgustingly good!$" Route111_Text_1BB1F6:: @ 81BB1F6 - .string "Ich denke, ich sollte zum SCHLOTBERG\n" - .string "gehen, aber hier ist es sooo schön...$" + .string "I’m thinking that I should go to\n" + .string "MT. CHIMNEY, but the view around\l" + .string "here is very nice, too.$" Route111_Text_1BB250:: @ 81BB250 - .string "Ich trainiere ganz individuell: Ich for-\n" - .string "dere alle TRAINER, die ich sehe, heraus.$" + .string "To train myself, I challenge all\n" + .string "whom I meet!$" Route111_Text_1BB27E:: @ 81BB27E - .string "Ich gebe auf! Ich gebe auf!$" + .string "Uncle! I give up!$" Route111_Text_1BB290:: @ 81BB290 - .string "Alles was ich tun kann, ist weiter\n" - .string "trainieren, bis ich starke TRAINER wie\l" - .string "dich besiegen kann.$" + .string "All I can do is keep training until\n" + .string "I can defeat strong TRAINERS such\l" + .string "as yourself.$" Route111_Text_1BB2E3:: @ 81BB2E3 - .string "Zeig mir, wie stark deine POKéMON\n" - .string "geworden sind.$" + .string "Show me how much you’ve toughened\n" + .string "your POKéMON.$" Route111_Text_1BB313:: @ 81BB313 - .string "Ich habe es zu spüren bekommen. Deine\n" - .string "POKéMON sind viel stärker geworden.$" + .string "I see, you’ve toughened them\n" + .string "considerably.$" Route111_Text_1BB33E:: @ 81BB33E - .string "POKéMON und TRAINER lernen durch\n" - .string "Kämpfe sehr viel.\p" - .string "Wichtig ist, niemals aufzugeben, auch\n" - .string "wenn du verlierst.$" + .string "POKéMON and TRAINERS learn much\n" + .string "through battling.\p" + .string "What’s important is to never give up\n" + .string "even if you lose.$" Route111_Text_1BB3A7:: @ 81BB3A7 - .string "Wir trainieren hier, um im Spiel einen\n" - .string "Level weiterzukommen.\l" - .string "Bleib hier und trainiere mit uns!$" + .string "We’re training here to elevate our\n" + .string "game to the next level.\l" + .string "Stay and train with us!$" Route111_Text_1BB3FA:: @ 81BB3FA - .string "Ooh, du bist unglaublich!$" + .string "Ooh, you’re decent!$" Route111_Text_1BB40E:: @ 81BB40E - .string "Da du so stark bist, solltest du dir die\n" - .string "POKéMON LIGA zum Ziel setzen.$" + .string "Since you’re that strong, you should\n" + .string "aim for the POKéMON LEAGUE.$" Route111_Text_1BB44F:: @ 81BB44F - .string "Oh, deine POKéMON machen den Eindruck\n" - .string "ernsthafter Schauspieler.\l" - .string "Ich möchte sie gerne engagieren.$" + .string "Oh, your POKéMON look like serious\n" + .string "actors.\l" + .string "I have to ask you for an engagement.$" Route111_Text_1BB49F:: @ 81BB49F - .string "Sie sehen nicht nur stark aus, sie sind\n" - .string "auch stark.$" + .string "They didn’t just look strong, they\n" + .string "are strong!$" Route111_Text_1BB4CE:: @ 81BB4CE - .string "Ich war überzeugt, meine POKéMON sorg-\n" - .string "fältig aufgezogen zu haben. Aber nein,\l" - .string "ich muss mich noch mehr anstrengen.$" + .string "I thought I was raising my POKéMON\n" + .string "diligently, but, oh no, there is still\l" + .string "much to be done.$" Route111_Text_1BB529:: @ 81BB529 - .string "Abhängig von den Attacken, die du ihnen\n" - .string "beibringst, sind deine POKéMON stärker\l" - .string "oder schwächer.\p" - .string "Welche Attacken haben deine POKéMON\n" - .string "auf Lager?$" + .string "You can make POKéMON stronger or\n" + .string "weaker depending on the moves you\l" + .string "teach them.\p" + .string "What kinds of moves do your POKéMON\n" + .string "know?$" Route111_Text_1BB5A2:: @ 81BB5A2 - .string "Ihre Attacken sind wirklich gut.$" + .string "You’ve taught them good moves!$" Route111_Text_1BB5C1:: @ 81BB5C1 - .string "Meine POKéMON sollten sich vielleicht\n" - .string "nicht eher entwickeln, bis sie wirklich\l" - .string "gute Attacken gelernt haben...$" + .string "Maybe I should have stopped my\n" + .string "POKéMON from evolving until they\l" + .string "learned better moves...$" Route112_Text_1BB619:: @ 81BB619 - .string "Hahahahahaha!\n" - .string "Wie wäre es, wenn wir kämpfen?\l" - .string "Du und ich!\l" - .string "Hahahahahaha!$" + .string "Hahahaha!\n" + .string "How about we have a battle?\l" + .string "You and me!\l" + .string "Hahahaha!$" Route112_Text_1BB655:: @ 81BB655 - .string "Ich habe verloren!\n" - .string "Hahahahahaha!$" + .string "I lost!\n" + .string "Hahahaha!$" Route112_Text_1BB667:: @ 81BB667 - .string "Hahahahahaha! Irgendetwas ist mir in\n" - .string "die Nase geflogen! Hahahahahaaatschiii!$" + .string "Hahahahaha! Something flew up my nose!\n" + .string "Hahahaha-hatchoo!$" Route112_Text_1BB6A0:: @ 81BB6A0 - .string "Meine Beine sind durch das Klettern in\n" - .string "den Bergen richtig muskulös geworden.\p" - .string "So leicht werden sie also nicht\n" - .string "einknicken, mein Freund!$" + .string "My legs are solid from pounding up\n" + .string "and down the mountains.\p" + .string "They’re not going to buckle easily,\n" + .string "friend!$" Route112_Text_1BB707:: @ 81BB707 - .string "Aua! Ich habe Muskelkrämpfe!$" + .string "Ouch! My legs cramped up!$" Route112_Text_1BB721:: @ 81BB721 - .string "Versuche mal, in den Bergen zu wandern.\n" - .string "Und zwar mit richtig festem Schritt. Und\l" - .string "das mit einem schweren Rucksack von\l" - .string "mehreren Pfund Gewicht...\p" - .string "So, mein Freund, bringst du deinen\n" - .string "Körper richtig in Form.$" + .string "Try hiking, and I mean really\n" + .string "pounding, on these mountain trails\l" + .string "with a heavy pack weighing dozens of\l" + .string "pounds.\p" + .string "That, my friend, will get your body\n" + .string "into serious shape.$" Route112_Text_1BB7C7:: @ 81BB7C7 - .string "Ich halte mich mit Wandern fit!\n" - .string "Dadurch habe ich viele Kräfte im Ärmel!$" + .string "I’ve been keeping fit by hiking.\n" + .string "Power, I have in spades!$" Route112_Text_1BB801:: @ 81BB801 - .string "Meine Ärmel waren wohl verknotet...$" + .string "I got trumped in power?$" Route112_Text_1BB819:: @ 81BB819 - .string "Ich habe gehört, dass es am Gipfel vom\n" - .string "SCHLOTBERG viele starke TRAINER gibt.\p" - .string "Ich werde dort hochgehen und sie alle\n" - .string "herausfordern!$" + .string "I hear there are some seriously tough\n" + .string "TRAINERS on top of MT. CHIMNEY.\p" + .string "I intend to get up there and give them\n" + .string "a challenge!$" Route112_Text_1BB893:: @ 81BB893 - .string "Ich bin stark. Ich weine bestimmt\n" - .string "nicht, wenn ich verliere.$" + .string "I’m strong.\n" + .string "I won’t cry if I lose.$" Route112_Text_1BB8B6:: @ 81BB8B6 - .string "Waaahaaa! Heul... Schluchz...$" + .string "Waaaah!$" Route112_Text_1BB8BE:: @ 81BB8BE - .string "Ich weine, weil ich meine Maaaaamiiii\n" - .string "vermisse! Schluchz... Jammer...$" + .string "I’m not crying because I miss my mommy!\n" + .string "Snivel...$" Route112_Text_1BB8F0:: @ 81BB8F0 - .string "Machst du ein Picknick, dann musst du\n" - .string "einfach vor Freude laut singen!\l" - .string "Komm, wir singen zusammen.$" + .string "When you’re out on a picnic, why, you\n" + .string "simply have to sing!\l" + .string "Come on, sing with me!$" Route112_Text_1BB942:: @ 81BB942 - .string "Oh, du triffst die Töne besser als ich!$" + .string "Oh, you’re so strong!$" Route112_Text_1BB958:: @ 81BB958 - .string "Es ist egal, ob du besser singst oder\n" - .string "besser mit POKéMON kämpfen kannst.\p" - .string "Wenn du Spaß hast, hast du schon\n" - .string "gewonnen!$" + .string "It doesn’t matter if you’re good or bad\n" + .string "at singing or POKéMON.\p" + .string "If you have the most fun, you win!$" Route113_Text_1BB9BA:: @ 81BB9BA - .string "Rate mal, warum es hier draußen so\n" - .string "kühl ist.$" + .string "Can you guess why it’s so cool\n" + .string "around here?$" Route113_Text_1BB9E6:: @ 81BB9E6 - .string "Puuuh äääh!\n" - .string "Das stinkt!$" + .string "Peeuuw!\n" + .string "That stinks!$" Route113_Text_1BB9FB:: @ 81BB9FB - .string "Die Vulkanasche lässt die Sonnen-\n" - .string "strahlen nicht durch. Es bleibt kalt.\p" - .string "Ich finde das angenehm, ich mag\n" - .string "Hitze nicht.$" + .string "The volcanic ash blocks the sun, so it\n" + .string "doesn’t get very warm.\p" + .string "That’s good for me - I can’t stand heat!$" Route113_Text_1BBA62:: @ 81BBA62 - .string "Der Vulkanausbruch ist der eindeutige\n" - .string "Beweis, dass die Erde lebt.$" + .string "The volcano’s eruption is proof that\n" + .string "the earth is alive.$" Route113_Text_1BBA9B:: @ 81BBA9B - .string "Du bist auf die eine oder andere\n" - .string "Weise stark!$" + .string "You’re some kind of strong!$" Route113_Text_1BBAB7:: @ 81BBAB7 - .string "Aua! Au au au! Ich kann nichts sehen!\n" - .string "Ich habe ein Aschenauge!\p" - .string "Hast du verstanden? Asche und Auge?\p" - .string "Okay, blöder Witz, tut mir Leid...$" + .string "Ouch! Owww! I can’t see!\n" + .string "I got ashes in my eyelashes!\p" + .string "Get it? Ashes and eyelashes?\p" + .string "Okay, that was bad, sorry...$" Route113_Text_1BBB27:: @ 81BBB27 - .string "Ich habe einen Sonnenschirm, um diese\n" - .string "staubige, widerliche Vulkanasche von\l" - .string "meinem niedlichen CAMAUB fernzuhalten.$" + .string "I use this parasol to ward off this\n" + .string "filthy, yucky volcanic ash from my\l" + .string "dear NUMEL.$" Route113_Text_1BBB7A:: @ 81BBB7A - .string "Keuchl, pust...\n" - .string "Ich bin total außer Atem...$" + .string "Huff, huff...\n" + .string "I am exhausted...$" Route113_Text_1BBB9A:: @ 81BBB9A - .string "Du bist wirklich sehr gut. Ich muss\n" - .string "sagen, ich bin schwer beeindruckt.$" + .string "You’re very good at this.\n" + .string "I must say I’m impressed!$" Route113_Text_1BBBCE:: @ 81BBBCE - .string "Oh, hallo, wir haben uns ja ewig nicht ge-\n" - .string "sehen. Ich lade dich zu einem Kampf ein.$" + .string "Oh, hello, hasn’t it been a while?\n" + .string "May I invite you to battle?$" Route113_Text_1BBC0D:: @ 81BBC0D - .string "Oh, suuuuuper!$" + .string "Oh, how super!$" Route113_Text_1BBC1C:: @ 81BBC1C - .string "Du bist immer noch sehr gut! Ich muss\n" - .string "sagen, ich bin immer noch beeindruckt.$" + .string "You’ve remained very good at this.\n" + .string "I must say I’m impressed!$" Route113_Text_1BBC59:: @ 81BBC59 - .string "Aus den Aschen erhebe ich mich! Kiyaih!\n" - .string "Herausfordern tue ich dich! Kiyaih!$" + .string "From out of the ashes I leap! Hiyah!\n" + .string "I challenge thee!$" Route113_Text_1BBC90:: @ 81BBC90 - .string "Eine Ehre, von dir besiegt zu werden!$" + .string "With honor I admit defeat!$" Route113_Text_1BBCAB:: @ 81BBCAB - .string "Ich muss die Kunst des Versteckens\n" - .string "verbessern. Mein Reimen auch. Leb wohl.$" + .string "I must refine the art of concealment.\n" + .string "I bid thee farewell.$" Route113_Text_1BBCE6:: @ 81BBCE6 - .string "Erhebe ich mich aus den Aschen, hast du\n" - .string "nichts zu lachen. Kiyaih!$" + .string "From out of the ashes I leap! Hiyah!\n" + .string "I challenge thee!$" Route113_Text_1BBD1D:: @ 81BBD1D - .string "Mein Versagen gereicht dir zur Ehre.$" + .string "With honor I admit defeat!$" Route113_Text_1BBD38:: @ 81BBD38 - .string "Mein Versteck ist so lausig wie mein\n" - .string "Kampfstil. Und meine Wortwahl erst...\p" - .string "Ich lasse das Reimen und sage Lebwohl.$" + .string "My flawless concealment was let down\n" + .string "by my immature battle skills...\p" + .string "I bid thee farewell.$" Route113_Text_1BBD92:: @ 81BBD92 - .string "Danke, dass du mich gefunden hast!\n" - .string "Aber nun müssen wir kämpfen!$" + .string "Thanks for finding me!\n" + .string "But we still have to battle!$" Route113_Text_1BBDC6:: @ 81BBDC6 - .string "Ich werde mein Ninjutsu gegen dich\n" - .string "einsetzen...\p" - .string "“VULKANASCHEN WIRBLER”!\n" - .string "...Was? Es ist schon vorbei?$" + .string "I’ll use my ninjutsu on you...\n" + .string "“VOLCANIC ASH SWIRL CLOAK”!\p" + .string "...What? It’s already over?$" Route113_Text_1BBE1D:: @ 81BBE1D - .string "Weißt du, was Sch... am Verstecken ist?\n" - .string "Es ist einsam, wenn keiner vorbeikommt.$" + .string "You know what’s crummy about hiding?\n" + .string "It’s lonely if no one comes along.$" Route113_Text_1BBE65:: @ 81BBE65 - .string "LI: Wir beide sammeln Asche.\n" - .string "Wir beide kämpfen auch mit POKéMON.$" + .string "TORI: Both of us, we collect ashes.\n" + .string "We battle POKéMON, too.$" Route113_Text_1BBEA1:: @ 81BBEA1 - .string "LI: Wir haben verloren... Mir ist lang-\n" - .string "weilig, daher sammle ich jetzt Asche.$" + .string "TORI: We lost... It’s boring, so I’m going\n" + .string "to get some more ashes.$" Route113_Text_1BBEE4:: @ 81BBEE4 - .string "LI: Wie viel Asche wir haben? Ich\n" - .string "hoffe, genug für eine WEISSE FLÖTE.$" + .string "TORI: How much ash do we have?\n" + .string "Enough for a WHITE FLUTE, I hope.$" Route113_Text_1BBF25:: @ 81BBF25 - .string "LI: Wir wollen einen 2-gegen-2-Kampf.\n" - .string "Anderenfalls würden wir verlieren.$" + .string "TORI: We want to battle 2-on-2.\n" + .string "If we didn’t, we would lose!$" Route113_Text_1BBF62:: @ 81BBF62 - .string "FLO: Wir beide sammeln Asche.\n" - .string "Wir beide kämpfen auch mit POKéMON.$" + .string "TIA: Both of us, we collect ashes.\n" + .string "We battle POKéMON, too.$" Route113_Text_1BBF9D:: @ 81BBF9D - .string "FLO: Wir haben verloren... Mir ist lang-\n" - .string "weilig, daher sammle ich jetzt Asche.$" + .string "TIA: We couldn’t win... It’s boring,\n" + .string "so I’m getting some more ashes.$" Route113_Text_1BBFE2:: @ 81BBFE2 - .string "FLO: Wie viel Asche wir haben? Ich\n" - .string "hoffe, genug für eine WEISSE FLÖTE.$" + .string "TIA: We have a lot of ashes!\n" + .string "I think enough for a WHITE FLUTE!$" Route113_Text_1BC021:: @ 81BC021 - .string "FLO: Wir wollen einen 2-gegen-2-Kampf.\n" - .string "Anderenfalls würden wir verlieren.$" + .string "TIA: We want to battle 2-on-2.\n" + .string "If we don’t, we won’t win!$" Route114_Text_1BC05B:: @ 81BC05B - .string "Hollerididudljö!\p" + .string "Yodelayhihoo!\p" .string "... ...\p" - .string "Du musst jetzt mit “Hollerididudljö!”\n" - .string "antworten, da es hier kein Echo gibt!$" + .string "You’re supposed to shout\n" + .string "“yodelayhihoo” since it doesn’t\l" + .string "echo here!$" Route114_Text_1BC0B5:: @ 81BC0B5 - .string "Hollerididudljö!$" + .string "Yodelayhihoo!$" Route114_Text_1BC0C3:: @ 81BC0C3 - .string "Als ich noch ein kleiner Lausbub war,\n" - .string "habe ich immer gedacht, da wäre jemand,\l" - .string "der mich ärgern will und \l" - .string "“Hollerididudljö” antwortet.$" + .string "When I was a wee tyke, I believed there\n" + .string "was someone copying me and shouting\l" + .string "back, “Yodelayhihoo.”$" Route114_Text_1BC125:: @ 81BC125 - .string "Ohne eine gute Ausrüstung solltest du\n" - .string "dich nicht in die Berge wagen.$" + .string "If you’re not prepared, you shouldn’t\n" + .string "be up in the mountains!$" Route114_Text_1BC163:: @ 81BC163 - .string "Die Berge sind unerbittlich...$" + .string "The mountains are unforgiving...$" Route114_Text_1BC184:: @ 81BC184 - .string "Im Winter sind Berge lebensgefährlich,\n" - .string "wegen der Blizzards und Lawinen.$" + .string "In the winter, mountains turn deadly\n" + .string "with blizzards and avalanches.$" Route114_Text_1BC1C8:: @ 81BC1C8 - .string "Campen macht Spaß! Du kannst angeln,\n" - .string "Würstchen braten und andere mit\l" - .string "Spukgeschichten zu Tode erschrecken!\p" - .string "Aber das Beste sind die POKéMON-\n" - .string "Kämpfe!$" + .string "Camping’s fun! You can fish, roast\n" + .string "marshmallows, and tell spooky stories!\p" + .string "But the best of all are the POKéMON\n" + .string "battles!$" Route114_Text_1BC23F:: @ 81BC23F - .string "Das war etwas zu schwer für mich!$" + .string "Way too strong!$" Route114_Text_1BC24F:: @ 81BC24F - .string "Ich finde es großartig, dass ich mit\n" - .string "meinen POKéMON campen gehen kann.$" + .string "I think it’s great that I can go\n" + .string "camping with my POKéMON.$" Route114_Text_1BC289:: @ 81BC289 - .string "Nach dem Essen muss ich Sport treiben.\n" - .string "Also lass uns kämpfen.$" + .string "I need to exercise after a meal.\n" + .string "Let’s have a match!$" Route114_Text_1BC2BE:: @ 81BC2BE - .string "Oh, nein!$" + .string "Oh, no!$" Route114_Text_1BC2C6:: @ 81BC2C6 - .string "Ich hatte so ein leckeres Essen. Des-\n" - .string "halb bin ich jetzt pappsatt und müde.$" + .string "I just had a tasty meal.\n" + .string "I’m getting drowsy...$" Route114_Text_1BC2F5:: @ 81BC2F5 - .string "Hufhufhufhufhufhuf...\n" - .string "Komm, trete gegen mein POKéMON an.$" + .string "Ufufufufufu...\n" + .string "Want to battle against my POKéMON?$" Route114_Text_1BC327:: @ 81BC327 - .string "Mei... Mein POKéMON... hiiii...$" + .string "M-My POKéMON...$" Route114_Text_1BC337:: @ 81BC337 - .string "Einen großen Körper, der plump und hart\n" - .string "ist, riesige Hörner und scharfe Fänge...\p" - .string "Hufhufhufhuf...\n" - .string "So ein POKéMON hätte ich gerne...$" + .string "A big body that’s all lumpy and hard,\n" + .string "enormous horns, and vicious fangs...\p" + .string "Ufufufufu...\n" + .string "I wish I had a POKéMON like that...$" Route114_Text_1BC3B3:: @ 81BC3B3 - .string "Hufhufhufhufhuf...\n" - .string "Komm, mein POKéMON ist bereit.$" + .string "Ufufufufufu...\n" + .string "Come on, battle my POKéMON...$" Route114_Text_1BC3E0:: @ 81BC3E0 - .string "Ich bin so froh, dass ich deine POKéMON\n" - .string "sehen durfte...$" + .string "I feel so lucky getting to see your\n" + .string "POKéMON...$" Route114_Text_1BC40F:: @ 81BC40F - .string "Hufhufhufhufhuf...\p" - .string "Wenn ich POKéMON kämpfen sehe, fange\n" - .string "ich an zu zittern und zu schaudern...$" + .string "Ufufufufufu...\p" + .string "When I see POKéMON battling, I get all\n" + .string "shivery and shaky...$" Route114_Text_1BC45A:: @ 81BC45A - .string "Wenn du ein Lagerfeuer entzündest,\n" - .string "muss immer Wasser in der Nähe sein.$" + .string "If you’re lighting a campfire, make\n" + .string "sure you have water handy.$" Route114_Text_1BC499:: @ 81BC499 - .string "Gut, du hast mein Feuer gelöscht.$" + .string "Thanks for dousing my fire!$" Route114_Text_1BC4B5:: @ 81BC4B5 - .string "Du musst im Wald mit allen Arten von\n" - .string "Feuer wirklich sehr vorsichtig sein.\p" - .string "Unterschätze nie die Gefahr des\n" - .string "Feuers!$" + .string "You really do have to be careful with\n" + .string "any sort of fire in a forest.\p" + .string "Don’t ever underestimate the power\n" + .string "of fire.$" Route114_Text_1BC525:: @ 81BC525 - .string "Hast du gelernt, dass man immer Wasser\n" - .string "neben einem Lagerfeuer stehen hat?$" + .string "Have you learned to keep water handy\n" + .string "for campfires?$" Route114_Text_1BC559:: @ 81BC559 - .string "Ich wurde schon gelöscht, bevor ich\n" - .string "überhaupt zur Flamme ansetzen konnte.$" + .string "I got hosed down before I could flare\n" + .string "up, I guess.$" Route114_Text_1BC58C:: @ 81BC58C - .string "Du musst im Wald mit allen Arten von\n" - .string "Feuer wirklich sehr vorsichtig sein.\p" - .string "Unterschätze nie die Gefahr des\n" - .string "Feuers!$" + .string "You really do have to be careful with\n" + .string "any sort of fire in a forest.\p" + .string "Don’t ever underestimate the power\n" + .string "of fire.$" Route114_Text_1BC5FC:: @ 81BC5FC - .string "Wenn wir angeln wären, hättest du nicht\n" - .string "den Hauch einer Chance gegen mich.\l" - .string "Also, dann zeig mal deine POKéMON.$" + .string "If we were fishing, you wouldn’t stand\n" + .string "a chance against me.\l" + .string "So, bring on your POKéMON!$" Route114_Text_1BC653:: @ 81BC653 - .string "Wären wir Angeln, hätte ich gewonnen!$" + .string "If we were fishing, I would’ve won...$" Route114_Text_1BC679:: @ 81BC679 - .string "Ich werde mein Glück bei METEORFÄLLE\n" - .string "versuchen und ein dickes Ding an Land\l" - .string "ziehen.\p" - .string "Da muss es etwas geben, das weiß ich\n" - .string "genau!$" + .string "I think I’ll try my luck at landing\n" + .string "a big one at METEOR FALLS.\p" + .string "There has to be something in there.\n" + .string "I just know it.$" Route114_Text_1BC6EC:: @ 81BC6EC - .string "Ich liebe das Angeln. Aber ich liebe auch\n" - .string "das Kämpfen!\p" - .string "Wenn mich jemand herausfordern will, ich\n" - .string "bin bereit. Auch wenn ich angle.$" + .string "I like to fish. But I also like to\n" + .string "battle!\p" + .string "If anyone challenges me, I’m there,\n" + .string "even if I’m fishing.$" Route114_Text_1BC750:: @ 81BC750 - .string "Ich liebe Kämpfe, aber das heißt nicht,\n" - .string "dass ich gut darin bin...$" + .string "I like to battle, but that doesn’t\n" + .string "mean I’m good at it...$" Route114_Text_1BC78A:: @ 81BC78A - .string "Dieses Mal werde ich trainieren!\p" - .string "Das denke ich jedes Mal und dann\n" - .string "kann ich mich doch nicht von meiner\l" - .string "Angel und meinen POKéMON trennen.$" + .string "This time I’ll do it!\p" + .string "I always think that, so I can’t walk\n" + .string "away from fishing or POKéMON.$" Route114_Text_1BC7E3:: @ 81BC7E3 - .string "TYRA: Natürlich. Ich bin in der\n" - .string "richtigen Stimmung. Ich werde dir\l" - .string "etwas über POKéMON beibringen.$" + .string "TYRA: Well, sure.\n" + .string "I’m in the mood for it.\l" + .string "I’ll teach you a little about POKéMON.$" Route114_Text_1BC834:: @ 81BC834 - .string "TYRA: Was für ein atemberaubender\n" - .string "Kampfstil.$" + .string "TYRA: What an amazing battle style!$" Route114_Text_1BC858:: @ 81BC858 - .string "TYRA: Ich bringe meiner Juniorin IVY\n" - .string "etwas über POKéMON bei.$" + .string "TYRA: I was teaching my junior IVY\n" + .string "about POKéMON.$" Route114_Text_1BC88A:: @ 81BC88A - .string "TYRA: Kicher...\n" - .string "Wenn du mit uns kämpfen willst, reicht\l" - .string "ein POKéMON nicht aus.$" + .string "TYRA: Giggle...\n" + .string "If you want to battle with us, just one\l" + .string "POKéMON isn’t enough!$" Route114_Text_1BC8D8:: @ 81BC8D8 - .string "IVY: Wer hat dir das alles über POKéMON\n" - .string "beigebracht?$" + .string "IVY: Who taught you about POKéMON?$" Route114_Text_1BC8FB:: @ 81BC8FB - .string "IVY: Was für ein unglaublicher Kampfstil!$" + .string "IVY: What an amazing battle style!$" Route114_Text_1BC91E:: @ 81BC91E - .string "IVY: Ich habe angefangen, POKéMON zu\n" - .string "trainieren, weil TYRA, meine Mentorin,\l" - .string "es mir beigebracht hat!$" + .string "IVY: I started training POKéMON\n" + .string "because TYRA, my student mentor,\l" + .string "taught me!$" Route114_Text_1BC96A:: @ 81BC96A - .string "IVY: Hast du nur ein POKéMON? Ich\n" - .string "glaube, das fühlt sich einsam!$" + .string "IVY: Do you only have one POKéMON?\n" + .string "I think it must feel lonesome.$" Route115_Text_1BC9AC:: @ 81BC9AC .string "Hm...\n" - .string "Du siehst ganz kompetent aus...\l" - .string "Ich leiste dir Gesellschaft!$" + .string "You seem rather capable...\l" + .string "Let me keep you company!$" Route115_Text_1BC9E6:: @ 81BC9E6 - .string "Du bist viel stärker, als ich mir das\n" - .string "vorgestellt hatte.$" + .string "You’re much stronger than\n" + .string "I’d imagined!$" Route115_Text_1BCA0E:: @ 81BCA0E - .string "Man wird nicht als Genie geboren!\n" - .string "Alles basiert auf Anstrengung!\l" - .string "Das ist meine Meinung...$" + .string "There is no such thing as a born genius.\n" + .string "It all depends on effort!\l" + .string "That is what I believe...$" Route115_Text_1BCA6B:: @ 81BCA6B - .string "Hm... Deine Flinkheit spricht mal wieder\n" - .string "für sich.\l" - .string "Komm, leiste mir erneut Gesellschaft!$" + .string "Hm... As always, your agility speaks\n" + .string "for itself.\l" + .string "Come, keep me company!$" Route115_Text_1BCAB3:: @ 81BCAB3 - .string "Stark wie immer!$" + .string "As strong as ever!$" Route115_Text_1BCAC6:: @ 81BCAC6 - .string "Alles verlangt ein Maß an Anstrengung!\p" - .string "Ich habe verloren, weil ich mich nicht\n" - .string "genügend angestrengt habe.$" + .string "All it takes is effort!\p" + .string "I lost because I haven’t put in enough\n" + .string "effort!$" Route115_Text_1BCB0D:: @ 81BCB0D - .string "Du!\p" - .string "Meine MACHOLLO!\p" - .string "Verlangen einen Kampf!$" + .string "You!\p" + .string "My MACHOP!\p" + .string "Demand a battle!$" Route115_Text_1BCB2E:: @ 81BCB2E - .string "Aua aua aua aua!$" + .string "Ouch, ouch, ouch!$" Route115_Text_1BCB40:: @ 81BCB40 - .string "Meine MACHOLLO haben gejauchzt!\p" - .string "Solange meine POKéMON nach Stärke\n" - .string "suchen, werde auch ich stärker!$" + .string "My MACHOP crew!\p" + .string "So long as they seek power, I will\n" + .string "grow strong with them!$" Route115_Text_1BCB8A:: @ 81BCB8A - .string "Mein Talent ist, Ziegelsteine mit meiner\n" - .string "Stirn zu zertrümmern.$" + .string "My strongest skill is busting bricks\n" + .string "with my forehead!$" Route115_Text_1BCBC1:: @ 81BCBC1 - .string "Uguaaah!\n" - .string "Mein Kopf wurde zertrümmert.$" + .string "Ugwaaaah!\n" + .string "My head is busted!$" Route115_Text_1BCBDE:: @ 81BCBDE - .string "Ich bringe meinem POKéMON Karate bei.\p" - .string "Und es sieht so aus, als wäre es darin\n" - .string "viel besser als ich. Das freut mich.$" + .string "I’ve been teaching my POKéMON karate.\p" + .string "It looks like they’ll get a lot better\n" + .string "than me. I’m excited about that.$" Route115_Text_1BCC4C:: @ 81BCC4C - .string "Nachdem du uns besiegt hattest, haben\n" - .string "wir hart trainiert, um besser zu werden.\l" - .string "Heute fordern wir Revanche!$" + .string "After you beat me, we trained hard to\n" + .string "improve our skills.\l" + .string "Come on, give us a rematch!$" Route115_Text_1BCCA2:: @ 81BCCA2 - .string "Uguaaah!\n" - .string "Wir haben schon wieder verloren!$" + .string "Ugwaaah!\n" + .string "We lost again!$" Route115_Text_1BCCBA:: @ 81BCCBA - .string "Meine POKéMON werden stärker! Ich\n" - .string "habe mein Trainingspensum verdoppelt.$" + .string "My POKéMON will grow stronger!\n" + .string "I’ll redouble my training!$" Route115_Text_1BCCF4:: @ 81BCCF4 - .string "Dieser Strand ist mein geheimer\n" - .string "Trainingsort. Du hast mich gestört!$" + .string "This beach is my secret training spot!\n" + .string "Don’t come butting in!$" Route115_Text_1BCD32:: @ 81BCD32 - .string "Ich habe nicht genug trainiert.$" + .string "I haven’t trained enough!$" Route115_Text_1BCD4C:: @ 81BCD4C - .string "Der Sand ist wie ein Kissen, das den\n" - .string "Sturz abfängt und Verletzungen ver-\l" - .string "hindert. Der perfekte Trainingsort.$" + .string "The sand acts as a cushion to reduce\n" + .string "impact and prevent injury.\l" + .string "This is the perfect place to train.$" Route115_Text_1BCDB0:: @ 81BCDB0 - .string "Okay, lass uns weiter kämpfen.$" + .string "Okay, let’s get this battle on!$" Route115_Text_1BCDD0:: @ 81BCDD0 - .string "Ich kann kämpfen, aber meine POKéMON...$" + .string "I can battle but my POKéMON...$" Route115_Text_1BCDEF:: @ 81BCDEF - .string "Sogar wenn ich verliere, habe ich meine\n" - .string "Freude an dem Kampf. Wahrscheinlich\l" - .string "weil ich die POKéMON liebe.$" + .string "Even when I lose, I still get some\n" + .string "enjoyment out of it.\l" + .string "It must be that I love POKéMON.$" UnknownString_81BCE47: @ 81BCE47 - .string "Ich habe ein seltenes POKéMON.\n" - .string "Möchtest du das mal sehen?$" + .string "I have a rare POKéMON!\n" + .string "Would you like me to show you?$" UnknownString_81BCE7D: @ 81BCE7D - .string "Du...\n" - .string "Du willst mein POKéMON haben, oder?$" + .string "You...\n" + .string "You want my POKéMON, don’t you?$" UnknownString_81BCEA4: @ 81BCEA4 - .string "Ich habe ein seltenes POKéMON. Das\n" - .string "reicht mir, um zufrieden zu sein.$" + .string "I have this rare POKéMON.\n" + .string "It’s enough to keep me satisfied.$" Route115_Text_1BCEE0:: @ 81BCEE0 - .string "Ich habe ein seltenes POKéMON.\n" - .string "Willst du das mal sehen?$" + .string "I have a rare POKéMON!\n" + .string "Would you like me to show you?$" Route115_Text_1BCF16:: @ 81BCF16 - .string "Du... Du versuchst mir mein POKéMON\n" - .string "abspenstig zu machen, oder?$" + .string "You...\n" + .string "You want my POKéMON, don’t you?$" Route115_Text_1BCF3D:: @ 81BCF3D - .string "Und ich habe immer noch mein seltenes\n" - .string "POKéMON, und damit bin ich zufrieden!$" + .string "I have this rare POKéMON.\n" + .string "It’s enough to keep me satisfied.$" Route116_Text_1BCF79:: @ 81BCF79 - .string "Wenn es keinen Tunnel gibt, dann\n" - .string "klettere ich eben über den Berg.$" + .string "If the tunnel doesn’t go through, then\n" + .string "I’ll just go over the top.$" Route116_Text_1BCFBB:: @ 81BCFBB - .string "Hechel... Keuch...\n" - .string "Verlieren erschöpft mich...$" + .string "Gasp... Gasp...\n" + .string "Losing made me tired...$" Route116_Text_1BCFE3:: @ 81BCFE3 - .string "Macht auch nichts, wenn es keinen\n" - .string "Tunnel gibt. Für WANDERER sind Berge\l" - .string "wie Straßen.$" + .string "It’s no big deal if there’s no tunnel.\n" + .string "To a HIKER, mountains are roads!$" Route116_Text_1BD02B:: @ 81BD02B - .string "Meine POKéMON sind die Kings.\n" - .string "Überzeug dich selbst!$" + .string "My POKéMON rule!\n" + .string "Check them out!$" Route116_Text_1BD04C:: @ 81BD04C - .string "Auaaa! Ein Kratzer!\n" - .string "Ich brauche dringend einen Verband.$" + .string "Ouch! A scrape!\n" + .string "I have to put on a bandage!$" Route116_Text_1BD078:: @ 81BD078 - .string "Verbände sind Zeichen von Rauheit!\n" - .string "Ich brauche unbedingt einen weiteren!$" + .string "Bandages are signs of toughness!\n" + .string "I’ve got another one!$" Route116_Text_1BD0AF:: @ 81BD0AF - .string "Meine KÄFER-POKéMON sind stark!\n" - .string "Lass uns kämpfen!$" + .string "My BUG POKéMON are tough!\n" + .string "Let’s battle!$" Route116_Text_1BD0D7:: @ 81BD0D7 - .string "Ich habe verloren! Ich dachte,\n" - .string "ich könnte dich am Kragen packen...$" + .string "I lost!\n" + .string "I thought I had you!$" Route116_Text_1BD0F4:: @ 81BD0F4 - .string "KÄFER-POKéMON entwickeln sich schnell.\n" - .string "So werden sie auch schnell stark.$" + .string "BUG POKéMON evolve quickly.\n" + .string "So they get strong quickly, too.$" Route116_Text_1BD131:: @ 81BD131 - .string "Ich bringe dir bei, wie stark mein\n" - .string "geliebtes POKéMON ist!$" + .string "Let me teach you how strong my\n" + .string "adorable POKéMON is!$" Route116_Text_1BD165:: @ 81BD165 - .string "Du bist mir haushoch überlegen...$" + .string "You’re a notch above me...$" Route116_Text_1BD180:: @ 81BD180 - .string "POKéMON, die Anmut und Stärke besitzen,\n" - .string "sind ideal, finde ich.$" + .string "POKéMON that possess cuteness and\n" + .string "power, that’s ideal, I think.$" Route116_Text_1BD1C0:: @ 81BD1C0 - .string "Wir lernen alle möglichen Sachen in der\n" - .string "TRAINERSCHULE.\p" - .string "Ich will einiges jetzt mal ausprobieren.$" + .string "We learn all sorts of things at the\n" + .string "TRAINER’S SCHOOL.\p" + .string "I want to test things out for real!$" Route116_Text_1BD21A:: @ 81BD21A - .string "Ich habe in der Schule nicht aufge-\n" - .string "passt. Daher habe ich verloren.$" + .string "I slacked off in school...\n" + .string "That’s why I lost.$" Route116_Text_1BD248:: @ 81BD248 - .string "Ich muss einige Kurse in der TRAINER-\n" - .string "SCHULE wiederholen.\l" - .string "Sonst wird FELIZIA vor Wut schäumen.$" + .string "I’ll have to redo some courses at the\n" + .string "TRAINER’S SCHOOL.\l" + .string "If I don’t, ROXANNE will be steamed.$" Route116_Text_1BD2A5:: @ 81BD2A5 - .string "Ich habe in der TRAINERSCHULE fleißig\n" - .string "gelernt. Ich werde dieses Mal also mit\l" - .string "Sicherheit nicht verlieren.$" + .string "I’ve been studying seriously at the\n" + .string "TRAINER’S SCHOOL.\l" + .string "I won’t lose like I did last time.$" Route116_Text_1BD2FE:: @ 81BD2FE - .string "Waaas?\n" - .string "Aber ich habe doch so fleißig gelernt!$" + .string "Hunh?\n" + .string "I studied diligently.$" Route116_Text_1BD31A:: @ 81BD31A - .string "Ich muss wohl erneut einige Kurse in der\n" - .string "TRAINERSCHULE wiederholen.\l" - .string "Sonst kocht FELIZIA über.$" + .string "I’ll have to redo some courses at the\n" + .string "TRAINER’S SCHOOL.\l" + .string "If I don’t, ROXANNE will be steamed.$" Route116_Text_1BD377:: @ 81BD377 - .string "Ich lerne in der Schule und auf dem\n" - .string "Heimweg lerne ich auch!$" + .string "I study at school, and I study on the\n" + .string "way home, too!$" Route116_Text_1BD3AC:: @ 81BD3AC - .string "Ich bin geschockt! Ich habe verloren?!?$" + .string "I’m in shock - I lost?$" Route116_Text_1BD3C3:: @ 81BD3C3 - .string "Argh, so werde ich nie so ein eleganter\n" - .string "TRAINER wie FELIZIA!$" + .string "Awww, I’ll never become an elegant\n" + .string "TRAINER like ROXANNE this way!$" Route116_Text_1BD405:: @ 81BD405 - .string "Seit unserem letzten Kampf habe ich\n" - .string "viel gelernt. Das musst du dir ansehen!$" + .string "I studied a whole lot since I saw you.\n" + .string "You must see my achievements!$" Route116_Text_1BD44A:: @ 81BD44A - .string "Ach, das gibt es doch nicht...$" + .string "I’m in shock. I lost again?$" Route116_Text_1BD466:: @ 81BD466 - .string "Du hast FELIZIA besiegt?!?\n" - .string "Dann kann ich dich nicht besiegen. Nee...$" + .string "You’ve beaten ROXANNE?\n" + .string "I can’t beat you, then. Not yet.$" Route117_Text_1BD49E:: @ 81BD49E - .string "Du? Würdest du gegen meine POKéMON\n" - .string "kämpfen?$" + .string "Listen, could I get you to battle the\n" + .string "POKéMON I’m raising?$" Route117_Text_1BD4D9:: @ 81BD4D9 - .string "Du hast einfach großartige POKéMON...$" + .string "You’ve raised yours superbly...$" Route117_Text_1BD4F9:: @ 81BD4F9 - .string "POKéMON sind nicht nur durch Stärke\n" - .string "definiert.\p" - .string "Jedes POKéMON hat seinen eigenen\n" - .string "Charakter. Dadurch wird der Umgang\l" - .string "mit ihnen noch viel interessanter.$" + .string "POKéMON isn’t all about power.\p" + .string "Polishing a unique aspect of one’s\n" + .string "character is another way of enjoying\l" + .string "POKéMON.$" Route117_Text_1BD569:: @ 81BD569 - .string "Die POKéMON, die ich aufgezogen habe,\n" - .string "sehen gut aus. Genau wie immer.$" + .string "The POKéMON I’ve been raising are\n" + .string "looking good, just like before.$" Route117_Text_1BD5AB:: @ 81BD5AB - .string "Du weißt, wie man sie richtig aufzieht.\n" - .string "Du hast die Talente, die man in einer\l" - .string "PENSION braucht.$" + .string "You know how to raise them properly.\n" + .string "You might have DAY CARE skills...$" Route117_Text_1BD5F2:: @ 81BD5F2 - .string "Deine POKéMON entwickeln sich gut.\n" - .string "Du solltest sie zu einem WETTBEWERB\l" - .string "anmelden!$" + .string "Your POKéMON are growing good!\n" + .string "You should enter them in CONTESTS.$" Route117_Text_1BD634:: @ 81BD634 - .string "Bitte lass mich überprüfen, ob du deine\n" - .string "POKéMON auch richtig aufgezogen hast.$" + .string "Please, allow me to evaluate if you\n" + .string "have raised your POKéMON properly.$" Route117_Text_1BD67B:: @ 81BD67B - .string "Ja, sie sehen sehr gut aus...$" + .string "Yes, they are growing properly.$" Route117_Text_1BD69B:: @ 81BD69B - .string "Wenn du deinen POKéMON {POKEBLOCK}\n" - .string "gibst, entwickeln sich ihre individuellen\l" - .string "Charaktereigenschaften.$" + .string "If you feed {POKEBLOCK}S to POKéMON, the\n" + .string "unique aspects of their character\l" + .string "will be enhanced.$" Route117_Text_1BD6F2:: @ 81BD6F2 - .string "Erlaube mir, noch einmal zu prüfen, ob\n" - .string "du deine POKéMON richtig aufziehst.$" + .string "Allow me to reevaluate if you have\n" + .string "raised your POKéMON properly.$" Route117_Text_1BD733:: @ 81BD733 - .string "Sie wurden sehr, sehr gut aufgezogen...$" + .string "They are growing admirably.$" Route117_Text_1BD74F:: @ 81BD74F - .string "POKéMON mögen, abhängig von ihrem\n" - .string "Wesen, die unterschiedlichsten {POKEBLOCK}.$" + .string "POKéMON seem to like different kinds\n" + .string "of {POKEBLOCK}S, depending on their nature.$" Route117_Text_1BD79A:: @ 81BD79A - .string "Ich bin mitten in einem Triathlon. Aber\n" - .string "lass uns trotzdem kämpfen!$" + .string "I’m in the middle of a triathlon, but,\n" + .string "whatever, let’s have a battle!$" Route117_Text_1BD7E0:: @ 81BD7E0 - .string "Ich habe keine Energie mehr!$" + .string "I ran out of energy!$" Route117_Text_1BD7F5:: @ 81BD7F5 - .string "Ich habe es wohl verpatzt...\p" - .string "Ich habe in meinem letzten Kampf\n" - .string "stark nachgelassen...$" + .string "I may have blown it...\p" + .string "I might have dropped to last during\n" + .string "that battle...$" Route117_Text_1BD83F:: @ 81BD83F - .string "Ich bin mitten in einem Triathlon, liege\n" - .string "aber weit an der Spitze. Lass uns zu\l" - .string "einem schnellen Kampf antreten.$" + .string "I’m smack in the middle of a triathlon,\n" + .string "but I’m comfortably ahead.\l" + .string "Let’s make this a quick battle!$" Route117_Text_1BD8A2:: @ 81BD8A2 - .string "Ich habe schon wieder meine Energie\n" - .string "verloren!$" + .string "I ran out of energy again!$" Route117_Text_1BD8BD:: @ 81BD8BD - .string "Im Schwimmen und im Radfahren bin ich\n" - .string "unschlagbar, aber meine Leistungen in\l" - .string "POKéMON-Kämpfen sind unbefriedigend.$" + .string "I was tops in swimming and cycling, but\n" + .string "I’m not quite that confident with\l" + .string "POKéMON yet.$" Route117_Text_1BD914:: @ 81BD914 - .string "Ich trainiere mit meinem POKéMON und\n" - .string "bin mit meinen Fähigkeiten echt\l" - .string "zufrieden.$" + .string "I do my triathlon training with POKéMON,\n" + .string "so I’m pretty confident about my speed.$" Route117_Text_1BD965:: @ 81BD965 - .string "Ich glaube, ich muss wirklich mehr üben.$" + .string "I need to get more practices in,\n" + .string "I guess.$" Route117_Text_1BD98F:: @ 81BD98F - .string "Training zahlt sich nur aus, wenn man\n" - .string "regelmäßig trainiert.\p" - .string "Okay! Ich setze mein Training fort!\n" - .string "Morgen!$" + .string "Training is meaningful only if you\n" + .string "keep it up regularly.\p" + .string "Okay! I’ll resume my training!\n" + .string "Tomorrow!$" Route117_Text_1BD9F1:: @ 81BD9F1 - .string "Trainierst du auch fleißig weiter?\n" - .string "Ich trainiere sehr fleißig!\l" - .string "Ich liefere dir den Beweis.$" + .string "Are you keeping up with your training?\n" + .string "I sure am!\l" + .string "Let me show you the evidence!$" Route117_Text_1BDA41:: @ 81BDA41 - .string "Ich muss, glaube ich, doch noch mehr\n" - .string "trainieren.$" + .string "I need to get more practices in,\n" + .string "I guess.$" Route117_Text_1BDA6B:: @ 81BDA6B - .string "Ich werde mein Training morgen fort-\n" - .string "setzen. Lass uns bald wieder kämpfen!$" + .string "I’ll resume training tomorrow.\n" + .string "Let’s battle again sometime!$" Route117_Text_1BDAA7:: @ 81BDAA7 - .string "Einst war ich KÄFERSAMMLER.\n" - .string "Heute bin ich ein KÄFERFREAK!\p" - .string "Aber meine Liebe zu POKéMON hat sich\n" - .string "nicht verändert!$" + .string "Once a BUG CATCHER!\n" + .string "And now a BUG MANIAC!\p" + .string "But my love for POKéMON remains\n" + .string "unchanged!$" Route117_Text_1BDAFC:: @ 81BDAFC - .string "Meine Ungeschicktheit ist auch\n" - .string "ungebrochen...$" + .string "My ineptitude also remains\n" + .string "unchanged...$" Route117_Text_1BDB24:: @ 81BDB24 - .string "Alles, was ich getan habe, war meinem\n" - .string "Herzen zu folgen, und nun nennen sie\l" - .string "mich den KÄFERFREAK...\p" - .string "Aber ich bin ein Experte für KÄFER-\n" - .string "POKéMON, daher ist es nur natürlich,\l" - .string "dass sie mich KÄFERFREAK nennen.$" + .string "All I did was follow my heart, and now\n" + .string "they call me a BUG MANIAC...\p" + .string "Still, I am an expert on BUG POKéMON,\n" + .string "so it’s only natural that they call me\l" + .string "a BUG MANIAC.$" Route117_Text_1BDBC3:: @ 81BDBC3 - .string "IRM: Ich bin hier mit meiner hübschen\n" - .string "Junior-Studentin. Ich muss gut sein!$" + .string "ANNA: I’m with my pretty junior student\n" + .string "partner. I have to do good!$" Route117_Text_1BDC07:: @ 81BDC07 - .string "IRM: Ich bin mit meiner hübschen\n" - .string "Junior-Studentin hier. Ich wollte so\l" - .string "gerne gewinnen!$" + .string "ANNA: I’m with my pretty junior student\n" + .string "partner! Let me win!$" Route117_Text_1BDC44:: @ 81BDC44 - .string "IRM: Deine POKéMON haben einige gute\n" - .string "Kombinationen auf Lager.\p" - .string "Trotzdem bist du uns gegenüber nur\n" - .string "zweite Klasse.$" + .string "ANNA: Your POKéMON have some good\n" + .string "combinations.\p" + .string "I’d say you’re second only to us!$" Route117_Text_1BDC96:: @ 81BDC96 - .string "IRM: Wenn du gegen uns antreten willst,\n" - .string "bring zwei POKéMON mit.$" + .string "ANNA: If you want to battle us, bring\n" + .string "two POKéMON with you.$" Route117_Text_1BDCD2:: @ 81BDCD2 - .string "IDA: Ich werde mich mit meiner Super-\n" - .string "Senior-Studentin verbünden und siegen!$" + .string "MEG: I’m going to tag up with my super\n" + .string "senior student partner and beat you!$" Route117_Text_1BDD1E:: @ 81BDD1E - .string "IDA: Oh, nein! Tut mir Leid, IRM.\n" - .string "Ich habe dich im Stich gelassen.$" + .string "MEG: Oh, no!\n" + .string "I’m sorry, ANNA! I let you down...$" Route117_Text_1BDD4E:: @ 81BDD4E - .string "IDA: Ich habe IRM in eine Niederlage\n" - .string "gebracht. Ohne mich hätte sie gewonnen!$" + .string "MEG: I dragged ANNA down...\n" + .string "If I didn’t, she would have won!$" Route117_Text_1BDD8B:: @ 81BDD8B - .string "IDA: Hast du nur ein POKéMON?\n" - .string "Dann können wir nicht mit dir kämpfen.\p" - .string "Wir wollen einen 2-gegen-2-Kampf.$" + .string "MEG: Do you only have one POKéMON?\n" + .string "We can’t battle with you, then.\p" + .string "We want to have a 2-on-2 battle.$" Route117_Text_1BDDEF:: @ 81BDDEF - .string "IRM: Ich kann doch nicht ständig vor\n" - .string "meiner Junior-Partnerin verlieren...$" + .string "ANNA: I can’t keep losing in front of\n" + .string "my junior partner, right?$" Route117_Text_1BDE2F:: @ 81BDE2F - .string "IRM: Ich komme einfach nicht in Fahrt.$" + .string "ANNA: I couldn’t get into the groove.$" Route117_Text_1BDE55:: @ 81BDE55 - .string "IRM: Deine POKéMON haben einige gute\n" - .string "Kombinationen auf Lager.\p" - .string "Trotzdem bist du uns gegenüber nur\n" - .string "zweite Klasse.$" + .string "ANNA: Your POKéMON have some good\n" + .string "combinations.\p" + .string "I’d say you’re second only to us!$" Route117_Text_1BDEA7:: @ 81BDEA7 - .string "IRM: Wenn du gegen uns antreten willst,\n" - .string "brauchst du zwei POKéMON.$" + .string "ANNA: If you want to battle us, bring\n" + .string "two POKéMON with you.$" Route117_Text_1BDEE3:: @ 81BDEE3 - .string "IDA: Ich werde mich mit meiner\n" - .string "Senior-Studentin verbünden und siegen!$" + .string "MEG: I’m going to tag up with my\n" + .string "senior partner and win this time!$" Route117_Text_1BDF26:: @ 81BDF26 - .string "IDA: Viel zu stark!$" + .string "MEG: Too strong!$" Route117_Text_1BDF37:: @ 81BDF37 - .string "IDA: Ich habe mit meiner Senior-\n" - .string "Partnerin gekämpft. Wir haben verloren.\p" - .string "Das ist so entmutigend...$" + .string "MEG: I battled together with my\n" + .string "senior partner, but we lost...\p" + .string "That’s so discouraging...$" Route117_Text_1BDF90:: @ 81BDF90 - .string "IDA: Besitzt du nur ein POKéMON?\n" - .string "Dann können wir nicht kämpfen.\p" - .string "Wir wollen einen 2-gegen-2-Kampf.$" + .string "MEG: Do you only have one POKéMON?\n" + .string "We can’t battle with you, then.\p" + .string "We want to have a 2-on-2 battle.$" Route118_Text_1BDFF4:: @ 81BDFF4 - .string "Der Duft von Blumen hat eine magische\n" - .string "Kraft. Er reinigt Körper und Geist.$" + .string "The aroma of flowers has a magical\n" + .string "power. It cleanses us body and soul.$" Route118_Text_1BE03C:: @ 81BE03C - .string "Oh, du meine Güte.\n" - .string "Scheinbar habe ich verloren.$" + .string "Oh, dear me.\n" + .string "I seem to have lost.$" Route118_Text_1BE05E:: @ 81BE05E - .string "Blumen, POKéMON...\n" - .string "Ich liebe alles, was gut riecht.\p" - .string "Stinkende Dinge...\n" - .string "Bah, da muss ich passen.$" + .string "Flowers, POKéMON...\n" + .string "I love whatever smells nice.\p" + .string "Stinky things...\n" + .string "I’ll pass.$" Route118_Text_1BE0AB:: @ 81BE0AB - .string "Hat dich der süße Duft hierher\n" - .string "gebracht?$" + .string "Were you drawn here by the sweet\n" + .string "aroma?$" Route118_Text_1BE0D3:: @ 81BE0D3 - .string "Die Kraft des Duftes...\n" - .string "Sie scheint nichts zu bewirken.$" + .string "The power of aroma...\n" + .string "It didn’t seem to do much.$" Route118_Text_1BE104:: @ 81BE104 - .string "Wenn du einen süßen Duft richtig ein-\n" - .string "setzt, werden POKéMON davon\l" - .string "angezogen.$" + .string "If you use a sweet aroma properly,\n" + .string "POKéMON will be attracted by it.$" Route118_Text_1BE148:: @ 81BE148 - .string "VOGEL-POKéMON, die elegant durch die\n" - .string "Lüfte FLIEGEN... Sie sind die Besten!$" + .string "BIRD POKéMON that FLY elegantly in\n" + .string "the sky... They’re the best!$" Route118_Text_1BE188:: @ 81BE188 - .string "Argh... Das war eine Bruchlandung...$" + .string "Urgh... I crashed...$" Route118_Text_1BE19D:: @ 81BE19D - .string "Du hast großartige POKéMON.\n" - .string "Ich muss meines besser trainieren.$" + .string "You’ve got great POKéMON.\n" + .string "I’ll have to train mine better.$" Route118_Text_1BE1D7:: @ 81BE1D7 - .string "Erhebt euch!\n" - .string "Meine VOGEL-POKéMON!$" + .string "Take flight!\n" + .string "My BIRD POKéMON!$" Route118_Text_1BE1F5:: @ 81BE1F5 - .string "Sie sind abgehoben...$" + .string "They did take flight...$" Route118_Text_1BE20D:: @ 81BE20D - .string "Wenn sie erst einmal stärker geworden\n" - .string "sind, können sie auch freier fliegen.$" + .string "If they’d get stronger, they’d be able\n" + .string "to fly more freely...$" Route118_Text_1BE24A:: @ 81BE24A - .string "Ich bin ein ANGLER, aber auch ein\n" - .string "TRAINER. Ich ziehe die POKéMON auf,\l" - .string "die ich gefangen habe.$" + .string "I’m a FISHERMAN, but also a TRAINER.\n" + .string "I’m raising the POKéMON I caught.$" Route118_Text_1BE291:: @ 81BE291 - .string "Ich dachte, ich wäre gut im Training...$" + .string "I thought I was doing okay in my\n" + .string "training...$" Route118_Text_1BE2BE:: @ 81BE2BE - .string "Ich kann nicht gewinnen, wenn ich\n" - .string "POKéMON trainiere, während ich angle.\p" - .string "Habe ich alles nur halb getan?$" + .string "I couldn’t win by training POKéMON\n" + .string "while I fished...\p" + .string "Was I doing things in half measures?$" Route118_Text_1BE318:: @ 81BE318 - .string "Für ANGLER ist die Ausrüstung\n" - .string "entscheidend.\p" - .string "Aber für TRAINER sind natürlich die\n" - .string "POKéMON und das Herz entscheidend!$" + .string "For FISHERMEN, equipment is the key.\p" + .string "But for TRAINERS, the key ingredients\n" + .string "are POKéMON and heart, of course!$" Route118_Text_1BE385:: @ 81BE385 - .string "Ich wurde im Herzen geschlagen?$" + .string "I was beaten in heart?$" Route118_Text_1BE39C:: @ 81BE39C - .string "Wenn ich so darüber nachdenke, komme\n" - .string "ich zu dem Schluss, dass Angeln ein\l" - .string "Kampf zwischen ANGLER und POKéMON ist.$" + .string "Come to think of it, fishing is a battle\n" + .string "between a FISHERMAN and a POKéMON.$" Route118_Text_1BE3E8:: @ 81BE3E8 - .string "Meine Melodie wird deine Seele\n" - .string "erschüttern.$" + .string "Let my melody rock your soul!$" Route118_Text_1BE406:: @ 81BE406 .string "La-lalala...$" Route118_Text_1BE413:: @ 81BE413 - .string "Eine E-Gitarre muss nicht immer laut\n" - .string "sein...\p" - .string "Sie kann auch so gespielt werden, dass\n" - .string "eine herzergreifende Melodie erklingt...$" + .string "An electric guitar doesn’t always\n" + .string "have to be noisy...\p" + .string "It can be strummed to squeeze out\n" + .string "this heart-stirring melody...$" Route118_Text_1BE489:: @ 81BE489 - .string "Eine Melodie von meinen POKéMON und mir.\n" - .string "Lass sie uns deiner Seele schenken.$" + .string "A melody from my POKéMON and me...\n" + .string "Let us deliver it to your soul.$" Route118_Text_1BE4CC:: @ 81BE4CC .string "La-lalala...$" Route118_Text_1BE4D9:: @ 81BE4D9 - .string "Wenn ich spiele, sollten dich meine Ge-\n" - .string "fühle über meine E-Gitarre erreichen...$" + .string "When I play, my emotions should reach\n" + .string "you through my electric guitar...$" Route119_Text_1BE521:: @ 81BE521 - .string "Wir gehören zum Mimikry-Zirkel!\n" - .string "Wir ahmen nach, was du machst!$" + .string "We’re the MIMIC CIRCLE!\n" + .string "We MIMIC what you do!$" Route119_Text_1BE54F:: @ 81BE54F - .string "Huupsie!\n" - .string "Ich habe verloren!$" + .string "Whoopsie!\n" + .string "I lost!$" Route119_Text_1BE561:: @ 81BE561 - .string "Was so toll an Mimikry sein soll?\p" - .string "Hähähä...\n" - .string "Das wirst du nie verstehen...$" + .string "What’s so good about mimicry?\p" + .string "Fufufu...\n" + .string "You’ll never understand...$" Route119_Text_1BE5A4:: @ 81BE5A4 - .string "So trifft man sich! Meine KÄFER-POKéMON\n" - .string "leisten dir Gesellschaft!$" + .string "So, we finally meet!\n" + .string "My BUG POKéMON will keep you company!$" Route119_Text_1BE5DF:: @ 81BE5DF - .string "Ich wünschte, wir hätten uns nie\n" - .string "getroffen...$" + .string "I wish we’d never met...$" Route119_Text_1BE5F8:: @ 81BE5F8 - .string "Ich möchte noch Mimikry bei dir an-\n" - .string "wenden.\p" - .string "Kannst du dich mal ein bisschen\n" - .string "bewegen?$" + .string "I want to MIMIC you some more.\p" + .string "Can you hurry up and move?$" Route119_Text_1BE632:: @ 81BE632 - .string "Trittst du einen Schritt vor, treten wir\n" - .string "auch einen Schritt vor.\p" - .string "Drehst du dich nach rechts, drehen wir\n" - .string "uns auch nach rechts...$" + .string "If you step forward, we step forward.\p" + .string "If you turn right, we turn, too...$" Route119_Text_1BE67B:: @ 81BE67B - .string "Aber wenn du gewinnst, verliere ich...$" + .string "But if you win, I lose...$" Route119_Text_1BE695:: @ 81BE695 - .string "Ich kann nicht mit Mimikry nachahmen,\n" - .string "wie du den Kampf gewinnst. Unmöglich!\l" - .string "Das lässt mich kochen vor Wut.$" + .string "I can’t MIMIC you winning the match.\n" + .string "That’s just impossible...\l" + .string "It’s burning me up...$" Route119_Text_1BE6EA:: @ 81BE6EA - .string "Hey, geschafft! Du hast mich gefunden!\n" - .string "Oder wolltest du mir ausweichen?$" + .string "Yep, you’ve finally caught me!\n" + .string "Or were you trying to avoid me?$" Route119_Text_1BE729:: @ 81BE729 - .string "Hui, was für ein großartiger Kampf!$" + .string "Whoop, that was a great match!$" Route119_Text_1BE748:: @ 81BE748 - .string "Wir sind der Mimikry-Zirkel! Ich\n" - .string "hoffe, dir gefiel unsere Vorstellung!$" + .string "We’re the MIMIC CIRCLE!\n" + .string "I hope you enjoyed our performance.$" Route119_Text_1BE784:: @ 81BE784 - .string "Du weißt nicht, wer ich bin, stimmt’s?\p" - .string "Aber... Ich kenne dich auch nicht.\n" - .string "Lass uns kämpfen.$" + .string "You don’t know who I am, do you?\p" + .string "But, I also don’t know you.\n" + .string "So, we’ll battle!$" Route119_Text_1BE7D3:: @ 81BE7D3 - .string "Du bist ganz schön stark!$" + .string "You’re pretty strong!$" Route119_Text_1BE7E9:: @ 81BE7E9 - .string "Solange du hier bist, werden wir jede\n" - .string "deiner Bewegungen nachahmen.$" + .string "Until you go away somewhere, we’ll\n" + .string "keep on mimicking your every move.$" Route119_Text_1BE82F:: @ 81BE82F - .string "Der Mimikry-Zirkel wurde von Leuten\n" - .string "gegründet, die die Mimikry lieben.\p" - .string "Der Kampf beginnt, sobald wir aufei-\n" - .string "nander treffen!$" + .string "The MIMIC CIRCLE was formed by people\n" + .string "who like to MIMIC.\p" + .string "A battle starts the instant we meet!$" Route119_Text_1BE88D:: @ 81BE88D - .string "Ich gebe auf!$" + .string "I surrender!$" Route119_Text_1BE89A:: @ 81BE89A - .string "Möchtest du nicht dem Mimikry-Zirkel\n" - .string "beitreten?$" + .string "Won’t you join our MIMIC CIRCLE?$" Route119_Text_1BE8BB:: @ 81BE8BB - .string "Wer besitzt das Wissen und die Technik,\n" - .string "um zu überleben?\p" - .string "Das sind die POKéMON-RANGER!$" + .string "Who has the knowledge and the\n" + .string "technique for survival?\p" + .string "POKéMON RANGERS, that’s who!$" Route119_Text_1BE90E:: @ 81BE90E - .string "Ich besitze nicht genügend Wissen über\n" - .string "POKéMON...$" + .string "I didn’t have enough POKéMON\n" + .string "know-how...$" Route119_Text_1BE937:: @ 81BE937 - .string "Aus der Zivilisation ausbrechen und die\n" - .string "wilde Natur in uns erwecken!\p" - .string "Das ist unsere Vision.$" + .string "To break away from civilization and\n" + .string "awaken the wild spirit within!\p" + .string "That’s our vision.$" Route119_Text_1BE98D:: @ 81BE98D - .string "Meine wilde Natur regt sich in mir, wenn\n" - .string "ich mit POKéMON zusammen bin.$" + .string "I’m going to regain my wild spirit by\n" + .string "being together with POKéMON.$" Route119_Text_1BE9D0:: @ 81BE9D0 - .string "Du bist immer noch sehr stark!$" + .string "You’ve remained strong!$" Route119_Text_1BE9E8:: @ 81BE9E8 - .string "Glaube an deine POKéMON.\n" - .string "Glaube an dich.\p" - .string "Dein Weg eröffnet sich von selbst.$" + .string "Believe in your POKéMON.\n" + .string "Believe in yourself.\p" + .string "The road will reveal itself to you.$" Route119_Text_1BEA3A:: @ 81BEA3A - .string "Oh! Schau dich nur an!\p" - .string "Für einen Abenteurer hast du\n" - .string "sehr leichtes Gepäck dabei!$" + .string "Oh? Look at you.\p" + .string "For someone on an adventure, you’re\n" + .string "traveling awfully light.$" Route119_Text_1BEA88:: @ 81BEA88 - .string "Unfälle passieren immer dann, wenn du\n" - .string "nicht damit rechnest!$" + .string "Accidents happen when you’re not\n" + .string "prepared!$" Route119_Text_1BEAB3:: @ 81BEAB3 - .string "Du hast leichtes Gepäck, aber alles, was\n" - .string "du brauchst dabei.\p" - .string "Du bist an der Spitze deiner geistigen\n" - .string "und körperlichen Kraft angekommen.$" + .string "You’re traveling light but you have\n" + .string "everything you need.\p" + .string "You’re on top of things mentally and\n" + .string "physically, too.$" Route119_Text_1BEB22:: @ 81BEB22 - .string "Wie läuft es auf deiner Reise mit den\n" - .string "POKéMON?$" + .string "How’s your journey with POKéMON\n" + .string "going?$" Route119_Text_1BEB49:: @ 81BEB49 - .string "Bei mir fehlt irgendetwas...$" + .string "I’m still missing something...$" Route119_Text_1BEB68:: @ 81BEB68 - .string "So wie du als TRAINER deinen POKéMON\n" - .string "vertraust, vertrauen dir deine POKéMON.$" + .string "In the same way that you, as a TRAINER,\n" + .string "rely on your POKéMON, your POKéMON\l" + .string "rely on you.$" Route119_Text_1BEBC0:: @ 81BEBC0 - .string "Die Weiten des Himmels strahlen die Aura\n" - .string "unausgesprochener Versprechen ab.\p" - .string "Nichts ist vergleichbar mit dem\n" - .string "absoluten Glück des Fliegens!$" + .string "The vast sky holds untold promise!\p" + .string "Nothing can compare to the sheer\n" + .string "exhilaration of flight!$" Route119_Text_1BEC1C:: @ 81BEC1C - .string "Abgewürgt und abgestürzt.$" + .string "Down and out!$" Route119_Text_1BEC2A:: @ 81BEC2A - .string "Meine VOGEL-POKéMON lassen den Traum\n" - .string "vom Fliegen für mich wahr werden!$" + .string "My BIRD POKéMON made my dreams of\n" + .string "flying come true!$" Route119_Text_1BEC5E:: @ 81BEC5E - .string "Ich zeige dir meine wahre Stärke und\n" - .string "die meiner VOGEL-POKéMON!$" + .string "I’ll show you the true potential of me\n" + .string "and my BIRD POKéMON!$" Route119_Text_1BEC9A:: @ 81BEC9A - .string "Uns fehlt es an Potential...$" + .string "We lacked potential...$" Route119_Text_1BECB1:: @ 81BECB1 - .string "Schon als kleines Kind habe ich VOGEL-\n" - .string "POKéMON geliebt...$" + .string "Ever since I was a little kid, I always\n" + .string "admired BIRD POKéMON...$" Route119_Text_1BECF1:: @ 81BECF1 - .string "Ich lauere in den Schatten und lebe in\n" - .string "der Dunkelheit... Das ist mein Schicksal.\p" - .string "Ich tauche auf, um dich heraus-\n" - .string "zufordern!$" + .string "To lurk in shadows, and live in\n" + .string "darkness... That is my destiny.\p" + .string "I emerge to challenge you!$" Route119_Text_1BED4C:: @ 81BED4C - .string "Ich gestehe meine Niederlage ein.$" + .string "I admit defeat!$" Route119_Text_1BED5C:: @ 81BED5C - .string "Die, die im Kampf geschlagen wurden,\n" - .string "verschwinden lautlos in der Dunkelheit.\l" - .string "Auch das ist Schicksal...$" + .string "Those defeated in battle withdraw\n" + .string "quietly back into the shadows.\l" + .string "That, too, is destiny...$" Route119_Text_1BEDB6:: @ 81BEDB6 - .string "Wenn du nicht auf deine Deckung auf-\n" - .string "passt, kommt der Schmerz zu dir!$" + .string "If you’re not on your guard, you’re in\n" + .string "for some pain!$" Route119_Text_1BEDEC:: @ 81BEDEC - .string "Du bist überraschend gut!$" + .string "You’re surprisingly good!$" Route119_Text_1BEE06:: @ 81BEE06 - .string "Mein Überraschungsangriff endete in\n" - .string "einer Niederlage...$" + .string "My surprise attack ended in\n" + .string "failure...$" Route119_Text_1BEE2D:: @ 81BEE2D - .string "Um einen Baum zu verstecken, nutze den\n" - .string "Wald!$" + .string "To hide a tree, use a forest!$" Route119_Text_1BEE4B:: @ 81BEE4B - .string "Ich verneige mich vor deiner Stärke.$" + .string "I bow to your superiority.$" Route119_Text_1BEE66:: @ 81BEE66 - .string "Um einen Baum zu verstecken, nutze den\n" - .string "Wald. Um ein POKéMON zu verstecken,\l" - .string "nutze ein POKéMON!\p" - .string "Dahinter steckt keine tiefere\n" - .string "Bedeutung.$" + .string "To hide a tree, use a forest!\n" + .string "To hide a POKéMON, use a POKéMON!\p" + .string "There is no deep, hidden meaning\n" + .string "to that.$" Route119_Text_1BEED0:: @ 81BEED0 - .string "Du hast mich angesprochen...\n" - .string "Also willst du mit mir kämpfen!\p" - .string "Sicher! Ich will das POKéMON einsetzen,\n" - .string "das ich gefangen habe, als ich SURFER\l" - .string "einsetzte.$" + .string "You spoke to me...\n" + .string "So you want to challenge me!\p" + .string "Sure! I’ll try out the POKéMON I caught\n" + .string "while SURFING!$" Route119_Text_1BEF37:: @ 81BEF37 - .string "Ich habe keine Ahnung, was verlangt\n" - .string "wird, um zu gewinnen.$" + .string "I don’t have a clue about what it\n" + .string "takes to win.$" Route119_Text_1BEF67:: @ 81BEF67 - .string "Nutze ein POKéMON als SURFER...\p" - .string "Dann angle von seinem Rücken aus...\p" - .string "Ein äußerst angenehmer Zeitvertreib!$" + .string "Go for a SURF on my POKéMON...\p" + .string "Then fish off its back...\p" + .string "It’s an indescribably luxuriant moment!$" Route120_Text_1BEFC8:: @ 81BEFC8 - .string "Hast du Attacken auf Lager, die ein\n" - .string "fliegendes POKéMON schlagen können?$" + .string "Do you have any moves that can strike\n" + .string "a flying POKéMON?$" Route120_Text_1BF000:: @ 81BF000 - .string "Du bist mir überlegen!$" + .string "You soared above me!$" Route120_Text_1BF015:: @ 81BF015 - .string "Die Attacke FLIEGEN ist sehr praktisch,\n" - .string "meinst du nicht auch?\p" - .string "Wenn ein POKéMON fliegt, kann ihm fast\n" - .string "keine Attacke Schaden zufügen.$" + .string "The move FLY is convenient, don’t\n" + .string "you think?\p" + .string "While the POKéMON is flying, almost\n" + .string "no moves can strike it.$" Route120_Text_1BF07E:: @ 81BF07E - .string "Mein POKéMON ist stark!\n" - .string "Wie sieht es mit deinen aus?$" + .string "My POKéMON is strong!\n" + .string "How about yours?$" Route120_Text_1BF0A5:: @ 81BF0A5 - .string "Deine POKéMON sind stärker...$" + .string "Your POKéMON were stronger...$" Route120_Text_1BF0C3:: @ 81BF0C3 - .string "Ein POKéMON, das beständig wächst, ist\n" - .string "absolut zuverlässig...$" + .string "A POKéMON that grows steadily is one\n" + .string "you can count on.$" Route120_Text_1BF0FA:: @ 81BF0FA - .string "Ein POKéMON, das beständig wächst, ist\n" - .string "absolut zuverlässig...$" + .string "A POKéMON that grows steadily is one\n" + .string "you can count on.$" Route120_Text_1BF131:: @ 81BF131 - .string "Deine POKéMON sind enorm stark.$" + .string "Your POKéMON are seriously strong.$" Route120_Text_1BF154:: @ 81BF154 - .string "Meine POKéMON werden immer stärker.\n" - .string "Ich muss auch immer stärker werden.$" + .string "My POKéMON are growing stronger.\n" + .string "I have to grow stronger, too.$" Route120_Text_1BF193:: @ 81BF193 - .string "Ich prüfe deine POKéMON und schaue, ob\n" - .string "sie fit für das Leben im Freien sind.$" + .string "I’ll check your POKéMON and see if\n" + .string "they’re fit for the outdoors.$" Route120_Text_1BF1D4:: @ 81BF1D4 - .string "Mit solch starken POKéMON brauchst du\n" - .string "in der Natur keine Angst zu haben.$" + .string "With POKéMON that strong, you’re in\n" + .string "no danger of needing rescue!$" Route120_Text_1BF215:: @ 81BF215 - .string "Mit POKéMON dorthin zu reisen, wohin\n" - .string "man auch immer will... Das ist das\l" - .string "Schöne an einem Leben als TRAINER.$" + .string "To travel wherever your heart desires\n" + .string "with POKéMON...\l" + .string "That’s the joy of being a TRAINER.$" Route120_Text_1BF26E:: @ 81BF26E - .string "Wie sieht es mit deiner Fitness aus?\n" - .string "Wenn du nicht fit bist, könnten \l" - .string "harte Zeiten auf dich zukommen.$" + .string "How’s your physical fitness?\n" + .string "If you’re not fit, you could have a\l" + .string "rough time in critical situations.$" Route120_Text_1BF2D2:: @ 81BF2D2 - .string "Ich bin fit wie ein Turnschuh, aber...$" + .string "I’m totally fit, but...$" Route120_Text_1BF2EA:: @ 81BF2EA - .string "Fitnesstraining gehört zu meinem\n" - .string "Leben. Ich laufe mit meinen POKéMON.$" + .string "Fitness training is in my routine.\n" + .string "I always run with my POKéMON.$" Route120_Text_1BF32B:: @ 81BF32B .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "Kampf gefällig?$" + .string "Want to battle?$" Route120_Text_1BF36B:: @ 81BF36B .string "... ... ... ... ... ...\n" - .string "Ich habe verloren...$" + .string "I lost...$" Route120_Text_1BF38D:: @ 81BF38D .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "Muss mich mehr anstrengen...$" + .string "I’ll try harder...$" Route120_Text_1BF3D0:: @ 81BF3D0 .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "Noch ein Kampf gefällig?$" + .string "Want to battle again?$" Route120_Text_1BF416:: @ 81BF416 .string "... ... ... ... ... ...\n" - .string "Ich habe wieder verloren...$" + .string "I lost again...$" Route120_Text_1BF43E:: @ 81BF43E .string "... ... ... ... ... ...\n" .string "... ... ... ... ... ...\l" - .string "Ich werde mich mehr anstrengen...\l" - .string "Für meine kostbaren KÄFER-POKéMON...$" + .string "I’ll try harder...\l" + .string "For my precious BUG POKéMON...$" Route120_Text_1BF4A0:: @ 81BF4A0 - .string "POKéMON haben viele spezielle Fähig-\n" - .string "keiten. Wenn du ein klasse TRAINER\l" - .string "werden willst, lerne etwas darüber.$" + .string "POKéMON have many special abilities.\n" + .string "If you want to become a first-class\l" + .string "TRAINER, learn about them.$" Route120_Text_1BF504:: @ 81BF504 - .string "Du setzt offensichtlich dein Gehirn ein.$" + .string "You’re obviously thinking.$" Route120_Text_1BF51F:: @ 81BF51F - .string "Die speziellen Fähigkeiten eines\n" - .string "POKéMON bestimmen den Kampfstil.$" + .string "The special abilities of POKéMON\n" + .string "will make battle styles change.$" Route120_Text_1BF560:: @ 81BF560 - .string "Wer magst du sein?\p" - .string "Suchst du etwa nach antiken Ruinen,\n" - .string "von denen die Legende sagt, sie\l" - .string "seien hier zu finden?$" + .string "Who might you be?\p" + .string "Are you perhaps searching for ancient\n" + .string "ruins that are rumored to possibly\l" + .string "exist according to legend?$" Route120_Text_1BF5D6:: @ 81BF5D6 - .string "Was für ein erbärmlicher Rückschritt...$" + .string "What a disgraceful setback...$" Route120_Text_1BF5F4:: @ 81BF5F4 - .string "Dieser gigantische Felsen... Ich würde\n" - .string "zu gerne glauben, er enthielte antike\l" - .string "Schätze. Aber ich sehe keinen Eingang.$" + .string "That giant rock... I would like to\n" + .string "believe it may indeed contain ancient\l" + .string "ruins. But I see no entrance.$" Route120_Text_1BF65B:: @ 81BF65B - .string "Warum ich diesen Schirm trage?\p" - .string "Das verrate ich dir, wenn du mich\n" - .string "besiegen kannst.$" + .string "Why am I carrying this parasol?\p" + .string "I’ll tell you if you can win against me.$" Route120_Text_1BF6A4:: @ 81BF6A4 - .string "Ein Schirm kann nicht vor den Attacken\n" - .string "der POKéMON schützen...$" + .string "A parasol can’t ward off POKéMON\n" + .string "attacks...$" Route120_Text_1BF6D0:: @ 81BF6D0 - .string "Ich glaube nicht, dass starkes Sonnen-\n" - .string "licht gut für meine POKéMON ist.\l" - .string "Daher schütze ich sie mit meinem Schirm.$" + .string "I don’t think strong sunlight is good\n" + .string "for my POKéMON.\l" + .string "So I shield them with my parasol.$" Route120_Text_1BF728:: @ 81BF728 - .string "Mein Schirm, mein POKéMON und ich...\p" - .string "Würde eines dieser Elemente fehlen,\n" - .string "wäre dieses Bild der Schönheit ruiniert.$" + .string "Me, POKéMON, and my parasol...\p" + .string "If any one of them is missing, the\n" + .string "picture of beauty will be ruined.$" Route120_Text_1BF78C:: @ 81BF78C - .string "Du hast das Bild der Schönheit ruiniert!$" + .string "You’ve completely ruined my beauty...$" Route120_Text_1BF7B2:: @ 81BF7B2 - .string "Mein Schirm würde dir überhaupt nicht\n" - .string "stehen.\p" - .string "Er wäre dir sogar hinderlich.$" + .string "A parasol wouldn’t suit you at all.\p" + .string "Why, something like this would only\n" + .string "get in your way.$" Route120_Text_1BF80B:: @ 81BF80B - .string "Ich werde die Techniken der POKéMON\n" - .string "übernehmen und neue Ninja-Techniken\l" - .string "daraus entwickeln.$" + .string "I will adopt the movements of POKéMON\n" + .string "and create new ninja techniques.$" Route120_Text_1BF852:: @ 81BF852 - .string "Die Entwicklung neuer Ninja-Techniken\n" - .string "bleibt ein Traum...$" + .string "The creation of new ninja techniques\n" + .string "is but a distant dream...$" Route120_Text_1BF891:: @ 81BF891 - .string "Vielleicht sollte ich unter einem Ninja-\n" - .string "Meister lernen...$" + .string "Perhaps I ought to apprentice under\n" + .string "a ninja sensei.$" Route120_Text_1BF8C5:: @ 81BF8C5 - .string "Wir Ninja verbergen uns unter unseren\n" - .string "Tarnmänteln. Ich wette, du wusstest\l" - .string "nicht, wo ich versteckt war!$" + .string "We ninja conceal ourselves under our\n" + .string "camouflage cloaks.\l" + .string "I bet you didn’t know where I was!$" Route120_Text_1BF920:: @ 81BF920 - .string "Ich habe verloren! Ich wünschte, mein\n" - .string "Tarnmantel würde meine Schande tarnen.$" + .string "I lost!\n" + .string "I should camouflage my shame!$" Route120_Text_1BF946:: @ 81BF946 - .string "Unsere Tarnmäntel sind alle handge-\n" - .string "arbeitet.$" + .string "Our camouflage cloaks are all\n" + .string "handmade.$" Route121_Text_1BF96E:: @ 81BF96E - .string "Möchtest du mit meinem wunderhübschen\n" - .string "POKéMON spielen?$" + .string "Will you play with my delightfully\n" + .string "pretty POKéMON?$" Route121_Text_1BF9A1:: @ 81BF9A1 - .string "So habe ich das aber nicht gemeint!$" + .string "This isn’t what I meant!$" Route121_Text_1BF9BA:: @ 81BF9BA - .string "Ich gehe zu einem WETTBEWERB in\n" - .string "SEEGRASULB CITY.\p" - .string "Mein POKéMON sollte kein Problem haben,\n" - .string "in der MASTER-KLASSE zu glänzen.$" + .string "I’m going to a CONTEST in LILYCOVE.\p" + .string "My POKéMON should have no problem\n" + .string "sweeping the MASTER CLASS.$" Route121_Text_1BFA1B:: @ 81BFA1B - .string "Mit meinem POKéMON habe ich alle vier\n" - .string "Ecken der Welt bereist.\p" - .string "Man könnte sagen, dass ich viel\n" - .string "Vertrauen in mein Können habe.$" + .string "With my POKéMON, I have traveled the\n" + .string "world’s four corners.\p" + .string "You might say I have some confidence\n" + .string "in my abilities.$" Route121_Text_1BFA8C:: @ 81BFA8C - .string "Ah, gut gespielt.$" + .string "Ah, well played.$" Route121_Text_1BFA9D:: @ 81BFA9D - .string "Ich möchte noch einmal die Welt mit\n" - .string "meinem POKéMON umrunden.$" + .string "I would like to circle the globe once\n" + .string "again with my POKéMON.$" Route121_Text_1BFADA:: @ 81BFADA - .string "Mit meinem POKéMON habe ich erneut die\n" - .string "vier Ecken der Welt bereist.\p" - .string "Ich habe noch größeres Vertrauen in\n" - .string "meine Fähigkeiten.$" + .string "With my POKéMON, I have traveled the\n" + .string "world’s four corners.\p" + .string "You might say I have some confidence\n" + .string "in my abilities.$" Route121_Text_1BFB4B:: @ 81BFB4B - .string "Ah, gut gespielt.$" + .string "Ah, well played.$" Route121_Text_1BFB5C:: @ 81BFB5C - .string "Deine POKéMON und du...\p" - .string "Eure Fähigkeiten werden auch in\n" - .string "Übersee als außerordentlich angesehen.$" + .string "Your POKéMON and you...\p" + .string "Your prowess together will be\n" + .string "considered strong, even overseas.$" Route121_Text_1BFBB4:: @ 81BFBB4 - .string "Auf der Welt gibt es Dinge, die jenseits\n" - .string "deines Verständnisses liegen...$" + .string "There are powers beyond our\n" + .string "understanding in the world...$" Route121_Text_1BFBEE:: @ 81BFBEE - .string "Ich habe verloren...$" + .string "I have lost...$" Route121_Text_1BFBFD:: @ 81BFBFD - .string "PYROBERG...\n" - .string "Dort ist eine geheimnisvolle Kraft am\l" - .string "Werk...$" + .string "MT. PYRE...\n" + .string "There is a mysterious power\l" + .string "at work there...$" Route121_Text_1BFC36:: @ 81BFC36 - .string "EVA: Zusammen sind wir furchtlos!\n" - .string "Wir demonstrieren dir unsere Stärke!$" + .string "KATE: Together, we’re fearless!\n" + .string "We’ll demonstrate how tough we are!$" Route121_Text_1BFC7A:: @ 81BFC7A - .string "EVA: Ich habe vor den Augen meiner\n" - .string "Juniorpartnerin versagt...$" + .string "KATE: I blew it in front of my junior\n" + .string "student partner...$" Route121_Text_1BFCB3:: @ 81BFCB3 - .string "EVA: Wenn sich jemand auf mich\n" - .string "verlässt, versuche ich ihm gegenüber\l" - .string "immer cool aufzutreten...$" + .string "KATE: When someone’s relying on me,\n" + .string "I get this urge to look cool in front\l" + .string "of them...$" Route121_Text_1BFD08:: @ 81BFD08 - .string "EVA: Wenn du nur ein POKéMON hast,\n" - .string "können wir nicht mit dir kämpfen.\p" - .string "Das wäre äußerst unfair.$" + .string "KATE: If you’ve only got one POKéMON,\n" + .string "we can’t battle with you.\p" + .string "That would be bullying.$" Route121_Text_1BFD60:: @ 81BFD60 - .string "UTE: Zusammen sind wir furchtlos!\n" - .string "Wir demonstrieren dir unsere Stärke!$" + .string "JOY: Together, we’re fearless!\n" + .string "We’ll demonstrate how tough we are!$" Route121_Text_1BFDA3:: @ 81BFDA3 - .string "UTE: Bitte vergib mir, EVA!$" + .string "JOY: Please forgive me, KATE!$" Route121_Text_1BFDC1:: @ 81BFDC1 - .string "UTE: Ehehehe, ich muss wohl noch etwas\n" - .string "mit meiner Seniorpartnerin trainieren.$" + .string "JOY: Ehehe, I’ll have to train with KATE,\n" + .string "my senior student partner, again.$" Route121_Text_1BFE0D:: @ 81BFE0D - .string "UTE: Du brauchst mindestens zwei\n" - .string "POKéMON, um gegen uns zu kämpfen.$" + .string "JOY: You need at least two POKéMON\n" + .string "if you’re going to challenge us!$" Route121_Text_1BFE51:: @ 81BFE51 - .string "Stopp! Schau dir meine wunderbaren\n" - .string "POKéMON gut an!$" + .string "Stop! Have a good look at my precious\n" + .string "POKéMON!$" Route121_Text_1BFE80:: @ 81BFE80 - .string "Oh, wie konntest du nur! Nimm die\n" - .string "Sache doch nicht gleich so ernst!$" + .string "Oh, how dare you!\n" + .string "Don’t take it so seriously!$" Route121_Text_1BFEAE:: @ 81BFEAE - .string "Vielleicht werde ich in die SAFARI-ZONE\n" - .string "gehen und mehr POKéMON fangen!$" + .string "Maybe I’ll go catch more POKéMON at\n" + .string "the SAFARI.$" Route121_Text_1BFEDE:: @ 81BFEDE - .string "Meine wertvollen POKéMON sind ge-\n" - .string "wachsen! Schau mal!$" + .string "My precious POKéMON grew!\n" + .string "Have a good look!$" Route121_Text_1BFF0A:: @ 81BFF0A - .string "Oh, du hast es wieder getan!\n" - .string "Du nimmst es wirklich zu ernst!$" + .string "Oh, how dare you!\n" + .string "You still won’t take it easy!$" Route121_Text_1BFF3A:: @ 81BFF3A - .string "Ich werde wohl wieder in die SAFARI-\n" - .string "ZONE gehen und POKéMON fangen.$" + .string "Maybe I’ll go catch more POKéMON at\n" + .string "the SAFARI.$" Route123_Text_1BFF6A:: @ 81BFF6A - .string "Möchtest du wissen, wie stark du bist?\n" - .string "Ich werde dich testen!$" + .string "Want to determine how strong you are?\n" + .string "I’ll be the test!$" Route123_Text_1BFFA2:: @ 81BFFA2 - .string "Du hast glänzend abgeschnitten!$" + .string "You passed with flying colors!$" Route123_Text_1BFFC1:: @ 81BFFC1 - .string "Um gegen mich bestehen zu können...\n" - .string "Deine Stärke ist einfach unglaublich!$" + .string "To best even me...\n" + .string "Your strength is marvelous!$" Route123_Text_1BFFF0:: @ 81BFFF0 - .string "Du hast da aber eine große Sammlung an\n" - .string "ORDEN der verschiedenen ARENEN!\p" - .string "Zeig mir, dass du diese ORDEN auch\n" - .string "zu Recht trägst!$" + .string "You seem to have a big collection\n" + .string "of GYM BADGES.\p" + .string "Let me see if you’re actually worthy of\n" + .string "those BADGES!$" Route123_Text_1C0057:: @ 81C0057 - .string "Oh, du bist ihrer würdig, wirklich!$" + .string "Oh, you’re worthy, all right!$" Route123_Text_1C0075:: @ 81C0075 - .string "Du wurdest deinen ORDEN in diesem\n" - .string "Kampf mehr als gerecht.$" + .string "You did your BADGES proud in that\n" + .string "match!$" Route123_Text_1C009E:: @ 81C009E - .string "Man sagt, dass gute Zeiten auch mit\n" - .string "guten Aromen erfüllt sind.$" + .string "They say that good times are filled\n" + .string "with good aromas.$" Route123_Text_1C00D4:: @ 81C00D4 - .string "Oh... Ich rieche den bitteren Geruch\n" - .string "der Niederlage...$" + .string "Oh...\n" + .string "I smell the bitter scent of misery...$" Route123_Text_1C0100:: @ 81C0100 - .string "Der Garten des BEERENMEISTERS ist\n" - .string "erfüllt mit den erhebendsten Aromen.$" + .string "The BERRY MASTER’s garden is filled\n" + .string "with uplifting fragrances.$" Route123_Text_1C013F:: @ 81C013F - .string "Ein Psycho zu sein ist eine Frage des\n" - .string "Willens.\p" - .string "Mein Wille will gegen niemanden verlieren.\n" - .string "Das macht mich stark.$" + .string "Being a psychic is about willpower.\p" + .string "I’ve willed myself not to lose to\n" + .string "anyone. That makes me strong!$" Route123_Text_1C01A3:: @ 81C01A3 - .string "Mir ist schlecht...$" + .string "I feel sad...$" Route123_Text_1C01B1:: @ 81C01B1 - .string "Es ist alles eine Frage des Willens. Ich\n" - .string "dachte, ich würde gegen dich gewinnen.$" + .string "Being a psychic is about willpower.\n" + .string "I thought I wouldn’t lose to you...$" Route123_Text_1C01F9:: @ 81C01F9 - .string "Ich habe mich selbst davon überzeugt,\n" - .string "dass ich einfach nicht verlieren werde.$" + .string "I’ve convinced myself that I won’t\n" + .string "lose anymore. That makes me strong!$" Route123_Text_1C0240:: @ 81C0240 - .string "So überzeugend war das gar nicht...$" + .string "I feel sad...$" Route123_Text_1C024E:: @ 81C024E - .string "Ich sollte am PYROBERG trainieren...\n" - .string "So werde ich dich nie schlagen...$" + .string "I should train at MT. PYRE...\n" + .string "I’ll never beat you this way...$" Route123_Text_1C028C:: @ 81C028C - .string "Sei nicht zu erfreut, wenn deine\n" - .string "POKéMON Psychokräfte entwickeln.\p" - .string "Du musst diese Kräfte modellieren,\n" - .string "um sie sinnvoll einsetzen zu können.$" + .string "Don’t be too happy if your POKéMON\n" + .string "develop psychic powers.\p" + .string "You need to refine those powers to\n" + .string "make them really useful.$" Route123_Text_1C0303:: @ 81C0303 - .string "Erstaunlich!$" + .string "Astounding!$" Route123_Text_1C030F:: @ 81C030F - .string "Wir alle besitzen Psychokräfte. Wir\n" - .string "haben nur vergessen, sie zu nutzen.$" + .string "We all have psychic powers.\n" + .string "We’ve just forgotten how to use them.$" Route123_Text_1C0351:: @ 81C0351 - .string "Hast du die Psychokräfte in dir\n" - .string "erweckt?$" + .string "Have you awoken the psychic powers\n" + .string "within you?$" Route123_Text_1C0380:: @ 81C0380 - .string "Erstaunlich!$" + .string "Astounding!$" Route123_Text_1C038C:: @ 81C038C - .string "Dein Einfluss auf deine POKéMON...\n" - .string "Auch das sind Psychokräfte.$" + .string "Your power with POKéMON...\n" + .string "That could be a psychic power, too.$" Route123_Text_1C03CB:: @ 81C03CB - .string "LEA: Hallo, TRAINER. Ich hoffe, deine\n" - .string "POKéMON fangen nicht an zu weinen,\l" - .string "wenn sie verlieren.$" + .string "MIU: Hello, TRAINER. I hope your\n" + .string "POKéMON won’t cry when they lose.$" Route123_Text_1C040E:: @ 81C040E - .string "LEA: Oh oh, wir haben verloren.$" + .string "MIU: Uh-oh, we lost.$" Route123_Text_1C0423:: @ 81C0423 - .string "LEA: TRAINER, deine POKéMON sind stark,\n" - .string "weil ihr eine starke Freundschaft teilt.$" + .string "MIU: TRAINER, your POKéMON are\n" + .string "strong because you are friends.$" Route123_Text_1C0462:: @ 81C0462 - .string "LEA: Es macht keinen Spaß, wenn du\n" - .string "weniger als zwei POKéMON hast.$" + .string "MIU: It’s no fun to battle if you\n" + .string "don’t have two POKéMON.$" Route123_Text_1C049C:: @ 81C049C - .string "GRIT: Okay!\n" - .string "Wir schlagen die POKéMON des TRAINERS.$" + .string "YUKI: Okay!\n" + .string "We’re beating the TRAINER’s POKéMON!$" Route123_Text_1C04CD:: @ 81C04CD - .string "GRIT: Oh oh. Wir haben verloren...$" + .string "YUKI: Uh-oh, we lost.$" Route123_Text_1C04E3:: @ 81C04E3 - .string "GRIT: Wieso bist du so stark?\n" - .string "Wir haben bisher noch nie verloren!$" + .string "YUKI: Why are you so strong?\n" + .string "We’ve never lost before.$" Route123_Text_1C0519:: @ 81C0519 - .string "GRIT: Es macht keinen Spaß, wenn du\n" - .string "weniger als zwei POKéMON hast.$" + .string "YUKI: It’s no fun to battle if you\n" + .string "don’t have two POKéMON.$" Route123_Text_1C0554:: @ 81C0554 - .string "PYROBERG...\n" - .string "Wo die Geister der POKéMON ruhen...\l" - .string "Ruhen deine POKéMON auch?$" + .string "MT. PYRE...\n" + .string "Where the spirits of POKéMON sleep...\l" + .string "Will your POKéMON sleep?$" Route123_Text_1C059F:: @ 81C059F - .string "Überschäumend mit Leben...$" + .string "Overflowing with vitality...$" Route123_Text_1C05BC:: @ 81C05BC - .string "PYROBERG...\n" - .string "Wo die Geister der POKéMON ruhen...\p" - .string "Dort muss es eine Kraft geben, die die\n" - .string "Geister beruhigt...$" + .string "MT. PYRE...\n" + .string "Where the spirits of POKéMON sleep...\p" + .string "It must overflow with a power that\n" + .string "soothes spirits...$" Route124_Text_1C0624:: @ 81C0624 - .string "Hey, hast du etwa auf dem Meer die\n" - .string "Orientierung verloren?\p" - .string "Wenn du meine POKéMON besiegst, zeige\n" - .string "ich dir den richtigen Weg.$" + .string "Hey, are you lost at sea?\p" + .string "If you can beat my POKéMON, I can\n" + .string "serve as your pilot.$" Route124_Text_1C0675:: @ 81C0675 - .string "Ich habe die Orientierung verloren...$" + .string "I lost my bearings in battle!$" Route124_Text_1C0693:: @ 81C0693 - .string "Viele Menschen verlieren auf dem Meer\n" - .string "die Orientierung.\p" - .string "Wenn du zu denen gehörst, solltest du\n" - .string "die KARTE des POKéNAV zu Hilfe nehmen.$" + .string "Many people lose their bearings at sea.\p" + .string "If you’re that sort, you should refer\n" + .string "to the POKéNAV’s MAP.$" Route124_Text_1C06F7:: @ 81C06F7 - .string "Hm! Du sitzt auf einem POKéMON anstatt\n" - .string "selbst zu schwimmen...\p" - .string "Ich bin richtig neidisch!$" + .string "Hm! You’re riding a POKéMON instead\n" + .string "of swimming yourself...\p" + .string "I am envious!$" Route124_Text_1C0741:: @ 81C0741 .string "Oh!\n" - .string "Ich kann doch nicht...$" + .string "I can’t...$" Route124_Text_1C0750:: @ 81C0750 - .string "Langsam bekomme ich eine Gänsehaut.\n" - .string "Ich bin schon zu lange im Wasser.\p" - .string "Ich wollte, ich könnte auf einem\n" - .string "POKéMON reiten. So wie du!$" + .string "I’m getting chilled...\n" + .string "I’ve been in the water too long...\p" + .string "I wish I could ride a POKéMON like you...$" Route124_Text_1C07B4:: @ 81C07B4 - .string "Wenn du dich einfach nur im Meer treiben\n" - .string "lässt, kommen POKéMON, um zu spielen.$" + .string "If you just float in the sea like\n" + .string "this, POKéMON come around to play.$" Route124_Text_1C07F9:: @ 81C07F9 - .string "Oh.\n" - .string "Verschollen auf hoher See...$" + .string "Oh...\n" + .string "Lost at sea...$" Route124_Text_1C080E:: @ 81C080E - .string "Ich habe beim Schwimmen festgestellt,\n" - .string "dass einige POKéMON angreifen und\l" - .string "manche einen nur beobachten.\p" - .string "Ich glaube, POKéMON haben unter-\n" - .string "schiedliche Persönlichkeiten.$" + .string "While swimming, I noticed that some\n" + .string "POKéMON attack, and some just watch.\p" + .string "I guess POKéMON have personalities\n" + .string "of their own.$" Route124_Text_1C0888:: @ 81C0888 - .string "Wenn du dich hier treiben lässt, triffst\n" - .string "du auf TRAINER, die kämpfen wollen.$" + .string "If you just float in the sea like this,\n" + .string "TRAINERS challenge you!$" Route124_Text_1C08C8:: @ 81C08C8 - .string "Das ist sehr merkwürdig...\n" - .string "Ich habe schon wieder verloren...$" + .string "That’s strange...\n" + .string "I lost again...$" Route124_Text_1C08EA:: @ 81C08EA - .string "Das hat zwar nichts damit zu tun, aber\n" - .string "ich glaube, ich besuche das RÄTSELHAUS.$" + .string "This has nothing to do with anything,\n" + .string "but maybe I’ll visit the TRICK HOUSE.$" Route124_Text_1C0936:: @ 81C0936 - .string "Ich fange an, mich beim Schwimmen zu\n" - .string "langweilen. Wie wär’s mit einem Kampf?$" + .string "I’m growing bored of swimming...\n" + .string "How about a battle?$" Route124_Text_1C096B:: @ 81C096B - .string "Ich hatte ja keine Ahnung, dass du so\n" - .string "stark bist!$" + .string "I had no idea that you were\n" + .string "this strong!$" Route124_Text_1C0994:: @ 81C0994 - .string "Alles was du bisher erreicht hast, hat\n" - .string "dich so stark werden lassen.$" + .string "All the effort you put in must have\n" + .string "made you this strong.$" Route124_Text_1C09CE:: @ 81C09CE - .string "Hähähä... Ich tauche tief hinab, um mich\n" - .string "tief und sicher zu verstecken.\l" - .string "Die Tiefen auszuloten ist meine Mission.$" + .string "Fufufufu... I dive deep underwater\n" + .string "to go deep under cover.\l" + .string "Plumbing the depths is where I excel!$" Route124_Text_1C0A2F:: @ 81C0A2F - .string "Blubb, blubb, blubb...\n" - .string "So saufe ich ab...$" + .string "Glub, glub, glub...\n" + .string "I’m sinking...$" Route124_Text_1C0A52:: @ 81C0A52 - .string "Aus zuverlässiger Quelle weiß ich, dass\n" - .string "es hier in der Nähe einen Platz zum\l" - .string "TAUCHEN gibt.\p" - .string "Das gibt mir das Verlangen, mich tief\n" - .string "fallen zu lassen...$" + .string "I have it on good authority that\n" + .string "there’s a DIVE spot around here.\p" + .string "It gives me the urge to go deep\n" + .string "again...$" Route124_Text_1C0ABD:: @ 81C0ABD - .string "UTA: Seufz...\p" - .string "Ich bin hier im Meer, aber wer ist bei\n" - .string "mir? Mein kleiner Bruder!\p" - .string "Lass uns kämpfen, dann brauche ich\n" - .string "nicht darüber nachzudenken.$" + .string "RITA: Sigh...\p" + .string "Here I am in the sea, but who’s with me?\n" + .string "My little brother!\p" + .string "Let’s battle so I won’t have to dwell\n" + .string "on that!$" Route124_Text_1C0B36:: @ 81C0B36 - .string "UTA: TOM! Es ist deine Schuld, dass wir\n" - .string "verloren haben! Das wirst du mir büßen!$" + .string "RITA: SAM! It’s your fault we lost!\n" + .string "You’re in for it later!$" Route124_Text_1C0B72:: @ 81C0B72 - .string "UTA: Seufz...\p" - .string "Wenn anstelle meines kleinen\n" - .string "Bruders ein hübscher Freund hier wäre...$" + .string "RITA: Sigh...\p" + .string "If only it wasn’t my little brother\n" + .string "next to me, but a nice boyfriend...$" Route124_Text_1C0BC8:: @ 81C0BC8 - .string "UTA: Du willst gegen uns antreten?\n" - .string "Dann brauchst du aber mehr POKéMON.$" + .string "RITA: You’re planning to battle us?\n" + .string "Not unless you have more POKéMON.$" Route124_Text_1C0C0E:: @ 81C0C0E - .string "TOM: Meine Schwester ist stark!\p" - .string "Heul bloß nicht, wenn du verlierst!$" + .string "SAM: My big sister is tough at POKéMON!\p" + .string "Don’t cry when you lose!$" Route124_Text_1C0C4F:: @ 81C0C4F - .string "TOM: Oh oh...\n" - .string "Meine Schwester wird mich fressen...$" + .string "SAM: Uh-oh...\n" + .string "My big sister will chew me out...$" Route124_Text_1C0C7F:: @ 81C0C7F - .string "TOM: Meine Schwester wird richtig\n" - .string "unheimlich, wenn sie wütend ist.\p" - .string "Daher hat sie auch noch keinen Freund.$" + .string "SAM: My big sister is really scary\n" + .string "when she gets angry.\p" + .string "That’s why she doesn’t have a\n" + .string "boyfriend.$" Route124_Text_1C0CE0:: @ 81C0CE0 - .string "TOM: Willst du gegen uns antreten?\n" - .string "Dann bring mehr POKéMON mit.$" + .string "SAM: Did you want to battle us?\n" + .string "Bring some more POKéMON, then.$" Route124_Text_1C0D1F:: @ 81C0D1F - .string "UTA: Megaseufz... Ich bin hier mitten\n" - .string "im Meer.\p" - .string "Und mit wem? Meinem kleinen Bruder!\n" - .string "Oh, dich habe ich lange nicht gesehen.\p" - .string "Lass uns kämpfen, dann muss ich nicht\n" - .string "länger über die Situation nachdenken.$" + .string "RITA: Sigh...\p" + .string "Here I am in the sea, but who’s with me?\n" + .string "My little brother!\p" + .string "Oh, hi, it’s been a while. Let’s battle\n" + .string "so I won’t have to dwell on things!$" Route124_Text_1C0DB5:: @ 81C0DB5 - .string "UTA: TOM!!! Du hast schon wieder für\n" - .string "eine Niederlage gesorgt!\p" - .string "Ich werde dir gleich eine Lektion\n" - .string "erteilen!$" + .string "RITA: SAM!\n" + .string "It’s your fault we lost again!\p" + .string "We’re having a training session later!$" Route124_Text_1C0E06:: @ 81C0E06 - .string "UTA: Seeeuuufz...\p" - .string "Wenn ich einen netten Freund hätte,\n" - .string "würden wir alle in Kombination schlagen.$" + .string "RITA: Sigh...\p" + .string "If I had a nice boyfriend, we’d beat\n" + .string "anyone with lovely combinations...$" Route124_Text_1C0E5C:: @ 81C0E5C - .string "UTA: Du willst gegen uns antreten?\n" - .string "Dann bring mehr POKéMON mit.$" + .string "RITA: You’re planning to battle us?\n" + .string "Not unless you have more POKéMON.$" Route124_Text_1C0EA2:: @ 81C0EA2 - .string "TOM: Wenn wir verlieren, stecke ich tief\n" - .string "in der Klemme. Dann flippe ich aus!$" + .string "SAM: If we lose, I’ll catch heck.\n" + .string "I’m going to go totally all out!$" Route124_Text_1C0EE5:: @ 81C0EE5 - .string "TOM: Oh oh...\n" - .string "Meine Schwester wird mich umbringen...$" + .string "SAM: Uh-oh...\n" + .string "My big sister will chew me out again.$" Route124_Text_1C0F19:: @ 81C0F19 - .string "TOM: Meine Schwester ist bizarr und\n" - .string "Furcht erregend, wenn sie wütend ist.\p" - .string "Sie wird mich später hart mit den\n" - .string "POKéMON trainieren lassen...$" + .string "SAM: My big sister is really scary\n" + .string "when she gets angry.\p" + .string "She’s going to make me train really\n" + .string "hard with POKéMON later...$" Route124_Text_1C0F90:: @ 81C0F90 - .string "TOM: Willst du gegen uns antreten?\n" - .string "Dann bring mehr POKéMON mit.$" + .string "SAM: Did you want to battle us?\n" + .string "Bring some more POKéMON, then.$" Route125_Text_1C0FCF:: @ 81C0FCF - .string "Ich habe dich kommen hören und\n" - .string "hier auf dich gewartet.$" + .string "I heard you approaching, so I hung\n" + .string "around for you!$" Route125_Text_1C1002:: @ 81C1002 - .string "Ich bitte um Frieden!$" + .string "I beg for peace!$" Route125_Text_1C1013:: @ 81C1013 - .string "Der Schall bewegt sich im Wasser\n" - .string "schneller als in der Luft.$" + .string "Sound travels faster in water than\n" + .string "it does through air.$" Route125_Text_1C104B:: @ 81C104B - .string "Hey, du!\n" - .string "Schau dir mein süßes POKéMON an!$" + .string "Hey, there!\n" + .string "Check out my sweet POKéMON!$" Route125_Text_1C1073:: @ 81C1073 - .string "Da habe ich aber rumgewurstelt...$" + .string "I floundered...$" Route125_Text_1C1083:: @ 81C1083 - .string "SEEPERS Charme hat mich gefangen, so\n" - .string "habe ich angefangen zu schwimmen.$" + .string "I was blown away by HORSEA’s charm,\n" + .string "so I started swimming, too.$" Route125_Text_1C10C3:: @ 81C10C3 - .string "Das Schwimmen hat mich ermüdet.\n" - .string "Willst du mit mir kämpfen?$" + .string "I’m tired of swimming.\n" + .string "Are you up for a battle with me?$" Route125_Text_1C10FB:: @ 81C10FB - .string "Du bist mir eine Nummer zu groß.$" + .string "You’re too much!$" Route125_Text_1C110C:: @ 81C110C - .string "Huuh... Wo geht es denn hier\n" - .string "nach MOOSBACH CITY?$" + .string "Whew...\n" + .string "Which way is it to MOSSDEEP CITY?$" Route125_Text_1C1136:: @ 81C1136 - .string "Wie willst du gegen meine WASSER-\n" - .string "POKéMON ankommen?$" + .string "How would you like to take on the\n" + .string "WATER-type POKéMON I raised?$" Route125_Text_1C1175:: @ 81C1175 - .string "Ich habe verloren...$" + .string "I lost...$" Route125_Text_1C117F:: @ 81C117F - .string "Deine Kraft... Absolut unglaublich.\n" - .string "Ich bin begeistert!$" + .string "Your power... You’re the real deal.\n" + .string "I’m amazed!$" Route125_Text_1C11AF:: @ 81C11AF - .string "Ahoi! Ich bin ein raubeiniger MATROSE!\n" - .string "Ich habe die Weltmeere umsegelt.$" + .string "Ahoy! I’m a buff, tough SAILOR!\n" + .string "I’ve braved the world’s seas!$" Route125_Text_1C11ED:: @ 81C11ED - .string "Grrrrooooaaar!\n" - .string "Ich konnte unmöglich gewinnen!$" + .string "Gwrroooar!\n" + .string "I couldn’t win!$" Route125_Text_1C1208:: @ 81C1208 - .string "Die Flut kommt und geht in der\n" - .string "KÜSTENHÖHLE.\p" - .string "Wusstest du eigentlich, dass zwischen\n" - .string "Flut und Ebbe immer 6 Stunden liegen?$" + .string "The tide ebbs and flows inside the\n" + .string "SHOAL CAVE.\p" + .string "By the way, it’s about six hours from\n" + .string "high tide to low tide. Did you know?$" Route125_Text_1C1282:: @ 81C1282 - .string "Jetzt läuft die Flut ein und für dich ist\n" - .string "Zahltag! Komm, wir kämpfen.$" + .string "It’s high time I get my payback\n" + .string "from you! Come on, we’re battling!$" Route125_Text_1C12C5:: @ 81C12C5 - .string "Ich konnte nicht gewinnen!\n" - .string "Die Flut hat mich davongetragen!$" + .string "I couldn’t win!\n" + .string "I flat out couldn’t win!$" Route125_Text_1C12EE:: @ 81C12EE - .string "Die KÜSTENHÖHLE...\p" - .string "Es gibt Orte, die sind mal erreichbar und\n" - .string "mal nicht. Ganz abhängig von Ebbe\l" - .string "und Flut.\p" - .string "Übrigens: Vergiss nicht, dass zwischen\n" - .string "Flut und Ebbe sechs Stunden liegen!$" + .string "The SHOAL CAVE...\p" + .string "There are places you can and can’t\n" + .string "get to depending on the rise and fall\l" + .string "of the tide.\p" + .string "By the way, it’s about six hours from\n" + .string "high tide to low tide. Don’t forget!$" Route125_Text_1C13A1:: @ 81C13A1 - .string "ZOE: Ein lustiger alter Mann lebt in der\n" - .string "KÜSTENHÖHLE. Das hat mir jemand\l" - .string "erzählt. Willst du ihn auch besuchen?$" + .string "KIM: A funny old man lives in the\n" + .string "SHOAL CAVE. Someone told me.\l" + .string "Are you going to see him, too?$" Route125_Text_1C13FF:: @ 81C13FF - .string "ZOE: Ich dachte, wir könnten gewinnen.$" + .string "KIM: I thought we would win.$" Route125_Text_1C141C:: @ 81C141C - .string "ZOE: Ein lustiger alter Mann lebt in der\n" - .string "KÜSTENHÖHLE, stimmt’s?\p" - .string "Komm, IRIS, wir besuchen ihn.$" + .string "KIM: A funny old man lives in the\n" + .string "SHOAL CAVE, doesn’t he?\p" + .string "Let’s go see him, IRIS!$" Route125_Text_1C146E:: @ 81C146E - .string "ZOE: Nein, nein, nein! Du brauchst zwei\n" - .string "POKéMON oder es funktioniert nicht!$" + .string "KIM: No, no, no! You need two POKéMON,\n" + .string "or it’s just no good!$" Route125_Text_1C14AB:: @ 81C14AB - .string "IRIS: ZOE, kannst du mir verraten, was\n" - .string "wir hier draußen überhaupt wollen?$" + .string "IRIS: KIM, can you tell me what we’re\n" + .string "looking for out here?$" Route125_Text_1C14E7:: @ 81C14E7 - .string "IRIS: Oh, wir waren so nah dran.$" + .string "IRIS: Oh, we came sort of close.$" Route125_Text_1C1508:: @ 81C1508 - .string "IRIS: ZOE, gehen wir wirklich zur\n" - .string "KÜSTENHÖHLE?\l" - .string "Dann werden wir ja ganz nass.$" + .string "IRIS: KIM, are we really going into\n" + .string "the SHOAL CAVE?\l" + .string "We’ll get all wet.$" Route125_Text_1C154F:: @ 81C154F - .string "IRIS: Oh, wir würden niemals einen\n" - .string "2-gegen-1-Kampf ausfechten! Niemals!$" + .string "IRIS: Oh, we could never, ever do\n" + .string "anything like a 2-on-1 battle.$" Route126_Text_1C1590:: @ 81C1590 - .string "Schwimmen verlangt vollen Körperein-\n" - .string "satz. Und so wird man fit!$" + .string "Swimming is a full-body workout!\n" + .string "You will get fit!$" Route126_Text_1C15C3:: @ 81C15C3 - .string "Ich gebe es zu! Du hast gewonnen!$" + .string "I admit it! You win!$" Route126_Text_1C15D8:: @ 81C15D8 - .string "Dank meiner täglichen Schwimmrunden...\n" - .string "Guck mal! Schau dir diesen Körperbau an!$" + .string "Thanks to my daily swimming routine...\n" + .string "Look! Feast your eyes on this physique!$" Route126_Text_1C1627:: @ 81C1627 - .string "Dieser hohe weiße Berg dort ist\n" - .string "XENEROVILLE.$" + .string "This towering white mountain of rock\n" + .string "is SOOTOPOLIS CITY.$" Route126_Text_1C1660:: @ 81C1660 - .string "Wie, das war’s schon?$" + .string "I was done in?$" Route126_Text_1C166F:: @ 81C166F - .string "Ich kann den Eingang zu XENEROVILLE\n" - .string "nicht finden. Wo kann er sein?$" + .string "I can’t find the entrance to\n" + .string "SOOTOPOLIS. Where could it be?$" Route126_Text_1C16AB:: @ 81C16AB - .string "Hihihihihi!\n" - .string "Ich bin eine Meerjungfrau!$" + .string "Ufufufufu!\n" + .string "I’m a mermaid!$" Route126_Text_1C16C5:: @ 81C16C5 - .string "Mein Traum platzt wie Seifenblasen!\n" - .string "Plopp, plopp, plopp...$" + .string "My fantasy burst as if it were a bubble!\n" + .string "Blub, blub, blub...$" Route126_Text_1C1702:: @ 81C1702 - .string "Du hast mich geschlagen... Ich möchte im\n" - .string "Meer der Verzweiflung untergehen...$" + .string "You thrashed me... I want to\n" + .string "disappear in a wave of despair...$" Route126_Text_1C1741:: @ 81C1741 - .string "Hallo, Kindchen!\n" - .string "Willst du gegen mich antreten?$" + .string "Hello, kiddo!\n" + .string "Want a battle with me?$" Route126_Text_1C1766:: @ 81C1766 - .string "Oh, neeeiiin!$" + .string "Oh, noooooh!$" Route126_Text_1C1773:: @ 81C1773 - .string "Ich liebe es, einfach so mit meinen \n" - .string "POKéMON im Meer abzuhängen!$" + .string "I love frolicking with POKéMON in\n" + .string "the sea like this!$" Route127_Text_1C17A8:: @ 81C17A8 - .string "Ich sehe es dir an. Du willst mich\n" - .string "herausfordern!$" + .string "I can see it in your face. You want\n" + .string "to challenge me.$" Route127_Text_1C17DD:: @ 81C17DD - .string "Auauauauahahaha!$" + .string "Awawawawawa...$" Route127_Text_1C17EC:: @ 81C17EC - .string "Ein gut gespieltes Match lässt immer ein\n" - .string "frisches und heiteres Gefühl zurück.$" + .string "A well-played match leaves me feeling\n" + .string "refreshed and serene.$" Route127_Text_1C1828:: @ 81C1828 - .string "Hast du auch einen Rivalen, gegen den\n" - .string "du es hasst zu verlieren?$" + .string "Do you have a rival whom you just\n" + .string "hate to lose against?$" Route127_Text_1C1860:: @ 81C1860 - .string "Aaargh! Ich hasse es, zu verlieren!$" + .string "Arrrgh! I hate losing!$" Route127_Text_1C1877:: @ 81C1877 - .string "Wenn du einen Rivalen hast, willst du\n" - .string "dann nicht auch immer besser werden?$" + .string "If you have a rival, don’t you get the\n" + .string "feeling that you have to keep getting\l" + .string "better?$" Route127_Text_1C18CC:: @ 81C18CC - .string "Durch das Angeln habe ich eine\n" - .string "gelassene Heiterkeit entwickelt...\l" - .string "Bitte lass mich sie dir zeigen...$" + .string "Through fishing, I have attained a\n" + .string "state of becalmed serenity...\l" + .string "Please, allow me to demonstrate...$" Route127_Text_1C1930:: @ 81C1930 - .string "Auch wenn ich verloren habe, so bleibt\n" - .string "mein Herz doch ruhig...$" + .string "Though I have lost, my heart remains\n" + .string "calm...$" Route127_Text_1C195D:: @ 81C195D - .string "Es macht nichts, wenn ich nichts fange.\n" - .string "Die Schnur bleibt im Wasser.$" + .string "It matters not that I catch nothing.\n" + .string "The line remains in the water...$" Route127_Text_1C19A3:: @ 81C19A3 - .string "Hups! Jetzt sag nicht, dass ich ein\n" - .string "SURFENDES POKéMON am Haken habe?$" + .string "Whoops! Don’t tell me I snagged\n" + .string "a SURFING POKéMON?$" Route127_Text_1C19D6:: @ 81C19D6 - .string "Ich kann so nicht weitermachen!$" + .string "I can’t keep up!$" Route127_Text_1C19E7:: @ 81C19E7 - .string "Deine POKéMON sehen stark aus! Und\n" - .string "doch wären sie nur ein Häppchen, wenn\l" - .string "ich sie als Köder am Haken hätte.$" + .string "Your POKéMON look pretty strong.\n" + .string "They’d be a handful if I hooked them!$" Route127_Text_1C1A2E:: @ 81C1A2E - .string "Nun! Das ist ein Kampf zwischen einem\n" - .string "POKéMON-Fan und einem Angel-Fan.$" + .string "Well, hey! This is a match between a\n" + .string "POKéMON fan and a fishing buff!$" Route127_Text_1C1A73:: @ 81C1A73 - .string "Nein! Meine Schnur hat sich verheddert.\n" - .string "Die Party ist vorbei!$" + .string "No! My line’s all tangled!\n" + .string "The party’s over!$" Route127_Text_1C1AA0:: @ 81C1AA0 - .string "Meine Angelschnur tanzt im Wasser!\n" - .string "Sie tanzt Tango! Hahahah, hiiiks!$" + .string "My fishing line’s doing a dance!\n" + .string "The tangle tango! Hahaha, snarl!$" Route127_Text_1C1AE2:: @ 81C1AE2 - .string "Das, was ich in der ARENA von\n" - .string "FAUSTAUHAVEN gelernt habe,\l" - .string "wende ich jetzt an.$" + .string "What I learned at DEWFORD’s POKéMON\n" + .string "GYM, I will put into practice here.$" Route127_Text_1C1B2A:: @ 81C1B2A - .string "Ich wurde weggeschwemmt.$" + .string "I was swamped!$" Route127_Text_1C1B39:: @ 81C1B39 - .string "KAMILLO, der ARENALEITER von\n" - .string "FAUSTAUHAVEN, soll mit einem Typen\l" - .string "namens BRUNO in KANTO trainiert haben.$" + .string "BRAWLY, DEWFORD’s GYM LEADER, used\n" + .string "to train with a guy named BRUNO in\l" + .string "KANTO, I’ve heard.$" Route127_Text_1C1B92:: @ 81C1B92 - .string "VOGEL-POKéMON haben exzellente Augen.\n" - .string "Sie erspähen Beute aus großer Höhe.$" + .string "BIRD POKéMON have excellent vision.\n" + .string "They spot prey from great heights.$" Route127_Text_1C1BD9:: @ 81C1BD9 - .string "Huuh... Ich gebe auf.$" + .string "Whew... I give up.$" Route127_Text_1C1BEC:: @ 81C1BEC - .string "Hier gibt es viele Plätze, an denen man\n" - .string "sehr gut tauchen kann.\p" - .string "Aus der Luft sind sie leicht zu\n" - .string "erkennen, da sie dunkler sind.$" + .string "There’re lots of diving spots in the\n" + .string "sea around here.\p" + .string "You can spot them easily from the sky\n" + .string "because of their darker color.$" Route128_Text_1C1C67:: @ 81C1C67 - .string "PRACHTPOLIS CITY ist weit entfernt...$" + .string "EVER GRANDE CITY is still a long ways\n" + .string "away...$" Route128_Text_1C1C95:: @ 81C1C95 - .string "Mein erster Sieg scheint weit entfernt\n" - .string "zu sein...$" + .string "My first victory seems to be far\n" + .string "away, too...$" Route128_Text_1C1CC3:: @ 81C1CC3 - .string "Mein ganzes Leben ist eine einzige\n" - .string "Niederlage, aber ich gebe nicht auf!$" + .string "My whole life has been about losing,\n" + .string "but I will never give up!$" Route128_Text_1C1D02:: @ 81C1D02 - .string "Ich fühle mich gut. Ich werde weiter\n" - .string "Richtung PRACHTPOLIS CITY schwimmen.$" + .string "I’m still feeling good. I’ll keep on\n" + .string "swimming to EVER GRANDE CITY.$" Route128_Text_1C1D45:: @ 81C1D45 - .string "Ich möchte sehr gerne einmal vom Sieg\n" - .string "kosten...$" + .string "I’ve yet to taste my first victory...$" Route128_Text_1C1D6B:: @ 81C1D6B - .string "Ich werde PRACHTPOLIS CITY eventuell\n" - .string "erreichen und dort eventuell gewinnen...$" + .string "I’ll eventually reach EVER GRANDE CITY\n" + .string "where I can eventually win...$" Route128_Text_1C1DB0:: @ 81C1DB0 - .string "In einem Triathlon musst du schwimmen,\n" - .string "Rad fahren und einen Marathon laufen.\p" - .string "Es ist ein mörderisches Rennen, das aus\n" - .string "drei Disziplinen besteht.$" + .string "You have to swim, cycle, and then run\n" + .string "a marathon in a triathlon.\p" + .string "It’s a grueling race that consists\n" + .string "of three events.$" Route128_Text_1C1E25:: @ 81C1E25 - .string "Ein POKéMON-Kampf ist auch mörderisch.$" + .string "A POKéMON battle is grueling, too...$" Route128_Text_1C1E4A:: @ 81C1E4A - .string "Ich muss als Nächstes mit dem RAD\n" - .string "fahren, aber... Ich möchte eigentlich\l" - .string "das Handtuch werfen.$" + .string "I have to ride a BIKE next, but...\n" + .string "I’m about to throw in the towel...$" Route128_Text_1C1E90:: @ 81C1E90 - .string "Ein Triathlon ist lang. Aber ich glaube,\n" - .string "um POKéMON CHAMP zu werden, hat\l" - .string "man auch einen langen Weg vor sich.$" + .string "A triathlon is long. But I guess the\n" + .string "road to become the POKéMON CHAMPION\l" + .string "is also a long and grueling one.$" Route128_Text_1C1EFA:: @ 81C1EFA - .string "Ein POKéMON-Kampf ist hart und \n" - .string "unbarmherzig...$" + .string "A POKéMON battle really is harsh\n" + .string "and unforgiving...$" Route128_Text_1C1F2E:: @ 81C1F2E - .string "Du solltest ernsthaft darüber nach-\n" - .string "denken, die SIEGESSTRASSE zu betreten.$" + .string "You should give serious thought to\n" + .string "challenges on VICTORY ROAD.$" Route128_Text_1C1F6D:: @ 81C1F6D - .string "Wir haben hart dafür gearbeitet, die\n" - .string "POKéMON LIGA herauszufordern...\p" - .string "Wir können es uns nicht erlauben,\n" - .string "jetzt zu verlieren!$" + .string "We’ve been working so hard to mount\n" + .string "a POKéMON LEAGUE challenge...\p" + .string "We can’t afford to lose now!$" Route128_Text_1C1FCC:: @ 81C1FCC .string "Oh!\n" - .string "Wie konnte das passieren?$" + .string "How could this happen?!$" Route128_Text_1C1FE8:: @ 81C1FE8 - .string "Ich bin so weit gekommen, ich gebe\n" - .string "jetzt bestimmt nicht auf.$" + .string "After all I’ve done to get here, I won’t\n" + .string "give up after one setback.$" Route128_Text_1C202C:: @ 81C202C - .string "Es gibt keinen stärkeren TRAINER als\n" - .string "mich!$" + .string "There is no stronger TRAINER than I!$" Route128_Text_1C2051:: @ 81C2051 - .string "Das darf nicht wahr sein!$" + .string "This can’t be!$" Route128_Text_1C2060:: @ 81C2060 - .string "Es gibt wohl keinen stärkeren TRAINER\n" - .string "als dich!$" + .string "There probably is no stronger TRAINER\n" + .string "than you!$" Route128_Text_1C2090:: @ 81C2090 - .string "Ich will nach PRACHTPOLIS CITY, daher\n" - .string "habe ich ein POKéMON gefangen, das\p" - .string "weiß, wie man mit KASKADE den Wasserfall\n" - .string "erklimmt.$" + .string "I want to visit EVER GRANDE, so I\n" + .string "caught myself a POKéMON that knows\l" + .string "the move WATERFALL to crest the falls.$" Route128_Text_1C20FC:: @ 81C20FC - .string "Ich bin abgestürzt.$" + .string "I’m crestfallen!$" Route128_Text_1C210D:: @ 81C210D - .string "Ooh, jeeeeh!\p" - .string "Mein POKéMON kennt KASKADE, aber mir\n" - .string "fehlt der ORDEN der ARENA von\l" - .string "XENEROVILLE!$" + .string "Awww, phooey!\p" + .string "My POKéMON know WATERFALL, but\n" + .string "I don’t have the SOOTOPOLIS GYM BADGE!$" Route129_Text_1C2161:: @ 81C2161 - .string "Das ist mein erster Triathlon.\n" - .string "Ich bin schon ganz hibbelig und nervös!$" + .string "This is my first triathlon.\n" + .string "I’m all tense and nervous!$" Route129_Text_1C2198:: @ 81C2198 - .string "Wooooaaaaaargh! Ich habe es\n" - .string "nicht geschafft, zu gewinnen.$" + .string "Wroooaaar!\n" + .string "I failed to win!$" Route129_Text_1C21B4:: @ 81C21B4 - .string "Wenn ich so hibbelig bin, kann ich nicht\n" - .string "alles geben.$" + .string "If I’m all tensed up, I won’t be able to\n" + .string "give it my all.$" Route129_Text_1C21ED:: @ 81C21ED - .string "Ich bin mitten in einem Triathlon, aber\n" - .string "warum sollten wir nicht kämpfen?$" + .string "I’m in the middle of a triathlon, but,\n" + .string "sure, why don’t we battle?$" Route129_Text_1C222F:: @ 81C222F - .string "Ich war sicher, ich würde gewinnen!$" + .string "I was sure I’d win!$" Route129_Text_1C2243:: @ 81C2243 - .string "Weißt du, was das Beste am Triathlon\n" - .string "ist?\p" - .string "Man kommt an seine eigenen Grenzen und\n" - .string "zeigt seine Ausdauer gegenüber Mutter\l" - .string "Natur.$" + .string "Do you know what’s the greatest thing\n" + .string "about triathlons?\p" + .string "Testing the limits of your own\n" + .string "strength and endurance against\l" + .string "Mother Nature!$" Route129_Text_1C22C8:: @ 81C22C8 - .string "Sag: Hey, hey!\n" - .string "Los geht’s!$" + .string "Say hey, hey!\n" + .string "Let’s get on with it!$" Route129_Text_1C22EC:: @ 81C22EC - .string "Geschlagen, ich wurde geschlagen.\n" - .string "Das war’s. Fertig!$" + .string "Beat, I’m beaten.\n" + .string "That’s it, done!$" Route129_Text_1C230F:: @ 81C230F - .string "Hier gibt es für Verlierer nichts zu tun.\n" - .string "Zeit für mich, nach Hause zu gehen.$" + .string "There’s nothing for a loser.\n" + .string "Time for me to beat it home.$" Route129_Text_1C2349:: @ 81C2349 - .string "Warum so eilig?\n" - .string "Immer mit der Ruhe...$" + .string "What’s the hurry?\n" + .string "Let’s take it slow and easy.$" Route129_Text_1C2378:: @ 81C2378 - .string "Oh, meine Güte. Dabei wollte ich\n" - .string "nur ein bisschen entspannen.$" + .string "Oh, my.\n" + .string "I wanted to relax a little more...$" Route129_Text_1C23A3:: @ 81C23A3 - .string "Hasst du es nicht auch, Fehler zu\n" - .string "machen, nur weil du es eilig hast?\p" - .string "Daher gehe ich alles langsam an.$" + .string "Don’t you hate making mistakes when\n" + .string "you’re in a rush?\p" + .string "That’s why I try to take things\n" + .string "slowly.$" Route130_Text_1C2401:: @ 81C2401 - .string "Was für eine Überraschung! Ich habe im\n" - .string "Meer keinen TRAINER erwartet.\p" - .string "Ich denke, wir sollten kämpfen.$" + .string "What a surprise! I didn’t expect to\n" + .string "see a TRAINER out in the sea.\p" + .string "I think we should battle!$" Route130_Text_1C245D:: @ 81C245D - .string "Dieses Kind ist unglaublich stark.$" + .string "This kid’s awfully tough...$" Route130_Text_1C2479:: @ 81C2479 - .string "Deine Augen haben den Ausdruck eines\n" - .string "Menschen, der harte Herausforderungen\l" - .string "siegreich gemeistert hat. Das steht dir.$" + .string "Your eyes have that look of someone\n" + .string "who’s experienced harsh challenges\l" + .string "and won. It suits you well!$" Route130_Text_1C24DC:: @ 81C24DC - .string "Im tiefen, blauen Meer fand mein\n" - .string "schwermütiges Herz Trost in den\l" - .string "wogenden Wellen.$" + .string "In the deep blue sea,\n" + .string "my shattered blue heart finds\l" + .string "comfort among waves.$" Route130_Text_1C2525:: @ 81C2525 - .string "Wie das weite Meer umspannt auch die \n" - .string "Welt der POKéMON Weiten jenseits\l" - .string "unseres Erfahrungshorizontes.$" + .string "Like the vast blue sea,\n" + .string "the world of POKéMON spans\l" + .string "depths beyond belief.$" Route130_Text_1C256E:: @ 81C256E - .string "Die Kinder dieser Welt träumen davon,\n" - .string "eines Tages der POKéMON CHAMP zu\l" - .string "werden.$" + .string "The world’s children dream\n" + .string "of one day becoming the\l" + .string "POKéMON CHAMPION.$" Route131_Text_1C25B3:: @ 81C25B3 - .string "Das Meer wimmelt von POKéMON.\n" - .string "Es ist nicht leicht, hier zu schwimmen.$" + .string "The sea is teeming with POKéMON.\n" + .string "It’s not easy swimming, I tell you.$" Route131_Text_1C25F8:: @ 81C25F8 - .string "POKéMON, die von TRAINERN aufgezogen\n" - .string "wurden, sind sehr stark...$" + .string "POKéMON raised by TRAINERS are\n" + .string "seriously tough...$" Route131_Text_1C262A:: @ 81C262A - .string "Keuch... Schnauf... Ich bin K.O.\p" - .string "Der Hinweg ist leicht. Der Heimweg umso\n" - .string "härter.\p" - .string "Ob ich genug Energie für die Heimreise\n" - .string "habe?$" + .string "Gasp... Gasp... I’m wiped out...\p" + .string "The going’s easy. It’s the leaving\n" + .string "that’s the hard part.\p" + .string "Will I have any energy left to make\n" + .string "the return trip?$" Route131_Text_1C26B9:: @ 81C26B9 - .string "Die See... Die See... Die See...\n" - .string "Die See... So weit ich mit den Augen seh.\l" - .string "Das Meer macht mich krank und müde.$" + .string "The sea... The sea... The sea...\n" + .string "The sea as far as these eyes can see!\l" + .string "I’m sick and tired of the sea!$" Route131_Text_1C271F:: @ 81C271F - .string "Bah!$" + .string "Bleah!$" Route131_Text_1C2726:: @ 81C2726 - .string "Gelangweilt bin ich von der See, aber\n" - .string "ich muss schwimmen.\p" - .string "Ich bin der geborene Schwimmer!\n" - .string "Das bin ich.$" + .string "Bored I am by the sea, but swim I must.\p" + .string "I’m a born swimmer!\n" + .string "That’s what I am.$" Route131_Text_1C2774:: @ 81C2774 - .string "Hey, Engelchen, warte!\n" - .string "Wir sollten kämpfen, du und ich!$" + .string "Hi, sweetie, wait!\n" + .string "We should battle, you and I!$" Route131_Text_1C27A4:: @ 81C27A4 - .string "Du bist stärker, als du aussiehst.$" + .string "You’re tough in spite of the way\n" + .string "you look!$" Route131_Text_1C27CF:: @ 81C27CF - .string "Hast du einen Typen gesehen, der heult,\n" - .string "weil das Meer ihn langweilt?\p" - .string "Das ist nur Gerede.\n" - .string "Er liebt das Meer aus tiefstem Herzen!$" + .string "Did you see a guy over there who whines\n" + .string "that he’s bored of the sea?\p" + .string "That’s all talk.\n" + .string "He’s hopelessly in love with the sea!$" Route131_Text_1C284A:: @ 81C284A - .string "Warum lieben Männer Bikinis nur so?\p" - .string "Sie starren alle meinen Bikini an.$" + .string "Why do men love bathing suits so much?\p" + .string "They all ogle me!$" Route131_Text_1C2883:: @ 81C2883 - .string "Ich bin erledigt.$" + .string "I’m out of my depth!$" Route131_Text_1C2898:: @ 81C2898 - .string "Vielleicht bewundern die Männer nicht\n" - .string "meinen Bikini, sondern mich!$" + .string "Maybe it’s not my bathing suit that\n" + .string "makes men look. It must be my beauty!$" Route131_Text_1C28E2:: @ 81C28E2 - .string "UNA: Wir nehmen es als Geschwister mit\n" - .string "dir auf!$" + .string "RELI: We’ll work together as siblings\n" + .string "to take you on!$" Route131_Text_1C2918:: @ 81C2918 - .string "UNA: Wir konnten nicht gewinnen. Trotz\n" - .string "unserer Zusammenarbeit.$" + .string "RELI: We couldn’t win even though we\n" + .string "worked together...$" Route131_Text_1C2950:: @ 81C2950 - .string "UNA: Die Menschen in FLOSSBRUNN\n" - .string "leben von Geburt an mit POKéMON\l" - .string "und dem Meer zusammen.$" + .string "RELI: The people of PACIFIDLOG are\n" + .string "together with the sea and POKéMON from\l" + .string "the time they are born.$" Route131_Text_1C29B2:: @ 81C29B2 - .string "UNA: Du hast keine zwei POKéMON?\n" - .string "Dann werden wir keinen Spaß haben!$" + .string "RELI: You don’t have two POKéMON?\n" + .string "We can’t enjoy a battle, then.$" Route131_Text_1C29F3:: @ 81C29F3 - .string "TOBI: Ich gebe zusammen mit meiner\n" - .string "Schwester mein Bestes!$" + .string "IAN: I’m doing my best together with\n" + .string "my sis!$" Route131_Text_1C2A20:: @ 81C2A20 - .string "TOBI: Meine Schwester und ich gaben\n" - .string "unser Bestes und haben doch verloren.$" + .string "IAN: I did my best with my sis, but\n" + .string "we still couldn’t win...$" Route131_Text_1C2A5D:: @ 81C2A5D - .string "TOBI: Du weißt, dass FLOSSBRUNN\n" - .string "eine schwimmende Stadt ist?\p" - .string "Wo immer auch das Meer ist, ist es Teil\n" - .string "von FLOSSBRUNN!$" + .string "IAN: You know how PACIFIDLOG is\n" + .string "a floating town?\p" + .string "So, wherever there is the sea, that’s\n" + .string "a part of PACIFIDLOG!$" Route131_Text_1C2ACA:: @ 81C2ACA - .string "TOBI: Wenn du zwei POKéMON mitbringst,\n" - .string "werden wir es mit dir aufnehmen!$" + .string "IAN: If you have two POKéMON, we’ll\n" + .string "take you on!$" Route132_Text_1C2AFB:: @ 81C2AFB - .string "Als Kind war ich andauernd erkältet,\n" - .string "aber seit ich mit dem Schwimmen\l" - .string "angefangen habe, bin ich fit.$" + .string "I used to catch colds all the time as\n" + .string "a kid, but I became totally fit after\l" + .string "I started swimming.$" Route132_Text_1C2B5B:: @ 81C2B5B - .string "Ich bitte um mehr Kraft...$" + .string "I crave more power...$" Route132_Text_1C2B71:: @ 81C2B71 - .string "TRAINER reisen über Berg und Tal\n" - .string "und müssen deshalb auch fit sein.$" + .string "TRAINERS travel the fields and\n" + .string "mountains, so they must be fit, too.$" Route132_Text_1C2BB5:: @ 81C2BB5 - .string "Ich versuche, mich von den Strömungen\n" - .string "fern zu halten.$" + .string "I try not to swim where the currents\n" + .string "are too strong.$" Route132_Text_1C2BEA:: @ 81C2BEA - .string "Oh, bitte, nein!$" + .string "Oh, please, no!$" Route132_Text_1C2BFA:: @ 81C2BFA - .string "Ich wurde weggespült. Ich habe voll-\n" - .string "ständig die Orientierung verloren.$" + .string "If I get swept away, I’ll lose all my\n" + .string "sense of place...$" Route132_Text_1C2C32:: @ 81C2C32 - .string "Sieg oder Niederlage. Das weiß man\n" - .string "erst, wenn man es ausprobiert hat.$" + .string "Win or lose, you’ll never know until\n" + .string "you try!$" Route132_Text_1C2C60:: @ 81C2C60 - .string "Aaah!\n" - .string "Ich versinke in einer Niederlage.$" + .string "Waah!\n" + .string "I sank in defeat!$" Route132_Text_1C2C78:: @ 81C2C78 - .string "Ich kämpfe nie, wenn ich weiß, dass ich\n" - .string "gewinne. Ich liebe den Kampf an der\l" - .string "Grenze zwischen Sieg und Niederlage.$" + .string "I never battle when I know I’ll win.\n" + .string "I like to battle at the razor’s edge of\l" + .string "victory and defeat!$" Route132_Text_1C2CD9:: @ 81C2CD9 - .string "Ich widme mich 24 Stunden am Tag den\n" - .string "POKéMON. Ob du mich besiegen kannst?$" + .string "I contemplate POKéMON 24 hours a day.\n" + .string "How could you possibly beat me?$" Route132_Text_1C2D1F:: @ 81C2D1F - .string "Ich habe verloren.\n" - .string "Ich gestehe die Niederlage ein.$" + .string "I lose.\n" + .string "I will concede defeat.$" Route132_Text_1C2D3E:: @ 81C2D3E - .string "Aargh...\n" - .string "Du bist ein POKéMON-Fanatiker, oder?\p" - .string "Du widmest dich den POKéMON\n" - .string "24 Stunden am Tag, oder?$" + .string "Urggh...\n" + .string "You’re a POKéMON fanatic, aren’t you?\p" + .string "You must contemplate POKéMON 24 hours\n" + .string "a day, don’t you?$" Route133_Text_1C2DA5:: @ 81C2DA5 - .string "Hat die Strömung dich hergebracht? Das\n" - .string "nenne ich Schicksal. Lass uns kämpfen!$" + .string "Did the currents carry you here, too?\n" + .string "This must have been fated. Let’s battle!$" Route133_Text_1C2DF4:: @ 81C2DF4 - .string "Stark!\n" - .string "Viel zu stark!$" + .string "Strong!\n" + .string "Too much so!$" Route133_Text_1C2E09:: @ 81C2E09 - .string "Soll ich das jetzt Glück nennen, dass ich\n" - .string "auf einen so starken TRAINER wie dich\l" - .string "gestoßen bin? Ich bin verflucht...$" + .string "It’s just my luck that a tough TRAINER\n" + .string "like you would drift here...\l" + .string "I must be cursed...$" Route133_Text_1C2E61:: @ 81C2E61 - .string "Ich führte ein Leben in Kummer und\n" - .string "Elend. Es hat mich hierher verschlagen\l" - .string "und hier bin ich gestrandet...$" + .string "I’ve led a life of woe and misery...\n" + .string "I’ve been cast away, and this is where\l" + .string "I’ve drifted...$" Route133_Text_1C2EBD:: @ 81C2EBD - .string "Eine weitere Niederlage...$" + .string "Another loss...$" Route133_Text_1C2ECD:: @ 81C2ECD - .string "Treibend auf dem Meer des Lebens...\n" - .string "Ich habe dazu keine Lust mehr!$" + .string "A life adrift...\n" + .string "I don’t want it anymore!$" Route133_Text_1C2EF7:: @ 81C2EF7 - .string "Willkommen!\n" - .string "Ich habe dich schon erwartet!$" + .string "Welcome!\n" + .string "I’ve been expecting you!$" Route133_Text_1C2F19:: @ 81C2F19 - .string "Nein! Bitte!$" + .string "No! Please!$" Route133_Text_1C2F25:: @ 81C2F25 - .string "Ein Kind als starker TRAINER...\n" - .string "Boh, ist das äääärgerlich!$" + .string "A strong child TRAINER...\n" + .string "That’s so annoying!$" Route133_Text_1C2F53:: @ 81C2F53 - .string "Ich möchte, wie jeder andere auch,\n" - .string "gewinnen, aber ich ziehe meine POKéMON\l" - .string "nicht auf wie jeder andere auch...$" + .string "I want to win like everyone else, but I\n" + .string "won’t raise POKéMON like everyone else.$" Route133_Text_1C2FA3:: @ 81C2FA3 - .string "Mist!\n" - .string "Meine Art und Weise reicht nicht aus!$" + .string "Darn it!\n" + .string "My way is still too slack!$" Route133_Text_1C2FC7:: @ 81C2FC7 - .string "Es macht mehr Spaß, die Dinge auf meine\n" - .string "Art zu erledigen, als auf die Art aller\l" - .string "anderen. Das ist doch klar!$" + .string "It’s way more fun to do things the way\n" + .string "I want than to be like everybody else.\l" + .string "I mean, that’s obvious!$" Route133_Text_1C302D:: @ 81C302D - .string "Ich bin mit meinen VOGEL-POKéMON\n" - .string "hierher gekommen.$" + .string "I came all the way out here with my\n" + .string "BIRD POKéMON.$" Route133_Text_1C305F:: @ 81C305F - .string "Du...\n" - .string "Du bist total cool!$" + .string "You...\n" + .string "You’re stunningly cool!$" Route133_Text_1C307E:: @ 81C307E - .string "Ich könnte nach BAUMHAUSEN CITY zu-\n" - .string "rückkehren, aber ich mag Orte wie diese.$" + .string "I’d like to go back to FORTREE, but I’ve\n" + .string "grown to like this place, too.$" Route134_Text_1C30C6:: @ 81C30C6 - .string "Selbst POKéMON, die schwimmen können,\n" - .string "werden oft von der Strömung erfasst.$" + .string "Even those POKéMON that can swim are\n" + .string "carried along by the rapid currents.$" Route134_Text_1C3110:: @ 81C3110 .string "Aiyeeeeh!$" Route134_Text_1C311A:: @ 81C311A - .string "Ich glaube, POKéMON mögen diese\n" - .string "schnellen Strömungen hier sehr.$" + .string "I think POKéMON enjoy the fast-running\n" + .string "currents around these parts.$" Route134_Text_1C315E:: @ 81C315E - .string "Meine LIEBISKUS möchten ihren Spaß\n" - .string "bei einem Kampf haben. Machst du mit?$" + .string "My LUVDISC are looking for a fun\n" + .string "match. Will you join us?$" Route134_Text_1C3198:: @ 81C3198 - .string "Huupsie!$" + .string "Oopsie!$" Route134_Text_1C31A0:: @ 81C31A0 - .string "Es gibt da einen Sammler, der sich für \n" - .string "SCHUPPEN von LIEBISKUS interessiert.$" + .string "There’s a collector who’s after the\n" + .string "SCALES of LUVDISC.$" Route134_Text_1C31D7:: @ 81C31D7 - .string "Okeydokey! Genug gerastet, Jungs!\n" - .string "Zeit für ein Kämpfchen!$" + .string "Okeydokey! That’s enough rest, gang!\n" + .string "It’s time for a match!$" Route134_Text_1C3213:: @ 81C3213 - .string "Wir wurden wieder fertig gemacht.$" + .string "Tuckered out again...$" Route134_Text_1C3229:: @ 81C3229 - .string "Mein VOGEL-POKéMON wird nach einem\n" - .string "langen Flug schnell müde...$" + .string "My BIRD POKéMON get tired quickly after\n" + .string "a long flight...$" Route134_Text_1C3262:: @ 81C3262 - .string "Du bist ein POKéMON-TRAINER.\n" - .string "Worte sind da überflüssig. Wir kämpfen.$" + .string "You’re a POKéMON TRAINER.\n" + .string "No need for words. We battle now.$" Route134_Text_1C329E:: @ 81C329E .string "... ... ... ... ... ... ...\n" .string "... ... ... ... ... ... ...$" Route134_Text_1C32D6:: @ 81C32D6 - .string "Ich habe dich herausgefordert und\n" - .string "doch verloren. Ich bin tief beschämt.$" + .string "It was I who challenged you, and yet\n" + .string "I lost. I am deeply shamed...$" Route134_Text_1C3319:: @ 81C3319 - .string "Die wilde Strömung in dieser Region hilft\n" - .string "uns dabei, stärker denn je zu werden.$" + .string "The savage tide in this area serves to\n" + .string "make us stronger than ever.$" Route134_Text_1C335C:: @ 81C335C - .string "Ich gebe meine Niederlage zu.$" + .string "I concede defeat.$" Route134_Text_1C336E:: @ 81C336E - .string "Wir werden für weiteres Training nach\n" - .string "METEORFÄLLE zurückkehren.\p" - .string "Wenn du magst, komm doch auch mit.\n" - .string "Das wird auch dich stärker machen!$" + .string "We will return for more training at\n" + .string "METEOR FALLS.\p" + .string "If you’d like, you should go, too.\n" + .string "It will definitely toughen you up!$" diff --git a/data/text/tv.inc b/data/text/tv.inc index 700f40db0..c27559abd 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -1,1085 +1,1050 @@ FallarborTown_ContestLobby_Text_1A6F7C:: @ 81A6F7C - .string "Du hast an einem POKéMON WETTBEWERB\n" - .string "teilgenommen, stimmt’s?\p" - .string "Da kannst du mir doch etwas über\n" - .string "dein POKéMON erzählen.\p" - .string "Ich bin Reporter. Ich arbeite an einer\n" - .string "Geschichte über POKéMON WETTBEWERBE.\p" - .string "Würdest du mir wohl einige Fragen\n" - .string "beantworten?$" + .string "Oh, hello! You were in a POKéMON CONTEST,\n" + .string "weren’t you?\l" + .string "It’s easy to tell from your POKéMON.\p" + .string "I’m a reporter. I’m working on a story\n" + .string "on POKéMON CONTESTS.\p" + .string "If I may, would you be willing to answer\n" + .string "a few questions?$" FallarborTown_ContestLobby_Text_1A704E:: @ 81A704E - .string "Oh, das machst du?\n" - .string "Herzlichen Dank.\p" - .string "Beschreibe mir doch kurz den WETTBE-\n" - .string "WERB, an dem du gerade teilgenommen\l" - .string "hast.$" + .string "Oh, you will?\n" + .string "Thank you.\p" + .string "Briefly, how would you describe the\n" + .string "CONTEST you just entered?$" FallarborTown_ContestLobby_Text_1A70A5:: @ 81A70A5 - .string "Ah, ich verstehe.\n" - .string "Das ist ein bewegender Kommentar.\p" - .string "Man bekommt ein gutes Bild davon,\n" - .string "wie dieser WETTBEWERB war.\p" - .string "Ich habe eine letzte Frage.\p" - .string "Wenn du das Wort “{STR_VAR_2}” hörst,\n" - .string "was für ein Bild hast du dann vor Augen?$" + .string "Ah, I see.\n" + .string "That’s a very edifying comment.\p" + .string "You get a good feel for what the\n" + .string "CONTEST was like.\p" + .string "I’ve got one last question.\p" + .string "When you hear the word “{STR_VAR_2},”\n" + .string "what image do you get?$" FallarborTown_ContestLobby_Text_1A7153:: @ 81A7153 - .string "Oh, hm.\p" - .string "Das stellst du dir also unter dem\n" - .string "Begriff “{STR_VAR_2}” vor.\p" - .string "Danke schön!\n" - .string "Du hast mir einige gute Ideen geliefert.\p" - .string "Jetzt kann ich eine gute Geschichte\n" - .string "über die POKéMON-WETTBEWERBE\l" - .string "schreiben.\p" - .string "Vielleicht, aber nur vielleicht, findet\n" - .string "sie auch ihren Weg ins Fernsehen.\l" - .string "Ich hoffe, du schaltest dann ein!$" + .string "I see!\p" + .string "So that’s how you imagine the concept\n" + .string "of “{STR_VAR_2}” to be.\p" + .string "Thank you!\n" + .string "You’ve given me some good ideas.\p" + .string "I think I can write a good story on\n" + .string "POKéMON CONTESTS now.\p" + .string "Maybe, just maybe, this story will even\n" + .string "make it to television.\l" + .string "I hope you’ll look forward to it!$" FallarborTown_ContestLobby_Text_1A7256:: @ 81A7256 - .string "Oh, das ist wirklich schade...\p" - .string "Nun, wenn du eine gute Geschichte auf\n" - .string "Lager hast, melde dich wieder bei mir.$" + .string "Oh, too bad...\p" + .string "Well, if you come across a good story,\n" + .string "please do share it with me.$" FallarborTown_ContestLobby_Text_1A72A8:: @ 81A72A8 - .string "Ich freue mich schon auf deinen\n" - .string "nächsten POKéMON-WETTBEWERB.$" + .string "I’ll be looking forward to your next\n" + .string "POKéMON CONTEST.$" gTVBravoTrainerText1:: @ 81A72DE .string "Yeah!\n" - .string "Es ist BRAVO TRAINER Zeit!\p" - .string "Heute stellen wir ein POKéMON vor,\n" - .string "das zu {STR_VAR_1} gehört.\p" - .string "Dieses POKéMON hat eine {STR_VAR_2}-\n" - .string "Wertung in der {STR_VAR_3} Klasse bekommen.$" + .string "It’s BRAVO TRAINER time!\p" + .string "Today, we’re going to profile a POKéMON\n" + .string "belonging to {STR_VAR_1}.\p" + .string "Now, this POKéMON boasts a {STR_VAR_2}\n" + .string "rating in the {STR_VAR_3} Rank.$" gTVBravoTrainerText2:: @ 81A736B - .string "Begrüßt {STR_VAR_2},\n" - .string "das {STR_VAR_1}!\p" - .string "Der Kosename {STR_VAR_2}...\p" - .string "Selbst dieser Kosename strahlt die\n" - .string "Aura von “{STR_VAR_3}” aus!$" + .string "Introducing {STR_VAR_2} the\n" + .string "{STR_VAR_1}!\p" + .string "The nickname {STR_VAR_2}...\p" + .string "Even the nickname exudes an air that\n" + .string "proclaims “{STR_VAR_3}”!$" gTVBravoTrainerText3:: @ 81A73CA - .string "Als der TRAINER {STR_VAR_1} sein POKéMON\n" - .string "in einem WETTBEWERB antreten ließ,\l" - .string "haben wir es geschafft, einige leiden-\l" - .string "schaftliche Aussagen zu erhalten.$" + .string "Anyway, when the TRAINER {STR_VAR_1}\n" + .string "entered the POKéMON in a CONTEST,\l" + .string "we managed to get a few impassioned\l" + .string "quotes about the trusty partner.$" gTVBravoTrainerText4:: @ 81A744D - .string "Als {STR_VAR_1} nach dem WETTBEWERB über\n" - .string "diesen befragt wurde, bekamen wir ein\l" - .string "breites Grinsen und folgende Antwort:\l" - .string "“{STR_VAR_2}!”\p" - .string "Nun, sicher, das POKéMON von {STR_VAR_1}\n" - .string "kam auf Platz {STR_VAR_3} im WETTBEWERB.\p" - .string "Die Aussage passt absolut zu {STR_VAR_1},\n" - .string "das ist meine Meinung!$" + .string "Asked about the CONTEST afterwards,\n" + .string "{STR_VAR_1} happily replied with a huge\l" + .string "grin, “{STR_VAR_2}!”\p" + .string "Well, sure, {STR_VAR_1}’s POKéMON came in\n" + .string "number {STR_VAR_3} in the CONTEST.\p" + .string "That line perfectly suits {STR_VAR_1}\n" + .string "right now, I’d say!$" gTVBravoTrainerText5:: @ 81A7508 - .string "Als {STR_VAR_1} nach dem WETTBEWERB über\n" - .string "diesen befragt wurde, bekamen wir die\l" - .string "bittere Antwort: “{STR_VAR_2}!”\p" - .string "Nun, sicher, das POKéMON von {STR_VAR_1}\n" - .string "kam auf Platz {STR_VAR_3} im WETTBEWERB.\p" - .string "Die Enttäuschung von {STR_VAR_1} wird hier\n" - .string "mehr als deutlich, das ist meine Meinung.$" + .string "Asked about the CONTEST afterwards,\n" + .string "{STR_VAR_1} replied with a tinge of\l" + .string "bitterness, “{STR_VAR_2}.”\p" + .string "Well, sure, {STR_VAR_1}’s POKéMON came in\n" + .string "number {STR_VAR_3} in the CONTEST.\p" + .string "{STR_VAR_1}’s disappointment comes across\n" + .string "loud and clear, I’d say!$" gTVBravoTrainerText6:: @ 81A75CE - .string "Möchtet ihr auch wissen, was {STR_VAR_1}\n" - .string "sich unter {STR_VAR_2} vorstellt?\p" - .string "Ihr könnt darauf wetten, dass wir\n" - .string "danach gefragt haben! Natürlich!\p" - .string "Die Antwort war klipp und klar:\n" + .string "Wouldn’t you also like to know what\n" + .string "{STR_VAR_1} imagines {STR_VAR_2} to be?\p" + .string "You bet we did!\n" + .string "So we asked, of course!\p" + .string "The answer is all perfectly condensed:\n" .string "“{STR_VAR_3}!”\p" - .string "Das ist es, was {STR_VAR_2} für {STR_VAR_1}\n" - .string "repräsentiert!$" + .string "That’s what the concept of {STR_VAR_2}\n" + .string "represents to {STR_VAR_1}!$" gTVBravoTrainerText7:: @ 81A768D - .string "Die letzte Attacke, {STR_VAR_2}, die\n" - .string "von {STR_VAR_1} eingesetzt wurde,\l" - .string "ist ganz klar “{STR_VAR_3}!”$" + .string "The last move {STR_VAR_2} used by\n" + .string "the {STR_VAR_1} is entirely about\l" + .string "“{STR_VAR_3}”!$" gTVBravoTrainerText8:: @ 81A76C5 .string "Bravo, {STR_VAR_1}!\n" .string "Bravo, {STR_VAR_2}!\p" - .string "Wir hoffen, dass {STR_VAR_1} noch höhere\n" - .string "Gipfel erklimmen wird!\p" - .string "Unsere Zeit ist mal wieder abgelaufen!\n" - .string "Bis zum nächsten Mal! Tschüss!$" + .string "I hope we can count on seeing\n" + .string "{STR_VAR_1} scale even greater heights!\p" + .string "That’s all the time we have!\n" + .string "Until next time, see you!$" gTVBravoTrainerText9:: @ 81A774F - .string "Wir stellen vor: TRAINERS {STR_VAR_1}!$" + .string "Introducing the TRAINER’s {STR_VAR_1}!$" BattleTower_Lobby_Text_1A776D:: @ 81A776D - .string "Hallo! Du bist der TRAINER, der gerade\n" - .string "gekämpft hat, richtig?\p" - .string "Ich interviewe TRAINER in der ganzen\n" - .string "Welt.\p" - .string "Würdest du mir deine Eindrücke über\n" - .string "das Kämpfen schildern?$" + .string "Hello! You’re the TRAINER who just had\n" + .string "a battle, right?\p" + .string "I’m gathering interviews with TRAINERS\n" + .string "all over the place.\p" + .string "May I get a few words from you about\n" + .string "your impressions on battling?$" BattleTower_Lobby_Text_1A7823:: @ 81A7823 - .string "Ja? Wirklich?\n" - .string "Danke schön!\l" - .string "Dann, äh...\p" - .string "Wie war es heute im DUELLTURM?\p" - .string "Warst du mit dem Kampf zufrieden?\n" - .string "Oder bist du unzufrieden?$" + .string "You will? Really?\n" + .string "Thank you!\l" + .string "Then, uh...\p" + .string "How did things turn out in the BATTLE\n" + .string "TOWER today?\p" + .string "Were you satisfied with the battle?\n" + .string "Or are you unhappy?$" BattleTower_Lobby_Text_1A78B7:: @ 81A78B7 .string "Oh...\n" - .string "Tut mir Leid, dich zu stören.\p" - .string "Bitte gib uns ein Interview, wenn du\n" - .string "wieder im DUELLTURM kämpfst.$" + .string "Sorry we disturbed you.\p" + .string "Please give us an interview the next\n" + .string "time you visit the BATTLE TOWER.$" BattleTower_Lobby_Text_1A791B:: @ 81A791B - .string "Ja, natürlich!\p" - .string "Da ist dieser untrügliche Ausdruck der\n" - .string "Zufriedenheit auf deinem Gesicht...\p" - .string "Ganz offensichtlich hattest du einen\n" - .string "großartigen Kampf!$" + .string "Well, of course!\p" + .string "That unmistakable look of satisfaction\n" + .string "on your face...\p" + .string "It’s obvious that you’ve had a great\n" + .string "battle.$" BattleTower_Lobby_Text_1A7990:: @ 81A7990 - .string "Oh, ich verstehe...\p" - .string "Nun, es ist immer schwer, den Kampf so\n" - .string "zu beeinflussen, wie man es möchte.$" + .string "Oh, I see...\p" + .string "Well, it certainly is difficult to make a\n" + .string "battle turn out exactly as planned.$" BattleTower_Lobby_Text_1A79EB:: @ 81A79EB - .string "Darf ich dir noch eine Frage stellen?\p" - .string "Wenn du deine Eindrücke über diesen\n" - .string "Kampf beschreiben müsstest, was\l" - .string "würdest du dann sagen?$" + .string "Oh, oh, may I ask one more question?\p" + .string "If you were to describe your\n" + .string "impressions about this battle with one\l" + .string "saying, what would it be?$" BattleTower_Lobby_Text_1A7A6E:: @ 81A7A6E - .string "Das ist erstaunlich cool!\p" - .string "Eine großartige Sache! Ich wünsche dir\n" - .string "im nächsten Kampf genauso viel Glück!\p" - .string "Ich hoffe, wir treffen uns bald wieder!$" + .string "Oh, that is stunningly cool!\p" + .string "That’s a great line!\n" + .string "I hope you’ll do great next time, too.\p" + .string "I hope to see you again!$" BattleTower_Lobby_Text_1A7AE0:: @ 81A7AE0 - .string "Oh, ich verstehe...\p" - .string "Nun, auch die ruhigen Typen sind cool,\n" - .string "nicht wahr?\p" - .string "Ich hoffe, du gibst mir bald wieder die\n" - .string "Möglichkeit, deine Eindrücke\l" - .string "festzuhalten!$" + .string "Oh, I see...\p" + .string "Still, being the silent type is also cool,\n" + .string "isn’t it?\p" + .string "I hope you’ll give me the opportunity to\n" + .string "share your thoughts again!$" BattleTower_Lobby_Text_1A7B66:: @ 81A7B66 - .string "Ich freue mich schon auf deinen\n" - .string "nächsten Kampf!$" + .string "I’ll be looking forward to your next\n" + .string "battle!$" gTVBravoTrainerBattleTowerText1:: @ 81A7B93 .string "Yeah!\n" - .string "Es ist BRAVO TRAINER Zeit!\p" - .string "Heute stellen wir {STR_VAR_1} vor. {STR_VAR_1}\n" - .string "hat sich der Herausforderung im\l" - .string "DUELLTURM gestellt!\p" - .string "Bei dieser Begegnung hat {STR_VAR_1}\n" - .string "das listige {STR_VAR_2} mitgebracht.$" + .string "It’s BRAVO TRAINER time!\p" + .string "Today, we’re going to profile {STR_VAR_1},\n" + .string "who took the BATTLE TOWER challenge!\p" + .string "For the challenge, {STR_VAR_1} entered one\n" + .string "wicked {STR_VAR_2}.$" gTVBravoTrainerBattleTowerText2:: @ 81A7C26 - .string "Das Paar stellte einen neuen Rekord von\n" - .string "{STR_VAR_2} Siegen in Folge in einer Level {STR_VAR_1}-\l" - .string "Konkurrenz auf! Bravo, TRAINER!$" + .string "The pair set a new record of {STR_VAR_2} wins\n" + .string "in a row in Level {STR_VAR_1} competition!\l" + .string "Bravo, TRAINER!$" gTVBravoTrainerBattleTowerText3:: @ 81A7C7D - .string "Die beiden scheiterten schließlich an\n" - .string "{STR_VAR_1} im Kampf Nummer {STR_VAR_2}.\l" - .string "Netter Versuch, TRAINER!\p" - .string "Es war einfach nur großes Pech, so\n" - .string "früh während dieser Herausforderung\l" - .string "auf {STR_VAR_1} zu treffen.\p" - .string "Wir fragten den TRAINER nach den\n" - .string "Eindrücken, die der Kampf gegen\l" - .string "{STR_VAR_1} hinterlassen hat.$" + .string "The twosome finally succumbed to\n" + .string "{STR_VAR_1} in match number {STR_VAR_2}.\l" + .string "Nice try, TRAINER!\p" + .string "But, hey, it’s just bad luck to run into\n" + .string "{STR_VAR_1} so early in the challenge.\p" + .string "We asked the TRAINER for impressions\n" + .string "on the match with {STR_VAR_1}.$" gTVBravoTrainerBattleTowerText4:: @ 81A7D4A - .string "Die beiden haben gewonnen, indem sie\n" - .string "{STR_VAR_2} von {STR_VAR_1} klar\l" - .string "besiegt haben. Bravo, TRAINER!\p" - .string "Sogar {STR_VAR_1} wurde besiegt...\n" - .string "Das ist unglaublich! Einfach unglaublich!\p" - .string "Wir haben den TRAINER nach den\n" - .string "Eindrücken im Moment des Sieges\l" - .string "gefragt.$" + .string "The twosome won it all by defeating\n" + .string "{STR_VAR_1}’s {STR_VAR_2} thoroughly.\l" + .string "Bravo, TRAINER!\p" + .string "Knocking off even {STR_VAR_1}...\n" + .string "It defies belief! Simply astounding!\p" + .string "We asked the TRAINER for impressions\n" + .string "on the moment of glory.$" gTVBravoTrainerBattleTowerText5:: @ 81A7E0C - .string "Nach einer Reihe von Siegen musste sich\n" - .string "das Paar schließlich doch {STR_VAR_2}\l" - .string "von {STR_VAR_1} geschlagen geben.\p" - .string "Netter Versuch, TRAINER!\p" - .string "Man sieht nicht oft so ein wunderbares\n" - .string "Team wie {STR_VAR_1} und\l" - .string "{STR_VAR_2}. Das könnt ihr glauben!\p" - .string "Wir haben den TRAINER gefragt, wie es\n" - .string "war, gegen dieses Super-Paar zu\l" - .string "kämpfen.$" + .string "After a string of wins, the pair finally\n" + .string "succumbed to {STR_VAR_1}’s {STR_VAR_2},\l" + .string "their final hurdle.\p" + .string "Nice try, TRAINER!\p" + .string "Still, you have to give credit.\n" + .string "You don’t see many famous combinations\l" + .string "like {STR_VAR_1} and {STR_VAR_2}.\p" + .string "We asked the TRAINER for impressions\n" + .string "on battling the celebrity pair.$" gTVBravoTrainerBattleTowerText6:: @ 81A7F0E - .string "Und das hat uns der TRAINER gesagt:\n" - .string "“Ich bin zufrieden!”\p" - .string "Ist das nicht eine erfrischend offene\n" - .string "Antwort? Bravo, TRAINER!\p" - .string "Aber ist ein so eingefleischter TRAINER\n" - .string "überhaupt in der Lage, mit einem Kampf\l" - .string "zufrieden zu sein?\p" - .string "Ich habe herausgefunden, wie zufrieden\n" - .string "der TRAINER war, als ich diese Worte\l" - .string "hörte:$" + .string "This is what the TRAINER had to say:\n" + .string "“I’m satisfied!”\p" + .string "Now isn’t that a refreshing reply?\n" + .string "Bravo, TRAINER!\p" + .string "Isn’t it out-and-out awesome to be able\n" + .string "to battle to full satisfaction?\p" + .string "I found out exactly how satisfied\n" + .string "when I heard the TRAINER say this:$" gTVBravoTrainerBattleTowerText7:: @ 81A8004 - .string "Und das hat uns der TRAINER verraten:\n" - .string "“Ich bin nicht zufrieden...”\p" - .string "Unser TRAINER war wohl gerade etwas\n" - .string "niedergeschlagen, als er das sagte.\p" - .string "Und es ist nicht immer leicht, nach einem\n" - .string "Kampf voll zufrieden zu sein, richtig?\p" - .string "Nun, wir haben nachgehakt und heraus-\n" - .string "gefunden, wie unzufrieden der TRAINER\l" - .string "tatsächlich war:$" + .string "This is what the TRAINER had to say:\n" + .string "“I’m not satisfied...”\p" + .string "Our TRAINER was obviously a little down\n" + .string "when that was uttered.\p" + .string "Still, it’s not easy to be able to battle\n" + .string "with complete satisfaction, am I right?\p" + .string "Anyway, I found out how dissatisfied\n" + .string "our TRAINER was when I heard this:$" gTVBravoTrainerBattleTowerText8:: @ 81A8119 - .string "Nichts$" + .string "None$" gTVBravoTrainerBattleTowerText9:: @ 81A811E - .string "Nichts$" + .string "None$" gTVBravoTrainerBattleTowerText10:: @ 81A8123 - .string "Nichts$" + .string "None$" gTVBravoTrainerBattleTowerText11:: @ 81A8128 - .string "Nichts$" + .string "None$" gTVBravoTrainerBattleTowerText12:: @ 81A812D - .string "“{STR_VAR_1}”.$" + .string "“{STR_VAR_1}.”$" gTVBravoTrainerBattleTowerText13:: @ 81A8133 - .string "“{STR_VAR_1}”.\n" - .string "Ist das nicht großartig?\p" - .string "Das drückt wahrhaftig {STR_VAR_2}s Freude\n" - .string "aus. Das würde ich doch sagen!\p" - .string "Am Ende noch der Kampf gegen\n" - .string "{STR_VAR_3}... Das war wirklich das, was\l" - .string "man “{STR_VAR_1}” nennt!$" + .string "“{STR_VAR_1}.”\n" + .string "Now isn’t that great?\p" + .string "It really expresses {STR_VAR_2}’s joy,\n" + .string "I’d say.\p" + .string "That battle with {STR_VAR_3} at the\n" + .string "end... It really was what you’d call\l" + .string "“{STR_VAR_1}”!$" gTVBravoTrainerBattleTowerText14:: @ 81A81BC - .string "“{STR_VAR_1}”.\n" - .string "Eine treffende Aussage!\p" - .string "Das Ende des Kampfes gegen\n" - .string "{STR_VAR_3}... Man kann es nur\l" - .string "“{STR_VAR_1}” nennen!\p" - .string "Ich finde, die Enttäuschung von\n" - .string "{STR_VAR_2} wird mehr als deutlich.$" + .string "“{STR_VAR_1}.”\n" + .string "Now isn’t that fitting?\p" + .string "That battle with {STR_VAR_3} at the\n" + .string "end... You can’t describe it as anything\l" + .string "else but “{STR_VAR_1}”!\p" + .string "{STR_VAR_2}’s disappointment comes across\n" + .string "loud and clear, I’d say!$" gTVBravoTrainerBattleTowerText15:: @ 81A8267 .string "Bravo, {STR_VAR_1}!\n" .string "Bravo, {STR_VAR_2}!\p" - .string "Ich hoffe, wir sehen {STR_VAR_1} noch\n" - .string "höhere Gipfel erklimmen!\p" - .string "Das war’s für den Moment!\n" - .string "Bis zur nächsten Sendung!$" + .string "I hope we can count on seeing\n" + .string "{STR_VAR_1} scale even greater heights!\p" + .string "That’s all the time we have!\n" + .string "Until next time, see you!$" + SlateportCity_PokemonFanClub_Text_1A82F1:: @ 81A82F1 .string "Wow!\p" - .string "Es ist ganz offensichtlich, dass du\n" - .string "deine Liebe {STR_VAR_1} schenkst.\p" - .string "Okay, es heißt {STR_VAR_2}.\p" - .string "Darf ich dich um einen Gefallen bitten?\p" - .string "Ich bin TV-Reporter und mache eine\n" - .string "Umfrage zum Thema POKéMON.\p" - .string "Würdest du mir bitte ein paar einfache\n" - .string "Fragen beantworten?$" + .string "It’s plain to see that you lavish your\n" + .string "love on your {STR_VAR_1}.\p" + .string "Okay, it’s named {STR_VAR_2}.\p" + .string "Can I ask you a favor?\p" + .string "I’m a TV reporter, and I’m running\n" + .string "a survey on POKéMON.\p" + .string "Would you be willing to answer a few\n" + .string "simple questions for me?$" SlateportCity_PokemonFanClub_Text_1A83D0:: @ 81A83D0 - .string "Großartig! Danke schön!\p" - .string "Okay, los geht’s. Ich brauche\n" - .string "kurze, knappe Antworten, okay?$" + .string "Great! Thank you!\p" + .string "Okay, here goes.\n" + .string "I just need quick answers, okay?$" SlateportCity_PokemonFanClub_Text_1A8414:: @ 81A8414 - .string "Als du {STR_VAR_1} zum ersten Mal ge-\n" - .string "sehen hast, was war das für\l" - .string "ein Gefühl?\p" - .string "Wie würdest du die Gefühle zu dem\n" - .string "Zeitpunkt beschreiben?$" + .string "When you first met {STR_VAR_1}, what\n" + .string "did you feel?\p" + .string "How would you describe your feelings\n" + .string "at the time?$" SlateportCity_PokemonFanClub_Text_1A8470:: @ 81A8470 - .string "Du kümmerst dich liebevoll um\n" - .string "{STR_VAR_1}.\p" - .string "Wenn du es mit etwas vergleichen\n" - .string "würdest, das du magst, was wäre das?$" + .string "Your {STR_VAR_1} is cared for lovingly.\p" + .string "If you were to liken it to something\n" + .string "that you like, what would it be?$" SlateportCity_PokemonFanClub_Text_1A84D5:: @ 81A84D5 - .string "Diese Frage bezieht sich auch auf dein\n" - .string "geliebtes {STR_VAR_1}.\p" - .string "Was hat dich an {STR_VAR_1} angezogen?$" + .string "This question also relates to your\n" + .string "beloved {STR_VAR_1}.\p" + .string "What was it about {STR_VAR_1} that\n" + .string "attracted you?$" SlateportCity_PokemonFanClub_Text_1A852D:: @ 81A852D - .string "Okay, das ergibt einen Sinn.\p" - .string "Diese Frage mag vielleicht etwas schwer\n" - .string "sein, um sie kurz zu beantworten.\p" - .string "Also...\p" - .string "Was bedeuten POKéMON für dich?$" + .string "Okay, that makes sense.\p" + .string "The next question might be a little\n" + .string "on the tough side.\p" + .string "Here goes...\p" + .string "What do POKéMON mean to you?$" SlateportCity_PokemonFanClub_Text_1A85A6:: @ 81A85A6 - .string "Ich verstehe!\p" + .string "I see!\p" .string "Hmhm...\p" - .string "Das war’s! Danke, dass du mir deine\n" - .string "Zeit zur Verfügung gestellt hast!\p" - .string "Es hat mir viel Spaß gemacht, mich mit\n" - .string "dir zu unterhalten.\p" - .string "Vielleicht kannst du dieses Interview\n" - .string "bald im Fernsehen sehen. Achte darauf!\p" - .string "Okay, das ist alles.\n" - .string "Vielen Dank und leb wohl.$" + .string "Okay!\n" + .string "Thanks for helping me out.\p" + .string "It was fun and enlightening chatting\n" + .string "with you.\p" + .string "It’s possible that our interview will end\n" + .string "up on TV. Tune in and check!\p" + .string "Okay, that’s all.\n" + .string "Bye-bye!$" SlateportCity_PokemonFanClub_Text_1A8667:: @ 81A8667 .string "Oh, okay...\p" - .string "Nun, wenn du mir doch etwas über\n" - .string "POKéMON erzählen willst, ich bin hier.$" + .string "Well, if you get the urge to tell me\n" + .string "about POKéMON, I’ll be here!$" SlateportCity_PokemonFanClub_Text_1A86B5:: @ 81A86B5 - .string "Ich liebe meinen Job - ich lerne so viel\n" - .string "über POKéMON während der Interviews.$" + .string "I enjoy this job - you get to learn so\n" + .string "much about POKéMON by doing\l" + .string "interviews.$" SlateportCity_PokemonFanClub_Text_1A8704:: @ 81A8704 - .string "Hallo, du scheinst deinem {STR_VAR_1}\n" - .string "sehr nahe zu stehen.\p" - .string "Weißt du was?\n" - .string "Ich bin ein TV-Reporter.\p" - .string "Ich reise herum und interviewe Leute,\n" - .string "befrage sie zu POKéMON.\p" - .string "Darf ich dich auch etwas über dein\n" - .string "{STR_VAR_1} fragen?$" + .string "Hi, you seem to be very close to your\n" + .string "{STR_VAR_1}.\p" + .string "Do you know what?\n" + .string "I’m a TV reporter.\p" + .string "I travel around interviewing people\n" + .string "about POKéMON.\p" + .string "I’m wondering if you’d be willing to tell\n" + .string "me a little abut your {STR_VAR_1}?$" SlateportCity_PokemonFanClub_Text_1A87CA:: @ 81A87CA - .string "Wow, danke schön!\p" - .string "Dann erzähl mir doch einfach alles, was\n" - .string "dir an {STR_VAR_1} gefällt.$" + .string "Wow, thank you!\p" + .string "Okay, then, please tell me anything you’d\n" + .string "like about your {STR_VAR_1}.$" SlateportCity_PokemonFanClub_Text_1A8818:: @ 81A8818 .string "Wow...\n" - .string "Das ist ja ein interessanter Bericht.\p" - .string "Du stehst deinem {STR_VAR_1} sehr nahe,\n" - .string "nicht wahr?\p" - .string "Ich denke, dein Bericht wird sich\n" - .string "großartig im Fernsehen machen.\p" - .string "Ich verspreche, ich mache daraus eine\n" - .string "unterhaltsame Sendung. Die darfst\l" - .string "du nicht verpassen!\p" - .string "Okay, das war’s.\n" - .string "Danke und leb wohl.$" + .string "That’s an interesting account.\p" + .string "You really are tight with {STR_VAR_1},\n" + .string "aren’t you?\p" + .string "I get the feeling that your account\n" + .string "will make a great TV story.\p" + .string "I promise that I’ll turn this into\n" + .string "an entertaining show.\l" + .string "Keep your eyes out for it.\p" + .string "Okay, that’s all.\n" + .string "Bye-bye!$" gTVFanClubOpinionsText1:: @ 81A8917 - .string "WIR SIND DER POKéMON-FANCLUB.\p" - .string "Wir sind live auf Sendung!\p" - .string "Hier ist eure Meinung gefragt und ich\n" - .string "spreche sie öffentlich laut für euch\l" - .string "aus. Ist das nicht fantastisch?\p" - .string "Heute bringen wir euch eine Reportage\n" - .string "unseres Reporters ins Haus, der im Auf-\l" - .string "trag des POKéMON-FANCLUBS unter-\l" - .string "wegs war.\p" - .string "Wer ist heute der glückliche\n" - .string "POKéMON-Fan, den wir hier vorstellen?\p" + .string "WE ARE THE POKéMON FAN CLUB!\p" + .string "We’re on the air!\p" + .string "On this program, we get your opinions,\n" + .string "and I shout them out on your behalf!\l" + .string "Isn’t it a fantastic program concept?\p" + .string "Today, we bring you this report from\n" + .string "our reporter, who we sent out to the\l" + .string "POKéMON FAN CLUB.\p" + .string "So, just who is today’s featured\n" + .string "POKéMON fan?\p" .string "... ... ... ... ... ... ... ...\p" .string "{STR_VAR_1}!\p" - .string "So, was hat uns {STR_VAR_1} wohl über\n" - .string "{STR_VAR_3}, dem {STR_VAR_2},\l" - .string "zu sagen?\p" - .string "Und ich... Ich werde die Worte der Zu-\n" - .string "neigung laut im Fernsehen herausrufen!\p" - .string "Huuh-haa!\p" - .string "Lasst uns alle laut rufen!$" + .string "So, let’s hear what {STR_VAR_1} has to\n" + .string "say about {STR_VAR_3} the {STR_VAR_2}.\p" + .string "And, I will shout those words of love\n" + .string "out loud on TV!\p" + .string "Hoo-hah!\p" + .string "Let’s shout!$" gTVFanClubOpinionsText2:: @ 81A8AE5 - .string "Wir haben {STR_VAR_1} gefragt: “Als du\n" - .string "{STR_VAR_2} das erste Mal gesehen hast,\l" - .string "was war das für ein Gefühl?”\p" - .string "“{STR_VAR_3}!”\p" - .string "Juhuhuu! Das ist eine super Aussage!\p" - .string "Bringt sie euch nicht auch Erinnerungen\n" - .string "an längst vergangene Zeiten wieder?$" + .string "We asked {STR_VAR_1}, “When you first\n" + .string "laid eyes on your {STR_VAR_2}, what was\l" + .string "your initial thought?“\p" + .string "“{STR_VAR_3}!“\p" + .string "Yeahah! That’s a mighty fine shout!\p" + .string "Doesn’t it bring back memories of those\n" + .string "days long gone by?$" gTVFanClubOpinionsText3:: @ 81A8B9D - .string "Wir haben {STR_VAR_1} gefragt: “Wenn du\n" - .string "{STR_VAR_2} mit etwas vergleichen\l" - .string "würdest, das du magst, was wäre das?”\p" + .string "We asked {STR_VAR_1}, “If you were to\n" + .string "liken your {STR_VAR_2} to something,\l" + .string "it would be...”\p" .string "... ... ... ... ... ... ... ...\p" .string "“{STR_VAR_3}!”\p" - .string "Huhuhuuu! Was für ein origineller\n" - .string "Vergleich!\p" - .string "Man spürt gleich das intensive Gefühl,\n" - .string "das der TRAINER für {STR_VAR_2}\l" - .string "empfindet!$" + .string "Whoah-oh, now that’s an original idea!\p" + .string "You sure can sense the intensity of\n" + .string "feeling the TRAINER has for\l" + .string "{STR_VAR_2}.$" gTVFanClubOpinionsText4:: @ 81A8C77 - .string "Sehen wir mal weiter...\n" - .string "Und was genau findet {STR_VAR_1} so\l" - .string "anziehend an {STR_VAR_2}?\p" + .string "And let’s see...\n" + .string "What was it about that {STR_VAR_2}\l" + .string "that so attracted {STR_VAR_1}?\p" .string "... ... ... ... ... ... ... ...\p" .string "“{STR_VAR_3}!”\p" - .string "Heiaaa! Was für eine spektakuläre\n" - .string "Erklärung!\p" - .string "Die Liebe dieses TRAINERS zu seinem\n" - .string "{STR_VAR_2} wird mehr als deutlich!$" + .string "Whoa! Such a spectacular declaration!\p" + .string "The love of this TRAINER for the\n" + .string "{STR_VAR_2} comes across loud and clear!$" gTVFanClubOpinionsText5:: @ 81A8D45 - .string "Hm? Oh, da gibt es noch mehr.\n" - .string "Dem müssen wir mal nachgehen.\p" - .string "Lasst uns mal sehen...\p" - .string "Wir haben {STR_VAR_1} gefragt: “Was be-\n" - .string "deuten dir POKéMON?”\p" + .string "Hm? Oh, there’s still more.\n" + .string "Let’s check it out!\p" + .string "Let me see, now...\p" + .string "We asked {STR_VAR_1}, “What do POKéMON\n" + .string "mean to you?”\p" .string "... ... ... ... ... ...\p" .string "“{STR_VAR_3}!”\p" .string "Bravo!\p" - .string "Das ist das Beste des heutigen Tages!\p" + .string "That’s the best shout I’ve had all day!\p" .string "“{STR_VAR_3}!”\p" - .string "Man will das immer und immer wieder\n" - .string "laut herausrufen!\p" - .string "Nach diesem großartigen Ausruf ist es\n" - .string "auch schon wieder Zeit, sich zu\l" - .string "verabschieden!\p" - .string "Also rufen wir jetzt zum Abschluss\n" - .string "alle zusammen...\p" + .string "It makes you want to shout it out loud\n" + .string "again and again!\p" + .string "Now that we’ve had a great shout, it’s\n" + .string "time to say good-bye until next time!\p" + .string "So, let’s all have one last shout!\n" + .string "All together now...\p" .string "“{STR_VAR_3}!”$" gTVFanClubText1:: @ 81A8EC9 - .string "WIR SIND DER POKéMON-FANCLUB.\p" - .string "Wir sind live auf Sendung!\p" - .string "Heute steht unsere Sendung ganz im\n" - .string "Zeichen unserer POKéMON-UMFRAGE. \p" - .string "Welcher der Geschichten, die TRAINER\n" - .string "und POKéMON uns liefern, wird heute\l" - .string "unsere Aufmerksamkeit gehören?\p" - .string "Mal sehen...\p" - .string "Diese hier!\p" - .string "Wir fangen mit diesem Brief an!\p" - .string "Dies ist ein Brief von {STR_VAR_1} über\n" - .string "ein geliebtes {STR_VAR_2}.\p" - .string "Mal sehen, wie leidenschaftlich der\n" - .string "Schreiber seine Liebe zu {STR_VAR_2}\l" - .string "ausdrückt! Hmhm...$" + .string "WE ARE THE POKéMON FAN CLUB!\p" + .string "We’re on the air!\p" + .string "Today, we’ll get rolling with the POKéMON\n" + .string "SURVEY CORNER.\p" + .string "Out of all the tales woven by POKéMON\n" + .string "and TRAINERS, what startling new drama\l" + .string "will grab our attention today?\p" + .string "Let me see...\p" + .string "This one!\p" + .string "We’ll start with this letter!\p" + .string "It’s a letter from {STR_VAR_1} about a\n" + .string "beloved {STR_VAR_2}.\p" + .string "Let’s see how passionately our writer\n" + .string "can express love for the {STR_VAR_2}!\l" + .string "Hmhm...$" gTVFanClubText2:: @ 81A9048 - .string "Hui!\n" - .string "Was für ein wunderbarer Brief!$" + .string "Whoah!\n" + .string "What an amazing letter!$" gTVFanClubText3:: @ 81A9067 - .string "Ich liebe ihn, ich muss ihn nochmal lesen!$" + .string "I loved it, so here it is again!$" gTVFanClubText4:: @ 81A9088 - .string "Ein großartiger Brief, den man immer und\n" - .string "immer wieder lesen muss.$" + .string "A great letter bears reading over\n" + .string "and over!$" gTVFanClubText5:: @ 81A90B4 - .string "Dieses kleine “{STR_VAR_3}!” zeigt\n" - .string "die unglaublich emotionale Bindung!\p" - .string "Ein großartiger Brief mit einer das Herz\n" - .string "erwärmenden Tiefe!$" + .string "The bit “{STR_VAR_3},” that really\n" + .string "accentuates emotional impact!\p" + .string "It’s a great letter that has real\n" + .string "heartfelt depth!$" gTVFanClubText6:: @ 81A911F - .string "Besonders das kleine “{STR_VAR_3}”!\p" - .string "Ich liebe es, wie “{STR_VAR_3}” hier\n" - .string "gebraucht wird!$" + .string "Especially that “{STR_VAR_3}” bit!\p" + .string "I love how “{STR_VAR_3}” is used!$" gTVFanClubText7:: @ 81A9152 - .string "Übrigens, auch wenn es nicht wirklich\n" - .string "wichtig ist, “{STR_VAR_3}” ist\l" - .string "eine super Aussage.\p" - .string "Ich werde “{STR_VAR_3}” ab sofort in\n" - .string "meiner Konversation einsetzen.$" + .string "By the way, and it’s not important,\n" + .string "but “{STR_VAR_3}” is a great saying.\p" + .string "I’ve been using “{STR_VAR_3}” a lot\n" + .string "in conversations lately.$" gTVFanClubText8:: @ 81A91C6 - .string "Wenn ich diesen Brief bewerten müsste,\n" - .string "bekäme er {STR_VAR_3} Punkte von mir.\p" - .string "Und für das nächste Mal erwarte ich\n" - .string "einen noch besseren Brief, {STR_VAR_1}!\p" - .string "Hui je, schaut euch nur die Uhrzeit an!\n" - .string "Für heute sage ich Tschüss. Bis zum\l" - .string "nächsten Mal.$" + .string "If I had to score this letter,\n" + .string "I’d give it {STR_VAR_3} points.\p" + .string "Next time, I’ll be expecting an even\n" + .string "better letter, {STR_VAR_1}!\p" + .string "A-whoops, will you look at the time?\n" + .string "Time to say good-bye until next time!$" SlateportCity_OceanicMuseum_1F_Text_1A927F:: @ 81A927F - .string "Ach!\n" - .string "Magst du vielleicht POKéMON?\p" - .string "Ich habe einen Vertrag mit einem Fern-\n" - .string "sehsender.\p" - .string "Ich sammle aktuelle Geschichten von\n" - .string "POKéMON und ihren TRAINERN.\p" - .string "Hättest du Lust, mir etwas von dir zu\n" - .string "erzählen?$" + .string "Oh?\n" + .string "Do you perhaps like POKéMON?\p" + .string "I’m on assignment with the TV network.\p" + .string "I’m gathering stories on POKéMON and\n" + .string "TRAINERS that occurred recently.\p" + .string "If you don’t mind, could you tell me\n" + .string "something about yourself?$" SlateportCity_OceanicMuseum_1F_Text_1A934C:: @ 81A934C - .string "Ich sammle aktuelle Geschichten von\n" - .string "POKéMON und ihren TRAINERN.\p" - .string "Hättest du Lust, mir etwas von dir zu\n" - .string "erzählen?$" + .string "I’m gathering stories on POKéMON and\n" + .string "TRAINERS that occurred recently.\p" + .string "If you don’t mind, could you tell me\n" + .string "something about yourself?$" SlateportCity_OceanicMuseum_1F_Text_1A93D1:: @ 81A93D1 - .string "Oh, du hast Lust dazu?!?\n" - .string "Wunderbar! Danke schön!\p" - .string "Dann erzähl mir doch bitte von\n" - .string "interessanten Begebenheiten, in denen\l" - .string "POKéMON eine Rolle spielen.$" + .string "Oh, you will?\n" + .string "Thank you!\p" + .string "Then, please, tell me anything of\n" + .string "interest that you experienced recently\l" + .string "involving POKéMON.$" SlateportCity_OceanicMuseum_1F_Text_1A9446:: @ 81A9446 - .string "Oh, ich versteh’ schon...\p" - .string "Nun, wenn du mir eine interessante\n" - .string "Geschichte erzählen kannst, sag es mir.$" + .string "Oh, I see...\p" + .string "Well, if you do have an interesting\n" + .string "story to tell, please let me know.$" SlateportCity_OceanicMuseum_1F_Text_1A949A:: @ 81A949A - .string "Hach, eine erhebende Geschichte!\p" - .string "Ich bin sicher, deine Geschichte wird\n" - .string "im Fernsehen ausgestrahlt.\p" - .string "Irgendwann bestimmt. Also, verpasse\n" - .string "sie nicht!$" + .string "Oh, what an uplifting story!\p" + .string "I’ll be sure to get your story told\n" + .string "on television.\p" + .string "It should be aired sometime, I think,\n" + .string "so please look forward to it.$" SlateportCity_OceanicMuseum_1F_Text_1A952E:: @ 81A952E - .string "Hmmm... Da habe ich eine wirklich gute\n" - .string "Geschichte für das Fernsehprogramm.\p" - .string "Ich sollte sie schnell aufschreiben!$" + .string "Hmmm...\n" + .string "I’ve got a good story for a TV program.\p" + .string "I’d better write it up in a hurry!$" gTVRecentHappeningsText1:: @ 81A9581 - .string "Hallo, es ist Zeit für INTERESSANTE\n" - .string "GESCHICHTEN.\p" - .string "Für einen POKéMON-TRAINER ist jeder\n" - .string "Tag ein Tag voller Geschichten.\p" - .string "Wir möchten heute einige dieser \n" - .string "POKéMON-Geschichten erzählen.\p" - .string "Heute erzählen wir die Geschichte von\n" + .string "Hello, it’s time for RECENT HAPPENINGS.\p" + .string "For POKéMON TRAINERS, every day is\n" + .string "a storybook tale.\p" + .string "What we want to do is to introduce you\n" + .string "to some of these POKéMON tales.\p" + .string "Today, we bring you the story of the\n" .string "TRAINER {STR_VAR_1}.\p" - .string "Was mag {STR_VAR_1} wohl erlebt haben?\n" - .string "Lasst es uns herausfinden.\p" - .string "Mal sehen...$" + .string "What did {STR_VAR_1} experience recently?\n" + .string "Let’s find out.\p" + .string "Let’s see...$" gTVRecentHappeningsText2:: @ 81A9694 - .string "War das nicht aufschlussreich?\p" - .string "Diese Geschichte gibt genau wieder, was\n" - .string "{STR_VAR_1} vor kurzem erlebt hat. So, als\l" - .string "hätten wir es selber erlebt.$" + .string "Wasn’t that enlightening?\p" + .string "The story gives you a clear idea of what\n" + .string "{STR_VAR_1} has experienced recently.\l" + .string "It’s as if we were there as witnesses!$" gTVRecentHappeningsText3:: @ 81A971B - .string "“{STR_VAR_3}”. Das gibt\n" - .string "der Geschichte Akzente und Tiefe.$" + .string "“{STR_VAR_3}.” That\n" + .string "accents the tale and gives it depth.$" gTVRecentHappeningsText4:: @ 81A974B - .string "“{STR_VAR_3}.” Das gibt\n" - .string "uns einen Eindruck von dem Schauplatz.\l" - .string "Wir können uns alles besser vorstellen.$" + .string "“{STR_VAR_3}.”\n" + .string "That gives the tale a sense of place.\l" + .string "It lets us envision the tale’s setting.$" gTVRecentHappeningsText5:: @ 81A979F - .string "“{STR_VAR_3}” war die\n" - .string "eindrucksvollste Stelle der Geschichte.$" + .string "The “{STR_VAR_3}”\n" + .string "section of the tale is very expressive.$" gTVRecentHappeningsText6:: @ 81A97D0 - .string "{STR_VAR_1} hat uns eine wundervolle Ge-\n" - .string "schichte mit POKéMON erzählt.\p" - .string "Und nun hat sich diese Geschichte tief\n" - .string "in unsere Seelen eingebrannt.\p" - .string "Das war es für heute. Bitte schaltet\n" - .string "auch nächstes Mal wieder ein.$" + .string "{STR_VAR_1} has recounted a wonderful\n" + .string "tale involving POKéMON.\p" + .string "And now {STR_VAR_1}’s tale is indelibly\n" + .string "etched into your soul, too.\p" + .string "That’s it for today.\n" + .string "Please tune in next time.$" + gTVPokemonOutbreakText:: @ 81A986F - .string "Guten Tag, meine Damen und Herren!\n" - .string "Hier sind die POKéMON NACHRICHTEN.\p" - .string "Wir haben soeben von einem sehr\n" - .string "seltenen Ereignis erfahren.\p" - .string "Es wird berichtet, dass es in der Umge-\n" - .string "bung von {STR_VAR_1} zu einem Massen-\l" - .string "aufkommen der {STR_VAR_2} kam.\p" - .string "{STR_VAR_2}, das ist bestimmt jedem be-\n" - .string "kannt, ist ein seltenes POKéMON,\l" - .string "das nur sehr schwer zu finden ist.\p" - .string "Das scheint eine seltene Gelegenheit zu\n" - .string "sein, den Ausbruch von wilden\l" - .string "{STR_VAR_2} zu beobachten.\p" - .string "Das waren die POKéMON NACHRICHTEN.$" + .string "Greetings!\n" + .string "It’s time for POKéMON NEWS.\p" + .string "We’ve just received word of a very\n" + .string "rare occurrence.\p" + .string "There have been reports of a mass\n" + .string "outbreak of {STR_VAR_2} in the vicinity\l" + .string "of {STR_VAR_1}.\p" + .string "{STR_VAR_2}, as you’re probably aware,\n" + .string "is known as a POKéMON that’s rare\l" + .string "and hard to find.\p" + .string "It sounds like a rare opportunity to\n" + .string "see the mystifying outbreak of\l" + .string "{STR_VAR_2} in the wild.\p" + .string "That’s the news on POKéMON NEWS.$" gTVNameRaterText1:: @ 81A99D9 - .string "Und nun ist es wieder Zeit für...\n" - .string "DIE NAMENBEWERTER SHOW\p" - .string "Ich sage die Zukunft eures POKéMON\n" - .string "anhand seines Kosenamens vorher.\p" - .string "Ratschläge habe ich zu geben und\n" - .string "hilfreiche Ratschläge biete ich an.\p" - .string "Heute basiert meine Prophezeiung auf\n" - .string "dem Kosenamen {STR_VAR_3} von dem\l" - .string "POKéMON {STR_VAR_2} von {STR_VAR_1}.\p" + .string "And now, it’s time for...\n" + .string "THE NAME RATER SHOW.\p" + .string "I tell your POKéMON’s fortune from\n" + .string "the nickname you’ve bestowed.\p" + .string "Advice is what I have to give, and it is\n" + .string "helpful advice that I offer.\p" + .string "Today, I shall prophesize the nickname\n" + .string "{STR_VAR_3} of {STR_VAR_1}’s POKéMON\l" + .string "{STR_VAR_2}.\p" .string "Hmhm...\p" .string "Hmm...\n" - .string "Dieser Kosename...$" + .string "This nickname is...$" gTVNameRaterText2:: @ 81A9AF0 - .string "Ein Kosename, der auf ein vielfältiges\n" - .string "Talent hindeutet.\p" - .string "Ich rate dem TRAINER, mutig zu sein\n" - .string "und sich vielen Herausforderungen\l" - .string "zu stellen.$" + .string "A nickname that hints at talent in many\n" + .string "different ways.\p" + .string "I urge this TRAINER to take courage\n" + .string "and take on many challenges.$" gTVNameRaterText3:: @ 81A9B69 - .string "Dieser Kosename passt perfekt\n" - .string "zu {STR_VAR_1}, dem Namen des TRAINERS!\p" - .string "Ich sehe eine starke Partnerschaft, in\n" - .string "der das Timing perfekt ist.$" + .string "A nickname that perfectly complements\n" + .string "{STR_VAR_1}, the TRAINER’s name.\p" + .string "It suggests that you will forge a fine\n" + .string "partnership with precise timing.$" gTVNameRaterText4:: @ 81A9BEF - .string "Dieser Kosename betont die einzig-\n" - .string "artige Persönlichkeit des POKéMON.\p" - .string "Wird das POKéMON gut aufgezogen, ent-\n" - .string "wickelt sich seine Einzigartigkeit voll.$" + .string "A nickname fit for a unique individual\n" + .string "of a POKéMON!\p" + .string "If raised properly, this POKéMON’s\n" + .string "uniqueness will bloom excessively!$" gTVNameRaterText5:: @ 81A9C6A - .string "Dieser Kosename zeigt die mitfühlende\n" - .string "und fürsorgliche Seite der POKéMON.\p" - .string "Wird dieses POKéMON gut aufgezogen,\n" - .string "wird es sehr warmherzig sein!$" + .string "A nickname that will nurture the caring\n" + .string "and compassionate side of POKéMON.\p" + .string "If raised properly, this POKéMON will\n" + .string "come to exhibit real warmth!$" gTVNameRaterText6:: @ 81A9CF8 - .string "Ein schöner Kosename, der auf die\n" - .string "zukünftige Größe hindeutet.\p" - .string "Mich würde es schon interessieren, was\n" - .string "die Zukunft für dieses POKéMON bringt.$" + .string "A very fine nickname that hints at\n" + .string "greatness to come.\p" + .string "I am intrigued about what the future\n" + .string "holds in store for this POKéMON.$" gTVNameRaterText7:: @ 81A9D74 - .string "Dieser gute Kosename sollte das\n" - .string "POKéMON kräftig und herzlich\l" - .string "werden lassen!\p" - .string "Dieses POKéMON wird für lange, lange\n" - .string "Zeit gesund und fit sein.$" + .string "A good nickname that should make the\n" + .string "POKéMON hale and hearty!\p" + .string "That POKéMON should remain fit and\n" + .string "robust for a long, long time.$" gTVNameRaterText8:: @ 81A9DF3 - .string "Dieser gute Kosename sollte das\n" - .string "POKéMON sehr aktiv machen!\p" - .string "Ich denke, das POKéMON wird in\n" - .string "Kämpfen stark auftreten.$" + .string "A good nickname that should make the\n" + .string "POKéMON very active!\p" + .string "I should think that this POKéMON will be\n" + .string "a strong performer in battles.$" gTVNameRaterText9:: @ 81A9E75 - .string "Ein ansprechender Kosename, der dem\n" - .string "POKéMON Charme verleihen wird!\p" - .string "Ich bezweifle nicht, dass das POKéMON\n" - .string "in einem POKéMON WETTBEWERB alle\l" - .string "mit seinem Charme betören wird!$" + .string "An appealing nickname that should make\n" + .string "the POKéMON very charming!\p" + .string "I don’t doubt that this POKéMON will be\n" + .string "quite the charmer in POKéMON CONTESTS.$" gTVNameRaterText10:: @ 81A9F06 - .string "Der Kosename {STR_VAR_1} wurzelt in\n" - .string "dem Buchstaben “{STR_VAR_3}”.\p" - .string "Der Buchstabe wird noch verstärkt\n" - .string "durch den Anfangsbuchstaben “{STR_VAR_2}”,\p" - .string "wodurch der Kosename eine starke\n" - .string "Ausstrahlung bekommt.$" + .string "The nickname {STR_VAR_1} is rooted by\n" + .string "the letter “{STR_VAR_3}.”\p" + .string "That letter is supported by the first\n" + .string "letter “{STR_VAR_2},” which gives it a solid sense\l" + .string "of presence as a nickname.$" gTVNameRaterText11:: @ 81A9F9F - .string "Der Kosename {STR_VAR_1} ist auf \n" - .string "ansprechende Weise wohlklingend.\p" - .string "Die Ausstrahlung der Buchstaben “{STR_VAR_2}”\n" - .string "und “{STR_VAR_3}” - einfach bemerkenswert!$" + .string "The nickname {STR_VAR_1} is very\n" + .string "shapely in a pleasing manner.\p" + .string "The presence of the letters “{STR_VAR_2}” and\n" + .string "“{STR_VAR_3}” - now that is remarkably good!$" gTVNameRaterText12:: @ 81AA01E - .string "Der Kosename {STR_VAR_1} - er strahlt\n" - .string "ein sublimes, fließendes Gefühl aus.\p" - .string "Der Fluss des ersten Buchstaben “{STR_VAR_2}”\n" - .string "bis hin zum “{STR_VAR_3}” ist wunderbar.$" + .string "The nickname {STR_VAR_1} - it has a\n" + .string "sublime, flowing feel to it.\p" + .string "The flow from the initial letter “{STR_VAR_2}” to\n" + .string "“{STR_VAR_3}” is especially wonderful.$" gTVNameRaterText13:: @ 81AA09D - .string "Lasst uns weitere Beispiele für gute\n" - .string "Kosenamen untersuchen.$" + .string "Let’s examine other examples of fine\n" + .string "nicknames, shall we?$" gTVNameRaterText14:: @ 81AA0D7 - .string "Nehmen wir zum Beispiel einen Teil des\n" - .string "Namens von TRAINER {STR_VAR_1}. Wir er-\l" - .string "halten den schönen Kosenamen {STR_VAR_2}{STR_VAR_3}.$" + .string "Try this example. Take a part of the\n" + .string "TRAINER name of {STR_VAR_1}, and end\l" + .string "up with the fine nickname {STR_VAR_2}{STR_VAR_3}.$" gTVNameRaterText15:: @ 81AA138 - .string "Natürlich wäre der Kosename {STR_VAR_2}{STR_VAR_3}\n" - .string "genauso schön.$" + .string "The nickname {STR_VAR_2}{STR_VAR_3} would also work\n" + .string "quite well.$" gTVNameRaterText16:: @ 81AA166 - .string "Der Name der POKéMON-Kategorie\n" - .string "{STR_VAR_2} kann ebenfalls als Basis für\l" - .string "den Kosenamen {STR_VAR_1}{STR_VAR_3} dienen.$" + .string "The POKéMON’s species name of\n" + .string "{STR_VAR_2} could be used as the basis\l" + .string "for making the nickname {STR_VAR_1}{STR_VAR_3}.$" gTVNameRaterText17:: @ 81AA1C0 - .string "{STR_VAR_1}{STR_VAR_3} ist ebenfalls ein anziehender\n" - .string "Kosename.$" + .string "{STR_VAR_1}{STR_VAR_3} would also be an effective\n" + .string "nickname.$" gTVNameRaterText18:: @ 81AA1EA - .string "Man sollte niemals einem POKéMON die\n" - .string "Kategoriebezeichnung eines anderen\l" - .string "POKéMON als Kosenamen geben!\p" - .string "Zum Beispiel sollte der Name von\n" - .string "{STR_VAR_2} nicht für den Namen {STR_VAR_1}{STR_VAR_3}\l" - .string "verwendet werden.$" + .string "What should always be avoided is using\n" + .string "another POKéMON species name.\p" + .string "For instance, avoid taking the name of\n" + .string "{STR_VAR_2} to make the nickname {STR_VAR_1}{STR_VAR_3}.\l" + .string "That is unacceptable.$" gTVNameRaterText19:: @ 81AA28A - .string "Aber ich gebe zu, {STR_VAR_2}\n" - .string "liegt die Vergabe der Namen geradezu\l" - .string "im Blut.\p" - .string "Und ich hoffe, dass der TRAINER\n" - .string "{STR_VAR_1} weiter liebevoll behandelt.\p" - .string "Das war unsere heutige Show.\n" - .string "Wir sehen uns hoffentlich bald wieder.$" + .string "But I must say, {STR_VAR_2} has a most\n" + .string "remarkable flair for devising nicknames.\p" + .string "It is my hope that the TRAINER will\n" + .string "continue to treat {STR_VAR_1} with love.\p" + .string "That’s it for today’s show.\n" + .string "May we meet again.$" gTVFishingGuruAdviceText1:: @ 81AA344 - .string " {STR_VAR_2}-ANGLER\p" - .string "MODERATOR: Hallo! Heute gibt uns\n" - .string "{STR_VAR_2} Tipps zum Angeln.\p" - .string "GURU, welchen Ratschlag haben\n" - .string "Sie für uns?\p" - .string "GURU: Hm? Ein {STR_VAR_2} fangen?\n" - .string "Nun, zunächst sind Geduld und Ausdauer\l" - .string "gefragt. Das ist das Wichtigste.\p" - .string "Sehen Sie {STR_VAR_1} dort drüben?\n" - .string "Dieser TRAINER ist ein gutes Beispiel.\p" - .string "Der TRAINER hat bereits {STR_VAR_3}\n" - .string "POKéMON entkommen lassen.\p" - .string "Aber {STR_VAR_1} wartet ab. Gibt nicht auf.\n" - .string "Das ist die erste Regel beim Angeln von\l" - .string "{STR_VAR_2}.\p" - .string "MODERATOR: Ich verstehe...\p" - .string "Oh! {STR_VAR_1} hat endlich das extrem\n" - .string "schnelle {STR_VAR_2} gefangen!\p" - .string "Der TRAINER ist den Tränen nahe vor\n" - .string "Freude!\p" - .string "Wenn ich diesen begeisterten Ausdruck\n" - .string "sehe, möchte ich auch Angeln gehen.\p" - .string "Zuschauer, warum nutzen Sie nicht die\n" - .string "Chance, einige {STR_VAR_2} zu fischen?\p" - .string "Bis zur nächsten Sendung leben Sie wohl\n" - .string "und Petri heil!$" + .string "{STR_VAR_2} ANGLER\p" + .string "ANNOUNCER: Hello! Today, we’ll get tips\n" + .string "on fishing for {STR_VAR_2}.\p" + .string "GURU, what advice can you give for\n" + .string "catching {STR_VAR_2}?\p" + .string "GURU: Hm? Catching {STR_VAR_2}?\n" + .string "Well, let me tell you, be patient and wait.\l" + .string "That’s the bottom line.\p" + .string "Do you see {STR_VAR_1} over there?\n" + .string "That TRAINER makes a good example.\p" + .string "That TRAINER’s already had {STR_VAR_3}\n" + .string "POKéMON get away.\p" + .string "But there {STR_VAR_1} waits. No giving up.\n" + .string "That’s the law for catching {STR_VAR_2}.\p" + .string "ANNOUNCER: I see...\p" + .string "Oh! {STR_VAR_1} has finally landed an\n" + .string "elusive {STR_VAR_2}!\p" + .string "The TRAINER appears close to tears\n" + .string "out of sheer joy!\p" + .string "Seeing that elated look, I’m getting\n" + .string "the itch to go fishing, too!\p" + .string "Viewers, why not take this as a cue to\n" + .string "try some {STR_VAR_2} fishing?\p" + .string "Until our next broadcast, farewell and\n" + .string "good fishing to you all!$" gTVFishingGuruAdviceText2:: @ 81AA5F3 - .string " {STR_VAR_2}-ANGLER\p" - .string "MODERATOR: Hallo! Heute gibt uns\n" - .string "{STR_VAR_2} Tipps für das Angeln.\p" - .string "GURU, welchen Ratschlag haben\n" - .string "Sie für uns?\p" - .string "GURU: Hm? {STR_VAR_2} fangen?\n" - .string "Nun, setzen Sie Ihre ANGEL mit viel\l" - .string "Kraft ein.\p" - .string "Sehen Sie {STR_VAR_1} dort drüben?\n" - .string "Wie hier die ANGEL gehandhabt wird?\p" - .string "Der TRAINER hat bereits {STR_VAR_3}\n" - .string "fangen können.\p" - .string "MODERATOR: Das ist unglaublich!\n" - .string "Es wirkt wie ein Sturm...\p" - .string "Wenn ich solche Techniken beobachte,\n" - .string "möchte ich auch sofort Angeln gehen.\p" - .string "Zuschauer, warum nutzen Sie nicht die\n" - .string "Chance, einige {STR_VAR_2} zu fischen?\p" - .string "Bis zur nächsten Sendung leben Sie wohl\n" - .string "und Petri heil!$" + .string "{STR_VAR_2} ANGLER\p" + .string "ANNOUNCER: Hello! Today, we’ll get tips\n" + .string "on fishing for {STR_VAR_2}.\p" + .string "GURU, what advice can you give for\n" + .string "catching {STR_VAR_2}?\p" + .string "GURU: Hm? Catching {STR_VAR_2}?\n" + .string "Well, let me tell you, use your fishing\l" + .string "ROD with vigor!\p" + .string "Do you see {STR_VAR_1} over there?\n" + .string "See how the ROD is handled?\p" + .string "That TRAINER’s already caught\n" + .string "{STR_VAR_3} in a row.\p" + .string "ANNOUNCER: It’s incredible!\n" + .string "It looks like a storm...\p" + .string "Seeing technique of that caliber, I’m\n" + .string "getting the itch to go fishing, too.\p" + .string "Viewers, why not take this as a cue to\n" + .string "try some {STR_VAR_2} fishing?\p" + .string "Until our next broadcast, farewell and\n" + .string "good fishing to you all!$" gTVPokemonTodayFailedCaptureText1:: @ 81AA814 - .string "Hallo!\p" - .string "Willkommen bei POKéMON HEUTE!\p" - .string "SCHWESTER: Hallo! Alles gesund\n" - .string "und munter?\p" - .string "Heute werfen wir einen Blick auf das\n" - .string "POKéMON {STR_VAR_2} von {STR_VAR_1}!\p" - .string "BRUDER: Yeah! Genau das werden wir tun!$" + .string "Hello!\p" + .string "It’s time for POKéMON TODAY!\p" + .string "BIG SIS: Hi! Is everyone peachy and\n" + .string "perky today?\p" + .string "Today, we’re going to look at {STR_VAR_1}’s\n" + .string "POKéMON {STR_VAR_2}!\p" + .string "BIG BRO: Yeah! That’s what we’re going\n" + .string "to do!$" gTVPokemonTodayFailedCaptureText2:: @ 81AA8C6 .string "Oh!\n" - .string "Da wir gerade über {STR_VAR_1} sprechen...\p" - .string "SCHWESTER, ich habe den TRAINER mit\n" - .string "eigenen Augen gesehen!\p" - .string "SCHWESTER: Und was hast du\n" - .string "beobachtet?\p" - .string "BRUDER: Nun, ich war gerade unterwegs\n" - .string "nach {STR_VAR_2}.\p" - .string "Da sah ich, wie {STR_VAR_1} versuchte, das \n" - .string "POKéMON {STR_VAR_3} zu fangen, aber...$" + .string "Speaking of {STR_VAR_1}...\p" + .string "BIG SIS, I saw the TRAINER with my very\n" + .string "own eyes!\p" + .string "BIG SIS: Oh, what did you see?\p" + .string "BIG BRO: Well, I had to go on a trip to\n" + .string "{STR_VAR_2}.\p" + .string "That’s when I happened to come across\n" + .string "{STR_VAR_1}, who was trying to catch the\l" + .string "POKéMON {STR_VAR_3}, but...$" gTVPokemonTodayFailedCaptureText3:: @ 81AA9B2 - .string "Das POKéMON konnte flüchten!\p" - .string "Und wie viele POKéBÄLLE wurden am Ende\n" - .string "verbraucht? {STR_VAR_2}! Und das für nichts!\p" - .string "Du hättest den frustrierten Ausdruck\n" - .string "im Gesicht von {STR_VAR_1} sehen\p" - .string "sollen, als das POKéMON sich aus dem\n" - .string "Staub machte!$" + .string "The POKéMON managed to get away!\p" + .string "It ended up wasting this many\n" + .string "POKé BALLS: {STR_VAR_2}!\p" + .string "You should have seen the expression\n" + .string "of frustration on {STR_VAR_1}’s face when\l" + .string "the POKéMON took off!$" gTVPokemonTodayFailedCaptureText4:: @ 81AAA5C - .string "Aber {STR_VAR_1} hat zu lange daneben-\n" - .string "geworfen, bis das POKéMON\l" - .string "kampfunfähig wurde!\p" - .string "Und wie viele POKéBÄLLE wurden am Ende\n" - .string "verbraucht? {STR_VAR_2}! Und das für nichts!\p" - .string "Du hättest den Ausdruck fassungsloser\n" - .string "Bestürzung auf dem Gesicht von\l" - .string "{STR_VAR_1}\p" - .string "sehen sollen, als das POKéMON plötzlich\n" - .string "kampfunfähig wurde!$" + .string "But {STR_VAR_1} goofed and made the\n" + .string "POKéMON faint!\p" + .string "It ended up wasting this many\n" + .string "POKé BALLS: {STR_VAR_2}!\p" + .string "You should have seen the expression\n" + .string "of stunned dismay on {STR_VAR_1}’s face\l" + .string "when the POKéMON fainted!$" gTVPokemonTodayFailedCaptureText5:: @ 81AAB11 - .string "SCHWESTER: Hey, du da!\n" - .string "Das ist aber nicht nett!\p" - .string "Du solltest dich nicht über das Unglück\n" - .string "anderer lustig machen!\p" - .string "Oh, mir tut {STR_VAR_1} Leid.\n" - .string "Was für eine Schande!\p" - .string "BRUDER: Da hast du Recht!\n" - .string "Tut mir Leid, dass ich gelacht habe.$" + .string "BIG SIS: Hey, there!\n" + .string "That’s not nice!\p" + .string "You shouldn’t be laughing at other\n" + .string "people’s misfortune!\p" + .string "Oh, poor {STR_VAR_1}.\n" + .string "What a shame!\p" + .string "BIG BRO: That’s true!\n" + .string "Sorry for laughing.$" gTVPokemonTodayFailedCaptureText6:: @ 81AABB4 - .string "SCHWESTER: Räusper Haha Räusper Haha...\p" - .string "BRUDER: HEY!\n" - .string "Du lachst ja!\p" - .string "SCHWESTER: Ich???\p" - .string "Ich habe doch nicht gelacht!\n" - .string "Ehrlich nicht!\p" - .string "Mir tut {STR_VAR_1} echt Leid.\n" - .string "Was für eine Schande!\p" - .string "BRUDER: ...$" + .string "BIG SIS: Bufufu...\p" + .string "BIG BRO: Hey!\n" + .string "You just laughed, too!\p" + .string "BIG SIS: Huh?!\p" + .string "I didn’t laugh!\n" + .string "Honestly, I didn’t!\p" + .string "Oh, poor {STR_VAR_1}.\n" + .string "What a shame!\p" + .string "BIG BRO: ...$" gTVPokemonTodayFailedCaptureText7:: @ 81AAC47 - .string "SCHWESTER: Schluss jetzt mit dem\n" - .string "Blödsinn! Lasst uns das heutige\l" - .string "POKéMON betrachten...\p" - .string "Wie?\n" - .string "Wir haben keine Zeit mehr dafür?\p" - .string "Oooh! Dann haben wir heute ja gar kein\n" - .string "POKéMON vorgestellt!\p" - .string "BRUDER: Also, bis zum nächsten Mal!\p" - .string "SCHWESTER: Hey, du kannst die Show\n" - .string "doch nicht einfach ohne mich beenden!$" + .string "BIG SIS: That’s enough silliness!\n" + .string "Let’s look at today’s POKéMON...\p" + .string "Huh?\n" + .string "We’re out of time already?\p" + .string "Aww!\n" + .string "We couldn’t profile a POKéMON today!\p" + .string "BIG BRO: See you again next time!\p" + .string "BIG SIS: Hey, don’t end the show\n" + .string "without me!$" gTVPokemonTodayText1:: @ 81AAD23 - .string "Hallo!\p" - .string "Willkommen bei POKéMON HEUTE!\p" - .string "SCHWESTER: Hallo! Alles gesund\n" - .string "und munter?\p" - .string "Heute werfen wir einen Blick auf das\n" - .string "POKéMON {STR_VAR_2} von {STR_VAR_1}!\p" - .string "BRUDER: Yeah! Genau das werden wir tun!$" + .string "Hello!\p" + .string "It’s time for POKéMON TODAY!\p" + .string "BIG SIS: Hi! Is everyone peachy and\n" + .string "perky today?\p" + .string "Today, we’re going to look at {STR_VAR_1}’s\n" + .string "POKéMON {STR_VAR_2}!\p" + .string "BIG BRO: Yeah! That’s what we’re going\n" + .string "to do!$" gTVPokemonTodayText2:: @ 81AADD5 - .string "SCHWESTER: {STR_VAR_1} hat {STR_VAR_2} den\n" - .string "Kosenamen {STR_VAR_3} gegeben!\p" - .string "{STR_VAR_3} scheint wirklich liebevoll\n" - .string "behandelt zu werden.$" + .string "BIG SIS: {STR_VAR_1} gave the nickname\n" + .string "{STR_VAR_3} to the {STR_VAR_2}!\p" + .string "It sounds like {STR_VAR_3} is getting\n" + .string "good, loving care!$" gTVPokemonTodayText3:: @ 81AAE31 - .string "BRUDER: Und wie viele BÄLLE musste der\n" - .string "TRAINER werfen, um es zu fangen? {STR_VAR_3}!\p" - .string "Ein {STR_VAR_2} brachte den\n" - .string "gewünschten Erfolg!$" + .string "BIG BRO: The TRAINER had to throw this\n" + .string "many BALLS to catch it: {STR_VAR_3}!\p" + .string "It finally took a single {STR_VAR_2}\n" + .string "to catch it!$" gTVPokemonTodayText4:: @ 81AAE9D - .string "SCHWESTER: Wenn das Fangen so einfach\n" - .string "war, wollte das Schicksal {STR_VAR_1} und\l" - .string "{STR_VAR_2} wohl zusammenführen!$" + .string "BIG SIS: If it was that easy to catch,\n" + .string "it must have been destiny that brought\l" + .string "{STR_VAR_1} and the {STR_VAR_2} together!$" gTVPokemonTodayText5:: @ 81AAF03 - .string "SCHWESTER: Wow! Wie aufregend!\p" - .string "Man sagt, dass ein POKéMON, das schwer\n" - .string "zu fangen ist, die Liebe seines\l" - .string "TRAINERS verdient!$" + .string "BIG SIS: Wow! That’s so neat!\p" + .string "But you know what they say, a POKéMON\n" + .string "that takes a lot of effort to catch\l" + .string "earns the love of its TRAINER!$" gTVPokemonTodayText6:: @ 81AAF8A - .string "SCHWESTER: {STR_VAR_2} von {STR_VAR_1} ist\n" - .string "ein bemerkenswertes POKéMON, da\p" - .string "es nur mit dem unfehlbaren\n" - .string "MEISTERBALL gefangen werden konnte!\p" - .string "BRUDER: Wow! Das ist\n" - .string "mega-beeindruckend!\p" - .string "SCHWESTER: {STR_VAR_1} muss {STR_VAR_2} \n" - .string "wirklich gewollt haben! Mit Sicherheit!$" + .string "BIG SIS: {STR_VAR_1}’s {STR_VAR_2} is a\n" + .string "memorable POKéMON because it took an\l" + .string "invaluable MASTER BALL to catch!\p" + .string "BIG BRO: Wow! That’s mega-awesome!\p" + .string "BIG SIS: {STR_VAR_1} must have really\n" + .string "wanted that {STR_VAR_2}, for sure!$" gTVPokemonTodayText7:: @ 81AB040 - .string "BRUDER: Und dann erhält {STR_VAR_2}\n" - .string "auch noch den Kosenamen {STR_VAR_3}...\p" - .string "Das ermöglicht einen guten Einblick in\n" - .string "die Einstellung von TRAINER {STR_VAR_1}.\p" - .string "SCHWESTER: Das sehe ich auch so!$" + .string "BIG BRO: Then to give the nickname\n" + .string "{STR_VAR_3} to that {STR_VAR_2}...\p" + .string "You really get a good idea about\n" + .string "{STR_VAR_1}’s TRAINER sense.\p" + .string "BIG SIS: I second that notion!$" gTVPokemonTodayText8:: @ 81AB0C8 - .string "Ich würde diesen Kosenamen einem\n" - .string "{STR_VAR_3} geben!\p" - .string "BRUDER: Hui! Das wäre der Anfang von\n" - .string "etwas ganz Neuem.$" + .string "If it were me, I’d give that\n" + .string "nickname to something like {STR_VAR_3}!\p" + .string "BIG BRO: Whoa! That could be the start\n" + .string "of something new!$" gTVPokemonTodayText9:: @ 81AB13D - .string "{STR_VAR_2}, das {STR_VAR_1}?\n" - .string "Hört sich das nicht einfach perfekt an?\p" - .string "Die Buchstaben und alles - wie\n" - .string "geschaffen für das POKéMON\l" - .string "{STR_VAR_1}!\p" - .string "BRUDER: Yeah! Stimmt! Absolut!$" + .string "{STR_VAR_2} the {STR_VAR_1}?\n" + .string "Doesn’t that sound perfect?\p" + .string "The letters and everything - they sound\n" + .string "just right for the POKéMON {STR_VAR_1}!\p" + .string "BIG BRO: Yeah, true, that!$" gTVPokemonTodayText10:: @ 81AB1C6 - .string "Soweit ich weiß, hat noch kein TRAINER\n" - .string "jemals seinem {STR_VAR_1} den\l" - .string "Kosenamen {STR_VAR_2} gegeben!\p" - .string "BRUDER: Das zeigt doch nur, welch einen\n" - .string "hervorragenden Geschmack der TRAINER\l" - .string "bei der Wahl des Kosenamens bewies!$" + .string "As far as I know, no TRAINER has ever\n" + .string "given the nickname {STR_VAR_2} to their\l" + .string "{STR_VAR_1}!\p" + .string "BIG BRO: That just goes to show what\n" + .string "great taste the TRAINER has in picking\l" + .string "nicknames!$" gTVPokemonTodayText11:: @ 81AB266 - .string "Mein nächstes POKéMON bekommt den\n" - .string "Kosenamen {STR_VAR_2}.\p" - .string "BRUDER: Wie? Meines auch!\n" - .string "Ich werde es auch {STR_VAR_2} nennen!$" + .string "The next time I catch a POKéMON,\n" + .string "I should give it the name {STR_VAR_2}.\p" + .string "BIG BRO: Huh? Me, too!\n" + .string "I’ll use the nickname {STR_VAR_2}, too!$" gTVPokemonTodayText12:: @ 81AB2DB - .string "SCHWESTER: Oh je!\n" - .string "Schau dir nur die Uhrzeit an!\p" - .string "Nun, Freunde, das war es für heute.\n" - .string "Wir sehen uns das nächste Mal wieder!\p" - .string "BRUDER: Denkt daran, es könnte euer\n" - .string "POKéMON sein, das wir hier vorstellen!$" + .string "BIG SIS: Oh, no!\n" + .string "Look at the time!\p" + .string "Well, gang, this is it for today.\n" + .string "See you again next time!\p" + .string "BIG BRO: Remember, it could be your\n" + .string "POKéMON in the spotlight next time!$" gTVSmartShopperText1:: @ 81AB381 - .string "Hallo!\p" - .string "Zeit für den heutigen CLEVERKAUF!\p" - .string "INTERVIEWER: Wie geht es euch?\p" - .string "Heute besuchen wir ein Geschäft\n" + .string "Hello!\p" + .string "It’s time for TODAY’S SMART SHOPPER.\p" + .string "INTERVIEWER: How are you, viewers?\p" + .if REVISION >= 1 + .string "Today we’re visiting a shop\n" + .else + .string "Today we’re visiting the POKéMON MART\n" + .endif .string "in {STR_VAR_2}.\p" - .string "Schauen wir doch mal, welche Artikel\n" - .string "dort besonders begehrt sind.$" + .string "Let’s check on what the hot sellers\n" + .string "have been recently.$" gTVSmartShopperText2:: @ 81AB435 - .string "Fragen wir doch einfach den Verkäufer\n" - .string "hier.\p" - .string "Hallo, wie läuft das Geschäft?\p" - .string "VERKÄUFER: Oh, ausgezeichnet!\p" - .string "Im Moment verkaufen wir {STR_VAR_2}\n" - .string "besonders gut.\p" - .string "Und gerade hat ein TRAINER namens\n" - .string "{STR_VAR_1} {STR_VAR_3} gekauft.$" + .string "Let’s interview the clerk to get the\n" + .string "lowdown.\p" + .string "Hi, how’s your business?\p" + .string "CLERK: Oh, we’re doing excellent.\p" + .string "Recently, {STR_VAR_2} has been selling\n" + .string "especially strongly.\p" + .string "Why, just the other day a TRAINER\n" + .string "named {STR_VAR_1} bought {STR_VAR_3}.$" gTVSmartShopperText3:: @ 81AB507 - .string "INTERVIEWER: Der TRAINER hat {STR_VAR_3}-mal\n" - .string "{STR_VAR_2} gekauft? Wow!\p" - .string "Mir scheint es, als ob {STR_VAR_1} sich\n" - .string "für eine längere Reise rüstet.\p" - .string "Auf Reisen ist {STR_VAR_2} einfach\n" - .string "unverzichtbar.$" + .string "INTERVIEWER: The TRAINER bought\n" + .string "{STR_VAR_3} {STR_VAR_2}S? That’s a haul!\p" + .string "If I may say so, {STR_VAR_1} must have\n" + .string "been stocking up for a long journey\l" + .string "to far-off places.\p" + .string "For traveling, {STR_VAR_2}S are so\n" + .string "important!$" gTVSmartShopperText4:: @ 81AB5B8 - .string "INTERVIEWER: Da wir gerade von\n" - .string "{STR_VAR_2} sprechen...\l" - .string "Ich habe {STR_VAR_3} gekauft.\p" - .string "{STR_VAR_2} ist ein großartiges Item!$" + .string "INTERVIEWER: Speaking of the item\n" + .string "{STR_VAR_2}, I just bought {STR_VAR_3} of\l" + .string "them recently.\p" + .string "After all, {STR_VAR_2}’s a great item!$" gTVSmartShopperText5:: @ 81AB61F - .string "INTERVIEWER: {STR_VAR_2}?!?\n" - .string "Und gleich {STR_VAR_3} davon?!?\p" - .string "Ich hätte nicht gedacht, dass jemand\n" - .string "so viel davon kauft.\p" - .string "Meine Güte, ich könnte mir höchstens\n" - .string "ein oder zwei auf einmal davon leisten...$" + .string "INTERVIEWER: {STR_VAR_2}?!\n" + .string "But {STR_VAR_3} of them?!\p" + .string "I didn’t think there would be anyone\n" + .string "buying that many.\p" + .string "My goodness, I can only afford one or\n" + .string "two at a time...$" gTVSmartShopperText6:: @ 81AB6B0 - .string "INTERVIEWER: Ich habe erst ein Mal\n" - .string "sehr viel gekauft. Eine große\l" - .string "Stückzahl des Items {STR_VAR_2}.\p" - .string "Aber schließlich war auch das zu viel.\n" - .string "Ich habe es hinterher echt bereut...\p" - .string "Seitdem kaufe ich grundsätzlich nur\n" - .string "noch das, was ich wirklich brauche...\p" - .string "Huups!\p" - .string "Wir wollen doch hier nicht über mich\n" - .string "reden!$" + .string "INTERVIEWER: One time, I bought\n" + .string "a whole lot of the item {STR_VAR_2}.\p" + .string "But it turned out to be too many.\n" + .string "I ended up regretting it...\p" + .string "Since then, I only buy strictly what\n" + .string "I absolutely need...\p" + .string "Oops!\p" + .string "There’s no point talking about me!$" gTVSmartShopperText7:: @ 81AB78D - .string "VERKÄUFER: {STR_VAR_1} hat auch von dem\n" - .string "Item {STR_VAR_2} gleich {STR_VAR_3} Exemplare\l" - .string "gekauft.\p" - .string "INTERVIEWER: Oh, das ist clever.\n" - .string "{STR_VAR_2} ist ein sehr gutes Item...$" + .string "CLERK: {STR_VAR_1} also bought the item\n" + .string "{STR_VAR_2} in bulk, taking {STR_VAR_3}.\p" + .string "INTERVIEWER: Oh, that’s smart.\n" + .string "{STR_VAR_2}’s a very good item, too.$" gTVSmartShopperText8:: @ 81AB7FE - .string "VERKÄUFER: Und der TRAINER kaufte\n" - .string "von dem Item {STR_VAR_2} {STR_VAR_3}\l" - .string "Exemplare.$" + .string "CLERK: And, the TRAINER also bought\n" + .string "{STR_VAR_3} of the item {STR_VAR_2}.$" gTVSmartShopperText9:: @ 81AB835 - .string "VERKÄUFER: Und zwar als es im Sonder-\n" - .string "angebot war. Clever!!!$" + .string "CLERK: Plus, it was during a big sale.\n" + .string "That’s smart shopping.$" gTVSmartShopperText10:: @ 81AB873 - .string "INTERVIEWER: Hmm... {STR_VAR_1} scheint ein\n" - .string "richtiger Schnäppchenjäger zu sein!\p" - .string "{STR_VAR_1} brauchte also für alles nur...\p" - .string "¥{STR_VAR_2} zu bezahlen?!?\n" - .string "Wie unglaublich günstig!\p" - .string "Oh! Wir sind am Ende unserer Sendung!\n" - .string "Bis zum nächsten Mal! Auf Wiedersehen!$" + .string "INTERVIEWER: Hmm... {STR_VAR_1} sounds like\n" + .string "quite the shrewd bargain hunter!\p" + .string "In total, {STR_VAR_1}’s purchases came to...\p" + .string "¥{STR_VAR_2}?!\n" + .string "What an amazing sum!\p" + .string "Oops! We’re out of time!\n" + .string "See you on our next broadcast!$" gTVSmartShopperText11:: @ 81AB92E - .string "VERKÄUFER: {STR_VAR_1} ist ein VIP-Kunde,\n" - .string "daran besteht kein Zweifel.$" + .string "CLERK: {STR_VAR_1} is a VIP customer,\n" + .string "no doubt about it.$" gTVSmartShopperText12:: @ 81AB95E - .string "Fragen wir doch mal den Verkäufer.\p" - .string "Hallo, wie läuft das Geschäft?\p" - .string "VERKÄUFER: Oh, es ist einfach un-\n" - .string "glaublich. Einfach überwältigend.\p" - .string "Vor kurzem hat ein TRAINER namens\n" - .string "{STR_VAR_1} das Item {STR_VAR_2}\l" - .string "in großer Stückzahl gekauft.\p" - .string "Er hat fast das ganze Regal mit\n" - .string "{STR_VAR_2} leergeräumt.\p" - .string "Ich hätte nie gedacht, dass es einen\n" - .string "TRAINER gibt, der {STR_VAR_2} \l" - .string "in so großen Mengen benötigt!\p" - .string "INTERVIEWER: Das waren dann ja 100\n" - .string "oder 200 Exemplare!?!\p" - .string "VERKÄUFER: Oh, nein. Viel, viel mehr!\p" - .string "INTERVIEWER: Du meine Güte! {STR_VAR_1}\n" - .string "muss ein ganz besonderer Kunde sein!\p" - .string "VERKÄUFER: {STR_VAR_1} ist ein VIP-Kunde,\n" - .string "daran besteht gar kein Zweifel!$" + .string "Let’s interview the clerk to get the\n" + .string "lowdown.\p" + .string "Hi, how’s your business?\p" + .string "CLERK: Oh, we’re doing unbelievable\n" + .string "business. It’s almost overwhelming.\p" + .string "Recently, a TRAINER named {STR_VAR_1}\n" + .string "bought the item {STR_VAR_2}in bulk.\p" + .string "The TRAINER almost cleared out our\n" + .string "entire stock of {STR_VAR_2}S.\p" + .string "I never dreamt that any customer\n" + .string "would ever need so many {STR_VAR_2}S.\l" + .string "It’s just unheard of!\p" + .string "INTERVIEWER: So that would be like 100\n" + .string "or 200 sold?\p" + .string "CLERK: Oh, no, much more than that!\p" + .string "INTERVIEWER: Oh, my goodness!\n" + .string "{STR_VAR_1} must be a special shopper!\p" + .string "CLERK: {STR_VAR_1} is a VIP customer,\n" + .string "no doubt about it.$" gTVSmartShopperText13:: @ 81ABB75 .string "INTERVIEWER: Hmm...\n" - .string "Das ist unglaublich.\p" - .string "Aber warum hat der TRAINER wohl gleich\n" - .string "so viel auf einmal gekauft?\p" + .string "That is amazing.\p" + .string "But why would the TRAINER need to buy\n" + .string "so many?\p" .string "... ...\p" - .string "Ein Mysterium... Aber leider haben wir\n" - .string "keine Zeit mehr, hinter das Geheimnis\l" - .string "zu kommen. Bis zur nächsten Sendung!\p" - .string "{STR_VAR_1} muss ein Rätsel bleiben...$" + .string "The mystery deepens, but this is all\n" + .string "the time we have today.\l" + .string "See you on our next broadcast!\p" + .string "Still, {STR_VAR_1} is certainly an enigma...$" gTVWorldOfMastersText1:: @ 81ABC51 - .string "DIE WELT DER MEISTER\p" - .string "Hallo, liebe Zuschauer.\p" - .string "Vielleicht ist Ihnen schon einmal der\n" - .string "TRAINER {STR_VAR_1} begegnet.\p" - .string "{STR_VAR_1} ist berühmt als Meister im\n" - .string "Fangen von POKéMON.\p" - .string "Der Erfolg von {STR_VAR_1} im Fangen von\n" - .string "POKéMON basiert auf einer gründlichen\l" - .string "Suche, die zu Fuß stattfindet.\p" - .string "Eines denkwürdigen Tages machte\n" - .string "der TRAINER {STR_VAR_2} Schritte.\p" - .string "Die Gesamtzahl der an diesem Tag\n" - .string "gefangenen POKéMON betrug {STR_VAR_3}!$" + .string "THE WORLD OF MASTERS\p" + .string "Hello, viewers.\p" + .string "Perhaps you are aware of a TRAINER\n" + .string "named {STR_VAR_1}.\p" + .string "{STR_VAR_1} is famous as a master at\n" + .string "catching POKéMON.\p" + .string "{STR_VAR_1}’s quest for POKéMON depends\n" + .string "entirely on a careful search on foot.\p" + .string "On one memorable day, the TRAINER\n" + .string "walked some {STR_VAR_2} steps.\p" + .string "The total number of POKéMON caught\n" + .string "that day reached an impressive {STR_VAR_3}!$" gTVWorldOfMastersText2:: @ 81ABD94 - .string "Diese bemerkenswerte Leistung war nur\n" - .string "möglich, weil zwischen dem TRAINER und\l" - .string "{STR_VAR_1} tiefes Vertrauen besteht.$" + .string "That remarkable feat must have been\n" + .string "possible because of the trust between\l" + .string "the TRAINER and {STR_VAR_1}.$" gTVWorldOfMastersText3:: @ 81ABDF2 - .string "Der Meister hat das letzte {STR_VAR_3}\n" - .string "an diesem Tage in der Nähe von\l" - .string "{STR_VAR_2} gefangen.\p" - .string "Dieses POKéMON kann sich nun an\n" - .string "dem besonderen Rang des Rekordhalters\l" - .string "erfreuen.\p" - .string "Talentierte TRAINER sollten versuchen,\n" - .string "diesen Rekord zu brechen.\p" - .string "Das war’s für heute.\n" - .string "Bis zum nächsten Mal.$" + .string "The master caught the day’s last\n" + .string "{STR_VAR_3} near {STR_VAR_2}.\p" + .string "That POKéMON apparently enjoys\n" + .string "a special status as a record holder.\p" + .string "Skilled TRAINERS should be encouraged\n" + .string "to challenge this fine record.\p" + .string "That’s all for today.\n" + .string "Please tune in next time.$" .include "data/text/gabby_and_ty.inc" .include "data/text/pokemon_news.inc" diff --git a/data/text/type_names.inc b/data/text/type_names.inc index 21245bcfe..83e85e1e1 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -1,19 +1,19 @@ gTypeNames:: @ 81F9870 .string "NORMAL$", 7 - .string "KAMPF$", 7 - .string "FLUG$", 7 - .string "GIFT$", 7 - .string "BODEN$", 7 - .string "GEST.$", 7 - .string "KÄFER$", 7 - .string "GEIST$", 7 - .string "STAHL$", 7 + .string "FIGHT$", 7 + .string "FLYING$", 7 + .string "POISON$", 7 + .string "GROUND$", 7 + .string "ROCK$", 7 + .string "BUG$", 7 + .string "GHOST$", 7 + .string "STEEL$", 7 .string "???$", 7 - .string "FEUER$", 7 - .string "WASSER$", 7 - .string "PFLAN.$", 7 - .string "ELEK.$", 7 - .string "PSYCHO$", 7 - .string "EIS$", 7 - .string "DRA.$", 7 - .string "UNL.$", 7 + .string "FIRE$", 7 + .string "WATER$", 7 + .string "GRASS$", 7 + .string "ELECTR$", 7 + .string "PSYCHC$", 7 + .string "ICE$", 7 + .string "DRAGON$", 7 + .string "DARK$", 7 diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png index 0713ec3de..168689b6d 100644 Binary files a/data/tilesets/primary/general/tiles.png and b/data/tilesets/primary/general/tiles.png differ diff --git a/data/tilesets/secondary/shop/metatiles.bin b/data/tilesets/secondary/shop/metatiles.bin index fef6a7bc5..474d535b1 100644 Binary files a/data/tilesets/secondary/shop/metatiles.bin and b/data/tilesets/secondary/shop/metatiles.bin differ diff --git a/data/tilesets/secondary/shop/tiles.png b/data/tilesets/secondary/shop/tiles.png index ea8d262d6..b5a0a4936 100644 Binary files a/data/tilesets/secondary/shop/tiles.png and b/data/tilesets/secondary/shop/tiles.png differ diff --git a/data/trainers.inc b/data/trainers.inc index 39bfd9bfe..be9ce1a81 100644 --- a/data/trainers.inc +++ b/data/trainers.inc @@ -17,7 +17,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE - .string "ADRIAN$", 12 + .string "ARCHIE$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -29,7 +29,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -41,7 +41,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -53,7 +53,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -65,7 +65,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -77,7 +77,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -89,7 +89,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -101,7 +101,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -113,7 +113,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -125,7 +125,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -137,7 +137,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -149,7 +149,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -161,7 +161,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -173,7 +173,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -185,7 +185,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -197,7 +197,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -209,7 +209,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -221,7 +221,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -233,7 +233,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -245,7 +245,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -257,7 +257,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -269,7 +269,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -281,7 +281,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -293,7 +293,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -305,7 +305,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -317,7 +317,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -329,7 +329,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -341,7 +341,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -365,7 +365,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M - .string "WOLFGANG$", 12 + .string "MATT$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -377,7 +377,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M - .string "WOLFGANG$", 12 + .string "MATT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -389,7 +389,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F - .string "KORDULA$", 12 + .string "SHELLY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -401,7 +401,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F - .string "KORDULA$", 12 + .string "SHELLY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -413,7 +413,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE - .string "ADRIAN$", 12 + .string "ARCHIE$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -425,7 +425,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE - .string "ADRIAN$", 12 + .string "ARCHIE$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -437,7 +437,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "MARGARETE$", 12 + .string "DAISY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -449,7 +449,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSEMARIE$", 12 + .string "ROSE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -461,7 +461,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "LILLY$", 12 + .string "LILY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -473,7 +473,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ERIKA$", 12 + .string "VIOLET$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -485,7 +485,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSEMARIE$", 12 + .string "ROSE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -497,7 +497,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSEMARIE$", 12 + .string "ROSE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -509,7 +509,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSEMARIE$", 12 + .string "ROSE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -521,7 +521,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY - .string "ROSEMARIE$", 12 + .string "ROSE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -533,7 +533,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "RÜDIGER$", 12 + .string "DUSTY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -545,7 +545,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "RUPRECHT$", 12 + .string "CHIP$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -557,7 +557,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "RUBEN$", 12 + .string "FOSTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -569,7 +569,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "RÜDIGER$", 12 + .string "DUSTY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -581,7 +581,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "RÜDIGER$", 12 + .string "DUSTY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -593,7 +593,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "RÜDIGER$", 12 + .string "DUSTY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -605,7 +605,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC - .string "RÜDIGER$", 12 + .string "DUSTY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -617,7 +617,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "PIA & UDO$", 12 + .string "GABBY & TY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -629,7 +629,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "PIA & UDO$", 12 + .string "GABBY & TY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -641,7 +641,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "PIA & UDO$", 12 + .string "GABBY & TY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -653,7 +653,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "PIA & UDO$", 12 + .string "GABBY & TY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -665,7 +665,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "PIA & UDO$", 12 + .string "GABBY & TY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -677,7 +677,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER - .string "PIA & UDO$", 12 + .string "GABBY & TY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -713,7 +713,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F - .string "HILDE $", 12 + .string "GWEN $", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -773,7 +773,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "GÜNTHER$", 12 + .string "RICKY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -797,7 +797,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "HILMAR$", 12 + .string "CHARLIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -809,7 +809,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "GÜNTHER$", 12 + .string "RICKY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -821,7 +821,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "GÜNTHER$", 12 + .string "RICKY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -833,7 +833,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "GÜNTHER$", 12 + .string "RICKY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -845,7 +845,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M - .string "GÜNTHER$", 12 + .string "RICKY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -857,7 +857,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "HUBERT$", 12 + .string "RANDALL$", 12 .2byte ITEM_X_SPEED, ITEM_X_SPEED, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -869,7 +869,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PATRICK$", 12 + .string "PARKER$", 12 .2byte ITEM_GUARD_SPEC, ITEM_GUARD_SPEC, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -881,7 +881,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "NILS$", 12 + .string "GEORGE$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -893,7 +893,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "CHRISTIAN$", 12 + .string "BERKE$", 12 .2byte ITEM_DIRE_HIT, ITEM_DIRE_HIT, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -905,7 +905,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "OSKAR$", 12 + .string "CLYDE$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -917,7 +917,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "OTFRIED$", 12 + .string "VINCENT$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -929,7 +929,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "OTMAR$", 12 + .string "LEROY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -941,7 +941,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PASCAL$", 12 + .string "WILTON$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -965,7 +965,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PABLO$", 12 + .string "ALBERT$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -977,7 +977,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "RICHARD$", 12 + .string "SAMUEL$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -989,7 +989,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PAUL$", 12 + .string "VITO$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1001,7 +1001,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "RAIMUND$", 12 + .string "OWEN$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1013,7 +1013,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PASCAL$", 12 + .string "WILTON$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1025,7 +1025,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PASCAL$", 12 + .string "WILTON$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1037,7 +1037,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PASCAL$", 12 + .string "WILTON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1049,7 +1049,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "PASCAL$", 12 + .string "WILTON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1061,7 +1061,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "MARKUS$", 12 + .string "WARREN$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1073,7 +1073,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "YVONNE$", 12 + .string "MARY$", 12 .2byte ITEM_X_ACCURACY, ITEM_X_ACCURACY, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1085,7 +1085,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "RAMONA$", 12 + .string "LORI$", 12 .2byte ITEM_X_DEFEND, ITEM_X_DEFEND, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1097,7 +1097,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "ROSWITA$", 12 + .string "JODY$", 12 .2byte ITEM_X_ATTACK, ITEM_X_ATTACK, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -1109,7 +1109,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "VIOLA$", 12 + .string "WENDY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -1121,7 +1121,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "FRAUKE$", 12 + .string "ELAINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -1133,7 +1133,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "VERONIKA$", 12 + .string "BROOKE$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1145,7 +1145,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "MARIANNE$", 12 + .string "JENNIFER$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1157,7 +1157,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "TRUDLINDE$", 12 + .string "HOPE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1169,7 +1169,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "THERESA$", 12 + .string "SHANNON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1193,7 +1193,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "KAROLINE$", 12 + .string "CAROLINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1205,7 +1205,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "MICHAELA$", 12 + .string "JULIE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1217,7 +1217,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "VERONIKA$", 12 + .string "BROOKE$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1229,7 +1229,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "VERONIKA$", 12 + .string "BROOKE$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1241,7 +1241,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "VERONIKA$", 12 + .string "BROOKE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1253,7 +1253,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "VERONIKA$", 12 + .string "BROOKE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -1265,7 +1265,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "WALBURGA$", 12 + .string "PATRICIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1277,7 +1277,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "GUNDULA$", 12 + .string "KINDRA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1289,7 +1289,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "BRUNHILDE$", 12 + .string "TAMMY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1301,7 +1301,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "TABITHA$", 12 + .string "VALERIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1313,7 +1313,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "PANDORA$", 12 + .string "TASHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1325,7 +1325,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "TABITHA$", 12 + .string "VALERIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1337,7 +1337,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "TABITHA$", 12 + .string "VALERIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1349,7 +1349,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "TABITHA$", 12 + .string "VALERIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1361,7 +1361,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC - .string "TABITHA$", 12 + .string "VALERIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1373,7 +1373,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "PATRIZIA$", 12 + .string "CINDY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1397,7 +1397,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "NATASCHA$", 12 + .string "BRIANNA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1409,7 +1409,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "PATRIZIA$", 12 + .string "CINDY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1421,7 +1421,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "NATASCHA$", 12 + .string "BRIANNA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1445,7 +1445,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "PATRIZIA$", 12 + .string "CINDY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1457,7 +1457,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "PATRIZIA$", 12 + .string "CINDY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1469,7 +1469,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "PATRIZIA$", 12 + .string "CINDY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1481,7 +1481,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY - .string "PATRIZIA$", 12 + .string "CINDY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1505,7 +1505,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "SYLVIA$", 12 + .string "SHEILA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1517,7 +1517,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "MIRJAM$", 12 + .string "SHIRLEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1529,7 +1529,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "GERMAINE$", 12 + .string "JESSICA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1541,7 +1541,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "FRANCESCA$", 12 + .string "CONNIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1553,7 +1553,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "SALMA$", 12 + .string "BRIDGET$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1565,7 +1565,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "TIA$", 12 + .string "OLIVIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1577,7 +1577,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "DANIELA$", 12 + .string "TIFFANY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1589,7 +1589,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "GERMAINE$", 12 + .string "JESSICA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1601,7 +1601,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "GERMAINE$", 12 + .string "JESSICA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1613,7 +1613,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "GERMAINE$", 12 + .string "JESSICA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1625,7 +1625,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "GERMAINE$", 12 + .string "JESSICA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1637,7 +1637,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "RENE$", 12 + .string "WINSTON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1661,7 +1661,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "KAI$", 12 + .string "GARRET$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1673,7 +1673,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "RENE$", 12 + .string "WINSTON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1685,7 +1685,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "RENE$", 12 + .string "WINSTON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1697,7 +1697,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "RENE$", 12 + .string "WINSTON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1709,7 +1709,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY - .string "RENE$", 12 + .string "WINSTON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1721,7 +1721,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "HIRO$", 12 + .string "STEVE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1757,7 +1757,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "KLAUS$", 12 + .string "KENN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1769,7 +1769,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "HIRO$", 12 + .string "STEVE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1781,7 +1781,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "HIRO$", 12 + .string "STEVE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1793,7 +1793,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "HIRO$", 12 + .string "STEVE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1805,7 +1805,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC - .string "HIRO$", 12 + .string "STEVE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1817,7 +1817,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "KONSTANTIN$", 12 + .string "LUIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1829,7 +1829,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "GUIDO$", 12 + .string "AUSTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1841,7 +1841,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "IGNAZ$", 12 + .string "DOUGLAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1853,7 +1853,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "MANUEL$", 12 + .string "DARRIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1865,7 +1865,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "KEVIN$", 12 + .string "TONY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1877,7 +1877,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "OSWALD$", 12 + .string "JEROME$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1889,7 +1889,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "UMBERTO$", 12 + .string "MATTHEW$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1901,7 +1901,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "WINFRIED$", 12 + .string "DAVID$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1913,7 +1913,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "LEOPOLD$", 12 + .string "SPENCER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1925,7 +1925,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "THOMAS$", 12 + .string "ROLAND$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1937,7 +1937,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "TIMO$", 12 + .string "CODY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1949,7 +1949,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "BALTHASAR$", 12 + .string "STAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1961,7 +1961,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "BASIL$", 12 + .string "BARRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1973,7 +1973,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DAGOBERT$", 12 + .string "DEAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1985,7 +1985,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "DIETER$", 12 + .string "RODNEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -1997,7 +1997,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "ENNO$", 12 + .string "RICHARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2009,7 +2009,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "BENNO$", 12 + .string "HERMAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2033,7 +2033,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "ERICH$", 12 + .string "GILBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2045,7 +2045,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "KASPER$", 12 + .string "FRANKLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2057,7 +2057,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "MARCEL$", 12 + .string "DANNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2069,7 +2069,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "PEDRO$", 12 + .string "JACK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2081,7 +2081,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "THEODOR$", 12 + .string "DUDLEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2093,7 +2093,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "JANNIK$", 12 + .string "CHAD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2105,7 +2105,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "KEVIN$", 12 + .string "TONY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2117,7 +2117,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "KEVIN$", 12 + .string "TONY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2129,7 +2129,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "KEVIN$", 12 + .string "TONY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2141,7 +2141,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "KEVIN$", 12 + .string "TONY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2153,7 +2153,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "SATORU$", 12 + .string "HIDEKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2165,7 +2165,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "SHIGERU$", 12 + .string "HITOSHI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2177,7 +2177,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "YU$", 12 + .string "KIYO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2189,7 +2189,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "JUNICHI$", 12 + .string "KOICHI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2201,7 +2201,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "MINORU$", 12 + .string "NOB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2213,7 +2213,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "MINORU$", 12 + .string "NOB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2225,7 +2225,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "MINORU$", 12 + .string "NOB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2237,7 +2237,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "MINORU$", 12 + .string "NOB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2249,7 +2249,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "MINORU$", 12 + .string "NOB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2261,7 +2261,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "HIDEO$", 12 + .string "YUJI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2273,7 +2273,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "KENJI$", 12 + .string "DAISUKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2285,7 +2285,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "HIROSHI$", 12 + .string "ATSUSHI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2297,7 +2297,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "CHUCK$", 12 + .string "KIRK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2309,7 +2309,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "TREY$", 12 + .string "SCOTT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2321,7 +2321,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "KERRY$", 12 + .string "HARVEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2333,7 +2333,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "REINHARD$", 12 + .string "SHAWN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2345,7 +2345,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "JEFF$", 12 + .string "RANDY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2357,7 +2357,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "KIRK$", 12 + .string "DALTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2369,7 +2369,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "KIRK$", 12 + .string "DALTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2381,7 +2381,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "KIRK$", 12 + .string "DALTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2393,7 +2393,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "KIRK$", 12 + .string "DALTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2405,7 +2405,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST - .string "KIRK$", 12 + .string "DALTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2417,7 +2417,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HENDRIK$", 12 + .string "COLE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2429,7 +2429,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HEINZ$", 12 + .string "FLINT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2441,7 +2441,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HAGEN$", 12 + .string "AXLE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2453,7 +2453,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HANNES$", 12 + .string "JAKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2465,7 +2465,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HARTMANN$", 12 + .string "ANDY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2477,7 +2477,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HASSO$", 12 + .string "BERNIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2489,7 +2489,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HASSO$", 12 + .string "BERNIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2501,7 +2501,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HASSO$", 12 + .string "BERNIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2513,7 +2513,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HASSO$", 12 + .string "BERNIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2525,7 +2525,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER - .string "HASSO$", 12 + .string "BERNIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2537,7 +2537,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "ISSIDOR$", 12 + .string "DREW$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2549,7 +2549,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "IVAN$", 12 + .string "CLIFF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2561,7 +2561,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "KAREL$", 12 + .string "LARRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2573,7 +2573,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "KUNO$", 12 + .string "SHANE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2585,7 +2585,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "LAURENZ$", 12 + .string "JUSTIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2597,7 +2597,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "EWALD$", 12 + .string "ETHAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2609,7 +2609,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "RAPHAEL$", 12 + .string "JEFF$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2621,7 +2621,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "RONALD$", 12 + .string "TRAVIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2633,7 +2633,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "EWALD$", 12 + .string "ETHAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2645,7 +2645,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "EWALD$", 12 + .string "ETHAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2657,7 +2657,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "EWALD$", 12 + .string "ETHAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2669,7 +2669,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "EWALD$", 12 + .string "ETHAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2681,7 +2681,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "ROMEO$", 12 + .string "BRENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2693,7 +2693,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "TILL$", 12 + .string "DONALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2705,7 +2705,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "URIEL$", 12 + .string "TAYLOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2717,7 +2717,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRUNO$", 12 + .string "BRANDON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2729,7 +2729,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BURKARD$", 12 + .string "DEREK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2741,7 +2741,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRUNO$", 12 + .string "BRANDON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2753,7 +2753,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRUNO$", 12 + .string "BRANDON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2765,7 +2765,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRUNO$", 12 + .string "BRANDON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2777,7 +2777,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC - .string "BRUNO$", 12 + .string "BRANDON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2789,7 +2789,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "WENDELIN$", 12 + .string "EDWARD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2801,7 +2801,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "URBAN$", 12 + .string "PRESTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2813,7 +2813,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "ZOLTAN$", 12 + .string "VIRGIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2825,7 +2825,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "XAVER$", 12 + .string "FRITZ$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2837,7 +2837,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "WULF$", 12 + .string "WILLIAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2849,7 +2849,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "JONAS$", 12 + .string "JOSHUA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2861,7 +2861,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "MAXIMILIAN$", 12 + .string "CAMERON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2873,7 +2873,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "MAXIMILIAN$", 12 + .string "CAMERON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2885,7 +2885,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "MAXIMILIAN$", 12 + .string "CAMERON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2897,7 +2897,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "MAXIMILIAN$", 12 + .string "CAMERON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2909,7 +2909,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M - .string "MAXIMILIAN$", 12 + .string "CAMERON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2921,7 +2921,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "COSIMA$", 12 + .string "JACLYN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2957,7 +2957,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "DOLORES$", 12 + .string "MAURA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2969,7 +2969,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "CAMILLA$", 12 + .string "KAYLA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -2993,7 +2993,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "KORNELIA$", 12 + .string "JACKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3005,7 +3005,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "KORNELIA$", 12 + .string "JACKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3017,7 +3017,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "KORNELIA$", 12 + .string "JACKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3029,7 +3029,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "KORNELIA$", 12 + .string "JACKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3041,7 +3041,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F - .string "KORNELIA$", 12 + .string "JACKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3053,7 +3053,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "ABRAHAM$", 12 + .string "WALTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3065,7 +3065,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "CLAUDIO$", 12 + .string "TUCKER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3077,7 +3077,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "NIKOLAI$", 12 + .string "THOMAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3089,7 +3089,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "ABRAHAM$", 12 + .string "WALTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3101,7 +3101,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "ABRAHAM$", 12 + .string "WALTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3113,7 +3113,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "ABRAHAM$", 12 + .string "WALTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3125,7 +3125,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN - .string "ABRAHAM$", 12 + .string "WALTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3137,7 +3137,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_SIDNEY - .string "ULRICH$", 12 + .string "SIDNEY$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3149,7 +3149,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_PHOEBE - .string "ANTONIA$", 12 + .string "PHOEBE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3161,7 +3161,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_GLACIA - .string "FROSINA$", 12 + .string "GLACIA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3173,7 +3173,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_DRAKE - .string "DRAGAN$", 12 + .string "DRAKE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3185,7 +3185,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_ROXANNE - .string "FELIZIA$", 12 + .string "ROXANNE$", 12 .2byte ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3197,7 +3197,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRAWLY - .string "KAMILLO$", 12 + .string "BRAWLY$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3209,7 +3209,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WATTSON - .string "WALTER$", 12 + .string "WATTSON$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3221,7 +3221,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_FLANNERY - .string "FLAVIA$", 12 + .string "FLANNERY$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3245,7 +3245,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_WINONA - .string "WIBKE$", 12 + .string "WINONA$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3257,7 +3257,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_TATE_AND_LIZA - .string "BEN&SVENJA$", 12 + .string "TATE&LIZA$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -3269,7 +3269,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLACE - .string "WASSILI$", 12 + .string "WALLACE$", 12 .2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3281,7 +3281,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "ORLANDO$", 12 + .string "JERRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3293,7 +3293,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "RAMON$", 12 + .string "TED$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3305,7 +3305,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "JÜRGEN$", 12 + .string "PAUL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3317,7 +3317,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "ORLANDO$", 12 + .string "JERRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3329,7 +3329,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "ORLANDO$", 12 + .string "JERRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3341,7 +3341,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "ORLANDO$", 12 + .string "JERRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3353,7 +3353,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M - .string "ORLANDO$", 12 + .string "JERRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3365,7 +3365,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KERSTIN$", 12 + .string "KAREN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3377,7 +3377,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "ARIANE$", 12 + .string "GEORGIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3389,7 +3389,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KERSTIN$", 12 + .string "KAREN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3401,7 +3401,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KERSTIN$", 12 + .string "KAREN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3413,7 +3413,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KERSTIN$", 12 + .string "KAREN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3425,7 +3425,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F - .string "KERSTIN$", 12 + .string "KAREN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3437,7 +3437,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "EVA & UTE$", 12 + .string "KATE & JOY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3449,7 +3449,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "IRM & IDA$", 12 + .string "ANNA & MEG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3461,7 +3461,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "IRM & IDA$", 12 + .string "ANNA & MEG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3473,7 +3473,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "IRM & IDA$", 12 + .string "ANNA & MEG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3485,7 +3485,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "IRM & IDA$", 12 + .string "ANNA & MEG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3497,7 +3497,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "IRM & IDA$", 12 + .string "ANNA & MEG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -3509,7 +3509,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_WINSTRATE .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M - .string "VIKTOR$", 12 + .string "VICTOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3533,7 +3533,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M - .string "ATTILA$", 12 + .string "COLTON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3593,7 +3593,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F - .string "VIKTORIA$", 12 + .string "VICTORIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -3617,7 +3617,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F - .string "EVELYN$", 12 + .string "MARISSA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3689,7 +3689,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "THEOBALD$", 12 + .string "TIMOTHY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3701,7 +3701,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "THEOBALD$", 12 + .string "TIMOTHY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3713,7 +3713,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "THEOBALD$", 12 + .string "TIMOTHY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3725,7 +3725,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "THEOBALD$", 12 + .string "TIMOTHY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3737,7 +3737,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M - .string "THEOBALD$", 12 + .string "TIMOTHY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3761,7 +3761,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "WALTRAUD$", 12 + .string "SHELBY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3773,7 +3773,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "WALTRAUD$", 12 + .string "SHELBY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3785,7 +3785,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "WALTRAUD$", 12 + .string "SHELBY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3797,7 +3797,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "WALTRAUD$", 12 + .string "SHELBY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3809,7 +3809,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F - .string "WALTRAUD$", 12 + .string "SHELBY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -3821,7 +3821,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ANSGAR$", 12 + .string "CALVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3833,7 +3833,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "FRIDOLIN$", 12 + .string "BILLY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3845,7 +3845,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "GASTON$", 12 + .string "JOSH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3857,7 +3857,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "DOMINIK$", 12 + .string "TOMMY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3869,7 +3869,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "LUDGER$", 12 + .string "JOEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3881,7 +3881,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "EGON$", 12 + .string "BEN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3905,7 +3905,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "JULIUS$", 12 + .string "KEVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3917,7 +3917,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "MORITZ$", 12 + .string "NEAL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3929,7 +3929,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "SÖNCKE$", 12 + .string "DILLON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3941,7 +3941,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ANSGAR$", 12 + .string "CALVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3953,7 +3953,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ANSGAR$", 12 + .string "CALVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3965,7 +3965,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ANSGAR$", 12 + .string "CALVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3977,7 +3977,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ANSGAR$", 12 + .string "CALVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -3989,7 +3989,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "HENRY$", 12 + .string "EDDIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4001,7 +4001,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "HUGO$", 12 + .string "ALLEN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4013,7 +4013,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "FRIEDER$", 12 + .string "TIMMY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4025,7 +4025,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CHAMPION .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_STEVEN - .string "TROY$", 12 + .string "STEVEN$", 12 .2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -4037,7 +4037,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ANSGAR$", 12 + .string "ANDREW$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4049,7 +4049,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ANGELO$", 12 + .string "IVAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4061,7 +4061,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ANSELM$", 12 + .string "CLAUDE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4073,7 +4073,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALOIS$", 12 + .string "ELLIOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4085,7 +4085,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ARTHUR$", 12 + .string "NED$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4097,7 +4097,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALBIN$", 12 + .string "DALE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4109,7 +4109,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "AMADEUS$", 12 + .string "NOLAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4121,7 +4121,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALBRECHT$", 12 + .string "BARNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4133,7 +4133,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALAIN$", 12 + .string "WADE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4145,7 +4145,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ARMIN$", 12 + .string "CARTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4157,7 +4157,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALOIS$", 12 + .string "ELLIOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4169,7 +4169,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALOIS$", 12 + .string "ELLIOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4181,7 +4181,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALOIS$", 12 + .string "ELLIOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4193,7 +4193,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALOIS$", 12 + .string "ELLIOT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -4205,7 +4205,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ACHMED$", 12 + .string "RONALD$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4217,7 +4217,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "ROMAN$", 12 + .string "JACOB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4229,7 +4229,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "EMIL$", 12 + .string "ANTHONY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4241,7 +4241,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "EGIDIUS$", 12 + .string "BENJAMIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4253,7 +4253,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "EGIDIUS$", 12 + .string "BENJAMIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4265,7 +4265,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "EGIDIUS$", 12 + .string "BENJAMIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4277,7 +4277,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "EGIDIUS$", 12 + .string "BENJAMIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4289,7 +4289,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M - .string "EGIDIUS$", 12 + .string "BENJAMIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4301,7 +4301,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "IRMGARD$", 12 + .string "ABIGAIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4313,7 +4313,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "MARTHA$", 12 + .string "JASMINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4325,7 +4325,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "IRMGARD$", 12 + .string "ABIGAIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4337,7 +4337,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "IRMGARD$", 12 + .string "ABIGAIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4349,7 +4349,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "IRMGARD$", 12 + .string "ABIGAIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4361,7 +4361,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F - .string "IRMGARD$", 12 + .string "ABIGAIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4373,7 +4373,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "IGOR$", 12 + .string "DYLAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4385,7 +4385,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "IGOR$", 12 + .string "DYLAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4397,7 +4397,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "IGOR$", 12 + .string "DYLAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4409,7 +4409,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "IGOR$", 12 + .string "DYLAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4421,7 +4421,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M - .string "IGOR$", 12 + .string "DYLAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4433,7 +4433,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "JUTTA$", 12 + .string "MARIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4445,7 +4445,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "JUTTA$", 12 + .string "MARIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4457,7 +4457,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "JUTTA$", 12 + .string "MARIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4469,7 +4469,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "JUTTA$", 12 + .string "MARIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4481,7 +4481,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F - .string "JUTTA$", 12 + .string "MARIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4493,7 +4493,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "OLEG$", 12 + .string "CALEB$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4517,7 +4517,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "KASPAR$", 12 + .string "ISAIAH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4541,7 +4541,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "FERDINAND$", 12 + .string "CHASE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4553,7 +4553,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "KASPAR$", 12 + .string "ISAIAH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4565,7 +4565,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "KASPAR$", 12 + .string "ISAIAH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4577,7 +4577,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "KASPAR$", 12 + .string "ISAIAH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4589,7 +4589,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M - .string "KASPAR$", 12 + .string "ISAIAH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4613,7 +4613,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "MIRA$", 12 + .string "CONNOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4637,7 +4637,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "MECHTHILD$", 12 + .string "KATELYN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4649,7 +4649,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "LOTTE$", 12 + .string "ALLISON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4661,7 +4661,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "MECHTHILD$", 12 + .string "KATELYN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4673,7 +4673,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "MECHTHILD$", 12 + .string "KATELYN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4685,7 +4685,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "MECHTHILD$", 12 + .string "KATELYN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4697,7 +4697,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F - .string "MECHTHILD$", 12 + .string "KATELYN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4709,7 +4709,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "ALFONS$", 12 + .string "NICOLAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4721,7 +4721,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "ALFONS$", 12 + .string "NICOLAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4733,7 +4733,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "ALFONS$", 12 + .string "NICOLAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4745,7 +4745,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "ALFONS$", 12 + .string "NICOLAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4757,7 +4757,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "ALFONS$", 12 + .string "NICOLAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4769,7 +4769,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER - .string "EDMUND$", 12 + .string "AARON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4781,7 +4781,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "JOSCHKA$", 12 + .string "PERRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4793,7 +4793,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ENRICO$", 12 + .string "HUGH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4805,7 +4805,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "HENRY$", 12 + .string "PHIL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4817,7 +4817,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "HIOB$", 12 + .string "JARED$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4841,7 +4841,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ANATOL$", 12 + .string "TANNER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4853,7 +4853,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "BJÖRN$", 12 + .string "WILL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4865,7 +4865,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "WIM$", 12 + .string "COLIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4877,7 +4877,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "FRITJOF$", 12 + .string "ROBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4889,7 +4889,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "GENADI$", 12 + .string "BENNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4901,7 +4901,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "VITALI$", 12 + .string "CHESTER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4913,7 +4913,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "FRITJOF$", 12 + .string "ROBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4925,7 +4925,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "FRITJOF$", 12 + .string "ROBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4937,7 +4937,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "FRITJOF$", 12 + .string "ROBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4949,7 +4949,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "FRITJOF$", 12 + .string "ROBERT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4961,7 +4961,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "ARNE$", 12 + .string "ALEX$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4973,7 +4973,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "VINCENT$", 12 + .string "BECK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -4985,7 +4985,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "VALENTIN$", 12 + .string "YASU$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -4997,7 +4997,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "EUGEN$", 12 + .string "TAKASHI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -5009,7 +5009,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "HERIBERT$", 12 + .string "MAKOTO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5021,7 +5021,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "SAUL$", 12 + .string "HIDEO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5033,7 +5033,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "EDUARD$", 12 + .string "LAO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5045,7 +5045,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "ARND$", 12 + .string "LUNG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5057,7 +5057,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "EDUARD$", 12 + .string "LAO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5069,7 +5069,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "EDUARD$", 12 + .string "LAO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5081,7 +5081,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "EDUARD$", 12 + .string "LAO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5093,7 +5093,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "EDUARD$", 12 + .string "LAO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x0 @ AI flags @@ -5105,7 +5105,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "TAMARA$", 12 + .string "TESSA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5129,7 +5129,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "ELFI$", 12 + .string "CYNDY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5141,7 +5141,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "THEA$", 12 + .string "CORA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5153,7 +5153,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "AGNES$", 12 + .string "JILL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5165,7 +5165,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "ELFI$", 12 + .string "CYNDY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5177,7 +5177,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "ELFI$", 12 + .string "CYNDY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5189,7 +5189,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "ELFI$", 12 + .string "CYNDY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5201,7 +5201,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "ELFI$", 12 + .string "CYNDY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5213,7 +5213,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "SASKIA$", 12 + .string "MADELINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5225,7 +5225,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "GERDA$", 12 + .string "CLARISSA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5237,7 +5237,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "MARIKA$", 12 + .string "ANGELICA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5249,7 +5249,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "SASKIA$", 12 + .string "MADELINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5261,7 +5261,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "SASKIA$", 12 + .string "MADELINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5273,7 +5273,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "SASKIA$", 12 + .string "MADELINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5285,7 +5285,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY - .string "SASKIA$", 12 + .string "MADELINE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5297,7 +5297,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "DAGMAR$", 12 + .string "BEVERLY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5309,7 +5309,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "HEIDRUN$", 12 + .string "DAWN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5345,7 +5345,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "ALMUT$", 12 + .string "BETH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5357,7 +5357,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "SIEGLINDE$", 12 + .string "TARA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5369,7 +5369,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "MARION$", 12 + .string "MISSY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5393,7 +5393,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "MONIKA$", 12 + .string "JENNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5405,7 +5405,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "ILONA$", 12 + .string "GRACE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5417,7 +5417,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "EMILIE$", 12 + .string "TANYA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5429,7 +5429,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "GUDRUN$", 12 + .string "SHARON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5441,7 +5441,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "ASTRID$", 12 + .string "NIKKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5453,7 +5453,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "OTTILIE$", 12 + .string "BRENDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5465,7 +5465,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "SENTA$", 12 + .string "KATIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5477,7 +5477,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "JANKA$", 12 + .string "SUSIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5489,7 +5489,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "RENATE$", 12 + .string "KARA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5501,7 +5501,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "VICKI$", 12 + .string "DANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5513,7 +5513,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "REBECCA$", 12 + .string "ERIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5525,7 +5525,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "ANJA$", 12 + .string "DEBRA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5537,7 +5537,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "GISELA$", 12 + .string "LINDA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5549,7 +5549,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "PAOLA$", 12 + .string "KAYLEE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5561,7 +5561,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "BIRTE$", 12 + .string "LAUREL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5573,7 +5573,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "DOROTHEA$", 12 + .string "DARCY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5585,7 +5585,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "MONIKA$", 12 + .string "JENNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5597,7 +5597,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "MONIKA$", 12 + .string "JENNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5609,7 +5609,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "MONIKA$", 12 + .string "JENNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5621,7 +5621,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "MONIKA$", 12 + .string "JENNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5633,7 +5633,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "JANA$", 12 + .string "HEIDI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5645,7 +5645,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "HEIDI$", 12 + .string "BECKY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5657,7 +5657,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "NATALIE$", 12 + .string "CAROL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5693,7 +5693,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "GWENDOLIN$", 12 + .string "DIANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5705,7 +5705,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "NADJA$", 12 + .string "NINA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5729,7 +5729,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "GWENDOLIN$", 12 + .string "DIANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5741,7 +5741,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "GWENDOLIN$", 12 + .string "DIANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5753,7 +5753,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "GWENDOLIN$", 12 + .string "DIANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5765,7 +5765,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "GWENDOLIN$", 12 + .string "DIANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5777,7 +5777,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "NORA & JO$", 12 + .string "AMY & LIV$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5789,7 +5789,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "NORA & JO$", 12 + .string "AMY & LIV$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5813,7 +5813,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "LEA & GRIT$", 12 + .string "MIU & YUKI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5825,7 +5825,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "NORA & JO$", 12 + .string "AMY & LIV$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5849,7 +5849,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "NORA & JO$", 12 + .string "AMY & LIV$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5861,7 +5861,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "NORA & JO$", 12 + .string "AMY & LIV$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5873,7 +5873,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "NORA & JO$", 12 + .string "AMY & LIV$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -5885,7 +5885,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "TASSILO$", 12 + .string "HUEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5897,7 +5897,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "MONTY$", 12 + .string "EDMOND$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5909,7 +5909,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ELERT$", 12 + .string "ERNEST$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5921,7 +5921,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "RETO$", 12 + .string "DWAYNE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5933,7 +5933,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "GUNNAR$", 12 + .string "PHILLIP$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5957,7 +5957,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "PIERRE$", 12 + .string "DUNCAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5969,7 +5969,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ELERT$", 12 + .string "ERNEST$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5981,7 +5981,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ELERT$", 12 + .string "ERNEST$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -5993,7 +5993,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ELERT$", 12 + .string "ERNEST$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6005,7 +6005,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR - .string "ELERT$", 12 + .string "ERNEST$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6053,7 +6053,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "WENZEL$", 12 + .string "SONNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6065,7 +6065,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "STANISLAUS$", 12 + .string "DONOVAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6089,7 +6089,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "AARON$", 12 + .string "KELVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6101,7 +6101,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ALBERT$", 12 + .string "KODY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6113,7 +6113,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "ANDRE$", 12 + .string "TEVIN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6125,7 +6125,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER - .string "AMON$", 12 + .string "DAMON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6161,7 +6161,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR - .string "HEKTOR$", 12 + .string "HECTOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6173,7 +6173,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR - .string "HEKTOR$", 12 + .string "HECTOR$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6233,7 +6233,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "HEIKO$", 12 + .string "WALLY$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6245,7 +6245,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6257,7 +6257,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6269,7 +6269,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6281,7 +6281,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6293,7 +6293,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6305,7 +6305,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6317,7 +6317,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6329,7 +6329,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6341,7 +6341,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6353,7 +6353,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6365,7 +6365,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6377,7 +6377,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6389,7 +6389,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6401,7 +6401,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6413,7 +6413,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6425,7 +6425,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6437,7 +6437,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6449,7 +6449,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6461,7 +6461,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "BLASIUS$", 12 + .string "ISAAC$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6473,7 +6473,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "CLIFF$", 12 + .string "RILEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6485,7 +6485,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "DARIO$", 12 + .string "AIDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6497,7 +6497,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "BLASIUS$", 12 + .string "ISAAC$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6509,7 +6509,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "BLASIUS$", 12 + .string "ISAAC$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6521,7 +6521,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "BLASIUS$", 12 + .string "ISAAC$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6533,7 +6533,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M - .string "BLASIUS$", 12 + .string "ISAAC$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6557,7 +6557,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "DORIS$", 12 + .string "ALEXIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6569,7 +6569,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F - .string "DUNJA$", 12 + .string "DANIELLE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6629,7 +6629,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "ECKBERT$", 12 + .string "JACKSON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6641,7 +6641,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "EDWARD$", 12 + .string "CARLOS$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6653,7 +6653,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "EILMAR$", 12 + .string "SEBASTIAN$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6665,7 +6665,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "ECKBERT$", 12 + .string "JACKSON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6677,7 +6677,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "ECKBERT$", 12 + .string "JACKSON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6689,7 +6689,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "ECKBERT$", 12 + .string "JACKSON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6701,7 +6701,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M - .string "ECKBERT$", 12 + .string "JACKSON$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6713,7 +6713,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "HANNELORE$", 12 + .string "CATHERINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6725,7 +6725,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "INGEBORG$", 12 + .string "JENNA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6749,7 +6749,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "HANNELORE$", 12 + .string "CATHERINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6761,7 +6761,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "HANNELORE$", 12 + .string "CATHERINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6773,7 +6773,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "HANNELORE$", 12 + .string "CATHERINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -6785,7 +6785,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F - .string "HANNELORE$", 12 + .string "CATHERINE$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6797,7 +6797,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE - .string "MARC$", 12 + .string "MAXIE$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -6809,7 +6809,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6821,7 +6821,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6833,7 +6833,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6845,7 +6845,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6857,7 +6857,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6869,7 +6869,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6881,7 +6881,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6893,7 +6893,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6905,7 +6905,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6917,7 +6917,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6929,7 +6929,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6941,7 +6941,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6953,7 +6953,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6965,7 +6965,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6977,7 +6977,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -6989,7 +6989,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7001,7 +7001,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7013,7 +7013,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7025,7 +7025,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7037,7 +7037,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7049,7 +7049,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7061,7 +7061,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7073,7 +7073,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7085,7 +7085,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7097,7 +7097,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7109,7 +7109,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7121,7 +7121,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F - .string "RÜPEL$", 12 + .string "GRUNT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7157,7 +7157,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M - .string "KALLE$", 12 + .string "TABITHA$", 12 .2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -7169,7 +7169,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M - .string "KALLE$", 12 + .string "TABITHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7193,7 +7193,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F - .string "JÖRDIS$", 12 + .string "COURTNEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7205,7 +7205,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F - .string "JÖRDIS$", 12 + .string "COURTNEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0xb @ AI flags @@ -7217,7 +7217,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE - .string "MARC$", 12 + .string "MAXIE$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7229,7 +7229,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE - .string "MARC$", 12 + .string "MAXIE$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7241,7 +7241,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "KARIN$", 12 + .string "TIANA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7253,7 +7253,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "ELISA$", 12 + .string "HALEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7265,7 +7265,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "RICARDA$", 12 + .string "JANICE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7277,7 +7277,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "SIEGLINDE$", 12 + .string "VIVI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7289,7 +7289,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "ELISA$", 12 + .string "HALEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7301,7 +7301,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "ELISA$", 12 + .string "HALEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7313,7 +7313,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "ELISA$", 12 + .string "HALEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7325,7 +7325,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "ELISA$", 12 + .string "HALEY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7337,7 +7337,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "FREDERIKE$", 12 + .string "SALLY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7361,7 +7361,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "FRIEDA$", 12 + .string "ANDREA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7373,7 +7373,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS - .string "ADELHEID$", 12 + .string "CRISSY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7385,7 +7385,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "BALDUR$", 12 + .string "RICK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7397,7 +7397,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "DETWIN$", 12 + .string "LYLE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7409,7 +7409,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "EROS$", 12 + .string "JOSE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7421,7 +7421,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "EUSEBIUS$", 12 + .string "DOUG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7433,7 +7433,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GANGOLF$", 12 + .string "GREG$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7445,7 +7445,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GERIT$", 12 + .string "KENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7457,7 +7457,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GERNOT$", 12 + .string "JAMES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7469,7 +7469,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GERNOT$", 12 + .string "JAMES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7481,7 +7481,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GERNOT$", 12 + .string "JAMES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7493,7 +7493,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GERNOT$", 12 + .string "JAMES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7505,7 +7505,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER - .string "GERNOT$", 12 + .string "JAMES$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7517,7 +7517,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "GISBERT$", 12 + .string "BRICE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7529,7 +7529,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "HEIMKE$", 12 + .string "TRENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7541,7 +7541,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "JANNO$", 12 + .string "LENNY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7553,7 +7553,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "KLODWIG$", 12 + .string "LUCAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7565,7 +7565,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "LANZELOT$", 12 + .string "ALAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7577,7 +7577,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "LUZIUS$", 12 + .string "CLARK$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7589,7 +7589,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "MAURIZIO$", 12 + .string "ERIC$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7601,7 +7601,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "KLODWIG$", 12 + .string "LUCAS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7613,7 +7613,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "MELVIN$", 12 + .string "MIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7625,7 +7625,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "MELVIN$", 12 + .string "MIKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7637,7 +7637,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "HEIMKE$", 12 + .string "TRENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7649,7 +7649,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "HEIMKE$", 12 + .string "TRENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7661,7 +7661,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "HEIMKE$", 12 + .string "TRENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7673,7 +7673,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER - .string "HEIMKE$", 12 + .string "TRENT$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7685,7 +7685,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "INA & LEIF$", 12 + .string "DEZ & LUKE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7697,7 +7697,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "LENA & UWE$", 12 + .string "LEA & JED$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7709,7 +7709,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "GESA & PIT$", 12 + .string "LOIS & HAL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7721,7 +7721,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "GESA & PIT$", 12 + .string "LOIS & HAL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7733,7 +7733,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "GESA & PIT$", 12 + .string "LOIS & HAL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7745,7 +7745,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "GESA & PIT$", 12 + .string "LOIS & HAL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7757,7 +7757,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "GESA & PIT$", 12 + .string "LOIS & HAL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -7769,7 +7769,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY - .string "CORDULA$", 12 + .string "JOHANNA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7781,7 +7781,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "OTBERT$", 12 + .string "ZANE$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7793,7 +7793,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "BÄRBEL$", 12 + .string "VIVIAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7805,7 +7805,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL - .string "CHANTAL$", 12 + .string "SADIE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7817,7 +7817,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "SAUL$", 12 + .string "HIDEO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -7829,7 +7829,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "NELSON$", 12 + .string "KEIGO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -7841,7 +7841,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY - .string "NIKODEMUS$", 12 + .string "TSUNAO$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x3 @ AI flags @@ -7853,7 +7853,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER - .string "NESTOR$", 12 + .string "TERRELL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7865,7 +7865,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER - .string "MIREILLE$", 12 + .string "KYLEE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -7877,7 +7877,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "HEIKO$", 12 + .string "WALLY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7889,7 +7889,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "HEIKO$", 12 + .string "WALLY$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7901,7 +7901,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "HEIKO$", 12 + .string "WALLY$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7913,7 +7913,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "HEIKO$", 12 + .string "WALLY$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7925,7 +7925,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY - .string "HEIKO$", 12 + .string "WALLY$", 12 .2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7937,7 +7937,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7949,7 +7949,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7961,7 +7961,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN - .string "BRIX$", 12 + .string "BRENDAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7973,7 +7973,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7985,7 +7985,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -7997,7 +7997,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY - .string "MAIKE$", 12 + .string "MAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -8009,7 +8009,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "OLOF$", 12 + .string "JONAH$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8021,7 +8021,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "PIUS$", 12 + .string "HENRY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8033,7 +8033,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "AMATUS$", 12 + .string "ROGER$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8045,7 +8045,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F - .string "ANNABEL$", 12 + .string "ALEXA$", 12 .2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -8057,7 +8057,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M - .string "TRUTZ$", 12 + .string "RUBEN$", 12 .2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x7 @ AI flags @@ -8069,7 +8069,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT - .string "REMIGIUS$", 12 + .string "KOJI$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8081,7 +8081,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ALVARO$", 12 + .string "WAYNE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8093,7 +8093,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER - .string "AMALRICH$", 12 + .string "BYRON$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8105,7 +8105,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M - .string "ANDOLIN$", 12 + .string "REED$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8117,7 +8117,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F - .string "IMKE$", 12 + .string "TISHA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags @@ -8129,7 +8129,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS - .string "LI & FLO$", 12 + .string "TORI & TIA$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8141,7 +8141,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR - .string "ZOE & IRIS$", 12 + .string "KIM & IRIS$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8165,7 +8165,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE - .string "GELI & OLE$", 12 + .string "MEL & PAUL$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8177,7 +8177,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "URS & EVI$", 12 + .string "JOHN & JAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8189,7 +8189,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "URS & EVI$", 12 + .string "JOHN & JAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8201,7 +8201,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "URS & EVI$", 12 + .string "JOHN & JAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8213,7 +8213,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "URS & EVI$", 12 + .string "JOHN & JAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0xb @ AI flags @@ -8225,7 +8225,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE - .string "URS & EVI$", 12 + .string "JOHN & JAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x7 @ AI flags @@ -8237,7 +8237,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "TOBI & UNA$", 12 + .string "RELI & IAN$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8249,7 +8249,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "TOM & UTA$", 12 + .string "RITA & SAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8261,7 +8261,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "TOM & UTA$", 12 + .string "RITA & SAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8273,7 +8273,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "TOM & UTA$", 12 + .string "RITA & SAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8285,7 +8285,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "TOM & UTA$", 12 + .string "RITA & SAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8297,7 +8297,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "TOM & UTA$", 12 + .string "RITA & SAM$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8309,7 +8309,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO - .string "ERKO & BEA$", 12 + .string "LISA & RAY$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte TRUE @ is double battle .4byte 0x1 @ AI flags @@ -8321,7 +8321,7 @@ gTrainers:: @ 81F04FC .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN - .string "ABELKE$", 12 + .string "EUGENE$", 12 .2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items .4byte FALSE @ is double battle .4byte 0x1 @ AI flags diff --git a/graphics/battle_interface/hpbar.png b/graphics/battle_interface/hpbar.png index c786ba339..f3a0314e4 100644 Binary files a/graphics/battle_interface/hpbar.png and b/graphics/battle_interface/hpbar.png differ diff --git a/graphics/battle_interface/status2.png b/graphics/battle_interface/status2.png index af0621c15..97a344ae3 100644 Binary files a/graphics/battle_interface/status2.png and b/graphics/battle_interface/status2.png differ diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png index 566e1b6f3..3e5989d05 100644 Binary files a/graphics/battle_interface/status3.png and b/graphics/battle_interface/status3.png differ diff --git a/graphics/battle_interface/status4.png b/graphics/battle_interface/status4.png index 952c65050..d9769ad28 100644 Binary files a/graphics/battle_interface/status4.png and b/graphics/battle_interface/status4.png differ diff --git a/graphics/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png index e5a9418b0..0de1e3ad2 100644 Binary files a/graphics/battle_interface/status_brn.png and b/graphics/battle_interface/status_brn.png differ diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png index 42d4c74fb..3e1d534b5 100644 Binary files a/graphics/battle_interface/status_frz.png and b/graphics/battle_interface/status_frz.png differ diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png index e27a7fe75..95869e572 100644 Binary files a/graphics/battle_interface/status_psn.png and b/graphics/battle_interface/status_psn.png differ diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png index a129e44a8..b0eb5a250 100644 Binary files a/graphics/battle_interface/status_slp.png and b/graphics/battle_interface/status_slp.png differ diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png index ea5fc73d7..2117967ec 100644 Binary files a/graphics/battle_interface/window.png and b/graphics/battle_interface/window.png differ diff --git a/graphics/berry_blender/outer.png b/graphics/berry_blender/outer.png index 451f5d3c0..d8040b022 100644 Binary files a/graphics/berry_blender/outer.png and b/graphics/berry_blender/outer.png differ diff --git a/graphics/contest/applause.png b/graphics/contest/applause.png index 36d2f9b98..32b1748a0 100644 Binary files a/graphics/contest/applause.png and b/graphics/contest/applause.png differ diff --git a/graphics/contest/contest_words.bin b/graphics/contest/contest_words.bin index 5b64b62ec..518b608c0 100644 Binary files a/graphics/contest/contest_words.bin and b/graphics/contest/contest_words.bin differ diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png index b784e7755..536924daf 100644 Binary files a/graphics/contest/misc.png and b/graphics/contest/misc.png differ diff --git a/graphics/contest/misc_2.png b/graphics/contest/misc_2.png index 8ff8ee043..44a4a8295 100644 Binary files a/graphics/contest/misc_2.png and b/graphics/contest/misc_2.png differ diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/misc_2_tilemap_2.bin index 97baed987..b31126836 100644 Binary files a/graphics/contest/misc_2_tilemap_2.bin and b/graphics/contest/misc_2_tilemap_2.bin differ diff --git a/graphics/contest/nextturn.png b/graphics/contest/nextturn.png index 49e6b1062..747c4b5a7 100644 Binary files a/graphics/contest/nextturn.png and b/graphics/contest/nextturn.png differ diff --git a/graphics/contest/nextturn_numbers.png b/graphics/contest/nextturn_numbers.png index 48ed89b20..4386f822d 100644 Binary files a/graphics/contest/nextturn_numbers.png and b/graphics/contest/nextturn_numbers.png differ diff --git a/graphics/contest/nextturn_random.png b/graphics/contest/nextturn_random.png index 3f5fd5914..b92003823 100644 Binary files a/graphics/contest/nextturn_random.png and b/graphics/contest/nextturn_random.png differ diff --git a/graphics/fonts/font3_lat.png b/graphics/fonts/font3_lat.png index 36de83fd9..b1606aef6 100644 Binary files a/graphics/fonts/font3_lat.png and b/graphics/fonts/font3_lat.png differ diff --git a/graphics/fonts/font4_lat.4bpp.bin b/graphics/fonts/font4_lat.4bpp.bin index 7317ab0a4..e69de29bb 100644 Binary files a/graphics/fonts/font4_lat.4bpp.bin and b/graphics/fonts/font4_lat.4bpp.bin differ diff --git a/graphics/interface/bag_screen.png b/graphics/interface/bag_screen.png index bde0158ef..86b824bce 100644 Binary files a/graphics/interface/bag_screen.png and b/graphics/interface/bag_screen.png differ diff --git a/graphics/interface/berry_tag.bin b/graphics/interface/berry_tag.bin index 9ec4ebfb8..1b75a6b1e 100644 Binary files a/graphics/interface/berry_tag.bin and b/graphics/interface/berry_tag.bin differ diff --git a/graphics/interface/check_berry.png b/graphics/interface/check_berry.png index 5b4e728c5..8a4ea695a 100644 Binary files a/graphics/interface/check_berry.png and b/graphics/interface/check_berry.png differ diff --git a/graphics/interface/money.png b/graphics/interface/money.png index eab4da519..5ad533dbf 100644 Binary files a/graphics/interface/money.png and b/graphics/interface/money.png differ diff --git a/graphics/interface/outline_cursor_00.png b/graphics/interface/outline_cursor_00.png index 39241e978..8e0be365b 100644 Binary files a/graphics/interface/outline_cursor_00.png and b/graphics/interface/outline_cursor_00.png differ diff --git a/graphics/interface/outline_cursor_01.png b/graphics/interface/outline_cursor_01.png index 3ce90161a..27bdb892d 100644 Binary files a/graphics/interface/outline_cursor_01.png and b/graphics/interface/outline_cursor_01.png differ diff --git a/graphics/interface/outline_cursor_02.png b/graphics/interface/outline_cursor_02.png index 5d2d69a45..93b5e9e6a 100644 Binary files a/graphics/interface/outline_cursor_02.png and b/graphics/interface/outline_cursor_02.png differ diff --git a/graphics/interface/outline_cursor_03.png b/graphics/interface/outline_cursor_03.png index 68698063a..ef20425ec 100644 Binary files a/graphics/interface/outline_cursor_03.png and b/graphics/interface/outline_cursor_03.png differ diff --git a/graphics/interface/outline_cursor_04.png b/graphics/interface/outline_cursor_04.png index 41d202407..4d06da317 100644 Binary files a/graphics/interface/outline_cursor_04.png and b/graphics/interface/outline_cursor_04.png differ diff --git a/graphics/interface/outline_cursor_05.png b/graphics/interface/outline_cursor_05.png index 9f64769e1..ba9e28bea 100644 Binary files a/graphics/interface/outline_cursor_05.png and b/graphics/interface/outline_cursor_05.png differ diff --git a/graphics/interface/outline_cursor_06.png b/graphics/interface/outline_cursor_06.png index d7e0cb91c..e68d42763 100644 Binary files a/graphics/interface/outline_cursor_06.png and b/graphics/interface/outline_cursor_06.png differ diff --git a/graphics/interface/outline_cursor_07.png b/graphics/interface/outline_cursor_07.png index f92da0c26..6df7fd731 100644 Binary files a/graphics/interface/outline_cursor_07.png and b/graphics/interface/outline_cursor_07.png differ diff --git a/graphics/interface/outline_cursor_08.png b/graphics/interface/outline_cursor_08.png index 6164c9504..006a0dc50 100644 Binary files a/graphics/interface/outline_cursor_08.png and b/graphics/interface/outline_cursor_08.png differ diff --git a/graphics/interface/outline_cursor_09.png b/graphics/interface/outline_cursor_09.png index 803f1c043..f1db0963f 100644 Binary files a/graphics/interface/outline_cursor_09.png and b/graphics/interface/outline_cursor_09.png differ diff --git a/graphics/interface/outline_cursor_10.png b/graphics/interface/outline_cursor_10.png index 401402c5a..a5356f083 100644 Binary files a/graphics/interface/outline_cursor_10.png and b/graphics/interface/outline_cursor_10.png differ diff --git a/graphics/interface/outline_cursor_11.png b/graphics/interface/outline_cursor_11.png index 9fed878ee..4415fa553 100644 Binary files a/graphics/interface/outline_cursor_11.png and b/graphics/interface/outline_cursor_11.png differ diff --git a/graphics/interface/outline_cursor_12.png b/graphics/interface/outline_cursor_12.png index 4d95f925b..97c57da0b 100644 Binary files a/graphics/interface/outline_cursor_12.png and b/graphics/interface/outline_cursor_12.png differ diff --git a/graphics/interface/outline_cursor_13.png b/graphics/interface/outline_cursor_13.png index 8b7beecac..301956091 100644 Binary files a/graphics/interface/outline_cursor_13.png and b/graphics/interface/outline_cursor_13.png differ diff --git a/graphics/interface/outline_cursor_14.png b/graphics/interface/outline_cursor_14.png index b8ae2106b..336e4cdc6 100644 Binary files a/graphics/interface/outline_cursor_14.png and b/graphics/interface/outline_cursor_14.png differ diff --git a/graphics/interface/outline_cursor_15.png b/graphics/interface/outline_cursor_15.png index 8ea94e2b5..d9771c0be 100644 Binary files a/graphics/interface/outline_cursor_15.png and b/graphics/interface/outline_cursor_15.png differ diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png index 13613b9f9..5860ada9b 100644 Binary files a/graphics/interface/party_menu_hpbar.png and b/graphics/interface/party_menu_hpbar.png differ diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png index c32a0a224..6ca98493b 100644 Binary files a/graphics/interface/party_menu_misc.png and b/graphics/interface/party_menu_misc.png differ diff --git a/graphics/interface/party_menu_ordertext.png b/graphics/interface/party_menu_ordertext.png index 423ff273e..003af36d0 100644 Binary files a/graphics/interface/party_menu_ordertext.png and b/graphics/interface/party_menu_ordertext.png differ diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png index c04cde98a..646636365 100644 Binary files a/graphics/interface/pokeblock_case_frame.png and b/graphics/interface/pokeblock_case_frame.png differ diff --git a/graphics/interface/pokemon_info.bin b/graphics/interface/pokemon_info.bin index fea2412da..a73c0fe94 100644 Binary files a/graphics/interface/pokemon_info.bin and b/graphics/interface/pokemon_info.bin differ diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png index 55c07d220..f319d5566 100644 Binary files a/graphics/interface/status_icons.png and b/graphics/interface/status_icons.png differ diff --git a/graphics/interface/status_screen.bin b/graphics/interface/status_screen.bin index 1ef3cd80b..e5387571c 100644 Binary files a/graphics/interface/status_screen.bin and b/graphics/interface/status_screen.bin differ diff --git a/graphics/interface/status_screen.png b/graphics/interface/status_screen.png index 2b3434b9e..3024a035c 100644 Binary files a/graphics/interface/status_screen.png and b/graphics/interface/status_screen.png differ diff --git a/graphics/interface/status_screen_battle_moves.bin b/graphics/interface/status_screen_battle_moves.bin index d5cea0cc0..46a3e9e55 100644 Binary files a/graphics/interface/status_screen_battle_moves.bin and b/graphics/interface/status_screen_battle_moves.bin differ diff --git a/graphics/interface/status_screen_contest_moves.bin b/graphics/interface/status_screen_contest_moves.bin index dbf92e246..cbb339c13 100644 Binary files a/graphics/interface/status_screen_contest_moves.bin and b/graphics/interface/status_screen_contest_moves.bin differ diff --git a/graphics/interface/status_screen_pokemon_skills.bin b/graphics/interface/status_screen_pokemon_skills.bin index b4e6cac23..745f3d2de 100644 Binary files a/graphics/interface/status_screen_pokemon_skills.bin and b/graphics/interface/status_screen_pokemon_skills.bin differ diff --git a/graphics/interface/wordgroup_frame.png b/graphics/interface/wordgroup_frame.png index ca1cc208d..71a26aab4 100644 Binary files a/graphics/interface/wordgroup_frame.png and b/graphics/interface/wordgroup_frame.png differ diff --git a/graphics/interface/wordgroup_indicator.png b/graphics/interface/wordgroup_indicator.png index 1d8313406..9cf90dbf1 100644 Binary files a/graphics/interface/wordgroup_indicator.png and b/graphics/interface/wordgroup_indicator.png differ diff --git a/graphics/interface/wordgroup_layout.bin b/graphics/interface/wordgroup_layout.bin index 787dcea1e..d9fd80e43 100644 Binary files a/graphics/interface/wordgroup_layout.bin and b/graphics/interface/wordgroup_layout.bin differ diff --git a/graphics/intro/copyright.bin b/graphics/intro/copyright.bin index 4a8309285..367991ff7 100644 Binary files a/graphics/intro/copyright.bin and b/graphics/intro/copyright.bin differ diff --git a/graphics/intro/copyright.png b/graphics/intro/copyright.png index a8304e57e..23d6dc2b4 100644 Binary files a/graphics/intro/copyright.png and b/graphics/intro/copyright.png differ diff --git a/graphics/misc/clock.png b/graphics/misc/clock.png index 73424016d..28780c1d1 100644 Binary files a/graphics/misc/clock.png and b/graphics/misc/clock.png differ diff --git a/graphics/misc/condition_up_down.png b/graphics/misc/condition_up_down.png index 02b3124de..7d4049d86 100644 Binary files a/graphics/misc/condition_up_down.png and b/graphics/misc/condition_up_down.png differ diff --git a/graphics/misc/end_copyright.png b/graphics/misc/end_copyright.png index 760d03e06..57fc6114a 100644 Binary files a/graphics/misc/end_copyright.png and b/graphics/misc/end_copyright.png differ diff --git a/graphics/misc/hof.png b/graphics/misc/hof.png index 33acc2dcd..b60489544 100644 Binary files a/graphics/misc/hof.png and b/graphics/misc/hof.png differ diff --git a/graphics/misc/interview_outline_cursor.png b/graphics/misc/interview_outline_cursor.png index 598b0d6f4..c9ade7073 100644 Binary files a/graphics/misc/interview_outline_cursor.png and b/graphics/misc/interview_outline_cursor.png differ diff --git a/graphics/misc/trainer_card.png b/graphics/misc/trainer_card.png index fe5626f12..915ecdca2 100644 Binary files a/graphics/misc/trainer_card.png and b/graphics/misc/trainer_card.png differ diff --git a/graphics/misc/wallclock_edit.bin b/graphics/misc/wallclock_edit.bin index 7d51a7cff..1c655c97b 100644 Binary files a/graphics/misc/wallclock_edit.bin and b/graphics/misc/wallclock_edit.bin differ diff --git a/graphics/misc/wallclock_view.bin b/graphics/misc/wallclock_view.bin index 444a57e60..f75a23c80 100644 Binary files a/graphics/misc/wallclock_view.bin and b/graphics/misc/wallclock_view.bin differ diff --git a/graphics/naming_screen/back_button.png b/graphics/naming_screen/back_button.png index 812e39255..39d69ba1a 100644 Binary files a/graphics/naming_screen/back_button.png and b/graphics/naming_screen/back_button.png differ diff --git a/graphics/naming_screen/lower_text.png b/graphics/naming_screen/lower_text.png index 08aebe26a..472e0abb0 100644 Binary files a/graphics/naming_screen/lower_text.png and b/graphics/naming_screen/lower_text.png differ diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png index 78b0f6f23..aae121e3e 100644 Binary files a/graphics/naming_screen/menu.png and b/graphics/naming_screen/menu.png differ diff --git a/graphics/naming_screen/ok_button.png b/graphics/naming_screen/ok_button.png index e8bf68016..2e9e9806d 100644 Binary files a/graphics/naming_screen/ok_button.png and b/graphics/naming_screen/ok_button.png differ diff --git a/graphics/naming_screen/others_text.png b/graphics/naming_screen/others_text.png index eafa76938..ffd71701a 100644 Binary files a/graphics/naming_screen/others_text.png and b/graphics/naming_screen/others_text.png differ diff --git a/graphics/naming_screen/upper_text.png b/graphics/naming_screen/upper_text.png index cacd890e8..58bfbed35 100644 Binary files a/graphics/naming_screen/upper_text.png and b/graphics/naming_screen/upper_text.png differ diff --git a/graphics/pokedex/area_unknown.png b/graphics/pokedex/area_unknown.png index 1a92a2a1a..66d0382c3 100644 Binary files a/graphics/pokedex/area_unknown.png and b/graphics/pokedex/area_unknown.png differ diff --git a/graphics/pokedex/cry_meter.png b/graphics/pokedex/cry_meter.png index 7862df796..ec6b0ed43 100644 Binary files a/graphics/pokedex/cry_meter.png and b/graphics/pokedex/cry_meter.png differ diff --git a/graphics/pokedex/cry_meter_map.bin b/graphics/pokedex/cry_meter_map.bin index 92a8da3af..cd58849a4 100644 Binary files a/graphics/pokedex/cry_meter_map.bin and b/graphics/pokedex/cry_meter_map.bin differ diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/menu.png index 7b2e814c7..dd8ab63a7 100644 Binary files a/graphics/pokedex/menu.png and b/graphics/pokedex/menu.png differ diff --git a/graphics/pokedex/menu2.png b/graphics/pokedex/menu2.png index 408668f27..27de53df0 100644 Binary files a/graphics/pokedex/menu2.png and b/graphics/pokedex/menu2.png differ diff --git a/graphics/pokedex/menu3.pal b/graphics/pokedex/menu3.pal index c35a1571f..101b62b41 100644 --- a/graphics/pokedex/menu3.pal +++ b/graphics/pokedex/menu3.pal @@ -31,7 +31,7 @@ JASC-PAL 16 0 0 172 156 139 82 82 57 -255 255 255 +0 0 0 0 0 0 123 131 0 0 0 0 @@ -52,7 +52,7 @@ JASC-PAL 123 131 0 0 0 0 0 0 0 -205 205 205 +172 172 172 172 172 172 98 98 115 57 57 57 @@ -63,5 +63,5 @@ JASC-PAL 32 32 32 172 156 139 82 82 57 -205 205 205 +0 0 0 0 0 0 diff --git a/graphics/pokedex/menu_search.png b/graphics/pokedex/menu_search.png index 0ea5e2649..d1c4ae466 100644 Binary files a/graphics/pokedex/menu_search.png and b/graphics/pokedex/menu_search.png differ diff --git a/graphics/pokedex/noball.png b/graphics/pokedex/noball.png index 1be1668af..40acfbd7d 100644 Binary files a/graphics/pokedex/noball.png and b/graphics/pokedex/noball.png differ diff --git a/graphics/pokedex/pokedex_detail_layout.bin b/graphics/pokedex/pokedex_detail_layout.bin index 673685f08..debd15a94 100644 Binary files a/graphics/pokedex/pokedex_detail_layout.bin and b/graphics/pokedex/pokedex_detail_layout.bin differ diff --git a/graphics/pokedex/pokedex_list_menu.bin b/graphics/pokedex/pokedex_list_menu.bin index 7bd0129db..9cc6acb41 100644 Binary files a/graphics/pokedex/pokedex_list_menu.bin and b/graphics/pokedex/pokedex_list_menu.bin differ diff --git a/graphics/pokedex/pokedex_listing_menu.bin b/graphics/pokedex/pokedex_listing_menu.bin index ffa7d4df6..00e63f3a9 100644 Binary files a/graphics/pokedex/pokedex_listing_menu.bin and b/graphics/pokedex/pokedex_listing_menu.bin differ diff --git a/graphics/pokedex/pokedex_navbar.bin b/graphics/pokedex/pokedex_navbar.bin index 5b08e2205..58da7b7b5 100644 Binary files a/graphics/pokedex/pokedex_navbar.bin and b/graphics/pokedex/pokedex_navbar.bin differ diff --git a/graphics/pokedex/pokedex_navbar_3.bin b/graphics/pokedex/pokedex_navbar_3.bin index 45c4afe93..e32733737 100644 Binary files a/graphics/pokedex/pokedex_navbar_3.bin and b/graphics/pokedex/pokedex_navbar_3.bin differ diff --git a/graphics/pokemon_storage/header.png b/graphics/pokemon_storage/header.png index 603e66042..f302ea41f 100644 Binary files a/graphics/pokemon_storage/header.png and b/graphics/pokemon_storage/header.png differ diff --git a/graphics/pokemon_storage/misc1.png b/graphics/pokemon_storage/misc1.png index bf6d8cdbc..e2906d6af 100644 Binary files a/graphics/pokemon_storage/misc1.png and b/graphics/pokemon_storage/misc1.png differ diff --git a/graphics/pokenav/bottom_toolbar.bin b/graphics/pokenav/bottom_toolbar.bin index c925629f8..84261404b 100644 Binary files a/graphics/pokenav/bottom_toolbar.bin and b/graphics/pokenav/bottom_toolbar.bin differ diff --git a/graphics/pokenav/condition_cancel.png b/graphics/pokenav/condition_cancel.png index c490fc7dc..db4734b15 100644 Binary files a/graphics/pokenav/condition_cancel.png and b/graphics/pokenav/condition_cancel.png differ diff --git a/graphics/pokenav/condition_menu.png b/graphics/pokenav/condition_menu.png index a384b26bb..8b682223e 100644 Binary files a/graphics/pokenav/condition_menu.png and b/graphics/pokenav/condition_menu.png differ diff --git a/graphics/pokenav/condition_menu_header.png b/graphics/pokenav/condition_menu_header.png index 9b7927a9d..1a9c07273 100644 Binary files a/graphics/pokenav/condition_menu_header.png and b/graphics/pokenav/condition_menu_header.png differ diff --git a/graphics/pokenav/condition_menu_misc.png b/graphics/pokenav/condition_menu_misc.png index 50f6b9dd5..3c87c867e 100644 Binary files a/graphics/pokenav/condition_menu_misc.png and b/graphics/pokenav/condition_menu_misc.png differ diff --git a/graphics/pokenav/condition_menu_options.png b/graphics/pokenav/condition_menu_options.png index 454799972..588c3b92f 100644 Binary files a/graphics/pokenav/condition_menu_options.png and b/graphics/pokenav/condition_menu_options.png differ diff --git a/graphics/pokenav/condition_menu_options2.png b/graphics/pokenav/condition_menu_options2.png index d7bb157be..f17160c56 100644 Binary files a/graphics/pokenav/condition_menu_options2.png and b/graphics/pokenav/condition_menu_options2.png differ diff --git a/graphics/pokenav/condition_screen.bin b/graphics/pokenav/condition_screen.bin index 672d4a7a3..7dc6d6c32 100644 --- a/graphics/pokenav/condition_screen.bin +++ b/graphics/pokenav/condition_screen.bin @@ -1 +1 @@ -€"€"€"€"€"€"€"€"€"€"€"€"�"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"ƒ"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‡"ˆ"‰"Š"‡&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‹"Œ"�"Ž"‹&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"ý"þ"…"…"�"�"‘"’"“"…"…"ý"þ"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"”"•"–"—"˜"™"š"›"œ"�"ž"Ÿ" "¡"¢"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"£"¤"¥"¦"§"¨"¨"©"¨"¨"ª"«"¬"­"®"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"¯"°"±"²"³"´"©"µ"¶"·"¸"¹"º"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"»"¼"¨"¨"½"¾"¿"¨"À"Á"Â"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ã"Ä"¨"Å"Æ"Ç"¨"È"É"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ê"Ë"Ì"Í"¨"Î"Ï"Ð"Ñ"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ò"Ó"Ô"Õ"Ö"×"Ø"Ù"Ú"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"Û"Ü"Ý"Þ"ß"à"á"â"ã"ä"å"æ"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"ç"è"é"ê"…"…"…"ë"ì"í"î"ï"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"ð"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ò"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€" \ No newline at end of file +€"€"€"€"€"€"€"€"€"€"€"€"�"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"‚"ƒ"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"…"…"…"…"…"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‡"ˆ"‰"Š"‡&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"‹"Œ"�"Ž"‹&…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"…"…"�"�"‘"’"“"…"…"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"”"•"–"—"˜"™"š"›"œ"�"ž"Ÿ" "¡"¢"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"£"¤"¥"¦"§"¨"¨"©"¨"¨"ª"«"¬"­"®"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"¯"°"±"²"³"´"©"µ"¶"·"¸"¹"º"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"»"¼"¨"¨"½"¾"¿"¨"À"Á"Â"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ã"Ä"¨"Å"Æ"Ç"¨"È"É"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ê"Ë"Ì"Í"¨"Î"Ï"Ð"Ñ"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"…"Ò"Ó"Ô"Õ"Ö"×"Ø"Ù"Ú"…"…"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"Û"Ü"Ý"Þ"ß"à"á"â"ã"ä"å"æ"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"„"…"ç"è"é"ê"…"…"…"ë"ì"í"î"ï"†"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"ð"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ñ"ò"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€"€" \ No newline at end of file diff --git a/graphics/pokenav/condition_search_beauty.png b/graphics/pokenav/condition_search_beauty.png index 9b6fd6519..8201ee306 100644 Binary files a/graphics/pokenav/condition_search_beauty.png and b/graphics/pokenav/condition_search_beauty.png differ diff --git a/graphics/pokenav/condition_search_cancel.png b/graphics/pokenav/condition_search_cancel.png index a2f49a507..9a612fff0 100644 Binary files a/graphics/pokenav/condition_search_cancel.png and b/graphics/pokenav/condition_search_cancel.png differ diff --git a/graphics/pokenav/condition_search_cool.png b/graphics/pokenav/condition_search_cool.png index 7c8ea960e..edf1a8770 100644 Binary files a/graphics/pokenav/condition_search_cool.png and b/graphics/pokenav/condition_search_cool.png differ diff --git a/graphics/pokenav/condition_search_cute.png b/graphics/pokenav/condition_search_cute.png index 141900e97..0551a1c1a 100644 Binary files a/graphics/pokenav/condition_search_cute.png and b/graphics/pokenav/condition_search_cute.png differ diff --git a/graphics/pokenav/condition_search_smart.png b/graphics/pokenav/condition_search_smart.png index 261be042f..bae400440 100644 Binary files a/graphics/pokenav/condition_search_smart.png and b/graphics/pokenav/condition_search_smart.png differ diff --git a/graphics/pokenav/condition_search_tough.png b/graphics/pokenav/condition_search_tough.png index 4eafca926..85c0d107c 100644 Binary files a/graphics/pokenav/condition_search_tough.png and b/graphics/pokenav/condition_search_tough.png differ diff --git a/graphics/pokenav/condition_view.png b/graphics/pokenav/condition_view.png index a5463c123..d41c5794b 100644 Binary files a/graphics/pokenav/condition_view.png and b/graphics/pokenav/condition_view.png differ diff --git a/graphics/pokenav/mainmenu.png b/graphics/pokenav/mainmenu.png index b7a5cb0c5..7908457cd 100644 Binary files a/graphics/pokenav/mainmenu.png and b/graphics/pokenav/mainmenu.png differ diff --git a/graphics/pokenav/map_header.png b/graphics/pokenav/map_header.png index c02157920..0b7d73130 100644 Binary files a/graphics/pokenav/map_header.png and b/graphics/pokenav/map_header.png differ diff --git a/graphics/pokenav/map_misc2.png b/graphics/pokenav/map_misc2.png index 3ee0872ba..1118afaf8 100644 Binary files a/graphics/pokenav/map_misc2.png and b/graphics/pokenav/map_misc2.png differ diff --git a/graphics/pokenav/map_squares.png b/graphics/pokenav/map_squares.png index 4cf6aa78c..fb73235ff 100644 Binary files a/graphics/pokenav/map_squares.png and b/graphics/pokenav/map_squares.png differ diff --git a/graphics/pokenav/menu_condition.png b/graphics/pokenav/menu_condition.png index 84d366795..e4d8f064f 100644 Binary files a/graphics/pokenav/menu_condition.png and b/graphics/pokenav/menu_condition.png differ diff --git a/graphics/pokenav/menu_eyes.png b/graphics/pokenav/menu_eyes.png index 6e1320dc7..bbc0869c1 100644 Binary files a/graphics/pokenav/menu_eyes.png and b/graphics/pokenav/menu_eyes.png differ diff --git a/graphics/pokenav/menu_hoennmap.png b/graphics/pokenav/menu_hoennmap.png index a0f3f22bc..06f7f5e7f 100644 Binary files a/graphics/pokenav/menu_hoennmap.png and b/graphics/pokenav/menu_hoennmap.png differ diff --git a/graphics/pokenav/menu_off.png b/graphics/pokenav/menu_off.png index 39bf30aca..8a753d0f1 100644 Binary files a/graphics/pokenav/menu_off.png and b/graphics/pokenav/menu_off.png differ diff --git a/graphics/pokenav/menu_ribbons.png b/graphics/pokenav/menu_ribbons.png index ec546bd0b..5426e24bb 100644 Binary files a/graphics/pokenav/menu_ribbons.png and b/graphics/pokenav/menu_ribbons.png differ diff --git a/graphics/pokenav/ribbons.png b/graphics/pokenav/ribbons.png index 7fb46e705..75ec59d25 100644 Binary files a/graphics/pokenav/ribbons.png and b/graphics/pokenav/ribbons.png differ diff --git a/graphics/pokenav/trainereyes.png b/graphics/pokenav/trainereyes.png index e470a7732..250b4c27e 100644 Binary files a/graphics/pokenav/trainereyes.png and b/graphics/pokenav/trainereyes.png differ diff --git a/graphics/roulette/credit.png b/graphics/roulette/credit.png index 4dceda07d..687d47934 100644 Binary files a/graphics/roulette/credit.png and b/graphics/roulette/credit.png differ diff --git a/graphics/slot_machine/slots.png b/graphics/slot_machine/slots.png index ac22fa099..291f467c3 100644 Binary files a/graphics/slot_machine/slots.png and b/graphics/slot_machine/slots.png differ diff --git a/graphics/slot_machine/slots_layout.bin b/graphics/slot_machine/slots_layout.bin index 085b43424..e7bc27a70 100644 Binary files a/graphics/slot_machine/slots_layout.bin and b/graphics/slot_machine/slots_layout.bin differ diff --git a/graphics/summary_screen/text.png b/graphics/summary_screen/text.png index e69558972..cd6b1e391 100644 Binary files a/graphics/summary_screen/text.png and b/graphics/summary_screen/text.png differ diff --git a/graphics/title_screen/logo_ruby.pal b/graphics/title_screen/logo_ruby.pal index 6bcffff32..ea9820a4a 100644 --- a/graphics/title_screen/logo_ruby.pal +++ b/graphics/title_screen/logo_ruby.pal @@ -3,26 +3,28 @@ JASC-PAL 224 0 0 0 0 0 0 -255 255 255 -246 222 24 255 238 16 +246 222 41 +246 238 246 255 246 24 +246 246 41 +246 246 246 246 255 255 +255 246 255 0 0 255 8 0 255 24 0 238 +246 222 24 246 222 32 -246 222 41 255 238 41 -246 238 238 +255 238 49 255 255 16 255 255 24 -255 246 32 -255 255 32 -246 246 238 -246 246 246 -246 246 255 -8 0 8 +255 255 246 +255 255 255 +0 0 0 +24 41 32 +32 32 74 32 0 230 32 0 238 32 0 246 @@ -31,17 +33,16 @@ JASC-PAL 255 230 24 246 230 41 246 238 41 -255 238 49 -246 246 41 -8 8 8 -24 16 16 -24 24 16 -32 16 16 -32 24 16 -24 16 24 -32 16 24 -24 24 24 -41 16 16 +246 230 49 +246 238 49 +255 246 32 +255 246 41 +255 255 32 +255 255 41 +32 24 32 +32 32 41 +197 156 41 +197 164 41 16 0 246 16 0 255 24 0 246 @@ -51,78 +52,105 @@ JASC-PAL 57 0 238 41 0 246 41 0 255 +8 8 197 246 230 24 246 230 32 255 238 24 255 238 32 -246 230 49 -246 238 49 -255 246 41 -255 255 41 -16 16 16 -32 24 24 -32 32 24 -32 41 57 -32 41 65 -41 24 16 -41 24 24 -49 16 16 -41 32 24 -57 32 24 +32 32 32 +32 41 32 +41 32 32 +41 41 32 +49 32 32 +49 41 32 +41 32 41 +49 32 41 +24 41 41 +32 32 90 +16 24 106 +24 32 98 41 32 82 41 32 98 -74 65 74 -57 32 106 -82 82 82 -82 82 90 -98 90 90 -98 98 98 -115 90 123 +41 41 82 +41 41 98 +0 0 115 +8 8 131 +32 24 115 +32 24 131 +32 41 115 +41 41 115 +32 41 131 +41 41 131 +57 41 41 +57 41 49 +57 49 41 +57 57 57 +65 41 41 +74 41 41 +65 57 57 +74 57 57 +57 74 74 +65 65 74 +82 74 82 +82 57 131 +82 90 82 +90 90 90 +90 98 98 +98 98 106 +115 106 106 131 98 115 +139 98 106 +139 115 98 180 139 57 172 131 65 -156 123 90 -164 123 82 -189 156 41 -197 164 41 -180 148 65 -189 164 65 -115 115 115 -115 115 123 -139 115 98 -131 123 123 -156 123 106 -156 139 115 -164 156 115 -180 164 98 -205 164 32 +156 115 90 +156 131 82 +115 82 139 +123 82 131 +115 98 131 +131 98 123 +115 123 123 +123 123 131 +139 131 139 +148 123 131 205 172 24 -222 180 16 -213 172 24 -213 189 32 +213 172 16 +205 164 32 +213 172 32 222 189 24 +230 189 16 +213 189 32 +222 189 32 230 205 24 -238 213 24 -205 164 41 -213 189 41 +230 205 32 +230 213 32 +238 222 32 +180 148 57 +189 156 49 +180 148 74 +180 172 90 +156 148 123 +139 148 139 +164 148 115 +172 156 106 +197 156 49 205 180 49 +197 172 90 205 189 82 -222 205 41 -230 213 41 -213 205 65 -230 222 57 +222 205 49 +230 222 49 +205 205 74 +222 213 65 49 0 230 49 0 238 49 0 246 49 0 255 57 0 246 57 0 255 -8 16 139 -16 16 139 -41 24 148 -32 16 164 -8 8 197 +16 8 197 16 16 189 +32 16 164 +41 16 164 32 16 180 41 16 189 8 8 205 @@ -149,79 +177,51 @@ JASC-PAL 41 16 230 49 16 230 49 8 238 -41 32 139 -41 41 139 -24 32 164 -41 32 156 -74 49 164 -90 57 164 -98 82 139 -98 74 164 -24 32 180 +32 32 156 +24 32 172 +41 41 156 +41 32 164 +74 49 180 +82 49 172 +82 65 164 +90 74 164 +24 32 189 57 41 189 41 32 213 57 32 213 -82 49 180 -98 74 180 -74 32 197 -82 49 197 -115 82 139 +74 41 189 +90 57 189 +74 49 197 +74 41 205 +106 65 156 +123 106 156 115 82 164 -123 106 148 -139 123 139 -139 139 139 -148 139 139 +106 82 172 148 148 156 -164 164 164 -180 180 180 -180 189 189 +156 156 156 +164 164 156 +172 172 172 +180 189 180 189 189 189 +197 189 189 197 197 197 +205 205 213 213 213 213 -222 213 222 +222 230 230 230 230 230 -238 238 238 -16 8 8 -16 8 16 -24 24 32 -24 32 32 -32 24 32 -32 32 32 -32 32 41 32 41 41 -32 32 74 -32 32 82 -0 0 123 -8 8 123 -24 32 98 -24 24 115 -49 24 16 -49 24 24 -57 16 16 -57 24 16 -65 16 16 -65 24 24 -41 32 32 +32 49 41 41 41 41 -49 32 32 -57 32 32 -49 41 49 -49 49 49 +49 41 41 +41 49 41 +49 49 41 +32 41 57 +41 41 49 +32 41 65 41 41 65 -49 49 57 -57 49 49 -57 57 57 -65 57 57 -74 65 65 -41 41 74 -49 49 82 -41 41 90 -49 41 98 -41 32 106 -49 32 115 -41 24 123 -49 32 123 -41 41 106 -41 49 106 -41 41 123 -41 49 123 +32 49 49 +41 49 49 +32 57 57 +41 49 57 +32 41 82 +32 41 90 diff --git a/graphics/title_screen/logo_sapphire.pal b/graphics/title_screen/logo_sapphire.pal index 7b74308af..e733c6d2c 100644 --- a/graphics/title_screen/logo_sapphire.pal +++ b/graphics/title_screen/logo_sapphire.pal @@ -3,225 +3,225 @@ JASC-PAL 224 0 0 0 0 0 0 -246 222 24 255 238 16 +246 222 41 +246 238 246 255 246 24 -246 246 41 -246 246 246 -246 255 255 -255 246 246 -8 8 8 -16 8 8 0 0 255 +8 0 255 +24 0 238 +246 222 24 246 222 32 -246 222 41 255 238 41 -246 238 238 +255 238 49 255 255 16 255 255 24 +255 246 32 +255 255 32 +246 246 238 +246 246 246 +246 246 255 +246 255 246 +246 255 255 +255 246 246 +255 246 255 255 255 246 255 255 255 +0 0 0 +32 32 41 +32 0 230 +32 0 238 +32 0 246 +32 0 255 246 238 32 255 230 24 246 230 41 246 238 41 -255 238 49 -255 246 32 -255 246 41 -255 255 32 -255 255 41 -16 8 16 -24 16 16 -24 16 24 -24 24 16 -24 24 24 -32 24 24 -32 32 24 -24 24 32 -41 32 32 +246 230 49 +246 238 49 +246 246 41 +32 41 32 41 41 32 -90 82 82 -222 180 16 -0 0 131 -8 8 131 -16 8 230 -16 8 238 -8 0 255 +49 32 32 +49 32 41 +197 156 41 +197 164 41 +16 0 246 +16 0 255 24 0 246 24 0 255 -24 8 246 -24 8 255 -8 16 246 -172 172 172 -189 180 189 -197 197 197 -213 213 213 -230 230 230 +41 0 230 +41 0 238 +57 0 238 +41 0 246 +41 0 255 246 230 24 246 230 32 255 238 24 255 238 32 -246 230 49 -246 238 49 -16 16 16 -16 16 24 -32 24 32 +255 246 41 +255 255 41 +32 32 24 32 32 32 -24 24 41 -24 32 41 -32 24 41 -32 32 41 -24 32 57 -24 41 65 -32 32 57 -32 41 57 -24 41 74 -32 32 74 -0 0 115 -24 32 106 +41 32 24 +41 32 32 +49 41 24 +49 41 32 +24 41 41 +32 41 41 41 32 41 +41 32 49 41 41 41 -49 41 49 -41 41 65 -41 32 82 -41 32 98 -41 41 82 -41 41 90 -41 32 106 -41 24 115 -41 41 115 -41 49 115 -57 49 49 -57 49 57 +41 41 49 +41 49 41 +41 49 49 +8 16 115 +16 24 106 +32 32 90 +32 32 106 +0 0 123 +8 8 131 +24 24 123 +41 24 131 +32 41 65 +32 41 82 +41 49 74 +41 57 65 +32 41 98 +41 41 98 +32 41 123 +41 41 123 +57 41 41 +57 49 41 +57 41 49 +65 49 49 57 57 49 +57 65 57 65 57 57 -65 57 65 -74 65 65 -74 65 74 -74 74 82 -90 82 90 -90 90 90 -106 98 98 -106 106 106 -123 98 115 -139 106 106 +74 57 57 +65 65 74 +74 74 74 +82 74 82 +65 49 115 +90 90 82 +98 90 90 +98 98 98 +98 98 106 +115 98 98 +115 115 106 +131 98 106 +139 115 98 180 139 57 -189 148 49 172 131 65 -180 148 65 -205 164 32 +156 115 90 +156 131 82 +115 82 131 +115 90 131 +115 115 131 +115 123 123 +131 90 123 +139 115 131 +131 131 123 +139 131 131 205 172 24 -197 164 41 -197 172 49 -123 123 123 -139 123 106 -164 123 82 -156 131 98 -172 139 82 -172 156 106 -189 172 98 -197 189 82 -213 172 24 -222 180 24 -213 189 32 +213 172 16 +205 164 32 +213 172 32 222 189 24 +230 189 16 +213 189 32 +222 189 32 230 205 24 -238 213 24 -213 180 41 -222 197 41 -213 189 49 -213 197 74 -230 213 41 -230 222 41 +230 205 32 +230 213 32 +238 222 32 +180 148 57 +172 148 65 +189 156 57 +189 164 57 +164 148 106 +156 148 123 +180 156 98 +189 172 90 +205 172 49 +213 197 49 +205 180 82 +205 197 74 +222 213 57 213 213 65 +230 213 57 230 222 57 +49 0 230 +49 0 238 +49 0 246 +49 0 255 +57 0 246 +57 0 255 +16 24 148 +24 16 180 8 8 197 -16 8 197 -32 8 205 -41 8 197 -16 8 213 -16 8 222 +16 16 189 +41 24 148 +32 16 164 +32 16 180 +41 16 189 +8 8 205 +8 16 205 24 8 213 -32 8 213 +24 16 205 41 8 213 -41 8 222 +41 16 213 49 8 213 -57 8 213 -24 0 238 +57 16 213 +16 8 230 24 8 230 -32 0 230 -32 8 230 -41 0 230 -41 0 238 -41 8 230 -41 8 238 -49 0 230 -49 8 230 -57 0 238 -57 8 238 +24 16 230 +24 24 230 8 8 246 -8 8 255 -16 0 246 -16 0 255 +8 16 246 16 8 246 -16 8 255 -32 0 246 -32 0 255 +16 16 246 +32 8 230 +32 16 230 +32 8 238 32 8 246 -32 8 255 -41 0 246 -41 8 246 -49 0 246 -57 0 246 -8 16 131 -24 24 131 -16 24 148 -32 24 156 -41 24 131 -41 24 156 -41 41 131 +41 8 230 +41 16 230 +49 16 230 +49 8 238 +24 32 164 +24 49 172 41 41 148 -16 16 180 -24 16 197 -24 24 180 +41 32 156 +82 57 172 +90 57 164 +90 74 156 +106 82 156 24 32 180 -41 16 172 -41 16 189 -41 24 180 -49 32 189 -8 16 222 -16 16 213 -8 24 222 -16 24 222 -24 16 238 -16 16 246 -41 16 213 -41 24 213 -57 24 213 +57 41 189 +41 32 213 57 32 213 -32 16 230 -32 24 222 -57 24 222 -49 16 230 -90 65 164 -98 57 156 -98 74 156 -98 82 148 -115 82 131 -115 90 156 -123 106 148 -139 115 139 82 49 180 -82 57 172 -98 65 172 -106 82 172 -74 32 189 -74 32 205 -82 49 189 +98 74 180 +74 32 197 82 49 197 -123 131 131 -131 131 131 -139 131 131 -139 139 139 -156 131 131 -156 148 156 +123 90 156 +131 115 148 +139 148 148 +148 148 148 +156 156 148 +148 156 156 +164 156 156 +172 172 172 +180 189 180 +180 189 189 +197 189 197 +205 205 197 +205 213 213 +213 213 213 +230 222 213 +230 230 230 +32 41 49 +32 41 57 +32 49 49 +32 49 57 diff --git a/graphics/title_screen/pokemon_ruby.png b/graphics/title_screen/pokemon_ruby.png index 691c02ce9..7d141ad67 100644 Binary files a/graphics/title_screen/pokemon_ruby.png and b/graphics/title_screen/pokemon_ruby.png differ diff --git a/graphics/title_screen/pokemon_sapphire.png b/graphics/title_screen/pokemon_sapphire.png index 2e451f746..9363289df 100644 Binary files a/graphics/title_screen/pokemon_sapphire.png and b/graphics/title_screen/pokemon_sapphire.png differ diff --git a/graphics/title_screen/press_start.png b/graphics/title_screen/press_start.png index 1800e4cc7..b38a4b58d 100644 Binary files a/graphics/title_screen/press_start.png and b/graphics/title_screen/press_start.png differ diff --git a/graphics/title_screen/rubyversion.png b/graphics/title_screen/rubyversion.png index ba3f342aa..d12eb7bfa 100644 Binary files a/graphics/title_screen/rubyversion.png and b/graphics/title_screen/rubyversion.png differ diff --git a/graphics/title_screen/sapphireversion.png b/graphics/title_screen/sapphireversion.png index 3e3c31a09..53b494d5e 100644 Binary files a/graphics/title_screen/sapphireversion.png and b/graphics/title_screen/sapphireversion.png differ diff --git a/graphics/trade/menu.png b/graphics/trade/menu.png index 8b5ee8eef..54b00eb1c 100644 Binary files a/graphics/trade/menu.png and b/graphics/trade/menu.png differ diff --git a/graphics/types/bug.png b/graphics/types/bug.png index 3d9d27a7e..c11629b21 100644 Binary files a/graphics/types/bug.png and b/graphics/types/bug.png differ diff --git a/graphics/types/contest_beauty.png b/graphics/types/contest_beauty.png index 397b67748..b52fe3ca4 100644 Binary files a/graphics/types/contest_beauty.png and b/graphics/types/contest_beauty.png differ diff --git a/graphics/types/contest_cool.png b/graphics/types/contest_cool.png index 5f11cbb3d..813e91f80 100644 Binary files a/graphics/types/contest_cool.png and b/graphics/types/contest_cool.png differ diff --git a/graphics/types/contest_cute.png b/graphics/types/contest_cute.png index fa2cf308c..ece852a9d 100644 Binary files a/graphics/types/contest_cute.png and b/graphics/types/contest_cute.png differ diff --git a/graphics/types/contest_smart.png b/graphics/types/contest_smart.png index fff25c17f..8e0d903f1 100644 Binary files a/graphics/types/contest_smart.png and b/graphics/types/contest_smart.png differ diff --git a/graphics/types/contest_tough.png b/graphics/types/contest_tough.png index 487579f85..a76e9cba4 100644 Binary files a/graphics/types/contest_tough.png and b/graphics/types/contest_tough.png differ diff --git a/graphics/types/dark.png b/graphics/types/dark.png index 004f2da82..3380297da 100644 Binary files a/graphics/types/dark.png and b/graphics/types/dark.png differ diff --git a/graphics/types/dragon.png b/graphics/types/dragon.png index ffff9e15b..908073260 100644 Binary files a/graphics/types/dragon.png and b/graphics/types/dragon.png differ diff --git a/graphics/types/electric.png b/graphics/types/electric.png index 8e88a1dec..84db710b6 100644 Binary files a/graphics/types/electric.png and b/graphics/types/electric.png differ diff --git a/graphics/types/fight.png b/graphics/types/fight.png index 00ccf7efd..6431c9bba 100644 Binary files a/graphics/types/fight.png and b/graphics/types/fight.png differ diff --git a/graphics/types/fire.png b/graphics/types/fire.png index 911c5152f..f6db950c8 100644 Binary files a/graphics/types/fire.png and b/graphics/types/fire.png differ diff --git a/graphics/types/flying.png b/graphics/types/flying.png index 5484c0a02..144d0010b 100644 Binary files a/graphics/types/flying.png and b/graphics/types/flying.png differ diff --git a/graphics/types/ghost.png b/graphics/types/ghost.png index 682f47502..5820fe93a 100644 Binary files a/graphics/types/ghost.png and b/graphics/types/ghost.png differ diff --git a/graphics/types/grass.png b/graphics/types/grass.png index ab758504b..6d3e870ca 100644 Binary files a/graphics/types/grass.png and b/graphics/types/grass.png differ diff --git a/graphics/types/ground.png b/graphics/types/ground.png index 301190d2f..2872b1367 100644 Binary files a/graphics/types/ground.png and b/graphics/types/ground.png differ diff --git a/graphics/types/ice.png b/graphics/types/ice.png index 3f0d5640a..a611d1f4a 100644 Binary files a/graphics/types/ice.png and b/graphics/types/ice.png differ diff --git a/graphics/types/poison.png b/graphics/types/poison.png index f0ebb5e10..2fab1ad53 100644 Binary files a/graphics/types/poison.png and b/graphics/types/poison.png differ diff --git a/graphics/types/psychic.png b/graphics/types/psychic.png index c8e4202c5..98f70406e 100644 Binary files a/graphics/types/psychic.png and b/graphics/types/psychic.png differ diff --git a/graphics/types/rock.png b/graphics/types/rock.png index 3d410ea7c..e95b2a8ef 100644 Binary files a/graphics/types/rock.png and b/graphics/types/rock.png differ diff --git a/graphics/types/steel.png b/graphics/types/steel.png index 47c778adb..b952031fd 100644 Binary files a/graphics/types/steel.png and b/graphics/types/steel.png differ diff --git a/graphics/types/water.png b/graphics/types/water.png index c2829c792..19ae3ebe3 100644 Binary files a/graphics/types/water.png and b/graphics/types/water.png differ diff --git a/graphics/unknown/unknown_E953D0.bin b/graphics/unknown/unknown_E953D0.bin index f19133fc8..1c4ec2567 100644 Binary files a/graphics/unknown/unknown_E953D0.bin and b/graphics/unknown/unknown_E953D0.bin differ diff --git a/graphics/unknown/unknown_E9ABB4.bin b/graphics/unknown/unknown_E9ABB4.bin index 887dfd287..f09bb8ab3 100644 --- a/graphics/unknown/unknown_E9ABB4.bin +++ b/graphics/unknown/unknown_E9ABB4.bin @@ -1 +1 @@ -�2�2 2¡2¢2£2¤2¥2¦2§2¨2©2�2�2�2�2�2ª2«2¬2­2®2¯2°2±2²2³2´2�2�2�2�2µ2¶2·2¸2¹2º2»2¼2½2�2�2�2�2�2�2¾2¿2À2Á2Â2Ã2Ä2Å2Æ2Ç2�2�2�2 \ No newline at end of file +�2�2 2¡2¢2£2¤2¥2¦2§2¨2©2�2�2�2�2�2ª2«2¬2­2®2¯2�2�2�2�2�2�2�2�2�2°2±2²2³2´2µ2¶2·2�2�2�2�2�2�2�2¸2¹2º2»2¼2½2¾2¿2À2Á2�2�2�2 \ No newline at end of file diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin index 716a93f2d..aa15ea36e 100644 Binary files a/graphics/unused/old_charmap.bin and b/graphics/unused/old_charmap.bin differ diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png index 72ceffbf9..b5ea6e803 100644 Binary files a/graphics/unused/old_charmap.png and b/graphics/unused/old_charmap.png differ diff --git a/override.mk b/override.mk index 64a139efb..e69de29bb 100644 --- a/override.mk +++ b/override.mk @@ -1,25 +0,0 @@ -# -# misc.mk -# -MENUGFXDIR := graphics/interface -INTROGFXDIR := graphics/intro -MISCGFXDIR := graphics/misc - -$(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png - $(GBAGFX) $< $@ -num_tiles 76 -$(MENUGFXDIR)/check_berry.4bpp: $(MENUGFXDIR)/check_berry.png - $(GBAGFX) $< $@ -num_tiles 97 - -$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png - $(GBAGFX) $< $@ -num_tiles 47 - -$(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png - $(GBAGFX) $< $@ -num_tiles 92 - -# -# tilesets.mk -# -TILESETDIR := data/tilesets - -$(TILESETDIR)/secondary/shop/tiles.4bpp: $(TILESETDIR)/secondary/shop/tiles.png - $(GBAGFX) $< $@ -num_tiles 503 -- cgit v1.2.3 From 3ab6bf09d8d6bb86e83033e8a7138d02e3917c55 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 17 Jan 2018 00:29:25 -0500 Subject: split out crash.c --- include/matsuda_debug_menu.h | 1 - include/pokedex.h | 2 +- ld_script.txt | 1 + src/battle/battle_party_menu.c | 6 +-- src/debug/crash.c | 55 ++++++++++++++++++++++++++++ src/debug/matsuda_debug_menu.c | 62 +------------------------------ src/field/diploma.c | 2 +- src/field/item_use.c | 22 +++++------ src/field/money.c | 2 + src/pokemon/pokedex.c | 83 +++++++++++++++++++++++++++++++++++++++--- src/pokemon/pokemon_menu.c | 6 +-- sym_common.txt | 2 +- 12 files changed, 157 insertions(+), 87 deletions(-) create mode 100644 src/debug/crash.c diff --git a/include/matsuda_debug_menu.h b/include/matsuda_debug_menu.h index 60f2dc48c..ad877a014 100644 --- a/include/matsuda_debug_menu.h +++ b/include/matsuda_debug_menu.h @@ -3,7 +3,6 @@ #define BIT(n) (1 << (n)) -void sub_80AB184(void); void sub_80AA280(u8); void sub_80AA5E8(u8); void sub_80AA658(u8); diff --git a/include/pokedex.h b/include/pokedex.h index d8416889a..73877bead 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -23,6 +23,6 @@ s8 GetSetPokedexFlag(u16, u8); u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); bool8 CompletedHoennPokedex(void); -u16 sub_8090FF4(void); +bool16 CompletedNationalPokedex(void); #endif // GUARD_POKEDEX_H diff --git a/ld_script.txt b/ld_script.txt index 3be3a6e56..82ba46b9c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -141,6 +141,7 @@ SECTIONS { src/battle/battle_anim_80A7E7C.o(.text); src/field/item.o(.text); src/debug/matsuda_debug_menu.o(.text); + src/debug/crash.o(.text); src/contest.o(.text); src/field/shop.o(.text); src/field/fldeff_escalator.o(.text); diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index 68a97c536..ed8cf4583 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -40,7 +40,7 @@ extern u8 gUnknown_0202E8F6; extern u8 gUnknown_02038470[3]; extern u8 gUnknown_02038473; extern u8 gUnknown_020384F0; -extern void (*gUnknown_03004AE4)(); //don't know types yet +extern void (*gPokemonItemUseCallback)(); //don't know types yet extern struct PokemonStorage gPokemonStorage; extern void nullsub_14(); @@ -466,7 +466,7 @@ void HandleBattlePartyMenu(u8 taskId) { if (gUnknown_02038473 == 3 && GetItemEffectType(gSpecialVar_ItemId) == 10) { - gUnknown_03004AE4(taskId, gSpecialVar_ItemId, Task_80952E4); + gPokemonItemUseCallback(taskId, gSpecialVar_ItemId, Task_80952E4); return; } @@ -480,7 +480,7 @@ void HandleBattlePartyMenu(u8 taskId) else { sub_806D5A4(); - gUnknown_03004AE4(taskId, gSpecialVar_ItemId, Task_80952E4); + gPokemonItemUseCallback(taskId, gSpecialVar_ItemId, Task_80952E4); } } else diff --git a/src/debug/crash.c b/src/debug/crash.c new file mode 100644 index 000000000..702dbc32a --- /dev/null +++ b/src/debug/crash.c @@ -0,0 +1,55 @@ +#include "global.h" +#include "main.h" +#include "task.h" +#include "text.h" +#include "palette.h" + +extern struct Window gUnknown_03004210; + +static void CB2_CrashIdle(void); + +// unused exception handler. Takes a string input describing the exception +// and halts on a black screen. Used in German Debug Ruby. +void Crash(u8 *text) +{ + u16 savedIme; + + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2HOFS = 0; + REG_BG2VOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; + REG_WIN0H = 0; + REG_WIN0V = 0; + REG_WIN1H = 0; + REG_WIN1V = 0; + REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; + savedIme = REG_IME; + REG_IME = 0; + REG_IE |= INTR_FLAG_VBLANK; + REG_IME = savedIme; + REG_DISPSTAT = 8; + ResetTasks(); + ResetSpriteData(); + SetMainCallback2(CB2_CrashIdle); + DmaFill32Large(3, 0, (void *)VRAM, 0x18000, 0x1000); + Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8); + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8); + LoadFontDefaultPalette(&gWindowTemplate_81E6FD8); + Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7); +} + +static void CB2_CrashIdle(void) +{ + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2HOFS = 0; + REG_BG2VOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; +} diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 1da337b04..b879584dd 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -37,7 +37,7 @@ extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_Y; -extern struct Window gUnknown_03004210; + extern u8 (*gCallback_03004AE8)(void); extern bool8 gReceivedRemoteLinkPlayers; @@ -1032,63 +1032,3 @@ u8 MatsudaDebugMenu_SetArtMuseumItems(void) CloseMenu(); return 1; } - -void unref_sub_80AB084(u8 *text) -{ - u16 savedIme; - u8 *addr; - size_t size; - - REG_BG0HOFS = 0; - REG_BG0VOFS = 0; - REG_BG1HOFS = 0; - REG_BG1VOFS = 0; - REG_BG2HOFS = 0; - REG_BG2VOFS = 0; - REG_BG3HOFS = 0; - REG_BG3VOFS = 0; - REG_WIN0H = 0; - REG_WIN0V = 0; - REG_WIN1H = 0; - REG_WIN1V = 0; - REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON; - - savedIme = REG_IME; - REG_IME = 0; - REG_IE |= INTR_FLAG_VBLANK; - REG_IME = savedIme; - REG_DISPSTAT = 8; - ResetTasks(); - ResetSpriteData(); - SetMainCallback2(sub_80AB184); - - addr = (void *)VRAM; - size = 0x18000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } - Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8); - Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8); - LoadFontDefaultPalette(&gWindowTemplate_81E6FD8); - Text_InitWindowAndPrintText(&gUnknown_03004210, text, 1, 9, 7); -} - -void sub_80AB184(void) -{ - REG_BG0HOFS = 0; - REG_BG0VOFS = 0; - REG_BG1HOFS = 0; - REG_BG1VOFS = 0; - REG_BG2HOFS = 0; - REG_BG2VOFS = 0; - REG_BG3HOFS = 0; - REG_BG3VOFS = 0; -} diff --git a/src/field/diploma.c b/src/field/diploma.c index 978eca7eb..b31fc7dec 100644 --- a/src/field/diploma.c +++ b/src/field/diploma.c @@ -125,7 +125,7 @@ static void Task_DiplomaFadeOut(u8 taskId) static void DisplayDiplomaText(void) { - if (sub_8090FF4()) + if (CompletedNationalPokedex()) { REG_BG3HOFS = 256; StringCopy(gStringVar1, gOtherText_NationalDex); diff --git a/src/field/item_use.c b/src/field/item_use.c index 9346cf42e..cdad3f840 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -40,7 +40,7 @@ extern void (*gFieldItemUseCallback)(u8); extern void (*gFieldCallback)(void); extern void (*gUnknown_0300485C)(void); -extern void (*gUnknown_03004AE4)(u8, u16, TaskFunc); +extern void (*gPokemonItemUseCallback)(u8, u16, TaskFunc); extern u8 gUnknown_02038561; extern u8 gLastFieldPokeMenuOpened; @@ -832,7 +832,7 @@ void sub_80C9D98(u8 taskId) void ItemUseOutOfBattle_Medicine(u8 taskId) { - gUnknown_03004AE4 = UseMedicine; + gPokemonItemUseCallback = UseMedicine; sub_80C9D98(taskId); } @@ -850,26 +850,26 @@ void ItemUseOutOfBattle_SacredAsh(u8 taskId) break; } } - gUnknown_03004AE4 = sub_8070048; + gPokemonItemUseCallback = sub_8070048; gUnknown_02038561 = 4; ItemMenu_ConfirmNormalFade(taskId); } void ItemUseOutOfBattle_PPRecovery(u8 taskId) { - gUnknown_03004AE4 = DoPPRecoveryItemEffect; + gPokemonItemUseCallback = DoPPRecoveryItemEffect; sub_80C9D98(taskId); } void ItemUseOutOfBattle_PPUp(u8 taskId) { - gUnknown_03004AE4 = DoPPUpItemEffect; + gPokemonItemUseCallback = DoPPUpItemEffect; sub_80C9D98(taskId); } void ItemUseOutOfBattle_RareCandy(u8 taskId) { - gUnknown_03004AE4 = DoRareCandyItemEffect; + gPokemonItemUseCallback = DoRareCandyItemEffect; sub_80C9D98(taskId); } @@ -908,7 +908,7 @@ void sub_80C9F80(u8 var) void sub_80C9FC0(u8 var) { - gUnknown_03004AE4 = TeachMonTMMove; + gPokemonItemUseCallback = TeachMonTMMove; sub_80C9D98(var); } @@ -1009,7 +1009,7 @@ void ItemUseOutOfBattle_EscapeRope(u8 taskId) void ItemUseOutOfBattle_EvolutionStone(u8 var) { - gUnknown_03004AE4 = DoEvolutionStoneItemEffect; + gPokemonItemUseCallback = DoEvolutionStoneItemEffect; sub_80C9D98(var); } @@ -1078,19 +1078,19 @@ void sub_80CA3C0(u8 taskId) void ItemUseInBattle_Medicine(u8 var) { - gUnknown_03004AE4 = UseMedicine; + gPokemonItemUseCallback = UseMedicine; sub_80CA3C0(var); } void unref_sub_80CA410(u8 var) { - gUnknown_03004AE4 = sub_8070048; + gPokemonItemUseCallback = sub_8070048; sub_80CA3C0(var); } void ItemUseInBattle_PPRecovery(u8 var) { - gUnknown_03004AE4 = DoPPRecoveryItemEffect; + gPokemonItemUseCallback = DoPPRecoveryItemEffect; sub_80CA3C0(var); } diff --git a/src/field/money.c b/src/field/money.c index 6cd73f600..3b7268dbc 100644 --- a/src/field/money.c +++ b/src/field/money.c @@ -100,6 +100,8 @@ void GetMoneyAmountText(u8 *buffer, u32 amount, u8 arg2) width = 7; else if (amount > 99999) width = 6; + // A special sprite is used for 10000 in the decoration + // shop, so be sure to account for this. else if (amount > 10000) width = 5; else if (amount > 999) diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 4fb6a4920..bdd136ff5 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -4121,28 +4121,101 @@ bool8 CompletedHoennPokedex(void) return TRUE; } -u16 sub_8090FF4(void) +bool16 CompletedNationalPokedex(void) { u16 i; + // BUG: This function indexes pokemon checks by 0, but adds + // 1 before passing to GetSetPokedexFlag. Normally, this is + // fine, because GetSetPokedexFlag subtracts by 1 to get the + // array index value, but since the array is 0 indexed + // starting with Bulbasaur, values passed actually means that + // dex entries 152 (Chikorita) and 252 (Treecko) are skipped. + // Because an earlier Hoenn Dex check prevented Treecko from + // being skippable, it means that Chikorita is not required + // to obtain the National Diploma. This was fixed in Emerald. for (i = 0; i < 150; i++) { if (GetSetPokedexFlag(i + 1, 1) == 0) - return 0; + return FALSE; } for (i = 152; i < 250; i++) { if (GetSetPokedexFlag(i + 1, 1) == 0) - return 0; + return FALSE; } for (i = 252; i < 384; i++) { if (GetSetPokedexFlag(i + 1, 1) == 0) - return 0; + return FALSE; } - return 1; + return TRUE; } +/* +CompletedNationalPokedex: + push {r4, r5, lr} + mov r0, #0x0 +.L1236: + add r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + add r0, r4, #0 + mov r1, #0x1 + bl GetSetPokedexFlag + lsl r0, r0, #0x18 + cmp r0, #0 + beq .L1252 @cond_branch + add r0, r4, #0 + cmp r0, #0x95 + bls .L1236 @cond_branch + mov r0, #0x98 +.L1242: + add r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + add r0, r4, #0 + mov r1, #0x1 + bl GetSetPokedexFlag + lsl r0, r0, #0x18 + cmp r0, #0 + beq .L1252 @cond_branch + add r0, r4, #0 + cmp r0, #0xf9 + bls .L1242 @cond_branch + mov r0, #0xfc + ldr r5, .L1253 +.L1248: + add r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + add r0, r4, #0 + mov r1, #0x1 + bl GetSetPokedexFlag + lsl r0, r0, #0x18 + cmp r0, #0 + bne .L1247 @cond_branch +.L1252: + mov r0, #0x0 + b .L1251 +.L1254: + .align 2, 0 +.L1253: + .word 0x17f +.L1247: + add r0, r4, #0 + cmp r0, r5 + bls .L1248 @cond_branch + mov r0, #0x1 +.L1251: + pop {r4, r5} + pop {r1} + bx r1 +.Lfe84: + .size CompletedNationalPokedex,.Lfe84-CompletedNationalPokedex + .align 2, 0 +*/ + static void sub_8091060(u16 a) { if (!(a & 0x100)) diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index 70234ac48..a41e197f2 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -51,7 +51,7 @@ extern u8 gUnknown_0202E8F5; extern u8 gUnknown_0202E8F6; extern u8 gUnknown_02038561; extern u16 gUnknown_0202E8F8; -extern void (*gUnknown_03004AE4)(u8 taskID, u16 itemID, TaskFunc func); +extern void (*gPokemonItemUseCallback)(u8 taskID, u16 itemID, TaskFunc func); extern TaskFunc gUnknown_03005CF0; void sub_808A520(void); @@ -1013,7 +1013,7 @@ void sub_808B0C0(u8 taskID) { sub_806D5A4(); if (gUnknown_02038561 == 0) - gUnknown_03004AE4(taskID, gSpecialVar_ItemId, sub_808B224); + gPokemonItemUseCallback(taskID, gSpecialVar_ItemId, sub_808B224); if (gUnknown_02038561 == 1) { PlaySE(SE_SELECT); @@ -1042,7 +1042,7 @@ void sub_808B0C0(u8 taskID) static void sub_808B1EC(u8 taskID) { if (!gPaletteFade.active) - gUnknown_03004AE4(taskID, gSpecialVar_ItemId, sub_808B224); + gPokemonItemUseCallback(taskID, gSpecialVar_ItemId, sub_808B224); } static void sub_808B224(u8 taskID) diff --git a/sym_common.txt b/sym_common.txt index cfb1b6b13..a37aa05ff 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -127,7 +127,7 @@ gUnknown_03004828: @ 3004828 @ party_menu? .align 2 -gUnknown_03004AE4: @ 3004AE4 +gPokemonItemUseCallback: @ 3004AE4 .space 0x4 .include "field/start_menu.o" -- cgit v1.2.3 From 4c15629b612da2e10ef2aee25cd5ecd5ebaf6bf4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 17 Jan 2018 00:30:54 -0500 Subject: oops --- src/debug/crash.c | 2 +- src/pokemon/pokedex.c | 64 --------------------------------------------------- 2 files changed, 1 insertion(+), 65 deletions(-) diff --git a/src/debug/crash.c b/src/debug/crash.c index 702dbc32a..85058d285 100644 --- a/src/debug/crash.c +++ b/src/debug/crash.c @@ -35,7 +35,7 @@ void Crash(u8 *text) ResetTasks(); ResetSpriteData(); SetMainCallback2(CB2_CrashIdle); - DmaFill32Large(3, 0, (void *)VRAM, 0x18000, 0x1000); + DmaFill32Large(3, 0, (void *)VRAM, 0x18000, 0x1000); Text_LoadWindowTemplate(&gWindowTemplate_81E6FD8); Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6FD8); LoadFontDefaultPalette(&gWindowTemplate_81E6FD8); diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index bdd136ff5..faebe526a 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -4152,70 +4152,6 @@ bool16 CompletedNationalPokedex(void) return TRUE; } -/* -CompletedNationalPokedex: - push {r4, r5, lr} - mov r0, #0x0 -.L1236: - add r0, r0, #0x1 - lsl r0, r0, #0x10 - lsr r4, r0, #0x10 - add r0, r4, #0 - mov r1, #0x1 - bl GetSetPokedexFlag - lsl r0, r0, #0x18 - cmp r0, #0 - beq .L1252 @cond_branch - add r0, r4, #0 - cmp r0, #0x95 - bls .L1236 @cond_branch - mov r0, #0x98 -.L1242: - add r0, r0, #0x1 - lsl r0, r0, #0x10 - lsr r4, r0, #0x10 - add r0, r4, #0 - mov r1, #0x1 - bl GetSetPokedexFlag - lsl r0, r0, #0x18 - cmp r0, #0 - beq .L1252 @cond_branch - add r0, r4, #0 - cmp r0, #0xf9 - bls .L1242 @cond_branch - mov r0, #0xfc - ldr r5, .L1253 -.L1248: - add r0, r0, #0x1 - lsl r0, r0, #0x10 - lsr r4, r0, #0x10 - add r0, r4, #0 - mov r1, #0x1 - bl GetSetPokedexFlag - lsl r0, r0, #0x18 - cmp r0, #0 - bne .L1247 @cond_branch -.L1252: - mov r0, #0x0 - b .L1251 -.L1254: - .align 2, 0 -.L1253: - .word 0x17f -.L1247: - add r0, r4, #0 - cmp r0, r5 - bls .L1248 @cond_branch - mov r0, #0x1 -.L1251: - pop {r4, r5} - pop {r1} - bx r1 -.Lfe84: - .size CompletedNationalPokedex,.Lfe84-CompletedNationalPokedex - .align 2, 0 -*/ - static void sub_8091060(u16 a) { if (!(a & 0x100)) -- cgit v1.2.3 From c8e231256e15362047760d094f62db5ab52c660c Mon Sep 17 00:00:00 2001 From: Thomas Winwood Date: Wed, 17 Jan 2018 05:47:02 +0000 Subject: Document sub_8121D1C, sub_8121D74 and gUnknown_084016BC These are left over from the Japanese games, which provide more variation to the attack string than the English games. --- src/battle/battle_message.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index e9334ef61..ed7ab3a35 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -25,6 +25,8 @@ #include "../data/battle_strings_en.h" #endif +// This is four lists of moves which use a different attack string in Japanese +// to the default. See the documentation for sub_8121D74 for more detail. const u16 gUnknown_084016BC[] = { MOVE_SWORDS_DANCE, @@ -69,7 +71,7 @@ const u16 gUnknown_084016BC[] = MOVE_MUDDY_WATER, MOVE_IRON_DEFENSE, MOVE_BOUNCE, - MOVE_NONE, + 0, MOVE_TELEPORT, MOVE_RECOVER, MOVE_BIDE, @@ -77,7 +79,7 @@ const u16 gUnknown_084016BC[] = MOVE_FLAIL, MOVE_TAUNT, MOVE_BULK_UP, - MOVE_NONE, + 0, MOVE_MEDITATE, MOVE_AGILITY, MOVE_MIMIC, @@ -96,7 +98,7 @@ const u16 gUnknown_084016BC[] = MOVE_FAKE_TEARS, MOVE_WATER_SPORT, MOVE_CALM_MIND, - MOVE_NONE, + 0, MOVE_POUND, MOVE_SCRATCH, MOVE_VICE_GRIP, @@ -144,7 +146,7 @@ const u16 gUnknown_084016BC[] = MOVE_ENDEAVOR, MOVE_TICKLE, MOVE_COVET, - MOVE_NONE, + 0, }; const u8 gUnknown_084017A8[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; // empty flags @@ -971,6 +973,10 @@ void StrCpyDecodeBattleTextBuff(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_8121D74 +// below to effect changes in the meaning of the line. void sub_8121D1C(u8* textBuff) { s32 counter = 0; @@ -993,6 +999,24 @@ void sub_8121D1C(u8* textBuff) } } +// Appends "!" to the text buffer `dst`. In the original Japanese this looked +// into the table of moves at gUnknown_084016BC and varied the line accordingly. +// +// BattleText_Exclamation was a plain "!", used for any attack not on the list. +// It resulted in the translation "'s !". +// +// BattleText_Exclamation2 was "を つかった!". This resulted in the translation +// " used !", which was used for all attacks in English. +// +// BattleText_Exclamation3 was "した!". This was used for those moves whose +// names were verbs, such as Recover, and resulted in translations like " +// recovered itself!". +// +// BattleText_Exclamation4 was "を した!" This resulted in a translation of +// " did an !". +// +// BattleText_Exclamation5 was " こうげき!" This resulted in a translation of +// "'s attack!". void sub_8121D74(u8* dst) { s32 counter = 0; -- cgit v1.2.3 From bcf3fb87450883c9c26afec55f5f0ddc04864e84 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 12:07:40 -0600 Subject: add more debug data --- Makefile | 4 +- asmdiff_de_debug.sh | 7 + charmap.txt | 5 + data-de/event_scripts.s | 100 +- data/debug_menu_3.s | 19 + data/debug_menu_nohara.s | 229 ++ data/debug_menu_taya.s | 219 ++ data/debug_menu_tomomichi.s | 2664 ++++++++++++++++ data/debug_menu_watanabe.s | 673 ++++ data/debug_mystery_event_menu.s | 16 + data/start_menu_debug.s | 807 +++++ graphics/debug/sprite_browser.pal | 51 + graphics/debug/sprite_browser.png | Bin 0 -> 416 bytes ld_script.txt | 6 + src/debug/start_menu_debug.c | 6130 +++++++++++++++++++++++++++++++++++++ src/debug/unk_debug_menu_3.c | 797 +++++ src/engine/sprite.c | 4 +- 17 files changed, 11677 insertions(+), 54 deletions(-) create mode 100755 asmdiff_de_debug.sh create mode 100644 data/debug_menu_3.s create mode 100644 data/debug_menu_nohara.s create mode 100644 data/debug_menu_taya.s create mode 100644 data/debug_menu_tomomichi.s create mode 100644 data/debug_menu_watanabe.s create mode 100644 data/debug_mystery_event_menu.s create mode 100644 data/start_menu_debug.s create mode 100644 graphics/debug/sprite_browser.pal create mode 100644 graphics/debug/sprite_browser.png create mode 100644 src/debug/start_menu_debug.c create mode 100644 src/debug/unk_debug_menu_3.c diff --git a/Makefile b/Makefile index 21973a915..d91bb6840 100644 --- a/Makefile +++ b/Makefile @@ -100,12 +100,12 @@ clean: tidy $(RM) $(ALL_OBJECTS) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + -ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de +ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug tidy: $(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map}) $(RM) -r build -%.gba: %.elf +$(BUILD_NAME).gba: $(BUILD_NAME).elf $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ %.elf: $(LD_SCRIPT) $(ALL_OBJECTS) diff --git a/asmdiff_de_debug.sh b/asmdiff_de_debug.sh new file mode 100755 index 000000000..837b88cd2 --- /dev/null +++ b/asmdiff_de_debug.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" +OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" +$OBJDUMP $OPTIONS baserom_de_debug.gba > baserom_de_debug.dump +$OBJDUMP $OPTIONS pokeruby_de_debug.gba > pokeruby_de_debug.dump +diff baserom_de_debug.dump pokeruby_de_debug.dump diff --git a/charmap.txt b/charmap.txt index 1c68994df..e6ad2c05b 100644 --- a/charmap.txt +++ b/charmap.txt @@ -44,6 +44,7 @@ SUPER_ER = 2C '+' = 2E LV = 34 '=' = 35 +';' = 36 '¿' = 51 '¡' = 52 PK = 53 @@ -59,6 +60,10 @@ UP_ARROW = 79 DOWN_ARROW = 7A LEFT_ARROW = 7B RIGHT_ARROW = 7C +SUPER_E = 84 +'<' = 85 +'>' = 86 +SUPER_RE = A0 '0' = A1 '1' = A2 '2' = A3 diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 4598e9f45..6fbd760fa 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -3371,56 +3371,56 @@ DebugScript_081C1D46:: @ 81C1D46 giveitem ITEM_ULTRA_BALL, 84 giveitem ITEM_POKE_BALL, 89 giveitem ITEM_MASTER_BALL, 74 - giveitem ITEM_TM01, 99 - giveitem ITEM_TM02, 99 - giveitem ITEM_TM03, 99 - giveitem ITEM_TM04, 99 - giveitem ITEM_TM05, 99 - giveitem ITEM_TM06, 99 - giveitem ITEM_TM07, 99 - giveitem ITEM_TM08, 99 - giveitem ITEM_TM09, 99 - giveitem ITEM_TM10, 99 - giveitem ITEM_TM11, 99 - giveitem ITEM_TM12, 99 - giveitem ITEM_TM13, 99 - giveitem ITEM_TM14, 99 - giveitem ITEM_TM15, 99 - giveitem ITEM_TM16, 99 - giveitem ITEM_TM17, 99 - giveitem ITEM_TM18, 99 - giveitem ITEM_TM19, 99 - giveitem ITEM_TM20, 99 - giveitem ITEM_TM21, 99 - giveitem ITEM_TM22, 99 - giveitem ITEM_TM23, 99 - giveitem ITEM_TM24, 99 - giveitem ITEM_TM25, 99 - giveitem ITEM_TM26, 99 - giveitem ITEM_TM27, 99 - giveitem ITEM_TM28, 99 - giveitem ITEM_TM29, 99 - giveitem ITEM_TM30, 99 - giveitem ITEM_TM31, 99 - giveitem ITEM_TM32, 99 - giveitem ITEM_TM33, 99 - giveitem ITEM_TM34, 99 - giveitem ITEM_TM35, 99 - giveitem ITEM_TM36, 99 - giveitem ITEM_TM37, 99 - giveitem ITEM_TM38, 99 - giveitem ITEM_TM39, 99 - giveitem ITEM_TM40, 99 - giveitem ITEM_TM41, 99 - giveitem ITEM_TM42, 99 - giveitem ITEM_TM43, 99 - giveitem ITEM_TM44, 99 - giveitem ITEM_TM45, 99 - giveitem ITEM_TM46, 99 - giveitem ITEM_TM47, 99 - giveitem ITEM_TM48, 99 - giveitem ITEM_TM49, 99 - giveitem ITEM_TM50, 99 + giveitem ITEM_TM01_FOCUS_PUNCH, 99 + giveitem ITEM_TM02_DRAGON_CLAW, 99 + giveitem ITEM_TM03_WATER_PULSE, 99 + giveitem ITEM_TM04_CALM_MIND, 99 + giveitem ITEM_TM05_ROAR, 99 + giveitem ITEM_TM06_TOXIC, 99 + giveitem ITEM_TM07_HAIL, 99 + giveitem ITEM_TM08_BULK_UP, 99 + giveitem ITEM_TM09_BULLET_SEED, 99 + giveitem ITEM_TM10_HIDDEN_POWER, 99 + giveitem ITEM_TM11_SUNNY_DAY, 99 + giveitem ITEM_TM12_TAUNT, 99 + giveitem ITEM_TM13_ICE_BEAM, 99 + giveitem ITEM_TM14_BLIZZARD, 99 + giveitem ITEM_TM15_HYPER_BEAM, 99 + giveitem ITEM_TM16_LIGHT_SCREEN, 99 + giveitem ITEM_TM17_PROTECT, 99 + giveitem ITEM_TM18_RAIN_DANCE, 99 + giveitem ITEM_TM19_GIGA_DRAIN, 99 + giveitem ITEM_TM20_SAFEGUARD, 99 + giveitem ITEM_TM21_FRUSTRATION, 99 + giveitem ITEM_TM22_SOLARBEAM, 99 + giveitem ITEM_TM23_IRON_TAIL, 99 + giveitem ITEM_TM24_THUNDERBOLT, 99 + giveitem ITEM_TM25_THUNDER, 99 + giveitem ITEM_TM26_EARTHQUAKE, 99 + giveitem ITEM_TM27_RETURN, 99 + giveitem ITEM_TM28_DIG, 99 + giveitem ITEM_TM29_PSYCHIC, 99 + giveitem ITEM_TM30_SHADOW_BALL, 99 + giveitem ITEM_TM31_BRICK_BREAK, 99 + giveitem ITEM_TM32_DOUBLE_TEAM, 99 + giveitem ITEM_TM33_REFLECT, 99 + giveitem ITEM_TM34_SHOCK_WAVE, 99 + giveitem ITEM_TM35_FLAMETHROWER, 99 + giveitem ITEM_TM36_SLUDGE_BOMB, 99 + giveitem ITEM_TM37_SANDSTORM, 99 + giveitem ITEM_TM38_FIRE_BLAST, 99 + giveitem ITEM_TM39_ROCK_TOMB, 99 + giveitem ITEM_TM40_AERIAL_ACE, 99 + giveitem ITEM_TM41_TORMENT, 99 + giveitem ITEM_TM42_FACADE, 99 + giveitem ITEM_TM43_SECRET_POWER, 99 + giveitem ITEM_TM44_REST, 99 + giveitem ITEM_TM45_ATTRACT, 99 + giveitem ITEM_TM46_THIEF, 99 + giveitem ITEM_TM47_STEEL_WING, 99 + giveitem ITEM_TM48_SKILL_SWAP, 99 + giveitem ITEM_TM49_SNATCH, 99 + giveitem ITEM_TM50_OVERHEAT, 99 giveitem ITEM_CHERI_BERRY, 200 giveitem ITEM_CHERI_BERRY, 200 giveitem ITEM_CHERI_BERRY, 200 diff --git a/data/debug_menu_3.s b/data/debug_menu_3.s new file mode 100644 index 000000000..1e0a79c9f --- /dev/null +++ b/data/debug_menu_3.s @@ -0,0 +1,19 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +_845DAE1:: + .incbin "baserom_de_debug.gba", 0x45DAE1, 721 +_845DDB2:: + .incbin "baserom_de_debug.gba", 0x45DDB2, 1364 +_845E306:: + .incbin "baserom_de_debug.gba", 0x45E306, 218 +_845E3E0:: + .incbin "baserom_de_debug.gba", 0x45E3E0, 34 +_845E402:: + .incbin "baserom_de_debug.gba", 0x45E402, 32 +_845E422:: + .incbin "baserom_de_debug.gba", 0x45E422, 33 +_845E443:: + .incbin "baserom_de_debug.gba", 0x45E443, 889 diff --git a/data/debug_menu_nohara.s b/data/debug_menu_nohara.s new file mode 100644 index 000000000..7b99bcd12 --- /dev/null +++ b/data/debug_menu_nohara.s @@ -0,0 +1,229 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .ifdef DEBUG + + .align 2 +gUnknown_Debug_083C48C4:: @ 0x83C48C4 + .string "TV$" + +gUnknown_Debug_083C48C7:: @ 0x83C48C7 + .string "Fan$" + +gUnknown_Debug_083C48CB:: @ 0x83C48CB + .string "Battle (vs Dad)$" + +gUnknown_Debug_083C48DB:: @ 0x83C48DB + .string "Dad after battle$" + +gUnknown_Debug_083C48EC:: @ 0x83C48EC + .string "SOOTOPOLIS CITY$" + +gUnknown_Debug_083C48FC:: @ 0x83C48FC + .string "Embark$" + +gUnknown_Debug_083C4903:: @ 0x83C4903 + .string "Yes 9999$" + +gUnknown_Debug_083C490C:: @ 0x83C490C + .string "Legends flag ON$" + +gUnknown_Debug_083C491C:: @ 0x83C491C + .string "Add num of winning streaks$" + + .align 2 +gUnknown_Debug_083C4938:: @ 0x83C4938 + .4byte gUnknown_Debug_083C48C4, NoharaDebugMenu_TV+1 + .4byte gUnknown_Debug_083C48C7, NoharaDebugMenu_Fan+1 + .4byte gUnknown_Debug_083C48CB, NoharaDebugMenu_BattleVSDad+1 + .4byte gUnknown_Debug_083C48DB, NoharaDebugMenu_DadAfterBattle+1 + .4byte gUnknown_Debug_083C48EC, NoharaDebugMenu_SootopolisCity+1 + .4byte gUnknown_Debug_083C48FC, NoharaDebugMenu_Embark+1 + .4byte gUnknown_Debug_083C4903, NoharaDebugMenu_Yes9999+1 + .4byte gUnknown_Debug_083C490C, NoharaDebugMenu_LegendsFlagOn+1 + .4byte gUnknown_Debug_083C491C, NoharaDebugMenu_AddNumWinningStreaks+1 + +gUnknown_Debug_083C4980:: @ 0x83C4980 + .string "Want to change data type{CLEAR_TO 143}Press Left\n" + .string "to see secret type now?{CLEAR_TO 143}to switch$" + +gUnknown_Debug_083C49CA:: @ 0x83C49CA + .string "Choose the TV data you wish to\n" + .string "create to check a transmission。$" + +gUnknown_Debug_083C4A09:: @ 0x83C4A09 + .string "ほうそうの はっせいりつを セット\n" + .string "してください ?ぶんの1に なります$" + +gUnknown_Debug_083C4A2E:: @ 0x83C4A2E + .string "SURVEY$" + +gUnknown_Debug_083C4A35:: @ 0x83C4A35 + .string "RECENT HAPPENINGS$" + +gUnknown_Debug_083C4A47:: @ 0x83C4A47 + .string "POKひMON FAN CLUB$" + +gUnknown_Debug_083C4A58:: @ 0x83C4A58 + .string "ジム$" + +gUnknown_Debug_083C4A5B:: @ 0x83C4A5B + .string "OUTBREAKS$" + +gUnknown_Debug_083C4A65:: @ 0x83C4A65 + .string "NAME RATER$" + +gUnknown_Debug_083C4A70:: @ 0x83C4A70 + .string "CONTEST$" + +gUnknown_Debug_083C4A78:: @ 0x83C4A78 + .string "INTRODUCTION$" + +gUnknown_Debug_083C4A85:: @ 0x83C4A85 + .string "SHOPPING$" + +gUnknown_Debug_083C4A8E:: @ 0x83C4A8E + .string "MISFORTUNE$" + +gUnknown_Debug_083C4A99:: @ 0x83C4A99 + .string "FISHING$" + +gUnknown_Debug_083C4AA1:: @ 0x83C4AA1 + .string "MEMORABLE DAY$" + +gUnknown_Debug_083C4AAF:: @ 0x83C4AAF + .string "BRAVO TRAINER$" + +gUnknown_Debug_083C4ABD:: @ 0x83C4ABD + .string "あいうるおかなにぬねのき   んぼざくゅぼざくびぼざくサぼざくナぼざくミぼざくリぼざくュぼざくズぼざくベぼざく0ぼざく·ぼざくBIG SALE$" + +gUnknown_Debug_083C4B05:: @ 0x83C4B05 + .string "SERVICE DAY$" + +gUnknown_Debug_083C4B11:: @ 0x83C4B11 + .string "CLEARーOUT SALE$" + +gUnknown_Debug_083C4B20:: @ 0x83C4B20 + .string "あいう {0xFC}ぼざくおぱざくちぱざく" + +gUnknown_Debug_083C4B30:: @ 0x83C4B30 + .string "Secret type$" + +gUnknown_Debug_083C4B3C:: @ 0x83C4B3C + .string "Start$" + +gUnknown_Debug_083C4B42:: @ 0x83C4B42 + .string "Create TV$" + +gUnknown_Debug_083C4B4C:: @ 0x83C4B4C + .string "All clear$" + +gUnknown_Debug_083C4B56:: @ 0x83C4B56 + .string "All seen$" + +gUnknown_Debug_083C4B5F:: @ 0x83C4B5F + .string "Create CM$" + +gUnknown_Debug_083C4B69:: @ 0x83C4B69 + .string "Not yet seen$" + +gUnknown_Debug_083C4B76:: @ 0x83C4B76 + .string "Hit Table$" + +gUnknown_Debug_083C4B80:: @ 0x83C4B80 + .string "Set full$" + + .align 2 +gUnknown_Debug_083C4B8C:: @ 0x83C4B8C + .4byte gUnknown_Debug_083C4B30, debug_sub_808F4EC+1 + .4byte gUnknown_Debug_083C4B3C, debug_sub_808F8AC+1 + .4byte gUnknown_Debug_083C4B42, debug_sub_808F8CC+1 + .4byte gUnknown_Debug_083C4B4C, debug_sub_808FEBC+1 + .4byte gUnknown_Debug_083C4B56, debug_sub_808F560+1 + .4byte gUnknown_Debug_083C4B5F, debug_sub_808FECC+1 + .4byte gUnknown_Debug_083C4B69, debug_sub_808F594+1 + .4byte gUnknown_Debug_083C4B76, debug_sub_808F5D8+1 + .4byte gUnknown_Debug_083C4B80, debug_sub_80900AC+1 + +gUnknown_Debug_083C4BD4:: @ 0x83C4BD4 + .string "しえ          しく          しこ          せか          せく          せこ          たえ          たか          たこ          つえ          つか          つこ          " + +gUnknown_Debug_083C4C64:: @ 0x83C4C64 + .string "TERUKUN$" + +gUnknown_Debug_083C4C6C:: @ 0x83C4C6C + .string "TERUTERUDA$" + +gUnknown_Debug_083C4C77:: @ 0x83C4C77 + .string "1 スクル$" + +gUnknown_Debug_083C4C7D:: @ 0x83C4C7D + .string "2 ミドル$" + +gUnknown_Debug_083C4C83:: @ 0x83C4C83 + .string "3 オジヨ$" + +gUnknown_Debug_083C4C89:: @ 0x83C4C89 + .string "4 ボーヤ$" + +gUnknown_Debug_083C4C8F:: @ 0x83C4C8F + .string "5 ボーイ$" + +gUnknown_Debug_083C4C95:: @ 0x83C4C95 + .string "6 ヤング$" + +gUnknown_Debug_083C4C9B:: @ 0x83C4C9B + .string "7 ヲーカ$" + +gUnknown_Debug_083C4CA1:: @ 0x83C4CA1 + .string "8 オルド$" + + .align 2 +gUnknown_Debug_083C4CA8:: @ 0x83C4CA8 + .4byte gUnknown_Debug_083C4C77, gUnknown_Debug_083C4C7D + .4byte gUnknown_Debug_083C4C83, gUnknown_Debug_083C4C89 + .4byte gUnknown_Debug_083C4C8F, gUnknown_Debug_083C4C95 + .4byte gUnknown_Debug_083C4C9B, gUnknown_Debug_083C4CA1 + +gUnknown_Debug_083C4CC8:: @ 0x83C4CC8 + .string "Start$" + +gUnknown_Debug_083C4CCE:: @ 0x83C4CCE + .string "Increase$" + +gUnknown_Debug_083C4CD7:: @ 0x83C4CD7 + .string "Reduce$" + +gUnknown_Debug_083C4CDE:: @ 0x83C4CDE + .string "Points$" + +gUnknown_Debug_083C4CE5:: @ 0x83C4CE5 + .string "Play time 6$" + +gUnknown_Debug_083C4CF1:: @ 0x83C4CF1 + .string "P ELITE FOUR$" + +gUnknown_Debug_083C4CFE:: @ 0x83C4CFE + .string "P SECRET BASE$" + +gUnknown_Debug_083C4D0C:: @ 0x83C4D0C + .string "P CONTEST$" + +gUnknown_Debug_083C4D16:: @ 0x83C4D16 + .string "P BATTLE TOWER$" + + .align 2 +gUnknown_Debug_083C4D28:: @ 0x83C4D28 + .4byte gUnknown_Debug_083C4CC8, debug_sub_80901E4+1 + .4byte gUnknown_Debug_083C4CCE, debug_sub_80901F8+1 + .4byte gUnknown_Debug_083C4CD7, debug_sub_8090238+1 + .4byte gUnknown_Debug_083C4CDE, debug_sub_809029C+1 + .4byte gUnknown_Debug_083C4CE5, debug_sub_80902E4+1 + .4byte gUnknown_Debug_083C4CF1, debug_sub_80902FC+1 + .4byte gUnknown_Debug_083C4CFE, debug_sub_8090310+1 + .4byte gUnknown_Debug_083C4D0C, debug_sub_8090324+1 + .4byte gUnknown_Debug_083C4D16, debug_sub_8090338+1 + + .endif diff --git a/data/debug_menu_taya.s b/data/debug_menu_taya.s new file mode 100644 index 000000000..a7de0c3d1 --- /dev/null +++ b/data/debug_menu_taya.s @@ -0,0 +1,219 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .ifdef DEBUG + +gUnknown_Debug_083C4E54:: @ 0x83C4E54 + .string "Profile$" + +gUnknown_Debug_083C4E5C:: @ 0x83C4E5C + .string "Battle’s start$" + +gUnknown_Debug_083C4E6B:: @ 0x83C4E6B + .string "Good saying$" + +gUnknown_Debug_083C4E77:: @ 0x83C4E77 + .string "Lose a battle$" + +gUnknown_Debug_083C4E85:: @ 0x83C4E85 + .string "MAIL$" + +gUnknown_Debug_083C4E8A:: @ 0x83C4E8A + .string "MAIL salutation$" + +gUnknown_Debug_083C4E9A:: @ 0x83C4E9A + .string "BARD’s song$" + +gUnknown_Debug_083C4EA6:: @ 0x83C4EA6 + .string "Interview$" + +gUnknown_Debug_083C4EB0:: @ 0x83C4EB0 + .string "InterviewシBTス$" + + .align 2 +gUnknown_Debug_083C4EC0:: @ 0x83C4EC0 + .4byte gUnknown_Debug_083C4E54, 0x0 + .4byte gUnknown_Debug_083C4E5C, 0x1 + .4byte gUnknown_Debug_083C4E6B, 0xD + .4byte gUnknown_Debug_083C4E77, 0x3 + .4byte gUnknown_Debug_083C4E85, 0x4 + .4byte gUnknown_Debug_083C4E8A, 0x5 + .4byte gUnknown_Debug_083C4E9A, 0x6 + .4byte gUnknown_Debug_083C4EA6, 0x7 + .4byte gUnknown_Debug_083C4EB0, 0xC + +gUnknown_Debug_083C4F08:: @ 0x83C4F08 + .string "サえぃえそい" + +gUnknown_Debug_083C4F0E:: @ 0x83C4F0E + .string "BARD$" + +gUnknown_Debug_083C4F13:: @ 0x83C4F13 + .string "HIPSTER$" + +gUnknown_Debug_083C4F1B:: @ 0x83C4F1B + .string "RECYCLE$" + +gUnknown_Debug_083C4F23:: @ 0x83C4F23 + .string "STORYTELLER$" + +gUnknown_Debug_083C4F2F:: @ 0x83C4F2F + .string "GIDDY GUY$" + +gUnknown_Debug_083C4F39:: @ 0x83C4F39 + .string "Flag OFF$" + +gUnknown_Debug_083C4F42:: @ 0x83C4F42 + .string "21 letters$" + +gUnknown_Debug_083C4F4D:: @ 0x83C4F4D + .string "ナウくなる$" + + .align 2 +gUnknown_Debug_083C4F54:: @ 0x83C4F54 + .4byte gUnknown_Debug_083C4F0E, 0x0 + .4byte gUnknown_Debug_083C4F13, 0x0 + .4byte gUnknown_Debug_083C4F1B, 0x0 + .4byte gUnknown_Debug_083C4F23, 0x0 + .4byte gUnknown_Debug_083C4F2F, 0x0 + .4byte gUnknown_Debug_083C4F39, 0x0 + .4byte gUnknown_Debug_083C4F42, 0x0 + .4byte gUnknown_Debug_083C4F4D, 0x0 + +gUnknown_Debug_083C4F94:: @ 0x83C4F94 + .string "しょうしょうおまちください!$" + +gUnknown_Debug_083C4FA3:: @ 0x83C4FA3 + .string "Weather$" + +gUnknown_Debug_083C4FAB:: @ 0x83C4FAB + .string "LANETTE’S PC$" + +gUnknown_Debug_083C4FB8:: @ 0x83C4FB8 + .string "SimpleText$" + +gUnknown_Debug_083C4FC3:: @ 0x83C4FC3 + .string "Old man$" + +gUnknown_Debug_083C4FCB:: @ 0x83C4FCB + .string "Trend$" + +gUnknown_Debug_083C4FD1:: @ 0x83C4FD1 + .string "Trend R$" + +gUnknown_Debug_083C4FD9:: @ 0x83C4FD9 + .string "Town flag$" + +gUnknown_Debug_083C4FE3:: @ 0x83C4FE3 + .string "Award a ribbon$" + +gUnknown_Debug_083C4FF2:: @ 0x83C4FF2 + .string "{PKMN}LOTTERY$" + +gUnknown_Debug_083C4FFC:: @ 0x83C4FFC + .string "Trainer$" + +gUnknown_Debug_083C5004:: @ 0x83C5004 + .string "POKéNAV D$" + + .align 2 +gUnknown_Debug_083C5010:: @ 0x83C5010 + .4byte gUnknown_Debug_083C4FA3, debug_sub_808560C+1 + .4byte gUnknown_Debug_083C4FAB, TayaDebugMenu_LanettesPC+1 + .4byte gUnknown_Debug_083C4FB8, TayaDebugMenu_SimpleText+1 + .4byte gUnknown_Debug_083C4FC3, TayaDebugMenu_OldMan+1 + .4byte gUnknown_Debug_083C4FCB, TayaDebugMenu_Trend+1 + .4byte gUnknown_Debug_083C4FD1, TayaDebugMenu_TrendR+1 + .4byte gUnknown_Debug_083C4FD9, TayaDebugMenu_TownFlags+1 + .4byte gUnknown_Debug_083C4FE3, TayaDebugMenu_AwardARibbon+1 + .4byte gUnknown_Debug_083C4FF2, TayaDebugMenu_PKMNLottery+1 + +gUnknown_Debug_083C5058:: @ 0x83C5058 + .4byte gUnknown_Debug_083C4FFC, TayaDebugMenu_Trainer+1 + .4byte gUnknown_Debug_083C5004, TayaDebugMenu_PokenavD+1 + +gUnknown_Debug_83C5068:: + .4byte gUnknown_Debug_083C5010, 0x9 + .4byte gUnknown_Debug_083C5058, 0x2 + +gUnknown_Debug_083C5078:: @ 0x83C5078 + .string "CHANP$" + +gUnknown_Debug_083C507E:: @ 0x83C507E + .string "COOL$" + +gUnknown_Debug_083C5083:: @ 0x83C5083 + .string "BEAUTY$" + +gUnknown_Debug_083C508A:: @ 0x83C508A + .string "CUTE$" + +gUnknown_Debug_083C508F:: @ 0x83C508F + .string "SMART$" + +gUnknown_Debug_083C5095:: @ 0x83C5095 + .string "TOUGH$" + +gUnknown_Debug_083C509B:: @ 0x83C509B + .string "WIN$" + +gUnknown_Debug_083C509F:: @ 0x83C509F + .string "VICTORY$" + +gUnknown_Debug_083C50A7:: @ 0x83C50A7 + .string "BROMIDE$" + +gUnknown_Debug_083C50AF:: @ 0x83C50AF + .string "ACCESSIT$" + +gUnknown_Debug_083C50B8:: @ 0x83C50B8 + .string "MARINE$" + +gUnknown_Debug_083C50BF:: @ 0x83C50BF + .string "LAND$" + +gUnknown_Debug_083C50C4:: @ 0x83C50C4 + .string "SKY$" + +gUnknown_Debug_083C50C8:: @ 0x83C50C8 + .string "COUNTRY$" + +gUnknown_Debug_083C50D0:: @ 0x83C50D0 + .string "NATIONAL$" + +gUnknown_Debug_083C50D9:: @ 0x83C50D9 + .string "EARTH$" + +gUnknown_Debug_083C50DF:: @ 0x83C50DF + .string "WORLD$" + +gUnknown_Debug_083C50E5:: @ 0x83C50E5 + .string "     $" + + .align 2 +gUnknown_Debug_083C50EC:: @ 0x83C50EC + .4byte gUnknown_Debug_083C5078, 0x43 + .4byte gUnknown_Debug_083C507E, 0x32 + .4byte gUnknown_Debug_083C5083, 0x33 + .4byte gUnknown_Debug_083C508A, 0x34 + .4byte gUnknown_Debug_083C508F, 0x35 + .4byte gUnknown_Debug_083C5095, 0x36 + .4byte gUnknown_Debug_083C509B, 0x44 + .4byte gUnknown_Debug_083C509F, 0x45 + .4byte gUnknown_Debug_083C50A7, 0x46 + .4byte gUnknown_Debug_083C50AF, 0x47 + .4byte gUnknown_Debug_083C50B8, 0x48 + .4byte gUnknown_Debug_083C50BF, 0x49 + .4byte gUnknown_Debug_083C50C4, 0x4A + .4byte gUnknown_Debug_083C50C8, 0x4B + .4byte gUnknown_Debug_083C50D0, 0x4C + .4byte gUnknown_Debug_083C50D9, 0x4D + .4byte gUnknown_Debug_083C50DF, 0x4E + .4byte gUnknown_Debug_083C50E5, 0x0 + +gUnknown_Debug_083C517C:: @ 0x83C517C + .string "Select Ribbon$" + + .endif diff --git a/data/debug_menu_tomomichi.s b/data/debug_menu_tomomichi.s new file mode 100644 index 000000000..1ec69ad3b --- /dev/null +++ b/data/debug_menu_tomomichi.s @@ -0,0 +1,2664 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .ifdef DEBUG +gUnknown_Debug_083C0C54:: @ 0x83C0C54 + .string "Contest graphics$" + +gUnknown_Debug_083C0C65:: @ 0x83C0C65 + .string "Art Mus. graphics$" + +gUnknown_Debug_083C0C77:: @ 0x83C0C77 + .string "Preview data$" + +gUnknown_Debug_083C0C84:: @ 0x83C0C84 + .string "TRICK HOUSE$" + +gUnknown_Debug_083C0C90:: @ 0x83C0C90 + .string "Control events$" + +gUnknown_Debug_083C0C9F:: @ 0x83C0C9F + .string "Control flags$" + +gUnknown_Debug_083C0CAD:: @ 0x83C0CAD + .string "Control WORK$" + + .align 2 +gUnknown_Debug_083C0CBA:: @ 0x83C0CBA + .4byte gUnknown_Debug_083C0C54, TomomichiDebugMenu_ContestGraphics+1 + .4byte gUnknown_Debug_083C0C65, TomomichiDebugMenu_ArtMusGraphics+1 + .4byte gUnknown_Debug_083C0C77, TomomichiDebugMenu_PreviewData+1 + .4byte gUnknown_Debug_083C0C84, TomomichiDebugMenu_TrickHouse+1 + .4byte gUnknown_Debug_083C0C90, TomomichiDebugMenu_ControlEvents+1 + .4byte gUnknown_Debug_083C0C9F, TomomichiDebugMenu_ControlFlags+1 + .4byte gUnknown_Debug_083C0CAD, TomomichiDebugMenu_ControlWorks+1 + +gUnknown_Debug_083C0CF4:: @ 0x83C0CF4 + .string "Contest$" + +gUnknown_Debug_083C0CFC:: @ 0x83C0CFC + .string "Pokémon No.$" + +gUnknown_Debug_083C0D08:: @ 0x83C0D08 + .string "ID rnd. digit$" + +gUnknown_Debug_083C0D16:: @ 0x83C0D16 + .string "Contest Type$" + +gUnknown_Debug_083C0D23:: @ 0x83C0D23 + .string "Poké Art$" + + .align 2 +gUnknown_Debug_083C0D2C:: @ 0x83C0D2C + .4byte gUnknown_Debug_083C0CFC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0D08, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0D16, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0D23, TomomichiDebugMenu_ContestGraphics_Show+1 + +gUnknown_Debug_083C0D4C:: @ 0x83C0D4C + .string "Art Mus.$" + +gUnknown_Debug_083C0D55:: @ 0x83C0D55 + .string "Pokémon No.$" + +gUnknown_Debug_083C0D61:: @ 0x83C0D61 + .string "ID rnd. digit$" + +gUnknown_Debug_083C0D6F:: @ 0x83C0D6F + .string "Title Type$" + +gUnknown_Debug_083C0D7A:: @ 0x83C0D7A + .string "Poké Art$" + + .align 2 +gUnknown_Debug_083C0D83:: @ 0x83C0D83 + .4byte gUnknown_Debug_083C0D55, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0D61, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0D6F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0D7A, TomomichiDebugMenu_MuseumGraphics_Show+1 + +gUnknown_Debug_083C0DA4:: @ 0x83C0DA4 + .string "Preview$" + +gUnknown_Debug_083C0DAC:: @ 0x83C0DAC + .string "Pokémon No.$" + +gUnknown_Debug_083C0DB8:: @ 0x83C0DB8 + .string "ID rnd. digit$" + +gUnknown_Debug_083C0DC6:: @ 0x83C0DC6 + .string "Type$" + +gUnknown_Debug_083C0DCB:: @ 0x83C0DCB + .string "Poké Art$" + + .align 2 +gUnknown_Debug_083C0DD4:: @ 0x83C0DD4 + .4byte gUnknown_Debug_083C0DAC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0DB8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0DC6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C0DCB, debug_sub_808ECA4+1 + +gUnknown_Debug_083C0DF4:: @ 0x83C0DF4 + .string "Trick related$" + +gUnknown_Debug_083C0E02:: @ 0x83C0E02 + .string "Level$" + +gUnknown_Debug_083C0E08:: @ 0x83C0E08 + .string "Trick Master$" + + .align 2 +gUnknown_Debug_083C0E15:: @ 0x83C0E15 + .4byte gUnknown_Debug_083C0E02, debug_sub_808EB58+1 + .4byte gUnknown_Debug_083C0E08, debug_sub_808EBB4+1 + +gUnknown_Debug_083C0E28:: @ 0x83C0E28 + .string "パート1$" + +gUnknown_Debug_083C0E2D:: @ 0x83C0E2D + .string "パート2$" + + .align 2 +gUnknown_Debug_083C0E32:: @ 0x83C0E32 + .4byte gUnknown_Debug_083C0E28, debug_sub_808BFC4+1 + .4byte gUnknown_Debug_083C0E2D, debug_sub_808C014+1 + +gUnknown_Debug_083C0E44:: @ 0x83C0E44 + .string "イベントFLAG$" + +gUnknown_Debug_083C0E4D:: @ 0x83C0E4D + .string "バニシュFLAG$" + +gUnknown_Debug_083C0E56:: @ 0x83C0E56 + .string "トレーナーFLAG$" + +gUnknown_Debug_083C0E60:: @ 0x83C0E60 + .string "SYSFLAG$" + +gUnknown_Debug_083C0E68:: @ 0x83C0E68 + .string "BALLバニシュFLAG$" + +gUnknown_Debug_083C0E75:: @ 0x83C0E75 + .string "FH$" + +gUnknown_Debug_083C0E78:: @ 0x83C0E78 + .string "FH-OBJ$" + + .align 2 +gUnknown_Debug_083C0E7F:: @ 0x83C0E7F + .4byte gUnknown_Debug_083C0E44, debug_sub_808C31C+1 + .4byte gUnknown_Debug_083C0E4D, debug_sub_808C7C8+1 + .4byte gUnknown_Debug_083C0E56, debug_sub_808CC74+1 + .4byte gUnknown_Debug_083C0E60, debug_sub_808CF10+1 + .4byte gUnknown_Debug_083C0E68, debug_sub_808D844+1 + .4byte gUnknown_Debug_083C0E75, debug_sub_808D600+1 + .4byte gUnknown_Debug_083C0E78, debug_sub_808D3BC+1 + +gUnknown_Debug_083C0EB8:: @ 0x83C0EB8 + .string "SAVEWORK$" + +gUnknown_Debug_083C0EC1:: @ 0x83C0EC1 + .string "SYSWORK$" + +gUnknown_Debug_083C0EC9:: @ 0x83C0EC9 + .string "LOCALWORK$" + +gUnknown_Debug_083C0ED3:: @ 0x83C0ED3 + .string "OBJWORK$" + +gUnknown_Debug_083C0EDB:: @ 0x83C0EDB + .string "ANSWORK$" + +gUnknown_Debug_083C0EE3:: @ 0x83C0EE3 + .string "SAVEWORK パート2$" + + .align 2 +gUnknown_Debug_083C0EF1:: @ 0x83C0EF1 + .4byte gUnknown_Debug_083C0EB8, debug_sub_808DB0C+1 + .4byte gUnknown_Debug_083C0EC1, debug_sub_808E36C+1 + .4byte gUnknown_Debug_083C0EC9, debug_sub_808E6C0+1 + .4byte gUnknown_Debug_083C0ED3, debug_sub_808E90C+1 + .4byte gUnknown_Debug_083C0EDB, debug_sub_808DA30+1 + .4byte gUnknown_Debug_083C0EE3, debug_sub_808DFC0+1 + +gUnknown_Debug_083C0F24:: @ 0x83C0F24 + .string "クリアご$" + +gUnknown_Debug_083C0F29:: @ 0x83C0F29 + .string "コインこうにゅうかのう$" + +gUnknown_Debug_083C0F35:: @ 0x83C0F35 + .string "コトキサポーターセット$" + +gUnknown_Debug_083C0F41:: @ 0x83C0F41 + .string "ニューキンセツOPEN$" + +gUnknown_Debug_083C0F4D:: @ 0x83C0F4D + .string "れんらくせんにのれる$" + +gUnknown_Debug_083C0F58:: @ 0x83C0F58 + .string "タマゴついか$" + +gUnknown_Debug_083C0F5F:: @ 0x83C0F5F + .string "アイテムいっぱい$" + +gUnknown_Debug_083C0F68:: @ 0x83C0F68 + .string "グッズいっぱい$" + +gUnknown_Debug_083C0F70:: @ 0x83C0F70 + .string "COINいっぱい$" + + .align 2 +gUnknown_Debug_083C0F79:: @ 0x83C0F79 + .4byte gUnknown_Debug_083C0F24, debug_sub_808C0EC+1 + .4byte gUnknown_Debug_083C0F29, debug_sub_808C104+1 + .4byte gUnknown_Debug_083C0F35, debug_sub_808C11C+1 + .4byte gUnknown_Debug_083C0F41, debug_sub_808C134+1 + .4byte gUnknown_Debug_083C0F4D, debug_sub_808C14C+1 + .4byte gUnknown_Debug_083C0F58, debug_sub_808C164+1 + .4byte gUnknown_Debug_083C0F5F, debug_sub_808C17C+1 + .4byte gUnknown_Debug_083C0F68, debug_sub_808C194+1 + .4byte gUnknown_Debug_083C0F70, debug_sub_808C1AC+1 + +gUnknown_Debug_083C0FC4:: @ 0x83C0FC4 + .string "ムロジムOPEN$" + +gUnknown_Debug_083C0FCD:: @ 0x83C0FCD + .string "おかねを0へ$" + +gUnknown_Debug_083C0FD4:: @ 0x83C0FD4 + .string "ドジョッチ FULL$" + +gUnknown_Debug_083C0FDF:: @ 0x83C0FDF + .string "キノココ FULL$" + +gUnknown_Debug_083C0FE9:: @ 0x83C0FE9 + .string "ドジョッチ タマゴ$" + +gUnknown_Debug_083C0FF3:: @ 0x83C0FF3 + .string "キノココ タマゴ$" + + .align 2 +gUnknown_Debug_083C0FFC:: @ 0x83C0FFC + .4byte gUnknown_Debug_083C0FC4, debug_sub_808C1C4+1 + .4byte gUnknown_Debug_083C0FCD, debug_sub_808C1DC+1 + .4byte gUnknown_Debug_083C0FD4, debug_sub_808C1F4+1 + .4byte gUnknown_Debug_083C0FDF, debug_sub_808C20C+1 + .4byte gUnknown_Debug_083C0FE9, debug_sub_808C224+1 + .4byte gUnknown_Debug_083C0FF3, debug_sub_808C23C+1 + +gUnknown_Debug_083C102C:: @ 0x83C102C + .string "ANSWORK みかんせい$" + + .align 2 +gUnknown_Debug_083C103A:: @ 0x83C103A + .4byte gUnknown_Debug_083C102C, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1044:: @ 0x83C1044 + .string "FHーOBJ00ー08$" + +gUnknown_Debug_083C1050:: @ 0x83C1050 + .string "FHーOBJ09ー15$" + + .align 2 +gUnknown_Debug_083C105C:: @ 0x83C105C + .4byte gUnknown_Debug_083C1044, debug_sub_808D450+1 + .4byte gUnknown_Debug_083C1050, debug_sub_808D4A8+1 + +gUnknown_Debug_083C106C:: @ 0x83C106C + .string "FHーOBJ00$" + +gUnknown_Debug_083C1075:: @ 0x83C1075 + .string "FHーOBJ01$" + +gUnknown_Debug_083C107E:: @ 0x83C107E + .string "FHーOBJ02$" + +gUnknown_Debug_083C1087:: @ 0x83C1087 + .string "FHーOBJ03$" + +gUnknown_Debug_083C1090:: @ 0x83C1090 + .string "FHーOBJ04$" + +gUnknown_Debug_083C1099:: @ 0x83C1099 + .string "FHーOBJ05$" + +gUnknown_Debug_083C10A2:: @ 0x83C10A2 + .string "FHーOBJ06$" + +gUnknown_Debug_083C10AB:: @ 0x83C10AB + .string "FHーOBJ07$" + +gUnknown_Debug_083C10B4:: @ 0x83C10B4 + .string "FHーOBJ08$" + + .align 2 +gUnknown_Debug_083C10BD:: @ 0x83C10BD + .4byte gUnknown_Debug_083C106C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1075, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C107E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1087, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1090, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1099, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C10A2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C10AB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C10B4, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1108:: @ 0x83C1108 + .string "FH-OBJ09$" + +gUnknown_Debug_083C1111:: @ 0x83C1111 + .string "FH-OBJ10$" + +gUnknown_Debug_083C111A:: @ 0x83C111A + .string "FH-OBJ11$" + +gUnknown_Debug_083C1123:: @ 0x83C1123 + .string "FH-OBJ12$" + +gUnknown_Debug_083C112C:: @ 0x83C112C + .string "FH-OBJ13$" + +gUnknown_Debug_083C1135:: @ 0x83C1135 + .string "FH-OBJ14$" + +gUnknown_Debug_083C113E:: @ 0x83C113E + .string "FH-OBJ15$" + +gUnknown_Debug_083C1147:: @ 0x83C1147 + .string "$" + +gUnknown_Debug_083C1148:: @ 0x83C1148 + .string "$" + + .align 2 +gUnknown_Debug_083C1149:: @ 0x83C1149 + .4byte gUnknown_Debug_083C1108, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1111, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C111A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1123, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C112C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1135, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C113E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1147, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1148, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1194:: @ 0x83C1194 + .incbin "baserom_de_debug.gba", 0x3C1194, 38 + +gUnknown_Debug_083C11BA:: @ 0x83C11BA + .string "FH-00-08$" + +gUnknown_Debug_083C11C3:: @ 0x83C11C3 + .string "FH-09-15$" + + .align 2 +gUnknown_Debug_083C11CC:: @ 0x83C11CC + .4byte gUnknown_Debug_083C11BA, debug_sub_808D694+1 + .4byte gUnknown_Debug_083C11C3, debug_sub_808D6EC+1 + +gUnknown_Debug_083C11DC:: @ 0x83C11DC + .string "FH-00$" + +gUnknown_Debug_083C11E2:: @ 0x83C11E2 + .string "FH-01$" + +gUnknown_Debug_083C11E8:: @ 0x83C11E8 + .string "FH-02$" + +gUnknown_Debug_083C11EE:: @ 0x83C11EE + .string "FH-03$" + +gUnknown_Debug_083C11F4:: @ 0x83C11F4 + .string "FH-04$" + +gUnknown_Debug_083C11FA:: @ 0x83C11FA + .string "FH-05$" + +gUnknown_Debug_083C1200:: @ 0x83C1200 + .string "FH-06$" + +gUnknown_Debug_083C1206:: @ 0x83C1206 + .string "FH-07$" + +gUnknown_Debug_083C120C:: @ 0x83C120C + .string "FH-08$" + + .align 2 +gUnknown_Debug_083C1212:: @ 0x83C1212 + .4byte gUnknown_Debug_083C11DC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C11E2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C11E8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C11EE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C11F4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C11FA, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1200, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1206, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C120C, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C125C:: @ 0x83C125C + .string "FHー09$" + +gUnknown_Debug_083C1262:: @ 0x83C1262 + .string "FHー10$" + +gUnknown_Debug_083C1268:: @ 0x83C1268 + .string "FHー11$" + +gUnknown_Debug_083C126E:: @ 0x83C126E + .string "FHー12$" + +gUnknown_Debug_083C1274:: @ 0x83C1274 + .string "FHー13$" + +gUnknown_Debug_083C127A:: @ 0x83C127A + .string "FHー14$" + +gUnknown_Debug_083C1280:: @ 0x83C1280 + .string "FHー15$" + +gUnknown_Debug_083C1286:: @ 0x83C1286 + .string "$" + +gUnknown_Debug_083C1287:: @ 0x83C1287 + .string "$" + + .align 2 +gUnknown_Debug_083C1288:: @ 0x83C1288 + .4byte gUnknown_Debug_083C125C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1262, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1268, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C126E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1274, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C127A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1280, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1286, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1287, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C12D0:: @ 0x83C12D0 + .incbin "baserom_de_debug.gba", 0x3C12D0, 38 + +gUnknown_Debug_083C12F6:: @ 0x83C12F6 + .string "BATCH$" + +gUnknown_Debug_083C12FC:: @ 0x83C12FC + .string "タウンとうちゃく$" + +gUnknown_Debug_083C1305:: @ 0x83C1305 + .string "シティとうちゃく$" + +gUnknown_Debug_083C130E:: @ 0x83C130E + .string "GET$" + +gUnknown_Debug_083C1312:: @ 0x83C1312 + .string "そのた1$" + +gUnknown_Debug_083C1317:: @ 0x83C1317 + .string "そのた2$" + +gUnknown_Debug_083C131C:: @ 0x83C131C + .string "そのた3$" + +gUnknown_Debug_083C1321:: @ 0x83C1321 + .string "そのた4$" + +gUnknown_Debug_083C1326:: @ 0x83C1326 + .string "そのた とうちゃく$" + +gUnknown_Debug_083C1330:: @ 0x83C1330 + .4byte gUnknown_Debug_083C12F6, debug_sub_808CFA4+1 + .4byte gUnknown_Debug_083C12FC, debug_sub_808CFFC+1 + .4byte gUnknown_Debug_083C1305, debug_sub_808D054+1 + .4byte gUnknown_Debug_083C130E, debug_sub_808D0AC+1 + .4byte gUnknown_Debug_083C1312, debug_sub_808D104+1 + .4byte gUnknown_Debug_083C1317, debug_sub_808D15C+1 + .4byte gUnknown_Debug_083C131C, debug_sub_808D1B4+1 + .4byte gUnknown_Debug_083C1321, debug_sub_808D20C+1 + .4byte gUnknown_Debug_083C1326, debug_sub_808D264+1 + +gUnknown_Debug_083C1378:: @ 0x83C1378 + .string "BATCH01ーGET$" + +gUnknown_Debug_083C1384:: @ 0x83C1384 + .string "BATCH02ーGET$" + +gUnknown_Debug_083C1390:: @ 0x83C1390 + .string "BATCH03ーGET$" + +gUnknown_Debug_083C139C:: @ 0x83C139C + .string "BATCH04ーGET$" + +gUnknown_Debug_083C13A8:: @ 0x83C13A8 + .string "BATCH05ーGET$" + +gUnknown_Debug_083C13B4:: @ 0x83C13B4 + .string "BATCH06ーGET$" + +gUnknown_Debug_083C13C0:: @ 0x83C13C0 + .string "BATCH07ーGET$" + +gUnknown_Debug_083C13CC:: @ 0x83C13CC + .string "BATCH08ーGET$" + +gUnknown_Debug_083C13D8:: @ 0x83C13D8 + .4byte gUnknown_Debug_083C1378, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1384, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1390, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C139C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C13A8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C13B4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C13C0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C13CC, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1418:: @ 0x83C1418 + .string "T101ARRIVE$" + +gUnknown_Debug_083C1423:: @ 0x83C1423 + .string "T102ARRIVE$" + +gUnknown_Debug_083C142E:: @ 0x83C142E + .string "T103ARRIVE$" + +gUnknown_Debug_083C1439:: @ 0x83C1439 + .string "T104ARRIVE$" + +gUnknown_Debug_083C1444:: @ 0x83C1444 + .string "T105ARRIVE$" + +gUnknown_Debug_083C144F:: @ 0x83C144F + .string "T106ARRIVE$" + +gUnknown_Debug_083C145A:: @ 0x83C145A + .string "T107ARRIVE$" + + .align 2 +gUnknown_Debug_083C1465:: @ 0x83C1465 + .4byte gUnknown_Debug_083C1418, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1423, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C142E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1439, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1444, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C144F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C145A, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C14A0:: @ 0x83C14A0 + .string "C101ARRIVE$" + +gUnknown_Debug_083C14AB:: @ 0x83C14AB + .string "C102ARRIVE$" + +gUnknown_Debug_083C14B6:: @ 0x83C14B6 + .string "C103ARRIVE$" + +gUnknown_Debug_083C14C1:: @ 0x83C14C1 + .string "C104ARRIVE$" + +gUnknown_Debug_083C14CC:: @ 0x83C14CC + .string "C105ARRIVE$" + +gUnknown_Debug_083C14D7:: @ 0x83C14D7 + .string "C106ARRIVE$" + +gUnknown_Debug_083C14E2:: @ 0x83C14E2 + .string "C107ARRIVE$" + +gUnknown_Debug_083C14ED:: @ 0x83C14ED + .string "C108ARRIVE$" + +gUnknown_Debug_083C14F8:: @ 0x83C14F8 + .string "C109ARRIVE$" + + .align 2 +gUnknown_Debug_083C1503:: @ 0x83C1503 + .4byte gUnknown_Debug_083C14A0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14AB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14B6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14C1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14CC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14D7, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14E2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14ED, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C14F8, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C154C:: @ 0x83C154C + .string "SYSーPOKEMONーGET$" + +gUnknown_Debug_083C155C:: @ 0x83C155C + .string "SYSーZUKANーGET$" + +gUnknown_Debug_083C156A:: @ 0x83C156A + .string "SYSーPOKEGEARーGET$" + +gUnknown_Debug_083C157B:: @ 0x83C157B + .string "SYSーRIBBONーGET$" + + .align 2 +gUnknown_Debug_083C158A:: @ 0x83C158A + .4byte gUnknown_Debug_083C154C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C155C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C156A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C157B, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C15AC:: @ 0x83C15AC + .string "SYSーGAMEーCLEAR$" + +gUnknown_Debug_083C15BB:: @ 0x83C15BB + .string "SYSーKAIWAーUSED$" + +gUnknown_Debug_083C15CA:: @ 0x83C15CA + .string "SYSーNOWーOYAJIーMEET$" + +gUnknown_Debug_083C15DD:: @ 0x83C15DD + .string "SYSーUSEーWAZAーFLASH$" + +gUnknown_Debug_083C15F0:: @ 0x83C15F0 + .string "SYSーUSEーWAZAーKAIRIKI$" + +gUnknown_Debug_083C1605:: @ 0x83C1605 + .string "SYSーWEATHERーCTRL$" + +gUnknown_Debug_083C1616:: @ 0x83C1616 + .string "SYSーCYCLINGーROAD$" + +gUnknown_Debug_083C1627:: @ 0x83C1627 + .string "SYSーSAFARIーMODE$" + +gUnknown_Debug_083C1637:: @ 0x83C1637 + .string "SYSーCRUISEーMODE$" + + .align 2 +gUnknown_Debug_083C1647:: @ 0x83C1647 + .4byte gUnknown_Debug_083C15AC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C15BB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C15CA, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C15DD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C15F0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1605, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1616, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1627, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1637, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1690:: @ 0x83C1690 + .string "SYSーTVーHOME$" + +gUnknown_Debug_083C169C:: @ 0x83C169C + .string "SYSーTVーWATCH$" + +gUnknown_Debug_083C16A9:: @ 0x83C16A9 + .string "SYSーTVSTART$" + +gUnknown_Debug_083C16B5:: @ 0x83C16B5 + .string "SYSーPOPWORDーINPUT$" + +gUnknown_Debug_083C16C7:: @ 0x83C16C7 + .string "SYSーMIXーRECORD$" + +gUnknown_Debug_083C16D6:: @ 0x83C16D6 + .string "SYSーCLOCKーSET$" + +gUnknown_Debug_083C16E4:: @ 0x83C16E4 + .string "SYSーCAVEーSHIP$" + +gUnknown_Debug_083C16F2:: @ 0x83C16F2 + .string "SYSーCAVEーWONDER$" + +gUnknown_Debug_083C1702:: @ 0x83C1702 + .string "SYSーCAVEーBATTLE$" + + .align 2 +gUnknown_Debug_083C1712:: @ 0x83C1712 + .4byte gUnknown_Debug_083C1690, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C169C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C16A9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C16B5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C16C7, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C16D6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C16E4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C16F2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1702, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C175C:: @ 0x83C175C + .string "SYSーSPECIALーZUKAN$" + +gUnknown_Debug_083C176E:: @ 0x83C176E + .string "SYSーASASEーTIDE$" + +gUnknown_Debug_083C177D:: @ 0x83C177D + .string "SYSーRIBBONーGET$" + +gUnknown_Debug_083C178C:: @ 0x83C178C + .string "SYSーPASOーMAYUMI$" + +gUnknown_Debug_083C179C:: @ 0x83C179C + .string "SYSーEXDATAーENABLE$" + +gUnknown_Debug_083C17AE:: @ 0x83C17AE + .string "SYSーTENJIーANAWOHORU$" + +gUnknown_Debug_083C17C2:: @ 0x83C17C2 + .string "SYSーTENJIーKAIRIKI$" + +gUnknown_Debug_083C17D4:: @ 0x83C17D4 + .string "SYSーTENJIーWAIT$" + +gUnknown_Debug_083C17E3:: @ 0x83C17E3 + .string "SYSーTENJIーSORAWOTOBU$" + +gUnknown_Debug_083C17F8:: @ 0x83C17F8 + .4byte gUnknown_Debug_083C175C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C176E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C177D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C178C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C179C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C17AE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C17C2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C17D4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C17E3, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1840:: @ 0x83C1840 + .string "SYSーENCーUPーITEM$" + +gUnknown_Debug_083C1850:: @ 0x83C1850 + .string "SYSーENEーDOWNーITEM$" + +gUnknown_Debug_083C1862:: @ 0x83C1862 + .string "SYSーKOKOROーEVENT$" + +gUnknown_Debug_083C1873:: @ 0x83C1873 + .string "SYSーMOVEーPOKEーNEWS$" + +gUnknown_Debug_083C1886:: @ 0x83C1886 + .string "SYSーASASEーITEM$" + +gUnknown_Debug_083C1895:: @ 0x83C1895 + .string "SYSーBーDASH$" + +gUnknown_Debug_083C18A0:: @ 0x83C18A0 + .string "SYSーCTRLーOBJーDELETE$" + +gUnknown_Debug_083C18B4:: @ 0x83C18B4 + .string "$" + +gUnknown_Debug_083C18B5:: @ 0x83C18B5 + .string "$" + + .align 2 +gUnknown_Debug_083C18B8:: @ 0x83C18B8 + .4byte gUnknown_Debug_083C1840, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1850, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1862, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1873, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1886, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1895, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C18A0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C18B4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C18B5, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1900:: @ 0x83C1900 + .string "SYSーARRIVEーSUBMARINECAVE$" + +gUnknown_Debug_083C1919:: @ 0x83C1919 + .string "SYSーARRIVEーBATTLETOWER$" + +gUnknown_Debug_083C1930:: @ 0x83C1930 + .string "SYSーARRIVEーISLAND$" + +gUnknown_Debug_083C1942:: @ 0x83C1942 + .string "SYSーARRIVEーLEAGUE$" + +gUnknown_Debug_083C1954:: @ 0x83C1954 + .string "SYSーARRIVEーSORANOHASHIRA$" + +gUnknown_Debug_083C196D:: @ 0x83C196D + .string "$" + +gUnknown_Debug_083C196E:: @ 0x83C196E + .string "$" + +gUnknown_Debug_083C196F:: @ 0x83C196F + .string "$" + +gUnknown_Debug_083C1970:: @ 0x83C1970 + .string "$" + + .align 2 +gDebug_0x83C1974:: @ 0x83C1974 + .4byte gUnknown_Debug_083C1900, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1919, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1930, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1942, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1954, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C196D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C196E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C196F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1970, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C19BC:: @ 0x83C19BC + .incbin "baserom_de_debug.gba", 0x3C19BC, 10 + +gUnknown_Debug_083C19C6:: @ 0x83C19C6 + .incbin "baserom_de_debug.gba", 0x3C19C6, 162 + + +gDebug_0x83C1A68:: @ 0x83C1A68 + .string "FVーBALL パート1$" + + .align 2 +gUnknown_Debug_083C1A78:: @ 0x83C1A78 + .4byte gDebug_0x83C1A68, debug_sub_808D8D8+1 + +gUnknown_Debug_083C1A80:: @ 0x83C1A80 + .string "FVーBALL1ー78$" + +gUnknown_Debug_083C1A8C:: @ 0x83C1A8C + .string "FVーBALL1ー133$" + + .align 2 +gUnknown_Debug_083C1A9C:: @ 0x83C1A9C + .4byte gUnknown_Debug_083C1A80, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1A8C, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1AAC:: @ 0x83C1AAC + .string "い ょえヘえ              " + +gUnknown_Debug_083C1AC0:: @ 0x83C1AC0 + .string "ジムリーダー$" + +gUnknown_Debug_083C1AC7:: @ 0x83C1AC7 + .string "してんのう$" + +gUnknown_Debug_083C1ACD:: @ 0x83C1ACD + .string "みつる/Champロード$" + + .align 2 +gUnknown_Debug_083C1ADC:: @ 0x83C1ADC + .4byte gUnknown_Debug_083C1AC0, debug_sub_808CD08+1 + .4byte gUnknown_Debug_083C1AC7, debug_sub_808CD60+1 + .4byte gUnknown_Debug_083C1ACD, debug_sub_808CDB8+1 + +gUnknown_Debug_083C1AF4:: @ 0x83C1AF4 + .string "FTーGYMー01ーLEADER$" + +gUnknown_Debug_083C1B05:: @ 0x83C1B05 + .string "FTーGYMー02ーLEADER$" + +gUnknown_Debug_083C1B16:: @ 0x83C1B16 + .string "FTーGYMー03ーLEADER$" + +gUnknown_Debug_083C1B27:: @ 0x83C1B27 + .string "FTーGYMー04ーLEADER$" + +gUnknown_Debug_083C1B38:: @ 0x83C1B38 + .string "FTーGYMー05ーLEADER$" + +gUnknown_Debug_083C1B49:: @ 0x83C1B49 + .string "FTーGYMー06ーLEADER$" + +gUnknown_Debug_083C1B5A:: @ 0x83C1B5A + .string "FTーGYMー07ーLEADER$" + +gUnknown_Debug_083C1B6B:: @ 0x83C1B6B + .string "FTーGYMー08ーLEADER$" + +gUnknown_Debug_083C1B7C:: @ 0x83C1B7C + .4byte gUnknown_Debug_083C1AF4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1B05, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1B16, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1B27, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1B38, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1B49, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1B5A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1B6B, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1BBC:: @ 0x83C1BBC + .string "FTーSHITENー01$" + +gUnknown_Debug_083C1BC9:: @ 0x83C1BC9 + .string "FTーSHITENー02$" + +gUnknown_Debug_083C1BD6:: @ 0x83C1BD6 + .string "FTーSHITENー03$" + +gUnknown_Debug_083C1BE3:: @ 0x83C1BE3 + .string "FTーSHITENー04$" + +gUnknown_Debug_083C1BF0:: @ 0x83C1BF0 + .4byte gUnknown_Debug_083C1BBC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1BC9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1BD6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1BE3, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1C10:: @ 0x83C1C10 + .string "FTーMITSURUー01ーCAVEーD1301$" + + .align 2 +gUnknown_Debug_083C1C2C:: @ 0x83C1C2C + .4byte gUnknown_Debug_083C1C10, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1C34:: @ 0x83C1C34 + .string "くえあ “え’え,えCえGえOえSえZえ  iえjえkえlえ          mえ                " + +gUnknown_Debug_083C1C6E:: @ 0x83C1C6E + .string "120/119ばんどうろカクレオン$" + +gUnknown_Debug_083C1C80:: @ 0x83C1C80 + .string "そのた1 / SUPPORTM/W$" + +gUnknown_Debug_083C1C92:: @ 0x83C1C92 + .string "ODAMAKI/FIGHTER1$" + +gUnknown_Debug_083C1CA3:: @ 0x83C1CA3 + .string "MITSURU/TENKI$" + +gUnknown_Debug_083C1CB1:: @ 0x83C1CB1 + .string "そのた2 /DAIGO$" + +gUnknown_Debug_083C1CBD:: @ 0x83C1CBD + .string "POKE/POKEMON$" + +gUnknown_Debug_083C1CCA:: @ 0x83C1CCA + .string "MAMA/SUPPORT02$" + +gUnknown_Debug_083C1CD9:: @ 0x83C1CD9 + .string "HAGI$" + +gUnknown_Debug_083C1CDE:: @ 0x83C1CDE + .string "SUPPORT01$" + +gUnknown_Debug_083C1CE8:: @ 0x83C1CE8 + .4byte gUnknown_Debug_083C1C6E, debug_sub_808C85C+1 + .4byte gUnknown_Debug_083C1C80, debug_sub_808C8B4+1 + .4byte gUnknown_Debug_083C1C92, debug_sub_808C90C+1 + .4byte gUnknown_Debug_083C1CA3, debug_sub_808C964+1 + .4byte gUnknown_Debug_083C1CB1, debug_sub_808C9BC+1 + .4byte gUnknown_Debug_083C1CBD, debug_sub_808CA14+1 + .4byte gUnknown_Debug_083C1CCA, debug_sub_808CA6C+1 + .4byte gUnknown_Debug_083C1CD9, debug_sub_808CAC4+1 + .4byte gUnknown_Debug_083C1CDE, debug_sub_808CB1C+1 + +gUnknown_Debug_083C1D30:: @ 0x83C1D30 + .string "FVーKAKUREONBー01ーFIELDーR120$" + +gUnknown_Debug_083C1D4B:: @ 0x83C1D4B + .string "FVーKAKUREー01ーFIELDーR120$" + +gUnknown_Debug_083C1D63:: @ 0x83C1D63 + .string "FVーKAKUREー02ーFIELDーR120$" + +gUnknown_Debug_083C1D7B:: @ 0x83C1D7B + .string "FVーKAKUREー03ーFIELDーR120$" + +gUnknown_Debug_083C1D93:: @ 0x83C1D93 + .string "FVーKAKUREー04ーFIELDーR120$" + +gUnknown_Debug_083C1DAB:: @ 0x83C1DAB + .string "FVーKAKUREー05ーFIELDーR120$" + +gUnknown_Debug_083C1DC3:: @ 0x83C1DC3 + .string "FVーKAKUREー06ーFIELDーR120$" + +gUnknown_Debug_083C1DDB:: @ 0x83C1DDB + .string "FVーKAKUREー01ーFIELDーR119$" + +gUnknown_Debug_083C1DF3:: @ 0x83C1DF3 + .string "FVーKAKUREー02ーFIELDーR119$" + + .align 2 +gUnknown_Debug_083C1E0C:: @ 0x83C1E0C + .4byte gUnknown_Debug_083C1D30, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1D4B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1D63, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1D7B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1D93, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1DAB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1DC3, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1DDB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1DF3, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1E54:: @ 0x83C1E54 + .string "FVーBALLー01ーC107ーR0501$" + +gUnknown_Debug_083C1E6A:: @ 0x83C1E6A + .string "FVーWORKERM1ー04ーFIELDーC104$" + +gUnknown_Debug_083C1E84:: @ 0x83C1E84 + .string "FVーSUBMARINEー06ーCAVEーD1101$" + +gUnknown_Debug_083C1E9F:: @ 0x83C1E9F + .string "FVーGUESTーALLーC106ーR0102$" + +gUnknown_Debug_083C1EB7:: @ 0x83C1EB7 + .string "FVーHORIDASIー01ーC106ーR1106$" + +gUnknown_Debug_083C1ED1:: @ 0x83C1ED1 + .string "FVーMIDDLEM1ー01ーR110ーR0101$" + +gUnknown_Debug_083C1EEB:: @ 0x83C1EEB + .string "FVーFUNEー01ーC102ーR0601$" + +gUnknown_Debug_083C1F01:: @ 0x83C1F01 + .string "FVーSUPPORTWー01ーT101ーR0202$" + +gUnknown_Debug_083C1F1B:: @ 0x83C1F1B + .string "FVーSUPPORTMー01ーT101ーR0102$" + + .align 2 +gUnknown_Debug_083C1F38:: @ 0x83C1F38 + .4byte gUnknown_Debug_083C1E54, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1E6A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1E84, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1E9F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1EB7, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1ED1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1EEB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1F01, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1F1B, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C1F80:: @ 0x83C1F80 + .string "FVーODAMAKIー01ーFIELDーR101$" + +gUnknown_Debug_083C1F99:: @ 0x83C1F99 + .string "FVーODAMAKIー01ーT101ーR0301$" + +gUnknown_Debug_083C1FB2:: @ 0x83C1FB2 + .string "FVーODAMAKIーHYOKAーT101ーR0301$" + +gUnknown_Debug_083C1FCE:: @ 0x83C1FCE + .string "FVーODAMAKIーHYOKAーFIELDーR101$" + +gUnknown_Debug_083C1FEA:: @ 0x83C1FEA + .string "FVーODAMAKIーHYOKAーFIELDーR103$" + +gUnknown_Debug_083C2006:: @ 0x83C2006 + .string "FVーODAMAKIー01ーC109ーR0105$" + +gUnknown_Debug_083C201F:: @ 0x83C201F + .string "FVーFIGHTERー01ーCAVEーD0201$" + +gUnknown_Debug_083C2038:: @ 0x83C2038 + .string "FVーFIGHTERー01ーT106ーR0201$" + +gUnknown_Debug_083C2051:: @ 0x83C2051 + .string "FVーFIGHTERー01ーFIELDーR116$" + + .align 2 +gUnknown_Debug_083C206C:: @ 0x83C206C + .4byte gUnknown_Debug_083C1F80, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1F99, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1FB2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1FCE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C1FEA, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2006, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C201F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2038, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2051, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C20B4:: @ 0x83C20B4 + .string "FVーMITSURUー01ーFIELDーC101$" + +gUnknown_Debug_083C20CD:: @ 0x83C20CD + .string "FVーMITSURUー02ーCAVEーD1301$" + +gUnknown_Debug_083C20E6:: @ 0x83C20E6 + .string "FVーMITSURUー01ーFIELDーC103$" + +gUnknown_Debug_083C20FF:: @ 0x83C20FF + .string "FVーMITSURUー01ーT106ーR0201$" + +gUnknown_Debug_083C2118:: @ 0x83C2118 + .string "FVーMITSURUー01ーCAVEーD1301$" + +gUnknown_Debug_083C2131:: @ 0x83C2131 + .string "FVーMITSURUー01ーC101ーR0201$" + +gUnknown_Debug_083C214A:: @ 0x83C214A + .string "FVーMITSURUー01ーFIELDーR102$" + +gUnknown_Debug_083C2163:: @ 0x83C2163 + .string "FVーTENKIー01ーR119ーR101$" + +gUnknown_Debug_083C2179:: @ 0x83C2179 + .string "FVーTENKIー01ーR119ーR102$" + + .align 2 +gUnknown_Debug_083C2190:: @ 0x83C2190 + .4byte gUnknown_Debug_083C20B4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C20CD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C20E6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C20FF, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2118, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2131, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C214A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2163, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2179, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C21D8:: @ 0x83C21D8 + .string "FVーDAIGOー01ーCAVEーD0504$" + +gUnknown_Debug_083C21EF:: @ 0x83C21EF + .string "FVーDAIGOー01ーFIELDーR128$" + +gUnknown_Debug_083C2206:: @ 0x83C2206 + .string "FVーDAIGOー01ーFIELDーR118$" + +gUnknown_Debug_083C221D:: @ 0x83C221D + .string "FVーDAIGOー01ーC107ーR0501$" + +gUnknown_Debug_083C2234:: @ 0x83C2234 + .string "FVーDAIGOー01ーFIELDーR120$" + +gUnknown_Debug_083C224B:: @ 0x83C224B + .string "FVーDAIGOー01ーFIELDーR108$" + + .align 2 +gUnknown_Debug_083C2264:: @ 0x83C2264 + .4byte gUnknown_Debug_083C21D8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C21EF, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2206, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C221D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2234, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C224B, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2294:: @ 0x83C2294 + .string "FVーPOKE1ー02ーCAVEーD1111$" + +gUnknown_Debug_083C22AB:: @ 0x83C22AB + .string "FVーPOKE1ー01ーCAVEーD0601$" + +gUnknown_Debug_083C22C2:: @ 0x83C22C2 + .string "FVーPOKE1ー02ーCAVEーD0601$" + +gUnknown_Debug_083C22D9:: @ 0x83C22D9 + .string "FVーPOKE1ー01ーFIELDーR101$" + +gUnknown_Debug_083C22F0:: @ 0x83C22F0 + .string "FVーPOKE1ー01ーOPENINGーROOM01$" + +gUnknown_Debug_083C230B:: @ 0x83C230B + .string "FVーPOKE1ー02ーOPENINGーROOM01$" + +gUnknown_Debug_083C2326:: @ 0x83C2326 + .string "FVーPOKE1ー01ーCAVEーD2308$" + +gUnknown_Debug_083C233D:: @ 0x83C233D + .string "FVーPOKEMONー01ーCAVEーD0201$" + +gUnknown_Debug_083C2356:: @ 0x83C2356 + .string "FVーPOKEMONー01ーR104ーR0101$" + + .align 2 +gUnknown_Debug_083C2370:: @ 0x83C2370 + .4byte gUnknown_Debug_083C2294, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C22AB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C22C2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C22D9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C22F0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C230B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2326, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C233D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2356, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C23B8:: @ 0x83C23B8 + .string "FVーMAMAー01ーFIELDーT101$" + +gUnknown_Debug_083C23CE:: @ 0x83C23CE + .string "FVーMAMAー01ーOPENINGーROOM02$" + +gUnknown_Debug_083C23E8:: @ 0x83C23E8 + .string "FVーMAMAー01ーT101ーR0101$" + +gUnknown_Debug_083C23FE:: @ 0x83C23FE + .string "FVーMAMAー01ーT101ーR0201$" + +gUnknown_Debug_083C2414:: @ 0x83C2414 + .string "FVーMAMAー02ーT101ーR0101$" + +gUnknown_Debug_083C242A:: @ 0x83C242A + .string "FVーMAMAー02ーT101ーR0201$" + +gUnknown_Debug_083C2440:: @ 0x83C2440 + .string "FVーSUPPORTー02ーFIELDーR110$" + +gUnknown_Debug_083C2459:: @ 0x83C2459 + .string "FVーSUPPORTー02ーFIELDーR119$" + +gUnknown_Debug_083C2472:: @ 0x83C2472 + .string "FVーSUPPORTー02ーFIELDーT104$" + + .align 2 +gUnknown_Debug_083C248C:: @ 0x83C248C + .4byte gUnknown_Debug_083C23B8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C23CE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C23E8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C23FE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2414, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C242A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2440, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2459, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2472, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C24D4:: @ 0x83C24D4 + .string "FVーHAGIー01ーFIELDーR104$" + +gUnknown_Debug_083C24EA:: @ 0x83C24EA + .string "FVーHAGIー01ーR104ーR0101$" + +gUnknown_Debug_083C2500:: @ 0x83C2500 + .string "FVーHAGIー01ーFIELDーT103$" + +gUnknown_Debug_083C2516:: @ 0x83C2516 + .string "FVーHAGIー01ーFIELDーR109$" + +gUnknown_Debug_083C252C:: @ 0x83C252C + .string "FVーHAGIー01ーC102ーR0601$" + +gUnknown_Debug_083C2542:: @ 0x83C2542 + .string "FVーHAGIー01ーC102ーR0101$" + +gUnknown_Debug_083C2558:: @ 0x83C2558 + .string "FVーHAGIー01ーCAVEーD0201$" + +gUnknown_Debug_083C256E:: @ 0x83C256E + .string "FVーHAGIー01ーFIELDーR116$" + +gUnknown_Debug_083C2584:: @ 0x83C2584 + .string "FVーHAGIー01ーSPーSHIP01$" + + .align 2 +gUnknown_Debug_083C259C:: @ 0x83C259C + .4byte gUnknown_Debug_083C24D4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C24EA, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2500, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2516, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C252C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2542, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2558, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C256E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2584, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C25E4:: @ 0x83C25E4 + .string "FVーSUPPORTー01ーT101ーR0301$" + +gUnknown_Debug_083C25FD:: @ 0x83C25FD + .string "FVーSUPPORTー01ーC109ーR0105$" + +gUnknown_Debug_083C2616:: @ 0x83C2616 + .string "FVーSUPPORTー01ーFIELDーC104$" + +gUnknown_Debug_083C262F:: @ 0x83C262F + .string "FVーSUPPORTー01ーFIELDーC106$" + +gUnknown_Debug_083C2648:: @ 0x83C2648 + .string "FVーSUPPORTー01ーFIELDーR103$" + +gUnknown_Debug_083C2661:: @ 0x83C2661 + .string "FVーSUPPORTー01ーFIELDーR110$" + +gUnknown_Debug_083C267A:: @ 0x83C267A + .string "FVーSUPPORTー01ーFIELDーR119$" + +gUnknown_Debug_083C2693:: @ 0x83C2693 + .string "FVーSUPPORTー01ーFIELDーT104$" + +gUnknown_Debug_083C26AC:: @ 0x83C26AC + .string "FVーSUPPORTー01ーFIELDーT102$" + + .align 2 +gUnknown_Debug_083C26C8:: @ 0x83C26C8 + .4byte gUnknown_Debug_083C25E4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C25FD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2616, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C262F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2648, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2661, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C267A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2693, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C26AC, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2710:: @ 0x83C2710 + .string "けけけけかけけけけ aうPうbうeうfうgうhうiうjうNうhいZうプうHうネうイうXい{0xF8}いVいWいィうゥうェうベうらうりうンうbい▶いやうようコうツうテうワうヲうだうぢうLうMうRうSう      iいmいxいzいÖいÜいおうミうムう:いöいüい{0xF7}いせうそうボうパう1うnいoいpいqいぽうナうマうロう♀うルうブうんうQうYいビうウう0うYう" + +gUnknown_Debug_083C27BC:: @ 0x83C27BC + .string "FEひでんわざ/デボンかんれん$" + +gUnknown_Debug_083C27CC:: @ 0x83C27CC + .string "FEだいじなアイテムPART1$" + +gUnknown_Debug_083C27DC:: @ 0x83C27DC + .string "そのた1$" + +gUnknown_Debug_083C27E1:: @ 0x83C27E1 + .string "MITSURU/DOOR$" + +gUnknown_Debug_083C27EE:: @ 0x83C27EE + .string "カラクリやしき10のやじるし/GYM07$" + +gUnknown_Debug_083C2803:: @ 0x83C2803 + .string "SUPPORT/そのた4$" + +gUnknown_Debug_083C2810:: @ 0x83C2810 + .string "DAISUKI/そのた5$" + +gUnknown_Debug_083C281D:: @ 0x83C281D + .string "そのた2$" + +gUnknown_Debug_083C2822:: @ 0x83C2822 + .string "そのた6$" + + .align 2 +gUnknown_Debug_083C2828:: @ 0x83C2828 + .4byte gUnknown_Debug_083C27BC, debug_sub_808C3B0+1 + .4byte gUnknown_Debug_083C27CC, debug_sub_808C408+1 + .4byte gUnknown_Debug_083C27DC, debug_sub_808C460+1 + .4byte gUnknown_Debug_083C27E1, debug_sub_808C4B8+1 + .4byte gUnknown_Debug_083C27EE, debug_sub_808C510+1 + .4byte gUnknown_Debug_083C2803, debug_sub_808C568+1 + .4byte gUnknown_Debug_083C2810, debug_sub_808C5C0+1 + .4byte gUnknown_Debug_083C281D, debug_sub_808C618+1 + .4byte gUnknown_Debug_083C2822, debug_sub_808C670+1 + +gUnknown_Debug_083C2870:: @ 0x83C2870 + .string "FEーHWAZA01ーGET$" + +gUnknown_Debug_083C287F:: @ 0x83C287F + .string "FEーHWAZA02ー01ーFIELDR119$" + +gUnknown_Debug_083C2897:: @ 0x83C2897 + .string "FEーHWAZA03ーGET$" + +gUnknown_Debug_083C28A6:: @ 0x83C28A6 + .string "FEーHWAZA04ー01ーT106ーR0201$" + +gUnknown_Debug_083C28BF:: @ 0x83C28BF + .string "FEーHWAZA05ー01ーCAVEーD0502$" + +gUnknown_Debug_083C28D8:: @ 0x83C28D8 + .string "FEーHWAZA04ー01ーC103ーR0301$" + +gUnknown_Debug_083C28F1:: @ 0x83C28F1 + .string "FEーDEBONーNIMOTSUーRETURN$" + +gUnknown_Debug_083C2909:: @ 0x83C2909 + .string "FEーDEBONー01ーFIELDーC104$" + +gUnknown_Debug_083C2920:: @ 0x83C2920 + .string "FEーDEBONー02ーFIELDーC104$" + + .align 2 +gUnknown_Debug_083C2938:: @ 0x83C2938 + .4byte gUnknown_Debug_083C2870, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C287F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2897, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C28A6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C28BF, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C28D8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C28F1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2909, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2920, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2980:: @ 0x83C2980 + .string "FEーCYCLEー01ーP01ーP01ーC103ーR0201$" + +gUnknown_Debug_083C299F:: @ 0x83C299F + .string "FEーSCOOPー01ーP01ーFIELDーR115$" + +gUnknown_Debug_083C29BA:: @ 0x83C29BA + .string "FEーROPEー01ーP01ーFIELDーR114$" + +gUnknown_Debug_083C29D4:: @ 0x83C29D4 + .string "FEーKAMAー01ーP01ーFIELDーR119$" + +gUnknown_Debug_083C29EE:: @ 0x83C29EE + .string "FEーZYOUROーGET$" + +gUnknown_Debug_083C29FC:: @ 0x83C29FC + .string "FEーCUBECASEーGET$" + +gUnknown_Debug_083C2A0C:: @ 0x83C2A0C + .string "FEーBORONOTURIZAOーGET$" + +gUnknown_Debug_083C2A21:: @ 0x83C2A21 + .string "FEーIITURIZAOーGET$" + +gUnknown_Debug_083C2A32:: @ 0x83C2A32 + .string "FEーSUGOITURIZAOーGET$" + + .align 2 +gUnknown_Debug_083C2A48:: @ 0x83C2A48 + .4byte gUnknown_Debug_083C2980, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C299F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C29BA, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C29D4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C29EE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C29FC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2A0C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2A21, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2A32, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2A90:: @ 0x83C2A90 + .string "FEーBOSSー01ーCAVEーD0701$" + +gUnknown_Debug_083C2AA6:: @ 0x83C2AA6 + .string "FEーTANTIKIーRETURN$" + +gUnknown_Debug_083C2AB8:: @ 0x83C2AB8 + .string "FEーPOKE1ー01ーCAVEーD1111$" + +gUnknown_Debug_083C2ACF:: @ 0x83C2ACF + .string "FEーPOKE1ー01ーCAVEーD1206$" + +gUnknown_Debug_083C2AE6:: @ 0x83C2AE6 + .string "FEーSHOPー01ーC104ーFS01$" + +gUnknown_Debug_083C2AFB:: @ 0x83C2AFB + .string "FEーHUNENOTIKETTーGET$" + +gUnknown_Debug_083C2B0F:: @ 0x83C2B0F + .string "FEーKAKUREー01ーFIELDーC105$" + +gUnknown_Debug_083C2B27:: @ 0x83C2B27 + .string "FEーKASEKIーRETURN$" + +gUnknown_Debug_083C2B38:: @ 0x83C2B38 + .string "FEーWINー01ーSPーSHIP01$" + +gUnknown_Debug_083C2B4C:: @ 0x83C2B4C + .4byte gUnknown_Debug_083C2A90, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2AA6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2AB8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2ACF, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2AE6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2AFB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2B0F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2B27, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2B38, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2B94:: @ 0x83C2B94 + .string "FEーMITSURUー01ーT106ーR0201$" + +gUnknown_Debug_083C2BAD:: @ 0x83C2BAD + .string "FEーMITSURUー01ーCAVEーD1301$" + +gUnknown_Debug_083C2BC6:: @ 0x83C2BC6 + .string "FEーMITSURUー02ーFIELDーC103$" + +gUnknown_Debug_083C2BDF:: @ 0x83C2BDF + .string "FEーMITSURUー02ーT106ーR0201$" + +gUnknown_Debug_083C2BF8:: @ 0x83C2BF8 + .string "FEーMITSURUー01ーFIELDーC103$" + +gUnknown_Debug_083C2C11:: @ 0x83C2C11 + .string "FEーDOORーOPENー01ーCAVEーD1712$" + +gUnknown_Debug_083C2C2C:: @ 0x83C2C2C + .string "FEーDOORーOPENー02ーCAVEーD1712$" + +gUnknown_Debug_083C2C47:: @ 0x83C2C47 + .string "FEーDOORーOPENー04ーCAVEーD1712$" + +gUnknown_Debug_083C2C62:: @ 0x83C2C62 + .string "FEーDOORーOPENー06ーCAVEーD1712$" + + .align 2 +gUnknown_Debug_083C2C80:: @ 0x83C2C80 + .4byte gUnknown_Debug_083C2B94, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2BAD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2BC6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2BDF, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2BF8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2C11, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2C2C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2C47, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2C62, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2CC8:: @ 0x83C2CC8 + .string "FEーKARAKURI10ーSWITCHー01$" + +gUnknown_Debug_083C2CE0:: @ 0x83C2CE0 + .string "FEーKARAKURI10ーSWITCHー02$" + +gUnknown_Debug_083C2CF8:: @ 0x83C2CF8 + .string "FEーKARAKURI10ーSWITCHー03$" + +gUnknown_Debug_083C2D10:: @ 0x83C2D10 + .string "FEーKARAKURI10ーSWITCHー04$" + +gUnknown_Debug_083C2D28:: @ 0x83C2D28 + .string "FEーKARAKURI10ーSWITCHー05$" + +gUnknown_Debug_083C2D40:: @ 0x83C2D40 + .string "FEーGYM07ーSWITCHー01$" + +gUnknown_Debug_083C2D53:: @ 0x83C2D53 + .string "FEーGYM07ーSWITCHー02$" + +gUnknown_Debug_083C2D66:: @ 0x83C2D66 + .string "FEーGYM07ーSWITCHー03$" + +gUnknown_Debug_083C2D79:: @ 0x83C2D79 + .string "FEーGYM07ーSWITCHー04$" + +gUnknown_Debug_083C2D8C:: @ 0x83C2D8C + .4byte gUnknown_Debug_083C2CC8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2CE0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2CF8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2D10, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2D28, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2D40, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2D53, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2D66, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2D79, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2DD4:: @ 0x83C2DD4 + .string "FEーSUPPORTー01ーFIELDーR103$" + +gUnknown_Debug_083C2DED:: @ 0x83C2DED + .string "FEーSUPPORTー01ーFIELDーC106$" + +gUnknown_Debug_083C2E06:: @ 0x83C2E06 + .string "FEーSUPPORTー01ーFIELDーR104$" + +gUnknown_Debug_083C2E1F:: @ 0x83C2E1F + .string "FEーSUPPORTー02ーFIELDーC106$" + +gUnknown_Debug_083C2E38:: @ 0x83C2E38 + .string "FEーSUPPORTー01ーT101ーR0202$" + +gUnknown_Debug_083C2E51:: @ 0x83C2E51 + .string "FEーMAMAー01ーP01ーT101ーR0101$" + +gUnknown_Debug_083C2E6B:: @ 0x83C2E6B + .string "FEーCLOCKーSET$" + +gUnknown_Debug_083C2E78:: @ 0x83C2E78 + .string "FEーODAMAKIー01ーP01ーT101ーR03$" + +gUnknown_Debug_083C2E93:: @ 0x83C2E93 + .string "FEーPAPAー01ーP01ーC101ーR0201$" + + .align 2 +gUnknown_Debug_083C2EB0:: @ 0x83C2EB0 + .4byte gUnknown_Debug_083C2DD4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2DED, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2E06, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2E1F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2E38, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2E51, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2E6B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2E78, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2E93, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C2EF8:: @ 0x83C2EF8 + .string "FEーDAISUKIーGOODSーFLAG01$" + +gUnknown_Debug_083C2F10:: @ 0x83C2F10 + .string "FEーDAISUKIーGOODSーFLAG02$" + +gUnknown_Debug_083C2F28:: @ 0x83C2F28 + .string "FEーDAISUKIーGOODSーFLAG03$" + +gUnknown_Debug_083C2F40:: @ 0x83C2F40 + .string "FEーDAISUKIーGOODSーFLAG04$" + +gUnknown_Debug_083C2F58:: @ 0x83C2F58 + .string "FEーDAISUKIーGOODSーFLAG05$" + +gUnknown_Debug_083C2F70:: @ 0x83C2F70 + .string "FEーBASHAー01ーP01ーFIELDーC101ー$" + +gUnknown_Debug_083C2F8C:: @ 0x83C2F8C + .string "FEーBASHAー01ーP02ーFIELDーC101ー$" + +gUnknown_Debug_083C2FA8:: @ 0x83C2FA8 + .string "FEーBALLー01ーP01ーSPーCONTEST$" + +gUnknown_Debug_083C2FC2:: @ 0x83C2FC2 + .string "FEーWOMAN2ー01ーP01ーT101ーR0201$" + + .align 2 +gUnknown_Debug_083C2FE0:: @ 0x83C2FE0 + .4byte gUnknown_Debug_083C2EF8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2F10, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2F28, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2F40, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2F58, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2F70, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2F8C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2FA8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C2FC2, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C3028:: @ 0x83C3028 + .string "FEーSOUKOーOPENーCAVEーD1704$" + +gUnknown_Debug_083C3041:: @ 0x83C3041 + .string "FEーSORAISIー01ーCAVEーD0101$" + +gUnknown_Debug_083C305A:: @ 0x83C305A + .string "FEーMAYUMIー01ーーR114ーR0201$" + +gUnknown_Debug_083C3073:: @ 0x83C3073 + .string "FEーKUSUNOKIー01ーC102ーR0601$" + +gUnknown_Debug_083C308D:: @ 0x83C308D + .string "FEーOLDWOMAN1ー01ーCAVEーD0808$" + +gUnknown_Debug_083C30A8:: @ 0x83C30A8 + .string "FEーTRAINERM1ー01ーC109ーR0206$" + +gUnknown_Debug_083C30C3:: @ 0x83C30C3 + .string "FEーSOONANOーTAMAGOーGET$" + +gUnknown_Debug_083C30D9:: @ 0x83C30D9 + .string "FEーDASHーSHOESーGET$" + +gUnknown_Debug_083C30EB:: @ 0x83C30EB + .string "FEーDEBONSUKOOPUーGET$" + + .align 2 +gUnknown_Debug_083C3100:: @ 0x83C3100 + .4byte gUnknown_Debug_083C3028, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3041, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C305A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3073, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C308D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C30A8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C30C3, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C30D9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C30EB, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C3148:: @ 0x83C3148 + .string "FEーSTUDYM1ー01ーP01ーT101R0301$" + +gUnknown_Debug_083C3164:: @ 0x83C3164 + .string "FEーWORKERM1ー01ーC103ーR0201$" + +gUnknown_Debug_083C317E:: @ 0x83C317E + .string "FEーHIMITSUーGET$" + +gUnknown_Debug_083C318D:: @ 0x83C318D + .string "$" + +gUnknown_Debug_083C318E:: @ 0x83C318E + .string "$" + +gUnknown_Debug_083C318F:: @ 0x83C318F + .string "$" + +gUnknown_Debug_083C3190:: @ 0x83C3190 + .string "$" + +gUnknown_Debug_083C3191:: @ 0x83C3191 + .string "$" + +gUnknown_Debug_083C3192:: @ 0x83C3192 + .string "$" + + .align 2 +gUnknown_Debug_083C3194:: @ 0x83C3194 + .4byte gUnknown_Debug_083C3148, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3164, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C317E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C318D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C318E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C318F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3190, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3191, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3192, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C31DC:: @ 0x83C31DC + .string "けけけけけけけけう グ ホ レ ハ ヘ ヒ ゾ ズ ゼ コ サ シ ス セ ソ ああo ブ ゴ よあゥ ム  あもあらあさあ{0xF7} フ ン D G ふあ: Ä Ö Ü H I J K L ト ナ ニ ヌ ェ ほあみあやあゆあっ ア イ オ N O P Q R ウ エ カ キ ▶ ä ォ そあうあきあこあつあへあク ケ タ             " + +gUnknown_Debug_083C3288:: @ 0x83C3288 + .string "CYCLEかんれん$" + +gUnknown_Debug_083C3292:: @ 0x83C3292 + .string "おおきさくらべ$" + +gUnknown_Debug_083C329A:: @ 0x83C329A + .string "カウンタ$" + +gUnknown_Debug_083C329F:: @ 0x83C329F + .string "そのた1$" + +gUnknown_Debug_083C32A4:: @ 0x83C32A4 + .string "そのた2$" + + .align 2 +gUnknown_Debug_083C32AC:: @ 0x83C32AC + .4byte gUnknown_Debug_083C3288, debug_sub_808E400+1 + .4byte gUnknown_Debug_083C3292, debug_sub_808E458+1 + .4byte gUnknown_Debug_083C329A, debug_sub_808E4B0+1 + .4byte gUnknown_Debug_083C329F, debug_sub_808E508+1 + .4byte gUnknown_Debug_083C32A4, debug_sub_808E560+1 + +gUnknown_Debug_083C32D4:: @ 0x83C32D4 + .string "WKーCYCLEーROADーHIT$" + +gUnknown_Debug_083C32E6:: @ 0x83C32E6 + .string "WKーCYCLEーROADーTIMエ1$" + +gUnknown_Debug_083C32FA:: @ 0x83C32FA + .string "WKーCYCLEーROADーTIMエ2$" + +gUnknown_Debug_083C330E:: @ 0x83C330E + .string "WKーSIZEーKINOKOKOーOYAJI$" + +gUnknown_Debug_083C3325:: @ 0x83C3325 + .string "WKーSIZEーNAMAZOーOYAJI$" + +gUnknown_Debug_083C333A:: @ 0x83C333A + .string "WKーSPRAYーCOUNT$" + +gUnknown_Debug_083C3349:: @ 0x83C3349 + .string "WKーICEーCOUNT$" + +gUnknown_Debug_083C3356:: @ 0x83C3356 + .string "WKーASHーGATHERーCOUNT$" + +gUnknown_Debug_083C336A:: @ 0x83C336A + .string "WKーCRUISEーCOUNT$" + +gUnknown_Debug_083C337A:: @ 0x83C337A + .string "WKーFRIENDLYーSTEPーCOUNT$" + +gUnknown_Debug_083C3391:: @ 0x83C3391 + .string "WKーPOISONーSTEPーCOUNT$" + +gUnknown_Debug_083C33A6:: @ 0x83C33A6 + .string "WKRECYCLEーGOODS$" + +gUnknown_Debug_083C33B6:: @ 0x83C33B6 + .string "WKーFIRSTーPOKE$" + +gUnknown_Debug_083C33C4:: @ 0x83C33C4 + .string "WKーMABOROSIRNDーH$" + +gUnknown_Debug_083C33D5:: @ 0x83C33D5 + .string "WKーMABOROSIRNDーL$" + +gUnknown_Debug_083C33E6:: @ 0x83C33E6 + .string "EVーONEーDAYーWORK$" + +gUnknown_Debug_083C33F6:: @ 0x83C33F6 + .string "EVーFANWORK$" + +gUnknown_Debug_083C3401:: @ 0x83C3401 + .string "EVーFANTIME$" + +gUnknown_Debug_083C340C:: @ 0x83C340C + .string "WKーKARAKURIーLEVEL$" + +gUnknown_Debug_083C341E:: @ 0x83C341E + .string "WKーPOKELOTーPRIZE$" + +gUnknown_Debug_083C342F:: @ 0x83C342F + .string "WKーSPECIALーZUKN$" + +gUnknown_Debug_083C343F:: @ 0x83C343F + .string "WKーHYOUKAーDAYS$" + +gUnknown_Debug_083C344E:: @ 0x83C344E + .string "WKーPOKELOTーRND1$" + +gUnknown_Debug_083C345E:: @ 0x83C345E + .string "WKーPOKELOTーRND2$" + +gUnknown_Debug_083C346E:: @ 0x83C346E + .string "WKーBASEーMAPNO$" + + .align 2 +gUnknown_Debug_083C347C:: @ 0x83C347C + .4byte gUnknown_Debug_083C32D4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C32E6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C32FA, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C3494:: + .4byte gUnknown_Debug_083C330E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3325, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C34A4:: + .4byte gUnknown_Debug_083C333A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3349, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3356, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C336A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C337A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3391, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C34D4:: + .4byte gUnknown_Debug_083C33A6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C33B6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C33C4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C33D5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C33E6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C33F6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3401, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C340C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C341E, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C351C:: + .4byte gUnknown_Debug_083C342F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C343F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C344E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C345E, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C346E, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C3544:: @ 0x83C3544 + .string "ういかけお らぞりぞるぞ            びぞぽぞ              むぞめぞぶぞぼぞれぞろぞ      みぞもぞやぞゆぞぞぞだぞぢぞでぞどぞばぞべぞぱぞぴぞよぞ        " + +gUnknown_Debug_083C35A4:: @ 0x83C35A4 + .string "OBJCHRWORK0ー8$" + +gUnknown_Debug_083C35B2:: @ 0x83C35B2 + .string "OBJCHRWORK9ー15$" + + .align 2 +gUnknown_Debug_083C35C4:: @ 0x83C35C4 + .4byte gUnknown_Debug_083C35A4, debug_sub_808E9A0+1 + .4byte gUnknown_Debug_083C35B2, debug_sub_808E9F8+1 + +gUnknown_Debug_083C35D4:: @ 0x83C35D4 + .string "OBJCHRWORK1$" + +gUnknown_Debug_083C35E0:: @ 0x83C35E0 + .string "OBJCHRWORK2$" + +gUnknown_Debug_083C35EC:: @ 0x83C35EC + .string "OBJCHRWORK3$" + +gUnknown_Debug_083C35F8:: @ 0x83C35F8 + .string "OBJCHRWORK4$" + +gUnknown_Debug_083C3604:: @ 0x83C3604 + .string "OBJCHRWORK5$" + +gUnknown_Debug_083C3610:: @ 0x83C3610 + .string "OBJCHRWORK6$" + +gUnknown_Debug_083C361C:: @ 0x83C361C + .string "OBJCHRWORK7$" + +gUnknown_Debug_083C3628:: @ 0x83C3628 + .string "OBJCHRWORK8$" + +gUnknown_Debug_083C3634:: @ 0x83C3634 + .string "OBJCHRWORK9$" + +gUnknown_Debug_083C3640:: @ 0x83C3640 + .string "OBJCHRWORK10$" + +gUnknown_Debug_083C364D:: @ 0x83C364D + .string "OBJCHRWORK11$" + +gUnknown_Debug_083C365A:: @ 0x83C365A + .string "OBJCHRWORK12$" + +gUnknown_Debug_083C3667:: @ 0x83C3667 + .string "OBJCHRWORK13$" + +gUnknown_Debug_083C3674:: @ 0x83C3674 + .string "OBJCHRWORK14$" + +gUnknown_Debug_083C3681:: @ 0x83C3681 + .string "OBJCHRWORK15$" + +gUnknown_Debug_083C368E:: @ 0x83C368E + .string "OBJCHRWORK16$" + + .align 2 +gUnknown_Debug_083C369C:: @ 0x83C369C + .4byte gUnknown_Debug_083C35D4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C35E0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C35EC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C35F8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3604, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3610, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C361C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3628, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3634, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C36E4:: + .4byte gUnknown_Debug_083C3640, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C364D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C365A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3667, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3674, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3681, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C368E, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C371C:: @ 0x83C371C + .string "けきたぞちぞつぞてぞとぞなぞにぞぬぞねぞのぞはぞひぞふぞへぞほぞまぞ    " + +gUnknown_Debug_083C3742:: @ 0x83C3742 + .string "SP$" + +gUnknown_Debug_083C3745:: @ 0x83C3745 + .string "ルーム R110 PART1/カラクリ$" + +gUnknown_Debug_083C3759:: @ 0x83C3759 + .string "ルーム R110 PART2$" + +gUnknown_Debug_083C3768:: @ 0x83C3768 + .string "ルーム ロード$" + +gUnknown_Debug_083C3770:: @ 0x83C3770 + .string "ソノタ1$" + +gUnknown_Debug_083C3775:: @ 0x83C3775 + .string "ソノタ2$" + + .align 2 +gUnknown_Debug_083C377C:: @ 0x83C377C + .4byte gUnknown_Debug_083C3742, debug_sub_808E054+1 + .4byte gUnknown_Debug_083C3745, debug_sub_808E0AC+1 + .4byte gUnknown_Debug_083C3759, debug_sub_808E104+1 + .4byte gUnknown_Debug_083C3768, debug_sub_808E15C+1 + .4byte gUnknown_Debug_083C3770, debug_sub_808E1B4+1 + .4byte gUnknown_Debug_083C3775, debug_sub_808E20C+1 + +gUnknown_Debug_083C37AC:: @ 0x83C37AC + .string "WKーSCENEーSPーCONTEST$" + +gUnknown_Debug_083C37C0:: @ 0x83C37C0 + .string "WKーSCENEーSPーPC$" + +gUnknown_Debug_083C37CF:: @ 0x83C37CF + .string "WKーSCENEーSPーCONTEST03$" + +gUnknown_Debug_083C37E5:: @ 0x83C37E5 + .string "WKーSCENEーSPーCONTESTITEM$" + +gUnknown_Debug_083C37FD:: @ 0x83C37FD + .string "WKーSCENEーSPーOPENING$" + +gUnknown_Debug_083C3811:: @ 0x83C3811 + .string "WKーSCENEーSPーSHIP01$" + +gUnknown_Debug_083C3824:: @ 0x83C3824 + .string "$" + +gUnknown_Debug_083C3825:: @ 0x83C3825 + .string "$" + +gUnknown_Debug_083C3826:: @ 0x83C3826 + .string "$" + +gUnknown_Debug_083C3827:: @ 0x83C3827 + .string "WKーSCENEーR110ーR0101$" + +gUnknown_Debug_083C383B:: @ 0x83C383B + .string "WKーSCENEーR110ーR0102$" + +gUnknown_Debug_083C384F:: @ 0x83C384F + .string "WKーSCENEーR110ーR0103$" + +gUnknown_Debug_083C3863:: @ 0x83C3863 + .string "WKーKARAKURIーDAIOU$" + +gUnknown_Debug_083C3875:: @ 0x83C3875 + .string "WKーSCENEーSHISEN$" + +gUnknown_Debug_083C3885:: @ 0x83C3885 + .string "$" + +gUnknown_Debug_083C3886:: @ 0x83C3886 + .string "$" + +gUnknown_Debug_083C3887:: @ 0x83C3887 + .string "$" + +gUnknown_Debug_083C3888:: @ 0x83C3888 + .string "$" + +gUnknown_Debug_083C3889:: @ 0x83C3889 + .string "WKーSCENEーR110ーR0104$" + +gUnknown_Debug_083C389D:: @ 0x83C389D + .string "WKーSCENEーR110ーR0105$" + +gUnknown_Debug_083C38B1:: @ 0x83C38B1 + .string "WKーSCENEーR110ーR0106$" + +gUnknown_Debug_083C38C5:: @ 0x83C38C5 + .string "WKーSCENEーR110ーR0107$" + +gUnknown_Debug_083C38D9:: @ 0x83C38D9 + .string "WKーSCENEーR110ーR0108$" + +gUnknown_Debug_083C38ED:: @ 0x83C38ED + .string "WKーSCENEーR110ーR0109$" + +gUnknown_Debug_083C3901:: @ 0x83C3901 + .string "WKーSCENEーR110ーR0110$" + +gUnknown_Debug_083C3915:: @ 0x83C3915 + .string "WKーSCENEーR110ーR0111$" + +gUnknown_Debug_083C3929:: @ 0x83C3929 + .string "WKーSCENEー02ーR110ーR0110$" + +gUnknown_Debug_083C3940:: @ 0x83C3940 + .string "WKーSCENEーR104ーR0101$" + +gUnknown_Debug_083C3954:: @ 0x83C3954 + .string "WKーSCENEーR113ーR0101$" + +gUnknown_Debug_083C3968:: @ 0x83C3968 + .string "$" + +gUnknown_Debug_083C3969:: @ 0x83C3969 + .string "$" + +gUnknown_Debug_083C396A:: @ 0x83C396A + .string "$" + +gUnknown_Debug_083C396B:: @ 0x83C396B + .string "$" + +gUnknown_Debug_083C396C:: @ 0x83C396C + .string "$" + +gUnknown_Debug_083C396D:: @ 0x83C396D + .string "$" + +gUnknown_Debug_083C396E:: @ 0x83C396E + .string "$" + +gUnknown_Debug_083C396F:: @ 0x83C396F + .string "WKーSCENEーBASEーGDOODS$" + +gUnknown_Debug_083C3984:: @ 0x83C3984 + .string "WKーSCENEーHAGIーFUNE$" + +gUnknown_Debug_083C3997:: @ 0x83C3997 + .string "WKーSCENEーFUNEーPOS$" + +gUnknown_Debug_083C39A9:: @ 0x83C39A9 + .string "WKーSCENEーBASEーMAKE$" + +gUnknown_Debug_083C39BC:: @ 0x83C39BC + .string "WKーSCENEーARTISTーC106ーR$" + +gUnknown_Debug_083C39D3:: @ 0x83C39D3 + .string "WKーSCENEーPOKEーLEAGUE$" + +gUnknown_Debug_083C39E8:: @ 0x83C39E8 + .string "WKーSCENEーROPEWAY$" + +gUnknown_Debug_083C39F9:: @ 0x83C39F9 + .string "WKーSCENEーSAFARIーZONE$" + +gUnknown_Debug_083C3A0E:: @ 0x83C3A0E + .string "WKーSCENEーCYCLEーROAD$" + +gUnknown_Debug_083C3A22:: @ 0x83C3A22 + .string "WKーSCENEーR119ーTENKI$" + +gUnknown_Debug_083C3A36:: @ 0x83C3A36 + .string "WKーSCENEー01ーC102ーR0401$" + +gUnknown_Debug_083C3A4D:: @ 0x83C3A4D + .string "WKーFUTAGOー01ーFIELDーR104$" + +gUnknown_Debug_083C3A65:: @ 0x83C3A65 + .string "WKーSCENEーBATTLEーTOWER$" + +gUnknown_Debug_083C3A7B:: @ 0x83C3A7B + .string "WKーSCENEーTRーHOUSE$" + +gUnknown_Debug_083C3A8D:: @ 0x83C3A8D + .string "WKーKASEKIーTYPE$" + +gUnknown_Debug_083C3A9C:: @ 0x83C3A9C + .string "$" + +gUnknown_Debug_083C3A9D:: @ 0x83C3A9D + .string "$" + +gUnknown_Debug_083C3A9E:: @ 0x83C3A9E + .string "$" + + .align 2 +gUnknown_Debug_083C3AA0:: @ 0x83C3AA0 + .4byte gUnknown_Debug_083C37AC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C37C0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C37CF, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C37E5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C37FD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3811, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3824, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3825, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_83C3AE0:: @ 0x83C3AE0 + .4byte gUnknown_Debug_083C3827, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C383B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C384F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3863, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3875, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3885, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3886, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3887, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3888, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_83C3B28:: @ 0x83C3B28 + .4byte gUnknown_Debug_083C3889, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C389D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C38B1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C38C5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C38D9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C38ED, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3901, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3915, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3929, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_83C3B70:: @ 0x83C3B70 + .4byte gUnknown_Debug_083C3940, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3954, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3968, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3969, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C396A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C396B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C396C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C396D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C396E, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_83C3BB8:: + .4byte gUnknown_Debug_083C396F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3984, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3997, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C39A9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C39BC, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C39D3, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C39E8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C39F9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A0E, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_83C3C00:: + .4byte gUnknown_Debug_083C3A22, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A36, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A4D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A65, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A7B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A8D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A9C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A9D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3A9E, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C3C48:: @ 0x83C3C48 + .string "かおけいけかョぞガぞギぞゲぞヂぞ’ぞ      5ぞGぞ♂ぞ6ぞ4ぞ        !ぞ?ぞ。ぞーぞ·ぞ‥ぞ“ぞ”ぞ♀ぞゾぞDぞ              グぞズぞバぞビぞベぞピぞ2ぞ3ぞ8ぞ‘ぞ¥ぞAぞBぞFぞKぞ      " + +gUnknown_Debug_083C3CBA:: @ 0x83C3CBA + .string "タウン$" + +gUnknown_Debug_083C3CBE:: @ 0x83C3CBE + .string "シティ$" + +gUnknown_Debug_083C3CC2:: @ 0x83C3CC2 + .string "ロード101ー109$" + +gUnknown_Debug_083C3CCD:: @ 0x83C3CCD + .string "ロード110ー118$" + +gUnknown_Debug_083C3CD8:: @ 0x83C3CD8 + .string "ロード119ー127$" + +gUnknown_Debug_083C3CE3:: @ 0x83C3CE3 + .string "ロード128ー134$" + +gUnknown_Debug_083C3CEE:: @ 0x83C3CEE + .string "ルーム タウン$" + +gUnknown_Debug_083C3CF6:: @ 0x83C3CF6 + .string "ルーム シティ$" + +gUnknown_Debug_083C3CFE:: @ 0x83C3CFE + .string "ダンジョンない$" + + .align 2 +gUnknown_Debug_083C3D08:: @ 0x83C3D08 + .4byte gUnknown_Debug_083C3CBA, debug_sub_808DBA0+1 + .4byte gUnknown_Debug_083C3CBE, debug_sub_808DBF8+1 + .4byte gUnknown_Debug_083C3CC2, debug_sub_808DC50+1 + .4byte gUnknown_Debug_083C3CCD, debug_sub_808DCA8+1 + .4byte gUnknown_Debug_083C3CD8, debug_sub_808DD00+1 + .4byte gUnknown_Debug_083C3CE3, debug_sub_808DD58+1 + .4byte gUnknown_Debug_083C3CEE, debug_sub_808DDB0+1 + .4byte gUnknown_Debug_083C3CF6, debug_sub_808DE08+1 + .4byte gUnknown_Debug_083C3CFE, debug_sub_808DE60+1 + +gUnknown_Debug_083C3D50:: @ 0x83C3D50 + .string "WKーSCENEーFIELDーT101$" + +gUnknown_Debug_083C3D64:: @ 0x83C3D64 + .string "WKーSCENEーFIELDーT102$" + +gUnknown_Debug_083C3D78:: @ 0x83C3D78 + .string "WKーSCENEーFIELDーT103$" + +gUnknown_Debug_083C3D8C:: @ 0x83C3D8C + .string "WKーSCENEーFIELDーT104$" + +gUnknown_Debug_083C3DA0:: @ 0x83C3DA0 + .string "WKーBASEーPOSNO$" + +gUnknown_Debug_083C3DAE:: @ 0x83C3DAE + .string "WKーSCENEーFIELDーT106$" + +gUnknown_Debug_083C3DC2:: @ 0x83C3DC2 + .string "WKーSCENEーFIELDーT107$" + +gUnknown_Debug_083C3DD6:: @ 0x83C3DD6 + .string "WKーSCENEー02ーFIELDーT102$" + +gUnknown_Debug_083C3DED:: @ 0x83C3DED + .string "WKーSCENEーFIELDーC101$" + +gUnknown_Debug_083C3E01:: @ 0x83C3E01 + .string "WKーSCENEーFIELDーC102$" + +gUnknown_Debug_083C3E15:: @ 0x83C3E15 + .string "WKーSCENEーFIELDーC103$" + +gUnknown_Debug_083C3E29:: @ 0x83C3E29 + .string "WKーSCENEーFIELDーC104$" + +gUnknown_Debug_083C3E3D:: @ 0x83C3E3D + .string "WKーSCENEーFIELDーC105$" + +gUnknown_Debug_083C3E51:: @ 0x83C3E51 + .string "WKーSCENEーFIELDーC106$" + +gUnknown_Debug_083C3E65:: @ 0x83C3E65 + .string "WKーSCENEーFIELDーC107$" + +gUnknown_Debug_083C3E79:: @ 0x83C3E79 + .string "WKーSCENEーFIELDーC108$" + +gUnknown_Debug_083C3E8D:: @ 0x83C3E8D + .string "WKーSCENEーFIELDーC109$" + +gUnknown_Debug_083C3EA1:: @ 0x83C3EA1 + .string "WKーSCENEーFIELDーR101$" + +gUnknown_Debug_083C3EB5:: @ 0x83C3EB5 + .string "WKーSCENEーFIELDーR102$" + +gUnknown_Debug_083C3EC9:: @ 0x83C3EC9 + .string "WKーSCENEーFIELDーR103$" + +gUnknown_Debug_083C3EDD:: @ 0x83C3EDD + .string "WKーSCENEーFIELDーR104$" + +gUnknown_Debug_083C3EF1:: @ 0x83C3EF1 + .string "WKーSCENEーFIELDーR105$" + +gUnknown_Debug_083C3F05:: @ 0x83C3F05 + .string "WKーSCENEーFIELDーR106$" + +gUnknown_Debug_083C3F19:: @ 0x83C3F19 + .string "WKーSCENEーFIELDーR107$" + +gUnknown_Debug_083C3F2D:: @ 0x83C3F2D + .string "WKーSCENEーFIELDーR108$" + +gUnknown_Debug_083C3F41:: @ 0x83C3F41 + .string "WKーSCENEーFIELDーR109$" + +gUnknown_Debug_083C3F55:: @ 0x83C3F55 + .string "WKーSCENEーFIELDーR110$" + +gUnknown_Debug_083C3F69:: @ 0x83C3F69 + .string "WKーSCENEーFIELDーR111$" + +gUnknown_Debug_083C3F7D:: @ 0x83C3F7D + .string "WKーSCENEーFIELDーR112$" + +gUnknown_Debug_083C3F91:: @ 0x83C3F91 + .string "WKーSCENEーFIELDーR113$" + +gUnknown_Debug_083C3FA5:: @ 0x83C3FA5 + .string "WKーSCENEーFIELDーR114$" + +gUnknown_Debug_083C3FB9:: @ 0x83C3FB9 + .string "WKーSCENEーFIELDーR115$" + +gUnknown_Debug_083C3FCD:: @ 0x83C3FCD + .string "WKーSCENEーFIELDーR116$" + +gUnknown_Debug_083C3FE1:: @ 0x83C3FE1 + .string "WKーSCENEーFIELDーR117$" + +gUnknown_Debug_083C3FF5:: @ 0x83C3FF5 + .string "WKーSCENEーFIELDーR118$" + +gUnknown_Debug_083C4009:: @ 0x83C4009 + .string "WKーSCENEーFIELDーR119$" + +gUnknown_Debug_083C401D:: @ 0x83C401D + .string "WKーSCENEーFIELDーR120$" + +gUnknown_Debug_083C4031:: @ 0x83C4031 + .string "WKーSCENEーFIELDーR121$" + +gUnknown_Debug_083C4045:: @ 0x83C4045 + .string "WKーSCENEーFIELDーR122$" + +gUnknown_Debug_083C4059:: @ 0x83C4059 + .string "WKーSCENEーFIELDーR123$" + +gUnknown_Debug_083C406D:: @ 0x83C406D + .string "WKーSCENEーFIELDーR124$" + +gUnknown_Debug_083C4081:: @ 0x83C4081 + .string "WKーSCENEーFIELDーR125$" + +gUnknown_Debug_083C4095:: @ 0x83C4095 + .string "WKーSCENEーFIELDーR126$" + +gUnknown_Debug_083C40A9:: @ 0x83C40A9 + .string "WKーSCENEーFIELDーR127$" + +gUnknown_Debug_083C40BD:: @ 0x83C40BD + .string "WKーSCENEーFIELDーR128$" + +gUnknown_Debug_083C40D1:: @ 0x83C40D1 + .string "WKーSCENEーFIELDーR129$" + +gUnknown_Debug_083C40E5:: @ 0x83C40E5 + .string "WKーSCENEーFIELDーR130$" + +gUnknown_Debug_083C40F9:: @ 0x83C40F9 + .string "WKーSCENEーFIELDーR131$" + +gUnknown_Debug_083C410D:: @ 0x83C410D + .string "WKーSCENEーFIELDーR132$" + +gUnknown_Debug_083C4121:: @ 0x83C4121 + .string "WKーSCENEーFIELDーR133$" + +gUnknown_Debug_083C4135:: @ 0x83C4135 + .string "WKーSCENEーFIELDーR134$" + +gUnknown_Debug_083C4149:: @ 0x83C4149 + .string "WKーSCENEーT101ーR0101$" + +gUnknown_Debug_083C415D:: @ 0x83C415D + .string "WKーSCENEーT101ーR0102$" + +gUnknown_Debug_083C4171:: @ 0x83C4171 + .string "WKーSCENEーT101ーR0301$" + +gUnknown_Debug_083C4185:: @ 0x83C4185 + .string "WKーSCENEーT101ーR0201$" + +gUnknown_Debug_083C4199:: @ 0x83C4199 + .string "WKーSCENEーT101ーR0202$" + +gUnknown_Debug_083C41AD:: @ 0x83C41AD + .string "WKーSCENEーT107ーR0201$" + +gUnknown_Debug_083C41C1:: @ 0x83C41C1 + .string "WKーSCENEーC101ーR0201$" + +gUnknown_Debug_083C41D5:: @ 0x83C41D5 + .string "WKーSCENEーC104ーR0103$" + +gUnknown_Debug_083C41E9:: @ 0x83C41E9 + .string "WKーSCENEーC103ーR0101$" + +gUnknown_Debug_083C41FD:: @ 0x83C41FD + .string "WKーSCENEーC106ーR0202$" + +gUnknown_Debug_083C4211:: @ 0x83C4211 + .string "WKーSCENEーC106ーR0401$" + +gUnknown_Debug_083C4225:: @ 0x83C4225 + .string "WKーSCENEーC102ーR0601$" + +gUnknown_Debug_083C4239:: @ 0x83C4239 + .string "WKーSCENEーC102ーR0501$" + +gUnknown_Debug_083C424D:: @ 0x83C424D + .string "WKーSCENEーC104ーR0102$" + +gUnknown_Debug_083C4261:: @ 0x83C4261 + .string "WKーSCENEーC107ーR0501$" + +gUnknown_Debug_083C4275:: @ 0x83C4275 + .string "WKーSCENEーCAVEーD0601$" + +gUnknown_Debug_083C4289:: @ 0x83C4289 + .string "WKーSCENEーCAVEーD0201$" + +gUnknown_Debug_083C429D:: @ 0x83C429D + .string "WKーSCENEーCAVEーD1206$" + +gUnknown_Debug_083C42B1:: @ 0x83C42B1 + .string "WKーSCENEーCAVEーD1111$" + +gUnknown_Debug_083C42C5:: @ 0x83C42C5 + .string "WKーSCENEーCAVEーD0701$" + +gUnknown_Debug_083C42D9:: @ 0x83C42D9 + .string "WKーSCENEーCAVEーD0808$" + +gUnknown_Debug_083C42ED:: @ 0x83C42ED + .string "WKーSCENEーCAVEーD1602$" + +gUnknown_Debug_083C4301:: @ 0x83C4301 + .string "WKーSCENEーCAVEーD0101$" + +gUnknown_Debug_083C4315:: @ 0x83C4315 + .string "WKーSCENEーCAVEーD1301$" + + .align 2 +gUnknown_Debug_083C432C:: @ 0x83C432C + .4byte gUnknown_Debug_083C3D50, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3D64, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3D78, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3D8C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3DA0, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3DAE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3DC2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3DD6, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C436C:: + .4byte gUnknown_Debug_083C3DED, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E01, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E15, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E29, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E3D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E51, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E65, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E79, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3E8D, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C43B4:: + .4byte gUnknown_Debug_083C3EA1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3EB5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3EC9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3EDD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3EF1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3F05, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3F19, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3F2D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3F41, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C43FC:: + .4byte gUnknown_Debug_083C3F55, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3F69, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3F7D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3F91, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3FA5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3FB9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3FCD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3FE1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C3FF5, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C4444:: + .4byte gUnknown_Debug_083C4009, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C401D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4031, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4045, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4059, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C406D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4081, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4095, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C40A9, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C448C:: + .4byte gUnknown_Debug_083C40BD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C40D1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C40E5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C40F9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C410D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4121, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4135, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_83C44C4:: + .4byte gUnknown_Debug_083C4149, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C415D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4171, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4185, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4199, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_83C44EC:: + .4byte gUnknown_Debug_083C41C1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C41D5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C41E9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C41FD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4211, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4225, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4239, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C424D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4261, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C4534:: + .4byte gUnknown_Debug_083C4275, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4289, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C429D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C42B1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C42C5, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C42D9, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C42ED, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4301, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4315, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C457C:: @ 0x83C457C + .string "くけけけけきかけけ っぞアぞイぞウぞエぞオぞカぞMぞ  キぞクぞケぞコぞサぞシぞスぞセぞソぞタぞチぞツぞテぞトぞナぞニぞヌぞネぞノぞハぞヒぞフぞヘぞホぞマぞミぞムぞメぞモぞヤぞユぞヨぞラぞリぞルぞレぞロぞワぞヲぞンぞァぞィぞゥぞ    ェぞォぞャぞザぞジぞHぞ      ュぞゼぞヅぞデぞドぞッぞ9ぞJぞLぞブぞボぞパぞ1ぞ7ぞ×ぞ/ぞEぞIぞ" + +gUnknown_Debug_083C4628:: @ 0x83C4628 + .string "LOCALWORK0ー8$" + +gUnknown_Debug_083C4635:: @ 0x83C4635 + .string "LOCALWORK9ー15$" + + .align 2 +gUnknown_Debug_083C4644:: @ 0x83C4644 + .4byte gUnknown_Debug_083C4628, debug_sub_808E754+1 + .4byte gUnknown_Debug_083C4635, debug_sub_808E7AC+1 + +gUnknown_Debug_083C4654:: @ 0x83C4654 + .string "LOCALWORK0$" + +gUnknown_Debug_083C465F:: @ 0x83C465F + .string "LOCALWORK1$" + +gUnknown_Debug_083C466A:: @ 0x83C466A + .string "LOCALWORK2$" + +gUnknown_Debug_083C4675:: @ 0x83C4675 + .string "LOCALWORK3$" + +gUnknown_Debug_083C4680:: @ 0x83C4680 + .string "LOCALWORK4$" + +gUnknown_Debug_083C468B:: @ 0x83C468B + .string "LOCALWORK5$" + +gUnknown_Debug_083C4696:: @ 0x83C4696 + .string "LOCALWORK6$" + +gUnknown_Debug_083C46A1:: @ 0x83C46A1 + .string "LOCALWORK7$" + +gUnknown_Debug_083C46AC:: @ 0x83C46AC + .string "LOCALWORK8$" + +gUnknown_Debug_083C46B7:: @ 0x83C46B7 + .string "LOCALWORK9$" + +gUnknown_Debug_083C46C2:: @ 0x83C46C2 + .string "LOCALWORK10$" + +gUnknown_Debug_083C46CE:: @ 0x83C46CE + .string "LOCALWORK11$" + +gUnknown_Debug_083C46DA:: @ 0x83C46DA + .string "LOCALWORK12$" + +gUnknown_Debug_083C46E6:: @ 0x83C46E6 + .string "LOCALWORK13$" + +gUnknown_Debug_083C46F2:: @ 0x83C46F2 + .string "LOCALWORK14$" + +gUnknown_Debug_083C46FE:: @ 0x83C46FE + .string "LOCALWORK15$" + + .align 2 +gUnknown_Debug_083C470C:: @ 0x83C470C + .4byte gUnknown_Debug_083C4654, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C465F, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C466A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4675, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4680, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C468B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4696, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46A1, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46AC, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C4754C:: + .4byte gUnknown_Debug_083C46B7, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46C2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46CE, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46DA, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46E6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46F2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C46FE, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C478C:: @ 0x83C478C + .string "けき ぞあぞいぞうぞえぞおぞかぞきぞくぞけぞこぞさぞしぞすぞせぞそぞ    " + +gUnknown_Debug_083C47B2:: + .string "Level$" + +gUnknown_Debug_083C47B8:: @ 0x83C47B8 + .string "Scene1$" + +gUnknown_Debug_083C47BF:: @ 0x83C47BF + .string "Scene2$" + +gUnknown_Debug_083C47C6:: @ 0x83C47C6 + .string "Scene3$" + +gUnknown_Debug_083C47CD:: @ 0x83C47CD + .string "Scene4$" + +gUnknown_Debug_083C47D4:: @ 0x83C47D4 + .string "Scene5$" + +gUnknown_Debug_083C47DB:: @ 0x83C47DB + .string "Scene6$" + +gUnknown_Debug_083C47E2:: @ 0x83C47E2 + .string "Scene7$" + +gUnknown_Debug_083C47E9:: @ 0x83C47E9 + .string "Scene8$" + + .align 2 +gUnknown_Debug_083C47F0:: @ 0x83C47F0 + .4byte gUnknown_Debug_083C47B8, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C47BF, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C47C6, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C47CD, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C47D4, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C47DB, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C47E2, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C47E9, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C4830:: @ 0x83C4830 + .string "Trick Master$" + +gUnknown_Debug_083C483D:: @ 0x83C483D + .string "Hidden MASTER$" + +gUnknown_Debug_083C484B:: @ 0x83C484B + .string "Inside the HOUSE$" + +gUnknown_Debug_083C485C:: @ 0x83C485C + .string "Pass a reward$" + +gUnknown_Debug_083C486A:: @ 0x83C486A + .string "Rig a trick$" + +gUnknown_Debug_083C4876:: @ 0x83C4876 + .string "MASTER is gone$" + + .align 2 +gUnknown_Debug_083C4888:: @ 0x83C4888 + .4byte gUnknown_Debug_083C483D, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C484B, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C485C, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C486A, TomomichiDebugMenu_Config+1 + .4byte gUnknown_Debug_083C4876, TomomichiDebugMenu_Config+1 + +gUnknown_Debug_083C48B0:: @ 0x83C48B0 + .string "PMNICKNAME$" + +gUnknown_Debug_083C48BB:: @ 0x83C48BB + .string "BREEDER$" + .endif diff --git a/data/debug_menu_watanabe.s b/data/debug_menu_watanabe.s new file mode 100644 index 000000000..cdb566208 --- /dev/null +++ b/data/debug_menu_watanabe.s @@ -0,0 +1,673 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .ifdef DEBUG + +gUnknown_Debug_083F7FD4:: @ 0x83F7FD4 + .string "▶$" + +gUnknown_Debug_083F7FD6:: @ 0x83F7FD6 + .string "ゆみあくひりつ$" + +gUnknown_Debug_083F7FDE:: @ 0x83F7FDE + .string "たかさ$" + +gUnknown_Debug_083F7FE2:: @ 0x83F7FE2 + .string "Lキー▶しゅくしょう$" + +gUnknown_Debug_083F7FED:: @ 0x83F7FED + .string "Rキー▶かくだい$" + +gUnknown_Debug_083F7FF6:: @ 0x83F7FF6 + .string "Uキー▶うえ いどう$" + +gUnknown_Debug_083F8001:: @ 0x83F8001 + .string "Dキー▶した いどう$" + +gUnknown_Debug_083F800C:: @ 0x83F800C + .string "Aボタン▶そうさきりかえ$" + +gUnknown_Debug_083F8019:: @ 0x83F8019 + .string "Bボタン▶やめる$" + +gUnknown_Debug_083F8022:: @ 0x83F8022 + .string "スタート:$" + +gUnknown_Debug_083F8028:: @ 0x83F8028 + .string ":セレクト$" + +gUnknown_Debug_083F802E:: @ 0x83F802E + .string "やせいたいせん$" + +gUnknown_Debug_083F8036:: @ 0x83F8036 + .string "1VS1たいせん$" + +gUnknown_Debug_083F803F:: @ 0x83F803F + .string "2VS2たいせん$" + +gUnknown_Debug_083F8048:: @ 0x83F8048 + .string "{COLOR BLUE}1VS1つうしんたいせん$" + +gUnknown_Debug_083F8058:: @ 0x83F8058 + .string "{COLOR BLUE}2VS2つうしんたいせん$" + +gUnknown_Debug_083F8068:: @ 0x83F8068 + .4byte gUnknown_Debug_083F802E, 0x100 + .4byte gUnknown_Debug_083F8036, 0x108 + .4byte gUnknown_Debug_083F803F, 0x209 + .4byte gUnknown_Debug_083F8048, 0x10A + .4byte gUnknown_Debug_083F8058, 0x20B + +gUnknown_Debug_083F8090:: @ 0x83F8090 + .string "きほんタイプ$" + +gUnknown_Debug_083F8097:: @ 0x83F8097 + .string "AIタイプ2$" + +gUnknown_Debug_083F809E:: @ 0x83F809E + .string "AIタイプ3$" + +gUnknown_Debug_083F80A5:: @ 0x83F80A5 + .string "AIタイプ4$" + +gUnknown_Debug_083F80AC:: @ 0x83F80AC + .string "AIタイプ5$" + +gUnknown_Debug_083F80B3:: @ 0x83F80B3 + .string "AIタイプ6$" + +gUnknown_Debug_083F80BA:: @ 0x83F80BA + .string "AIタイプ7$" + +gUnknown_Debug_083F80C1:: @ 0x83F80C1 + .string "AIタイプ8$" + +gUnknown_Debug_083F80C8:: @ 0x83F80C8 + .string "AIタイプ9$" + +gUnknown_Debug_083F80CF:: @ 0x83F80CF + .string "AIタイプ10$" + + .align 2 +gUnknown_Debug_083F80D8:: @ 0x83F80D8 + .4byte gUnknown_Debug_083F8090, 0x1 + .4byte gUnknown_Debug_083F8097, 0x2 + .4byte gUnknown_Debug_083F809E, 0x4 + .4byte gUnknown_Debug_083F80A5, 0x8 + .4byte gUnknown_Debug_083F80AC, 0x10 + .4byte gUnknown_Debug_083F80B3, 0x20 + .4byte gUnknown_Debug_083F80BA, 0x40 + .4byte gUnknown_Debug_083F80C1, 0x80 + .4byte gUnknown_Debug_083F80C8, 0x100 + .4byte gUnknown_Debug_083F80CF, 0x200 + +gUnknown_Debug_083F8128:: @ 0x83F8128 + .string "くさ$" + +gUnknown_Debug_083F812B:: @ 0x83F812B + .string "ながい くさ$" + +gUnknown_Debug_083F8132:: @ 0x83F8132 + .string "すな$" + +gUnknown_Debug_083F8135:: @ 0x83F8135 + .string "みず$" + +gUnknown_Debug_083F8138:: @ 0x83F8138 + .string "うみ$" + +gUnknown_Debug_083F813B:: @ 0x83F813B + .string "いけ$" + +gUnknown_Debug_083F813E:: @ 0x83F813E + .string "いわ$" + +gUnknown_Debug_083F8141:: @ 0x83F8141 + .string "どうくつ$" + +gUnknown_Debug_083F8146:: @ 0x83F8146 + .string "そのた$" + + .align 2 +gUnknown_Debug_083F814C:: @ 0x83F814C + .4byte gUnknown_Debug_083F8128, 0x0 + .4byte gUnknown_Debug_083F812B, 0x1 + .4byte gUnknown_Debug_083F8132, 0x2 + .4byte gUnknown_Debug_083F8135, 0x3 + .4byte gUnknown_Debug_083F8138, 0x4 + .4byte gUnknown_Debug_083F813B, 0x5 + .4byte gUnknown_Debug_083F813E, 0x6 + .4byte gUnknown_Debug_083F8141, 0x7 + .4byte gUnknown_Debug_083F8146, 0x8 + +gUnknown_Debug_083F8194:: @ 0x83F8194 + .string "ポケモンを えらんでね$" + +gUnknown_Debug_083F81A0:: @ 0x83F81A0 + .string "{COLOR RED}START:つぎへ$" + +gUnknown_Debug_083F81AD:: @ 0x83F81AD + .string "{COLOR RED}じぶんの ポケモン$" + +gUnknown_Debug_083F81BA:: @ 0x83F81BA + .string "{COLOR RED}あいての ポケモン$" + +gUnknown_Debug_083F81C7:: @ 0x83F81C7 + .string "たいせんモードを えらんでね$" + +gUnknown_Debug_083F81D6:: @ 0x83F81D6 + .string "{COLOR RED}バトルモード せんたく$" + +gUnknown_Debug_083F81E5:: @ 0x83F81E5 + .string "{COLOR RED}トレーナーAI せんたく$" + +gUnknown_Debug_083F81F5:: @ 0x83F81F5 + .string "{COLOR RED}START:かいし$" + +gUnknown_Debug_083F8202:: @ 0x83F8202 + .string "{COLOR RED}バトルちけい せんたく$" + +gUnknown_Debug_083F8211:: @ 0x83F8211 + .string "じぶんの せいべつを えらんでね$" + +gUnknown_Debug_083F8222:: @ 0x83F8222 + .string "{COLOR RED}せいべつ せんたく$" + +gUnknown_Debug_083F822F:: @ 0x83F822F + .string "おとこ$" + +gUnknown_Debug_083F8233:: @ 0x83F8233 + .string "おんな$" +Str_83F8237: + .string "Kind$" + + .align 2 +_83F823C: + .4byte 1 + .byte 0x82, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8248: + .string "Level$" + + .align 2 +_83F8250: + .4byte 1 + .byte 0x64, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F825C: + .string "EXP Points$" + + .align 2 +_83F8268: + .4byte 1 + .byte 0x80, 0x84, 0x1E, 0x00, 0x00, 0x07, 0x00, 0x00 + +Str_83F8274: + .string "ID$" + + .align 2 +_83F8278: + .4byte 0 + .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x00, 0x00 + +Str_83F8284: + .string "Rnd Numbers$" + + .align 2 +_83F8290: + .4byte 0 + .byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x00, 0x00 + +Str_83F829C: + .string "Sex$" + + .align 2 +_83F82A0: + .4byte 0 + .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 + +Str_83F82AC: + .string "Character$" + + .align 2 +_83F82B8: + .4byte 0 + .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 + +Str_83F82C4: + .string "Move1$" + + .align 2 +_83F82CC: + .4byte 0 + .byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F82D8: + .string "Move2$" + + .align 2 +_83F82E0: + .4byte 0 + .byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F82EC: + .string "Move3$" + + .align 2 +_83F82F4: + .4byte 0 + .byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8300: + .string "Move4$" + + .align 2 +_83F8308: + .4byte 0 + .byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8314: + .string "Hold$" + + .align 2 +_83F831C: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8328: + .string "SP. Ability$" + + .align 2 +_83F8334: + .4byte 0 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 + +Str_83F8340: + .string "HPrnd$" + + .align 2 +_83F8348: + .4byte 0 + .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + +Str_83F8354: + .string "HPexp$" + + .align 2 +_83F835C: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8368: + .string "ATKrnd$" + + .align 2 +_83F8370: + .4byte 0 + .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + +Str_83F837C: + .string "ATKexp$" + + .align 2 +_83F8384: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8390: + .string "DEFrnd$" + + .align 2 +_83F8398: + .4byte 0 + .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + +Str_83F83A4: + .string "DEFexp$" + + .align 2 +_83F83AC: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F83B8: + .string "SPDrnd$" + + .align 2 +_83F83C0: + .4byte 0 + .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + +Str_83F83CC: + .string "SPDexp$" + + .align 2 +_83F83D4: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F83E0: + .string "SP. ATK$" + .string "rnd$" + + .align 2 +_83F83EC: + .4byte 0 + .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + +Str_83F83F8: + .string "SP. ATK$" + .string "exp$" + + .align 2 +_83F8404: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8410: + .string "SP. DEF$" + .string "rnd$" + + .align 2 +_83F841C: + .4byte 0 + .byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + +Str_83F8428: + .string "SP. DEF$" + .string "exp$" + + .align 2 +_83F8434: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8440: + .string "Cool$" + + .align 2 +_83F8448: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8454: + .string "Beauty$" + + .align 2 +_83F845C: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8468: + .string "Cute$" + + .align 2 +_83F8470: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F847C: + .string "Smart$" + + .align 2 +_83F8484: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F8490: + .string "Tough$" + + .align 2 +_83F8498: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F84A4: + .string "Sheen$" + + .align 2 +_83F84AC: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F84B8: + .string "Tameness$" + + .align 2 +_83F84C4: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F84D0: + .string "{PK}RUS$" + + .align 2 +_83F84D8: + .4byte 0 + .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00 + +Str_83F84E4: + .string "EGG$" + .string "$" + + .align 2 +_83F84EC: + .4byte 0 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 + +Str_83F84F8: + .string "Status$" + + .align 2 +_83F8500: + .4byte 0 + .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00 + + +gUnknown_Debug_083F850A:: @ 0x83F850A + .string "{COLOR RED}HP  $" + +gUnknown_Debug_083F8514:: @ 0x83F8514 + .string "{COLOR RED}ATK $" + +gUnknown_Debug_083F851C:: @ 0x83F851C + .string "{COLOR RED}DEF $" + +gUnknown_Debug_083F8524:: @ 0x83F8524 + .string "{COLOR RED}SPEED$" + +gUnknown_Debug_083F852D:: @ 0x83F852D + .string "{COLOR RED}SP。ATK$" + +gUnknown_Debug_083F8537:: @ 0x83F8537 + .string "{COLOR RED}SP。DEF$" + +gUnknown_Debug_083F8541:: @ 0x83F8541 + .string "なし$" + +gUnknown_Debug_083F8544:: @ 0x83F8544 + .string "♂$" + +gUnknown_Debug_083F8546:: @ 0x83F8546 + .string "♀$" + +gUnknown_Debug_083F8548:: @ 0x83F8548 + .string "ー$" + +gUnknown_Debug_083F854A:: @ 0x83F854A + .string "ON$" + +gUnknown_Debug_083F854D:: @ 0x83F854D + .string "OFF$" + + .align 2 +gUnknown_Debug_083F8554:: @ 0x83F8554 + .4byte Str_83F8237, _83F823C + .4byte Str_83F8248, _83F8250 + .4byte Str_83F825C, _83F8268 + .4byte Str_83F8274, _83F8278 + .4byte Str_83F8284, _83F8290 + .4byte Str_83F829C, _83F82A0 + .4byte Str_83F82AC, _83F82B8 + .4byte Str_83F82C4, _83F82CC + .4byte Str_83F82D8, _83F82E0 + .4byte Str_83F82EC, _83F82F4 + .4byte Str_83F8300, _83F8308 + .4byte Str_83F8314, _83F831C + .4byte Str_83F8328, _83F8334 + .4byte Str_83F8340, _83F8348 + .4byte Str_83F8354, _83F835C + .4byte Str_83F8368, _83F8370 + .4byte Str_83F837C, _83F8384 + .4byte Str_83F8390, _83F8398 + .4byte Str_83F83A4, _83F83AC + .4byte Str_83F83B8, _83F83C0 + .4byte Str_83F83CC, _83F83D4 + .4byte Str_83F83E0, _83F83EC + .4byte Str_83F83F8, _83F8404 + .4byte Str_83F8410, _83F841C + .4byte Str_83F8428, _83F8434 + .4byte Str_83F8440, _83F8448 + .4byte Str_83F8454, _83F845C + .4byte Str_83F8468, _83F8470 + .4byte Str_83F847C, _83F8484 + .4byte Str_83F8490, _83F8498 + .4byte Str_83F84A4, _83F84AC + .4byte Str_83F84B8, _83F84C4 + .4byte Str_83F84D0, _83F84D8 + .4byte Str_83F84E4, _83F84EC + .4byte Str_83F84F8, _83F8500 + +gUnknown_Debug_083F866C:: @ 0x83F866C + .string " あいうえおか$" + +gUnknown_Debug_083F8674:: @ 0x83F8674 + .string "めまみ$" + +gUnknown_Debug_083F8678:: @ 0x83F8678 + .string "きくけこさし$" + +gUnknown_Debug_083F867F:: @ 0x83F867F + .string "すせそたちつ\n" + .string "$" + +gUnknown_Debug_083F8687:: @ 0x83F8687 + .string "てとなにぬね{STRING 255}のはひふへほ$" + + .align 2 +gUnknown_Debug_083F8698:: @ 0x83F8698 + .4byte gUnknown_Debug_083F866C, 0x5 + .4byte gUnknown_Debug_083F8674, 0x3 + .4byte gUnknown_Debug_083F8678, 0x6 + .4byte gUnknown_Debug_083F867F, 0x6 + .4byte gUnknown_Debug_083F8687, 0x6 + .4byte 0x83F868F, 0x6 + +gUnknown_Debug_083F86C8:: @ 0x83F86C8 + .string "ーーー$" + +gUnknown_Debug_083F86CC:: @ 0x83F86CC + .string "SLP$" + +gUnknown_Debug_083F86D0:: @ 0x83F86D0 + .string "PSN$" + +gUnknown_Debug_083F86D4:: @ 0x83F86D4 + .string "BRN$" + +gUnknown_Debug_083F86D8:: @ 0x83F86D8 + .string "FRZ$" + +gUnknown_Debug_083F86DC:: @ 0x83F86DC + .string "PAR$" + +gUnknown_Debug_083F86E0:: @ 0x83F86E0 + .string "PSN2$" + + .align 2 +gUnknown_Debug_083F86E8:: @ 0x83F86E8 + .4byte gUnknown_Debug_083F86C8, 0x0 + .4byte gUnknown_Debug_083F86CC, 0x1 + .4byte gUnknown_Debug_083F86D0, 0x8 + .4byte gUnknown_Debug_083F86D4, 0x10 + .4byte gUnknown_Debug_083F86D8, 0x20 + .4byte gUnknown_Debug_083F86DC, 0x40 + .4byte gUnknown_Debug_083F86E0, 0x80 + +gUnknown_Debug_083F8720:: @ 0x83F8720 + .string "PKMNワLIST$" + +gUnknown_Debug_083F872A:: @ 0x83F872A + .string "PKMNワBOX$" + +gUnknown_Debug_083F8733:: @ 0x83F8733 + .string "Create POKひMON   LR:Shift  START:Add$" + +gUnknown_Debug_083F8758:: @ 0x83F8758 + .string "たまご$" + +gUnknown_Debug_083F875C:: @ 0x83F875C + .string "DebugーG$" + +gUnknown_Debug_083F8764:: + .incbin "baserom_de_debug.gba", 0x3F8764, 4 + +gUnknown_Debug_083F8768:: + .incbin "baserom_de_debug.gba", 0x3F8768, 40 + +gUnknown_Debug_083F8790:: + .incbin "baserom_de_debug.gba", 0x3F8790, 64 + +gUnknown_Debug_083F87D0:: @ 0x83F87D0 + .string "{COLOR RED}L{ESCAPE}ロ$" + +gUnknown_Debug_083F87D8:: @ 0x83F87D8 +.string "{COLOR RED}{ESCAPE}ワR$" + +gUnknown_Debug_083F87E0:: @ 0x83F87E0 + .string "かいはつナンバー$" + +gUnknown_Debug_083F87E9:: @ 0x83F87E9 + .string "グラフィックナンバー$" + +gUnknown_Debug_083F87F4:: @ 0x83F87F4 + .string "{COLOR RED}A:カラーせってい$" + +gUnknown_Debug_083F8801:: @ 0x83F8801 + .string "{COLOR RED}A:けってい B:キャンセル$" + +gUnknown_Debug_083F8813:: @ 0x83F8813 + .string ":$" + +gUnknown_Debug_083F8815:: + .incbin "baserom_de_debug.gba", 0x3F8815, 18 + + .align 2 +stru_83F8828:: + obj_tiles byte_83F88EC, 0x800, 0x1000 + null_obj_tiles + +stru_83F8838:: + obj_pal word_83F888C, 0x1000 + null_obj_pal + +@ word_83F8848 +dword_83F8848: + .incbin "baserom_de_debug.gba", 0x3F8848, 32 + +@ unk_83F8868 +unk_83F8868:: + .incbin "baserom_de_debug.gba", 0x3F8868, 12 + +@ 83F8874 + spr_template 0x1000, 0x1000, dword_83F8848, unk_83F8868, 0, gDummySpriteAffineAnimTable, debug_80C7584 + +word_83F888C:: + .incbin "graphics/debug/sprite_browser.gbapal" + +byte_83F88EC:: + .incbin "graphics/debug/sprite_browser.4bpp" + + .endif diff --git a/data/debug_mystery_event_menu.s b/data/debug_mystery_event_menu.s new file mode 100644 index 000000000..a54a89715 --- /dev/null +++ b/data/debug_mystery_event_menu.s @@ -0,0 +1,16 @@ + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +Str_843DA70:: + .string "CARDーE emulation。。。$" + +Str_843DA84:: + .string "LR: select A: send。$" + +Str_843DA98:: + .string "sending。。。$" + +Str_843DAA3:: + .string "completed。$" diff --git a/data/start_menu_debug.s b/data/start_menu_debug.s new file mode 100644 index 000000000..2c7b465c9 --- /dev/null +++ b/data/start_menu_debug.s @@ -0,0 +1,807 @@ + .if DEBUG + +#include "constants/moves.h" + .include "include/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +Str_839B740: @ 0x839B740 + .string "·WATANABE$" + +Str_839B74A: @ 0x839B74A + .string "SOGABE$" + +Str_839B751: @ 0x839B751 + .string "·TAMADA$" + +Str_839B759: @ 0x839B759 + .string "KAGAYA$" + +Str_839B760: @ 0x839B760 + .string "MATUDA$" + +Str_839B767: @ 0x839B767 + .string "NOHARA$" + +Str_839B76E: @ 0x839B76E + .string "NAKAMURA$" + +Str_839B777: @ 0x839B777 + .string "EXIT$" + +Str_839B77C: @ 0x839B77C + .string "Teleport$" + +Str_839B785: @ 0x839B785 + .string "Switch BG$" + +Str_839B78F: @ 0x839B78F + .string "Edit your {PKMN}$" + +Str_839B79C: @ 0x839B79C + .string "MORI$" + +Str_839B7A1: @ 0x839B7A1 + .string "TOMOMITI$" + +Str_839B7AA: @ 0x839B7AA + .string "·AOKI$" + +Str_839B7B0: @ 0x839B7B0 + .string "TAYA$" + +Str_839B7B5: @ 0x839B7B5 + .string "Control Encounter$" + +Str_839B7C7: @ 0x839B7C7 + .string "PTIME$" + +Str_839B7CD: @ 0x839B7CD + .string "Make items$" + +Str_839B7D8: @ 0x839B7D8 + .string "Transport$" + +Str_839B7E2: @ 0x839B7E2 + .string "See portraits$" + +Str_839B7F0: @ 0x839B7F0 + .string "Time records$" + +Str_839B7FD: @ 0x839B7FD + .string "Set time$" + +Str_839B806: @ 0x839B806 + .string "National オカDex$" + +Str_839B815: @ 0x839B815 + .string "Hoenn オカDex$" + +Str_839B821: @ 0x839B821 + .string "Create {PKMN}$" + +Str_839B82B: @ 0x839B82B + .string "See {PKMN} graphics$" + +Str_839B83B: @ 0x839B83B + .string "See trainers$" + +Str_839B848: @ 0x839B848 + .string "Battle for debug$" + +Str_839B859: @ 0x839B859 + .string "Full set of badges$" + +Str_839B86C: @ 0x839B86C + .string "Hoenn National Dex$" + +Str_839B87F: @ 0x839B87F + .string "Set Ram berry$" + +Str_839B88D: @ 0x839B88D + .string "Use HM$" + +Str_839B894: @ 0x839B894 + .string "IWASAWA$" + +Str_839B89C: @ 0x839B89C + .string "BGM ON/OFF$" + +Str_839B8A7: @ 0x839B8A7 + .string "Size comparison$" + +Str_839B8B7: @ 0x839B8B7 + .string "Clear flag ON/OFF$" + +Str_839B8C9: @ 0x839B8C9 + .string "Safari$" + +Str_839B8D0: @ 0x839B8D0 + .string "Rematch trainers$" + +Str_839B8E1: @ 0x839B8E1 + .string "Mirage island RND$" + +Str_839B8F3: @ 0x839B8F3 + .string "Hall of fame$" + +Str_839B900: @ 0x839B900 + .string "Mystery event$" + +Str_839B90E: @ 0x839B90E + .string "Legends records$" + +Str_839B91E: @ 0x839B91E + .string "Weather events$" + +Str_839B92D: @ 0x839B92D + .string "Cell info.$" + +Str_839B938: @ 0x839B938 + .string "Check {POKEBLOCK}$" + +Str_839B944: @ 0x839B944 + .string "Effort values$" + +Str_839B952: @ 0x839B952 + .string "Berrie Info$" + +Str_839B95E: @ 0x839B95E + .string "Battle Tower stages$" + +Str_839B972: @ 0x839B972 + .string "End sequence demo$" + +Str_839B984: @ 0x839B984 + .string "Random number test$" + +Str_839B997: @ 0x839B997 + .string "Me-too BackupMan$" + +Str_839B9A8: @ 0x839B9A8 + .string "MURAKAWA$" + +Str_839B9B1: @ 0x839B9B1 + .string "KINA(FONT)$" + + .align 2 +gDebug0x839B9BC:: + .4byte Str_839B777, DebugMenu_Exit+1 + .4byte Str_839B740, DebugMenu_OpenWatanabe+1 + .4byte Str_839B74A, DebugMenu_OpenSogabe+1 + .4byte Str_839B751, DebugMenu_OpenTamada+1 + .4byte Str_839B759, DebugMenu_OpenKagaya+1 + .4byte Str_839B760, DebugMenu_OpenMatsuda+1 + .4byte Str_839B767, DebugMenu_OpenNohara+1 + .4byte Str_839B76E, DebugMenu_OpenNakamura+1 + .4byte Str_839B77C, DebugMenu_Teleport+1 + .4byte Str_839B78F, DebugMenu_EditPKMN+1 + .4byte Str_839B785, DebugMenu_SwitchBG+1 + .4byte Str_839B79C, DebugMenu_OpenMori+1 + .4byte Str_839B7A1, DebugMenu_OpenTomomichi+1 + .4byte Str_839B7AA, DebugMenu_OpenAoki+1 + .4byte Str_839B7B0, DebugMenu_OpenTaya+1 + .4byte Str_839B8B7, DebugMenu_ToggleClearFlag+1 + .4byte Str_839B7B5, DebugMenu_ControlEncounter+1 + .4byte Str_839B7C7, DebugMenu_PTime+1 + .4byte Str_839B7CD, DebugMenu_MakeItems+1 + .4byte Str_839B7D8, debug_sub_8091300+1 + .4byte Str_839B7E2, DebugMenu_ViewPortraits+1 + .4byte Str_839B7F0, DebugMenu_TimeRecords+1 + .4byte Str_839B7FD, DebugMenu_SetTime+1 + .4byte Str_839B806, DebugMenu_NationalDex+1 + .4byte Str_839B821, DebugMenu_CreatePKMN+1 + .4byte Str_839B82B, DebugMenu_ViewPokemonGraphics+1 + .4byte Str_839B848, DebugMenu_BattleForDebug+1 + .4byte Str_839B859, DebugMenu_AllBadges+1 + .4byte Str_839B86C, DebugMenu_HoennNationalDex+1 + .4byte Str_839B87F, DebugMenu_SetRamBerry+1 + .4byte Str_839B88D, DebugMenu_UseHM+1 + .4byte Str_839B894, DebugMenu_OpenIwasawa+1 + .4byte Str_839B89C, DebugMenu_ToggleBGM+1 + .4byte Str_839B8A7, DebugMenu_OpenSizeComparison+1 + .4byte Str_839B8C9, DebugMenu_Safari+1 + .4byte Str_839B8D0, DebugMenu_RematchTrainers+1 + .4byte Str_839B8E1, DebugMenu_MiragaIslandRND+1 + .4byte Str_839B8F3, DebugMenu_HallOfFame+1 + .4byte Str_839B900, DebugMenu_OpenMysteryEvent+1 + .4byte Str_839B90E, DebugMenu_OpenLegendsRecord+1 + .4byte Str_839B91E, DebugMenu_OpenWeatherEvents+1 + .4byte Str_839B92D, DebugMenu_CellInfo+1 + .4byte Str_839B938, DebugMenu_CheckPKBLCK+1 + .4byte Str_839B944, DebugMenu_EffortValues+1 + .4byte Str_839B815, DebugMenu_HoennDex+1 + .4byte Str_839B83B, DebugMenu_OpenSeeTrainers+1 + .4byte Str_839B952, DebugMenu_OpenBerryInfo+1 + .4byte Str_839B95E, DebugMenu_BattleTowerStages+1 + .4byte Str_839B972, DebugMenu_EndSequenceDemo+1 + .4byte Str_839B984, DebugMenu_RandomNumberTest+1 + .4byte Str_839B997, DebugMenu_MeTooBackupMan+1 + .4byte Str_839B9A8, DebugMenu_OpenMurakawa+1 + .4byte Str_839B9B1, DebugMenu_OpenKiwa+1 + +_839BB64:: + .incbin "baserom_de_debug.gba", 0x39bb64, 64 + +gUnknown_Debug_0839BBA4:: @ 0x839BBA4 + .string "Debugging Version$" + +gUnknown_Debug_0839BBB6:: @ 0x839BBB6 + .string "{VERSION} Version$" + +gUnknown_Debug_0839BBC1:: @ 0x839BBC1 + .string "Normal RTC compatible$" + +Str_839BBD7: @ 0x839BBD7 + .string "か の じっけん$" + +Str_839BBE0: @ 0x839BBE0 + .string "じっけん2$" + +Str_839BBE6: @ 0x839BBE6 + .string "BGじっけん$" + +Str_839BBED: @ 0x839BBED + .string "Battle$" + +Str_839BBF4: @ 0x839BBF4 + .string "つうしん じっけん$" + +Str_839BBFE: @ 0x839BBFE + .string "LINK Test2$" + +Str_839BC09: @ 0x839BC09 + .string "フィールド はじめる$" + +Str_839BC14: @ 0x839BC14 + .string "フィールド つづき$" + +Str_839BC1E: @ 0x839BC1E + .string "Sound test$" + +Str_839BC29: @ 0x839BC29 + .string "{POKEBLOCK} test$" + +Str_839BC34: @ 0x839BC34 + .string "Crash backup data$" + +Str_839BC46: @ 0x839BC46 + .string "e-Card test$" + +Str_839BC52: @ 0x839BC52 + .string "こうかんデモ   $" + +Str_839BC5C: @ 0x839BC5C + .string "Time in game$" + +Str_839BC69: @ 0x839BC69 + .string "フェスタ モード$" + +Str_839BC72: @ 0x839BC72 + .string "Mimic e-Card$" + +Str_839BC7F: @ 0x839BC7F + .string "RTC reset$" + +Str_839BC89: @ 0x839BC89 + .string "Converter$" + + .align 2 +_839BC94: @ 0x839BC94 + .4byte Str_839BBD7, DebugMenu_8076CBC+1 + .4byte Str_839BBE0, DebugMenu_8076CC0+1 + .4byte Str_839BBE6, DebugMenu_8076CD4+1 + .4byte Str_839BBED, DebugMenu_8076C6C+1 + .4byte Str_839BC29, DebugMenu_8076CD8+1 + .4byte Str_839BBFE, DebugMenu_8076D28+1 + .4byte Str_839BC1E, DebugMenu_8076D3C+1 + .4byte Str_839BC09, DebugMenu_8076C80+1 + .4byte Str_839BC14, DebugMenu_8076C90+1 + .4byte Str_839BC34, DebugMenu_8076D50+1 + .4byte Str_839BC46, DebugMenu_8076CEC+1 + .4byte Str_839BC52, DebugMenu_8076D14+1 + .4byte Str_839BC72, DebugMenu_8076D00+1 + .4byte Str_839BC5C, DebugMenu_8076D5C+1 + .4byte Str_839BC7F, DebugMenu_8076E18+1 + .4byte Str_839BC89, DebugMenu_8076EDC+1 + +Str_839BD14: @ 0x839BD14 + .string "うかえ$" + +Str_839BD18: @ 0x839BD18 + .string "      おけこしすせそ$" + +Str_839BD26: @ 0x839BD26 + .string "  い   " +Str_839BB64:: + .string "RTCを リセット します\n" + .string "Aで じっこう   Bでキャンセル$" + +Str_839BD4C: @ 0x839BD4C + .string "RTCを リセット した!$" + +Str_839BD5A: @ 0x839BD5A + .string "セーブデータを コンバートします\n" + .string "Aで けってい  Bで キャンセル$" + +Str_839BD7D: @ 0x839BD7D + .string "へんかんが しゅうりょう しました!$" + +Str_839BD90: @ 0x839BD90 + .string "ジュンイチ$" + +Str_839BD96: @ 0x839BD96 + .string "ダイゴロウ$" + +Str_839BD9C: @ 0x839BD9C + .string "テツジ$" + +Str_839BDA0: @ 0x839BDA0 + .string "バレンシア$" + +Str_839BDA6: @ 0x839BDA6 + .string "ハルコマチ$" + +Str_839BDAC: @ 0x839BDAC + .string "RAYMOND$" + +Str_839BDB4: @ 0x839BDB4 + .string "TIFFANY$" + +Str_839BDBC: @ 0x839BDBC + .string "くまxちえ$" + + .align 2 +_839BDC4: @ 0x839BDC4 + .4byte Str_839BD90, 0x0 + .4byte Str_839BD96, 0x0 + .4byte Str_839BDA0, 0x1 + .4byte Str_839BDA6, 0x1 + .4byte Str_839BDAC, 0x80 + .4byte Str_839BDB4, 0x81 + .4byte Str_839BD9C, 0x0 + .4byte Str_839BDBC, 0x1 + +Str_839BE04: @ 0x839BE04 + .string "ID$" + +Str_839BE07: @ 0x839BE07 + .string "X$" + +Str_839BE09: @ 0x839BE09 + .string " Y$" + +Str_839BE0C: @ 0x839BE0C + .string " H$" + +Str_839BE0F: @ 0x839BE0F + .string "HP$" + +Str_839BE12: @ 0x839BE12 + .string "PAR$" + +Str_839BE16: @ 0x839BE16 + .string "SLP$" + +Str_839BE1A: @ 0x839BE1A + .string "PSN$" + +Str_839BE1E: @ 0x839BE1E + .string "ウマイ$" + + .align 2 +_839BE24: @ 0x839BE24 + .4byte Str_839BE0F, DebugMenu_8077434+1 + .4byte Str_839BE12, DebugMenu_8077434+1 + .4byte Str_839BE16, DebugMenu_8077434+1 + .4byte Str_839BE1A, DebugMenu_8077434+1 + .4byte Str_839BE1E, DebugMenu_8077434+1 + +Str_839BE4C: @ 0x839BE4C + .string "OFF$" + +Str_839BE50: @ 0x839BE50 + .string "ON$" + +Str_839BE53: @ 0x839BE53 + .string "BG0\n" + .string "BG1\n" + .string "BG2\n" + .string "BG3\n" + .string "$" + +Str_839BE64: @ 0x839BE64 + .string "ON$" + +Str_839BE67: @ 0x839BE67 + .string "OFF$" + +Str_839BE6B: @ 0x839BE6B + .string "さいせんかのうトレーナー:{STR_VAR_1}\n" + .string "さいせんじょうたいトレーナー:{STR_VAR_2}$" + +Str_839BE8D: @ 0x839BE8D + .string "いる$" + +Str_839BE90: @ 0x839BE90 + .string "いない$" + +Str_839BE94: @ 0x839BE94 + .string "Max num of steps$" + +Str_839BEA5: @ 0x839BEA5 + .string "Clear num of steps$" + +Str_839BEB8: @ 0x839BEB8 + .string "See trainers$" + +Str_839BEC5: @ 0x839BEC5 + .string "Flag all clear$" + +Str_839BED4: @ 0x839BED4 + .string "Flag all set$" + + .align 2 +_839BEE4: @ 0x839BEE4 + .4byte Str_839BEB8, DebugMenu_8077974+1 + .4byte Str_839BE94, DebugMenu_8077A20+1 + .4byte Str_839BEA5, DebugMenu_8077A40+1 + .4byte Str_839BED4, DebugMenu_8077934+1 + .4byte Str_839BEC5, DebugMenu_8077954+1 + +Str_839BF0C: @ 0x839BF0C + .string "のこり {STR_VAR_1}ほ$" + +Str_839BF14: @ 0x839BF14 + .string "{STR_VAR_1}\n" + .string "のこり {STR_VAR_2}ほ$" + +Str_839BF1F: @ 0x839BF1F + .string "めのまえには\n" + .string "キューブが ありません!$" + +Str_839BF33: @ 0x839BF33 + .string "ほすうをのこり1にする$" + +Str_839BF3F: @ 0x839BF3F + .string "ボールをのこり1にする$" + +Str_839BF4B: @ 0x839BF4B + .string "キューブおきば$" + +Str_839BF53: @ 0x839BF53 + .string "ボールをのこり30に$" + +Str_839BF5E: @ 0x839BF5E + .string "ほすうをのこり500に$" + + .align 2 +_839BF6C: @ 0x839BF6C + .4byte Str_839BF4B, DebugMenu_8077B00+1 + .4byte Str_839BF5E, DebugMenu_8077ACC+1 + .4byte Str_839BF33, DebugMenu_8077AE8+1 + .4byte Str_839BF53, DebugMenu_8077A9C+1 + .4byte Str_839BF3F, DebugMenu_8077AB4+1 + +_839BF94: @ 0x839BF94 + .4byte gMoveNames + 13 * MOVE_CUT, DebugMenu_8077BB4+1 + .4byte gMoveNames + 13 * MOVE_FLASH, DebugMenu_8077BC0+1 + .4byte gMoveNames + 13 * MOVE_ROCK_SMASH, DebugMenu_8077BCC+1 + .4byte gMoveNames + 13 * MOVE_STRENGTH, DebugMenu_8077BD8+1 + .4byte gMoveNames + 13 * MOVE_SURF, debug_sub_80B0770+1 + .4byte gMoveNames + 13 * MOVE_FLY, debug_sub_80B07B0+1 + .4byte gMoveNames + 13 * MOVE_WATERFALL, DebugMenu_8077BE4+1 + .4byte gMoveNames + 13 * MOVE_DIVE, debug_sub_80B0800+1 + .4byte gMoveNames + 13 * MOVE_SECRET_POWER, DebugMenu_8077BF4+1 + +Str_839BFDC: @ 0x839BFDC + .string " じかん ふん びょう$" + +_839BFE8:: + .incbin "baserom_de_debug.gba", 0x39bfe8, 32 + +Str_839C008: @ 0x839C008 +gDebug0x839C008:: + .string "Which item?$" + +Str_839C014: @ 0x839C014 + .string "How many?$" + +Str_839C01E: @ 0x839C01E + .string "にがおえ ばんごう\n" + .string "ポケモンナンバー\n" + .string "ポケモンめい\n" + .string "ブリーダーめい\n" + .string "しゅるい\n" + .string "こせいらんすう$" + +Str_839C04D: @ 0x839C04D + .string "データなし$" + +Str_839C053: @ 0x839C053 + .string "Miracle Island emerged\n" + .string "Random numbers:{STR_VAR_1}$" + +Str_839C07C: @ 0x839C07C + .string "{STR_VAR_1}:{STR_VAR_2}\n" + .string "{STR_VAR_3}$" + +Str_839C085: @ 0x839C085 + .string "みしよう データ$" + +Str_839C08E: @ 0x839C08E + .string "Confirmation$" + +Str_839C09B: @ 0x839C09B + .string "Max-1 set$" + +Str_839C0A5: @ 0x839C0A5 + .string "Zero clear$" + +Str_839C0B0: @ 0x839C0B0 + .string "レポート$" + +Str_839C0B5: @ 0x839C0B5 + .string "クリア じかん$" + +Str_839C0BD: @ 0x839C0BD + .string "りゅうこう さくせい$" + +Str_839C0C8: @ 0x839C0C8 + .string "きのみを うえたかいすう$" + +Str_839C0D5: @ 0x839C0D5 + .string "じてんしゃこうかん$" + +Str_839C0DF: @ 0x839C0DF + .string "ほすう$" + +Str_839C0E3: @ 0x839C0E3 + .string "インタビュー$" + +Str_839C0EA: @ 0x839C0EA + .string "バトル$" + +Str_839C0EE: @ 0x839C0EE + .string "やせいバトル$" + +Str_839C0F5: @ 0x839C0F5 + .string "トレーナーバトル$" + +Str_839C0FE: @ 0x839C0FE + .string "でんどういり$" + +Str_839C105: @ 0x839C105 + .string "ポケモンほかく$" + +Str_839C10D: @ 0x839C10D + .string "つった かいすう$" + +Str_839C116: @ 0x839C116 + .string "タマゴかえった$" + +Str_839C11E: @ 0x839C11E + .string "しんかした$" + +Str_839C124: @ 0x839C124 + .string "ポケセン かいふく$" + +Str_839C12E: @ 0x839C12E + .string "じたく かいふく$" + +Str_839C137: @ 0x839C137 + .string "サファリ りよう$" + +Str_839C140: @ 0x839C140 + .string "ひでん:いあいぎり$" + +Str_839C14A: @ 0x839C14A + .string "ひでん:いわくだき$" + +Str_839C154: @ 0x839C154 + .string "きち ひっこし$" + +Str_839C15C: @ 0x839C15C + .string "つうしんこうかん$" + +Str_839C165: @ 0x839C165 + .string "つうしんたいせん$" + +Str_839C16E: @ 0x839C16E + .string "つうしん かち$" + +Str_839C176: @ 0x839C176 + .string "つうしん まけ$" + +Str_839C17E: @ 0x839C17E + .string "つうしん ひきわけ$" + +Str_839C188: @ 0x839C188 + .string "わざ:はねる$" + +Str_839C18F: @ 0x839C18F + .string "わざ:わるあがき$" + +Str_839C198: @ 0x839C198 + .string "スロットおおあたりかいすう$" + +Str_839C1A6: @ 0x839C1A6 + .string "ルーレット れんしょう$" + +Str_839C1B2: @ 0x839C1B2 + .string "バトルタワー$" + +Str_839C1B9: @ 0x839C1B9 + .string "バトルタワーかち$" + +Str_839C1C2: @ 0x839C1C2 + .string "バトルタワーれんしょう$" + +Str_839C1CE: @ 0x839C1CE + .string "ポロックさくせい$" + +Str_839C1D7: @ 0x839C1D7 + .string "つうしんでポロックつくった$" + +Str_839C1E5: @ 0x839C1E5 + .string "つうしんコンテストかち$" + +Str_839C1F1: @ 0x839C1F1 + .string "CPUコンテストさんか$" + +Str_839C1FD: @ 0x839C1FD + .string "CPUコンテストかち$" + +Str_839C208: @ 0x839C208 + .string "かいもの$" + +Str_839C20D: @ 0x839C20D + .string "ダウジングマシン$" + +Str_839C216: @ 0x839C216 + .string "あめふり$" + +Str_839C21B: @ 0x839C21B + .string "ずかんをみた$" + +Str_839C222: @ 0x839C222 + .string "リボン もらった$" + +Str_839C22B: @ 0x839C22B + .string "だんさ とびおり$" + +Str_839C234: @ 0x839C234 + .string "TVを みた$" + +Str_839C23B: @ 0x839C23B + .string "とけいを みた$" + +Str_839C243: @ 0x839C243 + .string "くじが あたった$" + +Str_839C24C: @ 0x839C24C + .string "ポケモンあずけた$" + +Str_839C255: @ 0x839C255 + .string "ロープウェイりよう$" + +Str_839C25F: @ 0x839C25F + .string "おんせん はいった$" + + .align 2 +_839C270: @ 0x839C270 + .4byte 0xFFFFFF, Str_839C0B0 + .4byte 0x3E73B3B, Str_839C0B5 + .4byte 0xFFFFFF, Str_839C0BD + .4byte 0xFFFFFF, Str_839C0C8 + .4byte 0xFFFFFF, Str_839C0D5 + .4byte 0xFFFFFF, Str_839C0DF + .4byte 0xFFFFFF, Str_839C0E3 + .4byte 0xFFFFFF, Str_839C0EA + .4byte 0xFFFFFF, Str_839C0EE + .4byte 0xFFFFFF, Str_839C0F5 + .4byte 0x3E7, Str_839C0FE + .4byte 0xFFFFFF, Str_839C105 + .4byte 0xFFFFFF, Str_839C10D + .4byte 0xFFFFFF, Str_839C116 + .4byte 0xFFFFFF, Str_839C11E + .4byte 0xFFFFFF, Str_839C124 + .4byte 0xFFFFFF, Str_839C12E + .4byte 0xFFFFFF, Str_839C137 + .4byte 0xFFFFFF, Str_839C140 + .4byte 0xFFFFFF, Str_839C14A + .4byte 0xFFFFFF, Str_839C154 + .4byte 0xFFFFFF, Str_839C15C + .4byte 0xFFFFFF, Str_839C165 + .4byte 0x270F, Str_839C16E + .4byte 0x270F, Str_839C176 + .4byte 0x270F, Str_839C17E + .4byte 0xFFFFFF, Str_839C188 + .4byte 0xFFFFFF, Str_839C18F + .4byte 0xFFFFFF, Str_839C198 + .4byte 0xFFFFFF, Str_839C1A6 + .4byte 0xFFFFFF, Str_839C1B2 + .4byte 0x0, Str_839C1B9 + .4byte 0x0, Str_839C1C2 + .4byte 0xFFFFFF, Str_839C1CE + .4byte 0xFFFFFF, Str_839C1D7 + .4byte 0xFFFFFF, Str_839C1E5 + .4byte 0xFFFFFF, Str_839C1F1 + .4byte 0xFFFFFF, Str_839C1FD + .4byte 0xFFFFFF, Str_839C208 + .4byte 0xFFFFFF, Str_839C20D + .4byte 0xFFFFFF, Str_839C216 + .4byte 0xFFFFFF, Str_839C21B + .4byte 0xFFFFFF, Str_839C222 + .4byte 0xFFFFFF, Str_839C22B + .4byte 0xFFFFFF, Str_839C234 + .4byte 0xFFFFFF, Str_839C23B + .4byte 0xFFFFFF, Str_839C243 + .4byte 0xFFFFFF, Str_839C24C + .4byte 0xFFFFFF, Str_839C255 + .4byte 0xFFFFFF, Str_839C25F + +_839C3FC: @ 0x839C3FC + .4byte Str_839C08E, DebugMenu_8078774+1 + .4byte Str_839C09B, DebugMenu_8078788+1 + .4byte Str_839C0A5, DebugMenu_807879C+1 + +Str_839C414: @ 0x839C414 + .string "ATTR:{STR_VAR_1} HEIGHT:{STR_VAR_3}\n" + .string "CODE:{STR_VAR_2}$" + +Str_839C42E: @ 0x839C42E + .string "レベル  ステージ$" + +Str_839C438: @ 0x839C438 + .string "ポロック グループ{STR_VAR_1}$" + +_839C444:: + .incbin "baserom_de_debug.gba", 0x39c444, 304 + +Str_839C574: @ 0x839C574 +gDebug0x839C574:: + .string "write to flash$" + +Str_839C583: @ 0x839C583 + .string "read from flash$" + + .align 2 +_839C594: @ 0x839C594 + .4byte gDebug0x839C574, DebugMenu_8078C80+1 + .4byte Str_839C583, DebugMenu_8078D30+1 + +Str_839C5A4: @ 0x839C5A4 + .string "Press A, begin to write\n" + .string "Press B, cancel$" + +Str_839C5CC: @ 0x839C5CC + .string "かきこみ せいこう$" + +Str_839C5D6: @ 0x839C5D6 + .string "よみこみせいこう$" + +Str_839C5DF: @ 0x839C5DF + .string "かきこみ しっぱい$" + +Str_839C5E9: @ 0x839C5E9 + .string "よみこみ しっぱい$" + +_839c5f3:: + .incbin "baserom_de_debug.gba", 0x39c5f3, 25 + +Str_839C60C: @ 0x839C60C +gDebug0x839C60C:: + .string "Set FLASH ERR$" + +Str_839C61A: @ 0x839C61A + .string "abcde; abcde: ABCDE; ABCDE:\p" + .string "Tableaux des verbes du 2{SUPER_E} groupe.\p" + .string "La1{SUPER_RE} chose à apprendre c’est de lire.\p" + .string "Tableaux des verbes du 1{SUPER_ER} groupe.\p" + .string "“あいうえおかきくけコさしすせそたちつてとな”\n" + .string "<にぬネのはひふへほマみむめもやゆよらりるれろわャッ>\p" + .string "をんゃゅょアイウエオカキクケサシスルレロワ,$" + + .endif diff --git a/graphics/debug/sprite_browser.pal b/graphics/debug/sprite_browser.pal new file mode 100644 index 000000000..ba4a6027c --- /dev/null +++ b/graphics/debug/sprite_browser.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +115 139 65 +255 0 0 +255 123 0 +255 255 0 +123 255 0 +0 255 0 +0 255 131 +0 255 255 +0 123 255 +0 0 255 +123 0 255 +255 0 255 +255 0 123 +0 0 0 +123 123 123 +255 255 255 +115 139 65 +255 0 0 +255 123 0 +255 255 0 +123 255 0 +0 255 0 +0 255 131 +0 255 255 +0 123 255 +0 0 255 +123 0 255 +255 0 255 +255 0 123 +0 0 0 +123 123 123 +255 255 255 +115 139 65 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 +49 49 49 diff --git a/graphics/debug/sprite_browser.png b/graphics/debug/sprite_browser.png new file mode 100644 index 000000000..b93ace2cd Binary files /dev/null and b/graphics/debug/sprite_browser.png differ diff --git a/ld_script.txt b/ld_script.txt index 7bc64638c..848ede7c5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -100,6 +100,7 @@ SECTIONS { src/engine/reset_rtc_screen.o(.text); src/field/party_menu.o(.text); src/field/start_menu.o(.text); + src/debug/start_menu_debug.o(.text); src/engine/menu.o(.text); src/engine/tileset_anim.o(.text); src/engine/palette.o(.text); @@ -354,6 +355,7 @@ SECTIONS { src/unused_8124F94.o(.text); src/engine/save.o(.text); src/engine/mystery_event_script.o(.text); + src/debug/unk_debug_menu_3.o(.text); src/field/field_effect_helpers.o(.text); src/contest_ai.o(.text); src/unused_81258BC.o(.text); @@ -522,6 +524,7 @@ SECTIONS { src/engine/reset_rtc_screen.o(.rodata); src/field/party_menu.o(.rodata); src/field/start_menu.o(.rodata); + data/start_menu_debug.o(.rodata); src/engine/menu.o(.rodata); src/engine/tileset_anim.o(.rodata); src/engine/palette.o(.rodata); @@ -575,6 +578,7 @@ SECTIONS { src/field/fldeff_decoration.o(.rodata); src/field/fldeff_recordmixing.o(.rodata); src/field/field_special_scene.o(.rodata); + src/battle/battle_records.o(.rodata); src/field/rotating_gate.o(.rodata); src/field/item_use.o(.rodata); data/battle_anim_80CA710.o(.rodata); @@ -632,6 +636,7 @@ SECTIONS { src/field/diploma.o(.rodata); src/strings.o(.rodata); src/field/berry_tag_screen.o(.rodata); + data/debug_mystery_event_menu.o(.rodata); src/engine/save_failed_screen.o(.rodata); src/pokemon/pokeblock_feed.o(.rodata); src/scene/intro_credits_graphics.o(.rodata); @@ -641,6 +646,7 @@ SECTIONS { data/strings2.o(.rodata); src/engine/menu_cursor.o(.rodata); src/engine/mystery_event_msg.o(.rodata); + data/debug_menu_3.o(.rodata); src/libs/m4a_tables.o(.rodata); data/sound_data.o(.rodata); } =0 diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c new file mode 100644 index 000000000..28f3a26d1 --- /dev/null +++ b/src/debug/start_menu_debug.c @@ -0,0 +1,6130 @@ +__attribute__((naked)) +void debug_sub_8076AC8() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " ldr r2, ._3\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x1\n" + " ldr r0, ._3 + 4\n" + " add r1, r1, r0\n" + " str r1, [r2]\n" + " mov r4, #0x0\n" + " ldrb r0, [r1]\n" + " cmp r0, #0xff\n" + " beq ._1 @cond_branch\n" + "._2:\n" + " add r4, r4, #0x1\n" + " add r0, r1, r4\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " bne ._2 @cond_branch\n" + "._1:\n" + " mov r0, #0x10\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuZeroFillWindowRect\n" + " lsl r3, r4, #0x1\n" + " add r3, r3, #0x1\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0x10\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " bl MenuDrawTextWindow\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r3, ._3 + 8\n" + " ldr r0, ._3\n" + " ldr r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, #0x11\n" + " mov r1, #0x1\n" + " add r2, r4, #0\n" + " bl PrintMenuItemsReordered\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0xc\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x11\n" + " mov r2, #0x1\n" + " add r3, r4, #0\n" + " bl InitMenu\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word 0x30006c4 @ gTileset1AnimLength\n" + " .word gUnknown_Debug_0839BBC1+0x153\n" + " .word gUnknown_Debug_0839BBC1+0xd3\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8076B4C() +{ + asm( + " push {lr}\n" + " ldr r0, ._6\n" + " bl FindTaskIdByFunc\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0xff\n" + " beq ._5 @cond_branch\n" + " bl DestroyTask\n" + "._5:\n" + " pop {r0}\n" + " bx r0\n" + "._7:\n" + " .align 2, 0\n" + "._6:\n" + " .word debug_sub_8076BB4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8076B68() +{ + asm( + " push {lr}\n" + " ldr r0, ._8\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r0, ._8 + 4\n" + " mov r1, #0x1\n" + " mov r2, #0x3\n" + " bl MenuPrint\n" + " ldr r0, ._8 + 8\n" + " mov r1, #0x1\n" + " mov r2, #0x9\n" + " bl MenuPrint\n" + " mov r0, #0x4\n" + " mov r1, #0xb\n" + " bl debug_sub_8077CF4\n" + " mov r0, #0x0\n" + " bl debug_sub_8076AC8\n" + " ldr r0, ._8 + 12\n" + " mov r1, #0x1\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._9:\n" + " .align 2, 0\n" + "._8:\n" + " .word gUnknown_Debug_0839BBB6\n" + " .word gUnknown_Debug_0839BBC1\n" + " .word gUnknown_Debug_0839BBA4\n" + " .word debug_sub_8076BB4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8076BB4() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " ldr r0, ._13\n" + " add r5, r1, r0\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r1, r0, #0x18\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._10 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r4, r0\n" + " beq ._11 @cond_branch\n" + " ldr r2, ._13 + 4\n" + " lsl r1, r1, #0x18\n" + " asr r1, r1, #0x18\n" + " ldr r0, ._13 + 8\n" + " ldr r0, [r0]\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r2, r2, #0x4\n" + " add r0, r0, r2\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " b ._24\n" + "._14:\n" + " .align 2, 0\n" + "._13:\n" + " .word gTasks+0x8\n" + " .word gUnknown_Debug_0839BBC1+0xd3\n" + " .word 0x30006c4 @ gTileset1AnimLength\n" + "._10:\n" + " ldr r0, ._18\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " cmp r2, #0\n" + " beq ._15 @cond_branch\n" + " ldrh r1, [r5]\n" + " mov r2, #0x0\n" + " ldsh r0, [r5, r2]\n" + " cmp r0, #0\n" + " bne ._16 @cond_branch\n" + " mov r0, #0x1\n" + " b ._20\n" + "._19:\n" + " .align 2, 0\n" + "._18:\n" + " .word gMain\n" + "._16:\n" + " sub r0, r1, #1\n" + " b ._20\n" + "._15:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._24 @cond_branch\n" + " ldrh r1, [r5]\n" + " mov r3, #0x0\n" + " ldsh r0, [r5, r3]\n" + " cmp r0, #0x1\n" + " bne ._22 @cond_branch\n" + " strh r2, [r5]\n" + " b ._23\n" + "._22:\n" + " add r0, r1, #1\n" + "._20:\n" + " strh r0, [r5]\n" + "._23:\n" + " ldrb r0, [r5]\n" + " bl debug_sub_8076AC8\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " b ._24\n" + "._11:\n" + " bl DoSoftReset\n" + "._24:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076C6C() +{ + asm( + " push {lr}\n" + " ldr r0, ._25\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._26:\n" + " .align 2, 0\n" + "._25:\n" + " .word debug_sub_8010800+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076C80() +{ + asm( + " push {lr}\n" + " bl debug_sub_8076B4C\n" + " bl DebugMenu_8076FEC\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076C90() +{ + asm( + " push {lr}\n" + " ldr r0, ._29\n" + " ldrh r0, [r0]\n" + " cmp r0, #0xff\n" + " bne ._27 @cond_branch\n" + " mov r0, #0x16\n" + " bl PlaySE\n" + " b ._28\n" + "._30:\n" + " .align 2, 0\n" + "._29:\n" + " .word gSaveFileStatus\n" + "._27:\n" + " bl debug_sub_8076B4C\n" + " ldr r0, ._31\n" + " bl SetMainCallback2\n" + "._28:\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._32:\n" + " .align 2, 0\n" + "._31:\n" + " .word CB2_ContinueSavedGame+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076CBC() +{ + asm( + " mov r0, #0x0\n" + " bx lr\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076CC0() +{ + asm( + " push {lr}\n" + " ldr r0, ._33\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._34:\n" + " .align 2, 0\n" + "._33:\n" + " .word debug_nullsub_66+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076CD4() +{ + asm( + " mov r0, #0x0\n" + " bx lr\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076CD8() +{ + asm( + " push {lr}\n" + " ldr r0, ._35\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._36:\n" + " .align 2, 0\n" + "._35:\n" + " .word unref_sub_80524BC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076CEC() +{ + asm( + " push {lr}\n" + " ldr r0, ._37\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._38:\n" + " .align 2, 0\n" + "._37:\n" + " .word CB2_InitMysteryEventMenu+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076D00() +{ + asm( + " push {lr}\n" + " ldr r0, ._39\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._40:\n" + " .align 2, 0\n" + "._39:\n" + " .word debug_sub_815D15C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076D14() +{ + asm( + " push {lr}\n" + " ldr r0, ._41\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._42:\n" + " .align 2, 0\n" + "._41:\n" + " .word sub_804B790+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076D28() +{ + asm( + " push {lr}\n" + " ldr r0, ._43\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._44:\n" + " .align 2, 0\n" + "._43:\n" + " .word LinkTestScreen+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076D3C() +{ + asm( + " push {lr}\n" + " ldr r0, ._45\n" + " bl SetMainCallback2\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._46:\n" + " .align 2, 0\n" + "._45:\n" + " .word CB2_StartSoundCheckMenu+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076D50() +{ + asm( + " push {lr}\n" + " bl ClearSaveData\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076D5C() +{ + asm( + " push {lr}\n" + " bl debug_sub_8076B4C\n" + " bl debug_sub_806F8F8\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076D6C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " lsl r0, r3, #0x2\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._51\n" + " add r4, r0, r1\n" + " mov r0, #0x0\n" + " ldsh r1, [r4, r0]\n" + " cmp r1, #0x1\n" + " beq ._47 @cond_branch\n" + " cmp r1, #0x1\n" + " bgt ._48 @cond_branch\n" + " cmp r1, #0\n" + " beq ._49 @cond_branch\n" + " b ._64\n" + "._52:\n" + " .align 2, 0\n" + "._51:\n" + " .word gTasks+0x8\n" + "._48:\n" + " cmp r1, #0x2\n" + " beq ._53 @cond_branch\n" + " b ._64\n" + "._49:\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._56\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " b ._55\n" + "._57:\n" + " .align 2, 0\n" + "._56:\n" + " .word gUnknown_Debug_0839BBC1+0x16b\n" + "._47:\n" + " ldr r0, ._60\n" + " ldrh r2, [r0, #0x2e]\n" + " and r1, r1, r2\n" + " cmp r1, #0\n" + " beq ._58 @cond_branch\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._60 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " mov r0, #0x49\n" + " bl PlaySE\n" + " bl RtcReset\n" + "._55:\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4]\n" + " b ._64\n" + "._61:\n" + " .align 2, 0\n" + "._60:\n" + " .word gMain\n" + " .word gUnknown_Debug_0839BBC1+0x18b\n" + "._58:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._64 @cond_branch\n" + " add r0, r3, #0\n" + " bl DestroyTask\n" + " bl DoSoftReset\n" + " b ._64\n" + "._53:\n" + " ldr r0, ._65\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._64 @cond_branch\n" + " add r0, r3, #0\n" + " bl DestroyTask\n" + " bl DoSoftReset\n" + "._64:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._66:\n" + " .align 2, 0\n" + "._65:\n" + " .word gMain\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076E18() +{ + asm( + " push {lr}\n" + " bl debug_sub_8076B4C\n" + " ldr r0, ._67\n" + " mov r1, #0xa\n" + " bl CreateTask\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._68:\n" + " .align 2, 0\n" + "._67:\n" + " .word DebugMenu_8076D6C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076E30() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " lsl r0, r3, #0x2\n" + " add r0, r0, r3\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._73\n" + " add r4, r0, r1\n" + " mov r0, #0x0\n" + " ldsh r1, [r4, r0]\n" + " cmp r1, #0x1\n" + " beq ._69 @cond_branch\n" + " cmp r1, #0x1\n" + " bgt ._70 @cond_branch\n" + " cmp r1, #0\n" + " beq ._71 @cond_branch\n" + " b ._86\n" + "._74:\n" + " .align 2, 0\n" + "._73:\n" + " .word gTasks+0x8\n" + "._70:\n" + " cmp r1, #0x2\n" + " beq ._75 @cond_branch\n" + " b ._86\n" + "._71:\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._78\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " b ._77\n" + "._79:\n" + " .align 2, 0\n" + "._78:\n" + " .word gUnknown_Debug_0839BBC1+0x199\n" + "._69:\n" + " ldr r0, ._82\n" + " ldrh r2, [r0, #0x2e]\n" + " and r1, r1, r2\n" + " cmp r1, #0\n" + " beq ._80 @cond_branch\n" + " bl MenuDisplayMessageBox\n" + " bl sub_813B79C\n" + " ldr r0, ._82 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " mov r0, #0x49\n" + " bl PlaySE\n" + "._77:\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4]\n" + " b ._86\n" + "._83:\n" + " .align 2, 0\n" + "._82:\n" + " .word gMain\n" + " .word gUnknown_Debug_0839BBC1+0x1bc\n" + "._80:\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._86 @cond_branch\n" + " add r0, r3, #0\n" + " bl DestroyTask\n" + " bl DoSoftReset\n" + " b ._86\n" + "._75:\n" + " ldr r0, ._87\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._86 @cond_branch\n" + " add r0, r3, #0\n" + " bl DestroyTask\n" + " bl DoSoftReset\n" + "._86:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._88:\n" + " .align 2, 0\n" + "._87:\n" + " .word gMain\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076EDC() +{ + asm( + " push {lr}\n" + " bl debug_sub_8076B4C\n" + " ldr r0, ._89\n" + " mov r1, #0xa\n" + " bl CreateTask\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._90:\n" + " .align 2, 0\n" + "._89:\n" + " .word DebugMenu_8076E30+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076EF4() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xb\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " ldr r4, ._93\n" + " mov r0, #0x2\n" + " mov r1, #0x1\n" + " mov r2, #0x8\n" + " add r3, r4, #0\n" + " bl PrintMenuItems\n" + " mov r5, #0x0\n" + " add r4, r4, #0x4\n" + "._92:\n" + " lsl r0, r5, #0x3\n" + " add r0, r0, r4\n" + " ldr r1, [r0]\n" + " mov r0, #0x1\n" + " and r1, r1, r0\n" + " mov r0, #0xb6\n" + " cmp r1, #0\n" + " bne ._91 @cond_branch\n" + " mov r0, #0xb5\n" + "._91:\n" + " lsl r2, r5, #0x1\n" + " add r2, r2, #0x1\n" + " lsl r2, r2, #0x18\n" + " lsr r2, r2, #0x18\n" + " mov r1, #0xa\n" + " bl sub_8071F60\n" + " add r0, r5, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " cmp r5, #0x7\n" + " bls ._92 @cond_branch\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x9\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " add sp, sp, #0x8\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._94:\n" + " .align 2, 0\n" + "._93:\n" + " .word gUnknown_Debug_0839BBC1+0x203\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076F60() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " bl ProcessMenuInput\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " lsl r4, r4, #0x18\n" + " asr r4, r4, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._97 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r4, r0\n" + " bne ._96 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " bl debug_sub_8076B68\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + " b ._97\n" + "._96:\n" + " ldr r3, ._100\n" + " lsl r2, r2, #0x18\n" + " asr r2, r2, #0x15\n" + " add r0, r3, #4\n" + " add r0, r2, r0\n" + " ldrb r4, [r0]\n" + " ldr r0, ._100 + 4\n" + " mov r1, #0x1\n" + " and r1, r1, r4\n" + " strb r1, [r0, #0x8]\n" + " add r2, r2, r3\n" + " ldr r1, [r2]\n" + " bl StringCopy\n" + " mov r0, #0x80\n" + " and r4, r4, r0\n" + " cmp r4, #0\n" + " bne ._98 @cond_branch\n" + " mov r0, #0x0\n" + " bl debug_sub_8057508\n" + " b ._99\n" + "._101:\n" + " .align 2, 0\n" + "._100:\n" + " .word gUnknown_Debug_0839BBC1+0x203\n" + " .word gSaveBlock2\n" + "._98:\n" + " mov r0, #0x1\n" + " bl debug_sub_8057508\n" + "._99:\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + " ldr r0, ._102\n" + " bl SetMainCallback2\n" + "._97:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._103:\n" + " .align 2, 0\n" + "._102:\n" + " .word debug_sub_8058C00+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8076FEC() +{ + asm( + " push {lr}\n" + " bl DebugMenu_8076EF4\n" + " ldr r0, ._104\n" + " mov r1, #0xa\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._105:\n" + " .align 2, 0\n" + "._104:\n" + " .word DebugMenu_8076F60+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077004() +{ + asm( + " ldr r2, ._106\n" + " ldr r0, ._106 + 4\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._106 + 8\n" + " add r0, r0, r1\n" + " str r0, [r2]\n" + " bx lr\n" + "._107:\n" + " .align 2, 0\n" + "._106:\n" + " .word 0x30006c4 @ gTileset1AnimLength\n" + " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" + " .word gDebug0x839B9BC+0x1a8\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077020() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, ._109\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._108 @cond_branch\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + "._108:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._110:\n" + " .align 2, 0\n" + "._109:\n" + " .word gCallback_03004AE8\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077048() +{ + asm( + " push {lr}\n" + " ldr r0, ._111\n" + " ldr r1, ._111 + 4\n" + " str r1, [r0]\n" + " bl ScriptContext2_Enable\n" + " ldr r0, ._111 + 8\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " pop {r0}\n" + " bx r0\n" + "._112:\n" + " .align 2, 0\n" + "._111:\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_807706C+1\n" + " .word DebugMenu_8077020+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807706C() +{ + asm( + " push {lr}\n" + " ldr r0, ._113\n" + " bl InitMenuWindow\n" + " bl DebugMenu_8077004\n" + " bl DebugMenu_807719C\n" + " bl DebugMenu_80771EC\n" + " bl DebugMenu_8077238\n" + " ldr r1, ._113 + 4\n" + " ldr r0, ._113 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._114:\n" + " .align 2, 0\n" + "._113:\n" + " .word gWindowConfig_81E6CE4\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_807709C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807709C() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._120\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._115 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + " ldr r1, ._120 + 4\n" + " strb r0, [r1]\n" + "._115:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._116 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + " ldr r1, ._120 + 4\n" + " strb r0, [r1]\n" + "._116:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._117 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._120 + 8\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " bne ._118 @cond_branch\n" + " mov r0, #0x7\n" + " b ._119\n" + "._121:\n" + " .align 2, 0\n" + "._120:\n" + " .word gMain\n" + " .word 0x030006c0 @ gNumTilesetAnimDmas\n" + " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" + "._118:\n" + " sub r0, r0, #0x1\n" + "._119:\n" + " strb r0, [r1]\n" + " bl DebugMenu_8077004\n" + " bl DebugMenu_807719C\n" + "._117:\n" + " ldr r0, ._125\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._122 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._125 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x7\n" + " bne ._123 @cond_branch\n" + " mov r0, #0x0\n" + " b ._124\n" + "._126:\n" + " .align 2, 0\n" + "._125:\n" + " .word gMain\n" + " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" + "._123:\n" + " add r0, r0, #0x1\n" + "._124:\n" + " strb r0, [r1]\n" + " bl DebugMenu_8077004\n" + " bl DebugMenu_807719C\n" + "._122:\n" + " ldr r0, ._129\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._127 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r1, ._129 + 4\n" + " ldr r0, ._129 + 8\n" + " ldrb r2, [r0]\n" + " ldr r0, ._129 + 12\n" + " ldr r0, [r0]\n" + " add r0, r0, r2\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " add r1, r1, #0x4\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " bl gScriptFuncs_End+0x3cf4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " b ._132\n" + "._130:\n" + " .align 2, 0\n" + "._129:\n" + " .word gMain\n" + " .word gDebug0x839B9BC\n" + " .word 0x030006c0 @ gNumTilesetAnimDmas\n" + " .word 0x30006c4 @ gTileset1AnimLength\n" + "._127:\n" + " mov r0, #0xa\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._131 @cond_branch\n" + " mov r0, #0x0\n" + " b ._132\n" + "._131:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._132:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807719C() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0xe\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " ldr r3, ._133\n" + " ldr r0, ._133 + 4\n" + " ldr r0, [r0]\n" + " str r0, [sp]\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " mov r2, #0x8\n" + " bl PrintMenuItemsReordered\n" + " ldr r4, ._133 + 8\n" + " ldrb r0, [r4]\n" + " str r0, [sp]\n" + " mov r0, #0xd\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " mov r3, #0x8\n" + " bl InitMenu\n" + " strb r0, [r4]\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._134:\n" + " .align 2, 0\n" + "._133:\n" + " .word gDebug0x839B9BC\n" + " .word 0x30006c4 @ gTileset1AnimLength\n" + " .word 0x030006c0 @ gNumTilesetAnimDmas\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80771EC() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._135\n" + " ldr r1, ._135 + 4\n" + " bl StringCopy\n" + " ldr r4, ._135 + 8\n" + " mov r1, #0x4\n" + " ldsb r1, [r4, r1]\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r1, #0x5\n" + " ldsb r1, [r4, r1]\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, #0x13\n" + " mov r1, #0xc\n" + " mov r2, #0x1d\n" + " mov r3, #0xf\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._135\n" + " mov r1, #0x14\n" + " mov r2, #0xd\n" + " bl MenuPrint\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._136:\n" + " .align 2, 0\n" + "._135:\n" + " .word gStringVar4\n" + " .word gUnknown_Debug_0839BBC1+0x243\n" + " .word gSaveBlock1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077238() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xffffffe8\n" + " ldr r1, ._139\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, sp, #0x4\n" + " mov r9, r0\n" + " ldr r1, ._139 + 4\n" + " mov r2, #0x3\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r1, sp, #0x8\n" + " mov sl, r1\n" + " ldr r1, ._139 + 8\n" + " mov r0, sl\n" + " mov r2, #0x3\n" + " bl gScriptFuncs_End+0x5bc4\n" + " mov r2, #0x0\n" + " str r2, [sp, #0x14]\n" + " add r4, sp, #0x10\n" + " mov r6, sp\n" + " add r6, r6, #0x12\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl PlayerGetDestCoords\n" + " mov r1, #0x0\n" + " ldsh r0, [r4, r1]\n" + " mov r2, #0x0\n" + " ldsh r1, [r6, r2]\n" + " bl MapGridGetZCoordAt\n" + " mov r8, r0\n" + " mov r0, r8\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r8, r0\n" + " ldrh r0, [r4]\n" + " sub r0, r0, #0x7\n" + " strh r0, [r4]\n" + " ldrh r0, [r6]\n" + " sub r0, r0, #0x7\n" + " strh r0, [r6]\n" + " ldr r7, ._139 + 12\n" + " add r0, r7, #0\n" + " mov r1, sp\n" + " bl StringCopy\n" + " add r5, sp, #0xc\n" + " mov r2, #0x0\n" + " ldsh r1, [r4, r2]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r7, #0\n" + " add r1, r5, #0\n" + " bl StringAppend\n" + " add r0, r7, #0\n" + " mov r1, r9\n" + " bl StringAppend\n" + " mov r0, #0x0\n" + " ldsh r1, [r6, r0]\n" + " add r0, r5, #0\n" + " mov r2, #0x0\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r7, #0\n" + " add r1, r5, #0\n" + " bl StringAppend\n" + " add r0, r7, #0\n" + " mov r1, sl\n" + " bl StringAppend\n" + " add r0, r5, #0\n" + " mov r1, r8\n" + " mov r2, #0x0\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r7, #0\n" + " add r1, r5, #0\n" + " bl StringAppend\n" + " ldrb r0, [r7]\n" + " cmp r0, #0xff\n" + " beq ._137 @cond_branch\n" + " add r1, r7, #0\n" + "._138:\n" + " ldr r0, [sp, #0x14]\n" + " add r0, r0, #0x1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " str r0, [sp, #0x14]\n" + " add r0, r0, r1\n" + " ldrb r0, [r0]\n" + " cmp r0, #0xff\n" + " bne ._138 @cond_branch\n" + "._137:\n" + " mov r0, #0x1c\n" + " ldr r1, [sp, #0x14]\n" + " sub r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x10\n" + " mov r2, #0x1d\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._139 + 12\n" + " mov r1, #0x1d\n" + " ldr r2, [sp, #0x14]\n" + " sub r1, r1, r2\n" + " lsl r1, r1, #0x18\n" + " lsr r1, r1, #0x18\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " add sp, sp, #0x18\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._140:\n" + " .align 2, 0\n" + "._139:\n" + " .word gUnknown_Debug_0839BBC1+0x246\n" + " .word gUnknown_Debug_0839BBC1+0x248\n" + " .word gUnknown_Debug_0839BBC1+0x24b\n" + " .word gStringVar4\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_Exit() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenSogabe() +{ + asm( + " push {lr}\n" + " bl unref_sub_814A414\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenTamada() +{ + asm( + " push {lr}\n" + " bl debug_sub_8075C30\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenKagaya() +{ + asm( + " push {lr}\n" + " bl InitKagayaDebugMenu_A\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenMatsuda() +{ + asm( + " push {lr}\n" + " bl unref_sub_80A9B28\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenNohara() +{ + asm( + " push {lr}\n" + " bl InitNoharaDebugMenu\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenWatanabe() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._141\n" + " bl SetMainCallback2\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._142:\n" + " .align 2, 0\n" + "._141:\n" + " .word InitWatanabeDebugMenu+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_EndSequenceDemo() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._143\n" + " bl SetMainCallback2\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._144:\n" + " .align 2, 0\n" + "._143:\n" + " .word sub_81439D0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_HallOfFame() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl GameClear\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenSizeComparison() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl InitSizeComparison\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_HoennNationalDex() +{ + asm( + " push {lr}\n" + " bl IsNationalPokedexEnabled\n" + " cmp r0, #0\n" + " beq ._145 @cond_branch\n" + " bl DisableNationalPokedex\n" + " b ._146\n" + "._145:\n" + " bl EnableNationalPokedex\n" + "._146:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077434() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x4\n" + " bhi ._165 @cond_branch\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._149\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._150:\n" + " .align 2, 0\n" + "._149:\n" + " .word ._148\n" + "._148:\n" + " .word ._151\n" + " .word ._152\n" + " .word ._153\n" + " .word ._154\n" + " .word ._155\n" + "._151:\n" + " ldr r0, ._157\n" + " mov r1, #0x1\n" + " mov r2, #0x4\n" + " bl GetEnigmaBerryChecksum\n" + " mov r0, #0xff\n" + " str r0, [sp]\n" + " str r0, [sp, #0x4]\n" + " mov r1, #0xff\n" + " mov r2, #0xff\n" + " mov r3, #0x0\n" + " bl debug_sub_80C2D24\n" + " b ._165\n" + "._158:\n" + " .align 2, 0\n" + "._157:\n" + " .word gUnknown_Debug_0839BBC1+0x24e\n" + "._152:\n" + " ldr r0, ._160\n" + " mov r1, #0x2\n" + " mov r2, #0x0\n" + " bl GetEnigmaBerryChecksum\n" + " mov r0, #0xff\n" + " str r0, [sp]\n" + " str r0, [sp, #0x4]\n" + " mov r1, #0xff\n" + " mov r2, #0x0\n" + " b ._159\n" + "._161:\n" + " .align 2, 0\n" + "._160:\n" + " .word gUnknown_Debug_0839BBC1+0x251\n" + "._153:\n" + " ldr r0, ._163\n" + " mov r1, #0x3\n" + " mov r2, #0x0\n" + " bl GetEnigmaBerryChecksum\n" + " mov r0, #0xff\n" + " str r0, [sp]\n" + " str r0, [sp, #0x4]\n" + " mov r1, #0x0\n" + " b ._162\n" + "._164:\n" + " .align 2, 0\n" + "._163:\n" + " .word gUnknown_Debug_0839BBC1+0x255\n" + "._154:\n" + " ldr r0, ._166\n" + " mov r1, #0x4\n" + " mov r2, #0x0\n" + " bl GetEnigmaBerryChecksum\n" + " mov r0, #0xff\n" + " str r0, [sp]\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0xff\n" + "._162:\n" + " mov r2, #0xff\n" + "._159:\n" + " mov r3, #0xff\n" + " bl debug_sub_80C2D24\n" + " b ._165\n" + "._167:\n" + " .align 2, 0\n" + "._166:\n" + " .word gUnknown_Debug_0839BBC1+0x259\n" + "._155:\n" + " ldr r0, ._168\n" + " mov r1, #0x4\n" + " mov r2, #0x0\n" + " bl GetEnigmaBerryChecksum\n" + " mov r0, #0xff\n" + " str r0, [sp]\n" + " str r0, [sp, #0x4]\n" + " mov r1, #0xff\n" + " mov r2, #0xff\n" + " mov r3, #0xff\n" + " bl debug_sub_80C2D24\n" + "._165:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._169:\n" + " .align 2, 0\n" + "._168:\n" + " .word gUnknown_Debug_0839BBC1+0x25d\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807750C() +{ + asm( + " push {lr}\n" + " ldr r0, ._170\n" + " bl DebugMenu_8077D78\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._171:\n" + " .align 2, 0\n" + "._170:\n" + " .word gUnknown_Debug_0839BBC1+0x263\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_SetRamBerry() +{ + asm( + " push {lr}\n" + " ldr r0, ._172\n" + " mov r1, #0xc\n" + " mov r2, #0x5\n" + " bl DebugMenu_8077D24\n" + " ldr r1, ._172 + 4\n" + " ldr r0, ._172 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._173:\n" + " .align 2, 0\n" + "._172:\n" + " .word gUnknown_Debug_0839BBC1+0x263\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_807750C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_ToggleBGM() +{ + asm( + " push {lr}\n" + " ldr r2, ._175\n" + " mov r1, #0x0\n" + " ldrb r0, [r2]\n" + " cmp r0, #0\n" + " bne ._174 @cond_branch\n" + " mov r1, #0x1\n" + "._174:\n" + " strb r1, [r2]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._176:\n" + " .align 2, 0\n" + "._175:\n" + " .word gDisableMusic\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_BattleForDebug() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl InitBattleForDebug\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_NationalDex() +{ + asm( + " push {r4, r5, lr}\n" + " mov r4, #0x0\n" + " ldr r5, ._178\n" + "._177:\n" + " add r4, r4, #0x1\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " bl GetNationalPokedexFlag\n" + " add r0, r4, #0\n" + " mov r1, #0x3\n" + " bl GetNationalPokedexFlag\n" + " cmp r4, r5\n" + " bls ._177 @cond_branch\n" + " ldr r1, ._178 + 4\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "._179:\n" + " .align 2, 0\n" + "._178:\n" + " .word 0x181\n" + " .word gUnknown_03005CE8\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_HoennDex() +{ + asm( + " push {r4, r5, lr}\n" + " mov r5, #0x0\n" + "._180:\n" + " add r5, r5, #0x1\n" + " lsl r5, r5, #0x10\n" + " lsr r5, r5, #0x10\n" + " add r0, r5, #0\n" + " bl HoennToNationalOrder\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " bl GetNationalPokedexFlag\n" + " add r0, r4, #0\n" + " mov r1, #0x3\n" + " bl GetNationalPokedexFlag\n" + " cmp r5, #0xc9\n" + " bls ._180 @cond_branch\n" + " ldr r1, ._181\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "._182:\n" + " .align 2, 0\n" + "._181:\n" + " .word gUnknown_03005CE8\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_CreatePKMN() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl InitCreatePokemon\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_ViewPokemonGraphics() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl InitSeePokemonGraphics\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenSeeTrainers() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl InitSeeTrainers\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenMori() +{ + asm( + " push {lr}\n" + " bl InitMoriDebugMenu\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenTomomichi() +{ + asm( + " push {lr}\n" + " bl InitTomomichiDebugWindow\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenAoki() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenTaya() +{ + asm( + " push {lr}\n" + " bl InitTayaDebugWindow\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenNakamura() +{ + asm( + " push {lr}\n" + " bl InitNakamuraDebugMenu\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenIwasawa() +{ + asm( + " push {lr}\n" + " bl debug_sub_8138CC4\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_Teleport() +{ + asm( + " push {lr}\n" + " bl sub_8053570\n" + " bl sub_8080E88\n" + " bl ScriptContext2_Enable\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_EditPKMN() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " bl debug_sub_815FFDC\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80776B4() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffff8\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r1, ._183\n" + " mov r0, sp\n" + " mov r2, #0x7\n" + " bl gScriptFuncs_End+0x5bc4\n" + " lsl r3, r4, #0x1\n" + " lsl r5, r4, #0x19\n" + " lsr r5, r5, #0x18\n" + " add r3, r3, #0x1\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0x19\n" + " add r1, r5, #0\n" + " mov r2, #0x1d\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r0, ._183 + 4\n" + " ldrb r0, [r0]\n" + " ASR r0, r4\n" + " mov r1, #0x1\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, sp\n" + " mov r1, #0x19\n" + " add r2, r5, #0\n" + " bl MenuPrint\n" + " add sp, sp, #0x8\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._184:\n" + " .align 2, 0\n" + "._183:\n" + " .word gUnknown_Debug_0839BBC1+0x28b\n" + " .word 0x30006c8 @ gTileset2AnimLength\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077704() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xffffffec\n" + " ldr r1, ._185\n" + " mov r0, sp\n" + " mov r2, #0x11\n" + " bl gScriptFuncs_End+0x5bc4\n" + " mov r0, #0x13\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x8\n" + " bl MenuFillWindowRectWithBlankTile\n" + " mov r0, sp\n" + " mov r1, #0x15\n" + " mov r2, #0x0\n" + " bl MenuPrint\n" + " ldr r2, ._185 + 4\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x13\n" + " ldrh r0, [r0]\n" + " lsr r0, r0, #0x8\n" + " mov r1, #0xf\n" + " and r0, r0, r1\n" + " strb r0, [r2]\n" + " mov r0, #0x0\n" + " bl DebugMenu_80776B4\n" + " mov r0, #0x1\n" + " bl DebugMenu_80776B4\n" + " mov r0, #0x2\n" + " bl DebugMenu_80776B4\n" + " mov r0, #0x3\n" + " bl DebugMenu_80776B4\n" + " add sp, sp, #0x14\n" + " pop {r0}\n" + " bx r0\n" + "._186:\n" + " .align 2, 0\n" + "._185:\n" + " .word gUnknown_Debug_0839BBC1+0x292\n" + " .word 0x30006c8 @ gTileset2AnimLength\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077760() +{ + asm( + " push {r4, r5, lr}\n" + " ldr r2, ._190\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " add r5, r2, #0\n" + " cmp r0, #0\n" + " beq ._187 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " bl MoveMenuCursor\n" + " ldr r1, ._190 + 4\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._188 @cond_branch\n" + " sub r0, r0, #0x1\n" + " b ._189\n" + "._191:\n" + " .align 2, 0\n" + "._190:\n" + " .word gMain\n" + " .word 0x030006b0+0x8 @ gMenu+0x8\n" + "._188:\n" + " mov r0, #0x3\n" + "._189:\n" + " strb r0, [r1]\n" + "._187:\n" + " ldrh r1, [r5, #0x2e]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._192 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + " bl MoveMenuCursor\n" + " ldr r1, ._195\n" + " ldrb r0, [r1]\n" + " cmp r0, #0x3\n" + " beq ._193 @cond_branch\n" + " add r0, r0, #0x1\n" + " b ._194\n" + "._196:\n" + " .align 2, 0\n" + "._195:\n" + " .word 0x030006b0+0x8 @ gMenu+0x8\n" + "._193:\n" + " mov r0, #0x0\n" + "._194:\n" + " strb r0, [r1]\n" + "._192:\n" + " ldrh r1, [r5, #0x2e]\n" + " mov r0, #0x30\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._197 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r4, ._201\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x1\n" + " LSL r1, r0\n" + " ldrb r0, [r4]\n" + " eor r1, r1, r0\n" + " strb r1, [r4]\n" + " bl GetMenuCursorPos\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl DebugMenu_80776B4\n" + "._197:\n" + " ldrh r2, [r5, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " bne ._198 @cond_branch\n" + " mov r0, #0x2\n" + " and r0, r0, r2\n" + " cmp r0, #0\n" + " beq ._199 @cond_branch\n" + "._198:\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x13\n" + " ldrh r0, [r2]\n" + " ldr r1, ._201 + 4\n" + " and r1, r1, r0\n" + " ldr r0, ._201\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x8\n" + " add r1, r1, r0\n" + " strh r1, [r2]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._200\n" + "._202:\n" + " .align 2, 0\n" + "._201:\n" + " .word 0x30006c8 @ gTileset2AnimLength\n" + " .word 0xf0ff\n" + "._199:\n" + " mov r0, #0x0\n" + "._200:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_SwitchBG() +{ + asm( + " push {lr}\n" + " add sp, sp, #0xfffffff8\n" + " bl MenuZeroFillScreen\n" + " bl DebugMenu_8077704\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " mov r0, #0x6\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x0\n" + " mov r1, #0x14\n" + " mov r2, #0x0\n" + " mov r3, #0x4\n" + " bl InitMenu\n" + " ldr r1, ._203\n" + " ldr r0, ._203 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " add sp, sp, #0x8\n" + " pop {r1}\n" + " bx r1\n" + "._204:\n" + " .align 2, 0\n" + "._203:\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077760+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807786C() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffff8\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " ldr r1, ._205\n" + " mov r0, sp\n" + " mov r2, #0x7\n" + " bl gScriptFuncs_End+0x5bc4\n" + " mov r0, #0x19\n" + " mov r1, #0x0\n" + " mov r2, #0x1d\n" + " mov r3, #0x3\n" + " bl MenuDrawTextWindow\n" + " lsl r0, r4, #0x1\n" + " add r0, r0, r4\n" + " add r0, r0, sp\n" + " mov r1, #0x1a\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " add sp, sp, #0x8\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._206:\n" + " .align 2, 0\n" + "._205:\n" + " .word gUnknown_Debug_0839BBC1+0x2a3\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80778A8() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._211\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x30\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._207 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r2, ._211 + 4\n" + " ldrb r0, [r2]\n" + " mov r1, #0x1\n" + " eor r0, r0, r1\n" + " strb r0, [r2]\n" + " ldrb r0, [r2]\n" + " bl DebugMenu_807786C\n" + "._207:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._208 @cond_branch\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._209 @cond_branch\n" + "._208:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._210\n" + "._212:\n" + " .align 2, 0\n" + "._211:\n" + " .word gMain\n" + " .word sWildEncountersDisabled\n" + "._209:\n" + " mov r0, #0x0\n" + "._210:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_ControlEncounter() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._213\n" + " ldrb r0, [r0]\n" + " bl DebugMenu_807786C\n" + " ldr r1, ._213 + 4\n" + " ldr r0, ._213 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._214:\n" + " .align 2, 0\n" + "._213:\n" + " .word sWildEncountersDisabled\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_80778A8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_UseHM() +{ + asm( + " ldr r1, ._215\n" + " ldr r0, ._215 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " bx lr\n" + "._216:\n" + " .align 2, 0\n" + "._215:\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077C14+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077934() +{ + asm( + " push {lr}\n" + " mov r1, #0x0\n" + " ldr r3, ._218\n" + " mov r2, #0x1\n" + "._217:\n" + " add r0, r1, r3\n" + " strb r2, [r0]\n" + " add r1, r1, #0x1\n" + " cmp r1, #0x63\n" + " bls ._217 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._219:\n" + " .align 2, 0\n" + "._218:\n" + " .word gSaveBlock1+0x97a\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077954() +{ + asm( + " push {lr}\n" + " mov r1, #0x0\n" + " ldr r3, ._222\n" + " mov r2, #0x0\n" + "._221:\n" + " add r0, r1, r3\n" + " strb r2, [r0]\n" + " add r1, r1, #0x1\n" + " cmp r1, #0x63\n" + " bls ._221 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._223:\n" + " .align 2, 0\n" + "._222:\n" + " .word gSaveBlock1+0x97a\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077974() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r1, ._226\n" + " mov r0, #0x4\n" + " ldsb r0, [r1, r0]\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " ldrb r1, [r1, #0x5]\n" + " lsl r1, r1, #0x18\n" + " asr r1, r1, #0x18\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " bl unref_sub_8082C2C\n" + " cmp r0, #0\n" + " beq ._224 @cond_branch\n" + " ldr r0, ._226 + 4\n" + " ldr r1, ._226 + 8\n" + " bl StringCopy\n" + " b ._225\n" + "._227:\n" + " .align 2, 0\n" + "._226:\n" + " .word gSaveBlock1\n" + " .word gStringVar1\n" + " .word gUnknown_Debug_0839BBC1+0x2cc\n" + "._224:\n" + " ldr r0, ._230\n" + " ldr r1, ._230 + 4\n" + " bl StringCopy\n" + "._225:\n" + " ldr r1, ._230 + 8\n" + " mov r0, #0x4\n" + " ldsb r0, [r1, r0]\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " ldrb r1, [r1, #0x5]\n" + " lsl r1, r1, #0x18\n" + " asr r1, r1, #0x18\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " bl sub_8082C0C\n" + " cmp r0, #0\n" + " beq ._228 @cond_branch\n" + " ldr r0, ._230 + 12\n" + " ldr r1, ._230 + 16\n" + " bl StringCopy\n" + " b ._229\n" + "._231:\n" + " .align 2, 0\n" + "._230:\n" + " .word gStringVar1\n" + " .word gUnknown_Debug_0839BBC1+0x2cf\n" + " .word gSaveBlock1\n" + " .word gStringVar2\n" + " .word gUnknown_Debug_0839BBC1+0x2cc\n" + "._228:\n" + " ldr r0, ._232\n" + " ldr r1, ._232 + 4\n" + " bl StringCopy\n" + "._229:\n" + " ldr r0, ._232 + 8\n" + " bl sub_8071F40\n" + " ldr r1, ._232 + 12\n" + " ldr r0, ._232 + 16\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._233:\n" + " .align 2, 0\n" + "._232:\n" + " .word gStringVar2\n" + " .word gUnknown_Debug_0839BBC1+0x2cf\n" + " .word gUnknown_Debug_0839BBC1+0x2aa\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077DB4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077A20() +{ + asm( + " push {lr}\n" + " ldr r0, ._234\n" + " ldr r1, ._234 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xff\n" + " strh r1, [r0]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._235:\n" + " .align 2, 0\n" + "._234:\n" + " .word gSaveBlock1\n" + " .word 0x978\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077A40() +{ + asm( + " push {lr}\n" + " ldr r0, ._236\n" + " ldr r1, ._236 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0x0\n" + " strh r1, [r0]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._237:\n" + " .align 2, 0\n" + "._236:\n" + " .word gSaveBlock1\n" + " .word 0x978\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077A60() +{ + asm( + " push {lr}\n" + " ldr r0, ._238\n" + " bl DebugMenu_8077D78\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._239:\n" + " .align 2, 0\n" + "._238:\n" + " .word gUnknown_Debug_0839BBC1+0x323\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_RematchTrainers() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._240\n" + " mov r1, #0xd\n" + " mov r2, #0x5\n" + " bl DebugMenu_8077D24\n" + " ldr r1, ._240 + 4\n" + " ldr r0, ._240 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._241:\n" + " .align 2, 0\n" + "._240:\n" + " .word gUnknown_Debug_0839BBC1+0x323\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077A60+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077A9C() +{ + asm( + " push {lr}\n" + " ldr r1, ._242\n" + " mov r0, #0x1e\n" + " strb r0, [r1]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._243:\n" + " .align 2, 0\n" + "._242:\n" + " .word gNumSafariBalls\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077AB4() +{ + asm( + " push {lr}\n" + " ldr r1, ._244\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._245:\n" + " .align 2, 0\n" + "._244:\n" + " .word gNumSafariBalls\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077ACC() +{ + asm( + " push {lr}\n" + " ldr r1, ._246\n" + " mov r2, #0xfa\n" + " lsl r2, r2, #0x1\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._247:\n" + " .align 2, 0\n" + "._246:\n" + " .word gSafariZoneStepCounter\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077AE8() +{ + asm( + " push {lr}\n" + " ldr r1, ._248\n" + " mov r0, #0x1\n" + " strh r0, [r1]\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._249:\n" + " .align 2, 0\n" + "._248:\n" + " .word gSafariZoneStepCounter\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077B00() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " bl unref_sub_80C853C\n" + " cmp r0, #0\n" + " beq ._250 @cond_branch\n" + " ldr r0, ._252\n" + " bl sub_8071F40\n" + " b ._251\n" + "._253:\n" + " .align 2, 0\n" + "._252:\n" + " .word gUnknown_Debug_0839BBC1+0x353\n" + "._250:\n" + " ldr r0, ._254\n" + " bl sub_8071F40\n" + "._251:\n" + " ldr r1, ._254 + 4\n" + " ldr r0, ._254 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._255:\n" + " .align 2, 0\n" + "._254:\n" + " .word gUnknown_Debug_0839BBC1+0x35e\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077DB4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077B3C() +{ + asm( + " push {lr}\n" + " ldr r0, ._256\n" + " bl DebugMenu_8077D78\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._257:\n" + " .align 2, 0\n" + "._256:\n" + " .word gUnknown_Debug_0839BBC1+0x3ab\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_Safari() +{ + asm( + " push {lr}\n" + " bl GetSafariZoneFlag\n" + " cmp r0, #0\n" + " beq ._258 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._260\n" + " mov r1, #0xe\n" + " mov r2, #0x5\n" + " bl DebugMenu_8077D24\n" + " ldr r0, ._260 + 4\n" + " ldr r1, ._260 + 8\n" + " ldrh r1, [r1]\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r0, ._260 + 12\n" + " bl sub_8071F40\n" + " ldr r1, ._260 + 16\n" + " ldr r0, ._260 + 20\n" + " str r0, [r1]\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x0\n" + " b ._259\n" + "._261:\n" + " .align 2, 0\n" + "._260:\n" + " .word gUnknown_Debug_0839BBC1+0x3ab\n" + " .word gStringVar1\n" + " .word gSafariZoneStepCounter\n" + " .word gUnknown_Debug_0839BBC1+0x34b\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077B3C+1\n" + "._258:\n" + " bl CloseMenu\n" + " mov r0, #0x16\n" + " bl PlaySE\n" + " mov r0, #0x1\n" + "._259:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077BB4() +{ + asm( + " push {lr}\n" + " bl debug_sub_80AFEE4\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077BC0() +{ + asm( + " push {lr}\n" + " bl debug_sub_8122080\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077BCC() +{ + asm( + " push {lr}\n" + " bl debug_sub_8120968\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077BD8() +{ + asm( + " push {lr}\n" + " bl debug_sub_8130318\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077BE4() +{ + asm( + " push {lr}\n" + " bl debug_sub_80986AC\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077BF4() +{ + asm( + " push {lr}\n" + " bl debug_sub_80D93F4\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077C00() +{ + asm( + " push {lr}\n" + " ldr r0, ._262\n" + " bl DebugMenu_8077D78\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._263:\n" + " .align 2, 0\n" + "._262:\n" + " .word gUnknown_Debug_0839BBC1+0x3d3\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077C14() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._264\n" + " mov r1, #0xa\n" + " mov r2, #0x9\n" + " bl DebugMenu_8077D24\n" + " ldr r1, ._264 + 4\n" + " ldr r0, ._264 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._265:\n" + " .align 2, 0\n" + "._264:\n" + " .word gUnknown_Debug_0839BBC1+0x3d3\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077C00+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077C3C() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, sl\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6, r7}\n" + " add sp, sp, #0xfffffffc\n" + " mov sl, r0\n" + " add r7, r1, #0\n" + " ldr r0, ._271\n" + " ldr r1, ._271 + 4\n" + " str r1, [r0]\n" + " mov r1, #0x0\n" + " strb r1, [r7]\n" + " add r7, r7, #0x1\n" + " strb r1, [r7]\n" + " add r7, r7, #0x1\n" + " mov r3, #0x0\n" + " mov r8, r0\n" + "._269:\n" + " mov r5, #0x0\n" + " ldr r1, ._271\n" + " ldr r0, [r1]\n" + " ldr r2, [r0, #0x4]\n" + " mov r4, #0x0\n" + " ldr r1, [r0, #0x8]\n" + " add r3, r3, #0x1\n" + " mov r9, r3\n" + " cmp r5, r1\n" + " bge ._266 @cond_branch\n" + " add r3, r0, #0\n" + " add r6, r1, #0\n" + "._267:\n" + " ldr r0, [r3, #0xc]\n" + " add r0, r0, r4\n" + " add r0, r0, sl\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x30\n" + " mul r0, r0, r2\n" + " add r5, r5, r0\n" + " add r4, r4, #0x1\n" + " add r0, r2, #0\n" + " mov r1, #0xa\n" + " str r3, [sp]\n" + " bl gScriptFuncs_End+0x3d30\n" + " add r2, r0, #0\n" + " ldr r3, [sp]\n" + " cmp r4, r6\n" + " blt ._267 @cond_branch\n" + "._266:\n" + " mov r0, r8\n" + " ldr r1, [r0]\n" + " ldr r0, [r1]\n" + " cmp r0, r5\n" + " bcs ._268 @cond_branch\n" + " add r5, r0, #0\n" + "._268:\n" + " ldrb r3, [r1, #0x8]\n" + " add r0, r7, #0\n" + " add r1, r5, #0\n" + " mov r2, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r7, r0, #0\n" + " mov r3, r9\n" + " mov r1, r8\n" + " ldr r0, [r1]\n" + " add r0, r0, #0x10\n" + " str r0, [r1]\n" + " cmp r3, #0x1\n" + " ble ._269 @cond_branch\n" + " mov r1, sl\n" + " ldrb r0, [r1, #0x1d]\n" + " add r0, r0, #0x7a\n" + " strb r0, [r7]\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0xf6\n" + " bls ._270 @cond_branch\n" + " mov r0, #0xf6\n" + " strb r0, [r7]\n" + "._270:\n" + " mov r0, #0xff\n" + " strb r0, [r7, #0x1]\n" + " add sp, sp, #0x4\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._272:\n" + " .align 2, 0\n" + "._271:\n" + " .word 0x030006b0+0xc @ gMenu+0xc\n" + " .word gUnknown_Debug_0839BBC1+0x427\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_8077CF4() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r4, r0, #0\n" + " add r5, r1, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " ldr r0, ._273\n" + " ldr r6, ._273 + 4\n" + " add r1, r6, #0\n" + " bl DebugMenu_8077C3C\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl MenuPrint\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._274:\n" + " .align 2, 0\n" + "._273:\n" + " .word BuildDateTime\n" + " .word gStringVar4\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077D24() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffff8\n" + " add r6, r0, #0\n" + " add r4, r1, #0\n" + " add r5, r2, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " bl MenuZeroFillScreen\n" + " lsl r3, r5, #0x1\n" + " add r3, r3, #0x1\n" + " lsl r3, r3, #0x18\n" + " lsr r3, r3, #0x18\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " add r2, r4, #0\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x1\n" + " mov r1, #0x1\n" + " add r2, r5, #0\n" + " add r3, r6, #0\n" + " bl PrintMenuItems\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " sub r4, r4, #0x1\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " str r4, [sp, #0x4]\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " add r3, r5, #0\n" + " bl InitMenu\n" + " add sp, sp, #0x8\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077D78() +{ + asm( + " push {r4, r5, lr}\n" + " add r5, r0, #0\n" + " bl ProcessMenuInput\n" + " lsl r0, r0, #0x18\n" + " asr r4, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r4, r0\n" + " beq ._275 @cond_branch\n" + " add r0, r0, #0x1\n" + " cmp r4, r0\n" + " beq ._276 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._278\n" + " lsl r1, r4, #0x3\n" + " add r1, r1, r5\n" + " ldr r1, [r1, #0x4]\n" + " str r1, [r0]\n" + "._275:\n" + " mov r0, #0x0\n" + " b ._277\n" + "._279:\n" + " .align 2, 0\n" + "._278:\n" + " .word gCallback_03004AE8\n" + "._276:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._277:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077DB4() +{ + asm( + " push {lr}\n" + " ldr r0, ._282\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._280 @cond_branch\n" + " mov r0, #0x0\n" + " b ._281\n" + "._283:\n" + " .align 2, 0\n" + "._282:\n" + " .word gMain\n" + "._280:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._281:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077DD8() +{ + asm( + " push {r4, r5, lr}\n" + " add r4, r0, #0\n" + " add r5, r1, #0\n" + " lsl r3, r3, #0x10\n" + " lsr r3, r3, #0x10\n" + " add r1, r3, #0\n" + " mov r0, #0x80\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._284 @cond_branch\n" + " ldrh r0, [r4]\n" + " sub r0, r0, #0x1\n" + " b ._285\n" + "._284:\n" + " mov r0, #0x40\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._286 @cond_branch\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0x1\n" + " b ._287\n" + "._286:\n" + " mov r0, #0x20\n" + " and r0, r0, r3\n" + " cmp r0, #0\n" + " beq ._288 @cond_branch\n" + " ldrh r0, [r4]\n" + " sub r0, r0, #0xa\n" + "._285:\n" + " strh r0, [r4]\n" + " mov r1, #0x0\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, r5\n" + " bge ._293 @cond_branch\n" + " strh r2, [r4]\n" + " b ._293\n" + "._288:\n" + " mov r0, #0x10\n" + " and r1, r1, r0\n" + " cmp r1, #0\n" + " bne ._291 @cond_branch\n" + " mov r0, #0x0\n" + " b ._292\n" + "._291:\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0xa\n" + "._287:\n" + " strh r0, [r4]\n" + " mov r1, #0x0\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, r2\n" + " ble ._293 @cond_branch\n" + " strh r5, [r4]\n" + "._293:\n" + " mov r0, #0x1\n" + "._292:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077E40() +{ + asm( + " push {r4, lr}\n" + " add r4, r0, #0\n" + " ldr r0, ._297\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._294 @cond_branch\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._295 @cond_branch\n" + "._294:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " b ._302\n" + "._298:\n" + " .align 2, 0\n" + "._297:\n" + " .word gMain\n" + "._295:\n" + " mov r0, #0x30\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._299 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " cmp r4, #0\n" + " beq ._300 @cond_branch\n" + " mov r0, #0x1\n" + " bl DebugMenu_807786C\n" + " mov r0, #0x0\n" + " b ._302\n" + "._300:\n" + " mov r0, #0x0\n" + " bl DebugMenu_807786C\n" + " mov r0, #0x1\n" + " b ._302\n" + "._299:\n" + " add r0, r4, #0\n" + "._302:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_MakeItems() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl DebugMenu_8077EAC\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077EAC() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._303\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl MenuZeroFillScreen\n" + " ldr r1, ._303 + 4\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0x1\n" + " strh r1, [r0, #0xa]\n" + " strh r1, [r0, #0xc]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._304:\n" + " .align 2, 0\n" + "._303:\n" + " .word DebugMenu_8077F40+1\n" + " .word gTasks\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077EE0() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r4, r0, #0\n" + " add r6, r1, #0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " lsl r6, r6, #0x10\n" + " lsr r6, r6, #0x10\n" + " mov r0, #0x4\n" + " mov r1, #0x11\n" + " mov r2, #0x16\n" + " mov r3, #0x12\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r5, ._305\n" + " add r0, r5, #0\n" + " add r1, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r5, #0\n" + " mov r1, #0x4\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " add r0, r4, #0\n" + " bl ItemId_GetItem\n" + " mov r1, #0x8\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " add r0, r5, #0\n" + " add r1, r6, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r5, #0\n" + " mov r1, #0x12\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._306:\n" + " .align 2, 0\n" + "._305:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077F40() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r4, r0, #0x2\n" + " add r4, r4, r0\n" + " lsl r4, r4, #0x3\n" + " ldr r0, ._307\n" + " add r4, r4, r0\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._307 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldrh r0, [r4, #0xa]\n" + " ldrh r1, [r4, #0xc]\n" + " bl DebugMenu_8077EE0\n" + " ldr r0, ._307 + 8\n" + " str r0, [r4]\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._308:\n" + " .align 2, 0\n" + "._307:\n" + " .word gTasks\n" + " .word gDebug0x839C008\n" + " .word DebugMenu_8077F7C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077F7C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " ldr r0, ._311\n" + " add r4, r1, r0\n" + " ldr r3, ._311 + 4\n" + " ldrh r1, [r3, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._309 @cond_branch\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._311 + 8\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldrh r0, [r4, #0xa]\n" + " ldrh r1, [r4, #0xc]\n" + " bl DebugMenu_8077EE0\n" + " ldr r0, ._311 + 12\n" + " str r0, [r4]\n" + " b ._317\n" + "._312:\n" + " .align 2, 0\n" + "._311:\n" + " .word gTasks\n" + " .word gMain\n" + " .word gDebug0x839C008+0xc\n" + " .word DebugMenu_8077FFC+1\n" + "._309:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._313 @cond_branch\n" + " ldr r0, ._315\n" + " str r0, [r4]\n" + " b ._317\n" + "._316:\n" + " .align 2, 0\n" + "._315:\n" + " .word DebugMenu_807806C+1\n" + "._313:\n" + " add r0, r4, #0\n" + " add r0, r0, #0xa\n" + " mov r2, #0xae\n" + " lsl r2, r2, #0x1\n" + " ldrh r3, [r3, #0x30]\n" + " mov r1, #0x1\n" + " bl DebugMenu_8077DD8\n" + " cmp r0, #0x1\n" + " bne ._317 @cond_branch\n" + " ldrh r0, [r4, #0xa]\n" + " ldrh r1, [r4, #0xc]\n" + " bl DebugMenu_8077EE0\n" + "._317:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8077FFC() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " ldr r0, ._321\n" + " add r4, r1, r0\n" + " ldr r2, ._321 + 4\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._318 @cond_branch\n" + " ldrh r0, [r4, #0xa]\n" + " ldrh r1, [r4, #0xc]\n" + " bl AddBagItem\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._320 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " b ._320\n" + "._322:\n" + " .align 2, 0\n" + "._321:\n" + " .word gTasks\n" + " .word gMain\n" + "._318:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._323 @cond_branch\n" + "._320:\n" + " ldr r0, ._325\n" + " str r0, [r4]\n" + " b ._327\n" + "._326:\n" + " .align 2, 0\n" + "._325:\n" + " .word DebugMenu_8077F40+1\n" + "._323:\n" + " add r0, r4, #0\n" + " add r0, r0, #0xc\n" + " ldrh r3, [r2, #0x30]\n" + " mov r1, #0x1\n" + " mov r2, #0x63\n" + " bl DebugMenu_8077DD8\n" + " cmp r0, #0x1\n" + " bne ._327 @cond_branch\n" + " ldrh r0, [r4, #0xa]\n" + " ldrh r1, [r4, #0xc]\n" + " bl DebugMenu_8077EE0\n" + "._327:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807806C() +{ + asm( + " push {r4, lr}\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + " bl DebugMenu_8077048\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807808C() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffff4\n" + " add r4, r0, #0\n" + " sub r0, r4, #1\n" + " cmp r0, #0xc\n" + " bls ._328 @cond_branch\n" + " mov r4, #0x1\n" + "._328:\n" + " lsl r1, r4, #0x5\n" + " ldr r0, ._331\n" + " add r5, r1, r0\n" + " bl MenuZeroFillScreen\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x13\n" + " mov r3, #0x11\n" + " bl MenuDrawTextWindow\n" + " ldr r0, ._331 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0x2\n" + " bl MenuPrint\n" + " mov r0, sp\n" + " add r1, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0xb\n" + " mov r2, #0x2\n" + " bl MenuPrint\n" + " ldrh r1, [r5, #0x8]\n" + " mov r0, sp\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0xb\n" + " mov r2, #0x4\n" + " bl MenuPrint\n" + " add r4, r5, #0\n" + " add r4, r4, #0xb\n" + " add r0, r4, #0\n" + " bl StringLength\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bhi ._329 @cond_branch\n" + " add r0, r4, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x6\n" + " bl MenuPrint\n" + " b ._330\n" + "._332:\n" + " .align 2, 0\n" + "._331:\n" + " .word gSaveBlock1+0x2ddc\n" + " .word gDebug0x839C008+0x16\n" + "._329:\n" + " ldr r0, ._335\n" + " mov r1, #0xb\n" + " mov r2, #0x6\n" + " bl MenuPrint\n" + "._330:\n" + " add r4, r5, #0\n" + " add r4, r4, #0x16\n" + " add r0, r4, #0\n" + " bl StringLength\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bhi ._333 @cond_branch\n" + " add r0, r4, #0\n" + " mov r1, #0xb\n" + " mov r2, #0x8\n" + " bl MenuPrint\n" + " b ._334\n" + "._336:\n" + " .align 2, 0\n" + "._335:\n" + " .word gDebug0x839C008+0x45\n" + "._333:\n" + " ldr r0, ._337\n" + " mov r1, #0xb\n" + " mov r2, #0x8\n" + " bl MenuPrint\n" + "._334:\n" + " ldrb r1, [r5, #0xa]\n" + " mov r0, sp\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r0, sp\n" + " mov r1, #0xb\n" + " mov r2, #0xa\n" + " bl MenuPrint\n" + " ldr r1, [r5]\n" + " mov r0, sp\n" + " mov r2, #0x2\n" + " mov r3, #0x8\n" + " bl ConvertIntToHexStringN\n" + " mov r0, sp\n" + " mov r1, #0xb\n" + " mov r2, #0xc\n" + " bl MenuPrint\n" + " add sp, sp, #0xc\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._338:\n" + " .align 2, 0\n" + "._337:\n" + " .word gDebug0x839C008+0x45\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807817C() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, ._340\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._339 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + " bl ScriptContext2_Disable\n" + "._339:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._341:\n" + " .align 2, 0\n" + "._340:\n" + " .word gMain\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80781A8() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r1, r1, #0x3\n" + " ldr r0, ._344\n" + " add r5, r1, r0\n" + " ldrh r1, [r5, #0x8]\n" + " mov r2, #0x8\n" + " ldsh r0, [r5, r2]\n" + " cmp r0, #0\n" + " bne ._342 @cond_branch\n" + " add r0, r1, #1\n" + " strh r0, [r5, #0x8]\n" + " b ._343\n" + "._345:\n" + " .align 2, 0\n" + "._344:\n" + " .word gTasks\n" + "._342:\n" + " ldr r2, ._348\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._346 @cond_branch\n" + " mov r1, #0x8\n" + " ldsh r0, [r5, r1]\n" + " bl DebugMenu_807808C\n" + " ldr r0, ._348 + 4\n" + " str r0, [r5]\n" + " b ._350\n" + "._349:\n" + " .align 2, 0\n" + "._348:\n" + " .word gMain\n" + " .word DebugMenu_807817C+1\n" + "._346:\n" + " add r0, r5, #0\n" + " add r0, r0, #0x8\n" + " ldrh r1, [r2, #0x30]\n" + " mov r3, #0xc0\n" + " and r3, r3, r1\n" + " mov r1, #0x1\n" + " mov r2, #0xd\n" + " bl DebugMenu_8077DD8\n" + " cmp r0, #0\n" + " beq ._350 @cond_branch\n" + "._343:\n" + " mov r0, #0x4\n" + " mov r1, #0x11\n" + " mov r2, #0x16\n" + " mov r3, #0x12\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r4, ._351\n" + " mov r2, #0x8\n" + " ldsh r1, [r5, r2]\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x4\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + "._350:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._352:\n" + " .align 2, 0\n" + "._351:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_ViewPortraits() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._353\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._354:\n" + " .align 2, 0\n" + "._353:\n" + " .word DebugMenu_80781A8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078254() +{ + asm( + " push {lr}\n" + " bl DebugMenu_807808C\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_AllBadges() +{ + asm( + " push {lr}\n" + " ldr r0, ._355\n" + " bl FlagSet\n" + " ldr r0, ._355 + 4\n" + " bl FlagSet\n" + " ldr r0, ._355 + 8\n" + " bl FlagSet\n" + " ldr r0, ._355 + 12\n" + " bl FlagSet\n" + " ldr r0, ._355 + 16\n" + " bl FlagSet\n" + " ldr r0, ._355 + 20\n" + " bl FlagSet\n" + " ldr r0, ._355 + 24\n" + " bl FlagSet\n" + " ldr r0, ._355 + 28\n" + " bl FlagSet\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._356:\n" + " .align 2, 0\n" + "._355:\n" + " .word 0x807\n" + " .word 0x808\n" + " .word 0x809\n" + " .word 0x80a\n" + " .word 0x80b\n" + " .word 0x80c\n" + " .word 0x80d\n" + " .word 0x80e\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_TimeRecords() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._357\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._358:\n" + " .align 2, 0\n" + "._357:\n" + " .word debug_sub_806F9E4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_SetTime() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl debug_sub_806F99C\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80782EC() +{ + asm( + " push {lr}\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " ldr r0, ._359\n" + " mov r2, #0x0\n" + " mov r3, #0x4\n" + " bl ConvertIntToHexStringN\n" + " ldr r0, ._359 + 4\n" + " bl sub_8071F40\n" + " pop {r0}\n" + " bx r0\n" + "._360:\n" + " .align 2, 0\n" + "._359:\n" + " .word gStringVar1\n" + " .word gDebug0x839C008+0x4b\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078310() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._364\n" + " add r4, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0\n" + " beq ._361 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._362 @cond_branch\n" + " b ._375\n" + "._365:\n" + " .align 2, 0\n" + "._364:\n" + " .word gTasks+0x8\n" + "._361:\n" + " ldr r0, ._367\n" + " bl VarGet\n" + " strh r0, [r4, #0x2]\n" + " ldrh r0, [r4, #0x2]\n" + " bl DebugMenu_80782EC\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4]\n" + " b ._375\n" + "._368:\n" + " .align 2, 0\n" + "._367:\n" + " .word 0x4024\n" + "._362:\n" + " ldr r3, ._371\n" + " ldrh r1, [r3, #0x2e]\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._369 @cond_branch\n" + " mov r0, #0x49\n" + " bl PlaySE\n" + " ldr r0, ._371 + 4\n" + " bl GetVarPointer\n" + " ldrh r1, [r4, #0x2]\n" + " strh r1, [r0]\n" + " b ._370\n" + "._372:\n" + " .align 2, 0\n" + "._371:\n" + " .word gMain\n" + " .word 0x4024\n" + "._369:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._373 @cond_branch\n" + "._370:\n" + " bl MenuZeroFillScreen\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + " bl ScriptContext2_Disable\n" + " b ._375\n" + "._373:\n" + " add r0, r4, #2\n" + " ldr r2, ._376\n" + " ldrh r3, [r3, #0x30]\n" + " mov r1, #0x0\n" + " bl DebugMenu_8077DD8\n" + " cmp r0, #0x1\n" + " bne ._375 @cond_branch\n" + " ldrh r0, [r4, #0x2]\n" + " bl DebugMenu_80782EC\n" + "._375:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._377:\n" + " .align 2, 0\n" + "._376:\n" + " .word 0xffff\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_MiragaIslandRND() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._378\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._379:\n" + " .align 2, 0\n" + "._378:\n" + " .word DebugMenu_8078310+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80783C8() +{ + asm( + " push {r4, lr}\n" + " ldr r0, ._383\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x30\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._382 @cond_branch\n" + " mov r0, #0x5\n" + " bl PlaySE\n" + " ldr r4, ._383 + 4\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._381 @cond_branch\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " mov r0, #0x0\n" + " bl DebugMenu_807786C\n" + " b ._382\n" + "._384:\n" + " .align 2, 0\n" + "._383:\n" + " .word gMain\n" + " .word 0x804\n" + "._381:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + " mov r0, #0x1\n" + " bl DebugMenu_807786C\n" + "._382:\n" + " ldr r0, ._388\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._385 @cond_branch\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._386 @cond_branch\n" + "._385:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._387\n" + "._389:\n" + " .align 2, 0\n" + "._388:\n" + " .word gMain\n" + "._386:\n" + " mov r0, #0x0\n" + "._387:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_ToggleClearFlag() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._390\n" + " bl FlagGet\n" + " mov r1, #0x1\n" + " eor r0, r0, r1\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl DebugMenu_807786C\n" + " ldr r1, ._390 + 4\n" + " ldr r0, ._390 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._391:\n" + " .align 2, 0\n" + "._390:\n" + " .word 0x804\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_80783C8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078464() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._396\n" + " add r0, r4, #0\n" + " bl FlagGet\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl DebugMenu_8077E40\n" + " add r1, r0, #0\n" + " cmp r1, #0\n" + " beq ._392 @cond_branch\n" + " cmp r1, #0\n" + " bgt ._393 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._394 @cond_branch\n" + " b ._401\n" + "._397:\n" + " .align 2, 0\n" + "._396:\n" + " .word 0x82a\n" + "._393:\n" + " cmp r1, #0x1\n" + " beq ._398 @cond_branch\n" + " b ._401\n" + "._392:\n" + " add r0, r4, #0\n" + " bl FlagReset\n" + " b ._401\n" + "._398:\n" + " add r0, r4, #0\n" + " bl FlagSet\n" + " b ._401\n" + "._394:\n" + " mov r0, #0x1\n" + " b ._402\n" + "._401:\n" + " mov r0, #0x0\n" + "._402:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenWeatherEvents() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._404\n" + " bl FlagGet\n" + " mov r1, #0x0\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._403 @cond_branch\n" + " mov r1, #0x1\n" + "._403:\n" + " add r0, r1, #0\n" + " bl DebugMenu_807786C\n" + " ldr r1, ._404 + 4\n" + " ldr r0, ._404 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._405:\n" + " .align 2, 0\n" + "._404:\n" + " .word 0x82a\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8078464+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80784E8() +{ + asm( + " push {lr}\n" + " bl IsMysteryGiftEnabled\n" + " bl DebugMenu_8077E40\n" + " add r1, r0, #0\n" + " cmp r1, #0\n" + " beq ._406 @cond_branch\n" + " cmp r1, #0\n" + " bgt ._407 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._408 @cond_branch\n" + " b ._413\n" + "._407:\n" + " cmp r1, #0x1\n" + " beq ._410 @cond_branch\n" + " b ._413\n" + "._406:\n" + " bl DisableMysteryGift\n" + " b ._413\n" + "._410:\n" + " bl EnableMysteryGift\n" + " b ._413\n" + "._408:\n" + " mov r0, #0x1\n" + " b ._414\n" + "._413:\n" + " mov r0, #0x0\n" + "._414:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenMysteryEvent() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " bl IsMysteryGiftEnabled\n" + " mov r1, #0x0\n" + " cmp r0, #0\n" + " bne ._415 @cond_branch\n" + " mov r1, #0x1\n" + "._415:\n" + " add r0, r1, #0\n" + " bl DebugMenu_807786C\n" + " ldr r1, ._416\n" + " ldr r0, ._416 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._417:\n" + " .align 2, 0\n" + "._416:\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_80784E8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078550() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " lsl r0, r0, #0x10\n" + " lsr r6, r0, #0x10\n" + " lsl r0, r6, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl GetGameStat\n" + " add r7, r0, #0\n" + " ldr r0, ._420\n" + " add r1, r6, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " ldr r0, ._420 + 4\n" + " ldr r5, ._420 + 8\n" + " lsl r4, r6, #0x3\n" + " add r1, r5, #4\n" + " add r1, r4, r1\n" + " ldr r1, [r1]\n" + " bl StringCopy\n" + " add r4, r4, r5\n" + " ldr r0, [r4]\n" + " cmp r0, #0\n" + " bne ._418 @cond_branch\n" + " ldr r0, ._420 + 12\n" + " ldr r1, ._420 + 16\n" + " bl StringCopy\n" + " b ._423\n" + "._421:\n" + " .align 2, 0\n" + "._420:\n" + " .word gStringVar1\n" + " .word gStringVar2\n" + " .word gDebug0x839C008+0x264\n" + " .word gStringVar3\n" + " .word gDebug0x839C008+0x7d\n" + "._418:\n" + " cmp r6, #0x1\n" + " beq ._422 @cond_branch\n" + " ldr r0, ._424\n" + " add r1, r7, #0\n" + " mov r2, #0x1\n" + " mov r3, #0xa\n" + " bl ConvertIntToDecimalStringN\n" + " b ._423\n" + "._425:\n" + " .align 2, 0\n" + "._424:\n" + " .word gStringVar3\n" + "._422:\n" + " ldr r4, ._426\n" + " lsr r1, r7, #0x10\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " mov r6, #0xf0\n" + " strb r6, [r4, #0x3]\n" + " add r0, r4, #4\n" + " lsr r1, r7, #0x8\n" + " mov r5, #0xff\n" + " and r1, r1, r5\n" + " mov r2, #0x2\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " strb r6, [r4, #0x6]\n" + " add r4, r4, #0x7\n" + " and r7, r7, r5\n" + " add r0, r4, #0\n" + " add r1, r7, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + "._423:\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._426 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._427:\n" + " .align 2, 0\n" + "._426:\n" + " .word gStringVar3\n" + " .word gDebug0x839C008+0x74\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807860C() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._432\n" + " add r4, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0x1\n" + " beq ._428 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._429 @cond_branch\n" + " cmp r0, #0\n" + " beq ._430 @cond_branch\n" + " b ._447\n" + "._433:\n" + " .align 2, 0\n" + "._432:\n" + " .word gTasks+0x8\n" + "._429:\n" + " cmp r0, #0x2\n" + " beq ._434 @cond_branch\n" + " b ._447\n" + "._430:\n" + " ldrh r0, [r4, #0x2]\n" + " bl DebugMenu_8078550\n" + "._441:\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4]\n" + " b ._447\n" + "._428:\n" + " ldr r3, ._439\n" + " ldrh r1, [r3, #0x2e]\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._437 @cond_branch\n" + " ldrh r0, [r4]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r4]\n" + " mov r0, #0x1\n" + " b ._438\n" + "._440:\n" + " .align 2, 0\n" + "._439:\n" + " .word gMain\n" + "._437:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " lsl r0, r0, #0x10\n" + " lsr r2, r0, #0x10\n" + " cmp r2, #0\n" + " bne ._441 @cond_branch\n" + " ldrh r1, [r3, #0x30]\n" + " mov r0, #0x40\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._442 @cond_branch\n" + " ldrh r0, [r4, #0x2]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4, #0x2]\n" + " lsl r0, r0, #0x10\n" + " asr r0, r0, #0x10\n" + " cmp r0, #0x32\n" + " bne ._446 @cond_branch\n" + " strh r2, [r4, #0x2]\n" + " b ._446\n" + "._442:\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._447 @cond_branch\n" + " ldrh r0, [r4, #0x2]\n" + " sub r0, r0, #0x1\n" + " strh r0, [r4, #0x2]\n" + " lsl r0, r0, #0x10\n" + " cmp r0, #0\n" + " bge ._446 @cond_branch\n" + " mov r0, #0x31\n" + " strh r0, [r4, #0x2]\n" + "._446:\n" + " ldrh r0, [r4, #0x2]\n" + " bl DebugMenu_8078550\n" + " b ._447\n" + "._434:\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + "._447:\n" + " mov r0, #0x0\n" + "._438:\n" + " pop {r4, r5}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80786C0() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " bl DebugMenu_807860C\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80786D0() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " add r0, r4, #0\n" + " bl DebugMenu_807860C\n" + " cmp r0, #0\n" + " beq ._449 @cond_branch\n" + " ldr r1, ._450\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldrb r2, [r0, #0xa]\n" + " ldr r1, ._450 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._449 @cond_branch\n" + " sub r1, r0, #1\n" + " add r0, r2, #0\n" + " bl SetGameStat\n" + " mov r0, #0x15\n" + " bl PlaySE\n" + "._449:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._451:\n" + " .align 2, 0\n" + "._450:\n" + " .word gTasks\n" + " .word gDebug0x839C008+0x264\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078714() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " add r0, r4, #0\n" + " bl DebugMenu_807860C\n" + " cmp r0, #0\n" + " beq ._453 @cond_branch\n" + " ldr r1, ._454\n" + " lsl r0, r4, #0x2\n" + " add r0, r0, r4\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldrb r2, [r0, #0xa]\n" + " ldr r1, ._454 + 4\n" + " lsl r0, r2, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " beq ._453 @cond_branch\n" + " add r0, r2, #0\n" + " mov r1, #0x0\n" + " bl SetGameStat\n" + " mov r0, #0x15\n" + " bl PlaySE\n" + "._453:\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._455:\n" + " .align 2, 0\n" + "._454:\n" + " .word gTasks\n" + " .word gDebug0x839C008+0x264\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078758() +{ + asm( + " push {r4, lr}\n" + " add r4, r0, #0\n" + " bl CloseMenu\n" + " bl ScriptContext2_Enable\n" + " add r0, r4, #0\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " mov r0, #0x1\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078774() +{ + asm( + " push {lr}\n" + " ldr r0, ._456\n" + " bl DebugMenu_8078758\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._457:\n" + " .align 2, 0\n" + "._456:\n" + " .word DebugMenu_80786C0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078788() +{ + asm( + " push {lr}\n" + " ldr r0, ._458\n" + " bl DebugMenu_8078758\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._459:\n" + " .align 2, 0\n" + "._458:\n" + " .word DebugMenu_80786D0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_807879C() +{ + asm( + " push {lr}\n" + " ldr r0, ._460\n" + " bl DebugMenu_8078758\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._461:\n" + " .align 2, 0\n" + "._460:\n" + " .word DebugMenu_8078714+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80787B0() +{ + asm( + " push {lr}\n" + " ldr r0, ._462\n" + " bl DebugMenu_8077D78\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._463:\n" + " .align 2, 0\n" + "._462:\n" + " .word gDebug0x839C008+0x3f4\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenLegendsRecord() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._464\n" + " mov r1, #0xc\n" + " mov r2, #0x3\n" + " bl DebugMenu_8077D24\n" + " ldr r1, ._464 + 4\n" + " ldr r0, ._464 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._465:\n" + " .align 2, 0\n" + "._464:\n" + " .word gDebug0x839C008+0x3f4\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_80787B0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80787EC() +{ + asm( + " push {r4, r5, lr}\n" + " add sp, sp, #0xfffffffc\n" + " mov r5, sp\n" + " add r5, r5, #0x2\n" + " mov r0, sp\n" + " add r1, r5, #0\n" + " bl GetXYCoordsOneStepInFrontOfPlayer\n" + " ldr r4, ._466\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " mov r2, #0x0\n" + " ldsh r1, [r5, r2]\n" + " bl MapGridGetMetatileBehaviorAt\n" + " strh r0, [r4]\n" + " ldr r0, ._466 + 4\n" + " ldrh r1, [r4]\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToHexStringN\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " mov r2, #0x0\n" + " ldsh r1, [r5, r2]\n" + " bl MapGridGetMetatileIdAt\n" + " strh r0, [r4]\n" + " ldr r0, ._466 + 8\n" + " ldrh r1, [r4]\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToHexStringN\n" + " mov r0, sp\n" + " mov r1, #0x0\n" + " ldsh r0, [r0, r1]\n" + " mov r2, #0x0\n" + " ldsh r1, [r5, r2]\n" + " bl MapGridGetZCoordAt\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " strh r0, [r4]\n" + " ldr r0, ._466 + 12\n" + " ldrh r1, [r4]\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToHexStringN\n" + " ldr r0, ._466 + 16\n" + " ldr r1, ._466 + 20\n" + " bl StringExpandPlaceholders\n" + " add sp, sp, #0x4\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._467:\n" + " .align 2, 0\n" + "._466:\n" + " .word gScriptResult\n" + " .word gStringVar1\n" + " .word gStringVar2\n" + " .word gStringVar3\n" + " .word gStringVar4\n" + " .word gDebug0x839C008+0x40c\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078880() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r1, ._472\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r4, r0, r1\n" + " mov r1, #0x8\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0x1\n" + " beq ._468 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._469 @cond_branch\n" + " cmp r0, #0\n" + " beq ._470 @cond_branch\n" + " b ._480\n" + "._473:\n" + " .align 2, 0\n" + "._472:\n" + " .word gTasks\n" + "._469:\n" + " cmp r0, #0x2\n" + " beq ._474 @cond_branch\n" + " b ._480\n" + "._470:\n" + " bl MenuDisplayMessageBox\n" + " b ._476\n" + "._468:\n" + " ldr r0, ._478\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + "._476:\n" + " ldrh r0, [r4, #0x8]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4, #0x8]\n" + " b ._480\n" + "._479:\n" + " .align 2, 0\n" + "._478:\n" + " .word gStringVar4\n" + "._474:\n" + " ldr r0, ._481\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._480 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + "._480:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._482:\n" + " .align 2, 0\n" + "._481:\n" + " .word gMain\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_CellInfo() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._483\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl DebugMenu_80787EC\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._484:\n" + " .align 2, 0\n" + "._483:\n" + " .word DebugMenu_8078880+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenBerryInfo() +{ + asm( + " push {r4, lr}\n" + " bl DebugOpenBerryInfo\n" + " add r4, r0, #0\n" + " cmp r4, #0\n" + " bne ._485 @cond_branch\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + " b ._486\n" + "._485:\n" + " mov r0, #0x0\n" + " mov r1, #0x0\n" + " mov r2, #0x13\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " add r0, r4, #0\n" + " mov r1, #0x1\n" + " mov r2, #0x1\n" + " bl MenuPrint\n" + " ldr r1, ._487\n" + " ldr r0, ._487 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + "._486:\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._488:\n" + " .align 2, 0\n" + "._487:\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8077DB4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078950() +{ + asm( + " push {lr}\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._489\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " pop {r0}\n" + " bx r0\n" + "._490:\n" + " .align 2, 0\n" + "._489:\n" + " .word gDebug0x839C008+0x426\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078968() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x10\n" + " cmp r0, #0\n" + " bne ._491 @cond_branch\n" + " ldr r0, ._493\n" + " mov r1, #0x32\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " b ._492\n" + "._494:\n" + " .align 2, 0\n" + "._493:\n" + " .word gStringVar1\n" + "._491:\n" + " ldr r0, ._495\n" + " mov r1, #0x64\n" + " mov r2, #0x2\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + "._492:\n" + " ldr r0, ._495\n" + " mov r1, #0x4\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " pop {r0}\n" + " bx r0\n" + "._496:\n" + " .align 2, 0\n" + "._495:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80789A4() +{ + asm( + " push {r4, lr}\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " ldr r4, ._497\n" + " add r0, r4, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x4\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x9\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._498:\n" + " .align 2, 0\n" + "._497:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_80789CC() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r4, r0, #0x2\n" + " add r4, r4, r0\n" + " lsl r4, r4, #0x3\n" + " ldr r6, ._499\n" + " add r5, r4, r6\n" + " mov r0, #0x0\n" + " strh r0, [r5]\n" + " ldr r0, ._499 + 4\n" + " ldr r1, ._499 + 8\n" + " add r0, r0, r1\n" + " ldrh r0, [r0]\n" + " strh r0, [r5, #0x2]\n" + " bl DebugMenu_8078950\n" + " ldrh r0, [r5]\n" + " bl DebugMenu_8078968\n" + " sub r6, r6, #0x8\n" + " add r4, r4, r6\n" + " ldr r0, ._499 + 12\n" + " str r0, [r4]\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._500:\n" + " .align 2, 0\n" + "._499:\n" + " .word gTasks+0x8\n" + " .word gSaveBlock2\n" + " .word 0x55c\n" + " .word DebugMenu_8078A14+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078A14() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r4, r1, #0x3\n" + " ldr r5, ._504\n" + " add r2, r4, r5\n" + " ldr r0, ._504 + 4\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0xc0\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._501 @cond_branch\n" + " mov r1, #0x0\n" + " mov r3, #0x0\n" + " ldsh r0, [r2, r3]\n" + " cmp r0, #0\n" + " bne ._502 @cond_branch\n" + " mov r1, #0x1\n" + "._502:\n" + " strh r1, [r2]\n" + " ldrh r0, [r2]\n" + " bl DebugMenu_8078968\n" + " b ._510\n" + "._505:\n" + " .align 2, 0\n" + "._504:\n" + " .word gTasks+0x8\n" + " .word gMain\n" + "._501:\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._506 @cond_branch\n" + " ldr r1, ._508\n" + " mov r3, #0x0\n" + " ldsh r0, [r2, r3]\n" + " lsl r0, r0, #0x1\n" + " ldr r3, ._508 + 4\n" + " add r1, r1, r3\n" + " add r0, r0, r1\n" + " ldrh r0, [r0]\n" + " strh r0, [r2, #0x2]\n" + " ldrh r0, [r2, #0x2]\n" + " bl DebugMenu_80789A4\n" + " add r0, r5, #0\n" + " sub r0, r0, #0x8\n" + " add r0, r4, r0\n" + " ldr r1, ._508 + 8\n" + " b ._507\n" + "._509:\n" + " .align 2, 0\n" + "._508:\n" + " .word gSaveBlock2\n" + " .word 0x55c\n" + " .word DebugMenu_8078AA4+1\n" + "._506:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._510 @cond_branch\n" + " add r0, r5, #0\n" + " sub r0, r0, #0x8\n" + " add r0, r4, r0\n" + " ldr r1, ._511\n" + "._507:\n" + " str r1, [r0]\n" + "._510:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._512:\n" + " .align 2, 0\n" + "._511:\n" + " .word DebugMenu_8078B38+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078AA4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r5, r1, #0x3\n" + " ldr r7, ._515\n" + " add r4, r5, r7\n" + " add r0, r4, #2\n" + " mov r2, #0xfa\n" + " lsl r2, r2, #0x3\n" + " ldr r6, ._515 + 4\n" + " ldrh r3, [r6, #0x30]\n" + " mov r1, #0x0\n" + " bl DebugMenu_8077DD8\n" + " cmp r0, #0x1\n" + " bne ._513 @cond_branch\n" + " ldrh r0, [r4, #0x2]\n" + " bl DebugMenu_80789A4\n" + " b ._521\n" + "._516:\n" + " .align 2, 0\n" + "._515:\n" + " .word gTasks+0x8\n" + " .word gMain\n" + "._513:\n" + " ldrh r1, [r6, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._517 @cond_branch\n" + " ldr r1, ._519\n" + " mov r2, #0x0\n" + " ldsh r0, [r4, r2]\n" + " lsl r0, r0, #0x1\n" + " ldr r2, ._519 + 4\n" + " add r1, r1, r2\n" + " add r0, r0, r1\n" + " ldrh r1, [r4, #0x2]\n" + " strh r1, [r0]\n" + " mov r0, #0x49\n" + " bl PlaySE\n" + " add r0, r7, #0\n" + " sub r0, r0, #0x8\n" + " add r0, r5, r0\n" + " ldr r1, ._519 + 8\n" + " b ._518\n" + "._520:\n" + " .align 2, 0\n" + "._519:\n" + " .word gSaveBlock2\n" + " .word 0x55c\n" + " .word DebugMenu_8078B38+1\n" + "._517:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._521 @cond_branch\n" + " bl DebugMenu_8078950\n" + " ldrh r0, [r4]\n" + " bl DebugMenu_8078968\n" + " add r0, r7, #0\n" + " sub r0, r0, #0x8\n" + " add r0, r5, r0\n" + " ldr r1, ._522\n" + "._518:\n" + " str r1, [r0]\n" + "._521:\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "._523:\n" + " .align 2, 0\n" + "._522:\n" + " .word DebugMenu_8078A14+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078B38() +{ + asm( + " push {r4, lr}\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_BattleTowerStages() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " bl ScriptContext2_Enable\n" + " ldr r0, ._524\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._525:\n" + " .align 2, 0\n" + "._524:\n" + " .word DebugMenu_80789CC+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078B70() +{ + asm( + " push {lr}\n" + " add r1, r0, #0\n" + " lsl r1, r1, #0x10\n" + " lsr r1, r1, #0x10\n" + " ldr r0, ._526\n" + " mov r2, #0x0\n" + " mov r3, #0x1\n" + " bl ConvertIntToHexStringN\n" + " ldr r0, ._526 + 4\n" + " bl sub_8071F40\n" + " pop {r0}\n" + " bx r0\n" + "._527:\n" + " .align 2, 0\n" + "._526:\n" + " .word gStringVar1\n" + " .word gDebug0x839C008+0x430\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078B94() +{ + asm( + " push {r4, r5, lr}\n" + " mov r3, #0x0\n" + " ldr r1, ._531\n" + " ldrb r0, [r1]\n" + " cmp r0, #0\n" + " beq ._529 @cond_branch\n" + " ldr r5, ._531 + 4\n" + " add r4, r1, #0\n" + "._530:\n" + " lsl r0, r3, #0x3\n" + " add r2, r0, r5\n" + " add r0, r0, r4\n" + " ldr r1, [r0, #0x4]\n" + " ldr r0, [r0]\n" + " str r0, [r2]\n" + " str r1, [r2, #0x4]\n" + " add r0, r3, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r3, r0, #0x18\n" + " cmp r3, #0x27\n" + " bhi ._529 @cond_branch\n" + " lsl r0, r3, #0x3\n" + " add r0, r0, r4\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._530 @cond_branch\n" + "._529:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._532:\n" + " .align 2, 0\n" + "._531:\n" + " .word gDebug0x839C008+0x43c\n" + " .word gSaveBlock1+0x7f8\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078BD4() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " ldr r1, ._536\n" + " add r4, r0, r1\n" + " mov r1, #0x0\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0\n" + " beq ._533 @cond_branch\n" + " cmp r0, #0x1\n" + " beq ._534 @cond_branch\n" + " b ._545\n" + "._537:\n" + " .align 2, 0\n" + "._536:\n" + " .word gTasks+0x8\n" + "._533:\n" + " ldrh r0, [r4, #0x2]\n" + " bl DebugMenu_8078B70\n" + " ldrh r0, [r4]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4]\n" + " b ._545\n" + "._534:\n" + " ldr r2, ._541\n" + " ldrh r1, [r2, #0x2e]\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._539 @cond_branch\n" + " mov r0, #0x49\n" + " bl PlaySE\n" + " bl MenuZeroFillScreen\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + " bl ScriptContext2_Disable\n" + " bl DebugMenu_8078B94\n" + " b ._545\n" + "._542:\n" + " .align 2, 0\n" + "._541:\n" + " .word gMain\n" + "._539:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._543 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + " bl ScriptContext2_Disable\n" + " b ._545\n" + "._543:\n" + " add r0, r4, #2\n" + " ldrh r3, [r2, #0x30]\n" + " mov r1, #0x0\n" + " mov r2, #0x4\n" + " bl DebugMenu_8077DD8\n" + " cmp r0, #0x1\n" + " bne ._545 @cond_branch\n" + " ldrh r0, [r4, #0x2]\n" + " bl DebugMenu_8078B70\n" + "._545:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_CheckPKBLCK() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._546\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._547:\n" + " .align 2, 0\n" + "._546:\n" + " .word DebugMenu_8078BD4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078C80() +{ + asm( + " push {lr}\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._548\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r1, ._548 + 4\n" + " ldr r0, ._548 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._549:\n" + " .align 2, 0\n" + "._548:\n" + " .word gDebug0x839C574+0x30\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8078CA8+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078CA8() +{ + asm( + " push {lr}\n" + " ldr r0, ._552\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._550 @cond_branch\n" + " ldr r1, ._552 + 4\n" + " ldr r0, ._552 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " b ._555\n" + "._553:\n" + " .align 2, 0\n" + "._552:\n" + " .word gMain\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8078CE4+1\n" + "._550:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._554 @cond_branch\n" + " mov r0, #0x0\n" + " b ._555\n" + "._554:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._555:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078CE4() +{ + asm( + " push {lr}\n" + " ldr r1, ._558\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0xa\n" + " mov r0, #0x0\n" + " bl DebugMenu_8078E40\n" + " cmp r0, #0x1\n" + " bne ._556 @cond_branch\n" + " ldr r0, ._558 + 4\n" + " ldr r1, ._558 + 8\n" + " bl StringCopy\n" + " b ._557\n" + "._559:\n" + " .align 2, 0\n" + "._558:\n" + " .word +0x2000000\n" + " .word gStringVar4\n" + " .word gDebug0x839C574+0x58\n" + "._556:\n" + " ldr r0, ._560\n" + " ldr r1, ._560 + 4\n" + " bl StringCopy\n" + "._557:\n" + " ldr r1, ._560 + 8\n" + " ldr r0, ._560 + 12\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._561:\n" + " .align 2, 0\n" + "._560:\n" + " .word gStringVar4\n" + " .word gDebug0x839C574+0x6b\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8078D7C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078D30() +{ + asm( + " push {r4, r5, r6, lr}\n" + " ldr r5, ._563\n" + " mov r4, #0x0\n" + " mov r6, #0x80\n" + " lsl r6, r6, #0x5\n" + "._562:\n" + " add r0, r4, #0\n" + " add r1, r5, #0\n" + " add r2, r6, #0\n" + " bl DebugMenu_8078E68\n" + " add r5, r5, r6\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0x1f\n" + " bls ._562 @cond_branch\n" + " ldr r0, ._563 + 4\n" + " ldr r1, ._563 + 8\n" + " bl StringCopy\n" + " ldr r1, ._563 + 12\n" + " ldr r0, ._563 + 16\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._564:\n" + " .align 2, 0\n" + "._563:\n" + " .word +0x2000000\n" + " .word gStringVar4\n" + " .word gDebug0x839C574+0x62\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8078D7C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078D7C() +{ + asm( + " push {lr}\n" + " bl MenuDisplayMessageBox\n" + " ldr r0, ._565\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r1, ._565 + 4\n" + " ldr r0, ._565 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._566:\n" + " .align 2, 0\n" + "._565:\n" + " .word gStringVar4\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8078DA4+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078DA4() +{ + asm( + " push {lr}\n" + " ldr r0, ._569\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._567 @cond_branch\n" + " mov r0, #0x0\n" + " b ._568\n" + "._570:\n" + " .align 2, 0\n" + "._569:\n" + " .word gMain\n" + "._567:\n" + " bl CloseMenu\n" + " mov r0, #0x1\n" + "._568:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_MeTooBackupMan() +{ + asm( + " push {lr}\n" + " bl MenuZeroFillScreen\n" + " ldr r0, ._571\n" + " mov r1, #0xc\n" + " mov r2, #0x2\n" + " bl DebugMenu_8077D24\n" + " ldr r1, ._571 + 4\n" + " ldr r0, ._571 + 8\n" + " str r0, [r1]\n" + " mov r0, #0x0\n" + " pop {r1}\n" + " bx r1\n" + "._572:\n" + " .align 2, 0\n" + "._571:\n" + " .word gDebug0x839C574+0x20\n" + " .word gCallback_03004AE8\n" + " .word DebugMenu_8078DF0+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078DF0() +{ + asm( + " push {lr}\n" + " ldr r0, ._573\n" + " bl DebugMenu_8077D78\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " pop {r1}\n" + " bx r1\n" + "._574:\n" + " .align 2, 0\n" + "._573:\n" + " .word gDebug0x839C574+0x20\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078E04() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r1, #0\n" + " add r5, r2, #0\n" + " b ._575\n" + "._577:\n" + " ldr r0, ._579\n" + " add r5, r5, r0\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x5\n" + " add r6, r6, r0\n" + " add r0, r4, #1\n" + "._575:\n" + " lsl r0, r0, #0x10\n" + " lsr r4, r0, #0x10\n" + " add r0, r4, #0\n" + " add r1, r6, #0\n" + " bl gScriptFuncs_End+0x2f60\n" + " cmp r0, #0\n" + " bne ._576 @cond_branch\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x5\n" + " cmp r5, r0\n" + " bhi ._577 @cond_branch\n" + " mov r0, #0x1\n" + " b ._578\n" + "._580:\n" + " .align 2, 0\n" + "._579:\n" + " .word 0xfffff000\n" + "._576:\n" + " mov r0, #0x0\n" + "._578:\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078E40() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r4, r0, #0\n" + " add r5, r1, #0\n" + " add r6, r2, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl gScriptFuncs_End+0x19f4\n" + " add r0, r4, #0\n" + " add r1, r5, #0\n" + " add r2, r6, #0\n" + " bl DebugMenu_8078E04\n" + " add r4, r0, #0\n" + " bl gScriptFuncs_End+0x1a70\n" + " add r0, r4, #0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078E68() +{ + asm( + " push {r4, lr}\n" + " add r4, r1, #0\n" + " add r3, r2, #0\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r1, #0x0\n" + " add r2, r4, #0\n" + " bl gScriptFuncs_End+0x2d64\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078E80() +{ + asm( + " push {r4, lr}\n" + " add r4, r0, #0\n" + " mov r0, #0x2\n" + " mov r1, #0xf\n" + " mov r2, #0x16\n" + " mov r3, #0x10\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r1, ._581\n" + " mov r2, #0x0\n" + " ldsh r0, [r4, r2]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldrb r1, [r0, #0x4]\n" + " mov r0, #0xd0\n" + " mov r2, #0xf\n" + " bl sub_8071F60\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._582:\n" + " .align 2, 0\n" + "._581:\n" + " .word gDebug0x839C574+0x80\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078EB0() +{ + asm( + " push {r4, r5, lr}\n" + " add r5, r0, #0\n" + " ldr r4, ._583\n" + " mov r0, #0x2\n" + " ldsh r1, [r5, r0]\n" + " add r0, r4, #0\n" + " mov r2, #0x1\n" + " mov r3, #0x3\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " mov r0, #0xf0\n" + " mov r1, #0x5\n" + " mov r2, #0x11\n" + " bl sub_8071F60\n" + " mov r0, #0x4\n" + " ldsh r1, [r5, r0]\n" + " add r0, r4, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x6\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " mov r0, #0xf0\n" + " mov r1, #0x8\n" + " mov r2, #0x11\n" + " bl sub_8071F60\n" + " mov r0, #0x6\n" + " ldsh r1, [r5, r0]\n" + " add r0, r4, #0\n" + " mov r2, #0x2\n" + " mov r3, #0x2\n" + " bl ConvertIntToDecimalStringN\n" + " add r0, r4, #0\n" + " mov r1, #0x9\n" + " mov r2, #0x11\n" + " bl MenuPrint\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._584:\n" + " .align 2, 0\n" + "._583:\n" + " .word gStringVar1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078F1C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r4, r0, #0x2\n" + " add r4, r4, r0\n" + " lsl r4, r4, #0x3\n" + " ldr r6, ._585\n" + " add r5, r4, r6\n" + " mov r0, #0x0\n" + " strh r0, [r5]\n" + " ldr r1, ._585 + 4\n" + " ldrh r0, [r1, #0xe]\n" + " strh r0, [r5, #0x2]\n" + " ldrb r0, [r1, #0x10]\n" + " strh r0, [r5, #0x4]\n" + " ldrb r0, [r1, #0x11]\n" + " strh r0, [r5, #0x6]\n" + " bl MenuDisplayMessageBox\n" + " add r0, r5, #0\n" + " bl DebugMenu_8078EB0\n" + " add r0, r5, #0\n" + " bl DebugMenu_8078E80\n" + " sub r6, r6, #0x8\n" + " add r4, r4, r6\n" + " ldr r0, ._585 + 8\n" + " str r0, [r4]\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._586:\n" + " .align 2, 0\n" + "._585:\n" + " .word gTasks+0x8\n" + " .word gSaveBlock2\n" + " .word DebugMenu_8078F68+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8078F68() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " lsl r1, r0, #0x2\n" + " add r1, r1, r0\n" + " lsl r5, r1, #0x3\n" + " ldr r6, ._589\n" + " add r4, r5, r6\n" + " ldr r3, ._589 + 4\n" + " ldrh r1, [r3, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._587 @cond_branch\n" + " ldr r1, ._589 + 8\n" + " ldrh r0, [r4, #0x2]\n" + " strh r0, [r1, #0xe]\n" + " ldrh r0, [r4, #0x4]\n" + " strb r0, [r1, #0x10]\n" + " ldrh r0, [r4, #0x6]\n" + " strb r0, [r1, #0x11]\n" + " mov r0, #0x49\n" + " bl PlaySE\n" + " b ._588\n" + "._590:\n" + " .align 2, 0\n" + "._589:\n" + " .word gTasks+0x8\n" + " .word gMain\n" + " .word gSaveBlock2\n" + "._587:\n" + " mov r0, #0x2\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._591 @cond_branch\n" + "._588:\n" + " add r0, r6, #0\n" + " sub r0, r0, #0x8\n" + " add r0, r5, r0\n" + " ldr r1, ._593\n" + " str r1, [r0]\n" + " b ._601\n" + "._594:\n" + " .align 2, 0\n" + "._593:\n" + " .word DebugMenu_8079020+1\n" + "._591:\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._595 @cond_branch\n" + " ldrh r1, [r4]\n" + " mov r2, #0x0\n" + " ldsh r0, [r4, r2]\n" + " cmp r0, #0\n" + " beq ._601 @cond_branch\n" + " sub r0, r1, #1\n" + " b ._597\n" + "._595:\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._598 @cond_branch\n" + " ldrh r0, [r4]\n" + " cmp r0, #0x1\n" + " bhi ._601 @cond_branch\n" + " add r0, r0, #0x1\n" + "._597:\n" + " strh r0, [r4]\n" + " add r0, r4, #0\n" + " bl DebugMenu_8078E80\n" + " b ._601\n" + "._598:\n" + " mov r0, #0x0\n" + " ldsh r2, [r4, r0]\n" + " lsl r2, r2, #0x3\n" + " ldr r0, ._602\n" + " add r2, r2, r0\n" + " ldrb r0, [r2, #0x5]\n" + " lsl r0, r0, #0x1\n" + " add r0, r4, r0\n" + " ldrh r1, [r2]\n" + " ldrh r2, [r2, #0x2]\n" + " ldrh r3, [r3, #0x30]\n" + " bl DebugMenu_8077DD8\n" + " cmp r0, #0x1\n" + " bne ._601 @cond_branch\n" + " add r0, r4, #0\n" + " bl DebugMenu_8078EB0\n" + "._601:\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._603:\n" + " .align 2, 0\n" + "._602:\n" + " .word gDebug0x839C574+0x80\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8079020() +{ + asm( + " push {r4, lr}\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x18\n" + " lsr r4, r4, #0x18\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r4, #0\n" + " bl DestroyTask\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_PTime() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._604\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._605:\n" + " .align 2, 0\n" + "._604:\n" + " .word DebugMenu_8078F1C+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8079058() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r1, ._610\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r4, r0, r1\n" + " mov r0, #0x8\n" + " ldsh r1, [r4, r0]\n" + " cmp r1, #0x1\n" + " beq ._606 @cond_branch\n" + " cmp r1, #0x1\n" + " bgt ._607 @cond_branch\n" + " cmp r1, #0\n" + " beq ._608 @cond_branch\n" + " b ._620\n" + "._611:\n" + " .align 2, 0\n" + "._610:\n" + " .word gTasks\n" + "._607:\n" + " cmp r1, #0x2\n" + " beq ._612 @cond_branch\n" + " b ._620\n" + "._608:\n" + " ldr r0, ._615\n" + " str r1, [r0]\n" + " bl MenuDisplayMessageBox\n" + " b ._614\n" + "._616:\n" + " .align 2, 0\n" + "._615:\n" + " .word gUnknown_Debug_03004BD0\n" + "._606:\n" + " ldr r0, ._618\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " mov r0, #0x14\n" + " mov r1, #0x8\n" + " mov r2, #0x1\n" + " bl DisplayYesNoMenu\n" + "._614:\n" + " ldrh r0, [r4, #0x8]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4, #0x8]\n" + " b ._620\n" + "._619:\n" + " .align 2, 0\n" + "._618:\n" + " .word gDebug0x839C60C\n" + "._612:\n" + " bl ProcessMenuInputNoWrap_\n" + " lsl r0, r0, #0x18\n" + " asr r1, r0, #0x18\n" + " mov r0, #0x2\n" + " neg r0, r0\n" + " cmp r1, r0\n" + " beq ._620 @cond_branch\n" + " cmp r1, #0\n" + " bne ._621 @cond_branch\n" + " ldr r1, ._623\n" + " mov r0, #0x1\n" + " b ._622\n" + "._624:\n" + " .align 2, 0\n" + "._623:\n" + " .word gUnknown_Debug_03004BD0\n" + "._621:\n" + " ldr r1, ._625\n" + " mov r0, #0x0\n" + "._622:\n" + " str r0, [r1]\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + "._620:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._626:\n" + " .align 2, 0\n" + "._625:\n" + " .word gUnknown_Debug_03004BD0\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenMurakawa() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._627\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " mov r0, #0x1\n" + " pop {r1}\n" + " bx r1\n" + "._628:\n" + " .align 2, 0\n" + "._627:\n" + " .word DebugMenu_8079058+1\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_8079110() +{ + asm( + " push {r4, r5, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r1, ._633\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r4, r0, r1\n" + " mov r1, #0x8\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0x1\n" + " beq ._629 @cond_branch\n" + " cmp r0, #0x1\n" + " bgt ._630 @cond_branch\n" + " cmp r0, #0\n" + " beq ._631 @cond_branch\n" + " b ._642\n" + "._634:\n" + " .align 2, 0\n" + "._633:\n" + " .word gTasks\n" + "._630:\n" + " cmp r0, #0x2\n" + " beq ._635 @cond_branch\n" + " b ._642\n" + "._631:\n" + " bl MenuDisplayMessageBox\n" + " b ._637\n" + "._629:\n" + " ldr r0, ._639\n" + " mov r1, #0x2\n" + " mov r2, #0xf\n" + " bl MenuPrintMessage\n" + "._637:\n" + " ldrh r0, [r4, #0x8]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4, #0x8]\n" + " b ._642\n" + "._640:\n" + " .align 2, 0\n" + "._639:\n" + " .word gDebug0x839C60C+0xe\n" + "._635:\n" + " bl MenuUpdateWindowText\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._642 @cond_branch\n" + " ldr r0, ._643\n" + " ldrh r1, [r0, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._642 @cond_branch\n" + " bl MenuZeroFillScreen\n" + " bl ScriptContext2_Disable\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + "._642:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._644:\n" + " .align 2, 0\n" + "._643:\n" + " .word gMain\n" + "\n" + ); +} + +__attribute__((naked)) +void DebugMenu_OpenKiwa() +{ + asm( + " push {lr}\n" + " bl CloseMenu\n" + " ldr r0, ._645\n" + " mov r1, #0x50\n" + " bl CreateTask\n" + " bl ScriptContext2_Enable\n" + " pop {r1}\n" + " bx r1\n" + "._646:\n" + " .align 2, 0\n" + "._645:\n" + " .word DebugMenu_8079110+1\n" + "\n" + ); +} + diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c new file mode 100644 index 000000000..70e194907 --- /dev/null +++ b/src/debug/unk_debug_menu_3.c @@ -0,0 +1,797 @@ +__attribute__((naked)) +void debug_sub_813C404() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " ldr r5, ._1\n" + " ldr r4, ._1 + 4\n" + " sub r5, r5, r4\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " bl unref_sub_812620C\n" + " add r0, r5, #0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._2:\n" + " .align 2, 0\n" + "._1:\n" + " .word gOtherText_DataCannotUseVersion+0x30d\n" + " .word gOtherText_DataCannotUseVersion+0x3c\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C430() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " ldr r5, ._3\n" + " ldr r4, ._3 + 4\n" + " sub r5, r5, r4\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " bl unref_sub_812620C\n" + " add r0, r5, #0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word gOtherText_DataCannotUseVersion+0x95d\n" + " .word gOtherText_DataCannotUseVersion+0x93b\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C45C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " ldr r5, ._5\n" + " ldr r4, ._5 + 4\n" + " sub r5, r5, r4\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " bl unref_sub_812620C\n" + " add r0, r5, #0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._6:\n" + " .align 2, 0\n" + "._5:\n" + " .word gOtherText_DataCannotUseVersion+0x99e\n" + " .word gOtherText_DataCannotUseVersion+0x97d\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C488() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " ldr r5, ._7\n" + " ldr r4, ._7 + 4\n" + " sub r5, r5, r4\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " bl unref_sub_812620C\n" + " add r0, r5, #0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._8:\n" + " .align 2, 0\n" + "._7:\n" + " .word gOtherText_DataCannotUseVersion+0x97d\n" + " .word gOtherText_DataCannotUseVersion+0x95d\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C4B4() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._9\n" + " ldr r1, ._9 + 4\n" + " sub r4, r4, r1\n" + " add r2, r4, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r4, #0\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "._10:\n" + " .align 2, 0\n" + "._9:\n" + " .word gOtherText_DataCannotUseVersion+0xb74\n" + " .word gOtherText_DataCannotUseVersion+0xb61\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C4D4() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " ldr r5, ._11\n" + " ldr r4, ._11 + 4\n" + " sub r5, r5, r4\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " bl unref_sub_81261B4\n" + " add r0, r5, #0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._12:\n" + " .align 2, 0\n" + "._11:\n" + " .word gOtherText_DataCannotUseVersion+0xc6d\n" + " .word gOtherText_DataCannotUseVersion+0xb74\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C500() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add r6, r0, #0\n" + " ldr r5, ._13\n" + " ldr r4, ._13 + 4\n" + " sub r5, r5, r4\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r4, #0\n" + " bl unref_sub_812620C\n" + " add r0, r5, #0\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._14:\n" + " .align 2, 0\n" + "._13:\n" + " .word gOtherText_DataCannotUseVersion+0xcf2\n" + " .word gOtherText_DataCannotUseVersion+0xc6d\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C52C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r9\n" + " mov r5, r8\n" + " push {r5, r6}\n" + " mov r8, r0\n" + " lsl r5, r1, #0x10\n" + " lsr r0, r5, #0x10\n" + " mov r9, r0\n" + " ldr r6, ._15\n" + " ldr r4, ._15 + 4\n" + " sub r6, r6, r4\n" + " mov r0, r8\n" + " add r1, r4, #0\n" + " add r2, r6, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " ldr r0, ._15 + 8\n" + " sub r0, r0, r4\n" + " add r0, r0, r8\n" + " add r0, r0, #0x3\n" + " mov r1, r9\n" + " strb r1, [r0]\n" + " lsr r5, r5, #0x18\n" + " strb r5, [r0, #0x1]\n" + " mov r0, r8\n" + " add r1, r4, #0\n" + " bl unref_sub_812620C\n" + " add r0, r6, #0\n" + " pop {r3, r4}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._16:\n" + " .align 2, 0\n" + "._15:\n" + " .word gOtherText_DataCannotUseVersion+0xd16\n" + " .word gOtherText_DataCannotUseVersion+0xcf2\n" + " .word gOtherText_DataCannotUseVersion+0xd10\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C580() +{ + asm( + " push {lr}\n" + " mov r1, #0xd\n" + " bl debug_sub_813C52C\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C58C() +{ + asm( + " push {lr}\n" + " mov r1, #0x4\n" + " bl debug_sub_813C52C\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C598() +{ + asm( + " push {lr}\n" + " mov r1, #0x85\n" + " bl debug_sub_813C52C\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C5A4() +{ + asm( + " push {lr}\n" + " ldr r1, ._17\n" + " bl debug_sub_813C52C\n" + " pop {r1}\n" + " bx r1\n" + "._18:\n" + " .align 2, 0\n" + "._17:\n" + " .word 0x121\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C5B4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " add r4, r0, #0\n" + " ldr r7, ._23\n" + " ldr r0, ._23 + 4\n" + " ldr r1, ._23 + 8\n" + " sub r0, r0, r1\n" + " add r6, r0, r4\n" + " ldr r0, ._23 + 12\n" + " sub r5, r0, r1\n" + " ldr r0, ._23 + 16\n" + " mov r1, #0x0\n" + " mov r2, #0x0\n" + " bl GetEnigmaBerryChecksum\n" + " mov r2, #0x0\n" + " ldr r3, ._23 + 20\n" + " mov r1, #0x0\n" + "._19:\n" + " add r0, r4, r2\n" + " strb r1, [r0]\n" + " add r2, r2, #0x1\n" + " cmp r2, r3\n" + " ble ._19 @cond_branch\n" + " mov r2, #0x0\n" + " cmp r2, r5\n" + " bcs ._20 @cond_branch\n" + " ldr r3, ._23 + 8\n" + "._21:\n" + " add r0, r4, r2\n" + " add r1, r2, r3\n" + " ldrb r1, [r1]\n" + " strb r1, [r0]\n" + " add r2, r2, #0x1\n" + " cmp r2, r5\n" + " bcc ._21 @cond_branch\n" + "._20:\n" + " mov r2, #0x0\n" + " ldr r3, ._23 + 24\n" + "._22:\n" + " add r0, r6, r2\n" + " add r1, r7, r2\n" + " ldrb r1, [r1]\n" + " strb r1, [r0]\n" + " add r2, r2, #0x1\n" + " cmp r2, r3\n" + " bls ._22 @cond_branch\n" + " bl ClearEnigmaBerries\n" + " ldr r1, ._23 + 8\n" + " add r0, r4, #0\n" + " bl unref_sub_81261B4\n" + " add r0, r5, #0\n" + " pop {r4, r5, r6, r7}\n" + " pop {r1}\n" + " bx r1\n" + "._24:\n" + " .align 2, 0\n" + "._23:\n" + " .word gSaveBlock1+0x3160\n" + " .word gOtherText_DataCannotUseVersion+0x331\n" + " .word gOtherText_DataCannotUseVersion+0x30d\n" + " .word gOtherText_DataCannotUseVersion+0x861\n" + " .word gFlashSectors+0x8\n" + " .word 0xfff\n" + " .word 0x52f\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C638() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xffffffec\n" + " mov r8, r0\n" + " add r4, r1, #0\n" + " add r5, r2, #0\n" + " add r6, r3, #0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " lsl r5, r5, #0x18\n" + " lsr r5, r5, #0x18\n" + " lsl r6, r6, #0x10\n" + " lsr r6, r6, #0x10\n" + " bl ZeroMonData\n" + " mov r0, #0x0\n" + " str r0, [sp]\n" + " str r0, [sp, #0x4]\n" + " mov r0, #0x1\n" + " str r0, [sp, #0x8]\n" + " ldr r0, ._25\n" + " str r0, [sp, #0xc]\n" + " mov r0, r8\n" + " add r1, r4, #0\n" + " add r2, r5, #0\n" + " mov r3, #0x20\n" + " bl CreateMon\n" + " ldr r2, ._25 + 4\n" + " mov r0, r8\n" + " mov r1, #0x7\n" + " bl SetMonData\n" + " ldr r2, ._25 + 8\n" + " mov r0, r8\n" + " mov r1, #0x2\n" + " bl SetMonData\n" + " str r6, [sp, #0x10]\n" + " mov r0, r8\n" + " mov r1, #0xc\n" + " add r2, sp, #0x10\n" + " bl SetMonData\n" + " add sp, sp, #0x14\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._26:\n" + " .align 2, 0\n" + "._25:\n" + " .word 0x270f\n" + " .word gFlashSectors+0xc\n" + " .word gFlashSectors+0x14\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C6AC() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " add sp, sp, #0xfffffff8\n" + " add r6, r0, #0\n" + " add r5, r1, #0\n" + " add r0, r5, #0\n" + " bl ClearMailStruct\n" + " add r0, r6, #0\n" + " mov r1, #0xc\n" + " bl GetMonData\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " mov r8, r0\n" + " bl ItemIsMail\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._27 @cond_branch\n" + " add r4, r5, #0\n" + " add r4, r4, #0x12\n" + " add r7, r5, #0\n" + " add r7, r7, #0x1a\n" + " mov r1, #0x9\n" + " add r0, r5, #0\n" + " add r0, r0, #0x10\n" + "._28:\n" + " strh r1, [r0]\n" + " sub r1, r1, #0x1\n" + " sub r0, r0, #0x2\n" + " cmp r0, r5\n" + " bge ._28 @cond_branch\n" + " add r0, r6, #0\n" + " mov r1, #0x7\n" + " mov r2, sp\n" + " bl GetMonData\n" + " add r0, r4, #0\n" + " mov r1, sp\n" + " mov r2, #0x8\n" + " bl StringCopyN\n" + " add r0, r6, #0\n" + " mov r1, #0x1\n" + " bl GetMonData\n" + " add r1, r7, #0\n" + " bl write_word_to_mem\n" + " add r0, r6, #0\n" + " mov r1, #0xb\n" + " bl GetMonData\n" + " add r4, r0, #0\n" + " lsl r4, r4, #0x10\n" + " lsr r4, r4, #0x10\n" + " add r0, r6, #0\n" + " mov r1, #0x0\n" + " bl GetMonData\n" + " add r1, r0, #0\n" + " add r0, r4, #0\n" + " bl SpeciesToMailSpecies\n" + " strh r0, [r5, #0x1e]\n" + " mov r0, r8\n" + " strh r0, [r5, #0x20]\n" + "._27:\n" + " add sp, sp, #0x8\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C740() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, sl\n" + " mov r5, r9\n" + " mov r4, r8\n" + " push {r4, r5, r6}\n" + " add sp, sp, #0xffffffd0\n" + " add r6, r0, #0\n" + " ldr r0, ._29\n" + " mov r8, r0\n" + " ldr r1, ._29 + 4\n" + " ldr r5, ._29 + 8\n" + " sub r1, r1, r0\n" + " mov r9, r1\n" + " add r0, r6, #0\n" + " mov r1, r8\n" + " mov r2, r9\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r5, #0\n" + " mov r1, #0x19\n" + " mov r2, #0x5\n" + " mov r3, #0x0\n" + " bl debug_sub_813C638\n" + " add r4, sp, #0x24\n" + " mov r0, #0x1\n" + " mov sl, r0\n" + " mov r1, sl\n" + " strb r1, [r4]\n" + " add r0, r5, #0\n" + " mov r1, #0x2d\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " mov r0, #0x3\n" + " strb r0, [r4]\n" + " add r0, r5, #0\n" + " mov r1, #0x20\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " mov r0, #0xff\n" + " strb r0, [r4]\n" + " add r0, r5, #0\n" + " mov r1, #0x23\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " ldr r1, ._29 + 12\n" + " add r0, r4, #0\n" + " mov r2, #0xb\n" + " bl StringCopyN\n" + " add r0, r5, #0\n" + " mov r1, #0x2\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " mov r0, sl\n" + " strb r0, [r4]\n" + " add r0, r5, #0\n" + " mov r1, #0x3\n" + " add r2, r4, #0\n" + " bl SetMonData\n" + " ldr r0, ._29 + 16\n" + " add r0, r6, r0\n" + " mov r1, r8\n" + " sub r0, r0, r1\n" + " add r1, r5, #0\n" + " mov r2, #0x64\n" + " bl gScriptFuncs_End+0x5bc4\n" + " ldr r0, ._29 + 20\n" + " add r6, r6, r0\n" + " mov r0, r8\n" + " sub r6, r6, r0\n" + " add r0, r6, #0\n" + " mov r1, sp\n" + " mov r2, #0x24\n" + " bl gScriptFuncs_End+0x5bc4\n" + " mov r0, r9\n" + " add sp, sp, #0x30\n" + " pop {r3, r4, r5}\n" + " mov r8, r3\n" + " mov r9, r4\n" + " mov sl, r5\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._30:\n" + " .align 2, 0\n" + "._29:\n" + " .word gOtherText_DataCannotUseVersion+0x99e\n" + " .word gOtherText_DataCannotUseVersion+0xa4a\n" + " .word gEnemyParty\n" + " .word gFlashSectors+0x4\n" + " .word gOtherText_DataCannotUseVersion+0x9c2\n" + " .word gOtherText_DataCannotUseVersion+0xa26\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C810() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xffffffdc\n" + " add r6, r0, #0\n" + " ldr r5, ._31\n" + " ldr r0, ._31 + 4\n" + " ldr r4, ._31 + 8\n" + " sub r0, r0, r5\n" + " mov r8, r0\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " mov r2, r8\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r4, #0\n" + " mov r1, #0xc9\n" + " mov r2, #0x15\n" + " mov r3, #0x82\n" + " bl debug_sub_813C638\n" + " add r0, r4, #0\n" + " mov r1, sp\n" + " bl debug_sub_813C6AC\n" + " ldr r0, ._31 + 12\n" + " add r0, r6, r0\n" + " sub r0, r0, r5\n" + " add r1, r4, #0\n" + " mov r2, #0x64\n" + " bl gScriptFuncs_End+0x5bc4\n" + " ldr r0, ._31 + 16\n" + " add r0, r6, r0\n" + " sub r0, r0, r5\n" + " mov r1, sp\n" + " mov r2, #0x24\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl unref_sub_812620C\n" + " mov r0, r8\n" + " add sp, sp, #0x24\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._32:\n" + " .align 2, 0\n" + "._31:\n" + " .word gOtherText_DataCannotUseVersion+0x99e\n" + " .word gOtherText_DataCannotUseVersion+0xa4a\n" + " .word gEnemyParty\n" + " .word gOtherText_DataCannotUseVersion+0x9c2\n" + " .word gOtherText_DataCannotUseVersion+0xa26\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C888() +{ + asm( + " push {r4, r5, r6, lr}\n" + " mov r6, r8\n" + " push {r6}\n" + " add sp, sp, #0xffffffdc\n" + " add r6, r0, #0\n" + " ldr r5, ._33\n" + " ldr r0, ._33 + 4\n" + " ldr r4, ._33 + 8\n" + " sub r0, r0, r5\n" + " mov r8, r0\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " mov r2, r8\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r4, #0\n" + " mov r1, #0xc9\n" + " mov r2, #0x15\n" + " mov r3, #0x82\n" + " bl debug_sub_813C638\n" + " add r0, r4, #0\n" + " mov r1, sp\n" + " bl debug_sub_813C6AC\n" + " mov r0, #0x0\n" + " strh r0, [r4, #0x1c]\n" + " ldr r0, ._33 + 12\n" + " add r0, r6, r0\n" + " sub r0, r0, r5\n" + " add r1, r4, #0\n" + " mov r2, #0x64\n" + " bl gScriptFuncs_End+0x5bc4\n" + " ldr r0, ._33 + 16\n" + " add r0, r6, r0\n" + " sub r0, r0, r5\n" + " mov r1, sp\n" + " mov r2, #0x24\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r6, #0\n" + " add r1, r5, #0\n" + " bl unref_sub_812620C\n" + " mov r0, r8\n" + " add sp, sp, #0x24\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._34:\n" + " .align 2, 0\n" + "._33:\n" + " .word gOtherText_DataCannotUseVersion+0x99e\n" + " .word gOtherText_DataCannotUseVersion+0xa4a\n" + " .word gEnemyParty\n" + " .word gOtherText_DataCannotUseVersion+0x9c2\n" + " .word gOtherText_DataCannotUseVersion+0xa26\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C904() +{ + asm( + " push {r4, lr}\n" + " ldr r4, ._35\n" + " add r0, r4, #0\n" + " mov r1, #0x5\n" + " mov r2, #0x32\n" + " mov r3, #0xb7\n" + " bl debug_sub_813C638\n" + " add r0, r4, #0\n" + " add r0, r0, #0x64\n" + " mov r1, #0x8\n" + " mov r2, #0x32\n" + " mov r3, #0xc4\n" + " bl debug_sub_813C638\n" + " add r4, r4, #0xc8\n" + " add r0, r4, #0\n" + " mov r1, #0x2\n" + " mov r2, #0x32\n" + " mov r3, #0x8d\n" + " bl debug_sub_813C638\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._36:\n" + " .align 2, 0\n" + "._35:\n" + " .word gPlayerParty\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_813C93C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xffffff44\n" + " add r4, r0, #0\n" + " ldr r6, ._37\n" + " ldr r5, ._37 + 4\n" + " sub r5, r5, r6\n" + " add r1, r6, #0\n" + " add r2, r5, #0\n" + " bl gScriptFuncs_End+0x5bc4\n" + " bl SavePlayerParty\n" + " bl debug_sub_813C904\n" + " ldr r1, ._37 + 8\n" + " ldr r2, ._37 + 12\n" + " mov r0, sp\n" + " bl debug_sub_8075DB4\n" + " bl LoadPlayerParty\n" + " ldr r0, ._37 + 16\n" + " add r4, r4, r0\n" + " sub r4, r4, r6\n" + " add r0, r4, #0\n" + " mov r1, sp\n" + " mov r2, #0xbc\n" + " bl gScriptFuncs_End+0x5bc4\n" + " add r0, r5, #0\n" + " add sp, sp, #0xbc\n" + " pop {r4, r5, r6}\n" + " pop {r1}\n" + " bx r1\n" + "._38:\n" + " .align 2, 0\n" + "._37:\n" + " .word gOtherText_DataCannotUseVersion+0xa4a\n" + " .word gOtherText_DataCannotUseVersion+0xb61\n" + " .word gFlashSectors+0x24\n" + " .word 0x270f\n" + " .word gOtherText_DataCannotUseVersion+0xa61\n" + "\n" + ); +} + diff --git a/src/engine/sprite.c b/src/engine/sprite.c index cec3d0b3a..ed143ae8e 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -815,7 +815,7 @@ void ProcessSpriteCopyRequests(void) } } -static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images) +/*static*/ void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images) { if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) { @@ -824,7 +824,7 @@ static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct Spr gSpriteCopyRequests[gSpriteCopyRequestCount].size = images[index].size; gSpriteCopyRequestCount++; } -#ifdef DEBUG +#if DEBUG else { unref_sub_80AB084(sDmaOverErrorMsg); -- cgit v1.2.3 From d79f440b8d4c5af26a98011719807b05745533e1 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 12:10:41 -0600 Subject: use 'if DEBUG' instead of 'ifdef DEBUG' --- data/debug_menu_nohara.s | 2 +- data/debug_menu_taya.s | 2 +- data/debug_menu_tomomichi.s | 2 +- data/debug_menu_watanabe.s | 2 +- src/battle/battle_2.c | 4 ++-- src/battle/battle_interface.c | 2 +- src/battle/battle_records.c | 2 +- src/debug/kagaya_debug_menu.c | 2 +- src/debug/nakamura_debug_menu.c | 2 +- src/debug/nohara_debug_menu.c | 2 +- src/debug/taya_debug_window.c | 2 +- src/debug/tomomichi_debug_menu.c | 2 +- src/debug/watanabe_debug_menu.c | 2 +- src/engine/cable_club.c | 2 +- src/engine/link.c | 4 ++-- src/engine/rtc.c | 4 ++-- src/engine/save.c | 2 +- src/engine/sprite.c | 2 +- src/engine/task.c | 2 +- src/engine/trainer_card.c | 16 ++++++++-------- src/field/bike.c | 6 +++--- src/field/decoration_inventory.c | 2 +- src/field/mauville_man.c | 2 +- src/field/party_menu.c | 4 ++-- src/field/roamer.c | 2 +- src/field/slot_machine.c | 2 +- src/field/start_menu.c | 4 ++-- src/pokemon/pokemon_1.c | 2 +- src/rom3.c | 4 ++-- src/rom6.c | 2 +- src/scene/new_game.c | 10 +++++----- src/scene/title_screen.c | 4 ++-- 32 files changed, 52 insertions(+), 52 deletions(-) diff --git a/data/debug_menu_nohara.s b/data/debug_menu_nohara.s index 7b99bcd12..269a0d550 100644 --- a/data/debug_menu_nohara.s +++ b/data/debug_menu_nohara.s @@ -3,7 +3,7 @@ .section .rodata - .ifdef DEBUG + .if DEBUG .align 2 gUnknown_Debug_083C48C4:: @ 0x83C48C4 diff --git a/data/debug_menu_taya.s b/data/debug_menu_taya.s index a7de0c3d1..4bd8239f4 100644 --- a/data/debug_menu_taya.s +++ b/data/debug_menu_taya.s @@ -3,7 +3,7 @@ .section .rodata - .ifdef DEBUG + .if DEBUG gUnknown_Debug_083C4E54:: @ 0x83C4E54 .string "Profile$" diff --git a/data/debug_menu_tomomichi.s b/data/debug_menu_tomomichi.s index 1ec69ad3b..58e23a572 100644 --- a/data/debug_menu_tomomichi.s +++ b/data/debug_menu_tomomichi.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata - .ifdef DEBUG + .if DEBUG gUnknown_Debug_083C0C54:: @ 0x83C0C54 .string "Contest graphics$" diff --git a/data/debug_menu_watanabe.s b/data/debug_menu_watanabe.s index cdb566208..3af2f893f 100644 --- a/data/debug_menu_watanabe.s +++ b/data/debug_menu_watanabe.s @@ -3,7 +3,7 @@ .section .rodata - .ifdef DEBUG + .if DEBUG gUnknown_Debug_083F7FD4:: @ 0x83F7FD4 .string "▶$" diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 12b18bb52..5700d1b7e 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1258,7 +1258,7 @@ void sub_800F02C(void) memcpy(gSharedMem, gUnknown_02023A00, 0x60); } -#ifdef DEBUG +#if DEBUG __attribute__((naked)) void sub_800F104() { @@ -1554,7 +1554,7 @@ void sub_800F104(void) } #endif -#ifdef DEBUG +#if DEBUG __attribute__((naked)) void sub_800F298() { diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index f7734301c..b19547d52 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -3045,7 +3045,7 @@ static u8 sub_80457E8(u8 a, u8 b) } } -#ifdef DEBUG +#if DEBUG __attribute__((naked)) void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) { diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index a03a215fd..17e2352ff 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -17,7 +17,7 @@ struct DebugStruct1 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; extern u8 gBattleOutcome; -#ifdef DEBUG +#if DEBUG const struct DebugStruct1 gUnknown_Debug_4245CC[] = { { 1, _("NUMBER1") }, diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 6f2734b08..e54e0d17f 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "global.h" #include "menu.h" diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 48b6d91b8..343d56bc2 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "global.h" #include "menu.h" diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index b7e62481b..2e739ef4d 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "global.h" #define BSS_DATA __attribute__((section(".bss"))) diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 4f9b588d8..c20d9b87c 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "global.h" EWRAM_DATA u8 unk_2030224[4] = { 0 }; diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index f745f2993..eb2fd8a7e 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "global.h" #define BSS_DATA __attribute__((section(".bss"))) diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index fed5b4e52..dcb3bd90b 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -1,4 +1,4 @@ -#ifdef DEBUG +#if DEBUG #include "global.h" EWRAM_DATA u8 unk_debug_ewram_0[56] = { 0 }; diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 03a64afc6..688560218 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -360,7 +360,7 @@ void sub_80831F8(u8 taskId) || sub_8082DF4(taskId) == TRUE) return; -#ifdef DEBUG +#if DEBUG sub_8082D60(taskId, GetLinkPlayerCount_2()); #endif diff --git a/src/engine/link.c b/src/engine/link.c index f93fb775f..5747915d7 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -544,7 +544,7 @@ static void ProcessRecvCmds(u8 unusedParam) else { SetBlockReceivedFlag(i); -#ifdef DEBUG +#if DEBUG debug_sub_808B838(i); #endif } @@ -979,7 +979,7 @@ static void PrintHex(u32 num, u8 x, u8 y, u8 maxDigits) } } -#ifdef DEBUG +#if DEBUG EWRAM_DATA u16 *debugCharacterBase = NULL; EWRAM_DATA void *unk_20238C8 = NULL; diff --git a/src/engine/rtc.c b/src/engine/rtc.c index a56fcd44e..5462298ed 100644 --- a/src/engine/rtc.c +++ b/src/engine/rtc.c @@ -268,7 +268,7 @@ void FormatHexDate(u8 *dest, s32 year, s32 month, s32 day) *dest = EOS; } -#ifdef DEBUG +#if DEBUG void debug_sub_800987C(u8 *dest) { @@ -370,7 +370,7 @@ u32 RtcGetMinuteCount() return (24 * 60) * RtcGetDayCount(&sRtc) + 60 * sRtc.hour + sRtc.minute; } -#ifdef DEBUG +#if DEBUG void debug_sub_8009A60() { RtcGetRawInfo(&sRtc); diff --git a/src/engine/save.c b/src/engine/save.c index d7df98e5f..5564a6ce3 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -663,7 +663,7 @@ static u16 CalculateChecksum(void *data, u16 size) return ((checksum >> 16) + checksum); } -#ifdef DEBUG +#if DEBUG __attribute__((naked)) void sub_813B79C() { diff --git a/src/engine/sprite.c b/src/engine/sprite.c index ed143ae8e..eaffedfdc 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -841,7 +841,7 @@ void RequestSpriteCopy(const void *src, u8 *dest, u16 size) gSpriteCopyRequests[gSpriteCopyRequestCount].size = size; gSpriteCopyRequestCount++; } -#ifdef DEBUG +#if DEBUG else { unref_sub_80AB084(sDmaOverErrorMsg); diff --git a/src/engine/task.c b/src/engine/task.c index ed17d28bb..d1f2cb5df 100644 --- a/src/engine/task.c +++ b/src/engine/task.c @@ -51,7 +51,7 @@ u8 CreateTask(TaskFunc func, u8 priority) } } -#ifdef DEBUG +#if DEBUG unref_sub_80AB084(gError_NoTasksLeft); #endif diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index daa513145..f9adc5777 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -63,7 +63,7 @@ const u8 gBadgesTiles[] = INCBIN_U8("graphics/trainer_card/badges.4bpp"); // XXX: what is this? u8 *const ewram_ = gSharedMem; -#ifdef DEBUG +#if DEBUG const struct TrainerCard gUnknown_Debug_083E0448 = { .gender = FEMALE, @@ -204,13 +204,13 @@ static void TrainerCard_Back_PrintPokemonTrades_Label(void); static void TrainerCard_Back_PrintPokemonTrades(void); void unref_sub_8094588(u16 left, u16 top); -#ifdef DEBUG +#if DEBUG static u8 gDebug_03000748; #endif void TrainerCard_ShowPlayerCard(Callback arg1) { -#ifdef DEBUG +#if DEBUG gDebug_03000748 = 0; #endif TrainerCard_InitScreenForPlayer(arg1); @@ -220,7 +220,7 @@ void TrainerCard_ShowPlayerCard(Callback arg1) void TrainerCard_ShowLinkCard(u8 playerIndex, Callback arg2) { -#ifdef DEBUG +#if DEBUG gDebug_03000748 = 0; #endif TrainerCard_InitScreenForLinkPlayer(playerIndex, arg2); @@ -228,7 +228,7 @@ void TrainerCard_ShowLinkCard(u8 playerIndex, Callback arg2) ewram0_2.language = gLinkPlayers[gLinkPlayerMapObjects[playerIndex].linkPlayerId].language; } -#ifdef DEBUG +#if DEBUG void debug_sub_80A0710(Callback callback) { gDebug_03000748 = TRUE; @@ -619,7 +619,7 @@ static void TrainerCard_FillFlags(void) } } -#ifdef DEBUG +#if DEBUG if (gDebug_03000748 != 0) { ewram0_2.showHallOfFame = TRUE; @@ -723,7 +723,7 @@ bool8 TrainerCard_WaitForKeys(struct Task *task) } return TRUE; } -#ifdef DEBUG +#if DEBUG else if (gDebug_03000748 && gMain.newKeys & R_BUTTON) { ewram0_2.starCount++; @@ -1462,7 +1462,7 @@ static void TrainerCard_Front_PrintPokedexCount(void) u8 buffer[16]; if ( -#ifdef DEBUG +#if DEBUG gDebug_03000748 == 0 && #endif !ewram0_2.showPokedexCount) diff --git a/src/field/bike.c b/src/field/bike.c index 736dbc837..eb9d56a64 100644 --- a/src/field/bike.c +++ b/src/field/bike.c @@ -14,7 +14,7 @@ extern bool8 gBikeCyclingChallenge; extern u8 gBikeCollisions; extern u8 gUnusedBikeCameraAheadPanback; -#ifdef DEBUG +#if DEBUG extern u8 gUnknown_020297ED; u8 debug_sub_805F2B0(u8); #endif @@ -131,7 +131,7 @@ static const struct BikeHistoryInputInfo gAcroBikeTricksList[] = void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys) { -#ifdef DEBUG +#if DEBUG if (gUnknown_020297ED && debug_sub_805F2B0(direction)) { Bike_SetBikeStill(); @@ -284,7 +284,7 @@ static void MachBikeTransition_TrySlowDown(u8 var) // the acro bike requires the input handler to be executed before the transition can. static void MovePlayerOnAcroBike(u8 newDirection, u16 newKeys, u16 heldKeys) { -#ifdef DEBUG +#if DEBUG if (gUnknown_020297ED && debug_sub_805F2B0(newDirection)) { Bike_SetBikeStill(); diff --git a/src/field/decoration_inventory.c b/src/field/decoration_inventory.c index 21ced1be8..8f7f5eb92 100644 --- a/src/field/decoration_inventory.c +++ b/src/field/decoration_inventory.c @@ -166,7 +166,7 @@ u8 sub_81341D4(void) } -#ifdef DEBUG +#if DEBUG void debug_sub_814A3A8(void) { u8 decor; diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 1b53df6be..00368c2f5 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -250,7 +250,7 @@ void SetupMauvilleOldMan(void) sub_80F83D0(); } -#ifdef DEBUG +#if DEBUG __attribute__((naked)) void debug_sub_810B32C() { diff --git a/src/field/party_menu.c b/src/field/party_menu.c index c099fd8f4..7994dd60c 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -4025,7 +4025,7 @@ void TeachMonTMMove(u8 taskId, u16 move, TaskFunc func) CreateTask(Task_TeamMonTMMove, 5); } -#ifdef DEBUG +#if DEBUG extern u8 gUnknown_020297ED; #endif @@ -4044,7 +4044,7 @@ void Task_TeamMonTMMove(u8 taskId) else { if ( -#ifdef DEBUG +#if DEBUG !gUnknown_020297ED && #endif !CanMonLearnTMHM(ewram1C000.pokemon, ewram1C000.unk6 - 33)) diff --git a/src/field/roamer.c b/src/field/roamer.c index 16a42e9f1..6ed5b6c89 100644 --- a/src/field/roamer.c +++ b/src/field/roamer.c @@ -227,7 +227,7 @@ void GetRoamerLocation(u8 *mapGroup, u8 *mapNum) *mapNum = sRoamerLocation[MAP_NUM]; } -#ifdef DEBUG +#if DEBUG void debug_sub_814A714(void) { if (gSaveBlock1.location.mapGroup == 0) diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index e231f686d..311679cb7 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -2855,7 +2855,7 @@ static void sub_8104C5C(void) static void LoadSlotMachineWheelOverlay(void); -#ifdef DEBUG +#if DEBUG // should be static __attribute__((section(".bss"))) u8 unk_debug_bss_1[0xC] = { 0 }; #endif diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 105ef1756..36295b3f8 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -44,7 +44,7 @@ enum { MENU_ACTION_PLAYER_LINK }; -#ifdef DEBUG +#if DEBUG static u32 _debugStartMenu_0 __attribute__((unused)); static u32 _debugStartMenu_1 __attribute__((unused)); #endif @@ -137,7 +137,7 @@ static bool32 sub_80719FC(u8 *ptr); static void sub_8071B54(void); static void Task_8071B64(u8 taskId); -#ifdef DEBUG +#if DEBUG __attribute__((naked)) void debug_sub_8075C30() { diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index 079bcf489..fd4684832 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -524,7 +524,7 @@ void CalculateMonStats(struct Pokemon *mon) SetMonData(mon, MON_DATA_HP, ¤tHP); } -#ifdef DEBUG +#if DEBUG __attribute__((naked)) void debug_sub_803F55C() { diff --git a/src/rom3.c b/src/rom3.c index 0fe67dcec..efaa1d97f 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -67,7 +67,7 @@ void sub_800B858(void) } } -#ifdef DEBUG +#if DEBUG extern u8 gUnknown_02023A14_50; #endif @@ -98,7 +98,7 @@ void setup_poochyena_battle(void) gUnknown_020239FC = 0; gUnknown_02024C78 = 0; -#ifdef DEBUG +#if DEBUG if (gUnknown_02023A14_50 & 0x80) { ewram[0x160fd] = 0; diff --git a/src/rom6.c b/src/rom6.c index 1c0654538..b23f1c15a 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -117,7 +117,7 @@ static void sub_810B4CC(u8 taskId) DestroyTask(taskId); } -#ifdef DEBUG +#if DEBUG void debug_sub_8120968(void) { if (npc_before_player_of_type(MAP_OBJ_GFX_BREAKABLE_ROCK) == TRUE) diff --git a/src/scene/new_game.c b/src/scene/new_game.c index d954fb3c8..cec7134a3 100644 --- a/src/scene/new_game.c +++ b/src/scene/new_game.c @@ -31,7 +31,7 @@ #include "text.h" #include "tv.h" -#ifdef DEBUG +#if DEBUG extern u8 gUnknown_020297ED; #endif @@ -50,7 +50,7 @@ static const struct ContestWinner sEmptyMuseumPortrait = .trainerName = {EOS}, }; -#ifdef DEBUG +#if DEBUG const s8 gUnknown_Debug_0823C788[][2] = { { MAP_GROUP(INSIDE_OF_TRUCK), MAP_NUM(INSIDE_OF_TRUCK) }, @@ -114,7 +114,7 @@ void ZeroBattleTowerData(void) CpuFill32(0, &gSaveBlock2.battleTower, sizeof(gSaveBlock2.battleTower)); } -#ifdef DEBUG +#if DEBUG void debug_sub_8052E04() { u8 i; @@ -153,7 +153,7 @@ void ClearSav2(void) void sub_8052E4C(void) { gDifferentSaveFile = 0; -#ifdef DEBUG +#if DEBUG gUnknown_020297ED = 0; #endif sub_808C0A0(); @@ -209,7 +209,7 @@ void NewGameInitData(void) ScriptContext2_RunNewScript(gUnknown_0819FA81); } -#ifdef DEBUG +#if DEBUG extern void debug_sub_80A3904(void); extern void debug_sub_80A3714(void); extern void debug_sub_8120F98(void); diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index 8d5c4da13..4ff02d93c 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -831,7 +831,7 @@ static void Task_TitleScreenPhase3(u8 taskId) BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); SetMainCallback2(CB2_GoToResetRtcScreen); } -#ifdef DEBUG +#if DEBUG else if (gMain.heldKeys == SELECT_BUTTON) { BeginNormalPaletteFade(-1, 0, 0, 16, 0); @@ -864,7 +864,7 @@ static void CB2_GoToMainMenu(void) SetMainCallback2(CB2_InitMainMenu); } -#ifdef DEBUG +#if DEBUG static void CB2_GoToTestMenu(void) { if (!UpdatePaletteFade()) -- cgit v1.2.3 From 05d18468a4b817c0976b16017ef7b6044befed7f Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 17 Jan 2018 13:18:23 -0500 Subject: Dma macro cleanup and cleanup sub_8076034 and sub_8076464 --- common_syms/field/start_menu.txt | 2 +- src/battle/anim/love_bg.c | 16 +----- src/battle/anim/scary_face.c | 16 +----- src/battle/battle_anim.c | 106 ++++++++------------------------------- src/debug/matsuda_debug_menu.c | 24 ++------- src/debug/mori_debug_menu.c | 8 +-- src/debug/unknown_debug_menu.c | 6 +-- src/field/start_menu.c | 20 ++++---- 8 files changed, 44 insertions(+), 154 deletions(-) diff --git a/common_syms/field/start_menu.txt b/common_syms/field/start_menu.txt index bc0c247d1..05beaf57c 100644 --- a/common_syms/field/start_menu.txt +++ b/common_syms/field/start_menu.txt @@ -1 +1 @@ -gCallback_03004AE8 +gMenuCallback diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c index bd3d22ca6..ef524e4be 100644 --- a/src/battle/anim/love_bg.c +++ b/src/battle/anim/love_bg.c @@ -90,21 +90,7 @@ void sub_80D21F0(u8 taskId) break; case 3: sub_8078914(&subStruct); - { - u8 *addr = subStruct.field_0; - u32 size = 0x2000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } - } + DmaFill32Large(3, 0, subStruct.field_0, 0x2000, 0x1000); DmaClear32(3, subStruct.field_4, 0x800); if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 0; diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c index 47776a3cb..65b9637c0 100644 --- a/src/battle/anim/scary_face.c +++ b/src/battle/anim/scary_face.c @@ -98,21 +98,7 @@ void sub_80D24E0(u8 taskId) break; case 3: sub_8078914(&subStruct); - { - u8 *addr = subStruct.field_0; - u32 size = 0x2000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } - } + DmaFill32Large(3, 0, subStruct.field_0, 0x2000, 0x1000); DmaClear32(3, subStruct.field_4, 0x800); if (!IsContest()) REG_BG1CNT_BITFIELD.charBaseBlock = 0; diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 4549d1fcb..059b8df1f 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -1910,36 +1910,19 @@ bool8 IsAnimBankSpriteVisible(u8 bank) void sub_8076034(u8 a, u8 b) { - volatile u8 pointlessZero; - u16 *addr2; u8 spriteId; if (b == 0) { + volatile u8 pointlessZero; struct UnknownStruct2 s; - u8 *addr; - u32 size; u8 r2; - u16 *addr3; sub_8078914(&s); - addr = s.unk0; - size = 0x2000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } - pointlessZero = 0; - pointlessZero = 0; - addr2 = (void *)s.unk4; - DmaFill16(3, 0xFF, addr2, 0x1000); + DmaFill32Large(3, 0, s.unk0, 0x2000, 0x1000); + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + DmaFill16Defvars(3, 0xFF, (void *)s.unk4, 0x1000); REG_BG1CNT_BITFIELD.priority = 2; REG_BG1CNT_BITFIELD.screenSize = 1; @@ -1956,8 +1939,7 @@ void sub_8076034(u8 a, u8 b) REG_BG1VOFS = gBattle_BG1_Y; LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, s.unk8 * 16, 32); - addr3 = (u16 *)PLTT + s.unk8 * 16; - DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32); + DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (u16 *)PLTT + s.unk8 * 16, 32); if (IsContest() != 0) r2 = 0; @@ -1969,27 +1951,12 @@ void sub_8076034(u8 a, u8 b) } else { - u8 *addr; - u32 size; - u16 *addr3; + volatile u8 pointlessZero; - addr = (void *)(VRAM + 0x6000); - size = 0x2000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } - pointlessZero = 0; - pointlessZero = 0; - addr2 = (void *)(VRAM + 0xF000); - DmaFill32(3, 0, addr2, 0x800); + DmaFill32Large(3, 0, (void *)(VRAM + 0x6000), 0x2000, 0x1000); + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + DmaFill32Defvars(3, 0, (void *)(VRAM + 0xF000), 0x800); REG_BG2CNT_BITFIELD.priority = 2; REG_BG2CNT_BITFIELD.screenSize = 1; @@ -2004,8 +1971,7 @@ void sub_8076034(u8 a, u8 b) REG_BG2VOFS = gBattle_BG2_Y; LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, 0x90, 32); - addr3 = (void *)(PLTT + 0x120); - DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32); + DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (void *)(PLTT + 0x120), 32); sub_80E4EF8(0, 0, GetBankIdentity(a), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock); } @@ -2060,57 +2026,25 @@ void sub_80763FC(u16 a, u16 *b, u32 c, u8 d) void sub_8076464(u8 a) { - u8 *addr; - u32 size; volatile u8 pointlessZero; struct UnknownStruct2 s; sub_8078914(&s); if (a == 0 || IsContest() != 0) { - u16 *addr2; - - addr = s.unk0; - size = 0x2000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } - pointlessZero = 0; - pointlessZero = 0; - addr2 = s.unk4; - DmaFill32(3, 0, addr2, 0x800); + DmaFill32Large(3, 0, s.unk0, 0x2000, 0x1000); + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + DmaFill32Defvars(3, 0, s.unk4, 0x800); gBattle_BG1_X = 0; gBattle_BG1_Y = 0; } else { - u16 *addr2; - - addr = (void *)(VRAM + 0x6000); - size = 0x2000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } - pointlessZero = 0; - pointlessZero = 0; - addr2 = (void *)(VRAM + 0xF000); - DmaFill32(3, 0, addr2, 0x800); + DmaFill32Large(3, 0, (void *)(VRAM + 0x6000), 0x2000, 0x1000); + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in? + DmaFill32Defvars(3, 0, (void *)(VRAM + 0xF000), 0x800); gBattle_BG2_X = 0; gBattle_BG2_Y = 0; } diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index b879584dd..da1937adb 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -38,7 +38,7 @@ extern u16 gBattle_BG2_Y; extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_Y; -extern u8 (*gCallback_03004AE8)(void); +extern u8 (*gMenuCallback)(void); extern bool8 gReceivedRemoteLinkPlayers; @@ -251,7 +251,7 @@ u8 unref_sub_80A9B28(void) Menu_DrawStdWindowFrame(0, 0, 17, 18); Menu_PrintItems(1, 1, 7, gMatsudaDebugMenuActions); InitMenu(0, 1, 1, 7, 0, 16); - gCallback_03004AE8 = sub_80A9B78; + gMenuCallback = sub_80A9B78; return 0; } @@ -264,7 +264,7 @@ static bool8 sub_80A9B78(void) case -2: return FALSE; default: - gCallback_03004AE8 = gMatsudaDebugMenuActions[choice].func; + gMenuCallback = gMatsudaDebugMenuActions[choice].func; return FALSE; case -1: CloseMenu(); @@ -469,26 +469,10 @@ static void sub_80A9F50(void) static void sub_80A9FE4(void) { - u8 *addr; - u32 i; u8 ptr[5]; memcpy(ptr, gMatsudaDebugMenu_UnknownByteArray, 5); - - addr = (void *)VRAM; - i = VRAM_SIZE; - - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - i -= 0x1000; - if (i <= 0x1000) - { - DmaFill32(3, 0, addr, i); - break; - } - } + DmaFill32Large(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); sub_80034D4((void *)VRAM, ptr); LoadFontDefaultPalette(&gWindowTemplate_81E6C3C); } diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 7b9a579a7..767f4cda0 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -12,7 +12,7 @@ #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT) -extern u8 (*gCallback_03004AE8)(void); +extern u8 (*gMenuCallback)(void); u8 gUnknown_03004DA0[0x20]; @@ -98,7 +98,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr) Menu_EraseScreen(); Menu_DrawStdWindowFrame(0, 14, 30, 19); Menu_PrintText(localPtr, 1, 15); - gCallback_03004AE8 = sub_8083D4C; + gMenuCallback = sub_8083D4C; return 0; } @@ -184,7 +184,7 @@ bool8 MoriDebugMenuProcessInput(void) switch (choice) { default: - gCallback_03004AE8 = gMoriDebugMenuActions[choice].func; + gMenuCallback = gMoriDebugMenuActions[choice].func; return FALSE; case -2: return FALSE; @@ -200,6 +200,6 @@ s8 InitMoriDebugMenu(void) Menu_DrawStdWindowFrame(0, 0, 10, 19); Menu_PrintItems(1, 1, 9, gMoriDebugMenuActions); InitMenu(0, 1, 1, 9, 0, 9); - gCallback_03004AE8 = MoriDebugMenuProcessInput; + gMenuCallback = MoriDebugMenuProcessInput; return 0; } diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c index 9cece924d..ef3e0e66c 100644 --- a/src/debug/unknown_debug_menu.c +++ b/src/debug/unknown_debug_menu.c @@ -4,7 +4,7 @@ extern u8 gBattleCommunication[]; -extern u8 (*gCallback_03004AE8)(void); +extern u8 (*gMenuCallback)(void); static u8 sub_814A4B8(void); static u8 sub_814A464(void); @@ -36,7 +36,7 @@ int unref_sub_814A414(void) Menu_DrawStdWindowFrame(0, 0, 16, 18); Menu_PrintItems(2, 1, 8, gUnknown_0842C29C); InitMenu(0, 1, 1, 8, 0, 15); - gCallback_03004AE8 = sub_814A464; + gMenuCallback = sub_814A464; return 0; } @@ -55,7 +55,7 @@ static u8 sub_814A464(void) else { gBattleCommunication[0] = result; - gCallback_03004AE8 = gUnknown_0842C29C[result].func; + gMenuCallback = gUnknown_0842C29C[result].func; return 0; } } diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 110351016..95aa9c79e 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -54,7 +54,7 @@ extern u16 gSpecialVar_Result; extern u8 gUnknown_03004860; -u8 (*gCallback_03004AE8)(void); +u8 (*gMenuCallback)(void); EWRAM_DATA static u8 sStartMenuCursorPos = 0; EWRAM_DATA static u8 sNumStartMenuActions = 0; @@ -283,11 +283,11 @@ void sub_80712B4(u8 taskId) switch (task->data[0]) { case 0: - gCallback_03004AE8 = StartMenu_InputProcessCallback; + gMenuCallback = StartMenu_InputProcessCallback; task->data[0]++; break; case 1: - if (gCallback_03004AE8() == 1) + if (gMenuCallback() == 1) DestroyTask(taskId); break; } @@ -325,10 +325,10 @@ static u8 StartMenu_InputProcessCallback(void) if (GetNationalPokedexCount(0) == 0) return 0; } - gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func; - if (gCallback_03004AE8 != StartMenu_SaveCallback && - gCallback_03004AE8 != StartMenu_ExitCallback && - gCallback_03004AE8 != StartMenu_RetireCallback) + gMenuCallback = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func; + if (gMenuCallback != StartMenu_SaveCallback && + gMenuCallback != StartMenu_ExitCallback && + gMenuCallback != StartMenu_RetireCallback) fade_screen(1, 0); return 0; } @@ -405,7 +405,7 @@ static u8 StartMenu_PlayerCallback(void) static u8 StartMenu_SaveCallback(void) { Menu_DestroyCursor(); - gCallback_03004AE8 = SaveCallback1; + gMenuCallback = SaveCallback1; return 0; } @@ -461,7 +461,7 @@ enum static u8 SaveCallback1(void) { sub_807160C(); - gCallback_03004AE8 = SaveCallback2; + gMenuCallback = SaveCallback2; return FALSE; } @@ -475,7 +475,7 @@ static u8 SaveCallback2(void) //Go back to start menu Menu_EraseScreen(); InitStartMenu(); - gCallback_03004AE8 = StartMenu_InputProcessCallback; + gMenuCallback = StartMenu_InputProcessCallback; return FALSE; case SAVE_SUCCESS: case SAVE_ERROR: -- cgit v1.2.3 From 6903b3626aed4e5521243b4517c43fed3c4d0ff5 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 13:11:10 -0600 Subject: resolve some undefined references --- data/data2a.s | 5 + data/debug_unk_0.inc | 57 ++++ ld_script.txt | 12 + src/battle/battle_2.c | 90 +++--- src/debug/kagaya_debug_menu.c | 8 +- src/debug/nakamura_debug_menu.c | 272 ++++++++-------- src/debug/nohara_debug_menu.c | 86 +++--- src/debug/start_menu_debug.c | 224 +++++++------- src/debug/taya_debug_window.c | 62 ++-- src/debug/tomomichi_debug_menu.c | 652 +++++++++++++++++++-------------------- src/debug/watanabe_debug_menu.c | 194 ++++++------ src/field/slot_machine.c | 96 +++--- src/field/start_menu.c | 6 +- sym_bss.txt | 10 + sym_common.txt | 19 ++ sym_ewram.txt | 7 + 16 files changed, 955 insertions(+), 845 deletions(-) create mode 100644 data/debug_unk_0.inc diff --git a/data/data2a.s b/data/data2a.s index c4d6343d8..f8bcfabad 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -898,6 +898,11 @@ gUnknown_081F96C8:: @ 81F96C8 gSpriteTemplate_81F96D0:: @ 81F96D0 spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828 +.if DEBUG +UnkDebug0:: + .include "data/debug_unk_0.inc" +.endif + .align 2 gOamData_81F96E8:: @ 81F96E8 .2byte 0x0100 diff --git a/data/debug_unk_0.inc b/data/debug_unk_0.inc new file mode 100644 index 000000000..4a2c2c777 --- /dev/null +++ b/data/debug_unk_0.inc @@ -0,0 +1,57 @@ +debug_unk_0:: +@ 0x821F3B8 + .incbin "baserom-debug.gba", 0x21F3B8, 620 + +Str_821F624:: @ 0x821F624 + .string "ーーーーーーーーーーーー$" + +str_821F631:: @ 0x821F631 + .string "ジュンイチ$" + .string "ダイゴロウ$" + .string "バレンシア$" + .string "ハルコマチ$" + +Str_821F649:: @ 0x821F649 + .string "てつじ$" + +debug_unk_0b:: +@ 0x821F64D + .string "  オン$" + +@ 0x821F652 + .string "オフ$" + +@ 0x821F655 + .string "モノラル$" + +@ 0x821F65A + .string "ステレオ$" + +@ 0x821F65F + .string "テストです$" + +@ 0x821F665 + .string "うけとったって$" + +@ 0x821F66D + .string "せつぞくエラー$" + +.incbin "baserom-debug.gba", 0x21F675, 323 + +Str_821F7B8:: @ 0x821F7B8 + .string "たかさ $" + +Str_821F7BD:: @ 0x821F7BD + .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}たかさ   ひこう\n" + .string "ポケモン  ファイル$" + +Str_821F7DA:: @ 0x821F7DA + .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}ロード\n" + .string "セーブ$" + +Str_821F7EA:: @ 0x821F7EA + .string "ロードしますか?$" + +@ 0x821F7F3 +gUnknown_Debug_821F7F3:: + .string "セーブしますか?$" diff --git a/ld_script.txt b/ld_script.txt index 848ede7c5..356ece4f4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -117,7 +117,10 @@ SECTIONS { src/field/field_screen_effect.o(.text); src/battle/battle_setup.o(.text); src/engine/cable_club.o(.text); + src/debug/tomomichi_debug_menu.o(.text); + src/debug/nohara_debug_menu.o(.text); src/debug/mori_debug_menu.o(.text); + src/debug/taya_debug_window.o(.text); src/field/trainer_see.o(.text); src/field/wild_encounter.o(.text); src/field/field_effect.o(.text); @@ -136,6 +139,7 @@ SECTIONS { src/pokemon/pokemon_summary_screen.o(.text); src/field/script_movement.o(.text); src/field/fldeff_cut.o(.text); + src/debug/kagaya_debug_menu.o(.text); src/pokemon/mail_data.o(.text); src/field/map_name_popup.o(.text); src/field/item_menu.o(.text); @@ -145,6 +149,7 @@ SECTIONS { src/contest.o(.text); src/field/shop.o(.text); src/field/berry.o(.text); + src/debug/watanabe_debug_menu.o(.text); src/field/script_menu.o(.text); src/engine/naming_screen.o(.text); src/field/money.o(.text); @@ -384,6 +389,7 @@ SECTIONS { src/field/braille_puzzles.o(.text); src/pokemon/pokeblock_feed.o(.text); src/engine/clear_save_data_menu.o(.text); + src/debug/nakamura_debug_menu.o(.text); src/scene/intro_credits_graphics.o(.text); src/scene/evolution_graphics.o(.text); src/field/bard_music.o(.text); @@ -541,7 +547,10 @@ SECTIONS { src/field/field_screen_effect.o(.rodata); src/battle/battle_setup.o(.rodata); src/engine/cable_club.o(.rodata); + data/debug_menu_tomomichi.o(.rodata); + data/debug_menu_nohara.o(.rodata); src/debug/mori_debug_menu.o(.rodata); + data/debug_menu_taya.o(.rodata); src/field/trainer_see.o(.rodata); src/field/wild_encounter.o(.rodata); src/field/field_effect.o(.rodata); @@ -554,6 +563,7 @@ SECTIONS { src/pokemon/pokemon_icon.o(.rodata); src/pokemon/pokemon_summary_screen.o(.rodata); src/field/fldeff_cut.o(.rodata); + src/debug/kagaya_debug_menu.o(.rodata); src/field/item_menu.o(.rodata); src/battle/battle_anim_80A7E7C.o(.rodata); src/field/item.o(.rodata); @@ -561,6 +571,7 @@ SECTIONS { data/contest.o(.rodata); src/field/shop.o(.rodata); src/field/berry.o(.rodata); + data/debug_menu_watanabe.o(.rodata); src/field/script_menu.o(.rodata); src/engine/naming_screen.o(.rodata); src/field/money.o(.rodata); @@ -639,6 +650,7 @@ SECTIONS { data/debug_mystery_event_menu.o(.rodata); src/engine/save_failed_screen.o(.rodata); src/pokemon/pokeblock_feed.o(.rodata); + src/debug/nakamura_debug_menu.o(.rodata); src/scene/intro_credits_graphics.o(.rodata); src/scene/evolution_graphics.o(.rodata); src/field/bard_music.o(.rodata); diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 5700d1b7e..78fc35ba5 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -275,7 +275,7 @@ void InitBattle(void) " bl sub_80895F8\n" " ldr r4, ._10 + 32\n" " add r0, r4, #0\n" - " bl SetUpWindowConfig\n" + " bl Text_LoadWindowTemplate\n" " bl ResetPaletteFade\n" " ldr r0, ._10 + 36\n" " mov r1, #0x0\n" @@ -306,13 +306,13 @@ void InitBattle(void) "._7:\n" " ldr r0, ._10 + 76\n" " add r1, r4, #0\n" - " bl InitWindowFromConfig\n" + " bl Text_InitWindowWithTemplate\n" " ldr r0, ._10 + 80\n" " ldr r1, ._10 + 84\n" - " bl InitWindowFromConfig\n" + " bl Text_InitWindowWithTemplate\n" " ldr r0, ._10 + 88\n" " ldr r1, ._10 + 92\n" - " bl InitWindowFromConfig\n" + " bl Text_InitWindowWithTemplate\n" " bl sub_800D6D4\n" " bl sub_800DAB8\n" " bl ResetSpriteData\n" @@ -348,7 +348,7 @@ void InitBattle(void) " .word gWindowConfig_81E6C58\n" " .word gUnknown_030042A4\n" " .word gUnknown_030042A0\n" - " .word gUnknown_030042C0\n" + " .word gBattle_BG1_X\n" " .word gUnknown_030041B4\n" " .word gUnknown_03004288\n" " .word gUnknown_03004280\n" @@ -3274,10 +3274,10 @@ void debug_sub_80108B8() " bl remove_some_task\n" " ldr r4, ._507 + 84\n" " add r0, r4, #0\n" - " bl SetUpWindowConfig\n" + " bl Text_LoadWindowTemplate\n" " ldr r0, ._507 + 88\n" " add r1, r4, #0\n" - " bl InitWindowFromConfig\n" + " bl Text_InitWindowWithTemplate\n" " ldr r0, ._507 + 92\n" " strb r5, [r0]\n" " ldr r0, ._507 + 96\n" @@ -3334,7 +3334,7 @@ void debug_sub_80108B8() " .word 0x4000200\n" " .word gUnknown_030042A4\n" " .word gUnknown_030042A0\n" - " .word gUnknown_030042C0\n" + " .word gBattle_BG1_X\n" " .word gUnknown_030041B4\n" " .word gUnknown_03004288\n" " .word gUnknown_03004280\n" @@ -3987,7 +3987,7 @@ void debug_sub_8010CAC() " .align 2, 0\n" "._581:\n" " .word gUnknown_Debug_03004360\n" - " .word gUnknown_030042C0\n" + " .word gBattle_BG1_X\n" " .word gUnknown_Debug_030043A4\n" " .word gMain\n" " .word gUnknown_Debug_030043A0\n" @@ -4043,7 +4043,7 @@ void debug_sub_8010CAC() " .align 2, 0\n" "._587:\n" " .word gUnknown_Debug_03004360\n" - " .word gUnknown_030042C0\n" + " .word gBattle_BG1_X\n" " .word gUnknown_Debug_030043A4\n" " .word gMain\n" " .word gUnknown_Debug_030043A0\n" @@ -5839,7 +5839,7 @@ void debug_sub_8011D40() " .word 0x80000800\n" " .word gUnknown_030042A4\n" " .word gUnknown_030042A0\n" - " .word gUnknown_030042C0\n" + " .word gBattle_BG1_X\n" " .word gUnknown_030041B4\n" " .word gUnknown_03004288\n" " .word gUnknown_03004280\n" @@ -5912,7 +5912,7 @@ void debug_sub_8011DD4() " .word 0x9803\n" " .word gUnknown_030042A4\n" " .word gUnknown_030042A0\n" - " .word gUnknown_030042C0\n" + " .word gBattle_BG1_X\n" " .word gUnknown_030041B4\n" " .word gUnknown_03004288\n" " .word gUnknown_03004280\n" @@ -6061,7 +6061,7 @@ void debug_sub_8011EA0() " add r1, r6, #0\n" " ldr r2, [sp, #0x4]\n" " mov r3, r8\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " ldr r0, ._823 + 8\n" " bl sub_8002F44\n" " ldr r1, ._823 + 12\n" @@ -6090,7 +6090,7 @@ void debug_sub_8011EA0() " str r0, [sp]\n" " ldr r0, ._823 + 8\n" " add r1, r6, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " ldr r0, ._823 + 8\n" " bl sub_8002F44\n" " mov r0, #0xff\n" @@ -6113,7 +6113,7 @@ void debug_sub_8011EA0() " add r1, r6, #0\n" " ldr r2, [sp, #0x4]\n" " mov r3, r8\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " ldr r0, ._823 + 8\n" " bl sub_8002F44\n" " b ._848\n" @@ -6171,7 +6171,7 @@ void debug_sub_8011EA0() " str r0, [sp]\n" " add r0, r6, #0\n" " mov r1, sl\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r6, #0\n" " bl sub_8002F44\n" " lsl r4, r7, #0x1\n" @@ -6199,7 +6199,7 @@ void debug_sub_8011EA0() " str r0, [sp]\n" " add r0, r6, #0\n" " mov r1, sl\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r6, #0\n" " bl sub_8002F44\n" " mov r0, #0xff\n" @@ -6250,7 +6250,7 @@ void debug_sub_8011EA0() " ldrb r0, [r4]\n" " str r0, [sp]\n" " add r0, r6, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r6, #0\n" " bl sub_8002F44\n" " b ._848\n" @@ -6282,7 +6282,7 @@ void debug_sub_8011EA0() " str r0, [sp]\n" " add r0, r5, #0\n" " add r1, r6, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" " mov r4, #0x0\n" @@ -6364,7 +6364,7 @@ void debug_sub_8011EA0() " str r0, [sp]\n" " add r0, r5, #0\n" " add r1, r6, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" " b ._848\n" @@ -6406,7 +6406,7 @@ void debug_sub_8011EA0() " str r0, [sp]\n" " add r0, r5, #0\n" " add r1, r6, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" "._848:\n" @@ -6476,7 +6476,7 @@ void debug_sub_8012294() " str r0, [sp]\n" " mov r0, sl\n" " mov r1, r9\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " mov r0, sl\n" " bl sub_8002F44\n" " ldrb r4, [r7]\n" @@ -6513,7 +6513,7 @@ void debug_sub_8012294() " str r0, [sp]\n" " mov r0, sl\n" " mov r1, r9\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " mov r0, sl\n" " bl sub_8002F44\n" " mov r0, #0xff\n" @@ -6553,7 +6553,7 @@ void debug_sub_8012294() " str r0, [sp]\n" " mov r0, sl\n" " mov r1, r9\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " mov r0, sl\n" " bl sub_8002F44\n" "._853:\n" @@ -6614,7 +6614,7 @@ void debug_sub_80123D8() " mov r1, r8\n" " mov r2, sl\n" " add r3, r7, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl sub_8002F44\n" " lsl r5, r5, #0x1\n" @@ -6646,7 +6646,7 @@ void debug_sub_80123D8() " mov r1, r8\n" " mov r2, sl\n" " add r3, r7, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl sub_8002F44\n" " mov r0, #0x0\n" @@ -6661,7 +6661,7 @@ void debug_sub_80123D8() " add r0, r4, #0\n" " mov r1, r8\n" " mov r3, sl\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl sub_8002F44\n" " ldr r1, ._858 + 12\n" @@ -6691,7 +6691,7 @@ void debug_sub_80123D8() " mov r1, r8\n" " mov r2, r9\n" " mov r3, sl\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl sub_8002F44\n" " b ._857\n" @@ -6718,7 +6718,7 @@ void debug_sub_80123D8() " str r0, [sp]\n" " add r0, r5, #0\n" " add r1, r6, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" " ldrh r2, [r4, #0x6]\n" @@ -6727,7 +6727,7 @@ void debug_sub_80123D8() " str r0, [sp]\n" " add r0, r5, #0\n" " add r1, r6, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" "._857:\n" @@ -6781,7 +6781,7 @@ void debug_sub_8012540() " str r0, [sp]\n" " add r0, r4, #0\n" " add r1, r5, #0\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl sub_8002F44\n" " add sp, sp, #0x4\n" @@ -6998,7 +6998,7 @@ void debug_sub_8012688() " strh r5, [r0]\n" " ldr r4, ._873 + 16\n" " add r0, r4, #0\n" - " bl SetUpWindowConfig\n" + " bl Text_LoadWindowTemplate\n" " bl ResetPaletteFade\n" " ldr r0, ._873 + 20\n" " strh r5, [r0]\n" @@ -7033,7 +7033,7 @@ void debug_sub_8012688() " strh r0, [r6]\n" " ldr r0, ._873 + 64\n" " add r1, r4, #0\n" - " bl InitWindowFromConfig\n" + " bl Text_InitWindowWithTemplate\n" " ldrh r2, [r6]\n" " lsl r0, r2, #0x3\n" " ldr r1, ._873 + 68\n" @@ -7133,7 +7133,7 @@ void debug_sub_8012688() " .word gWindowConfig_81E6C58\n" " .word gUnknown_030042A4\n" " .word gUnknown_030042A0\n" - " .word gUnknown_030042C0\n" + " .word gBattle_BG1_X\n" " .word gUnknown_030041B4\n" " .word gUnknown_03004288\n" " .word gUnknown_03004280\n" @@ -7211,7 +7211,7 @@ void debug_sub_80128B4() " add r1, r4, #0\n" " mov r2, #0x90\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" " ldr r6, ._878 + 8\n" @@ -7237,7 +7237,7 @@ void debug_sub_80128B4() " add r1, r4, #0\n" " mov r2, #0x90\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" " add sp, sp, #0x4\n" @@ -7282,7 +7282,7 @@ void debug_sub_8012938() " add r1, r4, #0\n" " mov r2, #0xa2\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r6, #0\n" " bl sub_8002F44\n" " ldr r1, ._880 + 8\n" @@ -7306,7 +7306,7 @@ void debug_sub_8012938() " add r1, r4, #0\n" " mov r2, #0xa2\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r6, #0\n" " bl sub_8002F44\n" " ldr r2, ._880 + 20\n" @@ -7622,7 +7622,7 @@ void debug_sub_8012B70() " str r0, [sp]\n" " add r0, r5, #0\n" " mov r3, #0x1a\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl sub_8002F44\n" " strh r6, [r4, #0xe]\n" @@ -7668,7 +7668,7 @@ void debug_sub_8012C08() " add r1, r5, #0\n" " mov r2, #0x90\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r7, #0\n" " bl sub_8002F44\n" " mov r0, #0x0\n" @@ -7680,7 +7680,7 @@ void debug_sub_8012C08() " add r1, r5, #0\n" " mov r2, #0xa2\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r7, #0\n" " bl sub_8002F44\n" " mov r0, #0x0\n" @@ -7705,7 +7705,7 @@ void debug_sub_8012C08() " add r0, r7, #0\n" " mov r2, #0x90\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " b ._904\n" "._906:\n" " .align 2, 0\n" @@ -7728,7 +7728,7 @@ void debug_sub_8012C08() " add r0, r7, #0\n" " mov r2, #0x90\n" " mov r3, #0x2\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" "._904:\n" " add r5, r4, #0\n" " ldr r4, ._907 + 8\n" @@ -7741,7 +7741,7 @@ void debug_sub_8012C08() " str r0, [sp]\n" " add r0, r4, #0\n" " mov r3, #0x1a\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl sub_8002F44\n" " ldr r1, ._907\n" @@ -7816,7 +7816,7 @@ void debug_sub_8012D10() " str r0, [sp]\n" " add r0, r4, #0\n" " mov r3, #0x13\n" - " bl InitWindow\n" + " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl sub_8002F44\n" " ldr r1, ._920 + 8\n" diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index e54e0d17f..8ece4ebec 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -35,17 +35,17 @@ void InitKagayaDebugMenu_B() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xe\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._1\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xd\n" @@ -76,7 +76,7 @@ void debug_sub_80B061C() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 343d56bc2..1d36d528f 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -178,17 +178,17 @@ void debug_sub_815F1B8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0xe\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._1\n" " mov r0, #0x10\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xe\n" @@ -243,7 +243,7 @@ void debug_sub_815F214() " beq ._5 @cond_branch\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._5:\n" " ldrh r1, [r4, #0x2e]\n" " mov r0, #0x80\n" @@ -251,7 +251,7 @@ void debug_sub_815F214() " cmp r0, #0\n" " beq ._6 @cond_branch\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._6:\n" " ldrh r1, [r4, #0x2e]\n" " mov r0, #0x1\n" @@ -259,13 +259,13 @@ void debug_sub_815F214() " cmp r0, #0\n" " beq ._7 @cond_branch\n" " ldr r4, ._9 + 4\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, #0x4\n" " add r0, r0, r4\n" " ldr r4, [r0]\n" - " bl HandleDestroyMenuCursors\n" + " bl Menu_DestroyCursor\n" " bl _call_via_r4\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -331,7 +331,7 @@ u8 debug_sub_815F2B4() " push {lr}\n" " add sp, sp, #0xfffffffc\n" " bl CloseMenu\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r1, ._16\n" " ldr r0, ._16 + 4\n" " str r0, [r1, #0x8]\n" @@ -632,7 +632,7 @@ void debug_sub_815F4D8() " mov r1, #0x1\n" " mov r2, #0xa\n" " mov r3, #0xa\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r6, ._43\n" " ldr r7, ._43 + 4\n" " ldrb r1, [r7]\n" @@ -643,7 +643,7 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r2, ._43 + 8\n" " ldrb r1, [r7]\n" " lsl r0, r1, #0x2\n" @@ -669,11 +669,11 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._43 + 16\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, sp\n" " ldrb r1, [r0]\n" " add r0, r6, #0\n" @@ -683,11 +683,11 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._43 + 20\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrb r1, [r4]\n" " add r0, r6, #0\n" " mov r2, #0x0\n" @@ -696,11 +696,11 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x3\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._43 + 24\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrb r1, [r5]\n" " add r0, r6, #0\n" " mov r2, #0x0\n" @@ -709,7 +709,7 @@ void debug_sub_815F4D8() " add r0, r6, #0\n" " mov r1, #0x3\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._42:\n" " add sp, sp, #0x4\n" " pop {r4, r5, r6, r7}\n" @@ -811,12 +811,12 @@ u8 debug_sub_815F62C() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl debug_sub_815F4D8\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -866,7 +866,7 @@ void debug_sub_815F668() " add r0, r5, #0\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " add r1, r6, #0\n" " bl __umodsi3\n" @@ -878,7 +878,7 @@ void debug_sub_815F668() " add r0, r5, #0\n" " mov r1, #0x7\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5, r6}\n" " pop {r0}\n" " bx r0\n" @@ -902,7 +902,7 @@ void debug_sub_815F6E4() " mov r1, #0x3\n" " mov r2, #0xb\n" " mov r3, #0x4\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._63\n" " ldr r0, ._63 + 4\n" " ldrb r0, [r0]\n" @@ -919,7 +919,7 @@ void debug_sub_815F6E4() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" @@ -942,7 +942,7 @@ void debug_sub_815F72C() " mov r1, #0x1\n" " mov r2, #0xb\n" " mov r3, #0xa\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._66\n" " ldr r5, ._66 + 4\n" " ldrb r1, [r5]\n" @@ -953,7 +953,7 @@ void debug_sub_815F72C() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r2, ._66 + 8\n" " ldrb r1, [r5]\n" " lsl r0, r1, #0x2\n" @@ -991,7 +991,7 @@ void debug_sub_815F788() " mov r1, #0x5\n" " mov r2, #0xb\n" " mov r3, #0x6\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r0, ._68\n" " ldr r1, ._68 + 4\n" " ldrb r1, [r1]\n" @@ -999,7 +999,7 @@ void debug_sub_815F788() " lsl r1, r1, #0x18\n" " lsr r1, r1, #0x18\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._69:\n" @@ -1024,7 +1024,7 @@ void debug_sub_815F7B4() " mov r1, #0x1\n" " mov r2, #0xb\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " b ._71\n" "._73:\n" " .align 2, 0\n" @@ -1038,7 +1038,7 @@ void debug_sub_815F7B4() " add r0, r0, r1\n" " mov r1, #0xb\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._71:\n" " pop {r0}\n" " bx r0\n" @@ -1354,12 +1354,12 @@ void debug_sub_815F930() " mov r1, #0x5\n" " mov r2, #0xb\n" " mov r3, #0x6\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " mov r0, #0xb\n" " mov r1, #0x1\n" " mov r2, #0xb\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r1, ._133\n" " ldr r0, ._133 + 4\n" " str r0, [r1]\n" @@ -1413,7 +1413,7 @@ void debug_sub_815FA38() " beq ._141 @cond_branch\n" " mov r0, #0x2\n" "._138:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._161:\n" " mov r0, #0x0\n" " b ._142\n" @@ -1481,7 +1481,7 @@ void debug_sub_815FA38() " ldrb r0, [r0]\n" " cmp r0, #0\n" " beq ._161 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " ldr r1, ._159 + 12\n" " strb r0, [r1]\n" " ldr r0, ._159 + 16\n" @@ -1535,12 +1535,12 @@ u8 debug_sub_815FB1C() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xc\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl debug_sub_815F72C\n" " mov r0, #0x0\n" " str r0, [sp]\n" @@ -1591,7 +1591,7 @@ void debug_sub_815FB78() " beq ._168 @cond_branch\n" " mov r0, #0x1\n" "._165:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " mov r0, #0x0\n" " b ._177\n" "._168:\n" @@ -1600,7 +1600,7 @@ void debug_sub_815FB78() " cmp r0, #0\n" " beq ._170 @cond_branch\n" " bl CloseMenu\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r0, #0\n" @@ -1646,7 +1646,7 @@ u8 debug_sub_815FBE8() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " ldr r4, ._178 + 8\n" " add r0, r4, #0\n" " bl debug_sub_814A73C\n" @@ -1654,15 +1654,15 @@ u8 debug_sub_815FBE8() " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, r4, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._178 + 12\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xa\n" @@ -1739,7 +1739,7 @@ u8 debug_sub_815FC94() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" " pop {r1}\n" @@ -1945,7 +1945,7 @@ void debug_sub_815FDE4() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" " b ._204\n" @@ -1971,16 +1971,16 @@ u8 debug_sub_815FE1C() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x10\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._210\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r6, ._210 + 4\n" " mov r0, #0x0\n" " bl debug_sub_815FCB4\n" @@ -1994,7 +1994,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0x5\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x1\n" " bl debug_sub_815FCB4\n" " add r1, r0, #0\n" @@ -2007,7 +2007,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0x5\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x2\n" " bl debug_sub_815FCB4\n" " add r1, r0, #0\n" @@ -2020,7 +2020,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0x5\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " bl debug_sub_8092344\n" " add r1, r0, #0\n" @@ -2033,7 +2033,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0xb\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x1\n" " bl debug_sub_8092344\n" " add r1, r0, #0\n" @@ -2046,7 +2046,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0xb\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x2\n" " bl debug_sub_8092344\n" " add r1, r0, #0\n" @@ -2059,7 +2059,7 @@ u8 debug_sub_815FE1C() " add r0, r6, #0\n" " mov r1, #0xb\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._210 + 8\n" " ldr r1, ._210 + 12\n" " add r0, r0, r1\n" @@ -2120,7 +2120,7 @@ u8 debug_sub_815FE1C() " lsr r2, r2, #0x18\n" " add r0, r6, #0\n" " add r1, r4, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" @@ -2139,7 +2139,7 @@ u8 debug_sub_815FE1C() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._210 + 16\n" " ldr r0, ._210 + 20\n" " str r0, [r1]\n" @@ -2171,16 +2171,16 @@ void debug_sub_815FFDC() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0xe\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._214\n" " mov r1, #0x1\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r5, #0x0\n" " ldr r0, ._214 + 4\n" " mov r8, r0\n" @@ -2278,7 +2278,7 @@ void debug_sub_816009C() " lsl r2, r2, #0x18\n" " lsr r2, r2, #0x18\n" " mov r1, #0x10\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._220:\n" @@ -2330,7 +2330,7 @@ void debug_sub_81600D0() " lsl r2, r2, #0x18\n" " lsr r2, r2, #0x18\n" " mov r1, #0x17\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._226\n" "._228:\n" " .align 2, 0\n" @@ -2343,7 +2343,7 @@ void debug_sub_81600D0() " lsr r2, r2, #0x18\n" " mov r0, sp\n" " mov r1, #0x17\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._226:\n" " add sp, sp, #0x4\n" " pop {r4, r5}\n" @@ -2378,7 +2378,7 @@ void debug_sub_816013C() " add r0, r5, #0\n" " mov r1, #0x1a\n" " add r2, r4, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -2407,7 +2407,7 @@ void debug_sub_816017C() " lsr r3, r3, #0x18\n" " mov r0, #0x10\n" " mov r2, #0x1c\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r1, ._232\n" " lsl r0, r4, #0x2\n" " add r0, r0, r1\n" @@ -2634,7 +2634,7 @@ void debug_sub_8160308() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " mov r2, #0x0\n" "._252:\n" " add r1, r2, #1\n" @@ -2748,7 +2748,7 @@ void debug_sub_81603B8() " lsl r3, r3, #0x18\n" " lsr r3, r3, #0x18\n" " add r0, r2, #0\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " cmp r6, #0\n" " bne ._256 @cond_branch\n" " cmp r4, #0\n" @@ -3698,7 +3698,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._423:\n" " .align 2, 0\n" @@ -3715,7 +3715,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._427:\n" " .align 2, 0\n" @@ -3731,7 +3731,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._431:\n" " .align 2, 0\n" @@ -3747,7 +3747,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._435:\n" " .align 2, 0\n" @@ -3763,7 +3763,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._440\n" "._439:\n" " .align 2, 0\n" @@ -3779,7 +3779,7 @@ void debug_sub_8160A80() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._440:\n" " pop {r4}\n" " pop {r0}\n" @@ -3871,11 +3871,11 @@ void debug_sub_8160BB0() " mov r1, #0x1\n" " mov r2, #0x8\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -3898,32 +3898,32 @@ void debug_sub_8160BE4() " mov r1, #0x0\n" " mov r2, #0xc\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl debug_sub_8160BB0\n" " ldr r0, ._459\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 4\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 8\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 12\n" " mov r1, #0x2\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 16\n" " mov r1, #0x2\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._459 + 20\n" " mov r1, #0x2\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r4, #0x0\n" "._458:\n" " add r0, r4, #0\n" @@ -4057,7 +4057,7 @@ void debug_sub_8160CF4() " beq ._475 @cond_branch\n" " mov r0, #0x1\n" "._472:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " mov r0, #0x0\n" " b ._484\n" "._475:\n" @@ -4065,7 +4065,7 @@ void debug_sub_8160CF4() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._477 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r1, #0x1\n" @@ -4076,13 +4076,13 @@ void debug_sub_8160CF4() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._479 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r1, #0x1\n" "._478:\n" " bl debug_sub_8160B50\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " bl debug_sub_8160A80\n" @@ -4112,7 +4112,7 @@ void debug_sub_8160CF4() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" "._484:\n" @@ -4131,7 +4131,7 @@ u8 debug_sub_8160D98() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl debug_sub_8160BE4\n" " ldr r1, ._485\n" " ldr r0, ._485 + 4\n" @@ -4157,43 +4157,43 @@ void debug_sub_8160DC0() " mov r1, #0x0\n" " mov r2, #0x16\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._487\n" " mov r1, #0xb\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 4\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 8\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 12\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 16\n" " mov r1, #0x2\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 20\n" " mov r1, #0x2\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 24\n" " mov r1, #0x2\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 28\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._487 + 32\n" " mov r1, #0x2\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._488:\n" @@ -4222,7 +4222,7 @@ void debug_sub_8160E50() " mov r1, #0x1\n" " mov r2, #0xa\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r5, ._489\n" " add r0, r6, #0\n" " mov r1, #0x2\n" @@ -4231,12 +4231,12 @@ void debug_sub_8160E50() " add r0, r5, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xc\n" " mov r1, #0x1\n" " mov r2, #0x15\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r6, #0\n" " mov r1, #0xb\n" " bl GetMonData\n" @@ -4246,7 +4246,7 @@ void debug_sub_8160E50() " add r0, r0, r1\n" " mov r1, #0xc\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1a\n" " bl GetMonData\n" @@ -4262,11 +4262,11 @@ void debug_sub_8160E50() " mov r1, #0x3\n" " mov r2, #0x11\n" " mov r3, #0x4\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1b\n" " bl GetMonData\n" @@ -4284,11 +4284,11 @@ void debug_sub_8160E50() " mov r1, #0x5\n" " mov r2, #0x11\n" " mov r3, #0x6\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1c\n" " bl GetMonData\n" @@ -4306,11 +4306,11 @@ void debug_sub_8160E50() " mov r1, #0x7\n" " mov r2, #0x11\n" " mov r3, #0x8\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1d\n" " bl GetMonData\n" @@ -4328,11 +4328,11 @@ void debug_sub_8160E50() " mov r1, #0x9\n" " mov r2, #0x11\n" " mov r3, #0xa\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1e\n" " bl GetMonData\n" @@ -4350,11 +4350,11 @@ void debug_sub_8160E50() " mov r1, #0xb\n" " mov r2, #0x11\n" " mov r3, #0xc\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x1f\n" " bl GetMonData\n" @@ -4372,11 +4372,11 @@ void debug_sub_8160E50() " mov r1, #0xd\n" " mov r2, #0x11\n" " mov r3, #0xe\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #0\n" " add r1, r4, #0\n" " mov r2, #0x0\n" @@ -4386,11 +4386,11 @@ void debug_sub_8160E50() " mov r1, #0xf\n" " mov r2, #0x11\n" " mov r3, #0x10\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x20\n" " bl GetMonData\n" @@ -4403,11 +4403,11 @@ void debug_sub_8160E50() " mov r1, #0x11\n" " mov r2, #0x11\n" " mov r3, #0x12\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0xd\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5, r6}\n" " pop {r0}\n" " bx r0\n" @@ -4565,7 +4565,7 @@ void debug_sub_81610BC() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" "._518:\n" @@ -4584,7 +4584,7 @@ void DebugMenu_EffortValues() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " ldr r1, ._519\n" " mov r0, #0x0\n" " strb r0, [r1]\n" @@ -4689,52 +4689,52 @@ void debug_sub_81611D8() " mov r1, #0x0\n" " mov r2, #0xf\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._531\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 4\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 8\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 12\n" " mov r1, #0x2\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 16\n" " mov r1, #0x2\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._531 + 20\n" " mov r1, #0xd\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r4, ._531 + 24\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xc\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xe\n" @@ -4778,7 +4778,7 @@ void debug_sub_8161290() " add r0, r4, #0\n" " mov r1, #0x8\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" @@ -4812,7 +4812,7 @@ void debug_sub_81612B8() " add r0, r5, #0\n" " mov r1, #0x8\n" " add r2, r4, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -4858,7 +4858,7 @@ void debug_sub_81612EC() " beq ._542 @cond_branch\n" " mov r0, #0x1\n" "._539:\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" "._565:\n" " mov r0, #0x0\n" " b ._543\n" @@ -4867,7 +4867,7 @@ void debug_sub_81612EC() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._544 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " asr r4, r0, #0x18\n" " cmp r4, #0\n" @@ -4910,7 +4910,7 @@ void debug_sub_81612EC() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._552 @cond_branch\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " asr r4, r0, #0x18\n" " cmp r4, #0\n" @@ -4978,7 +4978,7 @@ void debug_sub_81612EC() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl CloseMenu\n" " mov r0, #0x1\n" "._543:\n" @@ -5007,7 +5007,7 @@ void DebugMenu_RandomNumberTest() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " bl debug_sub_81611D8\n" " ldr r1, ._566 + 16\n" " ldr r0, ._566 + 20\n" diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index 2e739ef4d..f929170fd 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -11,17 +11,17 @@ void InitNoharaDebugMenu() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x13\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._1\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x12\n" @@ -53,7 +53,7 @@ void debug_sub_808F414() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -97,17 +97,17 @@ void NoharaDebugMenu_TV() " ldr r1, ._8\n" " mov r0, #0x0\n" " strb r0, [r1]\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xa\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._8 + 4\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x9\n" @@ -140,7 +140,7 @@ void debug_sub_808F4AC() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -356,7 +356,7 @@ void debug_sub_808F5D8() " add r0, r0, r8\n" " ldrb r2, [r0]\n" " add r0, r6, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" @@ -400,7 +400,7 @@ void debug_sub_808F648() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " ldr r0, ._35 + 4\n" " ldrb r1, [r0]\n" " mov r2, #0x1\n" @@ -478,7 +478,7 @@ void debug_sub_808F6BC() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" @@ -505,7 +505,7 @@ void debug_sub_808F6BC() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._47\n" "._49:\n" " .align 2, 0\n" @@ -521,7 +521,7 @@ void debug_sub_808F6BC() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x6\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._47:\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" @@ -550,7 +550,7 @@ void debug_sub_808F6BC() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._52\n" "._54:\n" " .align 2, 0\n" @@ -566,7 +566,7 @@ void debug_sub_808F6BC() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0xc\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._52:\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" @@ -607,7 +607,7 @@ void debug_sub_808F7B4() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" @@ -634,7 +634,7 @@ void debug_sub_808F7B4() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._58\n" "._60:\n" " .align 2, 0\n" @@ -650,7 +650,7 @@ void debug_sub_808F7B4() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x6\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._58:\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" @@ -679,7 +679,7 @@ void debug_sub_808F7B4() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._63\n" "._65:\n" " .align 2, 0\n" @@ -695,7 +695,7 @@ void debug_sub_808F7B4() " lsr r1, r1, #0x18\n" " add r0, r5, #0\n" " mov r2, #0xc\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._63:\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" @@ -745,17 +745,17 @@ void debug_sub_808F8CC() " mov r1, #0x6\n" " mov r2, #0x1a\n" " mov r3, #0x8\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r0, ._69 + 8\n" " ldr r0, [r0]\n" " mov r1, #0xe\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x16\n" " mov r1, #0x1\n" " mov r2, #0x18\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._69 + 12\n" " add r0, r4, #0\n" " mov r1, #0x0\n" @@ -765,7 +765,7 @@ void debug_sub_808F8CC() " add r0, r4, #0\n" " mov r1, #0x17\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._69 + 16\n" " ldr r0, ._69 + 20\n" " str r0, [r1]\n" @@ -878,7 +878,7 @@ void debug_sub_808F93C() " mov r1, #0x6\n" " mov r2, #0x1a\n" " mov r3, #0x8\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r1, ._83 + 12\n" " ldr r0, ._83 + 8\n" " ldrb r0, [r0]\n" @@ -887,12 +887,12 @@ void debug_sub_808F93C() " ldr r0, [r0]\n" " mov r1, #0xe\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x16\n" " mov r1, #0x1\n" " mov r2, #0x18\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._83 + 16\n" " ldr r0, ._83 + 4\n" " ldrb r1, [r0]\n" @@ -903,7 +903,7 @@ void debug_sub_808F93C() " add r0, r4, #0\n" " mov r1, #0x17\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._79:\n" " ldr r4, ._83\n" " ldrh r1, [r4, #0x2e]\n" @@ -1483,17 +1483,17 @@ void debug_sub_808FECC() " mov r1, #0x6\n" " mov r2, #0x17\n" " mov r3, #0x8\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r0, ._178 + 8\n" " ldr r0, [r0]\n" " mov r1, #0xe\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x16\n" " mov r1, #0x1\n" " mov r2, #0x18\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._178 + 12\n" " add r0, r4, #0\n" " mov r1, #0x0\n" @@ -1503,7 +1503,7 @@ void debug_sub_808FECC() " add r0, r4, #0\n" " mov r1, #0x17\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._178 + 16\n" " ldr r0, ._178 + 20\n" " str r0, [r1]\n" @@ -1616,7 +1616,7 @@ void debug_sub_808FF3C() " mov r1, #0x6\n" " mov r2, #0x17\n" " mov r3, #0x8\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r1, ._192 + 12\n" " ldr r0, ._192 + 8\n" " ldrb r0, [r0]\n" @@ -1625,12 +1625,12 @@ void debug_sub_808FF3C() " ldr r0, [r0]\n" " mov r1, #0xe\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x16\n" " mov r1, #0x1\n" " mov r2, #0x18\n" " mov r3, #0x2\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._192 + 16\n" " ldr r0, ._192 + 4\n" " ldrb r1, [r0]\n" @@ -1641,7 +1641,7 @@ void debug_sub_808FF3C() " add r0, r4, #0\n" " mov r1, #0x17\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._188:\n" " ldr r4, ._192\n" " ldrh r1, [r4, #0x2e]\n" @@ -1816,17 +1816,17 @@ void NoharaDebugMenu_Fan() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._204\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xa\n" @@ -1858,7 +1858,7 @@ void debug_sub_80901A4() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -1926,7 +1926,7 @@ void debug_sub_80901F8() " ldr r0, [r0]\n" " mov r1, #0xe\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._211 + 8\n" " ldr r0, ._211 + 12\n" " str r0, [r1]\n" @@ -1962,7 +1962,7 @@ void debug_sub_8090238() " ldr r0, [r0]\n" " mov r1, #0xe\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._213 + 8\n" " ldr r0, ._213 + 12\n" " str r0, [r1]\n" @@ -2026,7 +2026,7 @@ void debug_sub_809029C() " add r0, r4, #0\n" " mov r1, #0x10\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._219 + 12\n" " ldr r0, ._219 + 16\n" " str r0, [r1]\n" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 28f3a26d1..6f9f0d02c 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -28,7 +28,7 @@ void debug_sub_8076AC8() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuZeroFillWindowRect\n" + " bl Menu_EraseWindowRect\n" " lsl r3, r4, #0x1\n" " add r3, r3, #0x1\n" " lsl r3, r3, #0x18\n" @@ -36,7 +36,7 @@ void debug_sub_8076AC8() " mov r0, #0x10\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" " ldr r3, ._3 + 8\n" @@ -101,15 +101,15 @@ void debug_sub_8076B68() " ldr r0, ._8\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._8 + 4\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._8 + 8\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x4\n" " mov r1, #0xb\n" " bl debug_sub_8077CF4\n" @@ -143,11 +143,11 @@ void debug_sub_8076BB4() " lsl r1, r1, #0x3\n" " ldr r0, ._13\n" " add r5, r1, r0\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r1, r0, #0x18\n" " lsl r4, r4, #0x18\n" @@ -500,11 +500,11 @@ void DebugMenu_8076D6C() " beq ._53 @cond_branch\n" " b ._64\n" "._49:\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._56\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._55\n" "._57:\n" " .align 2, 0\n" @@ -516,11 +516,11 @@ void DebugMenu_8076D6C() " and r1, r1, r2\n" " cmp r1, #0\n" " beq ._58 @cond_branch\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._60 + 4\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x49\n" " bl PlaySE\n" " bl RtcReset\n" @@ -615,11 +615,11 @@ void DebugMenu_8076E30() " beq ._75 @cond_branch\n" " b ._86\n" "._71:\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._78\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._77\n" "._79:\n" " .align 2, 0\n" @@ -631,12 +631,12 @@ void DebugMenu_8076E30() " and r1, r1, r2\n" " cmp r1, #0\n" " beq ._80 @cond_branch\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " bl sub_813B79C\n" " ldr r0, ._82 + 4\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x49\n" " bl PlaySE\n" "._77:\n" @@ -710,13 +710,13 @@ void DebugMenu_8076EF4() " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r4, ._93\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x8\n" " add r3, r4, #0\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r5, #0x0\n" " add r4, r4, #0x4\n" "._92:\n" @@ -769,11 +769,11 @@ void DebugMenu_8076F60() " push {r4, r5, lr}\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r2, r0, #0x18\n" " lsl r4, r4, #0x18\n" @@ -785,7 +785,7 @@ void DebugMenu_8076F60() " add r0, r0, #0x1\n" " cmp r4, r0\n" " bne ._96 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl debug_sub_8076B68\n" " add r0, r5, #0\n" " bl DestroyTask\n" @@ -971,7 +971,7 @@ void DebugMenu_807709C() " bl PlaySE\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._120 + 4\n" " strb r0, [r1]\n" "._115:\n" @@ -983,7 +983,7 @@ void DebugMenu_807709C() " mov r0, #0x5\n" " bl PlaySE\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._120 + 4\n" " strb r0, [r1]\n" "._116:\n" @@ -1097,7 +1097,7 @@ void DebugMenu_807719C() " mov r1, #0x0\n" " mov r2, #0xe\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._133\n" " ldr r0, ._133 + 4\n" " ldr r0, [r0]\n" @@ -1154,11 +1154,11 @@ void DebugMenu_80771EC() " mov r1, #0xc\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._135\n" " mov r1, #0x14\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" @@ -1281,7 +1281,7 @@ void DebugMenu_8077238() " mov r1, #0x10\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._139 + 12\n" " mov r1, #0x1d\n" " ldr r2, [sp, #0x14]\n" @@ -1289,7 +1289,7 @@ void DebugMenu_8077238() " lsl r1, r1, #0x18\n" " lsr r1, r1, #0x18\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0x18\n" " pop {r3, r4, r5}\n" " mov r8, r3\n" @@ -1489,7 +1489,7 @@ void DebugMenu_8077434() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r0, #0x4\n" @@ -1909,7 +1909,7 @@ void DebugMenu_EditPKMN() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl debug_sub_815FFDC\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -1940,7 +1940,7 @@ void DebugMenu_80776B4() " mov r0, #0x19\n" " add r1, r5, #0\n" " mov r2, #0x1d\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r0, ._183 + 4\n" " ldrb r0, [r0]\n" " ASR r0, r4\n" @@ -1950,7 +1950,7 @@ void DebugMenu_80776B4() " add r0, r0, sp\n" " mov r1, #0x19\n" " add r2, r5, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0x8\n" " pop {r4, r5}\n" " pop {r0}\n" @@ -1978,11 +1978,11 @@ void DebugMenu_8077704() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x8\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " mov r0, sp\n" " mov r1, #0x15\n" " mov r2, #0x0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r2, ._185 + 4\n" " mov r0, #0x80\n" " lsl r0, r0, #0x13\n" @@ -2027,7 +2027,7 @@ void DebugMenu_8077760() " bl PlaySE\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._190 + 4\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" @@ -2052,7 +2052,7 @@ void DebugMenu_8077760() " mov r0, #0x5\n" " bl PlaySE\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._195\n" " ldrb r0, [r1]\n" " cmp r0, #0x3\n" @@ -2076,7 +2076,7 @@ void DebugMenu_8077760() " mov r0, #0x5\n" " bl PlaySE\n" " ldr r4, ._201\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r1, #0x1\n" @@ -2084,7 +2084,7 @@ void DebugMenu_8077760() " ldrb r0, [r4]\n" " eor r1, r1, r0\n" " strb r1, [r4]\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " bl DebugMenu_80776B4\n" @@ -2133,7 +2133,7 @@ void DebugMenu_SwitchBG() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl DebugMenu_8077704\n" " mov r0, #0x0\n" " str r0, [sp]\n" @@ -2177,13 +2177,13 @@ void DebugMenu_807786C() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x3\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " lsl r0, r4, #0x1\n" " add r0, r0, r4\n" " add r0, r0, sp\n" " mov r1, #0x1a\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0x8\n" " pop {r4}\n" " pop {r0}\n" @@ -2250,7 +2250,7 @@ void DebugMenu_ControlEncounter() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._213\n" " ldrb r0, [r0]\n" " bl DebugMenu_807786C\n" @@ -2345,7 +2345,7 @@ void DebugMenu_8077974() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r1, ._226\n" " mov r0, #0x4\n" " ldsb r0, [r1, r0]\n" @@ -2494,7 +2494,7 @@ void DebugMenu_RematchTrainers() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._240\n" " mov r1, #0xd\n" " mov r2, #0x5\n" @@ -2602,7 +2602,7 @@ void DebugMenu_8077B00() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl unref_sub_80C853C\n" " cmp r0, #0\n" " beq ._250 @cond_branch\n" @@ -2660,7 +2660,7 @@ void DebugMenu_Safari() " bl GetSafariZoneFlag\n" " cmp r0, #0\n" " beq ._258 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._260\n" " mov r1, #0xe\n" " mov r2, #0x5\n" @@ -2803,7 +2803,7 @@ void DebugMenu_8077C14() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._264\n" " mov r1, #0xa\n" " mov r2, #0x9\n" @@ -2945,7 +2945,7 @@ void debug_sub_8077CF4() " add r0, r6, #0\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5, r6}\n" " pop {r0}\n" " bx r0\n" @@ -2971,7 +2971,7 @@ void DebugMenu_8077D24() " lsr r4, r4, #0x18\n" " lsl r5, r5, #0x18\n" " lsr r5, r5, #0x18\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " lsl r3, r5, #0x1\n" " add r3, r3, #0x1\n" " lsl r3, r3, #0x18\n" @@ -2979,12 +2979,12 @@ void DebugMenu_8077D24() " mov r0, #0x0\n" " mov r1, #0x0\n" " add r2, r4, #0\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " add r2, r5, #0\n" " add r3, r6, #0\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " sub r4, r4, #0x1\n" @@ -3009,7 +3009,7 @@ void DebugMenu_8077D78() asm( " push {r4, r5, lr}\n" " add r5, r0, #0\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r4, r0, #0x18\n" " mov r0, #0x2\n" @@ -3019,7 +3019,7 @@ void DebugMenu_8077D78() " add r0, r0, #0x1\n" " cmp r4, r0\n" " beq ._276 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._278\n" " lsl r1, r4, #0x3\n" " add r1, r1, r5\n" @@ -3216,7 +3216,7 @@ void DebugMenu_8077EAC() " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r1, ._303 + 4\n" " lsl r0, r4, #0x2\n" " add r0, r0, r4\n" @@ -3252,7 +3252,7 @@ void DebugMenu_8077EE0() " mov r1, #0x11\n" " mov r2, #0x16\n" " mov r3, #0x12\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r5, ._305\n" " add r0, r5, #0\n" " add r1, r4, #0\n" @@ -3262,12 +3262,12 @@ void DebugMenu_8077EE0() " add r0, r5, #0\n" " mov r1, #0x4\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " bl ItemId_GetItem\n" " mov r1, #0x8\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #0\n" " add r1, r6, #0\n" " mov r2, #0x1\n" @@ -3276,7 +3276,7 @@ void DebugMenu_8077EE0() " add r0, r5, #0\n" " mov r1, #0x12\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5, r6}\n" " pop {r0}\n" " bx r0\n" @@ -3300,11 +3300,11 @@ void DebugMenu_8077F40() " lsl r4, r4, #0x3\n" " ldr r0, ._307\n" " add r4, r4, r0\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._307 + 4\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrh r0, [r4, #0xa]\n" " ldrh r1, [r4, #0xc]\n" " bl DebugMenu_8077EE0\n" @@ -3341,11 +3341,11 @@ void DebugMenu_8077F7C() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._309 @cond_branch\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._311 + 8\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrh r0, [r4, #0xa]\n" " ldrh r1, [r4, #0xc]\n" " bl DebugMenu_8077EE0\n" @@ -3466,7 +3466,7 @@ void DebugMenu_807806C() " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r4, #0\n" " bl DestroyTask\n" @@ -3493,16 +3493,16 @@ void DebugMenu_807808C() " lsl r1, r4, #0x5\n" " ldr r0, ._331\n" " add r5, r1, r0\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x13\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._331 + 4\n" " mov r1, #0x2\n" " mov r2, #0x2\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, sp\n" " add r1, r4, #0\n" " mov r2, #0x1\n" @@ -3511,7 +3511,7 @@ void DebugMenu_807808C() " mov r0, sp\n" " mov r1, #0xb\n" " mov r2, #0x2\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrh r1, [r5, #0x8]\n" " mov r0, sp\n" " mov r2, #0x1\n" @@ -3520,7 +3520,7 @@ void DebugMenu_807808C() " mov r0, sp\n" " mov r1, #0xb\n" " mov r2, #0x4\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r4, r5, #0\n" " add r4, r4, #0xb\n" " add r0, r4, #0\n" @@ -3532,7 +3532,7 @@ void DebugMenu_807808C() " add r0, r4, #0\n" " mov r1, #0xb\n" " mov r2, #0x6\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._330\n" "._332:\n" " .align 2, 0\n" @@ -3543,7 +3543,7 @@ void DebugMenu_807808C() " ldr r0, ._335\n" " mov r1, #0xb\n" " mov r2, #0x6\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._330:\n" " add r4, r5, #0\n" " add r4, r4, #0x16\n" @@ -3556,7 +3556,7 @@ void DebugMenu_807808C() " add r0, r4, #0\n" " mov r1, #0xb\n" " mov r2, #0x8\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._334\n" "._336:\n" " .align 2, 0\n" @@ -3566,7 +3566,7 @@ void DebugMenu_807808C() " ldr r0, ._337\n" " mov r1, #0xb\n" " mov r2, #0x8\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._334:\n" " ldrb r1, [r5, #0xa]\n" " mov r0, sp\n" @@ -3576,7 +3576,7 @@ void DebugMenu_807808C() " mov r0, sp\n" " mov r1, #0xb\n" " mov r2, #0xa\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, [r5]\n" " mov r0, sp\n" " mov r2, #0x2\n" @@ -3585,7 +3585,7 @@ void DebugMenu_807808C() " mov r0, sp\n" " mov r1, #0xb\n" " mov r2, #0xc\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0xc\n" " pop {r4, r5}\n" " pop {r0}\n" @@ -3611,7 +3611,7 @@ void DebugMenu_807817C() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._339 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " add r0, r4, #0\n" " bl DestroyTask\n" " bl ScriptContext2_Disable\n" @@ -3685,7 +3685,7 @@ void DebugMenu_80781A8() " mov r1, #0x11\n" " mov r2, #0x16\n" " mov r3, #0x12\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r4, ._351\n" " mov r2, #0x8\n" " ldsh r1, [r5, r2]\n" @@ -3696,7 +3696,7 @@ void DebugMenu_80781A8() " add r0, r4, #0\n" " mov r1, #0x4\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._350:\n" " pop {r4, r5}\n" " pop {r0}\n" @@ -3904,7 +3904,7 @@ void DebugMenu_8078310() " cmp r0, #0\n" " beq ._373 @cond_branch\n" "._370:\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " add r0, r5, #0\n" " bl DestroyTask\n" " bl ScriptContext2_Disable\n" @@ -4020,7 +4020,7 @@ void DebugMenu_ToggleClearFlag() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._390\n" " bl FlagGet\n" " mov r1, #0x1\n" @@ -4099,7 +4099,7 @@ void DebugMenu_OpenWeatherEvents() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._404\n" " bl FlagGet\n" " mov r1, #0x0\n" @@ -4170,7 +4170,7 @@ void DebugMenu_OpenMysteryEvent() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl IsMysteryGiftEnabled\n" " mov r1, #0x0\n" " cmp r0, #0\n" @@ -4271,11 +4271,11 @@ void DebugMenu_8078550() " mov r3, #0x2\n" " bl ConvertIntToDecimalStringN\n" "._423:\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._426 + 4\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5, r6, r7}\n" " pop {r0}\n" " bx r0\n" @@ -4379,7 +4379,7 @@ void DebugMenu_807860C() " bl DebugMenu_8078550\n" " b ._447\n" "._434:\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r5, #0\n" " bl DestroyTask\n" @@ -4589,7 +4589,7 @@ void DebugMenu_OpenLegendsRecord() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._464\n" " mov r1, #0xc\n" " mov r2, #0x3\n" @@ -4710,13 +4710,13 @@ void DebugMenu_8078880() " beq ._474 @cond_branch\n" " b ._480\n" "._470:\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " b ._476\n" "._468:\n" " ldr r0, ._478\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._476:\n" " ldrh r0, [r4, #0x8]\n" " add r0, r0, #0x1\n" @@ -4733,7 +4733,7 @@ void DebugMenu_8078880() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._480 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r5, #0\n" " bl DestroyTask\n" @@ -4788,11 +4788,11 @@ void DebugMenu_OpenBerryInfo() " mov r1, #0x0\n" " mov r2, #0x13\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, r4, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._487\n" " ldr r0, ._487 + 4\n" " str r0, [r1]\n" @@ -4815,11 +4815,11 @@ void DebugMenu_8078950() { asm( " push {lr}\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._489\n" " mov r1, #0x4\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._490:\n" @@ -4858,7 +4858,7 @@ void DebugMenu_8078968() " ldr r0, ._495\n" " mov r1, #0x4\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r0}\n" " bx r0\n" "._496:\n" @@ -4885,7 +4885,7 @@ void DebugMenu_80789A4() " add r0, r4, #0\n" " mov r1, #0x9\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" @@ -5112,7 +5112,7 @@ void DebugMenu_8078B38() " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r4, #0\n" " bl DestroyTask\n" @@ -5250,7 +5250,7 @@ void DebugMenu_8078BD4() " beq ._539 @cond_branch\n" " mov r0, #0x49\n" " bl PlaySE\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " add r0, r5, #0\n" " bl DestroyTask\n" " bl ScriptContext2_Disable\n" @@ -5265,7 +5265,7 @@ void DebugMenu_8078BD4() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._543 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " add r0, r5, #0\n" " bl DestroyTask\n" " bl ScriptContext2_Disable\n" @@ -5314,11 +5314,11 @@ void DebugMenu_8078C80() { asm( " push {lr}\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._548\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._548 + 4\n" " ldr r0, ._548 + 8\n" " str r0, [r1]\n" @@ -5465,11 +5465,11 @@ void DebugMenu_8078D7C() { asm( " push {lr}\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._565\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._565 + 4\n" " ldr r0, ._565 + 8\n" " str r0, [r1]\n" @@ -5518,7 +5518,7 @@ void DebugMenu_MeTooBackupMan() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " ldr r0, ._571\n" " mov r1, #0xc\n" " mov r2, #0x2\n" @@ -5655,7 +5655,7 @@ void DebugMenu_8078E80() " mov r1, #0xf\n" " mov r2, #0x16\n" " mov r3, #0x10\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r1, ._581\n" " mov r2, #0x0\n" " ldsh r0, [r4, r2]\n" @@ -5692,7 +5692,7 @@ void DebugMenu_8078EB0() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xf0\n" " mov r1, #0x5\n" " mov r2, #0x11\n" @@ -5706,7 +5706,7 @@ void DebugMenu_8078EB0() " add r0, r4, #0\n" " mov r1, #0x6\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xf0\n" " mov r1, #0x8\n" " mov r2, #0x11\n" @@ -5720,7 +5720,7 @@ void DebugMenu_8078EB0() " add r0, r4, #0\n" " mov r1, #0x9\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -5753,7 +5753,7 @@ void DebugMenu_8078F1C() " strh r0, [r5, #0x4]\n" " ldrb r0, [r1, #0x11]\n" " strh r0, [r5, #0x6]\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " add r0, r5, #0\n" " bl DebugMenu_8078EB0\n" " add r0, r5, #0\n" @@ -5888,7 +5888,7 @@ void DebugMenu_8079020() " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r4, #0\n" " bl DestroyTask\n" @@ -5952,7 +5952,7 @@ void DebugMenu_8079058() "._608:\n" " ldr r0, ._615\n" " str r1, [r0]\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " b ._614\n" "._616:\n" " .align 2, 0\n" @@ -5962,7 +5962,7 @@ void DebugMenu_8079058() " ldr r0, ._618\n" " mov r1, #0x4\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x14\n" " mov r1, #0x8\n" " mov r2, #0x1\n" @@ -5998,7 +5998,7 @@ void DebugMenu_8079058() " mov r0, #0x0\n" "._622:\n" " str r0, [r1]\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r5, #0\n" " bl DestroyTask\n" @@ -6065,7 +6065,7 @@ void DebugMenu_8079110() " beq ._635 @cond_branch\n" " b ._642\n" "._631:\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " b ._637\n" "._629:\n" " ldr r0, ._639\n" @@ -6092,7 +6092,7 @@ void DebugMenu_8079110() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._642 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r5, #0\n" " bl DestroyTask\n" diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index c20d9b87c..ce1cc47ee 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -13,12 +13,12 @@ void TayaDebugMenu_Trend() " mov r5, r8\n" " push {r5, r6, r7}\n" " add sp, sp, #0xffffffd8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1e\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r5, ._3\n" " mov r7, #0x0\n" " mov r0, #0x1\n" @@ -89,7 +89,7 @@ void TayaDebugMenu_Trend() " lsr r2, r2, #0x18\n" " mov r0, sp\n" " mov r1, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r5, r5, #0x8\n" " add r0, r7, #1\n" " lsl r0, r0, #0x10\n" @@ -136,7 +136,7 @@ void debug_sub_8090808() "._7:\n" " .word gMain\n" "._5:\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl CloseMenu\n" " mov r0, #0x1\n" "._6:\n" @@ -179,7 +179,7 @@ void TayaDebugMenu_TrendR() " lsr r0, r0, #0x10\n" " cmp r0, #0x4\n" " bls ._10 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl CloseMenu\n" " mov r0, #0x1\n" " pop {r4, r5, r6, r7}\n" @@ -219,7 +219,7 @@ void debug_sub_809089C() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -303,12 +303,12 @@ void TayaDebugMenu_SimpleText() " mov r1, #0x0\n" " mov r2, #0xc\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._32\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xb\n" @@ -340,7 +340,7 @@ void debug_sub_8090984() { asm( " push {r4, r5, r6, r7, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r2, r0, #0x18\n" " asr r1, r2, #0x18\n" " mov r0, #0x2\n" @@ -432,12 +432,12 @@ void TayaDebugMenu_OldMan() " mov r1, #0x0\n" " mov r2, #0xa\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._48\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x8\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " bl GetCurrentMauvilleOldMan\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -471,7 +471,7 @@ void TayaDebugMenu_LanettesPC() { asm( " push {lr}\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ShowPokemonStorageSystem\n" " mov r0, #0x1\n" " pop {r1}\n" @@ -658,7 +658,7 @@ void debug_sub_8090C44() " add r0, r4, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0x0\n" " mov r2, #0x5\n" @@ -670,7 +670,7 @@ void debug_sub_8090C44() " add r0, r4, #0\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4, r5}\n" " pop {r0}\n" " bx r0\n" @@ -874,7 +874,7 @@ void TayaDebugMenu_PKMNLottery() " mov r1, #0x0\n" " mov r2, #0x6\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl RetrieveLotteryNumber\n" " ldr r2, ._83\n" " ldr r0, ._83 + 4\n" @@ -979,7 +979,7 @@ void TayaDebugMenu_PokenavD() " mov r5, r8\n" " push {r5, r6, r7}\n" " add sp, sp, #0xffffffe4\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " mov r0, #0x0\n" " mov sl, r0\n" " mov r6, #0x1\n" @@ -999,7 +999,7 @@ void TayaDebugMenu_PokenavD() " add r0, r4, #0\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " mov r8, r0\n" " str r5, [sp, #0x14]\n" @@ -1299,7 +1299,7 @@ void TayaDebugMenu_8091190() asm( " push {r4, r5, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r3, r0, #0x18\n" " mov r0, #0x2\n" @@ -1370,12 +1370,12 @@ void TayaDebugMenu_8091190() " ldrsb r1, [r5, r1]\n" " cmp r0, r1\n" " beq ._106 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r4, ._107 + 8\n" " mov r0, #0x0\n" " ldrsb r0, [r5, r0]\n" @@ -1385,7 +1385,7 @@ void TayaDebugMenu_8091190() " ldr r3, [r0]\n" " mov r0, #0x1\n" " mov r1, #0x1\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " ldrsb r0, [r5, r0]\n" " lsl r0, r0, #0x3\n" @@ -1427,18 +1427,18 @@ void InitTayaDebugWindow() " ldr r1, ._109\n" " mov r0, #0x0\n" " strb r0, [r1]\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xb\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._109 + 4\n" " ldr r3, [r0]\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xa\n" @@ -1944,29 +1944,29 @@ void debug_sub_80915BC() " bls ._171 @cond_branch\n" " ldr r4, ._172\n" " add r0, r4, #0\n" - " bl SetUpWindowConfig\n" + " bl Text_LoadWindowTemplate\n" " add r0, r4, #0\n" " bl InitMenuWindow\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x3\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._172 + 4\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " mov r1, #0x4\n" " mov r2, #0x1d\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0x12\n" " mov r2, #0x1d\n" " mov r3, #0x15\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r1, #0x80\n" " lsl r1, r1, #0x13\n" " mov r2, #0x8a\n" @@ -2096,7 +2096,7 @@ void debug_sub_80916AC() " add r0, r7, #0\n" " add r0, r0, #0x12\n" " mov r1, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, [sp]\n" " lsl r0, r1, #0x18\n" " lsr r6, r0, #0x18\n" diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index eb2fd8a7e..cc2bdd80e 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -36,17 +36,17 @@ void debug_sub_808B874() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xd\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._1\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " ldr r0, ._1 + 4\n" " ldrb r0, [r0]\n" " str r0, [sp]\n" @@ -90,7 +90,7 @@ void debug_sub_808B8C8() " bl PlaySE\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._7 + 4\n" " strb r0, [r1]\n" "._3:\n" @@ -102,7 +102,7 @@ void debug_sub_808B8C8() " mov r0, #0x5\n" " bl PlaySE\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._7 + 4\n" " strb r0, [r1]\n" "._4:\n" @@ -154,21 +154,21 @@ void TomomichiDebugMenu_ContestGraphics() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x14\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._11\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r3, ._11 + 4\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x4\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x13\n" @@ -218,21 +218,21 @@ void TomomichiDebugMenu_ArtMusGraphics() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x14\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._13\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r3, ._13 + 4\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x4\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x13\n" @@ -282,21 +282,21 @@ void TomomichiDebugMenu_PreviewData() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x14\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._15\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r3, ._15 + 4\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x4\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x13\n" @@ -346,21 +346,21 @@ void TomomichiDebugMenu_TrickHouse() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._17\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r3, ._17 + 4\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " ldr r0, ._17 + 8\n" " ldrb r0, [r0]\n" " str r0, [sp]\n" @@ -396,17 +396,17 @@ void TomomichiDebugMenu_ControlEvents() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._19\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " ldr r0, ._19 + 4\n" " ldrb r0, [r0]\n" " str r0, [sp]\n" @@ -441,17 +441,17 @@ void TomomichiDebugMenu_ControlFlags() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._21\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " ldr r0, ._21 + 4\n" " ldrb r0, [r0]\n" " str r0, [sp]\n" @@ -486,17 +486,17 @@ void TomomichiDebugMenu_ControlWorks() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._23\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " ldr r0, ._23 + 4\n" " ldrb r0, [r0]\n" " str r0, [sp]\n" @@ -530,10 +530,10 @@ void debug_sub_808BC48() { asm( " push {r4, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " asr r0, r0, #0x18\n" " cmp r0, #0x1\n" @@ -598,10 +598,10 @@ void debug_sub_808BCBC() { asm( " push {r4, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " asr r0, r0, #0x18\n" " cmp r0, #0x1\n" @@ -666,10 +666,10 @@ void debug_sub_808BD30() { asm( " push {r4, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " asr r0, r0, #0x18\n" " cmp r0, #0x1\n" @@ -744,7 +744,7 @@ void debug_sub_808BDA4() " bl PlaySE\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._71 + 4\n" " strb r0, [r1]\n" "._67:\n" @@ -756,7 +756,7 @@ void debug_sub_808BDA4() " mov r0, #0x5\n" " bl PlaySE\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._71 + 4\n" " strb r0, [r1]\n" "._68:\n" @@ -817,7 +817,7 @@ void debug_sub_808BE2C() " bl PlaySE\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._79 + 4\n" " strb r0, [r1]\n" "._75:\n" @@ -829,7 +829,7 @@ void debug_sub_808BE2C() " mov r0, #0x5\n" " bl PlaySE\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._79 + 4\n" " strb r0, [r1]\n" "._76:\n" @@ -890,7 +890,7 @@ void debug_sub_808BEB4() " bl PlaySE\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._87 + 4\n" " strb r0, [r1]\n" "._83:\n" @@ -902,7 +902,7 @@ void debug_sub_808BEB4() " mov r0, #0x5\n" " bl PlaySE\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._87 + 4\n" " strb r0, [r1]\n" "._84:\n" @@ -963,7 +963,7 @@ void debug_sub_808BF3C() " bl PlaySE\n" " mov r0, #0x1\n" " neg r0, r0\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._95 + 4\n" " strb r0, [r1]\n" "._91:\n" @@ -975,7 +975,7 @@ void debug_sub_808BF3C() " mov r0, #0x5\n" " bl PlaySE\n" " mov r0, #0x1\n" - " bl MoveMenuCursor\n" + " bl Menu_MoveCursor\n" " ldr r1, ._95 + 4\n" " strb r0, [r1]\n" "._92:\n" @@ -1027,17 +1027,17 @@ void debug_sub_808BFC4() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._99\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -1070,17 +1070,17 @@ void debug_sub_808C014() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._101\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -1112,7 +1112,7 @@ void debug_sub_808C064() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -1155,7 +1155,7 @@ void debug_sub_808C0A8() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -1610,17 +1610,17 @@ void debug_sub_808C31C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._157\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -1652,7 +1652,7 @@ void debug_sub_808C36C() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -1696,17 +1696,17 @@ void debug_sub_808C3B0() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._165\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -1743,17 +1743,17 @@ void debug_sub_808C408() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._167\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -1790,17 +1790,17 @@ void debug_sub_808C460() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._169\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -1837,17 +1837,17 @@ void debug_sub_808C4B8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._171\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -1884,17 +1884,17 @@ void debug_sub_808C510() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._173\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -1931,17 +1931,17 @@ void debug_sub_808C568() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._175\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -1978,17 +1978,17 @@ void debug_sub_808C5C0() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._177\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2025,17 +2025,17 @@ void debug_sub_808C618() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._179\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2072,17 +2072,17 @@ void debug_sub_808C670() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._181\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2118,11 +2118,11 @@ void debug_sub_808C6C8() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._186\n" " ldrb r0, [r5]\n" @@ -2270,17 +2270,17 @@ void debug_sub_808C7C8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._197\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -2312,7 +2312,7 @@ void debug_sub_808C818() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -2356,17 +2356,17 @@ void debug_sub_808C85C() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._205\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -2403,17 +2403,17 @@ void debug_sub_808C8B4() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._207\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2450,17 +2450,17 @@ void debug_sub_808C90C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._209\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2497,17 +2497,17 @@ void debug_sub_808C964() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._211\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2544,17 +2544,17 @@ void debug_sub_808C9BC() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._213\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2591,17 +2591,17 @@ void debug_sub_808CA14() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._215\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2638,17 +2638,17 @@ void debug_sub_808CA6C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._217\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2685,17 +2685,17 @@ void debug_sub_808CAC4() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._219\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -2732,17 +2732,17 @@ void debug_sub_808CB1C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._221\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -2778,11 +2778,11 @@ void debug_sub_808CB74() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._226\n" " ldrb r0, [r5]\n" @@ -2930,17 +2930,17 @@ void debug_sub_808CC74() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._237\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -2972,7 +2972,7 @@ void debug_sub_808CCC4() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -3016,17 +3016,17 @@ void debug_sub_808CD08() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._245\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x8\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -3063,17 +3063,17 @@ void debug_sub_808CD60() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._247\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x4\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3110,17 +3110,17 @@ void debug_sub_808CDB8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x3\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._249\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3156,11 +3156,11 @@ void debug_sub_808CE10() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._254\n" " ldrb r0, [r5]\n" @@ -3308,17 +3308,17 @@ void debug_sub_808CF10() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._265\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -3350,7 +3350,7 @@ void debug_sub_808CF60() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -3394,17 +3394,17 @@ void debug_sub_808CFA4() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._273\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x8\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -3441,17 +3441,17 @@ void debug_sub_808CFFC() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._275\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3488,17 +3488,17 @@ void debug_sub_808D054() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._277\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3535,17 +3535,17 @@ void debug_sub_808D0AC() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._279\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x4\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3582,17 +3582,17 @@ void debug_sub_808D104() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._281\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3629,17 +3629,17 @@ void debug_sub_808D15C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._283\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3676,17 +3676,17 @@ void debug_sub_808D1B4() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._285\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3723,17 +3723,17 @@ void debug_sub_808D20C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._287\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3770,17 +3770,17 @@ void debug_sub_808D264() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._289\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -3816,11 +3816,11 @@ void debug_sub_808D2BC() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._294\n" " ldrb r0, [r5]\n" @@ -3968,17 +3968,17 @@ void debug_sub_808D3BC() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._305\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -4010,7 +4010,7 @@ void debug_sub_808D40C() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -4054,17 +4054,17 @@ void debug_sub_808D450() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._313\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -4101,17 +4101,17 @@ void debug_sub_808D4A8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._315\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -4147,11 +4147,11 @@ void debug_sub_808D500() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._320\n" " ldrb r0, [r5]\n" @@ -4299,17 +4299,17 @@ void debug_sub_808D600() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._331\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -4341,7 +4341,7 @@ void debug_sub_808D650() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -4385,17 +4385,17 @@ void debug_sub_808D694() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._339\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -4432,17 +4432,17 @@ void debug_sub_808D6EC() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._341\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -4478,11 +4478,11 @@ void debug_sub_808D744() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._346\n" " ldrb r0, [r5]\n" @@ -4630,17 +4630,17 @@ void debug_sub_808D844() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1c\n" " mov r3, #0x3\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._357\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1b\n" @@ -4672,7 +4672,7 @@ void debug_sub_808D894() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r3, r0, #0x18\n" " mov r0, #0x2\n" @@ -4715,17 +4715,17 @@ void debug_sub_808D8D8() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._365\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -4761,11 +4761,11 @@ void debug_sub_808D930() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._370\n" " ldrb r0, [r5]\n" @@ -4913,17 +4913,17 @@ void debug_sub_808DA30() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x3\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._381\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -4955,11 +4955,11 @@ void debug_sub_808DA80() { asm( " push {r4, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " bl debug_sub_808DAD4\n" " bl debug_sub_808DABC\n" " lsl r4, r4, #0x18\n" @@ -5054,17 +5054,17 @@ void debug_sub_808DB0C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._395\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x17\n" @@ -5096,7 +5096,7 @@ void debug_sub_808DB5C() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -5140,17 +5140,17 @@ void debug_sub_808DBA0() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x11\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._403\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x8\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -5187,17 +5187,17 @@ void debug_sub_808DBF8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._405\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5234,17 +5234,17 @@ void debug_sub_808DC50() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._407\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5281,17 +5281,17 @@ void debug_sub_808DCA8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._409\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5328,17 +5328,17 @@ void debug_sub_808DD00() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._411\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5375,17 +5375,17 @@ void debug_sub_808DD58() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._413\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5422,17 +5422,17 @@ void debug_sub_808DDB0() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._415\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5469,17 +5469,17 @@ void debug_sub_808DE08() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._417\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5516,17 +5516,17 @@ void debug_sub_808DE60() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._419\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5562,11 +5562,11 @@ void debug_sub_808DEB8() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._424\n" " ldrb r0, [r5]\n" @@ -5723,17 +5723,17 @@ void debug_sub_808DFC0() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._437\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x17\n" @@ -5765,7 +5765,7 @@ void debug_sub_808E010() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -5809,17 +5809,17 @@ void debug_sub_808E054() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._445\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -5856,17 +5856,17 @@ void debug_sub_808E0AC() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._447\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5903,17 +5903,17 @@ void debug_sub_808E104() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._449\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5950,17 +5950,17 @@ void debug_sub_808E15C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._451\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -5997,17 +5997,17 @@ void debug_sub_808E1B4() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._453\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -6044,17 +6044,17 @@ void debug_sub_808E20C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._455\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -6090,11 +6090,11 @@ void debug_sub_808E264() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._460\n" " ldrb r0, [r5]\n" @@ -6251,17 +6251,17 @@ void debug_sub_808E36C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._473\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x17\n" @@ -6293,7 +6293,7 @@ void debug_sub_808E3BC() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -6337,17 +6337,17 @@ void debug_sub_808E400() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._481\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -6384,17 +6384,17 @@ void debug_sub_808E458() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._483\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -6431,17 +6431,17 @@ void debug_sub_808E4B0() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._485\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x6\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -6478,17 +6478,17 @@ void debug_sub_808E508() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._487\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -6525,17 +6525,17 @@ void debug_sub_808E560() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._489\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -6571,11 +6571,11 @@ void debug_sub_808E5B8() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._494\n" " ldrb r0, [r5]\n" @@ -6732,17 +6732,17 @@ void debug_sub_808E6C0() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._507\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x17\n" @@ -6774,7 +6774,7 @@ void debug_sub_808E710() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -6818,17 +6818,17 @@ void debug_sub_808E754() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._515\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -6865,17 +6865,17 @@ void debug_sub_808E7AC() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._517\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -6911,11 +6911,11 @@ void debug_sub_808E804() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._522\n" " ldrb r0, [r5]\n" @@ -7072,17 +7072,17 @@ void debug_sub_808E90C() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._535\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x2\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x17\n" @@ -7114,7 +7114,7 @@ void debug_sub_808E95C() { asm( " push {lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -7158,17 +7158,17 @@ void debug_sub_808E9A0() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._543\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r4, #0x0\n" " str r4, [sp]\n" " mov r0, #0x1c\n" @@ -7205,17 +7205,17 @@ void debug_sub_808E9F8() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r3, ._545\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x1c\n" @@ -7251,11 +7251,11 @@ void debug_sub_808EA50() { asm( " push {r4, r5, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " add r1, r0, #0\n" " ldr r5, ._550\n" " ldrb r0, [r5]\n" @@ -7412,21 +7412,21 @@ void debug_sub_808EB58() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xc\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._563\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r3, ._563 + 4\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x8\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xb\n" @@ -7460,21 +7460,21 @@ void debug_sub_808EBB4() asm( " push {lr}\n" " add sp, sp, #0xfffffff8\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xd\n" " mov r3, #0xd\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._565\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r3, ._565 + 4\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x5\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xc\n" @@ -7507,11 +7507,11 @@ void debug_sub_808EC10() { asm( " push {r4, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r2, r0, #0x18\n" " lsl r4, r4, #0x18\n" @@ -7553,11 +7553,11 @@ void debug_sub_808EC5C() { asm( " push {r4, lr}\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl GetMenuCursorPos\n" + " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r1, r0, #0x18\n" " lsl r4, r4, #0x18\n" @@ -8127,7 +8127,7 @@ void debug_sub_808EF8C() " strb r1, [r0, #0x8]\n" " mov r1, #0xc\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._653:\n" " mov r3, #0x0\n" " ldr r7, ._666\n" @@ -8189,7 +8189,7 @@ void debug_sub_808EF8C() " add r0, r7, #0\n" " mov r1, #0x8\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._665\n" "._667:\n" " .align 2, 0\n" @@ -8201,7 +8201,7 @@ void debug_sub_808EF8C() " ldr r0, ._672\n" " mov r1, #0xc\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._665:\n" " ldr r5, ._672\n" " mov r0, #0xff\n" @@ -8229,7 +8229,7 @@ void debug_sub_808EF8C() " add r0, r5, #0\n" " mov r1, #0xc\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " cmp r6, #0x1\n" " beq ._668 @cond_branch\n" " cmp r6, #0x1\n" @@ -8278,7 +8278,7 @@ void debug_sub_808EF8C() " add r0, r5, #0\n" " mov r1, #0xc\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._679\n" "._681:\n" " .align 2, 0\n" @@ -8308,7 +8308,7 @@ void debug_sub_808EF8C() " add r0, r5, #0\n" " mov r1, #0xc\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._679:\n" " pop {r3}\n" " mov r8, r3\n" @@ -8537,7 +8537,7 @@ void debug_sub_808F2E0() " add r0, r1, #0\n" " add r1, r4, #0\n" " add r2, r3, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" @@ -8615,7 +8615,7 @@ void debug_sub_808F31C() " add r0, r5, #0\n" " mov r1, r8\n" " mov r2, r9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " pop {r3, r4}\n" " mov r8, r3\n" " mov r9, r4\n" diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index dcb3bd90b..731e58986 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -126,7 +126,7 @@ void debug_80C35DC() " ldr r0, ._2 + 12\n" " bl LoadSpritePalette\n" " ldr r0, ._2 + 16\n" - " bl SetUpWindowConfig\n" + " bl Text_LoadWindowTemplate\n" " ldr r0, ._2 + 20\n" " bl InitMenuWindow\n" " add sp, sp, #0x8\n" @@ -298,7 +298,7 @@ void debug_80C376C() " mov r0, sp\n" " add r1, r7, #0\n" " add r2, r6, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0x4\n" " pop {r4, r5, r6, r7}\n" " pop {r0}\n" @@ -365,7 +365,7 @@ void debug_80C3800() " mov r0, sp\n" " add r1, r6, #0\n" " add r2, r5, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0xc\n" " pop {r4, r5, r6, r7}\n" " pop {r0}\n" @@ -491,13 +491,13 @@ void debug_80C38E4() " add r1, r4, #0\n" " add r2, r7, #0\n" " add r3, r5, #0\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " cmp r6, #0\n" " beq ._36 @cond_branch\n" " mov r0, sp\n" " add r1, r7, #0\n" " mov r2, r8\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._36:\n" " add sp, sp, #0x4\n" " pop {r3}\n" @@ -699,82 +699,82 @@ void debug_80C3A50() " mov r1, #0x0\n" " mov r2, #0x17\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x5\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r5, ._56 + 8\n" " add r0, r5, #0\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r4, ._56 + 12\n" " add r0, r4, #0\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x18\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, r5, #0\n" " mov r1, #0x19\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0x19\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " mov r1, #0xa\n" " mov r2, #0xb\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._56 + 16\n" " mov r1, #0x1\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._56 + 20\n" " mov r1, #0x1\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._56 + 24\n" " mov r1, #0x1\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._56 + 28\n" " mov r1, #0x1\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xc\n" " mov r1, #0xa\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._56 + 32\n" " mov r1, #0xd\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._56 + 36\n" " mov r1, #0xd\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xc\n" " mov r1, #0x10\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._56 + 40\n" " mov r1, #0xd\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._56 + 44\n" " mov r1, #0x18\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, r9\n" " mov r1, #0x12\n" " mov r2, #0x11\n" @@ -1788,15 +1788,15 @@ void debug_80C42B8() " mov r1, #0x10\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, sp\n" " mov r1, #0x1\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0x14\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " bl debug_80C4694\n" " bl debug_80C4704\n" " ldr r0, ._150 + 8\n" @@ -2298,11 +2298,11 @@ void debug_80C4694() " mov r1, #0x0\n" " mov r2, #0xe\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, sp\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r4, #0x0\n" " add r5, sp, #0x10\n" "._212:\n" @@ -2324,7 +2324,7 @@ void debug_80C4694() " lsr r2, r2, #0x18\n" " add r0, r5, #0\n" " mov r1, #0x2\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" @@ -2357,11 +2357,11 @@ void debug_80C4704() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, sp\n" " mov r1, #0x11\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r4, #0x0\n" " add r5, sp, #0x10\n" "._215:\n" @@ -2383,7 +2383,7 @@ void debug_80C4704() " lsr r2, r2, #0x18\n" " add r0, r5, #0\n" " mov r1, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" @@ -2476,24 +2476,24 @@ void debug_80C47BC() " mov r1, #0x10\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, sp\n" " mov r1, #0x1\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0x14\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xe\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, r6, #0\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r4, #0x0\n" " ldr r6, ._224 + 16\n" "._223:\n" @@ -2506,7 +2506,7 @@ void debug_80C47BC() " add r2, r2, r1\n" " lsr r2, r2, #0x18\n" " mov r1, #0x2\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" @@ -2516,11 +2516,11 @@ void debug_80C47BC() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, r5, #0\n" " mov r1, #0x11\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._224 + 20\n" " ldrb r0, [r0, #0x4]\n" " bl debug_80C4C44\n" @@ -3142,7 +3142,7 @@ void debug_80C4C44() " lsr r2, r2, #0x18\n" " mov r0, sp\n" " mov r1, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._280:\n" " mov r7, r8\n" " lsl r0, r7, #0x18\n" @@ -3188,24 +3188,24 @@ void debug_80C4D14() " mov r1, #0x10\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, sp\n" " mov r1, #0x1\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #0\n" " mov r1, #0x14\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xe\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, r6, #0\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._291 + 12\n" " ldrb r0, [r0, #0x6]\n" " bl debug_80C4F00\n" @@ -3213,7 +3213,7 @@ void debug_80C4D14() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r1, ._291 + 16\n" " lsl r0, r4, #0x2\n" " add r0, r0, r4\n" @@ -3431,7 +3431,7 @@ void debug_80C4F00() " mov r1, #0x3\n" " mov r2, #0xd\n" " mov r3, #0xe\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " mov r4, #0x0\n" " ldr r6, ._318\n" "._317:\n" @@ -3447,7 +3447,7 @@ void debug_80C4F00() " add r2, r2, r1\n" " lsr r2, r2, #0x18\n" " mov r1, #0x2\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._316:\n" " add r0, r4, #1\n" " lsl r0, r0, #0x18\n" @@ -3505,46 +3505,46 @@ void debug_80C4F48() " mov r1, #0x10\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, sp\n" " mov r1, #0x1\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r6, #0\n" " mov r1, #0x14\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xe\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, r5, #0\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x1\n" " mov r1, #0x3\n" " mov r2, #0xd\n" " mov r3, #0xe\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " add r0, r5, #0\n" " mov r1, #0x2\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, r9\n" " mov r1, #0x2\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, r8\n" " mov r1, #0x2\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xf\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0xf\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r1, ._320 + 20\n" " lsl r0, r4, #0x2\n" " add r0, r0, r4\n" @@ -4039,11 +4039,11 @@ void InitCreatePokemon() " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x3\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " add r0, sp, #0x4\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r1, #0x80\n" " lsl r1, r1, #0x13\n" " mov r2, #0x8a\n" @@ -4244,13 +4244,13 @@ void debug_80C53F0() " mov r1, #0x8\n" " mov r2, #0x1a\n" " mov r3, #0xb\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " cmp r4, #0\n" " beq ._379 @cond_branch\n" " ldr r0, ._381 + 4\n" " mov r1, #0x4\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._380\n" "._382:\n" " .align 2, 0\n" @@ -4261,7 +4261,7 @@ void debug_80C53F0() " ldr r0, ._384\n" " mov r1, #0x4\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._380:\n" " ldr r0, ._384 + 4\n" " lsl r1, r5, #0x2\n" @@ -6028,7 +6028,7 @@ void debug_80C627C() " lsr r2, r2, #0x18\n" " add r0, r5, #0\n" " mov r1, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, [r4]\n" " ldr r2, ._593 + 4\n" " add r1, r0, r2\n" @@ -6046,7 +6046,7 @@ void debug_80C627C() " lsr r2, r2, #0x18\n" " mov r0, sp\n" " mov r1, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._595\n" "._594:\n" " .align 2, 0\n" @@ -6070,7 +6070,7 @@ void debug_80C627C() " lsr r2, r2, #0x18\n" " add r0, r5, #0\n" " mov r1, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, [r4]\n" " ldr r2, ._596 + 4\n" " add r1, r0, r2\n" @@ -6085,7 +6085,7 @@ void debug_80C627C() " lsr r2, r2, #0x18\n" " mov r0, sp\n" " mov r1, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._595:\n" " add sp, sp, #0x8\n" " pop {r4, r5, r6}\n" @@ -6112,7 +6112,7 @@ void debug_80C6384() " mov r1, #0x4\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r5, #0x0\n" " ldr r3, ._600\n" " ldr r1, ._600 + 4\n" @@ -6166,7 +6166,7 @@ void debug_80C6384() " add r2, r2, r1\n" " lsr r2, r2, #0x18\n" " mov r1, #0x2\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" @@ -6209,7 +6209,7 @@ void debug_80C643C() " mov r1, #0x5\n" " mov r2, #0x1c\n" " mov r3, #0x12\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " mov r5, #0x0\n" " ldr r6, ._605\n" " ldr r1, ._605 + 4\n" @@ -6301,7 +6301,7 @@ void debug_80C643C() " add r2, r2, r1\n" " lsr r2, r2, #0x18\n" " mov r1, #0x2\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" @@ -6888,7 +6888,7 @@ void debug_80C68CC() " add r0, r0, sp\n" " add r1, r6, #0\n" " add r2, r5, #0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0x8\n" " pop {r4, r5, r6, r7}\n" " pop {r0}\n" @@ -7092,39 +7092,39 @@ void debug_80C6B00() " mov r1, #0x0\n" " mov r2, #0xf\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x9\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0xa\n" " mov r2, #0x9\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x10\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._666 + 4\n" " mov r1, #0x11\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._666 + 8\n" " mov r1, #0x1b\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._666 + 12\n" " mov r1, #0x11\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xa\n" " mov r1, #0x8\n" " mov r2, #0x1d\n" " mov r3, #0xc\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r2, #0x0\n" " ldr r4, ._666 + 16\n" " ldr r0, ._666 + 20\n" @@ -7159,12 +7159,12 @@ void debug_80C6B00() " add r0, r5, #0\n" " mov r1, #0x14\n" " mov r2, #0xa\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xa\n" " mov r1, #0xd\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r1, sp\n" " mov r0, #0x23\n" " strb r0, [r1]\n" @@ -7232,7 +7232,7 @@ void debug_80C6B00() " add r0, r5, #0\n" " mov r1, #0xf\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._666 + 52\n" " ldr r2, ._666 + 56\n" " add r0, r2, #0\n" @@ -7595,7 +7595,7 @@ void debug_80C6EE8() " ldr r0, ._670 + 16\n" " mov r1, #0xd\n" " mov r2, #0xa\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xe\n" " mov r2, #0xa\n" @@ -8665,39 +8665,39 @@ void debug_80C777C() " mov r1, #0x0\n" " mov r2, #0xe\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x9\n" " mov r3, #0x9\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x0\n" " mov r1, #0xa\n" " mov r2, #0x9\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0xe\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._784 + 4\n" " mov r1, #0xf\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._784 + 8\n" " mov r1, #0x19\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._784 + 12\n" " mov r1, #0xf\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xa\n" " mov r1, #0x8\n" " mov r2, #0x1d\n" " mov r3, #0xc\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r2, #0x0\n" " ldr r4, ._784 + 16\n" " ldr r0, ._784 + 20\n" @@ -8732,12 +8732,12 @@ void debug_80C777C() " add r0, r5, #0\n" " mov r1, #0x14\n" " mov r2, #0xa\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0xa\n" " mov r1, #0xd\n" " mov r2, #0x1d\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r1, sp\n" " mov r0, #0x23\n" " strb r0, [r1]\n" @@ -8805,7 +8805,7 @@ void debug_80C777C() " add r0, r5, #0\n" " mov r1, #0xf\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._784 + 52\n" " ldr r2, ._784 + 56\n" " add r0, r2, #0\n" @@ -9052,7 +9052,7 @@ void debug_80C7A54() " ldr r0, ._788 + 16\n" " mov r1, #0xd\n" " mov r2, #0xa\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " mov r1, #0xe\n" " mov r2, #0xa\n" diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 311679cb7..3aefa80de 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -4217,7 +4217,7 @@ void debug_sub_811B2E8() " mov r0, sp\n" " mov r1, #0x6\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add sp, sp, #0x4\n" " pop {r0}\n" " bx r0\n" @@ -4238,75 +4238,75 @@ void debug_sub_811B310() " ldr r0, ._21\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 4\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 8\n" " mov r1, #0x1\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 12\n" " mov r1, #0x1\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 16\n" " mov r1, #0x1\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 20\n" " mov r1, #0x1\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 24\n" " mov r1, #0x1\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 28\n" " mov r1, #0x1\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 32\n" " mov r1, #0x1\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 36\n" " mov r1, #0xf\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 40\n" " mov r1, #0xf\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 44\n" " mov r1, #0xf\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 48\n" " mov r1, #0xf\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 52\n" " mov r1, #0xf\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 56\n" " mov r1, #0xf\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 60\n" " mov r1, #0xf\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 64\n" " mov r1, #0xf\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 68\n" " mov r1, #0xf\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._21 + 72\n" " ldrb r0, [r0, #0x3]\n" " cmp r0, #0\n" @@ -4314,7 +4314,7 @@ void debug_sub_811B310() " ldr r0, ._21 + 76\n" " mov r1, #0xa\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._20\n" "._22:\n" " .align 2, 0\n" @@ -4343,7 +4343,7 @@ void debug_sub_811B310() " ldr r0, ._30\n" " mov r1, #0xa\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._20:\n" " ldr r4, ._30 + 4\n" " ldr r1, [r4, #0x68]\n" @@ -4354,7 +4354,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0xa\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, [r4, #0x6c]\n" " mov r0, sp\n" " mov r2, #0x2\n" @@ -4363,7 +4363,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0xa\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " mov r0, #0x10\n" " ldsh r1, [r4, r0]\n" " mov r0, sp\n" @@ -4373,7 +4373,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0xa\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, [r4, #0x70]\n" " mov r0, sp\n" " mov r2, #0x2\n" @@ -4382,7 +4382,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, [r4, #0x74]\n" " mov r0, sp\n" " mov r2, #0x2\n" @@ -4391,7 +4391,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, [r4, #0x78]\n" " mov r0, sp\n" " mov r2, #0x2\n" @@ -4400,7 +4400,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0x7\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, [r4, #0x7c]\n" " mov r0, sp\n" " mov r2, #0x2\n" @@ -4409,7 +4409,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0x9\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " add r0, r0, #0x80\n" " ldr r1, [r0]\n" @@ -4420,7 +4420,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0xb\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " add r0, r0, #0x84\n" " ldr r1, [r0]\n" @@ -4431,7 +4431,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0xd\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " add r0, r0, #0x88\n" " ldr r1, [r0]\n" @@ -4442,7 +4442,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " add r0, r4, #0\n" " add r0, r0, #0x8c\n" " ldr r1, [r0]\n" @@ -4453,7 +4453,7 @@ void debug_sub_811B310() " mov r0, sp\n" " mov r1, #0x14\n" " mov r2, #0x11\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._30 + 8\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" @@ -4515,7 +4515,7 @@ void debug_sub_811B310() "._45:\n" " ldr r0, ._46\n" " mov r1, #0x17\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._23:\n" " bl debug_sub_811B2E8\n" " add sp, sp, #0x8\n" @@ -4684,7 +4684,7 @@ void debug_sub_811B654() " mov r1, #0x0\n" " mov r2, #0x18\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " bl debug_sub_811B310\n" " ldrh r0, [r5, #0x8]\n" " add r0, r0, #0x1\n" @@ -4749,20 +4749,20 @@ void debug_sub_811B654() " beq ._83 @cond_branch\n" " mov r0, #0x3\n" " strh r0, [r5, #0x8]\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x9\n" " mov r3, #0x5\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._85\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._85 + 4\n" " mov r1, #0x1\n" " mov r2, #0x3\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " b ._116\n" "._86:\n" " .align 2, 0\n" @@ -4778,21 +4778,21 @@ void debug_sub_811B654() " strb r4, [r0]\n" " ldr r0, ._91 + 4\n" " strb r4, [r0]\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0xa\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r0, ._91 + 8\n" " mov r1, #0x1\n" " mov r2, #0x1\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r3, ._91 + 12\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x8\n" - " bl PrintMenuItems\n" + " bl Menu_PrintItems\n" " str r4, [sp]\n" " mov r0, #0x9\n" " str r0, [sp, #0x4]\n" @@ -4825,7 +4825,7 @@ void debug_sub_811B654() " .word _841B270\n" " .word unk_debug_bss_1+0x4\n" "._66:\n" - " bl ProcessMenuInput\n" + " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r2, r0, #0x18\n" " mov r0, #0x2\n" @@ -4845,7 +4845,7 @@ void debug_sub_811B654() " ldr r0, [r1]\n" " bl _call_via_r0\n" "._94:\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " add r0, r6, #0\n" " bl DestroyTask\n" " b ._116\n" @@ -4938,7 +4938,7 @@ void debug_sub_811B654() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._116 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " add r0, r6, #0\n" " bl DestroyTask\n" "._116:\n" @@ -4986,7 +4986,7 @@ void debug_sub_811B894() " ldr r0, ._122 + 8\n" " mov r1, #0x4\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._122 + 12\n" " mov r0, #0x0\n" " strb r0, [r1]\n" @@ -5027,7 +5027,7 @@ void debug_sub_811B894() " mov r1, #0x4\n" " mov r2, #0x2\n" "._121:\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r0, ._163 + 4\n" " strb r4, [r0]\n" "._126:\n" @@ -5181,7 +5181,7 @@ void debug_sub_811B894() " ldr r0, ._163 + 12\n" " mov r1, #0x4\n" " mov r2, #0x0\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._163 + 4\n" " mov r0, #0x0\n" " strb r0, [r1]\n" diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 36295b3f8..1e4eace87 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -278,11 +278,11 @@ void debug_sub_8075C40() " mov r2, #0x1\n" " mov r3, #0x8\n" " bl ConvertIntToDecimalStringN\n" - " bl MenuDisplayMessageBox\n" + " bl Menu_DisplayDialogueFrame\n" " ldr r0, ._16 + 16\n" " mov r1, #0x2\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" "._12:\n" " ldrh r0, [r5]\n" " add r0, r0, #0x1\n" @@ -303,7 +303,7 @@ void debug_sub_8075C40() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._18 @cond_branch\n" - " bl MenuZeroFillScreen\n" + " bl Menu_EraseScreen\n" " bl ScriptContext2_Disable\n" " add r0, r4, #0\n" " bl DestroyTask\n" diff --git a/sym_bss.txt b/sym_bss.txt index 6e95a609f..bc2ae107c 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -19,8 +19,16 @@ .include "src/engine/tileset_anim.o" .include "src/engine/sound.o" .include "src/field/field_weather.o" + .include "src/debug/tomomichi_debug_menu.o" + .include "src/debug/nohara_debug_menu.o" .include "src/field/field_effect.o" + .include "src/engine/trainer_card.o" .include "src/field/item_menu.o" + +@ debug +unk_debug_bss_3: + .space 0x4 + .include "src/field/shop.o" .include "src/engine/record_mixing.o" .include "src/field/tv.o" @@ -29,11 +37,13 @@ .include "src/pokenav_before.o" .include "src/field/mauville_man.o" .include "src/field/menu_helpers.o" + .include "src/field/slot_machine.o" .include "src/scene/contest_painting.o" .include "src/field/pokeblock.o" .include "src/field/field_specials.o" .include "src/pokemon/learn_move.o" .include "src/field/player_pc.o" + .include "src/debug/nakamura_debug_menu.o" .include "src/libs/m4a_1.o" .include "src/libs/agb_flash.o" .include "src/libs/siirtc.o" diff --git a/sym_common.txt b/sym_common.txt index cfb1b6b13..e31dd104b 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -68,6 +68,25 @@ gBattle_BG1_X: @ 30042C0 gBattle_WIN0H: @ 30042C4 .space 0xC +@ debug + +gUnknown_Debug_03004360: + .space 0x10 + +gUnknown_Debug_03004370: + .space 0x30 + +gUnknown_Debug_030043A0: + .space 4 + +gUnknown_Debug_030043A4: + .space 4 + +gUnknown_Debug_030043A8: + .space 8 + +@ end debug + gPreBattleCallback1: @ 30042D0 .space 0x4 diff --git a/sym_ewram.txt b/sym_ewram.txt index 1b3bbe7fe..e3ccb6283 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -319,6 +319,11 @@ gBattleMonForms: @ 2024E84 .include "src/scene/title_screen.o" .include "src/field/field_weather.o" .include "src/battle/battle_setup.o" + +unk_2030220: + .space 0x4 + + .include "src/debug/taya_debug_window.o" .include "src/field/wild_encounter.o" .include "src/field/field_effect.o" .include "src/scanline_effect.o" @@ -387,6 +392,7 @@ gUnknown_020384EC: @ 20384EC .include "src/field/item_menu.o" .include "src/contest.o" .include "src/field/shop.o" + .include "src/debug/watanabe_debug_menu.o" .include "src/field/money.o" .include "src/engine/record_mixing.o" .include "src/debug/sound_check_menu.o" @@ -454,6 +460,7 @@ gUnknown_0203926A: @ 203926A .include "src/engine/mystery_event_menu.o" .include "src/engine/save_failed_screen.o" .include "src/pokemon/pokeblock_feed.o" + .include "src/debug/nakamura_debug_menu.o" .include "src/scene/intro_credits_graphics.o" @ ??? -- cgit v1.2.3 From 6efb614f3f3bf1b1b381bdfe220391e152fc8ebe Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 15:49:51 -0600 Subject: add more debug things --- asm/cute_sketch.s | 343 +++++++ asm/pokemon_storage_system.s | 431 ++++++++ data/pokemon_storage_system.s | 14 + de_after.sh | 2 +- src/battle/battle_2.c | 140 +-- src/battle/battle_ai.c | 2 +- src/battle/battle_interface.c | 6 +- src/debug/nakamura_debug_menu.c | 6 +- src/debug/nohara_debug_menu.c | 4 +- src/debug/start_menu_debug.c | 32 +- src/debug/tomomichi_debug_menu.c | 14 +- src/debug/unk_debug_menu_3.c | 38 +- src/engine/save.c | 4 +- src/field/choose_party.c | 2 +- src/field/field_player_avatar.c | 99 +- src/field/field_weather.c | 181 ++++ src/field/fldeff_secretpower.c | 96 ++ src/field/mauville_man.c | 2 +- src/field/party_menu.c | 17 +- src/field/region_map.c | 4 +- src/field/slot_machine.c | 1863 ++++++++++++++++++++++++++++------ src/pokemon/mail.c | 75 ++ src/pokemon/pokemon_1.c | 12 +- src/pokemon/pokemon_storage_system.c | 3 +- 24 files changed, 2939 insertions(+), 451 deletions(-) diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s index 8cb6cdbd8..26bd642cb 100644 --- a/asm/cute_sketch.s +++ b/asm/cute_sketch.s @@ -5,6 +5,349 @@ .text +.if DEBUG + + thumb_func_start debug_sub_8110CCC +debug_sub_8110CCC: +.syntax divided + push {r4, r5, r6, r7, lr} + mov r7, #0x0 + mov r1, #0x0 + ldr r2, ._5 + ldr r6, ._5 + 4 +._7: + lsl r0, r1, #0x3 + add r4, r0, r2 + ldrh r0, [r6, #0x1c] + ldrh r3, [r4, #0x4] + cmp r0, r3 + bne ._1 @cond_branch + ldrh r0, [r4, #0x6] + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._4 @cond_branch + ldrb r0, [r6, #0x1f] + ldr r1, [r4] + lsl r0, r0, #0x2 + add r0, r0, r1 + ldr r0, [r0] + bl StringLength + mov r1, #0xc + sub r1, r1, r0 + lsl r1, r1, #0x10 + lsr r5, r1, #0x10 + cmp r1, #0 + bge ._3 @cond_branch + mov r5, #0x0 +._3: + mov r7, #0x1 + mov r0, #0x10 + mov r1, #0xe + mov r2, #0x1d + mov r3, #0x13 + bl MenuDrawTextWindow + add r0, r6, #0 + add r0, r0, #0x8 + mov r1, #0x11 + mov r2, #0xf + bl MenuPrint + ldrb r0, [r6, #0x1f] + ldr r1, [r4] + lsl r0, r0, #0x2 + add r0, r0, r1 + ldr r0, [r0] + add r1, r5, #0 + add r1, r1, #0x11 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + mov r2, #0x11 + bl MenuPrint + b ._4 +._6: + .align 2, 0 +._5: + .word gUnknown_083E79C0 + .word +0x2000000 +._1: + add r0, r1, #1 + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + cmp r1, #0 + beq ._7 @cond_branch +._4: + cmp r7, #0 + bne ._8 @cond_branch + mov r0, #0x10 + mov r1, #0x10 + mov r2, #0x1d + mov r3, #0x13 + bl MenuDrawTextWindow + ldr r0, ._9 + mov r1, #0x11 + mov r2, #0x11 + bl MenuPrint + mov r0, #0x10 + mov r1, #0xe + mov r2, #0x1d + mov r3, #0xf + bl MenuZeroFillWindowRect +._8: + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._10: + .align 2, 0 +._9: + .word +0x2000008 +.syntax unified + thumb_func_end debug_sub_8110CCC + + thumb_func_start debug_sub_8110D84 +debug_sub_8110D84: +.syntax divided + push {r4, lr} + add sp, sp, #0xfffffffc + ldr r0, ._13 + ldrh r0, [r0, #0x4] + cmp r0, #0x7 + bls ._11 @cond_branch + b ._65 +._11: + lsl r0, r0, #0x2 + ldr r1, ._13 + 4 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._14: + .align 2, 0 +._13: + .word +0x2000000 + .word ._15 +._15: + .word ._16 + .word ._17 + .word ._18 + .word ._19 + .word ._20 + .word ._21 + .word ._22 + .word ._23 +._16: + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x10 + mov r3, #0x0 + bl BeginNormalPaletteFade + ldr r1, ._25 + ldrh r0, [r1, #0x4] + add r0, r0, #0x1 + b ._62 +._26: + .align 2, 0 +._25: + .word +0x2000000 +._17: + bl UpdatePaletteFade + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._27 @cond_branch + b ._65 +._27: + ldr r1, ._30 + ldrh r0, [r1, #0x4] + add r0, r0, #0x1 + b ._62 +._31: + .align 2, 0 +._30: + .word +0x2000000 +._18: + bl sub_80FAB60 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x3 + beq ._32 @cond_branch + cmp r0, #0x3 + bgt ._33 @cond_branch + b ._65 +._33: + cmp r0, #0x4 + beq ._35 @cond_branch + cmp r0, #0x5 + beq ._36 @cond_branch + b ._65 +._35: + ldr r4, ._41 + ldrb r0, [r4, #0x1e] + cmp r0, #0 + bne ._38 @cond_branch + b ._65 +._38: + mov r0, #0x5 + bl gMysteryEventScriptCmdTableEnd+0x13c0 + ldr r1, ._41 + 4 + add r0, r4, r1 + mov r1, #0x1 + strb r1, [r0] + ldr r0, ._41 + 8 + bl sub_80FC244 + b ._65 +._42: + .align 2, 0 +._41: + .word +0x2000000 + .word 0xa6e + .word sub_80FC69C+1 +._36: + mov r0, #0x5 + bl gMysteryEventScriptCmdTableEnd+0x13c0 + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r1, ._44 + ldrh r0, [r1, #0x4] + add r0, r0, #0x1 + b ._62 +._45: + .align 2, 0 +._44: + .word +0x2000000 +._19: + bl UpdatePaletteFade + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._65 @cond_branch + ldr r0, ._48 + bl SetMainCallback2 + b ._65 +._49: + .align 2, 0 +._48: + .word sub_805469C+1 +._20: + bl sub_80FAB60 + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._50 @cond_branch +._32: + bl debug_sub_8110CCC + b ._65 +._50: + ldr r0, ._54 + ldrh r1, [r0, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._65 @cond_branch + bl sub_80FBCA0 + bl sub_80FAEC4 + ldr r1, ._54 + 4 + ldrh r0, [r1, #0x4] + add r0, r0, #0x1 + b ._62 +._55: + .align 2, 0 +._54: + .word gMain + .word +0x2000000 +._21: + bl sub_80FAFC0 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._65 @cond_branch + mov r0, #0x0 + mov r1, #0x0 + bl sub_80FBB3C + ldr r1, ._58 + ldrh r0, [r1, #0x4] + add r0, r0, #0x1 + b ._62 +._59: + .align 2, 0 +._58: + .word +0x2000000 +._22: + bl sub_80FAB60 + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._60 @cond_branch + bl debug_sub_8110CCC +._60: + ldr r0, ._63 + ldrh r1, [r0, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._65 @cond_branch + bl sub_80FBCA0 + bl sub_80FAEC4 + ldr r1, ._63 + 4 + ldrh r0, [r1, #0x4] + add r0, r0, #0x1 + b ._62 +._64: + .align 2, 0 +._63: + .word gMain + .word +0x2000000 +._23: + bl sub_80FAFC0 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._65 @cond_branch + mov r0, #0x0 + mov r1, #0x0 + bl sub_80FBB3C + ldr r1, ._66 + mov r0, #0x3 +._62: + strh r0, [r1, #0x4] +._65: + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._67: + .align 2, 0 +._66: + .word +0x2000000 +.syntax unified + thumb_func_end debug_sub_8110D84 + + thumb_func_start debug_sub_8110F28 +debug_sub_8110F28: +.syntax divided + push {lr} + bl sub_80FC074 + ldr r0, ._69 + ldr r1, [r0, #0x4] + ldr r0, ._69 + 4 + cmp r1, r0 + bne ._68 @cond_branch + bl sub_80FBF94 + ldr r0, ._69 + 8 + bl sub_80FC244 + bl debug_sub_8110CCC +._68: + pop {r0} + bx r0 +._70: + .align 2, 0 +._69: + .word gMain + .word sub_80FC228+1 + .word debug_sub_8110D84+1 +.syntax unified + thumb_func_end debug_sub_8110F28 + +.endif thumb_func_start sub_80FCB5C sub_80FCB5C: @ 80FCB5C diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 2ac873fcd..14b86a3d1 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1009,6 +1009,180 @@ _0809625C: .4byte gPokemonStorage + 0x8344 _08096260: .4byte gPCText_BOX thumb_func_end ResetPokemonStorageSystem +.ifdef DEBUG + thumb_func_start debug_sub_80A3904 +debug_sub_80A3904: +.syntax divided + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xffffffe4 + mov r0, #0x0 + mov r8, r0 + mov r7, r8 + mov r1, #0x14 + str r1, [sp, #0x18] + mov r2, #0xff + mov r9, r2 +._162: + mov r5, #0x0 + cmp r7, #0 + beq ._160 @cond_branch + mov r0, #0xe + mov r8, r0 + b ._158 +._160: + bl Random + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + str r0, [sp, #0x14] + mov r2, r8 + lsl r1, r2, #0x2 + add r1, r1, r8 + lsl r3, r1, #0x4 + sub r3, r3, r1 + lsl r3, r3, #0x5 + lsl r1, r5, #0x2 + add r1, r1, r5 + lsl r1, r1, #0x4 + ldr r2, ._163 + add r1, r1, r2 + add r6, r3, r1 + ldr r2, ._163 + 4 + lsl r1, r7, #0x1 + add r1, r1, r2 + ldrh r4, [r1] + add r5, r5, #0x1 + lsl r2, r5, #0x18 + lsr r2, r2, #0x18 + mov r1, #0x0 + str r1, [sp] + str r1, [sp, #0x4] + mov r1, #0x1 + mov sl, r1 + str r1, [sp, #0x8] + str r0, [sp, #0xc] + add r0, r6, #0 + add r1, r4, #0 + mov r3, #0x20 + bl CreateBoxMon + cmp r4, #0 + beq ._157 @cond_branch + cmp r4, #0xac + bne ._156 @cond_branch + add r0, sp, #0x10 + mov r2, sl + strb r2, [r0] + add r0, r6, #0 + mov r1, #0x2d + add r2, sp, #0x10 + bl SetBoxMonData +._156: + bl Random + mov r1, r9 + and r1, r1, r0 + str r1, [sp, #0x14] + add r4, sp, #0x14 + add r0, r6, #0 + mov r1, #0x16 + add r2, r4, #0 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + str r1, [sp, #0x14] + add r0, r6, #0 + mov r1, #0x17 + add r2, r4, #0 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + str r1, [sp, #0x14] + add r0, r6, #0 + mov r1, #0x18 + add r2, r4, #0 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + str r1, [sp, #0x14] + add r0, r6, #0 + mov r1, #0x21 + add r2, r4, #0 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + str r1, [sp, #0x14] + add r0, r6, #0 + mov r1, #0x2f + add r2, r4, #0 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + str r1, [sp, #0x14] + add r0, r6, #0 + mov r1, #0x30 + add r2, r4, #0 + bl SetBoxMonData + ldr r0, [sp, #0x18] + cmp r0, #0 + beq ._157 @cond_branch + sub r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + str r0, [sp, #0x18] + mov r1, sl + str r1, [sp, #0x14] + add r0, r6, #0 + mov r1, #0x32 + add r2, r4, #0 + bl SetBoxMonData +._157: + add r0, r7, #1 + lsl r0, r0, #0x10 + lsr r7, r0, #0x10 + lsl r0, r5, #0x10 + lsr r5, r0, #0x10 + cmp r5, #0x1d + bhi ._158 @cond_branch + cmp r7, #0 + bne ._159 @cond_branch + b ._160 +._159: + mov r2, #0xe + mov r8, r2 +._158: + mov r0, r8 + add r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r8, r0 + cmp r0, #0xd + bhi ._161 @cond_branch + b ._162 +._161: + add sp, sp, #0x1c + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._164: + .align 2, 0 +._163: + .word gPokemonStorage+0x4 + .word gUnknown_Debug_083E05F0 +.syntax unified + thumb_func_end debug_sub_80A3904 +.endif + thumb_func_start sub_8096264 sub_8096264: @ 8096264 push {r4-r6,lr} @@ -2073,6 +2247,119 @@ _08096AF4: .4byte gMain _08096AF8: .4byte 0x0000043c thumb_func_end sub_80969A0 +.ifdef DEBUG + + thumb_func_start debug_sub_80A4300 +debug_sub_80A4300: +.syntax divided + push {lr} + ldr r1, ._296 + mov r0, #0x0 + strb r0, [r1] + ldr r1, ._296 + 4 + mov r0, #0x0 + strb r0, [r1, #0x5] + bl sub_8096884 + ldr r0, ._296 + 8 + ldr r1, [r0, #0x4] + ldr r0, ._296 + 12 + cmp r1, r0 + bne ._295 @cond_branch + ldr r1, ._296 + 16 + mov r0, #0x1 + strb r0, [r1] +._295: + pop {r0} + bx r0 +._297: + .align 2, 0 +._296: + .word gUnknown_0203847D + .word +0x2000000 + .word gMain + .word sub_8096B38+1 + .word unk_2038790 +.syntax unified + thumb_func_end debug_sub_80A4300 + + thumb_func_start debug_sub_80A433C +debug_sub_80A433C: +.syntax divided + push {lr} + ldr r2, ._298 + str r1, [r2] + ldr r1, ._298 + 4 + str r0, [r1] + ldr r0, ._298 + 8 + bl SetMainCallback2 + pop {r0} + bx r0 +._299: + .align 2, 0 +._298: + .word unk_2038794 + .word unk_2038798 + .word debug_sub_80A4300+1 +.syntax unified + thumb_func_end debug_sub_80A433C + + thumb_func_start debug_sub_80A435C +debug_sub_80A435C: +.syntax divided + push {r4, r5, lr} + add sp, sp, #0xfffffffc + ldr r5, ._303 + ldrb r4, [r5, #0x4] + cmp r4, #0 + beq ._300 @cond_branch + cmp r4, #0x1 + beq ._301 @cond_branch + b ._308 +._304: + .align 2, 0 +._303: + .word +0x2000000 +._300: + ldr r0, ._306 + ldr r0, [r0] + bl unref_sub_809CB94 + mov r0, #0x1 + neg r0, r0 + str r4, [sp] + mov r1, #0x0 + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldrb r0, [r5, #0x4] + add r0, r0, #0x1 + strb r0, [r5, #0x4] + b ._308 +._307: + .align 2, 0 +._306: + .word unk_2038798 +._301: + bl UpdatePaletteFade + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._308 @cond_branch + ldr r0, ._309 + ldr r0, [r0] + bl _call_via_r0 +._308: + add sp, sp, #0x4 + pop {r4, r5} + pop {r0} + bx r0 +._310: + .align 2, 0 +._309: + .word unk_2038794 +.syntax unified + thumb_func_end debug_sub_80A435C + +.endif + thumb_func_start sub_8096AFC sub_8096AFC: @ 8096AFC push {lr} @@ -13963,6 +14250,149 @@ sub_809CA8C: @ 809CA8C bx r0 thumb_func_end sub_809CA8C +.ifdef DEBUG + thumb_func_start debug_sub_80AA40C +debug_sub_80AA40C: +.syntax divided + push {lr} + bl sub_809AB8C + lsl r0, r0, #0x10 + cmp r0, #0 + beq ._2084 @cond_branch + bl sub_809CDCC + mov r0, #0x20 + bl sub_809CDEC + mov r0, #0x6 + bl sub_809CDEC + mov r0, #0x1 + b ._2085 +._2084: + mov r0, #0x0 +._2085: + pop {r1} + bx r1 +.syntax unified + thumb_func_end debug_sub_80AA40C +.endif + +.if DEBUG + thumb_func_start sub_809CAB0 +sub_809CAB0: +.syntax divided + push {lr} + ldr r0, ._2088 + ldrb r0, [r0] + cmp r0, #0 + beq ._2086 @cond_branch + bl debug_sub_80AA40C + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._2110 +._2089: + .align 2, 0 +._2088: + .word unk_2038790 +._2086: + bl sub_809CDCC + bl sub_809AB8C + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + ldr r0, ._2094 + ldr r0, [r0] + ldrb r0, [r0, #0x5] + cmp r0, #0x1 + beq ._2090 @cond_branch + cmp r0, #0x1 + bgt ._2091 @cond_branch + cmp r0, #0 + beq ._2092 @cond_branch + b ._2108 +._2095: + .align 2, 0 +._2094: + .word gUnknown_083B6DB4 +._2091: + cmp r0, #0x2 + beq ._2096 @cond_branch + b ._2108 +._2090: + cmp r1, #0 + beq ._2108 @cond_branch + mov r0, #0x1 + bl sub_809CDEC + b ._2109 +._2092: + cmp r1, #0 + beq ._2108 @cond_branch + mov r0, #0x2 + bl sub_809CDEC + b ._2109 +._2096: + ldr r0, ._2105 + ldrb r0, [r0] + cmp r0, #0 + beq ._2102 @cond_branch + cmp r1, #0 + beq ._2103 @cond_branch + mov r0, #0x4 + bl sub_809CDEC + b ._2109 +._2106: + .align 2, 0 +._2105: + .word gUnknown_020384E6 +._2103: + mov r0, #0x5 + bl sub_809CDEC + b ._2109 +._2102: + cmp r1, #0 + beq ._2108 @cond_branch + mov r0, #0x3 + bl sub_809CDEC + b ._2109 +._2108: + mov r0, #0x0 + b ._2110 +._2109: + mov r0, #0x6 + bl sub_809CDEC + ldr r0, ._2114 + ldr r0, [r0] + ldrb r0, [r0, #0x5] + cmp r0, #0x2 + bne ._2113 @cond_branch + ldr r0, ._2114 + 4 + ldrb r0, [r0] + lsl r0, r0, #0x18 + asr r0, r0, #0x18 + cmp r0, #0 + bne ._2112 @cond_branch + mov r0, #0x2 + bl sub_809CDEC + b ._2113 +._2115: + .align 2, 0 +._2114: + .word gUnknown_083B6DB4 + .word gUnknown_020384E4 +._2112: + mov r0, #0x1 + bl sub_809CDEC +._2113: + mov r0, #0x8 + bl sub_809CDEC + mov r0, #0x7 + bl sub_809CDEC + mov r0, #0x0 + bl sub_809CDEC + mov r0, #0x1 +._2110: + pop {r1} + bx r1 +.syntax unified + thumb_func_end sub_809CAB0 +.else thumb_func_start sub_809CAB0 sub_809CAB0: @ 809CAB0 push {lr} @@ -14058,6 +14488,7 @@ _0809CB6E: pop {r1} bx r1 thumb_func_end sub_809CAB0 +.endif thumb_func_start sub_809CB74 sub_809CB74: @ 809CB74 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index a3b7494dc..128f276f2 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -10,6 +10,12 @@ gUnknown_083B600C:: @ 83B600C .4byte PCText_MovePoke, PCText_OrganizeBoxesParty .4byte PCText_SeeYa, PCText_ReturnToPrevMenu +.if DEBUG +gUnknown_Debug_083E05F0:: @ 0x83E05F0 + .2byte 0 + .2byte 0 +.endif + .align 2 gSpriteAnim_83B602C:: @ 83B602C obj_image_anim_frame 0, 5 @@ -750,6 +756,11 @@ gSpriteTemplate_83BBC70:: @ 83BBC70 gSpriteTemplate_83BBC88:: @ 83BBC88 spr_template 1, 56006, gOamData_83BBC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_809CB74 +.if DEBUG +gUnknown_Debug_0x83E6268:: @ 0x83E6268 + .string "セットする$" +.endif + .align 2 gUnknown_083BBCA0:: @ 83BBCA0 .4byte PCText_Cancel2 @@ -784,3 +795,6 @@ gUnknown_083BBCA0:: @ 83BBCA0 .4byte PCText_PokeCenter .4byte PCText_Machine .4byte PCText_Plain +.if DEBUG + .4byte gUnknown_Debug_0x83E6268 +.endif diff --git a/de_after.sh b/de_after.sh index 60855b738..92f940d8d 100755 --- a/de_after.sh +++ b/de_after.sh @@ -1,2 +1,2 @@ -git checkout override.mk asm/ data/ graphics +git checkout override.mk data/ graphics rm data/ingame_trades.inc diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 78fc35ba5..454b47e08 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -220,7 +220,7 @@ void InitBattle(void) " lsl r1, r1, #0x13\n" " ldr r2, ._10\n" " mov r0, sp\n" - " bl gScriptFuncs_End+0x3cb4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" " ldr r0, ._10 + 4\n" " strh r4, [r0]\n" " sub r0, r0, #0xc\n" @@ -347,13 +347,13 @@ void InitBattle(void) " .word 0xff10\n" " .word gWindowConfig_81E6C58\n" " .word gUnknown_030042A4\n" - " .word gUnknown_030042A0\n" + " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" - " .word gUnknown_030041B4\n" - " .word gUnknown_03004288\n" - " .word gUnknown_03004280\n" - " .word gUnknown_030041B0\n" - " .word gUnknown_030041B8\n" + " .word gBattle_BG1_Y\n" + " .word gBattle_BG2_X\n" + " .word gBattle_BG2_Y\n" + " .word gBattle_BG3_X\n" + " .word gBattle_BG3_Y\n" " .word gUnknown_02023A14+0x50\n" " .word gBattleTerrain\n" " .word gUnknown_03004210\n" @@ -907,7 +907,7 @@ void sub_800EC9C() " ldr r2, ._116 + 4\n" " add r1, r1, r2\n" " mov r2, #0xc8\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " b ._129\n" "._117:\n" " .align 2, 0\n" @@ -946,7 +946,7 @@ void sub_800EC9C() " ldr r2, ._126 + 4\n" " add r1, r1, r2\n" " mov r2, #0xc8\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " b ._129\n" "._127:\n" " .align 2, 0\n" @@ -982,7 +982,7 @@ void sub_800EC9C() " add r1, r1, r0\n" " add r0, r4, #0\n" " mov r2, #0xc8\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " ldr r1, ._134 + 8\n" " add r0, r4, r1\n" " bl shedinja_something\n" @@ -1407,7 +1407,7 @@ void sub_800F104() " add r1, r1, r0\n" " ldr r0, ._177 + 4\n" " mov r2, #0x60\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" "._174:\n" " add r7, r7, #0x1c\n" " add r4, r4, #0x1\n" @@ -1781,7 +1781,7 @@ void sub_800F298() " ldr r1, ._239 + 4\n" " mov r2, #0x96\n" " lsl r2, r2, #0x1\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " ldr r0, ._239 + 8\n" " mov r1, #0x0\n" " bl CreateTask\n" @@ -2018,7 +2018,7 @@ void sub_800F298() "._283:\n" " add r1, r5, #0\n" " mov r2, #0xc8\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " b ._291\n" "._293:\n" " .align 2, 0\n" @@ -2028,7 +2028,7 @@ void sub_800F298() " ldr r0, ._296\n" " add r1, r5, #0\n" " mov r2, #0xc8\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" "._291:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -2185,7 +2185,7 @@ void sub_800F298() "._333:\n" " add r1, r5, #0\n" " mov r2, #0x64\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " b ._341\n" "._343:\n" " .align 2, 0\n" @@ -2195,7 +2195,7 @@ void sub_800F298() " ldr r0, ._346\n" " add r1, r5, #0\n" " mov r2, #0x64\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" "._341:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -2627,7 +2627,7 @@ void BattleMainCB2(void) " str r0, [r4]\n" " bl ZeroEnemyPartyMons\n" " mov r0, #0x5a\n" - " bl gScriptFuncs_End+0x148c\n" + " bl gMysteryEventScriptCmdTableEnd+0x148c\n" " ldr r0, ._358 + 24\n" " ldrh r1, [r0]\n" " mov r0, #0x2\n" @@ -3197,7 +3197,7 @@ void debug_sub_80108B8() asm( " push {r4, r5, lr}\n" " add sp, sp, #0xfffffffc\n" - " bl gScriptFuncs_End+0x19f4\n" + " bl gMysteryEventScriptCmdTableEnd+0x19f4\n" " mov r0, #0x0\n" " bl SetHBlankCallback\n" " mov r0, #0x0\n" @@ -3264,7 +3264,7 @@ void debug_sub_80108B8() " ldr r1, ._507 + 72\n" " add r0, r4, #0\n" " bl LZDecompressVram\n" - " bl gScriptFuncs_End+0x1a70\n" + " bl gMysteryEventScriptCmdTableEnd+0x1a70\n" " ldr r0, ._507 + 76\n" " bl SetVBlankCallback\n" " ldr r0, ._507 + 80\n" @@ -3333,13 +3333,13 @@ void debug_sub_80108B8() " .word 0x85006000\n" " .word 0x4000200\n" " .word gUnknown_030042A4\n" - " .word gUnknown_030042A0\n" + " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" - " .word gUnknown_030041B4\n" - " .word gUnknown_03004288\n" - " .word gUnknown_03004280\n" - " .word gUnknown_030041B0\n" - " .word gUnknown_030041B8\n" + " .word gBattle_BG1_Y\n" + " .word gBattle_BG2_X\n" + " .word gBattle_BG2_Y\n" + " .word gBattle_BG3_X\n" + " .word gBattle_BG3_Y\n" " .word 0x1f09\n" " .word 0x4801\n" " .word 0x4000050\n" @@ -3860,7 +3860,7 @@ void debug_sub_8010CAC() " strb r0, [r3, #0x15]\n" " lsl r0, r0, #0x1f\n" " lsr r0, r0, #0x1f\n" - " bl gScriptFuncs_End+0x2aa0\n" + " bl gMysteryEventScriptCmdTableEnd+0x2aa0\n" " bl debug_nullsub_3\n" "._559:\n" " ldr r4, ._565 + 12\n" @@ -4774,7 +4774,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x4358\n" + " bl gMysteryEventScriptCmdTableEnd+0x4358\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4830,7 +4830,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x4358\n" + " bl gMysteryEventScriptCmdTableEnd+0x4358\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4886,7 +4886,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x4358\n" + " bl gMysteryEventScriptCmdTableEnd+0x4358\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4929,7 +4929,7 @@ void debug_sub_8011498() " lsl r4, r5, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x4358\n" + " bl gMysteryEventScriptCmdTableEnd+0x4358\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4965,7 +4965,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x4358\n" + " bl gMysteryEventScriptCmdTableEnd+0x4358\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -5002,7 +5002,7 @@ void debug_sub_8011498() " lsl r4, r5, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x4358\n" + " bl gMysteryEventScriptCmdTableEnd+0x4358\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -5200,7 +5200,7 @@ void debug_sub_801174C() "._713:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" " ldr r1, ._719\n" @@ -5223,7 +5223,7 @@ void debug_sub_801174C() "._699:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " mov r2, #0x64\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" @@ -5282,7 +5282,7 @@ void debug_sub_801174C() " str r0, [sp, #0xc]\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" " ldr r1, ._726\n" @@ -5355,7 +5355,7 @@ void debug_sub_801174C() "._735:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " mov r2, #0x64\n" " mul r0, r0, r2\n" " ldr r1, ._741\n" @@ -5382,7 +5382,7 @@ void debug_sub_801174C() "._721:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " mov r2, #0x64\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" @@ -5441,7 +5441,7 @@ void debug_sub_801174C() " str r0, [sp, #0xc]\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " mov r2, #0x64\n" " mul r0, r0, r2\n" " ldr r1, ._750\n" @@ -5460,7 +5460,7 @@ void debug_sub_801174C() " ble ._743 @cond_branch\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" " ldr r1, ._750\n" @@ -5838,13 +5838,13 @@ void debug_sub_8011D40() " .word 0x6004000\n" " .word 0x80000800\n" " .word gUnknown_030042A4\n" - " .word gUnknown_030042A0\n" + " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" - " .word gUnknown_030041B4\n" - " .word gUnknown_03004288\n" - " .word gUnknown_03004280\n" - " .word gUnknown_030041B0\n" - " .word gUnknown_030041B8\n" + " .word gBattle_BG1_Y\n" + " .word gBattle_BG2_X\n" + " .word gBattle_BG2_Y\n" + " .word gBattle_BG3_X\n" + " .word gBattle_BG3_Y\n" "\n" ); } @@ -5911,13 +5911,13 @@ void debug_sub_8011DD4() " .word 0x4000008\n" " .word 0x9803\n" " .word gUnknown_030042A4\n" - " .word gUnknown_030042A0\n" + " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" - " .word gUnknown_030041B4\n" - " .word gUnknown_03004288\n" - " .word gUnknown_03004280\n" - " .word gUnknown_030041B0\n" - " .word gUnknown_030041B8\n" + " .word gBattle_BG1_Y\n" + " .word gBattle_BG2_X\n" + " .word gBattle_BG2_Y\n" + " .word gBattle_BG3_X\n" + " .word gBattle_BG3_Y\n" "\n" ); } @@ -6483,7 +6483,7 @@ void debug_sub_8012294() " lsl r4, r4, #0x1\n" " add r0, r5, #0\n" " mov r1, #0x5\n" - " bl gScriptFuncs_End+0x4358\n" + " bl gMysteryEventScriptCmdTableEnd+0x4358\n" " add r5, r0, #0\n" " lsl r5, r5, #0x18\n" " lsr r5, r5, #0x15\n" @@ -7102,7 +7102,7 @@ void debug_sub_8012688() " bl SetHBlankCallback\n" " ldr r0, ._873 + 100\n" " bl SetVBlankCallback\n" - " bl gScriptFuncs_End+0x14f4\n" + " bl gMysteryEventScriptCmdTableEnd+0x14f4\n" " ldr r0, ._873 + 104\n" " mov r1, #0x0\n" " bl CreateTask\n" @@ -7132,13 +7132,13 @@ void debug_sub_8012688() " .word 0x400004c\n" " .word gWindowConfig_81E6C58\n" " .word gUnknown_030042A4\n" - " .word gUnknown_030042A0\n" + " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" - " .word gUnknown_030041B4\n" - " .word gUnknown_03004288\n" - " .word gUnknown_03004280\n" - " .word gUnknown_030041B0\n" - " .word gUnknown_030041B8\n" + " .word gBattle_BG1_Y\n" + " .word gBattle_BG2_X\n" + " .word gBattle_BG2_Y\n" + " .word gBattle_BG3_X\n" + " .word gBattle_BG3_Y\n" " .word gBattleTerrain\n" " .word gReservedSpritePaletteCount\n" " .word gCurrentMove\n" @@ -7764,7 +7764,7 @@ void debug_sub_8012C08() " .word gTasks\n" " .word UnkDebug0+0x432\n" " .word gUnknown_03004210\n" - " .word gUnknown_08400D7A\n" + " .word BattleText_YesNo\n" "\n" ); } @@ -8484,7 +8484,7 @@ void debug_sub_8013240() { asm( " push {lr}\n" - " bl gScriptFuncs_End+0x2fec\n" + " bl gMysteryEventScriptCmdTableEnd+0x2fec\n" " lsl r0, r0, #0x10\n" " cmp r0, #0\n" " beq ._1068 @cond_branch\n" @@ -8519,7 +8519,7 @@ void debug_sub_8013258() " lsr r4, r0, #0x10\n" " add r0, r4, #0\n" " add r1, r6, #0\n" - " bl gScriptFuncs_End+0x2f60\n" + " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" " cmp r0, #0\n" " bne ._1071 @cond_branch\n" " mov r0, #0x80\n" @@ -8555,13 +8555,13 @@ void debug_sub_8013294() " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " bne ._1076 @cond_branch\n" - " bl gScriptFuncs_End+0x19f4\n" + " bl gMysteryEventScriptCmdTableEnd+0x19f4\n" " add r0, r4, #0\n" " add r1, r5, #0\n" " add r2, r6, #0\n" " bl debug_sub_8013258\n" " add r4, r0, #0\n" - " bl gScriptFuncs_End+0x1a70\n" + " bl gMysteryEventScriptCmdTableEnd+0x1a70\n" " add r0, r4, #0\n" " b ._1077\n" "._1076:\n" @@ -8591,7 +8591,7 @@ void debug_sub_80132C8() " mov r1, #0x0\n" " add r2, r5, #0\n" " add r3, r6, #0\n" - " bl gScriptFuncs_End+0x2d64\n" + " bl gMysteryEventScriptCmdTableEnd+0x2d64\n" "._1078:\n" " pop {r4, r5, r6}\n" " pop {r0}\n" @@ -9066,7 +9066,7 @@ void debug_sub_80139E4() "._1193:\n" " ldr r0, ._1198 + 12\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " ldr r1, ._1198 + 4\n" " mov r0, #0x0\n" " strb r0, [r1]\n" @@ -9081,7 +9081,7 @@ void debug_sub_80139E4() " lsl r0, r0, #0x2\n" " add r0, r0, r5\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " ldrb r0, [r4]\n" " add r0, r0, #0x1\n" " strb r0, [r4]\n" @@ -9103,7 +9103,7 @@ void debug_sub_80139E4() "._1192:\n" " ldr r0, ._1202\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " ldr r1, ._1202 + 4\n" " strb r4, [r1]\n" " ldr r0, ._1202 + 8\n" @@ -9117,7 +9117,7 @@ void debug_sub_80139E4() " lsl r0, r0, #0x2\n" " add r0, r0, r5\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " ldrb r0, [r4]\n" " add r0, r0, #0x1\n" " strb r0, [r4]\n" @@ -9349,7 +9349,7 @@ void sub_8010874() " mov r0, #0x64\n" " mul r0, r0, r1\n" " ldr r1, ._1215 + 160\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " ldr r2, ._1215 + 164\n" " add r1, r4, r2\n" " strb r0, [r1]\n" diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 938d0fde1..ffc9281e4 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -318,7 +318,7 @@ void BattleAI_SetupAIData() " ldrb r0, [r3]\n" " mov r1, #0x0\n" " mov r2, #0xff\n" - " bl sub_8015A98\n" + " bl CheckMoveLimitations\n" " lsl r0, r0, #0x18\n" " lsr r7, r0, #0x18\n" " mov r4, #0x0\n" diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index b19547d52..1b6240159 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -1405,7 +1405,7 @@ void sub_804454C() " add r1, r1, r0\n" " mov r0, sp\n" " ldr r2, ._150 + 36\n" - " bl gScriptFuncs_End+0x3cb4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" " ldrb r4, [r5]\n" " ldrh r0, [r7]\n" " mov r1, sl\n" @@ -1467,7 +1467,7 @@ void sub_804454C() " ldr r2, ._153 + 4\n" " add r1, r1, r2\n" " ldr r2, ._153 + 8\n" - " bl gScriptFuncs_End+0x3cb4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" " b ._163\n" "._154:\n" " .align 2, 0\n" @@ -1521,7 +1521,7 @@ void sub_804454C() " add r1, r1, r6\n" " mov r0, sp\n" " ldr r2, ._161 + 4\n" - " bl gScriptFuncs_End+0x3cb4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" " ldrb r4, [r5]\n" " ldrh r0, [r7]\n" " mov r1, sl\n" diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 1d36d528f..b86fa0abf 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -2237,7 +2237,7 @@ void debug_sub_815FFDC() " mov r0, #0xf\n" " mov r1, #0x1\n" " mov r2, #0xff\n" - " bl unref_sub_80F924C\n" + " bl PrintTriangleCursorWithPalette\n" " ldr r1, ._217 + 4\n" " ldr r0, ._217 + 8\n" " str r0, [r1]\n" @@ -2831,7 +2831,7 @@ void debug_sub_81603B8() " lsl r1, r1, #0x18\n" " lsr r1, r1, #0x18\n" " mov r2, #0xff\n" - " bl unref_sub_80F924C\n" + " bl PrintTriangleCursorWithPalette\n" " pop {r4, r5, r6, r7}\n" " pop {r0}\n" " bx r0\n" @@ -3206,7 +3206,7 @@ void debug_sub_8160714() " lsr r1, r1, #0x18\n" " mov r0, r9\n" " str r2, [sp, #0xc]\n" - " bl sub_810CA9C\n" + " bl GetPokeblockData\n" " add r1, r0, #0\n" " lsl r0, r5, #0x1\n" " add r0, r0, sp\n" diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index f929170fd..766137871 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -2177,7 +2177,7 @@ void NoharaDebugMenu_SootopolisCity() " mov r0, #0x71\n" " bl FlagSet\n" " ldr r0, ._227\n" - " bl FlagReset\n" + " bl FlagClear\n" " bl CloseMenu\n" " mov r0, #0x1\n" " pop {r1}\n" @@ -2196,7 +2196,7 @@ void NoharaDebugMenu_Embark() asm( " push {lr}\n" " ldr r0, ._229\n" - " bl FlagReset\n" + " bl FlagClear\n" " ldr r0, ._229 + 4\n" " mov r1, #0x1\n" " bl VarSet\n" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 6f9f0d02c..e4ae404e2 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -170,7 +170,7 @@ void debug_sub_8076BB4() " add r2, r2, #0x4\n" " add r0, r0, r2\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " b ._24\n" "._14:\n" " .align 2, 0\n" @@ -886,7 +886,7 @@ void DebugMenu_8077020() " lsr r4, r0, #0x18\n" " ldr r0, ._109\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r0, #0x1\n" @@ -1058,7 +1058,7 @@ void DebugMenu_807709C() " add r1, r1, #0x4\n" " add r0, r0, r1\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " b ._132\n" @@ -1185,18 +1185,18 @@ void DebugMenu_8077238() " ldr r1, ._139\n" " mov r0, sp\n" " mov r2, #0x2\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, sp, #0x4\n" " mov r9, r0\n" " ldr r1, ._139 + 4\n" " mov r2, #0x3\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r1, sp, #0x8\n" " mov sl, r1\n" " ldr r1, ._139 + 8\n" " mov r0, sl\n" " mov r2, #0x3\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " mov r2, #0x0\n" " str r2, [sp, #0x14]\n" " add r4, sp, #0x10\n" @@ -1930,7 +1930,7 @@ void DebugMenu_80776B4() " ldr r1, ._183\n" " mov r0, sp\n" " mov r2, #0x7\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " lsl r3, r4, #0x1\n" " lsl r5, r4, #0x19\n" " lsr r5, r5, #0x18\n" @@ -1973,7 +1973,7 @@ void DebugMenu_8077704() " ldr r1, ._185\n" " mov r0, sp\n" " mov r2, #0x11\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " mov r0, #0x13\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" @@ -2172,7 +2172,7 @@ void DebugMenu_807786C() " ldr r1, ._205\n" " mov r0, sp\n" " mov r2, #0x7\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " mov r0, #0x19\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" @@ -2871,7 +2871,7 @@ void DebugMenu_8077C3C() " add r0, r2, #0\n" " mov r1, #0xa\n" " str r3, [sp]\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " add r2, r0, #0\n" " ldr r3, [sp]\n" " cmp r4, r6\n" @@ -3983,7 +3983,7 @@ void DebugMenu_80783C8() " .word 0x804\n" "._381:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" " mov r0, #0x1\n" " bl DebugMenu_807786C\n" "._382:\n" @@ -4075,7 +4075,7 @@ void DebugMenu_8078464() " b ._401\n" "._392:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" " b ._401\n" "._398:\n" " add r0, r4, #0\n" @@ -5578,7 +5578,7 @@ void DebugMenu_8078E04() " lsr r4, r0, #0x10\n" " add r0, r4, #0\n" " add r1, r6, #0\n" - " bl gScriptFuncs_End+0x2f60\n" + " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" " cmp r0, #0\n" " bne ._576 @cond_branch\n" " mov r0, #0x80\n" @@ -5611,13 +5611,13 @@ void DebugMenu_8078E40() " add r6, r2, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl gScriptFuncs_End+0x19f4\n" + " bl gMysteryEventScriptCmdTableEnd+0x19f4\n" " add r0, r4, #0\n" " add r1, r5, #0\n" " add r2, r6, #0\n" " bl DebugMenu_8078E04\n" " add r4, r0, #0\n" - " bl gScriptFuncs_End+0x1a70\n" + " bl gMysteryEventScriptCmdTableEnd+0x1a70\n" " add r0, r4, #0\n" " pop {r4, r5, r6}\n" " pop {r1}\n" @@ -5637,7 +5637,7 @@ void DebugMenu_8078E68() " lsr r0, r0, #0x18\n" " mov r1, #0x0\n" " add r2, r4, #0\n" - " bl gScriptFuncs_End+0x2d64\n" + " bl gMysteryEventScriptCmdTableEnd+0x2d64\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index cc2bdd80e..2d9074d19 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -2197,7 +2197,7 @@ void debug_sub_808C714() " .word gUnknown_Debug_083C31DC+0xa\n" "._189:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" "._190:\n" " pop {r4}\n" " pop {r0}\n" @@ -2857,7 +2857,7 @@ void debug_sub_808CBC0() " .word gUnknown_Debug_083C2710+0xa\n" "._229:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" "._230:\n" " pop {r4}\n" " pop {r0}\n" @@ -3235,7 +3235,7 @@ void debug_sub_808CE5C() " .word gUnknown_Debug_083C1C34+0x4\n" "._257:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" "._258:\n" " pop {r4}\n" " pop {r0}\n" @@ -3895,7 +3895,7 @@ void debug_sub_808D308() " .word gUnknown_Debug_083C19C6\n" "._297:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" "._298:\n" " pop {r4}\n" " pop {r0}\n" @@ -4226,7 +4226,7 @@ void debug_sub_808D54C() " .word gUnknown_Debug_083C1194+0x2\n" "._323:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" "._324:\n" " pop {r4}\n" " pop {r0}\n" @@ -4557,7 +4557,7 @@ void debug_sub_808D790() " .word gUnknown_Debug_083C12D0+0x2\n" "._349:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" "._350:\n" " pop {r4}\n" " pop {r0}\n" @@ -4840,7 +4840,7 @@ void debug_sub_808D97C() " .word gUnknown_Debug_083C1AAC+0x2\n" "._373:\n" " add r0, r4, #0\n" - " bl FlagReset\n" + " bl FlagClear\n" "._374:\n" " pop {r4}\n" " pop {r0}\n" diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c index 70e194907..a217a0258 100644 --- a/src/debug/unk_debug_menu_3.c +++ b/src/debug/unk_debug_menu_3.c @@ -9,7 +9,7 @@ void debug_sub_813C404() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -37,7 +37,7 @@ void debug_sub_813C430() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -65,7 +65,7 @@ void debug_sub_813C45C() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -93,7 +93,7 @@ void debug_sub_813C488() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -119,7 +119,7 @@ void debug_sub_813C4B4() " ldr r1, ._9 + 4\n" " sub r4, r4, r1\n" " add r2, r4, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r4, #0\n" " pop {r4}\n" " pop {r1}\n" @@ -144,7 +144,7 @@ void debug_sub_813C4D4() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_81261B4\n" @@ -172,7 +172,7 @@ void debug_sub_813C500() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -207,7 +207,7 @@ void debug_sub_813C52C() " mov r0, r8\n" " add r1, r4, #0\n" " add r2, r6, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " ldr r0, ._15 + 8\n" " sub r0, r0, r4\n" " add r0, r0, r8\n" @@ -517,7 +517,7 @@ void debug_sub_813C740() " add r0, r6, #0\n" " mov r1, r8\n" " mov r2, r9\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r5, #0\n" " mov r1, #0x19\n" " mov r2, #0x5\n" @@ -564,7 +564,7 @@ void debug_sub_813C740() " sub r0, r0, r1\n" " add r1, r5, #0\n" " mov r2, #0x64\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " ldr r0, ._29 + 20\n" " add r6, r6, r0\n" " mov r0, r8\n" @@ -572,7 +572,7 @@ void debug_sub_813C740() " add r0, r6, #0\n" " mov r1, sp\n" " mov r2, #0x24\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " mov r0, r9\n" " add sp, sp, #0x30\n" " pop {r3, r4, r5}\n" @@ -612,7 +612,7 @@ void debug_sub_813C810() " add r0, r6, #0\n" " add r1, r5, #0\n" " mov r2, r8\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r4, #0\n" " mov r1, #0xc9\n" " mov r2, #0x15\n" @@ -626,13 +626,13 @@ void debug_sub_813C810() " sub r0, r0, r5\n" " add r1, r4, #0\n" " mov r2, #0x64\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " ldr r0, ._31 + 16\n" " add r0, r6, r0\n" " sub r0, r0, r5\n" " mov r1, sp\n" " mov r2, #0x24\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r5, #0\n" " bl unref_sub_812620C\n" @@ -672,7 +672,7 @@ void debug_sub_813C888() " add r0, r6, #0\n" " add r1, r5, #0\n" " mov r2, r8\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r4, #0\n" " mov r1, #0xc9\n" " mov r2, #0x15\n" @@ -688,13 +688,13 @@ void debug_sub_813C888() " sub r0, r0, r5\n" " add r1, r4, #0\n" " mov r2, #0x64\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " ldr r0, ._33 + 16\n" " add r0, r6, r0\n" " sub r0, r0, r5\n" " mov r1, sp\n" " mov r2, #0x24\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r6, #0\n" " add r1, r5, #0\n" " bl unref_sub_812620C\n" @@ -763,7 +763,7 @@ void debug_sub_813C93C() " sub r5, r5, r6\n" " add r1, r6, #0\n" " add r2, r5, #0\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " bl SavePlayerParty\n" " bl debug_sub_813C904\n" " ldr r1, ._37 + 8\n" @@ -777,7 +777,7 @@ void debug_sub_813C93C() " add r0, r4, #0\n" " mov r1, sp\n" " mov r2, #0xbc\n" - " bl gScriptFuncs_End+0x5bc4\n" + " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" " add r0, r5, #0\n" " add sp, sp, #0xbc\n" " pop {r4, r5, r6}\n" diff --git a/src/engine/save.c b/src/engine/save.c index 5564a6ce3..e1fb47dcc 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -690,7 +690,7 @@ void sub_813B79C() " strh r0, [r1]\n" " add r0, r5, #0\n" " add r1, r4, #0\n" - " bl gScriptFuncs_End+0x2f60\n" + " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" @@ -718,7 +718,7 @@ void sub_813B79C() " lsr r4, r4, #0x10\n" " add r0, r4, #0\n" " add r1, r6, #0\n" - " bl gScriptFuncs_End+0x2f60\n" + " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" diff --git a/src/field/choose_party.c b/src/field/choose_party.c index 545c19dfa..8a54b0ad0 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -540,7 +540,7 @@ void debug_sub_81381B4() " add r0, r4, #0\n" " mov r1, #0x0\n" " mov r2, #0x60\n" - " bl gScriptFuncs_End+0x5c24\n" + " bl gMysteryEventScriptCmdTableEnd+0x5c24\n" " mov r7, #0x0\n" " mov r8, r4\n" " mov r0, #0x4\n" diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 747edf816..db674e52f 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -291,7 +291,7 @@ u8 TryDoMetatileBehaviorForcedMovement() " lsr r0, r0, #0x16\n" " add r0, r0, r4\n" " ldr r0, [r0]\n" - " bl gScriptFuncs_End+0x3cf4\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" "._26:\n" @@ -513,7 +513,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161) " ldr r2, [r0]\n" " add r0, r5, #0\n" " add r1, r6, #0\n" - " bl gScriptFuncs_End+0x3cfc\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cfc\n" "._83:\n" " pop {r4, r5, r6}\n" " pop {r0}\n" @@ -1855,3 +1855,98 @@ static void sub_805A954(void) if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1A, 1, playerSprite->pos2.y); } + +#if DEBUG +__attribute__((naked)) +void debug_sub_805F2B0() +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r2, r0, #0x18\n" + " ldr r0, ._422\n" + " ldrh r1, [r0, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._420 @cond_branch\n" + " mov r0, #0x0\n" + " b ._421\n" + "._423:\n" + " .align 2, 0\n" + "._422:\n" + " .word gMain\n" + "._420:\n" + " add r0, r2, #0\n" + " bl debug_sub_805F2DC\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + "._421:\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} + +__attribute__((naked)) +void debug_sub_805F2DC() +{ + asm( + " push {r4, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " cmp r4, #0\n" + " bne ._424 @cond_branch\n" + " ldr r2, ._426\n" + " ldr r0, ._426 + 4\n" + " ldrb r1, [r0, #0x5]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldrb r0, [r0, #0x18]\n" + " lsr r0, r0, #0x4\n" + " bl PlayerFaceDirection\n" + " b ._430\n" + "._427:\n" + " .align 2, 0\n" + "._426:\n" + " .word gMapObjects\n" + " .word gPlayerAvatar\n" + "._424:\n" + " ldr r2, ._431\n" + " ldr r0, ._431 + 4\n" + " ldrb r1, [r0, #0x5]\n" + " lsl r0, r1, #0x3\n" + " add r0, r0, r1\n" + " lsl r0, r0, #0x2\n" + " add r0, r0, r2\n" + " ldrb r0, [r0, #0x1]\n" + " lsr r0, r0, #0x7\n" + " cmp r0, #0\n" + " beq ._429 @cond_branch\n" + " add r0, r4, #0\n" + " bl CanCameraMoveInDirection\n" + " cmp r0, #0\n" + " bne ._429 @cond_branch\n" + " add r0, r4, #0\n" + " bl PlayerOnBikeCollide\n" + " b ._430\n" + "._432:\n" + " .align 2, 0\n" + "._431:\n" + " .word gMapObjects\n" + " .word gPlayerAvatar\n" + "._429:\n" + " add r0, r4, #0\n" + " bl sub_80593F4\n" + "._430:\n" + " mov r0, #0x1\n" + " pop {r4}\n" + " pop {r1}\n" + " bx r1\n" + "\n" + ); +} +#endif diff --git a/src/field/field_weather.c b/src/field/field_weather.c index b6475d8ff..97eba16e0 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -188,6 +188,45 @@ const u8 gUnknown_083970C8[] = 1, }; +#if DEBUG + +const u8 gDebugText_Weather_0[] = _("なし   "); +const u8 gDebugText_Weather_1[] = _("はれ   "); +const u8 gDebugText_Weather_2[] = _("はれ2  "); +const u8 gDebugText_Weather_3[] = _("あめ   "); +const u8 gDebugText_Weather_4[] = _("ゆき   "); +const u8 gDebugText_Weather_5[] = _("かみなり "); +const u8 gDebugText_Weather_6[] = _("きり   "); +const u8 gDebugText_Weather_7[] = _("かざんばい"); +const u8 gDebugText_Weather_8[] = _("すなあらし"); +const u8 gDebugText_Weather_9[] = _("きり2  "); +const u8 gDebugText_Weather_10[] = _("かいてい "); +const u8 gDebugText_Weather_11[] = _("くもり  "); +const u8 gDebugText_Weather_12[] = _("はれ3  "); +const u8 gDebugText_Weather_13[] = _("おおあめ"); +const u8 gDebugText_Weather_14[] = _("かいてい2"); + +const u8 *const gDebugText_Weather[] = +{ + gDebugText_Weather_0, + gDebugText_Weather_1, + gDebugText_Weather_2, + gDebugText_Weather_3, + gDebugText_Weather_4, + gDebugText_Weather_5, + gDebugText_Weather_6, + gDebugText_Weather_7, + gDebugText_Weather_8, + gDebugText_Weather_9, + gDebugText_Weather_10, + gDebugText_Weather_11, + gDebugText_Weather_12, + gDebugText_Weather_13, + gDebugText_Weather_14, +}; + +#endif + const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); void StartWeather(void) @@ -1159,3 +1198,145 @@ void sub_807DE68(void) { gUnknown_030006DC = gUnknown_083970C8; } + +#if DEBUG + +__attribute__((naked)) +u8 debug_sub_8085564(void) +{ + asm("\ + push {lr}\n\ + mov r2, #0x0\n\ + ldr r0, ._375\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._370 @cond_branch\n\ + ldr r1, ._375 + 4\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0xf\n\ + bne ._371 @cond_branch\n\ + strb r2, [r1]\n\ +._371:\n\ + mov r2, #0x1\n\ +._370:\n\ + ldr r0, ._375\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._372 @cond_branch\n\ + ldr r1, ._375 + 4\n\ + ldrb r0, [r1]\n\ + cmp r0, #0\n\ + beq ._373 @cond_branch\n\ + sub r0, r0, #0x1\n\ + b ._374\n\ +._376:\n\ + .align 2, 0\n\ +._375:\n\ + .word gMain\n\ + .word gUnknown_0202FF58+0x2\n\ +._373:\n\ + mov r0, #0xe\n\ +._374:\n\ + strb r0, [r1]\n\ + mov r2, #0x1\n\ +._372:\n\ + cmp r2, #0\n\ + beq ._377 @cond_branch\n\ + mov r0, #0x16\n\ + mov r1, #0x1\n\ + mov r2, #0x1c\n\ + mov r3, #0x2\n\ + bl MenuFillWindowRectWithBlankTile\n\ + ldr r1, ._380\n\ + ldr r0, ._380 + 4\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x17\n\ + mov r2, #0x1\n\ + bl MenuPrint\n\ +._377:\n\ + ldr r0, ._380 + 8\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._378 @cond_branch\n\ + mov r0, #0x0\n\ + b ._379\n\ +._381:\n\ + .align 2, 0\n\ +._380:\n\ + .word gDebugText_Weather\n\ + .word gUnknown_0202FF58+0x2\n\ + .word gMain\n\ +._378:\n\ + ldr r0, ._382\n\ + ldrb r0, [r0]\n\ + bl DoWeatherEffect\n\ + bl CloseMenu\n\ + mov r0, #0x1\n\ +._379:\n\ + pop {r1}\n\ + bx r1\n\ +._383:\n\ + .align 2, 0\n\ +._382:\n\ + .word gUnknown_0202FF58+0x2"); +} + +__attribute__((naked)) +u8 debug_sub_808560C(void) +{ + asm("\ + push {r4, lr}\n\ + ldr r4, ._384\n\ + ldr r0, ._384 + 4\n\ + mov r1, #0xda\n\ + lsl r1, r1, #0x3\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + strb r0, [r4]\n\ + bl MenuZeroFillScreen\n\ + mov r0, #0x16\n\ + mov r1, #0x1\n\ + mov r2, #0x1c\n\ + mov r3, #0x2\n\ + bl MenuFillWindowRectWithBlankTile\n\ + ldr r1, ._384 + 8\n\ + ldrb r0, [r4]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x17\n\ + mov r2, #0x1\n\ + bl MenuPrint\n\ + ldr r1, ._384 + 12\n\ + ldr r0, ._384 + 16\n\ + str r0, [r1]\n\ + mov r0, #0x0\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ +._385:\n\ + .align 2, 0\n\ +._384:\n\ + .word gUnknown_0202FF58+0x2\n\ + .word gUnknown_0202F7E8\n\ + .word gDebugText_Weather\n\ + .word gCallback_03004AE8\n\ + .word debug_sub_8085564+1"); +} + +#endif diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c index bf8e98403..c200ce2f5 100644 --- a/src/field/fldeff_secretpower.c +++ b/src/field/fldeff_secretpower.c @@ -243,6 +243,102 @@ void sub_80C6280(void) } } +#if DEBUG + +__attribute__((naked)) +void debug_sub_80D93F4() +{ + asm("\ + push {r4, lr}\n\ + bl sub_80BB63C\n\ + ldr r0, ._98\n\ + ldrh r0, [r0]\n\ + cmp r0, #0x1\n\ + beq ._95 @cond_branch\n\ + bl player_get_direction_lower_nybble\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x2\n\ + beq ._96 @cond_branch\n\ +._95:\n\ + bl ScriptContext2_Disable\n\ + b ._109\n\ +._99:\n\ + .align 2, 0\n\ +._98:\n\ + .word gScriptResult\n\ +._96:\n\ + ldr r4, ._102\n\ + add r1, r4, #2\n\ + add r0, r4, #0\n\ + bl GetXYCoordsOneStepInFrontOfPlayer\n\ + mov r1, #0x0\n\ + ldsh r0, [r4, r1]\n\ + mov r2, #0x2\n\ + ldsh r1, [r4, r2]\n\ + bl MapGridGetMetatileBehaviorAt\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + add r0, r4, #0\n\ + bl MetatileBehavior_IsSecretBaseCave\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bne ._100 @cond_branch\n\ + bl sub_80C6264\n\ + ldr r1, ._102 + 4\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ + bl sub_80C639C\n\ + b ._109\n\ +._103:\n\ + .align 2, 0\n\ +._102:\n\ + .word gUnknown_0203923C\n\ + .word gLastFieldPokeMenuOpened\n\ +._100:\n\ + add r0, r4, #0\n\ + bl MetatileBehavior_IsSecretBaseTree\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bne ._104 @cond_branch\n\ + bl sub_80C6264\n\ + ldr r1, ._106\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ + bl sub_80C64A8\n\ + b ._109\n\ +._107:\n\ + .align 2, 0\n\ +._106:\n\ + .word gLastFieldPokeMenuOpened\n\ +._104:\n\ + add r0, r4, #0\n\ + bl MetatileBehavior_IsSecretBaseShrub\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bne ._108 @cond_branch\n\ + bl sub_80C6264\n\ + ldr r1, ._110\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ + bl sub_80C660C\n\ + b ._109\n\ +._111:\n\ + .align 2, 0\n\ +._110:\n\ + .word gLastFieldPokeMenuOpened\n\ +._108:\n\ + bl ScriptContext2_Disable\n\ +._109:\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0"); +} +#endif + bool8 SetUpFieldMove_SecretPower(void) { u8 behavior; diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 00368c2f5..1bce9bc3f 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -277,7 +277,7 @@ void debug_sub_810B32C() " .word ._28\n" " .word ._29\n" "._25:\n" - " bl sub_80F7A34\n" + " bl SetupBard\n" " b ._37\n" "._26:\n" " mov r2, #0x0\n" diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 7994dd60c..75c0cba78 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -4777,7 +4777,8 @@ void DoPPUpItemEffect(u8 taskId, u16 b, TaskFunc c) gMain.newKeys = 0; } -static const u8 *const StatNames[] = { +static const u8 *const StatNames[] = +{ gOtherText_HP, gOtherText_Attack, gOtherText_Defense, @@ -4786,7 +4787,8 @@ static const u8 *const StatNames[] = { gOtherText_Speed, }; -static const u8 StatDataTypes[] = { +static const u8 StatDataTypes[] = +{ MON_DATA_MAX_HP, MON_DATA_ATK, MON_DATA_DEF, @@ -4794,6 +4796,17 @@ static const u8 StatDataTypes[] = { MON_DATA_SPDEF, MON_DATA_SPEED, }; + +#if DEBUG + +const u8 gUnknown_Debug_839B6CE[] = {0x40, 0, 0, 0, 0x44, 0, 0xFF, 0, 0, 0}; + +const u8 gUnknown_Debug_839B6D8[] = _( + "{STR_VAR_1}かい じっこう\n" + "{STR_VAR_2}たんいじかん しょうひ"); + +#endif + void DoRareCandyItemEffect(u8 taskId, u16 b, TaskFunc c) { u8 i; diff --git a/src/field/region_map.c b/src/field/region_map.c index a098eb73d..3bd64a8a0 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -280,7 +280,7 @@ static u16 sub_80FB9C0(u16); static void sub_80FBA18(void); static bool8 sub_80FBAA0(u16); void CreateRegionMapCursor(u16, u16); -static void sub_80FBCA0(void); +void sub_80FBCA0(void); static void sub_80FBDF8(void); static void sub_80FBE24(void); static void SpriteCB_PlayerIconZoomedOut(struct Sprite *); @@ -1127,7 +1127,7 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag) } } -static void sub_80FBCA0(void) +void sub_80FBCA0(void) { if (gRegionMap->cursorSprite != NULL) { diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 3aefa80de..d84a6e592 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -30,6 +30,8 @@ struct UnkStruct1 #define SLOTMACHINE_GFX_TILES 236 #endif +// TODO: figure out which functions are static and which are not. +#define static static void CB2_SlotMachineSetup(void); static void CB2_SlotMachineLoop(void); @@ -77,6 +79,7 @@ static bool8 sub_81023E0(struct Task *task); static bool8 sub_81023FC(struct Task *task); static bool8 sub_8102424(struct Task *task); static bool8 sub_8102460(struct Task *task); +static bool8 debug_sub_8116E74(struct Task *); static void sub_8102484(void); static void sub_81024F0(void); static bool8 sub_8102540(void); @@ -230,11 +233,59 @@ static const u8 gUnknown_083ECE3A[]; static const u16 gUnknown_083ECE42[]; static const u16 gUnknown_083ECE48[]; +#if DEBUG +__attribute__((naked)) +void PlaySlotMachine(u8 arg0, MainCallback cb) +{ + asm("\ + push {lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r3, ._1\n\ + mov r2, #0x0\n\ + strb r2, [r3]\n\ + bl sub_81019B0\n\ + ldr r0, ._1 + 4\n\ + bl SetMainCallback2\n\ + pop {r0}\n\ + bx r0\n\ +._2:\n\ + .align 2, 0\n\ +._1:\n\ + .word unk_debug_bss_1+0x1\n\ + .word sub_81018B8+1"); +} +#else void PlaySlotMachine(u8 arg0, MainCallback cb) { PlaySlotMachine_Internal(arg0, cb); SetMainCallback2(CB2_SlotMachineSetup); } +#endif + +#if DEBUG +__attribute__((naked)) +void debug_sub_811609C() +{ + asm("\ + push {lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r3, ._3\n\ + mov r2, #0x1\n\ + strb r2, [r3]\n\ + bl sub_81019B0\n\ + ldr r0, ._3 + 4\n\ + bl SetMainCallback2\n\ + pop {r0}\n\ + bx r0\n\ +._4:\n\ + .align 2, 0\n\ +._3:\n\ + .word unk_debug_bss_1+0x1\n\ + .word sub_81018B8+1"); +} +#endif static void CB2_SlotMachineSetup(void) { @@ -367,6 +418,135 @@ static void SlotMachineSetup_2_1(void) static const s16 gUnknown_083ECCF8[][2]; +#if DEBUG +__attribute__((naked)) +static void SlotMachineSetup_0_1(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, sl\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5, r6, r7}\n\ + bl sub_81019EC\n\ + ldr r5, ._43\n\ + mov r4, #0x0\n\ + strb r4, [r5]\n\ + strb r4, [r5, #0x2]\n\ + bl Random\n\ + mov r1, #0x1\n\ + and r1, r1, r0\n\ + strb r1, [r5, #0x3]\n\ + strb r4, [r5, #0x4]\n\ + mov r0, #0x0\n\ + strh r4, [r5, #0x8]\n\ + strb r0, [r5, #0xa]\n\ + strb r0, [r5, #0xb]\n\ + ldr r0, ._43 + 4\n\ + ldr r1, ._43 + 8\n\ + add r0, r0, r1\n\ + ldrh r0, [r0]\n\ + strh r0, [r5, #0xc]\n\ + strh r4, [r5, #0xe]\n\ + strh r4, [r5, #0x10]\n\ + strh r4, [r5, #0x12]\n\ + strh r4, [r5, #0x18]\n\ + mov r0, #0x8\n\ + strh r0, [r5, #0x1a]\n\ + add r1, r5, #0\n\ + add r1, r1, #0x58\n\ + mov r0, #0xf0\n\ + strh r0, [r1]\n\ + add r1, r1, #0x2\n\ + mov r0, #0xa0\n\ + strh r0, [r1]\n\ + add r0, r5, #0\n\ + add r0, r0, #0x5c\n\ + mov r1, #0x3f\n\ + strh r1, [r0]\n\ + add r0, r0, #0x2\n\ + strh r1, [r0]\n\ + bl GetCurrentMapMusic\n\ + add r1, r5, #0\n\ + add r1, r1, #0x60\n\ + strh r0, [r1]\n\ + mov r7, #0x0\n\ + add r6, r5, #0\n\ + ldr r2, ._43 + 12\n\ + mov sl, r2\n\ + mov r0, #0x1c\n\ + add r0, r0, r6\n\ + mov r9, r0\n\ +._41:\n\ + lsl r5, r7, #0x1\n\ + mov r1, #0x22\n\ + add r1, r1, r6\n\ + mov r8, r1\n\ + add r1, r5, r1\n\ + mov r0, #0x0\n\ + strh r0, [r1]\n\ + add r4, r6, #0\n\ + add r4, r4, #0x28\n\ + add r4, r5, r4\n\ + ldrb r0, [r6, #0x3]\n\ + lsl r0, r0, #0x1\n\ + lsl r1, r7, #0x2\n\ + add r0, r0, r1\n\ + add r0, r0, sl\n\ + mov r2, #0x0\n\ + ldsh r0, [r0, r2]\n\ + mov r1, #0x15\n\ + bl __modsi3\n\ + strh r0, [r4]\n\ + add r5, r5, r9\n\ + mov r1, #0x0\n\ + ldsh r0, [r4, r1]\n\ + lsl r1, r0, #0x1\n\ + add r1, r1, r0\n\ + lsl r1, r1, #0x3\n\ + mov r2, #0xfc\n\ + lsl r2, r2, #0x1\n\ + add r0, r2, #0\n\ + sub r0, r0, r1\n\ + strh r0, [r5]\n\ + mov r1, #0x0\n\ + ldsh r0, [r5, r1]\n\ + add r1, r2, #0\n\ + bl __modsi3\n\ + strh r0, [r5]\n\ + add r0, r7, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + cmp r7, #0x2\n\ + bls ._41 @cond_branch\n\ + bl debug_sub_811B5D0\n\ + ldr r0, ._43 + 16\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._42 @cond_branch\n\ + mov r1, r8\n\ + sub r1, r1, #0x22\n\ + mov r0, #0xfa\n\ + lsl r0, r0, #0x2\n\ + strh r0, [r1, #0xc]\n\ +._42:\n\ + pop {r3, r4, r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov sl, r5\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._44:\n\ + .align 2, 0\n\ +._43:\n\ + .word +0x2000000\n\ + .word gSaveBlock1\n\ + .word 0x494\n\ + .word gUnknown_083ECCF8\n\ + .word unk_debug_bss_1+0x1"); +} +#else static void SlotMachineSetup_0_1(void) { u8 i; @@ -398,6 +578,7 @@ static void SlotMachineSetup_0_1(void) eSlotMachine->unk1C[i] %= 0x1f8; } } +#endif static void SlotMachineSetup_3_0(void) { @@ -442,7 +623,8 @@ static void sub_8101D04(void) sub_8101D24(CreateTask(sub_8101D24, 0)); } -static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { +static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = +{ sub_8101D5C, sub_8101D8C, sub_8101DB0, @@ -471,7 +653,10 @@ static bool8 (*const gUnknown_083ECAAC[])(struct Task *task) = { sub_81023E0, sub_81023FC, sub_8102424, - sub_8102460 + sub_8102460, +#if DEBUG + debug_sub_8116E74, +#endif }; static void sub_8101D24(u8 taskId) @@ -524,6 +709,46 @@ static bool8 sub_8101DF4(struct Task *task) return FALSE; } +#if DEBUG +__attribute__((naked)) +static bool8 sub_8101E10(struct Task *task) +{ + asm("\ + push {lr}\n\ + mov r0, #0x0\n\ + bl sub_8104CAC\n\ + ldr r2, ._70\n\ + mov r0, #0x5\n\ + strb r0, [r2]\n\ + ldr r0, ._70 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._67 @cond_branch\n\ + ldr r0, ._70 + 8\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._69 @cond_branch\n\ +._67:\n\ + mov r0, #0xc\n\ + ldsh r1, [r2, r0]\n\ + ldr r0, ._70 + 12\n\ + cmp r1, r0\n\ + ble ._69 @cond_branch\n\ + mov r0, #0x17\n\ + strb r0, [r2]\n\ +._69:\n\ + mov r0, #0x1\n\ + pop {r1}\n\ + bx r1\n\ +._71:\n\ + .align 2, 0\n\ +._70:\n\ + .word +0x2000000\n\ + .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1+0x4\n\ + .word 0x270e"); +} +#else static bool8 sub_8101E10(struct Task *task) { sub_8104CAC(0); @@ -534,7 +759,205 @@ static bool8 sub_8101E10(struct Task *task) } return TRUE; } +#endif +#if DEBUG +__attribute__((naked)) +static bool8 sub_8101E3C(struct Task *task) +{ + asm("\ + push {r4, r5, lr}\n\ + ldr r0, ._77\n\ + ldrb r1, [r0]\n\ + add r3, r0, #0\n\ + ldr r5, ._77 + 4\n\ + cmp r1, #0\n\ + beq ._76 @cond_branch\n\ + ldr r2, ._77 + 8\n\ + ldrb r0, [r2]\n\ + cmp r0, #0\n\ + beq ._76 @cond_branch\n\ + ldr r4, ._77 + 12\n\ + mov r1, #0xc\n\ + ldsh r0, [r4, r1]\n\ + cmp r0, #0x3\n\ + ble ._74 @cond_branch\n\ + ldrh r1, [r5, #0x2c]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._75 @cond_branch\n\ +._74:\n\ + mov r0, #0x0\n\ + strb r0, [r2]\n\ + b ._76\n\ +._78:\n\ + .align 2, 0\n\ +._77:\n\ + .word unk_debug_bss_1+0x1\n\ + .word gMain\n\ + .word unk_debug_bss_1+0x4\n\ + .word +0x2000000\n\ +._75:\n\ + mov r0, #0x0\n\ + bl sub_8103D50\n\ + mov r0, #0x1\n\ + bl sub_8103D50\n\ + mov r0, #0x2\n\ + bl sub_8103D50\n\ + ldrh r0, [r4, #0xc]\n\ + sub r0, r0, #0x3\n\ + strh r0, [r4, #0xc]\n\ + mov r0, #0x3\n\ + strh r0, [r4, #0x12]\n\ + mov r0, #0x9\n\ + strb r0, [r4]\n\ + b ._102\n\ +._76:\n\ + ldrb r0, [r3]\n\ + cmp r0, #0\n\ + beq ._81 @cond_branch\n\ + ldrh r1, [r5, #0x2e]\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._81 @cond_branch\n\ + bl debug_sub_811B620\n\ + ldr r1, ._83\n\ + mov r0, #0x1d\n\ + strb r0, [r1]\n\ + b ._102\n\ +._84:\n\ + .align 2, 0\n\ +._83:\n\ + .word +0x2000000\n\ +._81:\n\ + ldrh r1, [r5, #0x2e]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._85 @cond_branch\n\ + mov r0, #0x0\n\ + bl sub_8104AB8\n\ + ldr r1, ._87\n\ + mov r0, #0x8\n\ + strb r0, [r1]\n\ + b ._102\n\ +._88:\n\ + .align 2, 0\n\ +._87:\n\ + .word +0x2000000\n\ +._85:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._89 @cond_branch\n\ + ldr r2, ._94\n\ + mov r3, #0xc\n\ + ldsh r0, [r2, r3]\n\ + sub r0, r0, #0x3\n\ + mov r3, #0x12\n\ + ldsh r1, [r2, r3]\n\ + add r0, r0, r1\n\ + cmp r0, #0\n\ + blt ._90 @cond_branch\n\ + ldrh r4, [r2, #0x12]\n\ + add r0, r1, #0\n\ + cmp r0, #0x2\n\ + bgt ._91 @cond_branch\n\ +._92:\n\ + lsl r0, r4, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl sub_8103D50\n\ + lsl r0, r4, #0x10\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0x9\n\ + add r0, r0, r2\n\ + lsr r4, r0, #0x10\n\ + asr r0, r0, #0x10\n\ + cmp r0, #0x2\n\ + ble ._92 @cond_branch\n\ +._91:\n\ + ldr r1, ._94\n\ + ldrh r0, [r1, #0xc]\n\ + sub r0, r0, #0x3\n\ + ldrh r3, [r1, #0x12]\n\ + add r0, r0, r3\n\ + strh r0, [r1, #0xc]\n\ + mov r0, #0x3\n\ + strh r0, [r1, #0x12]\n\ + mov r0, #0x9\n\ + strb r0, [r1]\n\ + mov r0, #0x5f\n\ + bl PlaySE\n\ + b ._102\n\ +._95:\n\ + .align 2, 0\n\ +._94:\n\ + .word +0x2000000\n\ +._90:\n\ + mov r0, #0x6\n\ + b ._96\n\ +._89:\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._98 @cond_branch\n\ + ldr r4, ._103\n\ + mov r1, #0xc\n\ + ldsh r0, [r4, r1]\n\ + cmp r0, #0\n\ + beq ._98 @cond_branch\n\ + mov r0, #0x5f\n\ + bl PlaySE\n\ + ldrb r0, [r4, #0x12]\n\ + bl sub_8103D50\n\ + ldrh r0, [r4, #0xc]\n\ + sub r0, r0, #0x1\n\ + strh r0, [r4, #0xc]\n\ + ldrh r0, [r4, #0x12]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4, #0x12]\n\ +._98:\n\ + ldr r0, ._103\n\ + mov r2, #0x12\n\ + ldsh r1, [r0, r2]\n\ + add r2, r0, #0\n\ + ldr r5, ._103 + 4\n\ + cmp r1, #0x2\n\ + bgt ._99 @cond_branch\n\ + cmp r1, #0\n\ + beq ._101 @cond_branch\n\ + ldrh r1, [r5, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._101 @cond_branch\n\ +._99:\n\ + mov r0, #0x9\n\ + strb r0, [r2]\n\ +._101:\n\ + ldrh r1, [r5, #0x2e]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._102 @cond_branch\n\ + mov r0, #0x15\n\ +._96:\n\ + strb r0, [r2]\n\ +._102:\n\ + mov r0, #0x0\n\ + pop {r4, r5}\n\ + pop {r1}\n\ + bx r1\n\ +._104:\n\ + .align 2, 0\n\ +._103:\n\ + .word +0x2000000\n\ + .word gMain"); +} +#else static bool8 sub_8101E3C(struct Task *task) { s16 i; @@ -582,6 +1005,7 @@ static bool8 sub_8101E3C(struct Task *task) } return FALSE; } +#endif static void sub_8101F2C(const u8 *str) { @@ -615,6 +1039,71 @@ static bool8 sub_8101F88(struct Task *task) return FALSE; } +#if DEBUG +__attribute__((naked)) +static bool8 sub_8101FA4(struct Task *task) +{ + asm("\ + push {r4, lr}\n\ + add r4, r0, #0\n\ + bl sub_8102484\n\ + bl sub_8104DA4\n\ + mov r0, #0x0\n\ + bl sub_8102DEC\n\ + mov r0, #0x1\n\ + bl sub_8102DEC\n\ + mov r0, #0x2\n\ + bl sub_8102DEC\n\ + mov r0, #0x0\n\ + strh r0, [r4, #0x8]\n\ + ldr r4, ._115\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._113 @cond_branch\n\ + bl sub_810430C\n\ + mov r0, #0xa\n\ + b ._114\n\ +._116:\n\ + .align 2, 0\n\ +._115:\n\ + .word +0x2000000\n\ +._113:\n\ + mov r0, #0x1\n\ + bl sub_8104CAC\n\ + mov r0, #0xb\n\ +._114:\n\ + strb r0, [r4]\n\ + ldr r4, ._119\n\ + mov r0, #0x8\n\ + strh r0, [r4, #0x1a]\n\ + ldrb r0, [r4, #0xa]\n\ + cmp r0, #0\n\ + beq ._117 @cond_branch\n\ + bl dp15_jump_random_unknown\n\ + strh r0, [r4, #0x1a]\n\ +._117:\n\ + ldr r0, ._119 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._118 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x68\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._118:\n\ + mov r0, #0x0\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ +._120:\n\ + .align 2, 0\n\ +._119:\n\ + .word +0x2000000\n\ + .word unk_debug_bss_1+0x1"); +} +#else static bool8 sub_8101FA4(struct Task *task) { sub_8102484(); @@ -640,6 +1129,7 @@ static bool8 sub_8101FA4(struct Task *task) } return FALSE; } +#endif static bool8 sub_8102008(struct Task *task) { @@ -652,6 +1142,52 @@ static bool8 sub_8102008(struct Task *task) return FALSE; } +#if DEBUG +__attribute__((naked)) +static bool8 sub_8102034(struct Task *task) +{ + asm("\ + push {r4, lr}\n\ + ldrh r1, [r0, #0x8]\n\ + add r1, r1, #0x1\n\ + strh r1, [r0, #0x8]\n\ + lsl r1, r1, #0x10\n\ + asr r1, r1, #0x10\n\ + cmp r1, #0x1d\n\ + ble ._124 @cond_branch\n\ + ldr r0, ._127\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._126 @cond_branch\n\ + ldr r0, ._127 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._126 @cond_branch\n\ + ldr r4, ._127 + 8\n\ + bl Random\n\ + mov r1, #0x1f\n\ + and r1, r1, r0\n\ + add r1, r1, #0x1\n\ + str r1, [r4]\n\ +._126:\n\ + bl sub_81024F0\n\ + ldr r1, ._127 + 12\n\ + mov r0, #0xc\n\ + strb r0, [r1]\n\ +._124:\n\ + mov r0, #0x0\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ +._128:\n\ + .align 2, 0\n\ +._127:\n\ + .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1+0x4\n\ + .word unk_debug_bss_1+0x8\n\ + .word +0x2000000"); +} +#else static bool8 sub_8102034(struct Task *task) { if (++task->data[0] >= 30) @@ -661,7 +1197,77 @@ static bool8 sub_8102034(struct Task *task) } return FALSE; } +#endif +#if DEBUG +__attribute__((naked)) +static bool8 sub_8102058(struct Task *task) +{ + asm("\ + push {r4, r5, lr}\n\ + ldr r0, ._133\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._130 @cond_branch\n\ + ldr r0, ._133 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._130 @cond_branch\n\ + ldr r5, ._133 + 8\n\ + ldr r0, [r5]\n\ + sub r0, r0, #0x1\n\ + str r0, [r5]\n\ + cmp r0, #0\n\ + bne ._135 @cond_branch\n\ + mov r0, #0x18\n\ + bl PlaySE\n\ + ldr r4, ._133 + 12\n\ + ldrb r0, [r4, #0x18]\n\ + bl sub_8102E1C\n\ + ldrb r0, [r4, #0x18]\n\ + bl sub_8103C14\n\ + bl Random\n\ + mov r1, #0x1f\n\ + and r1, r1, r0\n\ + add r1, r1, #0x1\n\ + str r1, [r5]\n\ + b ._132\n\ +._134:\n\ + .align 2, 0\n\ +._133:\n\ + .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1+0x4\n\ + .word unk_debug_bss_1+0x8\n\ + .word +0x2000000\n\ +._130:\n\ + ldr r0, ._136\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._135 @cond_branch\n\ + mov r0, #0x18\n\ + bl PlaySE\n\ + ldr r4, ._136 + 4\n\ + ldrb r0, [r4, #0x18]\n\ + bl sub_8102E1C\n\ + ldrb r0, [r4, #0x18]\n\ + bl sub_8103C14\n\ +._132:\n\ + mov r0, #0xd\n\ + strb r0, [r4]\n\ +._135:\n\ + mov r0, #0x0\n\ + pop {r4, r5}\n\ + pop {r1}\n\ + bx r1\n\ +._137:\n\ + .align 2, 0\n\ +._136:\n\ + .word gMain\n\ + .word +0x2000000"); +} +#else static bool8 sub_8102058(struct Task *task) { if (gMain.newKeys & A_BUTTON) @@ -673,7 +1279,121 @@ static bool8 sub_8102058(struct Task *task) } return FALSE; } +#endif +#if DEBUG +__attribute__((naked)) +static bool8 sub_8102090(struct Task *task) +{ + asm("\ + push {r4, lr}\n\ + ldr r4, ._146\n\ + ldrb r0, [r4, #0x18]\n\ + bl sub_8102E40\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + bne ._138 @cond_branch\n\ + ldrh r0, [r4, #0x18]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4, #0x18]\n\ + mov r1, #0xc\n\ + strb r1, [r4]\n\ + lsl r0, r0, #0x10\n\ + asr r0, r0, #0x10\n\ + cmp r0, #0x2\n\ + ble ._161 @cond_branch\n\ + mov r0, #0xe\n\ + strb r0, [r4]\n\ + ldr r0, ._146 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x8\n\ + beq ._140 @cond_branch\n\ + cmp r0, #0x8\n\ + bgt ._141 @cond_branch\n\ + cmp r0, #0x2\n\ + beq ._142 @cond_branch\n\ + cmp r0, #0x2\n\ + bgt ._143 @cond_branch\n\ + cmp r0, #0x1\n\ + beq ._144 @cond_branch\n\ + b ._161\n\ +._147:\n\ + .align 2, 0\n\ +._146:\n\ + .word +0x2000000\n\ + .word unk_debug_bss_1\n\ +._143:\n\ + cmp r0, #0x4\n\ + beq ._148 @cond_branch\n\ + b ._161\n\ +._141:\n\ + cmp r0, #0x40\n\ + beq ._150 @cond_branch\n\ + cmp r0, #0x40\n\ + bgt ._151 @cond_branch\n\ + cmp r0, #0x10\n\ + beq ._152 @cond_branch\n\ + b ._161\n\ +._151:\n\ + cmp r0, #0x80\n\ + beq ._154 @cond_branch\n\ + b ._161\n\ +._142:\n\ + mov r0, #0x14\n\ + strh r0, [r4, #0x28]\n\ + strh r0, [r4, #0x2a]\n\ + mov r0, #0x12\n\ + b ._160\n\ +._144:\n\ + mov r0, #0x14\n\ + strh r0, [r4, #0x28]\n\ + strh r0, [r4, #0x2a]\n\ + mov r0, #0x12\n\ + b ._160\n\ +._148:\n\ + mov r0, #0x3\n\ + strh r0, [r4, #0x28]\n\ + mov r0, #0x1\n\ + strh r0, [r4, #0x2a]\n\ + mov r0, #0x2\n\ + b ._160\n\ +._140:\n\ + strh r2, [r4, #0x28]\n\ + mov r0, #0x2\n\ + strh r0, [r4, #0x2a]\n\ + mov r0, #0x3\n\ + b ._160\n\ +._152:\n\ + mov r0, #0x2\n\ + strh r0, [r4, #0x28]\n\ + mov r0, #0x5\n\ + strh r0, [r4, #0x2a]\n\ + mov r0, #0x14\n\ + b ._160\n\ +._150:\n\ + mov r0, #0x13\n\ + strh r0, [r4, #0x28]\n\ + strh r0, [r4, #0x2a]\n\ + strh r2, [r4, #0x2c]\n\ + b ._161\n\ +._154:\n\ + mov r0, #0x13\n\ + strh r0, [r4, #0x28]\n\ + strh r0, [r4, #0x2a]\n\ +._160:\n\ + strh r0, [r4, #0x2c]\n\ +._161:\n\ + mov r0, #0x1\n\ + b ._162\n\ +._138:\n\ + mov r0, #0x0\n\ +._162:\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1"); +} +#else static bool8 sub_8102090(struct Task *task) { if (!sub_8102E40(eSlotMachine->unk18)) @@ -688,7 +1408,168 @@ static bool8 sub_8102090(struct Task *task) } return FALSE; } +#endif +#if DEBUG +__attribute__((naked)) +static bool8 sub_81020C8(struct Task *task) +{ + asm("\ + push {r4, lr}\n\ + ldr r4, ._165\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0xc0\n\ + and r0, r0, r1\n\ + strb r0, [r4, #0x4]\n\ + bl sub_81027A0\n\ + ldrb r0, [r4, #0xa]\n\ + cmp r0, #0\n\ + beq ._163 @cond_branch\n\ + sub r0, r0, #0x1\n\ + strb r0, [r4, #0xa]\n\ + ldrb r0, [r4, #0xb]\n\ + add r0, r0, #0x1\n\ + strb r0, [r4, #0xb]\n\ + b ._164\n\ +._166:\n\ + .align 2, 0\n\ +._165:\n\ + .word +0x2000000\n\ +._163:\n\ + bl debug_sub_811B894\n\ +._164:\n\ + ldr r4, ._171\n\ + ldrh r0, [r4, #0x8]\n\ + cmp r0, #0\n\ + beq ._167 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x6c\n\ + mov r2, #0xe\n\ + ldsh r1, [r4, r2]\n\ + bl debug_sub_811B5B4\n\ + mov r0, #0xf\n\ + strb r0, [r4]\n\ + bl sub_8102A24\n\ + bl sub_8103F70\n\ + ldrh r0, [r4, #0x10]\n\ + ldrh r1, [r4, #0xe]\n\ + sub r0, r0, r1\n\ + strh r0, [r4, #0x10]\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + bge ._168 @cond_branch\n\ + mov r0, #0x0\n\ + strh r0, [r4, #0x10]\n\ +._168:\n\ + ldrh r1, [r4, #0x8]\n\ + mov r0, #0xc0\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._169 @cond_branch\n\ + ldr r0, ._171 + 4\n\ + bl PlayFanfare\n\ + mov r0, #0x6\n\ + bl sub_8104CAC\n\ + b ._174\n\ +._172:\n\ + .align 2, 0\n\ +._171:\n\ + .word +0x2000000\n\ + .word 0x185\n\ +._169:\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._173 @cond_branch\n\ + ldr r0, ._175\n\ + bl PlayFanfare\n\ + mov r0, #0x5\n\ + bl sub_8104CAC\n\ + b ._174\n\ +._176:\n\ + .align 2, 0\n\ +._175:\n\ + .word 0x185\n\ +._173:\n\ + mov r0, #0xc3\n\ + lsl r0, r0, #0x1\n\ + bl PlayFanfare\n\ + mov r0, #0x2\n\ + bl sub_8104CAC\n\ +._174:\n\ + ldr r1, ._183\n\ + ldrh r3, [r1, #0x8]\n\ + mov r0, #0xe0\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r3\n\ + add r2, r1, #0\n\ + cmp r0, #0\n\ + beq ._179 @cond_branch\n\ + ldrb r1, [r2, #0x4]\n\ + mov r0, #0x3f\n\ + and r0, r0, r1\n\ + mov r1, #0x0\n\ + strb r0, [r2, #0x4]\n\ + mov r0, #0xc0\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r3\n\ + cmp r0, #0\n\ + beq ._179 @cond_branch\n\ + strb r1, [r2, #0xa]\n\ + strb r1, [r2, #0xb]\n\ + strb r1, [r2, #0x3]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r3\n\ + cmp r0, #0\n\ + beq ._179 @cond_branch\n\ + mov r0, #0x1\n\ + strb r0, [r2, #0x3]\n\ +._179:\n\ + ldrh r1, [r2, #0x8]\n\ + mov r0, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._185 @cond_branch\n\ + ldrb r0, [r2, #0x2]\n\ + cmp r0, #0xf\n\ + bhi ._185 @cond_branch\n\ + add r0, r0, #0x1\n\ + strb r0, [r2, #0x2]\n\ + ldrb r0, [r2, #0x2]\n\ + bl sub_8104064\n\ + b ._185\n\ +._184:\n\ + .align 2, 0\n\ +._183:\n\ + .word +0x2000000\n\ +._167:\n\ + mov r0, #0x3\n\ + bl sub_8104CAC\n\ + mov r0, #0x14\n\ + strb r0, [r4]\n\ + ldrh r0, [r4, #0x12]\n\ + ldrh r1, [r4, #0x10]\n\ + add r0, r0, r1\n\ + strh r0, [r4, #0x10]\n\ + lsl r0, r0, #0x10\n\ + asr r0, r0, #0x10\n\ + ldr r1, ._186\n\ + cmp r0, r1\n\ + ble ._185 @cond_branch\n\ + strh r1, [r4, #0x10]\n\ +._185:\n\ + mov r0, #0x0\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ +._187:\n\ + .align 2, 0\n\ +._186:\n\ + .word 0x270f"); +} +#else static bool8 sub_81020C8(struct Task *task) { eSlotMachine->unk04 &= 0xc0; @@ -753,6 +1634,7 @@ static bool8 sub_81020C8(struct Task *task) } return FALSE; } +#endif static bool8 sub_81021E0(struct Task *task) { @@ -903,6 +1785,48 @@ static bool8 sub_81023FC(struct Task *task) return FALSE; } +#if DEBUG +__attribute__((naked)) +static bool8 sub_8102424(struct Task *task) +{ + asm("\ + push {lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._234\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._233 @cond_branch\n\ + ldr r0, ._234 + 4\n\ + ldr r1, ._234 + 8\n\ + ldrh r1, [r1, #0xc]\n\ + ldr r2, ._234 + 12\n\ + add r0, r0, r2\n\ + strh r1, [r0]\n\ +._233:\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + mov r1, #0x0\n\ + str r1, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + ldr r1, ._234 + 8\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + mov r0, #0x0\n\ + add sp, sp, #0x4\n\ + pop {r1}\n\ + bx r1\n\ +._235:\n\ + .align 2, 0\n\ +._234:\n\ + .word unk_debug_bss_1+0x1\n\ + .word gSaveBlock1\n\ + .word +0x2000000\n\ + .word 0x494"); +} +#else static bool8 sub_8102424(struct Task *task) { gSaveBlock1.coins = eSlotMachine->coins; @@ -910,6 +1834,7 @@ static bool8 sub_8102424(struct Task *task) eSlotMachine->state++; return FALSE; } +#endif static bool8 sub_8102460(struct Task *task) { @@ -920,6 +1845,272 @@ static bool8 sub_8102460(struct Task *task) return FALSE; } +#if DEBUG +__attribute__((naked)) +static bool8 debug_sub_8116E74(struct Task *task) +{ + asm("\ + push {lr}\n\ + bl debug_sub_811B634\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._239 @cond_branch\n\ + ldr r1, ._240\n\ + mov r0, #0x5\n\ + strb r0, [r1]\n\ +._239:\n\ + mov r0, #0x0\n\ + pop {r1}\n\ + bx r1\n\ +._241:\n\ + .align 2, 0\n\ +._240:\n\ + .word +0x2000000"); +} +#endif + +#if DEBUG +__attribute__((naked)) +static void sub_8102484(void) +{ + asm("\ + push {r4, r5, r6, lr}\n\ + ldr r0, ._256\n\ + ldrb r2, [r0, #0xa]\n\ + add r4, r0, #0\n\ + cmp r2, #0\n\ + beq ._242 @cond_branch\n\ + b ._270\n\ +._242:\n\ + ldr r0, ._256 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._245 @cond_branch\n\ + ldr r3, ._256 + 8\n\ + ldrb r0, [r3]\n\ + cmp r0, #0\n\ + beq ._245 @cond_branch\n\ + ldr r0, ._256 + 12\n\ + ldrb r1, [r0]\n\ + strb r1, [r4, #0x4]\n\ + strb r2, [r3]\n\ + strb r2, [r0]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._246 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x88\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._246:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._247 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x84\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._247:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._248 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x8c\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._248:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x10\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._249 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x80\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._249:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._250 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x7c\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._250:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._251 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x78\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._251:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._252 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x74\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._252:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._253 @cond_branch\n\ + b ._270\n\ +._253:\n\ + add r0, r4, #0\n\ + add r0, r0, #0x70\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ + b ._270\n\ +._257:\n\ + .align 2, 0\n\ +._256:\n\ + .word +0x2000000\n\ + .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1+0x2\n\ + .word unk_debug_bss_1+0x3\n\ +._245:\n\ + add r5, r4, #0\n\ + ldrb r1, [r5, #0x4]\n\ + mov r0, #0xc0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._270 @cond_branch\n\ + bl sub_8102540\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._260 @cond_branch\n\ + bl sub_8102578\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ + cmp r6, #0x3\n\ + beq ._260 @cond_branch\n\ + ldr r1, ._271\n\ + lsl r0, r6, #0x1\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + ldrb r0, [r5, #0x4]\n\ + orr r0, r0, r1\n\ + strb r0, [r5, #0x4]\n\ + mov r1, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._261 @cond_branch\n\ + add r0, r5, #0\n\ + add r0, r0, #0x88\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._261:\n\ + ldrb r1, [r5, #0x4]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._262 @cond_branch\n\ + add r0, r5, #0\n\ + add r0, r0, #0x84\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._262:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._263 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x8c\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._263:\n\ + cmp r6, #0x1\n\ + bne ._270 @cond_branch\n\ +._260:\n\ + bl sub_81025BC\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ + cmp r6, #0x5\n\ + beq ._270 @cond_branch\n\ + ldr r4, ._271 + 4\n\ + ldr r1, ._271 + 8\n\ + lsl r0, r6, #0x1\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + ldrb r0, [r4, #0x4]\n\ + orr r0, r0, r1\n\ + strb r0, [r4, #0x4]\n\ + mov r1, #0x10\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._266 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x80\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._266:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._267 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x7c\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._267:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._268 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x78\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._268:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._269 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x74\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._269:\n\ + ldrb r1, [r4, #0x4]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._270 @cond_branch\n\ + add r0, r4, #0\n\ + add r0, r0, #0x70\n\ + mov r1, #0x1\n\ + bl debug_sub_811B5B4\n\ +._270:\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0\n\ +._272:\n\ + .align 2, 0\n\ +._271:\n\ + .word gUnknown_083ECE42\n\ + .word +0x2000000\n\ + .word gUnknown_083ECE48"); +} +#else static void sub_8102484(void) { u8 r3; @@ -945,6 +2136,7 @@ static void sub_8102484(void) } } } +#endif static void sub_81024F0(void) { @@ -3993,12 +5185,12 @@ __attribute__((naked)) void debug_sub_811B1C4() { asm( - " ldr r1, ._1\n" + " ldr r1, .__1_\n" " ldrb r0, [r1]\n" " mov r3, #0x2\n" " orr r0, r0, r3\n" " strb r0, [r1]\n" - " ldr r2, ._1 + 4\n" + " ldr r2, .__1_ + 4\n" " ldrb r1, [r2]\n" " mov r0, #0x2\n" " eor r1, r1, r0\n" @@ -4008,9 +5200,9 @@ void debug_sub_811B1C4() " and r0, r0, r3\n" " strb r0, [r2]\n" " bx lr\n" - "._2:\n" + ".__2_:\n" " .align 2, 0\n" - "._1:\n" + ".__1_:\n" " .word unk_debug_bss_1+0x3\n" " .word unk_debug_bss_1\n" "\n" @@ -4021,12 +5213,12 @@ __attribute__((naked)) void debug_sub_811B1EC() { asm( - " ldr r2, ._3\n" + " ldr r2, .__3\n" " ldrb r0, [r2]\n" " mov r1, #0x1\n" " orr r0, r0, r1\n" " strb r0, [r2]\n" - " ldr r2, ._3 + 4\n" + " ldr r2, .__3 + 4\n" " ldrb r0, [r2]\n" " mov r1, #0x1\n" " eor r0, r0, r1\n" @@ -4034,9 +5226,9 @@ void debug_sub_811B1EC() " lsr r0, r0, #0x1f\n" " strb r0, [r2]\n" " bx lr\n" - "._4:\n" + ".__4:\n" " .align 2, 0\n" - "._3:\n" + ".__3:\n" " .word unk_debug_bss_1+0x3\n" " .word unk_debug_bss_1\n" "\n" @@ -4047,12 +5239,12 @@ __attribute__((naked)) void debug_sub_811B210() { asm( - " ldr r1, ._5\n" + " ldr r1, .__5\n" " ldrb r0, [r1]\n" " mov r3, #0x4\n" " orr r0, r0, r3\n" " strb r0, [r1]\n" - " ldr r2, ._5 + 4\n" + " ldr r2, .__5 + 4\n" " ldrb r1, [r2]\n" " mov r0, #0x4\n" " eor r1, r1, r0\n" @@ -4062,9 +5254,9 @@ void debug_sub_811B210() " and r0, r0, r3\n" " strb r0, [r2]\n" " bx lr\n" - "._6:\n" + ".__6:\n" " .align 2, 0\n" - "._5:\n" + ".__5:\n" " .word unk_debug_bss_1+0x3\n" " .word unk_debug_bss_1\n" "\n" @@ -4075,12 +5267,12 @@ __attribute__((naked)) void debug_sub_811B238() { asm( - " ldr r1, ._7\n" + " ldr r1, .__7\n" " ldrb r0, [r1]\n" " mov r3, #0x8\n" " orr r0, r0, r3\n" " strb r0, [r1]\n" - " ldr r2, ._7 + 4\n" + " ldr r2, .__7 + 4\n" " ldrb r1, [r2]\n" " mov r0, #0x8\n" " eor r1, r1, r0\n" @@ -4090,9 +5282,9 @@ void debug_sub_811B238() " and r0, r0, r3\n" " strb r0, [r2]\n" " bx lr\n" - "._8:\n" + ".__8:\n" " .align 2, 0\n" - "._7:\n" + ".__7:\n" " .word unk_debug_bss_1+0x3\n" " .word unk_debug_bss_1\n" "\n" @@ -4103,12 +5295,12 @@ __attribute__((naked)) void debug_sub_811B260() { asm( - " ldr r1, ._9\n" + " ldr r1, .__9\n" " ldrb r0, [r1]\n" " mov r3, #0x10\n" " orr r0, r0, r3\n" " strb r0, [r1]\n" - " ldr r2, ._9 + 4\n" + " ldr r2, .__9 + 4\n" " ldrb r1, [r2]\n" " mov r0, #0x10\n" " eor r1, r1, r0\n" @@ -4118,9 +5310,9 @@ void debug_sub_811B260() " and r0, r0, r3\n" " strb r0, [r2]\n" " bx lr\n" - "._10:\n" + ".__10:\n" " .align 2, 0\n" - "._9:\n" + ".__9:\n" " .word unk_debug_bss_1+0x3\n" " .word unk_debug_bss_1\n" "\n" @@ -4131,12 +5323,12 @@ __attribute__((naked)) void debug_sub_811B288() { asm( - " ldr r1, ._11\n" + " ldr r1, .__11\n" " ldrb r0, [r1]\n" " mov r3, #0x40\n" " orr r0, r0, r3\n" " strb r0, [r1]\n" - " ldr r2, ._11 + 4\n" + " ldr r2, .__11 + 4\n" " ldrb r1, [r2]\n" " mov r0, #0x40\n" " eor r1, r1, r0\n" @@ -4146,9 +5338,9 @@ void debug_sub_811B288() " and r0, r0, r3\n" " strb r0, [r2]\n" " bx lr\n" - "._12:\n" + ".__12:\n" " .align 2, 0\n" - "._11:\n" + ".__11:\n" " .word unk_debug_bss_1+0x3\n" " .word unk_debug_bss_1\n" "\n" @@ -4159,12 +5351,12 @@ __attribute__((naked)) void debug_sub_811B2B0() { asm( - " ldr r1, ._13\n" + " ldr r1, .__13\n" " ldrb r0, [r1]\n" " mov r3, #0x80\n" " orr r0, r0, r3\n" " strb r0, [r1]\n" - " ldr r2, ._13 + 4\n" + " ldr r2, .__13 + 4\n" " ldrb r1, [r2]\n" " mov r0, #0x80\n" " eor r1, r1, r0\n" @@ -4174,9 +5366,9 @@ void debug_sub_811B2B0() " and r0, r0, r3\n" " strb r0, [r2]\n" " bx lr\n" - "._14:\n" + ".__14:\n" " .align 2, 0\n" - "._13:\n" + ".__13:\n" " .word unk_debug_bss_1+0x3\n" " .word unk_debug_bss_1\n" "\n" @@ -4187,15 +5379,15 @@ __attribute__((naked)) void debug_sub_811B2D8() { asm( - " ldr r0, ._15\n" + " ldr r0, .__15\n" " ldrb r1, [r0]\n" " mov r2, #0x20\n" " orr r1, r1, r2\n" " strb r1, [r0]\n" " bx lr\n" - "._16:\n" + ".__16:\n" " .align 2, 0\n" - "._15:\n" + ".__15:\n" " .word unk_debug_bss_1+0x3\n" "\n" ); @@ -4207,7 +5399,7 @@ void debug_sub_811B2E8() asm( " push {lr}\n" " add sp, sp, #0xfffffffc\n" - " ldr r0, ._17\n" + " ldr r0, .__17\n" " ldrb r1, [r0, #0x1]\n" " add r1, r1, #0x1\n" " mov r0, sp\n" @@ -4221,9 +5413,9 @@ void debug_sub_811B2E8() " add sp, sp, #0x4\n" " pop {r0}\n" " bx r0\n" - "._18:\n" + ".__18:\n" " .align 2, 0\n" - "._17:\n" + ".__17:\n" " .word +0x2000000\n" "\n" ); @@ -4235,90 +5427,90 @@ void debug_sub_811B310() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffff8\n" - " ldr r0, ._21\n" + " ldr r0, .__21\n" " mov r1, #0x1\n" " mov r2, #0x1\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 4\n" + " ldr r0, .__21 + 4\n" " mov r1, #0x1\n" " mov r2, #0x3\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 8\n" + " ldr r0, .__21 + 8\n" " mov r1, #0x1\n" " mov r2, #0x5\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 12\n" + " ldr r0, .__21 + 12\n" " mov r1, #0x1\n" " mov r2, #0x7\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 16\n" + " ldr r0, .__21 + 16\n" " mov r1, #0x1\n" " mov r2, #0x9\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 20\n" + " ldr r0, .__21 + 20\n" " mov r1, #0x1\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 24\n" + " ldr r0, .__21 + 24\n" " mov r1, #0x1\n" " mov r2, #0xd\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 28\n" + " ldr r0, .__21 + 28\n" " mov r1, #0x1\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 32\n" + " ldr r0, .__21 + 32\n" " mov r1, #0x1\n" " mov r2, #0x11\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 36\n" + " ldr r0, .__21 + 36\n" " mov r1, #0xf\n" " mov r2, #0x1\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 40\n" + " ldr r0, .__21 + 40\n" " mov r1, #0xf\n" " mov r2, #0x3\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 44\n" + " ldr r0, .__21 + 44\n" " mov r1, #0xf\n" " mov r2, #0x5\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 48\n" + " ldr r0, .__21 + 48\n" " mov r1, #0xf\n" " mov r2, #0x7\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 52\n" + " ldr r0, .__21 + 52\n" " mov r1, #0xf\n" " mov r2, #0x9\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 56\n" + " ldr r0, .__21 + 56\n" " mov r1, #0xf\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 60\n" + " ldr r0, .__21 + 60\n" " mov r1, #0xf\n" " mov r2, #0xd\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 64\n" + " ldr r0, .__21 + 64\n" " mov r1, #0xf\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 68\n" + " ldr r0, .__21 + 68\n" " mov r1, #0xf\n" " mov r2, #0x11\n" " bl Menu_PrintText\n" - " ldr r0, ._21 + 72\n" + " ldr r0, .__21 + 72\n" " ldrb r0, [r0, #0x3]\n" " cmp r0, #0\n" - " bne ._19 @cond_branch\n" - " ldr r0, ._21 + 76\n" + " bne .__19 @cond_branch\n" + " ldr r0, .__21 + 76\n" " mov r1, #0xa\n" " mov r2, #0x9\n" " bl Menu_PrintText\n" - " b ._20\n" - "._22:\n" + " b .__20\n" + ".__22:\n" " .align 2, 0\n" - "._21:\n" + ".__21:\n" " .word Str_841B1C4\n" " .word Str_841B1CB\n" " .word Str_841B1D4\n" @@ -4339,13 +5531,13 @@ void debug_sub_811B310() " .word Str_841B243\n" " .word +0x2000000\n" " .word Str_841B246\n" - "._19:\n" - " ldr r0, ._30\n" + ".__19:\n" + " ldr r0, .__30\n" " mov r1, #0xa\n" " mov r2, #0x9\n" " bl Menu_PrintText\n" - "._20:\n" - " ldr r4, ._30 + 4\n" + ".__20:\n" + " ldr r4, .__30 + 4\n" " ldr r1, [r4, #0x68]\n" " mov r0, sp\n" " mov r2, #0x2\n" @@ -4454,77 +5646,77 @@ void debug_sub_811B310() " mov r1, #0x14\n" " mov r2, #0x11\n" " bl Menu_PrintText\n" - " ldr r1, ._30 + 8\n" + " ldr r1, .__30 + 8\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" - " beq ._23 @cond_branch\n" + " beq .__23 @cond_branch\n" " mov r2, #0x0\n" " cmp r0, #0x8\n" - " beq ._24 @cond_branch\n" + " beq .__24 @cond_branch\n" " cmp r0, #0x8\n" - " bgt ._25 @cond_branch\n" + " bgt .__25 @cond_branch\n" " cmp r0, #0x2\n" - " beq ._26 @cond_branch\n" + " beq .__26 @cond_branch\n" " cmp r0, #0x2\n" - " bgt ._27 @cond_branch\n" + " bgt .__27 @cond_branch\n" " cmp r0, #0x1\n" - " beq ._28 @cond_branch\n" - " b ._45\n" - "._31:\n" + " beq .__28 @cond_branch\n" + " b .__45\n" + ".__31:\n" " .align 2, 0\n" - "._30:\n" + ".__30:\n" " .word Str_841B249\n" " .word +0x2000000\n" " .word unk_debug_bss_1\n" - "._27:\n" + ".__27:\n" " cmp r0, #0x4\n" - " beq ._32 @cond_branch\n" - " b ._45\n" - "._25:\n" + " beq .__32 @cond_branch\n" + " b .__45\n" + ".__25:\n" " cmp r0, #0x40\n" - " beq ._34 @cond_branch\n" + " beq .__34 @cond_branch\n" " cmp r0, #0x40\n" - " bgt ._35 @cond_branch\n" + " bgt .__35 @cond_branch\n" " cmp r0, #0x10\n" - " beq ._36 @cond_branch\n" - " b ._45\n" - "._35:\n" + " beq .__36 @cond_branch\n" + " b .__45\n" + ".__35:\n" " cmp r0, #0x80\n" - " beq ._38 @cond_branch\n" - " b ._45\n" - "._26:\n" + " beq .__38 @cond_branch\n" + " b .__45\n" + ".__26:\n" " mov r2, #0x3\n" - " b ._45\n" - "._28:\n" + " b .__45\n" + ".__28:\n" " mov r2, #0x5\n" - " b ._45\n" - "._32:\n" + " b .__45\n" + ".__32:\n" " mov r2, #0x7\n" - " b ._45\n" - "._24:\n" + " b .__45\n" + ".__24:\n" " mov r2, #0x9\n" - " b ._45\n" - "._36:\n" + " b .__45\n" + ".__36:\n" " mov r2, #0xb\n" - " b ._45\n" - "._34:\n" + " b .__45\n" + ".__34:\n" " mov r2, #0xd\n" - " b ._45\n" - "._38:\n" + " b .__45\n" + ".__38:\n" " mov r2, #0xf\n" - "._45:\n" - " ldr r0, ._46\n" + ".__45:\n" + " ldr r0, .__46\n" " mov r1, #0x17\n" " bl Menu_PrintText\n" - "._23:\n" + ".__23:\n" " bl debug_sub_811B2E8\n" " add sp, sp, #0x8\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" - "._47:\n" + ".__47:\n" " .align 2, 0\n" - "._46:\n" + ".__46:\n" " .word Str_841B26D\n" "\n" ); @@ -4539,16 +5731,16 @@ void debug_sub_811B5B4() " ldr r0, [r2]\n" " add r0, r0, r1\n" " str r0, [r2]\n" - " ldr r1, ._49\n" + " ldr r1, .__49\n" " cmp r0, r1\n" - " ble ._48 @cond_branch\n" + " ble .__48 @cond_branch\n" " str r1, [r2]\n" - "._48:\n" + ".__48:\n" " pop {r0}\n" " bx r0\n" - "._50:\n" + ".__50:\n" " .align 2, 0\n" - "._49:\n" + ".__49:\n" " .word 0x270f\n" "\n" ); @@ -4558,16 +5750,16 @@ __attribute__((naked)) void debug_sub_811B5D0() { asm( - " ldr r0, ._51\n" + " ldr r0, .__51\n" " mov r1, #0x0\n" " strb r1, [r0]\n" - " ldr r0, ._51 + 4\n" + " ldr r0, .__51 + 4\n" " strb r1, [r0]\n" - " ldr r0, ._51 + 8\n" + " ldr r0, .__51 + 8\n" " strb r1, [r0]\n" - " ldr r0, ._51 + 12\n" + " ldr r0, .__51 + 12\n" " strb r1, [r0]\n" - " ldr r2, ._51 + 16\n" + " ldr r2, .__51 + 16\n" " mov r0, #0x0\n" " str r0, [r2, #0x68]\n" " str r0, [r2, #0x6c]\n" @@ -4587,9 +5779,9 @@ void debug_sub_811B5D0() " add r1, r1, #0x4\n" " str r0, [r1]\n" " bx lr\n" - "._52:\n" + ".__52:\n" " .align 2, 0\n" - "._51:\n" + ".__51:\n" " .word unk_debug_bss_1\n" " .word unk_debug_bss_1+0x2\n" " .word unk_debug_bss_1+0x3\n" @@ -4604,14 +5796,14 @@ void debug_sub_811B620() { asm( " push {lr}\n" - " ldr r0, ._53\n" + " ldr r0, .__53\n" " mov r1, #0x0\n" " bl CreateTask\n" " pop {r0}\n" " bx r0\n" - "._54:\n" + ".__54:\n" " .align 2, 0\n" - "._53:\n" + ".__53:\n" " .word debug_sub_811B654+1\n" "\n" ); @@ -4622,21 +5814,21 @@ void debug_sub_811B634() { asm( " push {lr}\n" - " ldr r0, ._57\n" + " ldr r0, .__57\n" " bl FindTaskIdByFunc\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r0, #0xff\n" - " beq ._55 @cond_branch\n" + " beq .__55 @cond_branch\n" " mov r0, #0x0\n" - " b ._56\n" - "._58:\n" + " b .__56\n" + ".__58:\n" " .align 2, 0\n" - "._57:\n" + ".__57:\n" " .word debug_sub_811B654+1\n" - "._55:\n" + ".__55:\n" " mov r0, #0x1\n" - "._56:\n" + ".__56:\n" " pop {r1}\n" " bx r1\n" "\n" @@ -4654,32 +5846,32 @@ void debug_sub_811B654() " lsl r0, r6, #0x2\n" " add r0, r0, r6\n" " lsl r0, r0, #0x3\n" - " ldr r1, ._63\n" + " ldr r1, .__63\n" " add r5, r0, r1\n" " mov r0, #0x8\n" " ldsh r1, [r5, r0]\n" " cmp r1, #0x1\n" - " beq ._59 @cond_branch\n" + " beq .__59 @cond_branch\n" " cmp r1, #0x1\n" - " bgt ._60 @cond_branch\n" + " bgt .__60 @cond_branch\n" " cmp r1, #0\n" - " beq ._61 @cond_branch\n" - " b ._116\n" - "._64:\n" + " beq .__61 @cond_branch\n" + " b .__116\n" + ".__64:\n" " .align 2, 0\n" - "._63:\n" + ".__63:\n" " .word gTasks\n" - "._60:\n" + ".__60:\n" " cmp r1, #0x2\n" - " bne ._65 @cond_branch\n" - " b ._66\n" - "._65:\n" + " bne .__65 @cond_branch\n" + " b .__66\n" + ".__65:\n" " cmp r1, #0x3\n" - " bne ._67 @cond_branch\n" - " b ._68\n" - "._67:\n" - " b ._116\n" - "._61:\n" + " bne .__67 @cond_branch\n" + " b .__68\n" + ".__67:\n" + " b .__116\n" + ".__61:\n" " mov r0, #0x0\n" " mov r1, #0x0\n" " mov r2, #0x18\n" @@ -4689,64 +5881,64 @@ void debug_sub_811B654() " ldrh r0, [r5, #0x8]\n" " add r0, r0, #0x1\n" " strh r0, [r5, #0x8]\n" - " b ._116\n" - "._59:\n" - " ldr r7, ._76\n" + " b .__116\n" + ".__59:\n" + " ldr r7, .__76\n" " ldrh r2, [r7, #0x2e]\n" " mov r0, #0x2\n" " and r0, r0, r2\n" " cmp r0, #0\n" - " beq ._71 @cond_branch\n" - " b ._94\n" - "._71:\n" + " beq .__71 @cond_branch\n" + " b .__94\n" + ".__71:\n" " mov r0, #0x20\n" " and r0, r0, r2\n" " lsl r0, r0, #0x10\n" " lsr r3, r0, #0x10\n" " cmp r3, #0\n" - " beq ._73 @cond_branch\n" - " ldr r1, ._76 + 4\n" + " beq .__73 @cond_branch\n" + " ldr r1, .__76 + 4\n" " ldrb r0, [r1, #0x1]\n" " sub r0, r0, #0x1\n" " strb r0, [r1, #0x1]\n" " lsl r0, r0, #0x18\n" " cmp r0, #0\n" - " bge ._79 @cond_branch\n" + " bge .__79 @cond_branch\n" " mov r0, #0x5\n" " strb r0, [r1, #0x1]\n" - " b ._79\n" - "._77:\n" + " b .__79\n" + ".__77:\n" " .align 2, 0\n" - "._76:\n" + ".__76:\n" " .word gMain\n" " .word +0x2000000\n" - "._73:\n" + ".__73:\n" " mov r0, #0x10\n" " and r0, r0, r2\n" " cmp r0, #0\n" - " beq ._78 @cond_branch\n" - " ldr r1, ._81\n" + " beq .__78 @cond_branch\n" + " ldr r1, .__81\n" " ldrb r0, [r1, #0x1]\n" " add r0, r0, #0x1\n" " strb r0, [r1, #0x1]\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r0, #0x5\n" - " bls ._79 @cond_branch\n" + " bls .__79 @cond_branch\n" " strb r3, [r1, #0x1]\n" - "._79:\n" + ".__79:\n" " bl debug_sub_811B2E8\n" - " b ._116\n" - "._82:\n" + " b .__116\n" + ".__82:\n" " .align 2, 0\n" - "._81:\n" + ".__81:\n" " .word +0x2000000\n" - "._78:\n" + ".__78:\n" " and r1, r1, r2\n" " lsl r0, r1, #0x10\n" " lsr r4, r0, #0x10\n" " cmp r4, #0\n" - " beq ._83 @cond_branch\n" + " beq .__83 @cond_branch\n" " mov r0, #0x3\n" " strh r0, [r5, #0x8]\n" " bl Menu_EraseScreen\n" @@ -4755,28 +5947,28 @@ void debug_sub_811B654() " mov r2, #0x9\n" " mov r3, #0x5\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._85\n" + " ldr r0, .__85\n" " mov r1, #0x1\n" " mov r2, #0x1\n" " bl Menu_PrintText\n" - " ldr r0, ._85 + 4\n" + " ldr r0, .__85 + 4\n" " mov r1, #0x1\n" " mov r2, #0x3\n" " bl Menu_PrintText\n" - " b ._116\n" - "._86:\n" + " b .__116\n" + ".__86:\n" " .align 2, 0\n" - "._85:\n" + ".__85:\n" " .word Str_841B25C\n" " .word Str_841B264\n" - "._83:\n" + ".__83:\n" " mov r0, #0x4\n" " and r0, r0, r2\n" " cmp r0, #0\n" - " beq ._87 @cond_branch\n" - " ldr r0, ._91\n" + " beq .__87 @cond_branch\n" + " ldr r0, .__91\n" " strb r4, [r0]\n" - " ldr r0, ._91 + 4\n" + " ldr r0, .__91 + 4\n" " strb r4, [r0]\n" " bl Menu_EraseScreen\n" " mov r0, #0x0\n" @@ -4784,11 +5976,11 @@ void debug_sub_811B654() " mov r2, #0xa\n" " mov r3, #0x13\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._91 + 8\n" + " ldr r0, .__91 + 8\n" " mov r1, #0x1\n" " mov r2, #0x1\n" " bl Menu_PrintText\n" - " ldr r3, ._91 + 12\n" + " ldr r3, .__91 + 12\n" " mov r0, #0x2\n" " mov r1, #0x3\n" " mov r2, #0x8\n" @@ -4804,144 +5996,144 @@ void debug_sub_811B654() " ldrh r0, [r5, #0x8]\n" " add r0, r0, #0x1\n" " strh r0, [r5, #0x8]\n" - "._87:\n" + ".__87:\n" " ldrh r1, [r7, #0x2e]\n" " mov r0, #0x8\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " bne ._88 @cond_branch\n" - " b ._116\n" - "._88:\n" - " ldr r1, ._91 + 16\n" + " bne .__88 @cond_branch\n" + " b .__116\n" + ".__88:\n" + " ldr r1, .__91 + 16\n" " mov r0, #0x1\n" " strb r0, [r1]\n" - " b ._94\n" - "._92:\n" + " b .__94\n" + ".__92:\n" " .align 2, 0\n" - "._91:\n" + ".__91:\n" " .word unk_debug_bss_1+0x2\n" " .word unk_debug_bss_1+0x3\n" " .word Str_841B254\n" " .word _841B270\n" " .word unk_debug_bss_1+0x4\n" - "._66:\n" + ".__66:\n" " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" " asr r2, r0, #0x18\n" " mov r0, #0x2\n" " neg r0, r0\n" " cmp r2, r0\n" - " beq ._116 @cond_branch\n" + " beq .__116 @cond_branch\n" " add r0, r0, #0x1\n" " cmp r2, r0\n" - " beq ._94 @cond_branch\n" - " ldr r1, ._96\n" + " beq .__94 @cond_branch\n" + " ldr r1, .__96\n" " mov r0, #0x1\n" " strb r0, [r1]\n" - " ldr r0, ._96 + 4\n" + " ldr r0, .__96 + 4\n" " lsl r1, r2, #0x3\n" " add r0, r0, #0x4\n" " add r1, r1, r0\n" " ldr r0, [r1]\n" " bl _call_via_r0\n" - "._94:\n" + ".__94:\n" " bl Menu_EraseScreen\n" " add r0, r6, #0\n" " bl DestroyTask\n" - " b ._116\n" - "._97:\n" + " b .__116\n" + ".__97:\n" " .align 2, 0\n" - "._96:\n" + ".__96:\n" " .word unk_debug_bss_1+0x2\n" " .word _841B270\n" - "._68:\n" - " ldr r2, ._100\n" + ".__68:\n" + " ldr r2, .__100\n" " ldrh r1, [r2, #0x30]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " beq ._98 @cond_branch\n" - " ldr r2, ._100 + 4\n" + " beq .__98 @cond_branch\n" + " ldr r2, .__100 + 4\n" " ldrh r0, [r2, #0xc]\n" " add r0, r0, #0x64\n" - " b ._99\n" - "._101:\n" + " b .__99\n" + ".__101:\n" " .align 2, 0\n" - "._100:\n" + ".__100:\n" " .word gMain\n" " .word +0x2000000\n" - "._98:\n" + ".__98:\n" " mov r0, #0x40\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " beq ._102 @cond_branch\n" - " ldr r1, ._104\n" + " beq .__102 @cond_branch\n" + " ldr r1, .__104\n" " ldrh r0, [r1, #0xc]\n" " sub r0, r0, #0x64\n" - " b ._103\n" - "._105:\n" + " b .__103\n" + ".__105:\n" " .align 2, 0\n" - "._104:\n" + ".__104:\n" " .word +0x2000000\n" - "._102:\n" + ".__102:\n" " mov r0, #0x20\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " beq ._106 @cond_branch\n" - " ldr r1, ._109\n" - " ldr r2, ._109 + 4\n" + " beq .__106 @cond_branch\n" + " ldr r1, .__109\n" + " ldr r2, .__109 + 4\n" " add r0, r2, #0\n" " ldrh r2, [r1, #0xc]\n" " add r0, r0, r2\n" - "._103:\n" + ".__103:\n" " strh r0, [r1, #0xc]\n" " lsl r0, r0, #0x10\n" " cmp r0, #0\n" - " bgt ._116 @cond_branch\n" - " ldr r0, ._109 + 8\n" + " bgt .__116 @cond_branch\n" + " ldr r0, .__109 + 8\n" " strh r0, [r1, #0xc]\n" - " b ._116\n" - "._110:\n" + " b .__116\n" + ".__110:\n" " .align 2, 0\n" - "._109:\n" + ".__109:\n" " .word +0x2000000\n" " .word 0xfffffc18\n" " .word 0x270f\n" - "._106:\n" + ".__106:\n" " mov r0, #0x10\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " beq ._111 @cond_branch\n" - " ldr r2, ._114\n" + " beq .__111 @cond_branch\n" + " ldr r2, .__114\n" " mov r1, #0xfa\n" " lsl r1, r1, #0x2\n" " add r0, r1, #0\n" " ldrh r1, [r2, #0xc]\n" " add r0, r0, r1\n" - "._99:\n" + ".__99:\n" " strh r0, [r2, #0xc]\n" " lsl r0, r0, #0x10\n" " asr r0, r0, #0x10\n" - " ldr r1, ._114 + 4\n" + " ldr r1, .__114 + 4\n" " cmp r0, r1\n" - " ble ._116 @cond_branch\n" + " ble .__116 @cond_branch\n" " strh r1, [r2, #0xc]\n" - " b ._116\n" - "._115:\n" + " b .__116\n" + ".__115:\n" " .align 2, 0\n" - "._114:\n" + ".__114:\n" " .word +0x2000000\n" " .word 0x270f\n" - "._111:\n" + ".__111:\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x2\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " beq ._116 @cond_branch\n" + " beq .__116 @cond_branch\n" " bl Menu_EraseScreen\n" " add r0, r6, #0\n" " bl DestroyTask\n" - "._116:\n" + ".__116:\n" " add sp, sp, #0x8\n" " pop {r4, r5, r6, r7}\n" " pop {r0}\n" @@ -4960,232 +6152,232 @@ void debug_sub_811B894() " mov r5, r8\n" " push {r5, r6, r7}\n" " add sp, sp, #0xfffffffc\n" - " ldr r1, ._122\n" + " ldr r1, .__122\n" " ldrh r2, [r1, #0x8]\n" " mov r0, #0xc0\n" " lsl r0, r0, #0x1\n" " and r0, r0, r2\n" " add r4, r1, #0\n" " cmp r0, #0\n" - " beq ._117 @cond_branch\n" + " beq .__117 @cond_branch\n" " add r1, r1, #0x90\n" " ldr r0, [r1]\n" " add r0, r0, #0x1\n" " str r0, [r1]\n" - " ldr r2, ._122 + 4\n" + " ldr r2, .__122 + 4\n" " cmp r0, r2\n" - " ble ._118 @cond_branch\n" + " ble .__118 @cond_branch\n" " str r2, [r1]\n" - "._118:\n" + ".__118:\n" " add r0, r4, #0\n" " add r0, r0, #0x88\n" " ldr r1, [r1]\n" " ldr r0, [r0]\n" " cmp r1, r0\n" - " beq ._119 @cond_branch\n" - " ldr r0, ._122 + 8\n" + " beq .__119 @cond_branch\n" + " ldr r0, .__122 + 8\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" - " ldr r1, ._122 + 12\n" + " ldr r1, .__122 + 12\n" " mov r0, #0x0\n" " strb r0, [r1]\n" - "._119:\n" + ".__119:\n" " ldrb r1, [r4, #0x4]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" " cmp r4, #0\n" - " bne ._126 @cond_branch\n" - " ldr r0, ._122 + 16\n" + " bne .__126 @cond_branch\n" + " ldr r0, .__122 + 16\n" " mov r1, #0x4\n" " mov r2, #0x11\n" - " b ._121\n" - "._123:\n" + " b .__121\n" + ".__123:\n" " .align 2, 0\n" - "._122:\n" + ".__122:\n" " .word +0x2000000\n" " .word 0x270f\n" " .word Str_841B2B0\n" " .word unk_debug_bss_1+0x4\n" " .word Str_841B2D3\n" - "._117:\n" + ".__117:\n" " lsl r0, r2, #0x10\n" " cmp r0, #0\n" - " beq ._127 @cond_branch\n" + " beq .__127 @cond_branch\n" " ldrb r1, [r4, #0x4]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " beq ._126 @cond_branch\n" + " beq .__126 @cond_branch\n" " mov r4, #0x3\n" " and r4, r4, r2\n" " cmp r4, #0\n" - " bne ._126 @cond_branch\n" - " ldr r0, ._163\n" + " bne .__126 @cond_branch\n" + " ldr r0, .__163\n" " mov r1, #0x4\n" " mov r2, #0x2\n" - "._121:\n" + ".__121:\n" " bl Menu_PrintText\n" - " ldr r0, ._163 + 4\n" + " ldr r0, .__163 + 4\n" " strb r4, [r0]\n" - "._126:\n" - " ldr r0, ._163 + 8\n" + ".__126:\n" + " ldr r0, .__163 + 8\n" " ldrh r1, [r0, #0x8]\n" " add r4, r0, #0\n" " cmp r1, #0\n" - " beq ._127 @cond_branch\n" - " b ._162\n" - "._127:\n" + " beq .__127 @cond_branch\n" + " b .__162\n" + ".__127:\n" " mov r1, #0x12\n" " ldsh r0, [r4, r1]\n" " cmp r0, #0x3\n" - " beq ._129 @cond_branch\n" - " b ._162\n" - "._129:\n" + " beq .__129 @cond_branch\n" + " b .__162\n" + ".__129:\n" " ldrb r1, [r4, #0x4]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" " cmp r0, #0\n" - " beq ._131 @cond_branch\n" - " b ._162\n" - "._131:\n" + " beq .__131 @cond_branch\n" + " b .__162\n" + ".__131:\n" " mov r0, #0x0\n" " mov r1, #0x1\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r7, r0, #0x18\n" " mov r0, #0x0\n" " mov r1, #0x2\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " str r0, [sp]\n" " mov r0, #0x0\n" " mov r1, #0x3\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r6, r0, #0x18\n" " mov r0, #0x1\n" " mov r1, #0x1\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r9, r0\n" " mov r0, #0x1\n" " mov r1, #0x2\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" " mov r0, #0x1\n" " mov r1, #0x3\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov sl, r0\n" " mov r0, #0x2\n" " mov r1, #0x1\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" " mov r0, #0x2\n" " mov r1, #0x2\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r8, r0\n" " mov r0, #0x2\n" " mov r1, #0x3\n" - " bl sub_8102BA4\n" + " bl GetTagOfReelSymbolOnScreenAtPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r7, #0\n" - " bne ._134 @cond_branch\n" + " bne .__134 @cond_branch\n" " mov r1, r9\n" " cmp r1, #0x1\n" - " bne ._134 @cond_branch\n" + " bne .__134 @cond_branch\n" " cmp r5, #0\n" - " beq ._159 @cond_branch\n" - "._134:\n" + " beq .__159 @cond_branch\n" + ".__134:\n" " ldr r1, [sp]\n" " cmp r1, #0\n" - " bne ._137 @cond_branch\n" + " bne .__137 @cond_branch\n" " cmp r4, #0x1\n" - " bne ._137 @cond_branch\n" + " bne .__137 @cond_branch\n" " mov r1, r8\n" " cmp r1, #0\n" - " beq ._159 @cond_branch\n" - "._137:\n" + " beq .__159 @cond_branch\n" + ".__137:\n" " cmp r6, #0\n" - " bne ._140 @cond_branch\n" + " bne .__140 @cond_branch\n" " mov r1, sl\n" " cmp r1, #0x1\n" - " bne ._140 @cond_branch\n" + " bne .__140 @cond_branch\n" " cmp r0, #0\n" - " beq ._159 @cond_branch\n" - "._140:\n" + " beq .__159 @cond_branch\n" + ".__140:\n" " cmp r7, #0\n" - " bne ._143 @cond_branch\n" + " bne .__143 @cond_branch\n" " cmp r4, #0x1\n" - " bne ._143 @cond_branch\n" + " bne .__143 @cond_branch\n" " cmp r0, #0\n" - " beq ._159 @cond_branch\n" - "._143:\n" + " beq .__159 @cond_branch\n" + ".__143:\n" " cmp r6, #0\n" - " bne ._146 @cond_branch\n" + " bne .__146 @cond_branch\n" " cmp r4, #0x1\n" - " bne ._146 @cond_branch\n" + " bne .__146 @cond_branch\n" " cmp r5, #0\n" - " beq ._159 @cond_branch\n" - "._146:\n" + " beq .__159 @cond_branch\n" + ".__146:\n" " cmp r7, #0x1\n" - " bne ._149 @cond_branch\n" + " bne .__149 @cond_branch\n" " mov r1, r9\n" " cmp r1, #0\n" - " bne ._149 @cond_branch\n" + " bne .__149 @cond_branch\n" " cmp r5, #0x1\n" - " beq ._159 @cond_branch\n" - "._149:\n" + " beq .__159 @cond_branch\n" + ".__149:\n" " ldr r1, [sp]\n" " cmp r1, #0x1\n" - " bne ._152 @cond_branch\n" + " bne .__152 @cond_branch\n" " cmp r4, #0\n" - " bne ._152 @cond_branch\n" + " bne .__152 @cond_branch\n" " mov r1, r8\n" " cmp r1, #0x1\n" - " beq ._159 @cond_branch\n" - "._152:\n" + " beq .__159 @cond_branch\n" + ".__152:\n" " cmp r6, #0x1\n" - " bne ._155 @cond_branch\n" + " bne .__155 @cond_branch\n" " mov r1, sl\n" " cmp r1, #0\n" - " bne ._155 @cond_branch\n" + " bne .__155 @cond_branch\n" " cmp r0, #0x1\n" - " beq ._159 @cond_branch\n" - "._155:\n" + " beq .__159 @cond_branch\n" + ".__155:\n" " cmp r7, #0x1\n" - " bne ._158 @cond_branch\n" + " bne .__158 @cond_branch\n" " cmp r4, #0\n" - " bne ._158 @cond_branch\n" + " bne .__158 @cond_branch\n" " cmp r0, #0x1\n" - " beq ._159 @cond_branch\n" - "._158:\n" + " beq .__159 @cond_branch\n" + ".__158:\n" " cmp r6, #0x1\n" - " bne ._162 @cond_branch\n" + " bne .__162 @cond_branch\n" " cmp r4, #0\n" - " bne ._162 @cond_branch\n" + " bne .__162 @cond_branch\n" " cmp r5, #0x1\n" - " bne ._162 @cond_branch\n" - "._159:\n" - " ldr r0, ._163 + 12\n" + " bne .__162 @cond_branch\n" + ".__159:\n" + " ldr r0, .__163 + 12\n" " mov r1, #0x4\n" " mov r2, #0x0\n" " bl Menu_PrintText\n" - " ldr r1, ._163 + 4\n" + " ldr r1, .__163 + 4\n" " mov r0, #0x0\n" " strb r0, [r1]\n" - "._162:\n" + ".__162:\n" " add sp, sp, #0x4\n" " pop {r3, r4, r5}\n" " mov r8, r3\n" @@ -5194,9 +6386,9 @@ void debug_sub_811B894() " pop {r4, r5, r6, r7}\n" " pop {r0}\n" " bx r0\n" - "._164:\n" + ".__164:\n" " .align 2, 0\n" - "._163:\n" + ".__163:\n" " .word Str_841B2E4\n" " .word unk_debug_bss_1+0x4\n" " .word +0x2000000\n" @@ -6636,3 +7828,50 @@ static const struct SpritePalette gSlotMachineSpritePalettes[] = { static const u8 sReelTimeGfx[] = INCBIN_U8("graphics/slot_machine/reel_time.4bpp.lz"); static const u16 sReelTimeWindowTilemap[] = INCBIN_U16("graphics/slot_machine/reel_time_window_map.bin"); + +#if DEBUG + +const u8 Str_841B1C4[] = _("SETTEI"); +const u8 Str_841B1CB[] = _("MAWASITA"); +const u8 Str_841B1D4[] = _("MODOSI"); +const u8 Str_841B1DB[] = _("NOMARE"); +const u8 Str_841B1E2[] = _("MAE 7"); +const u8 Str_841B1E8[] = _("LR  HENKOU"); +const u8 Str_841B1F3[] = _("START  JIDOUSU"); +const u8 Str_841B202[] = _("SELECT  SETTEI"); +const u8 Str_841B211[] = _("TYUHSEN"); +const u8 Str_841B219[] = _("CHERRY"); +const u8 Str_841B220[] = _("REPLAY"); +const u8 Str_841B227[] = _("HASUBO"); +const u8 Str_841B22E[] = _("RURIRI"); +const u8 Str_841B235[] = _("INAZU"); +const u8 Str_841B23B[] = _("REG"); +const u8 Str_841B23F[] = _("BIG"); +const u8 Str_841B243[] = _("BD"); +const u8 Str_841B246[] = _("R7"); +const u8 Str_841B249[] = _("B7"); +const u8 Str_841B24C[] = _("A  COIN"); +const u8 Str_841B254[] = _("TYUHSEN"); +const u8 Str_841B25C[] = _("UD  100"); +const u8 Str_841B264[] = _("LR  1000"); +const u8 Str_841B26D[] = _("×"); + +// Is this MenuAction2? I'm not sure. +const struct {const u8 *text; void (*func)();} _841B270[] = +{ + {Str_841B219, debug_sub_811B1C4}, + {Str_841B220, debug_sub_811B1EC}, + {Str_841B227, debug_sub_811B210}, + {Str_841B22E, debug_sub_811B238}, + {Str_841B235, debug_sub_811B260}, + {Str_841B23B, debug_sub_811B288}, + {Str_841B23F, debug_sub_811B2B0}, + {Str_841B243, debug_sub_811B2D8}, +}; + +const u8 Str_841B2B0[] = _("·カウントエラーがおきました"); +const u8 Str_841B2BF[] = _("·リールそうさで エラーが おきました"); +const u8 Str_841B2D3[] = _("·フラグオフエラーが おきました"); +const u8 Str_841B2E4[] = _("·ボーナスこやくの エラーが おきました"); + +#endif diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index c652b9398..ecff15c21 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -234,9 +234,84 @@ const struct MailLayout gUnknown_083E57A4[] = {5, 15, 15, 4, 3, Unknown_3E5790}, }; +#if DEBUG + +const u8 Str_8411540[] = _("レイアウトを にほんごで ひょうじ?"); // Display using Japanese layout? +const u8 Str_8411553[] = _("にほんご "); // Japanese +const u8 Str_8411559[] = _("かいがい "); // Overseas + +const u8 *const _8411560[] = +{ + Str_8411553, + Str_8411559, +}; + +const u8 Str_8411568[] = _("イメージ タイプを えらんでね"); // Choose an image type +const u8 Str_8411578[] = _("{STR_VAR_1}"); +const u8 Str_841157B[] = _("オレンジ "); // Orange +const u8 Str_8411581[] = _("ハーバー "); // Harbor +const u8 Str_8411587[] = _("キラキラ "); // Glitter +const u8 Str_841158D[] = _("メカニカル"); // Mech +const u8 Str_8411593[] = _("ウッディー"); // Wood +const u8 Str_8411599[] = _("クロス  "); // Wave +const u8 Str_841159F[] = _("トレジャー"); // Bead +const u8 Str_84115A5[] = _("シャドウ "); // Shadow +const u8 Str_84115AB[] = _("トロピカル"); // Tropic +const u8 Str_84115B1[] = _("ドリーム "); // Dream +const u8 Str_84115B7[] = _("ミラクル "); // Fab +const u8 Str_84115BD[] = _("レトロ  "); // Retro + +const u8 *const _84115C4[] = +{ + Str_841157B, + Str_8411581, + Str_8411587, + Str_841158D, + Str_8411593, + Str_8411599, + Str_841159F, + Str_84115A5, + Str_84115AB, + Str_84115B1, + Str_84115B7, + Str_84115BD, +}; + +const u8 Str_84115F4[] = _("メールをみる"); // View Mail +const u8 Str_84115FB[] = _("メールとうろく"); // Register Mail +const u8 Str_8411603[] = _("もたせる"); // Give to Pokémon +const u8 Str_8411608[] = _("メールをけす"); // Delete Mail + +#endif + // XXX: what is this? static u8 *const sSharedMemPtr = gSharedMem; +#if DEBUG + +const u8 Str_841160F[] = _("{STR_VAR_1} {STR_VAR_2}"); +const u8 Str_841161A[] = _("メール{STR_VAR_1} {STR_VAR_2}"); +const u8 Str_8411623[] = _("メール{STR_VAR_1}を だれに もたせる?"); +const u8 Str_8411634[] = _("000 {STR_VAR_1}"); +const u8 Str_841163B[] = _("せいきの データが とうろくずみ です\n"); +const u8 Str_841163B_after[] = _("しんき とうろく できません"); +const u8 Str_841165E[] = _("せいきに とうろくされたメールデータは\n"); +const u8 Str_841165E_after[] = _("へんこう できません"); +const u8 Str_841167D[] = _("メール{STR_VAR_1} とうろく かいじょ"); +const u8 Str_841168D[] = _("デバッグメニューから とうろくした\n"); +const u8 Str_841168D_after[] = _("メール いがいは けせません"); +const u8 Str_84116AE[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); + +const struct MenuAction _84116BC[] = +{ + {Str_84115F4, NULL}, + {Str_84115FB, NULL}, + {Str_8411603, NULL}, + {Str_8411608, NULL}, +}; + +#endif + static u8 sub_80F8A28(void); /*static*/ void sub_80F8D50(void); static void sub_80F8DA0(void); diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index fd4684832..63f1b322a 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -646,7 +646,7 @@ void debug_sub_803F55C() " ldr r4, [sp]\n" " mul r0, r0, r4\n" " mov r1, #0x64\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " add r0, r0, r4\n" " add r0, r0, #0xa\n" " str r0, [sp, #0x4]\n" @@ -673,7 +673,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x8]\n" " add r0, r5, #0\n" @@ -705,7 +705,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " add r0, r0, #0x5\n" " str r0, [sp, #0xc]\n" " add r0, r5, #0\n" @@ -737,7 +737,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x10]\n" " add r0, r5, #0\n" @@ -769,7 +769,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x14]\n" " add r0, r5, #0\n" @@ -801,7 +801,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gScriptFuncs_End+0x3d30\n" + " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x18]\n" " add r0, r5, #0\n" diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c index 001cebe45..cd4c18252 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon/pokemon_storage_system.c @@ -13,7 +13,8 @@ extern const struct StorageAction gUnknown_083B6DF4[]; EWRAM_DATA struct PokemonStorage gPokemonStorage = {0}; -void sub_8098898(u8 index) { +void sub_8098898(u8 index) +{ u8 *ptr; Menu_DrawStdWindowFrame(10, 16, 29, 19); -- cgit v1.2.3 From c3534e7b0e2df48fe989deb74c26f98e1fe759b8 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 16:46:54 -0600 Subject: add more debug code --- data/debug_unk_0.inc | 4 +- src/engine/cable_club.c | 436 +++++++++++++++++++++++++++++++++- src/engine/mystery_event_menu.c | 460 ++++++++++++++++++++++++++++++++++++ src/engine/reset_rtc_screen.c | 316 +++++++++++++++++++++++++ src/field/field_fadetransition.c | 16 ++ src/field/fldeff_cut.c | 109 +++++++++ src/field/fldeff_flash.c | 30 +++ src/field/fldeff_strength.c | 23 ++ src/field/item_menu.c | 498 +++++++++++++++++++++++++++++++++++++++ src/pokemon/pokemon_menu.c | 42 ++++ undefined.txt | 211 +++++++++++++++++ 11 files changed, 2142 insertions(+), 3 deletions(-) create mode 100644 undefined.txt diff --git a/data/debug_unk_0.inc b/data/debug_unk_0.inc index 4a2c2c777..d97e7676f 100644 --- a/data/debug_unk_0.inc +++ b/data/debug_unk_0.inc @@ -1,6 +1,6 @@ debug_unk_0:: @ 0x821F3B8 - .incbin "baserom-debug.gba", 0x21F3B8, 620 + .incbin "baserom_de_debug.gba", 0x21F3B8, 620 Str_821F624:: @ 0x821F624 .string "ーーーーーーーーーーーー$" @@ -36,7 +36,7 @@ debug_unk_0b:: @ 0x821F66D .string "せつぞくエラー$" -.incbin "baserom-debug.gba", 0x21F675, 323 +.incbin "baserom_de_debug.gba", 0x21F675, 323 Str_821F7B8:: @ 0x821F7B8 .string "たかさ $" diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 688560218..c0397f67b 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -95,6 +95,325 @@ const u8 *const gTrainerCardColorNames[] = TrainerCardColorName_Gold, }; +#if DEBUG + +__attribute__((naked)) +int debug_sub_808A4D0() +{ + asm("\ + push {lr}\n\ + add r1, r0, #0\n\ + ldr r0, ._3\n\ + cmp r1, r0\n\ + bne ._1 @cond_branch\n\ + mov r0, #0x1\n\ + b ._30\n\ +._4:\n\ + .align 2, 0\n\ +._3:\n\ + .word sub_8082F68+1\n\ +._1:\n\ + ldr r0, ._7\n\ + cmp r1, r0\n\ + bne ._5 @cond_branch\n\ + mov r0, #0x11\n\ + b ._30\n\ +._8:\n\ + .align 2, 0\n\ +._7:\n\ + .word sub_8082FEC+1\n\ +._5:\n\ + ldr r0, ._11\n\ + cmp r1, r0\n\ + bne ._9 @cond_branch\n\ + mov r0, #0x12\n\ + b ._30\n\ +._12:\n\ + .align 2, 0\n\ +._11:\n\ + .word sub_808303C+1\n\ +._9:\n\ + ldr r0, ._15\n\ + cmp r1, r0\n\ + bne ._13 @cond_branch\n\ + mov r0, #0x13\n\ + b ._30\n\ +._16:\n\ + .align 2, 0\n\ +._15:\n\ + .word sub_8083188+1\n\ +._13:\n\ + ldr r0, ._19\n\ + cmp r1, r0\n\ + bne ._17 @cond_branch\n\ + mov r0, #0x14\n\ + b ._30\n\ +._20:\n\ + .align 2, 0\n\ +._19:\n\ + .word sub_80830E4+1\n\ +._17:\n\ + ldr r0, ._23\n\ + cmp r1, r0\n\ + bne ._21 @cond_branch\n\ + mov r0, #0x21\n\ + b ._30\n\ +._24:\n\ + .align 2, 0\n\ +._23:\n\ + .word sub_80831F8+1\n\ +._21:\n\ + ldr r0, ._27\n\ + cmp r1, r0\n\ + bne ._25 @cond_branch\n\ + mov r0, #0x2\n\ + b ._30\n\ +._28:\n\ + .align 2, 0\n\ +._27:\n\ + .word sub_8083314+1\n\ +._25:\n\ + ldr r0, ._31\n\ + cmp r1, r0\n\ + beq ._29 @cond_branch\n\ + mov r0, #0x0\n\ + b ._30\n\ +._32:\n\ + .align 2, 0\n\ +._31:\n\ + .word sub_80833C4+1\n\ +._29:\n\ + mov r0, #0x3\n\ +._30:\n\ + pop {r1}\n\ + bx r1"); +} + +__attribute__((naked)) +void debug_sub_808A55C() +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + ldr r2, ._37\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + add r4, r0, r2\n\ + mov r0, #0x8\n\ + ldsh r1, [r4, r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r2\n\ + ldrb r0, [r0, #0x4]\n\ + cmp r0, #0\n\ + bne ._33 @cond_branch\n\ + mov r1, #0xa\n\ + ldsh r0, [r4, r1]\n\ + cmp r0, #0x5\n\ + bne ._34 @cond_branch\n\ + add r0, r7, #0\n\ + bl DestroyTask\n\ +._34:\n\ + ldrh r0, [r4, #0xa]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4, #0xa]\n\ +._33:\n\ + ldr r0, ._37 + 4\n\ + ldrb r0, [r0]\n\ + mov r1, #0x2\n\ + mov r2, #0x0\n\ + mov r3, #0x2\n\ + bl PrintHex\n\ + ldr r0, ._37 + 8\n\ + ldrb r0, [r0]\n\ + mov r1, #0x16\n\ + mov r2, #0x5\n\ + mov r3, #0x4\n\ + bl PrintHex\n\ + mov r4, #0x0\n\ + lsl r3, r7, #0x2\n\ + mov r8, r3\n\ + mov r6, #0xc0\n\ + lsl r6, r6, #0x13\n\ + mov r5, #0xa0\n\ + lsl r5, r5, #0x13\n\ +._35:\n\ + ldr r0, ._37 + 12\n\ + add r0, r4, r0\n\ + ldrb r0, [r0]\n\ + lsr r1, r5, #0x18\n\ + mov r2, #0x0\n\ + mov r3, #0x1\n\ + bl PrintHex\n\ + ldr r1, ._37 + 16\n\ + lsl r0, r4, #0x8\n\ + add r0, r0, r1\n\ + ldrh r0, [r0]\n\ + lsr r2, r6, #0x18\n\ + mov r1, #0x16\n\ + mov r3, #0x4\n\ + bl PrintHex\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x11\n\ + add r6, r6, r0\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x12\n\ + add r5, r5, r1\n\ + add r4, r4, #0x1\n\ + cmp r4, #0x3\n\ + ble ._35 @cond_branch\n\ + ldr r4, ._37 + 20\n\ + ldr r0, [r4]\n\ + mov r1, #0xf\n\ + mov r2, #0x0\n\ + mov r3, #0x8\n\ + bl PrintHex\n\ + ldr r0, ._37 + 24\n\ + ldrb r0, [r0, #0x1]\n\ + mov r1, #0x2\n\ + mov r2, #0xa\n\ + mov r3, #0x2\n\ + bl PrintHex\n\ + bl GetMultiplayerId\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r1, #0x7\n\ + mov r2, #0xc\n\ + mov r3, #0x2\n\ + bl PrintHex\n\ + bl GetBlockReceivedStatus\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r1, #0x7\n\ + mov r2, #0xa\n\ + mov r3, #0x2\n\ + bl PrintHex\n\ + ldr r0, ._37 + 28\n\ + ldrb r0, [r0]\n\ + mov r1, #0x2\n\ + mov r2, #0xc\n\ + mov r3, #0x1\n\ + bl PrintHex\n\ + ldr r0, ._37 + 32\n\ + ldrh r0, [r0]\n\ + mov r1, #0xb\n\ + mov r2, #0x8\n\ + mov r3, #0x2\n\ + bl PrintHex\n\ + ldr r0, [r4]\n\ + mov r1, #0x1c\n\ + and r0, r0, r1\n\ + lsr r0, r0, #0x2\n\ + mov r1, #0xb\n\ + mov r2, #0xa\n\ + mov r3, #0x2\n\ + bl PrintHex\n\ + bl IsLinkConnectionEstablished\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r1, #0xb\n\ + mov r2, #0xc\n\ + mov r3, #0x1\n\ + bl PrintHex\n\ + bl sub_8007ECC\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r1, #0xf\n\ + mov r2, #0xa\n\ + mov r3, #0x1\n\ + bl PrintHex\n\ + ldr r2, ._37\n\ + mov r3, r8\n\ + add r0, r3, r7\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r2\n\ + mov r3, #0x8\n\ + ldsh r1, [r0, r3]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r2\n\ + ldr r0, [r0]\n\ + bl debug_sub_808A4D0\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r1, #0xf\n\ + mov r2, #0xc\n\ + mov r3, #0x2\n\ + bl PrintHex\n\ + ldr r0, ._37 + 36\n\ + ldr r0, [r0]\n\ + mov r1, #0x2\n\ + mov r2, #0xd\n\ + mov r3, #0x8\n\ + bl PrintHex\n\ + bl HasLinkErrorOccurred\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r1, #0x2\n\ + mov r2, #0x2\n\ + mov r3, #0x1\n\ + bl PrintHex\n\ + ldr r0, ._37 + 40\n\ + mov r6, #0x80\n\ + lsl r6, r6, #0x12\n\ + add r5, r0, #0\n\ + add r5, r5, #0x14\n\ + mov r4, #0x3\n\ +._36:\n\ + ldr r0, [r5]\n\ + lsr r1, r6, #0x18\n\ + mov r2, #0x3\n\ + mov r3, #0x4\n\ + bl PrintHex\n\ + mov r0, #0xc0\n\ + lsl r0, r0, #0x13\n\ + add r6, r6, r0\n\ + add r5, r5, #0x1c\n\ + sub r4, r4, #0x1\n\ + cmp r4, #0\n\ + bge ._36 @cond_branch\n\ + ldr r0, ._37 + 44\n\ + ldrh r0, [r0]\n\ + mov r1, #0x2\n\ + mov r2, #0x6\n\ + mov r3, #0x4\n\ + bl PrintHex\n\ + bl debug_sub_808B850\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r1, #0x19\n\ + mov r2, #0x3\n\ + mov r3, #0x1\n\ + bl PrintHex\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._38:\n\ + .align 2, 0\n\ +._37:\n\ + .word gTasks\n\ + .word gShouldAdvanceLinkState\n\ + .word gBlockSendBuffer\n\ + .word gLinkPlayerPending\n\ + .word gBlockRecvBuffer\n\ + .word gLinkStatus\n\ + .word gLink\n\ + .word gReceivedRemoteLinkPlayers\n\ + .word gScriptResult\n\ + .word gLinkCallback\n\ + .word gLinkPlayers\n\ + .word 0x4000128"); +} +#endif + static void sub_8082CD4(u8 arg0, u8 arg1) { if (FindTaskIdByFunc(sub_8082F20) == 0xFF) @@ -912,6 +1231,74 @@ void sub_8083C50(u8 taskId) DestroyTask(taskId); } +#if DEBUG + +__attribute__((naked)) +void debug_sub_808B778() +{ + asm("\ + push {r4, lr}\n\ + ldr r4, ._390\n\ + add r0, r4, #0\n\ + bl FuncIsActiveTask\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._389 @cond_branch\n\ + add r0, r4, #0\n\ + mov r1, #0x50\n\ + bl CreateTask\n\ +._389:\n\ + ldr r1, ._390 + 4\n\ + ldr r0, [r1]\n\ + add r0, r0, #0x1\n\ + str r0, [r1]\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._391:\n\ + .align 2, 0\n\ +._390:\n\ + .word debug_sub_808B7A8+1\n\ + .word unk_3004E98"); +} + +__attribute__((naked)) +void debug_sub_808B7A8() +{ + asm("\ + push {lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r2, ._393\n\ + lsl r1, r0, #0x2\n\ + add r1, r1, r0\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r2\n\ + ldrh r0, [r1, #0x8]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1, #0x8]\n\ + lsl r0, r0, #0x10\n\ + asr r0, r0, #0x10\n\ + cmp r0, #0x1e\n\ + bne ._392 @cond_branch\n\ + mov r0, #0x0\n\ + strh r0, [r1, #0x8]\n\ + ldr r2, ._393 + 4\n\ + ldrh r0, [r2]\n\ + mov r1, #0x1\n\ + orr r0, r0, r1\n\ + strh r0, [r2]\n\ +._392:\n\ + pop {r0}\n\ + bx r0\n\ +._394:\n\ + .align 2, 0\n\ +._393:\n\ + .word gTasks\n\ + .word unk_3004E94"); +} +#endif + static void sub_8083CA4(u8 taskId) { if (!gReceivedRemoteLinkPlayers) @@ -925,4 +1312,51 @@ void unref_sub_8083CC8(u8 taskId) { sub_800832C(); gTasks[taskId].func = sub_8083CA4; -} \ No newline at end of file +} + +#if DEBUG + +void debug_sub_808B82C() +{ + asm("\ + ldr r1, ._400\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ + bx lr\n\ +._401:\n\ + .align 2, 0\n\ +._400:\n\ + .word unk_2030220"); +} + +void debug_sub_808B838(u8 a) +{ + asm("\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r2, ._402\n\ + mov r1, #0x1\n\ + LSL r1, r0\n\ + ldrb r0, [r2]\n\ + orr r1, r1, r0\n\ + strb r1, [r2]\n\ + bx lr\n\ +._403:\n\ + .align 2, 0\n\ +._402:\n\ + .word unk_2030220"); +} + +int debug_sub_808B850() +{ + asm("\ + ldr r0, ._404\n\ + ldrb r0, [r0]\n\ + bx lr\n\ +._405:\n\ + .align 2, 0\n\ +._404:\n\ + .word unk_2030220"); +} + +#endif \ No newline at end of file diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 8fad563e6..522a185c8 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -338,3 +338,463 @@ static void CB2_MysteryEventMenu(void) BuildOamBuffer(); UpdatePaletteFade(); } + +#if DEBUG + +void debug_sub_815D1D8(); + +__attribute__((naked)) +void debug_sub_815D04C() +{ + asm( + " push {r4, r5, r6, lr}\n" + " lsl r0, r0, #0x18\n" + " lsr r5, r0, #0x18\n" + " ldr r1, ._125\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r4, r0, r1\n" + " mov r1, #0x8\n" + " ldsh r0, [r4, r1]\n" + " cmp r0, #0\n" + " bne ._121 @cond_branch\n" + " mov r0, #0x4\n" + " mov r1, #0x4\n" + " mov r2, #0xd\n" + " mov r3, #0x7\n" + " bl MenuDrawTextWindow\n" + " ldr r1, ._125 + 4\n" + " mov r2, #0xa\n" + " ldsh r0, [r4, r2]\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov r1, #0x5\n" + " mov r2, #0x5\n" + " bl MenuPrint\n" + " ldrh r0, [r4, #0x8]\n" + " add r0, r0, #0x1\n" + " strh r0, [r4, #0x8]\n" + "._121:\n" + " ldr r2, ._125 + 8\n" + " ldrh r1, [r2, #0x2e]\n" + " mov r0, #0x20\n" + " and r0, r0, r1\n" + " add r6, r2, #0\n" + " cmp r0, #0\n" + " beq ._122 @cond_branch\n" + " ldrh r1, [r4, #0xa]\n" + " mov r2, #0xa\n" + " ldsh r0, [r4, r2]\n" + " cmp r0, #0\n" + " bne ._123 @cond_branch\n" + " ldr r0, ._125 + 12\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x1\n" + " b ._124\n" + "._126:\n" + " .align 2, 0\n" + "._125:\n" + " .word gTasks\n" + " .word gFlashSectors+0x9c\n" + " .word gMain\n" + " .word gFlashSectors+0x11c\n" + "._123:\n" + " sub r0, r1, #1\n" + "._124:\n" + " strh r0, [r4, #0xa]\n" + " ldr r0, ._130\n" + " lsl r1, r5, #0x2\n" + " add r1, r1, r5\n" + " lsl r1, r1, #0x3\n" + " add r1, r1, r0\n" + " mov r0, #0x0\n" + " strh r0, [r1, #0x8]\n" + "._122:\n" + " ldrh r1, [r6, #0x2e]\n" + " mov r0, #0x10\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._127 @cond_branch\n" + " ldr r1, ._130\n" + " lsl r2, r5, #0x2\n" + " add r0, r2, r5\n" + " lsl r0, r0, #0x3\n" + " add r4, r0, r1\n" + " mov r0, #0xa\n" + " ldsh r3, [r4, r0]\n" + " ldr r0, ._130 + 4\n" + " ldrb r0, [r0]\n" + " sub r0, r0, #0x1\n" + " cmp r3, r0\n" + " bne ._128 @cond_branch\n" + " mov r0, #0x0\n" + " b ._129\n" + "._131:\n" + " .align 2, 0\n" + "._130:\n" + " .word gTasks\n" + " .word gFlashSectors+0x11c\n" + "._128:\n" + " ldrh r0, [r4, #0xa]\n" + " add r0, r0, #0x1\n" + "._129:\n" + " strh r0, [r4, #0xa]\n" + " add r0, r2, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r1, #0x0\n" + " strh r1, [r0, #0x8]\n" + "._127:\n" + " ldrh r1, [r6, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._132 @cond_branch\n" + " ldr r1, ._133\n" + " lsl r0, r5, #0x2\n" + " add r0, r0, r5\n" + " lsl r0, r0, #0x3\n" + " add r0, r0, r1\n" + " mov r2, #0xa\n" + " ldsh r1, [r0, r2]\n" + " lsl r1, r1, #0x3\n" + " ldr r0, ._133 + 4\n" + " add r0, r0, #0x4\n" + " add r1, r1, r0\n" + " ldr r0, ._133 + 8\n" + " ldr r1, [r1]\n" + " bl gScriptFuncs_End+0x3cf8\n" + " ldr r0, ._133 + 12\n" + " add r1, r6, r0\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " add r0, r5, #0\n" + " bl DestroyTask\n" + "._132:\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + "._134:\n" + " .align 2, 0\n" + "._133:\n" + " .word gTasks\n" + " .word gFlashSectors+0x9c\n" + " .word +0x2004000\n" + " .word 0x43c\n" + "\n" + ); +} + +void debug_sub_815D15C(void) +{ + ResetSpriteData(); + FreeAllSpritePalettes(); + ResetTasks(); + SetVBlankCallback(VBlankCB); + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); + Menu_EraseScreen(); + REG_DISPCNT = DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP | DISPCNT_MODE_0; + REG_BLDCNT = 0; + + CreateTask(Task_DestroySelf, 0); + StopMapMusic(); + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); + FillPalette(0, 0, 2); + SetMainCallback2(debug_sub_815D1D8); +} + +__attribute__((naked)) +void debug_sub_815D1D8() +{ + asm( + " push {r4, lr}\n" + " add sp, sp, #0xfffffffc\n" + " ldr r1, ._139\n" + " ldr r2, ._139 + 4\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " add r4, r1, #0\n" + " cmp r0, #0xb\n" + " bls ._137 @cond_branch\n" + " b ._196\n" + "._137:\n" + " lsl r0, r0, #0x2\n" + " ldr r1, ._139 + 8\n" + " add r0, r0, r1\n" + " ldr r0, [r0]\n" + " mov pc, r0\n" + "._140:\n" + " .align 2, 0\n" + "._139:\n" + " .word gMain\n" + " .word 0x43c\n" + " .word ._141\n" + "._141:\n" + " .word ._142\n" + " .word ._143\n" + " .word ._144\n" + " .word ._145\n" + " .word ._146\n" + " .word ._196\n" + " .word ._148\n" + " .word ._149\n" + " .word ._150\n" + " .word ._151\n" + " .word ._152\n" + " .word ._153\n" + "._142:\n" + " mov r0, #0x3\n" + " mov r1, #0xe\n" + " mov r2, #0x1b\n" + " mov r3, #0x13\n" + " bl MenuDrawTextWindow\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x10\n" + " mov r3, #0x0\n" + " bl BeginNormalPaletteFade\n" + " ldr r1, ._155\n" + " ldr r0, ._155 + 4\n" + " add r1, r1, r0\n" + " b ._189\n" + "._156:\n" + " .align 2, 0\n" + "._155:\n" + " .word gMain\n" + " .word 0x43c\n" + "._143:\n" + " ldr r0, ._161\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._157 @cond_branch\n" + " b ._196\n" + "._157:\n" + " ldrh r1, [r4, #0x2c]\n" + " mov r0, #0x80\n" + " lsl r0, r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._159 @cond_branch\n" + " ldr r1, ._161 + 4\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + "._159:\n" + " ldr r0, ._161 + 8\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl MenuPrintMessage\n" + " ldr r2, ._161 + 12\n" + " add r1, r4, r2\n" + " b ._189\n" + "._162:\n" + " .align 2, 0\n" + "._161:\n" + " .word gPaletteFade\n" + " .word gLinkTestBlockChecksums+0x8\n" + " .word gUnknown_0841192C+0x14\n" + " .word 0x43c\n" + "._144:\n" + " bl MenuUpdateWindowText\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._163 @cond_branch\n" + " b ._196\n" + "._163:\n" + " ldr r1, ._166\n" + " ldr r0, ._166 + 4\n" + " add r1, r1, r0\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " ldr r1, ._166 + 8\n" + " ldr r2, ._166 + 12\n" + " add r0, r2, #0\n" + " strh r0, [r1]\n" + " bl OpenLink\n" + " b ._196\n" + "._167:\n" + " .align 2, 0\n" + "._166:\n" + " .word gMain\n" + " .word 0x43c\n" + " .word gLinkType\n" + " .word 0x5501\n" + "._145:\n" + " ldr r0, ._171\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._168 @cond_branch\n" + " b ._196\n" + "._168:\n" + " ldr r1, ._171 + 4\n" + " add r0, r4, r1\n" + " ldrb r1, [r0]\n" + " add r1, r1, #0x1\n" + " strb r1, [r0]\n" + " ldr r0, ._171 + 8\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl MenuPrintMessage\n" + " b ._196\n" + "._172:\n" + " .align 2, 0\n" + "._171:\n" + " .word gReceivedRemoteLinkPlayers\n" + " .word 0x43c\n" + " .word gUnknown_0841192C+0x28\n" + "._146:\n" + " bl MenuUpdateWindowText\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._173 @cond_branch\n" + " b ._196\n" + "._173:\n" + " ldr r0, ._176\n" + " mov r1, #0xa\n" + " bl CreateTask\n" + " ldr r1, ._176 + 4\n" + " ldr r2, ._176 + 8\n" + " add r1, r1, r2\n" + " b ._189\n" + "._177:\n" + " .align 2, 0\n" + "._176:\n" + " .word debug_sub_815D04C+1\n" + " .word gMain\n" + " .word 0x43c\n" + "._148:\n" + " ldr r0, ._179\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl MenuPrintMessage\n" + " ldr r1, ._179 + 4\n" + " ldr r2, ._179 + 8\n" + " mov r0, #0x0\n" + " bl SendBlock\n" + " ldr r1, ._179 + 12\n" + " ldr r0, ._179 + 16\n" + " add r1, r1, r0\n" + " b ._189\n" + "._180:\n" + " .align 2, 0\n" + "._179:\n" + " .word gUnknown_0841192C+0x3c\n" + " .word +0x2004000\n" + " .word 0x2004\n" + " .word gMain\n" + " .word 0x43c\n" + "._149:\n" + " bl MenuUpdateWindowText\n" + " bl sub_8007ECC\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " beq ._196 @cond_branch\n" + " ldr r1, ._183\n" + " ldr r2, ._183 + 4\n" + " add r1, r1, r2\n" + " b ._189\n" + "._184:\n" + " .align 2, 0\n" + "._183:\n" + " .word gMain\n" + " .word 0x43c\n" + "._150:\n" + " bl sub_800832C\n" + " ldr r1, ._186\n" + " ldr r0, ._186 + 4\n" + " add r1, r1, r0\n" + " b ._189\n" + "._187:\n" + " .align 2, 0\n" + "._186:\n" + " .word gMain\n" + " .word 0x43c\n" + "._151:\n" + " ldr r0, ._190\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " bne ._196 @cond_branch\n" + " mov r0, #0x4\n" + " mov r1, #0xf\n" + " mov r2, #0x1a\n" + " mov r3, #0x12\n" + " bl MenuFillWindowRectWithBlankTile\n" + " ldr r0, ._190 + 4\n" + " mov r1, #0x4\n" + " mov r2, #0xf\n" + " bl MenuPrint\n" + " ldr r1, ._190 + 8\n" + " ldr r2, ._190 + 12\n" + " add r1, r1, r2\n" + " b ._189\n" + "._191:\n" + " .align 2, 0\n" + "._190:\n" + " .word gReceivedRemoteLinkPlayers\n" + " .word gUnknown_0841192C+0x47\n" + " .word gMain\n" + " .word 0x43c\n" + "._152:\n" + " ldrh r1, [r4, #0x2e]\n" + " mov r0, #0x1\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " beq ._196 @cond_branch\n" + " mov r0, #0x1\n" + " neg r0, r0\n" + " mov r1, #0x0\n" + " str r1, [sp]\n" + " mov r2, #0x0\n" + " mov r3, #0x10\n" + " bl BeginNormalPaletteFade\n" + " ldr r0, ._194\n" + " add r1, r4, r0\n" + "._189:\n" + " ldrb r0, [r1]\n" + " add r0, r0, #0x1\n" + " strb r0, [r1]\n" + " b ._196\n" + "._195:\n" + " .align 2, 0\n" + "._194:\n" + " .word 0x43c\n" + "._153:\n" + " ldr r0, ._197\n" + " ldrb r1, [r0, #0x7]\n" + " mov r0, #0x80\n" + " and r0, r0, r1\n" + " cmp r0, #0\n" + " bne ._196 @cond_branch\n" + " ldr r0, ._197 + 4\n" + " bl SetMainCallback2\n" + "._196:\n" + " bl RunTasks\n" + " bl AnimateSprites\n" + " bl BuildOamBuffer\n" + " bl UpdatePaletteFade\n" + " add sp, sp, #0x4\n" + " pop {r4}\n" + " pop {r0}\n" + " bx r0\n" + "._198:\n" + " .align 2, 0\n" + "._197:\n" + " .word gPaletteFade\n" + " .word CB2_InitTitleScreen+1\n" + "\n" + ); +} + +#endif diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index c7d45e929..a11e1b3e3 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -605,3 +605,319 @@ void Task_ResetRtcScreen(u8 taskId) } } } + +#if DEBUG + +__attribute__((naked)) +void debug_sub_806F8F8(void) +{ + asm("\ + push {lr}\n\ + ldr r0, ._131\n\ + bl SetMainCallback2\n\ + pop {r0}\n\ + bx r0\n\ +._132:\n\ + .align 2, 0\n\ +._131:\n\ + .word CB2_InitResetRtcScreen+1"); +} + +__attribute__((naked)) +void debug_sub_806F908(u8 a) +{ + asm("\ + push {r4, r5, lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r5, r0, #0x18\n\ + lsl r0, r5, #0x2\n\ + add r0, r0, r5\n\ + lsl r0, r0, #0x3\n\ + ldr r2, ._136\n\ + add r4, r0, r2\n\ + mov r1, #0x0\n\ + ldsh r0, [r4, r1]\n\ + cmp r0, #0\n\ + beq ._133 @cond_branch\n\ + cmp r0, #0x1\n\ + beq ._134 @cond_branch\n\ + b ._141\n\ +._137:\n\ + .align 2, 0\n\ +._136:\n\ + .word gTasks+0x8\n\ +._133:\n\ + ldr r0, ._139\n\ + mov r1, #0x50\n\ + bl CreateTask\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + strh r0, [r4, #0x2]\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ + b ._141\n\ +._140:\n\ + .align 2, 0\n\ +._139:\n\ + .word Task_ResetRtc_0+1\n\ +._134:\n\ + sub r2, r2, #0x8\n\ + mov r0, #0x2\n\ + ldsh r1, [r4, r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x3\n\ + add r2, r0, r2\n\ + mov r1, #0x8\n\ + ldsh r0, [r2, r1]\n\ + cmp r0, #0\n\ + beq ._141 @cond_branch\n\ + mov r1, #0xa\n\ + ldsh r0, [r2, r1]\n\ + cmp r0, #0x1\n\ + bne ._142 @cond_branch\n\ + ldr r3, ._143\n\ + mov r1, #0x0\n\ + ldsh r0, [r3, r1]\n\ + mov r1, #0x2\n\ + ldsb r1, [r3, r1]\n\ + mov r2, #0x3\n\ + ldsb r2, [r3, r2]\n\ + ldrb r3, [r3, #0x4]\n\ + lsl r3, r3, #0x18\n\ + asr r3, r3, #0x18\n\ + bl RtcCalcLocalTimeOffset\n\ +._142:\n\ + ldrb r0, [r4, #0x2]\n\ + bl DestroyTask\n\ + bl MenuZeroFillScreen\n\ + bl ScriptContext2_Disable\n\ + add r0, r5, #0\n\ + bl DestroyTask\n\ +._141:\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0\n\ +._144:\n\ + .align 2, 0\n\ +._143:\n\ + .word gLocalTime"); +} + +__attribute__((naked)) +void debug_sub_806F99C() +{ + asm("\ + push {lr}\n\ + bl RtcCalcLocalTime\n\ + ldr r0, ._145\n\ + mov r1, #0x50\n\ + bl CreateTask\n\ + bl ScriptContext2_Enable\n\ + pop {r0}\n\ + bx r0\n\ +._146:\n\ + .align 2, 0\n\ +._145:\n\ + .word debug_sub_806F908+1"); +} + +__attribute__((naked)) +void debug_sub_806F9B8() +{ + asm("\ + push {lr}\n\ + ldr r2, ._147\n\ + ldr r0, ._147 + 4\n\ + add r0, r0, #0xa0\n\ + ldr r1, [r0, #0x4]\n\ + ldr r0, [r0]\n\ + str r0, [r2]\n\ + str r1, [r2, #0x4]\n\ + ldr r0, ._147 + 8\n\ + mov r1, #0x50\n\ + bl CreateTask\n\ + bl ScriptContext2_Enable\n\ + pop {r0}\n\ + bx r0\n\ +._148:\n\ + .align 2, 0\n\ +._147:\n\ + .word gLocalTime\n\ + .word gSaveBlock2\n\ + .word debug_sub_806F908+1"); +} + +__attribute__((naked)) +void debug_sub_806F9E4() +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, sl\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5, r6, r7}\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + ldr r1, ._153\n\ + add r5, r0, r1\n\ + ldr r6, ._153 + 4\n\ + mov r1, #0x0\n\ + ldsh r0, [r5, r1]\n\ + cmp r0, #0x1\n\ + beq ._149 @cond_branch\n\ + cmp r0, #0x1\n\ + bgt ._150 @cond_branch\n\ + cmp r0, #0\n\ + beq ._151 @cond_branch\n\ + b ._165\n\ +._154:\n\ + .align 2, 0\n\ +._153:\n\ + .word gTasks+0x8\n\ + .word gStringVar4\n\ +._150:\n\ + cmp r0, #0x2\n\ + beq ._155 @cond_branch\n\ + b ._165\n\ +._149:\n\ + mov r0, #0x0\n\ + mov r1, #0x9\n\ + mov r2, #0x1d\n\ + mov r3, #0x13\n\ + bl MenuDrawTextWindow\n\ + add r4, r6, #0\n\ + add r4, r4, #0x50\n\ + bl RtcGetErrorStatus\n\ + add r1, r0, #0\n\ + lsl r1, r1, #0x10\n\ + lsr r1, r1, #0x10\n\ + add r0, r4, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x4\n\ + bl ConvertIntToHexStringN\n\ + add r0, r4, #0\n\ + mov r1, #0x2\n\ + mov r2, #0xa\n\ + bl MenuPrint\n\ + ldr r0, ._158\n\ + mov r1, #0xc\n\ + mov r2, #0xc\n\ + bl MenuPrint\n\ + ldr r0, ._158 + 4\n\ + mov r1, #0x14\n\ + mov r2, #0xc\n\ + bl MenuPrint\n\ + ldr r0, ._158 + 8\n\ + mov r1, #0x1\n\ + mov r2, #0xe\n\ + bl MenuPrint\n\ + ldr r0, ._158 + 12\n\ + mov r1, #0x1\n\ + mov r2, #0x10\n\ + bl MenuPrint\n\ +._151:\n\ + ldrh r0, [r5]\n\ + add r0, r0, #0x1\n\ + strh r0, [r5]\n\ + b ._165\n\ +._159:\n\ + .align 2, 0\n\ +._158:\n\ + .word gUnknown_08376500+0x4\n\ + .word gUnknown_08376500+0x9\n\ + .word gUnknown_08376500+0x17\n\ + .word gUnknown_08376500+0xd\n\ +._155:\n\ + bl RtcCalcLocalTime\n\ + add r0, r6, #0\n\ + bl FormatHexRtcTime\n\ + mov r2, #0x14\n\ + add r2, r2, r6\n\ + mov r9, r2\n\ + mov r0, r9\n\ + bl debug_sub_8009894\n\ + mov r0, #0x28\n\ + add r0, r0, r6\n\ + mov sl, r0\n\ + ldr r4, ._163\n\ + mov r1, #0x2\n\ + ldsb r1, [r4, r1]\n\ + mov r2, #0x3\n\ + ldsb r2, [r4, r2]\n\ + mov r3, #0x4\n\ + ldsb r3, [r4, r3]\n\ + bl FormatDecimalTime\n\ + mov r1, #0x3c\n\ + add r1, r1, r6\n\ + mov r8, r1\n\ + mov r2, #0x0\n\ + ldsh r1, [r4, r2]\n\ + mov r0, r8\n\ + mov r2, #0x1\n\ + mov r3, #0x4\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r0, ._163 + 4\n\ + ldrb r0, [r0, #0x12]\n\ + cmp r0, #0\n\ + bne ._160 @cond_branch\n\ + add r0, r6, #0\n\ + mov r1, #0x14\n\ + mov r2, #0xe\n\ + bl MenuPrint\n\ + mov r0, r9\n\ + mov r1, #0xc\n\ + mov r2, #0xe\n\ + bl MenuPrint\n\ + mov r0, sl\n\ + mov r1, #0x14\n\ + mov r2, #0x10\n\ + bl MenuPrint\n\ + mov r0, r8\n\ + mov r1, #0xc\n\ + mov r2, #0x10\n\ + bl MenuPrint\n\ +._160:\n\ + ldrh r1, [r5, #0x2]\n\ + mov r2, #0x2\n\ + ldsh r0, [r5, r2]\n\ + cmp r0, #0x13\n\ + ble ._161 @cond_branch\n\ + add r0, r1, #1\n\ + strh r0, [r5, #0x2]\n\ + b ._165\n\ +._164:\n\ + .align 2, 0\n\ +._163:\n\ + .word gLocalTime\n\ + .word gSaveBlock2\n\ +._161:\n\ + ldr r0, ._166\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._165 @cond_branch\n\ + bl MenuZeroFillScreen\n\ + add r0, r7, #0\n\ + bl DestroyTask\n\ + bl ScriptContext2_Disable\n\ +._165:\n\ + pop {r3, r4, r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov sl, r5\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._167:\n\ + .align 2, 0\n\ +._166:\n\ + .word gMain"); +} + +#endif \ No newline at end of file diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c index 5014e97e3..6d40c53aa 100644 --- a/src/field/field_fadetransition.c +++ b/src/field/field_fadetransition.c @@ -511,6 +511,22 @@ void sub_80810DC(void) CreateTask(sub_8081050, 10); } +#if DEBUG + +__attribute__((naked)) +void debug_sub_80888D8() +{ + asm("\ + PUSH {LR}\n\ + BL debug_sub_8052E04\n\ + BL sub_8080E88\n\ + BL ScriptContext2_Enable\n\ + POP {R0}\n\ + BX R0"); +} + +#endif + void task0A_fade_n_map_maybe(u8 taskId) { struct Task *task = &gTasks[taskId]; diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c index e4328acfc..7d90b9f4d 100644 --- a/src/field/fldeff_cut.c +++ b/src/field/fldeff_cut.c @@ -72,6 +72,115 @@ static const struct SpriteTemplate gSpriteTemplate_CutGrass = .callback = sub_80A2A48, }; +#if DEBUG +__attribute__((naked)) +void debug_sub_80AFEE4() +{ + asm( + " push {r4, r5, r6, r7, lr}\n" + " mov r7, r8\n" + " push {r7}\n" + " mov r0, #0x52\n" + " bl npc_before_player_of_type\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._1 @cond_branch\n" + " ldr r1, ._3\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " bl sub_80A2634\n" + " b ._8\n" + "._4:\n" + " .align 2, 0\n" + "._3:\n" + " .word gLastFieldPokeMenuOpened\n" + "._1:\n" + " ldr r4, ._9\n" + " add r1, r4, #2\n" + " add r0, r4, #0\n" + " bl PlayerGetDestCoords\n" + " mov r7, #0x0\n" + " mov r8, r4\n" + "._12:\n" + " ldr r1, ._9 + 4\n" + " add r0, r7, r1\n" + " mov r2, r8\n" + " ldrh r2, [r2, #0x2]\n" + " add r0, r0, r2\n" + " mov r6, #0x0\n" + " lsl r0, r0, #0x10\n" + " asr r5, r0, #0x10\n" + "._11:\n" + " ldr r1, ._9 + 4\n" + " add r0, r6, r1\n" + " mov r2, r8\n" + " ldrh r2, [r2]\n" + " add r0, r0, r2\n" + " lsl r0, r0, #0x10\n" + " asr r4, r0, #0x10\n" + " add r0, r4, #0\n" + " add r1, r5, #0\n" + " bl MapGridGetZCoordAt\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " mov r2, r8\n" + " mov r1, #0x4\n" + " ldsb r1, [r2, r1]\n" + " cmp r0, r1\n" + " bne ._7 @cond_branch\n" + " add r0, r4, #0\n" + " add r1, r5, #0\n" + " bl MapGridGetMetatileBehaviorAt\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " add r0, r4, #0\n" + " bl MetatileBehavior_IsPokeGrass\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " beq ._6 @cond_branch\n" + " add r0, r4, #0\n" + " bl MetatileBehavior_IsAshGrass\n" + " lsl r0, r0, #0x18\n" + " lsr r0, r0, #0x18\n" + " cmp r0, #0x1\n" + " bne ._7 @cond_branch\n" + "._6:\n" + " ldr r1, ._9 + 8\n" + " mov r0, #0x0\n" + " strb r0, [r1]\n" + " bl sub_80A25E8\n" + " b ._8\n" + "._10:\n" + " .align 2, 0\n" + "._9:\n" + " .word gUnknown_0203923C\n" + " .word 0xffff\n" + " .word gLastFieldPokeMenuOpened\n" + "._7:\n" + " add r0, r6, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r6, r0, #0x18\n" + " cmp r6, #0x2\n" + " bls ._11 @cond_branch\n" + " add r0, r7, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r7, r0, #0x18\n" + " cmp r7, #0x2\n" + " bls ._12 @cond_branch\n" + " bl ScriptContext2_Disable\n" + "._8:\n" + " pop {r3}\n" + " mov r8, r3\n" + " pop {r4, r5, r6, r7}\n" + " pop {r0}\n" + " bx r0\n" + "\n" + ); +} +#endif + bool8 SetUpFieldMove_Cut(void) { s16 x, y; diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index 22f170184..d8f70200c 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -71,6 +71,36 @@ static const u16 gUnknown_083F809C[] = INCBIN_U16("graphics/misc/83F809C.gbapal" static const u16 gCaveTransitionTilemap[] = INCBIN_U16("graphics/misc/cave_transition_map.bin.lz"); static const u8 gCaveTransitionTiles[] = INCBIN_U8("graphics/misc/cave_transition.4bpp.lz"); +#if DEBUG +__attribute__((naked)) +void debug_sub_8122080(void) +{ + asm("\ + push {lr}\n\ + ldr r0, ._4\n\ + ldrb r0, [r0, #0x15]\n\ + cmp r0, #0x1\n\ + bne ._2 @cond_branch\n\ + ldr r0, ._4 + 4\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._2 @cond_branch\n\ + bl sub_810CBFC\n\ + b ._3\n\ +._5:\n\ + .align 2, 0\n\ +._4:\n\ + .word gMapHeader\n\ + .word 0x828\n\ +._2:\n\ + bl ScriptContext2_Disable\n\ +._3:\n\ + pop {r0}\n\ + bx r0"); +} +#endif + bool8 SetUpFieldMove_Flash(void) { if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) diff --git a/src/field/fldeff_strength.c b/src/field/fldeff_strength.c index 565ac1651..9f9cd4013 100644 --- a/src/field/fldeff_strength.c +++ b/src/field/fldeff_strength.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/map_objects.h" #include "braille_puzzles.h" #include "field_effect.h" #include "party_menu.h" @@ -20,6 +21,28 @@ extern void (*gUnknown_03005CE4)(void); extern u8 S_UseStrength[]; +#if DEBUG +void debug_sub_8130318(void) +{ + if (ShouldDoBrailleStrengthEffect()) + { + gLastFieldPokeMenuOpened = 0; + gSpecialVar_Result = 0; + sub_811AA38(); + } + else if (npc_before_player_of_type(MAP_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + { + gLastFieldPokeMenuOpened = 0; + gSpecialVar_Result = 0; + sub_811AA18(); + } + else + { + ScriptContext2_Disable(); + } +} +#endif + bool8 SetUpFieldMove_Strength(void) { if (ShouldDoBrailleStrengthEffect()) diff --git a/src/field/item_menu.c b/src/field/item_menu.c index e0575af4c..125edfef2 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -158,6 +158,9 @@ extern struct PocketScrollState gBagPocketScrollStates[]; extern struct ItemSlot *gCurrentBagPocketItemSlots; // selected pocket item slots extern const u8 Event_NoRegisteredItem[]; +// TODO: decompile the debug code so we can use static in this file +#define static + extern const struct CompressedSpriteSheet sMaleBagSpriteSheet; extern const struct CompressedSpriteSheet sFemaleBagSpriteSheet; extern const struct CompressedSpritePalette sBagSpritePalette; @@ -384,6 +387,390 @@ static void sub_80A3134(void) } } +#if DEBUG +__attribute__((naked)) +static bool8 SetupBagMultistep(void) +{ + asm("\ + push {r4, r5, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._5\n\ + ldr r1, ._5 + 4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x10\n\ + bls ._3 @cond_branch\n\ + b ._66\n\ +._3:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._5 + 8\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._6:\n\ + .align 2, 0\n\ +._5:\n\ + .word gMain\n\ + .word 0x43c\n\ + .word ._7\n\ +._7:\n\ + .word ._8\n\ + .word ._9\n\ + .word ._10\n\ + .word ._11\n\ + .word ._12\n\ + .word ._13\n\ + .word ._14\n\ + .word ._15\n\ + .word ._16\n\ + .word ._17\n\ + .word ._18\n\ + .word ._19\n\ + .word ._20\n\ + .word ._21\n\ + .word ._22\n\ + .word ._23\n\ + .word ._24\n\ +._8:\n\ + bl sub_80F9438\n\ + bl sub_80A34E8\n\ + b ._61\n\ +._9:\n\ + bl remove_some_task\n\ + ldr r1, ._27\n\ + ldr r0, ._27 + 4\n\ + add r1, r1, r0\n\ + b ._62\n\ +._28:\n\ + .align 2, 0\n\ +._27:\n\ + .word gMain\n\ + .word 0x43c\n\ +._10:\n\ + bl gpu_pal_allocator_reset__manage_upper_four\n\ + b ._61\n\ +._11:\n\ + bl sub_80F9020\n\ + ldr r0, ._31\n\ + ldr r1, ._31 + 4\n\ + add r0, r0, r1\n\ + mov r1, #0x0\n\ + strb r1, [r0]\n\ + b ._61\n\ +._32:\n\ + .align 2, 0\n\ +._31:\n\ + .word +0x2000000\n\ + .word 0x1ffff\n\ +._12:\n\ + bl ResetPaletteFade\n\ + ldr r2, ._34\n\ + ldrb r0, [r2, #0x8]\n\ + mov r1, #0x80\n\ + orr r0, r0, r1\n\ + strb r0, [r2, #0x8]\n\ + ldr r1, ._34 + 4\n\ + ldr r0, ._34 + 8\n\ + add r1, r1, r0\n\ + b ._62\n\ +._35:\n\ + .align 2, 0\n\ +._34:\n\ + .word gPaletteFade\n\ + .word gMain\n\ + .word 0x43c\n\ +._13:\n\ + bl ResetSpriteData\n\ + b ._61\n\ +._14:\n\ + bl sub_80A3520\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._37 @cond_branch\n\ + b ._66\n\ +._37:\n\ + ldr r1, ._40\n\ + ldr r0, ._40 + 4\n\ + add r1, r1, r0\n\ + b ._62\n\ +._41:\n\ + .align 2, 0\n\ +._40:\n\ + .word gMain\n\ + .word 0x43c\n\ +._15:\n\ + ldr r0, ._43\n\ + bl SetUpWindowConfig\n\ + b ._61\n\ +._44:\n\ + .align 2, 0\n\ +._43:\n\ + .word gWindowConfig_81E6DFC\n\ +._16:\n\ + ldr r0, ._46\n\ + bl MultistepInitMenuWindowBegin\n\ + ldr r1, ._46 + 4\n\ + ldr r0, ._46 + 8\n\ + add r1, r1, r0\n\ + b ._62\n\ +._47:\n\ + .align 2, 0\n\ +._46:\n\ + .word gWindowConfig_81E6DFC\n\ + .word gMain\n\ + .word 0x43c\n\ +._17:\n\ + bl MultistepInitMenuWindowContinue\n\ + cmp r0, #0\n\ + bne ._48 @cond_branch\n\ + b ._66\n\ +._48:\n\ + b ._61\n\ +._18:\n\ + bl sub_80F944C\n\ + bl LoadScrollIndicatorPalette\n\ + mov r0, #0x0\n\ + mov r1, #0xac\n\ + mov r2, #0xc\n\ + bl CreateVerticalScrollIndicators\n\ + mov r0, #0x1\n\ + mov r1, #0xac\n\ + mov r2, #0x94\n\ + bl CreateVerticalScrollIndicators\n\ + mov r0, #0x2\n\ + mov r1, #0x1c\n\ + mov r2, #0x58\n\ + bl CreateVerticalScrollIndicators\n\ + mov r0, #0x3\n\ + mov r1, #0x64\n\ + mov r2, #0x58\n\ + bl CreateVerticalScrollIndicators\n\ + mov r0, #0x0\n\ + mov r1, #0x2\n\ + bl sub_80F9988\n\ + mov r0, #0x1\n\ + mov r1, #0x2\n\ + bl sub_80F9988\n\ + mov r0, #0x2\n\ + mov r1, #0x2\n\ + bl sub_80F9988\n\ + mov r0, #0x3\n\ + mov r1, #0x2\n\ + bl sub_80F9988\n\ + ldr r0, ._53\n\ + ldrb r0, [r0]\n\ + sub r0, r0, #0x4\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bhi ._51 @cond_branch\n\ + mov r0, #0x2\n\ + mov r1, #0x1\n\ + bl sub_80F979C\n\ + mov r0, #0x3\n\ + mov r1, #0x1\n\ + bl sub_80F979C\n\ +._51:\n\ + ldr r1, ._53 + 4\n\ + ldr r0, ._53 + 8\n\ + add r1, r1, r0\n\ + b ._62\n\ +._54:\n\ + .align 2, 0\n\ +._53:\n\ + .word gUnknown_03000701\n\ + .word gMain\n\ + .word 0x43c\n\ +._19:\n\ + ldr r1, ._56\n\ + mov r0, #0x10\n\ + strb r0, [r1]\n\ + ldr r4, ._56 + 4\n\ + ldr r5, ._56 + 8\n\ + ldrb r1, [r5]\n\ + add r1, r1, #0x1\n\ + lsl r1, r1, #0x18\n\ + lsr r1, r1, #0x18\n\ + add r0, r4, #0\n\ + bl sub_80A39B8\n\ + ldrb r1, [r5]\n\ + add r0, r4, #0\n\ + bl sub_80A3AC0\n\ + bl sub_80A3D08\n\ + ldr r4, ._56 + 12\n\ + ldr r0, [r4, #0x10]\n\ + ldr r1, [r4, #0x14]\n\ + bl sub_80A3C34\n\ + ldr r0, [r4, #0x18]\n\ + ldr r1, [r4, #0x1c]\n\ + bl sub_80A3C34\n\ + bl sub_80A3D40\n\ + ldr r1, ._56 + 16\n\ + mov r0, #0x0\n\ + ldsb r0, [r5, r0]\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r4\n\ + ldr r0, [r0]\n\ + str r0, [r1]\n\ + bl sub_80A362C\n\ + b ._61\n\ +._57:\n\ + .align 2, 0\n\ +._56:\n\ + .word gUnknown_0203855A\n\ + .word gBGTilemapBuffers+0x1000\n\ + .word gUnknown_02038559\n\ + .word gBagPockets\n\ + .word gUnknown_03005D24\n\ +._20:\n\ + ldr r0, ._59\n\ + mov r1, #0x0\n\ + mov r2, #0x7\n\ + bl sub_80A48E8\n\ + ldr r1, ._59 + 4\n\ + ldr r4, ._59 + 8\n\ + mov r0, #0x0\n\ + ldsb r0, [r4, r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x1]\n\ + ldrb r0, [r0]\n\ + add r1, r1, r0\n\ + ldr r0, ._59 + 12\n\ + ldr r0, [r0]\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r0\n\ + mov r2, #0x0\n\ + ldsh r0, [r1, r2]\n\ + bl ItemListMenu_InitDescription\n\ + bl ItemListMenu_InitMenu\n\ + ldr r1, ._59 + 16\n\ + ldrb r0, [r4]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + ldr r1, ._59 + 20\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ + ldr r1, ._59 + 24\n\ + ldr r0, ._59 + 28\n\ + add r1, r1, r0\n\ + b ._62\n\ +._60:\n\ + .align 2, 0\n\ +._59:\n\ + .word 0xffff\n\ + .word gUnknown_03005D10\n\ + .word gUnknown_02038559\n\ + .word gUnknown_03005D24\n\ + .word gUnknown_0203855B\n\ + .word gUnknown_0203855C\n\ + .word gMain\n\ + .word 0x43c\n\ +._21:\n\ + bl CreateBagSprite\n\ + mov r0, #0x0\n\ + bl CreateBagPokeballSprite\n\ + bl sub_80A3740\n\ + b ._61\n\ +._22:\n\ + ldr r3, ._63\n\ + ldrh r2, [r3]\n\ + mov r0, #0x0\n\ + strh r0, [r3]\n\ + ldr r4, ._63 + 4\n\ + ldrh r0, [r4]\n\ + mov r1, #0x1\n\ + orr r0, r0, r1\n\ + strh r0, [r4]\n\ + strh r2, [r3]\n\ + ldr r2, ._63 + 8\n\ + ldrh r0, [r2]\n\ + mov r1, #0x8\n\ + orr r0, r0, r1\n\ + strh r0, [r2]\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + mov r1, #0x0\n\ + str r1, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r2, ._63 + 12\n\ + ldrb r1, [r2, #0x8]\n\ + mov r0, #0x7f\n\ + and r0, r0, r1\n\ + strb r0, [r2, #0x8]\n\ + ldr r1, ._63 + 16\n\ + ldr r0, ._63 + 20\n\ + add r1, r1, r0\n\ + b ._62\n\ +._64:\n\ + .align 2, 0\n\ +._63:\n\ + .word 0x4000208\n\ + .word 0x4000200\n\ + .word 0x4000004\n\ + .word gPaletteFade\n\ + .word gMain\n\ + .word 0x43c\n\ +._23:\n\ + bl sub_8055870\n\ + cmp r0, #0x1\n\ + beq ._66 @cond_branch\n\ +._61:\n\ + ldr r1, ._67\n\ + ldr r2, ._67 + 4\n\ + add r1, r1, r2\n\ +._62:\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + b ._66\n\ +._68:\n\ + .align 2, 0\n\ +._67:\n\ + .word gMain\n\ + .word 0x43c\n\ +._24:\n\ + ldr r0, ._71\n\ + bl SetVBlankCallback\n\ + ldr r0, ._71 + 4\n\ + bl SetMainCallback2\n\ + bl sub_80A751C\n\ + bl sub_80A7630\n\ + bl sub_80A770C\n\ + bl sub_80A7828\n\ + bl sub_80A78B8\n\ + ldr r0, ._71 + 8\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._69 @cond_branch\n\ + ldr r0, ._71 + 12\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x8\n\ + ldr r2, ._71 + 16\n\ + mov r3, #0x0\n\ + bl debug_sub_8008218\n\ +._69:\n\ + mov r0, #0x1\n\ + b ._70\n\ +._72:\n\ + .align 2, 0\n\ +._71:\n\ + .word sub_80A3134+1\n\ + .word sub_80A3118+1\n\ + .word gLinkOpen\n\ + .word 0x600f5e0\n\ + .word 0x600f800\n\ +._66:\n\ + mov r0, #0x0\n\ +._70:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5}\n\ + pop {r1}\n\ + bx r1"); +} +#else static bool8 SetupBagMultistep(void) { u32 index; @@ -508,6 +895,7 @@ static bool8 SetupBagMultistep(void) } return FALSE; } +#endif static bool8 sub_80A34B4(void) { @@ -634,6 +1022,79 @@ void ClearBag(void) ResetBagScrollPositions(); } +#if DEBUG +__attribute__((naked)) +void debug_sub_80A3714() +{ + asm("\ + push {r4, r5, r6, lr}\n\ + add sp, sp, #0xfffffff4\n\ + mov r5, #0x0\n\ + ldr r2, ._138\n\ + mov r1, #0x0\n\ +._134:\n\ + lsl r0, r5, #0x1\n\ + add r0, r0, sp\n\ + strh r1, [r0]\n\ + add r0, r5, #1\n\ + lsl r0, r0, #0x10\n\ + lsr r5, r0, #0x10\n\ + cmp r5, #0x4\n\ + bls ._134 @cond_branch\n\ + mov r5, #0x0\n\ + ldrh r0, [r2]\n\ + cmp r0, #0\n\ + beq ._136 @cond_branch\n\ + add r6, r2, #0\n\ +._137:\n\ + lsl r4, r5, #0x2\n\ + add r4, r4, r6\n\ + ldrh r0, [r4]\n\ + bl ItemId_GetPocket\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x8\n\ + ldr r1, ._138 + 4\n\ + add r0, r0, r1\n\ + lsr r0, r0, #0x10\n\ + ldr r1, ._138 + 8\n\ + lsl r2, r0, #0x3\n\ + add r2, r2, r1\n\ + lsl r0, r0, #0x1\n\ + mov r1, sp\n\ + add r3, r1, r0\n\ + ldrh r1, [r3]\n\ + ldr r0, [r2]\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r0\n\ + ldr r0, [r4]\n\ + str r0, [r1]\n\ + ldrh r0, [r3]\n\ + add r0, r0, #0x1\n\ + strh r0, [r3]\n\ + add r0, r5, #1\n\ + lsl r0, r0, #0x10\n\ + lsr r5, r0, #0x10\n\ + cmp r5, #0x3b\n\ + bhi ._136 @cond_branch\n\ + lsl r0, r5, #0x2\n\ + add r0, r0, r6\n\ + ldrh r0, [r0]\n\ + cmp r0, #0\n\ + bne ._137 @cond_branch\n\ +._136:\n\ + add sp, sp, #0xc\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0\n\ +._139:\n\ + .align 2, 0\n\ +._138:\n\ + .word gUnknown_Debug_083EBC68\n\ + .word 0xffff0000\n\ + .word gBagPockets"); +} +#endif + static void sub_80A3740(void) { const u16 colors[2] = {RGB(14, 15, 16), RGB_WHITE}; @@ -3573,12 +4034,49 @@ static void sub_80A73FC(void) MenuCursor_Destroy814AD44(); } +#if DEBUG +__attribute__((naked)) +static void sub_80A740C(void) +{ + asm("\ + push {lr}\n\ + add sp, sp, #0xfffffffc\n\ + bl sub_80A75E4\n\ + bl sub_80A7768\n\ + bl sub_80A7420\n\ + ldr r0, ._931\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._930 @cond_branch\n\ + ldr r0, ._931 + 4\n\ + ldr r1, ._931 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x0\n\ + str r1, [sp]\n\ + mov r1, #0x1\n\ + mov r2, #0x1\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._930:\n\ + add sp, sp, #0x4\n\ + pop {r0}\n\ + bx r0\n\ +._932:\n\ + .align 2, 0\n\ +._931:\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else static void sub_80A740C(void) { sub_80A75E4(); sub_80A7768(); sub_80A7420(); } +#endif static void sub_80A7420(void) { diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index 70234ac48..2b3405640 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -912,6 +912,48 @@ static bool8 SetUpFieldMove_Waterfall(void) return FALSE; } +#if DEBUG +__attribute__((naked)) +void debug_sub_80986AC() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + mov r4, sp\n\ + add r4, r4, #0x2\n\ + mov r0, sp\n\ + add r1, r4, #0\n\ + bl GetXYCoordsOneStepInFrontOfPlayer\n\ + mov r0, sp\n\ + mov r1, #0x0\n\ + ldsh r0, [r0, r1]\n\ + mov r2, #0x0\n\ + ldsh r1, [r4, r2]\n\ + bl MapGridGetMetatileBehaviorAt\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl MetatileBehavior_IsWaterfall\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bne ._274 @cond_branch\n\ + bl IsPlayerSurfingNorth\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bne ._274 @cond_branch\n\ + bl sub_808AE08\n\ + b ._275\n\ +._274:\n\ + bl ScriptContext2_Disable\n\ +._275:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0"); +} +#endif + static void sub_808AE8C(void) { u8 i; diff --git a/undefined.txt b/undefined.txt new file mode 100644 index 000000000..74e3d517d --- /dev/null +++ b/undefined.txt @@ -0,0 +1,211 @@ +(.text+0x120): undefined reference to `gUnknown_02023A14_50' +(.text+0x124): undefined reference to `ewram' +(.text+0x76): undefined reference to `dp12_8087EA4' +(.text+0xb8): undefined reference to `sub_80895F8' +(.text+0xf6): undefined reference to `GetBattleTerrain' +(.text+0x160): undefined reference to `gUnknown_030042C4' +(.text+0x164): undefined reference to `gUnknown_03004240' +(.text+0x168): undefined reference to `gUnknown_03004DE0' +(.text+0x174): undefined reference to `gWindowConfig_81E6C58' +(.text+0x178): undefined reference to `gUnknown_030042A4' +(.text+0x1a8): undefined reference to `gWindowConfig_81E71D0' +(.text+0x1b0): undefined reference to `gWindowConfig_81E71EC' +(.text+0x8a8): undefined reference to `sub_800F808' +(.text+0x10e0): undefined reference to `sub_800F808' +(.text+0x1150): undefined reference to `gScriptResult' +(.text+0x115c): undefined reference to `gUnknown_03004DC0' +(.text+0x11b6): undefined reference to `sub_800374C' +(.text+0x1d2c): undefined reference to `sub_800D238' +(.text+0x1d5c): undefined reference to `remove_some_task' +(.text+0x1de8): undefined reference to `gUnknown_030042A4' +(.text+0x1e30): undefined reference to `gWindowConfig_81E6C3C' +(.text+0x2188): undefined reference to `gUnknown_03005E94' +(.text+0x31a4): undefined reference to `gUnknown_030042A4' +(.text+0x321e): undefined reference to `sub_8089668' +(.text+0x3230): undefined reference to `gUnknown_030042A4' +(.text+0x3380): undefined reference to `sub_8002F44' +(.text+0x33c0): undefined reference to `sub_8002F44' +(.text+0x33f4): undefined reference to `sub_8002F44' +(.text+0x3476): undefined reference to `sub_8002F44' +(.text+0x34b4): undefined reference to `sub_8002F44' +src/battle/battle_2.o:(.text+0x3526): more undefined references to `sub_8002F44' follow +(.text+0x3c08): undefined reference to `gWindowConfig_81E6C58' +(.text+0x3c0c): undefined reference to `gUnknown_030042A4' +(.text+0x3c78): undefined reference to `sub_800374C' +(.text+0x3cd0): undefined reference to `sub_8002F44' +(.text+0x3d0c): undefined reference to `sub_8002F44' +(.text+0x3d5e): undefined reference to `sub_8002F44' +(.text+0x3d96): undefined reference to `sub_8002F44' +(.text+0x3fda): undefined reference to `sub_8002F44' +src/battle/battle_2.o:(.text+0x402e): more undefined references to `sub_8002F44' follow +(.text+0x5164): undefined reference to `gUnknown_02024C44' +(.text+0x5168): undefined reference to `gMoveHitWith' +(.text+0x5178): undefined reference to `gLockedMove' +(.text+0x518c): undefined reference to `gSideTimer' +(.text+0x235e): undefined reference to `sub_80593F4' +(.text+0x4c): undefined reference to `gUnknown_Debug_03004BC0' +(.text+0x39c): undefined reference to `gUnknown_Debug_03004BC0' +(.text+0x4d0): undefined reference to `gUnknown_Debug_03004BC0' +(.text+0x660): undefined reference to `gUnknown_Debug_03004BC0' +(.text+0xd4c): undefined reference to `gUnknown_Debug_03004BC0' +(.text+0xae8): undefined reference to `MenuZeroFillScreen' +(.text+0xb8a): undefined reference to `MenuDrawTextWindow' +(.text+0xbac): undefined reference to `MenuPrint' +(.text+0xbb6): undefined reference to `MenuPrint' +(.text+0xbc0): undefined reference to `MenuPrint' +(.text+0xbca): undefined reference to `MenuPrint' +(.text+0xbd4): undefined reference to `MenuPrint' +src/engine/reset_rtc_screen.o:(.text+0xc40): more undefined references to `MenuPrint' follow +(.text+0xc88): undefined reference to `MenuZeroFillScreen' +(.text+0xd4): undefined reference to `gUnknown_03004DE0' +(.text+0x1f0): undefined reference to `sub_8136088' +(.text+0x58): undefined reference to `PrintMenuItemsReordered' +(.text+0x25c): undefined reference to `sub_804B790' +(.text+0x28a): undefined reference to `ClearSaveData' +(.text+0x5c8): undefined reference to `gWindowConfig_81E6CE4' +(.text+0x6f2): undefined reference to `PrintMenuItemsReordered' +(.text+0xac0): undefined reference to `GetNationalPokedexFlag' +(.text+0xac8): undefined reference to `GetNationalPokedexFlag' +(.text+0xb06): undefined reference to `GetNationalPokedexFlag' +(.text+0xb0e): undefined reference to `GetNationalPokedexFlag' +(.text+0xbc6): undefined reference to `sub_8053570' +(.text+0xe24): undefined reference to `sWildEncountersDisabled' +(.text+0xe4c): undefined reference to `sWildEncountersDisabled' +(.text+0xec6): undefined reference to `unref_sub_8082C2C' +(.text+0xf00): undefined reference to `sub_8082C0C' +(.text+0x101c): undefined reference to `gSafariZoneStepCounter' +(.text+0x1034): undefined reference to `gSafariZoneStepCounter' +(.text+0x10cc): undefined reference to `gSafariZoneStepCounter' +(.text+0x1da0): undefined reference to `gScriptResult' +(.text+0x25c8): undefined reference to `gUnknown_Debug_03004BD0' +(.text+0x25ec): undefined reference to `ProcessMenuInputNoWrap_' +(.text+0x2608): undefined reference to `gUnknown_Debug_03004BD0' +(.text+0x2628): undefined reference to `gUnknown_Debug_03004BD0' +(.text+0x2694): undefined reference to `MenuUpdateWindowText' +(.text+0x16aa): undefined reference to `MenuFillWindowRectWithBlankTile' +(.text+0x16be): undefined reference to `MenuPrint' +(.text+0x1708): undefined reference to `MenuZeroFillScreen' +(.text+0x1714): undefined reference to `MenuFillWindowRectWithBlankTile' +(.text+0x1726): undefined reference to `MenuPrint' +(.text+0x173c): undefined reference to `gUnknown_0202F7E8' +(.text+0xd0): undefined reference to `PrintHex' +(.text+0xde): undefined reference to `PrintHex' +(.text+0xfc): undefined reference to `PrintHex' +(.text+0x10e): undefined reference to `PrintHex' +(.text+0x12e): undefined reference to `PrintHex' +src/engine/cable_club.o:(.text+0x13c): more undefined references to `PrintHex' follow +(.text+0x270): undefined reference to `gScriptResult' +(.text+0x12ac): undefined reference to `unk_3004E98' +(.text+0x12e4): undefined reference to `unk_3004E94' +(.text+0x2274): undefined reference to `gScriptResult' +(.text+0x22ac): undefined reference to `gScriptResult' +(.text+0x228): undefined reference to `sub_810F424' +(.text+0x2c2): undefined reference to `ProcessMenuInputNoWrap_' +(.text+0x712): undefined reference to `sub_80BFB54' +(.text+0x44): undefined reference to `sub_80EB3FC' +(.text+0x5a): undefined reference to `sub_80EB3FC' +(.text+0x318): undefined reference to `GetCurrentMauvilleOldMan' +(.text+0x6e0): undefined reference to `gScriptResult' +(.text+0x6f8): undefined reference to `trainer_flag_set' +(.text+0x708): undefined reference to `trainer_flag_set' +(.text+0x710): undefined reference to `trainer_flag_set' +(.text+0x716): undefined reference to `trainer_flag_set' +(.text+0x71e): undefined reference to `trainer_flag_set' +src/debug/taya_debug_window.o:(.text+0x724): more undefined references to `trainer_flag_set' follow +(.text+0xf78): undefined reference to `gWindowConfig_81E7224' +(.text+0x11b4): undefined reference to `unk_2038790' +(.text+0x11cc): undefined reference to `unk_2038794' +(.text+0x11d0): undefined reference to `unk_2038798' +(.text+0x1210): undefined reference to `unk_2038798' +(.text+0x1230): undefined reference to `unk_2038794' +(.text_8098A38+0x40b4): undefined reference to `unk_2038790' +(.text+0x1dc): undefined reference to `gUnknown_0202FF84' +(.text+0x238): undefined reference to `sub_80FC074' +(.text+0x264): undefined reference to `gUnknown_0202FF84' +(.text+0xda): undefined reference to `remove_some_task' +(.text+0x13a): undefined reference to `sub_80A3520' +(.text+0x15a): undefined reference to `SetUpWindowConfig' +(.text+0x160): undefined reference to `gWindowConfig_81E6DFC' +(.text+0x174): undefined reference to `gWindowConfig_81E6DFC' +(.text+0x204): undefined reference to `gUnknown_03000701' +(.text+0x22c): undefined reference to `sub_80A3AC0' +(.text+0x230): undefined reference to `sub_80A3D08' +(.text+0x23a): undefined reference to `sub_80A3C34' +(.text+0x242): undefined reference to `sub_80A3C34' +(.text+0x268): undefined reference to `gUnknown_02038559' +(.text+0x270): undefined reference to `gUnknown_03005D24' +(.text+0x2c0): undefined reference to `gUnknown_03005D10' +(.text+0x2c4): undefined reference to `gUnknown_02038559' +(.text+0x2c8): undefined reference to `gUnknown_03005D24' +(.text+0x6c0): undefined reference to `gUnknown_Debug_083EBC68' +(.text+0x93a): undefined reference to `GetFieldObjectScriptPointerForComparison' +(.text+0x948): undefined reference to `BerryTreeScript' +(.text+0xca): undefined reference to `remove_some_task' +(.text+0x114): undefined reference to `gWindowConfig_81E6C3C' +(.text+0x118): undefined reference to `gWindowConfig_81E6CE4' +(.text+0x72c): undefined reference to `gPokedexEntries' +(.text+0x1398): undefined reference to `gUnknown_02023A14_50' +(.text+0x1410): undefined reference to `gUnknown_02023A14_50' +(.text+0x1f4e): undefined reference to `GetNationalPokedexFlag' +(.text+0x1f56): undefined reference to `GetNationalPokedexFlag' +(.text+0x380e): undefined reference to `sub_8091738' +(.text+0x3b40): undefined reference to `species_and_otid_get_pal' +(.text+0x3b66): undefined reference to `species_and_otid_get_pal' +(.text+0x46a8): undefined reference to `species_and_otid_get_pal' +(.text+0x46ce): undefined reference to `species_and_otid_get_pal' +(.text+0x80): undefined reference to `gScriptResult' +(.text+0x122): undefined reference to `sub_80F7A6C' +(.text+0x144): undefined reference to `sub_80F7A98' +(.text+0x14a): undefined reference to `sub_80F7A7C' +(.text+0x150): undefined reference to `sub_80F7A88' +(.text+0x44): undefined reference to `gUnknown_03000748' +(.text+0x123c): undefined reference to `remove_some_task' +(.text+0x48): undefined reference to `MenuDrawTextWindow' +(.text+0x54): undefined reference to `MenuPrint' +(.text+0x6c): undefined reference to `MenuPrint' +(.text+0x74): undefined reference to `gUnknown_083E79C0' +(.text+0x92): undefined reference to `MenuDrawTextWindow' +(.text+0x9c): undefined reference to `MenuPrint' +(.text+0xa8): undefined reference to `MenuZeroFillWindowRect' +(.text+0x162): undefined reference to `sub_80FC244' +(.text+0x170): undefined reference to `sub_80FC69C' +(.text+0x1f2): undefined reference to `sub_80FBB3C' +(.text+0x246): undefined reference to `sub_80FBB3C' +(.text+0x25e): undefined reference to `sub_80FC074' +(.text+0x272): undefined reference to `sub_80FC244' +(.text+0x284): undefined reference to `sub_80FC228' +(.text+0xc): undefined reference to `sub_81019B0' +(.text+0x20): undefined reference to `sub_81018B8' +(.text+0x30): undefined reference to `sub_81019B0' +(.text+0x44): undefined reference to `sub_81018B8' +(.text+0xa28): undefined reference to `sub_81027A0' +(.text+0xae0): undefined reference to `StripExtCtrlCodes' +(.text+0xb2c): undefined reference to `gSaveSectionLocations' +(.text+0xb38): undefined reference to `gHallOfFameSaveSectionLocations' +(.text+0x228): undefined reference to `gFlashSectors' +(.text+0x2a0): undefined reference to `gFlashSectors' +(.text+0x2a4): undefined reference to `gFlashSectors' +(.text+0x400): undefined reference to `gFlashSectors' +(.text+0x584): undefined reference to `gFlashSectors' +(.text+0x530): undefined reference to `MenuDrawTextWindow' +(.text+0x544): undefined reference to `MenuPrint' +(.text+0x574): undefined reference to `gFlashSectors' +(.text+0x57c): undefined reference to `gFlashSectors' +(.text+0x5bc): undefined reference to `gFlashSectors' +(.text+0x5f4): undefined reference to `gScriptFuncs_End' +(.text+0x614): undefined reference to `gFlashSectors' +(.text+0x700): undefined reference to `MenuDrawTextWindow' +(.text+0x760): undefined reference to `gUnknown_0841192C' +(.text+0x768): undefined reference to `MenuUpdateWindowText' +(.text+0x7c8): undefined reference to `gUnknown_0841192C' +(.text+0x7cc): undefined reference to `MenuUpdateWindowText' +(.text+0x810): undefined reference to `gUnknown_0841192C' +(.text+0x824): undefined reference to `MenuUpdateWindowText' +(.text+0x868): undefined reference to `MenuFillWindowRectWithBlankTile' +(.text+0x872): undefined reference to `MenuPrint' +(.text+0x884): undefined reference to `gUnknown_0841192C' +(.text+0xd52): undefined reference to `FeebasSeedRng' +(.text+0xd76): undefined reference to `FeebasRandom' +(.text+0x17c0): undefined reference to `gOtherText_FiveQuestions' +(.text+0x1ac0): undefined reference to `gContestStatsText_Tasty' +(.text+0x1c74): undefined reference to `gOtherText_Slash' -- cgit v1.2.3 From f07cdb4c9723bdbb1fcdbbe622d39936ae5b532f Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 17 Jan 2018 17:47:46 -0500 Subject: use Dma Large loops for every while(1) Dma loop --- include/gba/macro.h | 53 +++++++++++++++++++++++++++++++++++ src/battle/battle_controller_player.c | 17 +---------- src/engine/naming_screen.c | 15 +--------- src/engine/option_menu.c | 17 +---------- src/engine/reset_rtc_screen.c | 20 +------------ src/engine/trade.c | 20 ++----------- src/engine/trainer_card.c | 46 +++--------------------------- src/field/menu_helpers.c | 19 +------------ src/field/overworld.c | 19 +------------ src/field/party_menu.c | 18 +----------- src/field/wallclock.c | 19 ++----------- src/pokemon/pokedex.c | 29 ++++--------------- src/scene/contest_painting.c | 17 +---------- 13 files changed, 75 insertions(+), 234 deletions(-) diff --git a/include/gba/macro.h b/include/gba/macro.h index dcad009e1..d39d10738 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -167,4 +167,57 @@ #define DmaFill16Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 16) #define DmaFill32Defvars(dmaNum, fillval, dest, size) DmaFillDefvars(dmaNum, fillval, dest, size, 32) +// from pokeemerald +// Maximum amount of data we will transfer in one operation +#define MAX_DMA_BLOCK_SIZE 0x1000 + +#define MAX_DMA_REQUESTS 128 + +#define DMA_REQUEST_COPY32 1 +#define DMA_REQUEST_FILL32 2 +#define DMA_REQUEST_COPY16 3 +#define DMA_REQUEST_FILL16 4 + +#define Dma3CopyLarge_(src, dest, size, bit) \ +{ \ + const void *_src = src; \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + if (_size <= MAX_DMA_BLOCK_SIZE) \ + { \ + DmaCopy##bit(3, _src, _dest, _size); \ + break; \ + } \ + DmaCopy##bit(3, _src, _dest, MAX_DMA_BLOCK_SIZE); \ + _src += MAX_DMA_BLOCK_SIZE; \ + _dest += MAX_DMA_BLOCK_SIZE; \ + _size -= MAX_DMA_BLOCK_SIZE; \ + } \ +} + +#define Dma3CopyLarge16_(src, dest, size) Dma3CopyLarge_(src, dest, size, 16) +#define Dma3CopyLarge32_(src, dest, size) Dma3CopyLarge_(src, dest, size, 32) + +#define Dma3FillLarge_(value, dest, size, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + if (_size <= MAX_DMA_BLOCK_SIZE) \ + { \ + DmaFill##bit(3, value, _dest, _size); \ + break; \ + } \ + DmaFill##bit(3, value, _dest, MAX_DMA_BLOCK_SIZE); \ + _dest += MAX_DMA_BLOCK_SIZE; \ + _size -= MAX_DMA_BLOCK_SIZE; \ + } \ +} + +#define Dma3FillLarge16_(value, dest, size) Dma3FillLarge_(value, dest, size, 16) +#define Dma3FillLarge32_(value, dest, size) Dma3FillLarge_(value, dest, size, 32) + #endif // GUARD_GBA_MACRO_H diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 0d05b7aed..f036e841f 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2749,22 +2749,7 @@ void PlayerHandleDMATransfer(void) | (gBattleBufferA[gActiveBank][4] << 24); u16 val2 = gBattleBufferA[gActiveBank][5] | (gBattleBufferA[gActiveBank][6] << 8); - const u8 *src = &gBattleBufferA[gActiveBank][7]; - u8 *dst = (u8 *)val1; - u32 size = val2; - - while (1) - { - if (size <= 0x1000) - { - DmaCopy16(3, src, dst, size); - break; - } - DmaCopy16(3, src, dst, 0x1000); - src += 0x1000; - dst += 0x1000; - size -= 0x1000; - } + Dma3CopyLarge16_(&gBattleBufferA[gActiveBank][7], (u8 *)val1, val2); PlayerBufferExecCompleted(); } diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index eddfdeda5..d54b84720 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -258,20 +258,7 @@ static void NamingScreen_InitDisplayMode(void) static void NamingScreen_ClearVram(void) { - u8 *addr = (void *)VRAM; - u32 size = 0x10000; - - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } + DmaFill16Large(3, 0, (void *)VRAM, 0x10000, 0x1000); } static void NamingScreen_ClearOam(void) diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c index 1fc78efaa..d4e921a0e 100644 --- a/src/engine/option_menu.c +++ b/src/engine/option_menu.c @@ -76,9 +76,6 @@ void CB2_InitOptionMenu(void) default: case 0: { - u8 *addr; - u32 size; - SetVBlankCallback(NULL); REG_DISPCNT = 0; REG_BG2CNT = 0; @@ -90,19 +87,7 @@ void CB2_InitOptionMenu(void) REG_BG1VOFS = 0; REG_BG0HOFS = 0; REG_BG0VOFS = 0; - addr = (u8 *)VRAM; - size = 0x18000; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } + DmaFill16Large(3, 0, (u8 *)VRAM, 0x18000, 0x1000); DmaClear32(3, OAM, OAM_SIZE); DmaClear16(3, PLTT, PLTT_SIZE); gMain.state++; diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index c7d45e929..ce4afe922 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -414,28 +414,10 @@ void Task_ResetRtc_0(u8 taskId) void CB2_InitResetRtcScreen(void) { - u8 *addr; - u32 size; - REG_DISPCNT = 0; SetVBlankCallback(NULL); - DmaClear16(3, PLTT, PLTT_SIZE); - - addr = (u8 *)VRAM; - size = 0x18000; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } - + DmaFill16Large(3, 0, (u8 *)VRAM, 0x18000, 0x1000); ResetOamRange(0, 128); LoadOam(); ScanlineEffect_Stop(); diff --git a/src/engine/trade.c b/src/engine/trade.c index 3a14adaca..81485d3f6 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -1453,9 +1453,7 @@ static void sub_8048AB4(void) static void sub_8048B0C(u8 a0) { int i; - u16 *dest; - const u16 *src; - u32 size; + switch (a0) { case 0: @@ -1464,21 +1462,7 @@ static void sub_8048B0C(u8 a0) gPlttBufferUnfaded[i] = *(gUnknown_08EA02C8 + i); gPlttBufferFaded[i] = *(gUnknown_08EA02C8 + i); } - src = gUnknown_08EA0348; - dest = (u16 *)BG_VRAM; - size = 0x1280; - while (1) - { - DmaCopy16(3, src, dest, BLOCKSIZE * sizeof(u16)); - src += BLOCKSIZE; - dest += BLOCKSIZE; - size -= BLOCKSIZE * sizeof(u16); - if (size <= BLOCKSIZE * sizeof(u16)) - { - DmaCopy16(3, src, dest, size); - break; - } - } + DmaCopyLarge16(3, gUnknown_08EA0348, (void *)BG_VRAM, 0x1280, 0x1000); for (i = 0; i < 0x400; i ++) gUnknown_03004824->unk_00c8.unk_12[i] = gUnknown_08EA15C8[i]; dest = BG_SCREEN_ADDR(6); diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index 9d09575c8..b49628bfa 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -441,27 +441,12 @@ static void sub_8093550(void) void sub_8093598(void) { - u8 *addr = (void *)VRAM; - u32 size = 0x10000; - - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } + DmaFill16Large(3, 0, (void *)VRAM, 0x10000, 0x1000); } void sub_80935EC(void) { - void *addr = (void *)OAM; - - DmaFill16(3, 0, addr, 0x400); + DmaFill16Defvars(3, 0, (void *)OAM, 0x400); } void sub_8093610(void) @@ -1163,33 +1148,10 @@ static void TrainerCard_ResetOffsetRegisters(void) static void TrainerCard_CopyGraphics(void) { - const u8 *src; - u8 *dst; - u32 size; - TrainerCard_LoadPalettes(); LoadPalette(gUnknown_083B5F6C, 0xE0, 32); - src = gMenuTrainerCard_Gfx; - dst = (void *)VRAM; - size = 0x1480; - while (1) - { - DmaCopy16(3, src, dst, 0x1000); - src += 0x1000; - dst += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaCopy16(3, src, dst, size); - break; - } - } - { - const void *src = gBadgesTiles; - void *dst = (void *)(VRAM + 0x1480); - - DmaCopy16(3, src, dst, 0x400); - } + DmaCopyLarge16(3, gMenuTrainerCard_Gfx, (void *)VRAM, 0x1480, 0x1000); + DmaCopy16Defvars(3, gBadgesTiles, (void *)(VRAM + 0x1480), 0x400); } extern const u16 *const gTrainerCardPalettes[]; diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c index 54668addb..388d98ec7 100644 --- a/src/field/menu_helpers.c +++ b/src/field/menu_helpers.c @@ -296,9 +296,6 @@ bool8 sub_80F9344(void) void sub_80F9368(void) { - u8 *addr; - u32 size; - REG_DISPCNT = 0; REG_BG3CNT = 0; REG_BG2CNT = 0; @@ -312,21 +309,7 @@ void sub_80F9368(void) REG_BG1VOFS = 0; REG_BG0HOFS = 0; REG_BG0VOFS = 0; - - addr = (u8 *)VRAM; - size = 0x18000; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } - + DmaFill16Large(3, 0, (u8 *)VRAM, 0x18000, 0x1000); DmaClear32(3, OAM, OAM_SIZE); DmaClear16(3, PLTT, PLTT_SIZE); } diff --git a/src/field/overworld.c b/src/field/overworld.c index 86b0a5dac..a6d34e103 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -1664,29 +1664,12 @@ void do_load_map_stuff_loop(u8 *a1) void sub_8054BA8(void) { - u8 *addr; - u32 size; - REG_DISPCNT = 0; ScanlineEffect_Stop(); DmaClear16(3, PLTT + 2, PLTT_SIZE - 2); - - addr = (void *)VRAM; - size = 0x18000; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } - + DmaFill16Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000); ResetOamRange(0, 128); LoadOam(); } diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 48275435e..53bad9618 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -620,27 +620,11 @@ bool8 SetupDefaultPartyMenu(void) bool8 InitPartyMenu(void) { - u8 *addr; - u32 size; - switch (gMain.state) { case 0: SetVBlankCallback(NULL); - addr = (u8 *)VRAM; - size = VRAM_SIZE; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } - + DmaFill16Large(3, 0, (void *)(VRAM + 0x0), VRAM_SIZE, 0x1000); DmaClear32(3, OAM, OAM_SIZE); DmaClear16(3, PLTT, PLTT_SIZE); diff --git a/src/field/wallclock.c b/src/field/wallclock.c index aaa7f9ae8..1f743a61a 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -190,10 +190,7 @@ static void WallClockVblankCallback(void) static void LoadWallClockGraphics(void) { - u8 *addr; - u32 size; - - SetVBlankCallback(0); + SetVBlankCallback(NULL); REG_DISPCNT = 0; REG_BG3CNT = 0; REG_BG2CNT = 0; @@ -208,19 +205,7 @@ static void LoadWallClockGraphics(void) REG_BG0HOFS = 0; REG_BG0VOFS = 0; - addr = (void *)VRAM; - size = 0x18000; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } + DmaFill16Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000); DmaClear32(3, OAM, OAM_SIZE); DmaClear16(3, PLTT, PLTT_SIZE); diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index faebe526a..cbd816206 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -1394,29 +1394,12 @@ void CB2_InitPokedex(void) { case 0: default: - { - u8 *addr; - u32 size; - - SetVBlankCallback(NULL); - sub_8091060(0); - addr = (u8 *)VRAM; - size = VRAM_SIZE; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } - DmaClear32(3, OAM, OAM_SIZE); - DmaClear16(3, PLTT, PLTT_SIZE); - gMain.state = 1; - } + SetVBlankCallback(NULL); + sub_8091060(0); + DmaFill16Large(3, 0, (void *)(VRAM + 0x0), VRAM_SIZE, 0x1000); + DmaClear32(3, OAM, OAM_SIZE); + DmaClear16(3, PLTT, PLTT_SIZE); + gMain.state = 1; break; case 1: ScanlineEffect_Stop(); diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c index 3aa898b03..0aa02312f 100644 --- a/src/scene/contest_painting.c +++ b/src/scene/contest_painting.c @@ -156,23 +156,8 @@ static void ShowContestPainting(void) break; case 1: { - u8 *addr; - size_t size; - ResetPaletteFade(); - addr = (void *)VRAM; - size = 0x18000; - while (1) - { - DmaFill32(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill32(3, 0, addr, size); - break; - } - } + DmaFill32Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000); ResetSpriteData(); gMain.state++; break; -- cgit v1.2.3 From 093422f3065ed47db9a475b0c9d67e9c5bc2c364 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 17 Jan 2018 18:10:16 -0500 Subject: use dma macros for remaining missing dma while(1) loops --- src/field/slot_machine.c | 19 +------------------ src/pokemon/mon_markings.c | 3 +-- src/pokemon/pokemon_summary_screen.c | 22 +++++----------------- src/scene/berry_blender.c | 20 ++------------------ src/scene/egg_hatch.c | 19 +------------------ src/scene/hall_of_fame.c | 33 ++++----------------------------- 6 files changed, 14 insertions(+), 102 deletions(-) diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 9ff3a037c..21bf29e91 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -3901,26 +3901,9 @@ static void sub_8106404(void) } static void sub_8106448(void) { - u32 offsetRead, offsetWrite; - u32 size; - LZDecompressWram(gSlotMachine_Gfx, eSlotMachineGfxBuffer); - offsetRead = (u32)eSlotMachineGfxBuffer; - offsetWrite = BG_VRAM; - size = SLOTMACHINE_GFX_TILES * 32; - while (TRUE) - { - DmaCopy16(3, offsetRead, (void *) (offsetWrite), 0x1000); - offsetRead += 0x1000; - offsetWrite += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaCopy16(3, offsetRead, (void *) (offsetWrite), size); - break; - } - } + DmaCopyLarge16(3, eSlotMachineGfxBuffer, BG_VRAM, SLOTMACHINE_GFX_TILES * 32, 0x1000); LoadPalette(gUnknown_08E95A18, 0, 160); LoadPalette(gPalette_83EDE24, 208, 32); diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c index 3734856b8..66c82a706 100644 --- a/src/pokemon/mon_markings.c +++ b/src/pokemon/mon_markings.c @@ -631,6 +631,5 @@ struct Sprite *sub_80F7960(u16 tileTag, u16 paletteTag, const u16 *palette, u16 void sub_80F7A10(u8 markings, void *dest) { - const void *src = gUnknown_083E4A14 + markings * 0x80; - DmaCopy16(3, src, dest, 0x80); + DmaCopy16Defvars(3, gUnknown_083E4A14 + markings * 0x80, dest, 0x80); } diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index bf8306fc0..eab6fb4ee 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -690,9 +690,6 @@ void sub_809DA1C(void) bool8 sub_809DA84(void) { - const u16 *src; - void *dest; - switch (gMain.state) { case 0: @@ -709,8 +706,7 @@ bool8 sub_809DA84(void) gMain.state++; break; case 3: - dest = (void *)VRAM; - DmaClearLarge(3, dest, 0x10000, 0x1000, 32); + DmaClearLarge(3, (void *)(VRAM + 0x0), 0x10000, 0x1000, 32); gMain.state++; break; case 4: @@ -736,14 +732,8 @@ bool8 sub_809DA84(void) gMain.state++; break; case 9: - src = gSummaryScreenTextTiles; - dest = (void *)VRAM + 0xD000; - DmaCopy16(3, src, dest, 320); - - src = sSummaryScreenButtonTiles; - dest = (void *)VRAM + 0xD140; - DmaCopy16(3, src, dest, 256); - + DmaCopy16Defvars(3, gSummaryScreenTextTiles, (void *)(VRAM + 0xD000), 320); + DmaCopy16Defvars(3, sSummaryScreenButtonTiles, (void *)(VRAM + 0xD140), 256); pssData.loadGfxState = 0; gMain.state++; break; @@ -3622,16 +3612,14 @@ static void DrawSummaryScreenNavigationDots(void) } } - dest = (void *)(VRAM + 0xE016); - DmaCopy16(3, arr, dest, 16); + DmaCopy16Defvars(3, arr, (void *)(VRAM + 0xE016), 16); for (i = 0; i < 8; i++) { arr[i] += 0x10; } - dest = (void *)(VRAM + 0xE056); - DmaCopy16(3, arr, dest, 16); + DmaCopy16Defvars(3, arr, (void *)(VRAM + 0xE056), 16); } #else __attribute__((naked)) diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 0a7e14e4e..6b6469634 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -842,24 +842,8 @@ static bool8 sub_804E2EC(void) } break; case 2: - { - void* offsetRead = ewram10000; - void* offsetWrite = (void*)(VRAM); - u32 size = 0x2000; - while (TRUE) - { - DmaCopy16(3, offsetRead, offsetWrite, 0x1000); - offsetRead += 0x1000; - offsetWrite += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaCopy16(3, offsetRead, offsetWrite, size); - break; - } - } - gBerryBlenderData->field_1++; - } + DmaCopyLarge16(3, ewram10000, (void *)(VRAM + 0x0), 0x2000, 0x1000); + gBerryBlenderData->field_1++; break; case 3: LZDecompressWram(gUnknown_08E6C920, ewram10000); diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index e0b798aea..8c585e067 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -505,28 +505,11 @@ static void CB2_EggHatch_0(void) break; case 7: { - u32 offsetRead, offsetWrite; u32 offsetRead2, offsetWrite2; - u32 size; REG_BG2CNT = 0x4C06; LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0); - - offsetRead = (u32)(&gUnknown_0820CA98); - offsetWrite = (VRAM + 0x4000); - size = 0x1300; - while (TRUE) - { - DmaCopy16(3, offsetRead, (void *) (offsetWrite), 0x1000); - offsetRead += 0x1000; - offsetWrite += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaCopy16(3, offsetRead, (void *) (offsetWrite), size); - break; - } - } + DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000); offsetRead2 = (u32)(&gUnknown_0820F798); offsetWrite2 = (u32)(VRAM + 0x6000); diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index a9532fd09..f7f7fb1cc 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -1199,8 +1199,8 @@ static void HallOfFame_PrintPlayerInfo(u8 a0, u8 a1) static void sub_81433E0(void) { - u32 offsetWrite, offsetWrite2, offsetWrite3, offsetWrite4; - u32 size, size2, size3, size4; + u32 offsetWrite2, offsetWrite3; + u32 size2, size3; u16 i; REG_DISPCNT = 0; @@ -1221,19 +1221,7 @@ static void sub_81433E0(void) REG_BG3HOFS = 0; REG_BG3VOFS = 0; - offsetWrite = (VRAM); - size = 0x18000; - while (TRUE) - { - DmaFill16(3, 0, offsetWrite, 0x1000); - offsetWrite += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, offsetWrite, size); - break; - } - } + DmaFill16Large(3, 0, VRAM, 0x18000, 0x1000); offsetWrite2 = OAM; size2 = OAM_SIZE; @@ -1258,20 +1246,7 @@ static void sub_81433E0(void) *((u16*)(VRAM + 0x3000) + i) = 2; } - offsetWrite4 = ewram0_6; - size4 = 0x4000; - while (TRUE) - { - DmaFill16(3, 0, offsetWrite4, 0x1000); - offsetWrite4 += 0x1000; - size4 -= 0x1000; - if (size4 <= 0x1000) - { - DmaFill16(3, 0, offsetWrite4, size4); - break; - } - } - + DmaFill16Large(3, 0, ewram0_6, 0x4000, 0x1000); ResetPaletteFade(); LoadPalette(gHallOfFame_Pal, 0, 0x20); } -- cgit v1.2.3 From 233654746815b884d303cc3416c3fe6c377b4a73 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 17:30:45 -0600 Subject: resolve more undefined references --- asm/cute_sketch.s | 20 +++++----- src/battle/battle_2.c | 86 ++++++++++++++++++++--------------------- src/debug/kagaya_debug_menu.c | 6 +-- src/debug/nohara_debug_menu.c | 4 +- src/debug/start_menu_debug.c | 10 ++--- src/debug/taya_debug_window.c | 6 +-- src/debug/unk_debug_menu_3.c | 10 ++--- src/debug/watanabe_debug_menu.c | 4 +- src/engine/mystery_event_menu.c | 24 ++++++------ src/engine/reset_rtc_screen.c | 20 +++++----- src/engine/save.c | 4 +- src/field/berry_tag_screen.c | 2 +- src/field/choose_party.c | 2 +- src/field/field_weather.c | 10 ++--- src/field/item_menu.c | 28 +++++++------- src/field/mauville_man.c | 10 ++--- src/field/region_map.c | 14 +++---- src/field/slot_machine.c | 16 ++++---- src/field/start_menu.c | 2 +- src/pokemon/pokedex.c | 4 +- undefined.txt | 71 +--------------------------------- 21 files changed, 142 insertions(+), 211 deletions(-) diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s index 26bd642cb..07cae108b 100644 --- a/asm/cute_sketch.s +++ b/asm/cute_sketch.s @@ -46,12 +46,12 @@ debug_sub_8110CCC: mov r1, #0xe mov r2, #0x1d mov r3, #0x13 - bl MenuDrawTextWindow + bl Menu_DrawStdWindowFrame add r0, r6, #0 add r0, r0, #0x8 mov r1, #0x11 mov r2, #0xf - bl MenuPrint + bl Menu_PrintText ldrb r0, [r6, #0x1f] ldr r1, [r4] lsl r0, r0, #0x2 @@ -62,7 +62,7 @@ debug_sub_8110CCC: lsl r1, r1, #0x18 lsr r1, r1, #0x18 mov r2, #0x11 - bl MenuPrint + bl Menu_PrintText b ._4 ._6: .align 2, 0 @@ -82,16 +82,16 @@ debug_sub_8110CCC: mov r1, #0x10 mov r2, #0x1d mov r3, #0x13 - bl MenuDrawTextWindow + bl Menu_DrawStdWindowFrame ldr r0, ._9 mov r1, #0x11 mov r2, #0x11 - bl MenuPrint + bl Menu_PrintText mov r0, #0x10 mov r1, #0xe mov r2, #0x1d mov r3, #0xf - bl MenuZeroFillWindowRect + bl Menu_EraseWindowRect ._8: pop {r4, r5, r6, r7} pop {r0} @@ -264,7 +264,7 @@ debug_sub_8110D84: bne ._65 @cond_branch mov r0, #0x0 mov r1, #0x0 - bl sub_80FBB3C + bl CreateRegionMapCursor ldr r1, ._58 ldrh r0, [r1, #0x4] add r0, r0, #0x1 @@ -304,7 +304,7 @@ debug_sub_8110D84: bne ._65 @cond_branch mov r0, #0x0 mov r1, #0x0 - bl sub_80FBB3C + bl CreateRegionMapCursor ldr r1, ._66 mov r0, #0x3 ._62: @@ -325,7 +325,7 @@ debug_sub_8110D84: debug_sub_8110F28: .syntax divided push {lr} - bl sub_80FC074 + bl CB2_InitFlyRegionMap ldr r0, ._69 ldr r1, [r0, #0x4] ldr r0, ._69 + 4 @@ -342,7 +342,7 @@ debug_sub_8110F28: .align 2, 0 ._69: .word gMain - .word sub_80FC228+1 + .word CB2_FlyRegionMap+1 .word debug_sub_8110D84+1 .syntax unified thumb_func_end debug_sub_8110F28 diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 454b47e08..7a819a8ef 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -340,13 +340,13 @@ void InitBattle(void) " .word 0x5006000\n" " .word 0x400004c\n" " .word 0x5051\n" - " .word gUnknown_030042C4\n" + " .word gBattle_WIN0H\n" " .word gUnknown_03004240\n" - " .word gUnknown_03004DE0\n" + " .word gScanlineEffectRegBuffers\n" " .word gUnknown_081F9674\n" " .word 0xff10\n" - " .word gWindowConfig_81E6C58\n" - " .word gUnknown_030042A4\n" + " .word gWindowTemplate_81E6C58\n" + " .word gBattle_BG0_X\n" " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" " .word gBattle_BG1_Y\n" @@ -358,9 +358,9 @@ void InitBattle(void) " .word gBattleTerrain\n" " .word gUnknown_03004210\n" " .word gUnknown_030041D0\n" - " .word gWindowConfig_81E71D0\n" + " .word gWindowTemplate_81E71D0\n" " .word gUnknown_03004250\n" - " .word gWindowConfig_81E71EC\n" + " .word gWindowTemplate_81E71EC\n" " .word gReservedSpritePaletteCount\n" " .word sub_800FCFC+1\n" " .word gBattleTypeFlags\n" @@ -1068,7 +1068,7 @@ void sub_800EC9C() " .word gPreBattleCallback1\n" " .word gMain\n" " .word debug_sub_80139E4+1\n" - " .word sub_800F808+1\n" + " .word BattleMainCB2+1\n" " .word gBattleTypeFlags\n" " .word gTrainerBattleOpponent\n" "\n" @@ -2313,7 +2313,7 @@ void sub_800F298() " .word gPreBattleCallback1\n" " .word gMain\n" " .word debug_sub_80139E4+1\n" - " .word sub_800F808+1\n" + " .word BattleMainCB2+1\n" " .word gBattleTypeFlags\n" " .word gTrainerBattleOpponent\n" "\n" @@ -3332,7 +3332,7 @@ void debug_sub_80108B8() " .word 0x40000d4\n" " .word 0x85006000\n" " .word 0x4000200\n" - " .word gUnknown_030042A4\n" + " .word gBattle_BG0_X\n" " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" " .word gBattle_BG1_Y\n" @@ -3350,7 +3350,7 @@ void debug_sub_80108B8() " .word 0x50001e0\n" " .word debug_sub_8011D40+1\n" " .word debug_sub_8010CAC+1\n" - " .word gWindowConfig_81E6C3C\n" + " .word gWindowTemplate_81E6C3C\n" " .word gUnknown_Debug_03004370\n" " .word gUnknown_Debug_03004360\n" " .word gUnknown_Debug_030043A0\n" @@ -5837,7 +5837,7 @@ void debug_sub_8011D40() " .word +0x2000000\n" " .word 0x6004000\n" " .word 0x80000800\n" - " .word gUnknown_030042A4\n" + " .word gBattle_BG0_X\n" " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" " .word gBattle_BG1_Y\n" @@ -5910,7 +5910,7 @@ void debug_sub_8011DD4() "._776:\n" " .word 0x4000008\n" " .word 0x9803\n" - " .word gUnknown_030042A4\n" + " .word gBattle_BG0_X\n" " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" " .word gBattle_BG1_Y\n" @@ -6063,7 +6063,7 @@ void debug_sub_8011EA0() " mov r3, r8\n" " bl Text_InitWindow\n" " ldr r0, ._823 + 8\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r1, ._823 + 12\n" " mov sl, r1\n" " lsl r4, r7, #0x1\n" @@ -6092,7 +6092,7 @@ void debug_sub_8011EA0() " add r1, r6, #0\n" " bl Text_InitWindow\n" " ldr r0, ._823 + 8\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " mov r0, #0xff\n" " strb r0, [r6]\n" " ldrb r0, [r5]\n" @@ -6115,7 +6115,7 @@ void debug_sub_8011EA0() " mov r3, r8\n" " bl Text_InitWindow\n" " ldr r0, ._823 + 8\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " b ._848\n" "._824:\n" " .align 2, 0\n" @@ -6173,7 +6173,7 @@ void debug_sub_8011EA0() " mov r1, sl\n" " bl Text_InitWindow\n" " add r0, r6, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " lsl r4, r7, #0x1\n" " ldr r5, ._830 + 12\n" " ldrb r0, [r5]\n" @@ -6201,7 +6201,7 @@ void debug_sub_8011EA0() " mov r1, sl\n" " bl Text_InitWindow\n" " add r0, r6, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " mov r0, #0xff\n" " mov r1, sl\n" " strb r0, [r1]\n" @@ -6252,7 +6252,7 @@ void debug_sub_8011EA0() " add r0, r6, #0\n" " bl Text_InitWindow\n" " add r0, r6, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " b ._848\n" "._834:\n" " .align 2, 0\n" @@ -6284,7 +6284,7 @@ void debug_sub_8011EA0() " add r1, r6, #0\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " mov r4, #0x0\n" " ldr r3, ._839 + 12\n" " lsl r1, r7, #0x1\n" @@ -6366,7 +6366,7 @@ void debug_sub_8011EA0() " add r1, r6, #0\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " b ._848\n" "._850:\n" " .align 2, 0\n" @@ -6408,7 +6408,7 @@ void debug_sub_8011EA0() " add r1, r6, #0\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" "._848:\n" " add sp, sp, #0xc\n" " pop {r3, r4, r5}\n" @@ -6478,7 +6478,7 @@ void debug_sub_8012294() " mov r1, r9\n" " bl Text_InitWindow\n" " mov r0, sl\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldrb r4, [r7]\n" " lsl r4, r4, #0x1\n" " add r0, r5, #0\n" @@ -6515,7 +6515,7 @@ void debug_sub_8012294() " mov r1, r9\n" " bl Text_InitWindow\n" " mov r0, sl\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " mov r0, #0xff\n" " mov r1, r9\n" " strb r0, [r1]\n" @@ -6555,7 +6555,7 @@ void debug_sub_8012294() " mov r1, r9\n" " bl Text_InitWindow\n" " mov r0, sl\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" "._853:\n" " add sp, sp, #0x4\n" " pop {r3, r4, r5}\n" @@ -6616,7 +6616,7 @@ void debug_sub_80123D8() " add r3, r7, #0\n" " bl Text_InitWindow\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " lsl r5, r5, #0x1\n" " ldr r1, ._858 + 12\n" " ldrb r0, [r1]\n" @@ -6648,7 +6648,7 @@ void debug_sub_80123D8() " add r3, r7, #0\n" " bl Text_InitWindow\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " mov r0, #0x0\n" " mov r1, #0x12\n" " bl debug_sub_8010A7C\n" @@ -6663,7 +6663,7 @@ void debug_sub_80123D8() " mov r3, sl\n" " bl Text_InitWindow\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r1, ._858 + 12\n" " ldrb r0, [r1]\n" " mov r2, #0x46\n" @@ -6693,7 +6693,7 @@ void debug_sub_80123D8() " mov r3, sl\n" " bl Text_InitWindow\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " b ._857\n" "._859:\n" " .align 2, 0\n" @@ -6720,7 +6720,7 @@ void debug_sub_80123D8() " add r1, r6, #0\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldrh r2, [r4, #0x6]\n" " ldrb r3, [r4, #0x8]\n" " ldrb r0, [r4, #0xa]\n" @@ -6729,7 +6729,7 @@ void debug_sub_80123D8() " add r1, r6, #0\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" "._857:\n" " add sp, sp, #0x4\n" " pop {r3, r4, r5}\n" @@ -6783,7 +6783,7 @@ void debug_sub_8012540() " add r1, r5, #0\n" " bl Text_InitWindow\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " add sp, sp, #0x4\n" " pop {r4, r5, r6}\n" " pop {r0}\n" @@ -7130,8 +7130,8 @@ void debug_sub_8012688() " .word 0x40000d4\n" " .word 0x85006000\n" " .word 0x400004c\n" - " .word gWindowConfig_81E6C58\n" - " .word gUnknown_030042A4\n" + " .word gWindowTemplate_81E6C58\n" + " .word gBattle_BG0_X\n" " .word gBattle_BG0_Y\n" " .word gBattle_BG1_X\n" " .word gBattle_BG1_Y\n" @@ -7213,7 +7213,7 @@ void debug_sub_80128B4() " mov r3, #0x2\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r6, ._878 + 8\n" " ldrh r1, [r6]\n" " add r0, r4, #0\n" @@ -7239,7 +7239,7 @@ void debug_sub_80128B4() " mov r3, #0x2\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " add sp, sp, #0x4\n" " pop {r3}\n" " mov r8, r3\n" @@ -7284,7 +7284,7 @@ void debug_sub_8012938() " mov r3, #0x2\n" " bl Text_InitWindow\n" " add r0, r6, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r1, ._880 + 8\n" " add r0, r4, #0\n" " bl StringCopy\n" @@ -7308,7 +7308,7 @@ void debug_sub_8012938() " mov r3, #0x2\n" " bl Text_InitWindow\n" " add r0, r6, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r2, ._880 + 20\n" " ldr r1, ._880 + 24\n" " lsl r0, r5, #0x2\n" @@ -7624,7 +7624,7 @@ void debug_sub_8012B70() " mov r3, #0x1a\n" " bl Text_InitWindow\n" " add r0, r5, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " strh r6, [r4, #0xe]\n" " mov r0, #0x0\n" " bl debug_sub_8012B2C\n" @@ -7670,7 +7670,7 @@ void debug_sub_8012C08() " mov r3, #0x2\n" " bl Text_InitWindow\n" " add r0, r7, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " mov r0, #0x0\n" " mov r1, #0x7\n" " bl debug_sub_8010A7C\n" @@ -7682,7 +7682,7 @@ void debug_sub_8012C08() " mov r3, #0x2\n" " bl Text_InitWindow\n" " add r0, r7, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0x18\n" @@ -7733,7 +7733,7 @@ void debug_sub_8012C08() " add r5, r4, #0\n" " ldr r4, ._907 + 8\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r1, ._907 + 12\n" " mov r2, #0xa4\n" " lsl r2, r2, #0x2\n" @@ -7743,7 +7743,7 @@ void debug_sub_8012C08() " mov r3, #0x1a\n" " bl Text_InitWindow\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r1, ._907\n" " add r0, r5, r6\n" " lsl r0, r0, #0x3\n" @@ -7818,7 +7818,7 @@ void debug_sub_8012D10() " mov r3, #0x13\n" " bl Text_InitWindow\n" " add r0, r4, #0\n" - " bl sub_8002F44\n" + " bl Text_PrintWindow8002F44\n" " ldr r1, ._920 + 8\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 8ece4ebec..321627a10 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -319,7 +319,7 @@ void debug_sub_80B0770() " .align 2, 0\n" "._30:\n" " .word gPlayerAvatar\n" - " .word gUnknown_0202FF84\n" + " .word gFieldEffectArguments\n" "._27:\n" " bl CloseMenu\n" "._29:\n" @@ -382,7 +382,7 @@ void debug_sub_80B07DC() "._37:\n" " .align 2, 0\n" "._36:\n" - " .word sub_80FC074+1\n" + " .word CB2_InitFlyRegionMap+1\n" "\n" ); } @@ -412,7 +412,7 @@ void debug_sub_80B0800() "._40:\n" " .align 2, 0\n" "._39:\n" - " .word gUnknown_0202FF84\n" + " .word gFieldEffectArguments\n" "\n" ); } diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index 766137871..53c6394ba 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -419,7 +419,7 @@ void debug_sub_808F648() " bl debug_sub_808F6BC\n" " b ._40\n" "._32:\n" - " bl ProcessMenuInputNoWrap_\n" + " bl Menu_ProcessInputNoWrap_\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x1\n" @@ -998,7 +998,7 @@ void debug_sub_808FA88() " cmp r1, #0x21\n" " bls ._87 @cond_branch\n" " add r0, r7, #0\n" - " bl sub_80BFB54\n" + " bl GetTVChannelByShowType\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " add r1, r0, #0\n" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index e4ae404e2..321bbb951 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -949,7 +949,7 @@ void DebugMenu_807706C() "._114:\n" " .align 2, 0\n" "._113:\n" - " .word gWindowConfig_81E6CE4\n" + " .word gWindowTemplate_81E6CE4\n" " .word gCallback_03004AE8\n" " .word DebugMenu_807709C+1\n" "\n" @@ -1893,7 +1893,7 @@ void DebugMenu_Teleport() { asm( " push {lr}\n" - " bl sub_8053570\n" + " bl Overworld_SetWarpDestToLastHealLoc\n" " bl sub_8080E88\n" " bl ScriptContext2_Enable\n" " bl CloseMenu\n" @@ -2384,7 +2384,7 @@ void DebugMenu_8077974() " asr r1, r1, #0x18\n" " lsl r1, r1, #0x10\n" " lsr r1, r1, #0x10\n" - " bl sub_8082C0C\n" + " bl DoesSomeoneWantRematchIn\n" " cmp r0, #0\n" " beq ._228 @cond_branch\n" " ldr r0, ._230 + 12\n" @@ -5977,7 +5977,7 @@ void DebugMenu_8079058() "._618:\n" " .word gDebug0x839C60C\n" "._612:\n" - " bl ProcessMenuInputNoWrap_\n" + " bl Menu_ProcessInputNoWrap_\n" " lsl r0, r0, #0x18\n" " asr r1, r0, #0x18\n" " mov r0, #0x2\n" @@ -6082,7 +6082,7 @@ void DebugMenu_8079110() "._639:\n" " .word gDebug0x839C60C+0xe\n" "._635:\n" - " bl MenuUpdateWindowText\n" + " bl Menu_UpdateWindowText\n" " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " beq ._642 @cond_branch\n" diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index ce1cc47ee..842837b18 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -41,7 +41,7 @@ void TayaDebugMenu_Trend() " strb r1, [r0]\n" " ldrh r1, [r5, #0x4]\n" " add r0, r6, #0\n" - " bl sub_80EB3FC\n" + " bl EasyChat_GetWordText\n" " mov r0, sl\n" " add r1, r6, #0\n" " mov r2, #0x0\n" @@ -50,7 +50,7 @@ void TayaDebugMenu_Trend() " add r4, r0, #0\n" " ldrh r1, [r5, #0x6]\n" " add r0, r6, #0\n" - " bl sub_80EB3FC\n" + " bl EasyChat_GetWordText\n" " add r0, r4, #0\n" " add r1, r6, #0\n" " mov r2, #0x0\n" @@ -1995,7 +1995,7 @@ void debug_sub_80915BC() "._173:\n" " .align 2, 0\n" "._172:\n" - " .word gWindowConfig_81E7224\n" + " .word gWindowTemplate_81E7224\n" " .word gUnknown_Debug_083C517C\n" " .word +0x2000000\n" " .word debug_sub_8091320+1\n" diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c index a217a0258..dfb92feb9 100644 --- a/src/debug/unk_debug_menu_3.c +++ b/src/debug/unk_debug_menu_3.c @@ -356,7 +356,7 @@ void debug_sub_813C5B4() " .word gOtherText_DataCannotUseVersion+0x331\n" " .word gOtherText_DataCannotUseVersion+0x30d\n" " .word gOtherText_DataCannotUseVersion+0x861\n" - " .word gFlashSectors+0x8\n" + " .word sUnusedFlashSectors+0x8\n" " .word 0xfff\n" " .word 0x52f\n" "\n" @@ -417,8 +417,8 @@ void debug_sub_813C638() " .align 2, 0\n" "._25:\n" " .word 0x270f\n" - " .word gFlashSectors+0xc\n" - " .word gFlashSectors+0x14\n" + " .word sUnusedFlashSectors+0xc\n" + " .word sUnusedFlashSectors+0x14\n" "\n" ); } @@ -588,7 +588,7 @@ void debug_sub_813C740() " .word gOtherText_DataCannotUseVersion+0x99e\n" " .word gOtherText_DataCannotUseVersion+0xa4a\n" " .word gEnemyParty\n" - " .word gFlashSectors+0x4\n" + " .word sUnusedFlashSectors+0x4\n" " .word gOtherText_DataCannotUseVersion+0x9c2\n" " .word gOtherText_DataCannotUseVersion+0xa26\n" "\n" @@ -788,7 +788,7 @@ void debug_sub_813C93C() "._37:\n" " .word gOtherText_DataCannotUseVersion+0xa4a\n" " .word gOtherText_DataCannotUseVersion+0xb61\n" - " .word gFlashSectors+0x24\n" + " .word sUnusedFlashSectors+0x24\n" " .word 0x270f\n" " .word gOtherText_DataCannotUseVersion+0xa61\n" "\n" diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 731e58986..7288f602e 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -142,8 +142,8 @@ void debug_80C35DC() " .word 0x81000800\n" " .word stru_83F8828\n" " .word stru_83F8838\n" - " .word gWindowConfig_81E6C3C\n" - " .word gWindowConfig_81E6CE4\n" + " .word gWindowTemplate_81E6C3C\n" + " .word gWindowTemplate_81E6CE4\n" "\n" ); } diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 522a185c8..8f280dc18 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -363,7 +363,7 @@ void debug_sub_815D04C() " mov r1, #0x4\n" " mov r2, #0xd\n" " mov r3, #0x7\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " ldr r1, ._125 + 4\n" " mov r2, #0xa\n" " ldsh r0, [r4, r2]\n" @@ -372,7 +372,7 @@ void debug_sub_815D04C() " ldr r0, [r0]\n" " mov r1, #0x5\n" " mov r2, #0x5\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldrh r0, [r4, #0x8]\n" " add r0, r0, #0x1\n" " strh r0, [r4, #0x8]\n" @@ -397,9 +397,9 @@ void debug_sub_815D04C() " .align 2, 0\n" "._125:\n" " .word gTasks\n" - " .word gFlashSectors+0x9c\n" + " .word sUnusedFlashSectors+0x9c\n" " .word gMain\n" - " .word gFlashSectors+0x11c\n" + " .word sUnusedFlashSectors+0x11c\n" "._123:\n" " sub r0, r1, #1\n" "._124:\n" @@ -435,7 +435,7 @@ void debug_sub_815D04C() " .align 2, 0\n" "._130:\n" " .word gTasks\n" - " .word gFlashSectors+0x11c\n" + " .word sUnusedFlashSectors+0x11c\n" "._128:\n" " ldrh r0, [r4, #0xa]\n" " add r0, r0, #0x1\n" @@ -481,7 +481,7 @@ void debug_sub_815D04C() " .align 2, 0\n" "._133:\n" " .word gTasks\n" - " .word gFlashSectors+0x9c\n" + " .word sUnusedFlashSectors+0x9c\n" " .word +0x2004000\n" " .word 0x43c\n" "\n" @@ -554,7 +554,7 @@ void debug_sub_815D1D8() " mov r1, #0xe\n" " mov r2, #0x1b\n" " mov r3, #0x13\n" - " bl MenuDrawTextWindow\n" + " bl Menu_DrawStdWindowFrame\n" " mov r0, #0x1\n" " neg r0, r0\n" " mov r1, #0x0\n" @@ -606,7 +606,7 @@ void debug_sub_815D1D8() " .word gUnknown_0841192C+0x14\n" " .word 0x43c\n" "._144:\n" - " bl MenuUpdateWindowText\n" + " bl Menu_UpdateWindowText\n" " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " bne ._163 @cond_branch\n" @@ -655,7 +655,7 @@ void debug_sub_815D1D8() " .word 0x43c\n" " .word gUnknown_0841192C+0x28\n" "._146:\n" - " bl MenuUpdateWindowText\n" + " bl Menu_UpdateWindowText\n" " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " bne ._173 @cond_branch\n" @@ -696,7 +696,7 @@ void debug_sub_815D1D8() " .word gMain\n" " .word 0x43c\n" "._149:\n" - " bl MenuUpdateWindowText\n" + " bl Menu_UpdateWindowText\n" " bl sub_8007ECC\n" " lsl r0, r0, #0x18\n" " cmp r0, #0\n" @@ -730,11 +730,11 @@ void debug_sub_815D1D8() " mov r1, #0xf\n" " mov r2, #0x1a\n" " mov r3, #0x12\n" - " bl MenuFillWindowRectWithBlankTile\n" + " bl Menu_BlankWindowRect\n" " ldr r0, ._190 + 4\n" " mov r1, #0x4\n" " mov r2, #0xf\n" - " bl MenuPrint\n" + " bl Menu_PrintText\n" " ldr r1, ._190 + 8\n" " ldr r2, ._190 + 12\n" " add r1, r1, r2\n" diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index a11e1b3e3..df4ab4f76 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -789,7 +789,7 @@ void debug_sub_806F9E4() mov r1, #0x9\n\ mov r2, #0x1d\n\ mov r3, #0x13\n\ - bl MenuDrawTextWindow\n\ + bl Menu_DrawStdWindowFrame\n\ add r4, r6, #0\n\ add r4, r4, #0x50\n\ bl RtcGetErrorStatus\n\ @@ -803,23 +803,23 @@ void debug_sub_806F9E4() add r0, r4, #0\n\ mov r1, #0x2\n\ mov r2, #0xa\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ldr r0, ._158\n\ mov r1, #0xc\n\ mov r2, #0xc\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ldr r0, ._158 + 4\n\ mov r1, #0x14\n\ mov r2, #0xc\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ldr r0, ._158 + 8\n\ mov r1, #0x1\n\ mov r2, #0xe\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ldr r0, ._158 + 12\n\ mov r1, #0x1\n\ mov r2, #0x10\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ._151:\n\ ldrh r0, [r5]\n\ add r0, r0, #0x1\n\ @@ -868,19 +868,19 @@ void debug_sub_806F9E4() add r0, r6, #0\n\ mov r1, #0x14\n\ mov r2, #0xe\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ mov r0, r9\n\ mov r1, #0xc\n\ mov r2, #0xe\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ mov r0, sl\n\ mov r1, #0x14\n\ mov r2, #0x10\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ mov r0, r8\n\ mov r1, #0xc\n\ mov r2, #0x10\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ._160:\n\ ldrh r1, [r5, #0x2]\n\ mov r2, #0x2\n\ diff --git a/src/engine/save.c b/src/engine/save.c index e1fb47dcc..1245d0a62 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -731,7 +731,7 @@ void sub_813B79C() " .align 2, 0\n" "._163:\n" " .word +0x2000000\n" - " .word gSaveSectionLocations\n" + " .word sSaveBlockChunks\n" " .word 0xff4\n" " .word 0xff6\n" " .word gHallOfFameSaveSectionLocations\n" @@ -892,7 +892,7 @@ u8 Save_LoadGameData(u8 saveType) return result; } -static const u8 sUnusedFlashSectors[] = { 30, 31 }; +const u8 sUnusedFlashSectors[] = { 30, 31 }; bool8 unref_sub_8125F4C(struct UnkSaveSection *a1) { diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index a05d9bf87..56d578464 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -42,7 +42,7 @@ extern u8 gBerryCheck_Pal[]; extern u8 gUnknown_08E788E4[]; extern u8 gUnknown_08E78A84[]; -static const u8 *const gUnknown_0841192C[] = +const u8 *const gUnknown_0841192C[] = { ContestStatsText_VerySoft, ContestStatsText_Soft, diff --git a/src/field/choose_party.c b/src/field/choose_party.c index 8a54b0ad0..b108ede5a 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -601,7 +601,7 @@ void debug_sub_81381B4() " add r2, r4, #0\n" " bl GetMonData\n" " add r0, r4, #0\n" - " bl StripExtCtrlCodes\n" + " bl Text_StripExtCtrlCodes\n" " add r0, r5, #0\n" " mov r1, #0x3\n" " bl GetMonData\n" diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 97eba16e0..1a4985892 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -1256,7 +1256,7 @@ u8 debug_sub_8085564(void) mov r1, #0x1\n\ mov r2, #0x1c\n\ mov r3, #0x2\n\ - bl MenuFillWindowRectWithBlankTile\n\ + bl Menu_BlankWindowRect\n\ ldr r1, ._380\n\ ldr r0, ._380 + 4\n\ ldrb r0, [r0]\n\ @@ -1265,7 +1265,7 @@ u8 debug_sub_8085564(void) ldr r0, [r0]\n\ mov r1, #0x17\n\ mov r2, #0x1\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ._377:\n\ ldr r0, ._380 + 8\n\ ldrh r1, [r0, #0x2e]\n\ @@ -1313,7 +1313,7 @@ u8 debug_sub_808560C(void) mov r1, #0x1\n\ mov r2, #0x1c\n\ mov r3, #0x2\n\ - bl MenuFillWindowRectWithBlankTile\n\ + bl Menu_BlankWindowRect\n\ ldr r1, ._384 + 8\n\ ldrb r0, [r4]\n\ lsl r0, r0, #0x2\n\ @@ -1321,7 +1321,7 @@ u8 debug_sub_808560C(void) ldr r0, [r0]\n\ mov r1, #0x17\n\ mov r2, #0x1\n\ - bl MenuPrint\n\ + bl Menu_PrintText\n\ ldr r1, ._384 + 12\n\ ldr r0, ._384 + 16\n\ str r0, [r1]\n\ @@ -1333,7 +1333,7 @@ u8 debug_sub_808560C(void) .align 2, 0\n\ ._384:\n\ .word gUnknown_0202FF58+0x2\n\ - .word gUnknown_0202F7E8\n\ + .word gWeather\n\ .word gDebugText_Weather\n\ .word gCallback_03004AE8\n\ .word debug_sub_8085564+1"); diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 125edfef2..ce1f18cdb 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -483,7 +483,7 @@ static bool8 SetupBagMultistep(void) bl ResetSpriteData\n\ b ._61\n\ ._14:\n\ - bl sub_80A3520\n\ + bl LoadBagGraphicsMultistep\n\ lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._37 @cond_branch\n\ @@ -500,12 +500,12 @@ static bool8 SetupBagMultistep(void) .word 0x43c\n\ ._15:\n\ ldr r0, ._43\n\ - bl SetUpWindowConfig\n\ + bl Text_LoadWindowTemplate\n\ b ._61\n\ ._44:\n\ .align 2, 0\n\ ._43:\n\ - .word gWindowConfig_81E6DFC\n\ + .word gWindowTemplate_81E6DFC\n\ ._16:\n\ ldr r0, ._46\n\ bl MultistepInitMenuWindowBegin\n\ @@ -516,7 +516,7 @@ static bool8 SetupBagMultistep(void) ._47:\n\ .align 2, 0\n\ ._46:\n\ - .word gWindowConfig_81E6DFC\n\ + .word gWindowTemplate_81E6DFC\n\ .word gMain\n\ .word 0x43c\n\ ._17:\n\ @@ -578,7 +578,7 @@ static bool8 SetupBagMultistep(void) ._54:\n\ .align 2, 0\n\ ._53:\n\ - .word gUnknown_03000701\n\ + .word sReturnLocation\n\ .word gMain\n\ .word 0x43c\n\ ._19:\n\ @@ -595,15 +595,15 @@ static bool8 SetupBagMultistep(void) bl sub_80A39B8\n\ ldrb r1, [r5]\n\ add r0, r4, #0\n\ - bl sub_80A3AC0\n\ - bl sub_80A3D08\n\ + bl DrawPocketIndicatorDots\n\ + bl UpdateAllBagPockets\n\ ldr r4, ._56 + 12\n\ ldr r0, [r4, #0x10]\n\ ldr r1, [r4, #0x14]\n\ - bl sub_80A3C34\n\ + bl SortItemSlots\n\ ldr r0, [r4, #0x18]\n\ ldr r1, [r4, #0x1c]\n\ - bl sub_80A3C34\n\ + bl SortItemSlots\n\ bl sub_80A3D40\n\ ldr r1, ._56 + 16\n\ mov r0, #0x0\n\ @@ -619,9 +619,9 @@ static bool8 SetupBagMultistep(void) ._56:\n\ .word gUnknown_0203855A\n\ .word gBGTilemapBuffers+0x1000\n\ - .word gUnknown_02038559\n\ + .word sCurrentBagPocket\n\ .word gBagPockets\n\ - .word gUnknown_03005D24\n\ + .word gCurrentBagPocketItemSlots\n\ ._20:\n\ ldr r0, ._59\n\ mov r1, #0x0\n\ @@ -659,9 +659,9 @@ static bool8 SetupBagMultistep(void) .align 2, 0\n\ ._59:\n\ .word 0xffff\n\ - .word gUnknown_03005D10\n\ - .word gUnknown_02038559\n\ - .word gUnknown_03005D24\n\ + .word gBagPocketScrollStates\n\ + .word sCurrentBagPocket\n\ + .word gCurrentBagPocketItemSlots\n\ .word gUnknown_0203855B\n\ .word gUnknown_0203855C\n\ .word gMain\n\ diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 1bce9bc3f..91165a2ee 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -293,7 +293,7 @@ void debug_sub_810B32C() " lsr r2, r0, #0x18\n" " cmp r2, #0x7\n" " bls ._31 @cond_branch\n" - " bl sub_80F7A6C\n" + " bl SetupHipster\n" " mov r2, #0x0\n" " ldr r3, ._34\n" "._32:\n" @@ -313,13 +313,13 @@ void debug_sub_810B32C() "._34:\n" " .word gSaveBlock1+0x2d8c\n" "._27:\n" - " bl sub_80F7A98\n" + " bl SetupTrader\n" " b ._37\n" "._28:\n" - " bl sub_80F7A7C\n" + " bl SetupStoryteller\n" " b ._37\n" "._29:\n" - " bl sub_80F7A88\n" + " bl SetupGiddy\n" "._37:\n" " bl sub_80F83D0\n" " add sp, sp, #0x8\n" @@ -1313,7 +1313,7 @@ static void PrintStoryList(void) Menu_PrintText(gPCText_Cancel, 1, 2 + i * 2); } -static u8 gUnknown_03000748; +u8 gUnknown_03000748; static void Task_StoryListMenu(u8 taskId) { diff --git a/src/field/region_map.c b/src/field/region_map.c index 3bd64a8a0..d6ebf0b9f 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -289,7 +289,7 @@ static void SpriteCB_PlayerIconZoomedIn(struct Sprite *); const u8 *GetMapSectionName(u8 *, u16, u16); static void VBlankCB_FlyRegionMap(void); static void CB2_FlyRegionMap(void); -static void sub_80FC244(void (*func)(void)); +void sub_80FC244(void (*func)(void)); static void PrintFlyTargetName(void); static void CreateFlyTargetGraphics(void); static void CreateCityTownFlyTargetIcons(void); @@ -297,7 +297,7 @@ static void CreateSpecialAreaFlyTargetIcons(void); static void SpriteCB_FlyTargetIcons(struct Sprite *); static void sub_80FC5B4(void); static void sub_80FC600(void); -static void sub_80FC69C(void); +void sub_80FC69C(void); void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed) { @@ -1420,7 +1420,7 @@ struct UnknownStruct4 static const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, OtherText_PokeCenter}; -static const struct UnknownStruct4 sUnknown_083E79C0[1] = +const struct UnknownStruct4 gUnknown_083E79C0[1] = { {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY}, }; @@ -1598,7 +1598,7 @@ static void CB2_FlyRegionMap(void) BuildOamBuffer(); } -static void sub_80FC244(void (*func)(void)) +void sub_80FC244(void (*func)(void)) { ewram0_3.unk0 = func; ewram0_3.unk4 = 0; @@ -1611,9 +1611,9 @@ static void PrintFlyTargetName(void) u16 i = 0; int zero; - for (i = 0; i < ARRAY_COUNT(sUnknown_083E79C0); i++) + for (i = 0; i < ARRAY_COUNT(gUnknown_083E79C0); i++) { - const struct UnknownStruct4 *r4 = &sUnknown_083E79C0[i]; + const struct UnknownStruct4 *r4 = &gUnknown_083E79C0[i]; if (ewram0_3.regionMap.mapSectionId == r4->mapSectionId) { @@ -1796,7 +1796,7 @@ static void sub_80FC600(void) } } -static void sub_80FC69C(void) +void sub_80FC69C(void) { switch (ewram0_3.unk4) { diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index d84a6e592..c4a4128b3 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -64,7 +64,7 @@ static bool8 sub_8102008(struct Task *task); static bool8 sub_8102034(struct Task *task); static bool8 sub_8102058(struct Task *task); static bool8 sub_8102090(struct Task *task); -static bool8 sub_81020C8(struct Task *task); +bool8 sub_81020C8(struct Task *task); static bool8 sub_81021E0(struct Task *task); static bool8 sub_81021FC(struct Task *task); static bool8 sub_8102264(struct Task *task); @@ -244,7 +244,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) ldr r3, ._1\n\ mov r2, #0x0\n\ strb r2, [r3]\n\ - bl sub_81019B0\n\ + bl PlaySlotMachine_Internal\n\ ldr r0, ._1 + 4\n\ bl SetMainCallback2\n\ pop {r0}\n\ @@ -253,7 +253,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) .align 2, 0\n\ ._1:\n\ .word unk_debug_bss_1+0x1\n\ - .word sub_81018B8+1"); + .word CB2_SlotMachineSetup+1"); } #else void PlaySlotMachine(u8 arg0, MainCallback cb) @@ -274,7 +274,7 @@ void debug_sub_811609C() ldr r3, ._3\n\ mov r2, #0x1\n\ strb r2, [r3]\n\ - bl sub_81019B0\n\ + bl PlaySlotMachine_Internal\n\ ldr r0, ._3 + 4\n\ bl SetMainCallback2\n\ pop {r0}\n\ @@ -283,7 +283,7 @@ void debug_sub_811609C() .align 2, 0\n\ ._3:\n\ .word unk_debug_bss_1+0x1\n\ - .word sub_81018B8+1"); + .word CB2_SlotMachineSetup+1"); } #endif @@ -1412,7 +1412,7 @@ static bool8 sub_8102090(struct Task *task) #if DEBUG __attribute__((naked)) -static bool8 sub_81020C8(struct Task *task) +bool8 sub_81020C8(struct Task *task) { asm("\ push {r4, lr}\n\ @@ -1421,7 +1421,7 @@ static bool8 sub_81020C8(struct Task *task) mov r0, #0xc0\n\ and r0, r0, r1\n\ strb r0, [r4, #0x4]\n\ - bl sub_81027A0\n\ + bl CheckMatch\n\ ldrb r0, [r4, #0xa]\n\ cmp r0, #0\n\ beq ._163 @cond_branch\n\ @@ -1570,7 +1570,7 @@ static bool8 sub_81020C8(struct Task *task) .word 0x270f"); } #else -static bool8 sub_81020C8(struct Task *task) +bool8 sub_81020C8(struct Task *task) { eSlotMachine->unk04 &= 0xc0; CheckMatch(); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 1e4eace87..17aeb8242 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -255,7 +255,7 @@ void debug_sub_8075C40() " .word 0x4000108\n" " .word 0xc34f\n" " .word 0x40000b0\n" - " .word gUnknown_03004DE0\n" + " .word gScanlineEffectRegBuffers\n" " .word 0xc5ff\n" " .word 0x7fff\n" " .word 0x4000040\n" diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 4fb6a4920..4f656a910 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -1273,7 +1273,7 @@ static u8 sub_8091260(u16 num, u8, u8, u8); static void sub_8091304(const u8 *name, u8, u8); static void sub_8091458(u16 height, u8 i, u8 i1); static void sub_8091564(u16 weight, u8 i, u8 i1); -static void sub_8091738(u16, u16, u16); +void sub_8091738(u16, u16, u16); static void sub_80917CC(u16 i, u16 i1); static u16 sub_8091818(u8, u16, u16, u16); u16 sub_80918EC(u16 a, s16 b, s16 c, u16 d); @@ -4457,7 +4457,7 @@ static void sub_8091564(u16 arg0, u8 left, u8 top) } #endif -static void sub_8091738(u16 num, u16 b, u16 c) +void sub_8091738(u16 num, u16 b, u16 c) { u8 arr[0x80]; u16 i; diff --git a/undefined.txt b/undefined.txt index 74e3d517d..4fcd0398e 100644 --- a/undefined.txt +++ b/undefined.txt @@ -6,10 +6,6 @@ (.text+0x160): undefined reference to `gUnknown_030042C4' (.text+0x164): undefined reference to `gUnknown_03004240' (.text+0x168): undefined reference to `gUnknown_03004DE0' -(.text+0x174): undefined reference to `gWindowConfig_81E6C58' -(.text+0x178): undefined reference to `gUnknown_030042A4' -(.text+0x1a8): undefined reference to `gWindowConfig_81E71D0' -(.text+0x1b0): undefined reference to `gWindowConfig_81E71EC' (.text+0x8a8): undefined reference to `sub_800F808' (.text+0x10e0): undefined reference to `sub_800F808' (.text+0x1150): undefined reference to `gScriptResult' @@ -17,27 +13,9 @@ (.text+0x11b6): undefined reference to `sub_800374C' (.text+0x1d2c): undefined reference to `sub_800D238' (.text+0x1d5c): undefined reference to `remove_some_task' -(.text+0x1de8): undefined reference to `gUnknown_030042A4' -(.text+0x1e30): undefined reference to `gWindowConfig_81E6C3C' (.text+0x2188): undefined reference to `gUnknown_03005E94' -(.text+0x31a4): undefined reference to `gUnknown_030042A4' (.text+0x321e): undefined reference to `sub_8089668' -(.text+0x3230): undefined reference to `gUnknown_030042A4' -(.text+0x3380): undefined reference to `sub_8002F44' -(.text+0x33c0): undefined reference to `sub_8002F44' -(.text+0x33f4): undefined reference to `sub_8002F44' -(.text+0x3476): undefined reference to `sub_8002F44' -(.text+0x34b4): undefined reference to `sub_8002F44' -src/battle/battle_2.o:(.text+0x3526): more undefined references to `sub_8002F44' follow -(.text+0x3c08): undefined reference to `gWindowConfig_81E6C58' -(.text+0x3c0c): undefined reference to `gUnknown_030042A4' (.text+0x3c78): undefined reference to `sub_800374C' -(.text+0x3cd0): undefined reference to `sub_8002F44' -(.text+0x3d0c): undefined reference to `sub_8002F44' -(.text+0x3d5e): undefined reference to `sub_8002F44' -(.text+0x3d96): undefined reference to `sub_8002F44' -(.text+0x3fda): undefined reference to `sub_8002F44' -src/battle/battle_2.o:(.text+0x402e): more undefined references to `sub_8002F44' follow (.text+0x5164): undefined reference to `gUnknown_02024C44' (.text+0x5168): undefined reference to `gMoveHitWith' (.text+0x5178): undefined reference to `gLockedMove' @@ -49,20 +27,12 @@ src/battle/battle_2.o:(.text+0x402e): more undefined references to `sub_8002F44' (.text+0x660): undefined reference to `gUnknown_Debug_03004BC0' (.text+0xd4c): undefined reference to `gUnknown_Debug_03004BC0' (.text+0xae8): undefined reference to `MenuZeroFillScreen' -(.text+0xb8a): undefined reference to `MenuDrawTextWindow' -(.text+0xbac): undefined reference to `MenuPrint' -(.text+0xbb6): undefined reference to `MenuPrint' -(.text+0xbc0): undefined reference to `MenuPrint' -(.text+0xbca): undefined reference to `MenuPrint' -(.text+0xbd4): undefined reference to `MenuPrint' -src/engine/reset_rtc_screen.o:(.text+0xc40): more undefined references to `MenuPrint' follow (.text+0xc88): undefined reference to `MenuZeroFillScreen' (.text+0xd4): undefined reference to `gUnknown_03004DE0' (.text+0x1f0): undefined reference to `sub_8136088' (.text+0x58): undefined reference to `PrintMenuItemsReordered' (.text+0x25c): undefined reference to `sub_804B790' (.text+0x28a): undefined reference to `ClearSaveData' -(.text+0x5c8): undefined reference to `gWindowConfig_81E6CE4' (.text+0x6f2): undefined reference to `PrintMenuItemsReordered' (.text+0xac0): undefined reference to `GetNationalPokedexFlag' (.text+0xac8): undefined reference to `GetNationalPokedexFlag' @@ -81,12 +51,9 @@ src/engine/reset_rtc_screen.o:(.text+0xc40): more undefined references to `MenuP (.text+0x25ec): undefined reference to `ProcessMenuInputNoWrap_' (.text+0x2608): undefined reference to `gUnknown_Debug_03004BD0' (.text+0x2628): undefined reference to `gUnknown_Debug_03004BD0' -(.text+0x2694): undefined reference to `MenuUpdateWindowText' (.text+0x16aa): undefined reference to `MenuFillWindowRectWithBlankTile' -(.text+0x16be): undefined reference to `MenuPrint' (.text+0x1708): undefined reference to `MenuZeroFillScreen' (.text+0x1714): undefined reference to `MenuFillWindowRectWithBlankTile' -(.text+0x1726): undefined reference to `MenuPrint' (.text+0x173c): undefined reference to `gUnknown_0202F7E8' (.text+0xd0): undefined reference to `PrintHex' (.text+0xde): undefined reference to `PrintHex' @@ -112,26 +79,19 @@ src/engine/cable_club.o:(.text+0x13c): more undefined references to `PrintHex' f (.text+0x716): undefined reference to `trainer_flag_set' (.text+0x71e): undefined reference to `trainer_flag_set' src/debug/taya_debug_window.o:(.text+0x724): more undefined references to `trainer_flag_set' follow -(.text+0xf78): undefined reference to `gWindowConfig_81E7224' (.text+0x11b4): undefined reference to `unk_2038790' (.text+0x11cc): undefined reference to `unk_2038794' (.text+0x11d0): undefined reference to `unk_2038798' (.text+0x1210): undefined reference to `unk_2038798' (.text+0x1230): undefined reference to `unk_2038794' (.text_8098A38+0x40b4): undefined reference to `unk_2038790' -(.text+0x1dc): undefined reference to `gUnknown_0202FF84' (.text+0x238): undefined reference to `sub_80FC074' -(.text+0x264): undefined reference to `gUnknown_0202FF84' (.text+0xda): undefined reference to `remove_some_task' (.text+0x13a): undefined reference to `sub_80A3520' (.text+0x15a): undefined reference to `SetUpWindowConfig' -(.text+0x160): undefined reference to `gWindowConfig_81E6DFC' -(.text+0x174): undefined reference to `gWindowConfig_81E6DFC' (.text+0x204): undefined reference to `gUnknown_03000701' (.text+0x22c): undefined reference to `sub_80A3AC0' (.text+0x230): undefined reference to `sub_80A3D08' -(.text+0x23a): undefined reference to `sub_80A3C34' -(.text+0x242): undefined reference to `sub_80A3C34' (.text+0x268): undefined reference to `gUnknown_02038559' (.text+0x270): undefined reference to `gUnknown_03005D24' (.text+0x2c0): undefined reference to `gUnknown_03005D10' @@ -141,8 +101,6 @@ src/debug/taya_debug_window.o:(.text+0x724): more undefined references to `train (.text+0x93a): undefined reference to `GetFieldObjectScriptPointerForComparison' (.text+0x948): undefined reference to `BerryTreeScript' (.text+0xca): undefined reference to `remove_some_task' -(.text+0x114): undefined reference to `gWindowConfig_81E6C3C' -(.text+0x118): undefined reference to `gWindowConfig_81E6CE4' (.text+0x72c): undefined reference to `gPokedexEntries' (.text+0x1398): undefined reference to `gUnknown_02023A14_50' (.text+0x1410): undefined reference to `gUnknown_02023A14_50' @@ -160,24 +118,10 @@ src/debug/taya_debug_window.o:(.text+0x724): more undefined references to `train (.text+0x150): undefined reference to `sub_80F7A88' (.text+0x44): undefined reference to `gUnknown_03000748' (.text+0x123c): undefined reference to `remove_some_task' -(.text+0x48): undefined reference to `MenuDrawTextWindow' -(.text+0x54): undefined reference to `MenuPrint' -(.text+0x6c): undefined reference to `MenuPrint' (.text+0x74): undefined reference to `gUnknown_083E79C0' -(.text+0x92): undefined reference to `MenuDrawTextWindow' -(.text+0x9c): undefined reference to `MenuPrint' -(.text+0xa8): undefined reference to `MenuZeroFillWindowRect' -(.text+0x162): undefined reference to `sub_80FC244' (.text+0x170): undefined reference to `sub_80FC69C' -(.text+0x1f2): undefined reference to `sub_80FBB3C' -(.text+0x246): undefined reference to `sub_80FBB3C' (.text+0x25e): undefined reference to `sub_80FC074' -(.text+0x272): undefined reference to `sub_80FC244' (.text+0x284): undefined reference to `sub_80FC228' -(.text+0xc): undefined reference to `sub_81019B0' -(.text+0x20): undefined reference to `sub_81018B8' -(.text+0x30): undefined reference to `sub_81019B0' -(.text+0x44): undefined reference to `sub_81018B8' (.text+0xa28): undefined reference to `sub_81027A0' (.text+0xae0): undefined reference to `StripExtCtrlCodes' (.text+0xb2c): undefined reference to `gSaveSectionLocations' @@ -187,23 +131,10 @@ src/debug/taya_debug_window.o:(.text+0x724): more undefined references to `train (.text+0x2a4): undefined reference to `gFlashSectors' (.text+0x400): undefined reference to `gFlashSectors' (.text+0x584): undefined reference to `gFlashSectors' -(.text+0x530): undefined reference to `MenuDrawTextWindow' -(.text+0x544): undefined reference to `MenuPrint' -(.text+0x574): undefined reference to `gFlashSectors' -(.text+0x57c): undefined reference to `gFlashSectors' -(.text+0x5bc): undefined reference to `gFlashSectors' +src/engine/mystery_event_menu.o:(.text+0x574): more undefined references to `gFlashSectors' follow (.text+0x5f4): undefined reference to `gScriptFuncs_End' (.text+0x614): undefined reference to `gFlashSectors' -(.text+0x700): undefined reference to `MenuDrawTextWindow' -(.text+0x760): undefined reference to `gUnknown_0841192C' -(.text+0x768): undefined reference to `MenuUpdateWindowText' -(.text+0x7c8): undefined reference to `gUnknown_0841192C' -(.text+0x7cc): undefined reference to `MenuUpdateWindowText' -(.text+0x810): undefined reference to `gUnknown_0841192C' -(.text+0x824): undefined reference to `MenuUpdateWindowText' (.text+0x868): undefined reference to `MenuFillWindowRectWithBlankTile' -(.text+0x872): undefined reference to `MenuPrint' -(.text+0x884): undefined reference to `gUnknown_0841192C' (.text+0xd52): undefined reference to `FeebasSeedRng' (.text+0xd76): undefined reference to `FeebasRandom' (.text+0x17c0): undefined reference to `gOtherText_FiveQuestions' -- cgit v1.2.3 From 73392181fe47fd0fe5ac3702978307926a442ef4 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 18:08:02 -0600 Subject: resolve more undefined references --- src/battle/battle_2.c | 26 +++++++++++++------------- src/data/pokedex_entries_de.h | 3 ++- src/data/pokedex_entries_en.h | 2 +- src/debug/nohara_debug_menu.c | 2 +- src/debug/start_menu_debug.c | 18 +++++++++--------- src/debug/taya_debug_window.c | 30 +++++++++++++++--------------- src/debug/tomomichi_debug_menu.c | 4 ++-- src/debug/watanabe_debug_menu.c | 14 +++++++------- src/engine/cable_club.c | 2 +- src/engine/link.c | 4 ++-- src/engine/reset_rtc_screen.c | 4 ++-- src/engine/save.c | 2 +- src/engine/trade.c | 2 +- src/field/berry.c | 6 +++--- src/field/field_player_avatar.c | 2 +- src/field/field_weather.c | 2 +- src/field/fldeff_secretpower.c | 2 +- src/field/item_menu.c | 2 +- src/field/mauville_man.c | 2 +- src/field/region_map.c | 4 ++-- src/field/safari_zone.c | 2 +- src/field/start_menu.c | 2 +- src/field/wild_encounter.c | 10 +++++----- src/pokemon/mail.c | 2 +- 24 files changed, 75 insertions(+), 74 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 7a819a8ef..bedcb0bb6 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -238,7 +238,7 @@ void InitBattle(void) " strh r2, [r0]\n" " ldr r0, ._10 + 16\n" " strh r1, [r0]\n" - " bl dp12_8087EA4\n" + " bl ScanlineEffect_Clear\n" " ldr r0, ._10 + 20\n" " mov r3, #0xf0\n" " mov r5, #0xf0\n" @@ -272,7 +272,7 @@ void InitBattle(void) " ldr r0, [r4]\n" " ldr r1, [r4, #0x4]\n" " ldr r2, [r4, #0x8]\n" - " bl sub_80895F8\n" + " bl ScanlineEffect_SetParams\n" " ldr r4, ._10 + 32\n" " add r0, r4, #0\n" " bl Text_LoadWindowTemplate\n" @@ -300,7 +300,7 @@ void InitBattle(void) " and r0, r0, r1\n" " cmp r0, #0\n" " bne ._7 @cond_branch\n" - " bl GetBattleTerrain\n" + " bl BattleSetup_GetTerrain\n" " ldr r1, ._10 + 72\n" " strb r0, [r1]\n" "._7:\n" @@ -341,7 +341,7 @@ void InitBattle(void) " .word 0x400004c\n" " .word 0x5051\n" " .word gBattle_WIN0H\n" - " .word gUnknown_03004240\n" + " .word gBattle_WIN0V\n" " .word gScanlineEffectRegBuffers\n" " .word gUnknown_081F9674\n" " .word 0xff10\n" @@ -2641,10 +2641,10 @@ void BattleMainCB2(void) " .align 2, 0\n" "._358:\n" " .word gMain\n" - " .word gScriptResult\n" + " .word gSpecialVar_Result\n" " .word gBattleOutcome\n" " .word 0x43d\n" - " .word gUnknown_03004DC0\n" + " .word gScanlineEffect\n" " .word gPreBattleCallback1\n" " .word gBattleTypeFlags\n" " .word sub_805465C+1\n" @@ -2684,7 +2684,7 @@ void BattleMainCB2(void) " bl debug_sub_8008264\n" "._360:\n" " ldr r0, ._361 + 4\n" - " bl sub_800374C\n" + " bl Text_UpdateWindowInBattle\n" " bl UpdatePaletteFade\n" " bl RunTasks\n" " add sp, sp, #0x4\n" @@ -3255,7 +3255,7 @@ void debug_sub_80108B8() " bl LZDecompressVram\n" " ldr r0, ._507 + 60\n" " ldr r1, ._507 + 64\n" - " bl sub_800D238\n" + " bl LZDecompressWram\n" " ldr r4, ._507 + 68\n" " mov r1, #0xa0\n" " lsl r1, r1, #0x13\n" @@ -3271,7 +3271,7 @@ void debug_sub_80108B8() " bl SetMainCallback2\n" " bl ResetTasks\n" " bl ResetSpriteData\n" - " bl remove_some_task\n" + " bl ScanlineEffect_Stop\n" " ldr r4, ._507 + 84\n" " add r0, r4, #0\n" " bl Text_LoadWindowTemplate\n" @@ -3816,7 +3816,7 @@ void debug_sub_8010CAC() "._557:\n" " .align 2, 0\n" "._556:\n" - " .word gUnknown_03005E94\n" + " .word gCB2_AfterEvolution\n" " .word debug_sub_80108B8+1\n" " .word gPlayerParty\n" "._551:\n" @@ -5902,7 +5902,7 @@ void debug_sub_8011DD4() " bl LoadOam\n" " bl ProcessSpriteCopyRequests\n" " bl TransferPlttBuffer\n" - " bl sub_8089668\n" + " bl ScanlineEffect_InitHBlankDmaTransfer\n" " pop {r0}\n" " bx r0\n" "._777:\n" @@ -7167,7 +7167,7 @@ void debug_sub_8012878() " bl AnimateSprites\n" " bl BuildOamBuffer\n" " ldr r0, ._876\n" - " bl sub_800374C\n" + " bl Text_UpdateWindowInBattle\n" " bl UpdatePaletteFade\n" " bl RunTasks\n" " ldr r0, ._876 + 4\n" @@ -9472,7 +9472,7 @@ void sub_8010874() " .align 2, 0\n" "._1215:\n" " .word gUnknown_02024C4C\n" - " .word gUnknown_02024C44\n" + " .word gLastHitByType\n" " .word gMoveHitWith\n" " .word gLastUsedMove\n" " .word gDisableStructs\n" diff --git a/src/data/pokedex_entries_de.h b/src/data/pokedex_entries_de.h index 0f64cba66..413b73d90 100644 --- a/src/data/pokedex_entries_de.h +++ b/src/data/pokedex_entries_de.h @@ -6337,7 +6337,8 @@ static const u8 DexDescription_Deoxys_2[] = _( "dieses POKéMON ist sein Gehirn."); #endif -static const struct PokedexEntry gPokedexEntries[] = { +const struct PokedexEntry gPokedexEntries[] = +{ { // Dummy .categoryName = _("UNBEKANNT"), diff --git a/src/data/pokedex_entries_en.h b/src/data/pokedex_entries_en.h index 86da3d67b..933b1fc7d 100644 --- a/src/data/pokedex_entries_en.h +++ b/src/data/pokedex_entries_en.h @@ -5389,7 +5389,7 @@ static const u8 DexDescription_Deoxys_2[] = _( "chest appears to be its brain."); #endif -static const struct PokedexEntry gPokedexEntries[] = +const struct PokedexEntry gPokedexEntries[] = { { //Dummy .categoryName = _("UNKNOWN"), diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index 53c6394ba..629b7b9eb 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -340,7 +340,7 @@ void debug_sub_808F5D8() "._29:\n" " ldr r5, ._30 + 8\n" " strh r4, [r5]\n" - " bl sub_810F424\n" + " bl GetSlotMachineId\n" " add r1, r0, #0\n" " lsl r1, r1, #0x10\n" " lsr r1, r1, #0x10\n" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 321bbb951..b376a4076 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -46,7 +46,7 @@ void debug_sub_8076AC8() " mov r0, #0x11\n" " mov r1, #0x1\n" " add r2, r4, #0\n" - " bl PrintMenuItemsReordered\n" + " bl Menu_PrintItemsReordered\n" " mov r0, #0x0\n" " str r0, [sp]\n" " mov r0, #0xc\n" @@ -448,7 +448,7 @@ void DebugMenu_8076D50() { asm( " push {lr}\n" - " bl ClearSaveData\n" + " bl Save_EraseAllData\n" " mov r0, #0x0\n" " pop {r1}\n" " bx r1\n" @@ -1105,7 +1105,7 @@ void DebugMenu_807719C() " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x8\n" - " bl PrintMenuItemsReordered\n" + " bl Menu_PrintItemsReordered\n" " ldr r4, ._133 + 8\n" " ldrb r0, [r4]\n" " str r0, [sp]\n" @@ -1698,10 +1698,10 @@ void DebugMenu_NationalDex() " lsr r4, r4, #0x10\n" " add r0, r4, #0\n" " mov r1, #0x2\n" - " bl GetNationalPokedexFlag\n" + " bl GetSetPokedexFlag\n" " add r0, r4, #0\n" " mov r1, #0x3\n" - " bl GetNationalPokedexFlag\n" + " bl GetSetPokedexFlag\n" " cmp r4, r5\n" " bls ._177 @cond_branch\n" " ldr r1, ._178 + 4\n" @@ -1738,10 +1738,10 @@ void DebugMenu_HoennDex() " lsr r4, r4, #0x10\n" " add r0, r4, #0\n" " mov r1, #0x2\n" - " bl GetNationalPokedexFlag\n" + " bl GetSetPokedexFlag\n" " add r0, r4, #0\n" " mov r1, #0x3\n" - " bl GetNationalPokedexFlag\n" + " bl GetSetPokedexFlag\n" " cmp r5, #0xc9\n" " bls ._180 @cond_branch\n" " ldr r1, ._181\n" @@ -2356,7 +2356,7 @@ void DebugMenu_8077974() " asr r1, r1, #0x18\n" " lsl r1, r1, #0x10\n" " lsr r1, r1, #0x10\n" - " bl unref_sub_8082C2C\n" + " bl IsRematchTrainerIn\n" " cmp r0, #0\n" " beq ._224 @cond_branch\n" " ldr r0, ._226 + 4\n" @@ -4670,7 +4670,7 @@ void DebugMenu_80787EC() "._467:\n" " .align 2, 0\n" "._466:\n" - " .word gScriptResult\n" + " .word gSpecialVar_Result\n" " .word gStringVar1\n" " .word gStringVar2\n" " .word gStringVar3\n" diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 842837b18..8b586deb2 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -893,7 +893,7 @@ void TayaDebugMenu_PKMNLottery() " .align 2, 0\n" "._83:\n" " .word +0x2000000\n" - " .word gScriptResult\n" + " .word gSpecialVar_Result\n" " .word gCallback_03004AE8\n" " .word debug_sub_8090C88+1\n" "\n" @@ -911,44 +911,44 @@ void TayaDebugMenu_Trainer() " lsl r0, r4, #0x4\n" " add r0, r0, r5\n" " ldrh r0, [r0]\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " add r0, r4, #1\n" " lsl r0, r0, #0x10\n" " lsr r4, r0, #0x10\n" " cmp r4, #0x37\n" " bls ._85 @cond_branch\n" " ldr r0, ._86 + 4\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " mov r0, #0x85\n" " lsl r0, r0, #0x1\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " ldr r0, ._86 + 8\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " mov r0, #0x86\n" " lsl r0, r0, #0x1\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " ldr r0, ._86 + 12\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " mov r0, #0x87\n" " lsl r0, r0, #0x1\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " ldr r0, ._86 + 16\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " mov r0, #0x88\n" " lsl r0, r0, #0x1\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " ldr r0, ._86 + 20\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " mov r0, #0x83\n" " lsl r0, r0, #0x1\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " ldr r0, ._86 + 24\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " mov r0, #0x84\n" " lsl r0, r0, #0x1\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " ldr r0, ._86 + 28\n" - " bl trainer_flag_set\n" + " bl SetTrainerFlag\n" " bl CloseMenu\n" " mov r0, #0x1\n" " pop {r4, r5}\n" diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 2d9074d19..28bb2717d 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -5001,7 +5001,7 @@ void debug_sub_808DABC() "._387:\n" " .align 2, 0\n" "._386:\n" - " .word gScriptResult\n" + " .word gSpecialVar_Result\n" "\n" ); } @@ -5043,7 +5043,7 @@ void debug_sub_808DAD4() " .align 2, 0\n" "._393:\n" " .word 0xffff\n" - " .word gScriptResult\n" + " .word gSpecialVar_Result\n" "\n" ); } diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 7288f602e..b0fbebac1 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -116,7 +116,7 @@ void debug_80C35DC() " str r3, [r2, #0x8]\n" " ldr r0, [r2, #0x8]\n" " bl ResetPaletteFade\n" - " bl remove_some_task\n" + " bl ScanlineEffect_Stop\n" " bl ResetTasks\n" " bl ResetSpriteData\n" " bl ResetPaletteFade\n" @@ -4289,10 +4289,10 @@ void debug_80C53F0() " lsr r4, r4, #0x10\n" " add r0, r4, #0\n" " mov r1, #0x2\n" - " bl GetNationalPokedexFlag\n" + " bl GetSetPokedexFlag\n" " add r0, r4, #0\n" " mov r1, #0x3\n" - " bl GetNationalPokedexFlag\n" + " bl GetSetPokedexFlag\n" " mov r0, #0x5\n" " bl PlaySE\n" " b ._400\n" @@ -7813,7 +7813,7 @@ void debug_80C6FA8() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x0\n" - " bl species_and_otid_get_pal\n" + " bl GetMonSpritePal\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" @@ -7832,7 +7832,7 @@ void debug_80C6FA8() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x9\n" - " bl species_and_otid_get_pal\n" + " bl GetMonSpritePal\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" @@ -9268,7 +9268,7 @@ void debug_80C7B14() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x0\n" - " bl species_and_otid_get_pal\n" + " bl GetMonSpritePal\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" @@ -9287,7 +9287,7 @@ void debug_80C7B14() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x9\n" - " bl species_and_otid_get_pal\n" + " bl GetMonSpritePal\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index c0397f67b..4063aee3a 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -407,7 +407,7 @@ void debug_sub_808A55C() .word gLinkStatus\n\ .word gLink\n\ .word gReceivedRemoteLinkPlayers\n\ - .word gScriptResult\n\ + .word gSpecialVar_Result\n\ .word gLinkCallback\n\ .word gLinkPlayers\n\ .word 0x4000128"); diff --git a/src/engine/link.c b/src/engine/link.c index 5747915d7..3bcacd12b 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -67,7 +67,7 @@ u32 sub_8007E40(void); static void SetBlockReceivedFlag(u8); static u16 LinkTestCalcBlockChecksum(void *, u16); static void PrintHexDigit(u8, u8, u8); -static void PrintHex(u32, u8, u8, u8); +void PrintHex(u32, u8, u8, u8); static void LinkCB_RequestPlayerDataExchange(void); static void Task_PrintTestData(u8); bool8 sub_8008224(void); @@ -961,7 +961,7 @@ static void PrintHexDigit(u8 tileNum, u8 x, u8 y) tilemap[(32 * y) + x] = (gLinkTestBGInfo.paletteNum << 12) | (tileNum + 1); } -static void PrintHex(u32 num, u8 x, u8 y, u8 maxDigits) +void PrintHex(u32 num, u8 x, u8 y, u8 maxDigits) { u8 buffer[16]; s32 i; diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index df4ab4f76..0cfa1e71a 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -691,7 +691,7 @@ void debug_sub_806F908(u8 a) ._142:\n\ ldrb r0, [r4, #0x2]\n\ bl DestroyTask\n\ - bl MenuZeroFillScreen\n\ + bl Menu_EraseScreen\n\ bl ScriptContext2_Disable\n\ add r0, r5, #0\n\ bl DestroyTask\n\ @@ -902,7 +902,7 @@ void debug_sub_806F9E4() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._165 @cond_branch\n\ - bl MenuZeroFillScreen\n\ + bl Menu_EraseScreen\n\ add r0, r7, #0\n\ bl DestroyTask\n\ bl ScriptContext2_Disable\n\ diff --git a/src/engine/save.c b/src/engine/save.c index 1245d0a62..a9945a80d 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -734,7 +734,7 @@ void sub_813B79C() " .word sSaveBlockChunks\n" " .word 0xff4\n" " .word 0xff6\n" - " .word gHallOfFameSaveSectionLocations\n" + " .word sHallOfFameChunks\n" "\n" ); } diff --git a/src/engine/trade.c b/src/engine/trade.c index e49cde6cd..715cc0377 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -4514,8 +4514,8 @@ static __attribute__((naked)) void sub_804B41C(void) } #endif -static void sub_804B790(void) // In-game trade init +void sub_804B790(void) { u8 otName[11]; switch (gMain.state) diff --git a/src/field/berry.c b/src/field/berry.c index 7c6640dc8..d6982479e 100644 --- a/src/field/berry.c +++ b/src/field/berry.c @@ -1780,7 +1780,7 @@ u8* DebugOpenBerryInfo(void) u8 berryTreeId; struct BerryTree *berryTree; - if (GetFieldObjectScriptPointerForComparison() != &BerryTreeScript) + if (GetFieldObjectScriptPointerPlayerFacing() != &S_BerryTree) return NULL; berryTreeId = FieldObjectGetBerryTreeId(gSelectedMapObject); @@ -1809,7 +1809,7 @@ void DebugOpenBerryInfo() { asm( " push {r4, r5, r6, r7, lr}\n" - " bl GetFieldObjectScriptPointerForComparison\n" + " bl GetFieldObjectScriptPointerPlayerFacing\n" " ldr r1, ._138\n" " cmp r0, r1\n" " beq ._136 @cond_branch\n" @@ -1818,7 +1818,7 @@ void DebugOpenBerryInfo() "._139:\n" " .align 2, 0\n" "._138:\n" - " .word BerryTreeScript\n" + " .word S_BerryTree\n" "._136:\n" " ldr r0, ._141\n" " ldrb r0, [r0]\n" diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index db674e52f..795a53d0b 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -1940,7 +1940,7 @@ void debug_sub_805F2DC() " .word gPlayerAvatar\n" "._429:\n" " add r0, r4, #0\n" - " bl sub_80593F4\n" + " bl PlayerGoSpeed4\n" "._430:\n" " mov r0, #0x1\n" " pop {r4}\n" diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 1a4985892..4a03322d5 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -1308,7 +1308,7 @@ u8 debug_sub_808560C(void) add r0, r0, r1\n\ ldrb r0, [r0]\n\ strb r0, [r4]\n\ - bl MenuZeroFillScreen\n\ + bl Menu_EraseScreen\n\ mov r0, #0x16\n\ mov r1, #0x1\n\ mov r2, #0x1c\n\ diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c index c200ce2f5..3f539fc6e 100644 --- a/src/field/fldeff_secretpower.c +++ b/src/field/fldeff_secretpower.c @@ -266,7 +266,7 @@ void debug_sub_80D93F4() ._99:\n\ .align 2, 0\n\ ._98:\n\ - .word gScriptResult\n\ + .word gSpecialVar_Result\n\ ._96:\n\ ldr r4, ._102\n\ add r1, r4, #2\n\ diff --git a/src/field/item_menu.c b/src/field/item_menu.c index ce1f18cdb..61774f816 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -436,7 +436,7 @@ static bool8 SetupBagMultistep(void) bl sub_80A34E8\n\ b ._61\n\ ._9:\n\ - bl remove_some_task\n\ + bl ScanlineEffect_Stop\n\ ldr r1, ._27\n\ ldr r0, ._27 + 4\n\ add r1, r1, r0\n\ diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 91165a2ee..51bd9bb35 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -331,7 +331,7 @@ void debug_sub_810B32C() } #endif -static u8 GetCurrentMauvilleOldMan(void) +u8 GetCurrentMauvilleOldMan(void) { struct MauvilleManCommon *common = &gSaveBlock1.mauvilleMan.common; diff --git a/src/field/region_map.c b/src/field/region_map.c index d6ebf0b9f..9194e791d 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -288,7 +288,7 @@ static void UpdateIconBlink(struct Sprite *); static void SpriteCB_PlayerIconZoomedIn(struct Sprite *); const u8 *GetMapSectionName(u8 *, u16, u16); static void VBlankCB_FlyRegionMap(void); -static void CB2_FlyRegionMap(void); +void CB2_FlyRegionMap(void); void sub_80FC244(void (*func)(void)); static void PrintFlyTargetName(void); static void CreateFlyTargetGraphics(void); @@ -1591,7 +1591,7 @@ static void VBlankCB_FlyRegionMap(void) TransferPlttBuffer(); } -static void CB2_FlyRegionMap(void) +void CB2_FlyRegionMap(void) { ewram0_3.unk0(); AnimateSprites(); diff --git a/src/field/safari_zone.c b/src/field/safari_zone.c index e9ca3a9f9..2829001f6 100644 --- a/src/field/safari_zone.c +++ b/src/field/safari_zone.c @@ -26,7 +26,7 @@ static void DecrementFeederStepCounters(void); extern u8 gBattleOutcome; EWRAM_DATA u8 gNumSafariBalls = 0; -EWRAM_DATA static u16 gSafariZoneStepCounter = 0; +EWRAM_DATA u16 gSafariZoneStepCounter = 0; EWRAM_DATA static struct PokeblockFeeder gPokeblockFeeders[NUM_POKEBLOCK_FEEDERS] = {0}; extern void (*gFieldCallback)(void); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 17aeb8242..47c7fca05 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -398,7 +398,7 @@ void debug_sub_8075DB4() " cmp r4, #0x2\n" " ble ._24 @cond_branch\n" " add r0, r6, #0\n" - " bl sub_8136088\n" + " bl SetEReaderTrainerChecksum\n" " pop {r4, r5, r6}\n" " pop {r0}\n" " bx r0\n" diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c index 08913f40d..10391348d 100644 --- a/src/field/wild_encounter.c +++ b/src/field/wild_encounter.c @@ -3698,13 +3698,13 @@ const u16 gRoute119WaterTileData[] = extern u16 gSpecialVar_Result; extern u8 S_RepelWoreOff[]; -EWRAM_DATA static u8 sWildEncountersDisabled = 0; +EWRAM_DATA u8 sWildEncountersDisabled = 0; EWRAM_DATA static u32 sFeebasRngValue = 0; #define NUM_FEEBAS_SPOTS 6 -static u16 FeebasRandom(void); -static void FeebasSeedRng(u16 seed); +u16 FeebasRandom(void); +void FeebasSeedRng(u16 seed); static bool8 IsWildLevelAllowedByRepel(u8 level); static void ApplyFluteEncounterRateMod(u32 *encRate); @@ -3791,13 +3791,13 @@ static bool8 CheckFeebas(void) return FALSE; } -static u16 FeebasRandom(void) +u16 FeebasRandom(void) { sFeebasRngValue = 12345 + 0x41C64E6D * sFeebasRngValue; return sFeebasRngValue >> 16; } -static void FeebasSeedRng(u16 seed) +void FeebasSeedRng(u16 seed) { sFeebasRngValue = seed; } diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index ecff15c21..565a9861b 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -2369,7 +2369,7 @@ void debug_sub_810D388() " .word unk_debug_bss_2\n" " .word 0x43c\n" "._297:\n" - " bl remove_some_task\n" + " bl ScanlineEffect_Stop\n" " bl ResetPaletteFade\n" " ldr r0, ._302\n" " bl SetVBlankCallback\n" -- cgit v1.2.3 From 8835353325d9c7eba7664bde5d5a2d4c40c4376d Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 18:24:33 -0600 Subject: resolve more undefined references --- include/strings.h | 2 +- src/battle/battle_2.c | 6 +- src/engine/mystery_event_menu.c | 2 +- src/field/battle_tower.c | 2 +- src/field/trader.c | 2 +- src/pokemon/pokemon_summary_screen.c | 4 +- src/rom3.c | 6 +- src/strings.c | 14 +++-- undefined.txt | 115 +---------------------------------- 9 files changed, 23 insertions(+), 130 deletions(-) diff --git a/include/strings.h b/include/strings.h index fe9cfc6ba..91c5c5344 100644 --- a/include/strings.h +++ b/include/strings.h @@ -164,7 +164,7 @@ extern const u8 gOtherText_None[]; extern const u8 gOtherText_ThreeQuestions2[]; -extern const u8 gOtherText_FiveQuestionsAndSlash[]; +extern const u8 gOtherText_FiveQuestions[]; extern const u8 gOtherText_OneDash[]; extern const u8 gOtherText_TwoDashes[]; diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index bedcb0bb6..6d2045604 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -9473,16 +9473,16 @@ void sub_8010874() "._1215:\n" " .word gUnknown_02024C4C\n" " .word gLastHitByType\n" - " .word gMoveHitWith\n" + " .word gLastLandedMoves\n" " .word gLastUsedMove\n" " .word gDisableStructs\n" " .word gUnknown_02024C2C\n" - " .word gLockedMove\n" + " .word gLockedMoves\n" " .word gStatuses3\n" " .word gUnknown_02024C70\n" " .word gUnknown_02024C5C\n" " .word +0x2017100\n" - " .word gSideTimer\n" + " .word gSideTimers\n" " .word gSideAffecting\n" " .word gBankAttacker\n" " .word gBankTarget\n" diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 8f280dc18..656e774c5 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -465,7 +465,7 @@ void debug_sub_815D04C() " add r1, r1, r0\n" " ldr r0, ._133 + 8\n" " ldr r1, [r1]\n" - " bl gScriptFuncs_End+0x3cf8\n" + " bl gMysteryEventScriptCmdTableEnd+0x3cf8\n" " ldr r0, ._133 + 12\n" " add r1, r6, r0\n" " ldrb r0, [r1]\n" diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index ab2a818a7..41d5ae9d1 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -259,7 +259,7 @@ static void SaveCurrentWinStreak(void); static void sub_8135CFC(void); static void CheckMonBattleTowerBanlist(u16, u16, u16, u8, u8, u16 *, u16 *, u8 *); static void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *); -static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer); +void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer); static void SetBattleTowerRecordChecksum(struct BattleTowerRecord *); static void ClearBattleTowerRecord(struct BattleTowerRecord *); diff --git a/src/field/trader.c b/src/field/trader.c index b4732ab15..2801df322 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -108,7 +108,7 @@ void CreateAvailableDecorationsMenu(u8 taskId) { if (trader->unk1[i] > DECOR_REGISTEEL_DOLL) { - Menu_PrintText(gOtherText_FiveQuestionsAndSlash, 1, numDecorations * 2 + 2); + Menu_PrintText(gOtherText_FiveQuestions, 1, numDecorations * 2 + 2); } else { diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index 7b40918e9..0102b7526 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -2576,14 +2576,14 @@ static void sub_809FC34(struct Pokemon *mon) buffer = gStringVar1; buffer = sub_80A1E58(buffer, 13); buffer = StringCopy(buffer, gOtherText_OriginalTrainer); - buffer = StringCopy(buffer, gOtherText_FiveQuestionsAndSlash); + buffer = StringCopy(buffer, gOtherText_FiveQuestions); buffer[0] = EXT_CTRL_CODE_BEGIN; buffer[1] = 0x13; buffer[2] = 0x4E; buffer[3] = EOS; Menu_PrintText(gStringVar1, 11, 4); - sub_80A1EF8(gOtherText_FiveQuestionsAndSlash, 13, 193, 32, 1); + sub_80A1EF8(gOtherText_FiveQuestions, 13, 193, 32, 1); sub_80A198C(9, 120, 48, 0); friendship = GetMonData(mon, MON_DATA_FRIENDSHIP); diff --git a/src/rom3.c b/src/rom3.c index efaa1d97f..34746c1a8 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -101,9 +101,9 @@ void setup_poochyena_battle(void) #if DEBUG if (gUnknown_02023A14_50 & 0x80) { - ewram[0x160fd] = 0; - ewram[0x160fe] = 0; - ewram[0x160ff] = 0; + gSharedMem[0x160fd] = 0; + gSharedMem[0x160fe] = 0; + gSharedMem[0x160ff] = 0; ((u32 *) gBattleBuffersTransferData)[64]++; } #endif diff --git a/src/strings.c b/src/strings.c index 06bbadb8f..0f599db72 100644 --- a/src/strings.c +++ b/src/strings.c @@ -173,7 +173,8 @@ const u8 gOtherText_None[] = _("NONE"); const u8 gOtherText_ThreeQuestions2[] = _("???"); -const u8 gOtherText_FiveQuestionsAndSlash[] = _("?????$/"); +const u8 gOtherText_FiveQuestions[] = _("?????"); +const u8 gOtherText_Slash[] = _("/"); const u8 gOtherText_OneDash[] = _("-"); const u8 gOtherText_TwoDashes[] = _("--"); @@ -267,7 +268,9 @@ const u8 gContestStatsText_Spicy[] = _("SPICY"); const u8 gContestStatsText_Dry[] = _("DRY"); const u8 gContestStatsText_Sweet[] = _("SWEET"); const u8 gContestStatsText_Bitter[] = _("BITTER"); -const u8 gContestStatsText_Sour[] = _("SOUR$TASTY$FEEL"); // tasty is unused, feel might not be +const u8 gContestStatsText_Sour[] = _("SOUR"); +const u8 gContestStatsText_Tasty[] = _("TASTY"); +const u8 gContestStatsText_Feel[] = _("FEEL"); const u8 gContestStatsText_StowCase[] = _("Stow CASE."); const u8 gContestStatsText_ThrowAwayPrompt[] = _("Throw away this\n{STR_VAR_1}?"); @@ -1096,7 +1099,8 @@ const u8 gOtherText_None[] = _("KEINES"); const u8 gOtherText_ThreeQuestions2[] = _("???"); -const u8 gOtherText_FiveQuestionsAndSlash[] = _("?????$/"); +const u8 gOtherText_FiveQuestions[] = _("?????"); +const u8 gOtherText_Slash[] = _("/"); const u8 gOtherText_OneDash[] = _("-"); const u8 gOtherText_TwoDashes[] = _("--"); @@ -1190,7 +1194,9 @@ const u8 gContestStatsText_Spicy[] = _("SCHARF"); const u8 gContestStatsText_Dry[] = _("TROCKEN"); const u8 gContestStatsText_Sweet[] = _("SÜSS"); const u8 gContestStatsText_Bitter[] = _("BITTER"); -const u8 gContestStatsText_Sour[] = _("SAUER$LECKER$WÜRZE"); +const u8 gContestStatsText_Sour[] = _("SAUER"); +const u8 gContestStatsText_Tasty[] = _("LECKER"); +const u8 gContestStatsText_Feel[] = _("WÜRZE"); const u8 gContestStatsText_StowCase[] = _("BOX verstauen."); const u8 gContestStatsText_ThrowAwayPrompt[] = _("{STR_VAR_1}\nwegwerfen?"); diff --git a/undefined.txt b/undefined.txt index 4fcd0398e..bd7c98f0f 100644 --- a/undefined.txt +++ b/undefined.txt @@ -1,142 +1,29 @@ (.text+0x120): undefined reference to `gUnknown_02023A14_50' (.text+0x124): undefined reference to `ewram' -(.text+0x76): undefined reference to `dp12_8087EA4' -(.text+0xb8): undefined reference to `sub_80895F8' -(.text+0xf6): undefined reference to `GetBattleTerrain' -(.text+0x160): undefined reference to `gUnknown_030042C4' -(.text+0x164): undefined reference to `gUnknown_03004240' -(.text+0x168): undefined reference to `gUnknown_03004DE0' -(.text+0x8a8): undefined reference to `sub_800F808' -(.text+0x10e0): undefined reference to `sub_800F808' -(.text+0x1150): undefined reference to `gScriptResult' -(.text+0x115c): undefined reference to `gUnknown_03004DC0' -(.text+0x11b6): undefined reference to `sub_800374C' -(.text+0x1d2c): undefined reference to `sub_800D238' -(.text+0x1d5c): undefined reference to `remove_some_task' -(.text+0x2188): undefined reference to `gUnknown_03005E94' -(.text+0x321e): undefined reference to `sub_8089668' -(.text+0x3c78): undefined reference to `sub_800374C' -(.text+0x5164): undefined reference to `gUnknown_02024C44' (.text+0x5168): undefined reference to `gMoveHitWith' (.text+0x5178): undefined reference to `gLockedMove' (.text+0x518c): undefined reference to `gSideTimer' -(.text+0x235e): undefined reference to `sub_80593F4' (.text+0x4c): undefined reference to `gUnknown_Debug_03004BC0' (.text+0x39c): undefined reference to `gUnknown_Debug_03004BC0' (.text+0x4d0): undefined reference to `gUnknown_Debug_03004BC0' (.text+0x660): undefined reference to `gUnknown_Debug_03004BC0' (.text+0xd4c): undefined reference to `gUnknown_Debug_03004BC0' -(.text+0xae8): undefined reference to `MenuZeroFillScreen' -(.text+0xc88): undefined reference to `MenuZeroFillScreen' -(.text+0xd4): undefined reference to `gUnknown_03004DE0' -(.text+0x1f0): undefined reference to `sub_8136088' -(.text+0x58): undefined reference to `PrintMenuItemsReordered' -(.text+0x25c): undefined reference to `sub_804B790' -(.text+0x28a): undefined reference to `ClearSaveData' -(.text+0x6f2): undefined reference to `PrintMenuItemsReordered' -(.text+0xac0): undefined reference to `GetNationalPokedexFlag' -(.text+0xac8): undefined reference to `GetNationalPokedexFlag' -(.text+0xb06): undefined reference to `GetNationalPokedexFlag' -(.text+0xb0e): undefined reference to `GetNationalPokedexFlag' -(.text+0xbc6): undefined reference to `sub_8053570' -(.text+0xe24): undefined reference to `sWildEncountersDisabled' -(.text+0xe4c): undefined reference to `sWildEncountersDisabled' -(.text+0xec6): undefined reference to `unref_sub_8082C2C' -(.text+0xf00): undefined reference to `sub_8082C0C' -(.text+0x101c): undefined reference to `gSafariZoneStepCounter' -(.text+0x1034): undefined reference to `gSafariZoneStepCounter' -(.text+0x10cc): undefined reference to `gSafariZoneStepCounter' -(.text+0x1da0): undefined reference to `gScriptResult' +(.text+0x1f0): undefined reference to `SetEReaderTrainerChecksum' (.text+0x25c8): undefined reference to `gUnknown_Debug_03004BD0' -(.text+0x25ec): undefined reference to `ProcessMenuInputNoWrap_' (.text+0x2608): undefined reference to `gUnknown_Debug_03004BD0' (.text+0x2628): undefined reference to `gUnknown_Debug_03004BD0' -(.text+0x16aa): undefined reference to `MenuFillWindowRectWithBlankTile' -(.text+0x1708): undefined reference to `MenuZeroFillScreen' -(.text+0x1714): undefined reference to `MenuFillWindowRectWithBlankTile' -(.text+0x173c): undefined reference to `gUnknown_0202F7E8' -(.text+0xd0): undefined reference to `PrintHex' -(.text+0xde): undefined reference to `PrintHex' -(.text+0xfc): undefined reference to `PrintHex' -(.text+0x10e): undefined reference to `PrintHex' -(.text+0x12e): undefined reference to `PrintHex' -src/engine/cable_club.o:(.text+0x13c): more undefined references to `PrintHex' follow -(.text+0x270): undefined reference to `gScriptResult' (.text+0x12ac): undefined reference to `unk_3004E98' (.text+0x12e4): undefined reference to `unk_3004E94' -(.text+0x2274): undefined reference to `gScriptResult' -(.text+0x22ac): undefined reference to `gScriptResult' -(.text+0x228): undefined reference to `sub_810F424' -(.text+0x2c2): undefined reference to `ProcessMenuInputNoWrap_' -(.text+0x712): undefined reference to `sub_80BFB54' -(.text+0x44): undefined reference to `sub_80EB3FC' -(.text+0x5a): undefined reference to `sub_80EB3FC' -(.text+0x318): undefined reference to `GetCurrentMauvilleOldMan' -(.text+0x6e0): undefined reference to `gScriptResult' -(.text+0x6f8): undefined reference to `trainer_flag_set' -(.text+0x708): undefined reference to `trainer_flag_set' -(.text+0x710): undefined reference to `trainer_flag_set' -(.text+0x716): undefined reference to `trainer_flag_set' -(.text+0x71e): undefined reference to `trainer_flag_set' -src/debug/taya_debug_window.o:(.text+0x724): more undefined references to `trainer_flag_set' follow (.text+0x11b4): undefined reference to `unk_2038790' (.text+0x11cc): undefined reference to `unk_2038794' (.text+0x11d0): undefined reference to `unk_2038798' (.text+0x1210): undefined reference to `unk_2038798' (.text+0x1230): undefined reference to `unk_2038794' (.text_8098A38+0x40b4): undefined reference to `unk_2038790' -(.text+0x238): undefined reference to `sub_80FC074' -(.text+0xda): undefined reference to `remove_some_task' -(.text+0x13a): undefined reference to `sub_80A3520' -(.text+0x15a): undefined reference to `SetUpWindowConfig' -(.text+0x204): undefined reference to `gUnknown_03000701' -(.text+0x22c): undefined reference to `sub_80A3AC0' -(.text+0x230): undefined reference to `sub_80A3D08' -(.text+0x268): undefined reference to `gUnknown_02038559' -(.text+0x270): undefined reference to `gUnknown_03005D24' -(.text+0x2c0): undefined reference to `gUnknown_03005D10' -(.text+0x2c4): undefined reference to `gUnknown_02038559' -(.text+0x2c8): undefined reference to `gUnknown_03005D24' (.text+0x6c0): undefined reference to `gUnknown_Debug_083EBC68' -(.text+0x93a): undefined reference to `GetFieldObjectScriptPointerForComparison' -(.text+0x948): undefined reference to `BerryTreeScript' -(.text+0xca): undefined reference to `remove_some_task' -(.text+0x72c): undefined reference to `gPokedexEntries' (.text+0x1398): undefined reference to `gUnknown_02023A14_50' (.text+0x1410): undefined reference to `gUnknown_02023A14_50' -(.text+0x1f4e): undefined reference to `GetNationalPokedexFlag' -(.text+0x1f56): undefined reference to `GetNationalPokedexFlag' -(.text+0x380e): undefined reference to `sub_8091738' -(.text+0x3b40): undefined reference to `species_and_otid_get_pal' -(.text+0x3b66): undefined reference to `species_and_otid_get_pal' -(.text+0x46a8): undefined reference to `species_and_otid_get_pal' -(.text+0x46ce): undefined reference to `species_and_otid_get_pal' -(.text+0x80): undefined reference to `gScriptResult' -(.text+0x122): undefined reference to `sub_80F7A6C' -(.text+0x144): undefined reference to `sub_80F7A98' -(.text+0x14a): undefined reference to `sub_80F7A7C' -(.text+0x150): undefined reference to `sub_80F7A88' -(.text+0x44): undefined reference to `gUnknown_03000748' -(.text+0x123c): undefined reference to `remove_some_task' -(.text+0x74): undefined reference to `gUnknown_083E79C0' -(.text+0x170): undefined reference to `sub_80FC69C' -(.text+0x25e): undefined reference to `sub_80FC074' -(.text+0x284): undefined reference to `sub_80FC228' -(.text+0xa28): undefined reference to `sub_81027A0' -(.text+0xae0): undefined reference to `StripExtCtrlCodes' -(.text+0xb2c): undefined reference to `gSaveSectionLocations' -(.text+0xb38): undefined reference to `gHallOfFameSaveSectionLocations' -(.text+0x228): undefined reference to `gFlashSectors' -(.text+0x2a0): undefined reference to `gFlashSectors' -(.text+0x2a4): undefined reference to `gFlashSectors' -(.text+0x400): undefined reference to `gFlashSectors' -(.text+0x584): undefined reference to `gFlashSectors' -src/engine/mystery_event_menu.o:(.text+0x574): more undefined references to `gFlashSectors' follow (.text+0x5f4): undefined reference to `gScriptFuncs_End' -(.text+0x614): undefined reference to `gFlashSectors' -(.text+0x868): undefined reference to `MenuFillWindowRectWithBlankTile' -(.text+0xd52): undefined reference to `FeebasSeedRng' -(.text+0xd76): undefined reference to `FeebasRandom' (.text+0x17c0): undefined reference to `gOtherText_FiveQuestions' (.text+0x1ac0): undefined reference to `gContestStatsText_Tasty' (.text+0x1c74): undefined reference to `gOtherText_Slash' -- cgit v1.2.3 From 2869160d630f569110ca895ff924070d626fd54b Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 17 Jan 2018 19:31:23 -0500 Subject: use Defvars instead of some Dma macros and hopefully last while(1)s --- src/battle/anim/love_bg.c | 7 +++---- src/battle/anim/scary_face.c | 5 ++--- src/battle/battle_7.c | 7 +------ src/battle/battle_anim.c | 22 ++++------------------ src/contest.c | 20 ++++---------------- src/engine/naming_screen.c | 12 ++---------- src/engine/palette.c | 4 +--- src/engine/trade.c | 13 +++---------- src/field/berry_tag_screen.c | 4 +--- src/field/item_menu.c | 16 ++-------------- src/field/party_menu.c | 4 +--- src/field/pokeblock.c | 6 +----- src/field/start_menu.c | 21 ++------------------- src/scene/berry_blender.c | 35 ++++++++--------------------------- src/scene/egg_hatch.c | 17 +++++------------ src/scene/hall_of_fame.c | 12 ++---------- src/scene/intro.c | 4 +--- 17 files changed, 43 insertions(+), 166 deletions(-) diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c index ef524e4be..c3828c681 100644 --- a/src/battle/anim/love_bg.c +++ b/src/battle/anim/love_bg.c @@ -25,7 +25,7 @@ static void sub_80D21F0(u8 taskId); void sub_80D2100(u8 taskId) { struct Struct_sub_8078914 subStruct; - u8* tempvar; + REG_BLDCNT = 0x3F42; REG_BLDALPHA = 0x1000; REG_BG1CNT_BITFIELD.priority = 3; @@ -38,9 +38,8 @@ void sub_80D2100(u8 taskId) REG_BG1HOFS = 0; REG_BG1VOFS = 0; sub_8078914(&subStruct); - tempvar = subStruct.field_4; - DmaFill32(3, 0x0, tempvar, 0x1000); - LZDecompressVram(&gAttractTilemap, tempvar); + DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000); + LZDecompressVram(&gAttractTilemap, subStruct.field_4); LZDecompressVram(&gAttractGfx, subStruct.field_0); LoadCompressedPalette(&gAttractPal, subStruct.field_8 << 4, 32); if (IsContest()) diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c index 65b9637c0..8d51521ee 100644 --- a/src/battle/anim/scary_face.c +++ b/src/battle/anim/scary_face.c @@ -27,7 +27,7 @@ static void sub_80D24E0(u8 taskId); void sub_80D23B4(u8 taskId) { struct Struct_sub_8078914 subStruct; - u8* tempvar; + REG_BLDCNT = 0x3F42; REG_BLDALPHA = 0x1000; REG_BG1CNT_BITFIELD.priority = 1; @@ -40,8 +40,7 @@ void sub_80D23B4(u8 taskId) REG_BG1HOFS = 0; REG_BG1VOFS = 0; sub_8078914(&subStruct); - tempvar = subStruct.field_4; - DmaFill32(3, 0x0, tempvar, 0x1000); + DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000); if (IsContest()) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4); else if (GetBankSide(gAnimBankTarget) == 1) diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 00216ce05..b4c71b9c2 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -624,9 +624,6 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) } else { - const void *src; - void *dst; - if (IsContest()) { r10 = 0; @@ -676,9 +673,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) gTransformedPersonalities[a]); } } - src = gUnknown_081FAF4C[r10]; - dst = (void *)(VRAM + 0x10000 + gSprites[gObjectBankIDs[a]].oam.tileNum * 32); - DmaCopy32(3, src, dst, 0x800); + DmaCopy32Defvars(3, gUnknown_081FAF4C[r10], (void *)(VRAM + 0x10000 + gSprites[gObjectBankIDs[a]].oam.tileNum * 32), 0x800); paletteOffset = 0x100 + a * 16; lzPaletteData = GetMonSpritePalFromOtIdPersonality(species, otId, personalityValue); LZDecompressWram(lzPaletteData, gSharedMem); diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index 059b8df1f..a4540868c 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -2064,25 +2064,15 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId) if (gTasks[taskId].data[5] == 0) { - u16 *src; - u16 *dst; - gBattle_BG1_X = x + gTasks[taskId].data[3]; gBattle_BG1_Y = y + gTasks[taskId].data[4]; - src = gPlttBufferFaded + 0x100 + palIndex * 16; - dst = gPlttBufferFaded + 0x100 + s.unk8 * 16 - 256; - DmaCopy32(3, src, dst, 32); + DmaCopy32Defvars(3, gPlttBufferFaded + 0x100 + palIndex * 16, gPlttBufferFaded + 0x100 + s.unk8 * 16 - 256, 32); } else { - u16 *src; - u16 *dst; - gBattle_BG2_X = x + gTasks[taskId].data[3]; gBattle_BG2_Y = y + gTasks[taskId].data[4]; - src = gPlttBufferFaded + 0x100 + palIndex * 16; - dst = gPlttBufferFaded + 0x100 - 112; - DmaCopy32(3, src, dst, 32); + DmaCopy32Defvars(3, gPlttBufferFaded + 0x100 + palIndex * 16, gPlttBufferFaded + 0x100 - 112, 32); } } @@ -2426,14 +2416,10 @@ static void LoadMoveBg(u16 bgId) if (IsContest()) { void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap; - void *dmaSrc; - void *dmaDest; - LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000); + LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000); sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0); - dmaSrc = IsContest() ? EWRAM_14800 : EWRAM_18000; - dmaDest = (void *)(VRAM + 0xD000); - DmaCopy32(3, dmaSrc, dmaDest, 0x800); + DmaCopy32Defvars(3, IsContest() ? EWRAM_14800 : EWRAM_18000, (void *)(VRAM + 0xD000), 0x800); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000)); LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80789BC() * 16, 32); } diff --git a/src/contest.c b/src/contest.c index df4bb361d..8081e8a8d 100644 --- a/src/contest.c +++ b/src/contest.c @@ -3671,12 +3671,8 @@ void sub_80B0748(u8 taskId) { // What the hell? These aren't pointers. // This code would crash if run. - { - void *src = (void *)(u32)gPlttBufferFaded[(r4 + 5) * 16 + 1]; - void *dest = (void *)(u32)gPlttBufferUnfaded[(r4 + 5) * 16 + 1]; - u32 size = 6; - DmaCopy16(3, src, dest, size); - } + DmaCopy16Defvars(3, (void *)(u32)gPlttBufferFaded[(r4 + 5) * 16 + 1], + (void *)(u32)gPlttBufferUnfaded[(r4 + 5) * 16 + 1], 6); gTasks[taskId].data[r1 + 0] = 0; } } @@ -4046,21 +4042,13 @@ u8 sub_80B09E4(u8 a) CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02038696[a] * 5 * 64 + 0x26), (u8 *)(VRAM + 0x10000 + gSprites[r8].oam.tileNum * 32)); CopySpriteTiles(0, 3, (void *)VRAM, (u16 *)(VRAM + 0xE000 + gUnknown_02038696[a] * 5 * 64 + 0x36), (u8 *)(VRAM + 0x10000 + gSprites[r6].oam.tileNum * 32)); - { - void *dest = (void *)(VRAM + 0x10000 + (0x28 + gSprites[r8].oam.tileNum) * 32); - u32 size = 0x300; - DmaFill32(3, 0, dest, size); - } + DmaFill32Defvars(3, 0, (void *)(VRAM + 0x10000 + (0x28 + gSprites[r8].oam.tileNum) * 32), 0x300); // What is this? zero = 0; zero = 0; - { - void *dest = (void *)(VRAM + 0x10000 + (0x28 + gSprites[r6].oam.tileNum) * 32); - u32 size = 0x300; - DmaFill32(3, 0, dest, size); - } + DmaFill32Defvars(3, 0, (void *)(VRAM + 0x10000 + (0x28 + gSprites[r6].oam.tileNum) * 32), 0x300); gSprites[r8].data[0] = r6; gSprites[r6].data[0] = r8; diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index d54b84720..97819322c 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -1616,16 +1616,8 @@ static void sub_80B7558(void) static void sub_80B7568(void) { - const void *src; - void *dst; - - src = gNamingScreenMenu_Gfx; - dst = (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32); - DmaCopy16(3, src, dst, 0x800); - - src = gNamingScreenMenu_Gfx; - dst = (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32); - DmaCopy16(3, src, dst, 0x800); + DmaCopy16Defvars(3, gNamingScreenMenu_Gfx, (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32), 0x800); + DmaCopy16Defvars(3, gNamingScreenMenu_Gfx, (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32), 0x800); } static void sub_80B75B0(void) diff --git a/src/engine/palette.c b/src/engine/palette.c index 17e9ca178..2a6602503 100644 --- a/src/engine/palette.c +++ b/src/engine/palette.c @@ -827,8 +827,6 @@ void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color) void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color) { - void *src = gPlttBufferUnfaded; - void *dest = gPlttBufferFaded; - DmaCopy32(3, src, dest, PLTT_SIZE); + DmaCopy32Defvars(3, gPlttBufferUnfaded, gPlttBufferFaded, PLTT_SIZE); BlendPalettes(selectedPalettes, coeff, color); } diff --git a/src/engine/trade.c b/src/engine/trade.c index 81485d3f6..c271649c1 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -1465,13 +1465,10 @@ static void sub_8048B0C(u8 a0) DmaCopyLarge16(3, gUnknown_08EA0348, (void *)BG_VRAM, 0x1280, 0x1000); for (i = 0; i < 0x400; i ++) gUnknown_03004824->unk_00c8.unk_12[i] = gUnknown_08EA15C8[i]; - dest = BG_SCREEN_ADDR(6); - DmaCopy16(3, gTradeStripesBG2Tilemap, dest, 0x800); + DmaCopy16Defvars(3, gTradeStripesBG2Tilemap, BG_SCREEN_ADDR(6), 0x800); break; case 1: - src = gTradeStripesBG3Tilemap; - dest = BG_SCREEN_ADDR(7); - DmaCopy16(3, src, dest, 0x800); + DmaCopy16Defvars(3, gTradeStripesBG3Tilemap, BG_SCREEN_ADDR(7), 0x800); sub_804A6DC(0); sub_804A6DC(1); sub_804A938(&gUnknown_03004824->unk_00c8); @@ -5685,13 +5682,9 @@ static void sub_804E1DC(void) void sub_804E22C(void) { - const u16 *src; - u16 *dest; LZDecompressVram(gUnknown_08D00000, (void *)VRAM); CpuCopy16(gUnknown_08D00524, gSharedMem, 0x1000); - src = (const u16 *)gSharedMem; - dest = BG_SCREEN_ADDR(5); - DmaCopy16(3, src, dest, 0x500) + DmaCopy16Defvars(3, gSharedMem, BG_SCREEN_ADDR(5), 0x500); LoadCompressedPalette(gUnknown_08D004E0, 0, 32); REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(5); } diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index bec16334d..bb937ea43 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -189,7 +189,6 @@ static void sub_8146288(void) bool8 sub_81462B8(void) { u16 i; - void *addr; switch (gSharedMem.var_1FFFF) { @@ -213,8 +212,7 @@ bool8 sub_81462B8(void) else gBGTilemapBuffers[2][i] = 0x5042; } - addr = (void *)(VRAM + 0x3800); - DmaCopy16(3, gBGTilemapBuffers[2], addr, 0x800); + DmaCopy16Defvars(3, gBGTilemapBuffers[2], (void *)(VRAM + 0x3800), 0x800); gSharedMem.var_1FFFF += 1; break; case 4: diff --git a/src/field/item_menu.c b/src/field/item_menu.c index d86550eb6..6bad9f4d6 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -368,20 +368,8 @@ static void sub_80A3134(void) LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - - { - const void *src = gBGTilemapBuffers[1]; - void *dst = (void *)(VRAM + 0x2000); - - DmaCopy16(3, src, dst, 0x800); - } - - { - const void *src = gBGTilemapBuffers[2]; - void *dst = (void *)(VRAM + 0x6000); - - DmaCopy16(3, src, dst, 0x800); - } + DmaCopy16Defvars(3, gBGTilemapBuffers[1], (void *)(VRAM + 0x2000), 0x800); + DmaCopy16Defvars(3, gBGTilemapBuffers[2], (void *)(VRAM + 0x6000), 0x800); } static bool8 SetupBagMultistep(void) diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 53bad9618..31dd55dda 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -777,9 +777,7 @@ void ReDrawPartyMonBackgrounds(void) { if (ewram1B000.unk261) { - const void *src = gBGTilemapBuffers[2]; - void *dest = (void *)(BG_VRAM + 0x3000); - DmaCopy16(3, src, dest, 0x800); + DmaCopy16Defvars(3, gBGTilemapBuffers[2], (void *)(BG_VRAM + 0x3000), 0x800); if (ewram1B000.unk261 == 2) { diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 31bdcc398..e08a65f49 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -228,14 +228,10 @@ static void sub_810B674(void) static void sub_810B68C(void) { - u16 *src; - vu16 *dest; LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); - src = gBGTilemapBuffers[2]; - dest = (vu16 *)(VRAM + 0x7800); - DmaCopy16(3, src, dest, sizeof gBGTilemapBuffers[2]); + DmaCopy16Defvars(3, gBGTilemapBuffers[2], (void *)(VRAM + 0x7800), sizeof gBGTilemapBuffers[2]); } static bool8 sub_810B6C0(void) diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 95aa9c79e..db41919be 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -744,29 +744,12 @@ static bool32 sub_80719FC(u8 *step) switch (*step) { case 0: - { - u8 *addr; - u32 size; - REG_DISPCNT = 0; SetVBlankCallback(NULL); ScanlineEffect_Stop(); DmaClear16(3, PLTT, PLTT_SIZE); - addr = (void *)VRAM; - size = 0x18000; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } - break; - } + DmaFill16Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000); + break; case 1: ResetSpriteData(); ResetTasks(); diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 6b6469634..7567899ae 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -832,14 +832,9 @@ static bool8 sub_804E2EC(void) gBerryBlenderData->field_1++; break; case 1: - { - const void* offsetRead = sBlenderCenterMap; - void* offsetWrite = (void*)(VRAM + 0x4000); - - DmaCopy16(3, offsetRead, offsetWrite, 0x400); - LoadPalette(sBlenderCenterPal, 0, 0x100); - gBerryBlenderData->field_1++; - } + DmaCopy16Defvars(3, sBlenderCenterMap, (void *)(VRAM + 0x4000), 0x400); + LoadPalette(sBlenderCenterPal, 0, 0x100); + gBerryBlenderData->field_1++; break; case 2: DmaCopyLarge16(3, ewram10000, (void *)(VRAM + 0x0), 0x2000, 0x1000); @@ -854,37 +849,23 @@ static bool8 sub_804E2EC(void) gBerryBlenderData->field_1++; break; case 5: - { - void* offsetRead = ewram10000; - void* offsetWrite = (void*)(VRAM + 0xE000); - - DmaCopy16(3, offsetRead, offsetWrite, 0x1000); - gBerryBlenderData->field_1++; - } + DmaCopy16Defvars(3, ewram10000, (void *)(VRAM + 0xE000), 0x1000); + gBerryBlenderData->field_1++; break; case 6: - { - void* offsetRead = ewram11000; - void* offsetWrite = (void*)(VRAM + 0xF000); - - DmaCopy16(3, offsetRead, offsetWrite, 0x1000); - gBerryBlenderData->field_1++; - } + DmaCopy16Defvars(3, ewram11000, (void *)(VRAM + 0xF000), 0x1000); + gBerryBlenderData->field_1++; break; case 7: { u16 i; u16* palStore = (u16*)(ewram13000); - void* offsetRead; - void* offsetWrite; for (i = 0; i < 640; i++) { *(palStore + i) |= 0x100; } - offsetRead = ewram13000; - offsetWrite = (void*)(VRAM + 0x6000); - DmaCopy16(3, offsetRead, offsetWrite, 0x500); + DmaCopy16Defvars(3, ewram13000, (void *)(VRAM + 0x6000), 0x500); LoadPalette(sBlenderOuterPal, 0x80, 0x20); gBerryBlenderData->field_1++; } diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index 8c585e067..282ad31fb 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -504,18 +504,11 @@ static void CB2_EggHatch_0(void) gMain.state++; break; case 7: - { - u32 offsetRead2, offsetWrite2; - - REG_BG2CNT = 0x4C06; - LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0); - DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000); - - offsetRead2 = (u32)(&gUnknown_0820F798); - offsetWrite2 = (u32)(VRAM + 0x6000); - DmaCopy16(3, offsetRead2, (void*)(offsetWrite2), 0x1000); - gMain.state++; - } + REG_BG2CNT = 0x4C06; + LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0); + DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000); + DmaCopy16Defvars(3, gUnknown_0820F798, (void *)(VRAM + 0x6000), 0x1000); + gMain.state++; break; case 8: REG_BG1CNT = 0x501; diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index f7f7fb1cc..e486c65a3 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -1199,8 +1199,6 @@ static void HallOfFame_PrintPlayerInfo(u8 a0, u8 a1) static void sub_81433E0(void) { - u32 offsetWrite2, offsetWrite3; - u32 size2, size3; u16 i; REG_DISPCNT = 0; @@ -1222,14 +1220,8 @@ static void sub_81433E0(void) REG_BG3VOFS = 0; DmaFill16Large(3, 0, VRAM, 0x18000, 0x1000); - - offsetWrite2 = OAM; - size2 = OAM_SIZE; - DmaFill32(3, 0, offsetWrite2, size2); - - offsetWrite3 = PLTT; - size3 = PLTT_SIZE; - DmaFill16(3, 0, offsetWrite3, size3); + DmaFill32Defvars(3, 0, OAM, OAM_SIZE); + DmaFill16Defvars(3, 0, PLTT, PLTT_SIZE); LZ77UnCompVram(gHallOfFame_Gfx, (void*)(VRAM)); diff --git a/src/scene/intro.c b/src/scene/intro.c index f7e196133..4da341744 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -1217,7 +1217,6 @@ static void Task_IntroWaitToSetupPart3DoubleFight(u8 taskId) static void Task_IntroLoadPart3Streaks(u8 taskId) { u16 i; - void *vram; intro_reset_and_hide_bgs(); for (i = 0; i < 32; i++) @@ -1226,8 +1225,7 @@ static void Task_IntroLoadPart3Streaks(u8 taskId) ewram0arr[1][i] = 17; ewram0arr[2][i] = 34; } - vram = (void *)VRAM; - DmaCopy16(3, gSharedMem, vram, 0x60); + DmaCopy16Defvars(3, gSharedMem, (void *)(VRAM + 0x0), 0x60); for (i = 0; i < 0x280; i++) ((u16 *)(VRAM + 0x3000))[i] = 0xF001; for (i = 0; i < 0x80; i++) -- cgit v1.2.3 From a02a85f477cbf44aa0370de8f40bd8ced77513c2 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 18:56:16 -0600 Subject: get nonmatching debug rom to build --- Makefile | 2 +- common_syms/debug/watanabe_debug_menu.txt | 1 + common_syms/field/field_map_obj.txt | 1 + src/field/field_map_obj.c | 3 + src/field/item_menu.c | 18 +++ src/field/mauville_man.c | 197 +++++++++++++++++++++++++++- src/pokemon/mail.c | 205 +----------------------------- sym_bss.txt | 1 + sym_common.txt | 19 +++ sym_ewram.txt | 14 ++ 10 files changed, 259 insertions(+), 202 deletions(-) create mode 100644 common_syms/debug/watanabe_debug_menu.txt diff --git a/Makefile b/Makefile index d91bb6840..8e2e503ab 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ tidy: $(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map}) $(RM) -r build -$(BUILD_NAME).gba: $(BUILD_NAME).elf +%.gba: %.elf $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ %.elf: $(LD_SCRIPT) $(ALL_OBJECTS) diff --git a/common_syms/debug/watanabe_debug_menu.txt b/common_syms/debug/watanabe_debug_menu.txt new file mode 100644 index 000000000..9b2626a86 --- /dev/null +++ b/common_syms/debug/watanabe_debug_menu.txt @@ -0,0 +1 @@ +byte_3005E30 diff --git a/common_syms/field/field_map_obj.txt b/common_syms/field/field_map_obj.txt index 32d8b1915..93dd77dde 100644 --- a/common_syms/field/field_map_obj.txt +++ b/common_syms/field/field_map_obj.txt @@ -1 +1,2 @@ gMapObjects +gUnknown_Debug_03004BC0 diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 1c0cefacb..c255d3013 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -1907,6 +1907,9 @@ static u8 gUnknown_030005A4; static u16 gUnknown_030005A6; struct MapObject gMapObjects[16]; +#if DEBUG +u8 gUnknown_Debug_03004BC0[4]; // unknown type +#endif void npc_clear_ids_and_state(struct MapObject *mapObj) { diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 61774f816..7922bf69d 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -289,6 +289,24 @@ static void sub_80A6618(u8); const struct YesNoFuncTable gUnknown_083C16FC = {sub_80A65AC, sub_80A6618}; +#if DEBUG +const struct {u16 item; u8 unk;} gUnknown_Debug_083EBC68[12+48] = +{ + {ITEM_POKE_BALL, 10}, + {ITEM_ULTRA_BALL, 15}, + {ITEM_GREAT_BALL, 20}, + {ITEM_MASTER_BALL, 25}, + {ITEM_ACRO_BIKE, 1 }, + {ITEM_OLD_ROD, 1 }, + {ITEM_GOOD_ROD, 1 }, + {ITEM_SUPER_ROD, 1 }, + {ITEM_POKEBLOCK_CASE, 1 }, + {ITEM_WAILMER_PAIL, 1 }, + {ITEM_ITEMFINDER, 1 }, + {ITEM_NONE, 1 }, +}; +#endif + void sub_80A34E8(void); static bool8 LoadBagGraphicsMultistep(void); static void sub_80A362C(void); diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 51bd9bb35..144c0235a 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -1313,7 +1313,7 @@ static void PrintStoryList(void) Menu_PrintText(gPCText_Cancel, 1, 2 + i * 2); } -u8 gUnknown_03000748; +static u8 gUnknown_03000748; static void Task_StoryListMenu(u8 taskId) { @@ -1392,3 +1392,198 @@ bool8 ScrSpecial_StorytellerInitializeRandomStat(void) { return StorytellerInitializeRandomStat(); } + +#if DEBUG +__attribute__((naked)) +void This_is_not_HandleReadMail() +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " add r6, r1, #0\n" + " lsl r2, r2, #0x18\n" + " lsr r5, r2, #0x18\n" + " ldr r0, .__3\n" + " ldrb r3, [r0]\n" + " cmp r3, #0\n" + " beq .__1 @cond_branch\n" + " ldr r2, .__3 + 4\n" + " add r1, r2, #0\n" + " add r1, r1, #0xff\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r0, .__3 + 8\n" + " ldrh r1, [r0]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x1\n" + " add r0, r2, r3\n" + " strb r1, [r0]\n" + " mov r0, #0x82\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, .__3 + 12\n" + " str r0, [r1]\n" + " add r3, r3, #0x8\n" + " add r1, r2, r3\n" + " ldr r0, .__3 + 16\n" + " str r0, [r1]\n" + " ldr r0, .__3 + 20\n" + " ldrh r1, [r0]\n" + " b .__2\n" + ".__4:\n" + " .align 2, 0\n" + ".__3:\n" + " .word gUnknown_03000748+0x4\n" + " .word +0x2000000\n" + " .word gSpecialVar_0x8004\n" + " .word EasyChat_GetWordText+1\n" + " .word ConvertEasyChatWordsToString+1\n" + " .word gSpecialVar_0x8006\n" + ".__1:\n" + " ldr r2, .__7\n" + " add r1, r2, #0\n" + " add r1, r1, #0xff\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " add r0, r0, #0xfb\n" + " add r1, r2, r0\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x82\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, .__7 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x84\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, .__7 + 8\n" + " str r0, [r1]\n" + " ldrh r1, [r4, #0x20]\n" + " add r0, r1, #0\n" + " sub r0, r0, #0x79\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bhi .__5 @cond_branch\n" + " sub r1, r1, #0x79\n" + ".__2:\n" + " add r0, r2, #0\n" + " add r0, r0, #0xfa\n" + " strb r1, [r0]\n" + " b .__6\n" + ".__8:\n" + " .align 2, 0\n" + ".__7:\n" + " .word +0x2000000\n" + " .word EasyChat_GetWordText+1\n" + " .word ConvertEasyChatWordsToString+1\n" + ".__5:\n" + " add r0, r2, #0\n" + " add r0, r0, #0xfa\n" + " strb r3, [r0]\n" + " mov r5, #0x0\n" + ".__6:\n" + " ldr r1, .__12\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq .__9 @cond_branch\n" + " cmp r0, #0x1\n" + " beq .__10 @cond_branch\n" + ".__9:\n" + " mov r3, #0x86\n" + " lsl r3, r3, #0x1\n" + " add r2, r1, r3\n" + " add r0, r1, #0\n" + " add r0, r0, #0xfa\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, .__12 + 4\n" + " b .__11\n" + ".__13:\n" + " .align 2, 0\n" + ".__12:\n" + " .word +0x2000000\n" + " .word gUnknown_083E5730\n" + ".__10:\n" + " mov r0, #0x86\n" + " lsl r0, r0, #0x1\n" + " add r2, r1, r0\n" + " add r0, r1, #0\n" + " add r0, r0, #0xfa\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, .__18\n" + ".__11:\n" + " add r0, r0, r1\n" + " str r0, [r2]\n" + " ldrh r0, [r4, #0x1e]\n" + " mov r1, sp\n" + " bl MailSpeciesToSpecies\n" + " lsl r0, r0, #0x10\n" + " ldr r1, .__18 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xcd\n" + " lsl r1, r1, #0x11\n" + " cmp r0, r1\n" + " bhi .__14 @cond_branch\n" + " ldr r0, .__18 + 8\n" + " add r1, r0, #0\n" + " add r1, r1, #0xfa\n" + " ldrb r2, [r1]\n" + " add r1, r0, #0\n" + " cmp r2, #0x6\n" + " beq .__15 @cond_branch\n" + " cmp r2, #0x9\n" + " beq .__16 @cond_branch\n" + " b .__17\n" + ".__19:\n" + " .align 2, 0\n" + ".__18:\n" + " .word gUnknown_083E57A4\n" + " .word 0xffff0000\n" + " .word +0x2000000\n" + ".__15:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x1\n" + " b .__21\n" + ".__16:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x2\n" + " b .__21\n" + ".__14:\n" + " ldr r1, .__22\n" + ".__17:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x0\n" + ".__21:\n" + " strb r0, [r2]\n" + " add r0, r1, #0\n" + " add r0, r0, #0xf4\n" + " str r4, [r0]\n" + " sub r0, r0, #0x8\n" + " str r6, [r0]\n" + " add r0, r0, #0xc\n" + " strb r5, [r0]\n" + " ldr r0, .__22 + 4\n" + " bl SetMainCallback2\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + ".__23:\n" + " .align 2, 0\n" + ".__22:\n" + " .word +0x2000000\n" + " .word sub_80F8D50+1\n" + "\n" + ); +} +#endif diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 565a9861b..6e03958e6 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -68,6 +68,11 @@ struct MailGraphics u16 color12; }; +#if DEBUG +// should be static +__attribute__((section(".bss"))) u8 unk_debug_bss_2; +#endif + const u16 gUnknown_083E562C[][2] = { {0x6ACD, 0x51A5}, @@ -322,205 +327,6 @@ static void sub_80F8F58(void); static void sub_80F8F78(void); static void sub_80F8FB4(void); - -#if DEBUG - -// should be static -__attribute__((section(".bss"))) u8 unk_debug_bss_2; - -__attribute__((naked)) -void HandleReadMail(struct MailStruct *aStruct, MainCallback callback, bool8 bool81) -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " add r6, r1, #0\n" - " lsl r2, r2, #0x18\n" - " lsr r5, r2, #0x18\n" - " ldr r0, ._3\n" - " ldrb r3, [r0]\n" - " cmp r3, #0\n" - " beq ._1 @cond_branch\n" - " ldr r2, ._3 + 4\n" - " add r1, r2, #0\n" - " add r1, r1, #0xff\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r0, ._3 + 8\n" - " ldrh r1, [r0]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x1\n" - " add r0, r2, r3\n" - " strb r1, [r0]\n" - " mov r0, #0x82\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, ._3 + 12\n" - " str r0, [r1]\n" - " add r3, r3, #0x8\n" - " add r1, r2, r3\n" - " ldr r0, ._3 + 16\n" - " str r0, [r1]\n" - " ldr r0, ._3 + 20\n" - " ldrh r1, [r0]\n" - " b ._2\n" - "._4:\n" - " .align 2, 0\n" - "._3:\n" - " .word gUnknown_03000748+0x4\n" - " .word +0x2000000\n" - " .word gSpecialVar_0x8004\n" - " .word EasyChat_GetWordText+1\n" - " .word ConvertEasyChatWordsToString+1\n" - " .word gSpecialVar_0x8006\n" - "._1:\n" - " ldr r2, ._7\n" - " add r1, r2, #0\n" - " add r1, r1, #0xff\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " add r0, r0, #0xfb\n" - " add r1, r2, r0\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x82\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, ._7 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x84\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, ._7 + 8\n" - " str r0, [r1]\n" - " ldrh r1, [r4, #0x20]\n" - " add r0, r1, #0\n" - " sub r0, r0, #0x79\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0xb\n" - " bhi ._5 @cond_branch\n" - " sub r1, r1, #0x79\n" - "._2:\n" - " add r0, r2, #0\n" - " add r0, r0, #0xfa\n" - " strb r1, [r0]\n" - " b ._6\n" - "._8:\n" - " .align 2, 0\n" - "._7:\n" - " .word +0x2000000\n" - " .word EasyChat_GetWordText+1\n" - " .word ConvertEasyChatWordsToString+1\n" - "._5:\n" - " add r0, r2, #0\n" - " add r0, r0, #0xfa\n" - " strb r3, [r0]\n" - " mov r5, #0x0\n" - "._6:\n" - " ldr r1, ._12\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r0, r1, r2\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._9 @cond_branch\n" - " cmp r0, #0x1\n" - " beq ._10 @cond_branch\n" - "._9:\n" - " mov r3, #0x86\n" - " lsl r3, r3, #0x1\n" - " add r2, r1, r3\n" - " add r0, r1, #0\n" - " add r0, r0, #0xfa\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, ._12 + 4\n" - " b ._11\n" - "._13:\n" - " .align 2, 0\n" - "._12:\n" - " .word +0x2000000\n" - " .word gUnknown_083E5730\n" - "._10:\n" - " mov r0, #0x86\n" - " lsl r0, r0, #0x1\n" - " add r2, r1, r0\n" - " add r0, r1, #0\n" - " add r0, r0, #0xfa\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, ._18\n" - "._11:\n" - " add r0, r0, r1\n" - " str r0, [r2]\n" - " ldrh r0, [r4, #0x1e]\n" - " mov r1, sp\n" - " bl MailSpeciesToSpecies\n" - " lsl r0, r0, #0x10\n" - " ldr r1, ._18 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xcd\n" - " lsl r1, r1, #0x11\n" - " cmp r0, r1\n" - " bhi ._14 @cond_branch\n" - " ldr r0, ._18 + 8\n" - " add r1, r0, #0\n" - " add r1, r1, #0xfa\n" - " ldrb r2, [r1]\n" - " add r1, r0, #0\n" - " cmp r2, #0x6\n" - " beq ._15 @cond_branch\n" - " cmp r2, #0x9\n" - " beq ._16 @cond_branch\n" - " b ._17\n" - "._19:\n" - " .align 2, 0\n" - "._18:\n" - " .word gUnknown_083E57A4\n" - " .word 0xffff0000\n" - " .word +0x2000000\n" - "._15:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x1\n" - " b ._21\n" - "._16:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x2\n" - " b ._21\n" - "._14:\n" - " ldr r1, ._22\n" - "._17:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x0\n" - "._21:\n" - " strb r0, [r2]\n" - " add r0, r1, #0\n" - " add r0, r0, #0xf4\n" - " str r4, [r0]\n" - " sub r0, r0, #0x8\n" - " str r6, [r0]\n" - " add r0, r0, #0xc\n" - " strb r5, [r0]\n" - " ldr r0, ._22 + 4\n" - " bl SetMainCallback2\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._23:\n" - " .align 2, 0\n" - "._22:\n" - " .word +0x2000000\n" - " .word sub_80F8D50+1\n" - "\n" - ); -} -#else void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { u16 mailDesign; @@ -584,7 +390,6 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) SetMainCallback2(sub_80F8D50); } -#endif #define RETURN_UP_STATE break #define RETURN_SKIP_STATE return FALSE diff --git a/sym_bss.txt b/sym_bss.txt index bc2ae107c..d09270756 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -36,6 +36,7 @@ unk_debug_bss_3: .include "src/easy_chat_2.o" .include "src/pokenav_before.o" .include "src/field/mauville_man.o" + .include "src/pokemon/mail.o" .include "src/field/menu_helpers.o" .include "src/field/slot_machine.o" .include "src/scene/contest_painting.o" diff --git a/sym_common.txt b/sym_common.txt index e31dd104b..7844c799b 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -150,9 +150,23 @@ gUnknown_03004AE4: @ 3004AE4 .space 0x4 .include "field/start_menu.o" + +@ debug start menu +gUnknown_Debug_03004BD0: + .space 0x4 + .include "engine/sound.o" .include "battle/battle_anim.o" .include "engine/task.o" + +@ debug stuff (possibly part of mori_debug_menu?) +unk_debug_common_1: + .space 0x4 +unk_3004E94: + .space 0x4 +unk_3004E98: + .space 0x8 + .include "debug/mori_debug_menu.o" @ unknown_task @@ -184,6 +198,11 @@ gCurrentBagPocketItemSlots: @ 3005D24 gUnknown_03005D28: @ 3005D28 .space 0x4 +@ debug stuff +unk_debug_common_0: + .space 0x4 + .include "debug/watanabe_debug_menu.o" + .include "engine/record_mixing.o" .include "debug/sound_check_menu.o" .include "field/tv.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index e3ccb6283..ab59fe5a7 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -32,6 +32,12 @@ gUnknown_02023A04: @ 2023A04 gUnknown_02023A14: @ 2023A14 .space 0x4C +@ debug stuff - probably not correct and should be part of gBattleBufferA +gUnknown_02023A14_4C: + .space 0x4 +gUnknown_02023A14_50: + .space 0x290 + gBattleBufferA: @ 2023A60 .space 0x2 @@ -362,6 +368,14 @@ gUnknown_0203847F: @ 203847F gUnknown_02038480: @ 2038480 .space 0x64 +@ debug stuff +unk_2038790: + .space 0x4 +unk_2038794: + .space 0x4 +unk_2038798: + .space 0x4 + gUnknown_020384E4: @ 20384E4 .space 0x1 -- cgit v1.2.3 From 8a21a49a35d91ba9b07ac5027a0560ddf1f4ad25 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 21:04:48 -0600 Subject: add some debug changes that I missed --- Makefile | 2 +- asm/battle_1.s | 72 + src/battle/battle_2.c | 19 +- src/battle/battle_util.c | 4473 ++++++++++++++++++++++++++++++++++++++++++++++ src/engine/link.c | 22 +- 5 files changed, 4576 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8e2e503ab..9a5303dad 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ tidy: $(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map}) $(RM) -r build -%.gba: %.elf +$(ROM): %.gba: %.elf $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ %.elf: $(LD_SCRIPT) $(ALL_OBJECTS) diff --git a/asm/battle_1.s b/asm/battle_1.s index 980bd6a65..24553e020 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -794,6 +794,77 @@ _0800DAB0: .4byte 0x0600d000 _0800DAB4: .4byte gBattleTerrainPalette_BattleTower thumb_func_end DrawMainBattleBackground +.if DEBUG + thumb_func_start sub_800DAB8 +sub_800DAB8: +.syntax divided + push {r4, r5, lr} + add sp, sp, #0xfffffffc + ldr r0, ._113 + mov r1, #0xc0 + lsl r1, r1, #0x13 + bl LZDecompressVram + ldr r0, ._113 + 4 + ldr r4, ._113 + 8 + mov r2, #0x80 + lsl r2, r2, #0x4 + add r1, r4, #0 + bl gMysteryEventScriptCmdTableEnd+0x3cb4 @ uh, what? + ldr r0, ._113 + 12 + mov r1, #0x0 + mov r2, #0x40 + bl LoadCompressedPalette + bl sub_800D74C + bl DrawMainBattleBackground + ldr r0, ._113 + 16 + ldrh r1, [r0] + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._112 @cond_branch + ldr r0, ._113 + 20 + mov r1, #0x0 + add r2, r4, #0 + mov r3, #0x1 + bl debug_sub_8008218 + ldr r5, ._113 + 24 + mov r4, #0x1 + str r4, [sp] + add r0, r5, #0 + mov r1, #0x3 + mov r2, #0x1 + mov r3, #0x3 + bl debug_sub_8008264 + str r4, [sp] + add r0, r5, #0 + mov r1, #0x3 + mov r2, #0x15 + mov r3, #0x3 + bl debug_sub_8008264 + str r4, [sp] + add r0, r5, #0 + mov r1, #0x3 + mov r2, #0x29 + mov r3, #0x3 + bl debug_sub_8008264 +._112: + add sp, sp, #0x4 + pop {r4, r5} + pop {r0} + bx r0 +._114: + .align 2, 0 +._113: + .word gUnknown_08D00000 + .word gUnknown_08D00524 + .word 0x600c000 + .word gUnknown_08D004E0 + .word gBattleTypeFlags + .word 0x6000600 + .word 0x101 +.syntax unified + thumb_func_end sub_800DAB8 +.else thumb_func_start sub_800DAB8 sub_800DAB8: @ 800DAB8 push {lr} @@ -820,6 +891,7 @@ _0800DAEC: .4byte gUnknown_08D00524 _0800DAF0: .4byte 0x0600c000 _0800DAF4: .4byte gUnknown_08D004E0 thumb_func_end sub_800DAB8 +.endif thumb_func_start sub_800DAF8 sub_800DAF8: @ 800DAF8 diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 6d2045604..696f1fde0 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -9141,17 +9141,7 @@ void debug_sub_80139E4() "\n" ); } -#endif - -void sub_8010824(void) -{ - gBattleMainFunc(); - for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) - gBattleBankFunc[gActiveBank](); -} - -#if DEBUG __attribute__((naked)) void sub_8010874() { @@ -9525,6 +9515,15 @@ void sub_8010874() ); } #else + +void sub_8010824(void) +{ + gBattleMainFunc(); + + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + gBattleBankFunc[gActiveBank](); +} + void sub_8010874(void) { s32 i; diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index f93664593..3bb99f845 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -1683,6 +1683,4066 @@ u8 CastformDataTypeChange(u8 bank) return formChange; } +#if DEBUG +__attribute__((naked)) +u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, sl\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5, r6, r7}\n\ + add sp, sp, #0xffffffd8\n\ + ldr r4, [sp, #0x48]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + str r0, [sp, #0x4]\n\ + lsl r1, r1, #0x18\n\ + lsr r1, r1, #0x18\n\ + mov sl, r1\n\ + lsl r2, r2, #0x18\n\ + lsr r6, r2, #0x18\n\ + lsl r3, r3, #0x18\n\ + lsr r3, r3, #0x18\n\ + mov r8, r3\n\ + lsl r4, r4, #0x10\n\ + lsr r4, r4, #0x10\n\ + mov r0, #0x0\n\ + mov r9, r0\n\ + ldr r5, ._718\n\ + ldr r1, ._718 + 4\n\ + ldrb r0, [r5]\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc ._715 @cond_branch\n\ + mov r1, sl\n\ + strb r1, [r5]\n\ +._715:\n\ + ldrb r0, [r5]\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._716 @cond_branch\n\ + ldr r1, ._718 + 8\n\ + ldrb r0, [r5]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + mov r0, #0x64\n\ + mul r1, r1, r0\n\ + ldr r0, ._718 + 12\n\ + b ._717\n\ +._719:\n\ + .align 2, 0\n\ +._718:\n\ + .word gBankAttacker\n\ + .word gNoOfAllBanks\n\ + .word gBattlePartyID\n\ + .word gPlayerParty\n\ +._716:\n\ + ldr r1, ._723\n\ + ldrb r0, [r5]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + mov r0, #0x64\n\ + mul r1, r1, r0\n\ + ldr r0, ._723 + 4\n\ +._717:\n\ + add r7, r1, r0\n\ + ldr r5, ._723 + 8\n\ + ldr r1, ._723 + 12\n\ + ldrb r0, [r5]\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc ._720 @cond_branch\n\ + mov r2, sl\n\ + strb r2, [r5]\n\ +._720:\n\ + ldrb r0, [r5]\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._721 @cond_branch\n\ + ldr r1, ._723\n\ + ldrb r0, [r5]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + mov r0, #0x64\n\ + mul r1, r1, r0\n\ + ldr r0, ._723 + 16\n\ + b ._722\n\ +._724:\n\ + .align 2, 0\n\ +._723:\n\ + .word gBattlePartyID\n\ + .word gEnemyParty\n\ + .word gBankTarget\n\ + .word gNoOfAllBanks\n\ + .word gPlayerParty\n\ +._721:\n\ + ldr r1, ._729\n\ + ldrb r0, [r5]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + mov r0, #0x64\n\ + mul r1, r1, r0\n\ + ldr r0, ._729 + 4\n\ +._722:\n\ + add r5, r1, r0\n\ + add r0, r7, #0\n\ + mov r1, #0xb\n\ + bl GetMonData\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + str r0, [sp, #0x8]\n\ + add r0, r7, #0\n\ + mov r1, #0x0\n\ + bl GetMonData\n\ + str r0, [sp, #0x10]\n\ + add r0, r5, #0\n\ + mov r1, #0xb\n\ + bl GetMonData\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + str r0, [sp, #0xc]\n\ + add r0, r5, #0\n\ + mov r1, #0x0\n\ + bl GetMonData\n\ + str r0, [sp, #0x14]\n\ + ldr r0, ._729 + 8\n\ + ldrh r1, [r0]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._725 @cond_branch\n\ + bl ._1540\n\ +._725:\n\ + mov r3, r8\n\ + cmp r3, #0\n\ + beq ._727 @cond_branch\n\ + ldr r0, ._729 + 12\n\ + strb r3, [r0]\n\ + mov r8, r0\n\ + b ._728\n\ +._730:\n\ + .align 2, 0\n\ +._729:\n\ + .word gBattlePartyID\n\ + .word gEnemyParty\n\ + .word gBattleTypeFlags\n\ + .word gLastUsedAbility\n\ +._727:\n\ + ldr r2, ._733\n\ + ldr r1, ._733 + 4\n\ + mov r0, #0x58\n\ + mov r5, sl\n\ + mul r5, r5, r0\n\ + add r0, r5, #0\n\ + add r0, r0, r1\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + strb r0, [r2]\n\ + mov r8, r2\n\ +._728:\n\ + cmp r4, #0\n\ + beq ._731 @cond_branch\n\ + add r3, r4, #0\n\ + b ._732\n\ +._734:\n\ + .align 2, 0\n\ +._733:\n\ + .word gLastUsedAbility\n\ + .word gBattleMons\n\ +._731:\n\ + ldr r0, ._737\n\ + ldrh r3, [r0]\n\ +._732:\n\ + ldr r1, ._737 + 4\n\ + ldr r2, ._737 + 8\n\ + add r0, r1, r2\n\ + ldrb r0, [r0]\n\ + add r7, r1, #0\n\ + cmp r0, #0\n\ + beq ._735 @cond_branch\n\ + mov r4, #0x3f\n\ + and r4, r4, r0\n\ + b ._736\n\ +._738:\n\ + .align 2, 0\n\ +._737:\n\ + .word gCurrentMove\n\ + .word +0x2000000\n\ + .word 0x1601c\n\ +._735:\n\ + ldr r1, ._741\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r4, [r0, #0x2]\n\ +._736:\n\ + ldr r5, [sp, #0x4]\n\ + cmp r5, #0x13\n\ + bls ._739 @cond_branch\n\ + bl ._1534\n\ +._739:\n\ + lsl r0, r5, #0x2\n\ + ldr r1, ._741 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._742:\n\ + .align 2, 0\n\ +._741:\n\ + .word gBattleMoves\n\ + .word ._743\n\ +._743:\n\ + .word ._744\n\ + .word ._745\n\ + .word ._746\n\ + .word ._747\n\ + .word ._748\n\ + .word ._749\n\ + .word ._750\n\ + .word ._751\n\ + .word ._752\n\ + .word ._753\n\ + .word ._754\n\ + .word ._755\n\ + .word ._756\n\ + .word ._757\n\ + .word ._758\n\ + .word ._759\n\ + .word ._760\n\ + .word ._761\n\ + .word ._762\n\ + .word ._763\n\ +._744:\n\ + ldr r2, ._774\n\ + ldr r0, ._774 + 4\n\ + ldrb r1, [r2]\n\ + add r5, r0, #0\n\ + ldrb r0, [r5]\n\ + cmp r1, r0\n\ + bcc ._764 @cond_branch\n\ + mov r1, sl\n\ + strb r1, [r2]\n\ +._764:\n\ + mov r2, r8\n\ + ldrb r0, [r2]\n\ + cmp r0, #0x2d\n\ + bne ._765 @cond_branch\n\ + b ._766\n\ +._765:\n\ + cmp r0, #0x2d\n\ + bgt ._767 @cond_branch\n\ + cmp r0, #0xd\n\ + bne ._768 @cond_branch\n\ + b ._788\n\ +._768:\n\ + cmp r0, #0xd\n\ + bgt ._770 @cond_branch\n\ + cmp r0, #0x2\n\ + bne ._771 @cond_branch\n\ + b ._772\n\ +._771:\n\ + bl ._1534\n\ +._775:\n\ + .align 2, 0\n\ +._774:\n\ + .word gBankAttacker\n\ + .word gNoOfAllBanks\n\ +._770:\n\ + cmp r0, #0x16\n\ + bne ._776 @cond_branch\n\ + b ._777\n\ +._776:\n\ + cmp r0, #0x24\n\ + bne ._778 @cond_branch\n\ + b ._779\n\ +._778:\n\ + bl ._1534\n\ +._767:\n\ + cmp r0, #0x46\n\ + bne ._781 @cond_branch\n\ + b ._782\n\ +._781:\n\ + cmp r0, #0x46\n\ + bgt ._783 @cond_branch\n\ + cmp r0, #0x3b\n\ + bne ._784 @cond_branch\n\ + b ._785\n\ +._784:\n\ + bl ._1534\n\ +._783:\n\ + cmp r0, #0x4d\n\ + bne ._787 @cond_branch\n\ + b ._788\n\ +._787:\n\ + cmp r0, #0xff\n\ + beq ._789 @cond_branch\n\ + bl ._1534\n\ +._789:\n\ + bl weather_get_current\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + sub r0, r0, #0x3\n\ + cmp r0, #0xa\n\ + bhi ._814 @cond_branch\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._793\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._794:\n\ + .align 2, 0\n\ +._793:\n\ + .word ._792\n\ +._792:\n\ + .word ._805\n\ + .word ._814\n\ + .word ._805\n\ + .word ._814\n\ + .word ._814\n\ + .word ._800\n\ + .word ._814\n\ + .word ._814\n\ + .word ._814\n\ + .word ._804\n\ + .word ._805\n\ +._805:\n\ + ldr r2, ._808\n\ + ldrh r1, [r2]\n\ + mov r0, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._814 @cond_branch\n\ + mov r0, #0x5\n\ + strh r0, [r2]\n\ + ldr r0, ._808 + 4\n\ + ldr r3, ._808 + 8\n\ + add r2, r0, r3\n\ + mov r1, #0xa\n\ + b ._811\n\ +._809:\n\ + .align 2, 0\n\ +._808:\n\ + .word gBattleWeather\n\ + .word +0x2000000\n\ + .word 0x160a4\n\ +._800:\n\ + ldr r3, ._812\n\ + ldrh r1, [r3]\n\ + mov r2, #0x18\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._814 @cond_branch\n\ + strh r2, [r3]\n\ + ldr r0, ._812 + 4\n\ + ldr r3, ._812 + 8\n\ + add r2, r0, r3\n\ + mov r1, #0xc\n\ + b ._811\n\ +._813:\n\ + .align 2, 0\n\ +._812:\n\ + .word gBattleWeather\n\ + .word +0x2000000\n\ + .word 0x160a4\n\ +._804:\n\ + ldr r3, ._818\n\ + ldrh r1, [r3]\n\ + mov r2, #0x60\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._814 @cond_branch\n\ + strh r2, [r3]\n\ + ldr r0, ._818 + 4\n\ + ldr r3, ._818 + 8\n\ + add r2, r0, r3\n\ + mov r1, #0xb\n\ +._811:\n\ + strb r1, [r2]\n\ + ldr r5, ._818 + 12\n\ + add r0, r0, r5\n\ + mov r1, sl\n\ + strb r1, [r0]\n\ + mov r0, r9\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._814:\n\ + mov r2, r9\n\ + cmp r2, #0\n\ + bne ._815 @cond_branch\n\ + bl ._1540\n\ +._815:\n\ + bl weather_get_current\n\ + ldr r1, ._818 + 16\n\ + strb r0, [r1, #0x5]\n\ + ldr r0, ._818 + 20\n\ + bl BattleScriptPushCursorAndCallback\n\ + bl ._1534\n\ +._819:\n\ + .align 2, 0\n\ +._818:\n\ + .word gBattleWeather\n\ + .word +0x2000000\n\ + .word 0x160a4\n\ + .word 0x16003\n\ + .word gBattleCommunication\n\ + .word BattleScript_OverworldWeatherStarts\n\ +._772:\n\ + ldr r2, ._823\n\ + ldrh r1, [r2]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._820 @cond_branch\n\ + bl ._1534\n\ +._820:\n\ + mov r0, #0x5\n\ + strh r0, [r2]\n\ + ldr r0, ._823 + 4\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r0, ._823 + 8\n\ + ldr r3, ._823 + 12\n\ + add r0, r0, r3\n\ + mov r5, sl\n\ + strb r5, [r0]\n\ + bl ._1392\n\ +._824:\n\ + .align 2, 0\n\ +._823:\n\ + .word gBattleWeather\n\ + .word BattleScript_DrizzleActivates\n\ + .word +0x2000000\n\ + .word 0x16003\n\ +._766:\n\ + ldr r2, ._828\n\ + ldrh r1, [r2]\n\ + mov r0, #0x10\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._825 @cond_branch\n\ + bl ._1534\n\ +._825:\n\ + mov r0, #0x18\n\ + strh r0, [r2]\n\ + ldr r0, ._828 + 4\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r0, ._828 + 8\n\ + ldr r1, ._828 + 12\n\ + add r0, r0, r1\n\ + mov r2, sl\n\ + strb r2, [r0]\n\ + bl ._1392\n\ +._829:\n\ + .align 2, 0\n\ +._828:\n\ + .word gBattleWeather\n\ + .word BattleScript_SandstreamActivates\n\ + .word +0x2000000\n\ + .word 0x16003\n\ +._782:\n\ + ldr r2, ._833\n\ + ldrh r1, [r2]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._830 @cond_branch\n\ + bl ._1534\n\ +._830:\n\ + mov r0, #0x60\n\ + strh r0, [r2]\n\ + ldr r0, ._833 + 4\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r0, ._833 + 8\n\ + ldr r3, ._833 + 12\n\ + add r0, r0, r3\n\ + mov r5, sl\n\ + strb r5, [r0]\n\ + bl ._1392\n\ +._834:\n\ + .align 2, 0\n\ +._833:\n\ + .word gBattleWeather\n\ + .word BattleScript_DroughtActivates\n\ + .word +0x2000000\n\ + .word 0x16003\n\ +._777:\n\ + ldr r0, ._838\n\ + mov r1, sl\n\ + lsl r2, r1, #0x2\n\ + add r1, r2, r1\n\ + lsl r1, r1, #0x2\n\ + add r3, r1, r0\n\ + ldrb r0, [r3]\n\ + lsl r0, r0, #0x1c\n\ + cmp r0, #0\n\ + bge ._835 @cond_branch\n\ + bl ._1534\n\ +._835:\n\ + ldr r1, ._838 + 4\n\ + add r1, r2, r1\n\ + ldr r0, [r1]\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0xc\n\ + orr r0, r0, r2\n\ + str r0, [r1]\n\ + ldrb r0, [r3]\n\ + mov r1, #0x8\n\ + b ._837\n\ +._839:\n\ + .align 2, 0\n\ +._838:\n\ + .word gSpecialStatuses\n\ + .word gStatuses3\n\ +._785:\n\ + mov r0, sl\n\ + bl CastformDataTypeChange\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ + cmp r0, #0\n\ + bne ._840 @cond_branch\n\ + bl ._1540\n\ +._840:\n\ + ldr r0, ._843\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r0, ._843 + 4\n\ + ldr r2, ._843 + 8\n\ + add r1, r0, r2\n\ + mov r3, sl\n\ + strb r3, [r1]\n\ + mov r1, r9\n\ + sub r1, r1, #0x1\n\ + ldr r5, ._843 + 12\n\ + add r0, r0, r5\n\ + strb r1, [r0]\n\ + bl ._1534\n\ +._844:\n\ + .align 2, 0\n\ +._843:\n\ + .word BattleScript_CastformChange\n\ + .word +0x2000000\n\ + .word 0x16003\n\ + .word 0x1609b\n\ +._779:\n\ + ldr r0, ._848\n\ + mov r1, sl\n\ + lsl r2, r1, #0x2\n\ + add r1, r2, r1\n\ + lsl r1, r1, #0x2\n\ + add r3, r1, r0\n\ + ldrb r0, [r3]\n\ + lsl r0, r0, #0x1b\n\ + cmp r0, #0\n\ + bge ._845 @cond_branch\n\ + bl ._1534\n\ +._845:\n\ + ldr r1, ._848 + 4\n\ + add r1, r2, r1\n\ + ldr r0, [r1]\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0xd\n\ + orr r0, r0, r2\n\ + str r0, [r1]\n\ + ldrb r0, [r3]\n\ + mov r1, #0x10\n\ +._837:\n\ + orr r0, r0, r1\n\ + strb r0, [r3]\n\ + bl ._1534\n\ +._849:\n\ + .align 2, 0\n\ +._848:\n\ + .word gSpecialStatuses\n\ + .word gStatuses3\n\ +._788:\n\ + mov r6, #0x0\n\ + ldrb r5, [r5]\n\ + cmp r6, r5\n\ + bcc ._854 @cond_branch\n\ + bl ._1534\n\ +._854:\n\ + add r0, r6, #0\n\ + bl CastformDataTypeChange\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ + cmp r0, #0\n\ + beq ._852 @cond_branch\n\ + bl ._853\n\ +._852:\n\ + add r0, r6, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ + ldr r0, ._856\n\ + ldrb r0, [r0]\n\ + cmp r6, r0\n\ + bcc ._854 @cond_branch\n\ + bl ._1534\n\ +._857:\n\ + .align 2, 0\n\ +._856:\n\ + .word gNoOfAllBanks\n\ +._745:\n\ + ldr r2, ._865\n\ + mov r0, #0x58\n\ + mov r1, sl\n\ + mul r1, r1, r0\n\ + add r4, r1, r2\n\ + ldrh r0, [r4, #0x28]\n\ + cmp r0, #0\n\ + bne ._858 @cond_branch\n\ + bl ._1534\n\ +._858:\n\ + ldr r0, ._865 + 4\n\ + mov r3, sl\n\ + strb r3, [r0]\n\ + mov r3, r8\n\ + ldrb r5, [r3]\n\ + cmp r5, #0x2c\n\ + beq ._860 @cond_branch\n\ + cmp r5, #0x2c\n\ + bgt ._861 @cond_branch\n\ + cmp r5, #0x3\n\ + bne ._862 @cond_branch\n\ + b ._863\n\ +._862:\n\ + bl ._1534\n\ +._866:\n\ + .align 2, 0\n\ +._865:\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ +._861:\n\ + cmp r5, #0x36\n\ + bne ._867 @cond_branch\n\ + b ._868\n\ +._867:\n\ + cmp r5, #0x3d\n\ + beq ._869 @cond_branch\n\ + bl ._1534\n\ +._860:\n\ + mov r0, #0x0\n\ + str r0, [sp]\n\ + mov r0, #0x13\n\ + mov r1, #0x0\n\ + mov r2, #0xd\n\ + mov r3, #0x0\n\ + bl AbilityBattleEffects\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._871 @cond_branch\n\ + bl ._1534\n\ +._871:\n\ + str r0, [sp]\n\ + mov r0, #0x13\n\ + mov r1, #0x0\n\ + mov r2, #0x4d\n\ + mov r3, #0x0\n\ + bl AbilityBattleEffects\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._873 @cond_branch\n\ + bl ._1534\n\ +._873:\n\ + ldr r0, ._881\n\ + ldrh r1, [r0]\n\ + mov r0, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._875 @cond_branch\n\ + bl ._1534\n\ +._875:\n\ + ldrh r0, [r4, #0x2c]\n\ + ldrh r1, [r4, #0x28]\n\ + cmp r0, r1\n\ + bhi ._877 @cond_branch\n\ + bl ._1534\n\ +._877:\n\ + mov r2, r8\n\ + strb r5, [r2]\n\ + ldr r0, ._881 + 4\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r1, ._881 + 8\n\ + ldrh r0, [r4, #0x2c]\n\ + lsr r0, r0, #0x4\n\ + str r0, [r1]\n\ + cmp r0, #0\n\ + bne ._879 @cond_branch\n\ + mov r0, #0x1\n\ + str r0, [r1]\n\ +._879:\n\ + ldr r0, [r1]\n\ + neg r0, r0\n\ + str r0, [r1]\n\ + bl ._1392\n\ +._882:\n\ + .align 2, 0\n\ +._881:\n\ + .word gBattleWeather\n\ + .word BattleScript_RainDishActivates\n\ + .word gBattleMoveDamage\n\ +._869:\n\ + add r0, r2, #0\n\ + add r0, r0, #0x4c\n\ + add r5, r1, r0\n\ + ldrb r0, [r5]\n\ + cmp r0, #0\n\ + bne ._883 @cond_branch\n\ + bl ._1534\n\ +._883:\n\ + bl Random\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + mov r1, #0x3\n\ + bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + lsl r0, r0, #0x10\n\ + lsr r4, r0, #0x10\n\ + cmp r4, #0\n\ + beq ._885 @cond_branch\n\ + bl ._1534\n\ +._885:\n\ + ldr r0, [r5]\n\ + mov r1, #0x88\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._887 @cond_branch\n\ + ldr r0, ._893\n\ + ldr r1, ._893 + 4\n\ + bl StringCopy\n\ +._887:\n\ + ldr r0, [r5]\n\ + mov r1, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._888 @cond_branch\n\ + ldr r0, ._893\n\ + ldr r1, ._893 + 8\n\ + bl StringCopy\n\ +._888:\n\ + ldr r0, [r5]\n\ + mov r1, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._889 @cond_branch\n\ + ldr r0, ._893\n\ + ldr r1, ._893 + 12\n\ + bl StringCopy\n\ +._889:\n\ + ldr r0, [r5]\n\ + mov r1, #0x10\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._890 @cond_branch\n\ + ldr r0, ._893\n\ + ldr r1, ._893 + 16\n\ + bl StringCopy\n\ +._890:\n\ + ldr r0, [r5]\n\ + mov r1, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._891 @cond_branch\n\ + ldr r0, ._893\n\ + ldr r1, ._893 + 20\n\ + bl StringCopy\n\ +._891:\n\ + str r4, [r5]\n\ + ldr r0, ._893 + 24\n\ + ldr r4, ._893 + 28\n\ + mov r3, sl\n\ + strb r3, [r4]\n\ + ldr r1, ._893 + 32\n\ + add r0, r0, r1\n\ + strb r3, [r0]\n\ + ldr r0, ._893 + 36\n\ + bl BattleScriptPushCursorAndCallback\n\ + str r5, [sp]\n\ + mov r0, #0x0\n\ + mov r1, #0x28\n\ + mov r2, #0x0\n\ + mov r3, #0x4\n\ + bl EmitSetMonData\n\ + ldrb r0, [r4]\n\ + bl MarkBufferBankForExecution\n\ + bl ._1392\n\ +._894:\n\ + .align 2, 0\n\ +._893:\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_PoisonJpn\n\ + .word gStatusConditionString_SleepJpn\n\ + .word gStatusConditionString_ParalysisJpn\n\ + .word gStatusConditionString_BurnJpn\n\ + .word gStatusConditionString_IceJpn\n\ + .word +0x2000000\n\ + .word gActiveBank\n\ + .word 0x16003\n\ + .word BattleScript_ShedSkinActivates\n\ +._863:\n\ + ldrb r2, [r4, #0x1b]\n\ + mov r0, #0x1b\n\ + ldsb r0, [r4, r0]\n\ + cmp r0, #0xb\n\ + ble ._895 @cond_branch\n\ + bl ._1534\n\ +._895:\n\ + ldr r0, ._900\n\ + mov r3, sl\n\ + lsl r1, r3, #0x3\n\ + sub r1, r1, r3\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x16]\n\ + cmp r0, #0x2\n\ + bne ._897 @cond_branch\n\ + bl ._1534\n\ +._897:\n\ + add r0, r2, #1\n\ + mov r2, #0x0\n\ + strb r0, [r4, #0x1b]\n\ + ldr r5, ._900 + 4\n\ + add r1, r7, r5\n\ + mov r0, #0x11\n\ + strb r0, [r1]\n\ + ldr r1, ._900 + 8\n\ + add r0, r7, r1\n\ + strb r2, [r0]\n\ + ldr r0, ._900 + 12\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r2, ._900 + 16\n\ + add r0, r7, r2\n\ + mov r3, sl\n\ + strb r3, [r0]\n\ + bl ._1392\n\ +._901:\n\ + .align 2, 0\n\ +._900:\n\ + .word gDisableStructs\n\ + .word 0x160a4\n\ + .word 0x160a5\n\ + .word BattleScript_SpeedBoostActivates\n\ + .word 0x16003\n\ +._868:\n\ + ldr r2, ._903\n\ + ldrb r0, [r0]\n\ + lsl r1, r0, #0x3\n\ + sub r1, r1, r0\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r2\n\ + ldrb r3, [r1, #0x18]\n\ + lsl r0, r3, #0x1f\n\ + lsr r0, r0, #0x1f\n\ + mov r2, #0x1\n\ + eor r2, r2, r0\n\ + mov r0, #0x2\n\ + neg r0, r0\n\ + and r0, r0, r3\n\ + orr r0, r0, r2\n\ + strb r0, [r1, #0x18]\n\ + bl ._1534\n\ +._904:\n\ + .align 2, 0\n\ +._903:\n\ + .word gDisableStructs\n\ +._746:\n\ + mov r5, r8\n\ + ldrb r0, [r5]\n\ + cmp r0, #0x2b\n\ + beq ._905 @cond_branch\n\ + bl ._1534\n\ +._905:\n\ + mov r4, #0x0\n\ + ldr r0, ._917\n\ + ldrh r2, [r0]\n\ + ldr r5, ._917 + 4\n\ + add r1, r0, #0\n\ + cmp r2, r5\n\ + bne ._907 @cond_branch\n\ + bl ._1534\n\ +._907:\n\ + cmp r2, r3\n\ + beq ._909 @cond_branch\n\ + add r2, r1, #0\n\ +._912:\n\ + add r2, r2, #0x2\n\ + add r4, r4, #0x1\n\ + ldrh r0, [r2]\n\ + cmp r0, r5\n\ + bne ._910 @cond_branch\n\ + bl ._1534\n\ +._910:\n\ + cmp r0, r3\n\ + bne ._912 @cond_branch\n\ +._909:\n\ + lsl r0, r4, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + ldr r0, ._917 + 4\n\ + cmp r1, r0\n\ + bne ._913 @cond_branch\n\ + bl ._1534\n\ +._913:\n\ + ldr r1, ._917 + 8\n\ + ldr r0, ._917 + 12\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r1, r1, #0x50\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x5\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._915 @cond_branch\n\ + ldr r0, ._917 + 16\n\ + ldr r1, [r0]\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0x4\n\ + orr r1, r1, r2\n\ + str r1, [r0]\n\ +._915:\n\ + ldr r1, ._917 + 20\n\ + ldr r0, ._917 + 24\n\ + str r0, [r1]\n\ + mov r0, #0x1\n\ + mov r9, r0\n\ + bl ._916\n\ +._918:\n\ + .align 2, 0\n\ +._917:\n\ + .word gSoundMovesTable\n\ + .word 0xffff\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gHitMarker\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_SoundproofProtected\n\ +._747:\n\ + cmp r3, #0\n\ + bne ._919 @cond_branch\n\ + bl ._1534\n\ +._919:\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + cmp r0, #0xb\n\ + beq ._921 @cond_branch\n\ + cmp r0, #0xb\n\ + bgt ._922 @cond_branch\n\ + cmp r0, #0xa\n\ + beq ._923 @cond_branch\n\ + b ._956\n\ +._922:\n\ + cmp r0, #0x12\n\ + beq ._925 @cond_branch\n\ + b ._956\n\ +._923:\n\ + cmp r4, #0xd\n\ + beq ._927 @cond_branch\n\ + b ._956\n\ +._927:\n\ + ldr r0, ._933\n\ + lsl r1, r3, #0x1\n\ + add r1, r1, r3\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + cmp r0, #0\n\ + bne ._929 @cond_branch\n\ + b ._956\n\ +._929:\n\ + ldr r1, ._933 + 4\n\ + ldr r0, ._933 + 8\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0, #0x2]\n\ + lsl r0, r0, #0x1c\n\ + cmp r0, #0\n\ + bge ._931 @cond_branch\n\ + ldr r1, ._933 + 12\n\ + ldr r0, ._933 + 16\n\ + b ._932\n\ +._934:\n\ + .align 2, 0\n\ +._933:\n\ + .word gBattleMoves\n\ + .word gProtectStructs\n\ + .word gBankAttacker\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_MoveHPDrain\n\ +._931:\n\ + ldr r1, ._936\n\ + ldr r0, ._936 + 4\n\ +._932:\n\ + str r0, [r1]\n\ + mov r2, #0x1\n\ + b ._935\n\ +._937:\n\ + .align 2, 0\n\ +._936:\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_MoveHPDrain_PPLoss\n\ +._921:\n\ + cmp r4, #0xb\n\ + beq ._938 @cond_branch\n\ + b ._956\n\ +._938:\n\ + ldr r0, ._944\n\ + lsl r1, r3, #0x1\n\ + add r1, r1, r3\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + cmp r0, #0\n\ + bne ._940 @cond_branch\n\ + b ._956\n\ +._940:\n\ + ldr r1, ._944 + 4\n\ + ldr r0, ._944 + 8\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0, #0x2]\n\ + lsl r0, r0, #0x1c\n\ + cmp r0, #0\n\ + bge ._942 @cond_branch\n\ + ldr r1, ._944 + 12\n\ + ldr r0, ._944 + 16\n\ + b ._943\n\ +._945:\n\ + .align 2, 0\n\ +._944:\n\ + .word gBattleMoves\n\ + .word gProtectStructs\n\ + .word gBankAttacker\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_MoveHPDrain\n\ +._942:\n\ + ldr r1, ._947\n\ + ldr r0, ._947 + 4\n\ +._943:\n\ + str r0, [r1]\n\ + mov r3, #0x1\n\ + mov r9, r3\n\ + b ._956\n\ +._948:\n\ + .align 2, 0\n\ +._947:\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_MoveHPDrain_PPLoss\n\ +._925:\n\ + cmp r4, #0xa\n\ + bne ._956 @cond_branch\n\ + ldr r1, ._954\n\ + mov r0, #0x58\n\ + mov r5, sl\n\ + mul r5, r5, r0\n\ + add r0, r5, #0\n\ + add r1, r1, #0x4c\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._956 @cond_branch\n\ + ldr r2, ._954 + 4\n\ + mov r0, sl\n\ + lsl r1, r0, #0x2\n\ + add r0, r1, r2\n\ + ldr r3, [r0]\n\ + mov r4, #0x1\n\ + and r3, r3, r4\n\ + add r5, r1, #0\n\ + cmp r3, #0\n\ + bne ._951 @cond_branch\n\ + ldr r0, ._954 + 8\n\ + strb r3, [r0, #0x5]\n\ + ldr r1, ._954 + 12\n\ + ldr r0, ._954 + 16\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0, #0x2]\n\ + lsl r0, r0, #0x1c\n\ + cmp r0, #0\n\ + bge ._952 @cond_branch\n\ + ldr r1, ._954 + 20\n\ + ldr r0, ._954 + 24\n\ + b ._953\n\ +._955:\n\ + .align 2, 0\n\ +._954:\n\ + .word gBattleMons\n\ + .word +0x2017100\n\ + .word gBattleCommunication\n\ + .word gProtectStructs\n\ + .word gBankAttacker\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_FlashFireBoost\n\ +._952:\n\ + ldr r1, ._957\n\ + ldr r0, ._957 + 4\n\ +._953:\n\ + str r0, [r1]\n\ + add r0, r5, r2\n\ + ldr r1, [r0]\n\ + mov r2, #0x1\n\ + orr r1, r1, r2\n\ + str r1, [r0]\n\ + mov r1, #0x2\n\ + mov r9, r1\n\ + b ._956\n\ +._958:\n\ + .align 2, 0\n\ +._957:\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_FlashFireBoost_PPLoss\n\ +._951:\n\ + ldr r0, ._961\n\ + strb r4, [r0, #0x5]\n\ + ldr r1, ._961 + 4\n\ + ldr r0, ._961 + 8\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0, #0x2]\n\ + lsl r0, r0, #0x1c\n\ + cmp r0, #0\n\ + bge ._959 @cond_branch\n\ + ldr r1, ._961 + 12\n\ + ldr r0, ._961 + 16\n\ + b ._960\n\ +._962:\n\ + .align 2, 0\n\ +._961:\n\ + .word gBattleCommunication\n\ + .word gProtectStructs\n\ + .word gBankAttacker\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_FlashFireBoost\n\ +._959:\n\ + ldr r1, ._968\n\ + ldr r0, ._968 + 4\n\ +._960:\n\ + str r0, [r1]\n\ + mov r2, #0x2\n\ +._935:\n\ + mov r9, r2\n\ +._956:\n\ + mov r3, r9\n\ + cmp r3, #0x1\n\ + beq ._963 @cond_branch\n\ + bl ._1534\n\ +._963:\n\ + ldr r1, ._968 + 8\n\ + mov r0, #0x58\n\ + mov r5, sl\n\ + mul r5, r5, r0\n\ + add r0, r5, #0\n\ + add r1, r0, r1\n\ + ldrh r0, [r1, #0x2c]\n\ + ldrh r2, [r1, #0x28]\n\ + cmp r0, r2\n\ + bne ._965 @cond_branch\n\ + ldr r1, ._968 + 12\n\ + ldr r0, ._968 + 16\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0, #0x2]\n\ + lsl r0, r0, #0x1c\n\ + cmp r0, #0\n\ + bge ._966 @cond_branch\n\ + ldr r1, ._968\n\ + ldr r0, ._968 + 20\n\ + str r0, [r1]\n\ + bl ._1534\n\ +._969:\n\ + .align 2, 0\n\ +._968:\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_FlashFireBoost_PPLoss\n\ + .word gBattleMons\n\ + .word gProtectStructs\n\ + .word gBankAttacker\n\ + .word BattleScript_MoveHPDrain_FullHP\n\ +._966:\n\ + ldr r1, ._971\n\ + ldr r0, ._971 + 4\n\ + str r0, [r1]\n\ + bl ._1534\n\ +._972:\n\ + .align 2, 0\n\ +._971:\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_MoveHPDrain_FullHP_PPLoss\n\ +._965:\n\ + ldr r2, ._975\n\ + ldrh r0, [r1, #0x2c]\n\ + lsr r0, r0, #0x2\n\ + str r0, [r2]\n\ + cmp r0, #0\n\ + bne ._973 @cond_branch\n\ + mov r3, r9\n\ + str r3, [r2]\n\ +._973:\n\ + ldr r0, [r2]\n\ + neg r0, r0\n\ + str r0, [r2]\n\ + bl ._1534\n\ +._976:\n\ + .align 2, 0\n\ +._975:\n\ + .word gBattleMoveDamage\n\ +._748:\n\ + mov r5, r8\n\ + ldrb r0, [r5]\n\ + sub r0, r0, #0x9\n\ + cmp r0, #0x2f\n\ + bls ._977 @cond_branch\n\ + bl ._1534\n\ +._977:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._980\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._981:\n\ + .align 2, 0\n\ +._980:\n\ + .word ._979\n\ +._979:\n\ + .word ._982\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._989\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._997\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1000\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1011\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1022\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1534\n\ + .word ._1029\n\ +._989:\n\ + ldr r0, ._1046\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1030 @cond_branch\n\ + bl ._1534\n\ +._1030:\n\ + cmp r3, #0xa5\n\ + bne ._1032 @cond_branch\n\ + bl ._1534\n\ +._1032:\n\ + ldr r0, ._1046 + 4\n\ + lsl r1, r3, #0x1\n\ + add r1, r1, r3\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + cmp r0, #0\n\ + bne ._1034 @cond_branch\n\ + bl ._1534\n\ +._1034:\n\ + ldr r2, ._1046 + 8\n\ + ldr r0, ._1046 + 12\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1037 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1037 @cond_branch\n\ + bl ._1534\n\ +._1037:\n\ + ldr r1, ._1046 + 16\n\ + mov r0, #0x58\n\ + mov r2, sl\n\ + mul r2, r2, r0\n\ + add r0, r2, #0\n\ + add r1, r0, r1\n\ + add r3, r1, #0\n\ + add r3, r3, #0x21\n\ + ldrb r0, [r3]\n\ + cmp r0, r4\n\ + bne ._1039 @cond_branch\n\ + bl ._1534\n\ +._1039:\n\ + add r2, r1, #0\n\ + add r2, r2, #0x22\n\ + ldrb r0, [r2]\n\ + cmp r0, r4\n\ + bne ._1041 @cond_branch\n\ + bl ._1534\n\ +._1041:\n\ + ldrh r0, [r1, #0x28]\n\ + cmp r0, #0\n\ + bne ._1043 @cond_branch\n\ + bl ._1534\n\ +._1043:\n\ + strb r4, [r3]\n\ + strb r4, [r2]\n\ + ldr r1, ._1046 + 20\n\ + mov r0, #0xfd\n\ + strb r0, [r1]\n\ + mov r0, #0x3\n\ + strb r0, [r1, #0x1]\n\ + strb r4, [r1, #0x2]\n\ + mov r0, #0xff\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1046 + 24\n\ + ldr r0, ._1046 + 28\n\ + str r0, [r1]\n\ + bl ._1392\n\ +._1047:\n\ + .align 2, 0\n\ +._1046:\n\ + .word gBattleMoveFlags\n\ + .word gBattleMoves\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMons\n\ + .word gBattleTextBuff1\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ColorChangeActivates\n\ +._997:\n\ + ldr r0, ._1061\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1048 @cond_branch\n\ + bl ._1534\n\ +._1048:\n\ + ldr r1, ._1061 + 4\n\ + ldr r0, ._1061 + 8\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r4, r0, r1\n\ + ldrh r0, [r4, #0x28]\n\ + cmp r0, #0\n\ + bne ._1050 @cond_branch\n\ + bl ._1534\n\ +._1050:\n\ + ldr r0, ._1061 + 12\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1052 @cond_branch\n\ + bl ._1534\n\ +._1052:\n\ + ldr r2, ._1061 + 16\n\ + ldr r0, ._1061 + 20\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1055 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1055 @cond_branch\n\ + bl ._1534\n\ +._1055:\n\ + ldr r1, ._1061 + 24\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r2, #0x1\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1057 @cond_branch\n\ + bl ._1534\n\ +._1057:\n\ + ldr r1, ._1061 + 28\n\ + ldrh r0, [r4, #0x2c]\n\ + lsr r0, r0, #0x4\n\ + str r0, [r1]\n\ + cmp r0, #0\n\ + bne ._1059 @cond_branch\n\ + str r2, [r1]\n\ +._1059:\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1061 + 32\n\ + ldr r0, ._1061 + 36\n\ + str r0, [r1]\n\ + bl ._1392\n\ +._1062:\n\ + .align 2, 0\n\ +._1061:\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMoves\n\ + .word gBattleMoveDamage\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_RoughSkinActivates\n\ +._1000:\n\ + ldr r0, ._1078\n\ + ldrb r1, [r0]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1063 @cond_branch\n\ + ldr r0, ._1078 + 4\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1064 @cond_branch\n\ + bl ._1534\n\ +._1064:\n\ + ldr r1, ._1078 + 8\n\ + ldr r0, ._1078 + 12\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1066 @cond_branch\n\ + bl ._1534\n\ +._1066:\n\ + ldr r0, ._1078 + 16\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1068 @cond_branch\n\ + bl ._1534\n\ +._1068:\n\ + ldr r2, ._1078 + 20\n\ + ldr r0, ._1078 + 24\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1071 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1071 @cond_branch\n\ + bl ._1534\n\ +._1071:\n\ + ldr r1, ._1078 + 28\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1073 @cond_branch\n\ + bl ._1534\n\ +._1073:\n\ + ldr r5, ._1078 + 32\n\ + mov r4, #0x3\n\ +._1075:\n\ + bl Random\n\ + and r0, r0, r4\n\ + strb r0, [r5, #0x3]\n\ + cmp r0, #0\n\ + beq ._1075 @cond_branch\n\ + ldr r1, ._1078 + 32\n\ + ldrb r0, [r1, #0x3]\n\ + cmp r0, #0x3\n\ + bne ._1076 @cond_branch\n\ + add r0, r0, #0x2\n\ + strb r0, [r1, #0x3]\n\ +._1076:\n\ + ldrb r0, [r1, #0x3]\n\ + add r0, r0, #0x40\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1078 + 36\n\ + ldr r0, ._1078 + 40\n\ + str r0, [r1]\n\ + ldr r2, ._1078 + 44\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1079:\n\ + .align 2, 0\n\ +._1078:\n\ + .word gUnknown_02023A14+0x50\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMoves\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._1063:\n\ + ldr r0, ._1096\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1080 @cond_branch\n\ + bl ._1534\n\ +._1080:\n\ + ldr r1, ._1096 + 4\n\ + ldr r0, ._1096 + 8\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1082 @cond_branch\n\ + bl ._1534\n\ +._1082:\n\ + ldr r0, ._1096 + 12\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1084 @cond_branch\n\ + bl ._1534\n\ +._1084:\n\ + ldr r2, ._1096 + 16\n\ + ldr r0, ._1096 + 20\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1087 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1087 @cond_branch\n\ + bl ._1534\n\ +._1087:\n\ + ldr r1, ._1096 + 24\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1089 @cond_branch\n\ + bl ._1534\n\ +._1089:\n\ + bl Random\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + mov r1, #0xa\n\ + bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + beq ._1091 @cond_branch\n\ + bl ._1534\n\ +._1091:\n\ + ldr r5, ._1096 + 28\n\ + mov r4, #0x3\n\ +._1093:\n\ + bl Random\n\ + and r0, r0, r4\n\ + strb r0, [r5, #0x3]\n\ + cmp r0, #0\n\ + beq ._1093 @cond_branch\n\ + ldr r1, ._1096 + 28\n\ + ldrb r0, [r1, #0x3]\n\ + cmp r0, #0x3\n\ + bne ._1094 @cond_branch\n\ + add r0, r0, #0x2\n\ + strb r0, [r1, #0x3]\n\ +._1094:\n\ + ldrb r0, [r1, #0x3]\n\ + add r0, r0, #0x40\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1096 + 32\n\ + ldr r0, ._1096 + 36\n\ + str r0, [r1]\n\ + ldr r2, ._1096 + 40\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1097:\n\ + .align 2, 0\n\ +._1096:\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMoves\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._1011:\n\ + ldr r0, ._1111\n\ + ldrb r1, [r0]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1098 @cond_branch\n\ + ldr r0, ._1111 + 4\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1099 @cond_branch\n\ + bl ._1534\n\ +._1099:\n\ + ldr r1, ._1111 + 8\n\ + ldr r0, ._1111 + 12\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1101 @cond_branch\n\ + bl ._1534\n\ +._1101:\n\ + ldr r0, ._1111 + 16\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1103 @cond_branch\n\ + bl ._1534\n\ +._1103:\n\ + ldr r2, ._1111 + 20\n\ + ldr r0, ._1111 + 24\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1106 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1106 @cond_branch\n\ + bl ._1534\n\ +._1106:\n\ + ldr r1, ._1111 + 28\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1108 @cond_branch\n\ + bl ._1534\n\ +._1108:\n\ + ldr r1, ._1111 + 32\n\ + mov r0, #0x42\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1111 + 36\n\ + ldr r0, ._1111 + 40\n\ + str r0, [r1]\n\ + ldr r2, ._1111 + 44\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1112:\n\ + .align 2, 0\n\ +._1111:\n\ + .word gUnknown_02023A14+0x50\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMoves\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._1098:\n\ + ldr r0, ._1127\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1113 @cond_branch\n\ + bl ._1534\n\ +._1113:\n\ + ldr r1, ._1127 + 4\n\ + ldr r0, ._1127 + 8\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1115 @cond_branch\n\ + bl ._1534\n\ +._1115:\n\ + ldr r0, ._1127 + 12\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1117 @cond_branch\n\ + bl ._1534\n\ +._1117:\n\ + ldr r2, ._1127 + 16\n\ + ldr r0, ._1127 + 20\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1120 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1120 @cond_branch\n\ + bl ._1534\n\ +._1120:\n\ + ldr r1, ._1127 + 24\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1122 @cond_branch\n\ + bl ._1534\n\ +._1122:\n\ + bl Random\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + mov r1, #0x3\n\ + bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + beq ._1124 @cond_branch\n\ + bl ._1534\n\ +._1124:\n\ + ldr r1, ._1127 + 28\n\ + mov r0, #0x42\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1127 + 32\n\ + ldr r0, ._1127 + 36\n\ + str r0, [r1]\n\ + ldr r2, ._1127 + 40\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1128:\n\ + .align 2, 0\n\ +._1127:\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMoves\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._982:\n\ + ldr r0, ._1142\n\ + ldrb r1, [r0]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1129 @cond_branch\n\ + ldr r0, ._1142 + 4\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1130 @cond_branch\n\ + bl ._1534\n\ +._1130:\n\ + ldr r1, ._1142 + 8\n\ + ldr r0, ._1142 + 12\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1132 @cond_branch\n\ + bl ._1534\n\ +._1132:\n\ + ldr r0, ._1142 + 16\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1134 @cond_branch\n\ + bl ._1534\n\ +._1134:\n\ + ldr r2, ._1142 + 20\n\ + ldr r0, ._1142 + 24\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1137 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1137 @cond_branch\n\ + bl ._1534\n\ +._1137:\n\ + ldr r1, ._1142 + 28\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1139 @cond_branch\n\ + bl ._1534\n\ +._1139:\n\ + ldr r1, ._1142 + 32\n\ + mov r0, #0x45\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1142 + 36\n\ + ldr r0, ._1142 + 40\n\ + str r0, [r1]\n\ + ldr r2, ._1142 + 44\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1143:\n\ + .align 2, 0\n\ +._1142:\n\ + .word gUnknown_02023A14+0x50\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMoves\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._1129:\n\ + ldr r0, ._1158\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1144 @cond_branch\n\ + bl ._1534\n\ +._1144:\n\ + ldr r1, ._1158 + 4\n\ + ldr r0, ._1158 + 8\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1146 @cond_branch\n\ + bl ._1534\n\ +._1146:\n\ + ldr r0, ._1158 + 12\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1148 @cond_branch\n\ + bl ._1534\n\ +._1148:\n\ + ldr r2, ._1158 + 16\n\ + ldr r0, ._1158 + 20\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1151 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1151 @cond_branch\n\ + bl ._1534\n\ +._1151:\n\ + ldr r1, ._1158 + 24\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1153 @cond_branch\n\ + bl ._1534\n\ +._1153:\n\ + bl Random\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + mov r1, #0x3\n\ + bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + beq ._1155 @cond_branch\n\ + bl ._1534\n\ +._1155:\n\ + ldr r1, ._1158 + 28\n\ + mov r0, #0x45\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1158 + 32\n\ + ldr r0, ._1158 + 36\n\ + str r0, [r1]\n\ + ldr r2, ._1158 + 40\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1159:\n\ + .align 2, 0\n\ +._1158:\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleMoves\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._1022:\n\ + ldr r0, ._1173\n\ + ldrb r1, [r0]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1160 @cond_branch\n\ + ldr r0, ._1173 + 4\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1161 @cond_branch\n\ + bl ._1534\n\ +._1161:\n\ + ldr r1, ._1173 + 8\n\ + ldr r0, ._1173 + 12\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1163 @cond_branch\n\ + bl ._1534\n\ +._1163:\n\ + ldr r0, ._1173 + 16\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1165 @cond_branch\n\ + bl ._1534\n\ +._1165:\n\ + ldr r1, ._1173 + 20\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1167 @cond_branch\n\ + bl ._1534\n\ +._1167:\n\ + ldr r2, ._1173 + 24\n\ + ldr r0, ._1173 + 28\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1170 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1170 @cond_branch\n\ + bl ._1534\n\ +._1170:\n\ + ldr r1, ._1173 + 32\n\ + mov r0, #0x43\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1173 + 36\n\ + ldr r0, ._1173 + 40\n\ + str r0, [r1]\n\ + ldr r2, ._1173 + 44\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1174:\n\ + .align 2, 0\n\ +._1173:\n\ + .word gUnknown_02023A14+0x50\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gBattleMoves\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._1160:\n\ + ldr r0, ._1189\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1175 @cond_branch\n\ + bl ._1534\n\ +._1175:\n\ + ldr r1, ._1189 + 4\n\ + ldr r0, ._1189 + 8\n\ + ldrb r2, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1177 @cond_branch\n\ + bl ._1534\n\ +._1177:\n\ + ldr r0, ._1189 + 12\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1179 @cond_branch\n\ + bl ._1534\n\ +._1179:\n\ + ldr r1, ._1189 + 16\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1181 @cond_branch\n\ + bl ._1534\n\ +._1181:\n\ + ldr r2, ._1189 + 20\n\ + ldr r0, ._1189 + 24\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r1, r0, #0x2\n\ + add r0, r2, #0\n\ + add r0, r0, #0x8\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1184 @cond_branch\n\ + add r0, r2, #0\n\ + add r0, r0, #0xc\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1184 @cond_branch\n\ + bl ._1534\n\ +._1184:\n\ + bl Random\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + mov r1, #0x3\n\ + bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + beq ._1186 @cond_branch\n\ + bl ._1534\n\ +._1186:\n\ + ldr r1, ._1189 + 28\n\ + mov r0, #0x43\n\ + strb r0, [r1, #0x3]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1189 + 32\n\ + ldr r0, ._1189 + 36\n\ + str r0, [r1]\n\ + ldr r2, ._1189 + 40\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl ._1392\n\ +._1190:\n\ + .align 2, 0\n\ +._1189:\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gBattleMoves\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_ApplySecondaryEffect\n\ + .word gHitMarker\n\ +._1029:\n\ + ldr r0, ._1217\n\ + ldrb r1, [r0]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1191 @cond_branch\n\ + b ._1192\n\ +._1191:\n\ + ldr r0, ._1217 + 4\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1193 @cond_branch\n\ + bl ._1534\n\ +._1193:\n\ + ldr r5, ._1217 + 8\n\ + ldr r7, ._1217 + 12\n\ + ldrb r1, [r7]\n\ + mov r6, #0x58\n\ + add r0, r1, #0\n\ + mul r0, r0, r6\n\ + add r4, r0, r5\n\ + ldrh r0, [r4, #0x28]\n\ + cmp r0, #0\n\ + bne ._1195 @cond_branch\n\ + bl ._1534\n\ +._1195:\n\ + ldr r0, ._1217 + 16\n\ + lsl r1, r1, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1197 @cond_branch\n\ + bl ._1534\n\ +._1197:\n\ + ldr r1, ._1217 + 20\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1199 @cond_branch\n\ + bl ._1534\n\ +._1199:\n\ + ldr r3, ._1217 + 24\n\ + ldr r0, ._1217 + 28\n\ + mov r8, r0\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r2, r0, #0x2\n\ + add r0, r3, #0\n\ + add r0, r0, #0x8\n\ + add r0, r2, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1202 @cond_branch\n\ + add r0, r3, #0\n\ + add r0, r0, #0xc\n\ + add r0, r2, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1202 @cond_branch\n\ + bl ._1534\n\ +._1202:\n\ + add r0, r1, #0\n\ + mul r0, r0, r6\n\ + add r0, r0, r5\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1204 @cond_branch\n\ + bl ._1534\n\ +._1204:\n\ + add r0, r4, #0\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0xc\n\ + bne ._1206 @cond_branch\n\ + bl ._1534\n\ +._1206:\n\ + ldr r0, [sp, #0x8]\n\ + ldr r1, [sp, #0x10]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + add r4, r0, #0\n\ + ldr r0, [sp, #0xc]\n\ + ldr r1, [sp, #0x14]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + lsl r4, r4, #0x18\n\ + lsl r0, r0, #0x18\n\ + cmp r4, r0\n\ + bne ._1208 @cond_branch\n\ + bl ._1534\n\ +._1208:\n\ + ldrb r0, [r7]\n\ + mul r0, r0, r6\n\ + add r4, r5, #0\n\ + add r4, r4, #0x50\n\ + add r0, r0, r4\n\ + ldr r0, [r0]\n\ + mov r1, #0xf0\n\ + lsl r1, r1, #0xc\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1210 @cond_branch\n\ + bl ._1534\n\ +._1210:\n\ + ldr r0, [sp, #0x8]\n\ + ldr r1, [sp, #0x10]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0xff\n\ + bne ._1212 @cond_branch\n\ + bl ._1534\n\ +._1212:\n\ + ldr r0, [sp, #0xc]\n\ + ldr r1, [sp, #0x14]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0xff\n\ + bne ._1214 @cond_branch\n\ + bl ._1534\n\ +._1214:\n\ + ldrb r0, [r7]\n\ + add r2, r0, #0\n\ + mul r2, r2, r6\n\ + add r2, r2, r4\n\ + ldr r1, ._1217 + 32\n\ + mov r3, r8\n\ + ldrb r0, [r3]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, [r0]\n\ + lsl r1, r1, #0x10\n\ + ldr r0, [r2]\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1217 + 36\n\ + ldr r0, ._1217 + 40\n\ + str r0, [r1]\n\ + bl ._1392\n\ +._1218:\n\ + .align 2, 0\n\ +._1217:\n\ + .word gUnknown_02023A14+0x50\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gBattleMoves\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBitTable\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_CuteCharmActivates\n\ +._1192:\n\ + ldr r0, ._1245\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1219 @cond_branch\n\ + bl ._1534\n\ +._1219:\n\ + ldr r5, ._1245 + 4\n\ + ldr r7, ._1245 + 8\n\ + ldrb r1, [r7]\n\ + mov r6, #0x58\n\ + add r0, r1, #0\n\ + mul r0, r0, r6\n\ + add r0, r0, r5\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1221 @cond_branch\n\ + bl ._1534\n\ +._1221:\n\ + ldr r0, ._1245 + 12\n\ + lsl r1, r1, #0x4\n\ + add r1, r1, r0\n\ + ldrb r0, [r1, #0x1]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._1223 @cond_branch\n\ + bl ._1534\n\ +._1223:\n\ + ldr r1, ._1245 + 16\n\ + lsl r0, r3, #0x1\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x8]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1225 @cond_branch\n\ + bl ._1534\n\ +._1225:\n\ + ldr r3, ._1245 + 20\n\ + ldr r0, ._1245 + 24\n\ + mov r8, r0\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r2, r0, #0x2\n\ + add r0, r3, #0\n\ + add r0, r0, #0x8\n\ + add r0, r2, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1228 @cond_branch\n\ + add r0, r3, #0\n\ + add r0, r0, #0xc\n\ + add r0, r2, r0\n\ + ldr r0, [r0]\n\ + cmp r0, #0\n\ + bne ._1228 @cond_branch\n\ + bl ._1534\n\ +._1228:\n\ + add r0, r1, #0\n\ + mul r0, r0, r6\n\ + add r0, r0, r5\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + bne ._1230 @cond_branch\n\ + bl ._1534\n\ +._1230:\n\ + bl Random\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + mov r1, #0x3\n\ + bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + beq ._1232 @cond_branch\n\ + bl ._1534\n\ +._1232:\n\ + ldrb r0, [r7]\n\ + mul r0, r0, r6\n\ + add r0, r0, r5\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0xc\n\ + bne ._1234 @cond_branch\n\ + bl ._1534\n\ +._1234:\n\ + ldr r0, [sp, #0x8]\n\ + ldr r1, [sp, #0x10]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + add r4, r0, #0\n\ + ldr r0, [sp, #0xc]\n\ + ldr r1, [sp, #0x14]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + lsl r4, r4, #0x18\n\ + lsl r0, r0, #0x18\n\ + cmp r4, r0\n\ + bne ._1236 @cond_branch\n\ + bl ._1534\n\ +._1236:\n\ + ldrb r0, [r7]\n\ + mul r0, r0, r6\n\ + add r4, r5, #0\n\ + add r4, r4, #0x50\n\ + add r0, r0, r4\n\ + ldr r0, [r0]\n\ + mov r1, #0xf0\n\ + lsl r1, r1, #0xc\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1238 @cond_branch\n\ + bl ._1534\n\ +._1238:\n\ + ldr r0, [sp, #0x8]\n\ + ldr r1, [sp, #0x10]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0xff\n\ + bne ._1240 @cond_branch\n\ + bl ._1534\n\ +._1240:\n\ + ldr r0, [sp, #0xc]\n\ + ldr r1, [sp, #0x14]\n\ + bl GetGenderFromSpeciesAndPersonality\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0xff\n\ + bne ._1242 @cond_branch\n\ + bl ._1534\n\ +._1242:\n\ + ldrb r0, [r7]\n\ + add r2, r0, #0\n\ + mul r2, r2, r6\n\ + add r2, r2, r4\n\ + ldr r1, ._1245 + 28\n\ + mov r3, r8\n\ + ldrb r0, [r3]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, [r0]\n\ + lsl r1, r1, #0x10\n\ + ldr r0, [r2]\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1245 + 32\n\ + ldr r0, ._1245 + 36\n\ + str r0, [r1]\n\ + bl ._1392\n\ +._1246:\n\ + .align 2, 0\n\ +._1245:\n\ + .word gBattleMoveFlags\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gProtectStructs\n\ + .word gBattleMoves\n\ + .word gSpecialStatuses\n\ + .word gBankTarget\n\ + .word gBitTable\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_CuteCharmActivates\n\ +._749:\n\ + mov r5, #0x0\n\ + mov sl, r5\n\ + ldr r0, ._1251\n\ + ldrb r0, [r0]\n\ + cmp sl, r0\n\ + bcc ._1366 @cond_branch\n\ + bl ._1534\n\ +._1366:\n\ + ldr r1, ._1251 + 4\n\ + mov r0, #0x58\n\ + mov r2, sl\n\ + mul r2, r2, r0\n\ + add r0, r2, #0\n\ + add r0, r0, r1\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + sub r0, r0, #0x7\n\ + add r2, r1, #0\n\ + cmp r0, #0x41\n\ + bls ._1249 @cond_branch\n\ + b ._1346\n\ +._1249:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._1251 + 8\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._1252:\n\ + .align 2, 0\n\ +._1251:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word ._1253\n\ +._1253:\n\ + .word ._1254\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1259\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1319\n\ + .word ._1346\n\ + .word ._1264\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1267\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1287\n\ + .word ._1288\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1346\n\ + .word ._1319\n\ +._1264:\n\ + mov r0, #0x58\n\ + mov r3, sl\n\ + mul r3, r3, r0\n\ + add r0, r3, #0\n\ + add r1, r2, #0\n\ + add r1, r1, #0x4c\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + ldr r1, ._1323\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1320 @cond_branch\n\ + b ._1346\n\ +._1320:\n\ + ldr r0, ._1323 + 4\n\ + ldr r1, ._1323 + 8\n\ + b ._1331\n\ +._1324:\n\ + .align 2, 0\n\ +._1323:\n\ + .word 0xf88\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_PoisonJpn\n\ +._1267:\n\ + mov r0, #0x58\n\ + mov r1, sl\n\ + mul r1, r1, r0\n\ + add r0, r1, #0\n\ + add r1, r2, #0\n\ + add r1, r1, #0x50\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1325 @cond_branch\n\ + b ._1346\n\ +._1325:\n\ + ldr r0, ._1328\n\ + ldr r1, ._1328 + 4\n\ + bl StringCopy\n\ + mov r2, #0x2\n\ + mov r9, r2\n\ + b ._1343\n\ +._1329:\n\ + .align 2, 0\n\ +._1328:\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_ConfusionJpn\n\ +._1254:\n\ + mov r0, #0x58\n\ + mov r3, sl\n\ + mul r3, r3, r0\n\ + add r0, r3, #0\n\ + add r1, r2, #0\n\ + add r1, r1, #0x4c\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1346 @cond_branch\n\ + ldr r0, ._1332\n\ + ldr r1, ._1332 + 4\n\ + b ._1331\n\ +._1333:\n\ + .align 2, 0\n\ +._1332:\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_ParalysisJpn\n\ +._1319:\n\ + mov r0, #0x58\n\ + mov r3, sl\n\ + mul r3, r3, r0\n\ + add r0, r2, #0\n\ + add r0, r0, #0x4c\n\ + add r0, r3, r0\n\ + ldr r0, [r0]\n\ + mov r1, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1346 @cond_branch\n\ + add r2, r2, #0x50\n\ + add r2, r3, r2\n\ + ldr r0, [r2]\n\ + ldr r1, ._1336\n\ + and r0, r0, r1\n\ + str r0, [r2]\n\ + ldr r0, ._1336 + 4\n\ + ldr r1, ._1336 + 8\n\ + bl StringCopy\n\ + mov r0, #0x1\n\ + mov r9, r0\n\ + b ._1343\n\ +._1337:\n\ + .align 2, 0\n\ +._1336:\n\ + .word 0xf7ffffff\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_SleepJpn\n\ +._1288:\n\ + mov r0, #0x58\n\ + mov r1, sl\n\ + mul r1, r1, r0\n\ + add r0, r1, #0\n\ + add r1, r2, #0\n\ + add r1, r1, #0x4c\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x10\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1346 @cond_branch\n\ + ldr r0, ._1340\n\ + ldr r1, ._1340 + 4\n\ + bl StringCopy\n\ + mov r2, #0x1\n\ + mov r9, r2\n\ + b ._1343\n\ +._1341:\n\ + .align 2, 0\n\ +._1340:\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_BurnJpn\n\ +._1287:\n\ + mov r0, #0x58\n\ + mov r3, sl\n\ + mul r3, r3, r0\n\ + add r0, r3, #0\n\ + add r1, r2, #0\n\ + add r1, r1, #0x4c\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1346 @cond_branch\n\ + ldr r0, ._1344\n\ + ldr r1, ._1344 + 4\n\ +._1331:\n\ + bl StringCopy\n\ + mov r5, #0x1\n\ + mov r9, r5\n\ + b ._1343\n\ +._1345:\n\ + .align 2, 0\n\ +._1344:\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_IceJpn\n\ +._1259:\n\ + mov r0, #0x58\n\ + mov r1, sl\n\ + mul r1, r1, r0\n\ + add r0, r1, #0\n\ + add r1, r2, #0\n\ + add r1, r1, #0x50\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0xf0\n\ + lsl r1, r1, #0xc\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1346 @cond_branch\n\ + ldr r0, ._1352\n\ + ldr r1, ._1352 + 4\n\ + bl StringCopy\n\ + mov r2, #0x3\n\ + mov r9, r2\n\ +._1346:\n\ + mov r3, r9\n\ + cmp r3, #0\n\ + beq ._1347 @cond_branch\n\ +._1343:\n\ + mov r5, r9\n\ + cmp r5, #0x2\n\ + beq ._1348 @cond_branch\n\ + cmp r5, #0x2\n\ + bgt ._1349 @cond_branch\n\ + cmp r5, #0x1\n\ + beq ._1350 @cond_branch\n\ + b ._1355\n\ +._1353:\n\ + .align 2, 0\n\ +._1352:\n\ + .word gBattleTextBuff1\n\ + .word gStatusConditionString_LoveJpn\n\ +._1349:\n\ + mov r0, r9\n\ + cmp r0, #0x3\n\ + beq ._1354 @cond_branch\n\ + b ._1355\n\ +._1350:\n\ + ldr r1, ._1357\n\ + mov r0, #0x58\n\ + mov r2, sl\n\ + mul r2, r2, r0\n\ + add r1, r1, #0x4c\n\ + add r2, r2, r1\n\ + mov r0, #0x0\n\ + b ._1356\n\ +._1358:\n\ + .align 2, 0\n\ +._1357:\n\ + .word gBattleMons\n\ +._1348:\n\ + ldr r1, ._1360\n\ + mov r0, #0x58\n\ + mov r2, sl\n\ + mul r2, r2, r0\n\ + add r1, r1, #0x50\n\ + add r2, r2, r1\n\ + ldr r0, [r2]\n\ + mov r1, #0x8\n\ + neg r1, r1\n\ + b ._1359\n\ +._1361:\n\ + .align 2, 0\n\ +._1360:\n\ + .word gBattleMons\n\ +._1354:\n\ + ldr r1, ._1363\n\ + mov r0, #0x58\n\ + mov r2, sl\n\ + mul r2, r2, r0\n\ + add r1, r1, #0x50\n\ + add r2, r2, r1\n\ + ldr r0, [r2]\n\ + ldr r1, ._1363 + 4\n\ +._1359:\n\ + and r0, r0, r1\n\ +._1356:\n\ + str r0, [r2]\n\ +._1355:\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1363 + 8\n\ + ldr r0, ._1363 + 12\n\ + str r0, [r1]\n\ + ldr r0, ._1363 + 16\n\ + ldr r1, ._1363 + 20\n\ + add r0, r0, r1\n\ + mov r2, sl\n\ + strb r2, [r0]\n\ + ldr r4, ._1363 + 24\n\ + strb r2, [r4]\n\ + ldrb r1, [r4]\n\ + mov r0, #0x58\n\ + mul r0, r0, r1\n\ + ldr r1, ._1363 + 28\n\ + add r0, r0, r1\n\ + str r0, [sp]\n\ + mov r0, #0x0\n\ + mov r1, #0x28\n\ + mov r2, #0x0\n\ + mov r3, #0x4\n\ + bl EmitSetMonData\n\ + ldrb r0, [r4]\n\ + bl MarkBufferBankForExecution\n\ + bl ._1540\n\ +._1364:\n\ + .align 2, 0\n\ +._1363:\n\ + .word gBattleMons\n\ + .word 0xfff0ffff\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_AbilityCuredStatus\n\ + .word +0x2000000\n\ + .word 0x16003\n\ + .word gActiveBank\n\ + .word gUnknown_02024ACC\n\ +._1347:\n\ + mov r0, sl\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov sl, r0\n\ + ldr r0, ._1368\n\ + ldrb r0, [r0]\n\ + cmp sl, r0\n\ + bcs ._1365 @cond_branch\n\ + b ._1366\n\ +._1365:\n\ + bl ._1534\n\ +._1369:\n\ + .align 2, 0\n\ +._1368:\n\ + .word gNoOfAllBanks\n\ +._750:\n\ + mov r3, #0x0\n\ + mov sl, r3\n\ + ldr r0, ._1377\n\ + ldrb r0, [r0]\n\ + cmp sl, r0\n\ + bcc ._1370 @cond_branch\n\ + b ._1534\n\ +._1370:\n\ + ldr r4, ._1377 + 4\n\ +._1375:\n\ + mov r0, #0x58\n\ + mov r5, sl\n\ + mul r5, r5, r0\n\ + add r0, r5, #0\n\ + add r0, r0, r4\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x3b\n\ + bne ._1373 @cond_branch\n\ + mov r0, sl\n\ + bl CastformDataTypeChange\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ + cmp r0, #0\n\ + beq ._1373 @cond_branch\n\ + b ._1374\n\ +._1373:\n\ + mov r0, sl\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov sl, r0\n\ + ldr r0, ._1377\n\ + ldrb r0, [r0]\n\ + cmp sl, r0\n\ + bcc ._1375 @cond_branch\n\ + b ._1534\n\ +._1378:\n\ + .align 2, 0\n\ +._1377:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ +._751:\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + cmp r0, #0x1c\n\ + beq ._1379 @cond_branch\n\ + b ._1534\n\ +._1379:\n\ + ldr r4, ._1385\n\ + ldr r1, [r4]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1381 @cond_branch\n\ + b ._1534\n\ +._1381:\n\ + ldr r0, ._1385 + 4\n\ + and r1, r1, r0\n\ + str r1, [r4]\n\ + ldr r3, ._1385 + 8\n\ + add r2, r7, r3\n\ + ldrb r1, [r2]\n\ + mov r0, #0x3f\n\ + and r0, r0, r1\n\ + strb r0, [r2]\n\ + cmp r0, #0x6\n\ + bne ._1383 @cond_branch\n\ + mov r0, #0x2\n\ + strb r0, [r2]\n\ +._1383:\n\ + ldr r1, ._1385 + 12\n\ + ldrb r0, [r2]\n\ + add r0, r0, #0x40\n\ + strb r0, [r1, #0x3]\n\ + ldr r0, ._1385 + 16\n\ + ldrb r1, [r0]\n\ + ldr r5, ._1385 + 20\n\ + add r0, r7, r5\n\ + strb r1, [r0]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1385 + 24\n\ + ldr r0, ._1385 + 28\n\ + str r0, [r1]\n\ + ldr r0, [r4]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r4]\n\ + b ._1392\n\ +._1386:\n\ + .align 2, 0\n\ +._1385:\n\ + .word gHitMarker\n\ + .word 0xffffbfff\n\ + .word 0x160ca\n\ + .word gBattleCommunication\n\ + .word gBankTarget\n\ + .word 0x16003\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_SynchronizeActivates\n\ +._752:\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + cmp r0, #0x1c\n\ + beq ._1387 @cond_branch\n\ + b ._1534\n\ +._1387:\n\ + ldr r4, ._1393\n\ + ldr r1, [r4]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1389 @cond_branch\n\ + b ._1534\n\ +._1389:\n\ + ldr r0, ._1393 + 4\n\ + and r1, r1, r0\n\ + str r1, [r4]\n\ + ldr r3, ._1393 + 8\n\ + add r2, r7, r3\n\ + ldrb r1, [r2]\n\ + mov r0, #0x3f\n\ + and r0, r0, r1\n\ + strb r0, [r2]\n\ + cmp r0, #0x6\n\ + bne ._1391 @cond_branch\n\ + mov r0, #0x2\n\ + strb r0, [r2]\n\ +._1391:\n\ + ldr r1, ._1393 + 12\n\ + ldrb r0, [r2]\n\ + strb r0, [r1, #0x3]\n\ + ldr r0, ._1393 + 16\n\ + ldrb r1, [r0]\n\ + ldr r5, ._1393 + 20\n\ + add r0, r7, r5\n\ + strb r1, [r0]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1393 + 24\n\ + ldr r0, ._1393 + 28\n\ + str r0, [r1]\n\ + ldr r0, [r4]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x6\n\ + orr r0, r0, r1\n\ + str r0, [r4]\n\ + b ._1392\n\ +._1394:\n\ + .align 2, 0\n\ +._1393:\n\ + .word gHitMarker\n\ + .word 0xffffbfff\n\ + .word 0x160ca\n\ + .word gBattleCommunication\n\ + .word gBankAttacker\n\ + .word 0x16003\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_SynchronizeActivates\n\ +._753:\n\ + mov r4, #0x0\n\ + ldr r0, ._1402\n\ + ldrb r1, [r0]\n\ + cmp r4, r1\n\ + blt ._1395 @cond_branch\n\ + b ._1534\n\ +._1395:\n\ + ldr r0, ._1402 + 4\n\ + add r5, r1, #0\n\ + ldr r2, ._1402 + 8\n\ + add r3, r0, #0\n\ + add r3, r3, #0x20\n\ + mov r6, #0x80\n\ + lsl r6, r6, #0xc\n\ +._1400:\n\ + ldrb r1, [r3]\n\ + cmp r1, #0x16\n\ + bne ._1398 @cond_branch\n\ + ldr r0, [r2]\n\ + and r0, r0, r6\n\ + cmp r0, #0\n\ + beq ._1398 @cond_branch\n\ + b ._1399\n\ +._1398:\n\ + add r2, r2, #0x4\n\ + add r3, r3, #0x58\n\ + add r4, r4, #0x1\n\ + cmp r4, r5\n\ + blt ._1400 @cond_branch\n\ + b ._1534\n\ +._1403:\n\ + .align 2, 0\n\ +._1402:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gStatuses3\n\ +._755:\n\ + mov r4, #0x0\n\ + ldr r0, ._1417\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1404 @cond_branch\n\ + b ._1534\n\ +._1404:\n\ + ldr r0, ._1417 + 4\n\ + mov r8, r0\n\ + ldr r1, ._1417 + 8\n\ + add r1, r1, #0x20\n\ + str r1, [sp, #0x1c]\n\ + mov r2, #0x0\n\ + str r2, [sp, #0x20]\n\ +._1434:\n\ + ldr r3, [sp, #0x1c]\n\ + ldrb r0, [r3]\n\ + cmp r0, #0x24\n\ + beq ._1406 @cond_branch\n\ + b ._1431\n\ +._1406:\n\ + ldr r0, ._1417 + 12\n\ + ldr r5, [sp, #0x20]\n\ + add r0, r5, r0\n\ + ldr r1, [r0]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0xd\n\ + and r1, r1, r0\n\ + str r5, [sp, #0x18]\n\ + cmp r1, #0\n\ + bne ._1408 @cond_branch\n\ + b ._1431\n\ +._1408:\n\ + lsl r0, r4, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl GetBankIdentity\n\ + mov r1, #0x1\n\ + add r5, r0, #0\n\ + eor r5, r5, r1\n\ + and r5, r5, r1\n\ + add r0, r5, #0\n\ + bl GetBankByIdentity\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ + add r0, r5, #2\n\ + bl GetBankByIdentity\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + ldr r0, ._1417 + 16\n\ + ldrh r1, [r0]\n\ + mov r2, #0x1\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1410 @cond_branch\n\ + b ._1411\n\ +._1410:\n\ + mov r1, #0x58\n\ + add r0, r6, #0\n\ + mul r0, r0, r1\n\ + ldr r3, ._1417 + 8\n\ + add r1, r0, r3\n\ + add r0, r1, #0\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._1420 @cond_branch\n\ + ldrh r0, [r1, #0x28]\n\ + cmp r0, #0\n\ + beq ._1415 @cond_branch\n\ + mov r1, #0x58\n\ + add r0, r7, #0\n\ + mul r0, r0, r1\n\ + add r1, r0, r3\n\ + add r0, r1, #0\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._1415 @cond_branch\n\ + ldrh r0, [r1, #0x28]\n\ + cmp r0, #0\n\ + beq ._1415 @cond_branch\n\ + str r2, [sp, #0x24]\n\ + bl Random\n\ + ldr r2, [sp, #0x24]\n\ + add r1, r2, #0\n\ + and r1, r1, r0\n\ + lsl r1, r1, #0x1\n\ + orr r5, r5, r1\n\ + add r0, r5, #0\n\ + bl GetBankByIdentity\n\ + mov r2, r8\n\ + strb r0, [r2]\n\ + ldrb r0, [r2]\n\ + mov r3, #0x58\n\ + mul r0, r0, r3\n\ + ldr r5, ._1417 + 8\n\ + add r0, r0, r5\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + ldr r1, [sp, #0x1c]\n\ + strb r0, [r1]\n\ + ldrb r0, [r2]\n\ + mul r0, r0, r3\n\ + add r0, r0, r5\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + ldr r2, ._1417 + 20\n\ + strb r0, [r2]\n\ + b ._1416\n\ +._1418:\n\ + .align 2, 0\n\ +._1417:\n\ + .word gNoOfAllBanks\n\ + .word gActiveBank\n\ + .word gBattleMons\n\ + .word gStatuses3\n\ + .word gBattleTypeFlags\n\ + .word gLastUsedAbility\n\ +._1415:\n\ + ldr r3, ._1422\n\ + mov r2, #0x58\n\ + add r0, r6, #0\n\ + mul r0, r0, r2\n\ + add r1, r0, r3\n\ + add r0, r1, #0\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._1420 @cond_branch\n\ + ldrh r0, [r1, #0x28]\n\ + cmp r0, #0\n\ + beq ._1420 @cond_branch\n\ + mov r5, r8\n\ + strb r6, [r5]\n\ + add r1, r4, #0\n\ + mul r1, r1, r2\n\ + add r1, r1, r3\n\ + ldrb r0, [r5]\n\ + mul r0, r0, r2\n\ + add r0, r0, r3\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + add r1, r1, #0x20\n\ + strb r0, [r1]\n\ + ldrb r0, [r5]\n\ + mul r0, r0, r2\n\ + add r0, r0, r3\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + b ._1426\n\ +._1423:\n\ + .align 2, 0\n\ +._1422:\n\ + .word gBattleMons\n\ +._1420:\n\ + ldr r3, ._1427\n\ + mov r2, #0x58\n\ + add r0, r7, #0\n\ + mul r0, r0, r2\n\ + add r1, r0, r3\n\ + add r0, r1, #0\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._1430 @cond_branch\n\ + ldrh r0, [r1, #0x28]\n\ + cmp r0, #0\n\ + beq ._1430 @cond_branch\n\ + mov r5, r8\n\ + strb r7, [r5]\n\ + add r1, r4, #0\n\ + mul r1, r1, r2\n\ + add r1, r1, r3\n\ + ldrb r0, [r5]\n\ + mul r0, r0, r2\n\ + add r0, r0, r3\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + add r1, r1, #0x20\n\ + strb r0, [r1]\n\ + ldrb r0, [r5]\n\ + mul r0, r0, r2\n\ + add r0, r0, r3\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + b ._1426\n\ +._1428:\n\ + .align 2, 0\n\ +._1427:\n\ + .word gBattleMons\n\ +._1411:\n\ + mov r2, r8\n\ + strb r6, [r2]\n\ + mov r3, #0x58\n\ + add r0, r6, #0\n\ + mul r0, r0, r3\n\ + ldr r5, ._1436\n\ + add r0, r0, r5\n\ + add r2, r0, #0\n\ + add r2, r2, #0x20\n\ + ldrb r1, [r2]\n\ + cmp r1, #0\n\ + beq ._1430 @cond_branch\n\ + ldrh r0, [r0, #0x28]\n\ + cmp r0, #0\n\ + beq ._1430 @cond_branch\n\ + ldr r0, [sp, #0x1c]\n\ + strb r1, [r0]\n\ + ldrb r0, [r2]\n\ +._1426:\n\ + ldr r1, ._1436 + 4\n\ + strb r0, [r1]\n\ +._1416:\n\ + mov r0, r9\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1430:\n\ + mov r2, r9\n\ + cmp r2, #0\n\ + beq ._1431 @cond_branch\n\ + b ._1432\n\ +._1431:\n\ + ldr r3, [sp, #0x1c]\n\ + add r3, r3, #0x58\n\ + str r3, [sp, #0x1c]\n\ + ldr r5, [sp, #0x20]\n\ + add r5, r5, #0x4\n\ + str r5, [sp, #0x20]\n\ + add r4, r4, #0x1\n\ + ldr r0, ._1436 + 8\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + bge ._1433 @cond_branch\n\ + b ._1434\n\ +._1433:\n\ + b ._1534\n\ +._1437:\n\ + .align 2, 0\n\ +._1436:\n\ + .word gBattleMons\n\ + .word gLastUsedAbility\n\ + .word gNoOfAllBanks\n\ +._754:\n\ + mov r4, #0x0\n\ + ldr r0, ._1445\n\ + ldrb r1, [r0]\n\ + cmp r4, r1\n\ + blt ._1438 @cond_branch\n\ + b ._1534\n\ +._1438:\n\ + ldr r0, ._1445 + 4\n\ + add r5, r1, #0\n\ + ldr r2, ._1445 + 8\n\ + add r3, r0, #0\n\ + add r3, r3, #0x20\n\ + mov r6, #0x80\n\ + lsl r6, r6, #0xc\n\ +._1443:\n\ + ldrb r1, [r3]\n\ + cmp r1, #0x16\n\ + bne ._1441 @cond_branch\n\ + ldr r0, [r2]\n\ + and r0, r0, r6\n\ + cmp r0, #0\n\ + beq ._1441 @cond_branch\n\ + b ._1442\n\ +._1441:\n\ + add r2, r2, #0x4\n\ + add r3, r3, #0x58\n\ + add r4, r4, #0x1\n\ + cmp r4, r5\n\ + blt ._1443 @cond_branch\n\ + b ._1534\n\ +._1446:\n\ + .align 2, 0\n\ +._1445:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gStatuses3\n\ +._756:\n\ + mov r0, sl\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r5, r0, #0x18\n\ + mov r4, #0x0\n\ + ldr r0, ._1453\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1447 @cond_branch\n\ + b ._1534\n\ +._1447:\n\ + ldr r7, ._1453 + 4\n\ +._1451:\n\ + lsl r0, r4, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + add r3, r4, #1\n\ + cmp r0, r5\n\ + beq ._1450 @cond_branch\n\ + mov r0, #0x58\n\ + mul r0, r0, r4\n\ + add r0, r0, r7\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, r6\n\ + bne ._1450 @cond_branch\n\ + ldr r0, ._1453 + 8\n\ + strb r6, [r0]\n\ + lsl r0, r3, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1450:\n\ + add r4, r3, #0\n\ + ldr r0, ._1453\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1451 @cond_branch\n\ + b ._1534\n\ +._1454:\n\ + .align 2, 0\n\ +._1453:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gLastUsedAbility\n\ +._757:\n\ + mov r0, sl\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r5, r0, #0x18\n\ + mov r4, #0x0\n\ + ldr r0, ._1461\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1455 @cond_branch\n\ + b ._1534\n\ +._1455:\n\ + ldr r7, ._1461 + 4\n\ +._1459:\n\ + lsl r0, r4, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + add r3, r4, #1\n\ + cmp r0, r5\n\ + bne ._1458 @cond_branch\n\ + mov r0, #0x58\n\ + mul r0, r0, r4\n\ + add r0, r0, r7\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, r6\n\ + bne ._1458 @cond_branch\n\ + ldr r0, ._1461 + 8\n\ + strb r6, [r0]\n\ + lsl r0, r3, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1458:\n\ + add r4, r3, #0\n\ + ldr r0, ._1461\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1459 @cond_branch\n\ + b ._1534\n\ +._1462:\n\ + .align 2, 0\n\ +._1461:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gLastUsedAbility\n\ +._758:\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + cmp r0, #0xfd\n\ + beq ._1463 @cond_branch\n\ + cmp r0, #0xfe\n\ + beq ._1464 @cond_branch\n\ + mov r4, #0x0\n\ + ldr r0, ._1468\n\ + add r5, r0, #0\n\ + ldrb r2, [r5]\n\ + cmp r4, r2\n\ + blt ._1465 @cond_branch\n\ + b ._1534\n\ +._1465:\n\ + ldr r2, ._1468 + 4\n\ + b ._1485\n\ +._1469:\n\ + .align 2, 0\n\ +._1468:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ +._1463:\n\ + mov r4, #0x0\n\ + ldr r0, ._1475\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1470 @cond_branch\n\ + b ._1534\n\ +._1470:\n\ + ldr r5, ._1475 + 4\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0x9\n\ + add r1, r0, #0\n\ +._1473:\n\ + lsl r0, r4, #0x2\n\ + add r0, r0, r5\n\ + ldr r0, [r0]\n\ + and r0, r0, r2\n\ + add r3, r4, #1\n\ + cmp r0, #0\n\ + beq ._1472 @cond_branch\n\ + lsl r0, r3, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1472:\n\ + add r4, r3, #0\n\ + cmp r4, r1\n\ + blt ._1473 @cond_branch\n\ + b ._1534\n\ +._1476:\n\ + .align 2, 0\n\ +._1475:\n\ + .word gNoOfAllBanks\n\ + .word gStatuses3\n\ +._1464:\n\ + mov r4, #0x0\n\ + ldr r0, ._1482\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1477 @cond_branch\n\ + b ._1534\n\ +._1477:\n\ + ldr r5, ._1482 + 4\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0xa\n\ + add r1, r0, #0\n\ +._1480:\n\ + lsl r0, r4, #0x2\n\ + add r0, r0, r5\n\ + ldr r0, [r0]\n\ + and r0, r0, r2\n\ + add r3, r4, #1\n\ + cmp r0, #0\n\ + beq ._1479 @cond_branch\n\ + lsl r0, r3, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1479:\n\ + add r4, r3, #0\n\ + cmp r4, r1\n\ + blt ._1480 @cond_branch\n\ + b ._1534\n\ +._1483:\n\ + .align 2, 0\n\ +._1482:\n\ + .word gNoOfAllBanks\n\ + .word gStatuses3\n\ +._1485:\n\ + mov r0, #0x58\n\ + mul r0, r0, r4\n\ + add r0, r0, r2\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + add r3, r4, #1\n\ + cmp r0, r6\n\ + bne ._1484 @cond_branch\n\ + mov r0, r8\n\ + strb r6, [r0]\n\ + lsl r0, r3, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1484:\n\ + add r4, r3, #0\n\ + ldrb r1, [r5]\n\ + cmp r4, r1\n\ + blt ._1485 @cond_branch\n\ + b ._1534\n\ +._763:\n\ + mov r4, #0x0\n\ + ldr r0, ._1493\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1487 @cond_branch\n\ + b ._1534\n\ +._1487:\n\ + ldr r7, ._1493 + 4\n\ + add r2, r0, #0\n\ + mov r5, #0x58\n\ +._1491:\n\ + add r0, r4, #0\n\ + mul r0, r0, r5\n\ + add r1, r0, r7\n\ + add r0, r1, #0\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + add r3, r4, #1\n\ + cmp r0, r6\n\ + bne ._1490 @cond_branch\n\ + ldrh r0, [r1, #0x28]\n\ + cmp r0, #0\n\ + beq ._1490 @cond_branch\n\ + mov r0, r8\n\ + strb r6, [r0]\n\ + lsl r0, r3, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1490:\n\ + add r4, r3, #0\n\ + cmp r4, r2\n\ + blt ._1491 @cond_branch\n\ + b ._1534\n\ +._1494:\n\ + .align 2, 0\n\ +._1493:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ +._759:\n\ + mov r4, #0x0\n\ + ldr r0, ._1501\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1495 @cond_branch\n\ + b ._1534\n\ +._1495:\n\ + ldr r7, ._1501 + 4\n\ + add r1, r0, #0\n\ + mov r5, #0x58\n\ + ldr r2, ._1501 + 8\n\ +._1499:\n\ + add r0, r4, #0\n\ + mul r0, r0, r5\n\ + add r0, r0, r7\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + add r3, r4, #1\n\ + cmp r0, r6\n\ + bne ._1498 @cond_branch\n\ + cmp r4, sl\n\ + beq ._1498 @cond_branch\n\ + strb r6, [r2]\n\ + lsl r0, r3, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1498:\n\ + add r4, r3, #0\n\ + cmp r4, r1\n\ + blt ._1499 @cond_branch\n\ + b ._1534\n\ +._1502:\n\ + .align 2, 0\n\ +._1501:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gLastUsedAbility\n\ +._760:\n\ + mov r0, sl\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r5, r0, #0x18\n\ + mov r4, #0x0\n\ + ldr r0, ._1509\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1503 @cond_branch\n\ + b ._1534\n\ +._1503:\n\ + ldr r7, ._1509 + 4\n\ +._1507:\n\ + lsl r0, r4, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, r5\n\ + beq ._1506 @cond_branch\n\ + mov r0, #0x58\n\ + mul r0, r0, r4\n\ + add r0, r0, r7\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, r6\n\ + bne ._1506 @cond_branch\n\ + ldr r0, ._1509 + 8\n\ + strb r6, [r0]\n\ + mov r0, r9\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1506:\n\ + add r4, r4, #0x1\n\ + ldr r0, ._1509\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1507 @cond_branch\n\ + b ._1534\n\ +._1510:\n\ + .align 2, 0\n\ +._1509:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gLastUsedAbility\n\ +._761:\n\ + mov r0, sl\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r5, r0, #0x18\n\ + mov r4, #0x0\n\ + ldr r0, ._1517\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1511 @cond_branch\n\ + b ._1534\n\ +._1511:\n\ + ldr r7, ._1517 + 4\n\ +._1515:\n\ + lsl r0, r4, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, r5\n\ + bne ._1514 @cond_branch\n\ + mov r0, #0x58\n\ + mul r0, r0, r4\n\ + add r0, r0, r7\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, r6\n\ + bne ._1514 @cond_branch\n\ + ldr r0, ._1517 + 8\n\ + strb r6, [r0]\n\ + mov r0, r9\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1514:\n\ + add r4, r4, #0x1\n\ + ldr r0, ._1517\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._1515 @cond_branch\n\ + b ._1534\n\ +._1518:\n\ + .align 2, 0\n\ +._1517:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gLastUsedAbility\n\ +._853:\n\ + ldr r0, ._1520\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r0, ._1520 + 4\n\ + ldr r2, ._1520 + 8\n\ + add r1, r0, r2\n\ + strb r6, [r1]\n\ + mov r1, r9\n\ + sub r1, r1, #0x1\n\ + ldr r3, ._1520 + 12\n\ + add r0, r0, r3\n\ + strb r1, [r0]\n\ + b ._1534\n\ +._1521:\n\ + .align 2, 0\n\ +._1520:\n\ + .word BattleScript_CastformChange\n\ + .word +0x2000000\n\ + .word 0x16003\n\ + .word 0x1609b\n\ +._1374:\n\ + ldr r0, ._1523\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r0, ._1523 + 4\n\ + ldr r5, ._1523 + 8\n\ + add r1, r0, r5\n\ + mov r2, sl\n\ + strb r2, [r1]\n\ + mov r1, r9\n\ + sub r1, r1, #0x1\n\ + ldr r3, ._1523 + 12\n\ + add r0, r0, r3\n\ + strb r1, [r0]\n\ + b ._1540\n\ +._1524:\n\ + .align 2, 0\n\ +._1523:\n\ + .word BattleScript_CastformChange\n\ + .word +0x2000000\n\ + .word 0x16003\n\ + .word 0x1609b\n\ +._1399:\n\ + mov r5, r8\n\ + strb r1, [r5]\n\ + ldr r0, [r2]\n\ + ldr r1, ._1526\n\ + and r0, r0, r1\n\ + str r0, [r2]\n\ + ldr r0, ._1526 + 4\n\ + bl BattleScriptPushCursorAndCallback\n\ + b ._1525\n\ +._1527:\n\ + .align 2, 0\n\ +._1526:\n\ + .word 0xfff7ffff\n\ + .word gUnknown_081D978C\n\ +._1432:\n\ + ldr r0, ._1529\n\ + bl BattleScriptPushCursorAndCallback\n\ + ldr r1, ._1529 + 4\n\ + ldr r2, [sp, #0x18]\n\ + add r1, r2, r1\n\ + ldr r0, [r1]\n\ + ldr r2, ._1529 + 8\n\ + and r0, r0, r2\n\ + str r0, [r1]\n\ + ldr r0, ._1529 + 12\n\ + ldr r3, ._1529 + 16\n\ + add r0, r0, r3\n\ + strb r4, [r0]\n\ + ldr r1, ._1529 + 20\n\ + mov r4, #0xfd\n\ + strb r4, [r1]\n\ + mov r0, #0x4\n\ + strb r0, [r1, #0x1]\n\ + ldr r2, ._1529 + 24\n\ + ldrb r0, [r2]\n\ + strb r0, [r1, #0x2]\n\ + ldr r3, ._1529 + 28\n\ + ldrb r0, [r2]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r3\n\ + ldrh r0, [r0]\n\ + strb r0, [r1, #0x3]\n\ + mov r0, #0xff\n\ + strb r0, [r1, #0x4]\n\ + ldr r1, ._1529 + 32\n\ + strb r4, [r1]\n\ + mov r0, #0x9\n\ + strb r0, [r1, #0x1]\n\ + ldr r0, ._1529 + 36\n\ + ldrb r0, [r0]\n\ + strb r0, [r1, #0x2]\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + strb r0, [r1, #0x3]\n\ + b ._1534\n\ +._1530:\n\ + .align 2, 0\n\ +._1529:\n\ + .word BattleScript_TraceActivates\n\ + .word gStatuses3\n\ + .word 0xffefffff\n\ + .word +0x2000000\n\ + .word 0x16003\n\ + .word gBattleTextBuff1\n\ + .word gActiveBank\n\ + .word gBattlePartyID\n\ + .word gBattleTextBuff2\n\ + .word gLastUsedAbility\n\ +._1442:\n\ + mov r5, r8\n\ + strb r1, [r5]\n\ + ldr r0, [r2]\n\ + ldr r1, ._1532\n\ + and r0, r0, r1\n\ + str r0, [r2]\n\ + bl BattleScriptPushCursor\n\ + ldr r1, ._1532 + 4\n\ + ldr r0, ._1532 + 8\n\ + str r0, [r1]\n\ +._1525:\n\ + ldr r0, ._1532 + 12\n\ + ldr r1, ._1532 + 16\n\ + add r0, r0, r1\n\ + strb r4, [r0]\n\ +._1392:\n\ + mov r0, r9\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ + b ._1534\n\ +._1533:\n\ + .align 2, 0\n\ +._1532:\n\ + .word 0xfff7ffff\n\ + .word gBattlescriptCurrInstr\n\ + .word gUnknown_081D9795\n\ + .word +0x2000000\n\ + .word 0x160dd\n\ +._762:\n\ + mov r4, #0x0\n\ + ldr r0, ._1541\n\ + ldrb r1, [r0]\n\ + cmp r4, r1\n\ + bge ._1534 @cond_branch\n\ + ldr r0, ._1541 + 4\n\ + add r2, r1, #0\n\ + add r1, r0, #0\n\ + add r1, r1, #0x20\n\ + ldr r3, ._1541 + 8\n\ +._1537:\n\ + ldrb r0, [r1]\n\ + cmp r0, r6\n\ + bne ._1536 @cond_branch\n\ + cmp r4, sl\n\ + beq ._1536 @cond_branch\n\ + strb r6, [r3]\n\ + mov r0, r9\n\ + add r0, r0, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r9, r0\n\ +._1536:\n\ + add r1, r1, #0x58\n\ + add r4, r4, #0x1\n\ + cmp r4, r2\n\ + blt ._1537 @cond_branch\n\ +._1534:\n\ + mov r2, r9\n\ + cmp r2, #0\n\ + beq ._1540 @cond_branch\n\ +._916:\n\ + ldr r3, [sp, #0x4]\n\ + cmp r3, #0xb\n\ + bhi ._1540 @cond_branch\n\ + ldr r1, ._1541 + 8\n\ + ldrb r0, [r1]\n\ + cmp r0, #0xff\n\ + beq ._1540 @cond_branch\n\ + add r1, r0, #0\n\ + mov r0, sl\n\ + bl RecordAbilityBattle\n\ +._1540:\n\ + mov r0, r9\n\ + add sp, sp, #0x28\n\ + pop {r3, r4, r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov sl, r5\n\ + pop {r4, r5, r6, r7}\n\ + pop {r1}\n\ + bx r1\n\ +._1542:\n\ + .align 2, 0\n\ +._1541:\n\ + .word gNoOfAllBanks\n\ + .word gBattleMons\n\ + .word gLastUsedAbility"); +} +#else u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { u8 effect = 0; @@ -2498,6 +6558,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) return effect; } +#endif void BattleScriptExecute(const u8* BS_ptr) { @@ -3377,6 +7438,417 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target return targetBank; } +#if DEBUG +__attribute__((naked)) +u8 IsMonDisobedient(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6, r7}\n\ + add sp, sp, #0xfffffff0\n\ + ldr r0, ._1785\n\ + ldrh r1, [r0]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1791 @cond_branch\n\ + ldr r4, ._1785 + 4\n\ + ldrb r0, [r4]\n\ + bl GetBankSide\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + beq ._1791 @cond_branch\n\ + ldr r2, ._1785 + 8\n\ + ldrb r1, [r4]\n\ + mov r0, #0x58\n\ + mul r1, r1, r0\n\ + add r0, r2, #0\n\ + add r0, r0, #0x54\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + add r2, r2, #0x3c\n\ + add r1, r1, r2\n\ + bl IsOtherTrainer\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1791 @cond_branch\n\ + ldr r0, ._1785 + 12\n\ + ldrb r1, [r0]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1783 @cond_branch\n\ + mov r0, #0xa\n\ + b ._1784\n\ +._1786:\n\ + .align 2, 0\n\ +._1785:\n\ + .word gBattleTypeFlags\n\ + .word gBankAttacker\n\ + .word gBattleMons\n\ + .word gUnknown_02023A14+0x50\n\ +._1783:\n\ + ldr r0, ._1794\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1791 @cond_branch\n\ + mov r1, #0xa\n\ + mov r8, r1\n\ + ldr r0, ._1794 + 4\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1788 @cond_branch\n\ + mov r2, #0x1e\n\ + mov r8, r2\n\ +._1788:\n\ + ldr r0, ._1794 + 8\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1789 @cond_branch\n\ + mov r4, #0x32\n\ + mov r8, r4\n\ +._1789:\n\ + ldr r0, ._1794 + 12\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1790 @cond_branch\n\ + mov r0, #0x46\n\ +._1784:\n\ + mov r8, r0\n\ +._1790:\n\ + ldr r5, ._1794 + 16\n\ + ldr r7, ._1794 + 20\n\ + ldrb r0, [r7]\n\ + mov r6, #0x58\n\ + mul r0, r0, r6\n\ + add r0, r0, r5\n\ + add r0, r0, #0x2a\n\ + ldrb r0, [r0]\n\ + cmp r0, r8\n\ + bls ._1791 @cond_branch\n\ + bl Random\n\ + mov r1, #0xff\n\ + and r1, r1, r0\n\ + ldrb r0, [r7]\n\ + add r2, r0, #0\n\ + mul r2, r2, r6\n\ + add r0, r2, r5\n\ + add r0, r0, #0x2a\n\ + ldrb r0, [r0]\n\ + add r0, r0, r8\n\ + mul r0, r0, r1\n\ + asr r4, r0, #0x8\n\ + cmp r4, r8\n\ + bge ._1792 @cond_branch\n\ +._1791:\n\ + mov r0, #0x0\n\ + b ._1823\n\ +._1795:\n\ + .align 2, 0\n\ +._1794:\n\ + .word 0x80e\n\ + .word 0x808\n\ + .word 0x80a\n\ + .word 0x80c\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ +._1792:\n\ + ldr r3, ._1801\n\ + ldrh r0, [r3]\n\ + cmp r0, #0x63\n\ + bne ._1796 @cond_branch\n\ + add r0, r5, #0\n\ + add r0, r0, #0x50\n\ + add r0, r2, r0\n\ + ldr r1, [r0]\n\ + ldr r2, ._1801 + 4\n\ + and r1, r1, r2\n\ + str r1, [r0]\n\ +._1796:\n\ + ldrb r0, [r7]\n\ + mul r0, r0, r6\n\ + add r1, r5, #0\n\ + add r1, r1, #0x4c\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x7\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1799 @cond_branch\n\ + ldrh r0, [r3]\n\ + cmp r0, #0xad\n\ + beq ._1798 @cond_branch\n\ + cmp r0, #0xd6\n\ + bne ._1799 @cond_branch\n\ +._1798:\n\ + ldr r1, ._1801 + 8\n\ + ldr r0, ._1801 + 12\n\ + b ._1819\n\ +._1802:\n\ + .align 2, 0\n\ +._1801:\n\ + .word gCurrentMove\n\ + .word 0xff7fffff\n\ + .word gBattlescriptCurrInstr\n\ + .word gUnknown_081D995F\n\ +._1799:\n\ + bl Random\n\ + mov r5, #0xff\n\ + add r1, r5, #0\n\ + and r1, r1, r0\n\ + ldr r6, ._1808\n\ + ldr r2, ._1808 + 4\n\ + mov r9, r2\n\ + ldrb r3, [r2]\n\ + mov r7, #0x58\n\ + add r0, r3, #0\n\ + mul r0, r0, r7\n\ + add r0, r0, r6\n\ + add r0, r0, #0x2a\n\ + ldrb r2, [r0]\n\ + mov r4, r8\n\ + add r0, r2, r4\n\ + mul r0, r0, r1\n\ + asr r4, r0, #0x8\n\ + cmp r4, r8\n\ + bge ._1803 @cond_branch\n\ + ldr r7, ._1808 + 8\n\ + ldr r5, ._1808 + 12\n\ + ldrb r0, [r5]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r7\n\ + ldrb r1, [r0]\n\ + add r0, r3, #0\n\ + mov r2, #0xff\n\ + bl CheckMoveLimitations\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + cmp r4, #0xf\n\ + bne ._1804 @cond_branch\n\ + b ._1805\n\ +._1804:\n\ + add r6, r5, #0\n\ + ldr r0, ._1808 + 16\n\ + mov r9, r0\n\ + mov r1, #0x3\n\ + mov r8, r1\n\ +._1806:\n\ + bl Random\n\ + mov r2, r8\n\ + and r0, r0, r2\n\ + mov r1, r9\n\ + strb r0, [r1]\n\ + strb r0, [r6]\n\ + ldrb r0, [r6]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r7\n\ + ldr r5, [r0]\n\ + and r5, r5, r4\n\ + cmp r5, #0\n\ + bne ._1806 @cond_branch\n\ + ldr r4, ._1808 + 20\n\ + ldr r3, ._1808\n\ + ldr r0, ._1808 + 12\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x1\n\ + ldr r1, ._1808 + 4\n\ + ldrb r2, [r1]\n\ + mov r1, #0x58\n\ + mul r1, r1, r2\n\ + add r0, r0, r1\n\ + add r3, r3, #0xc\n\ + add r0, r0, r3\n\ + ldrh r0, [r0]\n\ + strh r0, [r4]\n\ + ldr r0, ._1808 + 24\n\ + strb r5, [r0, #0x3]\n\ + ldr r0, ._1808 + 28\n\ + mov r1, #0x0\n\ + strh r5, [r0]\n\ + ldr r0, ._1808 + 32\n\ + ldr r2, ._1808 + 36\n\ + add r0, r0, r2\n\ + strb r1, [r0]\n\ + ldr r1, ._1808 + 40\n\ + ldr r0, ._1808 + 44\n\ + str r0, [r1]\n\ + ldrh r0, [r4]\n\ + mov r1, #0x0\n\ + bl GetMoveTarget\n\ + ldr r1, ._1808 + 48\n\ + strb r0, [r1]\n\ + ldr r2, ._1808 + 52\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0xe\n\ + b ._1807\n\ +._1809:\n\ + .align 2, 0\n\ +._1808:\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gBitTable\n\ + .word gCurrMovePos\n\ + .word gUnknown_02024BE5\n\ + .word gRandomMove\n\ + .word gBattleCommunication\n\ + .word gDynamicBasePower\n\ + .word +0x2000000\n\ + .word 0x1601c\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_IgnoresAndUsesRandomMove\n\ + .word gBankTarget\n\ + .word gHitMarker\n\ +._1803:\n\ + mov r4, r8\n\ + sub r0, r2, r4\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + mov r8, r0\n\ + bl Random\n\ + add r4, r5, #0\n\ + and r4, r4, r0\n\ + cmp r4, r8\n\ + bge ._1818 @cond_branch\n\ + mov r1, r9\n\ + ldrb r0, [r1]\n\ + add r1, r0, #0\n\ + mul r1, r1, r7\n\ + add r0, r6, #0\n\ + add r0, r0, #0x4c\n\ + add r0, r1, r0\n\ + ldr r0, [r0]\n\ + and r0, r0, r5\n\ + cmp r0, #0\n\ + bne ._1818 @cond_branch\n\ + add r0, r1, r6\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x48\n\ + beq ._1818 @cond_branch\n\ + cmp r0, #0xf\n\ + beq ._1818 @cond_branch\n\ + mov r2, #0x0\n\ + ldr r0, ._1820\n\ + ldrb r3, [r0]\n\ + add r7, r0, #0\n\ + cmp r2, r3\n\ + bge ._1816 @cond_branch\n\ + ldr r0, [r6, #0x50]\n\ + mov r1, #0x70\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1816 @cond_branch\n\ + add r1, r6, #0\n\ + add r1, r1, #0x50\n\ + mov r5, #0x70\n\ +._1817:\n\ + add r1, r1, #0x58\n\ + add r2, r2, #0x1\n\ + cmp r2, r3\n\ + bge ._1816 @cond_branch\n\ + ldr r0, [r1]\n\ + and r0, r0, r5\n\ + cmp r0, #0\n\ + beq ._1817 @cond_branch\n\ +._1816:\n\ + ldrb r7, [r7]\n\ + cmp r2, r7\n\ + bne ._1818 @cond_branch\n\ + ldr r1, ._1820 + 4\n\ + ldr r0, ._1820 + 8\n\ + b ._1819\n\ +._1821:\n\ + .align 2, 0\n\ +._1820:\n\ + .word gNoOfAllBanks\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_IgnoresAndFallsAsleep\n\ +._1818:\n\ + mov r2, r8\n\ + sub r4, r4, r2\n\ + cmp r4, r8\n\ + blt ._1822 @cond_branch\n\ +._1805:\n\ + bl Random\n\ + ldr r2, ._1824\n\ + mov r1, #0x3\n\ + and r1, r1, r0\n\ + strb r1, [r2, #0x5]\n\ + ldr r1, ._1824 + 4\n\ + ldr r0, ._1824 + 8\n\ +._1819:\n\ + str r0, [r1]\n\ + mov r0, #0x1\n\ + b ._1823\n\ +._1825:\n\ + .align 2, 0\n\ +._1824:\n\ + .word gBattleCommunication\n\ + .word gBattlescriptCurrInstr\n\ + .word BattleScript_MoveUsedLoafingAround\n\ +._1822:\n\ + ldr r4, ._1826\n\ + ldrb r1, [r4]\n\ + mov r0, #0x58\n\ + mul r1, r1, r0\n\ + ldr r0, ._1826 + 4\n\ + add r1, r1, r0\n\ + mov r0, #0x28\n\ + str r0, [sp]\n\ + mov r0, #0x0\n\ + str r0, [sp, #0x4]\n\ + ldrb r0, [r4]\n\ + str r0, [sp, #0x8]\n\ + ldrb r0, [r4]\n\ + str r0, [sp, #0xc]\n\ + add r0, r1, #0\n\ + mov r2, #0x1\n\ + mov r3, #0x0\n\ + bl CalculateBaseDamage\n\ + ldr r1, ._1826 + 8\n\ + str r0, [r1]\n\ + ldr r1, ._1826 + 12\n\ + ldrb r0, [r4]\n\ + strb r0, [r1]\n\ + ldr r1, ._1826 + 16\n\ + ldr r0, ._1826 + 20\n\ + str r0, [r1]\n\ + ldr r2, ._1826 + 24\n\ + ldr r0, [r2]\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0xc\n\ +._1807:\n\ + orr r0, r0, r1\n\ + str r0, [r2]\n\ + mov r0, #0x2\n\ +._1823:\n\ + add sp, sp, #0x10\n\ + pop {r3, r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4, r5, r6, r7}\n\ + pop {r1}\n\ + bx r1\n\ +._1827:\n\ + .align 2, 0\n\ +._1826:\n\ + .word gBankAttacker\n\ + .word gBattleMons\n\ + .word gBattleMoveDamage\n\ + .word gBankTarget\n\ + .word gBattlescriptCurrInstr\n\ + .word gUnknown_081D99A0\n\ + .word gHitMarker"); +} +#else u8 IsMonDisobedient(void) { u8 obedienceLevel; @@ -3477,3 +7949,4 @@ u8 IsMonDisobedient(void) } } } +#endif diff --git a/src/engine/link.c b/src/engine/link.c index 3bcacd12b..a716d5c2b 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -13,6 +13,7 @@ #include "constants/songs.h" #include "sound.h" #include "sprite.h" +#include "string_util.h" #include "strings2.h" #include "task.h" #include "text.h" @@ -1396,12 +1397,31 @@ void CB2_LinkError(void) static void CB2_PrintErrorMessage(void) { - u8 array[64] __attribute__((unused)); // unused + u8 array[32] __attribute__((unused)); // unused + u8 array2[32] __attribute__((unused)); // unused switch (gMain.state) { case 0: Menu_PrintTextPixelCoords(gMultiText_LinkError, 20, 56, 1); +#ifdef DEBUG + StringCopy(array, sColorCodes); + + ConvertIntToHexStringN(array2, sErrorLinkStatus, STR_CONV_MODE_LEADING_ZEROS, 8); + StringAppend(array, array2); + + StringAppend(array, sEmptyString); + + ConvertIntToHexStringN(array2, sErrorLastSendQueueCount, STR_CONV_MODE_LEADING_ZEROS, 2); + StringAppend(array, array2); + + StringAppend(array, sEmptyString); + + ConvertIntToHexStringN(array2, sErrorLastRecvQueueCount, STR_CONV_MODE_LEADING_ZEROS, 2); + StringAppend(array, array2); + + Menu_PrintText(array, 2, 15); +#endif break; case 30: case 60: -- cgit v1.2.3 From 6dea1a4af13d039c2bfe13170b3542cda535001b Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 17 Jan 2018 21:59:28 -0600 Subject: add debug code in battle_4.c and battle_controller_player.c --- src/battle/battle_4.c | 342 +++++++- src/battle/battle_controller_player.c | 1402 +++++++++++++++++++++++++++++++++ 2 files changed, 1742 insertions(+), 2 deletions(-) diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 3763fc309..038b4f5cf 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -1090,7 +1090,7 @@ static const u8 sTerrainToType[] = TYPE_NORMAL, // plain }; -static const u8 sBallCatchBonuses[] = +const u8 sBallCatchBonuses[] = { 20, 15, 10, 15 // Ultra, Great, Poke, Safari }; @@ -5018,7 +5018,156 @@ _0801F610: .4byte BattleScript_SAtkDown2\n\ } #endif // NONMATCHING - +#if DEBUG +__attribute__((naked)) +static void atk15_seteffectwithchance(void) +{ + asm("\ + push {r4, lr}\n\ + ldr r2, ._1037\n\ + ldr r0, ._1037 + 4\n\ + ldrb r1, [r0]\n\ + mov r0, #0x58\n\ + mul r0, r0, r1\n\ + add r0, r0, r2\n\ + add r0, r0, #0x20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x20\n\ + bne ._1035 @cond_branch\n\ + ldr r2, ._1037 + 8\n\ + ldr r0, ._1037 + 12\n\ + ldrh r1, [r0]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r2\n\ + ldrb r0, [r0, #0x5]\n\ + lsl r4, r0, #0x1\n\ + b ._1036\n\ +._1038:\n\ + .align 2, 0\n\ +._1037:\n\ + .word gBattleMons\n\ + .word gBankAttacker\n\ + .word gBattleMoves\n\ + .word gCurrentMove\n\ +._1035:\n\ + ldr r2, ._1045\n\ + ldr r0, ._1045 + 4\n\ + ldrh r1, [r0]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r2\n\ + ldrb r4, [r0, #0x5]\n\ +._1036:\n\ + ldr r0, ._1045 + 8\n\ + ldrb r1, [r0]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + ldr r2, ._1045 + 12\n\ + cmp r0, #0\n\ + beq ._1039 @cond_branch\n\ + ldrb r1, [r2, #0x3]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1040 @cond_branch\n\ + ldr r0, ._1045 + 16\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1050 @cond_branch\n\ +._1039:\n\ + ldrb r1, [r2, #0x3]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1043 @cond_branch\n\ +._1040:\n\ + ldr r0, ._1045 + 16\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1043 @cond_branch\n\ + ldr r2, ._1045 + 12\n\ + ldrb r1, [r2, #0x3]\n\ + mov r0, #0x7f\n\ + and r0, r0, r1\n\ + strb r0, [r2, #0x3]\n\ + b ._1044\n\ +._1046:\n\ + .align 2, 0\n\ +._1045:\n\ + .word gBattleMoves\n\ + .word gCurrentMove\n\ + .word gUnknown_02023A14+0x50\n\ + .word gBattleCommunication\n\ + .word gBattleMoveFlags\n\ +._1043:\n\ + bl Random\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + mov r1, #0x64\n\ + bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + lsl r0, r0, #0x10\n\ + lsr r0, r0, #0x10\n\ + cmp r0, r4\n\ + bhi ._1049 @cond_branch\n\ + ldr r0, ._1052\n\ + ldrb r0, [r0, #0x3]\n\ + cmp r0, #0\n\ + beq ._1049 @cond_branch\n\ + ldr r0, ._1052 + 4\n\ + ldrb r1, [r0]\n\ + mov r0, #0x29\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1049 @cond_branch\n\ + cmp r4, #0x63\n\ + bls ._1050 @cond_branch\n\ +._1044:\n\ + mov r0, #0x0\n\ + mov r1, #0x80\n\ + bl SetMoveEffect\n\ + b ._1054\n\ +._1053:\n\ + .align 2, 0\n\ +._1052:\n\ + .word gBattleCommunication\n\ + .word gBattleMoveFlags\n\ +._1050:\n\ + mov r0, #0x0\n\ + mov r1, #0x0\n\ + bl SetMoveEffect\n\ + b ._1054\n\ +._1049:\n\ + ldr r1, ._1055\n\ + ldr r0, [r1]\n\ + add r0, r0, #0x1\n\ + str r0, [r1]\n\ +._1054:\n\ + ldr r0, ._1055 + 4\n\ + mov r1, #0x0\n\ + strb r1, [r0, #0x3]\n\ + ldr r0, ._1055 + 8\n\ + ldr r2, ._1055 + 12\n\ + add r0, r0, r2\n\ + strb r1, [r0]\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._1056:\n\ + .align 2, 0\n\ +._1055:\n\ + .word gBattlescriptCurrInstr\n\ + .word gBattleCommunication\n\ + .word +0x2000000\n\ + .word 0x16112"); +} +#else static void atk15_seteffectwithchance(void) { u32 PercentChance; @@ -5043,6 +5192,7 @@ static void atk15_seteffectwithchance(void) gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattleStruct->unk16112 = 0; } +#endif static void atk16_seteffectprimary(void) { @@ -12620,6 +12770,193 @@ static void atk9D_mimicattackcopy(void) } } +#if DEBUG +__attribute__((naked)) +static void atk9E_metronome(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + ldr r6, ._3076\n\ + ldrb r2, [r6]\n\ + lsl r1, r2, #0x1\n\ + ldr r0, ._3076 + 4\n\ + add r3, r1, r0\n\ + ldr r5, ._3076 + 8\n\ + mov r4, #0x58\n\ + add r0, r2, #0\n\ + mul r0, r0, r4\n\ + add r1, r0, r5\n\ + ldrh r0, [r1, #0xe]\n\ + cmp r0, #0\n\ + bne ._3071 @cond_branch\n\ + ldrh r2, [r1, #0x10]\n\ + cmp r2, #0\n\ + beq ._3071 @cond_branch\n\ + ldrh r0, [r1, #0x12]\n\ + cmp r0, #0\n\ + beq ._3071 @cond_branch\n\ + ldrh r0, [r3]\n\ + cmp r0, #0\n\ + bne ._3072 @cond_branch\n\ + strh r2, [r3]\n\ +._3072:\n\ + ldr r1, ._3076 + 12\n\ + ldrh r0, [r3]\n\ + strh r0, [r1]\n\ + ldrb r0, [r6]\n\ + mul r0, r0, r4\n\ + add r0, r0, r5\n\ + ldrh r5, [r0, #0x10]\n\ + ldrh r2, [r0, #0x12]\n\ + add r7, r1, #0\n\ + cmp r5, r2\n\ + bcs ._3073 @cond_branch\n\ + ldrh r0, [r3]\n\ + cmp r0, r2\n\ + beq ._3074 @cond_branch\n\ + add r0, r0, #0x1\n\ + b ._3079\n\ +._3077:\n\ + .align 2, 0\n\ +._3076:\n\ + .word gBankAttacker\n\ + .word +0x20160b4\n\ + .word gBattleMons\n\ + .word gCurrentMove\n\ +._3073:\n\ + ldrh r4, [r3]\n\ + add r1, r4, #0\n\ + mov r0, #0xb1\n\ + lsl r0, r0, #0x1\n\ + cmp r1, r0\n\ + bne ._3078 @cond_branch\n\ + mov r0, #0x1\n\ + b ._3079\n\ +._3078:\n\ + cmp r1, r2\n\ + bne ._3080 @cond_branch\n\ +._3074:\n\ + strh r5, [r3]\n\ + b ._3081\n\ +._3080:\n\ + add r0, r4, #1\n\ +._3079:\n\ + strh r0, [r3]\n\ +._3081:\n\ + ldr r4, ._3083\n\ + ldr r2, [r4]\n\ + ldr r0, ._3083 + 4\n\ + and r2, r2, r0\n\ + str r2, [r4]\n\ + ldr r6, ._3083 + 8\n\ + ldr r5, ._3083 + 12\n\ + ldr r3, ._3083 + 16\n\ + ldrh r1, [r7]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r3\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r5\n\ + ldr r0, [r0]\n\ + str r0, [r6]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x4\n\ + orr r2, r2, r0\n\ + str r2, [r4]\n\ + ldrh r0, [r7]\n\ + b ._3082\n\ +._3084:\n\ + .align 2, 0\n\ +._3083:\n\ + .word gHitMarker\n\ + .word 0xfffffbff\n\ + .word gBattlescriptCurrInstr\n\ + .word gBattleScriptsForMoveEffects\n\ + .word gBattleMoves\n\ +._3071:\n\ + ldr r7, ._3090\n\ + mov r6, #0xb1\n\ + lsl r6, r6, #0x1\n\ + ldr r5, ._3090 + 4\n\ + ldr r0, ._3090 + 8\n\ + mov r8, r0\n\ +._3089:\n\ + bl Random\n\ + ldr r2, ._3090 + 12\n\ + add r1, r2, #0\n\ + and r0, r0, r1\n\ + add r0, r0, #0x1\n\ + strh r0, [r7]\n\ + cmp r0, r6\n\ + bhi ._3089 @cond_branch\n\ + mov r0, #0x3\n\ +._3086:\n\ + sub r0, r0, #0x1\n\ + cmp r0, #0\n\ + bge ._3086 @cond_branch\n\ + ldr r4, ._3090\n\ + ldrh r2, [r4]\n\ + ldr r3, ._3090 + 16\n\ + sub r0, r5, #2\n\ +._3088:\n\ + add r0, r0, #0x2\n\ + ldrh r1, [r0]\n\ + cmp r1, r2\n\ + beq ._3087 @cond_branch\n\ + cmp r1, r3\n\ + bne ._3088 @cond_branch\n\ +._3087:\n\ + ldr r0, ._3090 + 16\n\ + cmp r1, r0\n\ + bne ._3089 @cond_branch\n\ + ldr r2, ._3090 + 20\n\ + ldr r0, [r2]\n\ + ldr r1, ._3090 + 24\n\ + and r0, r0, r1\n\ + str r0, [r2]\n\ + ldr r3, ._3090 + 28\n\ + ldr r2, ._3090 + 32\n\ + ldrh r1, [r4]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r2\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r3\n\ + ldr r0, [r0]\n\ + mov r1, r8\n\ + str r0, [r1]\n\ + ldrh r0, [r4]\n\ +._3082:\n\ + mov r1, #0x0\n\ + bl GetMoveTarget\n\ + ldr r1, ._3090 + 36\n\ + strb r0, [r1]\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._3091:\n\ + .align 2, 0\n\ +._3090:\n\ + .word gCurrentMove\n\ + .word sMovesForbiddenToCopy\n\ + .word gBattlescriptCurrInstr\n\ + .word 0x1ff\n\ + .word 0xffff\n\ + .word gHitMarker\n\ + .word 0xfffffbff\n\ + .word gBattleScriptsForMoveEffects\n\ + .word gBattleMoves\n\ + .word gBankTarget"); +} +#else #ifdef NONMATCHING static void atk9E_metronome(void) { @@ -12721,6 +13058,7 @@ _0802795C: .4byte gBankTarget\n\ .syntax divided"); } #endif // NONMATCHING +#endif static void atk9F_dmgtolevel(void) { diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 0d05b7aed..eaabe9b53 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -617,6 +617,725 @@ struct ChooseMoveStruct const u8 gUnknown_081FAE80[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}"); +#if DEBUG +__attribute__((naked)) +void sub_802C68C(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, sl\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5, r6, r7}\n\ + add sp, sp, #0xfffffff8\n\ + mov r0, #0x0\n\ + mov r8, r0\n\ + mov r7, #0x0\n\ + ldr r1, ._131\n\ + ldrb r2, [r1]\n\ + lsl r1, r2, #0x9\n\ + ldr r0, ._131 + 4\n\ + add r6, r1, r0\n\ + ldr r0, ._131 + 8\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r5, #0x1\n\ + add r0, r5, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._126 @cond_branch\n\ + b ._127\n\ +._126:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r1, ._131 + 12\n\ + ldr r2, ._131\n\ + ldrb r0, [r2]\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x1\n\ + add r1, r6, r0\n\ + ldrh r0, [r1]\n\ + cmp r0, #0xae\n\ + bne ._128 @cond_branch\n\ + ldrb r0, [r6, #0x12]\n\ + mov r4, #0x0\n\ + cmp r0, #0x7\n\ + beq ._130 @cond_branch\n\ + ldrb r1, [r6, #0x13]\n\ + mov r0, #0x7\n\ + eor r1, r1, r0\n\ + neg r0, r1\n\ + orr r0, r0, r1\n\ + asr r4, r0, #0x1f\n\ + mov r0, #0x10\n\ + and r4, r4, r0\n\ + b ._130\n\ +._132:\n\ + .align 2, 0\n\ +._131:\n\ + .word gActiveBank\n\ + .word gUnknown_02023A64\n\ + .word gMain\n\ + .word gMoveSelectionCursor\n\ +._128:\n\ + ldr r2, ._135\n\ + ldrh r1, [r1]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r2\n\ + ldrb r4, [r0, #0x6]\n\ +._130:\n\ + mov r0, #0x10\n\ + and r0, r0, r4\n\ + cmp r0, #0\n\ + beq ._133 @cond_branch\n\ + ldr r0, ._135 + 4\n\ + ldr r1, ._135 + 8\n\ + ldrb r1, [r1]\n\ + strb r1, [r0]\n\ + b ._134\n\ +._136:\n\ + .align 2, 0\n\ +._135:\n\ + .word gBattleMoves\n\ + .word gUnknown_03004344\n\ + .word gActiveBank\n\ +._133:\n\ + ldr r0, ._141\n\ + ldrb r0, [r0]\n\ + bl GetBankIdentity\n\ + add r1, r0, #0\n\ + mov r2, #0x1\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + eor r0, r0, r2\n\ + bl GetBankByIdentity\n\ + ldr r1, ._141 + 4\n\ + strb r0, [r1]\n\ +._134:\n\ + ldr r3, ._141 + 8\n\ + ldr r5, ._141\n\ + ldrb r2, [r5]\n\ + lsl r1, r2, #0x9\n\ + add r0, r3, #1\n\ + add r0, r1, r0\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._137 @cond_branch\n\ + mov r0, #0x2\n\ + and r0, r0, r4\n\ + cmp r0, #0\n\ + beq ._146 @cond_branch\n\ + add r0, r3, #2\n\ + add r0, r1, r0\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._146 @cond_branch\n\ + mov r0, #0x1\n\ + add r8, r8, r0\n\ + b ._146\n\ +._142:\n\ + .align 2, 0\n\ +._141:\n\ + .word gActiveBank\n\ + .word gUnknown_03004344\n\ + .word gBattleBufferA\n\ +._137:\n\ + mov r0, #0x7d\n\ + and r0, r0, r4\n\ + cmp r0, #0\n\ + bne ._143 @cond_branch\n\ + mov r1, #0x1\n\ + add r8, r8, r1\n\ +._143:\n\ + ldr r0, ._149\n\ + add r0, r2, r0\n\ + add r1, r6, #0\n\ + add r1, r1, #0x8\n\ + ldrb r0, [r0]\n\ + add r1, r1, r0\n\ + ldrb r0, [r1]\n\ + cmp r0, #0\n\ + beq ._144 @cond_branch\n\ + mov r0, #0x12\n\ + and r0, r0, r4\n\ + cmp r0, #0\n\ + bne ._146 @cond_branch\n\ + mov r0, #0x0\n\ + bl CountAliveMons\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bhi ._146 @cond_branch\n\ + ldrb r0, [r5]\n\ + bl sub_803C434\n\ + ldr r1, ._149 + 4\n\ + strb r0, [r1]\n\ + mov r2, #0x0\n\ + mov r8, r2\n\ +._146:\n\ + mov r0, r8\n\ + cmp r0, #0\n\ + bne ._147 @cond_branch\n\ +._144:\n\ + bl DestroyMenuCursor\n\ + ldr r1, ._149\n\ + ldr r0, ._149 + 8\n\ + ldrb r0, [r0]\n\ + add r0, r0, r1\n\ + ldrb r2, [r0]\n\ + ldr r0, ._149 + 4\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x8\n\ + orr r2, r2, r0\n\ + b ._148\n\ +._150:\n\ + .align 2, 0\n\ +._149:\n\ + .word gMoveSelectionCursor\n\ + .word gUnknown_03004344\n\ + .word gActiveBank\n\ +._147:\n\ + ldr r1, ._153\n\ + ldr r2, ._153 + 4\n\ + ldrb r0, [r2]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, ._153 + 8\n\ + str r1, [r0]\n\ + mov r0, #0x12\n\ + and r4, r4, r0\n\ + cmp r4, #0\n\ + beq ._151 @cond_branch\n\ + ldr r1, ._153 + 12\n\ + ldrb r0, [r2]\n\ + b ._152\n\ +._154:\n\ + .align 2, 0\n\ +._153:\n\ + .word gBattleBankFunc\n\ + .word gActiveBank\n\ + .word sub_802C2EC+1\n\ + .word gUnknown_03004344\n\ +._151:\n\ + mov r0, #0x1\n\ + bl GetBankByIdentity\n\ + ldr r1, ._157\n\ + ldrb r1, [r1]\n\ + ldr r2, ._157 + 4\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x16\n\ + add r0, r0, r2\n\ + ldr r0, [r0]\n\ + and r1, r1, r0\n\ + cmp r1, #0\n\ + beq ._155 @cond_branch\n\ + mov r0, #0x3\n\ + b ._156\n\ +._158:\n\ + .align 2, 0\n\ +._157:\n\ + .word gAbsentBankFlags\n\ + .word gBitTable\n\ +._155:\n\ + mov r0, #0x1\n\ +._156:\n\ + bl GetBankByIdentity\n\ + ldr r1, ._160\n\ +._152:\n\ + strb r0, [r1]\n\ + ldr r2, ._160 + 4\n\ + ldr r1, ._160 + 8\n\ + ldr r0, ._160\n\ + ldrb r0, [r0]\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x4\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r2, r2, #0x1c\n\ + add r0, r0, r2\n\ + ldr r1, ._160 + 12\n\ + b ._203\n\ +._161:\n\ + .align 2, 0\n\ +._160:\n\ + .word gUnknown_03004344\n\ + .word gSprites\n\ + .word gObjectBankIDs\n\ + .word sub_8010520+1\n\ +._127:\n\ + mov r6, #0x2\n\ + add r0, r6, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._162 @cond_branch\n\ + bl DestroyMenuCursor\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._164\n\ + strh r7, [r0]\n\ + ldr r1, ._164 + 4\n\ + mov r2, #0xa0\n\ + lsl r2, r2, #0x1\n\ + add r0, r2, #0\n\ + strh r0, [r1]\n\ + ldr r2, ._164 + 8\n\ +._148:\n\ + mov r0, #0x1\n\ + mov r1, #0xa\n\ + bl Emitcmd33\n\ + bl PlayerBufferExecCompleted\n\ + b ._209\n\ +._165:\n\ + .align 2, 0\n\ +._164:\n\ + .word gBattle_BG0_X\n\ + .word gBattle_BG0_Y\n\ + .word 0xffff\n\ +._162:\n\ + mov r0, #0x20\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._166 @cond_branch\n\ + ldr r4, ._170\n\ + add r2, r2, r4\n\ + ldrb r1, [r2]\n\ + add r0, r5, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._167 @cond_branch\n\ + b ._209\n\ +._167:\n\ + ldrb r0, [r2]\n\ + bl nullsub_7\n\ + ldr r0, ._170 + 4\n\ + ldrb r1, [r0]\n\ + add r1, r1, r4\n\ + ldrb r0, [r1]\n\ + mov r2, #0x1\n\ + eor r0, r0, r2\n\ + b ._183\n\ +._171:\n\ + .align 2, 0\n\ +._170:\n\ + .word gMoveSelectionCursor\n\ + .word gActiveBank\n\ +._166:\n\ + mov r3, #0x10\n\ + add r0, r3, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._172 @cond_branch\n\ + ldr r4, ._178\n\ + add r3, r2, r4\n\ + ldrb r2, [r3]\n\ + mov r6, #0x1\n\ + add r0, r5, #0\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + beq ._173 @cond_branch\n\ + b ._209\n\ +._173:\n\ + ldr r1, ._178 + 4\n\ + add r0, r6, #0\n\ + eor r0, r0, r2\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc ._175 @cond_branch\n\ + b ._209\n\ +._175:\n\ + ldrb r0, [r3]\n\ + bl nullsub_7\n\ + ldr r2, ._178 + 8\n\ + ldrb r1, [r2]\n\ + add r1, r1, r4\n\ + ldrb r0, [r1]\n\ + eor r0, r0, r6\n\ + b ._183\n\ +._179:\n\ + .align 2, 0\n\ +._178:\n\ + .word gMoveSelectionCursor\n\ + .word gUnknown_03004348\n\ + .word gActiveBank\n\ +._172:\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._180 @cond_branch\n\ + ldr r4, ._184\n\ + add r2, r2, r4\n\ + ldrb r1, [r2]\n\ + add r0, r6, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._181 @cond_branch\n\ + b ._209\n\ +._181:\n\ + ldrb r0, [r2]\n\ + bl nullsub_7\n\ + ldr r2, ._184 + 4\n\ + ldrb r1, [r2]\n\ + add r1, r1, r4\n\ + ldrb r0, [r1]\n\ + mov r2, #0x2\n\ + eor r0, r0, r2\n\ + b ._183\n\ +._185:\n\ + .align 2, 0\n\ +._184:\n\ + .word gMoveSelectionCursor\n\ + .word gActiveBank\n\ +._180:\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._186 @cond_branch\n\ + ldr r4, ._192\n\ + add r3, r2, r4\n\ + ldrb r2, [r3]\n\ + mov r5, #0x2\n\ + add r0, r6, #0\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + beq ._187 @cond_branch\n\ + b ._209\n\ +._187:\n\ + ldr r1, ._192 + 4\n\ + add r0, r5, #0\n\ + eor r0, r0, r2\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc ._189 @cond_branch\n\ + b ._209\n\ +._189:\n\ + ldrb r0, [r3]\n\ + bl nullsub_7\n\ + ldr r2, ._192 + 8\n\ + ldrb r1, [r2]\n\ + add r1, r1, r4\n\ + ldrb r0, [r1]\n\ + eor r0, r0, r5\n\ +._183:\n\ + strb r0, [r1]\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r1, ._192 + 8\n\ + ldrb r0, [r1]\n\ + add r0, r0, r4\n\ + ldrb r0, [r0]\n\ + mov r1, #0x0\n\ + bl sub_802E3B4\n\ + bl sub_802E220\n\ + bl sub_802E2D4\n\ + b ._209\n\ +._193:\n\ + .align 2, 0\n\ +._192:\n\ + .word gMoveSelectionCursor\n\ + .word gUnknown_03004348\n\ + .word gActiveBank\n\ +._186:\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._194 @cond_branch\n\ + ldr r0, ._201\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bhi ._195 @cond_branch\n\ + b ._209\n\ +._195:\n\ + ldr r0, ._201 + 4\n\ + ldrh r1, [r0]\n\ + add r0, r6, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._197 @cond_branch\n\ + b ._209\n\ +._197:\n\ + ldr r4, ._201 + 8\n\ + add r0, r2, r4\n\ + ldrb r0, [r0]\n\ + ldr r1, ._201 + 12\n\ + bl sub_802E12C\n\ + ldr r2, ._201 + 16\n\ + ldrb r0, [r2]\n\ + add r0, r0, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._199 @cond_branch\n\ + ldr r0, ._201 + 20\n\ + strb r7, [r0]\n\ + b ._200\n\ +._202:\n\ + .align 2, 0\n\ +._201:\n\ + .word gUnknown_03004348\n\ + .word gBattleTypeFlags\n\ + .word gMoveSelectionCursor\n\ + .word gUnknown_081FAE80\n\ + .word gActiveBank\n\ + .word gUnknown_03004344\n\ +._199:\n\ + ldr r1, ._204\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + add r0, r1, #0\n\ +._200:\n\ + ldrb r0, [r0]\n\ + mov r1, #0x1b\n\ + bl sub_802E3B4\n\ + ldr r4, ._204 + 4\n\ + ldr r1, ._204 + 8\n\ + mov r0, #0x1c\n\ + str r0, [sp]\n\ + mov r0, #0x3a\n\ + str r0, [sp, #0x4]\n\ + add r0, r4, #0\n\ + mov r2, #0x17\n\ + mov r3, #0x37\n\ + bl Text_FillWindowRect\n\ + ldr r1, ._204 + 12\n\ + mov r2, #0xa4\n\ + lsl r2, r2, #0x2\n\ + mov r0, #0x37\n\ + str r0, [sp]\n\ + add r0, r4, #0\n\ + mov r3, #0x17\n\ + bl Text_InitWindow\n\ + add r0, r4, #0\n\ + bl Text_PrintWindow8002F44\n\ + ldr r1, ._204 + 16\n\ + ldr r0, ._204 + 20\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, ._204 + 24\n\ + b ._203\n\ +._205:\n\ + .align 2, 0\n\ +._204:\n\ + .word gUnknown_03004344\n\ + .word gUnknown_03004210\n\ + .word 0x1016\n\ + .word BattleText_SwitchWhich\n\ + .word gBattleBankFunc\n\ + .word gActiveBank\n\ + .word sub_802CA60+1\n\ +._194:\n\ + ldr r0, ._214\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + beq ._206 @cond_branch\n\ + b ._209\n\ +._206:\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._208 @cond_branch\n\ + b ._209\n\ +._208:\n\ + ldr r6, ._214 + 4\n\ + ldr r1, ._214 + 8\n\ + str r3, [sp]\n\ + mov r0, #0x3a\n\ + str r0, [sp, #0x4]\n\ + add r0, r6, #0\n\ + mov r2, #0x1\n\ + mov r3, #0x37\n\ + bl Text_FillWindowRect\n\ + ldr r0, ._214 + 12\n\ + mov sl, r0\n\ + ldr r1, ._214 + 16\n\ + ldrb r0, [r1]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, sl\n\ + ldrh r0, [r0]\n\ + mov r2, #0x64\n\ + mov r9, r2\n\ + mov r1, r9\n\ + mul r1, r1, r0\n\ + add r0, r1, #0\n\ + ldr r5, ._214 + 20\n\ + add r0, r0, r5\n\ + mov r1, #0xd\n\ + bl GetMonData\n\ + mov r1, #0xd\n\ + mul r1, r1, r0\n\ + ldr r0, ._214 + 24\n\ + add r1, r1, r0\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0x1\n\ + mov r0, #0x37\n\ + mov r8, r0\n\ + str r0, [sp]\n\ + add r0, r6, #0\n\ + mov r3, #0x2\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r4, ._214 + 28\n\ + ldr r1, ._214 + 16\n\ + ldrb r0, [r1]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, sl\n\ + ldrh r0, [r0]\n\ + mov r2, r9\n\ + mul r2, r2, r0\n\ + add r0, r2, #0\n\ + add r0, r0, r5\n\ + mov r1, #0xd\n\ + bl GetMonData\n\ + add r1, r0, #0\n\ + add r0, r4, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x3\n\ + bl ConvertIntToDecimalStringN\n\ + mov r2, #0x88\n\ + lsl r2, r2, #0x1\n\ + mov r0, r8\n\ + str r0, [sp]\n\ + add r0, r6, #0\n\ + add r1, r4, #0\n\ + mov r3, #0xa\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r1, ._214 + 32\n\ + mov r2, #0x8b\n\ + lsl r2, r2, #0x1\n\ + mov r5, #0x39\n\ + str r5, [sp]\n\ + add r0, r6, #0\n\ + mov r3, #0x1\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r0, ._214 + 36\n\ + ldrb r1, [r0]\n\ + add r0, r4, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x3\n\ + bl ConvertIntToDecimalStringN\n\ + mov r2, #0x8e\n\ + lsl r2, r2, #0x1\n\ + str r5, [sp]\n\ + add r0, r6, #0\n\ + add r1, r4, #0\n\ + mov r3, #0x4\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r0, ._214 + 40\n\ + add r2, r0, #0\n\ + add r2, r2, #0x3e\n\ + mov r1, #0x3f\n\ +._211:\n\ + ldrb r0, [r2]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._210 @cond_branch\n\ + add r0, r7, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ +._210:\n\ + add r2, r2, #0x44\n\ + sub r1, r1, #0x1\n\ + cmp r1, #0\n\ + bge ._211 @cond_branch\n\ + ldr r4, ._214 + 28\n\ + add r0, r4, #0\n\ + add r1, r7, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x2\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r6, ._214 + 4\n\ + mov r2, #0x91\n\ + lsl r2, r2, #0x1\n\ + mov r5, #0x39\n\ + str r5, [sp]\n\ + add r0, r6, #0\n\ + add r1, r4, #0\n\ + mov r3, #0x8\n\ + bl Text_InitWindowAndPrintText\n\ + bl GetTaskCount\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + add r0, r4, #0\n\ + add r1, r7, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x2\n\ + bl ConvertIntToDecimalStringN\n\ + mov r2, #0x93\n\ + lsl r2, r2, #0x1\n\ + str r5, [sp]\n\ + add r0, r6, #0\n\ + add r1, r4, #0\n\ + mov r3, #0xb\n\ + bl Text_InitWindowAndPrintText\n\ + mov r1, #0x0\n\ + mov r7, #0x0\n\ + ldr r0, ._214 + 44\n\ + mov r3, #0x1\n\ + ldr r2, [r0]\n\ +._213:\n\ + add r0, r3, #0\n\ + LSL r0, r1\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + beq ._212 @cond_branch\n\ + add r0, r7, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ +._212:\n\ + add r1, r1, #0x1\n\ + cmp r1, #0x1f\n\ + ble ._213 @cond_branch\n\ + ldr r4, ._214 + 28\n\ + add r0, r4, #0\n\ + add r1, r7, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x2\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r0, ._214 + 4\n\ + mov r2, #0x95\n\ + lsl r2, r2, #0x1\n\ + mov r1, #0x39\n\ + str r1, [sp]\n\ + add r1, r4, #0\n\ + mov r3, #0xe\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r1, ._214 + 48\n\ + ldr r0, ._214 + 16\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, ._214 + 52\n\ +._203:\n\ + str r1, [r0]\n\ +._209:\n\ + add sp, sp, #0x8\n\ + pop {r3, r4, r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov sl, r5\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._215:\n\ + .align 2, 0\n\ +._214:\n\ + .word gUnknown_020297ED\n\ + .word gUnknown_03004210\n\ + .word 0x1016\n\ + .word gBattlePartyID\n\ + .word gActiveBank\n\ + .word gPlayerParty\n\ + .word gMoveNames\n\ + .word gDisplayedStringBattle\n\ + .word sBallCatchBonuses+0x4\n\ + .word gAnimMoveTurn\n\ + .word gSprites\n\ + .word gOamMatrixAllocBitmap\n\ + .word gBattleBankFunc\n\ + .word debug_sub_8030C24+1"); +} +#else void sub_802C68C(void) { u32 r8 = 0; @@ -751,6 +1470,7 @@ void sub_802C68C(void) } } } +#endif extern const u8 BattleText_Format[]; @@ -956,6 +1676,688 @@ void sub_802D18C(void) } } +#if DEBUG +__attribute__((naked)) +void debug_sub_8030C24(void) +{ + asm("\ + push {r4, r5, r6, lr}\n\ + add sp, sp, #0xfffffff4\n\ + ldr r1, ._293\n\ + ldr r4, ._293 + 4\n\ + ldrb r0, [r4]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + mov r0, #0x64\n\ + mul r0, r0, r1\n\ + ldr r1, ._293 + 8\n\ + add r0, r0, r1\n\ + mov r1, #0xd\n\ + bl GetMonData\n\ + add r1, sp, #0x8\n\ + strh r0, [r1]\n\ + ldr r5, ._293 + 12\n\ + ldrh r1, [r5, #0x30]\n\ + cmp r1, #0x20\n\ + bne ._286 @cond_branch\n\ + b ._287\n\ +._286:\n\ + cmp r1, #0x20\n\ + bgt ._288 @cond_branch\n\ + cmp r1, #0x8\n\ + beq ._289 @cond_branch\n\ + cmp r1, #0x8\n\ + bgt ._290 @cond_branch\n\ + cmp r1, #0x4\n\ + beq ._291 @cond_branch\n\ + b ._348\n\ +._294:\n\ + .align 2, 0\n\ +._293:\n\ + .word gBattlePartyID\n\ + .word gActiveBank\n\ + .word gPlayerParty\n\ + .word gMain\n\ +._290:\n\ + cmp r1, #0x10\n\ + bne ._295 @cond_branch\n\ + b ._296\n\ +._295:\n\ + b ._348\n\ +._288:\n\ + cmp r1, #0x80\n\ + bne ._298 @cond_branch\n\ + b ._302\n\ +._298:\n\ + cmp r1, #0x80\n\ + bgt ._300 @cond_branch\n\ + cmp r1, #0x40\n\ + bne ._301 @cond_branch\n\ + b ._302\n\ +._301:\n\ + b ._348\n\ +._300:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + cmp r1, r0\n\ + bne ._304 @cond_branch\n\ + b ._305\n\ +._304:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x2\n\ + cmp r1, r0\n\ + bne ._306 @cond_branch\n\ + b ._307\n\ +._306:\n\ + b ._348\n\ +._289:\n\ + ldrb r0, [r4]\n\ + mov r1, #0x1\n\ + bl dp11b_obj_free\n\ + ldrb r0, [r4]\n\ + mov r1, #0x0\n\ + bl dp11b_obj_free\n\ + ldr r0, ._312\n\ + ldrb r2, [r4]\n\ + strb r2, [r0]\n\ + ldrh r1, [r5, #0x28]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._310 @cond_branch\n\ + ldr r0, ._312 + 4\n\ + ldrh r1, [r0]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._310 @cond_branch\n\ + ldr r0, ._312 + 8\n\ + mov r1, #0x2\n\ + eor r1, r1, r2\n\ + strb r1, [r0]\n\ + b ._311\n\ +._313:\n\ + .align 2, 0\n\ +._312:\n\ + .word gBankAttacker\n\ + .word gBattleTypeFlags\n\ + .word gBankTarget\n\ +._310:\n\ + ldr r0, ._317\n\ + ldrh r1, [r0, #0x28]\n\ + mov r2, #0x1\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._315 @cond_branch\n\ + ldr r0, ._317 + 4\n\ + ldrh r1, [r0]\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._315 @cond_branch\n\ + mov r0, #0x3\n\ + b ._316\n\ +._318:\n\ + .align 2, 0\n\ +._317:\n\ + .word gMain\n\ + .word gBattleTypeFlags\n\ +._315:\n\ + mov r0, #0x1\n\ +._316:\n\ + bl GetBankByIdentity\n\ + ldr r1, ._320\n\ + strb r0, [r1]\n\ +._311:\n\ + mov r0, #0x0\n\ + bl sub_80326EC\n\ + add r0, sp, #0x8\n\ + ldrh r0, [r0]\n\ + bl DoMoveAnim\n\ + ldr r1, ._320 + 4\n\ + ldr r0, ._320 + 8\n\ + ldrb r0, [r0]\n\ + b ._332\n\ +._321:\n\ + .align 2, 0\n\ +._320:\n\ + .word gBankTarget\n\ + .word gBattleBankFunc\n\ + .word gActiveBank\n\ +._291:\n\ + ldrb r0, [r4]\n\ + mov r1, #0x1\n\ + bl dp11b_obj_free\n\ + ldrb r0, [r4]\n\ + mov r1, #0x0\n\ + bl dp11b_obj_free\n\ + ldr r0, ._325\n\ + ldrb r2, [r4]\n\ + strb r2, [r0]\n\ + ldrh r1, [r5, #0x28]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._323 @cond_branch\n\ + ldr r0, ._325 + 4\n\ + ldrh r1, [r0]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._323 @cond_branch\n\ + ldr r0, ._325 + 8\n\ + mov r1, #0x2\n\ + eor r1, r1, r2\n\ + strb r1, [r0]\n\ + b ._324\n\ +._326:\n\ + .align 2, 0\n\ +._325:\n\ + .word gBankTarget\n\ + .word gBattleTypeFlags\n\ + .word gBankAttacker\n\ +._323:\n\ + ldr r0, ._330\n\ + ldrh r1, [r0, #0x28]\n\ + mov r2, #0x1\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._328 @cond_branch\n\ + ldr r0, ._330 + 4\n\ + ldrh r1, [r0]\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._328 @cond_branch\n\ + mov r0, #0x3\n\ + b ._329\n\ +._331:\n\ + .align 2, 0\n\ +._330:\n\ + .word gMain\n\ + .word gBattleTypeFlags\n\ +._328:\n\ + mov r0, #0x1\n\ +._329:\n\ + bl GetBankByIdentity\n\ + ldr r1, ._333\n\ + strb r0, [r1]\n\ +._324:\n\ + mov r0, #0x0\n\ + bl sub_80326EC\n\ + add r0, sp, #0x8\n\ + ldrh r0, [r0]\n\ + bl DoMoveAnim\n\ + ldr r1, ._333 + 4\n\ + ldr r0, ._333 + 8\n\ + ldrb r0, [r0]\n\ + b ._332\n\ +._334:\n\ + .align 2, 0\n\ +._333:\n\ + .word gBankAttacker\n\ + .word gBattleBankFunc\n\ + .word gActiveBank\n\ +._305:\n\ + ldrh r1, [r5, #0x28]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._336 @cond_branch\n\ + ldr r0, ._338\n\ + ldrh r1, [r0]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._336 @cond_branch\n\ + ldrb r0, [r4]\n\ + mov r1, #0x1\n\ + bl dp11b_obj_free\n\ + ldrb r0, [r4]\n\ + mov r1, #0x0\n\ + bl dp11b_obj_free\n\ + mov r0, #0x3\n\ + bl GetBankByIdentity\n\ + ldr r1, ._338 + 4\n\ + strb r0, [r1]\n\ + mov r0, #0x1\n\ + b ._337\n\ +._339:\n\ + .align 2, 0\n\ +._338:\n\ + .word gBattleTypeFlags\n\ + .word gBankAttacker\n\ +._336:\n\ + add r0, sp, #0x8\n\ + mov r1, #0x0\n\ + ldsh r0, [r0, r1]\n\ + add r0, r0, #0x9\n\ + add r1, sp, #0x8\n\ + strh r0, [r1]\n\ +._296:\n\ + add r0, sp, #0x8\n\ + mov r2, #0x0\n\ + ldsh r0, [r0, r2]\n\ + add r0, r0, #0x1\n\ + lsl r2, r0, #0x10\n\ + add r1, sp, #0x8\n\ + strh r0, [r1]\n\ + mov r0, #0xb1\n\ + lsl r0, r0, #0x11\n\ + cmp r2, r0\n\ + ble ._347 @cond_branch\n\ + mov r1, #0x1\n\ + add r0, sp, #0x8\n\ + strh r1, [r0]\n\ + b ._347\n\ +._307:\n\ + ldrh r1, [r5, #0x28]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._343 @cond_branch\n\ + ldr r0, ._345\n\ + ldrh r1, [r0]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._343 @cond_branch\n\ + ldrb r0, [r4]\n\ + mov r1, #0x1\n\ + bl dp11b_obj_free\n\ + ldrb r0, [r4]\n\ + mov r1, #0x0\n\ + bl dp11b_obj_free\n\ + mov r0, #0x1\n\ + bl GetBankByIdentity\n\ + ldr r1, ._345 + 4\n\ + strb r0, [r1]\n\ + mov r0, #0x3\n\ +._337:\n\ + bl GetBankByIdentity\n\ + ldr r1, ._345 + 8\n\ + strb r0, [r1]\n\ + mov r0, #0x0\n\ + bl sub_80326EC\n\ + add r0, sp, #0x8\n\ + ldrh r0, [r0]\n\ + bl DoMoveAnim\n\ + ldr r1, ._345 + 12\n\ + ldrb r0, [r4]\n\ +._332:\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, ._345 + 16\n\ + str r1, [r0]\n\ + b ._348\n\ +._346:\n\ + .align 2, 0\n\ +._345:\n\ + .word gBattleTypeFlags\n\ + .word gBankAttacker\n\ + .word gBankTarget\n\ + .word gBattleBankFunc\n\ + .word debug_sub_803107C+1\n\ +._343:\n\ + add r1, sp, #0x8\n\ + add r0, r1, #0\n\ + ldrh r0, [r0]\n\ + sub r0, r0, #0x9\n\ + strh r0, [r1]\n\ +._287:\n\ + add r1, sp, #0x8\n\ + add r0, r1, #0\n\ + ldrh r0, [r0]\n\ + sub r0, r0, #0x1\n\ + strh r0, [r1]\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + bgt ._347 @cond_branch\n\ + mov r2, #0xb1\n\ + lsl r2, r2, #0x1\n\ + add r0, r2, #0\n\ + strh r0, [r1]\n\ +._347:\n\ + ldr r1, ._349\n\ + ldr r4, ._349 + 4\n\ + ldrb r0, [r4]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + mov r0, #0x64\n\ + mul r0, r0, r1\n\ + ldr r1, ._349 + 8\n\ + add r0, r0, r1\n\ + mov r1, #0xd\n\ + add r2, sp, #0x8\n\ + bl SetMonData\n\ + ldr r2, ._349 + 12\n\ + ldrb r1, [r4]\n\ + mov r0, #0x58\n\ + mul r0, r0, r1\n\ + add r0, r0, r2\n\ + add r1, sp, #0x8\n\ + ldrh r1, [r1]\n\ + strh r1, [r0, #0xc]\n\ + ldr r5, ._349 + 16\n\ + ldr r1, ._349 + 20\n\ + mov r0, #0x10\n\ + str r0, [sp]\n\ + mov r0, #0x38\n\ + str r0, [sp, #0x4]\n\ + add r0, r5, #0\n\ + mov r2, #0x1\n\ + mov r3, #0x37\n\ + bl Text_FillWindowRect\n\ + add r0, sp, #0x8\n\ + mov r2, #0x0\n\ + ldsh r1, [r0, r2]\n\ + mov r0, #0xd\n\ + mul r1, r1, r0\n\ + ldr r0, ._349 + 24\n\ + add r1, r1, r0\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0x1\n\ + mov r6, #0x37\n\ + str r6, [sp]\n\ + add r0, r5, #0\n\ + mov r3, #0x2\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r4, ._349 + 28\n\ + add r0, sp, #0x8\n\ + mov r2, #0x0\n\ + ldsh r1, [r0, r2]\n\ + add r0, r4, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x3\n\ + bl ConvertIntToDecimalStringN\n\ + mov r2, #0x88\n\ + lsl r2, r2, #0x1\n\ + str r6, [sp]\n\ + add r0, r5, #0\n\ + add r1, r4, #0\n\ + mov r3, #0xa\n\ + bl Text_InitWindowAndPrintText\n\ + b ._348\n\ +._350:\n\ + .align 2, 0\n\ +._349:\n\ + .word gBattlePartyID\n\ + .word gActiveBank\n\ + .word gPlayerParty\n\ + .word gBattleMons\n\ + .word gUnknown_03004210\n\ + .word 0x1016\n\ + .word gMoveNames\n\ + .word gDisplayedStringBattle\n\ +._302:\n\ + ldr r0, ._353\n\ + ldrh r0, [r0, #0x30]\n\ + cmp r0, #0x40\n\ + bne ._351 @cond_branch\n\ + ldr r1, ._353 + 4\n\ + ldrb r0, [r1]\n\ + sub r0, r0, #0x1\n\ + b ._352\n\ +._354:\n\ + .align 2, 0\n\ +._353:\n\ + .word gMain\n\ + .word gAnimMoveTurn\n\ +._351:\n\ + ldr r1, ._359\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ +._352:\n\ + strb r0, [r1]\n\ + ldr r4, ._359 + 4\n\ + ldrb r1, [r1]\n\ + add r0, r4, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x3\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r0, ._359 + 8\n\ + mov r2, #0x8e\n\ + lsl r2, r2, #0x1\n\ + mov r1, #0x39\n\ + str r1, [sp]\n\ + add r1, r4, #0\n\ + mov r3, #0x4\n\ + bl Text_InitWindowAndPrintText\n\ +._348:\n\ + ldr r0, ._359 + 12\n\ + ldrh r2, [r0, #0x28]\n\ + mov r1, #0xc0\n\ + lsl r1, r1, #0x2\n\ + add r0, r1, #0\n\ + and r0, r0, r2\n\ + cmp r0, r1\n\ + bne ._355 @cond_branch\n\ + mov r4, #0x0\n\ + ldr r5, ._359 + 4\n\ + ldr r6, ._359 + 8\n\ +._361:\n\ + add r0, r5, #0\n\ + ldr r1, ._359 + 16\n\ + bl StringCopy\n\ + ldr r1, ._359 + 20\n\ + ldr r0, ._359 + 24\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x1\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + mov r0, #0x64\n\ + mul r0, r0, r1\n\ + ldr r1, ._359 + 28\n\ + add r0, r0, r1\n\ + add r1, r4, #0\n\ + add r1, r1, #0xd\n\ + bl GetMonData\n\ + mov r1, #0xd\n\ + mul r1, r1, r0\n\ + ldr r0, ._359 + 32\n\ + add r1, r1, r0\n\ + add r0, r5, #0\n\ + bl StringAppend\n\ + lsl r0, r4, #0x14\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x11\n\ + add r0, r0, r1\n\ + lsr r2, r0, #0x10\n\ + mov r0, #0x1\n\ + and r0, r0, r4\n\ + mov r3, #0x2\n\ + cmp r0, #0\n\ + beq ._356 @cond_branch\n\ + mov r3, #0xa\n\ +._356:\n\ + cmp r4, #0x1\n\ + bhi ._357 @cond_branch\n\ + mov r0, #0x37\n\ + b ._358\n\ +._360:\n\ + .align 2, 0\n\ +._359:\n\ + .word gAnimMoveTurn\n\ + .word gDisplayedStringBattle\n\ + .word gUnknown_03004210\n\ + .word gMain\n\ + .word BattleText_Format\n\ + .word gBattlePartyID\n\ + .word gActiveBank\n\ + .word gPlayerParty\n\ + .word gMoveNames\n\ +._357:\n\ + mov r0, #0x39\n\ +._358:\n\ + str r0, [sp]\n\ + add r0, r6, #0\n\ + add r1, r5, #0\n\ + bl Text_InitWindow\n\ + ldr r0, ._362\n\ + bl Text_PrintWindow8002F44\n\ + add r0, r4, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + cmp r4, #0x3\n\ + bls ._361 @cond_branch\n\ + ldr r1, ._362 + 4\n\ + ldr r0, ._362 + 8\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, ._362 + 12\n\ + str r1, [r0]\n\ +._355:\n\ + add sp, sp, #0xc\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0\n\ +._363:\n\ + .align 2, 0\n\ +._362:\n\ + .word gUnknown_03004210\n\ + .word gBattleBankFunc\n\ + .word gActiveBank\n\ + .word sub_802C68C+1"); +} + +__attribute__((naked)) +void debug_sub_803107C(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + add sp, sp, #0xfffffffc\n\ + mov r7, #0x0\n\ + ldr r0, ._369\n\ + ldr r0, [r0]\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ + ldr r0, ._369 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._364 @cond_branch\n\ + mov r0, #0x1\n\ + bl sub_80326EC\n\ + ldr r4, ._369 + 8\n\ + ldrb r0, [r4]\n\ + mov r1, #0x1\n\ + mov r2, #0x7\n\ + mov r3, #0x1\n\ + bl dp11b_obj_instanciate\n\ + ldrb r0, [r4]\n\ + mov r1, #0x0\n\ + mov r2, #0x7\n\ + mov r3, #0x1\n\ + bl dp11b_obj_instanciate\n\ + ldr r0, ._369 + 12\n\ + add r2, r0, #0\n\ + add r2, r2, #0x3e\n\ + mov r1, #0x3f\n\ +._366:\n\ + ldrb r0, [r2]\n\ + lsl r0, r0, #0x1f\n\ + cmp r0, #0\n\ + beq ._365 @cond_branch\n\ + add r0, r7, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ +._365:\n\ + add r2, r2, #0x44\n\ + sub r1, r1, #0x1\n\ + cmp r1, #0\n\ + bge ._366 @cond_branch\n\ + ldr r4, ._369 + 16\n\ + add r0, r4, #0\n\ + add r1, r7, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x2\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r6, ._369 + 20\n\ + mov r2, #0x91\n\ + lsl r2, r2, #0x1\n\ + mov r5, #0x39\n\ + str r5, [sp]\n\ + add r0, r6, #0\n\ + add r1, r4, #0\n\ + mov r3, #0x8\n\ + bl Text_InitWindowAndPrintText\n\ + bl GetTaskCount\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + add r0, r4, #0\n\ + add r1, r7, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x2\n\ + bl ConvertIntToDecimalStringN\n\ + mov r2, #0x93\n\ + lsl r2, r2, #0x1\n\ + str r5, [sp]\n\ + add r0, r6, #0\n\ + add r1, r4, #0\n\ + mov r3, #0xb\n\ + bl Text_InitWindowAndPrintText\n\ + mov r1, #0x0\n\ + mov r7, #0x0\n\ + ldr r0, ._369 + 24\n\ + mov r3, #0x1\n\ + ldr r2, [r0]\n\ +._368:\n\ + add r0, r3, #0\n\ + LSL r0, r1\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + beq ._367 @cond_branch\n\ + add r0, r7, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ +._367:\n\ + add r1, r1, #0x1\n\ + cmp r1, #0x1f\n\ + ble ._368 @cond_branch\n\ + ldr r4, ._369 + 16\n\ + add r0, r4, #0\n\ + add r1, r7, #0\n\ + mov r2, #0x2\n\ + mov r3, #0x2\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r0, ._369 + 20\n\ + mov r2, #0x95\n\ + lsl r2, r2, #0x1\n\ + mov r1, #0x39\n\ + str r1, [sp]\n\ + add r1, r4, #0\n\ + mov r3, #0xe\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r1, ._369 + 28\n\ + ldr r0, ._369 + 8\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, ._369 + 32\n\ + str r1, [r0]\n\ +._364:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._370:\n\ + .align 2, 0\n\ +._369:\n\ + .word gAnimScriptCallback\n\ + .word gAnimScriptActive\n\ + .word gActiveBank\n\ + .word gSprites\n\ + .word gDisplayedStringBattle\n\ + .word gUnknown_03004210\n\ + .word gOamMatrixAllocBitmap\n\ + .word gBattleBankFunc\n\ + .word debug_sub_8030C24+1"); +} +#endif + void sub_802D204(void) { if (gSprites[gObjectBankIDs[gActiveBank]].callback == SpriteCallbackDummy) -- cgit v1.2.3 From 723a50665a6417d971d183187dd9002c27517084 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 17 Jan 2018 23:45:37 -0500 Subject: remove unnecessary padding --- include/pokemon.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index 8f1b46387..6e3e15404 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -258,7 +258,6 @@ struct BoxPokemon /*0x13*/ u8 isBadEgg:1; u8 hasSpecies:1; u8 isEgg:1; - u8 unused:5; /*0x14*/ u8 otName[OT_NAME_LENGTH]; /*0x1B*/ u8 markings; /*0x1C*/ u16 checksum; @@ -419,7 +418,6 @@ struct BattleMove u8 target; s8 priority; u8 flags; - u8 pad[3]; }; #define FLAG_MAKES_CONTACT 0x1 -- cgit v1.2.3 From b8b4a11a032d7fb21ae14c5372a266509d2f918b Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Jan 2018 01:12:45 -0500 Subject: formatting --- src/battle/battle_anim.c | 2 +- src/engine/trade.c | 2 +- src/field/start_menu.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index a4540868c..c71c12ce7 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -2417,7 +2417,7 @@ static void LoadMoveBg(u16 bgId) { void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap; - LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000); + LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : EWRAM_18000); sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : EWRAM_18000, 0x100, 0); DmaCopy32Defvars(3, IsContest() ? EWRAM_14800 : EWRAM_18000, (void *)(VRAM + 0xD000), 0x800); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000)); diff --git a/src/engine/trade.c b/src/engine/trade.c index c271649c1..bc3daf249 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -1462,7 +1462,7 @@ static void sub_8048B0C(u8 a0) gPlttBufferUnfaded[i] = *(gUnknown_08EA02C8 + i); gPlttBufferFaded[i] = *(gUnknown_08EA02C8 + i); } - DmaCopyLarge16(3, gUnknown_08EA0348, (void *)BG_VRAM, 0x1280, 0x1000); + DmaCopyLarge16(3, gUnknown_08EA0348, (void *)BG_VRAM, 0x1280, 0x1000); for (i = 0; i < 0x400; i ++) gUnknown_03004824->unk_00c8.unk_12[i] = gUnknown_08EA15C8[i]; DmaCopy16Defvars(3, gTradeStripesBG2Tilemap, BG_SCREEN_ADDR(6), 0x800); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index db41919be..89cd404e9 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -749,7 +749,7 @@ static bool32 sub_80719FC(u8 *step) ScanlineEffect_Stop(); DmaClear16(3, PLTT, PLTT_SIZE); DmaFill16Large(3, 0, (void *)(VRAM + 0x0), 0x18000, 0x1000); - break; + break; case 1: ResetSpriteData(); ResetTasks(); -- cgit v1.2.3 From ec84ae801985ac7f83397979bde6a15508eb02ed Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 18 Jan 2018 11:54:49 -0600 Subject: add more debug code --- asm/battle_9.s | 171 ++++++ asm/pokemon_storage_system.s | 884 ++++++++++++++++++++++++++++++++ src/battle/battle_controller_opponent.c | 548 ++++++++++++++++++++ src/engine/cable_club.c | 65 ++- src/field/party_menu.c | 492 +++++++++++++++++- src/pokemon/pokemon_menu.c | 92 ++++ src/scene/berry_blender.c | 21 +- 7 files changed, 2262 insertions(+), 11 deletions(-) diff --git a/asm/battle_9.s b/asm/battle_9.s index 9dbb7c619..62e2baae6 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -1387,6 +1387,176 @@ _08036AFE: bx r1 thumb_func_end AI_ShouldSwitch +.if DEBUG + thumb_func_start sub_8036B0C +sub_8036B0C: +.syntax divided + push {r4, r5, r6, lr} + ldr r5, ._205 + ldrh r1, [r5] + mov r0, #0x8 + and r0, r0, r1 + cmp r0, #0 + bne ._197 @cond_branch + b ._216 +._197: + bl AI_ShouldSwitch + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._199 @cond_branch + b ._200 +._199: + ldr r4, ._205 + 4 + ldr r0, ._205 + 8 + ldrb r0, [r0] + bl GetBankIdentity + lsl r0, r0, #0x18 + lsr r0, r0, #0x19 + ldr r1, ._205 + 12 + add r0, r0, r1 + add r0, r0, r4 + ldrb r0, [r0] + cmp r0, #0x6 + bne ._201 @cond_branch + bl sub_8036CD4 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x6 + bne ._211 @cond_branch + ldrh r1, [r5] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + bne ._203 @cond_branch + mov r0, #0x1 + bl GetBankByIdentity + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + add r6, r5, #0 + b ._204 +._206: + .align 2, 0 +._205: + .word gBattleTypeFlags + .word +0x2000000 + .word gActiveBank + .word 0x160c8 +._203: + mov r0, #0x1 + bl GetBankByIdentity + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + mov r0, #0x3 + bl GetBankByIdentity + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 +._204: + mov r4, #0x0 +._212: + mov r0, #0x64 + mul r0, r0, r4 + ldr r1, ._214 + add r0, r0, r1 + mov r1, #0x39 + bl GetMonData + cmp r0, #0 + beq ._210 @cond_branch + ldr r1, ._214 + 4 + lsl r0, r6, #0x1 + add r0, r0, r1 + ldrh r0, [r0] + cmp r4, r0 + beq ._210 @cond_branch + lsl r0, r5, #0x1 + add r0, r0, r1 + ldrh r0, [r0] + cmp r4, r0 + beq ._210 @cond_branch + ldr r1, ._214 + 8 + ldr r2, ._214 + 12 + add r0, r6, r2 + add r0, r0, r1 + ldrb r0, [r0] + cmp r4, r0 + beq ._210 @cond_branch + add r0, r5, r2 + add r0, r0, r1 + ldrb r0, [r0] + cmp r4, r0 + bne ._211 @cond_branch +._210: + add r4, r4, #0x1 + cmp r4, #0x5 + ble ._212 @cond_branch +._211: + ldr r0, ._214 + 16 + ldrb r0, [r0] + bl GetBankIdentity + ldr r1, ._214 + 8 + lsl r0, r0, #0x18 + lsr r0, r0, #0x19 + ldr r3, ._214 + 20 + add r0, r0, r3 + add r0, r0, r1 + strb r4, [r0] +._201: + ldr r4, ._214 + 16 + ldrb r0, [r4] + bl GetBankIdentity + ldr r2, ._214 + 8 + ldrb r1, [r4] + ldr r3, ._214 + 12 + add r1, r1, r3 + add r1, r1, r2 + lsl r0, r0, #0x18 + lsr r0, r0, #0x19 + add r3, r3, #0x60 + add r0, r0, r3 + add r0, r0, r2 + ldrb r0, [r0] + strb r0, [r1] + b ._217 +._215: + .align 2, 0 +._214: + .word gEnemyParty + .word gBattlePartyID + .word +0x2000000 + .word 0x16068 + .word gActiveBank + .word 0x160c8 +._200: + ldr r0, ._218 + ldrb r1, [r0] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + bne ._216 @cond_branch + bl AI_ShouldUseItem + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._217 @cond_branch +._216: + ldr r0, ._218 + 4 + ldrb r0, [r0] + mov r2, #0x1 + eor r2, r2, r0 + lsl r2, r2, #0x8 + mov r0, #0x1 + mov r1, #0x0 + bl Emitcmd33 +._217: + pop {r4, r5, r6} + pop {r0} + bx r0 +._219: + .align 2, 0 +._218: + .word gUnknown_02023A14+0x50 + .word gActiveBank +.syntax unified + thumb_func_end sub_8036B0C +.else thumb_func_start sub_8036B0C sub_8036B0C: @ 8036B0C push {r4-r6,lr} @@ -1540,6 +1710,7 @@ _08036C40: .align 2, 0 _08036C48: .4byte gActiveBank thumb_func_end sub_8036B0C +.endif thumb_func_start sub_8036C4C sub_8036C4C: @ 8036C4C diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 14b86a3d1..24117bc8c 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1978,6 +1978,144 @@ sub_8096874: @ 8096874 bx lr thumb_func_end sub_8096874 +.if DEBUG + thumb_func_start sub_8096884 +sub_8096884: +.syntax divided + push {r4, lr} + ldr r0, ._223 + ldr r1, ._223 + 4 + add r0, r0, r1 + ldrb r0, [r0] + cmp r0, #0x9 + bls ._221 @cond_branch + b ._222 +._221: + lsl r0, r0, #0x2 + ldr r1, ._223 + 8 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._224: + .align 2, 0 +._223: + .word gMain + .word 0x43c + .word ._225 +._225: + .word ._226 + .word ._227 + .word ._228 + .word ._229 + .word ._230 + .word ._231 + .word ._232 + .word ._233 + .word ._234 + .word ._235 +._226: + mov r0, #0x0 + bl SetVBlankCallback + mov r0, #0x80 + lsl r0, r0, #0x13 + mov r4, #0x0 + strh r4, [r0] + bl sub_8096804 + ldr r0, ._237 + strb r4, [r0] + b ._250 +._238: + .align 2, 0 +._237: + .word unk_2038790 +._227: + ldr r0, ._240 + bl Text_LoadWindowTemplate + b ._250 +._241: + .align 2, 0 +._240: + .word gWindowTemplate_81E6D00 +._228: + ldr r0, ._243 + bl InitMenuWindow + bl Menu_EraseScreen + b ._250 +._244: + .align 2, 0 +._243: + .word gWindowTemplate_81E6D00 +._229: + bl sub_80967DC + bl sub_8096848 + b ._250 +._230: + bl sub_8098B48 + bl sub_809AA24 + b ._250 +._231: + bl sub_8097DE0 + b ._250 +._232: + bl sub_8097E70 + b ._250 +._233: + bl sub_8098400 + b ._250 +._234: + ldr r0, ._251 + ldrb r0, [r0] + bl sub_8099BF8 + ldr r2, ._251 + 4 + ldr r1, ._251 + 8 + add r0, r2, r1 + mov r1, #0xa + strh r1, [r0] + ldr r1, ._251 + 12 + add r2, r2, r1 + ldr r1, ._251 + 16 + strh r1, [r2] + bl sub_80F727C + bl sub_80F7404 + b ._250 +._252: + .align 2, 0 +._251: + .word gPokemonStorage + .word +0x2000000 + .word 0x12bc + .word 0x12be + .word 0xdacb +._235: + bl sub_8096874 + ldr r0, ._253 + bl sub_8096BE0 + ldr r0, ._253 + 4 + bl SetMainCallback2 + ldr r0, ._253 + 8 + bl SetVBlankCallback +._250: + ldr r1, ._253 + 12 + ldr r0, ._253 + 16 + add r1, r1, r0 + ldrb r0, [r1] + add r0, r0, #0x1 + strb r0, [r1] +._222: + pop {r4} + pop {r0} + bx r0 +._254: + .align 2, 0 +._253: + .word sub_8096BF0+1 + .word sub_8096B38+1 + .word sub_8096AFC+1 + .word gMain + .word 0x43c +.syntax unified + thumb_func_end sub_8096884 +.else thumb_func_start sub_8096884 sub_8096884: @ 8096884 push {lr} @@ -2096,6 +2234,7 @@ _08096994: .4byte sub_8096AFC _08096998: .4byte gMain _0809699C: .4byte 0x0000043c thumb_func_end sub_8096884 +.endif thumb_func_start sub_80969A0 sub_80969A0: @ 80969A0 @@ -2556,6 +2695,438 @@ _08096C7A: _08096C80: .4byte sub_8096C84 thumb_func_end sub_8096C68 +.if DEBUG + thumb_func_start sub_8096C84 +sub_8096C84: +.syntax divided + push {r4, lr} + ldr r0, ._347 + ldrb r0, [r0, #0x4] + cmp r0, #0x6 + bls ._345 @cond_branch + b ._466 +._345: + lsl r0, r0, #0x2 + ldr r1, ._347 + 4 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._348: + .align 2, 0 +._347: + .word +0x2000000 + .word ._349 +._349: + .word ._350 + .word ._351 + .word ._352 + .word ._353 + .word ._354 + .word ._355 + .word ._356 +._350: + bl sub_809CA40 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + sub r0, r0, #0x1 + cmp r0, #0xf + bls ._357 @cond_branch + b ._466 +._357: + lsl r0, r0, #0x2 + ldr r1, ._360 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._361: + .align 2, 0 +._360: + .word ._359 +._359: + .word ._362 + .word ._466 + .word ._466 + .word ._365 + .word ._366 + .word ._367 + .word ._368 + .word ._369 + .word ._370 + .word ._371 + .word ._372 + .word ._373 + .word ._374 + .word ._375 + .word ._376 + .word ._377 +._362: + mov r0, #0x5 + bl PlaySE + ldr r1, ._379 + mov r0, #0x1 + strb r0, [r1, #0x4] + b ._466 +._380: + .align 2, 0 +._379: + .word +0x2000000 +._366: + ldr r4, ._383 + ldrb r0, [r4, #0x5] + cmp r0, #0x2 + beq ._381 @cond_branch + mov r0, #0x10 + bl sub_8098898 + mov r0, #0x3 + strb r0, [r4, #0x4] + b ._466 +._384: + .align 2, 0 +._383: + .word +0x2000000 +._381: + bl sub_809B0D4 + ldr r0, ._386 + bl sub_8096BE0 + b ._466 +._387: + .align 2, 0 +._386: + .word sub_8096FC8+1 +._367: + ldr r4, ._394 + ldrb r0, [r4, #0x5] + cmp r0, #0x2 + beq ._388 @cond_branch + b ._466 +._388: + bl sub_809BF20 + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._391 @cond_branch + ldr r1, ._394 + 4 + add r0, r4, r1 + ldrh r0, [r0] + bl ItemIsMail + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._391 @cond_branch + b ._392 +._391: + ldr r0, ._394 + 8 + bl sub_8096BE0 + b ._466 +._395: + .align 2, 0 +._394: + .word +0x2000000 + .word 0x11f2 + .word sub_8097004+1 +._365: + ldr r0, ._399 + ldrb r0, [r0] + cmp r0, #0 + beq ._396 @cond_branch + b ._466 +._396: + ldr r0, ._399 + 4 + bl sub_8096BE0 + b ._466 +._400: + .align 2, 0 +._399: + .word unk_2038790 + .word sub_8097BA0+1 +._377: + ldr r0, ._404 + ldrb r0, [r0] + cmp r0, #0 + beq ._401 @cond_branch + b ._466 +._401: + ldr r0, ._404 + 4 + bl sub_8096BE0 + b ._466 +._405: + .align 2, 0 +._404: + .word unk_2038790 + .word sub_8097CC0+1 +._368: + mov r0, #0x5 + bl PlaySE + ldr r0, ._407 + bl sub_8096BE0 + b ._466 +._408: + .align 2, 0 +._407: + .word sub_809789C+1 +._369: + mov r0, #0x5 + bl PlaySE + ldr r0, ._410 + bl sub_8096BE0 + b ._466 +._411: + .align 2, 0 +._410: + .word sub_8097078+1 +._370: + mov r0, #0x5 + bl PlaySE + ldr r4, ._414 + ldr r0, ._414 + 4 + ldrb r0, [r0] + add r0, r0, #0x1 + ldr r2, ._414 + 8 + add r1, r4, r2 + strh r0, [r1] + cmp r0, #0xd + ble ._416 @cond_branch + mov r0, #0x0 + b ._413 +._415: + .align 2, 0 +._414: + .word +0x2000000 + .word gPokemonStorage + .word 0x8b2 +._371: + mov r0, #0x5 + bl PlaySE + ldr r4, ._418 + ldr r0, ._418 + 4 + ldrb r0, [r0] + sub r0, r0, #0x1 + ldr r2, ._418 + 8 + add r1, r4, r2 + strh r0, [r1] + cmp r0, #0 + bge ._416 @cond_branch + mov r0, #0xd +._413: + strh r0, [r1] +._416: + ldrb r0, [r1] + bl sub_8099C70 + mov r0, #0x2 + strb r0, [r4, #0x4] + b ._466 +._419: + .align 2, 0 +._418: + .word +0x2000000 + .word gPokemonStorage + .word 0x8b2 +._372: + bl sub_809BE80 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._428 @cond_branch + ldr r4, ._423 + ldr r1, ._423 + 4 + add r0, r4, r1 + ldrh r0, [r0] + bl ItemIsMail + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._421 @cond_branch +._392: + mov r0, #0x5 + strb r0, [r4, #0x4] + b ._466 +._424: + .align 2, 0 +._423: + .word +0x2000000 + .word 0x11f2 +._421: + mov r0, #0x5 + bl PlaySE + ldr r0, ._426 + bl sub_8096BE0 + b ._466 +._427: + .align 2, 0 +._426: + .word sub_809746C+1 +._374: + bl sub_809BE80 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._428 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r0, ._430 + bl sub_8096BE0 + b ._466 +._431: + .align 2, 0 +._430: + .word sub_80972A8+1 +._375: + bl sub_809BEBC + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._432 @cond_branch +._428: + ldr r1, ._434 + mov r0, #0x4 + strb r0, [r1, #0x4] + b ._466 +._435: + .align 2, 0 +._434: + .word +0x2000000 +._432: + mov r0, #0x5 + bl PlaySE + ldr r0, ._437 + bl sub_8096BE0 + b ._466 +._438: + .align 2, 0 +._437: + .word c3_0808DC50+1 +._373: + mov r0, #0x5 + bl PlaySE + ldr r0, ._440 + bl sub_8096BE0 + b ._466 +._441: + .align 2, 0 +._440: + .word sub_8097390+1 +._376: + mov r0, #0x5 + bl PlaySE + ldr r0, ._443 + bl sub_8096BE0 + b ._466 +._444: + .align 2, 0 +._443: + .word sub_80972FC+1 +._351: + bl sub_809AC00 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._466 @cond_branch + bl sub_809BF48 + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._446 @cond_branch + bl sub_80986E8 + b ._447 +._446: + bl sub_8098710 +._447: + ldr r4, ._450 + ldr r2, ._450 + 4 + add r0, r4, r2 + ldrb r0, [r0] + cmp r0, #0 + beq ._448 @cond_branch + bl BoxSetMosaic +._448: + mov r0, #0x0 + strb r0, [r4, #0x4] + b ._466 +._451: + .align 2, 0 +._450: + .word +0x2000000 + .word 0x11f6 +._352: + bl sub_8099D34 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._466 @cond_branch + ldr r1, ._456 + ldr r0, ._456 + 4 + ldr r2, ._456 + 8 + add r0, r0, r2 + ldrh r0, [r0] + strb r0, [r1] + ldr r0, ._456 + 12 + ldrb r0, [r0] + cmp r0, #0 + bne ._455 @cond_branch + bl sub_809BF20 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._455 @cond_branch + bl sub_809B440 + bl BoxSetMosaic + b ._455 +._457: + .align 2, 0 +._456: + .word gPokemonStorage + .word +0x2000000 + .word 0x8b2 + .word gUnknown_0203847C +._353: + ldr r0, ._460 + ldrh r1, [r0, #0x2e] + mov r0, #0xf3 + and r0, r0, r1 + cmp r0, #0 + beq ._466 @cond_branch + bl sub_8098A5C +._455: + ldr r1, ._460 + 4 + mov r0, #0x0 + strb r0, [r1, #0x4] + b ._466 +._461: + .align 2, 0 +._460: + .word gMain + .word +0x2000000 +._354: + mov r0, #0x20 + bl PlaySE + mov r0, #0xd + b ._462 +._355: + mov r0, #0x20 + bl PlaySE + mov r0, #0x16 +._462: + bl sub_8098898 + ldr r1, ._464 + mov r0, #0x6 + strb r0, [r1, #0x4] + b ._466 +._465: + .align 2, 0 +._464: + .word +0x2000000 +._356: + ldr r0, ._467 + ldrh r1, [r0, #0x2e] + mov r0, #0xf3 + and r0, r0, r1 + cmp r0, #0 + beq ._466 @cond_branch + bl sub_8098A5C + ldr r0, ._467 + 4 + bl sub_8096BE0 +._466: + pop {r4} + pop {r0} + bx r0 +._468: + .align 2, 0 +._467: + .word gMain + .word sub_8096C84+1 +.syntax unified + thumb_func_end sub_8096C84 +.else thumb_func_start sub_8096C84 sub_8096C84: @ 8096C84 push {r4,lr} @@ -2923,6 +3494,7 @@ _08096FBA: _08096FC0: .4byte gMain _08096FC4: .4byte sub_8096C84 thumb_func_end sub_8096C84 +.endif thumb_func_start sub_8096FC8 sub_8096FC8: @ 8096FC8 @@ -3017,6 +3589,317 @@ _08097070: .4byte 0x000011f6 _08097074: .4byte sub_8096C84 thumb_func_end sub_8097004 +.if DEBUG + thumb_func_start sub_8097078 +sub_8097078: +.syntax divided + push {r4, lr} + ldr r0, ._495 + ldrb r0, [r0, #0x4] + cmp r0, #0x5 + bls ._493 @cond_branch + b ._597 +._493: + lsl r0, r0, #0x2 + ldr r1, ._495 + 4 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._496: + .align 2, 0 +._495: + .word +0x2000000 + .word ._497 +._497: + .word ._498 + .word ._499 + .word ._500 + .word ._501 + .word ._502 + .word ._503 +._498: + mov r0, #0x4 + bl sub_8098898 + bl sub_809CE84 + ldr r1, ._505 + mov r0, #0x1 + strb r0, [r1, #0x4] + b ._597 +._506: + .align 2, 0 +._505: + .word +0x2000000 +._499: + bl sub_809CF30 + add r0, r0, #0x1 + lsl r0, r0, #0x10 + asr r0, r0, #0x10 + cmp r0, #0x21 + bls ._507 @cond_branch + b ._597 +._507: + lsl r0, r0, #0x2 + ldr r1, ._510 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._511: + .align 2, 0 +._510: + .word ._509 +._509: + .word ._513 + .word ._513 + .word ._514 + .word ._515 + .word ._516 + .word ._517 + .word ._518 + .word ._519 + .word ._520 + .word ._521 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._597 + .word ._545 +._513: + bl sub_8098A5C + ldr r0, ._547 + bl sub_8096BE0 + b ._597 +._548: + .align 2, 0 +._547: + .word sub_8096C84+1 +._516: + bl sub_809BE80 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._563 @cond_branch + mov r0, #0x5 + bl PlaySE + bl sub_8098A5C + ldr r0, ._551 + bl sub_8096BE0 + b ._597 +._552: + .align 2, 0 +._551: + .word sub_80972A8+1 +._518: + mov r0, #0x5 + bl PlaySE + bl sub_8098A5C + ldr r0, ._554 + bl sub_8096BE0 + b ._597 +._555: + .align 2, 0 +._554: + .word sub_80972FC+1 +._517: + bl sub_809BEBC + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._563 @cond_branch + mov r0, #0x5 + bl PlaySE + bl sub_8098A5C + ldr r0, ._558 + bl sub_8096BE0 + b ._597 +._559: + .align 2, 0 +._558: + .word c3_0808DC50+1 +._515: + mov r0, #0x5 + bl PlaySE + bl sub_8098A5C + ldr r0, ._561 + bl sub_8096BE0 + b ._597 +._562: + .align 2, 0 +._561: + .word sub_8097390+1 +._514: + bl sub_809BE80 + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._563 @cond_branch + ldr r4, ._566 + ldr r1, ._566 + 4 + add r0, r4, r1 + ldrh r0, [r0] + bl ItemIsMail + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._564 @cond_branch + mov r0, #0x5 + bl PlaySE + bl sub_8098A5C + ldr r0, ._566 + 8 + bl sub_8096BE0 + b ._597 +._567: + .align 2, 0 +._566: + .word +0x2000000 + .word 0x11f2 + .word sub_809746C+1 +._520: + bl sub_809BE80 + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._568 @cond_branch +._563: + ldr r1, ._570 + mov r0, #0x2 + strb r0, [r1, #0x4] + b ._597 +._571: + .align 2, 0 +._570: + .word +0x2000000 +._568: + ldr r4, ._574 + ldr r1, ._574 + 4 + add r0, r4, r1 + ldrb r0, [r0] + cmp r0, #0 + beq ._572 @cond_branch + mov r0, #0x4 + strb r0, [r4, #0x4] + b ._597 +._575: + .align 2, 0 +._574: + .word +0x2000000 + .word 0x11f9 +._572: + ldr r1, ._578 + add r0, r4, r1 + ldrh r0, [r0] + bl ItemIsMail + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._576 @cond_branch +._564: + mov r0, #0x3 + strb r0, [r4, #0x4] + b ._597 +._579: + .align 2, 0 +._578: + .word 0x11f2 +._576: + mov r0, #0x5 + bl PlaySE + ldr r0, ._581 + bl sub_8096BE0 + b ._597 +._582: + .align 2, 0 +._581: + .word sub_8097594+1 +._519: + mov r0, #0x5 + bl PlaySE + ldr r0, ._584 + bl sub_8096BE0 + b ._597 +._585: + .align 2, 0 +._584: + .word sub_8097788+1 +._521: + mov r0, #0x5 + bl PlaySE + ldr r0, ._587 + bl sub_8096BE0 + b ._597 +._588: + .align 2, 0 +._587: + .word sub_80977E4+1 +._545: + mov r0, #0x5 + bl PlaySE + bl sub_8098A5C + ldr r0, ._590 + bl sub_8096BE0 + b ._597 +._591: + .align 2, 0 +._590: + .word debug_sub_80A435C+1 +._500: + mov r0, #0x20 + bl PlaySE + mov r0, #0xd + b ._593 +._502: + mov r0, #0x20 + bl PlaySE + mov r0, #0x11 + b ._593 +._501: + mov r0, #0x20 + bl PlaySE + mov r0, #0x16 +._593: + bl sub_8098898 + ldr r1, ._595 + mov r0, #0x5 + strb r0, [r1, #0x4] + b ._597 +._596: + .align 2, 0 +._595: + .word +0x2000000 +._503: + ldr r0, ._598 + ldrh r1, [r0, #0x2e] + mov r0, #0xf3 + and r0, r0, r1 + cmp r0, #0 + beq ._597 @cond_branch + bl sub_8098A5C + ldr r0, ._598 + 4 + bl sub_8096BE0 +._597: + pop {r4} + pop {r0} + bx r0 +._599: + .align 2, 0 +._598: + .word gMain + .word sub_8096C84+1 +.syntax unified + thumb_func_end sub_8097078 +.else thumb_func_start sub_8097078 sub_8097078: @ 8097078 push {r4,lr} @@ -3257,6 +4140,7 @@ _0809729A: _080972A0: .4byte gMain _080972A4: .4byte sub_8096C84 thumb_func_end sub_8097078 +.endif thumb_func_start sub_80972A8 sub_80972A8: @ 80972A8 diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index 5947053b6..cc69c0120 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -1209,6 +1209,243 @@ void sub_8034B74(void) } } +#if DEBUG +__attribute__((naked)) +void OpponentHandleTrainerThrow(void) +{ + asm("\ + push {r4, r5, r6, lr}\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5, r6}\n\ + ldr r0, ._480\n\ + ldrb r1, [r0]\n\ + mov r0, #0x10\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._478 @cond_branch\n\ + ldr r0, ._480 + 4\n\ + ldr r1, ._480 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + b ._491\n\ +._481:\n\ + .align 2, 0\n\ +._480:\n\ + .word gUnknown_02023A14+0x50\n\ + .word +0x2000000\n\ + .word 0x160a3\n\ +._478:\n\ + ldr r3, ._484\n\ + ldrh r1, [r3]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x3\n\ + cmp r1, r0\n\ + bne ._482 @cond_branch\n\ + bl GetSecretBaseTrainerPicIndex\n\ + b ._487\n\ +._485:\n\ + .align 2, 0\n\ +._484:\n\ + .word gTrainerBattleOpponent\n\ +._482:\n\ + ldr r0, ._488\n\ + ldrh r1, [r0]\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._486 @cond_branch\n\ + bl get_trainer_class_pic_index\n\ + b ._487\n\ +._489:\n\ + .align 2, 0\n\ +._488:\n\ + .word gBattleTypeFlags\n\ +._486:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._490 @cond_branch\n\ + bl GetEReaderTrainerPicIndex\n\ +._487:\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + b ._491\n\ +._490:\n\ + ldr r2, ._492\n\ + ldrh r1, [r3]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r2\n\ + ldrb r0, [r0, #0x3]\n\ +._491:\n\ + mov r9, r0\n\ + ldr r2, ._492 + 4\n\ + mov r8, r2\n\ + ldrb r1, [r2]\n\ + bl sub_8031A6C\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + bl GetBankIdentity\n\ + add r1, r0, #0\n\ + lsl r1, r1, #0x18\n\ + lsr r1, r1, #0x18\n\ + mov r0, r9\n\ + bl GetMonSpriteTemplate_803C5A0\n\ + ldr r5, ._492 + 8\n\ + ldr r1, ._492 + 12\n\ + mov r2, r9\n\ + lsl r0, r2, #0x2\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r4, #0x8\n\ + sub r4, r4, r0\n\ + lsl r4, r4, #0x12\n\ + mov r0, #0xa0\n\ + lsl r0, r0, #0xe\n\ + add r4, r4, r0\n\ + asr r4, r4, #0x10\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + bl sub_8079E90\n\ + add r3, r0, #0\n\ + lsl r3, r3, #0x18\n\ + lsr r3, r3, #0x18\n\ + add r0, r5, #0\n\ + mov r1, #0xb0\n\ + add r2, r4, #0\n\ + bl CreateSprite\n\ + ldr r5, ._492 + 16\n\ + mov r2, r8\n\ + ldrb r1, [r2]\n\ + add r1, r1, r5\n\ + strb r0, [r1]\n\ + ldr r4, ._492 + 20\n\ + ldrb r0, [r2]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x4\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r4\n\ + ldr r1, ._492 + 24\n\ + strh r1, [r0, #0x24]\n\ + ldrb r0, [r2]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x4\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r4\n\ + mov r1, #0x2\n\ + strh r1, [r0, #0x2e]\n\ + ldr r0, ._492 + 28\n\ + mov r1, r9\n\ + lsl r6, r1, #0x3\n\ + add r0, r6, r0\n\ + ldrh r0, [r0, #0x4]\n\ + bl IndexOfSpritePaletteTag\n\ + mov r2, r8\n\ + ldrb r1, [r2]\n\ + add r1, r1, r5\n\ + ldrb r1, [r1]\n\ + lsl r2, r1, #0x4\n\ + add r2, r2, r1\n\ + lsl r2, r2, #0x2\n\ + add r2, r2, r4\n\ + lsl r0, r0, #0x4\n\ + ldrb r3, [r2, #0x5]\n\ + mov r1, #0xf\n\ + and r1, r1, r3\n\ + orr r1, r1, r0\n\ + strb r1, [r2, #0x5]\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + add r0, r0, r5\n\ + ldrb r0, [r0]\n\ + lsl r1, r0, #0x4\n\ + add r1, r1, r0\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r4\n\ + ldrh r0, [r1, #0x4]\n\ + lsl r0, r0, #0x16\n\ + lsr r0, r0, #0x16\n\ + strh r0, [r1, #0x38]\n\ + ldr r0, ._492 + 32\n\ + add r6, r6, r0\n\ + ldrh r0, [r6, #0x6]\n\ + bl GetSpriteTileStartByTag\n\ + mov r2, r8\n\ + ldrb r1, [r2]\n\ + add r1, r1, r5\n\ + ldrb r2, [r1]\n\ + lsl r1, r2, #0x4\n\ + add r1, r1, r2\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r4\n\ + ldr r2, ._492 + 36\n\ + and r2, r2, r0\n\ + ldrh r3, [r1, #0x4]\n\ + ldr r0, ._492 + 40\n\ + and r0, r0, r3\n\ + orr r0, r0, r2\n\ + strh r0, [r1, #0x4]\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x4\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r4\n\ + mov r2, r9\n\ + strh r2, [r0, #0x6]\n\ + mov r1, r8\n\ + ldrb r0, [r1]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x4\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r4, r4, #0x1c\n\ + add r0, r0, r4\n\ + ldr r1, ._492 + 44\n\ + str r1, [r0]\n\ + ldr r1, ._492 + 48\n\ + mov r2, r8\n\ + ldrb r0, [r2]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r1, ._492 + 52\n\ + str r1, [r0]\n\ + pop {r3, r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0\n\ +._493:\n\ + .align 2, 0\n\ +._492:\n\ + .word gTrainers\n\ + .word gActiveBank\n\ + .word gUnknown_02024E8C\n\ + .word gTrainerFrontPicCoords\n\ + .word gObjectBankIDs\n\ + .word gSprites\n\ + .word 0xff10\n\ + .word gTrainerFrontPicPaletteTable\n\ + .word gTrainerFrontPicTable\n\ + .word 0x3ff\n\ + .word 0xfffffc00\n\ + .word sub_80313A0+1\n\ + .word gBattleBankFunc\n\ + .word sub_8032B4C+1"); +} +#else void OpponentHandleTrainerThrow(void) { u32 trainerPicIndex; @@ -1238,6 +1475,7 @@ void OpponentHandleTrainerThrow(void) gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_8032B4C; } +#endif void OpponentHandleTrainerSlide(void) { @@ -1427,6 +1665,315 @@ void OpponentHandlecmd19(void) OpponentBufferExecCompleted(); } +#if DEBUG +__attribute__((naked)) +void OpponentHandlecmd20(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, sl\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5, r6, r7}\n\ + ldr r6, ._549\n\ + ldrb r0, [r6]\n\ + lsl r0, r0, #0x9\n\ + ldr r1, ._549 + 4\n\ + add r5, r0, r1\n\ + ldr r2, ._549 + 8\n\ + ldrb r1, [r2]\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + mov sl, r6\n\ + cmp r0, #0\n\ + beq ._546 @cond_branch\n\ + ldr r0, ._549 + 12\n\ + mov r9, r0\n\ + ldr r1, ._549 + 16\n\ + mov ip, r1\n\ + add r7, r6, #0\n\ + mov r0, #0x2\n\ + mov r8, r0\n\ + ldr r6, ._549 + 20\n\ +._552:\n\ + ldrb r1, [r7]\n\ + mov r0, r8\n\ + and r0, r0, r1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x19\n\ + add r0, r0, r6\n\ + mov r1, ip\n\ + add r3, r0, r1\n\ + ldrb r1, [r3]\n\ + lsl r0, r1, #0x1\n\ + add r0, r5, r0\n\ + ldrh r2, [r0]\n\ + add r4, r1, #0\n\ + cmp r2, #0\n\ + beq ._547 @cond_branch\n\ + add r0, r4, #1\n\ + strb r0, [r3]\n\ + b ._548\n\ +._550:\n\ + .align 2, 0\n\ +._549:\n\ + .word gActiveBank\n\ + .word gUnknown_02023A64\n\ + .word gUnknown_02023A14+0x50\n\ + .word gBattleMoves\n\ + .word +0x2000000\n\ + .word 0x1609e\n\ +._547:\n\ + strb r2, [r3]\n\ +._548:\n\ + ldrb r0, [r7]\n\ + mov r1, r8\n\ + and r1, r1, r0\n\ + lsl r1, r1, #0x18\n\ + lsr r1, r1, #0x19\n\ + add r1, r1, r6\n\ + add r1, r1, ip\n\ + ldrb r0, [r1]\n\ + cmp r0, #0x3\n\ + bls ._551 @cond_branch\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ +._551:\n\ + cmp r2, #0\n\ + beq ._552 @cond_branch\n\ + lsl r0, r2, #0x1\n\ + add r0, r0, r2\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r9\n\ + ldrb r3, [r0, #0x6]\n\ + mov r0, #0x12\n\ + and r0, r0, r3\n\ + cmp r0, #0\n\ + beq ._553 @cond_branch\n\ + mov r1, sl\n\ + ldrb r0, [r1]\n\ + b ._561\n\ +._553:\n\ + ldr r0, ._559\n\ + ldrh r1, [r0]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._557 @cond_branch\n\ + ldr r0, ._559 + 4\n\ + ldrb r1, [r0]\n\ + mov r5, #0x2\n\ + add r0, r5, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._556 @cond_branch\n\ + cmp r3, #0\n\ + bne ._557 @cond_branch\n\ + mov r1, sl\n\ + ldrb r0, [r1]\n\ + bl GetBankIdentity\n\ + mov r1, #0x2\n\ + eor r0, r0, r1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + b ._558\n\ +._560:\n\ + .align 2, 0\n\ +._559:\n\ + .word gBattleTypeFlags\n\ + .word gUnknown_02023A14+0x50\n\ +._556:\n\ + bl Random\n\ + add r1, r5, #0\n\ + and r1, r1, r0\n\ + lsl r1, r1, #0x10\n\ + lsr r0, r1, #0x10\n\ + b ._561\n\ +._557:\n\ + mov r0, #0x0\n\ +._558:\n\ + bl GetBankByIdentity\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ +._561:\n\ + lsl r2, r0, #0x8\n\ + orr r2, r2, r4\n\ + mov r0, #0x1\n\ + mov r1, #0xa\n\ +._569:\n\ + bl Emitcmd33\n\ +._573:\n\ + bl OpponentBufferExecCompleted\n\ + b ._562\n\ +._546:\n\ + ldr r0, ._567\n\ + ldrh r1, [r0]\n\ + mov r0, #0x93\n\ + lsl r0, r0, #0x3\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._563 @cond_branch\n\ + bl BattleAI_SetupAIData\n\ + bl BattleAI_GetAIActionToUse\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + cmp r4, #0x4\n\ + beq ._564 @cond_branch\n\ + cmp r4, #0x5\n\ + bne ._565 @cond_branch\n\ + mov r0, #0x1\n\ + mov r1, #0x4\n\ + b ._566\n\ +._568:\n\ + .align 2, 0\n\ +._567:\n\ + .word gBattleTypeFlags\n\ +._564:\n\ + mov r0, #0x1\n\ + mov r1, #0x3\n\ +._566:\n\ + mov r2, #0x0\n\ + b ._569\n\ +._565:\n\ + ldr r3, ._574\n\ + lsl r0, r4, #0x1\n\ + add r2, r5, r0\n\ + ldrh r1, [r2]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r3\n\ + ldrb r1, [r0, #0x6]\n\ + mov r0, #0x12\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._570 @cond_branch\n\ + ldr r1, ._574 + 4\n\ + ldrb r0, [r6]\n\ + strb r0, [r1]\n\ +._570:\n\ + ldrh r1, [r2]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r3\n\ + ldrb r1, [r0, #0x6]\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._572 @cond_branch\n\ + mov r0, #0x0\n\ + bl GetBankByIdentity\n\ + ldr r5, ._574 + 4\n\ + strb r0, [r5]\n\ + ldr r0, ._574 + 8\n\ + ldrb r1, [r0]\n\ + ldr r2, ._574 + 12\n\ + ldrb r0, [r5]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r2\n\ + ldr r0, [r0]\n\ + and r1, r1, r0\n\ + cmp r1, #0\n\ + beq ._572 @cond_branch\n\ + mov r0, #0x2\n\ + bl GetBankByIdentity\n\ + strb r0, [r5]\n\ +._572:\n\ + ldr r0, ._574 + 4\n\ + ldrb r2, [r0]\n\ + lsl r2, r2, #0x8\n\ + orr r2, r2, r4\n\ + mov r0, #0x1\n\ + mov r1, #0xa\n\ + bl Emitcmd33\n\ + b ._573\n\ +._575:\n\ + .align 2, 0\n\ +._574:\n\ + .word gBattleMoves\n\ + .word gBankTarget\n\ + .word gAbsentBankFlags\n\ + .word gBitTable\n\ +._563:\n\ + mov r6, #0x3\n\ +._576:\n\ + bl Random\n\ + add r4, r0, #0\n\ + and r4, r4, r6\n\ + lsl r0, r4, #0x1\n\ + add r0, r5, r0\n\ + ldrh r2, [r0]\n\ + cmp r2, #0\n\ + beq ._576 @cond_branch\n\ + ldr r1, ._579\n\ + lsl r0, r2, #0x1\n\ + add r0, r0, r2\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0, #0x6]\n\ + mov r0, #0x12\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._577 @cond_branch\n\ + ldr r0, ._579 + 4\n\ + ldrb r2, [r0]\n\ + lsl r2, r2, #0x8\n\ + b ._578\n\ +._580:\n\ + .align 2, 0\n\ +._579:\n\ + .word gBattleMoves\n\ + .word gActiveBank\n\ +._577:\n\ + ldr r0, ._583\n\ + ldrh r1, [r0]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._581 @cond_branch\n\ + bl Random\n\ + mov r1, #0x2\n\ + and r1, r1, r0\n\ + lsl r1, r1, #0x18\n\ + lsr r1, r1, #0x18\n\ + add r0, r1, #0\n\ + bl GetBankByIdentity\n\ + add r2, r0, #0\n\ + lsl r2, r2, #0x18\n\ + lsr r2, r2, #0x10\n\ +._578:\n\ + orr r2, r2, r4\n\ + mov r0, #0x1\n\ + mov r1, #0xa\n\ + bl Emitcmd33\n\ + b ._582\n\ +._584:\n\ + .align 2, 0\n\ +._583:\n\ + .word gBattleTypeFlags\n\ +._581:\n\ + mov r0, #0x0\n\ + bl GetBankByIdentity\n\ + add r2, r0, #0\n\ + lsl r2, r2, #0x18\n\ + lsr r2, r2, #0x10\n\ + orr r2, r2, r4\n\ + mov r0, #0x1\n\ + mov r1, #0xa\n\ + bl Emitcmd33\n\ +._582:\n\ + bl OpponentBufferExecCompleted\n\ +._562:\n\ + pop {r3, r4, r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov sl, r5\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0"); +} +#else #ifdef NONMATCHING void OpponentHandlecmd20(void) { @@ -1670,6 +2217,7 @@ _0803558A:\n\ .syntax divided\n"); } #endif +#endif void OpponentHandleOpenBag(void) { diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 4063aee3a..d40c31b1b 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -41,7 +41,7 @@ extern struct u8 field1; } gUnknown_020297D8; -static void sub_8082F20(u8 taskId); +/*static*/ void sub_8082F20(u8 taskId); static void sub_8082F68(u8 taskId); static void sub_8082FEC(u8 taskId); static void sub_808303C(u8 taskId); @@ -414,6 +414,63 @@ void debug_sub_808A55C() } #endif +#if DEBUG +__attribute__((naked)) +static void sub_8082CD4(u8 arg0, u8 arg1) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + lsl r1, r1, #0x18\n\ + lsr r6, r1, #0x18\n\ + mov r0, #0xc\n\ + mov r1, #0x0\n\ + mov r2, #0x1f\n\ + mov r3, #0x2\n\ + bl InitLinkTestBG_Unused\n\ + ldr r4, ._40\n\ + add r0, r4, #0\n\ + bl FindTaskIdByFunc\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0xff\n\ + bne ._39 @cond_branch\n\ + add r0, r4, #0\n\ + mov r1, #0x50\n\ + bl CreateTask\n\ + add r4, r0, #0\n\ + lsl r4, r4, #0x18\n\ + lsr r4, r4, #0x18\n\ + ldr r5, ._40 + 4\n\ + lsl r0, r4, #0x2\n\ + add r0, r0, r4\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r5\n\ + strh r7, [r0, #0xa]\n\ + strh r6, [r0, #0xc]\n\ + ldr r0, ._40 + 8\n\ + mov r1, #0x50\n\ + bl CreateTask\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + lsl r1, r0, #0x2\n\ + add r1, r1, r0\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r5\n\ + strh r4, [r1, #0x8]\n\ +._39:\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._41:\n\ + .align 2, 0\n\ +._40:\n\ + .word sub_8082F20+1\n\ + .word gTasks\n\ + .word debug_sub_808A55C+1"); +} +#else static void sub_8082CD4(u8 arg0, u8 arg1) { if (FindTaskIdByFunc(sub_8082F20) == 0xFF) @@ -424,6 +481,7 @@ static void sub_8082CD4(u8 arg0, u8 arg1) gTasks[taskId].data[2] = arg1; } } +#endif static void sub_8082D18(u32 value) { @@ -526,7 +584,7 @@ void unref_sub_8082EEC(u8 taskId) } } -static void sub_8082F20(u8 taskId) +/*static*/ void sub_8082F20(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -1316,6 +1374,7 @@ void unref_sub_8083CC8(u8 taskId) #if DEBUG +__attribute__((naked)) void debug_sub_808B82C() { asm("\ @@ -1329,6 +1388,7 @@ void debug_sub_808B82C() .word unk_2030220"); } +__attribute__((naked)) void debug_sub_808B838(u8 a) { asm("\ @@ -1347,6 +1407,7 @@ void debug_sub_808B838(u8 a) .word unk_2030220"); } +__attribute__((naked)) int debug_sub_808B850() { asm("\ diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 75c0cba78..e26b801bc 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -94,9 +94,9 @@ static void SpriteCB_UpdateHeldItemIconPosition(struct Sprite *sprite); static void ItemUseMoveMenu_HandleMoveSelection(u8 taskId); static void ItemUseMoveMenu_HandleCancel(u8 taskId); static bool8 SetupDefaultPartyMenu(void); -static void sub_806B4A8(void); -static void VBlankCB_PartyMenu(void); -static bool8 LoadPartyMenuGraphics(u8 a); +/*static*/ void sub_806B4A8(void); +/*static*/ void VBlankCB_PartyMenu(void); +/*static*/ bool8 LoadPartyMenuGraphics(u8 a); static void sub_806BF24(const u8 *a, u8 monIndex, u8 c, u8 d); static void sub_806BB9C(u8 a); static void sub_806BBEC(u8 a); @@ -493,6 +493,71 @@ extern const u8 gStatusPal_Icons[]; #define WINDOW_RIGHT (29) #endif +#if DEBUG +__attribute__((naked)) +void CB2_PartyMenuMain(void) +{ + asm("\ + push {r4, r5, r6, lr}\n\ + add sp, sp, #0xfffffffc\n\ + bl AnimateSprites\n\ + bl BuildOamBuffer\n\ + ldr r0, ._3\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x4\n\ + ldr r1, ._3 + 4\n\ + add r5, r0, r1\n\ + mov r6, #0x0\n\ +._1:\n\ + ldrb r0, [r5]\n\ + lsl r0, r0, #0x3\n\ + ldrb r1, [r5, #0x1]\n\ + lsl r1, r1, #0x3\n\ + ldr r2, [r5, #0x4]\n\ + lsl r3, r6, #0x5\n\ + mov r4, #0x80\n\ + lsl r4, r4, #0x2\n\ + orr r3, r3, r4\n\ + str r3, [sp]\n\ + mov r3, #0x0\n\ + bl DrawPartyMenuMonText\n\ + add r5, r5, #0x8\n\ + add r6, r6, #0x1\n\ + cmp r6, #0x5\n\ + ble ._1 @cond_branch\n\ + bl RunTasks\n\ + bl UpdatePaletteFade\n\ + ldr r0, ._3 + 8\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._2 @cond_branch\n\ + ldr r0, ._3 + 12\n\ + ldr r1, ._3 + 16\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x2\n\ + str r1, [sp]\n\ + mov r1, #0x1\n\ + mov r2, #0x1\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._2:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0\n\ +._4:\n\ + .align 2, 0\n\ +._3:\n\ + .word gPartyMenuType\n\ + .word PartyMonTextSettings\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else void CB2_PartyMenuMain(void) { const struct PartyMonTextSettingsStruct *textSettings; @@ -517,6 +582,7 @@ void CB2_PartyMenuMain(void) RunTasks(); UpdatePaletteFade(); } +#endif void VBlankCB_PartyMenu(void) { @@ -621,6 +687,425 @@ bool8 SetupDefaultPartyMenu(void) return FALSE; } +#if DEBUG +__attribute__((naked)) +bool8 InitPartyMenu(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + add sp, sp, #0xfffffff4\n\ + ldr r0, ._55\n\ + ldr r1, ._55 + 4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x11\n\ + bls ._53 @cond_branch\n\ + b ._125\n\ +._53:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._55 + 8\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._56:\n\ + .align 2, 0\n\ +._55:\n\ + .word gMain\n\ + .word 0x43c\n\ + .word ._57\n\ +._57:\n\ + .word ._58\n\ + .word ._59\n\ + .word ._60\n\ + .word ._61\n\ + .word ._62\n\ + .word ._63\n\ + .word ._64\n\ + .word ._65\n\ + .word ._66\n\ + .word ._67\n\ + .word ._68\n\ + .word ._69\n\ + .word ._70\n\ + .word ._71\n\ + .word ._72\n\ + .word ._73\n\ + .word ._74\n\ + .word ._75\n\ +._58:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + mov r3, #0xc0\n\ + lsl r3, r3, #0x13\n\ + mov r4, #0xc0\n\ + lsl r4, r4, #0x9\n\ + add r2, sp, #0x8\n\ + mov r8, r2\n\ + add r2, sp, #0x4\n\ + mov r6, #0x0\n\ + ldr r1, ._78\n\ + mov r5, #0x80\n\ + lsl r5, r5, #0x5\n\ + ldr r7, ._78 + 4\n\ + mov r0, #0x81\n\ + lsl r0, r0, #0x18\n\ + mov ip, r0\n\ +._76:\n\ + strh r6, [r2]\n\ + add r0, sp, #0x4\n\ + str r0, [r1]\n\ + str r3, [r1, #0x4]\n\ + str r7, [r1, #0x8]\n\ + ldr r0, [r1, #0x8]\n\ + add r3, r3, r5\n\ + sub r4, r4, r5\n\ + cmp r4, r5\n\ + bhi ._76 @cond_branch\n\ + strh r6, [r2]\n\ + add r2, sp, #0x4\n\ + str r2, [r1]\n\ + str r3, [r1, #0x4]\n\ + lsr r0, r4, #0x1\n\ + mov r3, ip\n\ + orr r0, r0, r3\n\ + str r0, [r1, #0x8]\n\ + ldr r0, [r1, #0x8]\n\ + mov r0, #0xe0\n\ + lsl r0, r0, #0x13\n\ + mov r3, #0x80\n\ + lsl r3, r3, #0x3\n\ + mov r4, #0x0\n\ + str r4, [sp, #0x8]\n\ + ldr r2, ._78\n\ + mov r1, r8\n\ + str r1, [r2]\n\ + str r0, [r2, #0x4]\n\ + lsr r0, r3, #0x2\n\ + mov r1, #0x85\n\ + lsl r1, r1, #0x18\n\ + orr r0, r0, r1\n\ + str r0, [r2, #0x8]\n\ + ldr r0, [r2, #0x8]\n\ + mov r1, #0xa0\n\ + lsl r1, r1, #0x13\n\ + add r0, sp, #0x4\n\ + strh r4, [r0]\n\ + str r0, [r2]\n\ + str r1, [r2, #0x4]\n\ + lsr r3, r3, #0x1\n\ + mov r0, #0x81\n\ + lsl r0, r0, #0x18\n\ + orr r3, r3, r0\n\ + str r3, [r2, #0x8]\n\ + ldr r0, [r2, #0x8]\n\ + ldr r2, ._78 + 8\n\ + ldrb r0, [r2, #0x8]\n\ + mov r1, #0x80\n\ + orr r0, r0, r1\n\ + strb r0, [r2, #0x8]\n\ + ldr r1, ._78 + 12\n\ + ldr r2, ._78 + 16\n\ + add r1, r1, r2\n\ + b ._122\n\ +._79:\n\ + .align 2, 0\n\ +._78:\n\ + .word 0x40000d4\n\ + .word 0x81000800\n\ + .word gPaletteFade\n\ + .word gMain\n\ + .word 0x43c\n\ +._59:\n\ + bl ScanlineEffect_Stop\n\ + b ._115\n\ +._60:\n\ + bl sub_806B4A8\n\ + ldr r1, ._82\n\ + mov r2, #0x99\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + mov r2, #0x0\n\ + strh r2, [r0]\n\ + ldr r3, ._82 + 4\n\ + add r0, r1, r3\n\ + strh r2, [r0]\n\ + mov r0, #0x9a\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + strh r2, [r1]\n\ + ldr r1, ._82 + 8\n\ + ldr r2, ._82 + 12\n\ + add r1, r1, r2\n\ + b ._122\n\ +._83:\n\ + .align 2, 0\n\ +._82:\n\ + .word +0x201b000\n\ + .word 0x266\n\ + .word gMain\n\ + .word 0x43c\n\ +._61:\n\ + bl ResetSpriteData\n\ + b ._115\n\ +._62:\n\ + ldr r0, ._88\n\ + mov r1, #0x96\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + beq ._86 @cond_branch\n\ + cmp r0, #0x5\n\ + beq ._86 @cond_branch\n\ + bl ResetTasks\n\ +._86:\n\ + ldr r1, ._88 + 4\n\ + ldr r2, ._88 + 8\n\ + add r1, r1, r2\n\ + b ._122\n\ +._89:\n\ + .align 2, 0\n\ +._88:\n\ + .word +0x201b000\n\ + .word gMain\n\ + .word 0x43c\n\ +._63:\n\ + bl FreeAllSpritePalettes\n\ + b ._115\n\ +._64:\n\ + ldr r4, ._92\n\ + mov r1, #0x97\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x0\n\ + bl CreateTask\n\ + mov r2, #0x98\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + strb r0, [r1]\n\ + b ._115\n\ +._93:\n\ + .align 2, 0\n\ +._92:\n\ + .word +0x201b000\n\ +._65:\n\ + ldr r0, ._95\n\ + bl Text_LoadWindowTemplate\n\ + ldr r1, ._95 + 4\n\ + ldr r0, ._95 + 8\n\ + add r1, r1, r0\n\ + b ._122\n\ +._96:\n\ + .align 2, 0\n\ +._95:\n\ + .word gWindowTemplate_81E6C90\n\ + .word gMain\n\ + .word 0x43c\n\ +._66:\n\ + ldr r4, ._98\n\ + ldr r1, ._98 + 4\n\ + add r0, r4, #0\n\ + bl Text_InitWindowWithTemplate\n\ + add r0, r4, #0\n\ + mov r1, #0x1\n\ + bl MultistepInitWindowTileData\n\ + ldr r1, ._98 + 8\n\ + ldr r2, ._98 + 12\n\ + add r1, r1, r2\n\ + b ._122\n\ +._99:\n\ + .align 2, 0\n\ +._98:\n\ + .word gUnknown_03004210\n\ + .word gWindowTemplate_81E6C90\n\ + .word gMain\n\ + .word 0x43c\n\ +._67:\n\ + bl MultistepLoadFont\n\ + cmp r0, #0\n\ + bne ._100 @cond_branch\n\ + b ._125\n\ +._100:\n\ + ldr r0, ._103\n\ + mov r3, #0x99\n\ + lsl r3, r3, #0x2\n\ + add r0, r0, r3\n\ + mov r1, #0x1\n\ + strh r1, [r0]\n\ + ldr r1, ._103 + 4\n\ + ldr r0, ._103 + 8\n\ + add r1, r1, r0\n\ + b ._122\n\ +._104:\n\ + .align 2, 0\n\ +._103:\n\ + .word +0x201b000\n\ + .word gMain\n\ + .word 0x43c\n\ +._68:\n\ + ldr r0, ._107\n\ + mov r1, #0x99\n\ + lsl r1, r1, #0x2\n\ + add r4, r0, r1\n\ + ldrb r0, [r4]\n\ + bl LoadPartyMenuGraphics\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bne ._105 @cond_branch\n\ + mov r0, #0x0\n\ + strh r0, [r4]\n\ + ldr r1, ._107 + 4\n\ + ldr r2, ._107 + 8\n\ + add r1, r1, r2\n\ + b ._122\n\ +._108:\n\ + .align 2, 0\n\ +._107:\n\ + .word +0x201b000\n\ + .word gMain\n\ + .word 0x43c\n\ +._105:\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ + b ._125\n\ +._69:\n\ + bl sub_809D51C\n\ + b ._115\n\ +._70:\n\ + ldr r2, ._113\n\ + ldr r0, ._113 + 4\n\ + mov r1, #0x96\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x1\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + add r2, r2, #0x4\n\ + add r0, r0, r2\n\ + ldr r0, [r0]\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bne ._125 @cond_branch\n\ + ldr r1, ._113 + 8\n\ + ldr r2, ._113 + 12\n\ + add r1, r1, r2\n\ + b ._122\n\ +._114:\n\ + .align 2, 0\n\ +._113:\n\ + .word PartyMenuHandlers\n\ + .word +0x201b000\n\ + .word gMain\n\ + .word 0x43c\n\ +._71:\n\ + ldr r0, ._116\n\ + bl MultistepInitMenuWindowBegin\n\ + b ._115\n\ +._117:\n\ + .align 2, 0\n\ +._116:\n\ + .word gWindowTemplate_81E6CC8\n\ +._72:\n\ + bl MultistepInitMenuWindowContinue\n\ + cmp r0, #0\n\ + beq ._125 @cond_branch\n\ + ldr r1, ._120\n\ + ldr r0, ._120 + 4\n\ + add r1, r1, r0\n\ + b ._122\n\ +._121:\n\ + .align 2, 0\n\ +._120:\n\ + .word gMain\n\ + .word 0x43c\n\ +._73:\n\ + ldr r0, ._123\n\ + ldr r1, ._123 + 4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x0\n\ + bl PrintPartyMenuPromptText\n\ + ldr r1, ._123 + 8\n\ + ldr r2, ._123 + 12\n\ + add r1, r1, r2\n\ + b ._122\n\ +._124:\n\ + .align 2, 0\n\ +._123:\n\ + .word +0x201b000\n\ + .word 0x259\n\ + .word gMain\n\ + .word 0x43c\n\ +._74:\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + mov r1, #0x0\n\ + str r1, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r2, ._126\n\ + ldrb r1, [r2, #0x8]\n\ + mov r0, #0x7f\n\ + and r0, r0, r1\n\ + strb r0, [r2, #0x8]\n\ +._115:\n\ + ldr r1, ._126 + 4\n\ + ldr r3, ._126 + 8\n\ + add r1, r1, r3\n\ +._122:\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + b ._125\n\ +._127:\n\ + .align 2, 0\n\ +._126:\n\ + .word gPaletteFade\n\ + .word gMain\n\ + .word 0x43c\n\ +._75:\n\ + ldr r0, ._130\n\ + bl SetVBlankCallback\n\ + ldr r0, ._130 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._128 @cond_branch\n\ + ldr r0, ._130 + 8\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x8\n\ + ldr r2, ._130 + 12\n\ + mov r3, #0x2\n\ + bl debug_sub_8008218\n\ +._128:\n\ + mov r0, #0x1\n\ + b ._129\n\ +._131:\n\ + .align 2, 0\n\ +._130:\n\ + .word VBlankCB_PartyMenu+1\n\ + .word gLinkOpen\n\ + .word 0x600e5e0\n\ + .word 0x6007800\n\ +._125:\n\ + mov r0, #0x0\n\ +._129:\n\ + add sp, sp, #0xc\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4, r5, r6, r7}\n\ + pop {r1}\n\ + bx r1"); +} +#else bool8 InitPartyMenu(void) { u8 *addr; @@ -744,6 +1229,7 @@ bool8 InitPartyMenu(void) return FALSE; } +#endif void CB2_InitPartyMenu(void) { diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index 2b3405640..34d816387 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -954,6 +954,97 @@ void debug_sub_80986AC() } #endif +#if DEBUG +__attribute__((naked)) +static void sub_808AE8C(void) +{ + asm("\ + push {r4, r5, r6, lr}\n\ + ldr r0, ._281\n\ + ldrb r0, [r0]\n\ + sub r0, r0, #0x21\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ + mov r5, #0x0\n\ +._287:\n\ + mov r0, #0x64\n\ + add r1, r5, #0\n\ + mul r1, r1, r0\n\ + ldr r0, ._281 + 4\n\ + add r4, r1, r0\n\ + add r0, r4, #0\n\ + mov r1, #0xb\n\ + bl GetMonData\n\ + cmp r0, #0\n\ + beq ._284 @cond_branch\n\ + add r0, r5, #0\n\ + bl sub_806D668\n\ + ldr r0, ._281 + 8\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._279 @cond_branch\n\ + add r0, r4, #0\n\ + mov r1, #0x2d\n\ + bl GetMonData\n\ + cmp r0, #0\n\ + bne ._278 @cond_branch\n\ + add r0, r4, #0\n\ + add r1, r6, #0\n\ + bl CanMonLearnTMHM\n\ + cmp r0, #0\n\ + bne ._279 @cond_branch\n\ +._278:\n\ + add r0, r5, #0\n\ + mov r1, #0x9a\n\ + bl sub_806BC3C\n\ + b ._284\n\ +._282:\n\ + .align 2, 0\n\ +._281:\n\ + .word gSpecialVar_ItemId\n\ + .word gPlayerParty\n\ + .word gUnknown_020297ED\n\ +._279:\n\ + mov r0, #0x64\n\ + add r4, r5, #0\n\ + mul r4, r4, r0\n\ + ldr r0, ._285\n\ + add r4, r4, r0\n\ + ldr r0, ._285 + 4\n\ + ldrh r0, [r0]\n\ + bl ItemIdToBattleMoveId\n\ + add r1, r0, #0\n\ + lsl r1, r1, #0x10\n\ + lsr r1, r1, #0x10\n\ + add r0, r4, #0\n\ + bl pokemon_has_move\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._283 @cond_branch\n\ + add r0, r5, #0\n\ + mov r1, #0xa8\n\ + bl sub_806BC3C\n\ + b ._284\n\ +._286:\n\ + .align 2, 0\n\ +._285:\n\ + .word gPlayerParty\n\ + .word gSpecialVar_ItemId\n\ +._283:\n\ + add r0, r5, #0\n\ + mov r1, #0x8c\n\ + bl sub_806BC3C\n\ +._284:\n\ + add r0, r5, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r5, r0, #0x18\n\ + cmp r5, #0x5\n\ + bls ._287 @cond_branch\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0"); +} +#else static void sub_808AE8C(void) { u8 i; @@ -972,6 +1063,7 @@ static void sub_808AE8C(void) } } } +#endif static void sub_808AF20(void) { diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index b59d02939..a93313e37 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -278,8 +278,8 @@ static bool8 Blender_PrintBlendingResults(void); static void sub_80510E8(void); static void sub_8050E30(void); static void sub_805197C(u16 a0, u16 a1); -static void Blender_PrintMadePokeblockString(struct Pokeblock* pokeblock, u8* dst); -static void sub_8052BD0(u8 taskID); +/*static*/ void Blender_PrintMadePokeblockString(struct Pokeblock* pokeblock, u8* dst); +/*static*/ void sub_8052BD0(u8 taskID); static void sub_8052AF8(void); static void sub_804F8C8(u8 taskID); static void sub_804F9F4(u8 taskID); @@ -2446,7 +2446,7 @@ static void BlenderDebug_CalculatePokeblock(struct BlenderBerry* berries, struct Blender_CalculatePokeblock(berries, pokeblock, playersNo, flavours, a4); } -static void sub_8050760(void) +/*static*/ void sub_8050760(void) { u32 frames = (u16)(gBerryBlenderData->gameFrameTime); u16 max_RPM = gBerryBlenderData->max_RPM; @@ -3305,12 +3305,20 @@ static void sub_8051C04(struct Sprite* sprite) sprite->pos2.y = -(gBerryBlenderData->field_146); } -static void Blender_TrySettingRecord(void) +/*static*/ void Blender_TrySettingRecord(void) { if (gSaveBlock1.berryBlenderRecords[gBerryBlenderData->playersNo - 2] < gBerryBlenderData->max_RPM) gSaveBlock1.berryBlenderRecords[gBerryBlenderData->playersNo - 2] = gBerryBlenderData->max_RPM; } +#if DEBUG +__attribute__((naked)) +static bool8 Blender_PrintBlendingResults(void) +{ + // TODO: disassemble this! + asm(".incbin \"baserom_de_debug.gba\", 0x56178, 0x5655C-0x56178"); +} +#else static bool8 Blender_PrintBlendingResults(void) { u16 i; @@ -3445,8 +3453,9 @@ static bool8 Blender_PrintBlendingResults(void) } return FALSE; } +#endif -static void Blender_PrintMadePokeblockString(struct Pokeblock* pokeblock, u8* dst) +/*static*/ void Blender_PrintMadePokeblockString(struct Pokeblock* pokeblock, u8* dst) { u8 text[12]; u8 flavourLvl, feel; @@ -3869,7 +3878,7 @@ void ShowBerryBlenderRecordWindow(void) } } -static void sub_8052BD0(u8 taskID) +/*static*/ void sub_8052BD0(u8 taskID) { if (gTasks[taskID].data[0] == 0) { -- cgit v1.2.3 From 2ca829a4abda20bb1b053f50a9f1c9b6c8e93223 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 18 Jan 2018 13:06:47 -0600 Subject: add more debug code --- src/contest.c | 840 ++++++ src/field/bike.c | 15 +- src/field/secret_base.c | 173 ++ src/field/shop.c | 21 + src/pokemon/pokemon_summary_screen.c | 552 +++- src/pokenav_before.c | 5192 +++++++++++++++++++++++++++++++++- 6 files changed, 6769 insertions(+), 24 deletions(-) diff --git a/src/contest.c b/src/contest.c index 972c19c2c..d559ca81f 100644 --- a/src/contest.c +++ b/src/contest.c @@ -611,6 +611,35 @@ void sub_80AB9A0(u8 taskId) } } +#if DEBUG +__attribute__((naked)) +void ContestMainCallback2(void) +{ + asm("\ + push {lr}\n\ + ldr r0, ._122\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._121 @cond_branch\n\ + ldr r0, ._122 + 4\n\ + ldrh r0, [r0, #0x2e]\n\ + cmp r0, #0x4\n\ + bne ._121 @cond_branch\n\ + bl unref_sub_80B0CF4\n\ +._121:\n\ + bl AnimateSprites\n\ + bl RunTasks\n\ + bl BuildOamBuffer\n\ + bl UpdatePaletteFade\n\ + pop {r0}\n\ + bx r0\n\ +._123:\n\ + .align 2, 0\n\ +._122:\n\ + .word gUnknown_020297ED\n\ + .word gMain"); +} +#else void ContestMainCallback2(void) { AnimateSprites(); @@ -618,6 +647,7 @@ void ContestMainCallback2(void) BuildOamBuffer(); UpdatePaletteFade(); } +#endif void ContestVBlankCallback(void) { @@ -733,6 +763,272 @@ void sub_80ABCDC(u8 taskId) } // Handle move selection input +#if DEBUG +__attribute__((naked)) +void sub_80ABEA0(u8 taskId) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + add sp, sp, #0xfffffff8\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + mov r6, #0x0\n\ + ldr r0, ._161\n\ + mov ip, r0\n\ + ldr r4, ._161 + 4\n\ + ldr r3, ._161 + 8\n\ + ldrb r0, [r4]\n\ + lsl r0, r0, #0x6\n\ + mov r1, ip\n\ + add r1, r1, #0x1e\n\ + add r1, r0, r1\n\ + mov r2, #0x3\n\ +._158:\n\ + ldrh r0, [r1]\n\ + cmp r0, #0\n\ + beq ._157 @cond_branch\n\ + add r0, r6, #1\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ +._157:\n\ + add r1, r1, #0x2\n\ + sub r2, r2, #0x1\n\ + cmp r2, #0\n\ + bge ._158 @cond_branch\n\ + ldrh r0, [r3, #0x2e]\n\ + mov r5, #0x1\n\ + and r5, r5, r0\n\ + cmp r5, #0\n\ + beq ._159 @cond_branch\n\ + bl DestroyMenuCursor\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._161 + 12\n\ + lsl r1, r7, #0x2\n\ + add r1, r1, r7\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r0\n\ + ldr r0, ._161 + 16\n\ + b ._160\n\ +._162:\n\ + .align 2, 0\n\ +._161:\n\ + .word gContestMons\n\ + .word gContestPlayerMonIndex\n\ + .word gMain\n\ + .word gTasks\n\ + .word sub_80AC0C8+1\n\ +._159:\n\ + ldrh r0, [r3, #0x30]\n\ + cmp r0, #0x10\n\ + bne ._163 @cond_branch\n\ + b ._196\n\ +._163:\n\ + cmp r0, #0x10\n\ + bgt ._165 @cond_branch\n\ + cmp r0, #0x2\n\ + beq ._166 @cond_branch\n\ + cmp r0, #0x8\n\ + bne ._167 @cond_branch\n\ + b ._168\n\ +._167:\n\ + b ._196\n\ +._165:\n\ + cmp r0, #0x40\n\ + beq ._170 @cond_branch\n\ + cmp r0, #0x40\n\ + bgt ._171 @cond_branch\n\ + b ._196\n\ +._171:\n\ + cmp r0, #0x80\n\ + beq ._173 @cond_branch\n\ + b ._196\n\ +._166:\n\ + bl sub_814A904\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r0, #0x0\n\ + bl sub_80AFFE0\n\ + ldr r0, ._177\n\ + ldr r1, ._177 + 4\n\ + ldrb r2, [r1]\n\ + ldrb r3, [r1, #0x1]\n\ + ldrb r4, [r1, #0x2]\n\ + str r4, [sp]\n\ + ldrb r1, [r1, #0x3]\n\ + str r1, [sp, #0x4]\n\ + mov r1, #0x0\n\ + bl Text_FillWindowRectDefPalette\n\ + ldr r0, ._177 + 8\n\ + ldrb r0, [r0]\n\ + bl Contest_IsMonsTurnDisabled\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._175 @cond_branch\n\ + ldr r0, ._177 + 12\n\ + ldr r1, ._177 + 16\n\ + bl StringCopy\n\ + b ._176\n\ +._178:\n\ + .align 2, 0\n\ +._177:\n\ + .word gUnknown_03004210\n\ + .word gUnknown_083CA340\n\ + .word gContestPlayerMonIndex\n\ + .word gDisplayedStringBattle\n\ + .word gText_Contest_WhichMoveWillBePlayed\n\ +._175:\n\ + ldr r0, ._180\n\ + ldr r1, ._180 + 4\n\ + bl StringCopy\n\ +._176:\n\ + ldr r5, ._180\n\ + ldr r0, ._180 + 8\n\ + ldrb r1, [r0, #0x1]\n\ + add r1, r1, #0x1\n\ + add r0, r5, #0\n\ + bl InsertStringDigit\n\ + bl sub_80AF138\n\ + ldr r4, ._180 + 12\n\ + add r0, r4, #0\n\ + add r1, r5, #0\n\ + bl StringExpandPlaceholders\n\ + ldr r0, ._180 + 16\n\ + mov r2, #0xc2\n\ + lsl r2, r2, #0x2\n\ + mov r1, #0xf\n\ + str r1, [sp]\n\ + add r1, r4, #0\n\ + mov r3, #0x1\n\ + bl Text_InitWindowAndPrintText\n\ + ldr r0, ._180 + 20\n\ + mov r1, #0x0\n\ + strh r1, [r0]\n\ + ldr r0, ._180 + 24\n\ + strh r1, [r0]\n\ + ldr r1, ._180 + 28\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r1\n\ + ldr r1, ._180 + 32\n\ + str r1, [r0]\n\ + b ._196\n\ +._181:\n\ + .align 2, 0\n\ +._180:\n\ + .word gDisplayedStringBattle\n\ + .word gText_Contest_ButItCantParticipate\n\ + .word +0x2019204\n\ + .word gStringVar4\n\ + .word gMenuWindow\n\ + .word gBattle_BG0_Y\n\ + .word gBattle_BG2_Y\n\ + .word gTasks\n\ + .word sub_80ABC70+1\n\ +._170:\n\ + ldr r4, ._184\n\ + mov r0, #0x0\n\ + ldsb r0, [r4, r0]\n\ + bl nullsub_17\n\ + ldrb r0, [r4]\n\ + cmp r0, #0\n\ + bne ._182 @cond_branch\n\ + sub r0, r6, #1\n\ + b ._186\n\ +._185:\n\ + .align 2, 0\n\ +._184:\n\ + .word +0x2019204\n\ +._182:\n\ + sub r0, r0, #0x1\n\ + b ._186\n\ +._173:\n\ + ldr r4, ._189\n\ + mov r0, #0x0\n\ + ldsb r0, [r4, r0]\n\ + bl nullsub_17\n\ + ldrb r1, [r4]\n\ + sub r0, r6, #1\n\ + cmp r1, r0\n\ + bne ._187 @cond_branch\n\ + strb r5, [r4]\n\ + b ._188\n\ +._190:\n\ + .align 2, 0\n\ +._189:\n\ + .word +0x2019204\n\ +._187:\n\ + add r0, r1, #1\n\ +._186:\n\ + strb r0, [r4]\n\ +._188:\n\ + ldr r4, ._193\n\ + mov r0, #0x0\n\ + ldsb r0, [r4, r0]\n\ + bl sub_80AC0AC\n\ + bl sub_80AED58\n\ + ldr r2, ._193 + 4\n\ + ldrb r1, [r4]\n\ + lsl r1, r1, #0x1\n\ + ldr r0, ._193 + 8\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x6\n\ + add r1, r1, r0\n\ + add r2, r2, #0x1e\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + bl sub_80AEBEC\n\ + cmp r6, #0x1\n\ + bls ._196 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + b ._196\n\ +._194:\n\ + .align 2, 0\n\ +._193:\n\ + .word +0x2019204\n\ + .word gContestMons\n\ + .word gContestPlayerMonIndex\n\ +._168:\n\ + ldr r0, ._197\n\ + ldrb r1, [r0]\n\ + cmp r1, #0x1\n\ + bne ._196 @cond_branch\n\ + ldr r0, ._197 + 4\n\ + ldrb r0, [r0]\n\ + add r2, r0, #0\n\ + and r2, r2, r1\n\ + cmp r2, #0\n\ + bne ._196 @cond_branch\n\ + ldr r0, ._197 + 8\n\ + lsl r1, r7, #0x2\n\ + add r1, r1, r7\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r0\n\ + strh r2, [r1, #0x8]\n\ + ldrb r0, [r4]\n\ + lsl r0, r0, #0x6\n\ + add r0, r0, ip\n\ + ldrh r0, [r0, #0x1e]\n\ + strh r0, [r1, #0xa]\n\ + ldr r0, ._197 + 12\n\ +._160:\n\ + str r0, [r1]\n\ +._196:\n\ + add sp, sp, #0x8\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._198:\n\ + .align 2, 0\n\ +._197:\n\ + .word gUnknown_020297ED\n\ + .word gIsLinkContest\n\ + .word gTasks\n\ + .word debug_sub_80B9EBC+1"); +} +#else void sub_80ABEA0(u8 taskId) { u8 numMoves = 0; @@ -807,6 +1103,550 @@ void sub_80ABEA0(u8 taskId) } } } +#endif + +#if DEBUG +__attribute__((naked)) +void debug_sub_80B9EBC() +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + add sp, sp, #0xffffff94\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + ldr r1, ._202\n\ + lsl r0, r4, #0x2\n\ + add r0, r0, r4\n\ + lsl r0, r0, #0x3\n\ + add r7, r0, r1\n\ + mov r0, #0x8\n\ + ldsh r2, [r7, r0]\n\ + cmp r2, #0\n\ + beq ._199 @cond_branch\n\ + cmp r2, #0x1\n\ + beq ._200 @cond_branch\n\ + b ._229\n\ +._203:\n\ + .align 2, 0\n\ +._202:\n\ + .word gTasks\n\ +._199:\n\ + ldr r5, ._205\n\ + ldr r4, ._205 + 4\n\ + ldrb r0, [r4]\n\ + mov r8, r0\n\ + ldrb r6, [r4, #0x1]\n\ + ldrb r0, [r4, #0x2]\n\ + str r0, [sp]\n\ + ldrb r0, [r4, #0x3]\n\ + str r0, [sp, #0x4]\n\ + add r0, r5, #0\n\ + mov r1, #0x0\n\ + mov r2, r8\n\ + add r3, r6, #0\n\ + bl Text_FillWindowRectDefPalette\n\ + mov r0, #0xa\n\ + ldsh r1, [r7, r0]\n\ + mov r0, #0xd\n\ + mul r1, r1, r0\n\ + ldr r0, ._205 + 8\n\ + add r1, r1, r0\n\ + mov r2, #0xc2\n\ + lsl r2, r2, #0x2\n\ + str r6, [sp]\n\ + add r0, r5, #0\n\ + mov r3, r8\n\ + bl Text_InitWindowAndPrintText\n\ + mov r0, #0xa\n\ + ldsh r1, [r7, r0]\n\ + add r0, sp, #0x8\n\ + mov r2, #0x2\n\ + mov r3, #0x3\n\ + bl ConvertIntToDecimalStringN\n\ + mov r2, #0xc7\n\ + lsl r2, r2, #0x2\n\ + ldrb r3, [r4, #0x4]\n\ + ldrb r0, [r4, #0x5]\n\ + str r0, [sp]\n\ + add r0, r5, #0\n\ + add r1, sp, #0x8\n\ + bl Text_InitWindowAndPrintText\n\ + bl sub_80AED58\n\ + ldrh r0, [r7, #0xa]\n\ + bl sub_80AEBEC\n\ + ldrh r0, [r7, #0x8]\n\ + add r0, r0, #0x1\n\ + strh r0, [r7, #0x8]\n\ + b ._229\n\ +._206:\n\ + .align 2, 0\n\ +._205:\n\ + .word gUnknown_03004210\n\ + .word gUnknown_083CA340\n\ + .word gMoveNames\n\ +._200:\n\ + ldr r0, ._213\n\ + ldrh r1, [r0, #0x30]\n\ + cmp r1, #0x10\n\ + beq ._207 @cond_branch\n\ + cmp r1, #0x10\n\ + bgt ._208 @cond_branch\n\ + cmp r1, #0x4\n\ + beq ._215 @cond_branch\n\ + cmp r1, #0x4\n\ + bgt ._210 @cond_branch\n\ + cmp r1, #0x2\n\ + beq ._211 @cond_branch\n\ + b ._229\n\ +._214:\n\ + .align 2, 0\n\ +._213:\n\ + .word gMain\n\ +._210:\n\ + cmp r1, #0x8\n\ + beq ._215 @cond_branch\n\ + b ._229\n\ +._208:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + cmp r1, r0\n\ + beq ._217 @cond_branch\n\ + cmp r1, r0\n\ + bgt ._218 @cond_branch\n\ + cmp r1, #0x20\n\ + beq ._219 @cond_branch\n\ + b ._229\n\ +._218:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x2\n\ + cmp r1, r0\n\ + beq ._221 @cond_branch\n\ + b ._229\n\ +._219:\n\ + ldrh r0, [r7, #0xa]\n\ + sub r0, r0, #0x1\n\ + b ._223\n\ +._221:\n\ + ldrh r0, [r7, #0xa]\n\ + sub r0, r0, #0xa\n\ +._223:\n\ + strh r0, [r7, #0xa]\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + bgt ._227 @cond_branch\n\ + mov r0, #0xb1\n\ + lsl r0, r0, #0x1\n\ + strh r0, [r7, #0xa]\n\ + b ._227\n\ +._207:\n\ + ldrh r0, [r7, #0xa]\n\ + add r0, r0, #0x1\n\ + b ._226\n\ +._217:\n\ + ldrh r0, [r7, #0xa]\n\ + add r0, r0, #0xa\n\ +._226:\n\ + strh r0, [r7, #0xa]\n\ + lsl r0, r0, #0x10\n\ + mov r1, #0xb1\n\ + lsl r1, r1, #0x11\n\ + cmp r0, r1\n\ + ble ._227 @cond_branch\n\ + strh r2, [r7, #0xa]\n\ +._227:\n\ + ldrh r0, [r7, #0x8]\n\ + sub r0, r0, #0x1\n\ + strh r0, [r7, #0x8]\n\ + b ._229\n\ +._215:\n\ + ldr r0, ._230\n\ + mov r1, #0x0\n\ + strh r1, [r0]\n\ + ldr r0, ._230 + 4\n\ + strh r1, [r0]\n\ + bl sub_80B1BDC\n\ + ldr r1, ._230 + 8\n\ + lsl r0, r4, #0x2\n\ + add r0, r0, r4\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r1\n\ + mov r1, #0x0\n\ + strh r1, [r0, #0x8]\n\ + ldr r1, ._230 + 12\n\ + str r1, [r0]\n\ + b ._229\n\ +._231:\n\ + .align 2, 0\n\ +._230:\n\ + .word gBattle_BG0_Y\n\ + .word gBattle_BG2_Y\n\ + .word gTasks\n\ + .word debug_sub_80BA054+1\n\ +._211:\n\ + ldr r0, ._232\n\ + mov r1, #0xa0\n\ + strh r1, [r0]\n\ + ldr r0, ._232 + 4\n\ + strh r1, [r0]\n\ + ldr r1, ._232 + 8\n\ + ldr r0, ._232 + 12\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x6\n\ + add r0, r0, r1\n\ + ldrh r2, [r7, #0xa]\n\ + mov r1, #0x0\n\ + strh r2, [r0, #0x1e]\n\ + strh r1, [r7, #0x8]\n\ + strh r1, [r7, #0xa]\n\ + strh r1, [r7, #0xc]\n\ + strh r1, [r7, #0xe]\n\ + ldr r0, ._232 + 16\n\ + str r0, [r7]\n\ +._229:\n\ + add sp, sp, #0x6c\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._233:\n\ + .align 2, 0\n\ +._232:\n\ + .word gBattle_BG0_Y\n\ + .word gBattle_BG2_Y\n\ + .word gContestMons\n\ + .word gContestPlayerMonIndex\n\ + .word sub_80ABCDC+1"); +} + +__attribute__((naked)) +void debug_sub_80BA054() +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6, r7}\n\ + lsl r0, r0, #0x18\n\ + lsr r7, r0, #0x18\n\ + ldr r1, ._236\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r1\n\ + mov r2, #0x8\n\ + ldsh r0, [r0, r2]\n\ + add r2, r1, #0\n\ + cmp r0, #0x14\n\ + bls ._234 @cond_branch\n\ + b ._286\n\ +._234:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._236 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._237:\n\ + .align 2, 0\n\ +._236:\n\ + .word gTasks\n\ + .word ._238\n\ +._238:\n\ + .word ._239\n\ + .word ._240\n\ + .word ._241\n\ + .word ._242\n\ + .word ._243\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._286\n\ + .word ._259\n\ +._239:\n\ + lsl r0, r7, #0x2\n\ + mov r8, r0\n\ + ldr r2, ._262\n\ + mov r9, r2\n\ + ldr r1, ._262 + 4\n\ + mov r2, #0x0\n\ + add r0, r1, #3\n\ +._260:\n\ + strb r2, [r0]\n\ + sub r0, r0, #0x1\n\ + cmp r0, r1\n\ + bge ._260 @cond_branch\n\ + mov r5, #0x0\n\ + mov r0, r9\n\ + mov r1, #0x0\n\ + mov r2, #0x14\n\ + bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + ldr r4, ._262 + 8\n\ + ldrb r0, [r4]\n\ + bl sub_80B28F0\n\ + ldr r3, ._262 + 12\n\ + ldrb r2, [r4]\n\ + lsl r2, r2, #0x6\n\ + add r0, r2, r3\n\ + ldrh r0, [r0]\n\ + add r1, r3, #0\n\ + add r1, r1, #0x3c\n\ + add r1, r2, r1\n\ + ldr r1, [r1]\n\ + add r3, r3, #0x38\n\ + add r2, r2, r3\n\ + ldr r2, [r2]\n\ + bl sub_80AE9FC\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ + ldr r2, ._262 + 16\n\ + lsl r0, r6, #0x4\n\ + add r0, r0, r6\n\ + lsl r0, r0, #0x2\n\ + add r3, r0, r2\n\ + mov r4, #0x0\n\ + mov r1, #0x78\n\ + strh r1, [r3, #0x24]\n\ + add r2, r2, #0x1c\n\ + add r0, r0, r2\n\ + ldr r1, ._262 + 20\n\ + str r1, [r0]\n\ + ldr r0, ._262 + 24\n\ + mov r2, r8\n\ + add r1, r2, r7\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r0\n\ + strh r6, [r1, #0xc]\n\ + ldr r2, ._262 + 28\n\ + ldr r0, ._262 + 32\n\ + ldrb r0, [r0]\n\ + add r0, r0, r2\n\ + strb r6, [r0]\n\ + strh r5, [r1, #0xe]\n\ + ldrh r0, [r1, #0x8]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1, #0x8]\n\ + mov r0, r9\n\ + sub r0, r0, #0xea\n\ + strb r4, [r0]\n\ + b ._286\n\ +._263:\n\ + .align 2, 0\n\ +._262:\n\ + .word +0x2019348\n\ + .word gBattleMonForms\n\ + .word gContestPlayerMonIndex\n\ + .word gContestMons\n\ + .word gSprites\n\ + .word sub_80AD8FC+1\n\ + .word gTasks\n\ + .word gObjectBankIDs\n\ + .word gBankAttacker\n\ +._240:\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + add r7, r0, r2\n\ + ldrb r6, [r7, #0xc]\n\ + ldr r1, ._267\n\ + lsl r0, r6, #0x4\n\ + add r0, r0, r6\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, #0x1c\n\ + add r0, r0, r1\n\ + ldr r1, [r0]\n\ + ldr r0, ._267 + 4\n\ + cmp r1, r0\n\ + beq ._264 @cond_branch\n\ + b ._286\n\ +._264:\n\ + ldr r4, ._267 + 8\n\ + ldrb r1, [r4]\n\ + lsl r0, r1, #0x3\n\ + sub r0, r0, r1\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._267 + 12\n\ + add r0, r0, r1\n\ + ldrh r1, [r7, #0xa]\n\ + mov r5, #0x0\n\ + strh r1, [r0, #0x6]\n\ + ldrb r0, [r4]\n\ + bl sub_80B2790\n\ + ldrb r0, [r4]\n\ + bl sub_80B28F0\n\ + ldrh r0, [r7, #0xa]\n\ + bl SelectContestMoveBankTarget\n\ + ldrh r0, [r7, #0xa]\n\ + bl DoMoveAnim\n\ + strh r5, [r7, #0xe]\n\ + ldrh r0, [r7, #0x8]\n\ + add r0, r0, #0x1\n\ + strh r0, [r7, #0x8]\n\ + b ._286\n\ +._268:\n\ + .align 2, 0\n\ +._267:\n\ + .word gSprites\n\ + .word SpriteCallbackDummy+1\n\ + .word gContestPlayerMonIndex\n\ + .word +0x2019260\n\ +._241:\n\ + ldr r0, ._273\n\ + ldr r0, [r0]\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ + ldr r0, ._273 + 4\n\ + ldrb r4, [r0]\n\ + cmp r4, #0\n\ + beq ._269 @cond_branch\n\ + b ._286\n\ +._269:\n\ + ldr r0, ._273 + 8\n\ + ldrb r0, [r0]\n\ + bl sub_80B28CC\n\ + ldr r0, ._273 + 12\n\ + add r0, r0, #0x5a\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._271 @cond_branch\n\ + ldr r0, ._273 + 16\n\ + lsl r1, r7, #0x2\n\ + add r1, r1, r7\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r0\n\ + strh r4, [r1, #0x1c]\n\ + mov r0, #0x14\n\ + strh r0, [r1, #0x8]\n\ + b ._286\n\ +._274:\n\ + .align 2, 0\n\ +._273:\n\ + .word gAnimScriptCallback\n\ + .word gAnimScriptActive\n\ + .word gContestPlayerMonIndex\n\ + .word +0x2019204\n\ + .word gTasks\n\ +._271:\n\ + ldr r0, ._276\n\ + lsl r1, r7, #0x2\n\ + add r1, r1, r7\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r0\n\ + ldrh r0, [r1, #0x8]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1, #0x8]\n\ + b ._286\n\ +._277:\n\ + .align 2, 0\n\ +._276:\n\ + .word gTasks\n\ +._242:\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + add r4, r0, r2\n\ + ldrh r0, [r4, #0xe]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4, #0xe]\n\ + lsl r0, r0, #0x10\n\ + asr r0, r0, #0x10\n\ + cmp r0, #0x15\n\ + bne ._286 @cond_branch\n\ + ldrb r6, [r4, #0xc]\n\ + ldr r1, ._280\n\ + lsl r0, r6, #0x4\n\ + add r0, r0, r6\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, #0x1c\n\ + add r0, r0, r1\n\ + ldr r1, ._280 + 4\n\ + str r1, [r0]\n\ + bl sub_80B1B14\n\ + mov r0, #0x0\n\ + strh r0, [r4, #0xe]\n\ + ldrh r0, [r4, #0x8]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4, #0x8]\n\ + b ._286\n\ +._281:\n\ + .align 2, 0\n\ +._280:\n\ + .word gSprites\n\ + .word sub_80AD92C+1\n\ +._243:\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + add r5, r0, r2\n\ + ldrb r6, [r5, #0xc]\n\ + ldr r1, ._284\n\ + lsl r0, r6, #0x4\n\ + add r0, r0, r6\n\ + lsl r0, r0, #0x2\n\ + add r4, r0, r1\n\ + add r0, r4, #0\n\ + add r0, r0, #0x3e\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x1d\n\ + cmp r0, #0\n\ + bge ._286 @cond_branch\n\ + add r0, r4, #0\n\ + bl FreeSpriteOamMatrix\n\ + add r0, r4, #0\n\ + bl DestroySprite\n\ + mov r0, #0x0\n\ + strh r0, [r5, #0x8]\n\ + ldr r0, ._284 + 4\n\ + str r0, [r5]\n\ + ldr r0, ._284 + 8\n\ + mov r1, #0xa0\n\ + strh r1, [r0]\n\ + ldr r0, ._284 + 12\n\ + strh r1, [r0]\n\ + b ._286\n\ +._285:\n\ + .align 2, 0\n\ +._284:\n\ + .word gSprites\n\ + .word debug_sub_80B9EBC+1\n\ + .word gBattle_BG0_Y\n\ + .word gBattle_BG2_Y\n\ +._259:\n\ + lsl r0, r7, #0x2\n\ + add r0, r0, r7\n\ + lsl r0, r0, #0x3\n\ + add r2, r0, r2\n\ + ldrh r0, [r2, #0x1c]\n\ + add r1, r0, #1\n\ + strh r1, [r2, #0x1c]\n\ + lsl r0, r0, #0x10\n\ + asr r0, r0, #0x10\n\ + cmp r0, #0x1e\n\ + ble ._286 @cond_branch\n\ + mov r0, #0x0\n\ + strh r0, [r2, #0x1c]\n\ + mov r0, #0x1\n\ + strh r0, [r2, #0x8]\n\ +._286:\n\ + pop {r3, r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0"); +} +#endif void sub_80AC0AC(s8 a) { diff --git a/src/field/bike.c b/src/field/bike.c index eb9d56a64..98966ebd4 100644 --- a/src/field/bike.c +++ b/src/field/bike.c @@ -131,14 +131,6 @@ static const struct BikeHistoryInputInfo gAcroBikeTricksList[] = void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys) { -#if DEBUG - if (gUnknown_020297ED && debug_sub_805F2B0(direction)) - { - Bike_SetBikeStill(); - return; - } -#endif - if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_MACH_BIKE) MovePlayerOnMachBike(direction, newKeys, heldKeys); else @@ -147,6 +139,13 @@ void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys) static void MovePlayerOnMachBike(u8 direction, u16 newKeys, u16 heldKeys) { +#if DEBUG + if (gUnknown_020297ED && debug_sub_805F2B0(direction)) + { + Bike_SetBikeStill(); + return; + } +#endif sMachBikeTransitions[GetMachBikeTransition(&direction)](direction); } diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 728decc9c..1bdc76b23 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -1648,6 +1648,178 @@ void sub_80BD610(struct SecretBaseRecord *basesA, struct SecretBaseRecord *bases sub_80BD328(basesC, 0); } +#if DEBUG +__attribute__((naked)) +void sub_80BD674(void *playerRecords, u32 size, u8 c) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + add r6, r0, #0\n\ + add r5, r1, #0\n\ + lsl r2, r2, #0x18\n\ + lsr r7, r2, #0x18\n\ + ldr r0, ._503\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._498 @cond_branch\n\ + mov r0, #0x60\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._498 @cond_branch\n\ + b ._520\n\ +._498:\n\ + bl GetLinkPlayerCount\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x2\n\ + beq ._500 @cond_branch\n\ + cmp r0, #0x3\n\ + beq ._501 @cond_branch\n\ + b ._505\n\ +._504:\n\ + .align 2, 0\n\ +._503:\n\ + .word gUnknown_020297ED\n\ +._500:\n\ + lsl r4, r5, #0x1\n\ + add r0, r6, r4\n\ + mov r1, #0x0\n\ + add r2, r5, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + add r4, r4, r5\n\ + add r4, r6, r4\n\ + add r0, r4, #0\n\ + mov r1, #0x0\n\ + add r2, r5, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + b ._505\n\ +._501:\n\ + lsl r0, r5, #0x1\n\ + add r0, r0, r5\n\ + add r0, r6, r0\n\ + mov r1, #0x0\n\ + add r2, r5, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ +._505:\n\ + cmp r7, #0x1\n\ + beq ._506 @cond_branch\n\ + cmp r7, #0x1\n\ + bgt ._507 @cond_branch\n\ + cmp r7, #0\n\ + beq ._508 @cond_branch\n\ + b ._515\n\ +._507:\n\ + cmp r7, #0x2\n\ + beq ._510 @cond_branch\n\ + cmp r7, #0x3\n\ + beq ._511 @cond_branch\n\ + b ._515\n\ +._508:\n\ + add r0, r6, r5\n\ + lsl r2, r5, #0x1\n\ + add r1, r6, r2\n\ + add r2, r2, r5\n\ + add r2, r6, r2\n\ + bl sub_80BD610\n\ + b ._515\n\ +._506:\n\ + lsl r1, r5, #0x1\n\ + add r0, r6, r1\n\ + add r1, r1, r5\n\ + add r1, r6, r1\n\ + add r2, r6, #0\n\ + bl sub_80BD610\n\ + b ._515\n\ +._510:\n\ + lsl r0, r5, #0x1\n\ + add r0, r0, r5\n\ + add r0, r6, r0\n\ + add r2, r6, r5\n\ + add r1, r6, #0\n\ + bl sub_80BD610\n\ + b ._515\n\ +._511:\n\ + add r1, r6, r5\n\ + lsl r2, r5, #0x1\n\ + add r2, r6, r2\n\ + add r0, r6, #0\n\ + bl sub_80BD610\n\ +._515:\n\ + mov r3, #0x1\n\ + ldr r6, ._521\n\ + mov r5, #0x10\n\ + neg r5, r5\n\ + ldr r4, ._521 + 4\n\ +._517:\n\ + lsl r0, r3, #0x2\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x5\n\ + add r0, r0, r6\n\ + add r2, r0, r4\n\ + ldrb r1, [r2]\n\ + lsl r0, r1, #0x1c\n\ + lsr r0, r0, #0x1c\n\ + cmp r0, #0x1\n\ + bne ._516 @cond_branch\n\ + mov r0, #0x3f\n\ + and r0, r0, r1\n\ + mov r1, #0x40\n\ + orr r0, r0, r1\n\ + and r0, r0, r5\n\ + strb r0, [r2]\n\ +._516:\n\ + add r0, r3, #1\n\ + lsl r0, r0, #0x10\n\ + lsr r3, r0, #0x10\n\ + cmp r3, #0x13\n\ + bls ._517 @cond_branch\n\ + bl sub_80BD280\n\ + mov r3, #0x1\n\ + ldr r4, ._521\n\ + ldr r6, ._521 + 4\n\ + add r7, r4, #0\n\ + mov r5, #0x3f\n\ +._519:\n\ + lsl r0, r3, #0x2\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x5\n\ + add r0, r0, r4\n\ + add r2, r0, r6\n\ + ldrb r1, [r2]\n\ + lsr r0, r1, #0x6\n\ + cmp r0, #0x2\n\ + bne ._518 @cond_branch\n\ + add r0, r5, #0\n\ + and r0, r0, r1\n\ + strb r0, [r2]\n\ +._518:\n\ + add r0, r3, #1\n\ + lsl r0, r0, #0x10\n\ + lsr r3, r0, #0x10\n\ + cmp r3, #0x13\n\ + bls ._519 @cond_branch\n\ + ldr r0, ._521 + 8\n\ + add r2, r7, r0\n\ + ldrh r1, [r2]\n\ + ldr r0, ._521 + 12\n\ + cmp r1, r0\n\ + beq ._520 @cond_branch\n\ + add r0, r1, #1\n\ + strh r0, [r2]\n\ +._520:\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._522:\n\ + .align 2, 0\n\ +._521:\n\ + .word gSaveBlock1\n\ + .word 0x1a09\n\ + .word 0x1a16\n\ + .word 0xffff"); +} +#else void sub_80BD674(void *playerRecords, u32 size, u8 c) { if (FlagGet(FLAG_RECEIVED_SECRET_POWER)) @@ -1706,3 +1878,4 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c) } } } +#endif diff --git a/src/field/shop.c b/src/field/shop.c index 1dc6ba0cd..df271743d 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -1222,6 +1222,27 @@ void CreateDecorationShop2Menu(u16 *itemList) SetShopMenuCallback(EnableBothScriptContexts); } +#if DEBUG +__attribute__((naked)) +void debug_sub_80C2818(void) +{ + asm("\ + push {lr}\n\ + mov r0, #0x0\n\ + bl CreateShopMenu\n\ + ldr r0, ._290\n\ + bl SetShopItemsForSale\n\ + mov r0, #0x0\n\ + bl SetShopMenuCallback\n\ + pop {r0}\n\ + bx r0\n\ +._291:\n\ + .align 2, 0\n\ +._290:\n\ + .word gUnknown_083CC6EB+0x3"); +} +#endif + void sub_80B45B4(u8 taskId, const s16 *list, u16 c) { s16 r5 = gTasks[taskId].data[4] - 1; diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index 0102b7526..8f7c8728d 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -41,11 +41,11 @@ static void sub_80A0090(struct Pokemon *); static void sub_80A015C(struct Pokemon *); static void sub_809DE44(void); static void sub_809EB40(u8); -static void sub_809EBC4(void); -static void sub_809E044(void); +/*static*/ void sub_809EBC4(void); +/*static*/ void sub_809E044(void); static void sub_80A1D84(struct Pokemon *); -static void sub_80A18C4(void); -static bool8 LoadPokemonSummaryScreenGraphics(void); +/*static*/ void sub_80A18C4(void); +/*static*/ bool8 LoadPokemonSummaryScreenGraphics(void); static bool8 MonKnowsMultipleMoves(struct Pokemon *); static void PrintSummaryWindowHeaderText(void); static void sub_80A1DCC(struct Pokemon *); @@ -63,8 +63,8 @@ static void PrintHeldItemName(u16, u8, u8); static void PrintNumRibbons(struct Pokemon *); static void DrawExperienceProgressBar(struct Pokemon *, u8, u8); static void sub_809E13C(u8 taskId); -static void sub_80A1950(void); -static void sub_809DE64(void); +/*static*/ void sub_80A1950(void); +/*static*/ void sub_809DE64(void); static void SummaryScreenHandleAButton(u8); static void SummaryScreenHandleUpDownInput(u8, s8); static bool8 sub_809F7D0(u8); @@ -572,7 +572,43 @@ static const u8 sUnknown_083C15BC[] = { -1, 15, 0, 10, }; - +#if DEBUG +__attribute__((naked)) +void sub_809D844(void) +{ + asm("\ + push {lr}\n\ + add sp, sp, #0xfffffffc\n\ + bl RunTasks\n\ + bl AnimateSprites\n\ + bl BuildOamBuffer\n\ + bl UpdatePaletteFade\n\ + ldr r0, ._2\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1 @cond_branch\n\ + ldr r0, ._2 + 4\n\ + ldr r1, ._2 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x3\n\ + str r1, [sp]\n\ + mov r1, #0x14\n\ + mov r2, #0x1\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._1:\n\ + add sp, sp, #0x4\n\ + pop {r0}\n\ + bx r0\n\ +._3:\n\ + .align 2, 0\n\ +._2:\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else void sub_809D844(void) { RunTasks(); @@ -580,6 +616,7 @@ void sub_809D844(void) BuildOamBuffer(); UpdatePaletteFade(); } +#endif void sub_809D85C(void) { @@ -689,6 +726,491 @@ void sub_809DA1C(void) } } +#if DEBUG +__attribute__((naked)) +bool8 sub_809DA84(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + add sp, sp, #0xfffffff8\n\ + ldr r1, ._52\n\ + ldr r2, ._52 + 4\n\ + add r0, r1, r2\n\ + ldrb r0, [r0]\n\ + mov ip, r1\n\ + cmp r0, #0x16\n\ + bls ._50 @cond_branch\n\ + b ._51\n\ +._50:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._52 + 8\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._53:\n\ + .align 2, 0\n\ +._52:\n\ + .word gMain\n\ + .word 0x43c\n\ + .word ._54\n\ +._54:\n\ + .word ._55\n\ + .word ._56\n\ + .word ._57\n\ + .word ._58\n\ + .word ._59\n\ + .word ._60\n\ + .word ._61\n\ + .word ._62\n\ + .word ._63\n\ + .word ._64\n\ + .word ._65\n\ + .word ._66\n\ + .word ._67\n\ + .word ._68\n\ + .word ._69\n\ + .word ._70\n\ + .word ._71\n\ + .word ._72\n\ + .word ._73\n\ + .word ._74\n\ + .word ._75\n\ + .word ._76\n\ + .word ._77\n\ +._55:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl ResetSpriteData\n\ + b ._146\n\ +._56:\n\ + bl ScanlineEffect_Stop\n\ + ldr r1, ._80\n\ + ldr r2, ._80 + 4\n\ + add r1, r1, r2\n\ + b ._153\n\ +._81:\n\ + .align 2, 0\n\ +._80:\n\ + .word gMain\n\ + .word 0x43c\n\ +._57:\n\ + bl FreeAllSpritePalettes\n\ + b ._146\n\ +._58:\n\ + mov r2, #0xc0\n\ + lsl r2, r2, #0x13\n\ + mov r3, #0x80\n\ + lsl r3, r3, #0x9\n\ + mov r5, #0x0\n\ + ldr r1, ._85\n\ + mov r4, #0x80\n\ + lsl r4, r4, #0x5\n\ + ldr r6, ._85 + 4\n\ + mov r7, #0x85\n\ + lsl r7, r7, #0x18\n\ +._83:\n\ + str r5, [sp, #0x4]\n\ + add r0, sp, #0x4\n\ + str r0, [r1]\n\ + str r2, [r1, #0x4]\n\ + str r6, [r1, #0x8]\n\ + ldr r0, [r1, #0x8]\n\ + add r2, r2, r4\n\ + sub r3, r3, r4\n\ + cmp r3, r4\n\ + bhi ._83 @cond_branch\n\ + str r5, [sp, #0x4]\n\ + add r0, sp, #0x4\n\ + str r0, [r1]\n\ + str r2, [r1, #0x4]\n\ + lsr r0, r3, #0x2\n\ + orr r0, r0, r7\n\ + str r0, [r1, #0x8]\n\ + ldr r0, [r1, #0x8]\n\ + ldr r1, ._85 + 8\n\ + add r1, r1, ip\n\ + b ._153\n\ +._86:\n\ + .align 2, 0\n\ +._85:\n\ + .word 0x40000d4\n\ + .word 0x85000400\n\ + .word 0x43c\n\ +._59:\n\ + bl sub_809DE64\n\ + ldr r1, ._88\n\ + ldr r2, ._88 + 4\n\ + add r1, r1, r2\n\ + b ._153\n\ +._89:\n\ + .align 2, 0\n\ +._88:\n\ + .word gMain\n\ + .word 0x43c\n\ +._60:\n\ + ldr r0, ._91\n\ + bl Text_LoadWindowTemplate\n\ + b ._146\n\ +._92:\n\ + .align 2, 0\n\ +._91:\n\ + .word gWindowTemplate_81E6E6C\n\ +._61:\n\ + ldr r0, ._94\n\ + bl MultistepInitMenuWindowBegin\n\ + ldr r1, ._94 + 4\n\ + ldr r2, ._94 + 8\n\ + add r1, r1, r2\n\ + b ._153\n\ +._95:\n\ + .align 2, 0\n\ +._94:\n\ + .word gWindowTemplate_81E6E6C\n\ + .word gMain\n\ + .word 0x43c\n\ +._62:\n\ + bl MultistepInitMenuWindowContinue\n\ + cmp r0, #0\n\ + bne ._96 @cond_branch\n\ + b ._157\n\ +._96:\n\ + b ._146\n\ +._63:\n\ + bl sub_809DA1C\n\ + ldr r1, ._100\n\ + ldr r2, ._100 + 4\n\ + add r1, r1, r2\n\ + b ._153\n\ +._101:\n\ + .align 2, 0\n\ +._100:\n\ + .word gMain\n\ + .word 0x43c\n\ +._64:\n\ + ldr r1, ._103\n\ + ldr r2, ._103 + 4\n\ + ldr r0, ._103 + 8\n\ + str r1, [r0]\n\ + str r2, [r0, #0x4]\n\ + ldr r1, ._103 + 12\n\ + str r1, [r0, #0x8]\n\ + ldr r1, [r0, #0x8]\n\ + ldr r1, ._103 + 16\n\ + ldr r2, ._103 + 20\n\ + str r1, [r0]\n\ + str r2, [r0, #0x4]\n\ + ldr r1, ._103 + 24\n\ + str r1, [r0, #0x8]\n\ + ldr r0, [r0, #0x8]\n\ + ldr r0, ._103 + 28\n\ + add r0, r0, #0x74\n\ + mov r1, #0x0\n\ + strb r1, [r0]\n\ + ldr r1, ._103 + 32\n\ + add r1, r1, ip\n\ + b ._153\n\ +._104:\n\ + .align 2, 0\n\ +._103:\n\ + .word gSummaryScreenTextTiles\n\ + .word 0x600d000\n\ + .word 0x40000d4\n\ + .word 0x800000a0\n\ + .word sSummaryScreenButtonTiles\n\ + .word 0x600d140\n\ + .word 0x80000080\n\ + .word +0x2018000\n\ + .word 0x43c\n\ +._65:\n\ + bl LoadPokemonSummaryScreenGraphics\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._105 @cond_branch\n\ + b ._157\n\ +._105:\n\ + ldr r0, ._108\n\ + add r0, r0, #0x74\n\ + mov r1, #0x0\n\ + strb r1, [r0]\n\ + b ._146\n\ +._109:\n\ + .align 2, 0\n\ +._108:\n\ + .word +0x2018000\n\ +._66:\n\ + bl sub_80A18C4\n\ + ldr r1, ._111\n\ + ldr r2, ._111 + 4\n\ + add r1, r1, r2\n\ + b ._153\n\ +._112:\n\ + .align 2, 0\n\ +._111:\n\ + .word gMain\n\ + .word 0x43c\n\ +._67:\n\ + ldr r4, ._115\n\ + add r0, r4, #0\n\ + bl sub_809F678\n\ + add r0, r4, #0\n\ + bl GetMonStatusAndPokerus\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._113 @cond_branch\n\ + mov r0, #0x0\n\ + bl sub_80A12D0\n\ + b ._114\n\ +._116:\n\ + .align 2, 0\n\ +._115:\n\ + .word +0x2018010\n\ +._113:\n\ + mov r0, #0xa\n\ + bl sub_80A12D0\n\ +._114:\n\ + ldr r0, ._118\n\ + bl DrawPokerusSurvivorDot\n\ + b ._146\n\ +._119:\n\ + .align 2, 0\n\ +._118:\n\ + .word +0x2018010\n\ +._68:\n\ + bl sub_80A1950\n\ + ldr r0, ._121\n\ + bl sub_80A1D84\n\ + ldr r1, ._121 + 4\n\ + ldr r2, ._121 + 8\n\ + add r1, r1, r2\n\ + b ._153\n\ +._122:\n\ + .align 2, 0\n\ +._121:\n\ + .word +0x2018010\n\ + .word gMain\n\ + .word 0x43c\n\ +._69:\n\ + ldr r4, ._124\n\ + add r0, r4, #0\n\ + bl sub_80A1DE8\n\ + add r4, r4, #0x64\n\ + mov r0, #0x0\n\ + strb r0, [r4]\n\ + b ._146\n\ +._125:\n\ + .align 2, 0\n\ +._124:\n\ + .word +0x2018010\n\ +._70:\n\ + ldr r4, ._129\n\ + add r5, r4, #0\n\ + add r5, r5, #0x64\n\ + add r0, r4, #0\n\ + add r1, r5, #0\n\ + bl sub_809F6B4\n\ + sub r4, r4, #0x10\n\ + strb r0, [r4, #0xc]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0xff\n\ + bne ._126 @cond_branch\n\ + b ._157\n\ +._126:\n\ + mov r0, #0x0\n\ + strb r0, [r5]\n\ + ldr r1, ._129 + 4\n\ + ldr r2, ._129 + 8\n\ + add r1, r1, r2\n\ + b ._153\n\ +._130:\n\ + .align 2, 0\n\ +._129:\n\ + .word +0x2018010\n\ + .word gMain\n\ + .word 0x43c\n\ +._71:\n\ + bl sub_809E044\n\ + bl DrawSummaryScreenNavigationDots\n\ + b ._146\n\ +._72:\n\ + ldr r1, ._134\n\ + ldrb r0, [r1, #0xb]\n\ + cmp r0, #0x1\n\ + bhi ._132 @cond_branch\n\ + ldr r0, ._134 + 4\n\ + ldrb r1, [r1, #0xb]\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r0\n\ + ldr r0, [r1]\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ +._132:\n\ + ldr r1, ._134 + 8\n\ + ldr r2, ._134 + 12\n\ + add r1, r1, r2\n\ + b ._153\n\ +._135:\n\ + .align 2, 0\n\ +._134:\n\ + .word +0x2018000\n\ + .word sUnknown_083C1580\n\ + .word gMain\n\ + .word 0x43c\n\ +._73:\n\ + ldr r0, ._137\n\ + bl sub_809FAC8\n\ + b ._146\n\ +._138:\n\ + .align 2, 0\n\ +._137:\n\ + .word +0x2018010\n\ +._74:\n\ + ldr r2, ._140\n\ + ldr r0, ._140 + 4\n\ + ldrb r1, [r0, #0xb]\n\ + lsl r1, r1, #0x2\n\ + add r1, r1, r2\n\ + add r0, r0, #0x10\n\ + ldr r1, [r1]\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cf8\n\ + ldr r1, ._140 + 8\n\ + ldr r2, ._140 + 12\n\ + add r1, r1, r2\n\ + b ._153\n\ +._141:\n\ + .align 2, 0\n\ +._140:\n\ + .word sUnknown_083C1598\n\ + .word +0x2018000\n\ + .word gMain\n\ + .word 0x43c\n\ +._75:\n\ + ldr r0, ._144\n\ + mov r1, #0x2d\n\ + bl GetMonData\n\ + add r1, r0, #0\n\ + cmp r1, #0\n\ + beq ._142 @cond_branch\n\ + ldr r1, ._144 + 4\n\ + mov r2, #0x80\n\ + lsl r2, r2, #0x1\n\ + add r0, r2, #0\n\ + strh r0, [r1]\n\ + b ._146\n\ +._145:\n\ + .align 2, 0\n\ +._144:\n\ + .word +0x2018010\n\ + .word gBattle_BG3_X\n\ +._142:\n\ + ldr r0, ._147\n\ + strh r1, [r0]\n\ + b ._146\n\ +._148:\n\ + .align 2, 0\n\ +._147:\n\ + .word gBattle_BG3_X\n\ +._76:\n\ + bl sub_809EBC4\n\ + ldr r0, ._151\n\ + add r0, r0, #0x79\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._149 @cond_branch\n\ + mov r0, #0x0\n\ + mov r1, #0x0\n\ + bl sub_80A1488\n\ + mov r0, #0x0\n\ + mov r1, #0x0\n\ + bl sub_80A1654\n\ + b ._150\n\ +._152:\n\ + .align 2, 0\n\ +._151:\n\ + .word +0x2018000\n\ +._149:\n\ + mov r0, #0xa\n\ + mov r1, #0x0\n\ + bl sub_80A1488\n\ + mov r0, #0xa\n\ + mov r1, #0x0\n\ + bl sub_80A1654\n\ +._150:\n\ + bl PrintSummaryWindowHeaderText\n\ + ldr r1, ._154\n\ + ldr r2, ._154 + 4\n\ + add r1, r1, r2\n\ + b ._153\n\ +._155:\n\ + .align 2, 0\n\ +._154:\n\ + .word gMain\n\ + .word 0x43c\n\ +._77:\n\ + bl sub_8055870\n\ + cmp r0, #0x1\n\ + beq ._157 @cond_branch\n\ +._146:\n\ + ldr r1, ._158\n\ + ldr r0, ._158 + 4\n\ + add r1, r1, r0\n\ +._153:\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + b ._157\n\ +._159:\n\ + .align 2, 0\n\ +._158:\n\ + .word gMain\n\ + .word 0x43c\n\ +._51:\n\ + ldr r0, ._162\n\ + bl SetVBlankCallback\n\ + mov r0, #0x1\n\ + str r0, [sp]\n\ + mov r0, #0xff\n\ + mov r1, #0x0\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginHardwarePaletteFade\n\ + ldr r0, ._162 + 4\n\ + bl SetMainCallback2\n\ + ldr r2, ._162 + 8\n\ + ldrb r1, [r2, #0x8]\n\ + mov r0, #0x7f\n\ + and r0, r0, r1\n\ + strb r0, [r2, #0x8]\n\ + ldr r0, ._162 + 12\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._160 @cond_branch\n\ + ldr r0, ._162 + 16\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x8\n\ + ldr r2, ._162 + 20\n\ + mov r3, #0x3\n\ + bl debug_sub_8008218\n\ +._160:\n\ + mov r0, #0x1\n\ + b ._161\n\ +._163:\n\ + .align 2, 0\n\ +._162:\n\ + .word sub_809D85C+1\n\ + .word sub_809D844+1\n\ + .word gPaletteFade\n\ + .word gLinkOpen\n\ + .word 0x600dde0\n\ + .word 0x600f000\n\ +._157:\n\ + mov r0, #0x0\n\ +._161:\n\ + add sp, sp, #0x8\n\ + pop {r4, r5, r6, r7}\n\ + pop {r1}\n\ + bx r1"); +} +#else bool8 sub_809DA84(void) { const u16 *src; @@ -856,13 +1378,15 @@ bool8 sub_809DA84(void) return FALSE; } +#endif static void sub_809DE44(void) { - while (sub_809DA84() != TRUE && sub_80F9344() != TRUE); + while (sub_809DA84() != TRUE && sub_80F9344() != TRUE) + ; } -static void sub_809DE64(void) +/*static*/ void sub_809DE64(void) { REG_BG0CNT = 0x1E08; REG_BG1CNT = 0x4801; @@ -889,7 +1413,7 @@ static void sub_809DE64(void) REG_DISPCNT = 0x1F40; } -static bool8 LoadPokemonSummaryScreenGraphics(void) +/*static*/ bool8 LoadPokemonSummaryScreenGraphics(void) { switch (pssData.loadGfxState) { @@ -939,7 +1463,7 @@ static bool8 LoadPokemonSummaryScreenGraphics(void) return FALSE; } -static void sub_809E044(void) +/*static*/ void sub_809E044(void) { LoadPalette(&gUnknownPalette_81E6692[28], 129, 2); LoadPalette(&gUnknownPalette_81E6692[30], 136, 2); @@ -1518,7 +2042,7 @@ static void sub_809EB40(u8 taskId) } } -static void sub_809EBC4(void) +/*static*/ void sub_809EBC4(void) { if (pssData.page != PSS_PAGE_INFO) { @@ -4887,7 +5411,7 @@ static void sub_80A1888(struct Sprite *sprite) } } -static void sub_80A18C4(void) +/*static*/ void sub_80A18C4(void) { u8 i; @@ -4911,7 +5435,7 @@ static void sub_80A1918(u8 a, u8 invisible) gSprites[ewram1A000[a]].invisible = invisible; } -static void sub_80A1950(void) +/*static*/ void sub_80A1950(void) { u8 i; diff --git a/src/pokenav_before.c b/src/pokenav_before.c index b31be2ce1..f9e2beccb 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -132,6 +132,10 @@ extern const u8 gUnknown_08E99FB0[]; extern const u8 gUnknown_08E9A100[]; extern const u16 gPokenavHoennMap1_Pal[]; +// TODO: decompile the debug code so the compiler doesn't complain about +// unused static functions +#define static + static void sub_80EBCA8(); static void sub_80EEE20(); static bool8 sub_80EEE54(); @@ -297,7 +301,6 @@ extern void sub_80F19FC(); extern u16 gKeyRepeatStartDelay; - void sub_80EBA5C() { switch (gMain.state) @@ -469,6 +472,315 @@ void sub_80EBDBC(void (*func)(void)) ewram0_10.var304 = 0; } +#if DEBUG +__attribute__((naked)) +void sub_80EBDD8() +{ + asm("\ + push {lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._64\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r2, r1, #0\n\ + cmp r0, #0x11\n\ + bls ._62 @cond_branch\n\ + b ._131\n\ +._62:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._64 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._65:\n\ + .align 2, 0\n\ +._64:\n\ + .word +0x2000000\n\ + .word ._66\n\ +._66:\n\ + .word ._67\n\ + .word ._68\n\ + .word ._69\n\ + .word ._70\n\ + .word ._71\n\ + .word ._72\n\ + .word ._73\n\ + .word ._74\n\ + .word ._75\n\ + .word ._76\n\ + .word ._77\n\ + .word ._78\n\ + .word ._79\n\ + .word ._80\n\ + .word ._81\n\ + .word ._82\n\ + .word ._83\n\ + .word ._84\n\ +._67:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x13\n\ + mov r0, #0x0\n\ + strh r0, [r1]\n\ + ldr r1, ._86\n\ + ldr r3, ._86 + 4\n\ + add r0, r1, r3\n\ + ldrb r2, [r0]\n\ + sub r3, r3, #0x2f\n\ + add r0, r1, r3\n\ + strb r2, [r0]\n\ + ldr r0, ._86 + 8\n\ + add r2, r1, r0\n\ + mov r0, #0x5\n\ + strb r0, [r2]\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._124\n\ +._87:\n\ + .align 2, 0\n\ +._86:\n\ + .word +0x2000000\n\ + .word 0x6ddc\n\ + .word 0x6dae\n\ +._68:\n\ + bl sub_80F3FF0\n\ + ldr r1, ._91\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._69:\n\ + bl sub_80F4024\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._88 @cond_branch\n\ + b ._131\n\ +._88:\n\ + ldr r1, ._91\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._124\n\ +._92:\n\ + .align 2, 0\n\ +._91:\n\ + .word +0x2000000\n\ +._70:\n\ + bl sub_80F2598\n\ + ldr r1, ._94\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._124\n\ +._95:\n\ + .align 2, 0\n\ +._94:\n\ + .word +0x2000000\n\ +._71:\n\ + bl sub_80EEE20\n\ + ldr r1, ._99\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._72:\n\ + bl sub_80EEE54\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._96 @cond_branch\n\ + b ._131\n\ +._96:\n\ + bl sub_80EEE08\n\ + ldr r1, ._99\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._124\n\ +._100:\n\ + .align 2, 0\n\ +._99:\n\ + .word +0x2000000\n\ +._73:\n\ + mov r0, #0x0\n\ + bl sub_80EF248\n\ + ldr r1, ._104\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._74:\n\ + mov r0, #0x0\n\ + bl sub_80EF284\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._101 @cond_branch\n\ + b ._131\n\ +._101:\n\ + b ._110\n\ +._105:\n\ + .align 2, 0\n\ +._104:\n\ + .word +0x2000000\n\ +._75:\n\ + mov r0, #0x0\n\ + bl sub_80F1B8C\n\ + ldr r1, ._108\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._76:\n\ + mov r0, #0x0\n\ + bl sub_80F1BC8\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._131 @cond_branch\n\ + ldr r1, ._108\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._124\n\ +._109:\n\ + .align 2, 0\n\ +._108:\n\ + .word +0x2000000\n\ +._77:\n\ + ldr r0, ._111\n\ + bl SetVBlankCallback\n\ + b ._110\n\ +._112:\n\ + .align 2, 0\n\ +._111:\n\ + .word sub_80EBD18+1\n\ +._78:\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + mov r1, #0x0\n\ + str r1, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r1, ._114\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._124\n\ +._115:\n\ + .align 2, 0\n\ +._114:\n\ + .word +0x2000000\n\ +._79:\n\ + mov r0, #0x0\n\ + bl sub_80EED2C\n\ + ldr r1, ._117\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._124\n\ +._118:\n\ + .align 2, 0\n\ +._117:\n\ + .word +0x2000000\n\ +._80:\n\ + ldr r0, ._121\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._131 @cond_branch\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r2, r3\n\ + b ._124\n\ +._122:\n\ + .align 2, 0\n\ +._121:\n\ + .word gPaletteFade\n\ +._81:\n\ + mov r0, #0x0\n\ + bl sub_80F2C80\n\ + ldr r1, ._125\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._82:\n\ + mov r0, #0x0\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._131 @cond_branch\n\ + ldr r1, ._125\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._124\n\ +._126:\n\ + .align 2, 0\n\ +._125:\n\ + .word +0x2000000\n\ +._83:\n\ + bl sub_80F1DF0\n\ +._110:\n\ + ldr r1, ._128\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ +._124:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._131\n\ +._129:\n\ + .align 2, 0\n\ +._128:\n\ + .word +0x2000000\n\ +._84:\n\ + bl sub_80F1E50\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._131 @cond_branch\n\ + mov r0, #0x0\n\ + mov r1, #0x0\n\ + bl sub_80EF428\n\ + ldr r0, ._132\n\ + bl sub_80EBDBC\n\ + ldr r0, ._132 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._131 @cond_branch\n\ + ldr r0, ._132 + 8\n\ + ldr r2, ._132 + 12\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ +._131:\n\ + add sp, sp, #0x4\n\ + pop {r0}\n\ + bx r0\n\ +._133:\n\ + .align 2, 0\n\ +._132:\n\ + .word sub_80EC268+1\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800"); +} +#else void sub_80EBDD8() { switch (ewram0_10.var304) @@ -556,7 +868,285 @@ void sub_80EBDD8() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EC00C() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._136\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0xd\n\ + bls ._134 @cond_branch\n\ + b ._191\n\ +._134:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._136 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._137:\n\ + .align 2, 0\n\ +._136:\n\ + .word +0x2000000\n\ + .word ._138\n\ +._138:\n\ + .word ._139\n\ + .word ._140\n\ + .word ._141\n\ + .word ._142\n\ + .word ._143\n\ + .word ._144\n\ + .word ._145\n\ + .word ._146\n\ + .word ._147\n\ + .word ._148\n\ + .word ._149\n\ + .word ._150\n\ + .word ._151\n\ + .word ._152\n\ +._139:\n\ + bl sub_80EEF78\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._153 @cond_branch\n\ + b ._191\n\ +._153:\n\ + ldr r0, ._156\n\ + bl SetVBlankCallback\n\ + bl sub_80EED1C\n\ + ldr r4, ._156 + 4\n\ + ldr r1, ._156 + 8\n\ + add r0, r4, r1\n\ + ldrb r1, [r0]\n\ + ldr r2, ._156 + 12\n\ + add r0, r4, r2\n\ + strb r1, [r0]\n\ + ldr r0, ._156 + 16\n\ + add r1, r4, r0\n\ + mov r0, #0x5\n\ + strb r0, [r1]\n\ + bl sub_80EEE08\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r4, r4, r1\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ + b ._191\n\ +._157:\n\ + .align 2, 0\n\ +._156:\n\ + .word sub_80EBD80+1\n\ + .word +0x2000000\n\ + .word 0x6ddc\n\ + .word 0x6dad\n\ + .word 0x6dae\n\ +._140:\n\ + mov r0, #0x0\n\ + bl sub_80EF248\n\ + ldr r1, ._161\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._141:\n\ + mov r0, #0x0\n\ + bl sub_80EF284\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._158 @cond_branch\n\ + b ._191\n\ +._158:\n\ + ldr r1, ._161\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._184\n\ +._162:\n\ + .align 2, 0\n\ +._161:\n\ + .word +0x2000000\n\ +._142:\n\ + mov r0, #0x0\n\ + bl sub_80F1B8C\n\ + ldr r1, ._166\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._143:\n\ + mov r0, #0x0\n\ + bl sub_80F1BC8\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._163 @cond_branch\n\ + b ._191\n\ +._163:\n\ + ldr r1, ._166\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._184\n\ +._167:\n\ + .align 2, 0\n\ +._166:\n\ + .word +0x2000000\n\ +._144:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._191 @cond_branch\n\ + b ._169\n\ +._145:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._171\n\ + bl SetVBlankCallback\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._184\n\ +._172:\n\ + .align 2, 0\n\ +._171:\n\ + .word sub_80EBD18+1\n\ +._146:\n\ + mov r0, #0x0\n\ + bl sub_80EED2C\n\ + ldr r1, ._174\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._184\n\ +._175:\n\ + .align 2, 0\n\ +._174:\n\ + .word +0x2000000\n\ +._147:\n\ + ldr r0, ._178\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._191 @cond_branch\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._184\n\ +._179:\n\ + .align 2, 0\n\ +._178:\n\ + .word gPaletteFade\n\ +._148:\n\ + bl sub_80F2598\n\ + ldr r1, ._181\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._184\n\ +._182:\n\ + .align 2, 0\n\ +._181:\n\ + .word +0x2000000\n\ +._149:\n\ + mov r0, #0x0\n\ + bl sub_80F2C80\n\ + ldr r1, ._185\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._150:\n\ + mov r0, #0x0\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._191 @cond_branch\n\ + ldr r1, ._185\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._184\n\ +._186:\n\ + .align 2, 0\n\ +._185:\n\ + .word +0x2000000\n\ +._151:\n\ + bl sub_80F1DF0\n\ +._169:\n\ + ldr r1, ._188\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ +._184:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._191\n\ +._189:\n\ + .align 2, 0\n\ +._188:\n\ + .word +0x2000000\n\ +._152:\n\ + bl sub_80F1E50\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._191 @cond_branch\n\ + ldr r0, ._192\n\ + ldr r1, ._192 + 4\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + mov r0, #0x0\n\ + bl sub_80EF428\n\ + ldr r0, ._192 + 8\n\ + bl sub_80EBDBC\n\ + ldr r0, ._192 + 12\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._191 @cond_branch\n\ + ldr r0, ._192 + 16\n\ + ldr r2, ._192 + 20\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ +._191:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._193:\n\ + .align 2, 0\n\ +._192:\n\ + .word +0x2000000\n\ + .word 0x6dad\n\ + .word sub_80EC268+1\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800"); +} +#else void sub_80EC00C() { switch (ewram0_10.var304) @@ -630,6 +1220,7 @@ void sub_80EC00C() break; } } +#endif void sub_80EC210() { @@ -751,6 +1342,262 @@ void sub_80EC268() } } +#if DEBUG +__attribute__((naked)) +void sub_80EC4A0() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._285\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0xe\n\ + bls ._283 @cond_branch\n\ + b ._340\n\ +._283:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._285 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._286:\n\ + .align 2, 0\n\ +._285:\n\ + .word +0x2000000\n\ + .word ._287\n\ +._287:\n\ + .word ._288\n\ + .word ._289\n\ + .word ._290\n\ + .word ._291\n\ + .word ._292\n\ + .word ._293\n\ + .word ._294\n\ + .word ._295\n\ + .word ._296\n\ + .word ._297\n\ + .word ._298\n\ + .word ._299\n\ + .word ._300\n\ + .word ._301\n\ + .word ._302\n\ +._288:\n\ + bl sub_80F1E84\n\ + mov r0, #0x0\n\ + bl sub_80F2D04\n\ + b ._336\n\ +._289:\n\ + bl sub_80F1F10\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._304 @cond_branch\n\ + b ._340\n\ +._304:\n\ + ldr r0, ._308\n\ + ldrb r1, [r0, #0x15]\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + mov r1, #0x8\n\ + cmp r0, #0\n\ + beq ._306 @cond_branch\n\ + mov r1, #0x7\n\ +._306:\n\ + add r0, r1, #0\n\ + bl sub_80EEFBC\n\ + ldr r1, ._308 + 4\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._335\n\ +._309:\n\ + .align 2, 0\n\ +._308:\n\ + .word gSaveBlock2\n\ + .word +0x2000000\n\ +._290:\n\ + bl sub_80EEF34\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + beq ._310 @cond_branch\n\ + b ._340\n\ +._310:\n\ + ldr r4, ._313\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + str r2, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._335\n\ +._314:\n\ + .align 2, 0\n\ +._313:\n\ + .word +0x2000000\n\ +._291:\n\ + ldr r0, ._318\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._315 @cond_branch\n\ + b ._340\n\ +._315:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + b ._336\n\ +._319:\n\ + .align 2, 0\n\ +._318:\n\ + .word gPaletteFade\n\ +._292:\n\ + bl sub_80F2620\n\ + ldr r1, ._321\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._335\n\ +._322:\n\ + .align 2, 0\n\ +._321:\n\ + .word +0x2000000\n\ +._293:\n\ + bl sub_80EF814\n\ + b ._336\n\ +._294:\n\ + bl sub_80EF840\n\ + ldr r1, ._326\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._295:\n\ + bl sub_80EF874\n\ +._328:\n\ + lsl r0, r0, #0x18\n\ +._334:\n\ + cmp r0, #0\n\ + bne ._340 @cond_branch\n\ + b ._336\n\ +._327:\n\ + .align 2, 0\n\ +._326:\n\ + .word +0x2000000\n\ +._296:\n\ + mov r0, #0x4\n\ + bl sub_80F2C80\n\ + ldr r1, ._329\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._297:\n\ + mov r0, #0x4\n\ + bl sub_80F2CBC\n\ + b ._328\n\ +._330:\n\ + .align 2, 0\n\ +._329:\n\ + .word +0x2000000\n\ +._298:\n\ + bl sub_80F2DD8\n\ + ldr r0, ._332\n\ + bl SetVBlankCallback\n\ + ldr r1, ._332 + 4\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._335\n\ +._333:\n\ + .align 2, 0\n\ +._332:\n\ + .word sub_80EBD30+1\n\ + .word +0x2000000\n\ +._299:\n\ + bl sub_8055870\n\ + b ._334\n\ +._300:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._335\n\ +._301:\n\ + mov r0, #0x1\n\ + bl sub_80EED2C\n\ + ldr r0, ._338\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._336 @cond_branch\n\ + ldr r0, ._338 + 4\n\ + ldr r2, ._338 + 8\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ +._336:\n\ + ldr r1, ._338 + 12\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ +._335:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._340\n\ +._339:\n\ + .align 2, 0\n\ +._338:\n\ + .word gLinkOpen\n\ + .word 0x60075e0\n\ + .word 0x600f800\n\ + .word +0x2000000\n\ +._302:\n\ + ldr r0, ._341\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._340 @cond_branch\n\ + ldr r0, ._341 + 4\n\ + bl sub_80EBDBC\n\ +._340:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._342:\n\ + .align 2, 0\n\ +._341:\n\ + .word gPaletteFade\n\ + .word sub_80EC67C+1"); +} +#else void sub_80EC4A0() { u32 var1; @@ -835,7 +1682,243 @@ void sub_80EC4A0() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EC67C() +{ + asm("\ + push {r4, r5, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._345\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x5\n\ + bls ._343 @cond_branch\n\ + b ._386\n\ +._343:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._345 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._346:\n\ + .align 2, 0\n\ +._345:\n\ + .word +0x2000000\n\ + .word ._347\n\ +._347:\n\ + .word ._348\n\ + .word ._349\n\ + .word ._350\n\ + .word ._351\n\ + .word ._352\n\ + .word ._353\n\ +._348:\n\ + bl sub_80FAB60\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x3\n\ + beq ._354 @cond_branch\n\ + cmp r0, #0x3\n\ + bgt ._355 @cond_branch\n\ + cmp r0, #0x1\n\ + beq ._356 @cond_branch\n\ + b ._386\n\ +._355:\n\ + cmp r0, #0x4\n\ + beq ._358 @cond_branch\n\ + cmp r0, #0x5\n\ + beq ._359 @cond_branch\n\ + b ._386\n\ +._356:\n\ + bl sub_80EED9C\n\ + b ._386\n\ +._354:\n\ + bl sub_80EF9F8\n\ + b ._386\n\ +._358:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._364\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + mov r1, #0x1\n\ + strh r1, [r0]\n\ + b ._386\n\ +._365:\n\ + .align 2, 0\n\ +._364:\n\ + .word +0x2000000\n\ +._359:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._367\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r0, r2\n\ + mov r1, #0x4\n\ + strh r1, [r0]\n\ + b ._386\n\ +._368:\n\ + .align 2, 0\n\ +._367:\n\ + .word +0x2000000\n\ +._349:\n\ + ldr r1, ._371\n\ + add r0, r4, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._369 @cond_branch\n\ + bl sub_80FAEC4\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._380\n\ +._372:\n\ + .align 2, 0\n\ +._371:\n\ + .word 0x6e90\n\ +._369:\n\ + mov r0, #0x1\n\ + bl sub_80EFBDC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._386 @cond_branch\n\ + bl sub_80FAEC4\n\ + b ._374\n\ +._350:\n\ + bl sub_80FAFC0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._386 @cond_branch\n\ + ldr r5, ._378\n\ + ldr r1, ._378 + 4\n\ + add r0, r5, r1\n\ + ldrb r4, [r0]\n\ + cmp r4, #0\n\ + bne ._376 @cond_branch\n\ + bl sub_80EFBB0\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r5, r2\n\ + strh r4, [r0]\n\ + b ._386\n\ +._379:\n\ + .align 2, 0\n\ +._378:\n\ + .word +0x2000000\n\ + .word 0x6e90\n\ +._376:\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r5, r0\n\ + b ._380\n\ +._351:\n\ + mov r0, #0x0\n\ + bl sub_80EFBDC\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + cmp r4, #0\n\ + bne ._386 @cond_branch\n\ + bl sub_80EFBB0\n\ + ldr r0, ._383\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + strh r4, [r0]\n\ + b ._386\n\ +._384:\n\ + .align 2, 0\n\ +._383:\n\ + .word +0x2000000\n\ +._352:\n\ + mov r2, #0xc2\n\ + lsl r2, r2, #0x2\n\ + add r0, r4, r2\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ +._374:\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ +._380:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._386\n\ +._353:\n\ + ldr r0, ._389\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._386 @cond_branch\n\ + bl sub_80F2DF4\n\ + mov r0, #0x4\n\ + bl sub_80F2D04\n\ + ldr r3, ._389 + 4\n\ + mov r2, #0x0\n\ + ldr r0, ._389 + 8\n\ + ldr r1, ._389 + 12\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._387 @cond_branch\n\ + mov r2, #0x1\n\ +._387:\n\ + lsl r2, r2, #0x3\n\ + ldrb r1, [r3, #0x15]\n\ + mov r0, #0x9\n\ + neg r0, r0\n\ + and r0, r0, r1\n\ + orr r0, r0, r2\n\ + strb r0, [r3, #0x15]\n\ + ldr r0, ._389 + 16\n\ + bl sub_80EBDBC\n\ +._386:\n\ + ldr r0, ._389 + 20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._388 @cond_branch\n\ + ldr r0, ._389 + 24\n\ + ldr r2, ._389 + 28\n\ + add r0, r0, r2\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x1\n\ + mov r2, #0x1\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._388:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0\n\ +._390:\n\ + .align 2, 0\n\ +._389:\n\ + .word gPaletteFade\n\ + .word gSaveBlock2\n\ + .word +0x2000000\n\ + .word 0x6e90\n\ + .word sub_80EC00C+1\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else void sub_80EC67C() { switch (ewram0_10.var304) @@ -907,6 +1990,7 @@ void sub_80EC67C() break; } } +#endif void sub_80EC81C() { @@ -1001,6 +2085,275 @@ void sub_80EC9A8() } } +#if DEBUG +__attribute__((naked)) +void sub_80ECA10() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._456\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0xd\n\ + bls ._454 @cond_branch\n\ + b ._509\n\ +._454:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._456 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._457:\n\ + .align 2, 0\n\ +._456:\n\ + .word +0x2000000\n\ + .word ._458\n\ +._458:\n\ + .word ._459\n\ + .word ._460\n\ + .word ._461\n\ + .word ._462\n\ + .word ._463\n\ + .word ._464\n\ + .word ._465\n\ + .word ._466\n\ + .word ._467\n\ + .word ._468\n\ + .word ._469\n\ + .word ._470\n\ + .word ._471\n\ + .word ._472\n\ +._459:\n\ + bl sub_80EEF78\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._473 @cond_branch\n\ + b ._509\n\ +._473:\n\ + ldr r0, ._476\n\ + bl SetVBlankCallback\n\ + bl sub_80EED1C\n\ + ldr r4, ._476 + 4\n\ + ldr r1, ._476 + 8\n\ + add r0, r4, r1\n\ + ldrb r1, [r0]\n\ + ldr r2, ._476 + 12\n\ + add r0, r4, r2\n\ + strb r1, [r0]\n\ + ldr r0, ._476 + 16\n\ + add r1, r4, r0\n\ + mov r0, #0x3\n\ + strb r0, [r1]\n\ + bl sub_80EEE08\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r4, r4, r1\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ + b ._509\n\ +._477:\n\ + .align 2, 0\n\ +._476:\n\ + .word sub_80EBD80+1\n\ + .word +0x2000000\n\ + .word 0x6df0\n\ + .word 0x6dad\n\ + .word 0x6dae\n\ +._460:\n\ + mov r0, #0x1\n\ + bl sub_80EF248\n\ + ldr r1, ._481\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._461:\n\ + mov r0, #0x1\n\ + bl sub_80EF284\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._478 @cond_branch\n\ + b ._509\n\ +._478:\n\ + ldr r1, ._481\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._502\n\ +._482:\n\ + .align 2, 0\n\ +._481:\n\ + .word +0x2000000\n\ +._462:\n\ + mov r0, #0x1\n\ + bl sub_80F1B8C\n\ + ldr r1, ._486\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._463:\n\ + mov r0, #0x1\n\ + bl sub_80F1BC8\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._483 @cond_branch\n\ + b ._509\n\ +._483:\n\ + ldr r1, ._486\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._502\n\ +._487:\n\ + .align 2, 0\n\ +._486:\n\ + .word +0x2000000\n\ +._464:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._509 @cond_branch\n\ + b ._496\n\ +._465:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._491\n\ + bl SetVBlankCallback\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._502\n\ +._492:\n\ + .align 2, 0\n\ +._491:\n\ + .word sub_80EBD18+1\n\ +._466:\n\ + mov r0, #0x0\n\ + bl sub_80EED2C\n\ + ldr r1, ._494\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._502\n\ +._495:\n\ + .align 2, 0\n\ +._494:\n\ + .word +0x2000000\n\ +._467:\n\ + bl sub_80F2598\n\ + b ._496\n\ +._468:\n\ + ldr r0, ._499\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._509 @cond_branch\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ + b ._502\n\ +._500:\n\ + .align 2, 0\n\ +._499:\n\ + .word gPaletteFade\n\ +._469:\n\ + mov r0, #0x1\n\ + bl sub_80F2C80\n\ + ldr r1, ._503\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._470:\n\ + mov r0, #0x1\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._509 @cond_branch\n\ + ldr r1, ._503\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._502\n\ +._504:\n\ + .align 2, 0\n\ +._503:\n\ + .word +0x2000000\n\ +._471:\n\ + bl sub_80F1DF0\n\ +._496:\n\ + ldr r1, ._506\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ +._502:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._509\n\ +._507:\n\ + .align 2, 0\n\ +._506:\n\ + .word +0x2000000\n\ +._472:\n\ + bl sub_80F1E50\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._509 @cond_branch\n\ + ldr r0, ._510\n\ + ldr r1, ._510 + 4\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + mov r0, #0x1\n\ + bl sub_80EF428\n\ + ldr r0, ._510 + 8\n\ + bl sub_80EBDBC\n\ + ldr r0, ._510 + 12\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._509 @cond_branch\n\ + ldr r0, ._510 + 16\n\ + ldr r2, ._510 + 20\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ +._509:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._511:\n\ + .align 2, 0\n\ +._510:\n\ + .word +0x2000000\n\ + .word 0x6dad\n\ + .word sub_80EC86C+1\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800"); +} +#else void sub_80ECA10() { switch (ewram0_10.var304) @@ -1072,6 +2425,7 @@ void sub_80ECA10() break; } } +#endif void sub_80ECC08() { @@ -1127,6 +2481,362 @@ void sub_80ECC08() } } +#if DEBUG +__attribute__((naked)) +void sub_80ECD80() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._564\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x14\n\ + bls ._562 @cond_branch\n\ + b ._642\n\ +._562:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._564 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._565:\n\ + .align 2, 0\n\ +._564:\n\ + .word +0x2000000\n\ + .word ._566\n\ +._566:\n\ + .word ._567\n\ + .word ._568\n\ + .word ._569\n\ + .word ._570\n\ + .word ._571\n\ + .word ._572\n\ + .word ._573\n\ + .word ._574\n\ + .word ._575\n\ + .word ._576\n\ + .word ._577\n\ + .word ._578\n\ + .word ._579\n\ + .word ._580\n\ + .word ._581\n\ + .word ._582\n\ + .word ._583\n\ + .word ._584\n\ + .word ._585\n\ + .word ._586\n\ + .word ._587\n\ +._567:\n\ + mov r3, #0xc2\n\ + lsl r3, r3, #0x2\n\ + add r0, r4, r3\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ + b ._630\n\ +._568:\n\ + ldr r0, ._592\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._589 @cond_branch\n\ + b ._642\n\ +._589:\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._630\n\ +._593:\n\ + .align 2, 0\n\ +._592:\n\ + .word gPaletteFade\n\ +._569:\n\ + bl sub_80EEF78\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._594 @cond_branch\n\ + b ._642\n\ +._594:\n\ + ldr r0, ._597\n\ + bl SetVBlankCallback\n\ + b ._625\n\ +._598:\n\ + .align 2, 0\n\ +._597:\n\ + .word sub_80EBD80+1\n\ +._570:\n\ + bl sub_80EED1C\n\ + bl sub_80F3130\n\ + ldr r1, ._600\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._630\n\ +._601:\n\ + .align 2, 0\n\ +._600:\n\ + .word +0x2000000\n\ +._571:\n\ + mov r0, #0x1\n\ + bl sub_80F2D6C\n\ + ldr r1, ._603\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._630\n\ +._604:\n\ + .align 2, 0\n\ +._603:\n\ + .word +0x2000000\n\ +._572:\n\ + mov r0, #0x5\n\ + bl sub_80F2D6C\n\ + b ._625\n\ +._573:\n\ + ldr r1, ._607\n\ + add r0, r4, r1\n\ + ldrb r1, [r0]\n\ + ldr r2, ._607 + 4\n\ + add r0, r4, r2\n\ + strb r1, [r0]\n\ + ldr r3, ._607 + 8\n\ + add r1, r4, r3\n\ + mov r0, #0x6\n\ + strb r0, [r1]\n\ + bl sub_80EEE08\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ + b ._630\n\ +._608:\n\ + .align 2, 0\n\ +._607:\n\ + .word 0x6dfc\n\ + .word 0x6dad\n\ + .word 0x6dae\n\ +._574:\n\ + mov r0, #0x2\n\ + bl sub_80EF248\n\ + ldr r1, ._612\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._575:\n\ + mov r0, #0x2\n\ + bl sub_80EF284\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._609 @cond_branch\n\ + b ._642\n\ +._609:\n\ + b ._625\n\ +._613:\n\ + .align 2, 0\n\ +._612:\n\ + .word +0x2000000\n\ +._576:\n\ + mov r0, #0x2\n\ + bl sub_80F1B8C\n\ + ldr r1, ._617\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._577:\n\ + mov r0, #0x2\n\ + bl sub_80F1BC8\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._614 @cond_branch\n\ + b ._642\n\ +._614:\n\ + ldr r1, ._617\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._630\n\ +._618:\n\ + .align 2, 0\n\ +._617:\n\ + .word +0x2000000\n\ +._578:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + beq ._619 @cond_branch\n\ + b ._642\n\ +._619:\n\ + b ._625\n\ +._579:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._623\n\ + bl SetVBlankCallback\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._630\n\ +._624:\n\ + .align 2, 0\n\ +._623:\n\ + .word sub_80EBD18+1\n\ +._580:\n\ + mov r0, #0x0\n\ + bl sub_80EED2C\n\ + b ._625\n\ +._581:\n\ + bl sub_80F2598\n\ + ldr r1, ._627\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._630\n\ +._628:\n\ + .align 2, 0\n\ +._627:\n\ + .word +0x2000000\n\ +._582:\n\ + ldr r0, ._631\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._642 @cond_branch\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._630\n\ +._632:\n\ + .align 2, 0\n\ +._631:\n\ + .word gPaletteFade\n\ +._583:\n\ + mov r0, #0x1\n\ + bl sub_80F2C80\n\ + ldr r1, ._635\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._584:\n\ + mov r0, #0x1\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + bne ._642 @cond_branch\n\ + ldr r0, ._635\n\ + ldr r3, ._635 + 4\n\ + add r1, r0, r3\n\ + strh r2, [r1]\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + add r1, r1, #0x1\n\ + strh r1, [r0]\n\ + b ._642\n\ +._636:\n\ + .align 2, 0\n\ +._635:\n\ + .word +0x2000000\n\ + .word 0x306\n\ +._585:\n\ + mov r0, #0x5\n\ + bl sub_80F2C80\n\ + ldr r1, ._639\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._586:\n\ + mov r0, #0x5\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._642 @cond_branch\n\ + bl sub_80F1DF0\n\ +._625:\n\ + ldr r1, ._639\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ +._630:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._642\n\ +._640:\n\ + .align 2, 0\n\ +._639:\n\ + .word +0x2000000\n\ +._587:\n\ + bl sub_80F1E50\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._642 @cond_branch\n\ + ldr r0, ._643\n\ + ldr r1, ._643 + 4\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + mov r0, #0x2\n\ + bl sub_80EF428\n\ + ldr r0, ._643 + 8\n\ + bl sub_80EBDBC\n\ + ldr r0, ._643 + 12\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._642 @cond_branch\n\ + ldr r0, ._643 + 16\n\ + ldr r2, ._643 + 20\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ +._642:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._644:\n\ + .align 2, 0\n\ +._643:\n\ + .word +0x2000000\n\ + .word 0x6dad\n\ + .word sub_80ECC08+1\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800"); +} +#else void sub_80ECD80() { switch (ewram0_10.var304) @@ -1233,7 +2943,418 @@ void sub_80ECD80() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80ED01C() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._647\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x13\n\ + bls ._645 @cond_branch\n\ + b ._736\n\ +._645:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._647 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._648:\n\ + .align 2, 0\n\ +._647:\n\ + .word +0x2000000\n\ + .word ._649\n\ +._649:\n\ + .word ._650\n\ + .word ._651\n\ + .word ._652\n\ + .word ._653\n\ + .word ._654\n\ + .word ._655\n\ + .word ._656\n\ + .word ._657\n\ + .word ._658\n\ + .word ._659\n\ + .word ._660\n\ + .word ._661\n\ + .word ._662\n\ + .word ._663\n\ + .word ._664\n\ + .word ._665\n\ + .word ._666\n\ + .word ._667\n\ + .word ._668\n\ + .word ._669\n\ +._650:\n\ + bl sub_80F1E84\n\ + mov r0, #0x1\n\ + bl sub_80F2D04\n\ + mov r0, #0x5\n\ + bl sub_80F2D04\n\ + ldr r1, ._671\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + b ._724\n\ +._672:\n\ + .align 2, 0\n\ +._671:\n\ + .word +0x2000000\n\ +._651:\n\ + bl sub_80F1F10\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._673 @cond_branch\n\ + b ._736\n\ +._673:\n\ + mov r0, #0x0\n\ + bl sub_80EEFBC\n\ + ldr r1, ._676\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._724\n\ +._677:\n\ + .align 2, 0\n\ +._676:\n\ + .word +0x2000000\n\ +._652:\n\ + bl sub_80EEF34\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + beq ._678 @cond_branch\n\ + b ._736\n\ +._678:\n\ + ldr r4, ._681\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + str r2, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._724\n\ +._682:\n\ + .align 2, 0\n\ +._681:\n\ + .word +0x2000000\n\ +._653:\n\ + ldr r0, ._686\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._683 @cond_branch\n\ + b ._736\n\ +._683:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + bl sub_80EF814\n\ + ldr r1, ._686 + 4\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + b ._724\n\ +._687:\n\ + .align 2, 0\n\ +._686:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ +._654:\n\ + bl sub_80F2620\n\ + ldr r1, ._689\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._724\n\ +._690:\n\ + .align 2, 0\n\ +._689:\n\ + .word +0x2000000\n\ +._655:\n\ + bl sub_80F4D44\n\ + ldr r1, ._693\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._656:\n\ + bl sub_80F4D88\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._691 @cond_branch\n\ + ldr r1, ._693\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x2\n\ + strh r0, [r1]\n\ + b ._736\n\ +._694:\n\ + .align 2, 0\n\ +._693:\n\ + .word +0x2000000\n\ +._691:\n\ + ldr r1, ._696\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._724\n\ +._697:\n\ + .align 2, 0\n\ +._696:\n\ + .word +0x2000000\n\ +._657:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + beq ._698 @cond_branch\n\ + b ._736\n\ +._698:\n\ + ldr r1, ._701\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + sub r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._736\n\ +._702:\n\ + .align 2, 0\n\ +._701:\n\ + .word +0x2000000\n\ +._658:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + beq ._703 @cond_branch\n\ + b ._736\n\ +._703:\n\ + ldr r1, ._706\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + b ._724\n\ +._707:\n\ + .align 2, 0\n\ +._706:\n\ + .word +0x2000000\n\ +._659:\n\ + mov r0, #0x0\n\ + bl sub_80F0264\n\ + ldr r1, ._711\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._660:\n\ + bl sub_80F02A0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._708 @cond_branch\n\ + b ._736\n\ +._708:\n\ + ldr r1, ._711\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._724\n\ +._712:\n\ + .align 2, 0\n\ +._711:\n\ + .word +0x2000000\n\ +._661:\n\ + mov r0, #0x0\n\ + bl sub_80F3008\n\ + ldr r1, ._714\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + b ._724\n\ +._715:\n\ + .align 2, 0\n\ +._714:\n\ + .word +0x2000000\n\ +._662:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + beq ._716 @cond_branch\n\ + b ._736\n\ +._716:\n\ + ldr r1, ._719\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._724\n\ +._720:\n\ + .align 2, 0\n\ +._719:\n\ + .word +0x2000000\n\ +._663:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._722\n\ + bl SetVBlankCallback\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._724\n\ +._723:\n\ + .align 2, 0\n\ +._722:\n\ + .word sub_80EBD18+1\n\ +._664:\n\ + mov r0, #0x4\n\ + bl sub_80EED2C\n\ + ldr r1, ._725\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r1, r3\n\ + b ._724\n\ +._726:\n\ + .align 2, 0\n\ +._725:\n\ + .word +0x2000000\n\ +._665:\n\ + ldr r0, ._729\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + lsl r0, r0, #0x18\n\ + lsr r1, r0, #0x18\n\ + cmp r1, #0\n\ + bne ._736 @cond_branch\n\ + ldr r2, ._729 + 4\n\ + add r0, r4, r2\n\ + strh r1, [r0]\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r1, r4, r3\n\ +._724:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._736\n\ +._730:\n\ + .align 2, 0\n\ +._729:\n\ + .word gPaletteFade\n\ + .word 0x306\n\ +._666:\n\ + mov r0, #0x1\n\ + bl sub_80F2C80\n\ + ldr r1, ._733\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._667:\n\ + mov r0, #0x1\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + bne ._736 @cond_branch\n\ + ldr r0, ._733\n\ + ldr r3, ._733 + 4\n\ + add r1, r0, r3\n\ + strh r2, [r1]\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + add r1, r1, #0x1\n\ + strh r1, [r0]\n\ + b ._736\n\ +._734:\n\ + .align 2, 0\n\ +._733:\n\ + .word +0x2000000\n\ + .word 0x306\n\ +._668:\n\ + ldr r4, ._737\n\ + ldr r2, ._737 + 4\n\ + add r0, r4, r2\n\ + ldrb r0, [r0]\n\ + add r0, r0, #0x7\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl sub_80F2C80\n\ + mov r3, #0xc1\n\ + lsl r3, r3, #0x2\n\ + add r4, r4, r3\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ +._669:\n\ + ldr r0, ._737\n\ + ldr r1, ._737 + 4\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + add r0, r0, #0x7\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._736 @cond_branch\n\ + ldr r0, ._737 + 8\n\ + bl sub_80EBDBC\n\ + ldr r0, ._737 + 12\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._736 @cond_branch\n\ + ldr r0, ._737 + 16\n\ + ldr r2, ._737 + 20\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ +._736:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._738:\n\ + .align 2, 0\n\ +._737:\n\ + .word +0x2000000\n\ + .word 0x6dfc\n\ + .word sub_80ED31C+1\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800"); +} +#else void sub_80ED01C() { switch (ewram0_10.var304) @@ -1342,7 +3463,129 @@ void sub_80ED01C() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80ED31C() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._743\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r4, r0, r1\n\ + ldrh r0, [r4]\n\ + cmp r0, #0x1\n\ + beq ._739 @cond_branch\n\ + cmp r0, #0x1\n\ + bgt ._740 @cond_branch\n\ + cmp r0, #0\n\ + beq ._741 @cond_branch\n\ + b ._761\n\ +._744:\n\ + .align 2, 0\n\ +._743:\n\ + .word +0x2000000\n\ +._740:\n\ + cmp r0, #0x2\n\ + beq ._745 @cond_branch\n\ + b ._761\n\ +._741:\n\ + bl sub_80F5DD4\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + beq ._747 @cond_branch\n\ + cmp r0, #0x2\n\ + beq ._748 @cond_branch\n\ + ldr r0, ._751\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._749 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._751 + 4\n\ + bl sub_80EBDBC\n\ + b ._762\n\ +._752:\n\ + .align 2, 0\n\ +._751:\n\ + .word gMain\n\ + .word sub_80ED4D8+1\n\ +._747:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + bl ShowMapNamePopUpWindow\n\ + b ._762\n\ +._748:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ + b ._762\n\ +._749:\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._761 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._757\n\ + bl sub_80EBDBC\n\ + b ._762\n\ +._758:\n\ + .align 2, 0\n\ +._757:\n\ + .word sub_80ECD80+1\n\ +._739:\n\ + bl sub_80F0718\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._761 @cond_branch\n\ + bl ShowMapNamePopUpWindow\n\ + bl sub_80F3264\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + b ._760\n\ +._745:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._761 @cond_branch\n\ +._760:\n\ + strh r0, [r4]\n\ +._761:\n\ + ldr r0, ._763\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._762 @cond_branch\n\ + ldr r0, ._763 + 4\n\ + ldr r1, ._763 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x1\n\ + mov r2, #0x8\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._762:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._764:\n\ + .align 2, 0\n\ +._763:\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else void sub_80ED31C() { switch (ewram0_10.var304) @@ -1386,7 +3629,195 @@ void sub_80ED31C() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80ED3D0() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._767\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0]\n\ + cmp r0, #0x8\n\ + bls ._765 @cond_branch\n\ + b ._803\n\ +._765:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._767 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._768:\n\ + .align 2, 0\n\ +._767:\n\ + .word +0x2000000\n\ + .word ._769\n\ +._769:\n\ + .word ._770\n\ + .word ._771\n\ + .word ._772\n\ + .word ._773\n\ + .word ._774\n\ + .word ._775\n\ + .word ._776\n\ + .word ._777\n\ + .word ._778\n\ +._770:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + ldr r1, ._780\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._793\n\ +._781:\n\ + .align 2, 0\n\ +._780:\n\ + .word +0x2000000\n\ +._771:\n\ + bl sub_80EED0C\n\ + bl sub_80F6134\n\ + ldr r1, ._783\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._793\n\ +._784:\n\ + .align 2, 0\n\ +._783:\n\ + .word +0x2000000\n\ +._772:\n\ + mov r0, #0x0\n\ + bl sub_80EEFBC\n\ + ldr r1, ._786\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._793\n\ +._787:\n\ + .align 2, 0\n\ +._786:\n\ + .word +0x2000000\n\ +._773:\n\ + mov r0, #0x0\n\ + bl sub_80F0264\n\ + ldr r1, ._790\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._774:\n\ + bl sub_80F02A0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._803 @cond_branch\n\ + ldr r1, ._790\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._793\n\ +._791:\n\ + .align 2, 0\n\ +._790:\n\ + .word +0x2000000\n\ +._775:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._803 @cond_branch\n\ + ldr r1, ._794\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._793\n\ +._795:\n\ + .align 2, 0\n\ +._794:\n\ + .word +0x2000000\n\ +._776:\n\ + mov r0, #0x0\n\ + bl sub_80F3008\n\ + ldr r4, ._797\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._797 + 4\n\ + bl SetVBlankCallback\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ +._793:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._803\n\ +._798:\n\ + .align 2, 0\n\ +._797:\n\ + .word +0x2000000\n\ + .word sub_80EBD18+1\n\ +._777:\n\ + mov r0, #0x4\n\ + bl sub_80EED2C\n\ + ldr r1, ._801\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + ldr r0, ._801 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._803 @cond_branch\n\ + ldr r0, ._801 + 8\n\ + ldr r2, ._801 + 12\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ + b ._803\n\ +._802:\n\ + .align 2, 0\n\ +._801:\n\ + .word +0x2000000\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800\n\ +._778:\n\ + ldr r0, ._804\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._803 @cond_branch\n\ + ldr r0, ._804 + 4\n\ + bl sub_80EBDBC\n\ +._803:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._805:\n\ + .align 2, 0\n\ +._804:\n\ + .word gPaletteFade\n\ + .word sub_80ED31C+1"); +} +#else void sub_80ED3D0() { switch (ewram0_10.var304) @@ -1432,7 +3863,207 @@ void sub_80ED3D0() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80ED4D8() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._808\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x8\n\ + bls ._806 @cond_branch\n\ + b ._844\n\ +._806:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._808 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._809:\n\ + .align 2, 0\n\ +._808:\n\ + .word +0x2000000\n\ + .word ._810\n\ +._810:\n\ + .word ._811\n\ + .word ._812\n\ + .word ._813\n\ + .word ._814\n\ + .word ._815\n\ + .word ._816\n\ + .word ._817\n\ + .word ._818\n\ + .word ._819\n\ +._811:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + b ._820\n\ +._812:\n\ + ldr r0, ._824\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._821 @cond_branch\n\ + b ._844\n\ +._821:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + bl sub_80F3130\n\ + ldr r1, ._824 + 4\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._834\n\ +._825:\n\ + .align 2, 0\n\ +._824:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ +._813:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._844 @cond_branch\n\ + ldr r1, ._828\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._834\n\ +._829:\n\ + .align 2, 0\n\ +._828:\n\ + .word +0x2000000\n\ +._814:\n\ + bl sub_80F4CF0\n\ + ldr r1, ._831\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._834\n\ +._832:\n\ + .align 2, 0\n\ +._831:\n\ + .word +0x2000000\n\ +._815:\n\ + bl sub_80EFF34\n\ + ldr r1, ._835\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._816:\n\ + bl sub_80EFF68\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._844 @cond_branch\n\ + ldr r1, ._835\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._834\n\ +._836:\n\ + .align 2, 0\n\ +._835:\n\ + .word +0x2000000\n\ +._817:\n\ + bl sub_80F35B4\n\ + mov r0, #0x2\n\ + bl sub_80EEFBC\n\ + ldr r4, ._838\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._838 + 4\n\ + bl SetVBlankCallback\n\ +._820:\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ +._834:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._844\n\ +._839:\n\ + .align 2, 0\n\ +._838:\n\ + .word +0x2000000\n\ + .word sub_80EBD4C+1\n\ +._818:\n\ + mov r0, #0x2\n\ + bl sub_80EED2C\n\ + ldr r1, ._842\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + ldr r0, ._842 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._844 @cond_branch\n\ + ldr r0, ._842 + 8\n\ + ldr r2, ._842 + 12\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ + b ._844\n\ +._843:\n\ + .align 2, 0\n\ +._842:\n\ + .word +0x2000000\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f000\n\ +._819:\n\ + ldr r0, ._845\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._844 @cond_branch\n\ + ldr r0, ._845 + 4\n\ + bl sub_80EBDBC\n\ +._844:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._846:\n\ + .align 2, 0\n\ +._845:\n\ + .word gPaletteFade\n\ + .word sub_80ED858+1"); +} +#else void sub_80ED4D8() { switch (ewram0_10.var304) @@ -1483,7 +4114,310 @@ void sub_80ED4D8() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80ED620() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._849\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x10\n\ + bls ._847 @cond_branch\n\ + b ._912\n\ +._847:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._849 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._850:\n\ + .align 2, 0\n\ +._849:\n\ + .word +0x2000000\n\ + .word ._851\n\ +._851:\n\ + .word ._852\n\ + .word ._853\n\ + .word ._854\n\ + .word ._855\n\ + .word ._856\n\ + .word ._857\n\ + .word ._858\n\ + .word ._859\n\ + .word ._860\n\ + .word ._861\n\ + .word ._862\n\ + .word ._863\n\ + .word ._864\n\ + .word ._865\n\ + .word ._866\n\ + .word ._867\n\ + .word ._868\n\ +._852:\n\ + bl sub_80F1E84\n\ + mov r0, #0x1\n\ + bl sub_80F2D04\n\ + ldr r1, ._870\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._904\n\ +._871:\n\ + .align 2, 0\n\ +._870:\n\ + .word +0x2000000\n\ +._853:\n\ + bl sub_80F1F10\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._872 @cond_branch\n\ + b ._912\n\ +._872:\n\ + mov r0, #0x1\n\ + bl sub_80EEFBC\n\ + b ._885\n\ +._854:\n\ + bl sub_80EEF34\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + beq ._875 @cond_branch\n\ + b ._912\n\ +._875:\n\ + ldr r4, ._878\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + str r2, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._904\n\ +._879:\n\ + .align 2, 0\n\ +._878:\n\ + .word +0x2000000\n\ +._855:\n\ + ldr r0, ._883\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + cmp r4, #0\n\ + beq ._880 @cond_branch\n\ + b ._912\n\ +._880:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + bl sub_80EF814\n\ + ldr r0, ._883 + 4\n\ + ldr r2, ._883 + 8\n\ + add r1, r0, r2\n\ + strb r4, [r1]\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + ldrh r1, [r0]\n\ + add r1, r1, #0x1\n\ + strh r1, [r0]\n\ + b ._912\n\ +._884:\n\ + .align 2, 0\n\ +._883:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ + .word 0x76aa\n\ +._856:\n\ + bl sub_80F2620\n\ + b ._885\n\ +._857:\n\ + ldr r0, ._887\n\ + add r1, r4, r0\n\ + mov r0, #0x2\n\ + strb r0, [r1]\n\ + bl sub_80F4BD0\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._904\n\ +._888:\n\ + .align 2, 0\n\ +._887:\n\ + .word 0xd162\n\ +._858:\n\ + bl sub_80EFF34\n\ + ldr r1, ._890\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._859:\n\ + bl sub_80EFF68\n\ + b ._889\n\ +._891:\n\ + .align 2, 0\n\ +._890:\n\ + .word +0x2000000\n\ +._860:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._912 @cond_branch\n\ + ldr r1, ._894\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._904\n\ +._895:\n\ + .align 2, 0\n\ +._894:\n\ + .word +0x2000000\n\ +._861:\n\ + bl sub_8055870\n\ + b ._896\n\ +._862:\n\ + bl sub_80F33A8\n\ + ldr r4, ._898\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._898 + 4\n\ + bl SetVBlankCallback\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._904\n\ +._899:\n\ + .align 2, 0\n\ +._898:\n\ + .word +0x2000000\n\ + .word sub_80EBD4C+1\n\ +._863:\n\ + mov r0, #0x2\n\ + bl sub_80EED2C\n\ + ldr r1, ._901\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._904\n\ +._902:\n\ + .align 2, 0\n\ +._901:\n\ + .word +0x2000000\n\ +._864:\n\ + ldr r0, ._905\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._912 @cond_branch\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ + b ._904\n\ +._906:\n\ + .align 2, 0\n\ +._905:\n\ + .word gPaletteFade\n\ +._865:\n\ + mov r0, #0x1\n\ + bl sub_80F2C80\n\ + ldr r1, ._909\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._866:\n\ + mov r0, #0x1\n\ + bl sub_80F2CBC\n\ +._889:\n\ + lsl r0, r0, #0x18\n\ +._896:\n\ + cmp r0, #0\n\ + bne ._912 @cond_branch\n\ +._885:\n\ + ldr r1, ._909\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ +._904:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._912\n\ +._910:\n\ + .align 2, 0\n\ +._909:\n\ + .word +0x2000000\n\ +._867:\n\ + mov r0, #0x6\n\ + bl sub_80F2C80\n\ + ldr r1, ._913\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._868:\n\ + mov r0, #0x6\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._912 @cond_branch\n\ + ldr r0, ._913 + 4\n\ + bl sub_80EBDBC\n\ + ldr r0, ._913 + 8\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._912 @cond_branch\n\ + ldr r0, ._913 + 12\n\ + ldr r2, ._913 + 16\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ +._912:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._914:\n\ + .align 2, 0\n\ +._913:\n\ + .word +0x2000000\n\ + .word sub_80ED858+1\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f000"); +} +#else void sub_80ED620() { switch (ewram0_10.var304) @@ -1573,6 +4507,7 @@ void sub_80ED620() break; } } +#endif #if 0 void sub_80F4F78(); @@ -1742,8 +4677,433 @@ label2: } #else +#if DEBUG __attribute__((naked)) -void sub_80ED858() { +void sub_80ED858() +{ + asm("\ + push {r4, r5, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._917\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r5, r1, #0\n\ + cmp r0, #0xb\n\ + bls ._915 @cond_branch\n\ + b ._999\n\ +._915:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._917 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._918:\n\ + .align 2, 0\n\ +._917:\n\ + .word +0x2000000\n\ + .word ._919\n\ +._919:\n\ + .word ._920\n\ + .word ._921\n\ + .word ._922\n\ + .word ._923\n\ + .word ._924\n\ + .word ._925\n\ + .word ._926\n\ + .word ._927\n\ + .word ._928\n\ + .word ._929\n\ + .word ._999\n\ + .word ._931\n\ +._920:\n\ + bl sub_80F4F78\n\ + bl sub_80F5B38\n\ + ldr r0, ._933\n\ + mov r4, #0xc1\n\ + lsl r4, r4, #0x2\n\ + add r0, r0, r4\n\ + mov r1, #0x1\n\ + strh r1, [r0]\n\ + b ._999\n\ +._934:\n\ + .align 2, 0\n\ +._933:\n\ + .word +0x2000000\n\ +._921:\n\ + bl sub_80F5B50\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._935 @cond_branch\n\ + b ._999\n\ +._935:\n\ + ldr r0, ._938\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + mov r1, #0x2\n\ + strh r1, [r0]\n\ + b ._999\n\ +._939:\n\ + .align 2, 0\n\ +._938:\n\ + .word +0x2000000\n\ +._922:\n\ + mov r0, #0x1\n\ + bl sub_80F0174\n\ + ldr r0, ._941\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r0, r2\n\ + mov r1, #0x3\n\ + strh r1, [r0]\n\ + b ._999\n\ +._942:\n\ + .align 2, 0\n\ +._941:\n\ + .word +0x2000000\n\ +._923:\n\ + bl sub_80F4FB4\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._943 @cond_branch\n\ + b ._999\n\ +._943:\n\ + bl sub_80F3C94\n\ + bl sub_80F3D00\n\ + b ._945\n\ +._924:\n\ + ldr r2, ._951\n\ + ldrh r1, [r2, #0x2c]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + add r3, r2, #0\n\ + cmp r0, #0\n\ + beq ._949 @cond_branch\n\ + ldr r1, ._951 + 4\n\ + add r0, r5, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._949 @cond_branch\n\ + ldr r2, ._951 + 8\n\ + add r0, r5, r2\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._948 @cond_branch\n\ + ldr r4, ._951 + 12\n\ + add r0, r5, r4\n\ + mov r1, #0x0\n\ + ldsh r0, [r0, r1]\n\ + cmp r0, #0\n\ + beq ._949 @cond_branch\n\ +._948:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r0, #0x1\n\ + bl sub_80F5060\n\ + bl move_anim_execute\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r5, r2\n\ + b ._950\n\ +._952:\n\ + .align 2, 0\n\ +._951:\n\ + .word gMain\n\ + .word 0x87cb\n\ + .word 0x76aa\n\ + .word 0x87dc\n\ +._949:\n\ + ldrh r1, [r3, #0x2c]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._956 @cond_branch\n\ + ldr r4, ._958\n\ + add r0, r5, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._956 @cond_branch\n\ + ldr r1, ._958 + 4\n\ + add r0, r5, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._955 @cond_branch\n\ + ldr r2, ._958 + 8\n\ + add r0, r5, r2\n\ + sub r4, r4, #0x57\n\ + add r1, r5, r4\n\ + mov r4, #0x0\n\ + ldsh r2, [r0, r4]\n\ + mov r4, #0x0\n\ + ldsh r0, [r1, r4]\n\ + cmp r2, r0\n\ + bge ._956 @cond_branch\n\ +._955:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r0, #0x0\n\ + bl sub_80F5060\n\ + bl move_anim_execute\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r5, r0\n\ +._950:\n\ + mov r0, #0x5\n\ + strh r0, [r1]\n\ + b ._999\n\ +._959:\n\ + .align 2, 0\n\ +._958:\n\ + .word 0x87cb\n\ + .word 0x76aa\n\ + .word 0x87dc\n\ +._956:\n\ + ldrh r2, [r3, #0x2e]\n\ + mov r0, #0x2\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + beq ._960 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + bl sub_80F4FDC\n\ + bl move_anim_execute\n\ + ldr r0, ._962\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + mov r1, #0x9\n\ + strh r1, [r0]\n\ + b ._999\n\ +._963:\n\ + .align 2, 0\n\ +._962:\n\ + .word +0x2000000\n\ +._960:\n\ + mov r0, #0x1\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + bne ._964 @cond_branch\n\ + b ._999\n\ +._964:\n\ + add r4, r5, #0\n\ + ldr r2, ._970\n\ + add r0, r4, r2\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._966 @cond_branch\n\ + ldr r1, ._970 + 4\n\ + add r0, r4, r1\n\ + mov r2, #0x0\n\ + ldsh r1, [r0, r2]\n\ + ldr r2, ._970 + 8\n\ + add r0, r4, r2\n\ + mov r2, #0x0\n\ + ldsh r0, [r0, r2]\n\ + sub r0, r0, #0x1\n\ + cmp r1, r0\n\ + beq ._967 @cond_branch\n\ + b ._999\n\ +._967:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ + mov r0, #0x9\n\ + strh r0, [r1]\n\ + b ._999\n\ +._971:\n\ + .align 2, 0\n\ +._970:\n\ + .word 0x76aa\n\ + .word 0x87dc\n\ + .word 0x87da\n\ +._966:\n\ + ldr r1, ._975\n\ + add r0, r5, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._972 @cond_branch\n\ + b ._999\n\ +._972:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r5, r2\n\ + mov r0, #0x7\n\ + strh r0, [r1]\n\ + b ._999\n\ +._976:\n\ + .align 2, 0\n\ +._975:\n\ + .word 0x6dac\n\ +._925:\n\ + bl gpu_sync_bg_show\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._977 @cond_branch\n\ + b ._999\n\ +._977:\n\ + bl sub_80F3D00\n\ + ldr r0, ._980\n\ + mov r4, #0xc1\n\ + lsl r4, r4, #0x2\n\ + add r0, r0, r4\n\ + mov r1, #0x6\n\ + strh r1, [r0]\n\ + b ._999\n\ +._981:\n\ + .align 2, 0\n\ +._980:\n\ + .word +0x2000000\n\ +._926:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._999 @cond_branch\n\ + ldr r0, ._984\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + b ._983\n\ +._985:\n\ + .align 2, 0\n\ +._984:\n\ + .word +0x2000000\n\ +._927:\n\ + mov r0, #0x3\n\ + bl sub_80EEFBC\n\ + bl sub_80F3668\n\ + ldr r0, ._987\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r0, r2\n\ + mov r1, #0x8\n\ + strh r1, [r0]\n\ + b ._999\n\ +._988:\n\ + .align 2, 0\n\ +._987:\n\ + .word +0x2000000\n\ +._928:\n\ + bl sub_80F7500\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._999 @cond_branch\n\ + mov r0, #0x2\n\ + bl sub_80EEFBC\n\ + bl sub_80F3698\n\ +._945:\n\ + ldr r0, ._991\n\ + mov r4, #0xc1\n\ + lsl r4, r4, #0x2\n\ + add r0, r0, r4\n\ +._983:\n\ + mov r1, #0x4\n\ + strh r1, [r0]\n\ + b ._999\n\ +._992:\n\ + .align 2, 0\n\ +._991:\n\ + .word +0x2000000\n\ +._929:\n\ + bl sub_80F5038\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + cmp r4, #0\n\ + bne ._999 @cond_branch\n\ + mov r0, #0x0\n\ + bl sub_80F0174\n\ + bl sub_80F2F48\n\ + ldr r5, ._995\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r5, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + str r4, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r5, r2\n\ + mov r0, #0xb\n\ + strh r0, [r1]\n\ + b ._999\n\ +._996:\n\ + .align 2, 0\n\ +._995:\n\ + .word +0x2000000\n\ +._931:\n\ + ldr r0, ._1000\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._999 @cond_branch\n\ + bl sub_80F3CE8\n\ + bl sub_80F5BDC\n\ + ldr r0, ._1000 + 4\n\ + ldr r4, ._1000 + 8\n\ + add r0, r0, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + bne ._998 @cond_branch\n\ + bl sub_80F357C\n\ + mov r0, #0x1\n\ + bl sub_80F2D6C\n\ + mov r0, #0x6\n\ + bl sub_80F2D6C\n\ + ldr r0, ._1000 + 12\n\ + bl sub_80EBDBC\n\ + b ._999\n\ +._1001:\n\ + .align 2, 0\n\ +._1000:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ + .word 0x76aa\n\ + .word sub_80ECA10+1\n\ +._998:\n\ + bl sub_80F3614\n\ + ldr r0, ._1003\n\ + bl sub_80EBDBC\n\ +._999:\n\ + ldr r0, ._1003 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1002 @cond_branch\n\ + ldr r0, ._1003 + 8\n\ + ldr r1, ._1003 + 12\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x9\n\ + mov r2, #0x6\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._1002:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0\n\ +._1004:\n\ + .align 2, 0\n\ +._1003:\n\ + .word sub_80ED3D0+1\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else +__attribute__((naked)) +void sub_80ED858() +{ asm_unified("push {r4,r5,lr}\n\ sub sp, 0x4\n\ ldr r1, _080ED878 @ =gSharedMem\n\ @@ -2114,7 +5474,361 @@ _080EDB7A:\n\ _080EDB84: .4byte sub_80ED3D0\n"); } #endif +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EDB88() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._1007\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x11\n\ + bls ._1005 @cond_branch\n\ + b ._1088\n\ +._1005:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._1007 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._1008:\n\ + .align 2, 0\n\ +._1007:\n\ + .word +0x2000000\n\ + .word ._1009\n\ +._1009:\n\ + .word ._1010\n\ + .word ._1011\n\ + .word ._1012\n\ + .word ._1013\n\ + .word ._1014\n\ + .word ._1015\n\ + .word ._1016\n\ + .word ._1017\n\ + .word ._1018\n\ + .word ._1019\n\ + .word ._1020\n\ + .word ._1021\n\ + .word ._1022\n\ + .word ._1023\n\ + .word ._1024\n\ + .word ._1025\n\ + .word ._1026\n\ + .word ._1027\n\ +._1010:\n\ + bl sub_80F1E84\n\ + mov r0, #0x0\n\ + bl sub_80F2D04\n\ + ldr r1, ._1029\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1078\n\ +._1030:\n\ + .align 2, 0\n\ +._1029:\n\ + .word +0x2000000\n\ +._1011:\n\ + bl sub_80F1F10\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1031 @cond_branch\n\ + b ._1088\n\ +._1031:\n\ + mov r0, #0x4\n\ + bl sub_80EEFBC\n\ + ldr r1, ._1034\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._1078\n\ +._1035:\n\ + .align 2, 0\n\ +._1034:\n\ + .word +0x2000000\n\ +._1012:\n\ + bl sub_80EEF34\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + beq ._1036 @cond_branch\n\ + b ._1088\n\ +._1036:\n\ + ldr r4, ._1039\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + str r2, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + b ._1038\n\ +._1040:\n\ + .align 2, 0\n\ +._1039:\n\ + .word +0x2000000\n\ +._1013:\n\ + ldr r0, ._1044\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1041 @cond_branch\n\ + b ._1088\n\ +._1041:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + bl sub_80EF814\n\ + ldr r1, ._1044 + 4\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1078\n\ +._1045:\n\ + .align 2, 0\n\ +._1044:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ +._1014:\n\ + bl sub_80F2620\n\ + ldr r1, ._1047\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._1078\n\ +._1048:\n\ + .align 2, 0\n\ +._1047:\n\ + .word +0x2000000\n\ +._1015:\n\ + bl sub_80F638C\n\ + ldr r1, ._1051\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._1016:\n\ + bl sub_80F63D0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1049 @cond_branch\n\ + ldr r1, ._1051\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x2\n\ + strh r0, [r1]\n\ + b ._1088\n\ +._1052:\n\ + .align 2, 0\n\ +._1051:\n\ + .word +0x2000000\n\ +._1049:\n\ + ldr r1, ._1054\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1078\n\ +._1055:\n\ + .align 2, 0\n\ +._1054:\n\ + .word +0x2000000\n\ +._1017:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + beq ._1056 @cond_branch\n\ + b ._1088\n\ +._1056:\n\ + ldr r1, ._1059\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + sub r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._1088\n\ +._1060:\n\ + .align 2, 0\n\ +._1059:\n\ + .word +0x2000000\n\ +._1018:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + beq ._1061 @cond_branch\n\ + b ._1088\n\ +._1061:\n\ + ldr r1, ._1064\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1078\n\ +._1065:\n\ + .align 2, 0\n\ +._1064:\n\ + .word +0x2000000\n\ +._1019:\n\ + mov r0, #0x1\n\ + bl sub_80F0264\n\ + ldr r1, ._1068\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._1020:\n\ + bl sub_80F02A0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1088 @cond_branch\n\ + ldr r1, ._1068\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1078\n\ +._1069:\n\ + .align 2, 0\n\ +._1068:\n\ + .word +0x2000000\n\ +._1021:\n\ + mov r0, #0x2\n\ + bl sub_80F2C80\n\ + ldr r1, ._1072\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._1022:\n\ + mov r0, #0x2\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1088 @cond_branch\n\ + ldr r1, ._1072\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1078\n\ +._1073:\n\ + .align 2, 0\n\ +._1072:\n\ + .word +0x2000000\n\ +._1023:\n\ + mov r0, #0x1\n\ + bl sub_80F3008\n\ + ldr r1, ._1075\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._1078\n\ +._1076:\n\ + .align 2, 0\n\ +._1075:\n\ + .word +0x2000000\n\ +._1024:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._1088 @cond_branch\n\ + ldr r1, ._1079\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1078\n\ +._1080:\n\ + .align 2, 0\n\ +._1079:\n\ + .word +0x2000000\n\ +._1025:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._1082\n\ + bl SetVBlankCallback\n\ +._1038:\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ +._1078:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._1088\n\ +._1083:\n\ + .align 2, 0\n\ +._1082:\n\ + .word sub_80EBD18+1\n\ +._1026:\n\ + mov r0, #0x4\n\ + bl sub_80EED2C\n\ + ldr r1, ._1086\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + ldr r0, ._1086 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1088 @cond_branch\n\ + ldr r0, ._1086 + 8\n\ + ldr r2, ._1086 + 12\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ + b ._1088\n\ +._1087:\n\ + .align 2, 0\n\ +._1086:\n\ + .word +0x2000000\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800\n\ +._1027:\n\ + ldr r0, ._1089\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1088 @cond_branch\n\ + ldr r0, ._1089 + 4\n\ + bl sub_80EBDBC\n\ +._1088:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._1090:\n\ + .align 2, 0\n\ +._1089:\n\ + .word gPaletteFade\n\ + .word sub_80EDDBC+1"); +} +#else void sub_80EDB88() { switch (ewram0_10.var304) @@ -2205,7 +5919,129 @@ void sub_80EDB88() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EDDBC() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._1095\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r4, r0, r1\n\ + ldrh r0, [r4]\n\ + cmp r0, #0x1\n\ + beq ._1091 @cond_branch\n\ + cmp r0, #0x1\n\ + bgt ._1092 @cond_branch\n\ + cmp r0, #0\n\ + beq ._1093 @cond_branch\n\ + b ._1113\n\ +._1096:\n\ + .align 2, 0\n\ +._1095:\n\ + .word +0x2000000\n\ +._1092:\n\ + cmp r0, #0x2\n\ + beq ._1097 @cond_branch\n\ + b ._1113\n\ +._1093:\n\ + bl sub_80F5DD4\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + beq ._1099 @cond_branch\n\ + cmp r0, #0x2\n\ + beq ._1100 @cond_branch\n\ + ldr r0, ._1103\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1101 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._1103 + 4\n\ + bl sub_80EBDBC\n\ + b ._1114\n\ +._1104:\n\ + .align 2, 0\n\ +._1103:\n\ + .word gMain\n\ + .word sub_80EDEE4+1\n\ +._1099:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + bl ShowMapNamePopUpWindow\n\ + b ._1114\n\ +._1100:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ + b ._1114\n\ +._1101:\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1113 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._1109\n\ + bl sub_80EBDBC\n\ + b ._1114\n\ +._1110:\n\ + .align 2, 0\n\ +._1109:\n\ + .word sub_80EDE70+1\n\ +._1091:\n\ + bl sub_80F0718\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1113 @cond_branch\n\ + bl ShowMapNamePopUpWindow\n\ + bl sub_80F3264\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + b ._1112\n\ +._1097:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._1113 @cond_branch\n\ +._1112:\n\ + strh r0, [r4]\n\ +._1113:\n\ + ldr r0, ._1115\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1114 @cond_branch\n\ + ldr r0, ._1115 + 4\n\ + ldr r1, ._1115 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x1\n\ + mov r2, #0x8\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._1114:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._1116:\n\ + .align 2, 0\n\ +._1115:\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else void sub_80EDDBC() { switch (ewram0_10.var304) @@ -2250,6 +6086,7 @@ void sub_80EDDBC() } } +#endif void sub_80EDE70() { @@ -2274,6 +6111,228 @@ void sub_80EDE70() } +#if DEBUG +__attribute__((naked)) +void sub_80EDEE4() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._1134\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0xa\n\ + bls ._1132 @cond_branch\n\ + b ._1180\n\ +._1132:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._1134 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._1135:\n\ + .align 2, 0\n\ +._1134:\n\ + .word +0x2000000\n\ + .word ._1136\n\ +._1136:\n\ + .word ._1137\n\ + .word ._1138\n\ + .word ._1139\n\ + .word ._1140\n\ + .word ._1141\n\ + .word ._1142\n\ + .word ._1143\n\ + .word ._1144\n\ + .word ._1145\n\ + .word ._1146\n\ + .word ._1147\n\ +._1137:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + b ._1169\n\ +._1138:\n\ + ldr r0, ._1152\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1149 @cond_branch\n\ + b ._1180\n\ +._1149:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + bl sub_80F3130\n\ + ldr r1, ._1152 + 4\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1166\n\ +._1153:\n\ + .align 2, 0\n\ +._1152:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ +._1139:\n\ + bl sub_80F66E0\n\ + bl sub_80EEE08\n\ + ldr r1, ._1155\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._1166\n\ +._1156:\n\ + .align 2, 0\n\ +._1155:\n\ + .word +0x2000000\n\ +._1140:\n\ + bl sub_80F1080\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1180 @cond_branch\n\ + ldr r1, ._1159\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1166\n\ +._1160:\n\ + .align 2, 0\n\ +._1159:\n\ + .word +0x2000000\n\ +._1141:\n\ + mov r0, #0x5\n\ + bl sub_80EEFBC\n\ + bl sub_80F38B8\n\ + ldr r1, ._1163\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._1142:\n\ + bl sub_80F38EC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1180 @cond_branch\n\ + ldr r1, ._1163\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1166\n\ +._1164:\n\ + .align 2, 0\n\ +._1163:\n\ + .word +0x2000000\n\ +._1143:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._1180 @cond_branch\n\ + ldr r1, ._1167\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._1166\n\ +._1168:\n\ + .align 2, 0\n\ +._1167:\n\ + .word +0x2000000\n\ +._1144:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._1170\n\ + bl SetVBlankCallback\n\ + b ._1169\n\ +._1171:\n\ + .align 2, 0\n\ +._1170:\n\ + .word sub_80EBD18+1\n\ +._1145:\n\ + mov r0, #0x3\n\ + bl sub_80EED2C\n\ + ldr r1, ._1174\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + ldr r0, ._1174 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1180 @cond_branch\n\ + ldr r0, ._1174 + 8\n\ + ldr r2, ._1174 + 12\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ + b ._1180\n\ +._1175:\n\ + .align 2, 0\n\ +._1174:\n\ + .word +0x2000000\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f000\n\ +._1146:\n\ + ldr r0, ._1178\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1180 @cond_branch\n\ +._1169:\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ +._1166:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._1180\n\ +._1179:\n\ + .align 2, 0\n\ +._1178:\n\ + .word gPaletteFade\n\ +._1147:\n\ + bl sub_80F170C\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1180 @cond_branch\n\ + ldr r0, ._1181\n\ + bl sub_80EBDBC\n\ +._1180:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._1182:\n\ + .align 2, 0\n\ +._1181:\n\ + .word sub_80EE06C+1"); +} +#else void sub_80EDEE4() { switch (ewram0_10.var304) @@ -2331,7 +6390,316 @@ void sub_80EDEE4() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EE06C() +{ + asm("\ + push {r4, r5, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._1185\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x8\n\ + bls ._1183 @cond_branch\n\ + b ._1248\n\ +._1183:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._1185 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._1186:\n\ + .align 2, 0\n\ +._1185:\n\ + .word +0x2000000\n\ + .word ._1187\n\ +._1187:\n\ + .word ._1188\n\ + .word ._1189\n\ + .word ._1190\n\ + .word ._1191\n\ + .word ._1192\n\ + .word ._1193\n\ + .word ._1194\n\ + .word ._1195\n\ + .word ._1196\n\ +._1188:\n\ + bl sub_80F15A8\n\ + ldr r1, ._1198\n\ + mov r5, #0xc1\n\ + lsl r5, r5, #0x2\n\ + add r1, r1, r5\n\ + b ._1221\n\ +._1199:\n\ + .align 2, 0\n\ +._1198:\n\ + .word +0x2000000\n\ +._1189:\n\ + ldr r2, ._1203\n\ + ldrh r1, [r2, #0x30]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + add r3, r2, #0\n\ + cmp r0, #0\n\ + beq ._1201 @cond_branch\n\ + ldr r1, ._1203 + 4\n\ + add r0, r4, r1\n\ + mov r2, #0x0\n\ + ldsh r0, [r0, r2]\n\ + cmp r0, #0\n\ + beq ._1201 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + bl sub_80F6A4C\n\ + mov r5, #0xc1\n\ + lsl r5, r5, #0x2\n\ + add r1, r4, r5\n\ + b ._1221\n\ +._1204:\n\ + .align 2, 0\n\ +._1203:\n\ + .word gMain\n\ + .word 0x87dc\n\ +._1201:\n\ + ldrh r1, [r3, #0x30]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1206 @cond_branch\n\ + ldr r1, ._1208\n\ + add r0, r4, r1\n\ + ldr r2, ._1208 + 4\n\ + add r1, r4, r2\n\ + mov r5, #0x0\n\ + ldsh r2, [r0, r5]\n\ + mov r5, #0x0\n\ + ldsh r0, [r1, r5]\n\ + cmp r2, r0\n\ + bge ._1206 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r0, #0x1\n\ + bl sub_80F6A4C\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ + b ._1221\n\ +._1209:\n\ + .align 2, 0\n\ +._1208:\n\ + .word 0x87dc\n\ + .word 0x8774\n\ +._1206:\n\ + ldrh r2, [r3, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + beq ._1210 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + mov r0, #0xb\n\ + bl sub_80EEFBC\n\ + ldr r0, ._1212\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + b ._1211\n\ +._1213:\n\ + .align 2, 0\n\ +._1212:\n\ + .word +0x2000000\n\ +._1210:\n\ + mov r0, #0x2\n\ + and r0, r0, r2\n\ + cmp r0, #0\n\ + bne ._1214 @cond_branch\n\ + b ._1248\n\ +._1214:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._1217\n\ + bl sub_80EBDBC\n\ + b ._1248\n\ +._1218:\n\ + .align 2, 0\n\ +._1217:\n\ + .word sub_80EE294+1\n\ +._1190:\n\ + bl sub_80F6AF0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1219 @cond_branch\n\ + b ._1248\n\ +._1219:\n\ + ldr r1, ._1222\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._1221\n\ +._1223:\n\ + .align 2, 0\n\ +._1222:\n\ + .word +0x2000000\n\ +._1191:\n\ + bl sub_8055870\n\ + add r1, r0, #0\n\ + cmp r1, #0\n\ + bne ._1248 @cond_branch\n\ + ldr r0, ._1226\n\ + mov r5, #0xc1\n\ + lsl r5, r5, #0x2\n\ + add r0, r0, r5\n\ + strh r1, [r0]\n\ + b ._1248\n\ +._1227:\n\ + .align 2, 0\n\ +._1226:\n\ + .word +0x2000000\n\ +._1192:\n\ + bl sub_80F3B00\n\ + ldr r1, ._1229\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ +._1221:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._1248\n\ +._1230:\n\ + .align 2, 0\n\ +._1229:\n\ + .word +0x2000000\n\ +._1193:\n\ + bl sub_80F3B58\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1248 @cond_branch\n\ + bl sub_80F1494\n\ + ldr r1, ._1233\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + bl sub_80EED9C\n\ + b ._1248\n\ +._1234:\n\ + .align 2, 0\n\ +._1233:\n\ + .word +0x2000000\n\ +._1194:\n\ + bl sub_80F68E8\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1236 @cond_branch\n\ + cmp r0, #0x1\n\ + bne ._1236 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + bl sub_80F3B94\n\ + ldr r0, ._1238\n\ + mov r5, #0xc1\n\ + lsl r5, r5, #0x2\n\ + add r0, r0, r5\n\ + mov r1, #0x7\n\ + strh r1, [r0]\n\ + b ._1249\n\ +._1239:\n\ + .align 2, 0\n\ +._1238:\n\ + .word +0x2000000\n\ +._1236:\n\ + ldr r0, ._1242\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1248 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + bl sub_80F3B94\n\ + ldr r0, ._1242 + 4\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + mov r1, #0x8\n\ + strh r1, [r0]\n\ + b ._1248\n\ +._1243:\n\ + .align 2, 0\n\ +._1242:\n\ + .word gMain\n\ + .word +0x2000000\n\ +._1195:\n\ + bl sub_80F3BD4\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1248 @cond_branch\n\ + ldr r0, ._1246\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r0, r2\n\ +._1211:\n\ + mov r1, #0x4\n\ + strh r1, [r0]\n\ + b ._1248\n\ +._1247:\n\ + .align 2, 0\n\ +._1246:\n\ + .word +0x2000000\n\ +._1196:\n\ + bl sub_80F3BD4\n\ + lsl r0, r0, #0x18\n\ + lsr r4, r0, #0x18\n\ + cmp r4, #0\n\ + bne ._1248 @cond_branch\n\ + mov r0, #0x5\n\ + bl sub_80EEFBC\n\ + ldr r0, ._1250\n\ + mov r5, #0xc1\n\ + lsl r5, r5, #0x2\n\ + add r0, r0, r5\n\ + strh r4, [r0]\n\ +._1248:\n\ + ldr r0, ._1250 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1249 @cond_branch\n\ + ldr r0, ._1250 + 8\n\ + ldr r1, ._1250 + 12\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x1\n\ + mov r2, #0x4\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._1249:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0\n\ +._1251:\n\ + .align 2, 0\n\ +._1250:\n\ + .word +0x2000000\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else void sub_80EE06C() { switch (ewram0_10.var304) @@ -2417,7 +6785,204 @@ void sub_80EE06C() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EE294() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._1254\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r0, r1, r2\n\ + ldrh r0, [r0]\n\ + add r4, r1, #0\n\ + cmp r0, #0x8\n\ + bls ._1252 @cond_branch\n\ + b ._1288\n\ +._1252:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._1254 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._1255:\n\ + .align 2, 0\n\ +._1254:\n\ + .word +0x2000000\n\ + .word ._1256\n\ +._1256:\n\ + .word ._1257\n\ + .word ._1258\n\ + .word ._1259\n\ + .word ._1260\n\ + .word ._1261\n\ + .word ._1262\n\ + .word ._1263\n\ + .word ._1264\n\ + .word ._1265\n\ +._1257:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r3, #0x10\n\ + b ._1266\n\ +._1258:\n\ + ldr r0, ._1270\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1267 @cond_branch\n\ + b ._1288\n\ +._1267:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + bl sub_80F3C2C\n\ + bl sub_80EEE08\n\ + ldr r1, ._1270 + 4\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1280\n\ +._1271:\n\ + .align 2, 0\n\ +._1270:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ +._1259:\n\ + bl sub_80F6134\n\ + mov r0, #0x1\n\ + bl sub_80F0264\n\ + ldr r1, ._1274\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._1260:\n\ + bl sub_80F02A0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1288 @cond_branch\n\ + ldr r1, ._1274\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1280\n\ +._1275:\n\ + .align 2, 0\n\ +._1274:\n\ + .word +0x2000000\n\ +._1261:\n\ + mov r0, #0x4\n\ + bl sub_80EEFBC\n\ + mov r0, #0x1\n\ + bl sub_80F3008\n\ + ldr r0, ._1277\n\ + bl SetVBlankCallback\n\ + ldr r1, ._1277 + 4\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r1, r2\n\ + b ._1280\n\ +._1278:\n\ + .align 2, 0\n\ +._1277:\n\ + .word sub_80EBD18+1\n\ + .word +0x2000000\n\ +._1262:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._1288 @cond_branch\n\ + ldr r1, ._1281\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1280\n\ +._1282:\n\ + .align 2, 0\n\ +._1281:\n\ + .word +0x2000000\n\ +._1263:\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ +._1266:\n\ + bl BeginNormalPaletteFade\n\ + mov r2, #0xc1\n\ + lsl r2, r2, #0x2\n\ + add r1, r4, r2\n\ +._1280:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._1288\n\ +._1264:\n\ + mov r0, #0x4\n\ + bl sub_80EED2C\n\ + ldr r1, ._1286\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + ldr r0, ._1286 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1288 @cond_branch\n\ + ldr r0, ._1286 + 8\n\ + ldr r2, ._1286 + 12\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ + b ._1288\n\ +._1287:\n\ + .align 2, 0\n\ +._1286:\n\ + .word +0x2000000\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800\n\ +._1265:\n\ + ldr r0, ._1289\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1288 @cond_branch\n\ + ldr r0, ._1289 + 4\n\ + bl sub_80EBDBC\n\ +._1288:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._1290:\n\ + .align 2, 0\n\ +._1289:\n\ + .word gPaletteFade\n\ + .word sub_80EDDBC+1"); +} +#else void sub_80EE294() { switch (ewram0_10.var304) @@ -2468,7 +7033,293 @@ void sub_80EE294() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EE3D8() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._1293\n\ + mov r1, #0xc1\n\ + lsl r1, r1, #0x2\n\ + add r0, r0, r1\n\ + ldrh r0, [r0]\n\ + cmp r0, #0xd\n\ + bls ._1291 @cond_branch\n\ + b ._1354\n\ +._1291:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._1293 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._1294:\n\ + .align 2, 0\n\ +._1293:\n\ + .word +0x2000000\n\ + .word ._1295\n\ +._1295:\n\ + .word ._1296\n\ + .word ._1297\n\ + .word ._1298\n\ + .word ._1299\n\ + .word ._1300\n\ + .word ._1301\n\ + .word ._1302\n\ + .word ._1303\n\ + .word ._1304\n\ + .word ._1305\n\ + .word ._1306\n\ + .word ._1307\n\ + .word ._1308\n\ + .word ._1309\n\ +._1296:\n\ + bl sub_80F1E84\n\ + mov r0, #0x0\n\ + bl sub_80F2D04\n\ + ldr r1, ._1311\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1312:\n\ + .align 2, 0\n\ +._1311:\n\ + .word +0x2000000\n\ +._1297:\n\ + bl sub_80F1F10\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1313 @cond_branch\n\ + b ._1354\n\ +._1313:\n\ + mov r0, #0x9\n\ + bl sub_80EEFBC\n\ + ldr r1, ._1316\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1317:\n\ + .align 2, 0\n\ +._1316:\n\ + .word +0x2000000\n\ +._1298:\n\ + bl sub_80EEF34\n\ + lsl r0, r0, #0x18\n\ + lsr r2, r0, #0x18\n\ + cmp r2, #0\n\ + beq ._1318 @cond_branch\n\ + b ._1354\n\ +._1318:\n\ + ldr r4, ._1321\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + str r2, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + b ._1320\n\ +._1322:\n\ + .align 2, 0\n\ +._1321:\n\ + .word +0x2000000\n\ +._1299:\n\ + ldr r0, ._1326\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1323 @cond_branch\n\ + b ._1354\n\ +._1323:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl sub_80EED0C\n\ + bl sub_80EF814\n\ + bl sub_80EEE08\n\ + ldr r1, ._1326 + 4\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1327:\n\ + .align 2, 0\n\ +._1326:\n\ + .word gPaletteFade\n\ + .word +0x2000000\n\ +._1300:\n\ + bl sub_80F2620\n\ + ldr r1, ._1329\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1330:\n\ + .align 2, 0\n\ +._1329:\n\ + .word +0x2000000\n\ +._1301:\n\ + mov r0, #0x2\n\ + bl sub_80F0264\n\ + ldr r1, ._1334\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._1302:\n\ + bl sub_80F02A0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._1331 @cond_branch\n\ + b ._1354\n\ +._1331:\n\ + ldr r1, ._1334\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1335:\n\ + .align 2, 0\n\ +._1334:\n\ + .word +0x2000000\n\ +._1303:\n\ + mov r0, #0x3\n\ + bl sub_80F2C80\n\ + ldr r1, ._1338\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ +._1304:\n\ + mov r0, #0x3\n\ + bl sub_80F2CBC\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1354 @cond_branch\n\ + ldr r1, ._1338\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1339:\n\ + .align 2, 0\n\ +._1338:\n\ + .word +0x2000000\n\ +._1305:\n\ + mov r0, #0x2\n\ + bl sub_80F3008\n\ + ldr r1, ._1341\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1342:\n\ + .align 2, 0\n\ +._1341:\n\ + .word +0x2000000\n\ +._1306:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._1354 @cond_branch\n\ + ldr r1, ._1345\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + b ._1344\n\ +._1346:\n\ + .align 2, 0\n\ +._1345:\n\ + .word +0x2000000\n\ +._1307:\n\ + bl sub_80F6F10\n\ + ldr r4, ._1348\n\ + mov r1, #0xc2\n\ + lsl r1, r1, #0x2\n\ + add r0, r4, r1\n\ + ldr r0, [r0]\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + mov r2, #0x0\n\ + str r2, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r0, ._1348 + 4\n\ + bl SetVBlankCallback\n\ +._1320:\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r4, r0\n\ +._1344:\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + b ._1354\n\ +._1349:\n\ + .align 2, 0\n\ +._1348:\n\ + .word +0x2000000\n\ + .word sub_80EBD68+1\n\ +._1308:\n\ + mov r0, #0x5\n\ + bl sub_80EED2C\n\ + ldr r1, ._1352\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r1, r1, r0\n\ + ldrh r0, [r1]\n\ + add r0, r0, #0x1\n\ + strh r0, [r1]\n\ + ldr r0, ._1352 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1354 @cond_branch\n\ + ldr r0, ._1352 + 8\n\ + ldr r2, ._1352 + 12\n\ + mov r1, #0x0\n\ + mov r3, #0x4\n\ + bl debug_sub_8008218\n\ + b ._1354\n\ +._1353:\n\ + .align 2, 0\n\ +._1352:\n\ + .word +0x2000000\n\ + .word gLinkOpen\n\ + .word 0x6007de0\n\ + .word 0x600f800\n\ +._1309:\n\ + ldr r0, ._1355\n\ + ldrb r1, [r0, #0x7]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._1354 @cond_branch\n\ + ldr r0, ._1355 + 4\n\ + bl sub_80EBDBC\n\ +._1354:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._1356:\n\ + .align 2, 0\n\ +._1355:\n\ + .word gPaletteFade\n\ + .word sub_80EE58C+1"); +} +#else void sub_80EE3D8() { switch (ewram0_10.var304) @@ -2544,7 +7395,143 @@ void sub_80EE3D8() break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_80EE58C() +{ + asm("\ + push {r4, r5, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r5, ._1361\n\ + mov r0, #0xc1\n\ + lsl r0, r0, #0x2\n\ + add r4, r5, r0\n\ + ldrh r0, [r4]\n\ + cmp r0, #0x1\n\ + beq ._1357 @cond_branch\n\ + cmp r0, #0x1\n\ + bgt ._1358 @cond_branch\n\ + cmp r0, #0\n\ + beq ._1359 @cond_branch\n\ + b ._1383\n\ +._1362:\n\ + .align 2, 0\n\ +._1361:\n\ + .word +0x2000000\n\ +._1358:\n\ + cmp r0, #0x2\n\ + beq ._1363 @cond_branch\n\ + b ._1383\n\ +._1359:\n\ + bl sub_80F5DD4\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + beq ._1365 @cond_branch\n\ + cmp r0, #0x2\n\ + beq ._1366 @cond_branch\n\ + ldr r0, ._1369\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1367 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._1369 + 4\n\ + bl sub_80EBDBC\n\ + b ._1384\n\ +._1370:\n\ + .align 2, 0\n\ +._1369:\n\ + .word gMain\n\ + .word sub_80EE658+1\n\ +._1365:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r1, ._1372\n\ + add r0, r5, r1\n\ + ldrb r0, [r0]\n\ + bl sub_80F0FFC\n\ + b ._1384\n\ +._1373:\n\ + .align 2, 0\n\ +._1372:\n\ + .word 0x876e\n\ +._1366:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + strh r0, [r4]\n\ + b ._1384\n\ +._1367:\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1383 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldr r0, ._1377\n\ + bl sub_80EBDBC\n\ + b ._1384\n\ +._1378:\n\ + .align 2, 0\n\ +._1377:\n\ + .word sub_80EE8F4+1\n\ +._1357:\n\ + bl sub_80F0718\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._1383 @cond_branch\n\ + ldr r1, ._1381\n\ + add r0, r5, r1\n\ + ldrb r0, [r0]\n\ + bl sub_80F0FFC\n\ + bl sub_80F3264\n\ + ldrh r0, [r4]\n\ + add r0, r0, #0x1\n\ + b ._1380\n\ +._1382:\n\ + .align 2, 0\n\ +._1381:\n\ + .word 0x876e\n\ +._1363:\n\ + bl sub_8055870\n\ + cmp r0, #0\n\ + bne ._1383 @cond_branch\n\ +._1380:\n\ + strh r0, [r4]\n\ +._1383:\n\ + ldr r0, ._1385\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1384 @cond_branch\n\ + ldr r0, ._1385 + 4\n\ + ldr r1, ._1385 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x1\n\ + mov r2, #0x3\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._1384:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0\n\ +._1386:\n\ + .align 2, 0\n\ +._1385:\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else void sub_80EE58C() { switch (ewram0_10.var304) @@ -2588,6 +7575,7 @@ void sub_80EE58C() break; } } +#endif void sub_80EE658() { @@ -3018,6 +8006,108 @@ _080EEC0A:\n\ #endif // var6dad and var6dae must be s8 in this func +#if DEBUG +__attribute__((naked)) +bool8 sub_80EEC10() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._1563\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1559 @cond_branch\n\ + ldr r1, ._1563 + 4\n\ + add r3, r1, #1\n\ + add r2, r1, #5\n\ +._1561:\n\ + ldrb r0, [r1]\n\ + sub r0, r0, #0x1\n\ + strb r0, [r1]\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bge ._1560 @cond_branch\n\ + ldrb r0, [r3]\n\ + sub r0, r0, #0x1\n\ + strb r0, [r1]\n\ +._1560:\n\ + mov r0, #0x0\n\ + ldsb r0, [r1, r0]\n\ + add r0, r0, r2\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._1561 @cond_branch\n\ + mov r0, #0x1\n\ + b ._1568\n\ +._1564:\n\ + .align 2, 0\n\ +._1563:\n\ + .word gMain\n\ + .word +0x2006dad\n\ +._1559:\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1565 @cond_branch\n\ + ldr r1, ._1569\n\ + mov r4, #0x0\n\ + mov r2, #0x1\n\ + ldsb r2, [r1, r2]\n\ + add r3, r1, #5\n\ +._1567:\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + lsl r0, r0, #0x18\n\ + asr r0, r0, #0x18\n\ + cmp r0, r2\n\ + blt ._1566 @cond_branch\n\ + strb r4, [r1]\n\ +._1566:\n\ + mov r0, #0x0\n\ + ldsb r0, [r1, r0]\n\ + add r0, r0, r3\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._1567 @cond_branch\n\ + mov r0, #0x1\n\ + b ._1568\n\ +._1570:\n\ + .align 2, 0\n\ +._1569:\n\ + .word +0x2006dad\n\ +._1565:\n\ + ldr r0, ._1572\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1571 @cond_branch\n\ + ldr r0, ._1572 + 4\n\ + ldr r1, ._1572 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x6\n\ + mov r2, #0xa\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._1571:\n\ + mov r0, #0x0\n\ +._1568:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ +._1573:\n\ + .align 2, 0\n\ +._1572:\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else bool8 sub_80EEC10() { if (gMain.newKeys & 0x40) @@ -3040,7 +8130,104 @@ bool8 sub_80EEC10() } return FALSE; } +#endif +#if DEBUG +__attribute__((naked)) +bool8 sub_80EEC90() +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._1577\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + lsl r0, r0, #0x10\n\ + lsr r3, r0, #0x10\n\ + cmp r3, #0\n\ + beq ._1574 @cond_branch\n\ + ldr r2, ._1577 + 4\n\ + ldr r0, ._1577 + 8\n\ + add r1, r2, r0\n\ + ldrb r0, [r1]\n\ + sub r0, r0, #0x1\n\ + strb r0, [r1]\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bge ._1580 @cond_branch\n\ + ldr r3, ._1577 + 12\n\ + add r0, r2, r3\n\ + ldrb r0, [r0]\n\ + sub r0, r0, #0x1\n\ + strb r0, [r1]\n\ + b ._1580\n\ +._1578:\n\ + .align 2, 0\n\ +._1577:\n\ + .word gMain\n\ + .word +0x2000000\n\ + .word 0x6dad\n\ + .word 0x6dae\n\ +._1574:\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._1579 @cond_branch\n\ + ldr r0, ._1582\n\ + ldr r4, ._1582 + 4\n\ + add r2, r0, r4\n\ + ldrb r1, [r2]\n\ + add r1, r1, #0x1\n\ + strb r1, [r2]\n\ + add r4, r4, #0x1\n\ + add r0, r0, r4\n\ + lsl r1, r1, #0x18\n\ + asr r1, r1, #0x18\n\ + ldrb r0, [r0]\n\ + lsl r0, r0, #0x18\n\ + asr r0, r0, #0x18\n\ + cmp r1, r0\n\ + blt ._1580 @cond_branch\n\ + strb r3, [r2]\n\ +._1580:\n\ + mov r0, #0x1\n\ + b ._1581\n\ +._1583:\n\ + .align 2, 0\n\ +._1582:\n\ + .word +0x2000000\n\ + .word 0x6dad\n\ +._1579:\n\ + ldr r0, ._1585\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + bne ._1584 @cond_branch\n\ + ldr r0, ._1585 + 4\n\ + ldr r1, ._1585 + 8\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + mov r1, #0x4\n\ + str r1, [sp]\n\ + mov r1, #0x6\n\ + mov r2, #0xa\n\ + mov r3, #0x2\n\ + bl debug_sub_8008264\n\ +._1584:\n\ + mov r0, #0x0\n\ +._1581:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r1}\n\ + bx r1\n\ +._1586:\n\ + .align 2, 0\n\ +._1585:\n\ + .word gLinkOpen\n\ + .word gLink\n\ + .word 0xfbd"); +} +#else bool8 sub_80EEC90() { if (gMain.newKeys & 0x40) @@ -3057,6 +8244,7 @@ bool8 sub_80EEC90() } return FALSE; } +#endif void sub_80EED0C() { -- cgit v1.2.3 From 9c2f7c88f0d7e57c99d548870e78185e05cc472a Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 18 Jan 2018 13:54:10 -0600 Subject: add more debug code --- asm/cute_sketch.s | 344 -------------------------------------------- src/battle/battle_records.c | 60 ++++++++ src/field/mauville_man.c | 195 ------------------------- src/pokemon/mail.c | 199 +++++++++++++++++++++++++ src/scene/cute_sketch.c | 344 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 603 insertions(+), 539 deletions(-) diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s index 07cae108b..bc72a6ef5 100644 --- a/asm/cute_sketch.s +++ b/asm/cute_sketch.s @@ -5,350 +5,6 @@ .text -.if DEBUG - - thumb_func_start debug_sub_8110CCC -debug_sub_8110CCC: -.syntax divided - push {r4, r5, r6, r7, lr} - mov r7, #0x0 - mov r1, #0x0 - ldr r2, ._5 - ldr r6, ._5 + 4 -._7: - lsl r0, r1, #0x3 - add r4, r0, r2 - ldrh r0, [r6, #0x1c] - ldrh r3, [r4, #0x4] - cmp r0, r3 - bne ._1 @cond_branch - ldrh r0, [r4, #0x6] - bl FlagGet - lsl r0, r0, #0x18 - cmp r0, #0 - beq ._4 @cond_branch - ldrb r0, [r6, #0x1f] - ldr r1, [r4] - lsl r0, r0, #0x2 - add r0, r0, r1 - ldr r0, [r0] - bl StringLength - mov r1, #0xc - sub r1, r1, r0 - lsl r1, r1, #0x10 - lsr r5, r1, #0x10 - cmp r1, #0 - bge ._3 @cond_branch - mov r5, #0x0 -._3: - mov r7, #0x1 - mov r0, #0x10 - mov r1, #0xe - mov r2, #0x1d - mov r3, #0x13 - bl Menu_DrawStdWindowFrame - add r0, r6, #0 - add r0, r0, #0x8 - mov r1, #0x11 - mov r2, #0xf - bl Menu_PrintText - ldrb r0, [r6, #0x1f] - ldr r1, [r4] - lsl r0, r0, #0x2 - add r0, r0, r1 - ldr r0, [r0] - add r1, r5, #0 - add r1, r1, #0x11 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - mov r2, #0x11 - bl Menu_PrintText - b ._4 -._6: - .align 2, 0 -._5: - .word gUnknown_083E79C0 - .word +0x2000000 -._1: - add r0, r1, #1 - lsl r0, r0, #0x10 - lsr r1, r0, #0x10 - cmp r1, #0 - beq ._7 @cond_branch -._4: - cmp r7, #0 - bne ._8 @cond_branch - mov r0, #0x10 - mov r1, #0x10 - mov r2, #0x1d - mov r3, #0x13 - bl Menu_DrawStdWindowFrame - ldr r0, ._9 - mov r1, #0x11 - mov r2, #0x11 - bl Menu_PrintText - mov r0, #0x10 - mov r1, #0xe - mov r2, #0x1d - mov r3, #0xf - bl Menu_EraseWindowRect -._8: - pop {r4, r5, r6, r7} - pop {r0} - bx r0 -._10: - .align 2, 0 -._9: - .word +0x2000008 -.syntax unified - thumb_func_end debug_sub_8110CCC - - thumb_func_start debug_sub_8110D84 -debug_sub_8110D84: -.syntax divided - push {r4, lr} - add sp, sp, #0xfffffffc - ldr r0, ._13 - ldrh r0, [r0, #0x4] - cmp r0, #0x7 - bls ._11 @cond_branch - b ._65 -._11: - lsl r0, r0, #0x2 - ldr r1, ._13 + 4 - add r0, r0, r1 - ldr r0, [r0] - mov pc, r0 -._14: - .align 2, 0 -._13: - .word +0x2000000 - .word ._15 -._15: - .word ._16 - .word ._17 - .word ._18 - .word ._19 - .word ._20 - .word ._21 - .word ._22 - .word ._23 -._16: - mov r0, #0x1 - neg r0, r0 - mov r1, #0x0 - str r1, [sp] - mov r2, #0x10 - mov r3, #0x0 - bl BeginNormalPaletteFade - ldr r1, ._25 - ldrh r0, [r1, #0x4] - add r0, r0, #0x1 - b ._62 -._26: - .align 2, 0 -._25: - .word +0x2000000 -._17: - bl UpdatePaletteFade - lsl r0, r0, #0x18 - cmp r0, #0 - beq ._27 @cond_branch - b ._65 -._27: - ldr r1, ._30 - ldrh r0, [r1, #0x4] - add r0, r0, #0x1 - b ._62 -._31: - .align 2, 0 -._30: - .word +0x2000000 -._18: - bl sub_80FAB60 - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - cmp r0, #0x3 - beq ._32 @cond_branch - cmp r0, #0x3 - bgt ._33 @cond_branch - b ._65 -._33: - cmp r0, #0x4 - beq ._35 @cond_branch - cmp r0, #0x5 - beq ._36 @cond_branch - b ._65 -._35: - ldr r4, ._41 - ldrb r0, [r4, #0x1e] - cmp r0, #0 - bne ._38 @cond_branch - b ._65 -._38: - mov r0, #0x5 - bl gMysteryEventScriptCmdTableEnd+0x13c0 - ldr r1, ._41 + 4 - add r0, r4, r1 - mov r1, #0x1 - strb r1, [r0] - ldr r0, ._41 + 8 - bl sub_80FC244 - b ._65 -._42: - .align 2, 0 -._41: - .word +0x2000000 - .word 0xa6e - .word sub_80FC69C+1 -._36: - mov r0, #0x5 - bl gMysteryEventScriptCmdTableEnd+0x13c0 - mov r0, #0x1 - neg r0, r0 - mov r1, #0x0 - str r1, [sp] - mov r2, #0x0 - mov r3, #0x10 - bl BeginNormalPaletteFade - ldr r1, ._44 - ldrh r0, [r1, #0x4] - add r0, r0, #0x1 - b ._62 -._45: - .align 2, 0 -._44: - .word +0x2000000 -._19: - bl UpdatePaletteFade - lsl r0, r0, #0x18 - cmp r0, #0 - bne ._65 @cond_branch - ldr r0, ._48 - bl SetMainCallback2 - b ._65 -._49: - .align 2, 0 -._48: - .word sub_805469C+1 -._20: - bl sub_80FAB60 - lsl r0, r0, #0x18 - cmp r0, #0 - beq ._50 @cond_branch -._32: - bl debug_sub_8110CCC - b ._65 -._50: - ldr r0, ._54 - ldrh r1, [r0, #0x2e] - mov r0, #0x1 - and r0, r0, r1 - cmp r0, #0 - beq ._65 @cond_branch - bl sub_80FBCA0 - bl sub_80FAEC4 - ldr r1, ._54 + 4 - ldrh r0, [r1, #0x4] - add r0, r0, #0x1 - b ._62 -._55: - .align 2, 0 -._54: - .word gMain - .word +0x2000000 -._21: - bl sub_80FAFC0 - lsl r0, r0, #0x18 - cmp r0, #0 - bne ._65 @cond_branch - mov r0, #0x0 - mov r1, #0x0 - bl CreateRegionMapCursor - ldr r1, ._58 - ldrh r0, [r1, #0x4] - add r0, r0, #0x1 - b ._62 -._59: - .align 2, 0 -._58: - .word +0x2000000 -._22: - bl sub_80FAB60 - lsl r0, r0, #0x18 - cmp r0, #0 - beq ._60 @cond_branch - bl debug_sub_8110CCC -._60: - ldr r0, ._63 - ldrh r1, [r0, #0x2e] - mov r0, #0x1 - and r0, r0, r1 - cmp r0, #0 - beq ._65 @cond_branch - bl sub_80FBCA0 - bl sub_80FAEC4 - ldr r1, ._63 + 4 - ldrh r0, [r1, #0x4] - add r0, r0, #0x1 - b ._62 -._64: - .align 2, 0 -._63: - .word gMain - .word +0x2000000 -._23: - bl sub_80FAFC0 - lsl r0, r0, #0x18 - cmp r0, #0 - bne ._65 @cond_branch - mov r0, #0x0 - mov r1, #0x0 - bl CreateRegionMapCursor - ldr r1, ._66 - mov r0, #0x3 -._62: - strh r0, [r1, #0x4] -._65: - add sp, sp, #0x4 - pop {r4} - pop {r0} - bx r0 -._67: - .align 2, 0 -._66: - .word +0x2000000 -.syntax unified - thumb_func_end debug_sub_8110D84 - - thumb_func_start debug_sub_8110F28 -debug_sub_8110F28: -.syntax divided - push {lr} - bl CB2_InitFlyRegionMap - ldr r0, ._69 - ldr r1, [r0, #0x4] - ldr r0, ._69 + 4 - cmp r1, r0 - bne ._68 @cond_branch - bl sub_80FBF94 - ldr r0, ._69 + 8 - bl sub_80FC244 - bl debug_sub_8110CCC -._68: - pop {r0} - bx r0 -._70: - .align 2, 0 -._69: - .word gMain - .word CB2_FlyRegionMap+1 - .word debug_sub_8110D84+1 -.syntax unified - thumb_func_end debug_sub_8110F28 - -.endif - thumb_func_start sub_80FCB5C sub_80FCB5C: @ 80FCB5C push {r4-r7,lr} diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index 17e2352ff..4fce958fa 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -223,6 +223,66 @@ void UpdateLinkBattleRecords(int id) gLinkPlayers[gLinkPlayerMapObjects[id].linkPlayerId].language); } +#if DEBUG +__attribute__((naked)) +void debug_sub_81257E0(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + add sp, sp, #0xfffffffc\n\ + bl InitLinkBattleRecords\n\ + mov r5, #0x0\n\ + ldr r6, ._62\n\ + sub r0, r6, #2\n\ + mov r8, r0\n\ + ldr r7, ._62 + 4\n\ +._61:\n\ + ldr r0, ._62 + 8\n\ + lsl r3, r5, #0x2\n\ + add r3, r3, r0\n\ + ldrb r4, [r3]\n\ + sub r4, r4, #0x1\n\ + lsl r0, r4, #0x1\n\ + add r0, r0, r4\n\ + lsl r0, r0, #0x2\n\ + add r1, r0, r6\n\ + add r0, r0, r8\n\ + ldrh r2, [r0]\n\ + ldrb r3, [r3, #0x1]\n\ + ldr r0, ._62 + 12\n\ + lsl r4, r4, #0x2\n\ + add r4, r4, r0\n\ + ldrb r4, [r4, #0x1]\n\ + lsl r0, r4, #0x3\n\ + sub r0, r0, r4\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r7\n\ + ldrb r0, [r0, #0x1a]\n\ + str r0, [sp]\n\ + ldr r0, ._62 + 16\n\ + bl UpdateLinkBattleRecords_\n\ + add r5, r5, #0x1\n\ + cmp r5, #0x2\n\ + bls ._61 @cond_branch\n\ + add sp, sp, #0x4\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._63:\n\ + .align 2, 0\n\ +._62:\n\ + .word gUnknown_083F8410+0xa\n\ + .word gLinkPlayers\n\ + .word gUnknown_083F8410+0x5c\n\ + .word gLinkPlayerMapObjects\n\ + .word gSaveBlock1+0x30b8"); +} +#endif + static void PrintLinkBattleWinsLossesDraws(struct LinkBattleRecord *records) { ConvertIntToDecimalStringN_DigitWidth6(gStringVar1, GetGameStat(GAME_STAT_LINK_BATTLE_WINS), STR_CONV_MODE_RIGHT_ALIGN, 4); diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 144c0235a..e41ea1628 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -1392,198 +1392,3 @@ bool8 ScrSpecial_StorytellerInitializeRandomStat(void) { return StorytellerInitializeRandomStat(); } - -#if DEBUG -__attribute__((naked)) -void This_is_not_HandleReadMail() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " add r6, r1, #0\n" - " lsl r2, r2, #0x18\n" - " lsr r5, r2, #0x18\n" - " ldr r0, .__3\n" - " ldrb r3, [r0]\n" - " cmp r3, #0\n" - " beq .__1 @cond_branch\n" - " ldr r2, .__3 + 4\n" - " add r1, r2, #0\n" - " add r1, r1, #0xff\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r0, .__3 + 8\n" - " ldrh r1, [r0]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x1\n" - " add r0, r2, r3\n" - " strb r1, [r0]\n" - " mov r0, #0x82\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, .__3 + 12\n" - " str r0, [r1]\n" - " add r3, r3, #0x8\n" - " add r1, r2, r3\n" - " ldr r0, .__3 + 16\n" - " str r0, [r1]\n" - " ldr r0, .__3 + 20\n" - " ldrh r1, [r0]\n" - " b .__2\n" - ".__4:\n" - " .align 2, 0\n" - ".__3:\n" - " .word gUnknown_03000748+0x4\n" - " .word +0x2000000\n" - " .word gSpecialVar_0x8004\n" - " .word EasyChat_GetWordText+1\n" - " .word ConvertEasyChatWordsToString+1\n" - " .word gSpecialVar_0x8006\n" - ".__1:\n" - " ldr r2, .__7\n" - " add r1, r2, #0\n" - " add r1, r1, #0xff\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " add r0, r0, #0xfb\n" - " add r1, r2, r0\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x82\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, .__7 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x84\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, .__7 + 8\n" - " str r0, [r1]\n" - " ldrh r1, [r4, #0x20]\n" - " add r0, r1, #0\n" - " sub r0, r0, #0x79\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0xb\n" - " bhi .__5 @cond_branch\n" - " sub r1, r1, #0x79\n" - ".__2:\n" - " add r0, r2, #0\n" - " add r0, r0, #0xfa\n" - " strb r1, [r0]\n" - " b .__6\n" - ".__8:\n" - " .align 2, 0\n" - ".__7:\n" - " .word +0x2000000\n" - " .word EasyChat_GetWordText+1\n" - " .word ConvertEasyChatWordsToString+1\n" - ".__5:\n" - " add r0, r2, #0\n" - " add r0, r0, #0xfa\n" - " strb r3, [r0]\n" - " mov r5, #0x0\n" - ".__6:\n" - " ldr r1, .__12\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r0, r1, r2\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq .__9 @cond_branch\n" - " cmp r0, #0x1\n" - " beq .__10 @cond_branch\n" - ".__9:\n" - " mov r3, #0x86\n" - " lsl r3, r3, #0x1\n" - " add r2, r1, r3\n" - " add r0, r1, #0\n" - " add r0, r0, #0xfa\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, .__12 + 4\n" - " b .__11\n" - ".__13:\n" - " .align 2, 0\n" - ".__12:\n" - " .word +0x2000000\n" - " .word gUnknown_083E5730\n" - ".__10:\n" - " mov r0, #0x86\n" - " lsl r0, r0, #0x1\n" - " add r2, r1, r0\n" - " add r0, r1, #0\n" - " add r0, r0, #0xfa\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, .__18\n" - ".__11:\n" - " add r0, r0, r1\n" - " str r0, [r2]\n" - " ldrh r0, [r4, #0x1e]\n" - " mov r1, sp\n" - " bl MailSpeciesToSpecies\n" - " lsl r0, r0, #0x10\n" - " ldr r1, .__18 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xcd\n" - " lsl r1, r1, #0x11\n" - " cmp r0, r1\n" - " bhi .__14 @cond_branch\n" - " ldr r0, .__18 + 8\n" - " add r1, r0, #0\n" - " add r1, r1, #0xfa\n" - " ldrb r2, [r1]\n" - " add r1, r0, #0\n" - " cmp r2, #0x6\n" - " beq .__15 @cond_branch\n" - " cmp r2, #0x9\n" - " beq .__16 @cond_branch\n" - " b .__17\n" - ".__19:\n" - " .align 2, 0\n" - ".__18:\n" - " .word gUnknown_083E57A4\n" - " .word 0xffff0000\n" - " .word +0x2000000\n" - ".__15:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x1\n" - " b .__21\n" - ".__16:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x2\n" - " b .__21\n" - ".__14:\n" - " ldr r1, .__22\n" - ".__17:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x0\n" - ".__21:\n" - " strb r0, [r2]\n" - " add r0, r1, #0\n" - " add r0, r0, #0xf4\n" - " str r4, [r0]\n" - " sub r0, r0, #0x8\n" - " str r6, [r0]\n" - " add r0, r0, #0xc\n" - " strb r5, [r0]\n" - " ldr r0, .__22 + 4\n" - " bl SetMainCallback2\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - ".__23:\n" - " .align 2, 0\n" - ".__22:\n" - " .word +0x2000000\n" - " .word sub_80F8D50+1\n" - "\n" - ); -} -#endif diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 6e03958e6..1ad8d8376 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -327,6 +327,204 @@ static void sub_80F8F58(void); static void sub_80F8F78(void); static void sub_80F8FB4(void); +// some debug variable, I guess. +// TODO: where exactly is this located? +__attribute__((section(".bss"))) /*static*/ u8 gUnknown_0300074C = 0; + +#if DEBUG +__attribute__((naked)) +void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) +{ + asm( + " push {r4, r5, r6, lr}\n" + " add sp, sp, #0xfffffffc\n" + " add r4, r0, #0\n" + " add r6, r1, #0\n" + " lsl r2, r2, #0x18\n" + " lsr r5, r2, #0x18\n" + " ldr r0, .__3\n" + " ldrb r3, [r0]\n" + " cmp r3, #0\n" + " beq .__1 @cond_branch\n" + " ldr r2, .__3 + 4\n" + " add r1, r2, #0\n" + " add r1, r1, #0xff\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " ldr r0, .__3 + 8\n" + " ldrh r1, [r0]\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x1\n" + " add r0, r2, r3\n" + " strb r1, [r0]\n" + " mov r0, #0x82\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, .__3 + 12\n" + " str r0, [r1]\n" + " add r3, r3, #0x8\n" + " add r1, r2, r3\n" + " ldr r0, .__3 + 16\n" + " str r0, [r1]\n" + " ldr r0, .__3 + 20\n" + " ldrh r1, [r0]\n" + " b .__2\n" + ".__4:\n" + " .align 2, 0\n" + ".__3:\n" + " .word gUnknown_0300074C\n" + " .word +0x2000000\n" + " .word gSpecialVar_0x8004\n" + " .word EasyChat_GetWordText+1\n" + " .word ConvertEasyChatWordsToString+1\n" + " .word gSpecialVar_0x8006\n" + ".__1:\n" + " ldr r2, .__7\n" + " add r1, r2, #0\n" + " add r1, r1, #0xff\n" + " mov r0, #0x5\n" + " strb r0, [r1]\n" + " add r0, r0, #0xfb\n" + " add r1, r2, r0\n" + " mov r0, #0x1\n" + " strb r0, [r1]\n" + " mov r0, #0x82\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, .__7 + 4\n" + " str r0, [r1]\n" + " mov r0, #0x84\n" + " lsl r0, r0, #0x1\n" + " add r1, r2, r0\n" + " ldr r0, .__7 + 8\n" + " str r0, [r1]\n" + " ldrh r1, [r4, #0x20]\n" + " add r0, r1, #0\n" + " sub r0, r0, #0x79\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, #0xb\n" + " bhi .__5 @cond_branch\n" + " sub r1, r1, #0x79\n" + ".__2:\n" + " add r0, r2, #0\n" + " add r0, r0, #0xfa\n" + " strb r1, [r0]\n" + " b .__6\n" + ".__8:\n" + " .align 2, 0\n" + ".__7:\n" + " .word +0x2000000\n" + " .word EasyChat_GetWordText+1\n" + " .word ConvertEasyChatWordsToString+1\n" + ".__5:\n" + " add r0, r2, #0\n" + " add r0, r0, #0xfa\n" + " strb r3, [r0]\n" + " mov r5, #0x0\n" + ".__6:\n" + " ldr r1, .__12\n" + " mov r2, #0x80\n" + " lsl r2, r2, #0x1\n" + " add r0, r1, r2\n" + " ldrb r0, [r0]\n" + " cmp r0, #0\n" + " beq .__9 @cond_branch\n" + " cmp r0, #0x1\n" + " beq .__10 @cond_branch\n" + ".__9:\n" + " mov r3, #0x86\n" + " lsl r3, r3, #0x1\n" + " add r2, r1, r3\n" + " add r0, r1, #0\n" + " add r0, r0, #0xfa\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, .__12 + 4\n" + " b .__11\n" + ".__13:\n" + " .align 2, 0\n" + ".__12:\n" + " .word +0x2000000\n" + " .word gUnknown_083E5730\n" + ".__10:\n" + " mov r0, #0x86\n" + " lsl r0, r0, #0x1\n" + " add r2, r1, r0\n" + " add r0, r1, #0\n" + " add r0, r0, #0xfa\n" + " ldrb r0, [r0]\n" + " lsl r0, r0, #0x3\n" + " ldr r1, .__18\n" + ".__11:\n" + " add r0, r0, r1\n" + " str r0, [r2]\n" + " ldrh r0, [r4, #0x1e]\n" + " mov r1, sp\n" + " bl MailSpeciesToSpecies\n" + " lsl r0, r0, #0x10\n" + " ldr r1, .__18 + 4\n" + " add r0, r0, r1\n" + " mov r1, #0xcd\n" + " lsl r1, r1, #0x11\n" + " cmp r0, r1\n" + " bhi .__14 @cond_branch\n" + " ldr r0, .__18 + 8\n" + " add r1, r0, #0\n" + " add r1, r1, #0xfa\n" + " ldrb r2, [r1]\n" + " add r1, r0, #0\n" + " cmp r2, #0x6\n" + " beq .__15 @cond_branch\n" + " cmp r2, #0x9\n" + " beq .__16 @cond_branch\n" + " b .__17\n" + ".__19:\n" + " .align 2, 0\n" + ".__18:\n" + " .word gUnknown_083E57A4\n" + " .word 0xffff0000\n" + " .word +0x2000000\n" + ".__15:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x1\n" + " b .__21\n" + ".__16:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x2\n" + " b .__21\n" + ".__14:\n" + " ldr r1, .__22\n" + ".__17:\n" + " add r2, r1, #0\n" + " add r2, r2, #0xfb\n" + " mov r0, #0x0\n" + ".__21:\n" + " strb r0, [r2]\n" + " add r0, r1, #0\n" + " add r0, r0, #0xf4\n" + " str r4, [r0]\n" + " sub r0, r0, #0x8\n" + " str r6, [r0]\n" + " add r0, r0, #0xc\n" + " strb r5, [r0]\n" + " ldr r0, .__22 + 4\n" + " bl SetMainCallback2\n" + " add sp, sp, #0x4\n" + " pop {r4, r5, r6}\n" + " pop {r0}\n" + " bx r0\n" + ".__23:\n" + " .align 2, 0\n" + ".__22:\n" + " .word +0x2000000\n" + " .word sub_80F8D50+1\n" + "\n" + ); +} +#else void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { u16 mailDesign; @@ -390,6 +588,7 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) SetMainCallback2(sub_80F8D50); } +#endif #define RETURN_UP_STATE break #define RETURN_SKIP_STATE return FALSE diff --git a/src/scene/cute_sketch.c b/src/scene/cute_sketch.c index 5317bc334..c4d9463f5 100644 --- a/src/scene/cute_sketch.c +++ b/src/scene/cute_sketch.c @@ -29,6 +29,350 @@ void sub_80FD1C8(u16); u16 sub_80FD39C(u16*); u16 sub_80FD68C(u16*, u16*, u16*); +#if DEBUG + +__attribute__((naked)) +void debug_sub_8110CCC(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, #0x0\n\ + mov r1, #0x0\n\ + ldr r2, ._5\n\ + ldr r6, ._5 + 4\n\ +._7:\n\ + lsl r0, r1, #0x3\n\ + add r4, r0, r2\n\ + ldrh r0, [r6, #0x1c]\n\ + ldrh r3, [r4, #0x4]\n\ + cmp r0, r3\n\ + bne ._1 @cond_branch\n\ + ldrh r0, [r4, #0x6]\n\ + bl FlagGet\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._4 @cond_branch\n\ + ldrb r0, [r6, #0x1f]\n\ + ldr r1, [r4]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + bl StringLength\n\ + mov r1, #0xc\n\ + sub r1, r1, r0\n\ + lsl r1, r1, #0x10\n\ + lsr r5, r1, #0x10\n\ + cmp r1, #0\n\ + bge ._3 @cond_branch\n\ + mov r5, #0x0\n\ +._3:\n\ + mov r7, #0x1\n\ + mov r0, #0x10\n\ + mov r1, #0xe\n\ + mov r2, #0x1d\n\ + mov r3, #0x13\n\ + bl Menu_DrawStdWindowFrame\n\ + add r0, r6, #0\n\ + add r0, r0, #0x8\n\ + mov r1, #0x11\n\ + mov r2, #0xf\n\ + bl Menu_PrintText\n\ + ldrb r0, [r6, #0x1f]\n\ + ldr r1, [r4]\n\ + lsl r0, r0, #0x2\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + add r1, r5, #0\n\ + add r1, r1, #0x11\n\ + lsl r1, r1, #0x18\n\ + lsr r1, r1, #0x18\n\ + mov r2, #0x11\n\ + bl Menu_PrintText\n\ + b ._4\n\ +._6:\n\ + .align 2, 0\n\ +._5:\n\ + .word gUnknown_083E79C0\n\ + .word +0x2000000\n\ +._1:\n\ + add r0, r1, #1\n\ + lsl r0, r0, #0x10\n\ + lsr r1, r0, #0x10\n\ + cmp r1, #0\n\ + beq ._7 @cond_branch\n\ +._4:\n\ + cmp r7, #0\n\ + bne ._8 @cond_branch\n\ + mov r0, #0x10\n\ + mov r1, #0x10\n\ + mov r2, #0x1d\n\ + mov r3, #0x13\n\ + bl Menu_DrawStdWindowFrame\n\ + ldr r0, ._9\n\ + mov r1, #0x11\n\ + mov r2, #0x11\n\ + bl Menu_PrintText\n\ + mov r0, #0x10\n\ + mov r1, #0xe\n\ + mov r2, #0x1d\n\ + mov r3, #0xf\n\ + bl Menu_EraseWindowRect\n\ +._8:\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._10:\n\ + .align 2, 0\n\ +._9:\n\ + .word +0x2000008"); +} + +__attribute__((naked)) +void debug_sub_8110D84(void) +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._13\n\ + ldrh r0, [r0, #0x4]\n\ + cmp r0, #0x7\n\ + bls ._11 @cond_branch\n\ + b ._65\n\ +._11:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._13 + 4\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._14:\n\ + .align 2, 0\n\ +._13:\n\ + .word +0x2000000\n\ + .word ._15\n\ +._15:\n\ + .word ._16\n\ + .word ._17\n\ + .word ._18\n\ + .word ._19\n\ + .word ._20\n\ + .word ._21\n\ + .word ._22\n\ + .word ._23\n\ +._16:\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + mov r1, #0x0\n\ + str r1, [sp]\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginNormalPaletteFade\n\ + ldr r1, ._25\n\ + ldrh r0, [r1, #0x4]\n\ + add r0, r0, #0x1\n\ + b ._62\n\ +._26:\n\ + .align 2, 0\n\ +._25:\n\ + .word +0x2000000\n\ +._17:\n\ + bl UpdatePaletteFade\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._27 @cond_branch\n\ + b ._65\n\ +._27:\n\ + ldr r1, ._30\n\ + ldrh r0, [r1, #0x4]\n\ + add r0, r0, #0x1\n\ + b ._62\n\ +._31:\n\ + .align 2, 0\n\ +._30:\n\ + .word +0x2000000\n\ +._18:\n\ + bl sub_80FAB60\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x3\n\ + beq ._32 @cond_branch\n\ + cmp r0, #0x3\n\ + bgt ._33 @cond_branch\n\ + b ._65\n\ +._33:\n\ + cmp r0, #0x4\n\ + beq ._35 @cond_branch\n\ + cmp r0, #0x5\n\ + beq ._36 @cond_branch\n\ + b ._65\n\ +._35:\n\ + ldr r4, ._41\n\ + ldrb r0, [r4, #0x1e]\n\ + cmp r0, #0\n\ + bne ._38 @cond_branch\n\ + b ._65\n\ +._38:\n\ + mov r0, #0x5\n\ + bl gMysteryEventScriptCmdTableEnd+0x13c0\n\ + ldr r1, ._41 + 4\n\ + add r0, r4, r1\n\ + mov r1, #0x1\n\ + strb r1, [r0]\n\ + ldr r0, ._41 + 8\n\ + bl sub_80FC244\n\ + b ._65\n\ +._42:\n\ + .align 2, 0\n\ +._41:\n\ + .word +0x2000000\n\ + .word 0xa6e\n\ + .word sub_80FC69C+1\n\ +._36:\n\ + mov r0, #0x5\n\ + bl gMysteryEventScriptCmdTableEnd+0x13c0\n\ + mov r0, #0x1\n\ + neg r0, r0\n\ + mov r1, #0x0\n\ + str r1, [sp]\n\ + mov r2, #0x0\n\ + mov r3, #0x10\n\ + bl BeginNormalPaletteFade\n\ + ldr r1, ._44\n\ + ldrh r0, [r1, #0x4]\n\ + add r0, r0, #0x1\n\ + b ._62\n\ +._45:\n\ + .align 2, 0\n\ +._44:\n\ + .word +0x2000000\n\ +._19:\n\ + bl UpdatePaletteFade\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._65 @cond_branch\n\ + ldr r0, ._48\n\ + bl SetMainCallback2\n\ + b ._65\n\ +._49:\n\ + .align 2, 0\n\ +._48:\n\ + .word sub_805469C+1\n\ +._20:\n\ + bl sub_80FAB60\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._50 @cond_branch\n\ +._32:\n\ + bl debug_sub_8110CCC\n\ + b ._65\n\ +._50:\n\ + ldr r0, ._54\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._65 @cond_branch\n\ + bl sub_80FBCA0\n\ + bl sub_80FAEC4\n\ + ldr r1, ._54 + 4\n\ + ldrh r0, [r1, #0x4]\n\ + add r0, r0, #0x1\n\ + b ._62\n\ +._55:\n\ + .align 2, 0\n\ +._54:\n\ + .word gMain\n\ + .word +0x2000000\n\ +._21:\n\ + bl sub_80FAFC0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._65 @cond_branch\n\ + mov r0, #0x0\n\ + mov r1, #0x0\n\ + bl CreateRegionMapCursor\n\ + ldr r1, ._58\n\ + ldrh r0, [r1, #0x4]\n\ + add r0, r0, #0x1\n\ + b ._62\n\ +._59:\n\ + .align 2, 0\n\ +._58:\n\ + .word +0x2000000\n\ +._22:\n\ + bl sub_80FAB60\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._60 @cond_branch\n\ + bl debug_sub_8110CCC\n\ +._60:\n\ + ldr r0, ._63\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._65 @cond_branch\n\ + bl sub_80FBCA0\n\ + bl sub_80FAEC4\n\ + ldr r1, ._63 + 4\n\ + ldrh r0, [r1, #0x4]\n\ + add r0, r0, #0x1\n\ + b ._62\n\ +._64:\n\ + .align 2, 0\n\ +._63:\n\ + .word gMain\n\ + .word +0x2000000\n\ +._23:\n\ + bl sub_80FAFC0\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._65 @cond_branch\n\ + mov r0, #0x0\n\ + mov r1, #0x0\n\ + bl CreateRegionMapCursor\n\ + ldr r1, ._66\n\ + mov r0, #0x3\n\ +._62:\n\ + strh r0, [r1, #0x4]\n\ +._65:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._67:\n\ + .align 2, 0\n\ +._66:\n\ + .word +0x2000000"); +} + +__attribute__((naked)) +void debug_sub_8110F28(void) +{ + asm("\ + push {lr}\n\ + bl CB2_InitFlyRegionMap\n\ + ldr r0, ._69\n\ + ldr r1, [r0, #0x4]\n\ + ldr r0, ._69 + 4\n\ + cmp r1, r0\n\ + bne ._68 @cond_branch\n\ + bl sub_80FBF94\n\ + ldr r0, ._69 + 8\n\ + bl sub_80FC244\n\ + bl debug_sub_8110CCC\n\ +._68:\n\ + pop {r0}\n\ + bx r0\n\ +._70:\n\ + .align 2, 0\n\ +._69:\n\ + .word gMain\n\ + .word CB2_FlyRegionMap+1\n\ + .word debug_sub_8110D84+1"); +} + +#endif + void sub_80FC7A0(struct Unk03005E20* info) { gUnknown_03005DEC = info->var_4; -- cgit v1.2.3 From 8d14b68921bf5a355e71031a9311125af114cbfe Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 18 Jan 2018 14:30:07 -0600 Subject: add more debug code --- common_syms/roulette.txt | 1 + src/engine/save.c | 10 +- src/roulette.c | 1093 +++++++++++++++++++++++++++++++++++++++++++++- sym_common.txt | 1 + 4 files changed, 1103 insertions(+), 2 deletions(-) create mode 100644 common_syms/roulette.txt diff --git a/common_syms/roulette.txt b/common_syms/roulette.txt new file mode 100644 index 000000000..d82426e97 --- /dev/null +++ b/common_syms/roulette.txt @@ -0,0 +1 @@ +gUnknown_Debug_03005FB8 diff --git a/src/engine/save.c b/src/engine/save.c index a9945a80d..de5fd2846 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -783,13 +783,21 @@ u8 Save_WriteDataInternal(u8 saveType) return 0; } +#ifdef DEBUG +extern u32 gUnknown_Debug_03004BD0; +#endif + u8 Save_WriteData(u8 saveType) // TrySave { if (gFlashMemoryPresent != TRUE) return SAVE_STATUS_ERROR; Save_WriteDataInternal(saveType); - if (!gDamagedSaveSectors) + if (!gDamagedSaveSectors +#ifdef DEBUG + && gUnknown_Debug_03004BD0 == 0 +#endif + ) return SAVE_STATUS_OK; DoSaveFailedScreen(saveType); diff --git a/src/roulette.c b/src/roulette.c index ce95bc1c9..240ca11fa 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -131,6 +131,12 @@ struct StructgUnknown_083F8D90 u32 var04; }; +#if DEBUG +u8 gUnknown_Debug_03005FB8; +#endif + +#define static + static void sub_81150FC(void); static void sub_8115124(void); static void sub_8115238(void); @@ -573,6 +579,305 @@ void sub_8115238(void) } #endif +#if DEBUG +__attribute__((naked)) +void sub_8115384(void) +{ + asm("\ + push {r4, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r1, ._35\n\ + ldr r0, ._35 + 4\n\ + str r0, [r1]\n\ + ldr r1, ._35 + 8\n\ + ldr r2, ._35 + 12\n\ + add r0, r1, r2\n\ + ldrb r0, [r0]\n\ + add r2, r1, #0\n\ + cmp r0, #0x7\n\ + bls ._33 @cond_branch\n\ + b ._64\n\ +._33:\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._35 + 16\n\ + add r0, r0, r1\n\ + ldr r0, [r0]\n\ + mov pc, r0\n\ +._36:\n\ + .align 2, 0\n\ +._35:\n\ + .word gUnknown_Debug_03005FB8\n\ + .word +0x2019000\n\ + .word gMain\n\ + .word 0x43c\n\ + .word ._37\n\ +._37:\n\ + .word ._38\n\ + .word ._39\n\ + .word ._40\n\ + .word ._41\n\ + .word ._42\n\ + .word ._43\n\ + .word ._44\n\ + .word ._45\n\ +._38:\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + bl ScanlineEffect_Stop\n\ + bl sub_80F9438\n\ + bl sub_80F9368\n\ + ldr r1, ._47\n\ + ldr r3, ._47 + 4\n\ + add r0, r3, #0\n\ + strh r0, [r1]\n\ + sub r1, r1, #0x2\n\ + ldr r2, ._47 + 8\n\ + add r0, r2, #0\n\ + strh r0, [r1]\n\ + add r1, r1, #0x46\n\ + mov r3, #0x90\n\ + lsl r3, r3, #0x6\n\ + add r0, r3, #0\n\ + strh r0, [r1]\n\ + add r1, r1, #0x2\n\ + ldr r2, ._47 + 12\n\ + add r0, r2, #0\n\ + strh r0, [r1]\n\ + ldr r0, ._47 + 16\n\ + mov r1, #0xc0\n\ + lsl r1, r1, #0x13\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cb8\n\ + ldr r0, ._47 + 20\n\ + ldr r1, ._47 + 24\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cb8\n\ + ldr r1, ._47 + 28\n\ + ldr r3, ._47 + 32\n\ + add r1, r1, r3\n\ + b ._61\n\ +._48:\n\ + .align 2, 0\n\ +._47:\n\ + .word 0x400000c\n\ + .word 0x4686\n\ + .word 0x4401\n\ + .word 0x60a\n\ + .word gUnknown_08E8096C\n\ + .word gRouletteWheelTiles\n\ + .word 0x6004000\n\ + .word gMain\n\ + .word 0x43c\n\ +._39:\n\ + bl ResetPaletteFade\n\ + bl ResetSpriteData\n\ + bl ResetTasks\n\ + ldr r1, ._50\n\ + ldr r0, ._50 + 4\n\ + add r1, r1, r0\n\ + b ._61\n\ +._51:\n\ + .align 2, 0\n\ +._50:\n\ + .word gMain\n\ + .word 0x43c\n\ +._40:\n\ + ldr r0, ._53\n\ + bl Text_LoadWindowTemplate\n\ + ldr r0, ._53 + 4\n\ + bl InitMenuWindow\n\ + ldr r0, ._53 + 8\n\ + mov r2, #0xe0\n\ + lsl r2, r2, #0x1\n\ + mov r1, #0x0\n\ + bl LoadPalette\n\ + ldr r1, ._53 + 12\n\ + ldr r2, ._53 + 16\n\ + add r1, r1, r2\n\ + b ._61\n\ +._54:\n\ + .align 2, 0\n\ +._53:\n\ + .word gWindowTemplate_81E6C3C\n\ + .word gWindowTemplate_81E6CE4\n\ + .word gUnknown_083F86BC\n\ + .word gMain\n\ + .word 0x43c\n\ +._41:\n\ + bl sub_8115238\n\ + bl sub_80F9020\n\ + ldr r0, ._56\n\ + ldr r1, ._56 + 4\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cbc\n\ + ldr r0, ._56 + 8\n\ + ldr r1, ._56 + 12\n\ + bl gMysteryEventScriptCmdTableEnd+0x3cb8\n\ + ldr r1, ._56 + 16\n\ + ldr r3, ._56 + 20\n\ + add r1, r1, r3\n\ + b ._61\n\ +._57:\n\ + .align 2, 0\n\ +._56:\n\ + .word gUnknown_083F88BC\n\ + .word +0x2018800\n\ + .word gUnknown_083F8A60\n\ + .word 0x6003000\n\ + .word gMain\n\ + .word 0x43c\n\ +._42:\n\ + mov r0, #0x0\n\ + bl sub_8117838\n\ + bl sub_811857C\n\ + bl sub_81184D8\n\ + bl sub_8117F2C\n\ + bl sub_8117900\n\ + bl sub_8117BBC\n\ + bl sub_8117DF4\n\ + ldr r1, ._59\n\ + ldr r0, ._59 + 4\n\ + add r1, r1, r0\n\ + b ._61\n\ +._60:\n\ + .align 2, 0\n\ +._59:\n\ + .word gMain\n\ + .word 0x43c\n\ +._43:\n\ + bl AnimateSprites\n\ + bl BuildOamBuffer\n\ + ldr r0, ._62\n\ + ldr r1, ._62 + 4\n\ + add r0, r0, r1\n\ + ldrh r0, [r0]\n\ + bl sub_81180F4\n\ + mov r0, #0x6\n\ + bl sub_81182F8\n\ + mov r0, #0x0\n\ + bl sub_811829C\n\ + mov r0, #0x0\n\ + bl sub_8117158\n\ + mov r0, #0x0\n\ + mov r1, #0xe\n\ + mov r2, #0x1d\n\ + mov r3, #0x13\n\ + bl Menu_DrawStdWindowFrame\n\ + ldr r0, ._62 + 8\n\ + mov r1, #0x1\n\ + mov r2, #0xf\n\ + bl Menu_PrintText\n\ + ldr r1, ._62 + 12\n\ + mov r2, #0x3c\n\ + neg r2, r2\n\ + add r0, r2, #0\n\ + strh r0, [r1]\n\ + ldr r1, ._62 + 16\n\ + mov r0, #0x0\n\ + strh r0, [r1]\n\ + ldr r1, ._62 + 20\n\ + ldr r3, ._62 + 24\n\ + add r1, r1, r3\n\ + b ._61\n\ +._63:\n\ + .align 2, 0\n\ +._62:\n\ + .word gSaveBlock1\n\ + .word 0x494\n\ + .word gUnknown_081C4157\n\ + .word gSpriteCoordOffsetX\n\ + .word gSpriteCoordOffsetY\n\ + .word gMain\n\ + .word 0x43c\n\ +._44:\n\ + mov r1, #0x80\n\ + lsl r1, r1, #0x13\n\ + ldr r3, ._65\n\ + add r0, r3, #0\n\ + strh r0, [r1]\n\ + ldr r0, ._65 + 4\n\ + add r1, r2, r0\n\ +._61:\n\ + ldrb r0, [r1]\n\ + add r0, r0, #0x1\n\ + strb r0, [r1]\n\ + b ._64\n\ +._66:\n\ + .align 2, 0\n\ +._65:\n\ + .word 0x1741\n\ + .word 0x43c\n\ +._45:\n\ + ldr r3, ._67\n\ + ldrh r2, [r3]\n\ + mov r0, #0x0\n\ + strh r0, [r3]\n\ + ldr r4, ._67 + 4\n\ + ldrh r0, [r4]\n\ + mov r1, #0x1\n\ + orr r0, r0, r1\n\ + strh r0, [r4]\n\ + strh r2, [r3]\n\ + ldr r2, ._67 + 8\n\ + ldrh r0, [r2]\n\ + mov r1, #0x8\n\ + orr r0, r0, r1\n\ + strh r0, [r2]\n\ + ldr r0, ._67 + 12\n\ + bl SetVBlankCallback\n\ + mov r0, #0x1\n\ + str r0, [sp]\n\ + mov r0, #0xff\n\ + mov r1, #0x0\n\ + mov r2, #0x10\n\ + mov r3, #0x0\n\ + bl BeginHardwarePaletteFade\n\ + ldr r0, ._67 + 16\n\ + mov r1, #0x0\n\ + bl CreateTask\n\ + ldr r4, ._67 + 20\n\ + add r1, r4, #0\n\ + add r1, r1, #0xa4\n\ + strb r0, [r1]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r2, ._67 + 24\n\ + lsl r1, r0, #0x2\n\ + add r1, r1, r0\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r2\n\ + mov r0, #0x6\n\ + strh r0, [r1, #0x14]\n\ + ldr r0, ._67 + 28\n\ + ldr r2, ._67 + 32\n\ + add r0, r0, r2\n\ + ldrh r0, [r0]\n\ + strh r0, [r1, #0x22]\n\ + ldr r0, ._67 + 36\n\ + mov r1, #0x1\n\ + bl CreateTask\n\ + add r4, r4, #0xa5\n\ + strb r0, [r4]\n\ + ldr r0, ._67 + 40\n\ + bl SetMainCallback2\n\ +._64:\n\ + add sp, sp, #0x4\n\ + pop {r4}\n\ + pop {r0}\n\ + bx r0\n\ +._68:\n\ + .align 2, 0\n\ +._67:\n\ + .word 0x4000208\n\ + .word 0x4000200\n\ + .word 0x4000004\n\ + .word sub_8115124+1\n\ + .word sub_81156BC+1\n\ + .word +0x2019000\n\ + .word gTasks\n\ + .word gSaveBlock1\n\ + .word 0x494\n\ + .word sub_8115634+1\n\ + .word sub_81150FC+1"); +} +#else void sub_8115384(void) { u32 temp_IME; @@ -654,7 +959,120 @@ void sub_8115384(void) break; } } +#endif +#if DEBUG +__attribute__((naked)) +void sub_8115634(u8 unused) +{ + asm("\ + push {r4, r5, r6, lr}\n\ + ldr r0, ._75\n\ + add r3, r0, #0\n\ + add r3, r3, #0x21\n\ + ldrb r1, [r3]\n\ + add r2, r1, #1\n\ + strb r2, [r3]\n\ + add r2, r0, #0\n\ + add r2, r2, #0x23\n\ + lsl r1, r1, #0x18\n\ + lsr r1, r1, #0x18\n\ + add r6, r0, #0\n\ + ldrb r2, [r2]\n\ + cmp r1, r2\n\ + bne ._70 @cond_branch\n\ + mov r0, #0x0\n\ + strb r0, [r3]\n\ + add r2, r6, #0\n\ + add r2, r2, #0x22\n\ + ldrb r1, [r2]\n\ + ldrh r0, [r6, #0x24]\n\ + sub r0, r0, r1\n\ + strh r0, [r6, #0x24]\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + bge ._70 @cond_branch\n\ + ldrb r1, [r2]\n\ + mov r2, #0xb4\n\ + lsl r2, r2, #0x1\n\ + add r0, r2, #0\n\ + sub r0, r0, r1\n\ + strh r0, [r6, #0x24]\n\ +._70:\n\ + add r4, r6, #0\n\ + ldrh r0, [r4, #0x24]\n\ + bl Sin2\n\ + lsl r0, r0, #0x10\n\ + lsr r5, r0, #0x10\n\ + ldrh r0, [r4, #0x24]\n\ + bl Cos2\n\ + lsl r0, r0, #0x10\n\ + lsr r1, r0, #0x10\n\ + lsl r0, r5, #0x10\n\ + asr r0, r0, #0x10\n\ + cmp r0, #0\n\ + bge ._71 @cond_branch\n\ + add r0, r0, #0xf\n\ +._71:\n\ + lsl r0, r0, #0xc\n\ + lsr r5, r0, #0x10\n\ + lsl r0, r1, #0x10\n\ + asr r0, r0, #0x10\n\ + cmp r0, #0\n\ + bge ._72 @cond_branch\n\ + add r0, r0, #0xf\n\ +._72:\n\ + asr r0, r0, #0x4\n\ + strh r0, [r6, #0x32]\n\ + strh r0, [r6, #0x2c]\n\ + strh r5, [r6, #0x2e]\n\ + lsl r0, r5, #0x10\n\ + asr r0, r0, #0x10\n\ + neg r0, r0\n\ + strh r0, [r6, #0x30]\n\ + ldr r0, ._75 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._74 @cond_branch\n\ + ldr r0, ._75 + 8\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._74 @cond_branch\n\ + ldr r2, ._75 + 12\n\ + add r0, r6, #0\n\ + add r0, r0, #0xa4\n\ + ldrb r1, [r0]\n\ + lsl r0, r1, #0x2\n\ + add r0, r0, r1\n\ + lsl r0, r0, #0x3\n\ + add r0, r0, r2\n\ + ldr r1, ._75 + 16\n\ + str r1, [r0]\n\ + ldr r0, ._75 + 20\n\ + bl gMysteryEventScriptCmdTableEnd+0x1c08\n\ + ldr r0, ._75 + 24\n\ + bl gMysteryEventScriptCmdTableEnd+0x1c08\n\ + ldr r0, ._75 + 28\n\ + bl gMysteryEventScriptCmdTableEnd+0x1c08\n\ +._74:\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0\n\ +._76:\n\ + .align 2, 0\n\ +._75:\n\ + .word +0x2019000\n\ + .word unk_203955C\n\ + .word gMain\n\ + .word gTasks\n\ + .word sub_81157AC+1\n\ + .word gMPlay_SE1\n\ + .word gMPlay_SE2\n\ + .word gMPlay_SE3"); +} +#else void sub_8115634(u8 unused) { s16 sin; @@ -675,6 +1093,7 @@ void sub_8115634(u8 unused) eRoulette->var2C.b = sin; eRoulette->var2C.c = -sin; } +#endif void sub_81156BC(u8 taskid) { @@ -1596,7 +2015,69 @@ void sub_8116AB0(u8 taskid) gTasks[taskid].func = &sub_8116B40; } -void sub_8116B40(u8 taskid) // end oulette ? +#if DEBUG +__attribute__((naked)) +void sub_8116B40(u8 taskid) // end roulette ? +{ + asm("\ + push {r4, r5, r6, lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r6, r0, #0x18\n\ + bl UpdatePaletteFade\n\ + lsl r0, r0, #0x18\n\ + lsr r5, r0, #0x18\n\ + cmp r5, #0\n\ + bne ._380 @cond_branch\n\ + mov r0, #0x0\n\ + bl SetVBlankCallback\n\ + ldr r0, ._381\n\ + mov r2, #0xbe\n\ + lsl r2, r2, #0x1\n\ + mov r1, #0x0\n\ + bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + ldr r1, ._381 + 4\n\ + ldr r0, ._381 + 8\n\ + mov r4, #0x0\n\ + strh r5, [r0]\n\ + strh r5, [r1]\n\ + bl sub_80F9368\n\ + bl FreeAllSpritePalettes\n\ + bl ResetPaletteFade\n\ + bl ResetSpriteData\n\ + bl sub_80F9020\n\ + ldr r0, ._381 + 12\n\ + strh r5, [r0]\n\ + add r0, r0, #0x2\n\ + strh r5, [r0]\n\ + add r0, r0, #0x2\n\ + strh r5, [r0]\n\ + ldr r1, ._381 + 16\n\ + ldr r0, ._381 + 20\n\ + str r0, [r1]\n\ + ldr r0, ._381 + 24\n\ + bl SetMainCallback2\n\ + add r0, r6, #0\n\ + bl DestroyTask\n\ + ldr r0, ._381 + 28\n\ + strb r4, [r0]\n\ +._380:\n\ + pop {r4, r5, r6}\n\ + pop {r0}\n\ + bx r0\n\ +._382:\n\ + .align 2, 0\n\ +._381:\n\ + .word +0x2019000\n\ + .word gSpriteCoordOffsetX\n\ + .word gSpriteCoordOffsetY\n\ + .word 0x4000050\n\ + .word gFieldCallback\n\ + .word sub_8080990+1\n\ + .word c2_exit_to_overworld_2_switch+1\n\ + .word unk_203955C"); +} +#else +void sub_8116B40(u8 taskid) // end roulette ? { if (UpdatePaletteFade() == 0) { @@ -1616,6 +2097,7 @@ void sub_8116B40(u8 taskid) // end oulette ? DestroyTask(taskid); } } +#endif void sub_8116BC0(u8 taskid) { @@ -2632,6 +3114,9 @@ void sub_811755C(u8 taskid) void sub_81175C0(u8 taskid) { +#if DEBUG + unk_203955C[0] = 0; +#endif Menu_EraseScreen(); ScriptContext2_Disable(); DestroyTask(taskid); @@ -2694,6 +3179,386 @@ void Task_Roulette_0(u8 taskid) } } +#if DEBUG + +__attribute__((naked)) +void debug_sub_812CDE4() +{ + asm("\ + push {r4, r5, lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r3, r0, #0x18\n\ + add r4, r3, #0\n\ + ldr r0, ._575\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._572 @cond_branch\n\ + ldr r1, ._575 + 4\n\ + lsl r0, r3, #0x2\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x3\n\ + add r2, r0, r1\n\ + ldrh r0, [r2, #0x22]\n\ + add r0, r0, #0x1\n\ + strh r0, [r2, #0x22]\n\ + lsl r0, r0, #0x10\n\ + ldr r1, ._575 + 8\n\ + cmp r0, r1\n\ + bne ._573 @cond_branch\n\ + mov r0, #0x0\n\ + strh r0, [r2, #0x22]\n\ +._573:\n\ + ldr r0, ._575 + 12\n\ + mov r3, #0x22\n\ + ldsh r1, [r2, r3]\n\ + b ._584\n\ +._576:\n\ + .align 2, 0\n\ +._575:\n\ + .word gMain\n\ + .word gTasks\n\ + .word 0x27100000\n\ + .word gStringVar1\n\ +._572:\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._577 @cond_branch\n\ + ldr r1, ._580\n\ + lsl r0, r3, #0x2\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x3\n\ + add r2, r0, r1\n\ + ldrh r0, [r2, #0x22]\n\ + sub r0, r0, #0x1\n\ + strh r0, [r2, #0x22]\n\ + lsl r0, r0, #0x10\n\ + asr r0, r0, #0x10\n\ + mov r1, #0x1\n\ + neg r1, r1\n\ + cmp r0, r1\n\ + bne ._578 @cond_branch\n\ + ldr r0, ._580 + 4\n\ + strh r0, [r2, #0x22]\n\ +._578:\n\ + ldr r0, ._580 + 8\n\ + mov r3, #0x22\n\ + ldsh r1, [r2, r3]\n\ + b ._584\n\ +._581:\n\ + .align 2, 0\n\ +._580:\n\ + .word gTasks\n\ + .word 0x270f\n\ + .word gStringVar1\n\ +._577:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._582 @cond_branch\n\ + ldr r1, ._585\n\ + lsl r0, r3, #0x2\n\ + add r0, r0, r3\n\ + lsl r0, r0, #0x3\n\ + add r2, r0, r1\n\ + ldrh r3, [r2, #0x22]\n\ + add r0, r3, #0\n\ + add r0, r0, #0xa\n\ + strh r0, [r2, #0x22]\n\ + lsl r0, r0, #0x10\n\ + ldr r1, ._585 + 4\n\ + cmp r0, r1\n\ + ble ._583 @cond_branch\n\ + ldr r1, ._585 + 8\n\ + add r0, r3, r1\n\ + strh r0, [r2, #0x22]\n\ +._583:\n\ + ldr r0, ._585 + 12\n\ + mov r3, #0x22\n\ + ldsh r1, [r2, r3]\n\ + b ._584\n\ +._586:\n\ + .align 2, 0\n\ +._585:\n\ + .word gTasks\n\ + .word 0x270f0000\n\ + .word 0xffffd8fb\n\ + .word gStringVar1\n\ +._582:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._587 @cond_branch\n\ + ldr r0, ._590\n\ + lsl r1, r3, #0x2\n\ + add r1, r1, r3\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r0\n\ + ldrh r2, [r1, #0x22]\n\ + add r0, r2, #0\n\ + sub r0, r0, #0xa\n\ + strh r0, [r1, #0x22]\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + bge ._588 @cond_branch\n\ + ldr r3, ._590 + 4\n\ + add r0, r2, r3\n\ + strh r0, [r1, #0x22]\n\ +._588:\n\ + ldr r0, ._590 + 8\n\ + mov r2, #0x22\n\ + ldsh r1, [r1, r2]\n\ +._584:\n\ + mov r2, #0x1\n\ + mov r3, #0x4\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r4, ._590 + 12\n\ + ldr r1, ._590 + 16\n\ + add r0, r4, #0\n\ + bl StringExpandPlaceholders\n\ + add r0, r4, #0\n\ + mov r1, #0x9\n\ + mov r2, #0x1\n\ + bl MenuPrint_RightAligned\n\ + b ._596\n\ +._591:\n\ + .align 2, 0\n\ +._590:\n\ + .word gTasks\n\ + .word 0x2705\n\ + .word gStringVar1\n\ + .word gStringVar4\n\ + .word gOtherText_Coins\n\ +._587:\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._592 @cond_branch\n\ + ldr r0, ._594\n\ + ldr r2, ._594 + 4\n\ + lsl r1, r3, #0x2\n\ + add r1, r1, r3\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r2\n\ + ldrh r2, [r1, #0x22]\n\ + ldr r3, ._594 + 8\n\ + add r0, r0, r3\n\ + mov r5, #0x0\n\ + strh r2, [r0]\n\ + ldr r0, ._594 + 12\n\ + str r0, [r1]\n\ + ldr r0, ._594 + 16\n\ + mov r2, #0x22\n\ + ldsh r1, [r1, r2]\n\ + mov r2, #0x1\n\ + mov r3, #0x4\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r4, ._594 + 20\n\ + ldr r1, ._594 + 24\n\ + add r0, r4, #0\n\ + bl StringExpandPlaceholders\n\ + add r0, r4, #0\n\ + mov r1, #0x9\n\ + mov r2, #0x1\n\ + bl MenuPrint_RightAligned\n\ + ldr r0, ._594 + 28\n\ + strb r5, [r0]\n\ + b ._596\n\ +._595:\n\ + .align 2, 0\n\ +._594:\n\ + .word gSaveBlock1\n\ + .word gTasks\n\ + .word 0x494\n\ + .word Task_Roulette_0+1\n\ + .word gStringVar1\n\ + .word gStringVar4\n\ + .word gOtherText_Coins\n\ + .word unk_2039560\n\ +._592:\n\ + mov r0, #0x4\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._596 @cond_branch\n\ + ldr r0, ._597\n\ + ldr r2, ._597 + 4\n\ + lsl r1, r4, #0x2\n\ + add r1, r1, r4\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r2\n\ + ldrh r2, [r1, #0x22]\n\ + ldr r3, ._597 + 8\n\ + add r0, r0, r3\n\ + strh r2, [r0]\n\ + ldr r0, ._597 + 12\n\ + str r0, [r1]\n\ + ldr r0, ._597 + 16\n\ + mov r2, #0x22\n\ + ldsh r1, [r1, r2]\n\ + mov r2, #0x1\n\ + mov r3, #0x4\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r4, ._597 + 20\n\ + ldr r1, ._597 + 24\n\ + add r0, r4, #0\n\ + bl StringExpandPlaceholders\n\ + add r0, r4, #0\n\ + mov r1, #0x9\n\ + mov r2, #0x1\n\ + bl MenuPrint_RightAligned\n\ + ldr r1, ._597 + 28\n\ + mov r0, #0x1\n\ + strb r0, [r1]\n\ +._596:\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0\n\ +._598:\n\ + .align 2, 0\n\ +._597:\n\ + .word gSaveBlock1\n\ + .word gTasks\n\ + .word 0x494\n\ + .word Task_Roulette_0+1\n\ + .word gStringVar1\n\ + .word gStringVar4\n\ + .word gOtherText_Coins\n\ + .word unk_2039560"); +} + +__attribute__((naked)) +void debug_sub_812CFE8() +{ + asm("\ + push {r4, r5, lr}\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r2, ._600\n\ + lsl r1, r0, #0x2\n\ + add r1, r1, r0\n\ + lsl r1, r1, #0x3\n\ + add r5, r1, r2\n\ + ldr r0, ._600 + 4\n\ + ldr r1, ._600 + 8\n\ + add r0, r0, r1\n\ + ldrh r0, [r0]\n\ + strh r0, [r5, #0x22]\n\ + bl Random\n\ + mov r1, #0x1\n\ + and r1, r1, r0\n\ + cmp r1, #0\n\ + beq ._599 @cond_branch\n\ + ldr r0, ._600 + 12\n\ + ldrh r1, [r0]\n\ + mov r2, #0x80\n\ + orr r1, r1, r2\n\ + strh r1, [r0]\n\ +._599:\n\ + ldr r0, ._600 + 16\n\ + mov r2, #0x22\n\ + ldsh r1, [r5, r2]\n\ + mov r2, #0x1\n\ + mov r3, #0x4\n\ + bl ConvertIntToDecimalStringN\n\ + ldr r4, ._600 + 20\n\ + ldr r1, ._600 + 24\n\ + add r0, r4, #0\n\ + bl StringExpandPlaceholders\n\ + mov r0, #0x0\n\ + mov r1, #0x0\n\ + mov r2, #0x9\n\ + mov r3, #0x3\n\ + bl Menu_DrawStdWindowFrame\n\ + add r0, r4, #0\n\ + mov r1, #0x9\n\ + mov r2, #0x1\n\ + bl MenuPrint_RightAligned\n\ + mov r0, #0x0\n\ + mov r1, #0xe\n\ + mov r2, #0x1d\n\ + mov r3, #0x13\n\ + bl Menu_DrawStdWindowFrame\n\ + ldr r0, ._600 + 28\n\ + mov r1, #0x1\n\ + mov r2, #0xf\n\ + bl Menu_PrintText\n\ + ldr r0, ._600 + 32\n\ + str r0, [r5]\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0\n\ +._601:\n\ + .align 2, 0\n\ +._600:\n\ + .word gTasks\n\ + .word gSaveBlock1\n\ + .word 0x494\n\ + .word gSpecialVar_0x8004\n\ + .word gStringVar1\n\ + .word gStringVar4\n\ + .word gOtherText_Coins\n\ + .word gUnknown_Debug_0842510D\n\ + .word debug_sub_812CDE4+1"); +} + +#endif + +#if DEBUG +__attribute__((naked)) +void PlayRoulette(void) +{ + asm("\ + push {lr}\n\ + bl ScriptContext2_Enable\n\ + ldr r1, ._604\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ + ldr r0, ._604 + 4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._602 @cond_branch\n\ + ldr r0, ._604 + 8\n\ + mov r1, #0x0\n\ + bl CreateTask\n\ + b ._603\n\ +._605:\n\ + .align 2, 0\n\ +._604:\n\ + .word unk_2039560\n\ + .word unk_203955C\n\ + .word debug_sub_812CFE8+1\n\ +._602:\n\ + ldr r0, ._606\n\ + mov r1, #0x0\n\ + bl CreateTask\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r2, ._606 + 4\n\ + lsl r1, r0, #0x2\n\ + add r1, r1, r0\n\ + lsl r1, r1, #0x3\n\ + add r1, r1, r2\n\ + ldr r0, ._606 + 8\n\ + ldr r2, ._606 + 12\n\ + add r0, r0, r2\n\ + ldrh r0, [r0]\n\ + strh r0, [r1, #0x22]\n\ +._603:\n\ + pop {r0}\n\ + bx r0\n\ +._607:\n\ + .align 2, 0\n\ +._606:\n\ + .word Task_Roulette_0+1\n\ + .word gTasks\n\ + .word gSaveBlock1\n\ + .word 0x494"); +} +#else void PlayRoulette(void) { u8 taskid; @@ -2701,6 +3566,7 @@ void PlayRoulette(void) taskid = CreateTask(&Task_Roulette_0, 0x0); gTasks[taskid].data[0xD] = gSaveBlock1.coins; } +#endif void sub_8117838(u8 r0) { @@ -3594,6 +4460,99 @@ void sub_8118D2C(struct Sprite *sprite) } } +#if DEBUG +__attribute__((naked)) +void debug_sub_812E698() +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + add r7, r0, #0\n\ + bl sub_8118724\n\ + mov r0, #0x0\n\ + strh r0, [r7, #0x32]\n\ + add r0, r7, #0\n\ + bl sub_81186B8\n\ + mov r0, #0x38\n\ + bl gMysteryEventScriptCmdTableEnd+0x13c0\n\ + bl Random\n\ + mov r1, #0x1\n\ + and r1, r1, r0\n\ + cmp r1, #0\n\ + beq ._837 @cond_branch\n\ + ldr r4, ._839\n\ + add r1, r4, #0\n\ + add r1, r1, #0x8c\n\ + ldr r0, ._839 + 4\n\ + str r0, [r1]\n\ + add r0, r4, #0\n\ + add r0, r0, #0x7e\n\ + ldrb r0, [r0]\n\ + add r0, r0, #0x1\n\ + mov r1, #0xc\n\ + bl gMysteryEventScriptCmdTableEnd+0x3e40\n\ + add r1, r4, #0\n\ + add r1, r1, #0x7f\n\ + strb r0, [r1]\n\ + add r1, r4, #0\n\ + ldr r4, ._839 + 8\n\ + b ._838\n\ +._840:\n\ + .align 2, 0\n\ +._839:\n\ + .word +0x2019000\n\ + .word 0x0\n\ + .word gUnknown_083F8DF4\n\ +._837:\n\ + ldr r6, ._841\n\ + add r5, r6, #0\n\ + add r5, r5, #0x8c\n\ + ldr r4, ._841 + 4\n\ + ldrb r0, [r6, #0x4]\n\ + lsl r0, r0, #0x1e\n\ + lsr r0, r0, #0x19\n\ + add r1, r4, #0\n\ + add r1, r1, #0x1c\n\ + add r0, r0, r1\n\ + ldr r1, [r0]\n\ + add r0, r1, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x54dc\n\ + str r0, [r5]\n\ + add r0, r6, #0\n\ + add r0, r0, #0x7e\n\ + ldrb r0, [r0]\n\ + add r1, r6, #0\n\ + add r1, r1, #0x7f\n\ + strb r0, [r1]\n\ + add r1, r6, #0\n\ +._838:\n\ + mov r0, #0x1\n\ + strh r0, [r7, #0x2e]\n\ + ldrb r0, [r1, #0x4]\n\ + lsl r0, r0, #0x1e\n\ + lsr r0, r0, #0x19\n\ + add r0, r0, r4\n\ + ldrb r0, [r0, #0x2]\n\ + strh r0, [r7, #0x32]\n\ + add r1, r1, #0x98\n\ + ldr r0, ._841 + 8\n\ + str r0, [r1]\n\ + ldr r0, ._841 + 12\n\ + str r0, [r7, #0x1c]\n\ + mov r0, #0x5\n\ + strh r0, [r7, #0x30]\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._842:\n\ + .align 2, 0\n\ +._841:\n\ + .word +0x2019000\n\ + .word gUnknown_083F8DF4\n\ + .word 0x3dae147b\n\ + .word sub_8118D2C+1"); +} +#endif + #ifdef NONMATCHING void sub_8118DE4(struct Sprite *sprite) { @@ -3869,6 +4828,137 @@ _08118F88: .4byte sub_8118D2C\n\ } #endif +#if DEBUG +__attribute__((naked)) +void sub_8118F8C(struct Sprite *sprite) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6, r7}\n\ + add r6, r0, #0\n\ + bl sub_8118724\n\ + ldr r5, ._868\n\ + mov r0, #0x8c\n\ + add r0, r0, r5\n\ + mov r8, r0\n\ + ldr r0, [r0]\n\ + ldr r1, ._868 + 4\n\ + bl gMysteryEventScriptCmdTableEnd+0x5928\n\ + cmp r0, #0\n\ + bgt ._874 @cond_branch\n\ + add r0, r6, #0\n\ + bl sub_81186B8\n\ + add r0, r6, #0\n\ + bl sub_81186E8\n\ + lsl r0, r0, #0x10\n\ + cmp r0, #0\n\ + bne ._864 @cond_branch\n\ + add r1, r5, #0\n\ + add r1, r1, #0x90\n\ + ldr r0, ._868 + 8\n\ + str r0, [r1]\n\ + ldr r1, ._868 + 12\n\ + mov r9, r1\n\ + ldrb r0, [r5, #0x4]\n\ + lsl r7, r0, #0x1e\n\ + lsr r0, r7, #0x19\n\ + add r0, r0, r9\n\ + mov r4, #0x3\n\ + ldsb r4, [r0, r4]\n\ + add r0, r4, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x5a48\n\ + add r5, r0, #0\n\ + cmp r4, #0\n\ + bge ._865 @cond_branch\n\ + ldr r1, ._868 + 16\n\ + bl gMysteryEventScriptCmdTableEnd+0x54dc\n\ + add r5, r0, #0\n\ +._865:\n\ + lsr r0, r7, #0x19\n\ + add r0, r0, r9\n\ + ldrb r0, [r0, #0x4]\n\ + add r0, r0, #0x1\n\ + bl gMysteryEventScriptCmdTableEnd+0x5a48\n\ + add r1, r0, #0\n\ + add r0, r5, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x56a0\n\ + add r1, r0, #0\n\ + mov r2, r8\n\ + ldr r0, [r2]\n\ + bl gMysteryEventScriptCmdTableEnd+0x5508\n\ + mov r1, r8\n\ + str r0, [r1]\n\ + mov r0, #0x4\n\ + strh r0, [r6, #0x30]\n\ + ldr r0, ._868 + 20\n\ + ldrb r0, [r0]\n\ + cmp r0, #0\n\ + beq ._866 @cond_branch\n\ + ldr r0, ._868 + 24\n\ + str r0, [r6, #0x1c]\n\ + b ._874\n\ +._869:\n\ + .align 2, 0\n\ +._868:\n\ + .word +0x2019000\n\ + .word 0x3f000000\n\ + .word 0x0\n\ + .word gUnknown_083F8DF4\n\ + .word 0x43800000\n\ + .word unk_2039560\n\ + .word debug_sub_812E698+1\n\ +._866:\n\ + ldr r0, ._871\n\ + str r0, [r6, #0x1c]\n\ + b ._874\n\ +._872:\n\ + .align 2, 0\n\ +._871:\n\ + .word sub_8118DE4+1\n\ +._864:\n\ + add r6, r5, #0\n\ + add r6, r6, #0x90\n\ + ldr r0, [r6]\n\ + ldr r4, ._875\n\ + add r1, r4, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x58e0\n\ + cmp r0, #0\n\ + beq ._874 @cond_branch\n\ + mov r2, r8\n\ + ldr r0, [r2]\n\ + add r1, r4, #0\n\ + bl gMysteryEventScriptCmdTableEnd+0x59b8\n\ + cmp r0, #0\n\ + bge ._874 @cond_branch\n\ + str r4, [r6]\n\ + mov r0, r8\n\ + str r4, [r0]\n\ + add r4, r5, #0\n\ + add r4, r4, #0x98\n\ + ldr r0, [r4]\n\ + bl gMysteryEventScriptCmdTableEnd+0x5b4c\n\ + ldr r2, ._875 + 4\n\ + ldr r3, ._875 + 8\n\ + bl gMysteryEventScriptCmdTableEnd+0x4c2c\n\ + bl gMysteryEventScriptCmdTableEnd+0x51e8\n\ + str r0, [r4]\n\ +._874:\n\ + pop {r3, r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._876:\n\ + .align 2, 0\n\ +._875:\n\ + .word 0x0\n\ + .word 0x3ff33333\n\ + .word 0x33333333"); +} +#else void sub_8118F8C(struct Sprite *sprite) { sub_8118724(sprite); @@ -3899,6 +4989,7 @@ void sub_8118F8C(struct Sprite *sprite) } } } +#endif void sub_8119088(struct Sprite *sprite) { diff --git a/sym_common.txt b/sym_common.txt index 7844c799b..1e6ac7e90 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -249,6 +249,7 @@ gUnknown_03005E0C: @ 3005E0C .include "scene/contest_painting.o" .include "scene/evolution_scene.o" + .include "roulette.o" @ pokedex_cry_screen -- cgit v1.2.3 From bcbc9d040ba671df27183bff0b7356da3d9511f6 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 18 Jan 2018 15:19:31 -0600 Subject: finish adding all debug code --- data/roulette.s | 7 ++ src/battle/battle_controller_safari.c | 231 ++++++++++++++++++++++++++++++++++ src/engine/save_failed_screen.c | 192 +++++++++++++++++++++++++++- src/field/party_menu.c | 64 ++++++++++ 4 files changed, 490 insertions(+), 4 deletions(-) diff --git a/data/roulette.s b/data/roulette.s index d19508fc3..b9d096ac4 100644 --- a/data/roulette.s +++ b/data/roulette.s @@ -133,6 +133,13 @@ gUnknown_083F8EE8:: @ 83F8EE8 gUnknown_083F8EF4:: @ 83F8EF4 .byte 0, 3, 4, 6, 12 +.if DEBUG +@ Could also be after English-only graphics +gUnknown_Debug_0842510D:: @ 0x842510D + .string "Set COIN and Press START\n" + .string "Aーp1 Bーm1 R:Lー×10$" +.endif + .ifdef ENGLISH .align 2 RouletteSpritePalette_01: diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 0d193d68f..4af8adbbb 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -207,6 +207,236 @@ void SafariBufferRunCommand(void) } } +#if DEBUG +__attribute__((naked)) +void bx_battle_menu_t6_2(void) +{ + asm("\ + push {r4, r5, lr}\n\ + add sp, sp, #0xfffffffc\n\ + ldr r0, ._94\n\ + ldrh r1, [r0, #0x2e]\n\ + mov r2, #0x1\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._89 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + bl DestroyMenuCursor\n\ + ldr r1, ._94 + 4\n\ + ldr r0, ._94 + 8\n\ + ldrb r0, [r0]\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + beq ._90 @cond_branch\n\ + cmp r0, #0x1\n\ + bgt ._91 @cond_branch\n\ + cmp r0, #0\n\ + beq ._92 @cond_branch\n\ + b ._101\n\ +._95:\n\ + .align 2, 0\n\ +._94:\n\ + .word gMain\n\ + .word gActionSelectionCursor\n\ + .word gActiveBank\n\ +._91:\n\ + cmp r0, #0x2\n\ + beq ._96 @cond_branch\n\ + cmp r0, #0x3\n\ + beq ._97 @cond_branch\n\ + b ._101\n\ +._92:\n\ + mov r0, #0x1\n\ + mov r1, #0x5\n\ + b ._100\n\ +._90:\n\ + mov r0, #0x1\n\ + mov r1, #0x6\n\ + b ._100\n\ +._96:\n\ + mov r0, #0x1\n\ + mov r1, #0x7\n\ +._100:\n\ + mov r2, #0x0\n\ + bl Emitcmd33\n\ + b ._101\n\ +._97:\n\ + mov r0, #0x1\n\ + mov r1, #0x8\n\ + mov r2, #0x0\n\ + bl Emitcmd33\n\ +._101:\n\ + bl SafariBufferExecCompleted\n\ + b ._129\n\ +._89:\n\ + mov r3, #0x20\n\ + add r0, r3, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._103 @cond_branch\n\ + ldr r5, ._107\n\ + ldr r4, ._107 + 4\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._104 @cond_branch\n\ + b ._129\n\ +._104:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r0, [r0]\n\ + bl nullsub_8\n\ + ldrb r1, [r4]\n\ + add r1, r1, r5\n\ + ldrb r0, [r1]\n\ + mov r2, #0x1\n\ + b ._111\n\ +._108:\n\ + .align 2, 0\n\ +._107:\n\ + .word gActionSelectionCursor\n\ + .word gActiveBank\n\ +._103:\n\ + mov r0, #0x10\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._109 @cond_branch\n\ + ldr r5, ._112\n\ + ldr r4, ._112 + 4\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + add r0, r2, #0\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._129 @cond_branch\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r0, [r0]\n\ + bl nullsub_8\n\ + ldrb r1, [r4]\n\ + add r1, r1, r5\n\ + ldrb r0, [r1]\n\ + mov r2, #0x1\n\ + b ._111\n\ +._113:\n\ + .align 2, 0\n\ +._112:\n\ + .word gActionSelectionCursor\n\ + .word gActiveBank\n\ +._109:\n\ + mov r0, #0x40\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._114 @cond_branch\n\ + ldr r5, ._117\n\ + ldr r4, ._117 + 4\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._129 @cond_branch\n\ + b ._116\n\ +._118:\n\ + .align 2, 0\n\ +._117:\n\ + .word gActionSelectionCursor\n\ + .word gActiveBank\n\ +._114:\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._119 @cond_branch\n\ + ldr r5, ._122\n\ + ldr r4, ._122 + 4\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r1, [r0]\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + bne ._129 @cond_branch\n\ +._116:\n\ + mov r0, #0x5\n\ + bl PlaySE\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r0, [r0]\n\ + bl nullsub_8\n\ + ldrb r1, [r4]\n\ + add r1, r1, r5\n\ + ldrb r0, [r1]\n\ + mov r2, #0x2\n\ +._111:\n\ + eor r0, r0, r2\n\ + strb r0, [r1]\n\ + ldrb r0, [r4]\n\ + add r0, r0, r5\n\ + ldrb r0, [r0]\n\ + mov r1, #0x0\n\ + bl sub_802E3E4\n\ + b ._129\n\ +._123:\n\ + .align 2, 0\n\ +._122:\n\ + .word gActionSelectionCursor\n\ + .word gActiveBank\n\ +._119:\n\ + mov r0, #0x80\n\ + lsl r0, r0, #0x1\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._124 @cond_branch\n\ + ldr r0, ._127\n\ + ldrb r2, [r0]\n\ + lsl r0, r2, #0x1\n\ + add r0, r0, r2\n\ + lsl r0, r0, #0x2\n\ + ldr r1, ._127 + 4\n\ + add r0, r0, r1\n\ + ldrb r1, [r0]\n\ + add r0, r3, #0\n\ + and r0, r0, r1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0\n\ + bne ._129 @cond_branch\n\ + str r0, [sp]\n\ + add r0, r2, #0\n\ + add r1, r2, #0\n\ + mov r3, #0x4\n\ + bl move_anim_start_t3\n\ + b ._129\n\ +._128:\n\ + .align 2, 0\n\ +._127:\n\ + .word gActiveBank\n\ + .word +0x2017810\n\ +._124:\n\ + mov r0, #0x8\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._129 @cond_branch\n\ + bl sub_804454C\n\ +._129:\n\ + add sp, sp, #0x4\n\ + pop {r4, r5}\n\ + pop {r0}\n\ + bx r0"); +} +#else void bx_battle_menu_t6_2(void) { if (gMain.newKeys & A_BUTTON) @@ -273,6 +503,7 @@ void bx_battle_menu_t6_2(void) } } } +#endif void sub_812B65C(void) { diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index 74a1e9612..421cd0779 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -61,16 +61,18 @@ static const u8 sClockFrames[8][3] = static const u8 gSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal"); static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); +#define static + static void VBlankCB(void); static void CB2_SaveFailedScreen(void); static void CB2_WipeSave(void); -static void CB2_GameplayCannotBeContinued(void); +/*static*/ void CB2_GameplayCannotBeContinued(void); static void CB2_FadeAndReturnToTitleScreen(void); static void CB2_ReturnToTitleScreen(void); static void VBlankCB_UpdateClockGraphics(void); static bool8 VerifySectorWipe(u16 sector); static bool8 WipeSector(u16 sector); -static bool8 WipeSectors(u32 sectorBits); +/*static*/ bool8 WipeSectors(u32 sectorBits); void DoSaveFailedScreen(u8 saveType) { @@ -148,6 +150,151 @@ static void CB2_SaveFailedScreen(void) } } +#if DEBUG +__attribute__((naked)) +void CB2_WipeSave() +{ + asm( + " push {r4, r5, lr}\n" + " mov r4, #0x0\n" + " ldr r0, ._20\n" + " mov r2, #0x1\n" + " strh r2, [r0]\n" + " ldr r0, ._20 + 4\n" + " ldr r0, [r0]\n" + " ldr r1, ._20 + 8\n" + " cmp r0, #0\n" + " beq ._12 @cond_branch\n" + " str r2, [r1]\n" + "._12:\n" + " ldr r0, [r1]\n" + " cmp r0, #0\n" + " beq ._16 @cond_branch\n" + " add r5, r1, #0\n" + "._17:\n" + " ldr r0, [r5]\n" + " bl WipeSectors\n" + " lsl r0, r0, #0x18\n" + " cmp r0, #0\n" + " bne ._14 @cond_branch\n" + " mov r0, #0x1\n" + " mov r1, #0xa\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r0, ._20 + 12\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl Menu_PrintText\n" + " ldr r0, ._20 + 16\n" + " ldrb r0, [r0]\n" + " bl Save_WriteDataInternal\n" + " ldr r0, [r5]\n" + " cmp r0, #0\n" + " beq ._15 @cond_branch\n" + " mov r0, #0x1\n" + " mov r1, #0xa\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r0, ._20 + 20\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl Menu_PrintText\n" + "._15:\n" + " add r0, r4, #1\n" + " lsl r0, r0, #0x18\n" + " lsr r4, r0, #0x18\n" + " ldr r0, [r5]\n" + " cmp r0, #0\n" + " beq ._16 @cond_branch\n" + " cmp r4, #0x2\n" + " bls ._17 @cond_branch\n" + "._16:\n" + " cmp r4, #0x3\n" + " bne ._18 @cond_branch\n" + " mov r0, #0x1\n" + " mov r1, #0xa\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r0, ._20 + 24\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl Menu_PrintText\n" + " ldr r0, ._20 + 28\n" + " bl SetMainCallback2\n" + " b ._23\n" + "._21:\n" + " .align 2, 0\n" + "._20:\n" + " .word gSaveFailedClockInfo\n" + " .word gUnknown_Debug_03004BD0\n" + " .word gDamagedSaveSectors\n" + " .word gSystemText_CheckCompleteSaveAttempt\n" + " .word gSaveFailedType\n" + " .word gSystemText_SaveFailedBackupCheck\n" + " .word gSystemText_BackupDamagedGameContinue\n" + " .word CB2_FadeAndReturnToTitleScreen+1\n" + "._18:\n" + " mov r0, #0x1\n" + " mov r1, #0xa\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r0, ._24\n" + " ldr r0, [r0]\n" + " cmp r0, #0\n" + " bne ._22 @cond_branch\n" + " ldr r0, ._24 + 4\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl Menu_PrintText\n" + " b ._23\n" + "._25:\n" + " .align 2, 0\n" + "._24:\n" + " .word gGameContinueCallback\n" + " .word gSystemText_SaveCompletedGameEnd\n" + "._14:\n" + " mov r0, #0x1\n" + " mov r1, #0xa\n" + " mov r2, #0x1c\n" + " mov r3, #0x13\n" + " bl Menu_DrawStdWindowFrame\n" + " ldr r0, ._27\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl Menu_PrintText\n" + " ldr r0, ._27 + 4\n" + " bl SetMainCallback2\n" + " b ._26\n" + "._28:\n" + " .align 2, 0\n" + "._27:\n" + " .word gSystemText_BackupDamagedGameContinue\n" + " .word CB2_GameplayCannotBeContinued+1\n" + "._22:\n" + " ldr r0, ._29\n" + " mov r1, #0x2\n" + " mov r2, #0xb\n" + " bl Menu_PrintText\n" + "._23:\n" + " ldr r0, ._29 + 4\n" + " bl SetMainCallback2\n" + "._26:\n" + " pop {r4, r5}\n" + " pop {r0}\n" + " bx r0\n" + "._30:\n" + " .align 2, 0\n" + "._29:\n" + " .word gSystemText_SaveCompletedPressA\n" + " .word CB2_FadeAndReturnToTitleScreen+1\n" + "\n" + ); +} +#else static void CB2_WipeSave(void) { u8 wipeTries = 0; @@ -198,8 +345,9 @@ static void CB2_WipeSave(void) SetMainCallback2(CB2_FadeAndReturnToTitleScreen); } +#endif -static void CB2_GameplayCannotBeContinued(void) +/*static*/ void CB2_GameplayCannotBeContinued(void) { gSaveFailedClockInfo[0] = FALSE; @@ -264,6 +412,41 @@ static void VBlankCB_UpdateClockGraphics(void) gSaveFailedClockInfo[1]--; } +#if DEBUG +__attribute__((naked)) +bool8 VerifySectorWipe(u16 sector) +{ + asm( + " push {lr}\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " ldr r2, ._50\n" + " mov r3, #0x80\n" + " lsl r3, r3, #0x5\n" + " mov r1, #0x0\n" + " bl gMysteryEventScriptCmdTableEnd+0x2d64\n" + " mov r0, #0x0\n" + " ldr r1, ._50 + 4\n" + "._49:\n" + " add r0, r0, #0x1\n" + " lsl r0, r0, #0x10\n" + " lsr r0, r0, #0x10\n" + " cmp r0, r1\n" + " bls ._49 @cond_branch\n" + " ldr r0, ._50 + 8\n" + " ldrb r0, [r0]\n" + " pop {r1}\n" + " bx r1\n" + "._51:\n" + " .align 2, 0\n" + "._50:\n" + " .word +0x2000000\n" + " .word 0x3ff\n" + " .word gUnknown_Debug_03004BD0\n" + "\n" + ); +} +#else static bool8 VerifySectorWipe(u16 sector) { u32 *ptr = (u32 *)&gSharedMem; @@ -277,6 +460,7 @@ static bool8 VerifySectorWipe(u16 sector) return FALSE; } +#endif static bool8 WipeSector(u16 sector) { @@ -294,7 +478,7 @@ static bool8 WipeSector(u16 sector) return failed; } -static bool8 WipeSectors(u32 sectorBits) +/*static*/ bool8 WipeSectors(u32 sectorBits) { u16 i; diff --git a/src/field/party_menu.c b/src/field/party_menu.c index e26b801bc..b76710a2d 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -107,6 +107,69 @@ EWRAM_DATA u8 gUnknown_0202E8F6 = 0; EWRAM_DATA u16 gUnknown_0202E8F8 = 0; EWRAM_DATA u8 gPartyMenuType = 0; +#if 0 +const u16 TMHMMoves[] = +{ + 0x5016, + 0x030D, + 0x3DFF, + MOVE_CALM_MIND, + MOVE_ROAR, + MOVE_TOXIC, + MOVE_HAIL, + MOVE_BULK_UP, + MOVE_BULLET_SEED, + MOVE_HIDDEN_POWER, + MOVE_SUNNY_DAY, + MOVE_TAUNT, + MOVE_ICE_BEAM, + MOVE_BLIZZARD, + MOVE_HYPER_BEAM, + MOVE_LIGHT_SCREEN, + MOVE_PROTECT, + MOVE_RAIN_DANCE, + MOVE_GIGA_DRAIN, + MOVE_SAFEGUARD, + MOVE_FRUSTRATION, + MOVE_SOLAR_BEAM, + MOVE_IRON_TAIL, + MOVE_THUNDERBOLT, + MOVE_THUNDER, + MOVE_EARTHQUAKE, + MOVE_RETURN, + MOVE_DIG, + MOVE_PSYCHIC, + MOVE_SHADOW_BALL, + MOVE_BRICK_BREAK, + MOVE_DOUBLE_TEAM, + MOVE_REFLECT, + MOVE_SHOCK_WAVE, + MOVE_FLAMETHROWER, + MOVE_SLUDGE_BOMB, + MOVE_SANDSTORM, + MOVE_FIRE_BLAST, + MOVE_ROCK_TOMB, + MOVE_AERIAL_ACE, + MOVE_TORMENT, + MOVE_FACADE, + MOVE_SECRET_POWER, + MOVE_REST, + MOVE_ATTRACT, + MOVE_THIEF, + MOVE_STEEL_WING, + MOVE_SKILL_SWAP, + MOVE_SNATCH, + MOVE_OVERHEAT, + MOVE_CUT, + MOVE_FLY, + MOVE_SURF, + MOVE_STRENGTH, + MOVE_FLASH, + MOVE_ROCK_SMASH, + MOVE_WATERFALL, + MOVE_DIVE, +}; +#else const u16 TMHMMoves[] = { MOVE_FOCUS_PUNCH, @@ -168,6 +231,7 @@ const u16 TMHMMoves[] = MOVE_WATERFALL, MOVE_DIVE, }; +#endif //FIXME //const u8 *unrefTileBuffer = gTileBuffer; -- cgit v1.2.3 From b85e23c15a5cbdd88d6c3111d2f54de0a2adac35 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 18 Jan 2018 17:07:11 -0600 Subject: add some debug data --- data/unk_debug_menu_3.s | 103 +++++++++++++++++++++++++++++++++++++++ ld_script.txt | 3 +- src/debug/unk_debug_menu_3.c | 39 +++++++++------ src/engine/menu_cursor.c | 9 ++++ src/engine/reset_rtc_screen.c | 7 +++ src/field/field_effect_helpers.c | 2 - src/field/party_menu.c | 64 ------------------------ src/field/pokeblock.c | 5 ++ src/pokemon/mail.c | 12 ++--- 9 files changed, 155 insertions(+), 89 deletions(-) create mode 100644 data/unk_debug_menu_3.s diff --git a/data/unk_debug_menu_3.s b/data/unk_debug_menu_3.s new file mode 100644 index 000000000..cb98f9bbf --- /dev/null +++ b/data/unk_debug_menu_3.s @@ -0,0 +1,103 @@ + .section .rodata + +Str_842E238: @ 0x842E238 + .string "タマゴ$" + +.if DEBUG + +Str_842E23C: @ 0x842E23C + .string "ガイブ$" + +Str_842E240: @ 0x842E240 + .string "ENGLISH$" + +Str_842E248: @ 0x842E248 + .string "TOURNAMENT$" + +Str_842E253: @ 0x842E253 + .string " そら  カードイー$" + +Str_842E25E: @ 0x842E25E + .string "ポケコッコ$" + +Str_842E264: @ 0x842E264 + .string "ticket$" + +Str_842E26B: @ 0x842E26B + .string "{PKMN}$" + +Str_842E26E: @ 0x842E26E + .string "wrong {PKMN}$" + +Str_842E277: @ 0x842E277 + .string "ribbon$" + +Str_842E27E: @ 0x842E27E + .string "DEX$" + +Str_842E282: @ 0x842E282 + .string "message$" + +Str_842E28A: @ 0x842E28A + .string "egg$" + +Str_842E28E: @ 0x842E28E + .string "RAM seed$" + +Str_842E297: @ 0x842E297 + .string "trainer$" + +Str_842E29F: @ 0x842E29F + .string "clock$" + +Str_842E2A5: @ 0x842E2A5 + .string "item$" + +Str_842E2AA: @ 0x842E2AA + .string "goods$" + +Str_842E2B0: @ 0x842E2B0 + .string "potion$" + +Str_842E2B7: @ 0x842E2B7 + .string "ball$" + +Str_842E2BC: @ 0x842E2BC + .string "cheri berry$" + +Str_842E2C8: @ 0x842E2C8 + .string "TM01$" + + .align 2 +_842E2D0:: + .4byte Str_842E264, debug_sub_813C404+1 + .4byte Str_842E26B, debug_sub_813C810+1 + .4byte Str_842E26E, debug_sub_813C888+1 + .4byte Str_842E277, debug_sub_813C430+1 + .4byte Str_842E27E, debug_sub_813C488+1 + .4byte Str_842E282, debug_sub_813C45C+1 + .4byte Str_842E28A, debug_sub_813C740+1 + .4byte Str_842E28E, debug_sub_813C5B4+1 + .4byte Str_842E297, debug_sub_813C93C+1 + .4byte Str_842E29F, debug_sub_813C4B4+1 + .4byte Str_842E2A5, debug_sub_813C4D4+1 + .4byte Str_842E2AA, debug_sub_813C500+1 + .4byte Str_842E2B0, debug_sub_813C580+1 + .4byte Str_842E2B7, debug_sub_813C58C+1 + .4byte Str_842E2BC, debug_sub_813C598+1 + .4byte Str_842E2C8, debug_sub_813C5A4+1 + +_842E350:: + .4byte 0x10 + .4byte _845DAE1 + .4byte _845DDB2 + .4byte _845E306 + .4byte _845E3E0 + .4byte _845E3E0 + .4byte _845E402 + .4byte _845E402 + .4byte _845E422 + .4byte _845E422 + .4byte _845E443 + +.endif diff --git a/ld_script.txt b/ld_script.txt index 356ece4f4..cbb91e209 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -589,7 +589,6 @@ SECTIONS { src/field/fldeff_decoration.o(.rodata); src/field/fldeff_recordmixing.o(.rodata); src/field/field_special_scene.o(.rodata); - src/battle/battle_records.o(.rodata); src/field/rotating_gate.o(.rodata); src/field/item_use.o(.rodata); data/battle_anim_80CA710.o(.rodata); @@ -617,6 +616,7 @@ SECTIONS { src/field/fldeff_flash.o(.rodata); src/engine/time_events.o(.rodata); src/field/field_specials.o(.rodata); + src/battle/battle_records.o(.rodata); data/pokedex_area_screen.o(.rodata); src/scene/evolution_scene.o(.rodata); data/roulette.o(.rodata); @@ -628,6 +628,7 @@ SECTIONS { src/field/choose_party.o(.rodata); src/scene/cable_car.o(.rodata); src/engine/save.o(.rodata); + data/unk_debug_menu_3.o(.rodata); src/field/field_effect_helpers.o(.rodata); src/contest_ai.o(.rodata); src/battle/battle_controller_safari.o(.rodata); diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c index dfb92feb9..fe2e6317e 100644 --- a/src/debug/unk_debug_menu_3.c +++ b/src/debug/unk_debug_menu_3.c @@ -1,5 +1,10 @@ +#include "global.h" +#include "menu.h" + +#if DEBUG + __attribute__((naked)) -void debug_sub_813C404() +int debug_sub_813C404() { asm( " push {r4, r5, r6, lr}\n" @@ -27,7 +32,7 @@ void debug_sub_813C404() } __attribute__((naked)) -void debug_sub_813C430() +int debug_sub_813C430() { asm( " push {r4, r5, r6, lr}\n" @@ -55,7 +60,7 @@ void debug_sub_813C430() } __attribute__((naked)) -void debug_sub_813C45C() +int debug_sub_813C45C() { asm( " push {r4, r5, r6, lr}\n" @@ -83,7 +88,7 @@ void debug_sub_813C45C() } __attribute__((naked)) -void debug_sub_813C488() +int debug_sub_813C488() { asm( " push {r4, r5, r6, lr}\n" @@ -111,7 +116,7 @@ void debug_sub_813C488() } __attribute__((naked)) -void debug_sub_813C4B4() +int debug_sub_813C4B4() { asm( " push {r4, lr}\n" @@ -134,7 +139,7 @@ void debug_sub_813C4B4() } __attribute__((naked)) -void debug_sub_813C4D4() +int debug_sub_813C4D4() { asm( " push {r4, r5, r6, lr}\n" @@ -162,7 +167,7 @@ void debug_sub_813C4D4() } __attribute__((naked)) -void debug_sub_813C500() +int debug_sub_813C500() { asm( " push {r4, r5, r6, lr}\n" @@ -237,7 +242,7 @@ void debug_sub_813C52C() } __attribute__((naked)) -void debug_sub_813C580() +int debug_sub_813C580() { asm( " push {lr}\n" @@ -250,7 +255,7 @@ void debug_sub_813C580() } __attribute__((naked)) -void debug_sub_813C58C() +int debug_sub_813C58C() { asm( " push {lr}\n" @@ -263,7 +268,7 @@ void debug_sub_813C58C() } __attribute__((naked)) -void debug_sub_813C598() +int debug_sub_813C598() { asm( " push {lr}\n" @@ -276,7 +281,7 @@ void debug_sub_813C598() } __attribute__((naked)) -void debug_sub_813C5A4() +int debug_sub_813C5A4() { asm( " push {lr}\n" @@ -293,7 +298,7 @@ void debug_sub_813C5A4() } __attribute__((naked)) -void debug_sub_813C5B4() +int debug_sub_813C5B4() { asm( " push {r4, r5, r6, r7, lr}\n" @@ -498,7 +503,7 @@ void debug_sub_813C6AC() } __attribute__((naked)) -void debug_sub_813C740() +int debug_sub_813C740() { asm( " push {r4, r5, r6, lr}\n" @@ -596,7 +601,7 @@ void debug_sub_813C740() } __attribute__((naked)) -void debug_sub_813C810() +int debug_sub_813C810() { asm( " push {r4, r5, r6, lr}\n" @@ -656,7 +661,7 @@ void debug_sub_813C810() } __attribute__((naked)) -void debug_sub_813C888() +int debug_sub_813C888() { asm( " push {r4, r5, r6, lr}\n" @@ -752,7 +757,7 @@ void debug_sub_813C904() } __attribute__((naked)) -void debug_sub_813C93C() +int debug_sub_813C93C() { asm( " push {r4, r5, r6, lr}\n" @@ -795,3 +800,5 @@ void debug_sub_813C93C() ); } +#endif + diff --git a/src/engine/menu_cursor.c b/src/engine/menu_cursor.c index 35116d40b..ae4d5b14a 100644 --- a/src/engine/menu_cursor.c +++ b/src/engine/menu_cursor.c @@ -11,6 +11,15 @@ EWRAM_DATA static u8 gUnknown_0203A3D2 = 0; EWRAM_DATA static u8 gUnknown_0203A3D3 = 0; EWRAM_DATA static u8 gUnknown_0203A3D4 = 0; +#if DEBUG +//const u8 gEmptySpace_08459A8C[0x1C0] = {0}; +//const u8 gEmptySpace_08459A8C[0xE300-0xC700] = {0}; +asm(".section .rodata\n\ + .global gEmptySpace_08459A8C\n\ +gEmptySpace_08459A8C:\n\ + .incbin \"pokeruby_de_debug.gba\", 0x459A8C, 0x1C00"); +#endif + #if ENGLISH #include "../src/data/menu_cursor_en.h" #elif GERMAN diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 0cfa1e71a..cda73f96b 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -147,6 +147,13 @@ const struct SpriteTemplate gSpriteTemplate_83764E8 = const u8 gUnknown_08376500[] = _(" : "); +#if DEBUG +const u8 gUnknown_Debug_0839AE94[] = _("にっすう"); +const u8 gUnknown_Debug_0839AE99[] = _("じかん"); +const u8 gUnknown_Debug_0839AE9D[] = _("ゲームない じかん"); +const u8 gUnknown_Debug_0839AEA7[] = _("RTC じかん"); +#endif + void SpriteCB_ResetRtcCusor0(struct Sprite *sprite) { int state = gTasks[sprite->data[0]].data[2]; diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c index 165829a55..e2514df90 100644 --- a/src/field/field_effect_helpers.c +++ b/src/field/field_effect_helpers.c @@ -29,8 +29,6 @@ static void sub_81280A0(struct MapObject *, struct Sprite *, struct Sprite *); static void sub_8128174(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); -const u8 UnusedEggString_8401E28[] = _("タマゴ"); - void SetUpReflection(struct MapObject *mapObject, struct Sprite *sprite, bool8 flag) { struct Sprite *newSprite; diff --git a/src/field/party_menu.c b/src/field/party_menu.c index b76710a2d..e26b801bc 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -107,69 +107,6 @@ EWRAM_DATA u8 gUnknown_0202E8F6 = 0; EWRAM_DATA u16 gUnknown_0202E8F8 = 0; EWRAM_DATA u8 gPartyMenuType = 0; -#if 0 -const u16 TMHMMoves[] = -{ - 0x5016, - 0x030D, - 0x3DFF, - MOVE_CALM_MIND, - MOVE_ROAR, - MOVE_TOXIC, - MOVE_HAIL, - MOVE_BULK_UP, - MOVE_BULLET_SEED, - MOVE_HIDDEN_POWER, - MOVE_SUNNY_DAY, - MOVE_TAUNT, - MOVE_ICE_BEAM, - MOVE_BLIZZARD, - MOVE_HYPER_BEAM, - MOVE_LIGHT_SCREEN, - MOVE_PROTECT, - MOVE_RAIN_DANCE, - MOVE_GIGA_DRAIN, - MOVE_SAFEGUARD, - MOVE_FRUSTRATION, - MOVE_SOLAR_BEAM, - MOVE_IRON_TAIL, - MOVE_THUNDERBOLT, - MOVE_THUNDER, - MOVE_EARTHQUAKE, - MOVE_RETURN, - MOVE_DIG, - MOVE_PSYCHIC, - MOVE_SHADOW_BALL, - MOVE_BRICK_BREAK, - MOVE_DOUBLE_TEAM, - MOVE_REFLECT, - MOVE_SHOCK_WAVE, - MOVE_FLAMETHROWER, - MOVE_SLUDGE_BOMB, - MOVE_SANDSTORM, - MOVE_FIRE_BLAST, - MOVE_ROCK_TOMB, - MOVE_AERIAL_ACE, - MOVE_TORMENT, - MOVE_FACADE, - MOVE_SECRET_POWER, - MOVE_REST, - MOVE_ATTRACT, - MOVE_THIEF, - MOVE_STEEL_WING, - MOVE_SKILL_SWAP, - MOVE_SNATCH, - MOVE_OVERHEAT, - MOVE_CUT, - MOVE_FLY, - MOVE_SURF, - MOVE_STRENGTH, - MOVE_FLASH, - MOVE_ROCK_SMASH, - MOVE_WATERFALL, - MOVE_DIVE, -}; -#else const u16 TMHMMoves[] = { MOVE_FOCUS_PUNCH, @@ -231,7 +168,6 @@ const u16 TMHMMoves[] = MOVE_WATERFALL, MOVE_DIVE, }; -#endif //FIXME //const u8 *unrefTileBuffer = gTileBuffer; diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 73fa53d97..b69d8ac06 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -233,6 +233,11 @@ const struct Pokeblock gUnknown_083F7F9C[] = { PBLOCK_CLR_YELLOW, 0, 0, 0, 0, 20, 20} }; +#if DEBUG +// possibly continuation of gUnknown_083F7F9C? +asm(".incbin \"baserom_de_debug.gba\", 0x424128, 0x50"); +#endif + // text static void sub_810B674(void) diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 1ad8d8376..160bce913 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -298,13 +298,13 @@ const u8 Str_841160F[] = _("{STR_VAR_1} {STR_VAR_2}"); const u8 Str_841161A[] = _("メール{STR_VAR_1} {STR_VAR_2}"); const u8 Str_8411623[] = _("メール{STR_VAR_1}を だれに もたせる?"); const u8 Str_8411634[] = _("000 {STR_VAR_1}"); -const u8 Str_841163B[] = _("せいきの データが とうろくずみ です\n"); -const u8 Str_841163B_after[] = _("しんき とうろく できません"); -const u8 Str_841165E[] = _("せいきに とうろくされたメールデータは\n"); -const u8 Str_841165E_after[] = _("へんこう できません"); +const u8 Str_841163B[] = _("せいきの データが とうろくずみ です\n" + "しんき とうろく できません"); +const u8 Str_841165E[] = _("せいきに とうろくされたメールデータは\n" + "へんこう できません"); const u8 Str_841167D[] = _("メール{STR_VAR_1} とうろく かいじょ"); -const u8 Str_841168D[] = _("デバッグメニューから とうろくした\n"); -const u8 Str_841168D_after[] = _("メール いがいは けせません"); +const u8 Str_841168D[] = _("デバッグメニューから とうろくした\n" + "メール いがいは けせません"); const u8 Str_84116AE[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); const struct MenuAction _84116BC[] = -- cgit v1.2.3 From 6553903150b6ee262bead5d8c7c5b304bd323fb2 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 18 Jan 2018 18:56:44 -0600 Subject: start labeling field_weather --- include/constants/weather.h | 4 +- include/field_weather.h | 35 ++++--- src/field/coord_event_weather.c | 4 +- src/field/field_weather.c | 193 ++++++++++++++++++-------------------- src/field/field_weather_effects.c | 60 ++++++------ 5 files changed, 149 insertions(+), 147 deletions(-) diff --git a/include/constants/weather.h b/include/constants/weather.h index 946316984..1110be7a2 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -12,7 +12,7 @@ #define WEATHER_SANDSTORM 8 #define WEATHER_FOG_2 9 #define WEATHER_FOG_3 10 -#define WEATHER_DARK 11 +#define WEATHER_SHADE 11 #define WEATHER_DROUGHT 12 #define WEATHER_RAIN_HEAVY 13 #define WEATHER_BUBBLES 14 @@ -31,7 +31,7 @@ #define COORD_EVENT_WEATHER_FOG_2 7 #define COORD_EVENT_WEATHER_ASH 8 #define COORD_EVENT_WEATHER_SANDSTORM 9 -#define COORD_EVENT_WEATHER_DARK 10 +#define COORD_EVENT_WEATHER_SHADE 10 #define COORD_EVENT_WEATHER_DROUGHT 11 #define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21 diff --git a/include/field_weather.h b/include/field_weather.h index 267650a2a..2c56a5a40 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -29,11 +29,11 @@ struct Weather u8 filler4A0[0x6B6-0x4A0]; s8 unknown_6B6; u8 filler_6B7[0xC0-0xB7]; - s8 unknown_6C0; - s8 unknown_6C1; - u8 unknown_6C2; - u8 unknown_6C3; - u16 unknown_6C4; + s8 gammaIndex; + s8 gammaTargetIndex; + u8 gammaStepDelay; + u8 gammaStepFrameCounter; + u16 fadeDestColor; u8 unknown_6C6; u8 unknown_6C7; u8 unknown_6C8; @@ -128,18 +128,27 @@ void nullsub_38(void); void sub_807CB10(void); void sub_807CC24(void); void sub_807CCAC(void); -u8 sub_807CDC4(void); -u8 sub_807CE24(void); -u8 sub_807CE7C(void); +u8 RainSnowShadeBlend_807CDC4(void); +u8 DroughtBlend_807CE24(void); +u8 Fog1Blend_807CE7C(void); void nullsub_39(void); // ASM -void sub_807CEBC(u8, u8, s8); -//void sub_807D1BC(u8, u8, u8, u8, u16); -void sub_807D1BC(u8 a, u8 a2, s8 c, u8 d, u16 e); -void sub_807D304(s8 a, u8 arg2, u16 c); -void sub_807D424(u8, u16); +void BlendSomething_807CEBC(u8, u8, s8); +//void BlendSomething_807D1BC(u8, u8, u8, u8, u16); +void BlendSomething_807D1BC(u8 a, u8 a2, s8 c, u8 d, u16 e); +void BlendSomething_807D304(s8 a, u8 arg2, u16 c); +void BlendSomething_807D424(u8, u16); // ... + +enum +{ + FADE_FROM_BLACK, + FADE_TO_BLACK, + FADE_FROM_WHITE, + FADE_TO_WHITE, +}; + void fade_screen(u8, u8); // ... void sub_807D78C(u8 tag); diff --git a/src/field/coord_event_weather.c b/src/field/coord_event_weather.c index db4e9c161..60b87fa30 100644 --- a/src/field/coord_event_weather.c +++ b/src/field/coord_event_weather.c @@ -34,7 +34,7 @@ static const struct CoordEventWeather sCoordEventWeatherFuncs[] = { COORD_EVENT_WEATHER_FOG_2, CoordEventWeather_DiagonalFog }, { COORD_EVENT_WEATHER_ASH, CoordEventWeather_Ash }, { COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm }, - { COORD_EVENT_WEATHER_DARK, CoordEventWeather_Dark }, + { COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Dark }, { COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought }, { COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle }, { COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle }, @@ -87,7 +87,7 @@ static void CoordEventWeather_Sandstorm(void) static void CoordEventWeather_Dark(void) { - SetWeather(WEATHER_DARK); + SetWeather(WEATHER_SHADE); } static void CoordEventWeather_Drought(void) diff --git a/src/field/field_weather.c b/src/field/field_weather.c index b6475d8ff..5f3f93096 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -13,7 +13,7 @@ #include "trig.h" #include "ewram.h" -#define MACRO1(a) ((((a) >> 1) & 0xF) | (((a) >> 2) & 0xF0) | (((a) >> 3) & 0xF00)) +#define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) struct RGBColor { @@ -108,10 +108,10 @@ void Fog1_InitVars(void); void Fog1_Main(void); void Fog1_InitAll(void); bool8 Fog1_Finish(void); -void Weather11_InitVars(void); -void Weather11_Main(void); -void Weather11_InitAll(void); -bool8 Weather11_Finish(void); +void Shade_InitVars(void); +void Shade_Main(void); +void Shade_InitAll(void); +bool8 Shade_Finish(void); void Drought_InitVars(void); void Drought_Main(void); void Drought_InitAll(void); @@ -138,7 +138,7 @@ static const struct WeatherCallbacks sWeatherFuncs[] = {Sandstorm_InitVars, Sandstorm_Main, Sandstorm_InitAll, Sandstorm_Finish}, {Fog2_InitVars, Fog2_Main, Fog2_InitAll, Fog2_Finish}, {Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish}, - {Weather11_InitVars, Weather11_Main, Weather11_InitAll, Weather11_Finish}, + {Shade_InitVars, Shade_Main, Shade_InitAll, Shade_Finish}, {Drought_InitVars, Drought_Main, Drought_InitAll, Drought_Finish}, {HeavyRain_InitVars, Rain_Main, HeavyRain_InitAll, Rain_Finish}, {Bubbles_InitVars, Bubbles_Main, Bubbles_InitAll, Bubbles_Finish}, @@ -152,7 +152,7 @@ void (*const gUnknown_083970B8[])(void) = nullsub_39, }; -const u8 gUnknown_083970C8[] = +const u8 gUnknown_083970C8[32] = { 1, 1, @@ -193,6 +193,7 @@ const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); void StartWeather(void) { u8 index; + if (!FuncIsActiveTask(Task_WeatherMain)) { index = AllocSpritePalette(0x1200); @@ -266,7 +267,7 @@ void Task_WeatherMain(u8 taskId) if (!sWeatherFuncs[gWeatherPtr->currWeather].finish()) { sWeatherFuncs[gWeatherPtr->nextWeather].initVars(); - gWeatherPtr->unknown_6C3 = 0; + gWeatherPtr->gammaStepFrameCounter = 0; gWeatherPtr->unknown_6C6 = 0; gWeatherPtr->currWeather = gWeatherPtr->nextWeather; gWeatherPtr->unknown_6D3 = 1; @@ -281,8 +282,8 @@ void Task_WeatherMain(u8 taskId) void None_Init(void) { - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 0; } void None_Main(void) @@ -315,7 +316,7 @@ void sub_807CB10(void) else v1 = gWeatherPtr->unk460; - for (v2 = 0; (u16)v2 <= 0x1f; v2++) + for (v2 = 0; v2 < 32; v2++) { v4 = v2 << 8; if (v0 == 0) @@ -334,33 +335,27 @@ void sub_807CB10(void) v10 += 0xf; } v11 = v10 >> 4; - if (v2 <= 0xb) + if (v2 < 12) { - for (; v6 <= 0x12; v6++) + for (; v6 < 19; v6++) { v4 += v11; dunno = v4 - v9; if (dunno > 0) - { v4 -= (dunno + ((u16)dunno >> 15)) >> 1; - } v1[v6][v2] = v4 >> 8; if (v1[v6][v2] > 0x1f) - { v1[v6][v2] = 0x1f; - } } } else { - for (; v6 <= 0x12; v6++) + for (; v6 < 19; v6++) { v4 += v11; v1[v6][v2] = v4 >> 8; if (v1[v6][v2] > 0x1f) - { v1[v6][v2] = 0x1f; - } } } } @@ -369,20 +364,20 @@ void sub_807CB10(void) void sub_807CC24(void) { - if (gWeatherPtr->unknown_6C0 == gWeatherPtr->unknown_6C1) + if (gWeatherPtr->gammaIndex == gWeatherPtr->gammaTargetIndex) { gWeatherPtr->unknown_6C6 = 3; } else { - if (++gWeatherPtr->unknown_6C3 >= gWeatherPtr->unknown_6C2) + if (++gWeatherPtr->gammaStepFrameCounter >= gWeatherPtr->gammaStepDelay) { - gWeatherPtr->unknown_6C3 = 0; - if (gWeatherPtr->unknown_6C0 < gWeatherPtr->unknown_6C1) - gWeatherPtr->unknown_6C0++; + gWeatherPtr->gammaStepFrameCounter = 0; + if (gWeatherPtr->gammaIndex < gWeatherPtr->gammaTargetIndex) + gWeatherPtr->gammaIndex++; else - gWeatherPtr->unknown_6C0--; - sub_807CEBC(0, 0x20, gWeatherPtr->unknown_6C0); + gWeatherPtr->gammaIndex--; + BlendSomething_807CEBC(0, 0x20, gWeatherPtr->gammaIndex); } } } @@ -397,24 +392,24 @@ void sub_807CCAC(void) case WEATHER_RAIN_MED: case WEATHER_RAIN_HEAVY: case WEATHER_SNOW: - case WEATHER_DARK: - if (sub_807CDC4() == 0) + case WEATHER_SHADE: + if (RainSnowShadeBlend_807CDC4() == 0) { - gWeatherPtr->unknown_6C0 = 3; + gWeatherPtr->gammaIndex = 3; gWeatherPtr->unknown_6C6 = 3; } break; case WEATHER_DROUGHT: - if (sub_807CE24() == 0) + if (DroughtBlend_807CE24() == 0) { - gWeatherPtr->unknown_6C0 = -6; + gWeatherPtr->gammaIndex = -6; gWeatherPtr->unknown_6C6 = 3; } break; case WEATHER_FOG_1: - if (sub_807CE7C() == 0) + if (Fog1Blend_807CE7C() == 0) { - gWeatherPtr->unknown_6C0 = 0; + gWeatherPtr->gammaIndex = 0; gWeatherPtr->unknown_6C6 = 3; } break; @@ -425,47 +420,47 @@ void sub_807CCAC(void) default: if (!gPaletteFade.active) { - gWeatherPtr->unknown_6C0 = gWeatherPtr->unknown_6C1; + gWeatherPtr->gammaIndex = gWeatherPtr->gammaTargetIndex; gWeatherPtr->unknown_6C6 = 3; } break; } } -u8 sub_807CDC4(void) +u8 RainSnowShadeBlend_807CDC4(void) { if (gWeatherPtr->unknown_6C7 == 0x10) return 0; if (++gWeatherPtr->unknown_6C7 >= 0x10) { - sub_807CEBC(0, 0x20, 3); + BlendSomething_807CEBC(0, 0x20, 3); gWeatherPtr->unknown_6C7 = 0x10; return 0; } - sub_807D1BC(0, 0x20, 3, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->unknown_6C4); + BlendSomething_807D1BC(0, 0x20, 3, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); return 1; } -u8 sub_807CE24(void) +u8 DroughtBlend_807CE24(void) { if (gWeatherPtr->unknown_6C7 == 0x10) return 0; if (++gWeatherPtr->unknown_6C7 >= 0x10) { - sub_807CEBC(0, 0x20, -6); + BlendSomething_807CEBC(0, 0x20, -6); gWeatherPtr->unknown_6C7 = 0x10; return 0; } - sub_807D304(-6, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->unknown_6C4); + BlendSomething_807D304(-6, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); return 1; } -u8 sub_807CE7C(void) +u8 Fog1Blend_807CE7C(void) { if (gWeatherPtr->unknown_6C7 == 0x10) return 0; ++gWeatherPtr->unknown_6C7; - sub_807D424(0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->unknown_6C4); + BlendSomething_807D424(0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); return 1; } @@ -473,7 +468,7 @@ void nullsub_39(void) { } -void sub_807CEBC(u8 a, u8 b, s8 c) +void BlendSomething_807CEBC(u8 a, u8 b, s8 c) { u16 r4; u16 palOffset; @@ -578,7 +573,7 @@ void sub_807CEBC(u8 a, u8 b, s8 c) } } -void sub_807D1BC(u8 a1, u8 a2, s8 c, u8 d, u16 e) +void BlendSomething_807D1BC(u8 a1, u8 a2, s8 c, u8 d, u16 e) { u16 palOffset; u16 r4; @@ -625,7 +620,7 @@ void sub_807D1BC(u8 a1, u8 a2, s8 c, u8 d, u16 e) } } -void sub_807D304(s8 a, u8 coeff, u16 c) +void BlendSomething_807D304(s8 a, u8 coeff, u16 c) { struct RGBColor color; u8 r_; @@ -681,31 +676,30 @@ void sub_807D304(s8 a, u8 coeff, u16 c) bool8 sub_807D574(u8); -void sub_807D424(u8 a, u16 b) +void BlendSomething_807D424(u8 coeff, u16 blendColor) { struct RGBColor color; - u8 r_; - u8 g_; - u8 b_; - u16 r4; - - BlendPalette(0, 0x100, a, b); - color = *(struct RGBColor *)&b; - r_ = color.r; - g_ = color.g; - b_ = color.b; - - r4 = 16; - while (r4 < 32) + u8 blendR; + u8 blendG; + u8 blendB; + u16 palNum; + + BlendPalette(0, 0x100, coeff, blendColor); + color = *(struct RGBColor *)&blendColor; + blendR = color.r; + blendG = color.g; + blendB = color.b; + + for (palNum = 16; palNum < 32; palNum++) { - if (sub_807D574(r4)) + if (sub_807D574(palNum)) { - u16 r12 = (r4 + 1) * 16; - u16 r6 = r4 * 16; + u16 palEnd = (palNum + 1) * 16; + u16 palOffset = palNum * 16; - while (r6 < r12) + while (palOffset < palEnd) { - struct RGBColor color = *(struct RGBColor *)&gPlttBufferUnfaded[r6]; + struct RGBColor color = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; u8 r = color.r; u8 g = color.g; u8 b = color.b; @@ -714,19 +708,18 @@ void sub_807D424(u8 a, u16 b) g += ((31 - g) * 3) >> 2; b += ((28 - b) * 3) >> 2; - r += ((r_ - r) * a) >> 4; - g += ((g_ - g) * a) >> 4; - b += ((b_ - b) * a) >> 4; + r += ((blendR - r) * coeff) >> 4; + g += ((blendG - g) * coeff) >> 4; + b += ((blendB - b) * coeff) >> 4; - gPlttBufferFaded[r6] = (b << 10) | (g << 5) | r; - r6++; + gPlttBufferFaded[palOffset] = (b << 10) | (g << 5) | r; + palOffset++; } } else { - BlendPalette(r4 * 16, 16, a, b); + BlendPalette(palNum * 16, 16, coeff, blendColor); } - r4++; } } @@ -755,8 +748,8 @@ void sub_807D5BC(s8 a) { if (gWeatherPtr->unknown_6C6 == 3) { - sub_807CEBC(0, 32, a); - gWeatherPtr->unknown_6C0 = a; + BlendSomething_807CEBC(0, 32, a); + gWeatherPtr->gammaIndex = a; } } @@ -765,37 +758,37 @@ void sub_807D5F0(u8 a, u8 b, u8 c) if (gWeatherPtr->unknown_6C6 == 3) { gWeatherPtr->unknown_6C6 = 0; - gWeatherPtr->unknown_6C0 = a; - gWeatherPtr->unknown_6C1 = b; - gWeatherPtr->unknown_6C3 = 0; - gWeatherPtr->unknown_6C2 = c; + gWeatherPtr->gammaIndex = a; + gWeatherPtr->gammaTargetIndex = b; + gWeatherPtr->gammaStepFrameCounter = 0; + gWeatherPtr->gammaStepDelay = c; sub_807D5BC(a); } } -void fade_screen(u8 a, u8 delay) +void fade_screen(u8 mode, u8 delay) { u32 fadeColor; - u32 r1; - u32 r2; + bool8 fadeTo; + bool8 useWeatherPal; - switch (a) + switch (mode) { - case 0: + case FADE_FROM_BLACK: fadeColor = 0; - r1 = 0; + fadeTo = FALSE; break; - case 2: + case FADE_FROM_WHITE: fadeColor = 0xFFFF; - r1 = 0; + fadeTo = FALSE; break; - case 1: + case FADE_TO_BLACK: fadeColor = 0; - r1 = 1; + fadeTo = TRUE; break; - case 3: + case FADE_TO_WHITE: fadeColor = 0xFFFF; - r1 = 1; + fadeTo = TRUE; break; default: return; @@ -808,26 +801,26 @@ void fade_screen(u8 a, u8 delay) case WEATHER_RAIN_HEAVY: case WEATHER_SNOW: case WEATHER_FOG_1: - case WEATHER_DARK: + case WEATHER_SHADE: case WEATHER_DROUGHT: - r2 = 1; + useWeatherPal = TRUE; break; default: - r2 = 0; + useWeatherPal = FALSE; break; } - if (r1 != 0) + if (fadeTo) { - if (r2 != 0) + if (useWeatherPal) CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor); gWeatherPtr->unknown_6C6 = 2; } else { - gWeatherPtr->unknown_6C4 = fadeColor; - if (r2 != 0) + gWeatherPtr->fadeDestColor = fadeColor; + if (useWeatherPal) gWeatherPtr->unknown_6C7 = 0; else BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor); @@ -858,7 +851,7 @@ void sub_807D78C(u8 a) sub_807D540(r4); r4 *= 16; for (i = 0; i < 16; i++) - gPlttBufferFaded[r4 + i] = gWeatherPtr->unknown_6C4; + gPlttBufferFaded[r4 + i] = gWeatherPtr->fadeDestColor; } break; case 2: @@ -869,7 +862,7 @@ void sub_807D78C(u8 a) default: if (gWeatherPtr->currWeather != WEATHER_FOG_1) { - sub_807CEBC(r4, 1, gWeatherPtr->unknown_6C0); + BlendSomething_807CEBC(r4, 1, gWeatherPtr->gammaIndex); } else { @@ -882,7 +875,7 @@ void sub_807D78C(u8 a) void sub_807D874(u8 a) { - sub_807CEBC(a, 1, gWeatherPtr->unknown_6C0); + BlendSomething_807CEBC(a, 1, gWeatherPtr->gammaIndex); } u8 unref_sub_807D894(void) diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c index 5a59d6c2a..154cd2e12 100644 --- a/src/field/field_weather_effects.c +++ b/src/field/field_weather_effects.c @@ -91,8 +91,8 @@ extern void sub_807D5F0(u8 a, u8 b, u8 c); void Clouds_InitVars(void) { - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; gWeatherPtr->initStep = 0; if (gWeatherPtr->cloudSpritesCreated == FALSE) @@ -159,8 +159,8 @@ bool8 Clouds_Finish(void) void Weather2_InitVars(void) { - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; } void Weather2_InitAll(void) @@ -236,8 +236,8 @@ void Drought_InitVars(void) { gWeatherPtr->initStep = 0; gWeatherPtr->weatherGfxLoaded = FALSE; - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 0; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 0; } void Drought_Main(void); @@ -368,8 +368,8 @@ void LightRain_InitVars(void) gWeatherPtr->unknown_6DB = 8; gWeatherPtr->unknown_6DC = 0; gWeatherPtr->unknown_6D9 = 10; - gWeatherPtr->unknown_6C1 = 3; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; SetRainStrengthFromSoundEffect(SE_T_KOAME); } @@ -885,8 +885,8 @@ void Snow_InitVars(void) { gWeatherPtr->initStep = 0; gWeatherPtr->weatherGfxLoaded = FALSE; - gWeatherPtr->unknown_6C1 = 3; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->unknown_6E5 = 16; gWeatherPtr->unknown_6E0 = 0; } @@ -1074,8 +1074,8 @@ void MedRain_InitVars(void) gWeatherPtr->unknown_6DB = 4; gWeatherPtr->unknown_6DC = 0; gWeatherPtr->unknown_6D9 = 16; - gWeatherPtr->unknown_6C1 = 3; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment gWeatherPtr->unknown_6ED = 0; SetRainStrengthFromSoundEffect(SE_T_AME); @@ -1102,8 +1102,8 @@ void HeavyRain_InitVars(void) gWeatherPtr->unknown_6DB = 4; gWeatherPtr->unknown_6DC = 1; gWeatherPtr->unknown_6D9 = 24; - gWeatherPtr->unknown_6C1 = 3; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment SetRainStrengthFromSoundEffect(SE_T_OOAME); } @@ -1296,8 +1296,8 @@ void Fog1_InitVars(void) { gWeatherPtr->initStep = 0; gWeatherPtr->weatherGfxLoaded = FALSE; - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; if (gWeatherPtr->fog1SpritesCreated == 0) { gWeatherPtr->unknown_6F0 = 0; @@ -1446,8 +1446,8 @@ void Ash_InitVars(void) { gWeatherPtr->initStep = 0; gWeatherPtr->weatherGfxLoaded = FALSE; - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->unknown_6FE = 20; if (!gWeatherPtr->ashSpritesCreated) { @@ -1634,8 +1634,8 @@ void Fog2_InitVars(void) { gWeatherPtr->initStep = 0; gWeatherPtr->weatherGfxLoaded = 0; - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->unknown_6F0 = 0; gWeatherPtr->unknown_6F2 = 1; if (gWeatherPtr->fog2SpritesCreated == 0) @@ -1835,8 +1835,8 @@ void Sandstorm_InitVars(void) { gWeatherPtr->initStep = 0; gWeatherPtr->weatherGfxLoaded = 0; - gWeatherPtr->unknown_6C1 = 0; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 0; + gWeatherPtr->gammaStepDelay = 20; if (gWeatherPtr->sandstormSprites1Created == 0) { gWeatherPtr->unknown_704 = gWeatherPtr->unknown_708 = 0; @@ -2113,26 +2113,26 @@ void SandstormSpriteCallback3(struct Sprite *sprite) } //------------------------------------------------------------------------------ -// Weather 11 +// Shade //------------------------------------------------------------------------------ -void Weather11_InitVars(void) +void Shade_InitVars(void) { gWeatherPtr->initStep = 0; - gWeatherPtr->unknown_6C1 = 3; - gWeatherPtr->unknown_6C2 = 20; + gWeatherPtr->gammaTargetIndex = 3; + gWeatherPtr->gammaStepDelay = 20; } -void Weather11_InitAll(void) +void Shade_InitAll(void) { - Weather11_InitVars(); + Shade_InitVars(); } -void Weather11_Main(void) +void Shade_Main(void) { } -bool8 Weather11_Finish(void) +bool8 Shade_Finish(void) { return FALSE; } -- cgit v1.2.3 From a0cb6c72b6ba7c1b2d2464f3c1ac04354d5d05de Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 18 Jan 2018 21:18:06 -0500 Subject: shop enum --- include/shop.h | 6 +++--- src/field/shop.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/shop.h b/include/shop.h index 76b68d0e9..80602e26c 100644 --- a/include/shop.h +++ b/include/shop.h @@ -20,9 +20,9 @@ enum // shop options enum { - BUY, - SELL, - EXIT + SHOP_BUY, + SHOP_SELL, + SHOP_EXIT }; struct MartInfo diff --git a/src/field/shop.c b/src/field/shop.c index beed50a41..a228ff92f 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -76,8 +76,8 @@ static const struct MenuAction2 sBuySellQuitMenuActions[] = { MartText_Quit2, Task_HandleShopMenuQuit }, }; -static const u8 gMartBuySellOptionList[] = {BUY, SELL, EXIT}; -static const u8 gMartBuyNoSellOptionList[] = {BUY, EXIT}; +static const u8 gMartBuySellOptionList[] = {SHOP_BUY, SHOP_SELL, SHOP_EXIT}; +static const u8 gMartBuyNoSellOptionList[] = {SHOP_BUY, SHOP_EXIT}; static const u16 gUnusedMartArray[] = {0x2, 0x3, 0x4, 0xD, 0x121, 0xE, 0xE, 0xE, 0xE, 0xE, 0xE, 0x0, 0x0}; -- cgit v1.2.3 From c9f2902f0ebce0cff90c9a06f9ae05b921b17448 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 19 Jan 2018 15:48:40 -0600 Subject: dump outline cursors for debug ROM --- .../outline_cursor_debug/outline_cursor_00.png | Bin 0 -> 78 bytes .../outline_cursor_debug/outline_cursor_01.png | Bin 0 -> 113 bytes .../outline_cursor_debug/outline_cursor_02.png | Bin 0 -> 113 bytes .../outline_cursor_debug/outline_cursor_03.png | Bin 0 -> 113 bytes .../outline_cursor_debug/outline_cursor_04.png | Bin 0 -> 113 bytes .../outline_cursor_debug/outline_cursor_05.png | Bin 0 -> 113 bytes .../outline_cursor_debug/outline_cursor_06.png | Bin 0 -> 113 bytes .../outline_cursor_debug/outline_cursor_07.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_08.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_09.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_10.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_11.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_12.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_13.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_14.png | Bin 0 -> 112 bytes .../outline_cursor_debug/outline_cursor_15.png | Bin 0 -> 111 bytes src/data/menu_cursor_de.h | 19 +++++++++++++++++++ src/engine/menu_cursor.c | 9 --------- 18 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_00.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_01.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_02.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_03.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_04.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_05.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_06.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_07.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_08.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_09.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_10.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_11.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_12.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_13.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_14.png create mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_15.png diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_00.png b/graphics/interface/outline_cursor_debug/outline_cursor_00.png new file mode 100644 index 000000000..8a0cb601e Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_00.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_01.png b/graphics/interface/outline_cursor_debug/outline_cursor_01.png new file mode 100644 index 000000000..06c691712 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_01.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_02.png b/graphics/interface/outline_cursor_debug/outline_cursor_02.png new file mode 100644 index 000000000..bbf2e3c11 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_02.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_03.png b/graphics/interface/outline_cursor_debug/outline_cursor_03.png new file mode 100644 index 000000000..ae0d96a01 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_03.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_04.png b/graphics/interface/outline_cursor_debug/outline_cursor_04.png new file mode 100644 index 000000000..80f3e5063 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_04.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_05.png b/graphics/interface/outline_cursor_debug/outline_cursor_05.png new file mode 100644 index 000000000..ec06e1daf Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_05.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_06.png b/graphics/interface/outline_cursor_debug/outline_cursor_06.png new file mode 100644 index 000000000..edab769fc Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_06.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_07.png b/graphics/interface/outline_cursor_debug/outline_cursor_07.png new file mode 100644 index 000000000..1404affb0 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_07.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_08.png b/graphics/interface/outline_cursor_debug/outline_cursor_08.png new file mode 100644 index 000000000..cfb72a578 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_08.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_09.png b/graphics/interface/outline_cursor_debug/outline_cursor_09.png new file mode 100644 index 000000000..4d8525a13 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_09.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_10.png b/graphics/interface/outline_cursor_debug/outline_cursor_10.png new file mode 100644 index 000000000..1bf65a4e1 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_10.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_11.png b/graphics/interface/outline_cursor_debug/outline_cursor_11.png new file mode 100644 index 000000000..e0545ffe2 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_11.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_12.png b/graphics/interface/outline_cursor_debug/outline_cursor_12.png new file mode 100644 index 000000000..b79b3cfe8 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_12.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_13.png b/graphics/interface/outline_cursor_debug/outline_cursor_13.png new file mode 100644 index 000000000..4ddef4874 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_13.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_14.png b/graphics/interface/outline_cursor_debug/outline_cursor_14.png new file mode 100644 index 000000000..34792f961 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_14.png differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_15.png b/graphics/interface/outline_cursor_debug/outline_cursor_15.png new file mode 100644 index 000000000..8f958c189 Binary files /dev/null and b/graphics/interface/outline_cursor_debug/outline_cursor_15.png differ diff --git a/src/data/menu_cursor_de.h b/src/data/menu_cursor_de.h index cd56f51d9..7be9e96aa 100644 --- a/src/data/menu_cursor_de.h +++ b/src/data/menu_cursor_de.h @@ -1,6 +1,24 @@ #ifndef GUARD_DATA_MENU_CURSOR_H #define GUARD_DATA_MENU_CURSOR_H +#if DEBUG +const u8 OutlineCursorTiles_00[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_00.4bpp"); +const u8 OutlineCursorTiles_01[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_01.4bpp"); +const u8 OutlineCursorTiles_02[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_02.4bpp"); +const u8 OutlineCursorTiles_03[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_03.4bpp"); +const u8 OutlineCursorTiles_04[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_04.4bpp"); +const u8 OutlineCursorTiles_05[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_05.4bpp"); +const u8 OutlineCursorTiles_06[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_06.4bpp"); +const u8 OutlineCursorTiles_07[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_07.4bpp"); +const u8 OutlineCursorTiles_08[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_08.4bpp"); +const u8 OutlineCursorTiles_09[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_09.4bpp"); +const u8 OutlineCursorTiles_10[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_10.4bpp"); +const u8 OutlineCursorTiles_11[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_11.4bpp"); +const u8 OutlineCursorTiles_12[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_12.4bpp"); +const u8 OutlineCursorTiles_13[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_13.4bpp"); +const u8 OutlineCursorTiles_14[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_14.4bpp"); +const u8 OutlineCursorTiles_15[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_15.4bpp"); +#else const u8 OutlineCursorTiles_00[] = INCBIN_U8("graphics/interface/outline_cursor_00.4bpp"); const u8 OutlineCursorTiles_01[] = INCBIN_U8("graphics/interface/outline_cursor_01.4bpp"); const u8 OutlineCursorTiles_02[] = INCBIN_U8("graphics/interface/outline_cursor_02.4bpp"); @@ -17,6 +35,7 @@ const u8 OutlineCursorTiles_12[] = INCBIN_U8("graphics/interface/outline_cursor_ const u8 OutlineCursorTiles_13[] = INCBIN_U8("graphics/interface/outline_cursor_13.4bpp"); const u8 OutlineCursorTiles_14[] = INCBIN_U8("graphics/interface/outline_cursor_14.4bpp"); const u8 OutlineCursorTiles_15[] = INCBIN_U8("graphics/interface/outline_cursor_15.4bpp"); +#endif const struct OamData gOamData_842F11C = { .objMode = ST_OAM_OBJ_NORMAL, diff --git a/src/engine/menu_cursor.c b/src/engine/menu_cursor.c index ae4d5b14a..35116d40b 100644 --- a/src/engine/menu_cursor.c +++ b/src/engine/menu_cursor.c @@ -11,15 +11,6 @@ EWRAM_DATA static u8 gUnknown_0203A3D2 = 0; EWRAM_DATA static u8 gUnknown_0203A3D3 = 0; EWRAM_DATA static u8 gUnknown_0203A3D4 = 0; -#if DEBUG -//const u8 gEmptySpace_08459A8C[0x1C0] = {0}; -//const u8 gEmptySpace_08459A8C[0xE300-0xC700] = {0}; -asm(".section .rodata\n\ - .global gEmptySpace_08459A8C\n\ -gEmptySpace_08459A8C:\n\ - .incbin \"pokeruby_de_debug.gba\", 0x459A8C, 0x1C00"); -#endif - #if ENGLISH #include "../src/data/menu_cursor_en.h" #elif GERMAN -- cgit v1.2.3 From 8520963669a4ab9390715a51ac412c7360309094 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 19 Jan 2018 16:33:19 -0600 Subject: unused charmap incbin --- data/graphics.s | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/graphics.s b/data/graphics.s index 6cc1c2db7..0adef4280 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -15,9 +15,11 @@ gUnknown_08D00524:: @ 8D00524 .incbin "graphics/interface/menu_map.bin" @ 8D01524 +test_8D01524:: .include "data/graphics/pokemon/circled_question_mark_graphics.inc" @ 8D019E4 +test_8D019E4:: .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff .incbin "graphics/unused/old_charmap.bin.lz" .incbin "graphics/unused/old_charmap.gbapal.lz" -- cgit v1.2.3 From 1c7de6838bbeb291d63ce87d1a1e58737b7a9d2f Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 19 Jan 2018 16:45:29 -0600 Subject: actually do unused charmap incbin --- data/graphics.s | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/graphics.s b/data/graphics.s index 0adef4280..10e05fdb9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -15,13 +15,15 @@ gUnknown_08D00524:: @ 8D00524 .incbin "graphics/interface/menu_map.bin" @ 8D01524 -test_8D01524:: .include "data/graphics/pokemon/circled_question_mark_graphics.inc" @ 8D019E4 -test_8D019E4:: +.if DEBUG + .incbin "baserom_de_debug.gba", 0xD019E4, 0xD245E8-0xD019E4 +.else .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff .incbin "graphics/unused/old_charmap.bin.lz" +.endif .incbin "graphics/unused/old_charmap.gbapal.lz" .align 2 -- cgit v1.2.3 From f398d0ad620eaf204d46df7f844e37e3a5d609cf Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 19 Jan 2018 16:51:26 -0600 Subject: apparently I suck at this --- data/graphics.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/graphics.s b/data/graphics.s index 10e05fdb9..bfb9ec226 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -19,7 +19,7 @@ gUnknown_08D00524:: @ 8D00524 @ 8D019E4 .if DEBUG - .incbin "baserom_de_debug.gba", 0xD019E4, 0xD245E8-0xD019E4 + .incbin "baserom_de_debug.gba", 0xD019E4, 0xD02458-0xD019E4 .else .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff .incbin "graphics/unused/old_charmap.bin.lz" -- cgit v1.2.3 From 22d4763c033cdd5ec54a495fbf9d08c92b534f6d Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Fri, 19 Jan 2018 17:22:46 -0600 Subject: more debug graphics baseroms --- data/graphics.s | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/graphics.s b/data/graphics.s index bfb9ec226..5a8af35df 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1228,7 +1228,11 @@ gUnknown_08D17C3C:: @ 8D17C3C .align 2 gContestMiscGfx:: @ 8D17D6C +.if DEBUG + .incbin "baserom_de_debug.gba", 0xD17DDC, 0xD188DC-0xD17DDC +.else .incbin "graphics/contest/misc.4bpp.lz" +.endif .align 2 gContestAudienceGfx:: @ 8D18818 @@ -1251,7 +1255,11 @@ gTiles_8D1975C:: @ 8D1975C .align 2 gUnknown_08D1977C:: @ 8D1977C +.if DEBUG + .incbin "baserom_de_debug.gba", 0xD19840, 0xD1A2E8-0xD19840 +.else .incbin "graphics/contest/misc_2.4bpp.lz" +.endif .align 2 gUnknown_08D1A250:: @ 8D1A250 @@ -2863,7 +2871,11 @@ gBattleAnimSpritePalette_068:: @ 8E69628 .align 2 gContestApplauseGfx:: +.if DEBUG + .incbin "baserom_de_debug.gba", 0xE696E0, 0xE69818-0xE696E0 +.else .incbin "graphics/contest/applause.4bpp.lz" +.endif .align 2 gContestApplauseMeterGfx:: @ 8E6978C @@ -2974,7 +2986,11 @@ gUnknown_08E6C100:: @ 8E6C100 .align 2 gUnknown_08E6C920:: @ 8E6C920 +.if DEBUG + .incbin "baserom_de_debug.gba", 0xE6C9AC, 0xE6D3E0-0xE6C9AC +.else .incbin "graphics/berry_blender/outer.4bpp.lz" +.endif .align 2 gUnknown_08E6D354:: @ 8E6D354 @@ -3134,7 +3150,11 @@ gBattleAnimSpritePalette_188:: @ 8E7133C .align 2 gPartyMenuMisc_Gfx:: @ 8E71354 +.if DEBUG + .incbin "baserom_de_debug.gba", 0xE713E0, 0xE71730-0xE713E0 +.else .incbin "graphics/interface/party_menu_misc.4bpp.lz" +.endif .align 2 gPartyMenuMisc_Pal:: @ 8E716A0 -- cgit v1.2.3 From 428f712da678b3f5b9256d85c0e3248cacd8e7c2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 19 Jan 2018 21:30:16 -0800 Subject: Further document weather --- include/ewram.h | 2 +- include/field_effect.h | 1 - include/field_weather.h | 33 ++- include/global.fieldmap.h | 3 +- src/battle/battle_util.c | 6 +- src/field/decoration.c | 6 +- src/field/field_control_avatar.c | 7 +- src/field/field_effect.c | 6 +- src/field/field_weather.c | 486 ++++++++++++++++++++------------------ src/field/field_weather_effects.c | 12 +- src/field/overworld.c | 6 +- src/scene/cable_car.c | 2 +- 12 files changed, 300 insertions(+), 270 deletions(-) diff --git a/include/ewram.h b/include/ewram.h index 6f42925c1..13e478ff1 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -8,7 +8,7 @@ extern u8 gSharedMem[]; // regions overlap others but have different definitions. Until some // dupes can be determined to be the same, they will be deliberate // seperated. -#define eWeatherPaletteData (*(struct WeatherPaletteData *)gSharedMem) +#define eDroughtPaletteData (*(struct WeatherPaletteData *)gSharedMem) #define gBattleStruct ((struct BattleStruct *) (gSharedMem + 0x0)) #define ewram0_2 (*(struct Struct2000000 *)(gSharedMem + 0x0)) #define namingScreenData (*(struct NamingScreenData *)(gSharedMem + 0x0)) diff --git a/include/field_effect.h b/include/field_effect.h index bb859074f..4d0e90767 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -103,7 +103,6 @@ void FieldEffectActiveListClear(void); void FieldEffectActiveListAdd(u8 id); void FieldEffectActiveListRemove(u8 id); bool8 FieldEffectActiveListContains(u8 id); -void sub_807DE38(u8 index); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/field_weather.h b/include/field_weather.h index 2c56a5a40..15be9229d 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -23,12 +23,8 @@ struct Weather struct Sprite *sandstormSprites2[5]; } s2; } sprites; - u8 unknown_200[2][32]; - u8 filler_240[0x460-0x240]; - u8 unk460[2][32]; - u8 filler4A0[0x6B6-0x4A0]; - s8 unknown_6B6; - u8 filler_6B7[0xC0-0xB7]; + u8 gammaShifts[19][32]; + u8 altGammaShifts[19][32]; s8 gammaIndex; s8 gammaTargetIndex; u8 gammaStepDelay; @@ -47,7 +43,7 @@ struct Weather u8 weatherGfxLoaded; u8 unknown_6D3; u8 unknown_6D4; - u8 unknown_6D5; + u8 altGammaSpritePalIndex; u16 unknown_6D6; u8 unknown_6D8; u8 unknown_6D9; @@ -104,8 +100,8 @@ struct Weather u16 currBlendEVB; u16 targetBlendEVA; u16 targetBlendEVB; - u8 unknown_738; - u8 unknown_739; + u8 blendUpdateCounter; + u8 blendFrameCounter; u8 blendDelay; u8 filler_73B[0x3C-0x3B]; s16 unknown_73C; @@ -113,20 +109,18 @@ struct Weather s16 unknown_740; s16 unknown_742; u8 filler_744[0xD-4]; - s8 unknown_74D; - u8 unknown_74E; + s8 loadDroughtPalsIndex; + u8 loadDroughtPalsOffset; }; void StartWeather(void); -void DoWeatherEffect(u8 effect); +void ChangeWeather(u8 weather); void sub_807C988(u8 effect); void sub_807C9B4(u8 effect); void Task_WeatherInit(u8); void Task_WeatherMain(u8); void sub_807CAE8(void); void nullsub_38(void); -void sub_807CB10(void); -void sub_807CC24(void); void sub_807CCAC(void); u8 RainSnowShadeBlend_807CDC4(void); u8 DroughtBlend_807CE24(void); @@ -135,9 +129,7 @@ void nullsub_39(void); // ASM void BlendSomething_807CEBC(u8, u8, s8); -//void BlendSomething_807D1BC(u8, u8, u8, u8, u16); void BlendSomething_807D1BC(u8 a, u8 a2, s8 c, u8 d, u16 e); -void BlendSomething_807D304(s8 a, u8 arg2, u16 c); void BlendSomething_807D424(u8, u16); // ... @@ -156,8 +148,6 @@ void sub_807D874(u8); // ... void Weather_SetBlendCoeffs(u8, u8); // ... -void sub_807DE68(void); -// ... void PlayRainSoundEffect(void); // ... void SetSav1Weather(u32); @@ -171,6 +161,13 @@ bool8 sub_807D770(void); bool8 sub_807DDFC(void); void SetWeather(u32); void UpdateWeatherPerDay(u16); +void PreservePaletteInWeather(u8 index); +void ResetPreservedPalettesInWeather(void); +extern void ResetDroughtWeatherPaletteLoading(void); +void ResetDroughtWeatherPaletteLoading(void); +bool8 LoadDroughtWeatherPalettes(void); +u8 GetCurrentWeather(void); + extern struct Weather gWeather; diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index a828cf131..30047c677 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -101,8 +101,7 @@ struct WarpEvent struct CoordEvent { s16 x, y; - u8 unk4; - u8 filler_5; + u8 elevation; u16 trigger; u16 index; u8 filler_A[0x2]; diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index f93664593..87b6952ff 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -4,6 +4,7 @@ #include "data2.h" #include "event_data.h" #include "ewram.h" +#include "field_weather.h" #include "item.h" #include "link.h" #include "pokemon.h" @@ -85,7 +86,6 @@ u8 CountTrailingZeroBits(u32 a); u8 GetMoveTarget(u16 move, u8 useMoveTarget); u8 sub_803FC34(u8 bank); u16 sub_803FBFC(u8 a); -u8 weather_get_current(void); void RecordAbilityBattle(u8 bank, u8 ability); void RecordItemBattle(u8 bank, u8 holdEffect); s8 GetPokeFlavourRelation(u32 pid, u8 flavor); @@ -1747,7 +1747,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { case 0xFF: //weather from overworld //_08018586 - switch (weather_get_current()) + switch (GetCurrentWeather()) { case WEATHER_RAIN_LIGHT: case WEATHER_RAIN_MED: @@ -1781,7 +1781,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } if (effect) { - gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current(); + gBattleCommunication[MULTISTRING_CHOOSER] = GetCurrentWeather(); BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts); } break; diff --git a/src/field/decoration.c b/src/field/decoration.c index e1604cfa1..1cc3bbe06 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -2289,7 +2289,7 @@ void sub_80FF6AC(u8 taskId) gTasks[taskId].data[2] = 2; break; case 2: - if (sub_807D770() == 1) + if (sub_807D770() == TRUE) { gTasks[taskId].data[12] = 0; sub_810065C(taskId); @@ -3222,7 +3222,7 @@ void c1_overworld_prev_quest(u8 taskId) void sub_8100334(u8 taskId) { - if (sub_807D770() == 1) + if (sub_807D770() == TRUE) { gTasks[taskId].func = sub_80FE948; } @@ -3735,7 +3735,7 @@ void sub_8100C88(u8 taskId) gTasks[taskId].data[2] = 3; break; case 3: - if (sub_807D770() == 1) + if (sub_807D770() == TRUE) { gTasks[taskId].data[13] = -1; DisplayItemMessageOnField(taskId, gSecretBaseText_DecorReturned, sub_81010F0, 0); diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index c156df035..bf96c724f 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -767,20 +767,19 @@ static u8 *trigger_activate(struct CoordEvent *coordEvent) return NULL; } -static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 x, u16 y, u8 d) +static u8 *mapheader_trigger_activate_at(struct MapHeader *mapHeader, u16 x, u16 y, u8 elevation) { s32 i; struct CoordEvent *coordEvents = mapHeader->events->coordEvents; u8 coordEventCount = mapHeader->events->coordEventCount; - u8 *script; for (i = 0; i < coordEventCount; i++) { if ((u16)coordEvents[i].x == x && (u16)coordEvents[i].y == y) { - if (coordEvents[i].unk4 == d || coordEvents[i].unk4 == 0) + if (coordEvents[i].elevation == elevation || coordEvents[i].elevation == 0) { - script = trigger_activate(&coordEvents[i]); + u8 *script = trigger_activate(&coordEvents[i]); if (script != NULL) return script; } diff --git a/src/field/field_effect.c b/src/field/field_effect.c index 5ff89574b..a3134552d 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -543,7 +543,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) LoadCompressedObjectPalette(&gMonPaletteTable[species]); GetMonSpriteTemplate_803C56C(species, 3); gUnknown_02024E8C.paletteTag = gMonPaletteTable[0].tag; - sub_807DE38(IndexOfSpritePaletteTag(gMonPaletteTable[0].tag) + 0x10); + PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[0].tag) + 0x10); return CreateSprite(&gUnknown_02024E8C, x, y, subpriority); } @@ -556,13 +556,13 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio LoadCompressedObjectPalette(spritePalette); GetMonSpriteTemplate_803C56C(species, 3); gUnknown_02024E8C.paletteTag = spritePalette->tag; - sub_807DE38(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); + PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); return CreateSprite(&gUnknown_02024E8C, x, y, subpriority); } void FreeResourcesAndDestroySprite(struct Sprite *sprite) { - sub_807DE68(); + ResetPreservedPalettesInWeather(); FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum)); if (sprite->oam.affineMode != 0) { diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 5f3f93096..2a5c311ab 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -15,6 +15,12 @@ #define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) +enum { + GAMMA_NONE, + GAMMA_NORMAL, + GAMMA_ALT, +}; + struct RGBColor { u16 r:5; @@ -24,7 +30,7 @@ struct RGBColor struct WeatherPaletteData { - u16 data[0][0x1000]; // unknown length + u16 gammaShiftColors[8][0x1000]; // 0x1000 is the number of bytes that make up all palettes. }; struct WeatherCallbacks @@ -36,10 +42,10 @@ struct WeatherCallbacks }; EWRAM_DATA struct Weather gWeather = {0}; -EWRAM_DATA u8 gUnknown_0202FF38[32] = {0}; +EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0}; EWRAM_DATA u16 gUnknown_0202FF58 = {0}; -static const u8 *gUnknown_030006DC; +static const u8 *sPaletteGammaTypes; const u8 DroughtPaletteData_0[] = INCBIN_U8("graphics/weather/drought0.bin.lz"); const u8 DroughtPaletteData_1[] = INCBIN_U8("graphics/weather/drought1.bin.lz"); @@ -56,7 +62,7 @@ static const u8 *const sCompressedDroughtPalettes[] = DroughtPaletteData_3, DroughtPaletteData_4, DroughtPaletteData_5, - gSharedMem, + (u8*)eDroughtPaletteData.gammaShiftColors, }; // This is a pointer to gWeather. All code in this file accesses gWeather directly, @@ -65,6 +71,10 @@ static const u8 *const sCompressedDroughtPalettes[] = // this file produces the same result as accessing gWeather directly. struct Weather *const gWeatherPtr = &gWeather; +static bool8 sub_807D574(u8); +static void DroughtBlendSomething_807D304(s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static void BuildGammaShiftTables(void); +static void UpdateGammaShift(void); void None_Init(void); void None_Main(void); bool8 None_Finish(void); @@ -130,7 +140,7 @@ static const struct WeatherCallbacks sWeatherFuncs[] = {None_Init, None_Main, None_Init, None_Finish}, {Clouds_InitVars, Clouds_Main, Clouds_InitAll, Clouds_Finish}, {Weather2_InitVars, Weather2_Main, Weather2_InitAll, Weather2_Finish}, - {LightRain_InitVars, LightRain_Main, LightRain_InitAll, LightRain_Finish}, // light rain + {LightRain_InitVars, LightRain_Main, LightRain_InitAll, LightRain_Finish}, {Snow_InitVars, Snow_Main, Snow_InitAll, Snow_Finish}, {MedRain_InitVars, Rain_Main, MedRain_InitAll, Rain_Finish}, {Fog1_InitVars, Fog1_Main, Fog1_InitAll, Fog1_Finish}, @@ -146,46 +156,50 @@ static const struct WeatherCallbacks sWeatherFuncs[] = void (*const gUnknown_083970B8[])(void) = { - sub_807CC24, + UpdateGammaShift, sub_807CCAC, nullsub_39, nullsub_39, }; -const u8 gUnknown_083970C8[32] = +// This table specifies which of the gamma shift tables should be +// applied to each of the background and sprite palettes. +static const u8 sBasePaletteGammaTypes[32] = { - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 1, - 0, - 0, - 2, - 1, - 2, - 2, - 2, - 2, - 1, - 1, - 1, - 1, - 2, - 1, - 1, - 1, - 1, - 1, + // background palettes + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NONE, + GAMMA_NONE, + // sprite palettes + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_ALT, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, + GAMMA_NORMAL, }; const u16 gUnknown_083970E8[] = INCBIN_U16("graphics/weather/0.gbapal"); @@ -198,8 +212,8 @@ void StartWeather(void) { index = AllocSpritePalette(0x1200); CpuCopy32(gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); - sub_807CB10(); - gWeatherPtr->unknown_6D5 = index; + BuildGammaShiftTables(); + gWeatherPtr->altGammaSpritePalIndex = index; gWeatherPtr->unknown_6D4 = AllocSpritePalette(0x1201); gWeatherPtr->rainSpriteCount = 0; gWeatherPtr->unknown_6D8 = 0; @@ -221,33 +235,35 @@ void StartWeather(void) } } -void DoWeatherEffect(u8 effect) +void ChangeWeather(u8 weather) { - if (effect != WEATHER_RAIN_LIGHT && effect != WEATHER_RAIN_MED && effect != WEATHER_RAIN_HEAVY) + if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY) { PlayRainSoundEffect(); } - if (gWeatherPtr->nextWeather != effect && gWeatherPtr->currWeather == effect) + + if (gWeatherPtr->nextWeather != weather && gWeatherPtr->currWeather == weather) { - sWeatherFuncs[effect].initVars(); + sWeatherFuncs[weather].initVars(); } + gWeatherPtr->unknown_6D3 = 0; - gWeatherPtr->nextWeather = effect; + gWeatherPtr->nextWeather = weather; gWeatherPtr->finishStep = 0; } -void sub_807C988(u8 effect) +void sub_807C988(u8 weather) { PlayRainSoundEffect(); - gWeatherPtr->currWeather = effect; - gWeatherPtr->nextWeather = effect; + gWeatherPtr->currWeather = weather; + gWeatherPtr->nextWeather = weather; } -void sub_807C9B4(u8 effect) +void sub_807C9B4(u8 weather) { PlayRainSoundEffect(); - gWeatherPtr->currWeather = effect; - gWeatherPtr->nextWeather = effect; + gWeatherPtr->currWeather = weather; + gWeatherPtr->nextWeather = weather; gWeatherPtr->unknown_6C8 = 1; } @@ -295,7 +311,10 @@ u8 None_Finish(void) return 0; } -void sub_807CB10(void) +// Builds two tables that contain gamma shifts for palette colors. +// It's unclear why the two tables aren't declared as const arrays, since +// this function always builds the same two tables. +static void BuildGammaShiftTables(void) { u16 v0; u8 (*v1)[32]; @@ -308,13 +327,13 @@ void sub_807CB10(void) u16 v11; s16 dunno; - gUnknown_030006DC = gUnknown_083970C8; + sPaletteGammaTypes = sBasePaletteGammaTypes; for (v0 = 0; v0 <= 1; v0++) { if (v0 == 0) - v1 = gWeatherPtr->unknown_200; + v1 = gWeatherPtr->gammaShifts; else - v1 = gWeatherPtr->unk460; + v1 = gWeatherPtr->altGammaShifts; for (v2 = 0; v2 < 32; v2++) { @@ -362,7 +381,9 @@ void sub_807CB10(void) } } -void sub_807CC24(void) +// When the weather is changing, it gradually updates the palettes +// towards the desired gamma shift. +static void UpdateGammaShift(void) { if (gWeatherPtr->gammaIndex == gWeatherPtr->gammaTargetIndex) { @@ -377,7 +398,7 @@ void sub_807CC24(void) gWeatherPtr->gammaIndex++; else gWeatherPtr->gammaIndex--; - BlendSomething_807CEBC(0, 0x20, gWeatherPtr->gammaIndex); + BlendSomething_807CEBC(0, 32, gWeatherPtr->gammaIndex); } } } @@ -433,11 +454,11 @@ u8 RainSnowShadeBlend_807CDC4(void) return 0; if (++gWeatherPtr->unknown_6C7 >= 0x10) { - BlendSomething_807CEBC(0, 0x20, 3); + BlendSomething_807CEBC(0, 32, 3); gWeatherPtr->unknown_6C7 = 0x10; return 0; } - BlendSomething_807D1BC(0, 0x20, 3, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); + BlendSomething_807D1BC(0, 32, 3, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); return 1; } @@ -447,11 +468,11 @@ u8 DroughtBlend_807CE24(void) return 0; if (++gWeatherPtr->unknown_6C7 >= 0x10) { - BlendSomething_807CEBC(0, 0x20, -6); + BlendSomething_807CEBC(0, 32, -6); gWeatherPtr->unknown_6C7 = 0x10; return 0; } - BlendSomething_807D304(-6, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); + DroughtBlendSomething_807D304(-6, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); return 1; } @@ -468,23 +489,26 @@ void nullsub_39(void) { } -void BlendSomething_807CEBC(u8 a, u8 b, s8 c) +void BlendSomething_807CEBC(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) { - u16 r4; + u16 curPalIndex; u16 palOffset; - u8 *r6; + u8 *gammaTable; u16 i; - if (c > 0) + if (gammaIndex > 0) { - c = c - 1; - palOffset = a * 16; - b += a; - r4 = a; - while (r4 < b) + gammaIndex--; + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + curPalIndex = startPalIndex; + + // Loop through the speficied palette range and apply necessary gamma shifts to the colors. + while (curPalIndex < numPalettes) { - if (gUnknown_030006DC[r4] == 0) + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) { + // No palette change. CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); palOffset += 16; } @@ -492,25 +516,27 @@ void BlendSomething_807CEBC(u8 a, u8 b, s8 c) { u8 r, g, b; - if (gUnknown_030006DC[r4] == 2 || r4 - 16 == gWeatherPtr->unknown_6D5) - r6 = gWeatherPtr->unk460[c]; + if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeatherPtr->altGammaSpritePalIndex) + gammaTable = gWeatherPtr->altGammaShifts[gammaIndex]; else - r6 = gWeatherPtr->unknown_200[c]; - if (r4 == 16 || r4 > 0x1B) + gammaTable = gWeatherPtr->gammaShifts[gammaIndex]; + + if (curPalIndex == 16 || curPalIndex > 27) { for (i = 0; i < 16; i++) { - if (gPlttBufferUnfaded[palOffset] == 0x2D9F) + if (gPlttBufferUnfaded[palOffset] == RGB(31, 12, 11)) { + // Skip gamma shift for this specific color. (Why?) palOffset++; } else { - struct RGBColor color = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; - - r = r6[color.r]; - g = r6[color.g]; - b = r6[color.b]; + // Apply gamma shift to the original color. + struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + r = gammaTable[baseColor.r]; + g = gammaTable[baseColor.g]; + b = gammaTable[baseColor.b]; gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r; } } @@ -519,39 +545,45 @@ void BlendSomething_807CEBC(u8 a, u8 b, s8 c) { for (i = 0; i < 16; i++) { - struct RGBColor color = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; - - r = r6[color.r]; - g = r6[color.g]; - b = r6[color.b]; + // Apply gamma shift to the original color. + struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + r = gammaTable[baseColor.r]; + g = gammaTable[baseColor.g]; + b = gammaTable[baseColor.b]; gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r; } } } - r4++; + + curPalIndex++; } } - else if (c < 0) + else if (gammaIndex < 0) { - c = -c - 1; - palOffset = a * 16; - b += a; - r4 = a; - while (r4 < b) + // A negative gammIndex value means that the blending will come from the special Drought weather's palette tables. + gammaIndex = -gammaIndex - 1; + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + curPalIndex = startPalIndex; + + while (curPalIndex < numPalettes) { - if (gUnknown_030006DC[r4] == 0) + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) { + // No palette change. CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16)); palOffset += 16; } else { - if (r4 == 16 || r4 > 0x1B) + if (curPalIndex == 16 || curPalIndex > 27) { for (i = 0; i < 16; i++) { - if (gPlttBufferUnfaded[palOffset] != 0x2D9F) - gPlttBufferFaded[palOffset] = eWeatherPaletteData.data[c][MACRO1(gPlttBufferUnfaded[palOffset])]; + // Skip gamma shift for this specific color. (Why?) + if (gPlttBufferUnfaded[palOffset] != RGB(31, 12, 11)) + gPlttBufferFaded[palOffset] = eDroughtPaletteData.gammaShiftColors[gammaIndex][MACRO1(gPlttBufferUnfaded[palOffset])]; + palOffset++; } } @@ -559,93 +591,100 @@ void BlendSomething_807CEBC(u8 a, u8 b, s8 c) { for (i = 0; i < 16; i++) { - gPlttBufferFaded[palOffset] = eWeatherPaletteData.data[c][MACRO1(gPlttBufferUnfaded[palOffset])]; + gPlttBufferFaded[palOffset] = eDroughtPaletteData.gammaShiftColors[gammaIndex][MACRO1(gPlttBufferUnfaded[palOffset])]; palOffset++; } } } - r4++; + + curPalIndex++; } } else { - CpuFastCopy(gPlttBufferUnfaded + a * 16, gPlttBufferFaded + a * 16, b * 16 * sizeof(u16)); + // No palette blending. + CpuFastCopy(gPlttBufferUnfaded + startPalIndex * 16, gPlttBufferFaded + startPalIndex * 16, numPalettes * 16 * sizeof(u16)); } } -void BlendSomething_807D1BC(u8 a1, u8 a2, s8 c, u8 d, u16 e) +void BlendSomething_807D1BC(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) { u16 palOffset; - u16 r4; + u16 curPalIndex; u16 i; - struct RGBColor color = *(struct RGBColor *)&e; - u8 r_ = color.r; - u8 g_ = color.g; - u8 b_ = color.b; - - palOffset = a1 * 16; - a2 += a1; - c = c - 1; - r4 = a1; - while (r4 < a2) + struct RGBColor color = *(struct RGBColor *)&blendColor; + u8 rBlend = color.r; + u8 gBlend = color.g; + u8 bBlend = color.b; + + palOffset = startPalIndex * 16; + numPalettes += startPalIndex; + gammaIndex--; + curPalIndex = startPalIndex; + + while (curPalIndex < numPalettes) { - if (gUnknown_030006DC[r4] == 0) + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) { - BlendPalette(palOffset, 16, d, e); + // No gamma shift. Simply blend the colors. + BlendPalette(palOffset, 16, blendCoeff, blendColor); palOffset += 16; } else { - u8 *r5; + u8 *gammaTable; - if (gUnknown_030006DC[r4] == 1) - r5 = gWeatherPtr->unknown_200[c]; + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NORMAL) + gammaTable = gWeatherPtr->gammaShifts[gammaIndex]; else - r5 = gWeatherPtr->unk460[c]; + gammaTable = gWeatherPtr->altGammaShifts[gammaIndex]; for (i = 0; i < 16; i++) { - struct RGBColor color = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; - u8 r = r5[color.r]; - u8 g = r5[color.g]; - u8 b = r5[color.b]; - - r += ((r_ - r) * d) >> 4; - g += ((g_ - g) * d) >> 4; - b += ((b_ - b) * d) >> 4; + struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset]; + u8 r = gammaTable[baseColor.r]; + u8 g = gammaTable[baseColor.g]; + u8 b = gammaTable[baseColor.b]; + + // Apply gamma shift and target blend color to the original color. + r += ((rBlend - r) * blendCoeff) >> 4; + g += ((gBlend - g) * blendCoeff) >> 4; + b += ((bBlend - b) * blendCoeff) >> 4; gPlttBufferFaded[palOffset++] = (b << 10) | (g << 5) | r; } } - r4++; + + curPalIndex++; } } -void BlendSomething_807D304(s8 a, u8 coeff, u16 c) +void DroughtBlendSomething_807D304(s8 gammaIndex, u8 blendCoeff, u16 blendColor) { struct RGBColor color; - u8 r_; - u8 g_; - u8 b_; - u16 r4; + u8 rBlend; + u8 gBlend; + u8 bBlend; + u16 curPalIndex; u16 palOffset; - u16 r12; + u16 i; - a = -a - 1; - color = *(struct RGBColor *)&c; - r_ = color.r; - g_ = color.g; - b_ = color.b; + gammaIndex = -gammaIndex - 1; + color = *(struct RGBColor *)&blendColor; + rBlend = color.r; + gBlend = color.g; + bBlend = color.b; palOffset = 0; - for (r4 = 0; r4 < 32; r4++) + for (curPalIndex = 0; curPalIndex < 32; curPalIndex++) { - if (gUnknown_030006DC[r4] == 0) + if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE) { - BlendPalette(palOffset, 16, coeff, c); + // No gamma shift. Simply blend the colors. + BlendPalette(palOffset, 16, blendCoeff, blendColor); palOffset += 16; } else { - for (r12 = 0; r12 < 16; r12++) + for (i = 0; i < 16; i++) { u32 offset; struct RGBColor color1; @@ -659,14 +698,14 @@ void BlendSomething_807D304(s8 a, u8 coeff, u16 c) b1 = color1.b; offset = ((b1 & 0x1E) << 7) | ((g1 & 0x1E) << 3) | ((r1 & 0x1E) >> 1); - color2 = *(struct RGBColor *)&eWeatherPaletteData.data[a][offset]; + color2 = *(struct RGBColor *)&eDroughtPaletteData.gammaShiftColors[gammaIndex][offset]; r2 = color2.r; g2 = color2.g; b2 = color2.b; - r2 += ((r_ - r2) * coeff) >> 4; - g2 += ((g_ - g2) * coeff) >> 4; - b2 += ((b_ - b2) * coeff) >> 4; + r2 += ((rBlend - r2) * blendCoeff) >> 4; + g2 += ((gBlend - g2) * blendCoeff) >> 4; + b2 += ((bBlend - b2) * blendCoeff) >> 4; gPlttBufferFaded[palOffset++] = (b2 << 10) | (g2 << 5) | r2; } @@ -674,28 +713,26 @@ void BlendSomething_807D304(s8 a, u8 coeff, u16 c) } } -bool8 sub_807D574(u8); - -void BlendSomething_807D424(u8 coeff, u16 blendColor) +void BlendSomething_807D424(u8 blendCoeff, u16 blendColor) { struct RGBColor color; - u8 blendR; - u8 blendG; - u8 blendB; - u16 palNum; + u8 rBlend; + u8 gBlend; + u8 bBlend; + u16 curPalIndex; - BlendPalette(0, 0x100, coeff, blendColor); + BlendPalette(0, 0x100, blendCoeff, blendColor); color = *(struct RGBColor *)&blendColor; - blendR = color.r; - blendG = color.g; - blendB = color.b; + rBlend = color.r; + gBlend = color.g; + bBlend = color.b; - for (palNum = 16; palNum < 32; palNum++) + for (curPalIndex = 16; curPalIndex < 32; curPalIndex++) { - if (sub_807D574(palNum)) + if (sub_807D574(curPalIndex)) { - u16 palEnd = (palNum + 1) * 16; - u16 palOffset = palNum * 16; + u16 palEnd = (curPalIndex + 1) * 16; + u16 palOffset = curPalIndex * 16; while (palOffset < palEnd) { @@ -708,9 +745,9 @@ void BlendSomething_807D424(u8 coeff, u16 blendColor) g += ((31 - g) * 3) >> 2; b += ((28 - b) * 3) >> 2; - r += ((blendR - r) * coeff) >> 4; - g += ((blendG - g) * coeff) >> 4; - b += ((blendB - b) * coeff) >> 4; + r += ((rBlend - r) * blendCoeff) >> 4; + g += ((gBlend - g) * blendCoeff) >> 4; + b += ((bBlend - b) * blendCoeff) >> 4; gPlttBufferFaded[palOffset] = (b << 10) | (g << 5) | r; palOffset++; @@ -718,51 +755,52 @@ void BlendSomething_807D424(u8 coeff, u16 blendColor) } else { - BlendPalette(palNum * 16, 16, coeff, blendColor); + BlendPalette(curPalIndex * 16, 16, blendCoeff, blendColor); } } } -void sub_807D540(u8 a) +void sub_807D540(u8 paletteIndex) { if (gWeatherPtr->unknown_6FA < 6) { - gWeatherPtr->unknown_6F4[gWeatherPtr->unknown_6FA] = a; + gWeatherPtr->unknown_6F4[gWeatherPtr->unknown_6FA] = paletteIndex; gWeatherPtr->unknown_6FA++; } } -bool8 sub_807D574(u8 a) +bool8 sub_807D574(u8 paletteIndex) { u16 i; for (i = 0; i < gWeatherPtr->unknown_6FA; i++) { - if (gWeatherPtr->unknown_6F4[i] == a) + if (gWeatherPtr->unknown_6F4[i] == paletteIndex) return TRUE; } + return FALSE; } -void sub_807D5BC(s8 a) +void sub_807D5BC(s8 gammaIndex) { if (gWeatherPtr->unknown_6C6 == 3) { - BlendSomething_807CEBC(0, 32, a); - gWeatherPtr->gammaIndex = a; + BlendSomething_807CEBC(0, 32, gammaIndex); + gWeatherPtr->gammaIndex = gammaIndex; } } -void sub_807D5F0(u8 a, u8 b, u8 c) +void sub_807D5F0(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay) { if (gWeatherPtr->unknown_6C6 == 3) { gWeatherPtr->unknown_6C6 = 0; - gWeatherPtr->gammaIndex = a; - gWeatherPtr->gammaTargetIndex = b; + gWeatherPtr->gammaIndex = gammaIndex; + gWeatherPtr->gammaTargetIndex = gammaTargetIndex; gWeatherPtr->gammaStepFrameCounter = 0; - gWeatherPtr->gammaStepDelay = c; - sub_807D5BC(a); + gWeatherPtr->gammaStepDelay = gammaStepDelay; + sub_807D5BC(gammaIndex); } } @@ -837,9 +875,9 @@ bool8 sub_807D770(void) return (gWeatherPtr->unknown_6C6 != 1); } -void sub_807D78C(u8 a) +void sub_807D78C(u8 spritePaletteIndex) { - u16 r4 = 16 + a; + u16 paletteIndex = 16 + spritePaletteIndex; u16 i; switch (gWeatherPtr->unknown_6C6) @@ -848,34 +886,34 @@ void sub_807D78C(u8 a) if (gWeatherPtr->unknown_6CA != 0) { if (gWeatherPtr->currWeather == WEATHER_FOG_1) - sub_807D540(r4); - r4 *= 16; + sub_807D540(paletteIndex); + paletteIndex *= 16; for (i = 0; i < 16; i++) - gPlttBufferFaded[r4 + i] = gWeatherPtr->fadeDestColor; + gPlttBufferFaded[paletteIndex + i] = gWeatherPtr->fadeDestColor; } break; case 2: - r4 *= 16; - CpuFastCopy(gPlttBufferFaded + r4, gPlttBufferUnfaded + r4, 32); - BlendPalette(r4, 16, gPaletteFade.y, gPaletteFade.blendColor); + paletteIndex *= 16; + CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, 32); + BlendPalette(paletteIndex, 16, gPaletteFade.y, gPaletteFade.blendColor); break; default: if (gWeatherPtr->currWeather != WEATHER_FOG_1) { - BlendSomething_807CEBC(r4, 1, gWeatherPtr->gammaIndex); + BlendSomething_807CEBC(paletteIndex, 1, gWeatherPtr->gammaIndex); } else { - r4 *= 16; - BlendPalette(r4, 16, 12, 0x73FC); + paletteIndex *= 16; + BlendPalette(paletteIndex, 16, 12, 0x73FC); } break; } } -void sub_807D874(u8 a) +void sub_807D874(u8 paletteIndex) { - BlendSomething_807CEBC(a, 1, gWeatherPtr->gammaIndex); + BlendSomething_807CEBC(paletteIndex, 1, gWeatherPtr->gammaIndex); } u8 unref_sub_807D894(void) @@ -892,54 +930,54 @@ void sub_807D8C0(const u16 *palette) sub_807D78C(gWeatherPtr->unknown_6D4); } -void sub_807D8F0(u8 *a, u8 *b) +static void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *b) { - u8 r4 = *a; + u8 gammaIndex = *gammaIndexPtr; u16 i; - if (r4 < 7) + if (gammaIndex < 7) { - r4--; - LZ77UnCompWram(sCompressedDroughtPalettes[r4], eWeatherPaletteData.data[r4]); - if (r4 == 0) + gammaIndex--; + LZ77UnCompWram(sCompressedDroughtPalettes[gammaIndex], eDroughtPaletteData.gammaShiftColors[gammaIndex]); + if (gammaIndex == 0) { - eWeatherPaletteData.data[r4][0] = 0x421; + eDroughtPaletteData.gammaShiftColors[gammaIndex][0] = RGB(1, 1, 1); for (i = 1; i < 0x1000; i++) - eWeatherPaletteData.data[r4][i] += eWeatherPaletteData.data[r4][i - 1]; + eDroughtPaletteData.gammaShiftColors[gammaIndex][i] += eDroughtPaletteData.gammaShiftColors[gammaIndex][i - 1]; } else { for (i = 0; i < 0x1000; i++) - eWeatherPaletteData.data[r4][i] += eWeatherPaletteData.data[r4 - 1][i]; + eDroughtPaletteData.gammaShiftColors[gammaIndex][i] += eDroughtPaletteData.gammaShiftColors[gammaIndex - 1][i]; } - if (++(*a) == 7) + if (++(*gammaIndexPtr) == 7) { - *a = 32; + *gammaIndexPtr = 32; *b = 32; } } } -void sub_807D9A8(void) +void ResetDroughtWeatherPaletteLoading(void) { - gWeatherPtr->unknown_74D = 1; - gWeatherPtr->unknown_74E = 1; + gWeatherPtr->loadDroughtPalsIndex = 1; + gWeatherPtr->loadDroughtPalsOffset = 1; } -bool8 sub_807D9C8(void) +bool8 LoadDroughtWeatherPalettes(void) { - if (gWeatherPtr->unknown_74D < 32) + if (gWeatherPtr->loadDroughtPalsIndex < 32) { - sub_807D8F0(&gWeatherPtr->unknown_74D, &gWeatherPtr->unknown_74E); - if (gWeatherPtr->unknown_74D < 32) + LoadDroughtWeatherPalette(&gWeatherPtr->loadDroughtPalsIndex, &gWeatherPtr->loadDroughtPalsOffset); + if (gWeatherPtr->loadDroughtPalsIndex < 32) return TRUE; } return FALSE; } -void sub_807DA04(s8 a) +void sub_807DA04(s8 gammaIndex) { - sub_807D5BC(-a - 1); + sub_807D5BC(-gammaIndex - 1); } void sub_807DA14(void) @@ -1001,8 +1039,8 @@ void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay) gWeatherPtr->targetBlendEVA = eva; gWeatherPtr->targetBlendEVB = evb; gWeatherPtr->blendDelay = delay; - gWeatherPtr->unknown_739 = 0; - gWeatherPtr->unknown_738 = 0; + gWeatherPtr->blendFrameCounter = 0; + gWeatherPtr->blendUpdateCounter = 0; } bool8 Weather_UpdateBlend(void) @@ -1011,13 +1049,13 @@ bool8 Weather_UpdateBlend(void) && gWeatherPtr->currBlendEVB == gWeatherPtr->targetBlendEVB) return TRUE; - if (++gWeatherPtr->unknown_739 > gWeatherPtr->blendDelay) + if (++gWeatherPtr->blendFrameCounter > gWeatherPtr->blendDelay) { - gWeatherPtr->unknown_739 = 0; - gWeatherPtr->unknown_738++; + gWeatherPtr->blendFrameCounter = 0; + gWeatherPtr->blendUpdateCounter++; // Update currBlendEVA and currBlendEVB on alternate frames - if (gWeatherPtr->unknown_738 & 1) + if (gWeatherPtr->blendUpdateCounter & 1) { if (gWeatherPtr->currBlendEVA < gWeatherPtr->targetBlendEVA) gWeatherPtr->currBlendEVA++; @@ -1079,7 +1117,7 @@ void unref_sub_807DCB4(u8 a) } } -u8 weather_get_current(void) +u8 GetCurrentWeather(void) { return gWeatherPtr->currWeather; } @@ -1141,14 +1179,14 @@ void unref_sub_807DE24(void) gWeatherPtr->unknown_6C6 = 3; } -void sub_807DE38(u8 a) +void PreservePaletteInWeather(u8 preservedPalIndex) { - CpuCopy16(gUnknown_083970C8, gUnknown_0202FF38, 32); - gUnknown_0202FF38[a] = 0; - gUnknown_030006DC = gUnknown_0202FF38; + CpuCopy16(sBasePaletteGammaTypes, gFieldEffectPaletteGammaTypes, 32); + gFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE; + sPaletteGammaTypes = gFieldEffectPaletteGammaTypes; } -void sub_807DE68(void) +void ResetPreservedPalettesInWeather(void) { - gUnknown_030006DC = gUnknown_083970C8; + sPaletteGammaTypes = sBasePaletteGammaTypes; } diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c index 4ffa171e8..0fee26b89 100644 --- a/src/field/field_weather_effects.c +++ b/src/field/field_weather_effects.c @@ -74,10 +74,8 @@ static const struct SpriteTemplate sCloudSpriteTemplate = .callback = sub_807E0F4, }; -extern void sub_807D5BC(s8 a); +extern void sub_807D5BC(s8 gammaIndex); extern void sub_807D8C0(const u16 *palette); -extern void sub_807D9A8(void); -extern bool8 sub_807D9C8(void); extern void sub_807DA14(void); extern void sub_807DA4C(void); extern void Weather_SetTargetBlendCoeffs(u8 a, u8 b, int c); @@ -258,11 +256,11 @@ void Drought_Main(void) gWeatherPtr->initStep++; break; case 1: - sub_807D9A8(); + ResetDroughtWeatherPaletteLoading(); gWeatherPtr->initStep++; break; case 2: - if (sub_807D9C8() == FALSE) + if (LoadDroughtWeatherPalettes() == FALSE) gWeatherPtr->initStep++; break; case 3: @@ -2322,7 +2320,7 @@ void SetSav1WeatherFromCurrMapHeader(void) void SetWeather(u32 weather) { SetSav1Weather(weather); - DoWeatherEffect(GetSav1Weather()); + ChangeWeather(GetSav1Weather()); } void SetWeather_Unused(u32 weather) @@ -2333,7 +2331,7 @@ void SetWeather_Unused(u32 weather) void DoCurrentWeather(void) { - DoWeatherEffect(GetSav1Weather()); + ChangeWeather(GetSav1Weather()); } void sub_8080750(void) diff --git a/src/field/overworld.c b/src/field/overworld.c index a6d34e103..fc313693a 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -590,7 +590,7 @@ bool8 sub_80538D0(u16 x, u16 y) void sub_80538F0(u8 mapGroup, u8 mapNum) { - s32 i; + s32 paletteIndex; Overworld_SetWarpDestination(mapGroup, mapNum, -1, -1, -1); sub_8053F0C(); @@ -611,8 +611,8 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) sub_8056D38(gMapHeader.mapData); apply_map_tileset2_palette(gMapHeader.mapData); - for (i = 6; i < 12; i++) - sub_807D874(i); + for (paletteIndex = 6; paletteIndex < 12; paletteIndex++) + sub_807D874(paletteIndex); sub_8072ED0(); UpdateLocationHistoryForRoamer(); diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index d8e099130..8b4a1bb28 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -357,7 +357,7 @@ static void sub_8123878(u8 taskId) case 0: if (sCableCarPtr->unk_0006 == sCableCarPtr->unk_0004) { - DoWeatherEffect(sCableCarPtr->unk_0002); + ChangeWeather(sCableCarPtr->unk_0002); sCableCarPtr->unk_0001 = 1; } break; -- cgit v1.2.3 From 7383117626ebb2b3d993e5ad8855da5752c9cce8 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 20 Jan 2018 14:36:32 -0600 Subject: turns out graphics are the same. I forgot to run 'make clean' :( --- data/graphics.s | 16 ---------------- .../outline_cursor_debug/outline_cursor_00.png | Bin 78 -> 0 bytes .../outline_cursor_debug/outline_cursor_01.png | Bin 113 -> 0 bytes .../outline_cursor_debug/outline_cursor_02.png | Bin 113 -> 0 bytes .../outline_cursor_debug/outline_cursor_03.png | Bin 113 -> 0 bytes .../outline_cursor_debug/outline_cursor_04.png | Bin 113 -> 0 bytes .../outline_cursor_debug/outline_cursor_05.png | Bin 113 -> 0 bytes .../outline_cursor_debug/outline_cursor_06.png | Bin 113 -> 0 bytes .../outline_cursor_debug/outline_cursor_07.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_08.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_09.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_10.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_11.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_12.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_13.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_14.png | Bin 112 -> 0 bytes .../outline_cursor_debug/outline_cursor_15.png | Bin 111 -> 0 bytes src/data/menu_cursor_de.h | 19 ------------------- 18 files changed, 35 deletions(-) delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_00.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_01.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_02.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_03.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_04.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_05.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_06.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_07.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_08.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_09.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_10.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_11.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_12.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_13.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_14.png delete mode 100644 graphics/interface/outline_cursor_debug/outline_cursor_15.png diff --git a/data/graphics.s b/data/graphics.s index 5a8af35df..e68a2130a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,12 +18,8 @@ gUnknown_08D00524:: @ 8D00524 .include "data/graphics/pokemon/circled_question_mark_graphics.inc" @ 8D019E4 -.if DEBUG - .incbin "baserom_de_debug.gba", 0xD019E4, 0xD02458-0xD019E4 -.else .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff .incbin "graphics/unused/old_charmap.bin.lz" -.endif .incbin "graphics/unused/old_charmap.gbapal.lz" .align 2 @@ -2871,11 +2867,7 @@ gBattleAnimSpritePalette_068:: @ 8E69628 .align 2 gContestApplauseGfx:: -.if DEBUG - .incbin "baserom_de_debug.gba", 0xE696E0, 0xE69818-0xE696E0 -.else .incbin "graphics/contest/applause.4bpp.lz" -.endif .align 2 gContestApplauseMeterGfx:: @ 8E6978C @@ -2986,11 +2978,7 @@ gUnknown_08E6C100:: @ 8E6C100 .align 2 gUnknown_08E6C920:: @ 8E6C920 -.if DEBUG - .incbin "baserom_de_debug.gba", 0xE6C9AC, 0xE6D3E0-0xE6C9AC -.else .incbin "graphics/berry_blender/outer.4bpp.lz" -.endif .align 2 gUnknown_08E6D354:: @ 8E6D354 @@ -3150,11 +3138,7 @@ gBattleAnimSpritePalette_188:: @ 8E7133C .align 2 gPartyMenuMisc_Gfx:: @ 8E71354 -.if DEBUG - .incbin "baserom_de_debug.gba", 0xE713E0, 0xE71730-0xE713E0 -.else .incbin "graphics/interface/party_menu_misc.4bpp.lz" -.endif .align 2 gPartyMenuMisc_Pal:: @ 8E716A0 diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_00.png b/graphics/interface/outline_cursor_debug/outline_cursor_00.png deleted file mode 100644 index 8a0cb601e..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_00.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_01.png b/graphics/interface/outline_cursor_debug/outline_cursor_01.png deleted file mode 100644 index 06c691712..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_01.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_02.png b/graphics/interface/outline_cursor_debug/outline_cursor_02.png deleted file mode 100644 index bbf2e3c11..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_02.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_03.png b/graphics/interface/outline_cursor_debug/outline_cursor_03.png deleted file mode 100644 index ae0d96a01..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_03.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_04.png b/graphics/interface/outline_cursor_debug/outline_cursor_04.png deleted file mode 100644 index 80f3e5063..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_04.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_05.png b/graphics/interface/outline_cursor_debug/outline_cursor_05.png deleted file mode 100644 index ec06e1daf..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_05.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_06.png b/graphics/interface/outline_cursor_debug/outline_cursor_06.png deleted file mode 100644 index edab769fc..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_06.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_07.png b/graphics/interface/outline_cursor_debug/outline_cursor_07.png deleted file mode 100644 index 1404affb0..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_07.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_08.png b/graphics/interface/outline_cursor_debug/outline_cursor_08.png deleted file mode 100644 index cfb72a578..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_08.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_09.png b/graphics/interface/outline_cursor_debug/outline_cursor_09.png deleted file mode 100644 index 4d8525a13..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_09.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_10.png b/graphics/interface/outline_cursor_debug/outline_cursor_10.png deleted file mode 100644 index 1bf65a4e1..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_10.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_11.png b/graphics/interface/outline_cursor_debug/outline_cursor_11.png deleted file mode 100644 index e0545ffe2..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_11.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_12.png b/graphics/interface/outline_cursor_debug/outline_cursor_12.png deleted file mode 100644 index b79b3cfe8..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_12.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_13.png b/graphics/interface/outline_cursor_debug/outline_cursor_13.png deleted file mode 100644 index 4ddef4874..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_13.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_14.png b/graphics/interface/outline_cursor_debug/outline_cursor_14.png deleted file mode 100644 index 34792f961..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_14.png and /dev/null differ diff --git a/graphics/interface/outline_cursor_debug/outline_cursor_15.png b/graphics/interface/outline_cursor_debug/outline_cursor_15.png deleted file mode 100644 index 8f958c189..000000000 Binary files a/graphics/interface/outline_cursor_debug/outline_cursor_15.png and /dev/null differ diff --git a/src/data/menu_cursor_de.h b/src/data/menu_cursor_de.h index 7be9e96aa..cd56f51d9 100644 --- a/src/data/menu_cursor_de.h +++ b/src/data/menu_cursor_de.h @@ -1,24 +1,6 @@ #ifndef GUARD_DATA_MENU_CURSOR_H #define GUARD_DATA_MENU_CURSOR_H -#if DEBUG -const u8 OutlineCursorTiles_00[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_00.4bpp"); -const u8 OutlineCursorTiles_01[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_01.4bpp"); -const u8 OutlineCursorTiles_02[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_02.4bpp"); -const u8 OutlineCursorTiles_03[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_03.4bpp"); -const u8 OutlineCursorTiles_04[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_04.4bpp"); -const u8 OutlineCursorTiles_05[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_05.4bpp"); -const u8 OutlineCursorTiles_06[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_06.4bpp"); -const u8 OutlineCursorTiles_07[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_07.4bpp"); -const u8 OutlineCursorTiles_08[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_08.4bpp"); -const u8 OutlineCursorTiles_09[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_09.4bpp"); -const u8 OutlineCursorTiles_10[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_10.4bpp"); -const u8 OutlineCursorTiles_11[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_11.4bpp"); -const u8 OutlineCursorTiles_12[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_12.4bpp"); -const u8 OutlineCursorTiles_13[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_13.4bpp"); -const u8 OutlineCursorTiles_14[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_14.4bpp"); -const u8 OutlineCursorTiles_15[] = INCBIN_U8("graphics/interface/outline_cursor_debug/outline_cursor_15.4bpp"); -#else const u8 OutlineCursorTiles_00[] = INCBIN_U8("graphics/interface/outline_cursor_00.4bpp"); const u8 OutlineCursorTiles_01[] = INCBIN_U8("graphics/interface/outline_cursor_01.4bpp"); const u8 OutlineCursorTiles_02[] = INCBIN_U8("graphics/interface/outline_cursor_02.4bpp"); @@ -35,7 +17,6 @@ const u8 OutlineCursorTiles_12[] = INCBIN_U8("graphics/interface/outline_cursor_ const u8 OutlineCursorTiles_13[] = INCBIN_U8("graphics/interface/outline_cursor_13.4bpp"); const u8 OutlineCursorTiles_14[] = INCBIN_U8("graphics/interface/outline_cursor_14.4bpp"); const u8 OutlineCursorTiles_15[] = INCBIN_U8("graphics/interface/outline_cursor_15.4bpp"); -#endif const struct OamData gOamData_842F11C = { .objMode = ST_OAM_OBJ_NORMAL, -- cgit v1.2.3 From 584a68eb9d7a7c9cfa8e8ee1873ebe495f4fdec7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 20 Jan 2018 16:02:30 -0600 Subject: use INCLUDE to include EWRAM and COMMON ld scripts --- ld_script.sed | 10 ---------- ld_script.txt | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ld_script.sed b/ld_script.sed index b91542b6f..76b18c301 100644 --- a/ld_script.sed +++ b/ld_script.sed @@ -1,14 +1,4 @@ -// { - r sym_ewram.ld - d -} - // { r sym_bss.ld d } - -// { - r sym_common.ld - d -} diff --git a/ld_script.txt b/ld_script.txt index 82ba46b9c..18de179bc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -9,7 +9,7 @@ SECTIONS { ewram (NOLOAD) : ALIGN(4) { - + INCLUDE "sym_ewram.ld" . = 0x40000; } @@ -26,7 +26,7 @@ SECTIONS { src/libs/m4a_2.o(.bss.code); /* COMMON starts at 0x3001760 */ - + INCLUDE "sym_common.ld" tools/agbcc/lib/libc.a:sbrkr.o(COMMON); end = .; . = 0x8000; -- cgit v1.2.3 From 003ed9293b2c51f0481ed31f0e0459cbecbf757e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 20 Jan 2018 14:17:03 -0800 Subject: More documentation of field_weather --- asm/pokemon_storage_system.s | 4 +- include/decoration.h | 2 +- include/field_weather.h | 49 ++++---- src/battle/battle_transition.c | 4 +- src/engine/cable_club.c | 4 +- src/engine/time_events.c | 2 +- src/field/choose_party.c | 2 +- src/field/decoration.c | 20 +-- src/field/field_effect.c | 12 +- src/field/field_effect_helpers.c | 4 +- src/field/field_fadetransition.c | 14 +-- src/field/field_weather.c | 259 +++++++++++++++++++++----------------- src/field/field_weather_effects.c | 11 +- src/field/item_menu.c | 4 +- src/field/item_use.c | 2 +- src/field/overworld.c | 2 +- src/field/player_pc.c | 12 +- src/field/scrcmd.c | 4 +- src/field/secret_base.c | 8 +- src/field/shop.c | 6 +- src/field/start_menu.c | 2 +- src/pokemon/pokemon_menu.c | 2 +- src/scene/cable_car.c | 7 +- 23 files changed, 229 insertions(+), 207 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 2ac873fcd..5b5dfbdd5 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -593,7 +593,7 @@ _08095EF4: .align 2, 0 _08095F18: .4byte gUnknown_083B600C _08095F1C: - bl sub_807D770 + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 bne _08095F28 @@ -732,7 +732,7 @@ _08096030: .4byte gPCText_OnlyOne _08096034: movs r0, 0x1 movs r1, 0 - bl fade_screen + bl FadeScreen movs r0, 0x4 strh r0, [r4, 0x8] b _080960F4 diff --git a/include/decoration.h b/include/decoration.h index 74ca47a3a..c38bd1bcb 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -160,7 +160,7 @@ extern const struct YesNoFuncTable gUnknown_083ECAA0; extern u8 sub_8134194(u8); // src/decoration_inventory extern bool8 sub_81341D4(void); // src/decoration_inventory extern void sub_8134104(u8); // src/decoration_inventory -extern bool8 sub_807D770(void); +extern bool8 IsWeatherNotFadingIn(void); extern void sub_8109DAC(u8); // src/trader extern void ReshowPlayerPC(u8); // src/player_pc void Task_SecretBasePC_Decoration(u8); diff --git a/include/field_weather.h b/include/field_weather.h index 15be9229d..0bdebf747 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -1,7 +1,15 @@ #ifndef GUARD_WEATHER_H #define GUARD_WEATHER_H -struct Sprite; +#include "sprite.h" + +// Controls how the weather should be changing the screen palettes. +enum { + WEATHER_PAL_STATE_CHANGING_WEATHER, + WEATHER_PAL_STATE_SCREEN_FADING_IN, + WEATHER_PAL_STATE_SCREEN_FADING_OUT, + WEATHER_PAL_STATE_IDLE, +}; struct Weather { @@ -30,10 +38,10 @@ struct Weather u8 gammaStepDelay; u8 gammaStepFrameCounter; u16 fadeDestColor; - u8 unknown_6C6; - u8 unknown_6C7; - u8 unknown_6C8; - u8 unknown_6C9; + u8 palProcessingState; + u8 fadeScreenCounter; + bool8 readyForInit; + u8 taskId; u8 unknown_6CA; u8 unknown_6CB; u16 initStep; @@ -41,8 +49,8 @@ struct Weather u8 currWeather; u8 nextWeather; u8 weatherGfxLoaded; - u8 unknown_6D3; - u8 unknown_6D4; + bool8 weatherChangeComplete; + u8 weatherPicSpritePalIndex; u8 altGammaSpritePalIndex; u16 unknown_6D6; u8 unknown_6D8; @@ -66,8 +74,8 @@ struct Weather u16 fog1ScrollPosX; u16 unknown_6F0; u16 unknown_6F2; - u8 unknown_6F4[6]; - u8 unknown_6FA; + u8 lightenedFogSpritePals[6]; + u8 lightenedFogSpritePalsCount; u8 fog1SpritesCreated; u16 unknown_6FC; u16 unknown_6FE; @@ -121,17 +129,7 @@ void Task_WeatherInit(u8); void Task_WeatherMain(u8); void sub_807CAE8(void); void nullsub_38(void); -void sub_807CCAC(void); -u8 RainSnowShadeBlend_807CDC4(void); -u8 DroughtBlend_807CE24(void); -u8 Fog1Blend_807CE7C(void); -void nullsub_39(void); - -// ASM -void BlendSomething_807CEBC(u8, u8, s8); -void BlendSomething_807D1BC(u8 a, u8 a2, s8 c, u8 d, u16 e); -void BlendSomething_807D424(u8, u16); -// ... +void SetWeatherScreenFadeOut(void); enum { @@ -141,10 +139,10 @@ enum FADE_TO_WHITE, }; -void fade_screen(u8, u8); +void FadeScreen(u8, u8); // ... -void sub_807D78C(u8 tag); -void sub_807D874(u8); +void UpdateSpritePaletteWithWeather(u8 tag); +void ApplyWeatherGammaShiftToPal(u8); // ... void Weather_SetBlendCoeffs(u8, u8); // ... @@ -157,8 +155,8 @@ void SetSav1WeatherFromCurrMapHeader(void); void DoCurrentWeather(void); void sub_8080750(); -bool8 sub_807D770(void); -bool8 sub_807DDFC(void); +bool8 IsWeatherNotFadingIn(void); +bool8 IsWeatherChangeComplete(void); void SetWeather(u32); void UpdateWeatherPerDay(u16); void PreservePaletteInWeather(u8 index); @@ -167,6 +165,7 @@ extern void ResetDroughtWeatherPaletteLoading(void); void ResetDroughtWeatherPaletteLoading(void); bool8 LoadDroughtWeatherPalettes(void); u8 GetCurrentWeather(void); +void LoadCustomWeatherSpritePalette(const u16 *palette); extern struct Weather gWeather; diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c index f7cdc0694..a94974b27 100644 --- a/src/battle/battle_transition.c +++ b/src/battle/battle_transition.c @@ -6,6 +6,7 @@ #include "palette.h" #include "trig.h" #include "field_effect.h" +#include "field_weather.h" #include "random.h" #include "sprite.h" #include "sound.h" @@ -15,7 +16,6 @@ #include "ewram.h" #include "scanline_effect.h" -void sub_807DE10(void); void ScanlineEffect_Clear(void); extern const struct OamData gFieldOamData_32x32; @@ -567,7 +567,7 @@ static void Task_BattleTransitionMain(u8 taskID) static bool8 Transition_Phase1(struct Task* task) { - sub_807DE10(); + SetWeatherScreenFadeOut(); CpuCopy32(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); if (sPhase1_Tasks[task->tTransitionID] != NULL) { diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 44d832e2b..e7c504c7b 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -676,7 +676,7 @@ static void sub_808382C(u8 taskId) switch (task->data[0]) { case 0: - fade_screen(1, 0); + FadeScreen(1, 0); gLinkType = 0x2211; ClearLinkCallback_2(); task->data[0]++; @@ -812,7 +812,7 @@ static void sub_8083AAC(u8 taskId) { case 0: ScriptContext2_Enable(); - fade_screen(1, 0); + FadeScreen(1, 0); ClearLinkCallback_2(); task->data[0]++; break; diff --git a/src/engine/time_events.c b/src/engine/time_events.c index 3e3054aa3..4bd732788 100644 --- a/src/engine/time_events.c +++ b/src/engine/time_events.c @@ -93,7 +93,7 @@ void UpdateShoalTideFlag(void) static void Task_WaitWeather(u8 taskId) { - if (sub_807DDFC()) + if (IsWeatherChangeComplete()) { EnableBothScriptContexts(); DestroyTask(taskId); diff --git a/src/field/choose_party.c b/src/field/choose_party.c index 3ba04e489..18d26f007 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -930,7 +930,7 @@ void sub_81231AC(void) static void sub_81231C4(u8 taskId) { - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { DestroyTask(taskId); ScriptContext2_Disable(); diff --git a/src/field/decoration.c b/src/field/decoration.c index 1cc3bbe06..0e7fa5f41 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -2239,7 +2239,7 @@ void sub_80FF5BC(u8 taskId) { if (sub_80FF58C() == TRUE) { - fade_screen(1, 0); + FadeScreen(1, 0); gTasks[taskId].data[2] = 0; gTasks[taskId].func = sub_80FF6AC; } else @@ -2289,7 +2289,7 @@ void sub_80FF6AC(u8 taskId) gTasks[taskId].data[2] = 2; break; case 2: - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { gTasks[taskId].data[12] = 0; sub_810065C(taskId); @@ -3193,7 +3193,7 @@ void sub_810026C(u8 taskId) void sub_810028C(u8 taskId) { - fade_screen(1, 0); + FadeScreen(1, 0); gTasks[taskId].data[2] = 0; gTasks[taskId].func = c1_overworld_prev_quest; } @@ -3222,7 +3222,7 @@ void c1_overworld_prev_quest(u8 taskId) void sub_8100334(u8 taskId) { - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { gTasks[taskId].func = sub_80FE948; } @@ -3629,7 +3629,7 @@ void sub_8100A0C(u8 taskId) { if (sub_8100D38(taskId) == 1) { - fade_screen(1, 0); + FadeScreen(1, 0); gTasks[taskId].data[2] = 0; gTasks[taskId].func = sub_8100E70; } else @@ -3735,7 +3735,7 @@ void sub_8100C88(u8 taskId) gTasks[taskId].data[2] = 3; break; case 3: - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { gTasks[taskId].data[13] = -1; DisplayItemMessageOnField(taskId, gSecretBaseText_DecorReturned, sub_81010F0, 0); @@ -3800,7 +3800,7 @@ void sub_8100E70(u8 taskId) data[2] = 2; break; case 2: - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { data[12] = 1; sub_8100EEC(taskId); @@ -4138,7 +4138,7 @@ void sub_8101518(u8 taskId) void sub_810153C(u8 taskId) { - fade_screen(1, 0); + FadeScreen(1, 0); gTasks[taskId].data[2] = 0; gTasks[taskId].func = sub_8100C88; } @@ -4157,7 +4157,7 @@ void sub_8101590(u8 taskId) void sub_81015B0(u8 taskId) { - fade_screen(1, 0); + FadeScreen(1, 0); gTasks[taskId].data[2] = 0; gTasks[taskId].func = sub_81015E0; } @@ -4184,7 +4184,7 @@ void sub_81015E0(u8 taskId) void sub_8101648(u8 taskId) { - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { gTasks[taskId].func = Task_DecorationPCProcessMenuInput; } diff --git a/src/field/field_effect.c b/src/field/field_effect.c index a3134552d..ad570cf7f 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -407,7 +407,7 @@ void FieldEffectScript_LoadFadedPalette(u8 **script) { struct SpritePalette *palette = (struct SpritePalette *)FieldEffectScript_ReadWord(script); LoadSpritePalette(palette); - sub_807D78C(IndexOfSpritePaletteTag(palette->tag)); + UpdateSpritePaletteWithWeather(IndexOfSpritePaletteTag(palette->tag)); (*script) += 4; } @@ -1091,7 +1091,7 @@ void task00_8084310(u8 taskId) task = &gTasks[taskId]; if (!task->data[0]) { - if (!sub_807D770()) + if (!IsWeatherNotFadingIn()) { return; } @@ -1191,7 +1191,7 @@ bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0] bool8 sub_8086854(struct Task *task) // gUnknown_0839F2CC[1] { - if (sub_807D770()) + if (IsWeatherNotFadingIn()) { task->data[0]++; } @@ -1813,7 +1813,7 @@ bool8 sub_80874CC(struct Task *task, struct MapObject *mapObject, struct Sprite bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite) { - if (sub_807D770()) + if (IsWeatherNotFadingIn()) { gFieldEffectArguments[0] = mapObject->coords2.x; gFieldEffectArguments[1] = mapObject->coords2.y; @@ -2046,7 +2046,7 @@ void sub_8087A74(u8 taskId) void sub_8087AA4(struct Task *task) { - if (sub_807D770()) + if (IsWeatherNotFadingIn()) { task->data[0]++; task->data[15] = player_get_direction_lower_nybble(); @@ -2199,7 +2199,7 @@ void sub_8087E4C(struct Task *task) { struct Sprite *sprite; s16 centerToCornerVecY; - if (sub_807D770()) + if (IsWeatherNotFadingIn()) { sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c index 165829a55..93fc62bd5 100644 --- a/src/field/field_effect_helpers.c +++ b/src/field/field_effect_helpers.c @@ -95,7 +95,7 @@ static void npc_pal_op_B(struct MapObject *mapObject, u8 paletteNum) { pal_patch_for_npc(npc_paltag_by_palslot(paletteNum), paletteNum); } - sub_807D78C(paletteNum); + UpdateSpritePaletteWithWeather(paletteNum); } } @@ -107,7 +107,7 @@ static void npc_pal_op_A(struct MapObject *mapObject, u8 paletteNum) if (graphicsInfo->paletteTag2 != 0x11ff) { pal_patch_for_npc(graphicsInfo->paletteTag2, paletteNum); - sub_807D78C(paletteNum); + UpdateSpritePaletteWithWeather(paletteNum); } } diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c index 5014e97e3..ad1cd4a59 100644 --- a/src/field/field_fadetransition.c +++ b/src/field/field_fadetransition.c @@ -44,18 +44,18 @@ void pal_fill_for_map_transition(void) switch (fade_type_for_given_maplight_pair(map_light, Overworld_GetMapTypeOfSaveblockLocation())) { case 0: - fade_screen(0, 0); + FadeScreen(0, 0); palette_bg_fill_black(); break; case 1: - fade_screen(2, 0); + FadeScreen(2, 0); palette_bg_fill_white(); } } void pal_fill_black(void) { - fade_screen(0, 0); + FadeScreen(0, 0); palette_bg_fill_black(); } @@ -65,10 +65,10 @@ void fade_8080918(void) switch (sub_810CDB8(light_level, warp1_get_mapheader()->mapType)) { case 0: - fade_screen(1, 0); + FadeScreen(1, 0); break; case 1: - fade_screen(3, 0); + FadeScreen(3, 0); } } @@ -366,7 +366,7 @@ bool32 sub_8080E64(void) bool32 sub_8080E70(void) { - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) return TRUE; else return FALSE; @@ -483,7 +483,7 @@ void sub_8081050(u8 taskId) { case 0: ClearLinkCallback_2(); - fade_screen(1, 0); + FadeScreen(1, 0); sub_8053FF8(); PlaySE(SE_KAIDAN); data[0]++; diff --git a/src/field/field_weather.c b/src/field/field_weather.c index 2a5c311ab..7beb1b440 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -71,10 +71,18 @@ static const u8 *const sCompressedDroughtPalettes[] = // this file produces the same result as accessing gWeather directly. struct Weather *const gWeatherPtr = &gWeather; -static bool8 sub_807D574(u8); -static void DroughtBlendSomething_807D304(s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static bool8 LightenSpritePaletteInFog(u8); static void BuildGammaShiftTables(void); -static void UpdateGammaShift(void); +static void UpdateWeatherGammaShift(void); +static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex); +static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor); +static void ApplyFogBlend(u8 blendCoeff, u16 blendColor); +static bool8 FadeInScreen_RainShowShade(void); +static bool8 FadeInScreen_Drought(void); +static bool8 FadeInScreen_Fog1(void); +static void FadeInScreenWithWeather(void); +static void DoNothing(void); void None_Init(void); void None_Main(void); bool8 None_Finish(void); @@ -154,12 +162,12 @@ static const struct WeatherCallbacks sWeatherFuncs[] = {Bubbles_InitVars, Bubbles_Main, Bubbles_InitAll, Bubbles_Finish}, }; -void (*const gUnknown_083970B8[])(void) = +void (*const gWeatherPalStateFuncs[])(void) = { - UpdateGammaShift, - sub_807CCAC, - nullsub_39, - nullsub_39, + UpdateWeatherGammaShift, // WEATHER_PAL_STATE_CHANGING_WEATHER + FadeInScreenWithWeather, // WEATHER_PAL_STATE_SCREEN_FADING_IN + DoNothing, // WEATHER_PAL_STATE_SCREEN_FADING_OUT + DoNothing, // WEATHER_PAL_STATE_IDLE }; // This table specifies which of the gamma shift tables should be @@ -214,7 +222,7 @@ void StartWeather(void) CpuCopy32(gUnknown_083970E8, &gPlttBufferUnfaded[0x100 + index * 16], 32); BuildGammaShiftTables(); gWeatherPtr->altGammaSpritePalIndex = index; - gWeatherPtr->unknown_6D4 = AllocSpritePalette(0x1201); + gWeatherPtr->weatherPicSpritePalIndex = AllocSpritePalette(0x1201); gWeatherPtr->rainSpriteCount = 0; gWeatherPtr->unknown_6D8 = 0; gWeatherPtr->cloudSpritesCreated = 0; @@ -225,13 +233,13 @@ void StartWeather(void) gWeatherPtr->sandstormSprites1Created = 0; gWeatherPtr->sandstormSprites2Created = 0; gWeatherPtr->unknown_72E = 0; - gWeatherPtr->unknown_6FA = 0; + gWeatherPtr->lightenedFogSpritePalsCount = 0; Weather_SetBlendCoeffs(16, 0); gWeatherPtr->currWeather = 0; - gWeatherPtr->unknown_6C6 = 3; - gWeatherPtr->unknown_6C8 = 0; - gWeatherPtr->unknown_6D3 = 1; - gWeatherPtr->unknown_6C9 = CreateTask(Task_WeatherInit, 80); + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; + gWeatherPtr->readyForInit = FALSE; + gWeatherPtr->weatherChangeComplete = TRUE; + gWeatherPtr->taskId = CreateTask(Task_WeatherInit, 80); } } @@ -247,7 +255,7 @@ void ChangeWeather(u8 weather) sWeatherFuncs[weather].initVars(); } - gWeatherPtr->unknown_6D3 = 0; + gWeatherPtr->weatherChangeComplete = FALSE; gWeatherPtr->nextWeather = weather; gWeatherPtr->finishStep = 0; } @@ -264,12 +272,14 @@ void sub_807C9B4(u8 weather) PlayRainSoundEffect(); gWeatherPtr->currWeather = weather; gWeatherPtr->nextWeather = weather; - gWeatherPtr->unknown_6C8 = 1; + gWeatherPtr->readyForInit = TRUE; } void Task_WeatherInit(u8 taskId) { - if (gWeatherPtr->unknown_6C8) + // Waits until it's ok to initialize weather. + // When the screen fades in, this is set to TRUE. + if (gWeatherPtr->readyForInit) { sWeatherFuncs[gWeatherPtr->currWeather].initAll(); gTasks[taskId].func = Task_WeatherMain; @@ -282,18 +292,20 @@ void Task_WeatherMain(u8 taskId) { if (!sWeatherFuncs[gWeatherPtr->currWeather].finish()) { + // Finished cleaning up previous weather. Now transition to next weather. sWeatherFuncs[gWeatherPtr->nextWeather].initVars(); gWeatherPtr->gammaStepFrameCounter = 0; - gWeatherPtr->unknown_6C6 = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; gWeatherPtr->currWeather = gWeatherPtr->nextWeather; - gWeatherPtr->unknown_6D3 = 1; + gWeatherPtr->weatherChangeComplete = TRUE; } } else { sWeatherFuncs[gWeatherPtr->currWeather].main(); } - gUnknown_083970B8[gWeatherPtr->unknown_6C6](); + + gWeatherPalStateFuncs[gWeatherPtr->palProcessingState](); } void None_Init(void) @@ -383,11 +395,11 @@ static void BuildGammaShiftTables(void) // When the weather is changing, it gradually updates the palettes // towards the desired gamma shift. -static void UpdateGammaShift(void) +static void UpdateWeatherGammaShift(void) { if (gWeatherPtr->gammaIndex == gWeatherPtr->gammaTargetIndex) { - gWeatherPtr->unknown_6C6 = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } else { @@ -398,15 +410,17 @@ static void UpdateGammaShift(void) gWeatherPtr->gammaIndex++; else gWeatherPtr->gammaIndex--; - BlendSomething_807CEBC(0, 32, gWeatherPtr->gammaIndex); + + ApplyGammaShift(0, 32, gWeatherPtr->gammaIndex); } } } -void sub_807CCAC(void) +static void FadeInScreenWithWeather(void) { if (++gWeatherPtr->unknown_6CB > 1) gWeatherPtr->unknown_6CA = 0; + switch (gWeatherPtr->currWeather) { case WEATHER_RAIN_LIGHT: @@ -414,24 +428,24 @@ void sub_807CCAC(void) case WEATHER_RAIN_HEAVY: case WEATHER_SNOW: case WEATHER_SHADE: - if (RainSnowShadeBlend_807CDC4() == 0) + if (FadeInScreen_RainShowShade() == FALSE) { gWeatherPtr->gammaIndex = 3; - gWeatherPtr->unknown_6C6 = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_DROUGHT: - if (DroughtBlend_807CE24() == 0) + if (FadeInScreen_Drought() == FALSE) { gWeatherPtr->gammaIndex = -6; - gWeatherPtr->unknown_6C6 = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_FOG_1: - if (Fog1Blend_807CE7C() == 0) + if (FadeInScreen_Fog1() == FALSE) { gWeatherPtr->gammaIndex = 0; - gWeatherPtr->unknown_6C6 = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; case WEATHER_ASH: @@ -442,54 +456,58 @@ void sub_807CCAC(void) if (!gPaletteFade.active) { gWeatherPtr->gammaIndex = gWeatherPtr->gammaTargetIndex; - gWeatherPtr->unknown_6C6 = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } break; } } -u8 RainSnowShadeBlend_807CDC4(void) +bool8 FadeInScreen_RainShowShade(void) { - if (gWeatherPtr->unknown_6C7 == 0x10) - return 0; - if (++gWeatherPtr->unknown_6C7 >= 0x10) + if (gWeatherPtr->fadeScreenCounter == 16) + return FALSE; + + if (++gWeatherPtr->fadeScreenCounter >= 16) { - BlendSomething_807CEBC(0, 32, 3); - gWeatherPtr->unknown_6C7 = 0x10; - return 0; + ApplyGammaShift(0, 32, 3); + gWeatherPtr->fadeScreenCounter = 16; + return FALSE; } - BlendSomething_807D1BC(0, 32, 3, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); - return 1; + + ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); + return TRUE; } -u8 DroughtBlend_807CE24(void) +bool8 FadeInScreen_Drought(void) { - if (gWeatherPtr->unknown_6C7 == 0x10) - return 0; - if (++gWeatherPtr->unknown_6C7 >= 0x10) + if (gWeatherPtr->fadeScreenCounter == 16) + return FALSE; + + if (++gWeatherPtr->fadeScreenCounter >= 16) { - BlendSomething_807CEBC(0, 32, -6); - gWeatherPtr->unknown_6C7 = 0x10; - return 0; + ApplyGammaShift(0, 32, -6); + gWeatherPtr->fadeScreenCounter = 16; + return FALSE; } - DroughtBlendSomething_807D304(-6, 0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); - return 1; -} -u8 Fog1Blend_807CE7C(void) -{ - if (gWeatherPtr->unknown_6C7 == 0x10) - return 0; - ++gWeatherPtr->unknown_6C7; - BlendSomething_807D424(0x10 - gWeatherPtr->unknown_6C7, gWeatherPtr->fadeDestColor); - return 1; + ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); + return TRUE; } -void nullsub_39(void) +bool8 FadeInScreen_Fog1(void) { + if (gWeatherPtr->fadeScreenCounter == 16) + return FALSE; + + gWeatherPtr->fadeScreenCounter++; + ApplyFogBlend(16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor); + return TRUE; } -void BlendSomething_807CEBC(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) +static void DoNothing(void) +{ } + +static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) { u16 curPalIndex; u16 palOffset; @@ -607,7 +625,7 @@ void BlendSomething_807CEBC(u8 startPalIndex, u8 numPalettes, s8 gammaIndex) } } -void BlendSomething_807D1BC(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) +static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor) { u16 palOffset; u16 curPalIndex; @@ -658,7 +676,7 @@ void BlendSomething_807D1BC(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 } } -void DroughtBlendSomething_807D304(s8 gammaIndex, u8 blendCoeff, u16 blendColor) +void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor) { struct RGBColor color; u8 rBlend; @@ -713,7 +731,7 @@ void DroughtBlendSomething_807D304(s8 gammaIndex, u8 blendCoeff, u16 blendColor) } } -void BlendSomething_807D424(u8 blendCoeff, u16 blendColor) +void ApplyFogBlend(u8 blendCoeff, u16 blendColor) { struct RGBColor color; u8 rBlend; @@ -729,7 +747,7 @@ void BlendSomething_807D424(u8 blendCoeff, u16 blendColor) for (curPalIndex = 16; curPalIndex < 32; curPalIndex++) { - if (sub_807D574(curPalIndex)) + if (LightenSpritePaletteInFog(curPalIndex)) { u16 palEnd = (curPalIndex + 1) * 16; u16 palOffset = curPalIndex * 16; @@ -760,22 +778,22 @@ void BlendSomething_807D424(u8 blendCoeff, u16 blendColor) } } -void sub_807D540(u8 paletteIndex) +static void MarkFogSpritePalToLighten(u8 paletteIndex) { - if (gWeatherPtr->unknown_6FA < 6) + if (gWeatherPtr->lightenedFogSpritePalsCount < 6) { - gWeatherPtr->unknown_6F4[gWeatherPtr->unknown_6FA] = paletteIndex; - gWeatherPtr->unknown_6FA++; + gWeatherPtr->lightenedFogSpritePals[gWeatherPtr->lightenedFogSpritePalsCount] = paletteIndex; + gWeatherPtr->lightenedFogSpritePalsCount++; } } -bool8 sub_807D574(u8 paletteIndex) +static bool8 LightenSpritePaletteInFog(u8 paletteIndex) { u16 i; - for (i = 0; i < gWeatherPtr->unknown_6FA; i++) + for (i = 0; i < gWeatherPtr->lightenedFogSpritePalsCount; i++) { - if (gWeatherPtr->unknown_6F4[i] == paletteIndex) + if (gWeatherPtr->lightenedFogSpritePals[i] == paletteIndex) return TRUE; } @@ -784,18 +802,18 @@ bool8 sub_807D574(u8 paletteIndex) void sub_807D5BC(s8 gammaIndex) { - if (gWeatherPtr->unknown_6C6 == 3) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE) { - BlendSomething_807CEBC(0, 32, gammaIndex); + ApplyGammaShift(0, 32, gammaIndex); gWeatherPtr->gammaIndex = gammaIndex; } } void sub_807D5F0(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay) { - if (gWeatherPtr->unknown_6C6 == 3) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE) { - gWeatherPtr->unknown_6C6 = 0; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER; gWeatherPtr->gammaIndex = gammaIndex; gWeatherPtr->gammaTargetIndex = gammaTargetIndex; gWeatherPtr->gammaStepFrameCounter = 0; @@ -804,29 +822,29 @@ void sub_807D5F0(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay) } } -void fade_screen(u8 mode, u8 delay) +void FadeScreen(u8 mode, u8 delay) { u32 fadeColor; - bool8 fadeTo; + bool8 fadeOut; bool8 useWeatherPal; switch (mode) { case FADE_FROM_BLACK: fadeColor = 0; - fadeTo = FALSE; + fadeOut = FALSE; break; case FADE_FROM_WHITE: fadeColor = 0xFFFF; - fadeTo = FALSE; + fadeOut = FALSE; break; case FADE_TO_BLACK: fadeColor = 0; - fadeTo = TRUE; + fadeOut = TRUE; break; case FADE_TO_WHITE: fadeColor = 0xFFFF; - fadeTo = TRUE; + fadeOut = TRUE; break; default: return; @@ -848,59 +866,63 @@ void fade_screen(u8 mode, u8 delay) break; } - if (fadeTo) + if (fadeOut) { if (useWeatherPal) CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); + BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor); - gWeatherPtr->unknown_6C6 = 2; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; } else { gWeatherPtr->fadeDestColor = fadeColor; if (useWeatherPal) - gWeatherPtr->unknown_6C7 = 0; + gWeatherPtr->fadeScreenCounter = 0; else BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor); - gWeatherPtr->unknown_6C6 = 1; + + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; gWeatherPtr->unknown_6CA = 1; gWeatherPtr->unknown_6CB = 0; Weather_SetBlendCoeffs(gWeatherPtr->currBlendEVA, gWeatherPtr->currBlendEVB); - gWeatherPtr->unknown_6C8 = 1; + gWeatherPtr->readyForInit = TRUE; } } -bool8 sub_807D770(void) +bool8 IsWeatherNotFadingIn(void) { - return (gWeatherPtr->unknown_6C6 != 1); + return (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_IN); } -void sub_807D78C(u8 spritePaletteIndex) +void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex) { u16 paletteIndex = 16 + spritePaletteIndex; u16 i; - switch (gWeatherPtr->unknown_6C6) + switch (gWeatherPtr->palProcessingState) { - case 1: + case WEATHER_PAL_STATE_SCREEN_FADING_IN: if (gWeatherPtr->unknown_6CA != 0) { if (gWeatherPtr->currWeather == WEATHER_FOG_1) - sub_807D540(paletteIndex); + MarkFogSpritePalToLighten(paletteIndex); paletteIndex *= 16; for (i = 0; i < 16; i++) gPlttBufferFaded[paletteIndex + i] = gWeatherPtr->fadeDestColor; } break; - case 2: + case WEATHER_PAL_STATE_SCREEN_FADING_OUT: paletteIndex *= 16; CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, 32); BlendPalette(paletteIndex, 16, gPaletteFade.y, gPaletteFade.blendColor); break; + // WEATHER_PAL_STATE_CHANGING_WEATHER + // WEATHER_PAL_STATE_CHANGING_IDLE default: if (gWeatherPtr->currWeather != WEATHER_FOG_1) { - BlendSomething_807CEBC(paletteIndex, 1, gWeatherPtr->gammaIndex); + ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex); } else { @@ -911,23 +933,23 @@ void sub_807D78C(u8 spritePaletteIndex) } } -void sub_807D874(u8 paletteIndex) +void ApplyWeatherGammaShiftToPal(u8 paletteIndex) { - BlendSomething_807CEBC(paletteIndex, 1, gWeatherPtr->gammaIndex); + ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex); } u8 unref_sub_807D894(void) { - if (gWeatherPtr->unknown_6C6 == 1) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_SCREEN_FADING_IN) return gWeatherPtr->unknown_6CA; else return 0; } -void sub_807D8C0(const u16 *palette) +void LoadCustomWeatherSpritePalette(const u16 *palette) { - LoadPalette(palette, 0x100 + gWeatherPtr->unknown_6D4 * 16, 32); - sub_807D78C(gWeatherPtr->unknown_6D4); + LoadPalette(palette, 0x100 + gWeatherPtr->weatherPicSpritePalIndex * 16, 32); + UpdateSpritePaletteWithWeather(gWeatherPtr->weatherPicSpritePalIndex); } static void LoadDroughtWeatherPalette(u8 *gammaIndexPtr, u8 *b) @@ -1085,34 +1107,34 @@ void unref_sub_807DCB4(u8 a) switch (a) { case 1: - SetWeather(1); + SetWeather(WEATHER_CLOUDS); break; case 2: - SetWeather(2); + SetWeather(WEATHER_SUNNY); break; case 3: - SetWeather(3); + SetWeather(WEATHER_RAIN_LIGHT); break; case 4: - SetWeather(4); + SetWeather(WEATHER_SNOW); break; case 5: - SetWeather(5); + SetWeather(WEATHER_RAIN_MED); break; case 6: - SetWeather(6); + SetWeather(WEATHER_FOG_1); break; case 7: - SetWeather(9); + SetWeather(WEATHER_FOG_2); break; case 8: - SetWeather(7); + SetWeather(WEATHER_ASH); break; case 9: - SetWeather(8); + SetWeather(WEATHER_SANDSTORM); break; case 10: - SetWeather(11); + SetWeather(WEATHER_SHADE); break; } } @@ -1122,11 +1144,11 @@ u8 GetCurrentWeather(void) return gWeatherPtr->currWeather; } -void SetRainStrengthFromSoundEffect(u16 sndEff) +void SetRainStrengthFromSoundEffect(u16 soundEffect) { - if (gWeatherPtr->unknown_6C6 != 2) + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT) { - switch (sndEff) + switch (soundEffect) { case SE_T_KOAME: gWeatherPtr->rainStrength = 0; @@ -1140,7 +1162,8 @@ void SetRainStrengthFromSoundEffect(u16 sndEff) default: return; } - PlaySE(sndEff); + + PlaySE(soundEffect); } } @@ -1164,19 +1187,19 @@ void PlayRainSoundEffect(void) } } -u8 sub_807DDFC(void) +u8 IsWeatherChangeComplete(void) { - return gWeatherPtr->unknown_6D3; + return gWeatherPtr->weatherChangeComplete; } -void sub_807DE10(void) +void SetWeatherScreenFadeOut(void) { - gWeatherPtr->unknown_6C6 = 2; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; } void unref_sub_807DE24(void) { - gWeatherPtr->unknown_6C6 = 3; + gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; } void PreservePaletteInWeather(u8 preservedPalIndex) diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c index 0fee26b89..eff702f8c 100644 --- a/src/field/field_weather_effects.c +++ b/src/field/field_weather_effects.c @@ -75,7 +75,6 @@ static const struct SpriteTemplate sCloudSpriteTemplate = }; extern void sub_807D5BC(s8 gammaIndex); -extern void sub_807D8C0(const u16 *palette); extern void sub_807DA14(void); extern void sub_807DA4C(void); extern void Weather_SetTargetBlendCoeffs(u8 a, u8 b, int c); @@ -182,7 +181,7 @@ void CreateCloudSprites(void) if (gWeatherPtr->cloudSpritesCreated == TRUE) return; LoadSpriteSheet(&sCloudSpriteSheet); - sub_807D8C0(gUnknown_08397108); + LoadCustomWeatherSpritePalette(gUnknown_08397108); for (i = 0; i < 3; i++) { u8 spriteId = CreateSprite(&sCloudSpriteTemplate, 0, 0, 0xFF); @@ -252,7 +251,7 @@ void Drought_Main(void) switch (gWeatherPtr->initStep) { case 0: - if (gWeatherPtr->unknown_6C6 != 0) + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_CHANGING_WEATHER) gWeatherPtr->initStep++; break; case 1: @@ -1137,7 +1136,7 @@ void Rain_Main(void) gWeatherPtr->initStep++; break; case 3: - if (gWeatherPtr->unknown_6C6 == 0) + if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_CHANGING_WEATHER) break; gWeatherPtr->initStep = 6; break; @@ -1211,7 +1210,7 @@ void Rain_Main(void) gWeatherPtr->initStep++; break; case 14: - if (gWeatherPtr->unknown_6C6 != 3) + if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_IDLE) break; gWeatherPtr->unknown_6EA = 1; gWeatherPtr->initStep = 4; @@ -2013,7 +2012,7 @@ void CreateSandstormSprites_1(void) if (!gWeatherPtr->sandstormSprites1Created) { LoadSpriteSheet(&sSandstormSpriteSheet); - sub_807D8C0(gUnknown_08397128); + LoadCustomWeatherSpritePalette(gUnknown_08397128); for (i = 0; i < 20; i++) { u8 spriteId = CreateSpriteAtEnd(&sSandstormSpriteTemplate, 0, (i / 5) * 64, 1); diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 6bad9f4d6..959eb09ae 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -47,7 +47,7 @@ extern void sub_808B5B4(); extern u8 sub_80F92F4(); extern void sub_80C9C7C(u8); extern void pal_fill_black(void); -extern bool8 sub_807D770(void); +extern bool8 IsWeatherNotFadingIn(void); extern u8 sub_80F931C(); extern void sub_808A3F8(u8); extern void Shop_FadeReturnToMartMenu(void); @@ -2699,7 +2699,7 @@ void ExecuteItemUseFromBlackPalette(void) static void Task_CallItemUseOnFieldCallback(u8 taskId) { - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) gFieldItemUseCallback(taskId); } diff --git a/src/field/item_use.c b/src/field/item_use.c index cdad3f840..219ef5080 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -100,7 +100,7 @@ void ItemMenu_ConfirmNormalFade(u8 var) void ItemMenu_ConfirmComplexFade(u8 var) { ExecuteSwitchToOverworldFromItemUse(var); - fade_screen(1, 0); + FadeScreen(1, 0); } void SetUpItemUseOnFieldCallback(u8 taskId) diff --git a/src/field/overworld.c b/src/field/overworld.c index fc313693a..07453e4fe 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -612,7 +612,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) apply_map_tileset2_palette(gMapHeader.mapData); for (paletteIndex = 6; paletteIndex < 12; paletteIndex++) - sub_807D874(paletteIndex); + ApplyWeatherGammaShiftToPal(paletteIndex); sub_8072ED0(); UpdateLocationHistoryForRoamer(); diff --git a/src/field/player_pc.c b/src/field/player_pc.c index 3719b7c7a..27427ecaa 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -29,7 +29,7 @@ extern void DestroyVerticalScrollIndicator(u8); extern void PauseVerticalScrollIndicator(u8); extern void LoadScrollIndicatorPalette(void); extern void ClearMailStruct(struct MailStruct *); -extern u8 sub_807D770(void); +extern u8 IsWeatherNotFadingIn(void); extern void sub_808B020(void); extern void ClearVerticalScrollIndicatorPalettes(void); @@ -357,12 +357,12 @@ static void Task_ItemStorage_Deposit(u8 taskId) static void ItemStorage_Deposit(u8 taskId) { TASK.FUNC = Task_ItemStorage_Deposit; - fade_screen(1, 0); + FadeScreen(1, 0); } static void ItemStorage_HandleReturnToProcessInput(u8 taskId) { - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) TASK.FUNC = ItemStorageMenuProcessInput; } @@ -1196,7 +1196,7 @@ static void Mailbox_MailOptionsProcessInput(u8 taskId) static void Mailbox_DoMailRead(u8 taskId) { - fade_screen(1, 0); + FadeScreen(1, 0); TASK.FUNC = Mailbox_FadeAndReadMail; } @@ -1211,7 +1211,7 @@ static void Mailbox_FadeAndReadMail(u8 taskId) static void Mailbox_HandleReturnToProcessInput(u8 taskId) // Mailbox_HandleReturnToProcessInput { - if(sub_807D770() == TRUE) // is black fade finished? why not gPaletteFade.active? + if (IsWeatherNotFadingIn() == TRUE) // is black fade finished? why not gPaletteFade.active? TASK.FUNC = Mailbox_ProcessInput; } @@ -1280,7 +1280,7 @@ static void Mailbox_Give(u8 taskId) Mailbox_NoPokemonForMail(taskId); // cannot be reached normally else { - fade_screen(1, 0); + FadeScreen(1, 0); TASK.FUNC = Mailbox_DoGiveMailPokeMenu; } } diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c index 36edbe472..bc5cd0b1d 100644 --- a/src/field/scrcmd.c +++ b/src/field/scrcmd.c @@ -626,7 +626,7 @@ bool8 IsPaletteNotActive(void) bool8 ScrCmd_fadescreen(struct ScriptContext *ctx) { - fade_screen(ScriptReadByte(ctx), 0); + FadeScreen(ScriptReadByte(ctx), 0); SetupNativeScript(ctx, IsPaletteNotActive); return TRUE; } @@ -636,7 +636,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx) u8 duration = ScriptReadByte(ctx); u8 delay = ScriptReadByte(ctx); - fade_screen(duration, delay); + FadeScreen(duration, delay); SetupNativeScript(ctx, IsPaletteNotActive); return TRUE; } diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 134aebbc6..2d02de004 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -348,7 +348,7 @@ void sub_80BBA48(u8 taskid) void sub_80BBAF0(void) { CreateTask(sub_80BBA48, 0); - fade_screen(1, 0); + FadeScreen(1, 0); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); } @@ -362,7 +362,7 @@ bool8 sub_80BBB24(void) void sub_80BBB50(u8 taskid) { FieldObjectTurn(&(gMapObjects[gPlayerAvatar.mapObjectId]), 2); - if (sub_807D770() == 1) { + if (IsWeatherNotFadingIn() == 1) { EnableBothScriptContexts(); DestroyTask(taskid); } @@ -397,7 +397,7 @@ void sub_80BBC78(void) { u8 taskid = CreateTask(sub_80BBBEC, 0); gTasks[taskid].data[0] = 0; - fade_screen(1, 0); + FadeScreen(1, 0); } bool8 CurrentMapIsSecretBase(void) @@ -534,7 +534,7 @@ void sub_80BC074(u8 taskid) void sub_80BC0F8(void) { CreateTask(sub_80BC074, 0); - fade_screen(1, 0); + FadeScreen(1, 0); } void sub_80BC114(void) { diff --git a/src/field/shop.c b/src/field/shop.c index a228ff92f..e087628da 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -173,7 +173,7 @@ static void Task_HandleShopMenuBuy(u8 taskId) gTasks[taskId].data[8] = (u32)BuyMenuDrawGraphics >> 16; gTasks[taskId].data[9] = (u32)BuyMenuDrawGraphics; gTasks[taskId].func = Shop_FadeAndRunBuySellCallback; - fade_screen(1, 0); + FadeScreen(1, 0); } static void Task_HandleShopMenuSell(u8 taskId) @@ -181,7 +181,7 @@ static void Task_HandleShopMenuSell(u8 taskId) gTasks[taskId].data[8] = (u32)ItemMenu_LoadSellMenu >> 16; gTasks[taskId].data[9] = (u32)ItemMenu_LoadSellMenu; gTasks[taskId].func = Shop_FadeAndRunBuySellCallback; - fade_screen(1, 0); + FadeScreen(1, 0); } static void Task_HandleShopMenuQuit(u8 taskId) @@ -213,7 +213,7 @@ static void ReturnToShopMenuAfterExitingSellMenu(u8 taskId) static void Task_ReturnToMartMenu(u8 taskId) { - if (sub_807D770() == 1) + if (IsWeatherNotFadingIn() == 1) { if (gMartInfo.martType == MART_TYPE_2) DisplayItemMessageOnField(taskId, gOtherText_CanIHelpYou, ReturnToShopMenuAfterExitingSellMenu, 0); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 89cd404e9..381c19bb7 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -329,7 +329,7 @@ static u8 StartMenu_InputProcessCallback(void) if (gMenuCallback != StartMenu_SaveCallback && gMenuCallback != StartMenu_ExitCallback && gMenuCallback != StartMenu_RetireCallback) - fade_screen(1, 0); + FadeScreen(1, 0); return 0; } if (gMain.newKeys & (START_BUTTON | B_BUTTON)) diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index a41e197f2..c0cae9353 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -786,7 +786,7 @@ void FieldCallback_Teleport(void) static void sub_808ABA8(u8 taskID) { - if (sub_807D770() == TRUE) + if (IsWeatherNotFadingIn() == TRUE) { gFieldEffectArguments[0] = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES); gUnknown_03005CE4(); diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index 8b4a1bb28..7faa8d844 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -18,6 +18,7 @@ #include "event_data.h" #include "cable_car_util.h" #include "constants/map_objects.h" +#include "constants/weather.h" // Static type declarations @@ -328,7 +329,7 @@ static void sub_8123740(void) i = 0; sub_8123FBC(0); gSpriteCoordOffsetX = 0; - sub_807C9B4(0); + sub_807C9B4(WEATHER_NONE); for (; i < 20; i++) { gWeatherPtr->sprites.s2.ashSprites[i] = NULL; @@ -769,7 +770,7 @@ static void LoadSprites(void) gSprites[spriteId].data[1] = 0x63; sCableCarPtr->unk_0002 = 7; sCableCarPtr->unk_0004 = 0x15e; - sub_807C9B4(2); + sub_807C9B4(WEATHER_SUNNY); break; case 1: CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); @@ -793,7 +794,7 @@ static void LoadSprites(void) gSprites[spriteId].data[1] = 0x41; sCableCarPtr->unk_0002 = 2; sCableCarPtr->unk_0004 = 0x109; - sub_807C9B4(7); + sub_807C9B4(WEATHER_ASH); break; } for (i = 0; i < 9; i++) -- cgit v1.2.3 From 8030b37e7585972f8c1b07b5d9200cf9975b89b0 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 20 Jan 2018 16:18:59 -0600 Subject: use manual ld scripts for common syms --- Makefile | 4 +- sym_common.txt | 854 +++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 616 insertions(+), 242 deletions(-) diff --git a/Makefile b/Makefile index 13c91f71d..7718ee523 100644 --- a/Makefile +++ b/Makefile @@ -115,8 +115,8 @@ $(LD_SCRIPT): $(BUILD_DIR)/sym_bss.ld $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sy cd $(BUILD_DIR) && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" >ld_script.ld $(BUILD_DIR)/sym_bss.ld: sym_bss.txt cd $(BUILD_DIR) && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt $(GAME_LANGUAGE) >sym_bss.ld -$(BUILD_DIR)/sym_common.ld: sym_common.txt $(C_OBJECTS) $(wildcard common_syms/*.txt) - cd $(BUILD_DIR) && ../../$(RAMSCRGEN) COMMON ../../sym_common.txt $(GAME_LANGUAGE) -c src,../../common_syms >sym_common.ld +$(BUILD_DIR)/sym_common.ld: sym_common.txt + $(CPP) -P $(CPPFLAGS) $< > $@ $(BUILD_DIR)/sym_ewram.ld: sym_ewram.txt cd $(BUILD_DIR) && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $(GAME_LANGUAGE) >sym_ewram.ld diff --git a/sym_common.txt b/sym_common.txt index a37aa05ff..1a523e7cb 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -1,240 +1,614 @@ - .include "engine/main.o" - .include "engine/sprite.o" - .include "engine/string_util.o" - .include "engine/link.o" - .include "engine/rtc.o" - .include "rom3.o" - -@ battle - - .align 2 -gBattle_BG3_X: @ 30041B0 - .space 0x4 - -gBattle_BG1_Y: @ 30041B4 - .space 0x4 - -gBattle_BG3_Y: @ 30041B8 - .space 0x8 - -gBattleTextBuff1: @ 30041C0 - .space 0x10 - -gUnknown_030041D0: @ 30041D0 - .space 0x30 - -gBattle_WIN1H: @ 3004200 - .space 0x10 - -gUnknown_03004210: @ 3004210 - .space 0x30 - -gBattle_WIN0V: @ 3004240 - .space 0x4 - -gBattle_WIN1V: @ 3004244 - .space 0xC - -gUnknown_03004250: @ 3004250 - .space 0x30 - -gBattle_BG2_Y: @ 3004280 - .space 0x4 - -gUnknown_03004284: @ 3004284 - .space 0x4 - -gBattle_BG2_X: @ 3004288 - .space 0x4 - -gBattleTerrain: @ 300428C - .space 0x4 - -gBattleTextBuff2: @ 3004290 - .space 0x10 - -gBattle_BG0_Y: @ 30042A0 - .space 0x4 - -gBattle_BG0_X: @ 30042A4 - .space 0xC - -gBattleTextBuff3: @ 30042B0 - .space 0x10 - -gBattle_BG1_X: @ 30042C0 - .space 0x4 - -gBattle_WIN0H: @ 30042C4 - .space 0xC - -gPreBattleCallback1: @ 30042D0 - .space 0x4 - -gBattleMainFunc: @ 30042D4 - .space 0xC - -gBattleResults: @ 30042E0 - .space 0x1C - -gUnknown_030042FC: @ 30042FC - .space 0xE - -gUnknown_0300430A: @ 300430A - .space 0xC - -gUnknown_03004316: @ 3004316 - .space 0xE - -gLeveledUpInBattle: @ 3004324 - .space 0xC - -gBattleBankFunc: @ 3004330 - .space 0x10 - -gHealthboxIDs: @ 3004340 - .space 0x4 - -gUnknown_03004344: @ 3004344 - .space 0x4 - -gUnknown_03004348: @ 3004348 - .space 0x4 - -gUnknown_0300434C: @ 300434C - .space 0x4 - - .include "pokemon/pokemon_1.o" - .include "engine/random.o" - .include "scene/egg_hatch.o" - .include "engine/load_save.o" - -@ trade - -gUnknown_03004824: @ 3004824 - .space 0x4 - -gUnknown_03004828: @ 3004828 - .space 0x8 - - .include "scene/berry_blender.o" - .include "field/overworld.o" - .include "field/fieldmap.o" - .include "field/field_camera.o" - .include "field/field_map_obj.o" - .include "field/field_control_avatar.o" - -@ party_menu? - - .align 2 -gPokemonItemUseCallback: @ 3004AE4 - .space 0x4 - - .include "field/start_menu.o" - .include "engine/sound.o" - .include "battle/battle_anim.o" - .include "engine/task.o" - .include "debug/mori_debug_menu.o" - -@ unknown_task - .include "scanline_effect.o" - .include "pokemon/pokemon_menu.o" - .include "pokemon/pokedex.o" - -@ pokemon_summary_screen - - .align 4 -gUnknown_03005CF0: @ 3005CF0 - .space 0x10 - -@ item_menu - - .align 4 -gFieldItemUseCallback: @ 3005D00 - .space 0x10 - -gBagPocketScrollStates: @ 3005D10 - .space 0x14 - -gCurrentBagPocketItemSlots: @ 3005D24 - .space 0x4 - -@ contest - - .align 2 -gUnknown_03005D28: @ 3005D28 - .space 0x4 - - .include "engine/record_mixing.o" - .include "debug/sound_check_menu.o" - .include "field/tv.o" - - .space 0x64 @ unused variable? - -@ mauville_old_man - - .align 4 -gUnknown_03005DA0: @ 3005DA0 - .space 0x48 - -@ cute_sketch - -gUnknown_03005DE8: @ 3005DE8 - .space 0x4 - -gUnknown_03005DEC: @ 3005DEC - .space 0x4 - -gUnknown_03005DF0: @ 3005DF0 - .space 0x4 - -gUnknown_03005DF4: @ 3005DF4 - .space 0x4 - -gUnknown_03005DF8: @ 3005DF8 - .space 0x4 - -gUnknown_03005DFC: @ 3005DFC - .space 0x4 - -gUnknown_03005E00: @ 3005E00 - .space 0x4 - -gUnknown_03005E04: @ 3005E04 - .space 0x4 - -gUnknown_03005E08: @ 3005E08 - .space 0x4 - -gUnknown_03005E0C: @ 3005E0C - .space 0x4 - - .include "scene/contest_painting.o" - .include "scene/evolution_scene.o" - -@ pokedex_cry_screen - -gUnknown_03005E98: @ 3005E98 - .space 0x4 - - .include "engine/save.o" - - .space 0x10 @ unused variable? - - .include "scene/intro.o" - -@ battle_anim_813F0F4 - - .align 2 -gUnknown_03005F0C: @ 3005F0C - .space 0x4 - -gUnknown_03005F10: @ 3005F10 - .space 0x4 - -gUnknown_03005F14: @ 3005F14 - .space 0xC - - .include "pokemon/pokeblock_feed.o" - .include "libs/m4a_2.o" - .include "libs/agb_flash.o" +. = ALIGN(4); +. = ALIGN(4); +gKeyRepeatStartDelay = .; +. += 0x4; +. = ALIGN(4); +gLinkTransferringData = .; +. += 0x4; +. = ALIGN(16); +gMain = .; +. += 0x440; +. = ALIGN(4); +gKeyRepeatContinueDelay = .; +. += 0x4; +. = ALIGN(4); +gSoftResetDisabled = .; +. += 0x4; +. = ALIGN(16); +gIntrTable = .; +. += 0x38; +. = ALIGN(4); +gLinkVSyncDisabled = .; +. += 0x4; +. = ALIGN(16); +IntrMain_Buffer = .; +. += 0x800; +. = ALIGN(4); +gPcmDmaCounter = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(16); +gSpriteOrder = .; +. += 0x40; +. = ALIGN(16); +gSpriteTileAllocBitmap = .; +. += 0x80; +. = ALIGN(4); +gSpriteCoordOffsetX = .; +. += 0x4; +. = ALIGN(4); +gOamLimit = .; +. += 0x4; +. = ALIGN(4); +gReservedSpriteTileCount = .; +. += 0x4; +. = ALIGN(4); +gSpriteCopyRequestCount = .; +. += 0x4; +. = ALIGN(16); +gSpriteCopyRequests = .; +. += 0x300; +. = ALIGN(4); +gSpriteCoordOffsetY = .; +. += 0x4; +. = ALIGN(16); +gOamMatrices = .; +. += 0x100; +. = ALIGN(4); +gShouldProcessSpriteCopyRequests = .; +. += 0x4; +. = ALIGN(4); +gOamMatrixAllocBitmap = .; +. += 0x4; +. = ALIGN(4); +gReservedSpritePaletteCount = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(16); +gUnknownStringVar = .; +. += 0x10; +. = ALIGN(4); +. = ALIGN(8); +word_3002910 = .; +. += 0x8; +. = ALIGN(4); +gLinkDebugValue1 = .; +. += 0x4; +. = ALIGN(16); +localLinkPlayerBlock = .; +. += 0x3C; +. = ALIGN(4); +gLinkErrorOccurred = .; +. += 0x4; +. += 0x4; +. = ALIGN(4); +gLinkDebugValue2 = .; +. += 0x4; +. += 0x4; + +#ifdef GERMAN +. = ALIGN(4); +deUnkValue1 = .; +. += 0x4; +. = ALIGN(4); +deUnkValue2 = .; +. += 0x4; +#endif + +. = ALIGN(4); +gLinkPlayerPending = .; +. += 0x4; +. = ALIGN(16); +gLinkPlayers = .; +. += 0x70; +. = ALIGN(4); +gBlockReceived = .; +. += 0x4; +. += 0x4; +. = ALIGN(4); +gLinkHeldKeys = .; +. += 0x4; +. = ALIGN(4); +gLinkTimeOutCounter = .; +. += 0x4; +. += 0x4; +. = ALIGN(16); +localLinkPlayer = .; +. += 0x1C; +. = ALIGN(16); +gRecvCmds = .; +. += 0x40; +. = ALIGN(4); +gLinkStatus = .; +. += 0x4; +. = ALIGN(4); +gLinkDummyBool = .; +. += 0x4; +. = ALIGN(4); +byte_3002A68 = .; +. += 0x4; +. = ALIGN(16); +gBlockSendBuffer = .; +. += 0x100; +. = ALIGN(4); +u8_array_3002B70 = .; +. += 0x4; +. = ALIGN(4); +gLinkType = .; +. += 0x4; +. = ALIGN(4); +u8_array_3002B78 = .; +. += 0x4; +. = ALIGN(16); +gBlockRecvBuffer = .; +. += 0x400; +. = ALIGN(4); +gSuppressLinkErrorMessage = .; +. += 0x4; +. = ALIGN(4); +gSavedLinkPlayerCount = .; +. += 0x4; +. = ALIGN(16); +gSendCmd = .; +. += 0x10; +. = ALIGN(4); +gSavedMultiplayerId = .; +. += 0x4; +. = ALIGN(4); +gReceivedRemoteLinkPlayers = .; +. += 0x4; +. = ALIGN(16); +gLinkTestBGInfo = .; +. += 0x10; +. = ALIGN(4); +gLinkCallback = .; +. += 0x4; +. = ALIGN(16); +gSavedLinkPlayers = .; +. += 0x70; +. = ALIGN(4); +gShouldAdvanceLinkState = .; +. += 0x4; +. = ALIGN(8); +gLinkTestBlockChecksums = .; +. += 0x8; +. += 0x4; +. = ALIGN(4); +gBlockRequestType = .; +. += 0x4; +. += 0x4; +. += 0x4; +. = ALIGN(4); +gLastSendQueueCount = .; +. += 0x4; +. = ALIGN(16); +gLink = .; +. += 0xFC0; +. = ALIGN(4); +gLastRecvQueueCount = .; +. += 0x4; +. = ALIGN(4); +gLinkSavedIme = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(8); +gLocalTime = .; +. += 0x8; +. = ALIGN(4); +. = ALIGN(16); +gBattleBuffersTransferData = .; +. += 0x170; +. = ALIGN(4); +gBattle_BG3_X = .; +. += 0x4; +gBattle_BG1_Y = .; +. += 0x4; +gBattle_BG3_Y = .; +. += 0x8; +gBattleTextBuff1 = .; +. += 0x10; +gUnknown_030041D0 = .; +. += 0x30; +gBattle_WIN1H = .; +. += 0x10; +gUnknown_03004210 = .; +. += 0x30; +gBattle_WIN0V = .; +. += 0x4; +gBattle_WIN1V = .; +. += 0xC; +gUnknown_03004250 = .; +. += 0x30; +gBattle_BG2_Y = .; +. += 0x4; +gUnknown_03004284 = .; +. += 0x4; +gBattle_BG2_X = .; +. += 0x4; +gBattleTerrain = .; +. += 0x4; +gBattleTextBuff2 = .; +. += 0x10; +gBattle_BG0_Y = .; +. += 0x4; +gBattle_BG0_X = .; +. += 0xC; +gBattleTextBuff3 = .; +. += 0x10; +gBattle_BG1_X = .; +. += 0x4; +gBattle_WIN0H = .; +. += 0xC; +gPreBattleCallback1 = .; +. += 0x4; +gBattleMainFunc = .; +. += 0xC; +gBattleResults = .; +. += 0x1C; +gUnknown_030042FC = .; +. += 0xE; +gUnknown_0300430A = .; +. += 0xC; +gUnknown_03004316 = .; +. += 0xE; +gLeveledUpInBattle = .; +. += 0xC; +gBattleBankFunc = .; +. += 0x10; +gHealthboxIDs = .; +. += 0x4; +gUnknown_03004344 = .; +. += 0x4; +gUnknown_03004348 = .; +. += 0x4; +gUnknown_0300434C = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gPlayerPartyCount = .; +. += 0x4; +. = ALIGN(16); +gPlayerParty = .; +. += 0x258; +. = ALIGN(4); +gEnemyPartyCount = .; +. += 0x4; +. = ALIGN(16); +gEnemyParty = .; +. += 0x258; +. = ALIGN(4); +. = ALIGN(4); +gRngValue = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gEggHatchData = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gFlashMemoryPresent = .; +. += 0x4; +gUnknown_03004824 = .; +. += 0x4; +gUnknown_03004828 = .; +. += 0x8; +. = ALIGN(4); +. = ALIGN(4); +gUnknown_03004830 = .; +. += 0x4; +. = ALIGN(4); +gInGameOpponentsNo = .; +. += 0x4; +. = ALIGN(16); +gUnknown_03004840 = .; +. += 0x14; +. = ALIGN(4); +gBerryBlenderData = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +word_3004858 = .; +. += 0x4; +. = ALIGN(4); +gFieldCallback = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03004860 = .; +. += 0x4; +. = ALIGN(4); +gFieldLinkPlayerCount = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(16); +gUnknown_03004870 = .; +. += 0xC; +. = ALIGN(4); +. = ALIGN(16); +gUnknown_03004880 = .; +. += 0x18; +. = ALIGN(4); +gUnknown_03004898 = .; +. += 0x4; +. = ALIGN(4); +gUnknown_0300489C = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(16); +gMapObjects = .; +. += 0x240; +. = ALIGN(4); +. = ALIGN(4); +gSelectedMapObject = .; +. += 0x4; +. = ALIGN(4); +gPokemonItemUseCallback = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gMenuCallback = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gDisableMusic = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gSoundAnimFramesToWait = .; +. += 0x4; +. = ALIGN(16); +gBattleAnimArgs = .; +. += 0x10; +. = ALIGN(16); +gAnimSpriteIndexArray = .; +. += 0x10; +. = ALIGN(4); +. = ALIGN(16); +gTasks = .; +. += 0x280; +. = ALIGN(4); +. = ALIGN(16); +gUnknown_03004DA0 = .; +. += 0x20; +. = ALIGN(4); +. = ALIGN(16); +gScanlineEffect = .; +. += 0x20; +. = ALIGN(16); +gScanlineEffectRegBuffers = .; +. += 0xF00; +. = ALIGN(4); +. = ALIGN(4); +gLastFieldPokeMenuOpened = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005CE4 = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gUnknown_03005CE8 = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005CEC = .; +. += 0x4; +. = ALIGN(16); +gUnknown_03005CF0 = .; +. += 0x10; +. = ALIGN(16); +gFieldItemUseCallback = .; +. += 0x10; +gBagPocketScrollStates = .; +. += 0x14; +gCurrentBagPocketItemSlots = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005D28 = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gUnknown_03005D2C = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gUnknown_03005D30 = .; +. += 0x4; +. = ALIGN(4); +gSoundTestCryNum = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gUnknown_03005D38 = .; +. += 0x4; +. += 0x64; +. = ALIGN(16); +gUnknown_03005DA0 = .; +. += 0x48; +gUnknown_03005DE8 = .; +. += 0x4; +gUnknown_03005DEC = .; +. += 0x4; +gUnknown_03005DF0 = .; +. += 0x4; +gUnknown_03005DF4 = .; +. += 0x4; +gUnknown_03005DF8 = .; +. += 0x4; +gUnknown_03005DFC = .; +. += 0x4; +gUnknown_03005E00 = .; +. += 0x4; +gUnknown_03005E04 = .; +. += 0x4; +gUnknown_03005E08 = .; +. += 0x4; +gUnknown_03005E0C = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gUnknown_03005E10 = .; +. += 0x4; +. = ALIGN(16); +gUnknown_03005E20 = .; +. += 0x20; +. = ALIGN(16); +gUnknown_03005E40 = .; +. += 0x4C; +. = ALIGN(4); +gUnknown_03005E8C = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005E90 = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gCB2_AfterEvolution = .; +. += 0x4; +gUnknown_03005E98 = .; +. += 0x4; +. = ALIGN(4); +. = ALIGN(4); +gFirstSaveSector = .; +. += 0x4; +. = ALIGN(4); +gPrevSaveCounter = .; +. += 0x4; +. = ALIGN(4); +gLastKnownGoodSector = .; +. += 0x4; +. = ALIGN(4); +gDamagedSaveSectors = .; +. += 0x4; +. = ALIGN(4); +gSaveCounter = .; +. += 0x4; +. = ALIGN(4); +gFastSaveSection = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005EB4 = .; +. += 0x4; +. = ALIGN(4); +gSaveFileStatus = .; +. += 0x4; +. = ALIGN(4); +gGameContinueCallback = .; +. += 0x4; +. += 0x10; +. = ALIGN(4); +. = ALIGN(4); +gIntroFrameCounter = .; +. += 0x4; +. = ALIGN(16); +gMultibootProgramStruct = .; +. += 0x2C; +. = ALIGN(4); +gUnknown_03005F0C = .; +. += 0x4; +gUnknown_03005F10 = .; +. += 0x4; +gUnknown_03005F14 = .; +. += 0xC; +. = ALIGN(4); +. = ALIGN(4); +gPokeblockFeedPokeSprite = .; +. += 0x4; +. = ALIGN(4); +gPokeblockFeedMonSpecies = .; +. += 0x4; +. = ALIGN(4); +gPokeblockMonNotFlipped = .; +. += 0x4; +. = ALIGN(4); +gPokeblockFeedMonSpriteID = .; +. += 0x4; +. = ALIGN(4); +gPokeblockFeedMonNature = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005F34 = .; +. += 0x4; +. = ALIGN(4); +gPokeblockFeedUnused0 = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005F3C = .; +. += 0x4; +. = ALIGN(4); +gUnknown_03005F40 = .; +. += 0x4; +. = ALIGN(16); +gPokeblockFeedPokeSpriteCopy = .; +. += 0x44; +. = ALIGN(4); +gUnknown_03005F94 = .; +. += 0x4; +. = ALIGN(16); +gUnknown_03005FA0 = .; +. += 0x30; +. = ALIGN(4); +. = ALIGN(16); +gSoundInfo = .; +. += 0xFB0; +. = ALIGN(16); +gPokemonCrySongs = .; +. += 0x68; +. = ALIGN(16); +gPokemonCryMusicPlayers = .; +. += 0x80; +. = ALIGN(16); +gMPlayJumpTable = .; +. += 0x90; +. = ALIGN(16); +gCgbChans = .; +. += 0x100; +. = ALIGN(16); +gPokemonCryTracks = .; +. += 0x140; +. = ALIGN(16); +gPokemonCrySong = .; +. += 0x34; +. = ALIGN(16); +gMPlay_BGM = .; +. += 0x40; +. = ALIGN(16); +gMPlay_SE1 = .; +. += 0x40; +. = ALIGN(16); +gMPlay_SE2 = .; +. += 0x40; +. = ALIGN(16); +gMPlayMemAccArea = .; +. += 0x10; +. = ALIGN(16); +gMPlay_SE3 = .; +. += 0x40; +. = ALIGN(4); +. = ALIGN(4); +gFlashTimeoutFlag = .; +. += 0x4; +. = ALIGN(4); +PollFlashStatus = .; +. += 0x4; +. = ALIGN(4); +WaitForFlashWrite = .; +. += 0x4; +. = ALIGN(4); +ProgramFlashSector = .; +. += 0x4; +. = ALIGN(4); +gFlash = .; +. += 0x4; +. = ALIGN(4); +ProgramFlashByte = .; +. += 0x4; +. = ALIGN(4); +gFlashNumRemainingBytes = .; +. += 0x4; +. = ALIGN(4); +EraseFlashChip = .; +. += 0x4; +. = ALIGN(4); +EraseFlashSector = .; +. += 0x4; +. = ALIGN(4); +gFlashMaxTime = .; +. += 0x4; -- cgit v1.2.3 From 933d63e1fd865ccca2ef8f75d6273d093a455900 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sat, 20 Jan 2018 18:34:37 -0500 Subject: make special ids global --- data/specials.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/specials.inc b/data/specials.inc index 6904a2b6b..73aa3e093 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -1,4 +1,5 @@ .macro def_special ptr +.global SPECIAL_\ptr .set SPECIAL_\ptr, __special__ .set __special__, __special__ + 1 .4byte \ptr -- cgit v1.2.3 From 7a4f92553a41fdd14a29ac038b512cb8603d2a0c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 20 Jan 2018 22:06:58 -0600 Subject: use C preprocessor to generate common syms file --- common_syms/battle/battle_anim.txt | 3 - common_syms/debug/mori_debug_menu.txt | 1 - common_syms/debug/sound_check_menu.txt | 2 - common_syms/engine/link.txt | 46 -- common_syms/engine/load_save.txt | 1 - common_syms/engine/main.txt | 9 - common_syms/engine/random.txt | 1 - common_syms/engine/record_mixing.txt | 1 - common_syms/engine/rtc.txt | 1 - common_syms/engine/save.txt | 9 - common_syms/engine/sound.txt | 1 - common_syms/engine/sprite.txt | 12 - common_syms/engine/string_util.txt | 1 - common_syms/engine/task.txt | 1 - common_syms/field/field_camera.txt | 3 - common_syms/field/field_control_avatar.txt | 1 - common_syms/field/field_map_obj.txt | 1 - common_syms/field/fieldmap.txt | 1 - common_syms/field/overworld.txt | 4 - common_syms/field/start_menu.txt | 1 - common_syms/field/tv.txt | 1 - common_syms/libs/agb_flash.txt | 10 - common_syms/libs/m4a_2.txt | 12 - common_syms/pokemon/pokeblock_feed.txt | 12 - common_syms/pokemon/pokedex.txt | 2 - common_syms/pokemon/pokemon_1.txt | 4 - common_syms/pokemon/pokemon_menu.txt | 2 - common_syms/rom3.txt | 1 - common_syms/scanline_effect.txt | 2 - common_syms/scene/berry_blender.txt | 4 - common_syms/scene/contest_painting.txt | 5 - common_syms/scene/cute_sketch.txt | 0 common_syms/scene/egg_hatch.txt | 1 - common_syms/scene/evolution_scene.txt | 1 - common_syms/scene/intro.txt | 2 - src/field/tv.c | 2 - sym_common.txt | 799 ++++++++--------------------- 37 files changed, 210 insertions(+), 750 deletions(-) delete mode 100644 common_syms/battle/battle_anim.txt delete mode 100644 common_syms/debug/mori_debug_menu.txt delete mode 100644 common_syms/debug/sound_check_menu.txt delete mode 100644 common_syms/engine/link.txt delete mode 100644 common_syms/engine/load_save.txt delete mode 100644 common_syms/engine/main.txt delete mode 100644 common_syms/engine/random.txt delete mode 100644 common_syms/engine/record_mixing.txt delete mode 100644 common_syms/engine/rtc.txt delete mode 100644 common_syms/engine/save.txt delete mode 100644 common_syms/engine/sound.txt delete mode 100644 common_syms/engine/sprite.txt delete mode 100644 common_syms/engine/string_util.txt delete mode 100644 common_syms/engine/task.txt delete mode 100644 common_syms/field/field_camera.txt delete mode 100644 common_syms/field/field_control_avatar.txt delete mode 100644 common_syms/field/field_map_obj.txt delete mode 100644 common_syms/field/fieldmap.txt delete mode 100644 common_syms/field/overworld.txt delete mode 100644 common_syms/field/start_menu.txt delete mode 100644 common_syms/field/tv.txt delete mode 100644 common_syms/libs/agb_flash.txt delete mode 100644 common_syms/libs/m4a_2.txt delete mode 100644 common_syms/pokemon/pokeblock_feed.txt delete mode 100644 common_syms/pokemon/pokedex.txt delete mode 100644 common_syms/pokemon/pokemon_1.txt delete mode 100644 common_syms/pokemon/pokemon_menu.txt delete mode 100644 common_syms/rom3.txt delete mode 100644 common_syms/scanline_effect.txt delete mode 100644 common_syms/scene/berry_blender.txt delete mode 100644 common_syms/scene/contest_painting.txt delete mode 100644 common_syms/scene/cute_sketch.txt delete mode 100644 common_syms/scene/egg_hatch.txt delete mode 100644 common_syms/scene/evolution_scene.txt delete mode 100644 common_syms/scene/intro.txt diff --git a/common_syms/battle/battle_anim.txt b/common_syms/battle/battle_anim.txt deleted file mode 100644 index a93ac9b5d..000000000 --- a/common_syms/battle/battle_anim.txt +++ /dev/null @@ -1,3 +0,0 @@ -gSoundAnimFramesToWait -gBattleAnimArgs -gAnimSpriteIndexArray diff --git a/common_syms/debug/mori_debug_menu.txt b/common_syms/debug/mori_debug_menu.txt deleted file mode 100644 index 77ab5531c..000000000 --- a/common_syms/debug/mori_debug_menu.txt +++ /dev/null @@ -1 +0,0 @@ -gUnknown_03004DA0 diff --git a/common_syms/debug/sound_check_menu.txt b/common_syms/debug/sound_check_menu.txt deleted file mode 100644 index e9e3032e6..000000000 --- a/common_syms/debug/sound_check_menu.txt +++ /dev/null @@ -1,2 +0,0 @@ -gUnknown_03005D30 -gSoundTestCryNum diff --git a/common_syms/engine/link.txt b/common_syms/engine/link.txt deleted file mode 100644 index faafda4d0..000000000 --- a/common_syms/engine/link.txt +++ /dev/null @@ -1,46 +0,0 @@ -word_3002910 -gLinkDebugValue1 -localLinkPlayerBlock -gLinkErrorOccurred -4 -gLinkDebugValue2 -4 -#begin GERMAN -deUnkValue1 -deUnkValue2 -#end -gLinkPlayerPending -gLinkPlayers -gBlockReceived -4 -gLinkHeldKeys -gLinkTimeOutCounter -4 -localLinkPlayer -gRecvCmds -gLinkStatus -gLinkDummyBool -byte_3002A68 -gBlockSendBuffer -u8_array_3002B70 -gLinkType -u8_array_3002B78 -gBlockRecvBuffer -gSuppressLinkErrorMessage -gSavedLinkPlayerCount -gSendCmd -gSavedMultiplayerId -gReceivedRemoteLinkPlayers -gLinkTestBGInfo -gLinkCallback -gSavedLinkPlayers -gShouldAdvanceLinkState -gLinkTestBlockChecksums -4 -gBlockRequestType -4 -4 -gLastSendQueueCount -gLink -gLastRecvQueueCount -gLinkSavedIme diff --git a/common_syms/engine/load_save.txt b/common_syms/engine/load_save.txt deleted file mode 100644 index 3b969deca..000000000 --- a/common_syms/engine/load_save.txt +++ /dev/null @@ -1 +0,0 @@ -gFlashMemoryPresent diff --git a/common_syms/engine/main.txt b/common_syms/engine/main.txt deleted file mode 100644 index a620083d1..000000000 --- a/common_syms/engine/main.txt +++ /dev/null @@ -1,9 +0,0 @@ -gKeyRepeatStartDelay -gLinkTransferringData -gMain -gKeyRepeatContinueDelay -gSoftResetDisabled -gIntrTable -gLinkVSyncDisabled -IntrMain_Buffer -gPcmDmaCounter diff --git a/common_syms/engine/random.txt b/common_syms/engine/random.txt deleted file mode 100644 index 794439ea5..000000000 --- a/common_syms/engine/random.txt +++ /dev/null @@ -1 +0,0 @@ -gRngValue diff --git a/common_syms/engine/record_mixing.txt b/common_syms/engine/record_mixing.txt deleted file mode 100644 index a6f4f8df3..000000000 --- a/common_syms/engine/record_mixing.txt +++ /dev/null @@ -1 +0,0 @@ -gUnknown_03005D2C diff --git a/common_syms/engine/rtc.txt b/common_syms/engine/rtc.txt deleted file mode 100644 index fa00a34d5..000000000 --- a/common_syms/engine/rtc.txt +++ /dev/null @@ -1 +0,0 @@ -gLocalTime diff --git a/common_syms/engine/save.txt b/common_syms/engine/save.txt deleted file mode 100644 index 4824255bf..000000000 --- a/common_syms/engine/save.txt +++ /dev/null @@ -1,9 +0,0 @@ -gFirstSaveSector -gPrevSaveCounter -gLastKnownGoodSector -gDamagedSaveSectors -gSaveCounter -gFastSaveSection -gUnknown_03005EB4 -gSaveFileStatus -gGameContinueCallback diff --git a/common_syms/engine/sound.txt b/common_syms/engine/sound.txt deleted file mode 100644 index 0f6f2fc75..000000000 --- a/common_syms/engine/sound.txt +++ /dev/null @@ -1 +0,0 @@ -gDisableMusic diff --git a/common_syms/engine/sprite.txt b/common_syms/engine/sprite.txt deleted file mode 100644 index fe38dc61f..000000000 --- a/common_syms/engine/sprite.txt +++ /dev/null @@ -1,12 +0,0 @@ -gSpriteOrder -gSpriteTileAllocBitmap -gSpriteCoordOffsetX -gOamLimit -gReservedSpriteTileCount -gSpriteCopyRequestCount -gSpriteCopyRequests -gSpriteCoordOffsetY -gOamMatrices -gShouldProcessSpriteCopyRequests -gOamMatrixAllocBitmap -gReservedSpritePaletteCount diff --git a/common_syms/engine/string_util.txt b/common_syms/engine/string_util.txt deleted file mode 100644 index 1ee62aaad..000000000 --- a/common_syms/engine/string_util.txt +++ /dev/null @@ -1 +0,0 @@ -gUnknownStringVar diff --git a/common_syms/engine/task.txt b/common_syms/engine/task.txt deleted file mode 100644 index 6601bd11b..000000000 --- a/common_syms/engine/task.txt +++ /dev/null @@ -1 +0,0 @@ -gTasks diff --git a/common_syms/field/field_camera.txt b/common_syms/field/field_camera.txt deleted file mode 100644 index 7aad967f8..000000000 --- a/common_syms/field/field_camera.txt +++ /dev/null @@ -1,3 +0,0 @@ -gUnknown_03004880 -gUnknown_03004898 -gUnknown_0300489C diff --git a/common_syms/field/field_control_avatar.txt b/common_syms/field/field_control_avatar.txt deleted file mode 100644 index 040a9e6c1..000000000 --- a/common_syms/field/field_control_avatar.txt +++ /dev/null @@ -1 +0,0 @@ -gSelectedMapObject diff --git a/common_syms/field/field_map_obj.txt b/common_syms/field/field_map_obj.txt deleted file mode 100644 index 32d8b1915..000000000 --- a/common_syms/field/field_map_obj.txt +++ /dev/null @@ -1 +0,0 @@ -gMapObjects diff --git a/common_syms/field/fieldmap.txt b/common_syms/field/fieldmap.txt deleted file mode 100644 index 7819b3b40..000000000 --- a/common_syms/field/fieldmap.txt +++ /dev/null @@ -1 +0,0 @@ -gUnknown_03004870 diff --git a/common_syms/field/overworld.txt b/common_syms/field/overworld.txt deleted file mode 100644 index ecdb190b2..000000000 --- a/common_syms/field/overworld.txt +++ /dev/null @@ -1,4 +0,0 @@ -word_3004858 -gFieldCallback -gUnknown_03004860 -gFieldLinkPlayerCount diff --git a/common_syms/field/start_menu.txt b/common_syms/field/start_menu.txt deleted file mode 100644 index 05beaf57c..000000000 --- a/common_syms/field/start_menu.txt +++ /dev/null @@ -1 +0,0 @@ -gMenuCallback diff --git a/common_syms/field/tv.txt b/common_syms/field/tv.txt deleted file mode 100644 index 829139f8f..000000000 --- a/common_syms/field/tv.txt +++ /dev/null @@ -1 +0,0 @@ -gUnknown_03005D38 diff --git a/common_syms/libs/agb_flash.txt b/common_syms/libs/agb_flash.txt deleted file mode 100644 index cb421ec80..000000000 --- a/common_syms/libs/agb_flash.txt +++ /dev/null @@ -1,10 +0,0 @@ -gFlashTimeoutFlag -PollFlashStatus -WaitForFlashWrite -ProgramFlashSector -gFlash -ProgramFlashByte -gFlashNumRemainingBytes -EraseFlashChip -EraseFlashSector -gFlashMaxTime diff --git a/common_syms/libs/m4a_2.txt b/common_syms/libs/m4a_2.txt deleted file mode 100644 index a80d8a79d..000000000 --- a/common_syms/libs/m4a_2.txt +++ /dev/null @@ -1,12 +0,0 @@ -gSoundInfo -gPokemonCrySongs -gPokemonCryMusicPlayers -gMPlayJumpTable -gCgbChans -gPokemonCryTracks -gPokemonCrySong -gMPlay_BGM -gMPlay_SE1 -gMPlay_SE2 -gMPlayMemAccArea -gMPlay_SE3 diff --git a/common_syms/pokemon/pokeblock_feed.txt b/common_syms/pokemon/pokeblock_feed.txt deleted file mode 100644 index 827e6526e..000000000 --- a/common_syms/pokemon/pokeblock_feed.txt +++ /dev/null @@ -1,12 +0,0 @@ -gPokeblockFeedPokeSprite -gPokeblockFeedMonSpecies -gPokeblockMonNotFlipped -gPokeblockFeedMonSpriteID -gPokeblockFeedMonNature -gUnknown_03005F34 -gPokeblockFeedUnused0 -gUnknown_03005F3C -gUnknown_03005F40 -gPokeblockFeedPokeSpriteCopy -gUnknown_03005F94 -gUnknown_03005FA0 diff --git a/common_syms/pokemon/pokedex.txt b/common_syms/pokemon/pokedex.txt deleted file mode 100644 index 18b14f3ed..000000000 --- a/common_syms/pokemon/pokedex.txt +++ /dev/null @@ -1,2 +0,0 @@ -gUnknown_03005CE8 -gUnknown_03005CEC diff --git a/common_syms/pokemon/pokemon_1.txt b/common_syms/pokemon/pokemon_1.txt deleted file mode 100644 index c588d53a7..000000000 --- a/common_syms/pokemon/pokemon_1.txt +++ /dev/null @@ -1,4 +0,0 @@ -gPlayerPartyCount -gPlayerParty -gEnemyPartyCount -gEnemyParty diff --git a/common_syms/pokemon/pokemon_menu.txt b/common_syms/pokemon/pokemon_menu.txt deleted file mode 100644 index 98a1bf53b..000000000 --- a/common_syms/pokemon/pokemon_menu.txt +++ /dev/null @@ -1,2 +0,0 @@ -gLastFieldPokeMenuOpened -gUnknown_03005CE4 diff --git a/common_syms/rom3.txt b/common_syms/rom3.txt deleted file mode 100644 index 06a965ff6..000000000 --- a/common_syms/rom3.txt +++ /dev/null @@ -1 +0,0 @@ -gBattleBuffersTransferData diff --git a/common_syms/scanline_effect.txt b/common_syms/scanline_effect.txt deleted file mode 100644 index 280e7f891..000000000 --- a/common_syms/scanline_effect.txt +++ /dev/null @@ -1,2 +0,0 @@ -gScanlineEffect -gScanlineEffectRegBuffers diff --git a/common_syms/scene/berry_blender.txt b/common_syms/scene/berry_blender.txt deleted file mode 100644 index 524a31411..000000000 --- a/common_syms/scene/berry_blender.txt +++ /dev/null @@ -1,4 +0,0 @@ -gUnknown_03004830 -gInGameOpponentsNo -gUnknown_03004840 -gBerryBlenderData diff --git a/common_syms/scene/contest_painting.txt b/common_syms/scene/contest_painting.txt deleted file mode 100644 index 2e8490348..000000000 --- a/common_syms/scene/contest_painting.txt +++ /dev/null @@ -1,5 +0,0 @@ -gUnknown_03005E10 -gUnknown_03005E20 -gUnknown_03005E40 -gUnknown_03005E8C -gUnknown_03005E90 diff --git a/common_syms/scene/cute_sketch.txt b/common_syms/scene/cute_sketch.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/common_syms/scene/egg_hatch.txt b/common_syms/scene/egg_hatch.txt deleted file mode 100644 index 891ccc104..000000000 --- a/common_syms/scene/egg_hatch.txt +++ /dev/null @@ -1 +0,0 @@ -gEggHatchData diff --git a/common_syms/scene/evolution_scene.txt b/common_syms/scene/evolution_scene.txt deleted file mode 100644 index 137cd3e05..000000000 --- a/common_syms/scene/evolution_scene.txt +++ /dev/null @@ -1 +0,0 @@ -gCB2_AfterEvolution diff --git a/common_syms/scene/intro.txt b/common_syms/scene/intro.txt deleted file mode 100644 index d069b1014..000000000 --- a/common_syms/scene/intro.txt +++ /dev/null @@ -1,2 +0,0 @@ -gIntroFrameCounter -gMultibootProgramStruct diff --git a/src/field/tv.c b/src/field/tv.c index efda4b925..8bd36bb9c 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -47,8 +47,6 @@ struct UnkTvStruct s8 var0; }; -extern u8 gUnknown_0300430A[11]; - struct OutbreakPokemon { /*0x00*/ u16 species; diff --git a/sym_common.txt b/sym_common.txt index 1a523e7cb..d8dc14812 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -1,614 +1,235 @@ -. = ALIGN(4); -. = ALIGN(4); -gKeyRepeatStartDelay = .; -. += 0x4; -. = ALIGN(4); -gLinkTransferringData = .; -. += 0x4; -. = ALIGN(16); -gMain = .; -. += 0x440; -. = ALIGN(4); -gKeyRepeatContinueDelay = .; -. += 0x4; -. = ALIGN(4); -gSoftResetDisabled = .; -. += 0x4; -. = ALIGN(16); -gIntrTable = .; -. += 0x38; -. = ALIGN(4); -gLinkVSyncDisabled = .; -. += 0x4; -. = ALIGN(16); -IntrMain_Buffer = .; -. += 0x800; -. = ALIGN(4); -gPcmDmaCounter = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(16); -gSpriteOrder = .; -. += 0x40; -. = ALIGN(16); -gSpriteTileAllocBitmap = .; -. += 0x80; -. = ALIGN(4); -gSpriteCoordOffsetX = .; -. += 0x4; -. = ALIGN(4); -gOamLimit = .; -. += 0x4; -. = ALIGN(4); -gReservedSpriteTileCount = .; -. += 0x4; -. = ALIGN(4); -gSpriteCopyRequestCount = .; -. += 0x4; -. = ALIGN(16); -gSpriteCopyRequests = .; -. += 0x300; -. = ALIGN(4); -gSpriteCoordOffsetY = .; -. += 0x4; -. = ALIGN(16); -gOamMatrices = .; -. += 0x100; -. = ALIGN(4); -gShouldProcessSpriteCopyRequests = .; -. += 0x4; -. = ALIGN(4); -gOamMatrixAllocBitmap = .; -. += 0x4; -. = ALIGN(4); -gReservedSpritePaletteCount = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(16); -gUnknownStringVar = .; -. += 0x10; -. = ALIGN(4); -. = ALIGN(8); -word_3002910 = .; -. += 0x8; -. = ALIGN(4); -gLinkDebugValue1 = .; -. += 0x4; -. = ALIGN(16); -localLinkPlayerBlock = .; -. += 0x3C; -. = ALIGN(4); -gLinkErrorOccurred = .; -. += 0x4; -. += 0x4; -. = ALIGN(4); -gLinkDebugValue2 = .; -. += 0x4; -. += 0x4; +#define SYMBOL(name, size) \ + . = ALIGN (((size) > 16) ? 16 : (size)); \ + . = ALIGN(4); \ + name = .; \ + . += size; -#ifdef GERMAN -. = ALIGN(4); -deUnkValue1 = .; -. += 0x4; -. = ALIGN(4); -deUnkValue2 = .; +SYMBOL(gKeyRepeatStartDelay, 4) +SYMBOL(gLinkTransferringData, 4) +SYMBOL(gMain, 1088) +SYMBOL(gKeyRepeatContinueDelay, 4) +SYMBOL(gSoftResetDisabled, 4) +SYMBOL(gIntrTable, 56) +SYMBOL(gLinkVSyncDisabled, 4) +SYMBOL(IntrMain_Buffer, 2048) +SYMBOL(gPcmDmaCounter, 4) +SYMBOL(gSpriteOrder, 64) +SYMBOL(gSpriteTileAllocBitmap, 128) +SYMBOL(gSpriteCoordOffsetX, 4) +SYMBOL(gOamLimit, 4) +SYMBOL(gReservedSpriteTileCount, 4) +SYMBOL(gSpriteCopyRequestCount, 4) +SYMBOL(gSpriteCopyRequests, 768) +SYMBOL(gSpriteCoordOffsetY, 4) +SYMBOL(gOamMatrices, 256) +SYMBOL(gShouldProcessSpriteCopyRequests, 4) +SYMBOL(gOamMatrixAllocBitmap, 4) +SYMBOL(gReservedSpritePaletteCount, 4) +SYMBOL(gUnknownStringVar, 16) +SYMBOL(word_3002910, 8) +SYMBOL(gLinkDebugValue1, 4) +SYMBOL(localLinkPlayerBlock, 60) +SYMBOL(gLinkErrorOccurred, 4) +. += 0x4; +SYMBOL(gLinkDebugValue2, 4) . += 0x4; +#ifdef GERMAN +SYMB0L(deUnkValue1, 4) +SYMB0L(deUnkValue2, 4) #endif - -. = ALIGN(4); -gLinkPlayerPending = .; -. += 0x4; -. = ALIGN(16); -gLinkPlayers = .; -. += 0x70; -. = ALIGN(4); -gBlockReceived = .; -. += 0x4; -. += 0x4; -. = ALIGN(4); -gLinkHeldKeys = .; -. += 0x4; -. = ALIGN(4); -gLinkTimeOutCounter = .; -. += 0x4; -. += 0x4; -. = ALIGN(16); -localLinkPlayer = .; -. += 0x1C; -. = ALIGN(16); -gRecvCmds = .; -. += 0x40; -. = ALIGN(4); -gLinkStatus = .; -. += 0x4; -. = ALIGN(4); -gLinkDummyBool = .; -. += 0x4; -. = ALIGN(4); -byte_3002A68 = .; -. += 0x4; -. = ALIGN(16); -gBlockSendBuffer = .; -. += 0x100; -. = ALIGN(4); -u8_array_3002B70 = .; -. += 0x4; -. = ALIGN(4); -gLinkType = .; -. += 0x4; -. = ALIGN(4); -u8_array_3002B78 = .; -. += 0x4; -. = ALIGN(16); -gBlockRecvBuffer = .; -. += 0x400; -. = ALIGN(4); -gSuppressLinkErrorMessage = .; -. += 0x4; -. = ALIGN(4); -gSavedLinkPlayerCount = .; -. += 0x4; -. = ALIGN(16); -gSendCmd = .; -. += 0x10; -. = ALIGN(4); -gSavedMultiplayerId = .; -. += 0x4; -. = ALIGN(4); -gReceivedRemoteLinkPlayers = .; -. += 0x4; -. = ALIGN(16); -gLinkTestBGInfo = .; -. += 0x10; -. = ALIGN(4); -gLinkCallback = .; -. += 0x4; -. = ALIGN(16); -gSavedLinkPlayers = .; -. += 0x70; -. = ALIGN(4); -gShouldAdvanceLinkState = .; -. += 0x4; -. = ALIGN(8); -gLinkTestBlockChecksums = .; -. += 0x8; -. += 0x4; -. = ALIGN(4); -gBlockRequestType = .; -. += 0x4; -. += 0x4; -. += 0x4; -. = ALIGN(4); -gLastSendQueueCount = .; -. += 0x4; -. = ALIGN(16); -gLink = .; -. += 0xFC0; -. = ALIGN(4); -gLastRecvQueueCount = .; -. += 0x4; -. = ALIGN(4); -gLinkSavedIme = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(8); -gLocalTime = .; +SYMBOL(gLinkPlayerPending, 4) +SYMBOL(gLinkPlayers, 112) +SYMBOL(gBlockReceived, 4) +. += 0x4; +SYMBOL(gLinkHeldKeys, 4) +SYMBOL(gLinkTimeOutCounter, 4) +. += 0x4; +SYMBOL(localLinkPlayer, 28) +SYMBOL(gRecvCmds, 64) +SYMBOL(gLinkStatus, 4) +SYMBOL(gLinkDummyBool, 4) +SYMBOL(byte_3002A68, 4) +SYMBOL(gBlockSendBuffer, 256) +SYMBOL(u8_array_3002B70, 4) +SYMBOL(gLinkType, 4) +SYMBOL(u8_array_3002B78, 4) +SYMBOL(gBlockRecvBuffer, 1024) +SYMBOL(gSuppressLinkErrorMessage, 4) +SYMBOL(gSavedLinkPlayerCount, 4) +SYMBOL(gSendCmd, 16) +SYMBOL(gSavedMultiplayerId, 4) +SYMBOL(gReceivedRemoteLinkPlayers, 4) +SYMBOL(gLinkTestBGInfo, 16) +SYMBOL(gLinkCallback, 4) +SYMBOL(gSavedLinkPlayers, 112) +SYMBOL(gShouldAdvanceLinkState, 4) +SYMBOL(gLinkTestBlockChecksums, 8) +. += 0x4; +SYMBOL(gBlockRequestType, 4) . += 0x8; -. = ALIGN(4); -. = ALIGN(16); -gBattleBuffersTransferData = .; -. += 0x170; -. = ALIGN(4); -gBattle_BG3_X = .; -. += 0x4; -gBattle_BG1_Y = .; -. += 0x4; -gBattle_BG3_Y = .; +SYMBOL(gLastSendQueueCount, 4) +SYMBOL(gLink, 4032) +SYMBOL(gLastRecvQueueCount, 4) +SYMBOL(gLinkSavedIme, 4) +SYMBOL(gLocalTime, 8) +SYMBOL(gBattleBuffersTransferData, 368) +SYMBOL(gBattle_BG3_X, 4) +SYMBOL(gBattle_BG1_Y, 4) +SYMBOL(gBattle_BG3_Y, 4) +SYMBOL(gBattleTextBuff1, 16) +SYMBOL(gUnknown_030041D0, 48) +SYMBOL(gBattle_WIN1H, 4) +SYMBOL(gUnknown_03004210, 48) +SYMBOL(gBattle_WIN0V, 4) +SYMBOL(gBattle_WIN1V, 4) +SYMBOL(gUnknown_03004250, 48) +SYMBOL(gBattle_BG2_Y, 4) +SYMBOL(gUnknown_03004284, 4) +SYMBOL(gBattle_BG2_X, 4) +SYMBOL(gBattleTerrain, 4) +SYMBOL(gBattleTextBuff2, 16) +SYMBOL(gBattle_BG0_Y, 4) +SYMBOL(gBattle_BG0_X, 4) +SYMBOL(gBattleTextBuff3, 16) +SYMBOL(gBattle_BG1_X, 4) +SYMBOL(gBattle_WIN0H, 4) . += 0x8; -gBattleTextBuff1 = .; -. += 0x10; -gUnknown_030041D0 = .; -. += 0x30; -gBattle_WIN1H = .; -. += 0x10; -gUnknown_03004210 = .; -. += 0x30; -gBattle_WIN0V = .; -. += 0x4; -gBattle_WIN1V = .; -. += 0xC; -gUnknown_03004250 = .; -. += 0x30; -gBattle_BG2_Y = .; -. += 0x4; -gUnknown_03004284 = .; -. += 0x4; -gBattle_BG2_X = .; -. += 0x4; -gBattleTerrain = .; -. += 0x4; -gBattleTextBuff2 = .; -. += 0x10; -gBattle_BG0_Y = .; -. += 0x4; -gBattle_BG0_X = .; -. += 0xC; -gBattleTextBuff3 = .; -. += 0x10; -gBattle_BG1_X = .; -. += 0x4; -gBattle_WIN0H = .; -. += 0xC; -gPreBattleCallback1 = .; -. += 0x4; +SYMBOL(gPreBattleCallback1, 4) gBattleMainFunc = .; . += 0xC; gBattleResults = .; . += 0x1C; +// Why is this not aligned? gUnknown_030042FC = .; -. += 0xE; -gUnknown_0300430A = .; -. += 0xC; +. += 0x1A; gUnknown_03004316 = .; . += 0xE; gLeveledUpInBattle = .; . += 0xC; -gBattleBankFunc = .; -. += 0x10; -gHealthboxIDs = .; -. += 0x4; -gUnknown_03004344 = .; -. += 0x4; -gUnknown_03004348 = .; -. += 0x4; -gUnknown_0300434C = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gPlayerPartyCount = .; -. += 0x4; -. = ALIGN(16); -gPlayerParty = .; -. += 0x258; -. = ALIGN(4); -gEnemyPartyCount = .; -. += 0x4; -. = ALIGN(16); -gEnemyParty = .; -. += 0x258; -. = ALIGN(4); -. = ALIGN(4); -gRngValue = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gEggHatchData = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gFlashMemoryPresent = .; -. += 0x4; -gUnknown_03004824 = .; -. += 0x4; -gUnknown_03004828 = .; -. += 0x8; -. = ALIGN(4); -. = ALIGN(4); -gUnknown_03004830 = .; -. += 0x4; -. = ALIGN(4); -gInGameOpponentsNo = .; -. += 0x4; -. = ALIGN(16); -gUnknown_03004840 = .; -. += 0x14; -. = ALIGN(4); -gBerryBlenderData = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -word_3004858 = .; -. += 0x4; -. = ALIGN(4); -gFieldCallback = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03004860 = .; -. += 0x4; -. = ALIGN(4); -gFieldLinkPlayerCount = .; -. += 0x4; -. = ALIGN(4); +SYMBOL(gBattleBankFunc, 16) +SYMBOL(gHealthboxIDs, 4) +SYMBOL(gUnknown_03004344, 4) +SYMBOL(gUnknown_03004348, 4) +SYMBOL(gUnknown_0300434C, 4) +SYMBOL(gPlayerPartyCount, 4) +SYMBOL(gPlayerParty, 600) +SYMBOL(gEnemyPartyCount, 4) +SYMBOL(gEnemyParty, 600) +SYMBOL(gRngValue, 4) +SYMBOL(gEggHatchData, 4) +SYMBOL(gFlashMemoryPresent, 4) +SYMBOL(gUnknown_03004824, 4) +SYMBOL(gUnknown_03004828, 4) +. += 0x4; +SYMBOL(gUnknown_03004830, 4) +SYMBOL(gInGameOpponentsNo, 4) +SYMBOL(gUnknown_03004840, 20) +SYMBOL(gBerryBlenderData, 4) +SYMBOL(word_3004858, 4) +SYMBOL(gFieldCallback, 4) +SYMBOL(gUnknown_03004860, 4) +SYMBOL(gFieldLinkPlayerCount, 4) . = ALIGN(16); gUnknown_03004870 = .; . += 0xC; -. = ALIGN(4); -. = ALIGN(16); -gUnknown_03004880 = .; -. += 0x18; -. = ALIGN(4); -gUnknown_03004898 = .; -. += 0x4; -. = ALIGN(4); -gUnknown_0300489C = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(16); -gMapObjects = .; -. += 0x240; -. = ALIGN(4); -. = ALIGN(4); -gSelectedMapObject = .; -. += 0x4; -. = ALIGN(4); -gPokemonItemUseCallback = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gMenuCallback = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gDisableMusic = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gSoundAnimFramesToWait = .; -. += 0x4; -. = ALIGN(16); -gBattleAnimArgs = .; -. += 0x10; -. = ALIGN(16); -gAnimSpriteIndexArray = .; -. += 0x10; -. = ALIGN(4); -. = ALIGN(16); -gTasks = .; -. += 0x280; -. = ALIGN(4); -. = ALIGN(16); -gUnknown_03004DA0 = .; -. += 0x20; -. = ALIGN(4); -. = ALIGN(16); -gScanlineEffect = .; -. += 0x20; -. = ALIGN(16); -gScanlineEffectRegBuffers = .; -. += 0xF00; -. = ALIGN(4); -. = ALIGN(4); -gLastFieldPokeMenuOpened = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005CE4 = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gUnknown_03005CE8 = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005CEC = .; -. += 0x4; -. = ALIGN(16); -gUnknown_03005CF0 = .; -. += 0x10; +SYMBOL(gUnknown_03004880, 24) +SYMBOL(gUnknown_03004898, 4) +SYMBOL(gUnknown_0300489C, 4) +SYMBOL(gMapObjects, 576) +SYMBOL(gSelectedMapObject, 4) +SYMBOL(gPokemonItemUseCallback, 4) +SYMBOL(gMenuCallback, 4) +SYMBOL(gDisableMusic, 4) +SYMBOL(gSoundAnimFramesToWait, 4) +SYMBOL(gBattleAnimArgs, 16) +SYMBOL(gAnimSpriteIndexArray, 16) +SYMBOL(gTasks, 640) +SYMBOL(gUnknown_03004DA0, 32) +SYMBOL(gScanlineEffect, 32) +SYMBOL(gScanlineEffectRegBuffers, 3840) +SYMBOL(gLastFieldPokeMenuOpened, 4) +SYMBOL(gUnknown_03005CE4, 4) +SYMBOL(gUnknown_03005CE8, 4) +SYMBOL(gUnknown_03005CEC, 4) +SYMBOL(gUnknown_03005CF0, 4) +// huh? . = ALIGN(16); gFieldItemUseCallback = .; . += 0x10; gBagPocketScrollStates = .; . += 0x14; -gCurrentBagPocketItemSlots = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005D28 = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gUnknown_03005D2C = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gUnknown_03005D30 = .; -. += 0x4; -. = ALIGN(4); -gSoundTestCryNum = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gUnknown_03005D38 = .; -. += 0x4; -. += 0x64; -. = ALIGN(16); -gUnknown_03005DA0 = .; -. += 0x48; -gUnknown_03005DE8 = .; -. += 0x4; -gUnknown_03005DEC = .; -. += 0x4; -gUnknown_03005DF0 = .; -. += 0x4; -gUnknown_03005DF4 = .; -. += 0x4; -gUnknown_03005DF8 = .; -. += 0x4; -gUnknown_03005DFC = .; -. += 0x4; -gUnknown_03005E00 = .; -. += 0x4; -gUnknown_03005E04 = .; -. += 0x4; -gUnknown_03005E08 = .; -. += 0x4; -gUnknown_03005E0C = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gUnknown_03005E10 = .; -. += 0x4; -. = ALIGN(16); -gUnknown_03005E20 = .; -. += 0x20; -. = ALIGN(16); -gUnknown_03005E40 = .; -. += 0x4C; -. = ALIGN(4); -gUnknown_03005E8C = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005E90 = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gCB2_AfterEvolution = .; -. += 0x4; -gUnknown_03005E98 = .; -. += 0x4; -. = ALIGN(4); -. = ALIGN(4); -gFirstSaveSector = .; -. += 0x4; -. = ALIGN(4); -gPrevSaveCounter = .; -. += 0x4; -. = ALIGN(4); -gLastKnownGoodSector = .; -. += 0x4; -. = ALIGN(4); -gDamagedSaveSectors = .; -. += 0x4; -. = ALIGN(4); -gSaveCounter = .; -. += 0x4; -. = ALIGN(4); -gFastSaveSection = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005EB4 = .; -. += 0x4; -. = ALIGN(4); -gSaveFileStatus = .; -. += 0x4; -. = ALIGN(4); -gGameContinueCallback = .; -. += 0x4; +SYMBOL(gCurrentBagPocketItemSlots, 4) +SYMBOL(gUnknown_03005D28, 4) +SYMBOL(gUnknown_03005D2C, 4) +SYMBOL(gUnknown_03005D30, 4) +SYMBOL(gSoundTestCryNum, 4) +SYMBOL(gUnknown_03005D38, 4) +. += 0x64; // huge gap? +SYMBOL(gUnknown_03005DA0, 0x48) +SYMBOL(gUnknown_03005DE8, 4) +SYMBOL(gUnknown_03005DEC, 4) +SYMBOL(gUnknown_03005DF0, 4) +SYMBOL(gUnknown_03005DF4, 4) +SYMBOL(gUnknown_03005DF8, 4) +SYMBOL(gUnknown_03005DFC, 4) +SYMBOL(gUnknown_03005E00, 4) +SYMBOL(gUnknown_03005E04, 4) +SYMBOL(gUnknown_03005E08, 4) +SYMBOL(gUnknown_03005E0C, 4) +SYMBOL(gUnknown_03005E10, 4) +SYMBOL(gUnknown_03005E20, 32) +SYMBOL(gUnknown_03005E40, 76) +SYMBOL(gUnknown_03005E8C, 4) +SYMBOL(gUnknown_03005E90, 4) +SYMBOL(gCB2_AfterEvolution, 4) +SYMBOL(gUnknown_03005E98, 4) +SYMBOL(gFirstSaveSector, 4) +SYMBOL(gPrevSaveCounter, 4) +SYMBOL(gLastKnownGoodSector, 4) +SYMBOL(gDamagedSaveSectors, 4) +SYMBOL(gSaveCounter, 4) +SYMBOL(gFastSaveSection, 4) +SYMBOL(gUnknown_03005EB4, 4) +SYMBOL(gSaveFileStatus, 4) +SYMBOL(gGameContinueCallback, 4) . += 0x10; -. = ALIGN(4); -. = ALIGN(4); -gIntroFrameCounter = .; -. += 0x4; -. = ALIGN(16); -gMultibootProgramStruct = .; -. += 0x2C; -. = ALIGN(4); -gUnknown_03005F0C = .; -. += 0x4; -gUnknown_03005F10 = .; -. += 0x4; +SYMBOL(gIntroFrameCounter, 4) +SYMBOL(gMultibootProgramStruct, 44) +SYMBOL(gUnknown_03005F0C, 4) +SYMBOL(gUnknown_03005F10, 4) gUnknown_03005F14 = .; . += 0xC; -. = ALIGN(4); -. = ALIGN(4); -gPokeblockFeedPokeSprite = .; -. += 0x4; -. = ALIGN(4); -gPokeblockFeedMonSpecies = .; -. += 0x4; -. = ALIGN(4); -gPokeblockMonNotFlipped = .; -. += 0x4; -. = ALIGN(4); -gPokeblockFeedMonSpriteID = .; -. += 0x4; -. = ALIGN(4); -gPokeblockFeedMonNature = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005F34 = .; -. += 0x4; -. = ALIGN(4); -gPokeblockFeedUnused0 = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005F3C = .; -. += 0x4; -. = ALIGN(4); -gUnknown_03005F40 = .; -. += 0x4; -. = ALIGN(16); -gPokeblockFeedPokeSpriteCopy = .; -. += 0x44; -. = ALIGN(4); -gUnknown_03005F94 = .; -. += 0x4; -. = ALIGN(16); -gUnknown_03005FA0 = .; -. += 0x30; -. = ALIGN(4); -. = ALIGN(16); -gSoundInfo = .; -. += 0xFB0; -. = ALIGN(16); -gPokemonCrySongs = .; -. += 0x68; -. = ALIGN(16); -gPokemonCryMusicPlayers = .; -. += 0x80; -. = ALIGN(16); -gMPlayJumpTable = .; -. += 0x90; -. = ALIGN(16); -gCgbChans = .; -. += 0x100; -. = ALIGN(16); -gPokemonCryTracks = .; -. += 0x140; -. = ALIGN(16); -gPokemonCrySong = .; -. += 0x34; -. = ALIGN(16); -gMPlay_BGM = .; -. += 0x40; -. = ALIGN(16); -gMPlay_SE1 = .; -. += 0x40; -. = ALIGN(16); -gMPlay_SE2 = .; -. += 0x40; -. = ALIGN(16); -gMPlayMemAccArea = .; -. += 0x10; -. = ALIGN(16); -gMPlay_SE3 = .; -. += 0x40; -. = ALIGN(4); -. = ALIGN(4); -gFlashTimeoutFlag = .; -. += 0x4; -. = ALIGN(4); -PollFlashStatus = .; -. += 0x4; -. = ALIGN(4); -WaitForFlashWrite = .; -. += 0x4; -. = ALIGN(4); -ProgramFlashSector = .; -. += 0x4; -. = ALIGN(4); -gFlash = .; -. += 0x4; -. = ALIGN(4); -ProgramFlashByte = .; -. += 0x4; -. = ALIGN(4); -gFlashNumRemainingBytes = .; -. += 0x4; -. = ALIGN(4); -EraseFlashChip = .; -. += 0x4; -. = ALIGN(4); -EraseFlashSector = .; -. += 0x4; -. = ALIGN(4); -gFlashMaxTime = .; -. += 0x4; +SYMBOL(gPokeblockFeedPokeSprite, 4) +SYMBOL(gPokeblockFeedMonSpecies, 4) +SYMBOL(gPokeblockMonNotFlipped, 4) +SYMBOL(gPokeblockFeedMonSpriteID, 4) +SYMBOL(gPokeblockFeedMonNature, 4) +SYMBOL(gUnknown_03005F34, 4) +SYMBOL(gPokeblockFeedUnused0, 4) +SYMBOL(gUnknown_03005F3C, 4) +SYMBOL(gUnknown_03005F40, 4) +SYMBOL(gPokeblockFeedPokeSpriteCopy, 68) +SYMBOL(gUnknown_03005F94, 4) +SYMBOL(gUnknown_03005FA0, 48) +SYMBOL(gSoundInfo, 4016) +SYMBOL(gPokemonCrySongs, 104) +SYMBOL(gPokemonCryMusicPlayers, 128) +SYMBOL(gMPlayJumpTable, 144) +SYMBOL(gCgbChans, 256) +SYMBOL(gPokemonCryTracks, 320) +SYMBOL(gPokemonCrySong, 52) +SYMBOL(gMPlay_BGM, 64) +SYMBOL(gMPlay_SE1, 64) +SYMBOL(gMPlay_SE2, 64) +SYMBOL(gMPlayMemAccArea, 16) +SYMBOL(gMPlay_SE3, 64) +SYMBOL(gFlashTimeoutFlag, 4) +SYMBOL(PollFlashStatus, 4) +SYMBOL(WaitForFlashWrite, 4) +SYMBOL(ProgramFlashSector, 4) +SYMBOL(gFlash, 4) +SYMBOL(ProgramFlashByte, 4) +SYMBOL(gFlashNumRemainingBytes, 4) +SYMBOL(EraseFlashChip, 4) +SYMBOL(EraseFlashSector, 4) +SYMBOL(gFlashMaxTime, 4) -- cgit v1.2.3 From 144e48af989692cd4012d9100b748b9cc1627d68 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 20 Jan 2018 23:30:42 -0600 Subject: fix typo --- sym_common.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sym_common.txt b/sym_common.txt index d8dc14812..2c390e214 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -34,8 +34,8 @@ SYMBOL(gLinkErrorOccurred, 4) SYMBOL(gLinkDebugValue2, 4) . += 0x4; #ifdef GERMAN -SYMB0L(deUnkValue1, 4) -SYMB0L(deUnkValue2, 4) +SYMBOL(deUnkValue1, 4) +SYMBOL(deUnkValue2, 4) #endif SYMBOL(gLinkPlayerPending, 4) SYMBOL(gLinkPlayers, 112) -- cgit v1.2.3 From 16f378cb66cbf5c0e4ef144357fe6601db4ac731 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 21 Jan 2018 01:29:33 -0600 Subject: don't generate ld scripts --- Makefile | 10 +- ld_script.sed | 4 - ld_script.txt | 4 +- sym_bss.txt | 84 +++---- sym_ewram.txt | 726 +++++++++++++++++++++++++++++----------------------------- 5 files changed, 410 insertions(+), 418 deletions(-) delete mode 100644 ld_script.sed diff --git a/Makefile b/Makefile index 7718ee523..83f37d8b7 100644 --- a/Makefile +++ b/Makefile @@ -109,16 +109,12 @@ tidy: $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ %.elf: $(LD_SCRIPT) $(ALL_OBJECTS) - cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) -o ../../$@ ../../$(LIBGCC) ../../$(LIBC) + cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) ../../$(LIBGCC) ../../$(LIBC) -o ../../$@ -$(LD_SCRIPT): $(BUILD_DIR)/sym_bss.ld $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld ld_script.txt - cd $(BUILD_DIR) && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" >ld_script.ld -$(BUILD_DIR)/sym_bss.ld: sym_bss.txt - cd $(BUILD_DIR) && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt $(GAME_LANGUAGE) >sym_bss.ld +$(LD_SCRIPT): $(BUILD_DIR)/sym_common.ld ld_script.txt + cd $(BUILD_DIR) && sed -e "s#tools/#../../tools/#g" ../../ld_script.txt >ld_script.ld $(BUILD_DIR)/sym_common.ld: sym_common.txt $(CPP) -P $(CPPFLAGS) $< > $@ -$(BUILD_DIR)/sym_ewram.ld: sym_ewram.txt - cd $(BUILD_DIR) && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $(GAME_LANGUAGE) >sym_ewram.ld $(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP) $(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i diff --git a/ld_script.sed b/ld_script.sed deleted file mode 100644 index 76b18c301..000000000 --- a/ld_script.sed +++ /dev/null @@ -1,4 +0,0 @@ -// { - r sym_bss.ld - d -} diff --git a/ld_script.txt b/ld_script.txt index 18de179bc..6931eb661 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -9,7 +9,7 @@ SECTIONS { ewram (NOLOAD) : ALIGN(4) { - INCLUDE "sym_ewram.ld" + INCLUDE "../../sym_ewram.txt" . = 0x40000; } @@ -20,7 +20,7 @@ SECTIONS { ALIGN(4) { /* .bss starts at 0x3000000 */ - + INCLUDE "../../sym_bss.txt" /* .bss.code starts at 0x3000F60 */ src/libs/m4a_2.o(.bss.code); diff --git a/sym_bss.txt b/sym_bss.txt index 6e95a609f..f36785ce8 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -1,42 +1,42 @@ - .include "src/engine/main.o" - .include "src/engine/sprite.o" - .include "src/engine/text.o" - .include "src/engine/string_util.o" - .include "src/engine/link.o" - .include "src/engine/rtc.o" - .include "src/field/daycare.o" - .include "src/engine/trade.o" - .include "src/scene/berry_blender.o" - .include "src/engine/play_time.o" - .include "src/field/overworld.o" - .include "src/field/field_camera.o" - .include "src/field/field_map_obj.o" - .include "src/field/field_message_box.o" - .include "src/engine/text_window.o" - .include "src/engine/script.o" - .include "src/field/start_menu.o" - .include "src/engine/menu.o" - .include "src/engine/tileset_anim.o" - .include "src/engine/sound.o" - .include "src/field/field_weather.o" - .include "src/field/field_effect.o" - .include "src/field/item_menu.o" - .include "src/field/shop.o" - .include "src/engine/record_mixing.o" - .include "src/field/tv.o" - .include "src/battle/battle_anim_80CA710.o" - .include "src/easy_chat_2.o" - .include "src/pokenav_before.o" - .include "src/field/mauville_man.o" - .include "src/field/menu_helpers.o" - .include "src/scene/contest_painting.o" - .include "src/field/pokeblock.o" - .include "src/field/field_specials.o" - .include "src/pokemon/learn_move.o" - .include "src/field/player_pc.o" - .include "src/libs/m4a_1.o" - .include "src/libs/agb_flash.o" - .include "src/libs/siirtc.o" - .include "tools/agbcc/lib/libgcc.a:dp-bit.o" - .include "tools/agbcc/lib/libgcc.a:fp-bit.o" - .include "tools/agbcc/lib/libc.a:syscalls.o" +. = ALIGN(4); src/engine/main.o(.bss); +. = ALIGN(4); src/engine/sprite.o(.bss); +. = ALIGN(4); src/engine/text.o(.bss); +. = ALIGN(4); src/engine/string_util.o(.bss); +. = ALIGN(4); src/engine/link.o(.bss); +. = ALIGN(4); src/engine/rtc.o(.bss); +. = ALIGN(4); src/field/daycare.o(.bss); +. = ALIGN(4); src/engine/trade.o(.bss); +. = ALIGN(4); src/scene/berry_blender.o(.bss); +. = ALIGN(4); src/engine/play_time.o(.bss); +. = ALIGN(4); src/field/overworld.o(.bss); +. = ALIGN(4); src/field/field_camera.o(.bss); +. = ALIGN(4); src/field/field_map_obj.o(.bss); +. = ALIGN(4); src/field/field_message_box.o(.bss); +. = ALIGN(4); src/engine/text_window.o(.bss); +. = ALIGN(4); src/engine/script.o(.bss); +. = ALIGN(4); src/field/start_menu.o(.bss); +. = ALIGN(4); src/engine/menu.o(.bss); +. = ALIGN(4); src/engine/tileset_anim.o(.bss); +. = ALIGN(4); src/engine/sound.o(.bss); +. = ALIGN(4); src/field/field_weather.o(.bss); +. = ALIGN(4); src/field/field_effect.o(.bss); +. = ALIGN(4); src/field/item_menu.o(.bss); +. = ALIGN(4); src/field/shop.o(.bss); +. = ALIGN(4); src/engine/record_mixing.o(.bss); +. = ALIGN(4); src/field/tv.o(.bss); +. = ALIGN(4); src/battle/battle_anim_80CA710.o(.bss); +. = ALIGN(4); src/easy_chat_2.o(.bss); +. = ALIGN(4); src/pokenav_before.o(.bss); +. = ALIGN(4); src/field/mauville_man.o(.bss); +. = ALIGN(4); src/field/menu_helpers.o(.bss); +. = ALIGN(4); src/scene/contest_painting.o(.bss); +. = ALIGN(4); src/field/pokeblock.o(.bss); +. = ALIGN(4); src/field/field_specials.o(.bss); +. = ALIGN(4); src/pokemon/learn_move.o(.bss); +. = ALIGN(4); src/field/player_pc.o(.bss); +. = ALIGN(4); src/libs/m4a_1.o(.bss); +. = ALIGN(4); src/libs/agb_flash.o(.bss); +. = ALIGN(4); src/libs/siirtc.o(.bss); +. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:dp-bit.o(.bss); +. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:fp-bit.o(.bss); +. = ALIGN(4); ../../tools/agbcc/lib/libc.a:syscalls.o(.bss); diff --git a/sym_ewram.txt b/sym_ewram.txt index d2fd0aabe..f6b4852a8 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1,471 +1,471 @@ - .include "src/engine/main.o" - .include "src/engine/sprite.o" - .include "src/engine/text.o" - .include "src/engine/string_util.o" +. = ALIGN(4); src/engine/main.o(ewram_data); +. = ALIGN(4); src/engine/sprite.o(ewram_data); +. = ALIGN(4); src/engine/text.o(ewram_data); +. = ALIGN(4); src/engine/string_util.o(ewram_data); - .space 0x2E8 +. += 0x2E8; - .include "src/engine/link.o" - .include "src/rom3.o" +. = ALIGN(4); src/engine/link.o(ewram_data); +. = ALIGN(4); src/rom3.o(ewram_data); -@ battle +/* battle */ - .align 2 -gUnknown_020238C8: @ 20238C8 - .space 0x4 + . = ALIGN(4); +gUnknown_020238C8 = .; /* 20238C8 */ + . += 0x4; -gDisplayedStringBattle: @ 20238CC - .space 0x12C +gDisplayedStringBattle = .; /* 20238CC */ + . += 0x12C; -gBattleTypeFlags: @ 20239F8 - .space 0x4 +gBattleTypeFlags = .; /* 20239F8 */ + . += 0x4; -gUnknown_020239FC: @ 20239FC - .space 0x4 +gUnknown_020239FC = .; /* 20239FC */ + . += 0x4; -gUnknown_02023A00: @ 2023A00 - .space 0x4 +gUnknown_02023A00 = .; /* 2023A00 */ + . += 0x4; -gUnknown_02023A04: @ 2023A04 - .space 0x10 +gUnknown_02023A04 = .; /* 2023A04 */ + . += 0x10; -gUnknown_02023A14: @ 2023A14 - .space 0x4C +gUnknown_02023A14 = .; /* 2023A14 */ + . += 0x4C; -gBattleBufferA: @ 2023A60 - .space 0x2 +gBattleBufferA = .; /* 2023A60 */ + . += 0x2; -gUnknown_02023A62: @ 2023A62 - .space 0x1 +gUnknown_02023A62 = .; /* 2023A62 */ + . += 0x1; -gUnknown_02023A63: @ 2023A63 - .space 0x1 +gUnknown_02023A63 = .; /* 2023A63 */ + . += 0x1; -gUnknown_02023A64: @ 2023A64 - .space 0x7FC +gUnknown_02023A64 = .; /* 2023A64 */ + . += 0x7FC; -gBattleBufferB: @ 2024260 - .space 0x4 +gBattleBufferB = .; /* 2024260 */ + . += 0x4; -gUnknown_02024264: @ 2024264 - .space 0x7FC +gUnknown_02024264 = .; /* 2024264 */ + . += 0x7FC; -gActiveBank: @ 2024A60 - .space 0x4 +gActiveBank = .; /* 2024A60 */ + . += 0x4; -gBattleExecBuffer: @ 2024A64 - .space 0x4 +gBattleExecBuffer = .; /* 2024A64 */ + . += 0x4; -gNoOfAllBanks: @ 2024A68 - .space 0x2 +gNoOfAllBanks = .; /* 2024A68 */ + . += 0x2; -gBattlePartyID: @ 2024A6A - .space 0x8 +gBattlePartyID = .; /* 2024A6A */ + . += 0x8; -gBanksBySide: @ 2024A72 - .space 0x4 +gBanksBySide = .; /* 2024A72 */ + . += 0x4; -gActionsByTurnOrder: @ 2024A76 - .space 0x4 +gActionsByTurnOrder = .; /* 2024A76 */ + . += 0x4; -gBanksByTurnOrder: @ 2024A7A - .space 0x4 +gBanksByTurnOrder = .; /* 2024A7A */ + . += 0x4; -gCurrentTurnActionNumber: @ 2024A7E - .space 0x1 +gCurrentTurnActionNumber = .; /* 2024A7E */ + . += 0x1; -gCurrentActionFuncId: @ 2024A7F - .space 0x1 +gCurrentActionFuncId = .; /* 2024A7F */ + . += 0x1; -gBattleMons: @ 2024A80 - .space 0xC +gBattleMons = .; /* 2024A80 */ + . += 0xC; -gUnknown_02024A8C: @ 2024A8C - .space 0xC +gUnknown_02024A8C = .; /* 2024A8C */ + . += 0xC; -gUnknown_02024A98: @ 2024A98 - .space 0xC +gUnknown_02024A98 = .; /* 2024A98 */ + . += 0xC; -gUnknown_02024AA4: @ 2024AA4 - .space 0x4 +gUnknown_02024AA4 = .; /* 2024AA4 */ + . += 0x4; -gUnknown_02024AA8: @ 2024AA8 - .space 0x24 +gUnknown_02024AA8 = .; /* 2024AA8 */ + . += 0x24; -gUnknown_02024ACC: @ 2024ACC - .space 0x4 +gUnknown_02024ACC = .; /* 2024ACC */ + . += 0x4; -gUnknown_02024AD0: @ 2024AD0 - .space 0x110 +gUnknown_02024AD0 = .; /* 2024AD0 */ + . += 0x110; -gObjectBankIDs: @ 2024BE0 - .space 0x4 +gObjectBankIDs = .; /* 2024BE0 */ + . += 0x4; -gCurrMovePos: @ 2024BE4 - .space 0x1 +gCurrMovePos = .; /* 2024BE4 */ + . += 0x1; -gUnknown_02024BE5: @ 2024BE5 - .space 0x1 +gUnknown_02024BE5 = .; /* 2024BE5 */ + . += 0x1; -gCurrentMove: @ 2024BE6 - .space 0x2 +gCurrentMove = .; /* 2024BE6 */ + . += 0x2; -gChosenMove: @ 2024BE8 - .space 0x2 +gChosenMove = .; /* 2024BE8 */ + . += 0x2; -gRandomMove: @ 2024BEA - .space 0x2 +gRandomMove = .; /* 2024BEA */ + . += 0x2; -gBattleMoveDamage: @ 2024BEC - .space 0x4 +gBattleMoveDamage = .; /* 2024BEC */ + . += 0x4; -gHpDealt: @ 2024BF0 - .space 0x4 +gHpDealt = .; /* 2024BF0 */ + . += 0x4; -gTakenDmg: @ 2024BF4 - .space 0x10 +gTakenDmg = .; /* 2024BF4 */ + . += 0x10; -gLastUsedItem: @ 2024C04 - .space 0x2 +gLastUsedItem = .; /* 2024C04 */ + . += 0x2; -gLastUsedAbility: @ 2024C06 - .space 0x1 +gLastUsedAbility = .; /* 2024C06 */ + . += 0x1; -gBankAttacker: @ 2024C07 - .space 0x1 +gBankAttacker = .; /* 2024C07 */ + . += 0x1; -gBankTarget: @ 2024C08 - .space 0x1 +gBankTarget = .; /* 2024C08 */ + . += 0x1; -gBank1: @ 2024C09 - .space 0x1 +gBank1 = .; /* 2024C09 */ + . += 0x1; -gEffectBank: @ 2024C0A - .space 0x1 +gEffectBank = .; /* 2024C0A */ + . += 0x1; -gStringBank: @ 2024C0B - .space 0x1 +gStringBank = .; /* 2024C0B */ + . += 0x1; -gAbsentBankFlags: @ 2024C0C - .space 0x1 +gAbsentBankFlags = .; /* 2024C0C */ + . += 0x1; -gCritMultiplier: @ 2024C0D - .space 0x1 +gCritMultiplier = .; /* 2024C0D */ + . += 0x1; -gMultiHitCounter: @ 2024C0E - .space 0x2 +gMultiHitCounter = .; /* 2024C0E */ + . += 0x2; -gBattlescriptCurrInstr: @ 2024C10 - .space 0x8 +gBattlescriptCurrInstr = .; /* 2024C10 */ + . += 0x8; -gActionForBanks: @ 2024C18 - .space 0x4 +gActionForBanks = .; /* 2024C18 */ + . += 0x4; -gUnknown_02024C1C: @ 2024C1C - .space 0x10 +gUnknown_02024C1C = .; /* 2024C1C */ + . += 0x10; -gUnknown_02024C2C: @ 2024C2C - .space 0x8 +gUnknown_02024C2C = .; /* 2024C2C */ + . += 0x8; -gLastUsedMove: @ 2024C34 - .space 0x8 +gLastUsedMove = .; /* 2024C34 */ + . += 0x8; -gLastLandedMoves: @ 2024C3C - .space 0x8 +gLastLandedMoves = .; /* 2024C3C */ + . += 0x8; -gLastHitByType: @ 2024C44 - .space 0x8 +gLastHitByType = .; /* 2024C44 */ + . += 0x8; -gUnknown_02024C4C: @ 2024C4C - .space 0x8 +gUnknown_02024C4C = .; /* 2024C4C */ + . += 0x8; -gLockedMoves: @ 2024C54 - .space 0x8 +gLockedMoves = .; /* 2024C54 */ + . += 0x8; -gUnknown_02024C5C: @ 2024C5C - .space 0x4 +gUnknown_02024C5C = .; /* 2024C5C */ + . += 0x4; -gChosenMovesByBanks: @ 2024C60 - .space 0x8 +gChosenMovesByBanks = .; /* 2024C60 */ + . += 0x8; -gBattleMoveFlags: @ 2024C68 - .space 0x4 +gBattleMoveFlags = .; /* 2024C68 */ + . += 0x4; -gHitMarker: @ 2024C6C - .space 0x4 +gHitMarker = .; /* 2024C6C */ + . += 0x4; -gUnknown_02024C70: @ 2024C70 - .space 0x4 +gUnknown_02024C70 = .; /* 2024C70 */ + . += 0x4; -gTakenDmgBanks: @ 2024C74 - .space 0x4 +gTakenDmgBanks = .; /* 2024C74 */ + . += 0x4; -gUnknown_02024C78: @ 2024C78 - .space 0x2 +gUnknown_02024C78 = .; /* 2024C78 */ + . += 0x2; -gSideAffecting: @ 2024C7A - .space 0x6 +gSideAffecting = .; /* 2024C7A */ + . += 0x6; -gSideTimers: @ 2024C80 - .space 0x18 +gSideTimers = .; /* 2024C80 */ + . += 0x18; -gStatuses3: @ 2024C98 - .space 0x10 +gStatuses3 = .; /* 2024C98 */ + . += 0x10; -gDisableStructs: @ 2024CA8 - .space 0x70 +gDisableStructs = .; /* 2024CA8 */ + . += 0x70; -gPauseCounterBattle: @ 2024D18 - .space 0x2 +gPauseCounterBattle = .; /* 2024D18 */ + . += 0x2; -gPaydayMoney: @ 2024D1A - .space 0x2 +gPaydayMoney = .; /* 2024D1A */ + . += 0x2; -gRandomTurnNumber: @ 2024D1C - .space 0x2 +gRandomTurnNumber = .; /* 2024D1C */ + . += 0x2; -gBattleCommunication: @ 2024D1E - .space 0x1 +gBattleCommunication = .; /* 2024D1E */ + . += 0x1; -gUnknown_02024D1F: @ 2024D1F - .space 0x7 +gUnknown_02024D1F = .; /* 2024D1F */ + . += 0x7; -gBattleOutcome: @ 2024D26 - .space 0x2 +gBattleOutcome = .; /* 2024D26 */ + . += 0x2; -gProtectStructs: @ 2024D28 - .space 0x40 +gProtectStructs = .; /* 2024D28 */ + . += 0x40; -gSpecialStatuses: @ 2024D68 - .space 0x50 +gSpecialStatuses = .; /* 2024D68 */ + . += 0x50; -gBattleWeather: @ 2024DB8 - .space 0x4 +gBattleWeather = .; /* 2024DB8 */ + . += 0x4; -gWishFutureKnock: @ 2024DBC - .space 0x20 +gWishFutureKnock = .; /* 2024DBC */ + . += 0x20; -gUnknown_02024DDC: @ 2024DDC - .space 0xC +gUnknown_02024DDC = .; /* 2024DDC */ + . += 0xC; -gUnknown_02024DE8: @ 2024DE8 - .space 0x2 +gUnknown_02024DE8 = .; /* 2024DE8 */ + . += 0x2; -gSentPokesToOpponent: @ 2024DEA - .space 0x2 +gSentPokesToOpponent = .; /* 2024DEA */ + . += 0x2; -gDynamicBasePower: @ 2024DEC - .space 0x2 +gDynamicBasePower = .; /* 2024DEC */ + . += 0x2; -gExpShareExp: @ 2024DEE - .space 0x2 +gExpShareExp = .; /* 2024DEE */ + . += 0x2; -gEnigmaBerries: @ 2024DF0 - .space 0x8 +gEnigmaBerries = .; /* 2024DF0 */ + . += 0x8; -gUnknown_02024DF8: @ 2024DF8 - .space 0x68 +gUnknown_02024DF8 = .; /* 2024DF8 */ + . += 0x68; -gActionSelectionCursor: @ 2024E60 - .space 0x4 +gActionSelectionCursor = .; /* 2024E60 */ + . += 0x4; -gMoveSelectionCursor: @ 2024E64 - .space 0x4 +gMoveSelectionCursor = .; /* 2024E64 */ + . += 0x4; -gUnknown_02024E68: @ 2024E68 - .space 0x4 +gUnknown_02024E68 = .; /* 2024E68 */ + . += 0x4; -gBankInMenu: @ 2024E6C - .space 0x1 +gBankInMenu = .; /* 2024E6C */ + . += 0x1; -gDoingBattleAnim: @ 2024E6D - .space 0x3 +gDoingBattleAnim = .; /* 2024E6D */ + . += 0x3; -gTransformedPersonalities: @ 2024E70 - .space 0x10 +gTransformedPersonalities = .; /* 2024E70 */ + . += 0x10; -gBattleMovePower: @ 2024E80 - .space 0x2 +gBattleMovePower = .; /* 2024E80 */ + . += 0x2; -gMoveToLearn: @ 2024E82 - .space 0x2 +gMoveToLearn = .; /* 2024E82 */ + . += 0x2; -gBattleMonForms: @ 2024E84 - .space 0x4 +gBattleMonForms = .; /* 2024E84 */ + . += 0x4; - .include "src/pokemon/pokemon_1.o" - .include "src/pokemon/pokemon_2.o" - .include "src/engine/load_save.o" - .include "src/engine/trade.o" - .include "src/scene/berry_blender.o" - .include "src/scene/new_game.o" - .include "src/field/overworld.o" - .include "src/field/fieldmap.o" - .include "src/field/field_camera.o" - .include "src/field/field_player_avatar.o" - .include "src/field/field_message_box.o" - .include "src/engine/script.o" - .include "src/field/scrcmd.o" - .include "src/field/field_control_avatar.o" - .include "src/field/event_data.o" - .include "src/field/party_menu.o" - .include "src/field/start_menu.o" - .include "src/engine/menu.o" - .include "src/engine/tileset_anim.o" - .include "src/engine/palette.o" - .include "src/engine/sound.o" - .include "src/battle/battle_anim.o" - .include "src/rom_8077ABC.o" - .include "src/scene/title_screen.o" - .include "src/field/field_weather.o" - .include "src/battle/battle_setup.o" - .include "src/field/wild_encounter.o" - .include "src/field/field_effect.o" - .include "src/scanline_effect.o" - .include "src/pokemon/pokemon_menu.o" - .include "src/pokemon/pokedex.o" - .include "src/engine/trainer_card.o" - .include "src/pokemon/pokemon_storage_system.o" +. = ALIGN(4); src/pokemon/pokemon_1.o(ewram_data); +. = ALIGN(4); src/pokemon/pokemon_2.o(ewram_data); +. = ALIGN(4); src/engine/load_save.o(ewram_data); +. = ALIGN(4); src/engine/trade.o(ewram_data); +. = ALIGN(4); src/scene/berry_blender.o(ewram_data); +. = ALIGN(4); src/scene/new_game.o(ewram_data); +. = ALIGN(4); src/field/overworld.o(ewram_data); +. = ALIGN(4); src/field/fieldmap.o(ewram_data); +. = ALIGN(4); src/field/field_camera.o(ewram_data); +. = ALIGN(4); src/field/field_player_avatar.o(ewram_data); +. = ALIGN(4); src/field/field_message_box.o(ewram_data); +. = ALIGN(4); src/engine/script.o(ewram_data); +. = ALIGN(4); src/field/scrcmd.o(ewram_data); +. = ALIGN(4); src/field/field_control_avatar.o(ewram_data); +. = ALIGN(4); src/field/event_data.o(ewram_data); +. = ALIGN(4); src/field/party_menu.o(ewram_data); +. = ALIGN(4); src/field/start_menu.o(ewram_data); +. = ALIGN(4); src/engine/menu.o(ewram_data); +. = ALIGN(4); src/engine/tileset_anim.o(ewram_data); +. = ALIGN(4); src/engine/palette.o(ewram_data); +. = ALIGN(4); src/engine/sound.o(ewram_data); +. = ALIGN(4); src/battle/battle_anim.o(ewram_data); +. = ALIGN(4); src/rom_8077ABC.o(ewram_data); +. = ALIGN(4); src/scene/title_screen.o(ewram_data); +. = ALIGN(4); src/field/field_weather.o(ewram_data); +. = ALIGN(4); src/battle/battle_setup.o(ewram_data); +. = ALIGN(4); src/field/wild_encounter.o(ewram_data); +. = ALIGN(4); src/field/field_effect.o(ewram_data); +. = ALIGN(4); src/scanline_effect.o(ewram_data); +. = ALIGN(4); src/pokemon/pokemon_menu.o(ewram_data); +. = ALIGN(4); src/pokemon/pokedex.o(ewram_data); +. = ALIGN(4); src/engine/trainer_card.o(ewram_data); +. = ALIGN(4); src/pokemon/pokemon_storage_system.o(ewram_data); -@ still pokemon_storage_system +/* still pokemon_storage_system */ - .align 2 -gUnknown_02038470: @ 2038470 - .space 0x3 + . = ALIGN(4); +gUnknown_02038470 = .; /* 2038470 */ + . += 0x3; -gUnknown_02038473: @ 2038473 - .space 0x1 +gUnknown_02038473 = .; /* 2038473 */ + . += 0x1; -gUnknown_02038474: @ 2038474 - .space 0x4 +gUnknown_02038474 = .; /* 2038474 */ + . += 0x4; -gUnknown_02038478: @ 2038478 - .space 0x4 - -gUnknown_0203847C: @ 203847C - .space 0x1 - -gUnknown_0203847D: @ 203847D - .space 0x1 - -gUnknown_0203847E: @ 203847E - .space 0x1 - -gUnknown_0203847F: @ 203847F - .space 0x1 - -gUnknown_02038480: @ 2038480 - .space 0x64 - -gUnknown_020384E4: @ 20384E4 - .space 0x1 - -gUnknown_020384E5: @ 20384E5 - .space 0x1 - -gUnknown_020384E6: @ 20384E6 - .space 0x1 - -gUnknown_020384E7: @ 20384E7 - .space 0x1 - -gUnknown_020384E8: @ 20384E8 - .space 0x1 - -gUnknown_020384E9: @ 20384E9 - .space 0x1 - -gUnknown_020384EA: @ 20384EA - .space 0x2 - -gUnknown_020384EC: @ 20384EC - .space 0x4 - - .include "src/pokemon/pokemon_summary_screen.o" - .include "src/field/script_movement.o" - .include "src/field/map_name_popup.o" - .include "src/field/item_menu.o" - .include "src/contest.o" - .include "src/field/shop.o" - .include "src/field/fldeff_escalator.o" - .include "src/field/money.o" - .include "src/engine/record_mixing.o" - .include "src/debug/sound_check_menu.o" - .include "src/field/secret_base.o" - .include "src/field/tv.o" - .include "src/field/pc_screen_effect.o" - .include "src/field/rotating_gate.o" - .include "src/field/safari_zone.o" - .include "src/easy_chat_2.o" - -@ pokenav - - .align 2 -gUnknown_020388B0: @ 20388B0 - .space 0x4 - -gUnknown_020388B4: @ 20388B4 - .space 0x4 - - .include "src/pokemon/mon_markings.o" - .include "src/field/mauville_man.o" - .include "src/field/menu_helpers.o" - .include "src/field/region_map.o" - .include "src/field/decoration.o" - .include "src/battle/battle_ai.o" - .include "src/rom6.o" - .include "src/field/pokeblock.o" - .include "src/field/field_specials.o" - -@ pokedex_area_screen - - .align 2 -gUnknown_02039260: @ 2039260 - .space 0x2 +gUnknown_02038478 = .; /* 2038478 */ + . += 0x4; + +gUnknown_0203847C = .; /* 203847C */ + . += 0x1; + +gUnknown_0203847D = .; /* 203847D */ + . += 0x1; + +gUnknown_0203847E = .; /* 203847E */ + . += 0x1; + +gUnknown_0203847F = .; /* 203847F */ + . += 0x1; + +gUnknown_02038480 = .; /* 2038480 */ + . += 0x64; + +gUnknown_020384E4 = .; /* 20384E4 */ + . += 0x1; + +gUnknown_020384E5 = .; /* 20384E5 */ + . += 0x1; + +gUnknown_020384E6 = .; /* 20384E6 */ + . += 0x1; + +gUnknown_020384E7 = .; /* 20384E7 */ + . += 0x1; + +gUnknown_020384E8 = .; /* 20384E8 */ + . += 0x1; + +gUnknown_020384E9 = .; /* 20384E9 */ + . += 0x1; + +gUnknown_020384EA = .; /* 20384EA */ + . += 0x2; + +gUnknown_020384EC = .; /* 20384EC */ + . += 0x4; + +. = ALIGN(4); src/pokemon/pokemon_summary_screen.o(ewram_data); +. = ALIGN(4); src/field/script_movement.o(ewram_data); +. = ALIGN(4); src/field/map_name_popup.o(ewram_data); +. = ALIGN(4); src/field/item_menu.o(ewram_data); +. = ALIGN(4); src/contest.o(ewram_data); +. = ALIGN(4); src/field/shop.o(ewram_data); +. = ALIGN(4); src/field/fldeff_escalator.o(ewram_data); +. = ALIGN(4); src/field/money.o(ewram_data); +. = ALIGN(4); src/engine/record_mixing.o(ewram_data); +. = ALIGN(4); src/debug/sound_check_menu.o(ewram_data); +. = ALIGN(4); src/field/secret_base.o(ewram_data); +. = ALIGN(4); src/field/tv.o(ewram_data); +. = ALIGN(4); src/field/pc_screen_effect.o(ewram_data); +. = ALIGN(4); src/field/rotating_gate.o(ewram_data); +. = ALIGN(4); src/field/safari_zone.o(ewram_data); +. = ALIGN(4); src/easy_chat_2.o(ewram_data); + +/* pokenav */ + + . = ALIGN(4); +gUnknown_020388B0 = .; /* 20388B0 */ + . += 0x4; + +gUnknown_020388B4 = .; /* 20388B4 */ + . += 0x4; + +. = ALIGN(4); src/pokemon/mon_markings.o(ewram_data); +. = ALIGN(4); src/field/mauville_man.o(ewram_data); +. = ALIGN(4); src/field/menu_helpers.o(ewram_data); +. = ALIGN(4); src/field/region_map.o(ewram_data); +. = ALIGN(4); src/field/decoration.o(ewram_data); +. = ALIGN(4); src/battle/battle_ai.o(ewram_data); +. = ALIGN(4); src/rom6.o(ewram_data); +. = ALIGN(4); src/field/pokeblock.o(ewram_data); +. = ALIGN(4); src/field/field_specials.o(ewram_data); + +/* pokedex_area_screen */ + + . = ALIGN(4); +gUnknown_02039260 = .; /* 2039260 */ + . += 0x2; -gUnknown_02039262: @ 2039262 - .space 0x2 +gUnknown_02039262 = .; /* 2039262 */ + . += 0x2; -gUnknown_02039264: @ 2039264 - .space 0x2 +gUnknown_02039264 = .; /* 2039264 */ + . += 0x2; -gUnknown_02039266: @ 2039266 - .space 0x2 +gUnknown_02039266 = .; /* 2039266 */ + . += 0x2; -gUnknown_02039268: @ 2039268 - .space 0x2 +gUnknown_02039268 = .; /* 2039268 */ + . += 0x2; -gUnknown_0203926A: @ 203926A - .space 0x2 - - .include "src/battle/battle_message.o" - .include "src/field/choose_party.o" - .include "src/scene/cable_car.o" - .include "src/engine/save.o" - .include "src/engine/mystery_event_script.o" - .include "src/field/roamer.o" - .include "src/field/use_pokeblock.o" - .include "src/field/player_pc.o" - .include "src/scene/intro.o" - .include "src/scene/hall_of_fame.o" - .include "src/scene/credits.o" - .include "src/field/lottery_corner.o" - .include "src/field/berry_tag_screen.o" - .include "src/engine/mystery_event_menu.o" - .include "src/engine/save_failed_screen.o" - .include "src/pokemon/pokeblock_feed.o" - .include "src/scene/intro_credits_graphics.o" - -@ ??? - - .align 4 -gTileBuffer: @ 2039360 - .space 0x100 - -gUnknown_02039460: @ 2039460 - .space 0x300 - -gUnknown_02039760: @ 2039760 - .space 0xC00 - - .include "src/engine/menu_cursor.o" +gUnknown_0203926A = .; /* 203926A */ + . += 0x2; + +. = ALIGN(4); src/battle/battle_message.o(ewram_data); +. = ALIGN(4); src/field/choose_party.o(ewram_data); +. = ALIGN(4); src/scene/cable_car.o(ewram_data); +. = ALIGN(4); src/engine/save.o(ewram_data); +. = ALIGN(4); src/engine/mystery_event_script.o(ewram_data); +. = ALIGN(4); src/field/roamer.o(ewram_data); +. = ALIGN(4); src/field/use_pokeblock.o(ewram_data); +. = ALIGN(4); src/field/player_pc.o(ewram_data); +. = ALIGN(4); src/scene/intro.o(ewram_data); +. = ALIGN(4); src/scene/hall_of_fame.o(ewram_data); +. = ALIGN(4); src/scene/credits.o(ewram_data); +. = ALIGN(4); src/field/lottery_corner.o(ewram_data); +. = ALIGN(4); src/field/berry_tag_screen.o(ewram_data); +. = ALIGN(4); src/engine/mystery_event_menu.o(ewram_data); +. = ALIGN(4); src/engine/save_failed_screen.o(ewram_data); +. = ALIGN(4); src/pokemon/pokeblock_feed.o(ewram_data); +. = ALIGN(4); src/scene/intro_credits_graphics.o(ewram_data); + +/* ??? */ + + . = ALIGN(16); +gTileBuffer = .; /* 2039360 */ + . += 0x100; + +gUnknown_02039460 = .; /* 2039460 */ + . += 0x300; + +gUnknown_02039760 = .; /* 2039760 */ + . += 0xC00; + +. = ALIGN(4); src/engine/menu_cursor.o(ewram_data); -- cgit v1.2.3 From f52a7bea85cac244b63b50fcf038830450946fb0 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 21 Jan 2018 10:31:03 -0600 Subject: annotate filenames of common symbols --- sym_common.txt | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/sym_common.txt b/sym_common.txt index 2c390e214..64e87c046 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -4,6 +4,8 @@ name = .; \ . += size; + +// main.c SYMBOL(gKeyRepeatStartDelay, 4) SYMBOL(gLinkTransferringData, 4) SYMBOL(gMain, 1088) @@ -13,6 +15,8 @@ SYMBOL(gIntrTable, 56) SYMBOL(gLinkVSyncDisabled, 4) SYMBOL(IntrMain_Buffer, 2048) SYMBOL(gPcmDmaCounter, 4) + +// sprite.c SYMBOL(gSpriteOrder, 64) SYMBOL(gSpriteTileAllocBitmap, 128) SYMBOL(gSpriteCoordOffsetX, 4) @@ -25,7 +29,11 @@ SYMBOL(gOamMatrices, 256) SYMBOL(gShouldProcessSpriteCopyRequests, 4) SYMBOL(gOamMatrixAllocBitmap, 4) SYMBOL(gReservedSpritePaletteCount, 4) + +// string_util.c SYMBOL(gUnknownStringVar, 16) + +// link.c SYMBOL(word_3002910, 8) SYMBOL(gLinkDebugValue1, 4) SYMBOL(localLinkPlayerBlock, 60) @@ -71,7 +79,11 @@ SYMBOL(gLastSendQueueCount, 4) SYMBOL(gLink, 4032) SYMBOL(gLastRecvQueueCount, 4) SYMBOL(gLinkSavedIme, 4) + +// rtc.c SYMBOL(gLocalTime, 8) + +// battle SYMBOL(gBattleBuffersTransferData, 368) SYMBOL(gBattle_BG3_X, 4) SYMBOL(gBattle_BG1_Y, 4) @@ -111,46 +123,88 @@ SYMBOL(gHealthboxIDs, 4) SYMBOL(gUnknown_03004344, 4) SYMBOL(gUnknown_03004348, 4) SYMBOL(gUnknown_0300434C, 4) + +// pokemon_1.c SYMBOL(gPlayerPartyCount, 4) SYMBOL(gPlayerParty, 600) SYMBOL(gEnemyPartyCount, 4) SYMBOL(gEnemyParty, 600) + +// random.c SYMBOL(gRngValue, 4) + +// egg_hatch.c SYMBOL(gEggHatchData, 4) + +// load_save.c SYMBOL(gFlashMemoryPresent, 4) + +// ??? SYMBOL(gUnknown_03004824, 4) SYMBOL(gUnknown_03004828, 4) . += 0x4; + +// berry_blender.c SYMBOL(gUnknown_03004830, 4) SYMBOL(gInGameOpponentsNo, 4) SYMBOL(gUnknown_03004840, 20) SYMBOL(gBerryBlenderData, 4) + +// overworld.c SYMBOL(word_3004858, 4) SYMBOL(gFieldCallback, 4) SYMBOL(gUnknown_03004860, 4) SYMBOL(gFieldLinkPlayerCount, 4) + +// fieldmap.c . = ALIGN(16); gUnknown_03004870 = .; . += 0xC; + +// field_camera.c SYMBOL(gUnknown_03004880, 24) SYMBOL(gUnknown_03004898, 4) SYMBOL(gUnknown_0300489C, 4) + +// field_map_obj.c SYMBOL(gMapObjects, 576) + +// field_control_avatar.c SYMBOL(gSelectedMapObject, 4) + +// ??? SYMBOL(gPokemonItemUseCallback, 4) + +// start_menu.c SYMBOL(gMenuCallback, 4) + +// sound.c SYMBOL(gDisableMusic, 4) + +// battle_anim.c SYMBOL(gSoundAnimFramesToWait, 4) SYMBOL(gBattleAnimArgs, 16) SYMBOL(gAnimSpriteIndexArray, 16) + +// task.c SYMBOL(gTasks, 640) + +// mori_debug_menu.c SYMBOL(gUnknown_03004DA0, 32) + +// scanline_effect.c SYMBOL(gScanlineEffect, 32) SYMBOL(gScanlineEffectRegBuffers, 3840) + +// pokemon_menu.c SYMBOL(gLastFieldPokeMenuOpened, 4) SYMBOL(gUnknown_03005CE4, 4) + +// pokedex.c SYMBOL(gUnknown_03005CE8, 4) SYMBOL(gUnknown_03005CEC, 4) + +// ??? SYMBOL(gUnknown_03005CF0, 4) // huh? . = ALIGN(16); @@ -160,11 +214,19 @@ gBagPocketScrollStates = .; . += 0x14; SYMBOL(gCurrentBagPocketItemSlots, 4) SYMBOL(gUnknown_03005D28, 4) + +// record_mixing.c SYMBOL(gUnknown_03005D2C, 4) + +// sound_check_menu.c SYMBOL(gUnknown_03005D30, 4) SYMBOL(gSoundTestCryNum, 4) + +// tv.c SYMBOL(gUnknown_03005D38, 4) . += 0x64; // huge gap? + +// ??? SYMBOL(gUnknown_03005DA0, 0x48) SYMBOL(gUnknown_03005DE8, 4) SYMBOL(gUnknown_03005DEC, 4) @@ -176,13 +238,21 @@ SYMBOL(gUnknown_03005E00, 4) SYMBOL(gUnknown_03005E04, 4) SYMBOL(gUnknown_03005E08, 4) SYMBOL(gUnknown_03005E0C, 4) + +// contest_painting.c SYMBOL(gUnknown_03005E10, 4) SYMBOL(gUnknown_03005E20, 32) SYMBOL(gUnknown_03005E40, 76) SYMBOL(gUnknown_03005E8C, 4) SYMBOL(gUnknown_03005E90, 4) + +// evolution_scene.c SYMBOL(gCB2_AfterEvolution, 4) + +// ??? SYMBOL(gUnknown_03005E98, 4) + +// save.c SYMBOL(gFirstSaveSector, 4) SYMBOL(gPrevSaveCounter, 4) SYMBOL(gLastKnownGoodSector, 4) @@ -193,12 +263,18 @@ SYMBOL(gUnknown_03005EB4, 4) SYMBOL(gSaveFileStatus, 4) SYMBOL(gGameContinueCallback, 4) . += 0x10; + +// intro.c SYMBOL(gIntroFrameCounter, 4) SYMBOL(gMultibootProgramStruct, 44) + +// ??? SYMBOL(gUnknown_03005F0C, 4) SYMBOL(gUnknown_03005F10, 4) gUnknown_03005F14 = .; . += 0xC; + +// pokeblock_feed.c SYMBOL(gPokeblockFeedPokeSprite, 4) SYMBOL(gPokeblockFeedMonSpecies, 4) SYMBOL(gPokeblockMonNotFlipped, 4) @@ -211,6 +287,8 @@ SYMBOL(gUnknown_03005F40, 4) SYMBOL(gPokeblockFeedPokeSpriteCopy, 68) SYMBOL(gUnknown_03005F94, 4) SYMBOL(gUnknown_03005FA0, 48) + +// m4a_2.c SYMBOL(gSoundInfo, 4016) SYMBOL(gPokemonCrySongs, 104) SYMBOL(gPokemonCryMusicPlayers, 128) @@ -223,6 +301,8 @@ SYMBOL(gMPlay_SE1, 64) SYMBOL(gMPlay_SE2, 64) SYMBOL(gMPlayMemAccArea, 16) SYMBOL(gMPlay_SE3, 64) + +// agb_flash.c SYMBOL(gFlashTimeoutFlag, 4) SYMBOL(PollFlashStatus, 4) SYMBOL(WaitForFlashWrite, 4) -- cgit v1.2.3 From 38c0be840e653454f7a9745ca63ae5f001a70e28 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 21 Jan 2018 11:13:52 -0600 Subject: preprocess and copy ld script files to build directory --- Makefile | 4 ++-- ld_script.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 83f37d8b7..556293b7a 100644 --- a/Makefile +++ b/Makefile @@ -111,9 +111,9 @@ tidy: %.elf: $(LD_SCRIPT) $(ALL_OBJECTS) cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) ../../$(LIBGCC) ../../$(LIBC) -o ../../$@ -$(LD_SCRIPT): $(BUILD_DIR)/sym_common.ld ld_script.txt +$(LD_SCRIPT): ld_script.txt $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld $(BUILD_DIR)/sym_bss.ld cd $(BUILD_DIR) && sed -e "s#tools/#../../tools/#g" ../../ld_script.txt >ld_script.ld -$(BUILD_DIR)/sym_common.ld: sym_common.txt +$(BUILD_DIR)/sym_%.ld: sym_%.txt $(CPP) -P $(CPPFLAGS) $< > $@ $(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP) diff --git a/ld_script.txt b/ld_script.txt index 6931eb661..5dcdf948d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -9,7 +9,7 @@ SECTIONS { ewram (NOLOAD) : ALIGN(4) { - INCLUDE "../../sym_ewram.txt" + INCLUDE "sym_ewram.ld" . = 0x40000; } @@ -20,7 +20,7 @@ SECTIONS { ALIGN(4) { /* .bss starts at 0x3000000 */ - INCLUDE "../../sym_bss.txt" + INCLUDE "sym_bss.ld" /* .bss.code starts at 0x3000F60 */ src/libs/m4a_2.o(.bss.code); -- cgit v1.2.3 From 7fbce3b89ff5ad8fae138ccf1842cb83cbc86799 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 21 Jan 2018 12:35:46 -0600 Subject: use sed to convert library paths relative to build dir --- Makefile | 2 +- sym_bss.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 556293b7a..eda7fb2c2 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ tidy: $(LD_SCRIPT): ld_script.txt $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld $(BUILD_DIR)/sym_bss.ld cd $(BUILD_DIR) && sed -e "s#tools/#../../tools/#g" ../../ld_script.txt >ld_script.ld $(BUILD_DIR)/sym_%.ld: sym_%.txt - $(CPP) -P $(CPPFLAGS) $< > $@ + $(CPP) -P $(CPPFLAGS) $< | sed -e "s#tools/#../../tools/#g" > $@ $(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP) $(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i diff --git a/sym_bss.txt b/sym_bss.txt index f36785ce8..5e22693fd 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -37,6 +37,6 @@ . = ALIGN(4); src/libs/m4a_1.o(.bss); . = ALIGN(4); src/libs/agb_flash.o(.bss); . = ALIGN(4); src/libs/siirtc.o(.bss); -. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:dp-bit.o(.bss); -. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:fp-bit.o(.bss); -. = ALIGN(4); ../../tools/agbcc/lib/libc.a:syscalls.o(.bss); +. = ALIGN(4); tools/agbcc/lib/libgcc.a:dp-bit.o(.bss); +. = ALIGN(4); tools/agbcc/lib/libgcc.a:fp-bit.o(.bss); +. = ALIGN(4); tools/agbcc/lib/libc.a:syscalls.o(.bss); -- cgit v1.2.3 From 9f1f9827a8a6057d86b63ccca34d96f5ae080c4f Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 21 Jan 2018 13:51:28 -0500 Subject: fix shell scripts in install instructions --- INSTALL.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index b852dd126..dfd992f2f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -6,12 +6,12 @@ Make sure that there is an environment variable called DEVKITARM with the path o Then get the compiler from https://github.com/pret/agbcc and run the following commands. - build.sh - install.sh PATH_OF_POKERUBY_DIRECTORY + ./build.sh + ./install.sh PATH_OF_POKERUBY_DIRECTORY Then in the pokeruby directory, build the tools. - build_tools.sh + ./build_tools.sh Finally, build the rom. -- cgit v1.2.3 From 608e06126acdc8b6d32a0aa71fdc57bc188b8d7b Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sun, 21 Jan 2018 14:27:32 -0600 Subject: fix build of normal ROMs --- asm/pokemon_storage_system.s | 6 +++--- data/debug_menu_3.s | 4 ++++ data/debug_mystery_event_menu.s | 4 ++++ data/unk_debug_menu_3.s | 3 +++ src/debug/start_menu_debug.c | 3 +++ src/engine/link.c | 2 +- src/engine/save.c | 4 ++-- src/pokemon/mail.c | 2 ++ src/scene/title_screen.c | 2 ++ 9 files changed, 24 insertions(+), 6 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index b5f1f495f..6e6e17db3 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1009,7 +1009,7 @@ _0809625C: .4byte gPokemonStorage + 0x8344 _08096260: .4byte gPCText_BOX thumb_func_end ResetPokemonStorageSystem -.ifdef DEBUG +.if DEBUG thumb_func_start debug_sub_80A3904 debug_sub_80A3904: .syntax divided @@ -2386,7 +2386,7 @@ _08096AF4: .4byte gMain _08096AF8: .4byte 0x0000043c thumb_func_end sub_80969A0 -.ifdef DEBUG +.if DEBUG thumb_func_start debug_sub_80A4300 debug_sub_80A4300: @@ -15134,7 +15134,7 @@ sub_809CA8C: @ 809CA8C bx r0 thumb_func_end sub_809CA8C -.ifdef DEBUG +.if DEBUG thumb_func_start debug_sub_80AA40C debug_sub_80AA40C: .syntax divided diff --git a/data/debug_menu_3.s b/data/debug_menu_3.s index 1e0a79c9f..36356c18a 100644 --- a/data/debug_menu_3.s +++ b/data/debug_menu_3.s @@ -1,3 +1,5 @@ +.if DEBUG + .include "include/macros.inc" .include "constants/constants.inc" @@ -17,3 +19,5 @@ _845E422:: .incbin "baserom_de_debug.gba", 0x45E422, 33 _845E443:: .incbin "baserom_de_debug.gba", 0x45E443, 889 + +.endif diff --git a/data/debug_mystery_event_menu.s b/data/debug_mystery_event_menu.s index a54a89715..06bf18377 100644 --- a/data/debug_mystery_event_menu.s +++ b/data/debug_mystery_event_menu.s @@ -1,3 +1,5 @@ +.if DEBUG + .include "include/macros.inc" .include "constants/constants.inc" @@ -14,3 +16,5 @@ Str_843DA98:: Str_843DAA3:: .string "completed。$" + +.endif diff --git a/data/unk_debug_menu_3.s b/data/unk_debug_menu_3.s index cb98f9bbf..2fd8381db 100644 --- a/data/unk_debug_menu_3.s +++ b/data/unk_debug_menu_3.s @@ -1,5 +1,8 @@ .section .rodata + .align 2 + +@ Is this actually sJapaneseEggNickname? Str_842E238: @ 0x842E238 .string "タマゴ$" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index f8e10baa2..572251fb4 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -1,3 +1,5 @@ +#if DEBUG + __attribute__((naked)) void debug_sub_8076AC8() { @@ -6128,3 +6130,4 @@ void DebugMenu_OpenKiwa() ); } +#endif diff --git a/src/engine/link.c b/src/engine/link.c index a716d5c2b..f800f4aad 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -1404,7 +1404,7 @@ static void CB2_PrintErrorMessage(void) { case 0: Menu_PrintTextPixelCoords(gMultiText_LinkError, 20, 56, 1); -#ifdef DEBUG +#if DEBUG StringCopy(array, sColorCodes); ConvertIntToHexStringN(array2, sErrorLinkStatus, STR_CONV_MODE_LEADING_ZEROS, 8); diff --git a/src/engine/save.c b/src/engine/save.c index 8217652f9..d11eebaac 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -783,7 +783,7 @@ u8 Save_WriteDataInternal(u8 saveType) return 0; } -#ifdef DEBUG +#if DEBUG extern u32 gUnknown_Debug_03004BD0; #endif @@ -794,7 +794,7 @@ u8 Save_WriteData(u8 saveType) // TrySave Save_WriteDataInternal(saveType); if (!gDamagedSaveSectors -#ifdef DEBUG +#if DEBUG && gUnknown_Debug_03004BD0 == 0 #endif ) diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index db0c96938..3187fef9f 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -327,9 +327,11 @@ static void sub_80F8F58(void); static void sub_80F8F78(void); static void sub_80F8FB4(void); +#if DEBUG // some debug variable, I guess. // TODO: where exactly is this located? __attribute__((section(".bss"))) /*static*/ u8 gUnknown_0300074C = 0; +#endif #if DEBUG __attribute__((naked)) diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c index 4ff02d93c..a1c8e081d 100644 --- a/src/scene/title_screen.c +++ b/src/scene/title_screen.c @@ -354,7 +354,9 @@ static void Task_TitleScreenPhase1(u8); static void Task_TitleScreenPhase2(u8); static void Task_TitleScreenPhase3(u8); static void CB2_GoToMainMenu(void); +#if DEBUG static void CB2_GoToTestMenu(void); +#endif static void CB2_GoToClearSaveDataScreen(void); static void CB2_GoToResetRtcScreen(void); static void CB2_GoToCopyrightScreen(void); -- cgit v1.2.3 From ffb74a0211f750506650b66fe2bcdf7ddf770668 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sun, 21 Jan 2018 18:14:47 -0600 Subject: match debug ROM --- sound/music_player_table.inc | 9 +++++++++ src/battle/battle_2.c | 6 ++++++ src/debug/watanabe_debug_menu.c | 8 ++++---- src/engine/link.c | 18 ++++++++++++++---- src/pokemon/mail.c | 11 +++-------- sym_bss.txt | 3 +++ sym_common.txt | 21 +++++++++++++++++++++ sym_ewram.txt | 4 ++++ 8 files changed, 64 insertions(+), 16 deletions(-) diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index eadcfc90a..6249a30e1 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,6 +1,15 @@ +@ TODO: remove the raw pointers + .align 2 gMPlayTable:: @ 845545C +.if DEBUG + music_player gMPlay_BGM, 0x3000878, 10, 0 + music_player gMPlay_SE1, 0x3000B98, 3, 1 + music_player gMPlay_SE2, 0x3000C88, 9, 1 + music_player gMPlay_SE3, 0x3000F58, 1, 0 +.else music_player gMPlay_BGM, 0x30007F8, 10, 0 music_player gMPlay_SE1, 0x3000B18, 3, 1 music_player gMPlay_SE2, 0x3000C08, 9, 1 music_player gMPlay_SE3, 0x3000ED8, 1, 0 +.endif diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 696f1fde0..03391cf92 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -12104,6 +12104,12 @@ void SetActionsAndBanksTurnOrder(void) } } } + // Debug ROM has a register swap from the retail ROM. + // And doing this seems to fix it. +#if DEBUG + asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm(""); + asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm(""); +#endif gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; eFocusPunchBank = 0; } diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index b0fbebac1..ff6f97933 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -7813,7 +7813,7 @@ void debug_80C6FA8() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x0\n" - " bl GetMonSpritePal\n" + " bl GetMonSpritePalFromOtIdPersonality\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" @@ -7832,7 +7832,7 @@ void debug_80C6FA8() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x9\n" - " bl GetMonSpritePal\n" + " bl GetMonSpritePalFromOtIdPersonality\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" @@ -9268,7 +9268,7 @@ void debug_80C7B14() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x0\n" - " bl GetMonSpritePal\n" + " bl GetMonSpritePalFromOtIdPersonality\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" @@ -9287,7 +9287,7 @@ void debug_80C7B14() " ldrh r0, [r1]\n" " mov r1, #0x0\n" " mov r2, #0x9\n" - " bl GetMonSpritePal\n" + " bl GetMonSpritePalFromOtIdPersonality\n" " ldr r1, [r4]\n" " ldrb r1, [r1, #0x6]\n" " lsl r1, r1, #0x14\n" diff --git a/src/engine/link.c b/src/engine/link.c index f800f4aad..5785a5a56 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -81,7 +81,7 @@ static void sub_80084C8(void); static void sub_80084F4(void); static void CheckErrorStatus(void); -static void CB2_PrintErrorMessage(void); +void CB2_PrintErrorMessage(void); static u8 IsSioMultiMaster(void); static void DisableSerial(void); static void EnableSerial(void); @@ -191,9 +191,19 @@ const struct BlockRequest sBlockRequestLookupTable[5] = static const u8 sTestString[] = _("テストな"); -ALIGNED(4) static const u8 sMagic[] = "GameFreak inc."; +// TODO: fix the alignment here -ALIGNED(4) static const u8 sEmptyString[] = _(""); +ALIGNED(4) const u8 sMagic[] = "GameFreak inc."; + +#if DEBUG +const u8 sEmptyString[] = _(" "); +#else +ALIGNED(4) const u8 sEmptyString[] = _(""); +#endif + +#if DEBUG +const u8 linkDebugFillerPleaseRemove[2] = {0}; +#endif void Task_DestroySelf(u8 taskId) { @@ -1395,7 +1405,7 @@ void CB2_LinkError(void) SetMainCallback2(CB2_PrintErrorMessage); } -static void CB2_PrintErrorMessage(void) +void CB2_PrintErrorMessage(void) { u8 array[32] __attribute__((unused)); // unused u8 array2[32] __attribute__((unused)); // unused diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 3187fef9f..11851410b 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -68,11 +68,6 @@ struct MailGraphics u16 color12; }; -#if DEBUG -// should be static -__attribute__((section(".bss"))) u8 unk_debug_bss_2; -#endif - const u16 gUnknown_083E562C[][2] = { {0x6ACD, 0x51A5}, @@ -977,7 +972,7 @@ void debug_sub_810C910() " .align 2, 0\n" "._143:\n" " .word gPaletteFade\n" - " .word unk_debug_bss_2\n" + " .word gUnknown_0300074C\n" " .word gSaveBlock1\n" " .word gSpecialVar_0x8005\n" " .word 0x2b6c\n" @@ -1529,7 +1524,7 @@ void debug_sub_810CD9C() "._192:\n" " .align 2, 0\n" "._191:\n" - " .word unk_debug_bss_2\n" + " .word gUnknown_0300074C\n" " .word gSpecialVar_0x8004\n" " .word gSpecialVar_0x8005\n" " .word gSpecialVar_0x8006\n" @@ -2372,7 +2367,7 @@ void debug_sub_810D388() "._300:\n" " .align 2, 0\n" "._299:\n" - " .word unk_debug_bss_2\n" + " .word gUnknown_0300074C\n" " .word 0x43c\n" "._297:\n" " bl ScanlineEffect_Stop\n" diff --git a/sym_bss.txt b/sym_bss.txt index 16f8c7874..a00532ec7 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -15,6 +15,9 @@ . = ALIGN(4); src/engine/text_window.o(.bss); . = ALIGN(4); src/engine/script.o(.bss); . = ALIGN(4); src/field/start_menu.o(.bss); +#if DEBUG +. += 0x18; +#endif . = ALIGN(4); src/engine/menu.o(.bss); . = ALIGN(4); src/engine/tileset_anim.o(.bss); . = ALIGN(4); src/engine/sound.o(.bss); diff --git a/sym_common.txt b/sym_common.txt index 1297b83b0..366036c9c 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -6,8 +6,14 @@ // main.c +#if DEBUG +/*. += 0x18;*/ +#endif SYMBOL(gKeyRepeatStartDelay, 4) SYMBOL(gLinkTransferringData, 4) +#if DEBUG +. += 0x8; +#endif SYMBOL(gMain, 1088) SYMBOL(gKeyRepeatContinueDelay, 4) SYMBOL(gSoftResetDisabled, 4) @@ -272,7 +278,11 @@ SYMBOL(gSoundTestCryNum, 4) // tv.c SYMBOL(gUnknown_03005D38, 4) +#if DEBUG +. += 0x54; +#else . += 0x64; // huge gap? +#endif // ??? SYMBOL(gUnknown_03005DA0, 0x48) @@ -315,7 +325,11 @@ SYMBOL(gFastSaveSection, 4) SYMBOL(gUnknown_03005EB4, 4) SYMBOL(gSaveFileStatus, 4) SYMBOL(gGameContinueCallback, 4) +#if DEBUG +. += 0xC; +#else . += 0x10; +#endif // intro.c SYMBOL(gIntroFrameCounter, 4) @@ -339,9 +353,16 @@ SYMBOL(gUnknown_03005F3C, 4) SYMBOL(gUnknown_03005F40, 4) SYMBOL(gPokeblockFeedPokeSpriteCopy, 68) SYMBOL(gUnknown_03005F94, 4) +#if DEBUG +SYMBOL(gUnknown_03005FA0, 32) +#else SYMBOL(gUnknown_03005FA0, 48) +#endif // m4a_2.c +#if DEBUG +. += 0x10; +#endif SYMBOL(gSoundInfo, 4016) SYMBOL(gPokemonCrySongs, 104) SYMBOL(gPokemonCryMusicPlayers, 128) diff --git a/sym_ewram.txt b/sym_ewram.txt index 59e3c1e1f..38df657f3 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -490,7 +490,11 @@ gUnknown_0203926A = .; /* 203926A */ /* ??? */ +#if DEBUG + . = ALIGN(8); +#else . = ALIGN(16); +#endif gTileBuffer = .; /* 2039360 */ . += 0x100; -- cgit v1.2.3 From 5ffd006acfe8ad12e88fa53a93a55b6f59e77779 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 21 Jan 2018 19:33:08 -0500 Subject: nonmatching sub_809C464 --- asm/pokemon_storage_system.s | 270 ----------------------- src/pokemon/pokemon_storage_system_4.c | 378 +++++++++++++++++++++++++++++++++ 2 files changed, 378 insertions(+), 270 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index eb4a9650e..8724f5608 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,276 +5,6 @@ .text - thumb_func_start sub_809C464 -sub_809C464: @ 809C464 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r0, _0809C4D8 @ =gUnknown_020384E4 - ldrb r0, [r0] - mov r8, r0 - ldr r2, _0809C4DC @ =gUnknown_020384E5 - ldrb r4, [r2] - ldr r0, _0809C4E0 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r0, _0809C4E4 @ =0x000011de - adds r7, r1, r0 - movs r0, 0 - strb r0, [r7] - ldr r3, _0809C4E8 @ =0x000011df - adds r5, r1, r3 - strb r0, [r5] - adds r3, 0x4 - adds r6, r1, r3 - strb r0, [r6] - ldr r0, _0809C4EC @ =gMain - mov r12, r0 - ldrh r1, [r0, 0x30] - movs r0, 0x40 - ands r0, r1 - adds r3, r2, 0 - cmp r0, 0 - beq _0809C4A0 - b _0809C62A -_0809C4A0: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0809C4F0 - movs r1, 0x1 - mov r9, r1 - lsls r0, r4, 24 - movs r3, 0xC0 - lsls r3, 19 - adds r0, r3 - lsrs r4, r0, 24 - asrs r0, 24 - cmp r0, 0x1D - bgt _0809C4BE - b _0809C648 -_0809C4BE: - movs r1, 0x3 - mov r8, r1 - subs r0, 0x1E - lsls r0, 24 - asrs r0, 24 - bl __divsi3 - lsls r0, 24 - lsrs r4, r0, 24 - mov r3, r9 - strb r3, [r7] - strb r3, [r6] - b _0809C648 - .align 2, 0 -_0809C4D8: .4byte gUnknown_020384E4 -_0809C4DC: .4byte gUnknown_020384E5 -_0809C4E0: .4byte gPokemonStorageSystemPtr -_0809C4E4: .4byte 0x000011de -_0809C4E8: .4byte 0x000011df -_0809C4EC: .4byte gMain -_0809C4F0: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0809C524 - movs r0, 0x1 - mov r9, r0 - movs r0, 0 - ldrsb r0, [r3, r0] - movs r1, 0x6 - bl __modsi3 - lsls r0, 24 - cmp r0, 0 - beq _0809C514 - lsls r0, r4, 24 - movs r1, 0xFF - lsls r1, 24 - b _0809C63C -_0809C514: - movs r0, 0xFF - strb r0, [r5] - lsls r0, r4, 24 - movs r3, 0xA0 - lsls r3, 19 - adds r0, r3 - lsrs r4, r0, 24 - b _0809C648 -_0809C524: - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0809C554 - movs r0, 0x1 - mov r9, r0 - movs r0, 0 - ldrsb r0, [r3, r0] - adds r0, 0x1 - movs r1, 0x6 - bl __modsi3 - cmp r0, 0 - beq _0809C548 - lsls r0, r4, 24 - movs r1, 0x80 - lsls r1, 17 - b _0809C63C -_0809C548: - mov r3, r9 - strb r3, [r5] - lsls r0, r4, 24 - movs r1, 0xFB - lsls r1, 24 - b _0809C63C -_0809C554: - mov r3, r12 - ldrh r1, [r3, 0x2E] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0809C56A - movs r0, 0x1 - mov r9, r0 - movs r1, 0x2 - mov r8, r1 - b _0809C646 -_0809C56A: - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0809C5D4 - bl sub_809CAB0 - lsls r0, 24 - cmp r0, 0 - beq _0809C5D4 - ldr r0, _0809C588 @ =gUnknown_020384E9 - ldrb r0, [r0] - cmp r0, 0 - bne _0809C58C - movs r0, 0x8 - b _0809C658 - .align 2, 0 -_0809C588: .4byte gUnknown_020384E9 -_0809C58C: - movs r0, 0 - bl sub_809CE4C - subs r0, 0x1 - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - bhi _0809C5D4 - lsls r0, 2 - ldr r1, _0809C5A8 @ =_0809C5AC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0809C5A8: .4byte _0809C5AC - .align 2, 0 -_0809C5AC: - .4byte _0809C5C0 - .4byte _0809C5C4 - .4byte _0809C5C8 - .4byte _0809C5CC - .4byte _0809C5D0 -_0809C5C0: - movs r0, 0xB - b _0809C658 -_0809C5C4: - movs r0, 0xC - b _0809C658 -_0809C5C8: - movs r0, 0xD - b _0809C658 -_0809C5CC: - movs r0, 0xE - b _0809C658 -_0809C5D0: - movs r0, 0xF - b _0809C658 -_0809C5D4: - ldr r2, _0809C5E4 @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809C5E8 - movs r0, 0x10 - b _0809C658 - .align 2, 0 -_0809C5E4: .4byte gMain -_0809C5E8: - ldr r0, _0809C600 @ =gSaveBlock2 - ldrb r0, [r0, 0x13] - cmp r0, 0x1 - bne _0809C612 - ldrh r1, [r2, 0x2C] - movs r0, 0x80 - lsls r0, 2 - ands r0, r1 - cmp r0, 0 - beq _0809C604 - movs r0, 0xA - b _0809C658 - .align 2, 0 -_0809C600: .4byte gSaveBlock2 -_0809C604: - movs r0, 0x80 - lsls r0, 1 - ands r0, r1 - cmp r0, 0 - beq _0809C612 - movs r0, 0x9 - b _0809C658 -_0809C612: - ldrh r1, [r2, 0x2E] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0809C624 - bl sub_809CD88 - movs r0, 0 - b _0809C658 -_0809C624: - movs r3, 0 - mov r9, r3 - b _0809C656 -_0809C62A: - movs r0, 0x1 - mov r9, r0 - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0x5 - ble _0809C642 - lsls r0, r4, 24 - movs r1, 0xFA - lsls r1, 24 -_0809C63C: - adds r0, r1 - lsrs r4, r0, 24 - b _0809C648 -_0809C642: - movs r3, 0x2 - mov r8, r3 -_0809C646: - movs r4, 0 -_0809C648: - mov r0, r9 - cmp r0, 0 - beq _0809C656 - mov r0, r8 - adds r1, r4, 0 - bl sub_809AF18 -_0809C656: - mov r0, r9 -_0809C658: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809C464 - thumb_func_start sub_809C664 sub_809C664: @ 809C664 push {r4-r7,lr} diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index eb5a6cb0b..c02ca878d 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -67,7 +67,10 @@ bool8 sub_809BF2C(void); void sub_809BF74(void); void sub_809C028(void); void sub_809C04C(void *pokemon, u8 a1); +bool8 sub_809CAB0(void); void sub_809CC04(void); +void sub_809CD88(void); +s8 sub_809CE4C(u8 a0); // .rodata @@ -2101,3 +2104,378 @@ void sub_809C04C(void *pokemon, u8 a1) buf[0] = EOS; } } + +#ifdef NONMATCHING +u8 sub_809C464(void) +{ + u8 r9; + s8 r8 = gUnknown_020384E4; + s8 r4 = gUnknown_020384E5; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + r9 = 1; + if (gUnknown_020384E5 >= 6) + { + r4 -= 6; + } + else + { + r8 = 2; + r4 = 0; + } + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + r9 = 1; + r4 += 6; + if (r4 >= 30) + { + r8 = 3; + r4 -= 30; + r4 /= 3; + gPokemonStorageSystemPtr->unk_11de = 1; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + } + else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + r9 = 1; + if (gUnknown_020384E5 % 6) + r4--; + else + { + gPokemonStorageSystemPtr->unk_11df = -1; + r4 += 5; + } + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + r9 = 1; + if ((gUnknown_020384E5 + 1) % 6) + r4++; + else + { + gPokemonStorageSystemPtr->unk_11df = 1; + r4 -= 5; + } + } + else if (gMain.newKeys & START_BUTTON) + { + r9 = 1; + r8 = 2; + r4 = 0; + } + else + { + if ((gMain.newKeys & A_BUTTON) && sub_809CAB0()) + { + if (gUnknown_020384E9 == 0) + return 8; + switch (sub_809CE4C(0)) + { + case 1: + return 11; + case 2: + return 12; + case 3: + return 13; + case 4: + return 14; + case 5: + return 15; + } + } + if (gMain.newKeys & B_BUTTON) + return 16; + if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR) + { + if (gMain.heldKeys & L_BUTTON) + return 10; + if (gMain.heldKeys & R_BUTTON) + return 9; + } + if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + r9 = 0; + } + if (r9) + sub_809AF18(r8, r4); + return r9; +} +#else +__attribute__((naked)) u8 sub_809C464(void) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r9\n" + "\tmov r6, r8\n" + "\tpush {r6,r7}\n" + "\tldr r0, _0809C4D8 @ =gUnknown_020384E4\n" + "\tldrb r0, [r0]\n" + "\tmov r8, r0\n" + "\tldr r2, _0809C4DC @ =gUnknown_020384E5\n" + "\tldrb r4, [r2]\n" + "\tldr r0, _0809C4E0 @ =gPokemonStorageSystemPtr\n" + "\tldr r1, [r0]\n" + "\tldr r0, _0809C4E4 @ =0x000011de\n" + "\tadds r7, r1, r0\n" + "\tmovs r0, 0\n" + "\tstrb r0, [r7]\n" + "\tldr r3, _0809C4E8 @ =0x000011df\n" + "\tadds r5, r1, r3\n" + "\tstrb r0, [r5]\n" + "\tadds r3, 0x4\n" + "\tadds r6, r1, r3\n" + "\tstrb r0, [r6]\n" + "\tldr r0, _0809C4EC @ =gMain\n" + "\tmov r12, r0\n" + "\tldrh r1, [r0, 0x30]\n" + "\tmovs r0, 0x40\n" + "\tands r0, r1\n" + "\tadds r3, r2, 0\n" + "\tcmp r0, 0\n" + "\tbeq _0809C4A0\n" + "\tb _0809C62A\n" + "_0809C4A0:\n" + "\tmovs r0, 0x80\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C4F0\n" + "\tmovs r1, 0x1\n" + "\tmov r9, r1\n" + "\tlsls r0, r4, 24\n" + "\tmovs r3, 0xC0\n" + "\tlsls r3, 19\n" + "\tadds r0, r3\n" + "\tlsrs r4, r0, 24\n" + "\tasrs r0, 24\n" + "\tcmp r0, 0x1D\n" + "\tbgt _0809C4BE\n" + "\tb _0809C648\n" + "_0809C4BE:\n" + "\tmovs r1, 0x3\n" + "\tmov r8, r1\n" + "\tsubs r0, 0x1E\n" + "\tlsls r0, 24\n" + "\tasrs r0, 24\n" + "\tbl __divsi3\n" + "\tlsls r0, 24\n" + "\tlsrs r4, r0, 24\n" + "\tmov r3, r9\n" + "\tstrb r3, [r7]\n" + "\tstrb r3, [r6]\n" + "\tb _0809C648\n" + "\t.align 2, 0\n" + "_0809C4D8: .4byte gUnknown_020384E4\n" + "_0809C4DC: .4byte gUnknown_020384E5\n" + "_0809C4E0: .4byte gPokemonStorageSystemPtr\n" + "_0809C4E4: .4byte 0x000011de\n" + "_0809C4E8: .4byte 0x000011df\n" + "_0809C4EC: .4byte gMain\n" + "_0809C4F0:\n" + "\tmovs r0, 0x20\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C524\n" + "\tmovs r0, 0x1\n" + "\tmov r9, r0\n" + "\tmovs r0, 0\n" + "\tldrsb r0, [r3, r0]\n" + "\tmovs r1, 0x6\n" + "\tbl __modsi3\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _0809C514\n" + "\tlsls r0, r4, 24\n" + "\tmovs r1, 0xFF\n" + "\tlsls r1, 24\n" + "\tb _0809C63C\n" + "_0809C514:\n" + "\tmovs r0, 0xFF\n" + "\tstrb r0, [r5]\n" + "\tlsls r0, r4, 24\n" + "\tmovs r3, 0xA0\n" + "\tlsls r3, 19\n" + "\tadds r0, r3\n" + "\tlsrs r4, r0, 24\n" + "\tb _0809C648\n" + "_0809C524:\n" + "\tmovs r0, 0x10\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C554\n" + "\tmovs r0, 0x1\n" + "\tmov r9, r0\n" + "\tmovs r0, 0\n" + "\tldrsb r0, [r3, r0]\n" + "\tadds r0, 0x1\n" + "\tmovs r1, 0x6\n" + "\tbl __modsi3\n" + "\tcmp r0, 0\n" + "\tbeq _0809C548\n" + "\tlsls r0, r4, 24\n" + "\tmovs r1, 0x80\n" + "\tlsls r1, 17\n" + "\tb _0809C63C\n" + "_0809C548:\n" + "\tmov r3, r9\n" + "\tstrb r3, [r5]\n" + "\tlsls r0, r4, 24\n" + "\tmovs r1, 0xFB\n" + "\tlsls r1, 24\n" + "\tb _0809C63C\n" + "_0809C554:\n" + "\tmov r3, r12\n" + "\tldrh r1, [r3, 0x2E]\n" + "\tmovs r0, 0x8\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C56A\n" + "\tmovs r0, 0x1\n" + "\tmov r9, r0\n" + "\tmovs r1, 0x2\n" + "\tmov r8, r1\n" + "\tb _0809C646\n" + "_0809C56A:\n" + "\tmovs r0, 0x1\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C5D4\n" + "\tbl sub_809CAB0\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _0809C5D4\n" + "\tldr r0, _0809C588 @ =gUnknown_020384E9\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbne _0809C58C\n" + "\tmovs r0, 0x8\n" + "\tb _0809C658\n" + "\t.align 2, 0\n" + "_0809C588: .4byte gUnknown_020384E9\n" + "_0809C58C:\n" + "\tmovs r0, 0\n" + "\tbl sub_809CE4C\n" + "\tsubs r0, 0x1\n" + "\tlsls r0, 24\n" + "\tasrs r0, 24\n" + "\tcmp r0, 0x4\n" + "\tbhi _0809C5D4\n" + "\tlsls r0, 2\n" + "\tldr r1, _0809C5A8 @ =_0809C5AC\n" + "\tadds r0, r1\n" + "\tldr r0, [r0]\n" + "\tmov pc, r0\n" + "\t.align 2, 0\n" + "_0809C5A8: .4byte _0809C5AC\n" + "\t.align 2, 0\n" + "_0809C5AC:\n" + "\t.4byte _0809C5C0\n" + "\t.4byte _0809C5C4\n" + "\t.4byte _0809C5C8\n" + "\t.4byte _0809C5CC\n" + "\t.4byte _0809C5D0\n" + "_0809C5C0:\n" + "\tmovs r0, 0xB\n" + "\tb _0809C658\n" + "_0809C5C4:\n" + "\tmovs r0, 0xC\n" + "\tb _0809C658\n" + "_0809C5C8:\n" + "\tmovs r0, 0xD\n" + "\tb _0809C658\n" + "_0809C5CC:\n" + "\tmovs r0, 0xE\n" + "\tb _0809C658\n" + "_0809C5D0:\n" + "\tmovs r0, 0xF\n" + "\tb _0809C658\n" + "_0809C5D4:\n" + "\tldr r2, _0809C5E4 @ =gMain\n" + "\tldrh r1, [r2, 0x2E]\n" + "\tmovs r0, 0x2\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C5E8\n" + "\tmovs r0, 0x10\n" + "\tb _0809C658\n" + "\t.align 2, 0\n" + "_0809C5E4: .4byte gMain\n" + "_0809C5E8:\n" + "\tldr r0, _0809C600 @ =gSaveBlock2\n" + "\tldrb r0, [r0, 0x13]\n" + "\tcmp r0, 0x1\n" + "\tbne _0809C612\n" + "\tldrh r1, [r2, 0x2C]\n" + "\tmovs r0, 0x80\n" + "\tlsls r0, 2\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C604\n" + "\tmovs r0, 0xA\n" + "\tb _0809C658\n" + "\t.align 2, 0\n" + "_0809C600: .4byte gSaveBlock2\n" + "_0809C604:\n" + "\tmovs r0, 0x80\n" + "\tlsls r0, 1\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C612\n" + "\tmovs r0, 0x9\n" + "\tb _0809C658\n" + "_0809C612:\n" + "\tldrh r1, [r2, 0x2E]\n" + "\tmovs r0, 0x4\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C624\n" + "\tbl sub_809CD88\n" + "\tmovs r0, 0\n" + "\tb _0809C658\n" + "_0809C624:\n" + "\tmovs r3, 0\n" + "\tmov r9, r3\n" + "\tb _0809C656\n" + "_0809C62A:\n" + "\tmovs r0, 0x1\n" + "\tmov r9, r0\n" + "\tmovs r0, 0\n" + "\tldrsb r0, [r2, r0]\n" + "\tcmp r0, 0x5\n" + "\tble _0809C642\n" + "\tlsls r0, r4, 24\n" + "\tmovs r1, 0xFA\n" + "\tlsls r1, 24\n" + "_0809C63C:\n" + "\tadds r0, r1\n" + "\tlsrs r4, r0, 24\n" + "\tb _0809C648\n" + "_0809C642:\n" + "\tmovs r3, 0x2\n" + "\tmov r8, r3\n" + "_0809C646:\n" + "\tmovs r4, 0\n" + "_0809C648:\n" + "\tmov r0, r9\n" + "\tcmp r0, 0\n" + "\tbeq _0809C656\n" + "\tmov r0, r8\n" + "\tadds r1, r4, 0\n" + "\tbl sub_809AF18\n" + "_0809C656:\n" + "\tmov r0, r9\n" + "_0809C658:\n" + "\tpop {r3,r4}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tpop {r4-r7}\n" + "\tpop {r1}\n" + "\tbx r1"); +} +#endif -- cgit v1.2.3 From 9cfd6fed81b77b4f3aca8ad7b4c2641672cc234b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 21 Jan 2018 21:04:43 -0500 Subject: Create stub files to hold ewram symbols --- src/field/pokedex_area_screen.c | 20 ++++++++++++++++++++ src/field/pokenav.c | 16 ++++++++++++++++ sym_common.txt | 17 ++++++++++++----- sym_ewram.txt | 34 ++-------------------------------- 4 files changed, 50 insertions(+), 37 deletions(-) create mode 100644 src/field/pokedex_area_screen.c create mode 100644 src/field/pokenav.c diff --git a/src/field/pokedex_area_screen.c b/src/field/pokedex_area_screen.c new file mode 100644 index 000000000..67ca276c4 --- /dev/null +++ b/src/field/pokedex_area_screen.c @@ -0,0 +1,20 @@ + +// Includes +#include "global.h" + +// Static type declarations + +// Static RAM declarations + +EWRAM_DATA u16 gUnknown_02039260 = 0; +EWRAM_DATA u16 gUnknown_02039262 = 0; +EWRAM_DATA u16 gUnknown_02039264 = 0; +EWRAM_DATA u16 gUnknown_02039266 = 0; +EWRAM_DATA u16 gUnknown_02039268 = 0; +EWRAM_DATA u16 gUnknown_0203926A = 0; + +// Static ROM declarations + +// .rodata + +// .text diff --git a/src/field/pokenav.c b/src/field/pokenav.c new file mode 100644 index 000000000..f57a98df6 --- /dev/null +++ b/src/field/pokenav.c @@ -0,0 +1,16 @@ + +// Includes +#include "global.h" + +// Static type declarations + +// Static RAM declarations + +EWRAM_DATA u8 gUnknown_020388B0[4] = {}; +EWRAM_DATA u16 gUnknown_020388B4 = 0; + +// Static ROM declarations + +// .rodata + +// .text diff --git a/sym_common.txt b/sym_common.txt index 64e87c046..7e5551025 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -139,7 +139,7 @@ SYMBOL(gEggHatchData, 4) // load_save.c SYMBOL(gFlashMemoryPresent, 4) -// ??? +// trade.c SYMBOL(gUnknown_03004824, 4) SYMBOL(gUnknown_03004828, 4) . += 0x4; @@ -204,15 +204,20 @@ SYMBOL(gUnknown_03005CE4, 4) SYMBOL(gUnknown_03005CE8, 4) SYMBOL(gUnknown_03005CEC, 4) -// ??? +// pokemon_summary_screen.o SYMBOL(gUnknown_03005CF0, 4) + // huh? . = ALIGN(16); + +// item_menu.c gFieldItemUseCallback = .; . += 0x10; gBagPocketScrollStates = .; . += 0x14; SYMBOL(gCurrentBagPocketItemSlots, 4) + +// contest.c SYMBOL(gUnknown_03005D28, 4) // record_mixing.c @@ -226,8 +231,10 @@ SYMBOL(gSoundTestCryNum, 4) SYMBOL(gUnknown_03005D38, 4) . += 0x64; // huge gap? -// ??? +// mauville_man.c SYMBOL(gUnknown_03005DA0, 0x48) + +// cute_sketch.c SYMBOL(gUnknown_03005DE8, 4) SYMBOL(gUnknown_03005DEC, 4) SYMBOL(gUnknown_03005DF0, 4) @@ -249,7 +256,7 @@ SYMBOL(gUnknown_03005E90, 4) // evolution_scene.c SYMBOL(gCB2_AfterEvolution, 4) -// ??? +// pokedex_cry_screen.c SYMBOL(gUnknown_03005E98, 4) // save.c @@ -268,7 +275,7 @@ SYMBOL(gGameContinueCallback, 4) SYMBOL(gIntroFrameCounter, 4) SYMBOL(gMultibootProgramStruct, 44) -// ??? +// battle_anim_813F0F4.c SYMBOL(gUnknown_03005F0C, 4) SYMBOL(gUnknown_03005F10, 4) gUnknown_03005F14 = .; diff --git a/sym_ewram.txt b/sym_ewram.txt index 2a2a2cc11..24b01b594 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -346,16 +346,7 @@ gBattleMonForms = .; /* 2024E84 */ . = ALIGN(4); src/field/rotating_gate.o(ewram_data); . = ALIGN(4); src/field/safari_zone.o(ewram_data); . = ALIGN(4); src/easy_chat_2.o(ewram_data); - -/* pokenav */ - - . = ALIGN(4); -gUnknown_020388B0 = .; /* 20388B0 */ - . += 0x4; - -gUnknown_020388B4 = .; /* 20388B4 */ - . += 0x4; - +. = ALIGN(4); src/field/pokenav.o(ewram_data); . = ALIGN(4); src/pokemon/mon_markings.o(ewram_data); . = ALIGN(4); src/field/mauville_man.o(ewram_data); . = ALIGN(4); src/field/menu_helpers.o(ewram_data); @@ -365,28 +356,7 @@ gUnknown_020388B4 = .; /* 20388B4 */ . = ALIGN(4); src/rom6.o(ewram_data); . = ALIGN(4); src/field/pokeblock.o(ewram_data); . = ALIGN(4); src/field/field_specials.o(ewram_data); - -/* pokedex_area_screen */ - - . = ALIGN(4); -gUnknown_02039260 = .; /* 2039260 */ - . += 0x2; - -gUnknown_02039262 = .; /* 2039262 */ - . += 0x2; - -gUnknown_02039264 = .; /* 2039264 */ - . += 0x2; - -gUnknown_02039266 = .; /* 2039266 */ - . += 0x2; - -gUnknown_02039268 = .; /* 2039268 */ - . += 0x2; - -gUnknown_0203926A = .; /* 203926A */ - . += 0x2; - +. = ALIGN(4); src/field/pokedex_area_screen.o(ewram_data); . = ALIGN(4); src/battle/battle_message.o(ewram_data); . = ALIGN(4); src/field/choose_party.o(ewram_data); . = ALIGN(4); src/scene/cable_car.o(ewram_data); -- cgit v1.2.3 From cc1767cbc116d26d954d50c6e7642138f012540c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 21 Jan 2018 21:49:43 -0500 Subject: nonmatching sub_809C664 --- asm/pokemon_storage_system.s | 265 +----------------------- src/pokemon/pokemon_storage_system_4.c | 363 +++++++++++++++++++++++++++++++++ 2 files changed, 365 insertions(+), 263 deletions(-) diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8724f5608..ad3f371f5 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -5,270 +5,8 @@ .text - thumb_func_start sub_809C664 -sub_809C664: @ 809C664 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, _0809C6D8 @ =gUnknown_020384E4 - ldrb r0, [r0] - mov r10, r0 - ldr r7, _0809C6DC @ =gUnknown_020384E5 - ldrb r4, [r7] - ldr r2, _0809C6E0 @ =gPokemonStorageSystemPtr - ldr r5, [r2] - ldr r1, _0809C6E4 @ =0x000011df - adds r0, r5, r1 - movs r1, 0 - strb r1, [r0] - ldr r3, _0809C6E8 @ =0x000011de - adds r0, r5, r3 - strb r1, [r0] - adds r3, 0x5 - adds r0, r5, r3 - strb r1, [r0] - mov r9, r1 - mov r8, r1 - ldr r1, _0809C6EC @ =gMain - ldrh r3, [r1, 0x30] - movs r0, 0x40 - ands r0, r3 - adds r6, r7, 0 - mov r12, r2 - adds r2, r1, 0 - cmp r0, 0 - beq _0809C6A8 - b _0809C81C -_0809C6A8: - movs r0, 0x80 - ands r0, r3 - cmp r0, 0 - beq _0809C6F0 - lsls r0, r4, 24 - movs r1, 0x80 - lsls r1, 17 - adds r0, r1 - lsrs r4, r0, 24 - asrs r0, 24 - cmp r0, 0x6 - ble _0809C6C2 - movs r4, 0 -_0809C6C2: - lsls r0, r4, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r6, r1] - cmp r0, r1 - bne _0809C6D0 - b _0809C83C -_0809C6D0: - movs r2, 0x1 - mov r8, r2 - b _0809C842 - .align 2, 0 -_0809C6D8: .4byte gUnknown_020384E4 -_0809C6DC: .4byte gUnknown_020384E5 -_0809C6E0: .4byte gPokemonStorageSystemPtr -_0809C6E4: .4byte 0x000011df -_0809C6E8: .4byte 0x000011de -_0809C6EC: .4byte gMain -_0809C6F0: - movs r0, 0x20 - ands r0, r3 - cmp r0, 0 - beq _0809C714 - ldrb r1, [r6] - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r0, 0 - beq _0809C714 - movs r3, 0x1 - mov r8, r3 - ldr r2, _0809C710 @ =0x000011e2 - adds r0, r5, r2 - strb r1, [r0] - movs r4, 0 - b _0809C83C - .align 2, 0 -_0809C710: .4byte 0x000011e2 -_0809C714: - ldrh r1, [r2, 0x30] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _0809C748 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r0, 0 - bne _0809C73C - movs r3, 0x1 - mov r8, r3 - mov r1, r12 - ldr r0, [r1] - ldr r2, _0809C738 @ =0x000011e2 - adds r0, r2 - ldrb r4, [r0] - b _0809C83C - .align 2, 0 -_0809C738: .4byte 0x000011e2 -_0809C73C: - movs r3, 0x6 - mov r8, r3 - movs r0, 0 - mov r10, r0 - movs r4, 0 - b _0809C83C -_0809C748: - ldrh r1, [r2, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0809C7D0 - movs r0, 0 - ldrsb r0, [r6, r0] - cmp r0, 0x6 - bne _0809C76E - mov r1, r12 - ldr r0, [r1] - ldrb r0, [r0, 0x5] - cmp r0, 0x1 - bne _0809C768 - movs r0, 0x4 - b _0809C84C -_0809C768: - movs r2, 0x1 - mov r9, r2 - b _0809C7D0 -_0809C76E: - bl sub_809CAB0 - lsls r0, 24 - cmp r0, 0 - beq _0809C7D0 - ldr r0, _0809C784 @ =gUnknown_020384E9 - ldrb r0, [r0] - cmp r0, 0 - bne _0809C788 - movs r0, 0x8 - b _0809C84C - .align 2, 0 -_0809C784: .4byte gUnknown_020384E9 -_0809C788: - movs r0, 0 - bl sub_809CE4C - subs r0, 0x1 - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - bhi _0809C7D0 - lsls r0, 2 - ldr r1, _0809C7A4 @ =_0809C7A8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0809C7A4: .4byte _0809C7A8 - .align 2, 0 -_0809C7A8: - .4byte _0809C7BC - .4byte _0809C7C0 - .4byte _0809C7C4 - .4byte _0809C7C8 - .4byte _0809C7CC -_0809C7BC: - movs r0, 0xB - b _0809C84C -_0809C7C0: - movs r0, 0xC - b _0809C84C -_0809C7C4: - movs r0, 0xD - b _0809C84C -_0809C7C8: - movs r0, 0xE - b _0809C84C -_0809C7CC: - movs r0, 0xF - b _0809C84C -_0809C7D0: - ldr r2, _0809C7EC @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809C7F8 - ldr r0, _0809C7F0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, 0x5] - cmp r0, 0x1 - bne _0809C7F4 - movs r0, 0x10 - b _0809C84C - .align 2, 0 -_0809C7EC: .4byte gMain -_0809C7F0: .4byte gPokemonStorageSystemPtr -_0809C7F4: - movs r3, 0x1 - mov r9, r3 -_0809C7F8: - mov r0, r9 - cmp r0, 0 - beq _0809C80A - movs r1, 0x6 - mov r8, r1 - movs r2, 0 - mov r10, r2 - movs r4, 0 - b _0809C83C -_0809C80A: - ldrh r1, [r2, 0x2E] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0809C83C - bl sub_809CD88 - movs r0, 0 - b _0809C84C -_0809C81C: - lsls r0, r4, 24 - movs r3, 0xFF - lsls r3, 24 - adds r0, r3 - lsrs r4, r0, 24 - cmp r0, 0 - bge _0809C82C - movs r4, 0x6 -_0809C82C: - lsls r0, r4, 24 - asrs r0, 24 - movs r1, 0 - ldrsb r1, [r7, r1] - cmp r0, r1 - beq _0809C83C - movs r0, 0x1 - mov r8, r0 -_0809C83C: - mov r1, r8 - cmp r1, 0 - beq _0809C84A -_0809C842: - mov r0, r10 - adds r1, r4, 0 - bl sub_809AF18 -_0809C84A: - mov r0, r8 -_0809C84C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809C664 - thumb_func_start sub_809C85C +@ u8 sub_809C85C(void) sub_809C85C: @ 809C85C push {r4-r6,lr} ldr r0, _0809C894 @ =gPokemonStorageSystemPtr @@ -392,6 +130,7 @@ _0809C93E: thumb_func_end sub_809C85C thumb_func_start sub_809C944 +@ u8 sub_809C944(void) sub_809C944: @ 809C944 push {r4-r7,lr} ldr r0, _0809C988 @ =gUnknown_020384E4 diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c index c02ca878d..1cc9f7e3b 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon/pokemon_storage_system_4.c @@ -2479,3 +2479,366 @@ __attribute__((naked)) u8 sub_809C464(void) "\tbx r1"); } #endif + +#ifdef NONMATCHING +u8 sub_809C664(void) +{ + s8 r10 = gUnknown_020384E4; + s8 r4 = gUnknown_020384E5; + u8 r8; + u8 r9; + + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + r9 = FALSE; + r8 = 0; + if (gMain.newAndRepeatedKeys & DPAD_UP) + { + if (--r4 < 0) + r4 = 6; + if (r4 != gUnknown_020384E5) + r8 = 1; + } + else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + if (++r4 > 6) + r4 = 0; + if (r4 != gUnknown_020384E5) + r8 = 1; + } + else if ((gMain.newAndRepeatedKeys & DPAD_LEFT) && gUnknown_020384E5) + { + r8 = 1; + gPokemonStorageSystemPtr->unk_11e2 = gUnknown_020384E5; + r4 = 0; + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + if (gUnknown_020384E5 == 0) + { + r8 = 1; + r4 = gPokemonStorageSystemPtr->unk_11e2; + } + else + { + r8 = 6; + r10 = 0; + r4 = 0; + } + } + else + { + if (gMain.newKeys & A_BUTTON) + { + if (gUnknown_020384E5 == 6) + { + if (gPokemonStorageSystemPtr->unk_0005 == 1) + return 4; + r9 = TRUE; + } + else if (sub_809CAB0()) + { + if (gUnknown_020384E9 == 0) + return 8; + switch (sub_809CE4C(0)) + { + case 1: + return 11; + case 2: + return 12; + case 3: + return 13; + case 4: + return 14; + case 5: + return 15; + } + } + } + if (gMain.newKeys & B_BUTTON) + { + if (gPokemonStorageSystemPtr->unk_0005 == 1) + return 16; + r9 = TRUE; + } + if (!r9) + { + r8 = 6; + r10 = 0; + r4 = 0; + } + else if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + } + if (r8) + sub_809AF18(r10, r4); + return r8; +} +#else +__attribute__((naked)) u8 sub_809C664(void) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmov r7, r10\n" + "\tmov r6, r9\n" + "\tmov r5, r8\n" + "\tpush {r5-r7}\n" + "\tldr r0, _0809C6D8 @ =gUnknown_020384E4\n" + "\tldrb r0, [r0]\n" + "\tmov r10, r0\n" + "\tldr r7, _0809C6DC @ =gUnknown_020384E5\n" + "\tldrb r4, [r7]\n" + "\tldr r2, _0809C6E0 @ =gPokemonStorageSystemPtr\n" + "\tldr r5, [r2]\n" + "\tldr r1, _0809C6E4 @ =0x000011df\n" + "\tadds r0, r5, r1\n" + "\tmovs r1, 0\n" + "\tstrb r1, [r0]\n" + "\tldr r3, _0809C6E8 @ =0x000011de\n" + "\tadds r0, r5, r3\n" + "\tstrb r1, [r0]\n" + "\tadds r3, 0x5\n" + "\tadds r0, r5, r3\n" + "\tstrb r1, [r0]\n" + "\tmov r9, r1\n" + "\tmov r8, r1\n" + "\tldr r1, _0809C6EC @ =gMain\n" + "\tldrh r3, [r1, 0x30]\n" + "\tmovs r0, 0x40\n" + "\tands r0, r3\n" + "\tadds r6, r7, 0\n" + "\tmov r12, r2\n" + "\tadds r2, r1, 0\n" + "\tcmp r0, 0\n" + "\tbeq _0809C6A8\n" + "\tb _0809C81C\n" + "_0809C6A8:\n" + "\tmovs r0, 0x80\n" + "\tands r0, r3\n" + "\tcmp r0, 0\n" + "\tbeq _0809C6F0\n" + "\tlsls r0, r4, 24\n" + "\tmovs r1, 0x80\n" + "\tlsls r1, 17\n" + "\tadds r0, r1\n" + "\tlsrs r4, r0, 24\n" + "\tasrs r0, 24\n" + "\tcmp r0, 0x6\n" + "\tble _0809C6C2\n" + "\tmovs r4, 0\n" + "_0809C6C2:\n" + "\tlsls r0, r4, 24\n" + "\tasrs r0, 24\n" + "\tmovs r1, 0\n" + "\tldrsb r1, [r6, r1]\n" + "\tcmp r0, r1\n" + "\tbne _0809C6D0\n" + "\tb _0809C83C\n" + "_0809C6D0:\n" + "\tmovs r2, 0x1\n" + "\tmov r8, r2\n" + "\tb _0809C842\n" + "\t.align 2, 0\n" + "_0809C6D8: .4byte gUnknown_020384E4\n" + "_0809C6DC: .4byte gUnknown_020384E5\n" + "_0809C6E0: .4byte gPokemonStorageSystemPtr\n" + "_0809C6E4: .4byte 0x000011df\n" + "_0809C6E8: .4byte 0x000011de\n" + "_0809C6EC: .4byte gMain\n" + "_0809C6F0:\n" + "\tmovs r0, 0x20\n" + "\tands r0, r3\n" + "\tcmp r0, 0\n" + "\tbeq _0809C714\n" + "\tldrb r1, [r6]\n" + "\tmovs r0, 0\n" + "\tldrsb r0, [r6, r0]\n" + "\tcmp r0, 0\n" + "\tbeq _0809C714\n" + "\tmovs r3, 0x1\n" + "\tmov r8, r3\n" + "\tldr r2, _0809C710 @ =0x000011e2\n" + "\tadds r0, r5, r2\n" + "\tstrb r1, [r0]\n" + "\tmovs r4, 0\n" + "\tb _0809C83C\n" + "\t.align 2, 0\n" + "_0809C710: .4byte 0x000011e2\n" + "_0809C714:\n" + "\tldrh r1, [r2, 0x30]\n" + "\tmovs r0, 0x10\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C748\n" + "\tmovs r0, 0\n" + "\tldrsb r0, [r6, r0]\n" + "\tcmp r0, 0\n" + "\tbne _0809C73C\n" + "\tmovs r3, 0x1\n" + "\tmov r8, r3\n" + "\tmov r1, r12\n" + "\tldr r0, [r1]\n" + "\tldr r2, _0809C738 @ =0x000011e2\n" + "\tadds r0, r2\n" + "\tldrb r4, [r0]\n" + "\tb _0809C83C\n" + "\t.align 2, 0\n" + "_0809C738: .4byte 0x000011e2\n" + "_0809C73C:\n" + "\tmovs r3, 0x6\n" + "\tmov r8, r3\n" + "\tmovs r0, 0\n" + "\tmov r10, r0\n" + "\tmovs r4, 0\n" + "\tb _0809C83C\n" + "_0809C748:\n" + "\tldrh r1, [r2, 0x2E]\n" + "\tmovs r0, 0x1\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C7D0\n" + "\tmovs r0, 0\n" + "\tldrsb r0, [r6, r0]\n" + "\tcmp r0, 0x6\n" + "\tbne _0809C76E\n" + "\tmov r1, r12\n" + "\tldr r0, [r1]\n" + "\tldrb r0, [r0, 0x5]\n" + "\tcmp r0, 0x1\n" + "\tbne _0809C768\n" + "\tmovs r0, 0x4\n" + "\tb _0809C84C\n" + "_0809C768:\n" + "\tmovs r2, 0x1\n" + "\tmov r9, r2\n" + "\tb _0809C7D0\n" + "_0809C76E:\n" + "\tbl sub_809CAB0\n" + "\tlsls r0, 24\n" + "\tcmp r0, 0\n" + "\tbeq _0809C7D0\n" + "\tldr r0, _0809C784 @ =gUnknown_020384E9\n" + "\tldrb r0, [r0]\n" + "\tcmp r0, 0\n" + "\tbne _0809C788\n" + "\tmovs r0, 0x8\n" + "\tb _0809C84C\n" + "\t.align 2, 0\n" + "_0809C784: .4byte gUnknown_020384E9\n" + "_0809C788:\n" + "\tmovs r0, 0\n" + "\tbl sub_809CE4C\n" + "\tsubs r0, 0x1\n" + "\tlsls r0, 24\n" + "\tasrs r0, 24\n" + "\tcmp r0, 0x4\n" + "\tbhi _0809C7D0\n" + "\tlsls r0, 2\n" + "\tldr r1, _0809C7A4 @ =_0809C7A8\n" + "\tadds r0, r1\n" + "\tldr r0, [r0]\n" + "\tmov pc, r0\n" + "\t.align 2, 0\n" + "_0809C7A4: .4byte _0809C7A8\n" + "\t.align 2, 0\n" + "_0809C7A8:\n" + "\t.4byte _0809C7BC\n" + "\t.4byte _0809C7C0\n" + "\t.4byte _0809C7C4\n" + "\t.4byte _0809C7C8\n" + "\t.4byte _0809C7CC\n" + "_0809C7BC:\n" + "\tmovs r0, 0xB\n" + "\tb _0809C84C\n" + "_0809C7C0:\n" + "\tmovs r0, 0xC\n" + "\tb _0809C84C\n" + "_0809C7C4:\n" + "\tmovs r0, 0xD\n" + "\tb _0809C84C\n" + "_0809C7C8:\n" + "\tmovs r0, 0xE\n" + "\tb _0809C84C\n" + "_0809C7CC:\n" + "\tmovs r0, 0xF\n" + "\tb _0809C84C\n" + "_0809C7D0:\n" + "\tldr r2, _0809C7EC @ =gMain\n" + "\tldrh r1, [r2, 0x2E]\n" + "\tmovs r0, 0x2\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C7F8\n" + "\tldr r0, _0809C7F0 @ =gPokemonStorageSystemPtr\n" + "\tldr r0, [r0]\n" + "\tldrb r0, [r0, 0x5]\n" + "\tcmp r0, 0x1\n" + "\tbne _0809C7F4\n" + "\tmovs r0, 0x10\n" + "\tb _0809C84C\n" + "\t.align 2, 0\n" + "_0809C7EC: .4byte gMain\n" + "_0809C7F0: .4byte gPokemonStorageSystemPtr\n" + "_0809C7F4:\n" + "\tmovs r3, 0x1\n" + "\tmov r9, r3\n" + "_0809C7F8:\n" + "\tmov r0, r9\n" + "\tcmp r0, 0\n" + "\tbeq _0809C80A\n" + "\tmovs r1, 0x6\n" + "\tmov r8, r1\n" + "\tmovs r2, 0\n" + "\tmov r10, r2\n" + "\tmovs r4, 0\n" + "\tb _0809C83C\n" + "_0809C80A:\n" + "\tldrh r1, [r2, 0x2E]\n" + "\tmovs r0, 0x4\n" + "\tands r0, r1\n" + "\tcmp r0, 0\n" + "\tbeq _0809C83C\n" + "\tbl sub_809CD88\n" + "\tmovs r0, 0\n" + "\tb _0809C84C\n" + "_0809C81C:\n" + "\tlsls r0, r4, 24\n" + "\tmovs r3, 0xFF\n" + "\tlsls r3, 24\n" + "\tadds r0, r3\n" + "\tlsrs r4, r0, 24\n" + "\tcmp r0, 0\n" + "\tbge _0809C82C\n" + "\tmovs r4, 0x6\n" + "_0809C82C:\n" + "\tlsls r0, r4, 24\n" + "\tasrs r0, 24\n" + "\tmovs r1, 0\n" + "\tldrsb r1, [r7, r1]\n" + "\tcmp r0, r1\n" + "\tbeq _0809C83C\n" + "\tmovs r0, 0x1\n" + "\tmov r8, r0\n" + "_0809C83C:\n" + "\tmov r1, r8\n" + "\tcmp r1, 0\n" + "\tbeq _0809C84A\n" + "_0809C842:\n" + "\tmov r0, r10\n" + "\tadds r1, r4, 0\n" + "\tbl sub_809AF18\n" + "_0809C84A:\n" + "\tmov r0, r8\n" + "_0809C84C:\n" + "\tpop {r3-r5}\n" + "\tmov r8, r3\n" + "\tmov r9, r4\n" + "\tmov r10, r5\n" + "\tpop {r4-r7}\n" + "\tpop {r1}\n" + "\tbx r1"); +} +#endif -- cgit v1.2.3 From 796d331df605f17b3e5d89d494d89ce7a907eaab Mon Sep 17 00:00:00 2001 From: Thomas Winwood Date: Mon, 22 Jan 2018 06:35:10 +0000 Subject: Use BATTLE_TYPE_DOUBLE constant in guard.c --- src/battle/anim/guard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index ab093eab1..01cf07e39 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -12,7 +12,7 @@ extern u16 gBattleTypeFlags; void sub_80D3014(struct Sprite *sprite) { - if ((gBattleTypeFlags & 1) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) { sub_807A3FC(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); sprite->pos1.y += 40; -- cgit v1.2.3 From 4e98ffed3339ca9fd7c4f0915da707aa8b2417ef Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 14:54:37 -0500 Subject: through sub_80C8604 --- asm/contest_link_80C857C.s | 133 -------------------------------------- include/ewram.h | 1 + ld_script.txt | 3 +- src/battle/contest_link_80C857C.c | 46 +++++++++++++ 4 files changed, 49 insertions(+), 134 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 6afcaec6d..c6958462c 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,139 +5,6 @@ .text - thumb_func_start sub_80C857C -sub_80C857C: @ 80C857C - push {r4,r5,lr} - adds r2, r0, 0 - lsls r4, r1, 16 - lsrs r4, 16 - ldr r5, _080C85A8 @ =gSharedMem + 0x1E000 - adds r0, r5, 0 - adds r1, r2, 0 - adds r2, r4, 0 - bl memcpy - bl bitmask_all_link_players_but_self - lsls r0, 24 - lsrs r0, 24 - adds r1, r5, 0 - adds r2, r4, 0 - bl SendBlock - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C85A8: .4byte gSharedMem + 0x1E000 - thumb_func_end sub_80C857C - - thumb_func_start sub_80C85AC -sub_80C85AC: @ 80C85AC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x80 - lsls r1, 17 - lsls r1, r0 - lsrs r4, r1, 24 - bl GetBlockReceivedStatus - adds r1, r4, 0 - ands r1, r0 - cmp r1, 0 - beq _080C85D0 - adds r0, r4, 0 - bl ResetBlockReceivedFlag - movs r0, 0x1 - b _080C85D2 -_080C85D0: - movs r0, 0 -_080C85D2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80C85AC - - thumb_func_start sub_80C85D8 -sub_80C85D8: @ 80C85D8 - push {r4,lr} - movs r4, 0 -_080C85DC: - bl GetBlockReceivedStatus - lsls r0, 24 - lsrs r0, 24 - asrs r0, r4 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080C85F2 - movs r0, 0 - b _080C85FE -_080C85F2: - adds r4, 0x1 - cmp r4, 0x3 - ble _080C85DC - bl ResetBlockReceivedFlags - movs r0, 0x1 -_080C85FE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80C85D8 - -.ifdef ENGLISH - thumb_func_start sub_80C8604 -sub_80C8604: @ 80C8604 - push {r4-r6,lr} - lsls r0, 24 - lsrs r2, r0, 24 - movs r1, 0 - ldr r5, _080C8638 @ =gTasks - ldr r6, _080C863C @ =sub_80C8644 - ldr r4, _080C8640 @ =gBlockRecvBuffer - movs r3, 0xFF -_080C8614: - lsls r0, r1, 8 - adds r0, r4 - strh r3, [r0] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3 - bls _080C8614 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r5 - movs r1, 0 - strh r1, [r0, 0x8] - str r6, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080C8638: .4byte gTasks -_080C863C: .4byte sub_80C8644 -_080C8640: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8604 -.else - thumb_func_start sub_80C8604 -sub_80C8604: @ 80C8604 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C861C @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - ldr r0, _080C8620 @ =sub_80C8644 - str r0, [r1] - bx lr - .align 2, 0 -_080C861C: .4byte gTasks -_080C8620: .4byte sub_80C8644 - thumb_func_end sub_80C8604 -.endif - thumb_func_start sub_80C8644 sub_80C8644: @ 80C8644 lsls r0, 24 diff --git a/include/ewram.h b/include/ewram.h index 13e478ff1..2f1c2d1ab 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -261,6 +261,7 @@ extern u8 gSharedMem[]; #define eHallOfFame (struct HallOfFame *)(gSharedMem + 0x1E000) #define HALL_OF_FAME_SHEET_0 ((u8 *)(gSharedMem + 0x1E000)) #define ewram1E000_2 (const u8 *)(gSharedMem + 0x1E000) +#define eContestLinkSendBuffer gSharedMem + 0x1E000 #define HALL_OF_FAME_SHEET_1 ((u8 *)(gSharedMem + 0x1E800)) #define ewram_1f000 (*(struct DecoPCPointers *)(gSharedMem + 0x1f000)) #define ewramSavedPokeballsPocket ((struct ItemSlot *)(gSharedMem + 0x1F000)) // saved Pokeballs pocket (for Wally battle) diff --git a/ld_script.txt b/ld_script.txt index 5dcdf948d..411d282d1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -169,8 +169,9 @@ SECTIONS { src/field/field_special_scene.o(.text); src/field/rotating_gate.o(.text); src/field/safari_zone.o(.text); - asm/contest_link_80C857C.o(.text); src/battle/contest_link_80C857C.o(.text); + asm/contest_link_80C857C.o(.text); + src/battle/contest_link_80C857C.o(.text_de); src/field/item_use.o(.text); src/battle/anim/powder.o(.text); src/battle/anim/orbs.o(.text); diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 616a72d27..e0b24b9e1 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -1,6 +1,52 @@ #include "global.h" +#include "ewram.h" +#include "task.h" #include "link.h" +void sub_80C8644(u8 taskId); + +void sub_80C857C(const void *data, u16 size) +{ + memcpy(eContestLinkSendBuffer, data, size); + SendBlock(bitmask_all_link_players_but_self(), eContestLinkSendBuffer, size); +} + +bool8 sub_80C85AC(u8 who) +{ + u8 flag = 1 << who; + if (!(GetBlockReceivedStatus() & flag)) + return FALSE; + ResetBlockReceivedFlag(flag); + return TRUE; +} + +bool8 sub_80C85D8(void) +{ + int i; + + for (i = 0; i < MAX_LINK_PLAYERS; i++) + { + if (!((GetBlockReceivedStatus() >> i) & 1)) + return FALSE; + } + ResetBlockReceivedFlags(); + return TRUE; +} + +void sub_80C8604(u8 taskId) +{ +#if ENGLISH + u8 i; + + for (i = 0; i < 4; i++) + gBlockRecvBuffer[i][0] = 0xff; +#endif + gTasks[taskId].data[0] = 0; + gTasks[taskId].func = sub_80C8644; +} + +asm(".section .text_de"); + #if GERMAN void de_sub_80C9274(bool32 arg0) -- cgit v1.2.3 From fc504ce61b8698bc4777bbd37a8766b8c35a5814 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 15:51:57 -0500 Subject: through (nonmatching) sub_80C86A0 --- asm/contest_link_80C857C.s | 139 ----------------------------------- include/contest.h | 3 + src/battle/contest_link_80C857C.c | 150 +++++++++++++++++++++++++++++++++++++- 3 files changed, 152 insertions(+), 140 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index c6958462c..1ac60af96 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,145 +5,6 @@ .text - thumb_func_start sub_80C8644 -sub_80C8644: @ 80C8644 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080C8658 @ =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, _080C865C @ =sub_80C8660 - str r0, [r1] - bx lr - .align 2, 0 -_080C8658: .4byte gTasks -_080C865C: .4byte sub_80C8660 - thumb_func_end sub_80C8644 - - thumb_func_start sub_80C8660 -sub_80C8660: @ 80C8660 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080C8694 @ =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - beq _080C868E - bl GetMultiplayerId - ldr r1, _080C8698 @ =gContestPlayerMonIndex - strb r0, [r1] - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bne _080C868E - ldr r1, _080C869C @ =gIsLinkContest - movs r0, 0x1 - strb r0, [r1] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc -_080C868E: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C8694: .4byte gReceivedRemoteLinkPlayers -_080C8698: .4byte gContestPlayerMonIndex -_080C869C: .4byte gIsLinkContest - thumb_func_end sub_80C8660 - - thumb_func_start sub_80C86A0 -sub_80C86A0: @ 80C86A0 - push {r4,r5,lr} - adds r4, r0, 0 -.ifdef ENGLISH - movs r5, 0x2 -.else - movs r5, 0x5 -.endif - ldrb r0, [r4] - cmp r0, 0xFC - bne _080C86B6 - ldrb r0, [r4, 0x1] - cmp r0, 0x15 - bne _080C86B6 -.ifdef ENGLISH - movs r0, 0x2 -.else - movs r0, 0x5 -.endif - b _080C872C -_080C86B6: - adds r0, r4, 0 - bl StringLength - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x5 - bhi _080C872A - ldrb r0, [r4] - cmp r0, 0xFF - beq _080C872A -_080C86CA: - ldrb r1, [r4] - adds r0, r1, 0 - adds r0, 0x45 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x33 - bls _080C871E - adds r0, r1, 0 - adds r0, 0x5F - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x9 - bls _080C871E - adds r0, r1, 0 - cmp r0, 0 - beq _080C871E - cmp r0, 0xAD - beq _080C871E - cmp r0, 0xB8 - beq _080C871E - cmp r0, 0xAB - beq _080C871E - cmp r0, 0xAC - beq _080C871E - cmp r0, 0xB5 - beq _080C871E - cmp r0, 0xB6 - beq _080C871E - cmp r0, 0xBA - beq _080C871E - cmp r0, 0xAE - beq _080C871E - cmp r0, 0xB0 - beq _080C871E - cmp r0, 0xB1 - beq _080C871E - cmp r0, 0xB2 - beq _080C871E - cmp r0, 0xB3 - beq _080C871E - cmp r0, 0xB1 - bne _080C8728 -_080C871E: - adds r4, 0x1 - ldrb r0, [r4] - cmp r0, 0xFF - bne _080C86CA - b _080C872A -_080C8728: - movs r5, 0x1 -_080C872A: - adds r0, r5, 0 -_080C872C: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80C86A0 - .ifdef ENGLISH thumb_func_start sub_80C8734 sub_80C8734: @ 80C8734 diff --git a/include/contest.h b/include/contest.h index 6b1f1f520..e8e68f0e6 100644 --- a/include/contest.h +++ b/include/contest.h @@ -271,4 +271,7 @@ struct UnknownContestStruct6 #define shared19338 ((struct UnknownContestStruct4 *)(gSharedMem + 0x19338)) #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348)) +extern u8 gContestPlayerMonIndex; +extern u8 gIsLinkContest; + #endif // GUARD_CONTEST_H diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index e0b24b9e1..3360ecbb6 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -1,9 +1,13 @@ #include "global.h" #include "ewram.h" #include "task.h" +#include "contest.h" +#include "text.h" +#include "string_util.h" #include "link.h" -void sub_80C8644(u8 taskId); +static void sub_80C8644(u8 taskId); +static void sub_80C8660(u8 taskId); void sub_80C857C(const void *data, u16 size) { @@ -45,6 +49,150 @@ void sub_80C8604(u8 taskId) gTasks[taskId].func = sub_80C8644; } +static void sub_80C8644(u8 taskId) +{ + gTasks[taskId].func = sub_80C8660; +} + +static void sub_80C8660(u8 taskId) +{ + if (gReceivedRemoteLinkPlayers) + { + gContestPlayerMonIndex = GetMultiplayerId(); + if (GetLinkPlayerCount() == MAX_LINK_PLAYERS) + { + gIsLinkContest = TRUE; + SwitchTaskToFollowupFunc(taskId); + } + } +} + +#ifdef NONMATCHING +u8 sub_80C86A0(const u8 *string) +{ + u8 language = GAME_LANGUAGE; + if (string[0] == EXT_CTRL_CODE_BEGIN && string[1] == 0x15) + return language; + if (StringLength(string) > 5) + return language; + for (; *string != EOS; string++) + { + if (!((*string >= CHAR_A && *string <= CHAR_z) || + (*string >= CHAR_0 + 0 && *string <= CHAR_0 + 9) || + *string == CHAR_SPACE || + *string == CHAR_PERIOD || + *string == CHAR_COMMA || + *string == 0xAB || + *string == CHAR_QUESTION_MARK || + *string == CHAR_MALE || + *string == CHAR_FEMALE || + *string == CHAR_SLASH || + *string == CHAR_HYPHEN || + *string == CHAR_ELLIPSIS || + *string == 0xB1 || + *string == 0xB2 || + *string == 0xB3 || + *string == 0xB1 + )) + { + language = LANGUAGE_JAPANESE; + break; + } + } + return language; +} +#else +__attribute__((naked)) u8 sub_80C86A0(const u8 *string) +{ + asm_unified("\tpush {r4,r5,lr}\n" + "\tadds r4, r0, 0\n" + ".ifdef ENGLISH\n" + "\tmovs r5, 0x2\n" + ".else\n" + "\tmovs r5, 0x5\n" + ".endif\n" + "\tldrb r0, [r4]\n" + "\tcmp r0, 0xFC\n" + "\tbne _080C86B6\n" + "\tldrb r0, [r4, 0x1]\n" + "\tcmp r0, 0x15\n" + "\tbne _080C86B6\n" + ".ifdef ENGLISH\n" + "\tmovs r0, 0x2\n" + ".else\n" + "\tmovs r0, 0x5\n" + ".endif\n" + "\tb _080C872C\n" + "_080C86B6:\n" + "\tadds r0, r4, 0\n" + "\tbl StringLength\n" + "\tlsls r0, 16\n" + "\tlsrs r0, 16\n" + "\tcmp r0, 0x5\n" + "\tbhi _080C872A\n" + "\tldrb r0, [r4]\n" + "\tcmp r0, 0xFF\n" + "\tbeq _080C872A\n" + "_080C86CA:\n" + "\tldrb r1, [r4]\n" + "\tadds r0, r1, 0\n" + "\tadds r0, 0x45\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x33\n" + "\tbls _080C871E\n" + "\tadds r0, r1, 0\n" + "\tadds r0, 0x5F\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r0, 0x9\n" + "\tbls _080C871E\n" + "\tadds r0, r1, 0\n" + "\tcmp r0, 0\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xAD\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB8\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xAB\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xAC\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB5\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB6\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xBA\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xAE\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB0\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB1\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB2\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB3\n" + "\tbeq _080C871E\n" + "\tcmp r0, 0xB1\n" + "\tbne _080C8728\n" + "_080C871E:\n" + "\tadds r4, 0x1\n" + "\tldrb r0, [r4]\n" + "\tcmp r0, 0xFF\n" + "\tbne _080C86CA\n" + "\tb _080C872A\n" + "_080C8728:\n" + "\tmovs r5, 0x1\n" + "_080C872A:\n" + "\tadds r0, r5, 0\n" + "_080C872C:\n" + "\tpop {r4,r5}\n" + "\tpop {r1}\n" + "\tbx r1"); +} +#endif + asm(".section .text_de"); #if GERMAN -- cgit v1.2.3 From b2ea9aec023be26a83853ca53134ce78b95ac2e6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 17:33:02 -0500 Subject: sub_80C8734 --- asm/contest_link_80C857C.s | 409 -------------------------------------- src/battle/contest_link_80C857C.c | 104 ++++++++++ 2 files changed, 104 insertions(+), 409 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 1ac60af96..2fdd4bbcd 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,415 +5,6 @@ .text -.ifdef ENGLISH - thumb_func_start sub_80C8734 -sub_80C8734: @ 80C8734 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldr r1, _080C8768 @ =gTasks - lsls r5, r0, 2 - adds r0, r5, r0 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C876C - cmp r0, 0x1 - beq _080C87D0 - movs r0, 0 - strh r0, [r4, 0x8] - mov r0, r9 - bl SwitchTaskToFollowupFunc - b _080C8896 - .align 2, 0 -_080C8768: .4byte gTasks -_080C876C: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C87A8 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - bne _080C8782 - b _080C8896 -_080C8782: - ldr r0, _080C879C @ =gBlockSendBuffer - ldr r1, _080C87A0 @ =gContestPlayerMonIndex - ldrb r1, [r1] - lsls r1, 6 - ldr r2, _080C87A4 @ =gContestMons - adds r1, r2 - movs r2, 0x40 - bl memcpy - movs r0, 0x2 - bl sub_8007E9C - b _080C87BA - .align 2, 0 -_080C879C: .4byte gBlockSendBuffer -_080C87A0: .4byte gContestPlayerMonIndex -_080C87A4: .4byte gContestMons -_080C87A8: - ldr r0, _080C87C4 @ =gBlockSendBuffer - ldr r1, _080C87C8 @ =gContestPlayerMonIndex - ldrb r1, [r1] - lsls r1, 6 - ldr r2, _080C87CC @ =gContestMons - adds r1, r2 - movs r2, 0x40 - bl memcpy -_080C87BA: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C8896 - .align 2, 0 -_080C87C4: .4byte gBlockSendBuffer -_080C87C8: .4byte gContestPlayerMonIndex -_080C87CC: .4byte gContestMons -_080C87D0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8896 - movs r7, 0 - str r5, [sp] - ldr r0, _080C8818 @ =gContestMons - ldr r6, _080C881C @ =gLinkPlayers - movs r5, 0 - mov r10, r0 - movs r2, 0xFF - mov r8, r2 -_080C87EA: - lsls r1, r7, 8 - ldr r0, _080C8820 @ =gBlockRecvBuffer - adds r1, r0 - mov r0, r10 - movs r2, 0x40 - bl memcpy - ldr r0, _080C8824 @ =gContestMons + 0x2 - adds r4, r5, r0 - ldrh r0, [r6, 0x1A] - cmp r0, 0x1 - bne _080C8828 - adds r0, r4, 0 - bl sub_80C86A0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl ConvertInternationalString - b _080C883E - .align 2, 0 -_080C8818: .4byte gContestMons -_080C881C: .4byte gLinkPlayers -_080C8820: .4byte gBlockRecvBuffer -_080C8824: .4byte gContestMons + 0x2 -_080C8828: - ldrb r0, [r4, 0xA] - cmp r0, 0xFC - bne _080C8838 - adds r0, r4, 0 - movs r1, 0x1 - bl ConvertInternationalString - b _080C883E -_080C8838: - strb r0, [r4, 0x5] - mov r1, r8 - strb r1, [r4, 0xA] -_080C883E: - ldr r0, _080C886C @ =gContestMons + 0xD - adds r4, r5, r0 - ldrh r0, [r6, 0x1A] - cmp r0, 0x1 - bne _080C8870 - mov r2, r8 - strb r2, [r4, 0x7] - ldrb r0, [r4, 0x4] - strb r0, [r4, 0x6] - ldrb r0, [r4, 0x3] - strb r0, [r4, 0x5] - ldrb r0, [r4, 0x2] - strb r0, [r4, 0x4] - ldrb r0, [r4, 0x1] - strb r0, [r4, 0x3] - ldrb r0, [r4] - strb r0, [r4, 0x2] - movs r0, 0x15 - strb r0, [r4, 0x1] - movs r0, 0xFC - strb r0, [r4] - b _080C8878 - .align 2, 0 -_080C886C: .4byte gContestMons + 0xD -_080C8870: - ldrb r0, [r4, 0x7] - strb r0, [r4, 0x5] - mov r0, r8 - strb r0, [r4, 0x7] -_080C8878: - adds r6, 0x1C - adds r5, 0x40 - movs r1, 0x40 - add r10, r1 - adds r7, 0x1 - cmp r7, 0x3 - ble _080C87EA - ldr r0, _080C88A8 @ =gTasks - ldr r1, [sp] - add r1, r9 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_080C8896: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C88A8: .4byte gTasks - thumb_func_end sub_80C8734 -.else - thumb_func_start sub_80C8734 -sub_80C8734: @ 80C8734 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080C8760 @ =gTasks - lsls r4, r5, 2 - adds r0, r4, r5 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - cmp r0, 0x1 - beq _080C8800 - cmp r0, 0x1 - bgt _080C8764 - cmp r0, 0 - beq _080C8770 - b _080C88E0 - .align 2, 0 -_080C8760: .4byte gTasks -_080C8764: - cmp r0, 0x2 - bne _080C876A - b _080C88D4_B -_080C876A: - cmp r0, 0x8 - beq _080C8770 - b _080C88E0 -_080C8770: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C87D4 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - bne _080C8786 - b _080C88EE -_080C8786: - ldr r0, _080C87A0 @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r0 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080C87A4 - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080C88EE - .align 2, 0 -_080C87A0: .4byte gTasks -_080C87A4: - ldr r0, _080C87C8 @ =gBlockSendBuffer - ldr r1, _080C87CC @ =gContestPlayerMonIndex - ldrb r1, [r1] - lsls r1, 6 - ldr r2, _080C87D0 @ =gContestMons - adds r1, r2 - movs r2, 0x40 - bl memcpy - movs r0, 0 - bl de_sub_80C9274 - movs r0, 0x2 - bl sub_8007E9C - movs r0, 0x1 - strh r0, [r4, 0x8] - b _080C88EE - .align 2, 0 -_080C87C8: .4byte gBlockSendBuffer -_080C87CC: .4byte gContestPlayerMonIndex -_080C87D0: .4byte gContestMons -_080C87D4: - ldr r0, _080C87F0 @ =gBlockSendBuffer - ldr r1, _080C87F4 @ =gContestPlayerMonIndex - ldrb r1, [r1] - lsls r1, 6 - ldr r2, _080C87F8 @ =gContestMons - adds r1, r2 - movs r2, 0x40 - bl memcpy - movs r0, 0 - bl de_sub_80C9294 - ldr r1, _080C87FC @ =gTasks - b _080C88E0 - .align 2, 0 -_080C87F0: .4byte gBlockSendBuffer -_080C87F4: .4byte gContestPlayerMonIndex -_080C87F8: .4byte gContestMons -_080C87FC: .4byte gTasks -_080C8800: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C88EE - movs r2, 0 - mov r8, r2 - str r4, [sp] - ldr r0, _080C884C @ =gContestMons - ldr r7, _080C8850 @ =gLinkPlayers - movs r6, 0 - mov r10, r0 - movs r3, 0xFF - mov r9, r3 -_080C881C: - mov r0, r8 - lsls r1, r0, 8 - ldr r0, _080C8854 @ =gBlockRecvBuffer - adds r1, r0 - mov r0, r10 - movs r2, 0x40 - bl memcpy - ldr r1, _080C8858 @ =gContestMons + 0x2 - adds r4, r6, r1 - ldrh r0, [r7, 0x1A] - cmp r0, 0x1 - bne _080C885C - adds r0, r4, 0 - bl sub_80C86A0 - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl ConvertInternationalString - b _080C8872 - .align 2, 0 -_080C884C: .4byte gContestMons -_080C8850: .4byte gLinkPlayers -_080C8854: .4byte gBlockRecvBuffer -_080C8858: .4byte gContestMons + 0x2 -_080C885C: - ldrb r0, [r4, 0xA] - cmp r0, 0xFC - bne _080C886C - adds r0, r4, 0 - movs r1, 0x1 - bl ConvertInternationalString - b _080C8872 -_080C886C: - strb r0, [r4, 0x5] - mov r2, r9 - strb r2, [r4, 0xA] -_080C8872: - ldr r0, _080C88A0 @ =gContestMons + 0xD - adds r4, r6, r0 - ldrh r0, [r7, 0x1A] - cmp r0, 0x1 - bne _080C88A4 - mov r3, r9 - strb r3, [r4, 0x7] - ldrb r0, [r4, 0x4] - strb r0, [r4, 0x6] - ldrb r0, [r4, 0x3] - strb r0, [r4, 0x5] - ldrb r0, [r4, 0x2] - strb r0, [r4, 0x4] - ldrb r0, [r4, 0x1] - strb r0, [r4, 0x3] - ldrb r0, [r4] - strb r0, [r4, 0x2] - movs r0, 0x15 - strb r0, [r4, 0x1] - movs r0, 0xFC - strb r0, [r4] - b _080C88AC - .align 2, 0 -_080C88A0: .4byte gContestMons + 0xD -_080C88A4: - ldrb r0, [r4, 0x7] - strb r0, [r4, 0x5] - mov r0, r9 - strb r0, [r4, 0x7] -_080C88AC: - adds r7, 0x1C - adds r6, 0x40 - movs r1, 0x40 - add r10, r1 - movs r2, 0x1 - add r8, r2 - mov r3, r8 - cmp r3, 0x3 - ble _080C881C - ldr r0, _080C88D0 @ =gTasks - ldr r2, [sp] - adds r1, r2, r5 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C88EE - .align 2, 0 -_080C88D0: .4byte gTasks -_080C88D4_B: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C88EE -_080C88E0: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_080C88EE: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8734 -.endif - thumb_func_start sub_80C88AC sub_80C88AC: @ 80C88AC push {r4,r5,lr} diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 3360ecbb6..b86e7bb9c 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -8,6 +8,10 @@ static void sub_80C8644(u8 taskId); static void sub_80C8660(u8 taskId); +#if GERMAN +void de_sub_80C9274(bool32 arg0); +void de_sub_80C9294(bool32 arg0); +#endif void sub_80C857C(const void *data, u16 size) { @@ -193,6 +197,106 @@ __attribute__((naked)) u8 sub_80C86A0(const u8 *string) } #endif +void sub_80C8734(u8 taskId) +{ + int i; + u8 *name; + + switch (gTasks[taskId].data[0]) { +#if ENGLISH + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; +#elif GERMAN + case 8: +#endif + case 0: + if (GetMultiplayerId() == 0) { + if (sub_8007ECC()) { +#if GERMAN + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[0] = 3; + } + else + { +#endif + memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon)); +#if GERMAN + de_sub_80C9274(FALSE); +#endif + sub_8007E9C(2); +#if GERMAN + gTasks[taskId].data[0] = 1; + } +#else + gTasks[taskId].data[0]++; +#endif + } + } + else + { + memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon)); +#if GERMAN + de_sub_80C9294(FALSE); +#endif + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + for (i = 0; i < MAX_LINK_PLAYERS; i++) + { + memcpy(gContestMons + i, gBlockRecvBuffer[i], sizeof(struct ContestPokemon)); + name = gContestMons[i].nickname; + if (gLinkPlayers[i].language == LANGUAGE_JAPANESE) + { + ConvertInternationalString(name, sub_80C86A0(name)); + } + else if (name[10] == EXT_CTRL_CODE_BEGIN) + { + ConvertInternationalString(name, LANGUAGE_JAPANESE); + } else + { + name[5] = name[10]; + name[10] = EOS; + } + name = gContestMons[i].trainerName; + if (gLinkPlayers[i].language == LANGUAGE_JAPANESE) + { + name[7] = EOS; + name[6] = name[4]; + name[5] = name[3]; + name[4] = name[2]; + name[3] = name[1]; + name[2] = name[0]; + name[1] = 0x15; + name[0] = EXT_CTRL_CODE_BEGIN; + } + else + { + name[5] = name[7]; + name[7] = EOS; + } + } + gTasks[taskId].data[0]++; + } + break; +#if GERMAN + case 2: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + default: + gTasks[taskId].data[0]++; + break; +#endif + } +} + + asm(".section .text_de"); #if GERMAN -- cgit v1.2.3 From 84769240d2002281c7bc274f18aab76fbe908483 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 18:04:04 -0500 Subject: sub_80C88AC --- asm/contest_link_80C857C.s | 67 --------------------------------------- include/contest.h | 1 + src/battle/contest_link_80C857C.c | 33 +++++++++++++++++++ src/contest.c | 6 ++-- src/script_pokemon_util_80C4BF0.c | 6 ++-- sym_common.txt | 2 +- 6 files changed, 41 insertions(+), 74 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 2fdd4bbcd..e73efe74d 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,73 +5,6 @@ .text - thumb_func_start sub_80C88AC -sub_80C88AC: @ 80C88AC - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C88D4 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _080C88D8 - cmp r0, 0x1 - beq _080C88FC - movs r0, 0 - strh r0, [r5, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8924 - .align 2, 0 -_080C88D4: .4byte gTasks -_080C88D8: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C891E - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8924 - ldr r0, _080C88F8 @ =gRngValue - movs r1, 0x4 - bl sub_80C857C - b _080C891E - .align 2, 0 -_080C88F8: .4byte gRngValue -_080C88FC: - movs r0, 0 - bl sub_80C85AC - lsls r0, 24 - cmp r0, 0 - beq _080C8924 - ldr r0, _080C892C @ =gRngValue - ldr r4, _080C8930 @ =gBlockRecvBuffer - adds r1, r4, 0 - movs r2, 0x4 - bl memcpy - ldr r0, _080C8934 @ =gUnknown_03005D28 - adds r1, r4, 0 - movs r2, 0x4 - bl memcpy -_080C891E: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_080C8924: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080C892C: .4byte gRngValue -_080C8930: .4byte gBlockRecvBuffer -_080C8934: .4byte gUnknown_03005D28 - thumb_func_end sub_80C88AC - .ifdef ENGLISH thumb_func_start sub_80C8938 sub_80C8938: @ 80C8938 diff --git a/include/contest.h b/include/contest.h index e8e68f0e6..dfa0e38da 100644 --- a/include/contest.h +++ b/include/contest.h @@ -273,5 +273,6 @@ struct UnknownContestStruct6 extern u8 gContestPlayerMonIndex; extern u8 gIsLinkContest; +extern u32 gContestRngValue; #endif // GUARD_CONTEST_H diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index b86e7bb9c..937193172 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -1,5 +1,6 @@ #include "global.h" #include "ewram.h" +#include "random.h" #include "task.h" #include "contest.h" #include "text.h" @@ -296,6 +297,38 @@ void sub_80C8734(u8 taskId) } } +void sub_80C88AC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + case 0: + if (GetMultiplayerId() == 0) + { + if (sub_8007ECC()) + { + sub_80C857C(&gRngValue, sizeof(u32)); + gTasks[taskId].data[0]++; + } + } + else + { + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85AC(0)) + { + memcpy(&gRngValue, gBlockRecvBuffer[0], sizeof(u32)); + memcpy(&gContestRngValue, gBlockRecvBuffer[0], sizeof(u32)); + gTasks[taskId].data[0]++; + } + break; + } +} asm(".section .text_de"); diff --git a/src/contest.c b/src/contest.c index 93d1a8efc..ce29d80b0 100644 --- a/src/contest.c +++ b/src/contest.c @@ -59,7 +59,7 @@ extern u16 gBattle_BG0_Y; extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u16 gBattle_WIN0H; -extern u32 gUnknown_03005D28; // saved RNG value +extern u32 gContestRngValue; // saved RNG value extern struct SpriteTemplate gUnknown_02024E8C; @@ -495,7 +495,7 @@ void sub_80AB6B4(u8 taskId) GetMultiplayerId(); // unused return value DestroyTask(taskId); gTasks[sContest.mainTaskId].func = sub_80AB960; - gRngValue = gUnknown_03005D28; + gRngValue = gContestRngValue; } } @@ -1812,7 +1812,7 @@ void sub_80ADDA4(u8 taskId) sub_80AF668(); sub_80AF138(); sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove); - gUnknown_03005D28 = gRngValue; + gContestRngValue = gRngValue; StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C); Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[2] = 0; diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index f991297ab..e51bc3522 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -45,7 +45,7 @@ extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; extern u16 gSpecialVar_Result; -extern u32 gUnknown_03005D28; +extern u32 gContestRngValue; extern u8 gUnknown_02038694; extern u8 gUnknown_0203856C; @@ -373,8 +373,8 @@ void ScriptRandom(void) if(gIsLinkContest & 1) { - gUnknown_03005D28 = 1103515245 * gUnknown_03005D28 + 24691; - random = gUnknown_03005D28 >> 16; + gContestRngValue = 1103515245 * gContestRngValue + 24691; + random = gContestRngValue >> 16; scriptPtr = &gSpecialVar_Result; } else diff --git a/sym_common.txt b/sym_common.txt index 64e87c046..0bc9fd80c 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -213,7 +213,7 @@ gFieldItemUseCallback = .; gBagPocketScrollStates = .; . += 0x14; SYMBOL(gCurrentBagPocketItemSlots, 4) -SYMBOL(gUnknown_03005D28, 4) +SYMBOL(gContestRngValue, 4) // record_mixing.c SYMBOL(gUnknown_03005D2C, 4) -- cgit v1.2.3 From 9474c491c070fe38e89f7b3848a5820c763fe045 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 19:03:23 -0500 Subject: sub_80C8938 --- asm/contest_link_80C857C.s | 210 -------------------------------------- src/battle/contest_link_80C857C.c | 68 ++++++++++++ 2 files changed, 68 insertions(+), 210 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index e73efe74d..6dc96e85d 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,216 +5,6 @@ .text -.ifdef ENGLISH - thumb_func_start sub_80C8938 -sub_80C8938: @ 80C8938 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, _080C8968 @ =gTasks - mov r8, r0 - lsls r6, r5, 2 - adds r0, r6, r5 - lsls r7, r0, 3 - mov r1, r8 - adds r4, r7, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C896C - cmp r0, 0x1 - beq _080C8998 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C89CE - .align 2, 0 -_080C8968: .4byte gTasks -_080C896C: - ldr r1, _080C8994 @ =gBlockSendBuffer - ldrh r0, [r4, 0x1A] - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C898C - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C89CE - movs r0, 0x2 - bl sub_8007E9C -_080C898C: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C89CE - .align 2, 0 -_080C8994: .4byte gBlockSendBuffer -_080C8998: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C89CE - movs r3, 0 - mov r12, r8 - adds r1, r6, 0 - ldr r4, _080C89D8 @ =gBlockRecvBuffer - mov r0, r12 - adds r0, 0xA - adds r2, r7, r0 - movs r6, 0x80 - lsls r6, 1 -_080C89B4: - ldrh r0, [r4] - strh r0, [r2] - adds r4, r6 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C89B4 - adds r1, r5 - lsls r1, 3 - add r1, r12 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_080C89CE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C89D8: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8938 -.else - thumb_func_start sub_80C8938 -sub_80C8938: @ 80C8938 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080C8960 @ =gTasks - lsls r5, r4, 2 - adds r0, r5, r4 - lsls r6, r0, 3 - adds r2, r6, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - mov r8, r1 - cmp r0, 0x1 - beq _080C89C4 - cmp r0, 0x1 - bgt _080C8964 - cmp r0, 0 - beq _080C896C - b _080C8A0C - .align 2, 0 -_080C8960: .4byte gTasks -_080C8964: - cmp r0, 0x2 - beq _080C8A00 - cmp r0, 0x8 - bne _080C8A0C -_080C896C: - ldr r1, _080C89A0 @ =gBlockSendBuffer - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - mov r2, r8 - adds r4, r0, r2 - ldrh r0, [r4, 0x1A] - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C89B6 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8A1A - movs r3, 0x8 - ldrsh r0, [r4, r3] - cmp r0, 0 - bne _080C89A4 - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080C8A1A - .align 2, 0 -_080C89A0: .4byte gBlockSendBuffer -_080C89A4: - movs r0, 0x1 - bl de_sub_80C9274 - movs r0, 0x2 - bl sub_8007E9C - movs r0, 0x1 - strh r0, [r4, 0x8] - b _080C8A1A -_080C89B6: - movs r0, 0x1 - bl de_sub_80C9294 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C8A1A -_080C89C4: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8A1A - movs r3, 0 - adds r7, r5, 0 - ldr r1, _080C89FC @ =gBlockRecvBuffer - mov r0, r8 - adds r0, 0xA - adds r2, r6, r0 - movs r5, 0x80 - lsls r5, 1 -_080C89DE: - ldrh r0, [r1] - strh r0, [r2] - adds r1, r5 - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x3 - ble _080C89DE - adds r1, r7, r4 - lsls r1, 3 - add r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C8A1A - .align 2, 0 -_080C89FC: .4byte gBlockRecvBuffer -_080C8A00: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc - b _080C8A1A -_080C8A0C: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - add r0, r8 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_080C8A1A: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8938 -.endif - thumb_func_start sub_80C89DC sub_80C89DC: @ 80C89DC push {r4,lr} diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 937193172..17b82388c 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -330,6 +330,74 @@ void sub_80C88AC(u8 taskId) } } +void sub_80C8938(u8 taskId) +{ + int i; + + switch (gTasks[taskId].data[0]) + { +#if ENGLISH + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; +#elif GERMAN + case 8: +#endif + case 0: + gBlockSendBuffer[0] = gTasks[taskId].data[9]; + if (GetMultiplayerId() == 0) + { + if (sub_8007ECC()) + { +#if GERMAN + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[0] = 3; + } + else + { + de_sub_80C9274(TRUE); +#endif + sub_8007E9C(2); +#if ENGLISH + gTasks[taskId].data[0]++; +#elif GERMAN + gTasks[taskId].data[0] = 1; + } +#endif + } + } + else + { +#if GERMAN + de_sub_80C9294(TRUE); +#endif + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + for (i = 0; i < MAX_LINK_PLAYERS; i++) + { + gTasks[taskId].data[i + 1] = gBlockRecvBuffer[i][0]; + } + gTasks[taskId].data[0]++; + } + break; +#if GERMAN + case 2: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + default: + gTasks[taskId].data[0]++; + break; +#endif + } +} + asm(".section .text_de"); #if GERMAN -- cgit v1.2.3 From 5312cf566196e662aa7edd4ef68f32922eb54180 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 19:20:26 -0500 Subject: through sub_80C8A38 --- asm/contest_link_80C857C.s | 126 -------------------------------------- src/battle/contest_link_80C857C.c | 54 ++++++++++++++++ 2 files changed, 54 insertions(+), 126 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 6dc96e85d..4285531f7 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,132 +5,6 @@ .text - thumb_func_start sub_80C89DC -sub_80C89DC: @ 80C89DC - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C8A04 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8A08 - cmp r0, 0x1 - beq _080C8A20 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8A30 - .align 2, 0 -_080C8A04: .4byte gTasks -_080C8A08: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8A30 - ldr r0, _080C8A1C @ =gContestPlayerMonIndex - movs r1, 0x1 - bl sub_80C857C - b _080C8A2A - .align 2, 0 -_080C8A1C: .4byte gContestPlayerMonIndex -_080C8A20: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8A30 -_080C8A2A: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080C8A30: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C89DC - - thumb_func_start sub_80C8A38 -sub_80C8A38: @ 80C8A38 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r7, _080C8A60 @ =gTasks - lsls r6, r5, 2 - adds r0, r6, r5 - lsls r0, 3 - adds r4, r0, r7 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8A64 - cmp r0, 0x1 - beq _080C8A94 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C8AC2 - .align 2, 0 -_080C8A60: .4byte gTasks -_080C8A64: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8AC2 - ldr r0, _080C8A8C @ =gContestPlayerMonIndex - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - ldr r1, _080C8A90 @ =gSharedMem + 0x19266 - adds r0, r1 - movs r1, 0x2 - bl sub_80C857C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C8AC2 - .align 2, 0 -_080C8A8C: .4byte gContestPlayerMonIndex -_080C8A90: .4byte gSharedMem + 0x19266 -_080C8A94: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8AC2 - ldr r1, _080C8AC8 @ =gBlockRecvBuffer - ldr r3, _080C8ACC @ =gSharedMem + 0x19266 - movs r4, 0x80 - lsls r4, 1 - movs r2, 0x3 -_080C8AA8: - ldrh r0, [r1] - strh r0, [r3] - adds r1, r4 - adds r3, 0x1C - subs r2, 0x1 - cmp r2, 0 - bge _080C8AA8 - adds r1, r6, r5 - lsls r1, 3 - adds r1, r7 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_080C8AC2: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8AC8: .4byte gBlockRecvBuffer -_080C8ACC: .4byte gSharedMem + 0x19266 - thumb_func_end sub_80C8A38 - thumb_func_start sub_80C8AD0 sub_80C8AD0: @ 80C8AD0 push {r4,lr} diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 17b82388c..cef290adf 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -398,6 +398,60 @@ void sub_80C8938(u8 taskId) } } +void sub_80C89DC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + case 0: + if (sub_8007ECC()) + { + sub_80C857C(&gContestPlayerMonIndex, sizeof(u8)); + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + gTasks[taskId].data[0]++; + } + break; + } +} + +void sub_80C8A38(u8 taskId) +{ + int i; + + switch (gTasks[taskId].data[0]) + { + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + case 0: + if (sub_8007ECC()) + { + sub_80C857C(&sContestantStatus[gContestPlayerMonIndex].currMove, sizeof(u16)); + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + for (i = 0; i < MAX_LINK_PLAYERS; i++) + { + *&sContestantStatus[i].currMove = gBlockRecvBuffer[i][0]; + } + gTasks[taskId].data[0]++; + } + break; + } +} + asm(".section .text_de"); #if GERMAN -- cgit v1.2.3 From cbab0f740349cbeece60f2155537c2a9870d2318 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 20:24:02 -0500 Subject: sub_80C8AD0 --- asm/contest_link_80C857C.s | 198 -------------------------------------- include/contest.h | 5 + src/battle/contest_link_80C857C.c | 77 +++++++++++++++ src/debug/matsuda_debug_menu.c | 8 -- src/script_pokemon_util_80C4BF0.c | 12 --- 5 files changed, 82 insertions(+), 218 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 4285531f7..61117e28c 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,204 +5,6 @@ .text - thumb_func_start sub_80C8AD0 -sub_80C8AD0: @ 80C8AD0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080C8AF8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - adds r3, r1, 0 - cmp r0, 0xB - bls _080C8AEC - b _080C8C70 -_080C8AEC: - lsls r0, 2 - ldr r1, _080C8AFC @ =_080C8B00 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C8AF8: .4byte gTasks -_080C8AFC: .4byte _080C8B00 - .align 2, 0 -_080C8B00: - .4byte _080C8B30 - .4byte _080C8B4C - .4byte _080C8B74 - .4byte _080C8B98 - .4byte _080C8BB0 - .4byte _080C8B74 - .4byte _080C8BD8 - .4byte _080C8BF0 - .4byte _080C8B74 - .4byte _080C8C18 - .4byte _080C8C30 - .4byte _080C8B74 -_080C8B30: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - bne _080C8B3C - b _080C8C7A -_080C8B3C: - ldr r0, _080C8B48 @ =gUnknown_02038678 - movs r1, 0x8 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8B48: .4byte gUnknown_02038678 -_080C8B4C: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - bne _080C8B58 - b _080C8C7A -_080C8B58: - ldr r0, _080C8B68 @ =gUnknown_02038678 - ldr r1, _080C8B6C @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8B70 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - b _080C8C48 - .align 2, 0 -_080C8B68: .4byte gUnknown_02038678 -_080C8B6C: .4byte gUnknown_0203869B -_080C8B70: .4byte gBlockRecvBuffer -_080C8B74: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r3 - ldrh r0, [r2, 0xA] - adds r1, r0, 0x1 - strh r1, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bgt _080C8B8C - b _080C8C7A -_080C8B8C: - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _080C8C7A -_080C8B98: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8BAC @ =gUnknown_02038680 - movs r1, 0x8 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8BAC: .4byte gUnknown_02038680 -_080C8BB0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8BCC @ =gUnknown_02038680 - ldr r1, _080C8BD0 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8BD4 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - b _080C8C48 - .align 2, 0 -_080C8BCC: .4byte gUnknown_02038680 -_080C8BD0: .4byte gUnknown_0203869B -_080C8BD4: .4byte gBlockRecvBuffer -_080C8BD8: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8BEC @ =gUnknown_02038688 - movs r1, 0x8 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8BEC: .4byte gUnknown_02038688 -_080C8BF0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8C0C @ =gUnknown_02038688 - ldr r1, _080C8C10 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8C14 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - b _080C8C48 - .align 2, 0 -_080C8C0C: .4byte gUnknown_02038688 -_080C8C10: .4byte gUnknown_0203869B -_080C8C14: .4byte gBlockRecvBuffer -_080C8C18: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8C2C @ =gContestFinalStandings - movs r1, 0x4 - bl sub_80C857C - b _080C8C4C - .align 2, 0 -_080C8C2C: .4byte gContestFinalStandings -_080C8C30: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8C7A - ldr r0, _080C8C60 @ =gContestFinalStandings - ldr r1, _080C8C64 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8C68 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x4 -_080C8C48: - bl memcpy -_080C8C4C: - ldr r1, _080C8C6C @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080C8C7A - .align 2, 0 -_080C8C60: .4byte gContestFinalStandings -_080C8C64: .4byte gUnknown_0203869B -_080C8C68: .4byte gBlockRecvBuffer -_080C8C6C: .4byte gTasks -_080C8C70: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc -_080C8C7A: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C8AD0 - thumb_func_start sub_80C8C80 sub_80C8C80: @ 80C8C80 push {r4,lr} diff --git a/include/contest.h b/include/contest.h index dfa0e38da..a15ca67e6 100644 --- a/include/contest.h +++ b/include/contest.h @@ -274,5 +274,10 @@ struct UnknownContestStruct6 extern u8 gContestPlayerMonIndex; extern u8 gIsLinkContest; extern u32 gContestRngValue; +extern s16 gUnknown_02038678[4]; +extern s16 gUnknown_02038680[4]; +extern u16 gUnknown_02038688[4]; +extern u8 gContestFinalStandings[4]; +extern u8 gUnknown_0203869B; #endif // GUARD_CONTEST_H diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index cef290adf..465bb0487 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -452,6 +452,83 @@ void sub_80C8A38(u8 taskId) } } +void sub_80C8AD0(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + if (sub_8007ECC()) + { + sub_80C857C(gUnknown_02038678, sizeof gUnknown_02038678); + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + memcpy(gUnknown_02038678, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038678); + gTasks[taskId].data[0]++; + } + break; + case 2: + case 5: + case 8: + case 11: + if (gTasks[taskId].data[1]++ > 10) + { + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[0]++; + } + break; + case 3: + if (sub_8007ECC()) + { + sub_80C857C(gUnknown_02038680, sizeof gUnknown_02038680); + gTasks[taskId].data[0]++; + } + break; + case 4: + if (sub_80C85D8()) + { + memcpy(gUnknown_02038680, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038680); + gTasks[taskId].data[0]++; + } + break; + case 6: + if (sub_8007ECC()) + { + sub_80C857C(gUnknown_02038688, sizeof gUnknown_02038688); + gTasks[taskId].data[0]++; + } + break; + case 7: + if (sub_80C85D8()) + { + memcpy(gUnknown_02038688, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038688); + gTasks[taskId].data[0]++; + } + break; + case 9: + if (sub_8007ECC()) + { + sub_80C857C(gContestFinalStandings, sizeof gContestFinalStandings); + gTasks[taskId].data[0]++; + } + break; + case 10: + if (sub_80C85D8()) + { + memcpy(gContestFinalStandings, gBlockRecvBuffer[gUnknown_0203869B], sizeof gContestFinalStandings); + gTasks[taskId].data[0]++; + } + break; + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + } +} + asm(".section .text_de"); #if GERMAN diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index da1937adb..15d28df09 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -19,13 +19,7 @@ extern u8 gUnknown_0203856C; extern s16 gUnknown_02038670[]; -extern s16 gUnknown_02038678[]; -extern s16 gUnknown_02038680[]; -extern u8 gContestFinalStandings[]; extern u8 gUnknown_02038694; -extern u8 gIsLinkContest; -extern u8 gUnknown_0203869B; -extern u8 gContestPlayerMonIndex; extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; @@ -40,8 +34,6 @@ extern u16 gBattle_BG3_Y; extern u8 (*gMenuCallback)(void); -extern bool8 gReceivedRemoteLinkPlayers; - static bool8 sub_80A9B78(void); static void sub_80A9BE4(u8 taskId); static void sub_80A9C98(u8); diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index e51bc3522..513f6ce2a 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -32,26 +32,14 @@ extern void sub_80C4698(u8 *, u8); extern struct SpriteTemplate gUnknown_02024E8C; -extern u8 gContestPlayerMonIndex; -extern u8 gIsLinkContest; -extern u8 gPlayerPartyCount; extern u8 gSelectedOrderFromParty[]; -extern u16 gSpecialVar_0x8004; -extern u16 gSpecialVar_0x8005; -extern u16 gSpecialVar_0x8006; - extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; -extern u16 gSpecialVar_Result; - -extern u32 gContestRngValue; extern u8 gUnknown_02038694; extern u8 gUnknown_0203856C; -extern u8 gContestFinalStandings[]; extern s16 gUnknown_02038670[]; -extern s16 gUnknown_02038678[]; void SetContestTrainerGfxIds(void) { -- cgit v1.2.3 From 399856bc7ead101718891712dd20dd85e138e640 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 20:30:31 -0500 Subject: sub_80C8C80 --- asm/contest_link_80C857C.s | 189 -------------------------------------- include/contest.h | 1 + src/battle/contest_link_80C857C.c | 77 ++++++++++++++++ 3 files changed, 78 insertions(+), 189 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 61117e28c..a27a96253 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,195 +5,6 @@ .text - thumb_func_start sub_80C8C80 -sub_80C8C80: @ 80C8C80 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080C8CA8 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - adds r3, r1, 0 - cmp r0, 0xB - bls _080C8C9C - b _080C8E0C -_080C8C9C: - lsls r0, 2 - ldr r1, _080C8CAC @ =_080C8CB0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080C8CA8: .4byte gTasks -_080C8CAC: .4byte _080C8CB0 - .align 2, 0 -_080C8CB0: - .4byte _080C8CE0 - .4byte _080C8CFC - .4byte _080C8D24 - .4byte _080C8D46 - .4byte _080C8D60 - .4byte _080C8D24 - .4byte _080C8D88 - .4byte _080C8DA0 - .4byte _080C8D24 - .4byte _080C8DB4 - .4byte _080C8DCC - .4byte _080C8D24 -_080C8CE0: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - bne _080C8CEC - b _080C8E16 -_080C8CEC: - ldr r0, _080C8CF8 @ =gSharedMem + 0x19260 - movs r1, 0x70 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8CF8: .4byte gSharedMem + 0x19260 -_080C8CFC: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - bne _080C8D08 - b _080C8E16 -_080C8D08: - ldr r0, _080C8D18 @ =gSharedMem + 0x19260 - ldr r1, _080C8D1C @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8D20 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x70 - b _080C8DE4 - .align 2, 0 -_080C8D18: .4byte gSharedMem + 0x19260 -_080C8D1C: .4byte gUnknown_0203869B -_080C8D20: .4byte gBlockRecvBuffer -_080C8D24: - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r2, r0, r3 - ldrh r0, [r2, 0xA] - adds r1, r0, 0x1 - strh r1, [r2, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - ble _080C8E16 - movs r0, 0 - strh r0, [r2, 0xA] - ldrh r0, [r2, 0x8] - adds r0, 0x1 - strh r0, [r2, 0x8] - b _080C8E16 -_080C8D46: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8D5C @ =gSharedMem + 0x192D0 - movs r1, 0x14 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8D5C: .4byte gSharedMem + 0x192D0 -_080C8D60: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8D7C @ =gSharedMem + 0x192D0 - ldr r1, _080C8D80 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8D84 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x14 - b _080C8DE4 - .align 2, 0 -_080C8D7C: .4byte gSharedMem + 0x192D0 -_080C8D80: .4byte gUnknown_0203869B -_080C8D84: .4byte gBlockRecvBuffer -_080C8D88: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8D9C @ =gSharedMem + 0x19328 - movs r1, 0x4 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8D9C: .4byte gSharedMem + 0x19328 -_080C8DA0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8DB0 @ =gSharedMem + 0x19328 - b _080C8DD8 - .align 2, 0 -_080C8DB0: .4byte gSharedMem + 0x19328 -_080C8DB4: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8DC8 @ =gUnknown_02038696 - movs r1, 0x4 - bl sub_80C857C - b _080C8DE8 - .align 2, 0 -_080C8DC8: .4byte gUnknown_02038696 -_080C8DCC: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8E16 - ldr r0, _080C8DFC @ =gUnknown_02038696 -_080C8DD8: - ldr r1, _080C8E00 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8E04 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x4 -_080C8DE4: - bl memcpy -_080C8DE8: - ldr r1, _080C8E08 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _080C8E16 - .align 2, 0 -_080C8DFC: .4byte gUnknown_02038696 -_080C8E00: .4byte gUnknown_0203869B -_080C8E04: .4byte gBlockRecvBuffer -_080C8E08: .4byte gTasks -_080C8E0C: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r4, 0 - bl SwitchTaskToFollowupFunc -_080C8E16: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80C8C80 - .ifdef ENGLISH thumb_func_start sub_80C8E1C sub_80C8E1C: @ 80C8E1C diff --git a/include/contest.h b/include/contest.h index a15ca67e6..f8fceae79 100644 --- a/include/contest.h +++ b/include/contest.h @@ -278,6 +278,7 @@ extern s16 gUnknown_02038678[4]; extern s16 gUnknown_02038680[4]; extern u16 gUnknown_02038688[4]; extern u8 gContestFinalStandings[4]; +extern u8 gUnknown_02038696[4]; extern u8 gUnknown_0203869B; #endif // GUARD_CONTEST_H diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 465bb0487..84695fb37 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -529,6 +529,83 @@ void sub_80C8AD0(u8 taskId) } } +void sub_80C8C80(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + if (sub_8007ECC()) + { + sub_80C857C(sContestantStatus, 4 * sizeof(struct ContestantStatus)); + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + memcpy(sContestantStatus, gBlockRecvBuffer[gUnknown_0203869B], 4 * sizeof(struct ContestantStatus)); + gTasks[taskId].data[0]++; + } + break; + case 2: + case 5: + case 8: + case 11: + if (gTasks[taskId].data[1]++ > 10) + { + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[0]++; + } + break; + case 3: + if (sub_8007ECC()) + { + sub_80C857C(&shared192D0, sizeof shared192D0); + gTasks[taskId].data[0]++; + } + break; + case 4: + if (sub_80C85D8()) + { + memcpy(&shared192D0, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared192D0); + gTasks[taskId].data[0]++; + } + break; + case 6: + if (sub_8007ECC()) + { + sub_80C857C(&shared19328, sizeof shared19328); + gTasks[taskId].data[0]++; + } + break; + case 7: + if (sub_80C85D8()) + { + memcpy(&shared19328, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared19328); + gTasks[taskId].data[0]++; + } + break; + case 9: + if (sub_8007ECC()) + { + sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696); + gTasks[taskId].data[0]++; + } + break; + case 10: + if (sub_80C85D8()) + { + memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696); + gTasks[taskId].data[0]++; + } + break; + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + } +} + asm(".section .text_de"); #if GERMAN -- cgit v1.2.3 From bcba136599ff2cecf4eeb0e6d592186509a98a59 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Mon, 22 Jan 2018 19:33:29 -0600 Subject: disassemble debug Blender_PrintBlendingResults --- src/scene/berry_blender.c | 487 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 483 insertions(+), 4 deletions(-) diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 2535f02a6..5b013e8de 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -274,7 +274,7 @@ static void sub_8051B18(void); static void sub_805123C(void); static void sub_8050954(void); static bool8 Blender_PrintBlendingRanking(void); -static bool8 Blender_PrintBlendingResults(void); +bool8 Blender_PrintBlendingResults(void); static void sub_80510E8(void); static void sub_8050E30(void); static void sub_805197C(u16 a0, u16 a1); @@ -3278,10 +3278,489 @@ static void sub_8051C04(struct Sprite* sprite) #if DEBUG __attribute__((naked)) -static bool8 Blender_PrintBlendingResults(void) +bool8 Blender_PrintBlendingResults(void) { - // TODO: disassemble this! - asm(".incbin \"baserom_de_debug.gba\", 0x56178, 0x5655C-0x56178"); + asm(".syntax unified\n\ +loc_8056178:\n\ + PUSH {R4-R7,LR}\n\ + MOV R7, R10\n\ + MOV R6, R9\n\ + MOV R5, R8\n\ + PUSH {R5-R7}\n\ + SUB SP, SP, #0x34\n\ + LDR R1, off_805619C\n\ + LDR R0, [R1]\n\ + LDRB R0, [R0]\n\ + ADDS R2, R1, #0\n\ + CMP R0, #6 @ switch 7 cases\n\ + BLS loc_8056192\n\ + B def_805619A @ jumptable 0805619A default case\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_8056192:\n\ + LSLS R0, R0, #2\n\ + LDR R1, off_80561A0\n\ + ADDS R0, R0, R1\n\ + LDR R0, [R0]\n\ + MOV PC, R0 @ switch jump\n\ +@ ---------------------------------------------------------------------------\n\ +off_805619C: .4byte gBerryBlenderData\n\ +off_80561A0: .4byte jpt_805619A\n\ +jpt_805619A: .4byte loc_80561C0 @ jump table for switch statement\n\ + .4byte loc_80561D6 @ jumptable 0805619A case 1\n\ + .4byte loc_80561F0 @ jumptable 0805619A case 2\n\ + .4byte loc_8056240 @ jumptable 0805619A case 3\n\ + .4byte loc_805645C @ jumptable 0805619A case 4\n\ + .4byte loc_8056470 @ jumptable 0805619A case 5\n\ + .4byte loc_8056538 @ jumptable 0805619A case 6\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_80561C0: @ jumptable 0805619A case 0\n\ + LDR R1, [R2]\n\ + LDRB R0, [R1]\n\ + ADDS R0, #1\n\ + STRB R0, [R1]\n\ + LDR R0, [R2]\n\ + MOVS R1, #0x98\n\ + LSLS R1, R1, #1\n\ + ADDS R0, R0, R1\n\ + MOVS R1, #0x11\n\ + STR R1, [R0]\n\ + B def_805619A @ jumptable 0805619A default case\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_80561D6: @ jumptable 0805619A case 1\n\ + LDR R1, [R2]\n\ + MOVS R0, #0x98\n\ + LSLS R0, R0, #1\n\ + ADDS R2, R1, R0\n\ + LDR R0, [R2]\n\ + SUBS R0, #0xA\n\ + STR R0, [R2]\n\ + CMP R0, #0\n\ + BLT loc_80561EA\n\ + B def_805619A @ jumptable 0805619A default case\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_80561EA:\n\ + MOVS R0, #0\n\ + STR R0, [R2]\n\ + B loc_8056520\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_80561F0: @ jumptable 0805619A case 2\n\ + LDR R1, [R2]\n\ + MOVS R2, #0x98\n\ + LSLS R2, R2, #1\n\ + ADDS R1, R1, R2\n\ + LDR R0, [R1]\n\ + ADDS R0, #1\n\ + STR R0, [R1]\n\ + CMP R0, #0x14\n\ + BGT loc_8056204\n\ + B def_805619A @ jumptable 0805619A default case\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_8056204:\n\ + MOVS R6, #0\n\ +\n\ +loc_8056206:\n\ + LDR R4, off_8056238\n\ + LDR R0, [R4]\n\ + ADDS R0, #0x50\n\ + ADDS R0, R0, R6\n\ + LDRB R1, [R0]\n\ + LSLS R0, R1, #4\n\ + ADDS R0, R0, R1\n\ + LSLS R0, R0, #2\n\ + LDR R1, off_805623C\n\ + ADDS R0, R0, R1\n\ + BL DestroySprite\n\ + ADDS R0, R6, #1\n\ + LSLS R0, R0, #0x10\n\ + LSRS R6, R0, #0x10\n\ + CMP R6, #2\n\ + BLS loc_8056206\n\ + LDR R1, [R4]\n\ + MOVS R0, #0x98\n\ + LSLS R0, R0, #1\n\ + ADDS R2, R1, R0\n\ + MOVS R0, #0\n\ + STR R0, [R2]\n\ + B loc_8056520\n\ +@ ---------------------------------------------------------------------------\n\ + .align 2, 0\n\ +off_8056238: .4byte gBerryBlenderData\n\ +off_805623C: .4byte gSprites\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_8056240: @ jumptable 0805619A case 3\n\ + MOVS R0, #4\n\ + MOVS R1, #2\n\ + MOVS R2, #0x19\n\ + MOVS R3, #0x11\n\ + BL Menu_DrawStdWindowFrame\n\ + LDR R0, dword_805642C\n\ + MOVS R1, #5\n\ + MOVS R2, #3\n\ + MOVS R3, #0xA0\n\ + BL sub_8072BD8\n\ + MOVS R6, #0\n\ + LDR R1, off_8056430\n\ + LDR R0, [R1]\n\ + ADDS R0, #0x88\n\ + ADD R2, SP, #0xC\n\ + MOV R8, R2\n\ + MOV R2, SP\n\ + ADDS R2, #0x16\n\ + STR R2, [SP,#0x30]\n\ + LDRB R0, [R0]\n\ + CMP R6, R0\n\ + BCS loc_8056322\n\ + MOV R9, R1\n\ + LDR R0, off_8056434\n\ + MOV R10, R0\n\ +\n\ +loc_8056276:\n\ + MOV R1, R9\n\ + LDR R2, [R1]\n\ + MOVS R1, #0xB2\n\ + LSLS R1, R1, #1\n\ + ADDS R0, R2, R1\n\ + ADDS R0, R0, R6\n\ + LDRB R4, [R0]\n\ + LSLS R1, R4, #4\n\ + ADDS R1, R1, R2\n\ + MOVS R2, #0xBF\n\ + LSLS R2, R2, #1\n\ + ADDS R1, R1, R2\n\ + MOV R0, R8\n\ + BL StringCopy\n\ + LSLS R5, R4, #3\n\ + SUBS R5, R5, R4\n\ + LSLS R5, R5, #2\n\ + MOV R1, R10\n\ + ADDS R0, R5, R1\n\ + LDRB R1, [R0,#0x1A]\n\ + MOV R0, R8\n\ + BL ConvertInternationalString\n\ + MOV R0, R8\n\ + LDR R1, dword_8056438\n\ + BL de_sub_8073174\n\ + MOV R2, R9\n\ + LDR R0, [R2]\n\ + ADDS R7, R0, #0\n\ + ADDS R7, #0xAB\n\ + ADDS R4, R6, #1\n\ + ADDS R0, R7, #0\n\ + ADDS R1, R4, #0\n\ + BL ConvertIntToDecimalString\n\ + ADDS R7, R0, #0\n\ + MOVS R1, #0\n\ + STRB R1, [R7]\n\ + MOVS R0, #0xAD\n\ + STRB R0, [R7,#1]\n\ + STRB R1, [R7,#2]\n\ + ADDS R7, #3\n\ + LDR R0, off_805643C\n\ + ADDS R5, R5, R0\n\ + ADDS R0, R7, #0\n\ + ADDS R1, R5, #0\n\ + MOVS R2, #0x58\n\ + MOVS R3, #0\n\ + BL sub_8072C74\n\ + ADDS R7, R0, #0\n\ + ADD R1, SP, #0xC\n\ + MOVS R2, #0x9D\n\ + MOVS R3, #0\n\ + BL sub_8072C74\n\ + MOV R2, R9\n\ + LDR R1, [R2]\n\ + ADDS R0, R1, #0\n\ + ADDS R0, #0xAB\n\ + LDR R3, dword_8056440\n\ + ADDS R1, #0x88\n\ + LDRB R2, [R1]\n\ + ADDS R3, R2, R3\n\ + LDR R1, dword_8056444\n\ + ADDS R2, R2, R1\n\ + LDRB R1, [R2]\n\ + ADDS R2, R6, #0\n\ + MULS R2, R1\n\ + LDRB R3, [R3]\n\ + ADDS R2, R2, R3\n\ + LSLS R2, R2, #0x18\n\ + LSRS R2, R2, #0x18\n\ + MOVS R1, #5\n\ + BL Menu_PrintText\n\ + LSLS R4, R4, #0x10\n\ + LSRS R6, R4, #0x10\n\ + MOV R1, R9\n\ + LDR R0, [R1]\n\ + ADDS R0, #0x88\n\ + LDRB R0, [R0]\n\ + CMP R6, R0\n\ + BCC loc_8056276\n\ +\n\ +loc_8056322:\n\ + LDR R6, off_8056430\n\ + LDR R0, [R6]\n\ + ADDS R0, #0x5A\n\ + LDRH R0, [R0]\n\ + MOVS R1, #0x64\n\ + BL __umodsi3\n\ + ADDS R1, R0, #0\n\ + LSLS R1, R1, #0x10\n\ + LSRS R1, R1, #0x10\n\ + MOV R0, R8\n\ + MOVS R2, #2\n\ + MOVS R3, #2\n\ + BL ConvertIntToDecimalStringN\n\ + LDR R0, [R6]\n\ + ADDS R7, R0, #0\n\ + ADDS R7, #0xAB\n\ + LDR R1, dword_8056448\n\ + ADDS R0, R7, #0\n\ + BL StringCopy\n\ + ADDS R7, R0, #0\n\ + LDR R0, [R6]\n\ + ADDS R0, #0x5A\n\ + LDRH R0, [R0]\n\ + MOVS R1, #0x64\n\ + BL __udivsi3\n\ + ADDS R1, R0, #0\n\ + LSLS R1, R1, #0x10\n\ + LSRS R1, R1, #0x10\n\ + ADDS R0, R7, #0\n\ + MOVS R2, #0x79\n\ + MOVS R3, #1\n\ + BL sub_8072C14\n\ + ADDS R7, R0, #0\n\ + MOVS R0, #0xB8\n\ + STRB R0, [R7]\n\ + ADDS R7, #1\n\ + ADDS R0, R7, #0\n\ + MOV R1, R8\n\ + MOVS R2, #0x88\n\ + MOVS R3, #1\n\ + BL sub_8072C74\n\ + ADDS R7, R0, #0\n\ + LDR R1, off_805644C\n\ + BL StringCopy\n\ + LDR R0, [R6]\n\ + ADDS R0, #0xAB\n\ + MOVS R1, #5\n\ + MOVS R2, #0xD\n\ + BL Menu_PrintText\n\ + LDR R0, [R6]\n\ + MOVS R2, #0x96\n\ + LSLS R2, R2, #1\n\ + ADDS R0, R0, R2\n\ + LDR R0, [R0]\n\ + MOVS R1, #0x3C\n\ + BL __udivsi3\n\ + ADDS R4, R0, #0\n\ + LSLS R4, R4, #0x10\n\ + LSRS R4, R4, #0x10\n\ + ADDS R0, R4, #0\n\ + MOVS R1, #0x3C\n\ + BL __umodsi3\n\ + ADDS R5, R0, #0\n\ + LSLS R5, R5, #0x10\n\ + LSRS R5, R5, #0x10\n\ + ADDS R0, R4, #0\n\ + MOVS R1, #0x3C\n\ + BL __udivsi3\n\ + ADDS R1, R0, #0\n\ + LSLS R1, R1, #0x10\n\ + LSRS R1, R1, #0x10\n\ + MOV R0, R8\n\ + MOVS R2, #2\n\ + MOVS R3, #2\n\ + BL ConvertIntToDecimalStringN\n\ + LDR R0, [SP,#0x30]\n\ + ADDS R1, R5, #0\n\ + MOVS R2, #2\n\ + MOVS R3, #2\n\ + BL ConvertIntToDecimalStringN\n\ + LDR R0, [R6]\n\ + ADDS R7, R0, #0\n\ + ADDS R7, #0xAB\n\ + LDR R1, dword_8056450\n\ + ADDS R0, R7, #0\n\ + BL StringCopy\n\ + ADDS R7, R0, #0\n\ + MOV R1, R8\n\ + MOVS R2, #0x63\n\ + MOVS R3, #1\n\ + BL sub_8072C74\n\ + ADDS R7, R0, #0\n\ + LDR R1, dword_8056454\n\ + BL StringAppend\n\ + ADDS R7, R0, #0\n\ + LDR R1, [SP,#0x30]\n\ + MOVS R2, #0x88\n\ + MOVS R3, #1\n\ + BL sub_8072C74\n\ + ADDS R7, R0, #0\n\ + LDR R1, dword_8056458\n\ + BL StringCopy\n\ + LDR R0, [R6]\n\ + ADDS R0, #0xAB\n\ + MOVS R1, #5\n\ + MOVS R2, #0xF\n\ + BL Menu_PrintText\n\ + LDR R1, [R6]\n\ + MOVS R0, #0x98\n\ + LSLS R0, R0, #1\n\ + ADDS R2, R1, R0\n\ + MOVS R0, #0\n\ + STR R0, [R2]\n\ + B loc_8056520\n\ +@ ---------------------------------------------------------------------------\n\ +dword_805642C: .4byte gOtherText_ResultsOfBlending\n\ +off_8056430: .4byte gBerryBlenderData\n\ +off_8056434: .4byte gLinkPlayers\n\ +dword_8056438: .4byte gOtherText_Berry\n\ +off_805643C: .4byte gLinkPlayers+0x8\n\ +dword_8056440: .4byte gUnknown_082165E9\n\ +dword_8056444: .4byte gUnknown_082165EE\n\ +dword_8056448: .4byte gOtherText_MaxSpeed\n\ +off_805644C: .4byte gOtherText_RPM\n\ +dword_8056450: .4byte gOtherText_RequiredTime\n\ +dword_8056454: .4byte gOtherText_Min\n\ +dword_8056458: .4byte gOtherText_Sec\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_805645C: @ jumptable 0805619A case 4\n\ + LDR R0, off_805646C\n\ + LDRH R1, [R0,#0x2E]\n\ + MOVS R0, #1\n\ + ANDS R0, R1\n\ + CMP R0, #0\n\ + BEQ def_805619A @ jumptable 0805619A default case\n\ + LDR R1, [R2]\n\ + B loc_8056520\n\ +@ ---------------------------------------------------------------------------\n\ +off_805646C: .4byte gMain\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_8056470: @ jumptable 0805619A case 5\n\ + BL Menu_EraseScreen\n\ + MOVS R0, #0\n\ + MOVS R1, #0xE\n\ + MOVS R2, #0x1D\n\ + MOVS R3, #0x13\n\ + BL Menu_DrawStdWindowFrame\n\ + MOVS R6, #0\n\ + ADD R1, SP, #0xC\n\ + MOV R8, R1\n\ + ADD R5, SP, #0x28\n\ + LDR R0, off_8056528\n\ + LDR R0, [R0]\n\ + ADDS R3, R0, #0\n\ + ADDS R3, #0x80\n\ + ADD R2, SP, #0x20\n\ +\n\ +loc_8056492:\n\ + LSLS R1, R6, #1\n\ + ADDS R0, R3, R1\n\ + LDRH R0, [R0]\n\ + CMP R0, #0\n\ + BEQ loc_80564A2\n\ + ADDS R1, R2, R1\n\ + SUBS R0, #0x85\n\ + STRH R0, [R1]\n\ +\n\ +loc_80564A2:\n\ + ADDS R0, R6, #1\n\ + LSLS R0, R0, #0x10\n\ + LSRS R6, R0, #0x10\n\ + CMP R6, #3\n\ + BLS loc_8056492\n\ + BL sub_8050760\n\ + LDR R4, off_8056528\n\ + LDR R3, [R4]\n\ + MOVS R2, #0xBE\n\ + LSLS R2, R2, #1\n\ + ADDS R0, R3, R2\n\ + ADDS R1, R3, #0\n\ + ADDS R1, #0x88\n\ + LDRB R2, [R1]\n\ + SUBS R1, #0x2E\n\ + LDRH R1, [R1]\n\ + STR R1, [SP]\n\ + ADDS R1, R5, #0\n\ + ADD R3, SP, #4\n\ + BL Blender_CalculatePokeblock\n\ + LDR R1, [R4]\n\ + ADDS R1, #0xAB\n\ + ADDS R0, R5, #0\n\ + BL Blender_PrintMadePokeblockString\n\ + LDR R0, off_805652C\n\ + MOVS R1, #6\n\ + BL CreateTask\n\ + BL sub_8007E40\n\ + ADDS R1, R0, #0\n\ + MOV R0, R8\n\ + MOVS R2, #0\n\ + MOVS R3, #4\n\ + BL ConvertIntToHexStringN\n\ + LDR R1, dword_8056530\n\ + MOV R0, R8\n\ + BL StringAppend\n\ + LDR R0, [R4]\n\ + ADDS R0, #0xAB\n\ + MOV R1, R8\n\ + BL StringAppend\n\ + LDR R0, [R4]\n\ + ADDS R0, #0xAB\n\ + MOVS R1, #1\n\ + MOVS R2, #0xF\n\ + BL MenuPrintMessage\n\ + LDR R0, off_8056534\n\ + LDRH R0, [R0]\n\ + MOVS R1, #1\n\ + BL RemoveBagItem\n\ + ADDS R0, R5, #0\n\ + BL sub_810CA34\n\ + LDR R1, [R4]\n\ +\n\ +loc_8056520:\n\ + LDRB R0, [R1]\n\ + ADDS R0, #1\n\ + STRB R0, [R1]\n\ + B def_805619A @ jumptable 0805619A default case\n\ +@ ---------------------------------------------------------------------------\n\ +off_8056528: .4byte gBerryBlenderData\n\ +off_805652C: .4byte sub_8052BD0+1\n\ +dword_8056530: .4byte gUnknown_08216249\n\ +off_8056534: .4byte gSpecialVar_ItemId\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +loc_8056538: @ jumptable 0805619A case 6\n\ + BL Menu_UpdateWindowText\n\ + LSLS R0, R0, #0x18\n\ + CMP R0, #0\n\ + BEQ def_805619A @ jumptable 0805619A default case\n\ + BL Blender_TrySettingRecord\n\ + MOVS R0, #1\n\ + B loc_805654C\n\ +@ ---------------------------------------------------------------------------\n\ +\n\ +def_805619A: @ jumptable 0805619A default case\n\ + MOVS R0, #0\n\ +\n\ +loc_805654C:\n\ + ADD SP, SP, #0x34\n\ + POP {R3-R5}\n\ + MOV R8, R3\n\ + MOV R9, R4\n\ + MOV R10, R5\n\ + POP {R4-R7}\n\ + POP {R1}\n\ + BX R1\n\ + .syntax divided\n"); } #else static bool8 Blender_PrintBlendingResults(void) -- cgit v1.2.3 From 765b2ffe3f7f49e49cc416a930a6e60ee265ce14 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 20:38:05 -0500 Subject: sub_80C8E1C --- asm/contest_link_80C857C.s | 210 -------------------------------------- src/battle/contest_link_80C857C.c | 68 ++++++++++++ 2 files changed, 68 insertions(+), 210 deletions(-) diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index a27a96253..27cdfd2a3 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -5,216 +5,6 @@ .text -.ifdef ENGLISH - thumb_func_start sub_80C8E1C -sub_80C8E1C: @ 80C8E1C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, _080C8E4C @ =gTasks - mov r8, r0 - lsls r6, r5, 2 - adds r0, r6, r5 - lsls r7, r0, 3 - mov r1, r8 - adds r4, r7, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8E50 - cmp r0, 0x1 - beq _080C8E7C - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C8EAE - .align 2, 0 -_080C8E4C: .4byte gTasks -_080C8E50: - ldr r1, _080C8E78 @ =gBlockSendBuffer - movs r0, 0x64 - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C8E70 - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8EAE - movs r0, 0x2 - bl sub_8007E9C -_080C8E70: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080C8EAE - .align 2, 0 -_080C8E78: .4byte gBlockSendBuffer -_080C8E7C: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8EAE - ldr r1, _080C8EB8 @ =gBlockRecvBuffer - mov r0, r8 - adds r0, 0x12 - adds r2, r7, r0 - movs r4, 0x80 - lsls r4, 1 - movs r3, 0x3 -_080C8E94: - ldrh r0, [r1] - strh r0, [r2] - adds r1, r4 - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080C8E94 - adds r1, r6, r5 - lsls r1, 3 - add r1, r8 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_080C8EAE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C8EB8: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8E1C -.else - thumb_func_start sub_80C8E1C -sub_80C8E1C: @ 80C8E1C - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _080C8E40 @ =gTasks - lsls r4, r5, 2 - adds r0, r4, r5 - lsls r6, r0, 3 - adds r2, r6, r1 - movs r3, 0x8 - ldrsh r0, [r2, r3] - adds r7, r1, 0 - cmp r0, 0x1 - beq _080C8EB0 - cmp r0, 0x1 - bgt _080C8E44 - cmp r0, 0 - beq _080C8E4C - b _080C8EF8 - .align 2, 0 -_080C8E40: .4byte gTasks -_080C8E44: - cmp r0, 0x2 - beq _080C8EEC - cmp r0, 0x8 - bne _080C8EF8 -_080C8E4C: - ldr r1, _080C8E80 @ =gBlockSendBuffer - movs r0, 0x64 - strb r0, [r1] - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _080C8E9A - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8F06 - ldr r0, _080C8E84 @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r4, r1, r0 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080C8E88 - movs r0, 0x3 - strh r0, [r4, 0x8] - b _080C8F06 - .align 2, 0 -_080C8E80: .4byte gBlockSendBuffer -_080C8E84: .4byte gTasks -_080C8E88: - movs r0, 0 - bl de_sub_80C9274 - movs r0, 0x2 - bl sub_8007E9C - movs r0, 0x1 - strh r0, [r4, 0x8] - b _080C8F06 -_080C8E9A: - movs r0, 0 - bl de_sub_80C9294 - ldr r0, _080C8EAC @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - b _080C8EDE - .align 2, 0 -_080C8EAC: .4byte gTasks -_080C8EB0: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8F06 - adds r1, r4, 0 - ldr r4, _080C8EE8 @ =gBlockRecvBuffer - adds r0, r7, 0 - adds r0, 0x12 - adds r2, r6, r0 - movs r6, 0x80 - lsls r6, 1 - movs r3, 0x3 -_080C8ECA: - ldrh r0, [r4] - strh r0, [r2] - adds r4, r6 - adds r2, 0x2 - subs r3, 0x1 - cmp r3, 0 - bge _080C8ECA - adds r1, r5 - lsls r1, 3 - adds r1, r7 -_080C8EDE: - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _080C8F06 - .align 2, 0 -_080C8EE8: .4byte gBlockRecvBuffer -_080C8EEC: - movs r0, 0 - strh r0, [r2, 0x8] - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc - b _080C8F06 -_080C8EF8: - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r7 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] -_080C8F06: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80C8E1C -.endif - thumb_func_start sub_80C8EBC sub_80C8EBC: @ 80C8EBC push {r4,lr} diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 84695fb37..f505fa658 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -606,6 +606,74 @@ void sub_80C8C80(u8 taskId) } } +void sub_80C8E1C(u8 taskId) +{ + int i; + + switch (gTasks[taskId].data[0]) + { +#if ENGLISH + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; +#elif GERMAN + case 8: +#endif + case 0: + gBlockSendBuffer[0] = 0x64; + if (GetMultiplayerId() == 0) + { + if (sub_8007ECC()) + { +#if GERMAN + if (gTasks[taskId].data[0] == 0) + { + gTasks[taskId].data[0] = 3; + } + else + { + de_sub_80C9274(FALSE); +#endif + sub_8007E9C(2); +#if ENGLISH + gTasks[taskId].data[0]++; +#else + gTasks[taskId].data[0] = 1; + } +#endif + } + } + else + { +#if GERMAN + de_sub_80C9294(FALSE); +#endif + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + for (i = 0; i < MAX_LINK_PLAYERS; i++) + { + gTasks[taskId].data[5 + i] = gBlockRecvBuffer[i][0]; + } + gTasks[taskId].data[0]++; + } + break; +#if GERMAN + case 2: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + default: + gTasks[taskId].data[0]++; + break; +#endif + } +} + asm(".section .text_de"); #if GERMAN -- cgit v1.2.3 From c9629085f5e4f5be557817ebe026abcbda33f366 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Mon, 22 Jan 2018 19:40:50 -0600 Subject: remove raw pointers from event_scripts.s --- data-de/event_scripts.s | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 6fbd760fa..4ca5992e6 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -3283,7 +3283,7 @@ Route101_EventScript_1A14DC:: @ 81A14DC DebugScript_081C1CFE:: @ 81C1CFE setflag 0x804 - call 0x81C032D + call EverGrandeCity_HallOfFame_EventScript_19FC13 end DebugScript_081C1D07:: @ 81C1D07 @@ -3297,7 +3297,7 @@ DebugScript_081C1D1D:: @ 81C1D1D end DebugScript_081C1D1E:: @ 81C1D1E - goto 0x8167646 + goto Route103_EventScript_14ED46 DebugScript_081C1D23:: @ 81C1D23 end @@ -3747,42 +3747,50 @@ DebugScript_081C23FD:: @ 81C23FD compare 0x800d, 1 goto_if_eq DebugScript_081C2436 compare 0x800d, 2 - goto_if_eq 0x81C2445 + goto_if_eq DebugScript_081C2445 compare 0x800d, 3 - goto_if_eq 0x81C2454 + goto_if_eq DebugScript_081C2454 compare 0x800d, 4 - goto_if_eq 0x81C2463 + goto_if_eq DebugScript_081C2463 compare 0x800d, 5 - goto_if_eq 0x81C2472 + goto_if_eq DebugScript_081C2472 end DebugScript_081C2436:: @ 81C2436 givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2445: givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2454: givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2463: givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2472: givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 end DebugScript_081C2482:: @ 81C2482 getpartysize compare 0x800d, 1 - goto_if_eq 0x81C24BB + goto_if_eq DebugScript_081C24BB compare 0x800d, 2 - goto_if_eq 0x81C24CA + goto_if_eq DebugScript_081C24CA compare 0x800d, 3 - goto_if_eq 0x81C24D9 + goto_if_eq DebugScript_081C24D9 compare 0x800d, 4 - goto_if_eq 0x81C24E8 + goto_if_eq DebugScript_081C24E8 compare 0x800d, 5 - goto_if_eq 0x81C24F7 + goto_if_eq DebugScript_081C24F7 end DebugScript_081C24BB:: @ 81C24BB givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24CA: givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24D9: givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24E8: givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24F7: givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 end -- cgit v1.2.3 From c723b341c50df19f8951353a7efd4ab83bf56833 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 20:52:41 -0500 Subject: through sub_80C8F34 --- asm/contest_link_80C857C.s | 130 -------------------------------------- include/contest.h | 2 + ld_script.txt | 2 - src/battle/contest_link_80C857C.c | 60 ++++++++++++++++-- src/contest_ai.c | 1 - src/debug/matsuda_debug_menu.c | 1 - src/script_pokemon_util_80C4BF0.c | 1 - 7 files changed, 56 insertions(+), 141 deletions(-) delete mode 100644 asm/contest_link_80C857C.s diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s deleted file mode 100644 index 27cdfd2a3..000000000 --- a/asm/contest_link_80C857C.s +++ /dev/null @@ -1,130 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_80C8EBC -sub_80C8EBC: @ 80C8EBC - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C8EE4 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8EE8_B - cmp r0, 0x1 - beq _080C8F00 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8F22 - .align 2, 0 -_080C8EE4: .4byte gTasks -_080C8EE8_B: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8F22 - ldr r0, _080C8EFC @ =gUnknown_02038670 - movs r1, 0x8 - bl sub_80C857C - b _080C8F1C - .align 2, 0 -_080C8EFC: .4byte gUnknown_02038670 -_080C8F00: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8F22 - ldr r0, _080C8F28 @ =gUnknown_02038670 - ldr r1, _080C8F2C @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8F30 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x8 - bl memcpy -_080C8F1C: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080C8F22: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C8F28: .4byte gUnknown_02038670 -_080C8F2C: .4byte gUnknown_0203869B -_080C8F30: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8EBC - - thumb_func_start sub_80C8F34 -sub_80C8F34: @ 80C8F34 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _080C8F5C @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080C8F60 - cmp r0, 0x1 - beq _080C8F78 - movs r0, 0 - strh r0, [r4, 0x8] - adds r0, r2, 0 - bl SwitchTaskToFollowupFunc - b _080C8F9A - .align 2, 0 -_080C8F5C: .4byte gTasks -_080C8F60: - bl sub_8007ECC - lsls r0, 24 - cmp r0, 0 - beq _080C8F9A - ldr r0, _080C8F74 @ =gUnknown_02038696 - movs r1, 0x4 - bl sub_80C857C - b _080C8F94 - .align 2, 0 -_080C8F74: .4byte gUnknown_02038696 -_080C8F78: - bl sub_80C85D8 - lsls r0, 24 - cmp r0, 0 - beq _080C8F9A - ldr r0, _080C8FA0 @ =gUnknown_02038696 - ldr r1, _080C8FA4 @ =gUnknown_0203869B - ldrb r1, [r1] - lsls r1, 8 - ldr r2, _080C8FA8 @ =gBlockRecvBuffer - adds r1, r2 - movs r2, 0x4 - bl memcpy -_080C8F94: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080C8F9A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080C8FA0: .4byte gUnknown_02038696 -_080C8FA4: .4byte gUnknown_0203869B -_080C8FA8: .4byte gBlockRecvBuffer - thumb_func_end sub_80C8F34 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/contest.h b/include/contest.h index f8fceae79..b0bdd7f61 100644 --- a/include/contest.h +++ b/include/contest.h @@ -274,6 +274,8 @@ struct UnknownContestStruct6 extern u8 gContestPlayerMonIndex; extern u8 gIsLinkContest; extern u32 gContestRngValue; +extern u8 gUnknown_02038696[4]; +extern s16 gUnknown_02038670[4]; extern s16 gUnknown_02038678[4]; extern s16 gUnknown_02038680[4]; extern u16 gUnknown_02038688[4]; diff --git a/ld_script.txt b/ld_script.txt index 411d282d1..fc13444f1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -170,8 +170,6 @@ SECTIONS { src/field/rotating_gate.o(.text); src/field/safari_zone.o(.text); src/battle/contest_link_80C857C.o(.text); - asm/contest_link_80C857C.o(.text); - src/battle/contest_link_80C857C.o(.text_de); src/field/item_use.o(.text); src/battle/anim/powder.o(.text); src/battle/anim/orbs.o(.text); diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index f505fa658..e85350aea 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -228,11 +228,11 @@ void sub_80C8734(u8 taskId) de_sub_80C9274(FALSE); #endif sub_8007E9C(2); -#if GERMAN - gTasks[taskId].data[0] = 1; - } -#else +#if ENGLISH gTasks[taskId].data[0]++; +#elif GERMAN + gTasks[taskId].data[0] = 1; + } #endif } } @@ -638,7 +638,7 @@ void sub_80C8E1C(u8 taskId) sub_8007E9C(2); #if ENGLISH gTasks[taskId].data[0]++; -#else +#elif GERMAN gTasks[taskId].data[0] = 1; } #endif @@ -674,7 +674,55 @@ void sub_80C8E1C(u8 taskId) } } -asm(".section .text_de"); +void sub_80C8EBC(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + case 0: + if (sub_8007ECC()) + { + sub_80C857C(gUnknown_02038670, sizeof gUnknown_02038670); + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + memcpy(gUnknown_02038670, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038670); + gTasks[taskId].data[0]++; + } + break; + } +} + +void sub_80C8F34(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + default: + gTasks[taskId].data[0] = 0; + SwitchTaskToFollowupFunc(taskId); + break; + case 0: + if (sub_8007ECC()) + { + sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696); + gTasks[taskId].data[0]++; + } + break; + case 1: + if (sub_80C85D8()) + { + memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696); + gTasks[taskId].data[0]++; + } + break; + } +} #if GERMAN diff --git a/src/contest_ai.c b/src/contest_ai.c index 66b387270..1e249083b 100644 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -8,7 +8,6 @@ extern u8 AreMovesContestCombo(u16, u16); extern bool8 sub_80B214C(u8); extern bool8 Contest_IsMonsTurnDisabled(u8); -extern s16 gUnknown_02038670[]; extern u16 gSpecialVar_ContestCategory; extern u8 *gAIScriptPtr; diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index 15d28df09..efd952ef7 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -18,7 +18,6 @@ #include "ewram.h" extern u8 gUnknown_0203856C; -extern s16 gUnknown_02038670[]; extern u8 gUnknown_02038694; extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index 513f6ce2a..02e66d313 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -39,7 +39,6 @@ extern u16 gSpecialVar_ContestRank; extern u8 gUnknown_02038694; extern u8 gUnknown_0203856C; -extern s16 gUnknown_02038670[]; void SetContestTrainerGfxIds(void) { -- cgit v1.2.3 From cc0d7a675d5fc85adac3bd94387c54e0eb507495 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 22 Jan 2018 21:01:33 -0500 Subject: Rename some static functions --- asm/contest_link_80C2020.s | 4 +- include/link.h | 2 +- src/battle/battle_2.c | 16 +++--- src/battle/contest_link_80C857C.c | 104 +++++++++++++++++++------------------- src/engine/link.c | 9 +--- src/engine/trade.c | 16 +++--- src/field/field_fadetransition.c | 2 +- src/rom3.c | 2 +- src/scene/berry_blender.c | 16 +++--- 9 files changed, 83 insertions(+), 88 deletions(-) diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 8a0f096f0..891711bc5 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -657,7 +657,7 @@ sub_80C25C0: @ 80C25C0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8007ECC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 beq _080C25EC @@ -5778,7 +5778,7 @@ sub_80C4B5C: @ 80C4B5C ldrh r0, [r0] cmp r0, 0x1 bne _080C4B90 - bl sub_8007ECC + bl IsLinkTaskFinished lsls r0, 24 cmp r0, 0 beq _080C4B9E diff --git a/include/link.h b/include/link.h index 367add625..6581fdbba 100644 --- a/include/link.h +++ b/include/link.h @@ -167,7 +167,7 @@ u8 GetMultiplayerId(void); u8 bitmask_all_link_players_but_self(void); bool8 SendBlock(u8, void *, u16); bool8 sub_8007E9C(u8); -bool8 sub_8007ECC(void); +bool8 IsLinkTaskFinished(void); u8 GetBlockReceivedStatus(void); void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlag(u8); diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index b00c35312..2ad2adb04 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -396,7 +396,7 @@ void sub_800EC9C(void) case 0: if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) + if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished()) { gBattleStruct->unk0 = 1; gBattleStruct->unk1 = 1; @@ -464,7 +464,7 @@ void sub_800EC9C(void) } break; case 2: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(*gPlayerParty) * 2); gBattleCommunication[0]++; @@ -479,7 +479,7 @@ void sub_800EC9C(void) } break; case 4: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(*gPlayerParty) * 2); gBattleCommunication[0]++; @@ -494,7 +494,7 @@ void sub_800EC9C(void) } break; case 6: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(*gPlayerParty) * 2); gBattleCommunication[0]++; @@ -579,7 +579,7 @@ void sub_800F104(void) switch (gBattleCommunication[0]) { case 0: - if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) + if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished()) { sub_800F02C(); SendBlock(bitmask_all_link_players_but_self(), gSharedMem, 0x60); @@ -639,7 +639,7 @@ void sub_800F298(void) switch (gBattleCommunication[0]) { case 0: - if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) + if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished()) { gBattleStruct->unk0 = 1; gBattleStruct->unk1 = 1; @@ -732,7 +732,7 @@ void sub_800F298(void) break; case 2: step_2: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { SendBlock(bitmask_all_link_players_but_self(), ewram1D000, sizeof(struct Pokemon) * 2); gBattleCommunication[0]++; @@ -795,7 +795,7 @@ void sub_800F298(void) } break; case 4: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { SendBlock(bitmask_all_link_players_but_self(), ewram1D000 + 2, sizeof(struct Pokemon)); gBattleCommunication[0]++; diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index e85350aea..01088bf53 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -10,17 +10,17 @@ static void sub_80C8644(u8 taskId); static void sub_80C8660(u8 taskId); #if GERMAN -void de_sub_80C9274(bool32 arg0); -void de_sub_80C9294(bool32 arg0); +static void de_sub_80C9274(bool32 arg0); +static void de_sub_80C9294(bool32 arg0); #endif -void sub_80C857C(const void *data, u16 size) +static void SendBlockToAllOpponents(const void *data, u16 size) { memcpy(eContestLinkSendBuffer, data, size); SendBlock(bitmask_all_link_players_but_self(), eContestLinkSendBuffer, size); } -bool8 sub_80C85AC(u8 who) +static bool8 HasPlayerReceivedBlock(u8 who) { u8 flag = 1 << who; if (!(GetBlockReceivedStatus() & flag)) @@ -29,7 +29,7 @@ bool8 sub_80C85AC(u8 who) return TRUE; } -bool8 sub_80C85D8(void) +static bool8 HaveAllPlayersReceivedBlock(void) { int i; @@ -214,7 +214,7 @@ void sub_80C8734(u8 taskId) #endif case 0: if (GetMultiplayerId() == 0) { - if (sub_8007ECC()) { + if (IsLinkTaskFinished()) { #if GERMAN if (gTasks[taskId].data[0] == 0) { @@ -246,7 +246,7 @@ void sub_80C8734(u8 taskId) } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { for (i = 0; i < MAX_LINK_PLAYERS; i++) { @@ -308,9 +308,9 @@ void sub_80C88AC(u8 taskId) case 0: if (GetMultiplayerId() == 0) { - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(&gRngValue, sizeof(u32)); + SendBlockToAllOpponents(&gRngValue, sizeof(u32)); gTasks[taskId].data[0]++; } } @@ -320,7 +320,7 @@ void sub_80C88AC(u8 taskId) } break; case 1: - if (sub_80C85AC(0)) + if (HasPlayerReceivedBlock(0)) { memcpy(&gRngValue, gBlockRecvBuffer[0], sizeof(u32)); memcpy(&gContestRngValue, gBlockRecvBuffer[0], sizeof(u32)); @@ -348,7 +348,7 @@ void sub_80C8938(u8 taskId) gBlockSendBuffer[0] = gTasks[taskId].data[9]; if (GetMultiplayerId() == 0) { - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { #if GERMAN if (gTasks[taskId].data[0] == 0) @@ -377,7 +377,7 @@ void sub_80C8938(u8 taskId) } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { for (i = 0; i < MAX_LINK_PLAYERS; i++) { @@ -407,14 +407,14 @@ void sub_80C89DC(u8 taskId) SwitchTaskToFollowupFunc(taskId); break; case 0: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(&gContestPlayerMonIndex, sizeof(u8)); + SendBlockToAllOpponents(&gContestPlayerMonIndex, sizeof(u8)); gTasks[taskId].data[0]++; } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { gTasks[taskId].data[0]++; } @@ -433,14 +433,14 @@ void sub_80C8A38(u8 taskId) SwitchTaskToFollowupFunc(taskId); break; case 0: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(&sContestantStatus[gContestPlayerMonIndex].currMove, sizeof(u16)); + SendBlockToAllOpponents(&sContestantStatus[gContestPlayerMonIndex].currMove, sizeof(u16)); gTasks[taskId].data[0]++; } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { for (i = 0; i < MAX_LINK_PLAYERS; i++) { @@ -457,14 +457,14 @@ void sub_80C8AD0(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(gUnknown_02038678, sizeof gUnknown_02038678); + SendBlockToAllOpponents(gUnknown_02038678, sizeof gUnknown_02038678); gTasks[taskId].data[0]++; } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(gUnknown_02038678, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038678); gTasks[taskId].data[0]++; @@ -481,42 +481,42 @@ void sub_80C8AD0(u8 taskId) } break; case 3: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(gUnknown_02038680, sizeof gUnknown_02038680); + SendBlockToAllOpponents(gUnknown_02038680, sizeof gUnknown_02038680); gTasks[taskId].data[0]++; } break; case 4: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(gUnknown_02038680, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038680); gTasks[taskId].data[0]++; } break; case 6: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(gUnknown_02038688, sizeof gUnknown_02038688); + SendBlockToAllOpponents(gUnknown_02038688, sizeof gUnknown_02038688); gTasks[taskId].data[0]++; } break; case 7: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(gUnknown_02038688, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038688); gTasks[taskId].data[0]++; } break; case 9: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(gContestFinalStandings, sizeof gContestFinalStandings); + SendBlockToAllOpponents(gContestFinalStandings, sizeof gContestFinalStandings); gTasks[taskId].data[0]++; } break; case 10: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(gContestFinalStandings, gBlockRecvBuffer[gUnknown_0203869B], sizeof gContestFinalStandings); gTasks[taskId].data[0]++; @@ -534,14 +534,14 @@ void sub_80C8C80(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(sContestantStatus, 4 * sizeof(struct ContestantStatus)); + SendBlockToAllOpponents(sContestantStatus, 4 * sizeof(struct ContestantStatus)); gTasks[taskId].data[0]++; } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(sContestantStatus, gBlockRecvBuffer[gUnknown_0203869B], 4 * sizeof(struct ContestantStatus)); gTasks[taskId].data[0]++; @@ -558,42 +558,42 @@ void sub_80C8C80(u8 taskId) } break; case 3: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(&shared192D0, sizeof shared192D0); + SendBlockToAllOpponents(&shared192D0, sizeof shared192D0); gTasks[taskId].data[0]++; } break; case 4: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(&shared192D0, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared192D0); gTasks[taskId].data[0]++; } break; case 6: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(&shared19328, sizeof shared19328); + SendBlockToAllOpponents(&shared19328, sizeof shared19328); gTasks[taskId].data[0]++; } break; case 7: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(&shared19328, gBlockRecvBuffer[gUnknown_0203869B], sizeof shared19328); gTasks[taskId].data[0]++; } break; case 9: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696); + SendBlockToAllOpponents(gUnknown_02038696, sizeof gUnknown_02038696); gTasks[taskId].data[0]++; } break; case 10: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696); gTasks[taskId].data[0]++; @@ -624,7 +624,7 @@ void sub_80C8E1C(u8 taskId) gBlockSendBuffer[0] = 0x64; if (GetMultiplayerId() == 0) { - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { #if GERMAN if (gTasks[taskId].data[0] == 0) @@ -653,7 +653,7 @@ void sub_80C8E1C(u8 taskId) } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { for (i = 0; i < MAX_LINK_PLAYERS; i++) { @@ -683,14 +683,14 @@ void sub_80C8EBC(u8 taskId) SwitchTaskToFollowupFunc(taskId); break; case 0: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(gUnknown_02038670, sizeof gUnknown_02038670); + SendBlockToAllOpponents(gUnknown_02038670, sizeof gUnknown_02038670); gTasks[taskId].data[0]++; } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(gUnknown_02038670, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038670); gTasks[taskId].data[0]++; @@ -708,14 +708,14 @@ void sub_80C8F34(u8 taskId) SwitchTaskToFollowupFunc(taskId); break; case 0: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { - sub_80C857C(gUnknown_02038696, sizeof gUnknown_02038696); + SendBlockToAllOpponents(gUnknown_02038696, sizeof gUnknown_02038696); gTasks[taskId].data[0]++; } break; case 1: - if (sub_80C85D8()) + if (HaveAllPlayersReceivedBlock()) { memcpy(gUnknown_02038696, gBlockRecvBuffer[gUnknown_0203869B], sizeof gUnknown_02038696); gTasks[taskId].data[0]++; @@ -726,7 +726,7 @@ void sub_80C8F34(u8 taskId) #if GERMAN -void de_sub_80C9274(bool32 arg0) +static void de_sub_80C9274(bool32 arg0) { if (deUnkValue2 == 1) { @@ -737,7 +737,7 @@ void de_sub_80C9274(bool32 arg0) } } -void de_sub_80C9294(bool32 arg0) +static void de_sub_80C9294(bool32 arg0) { if (deUnkValue2 == 1) { diff --git a/src/engine/link.c b/src/engine/link.c index ec94295d7..33037b817 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -898,14 +898,9 @@ bool8 sub_8007E9C(u8 a1) } } -bool8 sub_8007ECC(void) +bool8 IsLinkTaskFinished(void) { - u8 retVal = FALSE; - - if (!gLinkCallback) - retVal = TRUE; - - return retVal; + return gLinkCallback == NULL; } u8 GetBlockReceivedStatus(void) diff --git a/src/engine/trade.c b/src/engine/trade.c index 4dc27ea6f..4bd39c4ef 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -1711,7 +1711,7 @@ static bool8 sub_8048D44(void) gUnknown_03004824->unk_0075 ++; break; case 1: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { if (GetBlockReceivedStatus() == 0) { @@ -2210,7 +2210,7 @@ static void sub_8049A20(void) { sub_804AADC(3, 1); gUnknown_03004824->linkData[0] = 0xbbbb; - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { Trade_SendData(gUnknown_03004824); } @@ -2239,7 +2239,7 @@ static void sub_8049AC0(void) else { sub_804AADC(3, 1); - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { gUnknown_03004824->linkData[0] = 0xbbcc; Trade_SendData(gUnknown_03004824); @@ -4632,7 +4632,7 @@ static void sub_804BB78(void) switch (gUnknown_03004828->unk_00bd) { case 1: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { Trade_SendData(gUnknown_03004828); gUnknown_03004828->unk_00bd ++; @@ -5534,13 +5534,13 @@ static void sub_804DC88(void) gMain.state = 101; gUnknown_03004828->unk_00c0 = 0; } - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { gMain.state = 2; } break; case 101: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { gMain.state = 2; } @@ -5592,7 +5592,7 @@ static void sub_804DC88(void) gMain.state = 42; break; case 42: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { sub_8125E04(); gSoftResetDisabled = FALSE; @@ -5607,7 +5607,7 @@ static void sub_804DC88(void) } break; case 6: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { BeginNormalPaletteFade(-1, 0, 0, 16, 0); gMain.state ++; diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c index ad1cd4a59..d68be3b36 100644 --- a/src/field/field_fadetransition.c +++ b/src/field/field_fadetransition.c @@ -146,7 +146,7 @@ void sub_8080A5C(u8 taskId) task->data[0]++; break; case 1: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { pal_fill_for_map_transition(); task->data[0]++; diff --git a/src/rom3.c b/src/rom3.c index 713713162..000de8356 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -463,7 +463,7 @@ void sub_800C1A8(u8 taskId) } break; case 4: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { var = (ewram14004arr(0, gTasks[taskId].data[15]) | (ewram14004arr(1, gTasks[taskId].data[15]) << 8)); gTasks[taskId].data[13] = 1; diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 7567899ae..2cb68ccf1 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -1163,7 +1163,7 @@ static void sub_804E9F8(void) gBerryBlenderData->framesToWait = 0; break; case 9: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { ResetBlockReceivedFlags(); if (GetMultiplayerId() == 0) @@ -1215,7 +1215,7 @@ static void sub_804E9F8(void) } break; case 13: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { gBerryBlenderData->field_0++; sub_8051414(&gBerryBlenderData->field_168); @@ -1257,7 +1257,7 @@ static void sub_804E9F8(void) gBerryBlenderData->field_0++; break; case 20: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { sub_8007E24(); gBerryBlenderData->field_0++; @@ -2506,7 +2506,7 @@ static void sub_8050954(void) case 3: if (/*multiplayerID != 0*/ GetMultiplayerId() != 0) gBerryBlenderData->field_6F++; - else if (sub_8007ECC()) + else if (IsLinkTaskFinished()) { gBerryBlenderData->field_1BC = gBerryBlenderData->gameFrameTime; gBerryBlenderData->field_1C0 = gBerryBlenderData->max_RPM; @@ -2646,7 +2646,7 @@ bool8 sub_8050CE8(void) gBerryBlenderData->framesToWait = 0; break; case 1: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { gBerryBlenderData->field_1C4++; gSoftResetDisabled = TRUE; @@ -2665,7 +2665,7 @@ bool8 sub_8050CE8(void) } break; case 4: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { if (sub_8125E6C()) gBerryBlenderData->field_1C4 = 5; @@ -2752,7 +2752,7 @@ static void sub_8050E30(void) gBerryBlenderData->field_6F++; break; case 6: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { gBerryBlenderData->framesToWait = 0; gBerryBlenderData->field_6F++; @@ -2771,7 +2771,7 @@ static void sub_8050E30(void) sub_80084A4(); break; case 9: - if (sub_8007ECC()) + if (IsLinkTaskFinished()) { BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gBerryBlenderData->field_6F++; -- cgit v1.2.3 From 1685a7977a652f35998a717395407d625878e20e Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Mon, 22 Jan 2018 21:42:14 -0600 Subject: dump some debug baseroms --- data/btl_attrs.s | 60 ++++++++++++++++++++++++- data/debug_menu_watanabe.s | 97 +++++++++++++++++++++++++++++++++++------ data/debug_unk_0.inc | 57 ------------------------ data/graphics.s | 8 ---- include/pokeblock.h | 14 ++++-- src/battle/battle_2.c | 4 +- src/debug/watanabe_debug_menu.c | 4 +- src/field/pokeblock.c | 25 +++++++---- 8 files changed, 173 insertions(+), 96 deletions(-) delete mode 100644 data/debug_unk_0.inc diff --git a/data/btl_attrs.s b/data/btl_attrs.s index 1628f9018..5f44a87b8 100644 --- a/data/btl_attrs.s +++ b/data/btl_attrs.s @@ -204,8 +204,64 @@ gSpriteTemplate_81F96D0:: @ 81F96D0 spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828 .if DEBUG -UnkDebug0:: - .include "data/debug_unk_0.inc" + +UnkDebug0:: @ 0x821F3B8 + .incbin "baserom_de_debug.gba", 0x21F3B8, 620 + +Str_821F624:: @ 0x821F624 + .string "ーーーーーーーーーーーー$" + +str_821F631:: @ 0x821F631 + .string "ジュンイチ$" + .string "ダイゴロウ$" + .string "バレンシア$" + .string "ハルコマチ$" + +Str_821F649:: @ 0x821F649 + .string "てつじ$" + +debug_unk_0b:: +@ 0x821F64D + .string "  オン$" + +@ 0x821F652 + .string "オフ$" + +@ 0x821F655 + .string "モノラル$" + +@ 0x821F65A + .string "ステレオ$" + +@ 0x821F65F + .string "テストです$" + +@ 0x821F665 + .string "うけとったって$" + +@ 0x821F66D + .string "せつぞくエラー$" + +.incbin "baserom_de_debug.gba", 0x21F675, 323 + +Str_821F7B8:: @ 0x821F7B8 + .string "たかさ $" + +Str_821F7BD:: @ 0x821F7BD + .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}たかさ   ひこう\n" + .string "ポケモン  ファイル$" + +Str_821F7DA:: @ 0x821F7DA + .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}ロード\n" + .string "セーブ$" + +Str_821F7EA:: @ 0x821F7EA + .string "ロードしますか?$" + +@ 0x821F7F3 +gUnknown_Debug_821F7F3:: + .string "セーブしますか?$" + .endif .align 2 diff --git a/data/debug_menu_watanabe.s b/data/debug_menu_watanabe.s index 3af2f893f..58f9b21fd 100644 --- a/data/debug_menu_watanabe.s +++ b/data/debug_menu_watanabe.s @@ -612,19 +612,60 @@ gUnknown_Debug_083F875C:: @ 0x83F875C .string "DebugーG$" gUnknown_Debug_083F8764:: - .incbin "baserom_de_debug.gba", 0x3F8764, 4 + .string " $" + .byte 0, 0 gUnknown_Debug_083F8768:: - .incbin "baserom_de_debug.gba", 0x3F8768, 40 + .4byte 0x00000001 + .4byte 0x0000000a + .4byte 0x00000064 + .4byte 0x000003e8 + .4byte 0x00002710 + .4byte 0x000186a0 + .4byte 0x000f4240 + .4byte 0x00989680 + .4byte 0x05f5e100 + .4byte 0x3b9aca00 gUnknown_Debug_083F8790:: - .incbin "baserom_de_debug.gba", 0x3F8790, 64 + .2byte 0x0000 + .2byte 0x0002 + .2byte 0x0004 + .2byte 0x0006 + .2byte 0x0008 + .2byte 0x000a + .2byte 0x000c + .2byte 0x000e + .2byte 0x0010 + .2byte 0x0012 + .2byte 0x0014 + .2byte 0x0016 + .2byte 0x0018 + .2byte 0x001a + .2byte 0x001c + .2byte 0x001e + .2byte 0x001f + .2byte 0x001e + .2byte 0x001c + .2byte 0x001a + .2byte 0x0018 + .2byte 0x0016 + .2byte 0x0014 + .2byte 0x0012 + .2byte 0x0010 + .2byte 0x000e + .2byte 0x000c + .2byte 0x000a + .2byte 0x0008 + .2byte 0x0006 + .2byte 0x0004 + .2byte 0x0002 gUnknown_Debug_083F87D0:: @ 0x83F87D0 .string "{COLOR RED}L{ESCAPE}ロ$" gUnknown_Debug_083F87D8:: @ 0x83F87D8 -.string "{COLOR RED}{ESCAPE}ワR$" + .string "{COLOR RED}{ESCAPE}ワR$" gUnknown_Debug_083F87E0:: @ 0x83F87E0 .string "かいはつナンバー$" @@ -642,7 +683,24 @@ gUnknown_Debug_083F8813:: @ 0x83F8813 .string ":$" gUnknown_Debug_083F8815:: - .incbin "baserom_de_debug.gba", 0x3F8815, 18 + .byte 0x00 + .byte 0x10 + .byte 0x20 + .byte 0x20 + .byte 0x20 + .byte 0x21 + .byte 0x20 + .byte 0x20 + .byte 0x20 + .byte 0x21 + .byte 0x20 + .byte 0x20 + .byte 0x20 + .byte 0x21 + .byte 0x20 + .byte 0x20 + .byte 0x20 + .byte 0x21 .align 2 stru_83F8828:: @@ -653,16 +711,29 @@ stru_83F8838:: obj_pal word_83F888C, 0x1000 null_obj_pal -@ word_83F8848 -dword_83F8848: - .incbin "baserom_de_debug.gba", 0x3F8848, 32 +gOamData_83F8848: + .2byte 0x00a0 + .2byte 0x0000 + .2byte 0x0000 -@ unk_83F8868 -unk_83F8868:: - .incbin "baserom_de_debug.gba", 0x3F8868, 12 + .align 2 +gSpriteAnim_83F8850: + obj_image_anim_frame 38, 30 + obj_image_anim_end + +gSpriteAnim_83F8858: + obj_image_anim_frame 39, 30 + obj_image_anim_end + +gSpriteAnim_83F8860: + obj_image_anim_frame 40, 30 + obj_image_anim_end + +gSpriteAnimTable_83F8868:: + .4byte gSpriteAnim_83F8850, gSpriteAnim_83F8858, gSpriteAnim_83F8860 -@ 83F8874 - spr_template 0x1000, 0x1000, dword_83F8848, unk_83F8868, 0, gDummySpriteAffineAnimTable, debug_80C7584 +gSpriteTemplate_83F8874:: + spr_template 0x1000, 0x1000, gOamData_83F8848, gSpriteAnimTable_83F8868, 0, gDummySpriteAffineAnimTable, debug_80C7584 word_83F888C:: .incbin "graphics/debug/sprite_browser.gbapal" diff --git a/data/debug_unk_0.inc b/data/debug_unk_0.inc deleted file mode 100644 index d97e7676f..000000000 --- a/data/debug_unk_0.inc +++ /dev/null @@ -1,57 +0,0 @@ -debug_unk_0:: -@ 0x821F3B8 - .incbin "baserom_de_debug.gba", 0x21F3B8, 620 - -Str_821F624:: @ 0x821F624 - .string "ーーーーーーーーーーーー$" - -str_821F631:: @ 0x821F631 - .string "ジュンイチ$" - .string "ダイゴロウ$" - .string "バレンシア$" - .string "ハルコマチ$" - -Str_821F649:: @ 0x821F649 - .string "てつじ$" - -debug_unk_0b:: -@ 0x821F64D - .string "  オン$" - -@ 0x821F652 - .string "オフ$" - -@ 0x821F655 - .string "モノラル$" - -@ 0x821F65A - .string "ステレオ$" - -@ 0x821F65F - .string "テストです$" - -@ 0x821F665 - .string "うけとったって$" - -@ 0x821F66D - .string "せつぞくエラー$" - -.incbin "baserom_de_debug.gba", 0x21F675, 323 - -Str_821F7B8:: @ 0x821F7B8 - .string "たかさ $" - -Str_821F7BD:: @ 0x821F7BD - .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}たかさ   ひこう\n" - .string "ポケモン  ファイル$" - -Str_821F7DA:: @ 0x821F7DA - .string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}ロード\n" - .string "セーブ$" - -Str_821F7EA:: @ 0x821F7EA - .string "ロードしますか?$" - -@ 0x821F7F3 -gUnknown_Debug_821F7F3:: - .string "セーブしますか?$" diff --git a/data/graphics.s b/data/graphics.s index e68a2130a..6cc1c2db7 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1224,11 +1224,7 @@ gUnknown_08D17C3C:: @ 8D17C3C .align 2 gContestMiscGfx:: @ 8D17D6C -.if DEBUG - .incbin "baserom_de_debug.gba", 0xD17DDC, 0xD188DC-0xD17DDC -.else .incbin "graphics/contest/misc.4bpp.lz" -.endif .align 2 gContestAudienceGfx:: @ 8D18818 @@ -1251,11 +1247,7 @@ gTiles_8D1975C:: @ 8D1975C .align 2 gUnknown_08D1977C:: @ 8D1977C -.if DEBUG - .incbin "baserom_de_debug.gba", 0xD19840, 0xD1A2E8-0xD19840 -.else .incbin "graphics/contest/misc_2.4bpp.lz" -.endif .align 2 gUnknown_08D1A250:: @ 8D1A250 diff --git a/include/pokeblock.h b/include/pokeblock.h index 6720653a0..cda598f6c 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -3,12 +3,20 @@ enum { - PBLOCK_CLR_BLACK, - PBLOCK_CLR_RED, + PBLOCK_CLR_RED = 1, PBLOCK_CLR_BLUE, PBLOCK_CLR_PINK, PBLOCK_CLR_GREEN, - PBLOCK_CLR_YELLOW + PBLOCK_CLR_YELLOW, + PBLOCK_CLR_PURPLE, + PBLOCK_CLR_INDIGO, + PBLOCK_CLR_BROWN, + PBLOCK_CLR_LITEBLUE, + PBLOCK_CLR_OLIVE, + PBLOCK_CLR_GRAY, + PBLOCK_CLR_BLACK, + PBLOCK_CLR_WHITE, + PBLOCK_CLR_GOLD, }; enum diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 03391cf92..478499ad7 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -5155,7 +5155,7 @@ void debug_sub_801174C() "._704:\n" " .word gUnknown_020297ED\n" " .word gSaveBlock2\n" - " .word UnkDebug0+0x279\n" + " .word str_821F631\n" " .word gUnknown_02023A14+0x52\n" " .word gBattleTypeFlags\n" " .word UnkDebug0+0x1e0\n" @@ -5575,7 +5575,7 @@ void debug_sub_801174C() "._750:\n" " .word gPlayerParty\n" " .word gUnknown_02023A14+0x98\n" - " .word UnkDebug0+0x291\n" + " .word Str_821F649\n" " .word gUnknown_02023A14+0x50\n" " .word gUnknown_02023A14+0xde\n" " .word gEnemyParty\n" diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index ff6f97933..58ae28510 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -7068,7 +7068,7 @@ void InitSeePokemonGraphics() " .word unk_debug_ewram_0+0x34\n" " .word +0x2018000\n" " .word 0x115\n" - " .word unk_83F8868+0xc\n" + " .word gSpriteTemplate_83F8874\n" " .word gSprites\n" "\n" ); @@ -8641,7 +8641,7 @@ void InitSeeTrainers() " .word debug_80C777C+1\n" " .word unk_debug_ewram_0+0x34\n" " .word +0x2018000\n" - " .word unk_83F8868+0xc\n" + " .word gSpriteTemplate_83F8874\n" " .word gSprites\n" "\n" ); diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 43684dfec..b4be44aa2 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -222,17 +222,24 @@ const struct SpriteTemplate gSpriteTemplate_83F7F84 = const struct Pokeblock gUnknown_083F7F9C[] = { - { PBLOCK_CLR_RED, 20, 0, 0, 0, 0, 20}, - { PBLOCK_CLR_BLUE, 0, 20, 0, 0, 0, 20}, - { PBLOCK_CLR_PINK, 0, 0, 20, 0, 0, 20}, - { PBLOCK_CLR_GREEN, 0, 0, 0, 20, 0, 20}, - { PBLOCK_CLR_YELLOW, 0, 0, 0, 0, 20, 20} -}; - + { PBLOCK_CLR_RED, 20, 0, 0, 0, 0, 20 }, + { PBLOCK_CLR_BLUE, 0, 20, 0, 0, 0, 20 }, + { PBLOCK_CLR_PINK, 0, 0, 20, 0, 0, 20 }, + { PBLOCK_CLR_GREEN, 0, 0, 0, 20, 0, 20 }, + { PBLOCK_CLR_YELLOW, 0, 0, 0, 0, 20, 20 }, #if DEBUG -// possibly continuation of gUnknown_083F7F9C? -asm(".incbin \"baserom_de_debug.gba\", 0x424128, 0x50"); + { PBLOCK_CLR_PURPLE, 20, 0, 20, 0, 0, 20 }, + { PBLOCK_CLR_INDIGO, 0, 20, 0, 20, 0, 20 }, + { PBLOCK_CLR_BROWN, 0, 0, 20, 0, 20, 20 }, + { PBLOCK_CLR_LITEBLUE, 20, 0, 0, 20, 0, 20 }, + { PBLOCK_CLR_OLIVE, 0, 20, 0, 0, 20, 20 }, + { PBLOCK_CLR_GRAY, 0, 2, 0, 2, 2, 0 }, + { PBLOCK_CLR_BLACK, 3, 3, 3, 4, 3, 0 }, + { PBLOCK_CLR_WHITE, 1, 1, 1, 1, 1, 1 }, + { PBLOCK_CLR_GOLD, 20, 0, 0, 0, 0, 20 }, + { 0 }, #endif +}; // text -- cgit v1.2.3 From 0f09d2e7046a54c95e2ed4a7ff759d4cd1db87f7 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Mon, 22 Jan 2018 22:35:27 -0600 Subject: fix false gMysteryEventScriptCmdTableEnd offsets --- src/battle/battle_2.c | 78 +++++++++++++++++------------------ src/battle/battle_4.c | 2 +- src/battle/battle_controller_player.c | 2 +- src/battle/battle_interface.c | 6 +-- src/battle/battle_util.c | 12 +++--- src/contest.c | 4 +- src/debug/start_menu_debug.c | 28 ++++++------- src/debug/unk_debug_menu_3.c | 38 ++++++++--------- src/engine/mystery_event_menu.c | 2 +- src/engine/save.c | 4 +- src/engine/save_failed_screen.c | 2 +- src/field/choose_party.c | 2 +- src/field/field_player_avatar.c | 4 +- src/field/party_menu.c | 2 +- src/field/secret_base.c | 6 +-- src/pokemon/pokemon_1.c | 12 +++--- src/pokemon/pokemon_summary_screen.c | 4 +- src/roulette.c | 44 ++++++++++---------- src/scene/cute_sketch.c | 4 +- 19 files changed, 128 insertions(+), 128 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 478499ad7..41d00546d 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -220,7 +220,7 @@ void InitBattle(void) " lsl r1, r1, #0x13\n" " ldr r2, ._10\n" " mov r0, sp\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" + " bl CpuSet\n" " ldr r0, ._10 + 4\n" " strh r4, [r0]\n" " sub r0, r0, #0xc\n" @@ -907,7 +907,7 @@ void sub_800EC9C() " ldr r2, ._116 + 4\n" " add r1, r1, r2\n" " mov r2, #0xc8\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " b ._129\n" "._117:\n" " .align 2, 0\n" @@ -946,7 +946,7 @@ void sub_800EC9C() " ldr r2, ._126 + 4\n" " add r1, r1, r2\n" " mov r2, #0xc8\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " b ._129\n" "._127:\n" " .align 2, 0\n" @@ -982,7 +982,7 @@ void sub_800EC9C() " add r1, r1, r0\n" " add r0, r4, #0\n" " mov r2, #0xc8\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " ldr r1, ._134 + 8\n" " add r0, r4, r1\n" " bl shedinja_something\n" @@ -1407,7 +1407,7 @@ void sub_800F104() " add r1, r1, r0\n" " ldr r0, ._177 + 4\n" " mov r2, #0x60\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" "._174:\n" " add r7, r7, #0x1c\n" " add r4, r4, #0x1\n" @@ -1781,7 +1781,7 @@ void sub_800F298() " ldr r1, ._239 + 4\n" " mov r2, #0x96\n" " lsl r2, r2, #0x1\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " ldr r0, ._239 + 8\n" " mov r1, #0x0\n" " bl CreateTask\n" @@ -2018,7 +2018,7 @@ void sub_800F298() "._283:\n" " add r1, r5, #0\n" " mov r2, #0xc8\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " b ._291\n" "._293:\n" " .align 2, 0\n" @@ -2028,7 +2028,7 @@ void sub_800F298() " ldr r0, ._296\n" " add r1, r5, #0\n" " mov r2, #0xc8\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" "._291:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -2185,7 +2185,7 @@ void sub_800F298() "._333:\n" " add r1, r5, #0\n" " mov r2, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " b ._341\n" "._343:\n" " .align 2, 0\n" @@ -2195,7 +2195,7 @@ void sub_800F298() " ldr r0, ._346\n" " add r1, r5, #0\n" " mov r2, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" "._341:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -2627,7 +2627,7 @@ void BattleMainCB2(void) " str r0, [r4]\n" " bl ZeroEnemyPartyMons\n" " mov r0, #0x5a\n" - " bl gMysteryEventScriptCmdTableEnd+0x148c\n" + " bl m4aSongNumStop\n" " ldr r0, ._358 + 24\n" " ldrh r1, [r0]\n" " mov r0, #0x2\n" @@ -3197,7 +3197,7 @@ void debug_sub_80108B8() asm( " push {r4, r5, lr}\n" " add sp, sp, #0xfffffffc\n" - " bl gMysteryEventScriptCmdTableEnd+0x19f4\n" + " bl m4aSoundVSyncOff\n" " mov r0, #0x0\n" " bl SetHBlankCallback\n" " mov r0, #0x0\n" @@ -3264,7 +3264,7 @@ void debug_sub_80108B8() " ldr r1, ._507 + 72\n" " add r0, r4, #0\n" " bl LZDecompressVram\n" - " bl gMysteryEventScriptCmdTableEnd+0x1a70\n" + " bl m4aSoundVSyncOn\n" " ldr r0, ._507 + 76\n" " bl SetVBlankCallback\n" " ldr r0, ._507 + 80\n" @@ -3860,7 +3860,7 @@ void debug_sub_8010CAC() " strb r0, [r3, #0x15]\n" " lsl r0, r0, #0x1f\n" " lsr r0, r0, #0x1f\n" - " bl gMysteryEventScriptCmdTableEnd+0x2aa0\n" + " bl SetPokemonCryStereo\n" " bl debug_nullsub_3\n" "._559:\n" " ldr r4, ._565 + 12\n" @@ -4774,7 +4774,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x4358\n" + " bl __udivsi3\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4830,7 +4830,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x4358\n" + " bl __udivsi3\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4886,7 +4886,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x4358\n" + " bl __udivsi3\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4929,7 +4929,7 @@ void debug_sub_8011498() " lsl r4, r5, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x4358\n" + " bl __udivsi3\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -4965,7 +4965,7 @@ void debug_sub_8011498() " lsl r4, r4, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x4358\n" + " bl __udivsi3\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -5002,7 +5002,7 @@ void debug_sub_8011498() " lsl r4, r5, #0x1\n" " mov r0, r9\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x4358\n" + " bl __udivsi3\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" @@ -5200,7 +5200,7 @@ void debug_sub_801174C() "._713:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" " ldr r1, ._719\n" @@ -5223,7 +5223,7 @@ void debug_sub_801174C() "._699:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " mov r2, #0x64\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" @@ -5282,7 +5282,7 @@ void debug_sub_801174C() " str r0, [sp, #0xc]\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" " ldr r1, ._726\n" @@ -5355,7 +5355,7 @@ void debug_sub_801174C() "._735:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " mov r2, #0x64\n" " mul r0, r0, r2\n" " ldr r1, ._741\n" @@ -5382,7 +5382,7 @@ void debug_sub_801174C() "._721:\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " mov r2, #0x64\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" @@ -5441,7 +5441,7 @@ void debug_sub_801174C() " str r0, [sp, #0xc]\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " mov r2, #0x64\n" " mul r0, r0, r2\n" " ldr r1, ._750\n" @@ -5460,7 +5460,7 @@ void debug_sub_801174C() " ble ._743 @cond_branch\n" " add r0, r7, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" " ldr r1, ._750\n" @@ -6483,7 +6483,7 @@ void debug_sub_8012294() " lsl r4, r4, #0x1\n" " add r0, r5, #0\n" " mov r1, #0x5\n" - " bl gMysteryEventScriptCmdTableEnd+0x4358\n" + " bl __udivsi3\n" " add r5, r0, #0\n" " lsl r5, r5, #0x18\n" " lsr r5, r5, #0x15\n" @@ -7102,7 +7102,7 @@ void debug_sub_8012688() " bl SetHBlankCallback\n" " ldr r0, ._873 + 100\n" " bl SetVBlankCallback\n" - " bl gMysteryEventScriptCmdTableEnd+0x14f4\n" + " bl m4aMPlayAllStop\n" " ldr r0, ._873 + 104\n" " mov r1, #0x0\n" " bl CreateTask\n" @@ -8484,7 +8484,7 @@ void debug_sub_8013240() { asm( " push {lr}\n" - " bl gMysteryEventScriptCmdTableEnd+0x2fec\n" + " bl IdentifyFlash\n" " lsl r0, r0, #0x10\n" " cmp r0, #0\n" " beq ._1068 @cond_branch\n" @@ -8519,7 +8519,7 @@ void debug_sub_8013258() " lsr r4, r0, #0x10\n" " add r0, r4, #0\n" " add r1, r6, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" + " bl ProgramFlashSectorAndVerify\n" " cmp r0, #0\n" " bne ._1071 @cond_branch\n" " mov r0, #0x80\n" @@ -8555,13 +8555,13 @@ void debug_sub_8013294() " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " bne ._1076 @cond_branch\n" - " bl gMysteryEventScriptCmdTableEnd+0x19f4\n" + " bl m4aSoundVSyncOff\n" " add r0, r4, #0\n" " add r1, r5, #0\n" " add r2, r6, #0\n" " bl debug_sub_8013258\n" " add r4, r0, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x1a70\n" + " bl m4aSoundVSyncOn\n" " add r0, r4, #0\n" " b ._1077\n" "._1076:\n" @@ -8591,7 +8591,7 @@ void debug_sub_80132C8() " mov r1, #0x0\n" " add r2, r5, #0\n" " add r3, r6, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x2d64\n" + " bl ReadFlash\n" "._1078:\n" " pop {r4, r5, r6}\n" " pop {r0}\n" @@ -9066,7 +9066,7 @@ void debug_sub_80139E4() "._1193:\n" " ldr r0, ._1198 + 12\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " ldr r1, ._1198 + 4\n" " mov r0, #0x0\n" " strb r0, [r1]\n" @@ -9081,7 +9081,7 @@ void debug_sub_80139E4() " lsl r0, r0, #0x2\n" " add r0, r0, r5\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " ldrb r0, [r4]\n" " add r0, r0, #0x1\n" " strb r0, [r4]\n" @@ -9103,7 +9103,7 @@ void debug_sub_80139E4() "._1192:\n" " ldr r0, ._1202\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " ldr r1, ._1202 + 4\n" " strb r4, [r1]\n" " ldr r0, ._1202 + 8\n" @@ -9117,7 +9117,7 @@ void debug_sub_80139E4() " lsl r0, r0, #0x2\n" " add r0, r0, r5\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " ldrb r0, [r4]\n" " add r0, r0, #0x1\n" " strb r0, [r4]\n" @@ -9339,7 +9339,7 @@ void sub_8010874() " mov r0, #0x64\n" " mul r0, r0, r1\n" " ldr r1, ._1215 + 160\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " ldr r2, ._1215 + 164\n" " add r1, r4, r2\n" " strb r0, [r1]\n" diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 038b4f5cf..3415d9337 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -5111,7 +5111,7 @@ static void atk15_seteffectwithchance(void) lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ mov r1, #0x64\n\ - bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + bl __umodsi3\n\ lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ cmp r0, r4\n\ diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 7e3655e4a..cbca4a586 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2234,7 +2234,7 @@ void debug_sub_803107C(void) mov r7, #0x0\n\ ldr r0, ._369\n\ ldr r0, [r0]\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ + bl _call_via_r0\n\ ldr r0, ._369 + 4\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index 1b6240159..b703bc7b8 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -1405,7 +1405,7 @@ void sub_804454C() " add r1, r1, r0\n" " mov r0, sp\n" " ldr r2, ._150 + 36\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" + " bl CpuSet\n" " ldrb r4, [r5]\n" " ldrh r0, [r7]\n" " mov r1, sl\n" @@ -1467,7 +1467,7 @@ void sub_804454C() " ldr r2, ._153 + 4\n" " add r1, r1, r2\n" " ldr r2, ._153 + 8\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" + " bl CpuSet\n" " b ._163\n" "._154:\n" " .align 2, 0\n" @@ -1521,7 +1521,7 @@ void sub_804454C() " add r1, r1, r6\n" " mov r0, sp\n" " ldr r2, ._161 + 4\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n" + " bl CpuSet\n" " ldrb r4, [r5]\n" " ldrh r0, [r7]\n" " mov r1, sl\n" diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index 8dae98b66..817382911 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -2407,7 +2407,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ mov r1, #0x3\n\ - bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + bl __umodsi3\n\ lsl r0, r0, #0x10\n\ lsr r4, r0, #0x10\n\ cmp r4, #0\n\ @@ -3332,7 +3332,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ mov r1, #0xa\n\ - bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + bl __umodsi3\n\ lsl r0, r0, #0x10\n\ cmp r0, #0\n\ beq ._1091 @cond_branch\n\ @@ -3542,7 +3542,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ mov r1, #0x3\n\ - bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + bl __umodsi3\n\ lsl r0, r0, #0x10\n\ cmp r0, #0\n\ beq ._1124 @cond_branch\n\ @@ -3737,7 +3737,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ mov r1, #0x3\n\ - bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + bl __umodsi3\n\ lsl r0, r0, #0x10\n\ cmp r0, #0\n\ beq ._1155 @cond_branch\n\ @@ -3932,7 +3932,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ mov r1, #0x3\n\ - bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + bl __umodsi3\n\ lsl r0, r0, #0x10\n\ cmp r0, #0\n\ beq ._1186 @cond_branch\n\ @@ -4204,7 +4204,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) lsl r0, r0, #0x10\n\ lsr r0, r0, #0x10\n\ mov r1, #0x3\n\ - bl gMysteryEventScriptCmdTableEnd+0x43d0\n\ + bl __umodsi3\n\ lsl r0, r0, #0x10\n\ cmp r0, #0\n\ beq ._1232 @cond_branch\n\ diff --git a/src/contest.c b/src/contest.c index 20e202d80..834d641d0 100644 --- a/src/contest.c +++ b/src/contest.c @@ -1392,7 +1392,7 @@ void debug_sub_80BA054() mov r0, r9\n\ mov r1, #0x0\n\ mov r2, #0x14\n\ - bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + bl memset\n\ ldr r4, ._262 + 8\n\ ldrb r0, [r4]\n\ bl sub_80B28F0\n\ @@ -1505,7 +1505,7 @@ void debug_sub_80BA054() ._241:\n\ ldr r0, ._273\n\ ldr r0, [r0]\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ + bl _call_via_r0\n\ ldr r0, ._273 + 4\n\ ldrb r4, [r0]\n\ cmp r4, #0\n\ diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 572251fb4..d9f14a6b8 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -172,7 +172,7 @@ void debug_sub_8076BB4() " add r2, r2, #0x4\n" " add r0, r0, r2\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " b ._24\n" "._14:\n" " .align 2, 0\n" @@ -888,7 +888,7 @@ void DebugMenu_8077020() " lsr r4, r0, #0x18\n" " ldr r0, ._109\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " cmp r0, #0x1\n" @@ -1060,7 +1060,7 @@ void DebugMenu_807709C() " add r1, r1, #0x4\n" " add r0, r0, r1\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " b ._132\n" @@ -1187,18 +1187,18 @@ void DebugMenu_8077238() " ldr r1, ._139\n" " mov r0, sp\n" " mov r2, #0x2\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, sp, #0x4\n" " mov r9, r0\n" " ldr r1, ._139 + 4\n" " mov r2, #0x3\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r1, sp, #0x8\n" " mov sl, r1\n" " ldr r1, ._139 + 8\n" " mov r0, sl\n" " mov r2, #0x3\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " mov r2, #0x0\n" " str r2, [sp, #0x14]\n" " add r4, sp, #0x10\n" @@ -1932,7 +1932,7 @@ void DebugMenu_80776B4() " ldr r1, ._183\n" " mov r0, sp\n" " mov r2, #0x7\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " lsl r3, r4, #0x1\n" " lsl r5, r4, #0x19\n" " lsr r5, r5, #0x18\n" @@ -1975,7 +1975,7 @@ void DebugMenu_8077704() " ldr r1, ._185\n" " mov r0, sp\n" " mov r2, #0x11\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " mov r0, #0x13\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" @@ -2174,7 +2174,7 @@ void DebugMenu_807786C() " ldr r1, ._205\n" " mov r0, sp\n" " mov r2, #0x7\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " mov r0, #0x19\n" " mov r1, #0x0\n" " mov r2, #0x1d\n" @@ -2873,7 +2873,7 @@ void DebugMenu_8077C3C() " add r0, r2, #0\n" " mov r1, #0xa\n" " str r3, [sp]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " add r2, r0, #0\n" " ldr r3, [sp]\n" " cmp r4, r6\n" @@ -5580,7 +5580,7 @@ void DebugMenu_8078E04() " lsr r4, r0, #0x10\n" " add r0, r4, #0\n" " add r1, r6, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" + " bl ProgramFlashSectorAndVerify\n" " cmp r0, #0\n" " bne ._576 @cond_branch\n" " mov r0, #0x80\n" @@ -5613,13 +5613,13 @@ void DebugMenu_8078E40() " add r6, r2, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " bl gMysteryEventScriptCmdTableEnd+0x19f4\n" + " bl m4aSoundVSyncOff\n" " add r0, r4, #0\n" " add r1, r5, #0\n" " add r2, r6, #0\n" " bl DebugMenu_8078E04\n" " add r4, r0, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x1a70\n" + " bl m4aSoundVSyncOn\n" " add r0, r4, #0\n" " pop {r4, r5, r6}\n" " pop {r1}\n" @@ -5639,7 +5639,7 @@ void DebugMenu_8078E68() " lsr r0, r0, #0x18\n" " mov r1, #0x0\n" " add r2, r4, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x2d64\n" + " bl ReadFlash\n" " pop {r4}\n" " pop {r0}\n" " bx r0\n" diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c index fe2e6317e..411b32fe3 100644 --- a/src/debug/unk_debug_menu_3.c +++ b/src/debug/unk_debug_menu_3.c @@ -14,7 +14,7 @@ int debug_sub_813C404() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -42,7 +42,7 @@ int debug_sub_813C430() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -70,7 +70,7 @@ int debug_sub_813C45C() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -98,7 +98,7 @@ int debug_sub_813C488() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -124,7 +124,7 @@ int debug_sub_813C4B4() " ldr r1, ._9 + 4\n" " sub r4, r4, r1\n" " add r2, r4, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r4, #0\n" " pop {r4}\n" " pop {r1}\n" @@ -149,7 +149,7 @@ int debug_sub_813C4D4() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_81261B4\n" @@ -177,7 +177,7 @@ int debug_sub_813C500() " sub r5, r5, r4\n" " add r1, r4, #0\n" " add r2, r5, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r4, #0\n" " bl unref_sub_812620C\n" @@ -212,7 +212,7 @@ void debug_sub_813C52C() " mov r0, r8\n" " add r1, r4, #0\n" " add r2, r6, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " ldr r0, ._15 + 8\n" " sub r0, r0, r4\n" " add r0, r0, r8\n" @@ -522,7 +522,7 @@ int debug_sub_813C740() " add r0, r6, #0\n" " mov r1, r8\n" " mov r2, r9\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r5, #0\n" " mov r1, #0x19\n" " mov r2, #0x5\n" @@ -569,7 +569,7 @@ int debug_sub_813C740() " sub r0, r0, r1\n" " add r1, r5, #0\n" " mov r2, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " ldr r0, ._29 + 20\n" " add r6, r6, r0\n" " mov r0, r8\n" @@ -577,7 +577,7 @@ int debug_sub_813C740() " add r0, r6, #0\n" " mov r1, sp\n" " mov r2, #0x24\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " mov r0, r9\n" " add sp, sp, #0x30\n" " pop {r3, r4, r5}\n" @@ -617,7 +617,7 @@ int debug_sub_813C810() " add r0, r6, #0\n" " add r1, r5, #0\n" " mov r2, r8\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r4, #0\n" " mov r1, #0xc9\n" " mov r2, #0x15\n" @@ -631,13 +631,13 @@ int debug_sub_813C810() " sub r0, r0, r5\n" " add r1, r4, #0\n" " mov r2, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " ldr r0, ._31 + 16\n" " add r0, r6, r0\n" " sub r0, r0, r5\n" " mov r1, sp\n" " mov r2, #0x24\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r5, #0\n" " bl unref_sub_812620C\n" @@ -677,7 +677,7 @@ int debug_sub_813C888() " add r0, r6, #0\n" " add r1, r5, #0\n" " mov r2, r8\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r4, #0\n" " mov r1, #0xc9\n" " mov r2, #0x15\n" @@ -693,13 +693,13 @@ int debug_sub_813C888() " sub r0, r0, r5\n" " add r1, r4, #0\n" " mov r2, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " ldr r0, ._33 + 16\n" " add r0, r6, r0\n" " sub r0, r0, r5\n" " mov r1, sp\n" " mov r2, #0x24\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r6, #0\n" " add r1, r5, #0\n" " bl unref_sub_812620C\n" @@ -768,7 +768,7 @@ int debug_sub_813C93C() " sub r5, r5, r6\n" " add r1, r6, #0\n" " add r2, r5, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " bl SavePlayerParty\n" " bl debug_sub_813C904\n" " ldr r1, ._37 + 8\n" @@ -782,7 +782,7 @@ int debug_sub_813C93C() " add r0, r4, #0\n" " mov r1, sp\n" " mov r2, #0xbc\n" - " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n" + " bl memcpy\n" " add r0, r5, #0\n" " add sp, sp, #0xbc\n" " pop {r4, r5, r6}\n" diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 656e774c5..da2973945 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -465,7 +465,7 @@ void debug_sub_815D04C() " add r1, r1, r0\n" " ldr r0, ._133 + 8\n" " ldr r1, [r1]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf8\n" + " bl _call_via_r1\n" " ldr r0, ._133 + 12\n" " add r1, r6, r0\n" " ldrb r0, [r1]\n" diff --git a/src/engine/save.c b/src/engine/save.c index d11eebaac..0eb93eb1d 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -690,7 +690,7 @@ void sub_813B79C() " strh r0, [r1]\n" " add r0, r5, #0\n" " add r1, r4, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" + " bl ProgramFlashSectorAndVerify\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" @@ -718,7 +718,7 @@ void sub_813B79C() " lsr r4, r4, #0x10\n" " add r0, r4, #0\n" " add r1, r6, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x2f60\n" + " bl ProgramFlashSectorAndVerify\n" " add r0, r5, #1\n" " lsl r0, r0, #0x10\n" " lsr r5, r0, #0x10\n" diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index 421cd0779..7902427e0 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -424,7 +424,7 @@ bool8 VerifySectorWipe(u16 sector) " mov r3, #0x80\n" " lsl r3, r3, #0x5\n" " mov r1, #0x0\n" - " bl gMysteryEventScriptCmdTableEnd+0x2d64\n" + " bl ReadFlash\n" " mov r0, #0x0\n" " ldr r1, ._50 + 4\n" "._49:\n" diff --git a/src/field/choose_party.c b/src/field/choose_party.c index fd5808fc3..b2d950e35 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -540,7 +540,7 @@ void debug_sub_81381B4() " add r0, r4, #0\n" " mov r1, #0x0\n" " mov r2, #0x60\n" - " bl gMysteryEventScriptCmdTableEnd+0x5c24\n" + " bl memset\n" " mov r7, #0x0\n" " mov r8, r4\n" " mov r0, #0x4\n" diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 85cfdb829..c382db19f 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -291,7 +291,7 @@ u8 TryDoMetatileBehaviorForcedMovement() " lsr r0, r0, #0x16\n" " add r0, r0, r4\n" " ldr r0, [r0]\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n" + " bl _call_via_r0\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" "._26:\n" @@ -513,7 +513,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161) " ldr r2, [r0]\n" " add r0, r5, #0\n" " add r1, r6, #0\n" - " bl gMysteryEventScriptCmdTableEnd+0x3cfc\n" + " bl _call_via_r2\n" "._83:\n" " pop {r4, r5, r6}\n" " pop {r0}\n" diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 4fdb17786..4108145c1 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -989,7 +989,7 @@ bool8 InitPartyMenu(void) add r2, r2, #0x4\n\ add r0, r0, r2\n\ ldr r0, [r0]\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ + bl _call_via_r0\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x18\n\ cmp r0, #0x1\n\ diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 082e8ebc6..01e9711dc 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -1686,13 +1686,13 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c) add r0, r6, r4\n\ mov r1, #0x0\n\ add r2, r5, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + bl memset\n\ add r4, r4, r5\n\ add r4, r6, r4\n\ add r0, r4, #0\n\ mov r1, #0x0\n\ add r2, r5, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + bl memset\n\ b ._505\n\ ._501:\n\ lsl r0, r5, #0x1\n\ @@ -1700,7 +1700,7 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c) add r0, r6, r0\n\ mov r1, #0x0\n\ add r2, r5, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + bl memset\n\ ._505:\n\ cmp r7, #0x1\n\ beq ._506 @cond_branch\n\ diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index 63f1b322a..6f187ad71 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -646,7 +646,7 @@ void debug_sub_803F55C() " ldr r4, [sp]\n" " mul r0, r0, r4\n" " mov r1, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " add r0, r0, r4\n" " add r0, r0, #0xa\n" " str r0, [sp, #0x4]\n" @@ -673,7 +673,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x8]\n" " add r0, r5, #0\n" @@ -705,7 +705,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " add r0, r0, #0x5\n" " str r0, [sp, #0xc]\n" " add r0, r5, #0\n" @@ -737,7 +737,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x10]\n" " add r0, r5, #0\n" @@ -769,7 +769,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x14]\n" " add r0, r5, #0\n" @@ -801,7 +801,7 @@ void debug_sub_803F55C() " ldr r1, [sp]\n" " mul r0, r0, r1\n" " mov r1, #0x64\n" - " bl gMysteryEventScriptCmdTableEnd+0x3d30\n" + " bl __divsi3\n" " add r0, r0, #0x5\n" " str r0, [sp, #0x18]\n" " add r0, r5, #0\n" diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index 29973fd99..f1bded592 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -1042,7 +1042,7 @@ bool8 sub_809DA84(void) lsl r1, r1, #0x2\n\ add r1, r1, r0\n\ ldr r0, [r1]\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cf4\n\ + bl _call_via_r0\n\ ._132:\n\ ldr r1, ._134 + 8\n\ ldr r2, ._134 + 12\n\ @@ -1071,7 +1071,7 @@ bool8 sub_809DA84(void) add r1, r1, r2\n\ add r0, r0, #0x10\n\ ldr r1, [r1]\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cf8\n\ + bl _call_via_r1\n\ ldr r1, ._140 + 8\n\ ldr r2, ._140 + 12\n\ add r1, r1, r2\n\ diff --git a/src/roulette.c b/src/roulette.c index e01f085a2..5a8d35647 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -646,10 +646,10 @@ void sub_8115384(void) ldr r0, ._47 + 16\n\ mov r1, #0xc0\n\ lsl r1, r1, #0x13\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cb8\n\ + bl LZ77UnCompVram\n\ ldr r0, ._47 + 20\n\ ldr r1, ._47 + 24\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cb8\n\ + bl LZ77UnCompVram\n\ ldr r1, ._47 + 28\n\ ldr r3, ._47 + 32\n\ add r1, r1, r3\n\ @@ -706,10 +706,10 @@ void sub_8115384(void) bl ClearBGTilemapBuffers\n\ ldr r0, ._56\n\ ldr r1, ._56 + 4\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cbc\n\ + bl LZ77UnCompWram\n\ ldr r0, ._56 + 8\n\ ldr r1, ._56 + 12\n\ - bl gMysteryEventScriptCmdTableEnd+0x3cb8\n\ + bl LZ77UnCompVram\n\ ldr r1, ._56 + 16\n\ ldr r3, ._56 + 20\n\ add r1, r1, r3\n\ @@ -1051,11 +1051,11 @@ void sub_8115634(u8 unused) ldr r1, ._75 + 16\n\ str r1, [r0]\n\ ldr r0, ._75 + 20\n\ - bl gMysteryEventScriptCmdTableEnd+0x1c08\n\ + bl m4aMPlayStop\n\ ldr r0, ._75 + 24\n\ - bl gMysteryEventScriptCmdTableEnd+0x1c08\n\ + bl m4aMPlayStop\n\ ldr r0, ._75 + 28\n\ - bl gMysteryEventScriptCmdTableEnd+0x1c08\n\ + bl m4aMPlayStop\n\ ._74:\n\ pop {r4, r5, r6}\n\ pop {r0}\n\ @@ -2034,7 +2034,7 @@ void sub_8116B40(u8 taskid) // end roulette ? mov r2, #0xbe\n\ lsl r2, r2, #0x1\n\ mov r1, #0x0\n\ - bl gMysteryEventScriptCmdTableEnd+0x5c24\n\ + bl memset\n\ ldr r1, ._381 + 4\n\ ldr r0, ._381 + 8\n\ mov r4, #0x0\n\ @@ -4473,7 +4473,7 @@ void debug_sub_812E698() add r0, r7, #0\n\ bl sub_81186B8\n\ mov r0, #0x38\n\ - bl gMysteryEventScriptCmdTableEnd+0x13c0\n\ + bl m4aSongNumStart\n\ bl Random\n\ mov r1, #0x1\n\ and r1, r1, r0\n\ @@ -4489,7 +4489,7 @@ void debug_sub_812E698() ldrb r0, [r0]\n\ add r0, r0, #0x1\n\ mov r1, #0xc\n\ - bl gMysteryEventScriptCmdTableEnd+0x3e40\n\ + bl __modsi3\n\ add r1, r4, #0\n\ add r1, r1, #0x7f\n\ strb r0, [r1]\n\ @@ -4515,7 +4515,7 @@ void debug_sub_812E698() add r0, r0, r1\n\ ldr r1, [r0]\n\ add r0, r1, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x54dc\n\ + bl __addsf3\n\ str r0, [r5]\n\ add r0, r6, #0\n\ add r0, r0, #0x7e\n\ @@ -4845,7 +4845,7 @@ void sub_8118F8C(struct Sprite *sprite) mov r8, r0\n\ ldr r0, [r0]\n\ ldr r1, ._868 + 4\n\ - bl gMysteryEventScriptCmdTableEnd+0x5928\n\ + bl __gtsf2\n\ cmp r0, #0\n\ bgt ._874 @cond_branch\n\ add r0, r6, #0\n\ @@ -4868,26 +4868,26 @@ void sub_8118F8C(struct Sprite *sprite) mov r4, #0x3\n\ ldsb r4, [r0, r4]\n\ add r0, r4, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x5a48\n\ + bl __floatsisf\n\ add r5, r0, #0\n\ cmp r4, #0\n\ bge ._865 @cond_branch\n\ ldr r1, ._868 + 16\n\ - bl gMysteryEventScriptCmdTableEnd+0x54dc\n\ + bl __addsf3\n\ add r5, r0, #0\n\ ._865:\n\ lsr r0, r7, #0x19\n\ add r0, r0, r9\n\ ldrb r0, [r0, #0x4]\n\ add r0, r0, #0x1\n\ - bl gMysteryEventScriptCmdTableEnd+0x5a48\n\ + bl __floatsisf\n\ add r1, r0, #0\n\ add r0, r5, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x56a0\n\ + bl __divsf3\n\ add r1, r0, #0\n\ mov r2, r8\n\ ldr r0, [r2]\n\ - bl gMysteryEventScriptCmdTableEnd+0x5508\n\ + bl __subsf3\n\ mov r1, r8\n\ str r0, [r1]\n\ mov r0, #0x4\n\ @@ -4923,13 +4923,13 @@ void sub_8118F8C(struct Sprite *sprite) ldr r0, [r6]\n\ ldr r4, ._875\n\ add r1, r4, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x58e0\n\ + bl __nesf2\n\ cmp r0, #0\n\ beq ._874 @cond_branch\n\ mov r2, r8\n\ ldr r0, [r2]\n\ add r1, r4, #0\n\ - bl gMysteryEventScriptCmdTableEnd+0x59b8\n\ + bl __ltsf2\n\ cmp r0, #0\n\ bge ._874 @cond_branch\n\ str r4, [r6]\n\ @@ -4938,11 +4938,11 @@ void sub_8118F8C(struct Sprite *sprite) add r4, r5, #0\n\ add r4, r4, #0x98\n\ ldr r0, [r4]\n\ - bl gMysteryEventScriptCmdTableEnd+0x5b4c\n\ + bl __extendsfdf2\n\ ldr r2, ._875 + 4\n\ ldr r3, ._875 + 8\n\ - bl gMysteryEventScriptCmdTableEnd+0x4c2c\n\ - bl gMysteryEventScriptCmdTableEnd+0x51e8\n\ + bl __divdf3\n\ + bl __truncdfsf2\n\ str r0, [r4]\n\ ._874:\n\ pop {r3, r4}\n\ diff --git a/src/scene/cute_sketch.c b/src/scene/cute_sketch.c index c4d9463f5..848249528 100644 --- a/src/scene/cute_sketch.c +++ b/src/scene/cute_sketch.c @@ -212,7 +212,7 @@ void debug_sub_8110D84(void) b ._65\n\ ._38:\n\ mov r0, #0x5\n\ - bl gMysteryEventScriptCmdTableEnd+0x13c0\n\ + bl m4aSongNumStart\n\ ldr r1, ._41 + 4\n\ add r0, r4, r1\n\ mov r1, #0x1\n\ @@ -228,7 +228,7 @@ void debug_sub_8110D84(void) .word sub_80FC69C+1\n\ ._36:\n\ mov r0, #0x5\n\ - bl gMysteryEventScriptCmdTableEnd+0x13c0\n\ + bl m4aSongNumStart\n\ mov r0, #0x1\n\ neg r0, r0\n\ mov r1, #0x0\n\ -- cgit v1.2.3 From 305f571fb55bedea92eb0afad0d908fafc60f5c6 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 00:32:33 -0600 Subject: dump more baseroms and fix more false offsets --- data/debug_menu_3.s | 40 +++++++++++++++----- data/debug_menu_tomomichi.s | 27 +++++++++++--- data/unk_debug_menu_3.s | 69 +++++++++++++++++----------------- src/debug/tomomichi_debug_menu.c | 8 ++-- src/debug/unk_debug_menu_3.c | 80 ++++++++++++++++++++-------------------- src/engine/mystery_event_menu.c | 18 ++++----- 6 files changed, 140 insertions(+), 102 deletions(-) diff --git a/data/debug_menu_3.s b/data/debug_menu_3.s index 36356c18a..f26e257d1 100644 --- a/data/debug_menu_3.s +++ b/data/debug_menu_3.s @@ -5,19 +5,41 @@ .section .rodata -_845DAE1:: +gUnknown_Debug_845DAE1:: .incbin "baserom_de_debug.gba", 0x45DAE1, 721 -_845DDB2:: - .incbin "baserom_de_debug.gba", 0x45DDB2, 1364 -_845E306:: +gUnknown_Debug_845DDB2:: + .incbin "baserom_de_debug.gba", 0x45DDB2, 36 +gUnknown_Debug_845DDD6:: + .incbin "baserom_de_debug.gba", 0x45DDD6, 1328 +gUnknown_Debug_845E306:: .incbin "baserom_de_debug.gba", 0x45E306, 218 -_845E3E0:: +gUnknown_Debug_845E3E0:: .incbin "baserom_de_debug.gba", 0x45E3E0, 34 -_845E402:: +gUnknown_Debug_845E402:: .incbin "baserom_de_debug.gba", 0x45E402, 32 -_845E422:: +gUnknown_Debug_845E422:: .incbin "baserom_de_debug.gba", 0x45E422, 33 -_845E443:: - .incbin "baserom_de_debug.gba", 0x45E443, 889 +gUnknown_Debug_845E443:: + .incbin "baserom_de_debug.gba", 0x45E443, 36 +gUnknown_Debug_845E467:: + .incbin "baserom_de_debug.gba", 0x45E467, 100 +gUnknown_Debug_845E4CB:: + .incbin "baserom_de_debug.gba", 0x45E4CB, 36 +gUnknown_Debug_845E4EF:: + .incbin "baserom_de_debug.gba", 0x45E4EF, 23 +gUnknown_Debug_845E506:: + .incbin "baserom_de_debug.gba", 0x45E506, 256 +gUnknown_Debug_845E606:: + .incbin "baserom_de_debug.gba", 0x45E606, 19 +gUnknown_Debug_845E619:: + .incbin "baserom_de_debug.gba", 0x45E619, 249 +gUnknown_Debug_845E712:: + .incbin "baserom_de_debug.gba", 0x45E712, 133 +gUnknown_Debug_845E797:: + .incbin "baserom_de_debug.gba", 0x45E797, 30 +gUnknown_Debug_845E7B5:: + .incbin "baserom_de_debug.gba", 0x45E7B5, 6 +gUnknown_Debug_845E7BB:: + .incbin "baserom_de_debug.gba", 0x45E7BB, 1 .endif diff --git a/data/debug_menu_tomomichi.s b/data/debug_menu_tomomichi.s index 58e23a572..c54a52bb1 100644 --- a/data/debug_menu_tomomichi.s +++ b/data/debug_menu_tomomichi.s @@ -2,7 +2,9 @@ .include "constants/constants.inc" .section .rodata + .if DEBUG + gUnknown_Debug_083C0C54:: @ 0x83C0C54 .string "Contest graphics$" @@ -346,7 +348,11 @@ gUnknown_Debug_083C1149:: @ 0x83C1149 .4byte gUnknown_Debug_083C1148, TomomichiDebugMenu_Config+1 gUnknown_Debug_083C1194:: @ 0x83C1194 - .incbin "baserom_de_debug.gba", 0x3C1194, 38 + .byte 9, 7 + +gUnknown_Debug_083C1196:: @ 0x83C1196 + .2byte 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019 + .2byte 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0000, 0x0000 gUnknown_Debug_083C11BA:: @ 0x83C11BA .string "FH-00-08$" @@ -438,7 +444,11 @@ gUnknown_Debug_083C1288:: @ 0x83C1288 .4byte gUnknown_Debug_083C1287, TomomichiDebugMenu_Config+1 gUnknown_Debug_083C12D0:: @ 0x83C12D0 - .incbin "baserom_de_debug.gba", 0x3C12D0, 38 + .byte 9, 7 + +gUnknown_Debug_083C12D2:: @ 0x83C12D2 + .2byte 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009 + .2byte 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0010, 0x0000, 0x0000 gUnknown_Debug_083C12F6:: @ 0x83C12F6 .string "BATCH$" @@ -796,11 +806,18 @@ gDebug_0x83C1974:: @ 0x83C1974 .4byte gUnknown_Debug_083C1970, TomomichiDebugMenu_Config+1 gUnknown_Debug_083C19BC:: @ 0x83C19BC - .incbin "baserom_de_debug.gba", 0x3C19BC, 10 + .byte 0x08, 0x07, 0x09, 0x04, 0x09, 0x09, 0x09, 0x07, 0x05, 0x00 gUnknown_Debug_083C19C6:: @ 0x83C19C6 - .incbin "baserom_de_debug.gba", 0x3C19C6, 162 - + .2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e, 0x0000 + .2byte 0x080f, 0x0810, 0x0811, 0x0812, 0x0813, 0x0814, 0x0815, 0x0000, 0x0000 + .2byte 0x0816, 0x0817, 0x0818, 0x0819, 0x081a, 0x081b, 0x081c, 0x081d, 0x081e + .2byte 0x0800, 0x0801, 0x0802, 0x083b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + .2byte 0x0804, 0x0805, 0x0806, 0x0828, 0x0829, 0x082a, 0x082b, 0x082c, 0x082d + .2byte 0x0830, 0x0831, 0x0832, 0x0833, 0x0834, 0x0835, 0x0837, 0x0838, 0x0839 + .2byte 0x0836, 0x083a, 0x083b, 0x084b, 0x084c, 0x084f, 0x0850, 0x0851, 0x0852 + .2byte 0x084d, 0x084e, 0x0853, 0x085d, 0x085f, 0x0860, 0x0861, 0x0000, 0x0000 + .2byte 0x0847, 0x0848, 0x0849, 0x0854, 0x085e, 0x0000, 0x0000, 0x0000, 0x0000 gDebug_0x83C1A68:: @ 0x83C1A68 .string "FVーBALL パート1$" diff --git a/data/unk_debug_menu_3.s b/data/unk_debug_menu_3.s index 2fd8381db..100821c9b 100644 --- a/data/unk_debug_menu_3.s +++ b/data/unk_debug_menu_3.s @@ -2,77 +2,76 @@ .align 2 -@ Is this actually sJapaneseEggNickname? -Str_842E238: @ 0x842E238 +Str_842E238:: @ 0x842E238 .string "タマゴ$" .if DEBUG -Str_842E23C: @ 0x842E23C +Str_842E23C:: @ 0x842E23C .string "ガイブ$" -Str_842E240: @ 0x842E240 +Str_842E240:: @ 0x842E240 .string "ENGLISH$" -Str_842E248: @ 0x842E248 +Str_842E248:: @ 0x842E248 .string "TOURNAMENT$" -Str_842E253: @ 0x842E253 +Str_842E253:: @ 0x842E253 .string " そら  カードイー$" -Str_842E25E: @ 0x842E25E +Str_842E25E:: @ 0x842E25E .string "ポケコッコ$" -Str_842E264: @ 0x842E264 +Str_842E264:: @ 0x842E264 .string "ticket$" -Str_842E26B: @ 0x842E26B +Str_842E26B:: @ 0x842E26B .string "{PKMN}$" -Str_842E26E: @ 0x842E26E +Str_842E26E:: @ 0x842E26E .string "wrong {PKMN}$" -Str_842E277: @ 0x842E277 +Str_842E277:: @ 0x842E277 .string "ribbon$" -Str_842E27E: @ 0x842E27E +Str_842E27E:: @ 0x842E27E .string "DEX$" -Str_842E282: @ 0x842E282 +Str_842E282:: @ 0x842E282 .string "message$" -Str_842E28A: @ 0x842E28A +Str_842E28A:: @ 0x842E28A .string "egg$" -Str_842E28E: @ 0x842E28E +Str_842E28E:: @ 0x842E28E .string "RAM seed$" -Str_842E297: @ 0x842E297 +Str_842E297:: @ 0x842E297 .string "trainer$" -Str_842E29F: @ 0x842E29F +Str_842E29F:: @ 0x842E29F .string "clock$" -Str_842E2A5: @ 0x842E2A5 +Str_842E2A5:: @ 0x842E2A5 .string "item$" -Str_842E2AA: @ 0x842E2AA +Str_842E2AA:: @ 0x842E2AA .string "goods$" -Str_842E2B0: @ 0x842E2B0 +Str_842E2B0:: @ 0x842E2B0 .string "potion$" -Str_842E2B7: @ 0x842E2B7 +Str_842E2B7:: @ 0x842E2B7 .string "ball$" -Str_842E2BC: @ 0x842E2BC +Str_842E2BC:: @ 0x842E2BC .string "cheri berry$" -Str_842E2C8: @ 0x842E2C8 +Str_842E2C8:: @ 0x842E2C8 .string "TM01$" .align 2 -_842E2D0:: +gUnknown_Debug_842E2D0:: .4byte Str_842E264, debug_sub_813C404+1 .4byte Str_842E26B, debug_sub_813C810+1 .4byte Str_842E26E, debug_sub_813C888+1 @@ -90,17 +89,17 @@ _842E2D0:: .4byte Str_842E2BC, debug_sub_813C598+1 .4byte Str_842E2C8, debug_sub_813C5A4+1 -_842E350:: +gUnknown_Debug_842E350:: .4byte 0x10 - .4byte _845DAE1 - .4byte _845DDB2 - .4byte _845E306 - .4byte _845E3E0 - .4byte _845E3E0 - .4byte _845E402 - .4byte _845E402 - .4byte _845E422 - .4byte _845E422 - .4byte _845E443 + .4byte gUnknown_Debug_845DAE1 + .4byte gUnknown_Debug_845DDB2 + .4byte gUnknown_Debug_845E306 + .4byte gUnknown_Debug_845E3E0 + .4byte gUnknown_Debug_845E3E0 + .4byte gUnknown_Debug_845E402 + .4byte gUnknown_Debug_845E402 + .4byte gUnknown_Debug_845E422 + .4byte gUnknown_Debug_845E422 + .4byte gUnknown_Debug_845E443 .endif diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 0549cb5c0..68c05270f 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -4223,7 +4223,7 @@ void debug_sub_808D54C() " .align 2, 0\n" "._325:\n" " .word gMain\n" - " .word gUnknown_Debug_083C1194+0x2\n" + " .word gUnknown_Debug_083C1196\n" "._323:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -4288,7 +4288,7 @@ void debug_sub_808D59C() " .align 2, 0\n" "._329:\n" " .word gUnknown_Debug_083C1194\n" - " .word gUnknown_Debug_083C1194+0x2\n" + " .word gUnknown_Debug_083C1196\n" "\n" ); } @@ -4554,7 +4554,7 @@ void debug_sub_808D790() " .align 2, 0\n" "._351:\n" " .word gMain\n" - " .word gUnknown_Debug_083C12D0+0x2\n" + " .word gUnknown_Debug_083C12D2\n" "._349:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -4619,7 +4619,7 @@ void debug_sub_808D7E0() " .align 2, 0\n" "._355:\n" " .word gUnknown_Debug_083C12D0\n" - " .word gUnknown_Debug_083C12D0+0x2\n" + " .word gUnknown_Debug_083C12D2\n" "\n" ); } diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c index 411b32fe3..fa944b25f 100644 --- a/src/debug/unk_debug_menu_3.c +++ b/src/debug/unk_debug_menu_3.c @@ -25,8 +25,8 @@ int debug_sub_813C404() "._2:\n" " .align 2, 0\n" "._1:\n" - " .word gOtherText_DataCannotUseVersion+0x30d\n" - " .word gOtherText_DataCannotUseVersion+0x3c\n" + " .word gUnknown_Debug_845DDB2\n" + " .word gUnknown_Debug_845DAE1\n" "\n" ); } @@ -53,8 +53,8 @@ int debug_sub_813C430() "._4:\n" " .align 2, 0\n" "._3:\n" - " .word gOtherText_DataCannotUseVersion+0x95d\n" - " .word gOtherText_DataCannotUseVersion+0x93b\n" + " .word gUnknown_Debug_845E402\n" + " .word gUnknown_Debug_845E3E0\n" "\n" ); } @@ -81,8 +81,8 @@ int debug_sub_813C45C() "._6:\n" " .align 2, 0\n" "._5:\n" - " .word gOtherText_DataCannotUseVersion+0x99e\n" - " .word gOtherText_DataCannotUseVersion+0x97d\n" + " .word gUnknown_Debug_845E443\n" + " .word gUnknown_Debug_845E422\n" "\n" ); } @@ -109,8 +109,8 @@ int debug_sub_813C488() "._8:\n" " .align 2, 0\n" "._7:\n" - " .word gOtherText_DataCannotUseVersion+0x97d\n" - " .word gOtherText_DataCannotUseVersion+0x95d\n" + " .word gUnknown_Debug_845E422\n" + " .word gUnknown_Debug_845E402\n" "\n" ); } @@ -132,8 +132,8 @@ int debug_sub_813C4B4() "._10:\n" " .align 2, 0\n" "._9:\n" - " .word gOtherText_DataCannotUseVersion+0xb74\n" - " .word gOtherText_DataCannotUseVersion+0xb61\n" + " .word gUnknown_Debug_845E619\n" + " .word gUnknown_Debug_845E606\n" "\n" ); } @@ -160,8 +160,8 @@ int debug_sub_813C4D4() "._12:\n" " .align 2, 0\n" "._11:\n" - " .word gOtherText_DataCannotUseVersion+0xc6d\n" - " .word gOtherText_DataCannotUseVersion+0xb74\n" + " .word gUnknown_Debug_845E712\n" + " .word gUnknown_Debug_845E619\n" "\n" ); } @@ -188,8 +188,8 @@ int debug_sub_813C500() "._14:\n" " .align 2, 0\n" "._13:\n" - " .word gOtherText_DataCannotUseVersion+0xcf2\n" - " .word gOtherText_DataCannotUseVersion+0xc6d\n" + " .word gUnknown_Debug_845E797\n" + " .word gUnknown_Debug_845E712\n" "\n" ); } @@ -234,9 +234,9 @@ void debug_sub_813C52C() "._16:\n" " .align 2, 0\n" "._15:\n" - " .word gOtherText_DataCannotUseVersion+0xd16\n" - " .word gOtherText_DataCannotUseVersion+0xcf2\n" - " .word gOtherText_DataCannotUseVersion+0xd10\n" + " .word gUnknown_Debug_845E7BB\n" + " .word gUnknown_Debug_845E797\n" + " .word gUnknown_Debug_845E7B5\n" "\n" ); } @@ -358,10 +358,10 @@ int debug_sub_813C5B4() " .align 2, 0\n" "._23:\n" " .word gSaveBlock1+0x3160\n" - " .word gOtherText_DataCannotUseVersion+0x331\n" - " .word gOtherText_DataCannotUseVersion+0x30d\n" - " .word gOtherText_DataCannotUseVersion+0x861\n" - " .word sUnusedFlashSectors+0x8\n" + " .word gUnknown_Debug_845DDD6\n" + " .word gUnknown_Debug_845DDB2\n" + " .word gUnknown_Debug_845E306\n" + " .word Str_842E23C\n" " .word 0xfff\n" " .word 0x52f\n" "\n" @@ -422,8 +422,8 @@ void debug_sub_813C638() " .align 2, 0\n" "._25:\n" " .word 0x270f\n" - " .word sUnusedFlashSectors+0xc\n" - " .word sUnusedFlashSectors+0x14\n" + " .word Str_842E240\n" + " .word Str_842E248\n" "\n" ); } @@ -590,12 +590,12 @@ int debug_sub_813C740() "._30:\n" " .align 2, 0\n" "._29:\n" - " .word gOtherText_DataCannotUseVersion+0x99e\n" - " .word gOtherText_DataCannotUseVersion+0xa4a\n" + " .word gUnknown_Debug_845E443\n" + " .word gUnknown_Debug_845E4EF\n" " .word gEnemyParty\n" - " .word sUnusedFlashSectors+0x4\n" - " .word gOtherText_DataCannotUseVersion+0x9c2\n" - " .word gOtherText_DataCannotUseVersion+0xa26\n" + " .word Str_842E238\n" + " .word gUnknown_Debug_845E467\n" + " .word gUnknown_Debug_845E4CB\n" "\n" ); } @@ -651,11 +651,11 @@ int debug_sub_813C810() "._32:\n" " .align 2, 0\n" "._31:\n" - " .word gOtherText_DataCannotUseVersion+0x99e\n" - " .word gOtherText_DataCannotUseVersion+0xa4a\n" + " .word gUnknown_Debug_845E443\n" + " .word gUnknown_Debug_845E4EF\n" " .word gEnemyParty\n" - " .word gOtherText_DataCannotUseVersion+0x9c2\n" - " .word gOtherText_DataCannotUseVersion+0xa26\n" + " .word gUnknown_Debug_845E467\n" + " .word gUnknown_Debug_845E4CB\n" "\n" ); } @@ -713,11 +713,11 @@ int debug_sub_813C888() "._34:\n" " .align 2, 0\n" "._33:\n" - " .word gOtherText_DataCannotUseVersion+0x99e\n" - " .word gOtherText_DataCannotUseVersion+0xa4a\n" + " .word gUnknown_Debug_845E443\n" + " .word gUnknown_Debug_845E4EF\n" " .word gEnemyParty\n" - " .word gOtherText_DataCannotUseVersion+0x9c2\n" - " .word gOtherText_DataCannotUseVersion+0xa26\n" + " .word gUnknown_Debug_845E467\n" + " .word gUnknown_Debug_845E4CB\n" "\n" ); } @@ -791,11 +791,11 @@ int debug_sub_813C93C() "._38:\n" " .align 2, 0\n" "._37:\n" - " .word gOtherText_DataCannotUseVersion+0xa4a\n" - " .word gOtherText_DataCannotUseVersion+0xb61\n" - " .word sUnusedFlashSectors+0x24\n" + " .word gUnknown_Debug_845E4EF\n" + " .word gUnknown_Debug_845E606\n" + " .word Str_842E253+5 @ weird...\n" " .word 0x270f\n" - " .word gOtherText_DataCannotUseVersion+0xa61\n" + " .word gUnknown_Debug_845E506\n" "\n" ); } diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index da2973945..c80a8f3e9 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -397,9 +397,9 @@ void debug_sub_815D04C() " .align 2, 0\n" "._125:\n" " .word gTasks\n" - " .word sUnusedFlashSectors+0x9c\n" + " .word gUnknown_Debug_842E2D0\n" " .word gMain\n" - " .word sUnusedFlashSectors+0x11c\n" + " .word gUnknown_Debug_842E350\n" "._123:\n" " sub r0, r1, #1\n" "._124:\n" @@ -435,7 +435,7 @@ void debug_sub_815D04C() " .align 2, 0\n" "._130:\n" " .word gTasks\n" - " .word sUnusedFlashSectors+0x11c\n" + " .word gUnknown_Debug_842E350\n" "._128:\n" " ldrh r0, [r4, #0xa]\n" " add r0, r0, #0x1\n" @@ -481,7 +481,7 @@ void debug_sub_815D04C() " .align 2, 0\n" "._133:\n" " .word gTasks\n" - " .word sUnusedFlashSectors+0x9c\n" + " .word gUnknown_Debug_842E2D0\n" " .word +0x2004000\n" " .word 0x43c\n" "\n" @@ -603,7 +603,7 @@ void debug_sub_815D1D8() "._161:\n" " .word gPaletteFade\n" " .word gLinkTestBlockChecksums+0x8\n" - " .word gUnknown_0841192C+0x14\n" + " .word Str_843DA70\n" " .word 0x43c\n" "._144:\n" " bl Menu_UpdateWindowText\n" @@ -653,7 +653,7 @@ void debug_sub_815D1D8() "._171:\n" " .word gReceivedRemoteLinkPlayers\n" " .word 0x43c\n" - " .word gUnknown_0841192C+0x28\n" + " .word Str_843DA84\n" "._146:\n" " bl Menu_UpdateWindowText\n" " lsl r0, r0, #0x18\n" @@ -690,8 +690,8 @@ void debug_sub_815D1D8() "._180:\n" " .align 2, 0\n" "._179:\n" - " .word gUnknown_0841192C+0x3c\n" - " .word +0x2004000\n" + " .word Str_843DA98\n" + " .word 0x2004000\n" " .word 0x2004\n" " .word gMain\n" " .word 0x43c\n" @@ -743,7 +743,7 @@ void debug_sub_815D1D8() " .align 2, 0\n" "._190:\n" " .word gReceivedRemoteLinkPlayers\n" - " .word gUnknown_0841192C+0x47\n" + " .word Str_843DAA3\n" " .word gMain\n" " .word 0x43c\n" "._152:\n" -- cgit v1.2.3 From 76c40aac928d139afa725182ab291436f809258d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 23 Jan 2018 08:09:31 -0500 Subject: Clean up English/German blocks (fingers crossed) --- src/battle/contest_link_80C857C.c | 46 ++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c index 01088bf53..4fb236294 100644 --- a/src/battle/contest_link_80C857C.c +++ b/src/battle/contest_link_80C857C.c @@ -215,24 +215,22 @@ void sub_80C8734(u8 taskId) case 0: if (GetMultiplayerId() == 0) { if (IsLinkTaskFinished()) { -#if GERMAN +#if ENGLISH + memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon)); + sub_8007E9C(2); + gTasks[taskId].data[0]++; +#elif GERMAN if (gTasks[taskId].data[0] == 0) { gTasks[taskId].data[0] = 3; } else { -#endif - memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon)); -#if GERMAN - de_sub_80C9274(FALSE); -#endif - sub_8007E9C(2); -#if ENGLISH - gTasks[taskId].data[0]++; -#elif GERMAN - gTasks[taskId].data[0] = 1; - } + memcpy(gBlockSendBuffer, gContestMons + gContestPlayerMonIndex, sizeof(struct ContestPokemon)); + de_sub_80C9274(FALSE); + sub_8007E9C(2); + gTasks[taskId].data[0] = 1; + } #endif } } @@ -350,7 +348,10 @@ void sub_80C8938(u8 taskId) { if (IsLinkTaskFinished()) { -#if GERMAN +#if ENGLISH + sub_8007E9C(2); + gTasks[taskId].data[0]++; +#elif GERMAN if (gTasks[taskId].data[0] == 0) { gTasks[taskId].data[0] = 3; @@ -358,11 +359,7 @@ void sub_80C8938(u8 taskId) else { de_sub_80C9274(TRUE); -#endif - sub_8007E9C(2); -#if ENGLISH - gTasks[taskId].data[0]++; -#elif GERMAN + sub_8007E9C(2); gTasks[taskId].data[0] = 1; } #endif @@ -626,7 +623,10 @@ void sub_80C8E1C(u8 taskId) { if (IsLinkTaskFinished()) { -#if GERMAN +#if ENGLISH + sub_8007E9C(2); + gTasks[taskId].data[0]++; +#elif GERMAN if (gTasks[taskId].data[0] == 0) { gTasks[taskId].data[0] = 3; @@ -634,12 +634,8 @@ void sub_80C8E1C(u8 taskId) else { de_sub_80C9274(FALSE); -#endif - sub_8007E9C(2); -#if ENGLISH - gTasks[taskId].data[0]++; -#elif GERMAN - gTasks[taskId].data[0] = 1; + sub_8007E9C(2); + gTasks[taskId].data[0] = 1; } #endif } -- cgit v1.2.3 From 960bc2dd01bfc5bada0cbd96318440c81cfc235d Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 15:29:39 -0600 Subject: fix more false offsets --- data/debug_menu_tomomichi.s | 48 +++++-- data/start_menu_debug.s | 265 ++++++++++++++++++------------------- src/debug/nakamura_debug_menu.c | 152 +++++++++++---------- src/debug/start_menu_debug.c | 171 ++++++++++++------------ src/debug/taya_debug_window.c | 30 ++--- src/debug/tomomichi_debug_menu.c | 278 ++++++++++++++++++++------------------- src/debug/watanabe_debug_menu.c | 211 ++++++++++++++--------------- src/engine/reset_rtc_screen.c | 8 +- sym_bss.txt | 2 +- 9 files changed, 615 insertions(+), 550 deletions(-) diff --git a/data/debug_menu_tomomichi.s b/data/debug_menu_tomomichi.s index c54a52bb1..19401bb85 100644 --- a/data/debug_menu_tomomichi.s +++ b/data/debug_menu_tomomichi.s @@ -837,8 +837,11 @@ gUnknown_Debug_083C1A9C:: @ 0x83C1A9C .4byte gUnknown_Debug_083C1A80, TomomichiDebugMenu_Config+1 .4byte gUnknown_Debug_083C1A8C, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C1AAC:: @ 0x83C1AAC - .string "い ょえヘえ              " + .string "い " +gUnknown_Debug_083C1AAE:: @ 0x83C1AAE + .string "ょえヘえ              " gUnknown_Debug_083C1AC0:: @ 0x83C1AC0 .string "ジムリーダー$" @@ -914,8 +917,11 @@ gUnknown_Debug_083C1C10:: @ 0x83C1C10 gUnknown_Debug_083C1C2C:: @ 0x83C1C2C .4byte gUnknown_Debug_083C1C10, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C1C34:: @ 0x83C1C34 - .string "くえあ “え’え,えCえGえOえSえZえ  iえjえkえlえ          mえ                " + .string "くえあ " +gUnknown_Debug_083C1C38:: @ 0x83C1C38 + .string "“え’え,えCえGえOえSえZえ  iえjえkえlえ          mえ                " gUnknown_Debug_083C1C6E:: @ 0x83C1C6E .string "120/119ばんどうろカクレオン$" @@ -1294,8 +1300,11 @@ gUnknown_Debug_083C26C8:: @ 0x83C26C8 .4byte gUnknown_Debug_083C2693, TomomichiDebugMenu_Config+1 .4byte gUnknown_Debug_083C26AC, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C2710:: @ 0x83C2710 - .string "けけけけかけけけけ aうPうbうeうfうgうhうiうjうNうhいZうプうHうネうイうXい{0xF8}いVいWいィうゥうェうベうらうりうンうbい▶いやうようコうツうテうワうヲうだうぢうLうMうRうSう      iいmいxいzいÖいÜいおうミうムう:いöいüい{0xF7}いせうそうボうパう1うnいoいpいqいぽうナうマうロう♀うルうブうんうQうYいビうウう0うYう" + .string "けけけけかけけけけ " +gUnknown_Debug_083C271A:: @ 0x83C271A + .string "aうPうbうeうfうgうhうiうjうNうhいZうプうHうネうイうXい{0xF8}いVいWいィうゥうェうベうらうりうンうbい▶いやうようコうツうテうワうヲうだうぢうLうMうRうSう      iいmいxいzいÖいÜいおうミうムう:いöいüい{0xF7}いせうそうボうパう1うnいoいpいqいぽうナうマうロう♀うルうブうんうQうYいビうウう0うYう" gUnknown_Debug_083C27BC:: @ 0x83C27BC .string "FEひでんわざ/デボンかんれん$" @@ -1686,7 +1695,11 @@ gUnknown_Debug_083C3194:: @ 0x83C3194 .4byte gUnknown_Debug_083C3192, TomomichiDebugMenu_Config+1 gUnknown_Debug_083C31DC:: @ 0x83C31DC - .string "けけけけけけけけう グ ホ レ ハ ヘ ヒ ゾ ズ ゼ コ サ シ ス セ ソ ああo ブ ゴ よあゥ ム  あもあらあさあ{0xF7} フ ン D G ふあ: Ä Ö Ü H I J K L ト ナ ニ ヌ ェ ほあみあやあゆあっ ア イ オ N O P Q R ウ エ カ キ ▶ ä ォ そあうあきあこあつあへあク ケ タ             " + .byte 9, 9, 9, 9, 9, 9, 9, 9, 3, 0 + + @ This is not a string. I don't feel like converting it right now. +gUnknown_Debug_83C31E6:: @ 0x83C31E6 + .string "グ ホ レ ハ ヘ ヒ ゾ ズ ゼ コ サ シ ス セ ソ ああo ブ ゴ よあゥ ム  あもあらあさあ{0xF7} フ ン D G ふあ: Ä Ö Ü H I J K L ト ナ ニ ヌ ェ ほあみあやあゆあっ ア イ オ N O P Q R ウ エ カ キ ▶ ä ォ そあうあきあこあつあへあク ケ タ             " gUnknown_Debug_083C3288:: @ 0x83C3288 .string "CYCLEかんれん$" @@ -1822,8 +1835,11 @@ gUnknown_Debug_083C351C:: .4byte gUnknown_Debug_083C345E, TomomichiDebugMenu_Config+1 .4byte gUnknown_Debug_083C346E, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C3544:: @ 0x83C3544 - .string "ういかけお らぞりぞるぞ            びぞぽぞ              むぞめぞぶぞぼぞれぞろぞ      みぞもぞやぞゆぞぞぞだぞぢぞでぞどぞばぞべぞぱぞぴぞよぞ        " + .string "ういかけお " +gUnknown_Debug_083C354A:: + .string "らぞりぞるぞ            びぞぽぞ              むぞめぞぶぞぼぞれぞろぞ      みぞもぞやぞゆぞぞぞだぞぢぞでぞどぞばぞべぞぱぞぴぞよぞ        " gUnknown_Debug_083C35A4:: @ 0x83C35A4 .string "OBJCHRWORK0ー8$" @@ -1905,8 +1921,11 @@ gUnknown_Debug_083C36E4:: .4byte gUnknown_Debug_083C3681, TomomichiDebugMenu_Config+1 .4byte gUnknown_Debug_083C368E, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C371C:: @ 0x83C371C - .string "けきたぞちぞつぞてぞとぞなぞにぞぬぞねぞのぞはぞひぞふぞへぞほぞまぞ    " + .string "けき" +gUnknown_Debug_083C371E:: @ 0x83C371E + .string "たぞちぞつぞてぞとぞなぞにぞぬぞねぞのぞはぞひぞふぞへぞほぞまぞ    " gUnknown_Debug_083C3742:: @ 0x83C3742 .string "SP$" @@ -2163,9 +2182,14 @@ gUnknown_Debug_83C3C00:: .4byte gUnknown_Debug_083C3A9D, TomomichiDebugMenu_Config+1 .4byte gUnknown_Debug_083C3A9E, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C3C48:: @ 0x83C3C48 - .string "かおけいけかョぞガぞギぞゲぞヂぞ’ぞ      5ぞGぞ♂ぞ6ぞ4ぞ        !ぞ?ぞ。ぞーぞ·ぞ‥ぞ“ぞ”ぞ♀ぞゾぞDぞ              グぞズぞバぞビぞベぞピぞ2ぞ3ぞ8ぞ‘ぞ¥ぞAぞBぞFぞKぞ      " + .string "かおけいけか" + +gUnknown_Debug_83C3C4E:: @ 0x83C3C4E + .string "ョぞガぞギぞゲぞヂぞ’ぞ      5ぞGぞ♂ぞ6ぞ4ぞ        !ぞ?ぞ。ぞーぞ·ぞ‥ぞ“ぞ”ぞ♀ぞゾぞDぞ              グぞズぞバぞビぞベぞピぞ2ぞ3ぞ8ぞ‘ぞ¥ぞAぞBぞFぞKぞ      " + @ But these are strings gUnknown_Debug_083C3CBA:: @ 0x83C3CBA .string "タウン$" @@ -2523,8 +2547,11 @@ gUnknown_Debug_083C4534:: .4byte gUnknown_Debug_083C4301, TomomichiDebugMenu_Config+1 .4byte gUnknown_Debug_083C4315, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C457C:: @ 0x83C457C - .string "くけけけけきかけけ っぞアぞイぞウぞエぞオぞカぞMぞ  キぞクぞケぞコぞサぞシぞスぞセぞソぞタぞチぞツぞテぞトぞナぞニぞヌぞネぞノぞハぞヒぞフぞヘぞホぞマぞミぞムぞメぞモぞヤぞユぞヨぞラぞリぞルぞレぞロぞワぞヲぞンぞァぞィぞゥぞ    ェぞォぞャぞザぞジぞHぞ      ュぞゼぞヅぞデぞドぞッぞ9ぞJぞLぞブぞボぞパぞ1ぞ7ぞ×ぞ/ぞEぞIぞ" + .string "くけけけけきかけけ " +gUnknown_Debug_083C4586:: @ 0x83C4586 + .string "っぞアぞイぞウぞエぞオぞカぞMぞ  キぞクぞケぞコぞサぞシぞスぞセぞソぞタぞチぞツぞテぞトぞナぞニぞヌぞネぞノぞハぞヒぞフぞヘぞホぞマぞミぞムぞメぞモぞヤぞユぞヨぞラぞリぞルぞレぞロぞワぞヲぞンぞァぞィぞゥぞ    ェぞォぞャぞザぞジぞHぞ      ュぞゼぞヅぞデぞドぞッぞ9ぞJぞLぞブぞボぞパぞ1ぞ7ぞ×ぞ/ぞEぞIぞ" gUnknown_Debug_083C4628:: @ 0x83C4628 .string "LOCALWORK0ー8$" @@ -2606,8 +2633,11 @@ gUnknown_Debug_083C4754C:: .4byte gUnknown_Debug_083C46F2, TomomichiDebugMenu_Config+1 .4byte gUnknown_Debug_083C46FE, TomomichiDebugMenu_Config+1 + @ These are not strings gUnknown_Debug_083C478C:: @ 0x83C478C - .string "けき ぞあぞいぞうぞえぞおぞかぞきぞくぞけぞこぞさぞしぞすぞせぞそぞ    " + .string "けき" +gUnknown_Debug_083C478E:: @ 0x83C478E + .string " ぞあぞいぞうぞえぞおぞかぞきぞくぞけぞこぞさぞしぞすぞせぞそぞ    " gUnknown_Debug_083C47B2:: .string "Level$" diff --git a/data/start_menu_debug.s b/data/start_menu_debug.s index 2c7b465c9..ded17c700 100644 --- a/data/start_menu_debug.s +++ b/data/start_menu_debug.s @@ -221,7 +221,7 @@ gDebug0x839B9BC:: .4byte Str_839B9A8, DebugMenu_OpenMurakawa+1 .4byte Str_839B9B1, DebugMenu_OpenKiwa+1 -_839BB64:: +gUnknown_Debug_839BB64:: .incbin "baserom_de_debug.gba", 0x39bb64, 64 gUnknown_Debug_0839BBA4:: @ 0x839BBA4 @@ -288,7 +288,7 @@ Str_839BC89: @ 0x839BC89 .string "Converter$" .align 2 -_839BC94: @ 0x839BC94 +gUnknown_Debug_839BC94:: @ 0x839BC94 .4byte Str_839BBD7, DebugMenu_8076CBC+1 .4byte Str_839BBE0, DebugMenu_8076CC0+1 .4byte Str_839BBE6, DebugMenu_8076CD4+1 @@ -306,54 +306,54 @@ _839BC94: @ 0x839BC94 .4byte Str_839BC7F, DebugMenu_8076E18+1 .4byte Str_839BC89, DebugMenu_8076EDC+1 -Str_839BD14: @ 0x839BD14 +Str_839BD14:: @ 0x839BD14 .string "うかえ$" -Str_839BD18: @ 0x839BD18 +Str_839BD18:: @ 0x839BD18 .string "      おけこしすせそ$" -Str_839BD26: @ 0x839BD26 +Str_839BD26:: @ 0x839BD26 .string "  い   " -Str_839BB64:: +Str_839BD2C:: .string "RTCを リセット します\n" .string "Aで じっこう   Bでキャンセル$" -Str_839BD4C: @ 0x839BD4C +Str_839BD4C:: @ 0x839BD4C .string "RTCを リセット した!$" -Str_839BD5A: @ 0x839BD5A +Str_839BD5A:: @ 0x839BD5A .string "セーブデータを コンバートします\n" .string "Aで けってい  Bで キャンセル$" -Str_839BD7D: @ 0x839BD7D +Str_839BD7D:: @ 0x839BD7D .string "へんかんが しゅうりょう しました!$" -Str_839BD90: @ 0x839BD90 +Str_839BD90:: @ 0x839BD90 .string "ジュンイチ$" -Str_839BD96: @ 0x839BD96 +Str_839BD96:: @ 0x839BD96 .string "ダイゴロウ$" -Str_839BD9C: @ 0x839BD9C +Str_839BD9C:: @ 0x839BD9C .string "テツジ$" -Str_839BDA0: @ 0x839BDA0 +Str_839BDA0:: @ 0x839BDA0 .string "バレンシア$" -Str_839BDA6: @ 0x839BDA6 +Str_839BDA6:: @ 0x839BDA6 .string "ハルコマチ$" -Str_839BDAC: @ 0x839BDAC +Str_839BDAC:: @ 0x839BDAC .string "RAYMOND$" -Str_839BDB4: @ 0x839BDB4 +Str_839BDB4:: @ 0x839BDB4 .string "TIFFANY$" -Str_839BDBC: @ 0x839BDBC +Str_839BDBC:: @ 0x839BDBC .string "くまxちえ$" .align 2 -_839BDC4: @ 0x839BDC4 +gUnknown_Debug_839BDC4:: @ 0x839BDC4 .4byte Str_839BD90, 0x0 .4byte Str_839BD96, 0x0 .4byte Str_839BDA0, 0x1 @@ -363,128 +363,128 @@ _839BDC4: @ 0x839BDC4 .4byte Str_839BD9C, 0x0 .4byte Str_839BDBC, 0x1 -Str_839BE04: @ 0x839BE04 +Str_839BE04:: @ 0x839BE04 .string "ID$" -Str_839BE07: @ 0x839BE07 +Str_839BE07:: @ 0x839BE07 .string "X$" -Str_839BE09: @ 0x839BE09 +Str_839BE09:: @ 0x839BE09 .string " Y$" -Str_839BE0C: @ 0x839BE0C +Str_839BE0C:: @ 0x839BE0C .string " H$" -Str_839BE0F: @ 0x839BE0F +Str_839BE0F:: @ 0x839BE0F .string "HP$" -Str_839BE12: @ 0x839BE12 +Str_839BE12:: @ 0x839BE12 .string "PAR$" -Str_839BE16: @ 0x839BE16 +Str_839BE16:: @ 0x839BE16 .string "SLP$" -Str_839BE1A: @ 0x839BE1A +Str_839BE1A:: @ 0x839BE1A .string "PSN$" -Str_839BE1E: @ 0x839BE1E +Str_839BE1E:: @ 0x839BE1E .string "ウマイ$" .align 2 -_839BE24: @ 0x839BE24 +gUnknown_Debug_839BE24:: @ 0x839BE24 .4byte Str_839BE0F, DebugMenu_8077434+1 .4byte Str_839BE12, DebugMenu_8077434+1 .4byte Str_839BE16, DebugMenu_8077434+1 .4byte Str_839BE1A, DebugMenu_8077434+1 .4byte Str_839BE1E, DebugMenu_8077434+1 -Str_839BE4C: @ 0x839BE4C +Str_839BE4C:: @ 0x839BE4C .string "OFF$" -Str_839BE50: @ 0x839BE50 +Str_839BE50:: @ 0x839BE50 .string "ON$" -Str_839BE53: @ 0x839BE53 +Str_839BE53:: @ 0x839BE53 .string "BG0\n" .string "BG1\n" .string "BG2\n" .string "BG3\n" .string "$" -Str_839BE64: @ 0x839BE64 +Str_839BE64:: @ 0x839BE64 .string "ON$" -Str_839BE67: @ 0x839BE67 +Str_839BE67:: @ 0x839BE67 .string "OFF$" -Str_839BE6B: @ 0x839BE6B +Str_839BE6B:: @ 0x839BE6B .string "さいせんかのうトレーナー:{STR_VAR_1}\n" .string "さいせんじょうたいトレーナー:{STR_VAR_2}$" -Str_839BE8D: @ 0x839BE8D +Str_839BE8D:: @ 0x839BE8D .string "いる$" -Str_839BE90: @ 0x839BE90 +Str_839BE90:: @ 0x839BE90 .string "いない$" -Str_839BE94: @ 0x839BE94 +Str_839BE94:: @ 0x839BE94 .string "Max num of steps$" -Str_839BEA5: @ 0x839BEA5 +Str_839BEA5:: @ 0x839BEA5 .string "Clear num of steps$" -Str_839BEB8: @ 0x839BEB8 +Str_839BEB8:: @ 0x839BEB8 .string "See trainers$" -Str_839BEC5: @ 0x839BEC5 +Str_839BEC5:: @ 0x839BEC5 .string "Flag all clear$" -Str_839BED4: @ 0x839BED4 +Str_839BED4:: @ 0x839BED4 .string "Flag all set$" .align 2 -_839BEE4: @ 0x839BEE4 +gUnknown_Debug_839BEE4:: @ 0x839BEE4 .4byte Str_839BEB8, DebugMenu_8077974+1 .4byte Str_839BE94, DebugMenu_8077A20+1 .4byte Str_839BEA5, DebugMenu_8077A40+1 .4byte Str_839BED4, DebugMenu_8077934+1 .4byte Str_839BEC5, DebugMenu_8077954+1 -Str_839BF0C: @ 0x839BF0C +Str_839BF0C:: @ 0x839BF0C .string "のこり {STR_VAR_1}ほ$" -Str_839BF14: @ 0x839BF14 +Str_839BF14:: @ 0x839BF14 .string "{STR_VAR_1}\n" .string "のこり {STR_VAR_2}ほ$" -Str_839BF1F: @ 0x839BF1F +Str_839BF1F:: @ 0x839BF1F .string "めのまえには\n" .string "キューブが ありません!$" -Str_839BF33: @ 0x839BF33 +Str_839BF33:: @ 0x839BF33 .string "ほすうをのこり1にする$" -Str_839BF3F: @ 0x839BF3F +Str_839BF3F:: @ 0x839BF3F .string "ボールをのこり1にする$" -Str_839BF4B: @ 0x839BF4B +Str_839BF4B:: @ 0x839BF4B .string "キューブおきば$" -Str_839BF53: @ 0x839BF53 +Str_839BF53:: @ 0x839BF53 .string "ボールをのこり30に$" -Str_839BF5E: @ 0x839BF5E +Str_839BF5E:: @ 0x839BF5E .string "ほすうをのこり500に$" .align 2 -_839BF6C: @ 0x839BF6C +gUnknown_Debug_839BF6C:: @ 0x839BF6C .4byte Str_839BF4B, DebugMenu_8077B00+1 .4byte Str_839BF5E, DebugMenu_8077ACC+1 .4byte Str_839BF33, DebugMenu_8077AE8+1 .4byte Str_839BF53, DebugMenu_8077A9C+1 .4byte Str_839BF3F, DebugMenu_8077AB4+1 -_839BF94: @ 0x839BF94 +gUnknown_Debug_839BF94:: @ 0x839BF94 .4byte gMoveNames + 13 * MOVE_CUT, DebugMenu_8077BB4+1 .4byte gMoveNames + 13 * MOVE_FLASH, DebugMenu_8077BC0+1 .4byte gMoveNames + 13 * MOVE_ROCK_SMASH, DebugMenu_8077BCC+1 @@ -495,20 +495,20 @@ _839BF94: @ 0x839BF94 .4byte gMoveNames + 13 * MOVE_DIVE, debug_sub_80B0800+1 .4byte gMoveNames + 13 * MOVE_SECRET_POWER, DebugMenu_8077BF4+1 -Str_839BFDC: @ 0x839BFDC +Str_839BFDC:: @ 0x839BFDC .string " じかん ふん びょう$" -_839BFE8:: +gUnknown_Debug_839BFE8:: .incbin "baserom_de_debug.gba", 0x39bfe8, 32 Str_839C008: @ 0x839C008 gDebug0x839C008:: .string "Which item?$" -Str_839C014: @ 0x839C014 +Str_839C014:: @ 0x839C014 .string "How many?$" -Str_839C01E: @ 0x839C01E +Str_839C01E:: @ 0x839C01E .string "にがおえ ばんごう\n" .string "ポケモンナンバー\n" .string "ポケモンめい\n" @@ -516,181 +516,181 @@ Str_839C01E: @ 0x839C01E .string "しゅるい\n" .string "こせいらんすう$" -Str_839C04D: @ 0x839C04D +Str_839C04D:: @ 0x839C04D .string "データなし$" -Str_839C053: @ 0x839C053 +Str_839C053:: @ 0x839C053 .string "Miracle Island emerged\n" .string "Random numbers:{STR_VAR_1}$" -Str_839C07C: @ 0x839C07C +Str_839C07C:: @ 0x839C07C .string "{STR_VAR_1}:{STR_VAR_2}\n" .string "{STR_VAR_3}$" -Str_839C085: @ 0x839C085 +Str_839C085:: @ 0x839C085 .string "みしよう データ$" -Str_839C08E: @ 0x839C08E +Str_839C08E:: @ 0x839C08E .string "Confirmation$" -Str_839C09B: @ 0x839C09B +Str_839C09B:: @ 0x839C09B .string "Max-1 set$" -Str_839C0A5: @ 0x839C0A5 +Str_839C0A5:: @ 0x839C0A5 .string "Zero clear$" -Str_839C0B0: @ 0x839C0B0 +Str_839C0B0:: @ 0x839C0B0 .string "レポート$" -Str_839C0B5: @ 0x839C0B5 - .string "クリア じかん$" +Str_839C0B5:: @ 0x839C0B5 + .string "クリア じかん$" -Str_839C0BD: @ 0x839C0BD +Str_839C0BD:: @ 0x839C0BD .string "りゅうこう さくせい$" -Str_839C0C8: @ 0x839C0C8 +Str_839C0C8:: @ 0x839C0C8 .string "きのみを うえたかいすう$" -Str_839C0D5: @ 0x839C0D5 +Str_839C0D5:: @ 0x839C0D5 .string "じてんしゃこうかん$" -Str_839C0DF: @ 0x839C0DF +Str_839C0DF:: @ 0x839C0DF .string "ほすう$" -Str_839C0E3: @ 0x839C0E3 +Str_839C0E3:: @ 0x839C0E3 .string "インタビュー$" -Str_839C0EA: @ 0x839C0EA +Str_839C0EA:: @ 0x839C0EA .string "バトル$" -Str_839C0EE: @ 0x839C0EE +Str_839C0EE:: @ 0x839C0EE .string "やせいバトル$" -Str_839C0F5: @ 0x839C0F5 +Str_839C0F5:: @ 0x839C0F5 .string "トレーナーバトル$" -Str_839C0FE: @ 0x839C0FE +Str_839C0FE:: @ 0x839C0FE .string "でんどういり$" -Str_839C105: @ 0x839C105 +Str_839C105:: @ 0x839C105 .string "ポケモンほかく$" -Str_839C10D: @ 0x839C10D +Str_839C10D:: @ 0x839C10D .string "つった かいすう$" -Str_839C116: @ 0x839C116 +Str_839C116:: @ 0x839C116 .string "タマゴかえった$" -Str_839C11E: @ 0x839C11E +Str_839C11E:: @ 0x839C11E .string "しんかした$" -Str_839C124: @ 0x839C124 +Str_839C124:: @ 0x839C124 .string "ポケセン かいふく$" -Str_839C12E: @ 0x839C12E +Str_839C12E:: @ 0x839C12E .string "じたく かいふく$" -Str_839C137: @ 0x839C137 +Str_839C137:: @ 0x839C137 .string "サファリ りよう$" -Str_839C140: @ 0x839C140 +Str_839C140:: @ 0x839C140 .string "ひでん:いあいぎり$" -Str_839C14A: @ 0x839C14A +Str_839C14A:: @ 0x839C14A .string "ひでん:いわくだき$" -Str_839C154: @ 0x839C154 +Str_839C154:: @ 0x839C154 .string "きち ひっこし$" -Str_839C15C: @ 0x839C15C +Str_839C15C:: @ 0x839C15C .string "つうしんこうかん$" -Str_839C165: @ 0x839C165 +Str_839C165:: @ 0x839C165 .string "つうしんたいせん$" -Str_839C16E: @ 0x839C16E +Str_839C16E:: @ 0x839C16E .string "つうしん かち$" -Str_839C176: @ 0x839C176 +Str_839C176:: @ 0x839C176 .string "つうしん まけ$" -Str_839C17E: @ 0x839C17E +Str_839C17E:: @ 0x839C17E .string "つうしん ひきわけ$" -Str_839C188: @ 0x839C188 +Str_839C188:: @ 0x839C188 .string "わざ:はねる$" -Str_839C18F: @ 0x839C18F +Str_839C18F:: @ 0x839C18F .string "わざ:わるあがき$" -Str_839C198: @ 0x839C198 +Str_839C198:: @ 0x839C198 .string "スロットおおあたりかいすう$" -Str_839C1A6: @ 0x839C1A6 +Str_839C1A6:: @ 0x839C1A6 .string "ルーレット れんしょう$" -Str_839C1B2: @ 0x839C1B2 +Str_839C1B2:: @ 0x839C1B2 .string "バトルタワー$" -Str_839C1B9: @ 0x839C1B9 +Str_839C1B9:: @ 0x839C1B9 .string "バトルタワーかち$" -Str_839C1C2: @ 0x839C1C2 +Str_839C1C2:: @ 0x839C1C2 .string "バトルタワーれんしょう$" -Str_839C1CE: @ 0x839C1CE +Str_839C1CE:: @ 0x839C1CE .string "ポロックさくせい$" -Str_839C1D7: @ 0x839C1D7 +Str_839C1D7:: @ 0x839C1D7 .string "つうしんでポロックつくった$" -Str_839C1E5: @ 0x839C1E5 +Str_839C1E5:: @ 0x839C1E5 .string "つうしんコンテストかち$" -Str_839C1F1: @ 0x839C1F1 +Str_839C1F1:: @ 0x839C1F1 .string "CPUコンテストさんか$" -Str_839C1FD: @ 0x839C1FD +Str_839C1FD:: @ 0x839C1FD .string "CPUコンテストかち$" -Str_839C208: @ 0x839C208 +Str_839C208:: @ 0x839C208 .string "かいもの$" -Str_839C20D: @ 0x839C20D +Str_839C20D:: @ 0x839C20D .string "ダウジングマシン$" -Str_839C216: @ 0x839C216 +Str_839C216:: @ 0x839C216 .string "あめふり$" -Str_839C21B: @ 0x839C21B +Str_839C21B:: @ 0x839C21B .string "ずかんをみた$" -Str_839C222: @ 0x839C222 +Str_839C222:: @ 0x839C222 .string "リボン もらった$" -Str_839C22B: @ 0x839C22B +Str_839C22B:: @ 0x839C22B .string "だんさ とびおり$" -Str_839C234: @ 0x839C234 +Str_839C234:: @ 0x839C234 .string "TVを みた$" -Str_839C23B: @ 0x839C23B +Str_839C23B:: @ 0x839C23B .string "とけいを みた$" -Str_839C243: @ 0x839C243 +Str_839C243:: @ 0x839C243 .string "くじが あたった$" -Str_839C24C: @ 0x839C24C +Str_839C24C:: @ 0x839C24C .string "ポケモンあずけた$" -Str_839C255: @ 0x839C255 +Str_839C255:: @ 0x839C255 .string "ロープウェイりよう$" -Str_839C25F: @ 0x839C25F +Str_839C25F:: @ 0x839C25F .string "おんせん はいった$" .align 2 -_839C270: @ 0x839C270 +gUnknown_Debug_839C26C:: @ 0x839C26C .4byte 0xFFFFFF, Str_839C0B0 .4byte 0x3E73B3B, Str_839C0B5 .4byte 0xFFFFFF, Str_839C0BD @@ -742,60 +742,61 @@ _839C270: @ 0x839C270 .4byte 0xFFFFFF, Str_839C255 .4byte 0xFFFFFF, Str_839C25F -_839C3FC: @ 0x839C3FC +gUnknown_Debug_839C3FC:: @ 0x839C3FC .4byte Str_839C08E, DebugMenu_8078774+1 .4byte Str_839C09B, DebugMenu_8078788+1 .4byte Str_839C0A5, DebugMenu_807879C+1 -Str_839C414: @ 0x839C414 +Str_839C414:: @ 0x839C414 .string "ATTR:{STR_VAR_1} HEIGHT:{STR_VAR_3}\n" .string "CODE:{STR_VAR_2}$" -Str_839C42E: @ 0x839C42E +Str_839C42E:: @ 0x839C42E .string "レベル  ステージ$" -Str_839C438: @ 0x839C438 +Str_839C438:: @ 0x839C438 .string "ポロック グループ{STR_VAR_1}$" -_839C444:: +gUnknown_Debug_839C444:: .incbin "baserom_de_debug.gba", 0x39c444, 304 -Str_839C574: @ 0x839C574 +Str_839C574:: @ 0x839C574 gDebug0x839C574:: .string "write to flash$" -Str_839C583: @ 0x839C583 +Str_839C583:: @ 0x839C583 .string "read from flash$" .align 2 -_839C594: @ 0x839C594 +gUnknown_Debug_839C594:: @ 0x839C594 .4byte gDebug0x839C574, DebugMenu_8078C80+1 .4byte Str_839C583, DebugMenu_8078D30+1 -Str_839C5A4: @ 0x839C5A4 +Str_839C5A4:: @ 0x839C5A4 .string "Press A, begin to write\n" .string "Press B, cancel$" -Str_839C5CC: @ 0x839C5CC +Str_839C5CC:: @ 0x839C5CC .string "かきこみ せいこう$" -Str_839C5D6: @ 0x839C5D6 +Str_839C5D6:: @ 0x839C5D6 .string "よみこみせいこう$" -Str_839C5DF: @ 0x839C5DF +Str_839C5DF:: @ 0x839C5DF .string "かきこみ しっぱい$" -Str_839C5E9: @ 0x839C5E9 +Str_839C5E9:: @ 0x839C5E9 .string "よみこみ しっぱい$" -_839c5f3:: - .incbin "baserom_de_debug.gba", 0x39c5f3, 25 + .align 1 +gUnknown_Debug_839C5F4:: + .incbin "baserom_de_debug.gba", 0x39c5f4, 24 -Str_839C60C: @ 0x839C60C +Str_839C60C:: @ 0x839C60C gDebug0x839C60C:: .string "Set FLASH ERR$" -Str_839C61A: @ 0x839C61A +Str_839C61A:: @ 0x839C61A .string "abcde; abcde: ABCDE; ABCDE:\p" .string "Tableaux des verbes du 2{SUPER_E} groupe.\p" .string "La1{SUPER_RE} chose à apprendre c’est de lire.\p" diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 67f4a1af7..328903126 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -2,9 +2,19 @@ #include "global.h" #include "menu.h" -EWRAM_DATA u8 _nakamuraData[0x10] = {0}; +EWRAM_DATA u8 _nakamuraData0 = 0; +EWRAM_DATA u8 _nakamuraData1 = 0; +EWRAM_DATA u8 _nakamuraData2 = 0; +EWRAM_DATA u8 _nakamuraData3 = 0; +EWRAM_DATA u8 _nakamuraData4 = 0; +EWRAM_DATA u8 _nakamuraData5 = 0; +EWRAM_DATA u16 _nakamuraData6 = 0; +EWRAM_DATA u16 _nakamuraData8 = 0; +EWRAM_DATA u16 _nakamuraDataA = 0; +EWRAM_DATA u16 _nakamuraDataC = 0; -static u8 _nakamuraStatic[32] __attribute__((unused)); +__attribute__((unused)) static u8 _nakamuraStatic0[0x18]; +__attribute__((unused)) static u8 _nakamuraStatic18; u8 debug_sub_815FC54(); u8 debug_sub_815F2B4(); @@ -605,7 +615,7 @@ void debug_sub_815F470() " .align 2, 0\n" "._39:\n" " .word gSaveBlock1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word 0x1a08\n" " .word _843E424\n" "._37:\n" @@ -719,7 +729,7 @@ void debug_sub_815F4D8() " .align 2, 0\n" "._43:\n" " .word gStringVar1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1\n" " .word 0x1a08\n" " .word Str_843E550\n" @@ -752,7 +762,7 @@ void debug_sub_815F5C4() " .align 2, 0\n" "._48:\n" " .word gMain\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._46:\n" " sub r0, r0, #0x1\n" " b ._50\n" @@ -770,7 +780,7 @@ void debug_sub_815F5C4() "._55:\n" " .align 2, 0\n" "._54:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._52:\n" " add r0, r0, #0x1\n" "._50:\n" @@ -824,7 +834,7 @@ u8 debug_sub_815F62C() "._60:\n" " .align 2, 0\n" "._59:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gMenuCallback\n" " .word debug_sub_815F5C4+1\n" "\n" @@ -885,7 +895,7 @@ void debug_sub_815F668() "._62:\n" " .align 2, 0\n" "._61:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a11\n" " .word gStringVar1\n" " .word 0x186a0\n" @@ -927,7 +937,7 @@ void debug_sub_815F6E4() " .align 2, 0\n" "._63:\n" " .word gStringVar1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a0a\n" "\n" ); @@ -975,7 +985,7 @@ void debug_sub_815F72C() " .align 2, 0\n" "._66:\n" " .word gStringVar1\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1\n" " .word 0x1a08\n" "\n" @@ -1006,7 +1016,7 @@ void debug_sub_815F788() " .align 2, 0\n" "._68:\n" " .word Str_843E574\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "\n" ); } @@ -1029,7 +1039,7 @@ void debug_sub_815F7B4() "._73:\n" " .align 2, 0\n" "._72:\n" - " .word _nakamuraData+0x1\n" + " .word _nakamuraData1\n" "._70:\n" " ldr r0, ._74\n" " ldrb r0, [r0]\n" @@ -1045,7 +1055,7 @@ void debug_sub_815F7B4() "._75:\n" " .align 2, 0\n" "._74:\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData3\n" " .word Str_843E576\n" "\n" ); @@ -1115,9 +1125,9 @@ void debug_sub_815F7F0() "._79:\n" " .align 2, 0\n" "._78:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a11\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "\n" ); } @@ -1158,9 +1168,9 @@ void debug_sub_815F86C() "._85:\n" " .align 2, 0\n" "._84:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1+0x1a0a\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "._80:\n" " ldr r0, ._87\n" " ldrb r0, [r0]\n" @@ -1174,7 +1184,7 @@ void debug_sub_815F86C() "._88:\n" " .align 2, 0\n" "._87:\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData3\n" " .word ._89\n" "._89:\n" " .word ._90\n" @@ -1229,7 +1239,7 @@ void debug_sub_815F86C() "._102:\n" " .align 2, 0\n" "._101:\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "\n" ); } @@ -1260,7 +1270,7 @@ void debug_sub_815F930() "._108:\n" " .align 2, 0\n" "._107:\n" - " .word _nakamuraData+0x1\n" + " .word _nakamuraData1\n" " .word gMain\n" "._105:\n" " mov r0, #0x1\n" @@ -1296,7 +1306,7 @@ void debug_sub_815F930() "._118:\n" " .align 2, 0\n" "._117:\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "._115:\n" " sub r0, r0, #0x1\n" "._116:\n" @@ -1319,7 +1329,7 @@ void debug_sub_815F930() "._124:\n" " .align 2, 0\n" "._123:\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData2\n" "._121:\n" " add r0, r1, #1\n" " strb r0, [r2]\n" @@ -1344,7 +1354,7 @@ void debug_sub_815F930() "._130:\n" " .align 2, 0\n" "._129:\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData3\n" "._126:\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -1433,7 +1443,7 @@ void debug_sub_815FA38() "._147:\n" " .align 2, 0\n" "._146:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._144:\n" " sub r0, r0, #0x1\n" " b ._148\n" @@ -1453,7 +1463,7 @@ void debug_sub_815FA38() "._153:\n" " .align 2, 0\n" "._152:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" "._150:\n" " add r0, r0, #0x1\n" "._148:\n" @@ -1495,11 +1505,11 @@ void debug_sub_815FA38() "._160:\n" " .align 2, 0\n" "._159:\n" - " .word _nakamuraData\n" + " .word _nakamuraData0\n" " .word gSaveBlock1\n" " .word 0x1a08\n" - " .word _nakamuraData+0x1\n" - " .word _nakamuraData+0x2\n" + " .word _nakamuraData1\n" + " .word _nakamuraData2\n" " .word gMenuCallback\n" " .word debug_sub_815F930+1\n" "._155:\n" @@ -1558,8 +1568,8 @@ u8 debug_sub_815FB1C() "._163:\n" " .align 2, 0\n" "._162:\n" - " .word _nakamuraData\n" - " .word _nakamuraData+0x3\n" + " .word _nakamuraData0\n" + " .word _nakamuraData3\n" " .word gMenuCallback\n" " .word debug_sub_815FA38+1\n" "\n" @@ -2216,7 +2226,7 @@ void debug_sub_815FFDC() " .align 2, 0\n" "._214:\n" " .word Str_843E5D4\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word gPlayerParty\n" "._212:\n" " mov r0, #0x1\n" @@ -2249,7 +2259,7 @@ void debug_sub_815FFDC() "._218:\n" " .align 2, 0\n" "._217:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" " .word gMenuCallback\n" " .word debug_sub_8160498+1\n" "\n" @@ -2284,7 +2294,7 @@ void debug_sub_816009C() "._220:\n" " .align 2, 0\n" "._219:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word gSpeciesNames\n" "\n" ); @@ -2386,7 +2396,7 @@ void debug_sub_816013C() " .align 2, 0\n" "._229:\n" " .word gStringVar1\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -2430,7 +2440,7 @@ void debug_sub_816017C() "._233:\n" " .align 2, 0\n" "._232:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -2508,7 +2518,7 @@ void debug_sub_81601C8() "._240:\n" " .align 2, 0\n" "._239:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word 0xfffffe65\n" " .word 0x19b\n" " .word gPlayerParty\n" @@ -2538,7 +2548,7 @@ void debug_sub_8160258() "._243:\n" " .align 2, 0\n" "._242:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -2613,7 +2623,7 @@ void debug_sub_816027C() "._248:\n" " .align 2, 0\n" "._247:\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" " .word gPlayerParty\n" " .word gBaseStats\n" " .word gExperienceTables\n" @@ -2759,7 +2769,7 @@ void debug_sub_81603B8() "._260:\n" " .align 2, 0\n" "._259:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" " .word _843E5D1\n" "._257:\n" " lsl r0, r5, #0x1\n" @@ -2780,7 +2790,7 @@ void debug_sub_81603B8() "._265:\n" " .align 2, 0\n" "._264:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._262:\n" " lsl r0, r5, #0x1\n" " add r0, r0, r5\n" @@ -2926,7 +2936,7 @@ void debug_sub_8160498() "._290:\n" " .align 2, 0\n" "._289:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._284:\n" " mov r0, #0x2\n" " and r0, r0, r1\n" @@ -2942,7 +2952,7 @@ void debug_sub_8160498() "._295:\n" " .align 2, 0\n" "._294:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._291:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -2985,7 +2995,7 @@ void debug_sub_8160498() "._302:\n" " .align 2, 0\n" "._301:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._296:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" @@ -3041,7 +3051,7 @@ void debug_sub_8160498() "._309:\n" " .align 2, 0\n" "._308:\n" - " .word _nakamuraData+0x4\n" + " .word _nakamuraData4\n" "._303:\n" " mov r0, #0x8\n" " and r0, r0, r2\n" @@ -3179,7 +3189,7 @@ void debug_sub_816062C() " .align 2, 0\n" "._323:\n" " .word gPlayerParty\n" - " .word _nakamuraStatic\n" + " .word _nakamuraStatic0\n" "\n" ); } @@ -3703,7 +3713,7 @@ void debug_sub_8160A80() "._423:\n" " .align 2, 0\n" "._422:\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" " .word gStringVar1\n" "._420:\n" " cmp r0, #0x1\n" @@ -3813,7 +3823,7 @@ void debug_sub_8160B50() "._446:\n" " .align 2, 0\n" "._445:\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" "._443:\n" " cmp r0, #0x1\n" " bne ._447 @cond_branch\n" @@ -3883,7 +3893,7 @@ void debug_sub_8160BB0() " .align 2, 0\n" "._456:\n" " .word gStringVar1\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" "\n" ); } @@ -4027,7 +4037,7 @@ void debug_sub_8160C7C() "._470:\n" " .align 2, 0\n" "._469:\n" - " .word _nakamuraStatic+0x18\n" + " .word _nakamuraStatic18\n" "\n" ); } @@ -4462,7 +4472,7 @@ void debug_sub_8161028() "._497:\n" " .align 2, 0\n" "._496:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" " .word gPlayerParty\n" "._491:\n" " cmp r1, #0x1\n" @@ -4480,7 +4490,7 @@ void debug_sub_8161028() "._502:\n" " .align 2, 0\n" "._501:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" "._493:\n" " ldr r0, ._504\n" " strb r5, [r0]\n" @@ -4488,7 +4498,7 @@ void debug_sub_8161028() "._505:\n" " .align 2, 0\n" "._504:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" "._499:\n" " ldrb r1, [r4]\n" " mov r0, #0x64\n" @@ -4551,7 +4561,7 @@ void debug_sub_81610BC() "._516:\n" " .align 2, 0\n" "._515:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" " .word gPlayerParty\n" "._513:\n" " mov r0, #0x2\n" @@ -4600,7 +4610,7 @@ void DebugMenu_EffortValues() "._520:\n" " .align 2, 0\n" "._519:\n" - " .word _nakamuraData+0x5\n" + " .word _nakamuraData5\n" " .word gPlayerParty\n" " .word gMenuCallback\n" " .word debug_sub_81610BC+1\n" @@ -4628,8 +4638,8 @@ void debug_sub_8161160() "._524:\n" " .align 2, 0\n" "._523:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" "._521:\n" " ldrh r6, [r1]\n" " ldrh r5, [r2]\n" @@ -4673,8 +4683,8 @@ void debug_sub_8161160() "._530:\n" " .align 2, 0\n" "._529:\n" - " .word _nakamuraData+0xa\n" - " .word _nakamuraData+0xc\n" + " .word _nakamuraDataA\n" + " .word _nakamuraDataC\n" "\n" ); } @@ -4901,10 +4911,10 @@ void debug_sub_81612EC() "._551:\n" " .align 2, 0\n" "._550:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" - " .word _nakamuraData+0xc\n" - " .word _nakamuraData+0xa\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" + " .word _nakamuraDataC\n" + " .word _nakamuraDataA\n" "._544:\n" " mov r0, #0x10\n" " and r0, r0, r1\n" @@ -4944,10 +4954,10 @@ void debug_sub_81612EC() "._559:\n" " .align 2, 0\n" "._558:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" - " .word _nakamuraData+0xc\n" - " .word _nakamuraData+0xa\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" + " .word _nakamuraDataC\n" + " .word _nakamuraDataA\n" "._552:\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x1\n" @@ -4968,7 +4978,7 @@ void debug_sub_81612EC() "._564:\n" " .align 2, 0\n" "._563:\n" - " .word _nakamuraData+0xc\n" + " .word _nakamuraDataC\n" "._560:\n" " mov r0, #0x2\n" " and r0, r0, r1\n" @@ -5018,10 +5028,10 @@ void DebugMenu_RandomNumberTest() "._567:\n" " .align 2, 0\n" "._566:\n" - " .word _nakamuraData+0x6\n" - " .word _nakamuraData+0x8\n" - " .word _nakamuraData+0xc\n" - " .word _nakamuraData+0xa\n" + " .word _nakamuraData6\n" + " .word _nakamuraData8\n" + " .word _nakamuraDataC\n" + " .word _nakamuraDataA\n" " .word gMenuCallback\n" " .word debug_sub_81612EC+1\n" "\n" diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index d9f14a6b8..318785945 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -1,5 +1,14 @@ #if DEBUG +#include "global.h" + +__attribute__((unused)) static u8 gUnknown_030006B8[4]; +__attribute__((unused)) static u8 gUnknown_030006BC[4]; +__attribute__((unused)) static u8 gUnknown_030006C0; +__attribute__((unused)) static u8 gUnknown_030006C1; +__attribute__((unused)) static void *gUnknown_030006C4; +__attribute__((unused)) static u8 gUnknown_030006C8; + __attribute__((naked)) void debug_sub_8076AC8() { @@ -65,9 +74,9 @@ void debug_sub_8076AC8() "._4:\n" " .align 2, 0\n" "._3:\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" - " .word gUnknown_Debug_0839BBC1+0x153\n" - " .word gUnknown_Debug_0839BBC1+0xd3\n" + " .word gUnknown_030006C4 \n" + " .word Str_839BD14\n" + " .word gUnknown_Debug_839BC94\n" "\n" ); } @@ -178,8 +187,8 @@ void debug_sub_8076BB4() " .align 2, 0\n" "._13:\n" " .word gTasks+0x8\n" - " .word gUnknown_Debug_0839BBC1+0xd3\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" + " .word gUnknown_Debug_839BC94\n" + " .word gUnknown_030006C4 \n" "._10:\n" " ldr r0, ._18\n" " ldrh r1, [r0, #0x2e]\n" @@ -511,7 +520,7 @@ void DebugMenu_8076D6C() "._57:\n" " .align 2, 0\n" "._56:\n" - " .word gUnknown_Debug_0839BBC1+0x16b\n" + " .word Str_839BD2C\n" "._47:\n" " ldr r0, ._60\n" " ldrh r2, [r0, #0x2e]\n" @@ -535,7 +544,7 @@ void DebugMenu_8076D6C() " .align 2, 0\n" "._60:\n" " .word gMain\n" - " .word gUnknown_Debug_0839BBC1+0x18b\n" + " .word Str_839BD4C\n" "._58:\n" " mov r0, #0x2\n" " and r0, r0, r2\n" @@ -626,7 +635,7 @@ void DebugMenu_8076E30() "._79:\n" " .align 2, 0\n" "._78:\n" - " .word gUnknown_Debug_0839BBC1+0x199\n" + " .word Str_839BD5A\n" "._69:\n" " ldr r0, ._82\n" " ldrh r2, [r0, #0x2e]\n" @@ -650,7 +659,7 @@ void DebugMenu_8076E30() " .align 2, 0\n" "._82:\n" " .word gMain\n" - " .word gUnknown_Debug_0839BBC1+0x1bc\n" + " .word Str_839BD7D\n" "._80:\n" " mov r0, #0x2\n" " and r0, r0, r2\n" @@ -759,7 +768,7 @@ void DebugMenu_8076EF4() "._94:\n" " .align 2, 0\n" "._93:\n" - " .word gUnknown_Debug_0839BBC1+0x203\n" + " .word gUnknown_Debug_839BDC4\n" "\n" ); } @@ -816,7 +825,7 @@ void DebugMenu_8076F60() "._101:\n" " .align 2, 0\n" "._100:\n" - " .word gUnknown_Debug_0839BBC1+0x203\n" + " .word gUnknown_Debug_839BDC4\n" " .word gSaveBlock2\n" "._98:\n" " mov r0, #0x1\n" @@ -872,9 +881,9 @@ void DebugMenu_8077004() "._107:\n" " .align 2, 0\n" "._106:\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" - " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" - " .word gDebug0x839B9BC+0x1a8\n" + " .word gUnknown_030006C4 \n" + " .word gUnknown_030006C1 \n" + " .word gUnknown_Debug_839BB64\n" "\n" ); } @@ -1006,8 +1015,8 @@ void DebugMenu_807709C() " .align 2, 0\n" "._120:\n" " .word gMain\n" - " .word 0x030006c0 @ gNumTilesetAnimDmas\n" - " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" + " .word gUnknown_030006C0 \n" + " .word gUnknown_030006C1 \n" "._118:\n" " sub r0, r0, #0x1\n" "._119:\n" @@ -1033,7 +1042,7 @@ void DebugMenu_807709C() " .align 2, 0\n" "._125:\n" " .word gMain\n" - " .word 0x030006c0+0x1 @ gNumTilesetAnimDmas+0x1\n" + " .word gUnknown_030006C1 \n" "._123:\n" " add r0, r0, #0x1\n" "._124:\n" @@ -1069,8 +1078,8 @@ void DebugMenu_807709C() "._129:\n" " .word gMain\n" " .word gDebug0x839B9BC\n" - " .word 0x030006c0 @ gNumTilesetAnimDmas\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" + " .word gUnknown_030006C0 \n" + " .word gUnknown_030006C4 \n" "._127:\n" " mov r0, #0xa\n" " and r0, r0, r1\n" @@ -1127,8 +1136,8 @@ void DebugMenu_807719C() " .align 2, 0\n" "._133:\n" " .word gDebug0x839B9BC\n" - " .word 0x30006c4 @ gTileset1AnimLength\n" - " .word 0x030006c0 @ gNumTilesetAnimDmas\n" + " .word gUnknown_030006C4 \n" + " .word gUnknown_030006C0 \n" "\n" ); } @@ -1168,7 +1177,7 @@ void DebugMenu_80771EC() " .align 2, 0\n" "._135:\n" " .word gStringVar4\n" - " .word gUnknown_Debug_0839BBC1+0x243\n" + " .word Str_839BE04\n" " .word gSaveBlock1\n" "\n" ); @@ -1303,9 +1312,9 @@ void DebugMenu_8077238() "._140:\n" " .align 2, 0\n" "._139:\n" - " .word gUnknown_Debug_0839BBC1+0x246\n" - " .word gUnknown_Debug_0839BBC1+0x248\n" - " .word gUnknown_Debug_0839BBC1+0x24b\n" + " .word Str_839BE07\n" + " .word Str_839BE09\n" + " .word Str_839BE0C\n" " .word gStringVar4\n" "\n" ); @@ -1527,7 +1536,7 @@ void DebugMenu_8077434() "._158:\n" " .align 2, 0\n" "._157:\n" - " .word gUnknown_Debug_0839BBC1+0x24e\n" + " .word Str_839BE0F\n" "._152:\n" " ldr r0, ._160\n" " mov r1, #0x2\n" @@ -1542,7 +1551,7 @@ void DebugMenu_8077434() "._161:\n" " .align 2, 0\n" "._160:\n" - " .word gUnknown_Debug_0839BBC1+0x251\n" + " .word Str_839BE12\n" "._153:\n" " ldr r0, ._163\n" " mov r1, #0x3\n" @@ -1556,7 +1565,7 @@ void DebugMenu_8077434() "._164:\n" " .align 2, 0\n" "._163:\n" - " .word gUnknown_Debug_0839BBC1+0x255\n" + " .word Str_839BE16\n" "._154:\n" " ldr r0, ._166\n" " mov r1, #0x4\n" @@ -1576,7 +1585,7 @@ void DebugMenu_8077434() "._167:\n" " .align 2, 0\n" "._166:\n" - " .word gUnknown_Debug_0839BBC1+0x259\n" + " .word Str_839BE1A\n" "._155:\n" " ldr r0, ._168\n" " mov r1, #0x4\n" @@ -1598,7 +1607,7 @@ void DebugMenu_8077434() "._169:\n" " .align 2, 0\n" "._168:\n" - " .word gUnknown_Debug_0839BBC1+0x25d\n" + " .word Str_839BE1E\n" "\n" ); } @@ -1617,7 +1626,7 @@ void DebugMenu_807750C() "._171:\n" " .align 2, 0\n" "._170:\n" - " .word gUnknown_Debug_0839BBC1+0x263\n" + " .word gUnknown_Debug_839BE24\n" "\n" ); } @@ -1640,7 +1649,7 @@ void DebugMenu_SetRamBerry() "._173:\n" " .align 2, 0\n" "._172:\n" - " .word gUnknown_Debug_0839BBC1+0x263\n" + " .word gUnknown_Debug_839BE24\n" " .word gMenuCallback\n" " .word DebugMenu_807750C+1\n" "\n" @@ -1960,8 +1969,8 @@ void DebugMenu_80776B4() "._184:\n" " .align 2, 0\n" "._183:\n" - " .word gUnknown_Debug_0839BBC1+0x28b\n" - " .word 0x30006c8 @ gTileset2AnimLength\n" + " .word Str_839BE4C\n" + " .word gUnknown_030006C8 \n" "\n" ); } @@ -2007,8 +2016,8 @@ void DebugMenu_8077704() "._186:\n" " .align 2, 0\n" "._185:\n" - " .word gUnknown_Debug_0839BBC1+0x292\n" - " .word 0x30006c8 @ gTileset2AnimLength\n" + " .word Str_839BE53\n" + " .word gUnknown_030006C8 \n" "\n" ); } @@ -2040,7 +2049,7 @@ void DebugMenu_8077760() " .align 2, 0\n" "._190:\n" " .word gMain\n" - " .word 0x030006b0+0x8 @ gMenu+0x8\n" + " .word gUnknown_030006B8 \n" "._188:\n" " mov r0, #0x3\n" "._189:\n" @@ -2064,7 +2073,7 @@ void DebugMenu_8077760() "._196:\n" " .align 2, 0\n" "._195:\n" - " .word 0x030006b0+0x8 @ gMenu+0x8\n" + " .word gUnknown_030006B8 \n" "._193:\n" " mov r0, #0x0\n" "._194:\n" @@ -2117,7 +2126,7 @@ void DebugMenu_8077760() "._202:\n" " .align 2, 0\n" "._201:\n" - " .word 0x30006c8 @ gTileset2AnimLength\n" + " .word gUnknown_030006C8 \n" " .word 0xf0ff\n" "._199:\n" " mov r0, #0x0\n" @@ -2193,7 +2202,7 @@ void DebugMenu_807786C() "._206:\n" " .align 2, 0\n" "._205:\n" - " .word gUnknown_Debug_0839BBC1+0x2a3\n" + " .word Str_839BE64\n" "\n" ); } @@ -2370,7 +2379,7 @@ void DebugMenu_8077974() "._226:\n" " .word gSaveBlock1\n" " .word gStringVar1\n" - " .word gUnknown_Debug_0839BBC1+0x2cc\n" + " .word Str_839BE8D\n" "._224:\n" " ldr r0, ._230\n" " ldr r1, ._230 + 4\n" @@ -2397,10 +2406,10 @@ void DebugMenu_8077974() " .align 2, 0\n" "._230:\n" " .word gStringVar1\n" - " .word gUnknown_Debug_0839BBC1+0x2cf\n" + " .word Str_839BE90\n" " .word gSaveBlock1\n" " .word gStringVar2\n" - " .word gUnknown_Debug_0839BBC1+0x2cc\n" + " .word Str_839BE8D\n" "._228:\n" " ldr r0, ._232\n" " ldr r1, ._232 + 4\n" @@ -2418,8 +2427,8 @@ void DebugMenu_8077974() " .align 2, 0\n" "._232:\n" " .word gStringVar2\n" - " .word gUnknown_Debug_0839BBC1+0x2cf\n" - " .word gUnknown_Debug_0839BBC1+0x2aa\n" + " .word Str_839BE90\n" + " .word Str_839BE6B\n" " .word gMenuCallback\n" " .word DebugMenu_8077DB4+1\n" "\n" @@ -2486,7 +2495,7 @@ void DebugMenu_8077A60() "._239:\n" " .align 2, 0\n" "._238:\n" - " .word gUnknown_Debug_0839BBC1+0x323\n" + " .word gUnknown_Debug_839BEE4\n" "\n" ); } @@ -2510,7 +2519,7 @@ void DebugMenu_RematchTrainers() "._241:\n" " .align 2, 0\n" "._240:\n" - " .word gUnknown_Debug_0839BBC1+0x323\n" + " .word gUnknown_Debug_839BEE4\n" " .word gMenuCallback\n" " .word DebugMenu_8077A60+1\n" "\n" @@ -2614,7 +2623,7 @@ void DebugMenu_8077B00() "._253:\n" " .align 2, 0\n" "._252:\n" - " .word gUnknown_Debug_0839BBC1+0x353\n" + " .word Str_839BF14\n" "._250:\n" " ldr r0, ._254\n" " bl sub_8071F40\n" @@ -2628,7 +2637,7 @@ void DebugMenu_8077B00() "._255:\n" " .align 2, 0\n" "._254:\n" - " .word gUnknown_Debug_0839BBC1+0x35e\n" + " .word Str_839BF1F\n" " .word gMenuCallback\n" " .word DebugMenu_8077DB4+1\n" "\n" @@ -2649,7 +2658,7 @@ void DebugMenu_8077B3C() "._257:\n" " .align 2, 0\n" "._256:\n" - " .word gUnknown_Debug_0839BBC1+0x3ab\n" + " .word gUnknown_Debug_839BF6C\n" "\n" ); } @@ -2684,10 +2693,10 @@ void DebugMenu_Safari() "._261:\n" " .align 2, 0\n" "._260:\n" - " .word gUnknown_Debug_0839BBC1+0x3ab\n" + " .word gUnknown_Debug_839BF6C\n" " .word gStringVar1\n" " .word gSafariZoneStepCounter\n" - " .word gUnknown_Debug_0839BBC1+0x34b\n" + " .word Str_839BF0C\n" " .word gMenuCallback\n" " .word DebugMenu_8077B3C+1\n" "._258:\n" @@ -2795,7 +2804,7 @@ void DebugMenu_8077C00() "._263:\n" " .align 2, 0\n" "._262:\n" - " .word gUnknown_Debug_0839BBC1+0x3d3\n" + " .word gUnknown_Debug_839BF94\n" "\n" ); } @@ -2819,7 +2828,7 @@ void DebugMenu_8077C14() "._265:\n" " .align 2, 0\n" "._264:\n" - " .word gUnknown_Debug_0839BBC1+0x3d3\n" + " .word gUnknown_Debug_839BF94\n" " .word gMenuCallback\n" " .word DebugMenu_8077C00+1\n" "\n" @@ -2923,8 +2932,8 @@ void DebugMenu_8077C3C() "._272:\n" " .align 2, 0\n" "._271:\n" - " .word 0x030006b0+0xc @ gMenu+0xc\n" - " .word gUnknown_Debug_0839BBC1+0x427\n" + " .word gUnknown_030006BC \n" + " .word gUnknown_Debug_839BFE8\n" "\n" ); } @@ -3359,7 +3368,7 @@ void DebugMenu_8077F7C() "._311:\n" " .word gTasks\n" " .word gMain\n" - " .word gDebug0x839C008+0xc\n" + " .word Str_839C014\n" " .word DebugMenu_8077FFC+1\n" "._309:\n" " mov r0, #0x2\n" @@ -3540,7 +3549,7 @@ void DebugMenu_807808C() " .align 2, 0\n" "._331:\n" " .word gSaveBlock1+0x2ddc\n" - " .word gDebug0x839C008+0x16\n" + " .word Str_839C01E\n" "._329:\n" " ldr r0, ._335\n" " mov r1, #0xb\n" @@ -3563,7 +3572,7 @@ void DebugMenu_807808C() "._336:\n" " .align 2, 0\n" "._335:\n" - " .word gDebug0x839C008+0x45\n" + " .word Str_839C04D\n" "._333:\n" " ldr r0, ._337\n" " mov r1, #0xb\n" @@ -3595,7 +3604,7 @@ void DebugMenu_807808C() "._338:\n" " .align 2, 0\n" "._337:\n" - " .word gDebug0x839C008+0x45\n" + " .word Str_839C04D\n" "\n" ); } @@ -3840,7 +3849,7 @@ void DebugMenu_80782EC() " .align 2, 0\n" "._359:\n" " .word gStringVar1\n" - " .word gDebug0x839C008+0x4b\n" + " .word Str_839C053\n" "\n" ); } @@ -4232,9 +4241,9 @@ void DebugMenu_8078550() "._420:\n" " .word gStringVar1\n" " .word gStringVar2\n" - " .word gDebug0x839C008+0x264\n" + " .word gUnknown_Debug_839C26C\n" " .word gStringVar3\n" - " .word gDebug0x839C008+0x7d\n" + " .word Str_839C085\n" "._418:\n" " cmp r6, #0x1\n" " beq ._422 @cond_branch\n" @@ -4285,7 +4294,7 @@ void DebugMenu_8078550() " .align 2, 0\n" "._426:\n" " .word gStringVar3\n" - " .word gDebug0x839C008+0x74\n" + " .word Str_839C07C\n" "\n" ); } @@ -4445,7 +4454,7 @@ void DebugMenu_80786D0() " .align 2, 0\n" "._450:\n" " .word gTasks\n" - " .word gDebug0x839C008+0x264\n" + " .word gUnknown_Debug_839C26C\n" "\n" ); } @@ -4486,7 +4495,7 @@ void DebugMenu_8078714() " .align 2, 0\n" "._454:\n" " .word gTasks\n" - " .word gDebug0x839C008+0x264\n" + " .word gUnknown_Debug_839C26C\n" "\n" ); } @@ -4581,7 +4590,7 @@ void DebugMenu_80787B0() "._463:\n" " .align 2, 0\n" "._462:\n" - " .word gDebug0x839C008+0x3f4\n" + " .word gUnknown_Debug_839C3FC\n" "\n" ); } @@ -4605,7 +4614,7 @@ void DebugMenu_OpenLegendsRecord() "._465:\n" " .align 2, 0\n" "._464:\n" - " .word gDebug0x839C008+0x3f4\n" + " .word gUnknown_Debug_839C3FC\n" " .word gMenuCallback\n" " .word DebugMenu_80787B0+1\n" "\n" @@ -4677,7 +4686,7 @@ void DebugMenu_80787EC() " .word gStringVar2\n" " .word gStringVar3\n" " .word gStringVar4\n" - " .word gDebug0x839C008+0x40c\n" + " .word Str_839C414\n" "\n" ); } @@ -4827,7 +4836,7 @@ void DebugMenu_8078950() "._490:\n" " .align 2, 0\n" "._489:\n" - " .word gDebug0x839C008+0x426\n" + " .word Str_839C42E\n" "\n" ); } @@ -5166,7 +5175,7 @@ void DebugMenu_8078B70() " .align 2, 0\n" "._526:\n" " .word gStringVar1\n" - " .word gDebug0x839C008+0x430\n" + " .word Str_839C438\n" "\n" ); } @@ -5208,7 +5217,7 @@ void DebugMenu_8078B94() "._532:\n" " .align 2, 0\n" "._531:\n" - " .word gDebug0x839C008+0x43c\n" + " .word gUnknown_Debug_839C444\n" " .word gSaveBlock1+0x7f8\n" "\n" ); @@ -5330,7 +5339,7 @@ void DebugMenu_8078C80() "._549:\n" " .align 2, 0\n" "._548:\n" - " .word gDebug0x839C574+0x30\n" + " .word Str_839C5A4\n" " .word gMenuCallback\n" " .word DebugMenu_8078CA8+1\n" "\n" @@ -5397,7 +5406,7 @@ void DebugMenu_8078CE4() "._558:\n" " .word +0x2000000\n" " .word gStringVar4\n" - " .word gDebug0x839C574+0x58\n" + " .word Str_839C5CC\n" "._556:\n" " ldr r0, ._560\n" " ldr r1, ._560 + 4\n" @@ -5413,7 +5422,7 @@ void DebugMenu_8078CE4() " .align 2, 0\n" "._560:\n" " .word gStringVar4\n" - " .word gDebug0x839C574+0x6b\n" + " .word Str_839C5DF\n" " .word gMenuCallback\n" " .word DebugMenu_8078D7C+1\n" "\n" @@ -5455,7 +5464,7 @@ void DebugMenu_8078D30() "._563:\n" " .word +0x2000000\n" " .word gStringVar4\n" - " .word gDebug0x839C574+0x62\n" + " .word Str_839C5D6\n" " .word gMenuCallback\n" " .word DebugMenu_8078D7C+1\n" "\n" @@ -5534,7 +5543,7 @@ void DebugMenu_MeTooBackupMan() "._572:\n" " .align 2, 0\n" "._571:\n" - " .word gDebug0x839C574+0x20\n" + " .word gUnknown_Debug_839C594\n" " .word gMenuCallback\n" " .word DebugMenu_8078DF0+1\n" "\n" @@ -5555,7 +5564,7 @@ void DebugMenu_8078DF0() "._574:\n" " .align 2, 0\n" "._573:\n" - " .word gDebug0x839C574+0x20\n" + " .word gUnknown_Debug_839C594\n" "\n" ); } @@ -5673,7 +5682,7 @@ void DebugMenu_8078E80() "._582:\n" " .align 2, 0\n" "._581:\n" - " .word gDebug0x839C574+0x80\n" + " .word gUnknown_Debug_839C5F4\n" "\n" ); } @@ -5877,7 +5886,7 @@ void DebugMenu_8078F68() "._603:\n" " .align 2, 0\n" "._602:\n" - " .word gDebug0x839C574+0x80\n" + " .word gUnknown_Debug_839C5F4\n" "\n" ); } @@ -6082,7 +6091,7 @@ void DebugMenu_8079110() "._640:\n" " .align 2, 0\n" "._639:\n" - " .word gDebug0x839C60C+0xe\n" + " .word Str_839C61A\n" "._635:\n" " bl Menu_UpdateWindowText\n" " lsl r0, r0, #0x18\n" diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index 954974e50..d479c59c8 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -677,7 +677,7 @@ void debug_sub_8090C44() "._55:\n" " .align 2, 0\n" "._54:\n" - " .word +0x2000001\n" + " .word gSharedMem+1\n" "\n" ); } @@ -710,7 +710,7 @@ void debug_sub_8090C88() " .align 2, 0\n" "._59:\n" " .word gMain\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._67:\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" @@ -729,7 +729,7 @@ void debug_sub_8090C88() "._65:\n" " .align 2, 0\n" "._64:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._57:\n" " ldrh r1, [r3, #0x2e]\n" " mov r0, #0x10\n" @@ -858,7 +858,7 @@ void debug_sub_8090C88() "._82:\n" " .align 2, 0\n" "._81:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x2710\n" " .word 0xffff\n" "\n" @@ -892,7 +892,7 @@ void TayaDebugMenu_PKMNLottery() "._84:\n" " .align 2, 0\n" "._83:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gSpecialVar_Result\n" " .word gMenuCallback\n" " .word debug_sub_8090C88+1\n" @@ -1285,7 +1285,7 @@ void TayaDebugMenu_PokenavD() "._95:\n" " .align 2, 0\n" "._94:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gUnknown_Debug_083C4F94\n" " .word 0x19b\n" " .word gPokemonStorage+0x4\n" @@ -1559,7 +1559,7 @@ void debug_sub_8091334() "._124:\n" " .align 2, 0\n" "._123:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._119:\n" " add r5, r3, #0\n" " add r5, r5, #0x55\n" @@ -1603,7 +1603,7 @@ void debug_sub_8091334() " .align 2, 0\n" "._131:\n" " .word gMain\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._128:\n" " add r1, r5, #0\n" " add r1, r1, #0x54\n" @@ -1803,7 +1803,7 @@ void debug_sub_8091334() " .align 2, 0\n" "._159:\n" " .word gMain\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._157:\n" " mov r3, r9\n" " ldrh r1, [r3, #0x2e]\n" @@ -1926,7 +1926,7 @@ void debug_sub_80915BC() "._168:\n" " .word 0x4000010\n" " .word gUnknown_Debug_083C50EC\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gPlayerParty\n" "._166:\n" " add r0, r4, r5\n" @@ -1997,7 +1997,7 @@ void debug_sub_80915BC() "._172:\n" " .word gWindowTemplate_81E7224\n" " .word gUnknown_Debug_083C517C\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word debug_sub_8091320+1\n" " .word debug_sub_8091334+1\n" "\n" @@ -2041,9 +2041,9 @@ void debug_sub_80916AC() "._178:\n" " .align 2, 0\n" "._177:\n" - " .word +0x2000000\n" - " .word +0x2000012\n" - " .word +0x2000054\n" + " .word gSharedMem\n" + " .word gSharedMem+0x12\n" + " .word gSharedMem+0x54\n" "._175:\n" " mov r0, r8\n" " strb r0, [r2]\n" @@ -2114,7 +2114,7 @@ void debug_sub_80916AC() " .align 2, 0\n" "._183:\n" " .word gUnknown_Debug_083C50EC\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "\n" ); } diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 68c05270f..8451a104d 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -1,9 +1,21 @@ #if DEBUG #include "global.h" +// These should be static, uninitialized once it gets decompiled. #define BSS_DATA __attribute__((section(".bss"))) - -BSS_DATA u8 gDebug_03000700[0x24] = { 0 }; +BSS_DATA u8 gDebug_03000700[4] = {0}; +BSS_DATA u8 gDebug_03000704[4] = {0}; +BSS_DATA u8 gDebug_03000708[4] = {0}; +BSS_DATA u8 gDebug_0300070C = 0; +BSS_DATA u8 gDebug_0300070D = 0; +BSS_DATA u8 gDebug_0300070E = 0; +BSS_DATA u8 gDebug_0300070F = 0; +BSS_DATA u8 gDebug_03000710[13] = {0}; +BSS_DATA u8 gDebug_0300071D = 0; +BSS_DATA u8 gDebug_0300071E = 0; +BSS_DATA u8 gDebug_0300071F = 0; +BSS_DATA u8 gDebug_03000720 = 0; +BSS_DATA u8 gDebug_03000721 = 0; __attribute__((naked)) void InitTomomichiDebugWindow() @@ -68,7 +80,7 @@ void debug_sub_808B874() " .align 2, 0\n" "._1:\n" " .word gUnknown_Debug_083C0CBA\n" - " .word gDebug_03000700+0x1d\n" + " .word gDebug_0300071D\n" " .word gMenuCallback\n" " .word debug_sub_808B8C8+1\n" "\n" @@ -128,7 +140,7 @@ void debug_sub_808B8C8() " .align 2, 0\n" "._7:\n" " .word gMain\n" - " .word gDebug_03000700+0x1d\n" + " .word gDebug_0300071D\n" " .word gUnknown_Debug_083C0CBA\n" "._5:\n" " mov r0, #0xa\n" @@ -204,10 +216,10 @@ void TomomichiDebugMenu_ContestGraphics() " .word gMenuCallback\n" " .word debug_sub_808BC48+1\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" + " .word gDebug_03000704\n" " .word 0x6f33\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_03000708\n" + " .word gDebug_0300070C\n" "\n" ); } @@ -268,10 +280,10 @@ void TomomichiDebugMenu_ArtMusGraphics() " .word gMenuCallback\n" " .word debug_sub_808BCBC+1\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" + " .word gDebug_03000704\n" " .word 0x6f33\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_03000708\n" + " .word gDebug_0300070D\n" "\n" ); } @@ -332,10 +344,10 @@ void TomomichiDebugMenu_PreviewData() " .word gMenuCallback\n" " .word debug_sub_808BD30+1\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" + " .word gDebug_03000704\n" " .word 0x6f33\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_03000708\n" + " .word gDebug_0300070E\n" "\n" ); } @@ -383,7 +395,7 @@ void TomomichiDebugMenu_TrickHouse() "._17:\n" " .word gUnknown_Debug_083C0DF4\n" " .word gUnknown_Debug_083C0E15\n" - " .word gDebug_03000700+0x1e\n" + " .word gDebug_0300071E\n" " .word gMenuCallback\n" " .word debug_sub_808BDA4+1\n" "\n" @@ -428,7 +440,7 @@ void TomomichiDebugMenu_ControlEvents() " .align 2, 0\n" "._19:\n" " .word gUnknown_Debug_083C0E32\n" - " .word gDebug_03000700+0x1f\n" + " .word gDebug_0300071F\n" " .word gMenuCallback\n" " .word debug_sub_808BE2C+1\n" "\n" @@ -473,7 +485,7 @@ void TomomichiDebugMenu_ControlFlags() " .align 2, 0\n" "._21:\n" " .word gUnknown_Debug_083C0E7F\n" - " .word gDebug_03000700+0x20\n" + " .word gDebug_03000720\n" " .word gMenuCallback\n" " .word debug_sub_808BEB4+1\n" "\n" @@ -518,7 +530,7 @@ void TomomichiDebugMenu_ControlWorks() " .align 2, 0\n" "._23:\n" " .word gUnknown_Debug_083C0EF1\n" - " .word gDebug_03000700+0x21\n" + " .word gDebug_03000721\n" " .word gMenuCallback\n" " .word debug_sub_808BF3C+1\n" "\n" @@ -782,7 +794,7 @@ void debug_sub_808BDA4() " .align 2, 0\n" "._71:\n" " .word gMain\n" - " .word gDebug_03000700+0x1e\n" + " .word gDebug_0300071E\n" " .word gUnknown_Debug_083C0E15\n" "._69:\n" " mov r0, #0xa\n" @@ -855,7 +867,7 @@ void debug_sub_808BE2C() " .align 2, 0\n" "._79:\n" " .word gMain\n" - " .word gDebug_03000700+0x1f\n" + " .word gDebug_0300071F\n" " .word gUnknown_Debug_083C0E32\n" "._77:\n" " mov r0, #0xa\n" @@ -928,7 +940,7 @@ void debug_sub_808BEB4() " .align 2, 0\n" "._87:\n" " .word gMain\n" - " .word gDebug_03000700+0x20\n" + " .word gDebug_03000720\n" " .word gUnknown_Debug_083C0E7F\n" "._85:\n" " mov r0, #0xa\n" @@ -1001,7 +1013,7 @@ void debug_sub_808BF3C() " .align 2, 0\n" "._95:\n" " .word gMain\n" - " .word gDebug_03000700+0x21\n" + " .word gDebug_03000721\n" " .word gUnknown_Debug_083C0EF1\n" "._93:\n" " mov r0, #0xa\n" @@ -1730,7 +1742,7 @@ void debug_sub_808C3B0() " .align 2, 0\n" "._165:\n" " .word gUnknown_Debug_083C2938\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1777,7 +1789,7 @@ void debug_sub_808C408() " .align 2, 0\n" "._167:\n" " .word gUnknown_Debug_083C2A48\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1824,7 +1836,7 @@ void debug_sub_808C460() " .align 2, 0\n" "._169:\n" " .word gUnknown_Debug_083C2B4C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1871,7 +1883,7 @@ void debug_sub_808C4B8() " .align 2, 0\n" "._171:\n" " .word gUnknown_Debug_083C2C80\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1918,7 +1930,7 @@ void debug_sub_808C510() " .align 2, 0\n" "._173:\n" " .word gUnknown_Debug_083C2D8C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -1965,7 +1977,7 @@ void debug_sub_808C568() " .align 2, 0\n" "._175:\n" " .word gUnknown_Debug_083C2EB0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2012,7 +2024,7 @@ void debug_sub_808C5C0() " .align 2, 0\n" "._177:\n" " .word gUnknown_Debug_083C2FE0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2059,7 +2071,7 @@ void debug_sub_808C618() " .align 2, 0\n" "._179:\n" " .word gUnknown_Debug_083C3100\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2106,7 +2118,7 @@ void debug_sub_808C670() " .align 2, 0\n" "._181:\n" " .word gUnknown_Debug_083C3194\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808C6C8+1\n" "\n" @@ -2147,7 +2159,7 @@ void debug_sub_808C6C8() "._187:\n" " .align 2, 0\n" "._186:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._184:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -2194,7 +2206,7 @@ void debug_sub_808C714() " .align 2, 0\n" "._191:\n" " .word gMain\n" - " .word gUnknown_Debug_083C31DC+0xa\n" + " .word gUnknown_Debug_83C31E6\n" "._189:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -2259,7 +2271,7 @@ void debug_sub_808C764() " .align 2, 0\n" "._195:\n" " .word gUnknown_Debug_083C31DC\n" - " .word gUnknown_Debug_083C31DC+0xa\n" + " .word gUnknown_Debug_83C31E6\n" "\n" ); } @@ -2390,7 +2402,7 @@ void debug_sub_808C85C() " .align 2, 0\n" "._205:\n" " .word gUnknown_Debug_083C1E0C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2437,7 +2449,7 @@ void debug_sub_808C8B4() " .align 2, 0\n" "._207:\n" " .word gUnknown_Debug_083C1F38\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2484,7 +2496,7 @@ void debug_sub_808C90C() " .align 2, 0\n" "._209:\n" " .word gUnknown_Debug_083C206C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2531,7 +2543,7 @@ void debug_sub_808C964() " .align 2, 0\n" "._211:\n" " .word gUnknown_Debug_083C2190\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2578,7 +2590,7 @@ void debug_sub_808C9BC() " .align 2, 0\n" "._213:\n" " .word gUnknown_Debug_083C2264\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2625,7 +2637,7 @@ void debug_sub_808CA14() " .align 2, 0\n" "._215:\n" " .word gUnknown_Debug_083C2370\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2672,7 +2684,7 @@ void debug_sub_808CA6C() " .align 2, 0\n" "._217:\n" " .word gUnknown_Debug_083C248C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2719,7 +2731,7 @@ void debug_sub_808CAC4() " .align 2, 0\n" "._219:\n" " .word gUnknown_Debug_083C259C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2766,7 +2778,7 @@ void debug_sub_808CB1C() " .align 2, 0\n" "._221:\n" " .word gUnknown_Debug_083C26C8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CB74+1\n" "\n" @@ -2807,7 +2819,7 @@ void debug_sub_808CB74() "._227:\n" " .align 2, 0\n" "._226:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._224:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -2854,7 +2866,7 @@ void debug_sub_808CBC0() " .align 2, 0\n" "._231:\n" " .word gMain\n" - " .word gUnknown_Debug_083C2710+0xa\n" + " .word gUnknown_Debug_083C271A\n" "._229:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -2919,7 +2931,7 @@ void debug_sub_808CC10() " .align 2, 0\n" "._235:\n" " .word gUnknown_Debug_083C2710\n" - " .word gUnknown_Debug_083C2710+0xa\n" + " .word gUnknown_Debug_083C271A\n" "\n" ); } @@ -3050,7 +3062,7 @@ void debug_sub_808CD08() " .align 2, 0\n" "._245:\n" " .word gUnknown_Debug_083C1B7C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CE10+1\n" "\n" @@ -3097,7 +3109,7 @@ void debug_sub_808CD60() " .align 2, 0\n" "._247:\n" " .word gUnknown_Debug_083C1BF0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CE10+1\n" "\n" @@ -3144,7 +3156,7 @@ void debug_sub_808CDB8() " .align 2, 0\n" "._249:\n" " .word gUnknown_Debug_083C1C2C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808CE10+1\n" "\n" @@ -3185,7 +3197,7 @@ void debug_sub_808CE10() "._255:\n" " .align 2, 0\n" "._254:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._252:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -3232,7 +3244,7 @@ void debug_sub_808CE5C() " .align 2, 0\n" "._259:\n" " .word gMain\n" - " .word gUnknown_Debug_083C1C34+0x4\n" + " .word gUnknown_Debug_083C1C38\n" "._257:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -3297,7 +3309,7 @@ void debug_sub_808CEAC() " .align 2, 0\n" "._263:\n" " .word gUnknown_Debug_083C1C34\n" - " .word gUnknown_Debug_083C1C34+0x4\n" + " .word gUnknown_Debug_083C1C38\n" "\n" ); } @@ -3428,7 +3440,7 @@ void debug_sub_808CFA4() " .align 2, 0\n" "._273:\n" " .word gUnknown_Debug_083C13D8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3475,7 +3487,7 @@ void debug_sub_808CFFC() " .align 2, 0\n" "._275:\n" " .word gUnknown_Debug_083C1465\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3522,7 +3534,7 @@ void debug_sub_808D054() " .align 2, 0\n" "._277:\n" " .word gUnknown_Debug_083C1503\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3569,7 +3581,7 @@ void debug_sub_808D0AC() " .align 2, 0\n" "._279:\n" " .word gUnknown_Debug_083C158A\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3616,7 +3628,7 @@ void debug_sub_808D104() " .align 2, 0\n" "._281:\n" " .word gUnknown_Debug_083C1647\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3663,7 +3675,7 @@ void debug_sub_808D15C() " .align 2, 0\n" "._283:\n" " .word gUnknown_Debug_083C1712\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3710,7 +3722,7 @@ void debug_sub_808D1B4() " .align 2, 0\n" "._285:\n" " .word gUnknown_Debug_083C17F8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3757,7 +3769,7 @@ void debug_sub_808D20C() " .align 2, 0\n" "._287:\n" " .word gUnknown_Debug_083C18B8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3804,7 +3816,7 @@ void debug_sub_808D264() " .align 2, 0\n" "._289:\n" " .word gDebug_0x83C1974\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D2BC+1\n" "\n" @@ -3845,7 +3857,7 @@ void debug_sub_808D2BC() "._295:\n" " .align 2, 0\n" "._294:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._292:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4088,7 +4100,7 @@ void debug_sub_808D450() " .align 2, 0\n" "._313:\n" " .word gUnknown_Debug_083C10BD\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D500+1\n" "\n" @@ -4135,7 +4147,7 @@ void debug_sub_808D4A8() " .align 2, 0\n" "._315:\n" " .word gUnknown_Debug_083C1149\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D500+1\n" "\n" @@ -4176,7 +4188,7 @@ void debug_sub_808D500() "._321:\n" " .align 2, 0\n" "._320:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._318:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4419,7 +4431,7 @@ void debug_sub_808D694() " .align 2, 0\n" "._339:\n" " .word gUnknown_Debug_083C1212\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D744+1\n" "\n" @@ -4466,7 +4478,7 @@ void debug_sub_808D6EC() " .align 2, 0\n" "._341:\n" " .word gUnknown_Debug_083C1288\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D744+1\n" "\n" @@ -4507,7 +4519,7 @@ void debug_sub_808D744() "._347:\n" " .align 2, 0\n" "._346:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._344:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4749,7 +4761,7 @@ void debug_sub_808D8D8() " .align 2, 0\n" "._365:\n" " .word gUnknown_Debug_083C1A9C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808D930+1\n" "\n" @@ -4790,7 +4802,7 @@ void debug_sub_808D930() "._371:\n" " .align 2, 0\n" "._370:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._368:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -4837,7 +4849,7 @@ void debug_sub_808D97C() " .align 2, 0\n" "._375:\n" " .word gMain\n" - " .word gUnknown_Debug_083C1AAC+0x2\n" + " .word gUnknown_Debug_083C1AAE\n" "._373:\n" " add r0, r4, #0\n" " bl FlagClear\n" @@ -4902,7 +4914,7 @@ void debug_sub_808D9CC() " .align 2, 0\n" "._379:\n" " .word gUnknown_Debug_083C1AAC\n" - " .word gUnknown_Debug_083C1AAC+0x2\n" + " .word gUnknown_Debug_083C1AAE\n" "\n" ); } @@ -5174,7 +5186,7 @@ void debug_sub_808DBA0() " .align 2, 0\n" "._403:\n" " .word gUnknown_Debug_083C432C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5221,7 +5233,7 @@ void debug_sub_808DBF8() " .align 2, 0\n" "._405:\n" " .word gUnknown_Debug_083C436C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5268,7 +5280,7 @@ void debug_sub_808DC50() " .align 2, 0\n" "._407:\n" " .word gUnknown_Debug_083C43B4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5315,7 +5327,7 @@ void debug_sub_808DCA8() " .align 2, 0\n" "._409:\n" " .word gUnknown_Debug_083C43FC\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5362,7 +5374,7 @@ void debug_sub_808DD00() " .align 2, 0\n" "._411:\n" " .word gUnknown_Debug_083C4444\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5409,7 +5421,7 @@ void debug_sub_808DD58() " .align 2, 0\n" "._413:\n" " .word gUnknown_Debug_083C448C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5456,7 +5468,7 @@ void debug_sub_808DDB0() " .align 2, 0\n" "._415:\n" " .word gUnknown_Debug_83C44C4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5503,7 +5515,7 @@ void debug_sub_808DE08() " .align 2, 0\n" "._417:\n" " .word gUnknown_Debug_83C44EC\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5550,7 +5562,7 @@ void debug_sub_808DE60() " .align 2, 0\n" "._419:\n" " .word gUnknown_Debug_083C4534\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808DEB8+1\n" "\n" @@ -5591,7 +5603,7 @@ void debug_sub_808DEB8() "._425:\n" " .align 2, 0\n" "._424:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._422:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -5654,7 +5666,7 @@ void debug_sub_808DF04() " .align 2, 0\n" "._428:\n" " .word gUnknown_Debug_083C457C\n" - " .word gUnknown_Debug_083C457C+0xa\n" + " .word gUnknown_Debug_083C4586\n" "\n" ); } @@ -5712,7 +5724,7 @@ void debug_sub_808DF64() " .align 2, 0\n" "._435:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C457C+0xa\n" + " .word gUnknown_Debug_083C4586\n" "\n" ); } @@ -5843,7 +5855,7 @@ void debug_sub_808E054() " .align 2, 0\n" "._445:\n" " .word gUnknown_Debug_083C3AA0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -5890,7 +5902,7 @@ void debug_sub_808E0AC() " .align 2, 0\n" "._447:\n" " .word gUnknown_Debug_83C3AE0\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -5937,7 +5949,7 @@ void debug_sub_808E104() " .align 2, 0\n" "._449:\n" " .word gUnknown_Debug_83C3B28\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -5984,7 +5996,7 @@ void debug_sub_808E15C() " .align 2, 0\n" "._451:\n" " .word gUnknown_Debug_83C3B70\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -6031,7 +6043,7 @@ void debug_sub_808E1B4() " .align 2, 0\n" "._453:\n" " .word gUnknown_Debug_83C3BB8\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -6078,7 +6090,7 @@ void debug_sub_808E20C() " .align 2, 0\n" "._455:\n" " .word gUnknown_Debug_83C3C00\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E264+1\n" "\n" @@ -6119,7 +6131,7 @@ void debug_sub_808E264() "._461:\n" " .align 2, 0\n" "._460:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._458:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -6182,7 +6194,7 @@ void debug_sub_808E2B0() " .align 2, 0\n" "._464:\n" " .word gUnknown_Debug_083C3C48\n" - " .word gUnknown_Debug_083C3C48+0x6\n" + " .word gUnknown_Debug_83C3C4E\n" "\n" ); } @@ -6240,7 +6252,7 @@ void debug_sub_808E310() " .align 2, 0\n" "._471:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C3C48+0x6\n" + " .word gUnknown_Debug_83C3C4E\n" "\n" ); } @@ -6371,7 +6383,7 @@ void debug_sub_808E400() " .align 2, 0\n" "._481:\n" " .word gUnknown_Debug_083C347C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6418,7 +6430,7 @@ void debug_sub_808E458() " .align 2, 0\n" "._483:\n" " .word gUnknown_Debug_083C3494\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6465,7 +6477,7 @@ void debug_sub_808E4B0() " .align 2, 0\n" "._485:\n" " .word gUnknown_Debug_083C34A4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6512,7 +6524,7 @@ void debug_sub_808E508() " .align 2, 0\n" "._487:\n" " .word gUnknown_Debug_083C34D4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6559,7 +6571,7 @@ void debug_sub_808E560() " .align 2, 0\n" "._489:\n" " .word gUnknown_Debug_083C351C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E5B8+1\n" "\n" @@ -6600,7 +6612,7 @@ void debug_sub_808E5B8() "._495:\n" " .align 2, 0\n" "._494:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._492:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -6665,7 +6677,7 @@ void debug_sub_808E604() " .align 2, 0\n" "._501:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C3544+0x6\n" + " .word gUnknown_Debug_083C354A\n" "\n" ); } @@ -6721,7 +6733,7 @@ void debug_sub_808E660() " .align 2, 0\n" "._505:\n" " .word gUnknown_Debug_083C3544\n" - " .word gUnknown_Debug_083C3544+0x6\n" + " .word gUnknown_Debug_083C354A\n" "\n" ); } @@ -6852,7 +6864,7 @@ void debug_sub_808E754() " .align 2, 0\n" "._515:\n" " .word gUnknown_Debug_083C470C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E804+1\n" "\n" @@ -6899,7 +6911,7 @@ void debug_sub_808E7AC() " .align 2, 0\n" "._517:\n" " .word gUnknown_Debug_083C4754C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808E804+1\n" "\n" @@ -6940,7 +6952,7 @@ void debug_sub_808E804() "._523:\n" " .align 2, 0\n" "._522:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._520:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -7005,7 +7017,7 @@ void debug_sub_808E850() " .align 2, 0\n" "._529:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C478C+0x2\n" + " .word gUnknown_Debug_083C478E\n" "\n" ); } @@ -7061,7 +7073,7 @@ void debug_sub_808E8AC() " .align 2, 0\n" "._533:\n" " .word gUnknown_Debug_083C478C\n" - " .word gUnknown_Debug_083C478C+0x2\n" + " .word gUnknown_Debug_083C478E\n" "\n" ); } @@ -7192,7 +7204,7 @@ void debug_sub_808E9A0() " .align 2, 0\n" "._543:\n" " .word gUnknown_Debug_083C369C\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808EA50+1\n" "\n" @@ -7239,7 +7251,7 @@ void debug_sub_808E9F8() " .align 2, 0\n" "._545:\n" " .word gUnknown_Debug_083C36E4\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" " .word gMenuCallback\n" " .word debug_sub_808EA50+1\n" "\n" @@ -7280,7 +7292,7 @@ void debug_sub_808EA50() "._551:\n" " .align 2, 0\n" "._550:\n" - " .word gDebug_03000700+0xf\n" + " .word gDebug_0300070F\n" "._548:\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -7343,7 +7355,7 @@ void debug_sub_808EA9C() " .align 2, 0\n" "._554:\n" " .word gUnknown_Debug_083C371C\n" - " .word gUnknown_Debug_083C371C+0x2\n" + " .word gUnknown_Debug_083C371E\n" "\n" ); } @@ -7401,7 +7413,7 @@ void debug_sub_808EAFC() " .align 2, 0\n" "._561:\n" " .word 0xffff\n" - " .word gUnknown_Debug_083C371C+0x2\n" + " .word gUnknown_Debug_083C371E\n" "\n" ); } @@ -7802,7 +7814,7 @@ void debug_sub_808ED9C() " .align 2, 0\n" "._606:\n" " .word gMain\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000708\n" "._604:\n" " mov r0, #0x0\n" "._605:\n" @@ -7826,7 +7838,7 @@ void debug_sub_808ED9C() "._612:\n" " .align 2, 0\n" "._611:\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000708\n" "._609:\n" " mov r0, #0x1\n" " neg r0, r0\n" @@ -7850,7 +7862,7 @@ void debug_sub_808ED9C() "._615:\n" " .align 2, 0\n" "._614:\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000708\n" "\n" ); } @@ -7911,7 +7923,7 @@ void debug_sub_808EE3C() " .align 2, 0\n" "._622:\n" " .word gMain\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_0300070C\n" "\n" ); } @@ -7962,7 +7974,7 @@ void debug_sub_808EE9C() " .align 2, 0\n" "._631:\n" " .word gMain\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._629:\n" " mov r0, #0x0\n" "._630:\n" @@ -7983,7 +7995,7 @@ void debug_sub_808EE9C() "._637:\n" " .align 2, 0\n" "._636:\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._634:\n" " mov r0, #0xf\n" "._635:\n" @@ -8041,7 +8053,7 @@ void debug_sub_808EF14() " .align 2, 0\n" "._645:\n" " .word gMain\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "._643:\n" " mov r0, #0x0\n" "._644:\n" @@ -8062,7 +8074,7 @@ void debug_sub_808EF14() "._651:\n" " .align 2, 0\n" "._650:\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "._648:\n" " mov r0, #0xf\n" "._649:\n" @@ -8109,8 +8121,8 @@ void debug_sub_808EF8C() "._657:\n" " .align 2, 0\n" "._656:\n" - " .word gDebug_03000700+0x8\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000708\n" + " .word gDebug_03000710\n" "._654:\n" " add r1, r3, r4\n" " add r0, r2, #0\n" @@ -8194,7 +8206,7 @@ void debug_sub_808EF8C() "._667:\n" " .align 2, 0\n" "._666:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" " .word gDebug_03000700\n" " .word gSpeciesNames\n" "._664:\n" @@ -8240,7 +8252,7 @@ void debug_sub_808EF8C() "._673:\n" " .align 2, 0\n" "._672:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" " .word gDebug_03000700\n" "._669:\n" " cmp r6, #0x2\n" @@ -8252,7 +8264,7 @@ void debug_sub_808EF8C() "._678:\n" " .align 2, 0\n" "._677:\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_0300070C\n" "._668:\n" " ldr r4, ._680\n" "._676:\n" @@ -8283,7 +8295,7 @@ void debug_sub_808EF8C() "._681:\n" " .align 2, 0\n" "._680:\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._674:\n" " ldr r4, ._682\n" " ldrb r0, [r4]\n" @@ -8318,7 +8330,7 @@ void debug_sub_808EF8C() "._683:\n" " .align 2, 0\n" "._682:\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "\n" ); } @@ -8354,8 +8366,8 @@ void debug_sub_808F168() "._686:\n" " .word +0x2015de0\n" " .word gDebug_03000700\n" - " .word gDebug_03000700+0x4\n" - " .word gDebug_03000700+0x8\n" + " .word gDebug_03000704\n" + " .word gDebug_03000708\n" " .word ._688\n" "._688:\n" " .word ._689\n" @@ -8388,7 +8400,7 @@ void debug_sub_808F168() " .word +0x2000000\n" " .word 0x15ddf\n" " .word 0x15dde\n" - " .word gDebug_03000700+0xc\n" + " .word gDebug_0300070C\n" " .word gUnknown_Debug_083C48BB\n" "._690:\n" " ldr r1, ._699\n" @@ -8410,7 +8422,7 @@ void debug_sub_808F168() " .word +0x2000000\n" " .word 0x15ddf\n" " .word 0x15dde\n" - " .word gDebug_03000700+0xd\n" + " .word gDebug_0300070D\n" "._691:\n" " ldr r1, ._702\n" " ldr r0, ._702 + 4\n" @@ -8432,7 +8444,7 @@ void debug_sub_808F168() " .word +0x2000000\n" " .word 0x15ddf\n" " .word 0x15dde\n" - " .word gDebug_03000700+0xe\n" + " .word gDebug_0300070E\n" "._692:\n" " ldr r1, ._705\n" " ldr r2, ._705 + 4\n" @@ -8526,7 +8538,7 @@ void debug_sub_808F2E0() "._715:\n" " .align 2, 0\n" "._714:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" "._712:\n" " ldr r1, ._716\n" " mov r0, #0xa2\n" @@ -8544,7 +8556,7 @@ void debug_sub_808F2E0() "._717:\n" " .align 2, 0\n" "._716:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" "\n" ); } @@ -8625,7 +8637,7 @@ void debug_sub_808F31C() "._719:\n" " .align 2, 0\n" "._718:\n" - " .word gDebug_03000700+0x10\n" + " .word gDebug_03000710\n" " .word 0x2710\n" "\n" ); diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index 58ae28510..cc53f8c95 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -1,7 +1,10 @@ #if DEBUG #include "global.h" -EWRAM_DATA u8 unk_debug_ewram_0[56] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_20389EC[0x20] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_2038A0C[0x10] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_2038A1C[4] = { 0 }; +EWRAM_DATA u8 gUnknown_Debug_2038A20[4] = { 0 }; u8 byte_3005E30[0x20]; @@ -655,7 +658,7 @@ void InitSizeComparison() " .align 2, 0\n" "._54:\n" " .word gReservedSpritePaletteCount\n" - " .word unk_debug_ewram_0\n" + " .word gUnknown_Debug_20389EC\n" " .word 0x4000208\n" " .word 0x4000200\n" " .word debug_80C3758+1\n" @@ -1611,7 +1614,7 @@ void InitBattleForDebug() "._139:\n" " .align 2, 0\n" "._138:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gSaveBlock2\n" " .word byte_3005E30\n" " .word debug_80C47BC+1\n" @@ -1640,7 +1643,7 @@ void debug_80C41A8() "._141:\n" " .align 2, 0\n" "._140:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word debug_80C47BC+1\n" "\n" ); @@ -1815,7 +1818,7 @@ void debug_80C42B8() "._150:\n" " .word gUnknown_Debug_083F8194\n" " .word gUnknown_Debug_083F81A0\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C44EC+1\n" "._148:\n" @@ -1883,7 +1886,7 @@ void debug_80C4348() "._155:\n" " .align 2, 0\n" "._154:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -1924,7 +1927,7 @@ void debug_80C43A8() " .align 2, 0\n" "._158:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gPlayerParty\n" " .word debug_80C41D4+1\n" "._156:\n" @@ -2014,7 +2017,7 @@ void debug_80C43A8() "._177:\n" " .align 2, 0\n" "._176:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._174:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -2053,7 +2056,7 @@ void debug_80C43A8() "._182:\n" " .align 2, 0\n" "._181:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gPlayerParty\n" " .word gTasks\n" " .word debug_80C4348+1\n" @@ -2105,7 +2108,7 @@ void debug_80C44EC() "._184:\n" " .align 2, 0\n" "._183:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x79ef\n" " .word 0x17f\n" @@ -2147,7 +2150,7 @@ void debug_80C4550() " .align 2, 0\n" "._187:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gEnemyParty\n" " .word debug_80C41F4+1\n" "._185:\n" @@ -2237,7 +2240,7 @@ void debug_80C4550() "._206:\n" " .align 2, 0\n" "._205:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._203:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -2276,7 +2279,7 @@ void debug_80C4550() "._211:\n" " .align 2, 0\n" "._210:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gEnemyParty\n" " .word gTasks\n" " .word debug_80C44EC+1\n" @@ -2432,7 +2435,7 @@ void debug_80C4774() "._222:\n" " .align 2, 0\n" "._221:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gPlayerParty\n" " .word gEnemyParty\n" "._219:\n" @@ -2543,7 +2546,7 @@ void debug_80C47BC() " .word gUnknown_Debug_083F81D6\n" " .word gUnknown_Debug_083F81E5\n" " .word gUnknown_Debug_083F8068\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C48A0+1\n" "\n" @@ -2593,7 +2596,7 @@ void debug_80C48A0() "._227:\n" " .align 2, 0\n" "._226:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -2654,7 +2657,7 @@ void debug_80C4900() " .word gMain\n" " .word debug_80C370C+1\n" " .word gSaveBlock2\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gBattleTypeFlags\n" " .word gUnknown_02023A14_50\n" " .word gTasks\n" @@ -2712,7 +2715,7 @@ void debug_80C4900() "._236:\n" " .word gBattleTypeFlags\n" " .word gUnknown_Debug_083F8068\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gUnknown_02023A14_50\n" " .word gTasks\n" " .word debug_80C4A60+1\n" @@ -2745,7 +2748,7 @@ void debug_80C4900() "._245:\n" " .align 2, 0\n" "._244:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._242:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -2775,7 +2778,7 @@ void debug_80C4900() "._249:\n" " .align 2, 0\n" "._248:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C48A0+1\n" "\n" @@ -2826,7 +2829,7 @@ void debug_80C4A60() "._251:\n" " .align 2, 0\n" "._250:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x79ef\n" " .word 0x17f\n" @@ -2880,7 +2883,7 @@ void debug_80C4AC4() "._256:\n" " .align 2, 0\n" "._255:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gMain\n" " .word gUnknown_Debug_083F80D8\n" " .word byte_3005E30\n" @@ -3231,7 +3234,7 @@ void debug_80C4D14() " .word gUnknown_Debug_083F81C7\n" " .word gUnknown_Debug_083F81F5\n" " .word gUnknown_Debug_083F8202\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C4DB8+1\n" "\n" @@ -3281,7 +3284,7 @@ void debug_80C4DB8() "._294:\n" " .align 2, 0\n" "._293:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -3319,7 +3322,7 @@ void debug_80C4E18() "._298:\n" " .align 2, 0\n" "._297:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gMain\n" " .word gTasks\n" " .word debug_80C42B8+1\n" @@ -3616,7 +3619,7 @@ void debug_80C5038() "._323:\n" " .align 2, 0\n" "._322:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word 0x4000042\n" " .word 0x177\n" " .word gTasks\n" @@ -3680,7 +3683,7 @@ void debug_80C5098() " .align 2, 0\n" "._331:\n" " .word gSaveBlock2\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C42B8+1\n" "._329:\n" @@ -3698,7 +3701,7 @@ void debug_80C5098() "._337:\n" " .align 2, 0\n" "._336:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" "._334:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x80\n" @@ -3727,7 +3730,7 @@ void debug_80C5098() "._341:\n" " .align 2, 0\n" "._340:\n" - " .word unk_debug_ewram_0+0x20\n" + " .word gUnknown_Debug_2038A0C\n" " .word gTasks\n" " .word debug_80C5038+1\n" "\n" @@ -3929,7 +3932,7 @@ void debug_80C5208() "._356:\n" " .align 2, 0\n" "._355:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word +0x2018000\n" " .word gSaveBlock2\n" "\n" @@ -3986,7 +3989,7 @@ void debug_80C527C() "._363:\n" " .align 2, 0\n" "._362:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -4079,7 +4082,7 @@ void InitCreatePokemon() " .word debug_80C3758+1\n" " .word debug_80C370C+1\n" " .word debug_80C53A4+1\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "\n" ); @@ -4194,7 +4197,7 @@ void debug_80C53F0() " .align 2, 0\n" "._372:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F8698\n" " .word 0x169\n" " .word gTasks\n" @@ -4255,7 +4258,7 @@ void debug_80C53F0() "._382:\n" " .align 2, 0\n" "._381:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F872A\n" "._379:\n" " ldr r0, ._384\n" @@ -4299,7 +4302,7 @@ void debug_80C53F0() "._389:\n" " .align 2, 0\n" "._388:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._386:\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -4342,7 +4345,7 @@ void debug_80C53F0() "._398:\n" " .align 2, 0\n" "._397:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "._395:\n" " ldrh r1, [r4, #0x2e]\n" @@ -4383,7 +4386,7 @@ void debug_80C53F0() "._402:\n" " .align 2, 0\n" "._401:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gTasks\n" " .word debug_80C53C0+1\n" @@ -4438,7 +4441,7 @@ void debug_80C55E4() " .align 2, 0\n" "._405:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gMain\n" " .word gTasks\n" @@ -4645,7 +4648,7 @@ void debug_80C5738() " .align 2, 0\n" "._428:\n" " .word gUnknown_Debug_083F850A\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F8514\n" " .word gUnknown_Debug_083F851C\n" "._426:\n" @@ -4702,7 +4705,7 @@ void debug_80C5738() " .align 2, 0\n" "._432:\n" " .word gUnknown_Debug_083F8524\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F852D\n" " .word gUnknown_Debug_083F8537\n" "._430:\n" @@ -4835,7 +4838,7 @@ void debug_80C5738() "._478:\n" " .align 2, 0\n" "._477:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gSpeciesNames\n" "._445:\n" " ldr r0, ._483\n" @@ -4853,7 +4856,7 @@ void debug_80C5738() "._484:\n" " .align 2, 0\n" "._483:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._480:\n" " add r0, r6, #0\n" " add r0, r0, #0xa\n" @@ -4918,7 +4921,7 @@ void debug_80C5738() "._496:\n" " .align 2, 0\n" "._495:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gMoveNames\n" "._451:\n" " add r0, r6, #0\n" @@ -4957,7 +4960,7 @@ void debug_80C5738() "._500:\n" " .align 2, 0\n" "._499:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._497:\n" " add r0, r5, #0\n" " add r0, r0, #0xe\n" @@ -5000,7 +5003,7 @@ void debug_80C5738() "._506:\n" " .align 2, 0\n" "._505:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gAbilityNames\n" "._474:\n" " add r0, r6, #0\n" @@ -5019,7 +5022,7 @@ void debug_80C5738() " .align 2, 0\n" "._508:\n" " .word gUnknown_Debug_083F86E8\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._472:\n" " add r0, r6, #0\n" " add r0, r0, #0xc\n" @@ -5034,7 +5037,7 @@ void debug_80C5738() "._512:\n" " .align 2, 0\n" "._511:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._473:\n" " ldr r0, ._515\n" " ldr r0, [r0]\n" @@ -5050,7 +5053,7 @@ void debug_80C5738() "._516:\n" " .align 2, 0\n" "._515:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F854A\n" "._513:\n" " add r0, r6, #0\n" @@ -5090,7 +5093,7 @@ void debug_80C5738() " .align 2, 0\n" "._520:\n" " .word gNatureNames\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5110,7 +5113,7 @@ void debug_80C5B60() "._523:\n" " .align 2, 0\n" "._522:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5172,7 +5175,7 @@ void debug_80C5B74() "._555:\n" " .align 2, 0\n" "._554:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._532:\n" " ldr r0, ._557\n" " ldr r0, [r0]\n" @@ -5184,7 +5187,7 @@ void debug_80C5B74() "._558:\n" " .align 2, 0\n" "._557:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._529:\n" " ldr r4, ._560\n" " ldr r1, [r4]\n" @@ -5219,7 +5222,7 @@ void debug_80C5B74() "._561:\n" " .align 2, 0\n" "._560:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gExperienceTables\n" " .word gBaseStats\n" "._530:\n" @@ -5233,7 +5236,7 @@ void debug_80C5B74() "._564:\n" " .align 2, 0\n" "._563:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._552:\n" " ldr r0, ._565\n" " ldr r0, [r0]\n" @@ -5248,7 +5251,7 @@ void debug_80C5B74() "._566:\n" " .align 2, 0\n" "._565:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5414,7 +5417,7 @@ void debug_80C5C94() "._568:\n" " .align 2, 0\n" "._567:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5537,7 +5540,7 @@ void debug_80C5DEC() "._570:\n" " .align 2, 0\n" "._569:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5660,7 +5663,7 @@ void debug_80C5EF4() "._572:\n" " .align 2, 0\n" "._571:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "\n" ); } @@ -5953,7 +5956,7 @@ void debug_80C5FFC() "._578:\n" " .word gUnknown_Debug_083F8758\n" " .word gUnknown_Debug_083F875C\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word gUnknown_Debug_083F86E8+0x4\n" "\n" ); @@ -6002,7 +6005,7 @@ void debug_80C627C() "._590:\n" " .align 2, 0\n" "._589:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "._580:\n" " ldr r4, ._593\n" @@ -6051,7 +6054,7 @@ void debug_80C627C() "._594:\n" " .align 2, 0\n" "._593:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gUnknown_Debug_083F8698\n" "._586:\n" @@ -6094,7 +6097,7 @@ void debug_80C627C() "._597:\n" " .align 2, 0\n" "._596:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "\n" ); @@ -6191,7 +6194,7 @@ void debug_80C6384() " .align 2, 0\n" "._600:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x16b\n" " .word 0x16d\n" "\n" @@ -6267,7 +6270,7 @@ void debug_80C643C() " .align 2, 0\n" "._605:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x16b\n" " .word 0x169\n" " .word 0x16d\n" @@ -6402,7 +6405,7 @@ void debug_80C6544() " .align 2, 0\n" "._614:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" " .word gUnknown_Debug_083F8554\n" " .word gUnknown_Debug_083F8768\n" @@ -6458,7 +6461,7 @@ void debug_80C6544() " .align 2, 0\n" "._624:\n" " .word gUnknown_Debug_083F8698\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" " .word 0x169\n" "\n" ); @@ -6497,7 +6500,7 @@ void debug_80C6630() "._630:\n" " .align 2, 0\n" "._629:\n" - " .word unk_debug_ewram_0+0x30\n" + " .word gUnknown_Debug_2038A1C\n" "._627:\n" " mov r0, #0x4\n" "._626:\n" @@ -7065,7 +7068,7 @@ void InitSeePokemonGraphics() " .word 0x1f0b\n" " .word 0x1e0a\n" " .word debug_80C6B00+1\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word +0x2018000\n" " .word 0x115\n" " .word gSpriteTemplate_83F8874\n" @@ -7504,7 +7507,7 @@ void debug_80C6CB8() "._669:\n" " .align 2, 0\n" "._668:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gMonFrontPicTable\n" " .word gMonFrontPicCoords\n" " .word gUnknown_081FAF4C\n" @@ -7615,7 +7618,7 @@ void debug_80C6EE8() " .align 2, 0\n" "._670:\n" " .word gPlttBufferUnfaded+0x100\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0xffffff00\n" " .word 0xfffffc1f\n" " .word gUnknown_Debug_083F8813\n" @@ -7681,7 +7684,7 @@ void debug_80C6FA8() "._679:\n" " .align 2, 0\n" "._678:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._676:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" @@ -7707,7 +7710,7 @@ void debug_80C6FA8() "._683:\n" " .align 2, 0\n" "._682:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C71FC+1\n" "._680:\n" @@ -7738,7 +7741,7 @@ void debug_80C6FA8() "._687:\n" " .align 2, 0\n" "._686:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x4167\n" @@ -7766,7 +7769,7 @@ void debug_80C6FA8() "._692:\n" " .align 2, 0\n" "._691:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000102\n" "._689:\n" " ldrh r1, [r4, #0x30]\n" @@ -7792,7 +7795,7 @@ void debug_80C6FA8() "._697:\n" " .align 2, 0\n" "._696:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000102\n" "._694:\n" " ldrh r1, [r4, #0x2e]\n" @@ -7827,7 +7830,7 @@ void debug_80C6FA8() "._702:\n" " .align 2, 0\n" "._701:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._699:\n" " ldrh r0, [r1]\n" " mov r1, #0x0\n" @@ -7872,7 +7875,7 @@ void debug_80C6FA8() "._705:\n" " .align 2, 0\n" "._704:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded+0x200\n" " .word 0xffffff00\n" " .word gPlttBufferFaded+0x100\n" @@ -7919,7 +7922,7 @@ void debug_80C6FA8() "._708:\n" " .align 2, 0\n" "._707:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000142\n" " .word gUnknown_Debug_083F8790\n" "\n" @@ -7995,7 +7998,7 @@ void debug_80C71FC() " .align 2, 0\n" "._709:\n" " .word gSprites\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C6CB8+1\n" "\n" @@ -8033,7 +8036,7 @@ void debug_80C7294() " .align 2, 0\n" "._713:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -8099,7 +8102,7 @@ void debug_80C7294() "._718:\n" " .align 2, 0\n" "._717:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -8124,7 +8127,7 @@ void debug_80C7294() "._723:\n" " .align 2, 0\n" "._722:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._720:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x40\n" @@ -8142,7 +8145,7 @@ void debug_80C7294() "._728:\n" " .align 2, 0\n" "._727:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._725:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x10\n" @@ -8162,7 +8165,7 @@ void debug_80C7294() "._735:\n" " .align 2, 0\n" "._734:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._731:\n" " cmp r0, #0x2\n" " beq ._736 @cond_branch\n" @@ -8235,7 +8238,7 @@ void debug_80C7294() "._752:\n" " .align 2, 0\n" "._751:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._748:\n" " cmp r0, #0x2\n" " beq ._753 @cond_branch\n" @@ -8391,7 +8394,7 @@ void debug_80C74E4() "._765:\n" " .align 2, 0\n" "._764:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded\n" " .word gPlttBufferFaded\n" " .word 0x101\n" @@ -8428,7 +8431,7 @@ void debug_80C7584() "._772:\n" " .align 2, 0\n" "._771:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._767:\n" " ldrh r0, [r3, #0xc]\n" " lsl r0, r0, #0x16\n" @@ -8639,7 +8642,7 @@ void InitSeeTrainers() " .word 0x1f0b\n" " .word 0x1e0a\n" " .word debug_80C777C+1\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word +0x2018000\n" " .word gSpriteTemplate_83F8874\n" " .word gSprites\n" @@ -8970,7 +8973,7 @@ void debug_80C7934() "._787:\n" " .align 2, 0\n" "._786:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTrainerFrontPicTable\n" " .word gTrainerFrontPicCoords\n" " .word gUnknown_081FAF4C\n" @@ -9072,7 +9075,7 @@ void debug_80C7A54() " .align 2, 0\n" "._788:\n" " .word gPlttBufferUnfaded+0x100\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0xffffff00\n" " .word 0xfffffc1f\n" " .word gUnknown_Debug_083F8813\n" @@ -9138,7 +9141,7 @@ void debug_80C7B14() "._797:\n" " .align 2, 0\n" "._796:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._794:\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" @@ -9164,7 +9167,7 @@ void debug_80C7B14() "._801:\n" " .align 2, 0\n" "._800:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C7D44+1\n" "._798:\n" @@ -9195,7 +9198,7 @@ void debug_80C7B14() "._805:\n" " .align 2, 0\n" "._804:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x4167\n" @@ -9223,7 +9226,7 @@ void debug_80C7B14() "._810:\n" " .align 2, 0\n" "._809:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x5000102\n" "._807:\n" " ldrh r1, [r4, #0x30]\n" @@ -9282,7 +9285,7 @@ void debug_80C7B14() "._820:\n" " .align 2, 0\n" "._819:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._817:\n" " ldrh r0, [r1]\n" " mov r1, #0x0\n" @@ -9327,7 +9330,7 @@ void debug_80C7B14() "._823:\n" " .align 2, 0\n" "._822:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded+0x200\n" " .word 0xffffff00\n" " .word gPlttBufferFaded+0x100\n" @@ -9437,7 +9440,7 @@ void debug_80C7D44() " .align 2, 0\n" "._826:\n" " .word gSprites\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gTasks\n" " .word debug_80C7934+1\n" "\n" @@ -9475,7 +9478,7 @@ void debug_80C7DDC() " .align 2, 0\n" "._830:\n" " .word gMain\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -9541,7 +9544,7 @@ void debug_80C7DDC() "._835:\n" " .align 2, 0\n" "._834:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word 0x4000040\n" " .word 0x51ef\n" " .word 0x699f\n" @@ -9566,7 +9569,7 @@ void debug_80C7DDC() "._840:\n" " .align 2, 0\n" "._839:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._837:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x40\n" @@ -9584,7 +9587,7 @@ void debug_80C7DDC() "._845:\n" " .align 2, 0\n" "._844:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._842:\n" " ldrh r1, [r3, #0x30]\n" " mov r0, #0x10\n" @@ -9604,7 +9607,7 @@ void debug_80C7DDC() "._852:\n" " .align 2, 0\n" "._851:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._848:\n" " cmp r0, #0x2\n" " beq ._853 @cond_branch\n" @@ -9677,7 +9680,7 @@ void debug_80C7DDC() "._869:\n" " .align 2, 0\n" "._868:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" "._865:\n" " cmp r0, #0x2\n" " beq ._870 @cond_branch\n" @@ -9833,7 +9836,7 @@ void debug_80C802C() "._882:\n" " .align 2, 0\n" "._881:\n" - " .word unk_debug_ewram_0+0x34\n" + " .word gUnknown_Debug_2038A20\n" " .word gPlttBufferUnfaded\n" " .word gPlttBufferFaded\n" " .word 0x101\n" diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 45cde2cc0..9324ea1c1 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -817,10 +817,10 @@ void debug_sub_806F9E4() ._159:\n\ .align 2, 0\n\ ._158:\n\ - .word gUnknown_08376500+0x4\n\ - .word gUnknown_08376500+0x9\n\ - .word gUnknown_08376500+0x17\n\ - .word gUnknown_08376500+0xd\n\ + .word gUnknown_Debug_0839AE94\n\ + .word gUnknown_Debug_0839AE99\n\ + .word gUnknown_Debug_0839AEA7\n\ + .word gUnknown_Debug_0839AE9D\n\ ._155:\n\ bl RtcCalcLocalTime\n\ add r0, r6, #0\n\ diff --git a/sym_bss.txt b/sym_bss.txt index a00532ec7..947adcce8 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -16,7 +16,7 @@ . = ALIGN(4); src/engine/script.o(.bss); . = ALIGN(4); src/field/start_menu.o(.bss); #if DEBUG -. += 0x18; +. = ALIGN(4); src/debug/start_menu_debug.o(.bss); #endif . = ALIGN(4); src/engine/menu.o(.bss); . = ALIGN(4); src/engine/tileset_anim.o(.bss); -- cgit v1.2.3 From e03633d6bc1e1cd155bc258edbb7783020b4bdb7 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 16:55:48 -0600 Subject: fix more false offsets --- data/btl_attrs.s | 34 +++- src/battle/battle_2.c | 218 ++++++++++----------- src/battle/battle_4.c | 4 +- src/battle/battle_ai.c | 16 +- src/battle/battle_controller_opponent.c | 12 +- src/battle/battle_controller_player.c | 4 +- src/battle/battle_records.c | 4 +- src/battle/battle_util.c | 12 +- src/contest.c | 14 +- src/debug/nohara_debug_menu.c | 14 +- src/engine/link.c | 13 +- src/engine/mystery_event_menu.c | 2 +- src/field/berry.c | 4 +- src/field/field_weather.c | 13 +- src/field/slot_machine.c | 104 ++++++----- src/pokenav_before.c | 322 ++++++++++++++++---------------- sym_common.txt | 2 +- sym_ewram.txt | 40 ++-- 18 files changed, 442 insertions(+), 390 deletions(-) diff --git a/data/btl_attrs.s b/data/btl_attrs.s index 5f44a87b8..8d6e643c8 100644 --- a/data/btl_attrs.s +++ b/data/btl_attrs.s @@ -206,7 +206,31 @@ gSpriteTemplate_81F96D0:: @ 81F96D0 .if DEBUG UnkDebug0:: @ 0x821F3B8 - .incbin "baserom_de_debug.gba", 0x21F3B8, 620 + .incbin "baserom_de_debug.gba", 0x21F3B8, 108 + +gUnknown_Debug_821F424:: + .incbin "baserom_de_debug.gba", 0x21F424, 320 + +gUnknown_Debug_821F564:: + .incbin "baserom_de_debug.gba", 0x21F564, 2 + +gUnknown_Debug_821F566:: + .incbin "baserom_de_debug.gba", 0x21F566, 2 + +gUnknown_Debug_821F568:: + .incbin "baserom_de_debug.gba", 0x21F568, 4 + +gUnknown_Debug_821F56C:: + .incbin "baserom_de_debug.gba", 0x21F56C, 32 + +gUnknown_Debug_821F58C:: + .incbin "baserom_de_debug.gba", 0x21F58C, 12 + +gUnknown_Debug_821F598:: + .incbin "baserom_de_debug.gba", 0x21F598, 20 + +gUnknown_Debug_821F5AC:: + .incbin "baserom_de_debug.gba", 0x21F5AC, 120 Str_821F624:: @ 0x821F624 .string "ーーーーーーーーーーーー$" @@ -242,7 +266,13 @@ debug_unk_0b:: @ 0x821F66D .string "せつぞくエラー$" -.incbin "baserom_de_debug.gba", 0x21F675, 323 + .incbin "baserom_de_debug.gba", 0x21F675, 11 + +gUnknown_Debug_821F680:: + .incbin "baserom_de_debug.gba", 0x21F680, 280 + +gUnknown_Debug_821F798:: + .incbin "baserom_de_debug.gba", 0x21F798, 312-280 Str_821F7B8:: @ 0x821F7B8 .string "たかさ $" diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 41d00546d..6808ad61c 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -354,7 +354,7 @@ void InitBattle(void) " .word gBattle_BG2_Y\n" " .word gBattle_BG3_X\n" " .word gBattle_BG3_Y\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" " .word gBattleTerrain\n" " .word gUnknown_03004210\n" " .word gUnknown_030041D0\n" @@ -417,7 +417,7 @@ void InitBattle(void) "._15:\n" " .word sub_800EC9C+1\n" " .word gBattleTypeFlags\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" " .word gEnemyParty\n" " .word gTrainerBattleOpponent\n" " .word gMain\n" @@ -638,7 +638,7 @@ void sub_800EC9C() "._56:\n" " .align 2, 0\n" "._55:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x160cb\n" " .word gBattleCommunication\n" " .word ._57\n" @@ -710,8 +710,8 @@ void sub_800EC9C() "._76:\n" " .word gBattleTypeFlags\n" " .word gReceivedRemoteLinkPlayers\n" - " .word +0x2000000\n" - " .word gUnknown_02023A14+0x50\n" + " .word gSharedMem\n" + " .word gUnknown_02023A14_50\n" " .word 0x2211\n" " .word gLinkPlayers\n" " .word gBattleCommunication\n" @@ -873,7 +873,7 @@ void sub_800EC9C() "._106:\n" " .word sub_800DE30+1\n" " .word gTasks\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gBlockRecvBuffer\n" "._60:\n" " bl sub_8007ECC\n" @@ -1295,7 +1295,7 @@ void sub_800F104() "._152:\n" " .align 2, 0\n" "._151:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x160cb\n" " .word 0x160c4\n" " .word gBattleCommunication\n" @@ -1355,10 +1355,10 @@ void sub_800F104() " .align 2, 0\n" "._165:\n" " .word gReceivedRemoteLinkPlayers\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" " .word 0x2211\n" " .word gLinkPlayers\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gBattleCommunication\n" "._147:\n" " bl GetBlockReceivedStatus\n" @@ -1586,7 +1586,7 @@ void sub_800F298() "._189:\n" " .align 2, 0\n" "._188:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x160cb\n" " .word gBattleCommunication\n" " .word ._190\n" @@ -1646,10 +1646,10 @@ void sub_800F298() " .align 2, 0\n" "._206:\n" " .word gReceivedRemoteLinkPlayers\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" " .word 0x2211\n" " .word gLinkPlayers\n" - " .word +0x2000000\n" + " .word gSharedMem\n" "._192:\n" " bl GetBlockReceivedStatus\n" " mov r1, #0xf\n" @@ -3181,12 +3181,12 @@ void debug_sub_8010818() "._502:\n" " .align 2, 0\n" "._501:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word 0x115\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" " .word gUnknown_Debug_030043A8\n" - " .word gUnknown_02023A14+0xde\n" - " .word UnkDebug0+0x1b4\n" + " .word gUnknown_Debug_2023B02\n" + " .word gUnknown_Debug_821F56C\n" "\n" ); } @@ -3345,7 +3345,7 @@ void debug_sub_80108B8() " .word 0x4000050\n" " .word gMonShinyPalette_CircledQuestionMark+0x18\n" " .word gMonShinyPalette_CircledQuestionMark+0x834\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word gMonShinyPalette_CircledQuestionMark+0xa8c\n" " .word 0x50001e0\n" " .word debug_sub_8011D40+1\n" @@ -3356,7 +3356,7 @@ void debug_sub_80108B8() " .word gUnknown_Debug_030043A0\n" " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_030043A8\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" "._505:\n" " ldr r0, ._510\n" " mov r1, #0x0\n" @@ -3377,7 +3377,7 @@ void debug_sub_80108B8() "._511:\n" " .align 2, 0\n" "._510:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x160bb\n" "\n" ); @@ -3458,7 +3458,7 @@ void debug_sub_8010AAC() " .align 2, 0\n" "._520:\n" " .word gBaseStats\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_03004360\n" "._517:\n" @@ -3607,7 +3607,7 @@ void debug_sub_8010B80() "._535:\n" " .align 2, 0\n" "._534:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A0\n" " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_03004360\n" @@ -3800,8 +3800,8 @@ void debug_sub_8010CAC() " .word gUnknown_Debug_030043A0\n" " .word debug_sub_80108B8+1\n" " .word gPlayerParty\n" - " .word gUnknown_02023A14+0x52\n" - " .word gUnknown_02023A14+0xde\n" + " .word gUnknown_Debug_2023A76\n" + " .word gUnknown_Debug_2023B02\n" " .word gBattleMoves+0x4\n" "._550:\n" " ldr r1, ._556\n" @@ -4078,7 +4078,7 @@ void debug_sub_8010CAC() "._598:\n" " .align 2, 0\n" "._597:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A4\n" "._593:\n" " ldr r1, ._600\n" @@ -4089,7 +4089,7 @@ void debug_sub_8010CAC() "._601:\n" " .align 2, 0\n" "._600:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" "._594:\n" " ldr r3, ._604\n" " add r2, r3, #0\n" @@ -4110,7 +4110,7 @@ void debug_sub_8010CAC() "._605:\n" " .align 2, 0\n" "._604:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" "._602:\n" " mov r1, #0x8\n" " strh r1, [r2]\n" @@ -4250,11 +4250,11 @@ void debug_sub_8010CAC() "._619:\n" " .align 2, 0\n" "._618:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A0\n" " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_03004360\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" " .word gMain\n" " .word ._620\n" "._620:\n" @@ -4287,7 +4287,7 @@ void debug_sub_8010CAC() "._629:\n" " .align 2, 0\n" "._628:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A4\n" "._624:\n" " ldr r1, ._631\n" @@ -4298,7 +4298,7 @@ void debug_sub_8010CAC() "._632:\n" " .align 2, 0\n" "._631:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" "._625:\n" " ldr r3, ._635\n" " add r2, r3, #0\n" @@ -4319,7 +4319,7 @@ void debug_sub_8010CAC() "._636:\n" " .align 2, 0\n" "._635:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" "._633:\n" " mov r1, #0x0\n" " strh r1, [r2]\n" @@ -4456,11 +4456,11 @@ void debug_sub_8010CAC() "._651:\n" " .align 2, 0\n" "._650:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A0\n" " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_03004360\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" " .word gMain\n" "._648:\n" " mov r4, r8\n" @@ -4492,9 +4492,9 @@ void debug_sub_8010CAC() "._656:\n" " .align 2, 0\n" "._655:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_03004360\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" "._657:\n" " add r0, r5, #6\n" " add r0, r1, r0\n" @@ -4614,9 +4614,9 @@ void debug_sub_8010CAC() "._669:\n" " .align 2, 0\n" "._668:\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_03004360\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" "._670:\n" " ldrh r0, [r3]\n" " sub r0, r0, r1\n" @@ -4913,9 +4913,9 @@ void debug_sub_8011498() " .word gMain\n" " .word debug_sub_8010CAC+1\n" " .word gUnknown_Debug_030043A8\n" - " .word gUnknown_02023A14+0xde\n" + " .word gUnknown_Debug_2023B02\n" " .word gUnknown_Debug_03004360\n" - " .word UnkDebug0+0x1ac\n" + " .word gUnknown_Debug_821F564\n" "._689:\n" " add r0, r6, #6\n" " add r0, r2, r0\n" @@ -4988,10 +4988,10 @@ void debug_sub_8011498() " .align 2, 0\n" "._692:\n" " .word gMain\n" - " .word gUnknown_02023A14+0xde\n" + " .word gUnknown_Debug_2023B02\n" " .word gUnknown_Debug_030043A8\n" " .word gUnknown_Debug_03004360\n" - " .word UnkDebug0+0x1ac\n" + " .word gUnknown_Debug_821F564\n" "._694:\n" " ldrh r0, [r4]\n" " sub r0, r0, r1\n" @@ -5156,10 +5156,10 @@ void debug_sub_801174C() " .word gUnknown_020297ED\n" " .word gSaveBlock2\n" " .word str_821F631\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gBattleTypeFlags\n" - " .word UnkDebug0+0x1e0\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_Debug_821F598\n" + " .word gUnknown_02023A14_50\n" " .word gBattleTerrain\n" " .word gTrainerBattleOpponent\n" " .word gPlayerPartyCount\n" @@ -5272,8 +5272,8 @@ void debug_sub_801174C() " .align 2, 0\n" "._719:\n" " .word gEnemyParty\n" - " .word gUnknown_02023A14+0x52\n" - " .word gUnknown_02023A14+0x56\n" + " .word gUnknown_Debug_2023A76\n" + " .word gUnknown_Debug_2023A7A\n" "._717:\n" " mov r2, #0x0\n" " ldsh r0, [r0, r2]\n" @@ -5316,7 +5316,7 @@ void debug_sub_801174C() " .align 2, 0\n" "._726:\n" " .word gEnemyParty\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" "._723:\n" " cmp r0, #0x2\n" " beq ._728 @cond_branch\n" @@ -5429,10 +5429,10 @@ void debug_sub_801174C() " .align 2, 0\n" "._741:\n" " .word gPlayerParty\n" - " .word gUnknown_02023A14+0x98\n" + " .word gUnknown_Debug_2023ABC\n" " .word gPlayerPartyCount\n" - " .word gUnknown_02023A14+0x9c\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023AC0\n" + " .word gUnknown_Debug_2023A76\n" "._739:\n" " mov r1, #0x0\n" " ldsh r0, [r0, r1]\n" @@ -5574,14 +5574,14 @@ void debug_sub_801174C() " .align 2, 0\n" "._750:\n" " .word gPlayerParty\n" - " .word gUnknown_02023A14+0x98\n" + " .word gUnknown_Debug_2023ABC\n" " .word Str_821F649\n" - " .word gUnknown_02023A14+0x50\n" - " .word gUnknown_02023A14+0xde\n" + " .word gUnknown_02023A14_50\n" + " .word gUnknown_Debug_2023B02\n" " .word gEnemyParty\n" " .word gBattleMoves+0x4\n" - " .word gUnknown_02023A14+0x10e\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023B32\n" + " .word gUnknown_Debug_2023A76\n" "._748:\n" " cmp r0, #0x7\n" " bne ._752 @cond_branch\n" @@ -5592,7 +5592,7 @@ void debug_sub_801174C() "._755:\n" " .align 2, 0\n" "._754:\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" "._752:\n" " cmp r0, #0x6\n" " bne ._756 @cond_branch\n" @@ -5614,8 +5614,8 @@ void debug_sub_801174C() "._760:\n" " .align 2, 0\n" "._759:\n" - " .word gUnknown_02023A14+0x50\n" - " .word +0x2000000\n" + " .word gUnknown_02023A14_50\n" + " .word gSharedMem\n" " .word 0x160a3\n" "._757:\n" " ldr r0, ._762\n" @@ -5625,7 +5625,7 @@ void debug_sub_801174C() "._763:\n" " .align 2, 0\n" "._762:\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x160a3\n" "._756:\n" " cmp r0, #0x5\n" @@ -5642,7 +5642,7 @@ void debug_sub_801174C() "._767:\n" " .align 2, 0\n" "._766:\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" "._764:\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -5772,11 +5772,11 @@ void debug_sub_801174C() "._773:\n" " .align 2, 0\n" "._772:\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" " .word gMain\n" " .word debug_sub_80108B8+1\n" " .word unref_sub_800D684+1\n" - " .word UnkDebug0+0x1f4\n" + " .word gUnknown_Debug_821F5AC\n" "\n" ); } @@ -5834,7 +5834,7 @@ void debug_sub_8011D40() " .align 2, 0\n" "._774:\n" " .word 0x40000d4\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x6004000\n" " .word 0x80000800\n" " .word gBattle_BG0_X\n" @@ -6121,9 +6121,9 @@ void debug_sub_8011EA0() " .align 2, 0\n" "._823:\n" " .word gBattleTextBuff1\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" " .word gUnknown_Debug_03004370\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_03004360\n" " .word gSpeciesNames\n" "._817:\n" @@ -6147,7 +6147,7 @@ void debug_sub_8011EA0() " .align 2, 0\n" "._826:\n" " .word gBattleTextBuff1\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_03004360\n" "._814:\n" " mov r0, #0x0\n" @@ -6226,9 +6226,9 @@ void debug_sub_8011EA0() "._830:\n" " .word gUnknown_Debug_03004370\n" " .word gBattleTextBuff1\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" " .word gUnknown_Debug_03004360\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" "._828:\n" " ldr r1, ._833\n" " mov r0, sl\n" @@ -6257,10 +6257,10 @@ void debug_sub_8011EA0() "._834:\n" " .align 2, 0\n" "._833:\n" - " .word UnkDebug0+0x26c\n" + " .word Str_821F624\n" " .word gUnknown_Debug_03004370\n" " .word gBattleTextBuff1\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" "._816:\n" " mov r0, #0x0\n" " mov r1, #0x4\n" @@ -6308,8 +6308,8 @@ void debug_sub_8011EA0() "._839:\n" " .word gUnknown_Debug_03004370\n" " .word gBattleTextBuff1\n" - " .word UnkDebug0+0x6c\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_821F424\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_03004360\n" "._836:\n" " cmp r0, #0x2\n" @@ -6373,7 +6373,7 @@ void debug_sub_8011EA0() "._849:\n" " .word gBattleTextBuff1\n" " .word gUnknown_Debug_03004370\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" "._815:\n" " ldr r6, ._851\n" " ldr r3, ._851 + 4\n" @@ -6422,10 +6422,10 @@ void debug_sub_8011EA0() " .align 2, 0\n" "._851:\n" " .word gBattleTextBuff1\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_03004360\n" " .word gUnknown_Debug_03004370\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" "\n" ); } @@ -6572,12 +6572,12 @@ void debug_sub_8012294() " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_03004370\n" " .word gBattleTextBuff1\n" - " .word UnkDebug0+0x1ac\n" + " .word gUnknown_Debug_821F564\n" " .word gUnknown_Debug_030043A8\n" - " .word UnkDebug0+0x1ae\n" - " .word UnkDebug0+0x1b0\n" + " .word gUnknown_Debug_821F566\n" + " .word gUnknown_Debug_821F568\n" " .word gUnknown_Debug_03004360\n" - " .word gUnknown_02023A14+0xde\n" + " .word gUnknown_Debug_2023B02\n" " .word gMoveNames\n" "\n" ); @@ -6700,9 +6700,9 @@ void debug_sub_80123D8() "._858:\n" " .word gUnknown_Debug_03004370\n" " .word gBattleTextBuff1\n" - " .word UnkDebug0+0x1d4\n" + " .word gUnknown_Debug_821F58C\n" " .word gUnknown_Debug_03004360\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gBaseStats\n" " .word gAbilityNames\n" "._856:\n" @@ -6745,7 +6745,7 @@ void debug_sub_80123D8() " .word gBattleTextBuff1\n" " .word gAbilityNames\n" " .word gUnknown_Debug_03004370\n" - " .word UnkDebug0+0x1d4\n" + " .word gUnknown_Debug_821F58C\n" "\n" ); } @@ -6792,9 +6792,9 @@ void debug_sub_8012540() " .align 2, 0\n" "._862:\n" " .word gBattleTextBuff1\n" - " .word gUnknown_02023A14+0x52\n" + " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_03004370\n" - " .word UnkDebug0+0x6c\n" + " .word gUnknown_Debug_821F424\n" "\n" ); } @@ -6839,8 +6839,8 @@ void debug_sub_80125A0() "._865:\n" " .align 2, 0\n" "._864:\n" - " .word +0x2000000\n" - " .word UnkDebug0+0x2c8\n" + " .word gSharedMem\n" + " .word gUnknown_Debug_821F680\n" " .word gUnknown_Debug_030043A0\n" " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_03004360\n" @@ -6879,8 +6879,8 @@ void debug_sub_80125E4() "._867:\n" " .align 2, 0\n" "._866:\n" - " .word +0x2000000\n" - " .word UnkDebug0+0x2c8\n" + " .word gSharedMem\n" + " .word gUnknown_Debug_821F680\n" " .word gUnknown_Debug_030043A0\n" " .word gUnknown_Debug_030043A4\n" " .word gUnknown_Debug_03004360\n" @@ -6910,8 +6910,8 @@ void debug_sub_8012628() "._869:\n" " .align 2, 0\n" "._868:\n" - " .word +0x2000000\n" - " .word UnkDebug0+0x3e0\n" + " .word gSharedMem\n" + " .word gUnknown_Debug_821F798\n" " .word gUnknown_Debug_030043A8\n" " .word gUnknown_Debug_03004360\n" "\n" @@ -6940,8 +6940,8 @@ void debug_sub_8012658() "._871:\n" " .align 2, 0\n" "._870:\n" - " .word +0x2000000\n" - " .word UnkDebug0+0x3e0\n" + " .word gSharedMem\n" + " .word gUnknown_Debug_821F798\n" " .word gUnknown_Debug_030043A8\n" " .word gUnknown_Debug_03004360\n" "\n" @@ -7126,7 +7126,7 @@ void debug_sub_8012688() "._874:\n" " .align 2, 0\n" "._873:\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" " .word 0x40000d4\n" " .word 0x85006000\n" " .word 0x400004c\n" @@ -7341,8 +7341,8 @@ void debug_sub_8012938() "._880:\n" " .word gUnknown_03004210\n" " .word gBattleTextBuff1\n" - " .word UnkDebug0+0x400\n" - " .word gUnknown_02023A14+0x13e\n" + " .word Str_821F7B8\n" + " .word gUnknown_Debug_2023B62\n" " .word gCurrentMove\n" " .word gSprites\n" " .word gTasks\n" @@ -7444,7 +7444,7 @@ void debug_sub_80129F8() " .word gMonPaletteTable\n" " .word gSprites\n" " .word gTasks\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" "\n" ); } @@ -7638,7 +7638,7 @@ void debug_sub_8012B70() "._901:\n" " .word gTasks\n" " .word gUnknown_03004210\n" - " .word UnkDebug0+0x422\n" + " .word Str_821F7DA\n" "\n" ); } @@ -7762,7 +7762,7 @@ void debug_sub_8012C08() " .align 2, 0\n" "._907:\n" " .word gTasks\n" - " .word UnkDebug0+0x432\n" + " .word Str_821F7EA\n" " .word gUnknown_03004210\n" " .word BattleText_YesNo\n" "\n" @@ -7833,7 +7833,7 @@ void debug_sub_8012D10() " .align 2, 0\n" "._920:\n" " .word gUnknown_03004210\n" - " .word UnkDebug0+0x405\n" + " .word Str_821F7BD\n" " .word gTasks\n" "._915:\n" " ldr r2, ._924\n" @@ -7988,7 +7988,7 @@ void debug_sub_8012D10() "._953:\n" " .align 2, 0\n" "._952:\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" " .word gCurrentMove\n" "._939:\n" " mov r0, #0x1\n" @@ -8059,7 +8059,7 @@ void debug_sub_8012D10() "._974:\n" " .align 2, 0\n" "._973:\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" " .word gCurrentMove\n" "._968:\n" " ldr r1, ._977\n" @@ -8135,7 +8135,7 @@ void debug_sub_8012D10() "._996:\n" " .align 2, 0\n" "._995:\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" " .word gCurrentMove\n" "._983:\n" " mov r0, #0x1\n" @@ -8218,7 +8218,7 @@ void debug_sub_8012D10() "._1021:\n" " .align 2, 0\n" "._1020:\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" " .word gCurrentMove\n" "._1018:\n" " strb r3, [r2]\n" @@ -8372,7 +8372,7 @@ void debug_sub_8012D10() " .align 2, 0\n" "._1050:\n" " .word gTasks\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" " .word 0x19b\n" "._1047:\n" " mov r0, #0x2\n" @@ -8458,7 +8458,7 @@ void debug_sub_8012D10() " .align 2, 0\n" "._1065:\n" " .word gTasks\n" - " .word gUnknown_02023A14+0x13e\n" + " .word gUnknown_Debug_2023B62\n" " .word 0x19b\n" "._1062:\n" " mov r0, #0x2\n" @@ -8912,7 +8912,7 @@ void debug_sub_80138CC() " .align 2, 0\n" "._1167:\n" " .word gActiveBank\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x160fd\n" " .word ._1169\n" "._1169:\n" @@ -9095,7 +9095,7 @@ void debug_sub_80139E4() "._1199:\n" " .align 2, 0\n" "._1198:\n" - " .word gUnknown_02023A14+0x50\n" + " .word gUnknown_02023A14_50\n" " .word gActiveBank\n" " .word gNoOfAllBanks\n" " .word gBattleMainFunc\n" @@ -9471,7 +9471,7 @@ void sub_8010874() " .word gStatuses3\n" " .word gUnknown_02024C70\n" " .word gUnknown_02024C5C\n" - " .word +0x2017100\n" + " .word gSharedMem+0x17100\n" " .word gSideTimers\n" " .word gSideAffecting\n" " .word gBankAttacker\n" @@ -9481,7 +9481,7 @@ void sub_8010874() " .word gHitMarker\n" " .word gBattleTypeFlags\n" " .word gSaveBlock2\n" - " .word +0x2000000\n" + " .word gSharedMem\n" " .word 0x16084\n" " .word gMultiHitCounter\n" " .word gBattleOutcome\n" diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 3415d9337..9fe1f6cb0 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -1090,7 +1090,7 @@ static const u8 sTerrainToType[] = TYPE_NORMAL, // plain }; -const u8 sBallCatchBonuses[] = +static const u8 sBallCatchBonuses[] = { 20, 15, 10, 15 // Ultra, Great, Poke, Safari }; @@ -5103,7 +5103,7 @@ static void atk15_seteffectwithchance(void) ._1045:\n\ .word gBattleMoves\n\ .word gCurrentMove\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ .word gBattleCommunication\n\ .word gBattleMoveFlags\n\ ._1043:\n\ diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index ffc9281e4..87a66c2c7 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -381,7 +381,7 @@ void BattleAI_SetupAIData() "._17:\n" " .align 2, 0\n" "._16:\n" - " .word +0x2016800\n" + " .word gSharedMem+0x16800\n" " .word gActiveBank\n" " .word gBitTable\n" " .word +0x2016c00\n" @@ -410,7 +410,7 @@ void BattleAI_SetupAIData() "._20:\n" " .word gBankTarget\n" " .word gBattleTypeFlags\n" - " .word +0x2016800\n" + " .word gSharedMem+0x16800\n" "._18:\n" " mov r2, #0x80\n" " lsl r2, r2, #0x3\n" @@ -425,7 +425,7 @@ void BattleAI_SetupAIData() "._25:\n" " .align 2, 0\n" "._24:\n" - " .word +0x2016800\n" + " .word gSharedMem+0x16800\n" "._22:\n" " mov r0, #0x10\n" " and r0, r0, r1\n" @@ -438,7 +438,7 @@ void BattleAI_SetupAIData() "._29:\n" " .align 2, 0\n" "._28:\n" - " .word +0x2016800\n" + " .word gSharedMem+0x16800\n" "._26:\n" " mov r0, #0x90\n" " lsl r0, r0, #0x4\n" @@ -460,7 +460,7 @@ void BattleAI_SetupAIData() " .align 2, 0\n" "._33:\n" " .word gTrainerBattleOpponent\n" - " .word +0x2016800\n" + " .word gSharedMem+0x16800\n" "._31:\n" " ldr r3, ._36\n" " ldr r2, ._36 + 4\n" @@ -489,10 +489,10 @@ void BattleAI_SetupAIData() "._37:\n" " .align 2, 0\n" "._36:\n" - " .word +0x2016800\n" + " .word gSharedMem+0x16800\n" " .word gTrainers\n" - " .word gUnknown_02023A14+0x50\n" - " .word gUnknown_02023A14+0x4c\n" + " .word gUnknown_02023A14_50\n" + " .word gUnknown_02023A14_4C\n" "\n" ); } diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index cc69c0120..d2045b6c4 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -1232,7 +1232,7 @@ void OpponentHandleTrainerThrow(void) ._481:\n\ .align 2, 0\n\ ._480:\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ .word +0x2000000\n\ .word 0x160a3\n\ ._478:\n\ @@ -1718,8 +1718,8 @@ void OpponentHandlecmd20(void) .align 2, 0\n\ ._549:\n\ .word gActiveBank\n\ - .word gUnknown_02023A64\n\ - .word gUnknown_02023A14+0x50\n\ + .word gBattleBufferA+4\n\ + .word gUnknown_02023A14_50\n\ .word gBattleMoves\n\ .word +0x2000000\n\ .word 0x1609e\n\ @@ -1781,7 +1781,7 @@ void OpponentHandlecmd20(void) .align 2, 0\n\ ._559:\n\ .word gBattleTypeFlags\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ ._556:\n\ bl Random\n\ add r1, r5, #0\n\ @@ -2048,7 +2048,7 @@ void OpponentHandlecmd20(void) ldr r6, _0803545C @ =gActiveBank\n\ ldrb r0, [r6]\n\ lsls r0, 9\n\ - ldr r1, _08035460 @ =gUnknown_02023A64\n\ + ldr r1, _08035460 @ =gBattleBufferA+4\n\ adds r5, r0, r1\n\ ldr r0, _08035464 @ =gBattleTypeFlags\n\ ldrh r1, [r0]\n\ @@ -2070,7 +2070,7 @@ void OpponentHandlecmd20(void) b _0803546C\n\ .align 2, 0\n\ _0803545C: .4byte gActiveBank\n\ -_08035460: .4byte gUnknown_02023A64\n\ +_08035460: .4byte gBattleBufferA+4\n\ _08035464: .4byte gBattleTypeFlags\n\ _08035468:\n\ movs r0, 0x1\n\ diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index cbca4a586..8875d5148 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -674,7 +674,7 @@ void sub_802C68C(void) .align 2, 0\n\ ._131:\n\ .word gActiveBank\n\ - .word gUnknown_02023A64\n\ + .word gBattleBufferA+4\n\ .word gMain\n\ .word gMoveSelectionCursor\n\ ._128:\n\ @@ -1328,7 +1328,7 @@ void sub_802C68C(void) .word gPlayerParty\n\ .word gMoveNames\n\ .word gDisplayedStringBattle\n\ - .word sBallCatchBonuses+0x4\n\ + .word gString_TurnJP\n\ .word gAnimMoveTurn\n\ .word gSprites\n\ .word gOamMatrixAllocBitmap\n\ diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index 4fce958fa..9dd1d7b53 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -275,9 +275,9 @@ void debug_sub_81257E0(void) ._63:\n\ .align 2, 0\n\ ._62:\n\ - .word gUnknown_083F8410+0xa\n\ + .word gUnknown_Debug_4245CC+2\n\ .word gLinkPlayers\n\ - .word gUnknown_083F8410+0x5c\n\ + .word gUnknown_Debug_8424620\n\ .word gLinkPlayerMapObjects\n\ .word gSaveBlock1+0x30b8"); } diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index 817382911..620e0690a 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -3255,7 +3255,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) ._1079:\n\ .align 2, 0\n\ ._1078:\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ .word gBattleMoveFlags\n\ .word gBattleMons\n\ .word gBankAttacker\n\ @@ -3465,7 +3465,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) ._1112:\n\ .align 2, 0\n\ ._1111:\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ .word gBattleMoveFlags\n\ .word gBattleMons\n\ .word gBankAttacker\n\ @@ -3660,7 +3660,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) ._1143:\n\ .align 2, 0\n\ ._1142:\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ .word gBattleMoveFlags\n\ .word gBattleMons\n\ .word gBankAttacker\n\ @@ -3855,7 +3855,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) ._1174:\n\ .align 2, 0\n\ ._1173:\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ .word gBattleMoveFlags\n\ .word gBattleMons\n\ .word gBankAttacker\n\ @@ -4118,7 +4118,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) ._1218:\n\ .align 2, 0\n\ ._1217:\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ .word gBattleMoveFlags\n\ .word gBattleMons\n\ .word gBankAttacker\n\ @@ -7489,7 +7489,7 @@ u8 IsMonDisobedient(void) .word gBattleTypeFlags\n\ .word gBankAttacker\n\ .word gBattleMons\n\ - .word gUnknown_02023A14+0x50\n\ + .word gUnknown_02023A14_50\n\ ._1783:\n\ ldr r0, ._1794\n\ bl FlagGet\n\ diff --git a/src/contest.c b/src/contest.c index 834d641d0..950b26d0c 100644 --- a/src/contest.c +++ b/src/contest.c @@ -919,7 +919,7 @@ void sub_80ABEA0(u8 taskId) ._180:\n\ .word gDisplayedStringBattle\n\ .word gText_Contest_ButItCantParticipate\n\ - .word +0x2019204\n\ + .word gSharedMem+0x19204\n\ .word gStringVar4\n\ .word gMenuWindow\n\ .word gBattle_BG0_Y\n\ @@ -939,7 +939,7 @@ void sub_80ABEA0(u8 taskId) ._185:\n\ .align 2, 0\n\ ._184:\n\ - .word +0x2019204\n\ + .word gSharedMem+0x19204\n\ ._182:\n\ sub r0, r0, #0x1\n\ b ._186\n\ @@ -957,7 +957,7 @@ void sub_80ABEA0(u8 taskId) ._190:\n\ .align 2, 0\n\ ._189:\n\ - .word +0x2019204\n\ + .word gSharedMem+0x19204\n\ ._187:\n\ add r0, r1, #1\n\ ._186:\n\ @@ -987,7 +987,7 @@ void sub_80ABEA0(u8 taskId) ._194:\n\ .align 2, 0\n\ ._193:\n\ - .word +0x2019204\n\ + .word gSharedMem+0x19204\n\ .word gContestMons\n\ .word gContestPlayerMonIndex\n\ ._168:\n\ @@ -1445,7 +1445,7 @@ void debug_sub_80BA054() ._263:\n\ .align 2, 0\n\ ._262:\n\ - .word +0x2019348\n\ + .word gSharedMem+0x19348\n\ .word gBattleMonForms\n\ .word gContestPlayerMonIndex\n\ .word gContestMons\n\ @@ -1501,7 +1501,7 @@ void debug_sub_80BA054() .word gSprites\n\ .word SpriteCallbackDummy+1\n\ .word gContestPlayerMonIndex\n\ - .word +0x2019260\n\ + .word gSharedMem+0x19260\n\ ._241:\n\ ldr r0, ._273\n\ ldr r0, [r0]\n\ @@ -1535,7 +1535,7 @@ void debug_sub_80BA054() .word gAnimScriptCallback\n\ .word gAnimScriptActive\n\ .word gContestPlayerMonIndex\n\ - .word +0x2019204\n\ + .word gSharedMem+0x19204\n\ .word gTasks\n\ ._271:\n\ ldr r0, ._276\n\ diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index a932fee8d..bdfc8f9c5 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -1,9 +1,9 @@ #if DEBUG #include "global.h" -#define BSS_DATA __attribute__((section(".bss"))) - -BSS_DATA u8 gDebug_03000724[4] = { 0 }; +__attribute__((unused)) static u8 gDebug_03000724; +__attribute__((unused)) static u8 gDebug_03000725; +__attribute__((unused)) static u8 gDebug_03000726; __attribute__((naked)) void InitNoharaDebugMenu() @@ -127,7 +127,7 @@ void NoharaDebugMenu_TV() "._9:\n" " .align 2, 0\n" "._8:\n" - " .word gDebug_03000724+0x2\n" + " .word gDebug_03000726\n" " .word gUnknown_Debug_083C4B8C\n" " .word gMenuCallback\n" " .word debug_sub_808F4AC+1\n" @@ -414,7 +414,7 @@ void debug_sub_808F648() " .align 2, 0\n" "._35:\n" " .word gMain\n" - " .word gDebug_03000724+0x2\n" + " .word gDebug_03000726\n" "._33:\n" " bl debug_sub_808F6BC\n" " b ._40\n" @@ -933,7 +933,7 @@ void debug_sub_808F93C() " .align 2, 0\n" "._83:\n" " .word gMain\n" - " .word gDebug_03000724+0x1\n" + " .word gDebug_03000725\n" " .word gDebug_03000724\n" " .word gUnknown_Debug_083C4ABD+0xf\n" " .word gStringVar1\n" @@ -1671,7 +1671,7 @@ void debug_sub_808FF3C() " .align 2, 0\n" "._192:\n" " .word gMain\n" - " .word gDebug_03000724+0x1\n" + " .word gDebug_03000725\n" " .word gDebug_03000724\n" " .word gUnknown_Debug_083C4B20+0x4\n" " .word gStringVar1\n" diff --git a/src/engine/link.c b/src/engine/link.c index 5785a5a56..eb0ae4731 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -147,6 +147,9 @@ void (*gLinkCallback)(void); struct LinkPlayer gSavedLinkPlayers[MAX_LINK_PLAYERS]; u8 gShouldAdvanceLinkState; u16 gLinkTestBlockChecksums[MAX_LINK_PLAYERS]; +#if DEBUG +u8 gUnknown_Debug_30030E0; +#endif u8 gBlockRequestType; u8 gLastSendQueueCount; struct Link gLink; @@ -158,11 +161,11 @@ u8 deUnkValue1; u8 deUnkValue2; #endif -EWRAM_DATA bool8 gLinkTestDebugValuesEnabled = {0}; -EWRAM_DATA bool8 gLinkTestDummyBool = {0}; -EWRAM_DATA u32 gFiller_20238B8 = {0}; -EWRAM_DATA u32 dword_20238BC = {0}; -EWRAM_DATA bool8 gLinkOpen = {0}; +EWRAM_DATA bool8 gLinkTestDebugValuesEnabled = 0; +EWRAM_DATA bool8 gLinkTestDummyBool = 0; +EWRAM_DATA u32 gFiller_20238B8 = 0; +EWRAM_DATA u32 dword_20238BC = 0; +EWRAM_DATA bool8 gLinkOpen = 0; static const u16 sLinkTestDigitPalette[] = INCBIN_U16("graphics/interface/link_test_digits.gbapal"); static const u32 sLinkTestDigitTiles[] = INCBIN_U32("graphics/interface/link_test_digits.4bpp"); diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index c80a8f3e9..2e526bb4a 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -602,7 +602,7 @@ void debug_sub_815D1D8() " .align 2, 0\n" "._161:\n" " .word gPaletteFade\n" - " .word gLinkTestBlockChecksums+0x8\n" + " .word gUnknown_Debug_30030E0\n" " .word Str_843DA70\n" " .word 0x43c\n" "._144:\n" diff --git a/src/field/berry.c b/src/field/berry.c index d6982479e..5c1ecd699 100644 --- a/src/field/berry.c +++ b/src/field/berry.c @@ -1245,8 +1245,8 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) " .word 0x3170\n" " .word 0x47f\n" " .word 0x317c\n" - " .word gSpriteImage_83C172C+0x80\n" - " .word gSpriteImage_83C172C+0x500\n" + " .word gSpriteImage_UnusedCherry\n" + " .word gSpritePalette_UnusedCherry\n" " .word 0x35fc\n" " .word gSaveBlock1+0x3676\n" " .word gUnknown_Debug_839B6CE\n" diff --git a/src/field/field_weather.c b/src/field/field_weather.c index cf96b2e87..c411bf20b 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -43,7 +43,10 @@ struct WeatherCallbacks EWRAM_DATA struct Weather gWeather = {0}; EWRAM_DATA u8 gFieldEffectPaletteGammaTypes[32] = {0}; -EWRAM_DATA u16 gUnknown_0202FF58 = {0}; +EWRAM_DATA u16 gUnknown_0202FF58 = 0; +#if DEBUG +EWRAM_DATA u16 gUnknown_Debug_20301FE = 0; +#endif static const u8 *sPaletteGammaTypes; @@ -1297,7 +1300,7 @@ u8 debug_sub_8085564(void) .align 2, 0\n\ ._375:\n\ .word gMain\n\ - .word gUnknown_0202FF58+0x2\n\ + .word gUnknown_Debug_20301FE\n\ ._373:\n\ mov r0, #0xe\n\ ._374:\n\ @@ -1333,7 +1336,7 @@ u8 debug_sub_8085564(void) .align 2, 0\n\ ._380:\n\ .word gDebugText_Weather\n\ - .word gUnknown_0202FF58+0x2\n\ + .word gUnknown_Debug_20301FE\n\ .word gMain\n\ ._378:\n\ ldr r0, ._382\n\ @@ -1347,7 +1350,7 @@ u8 debug_sub_8085564(void) ._383:\n\ .align 2, 0\n\ ._382:\n\ - .word gUnknown_0202FF58+0x2"); + .word gUnknown_Debug_20301FE"); } __attribute__((naked)) @@ -1386,7 +1389,7 @@ u8 debug_sub_808560C(void) ._385:\n\ .align 2, 0\n\ ._384:\n\ - .word gUnknown_0202FF58+0x2\n\ + .word gUnknown_Debug_20301FE\n\ .word gWeather\n\ .word gDebugText_Weather\n\ .word gMenuCallback\n\ diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index b5b13c533..99770f6e3 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -226,6 +226,15 @@ static void sub_81064B8(void); static void sub_81065A8(s16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4); static void sub_81065DC(void); +#if DEBUG +__attribute__((section(".bss"))) u8 unk_debug_bss_1_0 = 0; +__attribute__((section(".bss"))) u8 unk_debug_bss_1_1 = 0; +__attribute__((section(".bss"))) u8 unk_debug_bss_1_2 = 0; +__attribute__((section(".bss"))) u8 unk_debug_bss_1_3 = 0; +__attribute__((section(".bss"))) u8 unk_debug_bss_1_4 = 0; +__attribute__((section(".bss"))) u32 unk_debug_bss_1_8 = 0; +#endif + static const struct UnkStruct1 *const gUnknown_083ED048[]; static const u16 gPalette_83EDE24[]; static const u8 gUnknown_083ECD04[][3]; @@ -252,7 +261,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb) ._2:\n\ .align 2, 0\n\ ._1:\n\ - .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1_1\n\ .word CB2_SlotMachineSetup+1"); } #else @@ -282,7 +291,7 @@ void debug_sub_811609C() ._4:\n\ .align 2, 0\n\ ._3:\n\ - .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1_1\n\ .word CB2_SlotMachineSetup+1"); } #endif @@ -544,7 +553,7 @@ static void SlotMachineSetup_0_1(void) .word gSaveBlock1\n\ .word 0x494\n\ .word gUnknown_083ECCF8\n\ - .word unk_debug_bss_1+0x1"); + .word unk_debug_bss_1_1"); } #else static void SlotMachineSetup_0_1(void) @@ -744,8 +753,8 @@ static bool8 sub_8101E10(struct Task *task) .align 2, 0\n\ ._70:\n\ .word +0x2000000\n\ - .word unk_debug_bss_1+0x1\n\ - .word unk_debug_bss_1+0x4\n\ + .word unk_debug_bss_1_1\n\ + .word unk_debug_bss_1_4\n\ .word 0x270e"); } #else @@ -794,9 +803,9 @@ static bool8 sub_8101E3C(struct Task *task) ._78:\n\ .align 2, 0\n\ ._77:\n\ - .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1_1\n\ .word gMain\n\ - .word unk_debug_bss_1+0x4\n\ + .word unk_debug_bss_1_4\n\ .word +0x2000000\n\ ._75:\n\ mov r0, #0x0\n\ @@ -1101,7 +1110,7 @@ static bool8 sub_8101FA4(struct Task *task) .align 2, 0\n\ ._119:\n\ .word +0x2000000\n\ - .word unk_debug_bss_1+0x1"); + .word unk_debug_bss_1_1"); } #else static bool8 sub_8101FA4(struct Task *task) @@ -1182,9 +1191,9 @@ static bool8 sub_8102034(struct Task *task) ._128:\n\ .align 2, 0\n\ ._127:\n\ - .word unk_debug_bss_1+0x1\n\ - .word unk_debug_bss_1+0x4\n\ - .word unk_debug_bss_1+0x8\n\ + .word unk_debug_bss_1_1\n\ + .word unk_debug_bss_1_4\n\ + .word unk_debug_bss_1_8\n\ .word +0x2000000"); } #else @@ -1235,9 +1244,9 @@ static bool8 sub_8102058(struct Task *task) ._134:\n\ .align 2, 0\n\ ._133:\n\ - .word unk_debug_bss_1+0x1\n\ - .word unk_debug_bss_1+0x4\n\ - .word unk_debug_bss_1+0x8\n\ + .word unk_debug_bss_1_1\n\ + .word unk_debug_bss_1_4\n\ + .word unk_debug_bss_1_8\n\ .word +0x2000000\n\ ._130:\n\ ldr r0, ._136\n\ @@ -1322,7 +1331,7 @@ static bool8 sub_8102090(struct Task *task) .align 2, 0\n\ ._146:\n\ .word +0x2000000\n\ - .word unk_debug_bss_1\n\ + .word unk_debug_bss_1_0\n\ ._143:\n\ cmp r0, #0x4\n\ beq ._148 @cond_branch\n\ @@ -1821,7 +1830,7 @@ static bool8 sub_8102424(struct Task *task) ._235:\n\ .align 2, 0\n\ ._234:\n\ - .word unk_debug_bss_1+0x1\n\ + .word unk_debug_bss_1_1\n\ .word gSaveBlock1\n\ .word +0x2000000\n\ .word 0x494"); @@ -1980,9 +1989,9 @@ static void sub_8102484(void) .align 2, 0\n\ ._256:\n\ .word +0x2000000\n\ - .word unk_debug_bss_1+0x1\n\ - .word unk_debug_bss_1+0x2\n\ - .word unk_debug_bss_1+0x3\n\ + .word unk_debug_bss_1_1\n\ + .word unk_debug_bss_1_2\n\ + .word unk_debug_bss_1_3\n\ ._245:\n\ add r5, r4, #0\n\ ldrb r1, [r5, #0x4]\n\ @@ -4047,11 +4056,6 @@ static void sub_8104C5C(void) static void LoadSlotMachineWheelOverlay(void); -#if DEBUG -// should be static -__attribute__((section(".bss"))) u8 unk_debug_bss_1[0xC] = { 0 }; -#endif - static void sub_8104CAC(u8 arg0) { u8 i; @@ -5186,8 +5190,8 @@ void debug_sub_811B1C4() ".__2_:\n" " .align 2, 0\n" ".__1_:\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_0\n" "\n" ); } @@ -5212,8 +5216,8 @@ void debug_sub_811B1EC() ".__4:\n" " .align 2, 0\n" ".__3:\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_0\n" "\n" ); } @@ -5240,8 +5244,8 @@ void debug_sub_811B210() ".__6:\n" " .align 2, 0\n" ".__5:\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_0\n" "\n" ); } @@ -5268,8 +5272,8 @@ void debug_sub_811B238() ".__8:\n" " .align 2, 0\n" ".__7:\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_0\n" "\n" ); } @@ -5296,8 +5300,8 @@ void debug_sub_811B260() ".__10:\n" " .align 2, 0\n" ".__9:\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_0\n" "\n" ); } @@ -5324,8 +5328,8 @@ void debug_sub_811B288() ".__12:\n" " .align 2, 0\n" ".__11:\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_0\n" "\n" ); } @@ -5352,8 +5356,8 @@ void debug_sub_811B2B0() ".__14:\n" " .align 2, 0\n" ".__13:\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_0\n" "\n" ); } @@ -5371,7 +5375,7 @@ void debug_sub_811B2D8() ".__16:\n" " .align 2, 0\n" ".__15:\n" - " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1_3\n" "\n" ); } @@ -5650,7 +5654,7 @@ void debug_sub_811B310() ".__30:\n" " .word Str_841B249\n" " .word +0x2000000\n" - " .word unk_debug_bss_1\n" + " .word unk_debug_bss_1_0\n" ".__27:\n" " cmp r0, #0x4\n" " beq .__32 @cond_branch\n" @@ -5765,10 +5769,10 @@ void debug_sub_811B5D0() ".__52:\n" " .align 2, 0\n" ".__51:\n" - " .word unk_debug_bss_1\n" - " .word unk_debug_bss_1+0x2\n" - " .word unk_debug_bss_1+0x3\n" - " .word unk_debug_bss_1+0x4\n" + " .word unk_debug_bss_1_0\n" + " .word unk_debug_bss_1_2\n" + " .word unk_debug_bss_1_3\n" + " .word unk_debug_bss_1_4\n" " .word +0x2000000\n" "\n" ); @@ -5994,11 +5998,11 @@ void debug_sub_811B654() ".__92:\n" " .align 2, 0\n" ".__91:\n" - " .word unk_debug_bss_1+0x2\n" - " .word unk_debug_bss_1+0x3\n" + " .word unk_debug_bss_1_2\n" + " .word unk_debug_bss_1_3\n" " .word Str_841B254\n" " .word _841B270\n" - " .word unk_debug_bss_1+0x4\n" + " .word unk_debug_bss_1_4\n" ".__66:\n" " bl Menu_ProcessInput\n" " lsl r0, r0, #0x18\n" @@ -6027,7 +6031,7 @@ void debug_sub_811B654() ".__97:\n" " .align 2, 0\n" ".__96:\n" - " .word unk_debug_bss_1+0x2\n" + " .word unk_debug_bss_1_2\n" " .word _841B270\n" ".__68:\n" " ldr r2, .__100\n" @@ -6183,7 +6187,7 @@ void debug_sub_811B894() " .word +0x2000000\n" " .word 0x270f\n" " .word Str_841B2B0\n" - " .word unk_debug_bss_1+0x4\n" + " .word unk_debug_bss_1_4\n" " .word Str_841B2D3\n" ".__117:\n" " lsl r0, r2, #0x10\n" @@ -6373,7 +6377,7 @@ void debug_sub_811B894() " .align 2, 0\n" ".__163:\n" " .word Str_841B2E4\n" - " .word unk_debug_bss_1+0x4\n" + " .word unk_debug_bss_1_4\n" " .word +0x2000000\n" " .word Str_841B2BF\n" "\n" diff --git a/src/pokenav_before.c b/src/pokenav_before.c index f9e2beccb..b292e80c4 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -497,7 +497,7 @@ void sub_80EBDD8() ._65:\n\ .align 2, 0\n\ ._64:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._66\n\ ._66:\n\ .word ._67\n\ @@ -543,7 +543,7 @@ void sub_80EBDD8() ._87:\n\ .align 2, 0\n\ ._86:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6ddc\n\ .word 0x6dae\n\ ._68:\n\ @@ -570,7 +570,7 @@ void sub_80EBDD8() ._92:\n\ .align 2, 0\n\ ._91:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._70:\n\ bl sub_80F2598\n\ ldr r1, ._94\n\ @@ -581,7 +581,7 @@ void sub_80EBDD8() ._95:\n\ .align 2, 0\n\ ._94:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._71:\n\ bl sub_80EEE20\n\ ldr r1, ._99\n\ @@ -607,7 +607,7 @@ void sub_80EBDD8() ._100:\n\ .align 2, 0\n\ ._99:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._73:\n\ mov r0, #0x0\n\ bl sub_80EF248\n\ @@ -630,7 +630,7 @@ void sub_80EBDD8() ._105:\n\ .align 2, 0\n\ ._104:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._75:\n\ mov r0, #0x0\n\ bl sub_80F1B8C\n\ @@ -655,7 +655,7 @@ void sub_80EBDD8() ._109:\n\ .align 2, 0\n\ ._108:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._77:\n\ ldr r0, ._111\n\ bl SetVBlankCallback\n\ @@ -680,7 +680,7 @@ void sub_80EBDD8() ._115:\n\ .align 2, 0\n\ ._114:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._79:\n\ mov r0, #0x0\n\ bl sub_80EED2C\n\ @@ -692,7 +692,7 @@ void sub_80EBDD8() ._118:\n\ .align 2, 0\n\ ._117:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._80:\n\ ldr r0, ._121\n\ ldrb r1, [r0, #0x7]\n\ @@ -732,7 +732,7 @@ void sub_80EBDD8() ._126:\n\ .align 2, 0\n\ ._125:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._83:\n\ bl sub_80F1DF0\n\ ._110:\n\ @@ -748,7 +748,7 @@ void sub_80EBDD8() ._129:\n\ .align 2, 0\n\ ._128:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._84:\n\ bl sub_80F1E50\n\ lsl r0, r0, #0x18\n\ @@ -895,7 +895,7 @@ void sub_80EC00C() ._137:\n\ .align 2, 0\n\ ._136:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._138\n\ ._138:\n\ .word ._139\n\ @@ -945,7 +945,7 @@ void sub_80EC00C() .align 2, 0\n\ ._156:\n\ .word sub_80EBD80+1\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6ddc\n\ .word 0x6dad\n\ .word 0x6dae\n\ @@ -975,7 +975,7 @@ void sub_80EC00C() ._162:\n\ .align 2, 0\n\ ._161:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._142:\n\ mov r0, #0x0\n\ bl sub_80F1B8C\n\ @@ -1002,7 +1002,7 @@ void sub_80EC00C() ._167:\n\ .align 2, 0\n\ ._166:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._144:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -1041,7 +1041,7 @@ void sub_80EC00C() ._175:\n\ .align 2, 0\n\ ._174:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._147:\n\ ldr r0, ._178\n\ ldrb r1, [r0, #0x7]\n\ @@ -1067,7 +1067,7 @@ void sub_80EC00C() ._182:\n\ .align 2, 0\n\ ._181:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._149:\n\ mov r0, #0x0\n\ bl sub_80F2C80\n\ @@ -1092,7 +1092,7 @@ void sub_80EC00C() ._186:\n\ .align 2, 0\n\ ._185:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._151:\n\ bl sub_80F1DF0\n\ ._169:\n\ @@ -1108,7 +1108,7 @@ void sub_80EC00C() ._189:\n\ .align 2, 0\n\ ._188:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._152:\n\ bl sub_80F1E50\n\ lsl r0, r0, #0x18\n\ @@ -1139,7 +1139,7 @@ void sub_80EC00C() ._193:\n\ .align 2, 0\n\ ._192:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6dad\n\ .word sub_80EC268+1\n\ .word gLinkOpen\n\ @@ -1367,7 +1367,7 @@ void sub_80EC4A0() ._286:\n\ .align 2, 0\n\ ._285:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._287\n\ ._287:\n\ .word ._288\n\ @@ -1417,7 +1417,7 @@ void sub_80EC4A0() .align 2, 0\n\ ._308:\n\ .word gSaveBlock2\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._290:\n\ bl sub_80EEF34\n\ lsl r0, r0, #0x18\n\ @@ -1444,7 +1444,7 @@ void sub_80EC4A0() ._314:\n\ .align 2, 0\n\ ._313:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._291:\n\ ldr r0, ._318\n\ ldrb r1, [r0, #0x7]\n\ @@ -1472,7 +1472,7 @@ void sub_80EC4A0() ._322:\n\ .align 2, 0\n\ ._321:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._293:\n\ bl sub_80EF814\n\ b ._336\n\ @@ -1496,7 +1496,7 @@ void sub_80EC4A0() ._327:\n\ .align 2, 0\n\ ._326:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._296:\n\ mov r0, #0x4\n\ bl sub_80F2C80\n\ @@ -1514,7 +1514,7 @@ void sub_80EC4A0() ._330:\n\ .align 2, 0\n\ ._329:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._298:\n\ bl sub_80F2DD8\n\ ldr r0, ._332\n\ @@ -1528,7 +1528,7 @@ void sub_80EC4A0() .align 2, 0\n\ ._332:\n\ .word sub_80EBD30+1\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._299:\n\ bl sub_8055870\n\ b ._334\n\ @@ -1576,7 +1576,7 @@ void sub_80EC4A0() .word gLinkOpen\n\ .word 0x60075e0\n\ .word 0x600f800\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._302:\n\ ldr r0, ._341\n\ ldrb r1, [r0, #0x7]\n\ @@ -1709,7 +1709,7 @@ void sub_80EC67C() ._346:\n\ .align 2, 0\n\ ._345:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._347\n\ ._347:\n\ .word ._348\n\ @@ -1754,7 +1754,7 @@ void sub_80EC67C() ._365:\n\ .align 2, 0\n\ ._364:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._359:\n\ mov r0, #0x5\n\ bl PlaySE\n\ @@ -1768,7 +1768,7 @@ void sub_80EC67C() ._368:\n\ .align 2, 0\n\ ._367:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._349:\n\ ldr r1, ._371\n\ add r0, r4, r1\n\ @@ -1812,7 +1812,7 @@ void sub_80EC67C() ._379:\n\ .align 2, 0\n\ ._378:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6e90\n\ ._376:\n\ mov r0, #0xc1\n\ @@ -1836,7 +1836,7 @@ void sub_80EC67C() ._384:\n\ .align 2, 0\n\ ._383:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._352:\n\ mov r2, #0xc2\n\ lsl r2, r2, #0x2\n\ @@ -1911,7 +1911,7 @@ void sub_80EC67C() ._389:\n\ .word gPaletteFade\n\ .word gSaveBlock2\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6e90\n\ .word sub_80EC00C+1\n\ .word gLinkOpen\n\ @@ -2110,7 +2110,7 @@ void sub_80ECA10() ._457:\n\ .align 2, 0\n\ ._456:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._458\n\ ._458:\n\ .word ._459\n\ @@ -2160,7 +2160,7 @@ void sub_80ECA10() .align 2, 0\n\ ._476:\n\ .word sub_80EBD80+1\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6df0\n\ .word 0x6dad\n\ .word 0x6dae\n\ @@ -2190,7 +2190,7 @@ void sub_80ECA10() ._482:\n\ .align 2, 0\n\ ._481:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._462:\n\ mov r0, #0x1\n\ bl sub_80F1B8C\n\ @@ -2217,7 +2217,7 @@ void sub_80ECA10() ._487:\n\ .align 2, 0\n\ ._486:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._464:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -2256,7 +2256,7 @@ void sub_80ECA10() ._495:\n\ .align 2, 0\n\ ._494:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._467:\n\ bl sub_80F2598\n\ b ._496\n\ @@ -2299,7 +2299,7 @@ void sub_80ECA10() ._504:\n\ .align 2, 0\n\ ._503:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._471:\n\ bl sub_80F1DF0\n\ ._496:\n\ @@ -2315,7 +2315,7 @@ void sub_80ECA10() ._507:\n\ .align 2, 0\n\ ._506:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._472:\n\ bl sub_80F1E50\n\ lsl r0, r0, #0x18\n\ @@ -2346,7 +2346,7 @@ void sub_80ECA10() ._511:\n\ .align 2, 0\n\ ._510:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6dad\n\ .word sub_80EC86C+1\n\ .word gLinkOpen\n\ @@ -2506,7 +2506,7 @@ void sub_80ECD80() ._565:\n\ .align 2, 0\n\ ._564:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._566\n\ ._566:\n\ .word ._567\n\ @@ -2587,7 +2587,7 @@ void sub_80ECD80() ._601:\n\ .align 2, 0\n\ ._600:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._571:\n\ mov r0, #0x1\n\ bl sub_80F2D6C\n\ @@ -2599,7 +2599,7 @@ void sub_80ECD80() ._604:\n\ .align 2, 0\n\ ._603:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._572:\n\ mov r0, #0x5\n\ bl sub_80F2D6C\n\ @@ -2648,7 +2648,7 @@ void sub_80ECD80() ._613:\n\ .align 2, 0\n\ ._612:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._576:\n\ mov r0, #0x2\n\ bl sub_80F1B8C\n\ @@ -2675,7 +2675,7 @@ void sub_80ECD80() ._618:\n\ .align 2, 0\n\ ._617:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._578:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -2719,7 +2719,7 @@ void sub_80ECD80() ._628:\n\ .align 2, 0\n\ ._627:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._582:\n\ ldr r0, ._631\n\ ldrb r1, [r0, #0x7]\n\ @@ -2766,7 +2766,7 @@ void sub_80ECD80() ._636:\n\ .align 2, 0\n\ ._635:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x306\n\ ._585:\n\ mov r0, #0x5\n\ @@ -2798,7 +2798,7 @@ void sub_80ECD80() ._640:\n\ .align 2, 0\n\ ._639:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._587:\n\ bl sub_80F1E50\n\ lsl r0, r0, #0x18\n\ @@ -2829,7 +2829,7 @@ void sub_80ECD80() ._644:\n\ .align 2, 0\n\ ._643:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6dad\n\ .word sub_80ECC08+1\n\ .word gLinkOpen\n\ @@ -2970,7 +2970,7 @@ void sub_80ED01C() ._648:\n\ .align 2, 0\n\ ._647:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._649\n\ ._649:\n\ .word ._650\n\ @@ -3007,7 +3007,7 @@ void sub_80ED01C() ._672:\n\ .align 2, 0\n\ ._671:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._651:\n\ bl sub_80F1F10\n\ lsl r0, r0, #0x18\n\ @@ -3025,7 +3025,7 @@ void sub_80ED01C() ._677:\n\ .align 2, 0\n\ ._676:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._652:\n\ bl sub_80EEF34\n\ lsl r0, r0, #0x18\n\ @@ -3052,7 +3052,7 @@ void sub_80ED01C() ._682:\n\ .align 2, 0\n\ ._681:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._653:\n\ ldr r0, ._686\n\ ldrb r1, [r0, #0x7]\n\ @@ -3075,7 +3075,7 @@ void sub_80ED01C() .align 2, 0\n\ ._686:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._654:\n\ bl sub_80F2620\n\ ldr r1, ._689\n\ @@ -3086,7 +3086,7 @@ void sub_80ED01C() ._690:\n\ .align 2, 0\n\ ._689:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._655:\n\ bl sub_80F4D44\n\ ldr r1, ._693\n\ @@ -3112,7 +3112,7 @@ void sub_80ED01C() ._694:\n\ .align 2, 0\n\ ._693:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._691:\n\ ldr r1, ._696\n\ mov r0, #0xc1\n\ @@ -3122,7 +3122,7 @@ void sub_80ED01C() ._697:\n\ .align 2, 0\n\ ._696:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._657:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -3140,7 +3140,7 @@ void sub_80ED01C() ._702:\n\ .align 2, 0\n\ ._701:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._658:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -3155,7 +3155,7 @@ void sub_80ED01C() ._707:\n\ .align 2, 0\n\ ._706:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._659:\n\ mov r0, #0x0\n\ bl sub_80F0264\n\ @@ -3181,7 +3181,7 @@ void sub_80ED01C() ._712:\n\ .align 2, 0\n\ ._711:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._661:\n\ mov r0, #0x0\n\ bl sub_80F3008\n\ @@ -3193,7 +3193,7 @@ void sub_80ED01C() ._715:\n\ .align 2, 0\n\ ._714:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._662:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -3208,7 +3208,7 @@ void sub_80ED01C() ._720:\n\ .align 2, 0\n\ ._719:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._663:\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ @@ -3242,7 +3242,7 @@ void sub_80ED01C() ._726:\n\ .align 2, 0\n\ ._725:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._665:\n\ ldr r0, ._729\n\ ldrb r1, [r0, #0x7]\n\ @@ -3299,7 +3299,7 @@ void sub_80ED01C() ._734:\n\ .align 2, 0\n\ ._733:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x306\n\ ._668:\n\ ldr r4, ._737\n\ @@ -3347,7 +3347,7 @@ void sub_80ED01C() ._738:\n\ .align 2, 0\n\ ._737:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6dfc\n\ .word sub_80ED31C+1\n\ .word gLinkOpen\n\ @@ -3487,7 +3487,7 @@ void sub_80ED31C() ._744:\n\ .align 2, 0\n\ ._743:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._740:\n\ cmp r0, #0x2\n\ beq ._745 @cond_branch\n\ @@ -3655,7 +3655,7 @@ void sub_80ED3D0() ._768:\n\ .align 2, 0\n\ ._767:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._769\n\ ._769:\n\ .word ._770\n\ @@ -3678,7 +3678,7 @@ void sub_80ED3D0() ._781:\n\ .align 2, 0\n\ ._780:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._771:\n\ bl sub_80EED0C\n\ bl sub_80F6134\n\ @@ -3690,7 +3690,7 @@ void sub_80ED3D0() ._784:\n\ .align 2, 0\n\ ._783:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._772:\n\ mov r0, #0x0\n\ bl sub_80EEFBC\n\ @@ -3702,7 +3702,7 @@ void sub_80ED3D0() ._787:\n\ .align 2, 0\n\ ._786:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._773:\n\ mov r0, #0x0\n\ bl sub_80F0264\n\ @@ -3726,7 +3726,7 @@ void sub_80ED3D0() ._791:\n\ .align 2, 0\n\ ._790:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._775:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -3739,7 +3739,7 @@ void sub_80ED3D0() ._795:\n\ .align 2, 0\n\ ._794:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._776:\n\ mov r0, #0x0\n\ bl sub_80F3008\n\ @@ -3768,7 +3768,7 @@ void sub_80ED3D0() ._798:\n\ .align 2, 0\n\ ._797:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word sub_80EBD18+1\n\ ._777:\n\ mov r0, #0x4\n\ @@ -3793,7 +3793,7 @@ void sub_80ED3D0() ._802:\n\ .align 2, 0\n\ ._801:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word gLinkOpen\n\ .word 0x6007de0\n\ .word 0x600f800\n\ @@ -3890,7 +3890,7 @@ void sub_80ED4D8() ._809:\n\ .align 2, 0\n\ ._808:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._810\n\ ._810:\n\ .word ._811\n\ @@ -3936,7 +3936,7 @@ void sub_80ED4D8() .align 2, 0\n\ ._824:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._813:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -3949,7 +3949,7 @@ void sub_80ED4D8() ._829:\n\ .align 2, 0\n\ ._828:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._814:\n\ bl sub_80F4CF0\n\ ldr r1, ._831\n\ @@ -3960,7 +3960,7 @@ void sub_80ED4D8() ._832:\n\ .align 2, 0\n\ ._831:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._815:\n\ bl sub_80EFF34\n\ ldr r1, ._835\n\ @@ -3983,7 +3983,7 @@ void sub_80ED4D8() ._836:\n\ .align 2, 0\n\ ._835:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._817:\n\ bl sub_80F35B4\n\ mov r0, #0x2\n\ @@ -4014,7 +4014,7 @@ void sub_80ED4D8() ._839:\n\ .align 2, 0\n\ ._838:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word sub_80EBD4C+1\n\ ._818:\n\ mov r0, #0x2\n\ @@ -4039,7 +4039,7 @@ void sub_80ED4D8() ._843:\n\ .align 2, 0\n\ ._842:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word gLinkOpen\n\ .word 0x6007de0\n\ .word 0x600f000\n\ @@ -4141,7 +4141,7 @@ void sub_80ED620() ._850:\n\ .align 2, 0\n\ ._849:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._851\n\ ._851:\n\ .word ._852\n\ @@ -4173,7 +4173,7 @@ void sub_80ED620() ._871:\n\ .align 2, 0\n\ ._870:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._853:\n\ bl sub_80F1F10\n\ lsl r0, r0, #0x18\n\ @@ -4210,7 +4210,7 @@ void sub_80ED620() ._879:\n\ .align 2, 0\n\ ._878:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._855:\n\ ldr r0, ._883\n\ ldrb r1, [r0, #0x7]\n\ @@ -4241,7 +4241,7 @@ void sub_80ED620() .align 2, 0\n\ ._883:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x76aa\n\ ._856:\n\ bl sub_80F2620\n\ @@ -4275,7 +4275,7 @@ void sub_80ED620() ._891:\n\ .align 2, 0\n\ ._890:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._860:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -4288,7 +4288,7 @@ void sub_80ED620() ._895:\n\ .align 2, 0\n\ ._894:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._861:\n\ bl sub_8055870\n\ b ._896\n\ @@ -4315,7 +4315,7 @@ void sub_80ED620() ._899:\n\ .align 2, 0\n\ ._898:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word sub_80EBD4C+1\n\ ._863:\n\ mov r0, #0x2\n\ @@ -4328,7 +4328,7 @@ void sub_80ED620() ._902:\n\ .align 2, 0\n\ ._901:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._864:\n\ ldr r0, ._905\n\ ldrb r1, [r0, #0x7]\n\ @@ -4375,7 +4375,7 @@ void sub_80ED620() ._910:\n\ .align 2, 0\n\ ._909:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._867:\n\ mov r0, #0x6\n\ bl sub_80F2C80\n\ @@ -4411,7 +4411,7 @@ void sub_80ED620() ._914:\n\ .align 2, 0\n\ ._913:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word sub_80ED858+1\n\ .word gLinkOpen\n\ .word 0x6007de0\n\ @@ -4702,7 +4702,7 @@ void sub_80ED858() ._918:\n\ .align 2, 0\n\ ._917:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._919\n\ ._919:\n\ .word ._920\n\ @@ -4730,7 +4730,7 @@ void sub_80ED858() ._934:\n\ .align 2, 0\n\ ._933:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._921:\n\ bl sub_80F5B50\n\ lsl r0, r0, #0x18\n\ @@ -4748,7 +4748,7 @@ void sub_80ED858() ._939:\n\ .align 2, 0\n\ ._938:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._922:\n\ mov r0, #0x1\n\ bl sub_80F0174\n\ @@ -4762,7 +4762,7 @@ void sub_80ED858() ._942:\n\ .align 2, 0\n\ ._941:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._923:\n\ bl sub_80F4FB4\n\ lsl r0, r0, #0x18\n\ @@ -4879,7 +4879,7 @@ void sub_80ED858() ._963:\n\ .align 2, 0\n\ ._962:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._960:\n\ mov r0, #0x1\n\ and r0, r0, r2\n\ @@ -4958,7 +4958,7 @@ void sub_80ED858() ._981:\n\ .align 2, 0\n\ ._980:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._926:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -4971,7 +4971,7 @@ void sub_80ED858() ._985:\n\ .align 2, 0\n\ ._984:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._927:\n\ mov r0, #0x3\n\ bl sub_80EEFBC\n\ @@ -4986,7 +4986,7 @@ void sub_80ED858() ._988:\n\ .align 2, 0\n\ ._987:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._928:\n\ bl sub_80F7500\n\ lsl r0, r0, #0x18\n\ @@ -5007,7 +5007,7 @@ void sub_80ED858() ._992:\n\ .align 2, 0\n\ ._991:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._929:\n\ bl sub_80F5038\n\ lsl r0, r0, #0x18\n\ @@ -5037,7 +5037,7 @@ void sub_80ED858() ._996:\n\ .align 2, 0\n\ ._995:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._931:\n\ ldr r0, ._1000\n\ ldrb r1, [r0, #0x7]\n\ @@ -5065,7 +5065,7 @@ void sub_80ED858() .align 2, 0\n\ ._1000:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x76aa\n\ .word sub_80ECA10+1\n\ ._998:\n\ @@ -5501,7 +5501,7 @@ void sub_80EDB88() ._1008:\n\ .align 2, 0\n\ ._1007:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._1009\n\ ._1009:\n\ .word ._1010\n\ @@ -5534,7 +5534,7 @@ void sub_80EDB88() ._1030:\n\ .align 2, 0\n\ ._1029:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1011:\n\ bl sub_80F1F10\n\ lsl r0, r0, #0x18\n\ @@ -5552,7 +5552,7 @@ void sub_80EDB88() ._1035:\n\ .align 2, 0\n\ ._1034:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1012:\n\ bl sub_80EEF34\n\ lsl r0, r0, #0x18\n\ @@ -5576,7 +5576,7 @@ void sub_80EDB88() ._1040:\n\ .align 2, 0\n\ ._1039:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1013:\n\ ldr r0, ._1044\n\ ldrb r1, [r0, #0x7]\n\ @@ -5599,7 +5599,7 @@ void sub_80EDB88() .align 2, 0\n\ ._1044:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1014:\n\ bl sub_80F2620\n\ ldr r1, ._1047\n\ @@ -5610,7 +5610,7 @@ void sub_80EDB88() ._1048:\n\ .align 2, 0\n\ ._1047:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1015:\n\ bl sub_80F638C\n\ ldr r1, ._1051\n\ @@ -5636,7 +5636,7 @@ void sub_80EDB88() ._1052:\n\ .align 2, 0\n\ ._1051:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1049:\n\ ldr r1, ._1054\n\ mov r0, #0xc1\n\ @@ -5646,7 +5646,7 @@ void sub_80EDB88() ._1055:\n\ .align 2, 0\n\ ._1054:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1017:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -5664,7 +5664,7 @@ void sub_80EDB88() ._1060:\n\ .align 2, 0\n\ ._1059:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1018:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -5679,7 +5679,7 @@ void sub_80EDB88() ._1065:\n\ .align 2, 0\n\ ._1064:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1019:\n\ mov r0, #0x1\n\ bl sub_80F0264\n\ @@ -5703,7 +5703,7 @@ void sub_80EDB88() ._1069:\n\ .align 2, 0\n\ ._1068:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1021:\n\ mov r0, #0x2\n\ bl sub_80F2C80\n\ @@ -5728,7 +5728,7 @@ void sub_80EDB88() ._1073:\n\ .align 2, 0\n\ ._1072:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1023:\n\ mov r0, #0x1\n\ bl sub_80F3008\n\ @@ -5740,7 +5740,7 @@ void sub_80EDB88() ._1076:\n\ .align 2, 0\n\ ._1075:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1024:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -5753,7 +5753,7 @@ void sub_80EDB88() ._1080:\n\ .align 2, 0\n\ ._1079:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1025:\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ @@ -5804,7 +5804,7 @@ void sub_80EDB88() ._1087:\n\ .align 2, 0\n\ ._1086:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word gLinkOpen\n\ .word 0x6007de0\n\ .word 0x600f800\n\ @@ -5943,7 +5943,7 @@ void sub_80EDDBC() ._1096:\n\ .align 2, 0\n\ ._1095:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1092:\n\ cmp r0, #0x2\n\ beq ._1097 @cond_branch\n\ @@ -6136,7 +6136,7 @@ void sub_80EDEE4() ._1135:\n\ .align 2, 0\n\ ._1134:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._1136\n\ ._1136:\n\ .word ._1137\n\ @@ -6184,7 +6184,7 @@ void sub_80EDEE4() .align 2, 0\n\ ._1152:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1139:\n\ bl sub_80F66E0\n\ bl sub_80EEE08\n\ @@ -6196,7 +6196,7 @@ void sub_80EDEE4() ._1156:\n\ .align 2, 0\n\ ._1155:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1140:\n\ bl sub_80F1080\n\ lsl r0, r0, #0x18\n\ @@ -6210,7 +6210,7 @@ void sub_80EDEE4() ._1160:\n\ .align 2, 0\n\ ._1159:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1141:\n\ mov r0, #0x5\n\ bl sub_80EEFBC\n\ @@ -6235,7 +6235,7 @@ void sub_80EDEE4() ._1164:\n\ .align 2, 0\n\ ._1163:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1143:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -6248,7 +6248,7 @@ void sub_80EDEE4() ._1168:\n\ .align 2, 0\n\ ._1167:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1144:\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ @@ -6291,7 +6291,7 @@ void sub_80EDEE4() ._1175:\n\ .align 2, 0\n\ ._1174:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word gLinkOpen\n\ .word 0x6007de0\n\ .word 0x600f000\n\ @@ -6417,7 +6417,7 @@ void sub_80EE06C() ._1186:\n\ .align 2, 0\n\ ._1185:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._1187\n\ ._1187:\n\ .word ._1188\n\ @@ -6439,7 +6439,7 @@ void sub_80EE06C() ._1199:\n\ .align 2, 0\n\ ._1198:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1189:\n\ ldr r2, ._1203\n\ ldrh r1, [r2, #0x30]\n\ @@ -6515,7 +6515,7 @@ void sub_80EE06C() ._1213:\n\ .align 2, 0\n\ ._1212:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1210:\n\ mov r0, #0x2\n\ and r0, r0, r2\n\ @@ -6547,7 +6547,7 @@ void sub_80EE06C() ._1223:\n\ .align 2, 0\n\ ._1222:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1191:\n\ bl sub_8055870\n\ add r1, r0, #0\n\ @@ -6562,7 +6562,7 @@ void sub_80EE06C() ._1227:\n\ .align 2, 0\n\ ._1226:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1192:\n\ bl sub_80F3B00\n\ ldr r1, ._1229\n\ @@ -6577,7 +6577,7 @@ void sub_80EE06C() ._1230:\n\ .align 2, 0\n\ ._1229:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1193:\n\ bl sub_80F3B58\n\ lsl r0, r0, #0x18\n\ @@ -6596,7 +6596,7 @@ void sub_80EE06C() ._1234:\n\ .align 2, 0\n\ ._1233:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1194:\n\ bl sub_80F68E8\n\ lsl r0, r0, #0x18\n\ @@ -6618,7 +6618,7 @@ void sub_80EE06C() ._1239:\n\ .align 2, 0\n\ ._1238:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1236:\n\ ldr r0, ._1242\n\ ldrh r1, [r0, #0x2e]\n\ @@ -6640,7 +6640,7 @@ void sub_80EE06C() .align 2, 0\n\ ._1242:\n\ .word gMain\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1195:\n\ bl sub_80F3BD4\n\ lsl r0, r0, #0x18\n\ @@ -6657,7 +6657,7 @@ void sub_80EE06C() ._1247:\n\ .align 2, 0\n\ ._1246:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1196:\n\ bl sub_80F3BD4\n\ lsl r0, r0, #0x18\n\ @@ -6694,7 +6694,7 @@ void sub_80EE06C() ._1251:\n\ .align 2, 0\n\ ._1250:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word gLinkOpen\n\ .word gLink\n\ .word 0xfbd"); @@ -6812,7 +6812,7 @@ void sub_80EE294() ._1255:\n\ .align 2, 0\n\ ._1254:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._1256\n\ ._1256:\n\ .word ._1257\n\ @@ -6858,7 +6858,7 @@ void sub_80EE294() .align 2, 0\n\ ._1270:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1259:\n\ bl sub_80F6134\n\ mov r0, #0x1\n\ @@ -6883,7 +6883,7 @@ void sub_80EE294() ._1275:\n\ .align 2, 0\n\ ._1274:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1261:\n\ mov r0, #0x4\n\ bl sub_80EEFBC\n\ @@ -6900,7 +6900,7 @@ void sub_80EE294() .align 2, 0\n\ ._1277:\n\ .word sub_80EBD18+1\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1262:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -6913,7 +6913,7 @@ void sub_80EE294() ._1282:\n\ .align 2, 0\n\ ._1281:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1263:\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ @@ -6958,7 +6958,7 @@ void sub_80EE294() ._1287:\n\ .align 2, 0\n\ ._1286:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word gLinkOpen\n\ .word 0x6007de0\n\ .word 0x600f800\n\ @@ -7059,7 +7059,7 @@ void sub_80EE3D8() ._1294:\n\ .align 2, 0\n\ ._1293:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word ._1295\n\ ._1295:\n\ .word ._1296\n\ @@ -7088,7 +7088,7 @@ void sub_80EE3D8() ._1312:\n\ .align 2, 0\n\ ._1311:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1297:\n\ bl sub_80F1F10\n\ lsl r0, r0, #0x18\n\ @@ -7106,7 +7106,7 @@ void sub_80EE3D8() ._1317:\n\ .align 2, 0\n\ ._1316:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1298:\n\ bl sub_80EEF34\n\ lsl r0, r0, #0x18\n\ @@ -7130,7 +7130,7 @@ void sub_80EE3D8() ._1322:\n\ .align 2, 0\n\ ._1321:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1299:\n\ ldr r0, ._1326\n\ ldrb r1, [r0, #0x7]\n\ @@ -7154,7 +7154,7 @@ void sub_80EE3D8() .align 2, 0\n\ ._1326:\n\ .word gPaletteFade\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1300:\n\ bl sub_80F2620\n\ ldr r1, ._1329\n\ @@ -7165,7 +7165,7 @@ void sub_80EE3D8() ._1330:\n\ .align 2, 0\n\ ._1329:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1301:\n\ mov r0, #0x2\n\ bl sub_80F0264\n\ @@ -7191,7 +7191,7 @@ void sub_80EE3D8() ._1335:\n\ .align 2, 0\n\ ._1334:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1303:\n\ mov r0, #0x3\n\ bl sub_80F2C80\n\ @@ -7216,7 +7216,7 @@ void sub_80EE3D8() ._1339:\n\ .align 2, 0\n\ ._1338:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1305:\n\ mov r0, #0x2\n\ bl sub_80F3008\n\ @@ -7228,7 +7228,7 @@ void sub_80EE3D8() ._1342:\n\ .align 2, 0\n\ ._1341:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1306:\n\ bl sub_8055870\n\ cmp r0, #0\n\ @@ -7241,7 +7241,7 @@ void sub_80EE3D8() ._1346:\n\ .align 2, 0\n\ ._1345:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1307:\n\ bl sub_80F6F10\n\ ldr r4, ._1348\n\ @@ -7270,7 +7270,7 @@ void sub_80EE3D8() ._1349:\n\ .align 2, 0\n\ ._1348:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word sub_80EBD68+1\n\ ._1308:\n\ mov r0, #0x5\n\ @@ -7295,7 +7295,7 @@ void sub_80EE3D8() ._1353:\n\ .align 2, 0\n\ ._1352:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word gLinkOpen\n\ .word 0x6007de0\n\ .word 0x600f800\n\ @@ -7419,7 +7419,7 @@ void sub_80EE58C() ._1362:\n\ .align 2, 0\n\ ._1361:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ ._1358:\n\ cmp r0, #0x2\n\ beq ._1363 @cond_branch\n\ @@ -8045,7 +8045,7 @@ bool8 sub_80EEC10() .align 2, 0\n\ ._1563:\n\ .word gMain\n\ - .word +0x2006dad\n\ + .word gSharedMem+0x6dad\n\ ._1559:\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -8077,7 +8077,7 @@ bool8 sub_80EEC10() ._1570:\n\ .align 2, 0\n\ ._1569:\n\ - .word +0x2006dad\n\ + .word gSharedMem+0x6dad\n\ ._1565:\n\ ldr r0, ._1572\n\ ldrb r0, [r0]\n\ @@ -8166,7 +8166,7 @@ bool8 sub_80EEC90() .align 2, 0\n\ ._1577:\n\ .word gMain\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6dad\n\ .word 0x6dae\n\ ._1574:\n\ @@ -8196,7 +8196,7 @@ bool8 sub_80EEC90() ._1583:\n\ .align 2, 0\n\ ._1582:\n\ - .word +0x2000000\n\ + .word gSharedMem\n\ .word 0x6dad\n\ ._1579:\n\ ldr r0, ._1585\n\ diff --git a/sym_common.txt b/sym_common.txt index 366036c9c..f079673f0 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -78,7 +78,7 @@ SYMBOL(gLinkCallback, 4) SYMBOL(gSavedLinkPlayers, 112) SYMBOL(gShouldAdvanceLinkState, 4) SYMBOL(gLinkTestBlockChecksums, 8) -. += 0x4; +SYMBOL(gUnknown_Debug_30030E0, 4) SYMBOL(gBlockRequestType, 4) . += 0x8; SYMBOL(gLastSendQueueCount, 4) diff --git a/sym_ewram.txt b/sym_ewram.txt index 38df657f3..8e2d8a230 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -33,29 +33,41 @@ gUnknown_02023A14 = .; /* 2023A14 */ . += 0x4C; #if DEBUG + gUnknown_02023A14_4C = .; . += 0x4; -gUnknown_02023A14_50 = .; - . += 0x290; -#endif -gBattleBufferA = .; /* 2023A60 */ +gUnknown_02023A14_50 = .; . += 0x2; -gUnknown_02023A62 = .; /* 2023A62 */ - . += 0x1; - -gUnknown_02023A63 = .; /* 2023A63 */ - . += 0x1; +gUnknown_Debug_2023A76 = .; + . += 0x4; -gUnknown_02023A64 = .; /* 2023A64 */ - . += 0x7FC; +gUnknown_Debug_2023A7A = .; + . += 0x42; -gBattleBufferB = .; /* 2024260 */ +gUnknown_Debug_2023ABC = .; . += 0x4; -gUnknown_02024264 = .; /* 2024264 */ - . += 0x7FC; +gUnknown_Debug_2023AC0 = .; + . += 0x42; + +gUnknown_Debug_2023B02 = .; + . += 0x30; + +gUnknown_Debug_2023B32 = .; + . += 0x30; + +gUnknown_Debug_2023B62 = .; + . += 0x1A2; + +#endif + +gBattleBufferA = .; /* 2023A60 */ + . += 0x800; + +gBattleBufferB = .; /* 2024260 */ + . += 0x800; gActiveBank = .; /* 2024A60 */ . += 0x4; -- cgit v1.2.3 From f2885be7da921ef0a5058b2b36d4473481db1022 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 17:03:59 -0600 Subject: remove some unnecessary DEBUG conditionals in symbol files --- src/scene/berry_blender.c | 2 +- sym_bss.txt | 10 ---------- sym_ewram.txt | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 5b013e8de..0799531cd 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -3763,7 +3763,7 @@ loc_805654C:\n\ .syntax divided\n"); } #else -static bool8 Blender_PrintBlendingResults(void) +bool8 Blender_PrintBlendingResults(void) { u16 i; diff --git a/sym_bss.txt b/sym_bss.txt index 947adcce8..7f0aa80f6 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -15,21 +15,15 @@ . = ALIGN(4); src/engine/text_window.o(.bss); . = ALIGN(4); src/engine/script.o(.bss); . = ALIGN(4); src/field/start_menu.o(.bss); -#if DEBUG . = ALIGN(4); src/debug/start_menu_debug.o(.bss); -#endif . = ALIGN(4); src/engine/menu.o(.bss); . = ALIGN(4); src/engine/tileset_anim.o(.bss); . = ALIGN(4); src/engine/sound.o(.bss); . = ALIGN(4); src/field/field_weather.o(.bss); -#if DEBUG . = ALIGN(4); src/debug/tomomichi_debug_menu.o(.bss); . = ALIGN(4); src/debug/nohara_debug_menu.o(.bss); -#endif . = ALIGN(4); src/field/field_effect.o(.bss); -#if DEBUG . = ALIGN(4); src/engine/trainer_card.o(.bss); -#endif . = ALIGN(4); src/field/item_menu.o(.bss); #if DEBUG unk_debug_bss_3 = .; @@ -44,17 +38,13 @@ unk_debug_bss_3 = .; . = ALIGN(4); src/field/mauville_man.o(.bss); . = ALIGN(4); src/pokemon/mail.o(.bss); . = ALIGN(4); src/field/menu_helpers.o(.bss); -#if DEBUG . = ALIGN(4); src/field/slot_machine.o(.bss); -#endif . = ALIGN(4); src/scene/contest_painting.o(.bss); . = ALIGN(4); src/field/pokeblock.o(.bss); . = ALIGN(4); src/field/field_specials.o(.bss); . = ALIGN(4); src/pokemon/learn_move.o(.bss); . = ALIGN(4); src/field/player_pc.o(.bss); -#if DEBUG . = ALIGN(4); src/debug/nakamura_debug_menu.o(.bss); -#endif . = ALIGN(4); src/libs/m4a_1.o(.bss); . = ALIGN(4); src/libs/agb_flash.o(.bss); . = ALIGN(4); src/libs/siirtc.o(.bss); diff --git a/sym_ewram.txt b/sym_ewram.txt index 8e2d8a230..5375968d4 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -423,9 +423,7 @@ gUnknown_020384EC = .; /* 20384EC */ . = ALIGN(4); src/contest.o(ewram_data); . = ALIGN(4); src/field/shop.o(ewram_data); . = ALIGN(4); src/field/fldeff_escalator.o(ewram_data); -#if DEBUG . = ALIGN(4); src/debug/watanabe_debug_menu.o(ewram_data); -#endif . = ALIGN(4); src/field/money.o(ewram_data); . = ALIGN(4); src/engine/record_mixing.o(ewram_data); . = ALIGN(4); src/debug/sound_check_menu.o(ewram_data); @@ -476,9 +474,7 @@ gUnknown_02039268 = .; /* 2039268 */ gUnknown_0203926A = .; /* 203926A */ . += 0x2; -#if DEBUG . = ALIGN(4); src/roulette.o(ewram_data); -#endif . = ALIGN(4); src/battle/battle_message.o(ewram_data); . = ALIGN(4); src/field/choose_party.o(ewram_data); . = ALIGN(4); src/scene/cable_car.o(ewram_data); @@ -495,9 +491,7 @@ gUnknown_0203926A = .; /* 203926A */ . = ALIGN(4); src/engine/mystery_event_menu.o(ewram_data); . = ALIGN(4); src/engine/save_failed_screen.o(ewram_data); . = ALIGN(4); src/pokemon/pokeblock_feed.o(ewram_data); -#if DEBUG . = ALIGN(4); src/debug/nakamura_debug_menu.o(ewram_data); -#endif . = ALIGN(4); src/scene/intro_credits_graphics.o(ewram_data); /* ??? */ -- cgit v1.2.3 From 329d9aa856caf39147da1999729ff21b3f51ebef Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 17:54:29 -0600 Subject: dump all remaining baseroms --- data/btl_attrs.s | 48 ++++++++++++++++++------ data/debug_menu_3.s | 97 ++++++++++++++++++++++++++++++++++++++++--------- data/start_menu_debug.s | 18 +++++++-- 3 files changed, 129 insertions(+), 34 deletions(-) diff --git a/data/btl_attrs.s b/data/btl_attrs.s index 8d6e643c8..5955c487d 100644 --- a/data/btl_attrs.s +++ b/data/btl_attrs.s @@ -206,31 +206,46 @@ gSpriteTemplate_81F96D0:: @ 81F96D0 .if DEBUG UnkDebug0:: @ 0x821F3B8 - .incbin "baserom_de_debug.gba", 0x21F3B8, 108 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_Debug_821F424:: - .incbin "baserom_de_debug.gba", 0x21F424, 320 + .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x9b, 0x01, 0x01, 0x00, 0x12, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x64, 0x00, 0x01, 0x00, 0x18, 0x00, 0x0e, 0x00, 0x02, 0x00, 0x5c, 0x01, 0x00, 0x00, 0x2e, 0x00 + .byte 0x1a, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x30, 0x00, 0x1c, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x34, 0x00, 0x01, 0x00, 0x04, 0x00, 0x9b, 0x01, 0x00, 0x00, 0x44, 0x00, 0x0a, 0x00 + .byte 0x04, 0x00, 0x64, 0x00, 0x01, 0x00, 0x4a, 0x00, 0x0e, 0x00, 0x04, 0x00, 0x5c, 0x01, 0x00, 0x00, 0x60, 0x00, 0x1a, 0x00, 0x04, 0x00, 0x05, 0x00, 0x00, 0x00, 0x62, 0x00, 0x1c, 0x00, 0x04, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x66, 0x00, 0x01, 0x00, 0x06, 0x00, 0x9b, 0x01, 0x00, 0x00, 0x76, 0x00, 0x0a, 0x00, 0x06, 0x00, 0x64, 0x00, 0x01, 0x00, 0x7c, 0x00, 0x0e, 0x00, 0x06, 0x00, 0x5c, 0x01 + .byte 0x00, 0x00, 0x92, 0x00, 0x1a, 0x00, 0x06, 0x00, 0x05, 0x00, 0x00, 0x00, 0x94, 0x00, 0x1c, 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x98, 0x00, 0x01, 0x00, 0x08, 0x00, 0x9b, 0x01, 0x00, 0x00 + .byte 0xa8, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x64, 0x00, 0x01, 0x00, 0xae, 0x00, 0x0e, 0x00, 0x08, 0x00, 0x5c, 0x01, 0x00, 0x00, 0xc4, 0x00, 0x1a, 0x00, 0x08, 0x00, 0x05, 0x00, 0x00, 0x00, 0xc6, 0x00 + .byte 0x1c, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x9b, 0x01, 0x00, 0x00, 0xda, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x64, 0x00, 0x01, 0x00, 0xe0, 0x00, 0x0e, 0x00 + .byte 0x0a, 0x00, 0x5c, 0x01, 0x00, 0x00, 0xf6, 0x00, 0x1a, 0x00, 0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x1c, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x01, 0x00, 0x0c, 0x00 + .byte 0x9b, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x0a, 0x00, 0x0c, 0x00, 0x64, 0x00, 0x01, 0x00, 0x12, 0x01, 0x0e, 0x00, 0x0c, 0x00, 0x5c, 0x01, 0x00, 0x00, 0x28, 0x01, 0x1a, 0x00, 0x0c, 0x00, 0x05, 0x00 + .byte 0x00, 0x00, 0x2a, 0x01, 0x1c, 0x00, 0x0c, 0x00, 0x02, 0x00, 0x00, 0x00, 0x2e, 0x01, 0x06, 0x00, 0x12, 0x00, 0x09, 0x00, 0x01, 0x00, 0x34, 0x01, 0x1a, 0x00, 0x12, 0x00, 0x09, 0x00, 0x01, 0x00 gUnknown_Debug_821F564:: - .incbin "baserom_de_debug.gba", 0x21F564, 2 + .byte 0x36, 0x01 gUnknown_Debug_821F566:: - .incbin "baserom_de_debug.gba", 0x21F566, 2 + .byte 0x01, 0x00 gUnknown_Debug_821F568:: - .incbin "baserom_de_debug.gba", 0x21F568, 4 + .byte 0x0e, 0x00, 0x62, 0x01 gUnknown_Debug_821F56C:: - .incbin "baserom_de_debug.gba", 0x21F56C, 32 + .byte 0x01, 0x00, 0x4a, 0x01, 0x0c, 0x00, 0x0e, 0x00, 0x62, 0x01, 0x00, 0x00, 0x5e, 0x01, 0x01, 0x00, 0x10, 0x00, 0x62, 0x01, 0x00, 0x00, 0x72, 0x01, 0x0c, 0x00, 0x10, 0x00, 0x62, 0x01, 0x00, 0x00 gUnknown_Debug_821F58C:: - .incbin "baserom_de_debug.gba", 0x21F58C, 12 + .byte 0x86, 0x01, 0x17, 0x00, 0x0e, 0x00, 0x94, 0x01, 0x17, 0x00, 0x10, 0x00 gUnknown_Debug_821F598:: - .incbin "baserom_de_debug.gba", 0x21F598, 20 + .byte 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x4b, 0x00, 0x00, 0x02, 0x80, 0x00, 0x00, 0x00 gUnknown_Debug_821F5AC:: - .incbin "baserom_de_debug.gba", 0x21F5AC, 120 + .byte 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x03, 0x00, 0x00, 0x14, 0x00, 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00 + .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x14, 0x14, 0x00, 0x06, 0x14, 0x00, 0x14, 0x00, 0x00, 0x14, 0x00, 0x07, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, 0x08, 0x00, 0x00, 0x14, 0x00, 0x14, 0x14, 0x00 + .byte 0x09, 0x14, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x00, 0x14, 0x14, 0x00, 0x0b, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00 + .byte 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 Str_821F624:: @ 0x821F624 .string "ーーーーーーーーーーーー$" @@ -266,13 +281,22 @@ debug_unk_0b:: @ 0x821F66D .string "せつぞくエラー$" - .incbin "baserom_de_debug.gba", 0x21F675, 11 +@ 0x821f675 + .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 gUnknown_Debug_821F680:: - .incbin "baserom_de_debug.gba", 0x21F680, 280 + .byte 0xc0, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, 0xda, 0x00, 0x00, 0x00, 0xf2, 0x00, 0x00, 0x00, 0xf6, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x52, 0x01, 0x00, 0x00, 0x5a, 0x01, 0x00, 0x00 + .byte 0x72, 0x01, 0x00, 0x00, 0x76, 0x01, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0xd2, 0x01, 0x00, 0x00, 0xda, 0x01, 0x00, 0x00, 0xf2, 0x01, 0x00, 0x00, 0xf6, 0x01, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00 + .byte 0x52, 0x02, 0x00, 0x00, 0x5a, 0x02, 0x00, 0x00, 0x72, 0x02, 0x00, 0x00, 0x76, 0x02, 0x00, 0x00, 0xc0, 0x02, 0x00, 0x00, 0xd2, 0x02, 0x00, 0x00, 0xda, 0x02, 0x00, 0x00, 0xf2, 0x02, 0x00, 0x00 + .byte 0xf6, 0x02, 0x00, 0x00, 0x40, 0x03, 0x00, 0x00, 0x52, 0x03, 0x00, 0x00, 0x5a, 0x03, 0x00, 0x00, 0x72, 0x03, 0x00, 0x00, 0x76, 0x03, 0x00, 0x00, 0xc0, 0x04, 0x00, 0x00, 0xd4, 0x04, 0x00, 0x00 + .byte 0xde, 0x04, 0x00, 0x00, 0xe8, 0x04, 0x00, 0x00, 0xf2, 0x04, 0x00, 0x00, 0xc0, 0x08, 0x00, 0x00, 0xd2, 0x08, 0x00, 0x00, 0xda, 0x08, 0x00, 0x00, 0xf2, 0x08, 0x00, 0x00, 0xf6, 0x08, 0x00, 0x00 + .byte 0x40, 0x09, 0x00, 0x00, 0x52, 0x09, 0x00, 0x00, 0x5a, 0x09, 0x00, 0x00, 0x72, 0x09, 0x00, 0x00, 0x76, 0x09, 0x00, 0x00, 0xc0, 0x09, 0x00, 0x00, 0xd2, 0x09, 0x00, 0x00, 0xda, 0x09, 0x00, 0x00 + .byte 0xf2, 0x09, 0x00, 0x00, 0xf6, 0x09, 0x00, 0x00, 0x40, 0x0a, 0x00, 0x00, 0x52, 0x0a, 0x00, 0x00, 0x5a, 0x0a, 0x00, 0x00, 0x72, 0x0a, 0x00, 0x00, 0x76, 0x0a, 0x00, 0x00, 0xc0, 0x0a, 0x00, 0x00 + .byte 0xd2, 0x0a, 0x00, 0x00, 0xda, 0x0a, 0x00, 0x00, 0xf2, 0x0a, 0x00, 0x00, 0xf6, 0x0a, 0x00, 0x00, 0x40, 0x0b, 0x00, 0x00, 0x52, 0x0b, 0x00, 0x00, 0x5a, 0x0b, 0x00, 0x00, 0x72, 0x0b, 0x00, 0x00 + .byte 0x76, 0x0b, 0x00, 0x00, 0xc0, 0x0c, 0x00, 0x00, 0xd4, 0x0c, 0x00, 0x00, 0xde, 0x0c, 0x00, 0x00, 0xe8, 0x0c, 0x00, 0x00, 0xf2, 0x0c, 0x00, 0x00 gUnknown_Debug_821F798:: - .incbin "baserom_de_debug.gba", 0x21F798, 312-280 + .byte 0xc0, 0x03, 0x00, 0x00, 0xd6, 0x03, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x56, 0x04, 0x00, 0x00, 0xc0, 0x0b, 0x00, 0x00, 0xd6, 0x0b, 0x00, 0x00, 0x40, 0x0c, 0x00, 0x00, 0x56, 0x0c, 0x00, 0x00 Str_821F7B8:: @ 0x821F7B8 .string "たかさ $" diff --git a/data/debug_menu_3.s b/data/debug_menu_3.s index f26e257d1..ed4bb599b 100644 --- a/data/debug_menu_3.s +++ b/data/debug_menu_3.s @@ -6,40 +6,101 @@ .section .rodata gUnknown_Debug_845DAE1:: - .incbin "baserom_de_debug.gba", 0x45DAE1, 721 + .byte 0x01, 0xe1, 0xda, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xff, 0xda, 0x45, 0x08, 0xb2, 0xdd, 0x45, 0x08, 0x06, 0x08 + .byte 0x01, 0x01, 0x56, 0xdb, 0x45, 0x08, 0x0d, 0xdd, 0x45, 0x08, 0x0b, 0x01, 0x05, 0x13, 0x01, 0x05, 0x0d, 0xdd, 0x45, 0x08, 0x02, 0xc6, 0xd5, 0xe9, 0xda, 0x00, 0xe9, 0xe2, 0xd8, 0x00, 0xd6, 0xd9 + .byte 0xe7, 0xe9, 0xd7, 0xdc, 0xd9, 0x00, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe2, 0x00, 0xd0, 0xd5, 0xe8, 0xd9, 0xe6, 0x00, 0xdd, 0xe2, 0x00, 0xd8, 0xd9, 0xe6, 0xfe, 0xbb, 0xcc, 0xbf, 0xc8, 0xbb, 0x00 + .byte 0xea, 0xe3, 0xe2, 0x00, 0xbc, 0xc6, 0xf3, 0xce, 0xbf, 0xc8, 0xbc, 0xcf, 0xcc, 0xc1, 0x00, 0xbd, 0xc3, 0xce, 0xd3, 0xad, 0xff, 0xb8, 0x56, 0xdb, 0x45, 0x08, 0x47, 0x13, 0x01, 0x01, 0x00, 0x21 + .byte 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xb4, 0xdb, 0x45, 0x08, 0x4a, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xb4, 0xdb, 0x45, 0x08, 0x2b, 0xce, 0x00, 0xbb, 0x01, 0xb4 + .byte 0xdb, 0x45, 0x08, 0x6a, 0x5a, 0xbd, 0xbe, 0xdb, 0x45, 0x08, 0x66, 0x6d, 0x46, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x00, 0x00, 0xbb, 0x01, 0xb5, 0xdb, 0x45, 0x08, 0x1a, 0x00, 0x80, 0x13 + .byte 0x01, 0x1a, 0x01, 0x80, 0x01, 0x00, 0x09, 0x00, 0x29, 0x53, 0x08, 0xbd, 0x00, 0xdc, 0x45, 0x08, 0x66, 0x6d, 0x6c, 0x0d, 0xbd, 0x94, 0xdc, 0x45, 0x08, 0x66, 0x6d, 0x6c, 0x02, 0xd0, 0xbb, 0xce + .byte 0xbf, 0xcc, 0xf0, 0x00, 0xfd, 0x01, 0xab, 0x00, 0xcd, 0xd7, 0xdc, 0xf5, 0xe2, 0xb8, 0x00, 0xd8, 0xdd, 0xd7, 0xdc, 0x00, 0xee, 0xe9, 0x00, 0xe7, 0xd9, 0xdc, 0xd9, 0xe2, 0xab, 0xfe, 0xc2, 0xdd + .byte 0xd9, 0xe6, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xd9, 0xdd, 0xe2, 0x00, 0xbc, 0xe6, 0xdd, 0xd9, 0xda, 0x00, 0xda, 0xf6, 0xe6, 0x00, 0xd8, 0xdd, 0xd7, 0xdc, 0xb8, 0x00, 0xfd, 0x01, 0xad, 0xff, 0xd0 + .byte 0xbb, 0xce, 0xbf, 0xcc, 0xf0, 0x00, 0xc3, 0xd7, 0xdc, 0x00, 0xd6, 0xdd, 0xe2, 0x00, 0xe1, 0xdd, 0xe6, 0x00, 0xe2, 0xdd, 0xd7, 0xdc, 0xe8, 0x00, 0xe7, 0xdd, 0xd7, 0xdc, 0xd9, 0xe6, 0xb8, 0x00 + .byte 0xd9, 0xe7, 0xfe, 0xdf, 0xf5, 0xe2, 0xe2, 0xe8, 0xd9, 0x00, 0xd9, 0xdd, 0xe2, 0x00, 0xce, 0xc3, 0xbd, 0xc5, 0xbf, 0xce, 0x00, 0xda, 0xf6, 0xe6, 0x00, 0xd9, 0xdd, 0xe2, 0xd9, 0x00, 0xc0, 0xf4 + .byte 0xdc, 0xe6, 0xd9, 0x00, 0xe7, 0xd9, 0xdd, 0xe2, 0xad, 0xfb, 0xbe, 0xe9, 0x00, 0xe7, 0xe3, 0xe0, 0xe0, 0xe8, 0xd9, 0xe7, 0xe8, 0x00, 0xe2, 0xd5, 0xd7, 0xdc, 0x00, 0xcd, 0xbf, 0xbf, 0xc1, 0xcc + .byte 0xbb, 0xcd, 0xcf, 0xc6, 0xbc, 0x00, 0xbd, 0xc3, 0xce, 0xd3, 0x00, 0xdb, 0xd9, 0xdc, 0xd9, 0xe2, 0xfe, 0xe9, 0xe2, 0xd8, 0x00, 0xd8, 0xdd, 0xd7, 0xdc, 0x00, 0xd8, 0xe3, 0xe6, 0xe8, 0x00, 0xdb + .byte 0xd9, 0xe2, 0xd5, 0xe9, 0xd9, 0xe6, 0x00, 0xd9, 0xe6, 0xdf, 0xe9, 0xe2, 0xd8, 0xdd, 0xdb, 0xd9, 0xe2, 0xad, 0xff, 0xd0, 0xbb, 0xce, 0xbf, 0xcc, 0xf0, 0x00, 0xfd, 0x01, 0xb8, 0x00, 0xd8, 0xdd + .byte 0xd9, 0x00, 0xbc, 0xbb, 0xcd, 0xc3, 0xcd, 0xae, 0xce, 0xbb, 0xcd, 0xbd, 0xc2, 0xbf, 0xfe, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe7, 0x00, 0xbc, 0xbf, 0xcf, 0xce, 0xbf, 0xc6, 0xcd, 0x00, 0xdd, 0xe7 + .byte 0xe8, 0x00, 0xea, 0xe3, 0xe0, 0xe0, 0xad, 0xfb, 0xc6, 0xd5, 0xdb, 0xd9, 0xe6, 0xd9, 0x00, 0xd9, 0xdd, 0xe2, 0xdd, 0xdb, 0xd9, 0x00, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe6, 0x00, 0xbc, 0xd5, 0xe7 + .byte 0xdd, 0xe7, 0xae, 0xc3, 0xe8, 0xd9, 0xe1, 0xe7, 0x00, 0xdd, 0xe2, 0xfe, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe1, 0x00, 0xca, 0xbd, 0x00, 0xe9, 0xe2, 0xd8, 0x00, 0xdf, 0xe3, 0xe1, 0xe1, 0x00, 0xd8 + .byte 0xd5, 0xe2, 0xe2, 0x00, 0xeb, 0xdd, 0xd9, 0xd8, 0xd9, 0xe6, 0xad, 0xff, 0xb8, 0x0d, 0xdd, 0x45, 0x08, 0x47, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0x53, 0xdd, 0x45 + .byte 0x08, 0x4a, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0x53, 0xdd, 0x45, 0x08, 0x2b, 0xce, 0x00, 0xbb, 0x01, 0x53, 0xdd, 0x45, 0x08, 0x46, 0x13, 0x01, 0x01, 0x00, 0x21 + .byte 0x0d, 0x80, 0x00, 0x00, 0xbb, 0x01, 0x5b, 0xdd, 0x45, 0x08, 0xbe, 0x16, 0xdb, 0x45, 0x08, 0x0e, 0x02, 0x02, 0xbe, 0x63, 0xdd, 0x45, 0x08, 0x0e, 0x03, 0x02, 0xbe, 0x95, 0xdd, 0x45, 0x08, 0x0e + .byte 0x03, 0x02, 0xbe, 0xdd, 0xd9, 0xe7, 0xd9, 0xe7, 0x00, 0xc1, 0xbf, 0xcd, 0xbd, 0xc2, 0xbf, 0xc2, 0xbf, 0xc8, 0x00, 0xdf, 0xd5, 0xe2, 0xe2, 0x00, 0xe2, 0xe9, 0xe6, 0x00, 0xd9, 0xdd, 0xe2, 0xe1 + .byte 0xd5, 0xe0, 0xfe, 0xdb, 0xd9, 0xe7, 0xe4, 0xdd, 0xd9, 0xe0, 0xe8, 0x00, 0xeb, 0xd9, 0xe6, 0xd8, 0xd9, 0xe2, 0xad, 0xff, 0xbe, 0xd9, 0xdd, 0xe2, 0xd9, 0x00, 0xbc, 0xbb, 0xcd, 0xc3, 0xcd, 0xae + .byte 0xce, 0xbb, 0xcd, 0xbd, 0xc2, 0xbf, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xea, 0xe3, 0xe0, 0xe0, 0xad, 0xff + gUnknown_Debug_845DDB2:: - .incbin "baserom_de_debug.gba", 0x45DDB2, 36 + .byte 0x01, 0xb2, 0xdd, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xdd, 0x45, 0x08, 0x06, 0xe3, 0x45, 0x08, 0x07, 0xd6 + .byte 0xdd, 0x45, 0x08, 0x02 + gUnknown_Debug_845DDD6:: - .incbin "baserom_de_debug.gba", 0x45DDD6, 1328 + .space 0x530 + gUnknown_Debug_845E306:: - .incbin "baserom_de_debug.gba", 0x45E306, 218 + .byte 0x01, 0x06, 0xe3, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x05, 0x29, 0xe3, 0x45, 0x08, 0x03, 0x02, 0x4f, 0xe3, 0x45, 0x08, 0x03, 0x03, 0x87, 0xe3 + .byte 0x45, 0x08, 0x02, 0xb8, 0x29, 0xe3, 0x45, 0x08, 0x43, 0x21, 0x0d, 0x80, 0x06, 0x00, 0xbb, 0x01, 0x4c, 0xe3, 0x45, 0x08, 0x79, 0x45, 0x01, 0x0f, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x0e, 0x02, 0x02, 0x0e, 0x03, 0x02, 0xbf, 0xdd, 0xe2, 0x00, 0xca, 0xc9, 0xc5, 0x1b, 0xc7, 0xc9, 0xc8, 0x00, 0xeb, 0xe9, 0xe6, 0xd8, 0xd9, 0x00, 0xdd, 0xe2, 0x00, 0xd8, 0xd5 + .byte 0xe7, 0x00, 0xce, 0xd9, 0xd5, 0xe1, 0x00, 0xd8, 0xd9, 0xe7, 0xfe, 0xcd, 0xe4, 0xdd, 0xd9, 0xe0, 0xd9, 0xe6, 0xe7, 0x00, 0xd5, 0xe9, 0xda, 0xdb, 0xd9, 0xe2, 0xe3, 0xe1, 0xe1, 0xd9, 0xe2, 0xad + .byte 0xff, 0xbe, 0xd5, 0xe7, 0x00, 0xce, 0xd9, 0xd5, 0xe1, 0x00, 0xd8, 0xd9, 0xe7, 0x00, 0xcd, 0xe4, 0xdd, 0xd9, 0xe0, 0xd9, 0xe6, 0xe7, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xea, 0xe3, 0xe0, 0xe0, 0xe7 + .byte 0xe8, 0xf4, 0xe2, 0xd8, 0xdd, 0xdb, 0xad, 0xfe, 0xbf, 0xe7, 0x00, 0xdf, 0xd5, 0xe2, 0xe2, 0x00, 0xdf, 0xd9, 0xdd, 0xe2, 0x00, 0xeb, 0xd9, 0xdd, 0xe8, 0xd9, 0xe6, 0xd9, 0xe7, 0x00, 0xca, 0xc9 + .byte 0xc5, 0x1b, 0xc7, 0xc9, 0xc8, 0xfa, 0xd5, 0xe9, 0xda, 0xdb, 0xd9, 0xe2, 0xe3, 0xe1, 0xe1, 0xd9, 0xe2, 0x00, 0xeb, 0xd9, 0xe6, 0xd8, 0xd9, 0xe2, 0xad, 0xff + gUnknown_Debug_845E3E0:: - .incbin "baserom_de_debug.gba", 0x45E3E0, 34 + .byte 0x01, 0xe0, 0xe3, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xe3, 0x45, 0x08, 0x02, 0xe4, 0x45, 0x08, 0x08, 0x00 + .byte 0x01, 0x02 + gUnknown_Debug_845E402:: - .incbin "baserom_de_debug.gba", 0x45E402, 32 + .byte 0x01, 0x02, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe4, 0x45, 0x08, 0x22, 0xe4, 0x45, 0x08, 0x09, 0x02 + gUnknown_Debug_845E422:: - .incbin "baserom_de_debug.gba", 0x45E422, 33 + .byte 0x01, 0x22, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe4, 0x45, 0x08, 0x43, 0xe4, 0x45, 0x08, 0x0a, 0x01 + .byte 0x02 + gUnknown_Debug_845E443:: - .incbin "baserom_de_debug.gba", 0x45E443, 36 + .byte 0x01, 0x43, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0xe4, 0x45, 0x08, 0xef, 0xe4, 0x45, 0x08, 0x0c, 0x67 + .byte 0xe4, 0x45, 0x08, 0x02 + gUnknown_Debug_845E467:: - .incbin "baserom_de_debug.gba", 0x45E467, 100 + .space 100 + gUnknown_Debug_845E4CB:: - .incbin "baserom_de_debug.gba", 0x45E4CB, 36 + .space 36 + gUnknown_Debug_845E4EF:: - .incbin "baserom_de_debug.gba", 0x45E4EF, 23 + .byte 0x01, 0xef, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0d, 0x06, 0xe5, 0x45, 0x08, 0x02 + gUnknown_Debug_845E506:: - .incbin "baserom_de_debug.gba", 0x45E506, 256 + .space 256 + gUnknown_Debug_845E606:: - .incbin "baserom_de_debug.gba", 0x45E606, 19 + .byte 0x01, 0x06, 0xe6, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0e, 0x02 + gUnknown_Debug_845E619:: - .incbin "baserom_de_debug.gba", 0x45E619, 249 + .byte 0x01, 0x19, 0xe6, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x37, 0xe6, 0x45, 0x08, 0x12, 0xe7, 0x45, 0x08, 0x06, 0x08 + .byte 0x01, 0x01, 0x83, 0xe6, 0x45, 0x08, 0x12, 0xe7, 0x45, 0x08, 0x03, 0xff, 0x4c, 0xe6, 0x45, 0x08, 0x04, 0x02, 0x02, 0xbc, 0xd9, 0xe7, 0xe9, 0xd7, 0xdc, 0xd9, 0x00, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9 + .byte 0xe2, 0x00, 0xd0, 0xd5, 0xe8, 0xd9, 0xe6, 0x00, 0xdd, 0xe2, 0x00, 0xd8, 0xd9, 0xe6, 0x00, 0xbb, 0xcc, 0xbf, 0xc8, 0xbb, 0xfe, 0xea, 0xe3, 0xe2, 0x00, 0xbc, 0xc6, 0xf3, 0xce, 0xbf, 0xc8, 0xbc + .byte 0xcf, 0xcc, 0xc1, 0x00, 0xbd, 0xc3, 0xce, 0xd3, 0xad, 0xff, 0xb8, 0x83, 0xe6, 0x45, 0x08, 0x47, 0xa9, 0x00, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xbf, 0xe6, 0x45, 0x08, 0x4a + .byte 0xa9, 0x00, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xbf, 0xe6, 0x45, 0x08, 0x6a, 0x5a, 0xbd, 0xc0, 0xe6, 0x45, 0x08, 0x66, 0x6d, 0x1a, 0x00, 0x80, 0xa9, 0x00, 0x1a, 0x01, 0x80 + .byte 0x01, 0x00, 0x09, 0x00, 0x6c, 0x0d, 0x0c, 0xd0, 0xbb, 0xce, 0xbf, 0xcc, 0xf0, 0x00, 0xc2, 0xdd, 0xb8, 0x00, 0xfd, 0x01, 0xab, 0xfb, 0xc3, 0xd7, 0xdc, 0x00, 0xdc, 0xd5, 0xd6, 0xd9, 0x00, 0xdb + .byte 0xd9, 0xe6, 0xd5, 0xd8, 0xd9, 0x00, 0xd8, 0xdd, 0xd9, 0xe7, 0xd9, 0x00, 0xe7, 0xd9, 0xe0, 0xe8, 0xd9, 0xe2, 0xd9, 0x00, 0xbc, 0xbf, 0xbf, 0xcc, 0xbf, 0xfe, 0xd9, 0xe6, 0xdc, 0xd5, 0xe0, 0xe8 + .byte 0xd9, 0xe2, 0xad, 0x00, 0xc3, 0xd7, 0xdc, 0x00, 0xe7, 0xd7, 0xdc, 0xd9, 0xe2, 0xdf, 0xd9, 0x00, 0xe7, 0xdd, 0xd9, 0x00, 0xd8, 0xdd, 0xe6, 0xab, 0xff + gUnknown_Debug_845E712:: - .incbin "baserom_de_debug.gba", 0x45E712, 133 + .byte 0x01, 0x12, 0xe7, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x30, 0xe7, 0x45, 0x08, 0x97, 0xe7, 0x45, 0x08, 0x05, 0x36 + .byte 0xe7, 0x45, 0x08, 0x02, 0xb8, 0x36, 0xe7, 0x45, 0x08, 0x81, 0x00, 0x78, 0x00, 0x4b, 0x78, 0x00, 0x21, 0x0d, 0x80, 0x00, 0x00, 0xbb, 0x01, 0x55, 0xe7, 0x45, 0x08, 0xbe, 0x5d, 0xe7, 0x45, 0x08 + .byte 0x0e, 0x02, 0x02, 0xbe, 0x71, 0xe7, 0x45, 0x08, 0x0e, 0x03, 0x02, 0xfd, 0x02, 0x00, 0xeb, 0xe9, 0xe6, 0xd8, 0xd9, 0x00, 0xf6, 0xd6, 0xd9, 0xe6, 0xdb, 0xd9, 0xd6, 0xd9, 0xe2, 0xad, 0xff, 0xbf + .byte 0xe7, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xdf, 0xd9, 0xdd, 0xe2, 0x00, 0xca, 0xe0, 0xd5, 0xe8, 0xee, 0x00, 0xda, 0xf6, 0xe6, 0x00, 0xfd, 0x02, 0xfe, 0xea, 0xe3, 0xe6, 0xdc, 0xd5, 0xe2, 0xd8, 0xd9 + .byte 0xe2, 0xad, 0xad, 0xad, 0xff + gUnknown_Debug_845E797:: - .incbin "baserom_de_debug.gba", 0x45E797, 30 + .byte 0x01, 0x97, 0xe7, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xb5, 0xe7, 0x45, 0x08, 0xbb, 0xe7, 0x45, 0x08 + gUnknown_Debug_845E7B5:: - .incbin "baserom_de_debug.gba", 0x45E7B5, 6 + .byte 0x0b, 0x01, 0x03, 0x0d, 0x00, 0x02 + gUnknown_Debug_845E7BB:: - .incbin "baserom_de_debug.gba", 0x45E7BB, 1 + .byte 0x00 .endif + diff --git a/data/start_menu_debug.s b/data/start_menu_debug.s index ded17c700..322c271ee 100644 --- a/data/start_menu_debug.s +++ b/data/start_menu_debug.s @@ -222,7 +222,8 @@ gDebug0x839B9BC:: .4byte Str_839B9B1, DebugMenu_OpenKiwa+1 gUnknown_Debug_839BB64:: - .incbin "baserom_de_debug.gba", 0x39bb64, 64 + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x0b, 0x0c, 0x0d, 0x0e, 0x1f, 0x12, 0x13, 0x00, 0x08, 0x09, 0x0a, 0x1e, 0x10, 0x24, 0x0f, 0x00, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x00 + .byte 0x1c, 0x1d, 0x14, 0x20, 0x21, 0x22, 0x23, 0x00, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x00, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x00, 0x11, 0x33, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_Debug_0839BBA4:: @ 0x839BBA4 .string "Debugging Version$" @@ -499,7 +500,7 @@ Str_839BFDC:: @ 0x839BFDC .string " じかん ふん びょう$" gUnknown_Debug_839BFE8:: - .incbin "baserom_de_debug.gba", 0x39bfe8, 32 + .byte 0x63, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00 Str_839C008: @ 0x839C008 gDebug0x839C008:: @@ -758,7 +759,16 @@ Str_839C438:: @ 0x839C438 .string "ポロック グループ{STR_VAR_1}$" gUnknown_Debug_839C444:: - .incbin "baserom_de_debug.gba", 0x39c444, 304 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00 + .byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 Str_839C574:: @ 0x839C574 gDebug0x839C574:: @@ -790,7 +800,7 @@ Str_839C5E9:: @ 0x839C5E9 .align 1 gUnknown_Debug_839C5F4:: - .incbin "baserom_de_debug.gba", 0x39c5f4, 24 + .byte 0x00, 0x00, 0xe7, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x09, 0x03, 0x00, 0x00 Str_839C60C:: @ 0x839C60C gDebug0x839C60C:: -- cgit v1.2.3 From 072cd4470c1b2c7dd17485e3fde37cdd80c2a7e3 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 18:02:32 -0600 Subject: fix travis script for debug rom --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27e572c75..6e88230ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ matrix: - make -j2 sapphire - make -j2 sapphire_rev1 - make -j2 sapphire_rev2 - - make -j2 ruby_debug_de COMPARE=0 - os: linux env: _="Formatting" addons: @@ -56,5 +55,6 @@ matrix: - ./build_tools.sh - make -j2 ruby_de - make -j2 sapphire_de + - make -j2 ruby_de_debug allow_failures: - env: _="Formatting" -- cgit v1.2.3 From 1e6cb59a0cd0dff15f749a5274bee17ca994c178 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 20:43:28 -0600 Subject: start decompiling start_menu_debug.c --- data/start_menu_debug.s | 323 ------------- include/battle.h | 2 + include/debug.h | 6 + include/link.h | 1 + include/mystery_event_menu.h | 1 + include/reset_rtc_screen.h | 1 + include/trade.h | 1 + ld_script.txt | 2 + src/debug/start_menu_debug.c | 1041 +++++++++++++++++++----------------------- 9 files changed, 489 insertions(+), 889 deletions(-) diff --git a/data/start_menu_debug.s b/data/start_menu_debug.s index 322c271ee..dc722bf33 100644 --- a/data/start_menu_debug.s +++ b/data/start_menu_debug.s @@ -6,329 +6,6 @@ .section .rodata -Str_839B740: @ 0x839B740 - .string "·WATANABE$" - -Str_839B74A: @ 0x839B74A - .string "SOGABE$" - -Str_839B751: @ 0x839B751 - .string "·TAMADA$" - -Str_839B759: @ 0x839B759 - .string "KAGAYA$" - -Str_839B760: @ 0x839B760 - .string "MATUDA$" - -Str_839B767: @ 0x839B767 - .string "NOHARA$" - -Str_839B76E: @ 0x839B76E - .string "NAKAMURA$" - -Str_839B777: @ 0x839B777 - .string "EXIT$" - -Str_839B77C: @ 0x839B77C - .string "Teleport$" - -Str_839B785: @ 0x839B785 - .string "Switch BG$" - -Str_839B78F: @ 0x839B78F - .string "Edit your {PKMN}$" - -Str_839B79C: @ 0x839B79C - .string "MORI$" - -Str_839B7A1: @ 0x839B7A1 - .string "TOMOMITI$" - -Str_839B7AA: @ 0x839B7AA - .string "·AOKI$" - -Str_839B7B0: @ 0x839B7B0 - .string "TAYA$" - -Str_839B7B5: @ 0x839B7B5 - .string "Control Encounter$" - -Str_839B7C7: @ 0x839B7C7 - .string "PTIME$" - -Str_839B7CD: @ 0x839B7CD - .string "Make items$" - -Str_839B7D8: @ 0x839B7D8 - .string "Transport$" - -Str_839B7E2: @ 0x839B7E2 - .string "See portraits$" - -Str_839B7F0: @ 0x839B7F0 - .string "Time records$" - -Str_839B7FD: @ 0x839B7FD - .string "Set time$" - -Str_839B806: @ 0x839B806 - .string "National オカDex$" - -Str_839B815: @ 0x839B815 - .string "Hoenn オカDex$" - -Str_839B821: @ 0x839B821 - .string "Create {PKMN}$" - -Str_839B82B: @ 0x839B82B - .string "See {PKMN} graphics$" - -Str_839B83B: @ 0x839B83B - .string "See trainers$" - -Str_839B848: @ 0x839B848 - .string "Battle for debug$" - -Str_839B859: @ 0x839B859 - .string "Full set of badges$" - -Str_839B86C: @ 0x839B86C - .string "Hoenn National Dex$" - -Str_839B87F: @ 0x839B87F - .string "Set Ram berry$" - -Str_839B88D: @ 0x839B88D - .string "Use HM$" - -Str_839B894: @ 0x839B894 - .string "IWASAWA$" - -Str_839B89C: @ 0x839B89C - .string "BGM ON/OFF$" - -Str_839B8A7: @ 0x839B8A7 - .string "Size comparison$" - -Str_839B8B7: @ 0x839B8B7 - .string "Clear flag ON/OFF$" - -Str_839B8C9: @ 0x839B8C9 - .string "Safari$" - -Str_839B8D0: @ 0x839B8D0 - .string "Rematch trainers$" - -Str_839B8E1: @ 0x839B8E1 - .string "Mirage island RND$" - -Str_839B8F3: @ 0x839B8F3 - .string "Hall of fame$" - -Str_839B900: @ 0x839B900 - .string "Mystery event$" - -Str_839B90E: @ 0x839B90E - .string "Legends records$" - -Str_839B91E: @ 0x839B91E - .string "Weather events$" - -Str_839B92D: @ 0x839B92D - .string "Cell info.$" - -Str_839B938: @ 0x839B938 - .string "Check {POKEBLOCK}$" - -Str_839B944: @ 0x839B944 - .string "Effort values$" - -Str_839B952: @ 0x839B952 - .string "Berrie Info$" - -Str_839B95E: @ 0x839B95E - .string "Battle Tower stages$" - -Str_839B972: @ 0x839B972 - .string "End sequence demo$" - -Str_839B984: @ 0x839B984 - .string "Random number test$" - -Str_839B997: @ 0x839B997 - .string "Me-too BackupMan$" - -Str_839B9A8: @ 0x839B9A8 - .string "MURAKAWA$" - -Str_839B9B1: @ 0x839B9B1 - .string "KINA(FONT)$" - - .align 2 -gDebug0x839B9BC:: - .4byte Str_839B777, DebugMenu_Exit+1 - .4byte Str_839B740, DebugMenu_OpenWatanabe+1 - .4byte Str_839B74A, DebugMenu_OpenSogabe+1 - .4byte Str_839B751, DebugMenu_OpenTamada+1 - .4byte Str_839B759, DebugMenu_OpenKagaya+1 - .4byte Str_839B760, DebugMenu_OpenMatsuda+1 - .4byte Str_839B767, DebugMenu_OpenNohara+1 - .4byte Str_839B76E, DebugMenu_OpenNakamura+1 - .4byte Str_839B77C, DebugMenu_Teleport+1 - .4byte Str_839B78F, DebugMenu_EditPKMN+1 - .4byte Str_839B785, DebugMenu_SwitchBG+1 - .4byte Str_839B79C, DebugMenu_OpenMori+1 - .4byte Str_839B7A1, DebugMenu_OpenTomomichi+1 - .4byte Str_839B7AA, DebugMenu_OpenAoki+1 - .4byte Str_839B7B0, DebugMenu_OpenTaya+1 - .4byte Str_839B8B7, DebugMenu_ToggleClearFlag+1 - .4byte Str_839B7B5, DebugMenu_ControlEncounter+1 - .4byte Str_839B7C7, DebugMenu_PTime+1 - .4byte Str_839B7CD, DebugMenu_MakeItems+1 - .4byte Str_839B7D8, debug_sub_8091300+1 - .4byte Str_839B7E2, DebugMenu_ViewPortraits+1 - .4byte Str_839B7F0, DebugMenu_TimeRecords+1 - .4byte Str_839B7FD, DebugMenu_SetTime+1 - .4byte Str_839B806, DebugMenu_NationalDex+1 - .4byte Str_839B821, DebugMenu_CreatePKMN+1 - .4byte Str_839B82B, DebugMenu_ViewPokemonGraphics+1 - .4byte Str_839B848, DebugMenu_BattleForDebug+1 - .4byte Str_839B859, DebugMenu_AllBadges+1 - .4byte Str_839B86C, DebugMenu_HoennNationalDex+1 - .4byte Str_839B87F, DebugMenu_SetRamBerry+1 - .4byte Str_839B88D, DebugMenu_UseHM+1 - .4byte Str_839B894, DebugMenu_OpenIwasawa+1 - .4byte Str_839B89C, DebugMenu_ToggleBGM+1 - .4byte Str_839B8A7, DebugMenu_OpenSizeComparison+1 - .4byte Str_839B8C9, DebugMenu_Safari+1 - .4byte Str_839B8D0, DebugMenu_RematchTrainers+1 - .4byte Str_839B8E1, DebugMenu_MiragaIslandRND+1 - .4byte Str_839B8F3, DebugMenu_HallOfFame+1 - .4byte Str_839B900, DebugMenu_OpenMysteryEvent+1 - .4byte Str_839B90E, DebugMenu_OpenLegendsRecord+1 - .4byte Str_839B91E, DebugMenu_OpenWeatherEvents+1 - .4byte Str_839B92D, DebugMenu_CellInfo+1 - .4byte Str_839B938, DebugMenu_CheckPKBLCK+1 - .4byte Str_839B944, DebugMenu_EffortValues+1 - .4byte Str_839B815, DebugMenu_HoennDex+1 - .4byte Str_839B83B, DebugMenu_OpenSeeTrainers+1 - .4byte Str_839B952, DebugMenu_OpenBerryInfo+1 - .4byte Str_839B95E, DebugMenu_BattleTowerStages+1 - .4byte Str_839B972, DebugMenu_EndSequenceDemo+1 - .4byte Str_839B984, DebugMenu_RandomNumberTest+1 - .4byte Str_839B997, DebugMenu_MeTooBackupMan+1 - .4byte Str_839B9A8, DebugMenu_OpenMurakawa+1 - .4byte Str_839B9B1, DebugMenu_OpenKiwa+1 - -gUnknown_Debug_839BB64:: - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x0b, 0x0c, 0x0d, 0x0e, 0x1f, 0x12, 0x13, 0x00, 0x08, 0x09, 0x0a, 0x1e, 0x10, 0x24, 0x0f, 0x00, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x00 - .byte 0x1c, 0x1d, 0x14, 0x20, 0x21, 0x22, 0x23, 0x00, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x00, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x00, 0x11, 0x33, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00 - -gUnknown_Debug_0839BBA4:: @ 0x839BBA4 - .string "Debugging Version$" - -gUnknown_Debug_0839BBB6:: @ 0x839BBB6 - .string "{VERSION} Version$" - -gUnknown_Debug_0839BBC1:: @ 0x839BBC1 - .string "Normal RTC compatible$" - -Str_839BBD7: @ 0x839BBD7 - .string "か の じっけん$" - -Str_839BBE0: @ 0x839BBE0 - .string "じっけん2$" - -Str_839BBE6: @ 0x839BBE6 - .string "BGじっけん$" - -Str_839BBED: @ 0x839BBED - .string "Battle$" - -Str_839BBF4: @ 0x839BBF4 - .string "つうしん じっけん$" - -Str_839BBFE: @ 0x839BBFE - .string "LINK Test2$" - -Str_839BC09: @ 0x839BC09 - .string "フィールド はじめる$" - -Str_839BC14: @ 0x839BC14 - .string "フィールド つづき$" - -Str_839BC1E: @ 0x839BC1E - .string "Sound test$" - -Str_839BC29: @ 0x839BC29 - .string "{POKEBLOCK} test$" - -Str_839BC34: @ 0x839BC34 - .string "Crash backup data$" - -Str_839BC46: @ 0x839BC46 - .string "e-Card test$" - -Str_839BC52: @ 0x839BC52 - .string "こうかんデモ   $" - -Str_839BC5C: @ 0x839BC5C - .string "Time in game$" - -Str_839BC69: @ 0x839BC69 - .string "フェスタ モード$" - -Str_839BC72: @ 0x839BC72 - .string "Mimic e-Card$" - -Str_839BC7F: @ 0x839BC7F - .string "RTC reset$" - -Str_839BC89: @ 0x839BC89 - .string "Converter$" - - .align 2 -gUnknown_Debug_839BC94:: @ 0x839BC94 - .4byte Str_839BBD7, DebugMenu_8076CBC+1 - .4byte Str_839BBE0, DebugMenu_8076CC0+1 - .4byte Str_839BBE6, DebugMenu_8076CD4+1 - .4byte Str_839BBED, DebugMenu_8076C6C+1 - .4byte Str_839BC29, DebugMenu_8076CD8+1 - .4byte Str_839BBFE, DebugMenu_8076D28+1 - .4byte Str_839BC1E, DebugMenu_8076D3C+1 - .4byte Str_839BC09, DebugMenu_8076C80+1 - .4byte Str_839BC14, DebugMenu_8076C90+1 - .4byte Str_839BC34, DebugMenu_8076D50+1 - .4byte Str_839BC46, DebugMenu_8076CEC+1 - .4byte Str_839BC52, DebugMenu_8076D14+1 - .4byte Str_839BC72, DebugMenu_8076D00+1 - .4byte Str_839BC5C, DebugMenu_8076D5C+1 - .4byte Str_839BC7F, DebugMenu_8076E18+1 - .4byte Str_839BC89, DebugMenu_8076EDC+1 - -Str_839BD14:: @ 0x839BD14 - .string "うかえ$" - -Str_839BD18:: @ 0x839BD18 - .string "      おけこしすせそ$" - -Str_839BD26:: @ 0x839BD26 - .string "  い   " -Str_839BD2C:: - .string "RTCを リセット します\n" - .string "Aで じっこう   Bでキャンセル$" - -Str_839BD4C:: @ 0x839BD4C - .string "RTCを リセット した!$" - -Str_839BD5A:: @ 0x839BD5A - .string "セーブデータを コンバートします\n" - .string "Aで けってい  Bで キャンセル$" - -Str_839BD7D:: @ 0x839BD7D - .string "へんかんが しゅうりょう しました!$" - Str_839BD90:: @ 0x839BD90 .string "ジュンイチ$" diff --git a/include/battle.h b/include/battle.h index d3cbd24f5..544e65b80 100644 --- a/include/battle.h +++ b/include/battle.h @@ -763,6 +763,8 @@ void sub_8012324(void); void SwapTurnOrder(u8, u8); u8 GetWhoStrikesFirst(u8, u8, u8); +void debug_sub_8010800(void); + // asm/battle_3.o u8 CheckMoveLimitations(u8 bank, u8 unusableMoves, u8 check); u8 UpdateTurnCounters(void); diff --git a/include/debug.h b/include/debug.h index 3c1a2b0a5..713b21ec5 100644 --- a/include/debug.h +++ b/include/debug.h @@ -5,4 +5,10 @@ void sub_80AAF30(void); void Crash(const u8 *text); +// tomomichi_debug_menu +void debug_nullsub_66(void); + +// sound_check_menu +void CB2_StartSoundCheckMenu(void); + #endif // GUARD_DEBUG_H diff --git a/include/link.h b/include/link.h index 367add625..21bb0b780 100644 --- a/include/link.h +++ b/include/link.h @@ -194,5 +194,6 @@ u32 LinkMain1(u8 *, u16 *, u16[CMD_LENGTH][MAX_LINK_PLAYERS]); void LinkVSync(void); void Timer3Intr(void); void SerialCB(void); +void LinkTestScreen(void); #endif // GUARD_LINK_H diff --git a/include/mystery_event_menu.h b/include/mystery_event_menu.h index 8801789d9..c1f5fbb8f 100644 --- a/include/mystery_event_menu.h +++ b/include/mystery_event_menu.h @@ -2,5 +2,6 @@ #define GUARD_MYSTERY_EVENT_MENU_H void CB2_InitMysteryEventMenu(void); +void debug_sub_815D15C(void); #endif // GUARD_MYSTERY_EVENT_MENU_H diff --git a/include/reset_rtc_screen.h b/include/reset_rtc_screen.h index 5807dec99..2de95534a 100644 --- a/include/reset_rtc_screen.h +++ b/include/reset_rtc_screen.h @@ -2,5 +2,6 @@ #define GUARD_RESET_RTC_SCREEN_H void CB2_InitResetRtcScreen(void); +void debug_sub_806F8F8(void); #endif // GUARD_RESET_RTC_SCREEN_H diff --git a/include/trade.h b/include/trade.h index 46f58a802..d6dee0bd9 100644 --- a/include/trade.h +++ b/include/trade.h @@ -51,6 +51,7 @@ extern const u32 gUnknown_0820CA98[]; extern const u16 gUnknown_0820F798[]; void sub_8047CD8(void); +void sub_804B790(void); void sub_804E174(void); extern const u8 gOtherText_MaleSymbol3[2]; extern const u8 gOtherText_FemaleSymbol3[2]; diff --git a/ld_script.txt b/ld_script.txt index 601408446..3a2bdac9e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -534,6 +534,8 @@ SECTIONS { src/engine/reset_rtc_screen.o(.rodata); src/field/party_menu.o(.rodata); src/field/start_menu.o(.rodata); + src/debug/start_menu_debug.o(.data); + src/debug/start_menu_debug.o(.rodata); data/start_menu_debug.o(.rodata); src/engine/menu.o(.rodata); src/engine/tileset_anim.o(.rodata); diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 318785945..5d9b150e7 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -1,583 +1,492 @@ #if DEBUG #include "global.h" +#include "constants/songs.h" +#include "battle.h" +#include "debug.h" +#include "link.h" +#include "main.h" +#include "menu.h" +#include "mystery_event_menu.h" +#include "overworld.h" +#include "reset_rtc_screen.h" +#include "rtc.h" +#include "save.h" +#include "sound.h" +#include "task.h" +#include "text.h" +#include "trade.h" + +// berry_blender.c +extern void unref_sub_80524BC(void); + +void debug_sub_8076BB4(u8); +void debug_sub_8077CF4(); + +u8 DebugMenu_Exit(void); +u8 DebugMenu_OpenWatanabe(void); +u8 DebugMenu_OpenSogabe(void); +u8 DebugMenu_OpenTamada(void); +u8 DebugMenu_OpenKagaya(void); +u8 DebugMenu_OpenMatsuda(void); +u8 DebugMenu_OpenNohara(void); +u8 DebugMenu_OpenNakamura(void); +u8 DebugMenu_Teleport(void); +u8 DebugMenu_EditPKMN(void); +u8 DebugMenu_SwitchBG(void); +u8 DebugMenu_OpenMori(void); +u8 DebugMenu_OpenTomomichi(void); +u8 DebugMenu_OpenAoki(void); +u8 DebugMenu_OpenTaya(void); +u8 DebugMenu_ToggleClearFlag(void); +u8 DebugMenu_ControlEncounter(void); +u8 DebugMenu_PTime(void); +u8 DebugMenu_MakeItems(void); +u8 debug_sub_8091300(void); +u8 DebugMenu_ViewPortraits(void); +u8 DebugMenu_TimeRecords(void); +u8 DebugMenu_SetTime(void); +u8 DebugMenu_NationalDex(void); +u8 DebugMenu_CreatePKMN(void); +u8 DebugMenu_ViewPokemonGraphics(void); +u8 DebugMenu_BattleForDebug(void); +u8 DebugMenu_AllBadges(void); +u8 DebugMenu_HoennNationalDex(void); +u8 DebugMenu_SetRamBerry(void); +u8 DebugMenu_UseHM(void); +u8 DebugMenu_OpenIwasawa(void); +u8 DebugMenu_ToggleBGM(void); +u8 DebugMenu_OpenSizeComparison(void); +u8 DebugMenu_Safari(void); +u8 DebugMenu_RematchTrainers(void); +u8 DebugMenu_MiragaIslandRND(void); +u8 DebugMenu_HallOfFame(void); +u8 DebugMenu_OpenMysteryEvent(void); +u8 DebugMenu_OpenLegendsRecord(void); +u8 DebugMenu_OpenWeatherEvents(void); +u8 DebugMenu_CellInfo(void); +u8 DebugMenu_CheckPKBLCK(void); +u8 DebugMenu_EffortValues(void); +u8 DebugMenu_HoennDex(void); +u8 DebugMenu_OpenSeeTrainers(void); +u8 DebugMenu_OpenBerryInfo(void); +u8 DebugMenu_BattleTowerStages(void); +u8 DebugMenu_EndSequenceDemo(void); +u8 DebugMenu_RandomNumberTest(void); +u8 DebugMenu_MeTooBackupMan(void); +u8 DebugMenu_OpenMurakawa(void); +u8 DebugMenu_OpenKiwa(void); +u8 DebugMenu_8076CBC(void); +u8 DebugMenu_8076CC0(void); +u8 DebugMenu_8076CD4(void); +u8 DebugMenu_8076C6C(void); +u8 DebugMenu_8076CD8(void); +u8 DebugMenu_8076D28(void); +u8 DebugMenu_8076D3C(void); +u8 DebugMenu_8076C80(void); +u8 DebugMenu_8076C90(void); +u8 DebugMenu_8076D50(void); +u8 DebugMenu_8076CEC(void); +u8 DebugMenu_8076D14(void); +u8 DebugMenu_8076D00(void); +u8 DebugMenu_8076D5C(void); +u8 DebugMenu_8076E18(void); +u8 DebugMenu_8076EDC(void); +void DebugMenu_8076FEC(void); + +const u8 Str_839B740[] = _("·WATANABE"); +const u8 Str_839B74A[] = _("SOGABE"); +const u8 Str_839B751[] = _("·TAMADA"); +const u8 Str_839B759[] = _("KAGAYA"); +const u8 Str_839B760[] = _("MATUDA"); +const u8 Str_839B767[] = _("NOHARA"); +const u8 Str_839B76E[] = _("NAKAMURA"); +const u8 Str_839B777[] = _("EXIT"); +const u8 Str_839B77C[] = _("Teleport"); +const u8 Str_839B785[] = _("Switch BG"); +const u8 Str_839B78F[] = _("Edit your {PKMN}"); +const u8 Str_839B79C[] = _("MORI"); +const u8 Str_839B7A1[] = _("TOMOMITI"); +const u8 Str_839B7AA[] = _("·AOKI"); +const u8 Str_839B7B0[] = _("TAYA"); +const u8 Str_839B7B5[] = _("Control Encounter"); +const u8 Str_839B7C7[] = _("PTIME"); +const u8 Str_839B7CD[] = _("Make items"); +const u8 Str_839B7D8[] = _("Transport"); +const u8 Str_839B7E2[] = _("See portraits"); +const u8 Str_839B7F0[] = _("Time records"); +const u8 Str_839B7FD[] = _("Set time"); +const u8 Str_839B806[] = _("National オカDex"); +const u8 Str_839B815[] = _("Hoenn オカDex"); +const u8 Str_839B821[] = _("Create {PKMN}"); +const u8 Str_839B82B[] = _("See {PKMN} graphics"); +const u8 Str_839B83B[] = _("See trainers"); +const u8 Str_839B848[] = _("Battle for debug"); +const u8 Str_839B859[] = _("Full set of badges"); +const u8 Str_839B86C[] = _("Hoenn National Dex"); +const u8 Str_839B87F[] = _("Set Ram berry"); +const u8 Str_839B88D[] = _("Use HM"); +const u8 Str_839B894[] = _("IWASAWA"); +const u8 Str_839B89C[] = _("BGM ON/OFF"); +const u8 Str_839B8A7[] = _("Size comparison"); +const u8 Str_839B8B7[] = _("Clear flag ON/OFF"); +const u8 Str_839B8C9[] = _("Safari"); +const u8 Str_839B8D0[] = _("Rematch trainers"); +const u8 Str_839B8E1[] = _("Mirage island RND"); +const u8 Str_839B8F3[] = _("Hall of fame"); +const u8 Str_839B900[] = _("Mystery event"); +const u8 Str_839B90E[] = _("Legends records"); +const u8 Str_839B91E[] = _("Weather events"); +const u8 Str_839B92D[] = _("Cell info."); +const u8 Str_839B938[] = _("Check {POKEBLOCK}"); +const u8 Str_839B944[] = _("Effort values"); +const u8 Str_839B952[] = _("Berrie Info"); +const u8 Str_839B95E[] = _("Battle Tower stages"); +const u8 Str_839B972[] = _("End sequence demo"); +const u8 Str_839B984[] = _("Random number test"); +const u8 Str_839B997[] = _("Me-too BackupMan"); +const u8 Str_839B9A8[] = _("MURAKAWA"); +const u8 Str_839B9B1[] = _("KINA(FONT)"); + +const struct MenuAction gDebug0x839B9BC[] = +{ + { Str_839B777, DebugMenu_Exit }, + { Str_839B740, DebugMenu_OpenWatanabe }, + { Str_839B74A, DebugMenu_OpenSogabe }, + { Str_839B751, DebugMenu_OpenTamada }, + { Str_839B759, DebugMenu_OpenKagaya }, + { Str_839B760, DebugMenu_OpenMatsuda }, + { Str_839B767, DebugMenu_OpenNohara }, + { Str_839B76E, DebugMenu_OpenNakamura }, + { Str_839B77C, DebugMenu_Teleport }, + { Str_839B78F, DebugMenu_EditPKMN }, + { Str_839B785, DebugMenu_SwitchBG }, + { Str_839B79C, DebugMenu_OpenMori }, + { Str_839B7A1, DebugMenu_OpenTomomichi }, + { Str_839B7AA, DebugMenu_OpenAoki }, + { Str_839B7B0, DebugMenu_OpenTaya }, + { Str_839B8B7, DebugMenu_ToggleClearFlag }, + { Str_839B7B5, DebugMenu_ControlEncounter }, + { Str_839B7C7, DebugMenu_PTime }, + { Str_839B7CD, DebugMenu_MakeItems }, + { Str_839B7D8, debug_sub_8091300 }, + { Str_839B7E2, DebugMenu_ViewPortraits }, + { Str_839B7F0, DebugMenu_TimeRecords }, + { Str_839B7FD, DebugMenu_SetTime }, + { Str_839B806, DebugMenu_NationalDex }, + { Str_839B821, DebugMenu_CreatePKMN }, + { Str_839B82B, DebugMenu_ViewPokemonGraphics }, + { Str_839B848, DebugMenu_BattleForDebug }, + { Str_839B859, DebugMenu_AllBadges }, + { Str_839B86C, DebugMenu_HoennNationalDex }, + { Str_839B87F, DebugMenu_SetRamBerry }, + { Str_839B88D, DebugMenu_UseHM }, + { Str_839B894, DebugMenu_OpenIwasawa }, + { Str_839B89C, DebugMenu_ToggleBGM }, + { Str_839B8A7, DebugMenu_OpenSizeComparison }, + { Str_839B8C9, DebugMenu_Safari }, + { Str_839B8D0, DebugMenu_RematchTrainers }, + { Str_839B8E1, DebugMenu_MiragaIslandRND }, + { Str_839B8F3, DebugMenu_HallOfFame }, + { Str_839B900, DebugMenu_OpenMysteryEvent }, + { Str_839B90E, DebugMenu_OpenLegendsRecord }, + { Str_839B91E, DebugMenu_OpenWeatherEvents }, + { Str_839B92D, DebugMenu_CellInfo }, + { Str_839B938, DebugMenu_CheckPKBLCK }, + { Str_839B944, DebugMenu_EffortValues }, + { Str_839B815, DebugMenu_HoennDex }, + { Str_839B83B, DebugMenu_OpenSeeTrainers }, + { Str_839B952, DebugMenu_OpenBerryInfo }, + { Str_839B95E, DebugMenu_BattleTowerStages }, + { Str_839B972, DebugMenu_EndSequenceDemo }, + { Str_839B984, DebugMenu_RandomNumberTest }, + { Str_839B997, DebugMenu_MeTooBackupMan }, + { Str_839B9A8, DebugMenu_OpenMurakawa }, + { Str_839B9B1, DebugMenu_OpenKiwa }, +}; + +const u8 gUnknown_Debug_839BB64[] = +{ + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x00, 0x0b, 0x0c, 0x0d, 0x0e, 0x1f, 0x12, 0x13, 0x00, 0x08, 0x09, 0x0a, 0x1e, 0x10, 0x24, 0x0f, 0x00, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x00, + 0x1c, 0x1d, 0x14, 0x20, 0x21, 0x22, 0x23, 0x00, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x00, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x00, 0x11, 0x33, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + +const u8 gUnknown_Debug_0839BBA4[] = _("Debugging Version"); +const u8 gUnknown_Debug_0839BBB6[] = _("{VERSION} Version"); +const u8 gUnknown_Debug_0839BBC1[] = _("Normal RTC compatible"); +const u8 Str_839BBD7[] = _("か の じっけん"); +const u8 Str_839BBE0[] = _("じっけん2"); +const u8 Str_839BBE6[] = _("BGじっけん"); +const u8 Str_839BBED[] = _("Battle"); +const u8 Str_839BBF4[] = _("つうしん じっけん"); +const u8 Str_839BBFE[] = _("LINK Test2"); +const u8 Str_839BC09[] = _("フィールド はじめる"); +const u8 Str_839BC14[] = _("フィールド つづき"); +const u8 Str_839BC1E[] = _("Sound test"); +const u8 Str_839BC29[] = _("{POKEBLOCK} test"); +const u8 Str_839BC34[] = _("Crash backup data"); +const u8 Str_839BC46[] = _("e-Card test"); +const u8 Str_839BC52[] = _("こうかんデモ   "); +const u8 Str_839BC5C[] = _("Time in game"); +const u8 Str_839BC69[] = _("フェスタ モード"); +const u8 Str_839BC72[] = _("Mimic e-Card"); +const u8 Str_839BC7F[] = _("RTC reset"); +const u8 Str_839BC89[] = _("Converter"); + +const struct MenuAction gUnknown_Debug_839BC94[] = +{ + { Str_839BBD7, DebugMenu_8076CBC }, + { Str_839BBE0, DebugMenu_8076CC0 }, + { Str_839BBE6, DebugMenu_8076CD4 }, + { Str_839BBED, DebugMenu_8076C6C }, + { Str_839BC29, DebugMenu_8076CD8 }, + { Str_839BBFE, DebugMenu_8076D28 }, + { Str_839BC1E, DebugMenu_8076D3C }, + { Str_839BC09, DebugMenu_8076C80 }, + { Str_839BC14, DebugMenu_8076C90 }, + { Str_839BC34, DebugMenu_8076D50 }, + { Str_839BC46, DebugMenu_8076CEC }, + { Str_839BC52, DebugMenu_8076D14 }, + { Str_839BC72, DebugMenu_8076D00 }, + { Str_839BC5C, DebugMenu_8076D5C }, + { Str_839BC7F, DebugMenu_8076E18 }, + { Str_839BC89, DebugMenu_8076EDC }, +}; + +// NOTE: When decompiling this file, I found out that having an extraneous extern +// in a C file can affect the generated asm. If this extern is commented out, +// debug_sub_8076BB4 will access the array differently and no longer match. +//extern const struct MenuAction gUnknown_Debug_839BC94[]; + +const u8 Str_839BD14[][10] = +{ + _("うかえ"), + _("おけこしすせそ"), +}; + +const u8 Str_839BD26[] = {2, 0, 0, 0}; // doesn't appear to be referenced + +const u8 Str_839BD2C[] = _("RTCを リセット します\n" + "Aで じっこう   Bでキャンセル"); + +const u8 Str_839BD4C[] = _("RTCを リセット した!"); + +const u8 Str_839BD5A[] = _("セーブデータを コンバートします\n" + "Aで けってい  Bで キャンセル"); + +const u8 Str_839BD7D[] = _("へんかんが しゅうりょう しました!"); + + +extern const u8 Str_839BD2C[]; +extern const u8 Str_839BD4C[]; __attribute__((unused)) static u8 gUnknown_030006B8[4]; __attribute__((unused)) static u8 gUnknown_030006BC[4]; __attribute__((unused)) static u8 gUnknown_030006C0; __attribute__((unused)) static u8 gUnknown_030006C1; -__attribute__((unused)) static void *gUnknown_030006C4; +static const u8 *gUnknown_030006C4; __attribute__((unused)) static u8 gUnknown_030006C8; -__attribute__((naked)) -void debug_sub_8076AC8() +void debug_sub_8076AC8(u8 a) { - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._3\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x1\n" - " ldr r0, ._3 + 4\n" - " add r1, r1, r0\n" - " str r1, [r2]\n" - " mov r4, #0x0\n" - " ldrb r0, [r1]\n" - " cmp r0, #0xff\n" - " beq ._1 @cond_branch\n" - "._2:\n" - " add r4, r4, #0x1\n" - " add r0, r1, r4\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " bne ._2 @cond_branch\n" - "._1:\n" - " mov r0, #0x10\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " lsl r3, r4, #0x1\n" - " add r3, r3, #0x1\n" - " lsl r3, r3, #0x18\n" - " lsr r3, r3, #0x18\n" - " mov r0, #0x10\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " bl Menu_DrawStdWindowFrame\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r3, ._3 + 8\n" - " ldr r0, ._3\n" - " ldr r0, [r0]\n" - " str r0, [sp]\n" - " mov r0, #0x11\n" - " mov r1, #0x1\n" - " add r2, r4, #0\n" - " bl Menu_PrintItemsReordered\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xc\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x11\n" - " mov r2, #0x1\n" - " add r3, r4, #0\n" - " bl InitMenu\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._4:\n" - " .align 2, 0\n" - "._3:\n" - " .word gUnknown_030006C4 \n" - " .word Str_839BD14\n" - " .word gUnknown_Debug_839BC94\n" - "\n" - ); + s32 r4; + + gUnknown_030006C4 = Str_839BD14[a]; + for (r4 = 0; gUnknown_030006C4[r4] != EOS; r4++) + ; + Menu_EraseWindowRect(16, 0, 29, 19); + Menu_DrawStdWindowFrame(16, 0, 29, r4 * 2 + 1); + Menu_PrintItemsReordered(17, 1, r4, (struct MenuAction2 *)gUnknown_Debug_839BC94, gUnknown_030006C4); + InitMenu(0, 17, 1, r4, 0, 12); } -__attribute__((naked)) -void debug_sub_8076B4C() +void debug_sub_8076B4C(void) { - asm( - " push {lr}\n" - " ldr r0, ._6\n" - " bl FindTaskIdByFunc\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0xff\n" - " beq ._5 @cond_branch\n" - " bl DestroyTask\n" - "._5:\n" - " pop {r0}\n" - " bx r0\n" - "._7:\n" - " .align 2, 0\n" - "._6:\n" - " .word debug_sub_8076BB4+1\n" - "\n" - ); + u8 taskId = FindTaskIdByFunc(debug_sub_8076BB4); + + if (taskId != 0xFF) + DestroyTask(taskId); } -__attribute__((naked)) -void debug_sub_8076B68() +// Initializes test menu +void debug_sub_8076B68(void) { - asm( - " push {lr}\n" - " ldr r0, ._8\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._8 + 4\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " ldr r0, ._8 + 8\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " mov r0, #0x4\n" - " mov r1, #0xb\n" - " bl debug_sub_8077CF4\n" - " mov r0, #0x0\n" - " bl debug_sub_8076AC8\n" - " ldr r0, ._8 + 12\n" - " mov r1, #0x1\n" - " bl CreateTask\n" - " pop {r0}\n" - " bx r0\n" - "._9:\n" - " .align 2, 0\n" - "._8:\n" - " .word gUnknown_Debug_0839BBB6\n" - " .word gUnknown_Debug_0839BBC1\n" - " .word gUnknown_Debug_0839BBA4\n" - " .word debug_sub_8076BB4+1\n" - "\n" - ); + Menu_PrintText(gUnknown_Debug_0839BBB6, 1, 1); + Menu_PrintText(gUnknown_Debug_0839BBC1, 1, 3); + Menu_PrintText(gUnknown_Debug_0839BBA4, 1, 9); + debug_sub_8077CF4(4, 11); + debug_sub_8076AC8(0); + CreateTask(debug_sub_8076BB4, 1); } -__attribute__((naked)) -void debug_sub_8076BB4() +// Handles input for the test menu +void debug_sub_8076BB4(u8 taskId) { - asm( - " push {r4, r5, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " ldr r0, ._13\n" - " add r5, r1, r0\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._10 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r4, r0\n" - " beq ._11 @cond_branch\n" - " ldr r2, ._13 + 4\n" - " lsl r1, r1, #0x18\n" - " asr r1, r1, #0x18\n" - " ldr r0, ._13 + 8\n" - " ldr r0, [r0]\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r2, r2, #0x4\n" - " add r0, r0, r2\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " b ._24\n" - "._14:\n" - " .align 2, 0\n" - "._13:\n" - " .word gTasks+0x8\n" - " .word gUnknown_Debug_839BC94\n" - " .word gUnknown_030006C4 \n" - "._10:\n" - " ldr r0, ._18\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r2, r0, #0x10\n" - " cmp r2, #0\n" - " beq ._15 @cond_branch\n" - " ldrh r1, [r5]\n" - " mov r2, #0x0\n" - " ldsh r0, [r5, r2]\n" - " cmp r0, #0\n" - " bne ._16 @cond_branch\n" - " mov r0, #0x1\n" - " b ._20\n" - "._19:\n" - " .align 2, 0\n" - "._18:\n" - " .word gMain\n" - "._16:\n" - " sub r0, r1, #1\n" - " b ._20\n" - "._15:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._24 @cond_branch\n" - " ldrh r1, [r5]\n" - " mov r3, #0x0\n" - " ldsh r0, [r5, r3]\n" - " cmp r0, #0x1\n" - " bne ._22 @cond_branch\n" - " strh r2, [r5]\n" - " b ._23\n" - "._22:\n" - " add r0, r1, #1\n" - "._20:\n" - " strh r0, [r5]\n" - "._23:\n" - " ldrb r0, [r5]\n" - " bl debug_sub_8076AC8\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " b ._24\n" - "._11:\n" - " bl DoSoftReset\n" - "._24:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); + s16 *data = gTasks[taskId].data; + s8 input = Menu_ProcessInput(); + s8 cursorPos = Menu_GetCursorPos(); + + switch (input) + { + default: + gUnknown_Debug_839BC94[gUnknown_030006C4[cursorPos]].func(); + break; + case -2: + if (gMain.newKeys & 0x20) + { + if (data[0] == 0) + data[0] = 1; + else + data[0]--; + debug_sub_8076AC8(data[0]); + PlaySE(SE_SELECT); + } + else if (gMain.newKeys & 0x10) + { + if (data[0] == 1) + data[0] = 0; + else + data[0]++; + debug_sub_8076AC8(data[0]); + PlaySE(SE_SELECT); + } + break; + case -1: + DoSoftReset(); + break; + } } -__attribute__((naked)) -void DebugMenu_8076C6C() +u8 DebugMenu_8076C6C(void) { - asm( - " push {lr}\n" - " ldr r0, ._25\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._26:\n" - " .align 2, 0\n" - "._25:\n" - " .word debug_sub_8010800+1\n" - "\n" - ); + SetMainCallback2(debug_sub_8010800); + return 0; } -__attribute__((naked)) -void DebugMenu_8076C80() +u8 DebugMenu_8076C80(void) { - asm( - " push {lr}\n" - " bl debug_sub_8076B4C\n" - " bl DebugMenu_8076FEC\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + debug_sub_8076B4C(); + DebugMenu_8076FEC(); + return 0; } -__attribute__((naked)) -void DebugMenu_8076C90() +u8 DebugMenu_8076C90(void) { - asm( - " push {lr}\n" - " ldr r0, ._29\n" - " ldrh r0, [r0]\n" - " cmp r0, #0xff\n" - " bne ._27 @cond_branch\n" - " mov r0, #0x16\n" - " bl PlaySE\n" - " b ._28\n" - "._30:\n" - " .align 2, 0\n" - "._29:\n" - " .word gSaveFileStatus\n" - "._27:\n" - " bl debug_sub_8076B4C\n" - " ldr r0, ._31\n" - " bl SetMainCallback2\n" - "._28:\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._32:\n" - " .align 2, 0\n" - "._31:\n" - " .word CB2_ContinueSavedGame+1\n" - "\n" - ); + if (gSaveFileStatus == SAVE_STATUS_ERROR) + { + PlaySE(0x16); + } + else + { + debug_sub_8076B4C(); + SetMainCallback2(CB2_ContinueSavedGame); + } + return 0; } -__attribute__((naked)) -void DebugMenu_8076CBC() +u8 DebugMenu_8076CBC(void) { - asm( - " mov r0, #0x0\n" - " bx lr\n" - "\n" - ); + return 0; } -__attribute__((naked)) -void DebugMenu_8076CC0() +u8 DebugMenu_8076CC0(void) { - asm( - " push {lr}\n" - " ldr r0, ._33\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._34:\n" - " .align 2, 0\n" - "._33:\n" - " .word debug_nullsub_66+1\n" - "\n" - ); + SetMainCallback2(debug_nullsub_66); + return 0; } -__attribute__((naked)) -void DebugMenu_8076CD4() +u8 DebugMenu_8076CD4(void) { - asm( - " mov r0, #0x0\n" - " bx lr\n" - "\n" - ); + return 0; } -__attribute__((naked)) -void DebugMenu_8076CD8() +u8 DebugMenu_8076CD8(void) { - asm( - " push {lr}\n" - " ldr r0, ._35\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._36:\n" - " .align 2, 0\n" - "._35:\n" - " .word unref_sub_80524BC+1\n" - "\n" - ); + SetMainCallback2(unref_sub_80524BC); + return 0; } -__attribute__((naked)) -void DebugMenu_8076CEC() +u8 DebugMenu_8076CEC(void) { - asm( - " push {lr}\n" - " ldr r0, ._37\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._38:\n" - " .align 2, 0\n" - "._37:\n" - " .word CB2_InitMysteryEventMenu+1\n" - "\n" - ); + SetMainCallback2(CB2_InitMysteryEventMenu); + return 0; } -__attribute__((naked)) -void DebugMenu_8076D00() +u8 DebugMenu_8076D00(void) { - asm( - " push {lr}\n" - " ldr r0, ._39\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._40:\n" - " .align 2, 0\n" - "._39:\n" - " .word debug_sub_815D15C+1\n" - "\n" - ); + SetMainCallback2(debug_sub_815D15C); + return 0; } -__attribute__((naked)) -void DebugMenu_8076D14() +u8 DebugMenu_8076D14(void) { - asm( - " push {lr}\n" - " ldr r0, ._41\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._42:\n" - " .align 2, 0\n" - "._41:\n" - " .word sub_804B790+1\n" - "\n" - ); + SetMainCallback2(sub_804B790); + return 0; } -__attribute__((naked)) -void DebugMenu_8076D28() +u8 DebugMenu_8076D28(void) { - asm( - " push {lr}\n" - " ldr r0, ._43\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._44:\n" - " .align 2, 0\n" - "._43:\n" - " .word LinkTestScreen+1\n" - "\n" - ); + SetMainCallback2(LinkTestScreen); + return 0; } -__attribute__((naked)) -void DebugMenu_8076D3C() +u8 DebugMenu_8076D3C(void) { - asm( - " push {lr}\n" - " ldr r0, ._45\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._46:\n" - " .align 2, 0\n" - "._45:\n" - " .word CB2_StartSoundCheckMenu+1\n" - "\n" - ); + SetMainCallback2(CB2_StartSoundCheckMenu); + return 0; } -__attribute__((naked)) -void DebugMenu_8076D50() +u8 DebugMenu_8076D50(void) { - asm( - " push {lr}\n" - " bl Save_EraseAllData\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + Save_EraseAllData(); + return 0; } -__attribute__((naked)) -void DebugMenu_8076D5C() +u8 DebugMenu_8076D5C(void) { - asm( - " push {lr}\n" - " bl debug_sub_8076B4C\n" - " bl debug_sub_806F8F8\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + debug_sub_8076B4C(); + debug_sub_806F8F8(); + return 0; } -__attribute__((naked)) -void DebugMenu_8076D6C() +void DebugMenu_8076D6C(u8 taskId) { - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " lsl r0, r3, #0x2\n" - " add r0, r0, r3\n" - " lsl r0, r0, #0x3\n" - " ldr r1, ._51\n" - " add r4, r0, r1\n" - " mov r0, #0x0\n" - " ldsh r1, [r4, r0]\n" - " cmp r1, #0x1\n" - " beq ._47 @cond_branch\n" - " cmp r1, #0x1\n" - " bgt ._48 @cond_branch\n" - " cmp r1, #0\n" - " beq ._49 @cond_branch\n" - " b ._64\n" - "._52:\n" - " .align 2, 0\n" - "._51:\n" - " .word gTasks+0x8\n" - "._48:\n" - " cmp r1, #0x2\n" - " beq ._53 @cond_branch\n" - " b ._64\n" - "._49:\n" - " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._56\n" - " mov r1, #0x2\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " b ._55\n" - "._57:\n" - " .align 2, 0\n" - "._56:\n" - " .word Str_839BD2C\n" - "._47:\n" - " ldr r0, ._60\n" - " ldrh r2, [r0, #0x2e]\n" - " and r1, r1, r2\n" - " cmp r1, #0\n" - " beq ._58 @cond_branch\n" - " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._60 + 4\n" - " mov r1, #0x2\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " mov r0, #0x49\n" - " bl PlaySE\n" - " bl RtcReset\n" - "._55:\n" - " ldrh r0, [r4]\n" - " add r0, r0, #0x1\n" - " strh r0, [r4]\n" - " b ._64\n" - "._61:\n" - " .align 2, 0\n" - "._60:\n" - " .word gMain\n" - " .word Str_839BD4C\n" - "._58:\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._64 @cond_branch\n" - " add r0, r3, #0\n" - " bl DestroyTask\n" - " bl DoSoftReset\n" - " b ._64\n" - "._53:\n" - " ldr r0, ._65\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._64 @cond_branch\n" - " add r0, r3, #0\n" - " bl DestroyTask\n" - " bl DoSoftReset\n" - "._64:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._66:\n" - " .align 2, 0\n" - "._65:\n" - " .word gMain\n" - "\n" - ); + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + Menu_DisplayDialogueFrame(); + Menu_PrintText(Str_839BD2C, 2, 15); + data[0]++; + break; + case 1: + if (gMain.newKeys & A_BUTTON) + { + Menu_DisplayDialogueFrame(); + Menu_PrintText(Str_839BD4C, 2, 15); + PlaySE(0x49); + RtcReset(); + data[0]++; + } + else if (gMain.newKeys & B_BUTTON) + { + DestroyTask(taskId); + DoSoftReset(); + } + break; + case 2: + if (gMain.newKeys & A_BUTTON) + { + DestroyTask(taskId); + DoSoftReset(); + } + break; + } } __attribute__((naked)) -void DebugMenu_8076E18() +u8 DebugMenu_8076E18() { asm( " push {lr}\n" @@ -692,7 +601,7 @@ void DebugMenu_8076E30() } __attribute__((naked)) -void DebugMenu_8076EDC() +u8 DebugMenu_8076EDC() { asm( " push {lr}\n" @@ -1321,7 +1230,7 @@ void DebugMenu_8077238() } __attribute__((naked)) -void DebugMenu_Exit() +u8 DebugMenu_Exit() { asm( " push {lr}\n" @@ -1334,7 +1243,7 @@ void DebugMenu_Exit() } __attribute__((naked)) -void DebugMenu_OpenSogabe() +u8 DebugMenu_OpenSogabe() { asm( " push {lr}\n" @@ -1348,7 +1257,7 @@ void DebugMenu_OpenSogabe() } __attribute__((naked)) -void DebugMenu_OpenTamada() +u8 DebugMenu_OpenTamada() { asm( " push {lr}\n" @@ -1362,7 +1271,7 @@ void DebugMenu_OpenTamada() } __attribute__((naked)) -void DebugMenu_OpenKagaya() +u8 DebugMenu_OpenKagaya() { asm( " push {lr}\n" @@ -1376,7 +1285,7 @@ void DebugMenu_OpenKagaya() } __attribute__((naked)) -void DebugMenu_OpenMatsuda() +u8 DebugMenu_OpenMatsuda() { asm( " push {lr}\n" @@ -1390,7 +1299,7 @@ void DebugMenu_OpenMatsuda() } __attribute__((naked)) -void DebugMenu_OpenNohara() +u8 DebugMenu_OpenNohara() { asm( " push {lr}\n" @@ -1404,7 +1313,7 @@ void DebugMenu_OpenNohara() } __attribute__((naked)) -void DebugMenu_OpenWatanabe() +u8 DebugMenu_OpenWatanabe() { asm( " push {lr}\n" @@ -1424,7 +1333,7 @@ void DebugMenu_OpenWatanabe() } __attribute__((naked)) -void DebugMenu_EndSequenceDemo() +u8 DebugMenu_EndSequenceDemo() { asm( " push {lr}\n" @@ -1444,7 +1353,7 @@ void DebugMenu_EndSequenceDemo() } __attribute__((naked)) -void DebugMenu_HallOfFame() +u8 DebugMenu_HallOfFame() { asm( " push {lr}\n" @@ -1459,7 +1368,7 @@ void DebugMenu_HallOfFame() } __attribute__((naked)) -void DebugMenu_OpenSizeComparison() +u8 DebugMenu_OpenSizeComparison() { asm( " push {lr}\n" @@ -1474,7 +1383,7 @@ void DebugMenu_OpenSizeComparison() } __attribute__((naked)) -void DebugMenu_HoennNationalDex() +u8 DebugMenu_HoennNationalDex() { asm( " push {lr}\n" @@ -1495,7 +1404,7 @@ void DebugMenu_HoennNationalDex() } __attribute__((naked)) -void DebugMenu_8077434() +u8 DebugMenu_8077434() { asm( " push {lr}\n" @@ -1613,7 +1522,7 @@ void DebugMenu_8077434() } __attribute__((naked)) -void DebugMenu_807750C() +u8 DebugMenu_807750C() { asm( " push {lr}\n" @@ -1632,7 +1541,7 @@ void DebugMenu_807750C() } __attribute__((naked)) -void DebugMenu_SetRamBerry() +u8 DebugMenu_SetRamBerry() { asm( " push {lr}\n" @@ -1657,7 +1566,7 @@ void DebugMenu_SetRamBerry() } __attribute__((naked)) -void DebugMenu_ToggleBGM() +u8 DebugMenu_ToggleBGM() { asm( " push {lr}\n" @@ -1682,7 +1591,7 @@ void DebugMenu_ToggleBGM() } __attribute__((naked)) -void DebugMenu_BattleForDebug() +u8 DebugMenu_BattleForDebug() { asm( " push {lr}\n" @@ -1697,7 +1606,7 @@ void DebugMenu_BattleForDebug() } __attribute__((naked)) -void DebugMenu_NationalDex() +u8 DebugMenu_NationalDex() { asm( " push {r4, r5, lr}\n" @@ -1733,7 +1642,7 @@ void DebugMenu_NationalDex() } __attribute__((naked)) -void DebugMenu_HoennDex() +u8 DebugMenu_HoennDex() { asm( " push {r4, r5, lr}\n" @@ -1772,7 +1681,7 @@ void DebugMenu_HoennDex() } __attribute__((naked)) -void DebugMenu_CreatePKMN() +u8 DebugMenu_CreatePKMN() { asm( " push {lr}\n" @@ -1787,7 +1696,7 @@ void DebugMenu_CreatePKMN() } __attribute__((naked)) -void DebugMenu_ViewPokemonGraphics() +u8 DebugMenu_ViewPokemonGraphics() { asm( " push {lr}\n" @@ -1802,7 +1711,7 @@ void DebugMenu_ViewPokemonGraphics() } __attribute__((naked)) -void DebugMenu_OpenSeeTrainers() +u8 DebugMenu_OpenSeeTrainers() { asm( " push {lr}\n" @@ -1817,7 +1726,7 @@ void DebugMenu_OpenSeeTrainers() } __attribute__((naked)) -void DebugMenu_OpenMori() +u8 DebugMenu_OpenMori() { asm( " push {lr}\n" @@ -1831,7 +1740,7 @@ void DebugMenu_OpenMori() } __attribute__((naked)) -void DebugMenu_OpenTomomichi() +u8 DebugMenu_OpenTomomichi() { asm( " push {lr}\n" @@ -1845,7 +1754,7 @@ void DebugMenu_OpenTomomichi() } __attribute__((naked)) -void DebugMenu_OpenAoki() +u8 DebugMenu_OpenAoki() { asm( " push {lr}\n" @@ -1858,7 +1767,7 @@ void DebugMenu_OpenAoki() } __attribute__((naked)) -void DebugMenu_OpenTaya() +u8 DebugMenu_OpenTaya() { asm( " push {lr}\n" @@ -1872,7 +1781,7 @@ void DebugMenu_OpenTaya() } __attribute__((naked)) -void DebugMenu_OpenNakamura() +u8 DebugMenu_OpenNakamura() { asm( " push {lr}\n" @@ -1886,7 +1795,7 @@ void DebugMenu_OpenNakamura() } __attribute__((naked)) -void DebugMenu_OpenIwasawa() +u8 DebugMenu_OpenIwasawa() { asm( " push {lr}\n" @@ -1900,7 +1809,7 @@ void DebugMenu_OpenIwasawa() } __attribute__((naked)) -void DebugMenu_Teleport() +u8 DebugMenu_Teleport() { asm( " push {lr}\n" @@ -1916,7 +1825,7 @@ void DebugMenu_Teleport() } __attribute__((naked)) -void DebugMenu_EditPKMN() +u8 DebugMenu_EditPKMN() { asm( " push {lr}\n" @@ -2023,7 +1932,7 @@ void DebugMenu_8077704() } __attribute__((naked)) -void DebugMenu_8077760() +u8 DebugMenu_8077760() { asm( " push {r4, r5, lr}\n" @@ -2139,7 +2048,7 @@ void DebugMenu_8077760() } __attribute__((naked)) -void DebugMenu_SwitchBG() +u8 DebugMenu_SwitchBG() { asm( " push {lr}\n" @@ -2257,7 +2166,7 @@ void DebugMenu_80778A8() } __attribute__((naked)) -void DebugMenu_ControlEncounter() +u8 DebugMenu_ControlEncounter() { asm( " push {lr}\n" @@ -2282,7 +2191,7 @@ void DebugMenu_ControlEncounter() } __attribute__((naked)) -void DebugMenu_UseHM() +u8 DebugMenu_UseHM() { asm( " ldr r1, ._215\n" @@ -2501,7 +2410,7 @@ void DebugMenu_8077A60() } __attribute__((naked)) -void DebugMenu_RematchTrainers() +u8 DebugMenu_RematchTrainers() { asm( " push {lr}\n" @@ -2664,7 +2573,7 @@ void DebugMenu_8077B3C() } __attribute__((naked)) -void DebugMenu_Safari() +u8 DebugMenu_Safari() { asm( " push {lr}\n" @@ -3202,7 +3111,7 @@ void DebugMenu_8077E40() } __attribute__((naked)) -void DebugMenu_MakeItems() +u8 DebugMenu_MakeItems() { asm( " push {lr}\n" @@ -3721,7 +3630,7 @@ void DebugMenu_80781A8() } __attribute__((naked)) -void DebugMenu_ViewPortraits() +u8 DebugMenu_ViewPortraits() { asm( " push {lr}\n" @@ -3754,7 +3663,7 @@ void DebugMenu_8078254() } __attribute__((naked)) -void DebugMenu_AllBadges() +u8 DebugMenu_AllBadges() { asm( " push {lr}\n" @@ -3794,7 +3703,7 @@ void DebugMenu_AllBadges() } __attribute__((naked)) -void DebugMenu_TimeRecords() +u8 DebugMenu_TimeRecords() { asm( " push {lr}\n" @@ -3815,7 +3724,7 @@ void DebugMenu_TimeRecords() } __attribute__((naked)) -void DebugMenu_SetTime() +u8 DebugMenu_SetTime() { asm( " push {lr}\n" @@ -3943,7 +3852,7 @@ void DebugMenu_8078310() } __attribute__((naked)) -void DebugMenu_MiragaIslandRND() +u8 DebugMenu_MiragaIslandRND() { asm( " push {lr}\n" @@ -4027,7 +3936,7 @@ void DebugMenu_80783C8() } __attribute__((naked)) -void DebugMenu_ToggleClearFlag() +u8 DebugMenu_ToggleClearFlag() { asm( " push {lr}\n" @@ -4106,7 +4015,7 @@ void DebugMenu_8078464() } __attribute__((naked)) -void DebugMenu_OpenWeatherEvents() +u8 DebugMenu_OpenWeatherEvents() { asm( " push {lr}\n" @@ -4177,7 +4086,7 @@ void DebugMenu_80784E8() } __attribute__((naked)) -void DebugMenu_OpenMysteryEvent() +u8 DebugMenu_OpenMysteryEvent() { asm( " push {lr}\n" @@ -4596,7 +4505,7 @@ void DebugMenu_80787B0() } __attribute__((naked)) -void DebugMenu_OpenLegendsRecord() +u8 DebugMenu_OpenLegendsRecord() { asm( " push {lr}\n" @@ -4761,7 +4670,7 @@ void DebugMenu_8078880() } __attribute__((naked)) -void DebugMenu_CellInfo() +u8 DebugMenu_CellInfo() { asm( " push {lr}\n" @@ -4783,7 +4692,7 @@ void DebugMenu_CellInfo() } __attribute__((naked)) -void DebugMenu_OpenBerryInfo() +u8 DebugMenu_OpenBerryInfo() { asm( " push {r4, lr}\n" @@ -5135,7 +5044,7 @@ void DebugMenu_8078B38() } __attribute__((naked)) -void DebugMenu_BattleTowerStages() +u8 DebugMenu_BattleTowerStages() { asm( " push {lr}\n" @@ -5300,7 +5209,7 @@ void DebugMenu_8078BD4() } __attribute__((naked)) -void DebugMenu_CheckPKBLCK() +u8 DebugMenu_CheckPKBLCK() { asm( " push {lr}\n" @@ -5525,7 +5434,7 @@ void DebugMenu_8078DA4() } __attribute__((naked)) -void DebugMenu_MeTooBackupMan() +u8 DebugMenu_MeTooBackupMan() { asm( " push {lr}\n" @@ -5911,7 +5820,7 @@ void DebugMenu_8079020() } __attribute__((naked)) -void DebugMenu_PTime() +u8 DebugMenu_PTime() { asm( " push {lr}\n" @@ -6026,7 +5935,7 @@ void DebugMenu_8079058() } __attribute__((naked)) -void DebugMenu_OpenMurakawa() +u8 DebugMenu_OpenMurakawa() { asm( " push {lr}\n" @@ -6120,7 +6029,7 @@ void DebugMenu_8079110() } __attribute__((naked)) -void DebugMenu_OpenKiwa() +u8 DebugMenu_OpenKiwa() { asm( " push {lr}\n" -- cgit v1.2.3 From 3f92436f0382d1cbab019e05833702c04c3e9cc8 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 20:56:35 -0600 Subject: remove temporary files --- undefined.txt | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 undefined.txt diff --git a/undefined.txt b/undefined.txt deleted file mode 100644 index bd7c98f0f..000000000 --- a/undefined.txt +++ /dev/null @@ -1,29 +0,0 @@ -(.text+0x120): undefined reference to `gUnknown_02023A14_50' -(.text+0x124): undefined reference to `ewram' -(.text+0x5168): undefined reference to `gMoveHitWith' -(.text+0x5178): undefined reference to `gLockedMove' -(.text+0x518c): undefined reference to `gSideTimer' -(.text+0x4c): undefined reference to `gUnknown_Debug_03004BC0' -(.text+0x39c): undefined reference to `gUnknown_Debug_03004BC0' -(.text+0x4d0): undefined reference to `gUnknown_Debug_03004BC0' -(.text+0x660): undefined reference to `gUnknown_Debug_03004BC0' -(.text+0xd4c): undefined reference to `gUnknown_Debug_03004BC0' -(.text+0x1f0): undefined reference to `SetEReaderTrainerChecksum' -(.text+0x25c8): undefined reference to `gUnknown_Debug_03004BD0' -(.text+0x2608): undefined reference to `gUnknown_Debug_03004BD0' -(.text+0x2628): undefined reference to `gUnknown_Debug_03004BD0' -(.text+0x12ac): undefined reference to `unk_3004E98' -(.text+0x12e4): undefined reference to `unk_3004E94' -(.text+0x11b4): undefined reference to `unk_2038790' -(.text+0x11cc): undefined reference to `unk_2038794' -(.text+0x11d0): undefined reference to `unk_2038798' -(.text+0x1210): undefined reference to `unk_2038798' -(.text+0x1230): undefined reference to `unk_2038794' -(.text_8098A38+0x40b4): undefined reference to `unk_2038790' -(.text+0x6c0): undefined reference to `gUnknown_Debug_083EBC68' -(.text+0x1398): undefined reference to `gUnknown_02023A14_50' -(.text+0x1410): undefined reference to `gUnknown_02023A14_50' -(.text+0x5f4): undefined reference to `gScriptFuncs_End' -(.text+0x17c0): undefined reference to `gOtherText_FiveQuestions' -(.text+0x1ac0): undefined reference to `gContestStatsText_Tasty' -(.text+0x1c74): undefined reference to `gOtherText_Slash' -- cgit v1.2.3 From 6437a2acd5b662db779352c24f34116852a1c605 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 21:44:01 -0600 Subject: decompile kagaya_debug_menu.c --- include/region_map.h | 1 + include/slot_machine.h | 1 + include/trainer_card.h | 2 + src/debug/kagaya_debug_menu.c | 497 +++++++++++------------------------------- src/field/slot_machine.c | 50 +---- 5 files changed, 141 insertions(+), 410 deletions(-) diff --git a/include/region_map.h b/include/region_map.h index 254307052..e7a357fe2 100644 --- a/include/region_map.h +++ b/include/region_map.h @@ -68,5 +68,6 @@ void CreateRegionMapPlayerIcon(u16, u16); const u8 *GetMapSectionName(u8 *dest, u16 mapSectionId, u16 length); const u8 *CopyMapName(u8 *dest, u16 b); const u8 *CopyLocationName(u8 *dest, u16 b); +void CB2_InitFlyRegionMap(void); #endif // GUARD_REGION_MAP_H diff --git a/include/slot_machine.h b/include/slot_machine.h index f886d9239..7759ca1b2 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -75,5 +75,6 @@ struct SlotMachineEwramStruct { void PlaySlotMachine(u8 arg0, MainCallback cb); void sub_8104DA4(void); u8 sub_8105BB4(u8 templateIdx, u8 cbAndCoordsIdx, s16 a2); +void debug_sub_811609C(u8, void (*)(void)); #endif // GUARD_SLOT_MACHINE_H diff --git a/include/trainer_card.h b/include/trainer_card.h index 7ea1d9fc0..28cabbd09 100644 --- a/include/trainer_card.h +++ b/include/trainer_card.h @@ -32,6 +32,8 @@ void TrainerCard_ShowPlayerCard(void (*)(void)); void TrainerCard_ShowLinkCard(u8, void (*)(void)); void TrainerCard_GenerateCardForPlayer(struct TrainerCard *); u8 sub_80934C4(u8 id); +void debug_sub_80A0710(void (*)(void)); +void debug_sub_80A073C(void (*)(void)); extern struct TrainerCard gTrainerCards[4]; diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 53e3fac1a..89df82f04 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -1,420 +1,183 @@ #if DEBUG + #include "global.h" +#include "field_effect.h" +#include "field_control_avatar.h" +#include "field_player_avatar.h" +#include "main.h" #include "menu.h" - -u8 KagayaDebugMenu_TrainerCard(); -u8 KagayaDebugMenu_CardToExchange(); -u8 KagayaDebugMenu_SlotMachine(); +#include "overworld.h" +#include "palette.h" +#include "random.h" +#include "region_map.h" +#include "script.h" +#include "slot_machine.h" +#include "trainer_card.h" + +extern u8 (*gMenuCallback)(void); + +void InitKagayaDebugMenu_B(void); +u8 debug_sub_80B061C(void); +u8 KagayaDebugMenu_TrainerCard(void); +u8 debug_sub_80B068C(void); +u8 KagayaDebugMenu_CardToExchange(void); +u8 debug_sub_80B06E0(void); +u8 KagayaDebugMenu_SlotMachine(void); +u8 Kagaya_80B0734(void); +u8 debug_sub_80B07DC(void); const u8 Str_83EBB34[] = _("Trainer’s card"); const u8 Str_83EBB43[] = _("Card to exchange"); const u8 Str_83EBB54[] = _("Slot machine"); -const struct MenuAction _83EBB64[] = { +const struct MenuAction _83EBB64[] = +{ { Str_83EBB34, KagayaDebugMenu_TrainerCard }, { Str_83EBB43, KagayaDebugMenu_CardToExchange }, { Str_83EBB54, KagayaDebugMenu_SlotMachine }, }; -__attribute__((naked)) -void InitKagayaDebugMenu_A() +u8 InitKagayaDebugMenu_A(void) { - asm( - " push {lr}\n" - " bl InitKagayaDebugMenu_B\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + InitKagayaDebugMenu_B(); + return 0; } -__attribute__((naked)) -void InitKagayaDebugMenu_B() +void InitKagayaDebugMenu_B(void) { - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xe\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._1\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xd\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x3\n" - " bl InitMenu\n" - " ldr r1, ._1 + 4\n" - " ldr r0, ._1 + 8\n" - " str r0, [r1]\n" - " add sp, sp, #0x8\n" - " pop {r0}\n" - " bx r0\n" - "._2:\n" - " .align 2, 0\n" - "._1:\n" - " .word _83EBB64\n" - " .word gMenuCallback\n" - " .word debug_sub_80B061C+1\n" - "\n" - ); + Menu_EraseScreen(); + Menu_DrawStdWindowFrame(0, 0, 14, 7); + Menu_PrintItems(2, 1, 3, _83EBB64); + InitMenu(0, 1, 1, 3, 0, 13); + gMenuCallback = debug_sub_80B061C; } -__attribute__((naked)) -void debug_sub_80B061C() +u8 debug_sub_80B061C(void) { - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._3 @cond_branch\n" - " mov r0, #0x0\n" - " b ._6\n" - "._3:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._5 @cond_branch\n" - " ldr r2, ._7\n" - " ldr r0, ._7 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._6\n" - "._8:\n" - " .align 2, 0\n" - "._7:\n" - " .word gMenuCallback\n" - " .word _83EBB64\n" - "._5:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._6:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + s8 input = Menu_ProcessInput(); + + if (input == -2) + { + return 0; + } + else if (input == -1) + { + CloseMenu(); + return 1; + } + else + { + gMenuCallback = _83EBB64[input].func; + return 0; + } } -__attribute__((naked)) -u8 KagayaDebugMenu_TrainerCard() +u8 KagayaDebugMenu_TrainerCard(void) { - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._9\n" - " ldr r0, ._9 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._10:\n" - " .align 2, 0\n" - "._9:\n" - " .word gMenuCallback\n" - " .word debug_sub_80B068C+1\n" - "\n" - ); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gMenuCallback = debug_sub_80B068C; + return 0; } -__attribute__((naked)) -void debug_sub_80B068C() +u8 debug_sub_80B068C(void) { - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._11 @cond_branch\n" - " mov r0, #0x0\n" - " b ._12\n" - "._11:\n" - " ldr r0, ._13\n" - " bl debug_sub_80A0710\n" - " bl CloseMenu\n" - " bl ScriptContext2_Enable\n" - " mov r0, #0x1\n" - "._12:\n" - " pop {r1}\n" - " bx r1\n" - "._14:\n" - " .align 2, 0\n" - "._13:\n" - " .word sub_805469C+1\n" - "\n" - ); + if (!UpdatePaletteFade()) + { + debug_sub_80A0710(sub_805469C); + CloseMenu(); + ScriptContext2_Enable(); + return 1; + } + return 0; } -__attribute__((naked)) -u8 KagayaDebugMenu_CardToExchange() +u8 KagayaDebugMenu_CardToExchange(void) { - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._15\n" - " ldr r0, ._15 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._16:\n" - " .align 2, 0\n" - "._15:\n" - " .word gMenuCallback\n" - " .word debug_sub_80B06E0+1\n" - "\n" - ); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gMenuCallback = debug_sub_80B06E0; + return 0; } -__attribute__((naked)) -void debug_sub_80B06E0() +u8 debug_sub_80B06E0(void) { - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._17 @cond_branch\n" - " mov r0, #0x0\n" - " b ._18\n" - "._17:\n" - " ldr r0, ._19\n" - " bl debug_sub_80A073C\n" - " bl CloseMenu\n" - " bl ScriptContext2_Enable\n" - " mov r0, #0x1\n" - "._18:\n" - " pop {r1}\n" - " bx r1\n" - "._20:\n" - " .align 2, 0\n" - "._19:\n" - " .word sub_805469C+1\n" - "\n" - ); + if (!UpdatePaletteFade()) + { + debug_sub_80A073C(sub_805469C); + CloseMenu(); + ScriptContext2_Enable(); + return 1; + } + return 0; } -__attribute__((naked)) -u8 KagayaDebugMenu_SlotMachine() +u8 KagayaDebugMenu_SlotMachine(void) { - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._21\n" - " ldr r0, ._21 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._22:\n" - " .align 2, 0\n" - "._21:\n" - " .word gMenuCallback\n" - " .word Kagaya_80B0734+1\n" - "\n" - ); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gMenuCallback = Kagaya_80B0734; + return 0; } -__attribute__((naked)) -void Kagaya_80B0734() +u8 Kagaya_80B0734(void) { - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._23 @cond_branch\n" - " mov r0, #0x0\n" - " b ._24\n" - "._23:\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._25\n" - " bl debug_sub_811609C\n" - " bl CloseMenu\n" - " bl ScriptContext2_Enable\n" - " mov r0, #0x1\n" - "._24:\n" - " pop {r1}\n" - " bx r1\n" - "._26:\n" - " .align 2, 0\n" - "._25:\n" - " .word sub_805469C+1\n" - "\n" - ); + if (!UpdatePaletteFade()) + { + debug_sub_811609C(Random() % 6, sub_805469C); + CloseMenu(); + ScriptContext2_Enable(); + return 1; + } + return 0; } -__attribute__((naked)) -void debug_sub_80B0770() +u8 debug_sub_80B0770(void) { - asm( - " push {r4, lr}\n" - " ldr r0, ._30\n" - " ldrb r1, [r0]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0\n" - " bne ._27 @cond_branch\n" - " bl CloseMenu\n" - " bl IsPlayerFacingSurfableFishableWater\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._29 @cond_branch\n" - " ldr r0, ._30 + 4\n" - " str r4, [r0]\n" - " mov r0, #0x9\n" - " bl FieldEffectStart\n" - " b ._29\n" - "._31:\n" - " .align 2, 0\n" - "._30:\n" - " .word gPlayerAvatar\n" - " .word gFieldEffectArguments\n" - "._27:\n" - " bl CloseMenu\n" - "._29:\n" - " mov r0, #0x1\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + if (!(gPlayerAvatar.flags & 8)) + { + CloseMenu(); + if (IsPlayerFacingSurfableFishableWater()) + { + gFieldEffectArguments[0] = 0; + FieldEffectStart(9); + } + } + else + { + CloseMenu(); + } + return 1; } -__attribute__((naked)) -void debug_sub_80B07B0() +u8 debug_sub_80B07B0(void) { - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._32\n" - " ldr r0, ._32 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._33:\n" - " .align 2, 0\n" - "._32:\n" - " .word gMenuCallback\n" - " .word debug_sub_80B07DC+1\n" - "\n" - ); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gMenuCallback = debug_sub_80B07DC; + return 0; } -__attribute__((naked)) -void debug_sub_80B07DC() +u8 debug_sub_80B07DC(void) { - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._34 @cond_branch\n" - " mov r0, #0x0\n" - " b ._35\n" - "._34:\n" - " bl CloseMenu\n" - " ldr r0, ._36\n" - " bl SetMainCallback2\n" - " mov r0, #0x1\n" - "._35:\n" - " pop {r1}\n" - " bx r1\n" - "._37:\n" - " .align 2, 0\n" - "._36:\n" - " .word CB2_InitFlyRegionMap+1\n" - "\n" - ); + if (!UpdatePaletteFade()) + { + CloseMenu(); + SetMainCallback2(CB2_InitFlyRegionMap); + return 1; + } + return 0; } -__attribute__((naked)) -void debug_sub_80B0800() +u8 debug_sub_80B0800(void) { - asm( - " push {lr}\n" - " bl CloseMenu\n" - " bl sub_8068F18\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0\n" - " beq ._38 @cond_branch\n" - " ldr r0, ._39\n" - " mov r1, #0x0\n" - " str r1, [r0]\n" - " sub r1, r2, #1\n" - " str r1, [r0, #0x4]\n" - " mov r0, #0x2c\n" - " bl FieldEffectStart\n" - "._38:\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._40:\n" - " .align 2, 0\n" - "._39:\n" - " .word gFieldEffectArguments\n" - "\n" - ); + u8 r2; + + CloseMenu(); + r2 = sub_8068F18(); + if (r2 != 0) + { + gFieldEffectArguments[0] = 0; + gFieldEffectArguments[1] = r2 - 1; + FieldEffectStart(0x2C); + } + return 1; } #endif // DEBUG diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 99770f6e3..0d4ebe3f0 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -242,57 +242,21 @@ static const u8 gUnknown_083ECE3A[]; static const u16 gUnknown_083ECE42[]; static const u16 gUnknown_083ECE48[]; -#if DEBUG -__attribute__((naked)) -void PlaySlotMachine(u8 arg0, MainCallback cb) -{ - asm("\ - push {lr}\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - ldr r3, ._1\n\ - mov r2, #0x0\n\ - strb r2, [r3]\n\ - bl PlaySlotMachine_Internal\n\ - ldr r0, ._1 + 4\n\ - bl SetMainCallback2\n\ - pop {r0}\n\ - bx r0\n\ -._2:\n\ - .align 2, 0\n\ -._1:\n\ - .word unk_debug_bss_1_1\n\ - .word CB2_SlotMachineSetup+1"); -} -#else void PlaySlotMachine(u8 arg0, MainCallback cb) { +#if DEBUG + unk_debug_bss_1_1 = 0; +#endif PlaySlotMachine_Internal(arg0, cb); SetMainCallback2(CB2_SlotMachineSetup); } -#endif #if DEBUG -__attribute__((naked)) -void debug_sub_811609C() +void debug_sub_811609C(u8 a, void (*func)(void)) { - asm("\ - push {lr}\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - ldr r3, ._3\n\ - mov r2, #0x1\n\ - strb r2, [r3]\n\ - bl PlaySlotMachine_Internal\n\ - ldr r0, ._3 + 4\n\ - bl SetMainCallback2\n\ - pop {r0}\n\ - bx r0\n\ -._4:\n\ - .align 2, 0\n\ -._3:\n\ - .word unk_debug_bss_1_1\n\ - .word CB2_SlotMachineSetup+1"); + unk_debug_bss_1_1 = 1; + PlaySlotMachine_Internal(a, func); + SetMainCallback2(CB2_SlotMachineSetup); } #endif -- cgit v1.2.3 From 8cfc82726a0712e8c86d30294cee6506c1f0dc97 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 22:36:44 -0600 Subject: move undecompiled debug menu code to asm --- asm/nakamura_debug_menu.s | 4686 ++++++++++++++++++ asm/nohara_debug_menu.s | 2198 +++++++++ asm/taya_debug_window.s | 2054 ++++++++ asm/tomomichi_debug_menu.s | 8100 +++++++++++++++++++++++++++++++ asm/unk_debug_menu_3.s | 747 +++ asm/watanabe_debug_menu.s | 9578 +++++++++++++++++++++++++++++++++++++ ld_script.txt | 7 +- src/debug/kagaya_debug_menu.c | 2 +- src/debug/nakamura_debug_menu.c | 4859 +------------------ src/debug/nohara_debug_menu.c | 2310 +-------- src/debug/taya_debug_window.c | 2116 -------- src/debug/tomomichi_debug_menu.c | 8635 --------------------------------- src/debug/unk_debug_menu_3.c | 804 ---- src/debug/watanabe_debug_menu.c | 9838 -------------------------------------- 14 files changed, 27376 insertions(+), 28558 deletions(-) create mode 100644 asm/nakamura_debug_menu.s create mode 100644 asm/nohara_debug_menu.s create mode 100644 asm/taya_debug_window.s create mode 100644 asm/tomomichi_debug_menu.s create mode 100644 asm/unk_debug_menu_3.s create mode 100644 asm/watanabe_debug_menu.s delete mode 100644 src/debug/unk_debug_menu_3.c diff --git a/asm/nakamura_debug_menu.s b/asm/nakamura_debug_menu.s new file mode 100644 index 000000000..2ef359b48 --- /dev/null +++ b/asm/nakamura_debug_menu.s @@ -0,0 +1,4686 @@ +.if DEBUG + + .include "constants/gba_constants.inc" + .include "include/macros.inc" + + .text + + thumb_func_start debug_sub_815F1B8 +debug_sub_815F1B8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0xe + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._1 + mov r0, #0x10 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0xe + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0xf + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + add sp, sp, #0x8 + pop {r0} + bx r0 +._2: + .align 2, 0 +._1: + .word _843E3DC + + thumb_func_end debug_sub_815F1B8 + + thumb_func_start InitNakamuraDebugMenu +InitNakamuraDebugMenu: + push {lr} + bl debug_sub_815F1B8 + ldr r1, ._3 + ldr r0, ._3 + 4 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._4: + .align 2, 0 +._3: + .word gMenuCallback + .word debug_sub_815F214+1 + + thumb_func_end InitNakamuraDebugMenu + + thumb_func_start debug_sub_815F214 +debug_sub_815F214: + push {r4, lr} + ldr r4, ._9 + ldrh r1, [r4, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._5 @cond_branch + mov r0, #0x1 + neg r0, r0 + bl Menu_MoveCursor +._5: + ldrh r1, [r4, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._6 @cond_branch + mov r0, #0x1 + bl Menu_MoveCursor +._6: + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._7 @cond_branch + ldr r4, ._9 + 4 + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + lsr r0, r0, #0x15 + add r4, r4, #0x4 + add r0, r0, r4 + ldr r4, [r0] + bl Menu_DestroyCursor + bl _call_via_r4 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._12 +._10: + .align 2, 0 +._9: + .word gMain + .word _843E3DC +._7: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + bne ._11 @cond_branch + mov r0, #0x0 + b ._12 +._11: + bl CloseMenu + mov r0, #0x1 +._12: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_815F214 + + thumb_func_start debug_sub_815F284 +debug_sub_815F284: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r0, ._14 + ldrb r1, [r0, #0x7] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + bne ._13 @cond_branch + bl debug_sub_81381B4 + mov r0, #0x5 + mov r1, #0x0 + bl OpenPartyMenu + add r0, r4, #0 + bl DestroyTask +._13: + pop {r4} + pop {r0} + bx r0 +._15: + .align 2, 0 +._14: + .word gPaletteFade + + thumb_func_end debug_sub_815F284 + + thumb_func_start debug_sub_815F2B4 +debug_sub_815F2B4: + push {lr} + add sp, sp, #0xfffffffc + bl CloseMenu + bl Menu_EraseScreen + ldr r1, ._16 + ldr r0, ._16 + 4 + str r0, [r1, #0x8] + ldr r0, ._16 + 8 + mov r1, #0x0 + bl CreateTask + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + mov r0, #0x1 + add sp, sp, #0x4 + pop {r1} + bx r1 +._17: + .align 2, 0 +._16: + .word gMain + .word sub_805469C+1 + .word debug_sub_815F284+1 + + thumb_func_end debug_sub_815F2B4 + + thumb_func_start debug_sub_815F2F4 +debug_sub_815F2F4: + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xfffffffc + bl CloseMenu + mov r7, #0x1 +._34: + lsl r1, r7, #0x2 + add r0, r1, r7 + lsl r2, r0, #0x5 + ldr r3, ._24 + add r0, r2, r3 + ldr r5, ._24 + 4 + add r0, r0, r5 + ldrb r0, [r0] + mov r9, r1 + add r1, r7, #1 + str r1, [sp] + cmp r0, #0 + beq ._18 @cond_branch + b ._19 +._18: + mov r5, #0x0 + ldr r6, ._24 + 8 + add r4, r7, #0 + sub r4, r4, #0x46 + ldr r3, ._24 + 12 +._21: + add r1, r5, r2 + add r1, r1, r3 + add r0, r5, r6 + ldrb r0, [r0] + strb r0, [r1] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0xff + beq ._20 @cond_branch + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x6 + bls ._21 @cond_branch +._20: + cmp r5, #0x7 + bne ._22 @cond_branch + add r0, r2, #6 + b ._23 +._25: + .align 2, 0 +._24: + .word gSaveBlock1 + .word 0x1a08 + .word gSaveBlock2 + .word gSaveBlock1+0x1a0a +._22: + add r0, r5, r2 +._23: + add r0, r0, r3 + strb r4, [r0] + ldr r1, ._35 + ldr r2, ._35 + 4 + add r2, r2, r1 + mov sl, r2 + mov r3, r9 + add r0, r3, r7 + lsl r6, r0, #0x5 + add r1, r6, r1 + ldr r5, ._35 + 4 + add r5, r5, r1 + mov r8, r5 +._30: + bl Random + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0x4b + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0xe + ldr r1, ._35 + 8 + add r0, r0, r1 + ldrb r0, [r0] + mov r2, r8 + strb r0, [r2] + mov r5, #0x0 + cmp r5, r7 + bcs ._28 @cond_branch + mov r3, sl + ldrb r3, [r3] + cmp r0, r3 + beq ._28 @cond_branch + ldr r4, ._35 + add r0, r6, r4 + ldr r2, ._35 + 4 + add r3, r0, r2 +._29: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r7 + bcs ._28 @cond_branch + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x5 + add r0, r0, r4 + add r0, r0, r2 + ldrb r1, [r3] + ldrb r0, [r0] + cmp r1, r0 + bne ._29 @cond_branch +._28: + cmp r5, r7 + bne ._30 @cond_branch + bl Random + mov r5, r9 + add r4, r5, r7 + lsl r4, r4, #0x5 + ldr r1, ._35 + add r3, r4, r1 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0x1 + ldr r2, ._35 + 12 + add r3, r3, r2 + and r0, r0, r1 + lsl r0, r0, #0x4 + ldrb r1, [r3] + mov r5, #0x11 + neg r5, r5 + add r2, r5, #0 + and r1, r1, r2 + orr r1, r1, r0 + strb r1, [r3] + mov r5, #0x0 + ldr r6, ._35 + 16 +._31: + bl Random + add r1, r5, r4 + add r1, r1, r6 + strb r0, [r1] + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x3 + bls ._31 @cond_branch + mov r5, #0x0 + mov r1, r9 + add r0, r1, r7 + lsl r4, r0, #0x5 + ldr r3, ._35 + 20 + mov r2, #0x0 + add r6, r3, #0 + add r6, r6, #0x10 +._32: + add r1, r5, r4 + add r0, r1, r3 + strb r2, [r0] + add r1, r1, r6 + strb r2, [r1] + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0xf + bls ._32 @cond_branch + add r0, r7, #0 + bl unref_sub_80BCD7C +._19: + ldr r2, [sp] + lsl r0, r2, #0x18 + lsr r7, r0, #0x18 + cmp r7, #0x13 + bhi ._33 @cond_branch + b ._34 +._33: + mov r0, #0x1 + add sp, sp, #0x4 + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._36: + .align 2, 0 +._35: + .word gSaveBlock1 + .word 0x1a08 + .word _843E424 + .word 0x1a09 + .word gSaveBlock1+0x1a11 + .word gSaveBlock1+0x1a1a + + thumb_func_end debug_sub_815F2F4 + + thumb_func_start debug_sub_815F470 +debug_sub_815F470: + push {r4, r5, r6, r7, lr} + add r6, r0, #0 + add r7, r1, #0 + mov ip, r2 + ldr r2, ._39 + ldr r0, ._39 + 4 + ldrb r1, [r0] + lsl r0, r1, #0x2 + add r0, r0, r1 + lsl r0, r0, #0x5 + add r0, r0, r2 + ldr r1, ._39 + 8 + add r0, r0, r1 + ldrb r4, [r0] + mov r2, #0x0 + ldr r3, ._39 + 12 + add r5, r3, #0 +._41: + lsl r1, r2, #0x2 + add r0, r1, r5 + ldrb r0, [r0] + cmp r0, r4 + bne ._37 @cond_branch + add r0, r1, #1 + add r0, r0, r3 + ldrb r0, [r0] + strb r0, [r6] + add r0, r1, #2 + add r0, r0, r3 + ldrb r0, [r0] + strb r0, [r7] + add r0, r1, #3 + add r0, r0, r3 + ldrb r0, [r0] + mov r1, ip + strb r0, [r1] + b ._38 +._40: + .align 2, 0 +._39: + .word gSaveBlock1 + .word _nakamuraData0 + .word 0x1a08 + .word _843E424 +._37: + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x4a + bls ._41 @cond_branch +._38: + pop {r4, r5, r6, r7} + pop {r0} + bx r0 + + thumb_func_end debug_sub_815F470 + + thumb_func_start debug_sub_815F4D8 +debug_sub_815F4D8: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xfffffffc + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0xa + mov r3, #0xa + bl Menu_BlankWindowRect + ldr r6, ._43 + ldr r7, ._43 + 4 + ldrb r1, [r7] + add r0, r6, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r2, ._43 + 8 + ldrb r1, [r7] + lsl r0, r1, #0x2 + add r0, r0, r1 + lsl r0, r0, #0x5 + add r0, r0, r2 + ldr r1, ._43 + 12 + add r0, r0, r1 + ldrb r0, [r0] + cmp r0, #0 + beq ._42 @cond_branch + mov r4, sp + add r4, r4, #0x1 + mov r5, sp + add r5, r5, #0x2 + mov r0, sp + add r1, r4, #0 + add r2, r5, #0 + bl debug_sub_815F470 + ldrb r1, [r7] + add r0, r6, #0 + bl sub_80BC190 + add r0, r6, #0 + mov r1, #0x1 + mov r2, #0x3 + bl Menu_PrintText + ldr r0, ._43 + 16 + mov r1, #0x1 + mov r2, #0x5 + bl Menu_PrintText + mov r0, sp + ldrb r1, [r0] + add r0, r6, #0 + mov r2, #0x0 + mov r3, #0x3 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0x2 + mov r2, #0x5 + bl Menu_PrintText + ldr r0, ._43 + 20 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintText + ldrb r1, [r4] + add r0, r6, #0 + mov r2, #0x0 + mov r3, #0x3 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0x3 + mov r2, #0x7 + bl Menu_PrintText + ldr r0, ._43 + 24 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintText + ldrb r1, [r5] + add r0, r6, #0 + mov r2, #0x0 + mov r3, #0x3 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0x3 + mov r2, #0x9 + bl Menu_PrintText +._42: + add sp, sp, #0x4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._44: + .align 2, 0 +._43: + .word gStringVar1 + .word _nakamuraData0 + .word gSaveBlock1 + .word 0x1a08 + .word Str_843E550 + .word Str_843E552 + .word Str_843E554 + + thumb_func_end debug_sub_815F4D8 + + thumb_func_start debug_sub_815F5C4 +debug_sub_815F5C4: + push {lr} + ldr r0, ._48 + ldrh r1, [r0, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + lsl r0, r0, #0x10 + lsr r2, r0, #0x10 + cmp r2, #0 + beq ._45 @cond_branch + ldr r1, ._48 + 4 + ldrb r0, [r1] + cmp r0, #0 + bne ._46 @cond_branch + mov r0, #0x13 + b ._50 +._49: + .align 2, 0 +._48: + .word gMain + .word _nakamuraData0 +._46: + sub r0, r0, #0x1 + b ._50 +._45: + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._51 @cond_branch + ldr r1, ._54 + ldrb r0, [r1] + cmp r0, #0x13 + bne ._52 @cond_branch + strb r2, [r1] + b ._53 +._55: + .align 2, 0 +._54: + .word _nakamuraData0 +._52: + add r0, r0, #0x1 +._50: + strb r0, [r1] +._53: + bl debug_sub_815F4D8 + mov r0, #0x0 + b ._58 +._51: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + bne ._57 @cond_branch + mov r0, #0x0 + b ._58 +._57: + bl CloseMenu + mov r0, #0x1 +._58: + pop {r1} + bx r1 + + thumb_func_end debug_sub_815F5C4 + + thumb_func_start debug_sub_815F62C +debug_sub_815F62C: + push {lr} + ldr r1, ._59 + mov r0, #0x0 + strb r0, [r1] + ldr r1, ._59 + 4 + ldr r0, ._59 + 8 + str r0, [r1] + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xb + mov r3, #0xb + bl Menu_DrawStdWindowFrame + bl debug_sub_815F4D8 + mov r0, #0x0 + pop {r1} + bx r1 +._60: + .align 2, 0 +._59: + .word _nakamuraData0 + .word gMenuCallback + .word debug_sub_815F5C4+1 + + thumb_func_end debug_sub_815F62C + + thumb_func_start debug_sub_815F668 +debug_sub_815F668: + push {r4, r5, r6, lr} + ldr r0, ._61 + ldrb r0, [r0] + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x5 + ldr r0, ._61 + 4 + add r1, r1, r0 + ldrb r4, [r1, #0x3] + lsl r4, r4, #0x18 + ldrb r0, [r1, #0x2] + lsl r0, r0, #0x10 + orr r4, r4, r0 + ldrb r0, [r1, #0x1] + lsl r0, r0, #0x8 + orr r4, r4, r0 + ldrb r0, [r1] + orr r4, r4, r0 + ldr r5, ._61 + 8 + ldr r6, ._61 + 12 + add r0, r4, #0 + add r1, r6, #0 + bl __udivsi3 + add r1, r0, #0 + add r0, r5, #0 + mov r2, #0x2 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r5, #0 + mov r1, #0x2 + mov r2, #0x7 + bl Menu_PrintText + add r0, r4, #0 + add r1, r6, #0 + bl __umodsi3 + add r1, r0, #0 + add r0, r5, #0 + mov r2, #0x2 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r5, #0 + mov r1, #0x7 + mov r2, #0x7 + bl Menu_PrintText + pop {r4, r5, r6} + pop {r0} + bx r0 +._62: + .align 2, 0 +._61: + .word _nakamuraData0 + .word gSaveBlock1+0x1a11 + .word gStringVar1 + .word 0x186a0 + + thumb_func_end debug_sub_815F668 + + thumb_func_start debug_sub_815F6E4 +debug_sub_815F6E4: + push {r4, lr} + mov r0, #0x2 + mov r1, #0x3 + mov r2, #0xb + mov r3, #0x4 + bl Menu_BlankWindowRect + ldr r4, ._63 + ldr r0, ._63 + 4 + ldrb r0, [r0] + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x5 + ldr r0, ._63 + 8 + add r1, r1, r0 + add r0, r4, #0 + mov r2, #0x7 + bl StringCopyN + mov r1, #0xff + strb r1, [r0] + add r0, r4, #0 + mov r1, #0x2 + mov r2, #0x3 + bl Menu_PrintText + pop {r4} + pop {r0} + bx r0 +._64: + .align 2, 0 +._63: + .word gStringVar1 + .word _nakamuraData0 + .word gSaveBlock1+0x1a0a + + thumb_func_end debug_sub_815F6E4 + + thumb_func_start debug_sub_815F72C +debug_sub_815F72C: + push {r4, r5, lr} + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0xb + mov r3, #0xa + bl Menu_BlankWindowRect + ldr r4, ._66 + ldr r5, ._66 + 4 + ldrb r1, [r5] + add r0, r4, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x2 + mov r2, #0x1 + bl Menu_PrintText + ldr r2, ._66 + 8 + ldrb r1, [r5] + lsl r0, r1, #0x2 + add r0, r0, r1 + lsl r0, r0, #0x5 + add r0, r0, r2 + ldr r1, ._66 + 12 + add r0, r0, r1 + ldrb r0, [r0] + cmp r0, #0 + beq ._65 @cond_branch + bl debug_sub_815F6E4 + bl debug_sub_815F668 +._65: + pop {r4, r5} + pop {r0} + bx r0 +._67: + .align 2, 0 +._66: + .word gStringVar1 + .word _nakamuraData0 + .word gSaveBlock1 + .word 0x1a08 + + thumb_func_end debug_sub_815F72C + + thumb_func_start debug_sub_815F788 +debug_sub_815F788: + push {lr} + mov r0, #0x2 + mov r1, #0x5 + mov r2, #0xb + mov r3, #0x6 + bl Menu_BlankWindowRect + ldr r0, ._68 + ldr r1, ._68 + 4 + ldrb r1, [r1] + add r1, r1, #0x2 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + mov r2, #0x5 + bl Menu_PrintText + pop {r0} + bx r0 +._69: + .align 2, 0 +._68: + .word Str_843E574 + .word _nakamuraData2 + + thumb_func_end debug_sub_815F788 + + thumb_func_start debug_sub_815F7B4 +debug_sub_815F7B4: + push {lr} + ldr r0, ._72 + ldrb r0, [r0] + cmp r0, #0 + beq ._70 @cond_branch + mov r0, #0xb + mov r1, #0x1 + mov r2, #0xb + mov r3, #0x2 + bl Menu_BlankWindowRect + b ._71 +._73: + .align 2, 0 +._72: + .word _nakamuraData1 +._70: + ldr r0, ._74 + ldrb r0, [r0] + lsl r0, r0, #0x1 + ldr r1, ._74 + 4 + add r0, r0, r1 + mov r1, #0xb + mov r2, #0x1 + bl Menu_PrintText +._71: + pop {r0} + bx r0 +._75: + .align 2, 0 +._74: + .word _nakamuraData3 + .word Str_843E576 + + thumb_func_end debug_sub_815F7B4 + + thumb_func_start debug_sub_815F7F0 +debug_sub_815F7F0: + push {r4, r5, lr} + ldr r1, ._78 + ldrb r2, [r1] + lsl r1, r2, #0x2 + add r1, r1, r2 + lsl r1, r1, #0x5 + ldr r2, ._78 + 4 + add r3, r1, r2 + ldrb r1, [r3, #0x3] + lsl r2, r1, #0x18 + ldrb r1, [r3, #0x2] + lsl r1, r1, #0x10 + orr r2, r2, r1 + ldrb r1, [r3, #0x1] + lsl r1, r1, #0x8 + orr r2, r2, r1 + ldrb r1, [r3] + orr r2, r2, r1 + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r4, #0x9 + ldr r0, ._78 + 8 + ldrb r0, [r0] + cmp r4, r0 + ble ._76 @cond_branch + add r5, r0, #0 +._77: + lsl r0, r1, #0x2 + add r0, r0, r1 + lsl r1, r0, #0x1 + lsl r0, r4, #0x18 + mov r4, #0xff + lsl r4, r4, #0x18 + add r0, r0, r4 + lsr r4, r0, #0x18 + asr r0, r0, #0x18 + cmp r0, r5 + bgt ._77 @cond_branch +._76: + add r2, r2, r1 + lsr r0, r2, #0x18 + strb r0, [r3, #0x3] + mov r0, #0xff + lsl r0, r0, #0x10 + and r0, r0, r2 + lsr r0, r0, #0x10 + strb r0, [r3, #0x2] + mov r0, #0xff + lsl r0, r0, #0x8 + and r0, r0, r2 + lsr r0, r0, #0x8 + strb r0, [r3, #0x1] + strb r2, [r3] + bl debug_sub_815F668 + pop {r4, r5} + pop {r0} + bx r0 +._79: + .align 2, 0 +._78: + .word _nakamuraData0 + .word gSaveBlock1+0x1a11 + .word _nakamuraData2 + + thumb_func_end debug_sub_815F7F0 + + thumb_func_start debug_sub_815F86C +debug_sub_815F86C: + push {r4, r5, r6, lr} + lsl r0, r0, #0x18 + ldr r1, ._84 + ldrb r2, [r1] + lsl r1, r2, #0x2 + add r1, r1, r2 + lsl r1, r1, #0x5 + ldr r2, ._84 + 4 + add r5, r1, r2 + mov r2, #0x0 + mov r3, #0x0 + lsr r6, r0, #0x18 + asr r0, r0, #0x18 + cmp r0, #0x64 + bne ._80 @cond_branch + ldr r0, ._84 + 8 + ldrb r1, [r0] + cmp r1, #0x6 + bhi ._100 @cond_branch + mov r2, #0xff +._82: + add r0, r5, r1 + strb r2, [r0] + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + cmp r1, #0x6 + bls ._82 @cond_branch + b ._100 +._85: + .align 2, 0 +._84: + .word _nakamuraData0 + .word gSaveBlock1+0x1a0a + .word _nakamuraData2 +._80: + ldr r0, ._87 + ldrb r0, [r0] + cmp r0, #0x4 + bhi ._98 @cond_branch + lsl r0, r0, #0x2 + ldr r1, ._87 + 4 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._88: + .align 2, 0 +._87: + .word _nakamuraData3 + .word ._89 +._89: + .word ._90 + .word ._91 + .word ._92 + .word ._93 + .word ._94 +._90: + mov r3, #0x1 + mov r2, #0x50 + b ._98 +._91: + mov r3, #0x51 + mov r2, #0xa0 + b ._98 +._92: + mov r3, #0xbb + mov r2, #0xd4 + b ._98 +._93: + mov r3, #0xd5 + mov r2, #0xee + b ._98 +._94: + mov r3, #0xa1 + mov r2, #0xaa +._98: + ldr r4, ._101 + ldrb r1, [r4] + add r1, r5, r1 + ldrb r0, [r1] + add r0, r0, r6 + strb r0, [r1] + ldrb r0, [r4] + add r1, r5, r0 + ldrb r0, [r1] + cmp r0, r3 + bcs ._99 @cond_branch + strb r2, [r1] +._99: + ldrb r0, [r4] + add r1, r5, r0 + ldrb r0, [r1] + cmp r0, r2 + bls ._100 @cond_branch + strb r3, [r1] +._100: + bl debug_sub_815F6E4 + pop {r4, r5, r6} + pop {r0} + bx r0 +._102: + .align 2, 0 +._101: + .word _nakamuraData2 + + thumb_func_end debug_sub_815F86C + + thumb_func_start debug_sub_815F930 +debug_sub_815F930: + push {r4, r5, lr} + ldr r0, ._107 + ldrb r2, [r0] + mov r4, #0xa + cmp r2, #0 + bne ._103 @cond_branch + mov r4, #0x7 +._103: + ldr r5, ._107 + 4 + ldrh r1, [r5, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._104 @cond_branch + cmp r2, #0 + beq ._105 @cond_branch + mov r0, #0x1 + bl debug_sub_815F7F0 + b ._136 +._108: + .align 2, 0 +._107: + .word _nakamuraData1 + .word gMain +._105: + mov r0, #0x1 + b ._113 +._104: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._110 @cond_branch + cmp r2, #0 + beq ._111 @cond_branch + mov r0, #0x1 + neg r0, r0 + bl debug_sub_815F7F0 + b ._136 +._111: + mov r0, #0x1 + neg r0, r0 + b ._113 +._110: + mov r0, #0x20 + and r0, r0, r1 + lsl r0, r0, #0x10 + lsr r3, r0, #0x10 + cmp r3, #0 + beq ._114 @cond_branch + ldr r1, ._117 + ldrb r0, [r1] + cmp r0, #0 + bne ._115 @cond_branch + sub r0, r4, #1 + b ._116 +._118: + .align 2, 0 +._117: + .word _nakamuraData2 +._115: + sub r0, r0, #0x1 +._116: + strb r0, [r1] +._125: + bl debug_sub_815F788 + b ._136 +._114: + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._120 @cond_branch + ldr r2, ._123 + ldrb r1, [r2] + sub r0, r4, #1 + cmp r1, r0 + bne ._121 @cond_branch + strb r3, [r2] + b ._125 +._124: + .align 2, 0 +._123: + .word _nakamuraData2 +._121: + add r0, r1, #1 + strb r0, [r2] + b ._125 +._120: + ldrh r1, [r5, #0x2e] + mov r0, #0x4 + and r0, r0, r1 + cmp r0, #0 + beq ._126 @cond_branch + cmp r2, #0 + bne ._127 @cond_branch + ldr r4, ._129 + ldrb r0, [r4] + add r0, r0, #0x1 + mov r1, #0x5 + bl __modsi3 + strb r0, [r4] +._127: + bl debug_sub_815F7B4 + b ._136 +._130: + .align 2, 0 +._129: + .word _nakamuraData3 +._126: + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._131 @cond_branch + mov r0, #0x2 + mov r1, #0x5 + mov r2, #0xb + mov r3, #0x6 + bl Menu_BlankWindowRect + mov r0, #0xb + mov r1, #0x1 + mov r2, #0xb + mov r3, #0x2 + bl Menu_BlankWindowRect + ldr r1, ._133 + ldr r0, ._133 + 4 + str r0, [r1] + b ._136 +._134: + .align 2, 0 +._133: + .word gMenuCallback + .word debug_sub_815FA38+1 +._131: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._136 @cond_branch + cmp r2, #0 + bne ._136 @cond_branch + mov r0, #0x64 +._113: + bl debug_sub_815F86C +._136: + mov r0, #0x0 + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_815F930 + + thumb_func_start debug_sub_815FA38 +debug_sub_815FA38: + push {r4, lr} + ldr r0, ._139 + ldrh r1, [r0, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._137 @cond_branch + mov r0, #0x2 + neg r0, r0 + b ._138 +._140: + .align 2, 0 +._139: + .word gMain +._137: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._141 @cond_branch + mov r0, #0x2 +._138: + bl Menu_MoveCursor +._161: + mov r0, #0x0 + b ._142 +._141: + mov r0, #0x20 + and r0, r0, r1 + lsl r0, r0, #0x10 + lsr r2, r0, #0x10 + cmp r2, #0 + beq ._143 @cond_branch + ldr r1, ._146 + ldrb r0, [r1] + cmp r0, #0 + bne ._144 @cond_branch + mov r0, #0x13 + b ._148 +._147: + .align 2, 0 +._146: + .word _nakamuraData0 +._144: + sub r0, r0, #0x1 + b ._148 +._143: + mov r0, #0x10 + and r0, r0, r1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + cmp r4, #0 + beq ._149 @cond_branch + ldr r1, ._152 + ldrb r0, [r1] + cmp r0, #0x13 + bne ._150 @cond_branch + strb r2, [r1] + b ._151 +._153: + .align 2, 0 +._152: + .word _nakamuraData0 +._150: + add r0, r0, #0x1 +._148: + strb r0, [r1] +._151: + bl debug_sub_815F72C + b ._161 +._149: + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._155 @cond_branch + ldr r1, ._159 + ldrb r0, [r1] + cmp r0, #0 + beq ._161 @cond_branch + ldr r2, ._159 + 4 + add r1, r0, #0 + lsl r0, r1, #0x2 + add r0, r0, r1 + lsl r0, r0, #0x5 + add r0, r0, r2 + ldr r1, ._159 + 8 + add r0, r0, r1 + ldrb r0, [r0] + cmp r0, #0 + beq ._161 @cond_branch + bl Menu_GetCursorPos + ldr r1, ._159 + 12 + strb r0, [r1] + ldr r0, ._159 + 16 + strb r4, [r0] + bl debug_sub_815F788 + bl debug_sub_815F7B4 + ldr r1, ._159 + 20 + ldr r0, ._159 + 24 + str r0, [r1] + b ._161 +._160: + .align 2, 0 +._159: + .word _nakamuraData0 + .word gSaveBlock1 + .word 0x1a08 + .word _nakamuraData1 + .word _nakamuraData2 + .word gMenuCallback + .word debug_sub_815F930+1 +._155: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._161 @cond_branch + bl CloseMenu + mov r0, #0x1 +._142: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_815FA38 + + thumb_func_start debug_sub_815FB1C +debug_sub_815FB1C: + push {lr} + add sp, sp, #0xfffffff8 + ldr r0, ._162 + mov r1, #0x0 + strb r1, [r0] + ldr r0, ._162 + 4 + strb r1, [r0] + ldr r1, ._162 + 8 + ldr r0, ._162 + 12 + str r0, [r1] + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xc + mov r3, #0xb + bl Menu_DrawStdWindowFrame + bl debug_sub_815F72C + mov r0, #0x0 + str r0, [sp] + mov r0, #0xb + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x3 + bl InitMenu + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._163: + .align 2, 0 +._162: + .word _nakamuraData0 + .word _nakamuraData3 + .word gMenuCallback + .word debug_sub_815FA38+1 + + thumb_func_end debug_sub_815FB1C + + thumb_func_start debug_sub_815FB78 +debug_sub_815FB78: + push {lr} + ldr r0, ._166 + ldrh r1, [r0, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._164 @cond_branch + mov r0, #0x1 + neg r0, r0 + b ._165 +._167: + .align 2, 0 +._166: + .word gMain +._164: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._168 @cond_branch + mov r0, #0x1 +._165: + bl Menu_MoveCursor + mov r0, #0x0 + b ._177 +._168: + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._170 @cond_branch + bl CloseMenu + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0 + beq ._171 @cond_branch + cmp r0, #0x1 + beq ._172 @cond_branch + b ._175 +._171: + bl debug_sub_814A714 + b ._175 +._172: + bl ClearRoamerData + bl ClearRoamerLocationData + b ._175 +._170: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + bne ._176 @cond_branch + mov r0, #0x0 + b ._177 +._176: + bl CloseMenu +._175: + mov r0, #0x1 +._177: + pop {r1} + bx r1 + + thumb_func_end debug_sub_815FB78 + + thumb_func_start debug_sub_815FBE8 +debug_sub_815FBE8: + push {r4, lr} + add sp, sp, #0xfffffff8 + ldr r1, ._178 + ldr r0, ._178 + 4 + str r0, [r1] + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + ldr r4, ._178 + 8 + add r0, r4, #0 + bl debug_sub_814A73C + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xb + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + add r0, r4, #0 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._178 + 12 + mov r1, #0x2 + mov r2, #0x3 + bl Menu_PrintText + mov r0, #0x0 + str r0, [sp] + mov r0, #0xa + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x3 + bl InitMenu + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._179: + .align 2, 0 +._178: + .word gMenuCallback + .word debug_sub_815FB78+1 + .word gStringVar1 + .word Str_843E580 + + thumb_func_end debug_sub_815FBE8 + + thumb_func_start debug_sub_815FC54 +debug_sub_815FC54: + push {r4, r5, r6, r7, lr} + mov r3, #0x0 + ldr r7, ._181 + mov r6, #0xe8 + lsl r6, r6, #0x3 + ldr r5, ._181 + 4 + ldr r4, ._181 + 8 +._180: + lsl r1, r3, #0x2 + add r1, r1, r7 + add r2, r3, #0 + add r2, r2, #0x85 + add r0, r1, r6 + strh r2, [r0] + add r1, r1, r4 + strh r5, [r1] + add r0, r3, #1 + lsl r0, r0, #0x10 + lsr r3, r0, #0x10 + cmp r3, #0x2a + bls ._180 @cond_branch + bl CloseMenu + mov r0, #0x1 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._182: + .align 2, 0 +._181: + .word gSaveBlock1 + .word 0x3e7 + .word 0x742 + + thumb_func_end debug_sub_815FC54 + + thumb_func_start debug_sub_815FC94 +debug_sub_815FC94: + push {lr} + bl ClearDecorationInventories + bl debug_sub_814A3A8 + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end debug_sub_815FC94 + + thumb_func_start debug_sub_815FCB4 +debug_sub_815FCB4: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + mov r7, #0x0 + ldr r5, ._188 + ldr r0, [r5] + ldr r0, [r0, #0x4] + mov r1, #0x3 + bl __divsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + add r1, r0, #0 + mul r1, r1, r4 + lsl r1, r1, #0x10 + lsr r6, r1, #0x10 + add r0, r6, r0 + mov r9, r5 + cmp r6, r0 + bge ._183 @cond_branch + mov r8, r0 +._187: + mov r4, #0x0 + mov r1, r9 + ldr r0, [r1] + ldr r0, [r0] + add r5, r6, #1 + cmp r4, r0 + bge ._184 @cond_branch + ldr r0, ._188 + mov r9, r0 +._186: + add r0, r4, #7 + add r1, r6, #7 + bl MapGridGetMetatileBehaviorAt + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl sub_805759C + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x1 + bne ._185 @cond_branch + add r0, r7, #1 + lsl r0, r0, #0x10 + lsr r7, r0, #0x10 +._185: + add r0, r4, #1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + ldr r0, ._188 + ldr r0, [r0] + ldr r0, [r0] + cmp r4, r0 + blt ._186 @cond_branch +._184: + lsl r0, r5, #0x10 + lsr r6, r0, #0x10 + cmp r6, r8 + blt ._187 @cond_branch +._183: + add r0, r7, #0 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._189: + .align 2, 0 +._188: + .word gMapHeader + + thumb_func_end debug_sub_815FCB4 + + thumb_func_start debug_sub_815FD40 +debug_sub_815FD40: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xfffffffc + mov r6, #0x0 + mov r4, sp + add r4, r4, #0x2 + mov r0, sp + add r1, r4, #0 + bl GetXYCoordsOneStepInFrontOfPlayer + mov r1, sp + mov r0, sp + ldrh r0, [r0] + sub r0, r0, #0x7 + strh r0, [r1] + ldrh r0, [r4] + sub r0, r0, #0x7 + strh r0, [r4] + mov r5, #0x0 + ldr r1, ._192 + ldr r0, [r1] + ldr r0, [r0, #0x4] + add r7, r4, #0 + cmp r6, r0 + bge ._190 @cond_branch +._199: + mov r4, #0x0 + ldr r0, [r1] + b ._191 +._193: + .align 2, 0 +._192: + .word gMapHeader +._198: + add r0, r4, #7 + add r1, r5, #7 + bl MapGridGetMetatileBehaviorAt + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl sub_805759C + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x1 + bne ._196 @cond_branch + add r0, r6, #1 + lsl r0, r0, #0x10 + lsr r6, r0, #0x10 + mov r0, sp + mov r1, #0x0 + ldsh r0, [r0, r1] + cmp r0, r4 + bne ._196 @cond_branch + mov r1, #0x0 + ldsh r0, [r7, r1] + cmp r0, r5 + bne ._196 @cond_branch + add r0, r6, #0 + b ._197 +._196: + add r0, r4, #1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + ldr r0, ._200 + ldr r0, [r0] +._191: + ldr r0, [r0] + cmp r4, r0 + blt ._198 @cond_branch + add r0, r5, #1 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + ldr r1, ._200 + ldr r0, [r1] + ldr r0, [r0, #0x4] + cmp r5, r0 + blt ._199 @cond_branch +._190: + add r0, r6, #1 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 +._197: + add sp, sp, #0x4 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._201: + .align 2, 0 +._200: + .word gMapHeader + + thumb_func_end debug_sub_815FD40 + + thumb_func_start debug_sub_815FDE4 +debug_sub_815FDE4: + push {lr} + ldr r0, ._205 + ldrh r1, [r0, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + bne ._202 @cond_branch + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._203 @cond_branch +._202: + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + bl CloseMenu + mov r0, #0x1 + b ._204 +._206: + .align 2, 0 +._205: + .word gMain +._203: + mov r0, #0x0 +._204: + pop {r1} + bx r1 + + thumb_func_end debug_sub_815FDE4 + + thumb_func_start debug_sub_815FE1C +debug_sub_815FE1C: + push {r4, r5, r6, r7, lr} + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x10 + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r0, ._210 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r6, ._210 + 4 + mov r0, #0x0 + bl debug_sub_815FCB4 + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r6, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0x5 + mov r2, #0x3 + bl Menu_PrintText + mov r0, #0x1 + bl debug_sub_815FCB4 + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r6, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0x5 + mov r2, #0x5 + bl Menu_PrintText + mov r0, #0x2 + bl debug_sub_815FCB4 + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r6, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0x5 + mov r2, #0x7 + bl Menu_PrintText + mov r0, #0x0 + bl debug_sub_8092344 + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r6, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0xb + mov r2, #0x3 + bl Menu_PrintText + mov r0, #0x1 + bl debug_sub_8092344 + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r6, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0xb + mov r2, #0x5 + bl Menu_PrintText + mov r0, #0x2 + bl debug_sub_8092344 + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r6, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r6, #0 + mov r1, #0xb + mov r2, #0x7 + bl Menu_PrintText + ldr r0, ._210 + 8 + ldr r1, ._210 + 12 + add r0, r0, r1 + ldrh r0, [r0] + bl FeebasSeedRng + mov r0, #0x0 + bl debug_sub_815FCB4 + add r4, r0, #0 + mov r0, #0x1 + bl debug_sub_815FCB4 + add r5, r0, #0 + mov r0, #0x2 + bl debug_sub_815FCB4 + add r4, r4, r5 + add r0, r0, r4 + lsl r0, r0, #0x10 + lsr r7, r0, #0x10 + mov r5, #0x0 +._209: + bl FeebasRandom + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + add r1, r7, #0 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + cmp r1, #0 + bne ._207 @cond_branch + add r1, r7, #0 +._207: + sub r0, r1, #1 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + cmp r0, #0x2 + bls ._208 @cond_branch + add r0, r6, #0 + mov r2, #0x1 + mov r3, #0x4 + bl ConvertIntToDecimalStringN + add r0, r5, #0 + mov r1, #0x3 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + lsl r4, r0, #0x2 + add r4, r4, r0 + add r4, r4, #0x2 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r5, #0 + mov r1, #0x3 + bl __udivsi3 + add r2, r0, #0 + lsl r2, r2, #0x19 + mov r0, #0xb0 + lsl r0, r0, #0x14 + add r2, r2, r0 + lsr r2, r2, #0x18 + add r0, r6, #0 + add r1, r4, #0 + bl Menu_PrintText + add r0, r5, #1 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 +._208: + cmp r5, #0x6 + bne ._209 @cond_branch + ldr r4, ._210 + 4 + bl debug_sub_815FD40 + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r4, #0 + mov r2, #0x1 + mov r3, #0x4 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x2 + mov r2, #0x11 + bl Menu_PrintText + ldr r1, ._210 + 16 + ldr r0, ._210 + 20 + str r0, [r1] + mov r0, #0x0 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._211: + .align 2, 0 +._210: + .word Str_843E58D + .word gStringVar1 + .word gSaveBlock1 + .word 0x2dd6 + .word gMenuCallback + .word debug_sub_815FDE4+1 + + thumb_func_end debug_sub_815FE1C + + thumb_func_start debug_sub_815FFDC +debug_sub_815FFDC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + mov r0, #0xe + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xd + bl Menu_DrawStdWindowFrame + mov r0, #0x0 + mov r1, #0xe + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r0, ._214 + mov r1, #0x1 + mov r2, #0xf + bl Menu_PrintText + mov r5, #0x0 + ldr r0, ._214 + 4 + mov r8, r0 +._216: + mov r0, #0x64 + add r1, r5, #0 + mul r1, r1, r0 + ldr r0, ._214 + 8 + add r6, r1, r0 + add r0, r6, #0 + mov r1, #0xb + bl GetMonData + lsl r1, r5, #0x2 + mov r2, r8 + add r4, r1, r2 + strh r0, [r4] + lsl r0, r0, #0x10 + add r7, r1, #0 + cmp r0, #0 + beq ._212 @cond_branch + add r0, r6, #0 + mov r1, #0x38 + bl GetMonData + strb r0, [r4, #0x2] + add r0, r5, #0 + bl debug_sub_816009C + add r0, r5, #0 + bl debug_sub_81600D0 + add r0, r5, #0 + bl debug_sub_816013C + b ._213 +._215: + .align 2, 0 +._214: + .word Str_843E5D4 + .word _nakamuraStatic0 + .word gPlayerParty +._212: + mov r0, #0x1 + strb r0, [r4, #0x2] +._213: + mov r0, r8 + add r1, r7, r0 + mov r0, #0x0 + strb r0, [r1, #0x3] + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x5 + bls ._216 @cond_branch + ldr r1, ._217 + mov r0, #0x0 + strb r0, [r1] + mov r0, #0xf + mov r1, #0x1 + mov r2, #0xff + bl PrintTriangleCursorWithPalette + ldr r1, ._217 + 4 + ldr r0, ._217 + 8 + str r0, [r1] + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._218: + .align 2, 0 +._217: + .word _nakamuraData4 + .word gMenuCallback + .word debug_sub_8160498+1 + + thumb_func_end debug_sub_815FFDC + + thumb_func_start debug_sub_816009C +debug_sub_816009C: + push {lr} + add r2, r0, #0 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + ldr r1, ._219 + lsl r0, r2, #0x2 + add r0, r0, r1 + mov r3, #0x0 + ldsh r1, [r0, r3] + mov r0, #0xb + mul r0, r0, r1 + ldr r1, ._219 + 4 + add r0, r0, r1 + lsl r2, r2, #0x1 + add r2, r2, #0x1 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + mov r1, #0x10 + bl Menu_PrintText + pop {r0} + bx r0 +._220: + .align 2, 0 +._219: + .word _nakamuraStatic0 + .word gSpeciesNames + + thumb_func_end debug_sub_816009C + + thumb_func_start debug_sub_81600D0 +debug_sub_81600D0: + push {r4, r5, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + add r5, r4, #0 + ldr r1, ._223 + mov r0, sp + mov r2, #0x2 + bl memcpy + mov r0, #0x64 + mul r0, r0, r4 + ldr r1, ._223 + 4 + add r0, r0, r1 + bl GetMonGender + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0 + bne ._221 @cond_branch + ldr r0, ._223 + 8 + b ._222 +._224: + .align 2, 0 +._223: + .word Str_843E5F0 + .word gPlayerParty + .word gOtherText_MaleSymbol2 +._221: + cmp r0, #0xfe + bne ._225 @cond_branch + ldr r0, ._227 +._222: + lsl r2, r4, #0x1 + add r2, r2, #0x1 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + mov r1, #0x17 + bl Menu_PrintText + b ._226 +._228: + .align 2, 0 +._227: + .word gOtherText_FemaleSymbolAndLv +._225: + lsl r2, r5, #0x1 + add r2, r2, #0x1 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + mov r0, sp + mov r1, #0x17 + bl Menu_PrintText +._226: + add sp, sp, #0x4 + pop {r4, r5} + pop {r0} + bx r0 + + thumb_func_end debug_sub_81600D0 + + thumb_func_start debug_sub_816013C +debug_sub_816013C: + push {r4, r5, lr} + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r5, ._229 + ldr r1, ._229 + 4 + lsl r0, r4, #0x2 + add r0, r0, r1 + mov r1, #0x2 + ldrsb r1, [r0, r1] + add r0, r5, #0 + mov r2, #0x1 + mov r3, #0x3 + bl ConvertIntToDecimalStringN + lsl r4, r4, #0x1 + add r4, r4, #0x1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r5, #0 + mov r1, #0x1a + add r2, r4, #0 + bl Menu_PrintText + pop {r4, r5} + pop {r0} + bx r0 +._230: + .align 2, 0 +._229: + .word gStringVar1 + .word _nakamuraStatic0 + + thumb_func_end debug_sub_816013C + + thumb_func_start debug_sub_816017C +debug_sub_816017C: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + lsl r3, r4, #0x1 + add r1, r3, #1 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r3, r3, #0x2 + lsl r3, r3, #0x18 + lsr r3, r3, #0x18 + mov r0, #0x10 + mov r2, #0x1c + bl Menu_BlankWindowRect + ldr r1, ._232 + lsl r0, r4, #0x2 + add r0, r0, r1 + mov r1, #0x0 + ldsh r0, [r0, r1] + cmp r0, #0 + beq ._231 @cond_branch + add r0, r4, #0 + bl debug_sub_816009C + add r0, r4, #0 + bl debug_sub_81600D0 + add r0, r4, #0 + bl debug_sub_816013C +._231: + mov r0, #0x5 + bl debug_sub_81603B8 + pop {r4} + pop {r0} + bx r0 +._233: + .align 2, 0 +._232: + .word _nakamuraStatic0 + + thumb_func_end debug_sub_816017C + + thumb_func_start debug_sub_81601C8 +debug_sub_81601C8: + push {r4, r5, lr} + add sp, sp, #0xfffffff0 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r1, ._239 + lsl r0, r5, #0x2 + add r2, r0, r1 + mov r4, #0x0 + ldsh r0, [r2, r4] + cmp r0, #0 + bne ._236 @cond_branch + ldrb r0, [r2, #0x3] + cmp r0, #0 + bne ._236 @cond_branch + cmp r3, #0x1 + bne ._236 @cond_branch + mov r0, #0x8a + lsl r0, r0, #0x1 + strh r0, [r2] +._236: + lsl r0, r5, #0x2 + add r4, r0, r1 + lsl r0, r3, #0x18 + asr r0, r0, #0x18 + ldrh r1, [r4] + add r2, r0, r1 + mov r3, #0x0 + strh r2, [r4] + lsl r1, r2, #0x10 + mov r0, #0xcd + lsl r0, r0, #0x11 + cmp r1, r0 + ble ._237 @cond_branch + ldr r1, ._239 + 4 + add r0, r2, r1 + strh r0, [r4] +._237: + ldrh r1, [r4] + mov r2, #0x0 + ldsh r0, [r4, r2] + cmp r0, #0 + bge ._238 @cond_branch + ldr r2, ._239 + 8 + add r0, r1, r2 + strh r0, [r4] +._238: + mov r0, #0x64 + mul r0, r0, r5 + ldr r1, ._239 + 12 + add r0, r0, r1 + ldrh r1, [r4] + ldrb r2, [r4, #0x2] + str r3, [sp] + str r3, [sp, #0x4] + str r3, [sp, #0x8] + str r3, [sp, #0xc] + mov r3, #0x20 + bl CreateMon + mov r0, #0x1 + strb r0, [r4, #0x3] + add sp, sp, #0x10 + pop {r4, r5} + pop {r0} + bx r0 +._240: + .align 2, 0 +._239: + .word _nakamuraStatic0 + .word 0xfffffe65 + .word 0x19b + .word gPlayerParty + + thumb_func_end debug_sub_81601C8 + + thumb_func_start debug_sub_8160258 +debug_sub_8160258: + push {lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + ldr r1, ._242 + lsl r0, r2, #0x2 + add r0, r0, r1 + mov r1, #0x0 + ldsh r0, [r0, r1] + cmp r0, #0 + beq ._241 @cond_branch + add r0, r2, #0 + bl debug_sub_816062C +._241: + pop {r0} + bx r0 +._243: + .align 2, 0 +._242: + .word _nakamuraStatic0 + + thumb_func_end debug_sub_8160258 + + thumb_func_start debug_sub_816027C +debug_sub_816027C: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + add r4, r0, #0 + lsl r1, r1, #0x18 + lsr r2, r1, #0x18 + ldr r1, ._247 + lsl r0, r4, #0x2 + add r3, r0, r1 + mov r1, #0x0 + ldsh r0, [r3, r1] + cmp r0, #0 + beq ._244 @cond_branch + lsl r0, r2, #0x18 + asr r0, r0, #0x18 + ldrb r1, [r3, #0x2] + add r0, r0, r1 + strb r0, [r3, #0x2] + lsl r0, r0, #0x18 + asr r0, r0, #0x18 + cmp r0, #0x64 + ble ._245 @cond_branch + mov r0, #0x1 + strb r0, [r3, #0x2] +._245: + mov r0, #0x2 + ldrsb r0, [r3, r0] + cmp r0, #0 + bgt ._246 @cond_branch + mov r0, #0x64 + strb r0, [r3, #0x2] +._246: + mov r0, #0x64 + mul r4, r4, r0 + ldr r0, ._247 + 4 + add r4, r4, r0 + ldr r2, ._247 + 8 + mov r0, #0x0 + ldsh r1, [r3, r0] + lsl r0, r1, #0x3 + sub r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r2 + ldrb r1, [r0, #0x13] + mov r0, #0xca + lsl r0, r0, #0x1 + add r2, r1, #0 + mul r2, r2, r0 + mov r0, #0x2 + ldrsb r0, [r3, r0] + lsl r0, r0, #0x2 + ldr r1, ._247 + 12 + add r0, r0, r1 + add r2, r2, r0 + add r0, r4, #0 + mov r1, #0x19 + bl SetMonData + add r0, r4, #0 + bl debug_sub_803F55C +._244: + pop {r4} + pop {r0} + bx r0 +._248: + .align 2, 0 +._247: + .word _nakamuraStatic0 + .word gPlayerParty + .word gBaseStats + .word gExperienceTables + + thumb_func_end debug_sub_816027C + + thumb_func_start debug_sub_8160308 +debug_sub_8160308: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + add sp, sp, #0xffffff8c + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + mov r2, #0x0 +._252: + add r1, r2, #1 + lsl r0, r1, #0x18 + lsr r5, r0, #0x18 + mov r8, r1 + cmp r5, #0x5 + bhi ._249 @cond_branch + mov r0, #0x64 + mov r9, r0 + mov r0, r9 + mul r0, r0, r2 + ldr r7, ._254 + add r6, r0, r7 +._251: + add r0, r6, #0 + mov r1, #0xb + mov r2, #0x0 + bl GetMonData + cmp r0, #0 + bne ._250 @cond_branch + add r0, sp, #0x10 + add r1, r6, #0 + mov r2, #0x64 + bl memcpy + mov r4, r9 + mul r4, r4, r5 + add r4, r4, r7 + add r0, r6, #0 + add r1, r4, #0 + mov r2, #0x64 + bl memcpy + add r0, r4, #0 + add r1, sp, #0x10 + mov r2, #0x64 + bl memcpy +._250: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x5 + bls ._251 @cond_branch +._249: + mov r1, r8 + lsl r0, r1, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x4 + bls ._252 @cond_branch + bl CalculatePlayerPartyCount + ldr r4, ._254 + 4 + ldrb r1, [r4] + cmp r1, #0 + bne ._253 @cond_branch + ldr r0, ._254 + str r1, [sp] + str r1, [sp, #0x4] + str r1, [sp, #0x8] + str r1, [sp, #0xc] + mov r1, #0x1 + mov r2, #0xa + mov r3, #0x20 + bl CreateMon + mov r0, #0x1 + strb r0, [r4] +._253: + add sp, sp, #0x74 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._255: + .align 2, 0 +._254: + .word gPlayerParty + .word gPlayerPartyCount + + thumb_func_end debug_sub_8160308 + + thumb_func_start debug_sub_81603B8 +debug_sub_81603B8: + push {r4, r5, r6, r7, lr} + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + mov r0, #0x5 + bl PlaySE + ldr r7, ._259 + ldrb r4, [r7] + add r0, r4, #0 + mov r1, #0x6 + bl __udivsi3 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + add r0, r4, #0 + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r0, ._259 + 4 + add r0, r5, r0 + ldrb r2, [r0] + lsl r3, r4, #0x1 + add r1, r3, #1 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r3, r3, #0x2 + lsl r3, r3, #0x18 + lsr r3, r3, #0x18 + add r0, r2, #0 + bl Menu_BlankWindowRect + cmp r6, #0 + bne ._256 @cond_branch + cmp r4, #0 + beq ._257 @cond_branch + ldrb r0, [r7] + sub r0, r0, #0x1 + b ._258 +._260: + .align 2, 0 +._259: + .word _nakamuraData4 + .word _843E5D1 +._257: + lsl r0, r5, #0x1 + add r0, r0, r5 + lsl r0, r0, #0x1 + add r0, r0, #0x5 +._258: + strb r0, [r7] +._256: + ldr r1, ._264 + cmp r6, #0x1 + bne ._261 @cond_branch + cmp r4, #0x5 + beq ._262 @cond_branch + ldrb r0, [r1] + add r0, r0, #0x1 + b ._263 +._265: + .align 2, 0 +._264: + .word _nakamuraData4 +._262: + lsl r0, r5, #0x1 + add r0, r0, r5 + lsl r0, r0, #0x1 +._263: + strb r0, [r1] +._261: + cmp r6, #0x2 + bne ._266 @cond_branch + cmp r5, #0 + beq ._267 @cond_branch + ldrb r0, [r1] + sub r0, r0, #0x6 + b ._268 +._267: + add r0, r4, #0 + add r0, r0, #0xc +._268: + strb r0, [r1] +._266: + cmp r6, #0x3 + bne ._271 @cond_branch + cmp r5, #0x2 + beq ._270 @cond_branch + ldrb r0, [r1] + add r0, r0, #0x6 + strb r0, [r1] + b ._271 +._270: + strb r4, [r1] +._271: + ldrb r4, [r1] + add r0, r4, #0 + mov r1, #0x6 + bl __udivsi3 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + add r0, r4, #0 + mov r1, #0x6 + bl __umodsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + ldr r0, ._272 + add r0, r5, r0 + ldrb r0, [r0] + lsr r1, r1, #0x17 + add r1, r1, #0x1 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + mov r2, #0xff + bl PrintTriangleCursorWithPalette + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._273: + .align 2, 0 +._272: + .word _843E5D1 + + thumb_func_end debug_sub_81603B8 + + thumb_func_start debug_sub_8160498 +debug_sub_8160498: + push {r4, lr} + ldr r1, ._276 + ldrh r2, [r1, #0x2e] + mov r0, #0x40 + and r0, r0, r2 + cmp r0, #0 + beq ._274 @cond_branch + mov r0, #0x0 + b ._281 +._277: + .align 2, 0 +._276: + .word gMain +._274: + mov r0, #0x80 + and r0, r0, r2 + cmp r0, #0 + beq ._278 @cond_branch + mov r0, #0x1 + b ._281 +._278: + mov r0, #0x20 + and r0, r0, r2 + cmp r0, #0 + beq ._280 @cond_branch + mov r0, #0x2 + b ._281 +._280: + mov r0, #0x10 + and r0, r0, r2 + cmp r0, #0 + beq ._282 @cond_branch + mov r0, #0x3 +._281: + bl debug_sub_81603B8 + mov r0, #0x0 + b ._311 +._282: + ldrh r1, [r1, #0x30] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._284 @cond_branch + ldr r4, ._289 + ldrb r0, [r4] + cmp r0, #0x5 + bhi ._285 @cond_branch + mov r1, #0x1 + bl debug_sub_81601C8 +._285: + ldrb r0, [r4] + sub r0, r0, #0x6 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x5 + bhi ._286 @cond_branch + ldrb r0, [r4] + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl debug_sub_8160258 +._286: + ldrb r0, [r4] + sub r0, r0, #0xc + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x5 + bhi ._306 @cond_branch + ldrb r0, [r4] + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0x1 + b ._300 +._290: + .align 2, 0 +._289: + .word _nakamuraData4 +._284: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._291 @cond_branch + ldr r4, ._294 + ldrb r0, [r4] + cmp r0, #0x5 + bhi ._304 @cond_branch + mov r1, #0x1 + neg r1, r1 + b ._293 +._295: + .align 2, 0 +._294: + .word _nakamuraData4 +._291: + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._296 @cond_branch + ldr r4, ._301 + ldrb r0, [r4] + cmp r0, #0x5 + bhi ._297 @cond_branch + mov r1, #0xa + bl debug_sub_81601C8 +._297: + ldrb r0, [r4] + sub r0, r0, #0x6 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x5 + bhi ._298 @cond_branch + ldrb r0, [r4] + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl debug_sub_8160258 +._298: + ldrb r0, [r4] + sub r0, r0, #0xc + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x5 + bhi ._306 @cond_branch + ldrb r0, [r4] + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0x1 + b ._300 +._302: + .align 2, 0 +._301: + .word _nakamuraData4 +._296: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._303 @cond_branch + ldr r4, ._308 + ldrb r0, [r4] + cmp r0, #0x5 + bhi ._304 @cond_branch + mov r1, #0xa + neg r1, r1 +._293: + bl debug_sub_81601C8 +._304: + ldrb r0, [r4] + sub r0, r0, #0x6 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x5 + bhi ._305 @cond_branch + ldrb r0, [r4] + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl debug_sub_8160258 +._305: + ldrb r0, [r4] + sub r0, r0, #0xc + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x5 + bhi ._306 @cond_branch + ldrb r0, [r4] + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0x1 + neg r1, r1 +._300: + bl debug_sub_816027C +._306: + ldrb r0, [r4] + mov r1, #0x6 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl debug_sub_816017C + mov r0, #0x0 + b ._311 +._309: + .align 2, 0 +._308: + .word _nakamuraData4 +._303: + mov r0, #0x8 + and r0, r0, r2 + cmp r0, #0 + bne ._310 @cond_branch + mov r0, #0x0 + b ._311 +._310: + bl debug_sub_8160308 + bl CloseMenu + mov r0, #0x1 +._311: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_8160498 + + thumb_func_start debug_sub_816062C +debug_sub_816062C: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + add sp, sp, #0xfffffff0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r8, r0 + mov r0, #0x64 + mov r4, r8 + mul r4, r4, r0 + ldr r0, ._316 + add r4, r4, r0 + add r0, r4, #0 + mov r1, #0xb + bl GetMonData + lsl r0, r0, #0x10 + lsr r7, r0, #0x10 + add r0, r4, #0 + bl GetMonGender + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + ldr r1, ._316 + 4 + lsl r0, r7, #0x3 + sub r0, r0, r7 + lsl r0, r0, #0x2 + add r0, r0, r1 + ldrb r6, [r0, #0x10] + cmp r6, #0 + beq ._313 @cond_branch + cmp r6, #0xfe + beq ._313 @cond_branch + cmp r6, #0xff + bne ._314 @cond_branch +._313: + mov r0, #0x64 + mov r1, r8 + mul r1, r1, r0 + add r0, r1, #0 + ldr r1, ._316 + add r0, r0, r1 + bl GetMonGender + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._320 +._317: + .align 2, 0 +._316: + .word gPlayerParty + .word gBaseStats +._314: + cmp r2, #0 + beq ._318 @cond_branch + cmp r2, #0xfe + beq ._319 @cond_branch + mov r0, #0x0 + b ._320 +._318: + mov r6, #0xfe + b ._321 +._319: + mov r6, #0x0 +._321: + mov r0, r8 + lsl r0, r0, #0x2 + mov r9, r0 +._322: + bl Random + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + bl Random + lsl r0, r0, #0x10 + orr r5, r5, r0 + add r0, r7, #0 + add r1, r5, #0 + bl GetGenderFromSpeciesAndPersonality + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, r6 + bne ._322 @cond_branch + mov r0, #0x64 + mov r4, r8 + mul r4, r4, r0 + ldr r0, ._323 + add r4, r4, r0 + add r0, r4, #0 + mov r1, #0x42 + bl GetMonData + ldr r0, ._323 + 4 + add r0, r0, r9 + ldrh r1, [r0] + ldrb r2, [r0, #0x2] + mov r0, #0x1 + str r0, [sp] + str r5, [sp, #0x4] + mov r0, #0x0 + str r0, [sp, #0x8] + str r0, [sp, #0xc] + add r0, r4, #0 + mov r3, #0x20 + bl CreateMon + add r0, r6, #0 +._320: + add sp, sp, #0x10 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._324: + .align 2, 0 +._323: + .word gPlayerParty + .word _nakamuraStatic0 + + thumb_func_end debug_sub_816062C + + thumb_func_start debug_sub_8160714 +debug_sub_8160714: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + add sp, sp, #0xfffffff0 + add r6, r0, #0 + mov r9, r1 + mov r7, #0x0 + mov r0, #0x0 + mov r8, r0 + mov r2, #0x0 + mov r5, #0x0 +._329: + add r4, r5, #1 + lsl r1, r4, #0x18 + lsr r1, r1, #0x18 + mov r0, r9 + str r2, [sp, #0xc] + bl GetPokeblockData + add r1, r0, #0 + lsl r0, r5, #0x1 + add r0, r0, sp + strh r1, [r0] + ldr r2, [sp, #0xc] + cmp r5, #0x5 + beq ._328 @cond_branch + lsl r0, r1, #0x10 + asr r1, r0, #0x10 + cmp r1, #0 + ble ._326 @cond_branch + add r0, r7, #1 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._326: + cmp r1, #0 + bge ._327 @cond_branch + mov r0, r8 + add r0, r0, #0x1 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r8, r0 +._327: + cmp r1, #0 + bne ._328 @cond_branch + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 +._328: + lsl r0, r4, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x5 + bls ._329 @cond_branch + mov r0, sp + mov r1, #0x0 + ldsh r0, [r0, r1] + cmp r0, #0x31 + bgt ._333 @cond_branch + mov r0, sp + ldrh r0, [r0, #0x2] + lsl r0, r0, #0x10 + asr r0, r0, #0x10 + cmp r0, #0x31 + bgt ._333 @cond_branch + mov r0, sp + mov r4, #0x4 + ldsh r0, [r0, r4] + cmp r0, #0x31 + bgt ._333 @cond_branch + mov r0, sp + mov r1, #0x6 + ldsh r0, [r0, r1] + cmp r0, #0x31 + bgt ._333 @cond_branch + mov r0, sp + mov r4, #0x8 + ldsh r0, [r0, r4] + cmp r0, #0x31 + ble ._334 @cond_branch +._333: + ldr r1, ._336 + add r0, r6, #0 + bl StringCopy + mov r0, #0xe + b ._400 +._337: + .align 2, 0 +._336: + .word ContestStatsText_GoldPokeBlock +._334: + cmp r7, #0x4 + bne ._338 @cond_branch + ldr r1, ._340 + add r0, r6, #0 + bl StringCopy + mov r0, #0xd + b ._400 +._341: + .align 2, 0 +._340: + .word ContestStatsText_WhitePokeBlock +._338: + mov r3, #0x0 + mov r5, #0x0 +._343: + lsl r0, r5, #0x1 + add r0, r0, sp + mov r1, #0x0 + ldsh r0, [r0, r1] + cmp r0, #0x2 + bne ._342 @cond_branch + add r0, r3, #1 + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 +._342: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x4 + bls ._343 @cond_branch + cmp r3, #0x3 + beq ._345 @cond_branch + cmp r2, #0x5 + beq ._345 @cond_branch + mov r4, r8 + cmp r4, #0x4 + bne ._346 @cond_branch +._345: + ldr r1, ._348 + add r0, r6, #0 + bl StringCopy + mov r0, #0xc + b ._400 +._349: + .align 2, 0 +._348: + .word ContestStatsText_BlackPokeBlock +._346: + cmp r7, #0x3 + bne ._350 @cond_branch + ldr r1, ._352 + add r0, r6, #0 + bl StringCopy + mov r0, #0xb + b ._400 +._353: + .align 2, 0 +._352: + .word ContestStatsText_GrayPokeBlock +._350: + cmp r7, #0x2 + beq ._354 @cond_branch + mov r0, r8 + cmp r0, #0x2 + bne ._377 @cond_branch +._354: + mov r3, #0x6 + mov r2, #0x0 + mov r5, #0x0 +._359: + lsl r0, r5, #0x1 + add r0, r0, sp + mov r1, #0x0 + ldsh r0, [r0, r1] + cmp r0, #0 + beq ._358 @cond_branch + cmp r3, #0x6 + bne ._357 @cond_branch + add r3, r5, #0 + b ._358 +._357: + add r2, r5, #0 +._358: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x4 + bls ._359 @cond_branch + lsl r0, r3, #0x1 + mov r4, sp + add r1, r4, r0 + lsl r0, r2, #0x1 + add r0, r0, sp + mov r4, #0x0 + ldsh r1, [r1, r4] + mov r4, #0x0 + ldsh r0, [r0, r4] + cmp r1, r0 + blt ._360 @cond_branch + add r2, r3, #0 +._360: + cmp r2, #0 + bne ._361 @cond_branch + ldr r1, ._363 + add r0, r6, #0 + bl StringCopy + mov r0, #0x6 + b ._400 +._364: + .align 2, 0 +._363: + .word ContestStatsText_PurplePokeBlock +._361: + cmp r2, #0x1 + bne ._365 @cond_branch + ldr r1, ._367 + add r0, r6, #0 + bl StringCopy + mov r0, #0x7 + b ._400 +._368: + .align 2, 0 +._367: + .word ContestStatsText_IndigoPokeBlock +._365: + cmp r2, #0x2 + bne ._369 @cond_branch + ldr r1, ._371 + add r0, r6, #0 + bl StringCopy + mov r0, #0x8 + b ._400 +._372: + .align 2, 0 +._371: + .word ContestStatsText_BrownPokeBlock +._369: + cmp r2, #0x3 + bne ._373 @cond_branch + ldr r1, ._375 + add r0, r6, #0 + bl StringCopy + mov r0, #0x9 + b ._400 +._376: + .align 2, 0 +._375: + .word ContestStatsText_LiteBluePokeBlock +._373: + cmp r2, #0x4 + bne ._377 @cond_branch + ldr r1, ._379 + add r0, r6, #0 + bl StringCopy + mov r0, #0xa + b ._400 +._380: + .align 2, 0 +._379: + .word ContestStatsText_OlivePokeBlock +._377: + cmp r7, #0x1 + beq ._381 @cond_branch + mov r0, r8 + cmp r0, #0x1 + bne ._399 @cond_branch +._381: + mov r0, sp + mov r1, #0x0 + ldsh r0, [r0, r1] + cmp r0, #0 + beq ._383 @cond_branch + ldr r1, ._385 + add r0, r6, #0 + bl StringCopy + mov r0, #0x1 + b ._400 +._386: + .align 2, 0 +._385: + .word ContestStatsText_RedPokeBlock +._383: + mov r0, sp + ldrh r0, [r0, #0x2] + cmp r0, #0 + beq ._387 @cond_branch + ldr r1, ._389 + add r0, r6, #0 + bl StringCopy + mov r0, #0x2 + b ._400 +._390: + .align 2, 0 +._389: + .word ContestStatsText_BluePokeBlock +._387: + mov r0, sp + mov r4, #0x4 + ldsh r0, [r0, r4] + cmp r0, #0 + beq ._391 @cond_branch + ldr r1, ._393 + add r0, r6, #0 + bl StringCopy + mov r0, #0x3 + b ._400 +._394: + .align 2, 0 +._393: + .word ContestStatsText_PinkPokeBlock +._391: + mov r0, sp + mov r1, #0x6 + ldsh r0, [r0, r1] + cmp r0, #0 + beq ._395 @cond_branch + ldr r1, ._397 + add r0, r6, #0 + bl StringCopy + mov r0, #0x4 + b ._400 +._398: + .align 2, 0 +._397: + .word ContestStatsText_GreenPokeBlock +._395: + mov r0, sp + mov r4, #0x8 + ldsh r0, [r0, r4] + cmp r0, #0 + beq ._399 @cond_branch + ldr r1, ._401 + add r0, r6, #0 + bl StringCopy + mov r0, #0x5 + b ._400 +._402: + .align 2, 0 +._401: + .word ContestStatsText_YellowPokeBlock +._399: + ldr r1, ._403 + add r0, r6, #0 + bl StringCopy + mov r0, #0x0 +._400: + add sp, sp, #0x10 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._404: + .align 2, 0 +._403: + .word gOtherText_FiveQuestions + + thumb_func_end debug_sub_8160714 + + thumb_func_start debug_sub_816097C +debug_sub_816097C: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add r7, r0, #0 + lsl r1, r1, #0x10 + lsr r5, r1, #0x10 + mov r6, #0x0 + mov r1, #0x0 +._405: + add r0, r7, r6 + strb r1, [r0] + add r0, r6, #1 + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + cmp r6, #0x3 + bls ._405 @cond_branch + mov r0, #0xff + strb r0, [r7, #0x4] + lsl r0, r5, #0x10 + asr r0, r0, #0x10 + cmp r0, #0 + bne ._406 @cond_branch + mov r0, #0xa1 + strb r0, [r7, #0x3] + b ._414 +._406: + cmp r0, #0 + ble ._408 @cond_branch + mov r4, #0x64 + mov r0, #0x0 + mov r8, r0 + mov r6, #0x0 +._412: + lsl r5, r5, #0x10 + asr r0, r5, #0x10 + lsl r4, r4, #0x10 + asr r1, r4, #0x10 + bl __divsi3 + lsl r0, r0, #0x10 + lsr r2, r0, #0x10 + mov r1, r8 + cmp r1, #0 + bne ._410 @cond_branch + cmp r6, #0x2 + beq ._410 @cond_branch + cmp r2, #0 + beq ._411 @cond_branch +._410: + add r1, r6, r7 + add r0, r2, #0 + sub r0, r0, #0x5f + strb r0, [r1, #0x1] + mov r0, #0x1 + mov r8, r0 +._411: + asr r0, r5, #0x10 + asr r4, r4, #0x10 + add r1, r4, #0 + bl __modsi3 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + add r0, r4, #0 + mov r1, #0xa + bl __divsi3 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + add r0, r6, #1 + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + cmp r6, #0x2 + bls ._412 @cond_branch + b ._414 +._408: + cmp r0, #0 + bge ._414 @cond_branch + neg r0, r0 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + mov r4, #0x64 + mov r1, #0x0 + mov r8, r1 + mov r6, #0x0 +._419: + lsl r5, r5, #0x10 + asr r0, r5, #0x10 + lsl r4, r4, #0x10 + asr r1, r4, #0x10 + bl __divsi3 + lsl r0, r0, #0x10 + lsr r2, r0, #0x10 + mov r1, r8 + lsl r0, r1, #0x10 + add r3, r0, #0 + cmp r3, #0 + bne ._416 @cond_branch + cmp r6, #0x2 + beq ._416 @cond_branch + cmp r2, #0 + beq ._417 @cond_branch +._416: + add r1, r6, r7 + add r0, r2, #0 + sub r0, r0, #0x5f + strb r0, [r1, #0x1] + cmp r3, #0 + bne ._418 @cond_branch + mov r0, #0xae + strb r0, [r1] +._418: + mov r0, #0x1 + mov r8, r0 +._417: + asr r0, r5, #0x10 + asr r4, r4, #0x10 + add r1, r4, #0 + bl __modsi3 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + add r0, r4, #0 + mov r1, #0xa + bl __divsi3 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + add r0, r6, #1 + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + cmp r6, #0x2 + bls ._419 @cond_branch +._414: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 + + thumb_func_end debug_sub_816097C + + thumb_func_start debug_sub_8160A80 +debug_sub_8160A80: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + add r2, r0, #0 + ldr r1, ._422 + cmp r0, #0 + bne ._420 @cond_branch + ldr r4, ._422 + 4 + ldrb r1, [r1, #0x1] + add r0, r4, #0 + bl debug_sub_816097C + add r0, r4, #0 + mov r1, #0x8 + mov r2, #0x3 + bl Menu_PrintText + b ._440 +._423: + .align 2, 0 +._422: + .word _nakamuraStatic18 + .word gStringVar1 +._420: + cmp r0, #0x1 + bne ._424 @cond_branch + ldr r4, ._426 + ldrb r1, [r1, #0x2] + add r0, r4, #0 + bl debug_sub_816097C + add r0, r4, #0 + mov r1, #0x8 + mov r2, #0x5 + bl Menu_PrintText + b ._440 +._427: + .align 2, 0 +._426: + .word gStringVar1 +._424: + cmp r0, #0x2 + bne ._428 @cond_branch + ldr r4, ._430 + ldrb r1, [r1, #0x3] + add r0, r4, #0 + bl debug_sub_816097C + add r0, r4, #0 + mov r1, #0x8 + mov r2, #0x7 + bl Menu_PrintText + b ._440 +._431: + .align 2, 0 +._430: + .word gStringVar1 +._428: + cmp r0, #0x3 + bne ._432 @cond_branch + ldr r4, ._434 + ldrb r1, [r1, #0x4] + add r0, r4, #0 + bl debug_sub_816097C + add r0, r4, #0 + mov r1, #0x8 + mov r2, #0x9 + bl Menu_PrintText + b ._440 +._435: + .align 2, 0 +._434: + .word gStringVar1 +._432: + cmp r0, #0x4 + bne ._436 @cond_branch + ldr r4, ._438 + ldrb r1, [r1, #0x5] + add r0, r4, #0 + bl debug_sub_816097C + add r0, r4, #0 + mov r1, #0x8 + mov r2, #0xb + bl Menu_PrintText + b ._440 +._439: + .align 2, 0 +._438: + .word gStringVar1 +._436: + cmp r2, #0x5 + bne ._440 @cond_branch + ldr r4, ._441 + ldrb r1, [r1, #0x6] + add r0, r4, #0 + bl debug_sub_816097C + add r0, r4, #0 + mov r1, #0x8 + mov r2, #0xd + bl Menu_PrintText +._440: + pop {r4} + pop {r0} + bx r0 +._442: + .align 2, 0 +._441: + .word gStringVar1 + + thumb_func_end debug_sub_8160A80 + + thumb_func_start debug_sub_8160B50 +debug_sub_8160B50: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + add r3, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r4, r1, #0 + ldr r2, ._445 + cmp r0, #0 + bne ._443 @cond_branch + ldrb r0, [r2, #0x1] + add r0, r0, r1 + strb r0, [r2, #0x1] + b ._455 +._446: + .align 2, 0 +._445: + .word _nakamuraStatic18 +._443: + cmp r0, #0x1 + bne ._447 @cond_branch + ldrb r0, [r2, #0x2] + add r0, r0, r1 + strb r0, [r2, #0x2] + b ._455 +._447: + cmp r0, #0x2 + bne ._449 @cond_branch + ldrb r0, [r2, #0x3] + add r0, r0, r1 + strb r0, [r2, #0x3] + b ._455 +._449: + cmp r0, #0x3 + bne ._451 @cond_branch + ldrb r0, [r2, #0x4] + add r0, r0, r1 + strb r0, [r2, #0x4] + b ._455 +._451: + cmp r0, #0x4 + bne ._453 @cond_branch + ldrb r0, [r2, #0x5] + add r0, r0, r1 + strb r0, [r2, #0x5] + b ._455 +._453: + cmp r3, #0x5 + bne ._455 @cond_branch + ldrb r0, [r2, #0x6] + add r0, r0, r4 + strb r0, [r2, #0x6] +._455: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_8160B50 + + thumb_func_start debug_sub_8160BB0 +debug_sub_8160BB0: + push {r4, r5, lr} + ldr r5, ._456 + ldr r4, ._456 + 4 + add r0, r5, #0 + add r1, r4, #0 + bl debug_sub_8160714 + strb r0, [r4] + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x8 + mov r3, #0x2 + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + pop {r4, r5} + pop {r0} + bx r0 +._457: + .align 2, 0 +._456: + .word gStringVar1 + .word _nakamuraStatic18 + + thumb_func_end debug_sub_8160BB0 + + thumb_func_start debug_sub_8160BE4 +debug_sub_8160BE4: + push {r4, lr} + add sp, sp, #0xfffffff8 + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xc + mov r3, #0xf + bl Menu_DrawStdWindowFrame + bl debug_sub_8160BB0 + ldr r0, ._459 + mov r1, #0x2 + mov r2, #0x3 + bl Menu_PrintText + ldr r0, ._459 + 4 + mov r1, #0x2 + mov r2, #0x5 + bl Menu_PrintText + ldr r0, ._459 + 8 + mov r1, #0x2 + mov r2, #0x7 + bl Menu_PrintText + ldr r0, ._459 + 12 + mov r1, #0x2 + mov r2, #0x9 + bl Menu_PrintText + ldr r0, ._459 + 16 + mov r1, #0x2 + mov r2, #0xb + bl Menu_PrintText + ldr r0, ._459 + 20 + mov r1, #0x2 + mov r2, #0xd + bl Menu_PrintText + mov r4, #0x0 +._458: + add r0, r4, #0 + bl debug_sub_8160A80 + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x5 + bls ._458 @cond_branch + mov r0, #0x0 + str r0, [sp] + mov r0, #0xb + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x6 + bl InitMenu + add sp, sp, #0x8 + pop {r4} + pop {r0} + bx r0 +._460: + .align 2, 0 +._459: + .word gContestStatsText_Spicy + .word gContestStatsText_Dry + .word gContestStatsText_Sweet + .word gContestStatsText_Bitter + .word gContestStatsText_Sour + .word gContestStatsText_Tasty + + thumb_func_end debug_sub_8160BE4 + + thumb_func_start debug_sub_8160C7C +debug_sub_8160C7C: + push {r4, lr} + ldr r2, ._469 + mov r1, #0x0 + ldrb r0, [r2] + cmp r0, #0xc + bne ._467 @cond_branch + ldrb r0, [r2, #0x1] + cmp r0, #0x2 + bne ._462 @cond_branch + mov r1, #0x1 +._462: + ldrb r0, [r2, #0x3] + cmp r0, #0x2 + bne ._463 @cond_branch + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 +._463: + ldrb r0, [r2, #0x4] + cmp r0, #0x2 + bne ._464 @cond_branch + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 +._464: + ldrb r0, [r2, #0x2] + cmp r0, #0x2 + bne ._465 @cond_branch + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 +._465: + ldrb r0, [r2, #0x5] + cmp r0, #0x2 + bne ._466 @cond_branch + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 +._466: + cmp r1, #0x3 + beq ._467 @cond_branch + mov r0, #0x2 + strb r0, [r2, #0x1] + strb r0, [r2, #0x3] + strb r0, [r2, #0x4] +._467: + add r0, r2, #0 + bl sub_810CA34 + bl debug_sub_8160BB0 + mov r4, #0x0 +._468: + add r0, r4, #0 + bl debug_sub_8160A80 + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x5 + bls ._468 @cond_branch + pop {r4} + pop {r0} + bx r0 +._470: + .align 2, 0 +._469: + .word _nakamuraStatic18 + + thumb_func_end debug_sub_8160C7C + + thumb_func_start debug_sub_8160CF4 +debug_sub_8160CF4: + push {lr} + ldr r2, ._473 + ldrh r1, [r2, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._471 @cond_branch + mov r0, #0x1 + neg r0, r0 + b ._472 +._474: + .align 2, 0 +._473: + .word gMain +._471: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._475 @cond_branch + mov r0, #0x1 +._472: + bl Menu_MoveCursor + mov r0, #0x0 + b ._484 +._475: + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._477 @cond_branch + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0x1 + neg r1, r1 + b ._478 +._477: + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._479 @cond_branch + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0x1 +._478: + bl debug_sub_8160B50 + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl debug_sub_8160A80 + bl debug_sub_8160BB0 + mov r0, #0x0 + b ._484 +._479: + ldrh r1, [r2, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._481 @cond_branch + bl debug_sub_8160C7C + mov r0, #0x5 + bl PlaySE + mov r0, #0x0 + b ._484 +._481: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + bne ._483 @cond_branch + mov r0, #0x0 + b ._484 +._483: + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + bl CloseMenu + mov r0, #0x1 +._484: + pop {r1} + bx r1 + + thumb_func_end debug_sub_8160CF4 + + thumb_func_start debug_sub_8160D98 +debug_sub_8160D98: + push {lr} + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + bl debug_sub_8160BE4 + ldr r1, ._485 + ldr r0, ._485 + 4 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._486: + .align 2, 0 +._485: + .word gMenuCallback + .word debug_sub_8160CF4+1 + + thumb_func_end debug_sub_8160D98 + + thumb_func_start debug_sub_8160DC0 +debug_sub_8160DC0: + push {lr} + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x16 + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r0, ._487 + mov r1, #0xb + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._487 + 4 + mov r1, #0x2 + mov r2, #0x3 + bl Menu_PrintText + ldr r0, ._487 + 8 + mov r1, #0x2 + mov r2, #0x5 + bl Menu_PrintText + ldr r0, ._487 + 12 + mov r1, #0x2 + mov r2, #0x7 + bl Menu_PrintText + ldr r0, ._487 + 16 + mov r1, #0x2 + mov r2, #0x9 + bl Menu_PrintText + ldr r0, ._487 + 20 + mov r1, #0x2 + mov r2, #0xb + bl Menu_PrintText + ldr r0, ._487 + 24 + mov r1, #0x2 + mov r2, #0xd + bl Menu_PrintText + ldr r0, ._487 + 28 + mov r1, #0x2 + mov r2, #0xf + bl Menu_PrintText + ldr r0, ._487 + 32 + mov r1, #0x2 + mov r2, #0x11 + bl Menu_PrintText + pop {r0} + bx r0 +._488: + .align 2, 0 +._487: + .word gOtherText_Slash + .word Str_843E5F2 + .word Str_843E5FB + .word Str_843E606 + .word Str_843E611 + .word Str_843E61C + .word Str_843E627 + .word Str_843E637 + .word Str_843E632 + + thumb_func_end debug_sub_8160DC0 + + thumb_func_start debug_sub_8160E50 +debug_sub_8160E50: + push {r4, r5, r6, lr} + add r6, r0, #0 + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0xa + mov r3, #0x2 + bl Menu_BlankWindowRect + ldr r5, ._489 + add r0, r6, #0 + mov r1, #0x2 + add r2, r5, #0 + bl GetMonData + add r0, r5, #0 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + mov r0, #0xc + mov r1, #0x1 + mov r2, #0x15 + mov r3, #0x2 + bl Menu_BlankWindowRect + add r0, r6, #0 + mov r1, #0xb + bl GetMonData + mov r1, #0xb + mul r0, r0, r1 + ldr r1, ._489 + 4 + add r0, r0, r1 + mov r1, #0xc + mov r2, #0x1 + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x1a + bl GetMonData + add r4, r0, #0 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r5, #0 + add r1, r4, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0x3 + mov r2, #0x11 + mov r3, #0x4 + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0x3 + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x1b + bl GetMonData + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r4, r4, r1 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0x5 + mov r2, #0x11 + mov r3, #0x6 + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0x5 + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x1c + bl GetMonData + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r4, r4, r1 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0x7 + mov r2, #0x11 + mov r3, #0x8 + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0x7 + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x1d + bl GetMonData + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r4, r4, r1 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0x9 + mov r2, #0x11 + mov r3, #0xa + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0x9 + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x1e + bl GetMonData + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r4, r4, r1 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0xb + mov r2, #0x11 + mov r3, #0xc + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0xb + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x1f + bl GetMonData + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r4, r4, r1 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0xd + mov r2, #0x11 + mov r3, #0xe + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0xd + bl Menu_PrintText + add r0, r5, #0 + add r1, r4, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0xf + mov r2, #0x11 + mov r3, #0x10 + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0xf + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x20 + bl GetMonData + add r1, r0, #0 + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + mov r0, #0xd + mov r1, #0x11 + mov r2, #0x11 + mov r3, #0x12 + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0xd + mov r2, #0x11 + bl Menu_PrintText + pop {r4, r5, r6} + pop {r0} + bx r0 +._490: + .align 2, 0 +._489: + .word gStringVar1 + .word gSpeciesNames + + thumb_func_end debug_sub_8160E50 + + thumb_func_start debug_sub_8161028 +debug_sub_8161028: + push {r4, r5, r6, lr} + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + bne ._491 @cond_branch + ldr r0, ._496 + ldrb r0, [r0] + cmp r0, #0 + bne ._492 @cond_branch + mov r5, #0x5 +._494: + lsl r0, r5, #0x10 + asr r4, r0, #0x10 + mov r0, #0x64 + mul r0, r0, r4 + ldr r1, ._496 + 4 + add r0, r0, r1 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + bne ._493 @cond_branch + sub r0, r4, #1 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + cmp r0, #0 + bge ._494 @cond_branch +._492: + ldr r1, ._496 + ldrb r0, [r1] + add r0, r0, r6 + strb r0, [r1] + b ._506 +._497: + .align 2, 0 +._496: + .word _nakamuraData5 + .word gPlayerParty +._491: + cmp r1, #0x1 + bne ._506 @cond_branch + ldr r4, ._501 + ldrb r0, [r4] + add r0, r0, r6 + strb r0, [r4] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x6 + bne ._499 @cond_branch + mov r0, #0x0 + b ._500 +._502: + .align 2, 0 +._501: + .word _nakamuraData5 +._493: + ldr r0, ._504 + strb r5, [r0] + b ._506 +._505: + .align 2, 0 +._504: + .word _nakamuraData5 +._499: + ldrb r1, [r4] + mov r0, #0x64 + mul r0, r0, r1 + ldr r1, ._507 + add r0, r0, r1 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + bne ._506 @cond_branch +._500: + strb r0, [r4] +._506: + pop {r4, r5, r6} + pop {r0} + bx r0 +._508: + .align 2, 0 +._507: + .word gPlayerParty + + thumb_func_end debug_sub_8161028 + + thumb_func_start debug_sub_81610BC +debug_sub_81610BC: + push {lr} + ldr r0, ._511 + ldrh r1, [r0, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._509 @cond_branch + mov r0, #0x1 + neg r0, r0 + b ._510 +._512: + .align 2, 0 +._511: + .word gMain +._509: + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._513 @cond_branch + mov r0, #0x1 +._510: + bl debug_sub_8161028 + ldr r0, ._515 + ldrb r1, [r0] + mov r0, #0x64 + mul r0, r0, r1 + ldr r1, ._515 + 4 + add r0, r0, r1 + bl debug_sub_8160E50 + mov r0, #0x0 + b ._518 +._516: + .align 2, 0 +._515: + .word _nakamuraData5 + .word gPlayerParty +._513: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + bne ._517 @cond_branch + mov r0, #0x0 + b ._518 +._517: + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + bl CloseMenu + mov r0, #0x1 +._518: + pop {r1} + bx r1 + + thumb_func_end debug_sub_81610BC + + thumb_func_start DebugMenu_EffortValues +DebugMenu_EffortValues: + push {lr} + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + ldr r1, ._519 + mov r0, #0x0 + strb r0, [r1] + bl debug_sub_8160DC0 + ldr r0, ._519 + 4 + bl debug_sub_8160E50 + ldr r1, ._519 + 8 + ldr r0, ._519 + 12 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._520: + .align 2, 0 +._519: + .word _nakamuraData5 + .word gPlayerParty + .word gMenuCallback + .word debug_sub_81610BC+1 + + thumb_func_end DebugMenu_EffortValues + + thumb_func_start debug_sub_8161160 +debug_sub_8161160: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + mov r7, #0x0 + ldr r2, ._523 + ldr r1, ._523 + 4 + ldrh r0, [r2] + ldrh r3, [r1] + cmp r0, r3 + bhi ._521 @cond_branch + add r6, r0, #0 + ldrh r5, [r1] + b ._522 +._524: + .align 2, 0 +._523: + .word _nakamuraData6 + .word _nakamuraData8 +._521: + ldrh r6, [r1] + ldrh r5, [r2] +._522: + mov r4, #0x0 + ldr r0, ._529 + ldrh r0, [r0] + cmp r4, r0 + bcs ._525 @cond_branch + ldr r0, ._529 + 4 + mov r8, r0 +._528: + bl Random + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r2, r8 + ldrh r1, [r2] + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + cmp r0, r6 + bcc ._527 @cond_branch + cmp r0, r5 + bhi ._527 @cond_branch + add r0, r7, #1 + lsl r0, r0, #0x10 + lsr r7, r0, #0x10 +._527: + add r4, r4, #0x1 + ldr r0, ._529 + ldrh r0, [r0] + cmp r4, r0 + bcc ._528 @cond_branch +._525: + add r0, r7, #0 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._530: + .align 2, 0 +._529: + .word _nakamuraDataA + .word _nakamuraDataC + + thumb_func_end debug_sub_8161160 + + thumb_func_start debug_sub_81611D8 +debug_sub_81611D8: + push {r4, lr} + add sp, sp, #0xfffffff8 + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xf + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r0, ._531 + mov r1, #0x2 + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._531 + 4 + mov r1, #0x2 + mov r2, #0x3 + bl Menu_PrintText + ldr r0, ._531 + 8 + mov r1, #0x2 + mov r2, #0x5 + bl Menu_PrintText + ldr r0, ._531 + 12 + mov r1, #0x2 + mov r2, #0x7 + bl Menu_PrintText + ldr r0, ._531 + 16 + mov r1, #0x2 + mov r2, #0x9 + bl Menu_PrintText + ldr r0, ._531 + 20 + mov r1, #0xd + mov r2, #0x9 + bl Menu_PrintText + ldr r4, ._531 + 24 + add r0, r4, #0 + mov r1, #0xc + mov r2, #0x1 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0xc + mov r2, #0x3 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0xc + mov r2, #0x5 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0xc + mov r2, #0x7 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0xc + mov r2, #0x9 + bl Menu_PrintText + mov r0, #0x0 + str r0, [sp] + mov r0, #0xe + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x4 + bl InitMenu + add sp, sp, #0x8 + pop {r4} + pop {r0} + bx r0 +._532: + .align 2, 0 +._531: + .word Str_843E642 + .word Str_843E647 + .word Str_843E65A + .word Str_843E64C + .word Str_843E651 + .word Str_843E655 + .word Str_843E658 + + thumb_func_end debug_sub_81611D8 + + thumb_func_start debug_sub_8161290 +debug_sub_8161290: + push {r4, lr} + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + ldr r4, ._533 + add r0, r4, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x8 + mov r2, #0x9 + bl Menu_PrintText + pop {r4} + pop {r0} + bx r0 +._534: + .align 2, 0 +._533: + .word gStringVar1 + + thumb_func_end debug_sub_8161290 + + thumb_func_start debug_sub_81612B8 +debug_sub_81612B8: + push {r4, r5, lr} + add r4, r2, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + lsl r1, r1, #0x18 + asr r1, r1, #0x18 + ldrh r2, [r0] + add r1, r1, r2 + strh r1, [r0] + ldr r5, ._535 + ldrh r1, [r0] + add r0, r5, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r5, #0 + mov r1, #0x8 + add r2, r4, #0 + bl Menu_PrintText + pop {r4, r5} + pop {r0} + bx r0 +._536: + .align 2, 0 +._535: + .word gStringVar1 + + thumb_func_end debug_sub_81612B8 + + thumb_func_start debug_sub_81612EC +debug_sub_81612EC: + push {r4, r5, lr} + ldr r2, ._540 + ldrh r1, [r2, #0x2c] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + mov r5, #0x1 + cmp r0, #0 + beq ._537 @cond_branch + mov r5, #0x64 +._537: + ldrh r1, [r2, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._538 @cond_branch + mov r0, #0x1 + neg r0, r0 + b ._539 +._541: + .align 2, 0 +._540: + .word gMain +._538: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._542 @cond_branch + mov r0, #0x1 +._539: + bl Menu_MoveCursor +._565: + mov r0, #0x0 + b ._543 +._542: + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._544 @cond_branch + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + asr r4, r0, #0x18 + cmp r4, #0 + bne ._545 @cond_branch + ldr r0, ._550 + neg r1, r5 + mov r2, #0x1 + bl debug_sub_81612B8 +._545: + cmp r4, #0x1 + bne ._546 @cond_branch + ldr r0, ._550 + 4 + neg r1, r5 + mov r2, #0x3 + bl debug_sub_81612B8 +._546: + cmp r4, #0x2 + bne ._547 @cond_branch + ldr r0, ._550 + 8 + neg r1, r5 + mov r2, #0x5 + bl debug_sub_81612B8 +._547: + cmp r4, #0x3 + bne ._565 @cond_branch + ldr r0, ._550 + 12 + neg r1, r5 + mov r2, #0x7 + bl debug_sub_81612B8 + b ._565 +._551: + .align 2, 0 +._550: + .word _nakamuraData6 + .word _nakamuraData8 + .word _nakamuraDataC + .word _nakamuraDataA +._544: + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._552 @cond_branch + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + asr r4, r0, #0x18 + cmp r4, #0 + bne ._553 @cond_branch + ldr r0, ._558 + add r1, r5, #0 + mov r2, #0x1 + bl debug_sub_81612B8 +._553: + cmp r4, #0x1 + bne ._554 @cond_branch + ldr r0, ._558 + 4 + add r1, r5, #0 + mov r2, #0x3 + bl debug_sub_81612B8 +._554: + cmp r4, #0x2 + bne ._555 @cond_branch + ldr r0, ._558 + 8 + add r1, r5, #0 + mov r2, #0x5 + bl debug_sub_81612B8 +._555: + cmp r4, #0x3 + bne ._565 @cond_branch + ldr r0, ._558 + 12 + add r1, r5, #0 + mov r2, #0x7 + bl debug_sub_81612B8 + b ._565 +._559: + .align 2, 0 +._558: + .word _nakamuraData6 + .word _nakamuraData8 + .word _nakamuraDataC + .word _nakamuraDataA +._552: + ldrh r1, [r2, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._560 @cond_branch + ldr r0, ._563 + ldrh r0, [r0] + cmp r0, #0 + beq ._565 @cond_branch + mov r0, #0x5 + bl PlaySE + bl debug_sub_8161160 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl debug_sub_8161290 + b ._565 +._564: + .align 2, 0 +._563: + .word _nakamuraDataC +._560: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._565 @cond_branch + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + bl CloseMenu + mov r0, #0x1 +._543: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_81612EC + + thumb_func_start DebugMenu_RandomNumberTest +DebugMenu_RandomNumberTest: + push {lr} + ldr r0, ._566 + mov r1, #0x0 + strh r1, [r0] + ldr r0, ._566 + 4 + strh r1, [r0] + ldr r0, ._566 + 8 + strh r1, [r0] + ldr r0, ._566 + 12 + strh r1, [r0] + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_EraseWindowRect + bl debug_sub_81611D8 + ldr r1, ._566 + 16 + ldr r0, ._566 + 20 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._567: + .align 2, 0 +._566: + .word _nakamuraData6 + .word _nakamuraData8 + .word _nakamuraDataC + .word _nakamuraDataA + .word gMenuCallback + .word debug_sub_81612EC+1 + + thumb_func_end DebugMenu_RandomNumberTest + + .align 2, 0 + +.endif diff --git a/asm/nohara_debug_menu.s b/asm/nohara_debug_menu.s new file mode 100644 index 000000000..88e6f1868 --- /dev/null +++ b/asm/nohara_debug_menu.s @@ -0,0 +1,2198 @@ +.if DEBUG + + .include "constants/gba_constants.inc" + .include "include/macros.inc" + + .text + + thumb_func_start InitNoharaDebugMenu +InitNoharaDebugMenu: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x13 + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._1 + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x12 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._1 + 4 + ldr r0, ._1 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._2: + .align 2, 0 +._1: + .word gUnknown_Debug_083C4938 + .word gMenuCallback + .word debug_sub_808F414+1 + + thumb_func_end InitNoharaDebugMenu + + thumb_func_start debug_sub_808F414 +debug_sub_808F414: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._3 @cond_branch + add r0, r0, #0x1 + cmp r1, r0 + beq ._4 @cond_branch + ldr r2, ._6 + ldr r0, ._6 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] +._3: + mov r0, #0x0 + b ._5 +._7: + .align 2, 0 +._6: + .word gMenuCallback + .word gUnknown_Debug_083C4938 +._4: + bl CloseMenu + mov r0, #0x1 +._5: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808F414 + + thumb_func_start NoharaDebugMenu_TV +NoharaDebugMenu_TV: + push {lr} + add sp, sp, #0xfffffff8 + ldr r1, ._8 + mov r0, #0x0 + strb r0, [r1] + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xa + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._8 + 4 + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x9 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._8 + 8 + ldr r0, ._8 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._9: + .align 2, 0 +._8: + .word gDebug_03000726 + .word gUnknown_Debug_083C4B8C + .word gMenuCallback + .word debug_sub_808F4AC+1 + + thumb_func_end NoharaDebugMenu_TV + + thumb_func_start debug_sub_808F4AC +debug_sub_808F4AC: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._10 @cond_branch + add r0, r0, #0x1 + cmp r1, r0 + beq ._11 @cond_branch + ldr r2, ._13 + ldr r0, ._13 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] +._10: + mov r0, #0x0 + b ._12 +._14: + .align 2, 0 +._13: + .word gMenuCallback + .word gUnknown_Debug_083C4B8C +._11: + bl CloseMenu + mov r0, #0x1 +._12: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808F4AC + + thumb_func_start debug_sub_808F4EC +debug_sub_808F4EC: + push {lr} + bl debug_sub_808F6BC + ldr r0, ._15 + bl sub_8071F40 + mov r0, #0x3 + mov r1, #0x3 + mov r2, #0x1 + bl DisplayYesNoMenu + ldr r1, ._15 + 4 + ldr r0, ._15 + 8 + str r0, [r1] + pop {r0} + bx r0 +._16: + .align 2, 0 +._15: + .word gUnknown_Debug_083C4980 + .word gMenuCallback + .word debug_sub_808F648+1 + + thumb_func_end debug_sub_808F4EC + + thumb_func_start debug_sub_808F518 +debug_sub_808F518: + push {r4, lr} + mov r2, #0x0 + ldr r4, ._20 + ldr r3, ._20 + 4 +._19: + lsl r0, r2, #0x3 + add r0, r0, r2 + lsl r0, r0, #0x2 + add r1, r0, r4 + add r0, r1, r3 + ldrb r0, [r0] + sub r0, r0, #0x15 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x13 + bhi ._18 @cond_branch + ldr r0, ._20 + 8 + add r1, r1, r0 + ldrb r0, [r1] + cmp r0, #0 + bne ._18 @cond_branch + mov r0, #0x1 + strb r0, [r1] +._18: + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x17 + bls ._19 @cond_branch + pop {r4} + pop {r0} + bx r0 +._21: + .align 2, 0 +._20: + .word gSaveBlock1 + .word 0x2738 + .word 0x2739 + + thumb_func_end debug_sub_808F518 + + thumb_func_start debug_sub_808F560 +debug_sub_808F560: + push {r4, lr} + mov r1, #0x0 + ldr r4, ._23 + ldr r3, ._23 + 4 + mov r2, #0x0 +._22: + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r4 + add r0, r0, r3 + strb r2, [r0] + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + cmp r1, #0x17 + bls ._22 @cond_branch + bl CloseMenu + mov r0, #0x1 + pop {r4} + pop {r1} + bx r1 +._24: + .align 2, 0 +._23: + .word gSaveBlock1 + .word 0x2739 + + thumb_func_end debug_sub_808F560 + + thumb_func_start debug_sub_808F594 +debug_sub_808F594: + push {r4, r5, r6, lr} + mov r2, #0x0 + ldr r6, ._27 + ldr r5, ._27 + 4 + ldr r4, ._27 + 8 + mov r3, #0x1 +._26: + lsl r0, r2, #0x3 + add r0, r0, r2 + lsl r0, r0, #0x2 + add r1, r0, r6 + add r0, r1, r5 + ldrb r0, [r0] + cmp r0, #0 + beq ._25 @cond_branch + add r0, r1, r4 + strb r3, [r0] +._25: + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x17 + bls ._26 @cond_branch + bl CloseMenu + mov r0, #0x1 + pop {r4, r5, r6} + pop {r1} + bx r1 +._28: + .align 2, 0 +._27: + .word gSaveBlock1 + .word 0x2738 + .word 0x2739 + + thumb_func_end debug_sub_808F594 + + thumb_func_start debug_sub_808F5D8 +debug_sub_808F5D8: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + mov r4, #0x0 + ldr r6, ._30 + ldr r7, ._30 + 4 + add r0, r7, #1 + mov r8, r0 +._29: + ldr r5, ._30 + 8 + strh r4, [r5] + bl GetSlotMachineId + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r6, #0 + mov r2, #0x0 + mov r3, #0x1 + bl ConvertIntToDecimalStringN + lsl r0, r4, #0x1 + add r0, r0, r4 + lsl r0, r0, #0x2 + add r1, r0, r7 + ldrb r1, [r1] + add r0, r0, r8 + ldrb r2, [r0] + add r0, r6, #0 + bl Menu_PrintText + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0xb + bls ._29 @cond_branch + mov r0, #0x0 + strh r0, [r5] + ldr r1, ._30 + 12 + ldr r0, ._30 + 16 + str r0, [r1] + mov r0, #0x0 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._31: + .align 2, 0 +._30: + .word gStringVar1 + .word gUnknown_Debug_083C4BD4 + .word gSpecialVar_0x8004 + .word gMenuCallback + .word debug_sub_8090278+1 + + thumb_func_end debug_sub_808F5D8 + + thumb_func_start debug_sub_808F648 +debug_sub_808F648: + push {lr} + ldr r0, ._35 + ldrh r1, [r0, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._32 @cond_branch + mov r0, #0xa + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xd + bl Menu_EraseWindowRect + ldr r0, ._35 + 4 + ldrb r1, [r0] + mov r2, #0x1 + eor r1, r1, r2 + strb r1, [r0] + cmp r1, #0 + beq ._33 @cond_branch + bl debug_sub_808F7B4 + b ._40 +._36: + .align 2, 0 +._35: + .word gMain + .word gDebug_03000726 +._33: + bl debug_sub_808F6BC + b ._40 +._32: + bl Menu_ProcessInputNoWrap_ + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._43 @cond_branch + cmp r1, r0 + bgt ._39 @cond_branch + sub r0, r0, #0x1 + cmp r1, r0 + beq ._40 @cond_branch + b ._43 +._39: + cmp r1, #0 + beq ._42 @cond_branch + b ._43 +._40: + mov r0, #0x0 + b ._44 +._42: + bl debug_sub_808F518 +._43: + bl CloseMenu + mov r0, #0x1 +._44: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808F648 + + thumb_func_start debug_sub_808F6BC +debug_sub_808F6BC: + push {r4, r5, r6, lr} + mov r4, #0x0 + ldr r5, ._48 + ldr r6, ._48 + 4 +._45: + lsl r0, r4, #0x3 + add r0, r0, r4 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldr r1, ._48 + 8 + add r0, r0, r1 + ldrb r1, [r0] + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + lsl r1, r4, #0x19 + mov r0, #0xa0 + lsl r0, r0, #0x14 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x0 + bl Menu_PrintText + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x4 + bls ._45 @cond_branch + mov r4, #0x5 + ldr r5, ._48 + ldr r6, ._48 + 4 +._50: + lsl r0, r4, #0x3 + add r0, r0, r4 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldr r1, ._48 + 8 + add r0, r0, r1 + ldrb r1, [r0] + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + cmp r4, #0xe + bhi ._46 @cond_branch + lsl r1, r4, #0x19 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x3 + bl Menu_PrintText + b ._47 +._49: + .align 2, 0 +._48: + .word gStringVar1 + .word gSaveBlock1 + .word 0x2738 +._46: + lsl r1, r4, #0x19 + mov r0, #0xec + lsl r0, r0, #0x18 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x6 + bl Menu_PrintText +._47: + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x17 + bls ._50 @cond_branch + mov r4, #0x0 + ldr r5, ._53 +._55: + ldr r0, ._53 + 4 + lsl r1, r4, #0x2 + add r1, r1, r0 + ldr r0, ._53 + 8 + add r1, r1, r0 + ldrb r1, [r1] + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + cmp r4, #0x7 + bhi ._51 @cond_branch + lsl r1, r4, #0x19 + mov r0, #0xa0 + lsl r0, r0, #0x14 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x9 + bl Menu_PrintText + b ._52 +._54: + .align 2, 0 +._53: + .word gStringVar1 + .word gSaveBlock1 + .word 0x2abc +._51: + lsl r1, r4, #0x19 + mov r0, #0xfa + lsl r0, r0, #0x18 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0xc + bl Menu_PrintText +._52: + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0xf + bls ._55 @cond_branch + pop {r4, r5, r6} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808F6BC + + thumb_func_start debug_sub_808F7B4 +debug_sub_808F7B4: + push {r4, r5, r6, lr} + mov r4, #0x0 + ldr r5, ._59 + ldr r6, ._59 + 4 +._56: + lsl r0, r4, #0x3 + add r0, r0, r4 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldr r1, ._59 + 8 + add r0, r0, r1 + ldrb r1, [r0] + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + lsl r1, r4, #0x19 + mov r0, #0xa0 + lsl r0, r0, #0x14 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x0 + bl Menu_PrintText + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x4 + bls ._56 @cond_branch + mov r4, #0x5 + ldr r5, ._59 + ldr r6, ._59 + 4 +._61: + lsl r0, r4, #0x3 + add r0, r0, r4 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldr r1, ._59 + 8 + add r0, r0, r1 + ldrb r1, [r0] + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + cmp r4, #0xe + bhi ._57 @cond_branch + lsl r1, r4, #0x19 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x3 + bl Menu_PrintText + b ._58 +._60: + .align 2, 0 +._59: + .word gStringVar1 + .word gSaveBlock1 + .word 0x2739 +._57: + lsl r1, r4, #0x19 + mov r0, #0xec + lsl r0, r0, #0x18 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x6 + bl Menu_PrintText +._58: + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x17 + bls ._61 @cond_branch + mov r4, #0x0 + ldr r5, ._64 +._66: + ldr r0, ._64 + 4 + lsl r1, r4, #0x2 + add r1, r1, r0 + ldr r0, ._64 + 8 + add r1, r1, r0 + ldrb r1, [r1] + add r0, r5, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + cmp r4, #0x7 + bhi ._62 @cond_branch + lsl r1, r4, #0x19 + mov r0, #0xa0 + lsl r0, r0, #0x14 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0x9 + bl Menu_PrintText + b ._63 +._65: + .align 2, 0 +._64: + .word gStringVar1 + .word gSaveBlock1 + .word 0x2abd +._62: + lsl r1, r4, #0x19 + mov r0, #0xfa + lsl r0, r0, #0x18 + add r1, r1, r0 + lsr r1, r1, #0x18 + add r0, r5, #0 + mov r2, #0xc + bl Menu_PrintText +._63: + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0xf + bls ._66 @cond_branch + pop {r4, r5, r6} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808F7B4 + + thumb_func_start debug_sub_808F8AC +debug_sub_808F8AC: + push {lr} + ldr r0, ._67 + bl FlagSet + ldr r0, ._67 + 4 + bl FlagSet + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._68: + .align 2, 0 +._67: + .word 0x832 + .word 0x818 + + thumb_func_end debug_sub_808F8AC + + thumb_func_start debug_sub_808F8CC +debug_sub_808F8CC: + push {r4, lr} + ldr r1, ._69 + mov r0, #0x0 + strb r0, [r1] + ldr r0, ._69 + 4 + bl sub_8071F40 + mov r0, #0xd + mov r1, #0x6 + mov r2, #0x1a + mov r3, #0x8 + bl Menu_BlankWindowRect + ldr r0, ._69 + 8 + ldr r0, [r0] + mov r1, #0xe + mov r2, #0x7 + bl Menu_PrintText + mov r0, #0x16 + mov r1, #0x1 + mov r2, #0x18 + mov r3, #0x2 + bl Menu_BlankWindowRect + ldr r4, ._69 + 12 + add r0, r4, #0 + mov r1, #0x0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x17 + mov r2, #0x1 + bl Menu_PrintText + ldr r1, ._69 + 16 + ldr r0, ._69 + 20 + str r0, [r1] + pop {r4} + pop {r0} + bx r0 +._70: + .align 2, 0 +._69: + .word gDebug_03000724 + .word gUnknown_Debug_083C49CA + .word gUnknown_Debug_083C4ABD+0xf + .word gStringVar1 + .word gMenuCallback + .word debug_sub_808F93C+1 + + thumb_func_end debug_sub_808F8CC + + thumb_func_start debug_sub_808F93C +debug_sub_808F93C: + push {r4, lr} + mov r2, #0x0 + ldr r0, ._83 + ldrh r1, [r0, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._71 @cond_branch + ldr r1, ._83 + 4 + ldrb r0, [r1] + add r0, r0, #0x1 + strb r0, [r1] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x18 + bne ._72 @cond_branch + strb r2, [r1] +._72: + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._71: + ldr r0, ._83 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._73 @cond_branch + ldr r1, ._83 + 4 + ldrb r0, [r1] + cmp r0, #0 + bne ._74 @cond_branch + mov r0, #0x18 + strb r0, [r1] +._74: + ldrb r0, [r1] + sub r0, r0, #0x1 + strb r0, [r1] + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._73: + ldr r0, ._83 + ldrh r1, [r0, #0x2e] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._75 @cond_branch + ldr r1, ._83 + 8 + ldrb r0, [r1] + add r0, r0, #0x1 + strb r0, [r1] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0xc + bne ._76 @cond_branch + mov r0, #0x0 + strb r0, [r1] +._76: + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._75: + ldr r0, ._83 + ldrh r1, [r0, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._77 @cond_branch + ldr r1, ._83 + 8 + ldrb r0, [r1] + cmp r0, #0 + bne ._78 @cond_branch + mov r0, #0xc + strb r0, [r1] +._78: + ldrb r0, [r1] + sub r0, r0, #0x1 + strb r0, [r1] + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._77: + cmp r2, #0 + beq ._79 @cond_branch + mov r0, #0xd + mov r1, #0x6 + mov r2, #0x1a + mov r3, #0x8 + bl Menu_BlankWindowRect + ldr r1, ._83 + 12 + ldr r0, ._83 + 8 + ldrb r0, [r0] + lsl r0, r0, #0x2 + add r0, r0, r1 + ldr r0, [r0] + mov r1, #0xe + mov r2, #0x7 + bl Menu_PrintText + mov r0, #0x16 + mov r1, #0x1 + mov r2, #0x18 + mov r3, #0x2 + bl Menu_BlankWindowRect + ldr r4, ._83 + 16 + ldr r0, ._83 + 4 + ldrb r1, [r0] + add r0, r4, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x17 + mov r2, #0x1 + bl Menu_PrintText +._79: + ldr r4, ._83 + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._80 @cond_branch + mov r0, #0x15 + bl PlaySE + ldr r0, ._83 + 4 + ldrb r0, [r0] + ldr r2, ._83 + 20 + ldr r1, ._83 + 8 + ldrb r1, [r1] + add r1, r1, r2 + ldrb r1, [r1] + bl debug_sub_808FA88 +._80: + ldrh r1, [r4, #0x2e] + mov r0, #0xa + and r0, r0, r1 + cmp r0, #0 + bne ._81 @cond_branch + mov r0, #0x0 + b ._82 +._84: + .align 2, 0 +._83: + .word gMain + .word gDebug_03000725 + .word gDebug_03000724 + .word gUnknown_Debug_083C4ABD+0xf + .word gStringVar1 + .word gUnknown_Debug_083C4ABD +._81: + ldr r0, ._85 + bl sub_80BF588 + bl CloseMenu + mov r0, #0x1 +._82: + pop {r4} + pop {r1} + bx r1 +._86: + .align 2, 0 +._85: + .word gSaveBlock1+0x2738 + + thumb_func_end debug_sub_808F93C + + thumb_func_start debug_sub_808FA88 +debug_sub_808FA88: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + add sp, sp, #0xffffffcc + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + lsl r1, r1, #0x18 + lsr r7, r1, #0x18 + bl GetLeadMonIndex + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r9, r0 + ldr r3, ._92 + lsl r4, r6, #0x3 + add r2, r4, r6 + lsl r2, r2, #0x2 + add r0, r2, r3 + ldr r5, ._92 + 4 + add r1, r0, r5 + strb r7, [r1] + ldr r1, ._92 + 8 + add r0, r0, r1 + mov r1, #0x1 + strb r1, [r0] + mov r1, #0x0 + ldr r0, ._92 + 12 + add r5, r3, r0 + mov r3, #0x1 +._87: + add r0, r1, r2 + add r0, r0, r5 + strb r3, [r0] + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + cmp r1, #0x21 + bls ._87 @cond_branch + add r0, r7, #0 + bl GetTVChannelByShowType + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + add r1, r0, #0 + cmp r0, #0x3 + beq ._88 @cond_branch + cmp r0, #0x3 + bgt ._89 @cond_branch + cmp r0, #0x2 + beq ._90 @cond_branch + b ._95 +._93: + .align 2, 0 +._92: + .word gSaveBlock1 + .word 0x2738 + .word 0x2739 + .word 0x273a +._89: + cmp r1, #0x4 + bne ._95 @cond_branch +._90: + add r0, r4, r6 + lsl r0, r0, #0x2 + ldr r1, ._96 + add r0, r0, r1 + bl sub_80BE160 + b ._95 +._97: + .align 2, 0 +._96: + .word gSaveBlock1+0x2738 +._88: + add r0, r4, r6 + lsl r0, r0, #0x2 + ldr r1, ._100 + add r0, r0, r1 + bl sub_80BE138 +._95: + sub r0, r7, #1 + cmp r0, #0x28 + bls ._98 @cond_branch + b ._173 +._98: + lsl r0, r0, #0x2 + ldr r1, ._100 + 4 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._101: + .align 2, 0 +._100: + .word gSaveBlock1+0x2738 + .word ._102 +._102: + .word ._104 + .word ._104 + .word ._105 + .word ._173 + .word ._107 + .word ._108 + .word ._109 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._123 + .word ._124 + .word ._125 + .word ._126 + .word ._127 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._173 + .word ._143 +._104: + add r0, r4, r6 + lsl r0, r0, #0x2 + ldr r1, ._145 + add r4, r0, r1 + mov r2, #0x1 + strh r2, [r4, #0x2] + add r1, r1, #0x10 + add r0, r0, r1 + ldr r1, ._145 + 4 + bl StringCopy + mov r0, #0x5 + strb r0, [r4, #0x18] + b ._173 +._146: + .align 2, 0 +._145: + .word gSaveBlock1+0x2738 + .word gSaveBlock2 +._105: + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r6, ._148 + add r1, r4, r6 + mov r8, r1 + mov r0, #0x1 + strh r0, [r1, #0x2] + add r0, r6, #5 + add r0, r4, r0 + ldr r1, ._148 + 4 + bl StringCopy + mov r0, #0x64 + mov r5, r9 + mul r5, r5, r0 + ldr r0, ._148 + 8 + add r5, r5, r0 + add r6, r6, #0x10 + add r4, r4, r6 + add r0, r5, #0 + mov r1, #0x2 + add r2, r4, #0 + bl GetMonData + mov r0, #0x5 + mov r1, r8 + strb r0, [r1, #0xd] + add r0, r5, #0 + mov r1, #0x3 + bl GetMonData + mov r5, r8 + strb r0, [r5, #0xe] + b ._173 +._149: + .align 2, 0 +._148: + .word gSaveBlock1+0x2738 + .word gSaveBlock2 + .word gPlayerParty +._107: + mov r0, #0x64 + mov r1, r9 + mul r1, r1, r0 + mov r8, r1 + ldr r0, ._151 + add r8, r8, r0 + mov r0, r8 + mov r1, #0xb + bl GetMonData + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r5, ._151 + 4 + add r6, r4, r5 + strh r0, [r6, #0x2] + mov r0, #0x1 + strh r0, [r6, #0x1c] + add r0, r5, #0 + add r0, r0, #0xf + add r0, r4, r0 + ldr r1, ._151 + 8 + bl StringCopy + add r5, r5, #0x4 + add r4, r4, r5 + mov r0, r8 + mov r1, #0x2 + add r2, r4, #0 + bl GetMonData + mov r0, #0x5 + strb r0, [r6, #0x1e] + mov r0, r8 + mov r1, #0x3 + bl GetMonData + strb r0, [r6, #0x1f] + b ._173 +._152: + .align 2, 0 +._151: + .word gPlayerParty + .word gSaveBlock1+0x2738 + .word gSaveBlock2 +._108: + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r6, ._154 + add r5, r4, r6 + mov r8, r5 + mov r0, #0x1 + strh r0, [r5, #0x2] + add r0, r6, #0 + add r0, r0, #0x16 + add r0, r4, r0 + ldr r1, ._154 + 4 + bl StringCopy + mov r0, #0x64 + mov r5, r9 + mul r5, r5, r0 + ldr r0, ._154 + 8 + add r5, r5, r0 + add r6, r6, #0x8 + add r4, r4, r6 + add r0, r5, #0 + mov r1, #0x2 + add r2, r4, #0 + bl GetMonData + mov r0, #0x5 + mov r1, r8 + strb r0, [r1, #0x1e] + add r0, r5, #0 + mov r1, #0x3 + bl GetMonData + mov r5, r8 + strb r0, [r5, #0x1f] + b ._173 +._155: + .align 2, 0 +._154: + .word gSaveBlock1+0x2738 + .word gSaveBlock2 + .word gPlayerParty +._109: + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r5, ._157 + add r6, r4, r5 + mov r0, #0x1 + strh r0, [r6, #0xa] + strh r0, [r6, #0x14] + add r0, r5, #2 + add r0, r4, r0 + ldr r1, ._157 + 4 + mov r8, r1 + bl StringCopy + add r5, r5, #0xc + add r4, r4, r5 + add r0, r4, #0 + mov r1, r8 + bl StringCopy + mov r0, #0x5 + strb r0, [r6, #0x1d] + b ._173 +._158: + .align 2, 0 +._157: + .word gSaveBlock1+0x2738 + .word gSaveBlock2 +._143: + add r0, r4, r6 + lsl r0, r0, #0x2 + ldr r1, ._160 + add r0, r0, r1 + mov r1, #0x1 + strh r1, [r0, #0xc] + strh r1, [r0, #0x16] + b ._173 +._161: + .align 2, 0 +._160: + .word gSaveBlock1+0x2738 +._123: + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r0, ._163 + add r4, r4, r0 + ldr r1, ._163 + 4 + mov r0, sp + mov r2, #0x8 + bl memcpy + add r5, sp, #0x8 + ldr r1, ._163 + 8 + add r0, r5, #0 + mov r2, #0xb + bl memcpy + mov r0, #0xff + strb r0, [r4, #0x12] + add r0, r4, #0 + add r0, r0, #0x13 + mov r1, sp + bl StringCopy + add r0, r4, #4 + add r1, r5, #0 + bl StringCopy + mov r0, #0xc + strb r0, [r4, #0xf] + mov r0, #0x28 + strh r0, [r4, #0x10] + mov r0, #0x5 + strb r0, [r4, #0x2] + strb r0, [r4, #0x3] + b ._173 +._164: + .align 2, 0 +._163: + .word gSaveBlock1+0x2738 + .word gUnknown_Debug_083C4C64 + .word gUnknown_Debug_083C4C6C +._124: + add r0, r4, r6 + lsl r0, r0, #0x2 + ldr r1, ._168 + add r5, r0, r1 + add r4, sp, #0x14 + ldr r1, ._168 + 4 + add r0, r4, #0 + mov r2, #0x8 + bl memcpy + add r1, r4, #0 + mov r3, #0xfe + mov r2, #0x2 + add r0, r5, #0 + add r0, r0, #0x10 +._165: + strh r3, [r0] + sub r0, r0, #0x2 + sub r2, r2, #0x1 + cmp r2, #0 + bge ._165 @cond_branch + mov r0, #0x1 + strb r0, [r5, #0x2] + mov r0, #0x28 + strb r0, [r5, #0x12] + add r0, r5, #0 + add r0, r0, #0x13 + add r3, r5, #6 + mov r6, #0x1e + add r2, r5, #0 + add r2, r2, #0xa +._166: + strh r6, [r2] + sub r2, r2, #0x2 + cmp r2, r3 + bge ._166 @cond_branch + bl StringCopy + mov r0, #0x5 + strb r0, [r5, #0x3] + b ._173 +._169: + .align 2, 0 +._168: + .word gSaveBlock1+0x2738 + .word gUnknown_Debug_083C4C64 +._125: + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r0, ._171 + add r4, r4, r0 + add r5, sp, #0x1c + ldr r1, ._171 + 4 + add r0, r5, #0 + mov r2, #0x8 + bl memcpy + mov r0, #0x28 + strh r0, [r4, #0xc] + strh r0, [r4, #0xe] + mov r0, #0x3 + strb r0, [r4, #0x12] + mov r0, #0xff + strb r0, [r4, #0x10] + mov r0, #0x1 + strb r0, [r4, #0x11] + add r0, r4, #0 + add r0, r0, #0x13 + add r1, r5, #0 + bl StringCopy + mov r0, #0x5 + strb r0, [r4, #0x2] + b ._173 +._172: + .align 2, 0 +._171: + .word gSaveBlock1+0x2738 + .word gUnknown_Debug_083C4C64 +._126: + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r0, ._174 + add r4, r4, r0 + add r5, sp, #0x24 + ldr r1, ._174 + 4 + add r0, r5, #0 + mov r2, #0x8 + bl memcpy + mov r0, #0xff + strb r0, [r4, #0x2] + mov r0, #0x0 + strb r0, [r4, #0x3] + mov r0, #0x28 + strh r0, [r4, #0x4] + add r0, r4, #0 + add r0, r0, #0x13 + add r1, r5, #0 + bl StringCopy + mov r0, #0x5 + strb r0, [r4, #0x6] + b ._173 +._175: + .align 2, 0 +._174: + .word gSaveBlock1+0x2738 + .word gUnknown_Debug_083C4C64 +._127: + add r4, r4, r6 + lsl r4, r4, #0x2 + ldr r0, ._176 + add r4, r4, r0 + add r5, sp, #0x2c + ldr r1, ._176 + 4 + add r0, r5, #0 + mov r2, #0x8 + bl memcpy + ldr r0, ._176 + 8 + strh r0, [r4, #0x2] + mov r0, #0x1 + neg r0, r0 + strh r0, [r4, #0x6] + mov r0, #0x28 + strh r0, [r4, #0x4] + strh r0, [r4, #0x8] + mov r0, #0x3 + strb r0, [r4, #0xa] + add r0, r4, #0 + add r0, r0, #0x13 + add r1, r5, #0 + bl StringCopy + mov r0, #0x5 + strb r0, [r4, #0xb] +._173: + add sp, sp, #0x34 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._177: + .align 2, 0 +._176: + .word gSaveBlock1+0x2738 + .word gUnknown_Debug_083C4C64 + .word 0xffff + + thumb_func_end debug_sub_808FA88 + + thumb_func_start debug_sub_808FEBC +debug_sub_808FEBC: + push {lr} + bl ClearTVShowData + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end debug_sub_808FEBC + + thumb_func_start debug_sub_808FECC +debug_sub_808FECC: + push {r4, lr} + ldr r1, ._178 + mov r0, #0x0 + strb r0, [r1] + ldr r0, ._178 + 4 + bl sub_8071F40 + mov r0, #0xd + mov r1, #0x6 + mov r2, #0x17 + mov r3, #0x8 + bl Menu_BlankWindowRect + ldr r0, ._178 + 8 + ldr r0, [r0] + mov r1, #0xe + mov r2, #0x7 + bl Menu_PrintText + mov r0, #0x16 + mov r1, #0x1 + mov r2, #0x18 + mov r3, #0x2 + bl Menu_BlankWindowRect + ldr r4, ._178 + 12 + add r0, r4, #0 + mov r1, #0x0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x17 + mov r2, #0x1 + bl Menu_PrintText + ldr r1, ._178 + 16 + ldr r0, ._178 + 20 + str r0, [r1] + pop {r4} + pop {r0} + bx r0 +._179: + .align 2, 0 +._178: + .word gDebug_03000724 + .word gUnknown_Debug_083C49CA + .word gUnknown_Debug_083C4B20+0x4 + .word gStringVar1 + .word gMenuCallback + .word debug_sub_808FF3C+1 + + thumb_func_end debug_sub_808FECC + + thumb_func_start debug_sub_808FF3C +debug_sub_808FF3C: + push {r4, lr} + mov r2, #0x0 + ldr r0, ._192 + ldrh r1, [r0, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._180 @cond_branch + ldr r1, ._192 + 4 + ldrb r0, [r1] + add r0, r0, #0x1 + strb r0, [r1] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x10 + bne ._181 @cond_branch + strb r2, [r1] +._181: + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._180: + ldr r0, ._192 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._182 @cond_branch + ldr r1, ._192 + 4 + ldrb r0, [r1] + cmp r0, #0 + bne ._183 @cond_branch + mov r0, #0x10 + strb r0, [r1] +._183: + ldrb r0, [r1] + sub r0, r0, #0x1 + strb r0, [r1] + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._182: + ldr r0, ._192 + ldrh r1, [r0, #0x2e] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._184 @cond_branch + ldr r1, ._192 + 8 + ldrb r0, [r1] + add r0, r0, #0x1 + strb r0, [r1] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x3 + bne ._185 @cond_branch + mov r0, #0x0 + strb r0, [r1] +._185: + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._184: + ldr r0, ._192 + ldrh r1, [r0, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._186 @cond_branch + ldr r1, ._192 + 8 + ldrb r0, [r1] + cmp r0, #0 + bne ._187 @cond_branch + mov r0, #0x3 + strb r0, [r1] +._187: + ldrb r0, [r1] + sub r0, r0, #0x1 + strb r0, [r1] + mov r0, #0x5 + bl PlaySE + mov r2, #0x1 +._186: + cmp r2, #0 + beq ._188 @cond_branch + mov r0, #0xd + mov r1, #0x6 + mov r2, #0x17 + mov r3, #0x8 + bl Menu_BlankWindowRect + ldr r1, ._192 + 12 + ldr r0, ._192 + 8 + ldrb r0, [r0] + lsl r0, r0, #0x2 + add r0, r0, r1 + ldr r0, [r0] + mov r1, #0xe + mov r2, #0x7 + bl Menu_PrintText + mov r0, #0x16 + mov r1, #0x1 + mov r2, #0x18 + mov r3, #0x2 + bl Menu_BlankWindowRect + ldr r4, ._192 + 16 + ldr r0, ._192 + 4 + ldrb r1, [r0] + add r0, r4, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x17 + mov r2, #0x1 + bl Menu_PrintText +._188: + ldr r4, ._192 + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._189 @cond_branch + mov r0, #0x15 + bl PlaySE + ldr r0, ._192 + 4 + ldrb r0, [r0] + ldr r2, ._192 + 20 + ldr r1, ._192 + 8 + ldrb r1, [r1] + add r1, r1, r2 + ldrb r1, [r1] + bl debug_sub_8090080 +._189: + ldrh r1, [r4, #0x2e] + mov r0, #0xa + and r0, r0, r1 + cmp r0, #0 + bne ._190 @cond_branch + mov r0, #0x0 + b ._191 +._193: + .align 2, 0 +._192: + .word gMain + .word gDebug_03000725 + .word gDebug_03000724 + .word gUnknown_Debug_083C4B20+0x4 + .word gStringVar1 + .word gUnknown_Debug_083C4B20 +._190: + bl sub_80BEC40 + bl CloseMenu + mov r0, #0x1 +._191: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808FF3C + + thumb_func_start debug_sub_8090080 +debug_sub_8090080: + lsl r0, r0, #0x18 + ldr r2, ._194 + lsr r0, r0, #0x16 + add r0, r0, r2 + ldr r3, ._194 + 4 + add r2, r0, r3 + strb r1, [r2] + ldr r1, ._194 + 8 + add r2, r0, r1 + mov r1, #0x1 + strb r1, [r2] + add r3, r3, #0x2 + add r0, r0, r3 + mov r1, #0x4 + strh r1, [r0] + bx lr +._195: + .align 2, 0 +._194: + .word gSaveBlock1 + .word 0x2abc + .word 0x2abd + + thumb_func_end debug_sub_8090080 + + thumb_func_start debug_sub_80900AC +debug_sub_80900AC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + mov r7, #0x0 + mov r5, #0x0 + ldr r0, ._202 + mov r8, r0 +._198: + lsl r0, r5, #0x3 + add r0, r0, r5 + lsl r0, r0, #0x2 + mov r1, r8 + add r6, r0, r1 + ldr r1, ._202 + 4 + add r0, r6, r1 + ldrb r4, [r0] + cmp r4, #0 + bne ._196 @cond_branch + cmp r7, #0xc + bne ._197 @cond_branch + mov r7, #0x0 +._197: + ldr r0, ._202 + 8 + add r0, r7, r0 + ldrb r1, [r0] + add r0, r5, #0 + bl debug_sub_808FA88 + ldr r1, ._202 + 12 + add r0, r6, r1 + strb r4, [r0] + add r0, r7, #1 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._196: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x17 + bls ._198 @cond_branch + mov r7, #0x0 + mov r5, #0x0 +._201: + ldr r0, ._202 + lsl r1, r5, #0x2 + add r1, r1, r0 + ldr r0, ._202 + 16 + add r1, r1, r0 + ldrb r0, [r1] + cmp r0, #0 + bne ._199 @cond_branch + cmp r7, #0x3 + bne ._200 @cond_branch + mov r7, #0x0 +._200: + ldr r0, ._202 + 20 + add r0, r7, r0 + ldrb r1, [r0] + add r0, r5, #0 + bl debug_sub_8090080 + add r0, r7, #1 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._199: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0xf + bls ._201 @cond_branch + bl CloseMenu + mov r0, #0x1 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._203: + .align 2, 0 +._202: + .word gSaveBlock1 + .word 0x2738 + .word gUnknown_Debug_083C4ABD + .word 0x2739 + .word 0x2abc + .word gUnknown_Debug_083C4B20 + + thumb_func_end debug_sub_80900AC + + thumb_func_start NoharaDebugMenu_Fan +NoharaDebugMenu_Fan: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xb + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._204 + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0xa + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._204 + 4 + ldr r0, ._204 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._205: + .align 2, 0 +._204: + .word gUnknown_Debug_083C4D28 + .word gMenuCallback + .word debug_sub_80901A4+1 + + thumb_func_end NoharaDebugMenu_Fan + + thumb_func_start debug_sub_80901A4 +debug_sub_80901A4: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._206 @cond_branch + add r0, r0, #0x1 + cmp r1, r0 + beq ._207 @cond_branch + ldr r2, ._209 + ldr r0, ._209 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] +._206: + mov r0, #0x0 + b ._208 +._210: + .align 2, 0 +._209: + .word gMenuCallback + .word gUnknown_Debug_083C4D28 +._207: + bl CloseMenu + mov r0, #0x1 +._208: + pop {r1} + bx r1 + + thumb_func_end debug_sub_80901A4 + + thumb_func_start debug_sub_80901E4 +debug_sub_80901E4: + push {lr} + bl ResetFanClub + bl sub_810FAA0 + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end debug_sub_80901E4 + + thumb_func_start debug_sub_80901F8 +debug_sub_80901F8: + push {lr} + bl sub_810FB9C + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._211 + ldr r1, ._211 + 4 + add r0, r0, r1 + ldrb r0, [r0] + sub r0, r0, #0x8 + lsl r0, r0, #0x2 + add r0, r0, r2 + ldr r0, [r0] + mov r1, #0xe + mov r2, #0x7 + bl Menu_PrintText + ldr r1, ._211 + 8 + ldr r0, ._211 + 12 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._212: + .align 2, 0 +._211: + .word gUnknown_Debug_083C4CA8 + .word gUnknown_083F8408 + .word gMenuCallback + .word debug_sub_8090278+1 + + thumb_func_end debug_sub_80901F8 + + thumb_func_start debug_sub_8090238 +debug_sub_8090238: + push {lr} + bl sub_810FC18 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._213 + ldr r1, ._213 + 4 + add r0, r0, r1 + ldrb r0, [r0] + sub r0, r0, #0x8 + lsl r0, r0, #0x2 + add r0, r0, r2 + ldr r0, [r0] + mov r1, #0xe + mov r2, #0x7 + bl Menu_PrintText + ldr r1, ._213 + 8 + ldr r0, ._213 + 12 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._214: + .align 2, 0 +._213: + .word gUnknown_Debug_083C4CA8 + .word gUnknown_083F8410 + .word gMenuCallback + .word debug_sub_8090278+1 + + thumb_func_end debug_sub_8090238 + + thumb_func_start debug_sub_8090278 +debug_sub_8090278: + push {lr} + ldr r0, ._217 + ldrh r1, [r0, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + bne ._215 @cond_branch + mov r0, #0x0 + b ._216 +._218: + .align 2, 0 +._217: + .word gMain +._215: + bl CloseMenu + mov r0, #0x1 +._216: + pop {r1} + bx r1 + + thumb_func_end debug_sub_8090278 + + thumb_func_start debug_sub_809029C +debug_sub_809029C: + push {r4, lr} + ldr r4, ._219 + ldr r0, ._219 + 4 + ldr r1, ._219 + 8 + add r0, r0, r1 + ldrh r0, [r0] + mov r1, #0x7f + and r1, r1, r0 + add r0, r4, #0 + mov r2, #0x0 + mov r3, #0x2 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x10 + mov r2, #0x7 + bl Menu_PrintText + ldr r1, ._219 + 12 + ldr r0, ._219 + 16 + str r0, [r1] + mov r0, #0x0 + pop {r4} + pop {r1} + bx r1 +._220: + .align 2, 0 +._219: + .word gStringVar1 + .word gSaveBlock1 + .word 0x13c2 + .word gMenuCallback + .word debug_sub_8090278+1 + + thumb_func_end debug_sub_809029C + + thumb_func_start debug_sub_80902E4 +debug_sub_80902E4: + push {lr} + ldr r1, ._221 + ldrh r0, [r1, #0xe] + add r0, r0, #0x6 + strh r0, [r1, #0xe] + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._222: + .align 2, 0 +._221: + .word gSaveBlock2 + + thumb_func_end debug_sub_80902E4 + + thumb_func_start debug_sub_80902FC +debug_sub_80902FC: + push {lr} + mov r0, #0x0 + bl sub_810FB10 + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end debug_sub_80902FC + + thumb_func_start debug_sub_8090310 +debug_sub_8090310: + push {lr} + mov r0, #0x1 + bl sub_810FB10 + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end debug_sub_8090310 + + thumb_func_start debug_sub_8090324 +debug_sub_8090324: + push {lr} + mov r0, #0x2 + bl sub_810FB10 + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end debug_sub_8090324 + + thumb_func_start debug_sub_8090338 +debug_sub_8090338: + push {lr} + mov r0, #0x3 + bl sub_810FB10 + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end debug_sub_8090338 + + thumb_func_start NoharaDebugMenu_BattleVSDad +NoharaDebugMenu_BattleVSDad: + push {lr} + ldr r0, ._223 + mov r1, #0x6 + bl VarSet + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._224: + .align 2, 0 +._223: + .word 0x4085 + + thumb_func_end NoharaDebugMenu_BattleVSDad + + thumb_func_start NoharaDebugMenu_DadAfterBattle +NoharaDebugMenu_DadAfterBattle: + push {lr} + ldr r0, ._225 + mov r1, #0x7 + bl VarSet + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._226: + .align 2, 0 +._225: + .word 0x4085 + + thumb_func_end NoharaDebugMenu_DadAfterBattle + + thumb_func_start NoharaDebugMenu_SootopolisCity +NoharaDebugMenu_SootopolisCity: + push {lr} + mov r0, #0x81 + bl FlagSet + mov r0, #0x71 + bl FlagSet + ldr r0, ._227 + bl FlagClear + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._228: + .align 2, 0 +._227: + .word 0x32f + + thumb_func_end NoharaDebugMenu_SootopolisCity + + thumb_func_start NoharaDebugMenu_Embark +NoharaDebugMenu_Embark: + push {lr} + ldr r0, ._229 + bl FlagClear + ldr r0, ._229 + 4 + mov r1, #0x1 + bl VarSet + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._230: + .align 2, 0 +._229: + .word 0x2e3 + .word 0x4090 + + thumb_func_end NoharaDebugMenu_Embark + + thumb_func_start NoharaDebugMenu_Yes9999 +NoharaDebugMenu_Yes9999: + push {lr} + ldr r0, ._231 + ldr r1, ._231 + 4 + bl VarSet + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._232: + .align 2, 0 +._231: + .word 0x4048 + .word 0x270f + + thumb_func_end NoharaDebugMenu_Yes9999 + + thumb_func_start NoharaDebugMenu_LegendsFlagOn +NoharaDebugMenu_LegendsFlagOn: + push {lr} + mov r0, #0xe4 + bl FlagSet + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end NoharaDebugMenu_LegendsFlagOn + + thumb_func_start NoharaDebugMenu_AddNumWinningStreaks +NoharaDebugMenu_AddNumWinningStreaks: + push {lr} + ldr r0, ._235 + ldr r1, ._235 + 4 + add r2, r0, r1 + ldrh r1, [r2] + cmp r1, #0x31 + bhi ._233 @cond_branch + mov r0, #0x32 + b ._244 +._236: + .align 2, 0 +._235: + .word gSaveBlock2 + .word 0x572 +._233: + cmp r1, #0x63 + bhi ._237 @cond_branch + mov r0, #0x64 + b ._244 +._237: + ldr r0, ._241 + cmp r1, r0 + bhi ._239 @cond_branch + add r0, r0, #0x1 + b ._244 +._242: + .align 2, 0 +._241: + .word 0x3e7 +._239: + ldr r0, ._245 + cmp r1, r0 + bhi ._243 @cond_branch + ldr r0, ._245 + 4 + b ._244 +._246: + .align 2, 0 +._245: + .word 0x1387 + .word 0x2706 +._243: + ldr r0, ._248 + cmp r1, r0 + bhi ._247 @cond_branch + add r0, r0, #0xa +._244: + strh r0, [r2] +._247: + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._249: + .align 2, 0 +._248: + .word 0x2705 + + thumb_func_end NoharaDebugMenu_AddNumWinningStreaks + + .align 2, 0 + +.endif diff --git a/asm/taya_debug_window.s b/asm/taya_debug_window.s new file mode 100644 index 000000000..1c25de5f6 --- /dev/null +++ b/asm/taya_debug_window.s @@ -0,0 +1,2054 @@ +.if DEBUG + + .include "constants/gba_constants.inc" + .include "include/macros.inc" + + .text + + thumb_func_start TayaDebugMenu_Trend +TayaDebugMenu_Trend: + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xffffffd8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1e + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r5, ._3 + mov r7, #0x0 + mov r0, #0x1 + add r0, r0, sp + mov sl, r0 + mov r9, sp + mov r0, #0x0 + mov r8, r0 + add r6, sp, #0x20 +._2: + ldrb r1, [r5, #0x1] + mov r0, #0x40 + and r0, r0, r1 + mov r1, #0xa1 + cmp r0, #0 + beq ._1 @cond_branch + mov r1, #0xa2 +._1: + mov r0, r9 + strb r1, [r0] + ldrh r1, [r5, #0x4] + add r0, r6, #0 + bl EasyChat_GetWordText + mov r0, sl + add r1, r6, #0 + mov r2, #0x0 + mov r3, #0x7 + bl StringCopyPadded + add r4, r0, #0 + ldrh r1, [r5, #0x6] + add r0, r6, #0 + bl EasyChat_GetWordText + add r0, r4, #0 + add r1, r6, #0 + mov r2, #0x0 + mov r3, #0x8 + bl StringCopyPadded + add r4, r0, #0 + ldrb r1, [r5] + lsl r1, r1, #0x19 + lsr r1, r1, #0x19 + mov r2, #0x1 + mov r3, #0x3 + bl ConvertIntToDecimalStringN + add r4, r0, #0 + mov r0, r8 + strb r0, [r4] + add r4, r4, #0x1 + ldrh r1, [r5] + lsl r1, r1, #0x12 + lsr r1, r1, #0x19 + add r0, r4, #0 + mov r2, #0x1 + mov r3, #0x3 + bl ConvertIntToDecimalStringN + add r4, r0, #0 + mov r0, r8 + strb r0, [r4] + add r4, r4, #0x1 + ldrh r1, [r5, #0x2] + add r0, r4, #0 + mov r2, #0x1 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + lsl r2, r7, #0x1 + add r2, r2, #0x1 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + mov r0, sp + mov r1, #0x1 + bl Menu_PrintText + add r5, r5, #0x8 + add r0, r7, #1 + lsl r0, r0, #0x10 + lsr r7, r0, #0x10 + cmp r7, #0x4 + bls ._2 @cond_branch + ldr r1, ._3 + 4 + ldr r0, ._3 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x28 + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._4: + .align 2, 0 +._3: + .word gSaveBlock1+0x2dd4 + .word gMenuCallback + .word debug_sub_8090808+1 + + thumb_func_end TayaDebugMenu_Trend + + thumb_func_start debug_sub_8090808 +debug_sub_8090808: + push {lr} + ldr r0, ._7 + ldrh r1, [r0, #0x2e] + mov r0, #0x3 + and r0, r0, r1 + cmp r0, #0 + bne ._5 @cond_branch + mov r0, #0x0 + b ._6 +._8: + .align 2, 0 +._7: + .word gMain +._5: + bl Menu_EraseScreen + bl CloseMenu + mov r0, #0x1 +._6: + pop {r1} + bx r1 + + thumb_func_end debug_sub_8090808 + + thumb_func_start TayaDebugMenu_TrendR +TayaDebugMenu_TrendR: + push {r4, r5, r6, r7, lr} + mov r0, #0x0 + ldr r7, ._11 +._10: + mov r4, #0x0 + lsl r5, r0, #0x3 + add r6, r0, #1 +._9: + bl Random + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0x16 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl sub_80EB72C + lsl r1, r4, #0x1 + add r1, r1, r5 + add r1, r1, r7 + strh r0, [r1] + add r0, r4, #1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + cmp r4, #0x1 + bls ._9 @cond_branch + lsl r0, r6, #0x10 + lsr r0, r0, #0x10 + cmp r0, #0x4 + bls ._10 @cond_branch + bl Menu_EraseScreen + bl CloseMenu + mov r0, #0x1 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._12: + .align 2, 0 +._11: + .word gSaveBlock1+0x2dd8 + + thumb_func_end TayaDebugMenu_TrendR + + thumb_func_start debug_sub_8090880 +debug_sub_8090880: + push {lr} + bl UpdatePaletteFade + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._13 @cond_branch + mov r0, #0x0 + b ._14 +._13: + bl sub_80E60D8 + mov r0, #0x1 +._14: + pop {r1} + bx r1 + + thumb_func_end debug_sub_8090880 + + thumb_func_start debug_sub_809089C +debug_sub_809089C: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._15 @cond_branch + add r0, r0, #0x1 + cmp r1, r0 + bne ._16 @cond_branch + bl CloseMenu + mov r0, #0x1 + b ._17 +._16: + ldr r2, ._19 + ldr r0, ._19 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + strh r0, [r2] + ldrh r0, [r2] + sub r0, r0, #0x5 + cmp r0, #0x7 + bhi ._27 @cond_branch + lsl r0, r0, #0x2 + ldr r1, ._19 + 8 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._20: + .align 2, 0 +._19: + .word gSpecialVar_0x8004 + .word gUnknown_Debug_083C4EC0 + .word ._21 +._21: + .word ._29 + .word ._27 + .word ._29 + .word ._29 + .word ._27 + .word ._27 + .word ._29 + .word ._29 +._29: + ldr r0, ._30 + mov r1, #0x0 + strh r1, [r0] + ldr r0, ._30 + 4 + strh r1, [r0] +._27: + mov r0, #0x1 + mov r1, #0x0 + bl FadeScreen + ldr r1, ._30 + 8 + ldr r0, ._30 + 12 + str r0, [r1] +._15: + mov r0, #0x0 +._17: + pop {r1} + bx r1 +._31: + .align 2, 0 +._30: + .word gSpecialVar_0x8005 + .word gSpecialVar_0x8006 + .word gMenuCallback + .word debug_sub_8090880+1 + + thumb_func_end debug_sub_809089C + + thumb_func_start TayaDebugMenu_SimpleText +TayaDebugMenu_SimpleText: + push {lr} + add sp, sp, #0xfffffff8 + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xc + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._32 + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0xb + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._32 + 4 + ldr r0, ._32 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._33: + .align 2, 0 +._32: + .word gUnknown_Debug_083C4EC0 + .word gMenuCallback + .word debug_sub_809089C+1 + + thumb_func_end TayaDebugMenu_SimpleText + + thumb_func_start debug_sub_8090984 +debug_sub_8090984: + push {r4, r5, r6, r7, lr} + bl Menu_ProcessInput + lsl r2, r0, #0x18 + asr r1, r2, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._34 @cond_branch + add r0, r0, #0x1 + cmp r1, r0 + beq ._46 @cond_branch + cmp r1, #0x4 + bgt ._36 @cond_branch + lsr r0, r2, #0x18 + bl debug_sub_810B32C + b ._46 +._34: + mov r0, #0x0 + b ._38 +._36: + cmp r1, #0x5 + bne ._39 @cond_branch + bl sub_80F7F30 + b ._46 +._39: + cmp r1, #0x6 + bne ._41 @cond_branch + mov r4, #0x0 + ldr r0, ._44 + add r1, r0, #2 + mov ip, r1 + ldr r7, ._44 + 4 + ldr r1, ._44 + 8 + add r6, r0, r1 + add r5, r0, #0 + add r5, r5, #0xe +._42: + lsl r1, r4, #0x1 + mov r0, ip + add r3, r1, r0 + add r0, r1, r7 + ldrh r2, [r0] + strh r2, [r3] + add r0, r1, r5 + strh r2, [r0] + add r1, r6, r1 + strh r2, [r1] + add r0, r4, #1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + cmp r4, #0x2 + bls ._42 @cond_branch + b ._46 +._45: + .align 2, 0 +._44: + .word gSaveBlock1+0x2d94 + .word gUnknown_Debug_083C4F08 + .word 0xfffffd94 +._41: + cmp r1, #0x7 + bne ._46 @cond_branch + mov r4, #0x0 +._47: + lsl r0, r4, #0x18 + lsr r0, r0, #0x18 + bl sub_80EB890 + add r0, r4, #1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + cmp r4, #0x20 + bls ._47 @cond_branch +._46: + bl CloseMenu + mov r0, #0x1 +._38: + pop {r4, r5, r6, r7} + pop {r1} + bx r1 + + thumb_func_end debug_sub_8090984 + + thumb_func_start TayaDebugMenu_OldMan +TayaDebugMenu_OldMan: + push {lr} + add sp, sp, #0xfffffff8 + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xa + mov r3, #0x11 + bl Menu_DrawStdWindowFrame + ldr r3, ._48 + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x8 + bl Menu_PrintItems + bl GetCurrentMauvilleOldMan + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + str r0, [sp] + mov r0, #0x9 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x8 + bl InitMenu + ldr r1, ._48 + 4 + ldr r0, ._48 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._49: + .align 2, 0 +._48: + .word gUnknown_Debug_083C4F54 + .word gMenuCallback + .word debug_sub_8090984+1 + + thumb_func_end TayaDebugMenu_OldMan + + thumb_func_start TayaDebugMenu_LanettesPC +TayaDebugMenu_LanettesPC: + push {lr} + bl Menu_EraseScreen + bl ShowPokemonStorageSystem + mov r0, #0x1 + pop {r1} + bx r1 + + thumb_func_end TayaDebugMenu_LanettesPC + + thumb_func_start TayaDebugMenu_TownFlags +TayaDebugMenu_TownFlags: + push {lr} + ldr r0, ._50 + bl FlagSet + mov r0, #0x81 + lsl r0, r0, #0x4 + bl FlagSet + ldr r0, ._50 + 4 + bl FlagSet + ldr r0, ._50 + 8 + bl FlagSet + ldr r0, ._50 + 12 + bl FlagSet + ldr r0, ._50 + 16 + bl FlagSet + ldr r0, ._50 + 20 + bl FlagSet + ldr r0, ._50 + 24 + bl FlagSet + ldr r0, ._50 + 28 + bl FlagSet + ldr r0, ._50 + 32 + bl FlagSet + ldr r0, ._50 + 36 + bl FlagSet + ldr r0, ._50 + 40 + bl FlagSet + ldr r0, ._50 + 44 + bl FlagSet + ldr r0, ._50 + 48 + bl FlagSet + ldr r0, ._50 + 52 + bl FlagSet + ldr r0, ._50 + 56 + bl FlagSet + ldr r0, ._50 + 60 + bl FlagSet + ldr r0, ._50 + 64 + bl FlagSet + ldr r0, ._50 + 68 + bl FlagSet + ldr r0, ._50 + 72 + bl FlagSet + ldr r0, ._50 + 76 + bl FlagSet + ldr r0, ._50 + 80 + bl FlagSet + ldr r0, ._50 + 84 + bl FlagSet + ldr r0, ._50 + 88 + bl FlagSet + ldr r0, ._50 + 92 + bl FlagSet + ldr r0, ._50 + 96 + bl FlagSet + ldr r0, ._50 + 100 + bl FlagSet + ldr r0, ._50 + 104 + bl FlagSet + ldr r0, ._50 + 108 + bl FlagSet + ldr r0, ._50 + 112 + bl FlagSet + ldr r0, ._50 + 116 + bl FlagSet + ldr r0, ._50 + 120 + bl FlagSet + mov r0, #0x84 + lsl r0, r0, #0x4 + bl FlagSet + ldr r0, ._50 + 124 + bl FlagSet + ldr r0, ._50 + 128 + bl FlagSet + ldr r0, ._50 + 132 + bl FlagSet + ldr r0, ._50 + 136 + bl FlagSet + ldr r0, ._50 + 140 + bl FlagSet + ldr r0, ._50 + 144 + bl FlagSet + ldr r0, ._50 + 148 + bl FlagSet + ldr r0, ._50 + 152 + bl FlagSet + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._51: + .align 2, 0 +._50: + .word 0x80f + .word 0x811 + .word 0x812 + .word 0x813 + .word 0x814 + .word 0x815 + .word 0x816 + .word 0x817 + .word 0x818 + .word 0x819 + .word 0x81a + .word 0x81b + .word 0x81c + .word 0x81d + .word 0x81e + .word 0x848 + .word 0x849 + .word 0x84a + .word 0x854 + .word 0x855 + .word 0x856 + .word 0x857 + .word 0x858 + .word 0x859 + .word 0x85a + .word 0x85b + .word 0x85c + .word 0x83c + .word 0x83d + .word 0x83e + .word 0x83f + .word 0x841 + .word 0x842 + .word 0x843 + .word 0x844 + .word 0x845 + .word 0x846 + .word 0x847 + .word 0x83b + + thumb_func_end TayaDebugMenu_TownFlags + + thumb_func_start TayaDebugMenu_AwardARibbon +TayaDebugMenu_AwardARibbon: + push {lr} + mov r0, #0x1 + neg r0, r0 + mov r1, #0x10 + mov r2, #0x0 + bl BlendPalettes + ldr r0, ._52 + bl SetMainCallback2 + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._53: + .align 2, 0 +._52: + .word debug_sub_80915BC+1 + + thumb_func_end TayaDebugMenu_AwardARibbon + + thumb_func_start debug_sub_8090C44 +debug_sub_8090C44: + push {r4, r5, lr} + ldr r4, ._54 + sub r5, r4, #1 + ldrh r1, [r5, #0x8] + add r0, r4, #0 + mov r2, #0x2 + mov r3, #0x5 + bl ConvertIntToDecimalStringN + add r0, r4, #0 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0x0 + mov r2, #0x5 + bl StringFill + ldrb r0, [r5] + add r0, r0, r4 + mov r1, #0x79 + strb r1, [r0] + add r0, r4, #0 + mov r1, #0x1 + mov r2, #0x3 + bl Menu_PrintText + pop {r4, r5} + pop {r0} + bx r0 +._55: + .align 2, 0 +._54: + .word gSharedMem+1 + + thumb_func_end debug_sub_8090C44 + + thumb_func_start debug_sub_8090C88 +debug_sub_8090C88: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xfffffffc + mov r0, #0x1 + mov r8, r0 + ldr r2, ._59 + ldrh r1, [r2, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + add r3, r2, #0 + cmp r0, #0 + beq ._57 @cond_branch + ldr r1, ._59 + 4 + ldrb r0, [r1] + cmp r0, #0 + beq ._57 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] + b ._62 +._60: + .align 2, 0 +._59: + .word gMain + .word gSharedMem +._67: + add r0, r0, #0x1 + strb r0, [r1] + b ._62 +._77: + strh r1, [r7, #0x8] + b ._62 +._79: + ldr r0, ._64 + ldrh r0, [r0, #0x8] + bl SetLotteryNumber16_Unused +._78: + bl CloseMenu + mov r0, #0x1 + b ._63 +._65: + .align 2, 0 +._64: + .word gSharedMem +._57: + ldrh r1, [r3, #0x2e] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._66 @cond_branch + ldr r1, ._81 + ldrb r0, [r1] + cmp r0, #0x3 + bls ._67 @cond_branch +._66: + ldrh r1, [r3, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._68 @cond_branch + ldr r0, ._81 + ldrh r1, [r0, #0x8] + str r1, [r0, #0xc] + ldr r1, ._81 + 4 + strh r1, [r0, #0x10] + mov r4, #0x0 + ldrb r1, [r0] + add r7, r0, #0 + cmp r4, r1 + bcs ._69 @cond_branch + add r5, r7, #0 + add r6, r1, #0 +._70: + ldrh r0, [r5, #0x10] + mov r1, #0xa + str r3, [sp] + bl __udivsi3 + strh r0, [r5, #0x10] + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r3, [sp] + cmp r4, r6 + bcc ._70 @cond_branch +._69: + ldrh r1, [r7, #0x10] + ldr r0, [r7, #0xc] + add r0, r0, r1 + str r0, [r7, #0xc] + ldr r1, ._81 + 8 + cmp r0, r1 + ble ._71 @cond_branch + str r1, [r7, #0xc] +._71: + ldrh r0, [r7, #0x8] + ldr r1, [r7, #0xc] + cmp r0, r1 + bne ._77 @cond_branch +._68: + ldrh r1, [r3, #0x30] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._73 @cond_branch + ldr r0, ._81 + ldrh r1, [r0, #0x8] + str r1, [r0, #0xc] + ldr r1, ._81 + 4 + strh r1, [r0, #0x10] + mov r4, #0x0 + ldrb r1, [r0] + add r7, r0, #0 + cmp r4, r1 + bcs ._74 @cond_branch + add r5, r7, #0 + add r6, r1, #0 +._75: + ldrh r0, [r5, #0x10] + mov r1, #0xa + str r3, [sp] + bl __udivsi3 + strh r0, [r5, #0x10] + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r3, [sp] + cmp r4, r6 + bcc ._75 @cond_branch +._74: + add r2, r7, #0 + ldrh r1, [r2, #0x10] + ldr r0, [r2, #0xc] + sub r0, r0, r1 + str r0, [r2, #0xc] + cmp r0, #0 + bge ._76 @cond_branch + mov r0, #0x0 + str r0, [r2, #0xc] +._76: + ldrh r0, [r2, #0x8] + ldr r1, [r2, #0xc] + cmp r0, r1 + bne ._77 @cond_branch +._73: + ldrh r2, [r3, #0x2e] + mov r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + bne ._78 @cond_branch + mov r0, #0x1 + and r0, r0, r2 + cmp r0, #0 + bne ._79 @cond_branch + mov r0, #0x0 + mov r8, r0 +._62: + mov r0, r8 + cmp r0, #0 + beq ._80 @cond_branch + bl debug_sub_8090C44 +._80: + mov r0, #0x0 +._63: + add sp, sp, #0x4 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._82: + .align 2, 0 +._81: + .word gSharedMem + .word 0x2710 + .word 0xffff + + thumb_func_end debug_sub_8090C88 + + thumb_func_start TayaDebugMenu_PKMNLottery +TayaDebugMenu_PKMNLottery: + push {lr} + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x6 + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + bl RetrieveLotteryNumber + ldr r2, ._83 + ldr r0, ._83 + 4 + ldrh r0, [r0] + mov r1, #0x0 + strh r0, [r2, #0x8] + strb r1, [r2] + bl debug_sub_8090C44 + ldr r1, ._83 + 8 + ldr r0, ._83 + 12 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._84: + .align 2, 0 +._83: + .word gSharedMem + .word gSpecialVar_Result + .word gMenuCallback + .word debug_sub_8090C88+1 + + thumb_func_end TayaDebugMenu_PKMNLottery + + thumb_func_start TayaDebugMenu_Trainer +TayaDebugMenu_Trainer: + push {r4, r5, lr} + mov r4, #0x0 + ldr r5, ._86 +._85: + lsl r0, r4, #0x4 + add r0, r0, r5 + ldrh r0, [r0] + bl SetTrainerFlag + add r0, r4, #1 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + cmp r4, #0x37 + bls ._85 @cond_branch + ldr r0, ._86 + 4 + bl SetTrainerFlag + mov r0, #0x85 + lsl r0, r0, #0x1 + bl SetTrainerFlag + ldr r0, ._86 + 8 + bl SetTrainerFlag + mov r0, #0x86 + lsl r0, r0, #0x1 + bl SetTrainerFlag + ldr r0, ._86 + 12 + bl SetTrainerFlag + mov r0, #0x87 + lsl r0, r0, #0x1 + bl SetTrainerFlag + ldr r0, ._86 + 16 + bl SetTrainerFlag + mov r0, #0x88 + lsl r0, r0, #0x1 + bl SetTrainerFlag + ldr r0, ._86 + 20 + bl SetTrainerFlag + mov r0, #0x83 + lsl r0, r0, #0x1 + bl SetTrainerFlag + ldr r0, ._86 + 24 + bl SetTrainerFlag + mov r0, #0x84 + lsl r0, r0, #0x1 + bl SetTrainerFlag + ldr r0, ._86 + 28 + bl SetTrainerFlag + bl CloseMenu + mov r0, #0x1 + pop {r4, r5} + pop {r1} + bx r1 +._87: + .align 2, 0 +._86: + .word gTrainerEyeTrainers + .word 0x109 + .word 0x10b + .word 0x10d + .word 0x10f + .word 0x105 + .word 0x107 + .word 0x14f + + thumb_func_end TayaDebugMenu_Trainer + + thumb_func_start TayaDebugMenu_PokenavD +TayaDebugMenu_PokenavD: + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xffffffe4 + bl Menu_DisplayDialogueFrame + mov r0, #0x0 + mov sl, r0 + mov r6, #0x1 + mov r7, #0xff + mov r1, #0x3 + mov r9, r1 +._93: + ldr r4, ._94 + add r0, r4, #0 + ldr r1, ._94 + 4 + bl StringCopy + mov r5, sl + add r5, r5, #0x1 + add r1, r5, r4 + mov r0, #0xff + strb r0, [r1] + add r0, r4, #0 + mov r1, #0x2 + mov r2, #0xf + bl Menu_PrintText + mov r0, #0x0 + mov r8, r0 + str r5, [sp, #0x14] + mov r1, sl + lsl r1, r1, #0x2 + str r1, [sp, #0x18] +._91: + bl Random + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + add r0, r0, #0x1 + str r0, [sp, #0x10] + bl Random + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0x64 + bl __umodsi3 + add r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + bl Random + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0xc1 + lsl r1, r1, #0x1 + bl __umodsi3 + add r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r3, r0, #0x10 + cmp r3, #0xfb + bls ._89 @cond_branch + add r0, r3, #0 + add r0, r0, #0x19 + lsl r0, r0, #0x10 + lsr r3, r0, #0x10 + ldr r0, ._94 + 8 + cmp r3, r0 + bls ._89 @cond_branch + mov r3, #0x1 +._89: + ldr r0, [sp, #0x18] + add r0, r0, sl + lsl r4, r0, #0x4 + sub r4, r4, r0 + lsl r4, r4, #0x5 + mov r1, r8 + lsl r0, r1, #0x2 + add r0, r0, r8 + lsl r0, r0, #0x4 + ldr r1, ._94 + 12 + add r0, r0, r1 + add r4, r4, r0 + lsl r2, r5, #0x18 + lsr r2, r2, #0x18 + mov r0, #0x0 + str r0, [sp] + str r0, [sp, #0x4] + str r6, [sp, #0x8] + ldr r0, [sp, #0x10] + str r0, [sp, #0xc] + add r0, r4, #0 + add r1, r3, #0 + mov r3, #0x20 + bl CreateBoxMon + bl Random + add r1, r7, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x16 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r7, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x17 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r7, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x18 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r7, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x21 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r7, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x2f + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r7, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x30 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + add r1, r1, #0x1 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x32 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + add r1, r1, #0x1 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x33 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + add r1, r1, #0x1 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x34 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + add r1, r1, #0x1 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x36 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + mov r1, r9 + and r1, r1, r0 + add r1, r1, #0x1 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x35 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x43 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x44 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x45 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x46 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x47 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x48 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x49 + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x4a + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x4b + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x4c + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x4d + add r2, sp, #0x10 + bl SetBoxMonData + bl Random + add r1, r6, #0 + and r1, r1, r0 + str r1, [sp, #0x10] + add r0, r4, #0 + mov r1, #0x4e + add r2, sp, #0x10 + bl SetBoxMonData + mov r0, r8 + add r0, r0, #0x1 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r8, r0 + cmp r0, #0x1d + bhi ._90 @cond_branch + b ._91 +._90: + ldr r1, [sp, #0x14] + lsl r0, r1, #0x10 + lsr r0, r0, #0x10 + mov sl, r0 + cmp r0, #0xd + bhi ._92 @cond_branch + b ._93 +._92: + bl TayaDebugMenu_TownFlags + bl TayaDebugMenu_Trainer + bl CloseMenu + mov r0, #0x1 + add sp, sp, #0x1c + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._95: + .align 2, 0 +._94: + .word gSharedMem + .word gUnknown_Debug_083C4F94 + .word 0x19b + .word gPokemonStorage+0x4 + + thumb_func_end TayaDebugMenu_PokenavD + + thumb_func_start TayaDebugMenu_8091190 +TayaDebugMenu_8091190: + push {r4, r5, lr} + add sp, sp, #0xfffffff8 + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r3, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r3, r0 + beq ._96 @cond_branch + add r0, r0, #0x1 + cmp r3, r0 + beq ._97 @cond_branch + ldr r2, ._99 + ldr r1, ._99 + 4 + ldr r0, ._99 + 8 + ldrb r0, [r0] + lsl r0, r0, #0x18 + asr r0, r0, #0x18 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, [r0] + lsl r0, r3, #0x3 + add r0, r0, r1 + ldr r0, [r0, #0x4] + str r0, [r2] +._106: + mov r0, #0x0 + b ._98 +._100: + .align 2, 0 +._99: + .word gMenuCallback + .word gUnknown_Debug_83C5068 + .word unk_2030224 +._96: + ldr r3, ._107 + ldrb r4, [r3] + ldr r2, ._107 + 4 + ldrh r1, [r2, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + add r5, r3, #0 + cmp r0, #0 + beq ._102 @cond_branch + sub r0, r4, #1 + strb r0, [r5] + lsl r0, r0, #0x18 + cmp r0, #0 + bge ._102 @cond_branch + mov r0, #0x1 + strb r0, [r5] +._102: + ldrh r1, [r2, #0x2e] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._104 @cond_branch + ldrb r0, [r5] + add r0, r0, #0x1 + strb r0, [r5] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x1 + bls ._104 @cond_branch + mov r0, #0x0 + strb r0, [r5] +._104: + lsl r0, r4, #0x18 + asr r0, r0, #0x18 + mov r1, #0x0 + ldrsb r1, [r5, r1] + cmp r0, r1 + beq ._106 @cond_branch + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xb + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r4, ._107 + 8 + mov r0, #0x0 + ldrsb r0, [r5, r0] + lsl r0, r0, #0x3 + add r0, r0, r4 + ldrb r2, [r0, #0x4] + ldr r3, [r0] + mov r0, #0x1 + mov r1, #0x1 + bl Menu_PrintItems + mov r0, #0x0 + ldrsb r0, [r5, r0] + lsl r0, r0, #0x3 + add r0, r0, r4 + ldrb r3, [r0, #0x4] + mov r0, #0x0 + str r0, [sp] + mov r0, #0xa + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + bl InitMenu + b ._106 +._108: + .align 2, 0 +._107: + .word unk_2030224 + .word gMain + .word gUnknown_Debug_83C5068 +._97: + bl CloseMenu + mov r0, #0x1 +._98: + add sp, sp, #0x8 + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end TayaDebugMenu_8091190 + + thumb_func_start InitTayaDebugWindow +InitTayaDebugWindow: + push {lr} + add sp, sp, #0xfffffff8 + ldr r1, ._109 + mov r0, #0x0 + strb r0, [r1] + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xb + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r0, ._109 + 4 + ldr r3, [r0] + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0xa + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._109 + 8 + ldr r0, ._109 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._110: + .align 2, 0 +._109: + .word unk_2030224 + .word gUnknown_Debug_83C5068 + .word gMenuCallback + .word TayaDebugMenu_8091190+1 + + thumb_func_end InitTayaDebugWindow + + thumb_func_start debug_sub_80912D8 +debug_sub_80912D8: + push {lr} + ldr r0, ._113 + ldrb r1, [r0, #0x7] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._111 @cond_branch + mov r0, #0x0 + b ._112 +._114: + .align 2, 0 +._113: + .word gPaletteFade +._111: + ldr r0, ._115 + bl SetMainCallback2 + mov r0, #0x1 +._112: + pop {r1} + bx r1 +._116: + .align 2, 0 +._115: + .word debug_sub_8110F28+1 + + thumb_func_end debug_sub_80912D8 + + thumb_func_start debug_sub_8091300 +debug_sub_8091300: + push {lr} + mov r0, #0x1 + mov r1, #0x0 + bl FadeScreen + ldr r1, ._117 + ldr r0, ._117 + 4 + str r0, [r1] + mov r0, #0x0 + pop {r1} + bx r1 +._118: + .align 2, 0 +._117: + .word gMenuCallback + .word debug_sub_80912D8+1 + + thumb_func_end debug_sub_8091300 + + thumb_func_start debug_sub_8091320 +debug_sub_8091320: + push {lr} + bl LoadOam + bl ProcessSpriteCopyRequests + bl TransferPlttBuffer + pop {r0} + bx r0 + + thumb_func_end debug_sub_8091320 + + thumb_func_start debug_sub_8091334 +debug_sub_8091334: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + bl AnimateSprites + bl BuildOamBuffer + ldr r3, ._123 + add r0, r3, #0 + add r0, r0, #0x52 + ldrb r4, [r0] + cmp r4, #0 + beq ._119 @cond_branch + cmp r4, #0x1 + bne ._120 @cond_branch + b ._121 +._120: + b ._162 +._124: + .align 2, 0 +._123: + .word gSharedMem +._119: + add r5, r3, #0 + add r5, r5, #0x55 + strb r4, [r5] + ldr r2, ._131 + ldrh r1, [r2, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + mov r9, r2 + cmp r0, #0 + beq ._126 @cond_branch + add r1, r3, #0 + add r1, r1, #0x54 + ldrb r0, [r1] + cmp r0, #0 + beq ._126 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] + mov r0, #0x1 + strb r0, [r5] +._126: + mov r0, r9 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + ldr r5, ._131 + 4 + cmp r0, #0 + beq ._133 @cond_branch + add r0, r5, #0 + add r0, r0, #0x53 + ldrb r0, [r0] + cmp r0, #0x2 + beq ._128 @cond_branch + add r1, r5, #0 + add r1, r1, #0x54 + ldrb r0, [r1] + cmp r0, #0x4 + bhi ._133 @cond_branch + b ._130 +._132: + .align 2, 0 +._131: + .word gMain + .word gSharedMem +._128: + add r1, r5, #0 + add r1, r1, #0x54 + ldrb r0, [r1] + cmp r0, #0x3 + bhi ._133 @cond_branch +._130: + add r0, r0, #0x1 + strb r0, [r1] + add r1, r1, #0x1 + mov r0, #0x1 + strb r0, [r1] +._133: + mov r2, r9 + ldrh r1, [r2, #0x2e] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._135 @cond_branch + add r1, r5, #0 + add r1, r1, #0x53 + ldrb r0, [r1] + cmp r0, #0 + beq ._135 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] + add r1, r1, #0x2 + mov r0, #0x1 + strb r0, [r1] +._135: + mov r3, r9 + ldrh r1, [r3, #0x2e] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._140 @cond_branch + add r0, r5, #0 + add r0, r0, #0x54 + ldrb r0, [r0] + cmp r0, #0x5 + beq ._137 @cond_branch + add r1, r5, #0 + add r1, r1, #0x53 + ldrb r0, [r1] + cmp r0, #0x1 + bhi ._140 @cond_branch + b ._139 +._137: + add r1, r5, #0 + add r1, r1, #0x53 + ldrb r0, [r1] + cmp r0, #0 + bne ._140 @cond_branch +._139: + add r0, r0, #0x1 + strb r0, [r1] + add r1, r1, #0x2 + mov r0, #0x1 + strb r0, [r1] +._140: + add r0, r5, #0 + add r0, r0, #0x55 + ldrb r0, [r0] + cmp r0, #0 + bne ._141 @cond_branch + mov r0, r9 + ldrh r2, [r0, #0x2e] + mov r0, #0x1 + and r0, r0, r2 + cmp r0, #0 + beq ._142 @cond_branch + ldr r2, ._145 + add r3, r5, #0 + add r3, r3, #0x53 + add r0, r5, #0 + add r0, r0, #0x54 + ldrb r1, [r0] + lsl r0, r1, #0x1 + add r0, r0, r1 + ldrb r3, [r3] + add r0, r0, r3 + lsl r0, r0, #0x3 + add r0, r0, r2 + ldrh r0, [r0, #0x4] + sub r0, r0, #0x32 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + cmp r0, #0x4 + bhi ._143 @cond_branch + add r1, r5, #0 + add r1, r1, #0x56 + mov r0, #0x4 + b ._144 +._146: + .align 2, 0 +._145: + .word gUnknown_Debug_083C50EC +._143: + add r1, r5, #0 + add r1, r1, #0x56 + mov r0, #0x1 +._144: + strb r0, [r1] + add r1, r5, #0 + add r1, r1, #0x52 + mov r0, #0x1 + strb r0, [r1] + b ._162 +._142: + mov r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + bne ._148 @cond_branch + b ._162 +._148: + mov r0, #0x1 + neg r0, r0 + mov r1, #0x10 + mov r2, #0x0 + bl BlendPalettes + ldr r0, ._151 + bl SetMainCallback2 + b ._162 +._152: + .align 2, 0 +._151: + .word sub_80546F0+1 +._121: + add r5, r3, #0 + add r5, r5, #0x55 + mov r0, #0x0 + strb r0, [r5] + ldr r2, ._159 + ldrh r1, [r2, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + mov r9, r2 + cmp r0, #0 + beq ._154 @cond_branch + add r2, r3, #0 + add r2, r2, #0x53 + add r0, r3, #0 + add r0, r0, #0x54 + ldrb r1, [r0] + lsl r0, r1, #0x1 + add r0, r0, r1 + ldrb r2, [r2] + add r0, r0, r2 + add r2, r0, r3 + add r0, r3, #0 + add r0, r0, #0x56 + ldrb r1, [r2] + ldrb r0, [r0] + cmp r1, r0 + bcs ._154 @cond_branch + add r0, r1, #1 + strb r0, [r2] + strb r4, [r5] +._154: + mov r2, r9 + ldrh r1, [r2, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + ldr r5, ._159 + 4 + cmp r0, #0 + beq ._156 @cond_branch + add r2, r5, #0 + add r2, r2, #0x53 + add r0, r5, #0 + add r0, r0, #0x54 + ldrb r1, [r0] + lsl r0, r1, #0x1 + add r0, r0, r1 + ldrb r2, [r2] + add r0, r0, r2 + add r1, r0, r5 + ldrb r0, [r1] + cmp r0, #0 + beq ._156 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] + add r1, r5, #0 + add r1, r1, #0x55 + mov r0, #0x1 + strb r0, [r1] +._156: + add r6, r5, #0 + add r0, r6, #0 + add r0, r0, #0x55 + ldrb r7, [r0] + cmp r7, #0 + beq ._157 @cond_branch +._141: + bl debug_sub_80916AC + b ._162 +._160: + .align 2, 0 +._159: + .word gMain + .word gSharedMem +._157: + mov r3, r9 + ldrh r1, [r3, #0x2e] + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._161 @cond_branch + ldr r0, ._164 + ldr r1, ._164 + 4 + mov ip, r1 + mov r2, #0x53 + add r2, r2, r6 + mov r8, r2 + add r4, r6, #0 + add r4, r4, #0x54 + ldrb r2, [r4] + lsl r1, r2, #0x1 + add r1, r1, r2 + mov r3, r8 + ldrb r3, [r3] + add r1, r1, r3 + lsl r1, r1, #0x3 + add r1, r1, ip + ldrh r1, [r1, #0x4] + bl GetMonData + ldrb r2, [r4] + lsl r1, r2, #0x1 + add r1, r1, r2 + mov r2, r8 + ldrb r2, [r2] + add r1, r1, r2 + add r1, r1, r6 + strb r0, [r1] + bl debug_sub_80916AC + add r0, r6, #0 + add r0, r0, #0x52 + strb r7, [r0] +._161: + mov r3, r9 + ldrh r1, [r3, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._162 @cond_branch + ldr r2, ._164 + 4 + add r0, r6, #0 + add r0, r0, #0x53 + ldrb r4, [r0] + add r0, r0, #0x1 + ldrb r1, [r0] + lsl r0, r1, #0x1 + add r3, r0, r1 + add r0, r3, r4 + lsl r0, r0, #0x3 + add r1, r0, r2 + ldrh r0, [r1, #0x4] + cmp r0, #0 + beq ._163 @cond_branch + ldr r0, ._164 + ldrh r1, [r1, #0x4] + add r2, r4, r6 + add r2, r3, r2 + bl SetMonData +._163: + add r0, r5, #0 + add r0, r0, #0x52 + strb r7, [r0] +._162: + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._165: + .align 2, 0 +._164: + .word gPlayerParty + .word gUnknown_Debug_083C50EC + + thumb_func_end debug_sub_8091334 + + thumb_func_start debug_sub_80915BC +debug_sub_80915BC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + ldr r0, ._168 + mov r1, #0x0 + strh r1, [r0] + add r0, r0, #0x2 + strh r1, [r0] + mov r1, #0x0 + ldr r0, ._168 + 4 + mov r8, r0 + ldr r7, ._168 + 8 +._171: + mov r4, #0x0 + lsl r0, r1, #0x1 + add r6, r1, #1 + add r5, r0, r1 +._170: + add r0, r5, r4 + lsl r0, r0, #0x3 + add r0, r0, r8 + ldrh r1, [r0, #0x4] + cmp r1, #0 + beq ._166 @cond_branch + ldr r0, ._168 + 12 + bl GetMonData + add r1, r4, r5 + add r1, r1, r7 + strb r0, [r1] + b ._167 +._169: + .align 2, 0 +._168: + .word 0x4000010 + .word gUnknown_Debug_083C50EC + .word gSharedMem + .word gPlayerParty +._166: + add r0, r4, r5 + add r0, r0, r7 + strb r1, [r0] +._167: + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x2 + bls ._170 @cond_branch + lsl r0, r6, #0x18 + lsr r1, r0, #0x18 + cmp r1, #0x5 + bls ._171 @cond_branch + ldr r4, ._172 + add r0, r4, #0 + bl Text_LoadWindowTemplate + add r0, r4, #0 + bl InitMenuWindow + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x3 + bl Menu_DrawStdWindowFrame + ldr r0, ._172 + 4 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + mov r0, #0x0 + mov r1, #0x4 + mov r2, #0x1d + mov r3, #0x11 + bl Menu_DrawStdWindowFrame + mov r0, #0x0 + mov r1, #0x12 + mov r2, #0x1d + mov r3, #0x15 + bl Menu_DrawStdWindowFrame + mov r1, #0x80 + lsl r1, r1, #0x13 + mov r2, #0x8a + lsl r2, r2, #0x5 + add r0, r2, #0 + strh r0, [r1] + ldr r2, ._172 + 8 + add r0, r2, #0 + add r0, r0, #0x53 + mov r1, #0x0 + strb r1, [r0] + add r0, r0, #0x1 + strb r1, [r0] + sub r0, r0, #0x2 + strb r1, [r0] + bl debug_sub_80916AC + ldr r0, ._172 + 12 + bl SetVBlankCallback + ldr r0, ._172 + 16 + bl SetMainCallback2 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._173: + .align 2, 0 +._172: + .word gWindowTemplate_81E7224 + .word gUnknown_Debug_083C517C + .word gSharedMem + .word debug_sub_8091320+1 + .word debug_sub_8091334+1 + + thumb_func_end debug_sub_80915BC + + thumb_func_start debug_sub_80916AC +debug_sub_80916AC: + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xfffffffc + mov r6, #0x0 + ldr r0, ._177 + mov sl, r0 + mov r1, #0x0 + mov r8, r1 +._182: + ldr r2, ._177 + 4 + mov r5, #0x0 + lsl r0, r6, #0x1 + mov r9, r0 + add r1, r6, #1 + str r1, [sp] +._181: + mov r0, sl + add r0, r0, #0x53 + ldrb r0, [r0] + cmp r0, r5 + bne ._175 @cond_branch + ldr r1, ._177 + 8 + ldrb r0, [r1] + cmp r0, r6 + bne ._175 @cond_branch + mov r0, #0xef + b ._176 +._178: + .align 2, 0 +._177: + .word gSharedMem + .word gSharedMem+0x12 + .word gSharedMem+0x54 +._175: + mov r0, r8 + strb r0, [r2] + add r2, r2, #0x1 +._176: + strb r0, [r2] + add r2, r2, #0x1 + mov r1, r9 + add r4, r1, r6 + add r0, r4, r5 + lsl r0, r0, #0x3 + ldr r1, ._183 + add r0, r0, r1 + ldr r1, [r0] + add r0, r2, #0 + bl StringCopy + add r2, r0, #0 + mov r0, r8 + strb r0, [r2] + add r2, r2, #0x1 + ldr r7, ._183 + 4 + add r4, r5, r4 + add r4, r4, r7 + ldrb r1, [r4] + add r0, r2, #0 + mov r2, #0x0 + mov r3, #0x1 + bl ConvertIntToDecimalStringN + add r2, r0, #0 + mov r1, r8 + strb r1, [r2] + add r2, r2, #0x1 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x2 + bhi ._179 @cond_branch + cmp r6, #0x5 + bne ._181 @cond_branch + cmp r5, #0x2 + bne ._181 @cond_branch +._179: + sub r1, r2, #1 + mov r0, #0xff + strb r0, [r1] + mov r2, r9 + add r2, r2, #0x5 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + add r0, r7, #0 + add r0, r0, #0x12 + mov r1, #0x1 + bl Menu_PrintText + ldr r1, [sp] + lsl r0, r1, #0x18 + lsr r6, r0, #0x18 + cmp r6, #0x5 + bls ._182 @cond_branch + add sp, sp, #0x4 + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._184: + .align 2, 0 +._183: + .word gUnknown_Debug_083C50EC + .word gSharedMem + + thumb_func_end debug_sub_80916AC + + .align 2, 0 + +.endif diff --git a/asm/tomomichi_debug_menu.s b/asm/tomomichi_debug_menu.s new file mode 100644 index 000000000..e6e0db8d6 --- /dev/null +++ b/asm/tomomichi_debug_menu.s @@ -0,0 +1,8100 @@ +.if DEBUG + + .include "constants/gba_constants.inc" + .include "include/macros.inc" + + thumb_func_start InitTomomichiDebugWindow +InitTomomichiDebugWindow: + push {lr} + bl debug_sub_808B874 + mov r0, #0x0 + pop {r1} + bx r1 + + thumb_func_end InitTomomichiDebugWindow + + thumb_func_start debug_sub_808B868 +debug_sub_808B868: + push {lr} + bl c2_exit_to_overworld_1_continue_scripts_restart_music + pop {r0} + bx r0 + + thumb_func_end debug_sub_808B868 + + thumb_func_start debug_sub_808B874 +debug_sub_808B874: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xd + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._1 + mov r0, #0x1 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + ldr r0, ._1 + 4 + ldrb r0, [r0] + str r0, [sp] + mov r0, #0xc + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._1 + 8 + ldr r0, ._1 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._2: + .align 2, 0 +._1: + .word gUnknown_Debug_083C0CBA + .word gDebug_0300071D + .word gMenuCallback + .word debug_sub_808B8C8+1 + + thumb_func_end debug_sub_808B874 + + thumb_func_start debug_sub_808B8C8 +debug_sub_808B8C8: + push {r4, lr} + ldr r4, ._7 + ldrh r1, [r4, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._3 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + bl Menu_MoveCursor + ldr r1, ._7 + 4 + strb r0, [r1] +._3: + ldrh r1, [r4, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._4 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + bl Menu_MoveCursor + ldr r1, ._7 + 4 + strb r0, [r1] +._4: + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._5 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r1, ._7 + 8 + ldr r0, ._7 + 4 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r1, r1, #0x4 + add r0, r0, r1 + ldr r0, [r0] + bl _call_via_r0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._10 +._8: + .align 2, 0 +._7: + .word gMain + .word gDebug_0300071D + .word gUnknown_Debug_083C0CBA +._5: + mov r0, #0xa + and r0, r0, r1 + cmp r0, #0 + bne ._9 @cond_branch + mov r0, #0x0 + b ._10 +._9: + bl CloseMenu + mov r0, #0x1 +._10: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808B8C8 + + thumb_func_start TomomichiDebugMenu_ContestGraphics +TomomichiDebugMenu_ContestGraphics: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x14 + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r0, ._11 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r3, ._11 + 4 + mov r0, #0x2 + mov r1, #0x3 + mov r2, #0x4 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x13 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x4 + bl InitMenu + ldr r1, ._11 + 8 + ldr r0, ._11 + 12 + str r0, [r1] + ldr r0, ._11 + 16 + mov r2, #0x1 + strh r2, [r0] + ldr r1, ._11 + 20 + ldr r0, ._11 + 24 + str r0, [r1] + ldr r0, ._11 + 28 + str r4, [r0] + ldr r0, ._11 + 32 + strb r2, [r0] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._12: + .align 2, 0 +._11: + .word gUnknown_Debug_083C0CF4 + .word gUnknown_Debug_083C0D2C + .word gMenuCallback + .word debug_sub_808BC48+1 + .word gDebug_03000700 + .word gDebug_03000704 + .word 0x6f33 + .word gDebug_03000708 + .word gDebug_0300070C + + thumb_func_end TomomichiDebugMenu_ContestGraphics + + thumb_func_start TomomichiDebugMenu_ArtMusGraphics +TomomichiDebugMenu_ArtMusGraphics: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x14 + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r0, ._13 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r3, ._13 + 4 + mov r0, #0x2 + mov r1, #0x3 + mov r2, #0x4 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x13 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x4 + bl InitMenu + ldr r1, ._13 + 8 + ldr r0, ._13 + 12 + str r0, [r1] + ldr r0, ._13 + 16 + mov r2, #0x1 + strh r2, [r0] + ldr r1, ._13 + 20 + ldr r0, ._13 + 24 + str r0, [r1] + ldr r0, ._13 + 28 + str r4, [r0] + ldr r0, ._13 + 32 + strb r2, [r0] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._14: + .align 2, 0 +._13: + .word gUnknown_Debug_083C0D4C + .word gUnknown_Debug_083C0D83 + .word gMenuCallback + .word debug_sub_808BCBC+1 + .word gDebug_03000700 + .word gDebug_03000704 + .word 0x6f33 + .word gDebug_03000708 + .word gDebug_0300070D + + thumb_func_end TomomichiDebugMenu_ArtMusGraphics + + thumb_func_start TomomichiDebugMenu_PreviewData +TomomichiDebugMenu_PreviewData: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x14 + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r0, ._15 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r3, ._15 + 4 + mov r0, #0x2 + mov r1, #0x3 + mov r2, #0x4 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x13 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x4 + bl InitMenu + ldr r1, ._15 + 8 + ldr r0, ._15 + 12 + str r0, [r1] + ldr r0, ._15 + 16 + mov r2, #0x1 + strh r2, [r0] + ldr r1, ._15 + 20 + ldr r0, ._15 + 24 + str r0, [r1] + ldr r0, ._15 + 28 + str r4, [r0] + ldr r0, ._15 + 32 + strb r2, [r0] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._16: + .align 2, 0 +._15: + .word gUnknown_Debug_083C0DA4 + .word gUnknown_Debug_083C0DD4 + .word gMenuCallback + .word debug_sub_808BD30+1 + .word gDebug_03000700 + .word gDebug_03000704 + .word 0x6f33 + .word gDebug_03000708 + .word gDebug_0300070E + + thumb_func_end TomomichiDebugMenu_PreviewData + + thumb_func_start TomomichiDebugMenu_TrickHouse +TomomichiDebugMenu_TrickHouse: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + ldr r0, ._17 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r3, ._17 + 4 + mov r0, #0x2 + mov r1, #0x3 + mov r2, #0x2 + bl Menu_PrintItems + ldr r0, ._17 + 8 + ldrb r0, [r0] + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x2 + bl InitMenu + ldr r1, ._17 + 12 + ldr r0, ._17 + 16 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._18: + .align 2, 0 +._17: + .word gUnknown_Debug_083C0DF4 + .word gUnknown_Debug_083C0E15 + .word gDebug_0300071E + .word gMenuCallback + .word debug_sub_808BDA4+1 + + thumb_func_end TomomichiDebugMenu_TrickHouse + + thumb_func_start TomomichiDebugMenu_ControlEvents +TomomichiDebugMenu_ControlEvents: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._19 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + ldr r0, ._19 + 4 + ldrb r0, [r0] + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r1, ._19 + 8 + ldr r0, ._19 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._20: + .align 2, 0 +._19: + .word gUnknown_Debug_083C0E32 + .word gDebug_0300071F + .word gMenuCallback + .word debug_sub_808BE2C+1 + + thumb_func_end TomomichiDebugMenu_ControlEvents + + thumb_func_start TomomichiDebugMenu_ControlFlags +TomomichiDebugMenu_ControlFlags: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._21 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + ldr r0, ._21 + 4 + ldrb r0, [r0] + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._21 + 8 + ldr r0, ._21 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._22: + .align 2, 0 +._21: + .word gUnknown_Debug_083C0E7F + .word gDebug_03000720 + .word gMenuCallback + .word debug_sub_808BEB4+1 + + thumb_func_end TomomichiDebugMenu_ControlFlags + + thumb_func_start TomomichiDebugMenu_ControlWorks +TomomichiDebugMenu_ControlWorks: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._23 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + ldr r0, ._23 + 4 + ldrb r0, [r0] + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r1, ._23 + 8 + ldr r0, ._23 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._24: + .align 2, 0 +._23: + .word gUnknown_Debug_083C0EF1 + .word gDebug_03000721 + .word gMenuCallback + .word debug_sub_808BF3C+1 + + thumb_func_end TomomichiDebugMenu_ControlWorks + + thumb_func_start debug_sub_808BC48 +debug_sub_808BC48: + push {r4, lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + asr r0, r0, #0x18 + cmp r0, #0x1 + beq ._25 @cond_branch + cmp r0, #0x1 + bgt ._26 @cond_branch + cmp r0, #0 + beq ._27 @cond_branch + b ._32 +._26: + cmp r0, #0x2 + beq ._29 @cond_branch + b ._32 +._27: + bl debug_sub_808ED0C + b ._32 +._25: + bl debug_sub_808ED9C + b ._32 +._29: + bl debug_sub_808EE3C +._32: + mov r0, #0x0 + bl debug_sub_808EF8C + lsl r0, r4, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._36 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + bne ._34 @cond_branch + bl CloseMenu + mov r0, #0x1 + b ._35 +._34: + cmp r1, #0x3 + bne ._36 @cond_branch + ldr r0, ._37 + ldr r1, ._37 + 4 + ldr r1, [r1, #0x1c] + str r1, [r0] +._36: + mov r0, #0x0 +._35: + pop {r4} + pop {r1} + bx r1 +._38: + .align 2, 0 +._37: + .word gMenuCallback + .word gUnknown_Debug_083C0D2C + + thumb_func_end debug_sub_808BC48 + + thumb_func_start debug_sub_808BCBC +debug_sub_808BCBC: + push {r4, lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + asr r0, r0, #0x18 + cmp r0, #0x1 + beq ._39 @cond_branch + cmp r0, #0x1 + bgt ._40 @cond_branch + cmp r0, #0 + beq ._41 @cond_branch + b ._46 +._40: + cmp r0, #0x2 + beq ._43 @cond_branch + b ._46 +._41: + bl debug_sub_808ED0C + b ._46 +._39: + bl debug_sub_808ED9C + b ._46 +._43: + bl debug_sub_808EE9C +._46: + mov r0, #0x1 + bl debug_sub_808EF8C + lsl r0, r4, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._50 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + bne ._48 @cond_branch + bl CloseMenu + mov r0, #0x1 + b ._49 +._48: + cmp r1, #0x3 + bne ._50 @cond_branch + ldr r0, ._51 + ldr r1, ._51 + 4 + ldr r1, [r1, #0x1c] + str r1, [r0] +._50: + mov r0, #0x0 +._49: + pop {r4} + pop {r1} + bx r1 +._52: + .align 2, 0 +._51: + .word gMenuCallback + .word gUnknown_Debug_083C0D83 + + thumb_func_end debug_sub_808BCBC + + thumb_func_start debug_sub_808BD30 +debug_sub_808BD30: + push {r4, lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + asr r0, r0, #0x18 + cmp r0, #0x1 + beq ._53 @cond_branch + cmp r0, #0x1 + bgt ._54 @cond_branch + cmp r0, #0 + beq ._55 @cond_branch + b ._60 +._54: + cmp r0, #0x2 + beq ._57 @cond_branch + b ._60 +._55: + bl debug_sub_808ED0C + b ._60 +._53: + bl debug_sub_808ED9C + b ._60 +._57: + bl debug_sub_808EF14 +._60: + mov r0, #0x2 + bl debug_sub_808EF8C + lsl r0, r4, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + beq ._64 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + bne ._62 @cond_branch + bl CloseMenu + mov r0, #0x1 + b ._63 +._62: + cmp r1, #0x3 + bne ._64 @cond_branch + ldr r0, ._65 + ldr r1, ._65 + 4 + ldr r1, [r1, #0x1c] + str r1, [r0] +._64: + mov r0, #0x0 +._63: + pop {r4} + pop {r1} + bx r1 +._66: + .align 2, 0 +._65: + .word gMenuCallback + .word gUnknown_Debug_083C0DD4 + + thumb_func_end debug_sub_808BD30 + + thumb_func_start debug_sub_808BDA4 +debug_sub_808BDA4: + push {r4, lr} + ldr r4, ._71 + ldrh r1, [r4, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._67 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + bl Menu_MoveCursor + ldr r1, ._71 + 4 + strb r0, [r1] +._67: + ldrh r1, [r4, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._68 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + bl Menu_MoveCursor + ldr r1, ._71 + 4 + strb r0, [r1] +._68: + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._69 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r1, ._71 + 8 + ldr r0, ._71 + 4 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r1, r1, #0x4 + add r0, r0, r1 + ldr r0, [r0] + bl _call_via_r0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._74 +._72: + .align 2, 0 +._71: + .word gMain + .word gDebug_0300071E + .word gUnknown_Debug_083C0E15 +._69: + mov r0, #0xa + and r0, r0, r1 + cmp r0, #0 + bne ._73 @cond_branch + mov r0, #0x0 + b ._74 +._73: + bl CloseMenu + mov r0, #0x1 +._74: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808BDA4 + + thumb_func_start debug_sub_808BE2C +debug_sub_808BE2C: + push {r4, lr} + ldr r4, ._79 + ldrh r1, [r4, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._75 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + bl Menu_MoveCursor + ldr r1, ._79 + 4 + strb r0, [r1] +._75: + ldrh r1, [r4, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._76 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + bl Menu_MoveCursor + ldr r1, ._79 + 4 + strb r0, [r1] +._76: + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._77 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r1, ._79 + 8 + ldr r0, ._79 + 4 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r1, r1, #0x4 + add r0, r0, r1 + ldr r0, [r0] + bl _call_via_r0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._82 +._80: + .align 2, 0 +._79: + .word gMain + .word gDebug_0300071F + .word gUnknown_Debug_083C0E32 +._77: + mov r0, #0xa + and r0, r0, r1 + cmp r0, #0 + bne ._81 @cond_branch + mov r0, #0x0 + b ._82 +._81: + bl CloseMenu + mov r0, #0x1 +._82: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808BE2C + + thumb_func_start debug_sub_808BEB4 +debug_sub_808BEB4: + push {r4, lr} + ldr r4, ._87 + ldrh r1, [r4, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._83 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + bl Menu_MoveCursor + ldr r1, ._87 + 4 + strb r0, [r1] +._83: + ldrh r1, [r4, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._84 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + bl Menu_MoveCursor + ldr r1, ._87 + 4 + strb r0, [r1] +._84: + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._85 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r1, ._87 + 8 + ldr r0, ._87 + 4 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r1, r1, #0x4 + add r0, r0, r1 + ldr r0, [r0] + bl _call_via_r0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._90 +._88: + .align 2, 0 +._87: + .word gMain + .word gDebug_03000720 + .word gUnknown_Debug_083C0E7F +._85: + mov r0, #0xa + and r0, r0, r1 + cmp r0, #0 + bne ._89 @cond_branch + mov r0, #0x0 + b ._90 +._89: + bl CloseMenu + mov r0, #0x1 +._90: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808BEB4 + + thumb_func_start debug_sub_808BF3C +debug_sub_808BF3C: + push {r4, lr} + ldr r4, ._95 + ldrh r1, [r4, #0x2e] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._91 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + bl Menu_MoveCursor + ldr r1, ._95 + 4 + strb r0, [r1] +._91: + ldrh r1, [r4, #0x2e] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._92 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + bl Menu_MoveCursor + ldr r1, ._95 + 4 + strb r0, [r1] +._92: + ldrh r1, [r4, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._93 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r1, ._95 + 8 + ldr r0, ._95 + 4 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r1, r1, #0x4 + add r0, r0, r1 + ldr r0, [r0] + bl _call_via_r0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + b ._98 +._96: + .align 2, 0 +._95: + .word gMain + .word gDebug_03000721 + .word gUnknown_Debug_083C0EF1 +._93: + mov r0, #0xa + and r0, r0, r1 + cmp r0, #0 + bne ._97 @cond_branch + mov r0, #0x0 + b ._98 +._97: + bl CloseMenu + mov r0, #0x1 +._98: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808BF3C + + thumb_func_start debug_sub_808BFC4 +debug_sub_808BFC4: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._99 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._99 + 4 + ldr r0, ._99 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._100: + .align 2, 0 +._99: + .word gUnknown_Debug_083C0F79 + .word gMenuCallback + .word debug_sub_808C064+1 + + thumb_func_end debug_sub_808BFC4 + + thumb_func_start debug_sub_808C014 +debug_sub_808C014: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._101 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r1, ._101 + 4 + ldr r0, ._101 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._102: + .align 2, 0 +._101: + .word gUnknown_Debug_083C0FFC + .word gMenuCallback + .word debug_sub_808C0A8+1 + + thumb_func_end debug_sub_808C014 + + thumb_func_start debug_sub_808C064 +debug_sub_808C064: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._103 @cond_branch + mov r0, #0x0 + b ._106 +._103: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._105 @cond_branch + ldr r2, ._107 + ldr r0, ._107 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._106 +._108: + .align 2, 0 +._107: + .word gMenuCallback + .word gUnknown_Debug_083C0F79 +._105: + bl CloseMenu + mov r0, #0x1 +._106: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808C064 + + thumb_func_start debug_sub_808C0A8 +debug_sub_808C0A8: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._109 @cond_branch + mov r0, #0x0 + b ._112 +._109: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._111 @cond_branch + ldr r2, ._113 + ldr r0, ._113 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._112 +._114: + .align 2, 0 +._113: + .word gMenuCallback + .word gUnknown_Debug_083C0FFC +._111: + bl CloseMenu + mov r0, #0x1 +._112: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808C0A8 + + thumb_func_start debug_sub_808C0EC +debug_sub_808C0EC: + push {lr} + ldr r0, ._115 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._116: + .align 2, 0 +._115: + .word DebugScript_081C1CFE + + thumb_func_end debug_sub_808C0EC + + thumb_func_start debug_sub_808C104 +debug_sub_808C104: + push {lr} + ldr r0, ._117 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._118: + .align 2, 0 +._117: + .word DebugScript_081C1D07 + + thumb_func_end debug_sub_808C104 + + thumb_func_start debug_sub_808C11C +debug_sub_808C11C: + push {lr} + ldr r0, ._119 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._120: + .align 2, 0 +._119: + .word DebugScript_081C1D1E + + thumb_func_end debug_sub_808C11C + + thumb_func_start debug_sub_808C134 +debug_sub_808C134: + push {lr} + ldr r0, ._121 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._122: + .align 2, 0 +._121: + .word DebugScript_081C1D24 + + thumb_func_end debug_sub_808C134 + + thumb_func_start debug_sub_808C14C +debug_sub_808C14C: + push {lr} + ldr r0, ._123 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._124: + .align 2, 0 +._123: + .word DebugScript_081C1D2A + + thumb_func_end debug_sub_808C14C + + thumb_func_start debug_sub_808C164 +debug_sub_808C164: + push {lr} + ldr r0, ._125 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._126: + .align 2, 0 +._125: + .word DebugScript_081C1D35 + + thumb_func_end debug_sub_808C164 + + thumb_func_start debug_sub_808C17C +debug_sub_808C17C: + push {lr} + ldr r0, ._127 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._128: + .align 2, 0 +._127: + .word DebugScript_081C1D46 + + thumb_func_end debug_sub_808C17C + + thumb_func_start debug_sub_808C194 +debug_sub_808C194: + push {lr} + ldr r0, ._129 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._130: + .align 2, 0 +._129: + .word DebugScript_081C221F + + thumb_func_end debug_sub_808C194 + + thumb_func_start debug_sub_808C1AC +debug_sub_808C1AC: + push {lr} + ldr r0, ._131 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._132: + .align 2, 0 +._131: + .word DebugScript_081C23E2 + + thumb_func_end debug_sub_808C1AC + + thumb_func_start debug_sub_808C1C4 +debug_sub_808C1C4: + push {lr} + ldr r0, ._133 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._134: + .align 2, 0 +._133: + .word DebugScript_081C23E6 + + thumb_func_end debug_sub_808C1C4 + + thumb_func_start debug_sub_808C1DC +debug_sub_808C1DC: + push {lr} + ldr r0, ._135 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._136: + .align 2, 0 +._135: + .word DebugScript_081C23F6 + + thumb_func_end debug_sub_808C1DC + + thumb_func_start debug_sub_808C1F4 +debug_sub_808C1F4: + push {lr} + ldr r0, ._137 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._138: + .align 2, 0 +._137: + .word DebugScript_081C2482 + + thumb_func_end debug_sub_808C1F4 + + thumb_func_start debug_sub_808C20C +debug_sub_808C20C: + push {lr} + ldr r0, ._139 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._140: + .align 2, 0 +._139: + .word DebugScript_081C23FD + + thumb_func_end debug_sub_808C20C + + thumb_func_start debug_sub_808C224 +debug_sub_808C224: + push {lr} + ldr r0, ._141 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._142: + .align 2, 0 +._141: + .word DebugScript_081C2518 + + thumb_func_end debug_sub_808C224 + + thumb_func_start debug_sub_808C23C +debug_sub_808C23C: + push {lr} + ldr r0, ._143 + bl ScriptContext1_SetupScript + bl CloseMenu + mov r0, #0x1 + pop {r1} + bx r1 +._144: + .align 2, 0 +._143: + .word DebugScript_081C2507 + + thumb_func_end debug_sub_808C23C + + thumb_func_start TomomichiDebugMenu_ContestGraphics_Show +TomomichiDebugMenu_ContestGraphics_Show: + push {lr} + add sp, sp, #0xfffffffc + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r1, ._145 + ldr r0, ._145 + 4 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x4 + pop {r1} + bx r1 +._146: + .align 2, 0 +._145: + .word gMenuCallback + .word debug_sub_808C280+1 + + thumb_func_end TomomichiDebugMenu_ContestGraphics_Show + + thumb_func_start debug_sub_808C280 +debug_sub_808C280: + push {lr} + bl UpdatePaletteFade + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._147 @cond_branch + mov r0, #0x0 + b ._148 +._147: + bl CloseMenu + mov r0, #0x0 + bl debug_sub_808F168 + ldr r0, ._149 + bl SetMainCallback2 + ldr r1, ._149 + 4 + ldr r0, ._149 + 8 + str r0, [r1, #0x8] + mov r0, #0x1 +._148: + pop {r1} + bx r1 +._150: + .align 2, 0 +._149: + .word CB2_ContestPainting+1 + .word gMain + .word debug_sub_808B868+1 + + thumb_func_end debug_sub_808C280 + + thumb_func_start TomomichiDebugMenu_MuseumGraphics_Show +TomomichiDebugMenu_MuseumGraphics_Show: + push {lr} + add sp, sp, #0xfffffffc + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r1, ._151 + ldr r0, ._151 + 4 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x4 + pop {r1} + bx r1 +._152: + .align 2, 0 +._151: + .word gMenuCallback + .word debug_sub_808C2E4+1 + + thumb_func_end TomomichiDebugMenu_MuseumGraphics_Show + + thumb_func_start debug_sub_808C2E4 +debug_sub_808C2E4: + push {lr} + bl UpdatePaletteFade + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._153 @cond_branch + mov r0, #0x0 + b ._154 +._153: + bl CloseMenu + mov r0, #0x1 + bl debug_sub_808F168 + ldr r0, ._155 + bl SetMainCallback2 + ldr r1, ._155 + 4 + ldr r0, ._155 + 8 + str r0, [r1, #0x8] + mov r0, #0x1 +._154: + pop {r1} + bx r1 +._156: + .align 2, 0 +._155: + .word CB2_ContestPainting+1 + .word gMain + .word debug_sub_808B868+1 + + thumb_func_end debug_sub_808C2E4 + + thumb_func_start debug_sub_808C31C +debug_sub_808C31C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._157 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._157 + 4 + ldr r0, ._157 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._158: + .align 2, 0 +._157: + .word gUnknown_Debug_083C2828 + .word gMenuCallback + .word debug_sub_808C36C+1 + + thumb_func_end debug_sub_808C31C + + thumb_func_start debug_sub_808C36C +debug_sub_808C36C: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._159 @cond_branch + mov r0, #0x0 + b ._162 +._159: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._161 @cond_branch + ldr r2, ._163 + ldr r0, ._163 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._162 +._164: + .align 2, 0 +._163: + .word gMenuCallback + .word gUnknown_Debug_083C2828 +._161: + bl CloseMenu + mov r0, #0x1 +._162: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808C36C + + thumb_func_start debug_sub_808C3B0 +debug_sub_808C3B0: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._165 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r0, ._165 + 4 + strb r4, [r0] + ldr r1, ._165 + 8 + ldr r0, ._165 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._166: + .align 2, 0 +._165: + .word gUnknown_Debug_083C2938 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C3B0 + + thumb_func_start debug_sub_808C408 +debug_sub_808C408: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._167 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._167 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._167 + 8 + ldr r0, ._167 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._168: + .align 2, 0 +._167: + .word gUnknown_Debug_083C2A48 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C408 + + thumb_func_start debug_sub_808C460 +debug_sub_808C460: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._169 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._169 + 4 + mov r0, #0x2 + strb r0, [r1] + ldr r1, ._169 + 8 + ldr r0, ._169 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._170: + .align 2, 0 +._169: + .word gUnknown_Debug_083C2B4C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C460 + + thumb_func_start debug_sub_808C4B8 +debug_sub_808C4B8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._171 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._171 + 4 + mov r0, #0x3 + strb r0, [r1] + ldr r1, ._171 + 8 + ldr r0, ._171 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._172: + .align 2, 0 +._171: + .word gUnknown_Debug_083C2C80 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C4B8 + + thumb_func_start debug_sub_808C510 +debug_sub_808C510: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._173 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._173 + 4 + mov r0, #0x4 + strb r0, [r1] + ldr r1, ._173 + 8 + ldr r0, ._173 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._174: + .align 2, 0 +._173: + .word gUnknown_Debug_083C2D8C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C510 + + thumb_func_start debug_sub_808C568 +debug_sub_808C568: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._175 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._175 + 4 + mov r0, #0x5 + strb r0, [r1] + ldr r1, ._175 + 8 + ldr r0, ._175 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._176: + .align 2, 0 +._175: + .word gUnknown_Debug_083C2EB0 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C568 + + thumb_func_start debug_sub_808C5C0 +debug_sub_808C5C0: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._177 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._177 + 4 + mov r0, #0x6 + strb r0, [r1] + ldr r1, ._177 + 8 + ldr r0, ._177 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._178: + .align 2, 0 +._177: + .word gUnknown_Debug_083C2FE0 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C5C0 + + thumb_func_start debug_sub_808C618 +debug_sub_808C618: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._179 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._179 + 4 + mov r0, #0x7 + strb r0, [r1] + ldr r1, ._179 + 8 + ldr r0, ._179 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._180: + .align 2, 0 +._179: + .word gUnknown_Debug_083C3100 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C618 + + thumb_func_start debug_sub_808C670 +debug_sub_808C670: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + ldr r3, ._181 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x3 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x3 + bl InitMenu + ldr r1, ._181 + 4 + mov r0, #0x8 + strb r0, [r1] + ldr r1, ._181 + 8 + ldr r0, ._181 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._182: + .align 2, 0 +._181: + .word gUnknown_Debug_083C3194 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808C6C8+1 + + thumb_func_end debug_sub_808C670 + + thumb_func_start debug_sub_808C6C8 +debug_sub_808C6C8: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._186 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808C714 + ldrb r0, [r5] + bl debug_sub_808C764 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._183 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._184 @cond_branch +._183: + mov r0, #0x0 + b ._185 +._187: + .align 2, 0 +._186: + .word gDebug_0300070F +._184: + bl CloseMenu + mov r0, #0x1 +._185: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808C6C8 + + thumb_func_start debug_sub_808C714 +debug_sub_808C714: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._191 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._190 @cond_branch + ldr r0, ._191 + 4 + lsl r1, r2, #0x3 + add r1, r1, r2 + add r1, r1, r3 + lsl r1, r1, #0x1 + add r1, r1, r0 + ldrh r4, [r1] + add r0, r4, #0 + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._189 @cond_branch + add r0, r4, #0 + bl FlagSet + b ._190 +._192: + .align 2, 0 +._191: + .word gMain + .word gUnknown_Debug_83C31E6 +._189: + add r0, r4, #0 + bl FlagClear +._190: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808C714 + + thumb_func_start debug_sub_808C764 +debug_sub_808C764: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._195 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._193 @cond_branch + ldr r0, ._195 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._194: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl FlagGet + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + neg r2, r0 + orr r2, r2, r0 + lsr r2, r2, #0x1f + mov r0, #0x1c + add r1, r4, #0 + bl debug_sub_808F2E0 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._194 @cond_branch +._193: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._196: + .align 2, 0 +._195: + .word gUnknown_Debug_083C31DC + .word gUnknown_Debug_83C31E6 + + thumb_func_end debug_sub_808C764 + + thumb_func_start debug_sub_808C7C8 +debug_sub_808C7C8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._197 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._197 + 4 + ldr r0, ._197 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._198: + .align 2, 0 +._197: + .word gUnknown_Debug_083C1CE8 + .word gMenuCallback + .word debug_sub_808C818+1 + + thumb_func_end debug_sub_808C7C8 + + thumb_func_start debug_sub_808C818 +debug_sub_808C818: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._199 @cond_branch + mov r0, #0x0 + b ._202 +._199: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._201 @cond_branch + ldr r2, ._203 + ldr r0, ._203 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._202 +._204: + .align 2, 0 +._203: + .word gMenuCallback + .word gUnknown_Debug_083C1CE8 +._201: + bl CloseMenu + mov r0, #0x1 +._202: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808C818 + + thumb_func_start debug_sub_808C85C +debug_sub_808C85C: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._205 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r0, ._205 + 4 + strb r4, [r0] + ldr r1, ._205 + 8 + ldr r0, ._205 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._206: + .align 2, 0 +._205: + .word gUnknown_Debug_083C1E0C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808C85C + + thumb_func_start debug_sub_808C8B4 +debug_sub_808C8B4: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._207 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._207 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._207 + 8 + ldr r0, ._207 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._208: + .align 2, 0 +._207: + .word gUnknown_Debug_083C1F38 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808C8B4 + + thumb_func_start debug_sub_808C90C +debug_sub_808C90C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._209 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._209 + 4 + mov r0, #0x2 + strb r0, [r1] + ldr r1, ._209 + 8 + ldr r0, ._209 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._210: + .align 2, 0 +._209: + .word gUnknown_Debug_083C206C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808C90C + + thumb_func_start debug_sub_808C964 +debug_sub_808C964: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._211 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._211 + 4 + mov r0, #0x3 + strb r0, [r1] + ldr r1, ._211 + 8 + ldr r0, ._211 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._212: + .align 2, 0 +._211: + .word gUnknown_Debug_083C2190 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808C964 + + thumb_func_start debug_sub_808C9BC +debug_sub_808C9BC: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._213 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r1, ._213 + 4 + mov r0, #0x4 + strb r0, [r1] + ldr r1, ._213 + 8 + ldr r0, ._213 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._214: + .align 2, 0 +._213: + .word gUnknown_Debug_083C2264 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808C9BC + + thumb_func_start debug_sub_808CA14 +debug_sub_808CA14: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._215 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._215 + 4 + mov r0, #0x5 + strb r0, [r1] + ldr r1, ._215 + 8 + ldr r0, ._215 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._216: + .align 2, 0 +._215: + .word gUnknown_Debug_083C2370 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808CA14 + + thumb_func_start debug_sub_808CA6C +debug_sub_808CA6C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._217 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._217 + 4 + mov r0, #0x6 + strb r0, [r1] + ldr r1, ._217 + 8 + ldr r0, ._217 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._218: + .align 2, 0 +._217: + .word gUnknown_Debug_083C248C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808CA6C + + thumb_func_start debug_sub_808CAC4 +debug_sub_808CAC4: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._219 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._219 + 4 + mov r0, #0x7 + strb r0, [r1] + ldr r1, ._219 + 8 + ldr r0, ._219 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._220: + .align 2, 0 +._219: + .word gUnknown_Debug_083C259C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808CAC4 + + thumb_func_start debug_sub_808CB1C +debug_sub_808CB1C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._221 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._221 + 4 + mov r0, #0x8 + strb r0, [r1] + ldr r1, ._221 + 8 + ldr r0, ._221 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._222: + .align 2, 0 +._221: + .word gUnknown_Debug_083C26C8 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CB74+1 + + thumb_func_end debug_sub_808CB1C + + thumb_func_start debug_sub_808CB74 +debug_sub_808CB74: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._226 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808CBC0 + ldrb r0, [r5] + bl debug_sub_808CC10 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._223 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._224 @cond_branch +._223: + mov r0, #0x0 + b ._225 +._227: + .align 2, 0 +._226: + .word gDebug_0300070F +._224: + bl CloseMenu + mov r0, #0x1 +._225: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808CB74 + + thumb_func_start debug_sub_808CBC0 +debug_sub_808CBC0: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._231 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._230 @cond_branch + ldr r0, ._231 + 4 + lsl r1, r2, #0x3 + add r1, r1, r2 + add r1, r1, r3 + lsl r1, r1, #0x1 + add r1, r1, r0 + ldrh r4, [r1] + add r0, r4, #0 + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._229 @cond_branch + add r0, r4, #0 + bl FlagSet + b ._230 +._232: + .align 2, 0 +._231: + .word gMain + .word gUnknown_Debug_083C271A +._229: + add r0, r4, #0 + bl FlagClear +._230: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808CBC0 + + thumb_func_start debug_sub_808CC10 +debug_sub_808CC10: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._235 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._233 @cond_branch + ldr r0, ._235 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._234: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl FlagGet + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + neg r2, r0 + orr r2, r2, r0 + lsr r2, r2, #0x1f + mov r0, #0x1c + add r1, r4, #0 + bl debug_sub_808F2E0 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._234 @cond_branch +._233: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._236: + .align 2, 0 +._235: + .word gUnknown_Debug_083C2710 + .word gUnknown_Debug_083C271A + + thumb_func_end debug_sub_808CC10 + + thumb_func_start debug_sub_808CC74 +debug_sub_808CC74: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + ldr r3, ._237 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x3 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x3 + bl InitMenu + ldr r1, ._237 + 4 + ldr r0, ._237 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._238: + .align 2, 0 +._237: + .word gUnknown_Debug_083C1ADC + .word gMenuCallback + .word debug_sub_808CCC4+1 + + thumb_func_end debug_sub_808CC74 + + thumb_func_start debug_sub_808CCC4 +debug_sub_808CCC4: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._239 @cond_branch + mov r0, #0x0 + b ._242 +._239: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._241 @cond_branch + ldr r2, ._243 + ldr r0, ._243 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._242 +._244: + .align 2, 0 +._243: + .word gMenuCallback + .word gUnknown_Debug_083C1ADC +._241: + bl CloseMenu + mov r0, #0x1 +._242: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808CCC4 + + thumb_func_start debug_sub_808CD08 +debug_sub_808CD08: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x11 + bl Menu_DrawStdWindowFrame + ldr r3, ._245 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x8 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x8 + bl InitMenu + ldr r0, ._245 + 4 + strb r4, [r0] + ldr r1, ._245 + 8 + ldr r0, ._245 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._246: + .align 2, 0 +._245: + .word gUnknown_Debug_083C1B7C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CE10+1 + + thumb_func_end debug_sub_808CD08 + + thumb_func_start debug_sub_808CD60 +debug_sub_808CD60: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + ldr r3, ._247 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x4 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x4 + bl InitMenu + ldr r1, ._247 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._247 + 8 + ldr r0, ._247 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._248: + .align 2, 0 +._247: + .word gUnknown_Debug_083C1BF0 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CE10+1 + + thumb_func_end debug_sub_808CD60 + + thumb_func_start debug_sub_808CDB8 +debug_sub_808CDB8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x3 + bl Menu_DrawStdWindowFrame + ldr r3, ._249 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x1 + bl InitMenu + ldr r1, ._249 + 4 + mov r0, #0x2 + strb r0, [r1] + ldr r1, ._249 + 8 + ldr r0, ._249 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._250: + .align 2, 0 +._249: + .word gUnknown_Debug_083C1C2C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808CE10+1 + + thumb_func_end debug_sub_808CDB8 + + thumb_func_start debug_sub_808CE10 +debug_sub_808CE10: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._254 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808CE5C + ldrb r0, [r5] + bl debug_sub_808CEAC + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._251 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._252 @cond_branch +._251: + mov r0, #0x0 + b ._253 +._255: + .align 2, 0 +._254: + .word gDebug_0300070F +._252: + bl CloseMenu + mov r0, #0x1 +._253: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808CE10 + + thumb_func_start debug_sub_808CE5C +debug_sub_808CE5C: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._259 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._258 @cond_branch + ldr r0, ._259 + 4 + lsl r1, r2, #0x3 + add r1, r1, r2 + add r1, r1, r3 + lsl r1, r1, #0x1 + add r1, r1, r0 + ldrh r4, [r1] + add r0, r4, #0 + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._257 @cond_branch + add r0, r4, #0 + bl FlagSet + b ._258 +._260: + .align 2, 0 +._259: + .word gMain + .word gUnknown_Debug_083C1C38 +._257: + add r0, r4, #0 + bl FlagClear +._258: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808CE5C + + thumb_func_start debug_sub_808CEAC +debug_sub_808CEAC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._263 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._261 @cond_branch + ldr r0, ._263 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._262: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl FlagGet + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + neg r2, r0 + orr r2, r2, r0 + lsr r2, r2, #0x1f + mov r0, #0x1c + add r1, r4, #0 + bl debug_sub_808F2E0 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._262 @cond_branch +._261: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._264: + .align 2, 0 +._263: + .word gUnknown_Debug_083C1C34 + .word gUnknown_Debug_083C1C38 + + thumb_func_end debug_sub_808CEAC + + thumb_func_start debug_sub_808CF10 +debug_sub_808CF10: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._265 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._265 + 4 + ldr r0, ._265 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._266: + .align 2, 0 +._265: + .word gUnknown_Debug_083C1330 + .word gMenuCallback + .word debug_sub_808CF60+1 + + thumb_func_end debug_sub_808CF10 + + thumb_func_start debug_sub_808CF60 +debug_sub_808CF60: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._267 @cond_branch + mov r0, #0x0 + b ._270 +._267: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._269 @cond_branch + ldr r2, ._271 + ldr r0, ._271 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._270 +._272: + .align 2, 0 +._271: + .word gMenuCallback + .word gUnknown_Debug_083C1330 +._269: + bl CloseMenu + mov r0, #0x1 +._270: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808CF60 + + thumb_func_start debug_sub_808CFA4 +debug_sub_808CFA4: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x11 + bl Menu_DrawStdWindowFrame + ldr r3, ._273 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x8 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x8 + bl InitMenu + ldr r0, ._273 + 4 + strb r4, [r0] + ldr r1, ._273 + 8 + ldr r0, ._273 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._274: + .align 2, 0 +._273: + .word gUnknown_Debug_083C13D8 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808CFA4 + + thumb_func_start debug_sub_808CFFC +debug_sub_808CFFC: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._275 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._275 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._275 + 8 + ldr r0, ._275 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._276: + .align 2, 0 +._275: + .word gUnknown_Debug_083C1465 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808CFFC + + thumb_func_start debug_sub_808D054 +debug_sub_808D054: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._277 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._277 + 4 + mov r0, #0x2 + strb r0, [r1] + ldr r1, ._277 + 8 + ldr r0, ._277 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._278: + .align 2, 0 +._277: + .word gUnknown_Debug_083C1503 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808D054 + + thumb_func_start debug_sub_808D0AC +debug_sub_808D0AC: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + ldr r3, ._279 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x4 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x4 + bl InitMenu + ldr r1, ._279 + 4 + mov r0, #0x3 + strb r0, [r1] + ldr r1, ._279 + 8 + ldr r0, ._279 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._280: + .align 2, 0 +._279: + .word gUnknown_Debug_083C158A + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808D0AC + + thumb_func_start debug_sub_808D104 +debug_sub_808D104: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._281 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._281 + 4 + mov r0, #0x4 + strb r0, [r1] + ldr r1, ._281 + 8 + ldr r0, ._281 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._282: + .align 2, 0 +._281: + .word gUnknown_Debug_083C1647 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808D104 + + thumb_func_start debug_sub_808D15C +debug_sub_808D15C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._283 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._283 + 4 + mov r0, #0x5 + strb r0, [r1] + ldr r1, ._283 + 8 + ldr r0, ._283 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._284: + .align 2, 0 +._283: + .word gUnknown_Debug_083C1712 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808D15C + + thumb_func_start debug_sub_808D1B4 +debug_sub_808D1B4: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._285 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._285 + 4 + mov r0, #0x6 + strb r0, [r1] + ldr r1, ._285 + 8 + ldr r0, ._285 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._286: + .align 2, 0 +._285: + .word gUnknown_Debug_083C17F8 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808D1B4 + + thumb_func_start debug_sub_808D20C +debug_sub_808D20C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._287 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._287 + 4 + mov r0, #0x7 + strb r0, [r1] + ldr r1, ._287 + 8 + ldr r0, ._287 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._288: + .align 2, 0 +._287: + .word gUnknown_Debug_083C18B8 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808D20C + + thumb_func_start debug_sub_808D264 +debug_sub_808D264: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r3, ._289 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x5 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x5 + bl InitMenu + ldr r1, ._289 + 4 + mov r0, #0x8 + strb r0, [r1] + ldr r1, ._289 + 8 + ldr r0, ._289 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._290: + .align 2, 0 +._289: + .word gDebug_0x83C1974 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D2BC+1 + + thumb_func_end debug_sub_808D264 + + thumb_func_start debug_sub_808D2BC +debug_sub_808D2BC: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._294 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808D308 + ldrb r0, [r5] + bl debug_sub_808D358 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._291 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._292 @cond_branch +._291: + mov r0, #0x0 + b ._293 +._295: + .align 2, 0 +._294: + .word gDebug_0300070F +._292: + bl CloseMenu + mov r0, #0x1 +._293: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808D2BC + + thumb_func_start debug_sub_808D308 +debug_sub_808D308: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._299 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._298 @cond_branch + ldr r0, ._299 + 4 + lsl r1, r2, #0x3 + add r1, r1, r2 + add r1, r1, r3 + lsl r1, r1, #0x1 + add r1, r1, r0 + ldrh r4, [r1] + add r0, r4, #0 + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._297 @cond_branch + add r0, r4, #0 + bl FlagSet + b ._298 +._300: + .align 2, 0 +._299: + .word gMain + .word gUnknown_Debug_083C19C6 +._297: + add r0, r4, #0 + bl FlagClear +._298: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808D308 + + thumb_func_start debug_sub_808D358 +debug_sub_808D358: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._303 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._301 @cond_branch + ldr r0, ._303 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._302: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl FlagGet + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + neg r2, r0 + orr r2, r2, r0 + lsr r2, r2, #0x1f + mov r0, #0x1c + add r1, r4, #0 + bl debug_sub_808F2E0 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._302 @cond_branch +._301: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._304: + .align 2, 0 +._303: + .word gUnknown_Debug_083C19BC + .word gUnknown_Debug_083C19C6 + + thumb_func_end debug_sub_808D358 + + thumb_func_start debug_sub_808D3BC +debug_sub_808D3BC: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._305 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r1, ._305 + 4 + ldr r0, ._305 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._306: + .align 2, 0 +._305: + .word gUnknown_Debug_083C105C + .word gMenuCallback + .word debug_sub_808D40C+1 + + thumb_func_end debug_sub_808D3BC + + thumb_func_start debug_sub_808D40C +debug_sub_808D40C: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._307 @cond_branch + mov r0, #0x0 + b ._310 +._307: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._309 @cond_branch + ldr r2, ._311 + ldr r0, ._311 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._310 +._312: + .align 2, 0 +._311: + .word gMenuCallback + .word gUnknown_Debug_083C105C +._309: + bl CloseMenu + mov r0, #0x1 +._310: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808D40C + + thumb_func_start debug_sub_808D450 +debug_sub_808D450: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._313 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r0, ._313 + 4 + strb r4, [r0] + ldr r1, ._313 + 8 + ldr r0, ._313 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._314: + .align 2, 0 +._313: + .word gUnknown_Debug_083C10BD + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D500+1 + + thumb_func_end debug_sub_808D450 + + thumb_func_start debug_sub_808D4A8 +debug_sub_808D4A8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._315 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._315 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._315 + 8 + ldr r0, ._315 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._316: + .align 2, 0 +._315: + .word gUnknown_Debug_083C1149 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D500+1 + + thumb_func_end debug_sub_808D4A8 + + thumb_func_start debug_sub_808D500 +debug_sub_808D500: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._320 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808D54C + ldrb r0, [r5] + bl debug_sub_808D59C + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._317 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._318 @cond_branch +._317: + mov r0, #0x0 + b ._319 +._321: + .align 2, 0 +._320: + .word gDebug_0300070F +._318: + bl CloseMenu + mov r0, #0x1 +._319: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808D500 + + thumb_func_start debug_sub_808D54C +debug_sub_808D54C: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._325 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._324 @cond_branch + ldr r0, ._325 + 4 + lsl r1, r2, #0x3 + add r1, r1, r2 + add r1, r1, r3 + lsl r1, r1, #0x1 + add r1, r1, r0 + ldrh r4, [r1] + add r0, r4, #0 + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._323 @cond_branch + add r0, r4, #0 + bl FlagSet + b ._324 +._326: + .align 2, 0 +._325: + .word gMain + .word gUnknown_Debug_083C1196 +._323: + add r0, r4, #0 + bl FlagClear +._324: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808D54C + + thumb_func_start debug_sub_808D59C +debug_sub_808D59C: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._329 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._327 @cond_branch + ldr r0, ._329 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._328: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl FlagGet + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + neg r2, r0 + orr r2, r2, r0 + lsr r2, r2, #0x1f + mov r0, #0x1c + add r1, r4, #0 + bl debug_sub_808F2E0 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._328 @cond_branch +._327: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._330: + .align 2, 0 +._329: + .word gUnknown_Debug_083C1194 + .word gUnknown_Debug_083C1196 + + thumb_func_end debug_sub_808D59C + + thumb_func_start debug_sub_808D600 +debug_sub_808D600: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._331 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r1, ._331 + 4 + ldr r0, ._331 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._332: + .align 2, 0 +._331: + .word gUnknown_Debug_083C11CC + .word gMenuCallback + .word debug_sub_808D650+1 + + thumb_func_end debug_sub_808D600 + + thumb_func_start debug_sub_808D650 +debug_sub_808D650: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._333 @cond_branch + mov r0, #0x0 + b ._336 +._333: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._335 @cond_branch + ldr r2, ._337 + ldr r0, ._337 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._336 +._338: + .align 2, 0 +._337: + .word gMenuCallback + .word gUnknown_Debug_083C11CC +._335: + bl CloseMenu + mov r0, #0x1 +._336: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808D650 + + thumb_func_start debug_sub_808D694 +debug_sub_808D694: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._339 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r0, ._339 + 4 + strb r4, [r0] + ldr r1, ._339 + 8 + ldr r0, ._339 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._340: + .align 2, 0 +._339: + .word gUnknown_Debug_083C1212 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D744+1 + + thumb_func_end debug_sub_808D694 + + thumb_func_start debug_sub_808D6EC +debug_sub_808D6EC: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._341 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._341 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._341 + 8 + ldr r0, ._341 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._342: + .align 2, 0 +._341: + .word gUnknown_Debug_083C1288 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D744+1 + + thumb_func_end debug_sub_808D6EC + + thumb_func_start debug_sub_808D744 +debug_sub_808D744: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._346 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808D790 + ldrb r0, [r5] + bl debug_sub_808D7E0 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._343 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._344 @cond_branch +._343: + mov r0, #0x0 + b ._345 +._347: + .align 2, 0 +._346: + .word gDebug_0300070F +._344: + bl CloseMenu + mov r0, #0x1 +._345: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808D744 + + thumb_func_start debug_sub_808D790 +debug_sub_808D790: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._351 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._350 @cond_branch + ldr r0, ._351 + 4 + lsl r1, r2, #0x3 + add r1, r1, r2 + add r1, r1, r3 + lsl r1, r1, #0x1 + add r1, r1, r0 + ldrh r4, [r1] + add r0, r4, #0 + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._349 @cond_branch + add r0, r4, #0 + bl FlagSet + b ._350 +._352: + .align 2, 0 +._351: + .word gMain + .word gUnknown_Debug_083C12D2 +._349: + add r0, r4, #0 + bl FlagClear +._350: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808D790 + + thumb_func_start debug_sub_808D7E0 +debug_sub_808D7E0: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._355 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._353 @cond_branch + ldr r0, ._355 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._354: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl FlagGet + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + neg r2, r0 + orr r2, r2, r0 + lsr r2, r2, #0x1f + mov r0, #0x1c + add r1, r4, #0 + bl debug_sub_808F2E0 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._354 @cond_branch +._353: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._356: + .align 2, 0 +._355: + .word gUnknown_Debug_083C12D0 + .word gUnknown_Debug_083C12D2 + + thumb_func_end debug_sub_808D7E0 + + thumb_func_start debug_sub_808D844 +debug_sub_808D844: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1c + mov r3, #0x3 + bl Menu_DrawStdWindowFrame + ldr r3, ._357 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1b + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x1 + bl InitMenu + ldr r1, ._357 + 4 + ldr r0, ._357 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._358: + .align 2, 0 +._357: + .word gUnknown_Debug_083C1A78 + .word gMenuCallback + .word debug_sub_808D894+1 + + thumb_func_end debug_sub_808D844 + + thumb_func_start debug_sub_808D894 +debug_sub_808D894: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r3, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r3, r0 + bne ._359 @cond_branch + mov r0, #0x0 + b ._362 +._359: + mov r0, #0x1 + neg r0, r0 + cmp r3, r0 + beq ._361 @cond_branch + ldr r2, ._363 + ldr r1, ._363 + 4 + lsl r0, r3, #0x3 + add r0, r0, r1 + ldr r0, [r0, #0x4] + str r0, [r2] + mov r0, #0x0 + b ._362 +._364: + .align 2, 0 +._363: + .word gMenuCallback + .word gUnknown_Debug_083C1A78 +._361: + bl CloseMenu + mov r0, #0x1 +._362: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808D894 + + thumb_func_start debug_sub_808D8D8 +debug_sub_808D8D8: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._365 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r0, ._365 + 4 + strb r4, [r0] + ldr r1, ._365 + 8 + ldr r0, ._365 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._366: + .align 2, 0 +._365: + .word gUnknown_Debug_083C1A9C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808D930+1 + + thumb_func_end debug_sub_808D8D8 + + thumb_func_start debug_sub_808D930 +debug_sub_808D930: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._370 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808D97C + ldrb r0, [r5] + bl debug_sub_808D9CC + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._367 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._368 @cond_branch +._367: + mov r0, #0x0 + b ._369 +._371: + .align 2, 0 +._370: + .word gDebug_0300070F +._368: + bl CloseMenu + mov r0, #0x1 +._369: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808D930 + + thumb_func_start debug_sub_808D97C +debug_sub_808D97C: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._375 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._374 @cond_branch + ldr r0, ._375 + 4 + lsl r1, r2, #0x3 + add r1, r1, r2 + add r1, r1, r3 + lsl r1, r1, #0x1 + add r1, r1, r0 + ldrh r4, [r1] + add r0, r4, #0 + bl FlagGet + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._373 @cond_branch + add r0, r4, #0 + bl FlagSet + b ._374 +._376: + .align 2, 0 +._375: + .word gMain + .word gUnknown_Debug_083C1AAE +._373: + add r0, r4, #0 + bl FlagClear +._374: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_sub_808D97C + + thumb_func_start debug_sub_808D9CC +debug_sub_808D9CC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._379 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._377 @cond_branch + ldr r0, ._379 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._378: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl FlagGet + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + neg r2, r0 + orr r2, r2, r0 + lsr r2, r2, #0x1f + mov r0, #0x1c + add r1, r4, #0 + bl debug_sub_808F2E0 + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._378 @cond_branch +._377: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._380: + .align 2, 0 +._379: + .word gUnknown_Debug_083C1AAC + .word gUnknown_Debug_083C1AAE + + thumb_func_end debug_sub_808D9CC + + thumb_func_start debug_sub_808DA30 +debug_sub_808DA30: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x3 + bl Menu_DrawStdWindowFrame + ldr r3, ._381 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x1 + bl InitMenu + ldr r1, ._381 + 4 + ldr r0, ._381 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._382: + .align 2, 0 +._381: + .word gUnknown_Debug_083C103A + .word gMenuCallback + .word debug_sub_808DA80+1 + + thumb_func_end debug_sub_808DA30 + + thumb_func_start debug_sub_808DA80 +debug_sub_808DA80: + push {r4, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + bl debug_sub_808DAD4 + bl debug_sub_808DABC + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._383 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._384 @cond_branch +._383: + mov r0, #0x0 + b ._385 +._384: + bl CloseMenu + mov r0, #0x1 +._385: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808DA80 + + thumb_func_start debug_sub_808DABC +debug_sub_808DABC: + push {lr} + ldr r0, ._386 + ldrh r2, [r0] + mov r0, #0x18 + mov r1, #0x1 + bl debug_sub_808F31C + pop {r0} + bx r0 +._387: + .align 2, 0 +._386: + .word gSpecialVar_Result + + thumb_func_end debug_sub_808DABC + + thumb_func_start debug_sub_808DAD4 +debug_sub_808DAD4: + push {lr} + ldr r0, ._390 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._388 @cond_branch + mov r2, #0x1 + b ._389 +._391: + .align 2, 0 +._390: + .word gMain +._388: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._392 @cond_branch + ldr r2, ._393 +._389: + ldr r1, ._393 + 4 + ldrh r0, [r1] + add r0, r2, r0 + strh r0, [r1] +._392: + pop {r0} + bx r0 +._394: + .align 2, 0 +._393: + .word 0xffff + .word gSpecialVar_Result + + thumb_func_end debug_sub_808DAD4 + + thumb_func_start debug_sub_808DB0C +debug_sub_808DB0C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._395 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._395 + 4 + ldr r0, ._395 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._396: + .align 2, 0 +._395: + .word gUnknown_Debug_083C3D08 + .word gMenuCallback + .word debug_sub_808DB5C+1 + + thumb_func_end debug_sub_808DB0C + + thumb_func_start debug_sub_808DB5C +debug_sub_808DB5C: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._397 @cond_branch + mov r0, #0x0 + b ._400 +._397: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._399 @cond_branch + ldr r2, ._401 + ldr r0, ._401 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._400 +._402: + .align 2, 0 +._401: + .word gMenuCallback + .word gUnknown_Debug_083C3D08 +._399: + bl CloseMenu + mov r0, #0x1 +._400: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808DB5C + + thumb_func_start debug_sub_808DBA0 +debug_sub_808DBA0: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x11 + bl Menu_DrawStdWindowFrame + ldr r3, ._403 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x8 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x8 + bl InitMenu + ldr r0, ._403 + 4 + strb r4, [r0] + ldr r1, ._403 + 8 + ldr r0, ._403 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._404: + .align 2, 0 +._403: + .word gUnknown_Debug_083C432C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DBA0 + + thumb_func_start debug_sub_808DBF8 +debug_sub_808DBF8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._405 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._405 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._405 + 8 + ldr r0, ._405 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._406: + .align 2, 0 +._405: + .word gUnknown_Debug_083C436C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DBF8 + + thumb_func_start debug_sub_808DC50 +debug_sub_808DC50: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._407 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._407 + 4 + mov r0, #0x2 + strb r0, [r1] + ldr r1, ._407 + 8 + ldr r0, ._407 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._408: + .align 2, 0 +._407: + .word gUnknown_Debug_083C43B4 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DC50 + + thumb_func_start debug_sub_808DCA8 +debug_sub_808DCA8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._409 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._409 + 4 + mov r0, #0x3 + strb r0, [r1] + ldr r1, ._409 + 8 + ldr r0, ._409 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._410: + .align 2, 0 +._409: + .word gUnknown_Debug_083C43FC + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DCA8 + + thumb_func_start debug_sub_808DD00 +debug_sub_808DD00: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._411 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._411 + 4 + mov r0, #0x4 + strb r0, [r1] + ldr r1, ._411 + 8 + ldr r0, ._411 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._412: + .align 2, 0 +._411: + .word gUnknown_Debug_083C4444 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DD00 + + thumb_func_start debug_sub_808DD58 +debug_sub_808DD58: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._413 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._413 + 4 + mov r0, #0x5 + strb r0, [r1] + ldr r1, ._413 + 8 + ldr r0, ._413 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._414: + .align 2, 0 +._413: + .word gUnknown_Debug_083C448C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DD58 + + thumb_func_start debug_sub_808DDB0 +debug_sub_808DDB0: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._415 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r1, ._415 + 4 + mov r0, #0x6 + strb r0, [r1] + ldr r1, ._415 + 8 + ldr r0, ._415 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._416: + .align 2, 0 +._415: + .word gUnknown_Debug_83C44C4 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DDB0 + + thumb_func_start debug_sub_808DE08 +debug_sub_808DE08: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._417 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._417 + 4 + mov r0, #0x7 + strb r0, [r1] + ldr r1, ._417 + 8 + ldr r0, ._417 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._418: + .align 2, 0 +._417: + .word gUnknown_Debug_83C44EC + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DE08 + + thumb_func_start debug_sub_808DE60 +debug_sub_808DE60: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._419 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._419 + 4 + mov r0, #0x8 + strb r0, [r1] + ldr r1, ._419 + 8 + ldr r0, ._419 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._420: + .align 2, 0 +._419: + .word gUnknown_Debug_083C4534 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808DEB8+1 + + thumb_func_end debug_sub_808DE60 + + thumb_func_start debug_sub_808DEB8 +debug_sub_808DEB8: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._424 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808DF64 + ldrb r0, [r5] + bl debug_sub_808DF04 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._421 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._422 @cond_branch +._421: + mov r0, #0x0 + b ._423 +._425: + .align 2, 0 +._424: + .word gDebug_0300070F +._422: + bl CloseMenu + mov r0, #0x1 +._423: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808DEB8 + + thumb_func_start debug_sub_808DF04 +debug_sub_808DF04: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._428 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._426 @cond_branch + ldr r0, ._428 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._427: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl VarGet + add r2, r0, #0 + lsl r2, r2, #0x10 + lsr r2, r2, #0x10 + mov r0, #0x18 + add r1, r4, #0 + bl debug_sub_808F31C + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._427 @cond_branch +._426: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._429: + .align 2, 0 +._428: + .word gUnknown_Debug_083C457C + .word gUnknown_Debug_083C4586 + + thumb_func_end debug_sub_808DF04 + + thumb_func_start debug_sub_808DF64 +debug_sub_808DF64: + push {r4, r5, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._432 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._430 @cond_branch + mov r5, #0x1 + b ._431 +._433: + .align 2, 0 +._432: + .word gMain +._430: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._434 @cond_branch + ldr r5, ._435 +._431: + ldr r1, ._435 + 4 + lsl r0, r2, #0x3 + add r0, r0, r2 + add r0, r0, r3 + lsl r0, r0, #0x1 + add r0, r0, r1 + ldrh r4, [r0] + add r0, r4, #0 + bl VarGet + add r1, r0, #0 + add r1, r5, r1 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r4, #0 + bl VarSet +._434: + pop {r4, r5} + pop {r0} + bx r0 +._436: + .align 2, 0 +._435: + .word 0xffff + .word gUnknown_Debug_083C4586 + + thumb_func_end debug_sub_808DF64 + + thumb_func_start debug_sub_808DFC0 +debug_sub_808DFC0: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._437 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r1, ._437 + 4 + ldr r0, ._437 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._438: + .align 2, 0 +._437: + .word gUnknown_Debug_083C377C + .word gMenuCallback + .word debug_sub_808E010+1 + + thumb_func_end debug_sub_808DFC0 + + thumb_func_start debug_sub_808E010 +debug_sub_808E010: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._439 @cond_branch + mov r0, #0x0 + b ._442 +._439: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._441 @cond_branch + ldr r2, ._443 + ldr r0, ._443 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._442 +._444: + .align 2, 0 +._443: + .word gMenuCallback + .word gUnknown_Debug_083C377C +._441: + bl CloseMenu + mov r0, #0x1 +._442: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808E010 + + thumb_func_start debug_sub_808E054 +debug_sub_808E054: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._445 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r0, ._445 + 4 + strb r4, [r0] + ldr r1, ._445 + 8 + ldr r0, ._445 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._446: + .align 2, 0 +._445: + .word gUnknown_Debug_083C3AA0 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E264+1 + + thumb_func_end debug_sub_808E054 + + thumb_func_start debug_sub_808E0AC +debug_sub_808E0AC: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r3, ._447 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x5 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x5 + bl InitMenu + ldr r1, ._447 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._447 + 8 + ldr r0, ._447 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._448: + .align 2, 0 +._447: + .word gUnknown_Debug_83C3AE0 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E264+1 + + thumb_func_end debug_sub_808E0AC + + thumb_func_start debug_sub_808E104 +debug_sub_808E104: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._449 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._449 + 4 + mov r0, #0x2 + strb r0, [r1] + ldr r1, ._449 + 8 + ldr r0, ._449 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._450: + .align 2, 0 +._449: + .word gUnknown_Debug_83C3B28 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E264+1 + + thumb_func_end debug_sub_808E104 + + thumb_func_start debug_sub_808E15C +debug_sub_808E15C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._451 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r1, ._451 + 4 + mov r0, #0x3 + strb r0, [r1] + ldr r1, ._451 + 8 + ldr r0, ._451 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._452: + .align 2, 0 +._451: + .word gUnknown_Debug_83C3B70 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E264+1 + + thumb_func_end debug_sub_808E15C + + thumb_func_start debug_sub_808E1B4 +debug_sub_808E1B4: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._453 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._453 + 4 + mov r0, #0x4 + strb r0, [r1] + ldr r1, ._453 + 8 + ldr r0, ._453 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._454: + .align 2, 0 +._453: + .word gUnknown_Debug_83C3BB8 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E264+1 + + thumb_func_end debug_sub_808E1B4 + + thumb_func_start debug_sub_808E20C +debug_sub_808E20C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._455 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r1, ._455 + 4 + mov r0, #0x5 + strb r0, [r1] + ldr r1, ._455 + 8 + ldr r0, ._455 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._456: + .align 2, 0 +._455: + .word gUnknown_Debug_83C3C00 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E264+1 + + thumb_func_end debug_sub_808E20C + + thumb_func_start debug_sub_808E264 +debug_sub_808E264: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._460 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808E310 + ldrb r0, [r5] + bl debug_sub_808E2B0 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._457 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._458 @cond_branch +._457: + mov r0, #0x0 + b ._459 +._461: + .align 2, 0 +._460: + .word gDebug_0300070F +._458: + bl CloseMenu + mov r0, #0x1 +._459: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808E264 + + thumb_func_start debug_sub_808E2B0 +debug_sub_808E2B0: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._464 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._462 @cond_branch + ldr r0, ._464 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._463: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl VarGet + add r2, r0, #0 + lsl r2, r2, #0x10 + lsr r2, r2, #0x10 + mov r0, #0x18 + add r1, r4, #0 + bl debug_sub_808F31C + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._463 @cond_branch +._462: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._465: + .align 2, 0 +._464: + .word gUnknown_Debug_083C3C48 + .word gUnknown_Debug_83C3C4E + + thumb_func_end debug_sub_808E2B0 + + thumb_func_start debug_sub_808E310 +debug_sub_808E310: + push {r4, r5, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._468 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._466 @cond_branch + mov r5, #0x1 + b ._467 +._469: + .align 2, 0 +._468: + .word gMain +._466: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._470 @cond_branch + ldr r5, ._471 +._467: + ldr r1, ._471 + 4 + lsl r0, r2, #0x3 + add r0, r0, r2 + add r0, r0, r3 + lsl r0, r0, #0x1 + add r0, r0, r1 + ldrh r4, [r0] + add r0, r4, #0 + bl VarGet + add r1, r0, #0 + add r1, r5, r1 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r4, #0 + bl VarSet +._470: + pop {r4, r5} + pop {r0} + bx r0 +._472: + .align 2, 0 +._471: + .word 0xffff + .word gUnknown_Debug_83C3C4E + + thumb_func_end debug_sub_808E310 + + thumb_func_start debug_sub_808E36C +debug_sub_808E36C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r3, ._473 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x5 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x5 + bl InitMenu + ldr r1, ._473 + 4 + ldr r0, ._473 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._474: + .align 2, 0 +._473: + .word gUnknown_Debug_083C32AC + .word gMenuCallback + .word debug_sub_808E3BC+1 + + thumb_func_end debug_sub_808E36C + + thumb_func_start debug_sub_808E3BC +debug_sub_808E3BC: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._475 @cond_branch + mov r0, #0x0 + b ._478 +._475: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._477 @cond_branch + ldr r2, ._479 + ldr r0, ._479 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._478 +._480: + .align 2, 0 +._479: + .word gMenuCallback + .word gUnknown_Debug_083C32AC +._477: + bl CloseMenu + mov r0, #0x1 +._478: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808E3BC + + thumb_func_start debug_sub_808E400 +debug_sub_808E400: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + ldr r3, ._481 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x3 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x3 + bl InitMenu + ldr r0, ._481 + 4 + strb r4, [r0] + ldr r1, ._481 + 8 + ldr r0, ._481 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._482: + .align 2, 0 +._481: + .word gUnknown_Debug_083C347C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E5B8+1 + + thumb_func_end debug_sub_808E400 + + thumb_func_start debug_sub_808E458 +debug_sub_808E458: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._483 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r1, ._483 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._483 + 8 + ldr r0, ._483 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._484: + .align 2, 0 +._483: + .word gUnknown_Debug_083C3494 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E5B8+1 + + thumb_func_end debug_sub_808E458 + + thumb_func_start debug_sub_808E4B0 +debug_sub_808E4B0: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r3, ._485 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x6 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x6 + bl InitMenu + ldr r1, ._485 + 4 + mov r0, #0x2 + strb r0, [r1] + ldr r1, ._485 + 8 + ldr r0, ._485 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._486: + .align 2, 0 +._485: + .word gUnknown_Debug_083C34A4 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E5B8+1 + + thumb_func_end debug_sub_808E4B0 + + thumb_func_start debug_sub_808E508 +debug_sub_808E508: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._487 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r1, ._487 + 4 + mov r0, #0x3 + strb r0, [r1] + ldr r1, ._487 + 8 + ldr r0, ._487 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._488: + .align 2, 0 +._487: + .word gUnknown_Debug_083C34D4 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E5B8+1 + + thumb_func_end debug_sub_808E508 + + thumb_func_start debug_sub_808E560 +debug_sub_808E560: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xb + bl Menu_DrawStdWindowFrame + ldr r3, ._489 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x5 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x5 + bl InitMenu + ldr r1, ._489 + 4 + mov r0, #0x4 + strb r0, [r1] + ldr r1, ._489 + 8 + ldr r0, ._489 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._490: + .align 2, 0 +._489: + .word gUnknown_Debug_083C351C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E5B8+1 + + thumb_func_end debug_sub_808E560 + + thumb_func_start debug_sub_808E5B8 +debug_sub_808E5B8: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._494 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808E604 + ldrb r0, [r5] + bl debug_sub_808E660 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._491 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._492 @cond_branch +._491: + mov r0, #0x0 + b ._493 +._495: + .align 2, 0 +._494: + .word gDebug_0300070F +._492: + bl CloseMenu + mov r0, #0x1 +._493: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808E5B8 + + thumb_func_start debug_sub_808E604 +debug_sub_808E604: + push {r4, r5, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._498 + ldrh r1, [r0, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._496 @cond_branch + mov r5, #0x1 + b ._497 +._499: + .align 2, 0 +._498: + .word gMain +._496: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._500 @cond_branch + ldr r5, ._501 +._497: + ldr r1, ._501 + 4 + lsl r0, r2, #0x3 + add r0, r0, r2 + add r0, r0, r3 + lsl r0, r0, #0x1 + add r0, r0, r1 + ldrh r4, [r0] + add r0, r4, #0 + bl VarGet + add r1, r0, #0 + add r1, r5, r1 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r4, #0 + bl VarSet +._500: + pop {r4, r5} + pop {r0} + bx r0 +._502: + .align 2, 0 +._501: + .word 0xffff + .word gUnknown_Debug_083C354A + + thumb_func_end debug_sub_808E604 + + thumb_func_start debug_sub_808E660 +debug_sub_808E660: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._505 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._503 @cond_branch + ldr r0, ._505 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._504: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl VarGet + add r2, r0, #0 + lsl r2, r2, #0x10 + lsr r2, r2, #0x10 + mov r0, #0x18 + add r1, r4, #0 + bl debug_sub_808F31C + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._504 @cond_branch +._503: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._506: + .align 2, 0 +._505: + .word gUnknown_Debug_083C3544 + .word gUnknown_Debug_083C354A + + thumb_func_end debug_sub_808E660 + + thumb_func_start debug_sub_808E6C0 +debug_sub_808E6C0: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._507 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r1, ._507 + 4 + ldr r0, ._507 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._508: + .align 2, 0 +._507: + .word gUnknown_Debug_083C4644 + .word gMenuCallback + .word debug_sub_808E710+1 + + thumb_func_end debug_sub_808E6C0 + + thumb_func_start debug_sub_808E710 +debug_sub_808E710: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._509 @cond_branch + mov r0, #0x0 + b ._512 +._509: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._511 @cond_branch + ldr r2, ._513 + ldr r0, ._513 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._512 +._514: + .align 2, 0 +._513: + .word gMenuCallback + .word gUnknown_Debug_083C4644 +._511: + bl CloseMenu + mov r0, #0x1 +._512: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808E710 + + thumb_func_start debug_sub_808E754 +debug_sub_808E754: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._515 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r0, ._515 + 4 + strb r4, [r0] + ldr r1, ._515 + 8 + ldr r0, ._515 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._516: + .align 2, 0 +._515: + .word gUnknown_Debug_083C470C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E804+1 + + thumb_func_end debug_sub_808E754 + + thumb_func_start debug_sub_808E7AC +debug_sub_808E7AC: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._517 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._517 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._517 + 8 + ldr r0, ._517 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._518: + .align 2, 0 +._517: + .word gUnknown_Debug_083C4754C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808E804+1 + + thumb_func_end debug_sub_808E7AC + + thumb_func_start debug_sub_808E804 +debug_sub_808E804: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._522 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808E850 + ldrb r0, [r5] + bl debug_sub_808E8AC + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._519 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._520 @cond_branch +._519: + mov r0, #0x0 + b ._521 +._523: + .align 2, 0 +._522: + .word gDebug_0300070F +._520: + bl CloseMenu + mov r0, #0x1 +._521: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808E804 + + thumb_func_start debug_sub_808E850 +debug_sub_808E850: + push {r4, r5, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._526 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._524 @cond_branch + mov r5, #0x1 + b ._525 +._527: + .align 2, 0 +._526: + .word gMain +._524: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._528 @cond_branch + ldr r5, ._529 +._525: + ldr r1, ._529 + 4 + lsl r0, r2, #0x3 + add r0, r0, r2 + add r0, r0, r3 + lsl r0, r0, #0x1 + add r0, r0, r1 + ldrh r4, [r0] + add r0, r4, #0 + bl VarGet + add r1, r0, #0 + add r1, r5, r1 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r4, #0 + bl VarSet +._528: + pop {r4, r5} + pop {r0} + bx r0 +._530: + .align 2, 0 +._529: + .word 0xffff + .word gUnknown_Debug_083C478E + + thumb_func_end debug_sub_808E850 + + thumb_func_start debug_sub_808E8AC +debug_sub_808E8AC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._533 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._531 @cond_branch + ldr r0, ._533 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._532: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl VarGet + add r2, r0, #0 + lsl r2, r2, #0x10 + lsr r2, r2, #0x10 + mov r0, #0x18 + add r1, r4, #0 + bl debug_sub_808F31C + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._532 @cond_branch +._531: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._534: + .align 2, 0 +._533: + .word gUnknown_Debug_083C478C + .word gUnknown_Debug_083C478E + + thumb_func_end debug_sub_808E8AC + + thumb_func_start debug_sub_808E90C +debug_sub_808E90C: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x18 + mov r3, #0x5 + bl Menu_DrawStdWindowFrame + ldr r3, ._535 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x2 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x17 + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x2 + bl InitMenu + ldr r1, ._535 + 4 + ldr r0, ._535 + 8 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._536: + .align 2, 0 +._535: + .word gUnknown_Debug_083C35C4 + .word gMenuCallback + .word debug_sub_808E95C+1 + + thumb_func_end debug_sub_808E90C + + thumb_func_start debug_sub_808E95C +debug_sub_808E95C: + push {lr} + bl Menu_ProcessInput + lsl r0, r0, #0x18 + asr r1, r0, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r1, r0 + bne ._537 @cond_branch + mov r0, #0x0 + b ._540 +._537: + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._539 @cond_branch + ldr r2, ._541 + ldr r0, ._541 + 4 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r0, [r1] + str r0, [r2] + mov r0, #0x0 + b ._540 +._542: + .align 2, 0 +._541: + .word gMenuCallback + .word gUnknown_Debug_083C35C4 +._539: + bl CloseMenu + mov r0, #0x1 +._540: + pop {r1} + bx r1 + + thumb_func_end debug_sub_808E95C + + thumb_func_start debug_sub_808E9A0 +debug_sub_808E9A0: + push {r4, lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r3, ._543 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x9 + bl Menu_PrintItems + mov r4, #0x0 + str r4, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x9 + bl InitMenu + ldr r0, ._543 + 4 + strb r4, [r0] + ldr r1, ._543 + 8 + ldr r0, ._543 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r4} + pop {r1} + bx r1 +._544: + .align 2, 0 +._543: + .word gUnknown_Debug_083C369C + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808EA50+1 + + thumb_func_end debug_sub_808E9A0 + + thumb_func_start debug_sub_808E9F8 +debug_sub_808E9F8: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r3, ._545 + mov r0, #0x2 + mov r1, #0x1 + mov r2, #0x7 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0x1c + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0x7 + bl InitMenu + ldr r1, ._545 + 4 + mov r0, #0x1 + strb r0, [r1] + ldr r1, ._545 + 8 + ldr r0, ._545 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._546: + .align 2, 0 +._545: + .word gUnknown_Debug_083C36E4 + .word gDebug_0300070F + .word gMenuCallback + .word debug_sub_808EA50+1 + + thumb_func_end debug_sub_808E9F8 + + thumb_func_start debug_sub_808EA50 +debug_sub_808EA50: + push {r4, r5, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + add r1, r0, #0 + ldr r5, ._550 + ldrb r0, [r5] + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + bl debug_sub_808EAFC + ldrb r0, [r5] + bl debug_sub_808EA9C + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._547 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._548 @cond_branch +._547: + mov r0, #0x0 + b ._549 +._551: + .align 2, 0 +._550: + .word gDebug_0300070F +._548: + bl CloseMenu + mov r0, #0x1 +._549: + pop {r4, r5} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808EA50 + + thumb_func_start debug_sub_808EA9C +debug_sub_808EA9C: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + mov r5, #0x0 + ldr r0, ._554 + add r0, r1, r0 + ldrb r2, [r0] + cmp r5, r2 + bcs ._552 @cond_branch + ldr r0, ._554 + 4 + mov r8, r0 + lsl r0, r1, #0x3 + add r0, r0, r1 + lsl r7, r0, #0x1 + add r6, r2, #0 +._553: + lsl r0, r5, #0x1 + add r4, r0, #1 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + add r0, r0, r7 + add r0, r0, r8 + ldrh r0, [r0] + bl VarGet + add r2, r0, #0 + lsl r2, r2, #0x10 + lsr r2, r2, #0x10 + mov r0, #0x18 + add r1, r4, #0 + bl debug_sub_808F31C + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, r6 + bcc ._553 @cond_branch +._552: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._555: + .align 2, 0 +._554: + .word gUnknown_Debug_083C371C + .word gUnknown_Debug_083C371E + + thumb_func_end debug_sub_808EA9C + + thumb_func_start debug_sub_808EAFC +debug_sub_808EAFC: + push {r4, r5, lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + ldr r0, ._558 + ldrh r1, [r0, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._556 @cond_branch + mov r5, #0x1 + b ._557 +._559: + .align 2, 0 +._558: + .word gMain +._556: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._560 @cond_branch + ldr r5, ._561 +._557: + ldr r1, ._561 + 4 + lsl r0, r2, #0x3 + add r0, r0, r2 + add r0, r0, r3 + lsl r0, r0, #0x1 + add r0, r0, r1 + ldrh r4, [r0] + add r0, r4, #0 + bl VarGet + add r1, r0, #0 + add r1, r5, r1 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r4, #0 + bl VarSet +._560: + pop {r4, r5} + pop {r0} + bx r0 +._562: + .align 2, 0 +._561: + .word 0xffff + .word gUnknown_Debug_083C371E + + thumb_func_end debug_sub_808EAFC + + thumb_func_start debug_sub_808EB58 +debug_sub_808EB58: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xc + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r0, ._563 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r3, ._563 + 4 + mov r0, #0x2 + mov r1, #0x3 + mov r2, #0x8 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0xb + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x8 + bl InitMenu + ldr r1, ._563 + 8 + ldr r0, ._563 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._564: + .align 2, 0 +._563: + .word gUnknown_Debug_083C47B2 + .word gUnknown_Debug_083C47F0 + .word gMenuCallback + .word debug_sub_808EC10+1 + + thumb_func_end debug_sub_808EB58 + + thumb_func_start debug_sub_808EBB4 +debug_sub_808EBB4: + push {lr} + add sp, sp, #0xfffffff8 + bl Menu_EraseScreen + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xd + mov r3, #0xd + bl Menu_DrawStdWindowFrame + ldr r0, ._565 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r3, ._565 + 4 + mov r0, #0x2 + mov r1, #0x3 + mov r2, #0x5 + bl Menu_PrintItems + mov r0, #0x0 + str r0, [sp] + mov r0, #0xc + str r0, [sp, #0x4] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x5 + bl InitMenu + ldr r1, ._565 + 8 + ldr r0, ._565 + 12 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x8 + pop {r1} + bx r1 +._566: + .align 2, 0 +._565: + .word gUnknown_Debug_083C4830 + .word gUnknown_Debug_083C4888 + .word gMenuCallback + .word debug_sub_808EC5C+1 + + thumb_func_end debug_sub_808EBB4 + + thumb_func_start debug_sub_808EC10 +debug_sub_808EC10: + push {r4, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._568 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._568 @cond_branch + ldr r1, ._570 + lsl r0, r2, #0x18 + asr r0, r0, #0x18 + ldr r2, ._570 + 4 + add r1, r1, r2 + strh r0, [r1] + bl CloseMenu + mov r0, #0x1 + b ._569 +._571: + .align 2, 0 +._570: + .word gSaveBlock1 + .word 0x13c8 +._568: + mov r0, #0x0 +._569: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808EC10 + + thumb_func_start debug_sub_808EC5C +debug_sub_808EC5C: + push {r4, lr} + bl Menu_ProcessInput + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl Menu_GetCursorPos + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + lsl r4, r4, #0x18 + asr r4, r4, #0x18 + mov r0, #0x2 + neg r0, r0 + cmp r4, r0 + beq ._573 @cond_branch + mov r0, #0x1 + neg r0, r0 + cmp r4, r0 + beq ._573 @cond_branch + ldr r0, ._575 + lsl r1, r1, #0x18 + asr r1, r1, #0x8 + lsr r1, r1, #0x10 + bl VarSet + bl CloseMenu + mov r0, #0x1 + b ._574 +._576: + .align 2, 0 +._575: + .word 0x40a7 +._573: + mov r0, #0x0 +._574: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_sub_808EC5C + + thumb_func_start debug_sub_808ECA4 +debug_sub_808ECA4: + push {lr} + add sp, sp, #0xfffffffc + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r1, ._577 + ldr r0, ._577 + 4 + str r0, [r1] + mov r0, #0x0 + add sp, sp, #0x4 + pop {r1} + bx r1 +._578: + .align 2, 0 +._577: + .word gMenuCallback + .word debug_sub_808ECD0+1 + + thumb_func_end debug_sub_808ECA4 + + thumb_func_start debug_sub_808ECD0 +debug_sub_808ECD0: + push {lr} + bl UpdatePaletteFade + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._579 @cond_branch + mov r0, #0x0 + b ._580 +._579: + bl CloseMenu + mov r0, #0x2 + bl debug_sub_808F168 + ldr r0, ._581 + bl SetMainCallback2 + ldr r1, ._581 + 4 + ldr r0, ._581 + 8 + str r0, [r1, #0x8] + mov r0, #0x1 +._580: + pop {r1} + bx r1 +._582: + .align 2, 0 +._581: + .word CB2_ContestPainting+1 + .word gMain + .word debug_sub_808B868+1 + + thumb_func_end debug_sub_808ECD0 + + thumb_func_start TomomichiDebugMenu_Config +TomomichiDebugMenu_Config: + mov r0, #0x0 + bx lr + + thumb_func_end TomomichiDebugMenu_Config + + thumb_func_start debug_sub_808ED0C +debug_sub_808ED0C: + push {lr} + ldr r2, ._590 + ldrh r1, [r2, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._584 @cond_branch + ldr r1, ._590 + 4 + ldrh r0, [r1] + cmp r0, #0x1 + beq ._584 @cond_branch + sub r0, r0, #0x1 + strh r0, [r1] +._584: + ldrh r1, [r2, #0x30] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._586 @cond_branch + ldr r3, ._590 + 4 + ldrh r1, [r3] + ldr r0, ._590 + 8 + cmp r1, r0 + beq ._586 @cond_branch + add r0, r1, #1 + strh r0, [r3] +._586: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._587 @cond_branch + ldr r1, ._590 + 4 + ldrh r0, [r1] + cmp r0, #0xa + bls ._588 @cond_branch + sub r0, r0, #0xa + b ._589 +._591: + .align 2, 0 +._590: + .word gMain + .word gDebug_03000700 + .word 0x19b +._588: + mov r0, #0x1 +._589: + strh r0, [r1] +._587: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._592 @cond_branch + ldr r2, ._595 + ldrh r1, [r2] + ldr r0, ._595 + 4 + cmp r1, r0 + bhi ._593 @cond_branch + add r0, r1, #0 + add r0, r0, #0xa + b ._594 +._596: + .align 2, 0 +._595: + .word gDebug_03000700 + .word 0x191 +._593: + ldr r1, ._597 + add r0, r1, #0 +._594: + strh r0, [r2] +._592: + pop {r0} + bx r0 +._598: + .align 2, 0 +._597: + .word 0x19b + + thumb_func_end debug_sub_808ED0C + + thumb_func_start debug_sub_808ED9C +debug_sub_808ED9C: + push {lr} + ldr r2, ._606 + ldrh r1, [r2, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._600 @cond_branch + ldr r1, ._606 + 4 + ldr r0, [r1] + cmp r0, #0 + beq ._600 @cond_branch + sub r0, r0, #0x1 + str r0, [r1] +._600: + ldrh r1, [r2, #0x30] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._602 @cond_branch + ldr r3, ._606 + 4 + ldr r1, [r3] + mov r0, #0x1 + neg r0, r0 + cmp r1, r0 + beq ._602 @cond_branch + add r0, r1, #1 + str r0, [r3] +._602: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._603 @cond_branch + ldr r1, ._606 + 4 + ldr r0, [r1] + cmp r0, #0xf + bls ._604 @cond_branch + sub r0, r0, #0x10 + b ._605 +._607: + .align 2, 0 +._606: + .word gMain + .word gDebug_03000708 +._604: + mov r0, #0x0 +._605: + str r0, [r1] +._603: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._608 @cond_branch + ldr r3, ._611 + ldr r1, [r3] + mov r0, #0x11 + neg r0, r0 + cmp r1, r0 + bhi ._609 @cond_branch + add r0, r1, #0 + add r0, r0, #0x10 + b ._610 +._612: + .align 2, 0 +._611: + .word gDebug_03000708 +._609: + mov r0, #0x1 + neg r0, r0 +._610: + str r0, [r3] +._608: + ldrh r2, [r2, #0x2e] + mov r1, #0xc0 + lsl r1, r1, #0x2 + add r0, r1, #0 + and r0, r0, r2 + cmp r0, r1 + bne ._613 @cond_branch + ldr r1, ._614 + mov r0, #0x1 + neg r0, r0 + str r0, [r1] +._613: + pop {r0} + bx r0 +._615: + .align 2, 0 +._614: + .word gDebug_03000708 + + thumb_func_end debug_sub_808ED9C + + thumb_func_start debug_sub_808EE3C +debug_sub_808EE3C: + push {lr} + ldr r2, ._622 + ldrh r1, [r2, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._617 @cond_branch + ldr r1, ._622 + 4 + ldrb r0, [r1] + cmp r0, #0x1 + beq ._617 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] +._617: + ldrh r1, [r2, #0x30] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._619 @cond_branch + ldr r1, ._622 + 4 + ldrb r0, [r1] + cmp r0, #0x5 + beq ._619 @cond_branch + add r0, r0, #0x1 + strb r0, [r1] +._619: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._620 @cond_branch + ldr r1, ._622 + 4 + mov r0, #0x1 + strb r0, [r1] +._620: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._621 @cond_branch + ldr r1, ._622 + 4 + mov r0, #0x5 + strb r0, [r1] +._621: + pop {r0} + bx r0 +._623: + .align 2, 0 +._622: + .word gMain + .word gDebug_0300070C + + thumb_func_end debug_sub_808EE3C + + thumb_func_start debug_sub_808EE9C +debug_sub_808EE9C: + push {lr} + ldr r2, ._631 + ldrh r1, [r2, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._625 @cond_branch + ldr r1, ._631 + 4 + ldrb r0, [r1] + cmp r0, #0x1 + beq ._625 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] +._625: + ldrh r1, [r2, #0x30] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._627 @cond_branch + ldr r1, ._631 + 4 + ldrb r0, [r1] + cmp r0, #0xf + beq ._627 @cond_branch + add r0, r0, #0x1 + strb r0, [r1] +._627: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._628 @cond_branch + ldr r1, ._631 + 4 + ldrb r0, [r1] + cmp r0, #0xa + bls ._629 @cond_branch + sub r0, r0, #0xa + b ._630 +._632: + .align 2, 0 +._631: + .word gMain + .word gDebug_0300070D +._629: + mov r0, #0x0 +._630: + strb r0, [r1] +._628: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._633 @cond_branch + ldr r1, ._636 + ldrb r0, [r1] + cmp r0, #0x5 + bhi ._634 @cond_branch + add r0, r0, #0xa + b ._635 +._637: + .align 2, 0 +._636: + .word gDebug_0300070D +._634: + mov r0, #0xf +._635: + strb r0, [r1] +._633: + pop {r0} + bx r0 + + thumb_func_end debug_sub_808EE9C + + thumb_func_start debug_sub_808EF14 +debug_sub_808EF14: + push {lr} + ldr r2, ._645 + ldrh r1, [r2, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._639 @cond_branch + ldr r1, ._645 + 4 + ldrb r0, [r1] + cmp r0, #0x1 + beq ._639 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] +._639: + ldrh r1, [r2, #0x30] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._641 @cond_branch + ldr r1, ._645 + 4 + ldrb r0, [r1] + cmp r0, #0xf + beq ._641 @cond_branch + add r0, r0, #0x1 + strb r0, [r1] +._641: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._642 @cond_branch + ldr r1, ._645 + 4 + ldrb r0, [r1] + cmp r0, #0xa + bls ._643 @cond_branch + sub r0, r0, #0xa + b ._644 +._646: + .align 2, 0 +._645: + .word gMain + .word gDebug_0300070E +._643: + mov r0, #0x0 +._644: + strb r0, [r1] +._642: + ldrh r1, [r2, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._647 @cond_branch + ldr r1, ._650 + ldrb r0, [r1] + cmp r0, #0x5 + bhi ._648 @cond_branch + add r0, r0, #0xa + b ._649 +._651: + .align 2, 0 +._650: + .word gDebug_0300070E +._648: + mov r0, #0xf +._649: + strb r0, [r1] +._647: + pop {r0} + bx r0 + + thumb_func_end debug_sub_808EF14 + + thumb_func_start debug_sub_808EF8C +debug_sub_808EF8C: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + cmp r6, #0x2 + bgt ._653 @cond_branch + cmp r6, #0 + blt ._653 @cond_branch + mov r3, #0x0 + ldr r0, ._656 + mov r8, r0 + ldr r4, ._656 + 4 + mov r7, #0x7 + mov r5, #0xf +._658: + sub r0, r7, r3 + lsl r0, r0, #0x2 + mov r1, r8 + ldr r2, [r1] + LSR r2, r0 + and r2, r2, r5 + cmp r2, #0x9 + bhi ._654 @cond_branch + add r1, r3, r4 + add r0, r2, #0 + add r0, r0, #0xa1 + b ._655 +._657: + .align 2, 0 +._656: + .word gDebug_03000708 + .word gDebug_03000710 +._654: + add r1, r3, r4 + add r0, r2, #0 + sub r0, r0, #0x4f +._655: + strb r0, [r1] + add r0, r3, #1 + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 + cmp r3, #0x7 + bls ._658 @cond_branch + ldr r0, ._666 + mov r1, #0xff + strb r1, [r0, #0x8] + mov r1, #0xc + mov r2, #0x5 + bl Menu_PrintText +._653: + mov r3, #0x0 + ldr r7, ._666 + ldr r5, ._666 + 4 + ldr r2, ._666 + 8 + mov r8, r2 + add r4, r7, #0 + mov r2, #0x0 +._659: + add r1, r3, #1 + add r0, r1, r4 + strb r2, [r0] + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + cmp r3, #0x9 + bls ._659 @cond_branch + mov r3, #0x0 + ldrh r2, [r5] + mov r0, #0xb + add r1, r2, #0 + mul r1, r1, r0 + mov r2, r8 + add r0, r1, r2 + ldrb r0, [r0] + cmp r0, #0xff + beq ._661 @cond_branch + ldr r0, ._666 + mov ip, r0 + mov r5, r8 + add r4, r1, #0 +._662: + add r1, r3, #1 + mov r0, ip + add r2, r1, r0 + add r0, r3, r4 + add r0, r0, r5 + ldrb r0, [r0] + strb r0, [r2] + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + add r0, r3, r4 + add r0, r0, r5 + ldrb r0, [r0] + cmp r0, #0xff + beq ._661 @cond_branch + cmp r3, #0x9 + bls ._662 @cond_branch +._661: + mov r0, #0xb1 + strb r0, [r7] + mov r0, #0xb2 + strb r0, [r7, #0xb] + mov r0, #0xff + strb r0, [r7, #0xc] + cmp r6, #0x2 + bgt ._664 @cond_branch + cmp r6, #0 + blt ._664 @cond_branch + add r0, r7, #0 + mov r1, #0x8 + mov r2, #0x1 + bl Menu_PrintText + b ._665 +._667: + .align 2, 0 +._666: + .word gDebug_03000710 + .word gDebug_03000700 + .word gSpeciesNames +._664: + ldr r0, ._672 + mov r1, #0xc + mov r2, #0x1 + bl Menu_PrintText +._665: + ldr r5, ._672 + mov r0, #0xff + strb r0, [r5, #0x3] + ldr r4, ._672 + 4 + ldrh r0, [r4] + mov r1, #0x64 + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5] + ldrh r0, [r4] + mov r1, #0x64 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0xa + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x1] + ldrh r0, [r4] + mov r1, #0xa + bl __umodsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x2] + add r0, r5, #0 + mov r1, #0xc + mov r2, #0x3 + bl Menu_PrintText + cmp r6, #0x1 + beq ._668 @cond_branch + cmp r6, #0x1 + bgt ._669 @cond_branch + cmp r6, #0 + beq ._670 @cond_branch + b ._679 +._673: + .align 2, 0 +._672: + .word gDebug_03000710 + .word gDebug_03000700 +._669: + cmp r6, #0x2 + beq ._674 @cond_branch + b ._679 +._670: + ldr r4, ._677 + b ._676 +._678: + .align 2, 0 +._677: + .word gDebug_0300070C +._668: + ldr r4, ._680 +._676: + ldrb r0, [r4] + mov r1, #0x64 + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5] + ldrb r0, [r4] + mov r1, #0x64 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0xa + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x1] + ldrb r0, [r4] + mov r1, #0xa + bl __umodsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x2] + add r0, r5, #0 + mov r1, #0xc + mov r2, #0x7 + bl Menu_PrintText + b ._679 +._681: + .align 2, 0 +._680: + .word gDebug_0300070D +._674: + ldr r4, ._682 + ldrb r0, [r4] + mov r1, #0x64 + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5] + ldrb r0, [r4] + mov r1, #0x64 + bl __umodsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0xa + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x1] + ldrb r0, [r4] + mov r1, #0xa + bl __umodsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x2] + add r0, r5, #0 + mov r1, #0xc + mov r2, #0x7 + bl Menu_PrintText +._679: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._683: + .align 2, 0 +._682: + .word gDebug_0300070E + + thumb_func_end debug_sub_808EF8C + + thumb_func_start debug_sub_808F168 +debug_sub_808F168: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + ldr r4, ._686 + ldr r0, ._686 + 4 + ldrh r0, [r0] + strh r0, [r4, #0x8] + ldr r0, ._686 + 8 + ldr r0, [r0] + str r0, [r4, #0x4] + ldr r0, ._686 + 12 + ldr r0, [r0] + str r0, [r4] + cmp r1, #0x5 + bls ._684 @cond_branch + b ._707 +._684: + lsl r0, r1, #0x2 + ldr r1, ._686 + 16 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._687: + .align 2, 0 +._686: + .word +0x2015de0 + .word gDebug_03000700 + .word gDebug_03000704 + .word gDebug_03000708 + .word ._688 +._688: + .word ._689 + .word ._690 + .word ._691 + .word ._692 + .word ._693 + .word ._694 +._689: + ldr r0, ._696 + ldr r2, ._696 + 4 + add r1, r0, r2 + mov r2, #0x0 + strb r2, [r1] + ldr r1, ._696 + 8 + add r0, r0, r1 + strb r2, [r0] + ldr r0, ._696 + 12 + ldrb r0, [r0] + sub r0, r0, #0x1 + strb r0, [r4, #0xa] + add r0, r4, #0 + add r0, r0, #0x16 + ldr r1, ._696 + 16 + bl StringCopy + b ._704 +._697: + .align 2, 0 +._696: + .word +0x2000000 + .word 0x15ddf + .word 0x15dde + .word gDebug_0300070C + .word gUnknown_Debug_083C48BB +._690: + ldr r1, ._699 + ldr r0, ._699 + 4 + add r2, r1, r0 + mov r0, #0x0 + strb r0, [r2] + ldr r2, ._699 + 8 + add r1, r1, r2 + mov r0, #0x8 + strb r0, [r1] + ldr r0, ._699 + 12 + ldrb r0, [r0] + sub r0, r0, #0x1 + b ._698 +._700: + .align 2, 0 +._699: + .word +0x2000000 + .word 0x15ddf + .word 0x15dde + .word gDebug_0300070D +._691: + ldr r1, ._702 + ldr r0, ._702 + 4 + add r2, r1, r0 + mov r0, #0x1 + strb r0, [r2] + ldr r2, ._702 + 8 + add r1, r1, r2 + mov r0, #0x8 + strb r0, [r1] + ldr r0, ._702 + 12 + ldrb r0, [r0] + sub r0, r0, #0x1 + strb r0, [r4, #0xa] + b ._707 +._703: + .align 2, 0 +._702: + .word +0x2000000 + .word 0x15ddf + .word 0x15dde + .word gDebug_0300070E +._692: + ldr r1, ._705 + ldr r2, ._705 + 4 + add r0, r1, r2 + mov r2, #0x0 + strb r2, [r0] + ldr r0, ._705 + 8 + add r1, r1, r0 + mov r0, #0x8 + strb r0, [r1] + strb r2, [r4, #0xa] + b ._704 +._706: + .align 2, 0 +._705: + .word +0x2000000 + .word 0x15ddf + .word 0x15dde +._693: + ldr r1, ._708 + ldr r0, ._708 + 4 + add r2, r1, r0 + mov r0, #0x0 + strb r0, [r2] + ldr r2, ._708 + 8 + add r1, r1, r2 + mov r0, #0x8 + strb r0, [r1] + mov r0, #0x3 +._698: + strb r0, [r4, #0xa] +._704: + add r0, r4, #0 + add r0, r0, #0xb + ldr r1, ._708 + 12 + bl StringCopy + b ._707 +._709: + .align 2, 0 +._708: + .word +0x2000000 + .word 0x15ddf + .word 0x15dde + .word gUnknown_Debug_083C48B0 +._694: + ldr r1, ._710 + ldr r0, ._710 + 4 + add r2, r1, r0 + mov r0, #0x0 + strb r0, [r2] + ldr r2, ._710 + 8 + add r1, r1, r2 + mov r0, #0x8 + strb r0, [r1] + mov r0, #0x9 + strb r0, [r4, #0xa] + add r0, r4, #0 + add r0, r0, #0xb + ldr r1, ._710 + 12 + bl StringCopy +._707: + pop {r4} + pop {r0} + bx r0 +._711: + .align 2, 0 +._710: + .word +0x2000000 + .word 0x15ddf + .word 0x15dde + .word gUnknown_Debug_083C48B0 + + thumb_func_end debug_sub_808F168 + + thumb_func_start debug_sub_808F2E0 +debug_sub_808F2E0: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + lsl r1, r1, #0x18 + lsr r3, r1, #0x18 + lsl r2, r2, #0x18 + cmp r2, #0 + bne ._712 @cond_branch + ldr r1, ._714 + mov r0, #0xa1 + b ._713 +._715: + .align 2, 0 +._714: + .word gDebug_03000710 +._712: + ldr r1, ._716 + mov r0, #0xa2 +._713: + strb r0, [r1] + mov r0, #0xff + strb r0, [r1, #0x1] + add r0, r1, #0 + add r1, r4, #0 + add r2, r3, #0 + bl Menu_PrintText + pop {r4} + pop {r0} + bx r0 +._717: + .align 2, 0 +._716: + .word gDebug_03000710 + + thumb_func_end debug_sub_808F2E0 + + thumb_func_start debug_sub_808F31C +debug_sub_808F31C: + push {r4, r5, r6, lr} + mov r6, r9 + mov r5, r8 + push {r5, r6} + mov r8, r0 + mov r9, r1 + add r4, r2, #0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r8, r0 + mov r0, r9 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r9, r0 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + ldr r5, ._718 + ldr r6, ._718 + 4 + add r0, r4, #0 + add r1, r6, #0 + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5] + add r0, r4, #0 + add r1, r6, #0 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r6, #0xfa + lsl r6, r6, #0x2 + add r1, r6, #0 + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x1] + add r0, r4, #0 + add r1, r6, #0 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0x64 + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x2] + add r0, r4, #0 + mov r1, #0x64 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0xa + bl __udivsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x3] + add r0, r4, #0 + mov r1, #0xa + bl __umodsi3 + add r0, r0, #0xa1 + strb r0, [r5, #0x4] + mov r0, #0xff + strb r0, [r5, #0x5] + add r0, r5, #0 + mov r1, r8 + mov r2, r9 + bl Menu_PrintText + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6} + pop {r0} + bx r0 +._719: + .align 2, 0 +._718: + .word gDebug_03000710 + .word 0x2710 + + thumb_func_end debug_sub_808F31C + + thumb_func_start debug_nullsub_66 +debug_nullsub_66: + bx lr + + thumb_func_end debug_nullsub_66 + + .align 2, 0 + +.endif diff --git a/asm/unk_debug_menu_3.s b/asm/unk_debug_menu_3.s new file mode 100644 index 000000000..e1be20589 --- /dev/null +++ b/asm/unk_debug_menu_3.s @@ -0,0 +1,747 @@ +.if DEBUG + + .include "constants/gba_constants.inc" + .include "include/macros.inc" + + .text + + thumb_func_start debug_sub_813C404 +debug_sub_813C404: + push {r4, r5, r6, lr} + add r6, r0, #0 + ldr r5, ._1 + ldr r4, ._1 + 4 + sub r5, r5, r4 + add r1, r4, #0 + add r2, r5, #0 + bl memcpy + add r0, r6, #0 + add r1, r4, #0 + bl unref_sub_812620C + add r0, r5, #0 + pop {r4, r5, r6} + pop {r1} + bx r1 +._2: + .align 2, 0 +._1: + .word gUnknown_Debug_845DDB2 + .word gUnknown_Debug_845DAE1 + + thumb_func_end debug_sub_813C404 + + thumb_func_start debug_sub_813C430 +debug_sub_813C430: + push {r4, r5, r6, lr} + add r6, r0, #0 + ldr r5, ._3 + ldr r4, ._3 + 4 + sub r5, r5, r4 + add r1, r4, #0 + add r2, r5, #0 + bl memcpy + add r0, r6, #0 + add r1, r4, #0 + bl unref_sub_812620C + add r0, r5, #0 + pop {r4, r5, r6} + pop {r1} + bx r1 +._4: + .align 2, 0 +._3: + .word gUnknown_Debug_845E402 + .word gUnknown_Debug_845E3E0 + + thumb_func_end debug_sub_813C430 + + thumb_func_start debug_sub_813C45C +debug_sub_813C45C: + push {r4, r5, r6, lr} + add r6, r0, #0 + ldr r5, ._5 + ldr r4, ._5 + 4 + sub r5, r5, r4 + add r1, r4, #0 + add r2, r5, #0 + bl memcpy + add r0, r6, #0 + add r1, r4, #0 + bl unref_sub_812620C + add r0, r5, #0 + pop {r4, r5, r6} + pop {r1} + bx r1 +._6: + .align 2, 0 +._5: + .word gUnknown_Debug_845E443 + .word gUnknown_Debug_845E422 + + thumb_func_end debug_sub_813C45C + + thumb_func_start debug_sub_813C488 +debug_sub_813C488: + push {r4, r5, r6, lr} + add r6, r0, #0 + ldr r5, ._7 + ldr r4, ._7 + 4 + sub r5, r5, r4 + add r1, r4, #0 + add r2, r5, #0 + bl memcpy + add r0, r6, #0 + add r1, r4, #0 + bl unref_sub_812620C + add r0, r5, #0 + pop {r4, r5, r6} + pop {r1} + bx r1 +._8: + .align 2, 0 +._7: + .word gUnknown_Debug_845E422 + .word gUnknown_Debug_845E402 + + thumb_func_end debug_sub_813C488 + + thumb_func_start debug_sub_813C4B4 +debug_sub_813C4B4: + push {r4, lr} + ldr r4, ._9 + ldr r1, ._9 + 4 + sub r4, r4, r1 + add r2, r4, #0 + bl memcpy + add r0, r4, #0 + pop {r4} + pop {r1} + bx r1 +._10: + .align 2, 0 +._9: + .word gUnknown_Debug_845E619 + .word gUnknown_Debug_845E606 + + thumb_func_end debug_sub_813C4B4 + + thumb_func_start debug_sub_813C4D4 +debug_sub_813C4D4: + push {r4, r5, r6, lr} + add r6, r0, #0 + ldr r5, ._11 + ldr r4, ._11 + 4 + sub r5, r5, r4 + add r1, r4, #0 + add r2, r5, #0 + bl memcpy + add r0, r6, #0 + add r1, r4, #0 + bl unref_sub_81261B4 + add r0, r5, #0 + pop {r4, r5, r6} + pop {r1} + bx r1 +._12: + .align 2, 0 +._11: + .word gUnknown_Debug_845E712 + .word gUnknown_Debug_845E619 + + thumb_func_end debug_sub_813C4D4 + + thumb_func_start debug_sub_813C500 +debug_sub_813C500: + push {r4, r5, r6, lr} + add r6, r0, #0 + ldr r5, ._13 + ldr r4, ._13 + 4 + sub r5, r5, r4 + add r1, r4, #0 + add r2, r5, #0 + bl memcpy + add r0, r6, #0 + add r1, r4, #0 + bl unref_sub_812620C + add r0, r5, #0 + pop {r4, r5, r6} + pop {r1} + bx r1 +._14: + .align 2, 0 +._13: + .word gUnknown_Debug_845E797 + .word gUnknown_Debug_845E712 + + thumb_func_end debug_sub_813C500 + + thumb_func_start debug_sub_813C52C +debug_sub_813C52C: + push {r4, r5, r6, lr} + mov r6, r9 + mov r5, r8 + push {r5, r6} + mov r8, r0 + lsl r5, r1, #0x10 + lsr r0, r5, #0x10 + mov r9, r0 + ldr r6, ._15 + ldr r4, ._15 + 4 + sub r6, r6, r4 + mov r0, r8 + add r1, r4, #0 + add r2, r6, #0 + bl memcpy + ldr r0, ._15 + 8 + sub r0, r0, r4 + add r0, r0, r8 + add r0, r0, #0x3 + mov r1, r9 + strb r1, [r0] + lsr r5, r5, #0x18 + strb r5, [r0, #0x1] + mov r0, r8 + add r1, r4, #0 + bl unref_sub_812620C + add r0, r6, #0 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6} + pop {r1} + bx r1 +._16: + .align 2, 0 +._15: + .word gUnknown_Debug_845E7BB + .word gUnknown_Debug_845E797 + .word gUnknown_Debug_845E7B5 + + thumb_func_end debug_sub_813C52C + + thumb_func_start debug_sub_813C580 +debug_sub_813C580: + push {lr} + mov r1, #0xd + bl debug_sub_813C52C + pop {r1} + bx r1 + + thumb_func_end debug_sub_813C580 + + thumb_func_start debug_sub_813C58C +debug_sub_813C58C: + push {lr} + mov r1, #0x4 + bl debug_sub_813C52C + pop {r1} + bx r1 + + thumb_func_end debug_sub_813C58C + + thumb_func_start debug_sub_813C598 +debug_sub_813C598: + push {lr} + mov r1, #0x85 + bl debug_sub_813C52C + pop {r1} + bx r1 + + thumb_func_end debug_sub_813C598 + + thumb_func_start debug_sub_813C5A4 +debug_sub_813C5A4: + push {lr} + ldr r1, ._17 + bl debug_sub_813C52C + pop {r1} + bx r1 +._18: + .align 2, 0 +._17: + .word 0x121 + + thumb_func_end debug_sub_813C5A4 + + thumb_func_start debug_sub_813C5B4 +debug_sub_813C5B4: + push {r4, r5, r6, r7, lr} + add r4, r0, #0 + ldr r7, ._23 + ldr r0, ._23 + 4 + ldr r1, ._23 + 8 + sub r0, r0, r1 + add r6, r0, r4 + ldr r0, ._23 + 12 + sub r5, r0, r1 + ldr r0, ._23 + 16 + mov r1, #0x0 + mov r2, #0x0 + bl GetEnigmaBerryChecksum + mov r2, #0x0 + ldr r3, ._23 + 20 + mov r1, #0x0 +._19: + add r0, r4, r2 + strb r1, [r0] + add r2, r2, #0x1 + cmp r2, r3 + ble ._19 @cond_branch + mov r2, #0x0 + cmp r2, r5 + bcs ._20 @cond_branch + ldr r3, ._23 + 8 +._21: + add r0, r4, r2 + add r1, r2, r3 + ldrb r1, [r1] + strb r1, [r0] + add r2, r2, #0x1 + cmp r2, r5 + bcc ._21 @cond_branch +._20: + mov r2, #0x0 + ldr r3, ._23 + 24 +._22: + add r0, r6, r2 + add r1, r7, r2 + ldrb r1, [r1] + strb r1, [r0] + add r2, r2, #0x1 + cmp r2, r3 + bls ._22 @cond_branch + bl ClearEnigmaBerries + ldr r1, ._23 + 8 + add r0, r4, #0 + bl unref_sub_81261B4 + add r0, r5, #0 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._24: + .align 2, 0 +._23: + .word gSaveBlock1+0x3160 + .word gUnknown_Debug_845DDD6 + .word gUnknown_Debug_845DDB2 + .word gUnknown_Debug_845E306 + .word Str_842E23C + .word 0xfff + .word 0x52f + + thumb_func_end debug_sub_813C5B4 + + thumb_func_start debug_sub_813C638 +debug_sub_813C638: + push {r4, r5, r6, lr} + mov r6, r8 + push {r6} + add sp, sp, #0xffffffec + mov r8, r0 + add r4, r1, #0 + add r5, r2, #0 + add r6, r3, #0 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + lsl r5, r5, #0x18 + lsr r5, r5, #0x18 + lsl r6, r6, #0x10 + lsr r6, r6, #0x10 + bl ZeroMonData + mov r0, #0x0 + str r0, [sp] + str r0, [sp, #0x4] + mov r0, #0x1 + str r0, [sp, #0x8] + ldr r0, ._25 + str r0, [sp, #0xc] + mov r0, r8 + add r1, r4, #0 + add r2, r5, #0 + mov r3, #0x20 + bl CreateMon + ldr r2, ._25 + 4 + mov r0, r8 + mov r1, #0x7 + bl SetMonData + ldr r2, ._25 + 8 + mov r0, r8 + mov r1, #0x2 + bl SetMonData + str r6, [sp, #0x10] + mov r0, r8 + mov r1, #0xc + add r2, sp, #0x10 + bl SetMonData + add sp, sp, #0x14 + pop {r3} + mov r8, r3 + pop {r4, r5, r6} + pop {r0} + bx r0 +._26: + .align 2, 0 +._25: + .word 0x270f + .word Str_842E240 + .word Str_842E248 + + thumb_func_end debug_sub_813C638 + + thumb_func_start debug_sub_813C6AC +debug_sub_813C6AC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xfffffff8 + add r6, r0, #0 + add r5, r1, #0 + add r0, r5, #0 + bl ClearMailStruct + add r0, r6, #0 + mov r1, #0xc + bl GetMonData + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r8, r0 + bl ItemIsMail + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._27 @cond_branch + add r4, r5, #0 + add r4, r4, #0x12 + add r7, r5, #0 + add r7, r7, #0x1a + mov r1, #0x9 + add r0, r5, #0 + add r0, r0, #0x10 +._28: + strh r1, [r0] + sub r1, r1, #0x1 + sub r0, r0, #0x2 + cmp r0, r5 + bge ._28 @cond_branch + add r0, r6, #0 + mov r1, #0x7 + mov r2, sp + bl GetMonData + add r0, r4, #0 + mov r1, sp + mov r2, #0x8 + bl StringCopyN + add r0, r6, #0 + mov r1, #0x1 + bl GetMonData + add r1, r7, #0 + bl write_word_to_mem + add r0, r6, #0 + mov r1, #0xb + bl GetMonData + add r4, r0, #0 + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r6, #0 + mov r1, #0x0 + bl GetMonData + add r1, r0, #0 + add r0, r4, #0 + bl SpeciesToMailSpecies + strh r0, [r5, #0x1e] + mov r0, r8 + strh r0, [r5, #0x20] +._27: + add sp, sp, #0x8 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 + + thumb_func_end debug_sub_813C6AC + + thumb_func_start debug_sub_813C740 +debug_sub_813C740: + push {r4, r5, r6, lr} + mov r6, sl + mov r5, r9 + mov r4, r8 + push {r4, r5, r6} + add sp, sp, #0xffffffd0 + add r6, r0, #0 + ldr r0, ._29 + mov r8, r0 + ldr r1, ._29 + 4 + ldr r5, ._29 + 8 + sub r1, r1, r0 + mov r9, r1 + add r0, r6, #0 + mov r1, r8 + mov r2, r9 + bl memcpy + add r0, r5, #0 + mov r1, #0x19 + mov r2, #0x5 + mov r3, #0x0 + bl debug_sub_813C638 + add r4, sp, #0x24 + mov r0, #0x1 + mov sl, r0 + mov r1, sl + strb r1, [r4] + add r0, r5, #0 + mov r1, #0x2d + add r2, r4, #0 + bl SetMonData + mov r0, #0x3 + strb r0, [r4] + add r0, r5, #0 + mov r1, #0x20 + add r2, r4, #0 + bl SetMonData + mov r0, #0xff + strb r0, [r4] + add r0, r5, #0 + mov r1, #0x23 + add r2, r4, #0 + bl SetMonData + ldr r1, ._29 + 12 + add r0, r4, #0 + mov r2, #0xb + bl StringCopyN + add r0, r5, #0 + mov r1, #0x2 + add r2, r4, #0 + bl SetMonData + mov r0, sl + strb r0, [r4] + add r0, r5, #0 + mov r1, #0x3 + add r2, r4, #0 + bl SetMonData + ldr r0, ._29 + 16 + add r0, r6, r0 + mov r1, r8 + sub r0, r0, r1 + add r1, r5, #0 + mov r2, #0x64 + bl memcpy + ldr r0, ._29 + 20 + add r6, r6, r0 + mov r0, r8 + sub r6, r6, r0 + add r0, r6, #0 + mov r1, sp + mov r2, #0x24 + bl memcpy + mov r0, r9 + add sp, sp, #0x30 + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6} + pop {r1} + bx r1 +._30: + .align 2, 0 +._29: + .word gUnknown_Debug_845E443 + .word gUnknown_Debug_845E4EF + .word gEnemyParty + .word Str_842E238 + .word gUnknown_Debug_845E467 + .word gUnknown_Debug_845E4CB + + thumb_func_end debug_sub_813C740 + + thumb_func_start debug_sub_813C810 +debug_sub_813C810: + push {r4, r5, r6, lr} + mov r6, r8 + push {r6} + add sp, sp, #0xffffffdc + add r6, r0, #0 + ldr r5, ._31 + ldr r0, ._31 + 4 + ldr r4, ._31 + 8 + sub r0, r0, r5 + mov r8, r0 + add r0, r6, #0 + add r1, r5, #0 + mov r2, r8 + bl memcpy + add r0, r4, #0 + mov r1, #0xc9 + mov r2, #0x15 + mov r3, #0x82 + bl debug_sub_813C638 + add r0, r4, #0 + mov r1, sp + bl debug_sub_813C6AC + ldr r0, ._31 + 12 + add r0, r6, r0 + sub r0, r0, r5 + add r1, r4, #0 + mov r2, #0x64 + bl memcpy + ldr r0, ._31 + 16 + add r0, r6, r0 + sub r0, r0, r5 + mov r1, sp + mov r2, #0x24 + bl memcpy + add r0, r6, #0 + add r1, r5, #0 + bl unref_sub_812620C + mov r0, r8 + add sp, sp, #0x24 + pop {r3} + mov r8, r3 + pop {r4, r5, r6} + pop {r1} + bx r1 +._32: + .align 2, 0 +._31: + .word gUnknown_Debug_845E443 + .word gUnknown_Debug_845E4EF + .word gEnemyParty + .word gUnknown_Debug_845E467 + .word gUnknown_Debug_845E4CB + + thumb_func_end debug_sub_813C810 + + thumb_func_start debug_sub_813C888 +debug_sub_813C888: + push {r4, r5, r6, lr} + mov r6, r8 + push {r6} + add sp, sp, #0xffffffdc + add r6, r0, #0 + ldr r5, ._33 + ldr r0, ._33 + 4 + ldr r4, ._33 + 8 + sub r0, r0, r5 + mov r8, r0 + add r0, r6, #0 + add r1, r5, #0 + mov r2, r8 + bl memcpy + add r0, r4, #0 + mov r1, #0xc9 + mov r2, #0x15 + mov r3, #0x82 + bl debug_sub_813C638 + add r0, r4, #0 + mov r1, sp + bl debug_sub_813C6AC + mov r0, #0x0 + strh r0, [r4, #0x1c] + ldr r0, ._33 + 12 + add r0, r6, r0 + sub r0, r0, r5 + add r1, r4, #0 + mov r2, #0x64 + bl memcpy + ldr r0, ._33 + 16 + add r0, r6, r0 + sub r0, r0, r5 + mov r1, sp + mov r2, #0x24 + bl memcpy + add r0, r6, #0 + add r1, r5, #0 + bl unref_sub_812620C + mov r0, r8 + add sp, sp, #0x24 + pop {r3} + mov r8, r3 + pop {r4, r5, r6} + pop {r1} + bx r1 +._34: + .align 2, 0 +._33: + .word gUnknown_Debug_845E443 + .word gUnknown_Debug_845E4EF + .word gEnemyParty + .word gUnknown_Debug_845E467 + .word gUnknown_Debug_845E4CB + + thumb_func_end debug_sub_813C888 + + thumb_func_start debug_sub_813C904 +debug_sub_813C904: + push {r4, lr} + ldr r4, ._35 + add r0, r4, #0 + mov r1, #0x5 + mov r2, #0x32 + mov r3, #0xb7 + bl debug_sub_813C638 + add r0, r4, #0 + add r0, r0, #0x64 + mov r1, #0x8 + mov r2, #0x32 + mov r3, #0xc4 + bl debug_sub_813C638 + add r4, r4, #0xc8 + add r0, r4, #0 + mov r1, #0x2 + mov r2, #0x32 + mov r3, #0x8d + bl debug_sub_813C638 + pop {r4} + pop {r0} + bx r0 +._36: + .align 2, 0 +._35: + .word gPlayerParty + + thumb_func_end debug_sub_813C904 + + thumb_func_start debug_sub_813C93C +debug_sub_813C93C: + push {r4, r5, r6, lr} + add sp, sp, #0xffffff44 + add r4, r0, #0 + ldr r6, ._37 + ldr r5, ._37 + 4 + sub r5, r5, r6 + add r1, r6, #0 + add r2, r5, #0 + bl memcpy + bl SavePlayerParty + bl debug_sub_813C904 + ldr r1, ._37 + 8 + ldr r2, ._37 + 12 + mov r0, sp + bl debug_sub_8075DB4 + bl LoadPlayerParty + ldr r0, ._37 + 16 + add r4, r4, r0 + sub r4, r4, r6 + add r0, r4, #0 + mov r1, sp + mov r2, #0xbc + bl memcpy + add r0, r5, #0 + add sp, sp, #0xbc + pop {r4, r5, r6} + pop {r1} + bx r1 +._38: + .align 2, 0 +._37: + .word gUnknown_Debug_845E4EF + .word gUnknown_Debug_845E606 + .word Str_842E253+5 @ weird... + .word 0x270f + .word gUnknown_Debug_845E506 + + thumb_func_end debug_sub_813C93C + + .align 2, 0 + +.endif diff --git a/asm/watanabe_debug_menu.s b/asm/watanabe_debug_menu.s new file mode 100644 index 000000000..6c56dab67 --- /dev/null +++ b/asm/watanabe_debug_menu.s @@ -0,0 +1,9578 @@ +.if DEBUG + + .include "constants/gba_constants.inc" + .include "include/macros.inc" + + .text + + thumb_func_start debug_69 +debug_69: + bx lr + + thumb_func_end debug_69 + + thumb_func_start debug_80C35DC +debug_80C35DC: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xfffffff8 + mov r0, #0x0 + bl SetVBlankCallback + mov r0, #0x80 + lsl r0, r0, #0x13 + mov r1, #0x0 + strh r1, [r0] + add r0, r0, #0xe + strh r1, [r0] + sub r0, r0, #0x2 + strh r1, [r0] + sub r0, r0, #0x2 + strh r1, [r0] + sub r0, r0, #0x2 + strh r1, [r0] + add r0, r0, #0x14 + strh r1, [r0] + add r0, r0, #0x2 + strh r1, [r0] + sub r0, r0, #0x6 + strh r1, [r0] + add r0, r0, #0x2 + strh r1, [r0] + sub r0, r0, #0x6 + strh r1, [r0] + add r0, r0, #0x2 + strh r1, [r0] + sub r0, r0, #0x6 + strh r1, [r0] + add r0, r0, #0x2 + strh r1, [r0] + mov r3, #0xc0 + lsl r3, r3, #0x13 + mov r4, #0xc0 + lsl r4, r4, #0x9 + add r0, sp, #0x4 + mov r8, r0 + mov r2, sp + mov r6, #0x0 + ldr r1, ._2 + mov r5, #0x80 + lsl r5, r5, #0x5 + ldr r7, ._2 + 4 + mov r0, #0x81 + lsl r0, r0, #0x18 + mov ip, r0 +._1: + strh r6, [r2] + mov r0, sp + str r0, [r1] + str r3, [r1, #0x4] + str r7, [r1, #0x8] + ldr r0, [r1, #0x8] + add r3, r3, r5 + sub r4, r4, r5 + cmp r4, r5 + bhi ._1 @cond_branch + strh r6, [r2] + mov r2, sp + str r2, [r1] + str r3, [r1, #0x4] + lsr r0, r4, #0x1 + mov r2, ip + orr r0, r0, r2 + str r0, [r1, #0x8] + ldr r0, [r1, #0x8] + mov r0, #0xe0 + lsl r0, r0, #0x13 + mov r3, #0x80 + lsl r3, r3, #0x3 + mov r4, #0x0 + str r4, [sp, #0x4] + ldr r2, ._2 + mov r1, r8 + str r1, [r2] + str r0, [r2, #0x4] + lsr r0, r3, #0x2 + mov r1, #0x85 + lsl r1, r1, #0x18 + orr r0, r0, r1 + str r0, [r2, #0x8] + ldr r0, [r2, #0x8] + mov r1, #0xa0 + lsl r1, r1, #0x13 + mov r0, sp + strh r4, [r0] + str r0, [r2] + str r1, [r2, #0x4] + lsr r3, r3, #0x1 + mov r0, #0x81 + lsl r0, r0, #0x18 + orr r3, r3, r0 + str r3, [r2, #0x8] + ldr r0, [r2, #0x8] + bl ResetPaletteFade + bl ScanlineEffect_Stop + bl ResetTasks + bl ResetSpriteData + bl ResetPaletteFade + bl FreeAllSpritePalettes + ldr r0, ._2 + 8 + bl LoadSpriteSheet + ldr r0, ._2 + 12 + bl LoadSpritePalette + ldr r0, ._2 + 16 + bl Text_LoadWindowTemplate + ldr r0, ._2 + 20 + bl InitMenuWindow + add sp, sp, #0x8 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._3: + .align 2, 0 +._2: + .word 0x40000d4 + .word 0x81000800 + .word stru_83F8828 + .word stru_83F8838 + .word gWindowTemplate_81E6C3C + .word gWindowTemplate_81E6CE4 + + thumb_func_end debug_80C35DC + + thumb_func_start debug_80C36F4 +debug_80C36F4: + push {lr} + bl RunTasks + bl AnimateSprites + bl BuildOamBuffer + bl UpdatePaletteFade + pop {r0} + bx r0 + + thumb_func_end debug_80C36F4 + + thumb_func_start debug_80C370C +debug_80C370C: + push {lr} + ldr r0, ._6 + ldrb r1, [r0, #0x7] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + bne ._4 @cond_branch + ldr r0, ._6 + 4 + bl SetMainCallback2 + b ._5 +._7: + .align 2, 0 +._6: + .word gPaletteFade + .word debug_80C36F4+1 +._4: + bl AnimateSprites + bl BuildOamBuffer + bl UpdatePaletteFade +._5: + pop {r0} + bx r0 + + thumb_func_end debug_80C370C + + thumb_func_start debug_80C373C +debug_80C373C: + push {lr} + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + bl DestroyTask + bl ScriptContext2_Disable + ldr r0, ._8 + bl SetMainCallback2 + pop {r0} + bx r0 +._9: + .align 2, 0 +._8: + .word sub_80546F0+1 + + thumb_func_end debug_80C373C + + thumb_func_start debug_80C3758 +debug_80C3758: + push {lr} + bl LoadOam + bl ProcessSpriteCopyRequests + bl TransferPlttBuffer + pop {r0} + bx r0 + + thumb_func_end debug_80C3758 + + thumb_func_start debug_80C376C +debug_80C376C: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + lsl r1, r1, #0x18 + lsr r7, r1, #0x18 + lsl r2, r2, #0x18 + lsr r6, r2, #0x18 + mov r1, #0x0 + mov r2, #0x0 +._10: + mov r3, sp + add r0, r3, r1 + strb r2, [r0] + add r0, r1, #1 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + cmp r1, #0x2 + bls ._10 @cond_branch + mov r1, sp + mov r0, #0xff + strb r0, [r1, #0x3] + mov r4, #0x0 + add r0, r5, #0 + mov r1, #0x64 + bl __udivsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0 + beq ._11 @cond_branch + mov r1, sp + add r0, r0, #0xa1 + strb r0, [r1] + mov r4, #0x1 +._11: + add r0, r5, #0 + mov r1, #0x64 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0xa + bl __udivsi3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0 + bne ._12 @cond_branch + cmp r4, #0 + beq ._13 @cond_branch +._12: + mov r1, sp + add r0, r0, #0xa1 + strb r0, [r1, #0x1] +._13: + mov r4, sp + add r0, r5, #0 + mov r1, #0x64 + bl __umodsi3 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0xa + bl __umodsi3 + add r0, r0, #0xa1 + strb r0, [r4, #0x2] + mov r0, sp + add r1, r7, #0 + add r2, r6, #0 + bl Menu_PrintText + add sp, sp, #0x4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 + + thumb_func_end debug_80C376C + + thumb_func_start debug_80C3800 +debug_80C3800: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xfffffff4 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + lsl r1, r1, #0x18 + lsr r6, r1, #0x18 + lsl r2, r2, #0x18 + lsr r5, r2, #0x18 + mov r3, #0x0 + ldr r2, ._18 + mov r1, #0x0 +._14: + mov r7, sp + add r0, r7, r3 + strb r1, [r0] + add r0, r3, #1 + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 + cmp r3, #0x9 + bls ._14 @cond_branch + add r1, r7, r3 + mov r0, #0xff + strb r0, [r1] + mov r3, #0x0 + mov r0, #0xb + add r1, r4, #0 + mul r1, r1, r0 + add r0, r1, r2 + ldrb r0, [r0] + cmp r0, #0xff + beq ._16 @cond_branch + add r4, r2, #0 + add r2, r1, #0 +._17: + mov r0, sp + add r1, r0, r3 + add r0, r3, r2 + add r0, r0, r4 + ldrb r0, [r0] + strb r0, [r1] + add r0, r3, #1 + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 + add r0, r3, r2 + add r0, r0, r4 + ldrb r0, [r0] + cmp r0, #0xff + beq ._16 @cond_branch + cmp r3, #0x9 + bls ._17 @cond_branch +._16: + mov r0, sp + add r1, r6, #0 + add r2, r5, #0 + bl Menu_PrintText + add sp, sp, #0xc + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._19: + .align 2, 0 +._18: + .word gSpeciesNames + + thumb_func_end debug_80C3800 + + thumb_func_start debug_80C3878 +debug_80C3878: + push {lr} + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + cmp r0, #0 + beq ._20 @cond_branch + cmp r0, #0x1 + beq ._21 @cond_branch +._20: + cmp r1, #0x1 + bls ._22 @cond_branch + sub r0, r1, #1 + b ._23 +._22: + ldr r1, ._25 + b ._28 +._26: + .align 2, 0 +._25: + .word 0x19b +._21: + mov r0, #0xcd + lsl r0, r0, #0x1 + cmp r1, r0 + bhi ._27 @cond_branch + add r0, r1, #1 +._23: + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + b ._28 +._27: + mov r1, #0x1 +._28: + add r0, r1, #0 + pop {r1} + bx r1 + + thumb_func_end debug_80C3878 + + thumb_func_start debug_80C38B4 +debug_80C38B4: + push {lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + lsl r1, r1, #0x10 + lsr r0, r1, #0x10 + cmp r2, #0 + beq ._29 @cond_branch + cmp r2, #0x1 + beq ._30 @cond_branch +._29: + cmp r0, #0 + beq ._31 @cond_branch + sub r0, r0, #0x1 + b ._32 +._31: + mov r0, #0x52 + b ._35 +._30: + cmp r0, #0x51 + bhi ._34 @cond_branch + add r0, r0, #0x1 +._32: + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + b ._35 +._34: + mov r0, #0x0 +._35: + pop {r1} + bx r1 + + thumb_func_end debug_80C38B4 + + thumb_func_start debug_80C38E4 +debug_80C38E4: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xfffffffc + add r4, r2, #0 + add r5, r3, #0 + ldr r6, [sp, #0x1c] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r8, r0 + lsl r1, r1, #0x18 + lsr r7, r1, #0x18 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + lsl r5, r5, #0x18 + lsr r5, r5, #0x18 + lsl r6, r6, #0x18 + lsr r6, r6, #0x18 + ldr r1, ._37 + mov r0, sp + mov r2, #0x2 + bl memcpy + add r0, r7, #0 + add r1, r4, #0 + add r2, r7, #0 + add r3, r5, #0 + bl Menu_BlankWindowRect + cmp r6, #0 + beq ._36 @cond_branch + mov r0, sp + add r1, r7, #0 + mov r2, r8 + bl Menu_PrintText +._36: + add sp, sp, #0x4 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._38: + .align 2, 0 +._37: + .word gUnknown_Debug_083F7FD4 + + thumb_func_end debug_80C38E4 + + thumb_func_start debug_80C393C +debug_80C393C: + push {lr} + ldr r1, ._39 + mov r0, #0x1e + bl ProgramFlashSectorAndVerify + pop {r0} + bx r0 +._40: + .align 2, 0 +._39: + .word gUnknown_Debug_083F7FD6 + + thumb_func_end debug_80C393C + + thumb_func_start InitWatanabeDebugMenu +InitWatanabeDebugMenu: + push {r4, lr} + ldr r0, ._46 + ldr r1, ._46 + 4 + add r4, r0, r1 + ldrb r0, [r4] + cmp r0, #0x1 + beq ._41 @cond_branch + cmp r0, #0x1 + ble ._42 @cond_branch + cmp r0, #0x2 + beq ._43 @cond_branch + cmp r0, #0x3 + beq ._44 @cond_branch +._42: + bl save_serialize_map + bl sub_8125E2C + mov r0, #0x1 + strb r0, [r4] + b ._51 +._47: + .align 2, 0 +._46: + .word gMain + .word 0x43c +._41: + bl sub_8125E6C + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._51 @cond_branch + b ._49 +._43: + mov r0, #0x37 + bl PlaySE +._49: + ldrb r0, [r4] + add r0, r0, #0x1 + strb r0, [r4] + b ._51 +._44: + bl IsSEPlaying + lsl r0, r0, #0x18 + cmp r0, #0 + bne ._51 @cond_branch + bl ScriptContext2_Disable + ldr r0, ._52 + bl SetMainCallback2 +._51: + pop {r4} + pop {r0} + bx r0 +._53: + .align 2, 0 +._52: + .word sub_80546F0+1 + + thumb_func_end InitWatanabeDebugMenu + + thumb_func_start InitSizeComparison +InitSizeComparison: + push {r4, lr} + add sp, sp, #0xfffffffc + bl debug_80C35DC + ldr r1, ._54 + mov r0, #0x1 + strb r0, [r1] + ldr r0, ._54 + 4 + mov r1, #0x80 + lsl r1, r1, #0x1 + mov r2, #0x20 + bl LoadPalette + ldr r3, ._54 + 8 + ldrh r2, [r3] + mov r0, #0x0 + strh r0, [r3] + ldr r4, ._54 + 12 + ldrh r0, [r4] + mov r1, #0x1 + orr r0, r0, r1 + strh r0, [r4] + strh r2, [r3] + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x10 + mov r3, #0x0 + bl BeginNormalPaletteFade + ldr r0, ._54 + 16 + bl SetVBlankCallback + ldr r0, ._54 + 20 + bl SetMainCallback2 + mov r1, #0x80 + lsl r1, r1, #0x13 + mov r2, #0x8a + lsl r2, r2, #0x5 + add r0, r2, #0 + strh r0, [r1] + ldr r0, ._54 + 24 + mov r1, #0x0 + bl CreateTask + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._54 + 28 + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x3 + add r1, r1, r2 + mov r0, #0xfc + strh r0, [r1, #0x8] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._55: + .align 2, 0 +._54: + .word gReservedSpritePaletteCount + .word gUnknown_Debug_20389EC + .word 0x4000208 + .word 0x4000200 + .word debug_80C3758+1 + .word debug_80C370C+1 + .word debug_80C3A50+1 + .word gTasks + + thumb_func_end InitSizeComparison + + thumb_func_start debug_80C3A50 +debug_80C3A50: + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xffffffd8 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r1, ._56 + lsl r2, r0, #0x2 + add r0, r2, r0 + lsl r0, r0, #0x3 + add r7, r0, r1 + ldrh r0, [r7, #0x8] + str r0, [sp, #0x4] + bl NationalPokedexNumToSpecies + mov r1, sp + strh r0, [r1, #0x8] + add r2, r0, #0 + lsl r2, r2, #0x10 + str r2, [sp, #0xc] + lsr r2, r2, #0x10 + mov r9, r2 + ldr r3, ._56 + 4 + mov r8, r3 + mov r0, #0x6 + mov r1, #0x0 + mov r2, #0x17 + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x5 + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + ldr r5, ._56 + 8 + add r0, r5, #0 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + ldr r4, ._56 + 12 + add r0, r4, #0 + mov r1, #0x1 + mov r2, #0x5 + bl Menu_PrintText + mov r0, #0x18 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + add r0, r5, #0 + mov r1, #0x19 + mov r2, #0x1 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0x19 + mov r2, #0x5 + bl Menu_PrintText + mov r0, #0x0 + mov r1, #0xa + mov r2, #0xb + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r0, ._56 + 16 + mov r1, #0x1 + mov r2, #0xb + bl Menu_PrintText + ldr r0, ._56 + 20 + mov r1, #0x1 + mov r2, #0xd + bl Menu_PrintText + ldr r0, ._56 + 24 + mov r1, #0x1 + mov r2, #0xf + bl Menu_PrintText + ldr r0, ._56 + 28 + mov r1, #0x1 + mov r2, #0x11 + bl Menu_PrintText + mov r0, #0xc + mov r1, #0xa + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r0, ._56 + 32 + mov r1, #0xd + mov r2, #0xb + bl Menu_PrintText + ldr r0, ._56 + 36 + mov r1, #0xd + mov r2, #0xd + bl Menu_PrintText + mov r0, #0xc + mov r1, #0x10 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + ldr r0, ._56 + 40 + mov r1, #0xd + mov r2, #0x11 + bl Menu_PrintText + ldr r0, ._56 + 44 + mov r1, #0x18 + mov r2, #0x11 + bl Menu_PrintText + mov r0, r9 + mov r1, #0x12 + mov r2, #0x11 + bl debug_80C3800 + mov r1, r8 + ldrb r0, [r1, #0x8] + mov r1, #0x98 + mov r2, #0x28 + mov r3, #0x0 + bl sub_8091A4C + mov r2, sp + strh r0, [r2, #0x10] + add r3, r0, #0 + lsl r3, r3, #0x10 + str r3, [sp, #0x18] + lsr r0, r3, #0x10 + str r0, [sp, #0x14] + lsl r4, r0, #0x4 + add r4, r4, r0 + lsl r4, r4, #0x2 + ldr r1, ._56 + 48 + add r4, r4, r1 + ldrb r1, [r4, #0x1] + mov r2, #0x4 + neg r2, r2 + mov sl, r2 + mov r0, sl + and r0, r0, r1 + mov r3, #0x1 + orr r0, r0, r3 + strb r0, [r4, #0x1] + ldrb r1, [r4, #0x3] + mov r0, #0x3f + neg r0, r0 + mov r9, r0 + and r0, r0, r1 + mov r1, #0x4 + orr r0, r0, r1 + strb r0, [r4, #0x3] + ldrb r1, [r4, #0x5] + sub r2, r2, #0x9 + mov r8, r2 + mov r0, r8 + and r0, r0, r1 + mov r3, #0xf + and r0, r0, r3 + strb r0, [r4, #0x5] + mov r0, #0x0 + bl GetSpritePaletteTagByPaletteNum + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl FreeSpritePaletteByTag + ldr r0, ._56 + 52 + ldr r1, [sp, #0x4] + lsl r5, r1, #0x3 + add r5, r5, r1 + lsl r5, r5, #0x2 + add r5, r5, r0 + ldrh r6, [r5, #0x20] + strh r6, [r4, #0x26] + ldrh r4, [r5, #0x1e] + str r4, [sp] + mov r0, #0x2 + add r1, r4, #0 + mov r2, #0x0 + mov r3, #0x0 + bl SetOamMatrix + mov r2, sp + ldrh r2, [r2, #0x14] + strh r2, [r7, #0xe] + strh r6, [r7, #0x10] + strh r4, [r7, #0x14] + ldr r0, [sp, #0x4] + mov r1, #0x58 + mov r2, #0x28 + mov r3, #0x1 + bl sub_80918EC + mov r3, sp + strh r0, [r3, #0x1c] + lsl r0, r0, #0x10 + str r0, [sp, #0x24] + lsr r1, r0, #0x10 + str r1, [sp, #0x20] + lsl r4, r1, #0x4 + add r4, r4, r1 + lsl r4, r4, #0x2 + ldr r2, ._56 + 48 + add r4, r4, r2 + ldrb r0, [r4, #0x1] + mov r3, sl + and r3, r3, r0 + mov r0, #0x1 + orr r3, r3, r0 + strb r3, [r4, #0x1] + ldrb r0, [r4, #0x3] + mov r1, r9 + and r1, r1, r0 + mov r0, #0x2 + orr r1, r1, r0 + strb r1, [r4, #0x3] + ldrb r0, [r4, #0x5] + mov r2, r8 + and r2, r2, r0 + mov r3, #0xf + and r2, r2, r3 + strb r2, [r4, #0x5] + mov r0, #0x0 + bl GetSpritePaletteTagByPaletteNum + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl FreeSpritePaletteByTag + ldrh r0, [r5, #0x1c] + mov r8, r0 + strh r0, [r4, #0x26] + ldrh r4, [r5, #0x1a] + str r4, [sp] + mov r0, #0x1 + add r1, r4, #0 + mov r2, #0x0 + mov r3, #0x0 + bl SetOamMatrix + mov r1, sp + ldrh r1, [r1, #0x20] + strh r1, [r7, #0xc] + mov r2, r8 + strh r2, [r7, #0x12] + strh r4, [r7, #0x16] + mov r3, #0x0 + strh r3, [r7, #0x18] + strh r3, [r7, #0x1a] + ldr r1, ._56 + 56 + ldr r2, ._56 + 60 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x2 + mov r0, #0x1f + strh r0, [r1] + ldr r2, ._56 + 64 + mov r3, #0x18 + ldsh r1, [r7, r3] + lsl r1, r1, #0x6 + add r0, r1, #0 + add r0, r0, #0x38 + lsl r0, r0, #0x8 + add r1, r1, #0x78 + add r0, r0, r1 + strh r0, [r2] + ldr r1, ._56 + 68 + ldr r2, ._56 + 72 + add r0, r2, #0 + strh r0, [r1] + sub r1, r1, #0x2 + ldr r3, ._56 + 76 + add r0, r3, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._56 + 80 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0xa + mov r0, #0xe1 + strh r0, [r1] + ldr r0, ._56 + 84 + mov r3, #0x0 + strh r3, [r0] + add r1, r1, #0x4 + mov r0, #0x7 + strh r0, [r1] + mov r2, #0x80 + lsl r2, r2, #0x13 + ldrh r0, [r2] + mov r3, #0xc0 + lsl r3, r3, #0x7 + add r1, r3, #0 + orr r0, r0, r1 + strh r0, [r2] + ldr r0, ._56 + 88 + str r0, [r7] + add sp, sp, #0x28 + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._57: + .align 2, 0 +._56: + .word gTasks + .word gSaveBlock2 + .word gUnknown_Debug_083F7FD6+0x4 + .word gUnknown_Debug_083F7FDE + .word gUnknown_Debug_083F7FE2 + .word gUnknown_Debug_083F7FED + .word gUnknown_Debug_083F7FF6 + .word gUnknown_Debug_083F8001 + .word gUnknown_Debug_083F800C + .word gUnknown_Debug_083F8019 + .word gUnknown_Debug_083F8022 + .word gUnknown_Debug_083F8028 + .word gSprites + .word gPokedexEntries + .word 0x4000048 + .word 0x3f1f + .word 0x4000040 + .word 0x4000044 + .word 0x848 + .word 0x31bf + .word 0x14f + .word 0x4000052 + .word debug_80C3D2C+1 + + thumb_func_end debug_80C3A50 + + thumb_func_start debug_80C3D2C +debug_80C3D2C: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + add r7, r6, #0 + ldr r4, ._60 + ldrh r1, [r4, #0x2e] + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._58 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r0, ._60 + 4 + bl SetMainCallback2 + ldr r1, ._60 + 8 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._60 + 12 + str r1, [r0] + b ._117 +._61: + .align 2, 0 +._60: + .word gMain + .word debug_80C370C+1 + .word gTasks + .word debug_80C373C+1 +._58: + mov r5, #0x1 + add r0, r5, #0 + and r0, r0, r1 + cmp r0, #0 + beq ._62 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r1, ._64 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldrh r1, [r0, #0x18] + mov r2, #0x1 + eor r1, r1, r2 + strh r1, [r0, #0x18] + b ._117 +._65: + .align 2, 0 +._64: + .word gTasks +._62: + ldrh r1, [r4, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._66 @cond_branch + ldr r1, ._70 + lsl r2, r6, #0x2 + add r0, r2, r6 + lsl r0, r0, #0x3 + add r3, r0, r1 + mov r5, #0x18 + ldsh r0, [r3, r5] + mov r8, r1 + cmp r0, #0 + beq ._67 @cond_branch + ldrh r1, [r4, #0x2c] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._68 @cond_branch + ldrh r0, [r3, #0x14] + add r0, r0, #0x10 + b ._69 +._71: + .align 2, 0 +._70: + .word gTasks +._68: + ldrh r0, [r3, #0x14] + add r0, r0, #0x1 +._69: + strh r0, [r3, #0x14] + add r0, r2, r7 + lsl r0, r0, #0x3 + mov r2, r8 + add r1, r0, r2 + ldrh r0, [r1, #0x14] + mov r6, #0x80 + lsl r6, r6, #0x8 + cmp r0, r6 + bhi ._72 @cond_branch + b ._117 +._72: + strh r6, [r1, #0x14] + b ._117 +._67: + ldrh r1, [r4, #0x2c] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._75 @cond_branch + ldrh r0, [r3, #0x16] + add r0, r0, #0x10 + b ._76 +._75: + ldrh r0, [r3, #0x16] + add r0, r0, #0x1 +._76: + strh r0, [r3, #0x16] + add r0, r2, r7 + lsl r0, r0, #0x3 + mov r4, r8 + add r1, r0, r4 + ldrh r0, [r1, #0x16] + mov r6, #0x80 + lsl r6, r6, #0x8 + cmp r0, r6 + bhi ._77 @cond_branch + b ._117 +._77: + strh r6, [r1, #0x16] + b ._117 +._66: + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._80 @cond_branch + ldr r1, ._84 + lsl r2, r6, #0x2 + add r0, r2, r6 + lsl r0, r0, #0x3 + add r3, r0, r1 + mov r5, #0x18 + ldsh r0, [r3, r5] + mov r8, r1 + cmp r0, #0 + beq ._81 @cond_branch + ldrh r1, [r4, #0x2c] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._82 @cond_branch + ldrh r0, [r3, #0x14] + sub r0, r0, #0x10 + b ._83 +._85: + .align 2, 0 +._84: + .word gTasks +._82: + ldrh r0, [r3, #0x14] + sub r0, r0, #0x1 +._83: + strh r0, [r3, #0x14] + add r0, r2, r7 + lsl r0, r0, #0x3 + mov r2, r8 + add r1, r0, r2 + mov r4, #0x14 + ldsh r0, [r1, r4] + cmp r0, #0xff + ble ._86 @cond_branch + b ._117 +._86: + mov r0, #0x80 + lsl r0, r0, #0x1 + strh r0, [r1, #0x14] + b ._117 +._81: + ldrh r1, [r4, #0x2c] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._89 @cond_branch + ldrh r0, [r3, #0x16] + sub r0, r0, #0x10 + b ._90 +._89: + ldrh r0, [r3, #0x16] + sub r0, r0, #0x1 +._90: + strh r0, [r3, #0x16] + add r0, r2, r7 + lsl r0, r0, #0x3 + mov r5, r8 + add r1, r0, r5 + mov r2, #0x16 + ldsh r0, [r1, r2] + cmp r0, #0xff + ble ._91 @cond_branch + b ._117 +._91: + mov r0, #0x80 + lsl r0, r0, #0x1 + strh r0, [r1, #0x16] + b ._117 +._80: + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._94 @cond_branch + ldr r0, ._97 + lsl r1, r6, #0x2 + add r1, r1, r6 + lsl r1, r1, #0x3 + add r1, r1, r0 + mov r4, #0x18 + ldsh r0, [r1, r4] + cmp r0, #0 + beq ._95 @cond_branch + ldrh r0, [r1, #0x10] + sub r0, r0, #0x1 + strh r0, [r1, #0x10] + b ._117 +._98: + .align 2, 0 +._97: + .word gTasks +._95: + ldrh r0, [r1, #0x12] + sub r0, r0, #0x1 + strh r0, [r1, #0x12] + b ._117 +._94: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._100 @cond_branch + ldr r0, ._103 + lsl r1, r6, #0x2 + add r1, r1, r6 + lsl r1, r1, #0x3 + add r1, r1, r0 + mov r5, #0x18 + ldsh r0, [r1, r5] + cmp r0, #0 + beq ._101 @cond_branch + ldrh r0, [r1, #0x10] + add r0, r0, #0x1 + strh r0, [r1, #0x10] + b ._117 +._104: + .align 2, 0 +._103: + .word gTasks +._101: + ldrh r0, [r1, #0x12] + add r0, r0, #0x1 + strh r0, [r1, #0x12] + b ._117 +._100: + mov r0, #0x8 + and r0, r0, r1 + cmp r0, #0 + beq ._106 @cond_branch + ldr r2, ._109 + lsl r3, r6, #0x2 + add r0, r3, r6 + lsl r0, r0, #0x3 + add r6, r0, r2 + ldrh r4, [r6, #0x8] + mov r0, #0x8 + ldsh r1, [r6, r0] + ldr r0, ._109 + 4 + mov r8, r2 + add r2, r3, #0 + cmp r1, r0 + bgt ._107 @cond_branch + add r0, r4, #1 + strh r0, [r6, #0x8] + b ._108 +._110: + .align 2, 0 +._109: + .word gTasks + .word 0x181 +._107: + strh r5, [r6, #0x8] +._108: + add r4, r2, r7 + lsl r4, r4, #0x3 + add r4, r4, r8 + mov r2, #0xc + ldsh r1, [r4, r2] + b ._111 +._106: + mov r0, #0x4 + and r0, r0, r1 + cmp r0, #0 + beq ._112 @cond_branch + ldr r1, ._115 + lsl r2, r6, #0x2 + add r0, r2, r6 + lsl r0, r0, #0x3 + add r3, r0, r1 + ldrh r6, [r3, #0x8] + mov r4, #0x8 + ldsh r0, [r3, r4] + mov r8, r1 + cmp r0, #0x1 + ble ._113 @cond_branch + sub r0, r6, #1 + b ._114 +._116: + .align 2, 0 +._115: + .word gTasks +._113: + mov r0, #0xc1 + lsl r0, r0, #0x1 +._114: + strh r0, [r3, #0x8] + add r4, r2, r7 + lsl r4, r4, #0x3 + add r4, r4, r8 + mov r5, #0xc + ldsh r1, [r4, r5] +._111: + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + ldr r5, ._118 + add r0, r0, r5 + bl DestroySprite + mov r0, #0xe + ldsh r1, [r4, r0] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r5 + bl DestroySprite + ldr r0, ._118 + 4 + str r0, [r4] + b ._117 +._119: + .align 2, 0 +._118: + .word gSprites + .word debug_80C3A50+1 +._112: + ldr r0, ._120 + lsl r5, r7, #0x2 + add r5, r5, r7 + lsl r5, r5, #0x3 + add r5, r5, r0 + ldrh r4, [r5, #0x16] + ldrh r6, [r5, #0x12] + str r4, [sp] + mov r0, #0x1 + add r1, r4, #0 + mov r2, #0x0 + mov r3, #0x0 + bl SetOamMatrix + add r0, r4, #0 + mov r1, #0x1 + mov r2, #0x3 + mov r3, #0x4 + bl debug_80C68CC + add r0, r6, #0 + mov r1, #0x1 + mov r2, #0x7 + mov r3, #0x4 + bl debug_80C68CC + ldr r2, ._120 + 4 + mov r8, r2 + mov r4, #0xc + ldsh r1, [r5, r4] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r8 + strh r6, [r0, #0x26] + ldrh r4, [r5, #0x14] + ldrh r6, [r5, #0x10] + str r4, [sp] + mov r0, #0x2 + add r1, r4, #0 + mov r2, #0x0 + mov r3, #0x0 + bl SetOamMatrix + add r0, r4, #0 + mov r1, #0x19 + mov r2, #0x3 + mov r3, #0x4 + bl debug_80C68CC + add r0, r6, #0 + mov r1, #0x19 + mov r2, #0x7 + mov r3, #0x4 + bl debug_80C68CC + mov r0, #0xe + ldsh r1, [r5, r0] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r8 + strh r6, [r0, #0x26] + ldr r2, ._120 + 8 + mov r4, #0x18 + ldsh r1, [r5, r4] + lsl r1, r1, #0x6 + add r0, r1, #0 + add r0, r0, #0x38 + lsl r0, r0, #0x8 + add r1, r1, #0x78 + add r0, r0, r1 + strh r0, [r2] +._117: + add sp, sp, #0x4 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._121: + .align 2, 0 +._120: + .word gTasks + .word gSprites + .word 0x4000040 + + thumb_func_end debug_80C3D2C + + thumb_func_start debug_80C405C +debug_80C405C: + push {r4, r5, lr} + add r4, r0, #0 + lsl r1, r1, #0x10 + lsr r5, r1, #0x10 + mov r2, #0x0 + mov r1, #0x0 +._122: + add r0, r4, r2 + strb r1, [r0] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x9 + bls ._122 @cond_branch + add r0, r4, r2 + mov r1, #0xff + strb r1, [r0] + mov r0, #0xae + strb r0, [r4] + cmp r5, #0 + beq ._125 @cond_branch + mov r2, #0x0 + ldr r3, ._127 + mov r0, #0xb + add r1, r5, #0 + mul r1, r1, r0 + add r0, r1, r3 + ldrb r0, [r0] + cmp r0, #0xff + beq ._125 @cond_branch + add r5, r3, #0 + add r3, r1, #0 +._126: + add r1, r4, r2 + add r0, r2, r3 + add r0, r0, r5 + ldrb r0, [r0] + strb r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + add r0, r2, r3 + add r0, r0, r5 + ldrb r0, [r0] + cmp r0, #0xff + beq ._125 @cond_branch + cmp r2, #0x9 + bls ._126 @cond_branch +._125: + pop {r4, r5} + pop {r0} + bx r0 +._128: + .align 2, 0 +._127: + .word gSpeciesNames + + thumb_func_end debug_80C405C + + thumb_func_start debug_80C40C4 +debug_80C40C4: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 + mov r5, #0x0 + mov r6, sp +._135: + cmp r7, #0 + beq ._129 @cond_branch + mov r0, #0x64 + add r1, r5, #0 + mul r1, r1, r0 + ldr r0, ._132 + add r4, r1, r0 + add r0, r4, #0 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + beq ._134 @cond_branch + add r0, r4, #0 + bl CalculateMonStats + add r0, r4, #0 + mov r1, #0x3a + bl GetMonData + strh r0, [r6] + add r0, r4, #0 + mov r1, #0x39 + mov r2, sp + bl SetMonData + b ._134 +._133: + .align 2, 0 +._132: + .word gEnemyParty +._129: + mov r0, #0x64 + add r1, r5, #0 + mul r1, r1, r0 + ldr r0, ._136 + add r4, r1, r0 + add r0, r4, #0 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + beq ._134 @cond_branch + add r0, r4, #0 + bl CalculateMonStats + add r0, r4, #0 + mov r1, #0x3a + bl GetMonData + strh r0, [r6] + add r0, r4, #0 + mov r1, #0x39 + mov r2, sp + bl SetMonData +._134: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x5 + bls ._135 @cond_branch + add sp, sp, #0x4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._137: + .align 2, 0 +._136: + .word gPlayerParty + + thumb_func_end debug_80C40C4 + + thumb_func_start InitBattleForDebug +InitBattleForDebug: + push {lr} + bl SavePlayerParty + ldr r1, ._138 + ldr r0, ._138 + 4 + ldrb r2, [r0, #0x8] + mov r0, #0x0 + strb r2, [r1, #0xd] + strb r0, [r1] + strb r0, [r1, #0x1] + strb r0, [r1, #0x2] + strb r0, [r1, #0x3] + strb r0, [r1, #0x4] + strb r0, [r1, #0x5] + strb r0, [r1, #0x6] + strb r0, [r1, #0x7] + strb r0, [r1, #0x8] + strb r0, [r1, #0xc] + ldr r1, ._138 + 8 + str r0, [r1] + bl ZeroPlayerPartyMons + bl ZeroEnemyPartyMons + mov r0, #0x0 + bl debug_80C4214 + ldr r0, ._138 + 12 + mov r1, #0x0 + bl CreateTask + pop {r0} + bx r0 +._139: + .align 2, 0 +._138: + .word gUnknown_Debug_2038A0C + .word gSaveBlock2 + .word byte_3005E30 + .word debug_80C47BC+1 + + thumb_func_end InitBattleForDebug + + thumb_func_start debug_80C41A8 +debug_80C41A8: + push {lr} + ldr r1, ._140 + mov r0, #0x0 + strb r0, [r1, #0x1] + strb r0, [r1, #0x2] + bl ZeroPlayerPartyMons + bl ZeroEnemyPartyMons + mov r0, #0x0 + bl debug_80C4214 + ldr r0, ._140 + 4 + mov r1, #0x0 + bl CreateTask + pop {r0} + bx r0 +._141: + .align 2, 0 +._140: + .word gUnknown_Debug_2038A0C + .word debug_80C47BC+1 + + thumb_func_end debug_80C41A8 + + thumb_func_start debug_80C41D4 +debug_80C41D4: + push {lr} + mov r0, #0x0 + bl debug_80C40C4 + mov r0, #0x0 + bl debug_80C4214 + ldr r0, ._142 + mov r1, #0x0 + bl CreateTask + pop {r0} + bx r0 +._143: + .align 2, 0 +._142: + .word debug_80C42B8+1 + + thumb_func_end debug_80C41D4 + + thumb_func_start debug_80C41F4 +debug_80C41F4: + push {lr} + mov r0, #0x1 + bl debug_80C40C4 + mov r0, #0x1 + bl debug_80C4214 + ldr r0, ._144 + mov r1, #0x0 + bl CreateTask + pop {r0} + bx r0 +._145: + .align 2, 0 +._144: + .word debug_80C42B8+1 + + thumb_func_end debug_80C41F4 + + thumb_func_start debug_80C4214 +debug_80C4214: + push {r4, r5, r6, lr} + bl debug_80C35DC + ldr r6, ._146 + mov r4, #0x0 + strh r4, [r6] + ldr r5, ._146 + 4 + strh r4, [r5] + ldr r0, ._146 + 8 + strh r4, [r0] + add r0, r0, #0x4 + strh r4, [r0] + ldr r1, ._146 + 12 + ldr r2, ._146 + 16 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x2 + mov r0, #0x31 + strh r0, [r1] + add r1, r1, #0x6 + mov r0, #0xe1 + strh r0, [r1] + ldr r0, ._146 + 20 + strh r4, [r0] + add r1, r1, #0x4 + mov r0, #0x7 + strh r0, [r1] + ldr r3, ._146 + 24 + ldrh r2, [r3] + strh r4, [r3] + ldr r4, ._146 + 28 + ldrh r0, [r4] + mov r1, #0x1 + orr r0, r0, r1 + strh r0, [r4] + strh r2, [r3] + ldr r0, ._146 + 32 + bl SetVBlankCallback + ldr r0, ._146 + 36 + bl SetMainCallback2 + mov r1, #0x80 + lsl r1, r1, #0x13 + ldr r2, ._146 + 40 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._146 + 44 + add r0, r1, #0 + strh r0, [r6] + ldr r2, ._146 + 48 + add r0, r2, #0 + strh r0, [r5] + pop {r4, r5, r6} + pop {r0} + bx r0 +._147: + .align 2, 0 +._146: + .word 0x4000040 + .word 0x4000044 + .word 0x4000042 + .word 0x4000048 + .word 0x1111 + .word 0x4000052 + .word 0x4000208 + .word 0x4000200 + .word debug_80C3758+1 + .word debug_80C370C+1 + .word 0x7140 + .word 0x1ef + .word 0x819f + + thumb_func_end debug_80C4214 + + thumb_func_start debug_80C42B8 +debug_80C42B8: + push {r4, r5, lr} + add sp, sp, #0xffffffe4 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + ldr r1, ._150 + mov r0, sp + mov r2, #0xc + bl memcpy + add r4, sp, #0xc + ldr r1, ._150 + 4 + add r0, r4, #0 + mov r2, #0xd + bl memcpy + mov r0, #0x0 + mov r1, #0x10 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r0, sp + mov r1, #0x1 + mov r2, #0x11 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0x14 + mov r2, #0x11 + bl Menu_PrintText + bl debug_80C4694 + bl debug_80C4704 + ldr r0, ._150 + 8 + ldrb r0, [r0] + cmp r0, #0 + beq ._148 @cond_branch + ldr r0, ._150 + 12 + lsl r1, r5, #0x2 + add r1, r1, r5 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._150 + 16 + b ._149 +._151: + .align 2, 0 +._150: + .word gUnknown_Debug_083F8194 + .word gUnknown_Debug_083F81A0 + .word gUnknown_Debug_2038A0C + .word gTasks + .word debug_80C44EC+1 +._148: + ldr r0, ._152 + lsl r1, r5, #0x2 + add r1, r1, r5 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._152 + 4 +._149: + str r0, [r1] + add sp, sp, #0x1c + pop {r4, r5} + pop {r0} + bx r0 +._153: + .align 2, 0 +._152: + .word gTasks + .word debug_80C4348+1 + + thumb_func_end debug_80C42B8 + + thumb_func_start debug_80C4348 +debug_80C4348: + push {r4, lr} + add sp, sp, #0xfffffffc + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r0, ._154 + ldrb r0, [r0, #0x1] + lsl r0, r0, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r0, r0, r1 + lsr r0, r0, #0x18 + mov r1, #0x1 + str r1, [sp] + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r1, ._154 + 4 + ldr r2, ._154 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + add r2, r2, #0x8 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._154 + 12 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._154 + 16 + str r1, [r0] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._155: + .align 2, 0 +._154: + .word gUnknown_Debug_2038A0C + .word 0x4000042 + .word 0x177 + .word gTasks + .word debug_80C43A8+1 + + thumb_func_end debug_80C4348 + + thumb_func_start debug_80C43A8 +debug_80C43A8: + push {r4, r5, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r1, ._158 + ldrh r2, [r1, #0x2e] + mov r0, #0x1 + and r0, r0, r2 + add r3, r1, #0 + cmp r0, #0 + beq ._156 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r0, ._158 + 4 + ldrb r1, [r0, #0x1] + mov r0, #0x64 + mul r0, r0, r1 + ldr r1, ._158 + 8 + add r0, r0, r1 + ldr r1, ._158 + 12 + bl debug_sub_80A433C + add r0, r4, #0 + bl DestroyTask + b ._180 +._159: + .align 2, 0 +._158: + .word gMain + .word gUnknown_Debug_2038A0C + .word gPlayerParty + .word debug_80C41D4+1 +._156: + mov r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + beq ._160 @cond_branch + ldr r0, ._162 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._162 + 4 + str r0, [r1] + b ._180 +._163: + .align 2, 0 +._162: + .word gTasks + .word debug_80C4F48+1 +._160: + mov r0, #0x8 + and r0, r0, r2 + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + cmp r1, #0 + beq ._164 @cond_branch + bl debug_80C4774 + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._180 @cond_branch + mov r0, #0x5 + bl PlaySE + bl CalculatePlayerPartyCount + bl CalculateEnemyPartyCount + ldr r0, ._167 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._167 + 4 + str r0, [r1] + b ._180 +._168: + .align 2, 0 +._167: + .word gTasks + .word debug_80C4D14+1 +._164: + mov r0, #0x88 + lsl r0, r0, #0x1 + and r0, r0, r2 + cmp r0, #0 + beq ._169 @cond_branch + str r1, [sp] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r0, ._171 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._171 + 4 + str r0, [r1] + b ._180 +._172: + .align 2, 0 +._171: + .word gTasks + .word debug_80C44EC+1 +._169: + ldrh r1, [r3, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._174 @cond_branch + ldr r1, ._176 + ldrb r0, [r1, #0x1] + cmp r0, #0 + beq ._174 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1, #0x1] + b ._175 +._177: + .align 2, 0 +._176: + .word gUnknown_Debug_2038A0C +._174: + ldrh r1, [r3, #0x30] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._180 @cond_branch + ldr r5, ._181 + ldrb r0, [r5, #0x1] + cmp r0, #0x4 + bhi ._180 @cond_branch + add r1, r0, #0 + mov r0, #0x64 + mul r0, r0, r1 + ldr r1, ._181 + 4 + add r0, r0, r1 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + beq ._180 @cond_branch + ldrb r0, [r5, #0x1] + add r0, r0, #0x1 + strb r0, [r5, #0x1] +._175: + ldr r1, ._181 + 8 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._181 + 12 + str r1, [r0] +._180: + add sp, sp, #0x4 + pop {r4, r5} + pop {r0} + bx r0 +._182: + .align 2, 0 +._181: + .word gUnknown_Debug_2038A0C + .word gPlayerParty + .word gTasks + .word debug_80C4348+1 + + thumb_func_end debug_80C43A8 + + thumb_func_start debug_80C44EC +debug_80C44EC: + push {r4, lr} + add sp, sp, #0xfffffffc + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r0, ._183 + ldrb r0, [r0, #0x2] + lsl r0, r0, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r0, r0, r1 + lsr r0, r0, #0x18 + mov r1, #0x1 + str r1, [sp] + mov r1, #0x10 + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r1, ._183 + 4 + ldr r2, ._183 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._183 + 12 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._183 + 16 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._183 + 20 + str r1, [r0] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._184: + .align 2, 0 +._183: + .word gUnknown_Debug_2038A0C + .word 0x4000042 + .word 0x79ef + .word 0x17f + .word gTasks + .word debug_80C4550+1 + + thumb_func_end debug_80C44EC + + thumb_func_start debug_80C4550 +debug_80C4550: + push {r4, r5, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r1, ._187 + ldrh r2, [r1, #0x2e] + mov r0, #0x1 + and r0, r0, r2 + add r3, r1, #0 + cmp r0, #0 + beq ._185 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r0, ._187 + 4 + ldrb r1, [r0, #0x2] + mov r0, #0x64 + mul r0, r0, r1 + ldr r1, ._187 + 8 + add r0, r0, r1 + ldr r1, ._187 + 12 + bl debug_sub_80A433C + add r0, r4, #0 + bl DestroyTask + b ._209 +._188: + .align 2, 0 +._187: + .word gMain + .word gUnknown_Debug_2038A0C + .word gEnemyParty + .word debug_80C41F4+1 +._185: + mov r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + beq ._189 @cond_branch + ldr r0, ._191 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._191 + 4 + str r0, [r1] + b ._209 +._192: + .align 2, 0 +._191: + .word gTasks + .word debug_80C4F48+1 +._189: + mov r0, #0x8 + and r0, r0, r2 + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + cmp r1, #0 + beq ._193 @cond_branch + bl debug_80C4774 + lsl r0, r0, #0x18 + cmp r0, #0 + beq ._209 @cond_branch + mov r0, #0x5 + bl PlaySE + bl CalculatePlayerPartyCount + bl CalculateEnemyPartyCount + ldr r0, ._196 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._196 + 4 + str r0, [r1] + b ._209 +._197: + .align 2, 0 +._196: + .word gTasks + .word debug_80C4D14+1 +._193: + mov r0, #0x88 + lsl r0, r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + beq ._198 @cond_branch + str r1, [sp] + mov r0, #0x0 + mov r1, #0x10 + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r0, ._200 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._200 + 4 + str r0, [r1] + b ._209 +._201: + .align 2, 0 +._200: + .word gTasks + .word debug_80C4348+1 +._198: + ldrh r1, [r3, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._203 @cond_branch + ldr r1, ._205 + ldrb r0, [r1, #0x2] + cmp r0, #0 + beq ._203 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1, #0x2] + b ._204 +._206: + .align 2, 0 +._205: + .word gUnknown_Debug_2038A0C +._203: + ldrh r1, [r3, #0x30] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._209 @cond_branch + ldr r5, ._210 + ldrb r0, [r5, #0x2] + cmp r0, #0x4 + bhi ._209 @cond_branch + add r1, r0, #0 + mov r0, #0x64 + mul r0, r0, r1 + ldr r1, ._210 + 4 + add r0, r0, r1 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + beq ._209 @cond_branch + ldrb r0, [r5, #0x2] + add r0, r0, #0x1 + strb r0, [r5, #0x2] +._204: + ldr r1, ._210 + 8 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._210 + 12 + str r1, [r0] +._209: + add sp, sp, #0x4 + pop {r4, r5} + pop {r0} + bx r0 +._211: + .align 2, 0 +._210: + .word gUnknown_Debug_2038A0C + .word gEnemyParty + .word gTasks + .word debug_80C44EC+1 + + thumb_func_end debug_80C4550 + + thumb_func_start debug_80C4694 +debug_80C4694: + push {r4, r5, lr} + add sp, sp, #0xffffffe4 + ldr r1, ._213 + mov r0, sp + mov r2, #0xd + bl memcpy + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xe + mov r3, #0xf + bl Menu_DrawStdWindowFrame + mov r0, sp + mov r1, #0x2 + mov r2, #0x1 + bl Menu_PrintText + mov r4, #0x0 + add r5, sp, #0x10 +._212: + mov r0, #0x64 + mul r0, r0, r4 + ldr r1, ._213 + 4 + add r0, r0, r1 + mov r1, #0xb + bl GetMonData + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r5, #0 + bl debug_80C405C + lsl r2, r4, #0x19 + mov r0, #0xc0 + lsl r0, r0, #0x12 + add r2, r2, r0 + lsr r2, r2, #0x18 + add r0, r5, #0 + mov r1, #0x2 + bl Menu_PrintText + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x5 + bls ._212 @cond_branch + add sp, sp, #0x1c + pop {r4, r5} + pop {r0} + bx r0 +._214: + .align 2, 0 +._213: + .word gUnknown_Debug_083F81AD + .word gPlayerParty + + thumb_func_end debug_80C4694 + + thumb_func_start debug_80C4704 +debug_80C4704: + push {r4, r5, lr} + add sp, sp, #0xffffffe4 + ldr r1, ._216 + mov r0, sp + mov r2, #0xd + bl memcpy + mov r0, #0xf + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + mov r0, sp + mov r1, #0x11 + mov r2, #0x1 + bl Menu_PrintText + mov r4, #0x0 + add r5, sp, #0x10 +._215: + mov r0, #0x64 + mul r0, r0, r4 + ldr r1, ._216 + 4 + add r0, r0, r1 + mov r1, #0xb + bl GetMonData + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + add r0, r5, #0 + bl debug_80C405C + lsl r2, r4, #0x19 + mov r0, #0xc0 + lsl r0, r0, #0x12 + add r2, r2, r0 + lsr r2, r2, #0x18 + add r0, r5, #0 + mov r1, #0x11 + bl Menu_PrintText + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x5 + bls ._215 @cond_branch + add sp, sp, #0x1c + pop {r4, r5} + pop {r0} + bx r0 +._217: + .align 2, 0 +._216: + .word gUnknown_Debug_083F81BA + .word gEnemyParty + + thumb_func_end debug_80C4704 + + thumb_func_start debug_80C4774 +debug_80C4774: + push {r4, lr} + ldr r0, ._221 + ldrb r0, [r0, #0xc] + sub r0, r0, #0x1 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0x64 + add r4, r0, #0 + mul r4, r4, r1 + ldr r0, ._221 + 4 + add r0, r4, r0 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + beq ._219 @cond_branch + ldr r0, ._221 + 8 + add r0, r4, r0 + mov r1, #0xb + bl GetMonData + cmp r0, #0 + beq ._219 @cond_branch + mov r0, #0x1 + b ._220 +._222: + .align 2, 0 +._221: + .word gUnknown_Debug_2038A0C + .word gPlayerParty + .word gEnemyParty +._219: + mov r0, #0x0 +._220: + pop {r4} + pop {r1} + bx r1 + + thumb_func_end debug_80C4774 + + thumb_func_start debug_80C47BC +debug_80C47BC: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xffffffc0 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 + ldr r1, ._224 + mov r0, sp + mov r2, #0xf + bl memcpy + add r4, sp, #0x10 + ldr r1, ._224 + 4 + add r0, r4, #0 + mov r2, #0xd + bl memcpy + add r6, sp, #0x20 + ldr r1, ._224 + 8 + add r0, r6, #0 + mov r2, #0xf + bl memcpy + add r5, sp, #0x30 + ldr r1, ._224 + 12 + add r0, r5, #0 + mov r2, #0x10 + bl memcpy + mov r0, #0x0 + mov r1, #0x10 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r0, sp + mov r1, #0x1 + mov r2, #0x11 + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0x14 + mov r2, #0x11 + bl Menu_PrintText + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xe + mov r3, #0xf + bl Menu_DrawStdWindowFrame + add r0, r6, #0 + mov r1, #0x2 + mov r2, #0x1 + bl Menu_PrintText + mov r4, #0x0 + ldr r6, ._224 + 16 +._223: + lsl r0, r4, #0x3 + add r0, r0, r6 + ldr r0, [r0] + lsl r2, r4, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r2, r2, r1 + lsr r2, r2, #0x18 + mov r1, #0x2 + bl Menu_PrintText + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x4 + bls ._223 @cond_branch + mov r0, #0xf + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + add r0, r5, #0 + mov r1, #0x11 + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._224 + 20 + ldrb r0, [r0, #0x4] + bl debug_80C4C44 + ldr r1, ._224 + 24 + lsl r0, r7, #0x2 + add r0, r0, r7 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._224 + 28 + str r1, [r0] + add sp, sp, #0x40 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._225: + .align 2, 0 +._224: + .word gUnknown_Debug_083F81C7 + .word gUnknown_Debug_083F81A0 + .word gUnknown_Debug_083F81D6 + .word gUnknown_Debug_083F81E5 + .word gUnknown_Debug_083F8068 + .word gUnknown_Debug_2038A0C + .word gTasks + .word debug_80C48A0+1 + + thumb_func_end debug_80C47BC + + thumb_func_start debug_80C48A0 +debug_80C48A0: + push {r4, lr} + add sp, sp, #0xfffffffc + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r0, ._226 + ldrb r0, [r0, #0x3] + lsl r0, r0, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r0, r0, r1 + lsr r0, r0, #0x18 + mov r1, #0x1 + str r1, [sp] + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r1, ._226 + 4 + ldr r2, ._226 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + add r2, r2, #0x8 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._226 + 12 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._226 + 16 + str r1, [r0] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._227: + .align 2, 0 +._226: + .word gUnknown_Debug_2038A0C + .word 0x4000042 + .word 0x177 + .word gTasks + .word debug_80C4900+1 + + thumb_func_end debug_80C48A0 + + thumb_func_start debug_80C4900 +debug_80C4900: + push {r4, r5, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + ldr r1, ._230 + ldrh r2, [r1, #0x2e] + mov r0, #0x2 + and r0, r0, r2 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + add r3, r1, #0 + cmp r4, #0 + beq ._228 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + mov r4, #0x0 + str r4, [sp] + mov r1, #0x0 + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r0, ._230 + 4 + bl SetMainCallback2 + bl LoadPlayerParty + ldr r1, ._230 + 8 + ldr r0, ._230 + 12 + ldrb r0, [r0, #0xd] + strb r0, [r1, #0x8] + ldr r0, ._230 + 16 + mov r1, #0x0 + strh r4, [r0] + ldr r0, ._230 + 20 + strb r1, [r0] + ldr r1, ._230 + 24 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._230 + 28 + b ._229 +._231: + .align 2, 0 +._230: + .word gMain + .word debug_80C370C+1 + .word gSaveBlock2 + .word gUnknown_Debug_2038A0C + .word gBattleTypeFlags + .word gUnknown_02023A14_50 + .word gTasks + .word debug_80C373C+1 +._228: + mov r0, #0x8 + and r0, r0, r2 + cmp r0, #0 + bne ._232 @cond_branch + mov r0, #0x1 + and r0, r0, r2 + cmp r0, #0 + beq ._233 @cond_branch +._232: + mov r0, #0x5 + bl PlaySE + ldr r1, ._236 + ldr r3, ._236 + 4 + ldr r2, ._236 + 8 + ldrb r0, [r2, #0x3] + lsl r0, r0, #0x3 + add r0, r0, r3 + ldrb r0, [r0, #0x4] + strh r0, [r1] + ldr r1, ._236 + 12 + mov r0, #0x8 + strb r0, [r1] + ldrb r0, [r2, #0x3] + lsl r0, r0, #0x3 + add r0, r0, r3 + ldrb r0, [r0, #0x5] + strb r0, [r2, #0xc] + ldrb r0, [r2, #0x3] + sub r0, r0, #0x1 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x1 + bhi ._234 @cond_branch + str r4, [sp] + mov r0, #0x0 + mov r1, #0x1 + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r0, ._236 + 16 + lsl r1, r5, #0x2 + add r1, r1, r5 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._236 + 20 + str r0, [r1] + b ._247 +._237: + .align 2, 0 +._236: + .word gBattleTypeFlags + .word gUnknown_Debug_083F8068 + .word gUnknown_Debug_2038A0C + .word gUnknown_02023A14_50 + .word gTasks + .word debug_80C4A60+1 +._234: + ldr r0, ._239 + lsl r1, r5, #0x2 + add r1, r1, r5 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._239 + 4 + str r0, [r1] + b ._247 +._240: + .align 2, 0 +._239: + .word gTasks + .word debug_80C4F48+1 +._233: + ldrh r1, [r3, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._242 @cond_branch + ldr r1, ._244 + ldrb r0, [r1, #0x3] + cmp r0, #0 + beq ._242 @cond_branch + sub r0, r0, #0x1 + b ._243 +._245: + .align 2, 0 +._244: + .word gUnknown_Debug_2038A0C +._242: + ldrh r1, [r3, #0x30] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._247 @cond_branch + ldr r1, ._248 + ldrb r0, [r1, #0x3] + cmp r0, #0x1 + bhi ._247 @cond_branch + add r0, r0, #0x1 +._243: + strb r0, [r1, #0x3] + ldr r1, ._248 + 4 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._248 + 8 +._229: + str r1, [r0] +._247: + add sp, sp, #0x4 + pop {r4, r5} + pop {r0} + bx r0 +._249: + .align 2, 0 +._248: + .word gUnknown_Debug_2038A0C + .word gTasks + .word debug_80C48A0+1 + + thumb_func_end debug_80C4900 + + thumb_func_start debug_80C4A60 +debug_80C4A60: + push {r4, lr} + add sp, sp, #0xfffffffc + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r0, ._250 + ldrb r0, [r0, #0x5] + lsl r0, r0, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r0, r0, r1 + lsr r0, r0, #0x18 + mov r1, #0x1 + str r1, [sp] + mov r1, #0x10 + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r1, ._250 + 4 + ldr r2, ._250 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._250 + 12 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._250 + 16 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._250 + 20 + str r1, [r0] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._251: + .align 2, 0 +._250: + .word gUnknown_Debug_2038A0C + .word 0x4000042 + .word 0x79ef + .word 0x17f + .word gTasks + .word debug_80C4AC4+1 + + thumb_func_end debug_80C4A60 + + thumb_func_start debug_80C4AC4 +debug_80C4AC4: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + ldr r7, ._255 + ldrb r0, [r7, #0x4] + mov ip, r0 + ldrb r5, [r7, #0x5] + mov r1, ip + add r0, r1, r5 + lsl r0, r0, #0x18 + lsr r1, r0, #0x18 + ldr r2, ._255 + 4 + mov r8, r2 + ldrh r2, [r2, #0x2e] + mov r3, #0x1 + and r3, r3, r2 + add r4, r7, #0 + cmp r3, #0 + beq ._252 @cond_branch + ldr r0, ._255 + 8 + lsl r1, r1, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r1, [r1] + ldr r3, ._255 + 12 + ldr r2, [r3] + add r0, r2, #0 + and r0, r0, r1 + cmp r0, #0 + beq ._253 @cond_branch + ldr r0, ._255 + 16 + eor r1, r1, r0 + and r2, r2, r1 + b ._254 +._256: + .align 2, 0 +._255: + .word gUnknown_Debug_2038A0C + .word gMain + .word gUnknown_Debug_083F80D8 + .word byte_3005E30 + .word 0xffff +._253: + orr r2, r2, r1 +._254: + str r2, [r3] + ldrb r0, [r4, #0x4] + bl debug_80C4C44 + ldr r1, ._258 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._258 + 4 + str r1, [r0] + b ._274 +._259: + .align 2, 0 +._258: + .word gTasks + .word debug_80C4A60+1 +._252: + mov r0, #0x2 + and r0, r0, r2 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + cmp r4, #0 + beq ._260 @cond_branch + str r3, [sp] + mov r0, #0x0 + mov r1, #0x10 + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r0, ._262 + lsl r1, r6, #0x2 + add r1, r1, r6 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._262 + 4 + b ._261 +._263: + .align 2, 0 +._262: + .word gTasks + .word debug_80C48A0+1 +._260: + mov r0, #0x8 + and r0, r0, r2 + cmp r0, #0 + beq ._264 @cond_branch + mov r0, #0x5 + bl PlaySE + ldr r1, ._266 + mov r2, #0x80 + lsl r2, r2, #0x3 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._266 + 4 + ldrb r2, [r1, #0x1] + mov r0, #0x11 + neg r0, r0 + and r0, r0, r2 + strb r0, [r1, #0x1] + mov r0, #0xac + strb r0, [r1, #0x2] + mov r0, #0xff + strb r0, [r1, #0x3] + strb r4, [r1, #0x9] + strb r4, [r1, #0xa] + strb r4, [r1, #0xb] + strb r4, [r1, #0xc] + ldr r1, ._266 + 8 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._266 + 12 + str r1, [r0] + b ._274 +._267: + .align 2, 0 +._266: + .word gTrainerBattleOpponent + .word +0x2017000 + .word gTasks + .word debug_80C4F48+1 +._264: + mov r0, r8 + ldrh r1, [r0, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._268 @cond_branch + lsl r0, r5, #0x18 + cmp r0, #0 + beq ._269 @cond_branch + sub r0, r5, #1 + strb r0, [r7, #0x5] + b ._277 +._269: + mov r1, ip + lsl r0, r1, #0x18 + cmp r0, #0 + beq ._277 @cond_branch + mov r0, ip + sub r0, r0, #0x1 + b ._272 +._268: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._274 @cond_branch + lsl r0, r5, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x8 + bhi ._274 @cond_branch + cmp r0, #0x4 + bhi ._275 @cond_branch + add r0, r5, #1 + strb r0, [r7, #0x5] + b ._277 +._275: + mov r2, ip + lsl r0, r2, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x3 + bhi ._277 @cond_branch + mov r0, ip + add r0, r0, #0x1 +._272: + strb r0, [r7, #0x4] + ldrb r0, [r7, #0x4] + bl debug_80C4C44 +._277: + ldr r0, ._278 + lsl r1, r6, #0x2 + add r1, r1, r6 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._278 + 4 +._261: + str r0, [r1] +._274: + add sp, sp, #0x4 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._279: + .align 2, 0 +._278: + .word gTasks + .word debug_80C4A60+1 + + thumb_func_end debug_80C4AC4 + + thumb_func_start debug_80C4C44 +debug_80C4C44: + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xfffffff0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov sl, r0 + mov r2, #0x0 + mov r5, sp +._290: + mov r0, sl + add r6, r2, r0 + add r4, r6, #0 + add r1, r2, #1 + mov r8, r1 + cmp r4, #0x9 + bgt ._280 @cond_branch + mov r3, #0x0 + ldr r1, ._288 + lsl r0, r4, #0x3 + add r0, r0, r1 + ldr r0, [r0] + ldrb r0, [r0] + ldr r7, ._288 + 4 + mov r9, r7 + lsl r2, r2, #0x1 + mov ip, r2 + cmp r0, #0xff + beq ._282 @cond_branch + add r7, r1, #0 +._283: + add r0, r3, #3 + mov r1, sp + add r2, r1, r0 + lsl r1, r6, #0x3 + add r1, r1, r7 + ldr r0, [r1] + add r0, r0, r3 + ldrb r0, [r0] + strb r0, [r2] + add r0, r3, #1 + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 + ldr r0, [r1] + add r0, r0, r3 + ldrb r0, [r0] + cmp r0, #0xff + beq ._282 @cond_branch + cmp r3, #0xb + bls ._283 @cond_branch +._282: + cmp r3, #0xb + bhi ._284 @cond_branch + mov r1, #0x0 +._285: + add r0, r3, #3 + add r0, r0, sp + strb r1, [r0] + add r0, r3, #1 + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 + cmp r3, #0xb + bls ._285 @cond_branch +._284: + mov r0, #0xff + strb r0, [r5, #0xe] + mov r0, #0xfc + strb r0, [r5] + mov r2, #0x1 + strb r2, [r5, #0x1] + add r1, r2, #0 + LSL r1, r4 + mov r3, r9 + ldr r0, [r3] + and r0, r0, r1 + cmp r0, #0 + beq ._286 @cond_branch + mov r0, #0x3 + strb r0, [r5, #0x2] + b ._287 +._289: + .align 2, 0 +._288: + .word gUnknown_Debug_083F80D8 + .word byte_3005E30 +._286: + strb r2, [r5, #0x2] +._287: + mov r2, ip + add r2, r2, #0x3 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + mov r0, sp + mov r1, #0x11 + bl Menu_PrintText +._280: + mov r7, r8 + lsl r0, r7, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x5 + bls ._290 @cond_branch + add sp, sp, #0x10 + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 + + thumb_func_end debug_80C4C44 + + thumb_func_start debug_80C4D14 +debug_80C4D14: + push {r4, r5, r6, lr} + add sp, sp, #0xffffffd0 + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r1, ._291 + mov r0, sp + mov r2, #0xf + bl memcpy + add r5, sp, #0x10 + ldr r1, ._291 + 4 + add r0, r5, #0 + mov r2, #0xd + bl memcpy + add r6, sp, #0x20 + ldr r1, ._291 + 8 + add r0, r6, #0 + mov r2, #0xf + bl memcpy + mov r0, #0x0 + mov r1, #0x10 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r0, sp + mov r1, #0x1 + mov r2, #0x11 + bl Menu_PrintText + add r0, r5, #0 + mov r1, #0x14 + mov r2, #0x11 + bl Menu_PrintText + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xe + mov r3, #0xf + bl Menu_DrawStdWindowFrame + add r0, r6, #0 + mov r1, #0x2 + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._291 + 12 + ldrb r0, [r0, #0x6] + bl debug_80C4F00 + mov r0, #0xf + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r1, ._291 + 16 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._291 + 20 + str r1, [r0] + add sp, sp, #0x30 + pop {r4, r5, r6} + pop {r0} + bx r0 +._292: + .align 2, 0 +._291: + .word gUnknown_Debug_083F81C7 + .word gUnknown_Debug_083F81F5 + .word gUnknown_Debug_083F8202 + .word gUnknown_Debug_2038A0C + .word gTasks + .word debug_80C4DB8+1 + + thumb_func_end debug_80C4D14 + + thumb_func_start debug_80C4DB8 +debug_80C4DB8: + push {r4, lr} + add sp, sp, #0xfffffffc + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r0, ._293 + ldrb r0, [r0, #0x7] + lsl r0, r0, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r0, r0, r1 + lsr r0, r0, #0x18 + mov r1, #0x1 + str r1, [sp] + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r1, ._293 + 4 + ldr r2, ._293 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + add r2, r2, #0x8 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._293 + 12 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._293 + 16 + str r1, [r0] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._294: + .align 2, 0 +._293: + .word gUnknown_Debug_2038A0C + .word 0x4000042 + .word 0x177 + .word gTasks + .word debug_80C4E18+1 + + thumb_func_end debug_80C4DB8 + + thumb_func_start debug_80C4E18 +debug_80C4E18: + push {r4, r5, r6, r7, lr} + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r5, ._297 + ldrb r3, [r5, #0x6] + ldrb r2, [r5, #0x7] + add r0, r3, r2 + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + ldr r7, ._297 + 4 + ldrh r1, [r7, #0x2e] + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._295 @cond_branch + ldr r0, ._297 + 8 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._297 + 12 + b ._296 +._298: + .align 2, 0 +._297: + .word gUnknown_Debug_2038A0C + .word gMain + .word gTasks + .word debug_80C42B8+1 +._295: + mov r0, #0x8 + and r0, r0, r1 + cmp r0, #0 + bne ._299 @cond_branch + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._300 @cond_branch +._299: + mov r0, #0x5 + bl PlaySE + ldr r2, ._302 + ldr r1, ._302 + 4 + lsl r0, r6, #0x3 + add r0, r0, r1 + ldrb r0, [r0, #0x4] + strb r0, [r2] + ldr r1, ._302 + 8 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._302 + 12 + str r1, [r0] + b ._310 +._303: + .align 2, 0 +._302: + .word gBattleTerrain + .word gUnknown_Debug_083F814C + .word gTasks + .word debug_80C5158+1 +._300: + ldrh r1, [r7, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._304 @cond_branch + lsl r0, r2, #0x18 + cmp r0, #0 + beq ._305 @cond_branch + sub r0, r2, #1 + strb r0, [r5, #0x7] + b ._313 +._305: + lsl r0, r3, #0x18 + cmp r0, #0 + beq ._313 @cond_branch + sub r0, r3, #1 + b ._308 +._304: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._310 @cond_branch + lsl r0, r2, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x7 + bhi ._310 @cond_branch + cmp r0, #0x4 + bhi ._311 @cond_branch + add r0, r2, #1 + strb r0, [r5, #0x7] + b ._313 +._311: + lsl r0, r3, #0x18 + lsr r0, r0, #0x18 + cmp r0, #0x2 + bhi ._313 @cond_branch + add r0, r3, #1 +._308: + strb r0, [r5, #0x6] + ldrb r0, [r5, #0x6] + bl debug_80C4F00 +._313: + ldr r0, ._314 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._314 + 4 +._296: + str r0, [r1] +._310: + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._315: + .align 2, 0 +._314: + .word gTasks + .word debug_80C4DB8+1 + + thumb_func_end debug_80C4E18 + + thumb_func_start debug_80C4F00 +debug_80C4F00: + push {r4, r5, r6, lr} + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + mov r0, #0x1 + mov r1, #0x3 + mov r2, #0xd + mov r3, #0xe + bl Menu_BlankWindowRect + mov r4, #0x0 + ldr r6, ._318 +._317: + cmp r4, #0x8 + bhi ._316 @cond_branch + add r0, r4, r5 + lsl r0, r0, #0x3 + add r0, r0, r6 + ldr r0, [r0] + lsl r2, r4, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r2, r2, r1 + lsr r2, r2, #0x18 + mov r1, #0x2 + bl Menu_PrintText +._316: + add r0, r4, #1 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + cmp r4, #0x5 + bls ._317 @cond_branch + pop {r4, r5, r6} + pop {r0} + bx r0 +._319: + .align 2, 0 +._318: + .word gUnknown_Debug_083F814C + + thumb_func_end debug_80C4F00 + + thumb_func_start debug_80C4F48 +debug_80C4F48: + push {r4, r5, r6, lr} + mov r6, r9 + mov r5, r8 + push {r5, r6} + add sp, sp, #0xffffffc4 + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r1, ._320 + mov r0, sp + mov r2, #0x11 + bl memcpy + add r6, sp, #0x14 + ldr r1, ._320 + 4 + add r0, r6, #0 + mov r2, #0xd + bl memcpy + add r5, sp, #0x24 + ldr r1, ._320 + 8 + add r0, r5, #0 + mov r2, #0xd + bl memcpy + add r0, sp, #0x34 + mov r9, r0 + ldr r1, ._320 + 12 + mov r2, #0x4 + bl memcpy + add r0, sp, #0x38 + mov r8, r0 + ldr r1, ._320 + 16 + mov r2, #0x4 + bl memcpy + mov r0, #0x0 + mov r1, #0x10 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r0, sp + mov r1, #0x1 + mov r2, #0x11 + bl Menu_PrintText + add r0, r6, #0 + mov r1, #0x14 + mov r2, #0x11 + bl Menu_PrintText + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0xe + mov r3, #0xf + bl Menu_DrawStdWindowFrame + add r0, r5, #0 + mov r1, #0x2 + mov r2, #0x1 + bl Menu_PrintText + mov r0, #0x1 + mov r1, #0x3 + mov r2, #0xd + mov r3, #0xe + bl Menu_BlankWindowRect + add r0, r5, #0 + mov r1, #0x2 + mov r2, #0x1 + bl Menu_PrintText + mov r0, r9 + mov r1, #0x2 + mov r2, #0x3 + bl Menu_PrintText + mov r0, r8 + mov r1, #0x2 + mov r2, #0x5 + bl Menu_PrintText + mov r0, #0xf + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0xf + bl Menu_DrawStdWindowFrame + ldr r1, ._320 + 20 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._320 + 24 + str r1, [r0] + add sp, sp, #0x3c + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6} + pop {r0} + bx r0 +._321: + .align 2, 0 +._320: + .word gUnknown_Debug_083F8211 + .word gUnknown_Debug_083F81A0 + .word gUnknown_Debug_083F8222 + .word gUnknown_Debug_083F822F + .word gUnknown_Debug_083F8233 + .word gTasks + .word debug_80C5038+1 + + thumb_func_end debug_80C4F48 + + thumb_func_start debug_80C5038 +debug_80C5038: + push {r4, lr} + add sp, sp, #0xfffffffc + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + ldr r0, ._322 + ldrb r0, [r0, #0x8] + lsl r0, r0, #0x19 + mov r1, #0xc0 + lsl r1, r1, #0x12 + add r0, r0, r1 + lsr r0, r0, #0x18 + mov r1, #0x1 + str r1, [sp] + mov r2, #0x1 + mov r3, #0xe + bl debug_80C38E4 + ldr r1, ._322 + 4 + ldr r2, ._322 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + add r2, r2, #0x8 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._322 + 12 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._322 + 16 + str r1, [r0] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._323: + .align 2, 0 +._322: + .word gUnknown_Debug_2038A0C + .word 0x4000042 + .word 0x177 + .word gTasks + .word debug_80C5098+1 + + thumb_func_end debug_80C5038 + + thumb_func_start debug_80C5098 +debug_80C5098: + push {r4, lr} + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + ldr r1, ._326 + ldrh r2, [r1, #0x2e] + mov r0, #0x2 + and r0, r0, r2 + add r3, r1, #0 + cmp r0, #0 + beq ._324 @cond_branch + ldr r0, ._326 + 4 + lsl r1, r4, #0x2 + add r1, r1, r4 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._326 + 8 + str r0, [r1] + b ._339 +._327: + .align 2, 0 +._326: + .word gMain + .word gTasks + .word debug_80C47BC+1 +._324: + mov r0, #0x8 + and r0, r0, r2 + cmp r0, #0 + bne ._328 @cond_branch + mov r0, #0x1 + and r0, r0, r2 + cmp r0, #0 + beq ._329 @cond_branch +._328: + mov r0, #0x5 + bl PlaySE + ldr r1, ._331 + ldr r0, ._331 + 4 + ldrb r0, [r0, #0x8] + strb r0, [r1, #0x8] + ldr r1, ._331 + 8 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._331 + 12 + b ._330 +._332: + .align 2, 0 +._331: + .word gSaveBlock2 + .word gUnknown_Debug_2038A0C + .word gTasks + .word debug_80C42B8+1 +._329: + ldrh r1, [r3, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._334 @cond_branch + ldr r1, ._336 + ldrb r0, [r1, #0x8] + cmp r0, #0 + beq ._334 @cond_branch + sub r0, r0, #0x1 + b ._335 +._337: + .align 2, 0 +._336: + .word gUnknown_Debug_2038A0C +._334: + ldrh r1, [r3, #0x30] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._339 @cond_branch + ldr r1, ._340 + ldrb r0, [r1, #0x8] + cmp r0, #0 + bne ._339 @cond_branch + add r0, r0, #0x1 +._335: + strb r0, [r1, #0x8] + ldr r1, ._340 + 4 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._340 + 8 +._330: + str r1, [r0] +._339: + pop {r4} + pop {r0} + bx r0 +._341: + .align 2, 0 +._340: + .word gUnknown_Debug_2038A0C + .word gTasks + .word debug_80C5038+1 + + thumb_func_end debug_80C5098 + + thumb_func_start debug_80C5158 +debug_80C5158: + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._342 + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r0, ._342 + 4 + str r0, [r1] + bx lr +._343: + .align 2, 0 +._342: + .word gTasks + .word debug_80C5174+1 + + thumb_func_end debug_80C5158 + + thumb_func_start debug_80C5174 +debug_80C5174: + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._344 + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r0, ._344 + 4 + str r0, [r1] + bx lr +._345: + .align 2, 0 +._344: + .word gTasks + .word debug_80C5190+1 + + thumb_func_end debug_80C5174 + + thumb_func_start debug_80C5190 +debug_80C5190: + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._346 + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r0, ._346 + 4 + str r0, [r1] + bx lr +._347: + .align 2, 0 +._346: + .word gTasks + .word debug_80C51AC+1 + + thumb_func_end debug_80C5190 + + thumb_func_start debug_80C51AC +debug_80C51AC: + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._348 + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r0, ._348 + 4 + str r0, [r1] + bx lr +._349: + .align 2, 0 +._348: + .word gTasks + .word debug_80C51C8+1 + + thumb_func_end debug_80C51AC + + thumb_func_start debug_80C51C8 +debug_80C51C8: + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._350 + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r0, ._350 + 4 + str r0, [r1] + bx lr +._351: + .align 2, 0 +._350: + .word gTasks + .word debug_80C51E4+1 + + thumb_func_end debug_80C51C8 + + thumb_func_start debug_80C51E4 +debug_80C51E4: + push {lr} + bl sub_80408BC + ldr r0, ._352 + ldr r1, ._352 + 4 + str r1, [r0, #0x8] + ldr r0, ._352 + 8 + bl SetMainCallback2 + pop {r0} + bx r0 +._353: + .align 2, 0 +._352: + .word gMain + .word debug_80C41A8+1 + .word unref_sub_800D684+1 + + thumb_func_end debug_80C51E4 + + thumb_func_start debug_80C5208 +debug_80C5208: + push {r4, r5, r6, lr} + ldr r1, ._355 + ldr r0, ._355 + 4 + str r0, [r1] + mov r3, #0x0 + add r6, r1, #0 + ldr r4, ._355 + 8 + add r5, r6, #0 + mov r2, #0x0 +._354: + ldr r0, [r5] + lsl r1, r3, #0x2 + add r0, r0, #0x64 + add r0, r0, r1 + str r2, [r0] + add r0, r3, #1 + lsl r0, r0, #0x10 + lsr r3, r0, #0x10 + cmp r3, #0x3f + bls ._354 @cond_branch + ldr r2, [r6] + mov r0, #0xfc + str r0, [r2, #0x64] + ldrb r1, [r4, #0xa] + ldrb r0, [r4, #0xb] + lsl r0, r0, #0x8 + orr r1, r1, r0 + ldrb r0, [r4, #0xc] + lsl r0, r0, #0x10 + orr r1, r1, r0 + ldrb r0, [r4, #0xd] + lsl r0, r0, #0x18 + orr r1, r1, r0 + str r1, [r2, #0x70] + bl Random + add r4, r0, #0 + bl Random + ldr r1, [r6] + lsl r4, r4, #0x10 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + orr r4, r4, r0 + str r4, [r1, #0x74] + mov r0, #0x1 + str r0, [r1, #0x68] + str r0, [r1, #0x6c] + bl debug_80C5C94 + pop {r4, r5, r6} + pop {r0} + bx r0 +._356: + .align 2, 0 +._355: + .word gUnknown_Debug_2038A1C + .word +0x2018000 + .word gSaveBlock2 + + thumb_func_end debug_80C5208 + + thumb_func_start debug_80C527C +debug_80C527C: + push {r4, r5, r6, r7, lr} + add r6, r0, #0 + mov r5, #0x0 + ldr r7, ._359 +._361: + mov r0, #0x64 + add r1, r5, #0 + mul r1, r1, r0 + ldr r0, ._359 + 4 + add r4, r1, r0 + add r0, r4, #0 + mov r1, #0xb + mov r2, #0x0 + bl GetMonData + cmp r0, #0 + bne ._357 @cond_branch + add r0, r4, #0 + add r1, r6, #0 + mov r2, #0x64 + bl memcpy + add r0, r5, #1 + strb r0, [r7] + mov r0, #0x0 + b ._358 +._360: + .align 2, 0 +._359: + .word gPlayerPartyCount + .word gPlayerParty +._357: + add r0, r5, #1 + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + cmp r5, #0x5 + bls ._361 @cond_branch + ldr r0, ._362 + ldr r0, [r0] + bl SendMonToPC + mov r0, #0x1 +._358: + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._363: + .align 2, 0 +._362: + .word gUnknown_Debug_2038A1C + + thumb_func_end debug_80C527C + + thumb_func_start InitCreatePokemon +InitCreatePokemon: + push {r4, r5, lr} + add sp, sp, #0xffffffd4 + ldr r1, ._364 + add r0, sp, #0x4 + mov r2, #0x25 + bl memcpy + bl debug_80C35DC + mov r0, #0x1 + neg r0, r0 + mov r4, #0x0 + str r4, [sp] + mov r1, #0x0 + mov r2, #0x10 + mov r3, #0x0 + bl BeginNormalPaletteFade + ldr r0, ._364 + 4 + mov r5, #0x0 + strh r4, [r0] + add r0, r0, #0x2 + strh r4, [r0] + add r0, r0, #0x2 + strh r4, [r0] + ldr r3, ._364 + 8 + ldrh r2, [r3] + strh r4, [r3] + ldr r4, ._364 + 12 + ldrh r0, [r4] + mov r1, #0x1 + orr r0, r0, r1 + strh r0, [r4] + strh r2, [r3] + ldr r2, ._364 + 16 + ldrh r0, [r2] + mov r1, #0x8 + orr r0, r0, r1 + strh r0, [r2] + ldr r0, ._364 + 20 + bl SetVBlankCallback + ldr r0, ._364 + 24 + bl SetMainCallback2 + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x3 + bl Menu_DrawStdWindowFrame + add r0, sp, #0x4 + mov r1, #0x1 + mov r2, #0x1 + bl Menu_PrintText + mov r1, #0x80 + lsl r1, r1, #0x13 + mov r2, #0x8a + lsl r2, r2, #0x5 + add r0, r2, #0 + strh r0, [r1] + ldr r0, ._364 + 28 + mov r1, #0x0 + bl CreateTask + bl debug_80C5208 + ldr r1, ._364 + 32 + ldr r0, [r1] + mov r2, #0xb4 + lsl r2, r2, #0x1 + add r0, r0, r2 + strb r5, [r0] + ldr r0, [r1] + ldr r1, ._364 + 36 + add r0, r0, r1 + strb r5, [r0] + add sp, sp, #0x2c + pop {r4, r5} + pop {r0} + bx r0 +._365: + .align 2, 0 +._364: + .word gUnknown_Debug_083F8733 + .word 0x4000050 + .word 0x4000208 + .word 0x4000200 + .word 0x4000004 + .word debug_80C3758+1 + .word debug_80C370C+1 + .word debug_80C53A4+1 + .word gUnknown_Debug_2038A1C + .word 0x169 + + thumb_func_end InitCreatePokemon + + thumb_func_start debug_80C53A4 +debug_80C53A4: + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + ldr r2, ._366 + lsl r1, r0, #0x2 + add r1, r1, r0 + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r0, ._366 + 4 + str r0, [r1] + bx lr +._367: + .align 2, 0 +._366: + .word gTasks + .word debug_80C53C0+1 + + thumb_func_end debug_80C53A4 + + thumb_func_start debug_80C53C0 +debug_80C53C0: + push {r4, lr} + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + bl debug_80C6384 + mov r0, #0x0 + bl debug_80C627C + ldr r1, ._368 + lsl r0, r4, #0x2 + add r0, r0, r4 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._368 + 4 + str r1, [r0] + pop {r4} + pop {r0} + bx r0 +._369: + .align 2, 0 +._368: + .word gTasks + .word debug_80C53F0+1 + + thumb_func_end debug_80C53C0 + + thumb_func_start debug_80C53F0 +debug_80C53F0: + push {r4, r5, r6, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r5, r0, #0x18 + ldr r0, ._372 + ldrh r1, [r0, #0x2e] + mov r2, #0x1 + and r2, r2, r1 + add r4, r0, #0 + cmp r2, #0 + beq ._370 @cond_branch + ldr r0, ._372 + 4 + ldr r3, [r0] + mov r0, #0xb2 + lsl r0, r0, #0x1 + add r2, r3, r0 + ldr r1, ._372 + 8 + mov r4, #0xb4 + lsl r4, r4, #0x1 + add r0, r3, r4 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r6, ._372 + 12 + add r1, r3, r6 + ldrb r1, [r1] + ldr r0, [r0] + add r0, r0, r1 + ldrb r1, [r0] + lsl r1, r1, #0x2 + add r0, r3, #0 + add r0, r0, #0x64 + add r0, r0, r1 + ldr r0, [r0] + str r0, [r2] + mov r0, #0xb5 + lsl r0, r0, #0x1 + add r1, r3, r0 + mov r0, #0x0 + strb r0, [r1] + bl debug_80C643C + ldr r1, ._372 + 16 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._372 + 20 + b ._375 +._373: + .align 2, 0 +._372: + .word gMain + .word gUnknown_Debug_2038A1C + .word gUnknown_Debug_083F8698 + .word 0x169 + .word gTasks + .word debug_80C55E4+1 +._370: + mov r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._374 @cond_branch + mov r0, #0x1 + neg r0, r0 + str r2, [sp] + mov r1, #0x0 + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r0, ._376 + bl SetMainCallback2 + ldr r1, ._376 + 4 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._376 + 8 + b ._375 +._377: + .align 2, 0 +._376: + .word debug_80C370C+1 + .word gTasks + .word debug_80C373C+1 +._374: + mov r0, #0x8 + and r0, r0, r1 + cmp r0, #0 + beq ._378 @cond_branch + mov r0, #0x5 + bl PlaySE + bl debug_80C5FFC + ldr r0, ._381 + ldr r0, [r0] + bl debug_80C527C + add r4, r0, #0 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + mov r0, #0x3 + mov r1, #0x8 + mov r2, #0x1a + mov r3, #0xb + bl Menu_DrawStdWindowFrame + cmp r4, #0 + beq ._379 @cond_branch + ldr r0, ._381 + 4 + mov r1, #0x4 + mov r2, #0x9 + bl Menu_PrintText + b ._380 +._382: + .align 2, 0 +._381: + .word gUnknown_Debug_2038A1C + .word gUnknown_Debug_083F872A +._379: + ldr r0, ._384 + mov r1, #0x4 + mov r2, #0x9 + bl Menu_PrintText +._380: + ldr r0, ._384 + 4 + lsl r1, r5, #0x2 + add r1, r1, r5 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._384 + 8 + str r0, [r1] + b ._400 +._385: + .align 2, 0 +._384: + .word gUnknown_Debug_083F8720 + .word gTasks + .word debug_80C5708+1 +._378: + mov r0, #0x4 + and r0, r0, r1 + cmp r0, #0 + beq ._386 @cond_branch + ldr r0, ._388 + ldr r0, [r0] + ldr r4, [r0, #0x64] + lsl r4, r4, #0x10 + lsr r4, r4, #0x10 + add r0, r4, #0 + mov r1, #0x2 + bl GetSetPokedexFlag + add r0, r4, #0 + mov r1, #0x3 + bl GetSetPokedexFlag + mov r0, #0x5 + bl PlaySE + b ._400 +._389: + .align 2, 0 +._388: + .word gUnknown_Debug_2038A1C +._386: + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._390 @cond_branch + mov r0, #0x2 + bl debug_80C627C + b ._400 +._390: + mov r0, #0x80 + and r0, r0, r1 + lsl r0, r0, #0x10 + lsr r3, r0, #0x10 + cmp r3, #0 + beq ._392 @cond_branch + mov r0, #0x1 + bl debug_80C627C + b ._400 +._392: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._395 @cond_branch + ldr r2, ._397 + ldr r0, [r2] + mov r6, #0xb4 + lsl r6, r6, #0x1 + add r1, r0, r6 + ldrb r0, [r1] + cmp r0, #0 + beq ._395 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] + ldr r0, [r2] + ldr r1, ._397 + 4 + add r0, r0, r1 + strb r3, [r0] + b ._396 +._398: + .align 2, 0 +._397: + .word gUnknown_Debug_2038A1C + .word 0x169 +._395: + ldrh r1, [r4, #0x2e] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._400 @cond_branch + ldr r3, ._401 + ldr r0, [r3] + mov r4, #0xb4 + lsl r4, r4, #0x1 + add r2, r0, r4 + ldrb r0, [r2] + cmp r0, #0x4 + bhi ._400 @cond_branch + add r0, r0, #0x1 + mov r1, #0x0 + strb r0, [r2] + ldr r0, [r3] + ldr r6, ._401 + 4 + add r0, r0, r6 + strb r1, [r0] +._396: + ldr r1, ._401 + 8 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._401 + 12 +._375: + str r1, [r0] +._400: + add sp, sp, #0x4 + pop {r4, r5, r6} + pop {r0} + bx r0 +._402: + .align 2, 0 +._401: + .word gUnknown_Debug_2038A1C + .word 0x169 + .word gTasks + .word debug_80C53C0+1 + + thumb_func_end debug_80C53F0 + + thumb_func_start debug_80C55E4 +debug_80C55E4: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 + add r6, r3, #0 + ldr r1, ._405 + ldr r2, ._405 + 4 + ldr r0, [r2] + mov ip, r0 + mov r0, #0xb4 + lsl r0, r0, #0x1 + add r0, r0, ip + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._405 + 8 + add r1, r1, ip + ldrb r1, [r1] + ldr r0, [r0] + add r0, r0, r1 + ldrb r5, [r0] + add r7, r5, #0 + ldr r1, ._405 + 12 + ldrh r4, [r1, #0x2e] + mov r0, #0x1 + and r0, r0, r4 + mov r8, r2 + add r2, r1, #0 + cmp r0, #0 + beq ._403 @cond_branch + ldr r0, ._405 + 16 + lsl r1, r3, #0x2 + add r1, r1, r3 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._405 + 20 + str r0, [r1] + b ._422 +._406: + .align 2, 0 +._405: + .word gUnknown_Debug_083F8698 + .word gUnknown_Debug_2038A1C + .word 0x169 + .word gMain + .word gTasks + .word debug_80C53C0+1 +._403: + mov r0, #0x2 + and r0, r0, r4 + cmp r0, #0 + beq ._407 @cond_branch + lsl r1, r5, #0x2 + mov r0, ip + add r0, r0, #0x64 + add r0, r0, r1 + mov r1, #0xb2 + lsl r1, r1, #0x1 + add r1, r1, ip + ldr r1, [r1] + str r1, [r0] + ldr r1, ._409 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._409 + 4 + str r1, [r0] + b ._422 +._410: + .align 2, 0 +._409: + .word gTasks + .word debug_80C53C0+1 +._407: + ldrh r1, [r2, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._411 @cond_branch + mov r0, #0x1 + b ._412 +._411: + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._413 @cond_branch + mov r0, #0x2 +._412: + bl debug_80C6544 + bl debug_80C643C + b ._422 +._413: + ldr r0, ._419 + lsl r1, r7, #0x3 + add r0, r0, #0x4 + add r1, r1, r0 + ldr r1, [r1] + ldrb r0, [r1, #0x9] + cmp r0, #0xff + beq ._422 @cond_branch + mov r0, #0x20 + and r0, r0, r4 + cmp r0, #0 + beq ._417 @cond_branch + mov r0, #0xb5 + lsl r0, r0, #0x1 + add ip, ip, r0 + mov r0, ip + ldrb r3, [r0] + ldrb r0, [r1, #0x9] + sub r0, r0, #0x1 + cmp r3, r0 + bge ._417 @cond_branch + add r0, r3, #1 + mov r1, ip + strb r0, [r1] + bl debug_80C643C + b ._422 +._420: + .align 2, 0 +._419: + .word gUnknown_Debug_083F8554 +._417: + ldrh r1, [r2, #0x2e] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._422 @cond_branch + mov r2, r8 + ldr r0, [r2] + mov r2, #0xb5 + lsl r2, r2, #0x1 + add r1, r0, r2 + ldrb r0, [r1] + cmp r0, #0 + beq ._422 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1] + bl debug_80C643C +._422: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 + + thumb_func_end debug_80C55E4 + + thumb_func_start debug_80C5708 +debug_80C5708: + push {lr} + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + ldr r0, ._424 + ldrh r1, [r0, #0x2e] + mov r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._423 @cond_branch + ldr r0, ._424 + 4 + lsl r1, r2, #0x2 + add r1, r1, r2 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._424 + 8 + str r0, [r1] +._423: + pop {r0} + bx r0 +._425: + .align 2, 0 +._424: + .word gMain + .word gTasks + .word debug_80C53C0+1 + + thumb_func_end debug_80C5708 + + thumb_func_start debug_80C5738 +debug_80C5738: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + add r6, r0, #0 + lsl r1, r1, #0x18 + lsr r4, r1, #0x18 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + mov r8, r2 + cmp r4, #0xfe + bne ._426 @cond_branch + ldr r1, ._428 + mov r2, #0x7 + bl debug_80C689C + add r0, r6, #7 + ldr r7, ._428 + 4 + ldr r1, [r7] + add r1, r1, #0xf0 + ldr r1, [r1] + mov r2, #0x3 + mov r3, #0x1 + bl debug_80C6678 + mov r4, #0x0 + strb r4, [r6, #0x13] + strb r4, [r6, #0x14] + add r0, r6, #0 + add r0, r0, #0x15 + ldr r1, ._428 + 8 + mov r2, #0x7 + bl debug_80C689C + add r0, r6, #0 + add r0, r0, #0x1c + ldr r1, [r7] + add r1, r1, #0xf4 + ldr r1, [r1] + mov r2, #0x3 + mov r3, #0x1 + bl debug_80C6678 + add r0, r6, #0 + add r0, r0, #0x28 + strb r4, [r0] + add r0, r0, #0x1 + strb r4, [r0] + add r0, r0, #0x1 + ldr r1, ._428 + 12 + mov r2, #0x9 + bl debug_80C689C + add r0, r6, #0 + add r0, r0, #0x31 + ldr r1, [r7] + add r1, r1, #0xf8 +._431: + ldr r1, [r1] + mov r2, #0x3 + mov r3, #0x1 + bl debug_80C6678 + b ._517 +._429: + .align 2, 0 +._428: + .word gUnknown_Debug_083F850A + .word gUnknown_Debug_2038A1C + .word gUnknown_Debug_083F8514 + .word gUnknown_Debug_083F851C +._426: + cmp r4, #0xfd + bne ._430 @cond_branch + ldr r1, ._432 + add r0, r6, #0 + mov r2, #0x9 + bl debug_80C689C + add r0, r6, #0 + add r0, r0, #0x9 + ldr r7, ._432 + 4 + ldr r1, [r7] + add r1, r1, #0xfc + ldr r1, [r1] + mov r2, #0x3 + mov r3, #0x1 + bl debug_80C6678 + mov r4, #0x0 + strb r4, [r6, #0x15] + strb r4, [r6, #0x16] + add r0, r6, #0 + add r0, r0, #0x17 + ldr r1, ._432 + 8 + mov r2, #0x9 + bl debug_80C689C + add r0, r6, #0 + add r0, r0, #0x20 + ldr r1, [r7] + mov r2, #0x80 + lsl r2, r2, #0x1 + add r1, r1, r2 + ldr r1, [r1] + mov r2, #0x3 + mov r3, #0x1 + bl debug_80C6678 + add r0, r6, #0 + add r0, r0, #0x2c + strb r4, [r0] + add r0, r0, #0x1 + strb r4, [r0] + add r0, r0, #0x1 + ldr r1, ._432 + 12 + mov r2, #0x9 + bl debug_80C689C + add r0, r6, #0 + add r0, r0, #0x37 + ldr r1, [r7] + mov r3, #0x82 + lsl r3, r3, #0x1 + add r1, r1, r3 + b ._431 +._433: + .align 2, 0 +._432: + .word gUnknown_Debug_083F8524 + .word gUnknown_Debug_2038A1C + .word gUnknown_Debug_083F852D + .word gUnknown_Debug_083F8537 +._430: + mov r1, #0x0 + lsl r5, r4, #0x3 + mov r2, #0x0 +._434: + add r0, r6, r1 + strb r2, [r0] + add r0, r1, #1 + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + cmp r1, #0xb + bls ._434 @cond_branch + ldr r0, ._437 + add r0, r5, r0 + ldr r1, [r0] + add r0, r6, #0 + mov r2, #0xb + bl debug_80C689C + mov r1, #0xc + mov r2, #0xff +._435: + add r0, r6, r1 + strb r2, [r0] + add r0, r1, #1 + lsl r0, r0, #0x10 + lsr r1, r0, #0x10 + cmp r1, #0xff + bls ._435 @cond_branch + ldr r0, ._437 + add r0, r0, #0x4 + add r0, r5, r0 + ldr r0, [r0] + ldrb r2, [r0, #0x9] + lsl r0, r2, #0x1a + lsr r5, r0, #0x18 + cmp r4, #0x22 + bhi ._436 @cond_branch + lsl r0, r4, #0x2 + ldr r1, ._437 + 4 + add r1, r0, r1 + ldr r1, [r1] + add r7, r0, #0 + mov pc, r1 +._438: + .align 2, 0 +._437: + .word gUnknown_Debug_083F8554 + .word ._439 +._439: + .word ._440 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._445 + .word ._446 + .word ._450 + .word ._450 + .word ._450 + .word ._450 + .word ._451 + .word ._452 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._472 + .word ._473 + .word ._474 +._436: + mov r0, #0xff + strb r0, [r6] + b ._517 +._440: + add r0, r6, #0 + add r0, r0, #0xa + ldr r1, ._477 + mov r9, r1 + ldr r1, [r1] + add r1, r1, #0x64 + add r1, r1, r7 + ldr r1, [r1] + mov r3, r8 + bl debug_80C6678 + add r1, r5, r6 + mov r0, #0x0 + strb r0, [r1, #0xa] + mov r0, #0xfc + strb r0, [r1, #0xb] + mov r0, #0x1 + strb r0, [r1, #0xc] + mov r2, r8 + strb r2, [r1, #0xd] + add r4, r5, #0 + add r4, r4, #0xe + add r4, r6, r4 + mov r3, r9 + ldr r0, [r3] + add r0, r0, #0x64 + add r0, r0, r7 + ldrh r0, [r0] + bl NationalPokedexNumToSpecies + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r1, #0xb + mul r1, r1, r0 + ldr r0, ._477 + 4 + add r1, r1, r0 + add r0, r4, #0 + mov r2, #0xa + bl debug_80C689C + b ._517 +._478: + .align 2, 0 +._477: + .word gUnknown_Debug_2038A1C + .word gSpeciesNames +._445: + ldr r0, ._483 + ldr r0, [r0] + add r0, r0, #0x64 + add r0, r0, r7 + ldr r0, [r0] + cmp r0, #0x1 + beq ._479 @cond_branch + cmp r0, #0x1 + bcc ._480 @cond_branch + cmp r0, #0x2 + beq ._481 @cond_branch + b ._517 +._484: + .align 2, 0 +._483: + .word gUnknown_Debug_2038A1C +._480: + add r0, r6, #0 + add r0, r0, #0xa + ldr r1, ._486 + b ._488 +._487: + .align 2, 0 +._486: + .word gUnknown_Debug_083F8546 +._479: + add r0, r6, #0 + add r0, r0, #0xa + ldr r1, ._489 + b ._488 +._490: + .align 2, 0 +._489: + .word gUnknown_Debug_083F8541 +._481: + add r0, r6, #0 + add r0, r0, #0xa + ldr r1, ._492 +._488: + mov r2, #0x2 + bl debug_80C689C + b ._517 +._493: + .align 2, 0 +._492: + .word gUnknown_Debug_083F8544 +._450: + add r0, r6, #0 + add r0, r0, #0xa + ldr r4, ._495 + ldr r1, [r4] + add r1, r1, #0x64 + add r1, r1, r7 + ldr r1, [r1] + mov r3, r8 + bl debug_80C6678 + add r1, r5, r6 + mov r0, #0x0 + strb r0, [r1, #0xa] + mov r0, #0xfc + strb r0, [r1, #0xb] + mov r0, #0x1 + strb r0, [r1, #0xc] + mov r0, r8 + strb r0, [r1, #0xd] + add r0, r5, #0 + add r0, r0, #0xe + add r0, r6, r0 + ldr r1, [r4] + add r1, r1, #0x64 + add r1, r1, r7 + ldr r2, [r1] + mov r1, #0xd + mul r1, r1, r2 + ldr r2, ._495 + 4 + add r1, r1, r2 + b ._494 +._496: + .align 2, 0 +._495: + .word gUnknown_Debug_2038A1C + .word gMoveNames +._451: + add r0, r6, #0 + add r0, r0, #0xa + ldr r4, ._499 + ldr r1, [r4] + add r1, r1, #0x64 + add r1, r1, r7 + ldr r1, [r1] + mov r3, r8 + bl debug_80C6678 + add r1, r5, r6 + mov r0, #0x0 + strb r0, [r1, #0xa] + mov r0, #0xfc + strb r0, [r1, #0xb] + mov r0, #0x1 + strb r0, [r1, #0xc] + mov r2, r8 + strb r2, [r1, #0xd] + ldr r0, [r4] + add r0, r0, #0x64 + add r0, r0, r7 + ldr r0, [r0] + cmp r0, #0 + beq ._497 @cond_branch + add r4, r5, #0 + add r4, r4, #0xe + add r4, r6, r4 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl ItemId_GetItem + add r1, r0, #0 + add r0, r4, #0 + b ._498 +._500: + .align 2, 0 +._499: + .word gUnknown_Debug_2038A1C +._497: + add r0, r5, #0 + add r0, r0, #0xe + add r0, r6, r0 + ldr r1, ._502 +._498: + mov r2, #0x9 + bl debug_80C689C + b ._517 +._503: + .align 2, 0 +._502: + .word gUnknown_Debug_083F8541 +._452: + add r6, r6, #0xc + ldr r4, ._505 + ldr r0, [r4] + ldr r0, [r0, #0x64] + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl NationalPokedexNumToSpecies + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + ldr r1, [r4] + add r1, r1, #0x64 + add r1, r1, r7 + ldrb r1, [r1] + bl GetAbilityBySpecies + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r1, #0xd + mul r1, r1, r0 + ldr r0, ._505 + 4 + add r1, r1, r0 + add r0, r6, #0 +._494: + mov r2, #0xc + bl debug_80C689C + b ._517 +._506: + .align 2, 0 +._505: + .word gUnknown_Debug_2038A1C + .word gAbilityNames +._474: + add r0, r6, #0 + add r0, r0, #0xa + ldr r2, ._508 + ldr r1, ._508 + 4 + ldr r1, [r1] + add r1, r1, #0x64 + add r1, r1, r7 + ldr r1, [r1] + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r1, [r1] + b ._514 +._509: + .align 2, 0 +._508: + .word gUnknown_Debug_083F86E8 + .word gUnknown_Debug_2038A1C +._472: + add r0, r6, #0 + add r0, r0, #0xc + ldr r1, ._511 + ldr r1, [r1] + add r1, r1, #0x64 + add r1, r1, r7 + ldr r1, [r1] + mov r3, r8 + bl debug_80C6678 + b ._517 +._512: + .align 2, 0 +._511: + .word gUnknown_Debug_2038A1C +._473: + ldr r0, ._515 + ldr r0, [r0] + add r0, r0, #0x64 + add r0, r0, r7 + ldr r0, [r0] + cmp r0, #0 + beq ._513 @cond_branch + add r0, r6, #0 + add r0, r0, #0xa + ldr r1, ._515 + 4 + b ._514 +._516: + .align 2, 0 +._515: + .word gUnknown_Debug_2038A1C + .word gUnknown_Debug_083F854A +._513: + add r0, r6, #0 + add r0, r0, #0xa + ldr r1, ._518 +._514: + mov r2, #0x4 + bl debug_80C689C + b ._517 +._519: + .align 2, 0 +._518: + .word gUnknown_Debug_083F854D +._446: + add r0, r6, #0 + add r0, r0, #0xa + ldr r2, ._520 + ldr r1, ._520 + 4 + ldr r1, [r1] + add r1, r1, #0x64 + add r1, r1, r7 + ldr r1, [r1] + lsl r1, r1, #0x2 + add r1, r1, r2 + ldr r1, [r1] + mov r2, #0x5 + bl debug_80C689C +._517: + mov r0, #0x0 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r1} + bx r1 +._521: + .align 2, 0 +._520: + .word gNatureNames + .word gUnknown_Debug_2038A1C + + thumb_func_end debug_80C5738 + + thumb_func_start debug_80C5B60 +debug_80C5B60: + lsl r0, r0, #0x18 + ldr r1, ._522 + ldr r1, [r1] + lsr r0, r0, #0x16 + add r1, r1, #0x64 + add r1, r1, r0 + ldr r0, [r1] + bx lr +._523: + .align 2, 0 +._522: + .word gUnknown_Debug_2038A1C + + thumb_func_end debug_80C5B60 + + thumb_func_start debug_80C5B74 +debug_80C5B74: + push {r4, r5, r6, lr} + add r6, r0, #0 + lsl r1, r1, #0x18 + lsr r2, r1, #0x18 + cmp r2, #0x18 + bhi ._540 @cond_branch + lsl r0, r2, #0x2 + ldr r1, ._526 + add r1, r0, r1 + ldr r1, [r1] + add r3, r0, #0 + mov pc, r1 +._527: + .align 2, 0 +._526: + .word ._525 +._525: + .word ._532 + .word ._529 + .word ._530 + .word ._532 + .word ._532 + .word ._540 + .word ._540 + .word ._540 + .word ._540 + .word ._540 + .word ._540 + .word ._540 + .word ._540 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 + .word ._552 +._540: + ldr r0, ._554 + ldr r0, [r0] + lsl r1, r2, #0x2 + add r0, r0, #0x64 + add r0, r0, r1 + str r6, [r0] + b ._562 +._555: + .align 2, 0 +._554: + .word gUnknown_Debug_2038A1C +._532: + ldr r0, ._557 + ldr r0, [r0] + add r0, r0, #0x64 + add r0, r0, r3 + str r6, [r0] + bl debug_80C5C94 + b ._562 +._558: + .align 2, 0 +._557: + .word gUnknown_Debug_2038A1C +._529: + ldr r4, ._560 + ldr r1, [r4] + add r0, r1, #0 + add r0, r0, #0x64 + add r0, r0, r3 + str r6, [r0] + ldr r0, [r1, #0x64] + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl NationalPokedexNumToSpecies + ldr r5, [r4] + ldr r4, ._560 + 4 + lsl r2, r6, #0x2 + ldr r3, ._560 + 8 + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + lsl r1, r0, #0x3 + sub r1, r1, r0 + lsl r1, r1, #0x2 + add r1, r1, r3 + ldrb r1, [r1, #0x13] + mov r0, #0xca + lsl r0, r0, #0x1 + mul r0, r0, r1 + add r2, r2, r0 + add r2, r2, r4 + ldr r0, [r2] + str r0, [r5, #0x6c] + bl debug_80C5C94 + b ._562 +._561: + .align 2, 0 +._560: + .word gUnknown_Debug_2038A1C + .word gExperienceTables + .word gBaseStats +._530: + ldr r0, ._563 + ldr r0, [r0] + add r0, r0, #0x64 + add r0, r0, r3 + str r6, [r0] + bl debug_80C5DEC + b ._562 +._564: + .align 2, 0 +._563: + .word gUnknown_Debug_2038A1C +._552: + ldr r0, ._565 + ldr r0, [r0] + add r0, r0, #0x64 + add r0, r0, r3 + str r6, [r0] + bl debug_80C5EF4 +._562: + pop {r4, r5, r6} + pop {r0} + bx r0 +._566: + .align 2, 0 +._565: + .word gUnknown_Debug_2038A1C + + thumb_func_end debug_80C5B74 + + thumb_func_start debug_80C5C94 +debug_80C5C94: + push {r4, r5, r6, lr} + add sp, sp, #0xfffffff0 + ldr r6, ._567 + ldr r2, [r6] + add r0, r2, #0 + add r0, r0, #0x98 + ldr r4, [r0] + mov r1, #0x1f + and r4, r4, r1 + add r0, r0, #0x8 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0x5 + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xa8 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0xa + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xb0 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0xf + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xb8 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0x14 + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xc0 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0x19 + orr r4, r4, r0 + ldr r0, [r2, #0x64] + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl NationalPokedexNumToSpecies + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + ldr r0, [r6] + ldr r2, [r0, #0x68] + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + mov r5, #0x1 + str r5, [sp] + ldr r3, [r0, #0x74] + str r3, [sp, #0x4] + str r5, [sp, #0x8] + ldr r3, [r0, #0x70] + str r3, [sp, #0xc] + add r3, r4, #0 + bl CreateMon + ldr r0, [r6] + bl GetMonGender + ldr r1, [r6] + add r0, r0, #0x2 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + str r0, [r1, #0x78] + add r0, r1, #0 + bl GetNature + ldr r1, [r6] + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + str r0, [r1, #0x7c] + add r0, r1, #0 + mov r1, #0xd + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0x80 + str r2, [r1] + mov r1, #0xe + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0x84 + str r2, [r1] + mov r1, #0xf + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0x88 + str r2, [r1] + mov r1, #0x10 + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0x8c + str r2, [r1] + mov r1, #0x19 + bl GetMonData + add r1, r0, #0 + ldr r0, [r6] + str r1, [r0, #0x6c] + mov r1, #0x3a + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0xf0 + str r2, [r1] + mov r1, #0x3b + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0xf4 + str r2, [r1] + mov r1, #0x3c + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0xf8 + str r2, [r1] + mov r1, #0x3d + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + add r1, r0, #0 + add r1, r1, #0xfc + str r2, [r1] + mov r1, #0x3e + bl GetMonData + add r2, r0, #0 + ldr r0, [r6] + mov r3, #0x80 + lsl r3, r3, #0x1 + add r1, r0, r3 + str r2, [r1] + mov r1, #0x3f + bl GetMonData + ldr r1, [r6] + mov r2, #0x82 + lsl r2, r2, #0x1 + add r1, r1, r2 + str r0, [r1] + add sp, sp, #0x10 + pop {r4, r5, r6} + pop {r0} + bx r0 +._568: + .align 2, 0 +._567: + .word gUnknown_Debug_2038A1C + + thumb_func_end debug_80C5C94 + + thumb_func_start debug_80C5DEC +debug_80C5DEC: + push {r4, lr} + add sp, sp, #0xfffffffc + mov r0, #0x0 + str r0, [sp] + ldr r4, ._569 + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0x6c + mov r1, #0x19 + bl SetMonData + ldr r0, [r4] + mov r1, #0xd + mov r2, sp + bl SetMonData + ldr r0, [r4] + mov r1, #0xe + mov r2, sp + bl SetMonData + ldr r0, [r4] + mov r1, #0xf + mov r2, sp + bl SetMonData + ldr r0, [r4] + mov r1, #0x10 + mov r2, sp + bl SetMonData + ldr r0, [r4] + bl CalculateMonStats + ldr r0, [r4] + bl GiveMonInitialMoveset + ldr r0, [r4] + mov r1, #0x38 + bl GetMonData + add r1, r0, #0 + ldr r0, [r4] + str r1, [r0, #0x68] + mov r1, #0xd + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0x80 + str r2, [r1] + mov r1, #0xe + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0x84 + str r2, [r1] + mov r1, #0xf + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0x88 + str r2, [r1] + mov r1, #0x10 + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0x8c + str r2, [r1] + mov r1, #0x3a + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xf0 + str r2, [r1] + mov r1, #0x3b + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xf4 + str r2, [r1] + mov r1, #0x3c + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xf8 + str r2, [r1] + mov r1, #0x3d + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xfc + str r2, [r1] + mov r1, #0x3e + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + mov r3, #0x80 + lsl r3, r3, #0x1 + add r1, r0, r3 + str r2, [r1] + mov r1, #0x3f + bl GetMonData + ldr r1, [r4] + mov r2, #0x82 + lsl r2, r2, #0x1 + add r1, r1, r2 + str r0, [r1] + add sp, sp, #0x4 + pop {r4} + pop {r0} + bx r0 +._570: + .align 2, 0 +._569: + .word gUnknown_Debug_2038A1C + + thumb_func_end debug_80C5DEC + + thumb_func_start debug_80C5EF4 +debug_80C5EF4: + push {r4, lr} + ldr r4, ._571 + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0x98 + mov r1, #0x27 + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0x9c + mov r1, #0x1a + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xa0 + mov r1, #0x28 + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xa4 + mov r1, #0x1b + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xa8 + mov r1, #0x29 + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xac + mov r1, #0x1c + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xb0 + mov r1, #0x2a + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xb4 + mov r1, #0x1d + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xb8 + mov r1, #0x2b + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xbc + mov r1, #0x1e + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xc0 + mov r1, #0x2c + bl SetMonData + ldr r0, [r4] + add r2, r0, #0 + add r2, r2, #0xc4 + mov r1, #0x1f + bl SetMonData + ldr r0, [r4] + bl CalculateMonStats + ldr r0, [r4] + mov r1, #0x3a + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xf0 + str r2, [r1] + mov r1, #0x3b + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xf4 + str r2, [r1] + mov r1, #0x3c + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xf8 + str r2, [r1] + mov r1, #0x3d + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + add r1, r0, #0 + add r1, r1, #0xfc + str r2, [r1] + mov r1, #0x3e + bl GetMonData + add r2, r0, #0 + ldr r0, [r4] + mov r3, #0x80 + lsl r3, r3, #0x1 + add r1, r0, r3 + str r2, [r1] + mov r1, #0x3f + bl GetMonData + ldr r1, [r4] + mov r2, #0x82 + lsl r2, r2, #0x1 + add r1, r1, r2 + str r0, [r1] + pop {r4} + pop {r0} + bx r0 +._572: + .align 2, 0 +._571: + .word gUnknown_Debug_2038A1C + + thumb_func_end debug_80C5EF4 + + thumb_func_start debug_80C5FFC +debug_80C5FFC: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xffffffe0 + ldr r1, ._578 + add r0, sp, #0x10 + mov r2, #0x4 + bl memcpy + add r7, sp, #0x14 + ldr r1, ._578 + 4 + add r0, r7, #0 + mov r2, #0x8 + bl memcpy + ldr r5, ._578 + 8 + ldr r2, [r5] + add r0, r2, #0 + add r0, r0, #0x98 + ldr r4, [r0] + mov r1, #0x1f + and r4, r4, r1 + add r0, r0, #0x8 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0x5 + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xa8 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0xa + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xb0 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0xf + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xb8 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0x14 + orr r4, r4, r0 + add r0, r2, #0 + add r0, r0, #0xc0 + ldr r0, [r0] + and r0, r0, r1 + lsl r0, r0, #0x19 + orr r4, r4, r0 + ldr r0, [r2, #0x64] + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl NationalPokedexNumToSpecies + add r1, r0, #0 + lsl r1, r1, #0x10 + lsr r1, r1, #0x10 + ldr r0, [r5] + ldr r2, [r0, #0x68] + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + lsl r4, r4, #0x18 + lsr r4, r4, #0x18 + mov r6, #0x1 + str r6, [sp] + ldr r3, [r0, #0x74] + str r3, [sp, #0x4] + str r6, [sp, #0x8] + ldr r3, [r0, #0x70] + str r3, [sp, #0xc] + add r3, r4, #0 + bl CreateMon + ldr r2, [r5] + add r0, r2, #0 + add r0, r0, #0x80 + ldr r0, [r0] + cmp r0, #0 + beq ._573 @cond_branch + lsl r1, r0, #0x10 + lsr r1, r1, #0x10 + add r0, r2, #0 + mov r2, #0x0 + bl SetMonMoveSlot +._573: + ldr r2, [r5] + add r0, r2, #0 + add r0, r0, #0x84 + ldr r0, [r0] + cmp r0, #0 + beq ._574 @cond_branch + lsl r1, r0, #0x10 + lsr r1, r1, #0x10 + add r0, r2, #0 + mov r2, #0x1 + bl SetMonMoveSlot +._574: + ldr r2, [r5] + add r0, r2, #0 + add r0, r0, #0x88 + ldr r0, [r0] + cmp r0, #0 + beq ._575 @cond_branch + lsl r1, r0, #0x10 + lsr r1, r1, #0x10 + add r0, r2, #0 + mov r2, #0x2 + bl SetMonMoveSlot +._575: + ldr r2, [r5] + add r0, r2, #0 + add r0, r0, #0x8c + ldr r0, [r0] + cmp r0, #0 + beq ._576 @cond_branch + lsl r1, r0, #0x10 + lsr r1, r1, #0x10 + add r0, r2, #0 + mov r2, #0x3 + bl SetMonMoveSlot +._576: + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0x6c + mov r1, #0x19 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0x98 + mov r1, #0x27 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0x9c + mov r1, #0x1a + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xa0 + mov r1, #0x28 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xa4 + mov r1, #0x1b + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xa8 + mov r1, #0x29 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xac + mov r1, #0x1c + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xb0 + mov r1, #0x2a + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xb4 + mov r1, #0x1d + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xb8 + mov r1, #0x2b + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xbc + mov r1, #0x1e + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xc0 + mov r1, #0x2c + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xc4 + mov r1, #0x1f + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xc8 + mov r1, #0x16 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xcc + mov r1, #0x17 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xd0 + mov r1, #0x18 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xd4 + mov r1, #0x21 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xd8 + mov r1, #0x2f + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xdc + mov r1, #0x30 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xe0 + mov r1, #0x20 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xe4 + mov r1, #0x22 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0x90 + mov r1, #0xc + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0x94 + mov r1, #0x2e + bl SetMonData + ldr r0, [r5] + add r1, r0, #0 + add r1, r1, #0xec + ldr r2, [r1] + lsl r2, r2, #0x3 + ldr r1, ._578 + 12 + add r2, r2, r1 + mov r1, #0x37 + bl SetMonData + ldr r0, [r5] + add r2, r0, #0 + add r2, r2, #0xe8 + mov r1, #0x2d + bl SetMonData + ldr r1, [r5] + add r0, r1, #0 + add r0, r0, #0xe8 + ldr r0, [r0] + cmp r0, #0 + beq ._577 @cond_branch + add r0, r1, #0 + mov r1, #0x2 + add r2, sp, #0x10 + bl SetMonData + add r2, sp, #0x1c + strb r6, [r2] + ldr r0, [r5] + mov r1, #0x3 + bl SetMonData +._577: + ldr r0, [r5] + mov r1, #0x7 + add r2, r7, #0 + bl SetMonData + mov r2, sp + add r2, r2, #0x1e + mov r0, #0xff + strh r0, [r2] + ldr r0, [r5] + mov r1, #0x23 + bl SetMonData + ldr r0, [r5] + bl CalculateMonStats + add sp, sp, #0x20 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._579: + .align 2, 0 +._578: + .word gUnknown_Debug_083F8758 + .word gUnknown_Debug_083F875C + .word gUnknown_Debug_2038A1C + .word gUnknown_Debug_083F86E8+0x4 + + thumb_func_end debug_80C5FFC + + thumb_func_start debug_80C627C +debug_80C627C: + push {r4, r5, r6, lr} + add sp, sp, #0xfffffff8 + lsl r0, r0, #0x18 + lsr r4, r0, #0x18 + add r6, r4, #0 + ldr r1, ._584 + mov r0, sp + mov r2, #0x2 + bl memcpy + add r5, sp, #0x4 + ldr r1, ._584 + 4 + add r0, r5, #0 + mov r2, #0x2 + bl memcpy + cmp r4, #0x1 + beq ._580 @cond_branch + cmp r4, #0x1 + bgt ._581 @cond_branch + cmp r4, #0 + beq ._582 @cond_branch + b ._595 +._585: + .align 2, 0 +._584: + .word gUnknown_Debug_083F7FD4 + .word gUnknown_Debug_083F8764 +._581: + cmp r6, #0x2 + beq ._586 @cond_branch + b ._595 +._582: + ldr r0, ._589 + ldr r0, [r0] + ldr r1, ._589 + 4 + add r0, r0, r1 + b ._588 +._590: + .align 2, 0 +._589: + .word gUnknown_Debug_2038A1C + .word 0x169 +._580: + ldr r4, ._593 + ldr r3, [r4] + ldr r1, ._593 + 4 + add r0, r3, r1 + ldrb r2, [r0] + ldr r1, ._593 + 8 + mov r6, #0xb4 + lsl r6, r6, #0x1 + add r0, r3, r6 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r1 + ldrb r0, [r0, #0x4] + sub r0, r0, #0x1 + cmp r2, r0 + bge ._595 @cond_branch + lsl r2, r2, #0x19 + mov r0, #0xa0 + lsl r0, r0, #0x13 + add r2, r2, r0 + lsr r2, r2, #0x18 + add r0, r5, #0 + mov r1, #0x1 + bl Menu_PrintText + ldr r0, [r4] + ldr r2, ._593 + 4 + add r1, r0, r2 + ldrb r0, [r1] + add r0, r0, #0x1 + strb r0, [r1] + ldr r0, [r4] + add r0, r0, r2 +._588: + ldrb r2, [r0] + lsl r2, r2, #0x19 + mov r6, #0xa0 + lsl r6, r6, #0x13 + add r2, r2, r6 + lsr r2, r2, #0x18 + mov r0, sp + mov r1, #0x1 + bl Menu_PrintText + b ._595 +._594: + .align 2, 0 +._593: + .word gUnknown_Debug_2038A1C + .word 0x169 + .word gUnknown_Debug_083F8698 +._586: + ldr r4, ._596 + ldr r0, [r4] + ldr r2, ._596 + 4 + add r1, r0, r2 + ldrb r0, [r1] + cmp r0, #0 + beq ._595 @cond_branch + add r2, r0, #0 + lsl r2, r2, #0x19 + mov r6, #0xa0 + lsl r6, r6, #0x13 + add r2, r2, r6 + lsr r2, r2, #0x18 + add r0, r5, #0 + mov r1, #0x1 + bl Menu_PrintText + ldr r0, [r4] + ldr r2, ._596 + 4 + add r1, r0, r2 + ldrb r0, [r1] + sub r0, r0, #0x1 + strb r0, [r1] + ldr r0, [r4] + add r0, r0, r2 + ldrb r2, [r0] + lsl r2, r2, #0x19 + add r2, r2, r6 + lsr r2, r2, #0x18 + mov r0, sp + mov r1, #0x1 + bl Menu_PrintText +._595: + add sp, sp, #0x8 + pop {r4, r5, r6} + pop {r0} + bx r0 +._597: + .align 2, 0 +._596: + .word gUnknown_Debug_2038A1C + .word 0x169 + + thumb_func_end debug_80C627C + + thumb_func_start debug_80C6384 +debug_80C6384: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + mov r0, #0x0 + mov r1, #0x4 + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r5, #0x0 + ldr r3, ._600 + ldr r1, ._600 + 4 + ldr r0, [r1] + mov r2, #0xb4 + lsl r2, r2, #0x1 + add r0, r0, r2 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r3 + ldr r0, [r0] + ldrb r0, [r0] + cmp r0, #0xff + beq ._598 @cond_branch + add r4, r1, #0 + ldr r0, ._600 + 8 + mov r9, r0 + mov r8, r3 + add r7, r2, #0 + mov r6, #0x1 +._599: + ldr r0, [r4] + add r0, r0, r9 + mov r1, #0xfc + strb r1, [r0] + ldr r0, [r4] + add r1, r1, #0x70 + add r0, r0, r1 + strb r6, [r0] + ldr r0, [r4] + ldr r2, ._600 + 12 + add r0, r0, r2 + strb r6, [r0] + ldr r1, [r4] + add r2, r2, #0x1 + add r0, r1, r2 + add r1, r1, r7 + ldrb r1, [r1] + lsl r1, r1, #0x3 + add r1, r1, r8 + ldr r1, [r1] + add r1, r1, r5 + ldrb r1, [r1] + mov r2, #0x1 + bl debug_80C5738 + ldr r0, [r4] + add r0, r0, r9 + lsl r2, r5, #0x19 + mov r1, #0xa0 + lsl r1, r1, #0x13 + add r2, r2, r1 + lsr r2, r2, #0x18 + mov r1, #0x2 + bl Menu_PrintText + add r0, r5, #1 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + ldr r0, [r4] + add r0, r0, r7 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r8 + ldr r0, [r0] + add r0, r0, r5 + ldrb r0, [r0] + cmp r0, #0xff + bne ._599 @cond_branch +._598: + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._601: + .align 2, 0 +._600: + .word gUnknown_Debug_083F8698 + .word gUnknown_Debug_2038A1C + .word 0x16b + .word 0x16d + + thumb_func_end debug_80C6384 + + thumb_func_start debug_80C643C +debug_80C643C: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + mov r0, #0x2 + mov r1, #0x5 + mov r2, #0x1c + mov r3, #0x12 + bl Menu_BlankWindowRect + mov r5, #0x0 + ldr r6, ._605 + ldr r1, ._605 + 4 + ldr r0, [r1] + mov r3, #0xb4 + lsl r3, r3, #0x1 + add r0, r0, r3 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r6 + ldr r0, [r0] + ldrb r0, [r0] + cmp r0, #0xff + beq ._602 @cond_branch + add r4, r1, #0 + mov r0, #0x1 + mov r8, r0 +._607: + ldr r0, [r4] + ldr r7, ._605 + 8 + add r2, r0, r7 + mov r0, #0xfc + strb r0, [r2] + ldr r0, [r4] + mov r2, #0xb6 + lsl r2, r2, #0x1 + add r0, r0, r2 + mov r7, r8 + strb r7, [r0] + ldr r2, [r4] + ldr r7, ._605 + 12 + add r0, r2, r7 + ldrb r0, [r0] + cmp r5, r0 + bne ._603 @cond_branch + ldr r0, ._605 + 16 + add r2, r2, r0 + mov r0, #0x2 + strb r0, [r2] + ldr r1, [r1] + mov r2, #0xb7 + lsl r2, r2, #0x1 + add r0, r1, r2 + add r1, r1, r3 + ldrb r1, [r1] + lsl r1, r1, #0x3 + add r1, r1, r6 + ldr r1, [r1] + add r1, r1, r5 + ldrb r1, [r1] + mov r2, #0x2 + bl debug_80C5738 + b ._604 +._606: + .align 2, 0 +._605: + .word gUnknown_Debug_083F8698 + .word gUnknown_Debug_2038A1C + .word 0x16b + .word 0x169 + .word 0x16d +._603: + ldr r3, ._608 + add r0, r2, r3 + mov r7, r8 + strb r7, [r0] + ldr r1, [r1] + mov r2, #0xb7 + lsl r2, r2, #0x1 + add r0, r1, r2 + ldr r2, ._608 + 4 + sub r3, r3, #0x5 + add r1, r1, r3 + ldrb r1, [r1] + lsl r1, r1, #0x3 + add r1, r1, r2 + ldr r1, [r1] + add r1, r1, r5 + ldrb r1, [r1] + mov r2, #0x1 + bl debug_80C5738 +._604: + ldr r0, [r4] + ldr r7, ._608 + 8 + add r0, r0, r7 + lsl r2, r5, #0x19 + mov r1, #0xa0 + lsl r1, r1, #0x13 + add r2, r2, r1 + lsr r2, r2, #0x18 + mov r1, #0x2 + bl Menu_PrintText + add r0, r5, #1 + lsl r0, r0, #0x10 + lsr r5, r0, #0x10 + ldr r6, ._608 + 4 + add r1, r4, #0 + ldr r0, [r4] + mov r3, #0xb4 + lsl r3, r3, #0x1 + add r0, r0, r3 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r6 + ldr r0, [r0] + add r0, r0, r5 + ldrb r0, [r0] + cmp r0, #0xff + bne ._607 @cond_branch +._602: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._609: + .align 2, 0 +._608: + .word 0x16d + .word gUnknown_Debug_083F8698 + .word 0x16b + + thumb_func_end debug_80C643C + + thumb_func_start debug_80C6544 +debug_80C6544: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r9, r0 + ldr r0, ._614 + mov r8, r0 + ldr r6, ._614 + 4 + ldr r1, [r6] + mov r5, #0xb4 + lsl r5, r5, #0x1 + add r0, r1, r5 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r8 + ldr r4, ._614 + 8 + add r1, r1, r4 + ldrb r1, [r1] + ldr r0, [r0] + add r0, r0, r1 + ldrb r0, [r0] + bl debug_80C5B60 + add r7, r0, #0 + ldr r2, ._614 + 12 + ldr r3, [r6] + add r5, r3, r5 + ldrb r0, [r5] + lsl r0, r0, #0x3 + add r0, r0, r8 + add r4, r3, r4 + ldrb r1, [r4] + ldr r0, [r0] + add r0, r0, r1 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r2, r2, #0x4 + add r0, r0, r2 + ldr r1, [r0] + ldr r5, [r1] + ldr r4, [r1, #0x4] + ldr r2, ._614 + 16 + mov r6, #0xb5 + lsl r6, r6, #0x1 + add r0, r3, r6 + ldrb r0, [r0] + lsl r0, r0, #0x2 + add r0, r0, r2 + ldr r3, [r0] + ldrb r0, [r1, #0x8] + cmp r0, #0 + bne ._623 @cond_branch + mov r0, r9 + cmp r0, #0x1 + beq ._611 @cond_branch + cmp r0, #0x2 + beq ._612 @cond_branch + b ._623 +._615: + .align 2, 0 +._614: + .word gUnknown_Debug_083F8698 + .word gUnknown_Debug_2038A1C + .word 0x169 + .word gUnknown_Debug_083F8554 + .word gUnknown_Debug_083F8768 +._611: + sub r0, r4, r3 + cmp r7, r0 + bcs ._616 @cond_branch + add r7, r7, r3 + b ._623 +._616: + cmp r7, r4 + bcc ._622 @cond_branch + b ._619 +._612: + add r0, r5, r3 + cmp r7, r0 + bls ._620 @cond_branch + sub r7, r7, r3 + b ._623 +._620: + cmp r7, r5 + bls ._622 @cond_branch +._619: + add r7, r5, #0 + b ._623 +._622: + add r7, r4, #0 +._623: + ldr r1, ._624 + ldr r0, ._624 + 4 + ldr r2, [r0] + mov r3, #0xb4 + lsl r3, r3, #0x1 + add r0, r2, r3 + ldrb r0, [r0] + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r6, ._624 + 8 + add r1, r2, r6 + ldrb r1, [r1] + ldr r0, [r0] + add r0, r0, r1 + ldrb r1, [r0] + add r0, r7, #0 + bl debug_80C5B74 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._625: + .align 2, 0 +._624: + .word gUnknown_Debug_083F8698 + .word gUnknown_Debug_2038A1C + .word 0x169 + + thumb_func_end debug_80C6544 + + thumb_func_start debug_80C6630 +debug_80C6630: + push {r4, r5, lr} + add r4, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + lsl r3, r3, #0x18 + lsr r3, r3, #0x18 + mov r0, #0xfc + strb r0, [r4] + add r4, r4, #0x1 + mov r0, #0x1 + strb r0, [r4] + add r4, r4, #0x1 + cmp r2, #0x2 + bne ._626 @cond_branch + ldr r0, ._629 + ldr r0, [r0] + mov r5, #0xb5 + lsl r5, r5, #0x1 + add r0, r0, r5 + ldrb r0, [r0] + cmp r3, r0 + beq ._627 @cond_branch + strb r2, [r4] + b ._628 +._630: + .align 2, 0 +._629: + .word gUnknown_Debug_2038A1C +._627: + mov r0, #0x4 +._626: + strb r0, [r4] +._628: + add r0, r1, #0 + add r0, r0, #0xa1 + strb r0, [r4, #0x1] + pop {r4, r5} + pop {r0} + bx r0 + + thumb_func_end debug_80C6630 + + thumb_func_start debug_80C6678 +debug_80C6678: + push {r4, r5, r6, r7, lr} + mov r7, r9 + mov r6, r8 + push {r6, r7} + mov r9, r0 + add r6, r1, #0 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + lsl r3, r3, #0x18 + lsr r3, r3, #0x18 + mov r8, r3 + mov r7, #0x0 + sub r0, r2, #1 + cmp r0, #0x9 + bhi ._644 @cond_branch + lsl r0, r0, #0x2 + ldr r1, ._633 + add r0, r0, r1 + ldr r0, [r0] + mov pc, r0 +._634: + .align 2, 0 +._633: + .word ._632 +._632: + .word ._635 + .word ._636 + .word ._637 + .word ._638 + .word ._639 + .word ._640 + .word ._641 + .word ._642 + .word ._643 + .word ._644 +._644: + mov r0, r9 + add r4, r0, r7 + ldr r5, ._645 + add r0, r6, #0 + add r1, r5, #0 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x9 + bl debug_80C6630 + add r0, r6, #0 + add r1, r5, #0 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._643: + mov r1, r9 + add r4, r1, r7 + ldr r5, ._645 + 4 + add r0, r6, #0 + add r1, r5, #0 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x8 + bl debug_80C6630 + add r0, r6, #0 + add r1, r5, #0 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._642: + mov r0, r9 + add r4, r0, r7 + ldr r5, ._645 + 8 + add r0, r6, #0 + add r1, r5, #0 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x7 + bl debug_80C6630 + add r0, r6, #0 + add r1, r5, #0 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._641: + mov r1, r9 + add r4, r1, r7 + ldr r5, ._645 + 12 + add r0, r6, #0 + add r1, r5, #0 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x6 + bl debug_80C6630 + add r0, r6, #0 + add r1, r5, #0 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._640: + mov r0, r9 + add r4, r0, r7 + ldr r5, ._645 + 16 + add r0, r6, #0 + add r1, r5, #0 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x5 + bl debug_80C6630 + add r0, r6, #0 + add r1, r5, #0 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._639: + mov r1, r9 + add r4, r1, r7 + ldr r5, ._645 + 20 + add r0, r6, #0 + add r1, r5, #0 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x4 + bl debug_80C6630 + add r0, r6, #0 + add r1, r5, #0 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._638: + mov r0, r9 + add r4, r0, r7 + mov r5, #0xfa + lsl r5, r5, #0x2 + add r0, r6, #0 + add r1, r5, #0 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x3 + bl debug_80C6630 + add r0, r6, #0 + add r1, r5, #0 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._637: + mov r1, r9 + add r4, r1, r7 + add r0, r6, #0 + mov r1, #0x64 + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x2 + bl debug_80C6630 + add r0, r6, #0 + mov r1, #0x64 + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._636: + mov r0, r9 + add r4, r0, r7 + add r0, r6, #0 + mov r1, #0xa + bl __udivsi3 + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + add r0, r4, #0 + mov r2, r8 + mov r3, #0x1 + bl debug_80C6630 + add r0, r6, #0 + mov r1, #0xa + bl __umodsi3 + add r6, r0, #0 + add r0, r7, #4 + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 +._635: + mov r1, r9 + add r0, r1, r7 + lsl r1, r6, #0x18 + lsr r1, r1, #0x18 + mov r2, r8 + mov r3, #0x0 + bl debug_80C6630 + pop {r3, r4} + mov r8, r3 + mov r9, r4 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._646: + .align 2, 0 +._645: + .word 0x3b9aca00 + .word 0x5f5e100 + .word 0x989680 + .word 0xf4240 + .word 0x186a0 + .word 0x2710 + + thumb_func_end debug_80C6678 + + thumb_func_start debug_80C689C +debug_80C689C: + push {r4, r5, lr} + add r5, r0, #0 + add r4, r1, #0 + lsl r2, r2, #0x18 + lsr r2, r2, #0x18 + mov r3, #0x0 + ldrb r0, [r4] + b ._647 +._649: + add r1, r5, r3 + add r0, r4, r3 + ldrb r0, [r0] + strb r0, [r1] + add r0, r3, #1 + lsl r0, r0, #0x18 + lsr r3, r0, #0x18 + add r0, r4, r3 + ldrb r0, [r0] +._647: + cmp r0, #0xff + beq ._648 @cond_branch + cmp r3, r2 + bcc ._649 @cond_branch +._648: + pop {r4, r5} + pop {r0} + bx r0 + + thumb_func_end debug_80C689C + + thumb_func_start debug_80C68CC +debug_80C68CC: + push {r4, r5, r6, r7, lr} + add sp, sp, #0xfffffff8 + lsl r0, r0, #0x10 + lsr r4, r0, #0x10 + lsl r1, r1, #0x18 + lsr r6, r1, #0x18 + lsl r2, r2, #0x18 + lsr r5, r2, #0x18 + lsl r3, r3, #0x18 + lsr r3, r3, #0x18 + mov r2, #0x0 + mov r1, #0x0 +._650: + mov r7, sp + add r0, r7, r2 + strb r1, [r0] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x3 + bls ._650 @cond_branch + mov r1, sp + mov r0, #0xff + strb r0, [r1, #0x4] + cmp r3, #0x2 + beq ._651 @cond_branch + cmp r3, #0x2 + bgt ._652 @cond_branch + cmp r3, #0x1 + beq ._653 @cond_branch + b ._654 +._652: + cmp r3, #0x3 + beq ._655 @cond_branch +._654: + mov r1, sp + lsr r0, r4, #0xc + strb r0, [r1] +._655: + mov r1, sp + mov r0, #0xf0 + lsl r0, r0, #0x4 + and r0, r0, r4 + lsr r0, r0, #0x8 + strb r0, [r1, #0x1] +._651: + mov r1, sp + mov r0, #0xf0 + and r0, r0, r4 + lsr r0, r0, #0x4 + strb r0, [r1, #0x2] +._653: + mov r2, sp + mov r1, #0xf + add r0, r4, #0 + and r0, r0, r1 + strb r0, [r2, #0x3] + mov r2, #0x0 +._658: + mov r0, sp + add r1, r0, r2 + ldrb r0, [r1] + cmp r0, #0x9 + bhi ._656 @cond_branch + add r0, r0, #0xa1 + b ._657 +._656: + add r0, r0, #0xb1 +._657: + strb r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x3 + bls ._658 @cond_branch + mov r0, #0x4 + sub r0, r0, r3 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + add r0, r0, sp + add r1, r6, #0 + add r2, r5, #0 + bl Menu_PrintText + add sp, sp, #0x8 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 + + thumb_func_end debug_80C68CC + + thumb_func_start InitSeePokemonGraphics +InitSeePokemonGraphics: + push {r4, r5, r6, lr} + add sp, sp, #0xfffffff8 + bl debug_80C35DC + ldr r1, ._659 + ldr r2, ._659 + 4 + ldr r0, ._659 + 8 + str r1, [r0] + str r2, [r0, #0x4] + ldr r1, ._659 + 12 + str r1, [r0, #0x8] + ldr r0, [r0, #0x8] + ldr r0, ._659 + 16 + mov r1, #0x80 + mov r2, #0x60 + bl LoadPalette + ldr r1, ._659 + 20 + add r0, sp, #0x4 + strh r1, [r0] + mov r1, #0x0 + mov r2, #0x2 + bl LoadPalette + mov r0, #0x1 + neg r0, r0 + mov r5, #0x0 + str r5, [sp] + mov r1, #0x0 + mov r2, #0x10 + mov r3, #0x0 + bl BeginNormalPaletteFade + ldr r0, ._659 + 24 + mov r6, #0x0 + strh r5, [r0] + add r0, r0, #0x4 + strh r5, [r0] + sub r0, r0, #0x2 + strh r5, [r0] + add r0, r0, #0x4 + strh r5, [r0] + ldr r1, ._659 + 28 + mov r0, #0x3f + strh r0, [r1] + add r1, r1, #0x2 + mov r0, #0x1f + strh r0, [r1] + add r1, r1, #0x6 + mov r0, #0xf1 + strh r0, [r1] + ldr r0, ._659 + 32 + strh r5, [r0] + add r1, r1, #0x4 + mov r0, #0x7 + strh r0, [r1] + ldr r3, ._659 + 36 + ldrh r2, [r3] + strh r5, [r3] + ldr r4, ._659 + 40 + ldrh r0, [r4] + mov r1, #0x1 + orr r0, r0, r1 + strh r0, [r4] + strh r2, [r3] + ldr r0, ._659 + 44 + bl SetVBlankCallback + ldr r0, ._659 + 48 + bl SetMainCallback2 + bl sub_809D51C + ldr r1, ._659 + 52 + ldr r2, ._659 + 56 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x2 + ldr r2, ._659 + 60 + add r0, r2, #0 + strh r0, [r1] + sub r1, r1, #0xa + mov r2, #0xcd + lsl r2, r2, #0x6 + add r0, r2, #0 + strh r0, [r1] + ldr r0, ._659 + 64 + mov r1, #0x0 + bl CreateTask + ldr r1, ._659 + 68 + ldr r0, ._659 + 72 + str r0, [r1] + ldr r1, ._659 + 76 + strh r1, [r0] + strb r6, [r0, #0x2] + strb r6, [r0, #0x3] + strb r6, [r0, #0x5] + strb r6, [r0, #0x7] + strb r6, [r0, #0xa] + strb r6, [r0, #0x8] + ldr r4, ._659 + 80 + add r0, r4, #0 + mov r1, #0x6c + mov r2, #0x74 + mov r3, #0x0 + bl CreateSprite + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + ldr r6, ._659 + 84 + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + strh r5, [r0, #0x2e] + mov r1, #0x0 + bl StartSpriteAnim + add r0, r4, #0 + mov r1, #0x6c + mov r2, #0x74 + mov r3, #0x0 + bl CreateSprite + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + mov r1, #0x1 + strh r1, [r0, #0x2e] + bl StartSpriteAnim + add r0, r4, #0 + mov r1, #0x6c + mov r2, #0x74 + mov r3, #0x0 + bl CreateSprite + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + mov r1, #0x2 + strh r1, [r0, #0x2e] + bl StartSpriteAnim + add sp, sp, #0x8 + pop {r4, r5, r6} + pop {r0} + bx r0 +._660: + .align 2, 0 +._659: + .word byte_83F88EC + .word 0x600e000 + .word 0x40000d4 + .word 0x80000400 + .word word_83F888C + .word 0x7fff + .word 0x4000040 + .word 0x4000048 + .word 0x4000052 + .word 0x4000208 + .word 0x4000200 + .word debug_80C3758+1 + .word debug_80C370C+1 + .word 0x4000008 + .word 0x1f0b + .word 0x1e0a + .word debug_80C6B00+1 + .word gUnknown_Debug_2038A20 + .word +0x2018000 + .word 0x115 + .word gSpriteTemplate_83F8874 + .word gSprites + + thumb_func_end InitSeePokemonGraphics + + thumb_func_start debug_80C6B00 +debug_80C6B00: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xffffffec + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 + ldr r1, ._666 + mov r0, sp + mov r2, #0x12 + bl memcpy + mov r0, #0xa + mov r1, #0x0 + mov r2, #0xf + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x9 + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + mov r0, #0x0 + mov r1, #0xa + mov r2, #0x9 + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r0, #0x10 + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + ldr r0, ._666 + 4 + mov r1, #0x11 + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._666 + 8 + mov r1, #0x1b + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._666 + 12 + mov r1, #0x11 + mov r2, #0x5 + bl Menu_PrintText + mov r0, #0xa + mov r1, #0x8 + mov r2, #0x1d + mov r3, #0xc + bl Menu_DrawStdWindowFrame + mov r2, #0x0 + ldr r4, ._666 + 16 + ldr r0, ._666 + 20 + add r3, r0, #0 +._661: + lsl r0, r2, #0x1 + add r0, r0, r4 + add r1, r2, r3 + strh r1, [r0] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0xe + bls ._661 @cond_branch + mov r2, #0x0 + ldr r5, ._666 + 24 + lsl r6, r7, #0x2 + mov r8, r6 + ldr r4, ._666 + 28 + ldr r0, ._666 + 32 + add r3, r0, #0 +._662: + lsl r0, r2, #0x1 + add r0, r0, r4 + add r1, r2, r3 + strh r1, [r0] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0xe + bls ._662 @cond_branch + add r0, r5, #0 + mov r1, #0x14 + mov r2, #0xa + bl Menu_PrintText + mov r0, #0xa + mov r1, #0xd + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r1, sp + mov r0, #0x23 + strb r0, [r1] + mov r2, #0x0 + ldr r4, ._666 + 36 + mov r5, #0x93 + lsl r5, r5, #0x8 + add r3, r5, #0 +._663: + lsl r1, r2, #0x1 + add r1, r1, r4 + mov r6, sp + add r0, r6, r2 + ldrb r0, [r0] + add r0, r0, r3 + strh r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x11 + bls ._663 @cond_branch + mov r1, sp + mov r0, #0x24 + strb r0, [r1] + mov r2, #0x0 + ldr r5, ._666 + 40 + ldr r4, ._666 + 44 + mov r0, #0x93 + lsl r0, r0, #0x8 + add r3, r0, #0 +._664: + lsl r1, r2, #0x1 + add r1, r1, r4 + mov r6, sp + add r0, r6, r2 + ldrb r0, [r0] + add r0, r0, r3 + strh r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x11 + bls ._664 @cond_branch + mov r1, sp + mov r0, #0x25 + strb r0, [r1] + mov r2, #0x0 + ldr r4, ._666 + 48 + mov r0, #0x93 + lsl r0, r0, #0x8 + add r3, r0, #0 +._665: + lsl r1, r2, #0x1 + add r1, r1, r4 + mov r6, sp + add r0, r6, r2 + ldrb r0, [r0] + add r0, r0, r3 + strh r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x11 + bls ._665 @cond_branch + add r0, r5, #0 + mov r1, #0xf + mov r2, #0x11 + bl Menu_PrintText + ldr r1, ._666 + 52 + ldr r2, ._666 + 56 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r5, ._666 + 60 + add r0, r5, #0 + strh r0, [r1] + ldr r1, ._666 + 64 + mov r6, r8 + add r0, r6, r7 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._666 + 68 + str r1, [r0] + add sp, sp, #0x14 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._667: + .align 2, 0 +._666: + .word gUnknown_Debug_083F8815 + .word gUnknown_Debug_083F87D0 + .word gUnknown_Debug_083F87D8 + .word gUnknown_Debug_083F87E0 + .word 0x600fa56 + .word 0xa311 + .word gUnknown_Debug_083F87F4 + .word 0x600f256 + .word 0x8301 + .word 0x600f396 + .word gUnknown_Debug_083F8801 + .word 0x600f3d6 + .word 0x600f416 + .word 0x4000040 + .word 0x51ef + .word 0x699f + .word gTasks + .word debug_80C6CB8+1 + + thumb_func_end debug_80C6B00 + + thumb_func_start debug_80C6CB8 +debug_80C6CB8: + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, r9 + mov r5, r8 + push {r5, r6, r7} + add sp, sp, #0xfffffff4 + mov sl, r0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov sl, r0 + ldr r5, ._668 + ldr r4, [r5] + ldrh r2, [r4] + lsl r0, r2, #0x3 + ldr r1, ._668 + 4 + add r0, r0, r1 + ldr r1, ._668 + 8 + lsl r2, r2, #0x2 + add r2, r2, r1 + ldrb r1, [r2] + ldrb r2, [r2, #0x1] + ldr r3, ._668 + 12 + mov r8, r3 + ldr r6, [r3] + str r6, [sp, #0x8] + ldr r3, [r3, #0x4] + str r3, [sp] + ldrh r3, [r4] + str r3, [sp, #0x4] + add r3, r6, #0 + bl DecompressPicFromTable_2 + ldr r0, [r5] + ldrh r0, [r0] + lsl r0, r0, #0x3 + ldr r7, ._668 + 16 + add r0, r0, r7 + bl LoadCompressedObjectPalette + ldr r0, [r5] + ldrh r0, [r0] + mov r1, #0x1 + bl GetMonSpriteTemplate_803C56C + ldr r0, ._668 + 20 + mov r1, #0x28 + mov r2, #0x28 + mov r3, #0x0 + bl CreateSprite + ldr r1, [r5] + strb r0, [r1, #0x2] + ldr r2, [r5] + ldrb r1, [r2, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + ldr r1, ._668 + 24 + add r0, r0, r1 + ldr r3, ._668 + 28 + mov r9, r3 + str r3, [r0] + ldrb r0, [r2, #0x2] + lsl r1, r0, #0x4 + add r1, r1, r0 + lsl r1, r1, #0x2 + ldr r6, ._668 + 32 + add r1, r1, r6 + ldrb r2, [r1, #0x5] + mov r6, #0xd + neg r6, r6 + add r0, r6, #0 + and r0, r0, r2 + strb r0, [r1, #0x5] + ldr r4, [r5] + ldrh r2, [r4] + lsl r0, r2, #0x3 + ldr r1, ._668 + 36 + add r0, r0, r1 + ldr r1, ._668 + 40 + lsl r2, r2, #0x2 + add r2, r2, r1 + ldrb r1, [r2] + ldrb r2, [r2, #0x1] + mov r7, r8 + ldr r3, [r7, #0x8] + str r3, [sp] + ldrh r3, [r4] + str r3, [sp, #0x4] + ldr r3, [sp, #0x8] + bl DecompressPicFromTable_2 + ldr r0, [r5] + ldrh r0, [r0] + lsl r0, r0, #0x3 + ldr r1, ._668 + 16 + add r0, r0, r1 + bl LoadCompressedObjectPalette + ldr r0, [r5] + ldrh r0, [r0] + mov r1, #0x2 + bl GetMonSpriteTemplate_803C56C + ldr r0, ._668 + 20 + mov r1, #0x28 + mov r2, #0x78 + mov r3, #0x0 + bl CreateSprite + ldr r1, [r5] + strb r0, [r1, #0x3] + ldr r2, [r5] + ldrb r1, [r2, #0x3] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + ldr r3, ._668 + 24 + add r0, r0, r3 + mov r7, r9 + str r7, [r0] + ldrb r1, [r2, #0x3] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + ldr r1, ._668 + 32 + add r0, r0, r1 + ldrb r1, [r0, #0x5] + and r6, r6, r1 + strb r6, [r0, #0x5] + ldr r0, [r5] + ldrh r0, [r0] + ldr r1, ._668 + 44 + mov r2, #0x0 + str r2, [sp] + str r2, [sp, #0x4] + mov r2, #0x68 + mov r3, #0x2c + bl CreateMonIcon + ldr r1, [r5] + strb r0, [r1, #0x4] + ldr r0, [r5] + ldrh r0, [r0] + bl SpeciesToNationalPokedexNum + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + mov r2, #0xff + lsl r2, r2, #0x2 + mov r1, #0x2 + bl sub_8091738 + ldr r1, ._668 + 48 + ldr r3, ._668 + 52 + add r0, r3, #0 + strh r0, [r1] + add r1, r1, #0x2 + ldr r6, ._668 + 56 + add r0, r6, #0 + strh r0, [r1] + add r1, r1, #0x3e + ldr r7, ._668 + 60 + add r0, r7, #0 + strh r0, [r1] + add r1, r1, #0x2 + ldr r2, ._668 + 64 + add r0, r2, #0 + strh r0, [r1] + ldr r0, [r5] + ldrh r0, [r0] + mov r1, #0x11 + mov r2, #0x3 + bl debug_80C3800 + ldr r0, [r5] + ldrh r0, [r0] + mov r1, #0x1a + mov r2, #0x5 + bl debug_80C376C + ldr r2, [r5] + ldrb r1, [r2, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + ldr r3, ._668 + 32 + add r0, r0, r3 + ldrb r0, [r0, #0x5] + lsr r0, r0, #0x4 + strb r0, [r2, #0x6] + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + ldr r4, ._668 + 68 + add r0, r0, r4 + ldr r6, ._668 + 72 + add r1, r4, r6 + mov r2, #0x10 + bl CpuSet + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + add r0, r0, r4 + ldr r1, ._668 + 76 + mov r2, #0x10 + bl CpuSet + ldr r1, ._668 + 80 + mov r7, sl + lsl r0, r7, #0x2 + add r0, r0, sl + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._668 + 84 + str r1, [r0] + ldr r0, [r5] + mov r1, #0x0 + strb r1, [r0, #0x9] + bl StopCryAndClearCrySongs + ldr r0, [r5] + ldrh r0, [r0] + mov r1, #0x0 + bl PlayCry1 + add sp, sp, #0xc + pop {r3, r4, r5} + mov r8, r3 + mov r9, r4 + mov sl, r5 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._669: + .align 2, 0 +._668: + .word gUnknown_Debug_2038A20 + .word gMonFrontPicTable + .word gMonFrontPicCoords + .word gUnknown_081FAF4C + .word gMonPaletteTable + .word gUnknown_02024E8C + .word gSprites+0x1c + .word debug_69+1 + .word gSprites + .word gMonBackPicTable + .word gMonBackPicCoords + .word sub_809D62C+1 + .word 0x600f858 + .word 0xf3fc + .word 0xf3fd + .word 0xf3fe + .word 0xf3ff + .word gPlttBufferUnfaded+0x200 + .word 0xffffff00 + .word gPlttBufferFaded+0x100 + .word gTasks + .word debug_80C6EE8+1 + + thumb_func_end debug_80C6CB8 + + thumb_func_start debug_80C6EE8 +debug_80C6EE8: + push {r4, r5, r6, lr} + add r6, r0, #0 + lsl r6, r6, #0x18 + lsr r6, r6, #0x18 + ldr r4, ._670 + ldr r5, ._670 + 4 + ldr r1, [r5] + add r1, r1, #0x10 + add r0, r4, #0 + mov r2, #0x10 + bl CpuSet + ldr r0, ._670 + 8 + add r4, r4, r0 + ldr r3, [r5] + ldrb r0, [r3, #0x7] + add r0, r0, #0x81 + lsl r0, r0, #0x1 + add r0, r0, r4 + ldrh r4, [r0] + mov r1, #0x1f + and r1, r1, r4 + ldrb r2, [r3, #0xc] + mov r0, #0x20 + neg r0, r0 + and r0, r0, r2 + orr r0, r0, r1 + strb r0, [r3, #0xc] + ldr r3, [r5] + mov r1, #0xf8 + lsl r1, r1, #0x2 + and r1, r1, r4 + ldrh r2, [r3, #0xc] + ldr r0, ._670 + 12 + and r0, r0, r2 + orr r0, r0, r1 + strh r0, [r3, #0xc] + mov r1, #0xf8 + lsl r1, r1, #0x7 + and r1, r1, r4 + lsr r1, r1, #0x8 + ldrb r2, [r3, #0xd] + mov r0, #0x7d + neg r0, r0 + and r0, r0, r2 + orr r0, r0, r1 + strb r0, [r3, #0xd] + ldr r2, [r5] + ldrb r1, [r2, #0xd] + mov r0, #0x7f + and r0, r0, r1 + strb r0, [r2, #0xd] + ldr r0, [r5] + ldrb r0, [r0, #0x7] + add r0, r0, #0x1 + mov r1, #0xb + mov r2, #0xa + mov r3, #0x2 + bl debug_80C68CC + ldr r0, ._670 + 16 + mov r1, #0xd + mov r2, #0xa + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0xe + mov r2, #0xa + mov r3, #0x4 + bl debug_80C68CC + ldr r1, ._670 + 20 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._670 + 24 + str r1, [r0] + pop {r4, r5, r6} + pop {r0} + bx r0 +._671: + .align 2, 0 +._670: + .word gPlttBufferUnfaded+0x100 + .word gUnknown_Debug_2038A20 + .word 0xffffff00 + .word 0xfffffc1f + .word gUnknown_Debug_083F8813 + .word gTasks + .word debug_80C6FA8+1 + + thumb_func_end debug_80C6EE8 + + thumb_func_start debug_80C6FA8 +debug_80C6FA8: + push {r4, r5, r6, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + ldr r1, ._674 + ldrh r2, [r1, #0x2e] + mov r0, #0x2 + and r0, r0, r2 + add r4, r1, #0 + cmp r0, #0 + beq ._672 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r0, ._674 + 4 + bl SetMainCallback2 + ldr r1, ._674 + 8 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._674 + 12 + str r1, [r0] + b ._703 +._675: + .align 2, 0 +._674: + .word gMain + .word debug_80C370C+1 + .word gTasks + .word debug_80C373C+1 +._672: + ldrh r1, [r4, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._676 @cond_branch + ldr r4, ._678 + ldr r0, [r4] + ldrh r1, [r0] + mov r0, #0x0 + b ._677 +._679: + .align 2, 0 +._678: + .word gUnknown_Debug_2038A20 +._676: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._680 @cond_branch + ldr r4, ._682 + ldr r0, [r4] + ldrh r1, [r0] + mov r0, #0x1 +._677: + bl debug_80C3878 + ldr r1, [r4] + strh r0, [r1] + ldr r1, ._682 + 4 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._682 + 8 + str r1, [r0] + b ._703 +._683: + .align 2, 0 +._682: + .word gUnknown_Debug_2038A20 + .word gTasks + .word debug_80C71FC+1 +._680: + mov r3, #0x1 + and r3, r3, r2 + cmp r3, #0 + beq ._684 @cond_branch + ldr r0, ._686 + ldr r1, [r0] + mov r0, #0x1 + strb r0, [r1, #0x5] + ldr r1, ._686 + 4 + ldr r2, ._686 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._686 + 12 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._686 + 16 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._686 + 20 + str r1, [r0] + b ._703 +._687: + .align 2, 0 +._686: + .word gUnknown_Debug_2038A20 + .word 0x4000040 + .word 0x51ef + .word 0x4167 + .word gTasks + .word debug_80C7294+1 +._684: + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._689 @cond_branch + ldr r1, ._691 + ldr r2, [r1] + ldrb r0, [r2, #0x7] + cmp r0, #0xd + bhi ._689 @cond_branch + lsl r0, r0, #0x1 + ldr r2, ._691 + 4 + add r0, r0, r2 + strh r3, [r0] + ldr r1, [r1] + ldrb r0, [r1, #0x7] + add r0, r0, #0x1 + strb r0, [r1, #0x7] + b ._695 +._692: + .align 2, 0 +._691: + .word gUnknown_Debug_2038A20 + .word 0x5000102 +._689: + ldrh r1, [r4, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._694 @cond_branch + ldr r2, ._696 + ldr r1, [r2] + ldrb r0, [r1, #0x7] + cmp r0, #0 + beq ._694 @cond_branch + lsl r0, r0, #0x1 + ldr r1, ._696 + 4 + add r0, r0, r1 + mov r1, #0x0 + strh r1, [r0] + ldr r1, [r2] + ldrb r0, [r1, #0x7] + sub r0, r0, #0x1 + strb r0, [r1, #0x7] + b ._695 +._697: + .align 2, 0 +._696: + .word gUnknown_Debug_2038A20 + .word 0x5000102 +._694: + ldrh r1, [r4, #0x2e] + mov r0, #0x8 + and r0, r0, r1 + cmp r0, #0 + beq ._698 @cond_branch + ldr r4, ._701 + ldr r2, [r4] + ldrb r0, [r2, #0x9] + mov r1, #0x1 + eor r0, r0, r1 + strb r0, [r2, #0x9] + ldr r1, [r4] + ldrb r0, [r1, #0x9] + cmp r0, #0 + beq ._699 @cond_branch + ldrh r0, [r1] + mov r1, #0x0 + mov r2, #0x0 + bl GetMonSpritePalFromOtIdPersonality + ldr r1, [r4] + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x14 + mov r2, #0x80 + lsl r2, r2, #0x11 + add r1, r1, r2 + lsr r1, r1, #0x10 + mov r2, #0x20 + bl LoadCompressedPalette + b ._700 +._702: + .align 2, 0 +._701: + .word gUnknown_Debug_2038A20 +._699: + ldrh r0, [r1] + mov r1, #0x0 + mov r2, #0x9 + bl GetMonSpritePalFromOtIdPersonality + ldr r1, [r4] + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x14 + mov r2, #0x80 + lsl r2, r2, #0x11 + add r1, r1, r2 + lsr r1, r1, #0x10 + mov r2, #0x20 + bl LoadCompressedPalette +._700: + ldr r5, ._704 + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + ldr r4, ._704 + 4 + add r0, r0, r4 + ldr r2, ._704 + 8 + add r1, r4, r2 + mov r2, #0x10 + bl CpuSet + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + add r0, r0, r4 + ldr r1, ._704 + 12 + mov r2, #0x10 + bl CpuSet +._695: + ldr r1, ._704 + 16 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._704 + 20 + str r1, [r0] + b ._703 +._705: + .align 2, 0 +._704: + .word gUnknown_Debug_2038A20 + .word gPlttBufferUnfaded+0x200 + .word 0xffffff00 + .word gPlttBufferFaded+0x100 + .word gTasks + .word debug_80C6EE8+1 +._698: + mov r0, #0x4 + and r0, r0, r1 + cmp r0, #0 + beq ._706 @cond_branch + bl StopCryAndClearCrySongs + ldr r0, ._707 + ldr r0, [r0] + ldrh r0, [r0] + mov r1, #0x0 + bl PlayCry1 +._706: + ldr r2, ._707 + ldr r1, [r2] + ldrb r0, [r1, #0x8] + add r0, r0, #0x4 + strb r0, [r1, #0x8] + ldr r3, [r2] + ldrb r1, [r3, #0x8] + mov r0, #0x1f + and r0, r0, r1 + strb r0, [r3, #0x8] + ldr r0, [r2] + ldrb r1, [r0, #0x7] + lsl r1, r1, #0x1 + ldr r2, ._707 + 4 + add r1, r1, r2 + ldr r2, ._707 + 8 + ldrb r0, [r0, #0x8] + lsl r0, r0, #0x1 + add r0, r0, r2 + ldrh r0, [r0] + strh r0, [r1] +._703: + add sp, sp, #0x4 + pop {r4, r5, r6} + pop {r0} + bx r0 +._708: + .align 2, 0 +._707: + .word gUnknown_Debug_2038A20 + .word 0x5000142 + .word gUnknown_Debug_083F8790 + + thumb_func_end debug_80C6FA8 + + thumb_func_start debug_80C71FC +debug_80C71FC: + push {r4, r5, r6, lr} + add r5, r0, #0 + lsl r5, r5, #0x18 + lsr r5, r5, #0x18 + ldr r6, ._709 + ldr r4, ._709 + 4 + ldr r0, [r4] + ldrb r1, [r0, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldrb r0, [r0, #0x5] + lsr r0, r0, #0x4 + bl GetSpritePaletteTagByPaletteNum + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl FreeSpritePaletteByTag + ldr r0, [r4] + ldrb r1, [r0, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + bl DestroySprite + ldr r0, [r4] + ldrb r1, [r0, #0x3] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldrb r0, [r0, #0x5] + lsr r0, r0, #0x4 + bl GetSpritePaletteTagByPaletteNum + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl FreeSpritePaletteByTag + ldr r0, [r4] + ldrb r1, [r0, #0x3] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + bl DestroySprite + ldr r0, [r4] + ldrb r1, [r0, #0x4] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + bl sub_809D510 + ldr r1, ._709 + 8 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._709 + 12 + str r1, [r0] + pop {r4, r5, r6} + pop {r0} + bx r0 +._710: + .align 2, 0 +._709: + .word gSprites + .word gUnknown_Debug_2038A20 + .word gTasks + .word debug_80C6CB8+1 + + thumb_func_end debug_80C71FC + + thumb_func_start debug_80C7294 +debug_80C7294: + push {r4, r5, r6, r7, lr} + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 + ldr r0, ._713 + ldrh r2, [r0, #0x2e] + mov r1, #0x1 + and r1, r1, r2 + add r3, r0, #0 + cmp r1, #0 + beq ._711 @cond_branch + ldr r0, ._713 + 4 + ldr r1, [r0] + mov r0, #0x0 + strb r0, [r1, #0x5] + ldr r1, ._713 + 8 + ldr r2, ._713 + 12 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._713 + 16 + add r0, r2, #0 + strh r0, [r1] + b ._712 +._714: + .align 2, 0 +._713: + .word gMain + .word gUnknown_Debug_2038A20 + .word 0x4000040 + .word 0x51ef + .word 0x699f +._711: + mov r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + beq ._715 @cond_branch + ldr r6, ._717 + ldr r0, [r6] + strb r1, [r0, #0x5] + ldr r1, ._717 + 4 + ldr r2, ._717 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._717 + 12 + add r0, r2, #0 + strh r0, [r1] + ldr r0, [r6] + add r0, r0, #0x10 + ldr r4, ._717 + 16 + add r1, r4, #0 + mov r2, #0x10 + bl CpuSet + ldr r0, [r6] + add r0, r0, #0x10 + ldr r5, ._717 + 20 + add r1, r5, #0 + mov r2, #0x10 + bl CpuSet + ldr r1, [r6] + add r0, r1, #0 + add r0, r0, #0x10 + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x5 + mov r2, #0x80 + lsl r2, r2, #0x1 + add r4, r4, r2 + add r1, r1, r4 + mov r2, #0x10 + bl CpuSet + ldr r1, [r6] + add r0, r1, #0 + add r0, r0, #0x10 + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x5 + mov r2, #0x80 + lsl r2, r2, #0x1 + add r5, r5, r2 + add r1, r1, r5 + mov r2, #0x10 + bl CpuSet +._712: + ldr r1, ._717 + 24 + lsl r0, r7, #0x2 + add r0, r0, r7 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._717 + 28 + str r1, [r0] + b ._754 +._718: + .align 2, 0 +._717: + .word gUnknown_Debug_2038A20 + .word 0x4000040 + .word 0x51ef + .word 0x699f + .word gPlttBufferUnfaded+0x100 + .word gPlttBufferFaded+0x100 + .word gTasks + .word debug_80C6EE8+1 +._715: + ldrh r1, [r3, #0x30] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._720 @cond_branch + ldr r0, ._722 + ldr r1, [r0] + ldrb r0, [r1, #0xa] + cmp r0, #0x1 + bhi ._720 @cond_branch + add r0, r0, #0x1 + strb r0, [r1, #0xa] + b ._754 +._723: + .align 2, 0 +._722: + .word gUnknown_Debug_2038A20 +._720: + ldrh r1, [r3, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._725 @cond_branch + ldr r0, ._727 + ldr r1, [r0] + ldrb r0, [r1, #0xa] + cmp r0, #0 + beq ._725 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1, #0xa] + b ._754 +._728: + .align 2, 0 +._727: + .word gUnknown_Debug_2038A20 +._725: + ldrh r1, [r3, #0x30] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._729 @cond_branch + ldr r0, ._734 + ldr r2, [r0] + ldrb r0, [r2, #0xa] + cmp r0, #0x1 + beq ._730 @cond_branch + cmp r0, #0x1 + bgt ._731 @cond_branch + cmp r0, #0 + beq ._732 @cond_branch + b ._754 +._735: + .align 2, 0 +._734: + .word gUnknown_Debug_2038A20 +._731: + cmp r0, #0x2 + beq ._736 @cond_branch + b ._754 +._732: + ldrb r3, [r2, #0xc] + lsl r1, r3, #0x1b + lsr r0, r1, #0x1b + cmp r0, #0x1e + bhi ._761 @cond_branch + add r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + mov r1, #0x20 + neg r1, r1 + and r1, r1, r3 + orr r1, r1, r0 + strb r1, [r2, #0xc] + b ._761 +._730: + ldrh r3, [r2, #0xc] + lsl r1, r3, #0x16 + lsr r0, r1, #0x1b + cmp r0, #0x1e + bhi ._761 @cond_branch + add r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x5 + ldr r1, ._742 + and r1, r1, r3 + orr r1, r1, r0 + strh r1, [r2, #0xc] + b ._761 +._743: + .align 2, 0 +._742: + .word 0xfffffc1f +._736: + ldrb r3, [r2, #0xd] + lsl r1, r3, #0x19 + lsr r0, r1, #0x1b + cmp r0, #0x1e + bhi ._761 @cond_branch + add r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x2 + mov r1, #0x7d + neg r1, r1 + and r1, r1, r3 + orr r1, r1, r0 + strb r1, [r2, #0xd] + b ._761 +._729: + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._754 @cond_branch + ldr r0, ._751 + ldr r3, [r0] + ldrb r0, [r3, #0xa] + cmp r0, #0x1 + beq ._747 @cond_branch + cmp r0, #0x1 + bgt ._748 @cond_branch + cmp r0, #0 + beq ._749 @cond_branch + b ._754 +._752: + .align 2, 0 +._751: + .word gUnknown_Debug_2038A20 +._748: + cmp r0, #0x2 + beq ._753 @cond_branch + b ._754 +._749: + ldrb r2, [r3, #0xc] + mov r0, #0x1f + and r0, r0, r2 + cmp r0, #0 + beq ._761 @cond_branch + lsl r0, r2, #0x1b + lsr r0, r0, #0x1b + sub r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + mov r1, #0x20 + neg r1, r1 + and r1, r1, r2 + orr r1, r1, r0 + strb r1, [r3, #0xc] + b ._761 +._747: + ldrh r2, [r3, #0xc] + mov r0, #0xf8 + lsl r0, r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + beq ._761 @cond_branch + lsl r0, r2, #0x16 + lsr r0, r0, #0x1b + sub r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x5 + ldr r1, ._759 + and r1, r1, r2 + orr r1, r1, r0 + strh r1, [r3, #0xc] + b ._761 +._760: + .align 2, 0 +._759: + .word 0xfffffc1f +._753: + ldrb r2, [r3, #0xd] + mov r0, #0x7c + and r0, r0, r2 + cmp r0, #0 + beq ._761 @cond_branch + lsl r0, r2, #0x19 + lsr r0, r0, #0x1b + sub r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x2 + mov r1, #0x7d + neg r1, r1 + and r1, r1, r2 + orr r1, r1, r0 + strb r1, [r3, #0xd] +._761: + ldr r0, ._762 + lsl r1, r7, #0x2 + add r1, r1, r7 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._762 + 4 + str r0, [r1] +._754: + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._763: + .align 2, 0 +._762: + .word gTasks + .word debug_80C74E4+1 + + thumb_func_end debug_80C7294 + + thumb_func_start debug_80C74E4 +debug_80C74E4: + push {r4, r5, r6, lr} + mov r6, r8 + push {r6} + add r5, r0, #0 + lsl r5, r5, #0x18 + lsr r5, r5, #0x18 + ldr r0, ._764 + ldr r3, [r0] + ldrb r0, [r3, #0xc] + lsl r0, r0, #0x1b + lsr r0, r0, #0x1b + ldrh r2, [r3, #0xc] + mov r1, #0xf8 + lsl r1, r1, #0x2 + and r1, r1, r2 + add r0, r0, r1 + ldrb r1, [r3, #0xd] + lsl r1, r1, #0x19 + lsr r1, r1, #0x1b + lsl r1, r1, #0xa + add r0, r0, r1 + ldr r6, ._764 + 4 + ldrb r1, [r3, #0x7] + add r1, r1, #0x81 + lsl r1, r1, #0x1 + add r1, r1, r6 + strh r0, [r1] + ldr r1, ._764 + 8 + mov r8, r1 + ldrb r1, [r3, #0x7] + add r1, r1, #0x81 + lsl r1, r1, #0x1 + add r1, r1, r8 + strh r0, [r1] + ldrb r1, [r3, #0x6] + lsl r1, r1, #0x4 + ldrb r2, [r3, #0x7] + ldr r4, ._764 + 12 + add r2, r2, r4 + add r1, r1, r2 + lsl r1, r1, #0x1 + add r1, r1, r6 + strh r0, [r1] + ldrb r1, [r3, #0x6] + lsl r1, r1, #0x4 + ldrb r2, [r3, #0x7] + add r2, r2, r4 + add r1, r1, r2 + lsl r1, r1, #0x1 + add r1, r1, r8 + strh r0, [r1] + mov r1, #0xe + mov r2, #0xa + mov r3, #0x4 + bl debug_80C68CC + ldr r1, ._764 + 16 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._764 + 20 + str r1, [r0] + pop {r3} + mov r8, r3 + pop {r4, r5, r6} + pop {r0} + bx r0 +._765: + .align 2, 0 +._764: + .word gUnknown_Debug_2038A20 + .word gPlttBufferUnfaded + .word gPlttBufferFaded + .word 0x101 + .word gTasks + .word debug_80C7294+1 + + thumb_func_end debug_80C74E4 + + thumb_func_start debug_80C7584 +debug_80C7584: + push {r4, lr} + add r2, r0, #0 + ldr r0, ._771 + ldr r3, [r0] + ldrb r1, [r3, #0x5] + add r4, r0, #0 + cmp r1, #0 + beq ._766 @cond_branch + mov r1, #0x2e + ldsh r0, [r2, r1] + cmp r0, #0x1 + beq ._767 @cond_branch + cmp r0, #0x1 + ble ._768 @cond_branch + cmp r0, #0x2 + beq ._769 @cond_branch +._768: + ldrb r0, [r3, #0xc] + lsl r0, r0, #0x1b + b ._773 +._772: + .align 2, 0 +._771: + .word gUnknown_Debug_2038A20 +._767: + ldrh r0, [r3, #0xc] + lsl r0, r0, #0x16 + b ._773 +._769: + ldrb r0, [r3, #0xd] + lsl r0, r0, #0x19 +._773: + lsr r0, r0, #0x1b + lsl r0, r0, #0x2 + strh r0, [r2, #0x24] + mov r1, #0x2e + ldsh r0, [r2, r1] + lsl r0, r0, #0x3 + strh r0, [r2, #0x26] + ldrh r0, [r2, #0x30] + add r3, r0, #1 + strh r3, [r2, #0x30] + mov r0, #0x2e + ldsh r1, [r2, r0] + ldr r0, [r4] + ldrb r0, [r0, #0xa] + cmp r1, r0 + bne ._775 @cond_branch + mov r0, #0x8 + and r3, r3, r0 + cmp r3, #0 + bne ._775 @cond_branch +._766: + add r0, r2, #0 + add r0, r0, #0x3e + ldrb r1, [r0] + mov r2, #0x4 + orr r1, r1, r2 + strb r1, [r0] + b ._776 +._775: + add r2, r2, #0x3e + ldrb r1, [r2] + mov r0, #0x5 + neg r0, r0 + and r0, r0, r1 + strb r0, [r2] +._776: + pop {r4} + pop {r0} + bx r0 + + thumb_func_end debug_80C7584 + + thumb_func_start InitSeeTrainers +InitSeeTrainers: + push {r4, r5, r6, lr} + add sp, sp, #0xfffffffc + bl debug_80C35DC + ldr r1, ._777 + ldr r2, ._777 + 4 + ldr r0, ._777 + 8 + str r1, [r0] + str r2, [r0, #0x4] + ldr r1, ._777 + 12 + str r1, [r0, #0x8] + ldr r0, [r0, #0x8] + ldr r0, ._777 + 16 + mov r1, #0x80 + mov r2, #0x60 + bl LoadPalette + mov r0, #0x1 + neg r0, r0 + mov r5, #0x0 + str r5, [sp] + mov r1, #0x0 + mov r2, #0x10 + mov r3, #0x0 + bl BeginNormalPaletteFade + ldr r0, ._777 + 20 + mov r6, #0x0 + strh r5, [r0] + add r0, r0, #0x4 + strh r5, [r0] + sub r0, r0, #0x2 + strh r5, [r0] + add r0, r0, #0x4 + strh r5, [r0] + ldr r1, ._777 + 24 + mov r0, #0x3f + strh r0, [r1] + add r1, r1, #0x2 + mov r0, #0x1f + strh r0, [r1] + add r1, r1, #0x6 + mov r0, #0xf1 + strh r0, [r1] + ldr r0, ._777 + 28 + strh r5, [r0] + add r1, r1, #0x4 + mov r0, #0x7 + strh r0, [r1] + ldr r3, ._777 + 32 + ldrh r2, [r3] + strh r5, [r3] + ldr r4, ._777 + 36 + ldrh r0, [r4] + mov r1, #0x1 + orr r0, r0, r1 + strh r0, [r4] + strh r2, [r3] + ldr r0, ._777 + 40 + bl SetVBlankCallback + ldr r0, ._777 + 44 + bl SetMainCallback2 + ldr r1, ._777 + 48 + ldr r2, ._777 + 52 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x2 + ldr r2, ._777 + 56 + add r0, r2, #0 + strh r0, [r1] + sub r1, r1, #0xa + mov r2, #0xcd + lsl r2, r2, #0x6 + add r0, r2, #0 + strh r0, [r1] + ldr r0, ._777 + 60 + mov r1, #0x0 + bl CreateTask + ldr r1, ._777 + 64 + ldr r0, ._777 + 68 + str r0, [r1] + strh r5, [r0] + strb r6, [r0, #0x2] + strb r6, [r0, #0x3] + strb r6, [r0, #0x5] + strb r6, [r0, #0x7] + strb r6, [r0, #0xa] + strb r6, [r0, #0x8] + ldr r4, ._777 + 72 + add r0, r4, #0 + mov r1, #0x6c + mov r2, #0x74 + mov r3, #0x0 + bl CreateSprite + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + ldr r6, ._777 + 76 + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + strh r5, [r0, #0x2e] + mov r1, #0x0 + bl StartSpriteAnim + add r0, r4, #0 + mov r1, #0x6c + mov r2, #0x74 + mov r3, #0x0 + bl CreateSprite + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + mov r1, #0x1 + strh r1, [r0, #0x2e] + bl StartSpriteAnim + add r0, r4, #0 + mov r1, #0x6c + mov r2, #0x74 + mov r3, #0x0 + bl CreateSprite + add r1, r0, #0 + lsl r1, r1, #0x18 + lsr r1, r1, #0x18 + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + mov r1, #0x2 + strh r1, [r0, #0x2e] + bl StartSpriteAnim + add sp, sp, #0x4 + pop {r4, r5, r6} + pop {r0} + bx r0 +._778: + .align 2, 0 +._777: + .word byte_83F88EC + .word 0x600e000 + .word 0x40000d4 + .word 0x80000400 + .word word_83F888C + .word 0x4000040 + .word 0x4000048 + .word 0x4000052 + .word 0x4000208 + .word 0x4000200 + .word debug_80C3758+1 + .word debug_80C370C+1 + .word 0x4000008 + .word 0x1f0b + .word 0x1e0a + .word debug_80C777C+1 + .word gUnknown_Debug_2038A20 + .word +0x2018000 + .word gSpriteTemplate_83F8874 + .word gSprites + + thumb_func_end InitSeeTrainers + + thumb_func_start debug_80C777C +debug_80C777C: + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + add sp, sp, #0xffffffec + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 + ldr r1, ._784 + mov r0, sp + mov r2, #0x12 + bl memcpy + mov r0, #0x9 + mov r1, #0x0 + mov r2, #0xe + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + mov r0, #0x0 + mov r1, #0x0 + mov r2, #0x9 + mov r3, #0x9 + bl Menu_DrawStdWindowFrame + mov r0, #0x0 + mov r1, #0xa + mov r2, #0x9 + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r0, #0xe + mov r1, #0x0 + mov r2, #0x1d + mov r3, #0x7 + bl Menu_DrawStdWindowFrame + ldr r0, ._784 + 4 + mov r1, #0xf + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._784 + 8 + mov r1, #0x19 + mov r2, #0x1 + bl Menu_PrintText + ldr r0, ._784 + 12 + mov r1, #0xf + mov r2, #0x5 + bl Menu_PrintText + mov r0, #0xa + mov r1, #0x8 + mov r2, #0x1d + mov r3, #0xc + bl Menu_DrawStdWindowFrame + mov r2, #0x0 + ldr r4, ._784 + 16 + ldr r0, ._784 + 20 + add r3, r0, #0 +._779: + lsl r0, r2, #0x1 + add r0, r0, r4 + add r1, r2, r3 + strh r1, [r0] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0xe + bls ._779 @cond_branch + mov r2, #0x0 + ldr r5, ._784 + 24 + lsl r6, r7, #0x2 + mov r8, r6 + ldr r4, ._784 + 28 + ldr r0, ._784 + 32 + add r3, r0, #0 +._780: + lsl r0, r2, #0x1 + add r0, r0, r4 + add r1, r2, r3 + strh r1, [r0] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0xe + bls ._780 @cond_branch + add r0, r5, #0 + mov r1, #0x14 + mov r2, #0xa + bl Menu_PrintText + mov r0, #0xa + mov r1, #0xd + mov r2, #0x1d + mov r3, #0x13 + bl Menu_DrawStdWindowFrame + mov r1, sp + mov r0, #0x23 + strb r0, [r1] + mov r2, #0x0 + ldr r4, ._784 + 36 + mov r5, #0x93 + lsl r5, r5, #0x8 + add r3, r5, #0 +._781: + lsl r1, r2, #0x1 + add r1, r1, r4 + mov r6, sp + add r0, r6, r2 + ldrb r0, [r0] + add r0, r0, r3 + strh r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x11 + bls ._781 @cond_branch + mov r1, sp + mov r0, #0x24 + strb r0, [r1] + mov r2, #0x0 + ldr r5, ._784 + 40 + ldr r4, ._784 + 44 + mov r0, #0x93 + lsl r0, r0, #0x8 + add r3, r0, #0 +._782: + lsl r1, r2, #0x1 + add r1, r1, r4 + mov r6, sp + add r0, r6, r2 + ldrb r0, [r0] + add r0, r0, r3 + strh r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x11 + bls ._782 @cond_branch + mov r1, sp + mov r0, #0x25 + strb r0, [r1] + mov r2, #0x0 + ldr r4, ._784 + 48 + mov r0, #0x93 + lsl r0, r0, #0x8 + add r3, r0, #0 +._783: + lsl r1, r2, #0x1 + add r1, r1, r4 + mov r6, sp + add r0, r6, r2 + ldrb r0, [r0] + add r0, r0, r3 + strh r0, [r1] + add r0, r2, #1 + lsl r0, r0, #0x18 + lsr r2, r0, #0x18 + cmp r2, #0x11 + bls ._783 @cond_branch + add r0, r5, #0 + mov r1, #0xf + mov r2, #0x11 + bl Menu_PrintText + ldr r1, ._784 + 52 + ldr r2, ._784 + 56 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r5, ._784 + 60 + add r0, r5, #0 + strh r0, [r1] + ldr r1, ._784 + 64 + mov r6, r8 + add r0, r6, r7 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._784 + 68 + str r1, [r0] + add sp, sp, #0x14 + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._785: + .align 2, 0 +._784: + .word gUnknown_Debug_083F8815 + .word gUnknown_Debug_083F87D0 + .word gUnknown_Debug_083F87D8 + .word gUnknown_Debug_083F87E0 + .word 0x600fa56 + .word 0xa311 + .word gUnknown_Debug_083F87F4 + .word 0x600f256 + .word 0x8301 + .word 0x600f396 + .word gUnknown_Debug_083F8801 + .word 0x600f3d6 + .word 0x600f416 + .word 0x4000040 + .word 0x51ef + .word 0x699f + .word gTasks + .word debug_80C7934+1 + + thumb_func_end debug_80C777C + + thumb_func_start debug_80C7934 +debug_80C7934: + push {r4, r5, r6, lr} + mov r6, r8 + push {r6} + add sp, sp, #0xfffffff8 + mov r8, r0 + lsl r0, r0, #0x18 + lsr r0, r0, #0x18 + mov r8, r0 + ldr r5, ._786 + ldr r6, [r5] + ldrh r2, [r6] + lsl r0, r2, #0x3 + ldr r1, ._786 + 4 + add r0, r0, r1 + ldr r1, ._786 + 8 + lsl r2, r2, #0x2 + add r2, r2, r1 + ldrb r1, [r2] + ldrb r2, [r2, #0x1] + ldr r4, ._786 + 12 + ldr r3, [r4] + ldr r4, [r4, #0x4] + str r4, [sp] + ldrh r4, [r6] + str r4, [sp, #0x4] + bl DecompressPicFromTable_2 + ldr r0, [r5] + ldrh r0, [r0] + lsl r0, r0, #0x3 + ldr r1, ._786 + 16 + add r0, r0, r1 + bl LoadCompressedObjectPalette + ldr r0, [r5] + ldrh r0, [r0] + mov r1, #0x1 + bl GetMonSpriteTemplate_803C5A0 + ldr r0, ._786 + 20 + mov r1, #0x28 + mov r2, #0x28 + mov r3, #0x0 + bl CreateSprite + ldr r1, [r5] + mov r6, #0x0 + strb r0, [r1, #0x2] + ldr r4, ._786 + 24 + ldr r2, [r5] + ldrb r1, [r2, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r1, r4, #0 + add r1, r1, #0x1c + add r0, r0, r1 + ldr r1, ._786 + 28 + str r1, [r0] + ldrb r0, [r2, #0x2] + lsl r1, r0, #0x4 + add r1, r1, r0 + lsl r1, r1, #0x2 + add r1, r1, r4 + ldrb r2, [r1, #0x5] + mov r0, #0xd + neg r0, r0 + and r0, r0, r2 + strb r0, [r1, #0x5] + ldr r0, [r5] + ldrh r0, [r0] + mov r1, #0x1a + mov r2, #0x5 + bl debug_80C376C + ldr r2, [r5] + ldrb r1, [r2, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r4 + ldrb r0, [r0, #0x5] + lsr r0, r0, #0x4 + strb r0, [r2, #0x6] + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + ldr r4, ._786 + 32 + add r0, r0, r4 + ldr r2, ._786 + 36 + add r1, r4, r2 + mov r2, #0x10 + bl CpuSet + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + add r0, r0, r4 + ldr r1, ._786 + 40 + mov r2, #0x10 + bl CpuSet + ldr r1, ._786 + 44 + mov r2, r8 + lsl r0, r2, #0x2 + add r0, r0, r8 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._786 + 48 + str r1, [r0] + ldr r0, [r5] + strb r6, [r0, #0x9] + add sp, sp, #0x8 + pop {r3} + mov r8, r3 + pop {r4, r5, r6} + pop {r0} + bx r0 +._787: + .align 2, 0 +._786: + .word gUnknown_Debug_2038A20 + .word gTrainerFrontPicTable + .word gTrainerFrontPicCoords + .word gUnknown_081FAF4C + .word gTrainerFrontPicPaletteTable + .word gUnknown_02024E8C + .word gSprites + .word debug_69+1 + .word gPlttBufferUnfaded+0x200 + .word 0xffffff00 + .word gPlttBufferFaded+0x100 + .word gTasks + .word debug_80C7A54+1 + + thumb_func_end debug_80C7934 + + thumb_func_start debug_80C7A54 +debug_80C7A54: + push {r4, r5, r6, lr} + add r6, r0, #0 + lsl r6, r6, #0x18 + lsr r6, r6, #0x18 + ldr r4, ._788 + ldr r5, ._788 + 4 + ldr r1, [r5] + add r1, r1, #0x10 + add r0, r4, #0 + mov r2, #0x10 + bl CpuSet + ldr r0, ._788 + 8 + add r4, r4, r0 + ldr r3, [r5] + ldrb r0, [r3, #0x7] + add r0, r0, #0x81 + lsl r0, r0, #0x1 + add r0, r0, r4 + ldrh r4, [r0] + mov r1, #0x1f + and r1, r1, r4 + ldrb r2, [r3, #0xc] + mov r0, #0x20 + neg r0, r0 + and r0, r0, r2 + orr r0, r0, r1 + strb r0, [r3, #0xc] + ldr r3, [r5] + mov r1, #0xf8 + lsl r1, r1, #0x2 + and r1, r1, r4 + ldrh r2, [r3, #0xc] + ldr r0, ._788 + 12 + and r0, r0, r2 + orr r0, r0, r1 + strh r0, [r3, #0xc] + mov r1, #0xf8 + lsl r1, r1, #0x7 + and r1, r1, r4 + lsr r1, r1, #0x8 + ldrb r2, [r3, #0xd] + mov r0, #0x7d + neg r0, r0 + and r0, r0, r2 + orr r0, r0, r1 + strb r0, [r3, #0xd] + ldr r2, [r5] + ldrb r1, [r2, #0xd] + mov r0, #0x7f + and r0, r0, r1 + strb r0, [r2, #0xd] + ldr r0, [r5] + ldrb r0, [r0, #0x7] + add r0, r0, #0x1 + mov r1, #0xb + mov r2, #0xa + mov r3, #0x2 + bl debug_80C68CC + ldr r0, ._788 + 16 + mov r1, #0xd + mov r2, #0xa + bl Menu_PrintText + add r0, r4, #0 + mov r1, #0xe + mov r2, #0xa + mov r3, #0x4 + bl debug_80C68CC + ldr r1, ._788 + 20 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._788 + 24 + str r1, [r0] + pop {r4, r5, r6} + pop {r0} + bx r0 +._789: + .align 2, 0 +._788: + .word gPlttBufferUnfaded+0x100 + .word gUnknown_Debug_2038A20 + .word 0xffffff00 + .word 0xfffffc1f + .word gUnknown_Debug_083F8813 + .word gTasks + .word debug_80C7B14+1 + + thumb_func_end debug_80C7A54 + + thumb_func_start debug_80C7B14 +debug_80C7B14: + push {r4, r5, r6, lr} + add sp, sp, #0xfffffffc + lsl r0, r0, #0x18 + lsr r6, r0, #0x18 + ldr r1, ._792 + ldrh r3, [r1, #0x2e] + mov r0, #0x2 + and r0, r0, r3 + add r4, r1, #0 + cmp r0, #0 + beq ._790 @cond_branch + mov r0, #0x5 + bl PlaySE + mov r0, #0x1 + neg r0, r0 + mov r1, #0x0 + str r1, [sp] + mov r2, #0x0 + mov r3, #0x10 + bl BeginNormalPaletteFade + ldr r0, ._792 + 4 + bl SetMainCallback2 + ldr r1, ._792 + 8 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._792 + 12 + str r1, [r0] + b ._821 +._793: + .align 2, 0 +._792: + .word gMain + .word debug_80C370C+1 + .word gTasks + .word debug_80C373C+1 +._790: + ldrh r1, [r4, #0x30] + mov r0, #0x80 + lsl r0, r0, #0x1 + and r0, r0, r1 + cmp r0, #0 + beq ._794 @cond_branch + ldr r4, ._796 + ldr r0, [r4] + ldrh r1, [r0] + mov r0, #0x0 + b ._795 +._797: + .align 2, 0 +._796: + .word gUnknown_Debug_2038A20 +._794: + mov r0, #0x80 + lsl r0, r0, #0x2 + and r0, r0, r1 + cmp r0, #0 + beq ._798 @cond_branch + ldr r4, ._800 + ldr r0, [r4] + ldrh r1, [r0] + mov r0, #0x1 +._795: + bl debug_80C38B4 + ldr r1, [r4] + strh r0, [r1] + ldr r1, ._800 + 4 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._800 + 8 + str r1, [r0] + b ._821 +._801: + .align 2, 0 +._800: + .word gUnknown_Debug_2038A20 + .word gTasks + .word debug_80C7D44+1 +._798: + mov r2, #0x1 + and r2, r2, r3 + cmp r2, #0 + beq ._802 @cond_branch + ldr r0, ._804 + ldr r1, [r0] + mov r0, #0x1 + strb r0, [r1, #0x5] + ldr r1, ._804 + 4 + ldr r2, ._804 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._804 + 12 + add r0, r2, #0 + strh r0, [r1] + ldr r1, ._804 + 16 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._804 + 20 + str r1, [r0] + b ._821 +._805: + .align 2, 0 +._804: + .word gUnknown_Debug_2038A20 + .word 0x4000040 + .word 0x51ef + .word 0x4167 + .word gTasks + .word debug_80C7DDC+1 +._802: + mov r0, #0x10 + and r0, r0, r1 + ldr r3, ._809 + cmp r0, #0 + beq ._807 @cond_branch + ldr r1, [r3] + ldrb r0, [r1, #0x7] + cmp r0, #0xd + bhi ._807 @cond_branch + lsl r0, r0, #0x1 + ldr r1, ._809 + 4 + add r0, r0, r1 + strh r2, [r0] + ldr r1, [r3] + ldrb r0, [r1, #0x7] + add r0, r0, #0x1 + strb r0, [r1, #0x7] + b ._813 +._810: + .align 2, 0 +._809: + .word gUnknown_Debug_2038A20 + .word 0x5000102 +._807: + ldrh r1, [r4, #0x30] + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._812 @cond_branch + ldr r1, [r3] + ldrb r0, [r1, #0x7] + cmp r0, #0 + beq ._812 @cond_branch + lsl r0, r0, #0x1 + ldr r2, ._814 + add r0, r0, r2 + mov r1, #0x0 + strh r1, [r0] + ldr r1, [r3] + ldrb r0, [r1, #0x7] + sub r0, r0, #0x1 + strb r0, [r1, #0x7] + b ._813 +._815: + .align 2, 0 +._814: + .word 0x5000102 +._812: + ldrh r1, [r4, #0x2e] + mov r0, #0x8 + and r0, r0, r1 + cmp r0, #0 + beq ._816 @cond_branch + ldr r4, ._819 + ldr r2, [r4] + ldrb r0, [r2, #0x9] + mov r1, #0x1 + eor r0, r0, r1 + strb r0, [r2, #0x9] + ldr r1, [r4] + ldrb r0, [r1, #0x9] + cmp r0, #0 + beq ._817 @cond_branch + ldrh r0, [r1] + mov r1, #0x0 + mov r2, #0x0 + bl GetMonSpritePalFromOtIdPersonality + ldr r1, [r4] + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x14 + mov r2, #0x80 + lsl r2, r2, #0x11 + add r1, r1, r2 + lsr r1, r1, #0x10 + mov r2, #0x20 + bl LoadCompressedPalette + b ._818 +._820: + .align 2, 0 +._819: + .word gUnknown_Debug_2038A20 +._817: + ldrh r0, [r1] + mov r1, #0x0 + mov r2, #0x9 + bl GetMonSpritePalFromOtIdPersonality + ldr r1, [r4] + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x14 + mov r2, #0x80 + lsl r2, r2, #0x11 + add r1, r1, r2 + lsr r1, r1, #0x10 + mov r2, #0x20 + bl LoadCompressedPalette +._818: + ldr r5, ._822 + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + ldr r4, ._822 + 4 + add r0, r0, r4 + ldr r2, ._822 + 8 + add r1, r4, r2 + mov r2, #0x10 + bl CpuSet + ldr r0, [r5] + ldrb r0, [r0, #0x6] + lsl r0, r0, #0x5 + add r0, r0, r4 + ldr r1, ._822 + 12 + mov r2, #0x10 + bl CpuSet +._813: + ldr r1, ._822 + 16 + lsl r0, r6, #0x2 + add r0, r0, r6 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._822 + 20 + str r1, [r0] + b ._821 +._823: + .align 2, 0 +._822: + .word gUnknown_Debug_2038A20 + .word gPlttBufferUnfaded+0x200 + .word 0xffffff00 + .word gPlttBufferFaded+0x100 + .word gTasks + .word debug_80C7A54+1 +._816: + ldr r1, [r3] + ldrb r0, [r1, #0x8] + add r0, r0, #0x4 + strb r0, [r1, #0x8] + ldr r2, [r3] + ldrb r1, [r2, #0x8] + mov r0, #0x1f + and r0, r0, r1 + strb r0, [r2, #0x8] + ldr r0, [r3] + ldrb r1, [r0, #0x7] + lsl r1, r1, #0x1 + ldr r2, ._824 + add r1, r1, r2 + ldr r2, ._824 + 4 + ldrb r0, [r0, #0x8] + lsl r0, r0, #0x1 + add r0, r0, r2 + ldrh r0, [r0] + strh r0, [r1] +._821: + add sp, sp, #0x4 + pop {r4, r5, r6} + pop {r0} + bx r0 +._825: + .align 2, 0 +._824: + .word 0x5000142 + .word gUnknown_Debug_083F8790 + + thumb_func_end debug_80C7B14 + + thumb_func_start debug_80C7D44 +debug_80C7D44: + push {r4, r5, r6, lr} + add r5, r0, #0 + lsl r5, r5, #0x18 + lsr r5, r5, #0x18 + ldr r6, ._826 + ldr r4, ._826 + 4 + ldr r0, [r4] + ldrb r1, [r0, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldrb r0, [r0, #0x5] + lsr r0, r0, #0x4 + bl GetSpritePaletteTagByPaletteNum + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl FreeSpritePaletteByTag + ldr r0, [r4] + ldrb r1, [r0, #0x2] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + bl DestroySprite + ldr r0, [r4] + ldrb r1, [r0, #0x3] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + ldrb r0, [r0, #0x5] + lsr r0, r0, #0x4 + bl GetSpritePaletteTagByPaletteNum + lsl r0, r0, #0x10 + lsr r0, r0, #0x10 + bl FreeSpritePaletteByTag + ldr r0, [r4] + ldrb r1, [r0, #0x3] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + bl DestroySprite + ldr r0, [r4] + ldrb r1, [r0, #0x4] + lsl r0, r1, #0x4 + add r0, r0, r1 + lsl r0, r0, #0x2 + add r0, r0, r6 + bl sub_809D510 + ldr r1, ._826 + 8 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._826 + 12 + str r1, [r0] + pop {r4, r5, r6} + pop {r0} + bx r0 +._827: + .align 2, 0 +._826: + .word gSprites + .word gUnknown_Debug_2038A20 + .word gTasks + .word debug_80C7934+1 + + thumb_func_end debug_80C7D44 + + thumb_func_start debug_80C7DDC +debug_80C7DDC: + push {r4, r5, r6, r7, lr} + lsl r0, r0, #0x18 + lsr r7, r0, #0x18 + ldr r0, ._830 + ldrh r2, [r0, #0x2e] + mov r1, #0x1 + and r1, r1, r2 + add r3, r0, #0 + cmp r1, #0 + beq ._828 @cond_branch + ldr r0, ._830 + 4 + ldr r1, [r0] + mov r0, #0x0 + strb r0, [r1, #0x5] + ldr r1, ._830 + 8 + ldr r2, ._830 + 12 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._830 + 16 + add r0, r2, #0 + strh r0, [r1] + b ._829 +._831: + .align 2, 0 +._830: + .word gMain + .word gUnknown_Debug_2038A20 + .word 0x4000040 + .word 0x51ef + .word 0x699f +._828: + mov r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + beq ._832 @cond_branch + ldr r6, ._834 + ldr r0, [r6] + strb r1, [r0, #0x5] + ldr r1, ._834 + 4 + ldr r2, ._834 + 8 + add r0, r2, #0 + strh r0, [r1] + add r1, r1, #0x4 + ldr r2, ._834 + 12 + add r0, r2, #0 + strh r0, [r1] + ldr r0, [r6] + add r0, r0, #0x10 + ldr r4, ._834 + 16 + add r1, r4, #0 + mov r2, #0x10 + bl CpuSet + ldr r0, [r6] + add r0, r0, #0x10 + ldr r5, ._834 + 20 + add r1, r5, #0 + mov r2, #0x10 + bl CpuSet + ldr r1, [r6] + add r0, r1, #0 + add r0, r0, #0x10 + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x5 + mov r2, #0x80 + lsl r2, r2, #0x1 + add r4, r4, r2 + add r1, r1, r4 + mov r2, #0x10 + bl CpuSet + ldr r1, [r6] + add r0, r1, #0 + add r0, r0, #0x10 + ldrb r1, [r1, #0x6] + lsl r1, r1, #0x5 + mov r2, #0x80 + lsl r2, r2, #0x1 + add r5, r5, r2 + add r1, r1, r5 + mov r2, #0x10 + bl CpuSet +._829: + ldr r1, ._834 + 24 + lsl r0, r7, #0x2 + add r0, r0, r7 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._834 + 28 + str r1, [r0] + b ._871 +._835: + .align 2, 0 +._834: + .word gUnknown_Debug_2038A20 + .word 0x4000040 + .word 0x51ef + .word 0x699f + .word gPlttBufferUnfaded+0x100 + .word gPlttBufferFaded+0x100 + .word gTasks + .word debug_80C7A54+1 +._832: + ldrh r1, [r3, #0x30] + mov r0, #0x80 + and r0, r0, r1 + cmp r0, #0 + beq ._837 @cond_branch + ldr r0, ._839 + ldr r1, [r0] + ldrb r0, [r1, #0xa] + cmp r0, #0x1 + bhi ._837 @cond_branch + add r0, r0, #0x1 + strb r0, [r1, #0xa] + b ._871 +._840: + .align 2, 0 +._839: + .word gUnknown_Debug_2038A20 +._837: + ldrh r1, [r3, #0x30] + mov r0, #0x40 + and r0, r0, r1 + cmp r0, #0 + beq ._842 @cond_branch + ldr r0, ._844 + ldr r1, [r0] + ldrb r0, [r1, #0xa] + cmp r0, #0 + beq ._842 @cond_branch + sub r0, r0, #0x1 + strb r0, [r1, #0xa] + b ._871 +._845: + .align 2, 0 +._844: + .word gUnknown_Debug_2038A20 +._842: + ldrh r1, [r3, #0x30] + mov r0, #0x10 + and r0, r0, r1 + cmp r0, #0 + beq ._846 @cond_branch + ldr r0, ._851 + ldr r2, [r0] + ldrb r0, [r2, #0xa] + cmp r0, #0x1 + beq ._847 @cond_branch + cmp r0, #0x1 + bgt ._848 @cond_branch + cmp r0, #0 + beq ._849 @cond_branch + b ._871 +._852: + .align 2, 0 +._851: + .word gUnknown_Debug_2038A20 +._848: + cmp r0, #0x2 + beq ._853 @cond_branch + b ._871 +._849: + ldrb r3, [r2, #0xc] + lsl r1, r3, #0x1b + lsr r0, r1, #0x1b + cmp r0, #0x1e + bhi ._878 @cond_branch + add r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + mov r1, #0x20 + neg r1, r1 + and r1, r1, r3 + orr r1, r1, r0 + strb r1, [r2, #0xc] + b ._878 +._847: + ldrh r3, [r2, #0xc] + lsl r1, r3, #0x16 + lsr r0, r1, #0x1b + cmp r0, #0x1e + bhi ._878 @cond_branch + add r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x5 + ldr r1, ._859 + and r1, r1, r3 + orr r1, r1, r0 + strh r1, [r2, #0xc] + b ._878 +._860: + .align 2, 0 +._859: + .word 0xfffffc1f +._853: + ldrb r3, [r2, #0xd] + lsl r1, r3, #0x19 + lsr r0, r1, #0x1b + cmp r0, #0x1e + bhi ._878 @cond_branch + add r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x2 + mov r1, #0x7d + neg r1, r1 + and r1, r1, r3 + orr r1, r1, r0 + strb r1, [r2, #0xd] + b ._878 +._846: + mov r0, #0x20 + and r0, r0, r1 + cmp r0, #0 + beq ._871 @cond_branch + ldr r0, ._868 + ldr r3, [r0] + ldrb r0, [r3, #0xa] + cmp r0, #0x1 + beq ._864 @cond_branch + cmp r0, #0x1 + bgt ._865 @cond_branch + cmp r0, #0 + beq ._866 @cond_branch + b ._871 +._869: + .align 2, 0 +._868: + .word gUnknown_Debug_2038A20 +._865: + cmp r0, #0x2 + beq ._870 @cond_branch + b ._871 +._866: + ldrb r2, [r3, #0xc] + mov r0, #0x1f + and r0, r0, r2 + cmp r0, #0 + beq ._878 @cond_branch + lsl r0, r2, #0x1b + lsr r0, r0, #0x1b + sub r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + mov r1, #0x20 + neg r1, r1 + and r1, r1, r2 + orr r1, r1, r0 + strb r1, [r3, #0xc] + b ._878 +._864: + ldrh r2, [r3, #0xc] + mov r0, #0xf8 + lsl r0, r0, #0x2 + and r0, r0, r2 + cmp r0, #0 + beq ._878 @cond_branch + lsl r0, r2, #0x16 + lsr r0, r0, #0x1b + sub r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x5 + ldr r1, ._876 + and r1, r1, r2 + orr r1, r1, r0 + strh r1, [r3, #0xc] + b ._878 +._877: + .align 2, 0 +._876: + .word 0xfffffc1f +._870: + ldrb r2, [r3, #0xd] + mov r0, #0x7c + and r0, r0, r2 + cmp r0, #0 + beq ._878 @cond_branch + lsl r0, r2, #0x19 + lsr r0, r0, #0x1b + sub r0, r0, #0x1 + mov r1, #0x1f + and r0, r0, r1 + lsl r0, r0, #0x2 + mov r1, #0x7d + neg r1, r1 + and r1, r1, r2 + orr r1, r1, r0 + strb r1, [r3, #0xd] +._878: + ldr r0, ._879 + lsl r1, r7, #0x2 + add r1, r1, r7 + lsl r1, r1, #0x3 + add r1, r1, r0 + ldr r0, ._879 + 4 + str r0, [r1] +._871: + pop {r4, r5, r6, r7} + pop {r0} + bx r0 +._880: + .align 2, 0 +._879: + .word gTasks + .word debug_80C802C+1 + + thumb_func_end debug_80C7DDC + + thumb_func_start debug_80C802C +debug_80C802C: + push {r4, r5, r6, lr} + mov r6, r8 + push {r6} + add r5, r0, #0 + lsl r5, r5, #0x18 + lsr r5, r5, #0x18 + ldr r0, ._881 + ldr r3, [r0] + ldrb r0, [r3, #0xc] + lsl r0, r0, #0x1b + lsr r0, r0, #0x1b + ldrh r2, [r3, #0xc] + mov r1, #0xf8 + lsl r1, r1, #0x2 + and r1, r1, r2 + add r0, r0, r1 + ldrb r1, [r3, #0xd] + lsl r1, r1, #0x19 + lsr r1, r1, #0x1b + lsl r1, r1, #0xa + add r0, r0, r1 + ldr r6, ._881 + 4 + ldrb r1, [r3, #0x7] + add r1, r1, #0x81 + lsl r1, r1, #0x1 + add r1, r1, r6 + strh r0, [r1] + ldr r1, ._881 + 8 + mov r8, r1 + ldrb r1, [r3, #0x7] + add r1, r1, #0x81 + lsl r1, r1, #0x1 + add r1, r1, r8 + strh r0, [r1] + ldrb r1, [r3, #0x6] + lsl r1, r1, #0x4 + ldrb r2, [r3, #0x7] + ldr r4, ._881 + 12 + add r2, r2, r4 + add r1, r1, r2 + lsl r1, r1, #0x1 + add r1, r1, r6 + strh r0, [r1] + ldrb r1, [r3, #0x6] + lsl r1, r1, #0x4 + ldrb r2, [r3, #0x7] + add r2, r2, r4 + add r1, r1, r2 + lsl r1, r1, #0x1 + add r1, r1, r8 + strh r0, [r1] + mov r1, #0xe + mov r2, #0xa + mov r3, #0x4 + bl debug_80C68CC + ldr r1, ._881 + 16 + lsl r0, r5, #0x2 + add r0, r0, r5 + lsl r0, r0, #0x3 + add r0, r0, r1 + ldr r1, ._881 + 20 + str r1, [r0] + pop {r3} + mov r8, r3 + pop {r4, r5, r6} + pop {r0} + bx r0 +._882: + .align 2, 0 +._881: + .word gUnknown_Debug_2038A20 + .word gPlttBufferUnfaded + .word gPlttBufferFaded + .word 0x101 + .word gTasks + .word debug_80C7DDC+1 + + thumb_func_end debug_80C802C + + .align 2, 0 + +.endif diff --git a/ld_script.txt b/ld_script.txt index 3a2bdac9e..40167f410 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -118,8 +118,11 @@ SECTIONS { src/battle/battle_setup.o(.text); src/engine/cable_club.o(.text); src/debug/tomomichi_debug_menu.o(.text); + asm/tomomichi_debug_menu.o(.text); src/debug/nohara_debug_menu.o(.text); + asm/nohara_debug_menu.o(.text); src/debug/mori_debug_menu.o(.text); + asm/taya_debug_window.o(.text); src/debug/taya_debug_window.o(.text); src/field/trainer_see.o(.text); src/field/wild_encounter.o(.text); @@ -152,6 +155,7 @@ SECTIONS { src/field/fldeff_escalator.o(.text); src/field/berry.o(.text); src/debug/watanabe_debug_menu.o(.text); + asm/watanabe_debug_menu.o(.text); src/field/script_menu.o(.text); src/engine/naming_screen.o(.text); src/field/money.o(.text); @@ -362,7 +366,7 @@ SECTIONS { src/unused_8124F94.o(.text); src/engine/save.o(.text); src/engine/mystery_event_script.o(.text); - src/debug/unk_debug_menu_3.o(.text); + asm/unk_debug_menu_3.o(.text); src/field/field_effect_helpers.o(.text); src/contest_ai.o(.text); src/unused_81258BC.o(.text); @@ -392,6 +396,7 @@ SECTIONS { src/pokemon/pokeblock_feed.o(.text); src/engine/clear_save_data_menu.o(.text); src/debug/nakamura_debug_menu.o(.text); + asm/nakamura_debug_menu.o(.text); src/scene/intro_credits_graphics.o(.text); src/scene/evolution_graphics.o(.text); src/field/bard_music.o(.text); diff --git a/src/debug/kagaya_debug_menu.c b/src/debug/kagaya_debug_menu.c index 89df82f04..3cb36ce0c 100644 --- a/src/debug/kagaya_debug_menu.c +++ b/src/debug/kagaya_debug_menu.c @@ -168,7 +168,7 @@ u8 debug_sub_80B07DC(void) u8 debug_sub_80B0800(void) { u8 r2; - + CloseMenu(); r2 = sub_8068F18(); if (r2 != 0) diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index 328903126..b8c4ed73e 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -16,6 +16,9 @@ EWRAM_DATA u16 _nakamuraDataC = 0; __attribute__((unused)) static u8 _nakamuraStatic0[0x18]; __attribute__((unused)) static u8 _nakamuraStatic18; +asm(".global _nakamuraStatic0"); +asm(".global _nakamuraStatic18"); + u8 debug_sub_815FC54(); u8 debug_sub_815F2B4(); u8 debug_sub_815FC94(); @@ -182,4860 +185,4 @@ const u8 Str_843E655[] = _("かい"); const u8 Str_843E658[] = _("0"); const u8 Str_843E65A[] = _("はんい"); -__attribute__((naked)) -void debug_sub_815F1B8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0xe\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._1\n" - " mov r0, #0x10\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xe\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0xf\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " add sp, sp, #0x8\n" - " pop {r0}\n" - " bx r0\n" - "._2:\n" - " .align 2, 0\n" - "._1:\n" - " .word _843E3DC\n" - "\n" - ); -} - -__attribute__((naked)) -void InitNakamuraDebugMenu() -{ - asm( - " push {lr}\n" - " bl debug_sub_815F1B8\n" - " ldr r1, ._3\n" - " ldr r0, ._3 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._4:\n" - " .align 2, 0\n" - "._3:\n" - " .word gMenuCallback\n" - " .word debug_sub_815F214+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F214() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._9\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._5 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " bl Menu_MoveCursor\n" - "._5:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._6 @cond_branch\n" - " mov r0, #0x1\n" - " bl Menu_MoveCursor\n" - "._6:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._7 @cond_branch\n" - " ldr r4, ._9 + 4\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x15\n" - " add r4, r4, #0x4\n" - " add r0, r0, r4\n" - " ldr r4, [r0]\n" - " bl Menu_DestroyCursor\n" - " bl _call_via_r4\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " b ._12\n" - "._10:\n" - " .align 2, 0\n" - "._9:\n" - " .word gMain\n" - " .word _843E3DC\n" - "._7:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._11 @cond_branch\n" - " mov r0, #0x0\n" - " b ._12\n" - "._11:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._12:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F284() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r0, ._14\n" - " ldrb r1, [r0, #0x7]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._13 @cond_branch\n" - " bl debug_sub_81381B4\n" - " mov r0, #0x5\n" - " mov r1, #0x0\n" - " bl OpenPartyMenu\n" - " add r0, r4, #0\n" - " bl DestroyTask\n" - "._13:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._15:\n" - " .align 2, 0\n" - "._14:\n" - " .word gPaletteFade\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815F2B4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " bl CloseMenu\n" - " bl Menu_EraseScreen\n" - " ldr r1, ._16\n" - " ldr r0, ._16 + 4\n" - " str r0, [r1, #0x8]\n" - " ldr r0, ._16 + 8\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " mov r0, #0x1\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._17:\n" - " .align 2, 0\n" - "._16:\n" - " .word gMain\n" - " .word sub_805469C+1\n" - " .word debug_sub_815F284+1\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815F2F4() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xfffffffc\n" - " bl CloseMenu\n" - " mov r7, #0x1\n" - "._34:\n" - " lsl r1, r7, #0x2\n" - " add r0, r1, r7\n" - " lsl r2, r0, #0x5\n" - " ldr r3, ._24\n" - " add r0, r2, r3\n" - " ldr r5, ._24 + 4\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " mov r9, r1\n" - " add r1, r7, #1\n" - " str r1, [sp]\n" - " cmp r0, #0\n" - " beq ._18 @cond_branch\n" - " b ._19\n" - "._18:\n" - " mov r5, #0x0\n" - " ldr r6, ._24 + 8\n" - " add r4, r7, #0\n" - " sub r4, r4, #0x46\n" - " ldr r3, ._24 + 12\n" - "._21:\n" - " add r1, r5, r2\n" - " add r1, r1, r3\n" - " add r0, r5, r6\n" - " ldrb r0, [r0]\n" - " strb r0, [r1]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0xff\n" - " beq ._20 @cond_branch\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x6\n" - " bls ._21 @cond_branch\n" - "._20:\n" - " cmp r5, #0x7\n" - " bne ._22 @cond_branch\n" - " add r0, r2, #6\n" - " b ._23\n" - "._25:\n" - " .align 2, 0\n" - "._24:\n" - " .word gSaveBlock1\n" - " .word 0x1a08\n" - " .word gSaveBlock2\n" - " .word gSaveBlock1+0x1a0a\n" - "._22:\n" - " add r0, r5, r2\n" - "._23:\n" - " add r0, r0, r3\n" - " strb r4, [r0]\n" - " ldr r1, ._35\n" - " ldr r2, ._35 + 4\n" - " add r2, r2, r1\n" - " mov sl, r2\n" - " mov r3, r9\n" - " add r0, r3, r7\n" - " lsl r6, r0, #0x5\n" - " add r1, r6, r1\n" - " ldr r5, ._35 + 4\n" - " add r5, r5, r1\n" - " mov r8, r5\n" - "._30:\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0x4b\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0xe\n" - " ldr r1, ._35 + 8\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " mov r2, r8\n" - " strb r0, [r2]\n" - " mov r5, #0x0\n" - " cmp r5, r7\n" - " bcs ._28 @cond_branch\n" - " mov r3, sl\n" - " ldrb r3, [r3]\n" - " cmp r0, r3\n" - " beq ._28 @cond_branch\n" - " ldr r4, ._35\n" - " add r0, r6, r4\n" - " ldr r2, ._35 + 4\n" - " add r3, r0, r2\n" - "._29:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r7\n" - " bcs ._28 @cond_branch\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r4\n" - " add r0, r0, r2\n" - " ldrb r1, [r3]\n" - " ldrb r0, [r0]\n" - " cmp r1, r0\n" - " bne ._29 @cond_branch\n" - "._28:\n" - " cmp r5, r7\n" - " bne ._30 @cond_branch\n" - " bl Random\n" - " mov r5, r9\n" - " add r4, r5, r7\n" - " lsl r4, r4, #0x5\n" - " ldr r1, ._35\n" - " add r3, r4, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0x1\n" - " ldr r2, ._35 + 12\n" - " add r3, r3, r2\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x4\n" - " ldrb r1, [r3]\n" - " mov r5, #0x11\n" - " neg r5, r5\n" - " add r2, r5, #0\n" - " and r1, r1, r2\n" - " orr r1, r1, r0\n" - " strb r1, [r3]\n" - " mov r5, #0x0\n" - " ldr r6, ._35 + 16\n" - "._31:\n" - " bl Random\n" - " add r1, r5, r4\n" - " add r1, r1, r6\n" - " strb r0, [r1]\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x3\n" - " bls ._31 @cond_branch\n" - " mov r5, #0x0\n" - " mov r1, r9\n" - " add r0, r1, r7\n" - " lsl r4, r0, #0x5\n" - " ldr r3, ._35 + 20\n" - " mov r2, #0x0\n" - " add r6, r3, #0\n" - " add r6, r6, #0x10\n" - "._32:\n" - " add r1, r5, r4\n" - " add r0, r1, r3\n" - " strb r2, [r0]\n" - " add r1, r1, r6\n" - " strb r2, [r1]\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0xf\n" - " bls ._32 @cond_branch\n" - " add r0, r7, #0\n" - " bl unref_sub_80BCD7C\n" - "._19:\n" - " ldr r2, [sp]\n" - " lsl r0, r2, #0x18\n" - " lsr r7, r0, #0x18\n" - " cmp r7, #0x13\n" - " bhi ._33 @cond_branch\n" - " b ._34\n" - "._33:\n" - " mov r0, #0x1\n" - " add sp, sp, #0x4\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._36:\n" - " .align 2, 0\n" - "._35:\n" - " .word gSaveBlock1\n" - " .word 0x1a08\n" - " .word _843E424\n" - " .word 0x1a09\n" - " .word gSaveBlock1+0x1a11\n" - " .word gSaveBlock1+0x1a1a\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F470() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add r6, r0, #0\n" - " add r7, r1, #0\n" - " mov ip, r2\n" - " ldr r2, ._39\n" - " ldr r0, ._39 + 4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r2\n" - " ldr r1, ._39 + 8\n" - " add r0, r0, r1\n" - " ldrb r4, [r0]\n" - " mov r2, #0x0\n" - " ldr r3, ._39 + 12\n" - " add r5, r3, #0\n" - "._41:\n" - " lsl r1, r2, #0x2\n" - " add r0, r1, r5\n" - " ldrb r0, [r0]\n" - " cmp r0, r4\n" - " bne ._37 @cond_branch\n" - " add r0, r1, #1\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " strb r0, [r6]\n" - " add r0, r1, #2\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " strb r0, [r7]\n" - " add r0, r1, #3\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " mov r1, ip\n" - " strb r0, [r1]\n" - " b ._38\n" - "._40:\n" - " .align 2, 0\n" - "._39:\n" - " .word gSaveBlock1\n" - " .word _nakamuraData0\n" - " .word 0x1a08\n" - " .word _843E424\n" - "._37:\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x4a\n" - " bls ._41 @cond_branch\n" - "._38:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F4D8() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0xa\n" - " mov r3, #0xa\n" - " bl Menu_BlankWindowRect\n" - " ldr r6, ._43\n" - " ldr r7, ._43 + 4\n" - " ldrb r1, [r7]\n" - " add r0, r6, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r2, ._43 + 8\n" - " ldrb r1, [r7]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r2\n" - " ldr r1, ._43 + 12\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._42 @cond_branch\n" - " mov r4, sp\n" - " add r4, r4, #0x1\n" - " mov r5, sp\n" - " add r5, r5, #0x2\n" - " mov r0, sp\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " bl debug_sub_815F470\n" - " ldrb r1, [r7]\n" - " add r0, r6, #0\n" - " bl sub_80BC190\n" - " add r0, r6, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " ldr r0, ._43 + 16\n" - " mov r1, #0x1\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, sp\n" - " ldrb r1, [r0]\n" - " add r0, r6, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " ldr r0, ._43 + 20\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldrb r1, [r4]\n" - " add r0, r6, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0x3\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r0, ._43 + 24\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " ldrb r1, [r5]\n" - " add r0, r6, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0x3\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - "._42:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._44:\n" - " .align 2, 0\n" - "._43:\n" - " .word gStringVar1\n" - " .word _nakamuraData0\n" - " .word gSaveBlock1\n" - " .word 0x1a08\n" - " .word Str_843E550\n" - " .word Str_843E552\n" - " .word Str_843E554\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F5C4() -{ - asm( - " push {lr}\n" - " ldr r0, ._48\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r2, r0, #0x10\n" - " cmp r2, #0\n" - " beq ._45 @cond_branch\n" - " ldr r1, ._48 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._46 @cond_branch\n" - " mov r0, #0x13\n" - " b ._50\n" - "._49:\n" - " .align 2, 0\n" - "._48:\n" - " .word gMain\n" - " .word _nakamuraData0\n" - "._46:\n" - " sub r0, r0, #0x1\n" - " b ._50\n" - "._45:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._51 @cond_branch\n" - " ldr r1, ._54\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x13\n" - " bne ._52 @cond_branch\n" - " strb r2, [r1]\n" - " b ._53\n" - "._55:\n" - " .align 2, 0\n" - "._54:\n" - " .word _nakamuraData0\n" - "._52:\n" - " add r0, r0, #0x1\n" - "._50:\n" - " strb r0, [r1]\n" - "._53:\n" - " bl debug_sub_815F4D8\n" - " mov r0, #0x0\n" - " b ._58\n" - "._51:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._57 @cond_branch\n" - " mov r0, #0x0\n" - " b ._58\n" - "._57:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._58:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815F62C() -{ - asm( - " push {lr}\n" - " ldr r1, ._59\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " ldr r1, ._59 + 4\n" - " ldr r0, ._59 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xb\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " bl debug_sub_815F4D8\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._60:\n" - " .align 2, 0\n" - "._59:\n" - " .word _nakamuraData0\n" - " .word gMenuCallback\n" - " .word debug_sub_815F5C4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F668() -{ - asm( - " push {r4, r5, r6, lr}\n" - " ldr r0, ._61\n" - " ldrb r0, [r0]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x5\n" - " ldr r0, ._61 + 4\n" - " add r1, r1, r0\n" - " ldrb r4, [r1, #0x3]\n" - " lsl r4, r4, #0x18\n" - " ldrb r0, [r1, #0x2]\n" - " lsl r0, r0, #0x10\n" - " orr r4, r4, r0\n" - " ldrb r0, [r1, #0x1]\n" - " lsl r0, r0, #0x8\n" - " orr r4, r4, r0\n" - " ldrb r0, [r1]\n" - " orr r4, r4, r0\n" - " ldr r5, ._61 + 8\n" - " ldr r6, ._61 + 12\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " add r0, r5, #0\n" - " mov r2, #0x2\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r5, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl __umodsi3\n" - " add r1, r0, #0\n" - " add r0, r5, #0\n" - " mov r2, #0x2\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r5, #0\n" - " mov r1, #0x7\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._62:\n" - " .align 2, 0\n" - "._61:\n" - " .word _nakamuraData0\n" - " .word gSaveBlock1+0x1a11\n" - " .word gStringVar1\n" - " .word 0x186a0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F6E4() -{ - asm( - " push {r4, lr}\n" - " mov r0, #0x2\n" - " mov r1, #0x3\n" - " mov r2, #0xb\n" - " mov r3, #0x4\n" - " bl Menu_BlankWindowRect\n" - " ldr r4, ._63\n" - " ldr r0, ._63 + 4\n" - " ldrb r0, [r0]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x5\n" - " ldr r0, ._63 + 8\n" - " add r1, r1, r0\n" - " add r0, r4, #0\n" - " mov r2, #0x7\n" - " bl StringCopyN\n" - " mov r1, #0xff\n" - " strb r1, [r0]\n" - " add r0, r4, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._64:\n" - " .align 2, 0\n" - "._63:\n" - " .word gStringVar1\n" - " .word _nakamuraData0\n" - " .word gSaveBlock1+0x1a0a\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F72C() -{ - asm( - " push {r4, r5, lr}\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0xb\n" - " mov r3, #0xa\n" - " bl Menu_BlankWindowRect\n" - " ldr r4, ._66\n" - " ldr r5, ._66 + 4\n" - " ldrb r1, [r5]\n" - " add r0, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r2, ._66 + 8\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r2\n" - " ldr r1, ._66 + 12\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._65 @cond_branch\n" - " bl debug_sub_815F6E4\n" - " bl debug_sub_815F668\n" - "._65:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._67:\n" - " .align 2, 0\n" - "._66:\n" - " .word gStringVar1\n" - " .word _nakamuraData0\n" - " .word gSaveBlock1\n" - " .word 0x1a08\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F788() -{ - asm( - " push {lr}\n" - " mov r0, #0x2\n" - " mov r1, #0x5\n" - " mov r2, #0xb\n" - " mov r3, #0x6\n" - " bl Menu_BlankWindowRect\n" - " ldr r0, ._68\n" - " ldr r1, ._68 + 4\n" - " ldrb r1, [r1]\n" - " add r1, r1, #0x2\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " pop {r0}\n" - " bx r0\n" - "._69:\n" - " .align 2, 0\n" - "._68:\n" - " .word Str_843E574\n" - " .word _nakamuraData2\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F7B4() -{ - asm( - " push {lr}\n" - " ldr r0, ._72\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._70 @cond_branch\n" - " mov r0, #0xb\n" - " mov r1, #0x1\n" - " mov r2, #0xb\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " b ._71\n" - "._73:\n" - " .align 2, 0\n" - "._72:\n" - " .word _nakamuraData1\n" - "._70:\n" - " ldr r0, ._74\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x1\n" - " ldr r1, ._74 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xb\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - "._71:\n" - " pop {r0}\n" - " bx r0\n" - "._75:\n" - " .align 2, 0\n" - "._74:\n" - " .word _nakamuraData3\n" - " .word Str_843E576\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F7F0() -{ - asm( - " push {r4, r5, lr}\n" - " ldr r1, ._78\n" - " ldrb r2, [r1]\n" - " lsl r1, r2, #0x2\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x5\n" - " ldr r2, ._78 + 4\n" - " add r3, r1, r2\n" - " ldrb r1, [r3, #0x3]\n" - " lsl r2, r1, #0x18\n" - " ldrb r1, [r3, #0x2]\n" - " lsl r1, r1, #0x10\n" - " orr r2, r2, r1\n" - " ldrb r1, [r3, #0x1]\n" - " lsl r1, r1, #0x8\n" - " orr r2, r2, r1\n" - " ldrb r1, [r3]\n" - " orr r2, r2, r1\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r4, #0x9\n" - " ldr r0, ._78 + 8\n" - " ldrb r0, [r0]\n" - " cmp r4, r0\n" - " ble ._76 @cond_branch\n" - " add r5, r0, #0\n" - "._77:\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r1, r0, #0x1\n" - " lsl r0, r4, #0x18\n" - " mov r4, #0xff\n" - " lsl r4, r4, #0x18\n" - " add r0, r0, r4\n" - " lsr r4, r0, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, r5\n" - " bgt ._77 @cond_branch\n" - "._76:\n" - " add r2, r2, r1\n" - " lsr r0, r2, #0x18\n" - " strb r0, [r3, #0x3]\n" - " mov r0, #0xff\n" - " lsl r0, r0, #0x10\n" - " and r0, r0, r2\n" - " lsr r0, r0, #0x10\n" - " strb r0, [r3, #0x2]\n" - " mov r0, #0xff\n" - " lsl r0, r0, #0x8\n" - " and r0, r0, r2\n" - " lsr r0, r0, #0x8\n" - " strb r0, [r3, #0x1]\n" - " strb r2, [r3]\n" - " bl debug_sub_815F668\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._79:\n" - " .align 2, 0\n" - "._78:\n" - " .word _nakamuraData0\n" - " .word gSaveBlock1+0x1a11\n" - " .word _nakamuraData2\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F86C() -{ - asm( - " push {r4, r5, r6, lr}\n" - " lsl r0, r0, #0x18\n" - " ldr r1, ._84\n" - " ldrb r2, [r1]\n" - " lsl r1, r2, #0x2\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x5\n" - " ldr r2, ._84 + 4\n" - " add r5, r1, r2\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " lsr r6, r0, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, #0x64\n" - " bne ._80 @cond_branch\n" - " ldr r0, ._84 + 8\n" - " ldrb r1, [r0]\n" - " cmp r1, #0x6\n" - " bhi ._100 @cond_branch\n" - " mov r2, #0xff\n" - "._82:\n" - " add r0, r5, r1\n" - " strb r2, [r0]\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " cmp r1, #0x6\n" - " bls ._82 @cond_branch\n" - " b ._100\n" - "._85:\n" - " .align 2, 0\n" - "._84:\n" - " .word _nakamuraData0\n" - " .word gSaveBlock1+0x1a0a\n" - " .word _nakamuraData2\n" - "._80:\n" - " ldr r0, ._87\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x4\n" - " bhi ._98 @cond_branch\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._87 + 4\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._88:\n" - " .align 2, 0\n" - "._87:\n" - " .word _nakamuraData3\n" - " .word ._89\n" - "._89:\n" - " .word ._90\n" - " .word ._91\n" - " .word ._92\n" - " .word ._93\n" - " .word ._94\n" - "._90:\n" - " mov r3, #0x1\n" - " mov r2, #0x50\n" - " b ._98\n" - "._91:\n" - " mov r3, #0x51\n" - " mov r2, #0xa0\n" - " b ._98\n" - "._92:\n" - " mov r3, #0xbb\n" - " mov r2, #0xd4\n" - " b ._98\n" - "._93:\n" - " mov r3, #0xd5\n" - " mov r2, #0xee\n" - " b ._98\n" - "._94:\n" - " mov r3, #0xa1\n" - " mov r2, #0xaa\n" - "._98:\n" - " ldr r4, ._101\n" - " ldrb r1, [r4]\n" - " add r1, r5, r1\n" - " ldrb r0, [r1]\n" - " add r0, r0, r6\n" - " strb r0, [r1]\n" - " ldrb r0, [r4]\n" - " add r1, r5, r0\n" - " ldrb r0, [r1]\n" - " cmp r0, r3\n" - " bcs ._99 @cond_branch\n" - " strb r2, [r1]\n" - "._99:\n" - " ldrb r0, [r4]\n" - " add r1, r5, r0\n" - " ldrb r0, [r1]\n" - " cmp r0, r2\n" - " bls ._100 @cond_branch\n" - " strb r3, [r1]\n" - "._100:\n" - " bl debug_sub_815F6E4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._102:\n" - " .align 2, 0\n" - "._101:\n" - " .word _nakamuraData2\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815F930() -{ - asm( - " push {r4, r5, lr}\n" - " ldr r0, ._107\n" - " ldrb r2, [r0]\n" - " mov r4, #0xa\n" - " cmp r2, #0\n" - " bne ._103 @cond_branch\n" - " mov r4, #0x7\n" - "._103:\n" - " ldr r5, ._107 + 4\n" - " ldrh r1, [r5, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._104 @cond_branch\n" - " cmp r2, #0\n" - " beq ._105 @cond_branch\n" - " mov r0, #0x1\n" - " bl debug_sub_815F7F0\n" - " b ._136\n" - "._108:\n" - " .align 2, 0\n" - "._107:\n" - " .word _nakamuraData1\n" - " .word gMain\n" - "._105:\n" - " mov r0, #0x1\n" - " b ._113\n" - "._104:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._110 @cond_branch\n" - " cmp r2, #0\n" - " beq ._111 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " bl debug_sub_815F7F0\n" - " b ._136\n" - "._111:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " b ._113\n" - "._110:\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r3, r0, #0x10\n" - " cmp r3, #0\n" - " beq ._114 @cond_branch\n" - " ldr r1, ._117\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._115 @cond_branch\n" - " sub r0, r4, #1\n" - " b ._116\n" - "._118:\n" - " .align 2, 0\n" - "._117:\n" - " .word _nakamuraData2\n" - "._115:\n" - " sub r0, r0, #0x1\n" - "._116:\n" - " strb r0, [r1]\n" - "._125:\n" - " bl debug_sub_815F788\n" - " b ._136\n" - "._114:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._120 @cond_branch\n" - " ldr r2, ._123\n" - " ldrb r1, [r2]\n" - " sub r0, r4, #1\n" - " cmp r1, r0\n" - " bne ._121 @cond_branch\n" - " strb r3, [r2]\n" - " b ._125\n" - "._124:\n" - " .align 2, 0\n" - "._123:\n" - " .word _nakamuraData2\n" - "._121:\n" - " add r0, r1, #1\n" - " strb r0, [r2]\n" - " b ._125\n" - "._120:\n" - " ldrh r1, [r5, #0x2e]\n" - " mov r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._126 @cond_branch\n" - " cmp r2, #0\n" - " bne ._127 @cond_branch\n" - " ldr r4, ._129\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " mov r1, #0x5\n" - " bl __modsi3\n" - " strb r0, [r4]\n" - "._127:\n" - " bl debug_sub_815F7B4\n" - " b ._136\n" - "._130:\n" - " .align 2, 0\n" - "._129:\n" - " .word _nakamuraData3\n" - "._126:\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._131 @cond_branch\n" - " mov r0, #0x2\n" - " mov r1, #0x5\n" - " mov r2, #0xb\n" - " mov r3, #0x6\n" - " bl Menu_BlankWindowRect\n" - " mov r0, #0xb\n" - " mov r1, #0x1\n" - " mov r2, #0xb\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " ldr r1, ._133\n" - " ldr r0, ._133 + 4\n" - " str r0, [r1]\n" - " b ._136\n" - "._134:\n" - " .align 2, 0\n" - "._133:\n" - " .word gMenuCallback\n" - " .word debug_sub_815FA38+1\n" - "._131:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._136 @cond_branch\n" - " cmp r2, #0\n" - " bne ._136 @cond_branch\n" - " mov r0, #0x64\n" - "._113:\n" - " bl debug_sub_815F86C\n" - "._136:\n" - " mov r0, #0x0\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815FA38() -{ - asm( - " push {r4, lr}\n" - " ldr r0, ._139\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._137 @cond_branch\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " b ._138\n" - "._140:\n" - " .align 2, 0\n" - "._139:\n" - " .word gMain\n" - "._137:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._141 @cond_branch\n" - " mov r0, #0x2\n" - "._138:\n" - " bl Menu_MoveCursor\n" - "._161:\n" - " mov r0, #0x0\n" - " b ._142\n" - "._141:\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r2, r0, #0x10\n" - " cmp r2, #0\n" - " beq ._143 @cond_branch\n" - " ldr r1, ._146\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._144 @cond_branch\n" - " mov r0, #0x13\n" - " b ._148\n" - "._147:\n" - " .align 2, 0\n" - "._146:\n" - " .word _nakamuraData0\n" - "._144:\n" - " sub r0, r0, #0x1\n" - " b ._148\n" - "._143:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " cmp r4, #0\n" - " beq ._149 @cond_branch\n" - " ldr r1, ._152\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x13\n" - " bne ._150 @cond_branch\n" - " strb r2, [r1]\n" - " b ._151\n" - "._153:\n" - " .align 2, 0\n" - "._152:\n" - " .word _nakamuraData0\n" - "._150:\n" - " add r0, r0, #0x1\n" - "._148:\n" - " strb r0, [r1]\n" - "._151:\n" - " bl debug_sub_815F72C\n" - " b ._161\n" - "._149:\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._155 @cond_branch\n" - " ldr r1, ._159\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._161 @cond_branch\n" - " ldr r2, ._159 + 4\n" - " add r1, r0, #0\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r2\n" - " ldr r1, ._159 + 8\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._161 @cond_branch\n" - " bl Menu_GetCursorPos\n" - " ldr r1, ._159 + 12\n" - " strb r0, [r1]\n" - " ldr r0, ._159 + 16\n" - " strb r4, [r0]\n" - " bl debug_sub_815F788\n" - " bl debug_sub_815F7B4\n" - " ldr r1, ._159 + 20\n" - " ldr r0, ._159 + 24\n" - " str r0, [r1]\n" - " b ._161\n" - "._160:\n" - " .align 2, 0\n" - "._159:\n" - " .word _nakamuraData0\n" - " .word gSaveBlock1\n" - " .word 0x1a08\n" - " .word _nakamuraData1\n" - " .word _nakamuraData2\n" - " .word gMenuCallback\n" - " .word debug_sub_815F930+1\n" - "._155:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._161 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._142:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815FB1C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " ldr r0, ._162\n" - " mov r1, #0x0\n" - " strb r1, [r0]\n" - " ldr r0, ._162 + 4\n" - " strb r1, [r0]\n" - " ldr r1, ._162 + 8\n" - " ldr r0, ._162 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xc\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " bl debug_sub_815F72C\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xb\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x3\n" - " bl InitMenu\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._163:\n" - " .align 2, 0\n" - "._162:\n" - " .word _nakamuraData0\n" - " .word _nakamuraData3\n" - " .word gMenuCallback\n" - " .word debug_sub_815FA38+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815FB78() -{ - asm( - " push {lr}\n" - " ldr r0, ._166\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._164 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " b ._165\n" - "._167:\n" - " .align 2, 0\n" - "._166:\n" - " .word gMain\n" - "._164:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._168 @cond_branch\n" - " mov r0, #0x1\n" - "._165:\n" - " bl Menu_MoveCursor\n" - " mov r0, #0x0\n" - " b ._177\n" - "._168:\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._170 @cond_branch\n" - " bl CloseMenu\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._171 @cond_branch\n" - " cmp r0, #0x1\n" - " beq ._172 @cond_branch\n" - " b ._175\n" - "._171:\n" - " bl debug_sub_814A714\n" - " b ._175\n" - "._172:\n" - " bl ClearRoamerData\n" - " bl ClearRoamerLocationData\n" - " b ._175\n" - "._170:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._176 @cond_branch\n" - " mov r0, #0x0\n" - " b ._177\n" - "._176:\n" - " bl CloseMenu\n" - "._175:\n" - " mov r0, #0x1\n" - "._177:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815FBE8() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " ldr r1, ._178\n" - " ldr r0, ._178 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " ldr r4, ._178 + 8\n" - " add r0, r4, #0\n" - " bl debug_sub_814A73C\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xb\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r4, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._178 + 12\n" - " mov r1, #0x2\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xa\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x3\n" - " bl InitMenu\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._179:\n" - " .align 2, 0\n" - "._178:\n" - " .word gMenuCallback\n" - " .word debug_sub_815FB78+1\n" - " .word gStringVar1\n" - " .word Str_843E580\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815FC54() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r3, #0x0\n" - " ldr r7, ._181\n" - " mov r6, #0xe8\n" - " lsl r6, r6, #0x3\n" - " ldr r5, ._181 + 4\n" - " ldr r4, ._181 + 8\n" - "._180:\n" - " lsl r1, r3, #0x2\n" - " add r1, r1, r7\n" - " add r2, r3, #0\n" - " add r2, r2, #0x85\n" - " add r0, r1, r6\n" - " strh r2, [r0]\n" - " add r1, r1, r4\n" - " strh r5, [r1]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r3, r0, #0x10\n" - " cmp r3, #0x2a\n" - " bls ._180 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._182:\n" - " .align 2, 0\n" - "._181:\n" - " .word gSaveBlock1\n" - " .word 0x3e7\n" - " .word 0x742\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815FC94() -{ - asm( - " push {lr}\n" - " bl ClearDecorationInventories\n" - " bl debug_sub_814A3A8\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815FCB4() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " mov r7, #0x0\n" - " ldr r5, ._188\n" - " ldr r0, [r5]\n" - " ldr r0, [r0, #0x4]\n" - " mov r1, #0x3\n" - " bl __divsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " add r1, r0, #0\n" - " mul r1, r1, r4\n" - " lsl r1, r1, #0x10\n" - " lsr r6, r1, #0x10\n" - " add r0, r6, r0\n" - " mov r9, r5\n" - " cmp r6, r0\n" - " bge ._183 @cond_branch\n" - " mov r8, r0\n" - "._187:\n" - " mov r4, #0x0\n" - " mov r1, r9\n" - " ldr r0, [r1]\n" - " ldr r0, [r0]\n" - " add r5, r6, #1\n" - " cmp r4, r0\n" - " bge ._184 @cond_branch\n" - " ldr r0, ._188\n" - " mov r9, r0\n" - "._186:\n" - " add r0, r4, #7\n" - " add r1, r6, #7\n" - " bl MapGridGetMetatileBehaviorAt\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl sub_805759C\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bne ._185 @cond_branch\n" - " add r0, r7, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r7, r0, #0x10\n" - "._185:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " ldr r0, ._188\n" - " ldr r0, [r0]\n" - " ldr r0, [r0]\n" - " cmp r4, r0\n" - " blt ._186 @cond_branch\n" - "._184:\n" - " lsl r0, r5, #0x10\n" - " lsr r6, r0, #0x10\n" - " cmp r6, r8\n" - " blt ._187 @cond_branch\n" - "._183:\n" - " add r0, r7, #0\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._189:\n" - " .align 2, 0\n" - "._188:\n" - " .word gMapHeader\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815FD40() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r6, #0x0\n" - " mov r4, sp\n" - " add r4, r4, #0x2\n" - " mov r0, sp\n" - " add r1, r4, #0\n" - " bl GetXYCoordsOneStepInFrontOfPlayer\n" - " mov r1, sp\n" - " mov r0, sp\n" - " ldrh r0, [r0]\n" - " sub r0, r0, #0x7\n" - " strh r0, [r1]\n" - " ldrh r0, [r4]\n" - " sub r0, r0, #0x7\n" - " strh r0, [r4]\n" - " mov r5, #0x0\n" - " ldr r1, ._192\n" - " ldr r0, [r1]\n" - " ldr r0, [r0, #0x4]\n" - " add r7, r4, #0\n" - " cmp r6, r0\n" - " bge ._190 @cond_branch\n" - "._199:\n" - " mov r4, #0x0\n" - " ldr r0, [r1]\n" - " b ._191\n" - "._193:\n" - " .align 2, 0\n" - "._192:\n" - " .word gMapHeader\n" - "._198:\n" - " add r0, r4, #7\n" - " add r1, r5, #7\n" - " bl MapGridGetMetatileBehaviorAt\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl sub_805759C\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bne ._196 @cond_branch\n" - " add r0, r6, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r6, r0, #0x10\n" - " mov r0, sp\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, r4\n" - " bne ._196 @cond_branch\n" - " mov r1, #0x0\n" - " ldsh r0, [r7, r1]\n" - " cmp r0, r5\n" - " bne ._196 @cond_branch\n" - " add r0, r6, #0\n" - " b ._197\n" - "._196:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " ldr r0, ._200\n" - " ldr r0, [r0]\n" - "._191:\n" - " ldr r0, [r0]\n" - " cmp r4, r0\n" - " blt ._198 @cond_branch\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " ldr r1, ._200\n" - " ldr r0, [r1]\n" - " ldr r0, [r0, #0x4]\n" - " cmp r5, r0\n" - " blt ._199 @cond_branch\n" - "._190:\n" - " add r0, r6, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - "._197:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._201:\n" - " .align 2, 0\n" - "._200:\n" - " .word gMapHeader\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815FDE4() -{ - asm( - " push {lr}\n" - " ldr r0, ._205\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._202 @cond_branch\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._203 @cond_branch\n" - "._202:\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._204\n" - "._206:\n" - " .align 2, 0\n" - "._205:\n" - " .word gMain\n" - "._203:\n" - " mov r0, #0x0\n" - "._204:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_815FE1C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x10\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._210\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r6, ._210 + 4\n" - " mov r0, #0x0\n" - " bl debug_sub_815FCB4\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r6, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0x5\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " mov r0, #0x1\n" - " bl debug_sub_815FCB4\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r6, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0x5\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, #0x2\n" - " bl debug_sub_815FCB4\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r6, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0x5\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " bl debug_sub_8092344\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r6, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0xb\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " mov r0, #0x1\n" - " bl debug_sub_8092344\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r6, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0xb\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, #0x2\n" - " bl debug_sub_8092344\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r6, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r6, #0\n" - " mov r1, #0xb\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r0, ._210 + 8\n" - " ldr r1, ._210 + 12\n" - " add r0, r0, r1\n" - " ldrh r0, [r0]\n" - " bl FeebasSeedRng\n" - " mov r0, #0x0\n" - " bl debug_sub_815FCB4\n" - " add r4, r0, #0\n" - " mov r0, #0x1\n" - " bl debug_sub_815FCB4\n" - " add r5, r0, #0\n" - " mov r0, #0x2\n" - " bl debug_sub_815FCB4\n" - " add r4, r4, r5\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x10\n" - " lsr r7, r0, #0x10\n" - " mov r5, #0x0\n" - "._209:\n" - " bl FeebasRandom\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " add r1, r7, #0\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r1, r0, #0x10\n" - " cmp r1, #0\n" - " bne ._207 @cond_branch\n" - " add r1, r7, #0\n" - "._207:\n" - " sub r0, r1, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0x2\n" - " bls ._208 @cond_branch\n" - " add r0, r6, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x4\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r5, #0\n" - " mov r1, #0x3\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " lsl r4, r0, #0x2\n" - " add r4, r4, r0\n" - " add r4, r4, #0x2\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r5, #0\n" - " mov r1, #0x3\n" - " bl __udivsi3\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x19\n" - " mov r0, #0xb0\n" - " lsl r0, r0, #0x14\n" - " add r2, r2, r0\n" - " lsr r2, r2, #0x18\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " bl Menu_PrintText\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - "._208:\n" - " cmp r5, #0x6\n" - " bne ._209 @cond_branch\n" - " ldr r4, ._210 + 4\n" - " bl debug_sub_815FD40\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x4\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " ldr r1, ._210 + 16\n" - " ldr r0, ._210 + 20\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._211:\n" - " .align 2, 0\n" - "._210:\n" - " .word Str_843E58D\n" - " .word gStringVar1\n" - " .word gSaveBlock1\n" - " .word 0x2dd6\n" - " .word gMenuCallback\n" - " .word debug_sub_815FDE4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_815FFDC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " mov r0, #0xe\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x0\n" - " mov r1, #0xe\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._214\n" - " mov r1, #0x1\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " mov r5, #0x0\n" - " ldr r0, ._214 + 4\n" - " mov r8, r0\n" - "._216:\n" - " mov r0, #0x64\n" - " add r1, r5, #0\n" - " mul r1, r1, r0\n" - " ldr r0, ._214 + 8\n" - " add r6, r1, r0\n" - " add r0, r6, #0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " lsl r1, r5, #0x2\n" - " mov r2, r8\n" - " add r4, r1, r2\n" - " strh r0, [r4]\n" - " lsl r0, r0, #0x10\n" - " add r7, r1, #0\n" - " cmp r0, #0\n" - " beq ._212 @cond_branch\n" - " add r0, r6, #0\n" - " mov r1, #0x38\n" - " bl GetMonData\n" - " strb r0, [r4, #0x2]\n" - " add r0, r5, #0\n" - " bl debug_sub_816009C\n" - " add r0, r5, #0\n" - " bl debug_sub_81600D0\n" - " add r0, r5, #0\n" - " bl debug_sub_816013C\n" - " b ._213\n" - "._215:\n" - " .align 2, 0\n" - "._214:\n" - " .word Str_843E5D4\n" - " .word _nakamuraStatic0\n" - " .word gPlayerParty\n" - "._212:\n" - " mov r0, #0x1\n" - " strb r0, [r4, #0x2]\n" - "._213:\n" - " mov r0, r8\n" - " add r1, r7, r0\n" - " mov r0, #0x0\n" - " strb r0, [r1, #0x3]\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x5\n" - " bls ._216 @cond_branch\n" - " ldr r1, ._217\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " mov r0, #0xf\n" - " mov r1, #0x1\n" - " mov r2, #0xff\n" - " bl PrintTriangleCursorWithPalette\n" - " ldr r1, ._217 + 4\n" - " ldr r0, ._217 + 8\n" - " str r0, [r1]\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._218:\n" - " .align 2, 0\n" - "._217:\n" - " .word _nakamuraData4\n" - " .word gMenuCallback\n" - " .word debug_sub_8160498+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_816009C() -{ - asm( - " push {lr}\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " ldr r1, ._219\n" - " lsl r0, r2, #0x2\n" - " add r0, r0, r1\n" - " mov r3, #0x0\n" - " ldsh r1, [r0, r3]\n" - " mov r0, #0xb\n" - " mul r0, r0, r1\n" - " ldr r1, ._219 + 4\n" - " add r0, r0, r1\n" - " lsl r2, r2, #0x1\n" - " add r2, r2, #0x1\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r1, #0x10\n" - " bl Menu_PrintText\n" - " pop {r0}\n" - " bx r0\n" - "._220:\n" - " .align 2, 0\n" - "._219:\n" - " .word _nakamuraStatic0\n" - " .word gSpeciesNames\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_81600D0() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " add r5, r4, #0\n" - " ldr r1, ._223\n" - " mov r0, sp\n" - " mov r2, #0x2\n" - " bl memcpy\n" - " mov r0, #0x64\n" - " mul r0, r0, r4\n" - " ldr r1, ._223 + 4\n" - " add r0, r0, r1\n" - " bl GetMonGender\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._221 @cond_branch\n" - " ldr r0, ._223 + 8\n" - " b ._222\n" - "._224:\n" - " .align 2, 0\n" - "._223:\n" - " .word Str_843E5F0\n" - " .word gPlayerParty\n" - " .word gOtherText_MaleSymbol2\n" - "._221:\n" - " cmp r0, #0xfe\n" - " bne ._225 @cond_branch\n" - " ldr r0, ._227\n" - "._222:\n" - " lsl r2, r4, #0x1\n" - " add r2, r2, #0x1\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r1, #0x17\n" - " bl Menu_PrintText\n" - " b ._226\n" - "._228:\n" - " .align 2, 0\n" - "._227:\n" - " .word gOtherText_FemaleSymbolAndLv\n" - "._225:\n" - " lsl r2, r5, #0x1\n" - " add r2, r2, #0x1\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r0, sp\n" - " mov r1, #0x17\n" - " bl Menu_PrintText\n" - "._226:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_816013C() -{ - asm( - " push {r4, r5, lr}\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r5, ._229\n" - " ldr r1, ._229 + 4\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r1\n" - " mov r1, #0x2\n" - " ldrsb r1, [r0, r1]\n" - " add r0, r5, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " lsl r4, r4, #0x1\n" - " add r4, r4, #0x1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r5, #0\n" - " mov r1, #0x1a\n" - " add r2, r4, #0\n" - " bl Menu_PrintText\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._230:\n" - " .align 2, 0\n" - "._229:\n" - " .word gStringVar1\n" - " .word _nakamuraStatic0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_816017C() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " lsl r3, r4, #0x1\n" - " add r1, r3, #1\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r3, r3, #0x2\n" - " lsl r3, r3, #0x18\n" - " lsr r3, r3, #0x18\n" - " mov r0, #0x10\n" - " mov r2, #0x1c\n" - " bl Menu_BlankWindowRect\n" - " ldr r1, ._232\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r1\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0\n" - " beq ._231 @cond_branch\n" - " add r0, r4, #0\n" - " bl debug_sub_816009C\n" - " add r0, r4, #0\n" - " bl debug_sub_81600D0\n" - " add r0, r4, #0\n" - " bl debug_sub_816013C\n" - "._231:\n" - " mov r0, #0x5\n" - " bl debug_sub_81603B8\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._233:\n" - " .align 2, 0\n" - "._232:\n" - " .word _nakamuraStatic0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_81601C8() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffff0\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r1, ._239\n" - " lsl r0, r5, #0x2\n" - " add r2, r0, r1\n" - " mov r4, #0x0\n" - " ldsh r0, [r2, r4]\n" - " cmp r0, #0\n" - " bne ._236 @cond_branch\n" - " ldrb r0, [r2, #0x3]\n" - " cmp r0, #0\n" - " bne ._236 @cond_branch\n" - " cmp r3, #0x1\n" - " bne ._236 @cond_branch\n" - " mov r0, #0x8a\n" - " lsl r0, r0, #0x1\n" - " strh r0, [r2]\n" - "._236:\n" - " lsl r0, r5, #0x2\n" - " add r4, r0, r1\n" - " lsl r0, r3, #0x18\n" - " asr r0, r0, #0x18\n" - " ldrh r1, [r4]\n" - " add r2, r0, r1\n" - " mov r3, #0x0\n" - " strh r2, [r4]\n" - " lsl r1, r2, #0x10\n" - " mov r0, #0xcd\n" - " lsl r0, r0, #0x11\n" - " cmp r1, r0\n" - " ble ._237 @cond_branch\n" - " ldr r1, ._239 + 4\n" - " add r0, r2, r1\n" - " strh r0, [r4]\n" - "._237:\n" - " ldrh r1, [r4]\n" - " mov r2, #0x0\n" - " ldsh r0, [r4, r2]\n" - " cmp r0, #0\n" - " bge ._238 @cond_branch\n" - " ldr r2, ._239 + 8\n" - " add r0, r1, r2\n" - " strh r0, [r4]\n" - "._238:\n" - " mov r0, #0x64\n" - " mul r0, r0, r5\n" - " ldr r1, ._239 + 12\n" - " add r0, r0, r1\n" - " ldrh r1, [r4]\n" - " ldrb r2, [r4, #0x2]\n" - " str r3, [sp]\n" - " str r3, [sp, #0x4]\n" - " str r3, [sp, #0x8]\n" - " str r3, [sp, #0xc]\n" - " mov r3, #0x20\n" - " bl CreateMon\n" - " mov r0, #0x1\n" - " strb r0, [r4, #0x3]\n" - " add sp, sp, #0x10\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._240:\n" - " .align 2, 0\n" - "._239:\n" - " .word _nakamuraStatic0\n" - " .word 0xfffffe65\n" - " .word 0x19b\n" - " .word gPlayerParty\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160258() -{ - asm( - " push {lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " ldr r1, ._242\n" - " lsl r0, r2, #0x2\n" - " add r0, r0, r1\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0\n" - " beq ._241 @cond_branch\n" - " add r0, r2, #0\n" - " bl debug_sub_816062C\n" - "._241:\n" - " pop {r0}\n" - " bx r0\n" - "._243:\n" - " .align 2, 0\n" - "._242:\n" - " .word _nakamuraStatic0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_816027C() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r4, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r2, r1, #0x18\n" - " ldr r1, ._247\n" - " lsl r0, r4, #0x2\n" - " add r3, r0, r1\n" - " mov r1, #0x0\n" - " ldsh r0, [r3, r1]\n" - " cmp r0, #0\n" - " beq ._244 @cond_branch\n" - " lsl r0, r2, #0x18\n" - " asr r0, r0, #0x18\n" - " ldrb r1, [r3, #0x2]\n" - " add r0, r0, r1\n" - " strb r0, [r3, #0x2]\n" - " lsl r0, r0, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, #0x64\n" - " ble ._245 @cond_branch\n" - " mov r0, #0x1\n" - " strb r0, [r3, #0x2]\n" - "._245:\n" - " mov r0, #0x2\n" - " ldrsb r0, [r3, r0]\n" - " cmp r0, #0\n" - " bgt ._246 @cond_branch\n" - " mov r0, #0x64\n" - " strb r0, [r3, #0x2]\n" - "._246:\n" - " mov r0, #0x64\n" - " mul r4, r4, r0\n" - " ldr r0, ._247 + 4\n" - " add r4, r4, r0\n" - " ldr r2, ._247 + 8\n" - " mov r0, #0x0\n" - " ldsh r1, [r3, r0]\n" - " lsl r0, r1, #0x3\n" - " sub r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r2\n" - " ldrb r1, [r0, #0x13]\n" - " mov r0, #0xca\n" - " lsl r0, r0, #0x1\n" - " add r2, r1, #0\n" - " mul r2, r2, r0\n" - " mov r0, #0x2\n" - " ldrsb r0, [r3, r0]\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._247 + 12\n" - " add r0, r0, r1\n" - " add r2, r2, r0\n" - " add r0, r4, #0\n" - " mov r1, #0x19\n" - " bl SetMonData\n" - " add r0, r4, #0\n" - " bl debug_sub_803F55C\n" - "._244:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._248:\n" - " .align 2, 0\n" - "._247:\n" - " .word _nakamuraStatic0\n" - " .word gPlayerParty\n" - " .word gBaseStats\n" - " .word gExperienceTables\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160308() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " add sp, sp, #0xffffff8c\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " mov r2, #0x0\n" - "._252:\n" - " add r1, r2, #1\n" - " lsl r0, r1, #0x18\n" - " lsr r5, r0, #0x18\n" - " mov r8, r1\n" - " cmp r5, #0x5\n" - " bhi ._249 @cond_branch\n" - " mov r0, #0x64\n" - " mov r9, r0\n" - " mov r0, r9\n" - " mul r0, r0, r2\n" - " ldr r7, ._254\n" - " add r6, r0, r7\n" - "._251:\n" - " add r0, r6, #0\n" - " mov r1, #0xb\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " bne ._250 @cond_branch\n" - " add r0, sp, #0x10\n" - " add r1, r6, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - " mov r4, r9\n" - " mul r4, r4, r5\n" - " add r4, r4, r7\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - " add r0, r4, #0\n" - " add r1, sp, #0x10\n" - " mov r2, #0x64\n" - " bl memcpy\n" - "._250:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x5\n" - " bls ._251 @cond_branch\n" - "._249:\n" - " mov r1, r8\n" - " lsl r0, r1, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x4\n" - " bls ._252 @cond_branch\n" - " bl CalculatePlayerPartyCount\n" - " ldr r4, ._254 + 4\n" - " ldrb r1, [r4]\n" - " cmp r1, #0\n" - " bne ._253 @cond_branch\n" - " ldr r0, ._254\n" - " str r1, [sp]\n" - " str r1, [sp, #0x4]\n" - " str r1, [sp, #0x8]\n" - " str r1, [sp, #0xc]\n" - " mov r1, #0x1\n" - " mov r2, #0xa\n" - " mov r3, #0x20\n" - " bl CreateMon\n" - " mov r0, #0x1\n" - " strb r0, [r4]\n" - "._253:\n" - " add sp, sp, #0x74\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._255:\n" - " .align 2, 0\n" - "._254:\n" - " .word gPlayerParty\n" - " .word gPlayerPartyCount\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_81603B8() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r7, ._259\n" - " ldrb r4, [r7]\n" - " add r0, r4, #0\n" - " mov r1, #0x6\n" - " bl __udivsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " add r0, r4, #0\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r0, ._259 + 4\n" - " add r0, r5, r0\n" - " ldrb r2, [r0]\n" - " lsl r3, r4, #0x1\n" - " add r1, r3, #1\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r3, r3, #0x2\n" - " lsl r3, r3, #0x18\n" - " lsr r3, r3, #0x18\n" - " add r0, r2, #0\n" - " bl Menu_BlankWindowRect\n" - " cmp r6, #0\n" - " bne ._256 @cond_branch\n" - " cmp r4, #0\n" - " beq ._257 @cond_branch\n" - " ldrb r0, [r7]\n" - " sub r0, r0, #0x1\n" - " b ._258\n" - "._260:\n" - " .align 2, 0\n" - "._259:\n" - " .word _nakamuraData4\n" - " .word _843E5D1\n" - "._257:\n" - " lsl r0, r5, #0x1\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, #0x5\n" - "._258:\n" - " strb r0, [r7]\n" - "._256:\n" - " ldr r1, ._264\n" - " cmp r6, #0x1\n" - " bne ._261 @cond_branch\n" - " cmp r4, #0x5\n" - " beq ._262 @cond_branch\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " b ._263\n" - "._265:\n" - " .align 2, 0\n" - "._264:\n" - " .word _nakamuraData4\n" - "._262:\n" - " lsl r0, r5, #0x1\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x1\n" - "._263:\n" - " strb r0, [r1]\n" - "._261:\n" - " cmp r6, #0x2\n" - " bne ._266 @cond_branch\n" - " cmp r5, #0\n" - " beq ._267 @cond_branch\n" - " ldrb r0, [r1]\n" - " sub r0, r0, #0x6\n" - " b ._268\n" - "._267:\n" - " add r0, r4, #0\n" - " add r0, r0, #0xc\n" - "._268:\n" - " strb r0, [r1]\n" - "._266:\n" - " cmp r6, #0x3\n" - " bne ._271 @cond_branch\n" - " cmp r5, #0x2\n" - " beq ._270 @cond_branch\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x6\n" - " strb r0, [r1]\n" - " b ._271\n" - "._270:\n" - " strb r4, [r1]\n" - "._271:\n" - " ldrb r4, [r1]\n" - " add r0, r4, #0\n" - " mov r1, #0x6\n" - " bl __udivsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " add r0, r4, #0\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " ldr r0, ._272\n" - " add r0, r5, r0\n" - " ldrb r0, [r0]\n" - " lsr r1, r1, #0x17\n" - " add r1, r1, #0x1\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " mov r2, #0xff\n" - " bl PrintTriangleCursorWithPalette\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._273:\n" - " .align 2, 0\n" - "._272:\n" - " .word _843E5D1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160498() -{ - asm( - " push {r4, lr}\n" - " ldr r1, ._276\n" - " ldrh r2, [r1, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._274 @cond_branch\n" - " mov r0, #0x0\n" - " b ._281\n" - "._277:\n" - " .align 2, 0\n" - "._276:\n" - " .word gMain\n" - "._274:\n" - " mov r0, #0x80\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._278 @cond_branch\n" - " mov r0, #0x1\n" - " b ._281\n" - "._278:\n" - " mov r0, #0x20\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._280 @cond_branch\n" - " mov r0, #0x2\n" - " b ._281\n" - "._280:\n" - " mov r0, #0x10\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._282 @cond_branch\n" - " mov r0, #0x3\n" - "._281:\n" - " bl debug_sub_81603B8\n" - " mov r0, #0x0\n" - " b ._311\n" - "._282:\n" - " ldrh r1, [r1, #0x30]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._284 @cond_branch\n" - " ldr r4, ._289\n" - " ldrb r0, [r4]\n" - " cmp r0, #0x5\n" - " bhi ._285 @cond_branch\n" - " mov r1, #0x1\n" - " bl debug_sub_81601C8\n" - "._285:\n" - " ldrb r0, [r4]\n" - " sub r0, r0, #0x6\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x5\n" - " bhi ._286 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8160258\n" - "._286:\n" - " ldrb r0, [r4]\n" - " sub r0, r0, #0xc\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x5\n" - " bhi ._306 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " b ._300\n" - "._290:\n" - " .align 2, 0\n" - "._289:\n" - " .word _nakamuraData4\n" - "._284:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._291 @cond_branch\n" - " ldr r4, ._294\n" - " ldrb r0, [r4]\n" - " cmp r0, #0x5\n" - " bhi ._304 @cond_branch\n" - " mov r1, #0x1\n" - " neg r1, r1\n" - " b ._293\n" - "._295:\n" - " .align 2, 0\n" - "._294:\n" - " .word _nakamuraData4\n" - "._291:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._296 @cond_branch\n" - " ldr r4, ._301\n" - " ldrb r0, [r4]\n" - " cmp r0, #0x5\n" - " bhi ._297 @cond_branch\n" - " mov r1, #0xa\n" - " bl debug_sub_81601C8\n" - "._297:\n" - " ldrb r0, [r4]\n" - " sub r0, r0, #0x6\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x5\n" - " bhi ._298 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8160258\n" - "._298:\n" - " ldrb r0, [r4]\n" - " sub r0, r0, #0xc\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x5\n" - " bhi ._306 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " b ._300\n" - "._302:\n" - " .align 2, 0\n" - "._301:\n" - " .word _nakamuraData4\n" - "._296:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._303 @cond_branch\n" - " ldr r4, ._308\n" - " ldrb r0, [r4]\n" - " cmp r0, #0x5\n" - " bhi ._304 @cond_branch\n" - " mov r1, #0xa\n" - " neg r1, r1\n" - "._293:\n" - " bl debug_sub_81601C8\n" - "._304:\n" - " ldrb r0, [r4]\n" - " sub r0, r0, #0x6\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x5\n" - " bhi ._305 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8160258\n" - "._305:\n" - " ldrb r0, [r4]\n" - " sub r0, r0, #0xc\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x5\n" - " bhi ._306 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " neg r1, r1\n" - "._300:\n" - " bl debug_sub_816027C\n" - "._306:\n" - " ldrb r0, [r4]\n" - " mov r1, #0x6\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_816017C\n" - " mov r0, #0x0\n" - " b ._311\n" - "._309:\n" - " .align 2, 0\n" - "._308:\n" - " .word _nakamuraData4\n" - "._303:\n" - " mov r0, #0x8\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " bne ._310 @cond_branch\n" - " mov r0, #0x0\n" - " b ._311\n" - "._310:\n" - " bl debug_sub_8160308\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._311:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_816062C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " add sp, sp, #0xfffffff0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r8, r0\n" - " mov r0, #0x64\n" - " mov r4, r8\n" - " mul r4, r4, r0\n" - " ldr r0, ._316\n" - " add r4, r4, r0\n" - " add r0, r4, #0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " lsl r0, r0, #0x10\n" - " lsr r7, r0, #0x10\n" - " add r0, r4, #0\n" - " bl GetMonGender\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " ldr r1, ._316 + 4\n" - " lsl r0, r7, #0x3\n" - " sub r0, r0, r7\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldrb r6, [r0, #0x10]\n" - " cmp r6, #0\n" - " beq ._313 @cond_branch\n" - " cmp r6, #0xfe\n" - " beq ._313 @cond_branch\n" - " cmp r6, #0xff\n" - " bne ._314 @cond_branch\n" - "._313:\n" - " mov r0, #0x64\n" - " mov r1, r8\n" - " mul r1, r1, r0\n" - " add r0, r1, #0\n" - " ldr r1, ._316\n" - " add r0, r0, r1\n" - " bl GetMonGender\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " b ._320\n" - "._317:\n" - " .align 2, 0\n" - "._316:\n" - " .word gPlayerParty\n" - " .word gBaseStats\n" - "._314:\n" - " cmp r2, #0\n" - " beq ._318 @cond_branch\n" - " cmp r2, #0xfe\n" - " beq ._319 @cond_branch\n" - " mov r0, #0x0\n" - " b ._320\n" - "._318:\n" - " mov r6, #0xfe\n" - " b ._321\n" - "._319:\n" - " mov r6, #0x0\n" - "._321:\n" - " mov r0, r8\n" - " lsl r0, r0, #0x2\n" - " mov r9, r0\n" - "._322:\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " orr r5, r5, r0\n" - " add r0, r7, #0\n" - " add r1, r5, #0\n" - " bl GetGenderFromSpeciesAndPersonality\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, r6\n" - " bne ._322 @cond_branch\n" - " mov r0, #0x64\n" - " mov r4, r8\n" - " mul r4, r4, r0\n" - " ldr r0, ._323\n" - " add r4, r4, r0\n" - " add r0, r4, #0\n" - " mov r1, #0x42\n" - " bl GetMonData\n" - " ldr r0, ._323 + 4\n" - " add r0, r0, r9\n" - " ldrh r1, [r0]\n" - " ldrb r2, [r0, #0x2]\n" - " mov r0, #0x1\n" - " str r0, [sp]\n" - " str r5, [sp, #0x4]\n" - " mov r0, #0x0\n" - " str r0, [sp, #0x8]\n" - " str r0, [sp, #0xc]\n" - " add r0, r4, #0\n" - " mov r3, #0x20\n" - " bl CreateMon\n" - " add r0, r6, #0\n" - "._320:\n" - " add sp, sp, #0x10\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._324:\n" - " .align 2, 0\n" - "._323:\n" - " .word gPlayerParty\n" - " .word _nakamuraStatic0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160714() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " add sp, sp, #0xfffffff0\n" - " add r6, r0, #0\n" - " mov r9, r1\n" - " mov r7, #0x0\n" - " mov r0, #0x0\n" - " mov r8, r0\n" - " mov r2, #0x0\n" - " mov r5, #0x0\n" - "._329:\n" - " add r4, r5, #1\n" - " lsl r1, r4, #0x18\n" - " lsr r1, r1, #0x18\n" - " mov r0, r9\n" - " str r2, [sp, #0xc]\n" - " bl GetPokeblockData\n" - " add r1, r0, #0\n" - " lsl r0, r5, #0x1\n" - " add r0, r0, sp\n" - " strh r1, [r0]\n" - " ldr r2, [sp, #0xc]\n" - " cmp r5, #0x5\n" - " beq ._328 @cond_branch\n" - " lsl r0, r1, #0x10\n" - " asr r1, r0, #0x10\n" - " cmp r1, #0\n" - " ble ._326 @cond_branch\n" - " add r0, r7, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._326:\n" - " cmp r1, #0\n" - " bge ._327 @cond_branch\n" - " mov r0, r8\n" - " add r0, r0, #0x1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r8, r0\n" - "._327:\n" - " cmp r1, #0\n" - " bne ._328 @cond_branch\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - "._328:\n" - " lsl r0, r4, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x5\n" - " bls ._329 @cond_branch\n" - " mov r0, sp\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0x31\n" - " bgt ._333 @cond_branch\n" - " mov r0, sp\n" - " ldrh r0, [r0, #0x2]\n" - " lsl r0, r0, #0x10\n" - " asr r0, r0, #0x10\n" - " cmp r0, #0x31\n" - " bgt ._333 @cond_branch\n" - " mov r0, sp\n" - " mov r4, #0x4\n" - " ldsh r0, [r0, r4]\n" - " cmp r0, #0x31\n" - " bgt ._333 @cond_branch\n" - " mov r0, sp\n" - " mov r1, #0x6\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0x31\n" - " bgt ._333 @cond_branch\n" - " mov r0, sp\n" - " mov r4, #0x8\n" - " ldsh r0, [r0, r4]\n" - " cmp r0, #0x31\n" - " ble ._334 @cond_branch\n" - "._333:\n" - " ldr r1, ._336\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0xe\n" - " b ._400\n" - "._337:\n" - " .align 2, 0\n" - "._336:\n" - " .word ContestStatsText_GoldPokeBlock\n" - "._334:\n" - " cmp r7, #0x4\n" - " bne ._338 @cond_branch\n" - " ldr r1, ._340\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0xd\n" - " b ._400\n" - "._341:\n" - " .align 2, 0\n" - "._340:\n" - " .word ContestStatsText_WhitePokeBlock\n" - "._338:\n" - " mov r3, #0x0\n" - " mov r5, #0x0\n" - "._343:\n" - " lsl r0, r5, #0x1\n" - " add r0, r0, sp\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0x2\n" - " bne ._342 @cond_branch\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - "._342:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x4\n" - " bls ._343 @cond_branch\n" - " cmp r3, #0x3\n" - " beq ._345 @cond_branch\n" - " cmp r2, #0x5\n" - " beq ._345 @cond_branch\n" - " mov r4, r8\n" - " cmp r4, #0x4\n" - " bne ._346 @cond_branch\n" - "._345:\n" - " ldr r1, ._348\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0xc\n" - " b ._400\n" - "._349:\n" - " .align 2, 0\n" - "._348:\n" - " .word ContestStatsText_BlackPokeBlock\n" - "._346:\n" - " cmp r7, #0x3\n" - " bne ._350 @cond_branch\n" - " ldr r1, ._352\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0xb\n" - " b ._400\n" - "._353:\n" - " .align 2, 0\n" - "._352:\n" - " .word ContestStatsText_GrayPokeBlock\n" - "._350:\n" - " cmp r7, #0x2\n" - " beq ._354 @cond_branch\n" - " mov r0, r8\n" - " cmp r0, #0x2\n" - " bne ._377 @cond_branch\n" - "._354:\n" - " mov r3, #0x6\n" - " mov r2, #0x0\n" - " mov r5, #0x0\n" - "._359:\n" - " lsl r0, r5, #0x1\n" - " add r0, r0, sp\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0\n" - " beq ._358 @cond_branch\n" - " cmp r3, #0x6\n" - " bne ._357 @cond_branch\n" - " add r3, r5, #0\n" - " b ._358\n" - "._357:\n" - " add r2, r5, #0\n" - "._358:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x4\n" - " bls ._359 @cond_branch\n" - " lsl r0, r3, #0x1\n" - " mov r4, sp\n" - " add r1, r4, r0\n" - " lsl r0, r2, #0x1\n" - " add r0, r0, sp\n" - " mov r4, #0x0\n" - " ldsh r1, [r1, r4]\n" - " mov r4, #0x0\n" - " ldsh r0, [r0, r4]\n" - " cmp r1, r0\n" - " blt ._360 @cond_branch\n" - " add r2, r3, #0\n" - "._360:\n" - " cmp r2, #0\n" - " bne ._361 @cond_branch\n" - " ldr r1, ._363\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x6\n" - " b ._400\n" - "._364:\n" - " .align 2, 0\n" - "._363:\n" - " .word ContestStatsText_PurplePokeBlock\n" - "._361:\n" - " cmp r2, #0x1\n" - " bne ._365 @cond_branch\n" - " ldr r1, ._367\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x7\n" - " b ._400\n" - "._368:\n" - " .align 2, 0\n" - "._367:\n" - " .word ContestStatsText_IndigoPokeBlock\n" - "._365:\n" - " cmp r2, #0x2\n" - " bne ._369 @cond_branch\n" - " ldr r1, ._371\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x8\n" - " b ._400\n" - "._372:\n" - " .align 2, 0\n" - "._371:\n" - " .word ContestStatsText_BrownPokeBlock\n" - "._369:\n" - " cmp r2, #0x3\n" - " bne ._373 @cond_branch\n" - " ldr r1, ._375\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x9\n" - " b ._400\n" - "._376:\n" - " .align 2, 0\n" - "._375:\n" - " .word ContestStatsText_LiteBluePokeBlock\n" - "._373:\n" - " cmp r2, #0x4\n" - " bne ._377 @cond_branch\n" - " ldr r1, ._379\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0xa\n" - " b ._400\n" - "._380:\n" - " .align 2, 0\n" - "._379:\n" - " .word ContestStatsText_OlivePokeBlock\n" - "._377:\n" - " cmp r7, #0x1\n" - " beq ._381 @cond_branch\n" - " mov r0, r8\n" - " cmp r0, #0x1\n" - " bne ._399 @cond_branch\n" - "._381:\n" - " mov r0, sp\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0\n" - " beq ._383 @cond_branch\n" - " ldr r1, ._385\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x1\n" - " b ._400\n" - "._386:\n" - " .align 2, 0\n" - "._385:\n" - " .word ContestStatsText_RedPokeBlock\n" - "._383:\n" - " mov r0, sp\n" - " ldrh r0, [r0, #0x2]\n" - " cmp r0, #0\n" - " beq ._387 @cond_branch\n" - " ldr r1, ._389\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x2\n" - " b ._400\n" - "._390:\n" - " .align 2, 0\n" - "._389:\n" - " .word ContestStatsText_BluePokeBlock\n" - "._387:\n" - " mov r0, sp\n" - " mov r4, #0x4\n" - " ldsh r0, [r0, r4]\n" - " cmp r0, #0\n" - " beq ._391 @cond_branch\n" - " ldr r1, ._393\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x3\n" - " b ._400\n" - "._394:\n" - " .align 2, 0\n" - "._393:\n" - " .word ContestStatsText_PinkPokeBlock\n" - "._391:\n" - " mov r0, sp\n" - " mov r1, #0x6\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0\n" - " beq ._395 @cond_branch\n" - " ldr r1, ._397\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x4\n" - " b ._400\n" - "._398:\n" - " .align 2, 0\n" - "._397:\n" - " .word ContestStatsText_GreenPokeBlock\n" - "._395:\n" - " mov r0, sp\n" - " mov r4, #0x8\n" - " ldsh r0, [r0, r4]\n" - " cmp r0, #0\n" - " beq ._399 @cond_branch\n" - " ldr r1, ._401\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x5\n" - " b ._400\n" - "._402:\n" - " .align 2, 0\n" - "._401:\n" - " .word ContestStatsText_YellowPokeBlock\n" - "._399:\n" - " ldr r1, ._403\n" - " add r0, r6, #0\n" - " bl StringCopy\n" - " mov r0, #0x0\n" - "._400:\n" - " add sp, sp, #0x10\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._404:\n" - " .align 2, 0\n" - "._403:\n" - " .word gOtherText_FiveQuestions\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_816097C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add r7, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r5, r1, #0x10\n" - " mov r6, #0x0\n" - " mov r1, #0x0\n" - "._405:\n" - " add r0, r7, r6\n" - " strb r1, [r0]\n" - " add r0, r6, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " cmp r6, #0x3\n" - " bls ._405 @cond_branch\n" - " mov r0, #0xff\n" - " strb r0, [r7, #0x4]\n" - " lsl r0, r5, #0x10\n" - " asr r0, r0, #0x10\n" - " cmp r0, #0\n" - " bne ._406 @cond_branch\n" - " mov r0, #0xa1\n" - " strb r0, [r7, #0x3]\n" - " b ._414\n" - "._406:\n" - " cmp r0, #0\n" - " ble ._408 @cond_branch\n" - " mov r4, #0x64\n" - " mov r0, #0x0\n" - " mov r8, r0\n" - " mov r6, #0x0\n" - "._412:\n" - " lsl r5, r5, #0x10\n" - " asr r0, r5, #0x10\n" - " lsl r4, r4, #0x10\n" - " asr r1, r4, #0x10\n" - " bl __divsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r2, r0, #0x10\n" - " mov r1, r8\n" - " cmp r1, #0\n" - " bne ._410 @cond_branch\n" - " cmp r6, #0x2\n" - " beq ._410 @cond_branch\n" - " cmp r2, #0\n" - " beq ._411 @cond_branch\n" - "._410:\n" - " add r1, r6, r7\n" - " add r0, r2, #0\n" - " sub r0, r0, #0x5f\n" - " strb r0, [r1, #0x1]\n" - " mov r0, #0x1\n" - " mov r8, r0\n" - "._411:\n" - " asr r0, r5, #0x10\n" - " asr r4, r4, #0x10\n" - " add r1, r4, #0\n" - " bl __modsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " add r0, r4, #0\n" - " mov r1, #0xa\n" - " bl __divsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " add r0, r6, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " cmp r6, #0x2\n" - " bls ._412 @cond_branch\n" - " b ._414\n" - "._408:\n" - " cmp r0, #0\n" - " bge ._414 @cond_branch\n" - " neg r0, r0\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " mov r4, #0x64\n" - " mov r1, #0x0\n" - " mov r8, r1\n" - " mov r6, #0x0\n" - "._419:\n" - " lsl r5, r5, #0x10\n" - " asr r0, r5, #0x10\n" - " lsl r4, r4, #0x10\n" - " asr r1, r4, #0x10\n" - " bl __divsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r2, r0, #0x10\n" - " mov r1, r8\n" - " lsl r0, r1, #0x10\n" - " add r3, r0, #0\n" - " cmp r3, #0\n" - " bne ._416 @cond_branch\n" - " cmp r6, #0x2\n" - " beq ._416 @cond_branch\n" - " cmp r2, #0\n" - " beq ._417 @cond_branch\n" - "._416:\n" - " add r1, r6, r7\n" - " add r0, r2, #0\n" - " sub r0, r0, #0x5f\n" - " strb r0, [r1, #0x1]\n" - " cmp r3, #0\n" - " bne ._418 @cond_branch\n" - " mov r0, #0xae\n" - " strb r0, [r1]\n" - "._418:\n" - " mov r0, #0x1\n" - " mov r8, r0\n" - "._417:\n" - " asr r0, r5, #0x10\n" - " asr r4, r4, #0x10\n" - " add r1, r4, #0\n" - " bl __modsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " add r0, r4, #0\n" - " mov r1, #0xa\n" - " bl __divsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " add r0, r6, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " cmp r6, #0x2\n" - " bls ._419 @cond_branch\n" - "._414:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160A80() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r2, r0, #0\n" - " ldr r1, ._422\n" - " cmp r0, #0\n" - " bne ._420 @cond_branch\n" - " ldr r4, ._422 + 4\n" - " ldrb r1, [r1, #0x1]\n" - " add r0, r4, #0\n" - " bl debug_sub_816097C\n" - " add r0, r4, #0\n" - " mov r1, #0x8\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " b ._440\n" - "._423:\n" - " .align 2, 0\n" - "._422:\n" - " .word _nakamuraStatic18\n" - " .word gStringVar1\n" - "._420:\n" - " cmp r0, #0x1\n" - " bne ._424 @cond_branch\n" - " ldr r4, ._426\n" - " ldrb r1, [r1, #0x2]\n" - " add r0, r4, #0\n" - " bl debug_sub_816097C\n" - " add r0, r4, #0\n" - " mov r1, #0x8\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " b ._440\n" - "._427:\n" - " .align 2, 0\n" - "._426:\n" - " .word gStringVar1\n" - "._424:\n" - " cmp r0, #0x2\n" - " bne ._428 @cond_branch\n" - " ldr r4, ._430\n" - " ldrb r1, [r1, #0x3]\n" - " add r0, r4, #0\n" - " bl debug_sub_816097C\n" - " add r0, r4, #0\n" - " mov r1, #0x8\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " b ._440\n" - "._431:\n" - " .align 2, 0\n" - "._430:\n" - " .word gStringVar1\n" - "._428:\n" - " cmp r0, #0x3\n" - " bne ._432 @cond_branch\n" - " ldr r4, ._434\n" - " ldrb r1, [r1, #0x4]\n" - " add r0, r4, #0\n" - " bl debug_sub_816097C\n" - " add r0, r4, #0\n" - " mov r1, #0x8\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " b ._440\n" - "._435:\n" - " .align 2, 0\n" - "._434:\n" - " .word gStringVar1\n" - "._432:\n" - " cmp r0, #0x4\n" - " bne ._436 @cond_branch\n" - " ldr r4, ._438\n" - " ldrb r1, [r1, #0x5]\n" - " add r0, r4, #0\n" - " bl debug_sub_816097C\n" - " add r0, r4, #0\n" - " mov r1, #0x8\n" - " mov r2, #0xb\n" - " bl Menu_PrintText\n" - " b ._440\n" - "._439:\n" - " .align 2, 0\n" - "._438:\n" - " .word gStringVar1\n" - "._436:\n" - " cmp r2, #0x5\n" - " bne ._440 @cond_branch\n" - " ldr r4, ._441\n" - " ldrb r1, [r1, #0x6]\n" - " add r0, r4, #0\n" - " bl debug_sub_816097C\n" - " add r0, r4, #0\n" - " mov r1, #0x8\n" - " mov r2, #0xd\n" - " bl Menu_PrintText\n" - "._440:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._442:\n" - " .align 2, 0\n" - "._441:\n" - " .word gStringVar1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160B50() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r3, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r4, r1, #0\n" - " ldr r2, ._445\n" - " cmp r0, #0\n" - " bne ._443 @cond_branch\n" - " ldrb r0, [r2, #0x1]\n" - " add r0, r0, r1\n" - " strb r0, [r2, #0x1]\n" - " b ._455\n" - "._446:\n" - " .align 2, 0\n" - "._445:\n" - " .word _nakamuraStatic18\n" - "._443:\n" - " cmp r0, #0x1\n" - " bne ._447 @cond_branch\n" - " ldrb r0, [r2, #0x2]\n" - " add r0, r0, r1\n" - " strb r0, [r2, #0x2]\n" - " b ._455\n" - "._447:\n" - " cmp r0, #0x2\n" - " bne ._449 @cond_branch\n" - " ldrb r0, [r2, #0x3]\n" - " add r0, r0, r1\n" - " strb r0, [r2, #0x3]\n" - " b ._455\n" - "._449:\n" - " cmp r0, #0x3\n" - " bne ._451 @cond_branch\n" - " ldrb r0, [r2, #0x4]\n" - " add r0, r0, r1\n" - " strb r0, [r2, #0x4]\n" - " b ._455\n" - "._451:\n" - " cmp r0, #0x4\n" - " bne ._453 @cond_branch\n" - " ldrb r0, [r2, #0x5]\n" - " add r0, r0, r1\n" - " strb r0, [r2, #0x5]\n" - " b ._455\n" - "._453:\n" - " cmp r3, #0x5\n" - " bne ._455 @cond_branch\n" - " ldrb r0, [r2, #0x6]\n" - " add r0, r0, r4\n" - " strb r0, [r2, #0x6]\n" - "._455:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160BB0() -{ - asm( - " push {r4, r5, lr}\n" - " ldr r5, ._456\n" - " ldr r4, ._456 + 4\n" - " add r0, r5, #0\n" - " add r1, r4, #0\n" - " bl debug_sub_8160714\n" - " strb r0, [r4]\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x8\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._457:\n" - " .align 2, 0\n" - "._456:\n" - " .word gStringVar1\n" - " .word _nakamuraStatic18\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160BE4() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xc\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " bl debug_sub_8160BB0\n" - " ldr r0, ._459\n" - " mov r1, #0x2\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " ldr r0, ._459 + 4\n" - " mov r1, #0x2\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " ldr r0, ._459 + 8\n" - " mov r1, #0x2\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r0, ._459 + 12\n" - " mov r1, #0x2\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " ldr r0, ._459 + 16\n" - " mov r1, #0x2\n" - " mov r2, #0xb\n" - " bl Menu_PrintText\n" - " ldr r0, ._459 + 20\n" - " mov r1, #0x2\n" - " mov r2, #0xd\n" - " bl Menu_PrintText\n" - " mov r4, #0x0\n" - "._458:\n" - " add r0, r4, #0\n" - " bl debug_sub_8160A80\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x5\n" - " bls ._458 @cond_branch\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xb\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._460:\n" - " .align 2, 0\n" - "._459:\n" - " .word gContestStatsText_Spicy\n" - " .word gContestStatsText_Dry\n" - " .word gContestStatsText_Sweet\n" - " .word gContestStatsText_Bitter\n" - " .word gContestStatsText_Sour\n" - " .word gContestStatsText_Tasty\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160C7C() -{ - asm( - " push {r4, lr}\n" - " ldr r2, ._469\n" - " mov r1, #0x0\n" - " ldrb r0, [r2]\n" - " cmp r0, #0xc\n" - " bne ._467 @cond_branch\n" - " ldrb r0, [r2, #0x1]\n" - " cmp r0, #0x2\n" - " bne ._462 @cond_branch\n" - " mov r1, #0x1\n" - "._462:\n" - " ldrb r0, [r2, #0x3]\n" - " cmp r0, #0x2\n" - " bne ._463 @cond_branch\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - "._463:\n" - " ldrb r0, [r2, #0x4]\n" - " cmp r0, #0x2\n" - " bne ._464 @cond_branch\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - "._464:\n" - " ldrb r0, [r2, #0x2]\n" - " cmp r0, #0x2\n" - " bne ._465 @cond_branch\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - "._465:\n" - " ldrb r0, [r2, #0x5]\n" - " cmp r0, #0x2\n" - " bne ._466 @cond_branch\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - "._466:\n" - " cmp r1, #0x3\n" - " beq ._467 @cond_branch\n" - " mov r0, #0x2\n" - " strb r0, [r2, #0x1]\n" - " strb r0, [r2, #0x3]\n" - " strb r0, [r2, #0x4]\n" - "._467:\n" - " add r0, r2, #0\n" - " bl sub_810CA34\n" - " bl debug_sub_8160BB0\n" - " mov r4, #0x0\n" - "._468:\n" - " add r0, r4, #0\n" - " bl debug_sub_8160A80\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x5\n" - " bls ._468 @cond_branch\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._470:\n" - " .align 2, 0\n" - "._469:\n" - " .word _nakamuraStatic18\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160CF4() -{ - asm( - " push {lr}\n" - " ldr r2, ._473\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._471 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " b ._472\n" - "._474:\n" - " .align 2, 0\n" - "._473:\n" - " .word gMain\n" - "._471:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._475 @cond_branch\n" - " mov r0, #0x1\n" - "._472:\n" - " bl Menu_MoveCursor\n" - " mov r0, #0x0\n" - " b ._484\n" - "._475:\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._477 @cond_branch\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " neg r1, r1\n" - " b ._478\n" - "._477:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._479 @cond_branch\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - "._478:\n" - " bl debug_sub_8160B50\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8160A80\n" - " bl debug_sub_8160BB0\n" - " mov r0, #0x0\n" - " b ._484\n" - "._479:\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._481 @cond_branch\n" - " bl debug_sub_8160C7C\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x0\n" - " b ._484\n" - "._481:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._483 @cond_branch\n" - " mov r0, #0x0\n" - " b ._484\n" - "._483:\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._484:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -u8 debug_sub_8160D98() -{ - asm( - " push {lr}\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " bl debug_sub_8160BE4\n" - " ldr r1, ._485\n" - " ldr r0, ._485 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._486:\n" - " .align 2, 0\n" - "._485:\n" - " .word gMenuCallback\n" - " .word debug_sub_8160CF4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160DC0() -{ - asm( - " push {lr}\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x16\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._487\n" - " mov r1, #0xb\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 4\n" - " mov r1, #0x2\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 8\n" - " mov r1, #0x2\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 12\n" - " mov r1, #0x2\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 16\n" - " mov r1, #0x2\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 20\n" - " mov r1, #0x2\n" - " mov r2, #0xb\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 24\n" - " mov r1, #0x2\n" - " mov r2, #0xd\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 28\n" - " mov r1, #0x2\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " ldr r0, ._487 + 32\n" - " mov r1, #0x2\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " pop {r0}\n" - " bx r0\n" - "._488:\n" - " .align 2, 0\n" - "._487:\n" - " .word gOtherText_Slash\n" - " .word Str_843E5F2\n" - " .word Str_843E5FB\n" - " .word Str_843E606\n" - " .word Str_843E611\n" - " .word Str_843E61C\n" - " .word Str_843E627\n" - " .word Str_843E637\n" - " .word Str_843E632\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8160E50() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0xa\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " ldr r5, ._489\n" - " add r0, r6, #0\n" - " mov r1, #0x2\n" - " add r2, r5, #0\n" - " bl GetMonData\n" - " add r0, r5, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r0, #0xc\n" - " mov r1, #0x1\n" - " mov r2, #0x15\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " add r0, r6, #0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " mov r1, #0xb\n" - " mul r0, r0, r1\n" - " ldr r1, ._489 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xc\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x1a\n" - " bl GetMonData\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r5, #0\n" - " add r1, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0x3\n" - " mov r2, #0x11\n" - " mov r3, #0x4\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x1b\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r4, r4, r1\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0x5\n" - " mov r2, #0x11\n" - " mov r3, #0x6\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x1c\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r4, r4, r1\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0x7\n" - " mov r2, #0x11\n" - " mov r3, #0x8\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x1d\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r4, r4, r1\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0x9\n" - " mov r2, #0x11\n" - " mov r3, #0xa\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x1e\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r4, r4, r1\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0xb\n" - " mov r2, #0x11\n" - " mov r3, #0xc\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0xb\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x1f\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r4, r4, r1\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0xd\n" - " mov r2, #0x11\n" - " mov r3, #0xe\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0xd\n" - " bl Menu_PrintText\n" - " add r0, r5, #0\n" - " add r1, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0xf\n" - " mov r2, #0x11\n" - " mov r3, #0x10\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x20\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0xd\n" - " mov r1, #0x11\n" - " mov r2, #0x11\n" - " mov r3, #0x12\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0xd\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._490:\n" - " .align 2, 0\n" - "._489:\n" - " .word gStringVar1\n" - " .word gSpeciesNames\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8161028() -{ - asm( - " push {r4, r5, r6, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._491 @cond_branch\n" - " ldr r0, ._496\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " bne ._492 @cond_branch\n" - " mov r5, #0x5\n" - "._494:\n" - " lsl r0, r5, #0x10\n" - " asr r4, r0, #0x10\n" - " mov r0, #0x64\n" - " mul r0, r0, r4\n" - " ldr r1, ._496 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " bne ._493 @cond_branch\n" - " sub r0, r4, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " cmp r0, #0\n" - " bge ._494 @cond_branch\n" - "._492:\n" - " ldr r1, ._496\n" - " ldrb r0, [r1]\n" - " add r0, r0, r6\n" - " strb r0, [r1]\n" - " b ._506\n" - "._497:\n" - " .align 2, 0\n" - "._496:\n" - " .word _nakamuraData5\n" - " .word gPlayerParty\n" - "._491:\n" - " cmp r1, #0x1\n" - " bne ._506 @cond_branch\n" - " ldr r4, ._501\n" - " ldrb r0, [r4]\n" - " add r0, r0, r6\n" - " strb r0, [r4]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x6\n" - " bne ._499 @cond_branch\n" - " mov r0, #0x0\n" - " b ._500\n" - "._502:\n" - " .align 2, 0\n" - "._501:\n" - " .word _nakamuraData5\n" - "._493:\n" - " ldr r0, ._504\n" - " strb r5, [r0]\n" - " b ._506\n" - "._505:\n" - " .align 2, 0\n" - "._504:\n" - " .word _nakamuraData5\n" - "._499:\n" - " ldrb r1, [r4]\n" - " mov r0, #0x64\n" - " mul r0, r0, r1\n" - " ldr r1, ._507\n" - " add r0, r0, r1\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " bne ._506 @cond_branch\n" - "._500:\n" - " strb r0, [r4]\n" - "._506:\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._508:\n" - " .align 2, 0\n" - "._507:\n" - " .word gPlayerParty\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_81610BC() -{ - asm( - " push {lr}\n" - " ldr r0, ._511\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._509 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " b ._510\n" - "._512:\n" - " .align 2, 0\n" - "._511:\n" - " .word gMain\n" - "._509:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._513 @cond_branch\n" - " mov r0, #0x1\n" - "._510:\n" - " bl debug_sub_8161028\n" - " ldr r0, ._515\n" - " ldrb r1, [r0]\n" - " mov r0, #0x64\n" - " mul r0, r0, r1\n" - " ldr r1, ._515 + 4\n" - " add r0, r0, r1\n" - " bl debug_sub_8160E50\n" - " mov r0, #0x0\n" - " b ._518\n" - "._516:\n" - " .align 2, 0\n" - "._515:\n" - " .word _nakamuraData5\n" - " .word gPlayerParty\n" - "._513:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._517 @cond_branch\n" - " mov r0, #0x0\n" - " b ._518\n" - "._517:\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._518:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void DebugMenu_EffortValues() -{ - asm( - " push {lr}\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " ldr r1, ._519\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " bl debug_sub_8160DC0\n" - " ldr r0, ._519 + 4\n" - " bl debug_sub_8160E50\n" - " ldr r1, ._519 + 8\n" - " ldr r0, ._519 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._520:\n" - " .align 2, 0\n" - "._519:\n" - " .word _nakamuraData5\n" - " .word gPlayerParty\n" - " .word gMenuCallback\n" - " .word debug_sub_81610BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8161160() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " mov r7, #0x0\n" - " ldr r2, ._523\n" - " ldr r1, ._523 + 4\n" - " ldrh r0, [r2]\n" - " ldrh r3, [r1]\n" - " cmp r0, r3\n" - " bhi ._521 @cond_branch\n" - " add r6, r0, #0\n" - " ldrh r5, [r1]\n" - " b ._522\n" - "._524:\n" - " .align 2, 0\n" - "._523:\n" - " .word _nakamuraData6\n" - " .word _nakamuraData8\n" - "._521:\n" - " ldrh r6, [r1]\n" - " ldrh r5, [r2]\n" - "._522:\n" - " mov r4, #0x0\n" - " ldr r0, ._529\n" - " ldrh r0, [r0]\n" - " cmp r4, r0\n" - " bcs ._525 @cond_branch\n" - " ldr r0, ._529 + 4\n" - " mov r8, r0\n" - "._528:\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r2, r8\n" - " ldrh r1, [r2]\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, r6\n" - " bcc ._527 @cond_branch\n" - " cmp r0, r5\n" - " bhi ._527 @cond_branch\n" - " add r0, r7, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r7, r0, #0x10\n" - "._527:\n" - " add r4, r4, #0x1\n" - " ldr r0, ._529\n" - " ldrh r0, [r0]\n" - " cmp r4, r0\n" - " bcc ._528 @cond_branch\n" - "._525:\n" - " add r0, r7, #0\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._530:\n" - " .align 2, 0\n" - "._529:\n" - " .word _nakamuraDataA\n" - " .word _nakamuraDataC\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_81611D8() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xf\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._531\n" - " mov r1, #0x2\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._531 + 4\n" - " mov r1, #0x2\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " ldr r0, ._531 + 8\n" - " mov r1, #0x2\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " ldr r0, ._531 + 12\n" - " mov r1, #0x2\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r0, ._531 + 16\n" - " mov r1, #0x2\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " ldr r0, ._531 + 20\n" - " mov r1, #0xd\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " ldr r4, ._531 + 24\n" - " add r0, r4, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xe\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x4\n" - " bl InitMenu\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._532:\n" - " .align 2, 0\n" - "._531:\n" - " .word Str_843E642\n" - " .word Str_843E647\n" - " .word Str_843E65A\n" - " .word Str_843E64C\n" - " .word Str_843E651\n" - " .word Str_843E655\n" - " .word Str_843E658\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8161290() -{ - asm( - " push {r4, lr}\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " ldr r4, ._533\n" - " add r0, r4, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x8\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._534:\n" - " .align 2, 0\n" - "._533:\n" - " .word gStringVar1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_81612B8() -{ - asm( - " push {r4, r5, lr}\n" - " add r4, r2, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " lsl r1, r1, #0x18\n" - " asr r1, r1, #0x18\n" - " ldrh r2, [r0]\n" - " add r1, r1, r2\n" - " strh r1, [r0]\n" - " ldr r5, ._535\n" - " ldrh r1, [r0]\n" - " add r0, r5, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r5, #0\n" - " mov r1, #0x8\n" - " add r2, r4, #0\n" - " bl Menu_PrintText\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._536:\n" - " .align 2, 0\n" - "._535:\n" - " .word gStringVar1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_81612EC() -{ - asm( - " push {r4, r5, lr}\n" - " ldr r2, ._540\n" - " ldrh r1, [r2, #0x2c]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " mov r5, #0x1\n" - " cmp r0, #0\n" - " beq ._537 @cond_branch\n" - " mov r5, #0x64\n" - "._537:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._538 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " b ._539\n" - "._541:\n" - " .align 2, 0\n" - "._540:\n" - " .word gMain\n" - "._538:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._542 @cond_branch\n" - " mov r0, #0x1\n" - "._539:\n" - " bl Menu_MoveCursor\n" - "._565:\n" - " mov r0, #0x0\n" - " b ._543\n" - "._542:\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._544 @cond_branch\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " asr r4, r0, #0x18\n" - " cmp r4, #0\n" - " bne ._545 @cond_branch\n" - " ldr r0, ._550\n" - " neg r1, r5\n" - " mov r2, #0x1\n" - " bl debug_sub_81612B8\n" - "._545:\n" - " cmp r4, #0x1\n" - " bne ._546 @cond_branch\n" - " ldr r0, ._550 + 4\n" - " neg r1, r5\n" - " mov r2, #0x3\n" - " bl debug_sub_81612B8\n" - "._546:\n" - " cmp r4, #0x2\n" - " bne ._547 @cond_branch\n" - " ldr r0, ._550 + 8\n" - " neg r1, r5\n" - " mov r2, #0x5\n" - " bl debug_sub_81612B8\n" - "._547:\n" - " cmp r4, #0x3\n" - " bne ._565 @cond_branch\n" - " ldr r0, ._550 + 12\n" - " neg r1, r5\n" - " mov r2, #0x7\n" - " bl debug_sub_81612B8\n" - " b ._565\n" - "._551:\n" - " .align 2, 0\n" - "._550:\n" - " .word _nakamuraData6\n" - " .word _nakamuraData8\n" - " .word _nakamuraDataC\n" - " .word _nakamuraDataA\n" - "._544:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._552 @cond_branch\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " asr r4, r0, #0x18\n" - " cmp r4, #0\n" - " bne ._553 @cond_branch\n" - " ldr r0, ._558\n" - " add r1, r5, #0\n" - " mov r2, #0x1\n" - " bl debug_sub_81612B8\n" - "._553:\n" - " cmp r4, #0x1\n" - " bne ._554 @cond_branch\n" - " ldr r0, ._558 + 4\n" - " add r1, r5, #0\n" - " mov r2, #0x3\n" - " bl debug_sub_81612B8\n" - "._554:\n" - " cmp r4, #0x2\n" - " bne ._555 @cond_branch\n" - " ldr r0, ._558 + 8\n" - " add r1, r5, #0\n" - " mov r2, #0x5\n" - " bl debug_sub_81612B8\n" - "._555:\n" - " cmp r4, #0x3\n" - " bne ._565 @cond_branch\n" - " ldr r0, ._558 + 12\n" - " add r1, r5, #0\n" - " mov r2, #0x7\n" - " bl debug_sub_81612B8\n" - " b ._565\n" - "._559:\n" - " .align 2, 0\n" - "._558:\n" - " .word _nakamuraData6\n" - " .word _nakamuraData8\n" - " .word _nakamuraDataC\n" - " .word _nakamuraDataA\n" - "._552:\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._560 @cond_branch\n" - " ldr r0, ._563\n" - " ldrh r0, [r0]\n" - " cmp r0, #0\n" - " beq ._565 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " bl debug_sub_8161160\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl debug_sub_8161290\n" - " b ._565\n" - "._564:\n" - " .align 2, 0\n" - "._563:\n" - " .word _nakamuraDataC\n" - "._560:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._565 @cond_branch\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._543:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void DebugMenu_RandomNumberTest() -{ - asm( - " push {lr}\n" - " ldr r0, ._566\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " ldr r0, ._566 + 4\n" - " strh r1, [r0]\n" - " ldr r0, ._566 + 8\n" - " strh r1, [r0]\n" - " ldr r0, ._566 + 12\n" - " strh r1, [r0]\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_EraseWindowRect\n" - " bl debug_sub_81611D8\n" - " ldr r1, ._566 + 16\n" - " ldr r0, ._566 + 20\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._567:\n" - " .align 2, 0\n" - "._566:\n" - " .word _nakamuraData6\n" - " .word _nakamuraData8\n" - " .word _nakamuraDataC\n" - " .word _nakamuraDataA\n" - " .word gMenuCallback\n" - " .word debug_sub_81612EC+1\n" - "\n" - ); -} - #endif // DEBUG diff --git a/src/debug/nohara_debug_menu.c b/src/debug/nohara_debug_menu.c index bdfc8f9c5..b3885ff76 100644 --- a/src/debug/nohara_debug_menu.c +++ b/src/debug/nohara_debug_menu.c @@ -5,2312 +5,8 @@ __attribute__((unused)) static u8 gDebug_03000724; __attribute__((unused)) static u8 gDebug_03000725; __attribute__((unused)) static u8 gDebug_03000726; -__attribute__((naked)) -void InitNoharaDebugMenu() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x13\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._1\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x12\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._1 + 4\n" - " ldr r0, ._1 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._2:\n" - " .align 2, 0\n" - "._1:\n" - " .word gUnknown_Debug_083C4938\n" - " .word gMenuCallback\n" - " .word debug_sub_808F414+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F414() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._3 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " beq ._4 @cond_branch\n" - " ldr r2, ._6\n" - " ldr r0, ._6 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - "._3:\n" - " mov r0, #0x0\n" - " b ._5\n" - "._7:\n" - " .align 2, 0\n" - "._6:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C4938\n" - "._4:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._5:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_TV() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " ldr r1, ._8\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xa\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._8 + 4\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x9\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._8 + 8\n" - " ldr r0, ._8 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._9:\n" - " .align 2, 0\n" - "._8:\n" - " .word gDebug_03000726\n" - " .word gUnknown_Debug_083C4B8C\n" - " .word gMenuCallback\n" - " .word debug_sub_808F4AC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F4AC() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._10 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " beq ._11 @cond_branch\n" - " ldr r2, ._13\n" - " ldr r0, ._13 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - "._10:\n" - " mov r0, #0x0\n" - " b ._12\n" - "._14:\n" - " .align 2, 0\n" - "._13:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C4B8C\n" - "._11:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._12:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F4EC() -{ - asm( - " push {lr}\n" - " bl debug_sub_808F6BC\n" - " ldr r0, ._15\n" - " bl sub_8071F40\n" - " mov r0, #0x3\n" - " mov r1, #0x3\n" - " mov r2, #0x1\n" - " bl DisplayYesNoMenu\n" - " ldr r1, ._15 + 4\n" - " ldr r0, ._15 + 8\n" - " str r0, [r1]\n" - " pop {r0}\n" - " bx r0\n" - "._16:\n" - " .align 2, 0\n" - "._15:\n" - " .word gUnknown_Debug_083C4980\n" - " .word gMenuCallback\n" - " .word debug_sub_808F648+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F518() -{ - asm( - " push {r4, lr}\n" - " mov r2, #0x0\n" - " ldr r4, ._20\n" - " ldr r3, ._20 + 4\n" - "._19:\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x2\n" - " add r1, r0, r4\n" - " add r0, r1, r3\n" - " ldrb r0, [r0]\n" - " sub r0, r0, #0x15\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x13\n" - " bhi ._18 @cond_branch\n" - " ldr r0, ._20 + 8\n" - " add r1, r1, r0\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._18 @cond_branch\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - "._18:\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x17\n" - " bls ._19 @cond_branch\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._21:\n" - " .align 2, 0\n" - "._20:\n" - " .word gSaveBlock1\n" - " .word 0x2738\n" - " .word 0x2739\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F560() -{ - asm( - " push {r4, lr}\n" - " mov r1, #0x0\n" - " ldr r4, ._23\n" - " ldr r3, ._23 + 4\n" - " mov r2, #0x0\n" - "._22:\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r4\n" - " add r0, r0, r3\n" - " strb r2, [r0]\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " cmp r1, #0x17\n" - " bls ._22 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._24:\n" - " .align 2, 0\n" - "._23:\n" - " .word gSaveBlock1\n" - " .word 0x2739\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F594() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r2, #0x0\n" - " ldr r6, ._27\n" - " ldr r5, ._27 + 4\n" - " ldr r4, ._27 + 8\n" - " mov r3, #0x1\n" - "._26:\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x2\n" - " add r1, r0, r6\n" - " add r0, r1, r5\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._25 @cond_branch\n" - " add r0, r1, r4\n" - " strb r3, [r0]\n" - "._25:\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x17\n" - " bls ._26 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._28:\n" - " .align 2, 0\n" - "._27:\n" - " .word gSaveBlock1\n" - " .word 0x2738\n" - " .word 0x2739\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F5D8() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " mov r4, #0x0\n" - " ldr r6, ._30\n" - " ldr r7, ._30 + 4\n" - " add r0, r7, #1\n" - " mov r8, r0\n" - "._29:\n" - " ldr r5, ._30 + 8\n" - " strh r4, [r5]\n" - " bl GetSlotMachineId\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r6, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " lsl r0, r4, #0x1\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x2\n" - " add r1, r0, r7\n" - " ldrb r1, [r1]\n" - " add r0, r0, r8\n" - " ldrb r2, [r0]\n" - " add r0, r6, #0\n" - " bl Menu_PrintText\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0xb\n" - " bls ._29 @cond_branch\n" - " mov r0, #0x0\n" - " strh r0, [r5]\n" - " ldr r1, ._30 + 12\n" - " ldr r0, ._30 + 16\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._31:\n" - " .align 2, 0\n" - "._30:\n" - " .word gStringVar1\n" - " .word gUnknown_Debug_083C4BD4\n" - " .word gSpecialVar_0x8004\n" - " .word gMenuCallback\n" - " .word debug_sub_8090278+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F648() -{ - asm( - " push {lr}\n" - " ldr r0, ._35\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._32 @cond_branch\n" - " mov r0, #0xa\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xd\n" - " bl Menu_EraseWindowRect\n" - " ldr r0, ._35 + 4\n" - " ldrb r1, [r0]\n" - " mov r2, #0x1\n" - " eor r1, r1, r2\n" - " strb r1, [r0]\n" - " cmp r1, #0\n" - " beq ._33 @cond_branch\n" - " bl debug_sub_808F7B4\n" - " b ._40\n" - "._36:\n" - " .align 2, 0\n" - "._35:\n" - " .word gMain\n" - " .word gDebug_03000726\n" - "._33:\n" - " bl debug_sub_808F6BC\n" - " b ._40\n" - "._32:\n" - " bl Menu_ProcessInputNoWrap_\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._43 @cond_branch\n" - " cmp r1, r0\n" - " bgt ._39 @cond_branch\n" - " sub r0, r0, #0x1\n" - " cmp r1, r0\n" - " beq ._40 @cond_branch\n" - " b ._43\n" - "._39:\n" - " cmp r1, #0\n" - " beq ._42 @cond_branch\n" - " b ._43\n" - "._40:\n" - " mov r0, #0x0\n" - " b ._44\n" - "._42:\n" - " bl debug_sub_808F518\n" - "._43:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._44:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F6BC() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r4, #0x0\n" - " ldr r5, ._48\n" - " ldr r6, ._48 + 4\n" - "._45:\n" - " lsl r0, r4, #0x3\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldr r1, ._48 + 8\n" - " add r0, r0, r1\n" - " ldrb r1, [r0]\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xa0\n" - " lsl r0, r0, #0x14\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " bl Menu_PrintText\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x4\n" - " bls ._45 @cond_branch\n" - " mov r4, #0x5\n" - " ldr r5, ._48\n" - " ldr r6, ._48 + 4\n" - "._50:\n" - " lsl r0, r4, #0x3\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldr r1, ._48 + 8\n" - " add r0, r0, r1\n" - " ldrb r1, [r0]\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " cmp r4, #0xe\n" - " bhi ._46 @cond_branch\n" - " lsl r1, r4, #0x19\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " b ._47\n" - "._49:\n" - " .align 2, 0\n" - "._48:\n" - " .word gStringVar1\n" - " .word gSaveBlock1\n" - " .word 0x2738\n" - "._46:\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xec\n" - " lsl r0, r0, #0x18\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x6\n" - " bl Menu_PrintText\n" - "._47:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x17\n" - " bls ._50 @cond_branch\n" - " mov r4, #0x0\n" - " ldr r5, ._53\n" - "._55:\n" - " ldr r0, ._53 + 4\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r0\n" - " ldr r0, ._53 + 8\n" - " add r1, r1, r0\n" - " ldrb r1, [r1]\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " cmp r4, #0x7\n" - " bhi ._51 @cond_branch\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xa0\n" - " lsl r0, r0, #0x14\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " b ._52\n" - "._54:\n" - " .align 2, 0\n" - "._53:\n" - " .word gStringVar1\n" - " .word gSaveBlock1\n" - " .word 0x2abc\n" - "._51:\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xfa\n" - " lsl r0, r0, #0x18\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0xc\n" - " bl Menu_PrintText\n" - "._52:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0xf\n" - " bls ._55 @cond_branch\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F7B4() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r4, #0x0\n" - " ldr r5, ._59\n" - " ldr r6, ._59 + 4\n" - "._56:\n" - " lsl r0, r4, #0x3\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldr r1, ._59 + 8\n" - " add r0, r0, r1\n" - " ldrb r1, [r0]\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xa0\n" - " lsl r0, r0, #0x14\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " bl Menu_PrintText\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x4\n" - " bls ._56 @cond_branch\n" - " mov r4, #0x5\n" - " ldr r5, ._59\n" - " ldr r6, ._59 + 4\n" - "._61:\n" - " lsl r0, r4, #0x3\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldr r1, ._59 + 8\n" - " add r0, r0, r1\n" - " ldrb r1, [r0]\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " cmp r4, #0xe\n" - " bhi ._57 @cond_branch\n" - " lsl r1, r4, #0x19\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " b ._58\n" - "._60:\n" - " .align 2, 0\n" - "._59:\n" - " .word gStringVar1\n" - " .word gSaveBlock1\n" - " .word 0x2739\n" - "._57:\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xec\n" - " lsl r0, r0, #0x18\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x6\n" - " bl Menu_PrintText\n" - "._58:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x17\n" - " bls ._61 @cond_branch\n" - " mov r4, #0x0\n" - " ldr r5, ._64\n" - "._66:\n" - " ldr r0, ._64 + 4\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r0\n" - " ldr r0, ._64 + 8\n" - " add r1, r1, r0\n" - " ldrb r1, [r1]\n" - " add r0, r5, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " cmp r4, #0x7\n" - " bhi ._62 @cond_branch\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xa0\n" - " lsl r0, r0, #0x14\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " b ._63\n" - "._65:\n" - " .align 2, 0\n" - "._64:\n" - " .word gStringVar1\n" - " .word gSaveBlock1\n" - " .word 0x2abd\n" - "._62:\n" - " lsl r1, r4, #0x19\n" - " mov r0, #0xfa\n" - " lsl r0, r0, #0x18\n" - " add r1, r1, r0\n" - " lsr r1, r1, #0x18\n" - " add r0, r5, #0\n" - " mov r2, #0xc\n" - " bl Menu_PrintText\n" - "._63:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0xf\n" - " bls ._66 @cond_branch\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F8AC() -{ - asm( - " push {lr}\n" - " ldr r0, ._67\n" - " bl FlagSet\n" - " ldr r0, ._67 + 4\n" - " bl FlagSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._68:\n" - " .align 2, 0\n" - "._67:\n" - " .word 0x832\n" - " .word 0x818\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F8CC() -{ - asm( - " push {r4, lr}\n" - " ldr r1, ._69\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " ldr r0, ._69 + 4\n" - " bl sub_8071F40\n" - " mov r0, #0xd\n" - " mov r1, #0x6\n" - " mov r2, #0x1a\n" - " mov r3, #0x8\n" - " bl Menu_BlankWindowRect\n" - " ldr r0, ._69 + 8\n" - " ldr r0, [r0]\n" - " mov r1, #0xe\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " mov r0, #0x16\n" - " mov r1, #0x1\n" - " mov r2, #0x18\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " ldr r4, ._69 + 12\n" - " add r0, r4, #0\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x17\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r1, ._69 + 16\n" - " ldr r0, ._69 + 20\n" - " str r0, [r1]\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._70:\n" - " .align 2, 0\n" - "._69:\n" - " .word gDebug_03000724\n" - " .word gUnknown_Debug_083C49CA\n" - " .word gUnknown_Debug_083C4ABD+0xf\n" - " .word gStringVar1\n" - " .word gMenuCallback\n" - " .word debug_sub_808F93C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F93C() -{ - asm( - " push {r4, lr}\n" - " mov r2, #0x0\n" - " ldr r0, ._83\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._71 @cond_branch\n" - " ldr r1, ._83 + 4\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x18\n" - " bne ._72 @cond_branch\n" - " strb r2, [r1]\n" - "._72:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._71:\n" - " ldr r0, ._83\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._73 @cond_branch\n" - " ldr r1, ._83 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._74 @cond_branch\n" - " mov r0, #0x18\n" - " strb r0, [r1]\n" - "._74:\n" - " ldrb r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._73:\n" - " ldr r0, ._83\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._75 @cond_branch\n" - " ldr r1, ._83 + 8\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0xc\n" - " bne ._76 @cond_branch\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - "._76:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._75:\n" - " ldr r0, ._83\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._77 @cond_branch\n" - " ldr r1, ._83 + 8\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._78 @cond_branch\n" - " mov r0, #0xc\n" - " strb r0, [r1]\n" - "._78:\n" - " ldrb r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._77:\n" - " cmp r2, #0\n" - " beq ._79 @cond_branch\n" - " mov r0, #0xd\n" - " mov r1, #0x6\n" - " mov r2, #0x1a\n" - " mov r3, #0x8\n" - " bl Menu_BlankWindowRect\n" - " ldr r1, ._83 + 12\n" - " ldr r0, ._83 + 8\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0xe\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " mov r0, #0x16\n" - " mov r1, #0x1\n" - " mov r2, #0x18\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " ldr r4, ._83 + 16\n" - " ldr r0, ._83 + 4\n" - " ldrb r1, [r0]\n" - " add r0, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x17\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - "._79:\n" - " ldr r4, ._83\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._80 @cond_branch\n" - " mov r0, #0x15\n" - " bl PlaySE\n" - " ldr r0, ._83 + 4\n" - " ldrb r0, [r0]\n" - " ldr r2, ._83 + 20\n" - " ldr r1, ._83 + 8\n" - " ldrb r1, [r1]\n" - " add r1, r1, r2\n" - " ldrb r1, [r1]\n" - " bl debug_sub_808FA88\n" - "._80:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0xa\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._81 @cond_branch\n" - " mov r0, #0x0\n" - " b ._82\n" - "._84:\n" - " .align 2, 0\n" - "._83:\n" - " .word gMain\n" - " .word gDebug_03000725\n" - " .word gDebug_03000724\n" - " .word gUnknown_Debug_083C4ABD+0xf\n" - " .word gStringVar1\n" - " .word gUnknown_Debug_083C4ABD\n" - "._81:\n" - " ldr r0, ._85\n" - " bl sub_80BF588\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._82:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._86:\n" - " .align 2, 0\n" - "._85:\n" - " .word gSaveBlock1+0x2738\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808FA88() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " add sp, sp, #0xffffffcc\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r7, r1, #0x18\n" - " bl GetLeadMonIndex\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r9, r0\n" - " ldr r3, ._92\n" - " lsl r4, r6, #0x3\n" - " add r2, r4, r6\n" - " lsl r2, r2, #0x2\n" - " add r0, r2, r3\n" - " ldr r5, ._92 + 4\n" - " add r1, r0, r5\n" - " strb r7, [r1]\n" - " ldr r1, ._92 + 8\n" - " add r0, r0, r1\n" - " mov r1, #0x1\n" - " strb r1, [r0]\n" - " mov r1, #0x0\n" - " ldr r0, ._92 + 12\n" - " add r5, r3, r0\n" - " mov r3, #0x1\n" - "._87:\n" - " add r0, r1, r2\n" - " add r0, r0, r5\n" - " strb r3, [r0]\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " cmp r1, #0x21\n" - " bls ._87 @cond_branch\n" - " add r0, r7, #0\n" - " bl GetTVChannelByShowType\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r1, r0, #0\n" - " cmp r0, #0x3\n" - " beq ._88 @cond_branch\n" - " cmp r0, #0x3\n" - " bgt ._89 @cond_branch\n" - " cmp r0, #0x2\n" - " beq ._90 @cond_branch\n" - " b ._95\n" - "._93:\n" - " .align 2, 0\n" - "._92:\n" - " .word gSaveBlock1\n" - " .word 0x2738\n" - " .word 0x2739\n" - " .word 0x273a\n" - "._89:\n" - " cmp r1, #0x4\n" - " bne ._95 @cond_branch\n" - "._90:\n" - " add r0, r4, r6\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._96\n" - " add r0, r0, r1\n" - " bl sub_80BE160\n" - " b ._95\n" - "._97:\n" - " .align 2, 0\n" - "._96:\n" - " .word gSaveBlock1+0x2738\n" - "._88:\n" - " add r0, r4, r6\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._100\n" - " add r0, r0, r1\n" - " bl sub_80BE138\n" - "._95:\n" - " sub r0, r7, #1\n" - " cmp r0, #0x28\n" - " bls ._98 @cond_branch\n" - " b ._173\n" - "._98:\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._100 + 4\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._101:\n" - " .align 2, 0\n" - "._100:\n" - " .word gSaveBlock1+0x2738\n" - " .word ._102\n" - "._102:\n" - " .word ._104\n" - " .word ._104\n" - " .word ._105\n" - " .word ._173\n" - " .word ._107\n" - " .word ._108\n" - " .word ._109\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._123\n" - " .word ._124\n" - " .word ._125\n" - " .word ._126\n" - " .word ._127\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._173\n" - " .word ._143\n" - "._104:\n" - " add r0, r4, r6\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._145\n" - " add r4, r0, r1\n" - " mov r2, #0x1\n" - " strh r2, [r4, #0x2]\n" - " add r1, r1, #0x10\n" - " add r0, r0, r1\n" - " ldr r1, ._145 + 4\n" - " bl StringCopy\n" - " mov r0, #0x5\n" - " strb r0, [r4, #0x18]\n" - " b ._173\n" - "._146:\n" - " .align 2, 0\n" - "._145:\n" - " .word gSaveBlock1+0x2738\n" - " .word gSaveBlock2\n" - "._105:\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r6, ._148\n" - " add r1, r4, r6\n" - " mov r8, r1\n" - " mov r0, #0x1\n" - " strh r0, [r1, #0x2]\n" - " add r0, r6, #5\n" - " add r0, r4, r0\n" - " ldr r1, ._148 + 4\n" - " bl StringCopy\n" - " mov r0, #0x64\n" - " mov r5, r9\n" - " mul r5, r5, r0\n" - " ldr r0, ._148 + 8\n" - " add r5, r5, r0\n" - " add r6, r6, #0x10\n" - " add r4, r4, r6\n" - " add r0, r5, #0\n" - " mov r1, #0x2\n" - " add r2, r4, #0\n" - " bl GetMonData\n" - " mov r0, #0x5\n" - " mov r1, r8\n" - " strb r0, [r1, #0xd]\n" - " add r0, r5, #0\n" - " mov r1, #0x3\n" - " bl GetMonData\n" - " mov r5, r8\n" - " strb r0, [r5, #0xe]\n" - " b ._173\n" - "._149:\n" - " .align 2, 0\n" - "._148:\n" - " .word gSaveBlock1+0x2738\n" - " .word gSaveBlock2\n" - " .word gPlayerParty\n" - "._107:\n" - " mov r0, #0x64\n" - " mov r1, r9\n" - " mul r1, r1, r0\n" - " mov r8, r1\n" - " ldr r0, ._151\n" - " add r8, r8, r0\n" - " mov r0, r8\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r5, ._151 + 4\n" - " add r6, r4, r5\n" - " strh r0, [r6, #0x2]\n" - " mov r0, #0x1\n" - " strh r0, [r6, #0x1c]\n" - " add r0, r5, #0\n" - " add r0, r0, #0xf\n" - " add r0, r4, r0\n" - " ldr r1, ._151 + 8\n" - " bl StringCopy\n" - " add r5, r5, #0x4\n" - " add r4, r4, r5\n" - " mov r0, r8\n" - " mov r1, #0x2\n" - " add r2, r4, #0\n" - " bl GetMonData\n" - " mov r0, #0x5\n" - " strb r0, [r6, #0x1e]\n" - " mov r0, r8\n" - " mov r1, #0x3\n" - " bl GetMonData\n" - " strb r0, [r6, #0x1f]\n" - " b ._173\n" - "._152:\n" - " .align 2, 0\n" - "._151:\n" - " .word gPlayerParty\n" - " .word gSaveBlock1+0x2738\n" - " .word gSaveBlock2\n" - "._108:\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r6, ._154\n" - " add r5, r4, r6\n" - " mov r8, r5\n" - " mov r0, #0x1\n" - " strh r0, [r5, #0x2]\n" - " add r0, r6, #0\n" - " add r0, r0, #0x16\n" - " add r0, r4, r0\n" - " ldr r1, ._154 + 4\n" - " bl StringCopy\n" - " mov r0, #0x64\n" - " mov r5, r9\n" - " mul r5, r5, r0\n" - " ldr r0, ._154 + 8\n" - " add r5, r5, r0\n" - " add r6, r6, #0x8\n" - " add r4, r4, r6\n" - " add r0, r5, #0\n" - " mov r1, #0x2\n" - " add r2, r4, #0\n" - " bl GetMonData\n" - " mov r0, #0x5\n" - " mov r1, r8\n" - " strb r0, [r1, #0x1e]\n" - " add r0, r5, #0\n" - " mov r1, #0x3\n" - " bl GetMonData\n" - " mov r5, r8\n" - " strb r0, [r5, #0x1f]\n" - " b ._173\n" - "._155:\n" - " .align 2, 0\n" - "._154:\n" - " .word gSaveBlock1+0x2738\n" - " .word gSaveBlock2\n" - " .word gPlayerParty\n" - "._109:\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r5, ._157\n" - " add r6, r4, r5\n" - " mov r0, #0x1\n" - " strh r0, [r6, #0xa]\n" - " strh r0, [r6, #0x14]\n" - " add r0, r5, #2\n" - " add r0, r4, r0\n" - " ldr r1, ._157 + 4\n" - " mov r8, r1\n" - " bl StringCopy\n" - " add r5, r5, #0xc\n" - " add r4, r4, r5\n" - " add r0, r4, #0\n" - " mov r1, r8\n" - " bl StringCopy\n" - " mov r0, #0x5\n" - " strb r0, [r6, #0x1d]\n" - " b ._173\n" - "._158:\n" - " .align 2, 0\n" - "._157:\n" - " .word gSaveBlock1+0x2738\n" - " .word gSaveBlock2\n" - "._143:\n" - " add r0, r4, r6\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._160\n" - " add r0, r0, r1\n" - " mov r1, #0x1\n" - " strh r1, [r0, #0xc]\n" - " strh r1, [r0, #0x16]\n" - " b ._173\n" - "._161:\n" - " .align 2, 0\n" - "._160:\n" - " .word gSaveBlock1+0x2738\n" - "._123:\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r0, ._163\n" - " add r4, r4, r0\n" - " ldr r1, ._163 + 4\n" - " mov r0, sp\n" - " mov r2, #0x8\n" - " bl memcpy\n" - " add r5, sp, #0x8\n" - " ldr r1, ._163 + 8\n" - " add r0, r5, #0\n" - " mov r2, #0xb\n" - " bl memcpy\n" - " mov r0, #0xff\n" - " strb r0, [r4, #0x12]\n" - " add r0, r4, #0\n" - " add r0, r0, #0x13\n" - " mov r1, sp\n" - " bl StringCopy\n" - " add r0, r4, #4\n" - " add r1, r5, #0\n" - " bl StringCopy\n" - " mov r0, #0xc\n" - " strb r0, [r4, #0xf]\n" - " mov r0, #0x28\n" - " strh r0, [r4, #0x10]\n" - " mov r0, #0x5\n" - " strb r0, [r4, #0x2]\n" - " strb r0, [r4, #0x3]\n" - " b ._173\n" - "._164:\n" - " .align 2, 0\n" - "._163:\n" - " .word gSaveBlock1+0x2738\n" - " .word gUnknown_Debug_083C4C64\n" - " .word gUnknown_Debug_083C4C6C\n" - "._124:\n" - " add r0, r4, r6\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._168\n" - " add r5, r0, r1\n" - " add r4, sp, #0x14\n" - " ldr r1, ._168 + 4\n" - " add r0, r4, #0\n" - " mov r2, #0x8\n" - " bl memcpy\n" - " add r1, r4, #0\n" - " mov r3, #0xfe\n" - " mov r2, #0x2\n" - " add r0, r5, #0\n" - " add r0, r0, #0x10\n" - "._165:\n" - " strh r3, [r0]\n" - " sub r0, r0, #0x2\n" - " sub r2, r2, #0x1\n" - " cmp r2, #0\n" - " bge ._165 @cond_branch\n" - " mov r0, #0x1\n" - " strb r0, [r5, #0x2]\n" - " mov r0, #0x28\n" - " strb r0, [r5, #0x12]\n" - " add r0, r5, #0\n" - " add r0, r0, #0x13\n" - " add r3, r5, #6\n" - " mov r6, #0x1e\n" - " add r2, r5, #0\n" - " add r2, r2, #0xa\n" - "._166:\n" - " strh r6, [r2]\n" - " sub r2, r2, #0x2\n" - " cmp r2, r3\n" - " bge ._166 @cond_branch\n" - " bl StringCopy\n" - " mov r0, #0x5\n" - " strb r0, [r5, #0x3]\n" - " b ._173\n" - "._169:\n" - " .align 2, 0\n" - "._168:\n" - " .word gSaveBlock1+0x2738\n" - " .word gUnknown_Debug_083C4C64\n" - "._125:\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r0, ._171\n" - " add r4, r4, r0\n" - " add r5, sp, #0x1c\n" - " ldr r1, ._171 + 4\n" - " add r0, r5, #0\n" - " mov r2, #0x8\n" - " bl memcpy\n" - " mov r0, #0x28\n" - " strh r0, [r4, #0xc]\n" - " strh r0, [r4, #0xe]\n" - " mov r0, #0x3\n" - " strb r0, [r4, #0x12]\n" - " mov r0, #0xff\n" - " strb r0, [r4, #0x10]\n" - " mov r0, #0x1\n" - " strb r0, [r4, #0x11]\n" - " add r0, r4, #0\n" - " add r0, r0, #0x13\n" - " add r1, r5, #0\n" - " bl StringCopy\n" - " mov r0, #0x5\n" - " strb r0, [r4, #0x2]\n" - " b ._173\n" - "._172:\n" - " .align 2, 0\n" - "._171:\n" - " .word gSaveBlock1+0x2738\n" - " .word gUnknown_Debug_083C4C64\n" - "._126:\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r0, ._174\n" - " add r4, r4, r0\n" - " add r5, sp, #0x24\n" - " ldr r1, ._174 + 4\n" - " add r0, r5, #0\n" - " mov r2, #0x8\n" - " bl memcpy\n" - " mov r0, #0xff\n" - " strb r0, [r4, #0x2]\n" - " mov r0, #0x0\n" - " strb r0, [r4, #0x3]\n" - " mov r0, #0x28\n" - " strh r0, [r4, #0x4]\n" - " add r0, r4, #0\n" - " add r0, r0, #0x13\n" - " add r1, r5, #0\n" - " bl StringCopy\n" - " mov r0, #0x5\n" - " strb r0, [r4, #0x6]\n" - " b ._173\n" - "._175:\n" - " .align 2, 0\n" - "._174:\n" - " .word gSaveBlock1+0x2738\n" - " .word gUnknown_Debug_083C4C64\n" - "._127:\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x2\n" - " ldr r0, ._176\n" - " add r4, r4, r0\n" - " add r5, sp, #0x2c\n" - " ldr r1, ._176 + 4\n" - " add r0, r5, #0\n" - " mov r2, #0x8\n" - " bl memcpy\n" - " ldr r0, ._176 + 8\n" - " strh r0, [r4, #0x2]\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " strh r0, [r4, #0x6]\n" - " mov r0, #0x28\n" - " strh r0, [r4, #0x4]\n" - " strh r0, [r4, #0x8]\n" - " mov r0, #0x3\n" - " strb r0, [r4, #0xa]\n" - " add r0, r4, #0\n" - " add r0, r0, #0x13\n" - " add r1, r5, #0\n" - " bl StringCopy\n" - " mov r0, #0x5\n" - " strb r0, [r4, #0xb]\n" - "._173:\n" - " add sp, sp, #0x34\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._177:\n" - " .align 2, 0\n" - "._176:\n" - " .word gSaveBlock1+0x2738\n" - " .word gUnknown_Debug_083C4C64\n" - " .word 0xffff\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808FEBC() -{ - asm( - " push {lr}\n" - " bl ClearTVShowData\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808FECC() -{ - asm( - " push {r4, lr}\n" - " ldr r1, ._178\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " ldr r0, ._178 + 4\n" - " bl sub_8071F40\n" - " mov r0, #0xd\n" - " mov r1, #0x6\n" - " mov r2, #0x17\n" - " mov r3, #0x8\n" - " bl Menu_BlankWindowRect\n" - " ldr r0, ._178 + 8\n" - " ldr r0, [r0]\n" - " mov r1, #0xe\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " mov r0, #0x16\n" - " mov r1, #0x1\n" - " mov r2, #0x18\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " ldr r4, ._178 + 12\n" - " add r0, r4, #0\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x17\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r1, ._178 + 16\n" - " ldr r0, ._178 + 20\n" - " str r0, [r1]\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._179:\n" - " .align 2, 0\n" - "._178:\n" - " .word gDebug_03000724\n" - " .word gUnknown_Debug_083C49CA\n" - " .word gUnknown_Debug_083C4B20+0x4\n" - " .word gStringVar1\n" - " .word gMenuCallback\n" - " .word debug_sub_808FF3C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808FF3C() -{ - asm( - " push {r4, lr}\n" - " mov r2, #0x0\n" - " ldr r0, ._192\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._180 @cond_branch\n" - " ldr r1, ._192 + 4\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x10\n" - " bne ._181 @cond_branch\n" - " strb r2, [r1]\n" - "._181:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._180:\n" - " ldr r0, ._192\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._182 @cond_branch\n" - " ldr r1, ._192 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._183 @cond_branch\n" - " mov r0, #0x10\n" - " strb r0, [r1]\n" - "._183:\n" - " ldrb r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._182:\n" - " ldr r0, ._192\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._184 @cond_branch\n" - " ldr r1, ._192 + 8\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x3\n" - " bne ._185 @cond_branch\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - "._185:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._184:\n" - " ldr r0, ._192\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._186 @cond_branch\n" - " ldr r1, ._192 + 8\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._187 @cond_branch\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - "._187:\n" - " ldrb r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r2, #0x1\n" - "._186:\n" - " cmp r2, #0\n" - " beq ._188 @cond_branch\n" - " mov r0, #0xd\n" - " mov r1, #0x6\n" - " mov r2, #0x17\n" - " mov r3, #0x8\n" - " bl Menu_BlankWindowRect\n" - " ldr r1, ._192 + 12\n" - " ldr r0, ._192 + 8\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0xe\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " mov r0, #0x16\n" - " mov r1, #0x1\n" - " mov r2, #0x18\n" - " mov r3, #0x2\n" - " bl Menu_BlankWindowRect\n" - " ldr r4, ._192 + 16\n" - " ldr r0, ._192 + 4\n" - " ldrb r1, [r0]\n" - " add r0, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x17\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - "._188:\n" - " ldr r4, ._192\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._189 @cond_branch\n" - " mov r0, #0x15\n" - " bl PlaySE\n" - " ldr r0, ._192 + 4\n" - " ldrb r0, [r0]\n" - " ldr r2, ._192 + 20\n" - " ldr r1, ._192 + 8\n" - " ldrb r1, [r1]\n" - " add r1, r1, r2\n" - " ldrb r1, [r1]\n" - " bl debug_sub_8090080\n" - "._189:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0xa\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._190 @cond_branch\n" - " mov r0, #0x0\n" - " b ._191\n" - "._193:\n" - " .align 2, 0\n" - "._192:\n" - " .word gMain\n" - " .word gDebug_03000725\n" - " .word gDebug_03000724\n" - " .word gUnknown_Debug_083C4B20+0x4\n" - " .word gStringVar1\n" - " .word gUnknown_Debug_083C4B20\n" - "._190:\n" - " bl sub_80BEC40\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._191:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090080() -{ - asm( - " lsl r0, r0, #0x18\n" - " ldr r2, ._194\n" - " lsr r0, r0, #0x16\n" - " add r0, r0, r2\n" - " ldr r3, ._194 + 4\n" - " add r2, r0, r3\n" - " strb r1, [r2]\n" - " ldr r1, ._194 + 8\n" - " add r2, r0, r1\n" - " mov r1, #0x1\n" - " strb r1, [r2]\n" - " add r3, r3, #0x2\n" - " add r0, r0, r3\n" - " mov r1, #0x4\n" - " strh r1, [r0]\n" - " bx lr\n" - "._195:\n" - " .align 2, 0\n" - "._194:\n" - " .word gSaveBlock1\n" - " .word 0x2abc\n" - " .word 0x2abd\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80900AC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " mov r7, #0x0\n" - " mov r5, #0x0\n" - " ldr r0, ._202\n" - " mov r8, r0\n" - "._198:\n" - " lsl r0, r5, #0x3\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x2\n" - " mov r1, r8\n" - " add r6, r0, r1\n" - " ldr r1, ._202 + 4\n" - " add r0, r6, r1\n" - " ldrb r4, [r0]\n" - " cmp r4, #0\n" - " bne ._196 @cond_branch\n" - " cmp r7, #0xc\n" - " bne ._197 @cond_branch\n" - " mov r7, #0x0\n" - "._197:\n" - " ldr r0, ._202 + 8\n" - " add r0, r7, r0\n" - " ldrb r1, [r0]\n" - " add r0, r5, #0\n" - " bl debug_sub_808FA88\n" - " ldr r1, ._202 + 12\n" - " add r0, r6, r1\n" - " strb r4, [r0]\n" - " add r0, r7, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._196:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x17\n" - " bls ._198 @cond_branch\n" - " mov r7, #0x0\n" - " mov r5, #0x0\n" - "._201:\n" - " ldr r0, ._202\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r0\n" - " ldr r0, ._202 + 16\n" - " add r1, r1, r0\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._199 @cond_branch\n" - " cmp r7, #0x3\n" - " bne ._200 @cond_branch\n" - " mov r7, #0x0\n" - "._200:\n" - " ldr r0, ._202 + 20\n" - " add r0, r7, r0\n" - " ldrb r1, [r0]\n" - " add r0, r5, #0\n" - " bl debug_sub_8090080\n" - " add r0, r7, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._199:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0xf\n" - " bls ._201 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._203:\n" - " .align 2, 0\n" - "._202:\n" - " .word gSaveBlock1\n" - " .word 0x2738\n" - " .word gUnknown_Debug_083C4ABD\n" - " .word 0x2739\n" - " .word 0x2abc\n" - " .word gUnknown_Debug_083C4B20\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_Fan() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xb\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._204\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xa\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._204 + 4\n" - " ldr r0, ._204 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._205:\n" - " .align 2, 0\n" - "._204:\n" - " .word gUnknown_Debug_083C4D28\n" - " .word gMenuCallback\n" - " .word debug_sub_80901A4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80901A4() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._206 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " beq ._207 @cond_branch\n" - " ldr r2, ._209\n" - " ldr r0, ._209 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - "._206:\n" - " mov r0, #0x0\n" - " b ._208\n" - "._210:\n" - " .align 2, 0\n" - "._209:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C4D28\n" - "._207:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._208:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80901E4() -{ - asm( - " push {lr}\n" - " bl ResetFanClub\n" - " bl sub_810FAA0\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80901F8() -{ - asm( - " push {lr}\n" - " bl sub_810FB9C\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._211\n" - " ldr r1, ._211 + 4\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " sub r0, r0, #0x8\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r2\n" - " ldr r0, [r0]\n" - " mov r1, #0xe\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r1, ._211 + 8\n" - " ldr r0, ._211 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._212:\n" - " .align 2, 0\n" - "._211:\n" - " .word gUnknown_Debug_083C4CA8\n" - " .word gUnknown_083F8408\n" - " .word gMenuCallback\n" - " .word debug_sub_8090278+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090238() -{ - asm( - " push {lr}\n" - " bl sub_810FC18\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._213\n" - " ldr r1, ._213 + 4\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " sub r0, r0, #0x8\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r2\n" - " ldr r0, [r0]\n" - " mov r1, #0xe\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r1, ._213 + 8\n" - " ldr r0, ._213 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._214:\n" - " .align 2, 0\n" - "._213:\n" - " .word gUnknown_Debug_083C4CA8\n" - " .word gUnknown_083F8410\n" - " .word gMenuCallback\n" - " .word debug_sub_8090278+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090278() -{ - asm( - " push {lr}\n" - " ldr r0, ._217\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._215 @cond_branch\n" - " mov r0, #0x0\n" - " b ._216\n" - "._218:\n" - " .align 2, 0\n" - "._217:\n" - " .word gMain\n" - "._215:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._216:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_809029C() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._219\n" - " ldr r0, ._219 + 4\n" - " ldr r1, ._219 + 8\n" - " add r0, r0, r1\n" - " ldrh r0, [r0]\n" - " mov r1, #0x7f\n" - " and r1, r1, r0\n" - " add r0, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x2\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x10\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " ldr r1, ._219 + 12\n" - " ldr r0, ._219 + 16\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._220:\n" - " .align 2, 0\n" - "._219:\n" - " .word gStringVar1\n" - " .word gSaveBlock1\n" - " .word 0x13c2\n" - " .word gMenuCallback\n" - " .word debug_sub_8090278+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80902E4() -{ - asm( - " push {lr}\n" - " ldr r1, ._221\n" - " ldrh r0, [r1, #0xe]\n" - " add r0, r0, #0x6\n" - " strh r0, [r1, #0xe]\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._222:\n" - " .align 2, 0\n" - "._221:\n" - " .word gSaveBlock2\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80902FC() -{ - asm( - " push {lr}\n" - " mov r0, #0x0\n" - " bl sub_810FB10\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090310() -{ - asm( - " push {lr}\n" - " mov r0, #0x1\n" - " bl sub_810FB10\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090324() -{ - asm( - " push {lr}\n" - " mov r0, #0x2\n" - " bl sub_810FB10\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090338() -{ - asm( - " push {lr}\n" - " mov r0, #0x3\n" - " bl sub_810FB10\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_BattleVSDad() -{ - asm( - " push {lr}\n" - " ldr r0, ._223\n" - " mov r1, #0x6\n" - " bl VarSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._224:\n" - " .align 2, 0\n" - "._223:\n" - " .word 0x4085\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_DadAfterBattle() -{ - asm( - " push {lr}\n" - " ldr r0, ._225\n" - " mov r1, #0x7\n" - " bl VarSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._226:\n" - " .align 2, 0\n" - "._225:\n" - " .word 0x4085\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_SootopolisCity() -{ - asm( - " push {lr}\n" - " mov r0, #0x81\n" - " bl FlagSet\n" - " mov r0, #0x71\n" - " bl FlagSet\n" - " ldr r0, ._227\n" - " bl FlagClear\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._228:\n" - " .align 2, 0\n" - "._227:\n" - " .word 0x32f\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_Embark() -{ - asm( - " push {lr}\n" - " ldr r0, ._229\n" - " bl FlagClear\n" - " ldr r0, ._229 + 4\n" - " mov r1, #0x1\n" - " bl VarSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._230:\n" - " .align 2, 0\n" - "._229:\n" - " .word 0x2e3\n" - " .word 0x4090\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_Yes9999() -{ - asm( - " push {lr}\n" - " ldr r0, ._231\n" - " ldr r1, ._231 + 4\n" - " bl VarSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._232:\n" - " .align 2, 0\n" - "._231:\n" - " .word 0x4048\n" - " .word 0x270f\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_LegendsFlagOn() -{ - asm( - " push {lr}\n" - " mov r0, #0xe4\n" - " bl FlagSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void NoharaDebugMenu_AddNumWinningStreaks() -{ - asm( - " push {lr}\n" - " ldr r0, ._235\n" - " ldr r1, ._235 + 4\n" - " add r2, r0, r1\n" - " ldrh r1, [r2]\n" - " cmp r1, #0x31\n" - " bhi ._233 @cond_branch\n" - " mov r0, #0x32\n" - " b ._244\n" - "._236:\n" - " .align 2, 0\n" - "._235:\n" - " .word gSaveBlock2\n" - " .word 0x572\n" - "._233:\n" - " cmp r1, #0x63\n" - " bhi ._237 @cond_branch\n" - " mov r0, #0x64\n" - " b ._244\n" - "._237:\n" - " ldr r0, ._241\n" - " cmp r1, r0\n" - " bhi ._239 @cond_branch\n" - " add r0, r0, #0x1\n" - " b ._244\n" - "._242:\n" - " .align 2, 0\n" - "._241:\n" - " .word 0x3e7\n" - "._239:\n" - " ldr r0, ._245\n" - " cmp r1, r0\n" - " bhi ._243 @cond_branch\n" - " ldr r0, ._245 + 4\n" - " b ._244\n" - "._246:\n" - " .align 2, 0\n" - "._245:\n" - " .word 0x1387\n" - " .word 0x2706\n" - "._243:\n" - " ldr r0, ._248\n" - " cmp r1, r0\n" - " bhi ._247 @cond_branch\n" - " add r0, r0, #0xa\n" - "._244:\n" - " strh r0, [r2]\n" - "._247:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._249:\n" - " .align 2, 0\n" - "._248:\n" - " .word 0x2705\n" - "\n" - ); -} +asm(".global gDebug_03000724"); +asm(".global gDebug_03000725"); +asm(".global gDebug_03000726"); #endif diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index d479c59c8..f7e0e3770 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -3,2120 +3,4 @@ EWRAM_DATA u8 unk_2030224[4] = { 0 }; -__attribute__((naked)) -void TayaDebugMenu_Trend() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xffffffd8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1e\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r5, ._3\n" - " mov r7, #0x0\n" - " mov r0, #0x1\n" - " add r0, r0, sp\n" - " mov sl, r0\n" - " mov r9, sp\n" - " mov r0, #0x0\n" - " mov r8, r0\n" - " add r6, sp, #0x20\n" - "._2:\n" - " ldrb r1, [r5, #0x1]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " mov r1, #0xa1\n" - " cmp r0, #0\n" - " beq ._1 @cond_branch\n" - " mov r1, #0xa2\n" - "._1:\n" - " mov r0, r9\n" - " strb r1, [r0]\n" - " ldrh r1, [r5, #0x4]\n" - " add r0, r6, #0\n" - " bl EasyChat_GetWordText\n" - " mov r0, sl\n" - " add r1, r6, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x7\n" - " bl StringCopyPadded\n" - " add r4, r0, #0\n" - " ldrh r1, [r5, #0x6]\n" - " add r0, r6, #0\n" - " bl EasyChat_GetWordText\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x8\n" - " bl StringCopyPadded\n" - " add r4, r0, #0\n" - " ldrb r1, [r5]\n" - " lsl r1, r1, #0x19\n" - " lsr r1, r1, #0x19\n" - " mov r2, #0x1\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " add r4, r0, #0\n" - " mov r0, r8\n" - " strb r0, [r4]\n" - " add r4, r4, #0x1\n" - " ldrh r1, [r5]\n" - " lsl r1, r1, #0x12\n" - " lsr r1, r1, #0x19\n" - " add r0, r4, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " add r4, r0, #0\n" - " mov r0, r8\n" - " strb r0, [r4]\n" - " add r4, r4, #0x1\n" - " ldrh r1, [r5, #0x2]\n" - " add r0, r4, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " lsl r2, r7, #0x1\n" - " add r2, r2, #0x1\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r0, sp\n" - " mov r1, #0x1\n" - " bl Menu_PrintText\n" - " add r5, r5, #0x8\n" - " add r0, r7, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r7, r0, #0x10\n" - " cmp r7, #0x4\n" - " bls ._2 @cond_branch\n" - " ldr r1, ._3 + 4\n" - " ldr r0, ._3 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x28\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._4:\n" - " .align 2, 0\n" - "._3:\n" - " .word gSaveBlock1+0x2dd4\n" - " .word gMenuCallback\n" - " .word debug_sub_8090808+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090808() -{ - asm( - " push {lr}\n" - " ldr r0, ._7\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x3\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._5 @cond_branch\n" - " mov r0, #0x0\n" - " b ._6\n" - "._8:\n" - " .align 2, 0\n" - "._7:\n" - " .word gMain\n" - "._5:\n" - " bl Menu_EraseScreen\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._6:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_TrendR() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r0, #0x0\n" - " ldr r7, ._11\n" - "._10:\n" - " mov r4, #0x0\n" - " lsl r5, r0, #0x3\n" - " add r6, r0, #1\n" - "._9:\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0x16\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl sub_80EB72C\n" - " lsl r1, r4, #0x1\n" - " add r1, r1, r5\n" - " add r1, r1, r7\n" - " strh r0, [r1]\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " cmp r4, #0x1\n" - " bls ._9 @cond_branch\n" - " lsl r0, r6, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0x4\n" - " bls ._10 @cond_branch\n" - " bl Menu_EraseScreen\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._12:\n" - " .align 2, 0\n" - "._11:\n" - " .word gSaveBlock1+0x2dd8\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090880() -{ - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._13 @cond_branch\n" - " mov r0, #0x0\n" - " b ._14\n" - "._13:\n" - " bl sub_80E60D8\n" - " mov r0, #0x1\n" - "._14:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_809089C() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._15 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._16 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._17\n" - "._16:\n" - " ldr r2, ._19\n" - " ldr r0, ._19 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " strh r0, [r2]\n" - " ldrh r0, [r2]\n" - " sub r0, r0, #0x5\n" - " cmp r0, #0x7\n" - " bhi ._27 @cond_branch\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._19 + 8\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._20:\n" - " .align 2, 0\n" - "._19:\n" - " .word gSpecialVar_0x8004\n" - " .word gUnknown_Debug_083C4EC0\n" - " .word ._21\n" - "._21:\n" - " .word ._29\n" - " .word ._27\n" - " .word ._29\n" - " .word ._29\n" - " .word ._27\n" - " .word ._27\n" - " .word ._29\n" - " .word ._29\n" - "._29:\n" - " ldr r0, ._30\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " ldr r0, ._30 + 4\n" - " strh r1, [r0]\n" - "._27:\n" - " mov r0, #0x1\n" - " mov r1, #0x0\n" - " bl FadeScreen\n" - " ldr r1, ._30 + 8\n" - " ldr r0, ._30 + 12\n" - " str r0, [r1]\n" - "._15:\n" - " mov r0, #0x0\n" - "._17:\n" - " pop {r1}\n" - " bx r1\n" - "._31:\n" - " .align 2, 0\n" - "._30:\n" - " .word gSpecialVar_0x8005\n" - " .word gSpecialVar_0x8006\n" - " .word gMenuCallback\n" - " .word debug_sub_8090880+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_SimpleText() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xc\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._32\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xb\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._32 + 4\n" - " ldr r0, ._32 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._33:\n" - " .align 2, 0\n" - "._32:\n" - " .word gUnknown_Debug_083C4EC0\n" - " .word gMenuCallback\n" - " .word debug_sub_809089C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090984() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " bl Menu_ProcessInput\n" - " lsl r2, r0, #0x18\n" - " asr r1, r2, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._34 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " beq ._46 @cond_branch\n" - " cmp r1, #0x4\n" - " bgt ._36 @cond_branch\n" - " lsr r0, r2, #0x18\n" - " bl debug_sub_810B32C\n" - " b ._46\n" - "._34:\n" - " mov r0, #0x0\n" - " b ._38\n" - "._36:\n" - " cmp r1, #0x5\n" - " bne ._39 @cond_branch\n" - " bl sub_80F7F30\n" - " b ._46\n" - "._39:\n" - " cmp r1, #0x6\n" - " bne ._41 @cond_branch\n" - " mov r4, #0x0\n" - " ldr r0, ._44\n" - " add r1, r0, #2\n" - " mov ip, r1\n" - " ldr r7, ._44 + 4\n" - " ldr r1, ._44 + 8\n" - " add r6, r0, r1\n" - " add r5, r0, #0\n" - " add r5, r5, #0xe\n" - "._42:\n" - " lsl r1, r4, #0x1\n" - " mov r0, ip\n" - " add r3, r1, r0\n" - " add r0, r1, r7\n" - " ldrh r2, [r0]\n" - " strh r2, [r3]\n" - " add r0, r1, r5\n" - " strh r2, [r0]\n" - " add r1, r6, r1\n" - " strh r2, [r1]\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " cmp r4, #0x2\n" - " bls ._42 @cond_branch\n" - " b ._46\n" - "._45:\n" - " .align 2, 0\n" - "._44:\n" - " .word gSaveBlock1+0x2d94\n" - " .word gUnknown_Debug_083C4F08\n" - " .word 0xfffffd94\n" - "._41:\n" - " cmp r1, #0x7\n" - " bne ._46 @cond_branch\n" - " mov r4, #0x0\n" - "._47:\n" - " lsl r0, r4, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl sub_80EB890\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " cmp r4, #0x20\n" - " bls ._47 @cond_branch\n" - "._46:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._38:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_OldMan() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xa\n" - " mov r3, #0x11\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._48\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x8\n" - " bl Menu_PrintItems\n" - " bl GetCurrentMauvilleOldMan\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " str r0, [sp]\n" - " mov r0, #0x9\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x8\n" - " bl InitMenu\n" - " ldr r1, ._48 + 4\n" - " ldr r0, ._48 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._49:\n" - " .align 2, 0\n" - "._48:\n" - " .word gUnknown_Debug_083C4F54\n" - " .word gMenuCallback\n" - " .word debug_sub_8090984+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_LanettesPC() -{ - asm( - " push {lr}\n" - " bl Menu_EraseScreen\n" - " bl ShowPokemonStorageSystem\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_TownFlags() -{ - asm( - " push {lr}\n" - " ldr r0, ._50\n" - " bl FlagSet\n" - " mov r0, #0x81\n" - " lsl r0, r0, #0x4\n" - " bl FlagSet\n" - " ldr r0, ._50 + 4\n" - " bl FlagSet\n" - " ldr r0, ._50 + 8\n" - " bl FlagSet\n" - " ldr r0, ._50 + 12\n" - " bl FlagSet\n" - " ldr r0, ._50 + 16\n" - " bl FlagSet\n" - " ldr r0, ._50 + 20\n" - " bl FlagSet\n" - " ldr r0, ._50 + 24\n" - " bl FlagSet\n" - " ldr r0, ._50 + 28\n" - " bl FlagSet\n" - " ldr r0, ._50 + 32\n" - " bl FlagSet\n" - " ldr r0, ._50 + 36\n" - " bl FlagSet\n" - " ldr r0, ._50 + 40\n" - " bl FlagSet\n" - " ldr r0, ._50 + 44\n" - " bl FlagSet\n" - " ldr r0, ._50 + 48\n" - " bl FlagSet\n" - " ldr r0, ._50 + 52\n" - " bl FlagSet\n" - " ldr r0, ._50 + 56\n" - " bl FlagSet\n" - " ldr r0, ._50 + 60\n" - " bl FlagSet\n" - " ldr r0, ._50 + 64\n" - " bl FlagSet\n" - " ldr r0, ._50 + 68\n" - " bl FlagSet\n" - " ldr r0, ._50 + 72\n" - " bl FlagSet\n" - " ldr r0, ._50 + 76\n" - " bl FlagSet\n" - " ldr r0, ._50 + 80\n" - " bl FlagSet\n" - " ldr r0, ._50 + 84\n" - " bl FlagSet\n" - " ldr r0, ._50 + 88\n" - " bl FlagSet\n" - " ldr r0, ._50 + 92\n" - " bl FlagSet\n" - " ldr r0, ._50 + 96\n" - " bl FlagSet\n" - " ldr r0, ._50 + 100\n" - " bl FlagSet\n" - " ldr r0, ._50 + 104\n" - " bl FlagSet\n" - " ldr r0, ._50 + 108\n" - " bl FlagSet\n" - " ldr r0, ._50 + 112\n" - " bl FlagSet\n" - " ldr r0, ._50 + 116\n" - " bl FlagSet\n" - " ldr r0, ._50 + 120\n" - " bl FlagSet\n" - " mov r0, #0x84\n" - " lsl r0, r0, #0x4\n" - " bl FlagSet\n" - " ldr r0, ._50 + 124\n" - " bl FlagSet\n" - " ldr r0, ._50 + 128\n" - " bl FlagSet\n" - " ldr r0, ._50 + 132\n" - " bl FlagSet\n" - " ldr r0, ._50 + 136\n" - " bl FlagSet\n" - " ldr r0, ._50 + 140\n" - " bl FlagSet\n" - " ldr r0, ._50 + 144\n" - " bl FlagSet\n" - " ldr r0, ._50 + 148\n" - " bl FlagSet\n" - " ldr r0, ._50 + 152\n" - " bl FlagSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._51:\n" - " .align 2, 0\n" - "._50:\n" - " .word 0x80f\n" - " .word 0x811\n" - " .word 0x812\n" - " .word 0x813\n" - " .word 0x814\n" - " .word 0x815\n" - " .word 0x816\n" - " .word 0x817\n" - " .word 0x818\n" - " .word 0x819\n" - " .word 0x81a\n" - " .word 0x81b\n" - " .word 0x81c\n" - " .word 0x81d\n" - " .word 0x81e\n" - " .word 0x848\n" - " .word 0x849\n" - " .word 0x84a\n" - " .word 0x854\n" - " .word 0x855\n" - " .word 0x856\n" - " .word 0x857\n" - " .word 0x858\n" - " .word 0x859\n" - " .word 0x85a\n" - " .word 0x85b\n" - " .word 0x85c\n" - " .word 0x83c\n" - " .word 0x83d\n" - " .word 0x83e\n" - " .word 0x83f\n" - " .word 0x841\n" - " .word 0x842\n" - " .word 0x843\n" - " .word 0x844\n" - " .word 0x845\n" - " .word 0x846\n" - " .word 0x847\n" - " .word 0x83b\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_AwardARibbon() -{ - asm( - " push {lr}\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x10\n" - " mov r2, #0x0\n" - " bl BlendPalettes\n" - " ldr r0, ._52\n" - " bl SetMainCallback2\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._53:\n" - " .align 2, 0\n" - "._52:\n" - " .word debug_sub_80915BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090C44() -{ - asm( - " push {r4, r5, lr}\n" - " ldr r4, ._54\n" - " sub r5, r4, #1\n" - " ldrh r1, [r5, #0x8]\n" - " add r0, r4, #0\n" - " mov r2, #0x2\n" - " mov r3, #0x5\n" - " bl ConvertIntToDecimalStringN\n" - " add r0, r4, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0x0\n" - " mov r2, #0x5\n" - " bl StringFill\n" - " ldrb r0, [r5]\n" - " add r0, r0, r4\n" - " mov r1, #0x79\n" - " strb r1, [r0]\n" - " add r0, r4, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._55:\n" - " .align 2, 0\n" - "._54:\n" - " .word gSharedMem+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8090C88() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " mov r8, r0\n" - " ldr r2, ._59\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " add r3, r2, #0\n" - " cmp r0, #0\n" - " beq ._57 @cond_branch\n" - " ldr r1, ._59 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._57 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " b ._62\n" - "._60:\n" - " .align 2, 0\n" - "._59:\n" - " .word gMain\n" - " .word gSharedMem\n" - "._67:\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " b ._62\n" - "._77:\n" - " strh r1, [r7, #0x8]\n" - " b ._62\n" - "._79:\n" - " ldr r0, ._64\n" - " ldrh r0, [r0, #0x8]\n" - " bl SetLotteryNumber16_Unused\n" - "._78:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._63\n" - "._65:\n" - " .align 2, 0\n" - "._64:\n" - " .word gSharedMem\n" - "._57:\n" - " ldrh r1, [r3, #0x2e]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._66 @cond_branch\n" - " ldr r1, ._81\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x3\n" - " bls ._67 @cond_branch\n" - "._66:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._68 @cond_branch\n" - " ldr r0, ._81\n" - " ldrh r1, [r0, #0x8]\n" - " str r1, [r0, #0xc]\n" - " ldr r1, ._81 + 4\n" - " strh r1, [r0, #0x10]\n" - " mov r4, #0x0\n" - " ldrb r1, [r0]\n" - " add r7, r0, #0\n" - " cmp r4, r1\n" - " bcs ._69 @cond_branch\n" - " add r5, r7, #0\n" - " add r6, r1, #0\n" - "._70:\n" - " ldrh r0, [r5, #0x10]\n" - " mov r1, #0xa\n" - " str r3, [sp]\n" - " bl __udivsi3\n" - " strh r0, [r5, #0x10]\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r3, [sp]\n" - " cmp r4, r6\n" - " bcc ._70 @cond_branch\n" - "._69:\n" - " ldrh r1, [r7, #0x10]\n" - " ldr r0, [r7, #0xc]\n" - " add r0, r0, r1\n" - " str r0, [r7, #0xc]\n" - " ldr r1, ._81 + 8\n" - " cmp r0, r1\n" - " ble ._71 @cond_branch\n" - " str r1, [r7, #0xc]\n" - "._71:\n" - " ldrh r0, [r7, #0x8]\n" - " ldr r1, [r7, #0xc]\n" - " cmp r0, r1\n" - " bne ._77 @cond_branch\n" - "._68:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._73 @cond_branch\n" - " ldr r0, ._81\n" - " ldrh r1, [r0, #0x8]\n" - " str r1, [r0, #0xc]\n" - " ldr r1, ._81 + 4\n" - " strh r1, [r0, #0x10]\n" - " mov r4, #0x0\n" - " ldrb r1, [r0]\n" - " add r7, r0, #0\n" - " cmp r4, r1\n" - " bcs ._74 @cond_branch\n" - " add r5, r7, #0\n" - " add r6, r1, #0\n" - "._75:\n" - " ldrh r0, [r5, #0x10]\n" - " mov r1, #0xa\n" - " str r3, [sp]\n" - " bl __udivsi3\n" - " strh r0, [r5, #0x10]\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r3, [sp]\n" - " cmp r4, r6\n" - " bcc ._75 @cond_branch\n" - "._74:\n" - " add r2, r7, #0\n" - " ldrh r1, [r2, #0x10]\n" - " ldr r0, [r2, #0xc]\n" - " sub r0, r0, r1\n" - " str r0, [r2, #0xc]\n" - " cmp r0, #0\n" - " bge ._76 @cond_branch\n" - " mov r0, #0x0\n" - " str r0, [r2, #0xc]\n" - "._76:\n" - " ldrh r0, [r2, #0x8]\n" - " ldr r1, [r2, #0xc]\n" - " cmp r0, r1\n" - " bne ._77 @cond_branch\n" - "._73:\n" - " ldrh r2, [r3, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " bne ._78 @cond_branch\n" - " mov r0, #0x1\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " bne ._79 @cond_branch\n" - " mov r0, #0x0\n" - " mov r8, r0\n" - "._62:\n" - " mov r0, r8\n" - " cmp r0, #0\n" - " beq ._80 @cond_branch\n" - " bl debug_sub_8090C44\n" - "._80:\n" - " mov r0, #0x0\n" - "._63:\n" - " add sp, sp, #0x4\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._82:\n" - " .align 2, 0\n" - "._81:\n" - " .word gSharedMem\n" - " .word 0x2710\n" - " .word 0xffff\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_PKMNLottery() -{ - asm( - " push {lr}\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x6\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " bl RetrieveLotteryNumber\n" - " ldr r2, ._83\n" - " ldr r0, ._83 + 4\n" - " ldrh r0, [r0]\n" - " mov r1, #0x0\n" - " strh r0, [r2, #0x8]\n" - " strb r1, [r2]\n" - " bl debug_sub_8090C44\n" - " ldr r1, ._83 + 8\n" - " ldr r0, ._83 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._84:\n" - " .align 2, 0\n" - "._83:\n" - " .word gSharedMem\n" - " .word gSpecialVar_Result\n" - " .word gMenuCallback\n" - " .word debug_sub_8090C88+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_Trainer() -{ - asm( - " push {r4, r5, lr}\n" - " mov r4, #0x0\n" - " ldr r5, ._86\n" - "._85:\n" - " lsl r0, r4, #0x4\n" - " add r0, r0, r5\n" - " ldrh r0, [r0]\n" - " bl SetTrainerFlag\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " cmp r4, #0x37\n" - " bls ._85 @cond_branch\n" - " ldr r0, ._86 + 4\n" - " bl SetTrainerFlag\n" - " mov r0, #0x85\n" - " lsl r0, r0, #0x1\n" - " bl SetTrainerFlag\n" - " ldr r0, ._86 + 8\n" - " bl SetTrainerFlag\n" - " mov r0, #0x86\n" - " lsl r0, r0, #0x1\n" - " bl SetTrainerFlag\n" - " ldr r0, ._86 + 12\n" - " bl SetTrainerFlag\n" - " mov r0, #0x87\n" - " lsl r0, r0, #0x1\n" - " bl SetTrainerFlag\n" - " ldr r0, ._86 + 16\n" - " bl SetTrainerFlag\n" - " mov r0, #0x88\n" - " lsl r0, r0, #0x1\n" - " bl SetTrainerFlag\n" - " ldr r0, ._86 + 20\n" - " bl SetTrainerFlag\n" - " mov r0, #0x83\n" - " lsl r0, r0, #0x1\n" - " bl SetTrainerFlag\n" - " ldr r0, ._86 + 24\n" - " bl SetTrainerFlag\n" - " mov r0, #0x84\n" - " lsl r0, r0, #0x1\n" - " bl SetTrainerFlag\n" - " ldr r0, ._86 + 28\n" - " bl SetTrainerFlag\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "._87:\n" - " .align 2, 0\n" - "._86:\n" - " .word gTrainerEyeTrainers\n" - " .word 0x109\n" - " .word 0x10b\n" - " .word 0x10d\n" - " .word 0x10f\n" - " .word 0x105\n" - " .word 0x107\n" - " .word 0x14f\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_PokenavD() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xffffffe4\n" - " bl Menu_DisplayDialogueFrame\n" - " mov r0, #0x0\n" - " mov sl, r0\n" - " mov r6, #0x1\n" - " mov r7, #0xff\n" - " mov r1, #0x3\n" - " mov r9, r1\n" - "._93:\n" - " ldr r4, ._94\n" - " add r0, r4, #0\n" - " ldr r1, ._94 + 4\n" - " bl StringCopy\n" - " mov r5, sl\n" - " add r5, r5, #0x1\n" - " add r1, r5, r4\n" - " mov r0, #0xff\n" - " strb r0, [r1]\n" - " add r0, r4, #0\n" - " mov r1, #0x2\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " mov r8, r0\n" - " str r5, [sp, #0x14]\n" - " mov r1, sl\n" - " lsl r1, r1, #0x2\n" - " str r1, [sp, #0x18]\n" - "._91:\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " add r0, r0, #0x1\n" - " str r0, [sp, #0x10]\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " add r0, r0, #0x1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0xc1\n" - " lsl r1, r1, #0x1\n" - " bl __umodsi3\n" - " add r0, r0, #0x1\n" - " lsl r0, r0, #0x10\n" - " lsr r3, r0, #0x10\n" - " cmp r3, #0xfb\n" - " bls ._89 @cond_branch\n" - " add r0, r3, #0\n" - " add r0, r0, #0x19\n" - " lsl r0, r0, #0x10\n" - " lsr r3, r0, #0x10\n" - " ldr r0, ._94 + 8\n" - " cmp r3, r0\n" - " bls ._89 @cond_branch\n" - " mov r3, #0x1\n" - "._89:\n" - " ldr r0, [sp, #0x18]\n" - " add r0, r0, sl\n" - " lsl r4, r0, #0x4\n" - " sub r4, r4, r0\n" - " lsl r4, r4, #0x5\n" - " mov r1, r8\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r8\n" - " lsl r0, r0, #0x4\n" - " ldr r1, ._94 + 12\n" - " add r0, r0, r1\n" - " add r4, r4, r0\n" - " lsl r2, r5, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " str r0, [sp, #0x4]\n" - " str r6, [sp, #0x8]\n" - " ldr r0, [sp, #0x10]\n" - " str r0, [sp, #0xc]\n" - " add r0, r4, #0\n" - " add r1, r3, #0\n" - " mov r3, #0x20\n" - " bl CreateBoxMon\n" - " bl Random\n" - " add r1, r7, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x16\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r7, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x17\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r7, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x18\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r7, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x21\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r7, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x2f\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r7, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x30\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " mov r1, r9\n" - " and r1, r1, r0\n" - " add r1, r1, #0x1\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x32\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " mov r1, r9\n" - " and r1, r1, r0\n" - " add r1, r1, #0x1\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x33\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " mov r1, r9\n" - " and r1, r1, r0\n" - " add r1, r1, #0x1\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x34\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " mov r1, r9\n" - " and r1, r1, r0\n" - " add r1, r1, #0x1\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x36\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " mov r1, r9\n" - " and r1, r1, r0\n" - " add r1, r1, #0x1\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x35\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x43\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x44\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x45\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x46\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x47\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x48\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x49\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x4a\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x4b\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x4c\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x4d\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " bl Random\n" - " add r1, r6, #0\n" - " and r1, r1, r0\n" - " str r1, [sp, #0x10]\n" - " add r0, r4, #0\n" - " mov r1, #0x4e\n" - " add r2, sp, #0x10\n" - " bl SetBoxMonData\n" - " mov r0, r8\n" - " add r0, r0, #0x1\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r8, r0\n" - " cmp r0, #0x1d\n" - " bhi ._90 @cond_branch\n" - " b ._91\n" - "._90:\n" - " ldr r1, [sp, #0x14]\n" - " lsl r0, r1, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov sl, r0\n" - " cmp r0, #0xd\n" - " bhi ._92 @cond_branch\n" - " b ._93\n" - "._92:\n" - " bl TayaDebugMenu_TownFlags\n" - " bl TayaDebugMenu_Trainer\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " add sp, sp, #0x1c\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._95:\n" - " .align 2, 0\n" - "._94:\n" - " .word gSharedMem\n" - " .word gUnknown_Debug_083C4F94\n" - " .word 0x19b\n" - " .word gPokemonStorage+0x4\n" - "\n" - ); -} - -__attribute__((naked)) -void TayaDebugMenu_8091190() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r3, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r3, r0\n" - " beq ._96 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r3, r0\n" - " beq ._97 @cond_branch\n" - " ldr r2, ._99\n" - " ldr r1, ._99 + 4\n" - " ldr r0, ._99 + 8\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x18\n" - " asr r0, r0, #0x18\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, [r0]\n" - " lsl r0, r3, #0x3\n" - " add r0, r0, r1\n" - " ldr r0, [r0, #0x4]\n" - " str r0, [r2]\n" - "._106:\n" - " mov r0, #0x0\n" - " b ._98\n" - "._100:\n" - " .align 2, 0\n" - "._99:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_83C5068\n" - " .word unk_2030224\n" - "._96:\n" - " ldr r3, ._107\n" - " ldrb r4, [r3]\n" - " ldr r2, ._107 + 4\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " add r5, r3, #0\n" - " cmp r0, #0\n" - " beq ._102 @cond_branch\n" - " sub r0, r4, #1\n" - " strb r0, [r5]\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bge ._102 @cond_branch\n" - " mov r0, #0x1\n" - " strb r0, [r5]\n" - "._102:\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._104 @cond_branch\n" - " ldrb r0, [r5]\n" - " add r0, r0, #0x1\n" - " strb r0, [r5]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bls ._104 @cond_branch\n" - " mov r0, #0x0\n" - " strb r0, [r5]\n" - "._104:\n" - " lsl r0, r4, #0x18\n" - " asr r0, r0, #0x18\n" - " mov r1, #0x0\n" - " ldrsb r1, [r5, r1]\n" - " cmp r0, r1\n" - " beq ._106 @cond_branch\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xb\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r4, ._107 + 8\n" - " mov r0, #0x0\n" - " ldrsb r0, [r5, r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r4\n" - " ldrb r2, [r0, #0x4]\n" - " ldr r3, [r0]\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " ldrsb r0, [r5, r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r4\n" - " ldrb r3, [r0, #0x4]\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xa\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl InitMenu\n" - " b ._106\n" - "._108:\n" - " .align 2, 0\n" - "._107:\n" - " .word unk_2030224\n" - " .word gMain\n" - " .word gUnknown_Debug_83C5068\n" - "._97:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._98:\n" - " add sp, sp, #0x8\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void InitTayaDebugWindow() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " ldr r1, ._109\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xb\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._109 + 4\n" - " ldr r3, [r0]\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xa\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._109 + 8\n" - " ldr r0, ._109 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._110:\n" - " .align 2, 0\n" - "._109:\n" - " .word unk_2030224\n" - " .word gUnknown_Debug_83C5068\n" - " .word gMenuCallback\n" - " .word TayaDebugMenu_8091190+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80912D8() -{ - asm( - " push {lr}\n" - " ldr r0, ._113\n" - " ldrb r1, [r0, #0x7]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._111 @cond_branch\n" - " mov r0, #0x0\n" - " b ._112\n" - "._114:\n" - " .align 2, 0\n" - "._113:\n" - " .word gPaletteFade\n" - "._111:\n" - " ldr r0, ._115\n" - " bl SetMainCallback2\n" - " mov r0, #0x1\n" - "._112:\n" - " pop {r1}\n" - " bx r1\n" - "._116:\n" - " .align 2, 0\n" - "._115:\n" - " .word debug_sub_8110F28+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8091300() -{ - asm( - " push {lr}\n" - " mov r0, #0x1\n" - " mov r1, #0x0\n" - " bl FadeScreen\n" - " ldr r1, ._117\n" - " ldr r0, ._117 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "._118:\n" - " .align 2, 0\n" - "._117:\n" - " .word gMenuCallback\n" - " .word debug_sub_80912D8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8091320() -{ - asm( - " push {lr}\n" - " bl LoadOam\n" - " bl ProcessSpriteCopyRequests\n" - " bl TransferPlttBuffer\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8091334() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " ldr r3, ._123\n" - " add r0, r3, #0\n" - " add r0, r0, #0x52\n" - " ldrb r4, [r0]\n" - " cmp r4, #0\n" - " beq ._119 @cond_branch\n" - " cmp r4, #0x1\n" - " bne ._120 @cond_branch\n" - " b ._121\n" - "._120:\n" - " b ._162\n" - "._124:\n" - " .align 2, 0\n" - "._123:\n" - " .word gSharedMem\n" - "._119:\n" - " add r5, r3, #0\n" - " add r5, r5, #0x55\n" - " strb r4, [r5]\n" - " ldr r2, ._131\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " mov r9, r2\n" - " cmp r0, #0\n" - " beq ._126 @cond_branch\n" - " add r1, r3, #0\n" - " add r1, r1, #0x54\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._126 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x1\n" - " strb r0, [r5]\n" - "._126:\n" - " mov r0, r9\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " ldr r5, ._131 + 4\n" - " cmp r0, #0\n" - " beq ._133 @cond_branch\n" - " add r0, r5, #0\n" - " add r0, r0, #0x53\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x2\n" - " beq ._128 @cond_branch\n" - " add r1, r5, #0\n" - " add r1, r1, #0x54\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x4\n" - " bhi ._133 @cond_branch\n" - " b ._130\n" - "._132:\n" - " .align 2, 0\n" - "._131:\n" - " .word gMain\n" - " .word gSharedMem\n" - "._128:\n" - " add r1, r5, #0\n" - " add r1, r1, #0x54\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x3\n" - " bhi ._133 @cond_branch\n" - "._130:\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " add r1, r1, #0x1\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - "._133:\n" - " mov r2, r9\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._135 @cond_branch\n" - " add r1, r5, #0\n" - " add r1, r1, #0x53\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._135 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " add r1, r1, #0x2\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - "._135:\n" - " mov r3, r9\n" - " ldrh r1, [r3, #0x2e]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._140 @cond_branch\n" - " add r0, r5, #0\n" - " add r0, r0, #0x54\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x5\n" - " beq ._137 @cond_branch\n" - " add r1, r5, #0\n" - " add r1, r1, #0x53\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x1\n" - " bhi ._140 @cond_branch\n" - " b ._139\n" - "._137:\n" - " add r1, r5, #0\n" - " add r1, r1, #0x53\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._140 @cond_branch\n" - "._139:\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " add r1, r1, #0x2\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - "._140:\n" - " add r0, r5, #0\n" - " add r0, r0, #0x55\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " bne ._141 @cond_branch\n" - " mov r0, r9\n" - " ldrh r2, [r0, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._142 @cond_branch\n" - " ldr r2, ._145\n" - " add r3, r5, #0\n" - " add r3, r3, #0x53\n" - " add r0, r5, #0\n" - " add r0, r0, #0x54\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x1\n" - " add r0, r0, r1\n" - " ldrb r3, [r3]\n" - " add r0, r0, r3\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r2\n" - " ldrh r0, [r0, #0x4]\n" - " sub r0, r0, #0x32\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0x4\n" - " bhi ._143 @cond_branch\n" - " add r1, r5, #0\n" - " add r1, r1, #0x56\n" - " mov r0, #0x4\n" - " b ._144\n" - "._146:\n" - " .align 2, 0\n" - "._145:\n" - " .word gUnknown_Debug_083C50EC\n" - "._143:\n" - " add r1, r5, #0\n" - " add r1, r1, #0x56\n" - " mov r0, #0x1\n" - "._144:\n" - " strb r0, [r1]\n" - " add r1, r5, #0\n" - " add r1, r1, #0x52\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " b ._162\n" - "._142:\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " bne ._148 @cond_branch\n" - " b ._162\n" - "._148:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x10\n" - " mov r2, #0x0\n" - " bl BlendPalettes\n" - " ldr r0, ._151\n" - " bl SetMainCallback2\n" - " b ._162\n" - "._152:\n" - " .align 2, 0\n" - "._151:\n" - " .word sub_80546F0+1\n" - "._121:\n" - " add r5, r3, #0\n" - " add r5, r5, #0x55\n" - " mov r0, #0x0\n" - " strb r0, [r5]\n" - " ldr r2, ._159\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " mov r9, r2\n" - " cmp r0, #0\n" - " beq ._154 @cond_branch\n" - " add r2, r3, #0\n" - " add r2, r2, #0x53\n" - " add r0, r3, #0\n" - " add r0, r0, #0x54\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x1\n" - " add r0, r0, r1\n" - " ldrb r2, [r2]\n" - " add r0, r0, r2\n" - " add r2, r0, r3\n" - " add r0, r3, #0\n" - " add r0, r0, #0x56\n" - " ldrb r1, [r2]\n" - " ldrb r0, [r0]\n" - " cmp r1, r0\n" - " bcs ._154 @cond_branch\n" - " add r0, r1, #1\n" - " strb r0, [r2]\n" - " strb r4, [r5]\n" - "._154:\n" - " mov r2, r9\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " ldr r5, ._159 + 4\n" - " cmp r0, #0\n" - " beq ._156 @cond_branch\n" - " add r2, r5, #0\n" - " add r2, r2, #0x53\n" - " add r0, r5, #0\n" - " add r0, r0, #0x54\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x1\n" - " add r0, r0, r1\n" - " ldrb r2, [r2]\n" - " add r0, r0, r2\n" - " add r1, r0, r5\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._156 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " add r1, r5, #0\n" - " add r1, r1, #0x55\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - "._156:\n" - " add r6, r5, #0\n" - " add r0, r6, #0\n" - " add r0, r0, #0x55\n" - " ldrb r7, [r0]\n" - " cmp r7, #0\n" - " beq ._157 @cond_branch\n" - "._141:\n" - " bl debug_sub_80916AC\n" - " b ._162\n" - "._160:\n" - " .align 2, 0\n" - "._159:\n" - " .word gMain\n" - " .word gSharedMem\n" - "._157:\n" - " mov r3, r9\n" - " ldrh r1, [r3, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._161 @cond_branch\n" - " ldr r0, ._164\n" - " ldr r1, ._164 + 4\n" - " mov ip, r1\n" - " mov r2, #0x53\n" - " add r2, r2, r6\n" - " mov r8, r2\n" - " add r4, r6, #0\n" - " add r4, r4, #0x54\n" - " ldrb r2, [r4]\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r2\n" - " mov r3, r8\n" - " ldrb r3, [r3]\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, ip\n" - " ldrh r1, [r1, #0x4]\n" - " bl GetMonData\n" - " ldrb r2, [r4]\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r2\n" - " mov r2, r8\n" - " ldrb r2, [r2]\n" - " add r1, r1, r2\n" - " add r1, r1, r6\n" - " strb r0, [r1]\n" - " bl debug_sub_80916AC\n" - " add r0, r6, #0\n" - " add r0, r0, #0x52\n" - " strb r7, [r0]\n" - "._161:\n" - " mov r3, r9\n" - " ldrh r1, [r3, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._162 @cond_branch\n" - " ldr r2, ._164 + 4\n" - " add r0, r6, #0\n" - " add r0, r0, #0x53\n" - " ldrb r4, [r0]\n" - " add r0, r0, #0x1\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x1\n" - " add r3, r0, r1\n" - " add r0, r3, r4\n" - " lsl r0, r0, #0x3\n" - " add r1, r0, r2\n" - " ldrh r0, [r1, #0x4]\n" - " cmp r0, #0\n" - " beq ._163 @cond_branch\n" - " ldr r0, ._164\n" - " ldrh r1, [r1, #0x4]\n" - " add r2, r4, r6\n" - " add r2, r3, r2\n" - " bl SetMonData\n" - "._163:\n" - " add r0, r5, #0\n" - " add r0, r0, #0x52\n" - " strb r7, [r0]\n" - "._162:\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._165:\n" - " .align 2, 0\n" - "._164:\n" - " .word gPlayerParty\n" - " .word gUnknown_Debug_083C50EC\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80915BC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " ldr r0, ._168\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " mov r1, #0x0\n" - " ldr r0, ._168 + 4\n" - " mov r8, r0\n" - " ldr r7, ._168 + 8\n" - "._171:\n" - " mov r4, #0x0\n" - " lsl r0, r1, #0x1\n" - " add r6, r1, #1\n" - " add r5, r0, r1\n" - "._170:\n" - " add r0, r5, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r8\n" - " ldrh r1, [r0, #0x4]\n" - " cmp r1, #0\n" - " beq ._166 @cond_branch\n" - " ldr r0, ._168 + 12\n" - " bl GetMonData\n" - " add r1, r4, r5\n" - " add r1, r1, r7\n" - " strb r0, [r1]\n" - " b ._167\n" - "._169:\n" - " .align 2, 0\n" - "._168:\n" - " .word 0x4000010\n" - " .word gUnknown_Debug_083C50EC\n" - " .word gSharedMem\n" - " .word gPlayerParty\n" - "._166:\n" - " add r0, r4, r5\n" - " add r0, r0, r7\n" - " strb r1, [r0]\n" - "._167:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x2\n" - " bls ._170 @cond_branch\n" - " lsl r0, r6, #0x18\n" - " lsr r1, r0, #0x18\n" - " cmp r1, #0x5\n" - " bls ._171 @cond_branch\n" - " ldr r4, ._172\n" - " add r0, r4, #0\n" - " bl Text_LoadWindowTemplate\n" - " add r0, r4, #0\n" - " bl InitMenuWindow\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x3\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._172 + 4\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " mov r1, #0x4\n" - " mov r2, #0x1d\n" - " mov r3, #0x11\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x0\n" - " mov r1, #0x12\n" - " mov r2, #0x1d\n" - " mov r3, #0x15\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x13\n" - " mov r2, #0x8a\n" - " lsl r2, r2, #0x5\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r2, ._172 + 8\n" - " add r0, r2, #0\n" - " add r0, r0, #0x53\n" - " mov r1, #0x0\n" - " strb r1, [r0]\n" - " add r0, r0, #0x1\n" - " strb r1, [r0]\n" - " sub r0, r0, #0x2\n" - " strb r1, [r0]\n" - " bl debug_sub_80916AC\n" - " ldr r0, ._172 + 12\n" - " bl SetVBlankCallback\n" - " ldr r0, ._172 + 16\n" - " bl SetMainCallback2\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._173:\n" - " .align 2, 0\n" - "._172:\n" - " .word gWindowTemplate_81E7224\n" - " .word gUnknown_Debug_083C517C\n" - " .word gSharedMem\n" - " .word debug_sub_8091320+1\n" - " .word debug_sub_8091334+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_80916AC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xfffffffc\n" - " mov r6, #0x0\n" - " ldr r0, ._177\n" - " mov sl, r0\n" - " mov r1, #0x0\n" - " mov r8, r1\n" - "._182:\n" - " ldr r2, ._177 + 4\n" - " mov r5, #0x0\n" - " lsl r0, r6, #0x1\n" - " mov r9, r0\n" - " add r1, r6, #1\n" - " str r1, [sp]\n" - "._181:\n" - " mov r0, sl\n" - " add r0, r0, #0x53\n" - " ldrb r0, [r0]\n" - " cmp r0, r5\n" - " bne ._175 @cond_branch\n" - " ldr r1, ._177 + 8\n" - " ldrb r0, [r1]\n" - " cmp r0, r6\n" - " bne ._175 @cond_branch\n" - " mov r0, #0xef\n" - " b ._176\n" - "._178:\n" - " .align 2, 0\n" - "._177:\n" - " .word gSharedMem\n" - " .word gSharedMem+0x12\n" - " .word gSharedMem+0x54\n" - "._175:\n" - " mov r0, r8\n" - " strb r0, [r2]\n" - " add r2, r2, #0x1\n" - "._176:\n" - " strb r0, [r2]\n" - " add r2, r2, #0x1\n" - " mov r1, r9\n" - " add r4, r1, r6\n" - " add r0, r4, r5\n" - " lsl r0, r0, #0x3\n" - " ldr r1, ._183\n" - " add r0, r0, r1\n" - " ldr r1, [r0]\n" - " add r0, r2, #0\n" - " bl StringCopy\n" - " add r2, r0, #0\n" - " mov r0, r8\n" - " strb r0, [r2]\n" - " add r2, r2, #0x1\n" - " ldr r7, ._183 + 4\n" - " add r4, r5, r4\n" - " add r4, r4, r7\n" - " ldrb r1, [r4]\n" - " add r0, r2, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " add r2, r0, #0\n" - " mov r1, r8\n" - " strb r1, [r2]\n" - " add r2, r2, #0x1\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x2\n" - " bhi ._179 @cond_branch\n" - " cmp r6, #0x5\n" - " bne ._181 @cond_branch\n" - " cmp r5, #0x2\n" - " bne ._181 @cond_branch\n" - "._179:\n" - " sub r1, r2, #1\n" - " mov r0, #0xff\n" - " strb r0, [r1]\n" - " mov r2, r9\n" - " add r2, r2, #0x5\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " add r0, r7, #0\n" - " add r0, r0, #0x12\n" - " mov r1, #0x1\n" - " bl Menu_PrintText\n" - " ldr r1, [sp]\n" - " lsl r0, r1, #0x18\n" - " lsr r6, r0, #0x18\n" - " cmp r6, #0x5\n" - " bls ._182 @cond_branch\n" - " add sp, sp, #0x4\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._184:\n" - " .align 2, 0\n" - "._183:\n" - " .word gUnknown_Debug_083C50EC\n" - " .word gSharedMem\n" - "\n" - ); -} - #endif diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c index 8451a104d..c3616797e 100644 --- a/src/debug/tomomichi_debug_menu.c +++ b/src/debug/tomomichi_debug_menu.c @@ -17,8639 +17,4 @@ BSS_DATA u8 gDebug_0300071F = 0; BSS_DATA u8 gDebug_03000720 = 0; BSS_DATA u8 gDebug_03000721 = 0; -__attribute__((naked)) -void InitTomomichiDebugWindow() -{ - asm( - " push {lr}\n" - " bl debug_sub_808B874\n" - " mov r0, #0x0\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808B868() -{ - asm( - " push {lr}\n" - " bl c2_exit_to_overworld_1_continue_scripts_restart_music\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808B874() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xd\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._1\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " ldr r0, ._1 + 4\n" - " ldrb r0, [r0]\n" - " str r0, [sp]\n" - " mov r0, #0xc\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._1 + 8\n" - " ldr r0, ._1 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._2:\n" - " .align 2, 0\n" - "._1:\n" - " .word gUnknown_Debug_083C0CBA\n" - " .word gDebug_0300071D\n" - " .word gMenuCallback\n" - " .word debug_sub_808B8C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808B8C8() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._7\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._3 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._7 + 4\n" - " strb r0, [r1]\n" - "._3:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._4 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._7 + 4\n" - " strb r0, [r1]\n" - "._4:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._5 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._7 + 8\n" - " ldr r0, ._7 + 4\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r1, r1, #0x4\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " b ._10\n" - "._8:\n" - " .align 2, 0\n" - "._7:\n" - " .word gMain\n" - " .word gDebug_0300071D\n" - " .word gUnknown_Debug_083C0CBA\n" - "._5:\n" - " mov r0, #0xa\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._9 @cond_branch\n" - " mov r0, #0x0\n" - " b ._10\n" - "._9:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._10:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_ContestGraphics() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x14\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._11\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r3, ._11 + 4\n" - " mov r0, #0x2\n" - " mov r1, #0x3\n" - " mov r2, #0x4\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x13\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x4\n" - " bl InitMenu\n" - " ldr r1, ._11 + 8\n" - " ldr r0, ._11 + 12\n" - " str r0, [r1]\n" - " ldr r0, ._11 + 16\n" - " mov r2, #0x1\n" - " strh r2, [r0]\n" - " ldr r1, ._11 + 20\n" - " ldr r0, ._11 + 24\n" - " str r0, [r1]\n" - " ldr r0, ._11 + 28\n" - " str r4, [r0]\n" - " ldr r0, ._11 + 32\n" - " strb r2, [r0]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._12:\n" - " .align 2, 0\n" - "._11:\n" - " .word gUnknown_Debug_083C0CF4\n" - " .word gUnknown_Debug_083C0D2C\n" - " .word gMenuCallback\n" - " .word debug_sub_808BC48+1\n" - " .word gDebug_03000700\n" - " .word gDebug_03000704\n" - " .word 0x6f33\n" - " .word gDebug_03000708\n" - " .word gDebug_0300070C\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_ArtMusGraphics() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x14\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._13\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r3, ._13 + 4\n" - " mov r0, #0x2\n" - " mov r1, #0x3\n" - " mov r2, #0x4\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x13\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x4\n" - " bl InitMenu\n" - " ldr r1, ._13 + 8\n" - " ldr r0, ._13 + 12\n" - " str r0, [r1]\n" - " ldr r0, ._13 + 16\n" - " mov r2, #0x1\n" - " strh r2, [r0]\n" - " ldr r1, ._13 + 20\n" - " ldr r0, ._13 + 24\n" - " str r0, [r1]\n" - " ldr r0, ._13 + 28\n" - " str r4, [r0]\n" - " ldr r0, ._13 + 32\n" - " strb r2, [r0]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._14:\n" - " .align 2, 0\n" - "._13:\n" - " .word gUnknown_Debug_083C0D4C\n" - " .word gUnknown_Debug_083C0D83\n" - " .word gMenuCallback\n" - " .word debug_sub_808BCBC+1\n" - " .word gDebug_03000700\n" - " .word gDebug_03000704\n" - " .word 0x6f33\n" - " .word gDebug_03000708\n" - " .word gDebug_0300070D\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_PreviewData() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x14\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._15\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r3, ._15 + 4\n" - " mov r0, #0x2\n" - " mov r1, #0x3\n" - " mov r2, #0x4\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x13\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x4\n" - " bl InitMenu\n" - " ldr r1, ._15 + 8\n" - " ldr r0, ._15 + 12\n" - " str r0, [r1]\n" - " ldr r0, ._15 + 16\n" - " mov r2, #0x1\n" - " strh r2, [r0]\n" - " ldr r1, ._15 + 20\n" - " ldr r0, ._15 + 24\n" - " str r0, [r1]\n" - " ldr r0, ._15 + 28\n" - " str r4, [r0]\n" - " ldr r0, ._15 + 32\n" - " strb r2, [r0]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._16:\n" - " .align 2, 0\n" - "._15:\n" - " .word gUnknown_Debug_083C0DA4\n" - " .word gUnknown_Debug_083C0DD4\n" - " .word gMenuCallback\n" - " .word debug_sub_808BD30+1\n" - " .word gDebug_03000700\n" - " .word gDebug_03000704\n" - " .word 0x6f33\n" - " .word gDebug_03000708\n" - " .word gDebug_0300070E\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_TrickHouse() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._17\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r3, ._17 + 4\n" - " mov r0, #0x2\n" - " mov r1, #0x3\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " ldr r0, ._17 + 8\n" - " ldrb r0, [r0]\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._17 + 12\n" - " ldr r0, ._17 + 16\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._18:\n" - " .align 2, 0\n" - "._17:\n" - " .word gUnknown_Debug_083C0DF4\n" - " .word gUnknown_Debug_083C0E15\n" - " .word gDebug_0300071E\n" - " .word gMenuCallback\n" - " .word debug_sub_808BDA4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_ControlEvents() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._19\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " ldr r0, ._19 + 4\n" - " ldrb r0, [r0]\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._19 + 8\n" - " ldr r0, ._19 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._20:\n" - " .align 2, 0\n" - "._19:\n" - " .word gUnknown_Debug_083C0E32\n" - " .word gDebug_0300071F\n" - " .word gMenuCallback\n" - " .word debug_sub_808BE2C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_ControlFlags() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._21\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " ldr r0, ._21 + 4\n" - " ldrb r0, [r0]\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._21 + 8\n" - " ldr r0, ._21 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._22:\n" - " .align 2, 0\n" - "._21:\n" - " .word gUnknown_Debug_083C0E7F\n" - " .word gDebug_03000720\n" - " .word gMenuCallback\n" - " .word debug_sub_808BEB4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_ControlWorks() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._23\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " ldr r0, ._23 + 4\n" - " ldrb r0, [r0]\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r1, ._23 + 8\n" - " ldr r0, ._23 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._24:\n" - " .align 2, 0\n" - "._23:\n" - " .word gUnknown_Debug_083C0EF1\n" - " .word gDebug_03000721\n" - " .word gMenuCallback\n" - " .word debug_sub_808BF3C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BC48() -{ - asm( - " push {r4, lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._25 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._26 @cond_branch\n" - " cmp r0, #0\n" - " beq ._27 @cond_branch\n" - " b ._32\n" - "._26:\n" - " cmp r0, #0x2\n" - " beq ._29 @cond_branch\n" - " b ._32\n" - "._27:\n" - " bl debug_sub_808ED0C\n" - " b ._32\n" - "._25:\n" - " bl debug_sub_808ED9C\n" - " b ._32\n" - "._29:\n" - " bl debug_sub_808EE3C\n" - "._32:\n" - " mov r0, #0x0\n" - " bl debug_sub_808EF8C\n" - " lsl r0, r4, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._36 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._34 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._35\n" - "._34:\n" - " cmp r1, #0x3\n" - " bne ._36 @cond_branch\n" - " ldr r0, ._37\n" - " ldr r1, ._37 + 4\n" - " ldr r1, [r1, #0x1c]\n" - " str r1, [r0]\n" - "._36:\n" - " mov r0, #0x0\n" - "._35:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._38:\n" - " .align 2, 0\n" - "._37:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C0D2C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BCBC() -{ - asm( - " push {r4, lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._39 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._40 @cond_branch\n" - " cmp r0, #0\n" - " beq ._41 @cond_branch\n" - " b ._46\n" - "._40:\n" - " cmp r0, #0x2\n" - " beq ._43 @cond_branch\n" - " b ._46\n" - "._41:\n" - " bl debug_sub_808ED0C\n" - " b ._46\n" - "._39:\n" - " bl debug_sub_808ED9C\n" - " b ._46\n" - "._43:\n" - " bl debug_sub_808EE9C\n" - "._46:\n" - " mov r0, #0x1\n" - " bl debug_sub_808EF8C\n" - " lsl r0, r4, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._50 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._48 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._49\n" - "._48:\n" - " cmp r1, #0x3\n" - " bne ._50 @cond_branch\n" - " ldr r0, ._51\n" - " ldr r1, ._51 + 4\n" - " ldr r1, [r1, #0x1c]\n" - " str r1, [r0]\n" - "._50:\n" - " mov r0, #0x0\n" - "._49:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._52:\n" - " .align 2, 0\n" - "._51:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C0D83\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BD30() -{ - asm( - " push {r4, lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._53 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._54 @cond_branch\n" - " cmp r0, #0\n" - " beq ._55 @cond_branch\n" - " b ._60\n" - "._54:\n" - " cmp r0, #0x2\n" - " beq ._57 @cond_branch\n" - " b ._60\n" - "._55:\n" - " bl debug_sub_808ED0C\n" - " b ._60\n" - "._53:\n" - " bl debug_sub_808ED9C\n" - " b ._60\n" - "._57:\n" - " bl debug_sub_808EF14\n" - "._60:\n" - " mov r0, #0x2\n" - " bl debug_sub_808EF8C\n" - " lsl r0, r4, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._64 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._62 @cond_branch\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._63\n" - "._62:\n" - " cmp r1, #0x3\n" - " bne ._64 @cond_branch\n" - " ldr r0, ._65\n" - " ldr r1, ._65 + 4\n" - " ldr r1, [r1, #0x1c]\n" - " str r1, [r0]\n" - "._64:\n" - " mov r0, #0x0\n" - "._63:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._66:\n" - " .align 2, 0\n" - "._65:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C0DD4\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BDA4() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._71\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._67 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._71 + 4\n" - " strb r0, [r1]\n" - "._67:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._68 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._71 + 4\n" - " strb r0, [r1]\n" - "._68:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._69 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._71 + 8\n" - " ldr r0, ._71 + 4\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r1, r1, #0x4\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " b ._74\n" - "._72:\n" - " .align 2, 0\n" - "._71:\n" - " .word gMain\n" - " .word gDebug_0300071E\n" - " .word gUnknown_Debug_083C0E15\n" - "._69:\n" - " mov r0, #0xa\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._73 @cond_branch\n" - " mov r0, #0x0\n" - " b ._74\n" - "._73:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._74:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BE2C() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._79\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._75 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._79 + 4\n" - " strb r0, [r1]\n" - "._75:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._76 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._79 + 4\n" - " strb r0, [r1]\n" - "._76:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._77 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._79 + 8\n" - " ldr r0, ._79 + 4\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r1, r1, #0x4\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " b ._82\n" - "._80:\n" - " .align 2, 0\n" - "._79:\n" - " .word gMain\n" - " .word gDebug_0300071F\n" - " .word gUnknown_Debug_083C0E32\n" - "._77:\n" - " mov r0, #0xa\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._81 @cond_branch\n" - " mov r0, #0x0\n" - " b ._82\n" - "._81:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._82:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BEB4() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._87\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._83 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._87 + 4\n" - " strb r0, [r1]\n" - "._83:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._84 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._87 + 4\n" - " strb r0, [r1]\n" - "._84:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._85 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._87 + 8\n" - " ldr r0, ._87 + 4\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r1, r1, #0x4\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " b ._90\n" - "._88:\n" - " .align 2, 0\n" - "._87:\n" - " .word gMain\n" - " .word gDebug_03000720\n" - " .word gUnknown_Debug_083C0E7F\n" - "._85:\n" - " mov r0, #0xa\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._89 @cond_branch\n" - " mov r0, #0x0\n" - " b ._90\n" - "._89:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._90:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BF3C() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._95\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._91 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._95 + 4\n" - " strb r0, [r1]\n" - "._91:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._92 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " bl Menu_MoveCursor\n" - " ldr r1, ._95 + 4\n" - " strb r0, [r1]\n" - "._92:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._93 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._95 + 8\n" - " ldr r0, ._95 + 4\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r1, r1, #0x4\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " b ._98\n" - "._96:\n" - " .align 2, 0\n" - "._95:\n" - " .word gMain\n" - " .word gDebug_03000721\n" - " .word gUnknown_Debug_083C0EF1\n" - "._93:\n" - " mov r0, #0xa\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._97 @cond_branch\n" - " mov r0, #0x0\n" - " b ._98\n" - "._97:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._98:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808BFC4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._99\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._99 + 4\n" - " ldr r0, ._99 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._100:\n" - " .align 2, 0\n" - "._99:\n" - " .word gUnknown_Debug_083C0F79\n" - " .word gMenuCallback\n" - " .word debug_sub_808C064+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C014() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._101\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r1, ._101 + 4\n" - " ldr r0, ._101 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._102:\n" - " .align 2, 0\n" - "._101:\n" - " .word gUnknown_Debug_083C0FFC\n" - " .word gMenuCallback\n" - " .word debug_sub_808C0A8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C064() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._103 @cond_branch\n" - " mov r0, #0x0\n" - " b ._106\n" - "._103:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._105 @cond_branch\n" - " ldr r2, ._107\n" - " ldr r0, ._107 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._106\n" - "._108:\n" - " .align 2, 0\n" - "._107:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C0F79\n" - "._105:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._106:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C0A8() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._109 @cond_branch\n" - " mov r0, #0x0\n" - " b ._112\n" - "._109:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._111 @cond_branch\n" - " ldr r2, ._113\n" - " ldr r0, ._113 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._112\n" - "._114:\n" - " .align 2, 0\n" - "._113:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C0FFC\n" - "._111:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._112:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C0EC() -{ - asm( - " push {lr}\n" - " ldr r0, ._115\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._116:\n" - " .align 2, 0\n" - "._115:\n" - " .word DebugScript_081C1CFE\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C104() -{ - asm( - " push {lr}\n" - " ldr r0, ._117\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._118:\n" - " .align 2, 0\n" - "._117:\n" - " .word DebugScript_081C1D07\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C11C() -{ - asm( - " push {lr}\n" - " ldr r0, ._119\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._120:\n" - " .align 2, 0\n" - "._119:\n" - " .word DebugScript_081C1D1E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C134() -{ - asm( - " push {lr}\n" - " ldr r0, ._121\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._122:\n" - " .align 2, 0\n" - "._121:\n" - " .word DebugScript_081C1D24\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C14C() -{ - asm( - " push {lr}\n" - " ldr r0, ._123\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._124:\n" - " .align 2, 0\n" - "._123:\n" - " .word DebugScript_081C1D2A\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C164() -{ - asm( - " push {lr}\n" - " ldr r0, ._125\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._126:\n" - " .align 2, 0\n" - "._125:\n" - " .word DebugScript_081C1D35\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C17C() -{ - asm( - " push {lr}\n" - " ldr r0, ._127\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._128:\n" - " .align 2, 0\n" - "._127:\n" - " .word DebugScript_081C1D46\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C194() -{ - asm( - " push {lr}\n" - " ldr r0, ._129\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._130:\n" - " .align 2, 0\n" - "._129:\n" - " .word DebugScript_081C221F\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C1AC() -{ - asm( - " push {lr}\n" - " ldr r0, ._131\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._132:\n" - " .align 2, 0\n" - "._131:\n" - " .word DebugScript_081C23E2\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C1C4() -{ - asm( - " push {lr}\n" - " ldr r0, ._133\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._134:\n" - " .align 2, 0\n" - "._133:\n" - " .word DebugScript_081C23E6\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C1DC() -{ - asm( - " push {lr}\n" - " ldr r0, ._135\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._136:\n" - " .align 2, 0\n" - "._135:\n" - " .word DebugScript_081C23F6\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C1F4() -{ - asm( - " push {lr}\n" - " ldr r0, ._137\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._138:\n" - " .align 2, 0\n" - "._137:\n" - " .word DebugScript_081C2482\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C20C() -{ - asm( - " push {lr}\n" - " ldr r0, ._139\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._140:\n" - " .align 2, 0\n" - "._139:\n" - " .word DebugScript_081C23FD\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C224() -{ - asm( - " push {lr}\n" - " ldr r0, ._141\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._142:\n" - " .align 2, 0\n" - "._141:\n" - " .word DebugScript_081C2518\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C23C() -{ - asm( - " push {lr}\n" - " ldr r0, ._143\n" - " bl ScriptContext1_SetupScript\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._144:\n" - " .align 2, 0\n" - "._143:\n" - " .word DebugScript_081C2507\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_ContestGraphics_Show() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._145\n" - " ldr r0, ._145 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._146:\n" - " .align 2, 0\n" - "._145:\n" - " .word gMenuCallback\n" - " .word debug_sub_808C280+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C280() -{ - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._147 @cond_branch\n" - " mov r0, #0x0\n" - " b ._148\n" - "._147:\n" - " bl CloseMenu\n" - " mov r0, #0x0\n" - " bl debug_sub_808F168\n" - " ldr r0, ._149\n" - " bl SetMainCallback2\n" - " ldr r1, ._149 + 4\n" - " ldr r0, ._149 + 8\n" - " str r0, [r1, #0x8]\n" - " mov r0, #0x1\n" - "._148:\n" - " pop {r1}\n" - " bx r1\n" - "._150:\n" - " .align 2, 0\n" - "._149:\n" - " .word CB2_ContestPainting+1\n" - " .word gMain\n" - " .word debug_sub_808B868+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_MuseumGraphics_Show() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._151\n" - " ldr r0, ._151 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._152:\n" - " .align 2, 0\n" - "._151:\n" - " .word gMenuCallback\n" - " .word debug_sub_808C2E4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C2E4() -{ - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._153 @cond_branch\n" - " mov r0, #0x0\n" - " b ._154\n" - "._153:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " bl debug_sub_808F168\n" - " ldr r0, ._155\n" - " bl SetMainCallback2\n" - " ldr r1, ._155 + 4\n" - " ldr r0, ._155 + 8\n" - " str r0, [r1, #0x8]\n" - " mov r0, #0x1\n" - "._154:\n" - " pop {r1}\n" - " bx r1\n" - "._156:\n" - " .align 2, 0\n" - "._155:\n" - " .word CB2_ContestPainting+1\n" - " .word gMain\n" - " .word debug_sub_808B868+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C31C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._157\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._157 + 4\n" - " ldr r0, ._157 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._158:\n" - " .align 2, 0\n" - "._157:\n" - " .word gUnknown_Debug_083C2828\n" - " .word gMenuCallback\n" - " .word debug_sub_808C36C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C36C() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._159 @cond_branch\n" - " mov r0, #0x0\n" - " b ._162\n" - "._159:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._161 @cond_branch\n" - " ldr r2, ._163\n" - " ldr r0, ._163 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._162\n" - "._164:\n" - " .align 2, 0\n" - "._163:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C2828\n" - "._161:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._162:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C3B0() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._165\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r0, ._165 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._165 + 8\n" - " ldr r0, ._165 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._166:\n" - " .align 2, 0\n" - "._165:\n" - " .word gUnknown_Debug_083C2938\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C408() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._167\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._167 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._167 + 8\n" - " ldr r0, ._167 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._168:\n" - " .align 2, 0\n" - "._167:\n" - " .word gUnknown_Debug_083C2A48\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C460() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._169\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._169 + 4\n" - " mov r0, #0x2\n" - " strb r0, [r1]\n" - " ldr r1, ._169 + 8\n" - " ldr r0, ._169 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._170:\n" - " .align 2, 0\n" - "._169:\n" - " .word gUnknown_Debug_083C2B4C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C4B8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._171\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._171 + 4\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - " ldr r1, ._171 + 8\n" - " ldr r0, ._171 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._172:\n" - " .align 2, 0\n" - "._171:\n" - " .word gUnknown_Debug_083C2C80\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C510() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._173\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._173 + 4\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r1, ._173 + 8\n" - " ldr r0, ._173 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._174:\n" - " .align 2, 0\n" - "._173:\n" - " .word gUnknown_Debug_083C2D8C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C568() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._175\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._175 + 4\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r1, ._175 + 8\n" - " ldr r0, ._175 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._176:\n" - " .align 2, 0\n" - "._175:\n" - " .word gUnknown_Debug_083C2EB0\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C5C0() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._177\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._177 + 4\n" - " mov r0, #0x6\n" - " strb r0, [r1]\n" - " ldr r1, ._177 + 8\n" - " ldr r0, ._177 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._178:\n" - " .align 2, 0\n" - "._177:\n" - " .word gUnknown_Debug_083C2FE0\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C618() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._179\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._179 + 4\n" - " mov r0, #0x7\n" - " strb r0, [r1]\n" - " ldr r1, ._179 + 8\n" - " ldr r0, ._179 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._180:\n" - " .align 2, 0\n" - "._179:\n" - " .word gUnknown_Debug_083C3100\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C670() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._181\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x3\n" - " bl InitMenu\n" - " ldr r1, ._181 + 4\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " ldr r1, ._181 + 8\n" - " ldr r0, ._181 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._182:\n" - " .align 2, 0\n" - "._181:\n" - " .word gUnknown_Debug_083C3194\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808C6C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C6C8() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._186\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808C714\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808C764\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._183 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._184 @cond_branch\n" - "._183:\n" - " mov r0, #0x0\n" - " b ._185\n" - "._187:\n" - " .align 2, 0\n" - "._186:\n" - " .word gDebug_0300070F\n" - "._184:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._185:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C714() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._191\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._190 @cond_branch\n" - " ldr r0, ._191 + 4\n" - " lsl r1, r2, #0x3\n" - " add r1, r1, r2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r0\n" - " ldrh r4, [r1]\n" - " add r0, r4, #0\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._189 @cond_branch\n" - " add r0, r4, #0\n" - " bl FlagSet\n" - " b ._190\n" - "._192:\n" - " .align 2, 0\n" - "._191:\n" - " .word gMain\n" - " .word gUnknown_Debug_83C31E6\n" - "._189:\n" - " add r0, r4, #0\n" - " bl FlagClear\n" - "._190:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C764() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._195\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._193 @cond_branch\n" - " ldr r0, ._195 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._194:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " neg r2, r0\n" - " orr r2, r2, r0\n" - " lsr r2, r2, #0x1f\n" - " mov r0, #0x1c\n" - " add r1, r4, #0\n" - " bl debug_sub_808F2E0\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._194 @cond_branch\n" - "._193:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._196:\n" - " .align 2, 0\n" - "._195:\n" - " .word gUnknown_Debug_083C31DC\n" - " .word gUnknown_Debug_83C31E6\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C7C8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._197\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._197 + 4\n" - " ldr r0, ._197 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._198:\n" - " .align 2, 0\n" - "._197:\n" - " .word gUnknown_Debug_083C1CE8\n" - " .word gMenuCallback\n" - " .word debug_sub_808C818+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C818() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._199 @cond_branch\n" - " mov r0, #0x0\n" - " b ._202\n" - "._199:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._201 @cond_branch\n" - " ldr r2, ._203\n" - " ldr r0, ._203 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._202\n" - "._204:\n" - " .align 2, 0\n" - "._203:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C1CE8\n" - "._201:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._202:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C85C() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._205\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r0, ._205 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._205 + 8\n" - " ldr r0, ._205 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._206:\n" - " .align 2, 0\n" - "._205:\n" - " .word gUnknown_Debug_083C1E0C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C8B4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._207\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._207 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._207 + 8\n" - " ldr r0, ._207 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._208:\n" - " .align 2, 0\n" - "._207:\n" - " .word gUnknown_Debug_083C1F38\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C90C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._209\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._209 + 4\n" - " mov r0, #0x2\n" - " strb r0, [r1]\n" - " ldr r1, ._209 + 8\n" - " ldr r0, ._209 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._210:\n" - " .align 2, 0\n" - "._209:\n" - " .word gUnknown_Debug_083C206C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C964() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._211\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._211 + 4\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - " ldr r1, ._211 + 8\n" - " ldr r0, ._211 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._212:\n" - " .align 2, 0\n" - "._211:\n" - " .word gUnknown_Debug_083C2190\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808C9BC() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._213\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r1, ._213 + 4\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r1, ._213 + 8\n" - " ldr r0, ._213 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._214:\n" - " .align 2, 0\n" - "._213:\n" - " .word gUnknown_Debug_083C2264\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CA14() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._215\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._215 + 4\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r1, ._215 + 8\n" - " ldr r0, ._215 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._216:\n" - " .align 2, 0\n" - "._215:\n" - " .word gUnknown_Debug_083C2370\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CA6C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._217\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._217 + 4\n" - " mov r0, #0x6\n" - " strb r0, [r1]\n" - " ldr r1, ._217 + 8\n" - " ldr r0, ._217 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._218:\n" - " .align 2, 0\n" - "._217:\n" - " .word gUnknown_Debug_083C248C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CAC4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._219\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._219 + 4\n" - " mov r0, #0x7\n" - " strb r0, [r1]\n" - " ldr r1, ._219 + 8\n" - " ldr r0, ._219 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._220:\n" - " .align 2, 0\n" - "._219:\n" - " .word gUnknown_Debug_083C259C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CB1C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._221\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._221 + 4\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " ldr r1, ._221 + 8\n" - " ldr r0, ._221 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._222:\n" - " .align 2, 0\n" - "._221:\n" - " .word gUnknown_Debug_083C26C8\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CB74+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CB74() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._226\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808CBC0\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808CC10\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._223 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._224 @cond_branch\n" - "._223:\n" - " mov r0, #0x0\n" - " b ._225\n" - "._227:\n" - " .align 2, 0\n" - "._226:\n" - " .word gDebug_0300070F\n" - "._224:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._225:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CBC0() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._231\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._230 @cond_branch\n" - " ldr r0, ._231 + 4\n" - " lsl r1, r2, #0x3\n" - " add r1, r1, r2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r0\n" - " ldrh r4, [r1]\n" - " add r0, r4, #0\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._229 @cond_branch\n" - " add r0, r4, #0\n" - " bl FlagSet\n" - " b ._230\n" - "._232:\n" - " .align 2, 0\n" - "._231:\n" - " .word gMain\n" - " .word gUnknown_Debug_083C271A\n" - "._229:\n" - " add r0, r4, #0\n" - " bl FlagClear\n" - "._230:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CC10() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._235\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._233 @cond_branch\n" - " ldr r0, ._235 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._234:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " neg r2, r0\n" - " orr r2, r2, r0\n" - " lsr r2, r2, #0x1f\n" - " mov r0, #0x1c\n" - " add r1, r4, #0\n" - " bl debug_sub_808F2E0\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._234 @cond_branch\n" - "._233:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._236:\n" - " .align 2, 0\n" - "._235:\n" - " .word gUnknown_Debug_083C2710\n" - " .word gUnknown_Debug_083C271A\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CC74() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._237\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x3\n" - " bl InitMenu\n" - " ldr r1, ._237 + 4\n" - " ldr r0, ._237 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._238:\n" - " .align 2, 0\n" - "._237:\n" - " .word gUnknown_Debug_083C1ADC\n" - " .word gMenuCallback\n" - " .word debug_sub_808CCC4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CCC4() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._239 @cond_branch\n" - " mov r0, #0x0\n" - " b ._242\n" - "._239:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._241 @cond_branch\n" - " ldr r2, ._243\n" - " ldr r0, ._243 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._242\n" - "._244:\n" - " .align 2, 0\n" - "._243:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C1ADC\n" - "._241:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._242:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CD08() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x11\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._245\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x8\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x8\n" - " bl InitMenu\n" - " ldr r0, ._245 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._245 + 8\n" - " ldr r0, ._245 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._246:\n" - " .align 2, 0\n" - "._245:\n" - " .word gUnknown_Debug_083C1B7C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CE10+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CD60() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._247\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x4\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x4\n" - " bl InitMenu\n" - " ldr r1, ._247 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._247 + 8\n" - " ldr r0, ._247 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._248:\n" - " .align 2, 0\n" - "._247:\n" - " .word gUnknown_Debug_083C1BF0\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CE10+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CDB8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x3\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._249\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl InitMenu\n" - " ldr r1, ._249 + 4\n" - " mov r0, #0x2\n" - " strb r0, [r1]\n" - " ldr r1, ._249 + 8\n" - " ldr r0, ._249 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._250:\n" - " .align 2, 0\n" - "._249:\n" - " .word gUnknown_Debug_083C1C2C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808CE10+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CE10() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._254\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808CE5C\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808CEAC\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._251 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._252 @cond_branch\n" - "._251:\n" - " mov r0, #0x0\n" - " b ._253\n" - "._255:\n" - " .align 2, 0\n" - "._254:\n" - " .word gDebug_0300070F\n" - "._252:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._253:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CE5C() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._259\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._258 @cond_branch\n" - " ldr r0, ._259 + 4\n" - " lsl r1, r2, #0x3\n" - " add r1, r1, r2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r0\n" - " ldrh r4, [r1]\n" - " add r0, r4, #0\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._257 @cond_branch\n" - " add r0, r4, #0\n" - " bl FlagSet\n" - " b ._258\n" - "._260:\n" - " .align 2, 0\n" - "._259:\n" - " .word gMain\n" - " .word gUnknown_Debug_083C1C38\n" - "._257:\n" - " add r0, r4, #0\n" - " bl FlagClear\n" - "._258:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CEAC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._263\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._261 @cond_branch\n" - " ldr r0, ._263 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._262:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " neg r2, r0\n" - " orr r2, r2, r0\n" - " lsr r2, r2, #0x1f\n" - " mov r0, #0x1c\n" - " add r1, r4, #0\n" - " bl debug_sub_808F2E0\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._262 @cond_branch\n" - "._261:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._264:\n" - " .align 2, 0\n" - "._263:\n" - " .word gUnknown_Debug_083C1C34\n" - " .word gUnknown_Debug_083C1C38\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CF10() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._265\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._265 + 4\n" - " ldr r0, ._265 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._266:\n" - " .align 2, 0\n" - "._265:\n" - " .word gUnknown_Debug_083C1330\n" - " .word gMenuCallback\n" - " .word debug_sub_808CF60+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CF60() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._267 @cond_branch\n" - " mov r0, #0x0\n" - " b ._270\n" - "._267:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._269 @cond_branch\n" - " ldr r2, ._271\n" - " ldr r0, ._271 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._270\n" - "._272:\n" - " .align 2, 0\n" - "._271:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C1330\n" - "._269:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._270:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CFA4() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x11\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._273\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x8\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x8\n" - " bl InitMenu\n" - " ldr r0, ._273 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._273 + 8\n" - " ldr r0, ._273 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._274:\n" - " .align 2, 0\n" - "._273:\n" - " .word gUnknown_Debug_083C13D8\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808CFFC() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._275\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._275 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._275 + 8\n" - " ldr r0, ._275 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._276:\n" - " .align 2, 0\n" - "._275:\n" - " .word gUnknown_Debug_083C1465\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D054() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._277\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._277 + 4\n" - " mov r0, #0x2\n" - " strb r0, [r1]\n" - " ldr r1, ._277 + 8\n" - " ldr r0, ._277 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._278:\n" - " .align 2, 0\n" - "._277:\n" - " .word gUnknown_Debug_083C1503\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D0AC() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._279\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x4\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x4\n" - " bl InitMenu\n" - " ldr r1, ._279 + 4\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - " ldr r1, ._279 + 8\n" - " ldr r0, ._279 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._280:\n" - " .align 2, 0\n" - "._279:\n" - " .word gUnknown_Debug_083C158A\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D104() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._281\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._281 + 4\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r1, ._281 + 8\n" - " ldr r0, ._281 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._282:\n" - " .align 2, 0\n" - "._281:\n" - " .word gUnknown_Debug_083C1647\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D15C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._283\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._283 + 4\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r1, ._283 + 8\n" - " ldr r0, ._283 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._284:\n" - " .align 2, 0\n" - "._283:\n" - " .word gUnknown_Debug_083C1712\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D1B4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._285\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._285 + 4\n" - " mov r0, #0x6\n" - " strb r0, [r1]\n" - " ldr r1, ._285 + 8\n" - " ldr r0, ._285 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._286:\n" - " .align 2, 0\n" - "._285:\n" - " .word gUnknown_Debug_083C17F8\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D20C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._287\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._287 + 4\n" - " mov r0, #0x7\n" - " strb r0, [r1]\n" - " ldr r1, ._287 + 8\n" - " ldr r0, ._287 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._288:\n" - " .align 2, 0\n" - "._287:\n" - " .word gUnknown_Debug_083C18B8\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D264() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._289\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x5\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl InitMenu\n" - " ldr r1, ._289 + 4\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " ldr r1, ._289 + 8\n" - " ldr r0, ._289 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._290:\n" - " .align 2, 0\n" - "._289:\n" - " .word gDebug_0x83C1974\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D2BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D2BC() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._294\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808D308\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808D358\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._291 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._292 @cond_branch\n" - "._291:\n" - " mov r0, #0x0\n" - " b ._293\n" - "._295:\n" - " .align 2, 0\n" - "._294:\n" - " .word gDebug_0300070F\n" - "._292:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._293:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D308() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._299\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._298 @cond_branch\n" - " ldr r0, ._299 + 4\n" - " lsl r1, r2, #0x3\n" - " add r1, r1, r2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r0\n" - " ldrh r4, [r1]\n" - " add r0, r4, #0\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._297 @cond_branch\n" - " add r0, r4, #0\n" - " bl FlagSet\n" - " b ._298\n" - "._300:\n" - " .align 2, 0\n" - "._299:\n" - " .word gMain\n" - " .word gUnknown_Debug_083C19C6\n" - "._297:\n" - " add r0, r4, #0\n" - " bl FlagClear\n" - "._298:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D358() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._303\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._301 @cond_branch\n" - " ldr r0, ._303 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._302:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " neg r2, r0\n" - " orr r2, r2, r0\n" - " lsr r2, r2, #0x1f\n" - " mov r0, #0x1c\n" - " add r1, r4, #0\n" - " bl debug_sub_808F2E0\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._302 @cond_branch\n" - "._301:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._304:\n" - " .align 2, 0\n" - "._303:\n" - " .word gUnknown_Debug_083C19BC\n" - " .word gUnknown_Debug_083C19C6\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D3BC() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._305\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._305 + 4\n" - " ldr r0, ._305 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._306:\n" - " .align 2, 0\n" - "._305:\n" - " .word gUnknown_Debug_083C105C\n" - " .word gMenuCallback\n" - " .word debug_sub_808D40C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D40C() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._307 @cond_branch\n" - " mov r0, #0x0\n" - " b ._310\n" - "._307:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._309 @cond_branch\n" - " ldr r2, ._311\n" - " ldr r0, ._311 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._310\n" - "._312:\n" - " .align 2, 0\n" - "._311:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C105C\n" - "._309:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._310:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D450() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._313\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r0, ._313 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._313 + 8\n" - " ldr r0, ._313 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._314:\n" - " .align 2, 0\n" - "._313:\n" - " .word gUnknown_Debug_083C10BD\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D500+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D4A8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._315\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._315 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._315 + 8\n" - " ldr r0, ._315 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._316:\n" - " .align 2, 0\n" - "._315:\n" - " .word gUnknown_Debug_083C1149\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D500+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D500() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._320\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808D54C\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808D59C\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._317 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._318 @cond_branch\n" - "._317:\n" - " mov r0, #0x0\n" - " b ._319\n" - "._321:\n" - " .align 2, 0\n" - "._320:\n" - " .word gDebug_0300070F\n" - "._318:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._319:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D54C() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._325\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._324 @cond_branch\n" - " ldr r0, ._325 + 4\n" - " lsl r1, r2, #0x3\n" - " add r1, r1, r2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r0\n" - " ldrh r4, [r1]\n" - " add r0, r4, #0\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._323 @cond_branch\n" - " add r0, r4, #0\n" - " bl FlagSet\n" - " b ._324\n" - "._326:\n" - " .align 2, 0\n" - "._325:\n" - " .word gMain\n" - " .word gUnknown_Debug_083C1196\n" - "._323:\n" - " add r0, r4, #0\n" - " bl FlagClear\n" - "._324:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D59C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._329\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._327 @cond_branch\n" - " ldr r0, ._329 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._328:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " neg r2, r0\n" - " orr r2, r2, r0\n" - " lsr r2, r2, #0x1f\n" - " mov r0, #0x1c\n" - " add r1, r4, #0\n" - " bl debug_sub_808F2E0\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._328 @cond_branch\n" - "._327:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._330:\n" - " .align 2, 0\n" - "._329:\n" - " .word gUnknown_Debug_083C1194\n" - " .word gUnknown_Debug_083C1196\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D600() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._331\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._331 + 4\n" - " ldr r0, ._331 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._332:\n" - " .align 2, 0\n" - "._331:\n" - " .word gUnknown_Debug_083C11CC\n" - " .word gMenuCallback\n" - " .word debug_sub_808D650+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D650() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._333 @cond_branch\n" - " mov r0, #0x0\n" - " b ._336\n" - "._333:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._335 @cond_branch\n" - " ldr r2, ._337\n" - " ldr r0, ._337 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._336\n" - "._338:\n" - " .align 2, 0\n" - "._337:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C11CC\n" - "._335:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._336:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D694() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._339\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r0, ._339 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._339 + 8\n" - " ldr r0, ._339 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._340:\n" - " .align 2, 0\n" - "._339:\n" - " .word gUnknown_Debug_083C1212\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D744+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D6EC() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._341\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._341 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._341 + 8\n" - " ldr r0, ._341 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._342:\n" - " .align 2, 0\n" - "._341:\n" - " .word gUnknown_Debug_083C1288\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D744+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D744() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._346\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808D790\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808D7E0\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._343 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._344 @cond_branch\n" - "._343:\n" - " mov r0, #0x0\n" - " b ._345\n" - "._347:\n" - " .align 2, 0\n" - "._346:\n" - " .word gDebug_0300070F\n" - "._344:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._345:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D790() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._351\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._350 @cond_branch\n" - " ldr r0, ._351 + 4\n" - " lsl r1, r2, #0x3\n" - " add r1, r1, r2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r0\n" - " ldrh r4, [r1]\n" - " add r0, r4, #0\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._349 @cond_branch\n" - " add r0, r4, #0\n" - " bl FlagSet\n" - " b ._350\n" - "._352:\n" - " .align 2, 0\n" - "._351:\n" - " .word gMain\n" - " .word gUnknown_Debug_083C12D2\n" - "._349:\n" - " add r0, r4, #0\n" - " bl FlagClear\n" - "._350:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D7E0() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._355\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._353 @cond_branch\n" - " ldr r0, ._355 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._354:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " neg r2, r0\n" - " orr r2, r2, r0\n" - " lsr r2, r2, #0x1f\n" - " mov r0, #0x1c\n" - " add r1, r4, #0\n" - " bl debug_sub_808F2E0\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._354 @cond_branch\n" - "._353:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._356:\n" - " .align 2, 0\n" - "._355:\n" - " .word gUnknown_Debug_083C12D0\n" - " .word gUnknown_Debug_083C12D2\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D844() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1c\n" - " mov r3, #0x3\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._357\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1b\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl InitMenu\n" - " ldr r1, ._357 + 4\n" - " ldr r0, ._357 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._358:\n" - " .align 2, 0\n" - "._357:\n" - " .word gUnknown_Debug_083C1A78\n" - " .word gMenuCallback\n" - " .word debug_sub_808D894+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D894() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r3, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r3, r0\n" - " bne ._359 @cond_branch\n" - " mov r0, #0x0\n" - " b ._362\n" - "._359:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r3, r0\n" - " beq ._361 @cond_branch\n" - " ldr r2, ._363\n" - " ldr r1, ._363 + 4\n" - " lsl r0, r3, #0x3\n" - " add r0, r0, r1\n" - " ldr r0, [r0, #0x4]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._362\n" - "._364:\n" - " .align 2, 0\n" - "._363:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C1A78\n" - "._361:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._362:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D8D8() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._365\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r0, ._365 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._365 + 8\n" - " ldr r0, ._365 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._366:\n" - " .align 2, 0\n" - "._365:\n" - " .word gUnknown_Debug_083C1A9C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808D930+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D930() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._370\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808D97C\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808D9CC\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._367 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._368 @cond_branch\n" - "._367:\n" - " mov r0, #0x0\n" - " b ._369\n" - "._371:\n" - " .align 2, 0\n" - "._370:\n" - " .word gDebug_0300070F\n" - "._368:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._369:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D97C() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._375\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._374 @cond_branch\n" - " ldr r0, ._375 + 4\n" - " lsl r1, r2, #0x3\n" - " add r1, r1, r2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r0\n" - " ldrh r4, [r1]\n" - " add r0, r4, #0\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._373 @cond_branch\n" - " add r0, r4, #0\n" - " bl FlagSet\n" - " b ._374\n" - "._376:\n" - " .align 2, 0\n" - "._375:\n" - " .word gMain\n" - " .word gUnknown_Debug_083C1AAE\n" - "._373:\n" - " add r0, r4, #0\n" - " bl FlagClear\n" - "._374:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808D9CC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._379\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._377 @cond_branch\n" - " ldr r0, ._379 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._378:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl FlagGet\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " neg r2, r0\n" - " orr r2, r2, r0\n" - " lsr r2, r2, #0x1f\n" - " mov r0, #0x1c\n" - " add r1, r4, #0\n" - " bl debug_sub_808F2E0\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._378 @cond_branch\n" - "._377:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._380:\n" - " .align 2, 0\n" - "._379:\n" - " .word gUnknown_Debug_083C1AAC\n" - " .word gUnknown_Debug_083C1AAE\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DA30() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x3\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._381\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl InitMenu\n" - " ldr r1, ._381 + 4\n" - " ldr r0, ._381 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._382:\n" - " .align 2, 0\n" - "._381:\n" - " .word gUnknown_Debug_083C103A\n" - " .word gMenuCallback\n" - " .word debug_sub_808DA80+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DA80() -{ - asm( - " push {r4, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " bl debug_sub_808DAD4\n" - " bl debug_sub_808DABC\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._383 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._384 @cond_branch\n" - "._383:\n" - " mov r0, #0x0\n" - " b ._385\n" - "._384:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._385:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DABC() -{ - asm( - " push {lr}\n" - " ldr r0, ._386\n" - " ldrh r2, [r0]\n" - " mov r0, #0x18\n" - " mov r1, #0x1\n" - " bl debug_sub_808F31C\n" - " pop {r0}\n" - " bx r0\n" - "._387:\n" - " .align 2, 0\n" - "._386:\n" - " .word gSpecialVar_Result\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DAD4() -{ - asm( - " push {lr}\n" - " ldr r0, ._390\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._388 @cond_branch\n" - " mov r2, #0x1\n" - " b ._389\n" - "._391:\n" - " .align 2, 0\n" - "._390:\n" - " .word gMain\n" - "._388:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._392 @cond_branch\n" - " ldr r2, ._393\n" - "._389:\n" - " ldr r1, ._393 + 4\n" - " ldrh r0, [r1]\n" - " add r0, r2, r0\n" - " strh r0, [r1]\n" - "._392:\n" - " pop {r0}\n" - " bx r0\n" - "._394:\n" - " .align 2, 0\n" - "._393:\n" - " .word 0xffff\n" - " .word gSpecialVar_Result\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DB0C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._395\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._395 + 4\n" - " ldr r0, ._395 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._396:\n" - " .align 2, 0\n" - "._395:\n" - " .word gUnknown_Debug_083C3D08\n" - " .word gMenuCallback\n" - " .word debug_sub_808DB5C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DB5C() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._397 @cond_branch\n" - " mov r0, #0x0\n" - " b ._400\n" - "._397:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._399 @cond_branch\n" - " ldr r2, ._401\n" - " ldr r0, ._401 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._400\n" - "._402:\n" - " .align 2, 0\n" - "._401:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C3D08\n" - "._399:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._400:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DBA0() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x11\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._403\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x8\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x8\n" - " bl InitMenu\n" - " ldr r0, ._403 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._403 + 8\n" - " ldr r0, ._403 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._404:\n" - " .align 2, 0\n" - "._403:\n" - " .word gUnknown_Debug_083C432C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DBF8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._405\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._405 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._405 + 8\n" - " ldr r0, ._405 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._406:\n" - " .align 2, 0\n" - "._405:\n" - " .word gUnknown_Debug_083C436C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DC50() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._407\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._407 + 4\n" - " mov r0, #0x2\n" - " strb r0, [r1]\n" - " ldr r1, ._407 + 8\n" - " ldr r0, ._407 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._408:\n" - " .align 2, 0\n" - "._407:\n" - " .word gUnknown_Debug_083C43B4\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DCA8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._409\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._409 + 4\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - " ldr r1, ._409 + 8\n" - " ldr r0, ._409 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._410:\n" - " .align 2, 0\n" - "._409:\n" - " .word gUnknown_Debug_083C43FC\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DD00() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._411\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._411 + 4\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r1, ._411 + 8\n" - " ldr r0, ._411 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._412:\n" - " .align 2, 0\n" - "._411:\n" - " .word gUnknown_Debug_083C4444\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DD58() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._413\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._413 + 4\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r1, ._413 + 8\n" - " ldr r0, ._413 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._414:\n" - " .align 2, 0\n" - "._413:\n" - " .word gUnknown_Debug_083C448C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DDB0() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._415\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r1, ._415 + 4\n" - " mov r0, #0x6\n" - " strb r0, [r1]\n" - " ldr r1, ._415 + 8\n" - " ldr r0, ._415 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._416:\n" - " .align 2, 0\n" - "._415:\n" - " .word gUnknown_Debug_83C44C4\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DE08() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._417\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._417 + 4\n" - " mov r0, #0x7\n" - " strb r0, [r1]\n" - " ldr r1, ._417 + 8\n" - " ldr r0, ._417 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._418:\n" - " .align 2, 0\n" - "._417:\n" - " .word gUnknown_Debug_83C44EC\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DE60() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._419\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._419 + 4\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " ldr r1, ._419 + 8\n" - " ldr r0, ._419 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._420:\n" - " .align 2, 0\n" - "._419:\n" - " .word gUnknown_Debug_083C4534\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808DEB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DEB8() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._424\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808DF64\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808DF04\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._421 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._422 @cond_branch\n" - "._421:\n" - " mov r0, #0x0\n" - " b ._423\n" - "._425:\n" - " .align 2, 0\n" - "._424:\n" - " .word gDebug_0300070F\n" - "._422:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._423:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DF04() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._428\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._426 @cond_branch\n" - " ldr r0, ._428 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._427:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl VarGet\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x10\n" - " lsr r2, r2, #0x10\n" - " mov r0, #0x18\n" - " add r1, r4, #0\n" - " bl debug_sub_808F31C\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._427 @cond_branch\n" - "._426:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._429:\n" - " .align 2, 0\n" - "._428:\n" - " .word gUnknown_Debug_083C457C\n" - " .word gUnknown_Debug_083C4586\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DF64() -{ - asm( - " push {r4, r5, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._432\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._430 @cond_branch\n" - " mov r5, #0x1\n" - " b ._431\n" - "._433:\n" - " .align 2, 0\n" - "._432:\n" - " .word gMain\n" - "._430:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._434 @cond_branch\n" - " ldr r5, ._435\n" - "._431:\n" - " ldr r1, ._435 + 4\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " add r0, r0, r3\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r1\n" - " ldrh r4, [r0]\n" - " add r0, r4, #0\n" - " bl VarGet\n" - " add r1, r0, #0\n" - " add r1, r5, r1\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " bl VarSet\n" - "._434:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._436:\n" - " .align 2, 0\n" - "._435:\n" - " .word 0xffff\n" - " .word gUnknown_Debug_083C4586\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808DFC0() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._437\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r1, ._437 + 4\n" - " ldr r0, ._437 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._438:\n" - " .align 2, 0\n" - "._437:\n" - " .word gUnknown_Debug_083C377C\n" - " .word gMenuCallback\n" - " .word debug_sub_808E010+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E010() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._439 @cond_branch\n" - " mov r0, #0x0\n" - " b ._442\n" - "._439:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._441 @cond_branch\n" - " ldr r2, ._443\n" - " ldr r0, ._443 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._442\n" - "._444:\n" - " .align 2, 0\n" - "._443:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C377C\n" - "._441:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._442:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E054() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._445\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r0, ._445 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._445 + 8\n" - " ldr r0, ._445 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._446:\n" - " .align 2, 0\n" - "._445:\n" - " .word gUnknown_Debug_083C3AA0\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E264+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E0AC() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._447\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x5\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl InitMenu\n" - " ldr r1, ._447 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._447 + 8\n" - " ldr r0, ._447 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._448:\n" - " .align 2, 0\n" - "._447:\n" - " .word gUnknown_Debug_83C3AE0\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E264+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E104() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._449\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._449 + 4\n" - " mov r0, #0x2\n" - " strb r0, [r1]\n" - " ldr r1, ._449 + 8\n" - " ldr r0, ._449 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._450:\n" - " .align 2, 0\n" - "._449:\n" - " .word gUnknown_Debug_83C3B28\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E264+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E15C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._451\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._451 + 4\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - " ldr r1, ._451 + 8\n" - " ldr r0, ._451 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._452:\n" - " .align 2, 0\n" - "._451:\n" - " .word gUnknown_Debug_83C3B70\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E264+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E1B4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._453\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._453 + 4\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r1, ._453 + 8\n" - " ldr r0, ._453 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._454:\n" - " .align 2, 0\n" - "._453:\n" - " .word gUnknown_Debug_83C3BB8\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E264+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E20C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._455\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r1, ._455 + 4\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r1, ._455 + 8\n" - " ldr r0, ._455 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._456:\n" - " .align 2, 0\n" - "._455:\n" - " .word gUnknown_Debug_83C3C00\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E264+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E264() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._460\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808E310\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808E2B0\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._457 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._458 @cond_branch\n" - "._457:\n" - " mov r0, #0x0\n" - " b ._459\n" - "._461:\n" - " .align 2, 0\n" - "._460:\n" - " .word gDebug_0300070F\n" - "._458:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._459:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E2B0() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._464\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._462 @cond_branch\n" - " ldr r0, ._464 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._463:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl VarGet\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x10\n" - " lsr r2, r2, #0x10\n" - " mov r0, #0x18\n" - " add r1, r4, #0\n" - " bl debug_sub_808F31C\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._463 @cond_branch\n" - "._462:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._465:\n" - " .align 2, 0\n" - "._464:\n" - " .word gUnknown_Debug_083C3C48\n" - " .word gUnknown_Debug_83C3C4E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E310() -{ - asm( - " push {r4, r5, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._468\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._466 @cond_branch\n" - " mov r5, #0x1\n" - " b ._467\n" - "._469:\n" - " .align 2, 0\n" - "._468:\n" - " .word gMain\n" - "._466:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._470 @cond_branch\n" - " ldr r5, ._471\n" - "._467:\n" - " ldr r1, ._471 + 4\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " add r0, r0, r3\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r1\n" - " ldrh r4, [r0]\n" - " add r0, r4, #0\n" - " bl VarGet\n" - " add r1, r0, #0\n" - " add r1, r5, r1\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " bl VarSet\n" - "._470:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._472:\n" - " .align 2, 0\n" - "._471:\n" - " .word 0xffff\n" - " .word gUnknown_Debug_83C3C4E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E36C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._473\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x5\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl InitMenu\n" - " ldr r1, ._473 + 4\n" - " ldr r0, ._473 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._474:\n" - " .align 2, 0\n" - "._473:\n" - " .word gUnknown_Debug_083C32AC\n" - " .word gMenuCallback\n" - " .word debug_sub_808E3BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E3BC() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._475 @cond_branch\n" - " mov r0, #0x0\n" - " b ._478\n" - "._475:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._477 @cond_branch\n" - " ldr r2, ._479\n" - " ldr r0, ._479 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._478\n" - "._480:\n" - " .align 2, 0\n" - "._479:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C32AC\n" - "._477:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._478:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E400() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._481\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x3\n" - " bl InitMenu\n" - " ldr r0, ._481 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._481 + 8\n" - " ldr r0, ._481 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._482:\n" - " .align 2, 0\n" - "._481:\n" - " .word gUnknown_Debug_083C347C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E5B8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E458() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._483\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._483 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._483 + 8\n" - " ldr r0, ._483 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._484:\n" - " .align 2, 0\n" - "._483:\n" - " .word gUnknown_Debug_083C3494\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E5B8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E4B0() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._485\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x6\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x6\n" - " bl InitMenu\n" - " ldr r1, ._485 + 4\n" - " mov r0, #0x2\n" - " strb r0, [r1]\n" - " ldr r1, ._485 + 8\n" - " ldr r0, ._485 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._486:\n" - " .align 2, 0\n" - "._485:\n" - " .word gUnknown_Debug_083C34A4\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E5B8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E508() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._487\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r1, ._487 + 4\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - " ldr r1, ._487 + 8\n" - " ldr r0, ._487 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._488:\n" - " .align 2, 0\n" - "._487:\n" - " .word gUnknown_Debug_083C34D4\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E5B8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E560() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._489\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x5\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x5\n" - " bl InitMenu\n" - " ldr r1, ._489 + 4\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r1, ._489 + 8\n" - " ldr r0, ._489 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._490:\n" - " .align 2, 0\n" - "._489:\n" - " .word gUnknown_Debug_083C351C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E5B8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E5B8() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._494\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808E604\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808E660\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._491 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._492 @cond_branch\n" - "._491:\n" - " mov r0, #0x0\n" - " b ._493\n" - "._495:\n" - " .align 2, 0\n" - "._494:\n" - " .word gDebug_0300070F\n" - "._492:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._493:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E604() -{ - asm( - " push {r4, r5, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._498\n" - " ldrh r1, [r0, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._496 @cond_branch\n" - " mov r5, #0x1\n" - " b ._497\n" - "._499:\n" - " .align 2, 0\n" - "._498:\n" - " .word gMain\n" - "._496:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._500 @cond_branch\n" - " ldr r5, ._501\n" - "._497:\n" - " ldr r1, ._501 + 4\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " add r0, r0, r3\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r1\n" - " ldrh r4, [r0]\n" - " add r0, r4, #0\n" - " bl VarGet\n" - " add r1, r0, #0\n" - " add r1, r5, r1\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " bl VarSet\n" - "._500:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._502:\n" - " .align 2, 0\n" - "._501:\n" - " .word 0xffff\n" - " .word gUnknown_Debug_083C354A\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E660() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._505\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._503 @cond_branch\n" - " ldr r0, ._505 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._504:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl VarGet\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x10\n" - " lsr r2, r2, #0x10\n" - " mov r0, #0x18\n" - " add r1, r4, #0\n" - " bl debug_sub_808F31C\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._504 @cond_branch\n" - "._503:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._506:\n" - " .align 2, 0\n" - "._505:\n" - " .word gUnknown_Debug_083C3544\n" - " .word gUnknown_Debug_083C354A\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E6C0() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._507\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._507 + 4\n" - " ldr r0, ._507 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._508:\n" - " .align 2, 0\n" - "._507:\n" - " .word gUnknown_Debug_083C4644\n" - " .word gMenuCallback\n" - " .word debug_sub_808E710+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E710() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._509 @cond_branch\n" - " mov r0, #0x0\n" - " b ._512\n" - "._509:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._511 @cond_branch\n" - " ldr r2, ._513\n" - " ldr r0, ._513 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._512\n" - "._514:\n" - " .align 2, 0\n" - "._513:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C4644\n" - "._511:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._512:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E754() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._515\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r0, ._515 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._515 + 8\n" - " ldr r0, ._515 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._516:\n" - " .align 2, 0\n" - "._515:\n" - " .word gUnknown_Debug_083C470C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E804+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E7AC() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._517\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._517 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._517 + 8\n" - " ldr r0, ._517 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._518:\n" - " .align 2, 0\n" - "._517:\n" - " .word gUnknown_Debug_083C4754C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808E804+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E804() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._522\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808E850\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808E8AC\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._519 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._520 @cond_branch\n" - "._519:\n" - " mov r0, #0x0\n" - " b ._521\n" - "._523:\n" - " .align 2, 0\n" - "._522:\n" - " .word gDebug_0300070F\n" - "._520:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._521:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E850() -{ - asm( - " push {r4, r5, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._526\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._524 @cond_branch\n" - " mov r5, #0x1\n" - " b ._525\n" - "._527:\n" - " .align 2, 0\n" - "._526:\n" - " .word gMain\n" - "._524:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._528 @cond_branch\n" - " ldr r5, ._529\n" - "._525:\n" - " ldr r1, ._529 + 4\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " add r0, r0, r3\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r1\n" - " ldrh r4, [r0]\n" - " add r0, r4, #0\n" - " bl VarGet\n" - " add r1, r0, #0\n" - " add r1, r5, r1\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " bl VarSet\n" - "._528:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._530:\n" - " .align 2, 0\n" - "._529:\n" - " .word 0xffff\n" - " .word gUnknown_Debug_083C478E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E8AC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._533\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._531 @cond_branch\n" - " ldr r0, ._533 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._532:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl VarGet\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x10\n" - " lsr r2, r2, #0x10\n" - " mov r0, #0x18\n" - " add r1, r4, #0\n" - " bl debug_sub_808F31C\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._532 @cond_branch\n" - "._531:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._534:\n" - " .align 2, 0\n" - "._533:\n" - " .word gUnknown_Debug_083C478C\n" - " .word gUnknown_Debug_083C478E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E90C() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x18\n" - " mov r3, #0x5\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._535\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x2\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x17\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x2\n" - " bl InitMenu\n" - " ldr r1, ._535 + 4\n" - " ldr r0, ._535 + 8\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._536:\n" - " .align 2, 0\n" - "._535:\n" - " .word gUnknown_Debug_083C35C4\n" - " .word gMenuCallback\n" - " .word debug_sub_808E95C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E95C() -{ - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bne ._537 @cond_branch\n" - " mov r0, #0x0\n" - " b ._540\n" - "._537:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._539 @cond_branch\n" - " ldr r2, ._541\n" - " ldr r0, ._541 + 4\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " mov r0, #0x0\n" - " b ._540\n" - "._542:\n" - " .align 2, 0\n" - "._541:\n" - " .word gMenuCallback\n" - " .word gUnknown_Debug_083C35C4\n" - "._539:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._540:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E9A0() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._543\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " bl Menu_PrintItems\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " ldr r0, ._543 + 4\n" - " strb r4, [r0]\n" - " ldr r1, ._543 + 8\n" - " ldr r0, ._543 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._544:\n" - " .align 2, 0\n" - "._543:\n" - " .word gUnknown_Debug_083C369C\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808EA50+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808E9F8() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._545\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x1c\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x7\n" - " bl InitMenu\n" - " ldr r1, ._545 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._545 + 8\n" - " ldr r0, ._545 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._546:\n" - " .align 2, 0\n" - "._545:\n" - " .word gUnknown_Debug_083C36E4\n" - " .word gDebug_0300070F\n" - " .word gMenuCallback\n" - " .word debug_sub_808EA50+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EA50() -{ - asm( - " push {r4, r5, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " add r1, r0, #0\n" - " ldr r5, ._550\n" - " ldrb r0, [r5]\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " bl debug_sub_808EAFC\n" - " ldrb r0, [r5]\n" - " bl debug_sub_808EA9C\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._547 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._548 @cond_branch\n" - "._547:\n" - " mov r0, #0x0\n" - " b ._549\n" - "._551:\n" - " .align 2, 0\n" - "._550:\n" - " .word gDebug_0300070F\n" - "._548:\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - "._549:\n" - " pop {r4, r5}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EA9C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " mov r5, #0x0\n" - " ldr r0, ._554\n" - " add r0, r1, r0\n" - " ldrb r2, [r0]\n" - " cmp r5, r2\n" - " bcs ._552 @cond_branch\n" - " ldr r0, ._554 + 4\n" - " mov r8, r0\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r7, r0, #0x1\n" - " add r6, r2, #0\n" - "._553:\n" - " lsl r0, r5, #0x1\n" - " add r4, r0, #1\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " add r0, r0, r7\n" - " add r0, r0, r8\n" - " ldrh r0, [r0]\n" - " bl VarGet\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x10\n" - " lsr r2, r2, #0x10\n" - " mov r0, #0x18\n" - " add r1, r4, #0\n" - " bl debug_sub_808F31C\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, r6\n" - " bcc ._553 @cond_branch\n" - "._552:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._555:\n" - " .align 2, 0\n" - "._554:\n" - " .word gUnknown_Debug_083C371C\n" - " .word gUnknown_Debug_083C371E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EAFC() -{ - asm( - " push {r4, r5, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " ldr r0, ._558\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._556 @cond_branch\n" - " mov r5, #0x1\n" - " b ._557\n" - "._559:\n" - " .align 2, 0\n" - "._558:\n" - " .word gMain\n" - "._556:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._560 @cond_branch\n" - " ldr r5, ._561\n" - "._557:\n" - " ldr r1, ._561 + 4\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " add r0, r0, r3\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r1\n" - " ldrh r4, [r0]\n" - " add r0, r4, #0\n" - " bl VarGet\n" - " add r1, r0, #0\n" - " add r1, r5, r1\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " bl VarSet\n" - "._560:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._562:\n" - " .align 2, 0\n" - "._561:\n" - " .word 0xffff\n" - " .word gUnknown_Debug_083C371E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EB58() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xc\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._563\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r3, ._563 + 4\n" - " mov r0, #0x2\n" - " mov r1, #0x3\n" - " mov r2, #0x8\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xb\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x8\n" - " bl InitMenu\n" - " ldr r1, ._563 + 8\n" - " ldr r0, ._563 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._564:\n" - " .align 2, 0\n" - "._563:\n" - " .word gUnknown_Debug_083C47B2\n" - " .word gUnknown_Debug_083C47F0\n" - " .word gMenuCallback\n" - " .word debug_sub_808EC10+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EBB4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl Menu_EraseScreen\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xd\n" - " mov r3, #0xd\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._565\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r3, ._565 + 4\n" - " mov r0, #0x2\n" - " mov r1, #0x3\n" - " mov r2, #0x5\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0xc\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x5\n" - " bl InitMenu\n" - " ldr r1, ._565 + 8\n" - " ldr r0, ._565 + 12\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x8\n" - " pop {r1}\n" - " bx r1\n" - "._566:\n" - " .align 2, 0\n" - "._565:\n" - " .word gUnknown_Debug_083C4830\n" - " .word gUnknown_Debug_083C4888\n" - " .word gMenuCallback\n" - " .word debug_sub_808EC5C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EC10() -{ - asm( - " push {r4, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._568 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._568 @cond_branch\n" - " ldr r1, ._570\n" - " lsl r0, r2, #0x18\n" - " asr r0, r0, #0x18\n" - " ldr r2, ._570 + 4\n" - " add r1, r1, r2\n" - " strh r0, [r1]\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._569\n" - "._571:\n" - " .align 2, 0\n" - "._570:\n" - " .word gSaveBlock1\n" - " .word 0x13c8\n" - "._568:\n" - " mov r0, #0x0\n" - "._569:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EC5C() -{ - asm( - " push {r4, lr}\n" - " bl Menu_ProcessInput\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl Menu_GetCursorPos\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " lsl r4, r4, #0x18\n" - " asr r4, r4, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._573 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r4, r0\n" - " beq ._573 @cond_branch\n" - " ldr r0, ._575\n" - " lsl r1, r1, #0x18\n" - " asr r1, r1, #0x8\n" - " lsr r1, r1, #0x10\n" - " bl VarSet\n" - " bl CloseMenu\n" - " mov r0, #0x1\n" - " b ._574\n" - "._576:\n" - " .align 2, 0\n" - "._575:\n" - " .word 0x40a7\n" - "._573:\n" - " mov r0, #0x0\n" - "._574:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808ECA4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._577\n" - " ldr r0, ._577 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x0\n" - " add sp, sp, #0x4\n" - " pop {r1}\n" - " bx r1\n" - "._578:\n" - " .align 2, 0\n" - "._577:\n" - " .word gMenuCallback\n" - " .word debug_sub_808ECD0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808ECD0() -{ - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._579 @cond_branch\n" - " mov r0, #0x0\n" - " b ._580\n" - "._579:\n" - " bl CloseMenu\n" - " mov r0, #0x2\n" - " bl debug_sub_808F168\n" - " ldr r0, ._581\n" - " bl SetMainCallback2\n" - " ldr r1, ._581 + 4\n" - " ldr r0, ._581 + 8\n" - " str r0, [r1, #0x8]\n" - " mov r0, #0x1\n" - "._580:\n" - " pop {r1}\n" - " bx r1\n" - "._582:\n" - " .align 2, 0\n" - "._581:\n" - " .word CB2_ContestPainting+1\n" - " .word gMain\n" - " .word debug_sub_808B868+1\n" - "\n" - ); -} - -__attribute__((naked)) -void TomomichiDebugMenu_Config() -{ - asm( - " mov r0, #0x0\n" - " bx lr\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808ED0C() -{ - asm( - " push {lr}\n" - " ldr r2, ._590\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._584 @cond_branch\n" - " ldr r1, ._590 + 4\n" - " ldrh r0, [r1]\n" - " cmp r0, #0x1\n" - " beq ._584 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strh r0, [r1]\n" - "._584:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._586 @cond_branch\n" - " ldr r3, ._590 + 4\n" - " ldrh r1, [r3]\n" - " ldr r0, ._590 + 8\n" - " cmp r1, r0\n" - " beq ._586 @cond_branch\n" - " add r0, r1, #1\n" - " strh r0, [r3]\n" - "._586:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._587 @cond_branch\n" - " ldr r1, ._590 + 4\n" - " ldrh r0, [r1]\n" - " cmp r0, #0xa\n" - " bls ._588 @cond_branch\n" - " sub r0, r0, #0xa\n" - " b ._589\n" - "._591:\n" - " .align 2, 0\n" - "._590:\n" - " .word gMain\n" - " .word gDebug_03000700\n" - " .word 0x19b\n" - "._588:\n" - " mov r0, #0x1\n" - "._589:\n" - " strh r0, [r1]\n" - "._587:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._592 @cond_branch\n" - " ldr r2, ._595\n" - " ldrh r1, [r2]\n" - " ldr r0, ._595 + 4\n" - " cmp r1, r0\n" - " bhi ._593 @cond_branch\n" - " add r0, r1, #0\n" - " add r0, r0, #0xa\n" - " b ._594\n" - "._596:\n" - " .align 2, 0\n" - "._595:\n" - " .word gDebug_03000700\n" - " .word 0x191\n" - "._593:\n" - " ldr r1, ._597\n" - " add r0, r1, #0\n" - "._594:\n" - " strh r0, [r2]\n" - "._592:\n" - " pop {r0}\n" - " bx r0\n" - "._598:\n" - " .align 2, 0\n" - "._597:\n" - " .word 0x19b\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808ED9C() -{ - asm( - " push {lr}\n" - " ldr r2, ._606\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._600 @cond_branch\n" - " ldr r1, ._606 + 4\n" - " ldr r0, [r1]\n" - " cmp r0, #0\n" - " beq ._600 @cond_branch\n" - " sub r0, r0, #0x1\n" - " str r0, [r1]\n" - "._600:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._602 @cond_branch\n" - " ldr r3, ._606 + 4\n" - " ldr r1, [r3]\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._602 @cond_branch\n" - " add r0, r1, #1\n" - " str r0, [r3]\n" - "._602:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._603 @cond_branch\n" - " ldr r1, ._606 + 4\n" - " ldr r0, [r1]\n" - " cmp r0, #0xf\n" - " bls ._604 @cond_branch\n" - " sub r0, r0, #0x10\n" - " b ._605\n" - "._607:\n" - " .align 2, 0\n" - "._606:\n" - " .word gMain\n" - " .word gDebug_03000708\n" - "._604:\n" - " mov r0, #0x0\n" - "._605:\n" - " str r0, [r1]\n" - "._603:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._608 @cond_branch\n" - " ldr r3, ._611\n" - " ldr r1, [r3]\n" - " mov r0, #0x11\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " bhi ._609 @cond_branch\n" - " add r0, r1, #0\n" - " add r0, r0, #0x10\n" - " b ._610\n" - "._612:\n" - " .align 2, 0\n" - "._611:\n" - " .word gDebug_03000708\n" - "._609:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - "._610:\n" - " str r0, [r3]\n" - "._608:\n" - " ldrh r2, [r2, #0x2e]\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x2\n" - " add r0, r1, #0\n" - " and r0, r0, r2\n" - " cmp r0, r1\n" - " bne ._613 @cond_branch\n" - " ldr r1, ._614\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " str r0, [r1]\n" - "._613:\n" - " pop {r0}\n" - " bx r0\n" - "._615:\n" - " .align 2, 0\n" - "._614:\n" - " .word gDebug_03000708\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EE3C() -{ - asm( - " push {lr}\n" - " ldr r2, ._622\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._617 @cond_branch\n" - " ldr r1, ._622 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x1\n" - " beq ._617 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._617:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._619 @cond_branch\n" - " ldr r1, ._622 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x5\n" - " beq ._619 @cond_branch\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._619:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._620 @cond_branch\n" - " ldr r1, ._622 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - "._620:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._621 @cond_branch\n" - " ldr r1, ._622 + 4\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - "._621:\n" - " pop {r0}\n" - " bx r0\n" - "._623:\n" - " .align 2, 0\n" - "._622:\n" - " .word gMain\n" - " .word gDebug_0300070C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EE9C() -{ - asm( - " push {lr}\n" - " ldr r2, ._631\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._625 @cond_branch\n" - " ldr r1, ._631 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x1\n" - " beq ._625 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._625:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._627 @cond_branch\n" - " ldr r1, ._631 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0xf\n" - " beq ._627 @cond_branch\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._627:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._628 @cond_branch\n" - " ldr r1, ._631 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0xa\n" - " bls ._629 @cond_branch\n" - " sub r0, r0, #0xa\n" - " b ._630\n" - "._632:\n" - " .align 2, 0\n" - "._631:\n" - " .word gMain\n" - " .word gDebug_0300070D\n" - "._629:\n" - " mov r0, #0x0\n" - "._630:\n" - " strb r0, [r1]\n" - "._628:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._633 @cond_branch\n" - " ldr r1, ._636\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x5\n" - " bhi ._634 @cond_branch\n" - " add r0, r0, #0xa\n" - " b ._635\n" - "._637:\n" - " .align 2, 0\n" - "._636:\n" - " .word gDebug_0300070D\n" - "._634:\n" - " mov r0, #0xf\n" - "._635:\n" - " strb r0, [r1]\n" - "._633:\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EF14() -{ - asm( - " push {lr}\n" - " ldr r2, ._645\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._639 @cond_branch\n" - " ldr r1, ._645 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x1\n" - " beq ._639 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._639:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._641 @cond_branch\n" - " ldr r1, ._645 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0xf\n" - " beq ._641 @cond_branch\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._641:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._642 @cond_branch\n" - " ldr r1, ._645 + 4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0xa\n" - " bls ._643 @cond_branch\n" - " sub r0, r0, #0xa\n" - " b ._644\n" - "._646:\n" - " .align 2, 0\n" - "._645:\n" - " .word gMain\n" - " .word gDebug_0300070E\n" - "._643:\n" - " mov r0, #0x0\n" - "._644:\n" - " strb r0, [r1]\n" - "._642:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._647 @cond_branch\n" - " ldr r1, ._650\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x5\n" - " bhi ._648 @cond_branch\n" - " add r0, r0, #0xa\n" - " b ._649\n" - "._651:\n" - " .align 2, 0\n" - "._650:\n" - " .word gDebug_0300070E\n" - "._648:\n" - " mov r0, #0xf\n" - "._649:\n" - " strb r0, [r1]\n" - "._647:\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808EF8C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " cmp r6, #0x2\n" - " bgt ._653 @cond_branch\n" - " cmp r6, #0\n" - " blt ._653 @cond_branch\n" - " mov r3, #0x0\n" - " ldr r0, ._656\n" - " mov r8, r0\n" - " ldr r4, ._656 + 4\n" - " mov r7, #0x7\n" - " mov r5, #0xf\n" - "._658:\n" - " sub r0, r7, r3\n" - " lsl r0, r0, #0x2\n" - " mov r1, r8\n" - " ldr r2, [r1]\n" - " LSR r2, r0\n" - " and r2, r2, r5\n" - " cmp r2, #0x9\n" - " bhi ._654 @cond_branch\n" - " add r1, r3, r4\n" - " add r0, r2, #0\n" - " add r0, r0, #0xa1\n" - " b ._655\n" - "._657:\n" - " .align 2, 0\n" - "._656:\n" - " .word gDebug_03000708\n" - " .word gDebug_03000710\n" - "._654:\n" - " add r1, r3, r4\n" - " add r0, r2, #0\n" - " sub r0, r0, #0x4f\n" - "._655:\n" - " strb r0, [r1]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " cmp r3, #0x7\n" - " bls ._658 @cond_branch\n" - " ldr r0, ._666\n" - " mov r1, #0xff\n" - " strb r1, [r0, #0x8]\n" - " mov r1, #0xc\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - "._653:\n" - " mov r3, #0x0\n" - " ldr r7, ._666\n" - " ldr r5, ._666 + 4\n" - " ldr r2, ._666 + 8\n" - " mov r8, r2\n" - " add r4, r7, #0\n" - " mov r2, #0x0\n" - "._659:\n" - " add r1, r3, #1\n" - " add r0, r1, r4\n" - " strb r2, [r0]\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " cmp r3, #0x9\n" - " bls ._659 @cond_branch\n" - " mov r3, #0x0\n" - " ldrh r2, [r5]\n" - " mov r0, #0xb\n" - " add r1, r2, #0\n" - " mul r1, r1, r0\n" - " mov r2, r8\n" - " add r0, r1, r2\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._661 @cond_branch\n" - " ldr r0, ._666\n" - " mov ip, r0\n" - " mov r5, r8\n" - " add r4, r1, #0\n" - "._662:\n" - " add r1, r3, #1\n" - " mov r0, ip\n" - " add r2, r1, r0\n" - " add r0, r3, r4\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " strb r0, [r2]\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " add r0, r3, r4\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._661 @cond_branch\n" - " cmp r3, #0x9\n" - " bls ._662 @cond_branch\n" - "._661:\n" - " mov r0, #0xb1\n" - " strb r0, [r7]\n" - " mov r0, #0xb2\n" - " strb r0, [r7, #0xb]\n" - " mov r0, #0xff\n" - " strb r0, [r7, #0xc]\n" - " cmp r6, #0x2\n" - " bgt ._664 @cond_branch\n" - " cmp r6, #0\n" - " blt ._664 @cond_branch\n" - " add r0, r7, #0\n" - " mov r1, #0x8\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " b ._665\n" - "._667:\n" - " .align 2, 0\n" - "._666:\n" - " .word gDebug_03000710\n" - " .word gDebug_03000700\n" - " .word gSpeciesNames\n" - "._664:\n" - " ldr r0, ._672\n" - " mov r1, #0xc\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - "._665:\n" - " ldr r5, ._672\n" - " mov r0, #0xff\n" - " strb r0, [r5, #0x3]\n" - " ldr r4, ._672 + 4\n" - " ldrh r0, [r4]\n" - " mov r1, #0x64\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5]\n" - " ldrh r0, [r4]\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0xa\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x1]\n" - " ldrh r0, [r4]\n" - " mov r1, #0xa\n" - " bl __umodsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x2]\n" - " add r0, r5, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " cmp r6, #0x1\n" - " beq ._668 @cond_branch\n" - " cmp r6, #0x1\n" - " bgt ._669 @cond_branch\n" - " cmp r6, #0\n" - " beq ._670 @cond_branch\n" - " b ._679\n" - "._673:\n" - " .align 2, 0\n" - "._672:\n" - " .word gDebug_03000710\n" - " .word gDebug_03000700\n" - "._669:\n" - " cmp r6, #0x2\n" - " beq ._674 @cond_branch\n" - " b ._679\n" - "._670:\n" - " ldr r4, ._677\n" - " b ._676\n" - "._678:\n" - " .align 2, 0\n" - "._677:\n" - " .word gDebug_0300070C\n" - "._668:\n" - " ldr r4, ._680\n" - "._676:\n" - " ldrb r0, [r4]\n" - " mov r1, #0x64\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5]\n" - " ldrb r0, [r4]\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0xa\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x1]\n" - " ldrb r0, [r4]\n" - " mov r1, #0xa\n" - " bl __umodsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x2]\n" - " add r0, r5, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - " b ._679\n" - "._681:\n" - " .align 2, 0\n" - "._680:\n" - " .word gDebug_0300070D\n" - "._674:\n" - " ldr r4, ._682\n" - " ldrb r0, [r4]\n" - " mov r1, #0x64\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5]\n" - " ldrb r0, [r4]\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0xa\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x1]\n" - " ldrb r0, [r4]\n" - " mov r1, #0xa\n" - " bl __umodsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x2]\n" - " add r0, r5, #0\n" - " mov r1, #0xc\n" - " mov r2, #0x7\n" - " bl Menu_PrintText\n" - "._679:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._683:\n" - " .align 2, 0\n" - "._682:\n" - " .word gDebug_0300070E\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F168() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " ldr r4, ._686\n" - " ldr r0, ._686 + 4\n" - " ldrh r0, [r0]\n" - " strh r0, [r4, #0x8]\n" - " ldr r0, ._686 + 8\n" - " ldr r0, [r0]\n" - " str r0, [r4, #0x4]\n" - " ldr r0, ._686 + 12\n" - " ldr r0, [r0]\n" - " str r0, [r4]\n" - " cmp r1, #0x5\n" - " bls ._684 @cond_branch\n" - " b ._707\n" - "._684:\n" - " lsl r0, r1, #0x2\n" - " ldr r1, ._686 + 16\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._687:\n" - " .align 2, 0\n" - "._686:\n" - " .word +0x2015de0\n" - " .word gDebug_03000700\n" - " .word gDebug_03000704\n" - " .word gDebug_03000708\n" - " .word ._688\n" - "._688:\n" - " .word ._689\n" - " .word ._690\n" - " .word ._691\n" - " .word ._692\n" - " .word ._693\n" - " .word ._694\n" - "._689:\n" - " ldr r0, ._696\n" - " ldr r2, ._696 + 4\n" - " add r1, r0, r2\n" - " mov r2, #0x0\n" - " strb r2, [r1]\n" - " ldr r1, ._696 + 8\n" - " add r0, r0, r1\n" - " strb r2, [r0]\n" - " ldr r0, ._696 + 12\n" - " ldrb r0, [r0]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r4, #0xa]\n" - " add r0, r4, #0\n" - " add r0, r0, #0x16\n" - " ldr r1, ._696 + 16\n" - " bl StringCopy\n" - " b ._704\n" - "._697:\n" - " .align 2, 0\n" - "._696:\n" - " .word +0x2000000\n" - " .word 0x15ddf\n" - " .word 0x15dde\n" - " .word gDebug_0300070C\n" - " .word gUnknown_Debug_083C48BB\n" - "._690:\n" - " ldr r1, ._699\n" - " ldr r0, ._699 + 4\n" - " add r2, r1, r0\n" - " mov r0, #0x0\n" - " strb r0, [r2]\n" - " ldr r2, ._699 + 8\n" - " add r1, r1, r2\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " ldr r0, ._699 + 12\n" - " ldrb r0, [r0]\n" - " sub r0, r0, #0x1\n" - " b ._698\n" - "._700:\n" - " .align 2, 0\n" - "._699:\n" - " .word +0x2000000\n" - " .word 0x15ddf\n" - " .word 0x15dde\n" - " .word gDebug_0300070D\n" - "._691:\n" - " ldr r1, ._702\n" - " ldr r0, ._702 + 4\n" - " add r2, r1, r0\n" - " mov r0, #0x1\n" - " strb r0, [r2]\n" - " ldr r2, ._702 + 8\n" - " add r1, r1, r2\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " ldr r0, ._702 + 12\n" - " ldrb r0, [r0]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r4, #0xa]\n" - " b ._707\n" - "._703:\n" - " .align 2, 0\n" - "._702:\n" - " .word +0x2000000\n" - " .word 0x15ddf\n" - " .word 0x15dde\n" - " .word gDebug_0300070E\n" - "._692:\n" - " ldr r1, ._705\n" - " ldr r2, ._705 + 4\n" - " add r0, r1, r2\n" - " mov r2, #0x0\n" - " strb r2, [r0]\n" - " ldr r0, ._705 + 8\n" - " add r1, r1, r0\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " strb r2, [r4, #0xa]\n" - " b ._704\n" - "._706:\n" - " .align 2, 0\n" - "._705:\n" - " .word +0x2000000\n" - " .word 0x15ddf\n" - " .word 0x15dde\n" - "._693:\n" - " ldr r1, ._708\n" - " ldr r0, ._708 + 4\n" - " add r2, r1, r0\n" - " mov r0, #0x0\n" - " strb r0, [r2]\n" - " ldr r2, ._708 + 8\n" - " add r1, r1, r2\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " mov r0, #0x3\n" - "._698:\n" - " strb r0, [r4, #0xa]\n" - "._704:\n" - " add r0, r4, #0\n" - " add r0, r0, #0xb\n" - " ldr r1, ._708 + 12\n" - " bl StringCopy\n" - " b ._707\n" - "._709:\n" - " .align 2, 0\n" - "._708:\n" - " .word +0x2000000\n" - " .word 0x15ddf\n" - " .word 0x15dde\n" - " .word gUnknown_Debug_083C48B0\n" - "._694:\n" - " ldr r1, ._710\n" - " ldr r0, ._710 + 4\n" - " add r2, r1, r0\n" - " mov r0, #0x0\n" - " strb r0, [r2]\n" - " ldr r2, ._710 + 8\n" - " add r1, r1, r2\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " mov r0, #0x9\n" - " strb r0, [r4, #0xa]\n" - " add r0, r4, #0\n" - " add r0, r0, #0xb\n" - " ldr r1, ._710 + 12\n" - " bl StringCopy\n" - "._707:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._711:\n" - " .align 2, 0\n" - "._710:\n" - " .word +0x2000000\n" - " .word 0x15ddf\n" - " .word 0x15dde\n" - " .word gUnknown_Debug_083C48B0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F2E0() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r3, r1, #0x18\n" - " lsl r2, r2, #0x18\n" - " cmp r2, #0\n" - " bne ._712 @cond_branch\n" - " ldr r1, ._714\n" - " mov r0, #0xa1\n" - " b ._713\n" - "._715:\n" - " .align 2, 0\n" - "._714:\n" - " .word gDebug_03000710\n" - "._712:\n" - " ldr r1, ._716\n" - " mov r0, #0xa2\n" - "._713:\n" - " strb r0, [r1]\n" - " mov r0, #0xff\n" - " strb r0, [r1, #0x1]\n" - " add r0, r1, #0\n" - " add r1, r4, #0\n" - " add r2, r3, #0\n" - " bl Menu_PrintText\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._717:\n" - " .align 2, 0\n" - "._716:\n" - " .word gDebug_03000710\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_808F31C() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6}\n" - " mov r8, r0\n" - " mov r9, r1\n" - " add r4, r2, #0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r8, r0\n" - " mov r0, r9\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r9, r0\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " ldr r5, ._718\n" - " ldr r6, ._718 + 4\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5]\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r6, #0xfa\n" - " lsl r6, r6, #0x2\n" - " add r1, r6, #0\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x1]\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0x64\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x2]\n" - " add r0, r4, #0\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0xa\n" - " bl __udivsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x3]\n" - " add r0, r4, #0\n" - " mov r1, #0xa\n" - " bl __umodsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r5, #0x4]\n" - " mov r0, #0xff\n" - " strb r0, [r5, #0x5]\n" - " add r0, r5, #0\n" - " mov r1, r8\n" - " mov r2, r9\n" - " bl Menu_PrintText\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._719:\n" - " .align 2, 0\n" - "._718:\n" - " .word gDebug_03000710\n" - " .word 0x2710\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_nullsub_66() -{ - asm( - " bx lr\n" - "\n" - ); -} - #endif diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c deleted file mode 100644 index fa944b25f..000000000 --- a/src/debug/unk_debug_menu_3.c +++ /dev/null @@ -1,804 +0,0 @@ -#include "global.h" -#include "menu.h" - -#if DEBUG - -__attribute__((naked)) -int debug_sub_813C404() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " ldr r5, ._1\n" - " ldr r4, ._1 + 4\n" - " sub r5, r5, r4\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " bl unref_sub_812620C\n" - " add r0, r5, #0\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._2:\n" - " .align 2, 0\n" - "._1:\n" - " .word gUnknown_Debug_845DDB2\n" - " .word gUnknown_Debug_845DAE1\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C430() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " ldr r5, ._3\n" - " ldr r4, ._3 + 4\n" - " sub r5, r5, r4\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " bl unref_sub_812620C\n" - " add r0, r5, #0\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._4:\n" - " .align 2, 0\n" - "._3:\n" - " .word gUnknown_Debug_845E402\n" - " .word gUnknown_Debug_845E3E0\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C45C() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " ldr r5, ._5\n" - " ldr r4, ._5 + 4\n" - " sub r5, r5, r4\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " bl unref_sub_812620C\n" - " add r0, r5, #0\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._6:\n" - " .align 2, 0\n" - "._5:\n" - " .word gUnknown_Debug_845E443\n" - " .word gUnknown_Debug_845E422\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C488() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " ldr r5, ._7\n" - " ldr r4, ._7 + 4\n" - " sub r5, r5, r4\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " bl unref_sub_812620C\n" - " add r0, r5, #0\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._8:\n" - " .align 2, 0\n" - "._7:\n" - " .word gUnknown_Debug_845E422\n" - " .word gUnknown_Debug_845E402\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C4B4() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._9\n" - " ldr r1, ._9 + 4\n" - " sub r4, r4, r1\n" - " add r2, r4, #0\n" - " bl memcpy\n" - " add r0, r4, #0\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._10:\n" - " .align 2, 0\n" - "._9:\n" - " .word gUnknown_Debug_845E619\n" - " .word gUnknown_Debug_845E606\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C4D4() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " ldr r5, ._11\n" - " ldr r4, ._11 + 4\n" - " sub r5, r5, r4\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " bl unref_sub_81261B4\n" - " add r0, r5, #0\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._12:\n" - " .align 2, 0\n" - "._11:\n" - " .word gUnknown_Debug_845E712\n" - " .word gUnknown_Debug_845E619\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C500() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " ldr r5, ._13\n" - " ldr r4, ._13 + 4\n" - " sub r5, r5, r4\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " bl unref_sub_812620C\n" - " add r0, r5, #0\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._14:\n" - " .align 2, 0\n" - "._13:\n" - " .word gUnknown_Debug_845E797\n" - " .word gUnknown_Debug_845E712\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_813C52C() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6}\n" - " mov r8, r0\n" - " lsl r5, r1, #0x10\n" - " lsr r0, r5, #0x10\n" - " mov r9, r0\n" - " ldr r6, ._15\n" - " ldr r4, ._15 + 4\n" - " sub r6, r6, r4\n" - " mov r0, r8\n" - " add r1, r4, #0\n" - " add r2, r6, #0\n" - " bl memcpy\n" - " ldr r0, ._15 + 8\n" - " sub r0, r0, r4\n" - " add r0, r0, r8\n" - " add r0, r0, #0x3\n" - " mov r1, r9\n" - " strb r1, [r0]\n" - " lsr r5, r5, #0x18\n" - " strb r5, [r0, #0x1]\n" - " mov r0, r8\n" - " add r1, r4, #0\n" - " bl unref_sub_812620C\n" - " add r0, r6, #0\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._16:\n" - " .align 2, 0\n" - "._15:\n" - " .word gUnknown_Debug_845E7BB\n" - " .word gUnknown_Debug_845E797\n" - " .word gUnknown_Debug_845E7B5\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C580() -{ - asm( - " push {lr}\n" - " mov r1, #0xd\n" - " bl debug_sub_813C52C\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C58C() -{ - asm( - " push {lr}\n" - " mov r1, #0x4\n" - " bl debug_sub_813C52C\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C598() -{ - asm( - " push {lr}\n" - " mov r1, #0x85\n" - " bl debug_sub_813C52C\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C5A4() -{ - asm( - " push {lr}\n" - " ldr r1, ._17\n" - " bl debug_sub_813C52C\n" - " pop {r1}\n" - " bx r1\n" - "._18:\n" - " .align 2, 0\n" - "._17:\n" - " .word 0x121\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C5B4() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add r4, r0, #0\n" - " ldr r7, ._23\n" - " ldr r0, ._23 + 4\n" - " ldr r1, ._23 + 8\n" - " sub r0, r0, r1\n" - " add r6, r0, r4\n" - " ldr r0, ._23 + 12\n" - " sub r5, r0, r1\n" - " ldr r0, ._23 + 16\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " bl GetEnigmaBerryChecksum\n" - " mov r2, #0x0\n" - " ldr r3, ._23 + 20\n" - " mov r1, #0x0\n" - "._19:\n" - " add r0, r4, r2\n" - " strb r1, [r0]\n" - " add r2, r2, #0x1\n" - " cmp r2, r3\n" - " ble ._19 @cond_branch\n" - " mov r2, #0x0\n" - " cmp r2, r5\n" - " bcs ._20 @cond_branch\n" - " ldr r3, ._23 + 8\n" - "._21:\n" - " add r0, r4, r2\n" - " add r1, r2, r3\n" - " ldrb r1, [r1]\n" - " strb r1, [r0]\n" - " add r2, r2, #0x1\n" - " cmp r2, r5\n" - " bcc ._21 @cond_branch\n" - "._20:\n" - " mov r2, #0x0\n" - " ldr r3, ._23 + 24\n" - "._22:\n" - " add r0, r6, r2\n" - " add r1, r7, r2\n" - " ldrb r1, [r1]\n" - " strb r1, [r0]\n" - " add r2, r2, #0x1\n" - " cmp r2, r3\n" - " bls ._22 @cond_branch\n" - " bl ClearEnigmaBerries\n" - " ldr r1, ._23 + 8\n" - " add r0, r4, #0\n" - " bl unref_sub_81261B4\n" - " add r0, r5, #0\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._24:\n" - " .align 2, 0\n" - "._23:\n" - " .word gSaveBlock1+0x3160\n" - " .word gUnknown_Debug_845DDD6\n" - " .word gUnknown_Debug_845DDB2\n" - " .word gUnknown_Debug_845E306\n" - " .word Str_842E23C\n" - " .word 0xfff\n" - " .word 0x52f\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_813C638() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xffffffec\n" - " mov r8, r0\n" - " add r4, r1, #0\n" - " add r5, r2, #0\n" - " add r6, r3, #0\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " lsl r6, r6, #0x10\n" - " lsr r6, r6, #0x10\n" - " bl ZeroMonData\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x1\n" - " str r0, [sp, #0x8]\n" - " ldr r0, ._25\n" - " str r0, [sp, #0xc]\n" - " mov r0, r8\n" - " add r1, r4, #0\n" - " add r2, r5, #0\n" - " mov r3, #0x20\n" - " bl CreateMon\n" - " ldr r2, ._25 + 4\n" - " mov r0, r8\n" - " mov r1, #0x7\n" - " bl SetMonData\n" - " ldr r2, ._25 + 8\n" - " mov r0, r8\n" - " mov r1, #0x2\n" - " bl SetMonData\n" - " str r6, [sp, #0x10]\n" - " mov r0, r8\n" - " mov r1, #0xc\n" - " add r2, sp, #0x10\n" - " bl SetMonData\n" - " add sp, sp, #0x14\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._26:\n" - " .align 2, 0\n" - "._25:\n" - " .word 0x270f\n" - " .word Str_842E240\n" - " .word Str_842E248\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_813C6AC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffff8\n" - " add r6, r0, #0\n" - " add r5, r1, #0\n" - " add r0, r5, #0\n" - " bl ClearMailStruct\n" - " add r0, r6, #0\n" - " mov r1, #0xc\n" - " bl GetMonData\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r8, r0\n" - " bl ItemIsMail\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._27 @cond_branch\n" - " add r4, r5, #0\n" - " add r4, r4, #0x12\n" - " add r7, r5, #0\n" - " add r7, r7, #0x1a\n" - " mov r1, #0x9\n" - " add r0, r5, #0\n" - " add r0, r0, #0x10\n" - "._28:\n" - " strh r1, [r0]\n" - " sub r1, r1, #0x1\n" - " sub r0, r0, #0x2\n" - " cmp r0, r5\n" - " bge ._28 @cond_branch\n" - " add r0, r6, #0\n" - " mov r1, #0x7\n" - " mov r2, sp\n" - " bl GetMonData\n" - " add r0, r4, #0\n" - " mov r1, sp\n" - " mov r2, #0x8\n" - " bl StringCopyN\n" - " add r0, r6, #0\n" - " mov r1, #0x1\n" - " bl GetMonData\n" - " add r1, r7, #0\n" - " bl write_word_to_mem\n" - " add r0, r6, #0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r6, #0\n" - " mov r1, #0x0\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " add r0, r4, #0\n" - " bl SpeciesToMailSpecies\n" - " strh r0, [r5, #0x1e]\n" - " mov r0, r8\n" - " strh r0, [r5, #0x20]\n" - "._27:\n" - " add sp, sp, #0x8\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C740() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, sl\n" - " mov r5, r9\n" - " mov r4, r8\n" - " push {r4, r5, r6}\n" - " add sp, sp, #0xffffffd0\n" - " add r6, r0, #0\n" - " ldr r0, ._29\n" - " mov r8, r0\n" - " ldr r1, ._29 + 4\n" - " ldr r5, ._29 + 8\n" - " sub r1, r1, r0\n" - " mov r9, r1\n" - " add r0, r6, #0\n" - " mov r1, r8\n" - " mov r2, r9\n" - " bl memcpy\n" - " add r0, r5, #0\n" - " mov r1, #0x19\n" - " mov r2, #0x5\n" - " mov r3, #0x0\n" - " bl debug_sub_813C638\n" - " add r4, sp, #0x24\n" - " mov r0, #0x1\n" - " mov sl, r0\n" - " mov r1, sl\n" - " strb r1, [r4]\n" - " add r0, r5, #0\n" - " mov r1, #0x2d\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " mov r0, #0x3\n" - " strb r0, [r4]\n" - " add r0, r5, #0\n" - " mov r1, #0x20\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " mov r0, #0xff\n" - " strb r0, [r4]\n" - " add r0, r5, #0\n" - " mov r1, #0x23\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " ldr r1, ._29 + 12\n" - " add r0, r4, #0\n" - " mov r2, #0xb\n" - " bl StringCopyN\n" - " add r0, r5, #0\n" - " mov r1, #0x2\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " mov r0, sl\n" - " strb r0, [r4]\n" - " add r0, r5, #0\n" - " mov r1, #0x3\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " ldr r0, ._29 + 16\n" - " add r0, r6, r0\n" - " mov r1, r8\n" - " sub r0, r0, r1\n" - " add r1, r5, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - " ldr r0, ._29 + 20\n" - " add r6, r6, r0\n" - " mov r0, r8\n" - " sub r6, r6, r0\n" - " add r0, r6, #0\n" - " mov r1, sp\n" - " mov r2, #0x24\n" - " bl memcpy\n" - " mov r0, r9\n" - " add sp, sp, #0x30\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._30:\n" - " .align 2, 0\n" - "._29:\n" - " .word gUnknown_Debug_845E443\n" - " .word gUnknown_Debug_845E4EF\n" - " .word gEnemyParty\n" - " .word Str_842E238\n" - " .word gUnknown_Debug_845E467\n" - " .word gUnknown_Debug_845E4CB\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C810() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xffffffdc\n" - " add r6, r0, #0\n" - " ldr r5, ._31\n" - " ldr r0, ._31 + 4\n" - " ldr r4, ._31 + 8\n" - " sub r0, r0, r5\n" - " mov r8, r0\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " mov r2, r8\n" - " bl memcpy\n" - " add r0, r4, #0\n" - " mov r1, #0xc9\n" - " mov r2, #0x15\n" - " mov r3, #0x82\n" - " bl debug_sub_813C638\n" - " add r0, r4, #0\n" - " mov r1, sp\n" - " bl debug_sub_813C6AC\n" - " ldr r0, ._31 + 12\n" - " add r0, r6, r0\n" - " sub r0, r0, r5\n" - " add r1, r4, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - " ldr r0, ._31 + 16\n" - " add r0, r6, r0\n" - " sub r0, r0, r5\n" - " mov r1, sp\n" - " mov r2, #0x24\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl unref_sub_812620C\n" - " mov r0, r8\n" - " add sp, sp, #0x24\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._32:\n" - " .align 2, 0\n" - "._31:\n" - " .word gUnknown_Debug_845E443\n" - " .word gUnknown_Debug_845E4EF\n" - " .word gEnemyParty\n" - " .word gUnknown_Debug_845E467\n" - " .word gUnknown_Debug_845E4CB\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C888() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xffffffdc\n" - " add r6, r0, #0\n" - " ldr r5, ._33\n" - " ldr r0, ._33 + 4\n" - " ldr r4, ._33 + 8\n" - " sub r0, r0, r5\n" - " mov r8, r0\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " mov r2, r8\n" - " bl memcpy\n" - " add r0, r4, #0\n" - " mov r1, #0xc9\n" - " mov r2, #0x15\n" - " mov r3, #0x82\n" - " bl debug_sub_813C638\n" - " add r0, r4, #0\n" - " mov r1, sp\n" - " bl debug_sub_813C6AC\n" - " mov r0, #0x0\n" - " strh r0, [r4, #0x1c]\n" - " ldr r0, ._33 + 12\n" - " add r0, r6, r0\n" - " sub r0, r0, r5\n" - " add r1, r4, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - " ldr r0, ._33 + 16\n" - " add r0, r6, r0\n" - " sub r0, r0, r5\n" - " mov r1, sp\n" - " mov r2, #0x24\n" - " bl memcpy\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl unref_sub_812620C\n" - " mov r0, r8\n" - " add sp, sp, #0x24\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._34:\n" - " .align 2, 0\n" - "._33:\n" - " .word gUnknown_Debug_845E443\n" - " .word gUnknown_Debug_845E4EF\n" - " .word gEnemyParty\n" - " .word gUnknown_Debug_845E467\n" - " .word gUnknown_Debug_845E4CB\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_813C904() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._35\n" - " add r0, r4, #0\n" - " mov r1, #0x5\n" - " mov r2, #0x32\n" - " mov r3, #0xb7\n" - " bl debug_sub_813C638\n" - " add r0, r4, #0\n" - " add r0, r0, #0x64\n" - " mov r1, #0x8\n" - " mov r2, #0x32\n" - " mov r3, #0xc4\n" - " bl debug_sub_813C638\n" - " add r4, r4, #0xc8\n" - " add r0, r4, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x32\n" - " mov r3, #0x8d\n" - " bl debug_sub_813C638\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._36:\n" - " .align 2, 0\n" - "._35:\n" - " .word gPlayerParty\n" - "\n" - ); -} - -__attribute__((naked)) -int debug_sub_813C93C() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xffffff44\n" - " add r4, r0, #0\n" - " ldr r6, ._37\n" - " ldr r5, ._37 + 4\n" - " sub r5, r5, r6\n" - " add r1, r6, #0\n" - " add r2, r5, #0\n" - " bl memcpy\n" - " bl SavePlayerParty\n" - " bl debug_sub_813C904\n" - " ldr r1, ._37 + 8\n" - " ldr r2, ._37 + 12\n" - " mov r0, sp\n" - " bl debug_sub_8075DB4\n" - " bl LoadPlayerParty\n" - " ldr r0, ._37 + 16\n" - " add r4, r4, r0\n" - " sub r4, r4, r6\n" - " add r0, r4, #0\n" - " mov r1, sp\n" - " mov r2, #0xbc\n" - " bl memcpy\n" - " add r0, r5, #0\n" - " add sp, sp, #0xbc\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "._38:\n" - " .align 2, 0\n" - "._37:\n" - " .word gUnknown_Debug_845E4EF\n" - " .word gUnknown_Debug_845E606\n" - " .word Str_842E253+5 @ weird...\n" - " .word 0x270f\n" - " .word gUnknown_Debug_845E506\n" - "\n" - ); -} - -#endif - diff --git a/src/debug/watanabe_debug_menu.c b/src/debug/watanabe_debug_menu.c index cc53f8c95..6c94b0466 100644 --- a/src/debug/watanabe_debug_menu.c +++ b/src/debug/watanabe_debug_menu.c @@ -8,9842 +8,4 @@ EWRAM_DATA u8 gUnknown_Debug_2038A20[4] = { 0 }; u8 byte_3005E30[0x20]; -__attribute__((naked)) -void debug_69() -{ - asm( - " bx lr\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C35DC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffff8\n" - " mov r0, #0x0\n" - " bl SetVBlankCallback\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x13\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " add r0, r0, #0xe\n" - " strh r1, [r0]\n" - " sub r0, r0, #0x2\n" - " strh r1, [r0]\n" - " sub r0, r0, #0x2\n" - " strh r1, [r0]\n" - " sub r0, r0, #0x2\n" - " strh r1, [r0]\n" - " add r0, r0, #0x14\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " sub r0, r0, #0x6\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " sub r0, r0, #0x6\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " sub r0, r0, #0x6\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " mov r3, #0xc0\n" - " lsl r3, r3, #0x13\n" - " mov r4, #0xc0\n" - " lsl r4, r4, #0x9\n" - " add r0, sp, #0x4\n" - " mov r8, r0\n" - " mov r2, sp\n" - " mov r6, #0x0\n" - " ldr r1, ._2\n" - " mov r5, #0x80\n" - " lsl r5, r5, #0x5\n" - " ldr r7, ._2 + 4\n" - " mov r0, #0x81\n" - " lsl r0, r0, #0x18\n" - " mov ip, r0\n" - "._1:\n" - " strh r6, [r2]\n" - " mov r0, sp\n" - " str r0, [r1]\n" - " str r3, [r1, #0x4]\n" - " str r7, [r1, #0x8]\n" - " ldr r0, [r1, #0x8]\n" - " add r3, r3, r5\n" - " sub r4, r4, r5\n" - " cmp r4, r5\n" - " bhi ._1 @cond_branch\n" - " strh r6, [r2]\n" - " mov r2, sp\n" - " str r2, [r1]\n" - " str r3, [r1, #0x4]\n" - " lsr r0, r4, #0x1\n" - " mov r2, ip\n" - " orr r0, r0, r2\n" - " str r0, [r1, #0x8]\n" - " ldr r0, [r1, #0x8]\n" - " mov r0, #0xe0\n" - " lsl r0, r0, #0x13\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x3\n" - " mov r4, #0x0\n" - " str r4, [sp, #0x4]\n" - " ldr r2, ._2\n" - " mov r1, r8\n" - " str r1, [r2]\n" - " str r0, [r2, #0x4]\n" - " lsr r0, r3, #0x2\n" - " mov r1, #0x85\n" - " lsl r1, r1, #0x18\n" - " orr r0, r0, r1\n" - " str r0, [r2, #0x8]\n" - " ldr r0, [r2, #0x8]\n" - " mov r1, #0xa0\n" - " lsl r1, r1, #0x13\n" - " mov r0, sp\n" - " strh r4, [r0]\n" - " str r0, [r2]\n" - " str r1, [r2, #0x4]\n" - " lsr r3, r3, #0x1\n" - " mov r0, #0x81\n" - " lsl r0, r0, #0x18\n" - " orr r3, r3, r0\n" - " str r3, [r2, #0x8]\n" - " ldr r0, [r2, #0x8]\n" - " bl ResetPaletteFade\n" - " bl ScanlineEffect_Stop\n" - " bl ResetTasks\n" - " bl ResetSpriteData\n" - " bl ResetPaletteFade\n" - " bl FreeAllSpritePalettes\n" - " ldr r0, ._2 + 8\n" - " bl LoadSpriteSheet\n" - " ldr r0, ._2 + 12\n" - " bl LoadSpritePalette\n" - " ldr r0, ._2 + 16\n" - " bl Text_LoadWindowTemplate\n" - " ldr r0, ._2 + 20\n" - " bl InitMenuWindow\n" - " add sp, sp, #0x8\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._3:\n" - " .align 2, 0\n" - "._2:\n" - " .word 0x40000d4\n" - " .word 0x81000800\n" - " .word stru_83F8828\n" - " .word stru_83F8838\n" - " .word gWindowTemplate_81E6C3C\n" - " .word gWindowTemplate_81E6CE4\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C36F4() -{ - asm( - " push {lr}\n" - " bl RunTasks\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " bl UpdatePaletteFade\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C370C() -{ - asm( - " push {lr}\n" - " ldr r0, ._6\n" - " ldrb r1, [r0, #0x7]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._4 @cond_branch\n" - " ldr r0, ._6 + 4\n" - " bl SetMainCallback2\n" - " b ._5\n" - "._7:\n" - " .align 2, 0\n" - "._6:\n" - " .word gPaletteFade\n" - " .word debug_80C36F4+1\n" - "._4:\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " bl UpdatePaletteFade\n" - "._5:\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C373C() -{ - asm( - " push {lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl DestroyTask\n" - " bl ScriptContext2_Disable\n" - " ldr r0, ._8\n" - " bl SetMainCallback2\n" - " pop {r0}\n" - " bx r0\n" - "._9:\n" - " .align 2, 0\n" - "._8:\n" - " .word sub_80546F0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C3758() -{ - asm( - " push {lr}\n" - " bl LoadOam\n" - " bl ProcessSpriteCopyRequests\n" - " bl TransferPlttBuffer\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C376C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " lsl r1, r1, #0x18\n" - " lsr r7, r1, #0x18\n" - " lsl r2, r2, #0x18\n" - " lsr r6, r2, #0x18\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - "._10:\n" - " mov r3, sp\n" - " add r0, r3, r1\n" - " strb r2, [r0]\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " cmp r1, #0x2\n" - " bls ._10 @cond_branch\n" - " mov r1, sp\n" - " mov r0, #0xff\n" - " strb r0, [r1, #0x3]\n" - " mov r4, #0x0\n" - " add r0, r5, #0\n" - " mov r1, #0x64\n" - " bl __udivsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._11 @cond_branch\n" - " mov r1, sp\n" - " add r0, r0, #0xa1\n" - " strb r0, [r1]\n" - " mov r4, #0x1\n" - "._11:\n" - " add r0, r5, #0\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0xa\n" - " bl __udivsi3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._12 @cond_branch\n" - " cmp r4, #0\n" - " beq ._13 @cond_branch\n" - "._12:\n" - " mov r1, sp\n" - " add r0, r0, #0xa1\n" - " strb r0, [r1, #0x1]\n" - "._13:\n" - " mov r4, sp\n" - " add r0, r5, #0\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0xa\n" - " bl __umodsi3\n" - " add r0, r0, #0xa1\n" - " strb r0, [r4, #0x2]\n" - " mov r0, sp\n" - " add r1, r7, #0\n" - " add r2, r6, #0\n" - " bl Menu_PrintText\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C3800() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xfffffff4\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " lsl r1, r1, #0x18\n" - " lsr r6, r1, #0x18\n" - " lsl r2, r2, #0x18\n" - " lsr r5, r2, #0x18\n" - " mov r3, #0x0\n" - " ldr r2, ._18\n" - " mov r1, #0x0\n" - "._14:\n" - " mov r7, sp\n" - " add r0, r7, r3\n" - " strb r1, [r0]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " cmp r3, #0x9\n" - " bls ._14 @cond_branch\n" - " add r1, r7, r3\n" - " mov r0, #0xff\n" - " strb r0, [r1]\n" - " mov r3, #0x0\n" - " mov r0, #0xb\n" - " add r1, r4, #0\n" - " mul r1, r1, r0\n" - " add r0, r1, r2\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._16 @cond_branch\n" - " add r4, r2, #0\n" - " add r2, r1, #0\n" - "._17:\n" - " mov r0, sp\n" - " add r1, r0, r3\n" - " add r0, r3, r2\n" - " add r0, r0, r4\n" - " ldrb r0, [r0]\n" - " strb r0, [r1]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " add r0, r3, r2\n" - " add r0, r0, r4\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._16 @cond_branch\n" - " cmp r3, #0x9\n" - " bls ._17 @cond_branch\n" - "._16:\n" - " mov r0, sp\n" - " add r1, r6, #0\n" - " add r2, r5, #0\n" - " bl Menu_PrintText\n" - " add sp, sp, #0xc\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._19:\n" - " .align 2, 0\n" - "._18:\n" - " .word gSpeciesNames\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C3878() -{ - asm( - " push {lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " cmp r0, #0\n" - " beq ._20 @cond_branch\n" - " cmp r0, #0x1\n" - " beq ._21 @cond_branch\n" - "._20:\n" - " cmp r1, #0x1\n" - " bls ._22 @cond_branch\n" - " sub r0, r1, #1\n" - " b ._23\n" - "._22:\n" - " ldr r1, ._25\n" - " b ._28\n" - "._26:\n" - " .align 2, 0\n" - "._25:\n" - " .word 0x19b\n" - "._21:\n" - " mov r0, #0xcd\n" - " lsl r0, r0, #0x1\n" - " cmp r1, r0\n" - " bhi ._27 @cond_branch\n" - " add r0, r1, #1\n" - "._23:\n" - " lsl r0, r0, #0x10\n" - " lsr r1, r0, #0x10\n" - " b ._28\n" - "._27:\n" - " mov r1, #0x1\n" - "._28:\n" - " add r0, r1, #0\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C38B4() -{ - asm( - " push {lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " lsl r1, r1, #0x10\n" - " lsr r0, r1, #0x10\n" - " cmp r2, #0\n" - " beq ._29 @cond_branch\n" - " cmp r2, #0x1\n" - " beq ._30 @cond_branch\n" - "._29:\n" - " cmp r0, #0\n" - " beq ._31 @cond_branch\n" - " sub r0, r0, #0x1\n" - " b ._32\n" - "._31:\n" - " mov r0, #0x52\n" - " b ._35\n" - "._30:\n" - " cmp r0, #0x51\n" - " bhi ._34 @cond_branch\n" - " add r0, r0, #0x1\n" - "._32:\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " b ._35\n" - "._34:\n" - " mov r0, #0x0\n" - "._35:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C38E4() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r2, #0\n" - " add r5, r3, #0\n" - " ldr r6, [sp, #0x1c]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r8, r0\n" - " lsl r1, r1, #0x18\n" - " lsr r7, r1, #0x18\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " lsl r6, r6, #0x18\n" - " lsr r6, r6, #0x18\n" - " ldr r1, ._37\n" - " mov r0, sp\n" - " mov r2, #0x2\n" - " bl memcpy\n" - " add r0, r7, #0\n" - " add r1, r4, #0\n" - " add r2, r7, #0\n" - " add r3, r5, #0\n" - " bl Menu_BlankWindowRect\n" - " cmp r6, #0\n" - " beq ._36 @cond_branch\n" - " mov r0, sp\n" - " add r1, r7, #0\n" - " mov r2, r8\n" - " bl Menu_PrintText\n" - "._36:\n" - " add sp, sp, #0x4\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._38:\n" - " .align 2, 0\n" - "._37:\n" - " .word gUnknown_Debug_083F7FD4\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C393C() -{ - asm( - " push {lr}\n" - " ldr r1, ._39\n" - " mov r0, #0x1e\n" - " bl ProgramFlashSectorAndVerify\n" - " pop {r0}\n" - " bx r0\n" - "._40:\n" - " .align 2, 0\n" - "._39:\n" - " .word gUnknown_Debug_083F7FD6\n" - "\n" - ); -} - -__attribute__((naked)) -void InitWatanabeDebugMenu() -{ - asm( - " push {r4, lr}\n" - " ldr r0, ._46\n" - " ldr r1, ._46 + 4\n" - " add r4, r0, r1\n" - " ldrb r0, [r4]\n" - " cmp r0, #0x1\n" - " beq ._41 @cond_branch\n" - " cmp r0, #0x1\n" - " ble ._42 @cond_branch\n" - " cmp r0, #0x2\n" - " beq ._43 @cond_branch\n" - " cmp r0, #0x3\n" - " beq ._44 @cond_branch\n" - "._42:\n" - " bl save_serialize_map\n" - " bl sub_8125E2C\n" - " mov r0, #0x1\n" - " strb r0, [r4]\n" - " b ._51\n" - "._47:\n" - " .align 2, 0\n" - "._46:\n" - " .word gMain\n" - " .word 0x43c\n" - "._41:\n" - " bl sub_8125E6C\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._51 @cond_branch\n" - " b ._49\n" - "._43:\n" - " mov r0, #0x37\n" - " bl PlaySE\n" - "._49:\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " strb r0, [r4]\n" - " b ._51\n" - "._44:\n" - " bl IsSEPlaying\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._51 @cond_branch\n" - " bl ScriptContext2_Disable\n" - " ldr r0, ._52\n" - " bl SetMainCallback2\n" - "._51:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._53:\n" - " .align 2, 0\n" - "._52:\n" - " .word sub_80546F0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void InitSizeComparison() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " bl debug_80C35DC\n" - " ldr r1, ._54\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r0, ._54 + 4\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x1\n" - " mov r2, #0x20\n" - " bl LoadPalette\n" - " ldr r3, ._54 + 8\n" - " ldrh r2, [r3]\n" - " mov r0, #0x0\n" - " strh r0, [r3]\n" - " ldr r4, ._54 + 12\n" - " ldrh r0, [r4]\n" - " mov r1, #0x1\n" - " orr r0, r0, r1\n" - " strh r0, [r4]\n" - " strh r2, [r3]\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x10\n" - " mov r3, #0x0\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._54 + 16\n" - " bl SetVBlankCallback\n" - " ldr r0, ._54 + 20\n" - " bl SetMainCallback2\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x13\n" - " mov r2, #0x8a\n" - " lsl r2, r2, #0x5\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, ._54 + 24\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._54 + 28\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " mov r0, #0xfc\n" - " strh r0, [r1, #0x8]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._55:\n" - " .align 2, 0\n" - "._54:\n" - " .word gReservedSpritePaletteCount\n" - " .word gUnknown_Debug_20389EC\n" - " .word 0x4000208\n" - " .word 0x4000200\n" - " .word debug_80C3758+1\n" - " .word debug_80C370C+1\n" - " .word debug_80C3A50+1\n" - " .word gTasks\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C3A50() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xffffffd8\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._56\n" - " lsl r2, r0, #0x2\n" - " add r0, r2, r0\n" - " lsl r0, r0, #0x3\n" - " add r7, r0, r1\n" - " ldrh r0, [r7, #0x8]\n" - " str r0, [sp, #0x4]\n" - " bl NationalPokedexNumToSpecies\n" - " mov r1, sp\n" - " strh r0, [r1, #0x8]\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x10\n" - " str r2, [sp, #0xc]\n" - " lsr r2, r2, #0x10\n" - " mov r9, r2\n" - " ldr r3, ._56 + 4\n" - " mov r8, r3\n" - " mov r0, #0x6\n" - " mov r1, #0x0\n" - " mov r2, #0x17\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x5\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r5, ._56 + 8\n" - " add r0, r5, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r4, ._56 + 12\n" - " add r0, r4, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, #0x18\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r5, #0\n" - " mov r1, #0x19\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0x19\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " mov r1, #0xa\n" - " mov r2, #0xb\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._56 + 16\n" - " mov r1, #0x1\n" - " mov r2, #0xb\n" - " bl Menu_PrintText\n" - " ldr r0, ._56 + 20\n" - " mov r1, #0x1\n" - " mov r2, #0xd\n" - " bl Menu_PrintText\n" - " ldr r0, ._56 + 24\n" - " mov r1, #0x1\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " ldr r0, ._56 + 28\n" - " mov r1, #0x1\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " mov r0, #0xc\n" - " mov r1, #0xa\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._56 + 32\n" - " mov r1, #0xd\n" - " mov r2, #0xb\n" - " bl Menu_PrintText\n" - " ldr r0, ._56 + 36\n" - " mov r1, #0xd\n" - " mov r2, #0xd\n" - " bl Menu_PrintText\n" - " mov r0, #0xc\n" - " mov r1, #0x10\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._56 + 40\n" - " mov r1, #0xd\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " ldr r0, ._56 + 44\n" - " mov r1, #0x18\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " mov r0, r9\n" - " mov r1, #0x12\n" - " mov r2, #0x11\n" - " bl debug_80C3800\n" - " mov r1, r8\n" - " ldrb r0, [r1, #0x8]\n" - " mov r1, #0x98\n" - " mov r2, #0x28\n" - " mov r3, #0x0\n" - " bl sub_8091A4C\n" - " mov r2, sp\n" - " strh r0, [r2, #0x10]\n" - " add r3, r0, #0\n" - " lsl r3, r3, #0x10\n" - " str r3, [sp, #0x18]\n" - " lsr r0, r3, #0x10\n" - " str r0, [sp, #0x14]\n" - " lsl r4, r0, #0x4\n" - " add r4, r4, r0\n" - " lsl r4, r4, #0x2\n" - " ldr r1, ._56 + 48\n" - " add r4, r4, r1\n" - " ldrb r1, [r4, #0x1]\n" - " mov r2, #0x4\n" - " neg r2, r2\n" - " mov sl, r2\n" - " mov r0, sl\n" - " and r0, r0, r1\n" - " mov r3, #0x1\n" - " orr r0, r0, r3\n" - " strb r0, [r4, #0x1]\n" - " ldrb r1, [r4, #0x3]\n" - " mov r0, #0x3f\n" - " neg r0, r0\n" - " mov r9, r0\n" - " and r0, r0, r1\n" - " mov r1, #0x4\n" - " orr r0, r0, r1\n" - " strb r0, [r4, #0x3]\n" - " ldrb r1, [r4, #0x5]\n" - " sub r2, r2, #0x9\n" - " mov r8, r2\n" - " mov r0, r8\n" - " and r0, r0, r1\n" - " mov r3, #0xf\n" - " and r0, r0, r3\n" - " strb r0, [r4, #0x5]\n" - " mov r0, #0x0\n" - " bl GetSpritePaletteTagByPaletteNum\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl FreeSpritePaletteByTag\n" - " ldr r0, ._56 + 52\n" - " ldr r1, [sp, #0x4]\n" - " lsl r5, r1, #0x3\n" - " add r5, r5, r1\n" - " lsl r5, r5, #0x2\n" - " add r5, r5, r0\n" - " ldrh r6, [r5, #0x20]\n" - " strh r6, [r4, #0x26]\n" - " ldrh r4, [r5, #0x1e]\n" - " str r4, [sp]\n" - " mov r0, #0x2\n" - " add r1, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " bl SetOamMatrix\n" - " mov r2, sp\n" - " ldrh r2, [r2, #0x14]\n" - " strh r2, [r7, #0xe]\n" - " strh r6, [r7, #0x10]\n" - " strh r4, [r7, #0x14]\n" - " ldr r0, [sp, #0x4]\n" - " mov r1, #0x58\n" - " mov r2, #0x28\n" - " mov r3, #0x1\n" - " bl sub_80918EC\n" - " mov r3, sp\n" - " strh r0, [r3, #0x1c]\n" - " lsl r0, r0, #0x10\n" - " str r0, [sp, #0x24]\n" - " lsr r1, r0, #0x10\n" - " str r1, [sp, #0x20]\n" - " lsl r4, r1, #0x4\n" - " add r4, r4, r1\n" - " lsl r4, r4, #0x2\n" - " ldr r2, ._56 + 48\n" - " add r4, r4, r2\n" - " ldrb r0, [r4, #0x1]\n" - " mov r3, sl\n" - " and r3, r3, r0\n" - " mov r0, #0x1\n" - " orr r3, r3, r0\n" - " strb r3, [r4, #0x1]\n" - " ldrb r0, [r4, #0x3]\n" - " mov r1, r9\n" - " and r1, r1, r0\n" - " mov r0, #0x2\n" - " orr r1, r1, r0\n" - " strb r1, [r4, #0x3]\n" - " ldrb r0, [r4, #0x5]\n" - " mov r2, r8\n" - " and r2, r2, r0\n" - " mov r3, #0xf\n" - " and r2, r2, r3\n" - " strb r2, [r4, #0x5]\n" - " mov r0, #0x0\n" - " bl GetSpritePaletteTagByPaletteNum\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl FreeSpritePaletteByTag\n" - " ldrh r0, [r5, #0x1c]\n" - " mov r8, r0\n" - " strh r0, [r4, #0x26]\n" - " ldrh r4, [r5, #0x1a]\n" - " str r4, [sp]\n" - " mov r0, #0x1\n" - " add r1, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " bl SetOamMatrix\n" - " mov r1, sp\n" - " ldrh r1, [r1, #0x20]\n" - " strh r1, [r7, #0xc]\n" - " mov r2, r8\n" - " strh r2, [r7, #0x12]\n" - " strh r4, [r7, #0x16]\n" - " mov r3, #0x0\n" - " strh r3, [r7, #0x18]\n" - " strh r3, [r7, #0x1a]\n" - " ldr r1, ._56 + 56\n" - " ldr r2, ._56 + 60\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " mov r0, #0x1f\n" - " strh r0, [r1]\n" - " ldr r2, ._56 + 64\n" - " mov r3, #0x18\n" - " ldsh r1, [r7, r3]\n" - " lsl r1, r1, #0x6\n" - " add r0, r1, #0\n" - " add r0, r0, #0x38\n" - " lsl r0, r0, #0x8\n" - " add r1, r1, #0x78\n" - " add r0, r0, r1\n" - " strh r0, [r2]\n" - " ldr r1, ._56 + 68\n" - " ldr r2, ._56 + 72\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " sub r1, r1, #0x2\n" - " ldr r3, ._56 + 76\n" - " add r0, r3, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._56 + 80\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0xa\n" - " mov r0, #0xe1\n" - " strh r0, [r1]\n" - " ldr r0, ._56 + 84\n" - " mov r3, #0x0\n" - " strh r3, [r0]\n" - " add r1, r1, #0x4\n" - " mov r0, #0x7\n" - " strh r0, [r1]\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x13\n" - " ldrh r0, [r2]\n" - " mov r3, #0xc0\n" - " lsl r3, r3, #0x7\n" - " add r1, r3, #0\n" - " orr r0, r0, r1\n" - " strh r0, [r2]\n" - " ldr r0, ._56 + 88\n" - " str r0, [r7]\n" - " add sp, sp, #0x28\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._57:\n" - " .align 2, 0\n" - "._56:\n" - " .word gTasks\n" - " .word gSaveBlock2\n" - " .word gUnknown_Debug_083F7FD6+0x4\n" - " .word gUnknown_Debug_083F7FDE\n" - " .word gUnknown_Debug_083F7FE2\n" - " .word gUnknown_Debug_083F7FED\n" - " .word gUnknown_Debug_083F7FF6\n" - " .word gUnknown_Debug_083F8001\n" - " .word gUnknown_Debug_083F800C\n" - " .word gUnknown_Debug_083F8019\n" - " .word gUnknown_Debug_083F8022\n" - " .word gUnknown_Debug_083F8028\n" - " .word gSprites\n" - " .word gPokedexEntries\n" - " .word 0x4000048\n" - " .word 0x3f1f\n" - " .word 0x4000040\n" - " .word 0x4000044\n" - " .word 0x848\n" - " .word 0x31bf\n" - " .word 0x14f\n" - " .word 0x4000052\n" - " .word debug_80C3D2C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C3D2C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " add r7, r6, #0\n" - " ldr r4, ._60\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._58 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._60 + 4\n" - " bl SetMainCallback2\n" - " ldr r1, ._60 + 8\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._60 + 12\n" - " str r1, [r0]\n" - " b ._117\n" - "._61:\n" - " .align 2, 0\n" - "._60:\n" - " .word gMain\n" - " .word debug_80C370C+1\n" - " .word gTasks\n" - " .word debug_80C373C+1\n" - "._58:\n" - " mov r5, #0x1\n" - " add r0, r5, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._62 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._64\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldrh r1, [r0, #0x18]\n" - " mov r2, #0x1\n" - " eor r1, r1, r2\n" - " strh r1, [r0, #0x18]\n" - " b ._117\n" - "._65:\n" - " .align 2, 0\n" - "._64:\n" - " .word gTasks\n" - "._62:\n" - " ldrh r1, [r4, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._66 @cond_branch\n" - " ldr r1, ._70\n" - " lsl r2, r6, #0x2\n" - " add r0, r2, r6\n" - " lsl r0, r0, #0x3\n" - " add r3, r0, r1\n" - " mov r5, #0x18\n" - " ldsh r0, [r3, r5]\n" - " mov r8, r1\n" - " cmp r0, #0\n" - " beq ._67 @cond_branch\n" - " ldrh r1, [r4, #0x2c]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._68 @cond_branch\n" - " ldrh r0, [r3, #0x14]\n" - " add r0, r0, #0x10\n" - " b ._69\n" - "._71:\n" - " .align 2, 0\n" - "._70:\n" - " .word gTasks\n" - "._68:\n" - " ldrh r0, [r3, #0x14]\n" - " add r0, r0, #0x1\n" - "._69:\n" - " strh r0, [r3, #0x14]\n" - " add r0, r2, r7\n" - " lsl r0, r0, #0x3\n" - " mov r2, r8\n" - " add r1, r0, r2\n" - " ldrh r0, [r1, #0x14]\n" - " mov r6, #0x80\n" - " lsl r6, r6, #0x8\n" - " cmp r0, r6\n" - " bhi ._72 @cond_branch\n" - " b ._117\n" - "._72:\n" - " strh r6, [r1, #0x14]\n" - " b ._117\n" - "._67:\n" - " ldrh r1, [r4, #0x2c]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._75 @cond_branch\n" - " ldrh r0, [r3, #0x16]\n" - " add r0, r0, #0x10\n" - " b ._76\n" - "._75:\n" - " ldrh r0, [r3, #0x16]\n" - " add r0, r0, #0x1\n" - "._76:\n" - " strh r0, [r3, #0x16]\n" - " add r0, r2, r7\n" - " lsl r0, r0, #0x3\n" - " mov r4, r8\n" - " add r1, r0, r4\n" - " ldrh r0, [r1, #0x16]\n" - " mov r6, #0x80\n" - " lsl r6, r6, #0x8\n" - " cmp r0, r6\n" - " bhi ._77 @cond_branch\n" - " b ._117\n" - "._77:\n" - " strh r6, [r1, #0x16]\n" - " b ._117\n" - "._66:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._80 @cond_branch\n" - " ldr r1, ._84\n" - " lsl r2, r6, #0x2\n" - " add r0, r2, r6\n" - " lsl r0, r0, #0x3\n" - " add r3, r0, r1\n" - " mov r5, #0x18\n" - " ldsh r0, [r3, r5]\n" - " mov r8, r1\n" - " cmp r0, #0\n" - " beq ._81 @cond_branch\n" - " ldrh r1, [r4, #0x2c]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._82 @cond_branch\n" - " ldrh r0, [r3, #0x14]\n" - " sub r0, r0, #0x10\n" - " b ._83\n" - "._85:\n" - " .align 2, 0\n" - "._84:\n" - " .word gTasks\n" - "._82:\n" - " ldrh r0, [r3, #0x14]\n" - " sub r0, r0, #0x1\n" - "._83:\n" - " strh r0, [r3, #0x14]\n" - " add r0, r2, r7\n" - " lsl r0, r0, #0x3\n" - " mov r2, r8\n" - " add r1, r0, r2\n" - " mov r4, #0x14\n" - " ldsh r0, [r1, r4]\n" - " cmp r0, #0xff\n" - " ble ._86 @cond_branch\n" - " b ._117\n" - "._86:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " strh r0, [r1, #0x14]\n" - " b ._117\n" - "._81:\n" - " ldrh r1, [r4, #0x2c]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._89 @cond_branch\n" - " ldrh r0, [r3, #0x16]\n" - " sub r0, r0, #0x10\n" - " b ._90\n" - "._89:\n" - " ldrh r0, [r3, #0x16]\n" - " sub r0, r0, #0x1\n" - "._90:\n" - " strh r0, [r3, #0x16]\n" - " add r0, r2, r7\n" - " lsl r0, r0, #0x3\n" - " mov r5, r8\n" - " add r1, r0, r5\n" - " mov r2, #0x16\n" - " ldsh r0, [r1, r2]\n" - " cmp r0, #0xff\n" - " ble ._91 @cond_branch\n" - " b ._117\n" - "._91:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " strh r0, [r1, #0x16]\n" - " b ._117\n" - "._80:\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._94 @cond_branch\n" - " ldr r0, ._97\n" - " lsl r1, r6, #0x2\n" - " add r1, r1, r6\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " mov r4, #0x18\n" - " ldsh r0, [r1, r4]\n" - " cmp r0, #0\n" - " beq ._95 @cond_branch\n" - " ldrh r0, [r1, #0x10]\n" - " sub r0, r0, #0x1\n" - " strh r0, [r1, #0x10]\n" - " b ._117\n" - "._98:\n" - " .align 2, 0\n" - "._97:\n" - " .word gTasks\n" - "._95:\n" - " ldrh r0, [r1, #0x12]\n" - " sub r0, r0, #0x1\n" - " strh r0, [r1, #0x12]\n" - " b ._117\n" - "._94:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._100 @cond_branch\n" - " ldr r0, ._103\n" - " lsl r1, r6, #0x2\n" - " add r1, r1, r6\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " mov r5, #0x18\n" - " ldsh r0, [r1, r5]\n" - " cmp r0, #0\n" - " beq ._101 @cond_branch\n" - " ldrh r0, [r1, #0x10]\n" - " add r0, r0, #0x1\n" - " strh r0, [r1, #0x10]\n" - " b ._117\n" - "._104:\n" - " .align 2, 0\n" - "._103:\n" - " .word gTasks\n" - "._101:\n" - " ldrh r0, [r1, #0x12]\n" - " add r0, r0, #0x1\n" - " strh r0, [r1, #0x12]\n" - " b ._117\n" - "._100:\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._106 @cond_branch\n" - " ldr r2, ._109\n" - " lsl r3, r6, #0x2\n" - " add r0, r3, r6\n" - " lsl r0, r0, #0x3\n" - " add r6, r0, r2\n" - " ldrh r4, [r6, #0x8]\n" - " mov r0, #0x8\n" - " ldsh r1, [r6, r0]\n" - " ldr r0, ._109 + 4\n" - " mov r8, r2\n" - " add r2, r3, #0\n" - " cmp r1, r0\n" - " bgt ._107 @cond_branch\n" - " add r0, r4, #1\n" - " strh r0, [r6, #0x8]\n" - " b ._108\n" - "._110:\n" - " .align 2, 0\n" - "._109:\n" - " .word gTasks\n" - " .word 0x181\n" - "._107:\n" - " strh r5, [r6, #0x8]\n" - "._108:\n" - " add r4, r2, r7\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r8\n" - " mov r2, #0xc\n" - " ldsh r1, [r4, r2]\n" - " b ._111\n" - "._106:\n" - " mov r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._112 @cond_branch\n" - " ldr r1, ._115\n" - " lsl r2, r6, #0x2\n" - " add r0, r2, r6\n" - " lsl r0, r0, #0x3\n" - " add r3, r0, r1\n" - " ldrh r6, [r3, #0x8]\n" - " mov r4, #0x8\n" - " ldsh r0, [r3, r4]\n" - " mov r8, r1\n" - " cmp r0, #0x1\n" - " ble ._113 @cond_branch\n" - " sub r0, r6, #1\n" - " b ._114\n" - "._116:\n" - " .align 2, 0\n" - "._115:\n" - " .word gTasks\n" - "._113:\n" - " mov r0, #0xc1\n" - " lsl r0, r0, #0x1\n" - "._114:\n" - " strh r0, [r3, #0x8]\n" - " add r4, r2, r7\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r8\n" - " mov r5, #0xc\n" - " ldsh r1, [r4, r5]\n" - "._111:\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " ldr r5, ._118\n" - " add r0, r0, r5\n" - " bl DestroySprite\n" - " mov r0, #0xe\n" - " ldsh r1, [r4, r0]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r5\n" - " bl DestroySprite\n" - " ldr r0, ._118 + 4\n" - " str r0, [r4]\n" - " b ._117\n" - "._119:\n" - " .align 2, 0\n" - "._118:\n" - " .word gSprites\n" - " .word debug_80C3A50+1\n" - "._112:\n" - " ldr r0, ._120\n" - " lsl r5, r7, #0x2\n" - " add r5, r5, r7\n" - " lsl r5, r5, #0x3\n" - " add r5, r5, r0\n" - " ldrh r4, [r5, #0x16]\n" - " ldrh r6, [r5, #0x12]\n" - " str r4, [sp]\n" - " mov r0, #0x1\n" - " add r1, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " bl SetOamMatrix\n" - " add r0, r4, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x3\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " add r0, r6, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x7\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " ldr r2, ._120 + 4\n" - " mov r8, r2\n" - " mov r4, #0xc\n" - " ldsh r1, [r5, r4]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r8\n" - " strh r6, [r0, #0x26]\n" - " ldrh r4, [r5, #0x14]\n" - " ldrh r6, [r5, #0x10]\n" - " str r4, [sp]\n" - " mov r0, #0x2\n" - " add r1, r4, #0\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " bl SetOamMatrix\n" - " add r0, r4, #0\n" - " mov r1, #0x19\n" - " mov r2, #0x3\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " add r0, r6, #0\n" - " mov r1, #0x19\n" - " mov r2, #0x7\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " mov r0, #0xe\n" - " ldsh r1, [r5, r0]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r8\n" - " strh r6, [r0, #0x26]\n" - " ldr r2, ._120 + 8\n" - " mov r4, #0x18\n" - " ldsh r1, [r5, r4]\n" - " lsl r1, r1, #0x6\n" - " add r0, r1, #0\n" - " add r0, r0, #0x38\n" - " lsl r0, r0, #0x8\n" - " add r1, r1, #0x78\n" - " add r0, r0, r1\n" - " strh r0, [r2]\n" - "._117:\n" - " add sp, sp, #0x4\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._121:\n" - " .align 2, 0\n" - "._120:\n" - " .word gTasks\n" - " .word gSprites\n" - " .word 0x4000040\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C405C() -{ - asm( - " push {r4, r5, lr}\n" - " add r4, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r5, r1, #0x10\n" - " mov r2, #0x0\n" - " mov r1, #0x0\n" - "._122:\n" - " add r0, r4, r2\n" - " strb r1, [r0]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x9\n" - " bls ._122 @cond_branch\n" - " add r0, r4, r2\n" - " mov r1, #0xff\n" - " strb r1, [r0]\n" - " mov r0, #0xae\n" - " strb r0, [r4]\n" - " cmp r5, #0\n" - " beq ._125 @cond_branch\n" - " mov r2, #0x0\n" - " ldr r3, ._127\n" - " mov r0, #0xb\n" - " add r1, r5, #0\n" - " mul r1, r1, r0\n" - " add r0, r1, r3\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._125 @cond_branch\n" - " add r5, r3, #0\n" - " add r3, r1, #0\n" - "._126:\n" - " add r1, r4, r2\n" - " add r0, r2, r3\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " strb r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " add r0, r2, r3\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._125 @cond_branch\n" - " cmp r2, #0x9\n" - " bls ._126 @cond_branch\n" - "._125:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._128:\n" - " .align 2, 0\n" - "._127:\n" - " .word gSpeciesNames\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C40C4() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " mov r5, #0x0\n" - " mov r6, sp\n" - "._135:\n" - " cmp r7, #0\n" - " beq ._129 @cond_branch\n" - " mov r0, #0x64\n" - " add r1, r5, #0\n" - " mul r1, r1, r0\n" - " ldr r0, ._132\n" - " add r4, r1, r0\n" - " add r0, r4, #0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " beq ._134 @cond_branch\n" - " add r0, r4, #0\n" - " bl CalculateMonStats\n" - " add r0, r4, #0\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " strh r0, [r6]\n" - " add r0, r4, #0\n" - " mov r1, #0x39\n" - " mov r2, sp\n" - " bl SetMonData\n" - " b ._134\n" - "._133:\n" - " .align 2, 0\n" - "._132:\n" - " .word gEnemyParty\n" - "._129:\n" - " mov r0, #0x64\n" - " add r1, r5, #0\n" - " mul r1, r1, r0\n" - " ldr r0, ._136\n" - " add r4, r1, r0\n" - " add r0, r4, #0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " beq ._134 @cond_branch\n" - " add r0, r4, #0\n" - " bl CalculateMonStats\n" - " add r0, r4, #0\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " strh r0, [r6]\n" - " add r0, r4, #0\n" - " mov r1, #0x39\n" - " mov r2, sp\n" - " bl SetMonData\n" - "._134:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x5\n" - " bls ._135 @cond_branch\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._137:\n" - " .align 2, 0\n" - "._136:\n" - " .word gPlayerParty\n" - "\n" - ); -} - -__attribute__((naked)) -void InitBattleForDebug() -{ - asm( - " push {lr}\n" - " bl SavePlayerParty\n" - " ldr r1, ._138\n" - " ldr r0, ._138 + 4\n" - " ldrb r2, [r0, #0x8]\n" - " mov r0, #0x0\n" - " strb r2, [r1, #0xd]\n" - " strb r0, [r1]\n" - " strb r0, [r1, #0x1]\n" - " strb r0, [r1, #0x2]\n" - " strb r0, [r1, #0x3]\n" - " strb r0, [r1, #0x4]\n" - " strb r0, [r1, #0x5]\n" - " strb r0, [r1, #0x6]\n" - " strb r0, [r1, #0x7]\n" - " strb r0, [r1, #0x8]\n" - " strb r0, [r1, #0xc]\n" - " ldr r1, ._138 + 8\n" - " str r0, [r1]\n" - " bl ZeroPlayerPartyMons\n" - " bl ZeroEnemyPartyMons\n" - " mov r0, #0x0\n" - " bl debug_80C4214\n" - " ldr r0, ._138 + 12\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " pop {r0}\n" - " bx r0\n" - "._139:\n" - " .align 2, 0\n" - "._138:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gSaveBlock2\n" - " .word byte_3005E30\n" - " .word debug_80C47BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C41A8() -{ - asm( - " push {lr}\n" - " ldr r1, ._140\n" - " mov r0, #0x0\n" - " strb r0, [r1, #0x1]\n" - " strb r0, [r1, #0x2]\n" - " bl ZeroPlayerPartyMons\n" - " bl ZeroEnemyPartyMons\n" - " mov r0, #0x0\n" - " bl debug_80C4214\n" - " ldr r0, ._140 + 4\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " pop {r0}\n" - " bx r0\n" - "._141:\n" - " .align 2, 0\n" - "._140:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word debug_80C47BC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C41D4() -{ - asm( - " push {lr}\n" - " mov r0, #0x0\n" - " bl debug_80C40C4\n" - " mov r0, #0x0\n" - " bl debug_80C4214\n" - " ldr r0, ._142\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " pop {r0}\n" - " bx r0\n" - "._143:\n" - " .align 2, 0\n" - "._142:\n" - " .word debug_80C42B8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C41F4() -{ - asm( - " push {lr}\n" - " mov r0, #0x1\n" - " bl debug_80C40C4\n" - " mov r0, #0x1\n" - " bl debug_80C4214\n" - " ldr r0, ._144\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " pop {r0}\n" - " bx r0\n" - "._145:\n" - " .align 2, 0\n" - "._144:\n" - " .word debug_80C42B8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4214() -{ - asm( - " push {r4, r5, r6, lr}\n" - " bl debug_80C35DC\n" - " ldr r6, ._146\n" - " mov r4, #0x0\n" - " strh r4, [r6]\n" - " ldr r5, ._146 + 4\n" - " strh r4, [r5]\n" - " ldr r0, ._146 + 8\n" - " strh r4, [r0]\n" - " add r0, r0, #0x4\n" - " strh r4, [r0]\n" - " ldr r1, ._146 + 12\n" - " ldr r2, ._146 + 16\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " mov r0, #0x31\n" - " strh r0, [r1]\n" - " add r1, r1, #0x6\n" - " mov r0, #0xe1\n" - " strh r0, [r1]\n" - " ldr r0, ._146 + 20\n" - " strh r4, [r0]\n" - " add r1, r1, #0x4\n" - " mov r0, #0x7\n" - " strh r0, [r1]\n" - " ldr r3, ._146 + 24\n" - " ldrh r2, [r3]\n" - " strh r4, [r3]\n" - " ldr r4, ._146 + 28\n" - " ldrh r0, [r4]\n" - " mov r1, #0x1\n" - " orr r0, r0, r1\n" - " strh r0, [r4]\n" - " strh r2, [r3]\n" - " ldr r0, ._146 + 32\n" - " bl SetVBlankCallback\n" - " ldr r0, ._146 + 36\n" - " bl SetMainCallback2\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x13\n" - " ldr r2, ._146 + 40\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._146 + 44\n" - " add r0, r1, #0\n" - " strh r0, [r6]\n" - " ldr r2, ._146 + 48\n" - " add r0, r2, #0\n" - " strh r0, [r5]\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._147:\n" - " .align 2, 0\n" - "._146:\n" - " .word 0x4000040\n" - " .word 0x4000044\n" - " .word 0x4000042\n" - " .word 0x4000048\n" - " .word 0x1111\n" - " .word 0x4000052\n" - " .word 0x4000208\n" - " .word 0x4000200\n" - " .word debug_80C3758+1\n" - " .word debug_80C370C+1\n" - " .word 0x7140\n" - " .word 0x1ef\n" - " .word 0x819f\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C42B8() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xffffffe4\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " ldr r1, ._150\n" - " mov r0, sp\n" - " mov r2, #0xc\n" - " bl memcpy\n" - " add r4, sp, #0xc\n" - " ldr r1, ._150 + 4\n" - " add r0, r4, #0\n" - " mov r2, #0xd\n" - " bl memcpy\n" - " mov r0, #0x0\n" - " mov r1, #0x10\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, sp\n" - " mov r1, #0x1\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0x14\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " bl debug_80C4694\n" - " bl debug_80C4704\n" - " ldr r0, ._150 + 8\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._148 @cond_branch\n" - " ldr r0, ._150 + 12\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._150 + 16\n" - " b ._149\n" - "._151:\n" - " .align 2, 0\n" - "._150:\n" - " .word gUnknown_Debug_083F8194\n" - " .word gUnknown_Debug_083F81A0\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gTasks\n" - " .word debug_80C44EC+1\n" - "._148:\n" - " ldr r0, ._152\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._152 + 4\n" - "._149:\n" - " str r0, [r1]\n" - " add sp, sp, #0x1c\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._153:\n" - " .align 2, 0\n" - "._152:\n" - " .word gTasks\n" - " .word debug_80C4348+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4348() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r0, ._154\n" - " ldrb r0, [r0, #0x1]\n" - " lsl r0, r0, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r0, r0, r1\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " str r1, [sp]\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r1, ._154 + 4\n" - " ldr r2, ._154 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " add r2, r2, #0x8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._154 + 12\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._154 + 16\n" - " str r1, [r0]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._155:\n" - " .align 2, 0\n" - "._154:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word 0x4000042\n" - " .word 0x177\n" - " .word gTasks\n" - " .word debug_80C43A8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C43A8() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r1, ._158\n" - " ldrh r2, [r1, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r2\n" - " add r3, r1, #0\n" - " cmp r0, #0\n" - " beq ._156 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._158 + 4\n" - " ldrb r1, [r0, #0x1]\n" - " mov r0, #0x64\n" - " mul r0, r0, r1\n" - " ldr r1, ._158 + 8\n" - " add r0, r0, r1\n" - " ldr r1, ._158 + 12\n" - " bl debug_sub_80A433C\n" - " add r0, r4, #0\n" - " bl DestroyTask\n" - " b ._180\n" - "._159:\n" - " .align 2, 0\n" - "._158:\n" - " .word gMain\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gPlayerParty\n" - " .word debug_80C41D4+1\n" - "._156:\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._160 @cond_branch\n" - " ldr r0, ._162\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._162 + 4\n" - " str r0, [r1]\n" - " b ._180\n" - "._163:\n" - " .align 2, 0\n" - "._162:\n" - " .word gTasks\n" - " .word debug_80C4F48+1\n" - "._160:\n" - " mov r0, #0x8\n" - " and r0, r0, r2\n" - " lsl r0, r0, #0x10\n" - " lsr r1, r0, #0x10\n" - " cmp r1, #0\n" - " beq ._164 @cond_branch\n" - " bl debug_80C4774\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._180 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " bl CalculatePlayerPartyCount\n" - " bl CalculateEnemyPartyCount\n" - " ldr r0, ._167\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._167 + 4\n" - " str r0, [r1]\n" - " b ._180\n" - "._168:\n" - " .align 2, 0\n" - "._167:\n" - " .word gTasks\n" - " .word debug_80C4D14+1\n" - "._164:\n" - " mov r0, #0x88\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._169 @cond_branch\n" - " str r1, [sp]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r0, ._171\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._171 + 4\n" - " str r0, [r1]\n" - " b ._180\n" - "._172:\n" - " .align 2, 0\n" - "._171:\n" - " .word gTasks\n" - " .word debug_80C44EC+1\n" - "._169:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._174 @cond_branch\n" - " ldr r1, ._176\n" - " ldrb r0, [r1, #0x1]\n" - " cmp r0, #0\n" - " beq ._174 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1, #0x1]\n" - " b ._175\n" - "._177:\n" - " .align 2, 0\n" - "._176:\n" - " .word gUnknown_Debug_2038A0C\n" - "._174:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._180 @cond_branch\n" - " ldr r5, ._181\n" - " ldrb r0, [r5, #0x1]\n" - " cmp r0, #0x4\n" - " bhi ._180 @cond_branch\n" - " add r1, r0, #0\n" - " mov r0, #0x64\n" - " mul r0, r0, r1\n" - " ldr r1, ._181 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " beq ._180 @cond_branch\n" - " ldrb r0, [r5, #0x1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r5, #0x1]\n" - "._175:\n" - " ldr r1, ._181 + 8\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._181 + 12\n" - " str r1, [r0]\n" - "._180:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._182:\n" - " .align 2, 0\n" - "._181:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gPlayerParty\n" - " .word gTasks\n" - " .word debug_80C4348+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C44EC() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r0, ._183\n" - " ldrb r0, [r0, #0x2]\n" - " lsl r0, r0, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r0, r0, r1\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " str r1, [sp]\n" - " mov r1, #0x10\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r1, ._183 + 4\n" - " ldr r2, ._183 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._183 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._183 + 16\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._183 + 20\n" - " str r1, [r0]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._184:\n" - " .align 2, 0\n" - "._183:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word 0x4000042\n" - " .word 0x79ef\n" - " .word 0x17f\n" - " .word gTasks\n" - " .word debug_80C4550+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4550() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r1, ._187\n" - " ldrh r2, [r1, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r2\n" - " add r3, r1, #0\n" - " cmp r0, #0\n" - " beq ._185 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._187 + 4\n" - " ldrb r1, [r0, #0x2]\n" - " mov r0, #0x64\n" - " mul r0, r0, r1\n" - " ldr r1, ._187 + 8\n" - " add r0, r0, r1\n" - " ldr r1, ._187 + 12\n" - " bl debug_sub_80A433C\n" - " add r0, r4, #0\n" - " bl DestroyTask\n" - " b ._209\n" - "._188:\n" - " .align 2, 0\n" - "._187:\n" - " .word gMain\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gEnemyParty\n" - " .word debug_80C41F4+1\n" - "._185:\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._189 @cond_branch\n" - " ldr r0, ._191\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._191 + 4\n" - " str r0, [r1]\n" - " b ._209\n" - "._192:\n" - " .align 2, 0\n" - "._191:\n" - " .word gTasks\n" - " .word debug_80C4F48+1\n" - "._189:\n" - " mov r0, #0x8\n" - " and r0, r0, r2\n" - " lsl r0, r0, #0x10\n" - " lsr r1, r0, #0x10\n" - " cmp r1, #0\n" - " beq ._193 @cond_branch\n" - " bl debug_80C4774\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._209 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " bl CalculatePlayerPartyCount\n" - " bl CalculateEnemyPartyCount\n" - " ldr r0, ._196\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._196 + 4\n" - " str r0, [r1]\n" - " b ._209\n" - "._197:\n" - " .align 2, 0\n" - "._196:\n" - " .word gTasks\n" - " .word debug_80C4D14+1\n" - "._193:\n" - " mov r0, #0x88\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._198 @cond_branch\n" - " str r1, [sp]\n" - " mov r0, #0x0\n" - " mov r1, #0x10\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r0, ._200\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._200 + 4\n" - " str r0, [r1]\n" - " b ._209\n" - "._201:\n" - " .align 2, 0\n" - "._200:\n" - " .word gTasks\n" - " .word debug_80C4348+1\n" - "._198:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._203 @cond_branch\n" - " ldr r1, ._205\n" - " ldrb r0, [r1, #0x2]\n" - " cmp r0, #0\n" - " beq ._203 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1, #0x2]\n" - " b ._204\n" - "._206:\n" - " .align 2, 0\n" - "._205:\n" - " .word gUnknown_Debug_2038A0C\n" - "._203:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._209 @cond_branch\n" - " ldr r5, ._210\n" - " ldrb r0, [r5, #0x2]\n" - " cmp r0, #0x4\n" - " bhi ._209 @cond_branch\n" - " add r1, r0, #0\n" - " mov r0, #0x64\n" - " mul r0, r0, r1\n" - " ldr r1, ._210 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " beq ._209 @cond_branch\n" - " ldrb r0, [r5, #0x2]\n" - " add r0, r0, #0x1\n" - " strb r0, [r5, #0x2]\n" - "._204:\n" - " ldr r1, ._210 + 8\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._210 + 12\n" - " str r1, [r0]\n" - "._209:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._211:\n" - " .align 2, 0\n" - "._210:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gEnemyParty\n" - " .word gTasks\n" - " .word debug_80C44EC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4694() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xffffffe4\n" - " ldr r1, ._213\n" - " mov r0, sp\n" - " mov r2, #0xd\n" - " bl memcpy\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xe\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, sp\n" - " mov r1, #0x2\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r4, #0x0\n" - " add r5, sp, #0x10\n" - "._212:\n" - " mov r0, #0x64\n" - " mul r0, r0, r4\n" - " ldr r1, ._213 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r5, #0\n" - " bl debug_80C405C\n" - " lsl r2, r4, #0x19\n" - " mov r0, #0xc0\n" - " lsl r0, r0, #0x12\n" - " add r2, r2, r0\n" - " lsr r2, r2, #0x18\n" - " add r0, r5, #0\n" - " mov r1, #0x2\n" - " bl Menu_PrintText\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x5\n" - " bls ._212 @cond_branch\n" - " add sp, sp, #0x1c\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._214:\n" - " .align 2, 0\n" - "._213:\n" - " .word gUnknown_Debug_083F81AD\n" - " .word gPlayerParty\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4704() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xffffffe4\n" - " ldr r1, ._216\n" - " mov r0, sp\n" - " mov r2, #0xd\n" - " bl memcpy\n" - " mov r0, #0xf\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, sp\n" - " mov r1, #0x11\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r4, #0x0\n" - " add r5, sp, #0x10\n" - "._215:\n" - " mov r0, #0x64\n" - " mul r0, r0, r4\n" - " ldr r1, ._216 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r5, #0\n" - " bl debug_80C405C\n" - " lsl r2, r4, #0x19\n" - " mov r0, #0xc0\n" - " lsl r0, r0, #0x12\n" - " add r2, r2, r0\n" - " lsr r2, r2, #0x18\n" - " add r0, r5, #0\n" - " mov r1, #0x11\n" - " bl Menu_PrintText\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x5\n" - " bls ._215 @cond_branch\n" - " add sp, sp, #0x1c\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._217:\n" - " .align 2, 0\n" - "._216:\n" - " .word gUnknown_Debug_083F81BA\n" - " .word gEnemyParty\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4774() -{ - asm( - " push {r4, lr}\n" - " ldr r0, ._221\n" - " ldrb r0, [r0, #0xc]\n" - " sub r0, r0, #0x1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x64\n" - " add r4, r0, #0\n" - " mul r4, r4, r1\n" - " ldr r0, ._221 + 4\n" - " add r0, r4, r0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " beq ._219 @cond_branch\n" - " ldr r0, ._221 + 8\n" - " add r0, r4, r0\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " beq ._219 @cond_branch\n" - " mov r0, #0x1\n" - " b ._220\n" - "._222:\n" - " .align 2, 0\n" - "._221:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gPlayerParty\n" - " .word gEnemyParty\n" - "._219:\n" - " mov r0, #0x0\n" - "._220:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C47BC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xffffffc0\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " ldr r1, ._224\n" - " mov r0, sp\n" - " mov r2, #0xf\n" - " bl memcpy\n" - " add r4, sp, #0x10\n" - " ldr r1, ._224 + 4\n" - " add r0, r4, #0\n" - " mov r2, #0xd\n" - " bl memcpy\n" - " add r6, sp, #0x20\n" - " ldr r1, ._224 + 8\n" - " add r0, r6, #0\n" - " mov r2, #0xf\n" - " bl memcpy\n" - " add r5, sp, #0x30\n" - " ldr r1, ._224 + 12\n" - " add r0, r5, #0\n" - " mov r2, #0x10\n" - " bl memcpy\n" - " mov r0, #0x0\n" - " mov r1, #0x10\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, sp\n" - " mov r1, #0x1\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0x14\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xe\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r6, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r4, #0x0\n" - " ldr r6, ._224 + 16\n" - "._223:\n" - " lsl r0, r4, #0x3\n" - " add r0, r0, r6\n" - " ldr r0, [r0]\n" - " lsl r2, r4, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r2, r2, r1\n" - " lsr r2, r2, #0x18\n" - " mov r1, #0x2\n" - " bl Menu_PrintText\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x4\n" - " bls ._223 @cond_branch\n" - " mov r0, #0xf\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r5, #0\n" - " mov r1, #0x11\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._224 + 20\n" - " ldrb r0, [r0, #0x4]\n" - " bl debug_80C4C44\n" - " ldr r1, ._224 + 24\n" - " lsl r0, r7, #0x2\n" - " add r0, r0, r7\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._224 + 28\n" - " str r1, [r0]\n" - " add sp, sp, #0x40\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._225:\n" - " .align 2, 0\n" - "._224:\n" - " .word gUnknown_Debug_083F81C7\n" - " .word gUnknown_Debug_083F81A0\n" - " .word gUnknown_Debug_083F81D6\n" - " .word gUnknown_Debug_083F81E5\n" - " .word gUnknown_Debug_083F8068\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gTasks\n" - " .word debug_80C48A0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C48A0() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r0, ._226\n" - " ldrb r0, [r0, #0x3]\n" - " lsl r0, r0, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r0, r0, r1\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " str r1, [sp]\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r1, ._226 + 4\n" - " ldr r2, ._226 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " add r2, r2, #0x8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._226 + 12\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._226 + 16\n" - " str r1, [r0]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._227:\n" - " .align 2, 0\n" - "._226:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word 0x4000042\n" - " .word 0x177\n" - " .word gTasks\n" - " .word debug_80C4900+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4900() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " ldr r1, ._230\n" - " ldrh r2, [r1, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " add r3, r1, #0\n" - " cmp r4, #0\n" - " beq ._228 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._230 + 4\n" - " bl SetMainCallback2\n" - " bl LoadPlayerParty\n" - " ldr r1, ._230 + 8\n" - " ldr r0, ._230 + 12\n" - " ldrb r0, [r0, #0xd]\n" - " strb r0, [r1, #0x8]\n" - " ldr r0, ._230 + 16\n" - " mov r1, #0x0\n" - " strh r4, [r0]\n" - " ldr r0, ._230 + 20\n" - " strb r1, [r0]\n" - " ldr r1, ._230 + 24\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._230 + 28\n" - " b ._229\n" - "._231:\n" - " .align 2, 0\n" - "._230:\n" - " .word gMain\n" - " .word debug_80C370C+1\n" - " .word gSaveBlock2\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gBattleTypeFlags\n" - " .word gUnknown_02023A14_50\n" - " .word gTasks\n" - " .word debug_80C373C+1\n" - "._228:\n" - " mov r0, #0x8\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " bne ._232 @cond_branch\n" - " mov r0, #0x1\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._233 @cond_branch\n" - "._232:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._236\n" - " ldr r3, ._236 + 4\n" - " ldr r2, ._236 + 8\n" - " ldrb r0, [r2, #0x3]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r3\n" - " ldrb r0, [r0, #0x4]\n" - " strh r0, [r1]\n" - " ldr r1, ._236 + 12\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " ldrb r0, [r2, #0x3]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r3\n" - " ldrb r0, [r0, #0x5]\n" - " strb r0, [r2, #0xc]\n" - " ldrb r0, [r2, #0x3]\n" - " sub r0, r0, #0x1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bhi ._234 @cond_branch\n" - " str r4, [sp]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r0, ._236 + 16\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._236 + 20\n" - " str r0, [r1]\n" - " b ._247\n" - "._237:\n" - " .align 2, 0\n" - "._236:\n" - " .word gBattleTypeFlags\n" - " .word gUnknown_Debug_083F8068\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gUnknown_02023A14_50\n" - " .word gTasks\n" - " .word debug_80C4A60+1\n" - "._234:\n" - " ldr r0, ._239\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._239 + 4\n" - " str r0, [r1]\n" - " b ._247\n" - "._240:\n" - " .align 2, 0\n" - "._239:\n" - " .word gTasks\n" - " .word debug_80C4F48+1\n" - "._233:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._242 @cond_branch\n" - " ldr r1, ._244\n" - " ldrb r0, [r1, #0x3]\n" - " cmp r0, #0\n" - " beq ._242 @cond_branch\n" - " sub r0, r0, #0x1\n" - " b ._243\n" - "._245:\n" - " .align 2, 0\n" - "._244:\n" - " .word gUnknown_Debug_2038A0C\n" - "._242:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._247 @cond_branch\n" - " ldr r1, ._248\n" - " ldrb r0, [r1, #0x3]\n" - " cmp r0, #0x1\n" - " bhi ._247 @cond_branch\n" - " add r0, r0, #0x1\n" - "._243:\n" - " strb r0, [r1, #0x3]\n" - " ldr r1, ._248 + 4\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._248 + 8\n" - "._229:\n" - " str r1, [r0]\n" - "._247:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._249:\n" - " .align 2, 0\n" - "._248:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gTasks\n" - " .word debug_80C48A0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4A60() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r0, ._250\n" - " ldrb r0, [r0, #0x5]\n" - " lsl r0, r0, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r0, r0, r1\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " str r1, [sp]\n" - " mov r1, #0x10\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r1, ._250 + 4\n" - " ldr r2, ._250 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._250 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._250 + 16\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._250 + 20\n" - " str r1, [r0]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._251:\n" - " .align 2, 0\n" - "._250:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word 0x4000042\n" - " .word 0x79ef\n" - " .word 0x17f\n" - " .word gTasks\n" - " .word debug_80C4AC4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4AC4() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " ldr r7, ._255\n" - " ldrb r0, [r7, #0x4]\n" - " mov ip, r0\n" - " ldrb r5, [r7, #0x5]\n" - " mov r1, ip\n" - " add r0, r1, r5\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " ldr r2, ._255 + 4\n" - " mov r8, r2\n" - " ldrh r2, [r2, #0x2e]\n" - " mov r3, #0x1\n" - " and r3, r3, r2\n" - " add r4, r7, #0\n" - " cmp r3, #0\n" - " beq ._252 @cond_branch\n" - " ldr r0, ._255 + 8\n" - " lsl r1, r1, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r1, [r1]\n" - " ldr r3, ._255 + 12\n" - " ldr r2, [r3]\n" - " add r0, r2, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._253 @cond_branch\n" - " ldr r0, ._255 + 16\n" - " eor r1, r1, r0\n" - " and r2, r2, r1\n" - " b ._254\n" - "._256:\n" - " .align 2, 0\n" - "._255:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gMain\n" - " .word gUnknown_Debug_083F80D8\n" - " .word byte_3005E30\n" - " .word 0xffff\n" - "._253:\n" - " orr r2, r2, r1\n" - "._254:\n" - " str r2, [r3]\n" - " ldrb r0, [r4, #0x4]\n" - " bl debug_80C4C44\n" - " ldr r1, ._258\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._258 + 4\n" - " str r1, [r0]\n" - " b ._274\n" - "._259:\n" - " .align 2, 0\n" - "._258:\n" - " .word gTasks\n" - " .word debug_80C4A60+1\n" - "._252:\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " cmp r4, #0\n" - " beq ._260 @cond_branch\n" - " str r3, [sp]\n" - " mov r0, #0x0\n" - " mov r1, #0x10\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r0, ._262\n" - " lsl r1, r6, #0x2\n" - " add r1, r1, r6\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._262 + 4\n" - " b ._261\n" - "._263:\n" - " .align 2, 0\n" - "._262:\n" - " .word gTasks\n" - " .word debug_80C48A0+1\n" - "._260:\n" - " mov r0, #0x8\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._264 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._266\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x3\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._266 + 4\n" - " ldrb r2, [r1, #0x1]\n" - " mov r0, #0x11\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " strb r0, [r1, #0x1]\n" - " mov r0, #0xac\n" - " strb r0, [r1, #0x2]\n" - " mov r0, #0xff\n" - " strb r0, [r1, #0x3]\n" - " strb r4, [r1, #0x9]\n" - " strb r4, [r1, #0xa]\n" - " strb r4, [r1, #0xb]\n" - " strb r4, [r1, #0xc]\n" - " ldr r1, ._266 + 8\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._266 + 12\n" - " str r1, [r0]\n" - " b ._274\n" - "._267:\n" - " .align 2, 0\n" - "._266:\n" - " .word gTrainerBattleOpponent\n" - " .word +0x2017000\n" - " .word gTasks\n" - " .word debug_80C4F48+1\n" - "._264:\n" - " mov r0, r8\n" - " ldrh r1, [r0, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._268 @cond_branch\n" - " lsl r0, r5, #0x18\n" - " cmp r0, #0\n" - " beq ._269 @cond_branch\n" - " sub r0, r5, #1\n" - " strb r0, [r7, #0x5]\n" - " b ._277\n" - "._269:\n" - " mov r1, ip\n" - " lsl r0, r1, #0x18\n" - " cmp r0, #0\n" - " beq ._277 @cond_branch\n" - " mov r0, ip\n" - " sub r0, r0, #0x1\n" - " b ._272\n" - "._268:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._274 @cond_branch\n" - " lsl r0, r5, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x8\n" - " bhi ._274 @cond_branch\n" - " cmp r0, #0x4\n" - " bhi ._275 @cond_branch\n" - " add r0, r5, #1\n" - " strb r0, [r7, #0x5]\n" - " b ._277\n" - "._275:\n" - " mov r2, ip\n" - " lsl r0, r2, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x3\n" - " bhi ._277 @cond_branch\n" - " mov r0, ip\n" - " add r0, r0, #0x1\n" - "._272:\n" - " strb r0, [r7, #0x4]\n" - " ldrb r0, [r7, #0x4]\n" - " bl debug_80C4C44\n" - "._277:\n" - " ldr r0, ._278\n" - " lsl r1, r6, #0x2\n" - " add r1, r1, r6\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._278 + 4\n" - "._261:\n" - " str r0, [r1]\n" - "._274:\n" - " add sp, sp, #0x4\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._279:\n" - " .align 2, 0\n" - "._278:\n" - " .word gTasks\n" - " .word debug_80C4A60+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4C44() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xfffffff0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov sl, r0\n" - " mov r2, #0x0\n" - " mov r5, sp\n" - "._290:\n" - " mov r0, sl\n" - " add r6, r2, r0\n" - " add r4, r6, #0\n" - " add r1, r2, #1\n" - " mov r8, r1\n" - " cmp r4, #0x9\n" - " bgt ._280 @cond_branch\n" - " mov r3, #0x0\n" - " ldr r1, ._288\n" - " lsl r0, r4, #0x3\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " ldrb r0, [r0]\n" - " ldr r7, ._288 + 4\n" - " mov r9, r7\n" - " lsl r2, r2, #0x1\n" - " mov ip, r2\n" - " cmp r0, #0xff\n" - " beq ._282 @cond_branch\n" - " add r7, r1, #0\n" - "._283:\n" - " add r0, r3, #3\n" - " mov r1, sp\n" - " add r2, r1, r0\n" - " lsl r1, r6, #0x3\n" - " add r1, r1, r7\n" - " ldr r0, [r1]\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " strb r0, [r2]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " ldr r0, [r1]\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._282 @cond_branch\n" - " cmp r3, #0xb\n" - " bls ._283 @cond_branch\n" - "._282:\n" - " cmp r3, #0xb\n" - " bhi ._284 @cond_branch\n" - " mov r1, #0x0\n" - "._285:\n" - " add r0, r3, #3\n" - " add r0, r0, sp\n" - " strb r1, [r0]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " cmp r3, #0xb\n" - " bls ._285 @cond_branch\n" - "._284:\n" - " mov r0, #0xff\n" - " strb r0, [r5, #0xe]\n" - " mov r0, #0xfc\n" - " strb r0, [r5]\n" - " mov r2, #0x1\n" - " strb r2, [r5, #0x1]\n" - " add r1, r2, #0\n" - " LSL r1, r4\n" - " mov r3, r9\n" - " ldr r0, [r3]\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._286 @cond_branch\n" - " mov r0, #0x3\n" - " strb r0, [r5, #0x2]\n" - " b ._287\n" - "._289:\n" - " .align 2, 0\n" - "._288:\n" - " .word gUnknown_Debug_083F80D8\n" - " .word byte_3005E30\n" - "._286:\n" - " strb r2, [r5, #0x2]\n" - "._287:\n" - " mov r2, ip\n" - " add r2, r2, #0x3\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r0, sp\n" - " mov r1, #0x11\n" - " bl Menu_PrintText\n" - "._280:\n" - " mov r7, r8\n" - " lsl r0, r7, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x5\n" - " bls ._290 @cond_branch\n" - " add sp, sp, #0x10\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4D14() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xffffffd0\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r1, ._291\n" - " mov r0, sp\n" - " mov r2, #0xf\n" - " bl memcpy\n" - " add r5, sp, #0x10\n" - " ldr r1, ._291 + 4\n" - " add r0, r5, #0\n" - " mov r2, #0xd\n" - " bl memcpy\n" - " add r6, sp, #0x20\n" - " ldr r1, ._291 + 8\n" - " add r0, r6, #0\n" - " mov r2, #0xf\n" - " bl memcpy\n" - " mov r0, #0x0\n" - " mov r1, #0x10\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, sp\n" - " mov r1, #0x1\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " add r0, r5, #0\n" - " mov r1, #0x14\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xe\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r6, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._291 + 12\n" - " ldrb r0, [r0, #0x6]\n" - " bl debug_80C4F00\n" - " mov r0, #0xf\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r1, ._291 + 16\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._291 + 20\n" - " str r1, [r0]\n" - " add sp, sp, #0x30\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._292:\n" - " .align 2, 0\n" - "._291:\n" - " .word gUnknown_Debug_083F81C7\n" - " .word gUnknown_Debug_083F81F5\n" - " .word gUnknown_Debug_083F8202\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gTasks\n" - " .word debug_80C4DB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4DB8() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r0, ._293\n" - " ldrb r0, [r0, #0x7]\n" - " lsl r0, r0, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r0, r0, r1\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " str r1, [sp]\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r1, ._293 + 4\n" - " ldr r2, ._293 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " add r2, r2, #0x8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._293 + 12\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._293 + 16\n" - " str r1, [r0]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._294:\n" - " .align 2, 0\n" - "._293:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word 0x4000042\n" - " .word 0x177\n" - " .word gTasks\n" - " .word debug_80C4E18+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4E18() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r5, ._297\n" - " ldrb r3, [r5, #0x6]\n" - " ldrb r2, [r5, #0x7]\n" - " add r0, r3, r2\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " ldr r7, ._297 + 4\n" - " ldrh r1, [r7, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._295 @cond_branch\n" - " ldr r0, ._297 + 8\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._297 + 12\n" - " b ._296\n" - "._298:\n" - " .align 2, 0\n" - "._297:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gMain\n" - " .word gTasks\n" - " .word debug_80C42B8+1\n" - "._295:\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._299 @cond_branch\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._300 @cond_branch\n" - "._299:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r2, ._302\n" - " ldr r1, ._302 + 4\n" - " lsl r0, r6, #0x3\n" - " add r0, r0, r1\n" - " ldrb r0, [r0, #0x4]\n" - " strb r0, [r2]\n" - " ldr r1, ._302 + 8\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._302 + 12\n" - " str r1, [r0]\n" - " b ._310\n" - "._303:\n" - " .align 2, 0\n" - "._302:\n" - " .word gBattleTerrain\n" - " .word gUnknown_Debug_083F814C\n" - " .word gTasks\n" - " .word debug_80C5158+1\n" - "._300:\n" - " ldrh r1, [r7, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._304 @cond_branch\n" - " lsl r0, r2, #0x18\n" - " cmp r0, #0\n" - " beq ._305 @cond_branch\n" - " sub r0, r2, #1\n" - " strb r0, [r5, #0x7]\n" - " b ._313\n" - "._305:\n" - " lsl r0, r3, #0x18\n" - " cmp r0, #0\n" - " beq ._313 @cond_branch\n" - " sub r0, r3, #1\n" - " b ._308\n" - "._304:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._310 @cond_branch\n" - " lsl r0, r2, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x7\n" - " bhi ._310 @cond_branch\n" - " cmp r0, #0x4\n" - " bhi ._311 @cond_branch\n" - " add r0, r2, #1\n" - " strb r0, [r5, #0x7]\n" - " b ._313\n" - "._311:\n" - " lsl r0, r3, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x2\n" - " bhi ._313 @cond_branch\n" - " add r0, r3, #1\n" - "._308:\n" - " strb r0, [r5, #0x6]\n" - " ldrb r0, [r5, #0x6]\n" - " bl debug_80C4F00\n" - "._313:\n" - " ldr r0, ._314\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._314 + 4\n" - "._296:\n" - " str r0, [r1]\n" - "._310:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._315:\n" - " .align 2, 0\n" - "._314:\n" - " .word gTasks\n" - " .word debug_80C4DB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4F00() -{ - asm( - " push {r4, r5, r6, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " mov r0, #0x1\n" - " mov r1, #0x3\n" - " mov r2, #0xd\n" - " mov r3, #0xe\n" - " bl Menu_BlankWindowRect\n" - " mov r4, #0x0\n" - " ldr r6, ._318\n" - "._317:\n" - " cmp r4, #0x8\n" - " bhi ._316 @cond_branch\n" - " add r0, r4, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r6\n" - " ldr r0, [r0]\n" - " lsl r2, r4, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r2, r2, r1\n" - " lsr r2, r2, #0x18\n" - " mov r1, #0x2\n" - " bl Menu_PrintText\n" - "._316:\n" - " add r0, r4, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0x5\n" - " bls ._317 @cond_branch\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._319:\n" - " .align 2, 0\n" - "._318:\n" - " .word gUnknown_Debug_083F814C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C4F48() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6}\n" - " add sp, sp, #0xffffffc4\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r1, ._320\n" - " mov r0, sp\n" - " mov r2, #0x11\n" - " bl memcpy\n" - " add r6, sp, #0x14\n" - " ldr r1, ._320 + 4\n" - " add r0, r6, #0\n" - " mov r2, #0xd\n" - " bl memcpy\n" - " add r5, sp, #0x24\n" - " ldr r1, ._320 + 8\n" - " add r0, r5, #0\n" - " mov r2, #0xd\n" - " bl memcpy\n" - " add r0, sp, #0x34\n" - " mov r9, r0\n" - " ldr r1, ._320 + 12\n" - " mov r2, #0x4\n" - " bl memcpy\n" - " add r0, sp, #0x38\n" - " mov r8, r0\n" - " ldr r1, ._320 + 16\n" - " mov r2, #0x4\n" - " bl memcpy\n" - " mov r0, #0x0\n" - " mov r1, #0x10\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, sp\n" - " mov r1, #0x1\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " mov r1, #0x14\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xe\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r5, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r0, #0x1\n" - " mov r1, #0x3\n" - " mov r2, #0xd\n" - " mov r3, #0xe\n" - " bl Menu_BlankWindowRect\n" - " add r0, r5, #0\n" - " mov r1, #0x2\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r0, r9\n" - " mov r1, #0x2\n" - " mov r2, #0x3\n" - " bl Menu_PrintText\n" - " mov r0, r8\n" - " mov r1, #0x2\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, #0xf\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0xf\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r1, ._320 + 20\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._320 + 24\n" - " str r1, [r0]\n" - " add sp, sp, #0x3c\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._321:\n" - " .align 2, 0\n" - "._320:\n" - " .word gUnknown_Debug_083F8211\n" - " .word gUnknown_Debug_083F81A0\n" - " .word gUnknown_Debug_083F8222\n" - " .word gUnknown_Debug_083F822F\n" - " .word gUnknown_Debug_083F8233\n" - " .word gTasks\n" - " .word debug_80C5038+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5038() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r0, ._322\n" - " ldrb r0, [r0, #0x8]\n" - " lsl r0, r0, #0x19\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x12\n" - " add r0, r0, r1\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0x1\n" - " str r1, [sp]\n" - " mov r2, #0x1\n" - " mov r3, #0xe\n" - " bl debug_80C38E4\n" - " ldr r1, ._322 + 4\n" - " ldr r2, ._322 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " add r2, r2, #0x8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._322 + 12\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._322 + 16\n" - " str r1, [r0]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._323:\n" - " .align 2, 0\n" - "._322:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word 0x4000042\n" - " .word 0x177\n" - " .word gTasks\n" - " .word debug_80C5098+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5098() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r1, ._326\n" - " ldrh r2, [r1, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " add r3, r1, #0\n" - " cmp r0, #0\n" - " beq ._324 @cond_branch\n" - " ldr r0, ._326 + 4\n" - " lsl r1, r4, #0x2\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._326 + 8\n" - " str r0, [r1]\n" - " b ._339\n" - "._327:\n" - " .align 2, 0\n" - "._326:\n" - " .word gMain\n" - " .word gTasks\n" - " .word debug_80C47BC+1\n" - "._324:\n" - " mov r0, #0x8\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " bne ._328 @cond_branch\n" - " mov r0, #0x1\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._329 @cond_branch\n" - "._328:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._331\n" - " ldr r0, ._331 + 4\n" - " ldrb r0, [r0, #0x8]\n" - " strb r0, [r1, #0x8]\n" - " ldr r1, ._331 + 8\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._331 + 12\n" - " b ._330\n" - "._332:\n" - " .align 2, 0\n" - "._331:\n" - " .word gSaveBlock2\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gTasks\n" - " .word debug_80C42B8+1\n" - "._329:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._334 @cond_branch\n" - " ldr r1, ._336\n" - " ldrb r0, [r1, #0x8]\n" - " cmp r0, #0\n" - " beq ._334 @cond_branch\n" - " sub r0, r0, #0x1\n" - " b ._335\n" - "._337:\n" - " .align 2, 0\n" - "._336:\n" - " .word gUnknown_Debug_2038A0C\n" - "._334:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._339 @cond_branch\n" - " ldr r1, ._340\n" - " ldrb r0, [r1, #0x8]\n" - " cmp r0, #0\n" - " bne ._339 @cond_branch\n" - " add r0, r0, #0x1\n" - "._335:\n" - " strb r0, [r1, #0x8]\n" - " ldr r1, ._340 + 4\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._340 + 8\n" - "._330:\n" - " str r1, [r0]\n" - "._339:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._341:\n" - " .align 2, 0\n" - "._340:\n" - " .word gUnknown_Debug_2038A0C\n" - " .word gTasks\n" - " .word debug_80C5038+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5158() -{ - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._342\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r0, ._342 + 4\n" - " str r0, [r1]\n" - " bx lr\n" - "._343:\n" - " .align 2, 0\n" - "._342:\n" - " .word gTasks\n" - " .word debug_80C5174+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5174() -{ - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._344\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r0, ._344 + 4\n" - " str r0, [r1]\n" - " bx lr\n" - "._345:\n" - " .align 2, 0\n" - "._344:\n" - " .word gTasks\n" - " .word debug_80C5190+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5190() -{ - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._346\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r0, ._346 + 4\n" - " str r0, [r1]\n" - " bx lr\n" - "._347:\n" - " .align 2, 0\n" - "._346:\n" - " .word gTasks\n" - " .word debug_80C51AC+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C51AC() -{ - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._348\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r0, ._348 + 4\n" - " str r0, [r1]\n" - " bx lr\n" - "._349:\n" - " .align 2, 0\n" - "._348:\n" - " .word gTasks\n" - " .word debug_80C51C8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C51C8() -{ - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._350\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r0, ._350 + 4\n" - " str r0, [r1]\n" - " bx lr\n" - "._351:\n" - " .align 2, 0\n" - "._350:\n" - " .word gTasks\n" - " .word debug_80C51E4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C51E4() -{ - asm( - " push {lr}\n" - " bl sub_80408BC\n" - " ldr r0, ._352\n" - " ldr r1, ._352 + 4\n" - " str r1, [r0, #0x8]\n" - " ldr r0, ._352 + 8\n" - " bl SetMainCallback2\n" - " pop {r0}\n" - " bx r0\n" - "._353:\n" - " .align 2, 0\n" - "._352:\n" - " .word gMain\n" - " .word debug_80C41A8+1\n" - " .word unref_sub_800D684+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5208() -{ - asm( - " push {r4, r5, r6, lr}\n" - " ldr r1, ._355\n" - " ldr r0, ._355 + 4\n" - " str r0, [r1]\n" - " mov r3, #0x0\n" - " add r6, r1, #0\n" - " ldr r4, ._355 + 8\n" - " add r5, r6, #0\n" - " mov r2, #0x0\n" - "._354:\n" - " ldr r0, [r5]\n" - " lsl r1, r3, #0x2\n" - " add r0, r0, #0x64\n" - " add r0, r0, r1\n" - " str r2, [r0]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r3, r0, #0x10\n" - " cmp r3, #0x3f\n" - " bls ._354 @cond_branch\n" - " ldr r2, [r6]\n" - " mov r0, #0xfc\n" - " str r0, [r2, #0x64]\n" - " ldrb r1, [r4, #0xa]\n" - " ldrb r0, [r4, #0xb]\n" - " lsl r0, r0, #0x8\n" - " orr r1, r1, r0\n" - " ldrb r0, [r4, #0xc]\n" - " lsl r0, r0, #0x10\n" - " orr r1, r1, r0\n" - " ldrb r0, [r4, #0xd]\n" - " lsl r0, r0, #0x18\n" - " orr r1, r1, r0\n" - " str r1, [r2, #0x70]\n" - " bl Random\n" - " add r4, r0, #0\n" - " bl Random\n" - " ldr r1, [r6]\n" - " lsl r4, r4, #0x10\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " orr r4, r4, r0\n" - " str r4, [r1, #0x74]\n" - " mov r0, #0x1\n" - " str r0, [r1, #0x68]\n" - " str r0, [r1, #0x6c]\n" - " bl debug_80C5C94\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._356:\n" - " .align 2, 0\n" - "._355:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word +0x2018000\n" - " .word gSaveBlock2\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C527C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add r6, r0, #0\n" - " mov r5, #0x0\n" - " ldr r7, ._359\n" - "._361:\n" - " mov r0, #0x64\n" - " add r1, r5, #0\n" - " mul r1, r1, r0\n" - " ldr r0, ._359 + 4\n" - " add r4, r1, r0\n" - " add r0, r4, #0\n" - " mov r1, #0xb\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " cmp r0, #0\n" - " bne ._357 @cond_branch\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - " add r0, r5, #1\n" - " strb r0, [r7]\n" - " mov r0, #0x0\n" - " b ._358\n" - "._360:\n" - " .align 2, 0\n" - "._359:\n" - " .word gPlayerPartyCount\n" - " .word gPlayerParty\n" - "._357:\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x5\n" - " bls ._361 @cond_branch\n" - " ldr r0, ._362\n" - " ldr r0, [r0]\n" - " bl SendMonToPC\n" - " mov r0, #0x1\n" - "._358:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._363:\n" - " .align 2, 0\n" - "._362:\n" - " .word gUnknown_Debug_2038A1C\n" - "\n" - ); -} - -__attribute__((naked)) -void InitCreatePokemon() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xffffffd4\n" - " ldr r1, ._364\n" - " add r0, sp, #0x4\n" - " mov r2, #0x25\n" - " bl memcpy\n" - " bl debug_80C35DC\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r1, #0x0\n" - " mov r2, #0x10\n" - " mov r3, #0x0\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._364 + 4\n" - " mov r5, #0x0\n" - " strh r4, [r0]\n" - " add r0, r0, #0x2\n" - " strh r4, [r0]\n" - " add r0, r0, #0x2\n" - " strh r4, [r0]\n" - " ldr r3, ._364 + 8\n" - " ldrh r2, [r3]\n" - " strh r4, [r3]\n" - " ldr r4, ._364 + 12\n" - " ldrh r0, [r4]\n" - " mov r1, #0x1\n" - " orr r0, r0, r1\n" - " strh r0, [r4]\n" - " strh r2, [r3]\n" - " ldr r2, ._364 + 16\n" - " ldrh r0, [r2]\n" - " mov r1, #0x8\n" - " orr r0, r0, r1\n" - " strh r0, [r2]\n" - " ldr r0, ._364 + 20\n" - " bl SetVBlankCallback\n" - " ldr r0, ._364 + 24\n" - " bl SetMainCallback2\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x3\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, sp, #0x4\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x13\n" - " mov r2, #0x8a\n" - " lsl r2, r2, #0x5\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, ._364 + 28\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " bl debug_80C5208\n" - " ldr r1, ._364 + 32\n" - " ldr r0, [r1]\n" - " mov r2, #0xb4\n" - " lsl r2, r2, #0x1\n" - " add r0, r0, r2\n" - " strb r5, [r0]\n" - " ldr r0, [r1]\n" - " ldr r1, ._364 + 36\n" - " add r0, r0, r1\n" - " strb r5, [r0]\n" - " add sp, sp, #0x2c\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._365:\n" - " .align 2, 0\n" - "._364:\n" - " .word gUnknown_Debug_083F8733\n" - " .word 0x4000050\n" - " .word 0x4000208\n" - " .word 0x4000200\n" - " .word 0x4000004\n" - " .word debug_80C3758+1\n" - " .word debug_80C370C+1\n" - " .word debug_80C53A4+1\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C53A4() -{ - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._366\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r0, ._366 + 4\n" - " str r0, [r1]\n" - " bx lr\n" - "._367:\n" - " .align 2, 0\n" - "._366:\n" - " .word gTasks\n" - " .word debug_80C53C0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C53C0() -{ - asm( - " push {r4, lr}\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " bl debug_80C6384\n" - " mov r0, #0x0\n" - " bl debug_80C627C\n" - " ldr r1, ._368\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._368 + 4\n" - " str r1, [r0]\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._369:\n" - " .align 2, 0\n" - "._368:\n" - " .word gTasks\n" - " .word debug_80C53F0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C53F0() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " ldr r0, ._372\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r2, #0x1\n" - " and r2, r2, r1\n" - " add r4, r0, #0\n" - " cmp r2, #0\n" - " beq ._370 @cond_branch\n" - " ldr r0, ._372 + 4\n" - " ldr r3, [r0]\n" - " mov r0, #0xb2\n" - " lsl r0, r0, #0x1\n" - " add r2, r3, r0\n" - " ldr r1, ._372 + 8\n" - " mov r4, #0xb4\n" - " lsl r4, r4, #0x1\n" - " add r0, r3, r4\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r6, ._372 + 12\n" - " add r1, r3, r6\n" - " ldrb r1, [r1]\n" - " ldr r0, [r0]\n" - " add r0, r0, r1\n" - " ldrb r1, [r0]\n" - " lsl r1, r1, #0x2\n" - " add r0, r3, #0\n" - " add r0, r0, #0x64\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " str r0, [r2]\n" - " mov r0, #0xb5\n" - " lsl r0, r0, #0x1\n" - " add r1, r3, r0\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " bl debug_80C643C\n" - " ldr r1, ._372 + 16\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._372 + 20\n" - " b ._375\n" - "._373:\n" - " .align 2, 0\n" - "._372:\n" - " .word gMain\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gUnknown_Debug_083F8698\n" - " .word 0x169\n" - " .word gTasks\n" - " .word debug_80C55E4+1\n" - "._370:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._374 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " str r2, [sp]\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._376\n" - " bl SetMainCallback2\n" - " ldr r1, ._376 + 4\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._376 + 8\n" - " b ._375\n" - "._377:\n" - " .align 2, 0\n" - "._376:\n" - " .word debug_80C370C+1\n" - " .word gTasks\n" - " .word debug_80C373C+1\n" - "._374:\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._378 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " bl debug_80C5FFC\n" - " ldr r0, ._381\n" - " ldr r0, [r0]\n" - " bl debug_80C527C\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " mov r0, #0x3\n" - " mov r1, #0x8\n" - " mov r2, #0x1a\n" - " mov r3, #0xb\n" - " bl Menu_DrawStdWindowFrame\n" - " cmp r4, #0\n" - " beq ._379 @cond_branch\n" - " ldr r0, ._381 + 4\n" - " mov r1, #0x4\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - " b ._380\n" - "._382:\n" - " .align 2, 0\n" - "._381:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gUnknown_Debug_083F872A\n" - "._379:\n" - " ldr r0, ._384\n" - " mov r1, #0x4\n" - " mov r2, #0x9\n" - " bl Menu_PrintText\n" - "._380:\n" - " ldr r0, ._384 + 4\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._384 + 8\n" - " str r0, [r1]\n" - " b ._400\n" - "._385:\n" - " .align 2, 0\n" - "._384:\n" - " .word gUnknown_Debug_083F8720\n" - " .word gTasks\n" - " .word debug_80C5708+1\n" - "._378:\n" - " mov r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._386 @cond_branch\n" - " ldr r0, ._388\n" - " ldr r0, [r0]\n" - " ldr r4, [r0, #0x64]\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r4, #0\n" - " mov r1, #0x2\n" - " bl GetSetPokedexFlag\n" - " add r0, r4, #0\n" - " mov r1, #0x3\n" - " bl GetSetPokedexFlag\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " b ._400\n" - "._389:\n" - " .align 2, 0\n" - "._388:\n" - " .word gUnknown_Debug_2038A1C\n" - "._386:\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._390 @cond_branch\n" - " mov r0, #0x2\n" - " bl debug_80C627C\n" - " b ._400\n" - "._390:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r3, r0, #0x10\n" - " cmp r3, #0\n" - " beq ._392 @cond_branch\n" - " mov r0, #0x1\n" - " bl debug_80C627C\n" - " b ._400\n" - "._392:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._395 @cond_branch\n" - " ldr r2, ._397\n" - " ldr r0, [r2]\n" - " mov r6, #0xb4\n" - " lsl r6, r6, #0x1\n" - " add r1, r0, r6\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._395 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r0, [r2]\n" - " ldr r1, ._397 + 4\n" - " add r0, r0, r1\n" - " strb r3, [r0]\n" - " b ._396\n" - "._398:\n" - " .align 2, 0\n" - "._397:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - "._395:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._400 @cond_branch\n" - " ldr r3, ._401\n" - " ldr r0, [r3]\n" - " mov r4, #0xb4\n" - " lsl r4, r4, #0x1\n" - " add r2, r0, r4\n" - " ldrb r0, [r2]\n" - " cmp r0, #0x4\n" - " bhi ._400 @cond_branch\n" - " add r0, r0, #0x1\n" - " mov r1, #0x0\n" - " strb r0, [r2]\n" - " ldr r0, [r3]\n" - " ldr r6, ._401 + 4\n" - " add r0, r0, r6\n" - " strb r1, [r0]\n" - "._396:\n" - " ldr r1, ._401 + 8\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._401 + 12\n" - "._375:\n" - " str r1, [r0]\n" - "._400:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._402:\n" - " .align 2, 0\n" - "._401:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - " .word gTasks\n" - " .word debug_80C53C0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C55E4() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " add r6, r3, #0\n" - " ldr r1, ._405\n" - " ldr r2, ._405 + 4\n" - " ldr r0, [r2]\n" - " mov ip, r0\n" - " mov r0, #0xb4\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, ip\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._405 + 8\n" - " add r1, r1, ip\n" - " ldrb r1, [r1]\n" - " ldr r0, [r0]\n" - " add r0, r0, r1\n" - " ldrb r5, [r0]\n" - " add r7, r5, #0\n" - " ldr r1, ._405 + 12\n" - " ldrh r4, [r1, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r4\n" - " mov r8, r2\n" - " add r2, r1, #0\n" - " cmp r0, #0\n" - " beq ._403 @cond_branch\n" - " ldr r0, ._405 + 16\n" - " lsl r1, r3, #0x2\n" - " add r1, r1, r3\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._405 + 20\n" - " str r0, [r1]\n" - " b ._422\n" - "._406:\n" - " .align 2, 0\n" - "._405:\n" - " .word gUnknown_Debug_083F8698\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - " .word gMain\n" - " .word gTasks\n" - " .word debug_80C53C0+1\n" - "._403:\n" - " mov r0, #0x2\n" - " and r0, r0, r4\n" - " cmp r0, #0\n" - " beq ._407 @cond_branch\n" - " lsl r1, r5, #0x2\n" - " mov r0, ip\n" - " add r0, r0, #0x64\n" - " add r0, r0, r1\n" - " mov r1, #0xb2\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, ip\n" - " ldr r1, [r1]\n" - " str r1, [r0]\n" - " ldr r1, ._409\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._409 + 4\n" - " str r1, [r0]\n" - " b ._422\n" - "._410:\n" - " .align 2, 0\n" - "._409:\n" - " .word gTasks\n" - " .word debug_80C53C0+1\n" - "._407:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._411 @cond_branch\n" - " mov r0, #0x1\n" - " b ._412\n" - "._411:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._413 @cond_branch\n" - " mov r0, #0x2\n" - "._412:\n" - " bl debug_80C6544\n" - " bl debug_80C643C\n" - " b ._422\n" - "._413:\n" - " ldr r0, ._419\n" - " lsl r1, r7, #0x3\n" - " add r0, r0, #0x4\n" - " add r1, r1, r0\n" - " ldr r1, [r1]\n" - " ldrb r0, [r1, #0x9]\n" - " cmp r0, #0xff\n" - " beq ._422 @cond_branch\n" - " mov r0, #0x20\n" - " and r0, r0, r4\n" - " cmp r0, #0\n" - " beq ._417 @cond_branch\n" - " mov r0, #0xb5\n" - " lsl r0, r0, #0x1\n" - " add ip, ip, r0\n" - " mov r0, ip\n" - " ldrb r3, [r0]\n" - " ldrb r0, [r1, #0x9]\n" - " sub r0, r0, #0x1\n" - " cmp r3, r0\n" - " bge ._417 @cond_branch\n" - " add r0, r3, #1\n" - " mov r1, ip\n" - " strb r0, [r1]\n" - " bl debug_80C643C\n" - " b ._422\n" - "._420:\n" - " .align 2, 0\n" - "._419:\n" - " .word gUnknown_Debug_083F8554\n" - "._417:\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._422 @cond_branch\n" - " mov r2, r8\n" - " ldr r0, [r2]\n" - " mov r2, #0xb5\n" - " lsl r2, r2, #0x1\n" - " add r1, r0, r2\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._422 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " bl debug_80C643C\n" - "._422:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5708() -{ - asm( - " push {lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " ldr r0, ._424\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._423 @cond_branch\n" - " ldr r0, ._424 + 4\n" - " lsl r1, r2, #0x2\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._424 + 8\n" - " str r0, [r1]\n" - "._423:\n" - " pop {r0}\n" - " bx r0\n" - "._425:\n" - " .align 2, 0\n" - "._424:\n" - " .word gMain\n" - " .word gTasks\n" - " .word debug_80C53C0+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5738() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " add r6, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r4, r1, #0x18\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r8, r2\n" - " cmp r4, #0xfe\n" - " bne ._426 @cond_branch\n" - " ldr r1, ._428\n" - " mov r2, #0x7\n" - " bl debug_80C689C\n" - " add r0, r6, #7\n" - " ldr r7, ._428 + 4\n" - " ldr r1, [r7]\n" - " add r1, r1, #0xf0\n" - " ldr r1, [r1]\n" - " mov r2, #0x3\n" - " mov r3, #0x1\n" - " bl debug_80C6678\n" - " mov r4, #0x0\n" - " strb r4, [r6, #0x13]\n" - " strb r4, [r6, #0x14]\n" - " add r0, r6, #0\n" - " add r0, r0, #0x15\n" - " ldr r1, ._428 + 8\n" - " mov r2, #0x7\n" - " bl debug_80C689C\n" - " add r0, r6, #0\n" - " add r0, r0, #0x1c\n" - " ldr r1, [r7]\n" - " add r1, r1, #0xf4\n" - " ldr r1, [r1]\n" - " mov r2, #0x3\n" - " mov r3, #0x1\n" - " bl debug_80C6678\n" - " add r0, r6, #0\n" - " add r0, r0, #0x28\n" - " strb r4, [r0]\n" - " add r0, r0, #0x1\n" - " strb r4, [r0]\n" - " add r0, r0, #0x1\n" - " ldr r1, ._428 + 12\n" - " mov r2, #0x9\n" - " bl debug_80C689C\n" - " add r0, r6, #0\n" - " add r0, r0, #0x31\n" - " ldr r1, [r7]\n" - " add r1, r1, #0xf8\n" - "._431:\n" - " ldr r1, [r1]\n" - " mov r2, #0x3\n" - " mov r3, #0x1\n" - " bl debug_80C6678\n" - " b ._517\n" - "._429:\n" - " .align 2, 0\n" - "._428:\n" - " .word gUnknown_Debug_083F850A\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gUnknown_Debug_083F8514\n" - " .word gUnknown_Debug_083F851C\n" - "._426:\n" - " cmp r4, #0xfd\n" - " bne ._430 @cond_branch\n" - " ldr r1, ._432\n" - " add r0, r6, #0\n" - " mov r2, #0x9\n" - " bl debug_80C689C\n" - " add r0, r6, #0\n" - " add r0, r0, #0x9\n" - " ldr r7, ._432 + 4\n" - " ldr r1, [r7]\n" - " add r1, r1, #0xfc\n" - " ldr r1, [r1]\n" - " mov r2, #0x3\n" - " mov r3, #0x1\n" - " bl debug_80C6678\n" - " mov r4, #0x0\n" - " strb r4, [r6, #0x15]\n" - " strb r4, [r6, #0x16]\n" - " add r0, r6, #0\n" - " add r0, r0, #0x17\n" - " ldr r1, ._432 + 8\n" - " mov r2, #0x9\n" - " bl debug_80C689C\n" - " add r0, r6, #0\n" - " add r0, r0, #0x20\n" - " ldr r1, [r7]\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r1, r1, r2\n" - " ldr r1, [r1]\n" - " mov r2, #0x3\n" - " mov r3, #0x1\n" - " bl debug_80C6678\n" - " add r0, r6, #0\n" - " add r0, r0, #0x2c\n" - " strb r4, [r0]\n" - " add r0, r0, #0x1\n" - " strb r4, [r0]\n" - " add r0, r0, #0x1\n" - " ldr r1, ._432 + 12\n" - " mov r2, #0x9\n" - " bl debug_80C689C\n" - " add r0, r6, #0\n" - " add r0, r0, #0x37\n" - " ldr r1, [r7]\n" - " mov r3, #0x82\n" - " lsl r3, r3, #0x1\n" - " add r1, r1, r3\n" - " b ._431\n" - "._433:\n" - " .align 2, 0\n" - "._432:\n" - " .word gUnknown_Debug_083F8524\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gUnknown_Debug_083F852D\n" - " .word gUnknown_Debug_083F8537\n" - "._430:\n" - " mov r1, #0x0\n" - " lsl r5, r4, #0x3\n" - " mov r2, #0x0\n" - "._434:\n" - " add r0, r6, r1\n" - " strb r2, [r0]\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r1, r0, #0x10\n" - " cmp r1, #0xb\n" - " bls ._434 @cond_branch\n" - " ldr r0, ._437\n" - " add r0, r5, r0\n" - " ldr r1, [r0]\n" - " add r0, r6, #0\n" - " mov r2, #0xb\n" - " bl debug_80C689C\n" - " mov r1, #0xc\n" - " mov r2, #0xff\n" - "._435:\n" - " add r0, r6, r1\n" - " strb r2, [r0]\n" - " add r0, r1, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r1, r0, #0x10\n" - " cmp r1, #0xff\n" - " bls ._435 @cond_branch\n" - " ldr r0, ._437\n" - " add r0, r0, #0x4\n" - " add r0, r5, r0\n" - " ldr r0, [r0]\n" - " ldrb r2, [r0, #0x9]\n" - " lsl r0, r2, #0x1a\n" - " lsr r5, r0, #0x18\n" - " cmp r4, #0x22\n" - " bhi ._436 @cond_branch\n" - " lsl r0, r4, #0x2\n" - " ldr r1, ._437 + 4\n" - " add r1, r0, r1\n" - " ldr r1, [r1]\n" - " add r7, r0, #0\n" - " mov pc, r1\n" - "._438:\n" - " .align 2, 0\n" - "._437:\n" - " .word gUnknown_Debug_083F8554\n" - " .word ._439\n" - "._439:\n" - " .word ._440\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._445\n" - " .word ._446\n" - " .word ._450\n" - " .word ._450\n" - " .word ._450\n" - " .word ._450\n" - " .word ._451\n" - " .word ._452\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._472\n" - " .word ._473\n" - " .word ._474\n" - "._436:\n" - " mov r0, #0xff\n" - " strb r0, [r6]\n" - " b ._517\n" - "._440:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r1, ._477\n" - " mov r9, r1\n" - " ldr r1, [r1]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldr r1, [r1]\n" - " mov r3, r8\n" - " bl debug_80C6678\n" - " add r1, r5, r6\n" - " mov r0, #0x0\n" - " strb r0, [r1, #0xa]\n" - " mov r0, #0xfc\n" - " strb r0, [r1, #0xb]\n" - " mov r0, #0x1\n" - " strb r0, [r1, #0xc]\n" - " mov r2, r8\n" - " strb r2, [r1, #0xd]\n" - " add r4, r5, #0\n" - " add r4, r4, #0xe\n" - " add r4, r6, r4\n" - " mov r3, r9\n" - " ldr r0, [r3]\n" - " add r0, r0, #0x64\n" - " add r0, r0, r7\n" - " ldrh r0, [r0]\n" - " bl NationalPokedexNumToSpecies\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0xb\n" - " mul r1, r1, r0\n" - " ldr r0, ._477 + 4\n" - " add r1, r1, r0\n" - " add r0, r4, #0\n" - " mov r2, #0xa\n" - " bl debug_80C689C\n" - " b ._517\n" - "._478:\n" - " .align 2, 0\n" - "._477:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gSpeciesNames\n" - "._445:\n" - " ldr r0, ._483\n" - " ldr r0, [r0]\n" - " add r0, r0, #0x64\n" - " add r0, r0, r7\n" - " ldr r0, [r0]\n" - " cmp r0, #0x1\n" - " beq ._479 @cond_branch\n" - " cmp r0, #0x1\n" - " bcc ._480 @cond_branch\n" - " cmp r0, #0x2\n" - " beq ._481 @cond_branch\n" - " b ._517\n" - "._484:\n" - " .align 2, 0\n" - "._483:\n" - " .word gUnknown_Debug_2038A1C\n" - "._480:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r1, ._486\n" - " b ._488\n" - "._487:\n" - " .align 2, 0\n" - "._486:\n" - " .word gUnknown_Debug_083F8546\n" - "._479:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r1, ._489\n" - " b ._488\n" - "._490:\n" - " .align 2, 0\n" - "._489:\n" - " .word gUnknown_Debug_083F8541\n" - "._481:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r1, ._492\n" - "._488:\n" - " mov r2, #0x2\n" - " bl debug_80C689C\n" - " b ._517\n" - "._493:\n" - " .align 2, 0\n" - "._492:\n" - " .word gUnknown_Debug_083F8544\n" - "._450:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r4, ._495\n" - " ldr r1, [r4]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldr r1, [r1]\n" - " mov r3, r8\n" - " bl debug_80C6678\n" - " add r1, r5, r6\n" - " mov r0, #0x0\n" - " strb r0, [r1, #0xa]\n" - " mov r0, #0xfc\n" - " strb r0, [r1, #0xb]\n" - " mov r0, #0x1\n" - " strb r0, [r1, #0xc]\n" - " mov r0, r8\n" - " strb r0, [r1, #0xd]\n" - " add r0, r5, #0\n" - " add r0, r0, #0xe\n" - " add r0, r6, r0\n" - " ldr r1, [r4]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldr r2, [r1]\n" - " mov r1, #0xd\n" - " mul r1, r1, r2\n" - " ldr r2, ._495 + 4\n" - " add r1, r1, r2\n" - " b ._494\n" - "._496:\n" - " .align 2, 0\n" - "._495:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gMoveNames\n" - "._451:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r4, ._499\n" - " ldr r1, [r4]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldr r1, [r1]\n" - " mov r3, r8\n" - " bl debug_80C6678\n" - " add r1, r5, r6\n" - " mov r0, #0x0\n" - " strb r0, [r1, #0xa]\n" - " mov r0, #0xfc\n" - " strb r0, [r1, #0xb]\n" - " mov r0, #0x1\n" - " strb r0, [r1, #0xc]\n" - " mov r2, r8\n" - " strb r2, [r1, #0xd]\n" - " ldr r0, [r4]\n" - " add r0, r0, #0x64\n" - " add r0, r0, r7\n" - " ldr r0, [r0]\n" - " cmp r0, #0\n" - " beq ._497 @cond_branch\n" - " add r4, r5, #0\n" - " add r4, r4, #0xe\n" - " add r4, r6, r4\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl ItemId_GetItem\n" - " add r1, r0, #0\n" - " add r0, r4, #0\n" - " b ._498\n" - "._500:\n" - " .align 2, 0\n" - "._499:\n" - " .word gUnknown_Debug_2038A1C\n" - "._497:\n" - " add r0, r5, #0\n" - " add r0, r0, #0xe\n" - " add r0, r6, r0\n" - " ldr r1, ._502\n" - "._498:\n" - " mov r2, #0x9\n" - " bl debug_80C689C\n" - " b ._517\n" - "._503:\n" - " .align 2, 0\n" - "._502:\n" - " .word gUnknown_Debug_083F8541\n" - "._452:\n" - " add r6, r6, #0xc\n" - " ldr r4, ._505\n" - " ldr r0, [r4]\n" - " ldr r0, [r0, #0x64]\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl NationalPokedexNumToSpecies\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " ldr r1, [r4]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldrb r1, [r1]\n" - " bl GetAbilityBySpecies\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r1, #0xd\n" - " mul r1, r1, r0\n" - " ldr r0, ._505 + 4\n" - " add r1, r1, r0\n" - " add r0, r6, #0\n" - "._494:\n" - " mov r2, #0xc\n" - " bl debug_80C689C\n" - " b ._517\n" - "._506:\n" - " .align 2, 0\n" - "._505:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gAbilityNames\n" - "._474:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r2, ._508\n" - " ldr r1, ._508 + 4\n" - " ldr r1, [r1]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldr r1, [r1]\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r1, [r1]\n" - " b ._514\n" - "._509:\n" - " .align 2, 0\n" - "._508:\n" - " .word gUnknown_Debug_083F86E8\n" - " .word gUnknown_Debug_2038A1C\n" - "._472:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xc\n" - " ldr r1, ._511\n" - " ldr r1, [r1]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldr r1, [r1]\n" - " mov r3, r8\n" - " bl debug_80C6678\n" - " b ._517\n" - "._512:\n" - " .align 2, 0\n" - "._511:\n" - " .word gUnknown_Debug_2038A1C\n" - "._473:\n" - " ldr r0, ._515\n" - " ldr r0, [r0]\n" - " add r0, r0, #0x64\n" - " add r0, r0, r7\n" - " ldr r0, [r0]\n" - " cmp r0, #0\n" - " beq ._513 @cond_branch\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r1, ._515 + 4\n" - " b ._514\n" - "._516:\n" - " .align 2, 0\n" - "._515:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gUnknown_Debug_083F854A\n" - "._513:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r1, ._518\n" - "._514:\n" - " mov r2, #0x4\n" - " bl debug_80C689C\n" - " b ._517\n" - "._519:\n" - " .align 2, 0\n" - "._518:\n" - " .word gUnknown_Debug_083F854D\n" - "._446:\n" - " add r0, r6, #0\n" - " add r0, r0, #0xa\n" - " ldr r2, ._520\n" - " ldr r1, ._520 + 4\n" - " ldr r1, [r1]\n" - " add r1, r1, #0x64\n" - " add r1, r1, r7\n" - " ldr r1, [r1]\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r2\n" - " ldr r1, [r1]\n" - " mov r2, #0x5\n" - " bl debug_80C689C\n" - "._517:\n" - " mov r0, #0x0\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._521:\n" - " .align 2, 0\n" - "._520:\n" - " .word gNatureNames\n" - " .word gUnknown_Debug_2038A1C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5B60() -{ - asm( - " lsl r0, r0, #0x18\n" - " ldr r1, ._522\n" - " ldr r1, [r1]\n" - " lsr r0, r0, #0x16\n" - " add r1, r1, #0x64\n" - " add r1, r1, r0\n" - " ldr r0, [r1]\n" - " bx lr\n" - "._523:\n" - " .align 2, 0\n" - "._522:\n" - " .word gUnknown_Debug_2038A1C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5B74() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r2, r1, #0x18\n" - " cmp r2, #0x18\n" - " bhi ._540 @cond_branch\n" - " lsl r0, r2, #0x2\n" - " ldr r1, ._526\n" - " add r1, r0, r1\n" - " ldr r1, [r1]\n" - " add r3, r0, #0\n" - " mov pc, r1\n" - "._527:\n" - " .align 2, 0\n" - "._526:\n" - " .word ._525\n" - "._525:\n" - " .word ._532\n" - " .word ._529\n" - " .word ._530\n" - " .word ._532\n" - " .word ._532\n" - " .word ._540\n" - " .word ._540\n" - " .word ._540\n" - " .word ._540\n" - " .word ._540\n" - " .word ._540\n" - " .word ._540\n" - " .word ._540\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - " .word ._552\n" - "._540:\n" - " ldr r0, ._554\n" - " ldr r0, [r0]\n" - " lsl r1, r2, #0x2\n" - " add r0, r0, #0x64\n" - " add r0, r0, r1\n" - " str r6, [r0]\n" - " b ._562\n" - "._555:\n" - " .align 2, 0\n" - "._554:\n" - " .word gUnknown_Debug_2038A1C\n" - "._532:\n" - " ldr r0, ._557\n" - " ldr r0, [r0]\n" - " add r0, r0, #0x64\n" - " add r0, r0, r3\n" - " str r6, [r0]\n" - " bl debug_80C5C94\n" - " b ._562\n" - "._558:\n" - " .align 2, 0\n" - "._557:\n" - " .word gUnknown_Debug_2038A1C\n" - "._529:\n" - " ldr r4, ._560\n" - " ldr r1, [r4]\n" - " add r0, r1, #0\n" - " add r0, r0, #0x64\n" - " add r0, r0, r3\n" - " str r6, [r0]\n" - " ldr r0, [r1, #0x64]\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl NationalPokedexNumToSpecies\n" - " ldr r5, [r4]\n" - " ldr r4, ._560 + 4\n" - " lsl r2, r6, #0x2\n" - " ldr r3, ._560 + 8\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " lsl r1, r0, #0x3\n" - " sub r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r3\n" - " ldrb r1, [r1, #0x13]\n" - " mov r0, #0xca\n" - " lsl r0, r0, #0x1\n" - " mul r0, r0, r1\n" - " add r2, r2, r0\n" - " add r2, r2, r4\n" - " ldr r0, [r2]\n" - " str r0, [r5, #0x6c]\n" - " bl debug_80C5C94\n" - " b ._562\n" - "._561:\n" - " .align 2, 0\n" - "._560:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gExperienceTables\n" - " .word gBaseStats\n" - "._530:\n" - " ldr r0, ._563\n" - " ldr r0, [r0]\n" - " add r0, r0, #0x64\n" - " add r0, r0, r3\n" - " str r6, [r0]\n" - " bl debug_80C5DEC\n" - " b ._562\n" - "._564:\n" - " .align 2, 0\n" - "._563:\n" - " .word gUnknown_Debug_2038A1C\n" - "._552:\n" - " ldr r0, ._565\n" - " ldr r0, [r0]\n" - " add r0, r0, #0x64\n" - " add r0, r0, r3\n" - " str r6, [r0]\n" - " bl debug_80C5EF4\n" - "._562:\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._566:\n" - " .align 2, 0\n" - "._565:\n" - " .word gUnknown_Debug_2038A1C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5C94() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffff0\n" - " ldr r6, ._567\n" - " ldr r2, [r6]\n" - " add r0, r2, #0\n" - " add r0, r0, #0x98\n" - " ldr r4, [r0]\n" - " mov r1, #0x1f\n" - " and r4, r4, r1\n" - " add r0, r0, #0x8\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xa8\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0xa\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xb0\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0xf\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xb8\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x14\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xc0\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x19\n" - " orr r4, r4, r0\n" - " ldr r0, [r2, #0x64]\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl NationalPokedexNumToSpecies\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " ldr r0, [r6]\n" - " ldr r2, [r0, #0x68]\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " mov r5, #0x1\n" - " str r5, [sp]\n" - " ldr r3, [r0, #0x74]\n" - " str r3, [sp, #0x4]\n" - " str r5, [sp, #0x8]\n" - " ldr r3, [r0, #0x70]\n" - " str r3, [sp, #0xc]\n" - " add r3, r4, #0\n" - " bl CreateMon\n" - " ldr r0, [r6]\n" - " bl GetMonGender\n" - " ldr r1, [r6]\n" - " add r0, r0, #0x2\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " str r0, [r1, #0x78]\n" - " add r0, r1, #0\n" - " bl GetNature\n" - " ldr r1, [r6]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " str r0, [r1, #0x7c]\n" - " add r0, r1, #0\n" - " mov r1, #0xd\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x80\n" - " str r2, [r1]\n" - " mov r1, #0xe\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x84\n" - " str r2, [r1]\n" - " mov r1, #0xf\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x88\n" - " str r2, [r1]\n" - " mov r1, #0x10\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x8c\n" - " str r2, [r1]\n" - " mov r1, #0x19\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " ldr r0, [r6]\n" - " str r1, [r0, #0x6c]\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf0\n" - " str r2, [r1]\n" - " mov r1, #0x3b\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf4\n" - " str r2, [r1]\n" - " mov r1, #0x3c\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf8\n" - " str r2, [r1]\n" - " mov r1, #0x3d\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xfc\n" - " str r2, [r1]\n" - " mov r1, #0x3e\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r6]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x1\n" - " add r1, r0, r3\n" - " str r2, [r1]\n" - " mov r1, #0x3f\n" - " bl GetMonData\n" - " ldr r1, [r6]\n" - " mov r2, #0x82\n" - " lsl r2, r2, #0x1\n" - " add r1, r1, r2\n" - " str r0, [r1]\n" - " add sp, sp, #0x10\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._568:\n" - " .align 2, 0\n" - "._567:\n" - " .word gUnknown_Debug_2038A1C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5DEC() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " ldr r4, ._569\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x6c\n" - " mov r1, #0x19\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " mov r1, #0xd\n" - " mov r2, sp\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " mov r1, #0xe\n" - " mov r2, sp\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " mov r1, #0xf\n" - " mov r2, sp\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " mov r1, #0x10\n" - " mov r2, sp\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " bl CalculateMonStats\n" - " ldr r0, [r4]\n" - " bl GiveMonInitialMoveset\n" - " ldr r0, [r4]\n" - " mov r1, #0x38\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " ldr r0, [r4]\n" - " str r1, [r0, #0x68]\n" - " mov r1, #0xd\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x80\n" - " str r2, [r1]\n" - " mov r1, #0xe\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x84\n" - " str r2, [r1]\n" - " mov r1, #0xf\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x88\n" - " str r2, [r1]\n" - " mov r1, #0x10\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0x8c\n" - " str r2, [r1]\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf0\n" - " str r2, [r1]\n" - " mov r1, #0x3b\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf4\n" - " str r2, [r1]\n" - " mov r1, #0x3c\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf8\n" - " str r2, [r1]\n" - " mov r1, #0x3d\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xfc\n" - " str r2, [r1]\n" - " mov r1, #0x3e\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x1\n" - " add r1, r0, r3\n" - " str r2, [r1]\n" - " mov r1, #0x3f\n" - " bl GetMonData\n" - " ldr r1, [r4]\n" - " mov r2, #0x82\n" - " lsl r2, r2, #0x1\n" - " add r1, r1, r2\n" - " str r0, [r1]\n" - " add sp, sp, #0x4\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._570:\n" - " .align 2, 0\n" - "._569:\n" - " .word gUnknown_Debug_2038A1C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5EF4() -{ - asm( - " push {r4, lr}\n" - " ldr r4, ._571\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x98\n" - " mov r1, #0x27\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x9c\n" - " mov r1, #0x1a\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xa0\n" - " mov r1, #0x28\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xa4\n" - " mov r1, #0x1b\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xa8\n" - " mov r1, #0x29\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xac\n" - " mov r1, #0x1c\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xb0\n" - " mov r1, #0x2a\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xb4\n" - " mov r1, #0x1d\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xb8\n" - " mov r1, #0x2b\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xbc\n" - " mov r1, #0x1e\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xc0\n" - " mov r1, #0x2c\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xc4\n" - " mov r1, #0x1f\n" - " bl SetMonData\n" - " ldr r0, [r4]\n" - " bl CalculateMonStats\n" - " ldr r0, [r4]\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf0\n" - " str r2, [r1]\n" - " mov r1, #0x3b\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf4\n" - " str r2, [r1]\n" - " mov r1, #0x3c\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xf8\n" - " str r2, [r1]\n" - " mov r1, #0x3d\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xfc\n" - " str r2, [r1]\n" - " mov r1, #0x3e\n" - " bl GetMonData\n" - " add r2, r0, #0\n" - " ldr r0, [r4]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x1\n" - " add r1, r0, r3\n" - " str r2, [r1]\n" - " mov r1, #0x3f\n" - " bl GetMonData\n" - " ldr r1, [r4]\n" - " mov r2, #0x82\n" - " lsl r2, r2, #0x1\n" - " add r1, r1, r2\n" - " str r0, [r1]\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._572:\n" - " .align 2, 0\n" - "._571:\n" - " .word gUnknown_Debug_2038A1C\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C5FFC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xffffffe0\n" - " ldr r1, ._578\n" - " add r0, sp, #0x10\n" - " mov r2, #0x4\n" - " bl memcpy\n" - " add r7, sp, #0x14\n" - " ldr r1, ._578 + 4\n" - " add r0, r7, #0\n" - " mov r2, #0x8\n" - " bl memcpy\n" - " ldr r5, ._578 + 8\n" - " ldr r2, [r5]\n" - " add r0, r2, #0\n" - " add r0, r0, #0x98\n" - " ldr r4, [r0]\n" - " mov r1, #0x1f\n" - " and r4, r4, r1\n" - " add r0, r0, #0x8\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xa8\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0xa\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xb0\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0xf\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xb8\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x14\n" - " orr r4, r4, r0\n" - " add r0, r2, #0\n" - " add r0, r0, #0xc0\n" - " ldr r0, [r0]\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x19\n" - " orr r4, r4, r0\n" - " ldr r0, [r2, #0x64]\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl NationalPokedexNumToSpecies\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " ldr r0, [r5]\n" - " ldr r2, [r0, #0x68]\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " mov r6, #0x1\n" - " str r6, [sp]\n" - " ldr r3, [r0, #0x74]\n" - " str r3, [sp, #0x4]\n" - " str r6, [sp, #0x8]\n" - " ldr r3, [r0, #0x70]\n" - " str r3, [sp, #0xc]\n" - " add r3, r4, #0\n" - " bl CreateMon\n" - " ldr r2, [r5]\n" - " add r0, r2, #0\n" - " add r0, r0, #0x80\n" - " ldr r0, [r0]\n" - " cmp r0, #0\n" - " beq ._573 @cond_branch\n" - " lsl r1, r0, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r2, #0\n" - " mov r2, #0x0\n" - " bl SetMonMoveSlot\n" - "._573:\n" - " ldr r2, [r5]\n" - " add r0, r2, #0\n" - " add r0, r0, #0x84\n" - " ldr r0, [r0]\n" - " cmp r0, #0\n" - " beq ._574 @cond_branch\n" - " lsl r1, r0, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r2, #0\n" - " mov r2, #0x1\n" - " bl SetMonMoveSlot\n" - "._574:\n" - " ldr r2, [r5]\n" - " add r0, r2, #0\n" - " add r0, r0, #0x88\n" - " ldr r0, [r0]\n" - " cmp r0, #0\n" - " beq ._575 @cond_branch\n" - " lsl r1, r0, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r2, #0\n" - " mov r2, #0x2\n" - " bl SetMonMoveSlot\n" - "._575:\n" - " ldr r2, [r5]\n" - " add r0, r2, #0\n" - " add r0, r0, #0x8c\n" - " ldr r0, [r0]\n" - " cmp r0, #0\n" - " beq ._576 @cond_branch\n" - " lsl r1, r0, #0x10\n" - " lsr r1, r1, #0x10\n" - " add r0, r2, #0\n" - " mov r2, #0x3\n" - " bl SetMonMoveSlot\n" - "._576:\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x6c\n" - " mov r1, #0x19\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x98\n" - " mov r1, #0x27\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x9c\n" - " mov r1, #0x1a\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xa0\n" - " mov r1, #0x28\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xa4\n" - " mov r1, #0x1b\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xa8\n" - " mov r1, #0x29\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xac\n" - " mov r1, #0x1c\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xb0\n" - " mov r1, #0x2a\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xb4\n" - " mov r1, #0x1d\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xb8\n" - " mov r1, #0x2b\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xbc\n" - " mov r1, #0x1e\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xc0\n" - " mov r1, #0x2c\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xc4\n" - " mov r1, #0x1f\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xc8\n" - " mov r1, #0x16\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xcc\n" - " mov r1, #0x17\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xd0\n" - " mov r1, #0x18\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xd4\n" - " mov r1, #0x21\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xd8\n" - " mov r1, #0x2f\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xdc\n" - " mov r1, #0x30\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xe0\n" - " mov r1, #0x20\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xe4\n" - " mov r1, #0x22\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x90\n" - " mov r1, #0xc\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0x94\n" - " mov r1, #0x2e\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r1, r0, #0\n" - " add r1, r1, #0xec\n" - " ldr r2, [r1]\n" - " lsl r2, r2, #0x3\n" - " ldr r1, ._578 + 12\n" - " add r2, r2, r1\n" - " mov r1, #0x37\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " add r2, r0, #0\n" - " add r2, r2, #0xe8\n" - " mov r1, #0x2d\n" - " bl SetMonData\n" - " ldr r1, [r5]\n" - " add r0, r1, #0\n" - " add r0, r0, #0xe8\n" - " ldr r0, [r0]\n" - " cmp r0, #0\n" - " beq ._577 @cond_branch\n" - " add r0, r1, #0\n" - " mov r1, #0x2\n" - " add r2, sp, #0x10\n" - " bl SetMonData\n" - " add r2, sp, #0x1c\n" - " strb r6, [r2]\n" - " ldr r0, [r5]\n" - " mov r1, #0x3\n" - " bl SetMonData\n" - "._577:\n" - " ldr r0, [r5]\n" - " mov r1, #0x7\n" - " add r2, r7, #0\n" - " bl SetMonData\n" - " mov r2, sp\n" - " add r2, r2, #0x1e\n" - " mov r0, #0xff\n" - " strh r0, [r2]\n" - " ldr r0, [r5]\n" - " mov r1, #0x23\n" - " bl SetMonData\n" - " ldr r0, [r5]\n" - " bl CalculateMonStats\n" - " add sp, sp, #0x20\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._579:\n" - " .align 2, 0\n" - "._578:\n" - " .word gUnknown_Debug_083F8758\n" - " .word gUnknown_Debug_083F875C\n" - " .word gUnknown_Debug_2038A1C\n" - " .word gUnknown_Debug_083F86E8+0x4\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C627C() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffff8\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " add r6, r4, #0\n" - " ldr r1, ._584\n" - " mov r0, sp\n" - " mov r2, #0x2\n" - " bl memcpy\n" - " add r5, sp, #0x4\n" - " ldr r1, ._584 + 4\n" - " add r0, r5, #0\n" - " mov r2, #0x2\n" - " bl memcpy\n" - " cmp r4, #0x1\n" - " beq ._580 @cond_branch\n" - " cmp r4, #0x1\n" - " bgt ._581 @cond_branch\n" - " cmp r4, #0\n" - " beq ._582 @cond_branch\n" - " b ._595\n" - "._585:\n" - " .align 2, 0\n" - "._584:\n" - " .word gUnknown_Debug_083F7FD4\n" - " .word gUnknown_Debug_083F8764\n" - "._581:\n" - " cmp r6, #0x2\n" - " beq ._586 @cond_branch\n" - " b ._595\n" - "._582:\n" - " ldr r0, ._589\n" - " ldr r0, [r0]\n" - " ldr r1, ._589 + 4\n" - " add r0, r0, r1\n" - " b ._588\n" - "._590:\n" - " .align 2, 0\n" - "._589:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - "._580:\n" - " ldr r4, ._593\n" - " ldr r3, [r4]\n" - " ldr r1, ._593 + 4\n" - " add r0, r3, r1\n" - " ldrb r2, [r0]\n" - " ldr r1, ._593 + 8\n" - " mov r6, #0xb4\n" - " lsl r6, r6, #0x1\n" - " add r0, r3, r6\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldrb r0, [r0, #0x4]\n" - " sub r0, r0, #0x1\n" - " cmp r2, r0\n" - " bge ._595 @cond_branch\n" - " lsl r2, r2, #0x19\n" - " mov r0, #0xa0\n" - " lsl r0, r0, #0x13\n" - " add r2, r2, r0\n" - " lsr r2, r2, #0x18\n" - " add r0, r5, #0\n" - " mov r1, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, [r4]\n" - " ldr r2, ._593 + 4\n" - " add r1, r0, r2\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r0, [r4]\n" - " add r0, r0, r2\n" - "._588:\n" - " ldrb r2, [r0]\n" - " lsl r2, r2, #0x19\n" - " mov r6, #0xa0\n" - " lsl r6, r6, #0x13\n" - " add r2, r2, r6\n" - " lsr r2, r2, #0x18\n" - " mov r0, sp\n" - " mov r1, #0x1\n" - " bl Menu_PrintText\n" - " b ._595\n" - "._594:\n" - " .align 2, 0\n" - "._593:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - " .word gUnknown_Debug_083F8698\n" - "._586:\n" - " ldr r4, ._596\n" - " ldr r0, [r4]\n" - " ldr r2, ._596 + 4\n" - " add r1, r0, r2\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._595 @cond_branch\n" - " add r2, r0, #0\n" - " lsl r2, r2, #0x19\n" - " mov r6, #0xa0\n" - " lsl r6, r6, #0x13\n" - " add r2, r2, r6\n" - " lsr r2, r2, #0x18\n" - " add r0, r5, #0\n" - " mov r1, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, [r4]\n" - " ldr r2, ._596 + 4\n" - " add r1, r0, r2\n" - " ldrb r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r0, [r4]\n" - " add r0, r0, r2\n" - " ldrb r2, [r0]\n" - " lsl r2, r2, #0x19\n" - " add r2, r2, r6\n" - " lsr r2, r2, #0x18\n" - " mov r0, sp\n" - " mov r1, #0x1\n" - " bl Menu_PrintText\n" - "._595:\n" - " add sp, sp, #0x8\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._597:\n" - " .align 2, 0\n" - "._596:\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6384() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " mov r0, #0x0\n" - " mov r1, #0x4\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r5, #0x0\n" - " ldr r3, ._600\n" - " ldr r1, ._600 + 4\n" - " ldr r0, [r1]\n" - " mov r2, #0xb4\n" - " lsl r2, r2, #0x1\n" - " add r0, r0, r2\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r3\n" - " ldr r0, [r0]\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._598 @cond_branch\n" - " add r4, r1, #0\n" - " ldr r0, ._600 + 8\n" - " mov r9, r0\n" - " mov r8, r3\n" - " add r7, r2, #0\n" - " mov r6, #0x1\n" - "._599:\n" - " ldr r0, [r4]\n" - " add r0, r0, r9\n" - " mov r1, #0xfc\n" - " strb r1, [r0]\n" - " ldr r0, [r4]\n" - " add r1, r1, #0x70\n" - " add r0, r0, r1\n" - " strb r6, [r0]\n" - " ldr r0, [r4]\n" - " ldr r2, ._600 + 12\n" - " add r0, r0, r2\n" - " strb r6, [r0]\n" - " ldr r1, [r4]\n" - " add r2, r2, #0x1\n" - " add r0, r1, r2\n" - " add r1, r1, r7\n" - " ldrb r1, [r1]\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r8\n" - " ldr r1, [r1]\n" - " add r1, r1, r5\n" - " ldrb r1, [r1]\n" - " mov r2, #0x1\n" - " bl debug_80C5738\n" - " ldr r0, [r4]\n" - " add r0, r0, r9\n" - " lsl r2, r5, #0x19\n" - " mov r1, #0xa0\n" - " lsl r1, r1, #0x13\n" - " add r2, r2, r1\n" - " lsr r2, r2, #0x18\n" - " mov r1, #0x2\n" - " bl Menu_PrintText\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " ldr r0, [r4]\n" - " add r0, r0, r7\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r8\n" - " ldr r0, [r0]\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " bne ._599 @cond_branch\n" - "._598:\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._601:\n" - " .align 2, 0\n" - "._600:\n" - " .word gUnknown_Debug_083F8698\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x16b\n" - " .word 0x16d\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C643C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " mov r0, #0x2\n" - " mov r1, #0x5\n" - " mov r2, #0x1c\n" - " mov r3, #0x12\n" - " bl Menu_BlankWindowRect\n" - " mov r5, #0x0\n" - " ldr r6, ._605\n" - " ldr r1, ._605 + 4\n" - " ldr r0, [r1]\n" - " mov r3, #0xb4\n" - " lsl r3, r3, #0x1\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r6\n" - " ldr r0, [r0]\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " beq ._602 @cond_branch\n" - " add r4, r1, #0\n" - " mov r0, #0x1\n" - " mov r8, r0\n" - "._607:\n" - " ldr r0, [r4]\n" - " ldr r7, ._605 + 8\n" - " add r2, r0, r7\n" - " mov r0, #0xfc\n" - " strb r0, [r2]\n" - " ldr r0, [r4]\n" - " mov r2, #0xb6\n" - " lsl r2, r2, #0x1\n" - " add r0, r0, r2\n" - " mov r7, r8\n" - " strb r7, [r0]\n" - " ldr r2, [r4]\n" - " ldr r7, ._605 + 12\n" - " add r0, r2, r7\n" - " ldrb r0, [r0]\n" - " cmp r5, r0\n" - " bne ._603 @cond_branch\n" - " ldr r0, ._605 + 16\n" - " add r2, r2, r0\n" - " mov r0, #0x2\n" - " strb r0, [r2]\n" - " ldr r1, [r1]\n" - " mov r2, #0xb7\n" - " lsl r2, r2, #0x1\n" - " add r0, r1, r2\n" - " add r1, r1, r3\n" - " ldrb r1, [r1]\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r6\n" - " ldr r1, [r1]\n" - " add r1, r1, r5\n" - " ldrb r1, [r1]\n" - " mov r2, #0x2\n" - " bl debug_80C5738\n" - " b ._604\n" - "._606:\n" - " .align 2, 0\n" - "._605:\n" - " .word gUnknown_Debug_083F8698\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x16b\n" - " .word 0x169\n" - " .word 0x16d\n" - "._603:\n" - " ldr r3, ._608\n" - " add r0, r2, r3\n" - " mov r7, r8\n" - " strb r7, [r0]\n" - " ldr r1, [r1]\n" - " mov r2, #0xb7\n" - " lsl r2, r2, #0x1\n" - " add r0, r1, r2\n" - " ldr r2, ._608 + 4\n" - " sub r3, r3, #0x5\n" - " add r1, r1, r3\n" - " ldrb r1, [r1]\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " ldr r1, [r1]\n" - " add r1, r1, r5\n" - " ldrb r1, [r1]\n" - " mov r2, #0x1\n" - " bl debug_80C5738\n" - "._604:\n" - " ldr r0, [r4]\n" - " ldr r7, ._608 + 8\n" - " add r0, r0, r7\n" - " lsl r2, r5, #0x19\n" - " mov r1, #0xa0\n" - " lsl r1, r1, #0x13\n" - " add r2, r2, r1\n" - " lsr r2, r2, #0x18\n" - " mov r1, #0x2\n" - " bl Menu_PrintText\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " ldr r6, ._608 + 4\n" - " add r1, r4, #0\n" - " ldr r0, [r4]\n" - " mov r3, #0xb4\n" - " lsl r3, r3, #0x1\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r6\n" - " ldr r0, [r0]\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " cmp r0, #0xff\n" - " bne ._607 @cond_branch\n" - "._602:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._609:\n" - " .align 2, 0\n" - "._608:\n" - " .word 0x16d\n" - " .word gUnknown_Debug_083F8698\n" - " .word 0x16b\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6544() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r9, r0\n" - " ldr r0, ._614\n" - " mov r8, r0\n" - " ldr r6, ._614 + 4\n" - " ldr r1, [r6]\n" - " mov r5, #0xb4\n" - " lsl r5, r5, #0x1\n" - " add r0, r1, r5\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r8\n" - " ldr r4, ._614 + 8\n" - " add r1, r1, r4\n" - " ldrb r1, [r1]\n" - " ldr r0, [r0]\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " bl debug_80C5B60\n" - " add r7, r0, #0\n" - " ldr r2, ._614 + 12\n" - " ldr r3, [r6]\n" - " add r5, r3, r5\n" - " ldrb r0, [r5]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r8\n" - " add r4, r3, r4\n" - " ldrb r1, [r4]\n" - " ldr r0, [r0]\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r2, r2, #0x4\n" - " add r0, r0, r2\n" - " ldr r1, [r0]\n" - " ldr r5, [r1]\n" - " ldr r4, [r1, #0x4]\n" - " ldr r2, ._614 + 16\n" - " mov r6, #0xb5\n" - " lsl r6, r6, #0x1\n" - " add r0, r3, r6\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r2\n" - " ldr r3, [r0]\n" - " ldrb r0, [r1, #0x8]\n" - " cmp r0, #0\n" - " bne ._623 @cond_branch\n" - " mov r0, r9\n" - " cmp r0, #0x1\n" - " beq ._611 @cond_branch\n" - " cmp r0, #0x2\n" - " beq ._612 @cond_branch\n" - " b ._623\n" - "._615:\n" - " .align 2, 0\n" - "._614:\n" - " .word gUnknown_Debug_083F8698\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - " .word gUnknown_Debug_083F8554\n" - " .word gUnknown_Debug_083F8768\n" - "._611:\n" - " sub r0, r4, r3\n" - " cmp r7, r0\n" - " bcs ._616 @cond_branch\n" - " add r7, r7, r3\n" - " b ._623\n" - "._616:\n" - " cmp r7, r4\n" - " bcc ._622 @cond_branch\n" - " b ._619\n" - "._612:\n" - " add r0, r5, r3\n" - " cmp r7, r0\n" - " bls ._620 @cond_branch\n" - " sub r7, r7, r3\n" - " b ._623\n" - "._620:\n" - " cmp r7, r5\n" - " bls ._622 @cond_branch\n" - "._619:\n" - " add r7, r5, #0\n" - " b ._623\n" - "._622:\n" - " add r7, r4, #0\n" - "._623:\n" - " ldr r1, ._624\n" - " ldr r0, ._624 + 4\n" - " ldr r2, [r0]\n" - " mov r3, #0xb4\n" - " lsl r3, r3, #0x1\n" - " add r0, r2, r3\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r6, ._624 + 8\n" - " add r1, r2, r6\n" - " ldrb r1, [r1]\n" - " ldr r0, [r0]\n" - " add r0, r0, r1\n" - " ldrb r1, [r0]\n" - " add r0, r7, #0\n" - " bl debug_80C5B74\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._625:\n" - " .align 2, 0\n" - "._624:\n" - " .word gUnknown_Debug_083F8698\n" - " .word gUnknown_Debug_2038A1C\n" - " .word 0x169\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6630() -{ - asm( - " push {r4, r5, lr}\n" - " add r4, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " lsl r3, r3, #0x18\n" - " lsr r3, r3, #0x18\n" - " mov r0, #0xfc\n" - " strb r0, [r4]\n" - " add r4, r4, #0x1\n" - " mov r0, #0x1\n" - " strb r0, [r4]\n" - " add r4, r4, #0x1\n" - " cmp r2, #0x2\n" - " bne ._626 @cond_branch\n" - " ldr r0, ._629\n" - " ldr r0, [r0]\n" - " mov r5, #0xb5\n" - " lsl r5, r5, #0x1\n" - " add r0, r0, r5\n" - " ldrb r0, [r0]\n" - " cmp r3, r0\n" - " beq ._627 @cond_branch\n" - " strb r2, [r4]\n" - " b ._628\n" - "._630:\n" - " .align 2, 0\n" - "._629:\n" - " .word gUnknown_Debug_2038A1C\n" - "._627:\n" - " mov r0, #0x4\n" - "._626:\n" - " strb r0, [r4]\n" - "._628:\n" - " add r0, r1, #0\n" - " add r0, r0, #0xa1\n" - " strb r0, [r4, #0x1]\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6678() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " mov r9, r0\n" - " add r6, r1, #0\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " lsl r3, r3, #0x18\n" - " lsr r3, r3, #0x18\n" - " mov r8, r3\n" - " mov r7, #0x0\n" - " sub r0, r2, #1\n" - " cmp r0, #0x9\n" - " bhi ._644 @cond_branch\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._633\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._634:\n" - " .align 2, 0\n" - "._633:\n" - " .word ._632\n" - "._632:\n" - " .word ._635\n" - " .word ._636\n" - " .word ._637\n" - " .word ._638\n" - " .word ._639\n" - " .word ._640\n" - " .word ._641\n" - " .word ._642\n" - " .word ._643\n" - " .word ._644\n" - "._644:\n" - " mov r0, r9\n" - " add r4, r0, r7\n" - " ldr r5, ._645\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x9\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._643:\n" - " mov r1, r9\n" - " add r4, r1, r7\n" - " ldr r5, ._645 + 4\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x8\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._642:\n" - " mov r0, r9\n" - " add r4, r0, r7\n" - " ldr r5, ._645 + 8\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x7\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._641:\n" - " mov r1, r9\n" - " add r4, r1, r7\n" - " ldr r5, ._645 + 12\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x6\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._640:\n" - " mov r0, r9\n" - " add r4, r0, r7\n" - " ldr r5, ._645 + 16\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x5\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._639:\n" - " mov r1, r9\n" - " add r4, r1, r7\n" - " ldr r5, ._645 + 20\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x4\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._638:\n" - " mov r0, r9\n" - " add r4, r0, r7\n" - " mov r5, #0xfa\n" - " lsl r5, r5, #0x2\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x3\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " add r1, r5, #0\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._637:\n" - " mov r1, r9\n" - " add r4, r1, r7\n" - " add r0, r6, #0\n" - " mov r1, #0x64\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x2\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " mov r1, #0x64\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._636:\n" - " mov r0, r9\n" - " add r4, r0, r7\n" - " add r0, r6, #0\n" - " mov r1, #0xa\n" - " bl __udivsi3\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " add r0, r4, #0\n" - " mov r2, r8\n" - " mov r3, #0x1\n" - " bl debug_80C6630\n" - " add r0, r6, #0\n" - " mov r1, #0xa\n" - " bl __umodsi3\n" - " add r6, r0, #0\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - "._635:\n" - " mov r1, r9\n" - " add r0, r1, r7\n" - " lsl r1, r6, #0x18\n" - " lsr r1, r1, #0x18\n" - " mov r2, r8\n" - " mov r3, #0x0\n" - " bl debug_80C6630\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._646:\n" - " .align 2, 0\n" - "._645:\n" - " .word 0x3b9aca00\n" - " .word 0x5f5e100\n" - " .word 0x989680\n" - " .word 0xf4240\n" - " .word 0x186a0\n" - " .word 0x2710\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C689C() -{ - asm( - " push {r4, r5, lr}\n" - " add r5, r0, #0\n" - " add r4, r1, #0\n" - " lsl r2, r2, #0x18\n" - " lsr r2, r2, #0x18\n" - " mov r3, #0x0\n" - " ldrb r0, [r4]\n" - " b ._647\n" - "._649:\n" - " add r1, r5, r3\n" - " add r0, r4, r3\n" - " ldrb r0, [r0]\n" - " strb r0, [r1]\n" - " add r0, r3, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r3, r0, #0x18\n" - " add r0, r4, r3\n" - " ldrb r0, [r0]\n" - "._647:\n" - " cmp r0, #0xff\n" - " beq ._648 @cond_branch\n" - " cmp r3, r2\n" - " bcc ._649 @cond_branch\n" - "._648:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C68CC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xfffffff8\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " lsl r1, r1, #0x18\n" - " lsr r6, r1, #0x18\n" - " lsl r2, r2, #0x18\n" - " lsr r5, r2, #0x18\n" - " lsl r3, r3, #0x18\n" - " lsr r3, r3, #0x18\n" - " mov r2, #0x0\n" - " mov r1, #0x0\n" - "._650:\n" - " mov r7, sp\n" - " add r0, r7, r2\n" - " strb r1, [r0]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x3\n" - " bls ._650 @cond_branch\n" - " mov r1, sp\n" - " mov r0, #0xff\n" - " strb r0, [r1, #0x4]\n" - " cmp r3, #0x2\n" - " beq ._651 @cond_branch\n" - " cmp r3, #0x2\n" - " bgt ._652 @cond_branch\n" - " cmp r3, #0x1\n" - " beq ._653 @cond_branch\n" - " b ._654\n" - "._652:\n" - " cmp r3, #0x3\n" - " beq ._655 @cond_branch\n" - "._654:\n" - " mov r1, sp\n" - " lsr r0, r4, #0xc\n" - " strb r0, [r1]\n" - "._655:\n" - " mov r1, sp\n" - " mov r0, #0xf0\n" - " lsl r0, r0, #0x4\n" - " and r0, r0, r4\n" - " lsr r0, r0, #0x8\n" - " strb r0, [r1, #0x1]\n" - "._651:\n" - " mov r1, sp\n" - " mov r0, #0xf0\n" - " and r0, r0, r4\n" - " lsr r0, r0, #0x4\n" - " strb r0, [r1, #0x2]\n" - "._653:\n" - " mov r2, sp\n" - " mov r1, #0xf\n" - " add r0, r4, #0\n" - " and r0, r0, r1\n" - " strb r0, [r2, #0x3]\n" - " mov r2, #0x0\n" - "._658:\n" - " mov r0, sp\n" - " add r1, r0, r2\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x9\n" - " bhi ._656 @cond_branch\n" - " add r0, r0, #0xa1\n" - " b ._657\n" - "._656:\n" - " add r0, r0, #0xb1\n" - "._657:\n" - " strb r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x3\n" - " bls ._658 @cond_branch\n" - " mov r0, #0x4\n" - " sub r0, r0, r3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r0, r0, sp\n" - " add r1, r6, #0\n" - " add r2, r5, #0\n" - " bl Menu_PrintText\n" - " add sp, sp, #0x8\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void InitSeePokemonGraphics() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffff8\n" - " bl debug_80C35DC\n" - " ldr r1, ._659\n" - " ldr r2, ._659 + 4\n" - " ldr r0, ._659 + 8\n" - " str r1, [r0]\n" - " str r2, [r0, #0x4]\n" - " ldr r1, ._659 + 12\n" - " str r1, [r0, #0x8]\n" - " ldr r0, [r0, #0x8]\n" - " ldr r0, ._659 + 16\n" - " mov r1, #0x80\n" - " mov r2, #0x60\n" - " bl LoadPalette\n" - " ldr r1, ._659 + 20\n" - " add r0, sp, #0x4\n" - " strh r1, [r0]\n" - " mov r1, #0x0\n" - " mov r2, #0x2\n" - " bl LoadPalette\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r5, #0x0\n" - " str r5, [sp]\n" - " mov r1, #0x0\n" - " mov r2, #0x10\n" - " mov r3, #0x0\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._659 + 24\n" - " mov r6, #0x0\n" - " strh r5, [r0]\n" - " add r0, r0, #0x4\n" - " strh r5, [r0]\n" - " sub r0, r0, #0x2\n" - " strh r5, [r0]\n" - " add r0, r0, #0x4\n" - " strh r5, [r0]\n" - " ldr r1, ._659 + 28\n" - " mov r0, #0x3f\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " mov r0, #0x1f\n" - " strh r0, [r1]\n" - " add r1, r1, #0x6\n" - " mov r0, #0xf1\n" - " strh r0, [r1]\n" - " ldr r0, ._659 + 32\n" - " strh r5, [r0]\n" - " add r1, r1, #0x4\n" - " mov r0, #0x7\n" - " strh r0, [r1]\n" - " ldr r3, ._659 + 36\n" - " ldrh r2, [r3]\n" - " strh r5, [r3]\n" - " ldr r4, ._659 + 40\n" - " ldrh r0, [r4]\n" - " mov r1, #0x1\n" - " orr r0, r0, r1\n" - " strh r0, [r4]\n" - " strh r2, [r3]\n" - " ldr r0, ._659 + 44\n" - " bl SetVBlankCallback\n" - " ldr r0, ._659 + 48\n" - " bl SetMainCallback2\n" - " bl sub_809D51C\n" - " ldr r1, ._659 + 52\n" - " ldr r2, ._659 + 56\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r2, ._659 + 60\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " sub r1, r1, #0xa\n" - " mov r2, #0xcd\n" - " lsl r2, r2, #0x6\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, ._659 + 64\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " ldr r1, ._659 + 68\n" - " ldr r0, ._659 + 72\n" - " str r0, [r1]\n" - " ldr r1, ._659 + 76\n" - " strh r1, [r0]\n" - " strb r6, [r0, #0x2]\n" - " strb r6, [r0, #0x3]\n" - " strb r6, [r0, #0x5]\n" - " strb r6, [r0, #0x7]\n" - " strb r6, [r0, #0xa]\n" - " strb r6, [r0, #0x8]\n" - " ldr r4, ._659 + 80\n" - " add r0, r4, #0\n" - " mov r1, #0x6c\n" - " mov r2, #0x74\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " ldr r6, ._659 + 84\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " strh r5, [r0, #0x2e]\n" - " mov r1, #0x0\n" - " bl StartSpriteAnim\n" - " add r0, r4, #0\n" - " mov r1, #0x6c\n" - " mov r2, #0x74\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " mov r1, #0x1\n" - " strh r1, [r0, #0x2e]\n" - " bl StartSpriteAnim\n" - " add r0, r4, #0\n" - " mov r1, #0x6c\n" - " mov r2, #0x74\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " mov r1, #0x2\n" - " strh r1, [r0, #0x2e]\n" - " bl StartSpriteAnim\n" - " add sp, sp, #0x8\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._660:\n" - " .align 2, 0\n" - "._659:\n" - " .word byte_83F88EC\n" - " .word 0x600e000\n" - " .word 0x40000d4\n" - " .word 0x80000400\n" - " .word word_83F888C\n" - " .word 0x7fff\n" - " .word 0x4000040\n" - " .word 0x4000048\n" - " .word 0x4000052\n" - " .word 0x4000208\n" - " .word 0x4000200\n" - " .word debug_80C3758+1\n" - " .word debug_80C370C+1\n" - " .word 0x4000008\n" - " .word 0x1f0b\n" - " .word 0x1e0a\n" - " .word debug_80C6B00+1\n" - " .word gUnknown_Debug_2038A20\n" - " .word +0x2018000\n" - " .word 0x115\n" - " .word gSpriteTemplate_83F8874\n" - " .word gSprites\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6B00() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xffffffec\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " ldr r1, ._666\n" - " mov r0, sp\n" - " mov r2, #0x12\n" - " bl memcpy\n" - " mov r0, #0xa\n" - " mov r1, #0x0\n" - " mov r2, #0xf\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x9\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x0\n" - " mov r1, #0xa\n" - " mov r2, #0x9\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x10\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._666 + 4\n" - " mov r1, #0x11\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._666 + 8\n" - " mov r1, #0x1b\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._666 + 12\n" - " mov r1, #0x11\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, #0xa\n" - " mov r1, #0x8\n" - " mov r2, #0x1d\n" - " mov r3, #0xc\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r2, #0x0\n" - " ldr r4, ._666 + 16\n" - " ldr r0, ._666 + 20\n" - " add r3, r0, #0\n" - "._661:\n" - " lsl r0, r2, #0x1\n" - " add r0, r0, r4\n" - " add r1, r2, r3\n" - " strh r1, [r0]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0xe\n" - " bls ._661 @cond_branch\n" - " mov r2, #0x0\n" - " ldr r5, ._666 + 24\n" - " lsl r6, r7, #0x2\n" - " mov r8, r6\n" - " ldr r4, ._666 + 28\n" - " ldr r0, ._666 + 32\n" - " add r3, r0, #0\n" - "._662:\n" - " lsl r0, r2, #0x1\n" - " add r0, r0, r4\n" - " add r1, r2, r3\n" - " strh r1, [r0]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0xe\n" - " bls ._662 @cond_branch\n" - " add r0, r5, #0\n" - " mov r1, #0x14\n" - " mov r2, #0xa\n" - " bl Menu_PrintText\n" - " mov r0, #0xa\n" - " mov r1, #0xd\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r1, sp\n" - " mov r0, #0x23\n" - " strb r0, [r1]\n" - " mov r2, #0x0\n" - " ldr r4, ._666 + 36\n" - " mov r5, #0x93\n" - " lsl r5, r5, #0x8\n" - " add r3, r5, #0\n" - "._663:\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r4\n" - " mov r6, sp\n" - " add r0, r6, r2\n" - " ldrb r0, [r0]\n" - " add r0, r0, r3\n" - " strh r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x11\n" - " bls ._663 @cond_branch\n" - " mov r1, sp\n" - " mov r0, #0x24\n" - " strb r0, [r1]\n" - " mov r2, #0x0\n" - " ldr r5, ._666 + 40\n" - " ldr r4, ._666 + 44\n" - " mov r0, #0x93\n" - " lsl r0, r0, #0x8\n" - " add r3, r0, #0\n" - "._664:\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r4\n" - " mov r6, sp\n" - " add r0, r6, r2\n" - " ldrb r0, [r0]\n" - " add r0, r0, r3\n" - " strh r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x11\n" - " bls ._664 @cond_branch\n" - " mov r1, sp\n" - " mov r0, #0x25\n" - " strb r0, [r1]\n" - " mov r2, #0x0\n" - " ldr r4, ._666 + 48\n" - " mov r0, #0x93\n" - " lsl r0, r0, #0x8\n" - " add r3, r0, #0\n" - "._665:\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r4\n" - " mov r6, sp\n" - " add r0, r6, r2\n" - " ldrb r0, [r0]\n" - " add r0, r0, r3\n" - " strh r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x11\n" - " bls ._665 @cond_branch\n" - " add r0, r5, #0\n" - " mov r1, #0xf\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " ldr r1, ._666 + 52\n" - " ldr r2, ._666 + 56\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r5, ._666 + 60\n" - " add r0, r5, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._666 + 64\n" - " mov r6, r8\n" - " add r0, r6, r7\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._666 + 68\n" - " str r1, [r0]\n" - " add sp, sp, #0x14\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._667:\n" - " .align 2, 0\n" - "._666:\n" - " .word gUnknown_Debug_083F8815\n" - " .word gUnknown_Debug_083F87D0\n" - " .word gUnknown_Debug_083F87D8\n" - " .word gUnknown_Debug_083F87E0\n" - " .word 0x600fa56\n" - " .word 0xa311\n" - " .word gUnknown_Debug_083F87F4\n" - " .word 0x600f256\n" - " .word 0x8301\n" - " .word 0x600f396\n" - " .word gUnknown_Debug_083F8801\n" - " .word 0x600f3d6\n" - " .word 0x600f416\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x699f\n" - " .word gTasks\n" - " .word debug_80C6CB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6CB8() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xfffffff4\n" - " mov sl, r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov sl, r0\n" - " ldr r5, ._668\n" - " ldr r4, [r5]\n" - " ldrh r2, [r4]\n" - " lsl r0, r2, #0x3\n" - " ldr r1, ._668 + 4\n" - " add r0, r0, r1\n" - " ldr r1, ._668 + 8\n" - " lsl r2, r2, #0x2\n" - " add r2, r2, r1\n" - " ldrb r1, [r2]\n" - " ldrb r2, [r2, #0x1]\n" - " ldr r3, ._668 + 12\n" - " mov r8, r3\n" - " ldr r6, [r3]\n" - " str r6, [sp, #0x8]\n" - " ldr r3, [r3, #0x4]\n" - " str r3, [sp]\n" - " ldrh r3, [r4]\n" - " str r3, [sp, #0x4]\n" - " add r3, r6, #0\n" - " bl DecompressPicFromTable_2\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r7, ._668 + 16\n" - " add r0, r0, r7\n" - " bl LoadCompressedObjectPalette\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x1\n" - " bl GetMonSpriteTemplate_803C56C\n" - " ldr r0, ._668 + 20\n" - " mov r1, #0x28\n" - " mov r2, #0x28\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " ldr r1, [r5]\n" - " strb r0, [r1, #0x2]\n" - " ldr r2, [r5]\n" - " ldrb r1, [r2, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._668 + 24\n" - " add r0, r0, r1\n" - " ldr r3, ._668 + 28\n" - " mov r9, r3\n" - " str r3, [r0]\n" - " ldrb r0, [r2, #0x2]\n" - " lsl r1, r0, #0x4\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " ldr r6, ._668 + 32\n" - " add r1, r1, r6\n" - " ldrb r2, [r1, #0x5]\n" - " mov r6, #0xd\n" - " neg r6, r6\n" - " add r0, r6, #0\n" - " and r0, r0, r2\n" - " strb r0, [r1, #0x5]\n" - " ldr r4, [r5]\n" - " ldrh r2, [r4]\n" - " lsl r0, r2, #0x3\n" - " ldr r1, ._668 + 36\n" - " add r0, r0, r1\n" - " ldr r1, ._668 + 40\n" - " lsl r2, r2, #0x2\n" - " add r2, r2, r1\n" - " ldrb r1, [r2]\n" - " ldrb r2, [r2, #0x1]\n" - " mov r7, r8\n" - " ldr r3, [r7, #0x8]\n" - " str r3, [sp]\n" - " ldrh r3, [r4]\n" - " str r3, [sp, #0x4]\n" - " ldr r3, [sp, #0x8]\n" - " bl DecompressPicFromTable_2\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, ._668 + 16\n" - " add r0, r0, r1\n" - " bl LoadCompressedObjectPalette\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x2\n" - " bl GetMonSpriteTemplate_803C56C\n" - " ldr r0, ._668 + 20\n" - " mov r1, #0x28\n" - " mov r2, #0x78\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " ldr r1, [r5]\n" - " strb r0, [r1, #0x3]\n" - " ldr r2, [r5]\n" - " ldrb r1, [r2, #0x3]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " ldr r3, ._668 + 24\n" - " add r0, r0, r3\n" - " mov r7, r9\n" - " str r7, [r0]\n" - " ldrb r1, [r2, #0x3]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._668 + 32\n" - " add r0, r0, r1\n" - " ldrb r1, [r0, #0x5]\n" - " and r6, r6, r1\n" - " strb r6, [r0, #0x5]\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " ldr r1, ._668 + 44\n" - " mov r2, #0x0\n" - " str r2, [sp]\n" - " str r2, [sp, #0x4]\n" - " mov r2, #0x68\n" - " mov r3, #0x2c\n" - " bl CreateMonIcon\n" - " ldr r1, [r5]\n" - " strb r0, [r1, #0x4]\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " bl SpeciesToNationalPokedexNum\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r2, #0xff\n" - " lsl r2, r2, #0x2\n" - " mov r1, #0x2\n" - " bl sub_8091738\n" - " ldr r1, ._668 + 48\n" - " ldr r3, ._668 + 52\n" - " add r0, r3, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r6, ._668 + 56\n" - " add r0, r6, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x3e\n" - " ldr r7, ._668 + 60\n" - " add r0, r7, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r2, ._668 + 64\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x11\n" - " mov r2, #0x3\n" - " bl debug_80C3800\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x1a\n" - " mov r2, #0x5\n" - " bl debug_80C376C\n" - " ldr r2, [r5]\n" - " ldrb r1, [r2, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " ldr r3, ._668 + 32\n" - " add r0, r0, r3\n" - " ldrb r0, [r0, #0x5]\n" - " lsr r0, r0, #0x4\n" - " strb r0, [r2, #0x6]\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " ldr r4, ._668 + 68\n" - " add r0, r0, r4\n" - " ldr r6, ._668 + 72\n" - " add r1, r4, r6\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r4\n" - " ldr r1, ._668 + 76\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r1, ._668 + 80\n" - " mov r7, sl\n" - " lsl r0, r7, #0x2\n" - " add r0, r0, sl\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._668 + 84\n" - " str r1, [r0]\n" - " ldr r0, [r5]\n" - " mov r1, #0x0\n" - " strb r1, [r0, #0x9]\n" - " bl StopCryAndClearCrySongs\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x0\n" - " bl PlayCry1\n" - " add sp, sp, #0xc\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._669:\n" - " .align 2, 0\n" - "._668:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gMonFrontPicTable\n" - " .word gMonFrontPicCoords\n" - " .word gUnknown_081FAF4C\n" - " .word gMonPaletteTable\n" - " .word gUnknown_02024E8C\n" - " .word gSprites+0x1c\n" - " .word debug_69+1\n" - " .word gSprites\n" - " .word gMonBackPicTable\n" - " .word gMonBackPicCoords\n" - " .word sub_809D62C+1\n" - " .word 0x600f858\n" - " .word 0xf3fc\n" - " .word 0xf3fd\n" - " .word 0xf3fe\n" - " .word 0xf3ff\n" - " .word gPlttBufferUnfaded+0x200\n" - " .word 0xffffff00\n" - " .word gPlttBufferFaded+0x100\n" - " .word gTasks\n" - " .word debug_80C6EE8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6EE8() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " lsl r6, r6, #0x18\n" - " lsr r6, r6, #0x18\n" - " ldr r4, ._670\n" - " ldr r5, ._670 + 4\n" - " ldr r1, [r5]\n" - " add r1, r1, #0x10\n" - " add r0, r4, #0\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, ._670 + 8\n" - " add r4, r4, r0\n" - " ldr r3, [r5]\n" - " ldrb r0, [r3, #0x7]\n" - " add r0, r0, #0x81\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r4\n" - " ldrh r4, [r0]\n" - " mov r1, #0x1f\n" - " and r1, r1, r4\n" - " ldrb r2, [r3, #0xc]\n" - " mov r0, #0x20\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " orr r0, r0, r1\n" - " strb r0, [r3, #0xc]\n" - " ldr r3, [r5]\n" - " mov r1, #0xf8\n" - " lsl r1, r1, #0x2\n" - " and r1, r1, r4\n" - " ldrh r2, [r3, #0xc]\n" - " ldr r0, ._670 + 12\n" - " and r0, r0, r2\n" - " orr r0, r0, r1\n" - " strh r0, [r3, #0xc]\n" - " mov r1, #0xf8\n" - " lsl r1, r1, #0x7\n" - " and r1, r1, r4\n" - " lsr r1, r1, #0x8\n" - " ldrb r2, [r3, #0xd]\n" - " mov r0, #0x7d\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " orr r0, r0, r1\n" - " strb r0, [r3, #0xd]\n" - " ldr r2, [r5]\n" - " ldrb r1, [r2, #0xd]\n" - " mov r0, #0x7f\n" - " and r0, r0, r1\n" - " strb r0, [r2, #0xd]\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x7]\n" - " add r0, r0, #0x1\n" - " mov r1, #0xb\n" - " mov r2, #0xa\n" - " mov r3, #0x2\n" - " bl debug_80C68CC\n" - " ldr r0, ._670 + 16\n" - " mov r1, #0xd\n" - " mov r2, #0xa\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0xe\n" - " mov r2, #0xa\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " ldr r1, ._670 + 20\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._670 + 24\n" - " str r1, [r0]\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._671:\n" - " .align 2, 0\n" - "._670:\n" - " .word gPlttBufferUnfaded+0x100\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0xffffff00\n" - " .word 0xfffffc1f\n" - " .word gUnknown_Debug_083F8813\n" - " .word gTasks\n" - " .word debug_80C6FA8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C6FA8() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " ldr r1, ._674\n" - " ldrh r2, [r1, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " add r4, r1, #0\n" - " cmp r0, #0\n" - " beq ._672 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._674 + 4\n" - " bl SetMainCallback2\n" - " ldr r1, ._674 + 8\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._674 + 12\n" - " str r1, [r0]\n" - " b ._703\n" - "._675:\n" - " .align 2, 0\n" - "._674:\n" - " .word gMain\n" - " .word debug_80C370C+1\n" - " .word gTasks\n" - " .word debug_80C373C+1\n" - "._672:\n" - " ldrh r1, [r4, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._676 @cond_branch\n" - " ldr r4, ._678\n" - " ldr r0, [r4]\n" - " ldrh r1, [r0]\n" - " mov r0, #0x0\n" - " b ._677\n" - "._679:\n" - " .align 2, 0\n" - "._678:\n" - " .word gUnknown_Debug_2038A20\n" - "._676:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._680 @cond_branch\n" - " ldr r4, ._682\n" - " ldr r0, [r4]\n" - " ldrh r1, [r0]\n" - " mov r0, #0x1\n" - "._677:\n" - " bl debug_80C3878\n" - " ldr r1, [r4]\n" - " strh r0, [r1]\n" - " ldr r1, ._682 + 4\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._682 + 8\n" - " str r1, [r0]\n" - " b ._703\n" - "._683:\n" - " .align 2, 0\n" - "._682:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gTasks\n" - " .word debug_80C71FC+1\n" - "._680:\n" - " mov r3, #0x1\n" - " and r3, r3, r2\n" - " cmp r3, #0\n" - " beq ._684 @cond_branch\n" - " ldr r0, ._686\n" - " ldr r1, [r0]\n" - " mov r0, #0x1\n" - " strb r0, [r1, #0x5]\n" - " ldr r1, ._686 + 4\n" - " ldr r2, ._686 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._686 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._686 + 16\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._686 + 20\n" - " str r1, [r0]\n" - " b ._703\n" - "._687:\n" - " .align 2, 0\n" - "._686:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x4167\n" - " .word gTasks\n" - " .word debug_80C7294+1\n" - "._684:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._689 @cond_branch\n" - " ldr r1, ._691\n" - " ldr r2, [r1]\n" - " ldrb r0, [r2, #0x7]\n" - " cmp r0, #0xd\n" - " bhi ._689 @cond_branch\n" - " lsl r0, r0, #0x1\n" - " ldr r2, ._691 + 4\n" - " add r0, r0, r2\n" - " strh r3, [r0]\n" - " ldr r1, [r1]\n" - " ldrb r0, [r1, #0x7]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1, #0x7]\n" - " b ._695\n" - "._692:\n" - " .align 2, 0\n" - "._691:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x5000102\n" - "._689:\n" - " ldrh r1, [r4, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._694 @cond_branch\n" - " ldr r2, ._696\n" - " ldr r1, [r2]\n" - " ldrb r0, [r1, #0x7]\n" - " cmp r0, #0\n" - " beq ._694 @cond_branch\n" - " lsl r0, r0, #0x1\n" - " ldr r1, ._696 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " ldr r1, [r2]\n" - " ldrb r0, [r1, #0x7]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1, #0x7]\n" - " b ._695\n" - "._697:\n" - " .align 2, 0\n" - "._696:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x5000102\n" - "._694:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._698 @cond_branch\n" - " ldr r4, ._701\n" - " ldr r2, [r4]\n" - " ldrb r0, [r2, #0x9]\n" - " mov r1, #0x1\n" - " eor r0, r0, r1\n" - " strb r0, [r2, #0x9]\n" - " ldr r1, [r4]\n" - " ldrb r0, [r1, #0x9]\n" - " cmp r0, #0\n" - " beq ._699 @cond_branch\n" - " ldrh r0, [r1]\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " bl GetMonSpritePalFromOtIdPersonality\n" - " ldr r1, [r4]\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x14\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x11\n" - " add r1, r1, r2\n" - " lsr r1, r1, #0x10\n" - " mov r2, #0x20\n" - " bl LoadCompressedPalette\n" - " b ._700\n" - "._702:\n" - " .align 2, 0\n" - "._701:\n" - " .word gUnknown_Debug_2038A20\n" - "._699:\n" - " ldrh r0, [r1]\n" - " mov r1, #0x0\n" - " mov r2, #0x9\n" - " bl GetMonSpritePalFromOtIdPersonality\n" - " ldr r1, [r4]\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x14\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x11\n" - " add r1, r1, r2\n" - " lsr r1, r1, #0x10\n" - " mov r2, #0x20\n" - " bl LoadCompressedPalette\n" - "._700:\n" - " ldr r5, ._704\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " ldr r4, ._704 + 4\n" - " add r0, r0, r4\n" - " ldr r2, ._704 + 8\n" - " add r1, r4, r2\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r4\n" - " ldr r1, ._704 + 12\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - "._695:\n" - " ldr r1, ._704 + 16\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._704 + 20\n" - " str r1, [r0]\n" - " b ._703\n" - "._705:\n" - " .align 2, 0\n" - "._704:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gPlttBufferUnfaded+0x200\n" - " .word 0xffffff00\n" - " .word gPlttBufferFaded+0x100\n" - " .word gTasks\n" - " .word debug_80C6EE8+1\n" - "._698:\n" - " mov r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._706 @cond_branch\n" - " bl StopCryAndClearCrySongs\n" - " ldr r0, ._707\n" - " ldr r0, [r0]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x0\n" - " bl PlayCry1\n" - "._706:\n" - " ldr r2, ._707\n" - " ldr r1, [r2]\n" - " ldrb r0, [r1, #0x8]\n" - " add r0, r0, #0x4\n" - " strb r0, [r1, #0x8]\n" - " ldr r3, [r2]\n" - " ldrb r1, [r3, #0x8]\n" - " mov r0, #0x1f\n" - " and r0, r0, r1\n" - " strb r0, [r3, #0x8]\n" - " ldr r0, [r2]\n" - " ldrb r1, [r0, #0x7]\n" - " lsl r1, r1, #0x1\n" - " ldr r2, ._707 + 4\n" - " add r1, r1, r2\n" - " ldr r2, ._707 + 8\n" - " ldrb r0, [r0, #0x8]\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r2\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - "._703:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._708:\n" - " .align 2, 0\n" - "._707:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x5000142\n" - " .word gUnknown_Debug_083F8790\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C71FC() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " ldr r6, ._709\n" - " ldr r4, ._709 + 4\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldrb r0, [r0, #0x5]\n" - " lsr r0, r0, #0x4\n" - " bl GetSpritePaletteTagByPaletteNum\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl FreeSpritePaletteByTag\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " bl DestroySprite\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x3]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldrb r0, [r0, #0x5]\n" - " lsr r0, r0, #0x4\n" - " bl GetSpritePaletteTagByPaletteNum\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl FreeSpritePaletteByTag\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x3]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " bl DestroySprite\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x4]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " bl sub_809D510\n" - " ldr r1, ._709 + 8\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._709 + 12\n" - " str r1, [r0]\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._710:\n" - " .align 2, 0\n" - "._709:\n" - " .word gSprites\n" - " .word gUnknown_Debug_2038A20\n" - " .word gTasks\n" - " .word debug_80C6CB8+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C7294() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " ldr r0, ._713\n" - " ldrh r2, [r0, #0x2e]\n" - " mov r1, #0x1\n" - " and r1, r1, r2\n" - " add r3, r0, #0\n" - " cmp r1, #0\n" - " beq ._711 @cond_branch\n" - " ldr r0, ._713 + 4\n" - " ldr r1, [r0]\n" - " mov r0, #0x0\n" - " strb r0, [r1, #0x5]\n" - " ldr r1, ._713 + 8\n" - " ldr r2, ._713 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._713 + 16\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " b ._712\n" - "._714:\n" - " .align 2, 0\n" - "._713:\n" - " .word gMain\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x699f\n" - "._711:\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._715 @cond_branch\n" - " ldr r6, ._717\n" - " ldr r0, [r6]\n" - " strb r1, [r0, #0x5]\n" - " ldr r1, ._717 + 4\n" - " ldr r2, ._717 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._717 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, [r6]\n" - " add r0, r0, #0x10\n" - " ldr r4, ._717 + 16\n" - " add r1, r4, #0\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, [r6]\n" - " add r0, r0, #0x10\n" - " ldr r5, ._717 + 20\n" - " add r1, r5, #0\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r1, [r6]\n" - " add r0, r1, #0\n" - " add r0, r0, #0x10\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x5\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r4, r4, r2\n" - " add r1, r1, r4\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r1, [r6]\n" - " add r0, r1, #0\n" - " add r0, r0, #0x10\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x5\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r5, r5, r2\n" - " add r1, r1, r5\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - "._712:\n" - " ldr r1, ._717 + 24\n" - " lsl r0, r7, #0x2\n" - " add r0, r0, r7\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._717 + 28\n" - " str r1, [r0]\n" - " b ._754\n" - "._718:\n" - " .align 2, 0\n" - "._717:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x699f\n" - " .word gPlttBufferUnfaded+0x100\n" - " .word gPlttBufferFaded+0x100\n" - " .word gTasks\n" - " .word debug_80C6EE8+1\n" - "._715:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._720 @cond_branch\n" - " ldr r0, ._722\n" - " ldr r1, [r0]\n" - " ldrb r0, [r1, #0xa]\n" - " cmp r0, #0x1\n" - " bhi ._720 @cond_branch\n" - " add r0, r0, #0x1\n" - " strb r0, [r1, #0xa]\n" - " b ._754\n" - "._723:\n" - " .align 2, 0\n" - "._722:\n" - " .word gUnknown_Debug_2038A20\n" - "._720:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._725 @cond_branch\n" - " ldr r0, ._727\n" - " ldr r1, [r0]\n" - " ldrb r0, [r1, #0xa]\n" - " cmp r0, #0\n" - " beq ._725 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1, #0xa]\n" - " b ._754\n" - "._728:\n" - " .align 2, 0\n" - "._727:\n" - " .word gUnknown_Debug_2038A20\n" - "._725:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._729 @cond_branch\n" - " ldr r0, ._734\n" - " ldr r2, [r0]\n" - " ldrb r0, [r2, #0xa]\n" - " cmp r0, #0x1\n" - " beq ._730 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._731 @cond_branch\n" - " cmp r0, #0\n" - " beq ._732 @cond_branch\n" - " b ._754\n" - "._735:\n" - " .align 2, 0\n" - "._734:\n" - " .word gUnknown_Debug_2038A20\n" - "._731:\n" - " cmp r0, #0x2\n" - " beq ._736 @cond_branch\n" - " b ._754\n" - "._732:\n" - " ldrb r3, [r2, #0xc]\n" - " lsl r1, r3, #0x1b\n" - " lsr r0, r1, #0x1b\n" - " cmp r0, #0x1e\n" - " bhi ._761 @cond_branch\n" - " add r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " mov r1, #0x20\n" - " neg r1, r1\n" - " and r1, r1, r3\n" - " orr r1, r1, r0\n" - " strb r1, [r2, #0xc]\n" - " b ._761\n" - "._730:\n" - " ldrh r3, [r2, #0xc]\n" - " lsl r1, r3, #0x16\n" - " lsr r0, r1, #0x1b\n" - " cmp r0, #0x1e\n" - " bhi ._761 @cond_branch\n" - " add r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " ldr r1, ._742\n" - " and r1, r1, r3\n" - " orr r1, r1, r0\n" - " strh r1, [r2, #0xc]\n" - " b ._761\n" - "._743:\n" - " .align 2, 0\n" - "._742:\n" - " .word 0xfffffc1f\n" - "._736:\n" - " ldrb r3, [r2, #0xd]\n" - " lsl r1, r3, #0x19\n" - " lsr r0, r1, #0x1b\n" - " cmp r0, #0x1e\n" - " bhi ._761 @cond_branch\n" - " add r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " mov r1, #0x7d\n" - " neg r1, r1\n" - " and r1, r1, r3\n" - " orr r1, r1, r0\n" - " strb r1, [r2, #0xd]\n" - " b ._761\n" - "._729:\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._754 @cond_branch\n" - " ldr r0, ._751\n" - " ldr r3, [r0]\n" - " ldrb r0, [r3, #0xa]\n" - " cmp r0, #0x1\n" - " beq ._747 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._748 @cond_branch\n" - " cmp r0, #0\n" - " beq ._749 @cond_branch\n" - " b ._754\n" - "._752:\n" - " .align 2, 0\n" - "._751:\n" - " .word gUnknown_Debug_2038A20\n" - "._748:\n" - " cmp r0, #0x2\n" - " beq ._753 @cond_branch\n" - " b ._754\n" - "._749:\n" - " ldrb r2, [r3, #0xc]\n" - " mov r0, #0x1f\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._761 @cond_branch\n" - " lsl r0, r2, #0x1b\n" - " lsr r0, r0, #0x1b\n" - " sub r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " mov r1, #0x20\n" - " neg r1, r1\n" - " and r1, r1, r2\n" - " orr r1, r1, r0\n" - " strb r1, [r3, #0xc]\n" - " b ._761\n" - "._747:\n" - " ldrh r2, [r3, #0xc]\n" - " mov r0, #0xf8\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._761 @cond_branch\n" - " lsl r0, r2, #0x16\n" - " lsr r0, r0, #0x1b\n" - " sub r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " ldr r1, ._759\n" - " and r1, r1, r2\n" - " orr r1, r1, r0\n" - " strh r1, [r3, #0xc]\n" - " b ._761\n" - "._760:\n" - " .align 2, 0\n" - "._759:\n" - " .word 0xfffffc1f\n" - "._753:\n" - " ldrb r2, [r3, #0xd]\n" - " mov r0, #0x7c\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._761 @cond_branch\n" - " lsl r0, r2, #0x19\n" - " lsr r0, r0, #0x1b\n" - " sub r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " mov r1, #0x7d\n" - " neg r1, r1\n" - " and r1, r1, r2\n" - " orr r1, r1, r0\n" - " strb r1, [r3, #0xd]\n" - "._761:\n" - " ldr r0, ._762\n" - " lsl r1, r7, #0x2\n" - " add r1, r1, r7\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._762 + 4\n" - " str r0, [r1]\n" - "._754:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._763:\n" - " .align 2, 0\n" - "._762:\n" - " .word gTasks\n" - " .word debug_80C74E4+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C74E4() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " ldr r0, ._764\n" - " ldr r3, [r0]\n" - " ldrb r0, [r3, #0xc]\n" - " lsl r0, r0, #0x1b\n" - " lsr r0, r0, #0x1b\n" - " ldrh r2, [r3, #0xc]\n" - " mov r1, #0xf8\n" - " lsl r1, r1, #0x2\n" - " and r1, r1, r2\n" - " add r0, r0, r1\n" - " ldrb r1, [r3, #0xd]\n" - " lsl r1, r1, #0x19\n" - " lsr r1, r1, #0x1b\n" - " lsl r1, r1, #0xa\n" - " add r0, r0, r1\n" - " ldr r6, ._764 + 4\n" - " ldrb r1, [r3, #0x7]\n" - " add r1, r1, #0x81\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r6\n" - " strh r0, [r1]\n" - " ldr r1, ._764 + 8\n" - " mov r8, r1\n" - " ldrb r1, [r3, #0x7]\n" - " add r1, r1, #0x81\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r8\n" - " strh r0, [r1]\n" - " ldrb r1, [r3, #0x6]\n" - " lsl r1, r1, #0x4\n" - " ldrb r2, [r3, #0x7]\n" - " ldr r4, ._764 + 12\n" - " add r2, r2, r4\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r6\n" - " strh r0, [r1]\n" - " ldrb r1, [r3, #0x6]\n" - " lsl r1, r1, #0x4\n" - " ldrb r2, [r3, #0x7]\n" - " add r2, r2, r4\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r8\n" - " strh r0, [r1]\n" - " mov r1, #0xe\n" - " mov r2, #0xa\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " ldr r1, ._764 + 16\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._764 + 20\n" - " str r1, [r0]\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._765:\n" - " .align 2, 0\n" - "._764:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gPlttBufferUnfaded\n" - " .word gPlttBufferFaded\n" - " .word 0x101\n" - " .word gTasks\n" - " .word debug_80C7294+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C7584() -{ - asm( - " push {r4, lr}\n" - " add r2, r0, #0\n" - " ldr r0, ._771\n" - " ldr r3, [r0]\n" - " ldrb r1, [r3, #0x5]\n" - " add r4, r0, #0\n" - " cmp r1, #0\n" - " beq ._766 @cond_branch\n" - " mov r1, #0x2e\n" - " ldsh r0, [r2, r1]\n" - " cmp r0, #0x1\n" - " beq ._767 @cond_branch\n" - " cmp r0, #0x1\n" - " ble ._768 @cond_branch\n" - " cmp r0, #0x2\n" - " beq ._769 @cond_branch\n" - "._768:\n" - " ldrb r0, [r3, #0xc]\n" - " lsl r0, r0, #0x1b\n" - " b ._773\n" - "._772:\n" - " .align 2, 0\n" - "._771:\n" - " .word gUnknown_Debug_2038A20\n" - "._767:\n" - " ldrh r0, [r3, #0xc]\n" - " lsl r0, r0, #0x16\n" - " b ._773\n" - "._769:\n" - " ldrb r0, [r3, #0xd]\n" - " lsl r0, r0, #0x19\n" - "._773:\n" - " lsr r0, r0, #0x1b\n" - " lsl r0, r0, #0x2\n" - " strh r0, [r2, #0x24]\n" - " mov r1, #0x2e\n" - " ldsh r0, [r2, r1]\n" - " lsl r0, r0, #0x3\n" - " strh r0, [r2, #0x26]\n" - " ldrh r0, [r2, #0x30]\n" - " add r3, r0, #1\n" - " strh r3, [r2, #0x30]\n" - " mov r0, #0x2e\n" - " ldsh r1, [r2, r0]\n" - " ldr r0, [r4]\n" - " ldrb r0, [r0, #0xa]\n" - " cmp r1, r0\n" - " bne ._775 @cond_branch\n" - " mov r0, #0x8\n" - " and r3, r3, r0\n" - " cmp r3, #0\n" - " bne ._775 @cond_branch\n" - "._766:\n" - " add r0, r2, #0\n" - " add r0, r0, #0x3e\n" - " ldrb r1, [r0]\n" - " mov r2, #0x4\n" - " orr r1, r1, r2\n" - " strb r1, [r0]\n" - " b ._776\n" - "._775:\n" - " add r2, r2, #0x3e\n" - " ldrb r1, [r2]\n" - " mov r0, #0x5\n" - " neg r0, r0\n" - " and r0, r0, r1\n" - " strb r0, [r2]\n" - "._776:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); -} - -__attribute__((naked)) -void InitSeeTrainers() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " bl debug_80C35DC\n" - " ldr r1, ._777\n" - " ldr r2, ._777 + 4\n" - " ldr r0, ._777 + 8\n" - " str r1, [r0]\n" - " str r2, [r0, #0x4]\n" - " ldr r1, ._777 + 12\n" - " str r1, [r0, #0x8]\n" - " ldr r0, [r0, #0x8]\n" - " ldr r0, ._777 + 16\n" - " mov r1, #0x80\n" - " mov r2, #0x60\n" - " bl LoadPalette\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r5, #0x0\n" - " str r5, [sp]\n" - " mov r1, #0x0\n" - " mov r2, #0x10\n" - " mov r3, #0x0\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._777 + 20\n" - " mov r6, #0x0\n" - " strh r5, [r0]\n" - " add r0, r0, #0x4\n" - " strh r5, [r0]\n" - " sub r0, r0, #0x2\n" - " strh r5, [r0]\n" - " add r0, r0, #0x4\n" - " strh r5, [r0]\n" - " ldr r1, ._777 + 24\n" - " mov r0, #0x3f\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " mov r0, #0x1f\n" - " strh r0, [r1]\n" - " add r1, r1, #0x6\n" - " mov r0, #0xf1\n" - " strh r0, [r1]\n" - " ldr r0, ._777 + 28\n" - " strh r5, [r0]\n" - " add r1, r1, #0x4\n" - " mov r0, #0x7\n" - " strh r0, [r1]\n" - " ldr r3, ._777 + 32\n" - " ldrh r2, [r3]\n" - " strh r5, [r3]\n" - " ldr r4, ._777 + 36\n" - " ldrh r0, [r4]\n" - " mov r1, #0x1\n" - " orr r0, r0, r1\n" - " strh r0, [r4]\n" - " strh r2, [r3]\n" - " ldr r0, ._777 + 40\n" - " bl SetVBlankCallback\n" - " ldr r0, ._777 + 44\n" - " bl SetMainCallback2\n" - " ldr r1, ._777 + 48\n" - " ldr r2, ._777 + 52\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r2, ._777 + 56\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " sub r1, r1, #0xa\n" - " mov r2, #0xcd\n" - " lsl r2, r2, #0x6\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, ._777 + 60\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " ldr r1, ._777 + 64\n" - " ldr r0, ._777 + 68\n" - " str r0, [r1]\n" - " strh r5, [r0]\n" - " strb r6, [r0, #0x2]\n" - " strb r6, [r0, #0x3]\n" - " strb r6, [r0, #0x5]\n" - " strb r6, [r0, #0x7]\n" - " strb r6, [r0, #0xa]\n" - " strb r6, [r0, #0x8]\n" - " ldr r4, ._777 + 72\n" - " add r0, r4, #0\n" - " mov r1, #0x6c\n" - " mov r2, #0x74\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " ldr r6, ._777 + 76\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " strh r5, [r0, #0x2e]\n" - " mov r1, #0x0\n" - " bl StartSpriteAnim\n" - " add r0, r4, #0\n" - " mov r1, #0x6c\n" - " mov r2, #0x74\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " mov r1, #0x1\n" - " strh r1, [r0, #0x2e]\n" - " bl StartSpriteAnim\n" - " add r0, r4, #0\n" - " mov r1, #0x6c\n" - " mov r2, #0x74\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " mov r1, #0x2\n" - " strh r1, [r0, #0x2e]\n" - " bl StartSpriteAnim\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._778:\n" - " .align 2, 0\n" - "._777:\n" - " .word byte_83F88EC\n" - " .word 0x600e000\n" - " .word 0x40000d4\n" - " .word 0x80000400\n" - " .word word_83F888C\n" - " .word 0x4000040\n" - " .word 0x4000048\n" - " .word 0x4000052\n" - " .word 0x4000208\n" - " .word 0x4000200\n" - " .word debug_80C3758+1\n" - " .word debug_80C370C+1\n" - " .word 0x4000008\n" - " .word 0x1f0b\n" - " .word 0x1e0a\n" - " .word debug_80C777C+1\n" - " .word gUnknown_Debug_2038A20\n" - " .word +0x2018000\n" - " .word gSpriteTemplate_83F8874\n" - " .word gSprites\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C777C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xffffffec\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " ldr r1, ._784\n" - " mov r0, sp\n" - " mov r2, #0x12\n" - " bl memcpy\n" - " mov r0, #0x9\n" - " mov r1, #0x0\n" - " mov r2, #0xe\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x9\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x0\n" - " mov r1, #0xa\n" - " mov r2, #0x9\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0xe\n" - " mov r1, #0x0\n" - " mov r2, #0x1d\n" - " mov r3, #0x7\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._784 + 4\n" - " mov r1, #0xf\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._784 + 8\n" - " mov r1, #0x19\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r0, ._784 + 12\n" - " mov r1, #0xf\n" - " mov r2, #0x5\n" - " bl Menu_PrintText\n" - " mov r0, #0xa\n" - " mov r1, #0x8\n" - " mov r2, #0x1d\n" - " mov r3, #0xc\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r2, #0x0\n" - " ldr r4, ._784 + 16\n" - " ldr r0, ._784 + 20\n" - " add r3, r0, #0\n" - "._779:\n" - " lsl r0, r2, #0x1\n" - " add r0, r0, r4\n" - " add r1, r2, r3\n" - " strh r1, [r0]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0xe\n" - " bls ._779 @cond_branch\n" - " mov r2, #0x0\n" - " ldr r5, ._784 + 24\n" - " lsl r6, r7, #0x2\n" - " mov r8, r6\n" - " ldr r4, ._784 + 28\n" - " ldr r0, ._784 + 32\n" - " add r3, r0, #0\n" - "._780:\n" - " lsl r0, r2, #0x1\n" - " add r0, r0, r4\n" - " add r1, r2, r3\n" - " strh r1, [r0]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0xe\n" - " bls ._780 @cond_branch\n" - " add r0, r5, #0\n" - " mov r1, #0x14\n" - " mov r2, #0xa\n" - " bl Menu_PrintText\n" - " mov r0, #0xa\n" - " mov r1, #0xd\n" - " mov r2, #0x1d\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r1, sp\n" - " mov r0, #0x23\n" - " strb r0, [r1]\n" - " mov r2, #0x0\n" - " ldr r4, ._784 + 36\n" - " mov r5, #0x93\n" - " lsl r5, r5, #0x8\n" - " add r3, r5, #0\n" - "._781:\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r4\n" - " mov r6, sp\n" - " add r0, r6, r2\n" - " ldrb r0, [r0]\n" - " add r0, r0, r3\n" - " strh r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x11\n" - " bls ._781 @cond_branch\n" - " mov r1, sp\n" - " mov r0, #0x24\n" - " strb r0, [r1]\n" - " mov r2, #0x0\n" - " ldr r5, ._784 + 40\n" - " ldr r4, ._784 + 44\n" - " mov r0, #0x93\n" - " lsl r0, r0, #0x8\n" - " add r3, r0, #0\n" - "._782:\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r4\n" - " mov r6, sp\n" - " add r0, r6, r2\n" - " ldrb r0, [r0]\n" - " add r0, r0, r3\n" - " strh r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x11\n" - " bls ._782 @cond_branch\n" - " mov r1, sp\n" - " mov r0, #0x25\n" - " strb r0, [r1]\n" - " mov r2, #0x0\n" - " ldr r4, ._784 + 48\n" - " mov r0, #0x93\n" - " lsl r0, r0, #0x8\n" - " add r3, r0, #0\n" - "._783:\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r4\n" - " mov r6, sp\n" - " add r0, r6, r2\n" - " ldrb r0, [r0]\n" - " add r0, r0, r3\n" - " strh r0, [r1]\n" - " add r0, r2, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r2, r0, #0x18\n" - " cmp r2, #0x11\n" - " bls ._783 @cond_branch\n" - " add r0, r5, #0\n" - " mov r1, #0xf\n" - " mov r2, #0x11\n" - " bl Menu_PrintText\n" - " ldr r1, ._784 + 52\n" - " ldr r2, ._784 + 56\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r5, ._784 + 60\n" - " add r0, r5, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._784 + 64\n" - " mov r6, r8\n" - " add r0, r6, r7\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._784 + 68\n" - " str r1, [r0]\n" - " add sp, sp, #0x14\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._785:\n" - " .align 2, 0\n" - "._784:\n" - " .word gUnknown_Debug_083F8815\n" - " .word gUnknown_Debug_083F87D0\n" - " .word gUnknown_Debug_083F87D8\n" - " .word gUnknown_Debug_083F87E0\n" - " .word 0x600fa56\n" - " .word 0xa311\n" - " .word gUnknown_Debug_083F87F4\n" - " .word 0x600f256\n" - " .word 0x8301\n" - " .word 0x600f396\n" - " .word gUnknown_Debug_083F8801\n" - " .word 0x600f3d6\n" - " .word 0x600f416\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x699f\n" - " .word gTasks\n" - " .word debug_80C7934+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C7934() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xfffffff8\n" - " mov r8, r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r8, r0\n" - " ldr r5, ._786\n" - " ldr r6, [r5]\n" - " ldrh r2, [r6]\n" - " lsl r0, r2, #0x3\n" - " ldr r1, ._786 + 4\n" - " add r0, r0, r1\n" - " ldr r1, ._786 + 8\n" - " lsl r2, r2, #0x2\n" - " add r2, r2, r1\n" - " ldrb r1, [r2]\n" - " ldrb r2, [r2, #0x1]\n" - " ldr r4, ._786 + 12\n" - " ldr r3, [r4]\n" - " ldr r4, [r4, #0x4]\n" - " str r4, [sp]\n" - " ldrh r4, [r6]\n" - " str r4, [sp, #0x4]\n" - " bl DecompressPicFromTable_2\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, ._786 + 16\n" - " add r0, r0, r1\n" - " bl LoadCompressedObjectPalette\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x1\n" - " bl GetMonSpriteTemplate_803C5A0\n" - " ldr r0, ._786 + 20\n" - " mov r1, #0x28\n" - " mov r2, #0x28\n" - " mov r3, #0x0\n" - " bl CreateSprite\n" - " ldr r1, [r5]\n" - " mov r6, #0x0\n" - " strb r0, [r1, #0x2]\n" - " ldr r4, ._786 + 24\n" - " ldr r2, [r5]\n" - " ldrb r1, [r2, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r1, r4, #0\n" - " add r1, r1, #0x1c\n" - " add r0, r0, r1\n" - " ldr r1, ._786 + 28\n" - " str r1, [r0]\n" - " ldrb r0, [r2, #0x2]\n" - " lsl r1, r0, #0x4\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r4\n" - " ldrb r2, [r1, #0x5]\n" - " mov r0, #0xd\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " strb r0, [r1, #0x5]\n" - " ldr r0, [r5]\n" - " ldrh r0, [r0]\n" - " mov r1, #0x1a\n" - " mov r2, #0x5\n" - " bl debug_80C376C\n" - " ldr r2, [r5]\n" - " ldrb r1, [r2, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r4\n" - " ldrb r0, [r0, #0x5]\n" - " lsr r0, r0, #0x4\n" - " strb r0, [r2, #0x6]\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " ldr r4, ._786 + 32\n" - " add r0, r0, r4\n" - " ldr r2, ._786 + 36\n" - " add r1, r4, r2\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r4\n" - " ldr r1, ._786 + 40\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r1, ._786 + 44\n" - " mov r2, r8\n" - " lsl r0, r2, #0x2\n" - " add r0, r0, r8\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._786 + 48\n" - " str r1, [r0]\n" - " ldr r0, [r5]\n" - " strb r6, [r0, #0x9]\n" - " add sp, sp, #0x8\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._787:\n" - " .align 2, 0\n" - "._786:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gTrainerFrontPicTable\n" - " .word gTrainerFrontPicCoords\n" - " .word gUnknown_081FAF4C\n" - " .word gTrainerFrontPicPaletteTable\n" - " .word gUnknown_02024E8C\n" - " .word gSprites\n" - " .word debug_69+1\n" - " .word gPlttBufferUnfaded+0x200\n" - " .word 0xffffff00\n" - " .word gPlttBufferFaded+0x100\n" - " .word gTasks\n" - " .word debug_80C7A54+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C7A54() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r0, #0\n" - " lsl r6, r6, #0x18\n" - " lsr r6, r6, #0x18\n" - " ldr r4, ._788\n" - " ldr r5, ._788 + 4\n" - " ldr r1, [r5]\n" - " add r1, r1, #0x10\n" - " add r0, r4, #0\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, ._788 + 8\n" - " add r4, r4, r0\n" - " ldr r3, [r5]\n" - " ldrb r0, [r3, #0x7]\n" - " add r0, r0, #0x81\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r4\n" - " ldrh r4, [r0]\n" - " mov r1, #0x1f\n" - " and r1, r1, r4\n" - " ldrb r2, [r3, #0xc]\n" - " mov r0, #0x20\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " orr r0, r0, r1\n" - " strb r0, [r3, #0xc]\n" - " ldr r3, [r5]\n" - " mov r1, #0xf8\n" - " lsl r1, r1, #0x2\n" - " and r1, r1, r4\n" - " ldrh r2, [r3, #0xc]\n" - " ldr r0, ._788 + 12\n" - " and r0, r0, r2\n" - " orr r0, r0, r1\n" - " strh r0, [r3, #0xc]\n" - " mov r1, #0xf8\n" - " lsl r1, r1, #0x7\n" - " and r1, r1, r4\n" - " lsr r1, r1, #0x8\n" - " ldrb r2, [r3, #0xd]\n" - " mov r0, #0x7d\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " orr r0, r0, r1\n" - " strb r0, [r3, #0xd]\n" - " ldr r2, [r5]\n" - " ldrb r1, [r2, #0xd]\n" - " mov r0, #0x7f\n" - " and r0, r0, r1\n" - " strb r0, [r2, #0xd]\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x7]\n" - " add r0, r0, #0x1\n" - " mov r1, #0xb\n" - " mov r2, #0xa\n" - " mov r3, #0x2\n" - " bl debug_80C68CC\n" - " ldr r0, ._788 + 16\n" - " mov r1, #0xd\n" - " mov r2, #0xa\n" - " bl Menu_PrintText\n" - " add r0, r4, #0\n" - " mov r1, #0xe\n" - " mov r2, #0xa\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " ldr r1, ._788 + 20\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._788 + 24\n" - " str r1, [r0]\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._789:\n" - " .align 2, 0\n" - "._788:\n" - " .word gPlttBufferUnfaded+0x100\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0xffffff00\n" - " .word 0xfffffc1f\n" - " .word gUnknown_Debug_083F8813\n" - " .word gTasks\n" - " .word debug_80C7B14+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C7B14() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " ldr r1, ._792\n" - " ldrh r3, [r1, #0x2e]\n" - " mov r0, #0x2\n" - " and r0, r0, r3\n" - " add r4, r1, #0\n" - " cmp r0, #0\n" - " beq ._790 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._792 + 4\n" - " bl SetMainCallback2\n" - " ldr r1, ._792 + 8\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._792 + 12\n" - " str r1, [r0]\n" - " b ._821\n" - "._793:\n" - " .align 2, 0\n" - "._792:\n" - " .word gMain\n" - " .word debug_80C370C+1\n" - " .word gTasks\n" - " .word debug_80C373C+1\n" - "._790:\n" - " ldrh r1, [r4, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._794 @cond_branch\n" - " ldr r4, ._796\n" - " ldr r0, [r4]\n" - " ldrh r1, [r0]\n" - " mov r0, #0x0\n" - " b ._795\n" - "._797:\n" - " .align 2, 0\n" - "._796:\n" - " .word gUnknown_Debug_2038A20\n" - "._794:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._798 @cond_branch\n" - " ldr r4, ._800\n" - " ldr r0, [r4]\n" - " ldrh r1, [r0]\n" - " mov r0, #0x1\n" - "._795:\n" - " bl debug_80C38B4\n" - " ldr r1, [r4]\n" - " strh r0, [r1]\n" - " ldr r1, ._800 + 4\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._800 + 8\n" - " str r1, [r0]\n" - " b ._821\n" - "._801:\n" - " .align 2, 0\n" - "._800:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gTasks\n" - " .word debug_80C7D44+1\n" - "._798:\n" - " mov r2, #0x1\n" - " and r2, r2, r3\n" - " cmp r2, #0\n" - " beq ._802 @cond_branch\n" - " ldr r0, ._804\n" - " ldr r1, [r0]\n" - " mov r0, #0x1\n" - " strb r0, [r1, #0x5]\n" - " ldr r1, ._804 + 4\n" - " ldr r2, ._804 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._804 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r1, ._804 + 16\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._804 + 20\n" - " str r1, [r0]\n" - " b ._821\n" - "._805:\n" - " .align 2, 0\n" - "._804:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x4167\n" - " .word gTasks\n" - " .word debug_80C7DDC+1\n" - "._802:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " ldr r3, ._809\n" - " cmp r0, #0\n" - " beq ._807 @cond_branch\n" - " ldr r1, [r3]\n" - " ldrb r0, [r1, #0x7]\n" - " cmp r0, #0xd\n" - " bhi ._807 @cond_branch\n" - " lsl r0, r0, #0x1\n" - " ldr r1, ._809 + 4\n" - " add r0, r0, r1\n" - " strh r2, [r0]\n" - " ldr r1, [r3]\n" - " ldrb r0, [r1, #0x7]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1, #0x7]\n" - " b ._813\n" - "._810:\n" - " .align 2, 0\n" - "._809:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x5000102\n" - "._807:\n" - " ldrh r1, [r4, #0x30]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._812 @cond_branch\n" - " ldr r1, [r3]\n" - " ldrb r0, [r1, #0x7]\n" - " cmp r0, #0\n" - " beq ._812 @cond_branch\n" - " lsl r0, r0, #0x1\n" - " ldr r2, ._814\n" - " add r0, r0, r2\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " ldr r1, [r3]\n" - " ldrb r0, [r1, #0x7]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1, #0x7]\n" - " b ._813\n" - "._815:\n" - " .align 2, 0\n" - "._814:\n" - " .word 0x5000102\n" - "._812:\n" - " ldrh r1, [r4, #0x2e]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._816 @cond_branch\n" - " ldr r4, ._819\n" - " ldr r2, [r4]\n" - " ldrb r0, [r2, #0x9]\n" - " mov r1, #0x1\n" - " eor r0, r0, r1\n" - " strb r0, [r2, #0x9]\n" - " ldr r1, [r4]\n" - " ldrb r0, [r1, #0x9]\n" - " cmp r0, #0\n" - " beq ._817 @cond_branch\n" - " ldrh r0, [r1]\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " bl GetMonSpritePalFromOtIdPersonality\n" - " ldr r1, [r4]\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x14\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x11\n" - " add r1, r1, r2\n" - " lsr r1, r1, #0x10\n" - " mov r2, #0x20\n" - " bl LoadCompressedPalette\n" - " b ._818\n" - "._820:\n" - " .align 2, 0\n" - "._819:\n" - " .word gUnknown_Debug_2038A20\n" - "._817:\n" - " ldrh r0, [r1]\n" - " mov r1, #0x0\n" - " mov r2, #0x9\n" - " bl GetMonSpritePalFromOtIdPersonality\n" - " ldr r1, [r4]\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x14\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x11\n" - " add r1, r1, r2\n" - " lsr r1, r1, #0x10\n" - " mov r2, #0x20\n" - " bl LoadCompressedPalette\n" - "._818:\n" - " ldr r5, ._822\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " ldr r4, ._822 + 4\n" - " add r0, r0, r4\n" - " ldr r2, ._822 + 8\n" - " add r1, r4, r2\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, [r5]\n" - " ldrb r0, [r0, #0x6]\n" - " lsl r0, r0, #0x5\n" - " add r0, r0, r4\n" - " ldr r1, ._822 + 12\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - "._813:\n" - " ldr r1, ._822 + 16\n" - " lsl r0, r6, #0x2\n" - " add r0, r0, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._822 + 20\n" - " str r1, [r0]\n" - " b ._821\n" - "._823:\n" - " .align 2, 0\n" - "._822:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gPlttBufferUnfaded+0x200\n" - " .word 0xffffff00\n" - " .word gPlttBufferFaded+0x100\n" - " .word gTasks\n" - " .word debug_80C7A54+1\n" - "._816:\n" - " ldr r1, [r3]\n" - " ldrb r0, [r1, #0x8]\n" - " add r0, r0, #0x4\n" - " strb r0, [r1, #0x8]\n" - " ldr r2, [r3]\n" - " ldrb r1, [r2, #0x8]\n" - " mov r0, #0x1f\n" - " and r0, r0, r1\n" - " strb r0, [r2, #0x8]\n" - " ldr r0, [r3]\n" - " ldrb r1, [r0, #0x7]\n" - " lsl r1, r1, #0x1\n" - " ldr r2, ._824\n" - " add r1, r1, r2\n" - " ldr r2, ._824 + 4\n" - " ldrb r0, [r0, #0x8]\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r2\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - "._821:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._825:\n" - " .align 2, 0\n" - "._824:\n" - " .word 0x5000142\n" - " .word gUnknown_Debug_083F8790\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C7D44() -{ - asm( - " push {r4, r5, r6, lr}\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " ldr r6, ._826\n" - " ldr r4, ._826 + 4\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldrb r0, [r0, #0x5]\n" - " lsr r0, r0, #0x4\n" - " bl GetSpritePaletteTagByPaletteNum\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl FreeSpritePaletteByTag\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x2]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " bl DestroySprite\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x3]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldrb r0, [r0, #0x5]\n" - " lsr r0, r0, #0x4\n" - " bl GetSpritePaletteTagByPaletteNum\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl FreeSpritePaletteByTag\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x3]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " bl DestroySprite\n" - " ldr r0, [r4]\n" - " ldrb r1, [r0, #0x4]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " bl sub_809D510\n" - " ldr r1, ._826 + 8\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._826 + 12\n" - " str r1, [r0]\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._827:\n" - " .align 2, 0\n" - "._826:\n" - " .word gSprites\n" - " .word gUnknown_Debug_2038A20\n" - " .word gTasks\n" - " .word debug_80C7934+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C7DDC() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " ldr r0, ._830\n" - " ldrh r2, [r0, #0x2e]\n" - " mov r1, #0x1\n" - " and r1, r1, r2\n" - " add r3, r0, #0\n" - " cmp r1, #0\n" - " beq ._828 @cond_branch\n" - " ldr r0, ._830 + 4\n" - " ldr r1, [r0]\n" - " mov r0, #0x0\n" - " strb r0, [r1, #0x5]\n" - " ldr r1, ._830 + 8\n" - " ldr r2, ._830 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._830 + 16\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " b ._829\n" - "._831:\n" - " .align 2, 0\n" - "._830:\n" - " .word gMain\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x699f\n" - "._828:\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._832 @cond_branch\n" - " ldr r6, ._834\n" - " ldr r0, [r6]\n" - " strb r1, [r0, #0x5]\n" - " ldr r1, ._834 + 4\n" - " ldr r2, ._834 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x4\n" - " ldr r2, ._834 + 12\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, [r6]\n" - " add r0, r0, #0x10\n" - " ldr r4, ._834 + 16\n" - " add r1, r4, #0\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r0, [r6]\n" - " add r0, r0, #0x10\n" - " ldr r5, ._834 + 20\n" - " add r1, r5, #0\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r1, [r6]\n" - " add r0, r1, #0\n" - " add r0, r0, #0x10\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x5\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r4, r4, r2\n" - " add r1, r1, r4\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - " ldr r1, [r6]\n" - " add r0, r1, #0\n" - " add r0, r0, #0x10\n" - " ldrb r1, [r1, #0x6]\n" - " lsl r1, r1, #0x5\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r5, r5, r2\n" - " add r1, r1, r5\n" - " mov r2, #0x10\n" - " bl CpuSet\n" - "._829:\n" - " ldr r1, ._834 + 24\n" - " lsl r0, r7, #0x2\n" - " add r0, r0, r7\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._834 + 28\n" - " str r1, [r0]\n" - " b ._871\n" - "._835:\n" - " .align 2, 0\n" - "._834:\n" - " .word gUnknown_Debug_2038A20\n" - " .word 0x4000040\n" - " .word 0x51ef\n" - " .word 0x699f\n" - " .word gPlttBufferUnfaded+0x100\n" - " .word gPlttBufferFaded+0x100\n" - " .word gTasks\n" - " .word debug_80C7A54+1\n" - "._832:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._837 @cond_branch\n" - " ldr r0, ._839\n" - " ldr r1, [r0]\n" - " ldrb r0, [r1, #0xa]\n" - " cmp r0, #0x1\n" - " bhi ._837 @cond_branch\n" - " add r0, r0, #0x1\n" - " strb r0, [r1, #0xa]\n" - " b ._871\n" - "._840:\n" - " .align 2, 0\n" - "._839:\n" - " .word gUnknown_Debug_2038A20\n" - "._837:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._842 @cond_branch\n" - " ldr r0, ._844\n" - " ldr r1, [r0]\n" - " ldrb r0, [r1, #0xa]\n" - " cmp r0, #0\n" - " beq ._842 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1, #0xa]\n" - " b ._871\n" - "._845:\n" - " .align 2, 0\n" - "._844:\n" - " .word gUnknown_Debug_2038A20\n" - "._842:\n" - " ldrh r1, [r3, #0x30]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._846 @cond_branch\n" - " ldr r0, ._851\n" - " ldr r2, [r0]\n" - " ldrb r0, [r2, #0xa]\n" - " cmp r0, #0x1\n" - " beq ._847 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._848 @cond_branch\n" - " cmp r0, #0\n" - " beq ._849 @cond_branch\n" - " b ._871\n" - "._852:\n" - " .align 2, 0\n" - "._851:\n" - " .word gUnknown_Debug_2038A20\n" - "._848:\n" - " cmp r0, #0x2\n" - " beq ._853 @cond_branch\n" - " b ._871\n" - "._849:\n" - " ldrb r3, [r2, #0xc]\n" - " lsl r1, r3, #0x1b\n" - " lsr r0, r1, #0x1b\n" - " cmp r0, #0x1e\n" - " bhi ._878 @cond_branch\n" - " add r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " mov r1, #0x20\n" - " neg r1, r1\n" - " and r1, r1, r3\n" - " orr r1, r1, r0\n" - " strb r1, [r2, #0xc]\n" - " b ._878\n" - "._847:\n" - " ldrh r3, [r2, #0xc]\n" - " lsl r1, r3, #0x16\n" - " lsr r0, r1, #0x1b\n" - " cmp r0, #0x1e\n" - " bhi ._878 @cond_branch\n" - " add r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " ldr r1, ._859\n" - " and r1, r1, r3\n" - " orr r1, r1, r0\n" - " strh r1, [r2, #0xc]\n" - " b ._878\n" - "._860:\n" - " .align 2, 0\n" - "._859:\n" - " .word 0xfffffc1f\n" - "._853:\n" - " ldrb r3, [r2, #0xd]\n" - " lsl r1, r3, #0x19\n" - " lsr r0, r1, #0x1b\n" - " cmp r0, #0x1e\n" - " bhi ._878 @cond_branch\n" - " add r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " mov r1, #0x7d\n" - " neg r1, r1\n" - " and r1, r1, r3\n" - " orr r1, r1, r0\n" - " strb r1, [r2, #0xd]\n" - " b ._878\n" - "._846:\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._871 @cond_branch\n" - " ldr r0, ._868\n" - " ldr r3, [r0]\n" - " ldrb r0, [r3, #0xa]\n" - " cmp r0, #0x1\n" - " beq ._864 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._865 @cond_branch\n" - " cmp r0, #0\n" - " beq ._866 @cond_branch\n" - " b ._871\n" - "._869:\n" - " .align 2, 0\n" - "._868:\n" - " .word gUnknown_Debug_2038A20\n" - "._865:\n" - " cmp r0, #0x2\n" - " beq ._870 @cond_branch\n" - " b ._871\n" - "._866:\n" - " ldrb r2, [r3, #0xc]\n" - " mov r0, #0x1f\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._878 @cond_branch\n" - " lsl r0, r2, #0x1b\n" - " lsr r0, r0, #0x1b\n" - " sub r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " mov r1, #0x20\n" - " neg r1, r1\n" - " and r1, r1, r2\n" - " orr r1, r1, r0\n" - " strb r1, [r3, #0xc]\n" - " b ._878\n" - "._864:\n" - " ldrh r2, [r3, #0xc]\n" - " mov r0, #0xf8\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._878 @cond_branch\n" - " lsl r0, r2, #0x16\n" - " lsr r0, r0, #0x1b\n" - " sub r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x5\n" - " ldr r1, ._876\n" - " and r1, r1, r2\n" - " orr r1, r1, r0\n" - " strh r1, [r3, #0xc]\n" - " b ._878\n" - "._877:\n" - " .align 2, 0\n" - "._876:\n" - " .word 0xfffffc1f\n" - "._870:\n" - " ldrb r2, [r3, #0xd]\n" - " mov r0, #0x7c\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._878 @cond_branch\n" - " lsl r0, r2, #0x19\n" - " lsr r0, r0, #0x1b\n" - " sub r0, r0, #0x1\n" - " mov r1, #0x1f\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " mov r1, #0x7d\n" - " neg r1, r1\n" - " and r1, r1, r2\n" - " orr r1, r1, r0\n" - " strb r1, [r3, #0xd]\n" - "._878:\n" - " ldr r0, ._879\n" - " lsl r1, r7, #0x2\n" - " add r1, r1, r7\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldr r0, ._879 + 4\n" - " str r0, [r1]\n" - "._871:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._880:\n" - " .align 2, 0\n" - "._879:\n" - " .word gTasks\n" - " .word debug_80C802C+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_80C802C() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " ldr r0, ._881\n" - " ldr r3, [r0]\n" - " ldrb r0, [r3, #0xc]\n" - " lsl r0, r0, #0x1b\n" - " lsr r0, r0, #0x1b\n" - " ldrh r2, [r3, #0xc]\n" - " mov r1, #0xf8\n" - " lsl r1, r1, #0x2\n" - " and r1, r1, r2\n" - " add r0, r0, r1\n" - " ldrb r1, [r3, #0xd]\n" - " lsl r1, r1, #0x19\n" - " lsr r1, r1, #0x1b\n" - " lsl r1, r1, #0xa\n" - " add r0, r0, r1\n" - " ldr r6, ._881 + 4\n" - " ldrb r1, [r3, #0x7]\n" - " add r1, r1, #0x81\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r6\n" - " strh r0, [r1]\n" - " ldr r1, ._881 + 8\n" - " mov r8, r1\n" - " ldrb r1, [r3, #0x7]\n" - " add r1, r1, #0x81\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r8\n" - " strh r0, [r1]\n" - " ldrb r1, [r3, #0x6]\n" - " lsl r1, r1, #0x4\n" - " ldrb r2, [r3, #0x7]\n" - " ldr r4, ._881 + 12\n" - " add r2, r2, r4\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r6\n" - " strh r0, [r1]\n" - " ldrb r1, [r3, #0x6]\n" - " lsl r1, r1, #0x4\n" - " ldrb r2, [r3, #0x7]\n" - " add r2, r2, r4\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x1\n" - " add r1, r1, r8\n" - " strh r0, [r1]\n" - " mov r1, #0xe\n" - " mov r2, #0xa\n" - " mov r3, #0x4\n" - " bl debug_80C68CC\n" - " ldr r1, ._881 + 16\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._881 + 20\n" - " str r1, [r0]\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._882:\n" - " .align 2, 0\n" - "._881:\n" - " .word gUnknown_Debug_2038A20\n" - " .word gPlttBufferUnfaded\n" - " .word gPlttBufferFaded\n" - " .word 0x101\n" - " .word gTasks\n" - " .word debug_80C7DDC+1\n" - "\n" - ); -} - #endif -- cgit v1.2.3 From d972f2af82d805b53bb4b93759fb3ba445b1ce78 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 23 Jan 2018 23:19:36 -0600 Subject: remove Japanese characters from menu order data --- src/debug/start_menu_debug.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 5d9b150e7..2bc536d6c 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -258,15 +258,15 @@ const struct MenuAction gUnknown_Debug_839BC94[] = // debug_sub_8076BB4 will access the array differently and no longer match. //extern const struct MenuAction gUnknown_Debug_839BC94[]; -const u8 Str_839BD14[][10] = +const u8 gMenuOrders_839BD14[][10] = { - _("うかえ"), - _("おけこしすせそ"), + { 3, 6, 4, 0xFF }, + { 5, 9, 10, 12, 13, 14, 15, 0xFF }, }; const u8 Str_839BD26[] = {2, 0, 0, 0}; // doesn't appear to be referenced -const u8 Str_839BD2C[] = _("RTCを リセット します\n" +const u8 Str_839BD2C[] = _("RTCを リセット します\n" // Reset RTC "Aで じっこう   Bでキャンセル"); const u8 Str_839BD4C[] = _("RTCを リセット した!"); @@ -291,8 +291,8 @@ void debug_sub_8076AC8(u8 a) { s32 r4; - gUnknown_030006C4 = Str_839BD14[a]; - for (r4 = 0; gUnknown_030006C4[r4] != EOS; r4++) + gUnknown_030006C4 = gMenuOrders_839BD14[a]; + for (r4 = 0; gUnknown_030006C4[r4] != 0xFF; r4++) ; Menu_EraseWindowRect(16, 0, 29, 19); Menu_DrawStdWindowFrame(16, 0, 29, r4 * 2 + 1); -- cgit v1.2.3 From dbcf1ce9cb124e303e6bed3fecede7a72b8000f2 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 24 Jan 2018 00:58:38 -0600 Subject: integrate some debug differences --- include/link.h | 1 + src/battle/battle_2.c | 2179 ++++------------------------------------------- src/engine/cable_club.c | 42 +- src/engine/link.c | 2 +- 4 files changed, 194 insertions(+), 2030 deletions(-) diff --git a/include/link.h b/include/link.h index 21bb0b780..ecebb586a 100644 --- a/include/link.h +++ b/include/link.h @@ -195,5 +195,6 @@ void LinkVSync(void); void Timer3Intr(void); void SerialCB(void); void LinkTestScreen(void); +void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0); #endif // GUARD_LINK_H diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 6808ad61c..64b64ecea 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -14,6 +14,7 @@ #include "main.h" #include "m4a.h" #include "name_string_util.h" +#include "overworld.h" #include "palette.h" #include "party_menu.h" #include "pokeball.h" @@ -64,6 +65,9 @@ struct UnknownStruct12 u8 filler4[0x54]; }; +void debug_sub_80139E4(void); +extern u8 gUnknown_02023A14_50; + extern const u16 gUnknown_08D004E0[]; extern const struct MonCoords gCastformFrontSpriteCoords[]; @@ -203,231 +207,6 @@ void sub_800E7C4(void) } } -#if DEBUG -__attribute__((naked)) -void InitBattle(void) -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x0\n" - " bl SetHBlankCallback\n" - " mov r0, #0x0\n" - " bl SetVBlankCallback\n" - " mov r4, #0x0\n" - " str r4, [sp]\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x13\n" - " ldr r2, ._10\n" - " mov r0, sp\n" - " bl CpuSet\n" - " ldr r0, ._10 + 4\n" - " strh r4, [r0]\n" - " sub r0, r0, #0xc\n" - " mov r2, #0xf0\n" - " strh r2, [r0]\n" - " add r0, r0, #0x4\n" - " ldr r3, ._10 + 8\n" - " add r1, r3, #0\n" - " strh r1, [r0]\n" - " add r0, r0, #0x4\n" - " strh r4, [r0]\n" - " add r0, r0, #0x2\n" - " strh r4, [r0]\n" - " ldr r0, ._10 + 12\n" - " strh r2, [r0]\n" - " ldr r0, ._10 + 16\n" - " strh r1, [r0]\n" - " bl ScanlineEffect_Clear\n" - " ldr r0, ._10 + 20\n" - " mov r3, #0xf0\n" - " mov r5, #0xf0\n" - " lsl r5, r5, #0x3\n" - " add r2, r0, r5\n" - " mov r1, #0x4f\n" - "._5:\n" - " strh r3, [r0]\n" - " strh r3, [r2]\n" - " add r2, r2, #0x2\n" - " add r0, r0, #0x2\n" - " sub r1, r1, #0x1\n" - " cmp r1, #0\n" - " bge ._5 @cond_branch\n" - " mov r1, #0x50\n" - " ldr r4, ._10 + 24\n" - " ldr r0, ._10 + 20\n" - " ldr r3, ._10 + 28\n" - " mov r5, #0x82\n" - " lsl r5, r5, #0x4\n" - " add r2, r0, r5\n" - " add r0, r0, #0xa0\n" - "._6:\n" - " strh r3, [r0]\n" - " strh r3, [r2]\n" - " add r2, r2, #0x2\n" - " add r0, r0, #0x2\n" - " add r1, r1, #0x1\n" - " cmp r1, #0x9f\n" - " ble ._6 @cond_branch\n" - " ldr r0, [r4]\n" - " ldr r1, [r4, #0x4]\n" - " ldr r2, [r4, #0x8]\n" - " bl ScanlineEffect_SetParams\n" - " ldr r4, ._10 + 32\n" - " add r0, r4, #0\n" - " bl Text_LoadWindowTemplate\n" - " bl ResetPaletteFade\n" - " ldr r0, ._10 + 36\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 40\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 44\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 48\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 52\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 56\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 60\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 64\n" - " strh r1, [r0]\n" - " ldr r0, ._10 + 68\n" - " ldrb r1, [r0]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._7 @cond_branch\n" - " bl BattleSetup_GetTerrain\n" - " ldr r1, ._10 + 72\n" - " strb r0, [r1]\n" - "._7:\n" - " ldr r0, ._10 + 76\n" - " add r1, r4, #0\n" - " bl Text_InitWindowWithTemplate\n" - " ldr r0, ._10 + 80\n" - " ldr r1, ._10 + 84\n" - " bl Text_InitWindowWithTemplate\n" - " ldr r0, ._10 + 88\n" - " ldr r1, ._10 + 92\n" - " bl Text_InitWindowWithTemplate\n" - " bl sub_800D6D4\n" - " bl sub_800DAB8\n" - " bl ResetSpriteData\n" - " bl ResetTasks\n" - " bl sub_800E23C\n" - " bl FreeAllSpritePalettes\n" - " ldr r1, ._10 + 96\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r0, ._10 + 100\n" - " bl SetVBlankCallback\n" - " bl setup_poochyena_battle\n" - " ldr r0, ._10 + 104\n" - " ldrh r1, [r0]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._8 @cond_branch\n" - " ldr r0, ._10 + 108\n" - " bl SetMainCallback2\n" - " b ._9\n" - "._11:\n" - " .align 2, 0\n" - "._10:\n" - " .word 0x5006000\n" - " .word 0x400004c\n" - " .word 0x5051\n" - " .word gBattle_WIN0H\n" - " .word gBattle_WIN0V\n" - " .word gScanlineEffectRegBuffers\n" - " .word gUnknown_081F9674\n" - " .word 0xff10\n" - " .word gWindowTemplate_81E6C58\n" - " .word gBattle_BG0_X\n" - " .word gBattle_BG0_Y\n" - " .word gBattle_BG1_X\n" - " .word gBattle_BG1_Y\n" - " .word gBattle_BG2_X\n" - " .word gBattle_BG2_Y\n" - " .word gBattle_BG3_X\n" - " .word gBattle_BG3_Y\n" - " .word gUnknown_02023A14_50\n" - " .word gBattleTerrain\n" - " .word gUnknown_03004210\n" - " .word gUnknown_030041D0\n" - " .word gWindowTemplate_81E71D0\n" - " .word gUnknown_03004250\n" - " .word gWindowTemplate_81E71EC\n" - " .word gReservedSpritePaletteCount\n" - " .word sub_800FCFC+1\n" - " .word gBattleTypeFlags\n" - " .word sub_800F298+1\n" - "._8:\n" - " ldr r0, ._15\n" - " bl SetMainCallback2\n" - "._9:\n" - " ldr r0, ._15 + 4\n" - " ldrh r1, [r0]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._13 @cond_branch\n" - " ldr r0, ._15 + 8\n" - " ldrb r1, [r0]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._13 @cond_branch\n" - " ldr r0, ._15 + 12\n" - " ldr r1, ._15 + 16\n" - " ldrh r1, [r1]\n" - " bl CreateNPCTrainerParty\n" - " bl SetWildMonHeldItem\n" - "._13:\n" - " ldr r0, ._15 + 20\n" - " ldr r1, ._15 + 24\n" - " add r0, r0, r1\n" - " ldrb r1, [r0]\n" - " mov r2, #0x2\n" - " orr r1, r1, r2\n" - " strb r1, [r0]\n" - " ldr r4, ._15 + 28\n" - " mov r3, #0xfa\n" - " lsl r3, r3, #0x1\n" - " add r5, r4, r3\n" - "._14:\n" - " add r0, r4, #0\n" - " mov r1, #0x3\n" - " bl AdjustFriendship\n" - " add r4, r4, #0x64\n" - " cmp r4, r5\n" - " ble ._14 @cond_branch\n" - " mov r1, #0x0\n" - " ldr r0, ._15 + 32\n" - " strb r1, [r0]\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._16:\n" - " .align 2, 0\n" - "._15:\n" - " .word sub_800EC9C+1\n" - " .word gBattleTypeFlags\n" - " .word gUnknown_02023A14_50\n" - " .word gEnemyParty\n" - " .word gTrainerBattleOpponent\n" - " .word gMain\n" - " .word 0x43d\n" - " .word gPlayerParty\n" - " .word gBattleCommunication\n" - "\n" - ); -} -#else void InitBattle(void) { s32 i; @@ -469,7 +248,14 @@ void InitBattle(void) gBattle_BG2_Y = 0; gBattle_BG3_X = 0; gBattle_BG3_Y = 0; + +#if DEBUG + if (!(gUnknown_02023A14_50 & 8)) + gBattleTerrain = BattleSetup_GetTerrain(); +#else gBattleTerrain = BattleSetup_GetTerrain(); +#endif + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0); Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC); @@ -486,7 +272,11 @@ void InitBattle(void) SetMainCallback2(sub_800F298); else SetMainCallback2(sub_800EC9C); - if (!(gBattleTypeFlags & BATTLE_TYPE_LINK)) + if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) +#if DEBUG + && !(gUnknown_02023A14_50 & 8) +#endif + ) { CreateNPCTrainerParty(gEnemyParty, gTrainerBattleOpponent); SetWildMonHeldItem(); @@ -496,7 +286,6 @@ void InitBattle(void) AdjustFriendship(&gPlayerParty[i], 3); gBattleCommunication[0] = 0; } -#endif void sub_800E9EC(void) { @@ -605,480 +394,11 @@ void shedinja_something(struct Pokemon *pkmn) } } -#if DEBUG -__attribute__((naked)) -void sub_800EC9C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " bl RunTasks\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " bl GetMultiplayerId\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r0, ._55\n" - " ldr r1, ._55 + 4\n" - " add r0, r0, r1\n" - " strb r4, [r0]\n" - " mov r0, #0x1\n" - " add r5, r4, #0\n" - " eor r5, r5, r0\n" - " ldr r0, ._55 + 8\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x9\n" - " bls ._53 @cond_branch\n" - " b ._140\n" - "._53:\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._55 + 12\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._56:\n" - " .align 2, 0\n" - "._55:\n" - " .word gSharedMem\n" - " .word 0x160cb\n" - " .word gBattleCommunication\n" - " .word ._57\n" - "._57:\n" - " .word ._58\n" - " .word ._59\n" - " .word ._60\n" - " .word ._61\n" - " .word ._62\n" - " .word ._63\n" - " .word ._64\n" - " .word ._65\n" - " .word ._66\n" - " .word ._67\n" - "._58:\n" - " ldr r2, ._76\n" - " ldrh r1, [r2]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._68 @cond_branch\n" - " ldr r0, ._76 + 4\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " bne ._69 @cond_branch\n" - " b ._140\n" - "._69:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._71 @cond_branch\n" - " b ._140\n" - "._71:\n" - " ldr r1, ._76 + 8\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " strb r0, [r1, #0x1]\n" - " bl sub_800E9EC\n" - " bl sub_800EAAC\n" - " ldr r0, ._76 + 12\n" - " ldrb r1, [r0]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._73 @cond_branch\n" - " mov r3, #0x0\n" - " ldr r1, ._76 + 16\n" - " ldr r0, ._76 + 20\n" - "._74:\n" - " strh r3, [r0, #0x18]\n" - " str r1, [r0, #0x14]\n" - " add r0, r0, #0x1c\n" - " add r3, r3, #0x1\n" - " cmp r3, #0x1\n" - " ble ._74 @cond_branch\n" - "._73:\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._76 + 8\n" - " mov r2, #0x20\n" - " bl SendBlock\n" - " ldr r1, ._76 + 24\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " b ._140\n" - "._77:\n" - " .align 2, 0\n" - "._76:\n" - " .word gBattleTypeFlags\n" - " .word gReceivedRemoteLinkPlayers\n" - " .word gSharedMem\n" - " .word gUnknown_02023A14_50\n" - " .word 0x2211\n" - " .word gLinkPlayers\n" - " .word gBattleCommunication\n" - "._68:\n" - " mov r0, #0x4\n" - " orr r0, r0, r1\n" - " strh r0, [r2]\n" - " ldr r1, ._79\n" - " mov r0, #0x8\n" - " strb r0, [r1]\n" - " bl sub_800EB08\n" - " b ._140\n" - "._80:\n" - " .align 2, 0\n" - "._79:\n" - " .word gBattleCommunication\n" - "._59:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0x3\n" - " and r1, r1, r0\n" - " cmp r1, #0x3\n" - " beq ._81 @cond_branch\n" - " b ._140\n" - "._81:\n" - " bl ResetBlockReceivedFlags\n" - " mov r3, #0x0\n" - " ldr r0, ._86\n" - " ldrh r1, [r0]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._83 @cond_branch\n" - " cmp r4, #0\n" - " bne ._84 @cond_branch\n" - " ldr r0, ._86 + 4\n" - " ldrh r1, [r0]\n" - " mov r2, #0xc\n" - " b ._85\n" - "._87:\n" - " .align 2, 0\n" - "._86:\n" - " .word gBlockRecvBuffer\n" - " .word gBattleTypeFlags\n" - "._84:\n" - " ldr r0, ._92\n" - " ldrh r1, [r0]\n" - " mov r2, #0x8\n" - "._85:\n" - " orr r1, r1, r2\n" - " strh r1, [r0]\n" - " add r3, r3, #0x1\n" - "._83:\n" - " lsl r7, r5, #0x8\n" - " cmp r3, #0\n" - " bne ._94 @cond_branch\n" - " ldr r0, ._92 + 4\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x1\n" - " add r2, r0, r1\n" - " ldrh r1, [r0]\n" - " add r6, r0, #0\n" - " ldrh r2, [r2]\n" - " cmp r1, r2\n" - " bne ._89 @cond_branch\n" - " cmp r4, #0\n" - " bne ._90 @cond_branch\n" - " ldr r0, ._92\n" - " ldrh r1, [r0]\n" - " mov r2, #0xc\n" - " b ._91\n" - "._93:\n" - " .align 2, 0\n" - "._92:\n" - " .word gBattleTypeFlags\n" - " .word gBlockRecvBuffer\n" - "._90:\n" - " ldr r0, ._96\n" - " ldrh r1, [r0]\n" - " mov r2, #0x8\n" - "._91:\n" - " orr r1, r1, r2\n" - " strh r1, [r0]\n" - " add r3, r3, #0x1\n" - "._89:\n" - " lsl r7, r5, #0x8\n" - " cmp r3, #0\n" - " bne ._94 @cond_branch\n" - " ldrh r1, [r6]\n" - " ldr r0, ._96 + 4\n" - " ldr r2, ._96\n" - " b ._95\n" - "._97:\n" - " .align 2, 0\n" - "._96:\n" - " .word gBattleTypeFlags\n" - " .word 0x101\n" - "._100:\n" - " add r3, r3, #0x1\n" - " cmp r3, #0x1\n" - " bgt ._98 @cond_branch\n" - " lsl r0, r3, #0x8\n" - " add r0, r0, r6\n" - " ldrh r1, [r0]\n" - " ldr r0, ._103\n" - "._95:\n" - " cmp r1, r0\n" - " bls ._100 @cond_branch\n" - " cmp r3, r4\n" - " beq ._100 @cond_branch\n" - "._98:\n" - " cmp r3, #0x2\n" - " bne ._101 @cond_branch\n" - " ldrh r0, [r2]\n" - " mov r1, #0xc\n" - " b ._102\n" - "._104:\n" - " .align 2, 0\n" - "._103:\n" - " .word 0x101\n" - "._101:\n" - " ldrh r0, [r2]\n" - " mov r1, #0x8\n" - "._102:\n" - " orr r0, r0, r1\n" - " strh r0, [r2]\n" - "._94:\n" - " bl sub_800EB08\n" - " ldr r0, ._106\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._106 + 4\n" - " lsl r2, r0, #0x2\n" - " add r2, r2, r0\n" - " lsl r2, r2, #0x3\n" - " add r2, r2, r1\n" - " mov r1, #0x0\n" - " mov r0, #0x87\n" - " lsl r0, r0, #0x1\n" - " strh r0, [r2, #0xa]\n" - " mov r0, #0x5a\n" - " strh r0, [r2, #0xc]\n" - " strh r1, [r2, #0x12]\n" - " ldr r0, ._106 + 8\n" - " ldrb r1, [r0, #0x2]\n" - " ldrb r0, [r0, #0x3]\n" - " lsl r0, r0, #0x8\n" - " orr r1, r1, r0\n" - " strh r1, [r2, #0xe]\n" - " ldr r0, ._106 + 12\n" - " add r0, r0, #0x2\n" - " add r0, r7, r0\n" - " ldrh r0, [r0]\n" - " strh r0, [r2, #0x10]\n" - " b ._129\n" - "._107:\n" - " .align 2, 0\n" - "._106:\n" - " .word sub_800DE30+1\n" - " .word gTasks\n" - " .word gSharedMem\n" - " .word gBlockRecvBuffer\n" - "._60:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._108 @cond_branch\n" - " b ._140\n" - "._108:\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._111\n" - " mov r2, #0xc8\n" - " bl SendBlock\n" - " b ._129\n" - "._112:\n" - " .align 2, 0\n" - "._111:\n" - " .word gPlayerParty\n" - "._61:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0x3\n" - " and r1, r1, r0\n" - " cmp r1, #0x3\n" - " beq ._113 @cond_branch\n" - " b ._140\n" - "._113:\n" - " bl ResetBlockReceivedFlags\n" - " ldr r0, ._116\n" - " lsl r1, r5, #0x8\n" - " ldr r2, ._116 + 4\n" - " add r1, r1, r2\n" - " mov r2, #0xc8\n" - " bl memcpy\n" - " b ._129\n" - "._117:\n" - " .align 2, 0\n" - "._116:\n" - " .word gEnemyParty\n" - " .word gBlockRecvBuffer\n" - "._62:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._118 @cond_branch\n" - " b ._140\n" - "._118:\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._121\n" - " mov r2, #0xc8\n" - " bl SendBlock\n" - " b ._129\n" - "._122:\n" - " .align 2, 0\n" - "._121:\n" - " .word gPlayerParty+0xc8\n" - "._63:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0x3\n" - " and r1, r1, r0\n" - " cmp r1, #0x3\n" - " beq ._123 @cond_branch\n" - " b ._140\n" - "._123:\n" - " bl ResetBlockReceivedFlags\n" - " ldr r0, ._126\n" - " lsl r1, r5, #0x8\n" - " ldr r2, ._126 + 4\n" - " add r1, r1, r2\n" - " mov r2, #0xc8\n" - " bl memcpy\n" - " b ._129\n" - "._127:\n" - " .align 2, 0\n" - "._126:\n" - " .word gEnemyParty+0xc8\n" - " .word gBlockRecvBuffer\n" - "._64:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._140 @cond_branch\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._130\n" - " mov r2, #0xc8\n" - " bl SendBlock\n" - " b ._129\n" - "._131:\n" - " .align 2, 0\n" - "._130:\n" - " .word gPlayerParty+0x190\n" - "._65:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0x3\n" - " and r1, r1, r0\n" - " cmp r1, #0x3\n" - " bne ._140 @cond_branch\n" - " bl ResetBlockReceivedFlags\n" - " ldr r4, ._134\n" - " lsl r1, r5, #0x8\n" - " ldr r0, ._134 + 4\n" - " add r1, r1, r0\n" - " add r0, r4, #0\n" - " mov r2, #0xc8\n" - " bl memcpy\n" - " ldr r1, ._134 + 8\n" - " add r0, r4, r1\n" - " bl shedinja_something\n" - " ldr r1, ._134 + 12\n" - " add r0, r4, r1\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " sub r0, r0, #0xc8\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " sub r0, r0, #0x64\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " add r0, r0, #0x64\n" - " bl shedinja_something\n" - "._129:\n" - " ldr r1, ._134 + 16\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " b ._140\n" - "._135:\n" - " .align 2, 0\n" - "._134:\n" - " .word gEnemyParty+0x190\n" - " .word gBlockRecvBuffer\n" - " .word 0xfffffe70\n" - " .word 0xfffffed4\n" - " .word gBattleCommunication\n" - "._66:\n" - " bl sub_800B950\n" - " ldr r0, ._137\n" - " ldrb r1, [r0]\n" - " add r1, r1, #0x1\n" - " mov r2, #0x0\n" - " strb r1, [r0]\n" - " strb r2, [r0, #0x1]\n" - " strb r2, [r0, #0x2]\n" - " b ._140\n" - "._138:\n" - " .align 2, 0\n" - "._137:\n" - " .word gBattleCommunication\n" - "._67:\n" - " ldr r0, ._141\n" - " add r1, r0, #1\n" - " bl battle_load_something\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._140 @cond_branch\n" - " ldr r2, ._141 + 4\n" - " ldr r1, ._141 + 8\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " ldr r0, ._141 + 12\n" - " str r0, [r1]\n" - " ldr r0, ._141 + 16\n" - " bl SetMainCallback2\n" - " ldr r3, ._141 + 20\n" - " ldrh r2, [r3]\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._140 @cond_branch\n" - " ldr r1, ._141 + 24\n" - " mov r4, #0x80\n" - " lsl r4, r4, #0x4\n" - " add r0, r4, #0\n" - " strh r0, [r1]\n" - " mov r0, #0x20\n" - " orr r0, r0, r2\n" - " strh r0, [r3]\n" - "._140:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._142:\n" - " .align 2, 0\n" - "._141:\n" - " .word gUnknown_02024D1F\n" - " .word gPreBattleCallback1\n" - " .word gMain\n" - " .word debug_sub_80139E4+1\n" - " .word BattleMainCB2+1\n" - " .word gBattleTypeFlags\n" - " .word gTrainerBattleOpponent\n" - "\n" - ); -} -#else -void sub_800EC9C(void) +void sub_800EC9C(void) { u8 playerId; u8 enemyId; + s32 id; RunTasks(); AnimateSprites(); @@ -1098,6 +418,16 @@ void sub_800EC9C(void) gBattleStruct->unk1 = 1; sub_800E9EC(); sub_800EAAC(); +#if DEBUG + if (gUnknown_02023A14_50 & 8) + { + for (id = 0; id < 2; id++) // Why < 2 here? + { + gLinkPlayers[id].lp_field_18 = id; + gLinkPlayers[id].linkType = 0x2211; + } + } +#endif SendBlock(bitmask_all_link_players_but_self(), gBattleStruct, 32); gBattleCommunication[0] = 1; } @@ -1112,7 +442,6 @@ void sub_800EC9C(void) case 1: if ((GetBlockReceivedStatus() & 3) == 3) { - s32 id; u8 taskId; ResetBlockReceivedFlags(); @@ -1220,7 +549,11 @@ void sub_800EC9C(void) if (battle_load_something(gUnknown_02024D1F, gUnknown_02024D1F + 1) != 0) { gPreBattleCallback1 = gMain.callback1; +#if DEBUG + gMain.callback1 = debug_sub_80139E4; +#else gMain.callback1 = sub_8010824; +#endif SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -1231,7 +564,6 @@ void sub_800EC9C(void) break; } } -#endif void sub_800F02C(void) { @@ -1258,241 +590,12 @@ void sub_800F02C(void) memcpy(gSharedMem, gUnknown_02023A00, 0x60); } -#if DEBUG -__attribute__((naked)) -void sub_800F104() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " bl GetMultiplayerId\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " ldr r0, ._151\n" - " ldr r2, ._151 + 4\n" - " add r1, r0, r2\n" - " strb r6, [r1]\n" - " ldr r1, ._151 + 8\n" - " add r1, r1, r0\n" - " mov r9, r1\n" - " sub r2, r2, #0x9\n" - " add r2, r2, r0\n" - " mov r8, r2\n" - " bl RunTasks\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " ldr r2, ._151 + 12\n" - " ldrb r0, [r2]\n" - " cmp r0, #0x1\n" - " beq ._147 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._148 @cond_branch\n" - " cmp r0, #0\n" - " beq ._149 @cond_branch\n" - " b ._183\n" - "._152:\n" - " .align 2, 0\n" - "._151:\n" - " .word gSharedMem\n" - " .word 0x160cb\n" - " .word 0x160c4\n" - " .word gBattleCommunication\n" - "._148:\n" - " cmp r0, #0x2\n" - " bne ._153 @cond_branch\n" - " b ._154\n" - "._153:\n" - " cmp r0, #0x3\n" - " bne ._155 @cond_branch\n" - " b ._156\n" - "._155:\n" - " b ._183\n" - "._149:\n" - " ldr r0, ._165\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " bne ._158 @cond_branch\n" - " b ._183\n" - "._158:\n" - " ldr r0, ._165 + 4\n" - " ldrb r1, [r0]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._160 @cond_branch\n" - " mov r4, #0x0\n" - " ldr r1, ._165 + 8\n" - " ldr r0, ._165 + 12\n" - "._161:\n" - " strh r4, [r0, #0x18]\n" - " str r1, [r0, #0x14]\n" - " add r0, r0, #0x1c\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x3\n" - " ble ._161 @cond_branch\n" - "._160:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._162 @cond_branch\n" - " b ._183\n" - "._162:\n" - " bl sub_800F02C\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._165 + 16\n" - " mov r2, #0x60\n" - " bl SendBlock\n" - " ldr r1, ._165 + 20\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " b ._183\n" - "._166:\n" - " .align 2, 0\n" - "._165:\n" - " .word gReceivedRemoteLinkPlayers\n" - " .word gUnknown_02023A14_50\n" - " .word 0x2211\n" - " .word gLinkPlayers\n" - " .word gSharedMem\n" - " .word gBattleCommunication\n" - "._147:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0xf\n" - " and r1, r1, r0\n" - " cmp r1, #0xf\n" - " bne ._183 @cond_branch\n" - " bl ResetBlockReceivedFlags\n" - " mov r4, #0x0\n" - " lsl r0, r6, #0x3\n" - " sub r0, r0, r6\n" - " lsl r5, r0, #0x2\n" - " mov r7, #0x0\n" - "._175:\n" - " cmp r4, r6\n" - " beq ._174 @cond_branch\n" - " ldr r2, ._172\n" - " add r0, r7, r2\n" - " ldrh r1, [r0, #0x18]\n" - " mov r3, #0x1\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._169 @cond_branch\n" - " add r0, r5, r2\n" - " ldrh r1, [r0, #0x18]\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._170 @cond_branch\n" - " b ._174\n" - "._173:\n" - " .align 2, 0\n" - "._172:\n" - " .word gLinkPlayers\n" - "._169:\n" - " add r0, r5, r2\n" - " ldrh r1, [r0, #0x18]\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._174 @cond_branch\n" - "._170:\n" - " lsl r1, r4, #0x8\n" - " ldr r0, ._177\n" - " add r1, r1, r0\n" - " ldr r0, ._177 + 4\n" - " mov r2, #0x60\n" - " bl memcpy\n" - "._174:\n" - " add r7, r7, #0x1c\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x3\n" - " ble ._175 @cond_branch\n" - " ldr r1, ._177 + 8\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r1, ._177 + 12\n" - " ldr r0, [r1, #0x8]\n" - " mov r2, r9\n" - " str r0, [r2]\n" - " ldr r0, ._177 + 16\n" - " ldrh r0, [r0]\n" - " mov r2, r8\n" - " strh r0, [r2]\n" - " ldr r0, ._177 + 20\n" - " str r0, [r1, #0x8]\n" - " mov r0, #0x5\n" - " mov r1, #0x0\n" - " bl OpenPartyMenu\n" - " b ._183\n" - "._178:\n" - " .align 2, 0\n" - "._177:\n" - " .word gBlockRecvBuffer\n" - " .word gUnknown_02023A00\n" - " .word gBattleCommunication\n" - " .word gMain\n" - " .word gBattleTypeFlags\n" - " .word sub_800F104+1\n" - "._154:\n" - " ldr r0, ._181\n" - " ldrb r1, [r0, #0x7]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._183 @cond_branch\n" - " mov r0, #0x3\n" - " strb r0, [r2]\n" - " bl sub_800832C\n" - " b ._183\n" - "._182:\n" - " .align 2, 0\n" - "._181:\n" - " .word gPaletteFade\n" - "._156:\n" - " ldr r0, ._184\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " bne ._183 @cond_branch\n" - " ldr r1, ._184 + 4\n" - " mov r2, r8\n" - " ldrh r0, [r2]\n" - " strh r0, [r1]\n" - " ldr r1, ._184 + 8\n" - " mov r2, r9\n" - " ldr r0, [r2]\n" - " str r0, [r1, #0x8]\n" - " ldr r0, ._184 + 12\n" - " bl SetMainCallback2\n" - "._183:\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._185:\n" - " .align 2, 0\n" - "._184:\n" - " .word gReceivedRemoteLinkPlayers\n" - " .word gBattleTypeFlags\n" - " .word gMain\n" - " .word InitBattle+1\n" - "\n" - ); -} -#else void sub_800F104(void) { u8 playerId; MainCallback *pSavedCallback; u16 *pSavedBattleTypeFlags; + s32 i; playerId = GetMultiplayerId(); ewram160CB = playerId; @@ -1506,820 +609,66 @@ void sub_800F104(void) switch (gBattleCommunication[0]) { case 0: - if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) - { - sub_800F02C(); - SendBlock(bitmask_all_link_players_but_self(), gSharedMem, 0x60); - gBattleCommunication[0]++; - } - break; - case 1: - if ((GetBlockReceivedStatus() & 0xF) == 0xF) - { - s32 i; - - ResetBlockReceivedFlags(); - for (i = 0; i < 4; i++) - { - if (i != playerId) - { - if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[playerId].lp_field_18 & 1)) - || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[playerId].lp_field_18 & 1))) - memcpy(gUnknown_02023A00, gBlockRecvBuffer[i], 0x60); - } - } - gBattleCommunication[0]++; - *pSavedCallback = gMain.savedCallback; - *pSavedBattleTypeFlags = gBattleTypeFlags; - gMain.savedCallback = sub_800F104; - OpenPartyMenu(PARTY_MENU_TYPE_LINK_MULTI_BATTLE, 0); - } - break; - case 2: - if (!gPaletteFade.active) - { - gBattleCommunication[0] = 3; - sub_800832C(); - } - break; - case 3: - if (gReceivedRemoteLinkPlayers == 0) - { - gBattleTypeFlags = *pSavedBattleTypeFlags; - gMain.savedCallback = *pSavedCallback; - SetMainCallback2(InitBattle); - } - break; - } -} -#endif - -#if DEBUG -__attribute__((naked)) -void sub_800F298() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " bl GetMultiplayerId\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " ldr r0, ._188\n" - " ldr r1, ._188 + 4\n" - " add r0, r0, r1\n" - " strb r6, [r0]\n" - " bl RunTasks\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " ldr r0, ._188 + 8\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x7\n" - " bls ._186 @cond_branch\n" - " b ._352\n" - "._186:\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._188 + 12\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._189:\n" - " .align 2, 0\n" - "._188:\n" - " .word gSharedMem\n" - " .word 0x160cb\n" - " .word gBattleCommunication\n" - " .word ._190\n" - "._190:\n" - " .word ._191\n" - " .word ._192\n" - " .word ._193\n" - " .word ._194\n" - " .word ._195\n" - " .word ._196\n" - " .word ._197\n" - " .word ._198\n" - "._191:\n" - " ldr r0, ._206\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " bne ._199 @cond_branch\n" - " b ._352\n" - "._199:\n" - " ldr r0, ._206 + 4\n" - " ldrb r1, [r0]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._201 @cond_branch\n" - " mov r4, #0x0\n" - " ldr r1, ._206 + 8\n" - " ldr r0, ._206 + 12\n" - "._202:\n" - " strh r4, [r0, #0x18]\n" - " str r1, [r0, #0x14]\n" - " add r0, r0, #0x1c\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x3\n" - " ble ._202 @cond_branch\n" - "._201:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._203 @cond_branch\n" - " b ._352\n" - "._203:\n" - " ldr r4, ._206 + 16\n" - " mov r0, #0x1\n" - " strb r0, [r4]\n" - " strb r0, [r4, #0x1]\n" - " bl sub_800E9EC\n" - " bl sub_800EAAC\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r1, r4, #0\n" - " mov r2, #0x20\n" - " bl SendBlock\n" - " b ._300\n" - "._207:\n" - " .align 2, 0\n" - "._206:\n" - " .word gReceivedRemoteLinkPlayers\n" - " .word gUnknown_02023A14_50\n" - " .word 0x2211\n" - " .word gLinkPlayers\n" - " .word gSharedMem\n" - "._192:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0xf\n" - " and r1, r1, r0\n" - " cmp r1, #0xf\n" - " beq ._208 @cond_branch\n" - " b ._352\n" - "._208:\n" - " bl ResetBlockReceivedFlags\n" - " mov r4, #0x0\n" - " ldr r0, ._213\n" - " ldrh r1, [r0]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._210 @cond_branch\n" - " cmp r6, #0\n" - " bne ._211 @cond_branch\n" - " ldr r0, ._213 + 4\n" - " ldrh r1, [r0]\n" - " mov r2, #0xc\n" - " b ._212\n" - "._214:\n" - " .align 2, 0\n" - "._213:\n" - " .word gBlockRecvBuffer\n" - " .word gBattleTypeFlags\n" - "._211:\n" - " ldr r0, ._221\n" - " ldrh r1, [r0]\n" - " mov r2, #0x8\n" - "._212:\n" - " orr r1, r1, r2\n" - " strh r1, [r0]\n" - " add r4, r4, #0x1\n" - "._210:\n" - " cmp r4, #0\n" - " bne ._223 @cond_branch\n" - " mov r2, #0x0\n" - " ldr r1, ._221 + 4\n" - " add r5, r1, #0\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x1\n" - "._217:\n" - " add r1, r1, r3\n" - " add r2, r2, #0x1\n" - " cmp r2, #0x3\n" - " bgt ._216 @cond_branch\n" - " ldrh r0, [r5]\n" - " ldrh r7, [r1]\n" - " cmp r0, r7\n" - " beq ._217 @cond_branch\n" - "._216:\n" - " cmp r2, #0x4\n" - " bne ._218 @cond_branch\n" - " cmp r6, #0\n" - " bne ._219 @cond_branch\n" - " ldr r0, ._221\n" - " ldrh r1, [r0]\n" - " mov r2, #0xc\n" - " b ._220\n" - "._222:\n" - " .align 2, 0\n" - "._221:\n" - " .word gBattleTypeFlags\n" - " .word gBlockRecvBuffer\n" - "._219:\n" - " ldr r0, ._233\n" - " ldrh r1, [r0]\n" - " mov r2, #0x8\n" - "._220:\n" - " orr r1, r1, r2\n" - " strh r1, [r0]\n" - " add r4, r4, #0x1\n" - "._218:\n" - " cmp r4, #0\n" - " bne ._223 @cond_branch\n" - " ldr r0, ._233 + 4\n" - " ldrh r2, [r0]\n" - " ldr r1, ._233 + 8\n" - " add r3, r0, #0\n" - " ldr r5, ._233\n" - " cmp r2, r1\n" - " beq ._224 @cond_branch\n" - "._230:\n" - " lsl r0, r4, #0x8\n" - " add r0, r0, r3\n" - " ldrh r0, [r0]\n" - " ldr r1, ._233 + 8\n" - " cmp r0, r1\n" - " bls ._225 @cond_branch\n" - " cmp r4, r6\n" - " bne ._227 @cond_branch\n" - "._225:\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x3\n" - " bgt ._227 @cond_branch\n" - " lsl r0, r4, #0x8\n" - " add r0, r0, r3\n" - " ldrh r0, [r0]\n" - " cmp r0, r1\n" - " bne ._230 @cond_branch\n" - "._224:\n" - " cmp r4, r6\n" - " beq ._230 @cond_branch\n" - " cmp r4, r6\n" - " bge ._230 @cond_branch\n" - "._227:\n" - " cmp r4, #0x4\n" - " bne ._231 @cond_branch\n" - " ldrh r0, [r5]\n" - " mov r1, #0xc\n" - " b ._232\n" - "._234:\n" - " .align 2, 0\n" - "._233:\n" - " .word gBattleTypeFlags\n" - " .word gBlockRecvBuffer\n" - " .word 0x101\n" - "._231:\n" - " ldrh r0, [r5]\n" - " mov r1, #0x8\n" - "._232:\n" - " orr r0, r0, r1\n" - " strh r0, [r5]\n" - "._223:\n" - " bl sub_800EB08\n" - " ldr r0, ._239\n" - " ldr r1, ._239 + 4\n" - " mov r2, #0x96\n" - " lsl r2, r2, #0x1\n" - " bl memcpy\n" - " ldr r0, ._239 + 8\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._239 + 12\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " mov r2, #0x0\n" - " mov r0, #0x87\n" - " lsl r0, r0, #0x1\n" - " strh r0, [r1, #0xa]\n" - " mov r0, #0x5a\n" - " strh r0, [r1, #0xc]\n" - " strh r2, [r1, #0x12]\n" - " strh r2, [r1, #0xe]\n" - " strh r2, [r1, #0x10]\n" - " add r2, r1, #0\n" - " ldr r0, ._239 + 16\n" - " add r3, r0, #2\n" - " ldr r6, ._239 + 20\n" - " mov r5, #0x3f\n" - " mov r7, #0x80\n" - " lsl r7, r7, #0x1\n" - " mov r4, #0x3\n" - "._247:\n" - " ldrh r0, [r6, #0x18]\n" - " cmp r0, #0x1\n" - " beq ._235 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._236 @cond_branch\n" - " cmp r0, #0\n" - " beq ._237 @cond_branch\n" - " b ._246\n" - "._240:\n" - " .align 2, 0\n" - "._239:\n" - " .word +0x201d000\n" - " .word gPlayerParty\n" - " .word sub_800DE30+1\n" - " .word gTasks\n" - " .word gBlockRecvBuffer\n" - " .word gLinkPlayers\n" - "._236:\n" - " cmp r0, #0x2\n" - " beq ._241 @cond_branch\n" - " cmp r0, #0x3\n" - " beq ._242 @cond_branch\n" - " b ._246\n" - "._237:\n" - " ldrh r0, [r3]\n" - " add r1, r5, #0\n" - " and r1, r1, r0\n" - " b ._244\n" - "._235:\n" - " ldrh r0, [r3]\n" - " add r1, r5, #0\n" - " and r1, r1, r0\n" - " b ._245\n" - "._241:\n" - " ldrh r0, [r3]\n" - " add r1, r5, #0\n" - " and r1, r1, r0\n" - " lsl r1, r1, #0x6\n" - "._244:\n" - " ldrh r0, [r2, #0xe]\n" - " orr r1, r1, r0\n" - " strh r1, [r2, #0xe]\n" - " b ._246\n" - "._242:\n" - " ldrh r0, [r3]\n" - " add r1, r5, #0\n" - " and r1, r1, r0\n" - " lsl r1, r1, #0x6\n" - "._245:\n" - " ldrh r0, [r2, #0x10]\n" - " orr r1, r1, r0\n" - " strh r1, [r2, #0x10]\n" - "._246:\n" - " add r3, r3, r7\n" - " add r6, r6, #0x1c\n" - " sub r4, r4, #0x1\n" - " cmp r4, #0\n" - " bge ._247 @cond_branch\n" - " bl ZeroPlayerPartyMons\n" - " bl ZeroEnemyPartyMons\n" - " ldr r1, ._251\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._193:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._248 @cond_branch\n" - " b ._352\n" - "._248:\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._251 + 4\n" - " mov r2, #0xc8\n" - " bl SendBlock\n" - " b ._300\n" - "._252:\n" - " .align 2, 0\n" - "._251:\n" - " .word gBattleCommunication\n" - " .word +0x201d000\n" - "._194:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0xf\n" - " and r1, r1, r0\n" - " cmp r1, #0xf\n" - " beq ._253 @cond_branch\n" - " b ._352\n" - "._253:\n" - " bl ResetBlockReceivedFlags\n" - " mov r4, #0x0\n" - " lsl r0, r6, #0x3\n" - " sub r0, r0, r6\n" - " lsl r0, r0, #0x2\n" - " mov r8, r0\n" - " ldr r5, ._260\n" - " mov r7, #0x0\n" - "._294:\n" - " cmp r4, r6\n" - " bne ._255 @cond_branch\n" - " ldr r0, ._260 + 4\n" - " add r0, r7, r0\n" - " ldrh r0, [r0, #0x18]\n" - " cmp r0, #0x2\n" - " bgt ._256 @cond_branch\n" - " cmp r0, #0x1\n" - " bge ._257 @cond_branch\n" - " cmp r0, #0\n" - " beq ._258 @cond_branch\n" - " b ._291\n" - "._261:\n" - " .align 2, 0\n" - "._260:\n" - " .word gBlockRecvBuffer\n" - " .word gLinkPlayers\n" - "._256:\n" - " cmp r0, #0x3\n" - " bne ._291 @cond_branch\n" - "._258:\n" - " ldr r0, ._264\n" - " b ._283\n" - "._265:\n" - " .align 2, 0\n" - "._264:\n" - " .word gPlayerParty\n" - "._257:\n" - " ldr r0, ._267\n" - " b ._283\n" - "._268:\n" - " .align 2, 0\n" - "._267:\n" - " .word gPlayerParty+0x12c\n" - "._255:\n" - " ldr r2, ._272\n" - " add r0, r7, r2\n" - " ldrh r1, [r0, #0x18]\n" - " mov r3, #0x1\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._269 @cond_branch\n" - " mov r1, r8\n" - " add r0, r1, r2\n" - " ldrh r1, [r0, #0x18]\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._270 @cond_branch\n" - " b ._274\n" - "._273:\n" - " .align 2, 0\n" - "._272:\n" - " .word gLinkPlayers\n" - "._269:\n" - " mov r1, r8\n" - " add r0, r1, r2\n" - " ldrh r1, [r0, #0x18]\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._274 @cond_branch\n" - "._270:\n" - " add r0, r7, r2\n" - " ldrh r2, [r0, #0x18]\n" - " cmp r2, #0x2\n" - " bgt ._275 @cond_branch\n" - " cmp r2, #0x1\n" - " bge ._276 @cond_branch\n" - " cmp r2, #0\n" - " beq ._277 @cond_branch\n" - " b ._291\n" - "._275:\n" - " cmp r2, #0x3\n" - " bne ._291 @cond_branch\n" - "._277:\n" - " ldr r0, ._281\n" - " b ._283\n" - "._282:\n" - " .align 2, 0\n" - "._281:\n" - " .word gPlayerParty\n" - "._276:\n" - " ldr r0, ._284\n" - " b ._283\n" - "._285:\n" - " .align 2, 0\n" - "._284:\n" - " .word gPlayerParty+0x12c\n" - "._274:\n" - " add r0, r7, r2\n" - " ldrh r2, [r0, #0x18]\n" - " cmp r2, #0x2\n" - " bgt ._286 @cond_branch\n" - " cmp r2, #0x1\n" - " bge ._287 @cond_branch\n" - " cmp r2, #0\n" - " beq ._288 @cond_branch\n" - " b ._291\n" - "._286:\n" - " cmp r2, #0x3\n" - " bne ._291 @cond_branch\n" - "._288:\n" - " ldr r0, ._292\n" - "._283:\n" - " add r1, r5, #0\n" - " mov r2, #0xc8\n" - " bl memcpy\n" - " b ._291\n" - "._293:\n" - " .align 2, 0\n" - "._292:\n" - " .word gEnemyParty\n" - "._287:\n" - " ldr r0, ._296\n" - " add r1, r5, #0\n" - " mov r2, #0xc8\n" - " bl memcpy\n" - "._291:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " add r5, r5, r0\n" - " add r7, r7, #0x1c\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x3\n" - " ble ._294 @cond_branch\n" - " b ._300\n" - "._297:\n" - " .align 2, 0\n" - "._296:\n" - " .word gEnemyParty+0x12c\n" - "._195:\n" - " bl sub_8007ECC\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._298 @cond_branch\n" - " b ._352\n" - "._298:\n" - " bl bitmask_all_link_players_but_self\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r1, ._301\n" - " mov r2, #0x64\n" - " bl SendBlock\n" - " b ._300\n" - "._302:\n" - " .align 2, 0\n" - "._301:\n" - " .word +0x201d0c8\n" - "._196:\n" - " bl GetBlockReceivedStatus\n" - " mov r1, #0xf\n" - " and r1, r1, r0\n" - " cmp r1, #0xf\n" - " beq ._303 @cond_branch\n" - " b ._352\n" - "._303:\n" - " bl ResetBlockReceivedFlags\n" - " mov r4, #0x0\n" - " lsl r0, r6, #0x3\n" - " sub r0, r0, r6\n" - " lsl r0, r0, #0x2\n" - " mov r8, r0\n" - " ldr r5, ._310\n" - " mov r7, #0x0\n" - "._344:\n" - " cmp r4, r6\n" - " bne ._305 @cond_branch\n" - " ldr r0, ._310 + 4\n" - " add r0, r7, r0\n" - " ldrh r0, [r0, #0x18]\n" - " cmp r0, #0x2\n" - " bgt ._306 @cond_branch\n" - " cmp r0, #0x1\n" - " bge ._307 @cond_branch\n" - " cmp r0, #0\n" - " beq ._308 @cond_branch\n" - " b ._341\n" - "._311:\n" - " .align 2, 0\n" - "._310:\n" - " .word gBlockRecvBuffer\n" - " .word gLinkPlayers\n" - "._306:\n" - " cmp r0, #0x3\n" - " bne ._341 @cond_branch\n" - "._308:\n" - " ldr r0, ._314\n" - " b ._333\n" - "._315:\n" - " .align 2, 0\n" - "._314:\n" - " .word gPlayerParty+0xc8\n" - "._307:\n" - " ldr r0, ._317\n" - " b ._333\n" - "._318:\n" - " .align 2, 0\n" - "._317:\n" - " .word gPlayerParty+0x1f4\n" - "._305:\n" - " ldr r2, ._322\n" - " add r0, r7, r2\n" - " ldrh r1, [r0, #0x18]\n" - " mov r3, #0x1\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._319 @cond_branch\n" - " mov r1, r8\n" - " add r0, r1, r2\n" - " ldrh r1, [r0, #0x18]\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._320 @cond_branch\n" - " b ._324\n" - "._323:\n" - " .align 2, 0\n" - "._322:\n" - " .word gLinkPlayers\n" - "._319:\n" - " mov r1, r8\n" - " add r0, r1, r2\n" - " ldrh r1, [r0, #0x18]\n" - " add r0, r3, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._324 @cond_branch\n" - "._320:\n" - " add r0, r7, r2\n" - " ldrh r2, [r0, #0x18]\n" - " cmp r2, #0x2\n" - " bgt ._325 @cond_branch\n" - " cmp r2, #0x1\n" - " bge ._326 @cond_branch\n" - " cmp r2, #0\n" - " beq ._327 @cond_branch\n" - " b ._341\n" - "._325:\n" - " cmp r2, #0x3\n" - " bne ._341 @cond_branch\n" - "._327:\n" - " ldr r0, ._331\n" - " b ._333\n" - "._332:\n" - " .align 2, 0\n" - "._331:\n" - " .word gPlayerParty+0xc8\n" - "._326:\n" - " ldr r0, ._334\n" - " b ._333\n" - "._335:\n" - " .align 2, 0\n" - "._334:\n" - " .word gPlayerParty+0x1f4\n" - "._324:\n" - " add r0, r7, r2\n" - " ldrh r2, [r0, #0x18]\n" - " cmp r2, #0x2\n" - " bgt ._336 @cond_branch\n" - " cmp r2, #0x1\n" - " bge ._337 @cond_branch\n" - " cmp r2, #0\n" - " beq ._338 @cond_branch\n" - " b ._341\n" - "._336:\n" - " cmp r2, #0x3\n" - " bne ._341 @cond_branch\n" - "._338:\n" - " ldr r0, ._342\n" - "._333:\n" - " add r1, r5, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - " b ._341\n" - "._343:\n" - " .align 2, 0\n" - "._342:\n" - " .word gEnemyParty+0xc8\n" - "._337:\n" - " ldr r0, ._346\n" - " add r1, r5, #0\n" - " mov r2, #0x64\n" - " bl memcpy\n" - "._341:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " add r5, r5, r0\n" - " add r7, r7, #0x1c\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x3\n" - " ble ._344 @cond_branch\n" - " ldr r4, ._346 + 4\n" - " add r0, r4, #0\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " add r0, r0, #0x64\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " add r0, r0, #0xc8\n" - " bl shedinja_something\n" - " mov r1, #0x96\n" - " lsl r1, r1, #0x1\n" - " add r0, r4, r1\n" - " bl shedinja_something\n" - " mov r7, #0xc8\n" - " lsl r7, r7, #0x1\n" - " add r0, r4, r7\n" - " bl shedinja_something\n" - " mov r1, #0xfa\n" - " lsl r1, r1, #0x1\n" - " add r0, r4, r1\n" - " bl shedinja_something\n" - " ldr r4, ._346 + 8\n" - " add r0, r4, #0\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " add r0, r0, #0x64\n" - " bl shedinja_something\n" - " add r0, r4, #0\n" - " add r0, r0, #0xc8\n" - " bl shedinja_something\n" - " sub r7, r7, #0x64\n" - " add r0, r4, r7\n" - " bl shedinja_something\n" - " mov r1, #0xc8\n" - " lsl r1, r1, #0x1\n" - " add r0, r4, r1\n" - " bl shedinja_something\n" - " add r7, r7, #0xc8\n" - " add r0, r4, r7\n" - " bl shedinja_something\n" - "._300:\n" - " ldr r1, ._346 + 12\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " b ._352\n" - "._347:\n" - " .align 2, 0\n" - "._346:\n" - " .word gEnemyParty+0x1f4\n" - " .word gPlayerParty\n" - " .word gEnemyParty\n" - " .word gBattleCommunication\n" - "._197:\n" - " bl sub_800B950\n" - " ldr r0, ._349\n" - " ldrb r1, [r0]\n" - " add r1, r1, #0x1\n" - " mov r2, #0x0\n" - " strb r1, [r0]\n" - " strb r2, [r0, #0x1]\n" - " strb r2, [r0, #0x2]\n" - " b ._352\n" - "._350:\n" - " .align 2, 0\n" - "._349:\n" - " .word gBattleCommunication\n" - "._198:\n" - " ldr r0, ._353\n" - " add r1, r0, #1\n" - " bl battle_load_something\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._352 @cond_branch\n" - " ldr r2, ._353 + 4\n" - " ldr r1, ._353 + 8\n" - " ldr r0, [r1]\n" - " str r0, [r2]\n" - " ldr r0, ._353 + 12\n" - " str r0, [r1]\n" - " ldr r0, ._353 + 16\n" - " bl SetMainCallback2\n" - " ldr r3, ._353 + 20\n" - " ldrh r2, [r3]\n" - " mov r0, #0x2\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._352 @cond_branch\n" - " ldr r1, ._353 + 24\n" - " mov r4, #0x80\n" - " lsl r4, r4, #0x4\n" - " add r0, r4, #0\n" - " strh r0, [r1]\n" - " mov r0, #0x20\n" - " orr r0, r0, r2\n" - " strh r0, [r3]\n" - "._352:\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._354:\n" - " .align 2, 0\n" - "._353:\n" - " .word gUnknown_02024D1F\n" - " .word gPreBattleCallback1\n" - " .word gMain\n" - " .word debug_sub_80139E4+1\n" - " .word BattleMainCB2+1\n" - " .word gBattleTypeFlags\n" - " .word gTrainerBattleOpponent\n" - "\n" - ); + if (gReceivedRemoteLinkPlayers != 0) + { +#if DEBUG + if (gUnknown_02023A14_50 & 8) + { + for (i = 0; i < 4; i++) + { + gLinkPlayers[i].lp_field_18 = i; + gLinkPlayers[i].linkType = 0x2211; + } + } +#endif + if (sub_8007ECC()) + { + sub_800F02C(); + SendBlock(bitmask_all_link_players_but_self(), gSharedMem, 0x60); + gBattleCommunication[0]++; + } + } + break; + case 1: + if ((GetBlockReceivedStatus() & 0xF) == 0xF) + { + //s32 i; + + ResetBlockReceivedFlags(); + for (i = 0; i < 4; i++) + { + if (i != playerId) + { + if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[playerId].lp_field_18 & 1)) + || ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[playerId].lp_field_18 & 1))) + memcpy(gUnknown_02023A00, gBlockRecvBuffer[i], 0x60); + } + } + gBattleCommunication[0]++; + *pSavedCallback = gMain.savedCallback; + *pSavedBattleTypeFlags = gBattleTypeFlags; + gMain.savedCallback = sub_800F104; + OpenPartyMenu(PARTY_MENU_TYPE_LINK_MULTI_BATTLE, 0); + } + break; + case 2: + if (!gPaletteFade.active) + { + gBattleCommunication[0] = 3; + sub_800832C(); + } + break; + case 3: + if (gReceivedRemoteLinkPlayers == 0) + { + gBattleTypeFlags = *pSavedBattleTypeFlags; + gMain.savedCallback = *pSavedCallback; + SetMainCallback2(InitBattle); + } + break; + } } -#else + void sub_800F298(void) { u8 playerId; @@ -2333,14 +682,27 @@ void sub_800F298(void) switch (gBattleCommunication[0]) { case 0: - if (gReceivedRemoteLinkPlayers != 0 && sub_8007ECC()) + if (gReceivedRemoteLinkPlayers != 0) { - gBattleStruct->unk0 = 1; - gBattleStruct->unk1 = 1; - sub_800E9EC(); - sub_800EAAC(); - SendBlock(bitmask_all_link_players_but_self(), gSharedMem, 0x20); - gBattleCommunication[0]++; +#if DEBUG + if (gUnknown_02023A14_50 & 8) + { + for (id = 0; id < 4; id++) + { + gLinkPlayers[id].lp_field_18 = id; + gLinkPlayers[id].linkType = 0x2211; + } + } +#endif + if (sub_8007ECC()) + { + gBattleStruct->unk0 = 1; + gBattleStruct->unk1 = 1; + sub_800E9EC(); + sub_800EAAC(); + SendBlock(bitmask_all_link_players_but_self(), gSharedMem, 0x20); + gBattleCommunication[0]++; + } } break; case 1: @@ -2576,7 +938,12 @@ void sub_800F298(void) if (battle_load_something(gUnknown_02024D1F, gUnknown_02024D1F + 1) != 0) { gPreBattleCallback1 = gMain.callback1; + // debug +#if DEBUG + gMain.callback1 = debug_sub_80139E4; +#else gMain.callback1 = sub_8010824; +#endif SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -2587,128 +954,38 @@ void sub_800F298(void) break; } } -#endif -#if DEBUG -__attribute__((naked)) -void BattleMainCB2(void) -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " ldr r4, ._358\n" - " ldrh r2, [r4, #0x2c]\n" - " mov r1, #0x82\n" - " lsl r1, r1, #0x1\n" - " add r0, r1, #0\n" - " and r0, r0, r2\n" - " cmp r0, r1\n" - " bne ._357 @cond_branch\n" - " ldr r2, ._358 + 4\n" - " ldr r1, ._358 + 8\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x1\n" - " strh r0, [r2]\n" - " ldr r0, ._358 + 12\n" - " add r2, r4, r0\n" - " ldrb r1, [r2]\n" - " mov r0, #0x3\n" - " neg r0, r0\n" - " and r0, r0, r1\n" - " strb r0, [r2]\n" - " ldr r1, ._358 + 16\n" - " mov r0, #0x3\n" - " strb r0, [r1, #0x15]\n" - " ldr r0, ._358 + 20\n" - " ldr r0, [r0]\n" - " str r0, [r4]\n" - " bl ZeroEnemyPartyMons\n" - " mov r0, #0x5a\n" - " bl m4aSongNumStop\n" - " ldr r0, ._358 + 24\n" - " ldrh r1, [r0]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._356 @cond_branch\n" - " ldr r0, ._358 + 28\n" - " bl SetMainCallback2\n" - " b ._357\n" - "._359:\n" - " .align 2, 0\n" - "._358:\n" - " .word gMain\n" - " .word gSpecialVar_Result\n" - " .word gBattleOutcome\n" - " .word 0x43d\n" - " .word gScanlineEffect\n" - " .word gPreBattleCallback1\n" - " .word gBattleTypeFlags\n" - " .word sub_805465C+1\n" - "._356:\n" - " ldr r0, [r4, #0x8]\n" - " bl SetMainCallback2\n" - "._357:\n" - " ldr r5, ._361\n" - " ldrh r1, [r5]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._360 @cond_branch\n" - " lsr r0, r1, #0x2\n" - " mov r4, #0x1\n" - " and r0, r0, r4\n" - " str r4, [sp]\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl debug_sub_8008264\n" - " ldrh r0, [r5]\n" - " lsr r0, r0, #0x2\n" - " and r0, r0, r4\n" - " str r4, [sp]\n" - " mov r1, #0x1\n" - " mov r2, #0x15\n" - " mov r3, #0x1\n" - " bl debug_sub_8008264\n" - " ldrh r0, [r5]\n" - " lsr r0, r0, #0x2\n" - " and r0, r0, r4\n" - " str r4, [sp]\n" - " mov r1, #0x1\n" - " mov r2, #0x29\n" - " mov r3, #0x1\n" - " bl debug_sub_8008264\n" - "._360:\n" - " ldr r0, ._361 + 4\n" - " bl Text_UpdateWindowInBattle\n" - " bl UpdatePaletteFade\n" - " bl RunTasks\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._362:\n" - " .align 2, 0\n" - "._361:\n" - " .word gBattleTypeFlags\n" - " .word gUnknown_03004210\n" - "\n" - ); -} -#else void BattleMainCB2(void) { AnimateSprites(); BuildOamBuffer(); + +#if DEBUG + if ((gMain.heldKeys & (R_BUTTON | SELECT_BUTTON)) == ((R_BUTTON | SELECT_BUTTON))) + { + gSpecialVar_Result = gBattleOutcome = 1; + gMain.inBattle = FALSE; + gScanlineEffect.state = 3; + gMain.callback1 = gPreBattleCallback1; + ZeroEnemyPartyMons(); + m4aSongNumStop(0x5A); + if (gBattleTypeFlags & 2) + SetMainCallback2(sub_805465C); + else + SetMainCallback2(gMain.savedCallback); + } + if (gBattleTypeFlags & 2) + { + debug_sub_8008264((gBattleTypeFlags >> 2) % 2, 1, 1, 1, 1); + debug_sub_8008264((gBattleTypeFlags >> 2) % 2, 1, 21, 1, 1); + debug_sub_8008264((gBattleTypeFlags >> 2) % 2, 1, 41, 1, 1); + } +#endif + Text_UpdateWindowInBattle(&gUnknown_03004210); UpdatePaletteFade(); RunTasks(); } -#endif void sub_800F828(struct Sprite *sprite) { @@ -3084,24 +1361,19 @@ void c2_081284E0(void) // A LOT of debug code! #if DEBUG -__attribute__((naked)) -void debug_sub_8010800() + +extern u8 gBattleBuffersTransferData[]; + +void debug_sub_8010818(void); +void debug_sub_80108B8(void); +void debug_sub_8011EA0(u8); +void debug_sub_8012294(void); + +void debug_sub_8010800(void) { - asm( - " push {lr}\n" - " bl debug_sub_8010818\n" - " bl debug_sub_80108B8\n" - " ldr r1, ._496\n" - " mov r0, #0x0\n" - " str r0, [r1]\n" - " pop {r0}\n" - " bx r0\n" - "._497:\n" - " .align 2, 0\n" - "._496:\n" - " .word gBattleBuffersTransferData+0x100\n" - "\n" - ); + debug_sub_8010818(); + debug_sub_80108B8(); + *(u32 *)(gBattleBuffersTransferData + 0x100) = 0; } __attribute__((naked)) @@ -5849,133 +4121,54 @@ void debug_sub_8011D40() ); } -__attribute__((naked)) void debug_nullsub_45() { - asm( - " bx lr\n" - "\n" - ); } -__attribute__((naked)) -void debug_sub_8011DD4() +void debug_sub_8011DD4(void) { - asm( - " push {lr}\n" - " ldr r1, ._776\n" - " ldr r2, ._776 + 4\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x8\n" - " ldr r0, ._776 + 8\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._776 + 12\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._776 + 16\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._776 + 20\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._776 + 24\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._776 + 28\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._776 + 32\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._776 + 36\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " bl LoadOam\n" - " bl ProcessSpriteCopyRequests\n" - " bl TransferPlttBuffer\n" - " bl ScanlineEffect_InitHBlankDmaTransfer\n" - " pop {r0}\n" - " bx r0\n" - "._777:\n" - " .align 2, 0\n" - "._776:\n" - " .word 0x4000008\n" - " .word 0x9803\n" - " .word gBattle_BG0_X\n" - " .word gBattle_BG0_Y\n" - " .word gBattle_BG1_X\n" - " .word gBattle_BG1_Y\n" - " .word gBattle_BG2_X\n" - " .word gBattle_BG2_Y\n" - " .word gBattle_BG3_X\n" - " .word gBattle_BG3_Y\n" - "\n" - ); + REG_BG0CNT = 0x9803; + + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; + + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; + + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; + + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + ScanlineEffect_InitHBlankDmaTransfer(); } -__attribute__((naked)) -void debug_sub_8011E5C() +void debug_sub_8011E5C(void) { - asm( - " push {r4, lr}\n" - " mov r4, #0x0\n" - "._778:\n" - " lsl r0, r4, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x1e\n" - " ble ._778 @cond_branch\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); + s32 i; + + for (i = 0; i < 31; i++) + debug_sub_8011EA0(i); } -__attribute__((naked)) -void debug_sub_8011E74() +extern u8 gUnknown_Debug_030043A8; + +void debug_sub_8011E74(void) { - asm( - " push {r4, r5, lr}\n" - " ldr r0, ._780\n" - " ldrb r5, [r0]\n" - " mov r1, #0x0\n" - " strb r1, [r0]\n" - " add r4, r0, #0\n" - "._779:\n" - " bl debug_sub_8012294\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " strb r0, [r4]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x3\n" - " bls ._779 @cond_branch\n" - " ldr r0, ._780\n" - " strb r5, [r0]\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._781:\n" - " .align 2, 0\n" - "._780:\n" - " .word gUnknown_Debug_030043A8\n" - "\n" - ); + u8 r5 = gUnknown_Debug_030043A8; + + for (gUnknown_Debug_030043A8 = 0; gUnknown_Debug_030043A8 < 4; gUnknown_Debug_030043A8++) + debug_sub_8012294(); + + gUnknown_Debug_030043A8 = r5; } __attribute__((naked)) -void debug_sub_8011EA0() +void debug_sub_8011EA0(u8 a) { asm( " push {r4, r5, r6, r7, lr}\n" diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index ed6929638..8f79944de 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -23,6 +23,7 @@ #include "text.h" #include "trainer_card.h" +extern u8 unk_2030220; extern u16 gSpecialVar_Result; extern struct TrainerCard gTrainerCards[4]; extern u8 gUnknown_03004860; @@ -1374,50 +1375,19 @@ void unref_sub_8083CC8(u8 taskId) #if DEBUG -__attribute__((naked)) -void debug_sub_808B82C() +void debug_sub_808B82C(void) { - asm("\ - ldr r1, ._400\n\ - mov r0, #0x0\n\ - strb r0, [r1]\n\ - bx lr\n\ -._401:\n\ - .align 2, 0\n\ -._400:\n\ - .word unk_2030220"); + unk_2030220 = 0; } -__attribute__((naked)) void debug_sub_808B838(u8 a) { - asm("\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - ldr r2, ._402\n\ - mov r1, #0x1\n\ - LSL r1, r0\n\ - ldrb r0, [r2]\n\ - orr r1, r1, r0\n\ - strb r1, [r2]\n\ - bx lr\n\ -._403:\n\ - .align 2, 0\n\ -._402:\n\ - .word unk_2030220"); + unk_2030220 |= 1 << a; } -__attribute__((naked)) -int debug_sub_808B850() +int debug_sub_808B850(void) { - asm("\ - ldr r0, ._404\n\ - ldrb r0, [r0]\n\ - bx lr\n\ -._405:\n\ - .align 2, 0\n\ -._404:\n\ - .word unk_2030220"); + return unk_2030220; } #endif \ No newline at end of file diff --git a/src/engine/link.c b/src/engine/link.c index eb0ae4731..31311d345 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -1044,7 +1044,7 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0) } #else __attribute__((naked)) -void debug_sub_8008264() +void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0) { asm( " push {r4, r5, r6, r7, lr}\n" -- cgit v1.2.3 From ac53fde3fc85ef3015ea62ed7ce5926146ea564e Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 24 Jan 2018 01:18:38 -0600 Subject: move debug scripts to a separate file --- data-de/event_scripts.s | 538 +----------------------------------------------- data/event_scripts.s | 1 + data/scripts/debug.inc | 536 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 538 insertions(+), 537 deletions(-) create mode 100644 data/scripts/debug.inc diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 4ca5992e6..7e43905bf 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -3279,543 +3279,7 @@ PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC Route101_EventScript_1A14DC:: @ 81A14DC return -.if DEBUG - -DebugScript_081C1CFE:: @ 81C1CFE - setflag 0x804 - call EverGrandeCity_HallOfFame_EventScript_19FC13 - end - -DebugScript_081C1D07:: @ 81C1D07 - checkitem ITEM_COIN_CASE, 1 - compare 0x800d, 1 - goto_if_eq DebugScript_081C1D1D - giveitem ITEM_COIN_CASE, 1 - end - -DebugScript_081C1D1D:: @ 81C1D1D - end - -DebugScript_081C1D1E:: @ 81C1D1E - goto Route103_EventScript_14ED46 - -DebugScript_081C1D23:: @ 81C1D23 - end - -DebugScript_081C1D24:: @ 81C1D24 - setvar 0x40ba, 1 - end - -DebugScript_081C1D2A:: @ 81C1D2A - giveitem ITEM_SS_TICKET, 1 - goto DebugScript_081C1CFE - -DebugScript_081C1D34:: @ 81C1D34 - end - -DebugScript_081C1D35:: @ 81C1D35 - getpartysize - compare 0x800d, 6 - goto_if_eq DebugScript_081C1D45 - giveegg SPECIES_KYOGRE - end - -DebugScript_081C1D45:: @ 81C1D45 - end - -DebugScript_081C1D46:: @ 81C1D46 - giveitem ITEM_POTION, 99 - giveitem ITEM_ANTIDOTE, 99 - giveitem ITEM_BURN_HEAL, 99 - giveitem ITEM_ICE_HEAL, 99 - giveitem ITEM_AWAKENING, 99 - giveitem ITEM_PARALYZE_HEAL, 99 - giveitem ITEM_FULL_RESTORE, 99 - giveitem ITEM_MAX_POTION, 99 - giveitem ITEM_HYPER_POTION, 99 - giveitem ITEM_SUPER_POTION, 99 - giveitem ITEM_FULL_HEAL, 99 - giveitem ITEM_REVIVE, 99 - giveitem ITEM_MAX_REVIVE, 99 - giveitem ITEM_FRESH_WATER, 99 - giveitem ITEM_SODA_POP, 99 - giveitem ITEM_LEMONADE, 99 - giveitem ITEM_MOOMOO_MILK, 99 - giveitem ITEM_ENERGY_POWDER, 99 - giveitem ITEM_ENERGY_ROOT, 99 - giveitem ITEM_HEAL_POWDER, 99 - giveitem ITEM_ORANGE_MAIL, 92 - giveitem ITEM_RETRO_MAIL, 94 - giveitem ITEM_POTION, 89 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_ULTRA_BALL, 99 - giveitem ITEM_GREAT_BALL, 99 - giveitem ITEM_POKE_BALL, 99 - giveitem ITEM_NET_BALL, 99 - giveitem ITEM_DIVE_BALL, 99 - giveitem ITEM_NEST_BALL, 99 - giveitem ITEM_REPEAT_BALL, 99 - giveitem ITEM_TIMER_BALL, 99 - giveitem ITEM_LUXURY_BALL, 99 - giveitem ITEM_PREMIER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_MASTER_BALL, 99 - giveitem ITEM_GREAT_BALL, 79 - giveitem ITEM_ULTRA_BALL, 84 - giveitem ITEM_POKE_BALL, 89 - giveitem ITEM_MASTER_BALL, 74 - giveitem ITEM_TM01_FOCUS_PUNCH, 99 - giveitem ITEM_TM02_DRAGON_CLAW, 99 - giveitem ITEM_TM03_WATER_PULSE, 99 - giveitem ITEM_TM04_CALM_MIND, 99 - giveitem ITEM_TM05_ROAR, 99 - giveitem ITEM_TM06_TOXIC, 99 - giveitem ITEM_TM07_HAIL, 99 - giveitem ITEM_TM08_BULK_UP, 99 - giveitem ITEM_TM09_BULLET_SEED, 99 - giveitem ITEM_TM10_HIDDEN_POWER, 99 - giveitem ITEM_TM11_SUNNY_DAY, 99 - giveitem ITEM_TM12_TAUNT, 99 - giveitem ITEM_TM13_ICE_BEAM, 99 - giveitem ITEM_TM14_BLIZZARD, 99 - giveitem ITEM_TM15_HYPER_BEAM, 99 - giveitem ITEM_TM16_LIGHT_SCREEN, 99 - giveitem ITEM_TM17_PROTECT, 99 - giveitem ITEM_TM18_RAIN_DANCE, 99 - giveitem ITEM_TM19_GIGA_DRAIN, 99 - giveitem ITEM_TM20_SAFEGUARD, 99 - giveitem ITEM_TM21_FRUSTRATION, 99 - giveitem ITEM_TM22_SOLARBEAM, 99 - giveitem ITEM_TM23_IRON_TAIL, 99 - giveitem ITEM_TM24_THUNDERBOLT, 99 - giveitem ITEM_TM25_THUNDER, 99 - giveitem ITEM_TM26_EARTHQUAKE, 99 - giveitem ITEM_TM27_RETURN, 99 - giveitem ITEM_TM28_DIG, 99 - giveitem ITEM_TM29_PSYCHIC, 99 - giveitem ITEM_TM30_SHADOW_BALL, 99 - giveitem ITEM_TM31_BRICK_BREAK, 99 - giveitem ITEM_TM32_DOUBLE_TEAM, 99 - giveitem ITEM_TM33_REFLECT, 99 - giveitem ITEM_TM34_SHOCK_WAVE, 99 - giveitem ITEM_TM35_FLAMETHROWER, 99 - giveitem ITEM_TM36_SLUDGE_BOMB, 99 - giveitem ITEM_TM37_SANDSTORM, 99 - giveitem ITEM_TM38_FIRE_BLAST, 99 - giveitem ITEM_TM39_ROCK_TOMB, 99 - giveitem ITEM_TM40_AERIAL_ACE, 99 - giveitem ITEM_TM41_TORMENT, 99 - giveitem ITEM_TM42_FACADE, 99 - giveitem ITEM_TM43_SECRET_POWER, 99 - giveitem ITEM_TM44_REST, 99 - giveitem ITEM_TM45_ATTRACT, 99 - giveitem ITEM_TM46_THIEF, 99 - giveitem ITEM_TM47_STEEL_WING, 99 - giveitem ITEM_TM48_SKILL_SWAP, 99 - giveitem ITEM_TM49_SNATCH, 99 - giveitem ITEM_TM50_OVERHEAT, 99 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 200 - giveitem ITEM_CHERI_BERRY, 199 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 200 - giveitem ITEM_CHESTO_BERRY, 199 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 200 - giveitem ITEM_PECHA_BERRY, 199 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 200 - giveitem ITEM_RAWST_BERRY, 199 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 200 - giveitem ITEM_ASPEAR_BERRY, 199 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 200 - giveitem ITEM_LEPPA_BERRY, 199 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 200 - giveitem ITEM_ORAN_BERRY, 199 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 200 - giveitem ITEM_PERSIM_BERRY, 199 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 200 - giveitem ITEM_LUM_BERRY, 199 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 200 - giveitem ITEM_SITRUS_BERRY, 199 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 200 - giveitem ITEM_FIGY_BERRY, 199 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 200 - giveitem ITEM_WIKI_BERRY, 199 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 200 - giveitem ITEM_MAGO_BERRY, 199 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 200 - giveitem ITEM_AGUAV_BERRY, 199 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 200 - giveitem ITEM_IAPAPA_BERRY, 199 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 200 - giveitem ITEM_RAZZ_BERRY, 199 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 200 - giveitem ITEM_BLUK_BERRY, 199 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 200 - giveitem ITEM_NANAB_BERRY, 199 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 200 - giveitem ITEM_WEPEAR_BERRY, 199 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 200 - giveitem ITEM_PINAP_BERRY, 199 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 200 - giveitem ITEM_POMEG_BERRY, 199 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 200 - giveitem ITEM_KELPSY_BERRY, 199 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 200 - giveitem ITEM_QUALOT_BERRY, 199 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 200 - giveitem ITEM_HONDEW_BERRY, 199 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 200 - giveitem ITEM_GREPA_BERRY, 199 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 200 - giveitem ITEM_TAMATO_BERRY, 199 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 200 - giveitem ITEM_CORNN_BERRY, 199 - giveitem ITEM_MAGOST_BERRY, 999 - giveitem ITEM_RABUTA_BERRY, 999 - giveitem ITEM_NOMEL_BERRY, 999 - giveitem ITEM_SPELON_BERRY, 999 - giveitem ITEM_PAMTRE_BERRY, 999 - giveitem ITEM_WATMEL_BERRY, 999 - giveitem ITEM_DURIN_BERRY, 999 - giveitem ITEM_BELUE_BERRY, 999 - giveitem ITEM_LIECHI_BERRY, 999 - giveitem ITEM_GANLON_BERRY, 999 - giveitem ITEM_SALAC_BERRY, 999 - giveitem ITEM_PETAYA_BERRY, 999 - giveitem ITEM_APICOT_BERRY, 999 - giveitem ITEM_LANSAT_BERRY, 999 - giveitem ITEM_STARF_BERRY, 999 - giveitem ITEM_ENIGMA_BERRY, 999 - end - -DebugScript_081C221F:: @ 81C221F - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_DESK - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_SMALL_CHAIR - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_PLANT - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_RED_BRICK - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_JUMP_MAT - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_BALL_POSTER - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_DUSKULL_DOLL - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - givedecoration DECOR_KISS_CUSHION - end - -DebugScript_081C23E2:: @ 81C23E2 - givecoins 9999 - end - -DebugScript_081C23E6:: @ 81C23E6 - setflag 0x081 - setflag 0x071 - warp MAP_SOOTOPOLIS_CITY, 0xFF, 31, 33 - waitstate - end - -DebugScript_081C23F6:: @ 81C23F6 - takemoney 999999, 0x00 - end - -DebugScript_081C23FD:: @ 81C23FD - getpartysize - compare 0x800d, 1 - goto_if_eq DebugScript_081C2436 - compare 0x800d, 2 - goto_if_eq DebugScript_081C2445 - compare 0x800d, 3 - goto_if_eq DebugScript_081C2454 - compare 0x800d, 4 - goto_if_eq DebugScript_081C2463 - compare 0x800d, 5 - goto_if_eq DebugScript_081C2472 - end - -DebugScript_081C2436:: @ 81C2436 - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 -DebugScript_081C2445: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 -DebugScript_081C2454: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 -DebugScript_081C2463: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 -DebugScript_081C2472: - givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 - end - -DebugScript_081C2482:: @ 81C2482 - getpartysize - compare 0x800d, 1 - goto_if_eq DebugScript_081C24BB - compare 0x800d, 2 - goto_if_eq DebugScript_081C24CA - compare 0x800d, 3 - goto_if_eq DebugScript_081C24D9 - compare 0x800d, 4 - goto_if_eq DebugScript_081C24E8 - compare 0x800d, 5 - goto_if_eq DebugScript_081C24F7 - end - -DebugScript_081C24BB:: @ 81C24BB - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 -DebugScript_081C24CA: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 -DebugScript_081C24D9: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 -DebugScript_081C24E8: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 -DebugScript_081C24F7: - givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 - end - -DebugScript_081C2507:: @ 81C2507 - getpartysize - compare 0x800d, 6 - goto_if_eq DebugScript_081C2517 - giveegg SPECIES_BARBOACH - end - -DebugScript_081C2517:: @ 81C2517 - end - -DebugScript_081C2518:: @ 81C2518 - getpartysize - compare 0x800d, 6 - goto_if_eq DebugScript_081C2528 - giveegg SPECIES_SHROOMISH - end - -DebugScript_081C2528:: @ 81C2528 - end - -.endif - + .include "data/scripts/debug.inc" .include "data/scripts/berry_tree.inc" .include "data/text/berry_tree.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index 3b25ceab4..1839c3547 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3269,6 +3269,7 @@ PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC Route101_EventScript_1A14DC:: @ 81A14DC return + .include "data/scripts/debug.inc" .include "data/scripts/berry_tree.inc" .include "data/text/berry_tree.inc" diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc new file mode 100644 index 000000000..bc7805f72 --- /dev/null +++ b/data/scripts/debug.inc @@ -0,0 +1,536 @@ +.if DEBUG + +DebugScript_081C1CFE:: @ 81C1CFE + setflag 0x804 + call EverGrandeCity_HallOfFame_EventScript_19FC13 + end + +DebugScript_081C1D07:: @ 81C1D07 + checkitem ITEM_COIN_CASE, 1 + compare 0x800d, 1 + goto_if_eq DebugScript_081C1D1D + giveitem ITEM_COIN_CASE, 1 + end + +DebugScript_081C1D1D:: @ 81C1D1D + end + +DebugScript_081C1D1E:: @ 81C1D1E + goto Route103_EventScript_14ED46 + +DebugScript_081C1D23:: @ 81C1D23 + end + +DebugScript_081C1D24:: @ 81C1D24 + setvar 0x40ba, 1 + end + +DebugScript_081C1D2A:: @ 81C1D2A + giveitem ITEM_SS_TICKET, 1 + goto DebugScript_081C1CFE + +DebugScript_081C1D34:: @ 81C1D34 + end + +DebugScript_081C1D35:: @ 81C1D35 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C1D45 + giveegg SPECIES_KYOGRE + end + +DebugScript_081C1D45:: @ 81C1D45 + end + +DebugScript_081C1D46:: @ 81C1D46 + giveitem ITEM_POTION, 99 + giveitem ITEM_ANTIDOTE, 99 + giveitem ITEM_BURN_HEAL, 99 + giveitem ITEM_ICE_HEAL, 99 + giveitem ITEM_AWAKENING, 99 + giveitem ITEM_PARALYZE_HEAL, 99 + giveitem ITEM_FULL_RESTORE, 99 + giveitem ITEM_MAX_POTION, 99 + giveitem ITEM_HYPER_POTION, 99 + giveitem ITEM_SUPER_POTION, 99 + giveitem ITEM_FULL_HEAL, 99 + giveitem ITEM_REVIVE, 99 + giveitem ITEM_MAX_REVIVE, 99 + giveitem ITEM_FRESH_WATER, 99 + giveitem ITEM_SODA_POP, 99 + giveitem ITEM_LEMONADE, 99 + giveitem ITEM_MOOMOO_MILK, 99 + giveitem ITEM_ENERGY_POWDER, 99 + giveitem ITEM_ENERGY_ROOT, 99 + giveitem ITEM_HEAL_POWDER, 99 + giveitem ITEM_ORANGE_MAIL, 92 + giveitem ITEM_RETRO_MAIL, 94 + giveitem ITEM_POTION, 89 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_ULTRA_BALL, 99 + giveitem ITEM_GREAT_BALL, 99 + giveitem ITEM_POKE_BALL, 99 + giveitem ITEM_NET_BALL, 99 + giveitem ITEM_DIVE_BALL, 99 + giveitem ITEM_NEST_BALL, 99 + giveitem ITEM_REPEAT_BALL, 99 + giveitem ITEM_TIMER_BALL, 99 + giveitem ITEM_LUXURY_BALL, 99 + giveitem ITEM_PREMIER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_MASTER_BALL, 99 + giveitem ITEM_GREAT_BALL, 79 + giveitem ITEM_ULTRA_BALL, 84 + giveitem ITEM_POKE_BALL, 89 + giveitem ITEM_MASTER_BALL, 74 + giveitem ITEM_TM01_FOCUS_PUNCH, 99 + giveitem ITEM_TM02_DRAGON_CLAW, 99 + giveitem ITEM_TM03_WATER_PULSE, 99 + giveitem ITEM_TM04_CALM_MIND, 99 + giveitem ITEM_TM05_ROAR, 99 + giveitem ITEM_TM06_TOXIC, 99 + giveitem ITEM_TM07_HAIL, 99 + giveitem ITEM_TM08_BULK_UP, 99 + giveitem ITEM_TM09_BULLET_SEED, 99 + giveitem ITEM_TM10_HIDDEN_POWER, 99 + giveitem ITEM_TM11_SUNNY_DAY, 99 + giveitem ITEM_TM12_TAUNT, 99 + giveitem ITEM_TM13_ICE_BEAM, 99 + giveitem ITEM_TM14_BLIZZARD, 99 + giveitem ITEM_TM15_HYPER_BEAM, 99 + giveitem ITEM_TM16_LIGHT_SCREEN, 99 + giveitem ITEM_TM17_PROTECT, 99 + giveitem ITEM_TM18_RAIN_DANCE, 99 + giveitem ITEM_TM19_GIGA_DRAIN, 99 + giveitem ITEM_TM20_SAFEGUARD, 99 + giveitem ITEM_TM21_FRUSTRATION, 99 + giveitem ITEM_TM22_SOLARBEAM, 99 + giveitem ITEM_TM23_IRON_TAIL, 99 + giveitem ITEM_TM24_THUNDERBOLT, 99 + giveitem ITEM_TM25_THUNDER, 99 + giveitem ITEM_TM26_EARTHQUAKE, 99 + giveitem ITEM_TM27_RETURN, 99 + giveitem ITEM_TM28_DIG, 99 + giveitem ITEM_TM29_PSYCHIC, 99 + giveitem ITEM_TM30_SHADOW_BALL, 99 + giveitem ITEM_TM31_BRICK_BREAK, 99 + giveitem ITEM_TM32_DOUBLE_TEAM, 99 + giveitem ITEM_TM33_REFLECT, 99 + giveitem ITEM_TM34_SHOCK_WAVE, 99 + giveitem ITEM_TM35_FLAMETHROWER, 99 + giveitem ITEM_TM36_SLUDGE_BOMB, 99 + giveitem ITEM_TM37_SANDSTORM, 99 + giveitem ITEM_TM38_FIRE_BLAST, 99 + giveitem ITEM_TM39_ROCK_TOMB, 99 + giveitem ITEM_TM40_AERIAL_ACE, 99 + giveitem ITEM_TM41_TORMENT, 99 + giveitem ITEM_TM42_FACADE, 99 + giveitem ITEM_TM43_SECRET_POWER, 99 + giveitem ITEM_TM44_REST, 99 + giveitem ITEM_TM45_ATTRACT, 99 + giveitem ITEM_TM46_THIEF, 99 + giveitem ITEM_TM47_STEEL_WING, 99 + giveitem ITEM_TM48_SKILL_SWAP, 99 + giveitem ITEM_TM49_SNATCH, 99 + giveitem ITEM_TM50_OVERHEAT, 99 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 200 + giveitem ITEM_CHERI_BERRY, 199 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 200 + giveitem ITEM_CHESTO_BERRY, 199 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 200 + giveitem ITEM_PECHA_BERRY, 199 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 200 + giveitem ITEM_RAWST_BERRY, 199 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 200 + giveitem ITEM_ASPEAR_BERRY, 199 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 200 + giveitem ITEM_LEPPA_BERRY, 199 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 200 + giveitem ITEM_ORAN_BERRY, 199 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 200 + giveitem ITEM_PERSIM_BERRY, 199 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 200 + giveitem ITEM_LUM_BERRY, 199 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 200 + giveitem ITEM_SITRUS_BERRY, 199 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 200 + giveitem ITEM_FIGY_BERRY, 199 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 200 + giveitem ITEM_WIKI_BERRY, 199 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 200 + giveitem ITEM_MAGO_BERRY, 199 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 200 + giveitem ITEM_AGUAV_BERRY, 199 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 200 + giveitem ITEM_IAPAPA_BERRY, 199 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 200 + giveitem ITEM_RAZZ_BERRY, 199 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 200 + giveitem ITEM_BLUK_BERRY, 199 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 200 + giveitem ITEM_NANAB_BERRY, 199 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 200 + giveitem ITEM_WEPEAR_BERRY, 199 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 200 + giveitem ITEM_PINAP_BERRY, 199 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 200 + giveitem ITEM_POMEG_BERRY, 199 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 200 + giveitem ITEM_KELPSY_BERRY, 199 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 200 + giveitem ITEM_QUALOT_BERRY, 199 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 200 + giveitem ITEM_HONDEW_BERRY, 199 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 200 + giveitem ITEM_GREPA_BERRY, 199 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 200 + giveitem ITEM_TAMATO_BERRY, 199 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 200 + giveitem ITEM_CORNN_BERRY, 199 + giveitem ITEM_MAGOST_BERRY, 999 + giveitem ITEM_RABUTA_BERRY, 999 + giveitem ITEM_NOMEL_BERRY, 999 + giveitem ITEM_SPELON_BERRY, 999 + giveitem ITEM_PAMTRE_BERRY, 999 + giveitem ITEM_WATMEL_BERRY, 999 + giveitem ITEM_DURIN_BERRY, 999 + giveitem ITEM_BELUE_BERRY, 999 + giveitem ITEM_LIECHI_BERRY, 999 + giveitem ITEM_GANLON_BERRY, 999 + giveitem ITEM_SALAC_BERRY, 999 + giveitem ITEM_PETAYA_BERRY, 999 + giveitem ITEM_APICOT_BERRY, 999 + giveitem ITEM_LANSAT_BERRY, 999 + giveitem ITEM_STARF_BERRY, 999 + giveitem ITEM_ENIGMA_BERRY, 999 + end + +DebugScript_081C221F:: @ 81C221F + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_DESK + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_SMALL_CHAIR + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_PLANT + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_RED_BRICK + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_JUMP_MAT + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_BALL_POSTER + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_DUSKULL_DOLL + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + givedecoration DECOR_KISS_CUSHION + end + +DebugScript_081C23E2:: @ 81C23E2 + givecoins 9999 + end + +DebugScript_081C23E6:: @ 81C23E6 + setflag 0x081 + setflag 0x071 + warp MAP_SOOTOPOLIS_CITY, 0xFF, 31, 33 + waitstate + end + +DebugScript_081C23F6:: @ 81C23F6 + takemoney 999999, 0x00 + end + +DebugScript_081C23FD:: @ 81C23FD + getpartysize + compare 0x800d, 1 + goto_if_eq DebugScript_081C2436 + compare 0x800d, 2 + goto_if_eq DebugScript_081C2445 + compare 0x800d, 3 + goto_if_eq DebugScript_081C2454 + compare 0x800d, 4 + goto_if_eq DebugScript_081C2463 + compare 0x800d, 5 + goto_if_eq DebugScript_081C2472 + end + +DebugScript_081C2436:: @ 81C2436 + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2445: + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2454: + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2463: + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 +DebugScript_081C2472: + givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0 + end + +DebugScript_081C2482:: @ 81C2482 + getpartysize + compare 0x800d, 1 + goto_if_eq DebugScript_081C24BB + compare 0x800d, 2 + goto_if_eq DebugScript_081C24CA + compare 0x800d, 3 + goto_if_eq DebugScript_081C24D9 + compare 0x800d, 4 + goto_if_eq DebugScript_081C24E8 + compare 0x800d, 5 + goto_if_eq DebugScript_081C24F7 + end + +DebugScript_081C24BB:: @ 81C24BB + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24CA: + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24D9: + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24E8: + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 +DebugScript_081C24F7: + givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0 + end + +DebugScript_081C2507:: @ 81C2507 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C2517 + giveegg SPECIES_BARBOACH + end + +DebugScript_081C2517:: @ 81C2517 + end + +DebugScript_081C2518:: @ 81C2518 + getpartysize + compare 0x800d, 6 + goto_if_eq DebugScript_081C2528 + giveegg SPECIES_SHROOMISH + end + +DebugScript_081C2528:: @ 81C2528 + end + +.endif -- cgit v1.2.3 From d125e9b461204d0f80ae25d35a1569613ee3aa6e Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 24 Jan 2018 01:35:05 -0600 Subject: integrate debug Blender_PrintBlendingResults --- include/link.h | 1 + src/scene/berry_blender.c | 493 +--------------------------------------------- 2 files changed, 6 insertions(+), 488 deletions(-) diff --git a/include/link.h b/include/link.h index ecebb586a..f3e918bc6 100644 --- a/include/link.h +++ b/include/link.h @@ -196,5 +196,6 @@ void Timer3Intr(void); void SerialCB(void); void LinkTestScreen(void); void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0); +u32 sub_8007E40(void); #endif // GUARD_LINK_H diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 0799531cd..c636e245c 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -3276,493 +3276,6 @@ static void sub_8051C04(struct Sprite* sprite) gSaveBlock1.berryBlenderRecords[gBerryBlenderData->playersNo - 2] = gBerryBlenderData->max_RPM; } -#if DEBUG -__attribute__((naked)) -bool8 Blender_PrintBlendingResults(void) -{ - asm(".syntax unified\n\ -loc_8056178:\n\ - PUSH {R4-R7,LR}\n\ - MOV R7, R10\n\ - MOV R6, R9\n\ - MOV R5, R8\n\ - PUSH {R5-R7}\n\ - SUB SP, SP, #0x34\n\ - LDR R1, off_805619C\n\ - LDR R0, [R1]\n\ - LDRB R0, [R0]\n\ - ADDS R2, R1, #0\n\ - CMP R0, #6 @ switch 7 cases\n\ - BLS loc_8056192\n\ - B def_805619A @ jumptable 0805619A default case\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_8056192:\n\ - LSLS R0, R0, #2\n\ - LDR R1, off_80561A0\n\ - ADDS R0, R0, R1\n\ - LDR R0, [R0]\n\ - MOV PC, R0 @ switch jump\n\ -@ ---------------------------------------------------------------------------\n\ -off_805619C: .4byte gBerryBlenderData\n\ -off_80561A0: .4byte jpt_805619A\n\ -jpt_805619A: .4byte loc_80561C0 @ jump table for switch statement\n\ - .4byte loc_80561D6 @ jumptable 0805619A case 1\n\ - .4byte loc_80561F0 @ jumptable 0805619A case 2\n\ - .4byte loc_8056240 @ jumptable 0805619A case 3\n\ - .4byte loc_805645C @ jumptable 0805619A case 4\n\ - .4byte loc_8056470 @ jumptable 0805619A case 5\n\ - .4byte loc_8056538 @ jumptable 0805619A case 6\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_80561C0: @ jumptable 0805619A case 0\n\ - LDR R1, [R2]\n\ - LDRB R0, [R1]\n\ - ADDS R0, #1\n\ - STRB R0, [R1]\n\ - LDR R0, [R2]\n\ - MOVS R1, #0x98\n\ - LSLS R1, R1, #1\n\ - ADDS R0, R0, R1\n\ - MOVS R1, #0x11\n\ - STR R1, [R0]\n\ - B def_805619A @ jumptable 0805619A default case\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_80561D6: @ jumptable 0805619A case 1\n\ - LDR R1, [R2]\n\ - MOVS R0, #0x98\n\ - LSLS R0, R0, #1\n\ - ADDS R2, R1, R0\n\ - LDR R0, [R2]\n\ - SUBS R0, #0xA\n\ - STR R0, [R2]\n\ - CMP R0, #0\n\ - BLT loc_80561EA\n\ - B def_805619A @ jumptable 0805619A default case\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_80561EA:\n\ - MOVS R0, #0\n\ - STR R0, [R2]\n\ - B loc_8056520\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_80561F0: @ jumptable 0805619A case 2\n\ - LDR R1, [R2]\n\ - MOVS R2, #0x98\n\ - LSLS R2, R2, #1\n\ - ADDS R1, R1, R2\n\ - LDR R0, [R1]\n\ - ADDS R0, #1\n\ - STR R0, [R1]\n\ - CMP R0, #0x14\n\ - BGT loc_8056204\n\ - B def_805619A @ jumptable 0805619A default case\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_8056204:\n\ - MOVS R6, #0\n\ -\n\ -loc_8056206:\n\ - LDR R4, off_8056238\n\ - LDR R0, [R4]\n\ - ADDS R0, #0x50\n\ - ADDS R0, R0, R6\n\ - LDRB R1, [R0]\n\ - LSLS R0, R1, #4\n\ - ADDS R0, R0, R1\n\ - LSLS R0, R0, #2\n\ - LDR R1, off_805623C\n\ - ADDS R0, R0, R1\n\ - BL DestroySprite\n\ - ADDS R0, R6, #1\n\ - LSLS R0, R0, #0x10\n\ - LSRS R6, R0, #0x10\n\ - CMP R6, #2\n\ - BLS loc_8056206\n\ - LDR R1, [R4]\n\ - MOVS R0, #0x98\n\ - LSLS R0, R0, #1\n\ - ADDS R2, R1, R0\n\ - MOVS R0, #0\n\ - STR R0, [R2]\n\ - B loc_8056520\n\ -@ ---------------------------------------------------------------------------\n\ - .align 2, 0\n\ -off_8056238: .4byte gBerryBlenderData\n\ -off_805623C: .4byte gSprites\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_8056240: @ jumptable 0805619A case 3\n\ - MOVS R0, #4\n\ - MOVS R1, #2\n\ - MOVS R2, #0x19\n\ - MOVS R3, #0x11\n\ - BL Menu_DrawStdWindowFrame\n\ - LDR R0, dword_805642C\n\ - MOVS R1, #5\n\ - MOVS R2, #3\n\ - MOVS R3, #0xA0\n\ - BL sub_8072BD8\n\ - MOVS R6, #0\n\ - LDR R1, off_8056430\n\ - LDR R0, [R1]\n\ - ADDS R0, #0x88\n\ - ADD R2, SP, #0xC\n\ - MOV R8, R2\n\ - MOV R2, SP\n\ - ADDS R2, #0x16\n\ - STR R2, [SP,#0x30]\n\ - LDRB R0, [R0]\n\ - CMP R6, R0\n\ - BCS loc_8056322\n\ - MOV R9, R1\n\ - LDR R0, off_8056434\n\ - MOV R10, R0\n\ -\n\ -loc_8056276:\n\ - MOV R1, R9\n\ - LDR R2, [R1]\n\ - MOVS R1, #0xB2\n\ - LSLS R1, R1, #1\n\ - ADDS R0, R2, R1\n\ - ADDS R0, R0, R6\n\ - LDRB R4, [R0]\n\ - LSLS R1, R4, #4\n\ - ADDS R1, R1, R2\n\ - MOVS R2, #0xBF\n\ - LSLS R2, R2, #1\n\ - ADDS R1, R1, R2\n\ - MOV R0, R8\n\ - BL StringCopy\n\ - LSLS R5, R4, #3\n\ - SUBS R5, R5, R4\n\ - LSLS R5, R5, #2\n\ - MOV R1, R10\n\ - ADDS R0, R5, R1\n\ - LDRB R1, [R0,#0x1A]\n\ - MOV R0, R8\n\ - BL ConvertInternationalString\n\ - MOV R0, R8\n\ - LDR R1, dword_8056438\n\ - BL de_sub_8073174\n\ - MOV R2, R9\n\ - LDR R0, [R2]\n\ - ADDS R7, R0, #0\n\ - ADDS R7, #0xAB\n\ - ADDS R4, R6, #1\n\ - ADDS R0, R7, #0\n\ - ADDS R1, R4, #0\n\ - BL ConvertIntToDecimalString\n\ - ADDS R7, R0, #0\n\ - MOVS R1, #0\n\ - STRB R1, [R7]\n\ - MOVS R0, #0xAD\n\ - STRB R0, [R7,#1]\n\ - STRB R1, [R7,#2]\n\ - ADDS R7, #3\n\ - LDR R0, off_805643C\n\ - ADDS R5, R5, R0\n\ - ADDS R0, R7, #0\n\ - ADDS R1, R5, #0\n\ - MOVS R2, #0x58\n\ - MOVS R3, #0\n\ - BL sub_8072C74\n\ - ADDS R7, R0, #0\n\ - ADD R1, SP, #0xC\n\ - MOVS R2, #0x9D\n\ - MOVS R3, #0\n\ - BL sub_8072C74\n\ - MOV R2, R9\n\ - LDR R1, [R2]\n\ - ADDS R0, R1, #0\n\ - ADDS R0, #0xAB\n\ - LDR R3, dword_8056440\n\ - ADDS R1, #0x88\n\ - LDRB R2, [R1]\n\ - ADDS R3, R2, R3\n\ - LDR R1, dword_8056444\n\ - ADDS R2, R2, R1\n\ - LDRB R1, [R2]\n\ - ADDS R2, R6, #0\n\ - MULS R2, R1\n\ - LDRB R3, [R3]\n\ - ADDS R2, R2, R3\n\ - LSLS R2, R2, #0x18\n\ - LSRS R2, R2, #0x18\n\ - MOVS R1, #5\n\ - BL Menu_PrintText\n\ - LSLS R4, R4, #0x10\n\ - LSRS R6, R4, #0x10\n\ - MOV R1, R9\n\ - LDR R0, [R1]\n\ - ADDS R0, #0x88\n\ - LDRB R0, [R0]\n\ - CMP R6, R0\n\ - BCC loc_8056276\n\ -\n\ -loc_8056322:\n\ - LDR R6, off_8056430\n\ - LDR R0, [R6]\n\ - ADDS R0, #0x5A\n\ - LDRH R0, [R0]\n\ - MOVS R1, #0x64\n\ - BL __umodsi3\n\ - ADDS R1, R0, #0\n\ - LSLS R1, R1, #0x10\n\ - LSRS R1, R1, #0x10\n\ - MOV R0, R8\n\ - MOVS R2, #2\n\ - MOVS R3, #2\n\ - BL ConvertIntToDecimalStringN\n\ - LDR R0, [R6]\n\ - ADDS R7, R0, #0\n\ - ADDS R7, #0xAB\n\ - LDR R1, dword_8056448\n\ - ADDS R0, R7, #0\n\ - BL StringCopy\n\ - ADDS R7, R0, #0\n\ - LDR R0, [R6]\n\ - ADDS R0, #0x5A\n\ - LDRH R0, [R0]\n\ - MOVS R1, #0x64\n\ - BL __udivsi3\n\ - ADDS R1, R0, #0\n\ - LSLS R1, R1, #0x10\n\ - LSRS R1, R1, #0x10\n\ - ADDS R0, R7, #0\n\ - MOVS R2, #0x79\n\ - MOVS R3, #1\n\ - BL sub_8072C14\n\ - ADDS R7, R0, #0\n\ - MOVS R0, #0xB8\n\ - STRB R0, [R7]\n\ - ADDS R7, #1\n\ - ADDS R0, R7, #0\n\ - MOV R1, R8\n\ - MOVS R2, #0x88\n\ - MOVS R3, #1\n\ - BL sub_8072C74\n\ - ADDS R7, R0, #0\n\ - LDR R1, off_805644C\n\ - BL StringCopy\n\ - LDR R0, [R6]\n\ - ADDS R0, #0xAB\n\ - MOVS R1, #5\n\ - MOVS R2, #0xD\n\ - BL Menu_PrintText\n\ - LDR R0, [R6]\n\ - MOVS R2, #0x96\n\ - LSLS R2, R2, #1\n\ - ADDS R0, R0, R2\n\ - LDR R0, [R0]\n\ - MOVS R1, #0x3C\n\ - BL __udivsi3\n\ - ADDS R4, R0, #0\n\ - LSLS R4, R4, #0x10\n\ - LSRS R4, R4, #0x10\n\ - ADDS R0, R4, #0\n\ - MOVS R1, #0x3C\n\ - BL __umodsi3\n\ - ADDS R5, R0, #0\n\ - LSLS R5, R5, #0x10\n\ - LSRS R5, R5, #0x10\n\ - ADDS R0, R4, #0\n\ - MOVS R1, #0x3C\n\ - BL __udivsi3\n\ - ADDS R1, R0, #0\n\ - LSLS R1, R1, #0x10\n\ - LSRS R1, R1, #0x10\n\ - MOV R0, R8\n\ - MOVS R2, #2\n\ - MOVS R3, #2\n\ - BL ConvertIntToDecimalStringN\n\ - LDR R0, [SP,#0x30]\n\ - ADDS R1, R5, #0\n\ - MOVS R2, #2\n\ - MOVS R3, #2\n\ - BL ConvertIntToDecimalStringN\n\ - LDR R0, [R6]\n\ - ADDS R7, R0, #0\n\ - ADDS R7, #0xAB\n\ - LDR R1, dword_8056450\n\ - ADDS R0, R7, #0\n\ - BL StringCopy\n\ - ADDS R7, R0, #0\n\ - MOV R1, R8\n\ - MOVS R2, #0x63\n\ - MOVS R3, #1\n\ - BL sub_8072C74\n\ - ADDS R7, R0, #0\n\ - LDR R1, dword_8056454\n\ - BL StringAppend\n\ - ADDS R7, R0, #0\n\ - LDR R1, [SP,#0x30]\n\ - MOVS R2, #0x88\n\ - MOVS R3, #1\n\ - BL sub_8072C74\n\ - ADDS R7, R0, #0\n\ - LDR R1, dword_8056458\n\ - BL StringCopy\n\ - LDR R0, [R6]\n\ - ADDS R0, #0xAB\n\ - MOVS R1, #5\n\ - MOVS R2, #0xF\n\ - BL Menu_PrintText\n\ - LDR R1, [R6]\n\ - MOVS R0, #0x98\n\ - LSLS R0, R0, #1\n\ - ADDS R2, R1, R0\n\ - MOVS R0, #0\n\ - STR R0, [R2]\n\ - B loc_8056520\n\ -@ ---------------------------------------------------------------------------\n\ -dword_805642C: .4byte gOtherText_ResultsOfBlending\n\ -off_8056430: .4byte gBerryBlenderData\n\ -off_8056434: .4byte gLinkPlayers\n\ -dword_8056438: .4byte gOtherText_Berry\n\ -off_805643C: .4byte gLinkPlayers+0x8\n\ -dword_8056440: .4byte gUnknown_082165E9\n\ -dword_8056444: .4byte gUnknown_082165EE\n\ -dword_8056448: .4byte gOtherText_MaxSpeed\n\ -off_805644C: .4byte gOtherText_RPM\n\ -dword_8056450: .4byte gOtherText_RequiredTime\n\ -dword_8056454: .4byte gOtherText_Min\n\ -dword_8056458: .4byte gOtherText_Sec\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_805645C: @ jumptable 0805619A case 4\n\ - LDR R0, off_805646C\n\ - LDRH R1, [R0,#0x2E]\n\ - MOVS R0, #1\n\ - ANDS R0, R1\n\ - CMP R0, #0\n\ - BEQ def_805619A @ jumptable 0805619A default case\n\ - LDR R1, [R2]\n\ - B loc_8056520\n\ -@ ---------------------------------------------------------------------------\n\ -off_805646C: .4byte gMain\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_8056470: @ jumptable 0805619A case 5\n\ - BL Menu_EraseScreen\n\ - MOVS R0, #0\n\ - MOVS R1, #0xE\n\ - MOVS R2, #0x1D\n\ - MOVS R3, #0x13\n\ - BL Menu_DrawStdWindowFrame\n\ - MOVS R6, #0\n\ - ADD R1, SP, #0xC\n\ - MOV R8, R1\n\ - ADD R5, SP, #0x28\n\ - LDR R0, off_8056528\n\ - LDR R0, [R0]\n\ - ADDS R3, R0, #0\n\ - ADDS R3, #0x80\n\ - ADD R2, SP, #0x20\n\ -\n\ -loc_8056492:\n\ - LSLS R1, R6, #1\n\ - ADDS R0, R3, R1\n\ - LDRH R0, [R0]\n\ - CMP R0, #0\n\ - BEQ loc_80564A2\n\ - ADDS R1, R2, R1\n\ - SUBS R0, #0x85\n\ - STRH R0, [R1]\n\ -\n\ -loc_80564A2:\n\ - ADDS R0, R6, #1\n\ - LSLS R0, R0, #0x10\n\ - LSRS R6, R0, #0x10\n\ - CMP R6, #3\n\ - BLS loc_8056492\n\ - BL sub_8050760\n\ - LDR R4, off_8056528\n\ - LDR R3, [R4]\n\ - MOVS R2, #0xBE\n\ - LSLS R2, R2, #1\n\ - ADDS R0, R3, R2\n\ - ADDS R1, R3, #0\n\ - ADDS R1, #0x88\n\ - LDRB R2, [R1]\n\ - SUBS R1, #0x2E\n\ - LDRH R1, [R1]\n\ - STR R1, [SP]\n\ - ADDS R1, R5, #0\n\ - ADD R3, SP, #4\n\ - BL Blender_CalculatePokeblock\n\ - LDR R1, [R4]\n\ - ADDS R1, #0xAB\n\ - ADDS R0, R5, #0\n\ - BL Blender_PrintMadePokeblockString\n\ - LDR R0, off_805652C\n\ - MOVS R1, #6\n\ - BL CreateTask\n\ - BL sub_8007E40\n\ - ADDS R1, R0, #0\n\ - MOV R0, R8\n\ - MOVS R2, #0\n\ - MOVS R3, #4\n\ - BL ConvertIntToHexStringN\n\ - LDR R1, dword_8056530\n\ - MOV R0, R8\n\ - BL StringAppend\n\ - LDR R0, [R4]\n\ - ADDS R0, #0xAB\n\ - MOV R1, R8\n\ - BL StringAppend\n\ - LDR R0, [R4]\n\ - ADDS R0, #0xAB\n\ - MOVS R1, #1\n\ - MOVS R2, #0xF\n\ - BL MenuPrintMessage\n\ - LDR R0, off_8056534\n\ - LDRH R0, [R0]\n\ - MOVS R1, #1\n\ - BL RemoveBagItem\n\ - ADDS R0, R5, #0\n\ - BL sub_810CA34\n\ - LDR R1, [R4]\n\ -\n\ -loc_8056520:\n\ - LDRB R0, [R1]\n\ - ADDS R0, #1\n\ - STRB R0, [R1]\n\ - B def_805619A @ jumptable 0805619A default case\n\ -@ ---------------------------------------------------------------------------\n\ -off_8056528: .4byte gBerryBlenderData\n\ -off_805652C: .4byte sub_8052BD0+1\n\ -dword_8056530: .4byte gUnknown_08216249\n\ -off_8056534: .4byte gSpecialVar_ItemId\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -loc_8056538: @ jumptable 0805619A case 6\n\ - BL Menu_UpdateWindowText\n\ - LSLS R0, R0, #0x18\n\ - CMP R0, #0\n\ - BEQ def_805619A @ jumptable 0805619A default case\n\ - BL Blender_TrySettingRecord\n\ - MOVS R0, #1\n\ - B loc_805654C\n\ -@ ---------------------------------------------------------------------------\n\ -\n\ -def_805619A: @ jumptable 0805619A default case\n\ - MOVS R0, #0\n\ -\n\ -loc_805654C:\n\ - ADD SP, SP, #0x34\n\ - POP {R3-R5}\n\ - MOV R8, R3\n\ - MOV R9, R4\n\ - MOV R10, R5\n\ - POP {R4-R7}\n\ - POP {R1}\n\ - BX R1\n\ - .syntax divided\n"); -} -#else bool8 Blender_PrintBlendingResults(void) { u16 i; @@ -3882,6 +3395,11 @@ bool8 Blender_PrintBlendingResults(void) Blender_CalculatePokeblock(gBerryBlenderData->blendedBerries, &pokeblock, gBerryBlenderData->playersNo, flavours, gBerryBlenderData->max_RPM); Blender_PrintMadePokeblockString(&pokeblock, gBerryBlenderData->stringVar); CreateTask(sub_8052BD0, 6); +#if DEBUG + ConvertIntToHexStringN(text[0], sub_8007E40(), 0, 4); + StringAppend(text[0], gUnknown_08216249); + StringAppend(gBerryBlenderData->stringVar, text[0]); +#endif MenuPrintMessage(gBerryBlenderData->stringVar, 1, 15); RemoveBagItem(gSpecialVar_ItemId, 1); sub_810CA34(&pokeblock); @@ -3897,7 +3415,6 @@ bool8 Blender_PrintBlendingResults(void) } return FALSE; } -#endif /*static*/ void Blender_PrintMadePokeblockString(struct Pokeblock* pokeblock, u8* dst) { -- cgit v1.2.3 From 641d2749b67b6c7cad2054f5c52c990f0dad0121 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 24 Jan 2018 15:32:04 -0600 Subject: decompile debug_sub_8010818 and debug_sub_80108B8 --- src/battle/battle_2.c | 429 ++++++++++++++++---------------------------------- 1 file changed, 137 insertions(+), 292 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 64b64ecea..f9756db29 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1,5 +1,11 @@ #include "global.h" #include "constants/abilities.h" +#include "constants/battle_move_effects.h" +#include "constants/hold_effects.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/songs.h" +#include "constants/species.h" #include "battle.h" #include "battle_ai.h" #include "battle_interface.h" @@ -7,6 +13,7 @@ #include "battle_setup.h" #include "battle_util.h" #include "data2.h" +#include "decompress.h" #include "event_data.h" #include "evolution_scene.h" #include "item.h" @@ -25,9 +32,7 @@ #include "rom3.h" #include "rom_8077ABC.h" #include "rom_8094928.h" -#include "constants/songs.h" #include "sound.h" -#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "task.h" @@ -37,10 +42,6 @@ #include "tv.h" #include "scanline_effect.h" #include "util.h" -#include "constants/battle_move_effects.h" -#include "constants/items.h" -#include "constants/hold_effects.h" -#include "constants/moves.h" #include "ewram.h" struct UnknownStruct7 @@ -1362,12 +1363,55 @@ void c2_081284E0(void) // A LOT of debug code! #if DEBUG -extern u8 gBattleBuffersTransferData[]; - void debug_sub_8010818(void); void debug_sub_80108B8(void); +void debug_sub_8010CAC(void); +void debug_sub_801174C(void); +void debug_sub_8011D40(void); void debug_sub_8011EA0(u8); void debug_sub_8012294(void); +void debug_sub_80123D8(u8); +void debug_sub_8012540(void); +void debug_sub_80125A0(void); +void debug_nullsub_3(void); + +struct UnknownStruct2023A76 +{ + u16 unk0; + u16 unk2[(0x44-2)/2]; + s16 unk44; + u16 unk46; + u16 unk48[1]; +}; + +struct UnknownStruct2023B02 +{ + u16 unk0[4][4]; + u8 filler20[0x10]; + u16 unk30[4][4]; +}; + +struct UnknownStruct821F424 +{ + u8 filler0[0x12]; + u16 unk12[1][5]; // unknown length +}; + +extern struct UnknownStruct2023A76 gUnknown_Debug_2023A76; +extern struct UnknownStruct2023B02 gUnknown_Debug_2023B02; +extern u8 gUnknown_Debug_03004360; +extern struct Window gUnknown_Debug_03004370; +extern u8 gUnknown_Debug_030043A0; +extern u8 gUnknown_Debug_030043A4; +extern u8 gUnknown_Debug_030043A8; +extern u8 gBattleBuffersTransferData[]; + +extern const struct UnknownStruct821F424 gUnknown_Debug_821F424; +extern const u16 gUnknown_Debug_821F56C[][5]; + +extern const u8 gUnusedOldCharmap_Gfx_lz[]; +extern const u8 gUnusedOldCharmap_Tilemap_lz[]; +extern const u8 gUnusedOldCharmap_Pal_lz[]; void debug_sub_8010800(void) { @@ -1376,283 +1420,84 @@ void debug_sub_8010800(void) *(u32 *)(gBattleBuffersTransferData + 0x100) = 0; } -__attribute__((naked)) -void debug_sub_8010818() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " ldr r1, ._501\n" - " ldr r0, ._501 + 4\n" - " strh r0, [r1]\n" - " add r2, r1, #0\n" - " add r2, r2, #0x46\n" - " strh r0, [r2]\n" - " ldr r0, ._501 + 8\n" - " add r4, r1, #0\n" - " add r4, r4, #0x48\n" - " add r3, r0, #0\n" - " add r3, r3, #0x12\n" - " add r2, r1, #2\n" - " mov r1, #0x1d\n" - "._498:\n" - " ldrh r0, [r3]\n" - " strh r0, [r2]\n" - " strh r0, [r4]\n" - " add r4, r4, #0x2\n" - " add r3, r3, #0xa\n" - " add r2, r2, #0x2\n" - " sub r1, r1, #0x1\n" - " cmp r1, #0\n" - " bge ._498 @cond_branch\n" - " mov r1, #0x0\n" - " ldr r4, ._501 + 12\n" - " ldr r7, ._501 + 16\n" - " ldr r6, ._501 + 20\n" - " mov r0, #0x30\n" - " add r0, r0, r7\n" - " mov ip, r0\n" - "._500:\n" - " mov r0, #0x0\n" - " strb r0, [r4]\n" - " add r5, r1, #1\n" - " lsl r3, r1, #0x3\n" - "._499:\n" - " ldrb r2, [r4]\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r3\n" - " add r1, r1, r7\n" - " lsl r0, r2, #0x2\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r6\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " ldrb r2, [r4]\n" - " lsl r1, r2, #0x1\n" - " add r1, r1, r3\n" - " add r1, r1, ip\n" - " lsl r0, r2, #0x2\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r6\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " strb r0, [r4]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x3\n" - " bls ._499 @cond_branch\n" - " add r1, r5, #0\n" - " cmp r1, #0x5\n" - " ble ._500 @cond_branch\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._502:\n" - " .align 2, 0\n" - "._501:\n" - " .word gUnknown_Debug_2023A76\n" - " .word 0x115\n" - " .word gUnknown_Debug_821F424\n" - " .word gUnknown_Debug_030043A8\n" - " .word gUnknown_Debug_2023B02\n" - " .word gUnknown_Debug_821F56C\n" - "\n" - ); -} -__attribute__((naked)) -void debug_sub_80108B8() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " bl m4aSoundVSyncOff\n" - " mov r0, #0x0\n" - " bl SetHBlankCallback\n" - " mov r0, #0x0\n" - " bl SetVBlankCallback\n" - " mov r3, #0x0\n" - " str r3, [sp]\n" - " ldr r2, ._507\n" - " mov r0, sp\n" - " str r0, [r2]\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x13\n" - " str r1, [r2, #0x4]\n" - " ldr r0, ._507 + 4\n" - " str r0, [r2, #0x8]\n" - " ldr r0, [r2, #0x8]\n" - " ldr r2, ._507 + 8\n" - " mov r0, #0x1\n" - " strh r0, [r2]\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x13\n" - " mov r4, #0x9a\n" - " lsl r4, r4, #0x5\n" - " add r0, r4, #0\n" - " strh r0, [r2]\n" - " ldr r0, ._507 + 12\n" - " mov r5, #0x0\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 16\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 20\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 24\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 28\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 32\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 36\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 40\n" - " strh r3, [r0]\n" - " add r2, r2, #0x8\n" - " ldr r4, ._507 + 44\n" - " add r0, r4, #0\n" - " strh r0, [r2]\n" - " add r2, r2, #0x2\n" - " ldr r4, ._507 + 48\n" - " add r0, r4, #0\n" - " strh r0, [r2]\n" - " ldr r0, ._507 + 52\n" - " strh r3, [r0]\n" - " add r0, r0, #0x4\n" - " strh r3, [r0]\n" - " ldr r0, ._507 + 56\n" - " bl LZDecompressVram\n" - " ldr r0, ._507 + 60\n" - " ldr r1, ._507 + 64\n" - " bl LZDecompressWram\n" - " ldr r4, ._507 + 68\n" - " mov r1, #0xa0\n" - " lsl r1, r1, #0x13\n" - " add r0, r4, #0\n" - " bl LZDecompressVram\n" - " ldr r1, ._507 + 72\n" - " add r0, r4, #0\n" - " bl LZDecompressVram\n" - " bl m4aSoundVSyncOn\n" - " ldr r0, ._507 + 76\n" - " bl SetVBlankCallback\n" - " ldr r0, ._507 + 80\n" - " bl SetMainCallback2\n" - " bl ResetTasks\n" - " bl ResetSpriteData\n" - " bl ScanlineEffect_Stop\n" - " ldr r4, ._507 + 84\n" - " add r0, r4, #0\n" - " bl Text_LoadWindowTemplate\n" - " ldr r0, ._507 + 88\n" - " add r1, r4, #0\n" - " bl Text_InitWindowWithTemplate\n" - " ldr r0, ._507 + 92\n" - " strb r5, [r0]\n" - " ldr r0, ._507 + 96\n" - " strb r5, [r0]\n" - " ldr r0, ._507 + 100\n" - " strb r5, [r0]\n" - " mov r4, #0x0\n" - "._503:\n" - " lsl r0, r4, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x1e\n" - " ble ._503 @cond_branch\n" - " ldr r1, ._507 + 104\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " add r4, r1, #0\n" - "._504:\n" - " bl debug_sub_8012294\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " strb r0, [r4]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x3\n" - " bls ._504 @cond_branch\n" - " ldr r0, ._507 + 100\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - " bl debug_sub_8012540\n" - " bl debug_nullsub_3\n" - " ldr r1, ._507 + 104\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " bl debug_sub_80125A0\n" - " ldr r0, ._507 + 108\n" - " add r0, r0, #0x44\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0x8\n" - " bne ._505 @cond_branch\n" - " bl debug_sub_801174C\n" - " b ._506\n" - "._508:\n" - " .align 2, 0\n" - "._507:\n" - " .word 0x40000d4\n" - " .word 0x85006000\n" - " .word 0x4000200\n" - " .word gBattle_BG0_X\n" - " .word gBattle_BG0_Y\n" - " .word gBattle_BG1_X\n" - " .word gBattle_BG1_Y\n" - " .word gBattle_BG2_X\n" - " .word gBattle_BG2_Y\n" - " .word gBattle_BG3_X\n" - " .word gBattle_BG3_Y\n" - " .word 0x1f09\n" - " .word 0x4801\n" - " .word 0x4000050\n" - " .word gMonShinyPalette_CircledQuestionMark+0x18\n" - " .word gMonShinyPalette_CircledQuestionMark+0x834\n" - " .word gSharedMem\n" - " .word gMonShinyPalette_CircledQuestionMark+0xa8c\n" - " .word 0x50001e0\n" - " .word debug_sub_8011D40+1\n" - " .word debug_sub_8010CAC+1\n" - " .word gWindowTemplate_81E6C3C\n" - " .word gUnknown_Debug_03004370\n" - " .word gUnknown_Debug_03004360\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - " .word gUnknown_Debug_030043A8\n" - " .word gUnknown_Debug_2023A76\n" - "._505:\n" - " ldr r0, ._510\n" - " mov r1, #0x0\n" - " mov r4, #0x7\n" - " ldr r2, ._510 + 4\n" - " add r0, r0, r2\n" - "._509:\n" - " strb r1, [r0]\n" - " sub r0, r0, #0x1\n" - " sub r4, r4, #0x1\n" - " cmp r4, #0\n" - " bge ._509 @cond_branch\n" - "._506:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._511:\n" - " .align 2, 0\n" - "._510:\n" - " .word gSharedMem\n" - " .word 0x160bb\n" - "\n" - ); +void debug_sub_8010818(void) +{ + s32 i; + + gUnknown_Debug_2023A76.unk0 = 0x115; + gUnknown_Debug_2023A76.unk46 = 0x115; + for (i = 0; i < 30; i++) + { + gUnknown_Debug_2023A76.unk2[i] = gUnknown_Debug_821F424.unk12[i][0]; + gUnknown_Debug_2023A76.unk48[i] = gUnknown_Debug_821F424.unk12[i][0]; + } + + for (i = 0; i < 6; i++) + { + for (gUnknown_Debug_030043A8 = 0; gUnknown_Debug_030043A8 < 4; gUnknown_Debug_030043A8++) + { + gUnknown_Debug_2023B02.unk0[i][gUnknown_Debug_030043A8] = gUnknown_Debug_821F56C[gUnknown_Debug_030043A8][0]; + gUnknown_Debug_2023B02.unk30[i][gUnknown_Debug_030043A8] = gUnknown_Debug_821F56C[gUnknown_Debug_030043A8][0]; + } + } +} + +void debug_sub_80108B8(void) +{ + s32 i; + + m4aSoundVSyncOff(); + SetHBlankCallback(NULL); + SetVBlankCallback(NULL); + DmaFill32(3, 0, (void *)VRAM, VRAM_SIZE); + REG_IE = 1; + REG_DISPCNT = 0x1340; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; + REG_BG0CNT = 0x1F09; + REG_BG1CNT = 0x4801; + REG_BLDCNT = 0; + REG_BLDY = 0; + LZDecompressVram(gUnusedOldCharmap_Gfx_lz, (void *)VRAM); + LZDecompressWram(gUnusedOldCharmap_Tilemap_lz, gSharedMem); + LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)PLTT); + LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)(PLTT + 0x1E0)); + m4aSoundVSyncOn(); + SetVBlankCallback(debug_sub_8011D40); + SetMainCallback2(debug_sub_8010CAC); + ResetTasks(); + ResetSpriteData(); + ScanlineEffect_Stop(); + Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); + Text_InitWindowWithTemplate(&gUnknown_Debug_03004370, &gWindowTemplate_81E6C3C); + gUnknown_Debug_03004360 = 0; + gUnknown_Debug_030043A0 = 0; + gUnknown_Debug_030043A4 = 0; + for (i = 0; i < 31; i++) + debug_sub_8011EA0(i); + for (gUnknown_Debug_030043A8 = 0; gUnknown_Debug_030043A8 < 4; gUnknown_Debug_030043A8++) + debug_sub_8012294(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + debug_sub_8012540(); + debug_nullsub_3(); + gUnknown_Debug_030043A8 = 0; + debug_sub_80125A0(); + if (gUnknown_Debug_2023A76.unk44 == 8) + { + debug_sub_801174C(); + } + else + { + for (i = 0; i < 8; i++) + gSharedMem[0x160B4 + i] = 0; + } } __attribute__((naked)) @@ -4128,19 +3973,19 @@ void debug_nullsub_45() void debug_sub_8011DD4(void) { REG_BG0CNT = 0x9803; - + REG_BG0HOFS = gBattle_BG0_X; REG_BG0VOFS = gBattle_BG0_Y; - + REG_BG1HOFS = gBattle_BG1_X; REG_BG1VOFS = gBattle_BG1_Y; - + REG_BG2HOFS = gBattle_BG2_X; REG_BG2VOFS = gBattle_BG2_Y; - + REG_BG3HOFS = gBattle_BG3_X; REG_BG3VOFS = gBattle_BG3_Y; - + LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); @@ -4150,7 +3995,7 @@ void debug_sub_8011DD4(void) void debug_sub_8011E5C(void) { s32 i; - + for (i = 0; i < 31; i++) debug_sub_8011EA0(i); } @@ -4160,7 +4005,7 @@ extern u8 gUnknown_Debug_030043A8; void debug_sub_8011E74(void) { u8 r5 = gUnknown_Debug_030043A8; - + for (gUnknown_Debug_030043A8 = 0; gUnknown_Debug_030043A8 < 4; gUnknown_Debug_030043A8++) debug_sub_8012294(); @@ -4777,7 +4622,7 @@ void debug_sub_8012294() } __attribute__((naked)) -void debug_sub_80123D8() +void debug_sub_80123D8(u8 a) { asm( " push {r4, r5, r6, r7, lr}\n" -- cgit v1.2.3 From d5bc4b12072359c2ba8a33acc38da880d113c779 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 24 Jan 2018 15:39:19 -0600 Subject: oops, re-add the old charmap labels in graphics.s --- data/graphics.s | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/graphics.s b/data/graphics.s index 6cc1c2db7..6d678ede9 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -18,8 +18,11 @@ gUnknown_08D00524:: @ 8D00524 .include "data/graphics/pokemon/circled_question_mark_graphics.inc" @ 8D019E4 +gUnusedOldCharmap_Gfx_lz:: .incbin "graphics/unused/old_charmap.4bpp.lz" @ japanese table and bunch of stuff +gUnusedOldCharmap_Tilemap_lz:: .incbin "graphics/unused/old_charmap.bin.lz" +gUnusedOldCharmap_Pal_lz:: .incbin "graphics/unused/old_charmap.gbapal.lz" .align 2 -- cgit v1.2.3 From c7cd31f56ced799f6bb75ef8357b6d623a0b0de8 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 24 Jan 2018 18:17:43 -0600 Subject: integrate debug AbilityBattleEffects --- src/battle/battle_util.c | 4357 ++-------------------------------------------- 1 file changed, 179 insertions(+), 4178 deletions(-) diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index 620e0690a..faa395a97 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -22,6 +22,8 @@ #include "constants/species.h" #include "constants/weather.h" +extern u8 gUnknown_02023A14_50; + extern const u8* gBattlescriptCurrInstr; extern u8 gActiveBank; extern u8 gBattleBufferB[4][0x200]; @@ -1683,4066 +1685,6 @@ u8 CastformDataTypeChange(u8 bank) return formChange; } -#if DEBUG -__attribute__((naked)) -u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) -{ - asm("\ - push {r4, r5, r6, r7, lr}\n\ - mov r7, sl\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5, r6, r7}\n\ - add sp, sp, #0xffffffd8\n\ - ldr r4, [sp, #0x48]\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - str r0, [sp, #0x4]\n\ - lsl r1, r1, #0x18\n\ - lsr r1, r1, #0x18\n\ - mov sl, r1\n\ - lsl r2, r2, #0x18\n\ - lsr r6, r2, #0x18\n\ - lsl r3, r3, #0x18\n\ - lsr r3, r3, #0x18\n\ - mov r8, r3\n\ - lsl r4, r4, #0x10\n\ - lsr r4, r4, #0x10\n\ - mov r0, #0x0\n\ - mov r9, r0\n\ - ldr r5, ._718\n\ - ldr r1, ._718 + 4\n\ - ldrb r0, [r5]\n\ - ldrb r1, [r1]\n\ - cmp r0, r1\n\ - bcc ._715 @cond_branch\n\ - mov r1, sl\n\ - strb r1, [r5]\n\ -._715:\n\ - ldrb r0, [r5]\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._716 @cond_branch\n\ - ldr r1, ._718 + 8\n\ - ldrb r0, [r5]\n\ - lsl r0, r0, #0x1\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - mov r0, #0x64\n\ - mul r1, r1, r0\n\ - ldr r0, ._718 + 12\n\ - b ._717\n\ -._719:\n\ - .align 2, 0\n\ -._718:\n\ - .word gBankAttacker\n\ - .word gNoOfAllBanks\n\ - .word gBattlePartyID\n\ - .word gPlayerParty\n\ -._716:\n\ - ldr r1, ._723\n\ - ldrb r0, [r5]\n\ - lsl r0, r0, #0x1\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - mov r0, #0x64\n\ - mul r1, r1, r0\n\ - ldr r0, ._723 + 4\n\ -._717:\n\ - add r7, r1, r0\n\ - ldr r5, ._723 + 8\n\ - ldr r1, ._723 + 12\n\ - ldrb r0, [r5]\n\ - ldrb r1, [r1]\n\ - cmp r0, r1\n\ - bcc ._720 @cond_branch\n\ - mov r2, sl\n\ - strb r2, [r5]\n\ -._720:\n\ - ldrb r0, [r5]\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._721 @cond_branch\n\ - ldr r1, ._723\n\ - ldrb r0, [r5]\n\ - lsl r0, r0, #0x1\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - mov r0, #0x64\n\ - mul r1, r1, r0\n\ - ldr r0, ._723 + 16\n\ - b ._722\n\ -._724:\n\ - .align 2, 0\n\ -._723:\n\ - .word gBattlePartyID\n\ - .word gEnemyParty\n\ - .word gBankTarget\n\ - .word gNoOfAllBanks\n\ - .word gPlayerParty\n\ -._721:\n\ - ldr r1, ._729\n\ - ldrb r0, [r5]\n\ - lsl r0, r0, #0x1\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - mov r0, #0x64\n\ - mul r1, r1, r0\n\ - ldr r0, ._729 + 4\n\ -._722:\n\ - add r5, r1, r0\n\ - add r0, r7, #0\n\ - mov r1, #0xb\n\ - bl GetMonData\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - str r0, [sp, #0x8]\n\ - add r0, r7, #0\n\ - mov r1, #0x0\n\ - bl GetMonData\n\ - str r0, [sp, #0x10]\n\ - add r0, r5, #0\n\ - mov r1, #0xb\n\ - bl GetMonData\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - str r0, [sp, #0xc]\n\ - add r0, r5, #0\n\ - mov r1, #0x0\n\ - bl GetMonData\n\ - str r0, [sp, #0x14]\n\ - ldr r0, ._729 + 8\n\ - ldrh r1, [r0]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._725 @cond_branch\n\ - bl ._1540\n\ -._725:\n\ - mov r3, r8\n\ - cmp r3, #0\n\ - beq ._727 @cond_branch\n\ - ldr r0, ._729 + 12\n\ - strb r3, [r0]\n\ - mov r8, r0\n\ - b ._728\n\ -._730:\n\ - .align 2, 0\n\ -._729:\n\ - .word gBattlePartyID\n\ - .word gEnemyParty\n\ - .word gBattleTypeFlags\n\ - .word gLastUsedAbility\n\ -._727:\n\ - ldr r2, ._733\n\ - ldr r1, ._733 + 4\n\ - mov r0, #0x58\n\ - mov r5, sl\n\ - mul r5, r5, r0\n\ - add r0, r5, #0\n\ - add r0, r0, r1\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - strb r0, [r2]\n\ - mov r8, r2\n\ -._728:\n\ - cmp r4, #0\n\ - beq ._731 @cond_branch\n\ - add r3, r4, #0\n\ - b ._732\n\ -._734:\n\ - .align 2, 0\n\ -._733:\n\ - .word gLastUsedAbility\n\ - .word gBattleMons\n\ -._731:\n\ - ldr r0, ._737\n\ - ldrh r3, [r0]\n\ -._732:\n\ - ldr r1, ._737 + 4\n\ - ldr r2, ._737 + 8\n\ - add r0, r1, r2\n\ - ldrb r0, [r0]\n\ - add r7, r1, #0\n\ - cmp r0, #0\n\ - beq ._735 @cond_branch\n\ - mov r4, #0x3f\n\ - and r4, r4, r0\n\ - b ._736\n\ -._738:\n\ - .align 2, 0\n\ -._737:\n\ - .word gCurrentMove\n\ - .word +0x2000000\n\ - .word 0x1601c\n\ -._735:\n\ - ldr r1, ._741\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r4, [r0, #0x2]\n\ -._736:\n\ - ldr r5, [sp, #0x4]\n\ - cmp r5, #0x13\n\ - bls ._739 @cond_branch\n\ - bl ._1534\n\ -._739:\n\ - lsl r0, r5, #0x2\n\ - ldr r1, ._741 + 4\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._742:\n\ - .align 2, 0\n\ -._741:\n\ - .word gBattleMoves\n\ - .word ._743\n\ -._743:\n\ - .word ._744\n\ - .word ._745\n\ - .word ._746\n\ - .word ._747\n\ - .word ._748\n\ - .word ._749\n\ - .word ._750\n\ - .word ._751\n\ - .word ._752\n\ - .word ._753\n\ - .word ._754\n\ - .word ._755\n\ - .word ._756\n\ - .word ._757\n\ - .word ._758\n\ - .word ._759\n\ - .word ._760\n\ - .word ._761\n\ - .word ._762\n\ - .word ._763\n\ -._744:\n\ - ldr r2, ._774\n\ - ldr r0, ._774 + 4\n\ - ldrb r1, [r2]\n\ - add r5, r0, #0\n\ - ldrb r0, [r5]\n\ - cmp r1, r0\n\ - bcc ._764 @cond_branch\n\ - mov r1, sl\n\ - strb r1, [r2]\n\ -._764:\n\ - mov r2, r8\n\ - ldrb r0, [r2]\n\ - cmp r0, #0x2d\n\ - bne ._765 @cond_branch\n\ - b ._766\n\ -._765:\n\ - cmp r0, #0x2d\n\ - bgt ._767 @cond_branch\n\ - cmp r0, #0xd\n\ - bne ._768 @cond_branch\n\ - b ._788\n\ -._768:\n\ - cmp r0, #0xd\n\ - bgt ._770 @cond_branch\n\ - cmp r0, #0x2\n\ - bne ._771 @cond_branch\n\ - b ._772\n\ -._771:\n\ - bl ._1534\n\ -._775:\n\ - .align 2, 0\n\ -._774:\n\ - .word gBankAttacker\n\ - .word gNoOfAllBanks\n\ -._770:\n\ - cmp r0, #0x16\n\ - bne ._776 @cond_branch\n\ - b ._777\n\ -._776:\n\ - cmp r0, #0x24\n\ - bne ._778 @cond_branch\n\ - b ._779\n\ -._778:\n\ - bl ._1534\n\ -._767:\n\ - cmp r0, #0x46\n\ - bne ._781 @cond_branch\n\ - b ._782\n\ -._781:\n\ - cmp r0, #0x46\n\ - bgt ._783 @cond_branch\n\ - cmp r0, #0x3b\n\ - bne ._784 @cond_branch\n\ - b ._785\n\ -._784:\n\ - bl ._1534\n\ -._783:\n\ - cmp r0, #0x4d\n\ - bne ._787 @cond_branch\n\ - b ._788\n\ -._787:\n\ - cmp r0, #0xff\n\ - beq ._789 @cond_branch\n\ - bl ._1534\n\ -._789:\n\ - bl GetCurrentWeather\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - sub r0, r0, #0x3\n\ - cmp r0, #0xa\n\ - bhi ._814 @cond_branch\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._793\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._794:\n\ - .align 2, 0\n\ -._793:\n\ - .word ._792\n\ -._792:\n\ - .word ._805\n\ - .word ._814\n\ - .word ._805\n\ - .word ._814\n\ - .word ._814\n\ - .word ._800\n\ - .word ._814\n\ - .word ._814\n\ - .word ._814\n\ - .word ._804\n\ - .word ._805\n\ -._805:\n\ - ldr r2, ._808\n\ - ldrh r1, [r2]\n\ - mov r0, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._814 @cond_branch\n\ - mov r0, #0x5\n\ - strh r0, [r2]\n\ - ldr r0, ._808 + 4\n\ - ldr r3, ._808 + 8\n\ - add r2, r0, r3\n\ - mov r1, #0xa\n\ - b ._811\n\ -._809:\n\ - .align 2, 0\n\ -._808:\n\ - .word gBattleWeather\n\ - .word +0x2000000\n\ - .word 0x160a4\n\ -._800:\n\ - ldr r3, ._812\n\ - ldrh r1, [r3]\n\ - mov r2, #0x18\n\ - add r0, r2, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._814 @cond_branch\n\ - strh r2, [r3]\n\ - ldr r0, ._812 + 4\n\ - ldr r3, ._812 + 8\n\ - add r2, r0, r3\n\ - mov r1, #0xc\n\ - b ._811\n\ -._813:\n\ - .align 2, 0\n\ -._812:\n\ - .word gBattleWeather\n\ - .word +0x2000000\n\ - .word 0x160a4\n\ -._804:\n\ - ldr r3, ._818\n\ - ldrh r1, [r3]\n\ - mov r2, #0x60\n\ - add r0, r2, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._814 @cond_branch\n\ - strh r2, [r3]\n\ - ldr r0, ._818 + 4\n\ - ldr r3, ._818 + 8\n\ - add r2, r0, r3\n\ - mov r1, #0xb\n\ -._811:\n\ - strb r1, [r2]\n\ - ldr r5, ._818 + 12\n\ - add r0, r0, r5\n\ - mov r1, sl\n\ - strb r1, [r0]\n\ - mov r0, r9\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._814:\n\ - mov r2, r9\n\ - cmp r2, #0\n\ - bne ._815 @cond_branch\n\ - bl ._1540\n\ -._815:\n\ - bl GetCurrentWeather\n\ - ldr r1, ._818 + 16\n\ - strb r0, [r1, #0x5]\n\ - ldr r0, ._818 + 20\n\ - bl BattleScriptPushCursorAndCallback\n\ - bl ._1534\n\ -._819:\n\ - .align 2, 0\n\ -._818:\n\ - .word gBattleWeather\n\ - .word +0x2000000\n\ - .word 0x160a4\n\ - .word 0x16003\n\ - .word gBattleCommunication\n\ - .word BattleScript_OverworldWeatherStarts\n\ -._772:\n\ - ldr r2, ._823\n\ - ldrh r1, [r2]\n\ - mov r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._820 @cond_branch\n\ - bl ._1534\n\ -._820:\n\ - mov r0, #0x5\n\ - strh r0, [r2]\n\ - ldr r0, ._823 + 4\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r0, ._823 + 8\n\ - ldr r3, ._823 + 12\n\ - add r0, r0, r3\n\ - mov r5, sl\n\ - strb r5, [r0]\n\ - bl ._1392\n\ -._824:\n\ - .align 2, 0\n\ -._823:\n\ - .word gBattleWeather\n\ - .word BattleScript_DrizzleActivates\n\ - .word +0x2000000\n\ - .word 0x16003\n\ -._766:\n\ - ldr r2, ._828\n\ - ldrh r1, [r2]\n\ - mov r0, #0x10\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._825 @cond_branch\n\ - bl ._1534\n\ -._825:\n\ - mov r0, #0x18\n\ - strh r0, [r2]\n\ - ldr r0, ._828 + 4\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r0, ._828 + 8\n\ - ldr r1, ._828 + 12\n\ - add r0, r0, r1\n\ - mov r2, sl\n\ - strb r2, [r0]\n\ - bl ._1392\n\ -._829:\n\ - .align 2, 0\n\ -._828:\n\ - .word gBattleWeather\n\ - .word BattleScript_SandstreamActivates\n\ - .word +0x2000000\n\ - .word 0x16003\n\ -._782:\n\ - ldr r2, ._833\n\ - ldrh r1, [r2]\n\ - mov r0, #0x40\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._830 @cond_branch\n\ - bl ._1534\n\ -._830:\n\ - mov r0, #0x60\n\ - strh r0, [r2]\n\ - ldr r0, ._833 + 4\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r0, ._833 + 8\n\ - ldr r3, ._833 + 12\n\ - add r0, r0, r3\n\ - mov r5, sl\n\ - strb r5, [r0]\n\ - bl ._1392\n\ -._834:\n\ - .align 2, 0\n\ -._833:\n\ - .word gBattleWeather\n\ - .word BattleScript_DroughtActivates\n\ - .word +0x2000000\n\ - .word 0x16003\n\ -._777:\n\ - ldr r0, ._838\n\ - mov r1, sl\n\ - lsl r2, r1, #0x2\n\ - add r1, r2, r1\n\ - lsl r1, r1, #0x2\n\ - add r3, r1, r0\n\ - ldrb r0, [r3]\n\ - lsl r0, r0, #0x1c\n\ - cmp r0, #0\n\ - bge ._835 @cond_branch\n\ - bl ._1534\n\ -._835:\n\ - ldr r1, ._838 + 4\n\ - add r1, r2, r1\n\ - ldr r0, [r1]\n\ - mov r2, #0x80\n\ - lsl r2, r2, #0xc\n\ - orr r0, r0, r2\n\ - str r0, [r1]\n\ - ldrb r0, [r3]\n\ - mov r1, #0x8\n\ - b ._837\n\ -._839:\n\ - .align 2, 0\n\ -._838:\n\ - .word gSpecialStatuses\n\ - .word gStatuses3\n\ -._785:\n\ - mov r0, sl\n\ - bl CastformDataTypeChange\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ - cmp r0, #0\n\ - bne ._840 @cond_branch\n\ - bl ._1540\n\ -._840:\n\ - ldr r0, ._843\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r0, ._843 + 4\n\ - ldr r2, ._843 + 8\n\ - add r1, r0, r2\n\ - mov r3, sl\n\ - strb r3, [r1]\n\ - mov r1, r9\n\ - sub r1, r1, #0x1\n\ - ldr r5, ._843 + 12\n\ - add r0, r0, r5\n\ - strb r1, [r0]\n\ - bl ._1534\n\ -._844:\n\ - .align 2, 0\n\ -._843:\n\ - .word BattleScript_CastformChange\n\ - .word +0x2000000\n\ - .word 0x16003\n\ - .word 0x1609b\n\ -._779:\n\ - ldr r0, ._848\n\ - mov r1, sl\n\ - lsl r2, r1, #0x2\n\ - add r1, r2, r1\n\ - lsl r1, r1, #0x2\n\ - add r3, r1, r0\n\ - ldrb r0, [r3]\n\ - lsl r0, r0, #0x1b\n\ - cmp r0, #0\n\ - bge ._845 @cond_branch\n\ - bl ._1534\n\ -._845:\n\ - ldr r1, ._848 + 4\n\ - add r1, r2, r1\n\ - ldr r0, [r1]\n\ - mov r2, #0x80\n\ - lsl r2, r2, #0xd\n\ - orr r0, r0, r2\n\ - str r0, [r1]\n\ - ldrb r0, [r3]\n\ - mov r1, #0x10\n\ -._837:\n\ - orr r0, r0, r1\n\ - strb r0, [r3]\n\ - bl ._1534\n\ -._849:\n\ - .align 2, 0\n\ -._848:\n\ - .word gSpecialStatuses\n\ - .word gStatuses3\n\ -._788:\n\ - mov r6, #0x0\n\ - ldrb r5, [r5]\n\ - cmp r6, r5\n\ - bcc ._854 @cond_branch\n\ - bl ._1534\n\ -._854:\n\ - add r0, r6, #0\n\ - bl CastformDataTypeChange\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ - cmp r0, #0\n\ - beq ._852 @cond_branch\n\ - bl ._853\n\ -._852:\n\ - add r0, r6, #1\n\ - lsl r0, r0, #0x18\n\ - lsr r6, r0, #0x18\n\ - ldr r0, ._856\n\ - ldrb r0, [r0]\n\ - cmp r6, r0\n\ - bcc ._854 @cond_branch\n\ - bl ._1534\n\ -._857:\n\ - .align 2, 0\n\ -._856:\n\ - .word gNoOfAllBanks\n\ -._745:\n\ - ldr r2, ._865\n\ - mov r0, #0x58\n\ - mov r1, sl\n\ - mul r1, r1, r0\n\ - add r4, r1, r2\n\ - ldrh r0, [r4, #0x28]\n\ - cmp r0, #0\n\ - bne ._858 @cond_branch\n\ - bl ._1534\n\ -._858:\n\ - ldr r0, ._865 + 4\n\ - mov r3, sl\n\ - strb r3, [r0]\n\ - mov r3, r8\n\ - ldrb r5, [r3]\n\ - cmp r5, #0x2c\n\ - beq ._860 @cond_branch\n\ - cmp r5, #0x2c\n\ - bgt ._861 @cond_branch\n\ - cmp r5, #0x3\n\ - bne ._862 @cond_branch\n\ - b ._863\n\ -._862:\n\ - bl ._1534\n\ -._866:\n\ - .align 2, 0\n\ -._865:\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ -._861:\n\ - cmp r5, #0x36\n\ - bne ._867 @cond_branch\n\ - b ._868\n\ -._867:\n\ - cmp r5, #0x3d\n\ - beq ._869 @cond_branch\n\ - bl ._1534\n\ -._860:\n\ - mov r0, #0x0\n\ - str r0, [sp]\n\ - mov r0, #0x13\n\ - mov r1, #0x0\n\ - mov r2, #0xd\n\ - mov r3, #0x0\n\ - bl AbilityBattleEffects\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._871 @cond_branch\n\ - bl ._1534\n\ -._871:\n\ - str r0, [sp]\n\ - mov r0, #0x13\n\ - mov r1, #0x0\n\ - mov r2, #0x4d\n\ - mov r3, #0x0\n\ - bl AbilityBattleEffects\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._873 @cond_branch\n\ - bl ._1534\n\ -._873:\n\ - ldr r0, ._881\n\ - ldrh r1, [r0]\n\ - mov r0, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._875 @cond_branch\n\ - bl ._1534\n\ -._875:\n\ - ldrh r0, [r4, #0x2c]\n\ - ldrh r1, [r4, #0x28]\n\ - cmp r0, r1\n\ - bhi ._877 @cond_branch\n\ - bl ._1534\n\ -._877:\n\ - mov r2, r8\n\ - strb r5, [r2]\n\ - ldr r0, ._881 + 4\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r1, ._881 + 8\n\ - ldrh r0, [r4, #0x2c]\n\ - lsr r0, r0, #0x4\n\ - str r0, [r1]\n\ - cmp r0, #0\n\ - bne ._879 @cond_branch\n\ - mov r0, #0x1\n\ - str r0, [r1]\n\ -._879:\n\ - ldr r0, [r1]\n\ - neg r0, r0\n\ - str r0, [r1]\n\ - bl ._1392\n\ -._882:\n\ - .align 2, 0\n\ -._881:\n\ - .word gBattleWeather\n\ - .word BattleScript_RainDishActivates\n\ - .word gBattleMoveDamage\n\ -._869:\n\ - add r0, r2, #0\n\ - add r0, r0, #0x4c\n\ - add r5, r1, r0\n\ - ldrb r0, [r5]\n\ - cmp r0, #0\n\ - bne ._883 @cond_branch\n\ - bl ._1534\n\ -._883:\n\ - bl Random\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - mov r1, #0x3\n\ - bl __umodsi3\n\ - lsl r0, r0, #0x10\n\ - lsr r4, r0, #0x10\n\ - cmp r4, #0\n\ - beq ._885 @cond_branch\n\ - bl ._1534\n\ -._885:\n\ - ldr r0, [r5]\n\ - mov r1, #0x88\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._887 @cond_branch\n\ - ldr r0, ._893\n\ - ldr r1, ._893 + 4\n\ - bl StringCopy\n\ -._887:\n\ - ldr r0, [r5]\n\ - mov r1, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._888 @cond_branch\n\ - ldr r0, ._893\n\ - ldr r1, ._893 + 8\n\ - bl StringCopy\n\ -._888:\n\ - ldr r0, [r5]\n\ - mov r1, #0x40\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._889 @cond_branch\n\ - ldr r0, ._893\n\ - ldr r1, ._893 + 12\n\ - bl StringCopy\n\ -._889:\n\ - ldr r0, [r5]\n\ - mov r1, #0x10\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._890 @cond_branch\n\ - ldr r0, ._893\n\ - ldr r1, ._893 + 16\n\ - bl StringCopy\n\ -._890:\n\ - ldr r0, [r5]\n\ - mov r1, #0x20\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._891 @cond_branch\n\ - ldr r0, ._893\n\ - ldr r1, ._893 + 20\n\ - bl StringCopy\n\ -._891:\n\ - str r4, [r5]\n\ - ldr r0, ._893 + 24\n\ - ldr r4, ._893 + 28\n\ - mov r3, sl\n\ - strb r3, [r4]\n\ - ldr r1, ._893 + 32\n\ - add r0, r0, r1\n\ - strb r3, [r0]\n\ - ldr r0, ._893 + 36\n\ - bl BattleScriptPushCursorAndCallback\n\ - str r5, [sp]\n\ - mov r0, #0x0\n\ - mov r1, #0x28\n\ - mov r2, #0x0\n\ - mov r3, #0x4\n\ - bl EmitSetMonData\n\ - ldrb r0, [r4]\n\ - bl MarkBufferBankForExecution\n\ - bl ._1392\n\ -._894:\n\ - .align 2, 0\n\ -._893:\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_PoisonJpn\n\ - .word gStatusConditionString_SleepJpn\n\ - .word gStatusConditionString_ParalysisJpn\n\ - .word gStatusConditionString_BurnJpn\n\ - .word gStatusConditionString_IceJpn\n\ - .word +0x2000000\n\ - .word gActiveBank\n\ - .word 0x16003\n\ - .word BattleScript_ShedSkinActivates\n\ -._863:\n\ - ldrb r2, [r4, #0x1b]\n\ - mov r0, #0x1b\n\ - ldsb r0, [r4, r0]\n\ - cmp r0, #0xb\n\ - ble ._895 @cond_branch\n\ - bl ._1534\n\ -._895:\n\ - ldr r0, ._900\n\ - mov r3, sl\n\ - lsl r1, r3, #0x3\n\ - sub r1, r1, r3\n\ - lsl r1, r1, #0x2\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x16]\n\ - cmp r0, #0x2\n\ - bne ._897 @cond_branch\n\ - bl ._1534\n\ -._897:\n\ - add r0, r2, #1\n\ - mov r2, #0x0\n\ - strb r0, [r4, #0x1b]\n\ - ldr r5, ._900 + 4\n\ - add r1, r7, r5\n\ - mov r0, #0x11\n\ - strb r0, [r1]\n\ - ldr r1, ._900 + 8\n\ - add r0, r7, r1\n\ - strb r2, [r0]\n\ - ldr r0, ._900 + 12\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r2, ._900 + 16\n\ - add r0, r7, r2\n\ - mov r3, sl\n\ - strb r3, [r0]\n\ - bl ._1392\n\ -._901:\n\ - .align 2, 0\n\ -._900:\n\ - .word gDisableStructs\n\ - .word 0x160a4\n\ - .word 0x160a5\n\ - .word BattleScript_SpeedBoostActivates\n\ - .word 0x16003\n\ -._868:\n\ - ldr r2, ._903\n\ - ldrb r0, [r0]\n\ - lsl r1, r0, #0x3\n\ - sub r1, r1, r0\n\ - lsl r1, r1, #0x2\n\ - add r1, r1, r2\n\ - ldrb r3, [r1, #0x18]\n\ - lsl r0, r3, #0x1f\n\ - lsr r0, r0, #0x1f\n\ - mov r2, #0x1\n\ - eor r2, r2, r0\n\ - mov r0, #0x2\n\ - neg r0, r0\n\ - and r0, r0, r3\n\ - orr r0, r0, r2\n\ - strb r0, [r1, #0x18]\n\ - bl ._1534\n\ -._904:\n\ - .align 2, 0\n\ -._903:\n\ - .word gDisableStructs\n\ -._746:\n\ - mov r5, r8\n\ - ldrb r0, [r5]\n\ - cmp r0, #0x2b\n\ - beq ._905 @cond_branch\n\ - bl ._1534\n\ -._905:\n\ - mov r4, #0x0\n\ - ldr r0, ._917\n\ - ldrh r2, [r0]\n\ - ldr r5, ._917 + 4\n\ - add r1, r0, #0\n\ - cmp r2, r5\n\ - bne ._907 @cond_branch\n\ - bl ._1534\n\ -._907:\n\ - cmp r2, r3\n\ - beq ._909 @cond_branch\n\ - add r2, r1, #0\n\ -._912:\n\ - add r2, r2, #0x2\n\ - add r4, r4, #0x1\n\ - ldrh r0, [r2]\n\ - cmp r0, r5\n\ - bne ._910 @cond_branch\n\ - bl ._1534\n\ -._910:\n\ - cmp r0, r3\n\ - bne ._912 @cond_branch\n\ -._909:\n\ - lsl r0, r4, #0x1\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - ldr r0, ._917 + 4\n\ - cmp r1, r0\n\ - bne ._913 @cond_branch\n\ - bl ._1534\n\ -._913:\n\ - ldr r1, ._917 + 8\n\ - ldr r0, ._917 + 12\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r1, r1, #0x50\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x5\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._915 @cond_branch\n\ - ldr r0, ._917 + 16\n\ - ldr r1, [r0]\n\ - mov r2, #0x80\n\ - lsl r2, r2, #0x4\n\ - orr r1, r1, r2\n\ - str r1, [r0]\n\ -._915:\n\ - ldr r1, ._917 + 20\n\ - ldr r0, ._917 + 24\n\ - str r0, [r1]\n\ - mov r0, #0x1\n\ - mov r9, r0\n\ - bl ._916\n\ -._918:\n\ - .align 2, 0\n\ -._917:\n\ - .word gSoundMovesTable\n\ - .word 0xffff\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gHitMarker\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_SoundproofProtected\n\ -._747:\n\ - cmp r3, #0\n\ - bne ._919 @cond_branch\n\ - bl ._1534\n\ -._919:\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - cmp r0, #0xb\n\ - beq ._921 @cond_branch\n\ - cmp r0, #0xb\n\ - bgt ._922 @cond_branch\n\ - cmp r0, #0xa\n\ - beq ._923 @cond_branch\n\ - b ._956\n\ -._922:\n\ - cmp r0, #0x12\n\ - beq ._925 @cond_branch\n\ - b ._956\n\ -._923:\n\ - cmp r4, #0xd\n\ - beq ._927 @cond_branch\n\ - b ._956\n\ -._927:\n\ - ldr r0, ._933\n\ - lsl r1, r3, #0x1\n\ - add r1, r1, r3\n\ - lsl r1, r1, #0x2\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - cmp r0, #0\n\ - bne ._929 @cond_branch\n\ - b ._956\n\ -._929:\n\ - ldr r1, ._933 + 4\n\ - ldr r0, ._933 + 8\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x4\n\ - add r0, r0, r1\n\ - ldrb r0, [r0, #0x2]\n\ - lsl r0, r0, #0x1c\n\ - cmp r0, #0\n\ - bge ._931 @cond_branch\n\ - ldr r1, ._933 + 12\n\ - ldr r0, ._933 + 16\n\ - b ._932\n\ -._934:\n\ - .align 2, 0\n\ -._933:\n\ - .word gBattleMoves\n\ - .word gProtectStructs\n\ - .word gBankAttacker\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_MoveHPDrain\n\ -._931:\n\ - ldr r1, ._936\n\ - ldr r0, ._936 + 4\n\ -._932:\n\ - str r0, [r1]\n\ - mov r2, #0x1\n\ - b ._935\n\ -._937:\n\ - .align 2, 0\n\ -._936:\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_MoveHPDrain_PPLoss\n\ -._921:\n\ - cmp r4, #0xb\n\ - beq ._938 @cond_branch\n\ - b ._956\n\ -._938:\n\ - ldr r0, ._944\n\ - lsl r1, r3, #0x1\n\ - add r1, r1, r3\n\ - lsl r1, r1, #0x2\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - cmp r0, #0\n\ - bne ._940 @cond_branch\n\ - b ._956\n\ -._940:\n\ - ldr r1, ._944 + 4\n\ - ldr r0, ._944 + 8\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x4\n\ - add r0, r0, r1\n\ - ldrb r0, [r0, #0x2]\n\ - lsl r0, r0, #0x1c\n\ - cmp r0, #0\n\ - bge ._942 @cond_branch\n\ - ldr r1, ._944 + 12\n\ - ldr r0, ._944 + 16\n\ - b ._943\n\ -._945:\n\ - .align 2, 0\n\ -._944:\n\ - .word gBattleMoves\n\ - .word gProtectStructs\n\ - .word gBankAttacker\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_MoveHPDrain\n\ -._942:\n\ - ldr r1, ._947\n\ - ldr r0, ._947 + 4\n\ -._943:\n\ - str r0, [r1]\n\ - mov r3, #0x1\n\ - mov r9, r3\n\ - b ._956\n\ -._948:\n\ - .align 2, 0\n\ -._947:\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_MoveHPDrain_PPLoss\n\ -._925:\n\ - cmp r4, #0xa\n\ - bne ._956 @cond_branch\n\ - ldr r1, ._954\n\ - mov r0, #0x58\n\ - mov r5, sl\n\ - mul r5, r5, r0\n\ - add r0, r5, #0\n\ - add r1, r1, #0x4c\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x20\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._956 @cond_branch\n\ - ldr r2, ._954 + 4\n\ - mov r0, sl\n\ - lsl r1, r0, #0x2\n\ - add r0, r1, r2\n\ - ldr r3, [r0]\n\ - mov r4, #0x1\n\ - and r3, r3, r4\n\ - add r5, r1, #0\n\ - cmp r3, #0\n\ - bne ._951 @cond_branch\n\ - ldr r0, ._954 + 8\n\ - strb r3, [r0, #0x5]\n\ - ldr r1, ._954 + 12\n\ - ldr r0, ._954 + 16\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x4\n\ - add r0, r0, r1\n\ - ldrb r0, [r0, #0x2]\n\ - lsl r0, r0, #0x1c\n\ - cmp r0, #0\n\ - bge ._952 @cond_branch\n\ - ldr r1, ._954 + 20\n\ - ldr r0, ._954 + 24\n\ - b ._953\n\ -._955:\n\ - .align 2, 0\n\ -._954:\n\ - .word gBattleMons\n\ - .word +0x2017100\n\ - .word gBattleCommunication\n\ - .word gProtectStructs\n\ - .word gBankAttacker\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_FlashFireBoost\n\ -._952:\n\ - ldr r1, ._957\n\ - ldr r0, ._957 + 4\n\ -._953:\n\ - str r0, [r1]\n\ - add r0, r5, r2\n\ - ldr r1, [r0]\n\ - mov r2, #0x1\n\ - orr r1, r1, r2\n\ - str r1, [r0]\n\ - mov r1, #0x2\n\ - mov r9, r1\n\ - b ._956\n\ -._958:\n\ - .align 2, 0\n\ -._957:\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_FlashFireBoost_PPLoss\n\ -._951:\n\ - ldr r0, ._961\n\ - strb r4, [r0, #0x5]\n\ - ldr r1, ._961 + 4\n\ - ldr r0, ._961 + 8\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x4\n\ - add r0, r0, r1\n\ - ldrb r0, [r0, #0x2]\n\ - lsl r0, r0, #0x1c\n\ - cmp r0, #0\n\ - bge ._959 @cond_branch\n\ - ldr r1, ._961 + 12\n\ - ldr r0, ._961 + 16\n\ - b ._960\n\ -._962:\n\ - .align 2, 0\n\ -._961:\n\ - .word gBattleCommunication\n\ - .word gProtectStructs\n\ - .word gBankAttacker\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_FlashFireBoost\n\ -._959:\n\ - ldr r1, ._968\n\ - ldr r0, ._968 + 4\n\ -._960:\n\ - str r0, [r1]\n\ - mov r2, #0x2\n\ -._935:\n\ - mov r9, r2\n\ -._956:\n\ - mov r3, r9\n\ - cmp r3, #0x1\n\ - beq ._963 @cond_branch\n\ - bl ._1534\n\ -._963:\n\ - ldr r1, ._968 + 8\n\ - mov r0, #0x58\n\ - mov r5, sl\n\ - mul r5, r5, r0\n\ - add r0, r5, #0\n\ - add r1, r0, r1\n\ - ldrh r0, [r1, #0x2c]\n\ - ldrh r2, [r1, #0x28]\n\ - cmp r0, r2\n\ - bne ._965 @cond_branch\n\ - ldr r1, ._968 + 12\n\ - ldr r0, ._968 + 16\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x4\n\ - add r0, r0, r1\n\ - ldrb r0, [r0, #0x2]\n\ - lsl r0, r0, #0x1c\n\ - cmp r0, #0\n\ - bge ._966 @cond_branch\n\ - ldr r1, ._968\n\ - ldr r0, ._968 + 20\n\ - str r0, [r1]\n\ - bl ._1534\n\ -._969:\n\ - .align 2, 0\n\ -._968:\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_FlashFireBoost_PPLoss\n\ - .word gBattleMons\n\ - .word gProtectStructs\n\ - .word gBankAttacker\n\ - .word BattleScript_MoveHPDrain_FullHP\n\ -._966:\n\ - ldr r1, ._971\n\ - ldr r0, ._971 + 4\n\ - str r0, [r1]\n\ - bl ._1534\n\ -._972:\n\ - .align 2, 0\n\ -._971:\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_MoveHPDrain_FullHP_PPLoss\n\ -._965:\n\ - ldr r2, ._975\n\ - ldrh r0, [r1, #0x2c]\n\ - lsr r0, r0, #0x2\n\ - str r0, [r2]\n\ - cmp r0, #0\n\ - bne ._973 @cond_branch\n\ - mov r3, r9\n\ - str r3, [r2]\n\ -._973:\n\ - ldr r0, [r2]\n\ - neg r0, r0\n\ - str r0, [r2]\n\ - bl ._1534\n\ -._976:\n\ - .align 2, 0\n\ -._975:\n\ - .word gBattleMoveDamage\n\ -._748:\n\ - mov r5, r8\n\ - ldrb r0, [r5]\n\ - sub r0, r0, #0x9\n\ - cmp r0, #0x2f\n\ - bls ._977 @cond_branch\n\ - bl ._1534\n\ -._977:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._980\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._981:\n\ - .align 2, 0\n\ -._980:\n\ - .word ._979\n\ -._979:\n\ - .word ._982\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._989\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._997\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1000\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1011\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1022\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1534\n\ - .word ._1029\n\ -._989:\n\ - ldr r0, ._1046\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1030 @cond_branch\n\ - bl ._1534\n\ -._1030:\n\ - cmp r3, #0xa5\n\ - bne ._1032 @cond_branch\n\ - bl ._1534\n\ -._1032:\n\ - ldr r0, ._1046 + 4\n\ - lsl r1, r3, #0x1\n\ - add r1, r1, r3\n\ - lsl r1, r1, #0x2\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - cmp r0, #0\n\ - bne ._1034 @cond_branch\n\ - bl ._1534\n\ -._1034:\n\ - ldr r2, ._1046 + 8\n\ - ldr r0, ._1046 + 12\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1037 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1037 @cond_branch\n\ - bl ._1534\n\ -._1037:\n\ - ldr r1, ._1046 + 16\n\ - mov r0, #0x58\n\ - mov r2, sl\n\ - mul r2, r2, r0\n\ - add r0, r2, #0\n\ - add r1, r0, r1\n\ - add r3, r1, #0\n\ - add r3, r3, #0x21\n\ - ldrb r0, [r3]\n\ - cmp r0, r4\n\ - bne ._1039 @cond_branch\n\ - bl ._1534\n\ -._1039:\n\ - add r2, r1, #0\n\ - add r2, r2, #0x22\n\ - ldrb r0, [r2]\n\ - cmp r0, r4\n\ - bne ._1041 @cond_branch\n\ - bl ._1534\n\ -._1041:\n\ - ldrh r0, [r1, #0x28]\n\ - cmp r0, #0\n\ - bne ._1043 @cond_branch\n\ - bl ._1534\n\ -._1043:\n\ - strb r4, [r3]\n\ - strb r4, [r2]\n\ - ldr r1, ._1046 + 20\n\ - mov r0, #0xfd\n\ - strb r0, [r1]\n\ - mov r0, #0x3\n\ - strb r0, [r1, #0x1]\n\ - strb r4, [r1, #0x2]\n\ - mov r0, #0xff\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1046 + 24\n\ - ldr r0, ._1046 + 28\n\ - str r0, [r1]\n\ - bl ._1392\n\ -._1047:\n\ - .align 2, 0\n\ -._1046:\n\ - .word gBattleMoveFlags\n\ - .word gBattleMoves\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMons\n\ - .word gBattleTextBuff1\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ColorChangeActivates\n\ -._997:\n\ - ldr r0, ._1061\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1048 @cond_branch\n\ - bl ._1534\n\ -._1048:\n\ - ldr r1, ._1061 + 4\n\ - ldr r0, ._1061 + 8\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r4, r0, r1\n\ - ldrh r0, [r4, #0x28]\n\ - cmp r0, #0\n\ - bne ._1050 @cond_branch\n\ - bl ._1534\n\ -._1050:\n\ - ldr r0, ._1061 + 12\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1052 @cond_branch\n\ - bl ._1534\n\ -._1052:\n\ - ldr r2, ._1061 + 16\n\ - ldr r0, ._1061 + 20\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1055 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1055 @cond_branch\n\ - bl ._1534\n\ -._1055:\n\ - ldr r1, ._1061 + 24\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r2, #0x1\n\ - add r0, r2, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1057 @cond_branch\n\ - bl ._1534\n\ -._1057:\n\ - ldr r1, ._1061 + 28\n\ - ldrh r0, [r4, #0x2c]\n\ - lsr r0, r0, #0x4\n\ - str r0, [r1]\n\ - cmp r0, #0\n\ - bne ._1059 @cond_branch\n\ - str r2, [r1]\n\ -._1059:\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1061 + 32\n\ - ldr r0, ._1061 + 36\n\ - str r0, [r1]\n\ - bl ._1392\n\ -._1062:\n\ - .align 2, 0\n\ -._1061:\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMoves\n\ - .word gBattleMoveDamage\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_RoughSkinActivates\n\ -._1000:\n\ - ldr r0, ._1078\n\ - ldrb r1, [r0]\n\ - mov r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1063 @cond_branch\n\ - ldr r0, ._1078 + 4\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1064 @cond_branch\n\ - bl ._1534\n\ -._1064:\n\ - ldr r1, ._1078 + 8\n\ - ldr r0, ._1078 + 12\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1066 @cond_branch\n\ - bl ._1534\n\ -._1066:\n\ - ldr r0, ._1078 + 16\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1068 @cond_branch\n\ - bl ._1534\n\ -._1068:\n\ - ldr r2, ._1078 + 20\n\ - ldr r0, ._1078 + 24\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1071 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1071 @cond_branch\n\ - bl ._1534\n\ -._1071:\n\ - ldr r1, ._1078 + 28\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1073 @cond_branch\n\ - bl ._1534\n\ -._1073:\n\ - ldr r5, ._1078 + 32\n\ - mov r4, #0x3\n\ -._1075:\n\ - bl Random\n\ - and r0, r0, r4\n\ - strb r0, [r5, #0x3]\n\ - cmp r0, #0\n\ - beq ._1075 @cond_branch\n\ - ldr r1, ._1078 + 32\n\ - ldrb r0, [r1, #0x3]\n\ - cmp r0, #0x3\n\ - bne ._1076 @cond_branch\n\ - add r0, r0, #0x2\n\ - strb r0, [r1, #0x3]\n\ -._1076:\n\ - ldrb r0, [r1, #0x3]\n\ - add r0, r0, #0x40\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1078 + 36\n\ - ldr r0, ._1078 + 40\n\ - str r0, [r1]\n\ - ldr r2, ._1078 + 44\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1079:\n\ - .align 2, 0\n\ -._1078:\n\ - .word gUnknown_02023A14_50\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMoves\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._1063:\n\ - ldr r0, ._1096\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1080 @cond_branch\n\ - bl ._1534\n\ -._1080:\n\ - ldr r1, ._1096 + 4\n\ - ldr r0, ._1096 + 8\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1082 @cond_branch\n\ - bl ._1534\n\ -._1082:\n\ - ldr r0, ._1096 + 12\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1084 @cond_branch\n\ - bl ._1534\n\ -._1084:\n\ - ldr r2, ._1096 + 16\n\ - ldr r0, ._1096 + 20\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1087 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1087 @cond_branch\n\ - bl ._1534\n\ -._1087:\n\ - ldr r1, ._1096 + 24\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1089 @cond_branch\n\ - bl ._1534\n\ -._1089:\n\ - bl Random\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - mov r1, #0xa\n\ - bl __umodsi3\n\ - lsl r0, r0, #0x10\n\ - cmp r0, #0\n\ - beq ._1091 @cond_branch\n\ - bl ._1534\n\ -._1091:\n\ - ldr r5, ._1096 + 28\n\ - mov r4, #0x3\n\ -._1093:\n\ - bl Random\n\ - and r0, r0, r4\n\ - strb r0, [r5, #0x3]\n\ - cmp r0, #0\n\ - beq ._1093 @cond_branch\n\ - ldr r1, ._1096 + 28\n\ - ldrb r0, [r1, #0x3]\n\ - cmp r0, #0x3\n\ - bne ._1094 @cond_branch\n\ - add r0, r0, #0x2\n\ - strb r0, [r1, #0x3]\n\ -._1094:\n\ - ldrb r0, [r1, #0x3]\n\ - add r0, r0, #0x40\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1096 + 32\n\ - ldr r0, ._1096 + 36\n\ - str r0, [r1]\n\ - ldr r2, ._1096 + 40\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1097:\n\ - .align 2, 0\n\ -._1096:\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMoves\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._1011:\n\ - ldr r0, ._1111\n\ - ldrb r1, [r0]\n\ - mov r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1098 @cond_branch\n\ - ldr r0, ._1111 + 4\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1099 @cond_branch\n\ - bl ._1534\n\ -._1099:\n\ - ldr r1, ._1111 + 8\n\ - ldr r0, ._1111 + 12\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1101 @cond_branch\n\ - bl ._1534\n\ -._1101:\n\ - ldr r0, ._1111 + 16\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1103 @cond_branch\n\ - bl ._1534\n\ -._1103:\n\ - ldr r2, ._1111 + 20\n\ - ldr r0, ._1111 + 24\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1106 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1106 @cond_branch\n\ - bl ._1534\n\ -._1106:\n\ - ldr r1, ._1111 + 28\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1108 @cond_branch\n\ - bl ._1534\n\ -._1108:\n\ - ldr r1, ._1111 + 32\n\ - mov r0, #0x42\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1111 + 36\n\ - ldr r0, ._1111 + 40\n\ - str r0, [r1]\n\ - ldr r2, ._1111 + 44\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1112:\n\ - .align 2, 0\n\ -._1111:\n\ - .word gUnknown_02023A14_50\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMoves\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._1098:\n\ - ldr r0, ._1127\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1113 @cond_branch\n\ - bl ._1534\n\ -._1113:\n\ - ldr r1, ._1127 + 4\n\ - ldr r0, ._1127 + 8\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1115 @cond_branch\n\ - bl ._1534\n\ -._1115:\n\ - ldr r0, ._1127 + 12\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1117 @cond_branch\n\ - bl ._1534\n\ -._1117:\n\ - ldr r2, ._1127 + 16\n\ - ldr r0, ._1127 + 20\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1120 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1120 @cond_branch\n\ - bl ._1534\n\ -._1120:\n\ - ldr r1, ._1127 + 24\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1122 @cond_branch\n\ - bl ._1534\n\ -._1122:\n\ - bl Random\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - mov r1, #0x3\n\ - bl __umodsi3\n\ - lsl r0, r0, #0x10\n\ - cmp r0, #0\n\ - beq ._1124 @cond_branch\n\ - bl ._1534\n\ -._1124:\n\ - ldr r1, ._1127 + 28\n\ - mov r0, #0x42\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1127 + 32\n\ - ldr r0, ._1127 + 36\n\ - str r0, [r1]\n\ - ldr r2, ._1127 + 40\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1128:\n\ - .align 2, 0\n\ -._1127:\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMoves\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._982:\n\ - ldr r0, ._1142\n\ - ldrb r1, [r0]\n\ - mov r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1129 @cond_branch\n\ - ldr r0, ._1142 + 4\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1130 @cond_branch\n\ - bl ._1534\n\ -._1130:\n\ - ldr r1, ._1142 + 8\n\ - ldr r0, ._1142 + 12\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1132 @cond_branch\n\ - bl ._1534\n\ -._1132:\n\ - ldr r0, ._1142 + 16\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1134 @cond_branch\n\ - bl ._1534\n\ -._1134:\n\ - ldr r2, ._1142 + 20\n\ - ldr r0, ._1142 + 24\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1137 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1137 @cond_branch\n\ - bl ._1534\n\ -._1137:\n\ - ldr r1, ._1142 + 28\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1139 @cond_branch\n\ - bl ._1534\n\ -._1139:\n\ - ldr r1, ._1142 + 32\n\ - mov r0, #0x45\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1142 + 36\n\ - ldr r0, ._1142 + 40\n\ - str r0, [r1]\n\ - ldr r2, ._1142 + 44\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1143:\n\ - .align 2, 0\n\ -._1142:\n\ - .word gUnknown_02023A14_50\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMoves\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._1129:\n\ - ldr r0, ._1158\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1144 @cond_branch\n\ - bl ._1534\n\ -._1144:\n\ - ldr r1, ._1158 + 4\n\ - ldr r0, ._1158 + 8\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1146 @cond_branch\n\ - bl ._1534\n\ -._1146:\n\ - ldr r0, ._1158 + 12\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1148 @cond_branch\n\ - bl ._1534\n\ -._1148:\n\ - ldr r2, ._1158 + 16\n\ - ldr r0, ._1158 + 20\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1151 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1151 @cond_branch\n\ - bl ._1534\n\ -._1151:\n\ - ldr r1, ._1158 + 24\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1153 @cond_branch\n\ - bl ._1534\n\ -._1153:\n\ - bl Random\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - mov r1, #0x3\n\ - bl __umodsi3\n\ - lsl r0, r0, #0x10\n\ - cmp r0, #0\n\ - beq ._1155 @cond_branch\n\ - bl ._1534\n\ -._1155:\n\ - ldr r1, ._1158 + 28\n\ - mov r0, #0x45\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1158 + 32\n\ - ldr r0, ._1158 + 36\n\ - str r0, [r1]\n\ - ldr r2, ._1158 + 40\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1159:\n\ - .align 2, 0\n\ -._1158:\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleMoves\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._1022:\n\ - ldr r0, ._1173\n\ - ldrb r1, [r0]\n\ - mov r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1160 @cond_branch\n\ - ldr r0, ._1173 + 4\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1161 @cond_branch\n\ - bl ._1534\n\ -._1161:\n\ - ldr r1, ._1173 + 8\n\ - ldr r0, ._1173 + 12\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1163 @cond_branch\n\ - bl ._1534\n\ -._1163:\n\ - ldr r0, ._1173 + 16\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1165 @cond_branch\n\ - bl ._1534\n\ -._1165:\n\ - ldr r1, ._1173 + 20\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1167 @cond_branch\n\ - bl ._1534\n\ -._1167:\n\ - ldr r2, ._1173 + 24\n\ - ldr r0, ._1173 + 28\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1170 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1170 @cond_branch\n\ - bl ._1534\n\ -._1170:\n\ - ldr r1, ._1173 + 32\n\ - mov r0, #0x43\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1173 + 36\n\ - ldr r0, ._1173 + 40\n\ - str r0, [r1]\n\ - ldr r2, ._1173 + 44\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1174:\n\ - .align 2, 0\n\ -._1173:\n\ - .word gUnknown_02023A14_50\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gBattleMoves\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._1160:\n\ - ldr r0, ._1189\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1175 @cond_branch\n\ - bl ._1534\n\ -._1175:\n\ - ldr r1, ._1189 + 4\n\ - ldr r0, ._1189 + 8\n\ - ldrb r2, [r0]\n\ - mov r0, #0x58\n\ - mul r0, r0, r2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1177 @cond_branch\n\ - bl ._1534\n\ -._1177:\n\ - ldr r0, ._1189 + 12\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1179 @cond_branch\n\ - bl ._1534\n\ -._1179:\n\ - ldr r1, ._1189 + 16\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1181 @cond_branch\n\ - bl ._1534\n\ -._1181:\n\ - ldr r2, ._1189 + 20\n\ - ldr r0, ._1189 + 24\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r1, r0, #0x2\n\ - add r0, r2, #0\n\ - add r0, r0, #0x8\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1184 @cond_branch\n\ - add r0, r2, #0\n\ - add r0, r0, #0xc\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1184 @cond_branch\n\ - bl ._1534\n\ -._1184:\n\ - bl Random\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - mov r1, #0x3\n\ - bl __umodsi3\n\ - lsl r0, r0, #0x10\n\ - cmp r0, #0\n\ - beq ._1186 @cond_branch\n\ - bl ._1534\n\ -._1186:\n\ - ldr r1, ._1189 + 28\n\ - mov r0, #0x43\n\ - strb r0, [r1, #0x3]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1189 + 32\n\ - ldr r0, ._1189 + 36\n\ - str r0, [r1]\n\ - ldr r2, ._1189 + 40\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl ._1392\n\ -._1190:\n\ - .align 2, 0\n\ -._1189:\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gBattleMoves\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_ApplySecondaryEffect\n\ - .word gHitMarker\n\ -._1029:\n\ - ldr r0, ._1217\n\ - ldrb r1, [r0]\n\ - mov r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1191 @cond_branch\n\ - b ._1192\n\ -._1191:\n\ - ldr r0, ._1217 + 4\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1193 @cond_branch\n\ - bl ._1534\n\ -._1193:\n\ - ldr r5, ._1217 + 8\n\ - ldr r7, ._1217 + 12\n\ - ldrb r1, [r7]\n\ - mov r6, #0x58\n\ - add r0, r1, #0\n\ - mul r0, r0, r6\n\ - add r4, r0, r5\n\ - ldrh r0, [r4, #0x28]\n\ - cmp r0, #0\n\ - bne ._1195 @cond_branch\n\ - bl ._1534\n\ -._1195:\n\ - ldr r0, ._1217 + 16\n\ - lsl r1, r1, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1197 @cond_branch\n\ - bl ._1534\n\ -._1197:\n\ - ldr r1, ._1217 + 20\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1199 @cond_branch\n\ - bl ._1534\n\ -._1199:\n\ - ldr r3, ._1217 + 24\n\ - ldr r0, ._1217 + 28\n\ - mov r8, r0\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r2, r0, #0x2\n\ - add r0, r3, #0\n\ - add r0, r0, #0x8\n\ - add r0, r2, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1202 @cond_branch\n\ - add r0, r3, #0\n\ - add r0, r0, #0xc\n\ - add r0, r2, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1202 @cond_branch\n\ - bl ._1534\n\ -._1202:\n\ - add r0, r1, #0\n\ - mul r0, r0, r6\n\ - add r0, r0, r5\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1204 @cond_branch\n\ - bl ._1534\n\ -._1204:\n\ - add r0, r4, #0\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0xc\n\ - bne ._1206 @cond_branch\n\ - bl ._1534\n\ -._1206:\n\ - ldr r0, [sp, #0x8]\n\ - ldr r1, [sp, #0x10]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - add r4, r0, #0\n\ - ldr r0, [sp, #0xc]\n\ - ldr r1, [sp, #0x14]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - lsl r4, r4, #0x18\n\ - lsl r0, r0, #0x18\n\ - cmp r4, r0\n\ - bne ._1208 @cond_branch\n\ - bl ._1534\n\ -._1208:\n\ - ldrb r0, [r7]\n\ - mul r0, r0, r6\n\ - add r4, r5, #0\n\ - add r4, r4, #0x50\n\ - add r0, r0, r4\n\ - ldr r0, [r0]\n\ - mov r1, #0xf0\n\ - lsl r1, r1, #0xc\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1210 @cond_branch\n\ - bl ._1534\n\ -._1210:\n\ - ldr r0, [sp, #0x8]\n\ - ldr r1, [sp, #0x10]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0xff\n\ - bne ._1212 @cond_branch\n\ - bl ._1534\n\ -._1212:\n\ - ldr r0, [sp, #0xc]\n\ - ldr r1, [sp, #0x14]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0xff\n\ - bne ._1214 @cond_branch\n\ - bl ._1534\n\ -._1214:\n\ - ldrb r0, [r7]\n\ - add r2, r0, #0\n\ - mul r2, r2, r6\n\ - add r2, r2, r4\n\ - ldr r1, ._1217 + 32\n\ - mov r3, r8\n\ - ldrb r0, [r3]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldr r1, [r0]\n\ - lsl r1, r1, #0x10\n\ - ldr r0, [r2]\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1217 + 36\n\ - ldr r0, ._1217 + 40\n\ - str r0, [r1]\n\ - bl ._1392\n\ -._1218:\n\ - .align 2, 0\n\ -._1217:\n\ - .word gUnknown_02023A14_50\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gBattleMoves\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBitTable\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_CuteCharmActivates\n\ -._1192:\n\ - ldr r0, ._1245\n\ - ldrb r1, [r0]\n\ - mov r0, #0x29\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1219 @cond_branch\n\ - bl ._1534\n\ -._1219:\n\ - ldr r5, ._1245 + 4\n\ - ldr r7, ._1245 + 8\n\ - ldrb r1, [r7]\n\ - mov r6, #0x58\n\ - add r0, r1, #0\n\ - mul r0, r0, r6\n\ - add r0, r0, r5\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1221 @cond_branch\n\ - bl ._1534\n\ -._1221:\n\ - ldr r0, ._1245 + 12\n\ - lsl r1, r1, #0x4\n\ - add r1, r1, r0\n\ - ldrb r0, [r1, #0x1]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._1223 @cond_branch\n\ - bl ._1534\n\ -._1223:\n\ - ldr r1, ._1245 + 16\n\ - lsl r0, r3, #0x1\n\ - add r0, r0, r3\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldrb r1, [r0, #0x8]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1225 @cond_branch\n\ - bl ._1534\n\ -._1225:\n\ - ldr r3, ._1245 + 20\n\ - ldr r0, ._1245 + 24\n\ - mov r8, r0\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r2, r0, #0x2\n\ - add r0, r3, #0\n\ - add r0, r0, #0x8\n\ - add r0, r2, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1228 @cond_branch\n\ - add r0, r3, #0\n\ - add r0, r0, #0xc\n\ - add r0, r2, r0\n\ - ldr r0, [r0]\n\ - cmp r0, #0\n\ - bne ._1228 @cond_branch\n\ - bl ._1534\n\ -._1228:\n\ - add r0, r1, #0\n\ - mul r0, r0, r6\n\ - add r0, r0, r5\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - bne ._1230 @cond_branch\n\ - bl ._1534\n\ -._1230:\n\ - bl Random\n\ - lsl r0, r0, #0x10\n\ - lsr r0, r0, #0x10\n\ - mov r1, #0x3\n\ - bl __umodsi3\n\ - lsl r0, r0, #0x10\n\ - cmp r0, #0\n\ - beq ._1232 @cond_branch\n\ - bl ._1534\n\ -._1232:\n\ - ldrb r0, [r7]\n\ - mul r0, r0, r6\n\ - add r0, r0, r5\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0xc\n\ - bne ._1234 @cond_branch\n\ - bl ._1534\n\ -._1234:\n\ - ldr r0, [sp, #0x8]\n\ - ldr r1, [sp, #0x10]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - add r4, r0, #0\n\ - ldr r0, [sp, #0xc]\n\ - ldr r1, [sp, #0x14]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - lsl r4, r4, #0x18\n\ - lsl r0, r0, #0x18\n\ - cmp r4, r0\n\ - bne ._1236 @cond_branch\n\ - bl ._1534\n\ -._1236:\n\ - ldrb r0, [r7]\n\ - mul r0, r0, r6\n\ - add r4, r5, #0\n\ - add r4, r4, #0x50\n\ - add r0, r0, r4\n\ - ldr r0, [r0]\n\ - mov r1, #0xf0\n\ - lsl r1, r1, #0xc\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1238 @cond_branch\n\ - bl ._1534\n\ -._1238:\n\ - ldr r0, [sp, #0x8]\n\ - ldr r1, [sp, #0x10]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0xff\n\ - bne ._1240 @cond_branch\n\ - bl ._1534\n\ -._1240:\n\ - ldr r0, [sp, #0xc]\n\ - ldr r1, [sp, #0x14]\n\ - bl GetGenderFromSpeciesAndPersonality\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0xff\n\ - bne ._1242 @cond_branch\n\ - bl ._1534\n\ -._1242:\n\ - ldrb r0, [r7]\n\ - add r2, r0, #0\n\ - mul r2, r2, r6\n\ - add r2, r2, r4\n\ - ldr r1, ._1245 + 28\n\ - mov r3, r8\n\ - ldrb r0, [r3]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldr r1, [r0]\n\ - lsl r1, r1, #0x10\n\ - ldr r0, [r2]\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1245 + 32\n\ - ldr r0, ._1245 + 36\n\ - str r0, [r1]\n\ - bl ._1392\n\ -._1246:\n\ - .align 2, 0\n\ -._1245:\n\ - .word gBattleMoveFlags\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gProtectStructs\n\ - .word gBattleMoves\n\ - .word gSpecialStatuses\n\ - .word gBankTarget\n\ - .word gBitTable\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_CuteCharmActivates\n\ -._749:\n\ - mov r5, #0x0\n\ - mov sl, r5\n\ - ldr r0, ._1251\n\ - ldrb r0, [r0]\n\ - cmp sl, r0\n\ - bcc ._1366 @cond_branch\n\ - bl ._1534\n\ -._1366:\n\ - ldr r1, ._1251 + 4\n\ - mov r0, #0x58\n\ - mov r2, sl\n\ - mul r2, r2, r0\n\ - add r0, r2, #0\n\ - add r0, r0, r1\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - sub r0, r0, #0x7\n\ - add r2, r1, #0\n\ - cmp r0, #0x41\n\ - bls ._1249 @cond_branch\n\ - b ._1346\n\ -._1249:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._1251 + 8\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._1252:\n\ - .align 2, 0\n\ -._1251:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word ._1253\n\ -._1253:\n\ - .word ._1254\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1259\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1319\n\ - .word ._1346\n\ - .word ._1264\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1267\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1287\n\ - .word ._1288\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1346\n\ - .word ._1319\n\ -._1264:\n\ - mov r0, #0x58\n\ - mov r3, sl\n\ - mul r3, r3, r0\n\ - add r0, r3, #0\n\ - add r1, r2, #0\n\ - add r1, r1, #0x4c\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - ldr r1, ._1323\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1320 @cond_branch\n\ - b ._1346\n\ -._1320:\n\ - ldr r0, ._1323 + 4\n\ - ldr r1, ._1323 + 8\n\ - b ._1331\n\ -._1324:\n\ - .align 2, 0\n\ -._1323:\n\ - .word 0xf88\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_PoisonJpn\n\ -._1267:\n\ - mov r0, #0x58\n\ - mov r1, sl\n\ - mul r1, r1, r0\n\ - add r0, r1, #0\n\ - add r1, r2, #0\n\ - add r1, r1, #0x50\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1325 @cond_branch\n\ - b ._1346\n\ -._1325:\n\ - ldr r0, ._1328\n\ - ldr r1, ._1328 + 4\n\ - bl StringCopy\n\ - mov r2, #0x2\n\ - mov r9, r2\n\ - b ._1343\n\ -._1329:\n\ - .align 2, 0\n\ -._1328:\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_ConfusionJpn\n\ -._1254:\n\ - mov r0, #0x58\n\ - mov r3, sl\n\ - mul r3, r3, r0\n\ - add r0, r3, #0\n\ - add r1, r2, #0\n\ - add r1, r1, #0x4c\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x40\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1346 @cond_branch\n\ - ldr r0, ._1332\n\ - ldr r1, ._1332 + 4\n\ - b ._1331\n\ -._1333:\n\ - .align 2, 0\n\ -._1332:\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_ParalysisJpn\n\ -._1319:\n\ - mov r0, #0x58\n\ - mov r3, sl\n\ - mul r3, r3, r0\n\ - add r0, r2, #0\n\ - add r0, r0, #0x4c\n\ - add r0, r3, r0\n\ - ldr r0, [r0]\n\ - mov r1, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1346 @cond_branch\n\ - add r2, r2, #0x50\n\ - add r2, r3, r2\n\ - ldr r0, [r2]\n\ - ldr r1, ._1336\n\ - and r0, r0, r1\n\ - str r0, [r2]\n\ - ldr r0, ._1336 + 4\n\ - ldr r1, ._1336 + 8\n\ - bl StringCopy\n\ - mov r0, #0x1\n\ - mov r9, r0\n\ - b ._1343\n\ -._1337:\n\ - .align 2, 0\n\ -._1336:\n\ - .word 0xf7ffffff\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_SleepJpn\n\ -._1288:\n\ - mov r0, #0x58\n\ - mov r1, sl\n\ - mul r1, r1, r0\n\ - add r0, r1, #0\n\ - add r1, r2, #0\n\ - add r1, r1, #0x4c\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x10\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1346 @cond_branch\n\ - ldr r0, ._1340\n\ - ldr r1, ._1340 + 4\n\ - bl StringCopy\n\ - mov r2, #0x1\n\ - mov r9, r2\n\ - b ._1343\n\ -._1341:\n\ - .align 2, 0\n\ -._1340:\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_BurnJpn\n\ -._1287:\n\ - mov r0, #0x58\n\ - mov r3, sl\n\ - mul r3, r3, r0\n\ - add r0, r3, #0\n\ - add r1, r2, #0\n\ - add r1, r1, #0x4c\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x20\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1346 @cond_branch\n\ - ldr r0, ._1344\n\ - ldr r1, ._1344 + 4\n\ -._1331:\n\ - bl StringCopy\n\ - mov r5, #0x1\n\ - mov r9, r5\n\ - b ._1343\n\ -._1345:\n\ - .align 2, 0\n\ -._1344:\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_IceJpn\n\ -._1259:\n\ - mov r0, #0x58\n\ - mov r1, sl\n\ - mul r1, r1, r0\n\ - add r0, r1, #0\n\ - add r1, r2, #0\n\ - add r1, r1, #0x50\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0xf0\n\ - lsl r1, r1, #0xc\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1346 @cond_branch\n\ - ldr r0, ._1352\n\ - ldr r1, ._1352 + 4\n\ - bl StringCopy\n\ - mov r2, #0x3\n\ - mov r9, r2\n\ -._1346:\n\ - mov r3, r9\n\ - cmp r3, #0\n\ - beq ._1347 @cond_branch\n\ -._1343:\n\ - mov r5, r9\n\ - cmp r5, #0x2\n\ - beq ._1348 @cond_branch\n\ - cmp r5, #0x2\n\ - bgt ._1349 @cond_branch\n\ - cmp r5, #0x1\n\ - beq ._1350 @cond_branch\n\ - b ._1355\n\ -._1353:\n\ - .align 2, 0\n\ -._1352:\n\ - .word gBattleTextBuff1\n\ - .word gStatusConditionString_LoveJpn\n\ -._1349:\n\ - mov r0, r9\n\ - cmp r0, #0x3\n\ - beq ._1354 @cond_branch\n\ - b ._1355\n\ -._1350:\n\ - ldr r1, ._1357\n\ - mov r0, #0x58\n\ - mov r2, sl\n\ - mul r2, r2, r0\n\ - add r1, r1, #0x4c\n\ - add r2, r2, r1\n\ - mov r0, #0x0\n\ - b ._1356\n\ -._1358:\n\ - .align 2, 0\n\ -._1357:\n\ - .word gBattleMons\n\ -._1348:\n\ - ldr r1, ._1360\n\ - mov r0, #0x58\n\ - mov r2, sl\n\ - mul r2, r2, r0\n\ - add r1, r1, #0x50\n\ - add r2, r2, r1\n\ - ldr r0, [r2]\n\ - mov r1, #0x8\n\ - neg r1, r1\n\ - b ._1359\n\ -._1361:\n\ - .align 2, 0\n\ -._1360:\n\ - .word gBattleMons\n\ -._1354:\n\ - ldr r1, ._1363\n\ - mov r0, #0x58\n\ - mov r2, sl\n\ - mul r2, r2, r0\n\ - add r1, r1, #0x50\n\ - add r2, r2, r1\n\ - ldr r0, [r2]\n\ - ldr r1, ._1363 + 4\n\ -._1359:\n\ - and r0, r0, r1\n\ -._1356:\n\ - str r0, [r2]\n\ -._1355:\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1363 + 8\n\ - ldr r0, ._1363 + 12\n\ - str r0, [r1]\n\ - ldr r0, ._1363 + 16\n\ - ldr r1, ._1363 + 20\n\ - add r0, r0, r1\n\ - mov r2, sl\n\ - strb r2, [r0]\n\ - ldr r4, ._1363 + 24\n\ - strb r2, [r4]\n\ - ldrb r1, [r4]\n\ - mov r0, #0x58\n\ - mul r0, r0, r1\n\ - ldr r1, ._1363 + 28\n\ - add r0, r0, r1\n\ - str r0, [sp]\n\ - mov r0, #0x0\n\ - mov r1, #0x28\n\ - mov r2, #0x0\n\ - mov r3, #0x4\n\ - bl EmitSetMonData\n\ - ldrb r0, [r4]\n\ - bl MarkBufferBankForExecution\n\ - bl ._1540\n\ -._1364:\n\ - .align 2, 0\n\ -._1363:\n\ - .word gBattleMons\n\ - .word 0xfff0ffff\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_AbilityCuredStatus\n\ - .word +0x2000000\n\ - .word 0x16003\n\ - .word gActiveBank\n\ - .word gUnknown_02024ACC\n\ -._1347:\n\ - mov r0, sl\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov sl, r0\n\ - ldr r0, ._1368\n\ - ldrb r0, [r0]\n\ - cmp sl, r0\n\ - bcs ._1365 @cond_branch\n\ - b ._1366\n\ -._1365:\n\ - bl ._1534\n\ -._1369:\n\ - .align 2, 0\n\ -._1368:\n\ - .word gNoOfAllBanks\n\ -._750:\n\ - mov r3, #0x0\n\ - mov sl, r3\n\ - ldr r0, ._1377\n\ - ldrb r0, [r0]\n\ - cmp sl, r0\n\ - bcc ._1370 @cond_branch\n\ - b ._1534\n\ -._1370:\n\ - ldr r4, ._1377 + 4\n\ -._1375:\n\ - mov r0, #0x58\n\ - mov r5, sl\n\ - mul r5, r5, r0\n\ - add r0, r5, #0\n\ - add r0, r0, r4\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x3b\n\ - bne ._1373 @cond_branch\n\ - mov r0, sl\n\ - bl CastformDataTypeChange\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ - cmp r0, #0\n\ - beq ._1373 @cond_branch\n\ - b ._1374\n\ -._1373:\n\ - mov r0, sl\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov sl, r0\n\ - ldr r0, ._1377\n\ - ldrb r0, [r0]\n\ - cmp sl, r0\n\ - bcc ._1375 @cond_branch\n\ - b ._1534\n\ -._1378:\n\ - .align 2, 0\n\ -._1377:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ -._751:\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - cmp r0, #0x1c\n\ - beq ._1379 @cond_branch\n\ - b ._1534\n\ -._1379:\n\ - ldr r4, ._1385\n\ - ldr r1, [r4]\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1381 @cond_branch\n\ - b ._1534\n\ -._1381:\n\ - ldr r0, ._1385 + 4\n\ - and r1, r1, r0\n\ - str r1, [r4]\n\ - ldr r3, ._1385 + 8\n\ - add r2, r7, r3\n\ - ldrb r1, [r2]\n\ - mov r0, #0x3f\n\ - and r0, r0, r1\n\ - strb r0, [r2]\n\ - cmp r0, #0x6\n\ - bne ._1383 @cond_branch\n\ - mov r0, #0x2\n\ - strb r0, [r2]\n\ -._1383:\n\ - ldr r1, ._1385 + 12\n\ - ldrb r0, [r2]\n\ - add r0, r0, #0x40\n\ - strb r0, [r1, #0x3]\n\ - ldr r0, ._1385 + 16\n\ - ldrb r1, [r0]\n\ - ldr r5, ._1385 + 20\n\ - add r0, r7, r5\n\ - strb r1, [r0]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1385 + 24\n\ - ldr r0, ._1385 + 28\n\ - str r0, [r1]\n\ - ldr r0, [r4]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r4]\n\ - b ._1392\n\ -._1386:\n\ - .align 2, 0\n\ -._1385:\n\ - .word gHitMarker\n\ - .word 0xffffbfff\n\ - .word 0x160ca\n\ - .word gBattleCommunication\n\ - .word gBankTarget\n\ - .word 0x16003\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_SynchronizeActivates\n\ -._752:\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - cmp r0, #0x1c\n\ - beq ._1387 @cond_branch\n\ - b ._1534\n\ -._1387:\n\ - ldr r4, ._1393\n\ - ldr r1, [r4]\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1389 @cond_branch\n\ - b ._1534\n\ -._1389:\n\ - ldr r0, ._1393 + 4\n\ - and r1, r1, r0\n\ - str r1, [r4]\n\ - ldr r3, ._1393 + 8\n\ - add r2, r7, r3\n\ - ldrb r1, [r2]\n\ - mov r0, #0x3f\n\ - and r0, r0, r1\n\ - strb r0, [r2]\n\ - cmp r0, #0x6\n\ - bne ._1391 @cond_branch\n\ - mov r0, #0x2\n\ - strb r0, [r2]\n\ -._1391:\n\ - ldr r1, ._1393 + 12\n\ - ldrb r0, [r2]\n\ - strb r0, [r1, #0x3]\n\ - ldr r0, ._1393 + 16\n\ - ldrb r1, [r0]\n\ - ldr r5, ._1393 + 20\n\ - add r0, r7, r5\n\ - strb r1, [r0]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1393 + 24\n\ - ldr r0, ._1393 + 28\n\ - str r0, [r1]\n\ - ldr r0, [r4]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x6\n\ - orr r0, r0, r1\n\ - str r0, [r4]\n\ - b ._1392\n\ -._1394:\n\ - .align 2, 0\n\ -._1393:\n\ - .word gHitMarker\n\ - .word 0xffffbfff\n\ - .word 0x160ca\n\ - .word gBattleCommunication\n\ - .word gBankAttacker\n\ - .word 0x16003\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_SynchronizeActivates\n\ -._753:\n\ - mov r4, #0x0\n\ - ldr r0, ._1402\n\ - ldrb r1, [r0]\n\ - cmp r4, r1\n\ - blt ._1395 @cond_branch\n\ - b ._1534\n\ -._1395:\n\ - ldr r0, ._1402 + 4\n\ - add r5, r1, #0\n\ - ldr r2, ._1402 + 8\n\ - add r3, r0, #0\n\ - add r3, r3, #0x20\n\ - mov r6, #0x80\n\ - lsl r6, r6, #0xc\n\ -._1400:\n\ - ldrb r1, [r3]\n\ - cmp r1, #0x16\n\ - bne ._1398 @cond_branch\n\ - ldr r0, [r2]\n\ - and r0, r0, r6\n\ - cmp r0, #0\n\ - beq ._1398 @cond_branch\n\ - b ._1399\n\ -._1398:\n\ - add r2, r2, #0x4\n\ - add r3, r3, #0x58\n\ - add r4, r4, #0x1\n\ - cmp r4, r5\n\ - blt ._1400 @cond_branch\n\ - b ._1534\n\ -._1403:\n\ - .align 2, 0\n\ -._1402:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gStatuses3\n\ -._755:\n\ - mov r4, #0x0\n\ - ldr r0, ._1417\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1404 @cond_branch\n\ - b ._1534\n\ -._1404:\n\ - ldr r0, ._1417 + 4\n\ - mov r8, r0\n\ - ldr r1, ._1417 + 8\n\ - add r1, r1, #0x20\n\ - str r1, [sp, #0x1c]\n\ - mov r2, #0x0\n\ - str r2, [sp, #0x20]\n\ -._1434:\n\ - ldr r3, [sp, #0x1c]\n\ - ldrb r0, [r3]\n\ - cmp r0, #0x24\n\ - beq ._1406 @cond_branch\n\ - b ._1431\n\ -._1406:\n\ - ldr r0, ._1417 + 12\n\ - ldr r5, [sp, #0x20]\n\ - add r0, r5, r0\n\ - ldr r1, [r0]\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0xd\n\ - and r1, r1, r0\n\ - str r5, [sp, #0x18]\n\ - cmp r1, #0\n\ - bne ._1408 @cond_branch\n\ - b ._1431\n\ -._1408:\n\ - lsl r0, r4, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl GetBankIdentity\n\ - mov r1, #0x1\n\ - add r5, r0, #0\n\ - eor r5, r5, r1\n\ - and r5, r5, r1\n\ - add r0, r5, #0\n\ - bl GetBankByIdentity\n\ - lsl r0, r0, #0x18\n\ - lsr r6, r0, #0x18\n\ - add r0, r5, #2\n\ - bl GetBankByIdentity\n\ - lsl r0, r0, #0x18\n\ - lsr r7, r0, #0x18\n\ - ldr r0, ._1417 + 16\n\ - ldrh r1, [r0]\n\ - mov r2, #0x1\n\ - add r0, r2, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1410 @cond_branch\n\ - b ._1411\n\ -._1410:\n\ - mov r1, #0x58\n\ - add r0, r6, #0\n\ - mul r0, r0, r1\n\ - ldr r3, ._1417 + 8\n\ - add r1, r0, r3\n\ - add r0, r1, #0\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._1420 @cond_branch\n\ - ldrh r0, [r1, #0x28]\n\ - cmp r0, #0\n\ - beq ._1415 @cond_branch\n\ - mov r1, #0x58\n\ - add r0, r7, #0\n\ - mul r0, r0, r1\n\ - add r1, r0, r3\n\ - add r0, r1, #0\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._1415 @cond_branch\n\ - ldrh r0, [r1, #0x28]\n\ - cmp r0, #0\n\ - beq ._1415 @cond_branch\n\ - str r2, [sp, #0x24]\n\ - bl Random\n\ - ldr r2, [sp, #0x24]\n\ - add r1, r2, #0\n\ - and r1, r1, r0\n\ - lsl r1, r1, #0x1\n\ - orr r5, r5, r1\n\ - add r0, r5, #0\n\ - bl GetBankByIdentity\n\ - mov r2, r8\n\ - strb r0, [r2]\n\ - ldrb r0, [r2]\n\ - mov r3, #0x58\n\ - mul r0, r0, r3\n\ - ldr r5, ._1417 + 8\n\ - add r0, r0, r5\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - ldr r1, [sp, #0x1c]\n\ - strb r0, [r1]\n\ - ldrb r0, [r2]\n\ - mul r0, r0, r3\n\ - add r0, r0, r5\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - ldr r2, ._1417 + 20\n\ - strb r0, [r2]\n\ - b ._1416\n\ -._1418:\n\ - .align 2, 0\n\ -._1417:\n\ - .word gNoOfAllBanks\n\ - .word gActiveBank\n\ - .word gBattleMons\n\ - .word gStatuses3\n\ - .word gBattleTypeFlags\n\ - .word gLastUsedAbility\n\ -._1415:\n\ - ldr r3, ._1422\n\ - mov r2, #0x58\n\ - add r0, r6, #0\n\ - mul r0, r0, r2\n\ - add r1, r0, r3\n\ - add r0, r1, #0\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._1420 @cond_branch\n\ - ldrh r0, [r1, #0x28]\n\ - cmp r0, #0\n\ - beq ._1420 @cond_branch\n\ - mov r5, r8\n\ - strb r6, [r5]\n\ - add r1, r4, #0\n\ - mul r1, r1, r2\n\ - add r1, r1, r3\n\ - ldrb r0, [r5]\n\ - mul r0, r0, r2\n\ - add r0, r0, r3\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - add r1, r1, #0x20\n\ - strb r0, [r1]\n\ - ldrb r0, [r5]\n\ - mul r0, r0, r2\n\ - add r0, r0, r3\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - b ._1426\n\ -._1423:\n\ - .align 2, 0\n\ -._1422:\n\ - .word gBattleMons\n\ -._1420:\n\ - ldr r3, ._1427\n\ - mov r2, #0x58\n\ - add r0, r7, #0\n\ - mul r0, r0, r2\n\ - add r1, r0, r3\n\ - add r0, r1, #0\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._1430 @cond_branch\n\ - ldrh r0, [r1, #0x28]\n\ - cmp r0, #0\n\ - beq ._1430 @cond_branch\n\ - mov r5, r8\n\ - strb r7, [r5]\n\ - add r1, r4, #0\n\ - mul r1, r1, r2\n\ - add r1, r1, r3\n\ - ldrb r0, [r5]\n\ - mul r0, r0, r2\n\ - add r0, r0, r3\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - add r1, r1, #0x20\n\ - strb r0, [r1]\n\ - ldrb r0, [r5]\n\ - mul r0, r0, r2\n\ - add r0, r0, r3\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - b ._1426\n\ -._1428:\n\ - .align 2, 0\n\ -._1427:\n\ - .word gBattleMons\n\ -._1411:\n\ - mov r2, r8\n\ - strb r6, [r2]\n\ - mov r3, #0x58\n\ - add r0, r6, #0\n\ - mul r0, r0, r3\n\ - ldr r5, ._1436\n\ - add r0, r0, r5\n\ - add r2, r0, #0\n\ - add r2, r2, #0x20\n\ - ldrb r1, [r2]\n\ - cmp r1, #0\n\ - beq ._1430 @cond_branch\n\ - ldrh r0, [r0, #0x28]\n\ - cmp r0, #0\n\ - beq ._1430 @cond_branch\n\ - ldr r0, [sp, #0x1c]\n\ - strb r1, [r0]\n\ - ldrb r0, [r2]\n\ -._1426:\n\ - ldr r1, ._1436 + 4\n\ - strb r0, [r1]\n\ -._1416:\n\ - mov r0, r9\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1430:\n\ - mov r2, r9\n\ - cmp r2, #0\n\ - beq ._1431 @cond_branch\n\ - b ._1432\n\ -._1431:\n\ - ldr r3, [sp, #0x1c]\n\ - add r3, r3, #0x58\n\ - str r3, [sp, #0x1c]\n\ - ldr r5, [sp, #0x20]\n\ - add r5, r5, #0x4\n\ - str r5, [sp, #0x20]\n\ - add r4, r4, #0x1\n\ - ldr r0, ._1436 + 8\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - bge ._1433 @cond_branch\n\ - b ._1434\n\ -._1433:\n\ - b ._1534\n\ -._1437:\n\ - .align 2, 0\n\ -._1436:\n\ - .word gBattleMons\n\ - .word gLastUsedAbility\n\ - .word gNoOfAllBanks\n\ -._754:\n\ - mov r4, #0x0\n\ - ldr r0, ._1445\n\ - ldrb r1, [r0]\n\ - cmp r4, r1\n\ - blt ._1438 @cond_branch\n\ - b ._1534\n\ -._1438:\n\ - ldr r0, ._1445 + 4\n\ - add r5, r1, #0\n\ - ldr r2, ._1445 + 8\n\ - add r3, r0, #0\n\ - add r3, r3, #0x20\n\ - mov r6, #0x80\n\ - lsl r6, r6, #0xc\n\ -._1443:\n\ - ldrb r1, [r3]\n\ - cmp r1, #0x16\n\ - bne ._1441 @cond_branch\n\ - ldr r0, [r2]\n\ - and r0, r0, r6\n\ - cmp r0, #0\n\ - beq ._1441 @cond_branch\n\ - b ._1442\n\ -._1441:\n\ - add r2, r2, #0x4\n\ - add r3, r3, #0x58\n\ - add r4, r4, #0x1\n\ - cmp r4, r5\n\ - blt ._1443 @cond_branch\n\ - b ._1534\n\ -._1446:\n\ - .align 2, 0\n\ -._1445:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gStatuses3\n\ -._756:\n\ - mov r0, sl\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r5, r0, #0x18\n\ - mov r4, #0x0\n\ - ldr r0, ._1453\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1447 @cond_branch\n\ - b ._1534\n\ -._1447:\n\ - ldr r7, ._1453 + 4\n\ -._1451:\n\ - lsl r0, r4, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - add r3, r4, #1\n\ - cmp r0, r5\n\ - beq ._1450 @cond_branch\n\ - mov r0, #0x58\n\ - mul r0, r0, r4\n\ - add r0, r0, r7\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, r6\n\ - bne ._1450 @cond_branch\n\ - ldr r0, ._1453 + 8\n\ - strb r6, [r0]\n\ - lsl r0, r3, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1450:\n\ - add r4, r3, #0\n\ - ldr r0, ._1453\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1451 @cond_branch\n\ - b ._1534\n\ -._1454:\n\ - .align 2, 0\n\ -._1453:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gLastUsedAbility\n\ -._757:\n\ - mov r0, sl\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r5, r0, #0x18\n\ - mov r4, #0x0\n\ - ldr r0, ._1461\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1455 @cond_branch\n\ - b ._1534\n\ -._1455:\n\ - ldr r7, ._1461 + 4\n\ -._1459:\n\ - lsl r0, r4, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - add r3, r4, #1\n\ - cmp r0, r5\n\ - bne ._1458 @cond_branch\n\ - mov r0, #0x58\n\ - mul r0, r0, r4\n\ - add r0, r0, r7\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, r6\n\ - bne ._1458 @cond_branch\n\ - ldr r0, ._1461 + 8\n\ - strb r6, [r0]\n\ - lsl r0, r3, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1458:\n\ - add r4, r3, #0\n\ - ldr r0, ._1461\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1459 @cond_branch\n\ - b ._1534\n\ -._1462:\n\ - .align 2, 0\n\ -._1461:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gLastUsedAbility\n\ -._758:\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - cmp r0, #0xfd\n\ - beq ._1463 @cond_branch\n\ - cmp r0, #0xfe\n\ - beq ._1464 @cond_branch\n\ - mov r4, #0x0\n\ - ldr r0, ._1468\n\ - add r5, r0, #0\n\ - ldrb r2, [r5]\n\ - cmp r4, r2\n\ - blt ._1465 @cond_branch\n\ - b ._1534\n\ -._1465:\n\ - ldr r2, ._1468 + 4\n\ - b ._1485\n\ -._1469:\n\ - .align 2, 0\n\ -._1468:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ -._1463:\n\ - mov r4, #0x0\n\ - ldr r0, ._1475\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1470 @cond_branch\n\ - b ._1534\n\ -._1470:\n\ - ldr r5, ._1475 + 4\n\ - mov r2, #0x80\n\ - lsl r2, r2, #0x9\n\ - add r1, r0, #0\n\ -._1473:\n\ - lsl r0, r4, #0x2\n\ - add r0, r0, r5\n\ - ldr r0, [r0]\n\ - and r0, r0, r2\n\ - add r3, r4, #1\n\ - cmp r0, #0\n\ - beq ._1472 @cond_branch\n\ - lsl r0, r3, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1472:\n\ - add r4, r3, #0\n\ - cmp r4, r1\n\ - blt ._1473 @cond_branch\n\ - b ._1534\n\ -._1476:\n\ - .align 2, 0\n\ -._1475:\n\ - .word gNoOfAllBanks\n\ - .word gStatuses3\n\ -._1464:\n\ - mov r4, #0x0\n\ - ldr r0, ._1482\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1477 @cond_branch\n\ - b ._1534\n\ -._1477:\n\ - ldr r5, ._1482 + 4\n\ - mov r2, #0x80\n\ - lsl r2, r2, #0xa\n\ - add r1, r0, #0\n\ -._1480:\n\ - lsl r0, r4, #0x2\n\ - add r0, r0, r5\n\ - ldr r0, [r0]\n\ - and r0, r0, r2\n\ - add r3, r4, #1\n\ - cmp r0, #0\n\ - beq ._1479 @cond_branch\n\ - lsl r0, r3, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1479:\n\ - add r4, r3, #0\n\ - cmp r4, r1\n\ - blt ._1480 @cond_branch\n\ - b ._1534\n\ -._1483:\n\ - .align 2, 0\n\ -._1482:\n\ - .word gNoOfAllBanks\n\ - .word gStatuses3\n\ -._1485:\n\ - mov r0, #0x58\n\ - mul r0, r0, r4\n\ - add r0, r0, r2\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - add r3, r4, #1\n\ - cmp r0, r6\n\ - bne ._1484 @cond_branch\n\ - mov r0, r8\n\ - strb r6, [r0]\n\ - lsl r0, r3, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1484:\n\ - add r4, r3, #0\n\ - ldrb r1, [r5]\n\ - cmp r4, r1\n\ - blt ._1485 @cond_branch\n\ - b ._1534\n\ -._763:\n\ - mov r4, #0x0\n\ - ldr r0, ._1493\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1487 @cond_branch\n\ - b ._1534\n\ -._1487:\n\ - ldr r7, ._1493 + 4\n\ - add r2, r0, #0\n\ - mov r5, #0x58\n\ -._1491:\n\ - add r0, r4, #0\n\ - mul r0, r0, r5\n\ - add r1, r0, r7\n\ - add r0, r1, #0\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - add r3, r4, #1\n\ - cmp r0, r6\n\ - bne ._1490 @cond_branch\n\ - ldrh r0, [r1, #0x28]\n\ - cmp r0, #0\n\ - beq ._1490 @cond_branch\n\ - mov r0, r8\n\ - strb r6, [r0]\n\ - lsl r0, r3, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1490:\n\ - add r4, r3, #0\n\ - cmp r4, r2\n\ - blt ._1491 @cond_branch\n\ - b ._1534\n\ -._1494:\n\ - .align 2, 0\n\ -._1493:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ -._759:\n\ - mov r4, #0x0\n\ - ldr r0, ._1501\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1495 @cond_branch\n\ - b ._1534\n\ -._1495:\n\ - ldr r7, ._1501 + 4\n\ - add r1, r0, #0\n\ - mov r5, #0x58\n\ - ldr r2, ._1501 + 8\n\ -._1499:\n\ - add r0, r4, #0\n\ - mul r0, r0, r5\n\ - add r0, r0, r7\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - add r3, r4, #1\n\ - cmp r0, r6\n\ - bne ._1498 @cond_branch\n\ - cmp r4, sl\n\ - beq ._1498 @cond_branch\n\ - strb r6, [r2]\n\ - lsl r0, r3, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1498:\n\ - add r4, r3, #0\n\ - cmp r4, r1\n\ - blt ._1499 @cond_branch\n\ - b ._1534\n\ -._1502:\n\ - .align 2, 0\n\ -._1501:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gLastUsedAbility\n\ -._760:\n\ - mov r0, sl\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r5, r0, #0x18\n\ - mov r4, #0x0\n\ - ldr r0, ._1509\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1503 @cond_branch\n\ - b ._1534\n\ -._1503:\n\ - ldr r7, ._1509 + 4\n\ -._1507:\n\ - lsl r0, r4, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, r5\n\ - beq ._1506 @cond_branch\n\ - mov r0, #0x58\n\ - mul r0, r0, r4\n\ - add r0, r0, r7\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, r6\n\ - bne ._1506 @cond_branch\n\ - ldr r0, ._1509 + 8\n\ - strb r6, [r0]\n\ - mov r0, r9\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1506:\n\ - add r4, r4, #0x1\n\ - ldr r0, ._1509\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1507 @cond_branch\n\ - b ._1534\n\ -._1510:\n\ - .align 2, 0\n\ -._1509:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gLastUsedAbility\n\ -._761:\n\ - mov r0, sl\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r5, r0, #0x18\n\ - mov r4, #0x0\n\ - ldr r0, ._1517\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1511 @cond_branch\n\ - b ._1534\n\ -._1511:\n\ - ldr r7, ._1517 + 4\n\ -._1515:\n\ - lsl r0, r4, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, r5\n\ - bne ._1514 @cond_branch\n\ - mov r0, #0x58\n\ - mul r0, r0, r4\n\ - add r0, r0, r7\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, r6\n\ - bne ._1514 @cond_branch\n\ - ldr r0, ._1517 + 8\n\ - strb r6, [r0]\n\ - mov r0, r9\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1514:\n\ - add r4, r4, #0x1\n\ - ldr r0, ._1517\n\ - ldrb r0, [r0]\n\ - cmp r4, r0\n\ - blt ._1515 @cond_branch\n\ - b ._1534\n\ -._1518:\n\ - .align 2, 0\n\ -._1517:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gLastUsedAbility\n\ -._853:\n\ - ldr r0, ._1520\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r0, ._1520 + 4\n\ - ldr r2, ._1520 + 8\n\ - add r1, r0, r2\n\ - strb r6, [r1]\n\ - mov r1, r9\n\ - sub r1, r1, #0x1\n\ - ldr r3, ._1520 + 12\n\ - add r0, r0, r3\n\ - strb r1, [r0]\n\ - b ._1534\n\ -._1521:\n\ - .align 2, 0\n\ -._1520:\n\ - .word BattleScript_CastformChange\n\ - .word +0x2000000\n\ - .word 0x16003\n\ - .word 0x1609b\n\ -._1374:\n\ - ldr r0, ._1523\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r0, ._1523 + 4\n\ - ldr r5, ._1523 + 8\n\ - add r1, r0, r5\n\ - mov r2, sl\n\ - strb r2, [r1]\n\ - mov r1, r9\n\ - sub r1, r1, #0x1\n\ - ldr r3, ._1523 + 12\n\ - add r0, r0, r3\n\ - strb r1, [r0]\n\ - b ._1540\n\ -._1524:\n\ - .align 2, 0\n\ -._1523:\n\ - .word BattleScript_CastformChange\n\ - .word +0x2000000\n\ - .word 0x16003\n\ - .word 0x1609b\n\ -._1399:\n\ - mov r5, r8\n\ - strb r1, [r5]\n\ - ldr r0, [r2]\n\ - ldr r1, ._1526\n\ - and r0, r0, r1\n\ - str r0, [r2]\n\ - ldr r0, ._1526 + 4\n\ - bl BattleScriptPushCursorAndCallback\n\ - b ._1525\n\ -._1527:\n\ - .align 2, 0\n\ -._1526:\n\ - .word 0xfff7ffff\n\ - .word gUnknown_081D978C\n\ -._1432:\n\ - ldr r0, ._1529\n\ - bl BattleScriptPushCursorAndCallback\n\ - ldr r1, ._1529 + 4\n\ - ldr r2, [sp, #0x18]\n\ - add r1, r2, r1\n\ - ldr r0, [r1]\n\ - ldr r2, ._1529 + 8\n\ - and r0, r0, r2\n\ - str r0, [r1]\n\ - ldr r0, ._1529 + 12\n\ - ldr r3, ._1529 + 16\n\ - add r0, r0, r3\n\ - strb r4, [r0]\n\ - ldr r1, ._1529 + 20\n\ - mov r4, #0xfd\n\ - strb r4, [r1]\n\ - mov r0, #0x4\n\ - strb r0, [r1, #0x1]\n\ - ldr r2, ._1529 + 24\n\ - ldrb r0, [r2]\n\ - strb r0, [r1, #0x2]\n\ - ldr r3, ._1529 + 28\n\ - ldrb r0, [r2]\n\ - lsl r0, r0, #0x1\n\ - add r0, r0, r3\n\ - ldrh r0, [r0]\n\ - strb r0, [r1, #0x3]\n\ - mov r0, #0xff\n\ - strb r0, [r1, #0x4]\n\ - ldr r1, ._1529 + 32\n\ - strb r4, [r1]\n\ - mov r0, #0x9\n\ - strb r0, [r1, #0x1]\n\ - ldr r0, ._1529 + 36\n\ - ldrb r0, [r0]\n\ - strb r0, [r1, #0x2]\n\ - mov r0, #0x1\n\ - neg r0, r0\n\ - strb r0, [r1, #0x3]\n\ - b ._1534\n\ -._1530:\n\ - .align 2, 0\n\ -._1529:\n\ - .word BattleScript_TraceActivates\n\ - .word gStatuses3\n\ - .word 0xffefffff\n\ - .word +0x2000000\n\ - .word 0x16003\n\ - .word gBattleTextBuff1\n\ - .word gActiveBank\n\ - .word gBattlePartyID\n\ - .word gBattleTextBuff2\n\ - .word gLastUsedAbility\n\ -._1442:\n\ - mov r5, r8\n\ - strb r1, [r5]\n\ - ldr r0, [r2]\n\ - ldr r1, ._1532\n\ - and r0, r0, r1\n\ - str r0, [r2]\n\ - bl BattleScriptPushCursor\n\ - ldr r1, ._1532 + 4\n\ - ldr r0, ._1532 + 8\n\ - str r0, [r1]\n\ -._1525:\n\ - ldr r0, ._1532 + 12\n\ - ldr r1, ._1532 + 16\n\ - add r0, r0, r1\n\ - strb r4, [r0]\n\ -._1392:\n\ - mov r0, r9\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ - b ._1534\n\ -._1533:\n\ - .align 2, 0\n\ -._1532:\n\ - .word 0xfff7ffff\n\ - .word gBattlescriptCurrInstr\n\ - .word gUnknown_081D9795\n\ - .word +0x2000000\n\ - .word 0x160dd\n\ -._762:\n\ - mov r4, #0x0\n\ - ldr r0, ._1541\n\ - ldrb r1, [r0]\n\ - cmp r4, r1\n\ - bge ._1534 @cond_branch\n\ - ldr r0, ._1541 + 4\n\ - add r2, r1, #0\n\ - add r1, r0, #0\n\ - add r1, r1, #0x20\n\ - ldr r3, ._1541 + 8\n\ -._1537:\n\ - ldrb r0, [r1]\n\ - cmp r0, r6\n\ - bne ._1536 @cond_branch\n\ - cmp r4, sl\n\ - beq ._1536 @cond_branch\n\ - strb r6, [r3]\n\ - mov r0, r9\n\ - add r0, r0, #0x1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r9, r0\n\ -._1536:\n\ - add r1, r1, #0x58\n\ - add r4, r4, #0x1\n\ - cmp r4, r2\n\ - blt ._1537 @cond_branch\n\ -._1534:\n\ - mov r2, r9\n\ - cmp r2, #0\n\ - beq ._1540 @cond_branch\n\ -._916:\n\ - ldr r3, [sp, #0x4]\n\ - cmp r3, #0xb\n\ - bhi ._1540 @cond_branch\n\ - ldr r1, ._1541 + 8\n\ - ldrb r0, [r1]\n\ - cmp r0, #0xff\n\ - beq ._1540 @cond_branch\n\ - add r1, r0, #0\n\ - mov r0, sl\n\ - bl RecordAbilityBattle\n\ -._1540:\n\ - mov r0, r9\n\ - add sp, sp, #0x28\n\ - pop {r3, r4, r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov sl, r5\n\ - pop {r4, r5, r6, r7}\n\ - pop {r1}\n\ - bx r1\n\ -._1542:\n\ - .align 2, 0\n\ -._1541:\n\ - .word gNoOfAllBanks\n\ - .word gBattleMons\n\ - .word gLastUsedAbility"); -} -#else u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) { u8 effect = 0; @@ -5796,17 +1738,14 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) else moveType = gBattleMoves[move].type; - //_080184AC switch (caseID) { case ABILITYEFFECT_ON_SWITCHIN: // 0 - //_08018518 if (gBankAttacker >= gNoOfAllBanks) gBankAttacker = bank; switch (gLastUsedAbility) { case 0xFF: //weather from overworld - //_08018586 switch (GetCurrentWeather()) { case WEATHER_RAIN_LIGHT: @@ -5846,7 +1785,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_DRIZZLE: - //_08018680 if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) { gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY); @@ -5856,7 +1794,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_SAND_STREAM: - //_080186B8 if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT)) { gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); @@ -5866,7 +1803,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_DROUGHT: - //_080186F0 if (!(gBattleWeather & WEATHER_SUN_PERMANENT)) { gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); @@ -5876,7 +1812,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_INTIMIDATE: - //_08018728 if (!(gSpecialStatuses[bank].intimidatedPoke)) { gStatuses3[bank] |= STATUS3_INTIMIDATE_POKES; @@ -5884,7 +1819,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_FORECAST: - //_0801875C effect = CastformDataTypeChange(bank); if (effect != 0) { @@ -5894,7 +1828,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_TRACE: - //_080187A0 if (!(gSpecialStatuses[bank].traced)) { gStatuses3[bank] |= STATUS3_TRACE; @@ -5903,7 +1836,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) break; case ABILITY_CLOUD_NINE: case ABILITY_AIR_LOCK: - //_080187DC { // that's a weird choice for a variable, why not use i or bank? for (target1 = 0; target1 < gNoOfAllBanks; target1++) @@ -5922,7 +1854,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_ENDTURN: // 1 - //_08018814 if (gBattleMons[bank].hp != 0) { gBankAttacker = bank; @@ -5982,7 +1913,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_MOVES_BLOCK: // 2 - //_08018A40 if (gLastUsedAbility == ABILITY_SOUNDPROOF) { for (i = 0; gSoundMovesTable[i] != 0xFFFF; i++) @@ -6000,7 +1930,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_ABSORBING: // 3 - //_08018AD8 if (move) { switch (gLastUsedAbility) @@ -6070,11 +1999,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_CONTACT: // 4 - //_08018CF0 switch (gLastUsedAbility) { case ABILITY_COLOR_CHANGE: - //_08018DCC if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) && move != MOVE_STRUGGLE && gBattleMoves[move].power != 0 @@ -6095,7 +2022,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_ROUGH_SKIN: - //_08018E94 if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) && gBattleMons[gBankAttacker].hp != 0 && !gProtectStructs[gBankAttacker].confusionSelfDmg @@ -6111,100 +2037,195 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITY_EFFECT_SPORE: - //_08018F54 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (Random() % 10) == 0) - { - do - { - gBattleCommunication[MOVE_EFFECT_BYTE] = Random() & 3; - } while (gBattleCommunication[MOVE_EFFECT_BYTE] == 0); - if (gBattleCommunication[MOVE_EFFECT_BYTE] == 3) - gBattleCommunication[MOVE_EFFECT_BYTE] += 2; - gBattleCommunication[MOVE_EFFECT_BYTE] += 0x40; - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } + if (DEBUG && (gUnknown_02023A14_50 & 4)) + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)) + { + do + { + gBattleCommunication[MOVE_EFFECT_BYTE] = Random() & 3; + } while (gBattleCommunication[MOVE_EFFECT_BYTE] == 0); + if (gBattleCommunication[MOVE_EFFECT_BYTE] == 3) + gBattleCommunication[MOVE_EFFECT_BYTE] += 2; + gBattleCommunication[MOVE_EFFECT_BYTE] += 0x40; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } + else + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (Random() % 10) == 0) + { + do + { + gBattleCommunication[MOVE_EFFECT_BYTE] = Random() & 3; + } while (gBattleCommunication[MOVE_EFFECT_BYTE] == 0); + if (gBattleCommunication[MOVE_EFFECT_BYTE] == 3) + gBattleCommunication[MOVE_EFFECT_BYTE] += 2; + gBattleCommunication[MOVE_EFFECT_BYTE] += 0x40; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } break; case ABILITY_POISON_POINT: - //_0801904C - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (Random() % 3) == 0) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 0x42; - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } + if (DEBUG && (gUnknown_02023A14_50 & 4)) + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x42; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } + else + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (Random() % 3) == 0) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x42; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } break; case ABILITY_STATIC: - //_08019128 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (Random() % 3) == 0) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 0x45; - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } + if (DEBUG && (gUnknown_02023A14_50 & 4)) + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT)) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x45; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } + else + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (Random() % 3) == 0) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x45; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } break; case ABILITY_FLAME_BODY: - //_08019204 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && (Random() % 3) == 0) - { - gBattleCommunication[MOVE_EFFECT_BYTE] = 0x43; - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; - gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; - effect++; - } + if (DEBUG && (gUnknown_02023A14_50 & 4)) + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special)) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x43; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } + else + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && (Random() % 3) == 0) + { + gBattleCommunication[MOVE_EFFECT_BYTE] = 0x43; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_ApplySecondaryEffect; + gHitMarker |= HITMARKER_IGNORE_SAFEGUARD; + effect++; + } + } break; case ABILITY_CUTE_CHARM: - //_080192E0 - if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) - && gBattleMons[gBankAttacker].hp != 0 - && !gProtectStructs[gBankAttacker].confusionSelfDmg - && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) - && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) - && gBattleMons[gBankTarget].hp != 0 - && (Random() % 3) == 0 - && gBattleMons[gBankAttacker].ability != ABILITY_OBLIVIOUS - && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) - && !(gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) - && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != 0xFF - && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != 0xFF) - { - gBattleMons[gBankAttacker].status2 |= (gBitTable[gBankTarget] << 0x10); - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_CuteCharmActivates; - effect++; - } + if (DEBUG && (gUnknown_02023A14_50 & 4)) + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && gBattleMons[gBankTarget].hp != 0 + && gBattleMons[gBankAttacker].ability != ABILITY_OBLIVIOUS + && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) + && !(gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) + && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != 0xFF + && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != 0xFF) + { + gBattleMons[gBankAttacker].status2 |= (gBitTable[gBankTarget] << 0x10); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_CuteCharmActivates; + effect++; + } + } + else + { + if (!(gBattleMoveFlags & MOVESTATUS_NOEFFECT) + && gBattleMons[gBankAttacker].hp != 0 + && !gProtectStructs[gBankAttacker].confusionSelfDmg + && (gBattleMoves[move].flags & FLAG_MAKES_CONTACT) + && (gSpecialStatuses[gBankTarget].moveturnLostHP_physical || gSpecialStatuses[gBankTarget].moveturnLostHP_special) + && gBattleMons[gBankTarget].hp != 0 + && (Random() % 3) == 0 + && gBattleMons[gBankAttacker].ability != ABILITY_OBLIVIOUS + && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) + && !(gBattleMons[gBankAttacker].status2 & STATUS2_INFATUATION) + && GetGenderFromSpeciesAndPersonality(speciesAtk, pidAtk) != 0xFF + && GetGenderFromSpeciesAndPersonality(speciesDef, pidDef) != 0xFF) + { + gBattleMons[gBankAttacker].status2 |= (gBitTable[gBankTarget] << 0x10); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_CuteCharmActivates; + effect++; + } + } break; } break; case ABILITYEFFECT_IMMUNITY: // 5 - //_08019448 { for (bank = 0; bank < gNoOfAllBanks; bank++) { @@ -6288,7 +2309,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_FORECAST: // 6 - //_080197B4 { for (bank = 0; bank < gNoOfAllBanks; bank++) { @@ -6307,7 +2327,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_SYNCHRONIZE: // 7 - //_08019804 if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) { gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); @@ -6323,7 +2342,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_ATK_SYNCHRONIZE: // 8 - //_08019880 if (gLastUsedAbility == ABILITY_SYNCHRONIZE && (gHitMarker & HITMARKER_SYNCHRONISE_EFFECT)) { gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); @@ -6339,7 +2357,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_INTIMIDATE1: // 9 - //_080198FC for (i = 0; i < gNoOfAllBanks; i++) { if (gBattleMons[i].ability == ABILITY_INTIMIDATE && gStatuses3[i] & STATUS3_INTIMIDATE_POKES) @@ -6354,7 +2371,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_TRACE: // 11 - //_08019940 for (i = 0; i < gNoOfAllBanks; i++) { if (gBattleMons[i].ability == ABILITY_TRACE && (gStatuses3[i] & STATUS3_TRACE)) @@ -6368,7 +2384,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0 && gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0) { - //_080199AE gActiveBank = GetBankByIdentity(((Random() & 1) * 2) | side); gBattleMons[i].ability = gBattleMons[gActiveBank].ability; gLastUsedAbility = gBattleMons[gActiveBank].ability; @@ -6376,7 +2391,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } else if (gBattleMons[target1].ability != 0 && gBattleMons[target1].hp != 0) { - //_08019A34 gActiveBank = target1; gBattleMons[i].ability = gBattleMons[gActiveBank].ability; gLastUsedAbility = gBattleMons[gActiveBank].ability; @@ -6384,7 +2398,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } else if (gBattleMons[target2].ability != 0 && gBattleMons[target2].hp != 0) { - //_08019A78 gActiveBank = target2; gBattleMons[i].ability = gBattleMons[gActiveBank].ability; gLastUsedAbility = gBattleMons[gActiveBank].ability; @@ -6392,7 +2405,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } } else - //_08019ABC { gActiveBank = target1; if (gBattleMons[target1].ability && gBattleMons[target1].hp) @@ -6424,7 +2436,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_INTIMIDATE2: // 10 - //_08019B1C for (i = 0; i < gNoOfAllBanks; i++) { if (gBattleMons[i].ability == ABILITY_INTIMIDATE && (gStatuses3[i] & STATUS3_INTIMIDATE_POKES)) @@ -6440,7 +2451,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_CHECK_OTHER_SIDE: // 12 - //_08019B60 side = GetBankSide(bank); for (i = 0; i < gNoOfAllBanks; i++) { @@ -6452,7 +2462,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_CHECK_BANK_SIDE: // 13 - //_08019BBC side = GetBankSide(bank); for (i = 0; i < gNoOfAllBanks; i++) { @@ -6464,7 +2473,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_FIELD_SPORT: // 14 - //_08019C18 switch (gLastUsedAbility) { case 0xFD: @@ -6494,7 +2502,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_CHECK_ON_FIELD: // 19 - //_08019CD4 for (i = 0; i < gNoOfAllBanks; i++) { if (gBattleMons[i].ability == ability && gBattleMons[i].hp != 0) @@ -6505,7 +2512,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_CHECK_FIELD_EXCEPT_BANK: // 15 - //_08019D18 for (i = 0; i < gNoOfAllBanks; i++) { if (gBattleMons[i].ability == ability && i != bank) @@ -6516,7 +2522,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_COUNT_OTHER_SIZE: // 16 - //_08019D5C side = GetBankSide(bank); for (i = 0; i < gNoOfAllBanks; i++) { @@ -6528,7 +2533,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_COUNT_BANK_SIDE: // 17 - //_08019DB8 side = GetBankSide(bank); for (i = 0; i < gNoOfAllBanks; i++) { @@ -6540,7 +2544,6 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; case ABILITYEFFECT_COUNT_ON_FIELD: // 18 - //_08019F44 for (i = 0; i < gNoOfAllBanks; i++) { if (gBattleMons[i].ability == ability && i != bank) @@ -6551,14 +2554,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) } break; } - //_08019F76 if (effect && caseID < 0xC && gLastUsedAbility != 0xFF) RecordAbilityBattle(bank, gLastUsedAbility); } return effect; } -#endif void BattleScriptExecute(const u8* BS_ptr) { -- cgit v1.2.3 From 94c9998804e9da20edf5e7285603c3e03b07e3c5 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 24 Jan 2018 18:58:29 -0600 Subject: integrate debug IsMonDisobedient --- src/battle/battle_util.c | 440 ++--------------------------------------------- 1 file changed, 18 insertions(+), 422 deletions(-) diff --git a/src/battle/battle_util.c b/src/battle/battle_util.c index faa395a97..194a002d3 100644 --- a/src/battle/battle_util.c +++ b/src/battle/battle_util.c @@ -3439,417 +3439,6 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) //get move target return targetBank; } -#if DEBUG -__attribute__((naked)) -u8 IsMonDisobedient(void) -{ - asm("\ - push {r4, r5, r6, r7, lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6, r7}\n\ - add sp, sp, #0xfffffff0\n\ - ldr r0, ._1785\n\ - ldrh r1, [r0]\n\ - mov r0, #0x2\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1791 @cond_branch\n\ - ldr r4, ._1785 + 4\n\ - ldrb r0, [r4]\n\ - bl GetBankSide\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x1\n\ - beq ._1791 @cond_branch\n\ - ldr r2, ._1785 + 8\n\ - ldrb r1, [r4]\n\ - mov r0, #0x58\n\ - mul r1, r1, r0\n\ - add r0, r2, #0\n\ - add r0, r0, #0x54\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - add r2, r2, #0x3c\n\ - add r1, r1, r2\n\ - bl IsOtherTrainer\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1791 @cond_branch\n\ - ldr r0, ._1785 + 12\n\ - ldrb r1, [r0]\n\ - mov r0, #0x40\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1783 @cond_branch\n\ - mov r0, #0xa\n\ - b ._1784\n\ -._1786:\n\ - .align 2, 0\n\ -._1785:\n\ - .word gBattleTypeFlags\n\ - .word gBankAttacker\n\ - .word gBattleMons\n\ - .word gUnknown_02023A14_50\n\ -._1783:\n\ - ldr r0, ._1794\n\ - bl FlagGet\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1791 @cond_branch\n\ - mov r1, #0xa\n\ - mov r8, r1\n\ - ldr r0, ._1794 + 4\n\ - bl FlagGet\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1788 @cond_branch\n\ - mov r2, #0x1e\n\ - mov r8, r2\n\ -._1788:\n\ - ldr r0, ._1794 + 8\n\ - bl FlagGet\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1789 @cond_branch\n\ - mov r4, #0x32\n\ - mov r8, r4\n\ -._1789:\n\ - ldr r0, ._1794 + 12\n\ - bl FlagGet\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1790 @cond_branch\n\ - mov r0, #0x46\n\ -._1784:\n\ - mov r8, r0\n\ -._1790:\n\ - ldr r5, ._1794 + 16\n\ - ldr r7, ._1794 + 20\n\ - ldrb r0, [r7]\n\ - mov r6, #0x58\n\ - mul r0, r0, r6\n\ - add r0, r0, r5\n\ - add r0, r0, #0x2a\n\ - ldrb r0, [r0]\n\ - cmp r0, r8\n\ - bls ._1791 @cond_branch\n\ - bl Random\n\ - mov r1, #0xff\n\ - and r1, r1, r0\n\ - ldrb r0, [r7]\n\ - add r2, r0, #0\n\ - mul r2, r2, r6\n\ - add r0, r2, r5\n\ - add r0, r0, #0x2a\n\ - ldrb r0, [r0]\n\ - add r0, r0, r8\n\ - mul r0, r0, r1\n\ - asr r4, r0, #0x8\n\ - cmp r4, r8\n\ - bge ._1792 @cond_branch\n\ -._1791:\n\ - mov r0, #0x0\n\ - b ._1823\n\ -._1795:\n\ - .align 2, 0\n\ -._1794:\n\ - .word 0x80e\n\ - .word 0x808\n\ - .word 0x80a\n\ - .word 0x80c\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ -._1792:\n\ - ldr r3, ._1801\n\ - ldrh r0, [r3]\n\ - cmp r0, #0x63\n\ - bne ._1796 @cond_branch\n\ - add r0, r5, #0\n\ - add r0, r0, #0x50\n\ - add r0, r2, r0\n\ - ldr r1, [r0]\n\ - ldr r2, ._1801 + 4\n\ - and r1, r1, r2\n\ - str r1, [r0]\n\ -._1796:\n\ - ldrb r0, [r7]\n\ - mul r0, r0, r6\n\ - add r1, r5, #0\n\ - add r1, r1, #0x4c\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x7\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1799 @cond_branch\n\ - ldrh r0, [r3]\n\ - cmp r0, #0xad\n\ - beq ._1798 @cond_branch\n\ - cmp r0, #0xd6\n\ - bne ._1799 @cond_branch\n\ -._1798:\n\ - ldr r1, ._1801 + 8\n\ - ldr r0, ._1801 + 12\n\ - b ._1819\n\ -._1802:\n\ - .align 2, 0\n\ -._1801:\n\ - .word gCurrentMove\n\ - .word 0xff7fffff\n\ - .word gBattlescriptCurrInstr\n\ - .word gUnknown_081D995F\n\ -._1799:\n\ - bl Random\n\ - mov r5, #0xff\n\ - add r1, r5, #0\n\ - and r1, r1, r0\n\ - ldr r6, ._1808\n\ - ldr r2, ._1808 + 4\n\ - mov r9, r2\n\ - ldrb r3, [r2]\n\ - mov r7, #0x58\n\ - add r0, r3, #0\n\ - mul r0, r0, r7\n\ - add r0, r0, r6\n\ - add r0, r0, #0x2a\n\ - ldrb r2, [r0]\n\ - mov r4, r8\n\ - add r0, r2, r4\n\ - mul r0, r0, r1\n\ - asr r4, r0, #0x8\n\ - cmp r4, r8\n\ - bge ._1803 @cond_branch\n\ - ldr r7, ._1808 + 8\n\ - ldr r5, ._1808 + 12\n\ - ldrb r0, [r5]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r7\n\ - ldrb r1, [r0]\n\ - add r0, r3, #0\n\ - mov r2, #0xff\n\ - bl CheckMoveLimitations\n\ - lsl r0, r0, #0x18\n\ - lsr r4, r0, #0x18\n\ - cmp r4, #0xf\n\ - bne ._1804 @cond_branch\n\ - b ._1805\n\ -._1804:\n\ - add r6, r5, #0\n\ - ldr r0, ._1808 + 16\n\ - mov r9, r0\n\ - mov r1, #0x3\n\ - mov r8, r1\n\ -._1806:\n\ - bl Random\n\ - mov r2, r8\n\ - and r0, r0, r2\n\ - mov r1, r9\n\ - strb r0, [r1]\n\ - strb r0, [r6]\n\ - ldrb r0, [r6]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r7\n\ - ldr r5, [r0]\n\ - and r5, r5, r4\n\ - cmp r5, #0\n\ - bne ._1806 @cond_branch\n\ - ldr r4, ._1808 + 20\n\ - ldr r3, ._1808\n\ - ldr r0, ._1808 + 12\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x1\n\ - ldr r1, ._1808 + 4\n\ - ldrb r2, [r1]\n\ - mov r1, #0x58\n\ - mul r1, r1, r2\n\ - add r0, r0, r1\n\ - add r3, r3, #0xc\n\ - add r0, r0, r3\n\ - ldrh r0, [r0]\n\ - strh r0, [r4]\n\ - ldr r0, ._1808 + 24\n\ - strb r5, [r0, #0x3]\n\ - ldr r0, ._1808 + 28\n\ - mov r1, #0x0\n\ - strh r5, [r0]\n\ - ldr r0, ._1808 + 32\n\ - ldr r2, ._1808 + 36\n\ - add r0, r0, r2\n\ - strb r1, [r0]\n\ - ldr r1, ._1808 + 40\n\ - ldr r0, ._1808 + 44\n\ - str r0, [r1]\n\ - ldrh r0, [r4]\n\ - mov r1, #0x0\n\ - bl GetMoveTarget\n\ - ldr r1, ._1808 + 48\n\ - strb r0, [r1]\n\ - ldr r2, ._1808 + 52\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0xe\n\ - b ._1807\n\ -._1809:\n\ - .align 2, 0\n\ -._1808:\n\ - .word gBattleMons\n\ - .word gBankAttacker\n\ - .word gBitTable\n\ - .word gCurrMovePos\n\ - .word gUnknown_02024BE5\n\ - .word gRandomMove\n\ - .word gBattleCommunication\n\ - .word gDynamicBasePower\n\ - .word +0x2000000\n\ - .word 0x1601c\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_IgnoresAndUsesRandomMove\n\ - .word gBankTarget\n\ - .word gHitMarker\n\ -._1803:\n\ - mov r4, r8\n\ - sub r0, r2, r4\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - mov r8, r0\n\ - bl Random\n\ - add r4, r5, #0\n\ - and r4, r4, r0\n\ - cmp r4, r8\n\ - bge ._1818 @cond_branch\n\ - mov r1, r9\n\ - ldrb r0, [r1]\n\ - add r1, r0, #0\n\ - mul r1, r1, r7\n\ - add r0, r6, #0\n\ - add r0, r0, #0x4c\n\ - add r0, r1, r0\n\ - ldr r0, [r0]\n\ - and r0, r0, r5\n\ - cmp r0, #0\n\ - bne ._1818 @cond_branch\n\ - add r0, r1, r6\n\ - add r0, r0, #0x20\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x48\n\ - beq ._1818 @cond_branch\n\ - cmp r0, #0xf\n\ - beq ._1818 @cond_branch\n\ - mov r2, #0x0\n\ - ldr r0, ._1820\n\ - ldrb r3, [r0]\n\ - add r7, r0, #0\n\ - cmp r2, r3\n\ - bge ._1816 @cond_branch\n\ - ldr r0, [r6, #0x50]\n\ - mov r1, #0x70\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1816 @cond_branch\n\ - add r1, r6, #0\n\ - add r1, r1, #0x50\n\ - mov r5, #0x70\n\ -._1817:\n\ - add r1, r1, #0x58\n\ - add r2, r2, #0x1\n\ - cmp r2, r3\n\ - bge ._1816 @cond_branch\n\ - ldr r0, [r1]\n\ - and r0, r0, r5\n\ - cmp r0, #0\n\ - beq ._1817 @cond_branch\n\ -._1816:\n\ - ldrb r7, [r7]\n\ - cmp r2, r7\n\ - bne ._1818 @cond_branch\n\ - ldr r1, ._1820 + 4\n\ - ldr r0, ._1820 + 8\n\ - b ._1819\n\ -._1821:\n\ - .align 2, 0\n\ -._1820:\n\ - .word gNoOfAllBanks\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_IgnoresAndFallsAsleep\n\ -._1818:\n\ - mov r2, r8\n\ - sub r4, r4, r2\n\ - cmp r4, r8\n\ - blt ._1822 @cond_branch\n\ -._1805:\n\ - bl Random\n\ - ldr r2, ._1824\n\ - mov r1, #0x3\n\ - and r1, r1, r0\n\ - strb r1, [r2, #0x5]\n\ - ldr r1, ._1824 + 4\n\ - ldr r0, ._1824 + 8\n\ -._1819:\n\ - str r0, [r1]\n\ - mov r0, #0x1\n\ - b ._1823\n\ -._1825:\n\ - .align 2, 0\n\ -._1824:\n\ - .word gBattleCommunication\n\ - .word gBattlescriptCurrInstr\n\ - .word BattleScript_MoveUsedLoafingAround\n\ -._1822:\n\ - ldr r4, ._1826\n\ - ldrb r1, [r4]\n\ - mov r0, #0x58\n\ - mul r1, r1, r0\n\ - ldr r0, ._1826 + 4\n\ - add r1, r1, r0\n\ - mov r0, #0x28\n\ - str r0, [sp]\n\ - mov r0, #0x0\n\ - str r0, [sp, #0x4]\n\ - ldrb r0, [r4]\n\ - str r0, [sp, #0x8]\n\ - ldrb r0, [r4]\n\ - str r0, [sp, #0xc]\n\ - add r0, r1, #0\n\ - mov r2, #0x1\n\ - mov r3, #0x0\n\ - bl CalculateBaseDamage\n\ - ldr r1, ._1826 + 8\n\ - str r0, [r1]\n\ - ldr r1, ._1826 + 12\n\ - ldrb r0, [r4]\n\ - strb r0, [r1]\n\ - ldr r1, ._1826 + 16\n\ - ldr r0, ._1826 + 20\n\ - str r0, [r1]\n\ - ldr r2, ._1826 + 24\n\ - ldr r0, [r2]\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0xc\n\ -._1807:\n\ - orr r0, r0, r1\n\ - str r0, [r2]\n\ - mov r0, #0x2\n\ -._1823:\n\ - add sp, sp, #0x10\n\ - pop {r3, r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4, r5, r6, r7}\n\ - pop {r1}\n\ - bx r1\n\ -._1827:\n\ - .align 2, 0\n\ -._1826:\n\ - .word gBankAttacker\n\ - .word gBattleMons\n\ - .word gBattleMoveDamage\n\ - .word gBankTarget\n\ - .word gBattlescriptCurrInstr\n\ - .word gUnknown_081D99A0\n\ - .word gHitMarker"); -} -#else u8 IsMonDisobedient(void) { u8 obedienceLevel; @@ -3858,17 +3447,25 @@ u8 IsMonDisobedient(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK || GetBankSide(gBankAttacker) == 1 - || !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName) - || FlagGet(FLAG_BADGE08_GET)) - return 0; + || !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName)) + return 0; - obedienceLevel = 10; - if (FlagGet(FLAG_BADGE02_GET)) - obedienceLevel = 30; - if (FlagGet(FLAG_BADGE04_GET)) - obedienceLevel = 50; - if (FlagGet(FLAG_BADGE06_GET)) - obedienceLevel = 70; + if (DEBUG && (gUnknown_02023A14_50 & 0x40)) + { + obedienceLevel = 10; + } + else + { + if (FlagGet(FLAG_BADGE08_GET)) + return 0; + obedienceLevel = 10; + if (FlagGet(FLAG_BADGE02_GET)) + obedienceLevel = 30; + if (FlagGet(FLAG_BADGE04_GET)) + obedienceLevel = 50; + if (FlagGet(FLAG_BADGE06_GET)) + obedienceLevel = 70; + } if (gBattleMons[gBankAttacker].level <= obedienceLevel) return 0; @@ -3950,4 +3547,3 @@ u8 IsMonDisobedient(void) } } } -#endif -- cgit v1.2.3 From 8cce68537704adb0d1d34a96fa977675ad1a0340 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 24 Jan 2018 20:11:06 -0600 Subject: integrate debug functions in field_control_avatar.c --- include/debug.h | 3 + include/field_control_avatar.h | 1 + include/field_fadetransition.h | 1 + src/field/field_control_avatar.c | 537 ++++++--------------------------------- src/scene/new_game.c | 4 - 5 files changed, 82 insertions(+), 464 deletions(-) diff --git a/include/debug.h b/include/debug.h index 713b21ec5..2136dbfb8 100644 --- a/include/debug.h +++ b/include/debug.h @@ -1,6 +1,9 @@ #ifndef GUARD_DEBUG_H #define GUARD_DEBUG_H +// start_menu_debug +void DebugMenu_8077048(void); + // matsuda_debug_menu void sub_80AAF30(void); void Crash(const u8 *text); diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 2d5693e40..49e9f23e3 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -36,5 +36,6 @@ bool8 sub_8068870(u16 a); bool8 sub_8068894(void); bool8 sub_8068A64(struct MapPosition *, u16); u8 sub_8068F18(void); +bool8 dive_warp(struct MapPosition *position, u16 b); #endif diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index 4377367f7..cd0cb6eab 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -27,5 +27,6 @@ void sub_8080F48(void); void sub_8080F58(void); void sub_8080F68(void); void sub_8080F9C(void); +void debug_sub_80888D8(void); #endif // GUARD_FIELD_FADETRANSITION_H diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index 9ac5ae11d..8dc1fed18 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -4,6 +4,7 @@ #include "bike.h" #include "coord_event_weather.h" #include "daycare.h" +#include "debug.h" #include "event_data.h" #include "field_fadetransition.h" #include "field_player_avatar.h" @@ -35,6 +36,7 @@ extern u16 gSpecialVar_Facing; extern struct LinkPlayerMapObject gLinkPlayerMapObjects[]; extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; +extern u8 gUnknown_020297ED; static EWRAM_DATA u8 gUnknown_0202E8C0 = 0; static EWRAM_DATA u16 gUnknown_0202E8C2 = 0; @@ -82,28 +84,28 @@ extern u8 gUnknown_081C6BDE[]; static void player_get_pos_to_and_height(struct MapPosition *); static void player_get_next_pos_and_height(struct MapPosition *); -/*static*/ u16 cur_mapdata_block_role_at_player_pos(int); -/*static*/ bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c); +static u16 cur_mapdata_block_role_at_player_pos(int); +static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c); static u8 *TryGetScriptOnPressingA(struct MapPosition *position, u8 b, u8 c); static u8 *sub_8068364(struct MapPosition *, u8, u8); static u8 *TryGetInvisibleMapObjectScript(struct MapPosition *, u8, u8 c); static u8 *sub_8068500(struct MapPosition *, u8, u8); static u8 *TryGetFieldMoveScript(struct MapPosition *, u8, u8); -/*static*/ bool32 sub_8068770(void); -/*static*/ bool32 sub_80687A4(void); -/*static*/ bool8 sub_80687E4(struct MapPosition *, u16, u16); +static bool32 sub_8068770(void); +static bool32 sub_80687A4(void); +static bool8 sub_80687E4(struct MapPosition *, u16, u16); static void happiness_algorithm_step(void); static bool8 overworld_poison_step(void); -/*static*/ bool8 is_it_battle_time_3(u16); -/*static*/ bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *, u16, u8); +static bool8 is_it_battle_time_3(u16); +static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *, u16, u8); static bool8 sub_8068B30(u16); static bool8 is_non_stair_warp_tile(u16, u8); static s8 map_warp_check_packed(struct MapHeader *, struct MapPosition *); static void sub_8068C30(struct MapHeader *, s8, struct MapPosition *); -/*static*/ bool8 map_warp_consider_2_to_inside(struct MapPosition *, u16, u8); +static bool8 map_warp_consider_2_to_inside(struct MapPosition *, u16, u8); static s8 map_warp_check(struct MapHeader *, u16, u16, u8); static u8 *mapheader_trigger_activate_at(struct MapHeader *, u16, u16, u8); -static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *, u16, u16, u8); +static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *, u16, u16, u8);; void FieldClearPlayerInput(struct FieldInput *input) { @@ -122,230 +124,6 @@ void FieldClearPlayerInput(struct FieldInput *input) input->dpadDirection = 0; } -#if DEBUG -__attribute__((naked)) -void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " add r4, r0, #0\n" - " lsl r1, r1, #0x10\n" - " lsr r1, r1, #0x10\n" - " mov r8, r1\n" - " lsl r2, r2, #0x10\n" - " lsr r5, r2, #0x10\n" - " ldr r0, ._17\n" - " ldrb r6, [r0, #0x3]\n" - " ldrb r0, [r0, #0x2]\n" - " mov r9, r0\n" - " bl cur_mapdata_block_role_at_player_pos\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl MetatileBehavior_IsMoveTile\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " cmp r6, #0x2\n" - " bne ._1 @cond_branch\n" - " cmp r7, #0\n" - " beq ._2 @cond_branch\n" - "._1:\n" - " cmp r6, #0\n" - " bne ._9 @cond_branch\n" - "._2:\n" - " bl GetPlayerSpeed\n" - " lsl r0, r0, #0x10\n" - " asr r0, r0, #0x10\n" - " cmp r0, #0x4\n" - " beq ._8 @cond_branch\n" - " mov r0, #0x8\n" - " mov r1, r8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._5 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x4\n" - " orr r0, r0, r1\n" - " strb r0, [r4]\n" - "._5:\n" - " mov r0, #0x4\n" - " mov r3, r8\n" - " and r0, r0, r3\n" - " cmp r0, #0\n" - " beq ._6 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x8\n" - " orr r0, r0, r1\n" - " strb r0, [r4]\n" - "._6:\n" - " mov r0, #0x1\n" - " mov r1, r8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._7 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x1\n" - " orr r0, r0, r1\n" - " strb r0, [r4]\n" - "._7:\n" - " mov r0, #0x2\n" - " mov r3, r8\n" - " and r0, r0, r3\n" - " cmp r0, #0\n" - " beq ._8 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x80\n" - " orr r0, r0, r1\n" - " strb r0, [r4]\n" - "._8:\n" - " mov r0, #0xf0\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._9 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x10\n" - " orr r0, r0, r1\n" - " mov r1, #0x20\n" - " orr r0, r0, r1\n" - " strb r0, [r4]\n" - "._9:\n" - " cmp r7, #0\n" - " bne ._14 @cond_branch\n" - " cmp r6, #0x2\n" - " bne ._12 @cond_branch\n" - " mov r0, r9\n" - " cmp r0, #0x2\n" - " bne ._12 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x40\n" - " orr r0, r0, r1\n" - " strb r0, [r4]\n" - "._12:\n" - " cmp r7, #0\n" - " bne ._14 @cond_branch\n" - " cmp r6, #0x2\n" - " bne ._14 @cond_branch\n" - " ldrb r0, [r4]\n" - " mov r1, #0x2\n" - " orr r0, r0, r1\n" - " strb r0, [r4]\n" - "._14:\n" - " mov r0, #0x40\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._15 @cond_branch\n" - " mov r0, #0x2\n" - " b ._22\n" - "._18:\n" - " .align 2, 0\n" - "._17:\n" - " .word gPlayerAvatar\n" - "._15:\n" - " mov r0, #0x80\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._19 @cond_branch\n" - " mov r0, #0x1\n" - " b ._22\n" - "._19:\n" - " mov r0, #0x20\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._21 @cond_branch\n" - " mov r0, #0x3\n" - " b ._22\n" - "._21:\n" - " mov r0, #0x10\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._23 @cond_branch\n" - " mov r0, #0x4\n" - "._22:\n" - " strb r0, [r4, #0x2]\n" - "._23:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._25 @cond_branch\n" - " ldrb r2, [r4]\n" - " mov r0, #0x4\n" - " and r0, r0, r2\n" - " cmp r0, #0\n" - " beq ._25 @cond_branch\n" - " ldrb r0, [r4, #0x1]\n" - " mov r1, #0x4\n" - " orr r0, r0, r1\n" - " strb r0, [r4, #0x1]\n" - " mov r0, #0x5\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " strb r0, [r4]\n" - "._25:\n" - " ldr r0, ._30\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._29 @cond_branch\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._28 @cond_branch\n" - " ldrb r1, [r4, #0x1]\n" - " mov r0, #0x2\n" - " orr r1, r1, r0\n" - " strb r1, [r4, #0x1]\n" - " ldrb r0, [r4]\n" - " mov r2, #0x41\n" - " neg r2, r2\n" - " and r2, r2, r0\n" - " mov r0, #0x3\n" - " neg r0, r0\n" - " and r2, r2, r0\n" - " sub r0, r0, #0xe\n" - " and r2, r2, r0\n" - " sub r0, r0, #0x10\n" - " and r2, r2, r0\n" - " strb r2, [r4]\n" - " mov r0, #0x4\n" - " mov r3, r8\n" - " and r0, r0, r3\n" - " cmp r0, #0\n" - " beq ._28 @cond_branch\n" - " mov r0, #0x1\n" - " orr r1, r1, r0\n" - " strb r1, [r4, #0x1]\n" - " mov r0, #0x9\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " strb r0, [r4]\n" - "._28:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r5\n" - " cmp r0, #0\n" - " beq ._29 @cond_branch\n" - " ldrb r0, [r4, #0x1]\n" - " mov r1, #0x8\n" - " orr r0, r0, r1\n" - " strb r0, [r4, #0x1]\n" - "._29:\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._31:\n" - " .align 2, 0\n" - "._30:\n" - " .word gUnknown_020297ED\n" - "\n" - ); -} -#else void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) { u8 r6 = gPlayerAvatar.tileTransitionState; @@ -386,223 +164,33 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) input->dpadDirection = DIR_WEST; else if (heldKeys & DPAD_RIGHT) input->dpadDirection = DIR_EAST; -} -#endif - #if DEBUG -__attribute__((naked)) -int sub_8068024(struct FieldInput *input) -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xfffffff8\n" - " add r5, r0, #0\n" - " bl player_get_direction_lower_nybble\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " mov r4, sp\n" - " mov r0, sp\n" - " bl player_get_pos_to_and_height\n" - " mov r0, sp\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " mov r2, #0x2\n" - " ldsh r1, [r4, r2]\n" - " bl MapGridGetMetatileBehaviorAt\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " ldrb r1, [r5, #0x1]\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._33 @cond_branch\n" - " mov r0, sp\n" - " add r1, r4, #0\n" - " bl dive_warp\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bne ._33 @cond_branch\n" - " b ._63\n" - "._33:\n" - " ldrb r1, [r5, #0x1]\n" - " mov r6, #0x2\n" - " add r0, r6, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._39 @cond_branch\n" - " bl CheckTrainers\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bne ._36 @cond_branch\n" - " b ._63\n" - "._36:\n" - " ldrb r1, [r5, #0x1]\n" - " add r0, r6, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._39 @cond_branch\n" - " bl mapheader_run_first_tag2_script_list_match\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bne ._39 @cond_branch\n" - " b ._63\n" - "._39:\n" - " ldrb r1, [r5]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._42 @cond_branch\n" - " bl sub_80687A4\n" - " cmp r0, #0x1\n" - " bne ._42 @cond_branch\n" - " b ._63\n" - "._42:\n" - " ldrb r1, [r5]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._44 @cond_branch\n" - " mov r0, #0x5\n" - " bl IncrementGameStat\n" - " mov r0, sp\n" - " add r1, r4, #0\n" - " add r2, r7, #0\n" - " bl sub_80687E4\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._63 @cond_branch\n" - "._44:\n" - " ldrb r1, [r5]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._46 @cond_branch\n" - " add r0, r4, #0\n" - " bl is_it_battle_time_3\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._63 @cond_branch\n" - "._46:\n" - " ldrb r1, [r5]\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._49 @cond_branch\n" - " ldrb r0, [r5, #0x2]\n" - " cmp r0, r7\n" - " bne ._49 @cond_branch\n" - " mov r0, sp\n" - " add r1, r4, #0\n" - " add r2, r7, #0\n" - " bl mapheader_run_first_tag2_script_list_match_conditionally\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._63 @cond_branch\n" - "._49:\n" - " mov r4, sp\n" - " mov r0, sp\n" - " bl player_get_next_pos_and_height\n" - " mov r0, sp\n" - " mov r1, #0x0\n" - " ldsh r0, [r0, r1]\n" - " mov r2, #0x2\n" - " ldsh r1, [r4, r2]\n" - " bl MapGridGetMetatileBehaviorAt\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " ldrb r1, [r5]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._51 @cond_branch\n" - " mov r0, sp\n" - " add r1, r4, #0\n" - " add r2, r7, #0\n" - " bl sub_80681F0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._63 @cond_branch\n" - "._51:\n" - " ldrb r1, [r5]\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._54 @cond_branch\n" - " ldrb r0, [r5, #0x2]\n" - " cmp r0, r7\n" - " bne ._54 @cond_branch\n" - " mov r0, sp\n" - " add r1, r4, #0\n" - " add r2, r7, #0\n" - " bl map_warp_consider_2_to_inside\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " beq ._63 @cond_branch\n" - "._54:\n" - " ldrb r1, [r5]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._56 @cond_branch\n" - " bl sub_8068770\n" - " cmp r0, #0x1\n" - " beq ._63 @cond_branch\n" - "._56:\n" - " ldrb r1, [r5]\n" - " mov r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._58 @cond_branch\n" - " mov r0, #0x6\n" - " bl PlaySE\n" - " bl sub_8071310\n" - " b ._63\n" - "._58:\n" - " mov r0, #0x8\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._60 @cond_branch\n" - " bl sub_80A6D1C\n" - " cmp r0, #0x1\n" - " beq ._63 @cond_branch\n" - "._60:\n" - " ldrb r1, [r5, #0x1]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._62 @cond_branch\n" - " bl debug_sub_80888D8\n" - " b ._63\n" - "._62:\n" - " mov r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._64 @cond_branch\n" - " mov r0, #0x0\n" - " b ._65\n" - "._64:\n" - " mov r0, #0x6\n" - " bl PlaySE\n" - " bl DebugMenu_8077048\n" - "._63:\n" - " mov r0, #0x1\n" - "._65:\n" - " add sp, sp, #0x8\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + if ((heldKeys & R_BUTTON) && input->pressedStartButton) + { + input->input_field_1_2 = TRUE; + input->pressedStartButton = FALSE; + } + if (gUnknown_020297ED) + { + if (heldKeys & R_BUTTON) + { + input->input_field_1_1 = TRUE; + input->input_field_0_6 = FALSE; + input->input_field_0_1 = FALSE; + input->input_field_0_4 = FALSE; + input->input_field_0_5 = FALSE; + if (newKeys & SELECT_BUTTON) + { + input->input_field_1_0 = TRUE; + input->pressedSelectButton = FALSE; + } + } + if (heldKeys & L_BUTTON) + input->input_field_1_3 = TRUE; + } +#endif } -#else + int sub_8068024(struct FieldInput *input) { struct MapPosition position; @@ -612,10 +200,25 @@ int sub_8068024(struct FieldInput *input) r6 = player_get_direction_lower_nybble(); player_get_pos_to_and_height(&position); r4 = MapGridGetMetatileBehaviorAt(position.x, position.y); - if (CheckTrainers() == TRUE) +#if DEBUG + if (input->input_field_1_3 && dive_warp(&position, r4) == TRUE) return TRUE; - if (mapheader_run_first_tag2_script_list_match() == 1) +#endif + + if ( +#if DEBUG + !input->input_field_1_1 +#endif + && CheckTrainers() == TRUE) return TRUE; + + if ( +#if DEBUG + !input->input_field_1_1 +#endif + && mapheader_run_first_tag2_script_list_match() == 1) + return TRUE; + if (input->pressedBButton && sub_80687A4() == 1) return TRUE; if (input->input_field_0_6) @@ -650,9 +253,23 @@ int sub_8068024(struct FieldInput *input) } if (input->pressedSelectButton && sub_80A6D1C() == TRUE) return TRUE; + +#if DEBUG + if (input->input_field_1_0) + { + debug_sub_80888D8(); + return TRUE; + } + if (input->input_field_1_2) + { + PlaySE(SE_WIN_OPEN); + DebugMenu_8077048(); + return TRUE; + } +#endif + return FALSE; } -#endif static void player_get_pos_to_and_height(struct MapPosition *position) { @@ -672,7 +289,7 @@ static void player_get_next_pos_and_height(struct MapPosition *position) position->height = 0; } -/*static*/ u16 cur_mapdata_block_role_at_player_pos(int unused) +static u16 cur_mapdata_block_role_at_player_pos(int unused) { s16 x, y; @@ -680,7 +297,7 @@ static void player_get_next_pos_and_height(struct MapPosition *position) return MapGridGetMetatileBehaviorAt(x, y); } -/*static*/ bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) +static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) { u8 *script = TryGetScriptOnPressingA(position, b, c); @@ -875,7 +492,7 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2) return NULL; } -/*static*/ bool32 sub_8068770(void) +static bool32 sub_8068770(void) { if (FlagGet(FLAG_BADGE07_GET) && sub_8068F18() == 2) { @@ -885,7 +502,7 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2) return FALSE; } -/*static*/ bool32 sub_80687A4(void) +static bool32 sub_80687A4(void) { if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1) { @@ -895,7 +512,7 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2) return FALSE; } -/*static*/ bool8 sub_80687E4(struct MapPosition *position, u16 b, u16 unused) +static bool8 sub_80687E4(struct MapPosition *position, u16 b, u16 unused) { if (mapheader_trigger_activate_at__run_now(position) == TRUE) return TRUE; @@ -1015,7 +632,7 @@ void prev_quest_postbuffer_cursor_backup_reset(void) gUnknown_0202E8C0 = 0; } -/*static*/ bool8 is_it_battle_time_3(u16 a) +static bool8 is_it_battle_time_3(u16 a) { if (gUnknown_0202E8C0 < 4) { @@ -1036,7 +653,7 @@ void prev_quest_postbuffer_cursor_backup_reset(void) } } -/*static*/ bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *position, u16 b, u8 c) +static bool8 mapheader_run_first_tag2_script_list_match_conditionally(struct MapPosition *position, u16 b, u8 c) { s8 r6 = map_warp_check_packed(&gMapHeader, position); @@ -1144,7 +761,7 @@ static void sub_8068C30(struct MapHeader *unused, s8 b, struct MapPosition *posi } } -/*static*/ bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 b, u8 c) +static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 b, u8 c) { s8 r4; @@ -1250,7 +867,7 @@ static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *mapHea return NULL; } -int dive_warp(struct MapPosition *position, u16 b) +bool8 dive_warp(struct MapPosition *position, u16 b) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_805750C(b) == 0) { diff --git a/src/scene/new_game.c b/src/scene/new_game.c index cec7134a3..e64dc91e3 100644 --- a/src/scene/new_game.c +++ b/src/scene/new_game.c @@ -31,10 +31,6 @@ #include "text.h" #include "tv.h" -#if DEBUG -extern u8 gUnknown_020297ED; -#endif - EWRAM_DATA u8 gDifferentSaveFile = 0; EWRAM_DATA u8 gUnknown_020297ED = 0; -- cgit v1.2.3 From d6f6e12490f5d980c66c2de0f767bbaf8da75da1 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Wed, 24 Jan 2018 20:16:00 -0600 Subject: fix build --- src/field/field_control_avatar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index 8dc1fed18..48eb64dd7 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -207,16 +207,16 @@ int sub_8068024(struct FieldInput *input) if ( #if DEBUG - !input->input_field_1_1 + !input->input_field_1_1 && #endif - && CheckTrainers() == TRUE) + CheckTrainers() == TRUE) return TRUE; if ( #if DEBUG - !input->input_field_1_1 + !input->input_field_1_1 && #endif - && mapheader_run_first_tag2_script_list_match() == 1) + mapheader_run_first_tag2_script_list_match() == 1) return TRUE; if (input->pressedBButton && sub_80687A4() == 1) -- cgit v1.2.3 From 4c1e0b8b303320a173203b8ab94c2a695555ace3 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 25 Jan 2018 00:07:15 -0600 Subject: integrate debug functions in mail.c and decompile some debug code --- include/constants/items.h | 2 + include/easy_chat.h | 1 + src/engine/sprite.c | 2 +- src/pokemon/mail.c | 1712 +++++++++------------------------------------ 4 files changed, 347 insertions(+), 1370 deletions(-) diff --git a/include/constants/items.h b/include/constants/items.h index 9b88db1da..6f54e6ee4 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -401,4 +401,6 @@ // Check if the item is one that can be used on a Pokemon. #define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) +#define IS_ITEM_MAIL(item) ((item) >= ITEM_ORANGE_MAIL && (item) <= ITEM_RETRO_MAIL) + #endif // GUARD_CONSTANTS_ITEMS_H diff --git a/include/easy_chat.h b/include/easy_chat.h index 58750fa92..b86b166aa 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -117,6 +117,7 @@ struct Shared1000 // const pointer to shared1000. easy_chat might be two separate files. extern struct Shared1000 *const gEasyChatStruct; +void sub_80E60D8(void); void sub_80E62A0(u8 arg0, u16 *arg1, void (*arg2)(void), u8 arg3); u16 sub_80EB72C(u16 group); void sub_80EB6FC(u16 *, u16); diff --git a/src/engine/sprite.c b/src/engine/sprite.c index df8c66750..a9d84e01a 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -815,7 +815,7 @@ void ProcessSpriteCopyRequests(void) } } -/*static*/ void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images) +static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images) { if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) { diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 11851410b..16252af64 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -1,7 +1,10 @@ #include "global.h" #include "mail.h" +#include "data2.h" #include "easy_chat.h" #include "constants/items.h" +#include "constants/species.h" +#include "field_fadetransition.h" #include "graphics.h" #include "mail_data.h" #include "menu.h" @@ -10,6 +13,7 @@ #include "palette.h" #include "pokemon_icon.h" #include "overworld.h" +#include "script.h" #include "sprite.h" #include "string_util.h" #include "strings2.h" @@ -18,6 +22,8 @@ #include "scanline_effect.h" #include "ewram.h" +extern u8 (*gMenuCallback)(void); + struct UnkMailStruct { u8 unk_0_0:2; @@ -287,31 +293,6 @@ const u8 Str_8411608[] = _("メールをけす"); // Delete Mail // XXX: what is this? static u8 *const sSharedMemPtr = gSharedMem; -#if DEBUG - -const u8 Str_841160F[] = _("{STR_VAR_1} {STR_VAR_2}"); -const u8 Str_841161A[] = _("メール{STR_VAR_1} {STR_VAR_2}"); -const u8 Str_8411623[] = _("メール{STR_VAR_1}を だれに もたせる?"); -const u8 Str_8411634[] = _("000 {STR_VAR_1}"); -const u8 Str_841163B[] = _("せいきの データが とうろくずみ です\n" - "しんき とうろく できません"); -const u8 Str_841165E[] = _("せいきに とうろくされたメールデータは\n" - "へんこう できません"); -const u8 Str_841167D[] = _("メール{STR_VAR_1} とうろく かいじょ"); -const u8 Str_841168D[] = _("デバッグメニューから とうろくした\n" - "メール いがいは けせません"); -const u8 Str_84116AE[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); - -const struct MenuAction _84116BC[] = -{ - {Str_84115F4, NULL}, - {Str_84115FB, NULL}, - {Str_8411603, NULL}, - {Str_8411608, NULL}, -}; - -#endif - static u8 sub_80F8A28(void); /*static*/ void sub_80F8D50(void); static void sub_80F8DA0(void); @@ -322,226 +303,44 @@ static void sub_80F8F58(void); static void sub_80F8F78(void); static void sub_80F8FB4(void); +extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; +extern u16 gSpecialVar_0x8006; + #if DEBUG -// some debug variable, I guess. -// TODO: where exactly is this located? -__attribute__((section(".bss"))) /*static*/ u8 gUnknown_0300074C = 0; +static u8 gUnknown_Debug_0300079C; #endif -#if DEBUG -__attribute__((naked)) -void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) -{ - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r0, #0\n" - " add r6, r1, #0\n" - " lsl r2, r2, #0x18\n" - " lsr r5, r2, #0x18\n" - " ldr r0, .__3\n" - " ldrb r3, [r0]\n" - " cmp r3, #0\n" - " beq .__1 @cond_branch\n" - " ldr r2, .__3 + 4\n" - " add r1, r2, #0\n" - " add r1, r1, #0xff\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " ldr r0, .__3 + 8\n" - " ldrh r1, [r0]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x1\n" - " add r0, r2, r3\n" - " strb r1, [r0]\n" - " mov r0, #0x82\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, .__3 + 12\n" - " str r0, [r1]\n" - " add r3, r3, #0x8\n" - " add r1, r2, r3\n" - " ldr r0, .__3 + 16\n" - " str r0, [r1]\n" - " ldr r0, .__3 + 20\n" - " ldrh r1, [r0]\n" - " b .__2\n" - ".__4:\n" - " .align 2, 0\n" - ".__3:\n" - " .word gUnknown_0300074C\n" - " .word +0x2000000\n" - " .word gSpecialVar_0x8004\n" - " .word EasyChat_GetWordText+1\n" - " .word ConvertEasyChatWordsToString+1\n" - " .word gSpecialVar_0x8006\n" - ".__1:\n" - " ldr r2, .__7\n" - " add r1, r2, #0\n" - " add r1, r1, #0xff\n" - " mov r0, #0x5\n" - " strb r0, [r1]\n" - " add r0, r0, #0xfb\n" - " add r1, r2, r0\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x82\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, .__7 + 4\n" - " str r0, [r1]\n" - " mov r0, #0x84\n" - " lsl r0, r0, #0x1\n" - " add r1, r2, r0\n" - " ldr r0, .__7 + 8\n" - " str r0, [r1]\n" - " ldrh r1, [r4, #0x20]\n" - " add r0, r1, #0\n" - " sub r0, r0, #0x79\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0xb\n" - " bhi .__5 @cond_branch\n" - " sub r1, r1, #0x79\n" - ".__2:\n" - " add r0, r2, #0\n" - " add r0, r0, #0xfa\n" - " strb r1, [r0]\n" - " b .__6\n" - ".__8:\n" - " .align 2, 0\n" - ".__7:\n" - " .word +0x2000000\n" - " .word EasyChat_GetWordText+1\n" - " .word ConvertEasyChatWordsToString+1\n" - ".__5:\n" - " add r0, r2, #0\n" - " add r0, r0, #0xfa\n" - " strb r3, [r0]\n" - " mov r5, #0x0\n" - ".__6:\n" - " ldr r1, .__12\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r0, r1, r2\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq .__9 @cond_branch\n" - " cmp r0, #0x1\n" - " beq .__10 @cond_branch\n" - ".__9:\n" - " mov r3, #0x86\n" - " lsl r3, r3, #0x1\n" - " add r2, r1, r3\n" - " add r0, r1, #0\n" - " add r0, r0, #0xfa\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, .__12 + 4\n" - " b .__11\n" - ".__13:\n" - " .align 2, 0\n" - ".__12:\n" - " .word +0x2000000\n" - " .word gUnknown_083E5730\n" - ".__10:\n" - " mov r0, #0x86\n" - " lsl r0, r0, #0x1\n" - " add r2, r1, r0\n" - " add r0, r1, #0\n" - " add r0, r0, #0xfa\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " ldr r1, .__18\n" - ".__11:\n" - " add r0, r0, r1\n" - " str r0, [r2]\n" - " ldrh r0, [r4, #0x1e]\n" - " mov r1, sp\n" - " bl MailSpeciesToSpecies\n" - " lsl r0, r0, #0x10\n" - " ldr r1, .__18 + 4\n" - " add r0, r0, r1\n" - " mov r1, #0xcd\n" - " lsl r1, r1, #0x11\n" - " cmp r0, r1\n" - " bhi .__14 @cond_branch\n" - " ldr r0, .__18 + 8\n" - " add r1, r0, #0\n" - " add r1, r1, #0xfa\n" - " ldrb r2, [r1]\n" - " add r1, r0, #0\n" - " cmp r2, #0x6\n" - " beq .__15 @cond_branch\n" - " cmp r2, #0x9\n" - " beq .__16 @cond_branch\n" - " b .__17\n" - ".__19:\n" - " .align 2, 0\n" - ".__18:\n" - " .word gUnknown_083E57A4\n" - " .word 0xffff0000\n" - " .word +0x2000000\n" - ".__15:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x1\n" - " b .__21\n" - ".__16:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x2\n" - " b .__21\n" - ".__14:\n" - " ldr r1, .__22\n" - ".__17:\n" - " add r2, r1, #0\n" - " add r2, r2, #0xfb\n" - " mov r0, #0x0\n" - ".__21:\n" - " strb r0, [r2]\n" - " add r0, r1, #0\n" - " add r0, r0, #0xf4\n" - " str r4, [r0]\n" - " sub r0, r0, #0x8\n" - " str r6, [r0]\n" - " add r0, r0, #0xc\n" - " strb r5, [r0]\n" - " ldr r0, .__22 + 4\n" - " bl SetMainCallback2\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - ".__23:\n" - " .align 2, 0\n" - ".__22:\n" - " .word +0x2000000\n" - " .word sub_80F8D50+1\n" - "\n" - ); -} -#else void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) { - u16 mailDesign; u16 buffer[2]; + u16 species; - ewram0_4.varFF = GAME_LANGUAGE; - ewram0_4.var100 = 1; - ewram0_4.var104 = (MainCallback)EasyChat_GetWordText; - ewram0_4.var108 = (MainCallback)ConvertEasyChatWordsToString; - - mailDesign = arg0->itemId - ITEM_ORANGE_MAIL; - - if (mailDesign <= 11) +#if DEBUG + if (gUnknown_Debug_0300079C != 0) { - ewram0_4.varFA = arg0->itemId - ITEM_ORANGE_MAIL; + ewram0_4.varFF = GAME_LANGUAGE; + ewram0_4.var100 = gSpecialVar_0x8004; + ewram0_4.var104 = (MainCallback)EasyChat_GetWordText; + ewram0_4.var108 = (MainCallback)ConvertEasyChatWordsToString; + ewram0_4.varFA = gSpecialVar_0x8006; } else +#endif { - ewram0_4.varFA = 0; - arg2 = FALSE; + ewram0_4.varFF = GAME_LANGUAGE; + ewram0_4.var100 = 1; + ewram0_4.var104 = (MainCallback)EasyChat_GetWordText; + ewram0_4.var108 = (MainCallback)ConvertEasyChatWordsToString; + if (IS_ITEM_MAIL(arg0->itemId)) + { + ewram0_4.varFA = arg0->itemId - 0x79; + } + else + { + ewram0_4.varFA = 0; + arg2 = FALSE; + } } switch (ewram0_4.var100) @@ -550,24 +349,22 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) default: ewram0_4.var10C = &gUnknown_083E5730[ewram0_4.varFA]; break; - case 1: ewram0_4.var10C = &gUnknown_083E57A4[ewram0_4.varFA]; break; } - if (((MailSpeciesToSpecies(arg0->species, buffer) << 16) + 0xFFFF0000) <= (410 << 16)) + species = MailSpeciesToSpecies(arg0->species, buffer); + if (species >= 1 && species <= 411) { switch (ewram0_4.varFA) { case 6: ewram0_4.varFB = 1; break; - case 9: ewram0_4.varFB = 2; break; - default: ewram0_4.varFB = 0; break; @@ -578,14 +375,12 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2) ewram0_4.varFB = 0; } - ewram0_4.varF4 = arg0; ewram0_4.varEC = arg1; ewram0_4.varF8 = arg2; SetMainCallback2(sub_80F8D50); } -#endif #define RETURN_UP_STATE break #define RETURN_SKIP_STATE return FALSE @@ -849,1180 +644,359 @@ static void sub_80F8F78(void) } } +static void sub_80F8FB4(void) +{ + if (!UpdatePaletteFade()) + { + SetMainCallback2(ewram0_4.varEC); + switch (ewram0_4.varFB) + { + case 2: + case 1: + sub_809D608(sub_809D4A8(ewram0_4.varF4->species)); + sub_809D510(&gSprites[ewram0_4.varFC]); + break; + } +#if !DEBUG + memset(&ewram0_4, 0, 0x110); +#endif + ResetPaletteFade(); + } +} + #if DEBUG -__attribute__((naked)) -void sub_80F8FB4() + +void debug_sub_810CA7C(u8); +void debug_sub_810CE1C(u8); +void debug_sub_810D388(void); +void debug_sub_810D340(void); + +void debug_sub_810C910(u8 taskId) { - asm( - " push {r4, lr}\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._135 @cond_branch\n" - " ldr r4, ._138\n" - " add r0, r4, #0\n" - " add r0, r0, #0xec\n" - " ldr r0, [r0]\n" - " bl SetMainCallback2\n" - " add r0, r4, #0\n" - " add r0, r0, #0xfb\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x2\n" - " bgt ._137 @cond_branch\n" - " cmp r0, #0x1\n" - " blt ._137 @cond_branch\n" - " add r0, r4, #0\n" - " add r0, r0, #0xf4\n" - " ldr r0, [r0]\n" - " ldrh r0, [r0, #0x1e]\n" - " bl sub_809D4A8\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " bl sub_809D608\n" - " add r0, r4, #0\n" - " add r0, r0, #0xfc\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._138 + 4\n" - " add r0, r0, r1\n" - " bl sub_809D510\n" - "._137:\n" - " bl ResetPaletteFade\n" - "._135:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._139:\n" - " .align 2, 0\n" - "._138:\n" - " .word +0x2000000\n" - " .word gSprites\n" - "\n" - ); + if (!gPaletteFade.active) + { + gUnknown_Debug_0300079C = 1; + Menu_EraseScreen(); + DestroyTask(taskId); + if (gSaveBlock1.mail[gSpecialVar_0x8005].itemId == 0) + HandleReadMail(&gSaveBlock1.mail[gSpecialVar_0x8005], debug_sub_810D388, 0); + else + HandleReadMail(&gSaveBlock1.mail[gSpecialVar_0x8005], debug_sub_810D388, 1); + } } -#else -static void sub_80F8FB4(void) + +void debug_sub_810C990(u8 taskId) { - u16 local1; + if (gMain.newKeys & (DPAD_LEFT | DPAD_DOWN)) + { + gSpecialVar_0x8006 = (gSpecialVar_0x8006 + 11) % 12; + Menu_DrawStdWindowFrame(1, 1, 10, 4); + Menu_PrintText(_84115C4[gSpecialVar_0x8006], 2, 2); + } + else if (gMain.newKeys & (DPAD_UP | DPAD_RIGHT)) + { + gSpecialVar_0x8006 = (gSpecialVar_0x8006 + 1) % 12; + Menu_DrawStdWindowFrame(1, 1, 10, 4); + Menu_PrintText(_84115C4[gSpecialVar_0x8006], 2, 2); + } + else if (gMain.newKeys & A_BUTTON) + { + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + gTasks[taskId].func = debug_sub_810C910; + } + else if (gMain.newKeys & B_BUTTON) + { + Menu_DisplayDialogueFrame(); + Menu_PrintText(Str_8411540, 4, 15); + Menu_PrintText(_8411560[gSpecialVar_0x8004], 2, 2); + gTasks[taskId].func = debug_sub_810CA7C; + } +} - if (UpdatePaletteFade()) +void debug_sub_810CA7C(u8 taskId) +{ + if (gMain.newKeys & 0xF0) { - return; + gSpecialVar_0x8004 ^= 1; + Menu_PrintText(_8411560[gSpecialVar_0x8004], 2, 2); + } + else if (gMain.newKeys & A_BUTTON) + { + if (gMain.watchedKeysPressed) + { + gMain.watchedKeysPressed = FALSE; + Menu_DisplayDialogueFrame(); + Menu_PrintText(Str_8411540, 4, 15); + Menu_DrawStdWindowFrame(1, 1, 10, 4); + Menu_PrintText(_8411560[gSpecialVar_0x8004], 2, 2); + } + else + { + Menu_DisplayDialogueFrame(); + Menu_PrintText(Str_8411568, 4, 15); + Menu_DrawStdWindowFrame(1, 1, 10, 4); + Menu_PrintText(_84115C4[gSpecialVar_0x8006], 2, 2); + gTasks[taskId].func = debug_sub_810C990; + } } +} + +void debug_sub_810CB50(u8 taskId) +{ + u8 sp0[] = _("{STR_VAR_1} {STR_VAR_2}"); + u8 sp8[] = _("メール{STR_VAR_1} {STR_VAR_2}"); + bool8 r2 = FALSE; - SetMainCallback2(ewram0_4.varEC); - switch (ewram0_4.varFB) + if (gMain.newKeys & A_BUTTON) { - case 2: - case 1: - local1 = sub_809D4A8(ewram0_4.varF4->species); - sub_809D608(local1); + ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_0x8005, 2, 1); + StringCopy(gStringVar2, gSpeciesNames[gTasks[taskId].data[0]]); + gSaveBlock1.mail[gSpecialVar_0x8005].species = gTasks[taskId].data[0]; + StringExpandPlaceholders(gStringVar4, sp8); + Menu_DisplayDialogueFrame(); + Menu_PrintText(gStringVar4, 4, 15); + DestroyTask(taskId); + CreateTask(debug_sub_810CE1C, 0); + debug_sub_810D340(); + return; + } + else if (gMain.newKeys & B_BUTTON) + { + DestroyTask(taskId); + Menu_EraseScreen(); + CreateTask(debug_sub_810CE1C, 0); + debug_sub_810D340(); + return; + } + else if (gMain.newKeys & (DPAD_LEFT | DPAD_DOWN)) + { + gTasks[taskId].data[0] = (gTasks[taskId].data[0] + 0x19B) % 0x19C; + r2 = TRUE; + } + else if (gMain.newKeys & (DPAD_UP | DPAD_RIGHT)) + { + gTasks[taskId].data[0] = (gTasks[taskId].data[0] + 1) % 0x19C; + r2 = TRUE; + } - sub_809D510(&gSprites[ewram0_4.varFC]); - break; + if (r2) + { + ConvertIntToDecimalStringN(gStringVar1, gTasks[taskId].data[0], 2, 3); + StringCopy(gStringVar2, gSpeciesNames[gTasks[taskId].data[0]]); + StringExpandPlaceholders(gStringVar4, sp0); + Menu_DrawStdWindowFrame(0, 0, 12, 3); + Menu_PrintText(gStringVar4, 1, 1); } +} + +void debug_sub_810CCEC(u8 taskId) +{ + u8 string1[] = _("メール{STR_VAR_1}を だれに もたせる?"); + u8 string2[] = _("000 {STR_VAR_1}"); + + ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_0x8005, 1, 1); + StringExpandPlaceholders(gStringVar4, string1); + Menu_DisplayDialogueFrame(); + Menu_PrintText(gStringVar4, 4, 15); + + StringCopy(gStringVar1, gSpeciesNames[0]); + StringExpandPlaceholders(gStringVar4, string2); + Menu_DrawStdWindowFrame(0, 0, 12, 3); + Menu_PrintText(string2, 1, 1); // This probably should have been gStringVar4 - memset(&ewram0_4, 0, 0x110); - ResetPaletteFade(); + gTasks[taskId].func = debug_sub_810CB50; } -#endif -#if DEBUG -__attribute__((naked)) -void debug_sub_810C910() +u8 debug_sub_810CD9C(void) { - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r0, ._143\n" - " ldrb r1, [r0, #0x7]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._142 @cond_branch\n" - " ldr r1, ._143 + 4\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " bl Menu_EraseScreen\n" - " add r0, r4, #0\n" - " bl DestroyTask\n" - " ldr r2, ._143 + 8\n" - " ldr r0, ._143 + 12\n" - " ldrh r1, [r0]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r1, r0, #0x2\n" - " add r0, r1, r2\n" - " ldr r3, ._143 + 16\n" - " add r0, r0, r3\n" - " ldrh r0, [r0]\n" - " cmp r0, #0\n" - " bne ._141 @cond_branch\n" - " sub r3, r3, #0x20\n" - " add r0, r2, r3\n" - " add r0, r1, r0\n" - " ldr r1, ._143 + 20\n" - " mov r2, #0x0\n" - " bl HandleReadMail\n" - " b ._142\n" - "._144:\n" - " .align 2, 0\n" - "._143:\n" - " .word gPaletteFade\n" - " .word gUnknown_0300074C\n" - " .word gSaveBlock1\n" - " .word gSpecialVar_0x8005\n" - " .word 0x2b6c\n" - " .word debug_sub_810D388+1\n" - "._141:\n" - " ldr r3, ._145\n" - " add r0, r2, r3\n" - " add r0, r1, r0\n" - " ldr r1, ._145 + 4\n" - " mov r2, #0x1\n" - " bl HandleReadMail\n" - "._142:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._146:\n" - " .align 2, 0\n" - "._145:\n" - " .word 0x2b4c\n" - " .word debug_sub_810D388+1\n" - "\n" - ); + CloseMenu(); + ScriptContext1_Stop(); + ScriptContext2_Enable(); + gUnknown_Debug_0300079C = 0; + gSpecialVar_0x8004 = gSpecialVar_0x8005 = gSpecialVar_0x8006 = 0; + SetMainCallback2(debug_sub_810D388); + return 1; } -__attribute__((naked)) -void debug_sub_810C990() +void debug_sub_810CDE0(void) { - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " add r5, r4, #0\n" - " ldr r0, ._149\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0xa0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._147 @cond_branch\n" - " ldr r4, ._149 + 4\n" - " ldrh r0, [r4]\n" - " add r0, r0, #0xb\n" - " b ._148\n" - "._150:\n" - " .align 2, 0\n" - "._149:\n" - " .word gMain\n" - " .word gSpecialVar_0x8006\n" - "._147:\n" - " mov r2, #0x50\n" - " and r2, r2, r1\n" - " cmp r2, #0\n" - " beq ._151 @cond_branch\n" - " ldr r4, ._153\n" - " ldrh r0, [r4]\n" - " add r0, r0, #0x1\n" - "._148:\n" - " mov r1, #0xc\n" - " bl __modsi3\n" - " strh r0, [r4]\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0xa\n" - " mov r3, #0x4\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r1, ._153 + 4\n" - " ldrh r0, [r4]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0x2\n" - " mov r2, #0x2\n" - " bl Menu_PrintText\n" - " b ._159\n" - "._154:\n" - " .align 2, 0\n" - "._153:\n" - " .word gSpecialVar_0x8006\n" - " .word _84115C4\n" - "._151:\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._155 @cond_branch\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " str r2, [sp]\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " ldr r1, ._157\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._157 + 4\n" - " b ._156\n" - "._158:\n" - " .align 2, 0\n" - "._157:\n" - " .word gTasks\n" - " .word debug_sub_810C910+1\n" - "._155:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._159 @cond_branch\n" - " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._160\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " ldr r1, ._160 + 4\n" - " ldr r0, ._160 + 8\n" - " ldrh r0, [r0]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0x2\n" - " mov r2, #0x2\n" - " bl Menu_PrintText\n" - " ldr r1, ._160 + 12\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._160 + 16\n" - "._156:\n" - " str r1, [r0]\n" - "._159:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._161:\n" - " .align 2, 0\n" - "._160:\n" - " .word Str_8411540\n" - " .word _8411560\n" - " .word gSpecialVar_0x8004\n" - " .word gTasks\n" - " .word debug_sub_810CA7C+1\n" - "\n" - ); + UpdatePaletteFade(); + RunTasks(); } -__attribute__((naked)) -void debug_sub_810CA7C() +void debug_sub_810CDF0(void) { - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r3, ._164\n" - " ldrh r1, [r3, #0x2e]\n" - " mov r2, #0xf0\n" - " and r2, r2, r1\n" - " cmp r2, #0\n" - " beq ._162 @cond_branch\n" - " ldr r2, ._164 + 4\n" - " ldrh r0, [r2]\n" - " mov r1, #0x1\n" - " eor r0, r0, r1\n" - " strh r0, [r2]\n" - " ldr r1, ._164 + 8\n" - " ldrh r0, [r2]\n" - " b ._163\n" - "._165:\n" - " .align 2, 0\n" - "._164:\n" - " .word gMain\n" - " .word gSpecialVar_0x8004\n" - " .word _8411560\n" - "._162:\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._168 @cond_branch\n" - " ldrh r0, [r3, #0x34]\n" - " cmp r0, #0\n" - " beq ._167 @cond_branch\n" - " strh r2, [r3, #0x34]\n" - " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._169\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0xa\n" - " mov r3, #0x4\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r1, ._169 + 4\n" - " ldr r0, ._169 + 8\n" - " ldrh r0, [r0]\n" - "._163:\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0x2\n" - " mov r2, #0x2\n" - " bl Menu_PrintText\n" - " b ._168\n" - "._170:\n" - " .align 2, 0\n" - "._169:\n" - " .word Str_8411540\n" - " .word _8411560\n" - " .word gSpecialVar_0x8004\n" - "._167:\n" - " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._171\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " mov r0, #0x1\n" - " mov r1, #0x1\n" - " mov r2, #0xa\n" - " mov r3, #0x4\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r1, ._171 + 4\n" - " ldr r0, ._171 + 8\n" - " ldrh r0, [r0]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0x2\n" - " mov r2, #0x2\n" - " bl Menu_PrintText\n" - " ldr r1, ._171 + 12\n" - " lsl r0, r4, #0x2\n" - " add r0, r0, r4\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._171 + 16\n" - " str r1, [r0]\n" - "._168:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._172:\n" - " .align 2, 0\n" - "._171:\n" - " .word Str_8411568\n" - " .word _84115C4\n" - " .word gSpecialVar_0x8006\n" - " .word gTasks\n" - " .word debug_sub_810C990+1\n" - "\n" - ); + gMain.watchedKeysPressed = 0; + gMain.watchedKeysMask = 0; + gFieldCallback = mapldr_default; + SetMainCallback2(c2_exit_to_overworld_2_switch); } -__attribute__((naked)) -void debug_sub_810CB50() +void debug_sub_810CE1C(u8 taskId) { - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xffffffec\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " ldr r1, ._175\n" - " mov r0, sp\n" - " mov r2, #0x6\n" - " bl memcpy\n" - " add r7, sp, #0x8\n" - " ldr r1, ._175 + 4\n" - " add r0, r7, #0\n" - " mov r2, #0x9\n" - " bl memcpy\n" - " mov r2, #0x0\n" - " ldr r0, ._175 + 8\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._173 @cond_branch\n" - " ldr r0, ._175 + 12\n" - " ldr r5, ._175 + 16\n" - " ldrh r1, [r5]\n" - " mov r2, #0x2\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " ldr r0, ._175 + 20\n" - " ldr r1, ._175 + 24\n" - " lsl r4, r6, #0x2\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r1\n" - " mov r1, #0x8\n" - " ldsh r2, [r4, r1]\n" - " mov r1, #0xb\n" - " mul r1, r1, r2\n" - " ldr r2, ._175 + 28\n" - " add r1, r1, r2\n" - " bl StringCopy\n" - " ldr r2, ._175 + 32\n" - " ldrh r1, [r5]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r2\n" - " ldrh r1, [r4, #0x8]\n" - " ldr r2, ._175 + 36\n" - " add r0, r0, r2\n" - " strh r1, [r0]\n" - " ldr r4, ._175 + 40\n" - " add r0, r4, #0\n" - " add r1, r7, #0\n" - " bl StringExpandPlaceholders\n" - " bl Menu_DisplayDialogueFrame\n" - " add r0, r4, #0\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " add r0, r6, #0\n" - " bl DestroyTask\n" - " b ._174\n" - "._176:\n" - " .align 2, 0\n" - "._175:\n" - " .word Str_841160F\n" - " .word Str_841161A\n" - " .word gMain\n" - " .word gStringVar1\n" - " .word gSpecialVar_0x8005\n" - " .word gStringVar2\n" - " .word gTasks\n" - " .word gSpeciesNames\n" - " .word gSaveBlock1\n" - " .word 0x2b6a\n" - " .word gStringVar4\n" - "._173:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._177 @cond_branch\n" - " add r0, r6, #0\n" - " bl DestroyTask\n" - " bl Menu_EraseScreen\n" - "._174:\n" - " ldr r0, ._179\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " bl debug_sub_810D340\n" - " b ._186\n" - "._180:\n" - " .align 2, 0\n" - "._179:\n" - " .word debug_sub_810CE1C+1\n" - "._177:\n" - " mov r0, #0xa0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._181 @cond_branch\n" - " ldr r0, ._183\n" - " lsl r4, r6, #0x2\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " mov r1, #0x8\n" - " ldsh r0, [r4, r1]\n" - " ldr r2, ._183 + 4\n" - " add r0, r0, r2\n" - " mov r1, #0xce\n" - " lsl r1, r1, #0x1\n" - " bl __modsi3\n" - " strh r0, [r4, #0x8]\n" - " b ._182\n" - "._184:\n" - " .align 2, 0\n" - "._183:\n" - " .word gTasks\n" - " .word 0x19b\n" - "._181:\n" - " mov r0, #0x50\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._185 @cond_branch\n" - " ldr r0, ._187\n" - " lsl r4, r6, #0x2\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " mov r1, #0x8\n" - " ldsh r0, [r4, r1]\n" - " add r0, r0, #0x1\n" - " mov r1, #0xce\n" - " lsl r1, r1, #0x1\n" - " bl __modsi3\n" - " strh r0, [r4, #0x8]\n" - " mov r2, #0x1\n" - "._185:\n" - " cmp r2, #0\n" - " beq ._186 @cond_branch\n" - "._182:\n" - " ldr r0, ._187 + 4\n" - " ldr r1, ._187\n" - " lsl r4, r6, #0x2\n" - " add r4, r4, r6\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r1\n" - " mov r2, #0x8\n" - " ldsh r1, [r4, r2]\n" - " mov r2, #0x2\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " ldr r0, ._187 + 8\n" - " mov r1, #0x8\n" - " ldsh r2, [r4, r1]\n" - " mov r1, #0xb\n" - " mul r1, r1, r2\n" - " ldr r2, ._187 + 12\n" - " add r1, r1, r2\n" - " bl StringCopy\n" - " ldr r4, ._187 + 16\n" - " add r0, r4, #0\n" - " mov r1, sp\n" - " bl StringExpandPlaceholders\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xc\n" - " mov r3, #0x3\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r4, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - "._186:\n" - " add sp, sp, #0x14\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._188:\n" - " .align 2, 0\n" - "._187:\n" - " .word gTasks\n" - " .word gStringVar1\n" - " .word gStringVar2\n" - " .word gSpeciesNames\n" - " .word gStringVar4\n" - "\n" - ); + if (gMenuCallback() == TRUE) + { + CloseMenu(); + DestroyTask(taskId); + } } -__attribute__((naked)) -void debug_sub_810CCEC() +u8 debug_sub_810CE48(void) { - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xffffffe4\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " ldr r1, ._189\n" - " mov r0, sp\n" - " mov r2, #0x11\n" - " bl memcpy\n" - " add r6, sp, #0x14\n" - " ldr r1, ._189 + 4\n" - " add r0, r6, #0\n" - " mov r2, #0x7\n" - " bl memcpy\n" - " ldr r0, ._189 + 8\n" - " mov r8, r0\n" - " ldr r0, ._189 + 12\n" - " ldrh r1, [r0]\n" - " mov r0, r8\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " ldr r4, ._189 + 16\n" - " add r0, r4, #0\n" - " mov r1, sp\n" - " bl StringExpandPlaceholders\n" - " bl Menu_DisplayDialogueFrame\n" - " add r0, r4, #0\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - " ldr r1, ._189 + 20\n" - " mov r0, r8\n" - " bl StringCopy\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl StringExpandPlaceholders\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0xc\n" - " mov r3, #0x3\n" - " bl Menu_DrawStdWindowFrame\n" - " add r0, r6, #0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " bl Menu_PrintText\n" - " ldr r1, ._189 + 24\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r1, ._189 + 28\n" - " str r1, [r0]\n" - " add sp, sp, #0x1c\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._190:\n" - " .align 2, 0\n" - "._189:\n" - " .word Str_8411623\n" - " .word Str_8411634\n" - " .word gStringVar1\n" - " .word gSpecialVar_0x8005\n" - " .word gStringVar4\n" - " .word gSpeciesNames\n" - " .word gTasks\n" - " .word debug_sub_810CB50+1\n" - "\n" - ); -} + s8 input = Menu_ProcessInput(); -__attribute__((naked)) -void debug_sub_810CD9C() -{ - asm( - " push {lr}\n" - " bl CloseMenu\n" - " bl ScriptContext1_Stop\n" - " bl ScriptContext2_Enable\n" - " ldr r1, ._191\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " ldr r3, ._191 + 4\n" - " ldr r2, ._191 + 8\n" - " ldr r1, ._191 + 12\n" - " mov r0, #0x0\n" - " strh r0, [r1]\n" - " strh r0, [r2]\n" - " strh r0, [r3]\n" - " ldr r0, ._191 + 16\n" - " bl SetMainCallback2\n" - " mov r0, #0x1\n" - " pop {r1}\n" - " bx r1\n" - "._192:\n" - " .align 2, 0\n" - "._191:\n" - " .word gUnknown_0300074C\n" - " .word gSpecialVar_0x8004\n" - " .word gSpecialVar_0x8005\n" - " .word gSpecialVar_0x8006\n" - " .word debug_sub_810D388+1\n" - "\n" - ); + switch (input) + { + case -1: + Menu_EraseScreen(); + debug_sub_810D340(); + return 0; + case -2: + return 0; + default: + gSpecialVar_0x8005 = input; + gSpecialVar_0x8006 %= 12; + CreateTask(debug_sub_810CA7C, 0); + gMain.watchedKeysPressed = TRUE; // huh? + gMain.watchedKeysMask = 0; + return 1; + } } -__attribute__((naked)) -void debug_sub_810CDE0() +u8 debug_sub_810CEA4(void) { - asm( - " push {lr}\n" - " bl UpdatePaletteFade\n" - " bl RunTasks\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); + if (!gPaletteFade.active) + { + gSpecialVar_0x8004 = 4; + sub_80E60D8(); + return 1; + } + return 0; } -__attribute__((naked)) -void debug_sub_810CDF0() +u8 debug_sub_810CED0(void) { - asm( - " push {lr}\n" - " ldr r1, ._193\n" - " mov r0, #0x0\n" - " strh r0, [r1, #0x34]\n" - " strh r0, [r1, #0x36]\n" - " ldr r1, ._193 + 4\n" - " ldr r0, ._193 + 8\n" - " str r0, [r1]\n" - " ldr r0, ._193 + 12\n" - " bl SetMainCallback2\n" - " pop {r0}\n" - " bx r0\n" - "._194:\n" - " .align 2, 0\n" - "._193:\n" - " .word gMain\n" - " .word gFieldCallback\n" - " .word mapldr_default+1\n" - " .word c2_exit_to_overworld_2_switch+1\n" - "\n" - ); -} + u8 text[] = _("せいきの データが とうろくずみ です\n" + "しんき とうろく できません"); + s8 input = Menu_ProcessInput(); -__attribute__((naked)) -void debug_sub_810CE1C() -{ - asm( - " push {r4, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " ldr r0, ._196\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bne ._195 @cond_branch\n" - " bl CloseMenu\n" - " add r0, r4, #0\n" - " bl DestroyTask\n" - "._195:\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._197:\n" - " .align 2, 0\n" - "._196:\n" - " .word gMenuCallback\n" - "\n" - ); + switch (input) + { + case -1: + Menu_EraseScreen(); + break; + case -2: + return 0; + default: + gSpecialVar_0x8005 = input; + if (IS_ITEM_MAIL(gSaveBlock1.mail[input].itemId)) + { + Menu_EraseScreen(); + Menu_DisplayDialogueFrame(); + Menu_PrintText(text, 4, 15); + } + else + { + gSaveBlock1.mail[gSpecialVar_0x8005].itemId = 0xFFFF; + StringCopy(gSaveBlock1.mail[gSpecialVar_0x8005].playerName, gSaveBlock2.playerName); + *(u32 *)gSaveBlock1.mail[gSpecialVar_0x8005].trainerId = *(u32 *)gSaveBlock2.playerTrainerId; + gMenuCallback = debug_sub_810CEA4; + return 0; + } + break; + } + debug_sub_810D340(); + return 0; } -__attribute__((naked)) -void debug_sub_810CE48() +u8 debug_sub_810CFA4(void) { - asm( - " push {r4, lr}\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._198 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._199 @cond_branch\n" - " bl Menu_EraseScreen\n" - " bl debug_sub_810D340\n" - "._198:\n" - " mov r0, #0x0\n" - " b ._200\n" - "._199:\n" - " ldr r0, ._201\n" - " strh r1, [r0]\n" - " ldr r4, ._201 + 4\n" - " ldrh r0, [r4]\n" - " mov r1, #0xc\n" - " bl __umodsi3\n" - " strh r0, [r4]\n" - " ldr r0, ._201 + 8\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " ldr r1, ._201 + 12\n" - " mov r2, #0x0\n" - " mov r0, #0x1\n" - " strh r0, [r1, #0x34]\n" - " strh r2, [r1, #0x36]\n" - "._200:\n" - " pop {r4}\n" - " pop {r1}\n" - " bx r1\n" - "._202:\n" - " .align 2, 0\n" - "._201:\n" - " .word gSpecialVar_0x8005\n" - " .word gSpecialVar_0x8006\n" - " .word debug_sub_810CA7C+1\n" - " .word gMain\n" - "\n" - ); -} + u8 text[] = _("せいきに とうろくされたメールデータは\n" + "へんこう できません"); + s8 input = Menu_ProcessInput(); -__attribute__((naked)) -void debug_sub_810CEA4() -{ - asm( - " push {lr}\n" - " ldr r0, ._205\n" - " ldrb r1, [r0, #0x7]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._203 @cond_branch\n" - " mov r0, #0x0\n" - " b ._204\n" - "._206:\n" - " .align 2, 0\n" - "._205:\n" - " .word gPaletteFade\n" - "._203:\n" - " ldr r1, ._207\n" - " mov r0, #0x4\n" - " strh r0, [r1]\n" - " bl sub_80E60D8\n" - " mov r0, #0x1\n" - "._204:\n" - " pop {r1}\n" - " bx r1\n" - "._208:\n" - " .align 2, 0\n" - "._207:\n" - " .word gSpecialVar_0x8004\n" - "\n" - ); + switch (input) + { + case -1: + Menu_EraseScreen(); + debug_sub_810D340(); + return 0; + case -2: + return 0; + default: + gSpecialVar_0x8005 = input; + if (IS_ITEM_MAIL(gSaveBlock1.mail[input].itemId)) + { + Menu_EraseScreen(); + Menu_DisplayDialogueFrame(); + Menu_PrintText(text, 4, 15); + debug_sub_810D340(); + return 0; + } + else + { + CreateTask(debug_sub_810CCEC, 0); + return 1; + } + } } -__attribute__((naked)) -void debug_sub_810CED0() +u8 debug_sub_810D030(void) { - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xffffffdc\n" - " ldr r1, ._212\n" - " mov r0, sp\n" - " mov r2, #0x23\n" - " bl memcpy\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._215 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._210 @cond_branch\n" - " bl Menu_EraseScreen\n" - " b ._211\n" - "._213:\n" - " .align 2, 0\n" - "._212:\n" - " .word Str_841163B\n" - "._210:\n" - " ldr r5, ._216\n" - " strh r1, [r5]\n" - " ldr r6, ._216 + 4\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldr r1, ._216 + 8\n" - " add r0, r0, r1\n" - " ldrh r0, [r0]\n" - " sub r0, r0, #0x79\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0xb\n" - " bls ._214 @cond_branch\n" - " ldrh r1, [r5]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldr r2, ._216 + 8\n" - " add r0, r0, r2\n" - " ldr r1, ._216 + 12\n" - " strh r1, [r0]\n" - " ldrh r1, [r5]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " sub r2, r2, #0xe\n" - " add r1, r6, r2\n" - " add r0, r0, r1\n" - " ldr r4, ._216 + 16\n" - " add r1, r4, #0\n" - " bl StringCopy\n" - " ldrh r1, [r5]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " ldr r2, ._216 + 20\n" - " add r1, r6, r2\n" - " add r0, r0, r1\n" - " add r4, r4, #0xa\n" - " ldr r1, [r4]\n" - " str r1, [r0]\n" - " ldr r1, ._216 + 24\n" - " ldr r0, ._216 + 28\n" - " str r0, [r1]\n" - " b ._215\n" - "._217:\n" - " .align 2, 0\n" - "._216:\n" - " .word gSpecialVar_0x8005\n" - " .word gSaveBlock1\n" - " .word 0x2b6c\n" - " .word 0xffff\n" - " .word gSaveBlock2\n" - " .word 0x2b66\n" - " .word gMenuCallback\n" - " .word debug_sub_810CEA4+1\n" - "._214:\n" - " bl Menu_EraseScreen\n" - " bl Menu_DisplayDialogueFrame\n" - " mov r0, sp\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - "._211:\n" - " bl debug_sub_810D340\n" - "._215:\n" - " mov r0, #0x0\n" - " add sp, sp, #0x24\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); -} + const u8 text1[] = _("メール{STR_VAR_1} とうろく かいじょ"); + const u8 text2[] = _("デバッグメニューから とうろくした\n" + "メール いがいは けせません"); + s8 input = Menu_ProcessInput(); -__attribute__((naked)) -void debug_sub_810CFA4() -{ - asm( - " push {lr}\n" - " add sp, sp, #0xffffffe0\n" - " ldr r1, ._221\n" - " mov r0, sp\n" - " mov r2, #0x1f\n" - " bl memcpy\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r2, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r2, r0\n" - " beq ._218 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r2, r0\n" - " bne ._219 @cond_branch\n" - " bl Menu_EraseScreen\n" - " b ._220\n" - "._222:\n" - " .align 2, 0\n" - "._221:\n" - " .word Str_841165E\n" - "._219:\n" - " ldr r0, ._225\n" - " strh r2, [r0]\n" - " ldr r1, ._225 + 4\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r1, ._225 + 8\n" - " add r0, r0, r1\n" - " ldrh r0, [r0]\n" - " sub r0, r0, #0x79\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0xb\n" - " bls ._223 @cond_branch\n" - " ldr r0, ._225 + 12\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " mov r0, #0x1\n" - " b ._224\n" - "._226:\n" - " .align 2, 0\n" - "._225:\n" - " .word gSpecialVar_0x8005\n" - " .word gSaveBlock1\n" - " .word 0x2b6c\n" - " .word debug_sub_810CCEC+1\n" - "._223:\n" - " bl Menu_EraseScreen\n" - " bl Menu_DisplayDialogueFrame\n" - " mov r0, sp\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - "._220:\n" - " bl debug_sub_810D340\n" - "._218:\n" - " mov r0, #0x0\n" - "._224:\n" - " add sp, sp, #0x20\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + switch (input) + { + case -1: + Menu_EraseScreen(); + debug_sub_810D340(); + return 0; + case -2: + return 0; + default: + gSpecialVar_0x8005 = input; + if (gSaveBlock1.mail[gSpecialVar_0x8005].itemId != 0xFFFF + && gSaveBlock1.mail[gSpecialVar_0x8005].itemId != 0) + { + Menu_EraseScreen(); + Menu_DisplayDialogueFrame(); + Menu_PrintText(text2, 4, 15); + debug_sub_810D340(); + return 0; + } + else + { + s8 i; + + gSaveBlock1.mail[gSpecialVar_0x8005].itemId = 0; + gSaveBlock1.mail[gSpecialVar_0x8005].species = 0; + gSaveBlock1.mail[gSpecialVar_0x8005].playerName[0] = EOS; + *(u32 *)gSaveBlock1.mail[gSpecialVar_0x8005].trainerId = 0; + for (i = 0; i < 9; i++) + gSaveBlock1.mail[gSpecialVar_0x8005].words[i] = 0xFFFF; + ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_0x8005, 1, 1); + StringExpandPlaceholders(gStringVar4, text1); + Menu_EraseScreen(); + Menu_DisplayDialogueFrame(); + Menu_PrintText(gStringVar4, 4, 15); + debug_sub_810D340(); + return 0; + } + } } -__attribute__((naked)) -void debug_sub_810D030() +const u8 Str_84116AE[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); + +const struct MenuAction _84116BC[] = { - asm( - " push {r4, r5, r6, r7, lr}\n" - " add sp, sp, #0xffffffcc\n" - " ldr r1, ._230\n" - " mov r0, sp\n" - " mov r2, #0x10\n" - " bl memcpy\n" - " add r5, sp, #0x10\n" - " ldr r1, ._230 + 4\n" - " add r0, r5, #0\n" - " mov r2, #0x21\n" - " bl memcpy\n" - " bl Menu_ProcessInput\n" - " lsl r0, r0, #0x18\n" - " asr r1, r0, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._227 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._228 @cond_branch\n" - " bl Menu_EraseScreen\n" - " b ._229\n" - "._231:\n" - " .align 2, 0\n" - "._230:\n" - " .word Str_841167D\n" - " .word Str_841168D\n" - "._228:\n" - " ldr r2, ._235\n" - " strh r1, [r2]\n" - " ldr r3, ._235 + 4\n" - " ldrh r1, [r2]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r3\n" - " ldr r1, ._235 + 8\n" - " add r0, r0, r1\n" - " ldrh r1, [r0]\n" - " ldr r0, ._235 + 12\n" - " add r4, r2, #0\n" - " cmp r1, r0\n" - " beq ._233 @cond_branch\n" - " cmp r1, #0\n" - " beq ._233 @cond_branch\n" - " bl Menu_EraseScreen\n" - " bl Menu_DisplayDialogueFrame\n" - " add r0, r5, #0\n" - " b ._234\n" - "._236:\n" - " .align 2, 0\n" - "._235:\n" - " .word gSpecialVar_0x8005\n" - " .word gSaveBlock1\n" - " .word 0x2b6c\n" - " .word 0xffff\n" - "._233:\n" - " ldrh r1, [r4]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r3\n" - " ldr r5, ._238\n" - " add r0, r0, r5\n" - " mov r2, #0x0\n" - " strh r2, [r0]\n" - " ldrh r1, [r4]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r3\n" - " ldr r1, ._238 + 4\n" - " add r0, r0, r1\n" - " strh r2, [r0]\n" - " ldrh r1, [r4]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r3\n" - " sub r5, r5, #0xe\n" - " add r0, r0, r5\n" - " mov r1, #0xff\n" - " strb r1, [r0]\n" - " ldrh r1, [r4]\n" - " lsl r0, r1, #0x3\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r5, r5, #0x8\n" - " add r1, r3, r5\n" - " add r0, r0, r1\n" - " str r2, [r0]\n" - " mov r0, #0x0\n" - " ldr r1, ._238 + 8\n" - " mov ip, r1\n" - " sub r5, r5, #0x1a\n" - " add r7, r3, r5\n" - " add r6, r4, #0\n" - " ldr r1, ._238 + 12\n" - " add r5, r1, #0\n" - "._237:\n" - " lsl r1, r0, #0x18\n" - " asr r1, r1, #0x18\n" - " lsl r3, r1, #0x1\n" - " ldrh r2, [r6]\n" - " lsl r0, r2, #0x3\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x2\n" - " add r3, r3, r0\n" - " add r3, r3, r7\n" - " ldrh r0, [r3]\n" - " orr r0, r0, r5\n" - " strh r0, [r3]\n" - " add r1, r1, #0x1\n" - " lsl r1, r1, #0x18\n" - " lsr r0, r1, #0x18\n" - " asr r1, r1, #0x18\n" - " cmp r1, #0x8\n" - " ble ._237 @cond_branch\n" - " ldrh r1, [r4]\n" - " mov r0, ip\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " ldr r4, ._238 + 16\n" - " add r0, r4, #0\n" - " mov r1, sp\n" - " bl StringExpandPlaceholders\n" - " bl Menu_EraseScreen\n" - " bl Menu_DisplayDialogueFrame\n" - " add r0, r4, #0\n" - "._234:\n" - " mov r1, #0x4\n" - " mov r2, #0xf\n" - " bl Menu_PrintText\n" - "._229:\n" - " bl debug_sub_810D340\n" - "._227:\n" - " mov r0, #0x0\n" - " add sp, sp, #0x34\n" - " pop {r4, r5, r6, r7}\n" - " pop {r1}\n" - " bx r1\n" - "._239:\n" - " .align 2, 0\n" - "._238:\n" - " .word 0x2b6c\n" - " .word 0x2b6a\n" - " .word gStringVar1\n" - " .word 0xffff\n" - " .word gStringVar4\n" - "\n" - ); -} + {Str_84115F4, NULL}, + {Str_84115FB, NULL}, + {Str_8411603, NULL}, + {Str_8411608, NULL}, +}; __attribute__((naked)) void debug_sub_810D174() @@ -2367,7 +1341,7 @@ void debug_sub_810D388() "._300:\n" " .align 2, 0\n" "._299:\n" - " .word gUnknown_0300074C\n" + " .word gUnknown_Debug_0300079C\n" " .word 0x43c\n" "._297:\n" " bl ScanlineEffect_Stop\n" -- cgit v1.2.3 From aa3c9d1d357f858baad3065fa2939eba695d5731 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 25 Jan 2018 15:19:46 -0600 Subject: finish decompiling all debug code in mail.c --- src/pokemon/mail.c | 664 +++++++++++++---------------------------------------- 1 file changed, 156 insertions(+), 508 deletions(-) diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 16252af64..4497c98fb 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -294,7 +294,7 @@ const u8 Str_8411608[] = _("メールをけす"); // Delete Mail static u8 *const sSharedMemPtr = gSharedMem; static u8 sub_80F8A28(void); -/*static*/ void sub_80F8D50(void); +static void sub_80F8D50(void); static void sub_80F8DA0(void); static void sub_80F8E80(void); static void sub_80F8F18(void); @@ -527,7 +527,7 @@ static u8 sub_80F8A28(void) return FALSE; } -/*static*/ void sub_80F8D50(void) +static void sub_80F8D50(void) { do { @@ -988,7 +988,85 @@ u8 debug_sub_810D030(void) } } -const u8 Str_84116AE[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); +void debug_sub_810D174(u8 a) +{ + u8 string[] = _("メール{STR_VAR_1} {STR_VAR_2} {STR_VAR_3}"); + u8 buffer[9][20]; + struct MenuAction menuActions[9]; + u8 i; + + for (i = 0; i < 9; i++) + { + ConvertIntToDecimalStringN(gStringVar1, i, 1, 1); + if (gSaveBlock1.mail[i].itemId == 0xFFFF) + { + ConvertIntToDecimalStringN(gStringVar2, 1, 1, 1); + } + else if (IS_ITEM_MAIL(gSaveBlock1.mail[i].itemId)) + { + ConvertIntToDecimalStringN(gStringVar2, 2, 1, 1); + } + else + { + ConvertIntToDecimalStringN(gStringVar2, 0, 1, 1); + gSaveBlock1.mail[i].itemId = 0; + } + StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.mail[i].species]); + StringExpandPlaceholders(buffer[i], string); + menuActions[i].text = buffer[i]; + menuActions[i].func = NULL; + } + Menu_DrawStdWindowFrame(0, 0, 16, 19); + Menu_PrintItems(2, 1, 9, menuActions); + InitMenu(0, 1, 1, 9, 0, 15); + switch (a) + { + case 0: + gMenuCallback = debug_sub_810CE48; + break; + case 1: + gMenuCallback = debug_sub_810CED0; + break; + case 2: + gMenuCallback = debug_sub_810CFA4; + break; + case 3: + gMenuCallback = debug_sub_810D030; + break; + } +} + +u8 debug_sub_810D2F4(void) +{ + s8 input = Menu_ProcessInput(); + + switch (input) + { + case -1: + SetMainCallback2(debug_sub_810CDF0); + return 1; + case -2: + return 0; + } + + switch (input) + { + case 0: + debug_sub_810D174(input); + return 0; + case 1: + debug_sub_810D174(input); + return 0; + case 2: + debug_sub_810D174(input); + return 0; + case 3: + debug_sub_810D174(input); + return 0; + } + + return 1; +} const struct MenuAction _84116BC[] = { @@ -998,514 +1076,84 @@ const struct MenuAction _84116BC[] = {Str_8411608, NULL}, }; -__attribute__((naked)) -void debug_sub_810D174() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xfffffeec\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " ldr r1, ._242\n" - " add r0, sp, #0x8\n" - " mov r2, #0xc\n" - " bl memcpy\n" - " mov r5, #0x0\n" - " mov r0, sp\n" - " add r0, r0, #0x14\n" - " str r0, [sp, #0x110]\n" - " add r1, sp, #0xc8\n" - " mov r8, r1\n" - " add r2, sp, #0xcc\n" - " mov sl, r2\n" - " ldr r0, ._242 + 4\n" - " mov r9, r0\n" - "._248:\n" - " ldr r0, ._242 + 8\n" - " add r1, r5, #0\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " lsl r1, r5, #0x3\n" - " add r0, r1, r5\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r9\n" - " ldr r2, ._242 + 12\n" - " add r4, r0, r2\n" - " ldrh r0, [r4]\n" - " add r6, r1, #0\n" - " ldr r1, ._242 + 16\n" - " cmp r0, r1\n" - " bne ._240 @cond_branch\n" - " ldr r0, ._242 + 20\n" - " mov r1, #0x1\n" - " b ._241\n" - "._243:\n" - " .align 2, 0\n" - "._242:\n" - " .word Str_84116AE\n" - " .word gSaveBlock1\n" - " .word gStringVar1\n" - " .word 0x2b6c\n" - " .word 0xffff\n" - " .word gStringVar2\n" - "._240:\n" - " sub r0, r0, #0x79\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " cmp r0, #0xb\n" - " bhi ._244 @cond_branch\n" - " ldr r0, ._246\n" - " mov r1, #0x2\n" - "._241:\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " b ._245\n" - "._247:\n" - " .align 2, 0\n" - "._246:\n" - " .word gStringVar2\n" - "._244:\n" - " ldr r0, ._253\n" - " mov r1, #0x0\n" - " mov r2, #0x1\n" - " mov r3, #0x1\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0x0\n" - " strh r0, [r4]\n" - "._245:\n" - " add r0, r6, r5\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r9\n" - " ldr r2, ._253 + 4\n" - " add r0, r0, r2\n" - " ldrh r1, [r0]\n" - " mov r0, #0xb\n" - " mul r1, r1, r0\n" - " ldr r0, ._253 + 8\n" - " add r1, r1, r0\n" - " ldr r0, ._253 + 12\n" - " bl StringCopy\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x2\n" - " ldr r0, [sp, #0x110]\n" - " add r4, r0, r4\n" - " add r0, r4, #0\n" - " add r1, sp, #0x8\n" - " bl StringExpandPlaceholders\n" - " mov r1, r8\n" - " add r0, r1, r6\n" - " str r4, [r0]\n" - " mov r2, sl\n" - " add r0, r2, r6\n" - " mov r4, #0x0\n" - " str r4, [r0]\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " cmp r5, #0x8\n" - " bls ._248 @cond_branch\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x10\n" - " mov r3, #0x13\n" - " bl Menu_DrawStdWindowFrame\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x9\n" - " mov r3, r8\n" - " bl Menu_PrintItems\n" - " str r4, [sp]\n" - " mov r0, #0xf\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x9\n" - " bl InitMenu\n" - " cmp r7, #0x1\n" - " beq ._249 @cond_branch\n" - " cmp r7, #0x1\n" - " bgt ._250 @cond_branch\n" - " cmp r7, #0\n" - " beq ._251 @cond_branch\n" - " b ._257\n" - "._254:\n" - " .align 2, 0\n" - "._253:\n" - " .word gStringVar2\n" - " .word 0x2b6a\n" - " .word gSpeciesNames\n" - " .word gStringVar3\n" - "._250:\n" - " cmp r7, #0x2\n" - " beq ._255 @cond_branch\n" - " cmp r7, #0x3\n" - " beq ._256 @cond_branch\n" - " b ._257\n" - "._251:\n" - " ldr r1, ._259\n" - " ldr r0, ._259 + 4\n" - " b ._264\n" - "._260:\n" - " .align 2, 0\n" - "._259:\n" - " .word gMenuCallback\n" - " .word debug_sub_810CE48+1\n" - "._249:\n" - " ldr r1, ._262\n" - " ldr r0, ._262 + 4\n" - " b ._264\n" - "._263:\n" - " .align 2, 0\n" - "._262:\n" - " .word gMenuCallback\n" - " .word debug_sub_810CED0+1\n" - "._255:\n" - " ldr r1, ._265\n" - " ldr r0, ._265 + 4\n" - " b ._264\n" - "._266:\n" - " .align 2, 0\n" - "._265:\n" - " .word gMenuCallback\n" - " .word debug_sub_810CFA4+1\n" - "._256:\n" - " ldr r1, ._267\n" - " ldr r0, ._267 + 4\n" - "._264:\n" - " str r0, [r1]\n" - "._257:\n" - " add sp, sp, #0x114\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._268:\n" - " .align 2, 0\n" - "._267:\n" - " .word gMenuCallback\n" - " .word debug_sub_810D030+1\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_810D2F4() +void debug_sub_810D340(void) { - asm( - " push {lr}\n" - " bl Menu_ProcessInput\n" - " lsl r2, r0, #0x18\n" - " asr r1, r2, #0x18\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " cmp r1, r0\n" - " beq ._269 @cond_branch\n" - " add r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._270 @cond_branch\n" - " ldr r0, ._272\n" - " bl SetMainCallback2\n" - " b ._279\n" - "._273:\n" - " .align 2, 0\n" - "._272:\n" - " .word debug_sub_810CDF0+1\n" - "._270:\n" - " cmp r1, #0x1\n" - " beq ._278 @cond_branch\n" - " cmp r1, #0x1\n" - " bgt ._275 @cond_branch\n" - " cmp r1, #0\n" - " beq ._278 @cond_branch\n" - " b ._279\n" - "._275:\n" - " cmp r1, #0x2\n" - " beq ._278 @cond_branch\n" - " cmp r1, #0x3\n" - " bne ._279 @cond_branch\n" - "._278:\n" - " lsr r0, r2, #0x18\n" - " bl debug_sub_810D174\n" - "._269:\n" - " mov r0, #0x0\n" - " b ._280\n" - "._279:\n" - " mov r0, #0x1\n" - "._280:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + Menu_DrawStdWindowFrame(0, 0, 9, 9); + Menu_PrintItems(2, 1, 4, _84116BC); + InitMenu(0, 1, 1, 4, 0, 8); + gMenuCallback = debug_sub_810D2F4; } -__attribute__((naked)) -void debug_sub_810D340() +void debug_sub_810D388(void) { - asm( - " push {lr}\n" - " add sp, sp, #0xfffffff8\n" - " mov r0, #0x0\n" - " mov r1, #0x0\n" - " mov r2, #0x9\n" - " mov r3, #0x9\n" - " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._281\n" - " mov r0, #0x2\n" - " mov r1, #0x1\n" - " mov r2, #0x4\n" - " bl Menu_PrintItems\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x8\n" - " str r0, [sp, #0x4]\n" - " mov r0, #0x0\n" - " mov r1, #0x1\n" - " mov r2, #0x1\n" - " mov r3, #0x4\n" - " bl InitMenu\n" - " ldr r1, ._281 + 4\n" - " ldr r0, ._281 + 8\n" - " str r0, [r1]\n" - " add sp, sp, #0x8\n" - " pop {r0}\n" - " bx r0\n" - "._282:\n" - " .align 2, 0\n" - "._281:\n" - " .word _84116BC\n" - " .word gMenuCallback\n" - " .word debug_sub_810D2F4+1\n" - "\n" - ); + switch (gMain.state) + { + case 0: + if (gUnknown_Debug_0300079C != 0) + { + gMain.state = 2; + gUnknown_Debug_0300079C = 0; + return; + } + else + { + ScanlineEffect_Stop(); + ResetPaletteFade(); + SetVBlankCallback(sub_80F8F18); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + } + break; + case 1: + if (UpdatePaletteFade()) + return; + break; + case 2: + SetVBlankCallback(NULL); + REG_BG0HOFS = 0; + REG_BG0VOFS = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + REG_BG2VOFS = 0; + REG_BG2HOFS = 0; + REG_BG3HOFS = 0; + REG_BG3VOFS = 0; + break; + case 3: + ResetSpriteData(); + ResetTasks(); + FreeAllSpritePalettes(); + break; + case 4: + Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); + InitMenuWindow(&gWindowTemplate_81E6CE4); + Menu_EraseScreen(); + break; + case 5: + LoadPalette(gMailGraphicsTable[0].palette, 0, 32); + LZ77UnCompVram(gMailGraphicsTable[0].tiles, (void *)VRAM); + DmaFill16(3, 1, (void *)(VRAM + 0x4000), 0x500); + break; + case 6: + REG_BG0CNT = 0x9F08; + REG_BG1CNT = 0x0801; + REG_BLDCNT = 0; + REG_DISPCNT = 0x0340; + debug_sub_810D340(); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + SetVBlankCallback(sub_80F8F18); + break; + case 7: + if (!UpdatePaletteFade()) + return; + break; + case 8: + CreateTask(debug_sub_810CE1C, 0); + SetMainCallback2(debug_sub_810CDE0); + break; + default: + return; + } + gMain.state++; } -__attribute__((naked)) -void debug_sub_810D388() -{ - asm( - " push {r4, lr}\n" - " add sp, sp, #0xfffffff8\n" - " ldr r1, ._285\n" - " ldr r2, ._285 + 4\n" - " add r0, r1, r2\n" - " ldrb r0, [r0]\n" - " add r2, r1, #0\n" - " cmp r0, #0x8\n" - " bls ._283 @cond_branch\n" - " b ._320\n" - "._283:\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._285 + 8\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._286:\n" - " .align 2, 0\n" - "._285:\n" - " .word gMain\n" - " .word 0x43c\n" - " .word ._287\n" - "._287:\n" - " .word ._288\n" - " .word ._289\n" - " .word ._290\n" - " .word ._291\n" - " .word ._292\n" - " .word ._293\n" - " .word ._294\n" - " .word ._295\n" - " .word ._296\n" - "._288:\n" - " ldr r3, ._299\n" - " ldrb r4, [r3]\n" - " cmp r4, #0\n" - " beq ._297 @cond_branch\n" - " ldr r1, ._299 + 4\n" - " add r0, r2, r1\n" - " mov r2, #0x0\n" - " mov r1, #0x2\n" - " strb r1, [r0]\n" - " strb r2, [r3]\n" - " b ._320\n" - "._300:\n" - " .align 2, 0\n" - "._299:\n" - " .word gUnknown_Debug_0300079C\n" - " .word 0x43c\n" - "._297:\n" - " bl ScanlineEffect_Stop\n" - " bl ResetPaletteFade\n" - " ldr r0, ._302\n" - " bl SetVBlankCallback\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " str r4, [sp]\n" - " mov r1, #0x0\n" - " mov r2, #0x0\n" - " mov r3, #0x10\n" - " bl BeginNormalPaletteFade\n" - " b ._321\n" - "._303:\n" - " .align 2, 0\n" - "._302:\n" - " .word sub_80F8F18+1\n" - "._289:\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._304 @cond_branch\n" - " b ._320\n" - "._304:\n" - " b ._321\n" - "._290:\n" - " mov r0, #0x0\n" - " bl SetVBlankCallback\n" - " ldr r0, ._308\n" - " mov r1, #0x0\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " add r0, r0, #0x4\n" - " strh r1, [r0]\n" - " sub r0, r0, #0x2\n" - " strh r1, [r0]\n" - " add r0, r0, #0x4\n" - " strh r1, [r0]\n" - " add r0, r0, #0x2\n" - " strh r1, [r0]\n" - " b ._321\n" - "._309:\n" - " .align 2, 0\n" - "._308:\n" - " .word 0x4000010\n" - "._291:\n" - " bl ResetSpriteData\n" - " bl ResetTasks\n" - " bl FreeAllSpritePalettes\n" - " b ._321\n" - "._292:\n" - " ldr r4, ._312\n" - " add r0, r4, #0\n" - " bl Text_LoadWindowTemplate\n" - " add r0, r4, #0\n" - " bl InitMenuWindow\n" - " bl Menu_EraseScreen\n" - " b ._321\n" - "._313:\n" - " .align 2, 0\n" - "._312:\n" - " .word gWindowTemplate_81E6CE4\n" - "._293:\n" - " ldr r4, ._315\n" - " ldr r0, [r4]\n" - " mov r1, #0x0\n" - " mov r2, #0x20\n" - " bl LoadPalette\n" - " ldr r0, [r4, #0x4]\n" - " mov r1, #0xc0\n" - " lsl r1, r1, #0x13\n" - " bl LZ77UnCompVram\n" - " add r1, sp, #0x4\n" - " mov r0, #0x1\n" - " strh r0, [r1]\n" - " ldr r1, ._315 + 4\n" - " add r2, sp, #0x4\n" - " str r2, [r1]\n" - " ldr r0, ._315 + 8\n" - " str r0, [r1, #0x4]\n" - " ldr r0, ._315 + 12\n" - " str r0, [r1, #0x8]\n" - " ldr r0, [r1, #0x8]\n" - " b ._321\n" - "._316:\n" - " .align 2, 0\n" - "._315:\n" - " .word gMailGraphicsTable\n" - " .word 0x40000d4\n" - " .word 0x6004000\n" - " .word 0x81000280\n" - "._294:\n" - " ldr r1, ._318\n" - " ldr r2, ._318 + 4\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r2, ._318 + 8\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " add r1, r1, #0x46\n" - " mov r0, #0x0\n" - " strh r0, [r1]\n" - " sub r1, r1, #0x50\n" - " mov r2, #0xd0\n" - " lsl r2, r2, #0x2\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " bl debug_sub_810D340\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - " mov r1, #0x0\n" - " str r1, [sp]\n" - " mov r2, #0x10\n" - " mov r3, #0x0\n" - " bl BeginNormalPaletteFade\n" - " ldr r0, ._318 + 12\n" - " bl SetVBlankCallback\n" - " b ._321\n" - "._319:\n" - " .align 2, 0\n" - "._318:\n" - " .word 0x4000008\n" - " .word 0x9f08\n" - " .word 0x801\n" - " .word sub_80F8F18+1\n" - "._295:\n" - " bl UpdatePaletteFade\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._320 @cond_branch\n" - " b ._321\n" - "._296:\n" - " ldr r0, ._322\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " ldr r0, ._322 + 4\n" - " bl SetMainCallback2\n" - "._321:\n" - " ldr r1, ._322 + 8\n" - " ldr r0, ._322 + 12\n" - " add r1, r1, r0\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - "._320:\n" - " add sp, sp, #0x8\n" - " pop {r4}\n" - " pop {r0}\n" - " bx r0\n" - "._323:\n" - " .align 2, 0\n" - "._322:\n" - " .word debug_sub_810CE1C+1\n" - " .word debug_sub_810CDE0+1\n" - " .word gMain\n" - " .word 0x43c\n" - "\n" - ); -} -#endif \ No newline at end of file +#endif -- cgit v1.2.3 From 092eba3155abf78bfdde1dbe3f140fdbfa9f5081 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 25 Jan 2018 16:50:16 -0600 Subject: integrate debug functions in contest.c --- src/contest.c | 1022 +++++++++++---------------------------------------------- 1 file changed, 187 insertions(+), 835 deletions(-) diff --git a/src/contest.c b/src/contest.c index 950b26d0c..2f988b9e4 100644 --- a/src/contest.c +++ b/src/contest.c @@ -33,6 +33,8 @@ #include "util.h" #include "contest_ai.h" +extern u8 gUnknown_020297ED; + extern u8 AreMovesContestCombo(u16, u16); // I don't think this is a bool extern void sub_80C8A38(u8); extern void sub_80C8AD0(u8); @@ -238,6 +240,7 @@ void sub_80B0BC4(u8, bool8); void sub_80B0C5C(struct Sprite *); void sub_80B0CB0(struct Sprite *); void sub_80B0CDC(u8, int); +void unref_sub_80B0CF4(void); void sub_80B0D7C(void); void sub_80B1118(void); void sub_80B114C(u8); @@ -611,43 +614,17 @@ void sub_80AB9A0(u8 taskId) } } -#if DEBUG -__attribute__((naked)) -void ContestMainCallback2(void) -{ - asm("\ - push {lr}\n\ - ldr r0, ._122\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._121 @cond_branch\n\ - ldr r0, ._122 + 4\n\ - ldrh r0, [r0, #0x2e]\n\ - cmp r0, #0x4\n\ - bne ._121 @cond_branch\n\ - bl unref_sub_80B0CF4\n\ -._121:\n\ - bl AnimateSprites\n\ - bl RunTasks\n\ - bl BuildOamBuffer\n\ - bl UpdatePaletteFade\n\ - pop {r0}\n\ - bx r0\n\ -._123:\n\ - .align 2, 0\n\ -._122:\n\ - .word gUnknown_020297ED\n\ - .word gMain"); -} -#else void ContestMainCallback2(void) { +#if DEBUG + if (gUnknown_020297ED == 1 && gMain.newKeys == 4) + unref_sub_80B0CF4(); +#endif AnimateSprites(); RunTasks(); BuildOamBuffer(); UpdatePaletteFade(); } -#endif void ContestVBlankCallback(void) { @@ -762,273 +739,9 @@ void sub_80ABCDC(u8 taskId) gTasks[taskId].func = sub_80ABEA0; } +void debug_sub_80B9EBC(u8); + // Handle move selection input -#if DEBUG -__attribute__((naked)) -void sub_80ABEA0(u8 taskId) -{ - asm("\ - push {r4, r5, r6, r7, lr}\n\ - add sp, sp, #0xfffffff8\n\ - lsl r0, r0, #0x18\n\ - lsr r7, r0, #0x18\n\ - mov r6, #0x0\n\ - ldr r0, ._161\n\ - mov ip, r0\n\ - ldr r4, ._161 + 4\n\ - ldr r3, ._161 + 8\n\ - ldrb r0, [r4]\n\ - lsl r0, r0, #0x6\n\ - mov r1, ip\n\ - add r1, r1, #0x1e\n\ - add r1, r0, r1\n\ - mov r2, #0x3\n\ -._158:\n\ - ldrh r0, [r1]\n\ - cmp r0, #0\n\ - beq ._157 @cond_branch\n\ - add r0, r6, #1\n\ - lsl r0, r0, #0x18\n\ - lsr r6, r0, #0x18\n\ -._157:\n\ - add r1, r1, #0x2\n\ - sub r2, r2, #0x1\n\ - cmp r2, #0\n\ - bge ._158 @cond_branch\n\ - ldrh r0, [r3, #0x2e]\n\ - mov r5, #0x1\n\ - and r5, r5, r0\n\ - cmp r5, #0\n\ - beq ._159 @cond_branch\n\ - bl DestroyMenuCursor\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._161 + 12\n\ - lsl r1, r7, #0x2\n\ - add r1, r1, r7\n\ - lsl r1, r1, #0x3\n\ - add r1, r1, r0\n\ - ldr r0, ._161 + 16\n\ - b ._160\n\ -._162:\n\ - .align 2, 0\n\ -._161:\n\ - .word gContestMons\n\ - .word gContestPlayerMonIndex\n\ - .word gMain\n\ - .word gTasks\n\ - .word sub_80AC0C8+1\n\ -._159:\n\ - ldrh r0, [r3, #0x30]\n\ - cmp r0, #0x10\n\ - bne ._163 @cond_branch\n\ - b ._196\n\ -._163:\n\ - cmp r0, #0x10\n\ - bgt ._165 @cond_branch\n\ - cmp r0, #0x2\n\ - beq ._166 @cond_branch\n\ - cmp r0, #0x8\n\ - bne ._167 @cond_branch\n\ - b ._168\n\ -._167:\n\ - b ._196\n\ -._165:\n\ - cmp r0, #0x40\n\ - beq ._170 @cond_branch\n\ - cmp r0, #0x40\n\ - bgt ._171 @cond_branch\n\ - b ._196\n\ -._171:\n\ - cmp r0, #0x80\n\ - beq ._173 @cond_branch\n\ - b ._196\n\ -._166:\n\ - bl sub_814A904\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - mov r0, #0x0\n\ - bl sub_80AFFE0\n\ - ldr r0, ._177\n\ - ldr r1, ._177 + 4\n\ - ldrb r2, [r1]\n\ - ldrb r3, [r1, #0x1]\n\ - ldrb r4, [r1, #0x2]\n\ - str r4, [sp]\n\ - ldrb r1, [r1, #0x3]\n\ - str r1, [sp, #0x4]\n\ - mov r1, #0x0\n\ - bl Text_FillWindowRectDefPalette\n\ - ldr r0, ._177 + 8\n\ - ldrb r0, [r0]\n\ - bl Contest_IsMonsTurnDisabled\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._175 @cond_branch\n\ - ldr r0, ._177 + 12\n\ - ldr r1, ._177 + 16\n\ - bl StringCopy\n\ - b ._176\n\ -._178:\n\ - .align 2, 0\n\ -._177:\n\ - .word gUnknown_03004210\n\ - .word gUnknown_083CA340\n\ - .word gContestPlayerMonIndex\n\ - .word gDisplayedStringBattle\n\ - .word gText_Contest_WhichMoveWillBePlayed\n\ -._175:\n\ - ldr r0, ._180\n\ - ldr r1, ._180 + 4\n\ - bl StringCopy\n\ -._176:\n\ - ldr r5, ._180\n\ - ldr r0, ._180 + 8\n\ - ldrb r1, [r0, #0x1]\n\ - add r1, r1, #0x1\n\ - add r0, r5, #0\n\ - bl InsertStringDigit\n\ - bl sub_80AF138\n\ - ldr r4, ._180 + 12\n\ - add r0, r4, #0\n\ - add r1, r5, #0\n\ - bl StringExpandPlaceholders\n\ - ldr r0, ._180 + 16\n\ - mov r2, #0xc2\n\ - lsl r2, r2, #0x2\n\ - mov r1, #0xf\n\ - str r1, [sp]\n\ - add r1, r4, #0\n\ - mov r3, #0x1\n\ - bl Text_InitWindowAndPrintText\n\ - ldr r0, ._180 + 20\n\ - mov r1, #0x0\n\ - strh r1, [r0]\n\ - ldr r0, ._180 + 24\n\ - strh r1, [r0]\n\ - ldr r1, ._180 + 28\n\ - lsl r0, r7, #0x2\n\ - add r0, r0, r7\n\ - lsl r0, r0, #0x3\n\ - add r0, r0, r1\n\ - ldr r1, ._180 + 32\n\ - str r1, [r0]\n\ - b ._196\n\ -._181:\n\ - .align 2, 0\n\ -._180:\n\ - .word gDisplayedStringBattle\n\ - .word gText_Contest_ButItCantParticipate\n\ - .word gSharedMem+0x19204\n\ - .word gStringVar4\n\ - .word gMenuWindow\n\ - .word gBattle_BG0_Y\n\ - .word gBattle_BG2_Y\n\ - .word gTasks\n\ - .word sub_80ABC70+1\n\ -._170:\n\ - ldr r4, ._184\n\ - mov r0, #0x0\n\ - ldsb r0, [r4, r0]\n\ - bl nullsub_17\n\ - ldrb r0, [r4]\n\ - cmp r0, #0\n\ - bne ._182 @cond_branch\n\ - sub r0, r6, #1\n\ - b ._186\n\ -._185:\n\ - .align 2, 0\n\ -._184:\n\ - .word gSharedMem+0x19204\n\ -._182:\n\ - sub r0, r0, #0x1\n\ - b ._186\n\ -._173:\n\ - ldr r4, ._189\n\ - mov r0, #0x0\n\ - ldsb r0, [r4, r0]\n\ - bl nullsub_17\n\ - ldrb r1, [r4]\n\ - sub r0, r6, #1\n\ - cmp r1, r0\n\ - bne ._187 @cond_branch\n\ - strb r5, [r4]\n\ - b ._188\n\ -._190:\n\ - .align 2, 0\n\ -._189:\n\ - .word gSharedMem+0x19204\n\ -._187:\n\ - add r0, r1, #1\n\ -._186:\n\ - strb r0, [r4]\n\ -._188:\n\ - ldr r4, ._193\n\ - mov r0, #0x0\n\ - ldsb r0, [r4, r0]\n\ - bl sub_80AC0AC\n\ - bl sub_80AED58\n\ - ldr r2, ._193 + 4\n\ - ldrb r1, [r4]\n\ - lsl r1, r1, #0x1\n\ - ldr r0, ._193 + 8\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x6\n\ - add r1, r1, r0\n\ - add r2, r2, #0x1e\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - bl sub_80AEBEC\n\ - cmp r6, #0x1\n\ - bls ._196 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - b ._196\n\ -._194:\n\ - .align 2, 0\n\ -._193:\n\ - .word gSharedMem+0x19204\n\ - .word gContestMons\n\ - .word gContestPlayerMonIndex\n\ -._168:\n\ - ldr r0, ._197\n\ - ldrb r1, [r0]\n\ - cmp r1, #0x1\n\ - bne ._196 @cond_branch\n\ - ldr r0, ._197 + 4\n\ - ldrb r0, [r0]\n\ - add r2, r0, #0\n\ - and r2, r2, r1\n\ - cmp r2, #0\n\ - bne ._196 @cond_branch\n\ - ldr r0, ._197 + 8\n\ - lsl r1, r7, #0x2\n\ - add r1, r1, r7\n\ - lsl r1, r1, #0x3\n\ - add r1, r1, r0\n\ - strh r2, [r1, #0x8]\n\ - ldrb r0, [r4]\n\ - lsl r0, r0, #0x6\n\ - add r0, r0, ip\n\ - ldrh r0, [r0, #0x1e]\n\ - strh r0, [r1, #0xa]\n\ - ldr r0, ._197 + 12\n\ -._160:\n\ - str r0, [r1]\n\ -._196:\n\ - add sp, sp, #0x8\n\ - pop {r4, r5, r6, r7}\n\ - pop {r0}\n\ - bx r0\n\ -._198:\n\ - .align 2, 0\n\ -._197:\n\ - .word gUnknown_020297ED\n\ - .word gIsLinkContest\n\ - .word gTasks\n\ - .word debug_sub_80B9EBC+1"); -} -#else void sub_80ABEA0(u8 taskId) { u8 numMoves = 0; @@ -1100,552 +813,191 @@ void sub_80ABEA0(u8 taskId) if (numMoves > 1) PlaySE(SE_SELECT); break; +#if DEBUG + case START_BUTTON: + if (gUnknown_020297ED == 1 && !(gIsLinkContest & 1)) + { + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = gContestMons[gContestPlayerMonIndex].moves[0]; + gTasks[taskId].func = debug_sub_80B9EBC; + } + break; +#endif } } } -#endif #if DEBUG -__attribute__((naked)) -void debug_sub_80B9EBC() -{ - asm("\ - push {r4, r5, r6, r7, lr}\n\ - mov r7, r8\n\ - push {r7}\n\ - add sp, sp, #0xffffff94\n\ - lsl r0, r0, #0x18\n\ - lsr r4, r0, #0x18\n\ - ldr r1, ._202\n\ - lsl r0, r4, #0x2\n\ - add r0, r0, r4\n\ - lsl r0, r0, #0x3\n\ - add r7, r0, r1\n\ - mov r0, #0x8\n\ - ldsh r2, [r7, r0]\n\ - cmp r2, #0\n\ - beq ._199 @cond_branch\n\ - cmp r2, #0x1\n\ - beq ._200 @cond_branch\n\ - b ._229\n\ -._203:\n\ - .align 2, 0\n\ -._202:\n\ - .word gTasks\n\ -._199:\n\ - ldr r5, ._205\n\ - ldr r4, ._205 + 4\n\ - ldrb r0, [r4]\n\ - mov r8, r0\n\ - ldrb r6, [r4, #0x1]\n\ - ldrb r0, [r4, #0x2]\n\ - str r0, [sp]\n\ - ldrb r0, [r4, #0x3]\n\ - str r0, [sp, #0x4]\n\ - add r0, r5, #0\n\ - mov r1, #0x0\n\ - mov r2, r8\n\ - add r3, r6, #0\n\ - bl Text_FillWindowRectDefPalette\n\ - mov r0, #0xa\n\ - ldsh r1, [r7, r0]\n\ - mov r0, #0xd\n\ - mul r1, r1, r0\n\ - ldr r0, ._205 + 8\n\ - add r1, r1, r0\n\ - mov r2, #0xc2\n\ - lsl r2, r2, #0x2\n\ - str r6, [sp]\n\ - add r0, r5, #0\n\ - mov r3, r8\n\ - bl Text_InitWindowAndPrintText\n\ - mov r0, #0xa\n\ - ldsh r1, [r7, r0]\n\ - add r0, sp, #0x8\n\ - mov r2, #0x2\n\ - mov r3, #0x3\n\ - bl ConvertIntToDecimalStringN\n\ - mov r2, #0xc7\n\ - lsl r2, r2, #0x2\n\ - ldrb r3, [r4, #0x4]\n\ - ldrb r0, [r4, #0x5]\n\ - str r0, [sp]\n\ - add r0, r5, #0\n\ - add r1, sp, #0x8\n\ - bl Text_InitWindowAndPrintText\n\ - bl sub_80AED58\n\ - ldrh r0, [r7, #0xa]\n\ - bl sub_80AEBEC\n\ - ldrh r0, [r7, #0x8]\n\ - add r0, r0, #0x1\n\ - strh r0, [r7, #0x8]\n\ - b ._229\n\ -._206:\n\ - .align 2, 0\n\ -._205:\n\ - .word gUnknown_03004210\n\ - .word gUnknown_083CA340\n\ - .word gMoveNames\n\ -._200:\n\ - ldr r0, ._213\n\ - ldrh r1, [r0, #0x30]\n\ - cmp r1, #0x10\n\ - beq ._207 @cond_branch\n\ - cmp r1, #0x10\n\ - bgt ._208 @cond_branch\n\ - cmp r1, #0x4\n\ - beq ._215 @cond_branch\n\ - cmp r1, #0x4\n\ - bgt ._210 @cond_branch\n\ - cmp r1, #0x2\n\ - beq ._211 @cond_branch\n\ - b ._229\n\ -._214:\n\ - .align 2, 0\n\ -._213:\n\ - .word gMain\n\ -._210:\n\ - cmp r1, #0x8\n\ - beq ._215 @cond_branch\n\ - b ._229\n\ -._208:\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x1\n\ - cmp r1, r0\n\ - beq ._217 @cond_branch\n\ - cmp r1, r0\n\ - bgt ._218 @cond_branch\n\ - cmp r1, #0x20\n\ - beq ._219 @cond_branch\n\ - b ._229\n\ -._218:\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x2\n\ - cmp r1, r0\n\ - beq ._221 @cond_branch\n\ - b ._229\n\ -._219:\n\ - ldrh r0, [r7, #0xa]\n\ - sub r0, r0, #0x1\n\ - b ._223\n\ -._221:\n\ - ldrh r0, [r7, #0xa]\n\ - sub r0, r0, #0xa\n\ -._223:\n\ - strh r0, [r7, #0xa]\n\ - lsl r0, r0, #0x10\n\ - cmp r0, #0\n\ - bgt ._227 @cond_branch\n\ - mov r0, #0xb1\n\ - lsl r0, r0, #0x1\n\ - strh r0, [r7, #0xa]\n\ - b ._227\n\ -._207:\n\ - ldrh r0, [r7, #0xa]\n\ - add r0, r0, #0x1\n\ - b ._226\n\ -._217:\n\ - ldrh r0, [r7, #0xa]\n\ - add r0, r0, #0xa\n\ -._226:\n\ - strh r0, [r7, #0xa]\n\ - lsl r0, r0, #0x10\n\ - mov r1, #0xb1\n\ - lsl r1, r1, #0x11\n\ - cmp r0, r1\n\ - ble ._227 @cond_branch\n\ - strh r2, [r7, #0xa]\n\ -._227:\n\ - ldrh r0, [r7, #0x8]\n\ - sub r0, r0, #0x1\n\ - strh r0, [r7, #0x8]\n\ - b ._229\n\ -._215:\n\ - ldr r0, ._230\n\ - mov r1, #0x0\n\ - strh r1, [r0]\n\ - ldr r0, ._230 + 4\n\ - strh r1, [r0]\n\ - bl sub_80B1BDC\n\ - ldr r1, ._230 + 8\n\ - lsl r0, r4, #0x2\n\ - add r0, r0, r4\n\ - lsl r0, r0, #0x3\n\ - add r0, r0, r1\n\ - mov r1, #0x0\n\ - strh r1, [r0, #0x8]\n\ - ldr r1, ._230 + 12\n\ - str r1, [r0]\n\ - b ._229\n\ -._231:\n\ - .align 2, 0\n\ -._230:\n\ - .word gBattle_BG0_Y\n\ - .word gBattle_BG2_Y\n\ - .word gTasks\n\ - .word debug_sub_80BA054+1\n\ -._211:\n\ - ldr r0, ._232\n\ - mov r1, #0xa0\n\ - strh r1, [r0]\n\ - ldr r0, ._232 + 4\n\ - strh r1, [r0]\n\ - ldr r1, ._232 + 8\n\ - ldr r0, ._232 + 12\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x6\n\ - add r0, r0, r1\n\ - ldrh r2, [r7, #0xa]\n\ - mov r1, #0x0\n\ - strh r2, [r0, #0x1e]\n\ - strh r1, [r7, #0x8]\n\ - strh r1, [r7, #0xa]\n\ - strh r1, [r7, #0xc]\n\ - strh r1, [r7, #0xe]\n\ - ldr r0, ._232 + 16\n\ - str r0, [r7]\n\ -._229:\n\ - add sp, sp, #0x6c\n\ - pop {r3}\n\ - mov r8, r3\n\ - pop {r4, r5, r6, r7}\n\ - pop {r0}\n\ - bx r0\n\ -._233:\n\ - .align 2, 0\n\ -._232:\n\ - .word gBattle_BG0_Y\n\ - .word gBattle_BG2_Y\n\ - .word gContestMons\n\ - .word gContestPlayerMonIndex\n\ - .word sub_80ABCDC+1"); -} -__attribute__((naked)) -void debug_sub_80BA054() -{ - asm("\ - push {r4, r5, r6, r7, lr}\n\ - mov r7, r9\n\ - mov r6, r8\n\ - push {r6, r7}\n\ - lsl r0, r0, #0x18\n\ - lsr r7, r0, #0x18\n\ - ldr r1, ._236\n\ - lsl r0, r7, #0x2\n\ - add r0, r0, r7\n\ - lsl r0, r0, #0x3\n\ - add r0, r0, r1\n\ - mov r2, #0x8\n\ - ldsh r0, [r0, r2]\n\ - add r2, r1, #0\n\ - cmp r0, #0x14\n\ - bls ._234 @cond_branch\n\ - b ._286\n\ -._234:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._236 + 4\n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._237:\n\ - .align 2, 0\n\ -._236:\n\ - .word gTasks\n\ - .word ._238\n\ -._238:\n\ - .word ._239\n\ - .word ._240\n\ - .word ._241\n\ - .word ._242\n\ - .word ._243\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._286\n\ - .word ._259\n\ -._239:\n\ - lsl r0, r7, #0x2\n\ - mov r8, r0\n\ - ldr r2, ._262\n\ - mov r9, r2\n\ - ldr r1, ._262 + 4\n\ - mov r2, #0x0\n\ - add r0, r1, #3\n\ -._260:\n\ - strb r2, [r0]\n\ - sub r0, r0, #0x1\n\ - cmp r0, r1\n\ - bge ._260 @cond_branch\n\ - mov r5, #0x0\n\ - mov r0, r9\n\ - mov r1, #0x0\n\ - mov r2, #0x14\n\ - bl memset\n\ - ldr r4, ._262 + 8\n\ - ldrb r0, [r4]\n\ - bl sub_80B28F0\n\ - ldr r3, ._262 + 12\n\ - ldrb r2, [r4]\n\ - lsl r2, r2, #0x6\n\ - add r0, r2, r3\n\ - ldrh r0, [r0]\n\ - add r1, r3, #0\n\ - add r1, r1, #0x3c\n\ - add r1, r2, r1\n\ - ldr r1, [r1]\n\ - add r3, r3, #0x38\n\ - add r2, r2, r3\n\ - ldr r2, [r2]\n\ - bl sub_80AE9FC\n\ - lsl r0, r0, #0x18\n\ - lsr r6, r0, #0x18\n\ - ldr r2, ._262 + 16\n\ - lsl r0, r6, #0x4\n\ - add r0, r0, r6\n\ - lsl r0, r0, #0x2\n\ - add r3, r0, r2\n\ - mov r4, #0x0\n\ - mov r1, #0x78\n\ - strh r1, [r3, #0x24]\n\ - add r2, r2, #0x1c\n\ - add r0, r0, r2\n\ - ldr r1, ._262 + 20\n\ - str r1, [r0]\n\ - ldr r0, ._262 + 24\n\ - mov r2, r8\n\ - add r1, r2, r7\n\ - lsl r1, r1, #0x3\n\ - add r1, r1, r0\n\ - strh r6, [r1, #0xc]\n\ - ldr r2, ._262 + 28\n\ - ldr r0, ._262 + 32\n\ - ldrb r0, [r0]\n\ - add r0, r0, r2\n\ - strb r6, [r0]\n\ - strh r5, [r1, #0xe]\n\ - ldrh r0, [r1, #0x8]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1, #0x8]\n\ - mov r0, r9\n\ - sub r0, r0, #0xea\n\ - strb r4, [r0]\n\ - b ._286\n\ -._263:\n\ - .align 2, 0\n\ -._262:\n\ - .word gSharedMem+0x19348\n\ - .word gBattleMonForms\n\ - .word gContestPlayerMonIndex\n\ - .word gContestMons\n\ - .word gSprites\n\ - .word sub_80AD8FC+1\n\ - .word gTasks\n\ - .word gObjectBankIDs\n\ - .word gBankAttacker\n\ -._240:\n\ - lsl r0, r7, #0x2\n\ - add r0, r0, r7\n\ - lsl r0, r0, #0x3\n\ - add r7, r0, r2\n\ - ldrb r6, [r7, #0xc]\n\ - ldr r1, ._267\n\ - lsl r0, r6, #0x4\n\ - add r0, r0, r6\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, #0x1c\n\ - add r0, r0, r1\n\ - ldr r1, [r0]\n\ - ldr r0, ._267 + 4\n\ - cmp r1, r0\n\ - beq ._264 @cond_branch\n\ - b ._286\n\ -._264:\n\ - ldr r4, ._267 + 8\n\ - ldrb r1, [r4]\n\ - lsl r0, r1, #0x3\n\ - sub r0, r0, r1\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._267 + 12\n\ - add r0, r0, r1\n\ - ldrh r1, [r7, #0xa]\n\ - mov r5, #0x0\n\ - strh r1, [r0, #0x6]\n\ - ldrb r0, [r4]\n\ - bl sub_80B2790\n\ - ldrb r0, [r4]\n\ - bl sub_80B28F0\n\ - ldrh r0, [r7, #0xa]\n\ - bl SelectContestMoveBankTarget\n\ - ldrh r0, [r7, #0xa]\n\ - bl DoMoveAnim\n\ - strh r5, [r7, #0xe]\n\ - ldrh r0, [r7, #0x8]\n\ - add r0, r0, #0x1\n\ - strh r0, [r7, #0x8]\n\ - b ._286\n\ -._268:\n\ - .align 2, 0\n\ -._267:\n\ - .word gSprites\n\ - .word SpriteCallbackDummy+1\n\ - .word gContestPlayerMonIndex\n\ - .word gSharedMem+0x19260\n\ -._241:\n\ - ldr r0, ._273\n\ - ldr r0, [r0]\n\ - bl _call_via_r0\n\ - ldr r0, ._273 + 4\n\ - ldrb r4, [r0]\n\ - cmp r4, #0\n\ - beq ._269 @cond_branch\n\ - b ._286\n\ -._269:\n\ - ldr r0, ._273 + 8\n\ - ldrb r0, [r0]\n\ - bl sub_80B28CC\n\ - ldr r0, ._273 + 12\n\ - add r0, r0, #0x5a\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._271 @cond_branch\n\ - ldr r0, ._273 + 16\n\ - lsl r1, r7, #0x2\n\ - add r1, r1, r7\n\ - lsl r1, r1, #0x3\n\ - add r1, r1, r0\n\ - strh r4, [r1, #0x1c]\n\ - mov r0, #0x14\n\ - strh r0, [r1, #0x8]\n\ - b ._286\n\ -._274:\n\ - .align 2, 0\n\ -._273:\n\ - .word gAnimScriptCallback\n\ - .word gAnimScriptActive\n\ - .word gContestPlayerMonIndex\n\ - .word gSharedMem+0x19204\n\ - .word gTasks\n\ -._271:\n\ - ldr r0, ._276\n\ - lsl r1, r7, #0x2\n\ - add r1, r1, r7\n\ - lsl r1, r1, #0x3\n\ - add r1, r1, r0\n\ - ldrh r0, [r1, #0x8]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1, #0x8]\n\ - b ._286\n\ -._277:\n\ - .align 2, 0\n\ -._276:\n\ - .word gTasks\n\ -._242:\n\ - lsl r0, r7, #0x2\n\ - add r0, r0, r7\n\ - lsl r0, r0, #0x3\n\ - add r4, r0, r2\n\ - ldrh r0, [r4, #0xe]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4, #0xe]\n\ - lsl r0, r0, #0x10\n\ - asr r0, r0, #0x10\n\ - cmp r0, #0x15\n\ - bne ._286 @cond_branch\n\ - ldrb r6, [r4, #0xc]\n\ - ldr r1, ._280\n\ - lsl r0, r6, #0x4\n\ - add r0, r0, r6\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, #0x1c\n\ - add r0, r0, r1\n\ - ldr r1, ._280 + 4\n\ - str r1, [r0]\n\ - bl sub_80B1B14\n\ - mov r0, #0x0\n\ - strh r0, [r4, #0xe]\n\ - ldrh r0, [r4, #0x8]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4, #0x8]\n\ - b ._286\n\ -._281:\n\ - .align 2, 0\n\ -._280:\n\ - .word gSprites\n\ - .word sub_80AD92C+1\n\ -._243:\n\ - lsl r0, r7, #0x2\n\ - add r0, r0, r7\n\ - lsl r0, r0, #0x3\n\ - add r5, r0, r2\n\ - ldrb r6, [r5, #0xc]\n\ - ldr r1, ._284\n\ - lsl r0, r6, #0x4\n\ - add r0, r0, r6\n\ - lsl r0, r0, #0x2\n\ - add r4, r0, r1\n\ - add r0, r4, #0\n\ - add r0, r0, #0x3e\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x1d\n\ - cmp r0, #0\n\ - bge ._286 @cond_branch\n\ - add r0, r4, #0\n\ - bl FreeSpriteOamMatrix\n\ - add r0, r4, #0\n\ - bl DestroySprite\n\ - mov r0, #0x0\n\ - strh r0, [r5, #0x8]\n\ - ldr r0, ._284 + 4\n\ - str r0, [r5]\n\ - ldr r0, ._284 + 8\n\ - mov r1, #0xa0\n\ - strh r1, [r0]\n\ - ldr r0, ._284 + 12\n\ - strh r1, [r0]\n\ - b ._286\n\ -._285:\n\ - .align 2, 0\n\ -._284:\n\ - .word gSprites\n\ - .word debug_sub_80B9EBC+1\n\ - .word gBattle_BG0_Y\n\ - .word gBattle_BG2_Y\n\ -._259:\n\ - lsl r0, r7, #0x2\n\ - add r0, r0, r7\n\ - lsl r0, r0, #0x3\n\ - add r2, r0, r2\n\ - ldrh r0, [r2, #0x1c]\n\ - add r1, r0, #1\n\ - strh r1, [r2, #0x1c]\n\ - lsl r0, r0, #0x10\n\ - asr r0, r0, #0x10\n\ - cmp r0, #0x1e\n\ - ble ._286 @cond_branch\n\ - mov r0, #0x0\n\ - strh r0, [r2, #0x1c]\n\ - mov r0, #0x1\n\ - strh r0, [r2, #0x8]\n\ -._286:\n\ - pop {r3, r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4, r5, r6, r7}\n\ - pop {r0}\n\ - bx r0"); +void debug_sub_80BA054(u8); + +void debug_sub_80B9EBC(u8 taskId) +{ + u8 text[100]; + + switch (gTasks[taskId].data[0]) + { + case 0: + Text_FillWindowRectDefPalette( + &gUnknown_03004210, + 0, + gUnknown_083CA340[0][0], + gUnknown_083CA340[0][1], + gUnknown_083CA340[0][2], + gUnknown_083CA340[0][3]); + Text_InitWindowAndPrintText( + &gUnknown_03004210, + gMoveNames[gTasks[taskId].data[1]], + 776, + gUnknown_083CA340[0][0], + gUnknown_083CA340[0][1]); + ConvertIntToDecimalStringN(text, gTasks[taskId].data[1], 2, 3); + Text_InitWindowAndPrintText( + &gUnknown_03004210, + text, + 796, + gUnknown_083CA340[1][0], + gUnknown_083CA340[1][1]); + sub_80AED58(); + sub_80AEBEC(gTasks[taskId].data[1]); + gTasks[taskId].data[0]++; + break; + case 1: + switch (gMain.newAndRepeatedKeys) + { + case 0x20: + gTasks[taskId].data[1] -= 1; + if (gTasks[taskId].data[1] < 1) + gTasks[taskId].data[1] = 354; + gTasks[taskId].data[0]--; + break; + case 0x200: + gTasks[taskId].data[1] -= 10; + if (gTasks[taskId].data[1] < 1) + gTasks[taskId].data[1] = 354; + gTasks[taskId].data[0]--; + break; + case 0x10: + gTasks[taskId].data[1] += 1; + if (gTasks[taskId].data[1] > 354) + gTasks[taskId].data[1] = 1; + gTasks[taskId].data[0]--; + break; + case 0x100: + gTasks[taskId].data[1] += 10; + if (gTasks[taskId].data[1] > 354) + gTasks[taskId].data[1] = 1; + gTasks[taskId].data[0]--; + break; + case 4: + case 8: + gBattle_BG0_Y = 0; + gBattle_BG2_Y = 0; + sub_80B1BDC(); + gTasks[taskId].data[0] = 0; + gTasks[taskId].func = debug_sub_80BA054; + break; + case 2: + gBattle_BG0_Y = DISPLAY_HEIGHT; + gBattle_BG2_Y = DISPLAY_HEIGHT; + gContestMons[gContestPlayerMonIndex].moves[0] = gTasks[taskId].data[1]; + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = 0; + gTasks[taskId].data[2] = 0; + gTasks[taskId].data[3] = 0; + gTasks[taskId].func = sub_80ABCDC; + break; + } + break; + } +} + +void debug_sub_80BA054(u8 taskId) +{ + s32 i; + u8 r6; + + switch (gTasks[taskId].data[0]) + { + case 0: + for (i = 0; i < 4; i++) + gBattleMonForms[i] = 0; + memset(&shared19348, 0, sizeof(shared19348)); + sub_80B28F0(gContestPlayerMonIndex); + r6 = sub_80AE9FC( + gContestMons[gContestPlayerMonIndex].species, + gContestMons[gContestPlayerMonIndex].otId, + gContestMons[gContestPlayerMonIndex].personality); + gSprites[r6].pos2.x = 120; + gSprites[r6].callback = sub_80AD8FC; + gTasks[taskId].data[2] = r6; + gObjectBankIDs[gBankAttacker] = r6; + gTasks[taskId].data[3] = 0; + gTasks[taskId].data[0]++; + sContest.unk1925E = 0; + break; + case 1: + r6 = gTasks[taskId].data[2]; + if (gSprites[r6].callback == SpriteCallbackDummy) + { + sContestantStatus[gContestPlayerMonIndex].currMove = gTasks[taskId].data[1]; + sub_80B2790(gContestPlayerMonIndex); + sub_80B28F0(gContestPlayerMonIndex); + SelectContestMoveBankTarget(gTasks[taskId].data[1]); + DoMoveAnim(gTasks[taskId].data[1]); + gTasks[taskId].data[3] = 0; + gTasks[taskId].data[0]++; + } + break; + case 2: + gAnimScriptCallback(); + if (!gAnimScriptActive) + { + sub_80B28CC(gContestPlayerMonIndex); + if (sContest.unk1925E != 0) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 20; + } + else + { + gTasks[taskId].data[0]++; + } + } + break; + case 3: + gTasks[taskId].data[3]++; + if (gTasks[taskId].data[3] == 21) + { + r6 = gTasks[taskId].data[2]; + gSprites[r6].callback = sub_80AD92C; + sub_80B1B14(); + gTasks[taskId].data[3] = 0; + gTasks[taskId].data[0]++; + } + break; + case 4: + r6 = gTasks[taskId].data[2]; + if (gSprites[r6].invisible) + { + FreeSpriteOamMatrix(&gSprites[r6]); + DestroySprite(&gSprites[r6]); + gTasks[taskId].data[0] = 0; + gTasks[taskId].func = debug_sub_80B9EBC; + gBattle_BG0_Y = DISPLAY_HEIGHT; + gBattle_BG2_Y = DISPLAY_HEIGHT; + } + break; + case 20: + if (gTasks[taskId].data[10]++ > 30) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[0] = 1; + } + break; + } } + #endif void sub_80AC0AC(s8 a) -- cgit v1.2.3 From 9f7fa5781e8de8e23faea3785e8b3aebde79c8c6 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 25 Jan 2018 17:15:37 -0600 Subject: decompile sub_813B79C --- src/engine/save.c | 98 ++++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 73 deletions(-) diff --git a/src/engine/save.c b/src/engine/save.c index 0eb93eb1d..0b7a3dd79 100644 --- a/src/engine/save.c +++ b/src/engine/save.c @@ -664,79 +664,31 @@ static u16 CalculateChecksum(void *data, u16 size) } #if DEBUG -__attribute__((naked)) -void sub_813B79C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " ldr r4, ._163\n" - " ldr r6, ._163 + 4\n" - " mov r5, #0x0\n" - "._161:\n" - " lsl r0, r5, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r1, r4, #0\n" - " bl DoReadFlashWholeSection\n" - " ldr r1, ._163 + 8\n" - " add r0, r4, r1\n" - " ldrh r0, [r0]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r6\n" - " ldrh r1, [r0, #0x4]\n" - " add r0, r4, #0\n" - " bl CalculateChecksum\n" - " ldr r2, ._163 + 12\n" - " add r1, r4, r2\n" - " strh r0, [r1]\n" - " add r0, r5, #0\n" - " add r1, r4, #0\n" - " bl ProgramFlashSectorAndVerify\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " cmp r5, #0x1b\n" - " bls ._161 @cond_branch\n" - " ldr r6, ._163\n" - " ldr r7, ._163 + 16\n" - " mov r5, #0x0\n" - "._162:\n" - " add r4, r5, #0\n" - " add r4, r4, #0x1c\n" - " lsl r0, r4, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r1, r6, #0\n" - " bl DoReadFlashWholeSection\n" - " lsl r0, r5, #0x3\n" - " add r0, r0, r7\n" - " ldrh r1, [r0, #0x4]\n" - " add r0, r6, #0\n" - " bl CalculateChecksum\n" - " ldr r2, ._163 + 8\n" - " add r1, r6, r2\n" - " strh r0, [r1]\n" - " lsl r4, r4, #0x10\n" - " lsr r4, r4, #0x10\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl ProgramFlashSectorAndVerify\n" - " add r0, r5, #1\n" - " lsl r0, r0, #0x10\n" - " lsr r5, r0, #0x10\n" - " cmp r5, #0x1\n" - " bls ._162 @cond_branch\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._164:\n" - " .align 2, 0\n" - "._163:\n" - " .word +0x2000000\n" - " .word sSaveBlockChunks\n" - " .word 0xff4\n" - " .word 0xff6\n" - " .word sHallOfFameChunks\n" - "\n" - ); +void sub_813B79C(void) +{ + struct SaveSector *sbSector; + struct SaveSector *hofSector; + const struct SaveBlockChunk *sbChunks; + const struct SaveBlockChunk *hofChunks; + u16 i; + + sbSector = eSaveSection; + sbChunks = sSaveBlockChunks; + for (i = 0; i < NUM_SECTORS_PER_SAVE_SLOT * 2; i++) + { + DoReadFlashWholeSection(i, sbSector); + sbSector->checksum = CalculateChecksum(sbSector, sbChunks[sbSector->id].size); + ProgramFlashSectorAndVerify(i, sbSector->data); + } + + hofSector = eSaveSection; + hofChunks = sHallOfFameChunks; + for (i = 0; i < NUM_HALL_OF_FAME_SECTORS; i++) + { + DoReadFlashWholeSection(HALL_OF_FAME_SECTOR + i, hofSector); + hofSector->id = CalculateChecksum(hofSector, hofChunks[i].size); // why id? + ProgramFlashSectorAndVerify(HALL_OF_FAME_SECTOR + i, hofSector->data); + } } #endif -- cgit v1.2.3 From 5ffae54ea24eeaa1b2b1e31543b123a6304ee226 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 25 Jan 2018 16:02:49 -0800 Subject: Move phonemes to their own directory --- sound/direct_sound_data.inc | 114 ++++++++++++------------ sound/direct_sound_samples/84A7328.aif | Bin 3186 -> 0 bytes sound/direct_sound_samples/84A7F38.aif | Bin 3057 -> 0 bytes sound/direct_sound_samples/84A8AC8.aif | Bin 2814 -> 0 bytes sound/direct_sound_samples/84A9564.aif | Bin 2474 -> 0 bytes sound/direct_sound_samples/84A9EAC.aif | Bin 2729 -> 0 bytes sound/direct_sound_samples/84AA8F4.aif | Bin 3305 -> 0 bytes sound/direct_sound_samples/8639898.aif | Bin 1697 -> 0 bytes sound/direct_sound_samples/8639EF8.aif | Bin 1350 -> 0 bytes sound/direct_sound_samples/863A3DC.aif | Bin 2447 -> 0 bytes sound/direct_sound_samples/863AD2C.aif | Bin 2738 -> 0 bytes sound/direct_sound_samples/863B79C.aif | Bin 897 -> 0 bytes sound/direct_sound_samples/863BABC.aif | Bin 3273 -> 0 bytes sound/direct_sound_samples/863C744.aif | Bin 1634 -> 0 bytes sound/direct_sound_samples/863CD64.aif | Bin 999 -> 0 bytes sound/direct_sound_samples/863D0EC.aif | Bin 3619 -> 0 bytes sound/direct_sound_samples/863DED0.aif | Bin 2481 -> 0 bytes sound/direct_sound_samples/863E840.aif | Bin 1021 -> 0 bytes sound/direct_sound_samples/863EBDC.aif | Bin 2035 -> 0 bytes sound/direct_sound_samples/863F390.aif | Bin 3483 -> 0 bytes sound/direct_sound_samples/86400EC.aif | Bin 678 -> 0 bytes sound/direct_sound_samples/8640330.aif | Bin 3711 -> 0 bytes sound/direct_sound_samples/8641170.aif | Bin 2451 -> 0 bytes sound/direct_sound_samples/8641AC4.aif | Bin 948 -> 0 bytes sound/direct_sound_samples/8641E18.aif | Bin 1651 -> 0 bytes sound/direct_sound_samples/864244C.aif | Bin 3243 -> 0 bytes sound/direct_sound_samples/86430B8.aif | Bin 1529 -> 0 bytes sound/direct_sound_samples/8643650.aif | Bin 2883 -> 0 bytes sound/direct_sound_samples/8644154.aif | Bin 1605 -> 0 bytes sound/direct_sound_samples/8644758.aif | Bin 599 -> 0 bytes sound/direct_sound_samples/8644950.aif | Bin 2467 -> 0 bytes sound/direct_sound_samples/86452B4.aif | Bin 4043 -> 0 bytes sound/direct_sound_samples/8646240.aif | Bin 1687 -> 0 bytes sound/direct_sound_samples/8646878.aif | Bin 2835 -> 0 bytes sound/direct_sound_samples/864734C.aif | Bin 3974 -> 0 bytes sound/direct_sound_samples/8648290.aif | Bin 1498 -> 0 bytes sound/direct_sound_samples/8648808.aif | Bin 3723 -> 0 bytes sound/direct_sound_samples/8649654.aif | Bin 3911 -> 0 bytes sound/direct_sound_samples/864A55C.aif | Bin 2870 -> 0 bytes sound/direct_sound_samples/864B030.aif | Bin 3027 -> 0 bytes sound/direct_sound_samples/864BBC4.aif | Bin 2583 -> 0 bytes sound/direct_sound_samples/864C59C.aif | Bin 1696 -> 0 bytes sound/direct_sound_samples/864CBDC.aif | Bin 2847 -> 0 bytes sound/direct_sound_samples/864D6BC.aif | Bin 1660 -> 0 bytes sound/direct_sound_samples/864DCF8.aif | Bin 1912 -> 0 bytes sound/direct_sound_samples/864E410.aif | Bin 2427 -> 0 bytes sound/direct_sound_samples/864ED4C.aif | Bin 2043 -> 0 bytes sound/direct_sound_samples/864F508.aif | Bin 1478 -> 0 bytes sound/direct_sound_samples/864FA6C.aif | Bin 3507 -> 0 bytes sound/direct_sound_samples/86507E0.aif | Bin 1213 -> 0 bytes sound/direct_sound_samples/8650C5C.aif | Bin 1358 -> 0 bytes sound/direct_sound_samples/8651148.aif | Bin 2055 -> 0 bytes sound/direct_sound_samples/8651910.aif | Bin 3133 -> 0 bytes sound/direct_sound_samples/865250C.aif | Bin 984 -> 0 bytes sound/direct_sound_samples/8652884.aif | Bin 2043 -> 0 bytes sound/direct_sound_samples/8653040.aif | Bin 3235 -> 0 bytes sound/direct_sound_samples/8653CA4.aif | Bin 1326 -> 0 bytes sound/direct_sound_samples/8654170.aif | Bin 2799 -> 0 bytes sound/direct_sound_samples/phonemes/84A7328.aif | Bin 0 -> 3186 bytes sound/direct_sound_samples/phonemes/84A7F38.aif | Bin 0 -> 3057 bytes sound/direct_sound_samples/phonemes/84A8AC8.aif | Bin 0 -> 2814 bytes sound/direct_sound_samples/phonemes/84A9564.aif | Bin 0 -> 2474 bytes sound/direct_sound_samples/phonemes/84A9EAC.aif | Bin 0 -> 2729 bytes sound/direct_sound_samples/phonemes/84AA8F4.aif | Bin 0 -> 3305 bytes sound/direct_sound_samples/phonemes/8639898.aif | Bin 0 -> 1697 bytes sound/direct_sound_samples/phonemes/8639EF8.aif | Bin 0 -> 1350 bytes sound/direct_sound_samples/phonemes/863A3DC.aif | Bin 0 -> 2447 bytes sound/direct_sound_samples/phonemes/863AD2C.aif | Bin 0 -> 2738 bytes sound/direct_sound_samples/phonemes/863B79C.aif | Bin 0 -> 897 bytes sound/direct_sound_samples/phonemes/863BABC.aif | Bin 0 -> 3273 bytes sound/direct_sound_samples/phonemes/863C744.aif | Bin 0 -> 1634 bytes sound/direct_sound_samples/phonemes/863CD64.aif | Bin 0 -> 999 bytes sound/direct_sound_samples/phonemes/863D0EC.aif | Bin 0 -> 3619 bytes sound/direct_sound_samples/phonemes/863DED0.aif | Bin 0 -> 2481 bytes sound/direct_sound_samples/phonemes/863E840.aif | Bin 0 -> 1021 bytes sound/direct_sound_samples/phonemes/863EBDC.aif | Bin 0 -> 2035 bytes sound/direct_sound_samples/phonemes/863F390.aif | Bin 0 -> 3483 bytes sound/direct_sound_samples/phonemes/86400EC.aif | Bin 0 -> 678 bytes sound/direct_sound_samples/phonemes/8640330.aif | Bin 0 -> 3711 bytes sound/direct_sound_samples/phonemes/8641170.aif | Bin 0 -> 2451 bytes sound/direct_sound_samples/phonemes/8641AC4.aif | Bin 0 -> 948 bytes sound/direct_sound_samples/phonemes/8641E18.aif | Bin 0 -> 1651 bytes sound/direct_sound_samples/phonemes/864244C.aif | Bin 0 -> 3243 bytes sound/direct_sound_samples/phonemes/86430B8.aif | Bin 0 -> 1529 bytes sound/direct_sound_samples/phonemes/8643650.aif | Bin 0 -> 2883 bytes sound/direct_sound_samples/phonemes/8644154.aif | Bin 0 -> 1605 bytes sound/direct_sound_samples/phonemes/8644758.aif | Bin 0 -> 599 bytes sound/direct_sound_samples/phonemes/8644950.aif | Bin 0 -> 2467 bytes sound/direct_sound_samples/phonemes/86452B4.aif | Bin 0 -> 4043 bytes sound/direct_sound_samples/phonemes/8646240.aif | Bin 0 -> 1687 bytes sound/direct_sound_samples/phonemes/8646878.aif | Bin 0 -> 2835 bytes sound/direct_sound_samples/phonemes/864734C.aif | Bin 0 -> 3974 bytes sound/direct_sound_samples/phonemes/8648290.aif | Bin 0 -> 1498 bytes sound/direct_sound_samples/phonemes/8648808.aif | Bin 0 -> 3723 bytes sound/direct_sound_samples/phonemes/8649654.aif | Bin 0 -> 3911 bytes sound/direct_sound_samples/phonemes/864A55C.aif | Bin 0 -> 2870 bytes sound/direct_sound_samples/phonemes/864B030.aif | Bin 0 -> 3027 bytes sound/direct_sound_samples/phonemes/864BBC4.aif | Bin 0 -> 2583 bytes sound/direct_sound_samples/phonemes/864C59C.aif | Bin 0 -> 1696 bytes sound/direct_sound_samples/phonemes/864CBDC.aif | Bin 0 -> 2847 bytes sound/direct_sound_samples/phonemes/864D6BC.aif | Bin 0 -> 1660 bytes sound/direct_sound_samples/phonemes/864DCF8.aif | Bin 0 -> 1912 bytes sound/direct_sound_samples/phonemes/864E410.aif | Bin 0 -> 2427 bytes sound/direct_sound_samples/phonemes/864ED4C.aif | Bin 0 -> 2043 bytes sound/direct_sound_samples/phonemes/864F508.aif | Bin 0 -> 1478 bytes sound/direct_sound_samples/phonemes/864FA6C.aif | Bin 0 -> 3507 bytes sound/direct_sound_samples/phonemes/86507E0.aif | Bin 0 -> 1213 bytes sound/direct_sound_samples/phonemes/8650C5C.aif | Bin 0 -> 1358 bytes sound/direct_sound_samples/phonemes/8651148.aif | Bin 0 -> 2055 bytes sound/direct_sound_samples/phonemes/8651910.aif | Bin 0 -> 3133 bytes sound/direct_sound_samples/phonemes/865250C.aif | Bin 0 -> 984 bytes sound/direct_sound_samples/phonemes/8652884.aif | Bin 0 -> 2043 bytes sound/direct_sound_samples/phonemes/8653040.aif | Bin 0 -> 3235 bytes sound/direct_sound_samples/phonemes/8653CA4.aif | Bin 0 -> 1326 bytes sound/direct_sound_samples/phonemes/8654170.aif | Bin 0 -> 2799 bytes 115 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 sound/direct_sound_samples/84A7328.aif delete mode 100644 sound/direct_sound_samples/84A7F38.aif delete mode 100644 sound/direct_sound_samples/84A8AC8.aif delete mode 100644 sound/direct_sound_samples/84A9564.aif delete mode 100644 sound/direct_sound_samples/84A9EAC.aif delete mode 100644 sound/direct_sound_samples/84AA8F4.aif delete mode 100644 sound/direct_sound_samples/8639898.aif delete mode 100644 sound/direct_sound_samples/8639EF8.aif delete mode 100644 sound/direct_sound_samples/863A3DC.aif delete mode 100644 sound/direct_sound_samples/863AD2C.aif delete mode 100644 sound/direct_sound_samples/863B79C.aif delete mode 100644 sound/direct_sound_samples/863BABC.aif delete mode 100644 sound/direct_sound_samples/863C744.aif delete mode 100644 sound/direct_sound_samples/863CD64.aif delete mode 100644 sound/direct_sound_samples/863D0EC.aif delete mode 100644 sound/direct_sound_samples/863DED0.aif delete mode 100644 sound/direct_sound_samples/863E840.aif delete mode 100644 sound/direct_sound_samples/863EBDC.aif delete mode 100644 sound/direct_sound_samples/863F390.aif delete mode 100644 sound/direct_sound_samples/86400EC.aif delete mode 100644 sound/direct_sound_samples/8640330.aif delete mode 100644 sound/direct_sound_samples/8641170.aif delete mode 100644 sound/direct_sound_samples/8641AC4.aif delete mode 100644 sound/direct_sound_samples/8641E18.aif delete mode 100644 sound/direct_sound_samples/864244C.aif delete mode 100644 sound/direct_sound_samples/86430B8.aif delete mode 100644 sound/direct_sound_samples/8643650.aif delete mode 100644 sound/direct_sound_samples/8644154.aif delete mode 100644 sound/direct_sound_samples/8644758.aif delete mode 100644 sound/direct_sound_samples/8644950.aif delete mode 100644 sound/direct_sound_samples/86452B4.aif delete mode 100644 sound/direct_sound_samples/8646240.aif delete mode 100644 sound/direct_sound_samples/8646878.aif delete mode 100644 sound/direct_sound_samples/864734C.aif delete mode 100644 sound/direct_sound_samples/8648290.aif delete mode 100644 sound/direct_sound_samples/8648808.aif delete mode 100644 sound/direct_sound_samples/8649654.aif delete mode 100644 sound/direct_sound_samples/864A55C.aif delete mode 100644 sound/direct_sound_samples/864B030.aif delete mode 100644 sound/direct_sound_samples/864BBC4.aif delete mode 100644 sound/direct_sound_samples/864C59C.aif delete mode 100644 sound/direct_sound_samples/864CBDC.aif delete mode 100644 sound/direct_sound_samples/864D6BC.aif delete mode 100644 sound/direct_sound_samples/864DCF8.aif delete mode 100644 sound/direct_sound_samples/864E410.aif delete mode 100644 sound/direct_sound_samples/864ED4C.aif delete mode 100644 sound/direct_sound_samples/864F508.aif delete mode 100644 sound/direct_sound_samples/864FA6C.aif delete mode 100644 sound/direct_sound_samples/86507E0.aif delete mode 100644 sound/direct_sound_samples/8650C5C.aif delete mode 100644 sound/direct_sound_samples/8651148.aif delete mode 100644 sound/direct_sound_samples/8651910.aif delete mode 100644 sound/direct_sound_samples/865250C.aif delete mode 100644 sound/direct_sound_samples/8652884.aif delete mode 100644 sound/direct_sound_samples/8653040.aif delete mode 100644 sound/direct_sound_samples/8653CA4.aif delete mode 100644 sound/direct_sound_samples/8654170.aif create mode 100644 sound/direct_sound_samples/phonemes/84A7328.aif create mode 100644 sound/direct_sound_samples/phonemes/84A7F38.aif create mode 100644 sound/direct_sound_samples/phonemes/84A8AC8.aif create mode 100644 sound/direct_sound_samples/phonemes/84A9564.aif create mode 100644 sound/direct_sound_samples/phonemes/84A9EAC.aif create mode 100644 sound/direct_sound_samples/phonemes/84AA8F4.aif create mode 100644 sound/direct_sound_samples/phonemes/8639898.aif create mode 100644 sound/direct_sound_samples/phonemes/8639EF8.aif create mode 100644 sound/direct_sound_samples/phonemes/863A3DC.aif create mode 100644 sound/direct_sound_samples/phonemes/863AD2C.aif create mode 100644 sound/direct_sound_samples/phonemes/863B79C.aif create mode 100644 sound/direct_sound_samples/phonemes/863BABC.aif create mode 100644 sound/direct_sound_samples/phonemes/863C744.aif create mode 100644 sound/direct_sound_samples/phonemes/863CD64.aif create mode 100644 sound/direct_sound_samples/phonemes/863D0EC.aif create mode 100644 sound/direct_sound_samples/phonemes/863DED0.aif create mode 100644 sound/direct_sound_samples/phonemes/863E840.aif create mode 100644 sound/direct_sound_samples/phonemes/863EBDC.aif create mode 100644 sound/direct_sound_samples/phonemes/863F390.aif create mode 100644 sound/direct_sound_samples/phonemes/86400EC.aif create mode 100644 sound/direct_sound_samples/phonemes/8640330.aif create mode 100644 sound/direct_sound_samples/phonemes/8641170.aif create mode 100644 sound/direct_sound_samples/phonemes/8641AC4.aif create mode 100644 sound/direct_sound_samples/phonemes/8641E18.aif create mode 100644 sound/direct_sound_samples/phonemes/864244C.aif create mode 100644 sound/direct_sound_samples/phonemes/86430B8.aif create mode 100644 sound/direct_sound_samples/phonemes/8643650.aif create mode 100644 sound/direct_sound_samples/phonemes/8644154.aif create mode 100644 sound/direct_sound_samples/phonemes/8644758.aif create mode 100644 sound/direct_sound_samples/phonemes/8644950.aif create mode 100644 sound/direct_sound_samples/phonemes/86452B4.aif create mode 100644 sound/direct_sound_samples/phonemes/8646240.aif create mode 100644 sound/direct_sound_samples/phonemes/8646878.aif create mode 100644 sound/direct_sound_samples/phonemes/864734C.aif create mode 100644 sound/direct_sound_samples/phonemes/8648290.aif create mode 100644 sound/direct_sound_samples/phonemes/8648808.aif create mode 100644 sound/direct_sound_samples/phonemes/8649654.aif create mode 100644 sound/direct_sound_samples/phonemes/864A55C.aif create mode 100644 sound/direct_sound_samples/phonemes/864B030.aif create mode 100644 sound/direct_sound_samples/phonemes/864BBC4.aif create mode 100644 sound/direct_sound_samples/phonemes/864C59C.aif create mode 100644 sound/direct_sound_samples/phonemes/864CBDC.aif create mode 100644 sound/direct_sound_samples/phonemes/864D6BC.aif create mode 100644 sound/direct_sound_samples/phonemes/864DCF8.aif create mode 100644 sound/direct_sound_samples/phonemes/864E410.aif create mode 100644 sound/direct_sound_samples/phonemes/864ED4C.aif create mode 100644 sound/direct_sound_samples/phonemes/864F508.aif create mode 100644 sound/direct_sound_samples/phonemes/864FA6C.aif create mode 100644 sound/direct_sound_samples/phonemes/86507E0.aif create mode 100644 sound/direct_sound_samples/phonemes/8650C5C.aif create mode 100644 sound/direct_sound_samples/phonemes/8651148.aif create mode 100644 sound/direct_sound_samples/phonemes/8651910.aif create mode 100644 sound/direct_sound_samples/phonemes/865250C.aif create mode 100644 sound/direct_sound_samples/phonemes/8652884.aif create mode 100644 sound/direct_sound_samples/phonemes/8653040.aif create mode 100644 sound/direct_sound_samples/phonemes/8653CA4.aif create mode 100644 sound/direct_sound_samples/phonemes/8654170.aif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index d4c39b2f8..9d8f713e0 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -240,27 +240,27 @@ DirectSoundWaveData_84A5F58:: @ 84A5F58 .align 2 DirectSoundWaveData_84A7328:: @ 84A7328 - .incbin "sound/direct_sound_samples/84A7328.bin" + .incbin "sound/direct_sound_samples/phonemes/84A7328.bin" .align 2 DirectSoundWaveData_84A7F38:: @ 84A7F38 - .incbin "sound/direct_sound_samples/84A7F38.bin" + .incbin "sound/direct_sound_samples/phonemes/84A7F38.bin" .align 2 DirectSoundWaveData_84A8AC8:: @ 84A8AC8 - .incbin "sound/direct_sound_samples/84A8AC8.bin" + .incbin "sound/direct_sound_samples/phonemes/84A8AC8.bin" .align 2 DirectSoundWaveData_84A9564:: @ 84A9564 - .incbin "sound/direct_sound_samples/84A9564.bin" + .incbin "sound/direct_sound_samples/phonemes/84A9564.bin" .align 2 DirectSoundWaveData_84A9EAC:: @ 84A9EAC - .incbin "sound/direct_sound_samples/84A9EAC.bin" + .incbin "sound/direct_sound_samples/phonemes/84A9EAC.bin" .align 2 DirectSoundWaveData_84AA8F4:: @ 84AA8F4 - .incbin "sound/direct_sound_samples/84AA8F4.bin" + .incbin "sound/direct_sound_samples/phonemes/84AA8F4.bin" .align 2 Cry_Bulbasaur:: @ 84AB57C @@ -1816,207 +1816,207 @@ Cry_Chimecho:: @ 8638E88 .align 2 DirectSoundWaveData_8639898:: @ 8639898 - .incbin "sound/direct_sound_samples/8639898.bin" + .incbin "sound/direct_sound_samples/phonemes/8639898.bin" .align 2 DirectSoundWaveData_8639EF8:: @ 8639EF8 - .incbin "sound/direct_sound_samples/8639EF8.bin" + .incbin "sound/direct_sound_samples/phonemes/8639EF8.bin" .align 2 DirectSoundWaveData_863A3DC:: @ 863A3DC - .incbin "sound/direct_sound_samples/863A3DC.bin" + .incbin "sound/direct_sound_samples/phonemes/863A3DC.bin" .align 2 DirectSoundWaveData_863AD2C:: @ 863AD2C - .incbin "sound/direct_sound_samples/863AD2C.bin" + .incbin "sound/direct_sound_samples/phonemes/863AD2C.bin" .align 2 DirectSoundWaveData_863B79C:: @ 863B79C - .incbin "sound/direct_sound_samples/863B79C.bin" + .incbin "sound/direct_sound_samples/phonemes/863B79C.bin" .align 2 DirectSoundWaveData_863BABC:: @ 863BABC - .incbin "sound/direct_sound_samples/863BABC.bin" + .incbin "sound/direct_sound_samples/phonemes/863BABC.bin" .align 2 DirectSoundWaveData_863C744:: @ 863C744 - .incbin "sound/direct_sound_samples/863C744.bin" + .incbin "sound/direct_sound_samples/phonemes/863C744.bin" .align 2 DirectSoundWaveData_863CD64:: @ 863CD64 - .incbin "sound/direct_sound_samples/863CD64.bin" + .incbin "sound/direct_sound_samples/phonemes/863CD64.bin" .align 2 DirectSoundWaveData_863D0EC:: @ 863D0EC - .incbin "sound/direct_sound_samples/863D0EC.bin" + .incbin "sound/direct_sound_samples/phonemes/863D0EC.bin" .align 2 DirectSoundWaveData_863DED0:: @ 863DED0 - .incbin "sound/direct_sound_samples/863DED0.bin" + .incbin "sound/direct_sound_samples/phonemes/863DED0.bin" .align 2 DirectSoundWaveData_863E840:: @ 863E840 - .incbin "sound/direct_sound_samples/863E840.bin" + .incbin "sound/direct_sound_samples/phonemes/863E840.bin" .align 2 DirectSoundWaveData_863EBDC:: @ 863EBDC - .incbin "sound/direct_sound_samples/863EBDC.bin" + .incbin "sound/direct_sound_samples/phonemes/863EBDC.bin" .align 2 DirectSoundWaveData_863F390:: @ 863F390 - .incbin "sound/direct_sound_samples/863F390.bin" + .incbin "sound/direct_sound_samples/phonemes/863F390.bin" .align 2 DirectSoundWaveData_86400EC:: @ 86400EC - .incbin "sound/direct_sound_samples/86400EC.bin" + .incbin "sound/direct_sound_samples/phonemes/86400EC.bin" .align 2 DirectSoundWaveData_8640330:: @ 8640330 - .incbin "sound/direct_sound_samples/8640330.bin" + .incbin "sound/direct_sound_samples/phonemes/8640330.bin" .align 2 DirectSoundWaveData_8641170:: @ 8641170 - .incbin "sound/direct_sound_samples/8641170.bin" + .incbin "sound/direct_sound_samples/phonemes/8641170.bin" .align 2 DirectSoundWaveData_8641AC4:: @ 8641AC4 - .incbin "sound/direct_sound_samples/8641AC4.bin" + .incbin "sound/direct_sound_samples/phonemes/8641AC4.bin" .align 2 DirectSoundWaveData_8641E18:: @ 8641E18 - .incbin "sound/direct_sound_samples/8641E18.bin" + .incbin "sound/direct_sound_samples/phonemes/8641E18.bin" .align 2 DirectSoundWaveData_864244C:: @ 864244C - .incbin "sound/direct_sound_samples/864244C.bin" + .incbin "sound/direct_sound_samples/phonemes/864244C.bin" .align 2 DirectSoundWaveData_86430B8:: @ 86430B8 - .incbin "sound/direct_sound_samples/86430B8.bin" + .incbin "sound/direct_sound_samples/phonemes/86430B8.bin" .align 2 DirectSoundWaveData_8643650:: @ 8643650 - .incbin "sound/direct_sound_samples/8643650.bin" + .incbin "sound/direct_sound_samples/phonemes/8643650.bin" .align 2 DirectSoundWaveData_8644154:: @ 8644154 - .incbin "sound/direct_sound_samples/8644154.bin" + .incbin "sound/direct_sound_samples/phonemes/8644154.bin" .align 2 DirectSoundWaveData_8644758:: @ 8644758 - .incbin "sound/direct_sound_samples/8644758.bin" + .incbin "sound/direct_sound_samples/phonemes/8644758.bin" .align 2 DirectSoundWaveData_8644950:: @ 8644950 - .incbin "sound/direct_sound_samples/8644950.bin" + .incbin "sound/direct_sound_samples/phonemes/8644950.bin" .align 2 DirectSoundWaveData_86452B4:: @ 86452B4 - .incbin "sound/direct_sound_samples/86452B4.bin" + .incbin "sound/direct_sound_samples/phonemes/86452B4.bin" .align 2 DirectSoundWaveData_8646240:: @ 8646240 - .incbin "sound/direct_sound_samples/8646240.bin" + .incbin "sound/direct_sound_samples/phonemes/8646240.bin" .align 2 DirectSoundWaveData_8646878:: @ 8646878 - .incbin "sound/direct_sound_samples/8646878.bin" + .incbin "sound/direct_sound_samples/phonemes/8646878.bin" .align 2 DirectSoundWaveData_864734C:: @ 864734C - .incbin "sound/direct_sound_samples/864734C.bin" + .incbin "sound/direct_sound_samples/phonemes/864734C.bin" .align 2 DirectSoundWaveData_8648290:: @ 8648290 - .incbin "sound/direct_sound_samples/8648290.bin" + .incbin "sound/direct_sound_samples/phonemes/8648290.bin" .align 2 DirectSoundWaveData_8648808:: @ 8648808 - .incbin "sound/direct_sound_samples/8648808.bin" + .incbin "sound/direct_sound_samples/phonemes/8648808.bin" .align 2 DirectSoundWaveData_8649654:: @ 8649654 - .incbin "sound/direct_sound_samples/8649654.bin" + .incbin "sound/direct_sound_samples/phonemes/8649654.bin" .align 2 DirectSoundWaveData_864A55C:: @ 864A55C - .incbin "sound/direct_sound_samples/864A55C.bin" + .incbin "sound/direct_sound_samples/phonemes/864A55C.bin" .align 2 DirectSoundWaveData_864B030:: @ 864B030 - .incbin "sound/direct_sound_samples/864B030.bin" + .incbin "sound/direct_sound_samples/phonemes/864B030.bin" .align 2 DirectSoundWaveData_864BBC4:: @ 864BBC4 - .incbin "sound/direct_sound_samples/864BBC4.bin" + .incbin "sound/direct_sound_samples/phonemes/864BBC4.bin" .align 2 DirectSoundWaveData_864C59C:: @ 864C59C - .incbin "sound/direct_sound_samples/864C59C.bin" + .incbin "sound/direct_sound_samples/phonemes/864C59C.bin" .align 2 DirectSoundWaveData_864CBDC:: @ 864CBDC - .incbin "sound/direct_sound_samples/864CBDC.bin" + .incbin "sound/direct_sound_samples/phonemes/864CBDC.bin" .align 2 DirectSoundWaveData_864D6BC:: @ 864D6BC - .incbin "sound/direct_sound_samples/864D6BC.bin" + .incbin "sound/direct_sound_samples/phonemes/864D6BC.bin" .align 2 DirectSoundWaveData_864DCF8:: @ 864DCF8 - .incbin "sound/direct_sound_samples/864DCF8.bin" + .incbin "sound/direct_sound_samples/phonemes/864DCF8.bin" .align 2 DirectSoundWaveData_864E410:: @ 864E410 - .incbin "sound/direct_sound_samples/864E410.bin" + .incbin "sound/direct_sound_samples/phonemes/864E410.bin" .align 2 DirectSoundWaveData_864ED4C:: @ 864ED4C - .incbin "sound/direct_sound_samples/864ED4C.bin" + .incbin "sound/direct_sound_samples/phonemes/864ED4C.bin" .align 2 DirectSoundWaveData_864F508:: @ 864F508 - .incbin "sound/direct_sound_samples/864F508.bin" + .incbin "sound/direct_sound_samples/phonemes/864F508.bin" .align 2 DirectSoundWaveData_864FA6C:: @ 864FA6C - .incbin "sound/direct_sound_samples/864FA6C.bin" + .incbin "sound/direct_sound_samples/phonemes/864FA6C.bin" .align 2 DirectSoundWaveData_86507E0:: @ 86507E0 - .incbin "sound/direct_sound_samples/86507E0.bin" + .incbin "sound/direct_sound_samples/phonemes/86507E0.bin" .align 2 DirectSoundWaveData_8650C5C:: @ 8650C5C - .incbin "sound/direct_sound_samples/8650C5C.bin" + .incbin "sound/direct_sound_samples/phonemes/8650C5C.bin" .align 2 DirectSoundWaveData_8651148:: @ 8651148 - .incbin "sound/direct_sound_samples/8651148.bin" + .incbin "sound/direct_sound_samples/phonemes/8651148.bin" .align 2 DirectSoundWaveData_8651910:: @ 8651910 - .incbin "sound/direct_sound_samples/8651910.bin" + .incbin "sound/direct_sound_samples/phonemes/8651910.bin" .align 2 DirectSoundWaveData_865250C:: @ 865250C - .incbin "sound/direct_sound_samples/865250C.bin" + .incbin "sound/direct_sound_samples/phonemes/865250C.bin" .align 2 DirectSoundWaveData_8652884:: @ 8652884 - .incbin "sound/direct_sound_samples/8652884.bin" + .incbin "sound/direct_sound_samples/phonemes/8652884.bin" .align 2 DirectSoundWaveData_8653040:: @ 8653040 - .incbin "sound/direct_sound_samples/8653040.bin" + .incbin "sound/direct_sound_samples/phonemes/8653040.bin" .align 2 DirectSoundWaveData_8653CA4:: @ 8653CA4 - .incbin "sound/direct_sound_samples/8653CA4.bin" + .incbin "sound/direct_sound_samples/phonemes/8653CA4.bin" .align 2 DirectSoundWaveData_8654170:: @ 8654170 - .incbin "sound/direct_sound_samples/8654170.bin" + .incbin "sound/direct_sound_samples/phonemes/8654170.bin" .align 2 DirectSoundWaveData_8654C20:: @ 8654C20 diff --git a/sound/direct_sound_samples/84A7328.aif b/sound/direct_sound_samples/84A7328.aif deleted file mode 100644 index 9521d0b6e..000000000 Binary files a/sound/direct_sound_samples/84A7328.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A7F38.aif b/sound/direct_sound_samples/84A7F38.aif deleted file mode 100644 index 2519572e2..000000000 Binary files a/sound/direct_sound_samples/84A7F38.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A8AC8.aif b/sound/direct_sound_samples/84A8AC8.aif deleted file mode 100644 index d411e6612..000000000 Binary files a/sound/direct_sound_samples/84A8AC8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A9564.aif b/sound/direct_sound_samples/84A9564.aif deleted file mode 100644 index 3bc1aa839..000000000 Binary files a/sound/direct_sound_samples/84A9564.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A9EAC.aif b/sound/direct_sound_samples/84A9EAC.aif deleted file mode 100644 index 3bacf3676..000000000 Binary files a/sound/direct_sound_samples/84A9EAC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84AA8F4.aif b/sound/direct_sound_samples/84AA8F4.aif deleted file mode 100644 index 5ddaa153d..000000000 Binary files a/sound/direct_sound_samples/84AA8F4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8639898.aif b/sound/direct_sound_samples/8639898.aif deleted file mode 100644 index 4b15a94b7..000000000 Binary files a/sound/direct_sound_samples/8639898.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8639EF8.aif b/sound/direct_sound_samples/8639EF8.aif deleted file mode 100644 index 74c129073..000000000 Binary files a/sound/direct_sound_samples/8639EF8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863A3DC.aif b/sound/direct_sound_samples/863A3DC.aif deleted file mode 100644 index 359972c16..000000000 Binary files a/sound/direct_sound_samples/863A3DC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863AD2C.aif b/sound/direct_sound_samples/863AD2C.aif deleted file mode 100644 index 3b136fa43..000000000 Binary files a/sound/direct_sound_samples/863AD2C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863B79C.aif b/sound/direct_sound_samples/863B79C.aif deleted file mode 100644 index fd72512cf..000000000 Binary files a/sound/direct_sound_samples/863B79C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863BABC.aif b/sound/direct_sound_samples/863BABC.aif deleted file mode 100644 index 6f7794bec..000000000 Binary files a/sound/direct_sound_samples/863BABC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863C744.aif b/sound/direct_sound_samples/863C744.aif deleted file mode 100644 index 89b845f21..000000000 Binary files a/sound/direct_sound_samples/863C744.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863CD64.aif b/sound/direct_sound_samples/863CD64.aif deleted file mode 100644 index 1d99a3a93..000000000 Binary files a/sound/direct_sound_samples/863CD64.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863D0EC.aif b/sound/direct_sound_samples/863D0EC.aif deleted file mode 100644 index 883398129..000000000 Binary files a/sound/direct_sound_samples/863D0EC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863DED0.aif b/sound/direct_sound_samples/863DED0.aif deleted file mode 100644 index 776815e63..000000000 Binary files a/sound/direct_sound_samples/863DED0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863E840.aif b/sound/direct_sound_samples/863E840.aif deleted file mode 100644 index 545bd1292..000000000 Binary files a/sound/direct_sound_samples/863E840.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863EBDC.aif b/sound/direct_sound_samples/863EBDC.aif deleted file mode 100644 index c0a3be10d..000000000 Binary files a/sound/direct_sound_samples/863EBDC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/863F390.aif b/sound/direct_sound_samples/863F390.aif deleted file mode 100644 index d26ecdd6d..000000000 Binary files a/sound/direct_sound_samples/863F390.aif and /dev/null differ diff --git a/sound/direct_sound_samples/86400EC.aif b/sound/direct_sound_samples/86400EC.aif deleted file mode 100644 index 2b51201a4..000000000 Binary files a/sound/direct_sound_samples/86400EC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8640330.aif b/sound/direct_sound_samples/8640330.aif deleted file mode 100644 index cf5ac4e03..000000000 Binary files a/sound/direct_sound_samples/8640330.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8641170.aif b/sound/direct_sound_samples/8641170.aif deleted file mode 100644 index 606742e60..000000000 Binary files a/sound/direct_sound_samples/8641170.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8641AC4.aif b/sound/direct_sound_samples/8641AC4.aif deleted file mode 100644 index 71d4987d6..000000000 Binary files a/sound/direct_sound_samples/8641AC4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8641E18.aif b/sound/direct_sound_samples/8641E18.aif deleted file mode 100644 index 070c44a37..000000000 Binary files a/sound/direct_sound_samples/8641E18.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864244C.aif b/sound/direct_sound_samples/864244C.aif deleted file mode 100644 index b0ca84a38..000000000 Binary files a/sound/direct_sound_samples/864244C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/86430B8.aif b/sound/direct_sound_samples/86430B8.aif deleted file mode 100644 index f44101b23..000000000 Binary files a/sound/direct_sound_samples/86430B8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8643650.aif b/sound/direct_sound_samples/8643650.aif deleted file mode 100644 index a33809d42..000000000 Binary files a/sound/direct_sound_samples/8643650.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8644154.aif b/sound/direct_sound_samples/8644154.aif deleted file mode 100644 index 6a005efcc..000000000 Binary files a/sound/direct_sound_samples/8644154.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8644758.aif b/sound/direct_sound_samples/8644758.aif deleted file mode 100644 index 62f9493fd..000000000 Binary files a/sound/direct_sound_samples/8644758.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8644950.aif b/sound/direct_sound_samples/8644950.aif deleted file mode 100644 index 5767bd6d9..000000000 Binary files a/sound/direct_sound_samples/8644950.aif and /dev/null differ diff --git a/sound/direct_sound_samples/86452B4.aif b/sound/direct_sound_samples/86452B4.aif deleted file mode 100644 index 33e328a82..000000000 Binary files a/sound/direct_sound_samples/86452B4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8646240.aif b/sound/direct_sound_samples/8646240.aif deleted file mode 100644 index 548e740c8..000000000 Binary files a/sound/direct_sound_samples/8646240.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8646878.aif b/sound/direct_sound_samples/8646878.aif deleted file mode 100644 index cbbe09266..000000000 Binary files a/sound/direct_sound_samples/8646878.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864734C.aif b/sound/direct_sound_samples/864734C.aif deleted file mode 100644 index 8bdf7faaa..000000000 Binary files a/sound/direct_sound_samples/864734C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8648290.aif b/sound/direct_sound_samples/8648290.aif deleted file mode 100644 index f96f8853b..000000000 Binary files a/sound/direct_sound_samples/8648290.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8648808.aif b/sound/direct_sound_samples/8648808.aif deleted file mode 100644 index ab9abbf79..000000000 Binary files a/sound/direct_sound_samples/8648808.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8649654.aif b/sound/direct_sound_samples/8649654.aif deleted file mode 100644 index 9d21d0ab4..000000000 Binary files a/sound/direct_sound_samples/8649654.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864A55C.aif b/sound/direct_sound_samples/864A55C.aif deleted file mode 100644 index c037ed4af..000000000 Binary files a/sound/direct_sound_samples/864A55C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864B030.aif b/sound/direct_sound_samples/864B030.aif deleted file mode 100644 index ac1f8b66f..000000000 Binary files a/sound/direct_sound_samples/864B030.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864BBC4.aif b/sound/direct_sound_samples/864BBC4.aif deleted file mode 100644 index 1fd9111c8..000000000 Binary files a/sound/direct_sound_samples/864BBC4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864C59C.aif b/sound/direct_sound_samples/864C59C.aif deleted file mode 100644 index 5d6ae2282..000000000 Binary files a/sound/direct_sound_samples/864C59C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864CBDC.aif b/sound/direct_sound_samples/864CBDC.aif deleted file mode 100644 index f26700690..000000000 Binary files a/sound/direct_sound_samples/864CBDC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864D6BC.aif b/sound/direct_sound_samples/864D6BC.aif deleted file mode 100644 index 3ba97a9fc..000000000 Binary files a/sound/direct_sound_samples/864D6BC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864DCF8.aif b/sound/direct_sound_samples/864DCF8.aif deleted file mode 100644 index 37f1be4b1..000000000 Binary files a/sound/direct_sound_samples/864DCF8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864E410.aif b/sound/direct_sound_samples/864E410.aif deleted file mode 100644 index 4b3facb99..000000000 Binary files a/sound/direct_sound_samples/864E410.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864ED4C.aif b/sound/direct_sound_samples/864ED4C.aif deleted file mode 100644 index 8a4d7653b..000000000 Binary files a/sound/direct_sound_samples/864ED4C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864F508.aif b/sound/direct_sound_samples/864F508.aif deleted file mode 100644 index db5bae244..000000000 Binary files a/sound/direct_sound_samples/864F508.aif and /dev/null differ diff --git a/sound/direct_sound_samples/864FA6C.aif b/sound/direct_sound_samples/864FA6C.aif deleted file mode 100644 index 6612dd54d..000000000 Binary files a/sound/direct_sound_samples/864FA6C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/86507E0.aif b/sound/direct_sound_samples/86507E0.aif deleted file mode 100644 index 441eecfcd..000000000 Binary files a/sound/direct_sound_samples/86507E0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8650C5C.aif b/sound/direct_sound_samples/8650C5C.aif deleted file mode 100644 index 95670cf0a..000000000 Binary files a/sound/direct_sound_samples/8650C5C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8651148.aif b/sound/direct_sound_samples/8651148.aif deleted file mode 100644 index 0fadcba8e..000000000 Binary files a/sound/direct_sound_samples/8651148.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8651910.aif b/sound/direct_sound_samples/8651910.aif deleted file mode 100644 index 6017c55b4..000000000 Binary files a/sound/direct_sound_samples/8651910.aif and /dev/null differ diff --git a/sound/direct_sound_samples/865250C.aif b/sound/direct_sound_samples/865250C.aif deleted file mode 100644 index 2327b6d65..000000000 Binary files a/sound/direct_sound_samples/865250C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8652884.aif b/sound/direct_sound_samples/8652884.aif deleted file mode 100644 index 19ceca0d0..000000000 Binary files a/sound/direct_sound_samples/8652884.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8653040.aif b/sound/direct_sound_samples/8653040.aif deleted file mode 100644 index 8438d301a..000000000 Binary files a/sound/direct_sound_samples/8653040.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8653CA4.aif b/sound/direct_sound_samples/8653CA4.aif deleted file mode 100644 index 74d4bcf4a..000000000 Binary files a/sound/direct_sound_samples/8653CA4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8654170.aif b/sound/direct_sound_samples/8654170.aif deleted file mode 100644 index dfef8a82b..000000000 Binary files a/sound/direct_sound_samples/8654170.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/84A7328.aif b/sound/direct_sound_samples/phonemes/84A7328.aif new file mode 100644 index 000000000..9521d0b6e Binary files /dev/null and b/sound/direct_sound_samples/phonemes/84A7328.aif differ diff --git a/sound/direct_sound_samples/phonemes/84A7F38.aif b/sound/direct_sound_samples/phonemes/84A7F38.aif new file mode 100644 index 000000000..2519572e2 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/84A7F38.aif differ diff --git a/sound/direct_sound_samples/phonemes/84A8AC8.aif b/sound/direct_sound_samples/phonemes/84A8AC8.aif new file mode 100644 index 000000000..d411e6612 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/84A8AC8.aif differ diff --git a/sound/direct_sound_samples/phonemes/84A9564.aif b/sound/direct_sound_samples/phonemes/84A9564.aif new file mode 100644 index 000000000..3bc1aa839 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/84A9564.aif differ diff --git a/sound/direct_sound_samples/phonemes/84A9EAC.aif b/sound/direct_sound_samples/phonemes/84A9EAC.aif new file mode 100644 index 000000000..3bacf3676 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/84A9EAC.aif differ diff --git a/sound/direct_sound_samples/phonemes/84AA8F4.aif b/sound/direct_sound_samples/phonemes/84AA8F4.aif new file mode 100644 index 000000000..5ddaa153d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/84AA8F4.aif differ diff --git a/sound/direct_sound_samples/phonemes/8639898.aif b/sound/direct_sound_samples/phonemes/8639898.aif new file mode 100644 index 000000000..4b15a94b7 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8639898.aif differ diff --git a/sound/direct_sound_samples/phonemes/8639EF8.aif b/sound/direct_sound_samples/phonemes/8639EF8.aif new file mode 100644 index 000000000..74c129073 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8639EF8.aif differ diff --git a/sound/direct_sound_samples/phonemes/863A3DC.aif b/sound/direct_sound_samples/phonemes/863A3DC.aif new file mode 100644 index 000000000..359972c16 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863A3DC.aif differ diff --git a/sound/direct_sound_samples/phonemes/863AD2C.aif b/sound/direct_sound_samples/phonemes/863AD2C.aif new file mode 100644 index 000000000..3b136fa43 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863AD2C.aif differ diff --git a/sound/direct_sound_samples/phonemes/863B79C.aif b/sound/direct_sound_samples/phonemes/863B79C.aif new file mode 100644 index 000000000..fd72512cf Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863B79C.aif differ diff --git a/sound/direct_sound_samples/phonemes/863BABC.aif b/sound/direct_sound_samples/phonemes/863BABC.aif new file mode 100644 index 000000000..6f7794bec Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863BABC.aif differ diff --git a/sound/direct_sound_samples/phonemes/863C744.aif b/sound/direct_sound_samples/phonemes/863C744.aif new file mode 100644 index 000000000..89b845f21 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863C744.aif differ diff --git a/sound/direct_sound_samples/phonemes/863CD64.aif b/sound/direct_sound_samples/phonemes/863CD64.aif new file mode 100644 index 000000000..1d99a3a93 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863CD64.aif differ diff --git a/sound/direct_sound_samples/phonemes/863D0EC.aif b/sound/direct_sound_samples/phonemes/863D0EC.aif new file mode 100644 index 000000000..883398129 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863D0EC.aif differ diff --git a/sound/direct_sound_samples/phonemes/863DED0.aif b/sound/direct_sound_samples/phonemes/863DED0.aif new file mode 100644 index 000000000..776815e63 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863DED0.aif differ diff --git a/sound/direct_sound_samples/phonemes/863E840.aif b/sound/direct_sound_samples/phonemes/863E840.aif new file mode 100644 index 000000000..545bd1292 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863E840.aif differ diff --git a/sound/direct_sound_samples/phonemes/863EBDC.aif b/sound/direct_sound_samples/phonemes/863EBDC.aif new file mode 100644 index 000000000..c0a3be10d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863EBDC.aif differ diff --git a/sound/direct_sound_samples/phonemes/863F390.aif b/sound/direct_sound_samples/phonemes/863F390.aif new file mode 100644 index 000000000..d26ecdd6d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/863F390.aif differ diff --git a/sound/direct_sound_samples/phonemes/86400EC.aif b/sound/direct_sound_samples/phonemes/86400EC.aif new file mode 100644 index 000000000..2b51201a4 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/86400EC.aif differ diff --git a/sound/direct_sound_samples/phonemes/8640330.aif b/sound/direct_sound_samples/phonemes/8640330.aif new file mode 100644 index 000000000..cf5ac4e03 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8640330.aif differ diff --git a/sound/direct_sound_samples/phonemes/8641170.aif b/sound/direct_sound_samples/phonemes/8641170.aif new file mode 100644 index 000000000..606742e60 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8641170.aif differ diff --git a/sound/direct_sound_samples/phonemes/8641AC4.aif b/sound/direct_sound_samples/phonemes/8641AC4.aif new file mode 100644 index 000000000..71d4987d6 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8641AC4.aif differ diff --git a/sound/direct_sound_samples/phonemes/8641E18.aif b/sound/direct_sound_samples/phonemes/8641E18.aif new file mode 100644 index 000000000..070c44a37 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8641E18.aif differ diff --git a/sound/direct_sound_samples/phonemes/864244C.aif b/sound/direct_sound_samples/phonemes/864244C.aif new file mode 100644 index 000000000..b0ca84a38 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864244C.aif differ diff --git a/sound/direct_sound_samples/phonemes/86430B8.aif b/sound/direct_sound_samples/phonemes/86430B8.aif new file mode 100644 index 000000000..f44101b23 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/86430B8.aif differ diff --git a/sound/direct_sound_samples/phonemes/8643650.aif b/sound/direct_sound_samples/phonemes/8643650.aif new file mode 100644 index 000000000..a33809d42 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8643650.aif differ diff --git a/sound/direct_sound_samples/phonemes/8644154.aif b/sound/direct_sound_samples/phonemes/8644154.aif new file mode 100644 index 000000000..6a005efcc Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8644154.aif differ diff --git a/sound/direct_sound_samples/phonemes/8644758.aif b/sound/direct_sound_samples/phonemes/8644758.aif new file mode 100644 index 000000000..62f9493fd Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8644758.aif differ diff --git a/sound/direct_sound_samples/phonemes/8644950.aif b/sound/direct_sound_samples/phonemes/8644950.aif new file mode 100644 index 000000000..5767bd6d9 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8644950.aif differ diff --git a/sound/direct_sound_samples/phonemes/86452B4.aif b/sound/direct_sound_samples/phonemes/86452B4.aif new file mode 100644 index 000000000..33e328a82 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/86452B4.aif differ diff --git a/sound/direct_sound_samples/phonemes/8646240.aif b/sound/direct_sound_samples/phonemes/8646240.aif new file mode 100644 index 000000000..548e740c8 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8646240.aif differ diff --git a/sound/direct_sound_samples/phonemes/8646878.aif b/sound/direct_sound_samples/phonemes/8646878.aif new file mode 100644 index 000000000..cbbe09266 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8646878.aif differ diff --git a/sound/direct_sound_samples/phonemes/864734C.aif b/sound/direct_sound_samples/phonemes/864734C.aif new file mode 100644 index 000000000..8bdf7faaa Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864734C.aif differ diff --git a/sound/direct_sound_samples/phonemes/8648290.aif b/sound/direct_sound_samples/phonemes/8648290.aif new file mode 100644 index 000000000..f96f8853b Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8648290.aif differ diff --git a/sound/direct_sound_samples/phonemes/8648808.aif b/sound/direct_sound_samples/phonemes/8648808.aif new file mode 100644 index 000000000..ab9abbf79 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8648808.aif differ diff --git a/sound/direct_sound_samples/phonemes/8649654.aif b/sound/direct_sound_samples/phonemes/8649654.aif new file mode 100644 index 000000000..9d21d0ab4 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8649654.aif differ diff --git a/sound/direct_sound_samples/phonemes/864A55C.aif b/sound/direct_sound_samples/phonemes/864A55C.aif new file mode 100644 index 000000000..c037ed4af Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864A55C.aif differ diff --git a/sound/direct_sound_samples/phonemes/864B030.aif b/sound/direct_sound_samples/phonemes/864B030.aif new file mode 100644 index 000000000..ac1f8b66f Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864B030.aif differ diff --git a/sound/direct_sound_samples/phonemes/864BBC4.aif b/sound/direct_sound_samples/phonemes/864BBC4.aif new file mode 100644 index 000000000..1fd9111c8 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864BBC4.aif differ diff --git a/sound/direct_sound_samples/phonemes/864C59C.aif b/sound/direct_sound_samples/phonemes/864C59C.aif new file mode 100644 index 000000000..5d6ae2282 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864C59C.aif differ diff --git a/sound/direct_sound_samples/phonemes/864CBDC.aif b/sound/direct_sound_samples/phonemes/864CBDC.aif new file mode 100644 index 000000000..f26700690 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864CBDC.aif differ diff --git a/sound/direct_sound_samples/phonemes/864D6BC.aif b/sound/direct_sound_samples/phonemes/864D6BC.aif new file mode 100644 index 000000000..3ba97a9fc Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864D6BC.aif differ diff --git a/sound/direct_sound_samples/phonemes/864DCF8.aif b/sound/direct_sound_samples/phonemes/864DCF8.aif new file mode 100644 index 000000000..37f1be4b1 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864DCF8.aif differ diff --git a/sound/direct_sound_samples/phonemes/864E410.aif b/sound/direct_sound_samples/phonemes/864E410.aif new file mode 100644 index 000000000..4b3facb99 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864E410.aif differ diff --git a/sound/direct_sound_samples/phonemes/864ED4C.aif b/sound/direct_sound_samples/phonemes/864ED4C.aif new file mode 100644 index 000000000..8a4d7653b Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864ED4C.aif differ diff --git a/sound/direct_sound_samples/phonemes/864F508.aif b/sound/direct_sound_samples/phonemes/864F508.aif new file mode 100644 index 000000000..db5bae244 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864F508.aif differ diff --git a/sound/direct_sound_samples/phonemes/864FA6C.aif b/sound/direct_sound_samples/phonemes/864FA6C.aif new file mode 100644 index 000000000..6612dd54d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/864FA6C.aif differ diff --git a/sound/direct_sound_samples/phonemes/86507E0.aif b/sound/direct_sound_samples/phonemes/86507E0.aif new file mode 100644 index 000000000..441eecfcd Binary files /dev/null and b/sound/direct_sound_samples/phonemes/86507E0.aif differ diff --git a/sound/direct_sound_samples/phonemes/8650C5C.aif b/sound/direct_sound_samples/phonemes/8650C5C.aif new file mode 100644 index 000000000..95670cf0a Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8650C5C.aif differ diff --git a/sound/direct_sound_samples/phonemes/8651148.aif b/sound/direct_sound_samples/phonemes/8651148.aif new file mode 100644 index 000000000..0fadcba8e Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8651148.aif differ diff --git a/sound/direct_sound_samples/phonemes/8651910.aif b/sound/direct_sound_samples/phonemes/8651910.aif new file mode 100644 index 000000000..6017c55b4 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8651910.aif differ diff --git a/sound/direct_sound_samples/phonemes/865250C.aif b/sound/direct_sound_samples/phonemes/865250C.aif new file mode 100644 index 000000000..2327b6d65 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/865250C.aif differ diff --git a/sound/direct_sound_samples/phonemes/8652884.aif b/sound/direct_sound_samples/phonemes/8652884.aif new file mode 100644 index 000000000..19ceca0d0 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8652884.aif differ diff --git a/sound/direct_sound_samples/phonemes/8653040.aif b/sound/direct_sound_samples/phonemes/8653040.aif new file mode 100644 index 000000000..8438d301a Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8653040.aif differ diff --git a/sound/direct_sound_samples/phonemes/8653CA4.aif b/sound/direct_sound_samples/phonemes/8653CA4.aif new file mode 100644 index 000000000..74d4bcf4a Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8653CA4.aif differ diff --git a/sound/direct_sound_samples/phonemes/8654170.aif b/sound/direct_sound_samples/phonemes/8654170.aif new file mode 100644 index 000000000..dfef8a82b Binary files /dev/null and b/sound/direct_sound_samples/phonemes/8654170.aif differ -- cgit v1.2.3 From e50f5e906776a799ec69418168f032880e16384c Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 25 Jan 2018 19:36:54 -0600 Subject: more debug integrations --- asm/battle_1.s | 2 +- src/battle/battle_controller_opponent.c | 262 +---------- src/battle/battle_controller_player.c | 764 ++------------------------------ src/battle/battle_controller_safari.c | 243 +--------- src/battle/battle_interface.c | 668 +--------------------------- src/pokemon/pokemon_1.c | 359 ++------------- src/pokemon/pokemon_menu.c | 151 +------ 7 files changed, 150 insertions(+), 2299 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index 24553e020..8ed743677 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -809,7 +809,7 @@ sub_800DAB8: mov r2, #0x80 lsl r2, r2, #0x4 add r1, r4, #0 - bl gMysteryEventScriptCmdTableEnd+0x3cb4 @ uh, what? + bl CpuSet ldr r0, ._113 + 12 mov r1, #0x0 mov r2, #0x40 diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index d2045b6c4..5382738f7 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -30,6 +30,7 @@ struct MovePpInfo u8 ppBonuses; }; +extern u8 gUnknown_02023A14_50; extern u8 gActiveBank; extern u8 gBattleBufferA[][0x200]; extern u16 gBattlePartyID[]; @@ -1209,255 +1210,27 @@ void sub_8034B74(void) } } -#if DEBUG -__attribute__((naked)) -void OpponentHandleTrainerThrow(void) -{ - asm("\ - push {r4, r5, r6, lr}\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5, r6}\n\ - ldr r0, ._480\n\ - ldrb r1, [r0]\n\ - mov r0, #0x10\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._478 @cond_branch\n\ - ldr r0, ._480 + 4\n\ - ldr r1, ._480 + 8\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - b ._491\n\ -._481:\n\ - .align 2, 0\n\ -._480:\n\ - .word gUnknown_02023A14_50\n\ - .word +0x2000000\n\ - .word 0x160a3\n\ -._478:\n\ - ldr r3, ._484\n\ - ldrh r1, [r3]\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x3\n\ - cmp r1, r0\n\ - bne ._482 @cond_branch\n\ - bl GetSecretBaseTrainerPicIndex\n\ - b ._487\n\ -._485:\n\ - .align 2, 0\n\ -._484:\n\ - .word gTrainerBattleOpponent\n\ -._482:\n\ - ldr r0, ._488\n\ - ldrh r1, [r0]\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._486 @cond_branch\n\ - bl get_trainer_class_pic_index\n\ - b ._487\n\ -._489:\n\ - .align 2, 0\n\ -._488:\n\ - .word gBattleTypeFlags\n\ -._486:\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._490 @cond_branch\n\ - bl GetEReaderTrainerPicIndex\n\ -._487:\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - b ._491\n\ -._490:\n\ - ldr r2, ._492\n\ - ldrh r1, [r3]\n\ - lsl r0, r1, #0x2\n\ - add r0, r0, r1\n\ - lsl r0, r0, #0x3\n\ - add r0, r0, r2\n\ - ldrb r0, [r0, #0x3]\n\ -._491:\n\ - mov r9, r0\n\ - ldr r2, ._492 + 4\n\ - mov r8, r2\n\ - ldrb r1, [r2]\n\ - bl sub_8031A6C\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - bl GetBankIdentity\n\ - add r1, r0, #0\n\ - lsl r1, r1, #0x18\n\ - lsr r1, r1, #0x18\n\ - mov r0, r9\n\ - bl GetMonSpriteTemplate_803C5A0\n\ - ldr r5, ._492 + 8\n\ - ldr r1, ._492 + 12\n\ - mov r2, r9\n\ - lsl r0, r2, #0x2\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - mov r4, #0x8\n\ - sub r4, r4, r0\n\ - lsl r4, r4, #0x12\n\ - mov r0, #0xa0\n\ - lsl r0, r0, #0xe\n\ - add r4, r4, r0\n\ - asr r4, r4, #0x10\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - bl sub_8079E90\n\ - add r3, r0, #0\n\ - lsl r3, r3, #0x18\n\ - lsr r3, r3, #0x18\n\ - add r0, r5, #0\n\ - mov r1, #0xb0\n\ - add r2, r4, #0\n\ - bl CreateSprite\n\ - ldr r5, ._492 + 16\n\ - mov r2, r8\n\ - ldrb r1, [r2]\n\ - add r1, r1, r5\n\ - strb r0, [r1]\n\ - ldr r4, ._492 + 20\n\ - ldrb r0, [r2]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x4\n\ - add r0, r0, r1\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r4\n\ - ldr r1, ._492 + 24\n\ - strh r1, [r0, #0x24]\n\ - ldrb r0, [r2]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x4\n\ - add r0, r0, r1\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r4\n\ - mov r1, #0x2\n\ - strh r1, [r0, #0x2e]\n\ - ldr r0, ._492 + 28\n\ - mov r1, r9\n\ - lsl r6, r1, #0x3\n\ - add r0, r6, r0\n\ - ldrh r0, [r0, #0x4]\n\ - bl IndexOfSpritePaletteTag\n\ - mov r2, r8\n\ - ldrb r1, [r2]\n\ - add r1, r1, r5\n\ - ldrb r1, [r1]\n\ - lsl r2, r1, #0x4\n\ - add r2, r2, r1\n\ - lsl r2, r2, #0x2\n\ - add r2, r2, r4\n\ - lsl r0, r0, #0x4\n\ - ldrb r3, [r2, #0x5]\n\ - mov r1, #0xf\n\ - and r1, r1, r3\n\ - orr r1, r1, r0\n\ - strb r1, [r2, #0x5]\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - add r0, r0, r5\n\ - ldrb r0, [r0]\n\ - lsl r1, r0, #0x4\n\ - add r1, r1, r0\n\ - lsl r1, r1, #0x2\n\ - add r1, r1, r4\n\ - ldrh r0, [r1, #0x4]\n\ - lsl r0, r0, #0x16\n\ - lsr r0, r0, #0x16\n\ - strh r0, [r1, #0x38]\n\ - ldr r0, ._492 + 32\n\ - add r6, r6, r0\n\ - ldrh r0, [r6, #0x6]\n\ - bl GetSpriteTileStartByTag\n\ - mov r2, r8\n\ - ldrb r1, [r2]\n\ - add r1, r1, r5\n\ - ldrb r2, [r1]\n\ - lsl r1, r2, #0x4\n\ - add r1, r1, r2\n\ - lsl r1, r1, #0x2\n\ - add r1, r1, r4\n\ - ldr r2, ._492 + 36\n\ - and r2, r2, r0\n\ - ldrh r3, [r1, #0x4]\n\ - ldr r0, ._492 + 40\n\ - and r0, r0, r3\n\ - orr r0, r0, r2\n\ - strh r0, [r1, #0x4]\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x4\n\ - add r0, r0, r1\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r4\n\ - mov r2, r9\n\ - strh r2, [r0, #0x6]\n\ - mov r1, r8\n\ - ldrb r0, [r1]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x4\n\ - add r0, r0, r1\n\ - lsl r0, r0, #0x2\n\ - add r4, r4, #0x1c\n\ - add r0, r0, r4\n\ - ldr r1, ._492 + 44\n\ - str r1, [r0]\n\ - ldr r1, ._492 + 48\n\ - mov r2, r8\n\ - ldrb r0, [r2]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldr r1, ._492 + 52\n\ - str r1, [r0]\n\ - pop {r3, r4}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - pop {r4, r5, r6}\n\ - pop {r0}\n\ - bx r0\n\ -._493:\n\ - .align 2, 0\n\ -._492:\n\ - .word gTrainers\n\ - .word gActiveBank\n\ - .word gUnknown_02024E8C\n\ - .word gTrainerFrontPicCoords\n\ - .word gObjectBankIDs\n\ - .word gSprites\n\ - .word 0xff10\n\ - .word gTrainerFrontPicPaletteTable\n\ - .word gTrainerFrontPicTable\n\ - .word 0x3ff\n\ - .word 0xfffffc00\n\ - .word sub_80313A0+1\n\ - .word gBattleBankFunc\n\ - .word sub_8032B4C+1"); -} -#else void OpponentHandleTrainerThrow(void) { u32 trainerPicIndex; - if (gTrainerBattleOpponent == 0x400) - trainerPicIndex = GetSecretBaseTrainerPicIndex(); - else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) - trainerPicIndex = get_trainer_class_pic_index(); - else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) - trainerPicIndex = GetEReaderTrainerPicIndex(); +#if DEBUG + if (gUnknown_02023A14_50 & 0x10) + { + trainerPicIndex = gSharedMem[0x160A3]; + } else - trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic; +#endif + { + if (gTrainerBattleOpponent == 0x400) + trainerPicIndex = GetSecretBaseTrainerPicIndex(); + else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) + trainerPicIndex = get_trainer_class_pic_index(); + else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) + trainerPicIndex = GetEReaderTrainerPicIndex(); + else + trainerPicIndex = gTrainers[gTrainerBattleOpponent].trainerPic; + } sub_8031A6C(trainerPicIndex, gActiveBank); GetMonSpriteTemplate_803C5A0(trainerPicIndex, GetBankIdentity(gActiveBank)); @@ -1475,7 +1248,6 @@ void OpponentHandleTrainerThrow(void) gSprites[gObjectBankIDs[gActiveBank]].callback = sub_80313A0; gBattleBankFunc[gActiveBank] = sub_8032B4C; } -#endif void OpponentHandleTrainerSlide(void) { diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 8875d5148..d4b4da6f2 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -42,6 +42,8 @@ extern struct Window gUnknown_03004210; extern void (*gBattleBankFunc[])(void); +extern u32 gOamMatrixAllocBitmap; +extern u8 gUnknown_020297ED; extern u8 gActiveBank; extern u8 gActionSelectionCursor[]; extern u8 gDisplayedStringBattle[]; @@ -617,728 +619,14 @@ struct ChooseMoveStruct const u8 gUnknown_081FAE80[] = _("{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}"); -#if DEBUG -__attribute__((naked)) -void sub_802C68C(void) -{ - asm("\ - push {r4, r5, r6, r7, lr}\n\ - mov r7, sl\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5, r6, r7}\n\ - add sp, sp, #0xfffffff8\n\ - mov r0, #0x0\n\ - mov r8, r0\n\ - mov r7, #0x0\n\ - ldr r1, ._131\n\ - ldrb r2, [r1]\n\ - lsl r1, r2, #0x9\n\ - ldr r0, ._131 + 4\n\ - add r6, r1, r0\n\ - ldr r0, ._131 + 8\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r5, #0x1\n\ - add r0, r5, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._126 @cond_branch\n\ - b ._127\n\ -._126:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r1, ._131 + 12\n\ - ldr r2, ._131\n\ - ldrb r0, [r2]\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x1\n\ - add r1, r6, r0\n\ - ldrh r0, [r1]\n\ - cmp r0, #0xae\n\ - bne ._128 @cond_branch\n\ - ldrb r0, [r6, #0x12]\n\ - mov r4, #0x0\n\ - cmp r0, #0x7\n\ - beq ._130 @cond_branch\n\ - ldrb r1, [r6, #0x13]\n\ - mov r0, #0x7\n\ - eor r1, r1, r0\n\ - neg r0, r1\n\ - orr r0, r0, r1\n\ - asr r4, r0, #0x1f\n\ - mov r0, #0x10\n\ - and r4, r4, r0\n\ - b ._130\n\ -._132:\n\ - .align 2, 0\n\ -._131:\n\ - .word gActiveBank\n\ - .word gBattleBufferA+4\n\ - .word gMain\n\ - .word gMoveSelectionCursor\n\ -._128:\n\ - ldr r2, ._135\n\ - ldrh r1, [r1]\n\ - lsl r0, r1, #0x1\n\ - add r0, r0, r1\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r2\n\ - ldrb r4, [r0, #0x6]\n\ -._130:\n\ - mov r0, #0x10\n\ - and r0, r0, r4\n\ - cmp r0, #0\n\ - beq ._133 @cond_branch\n\ - ldr r0, ._135 + 4\n\ - ldr r1, ._135 + 8\n\ - ldrb r1, [r1]\n\ - strb r1, [r0]\n\ - b ._134\n\ -._136:\n\ - .align 2, 0\n\ -._135:\n\ - .word gBattleMoves\n\ - .word gUnknown_03004344\n\ - .word gActiveBank\n\ -._133:\n\ - ldr r0, ._141\n\ - ldrb r0, [r0]\n\ - bl GetBankIdentity\n\ - add r1, r0, #0\n\ - mov r2, #0x1\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - eor r0, r0, r2\n\ - bl GetBankByIdentity\n\ - ldr r1, ._141 + 4\n\ - strb r0, [r1]\n\ -._134:\n\ - ldr r3, ._141 + 8\n\ - ldr r5, ._141\n\ - ldrb r2, [r5]\n\ - lsl r1, r2, #0x9\n\ - add r0, r3, #1\n\ - add r0, r1, r0\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - bne ._137 @cond_branch\n\ - mov r0, #0x2\n\ - and r0, r0, r4\n\ - cmp r0, #0\n\ - beq ._146 @cond_branch\n\ - add r0, r3, #2\n\ - add r0, r1, r0\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - bne ._146 @cond_branch\n\ - mov r0, #0x1\n\ - add r8, r8, r0\n\ - b ._146\n\ -._142:\n\ - .align 2, 0\n\ -._141:\n\ - .word gActiveBank\n\ - .word gUnknown_03004344\n\ - .word gBattleBufferA\n\ -._137:\n\ - mov r0, #0x7d\n\ - and r0, r0, r4\n\ - cmp r0, #0\n\ - bne ._143 @cond_branch\n\ - mov r1, #0x1\n\ - add r8, r8, r1\n\ -._143:\n\ - ldr r0, ._149\n\ - add r0, r2, r0\n\ - add r1, r6, #0\n\ - add r1, r1, #0x8\n\ - ldrb r0, [r0]\n\ - add r1, r1, r0\n\ - ldrb r0, [r1]\n\ - cmp r0, #0\n\ - beq ._144 @cond_branch\n\ - mov r0, #0x12\n\ - and r0, r0, r4\n\ - cmp r0, #0\n\ - bne ._146 @cond_branch\n\ - mov r0, #0x0\n\ - bl CountAliveMons\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x1\n\ - bhi ._146 @cond_branch\n\ - ldrb r0, [r5]\n\ - bl sub_803C434\n\ - ldr r1, ._149 + 4\n\ - strb r0, [r1]\n\ - mov r2, #0x0\n\ - mov r8, r2\n\ -._146:\n\ - mov r0, r8\n\ - cmp r0, #0\n\ - bne ._147 @cond_branch\n\ -._144:\n\ - bl DestroyMenuCursor\n\ - ldr r1, ._149\n\ - ldr r0, ._149 + 8\n\ - ldrb r0, [r0]\n\ - add r0, r0, r1\n\ - ldrb r2, [r0]\n\ - ldr r0, ._149 + 4\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x8\n\ - orr r2, r2, r0\n\ - b ._148\n\ -._150:\n\ - .align 2, 0\n\ -._149:\n\ - .word gMoveSelectionCursor\n\ - .word gUnknown_03004344\n\ - .word gActiveBank\n\ -._147:\n\ - ldr r1, ._153\n\ - ldr r2, ._153 + 4\n\ - ldrb r0, [r2]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldr r1, ._153 + 8\n\ - str r1, [r0]\n\ - mov r0, #0x12\n\ - and r4, r4, r0\n\ - cmp r4, #0\n\ - beq ._151 @cond_branch\n\ - ldr r1, ._153 + 12\n\ - ldrb r0, [r2]\n\ - b ._152\n\ -._154:\n\ - .align 2, 0\n\ -._153:\n\ - .word gBattleBankFunc\n\ - .word gActiveBank\n\ - .word sub_802C2EC+1\n\ - .word gUnknown_03004344\n\ -._151:\n\ - mov r0, #0x1\n\ - bl GetBankByIdentity\n\ - ldr r1, ._157\n\ - ldrb r1, [r1]\n\ - ldr r2, ._157 + 4\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x16\n\ - add r0, r0, r2\n\ - ldr r0, [r0]\n\ - and r1, r1, r0\n\ - cmp r1, #0\n\ - beq ._155 @cond_branch\n\ - mov r0, #0x3\n\ - b ._156\n\ -._158:\n\ - .align 2, 0\n\ -._157:\n\ - .word gAbsentBankFlags\n\ - .word gBitTable\n\ -._155:\n\ - mov r0, #0x1\n\ -._156:\n\ - bl GetBankByIdentity\n\ - ldr r1, ._160\n\ -._152:\n\ - strb r0, [r1]\n\ - ldr r2, ._160 + 4\n\ - ldr r1, ._160 + 8\n\ - ldr r0, ._160\n\ - ldrb r0, [r0]\n\ - add r0, r0, r1\n\ - ldrb r1, [r0]\n\ - lsl r0, r1, #0x4\n\ - add r0, r0, r1\n\ - lsl r0, r0, #0x2\n\ - add r2, r2, #0x1c\n\ - add r0, r0, r2\n\ - ldr r1, ._160 + 12\n\ - b ._203\n\ -._161:\n\ - .align 2, 0\n\ -._160:\n\ - .word gUnknown_03004344\n\ - .word gSprites\n\ - .word gObjectBankIDs\n\ - .word sub_8010520+1\n\ -._127:\n\ - mov r6, #0x2\n\ - add r0, r6, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._162 @cond_branch\n\ - bl DestroyMenuCursor\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._164\n\ - strh r7, [r0]\n\ - ldr r1, ._164 + 4\n\ - mov r2, #0xa0\n\ - lsl r2, r2, #0x1\n\ - add r0, r2, #0\n\ - strh r0, [r1]\n\ - ldr r2, ._164 + 8\n\ -._148:\n\ - mov r0, #0x1\n\ - mov r1, #0xa\n\ - bl Emitcmd33\n\ - bl PlayerBufferExecCompleted\n\ - b ._209\n\ -._165:\n\ - .align 2, 0\n\ -._164:\n\ - .word gBattle_BG0_X\n\ - .word gBattle_BG0_Y\n\ - .word 0xffff\n\ -._162:\n\ - mov r0, #0x20\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._166 @cond_branch\n\ - ldr r4, ._170\n\ - add r2, r2, r4\n\ - ldrb r1, [r2]\n\ - add r0, r5, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._167 @cond_branch\n\ - b ._209\n\ -._167:\n\ - ldrb r0, [r2]\n\ - bl nullsub_7\n\ - ldr r0, ._170 + 4\n\ - ldrb r1, [r0]\n\ - add r1, r1, r4\n\ - ldrb r0, [r1]\n\ - mov r2, #0x1\n\ - eor r0, r0, r2\n\ - b ._183\n\ -._171:\n\ - .align 2, 0\n\ -._170:\n\ - .word gMoveSelectionCursor\n\ - .word gActiveBank\n\ -._166:\n\ - mov r3, #0x10\n\ - add r0, r3, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._172 @cond_branch\n\ - ldr r4, ._178\n\ - add r3, r2, r4\n\ - ldrb r2, [r3]\n\ - mov r6, #0x1\n\ - add r0, r5, #0\n\ - and r0, r0, r2\n\ - cmp r0, #0\n\ - beq ._173 @cond_branch\n\ - b ._209\n\ -._173:\n\ - ldr r1, ._178 + 4\n\ - add r0, r6, #0\n\ - eor r0, r0, r2\n\ - ldrb r1, [r1]\n\ - cmp r0, r1\n\ - bcc ._175 @cond_branch\n\ - b ._209\n\ -._175:\n\ - ldrb r0, [r3]\n\ - bl nullsub_7\n\ - ldr r2, ._178 + 8\n\ - ldrb r1, [r2]\n\ - add r1, r1, r4\n\ - ldrb r0, [r1]\n\ - eor r0, r0, r6\n\ - b ._183\n\ -._179:\n\ - .align 2, 0\n\ -._178:\n\ - .word gMoveSelectionCursor\n\ - .word gUnknown_03004348\n\ - .word gActiveBank\n\ -._172:\n\ - mov r0, #0x40\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._180 @cond_branch\n\ - ldr r4, ._184\n\ - add r2, r2, r4\n\ - ldrb r1, [r2]\n\ - add r0, r6, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._181 @cond_branch\n\ - b ._209\n\ -._181:\n\ - ldrb r0, [r2]\n\ - bl nullsub_7\n\ - ldr r2, ._184 + 4\n\ - ldrb r1, [r2]\n\ - add r1, r1, r4\n\ - ldrb r0, [r1]\n\ - mov r2, #0x2\n\ - eor r0, r0, r2\n\ - b ._183\n\ -._185:\n\ - .align 2, 0\n\ -._184:\n\ - .word gMoveSelectionCursor\n\ - .word gActiveBank\n\ -._180:\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._186 @cond_branch\n\ - ldr r4, ._192\n\ - add r3, r2, r4\n\ - ldrb r2, [r3]\n\ - mov r5, #0x2\n\ - add r0, r6, #0\n\ - and r0, r0, r2\n\ - cmp r0, #0\n\ - beq ._187 @cond_branch\n\ - b ._209\n\ -._187:\n\ - ldr r1, ._192 + 4\n\ - add r0, r5, #0\n\ - eor r0, r0, r2\n\ - ldrb r1, [r1]\n\ - cmp r0, r1\n\ - bcc ._189 @cond_branch\n\ - b ._209\n\ -._189:\n\ - ldrb r0, [r3]\n\ - bl nullsub_7\n\ - ldr r2, ._192 + 8\n\ - ldrb r1, [r2]\n\ - add r1, r1, r4\n\ - ldrb r0, [r1]\n\ - eor r0, r0, r5\n\ -._183:\n\ - strb r0, [r1]\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r1, ._192 + 8\n\ - ldrb r0, [r1]\n\ - add r0, r0, r4\n\ - ldrb r0, [r0]\n\ - mov r1, #0x0\n\ - bl sub_802E3B4\n\ - bl sub_802E220\n\ - bl sub_802E2D4\n\ - b ._209\n\ -._193:\n\ - .align 2, 0\n\ -._192:\n\ - .word gMoveSelectionCursor\n\ - .word gUnknown_03004348\n\ - .word gActiveBank\n\ -._186:\n\ - mov r0, #0x4\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._194 @cond_branch\n\ - ldr r0, ._201\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bhi ._195 @cond_branch\n\ - b ._209\n\ -._195:\n\ - ldr r0, ._201 + 4\n\ - ldrh r1, [r0]\n\ - add r0, r6, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._197 @cond_branch\n\ - b ._209\n\ -._197:\n\ - ldr r4, ._201 + 8\n\ - add r0, r2, r4\n\ - ldrb r0, [r0]\n\ - ldr r1, ._201 + 12\n\ - bl sub_802E12C\n\ - ldr r2, ._201 + 16\n\ - ldrb r0, [r2]\n\ - add r0, r0, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._199 @cond_branch\n\ - ldr r0, ._201 + 20\n\ - strb r7, [r0]\n\ - b ._200\n\ -._202:\n\ - .align 2, 0\n\ -._201:\n\ - .word gUnknown_03004348\n\ - .word gBattleTypeFlags\n\ - .word gMoveSelectionCursor\n\ - .word gUnknown_081FAE80\n\ - .word gActiveBank\n\ - .word gUnknown_03004344\n\ -._199:\n\ - ldr r1, ._204\n\ - add r0, r0, #0x1\n\ - strb r0, [r1]\n\ - add r0, r1, #0\n\ -._200:\n\ - ldrb r0, [r0]\n\ - mov r1, #0x1b\n\ - bl sub_802E3B4\n\ - ldr r4, ._204 + 4\n\ - ldr r1, ._204 + 8\n\ - mov r0, #0x1c\n\ - str r0, [sp]\n\ - mov r0, #0x3a\n\ - str r0, [sp, #0x4]\n\ - add r0, r4, #0\n\ - mov r2, #0x17\n\ - mov r3, #0x37\n\ - bl Text_FillWindowRect\n\ - ldr r1, ._204 + 12\n\ - mov r2, #0xa4\n\ - lsl r2, r2, #0x2\n\ - mov r0, #0x37\n\ - str r0, [sp]\n\ - add r0, r4, #0\n\ - mov r3, #0x17\n\ - bl Text_InitWindow\n\ - add r0, r4, #0\n\ - bl Text_PrintWindow8002F44\n\ - ldr r1, ._204 + 16\n\ - ldr r0, ._204 + 20\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldr r1, ._204 + 24\n\ - b ._203\n\ -._205:\n\ - .align 2, 0\n\ -._204:\n\ - .word gUnknown_03004344\n\ - .word gUnknown_03004210\n\ - .word 0x1016\n\ - .word BattleText_SwitchWhich\n\ - .word gBattleBankFunc\n\ - .word gActiveBank\n\ - .word sub_802CA60+1\n\ -._194:\n\ - ldr r0, ._214\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - beq ._206 @cond_branch\n\ - b ._209\n\ -._206:\n\ - mov r0, #0x8\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._208 @cond_branch\n\ - b ._209\n\ -._208:\n\ - ldr r6, ._214 + 4\n\ - ldr r1, ._214 + 8\n\ - str r3, [sp]\n\ - mov r0, #0x3a\n\ - str r0, [sp, #0x4]\n\ - add r0, r6, #0\n\ - mov r2, #0x1\n\ - mov r3, #0x37\n\ - bl Text_FillWindowRect\n\ - ldr r0, ._214 + 12\n\ - mov sl, r0\n\ - ldr r1, ._214 + 16\n\ - ldrb r0, [r1]\n\ - lsl r0, r0, #0x1\n\ - add r0, r0, sl\n\ - ldrh r0, [r0]\n\ - mov r2, #0x64\n\ - mov r9, r2\n\ - mov r1, r9\n\ - mul r1, r1, r0\n\ - add r0, r1, #0\n\ - ldr r5, ._214 + 20\n\ - add r0, r0, r5\n\ - mov r1, #0xd\n\ - bl GetMonData\n\ - mov r1, #0xd\n\ - mul r1, r1, r0\n\ - ldr r0, ._214 + 24\n\ - add r1, r1, r0\n\ - mov r2, #0x80\n\ - lsl r2, r2, #0x1\n\ - mov r0, #0x37\n\ - mov r8, r0\n\ - str r0, [sp]\n\ - add r0, r6, #0\n\ - mov r3, #0x2\n\ - bl Text_InitWindowAndPrintText\n\ - ldr r4, ._214 + 28\n\ - ldr r1, ._214 + 16\n\ - ldrb r0, [r1]\n\ - lsl r0, r0, #0x1\n\ - add r0, r0, sl\n\ - ldrh r0, [r0]\n\ - mov r2, r9\n\ - mul r2, r2, r0\n\ - add r0, r2, #0\n\ - add r0, r0, r5\n\ - mov r1, #0xd\n\ - bl GetMonData\n\ - add r1, r0, #0\n\ - add r0, r4, #0\n\ - mov r2, #0x2\n\ - mov r3, #0x3\n\ - bl ConvertIntToDecimalStringN\n\ - mov r2, #0x88\n\ - lsl r2, r2, #0x1\n\ - mov r0, r8\n\ - str r0, [sp]\n\ - add r0, r6, #0\n\ - add r1, r4, #0\n\ - mov r3, #0xa\n\ - bl Text_InitWindowAndPrintText\n\ - ldr r1, ._214 + 32\n\ - mov r2, #0x8b\n\ - lsl r2, r2, #0x1\n\ - mov r5, #0x39\n\ - str r5, [sp]\n\ - add r0, r6, #0\n\ - mov r3, #0x1\n\ - bl Text_InitWindowAndPrintText\n\ - ldr r0, ._214 + 36\n\ - ldrb r1, [r0]\n\ - add r0, r4, #0\n\ - mov r2, #0x2\n\ - mov r3, #0x3\n\ - bl ConvertIntToDecimalStringN\n\ - mov r2, #0x8e\n\ - lsl r2, r2, #0x1\n\ - str r5, [sp]\n\ - add r0, r6, #0\n\ - add r1, r4, #0\n\ - mov r3, #0x4\n\ - bl Text_InitWindowAndPrintText\n\ - ldr r0, ._214 + 40\n\ - add r2, r0, #0\n\ - add r2, r2, #0x3e\n\ - mov r1, #0x3f\n\ -._211:\n\ - ldrb r0, [r2]\n\ - lsl r0, r0, #0x1f\n\ - cmp r0, #0\n\ - beq ._210 @cond_branch\n\ - add r0, r7, #1\n\ - lsl r0, r0, #0x18\n\ - lsr r7, r0, #0x18\n\ -._210:\n\ - add r2, r2, #0x44\n\ - sub r1, r1, #0x1\n\ - cmp r1, #0\n\ - bge ._211 @cond_branch\n\ - ldr r4, ._214 + 28\n\ - add r0, r4, #0\n\ - add r1, r7, #0\n\ - mov r2, #0x2\n\ - mov r3, #0x2\n\ - bl ConvertIntToDecimalStringN\n\ - ldr r6, ._214 + 4\n\ - mov r2, #0x91\n\ - lsl r2, r2, #0x1\n\ - mov r5, #0x39\n\ - str r5, [sp]\n\ - add r0, r6, #0\n\ - add r1, r4, #0\n\ - mov r3, #0x8\n\ - bl Text_InitWindowAndPrintText\n\ - bl GetTaskCount\n\ - lsl r0, r0, #0x18\n\ - lsr r7, r0, #0x18\n\ - add r0, r4, #0\n\ - add r1, r7, #0\n\ - mov r2, #0x2\n\ - mov r3, #0x2\n\ - bl ConvertIntToDecimalStringN\n\ - mov r2, #0x93\n\ - lsl r2, r2, #0x1\n\ - str r5, [sp]\n\ - add r0, r6, #0\n\ - add r1, r4, #0\n\ - mov r3, #0xb\n\ - bl Text_InitWindowAndPrintText\n\ - mov r1, #0x0\n\ - mov r7, #0x0\n\ - ldr r0, ._214 + 44\n\ - mov r3, #0x1\n\ - ldr r2, [r0]\n\ -._213:\n\ - add r0, r3, #0\n\ - LSL r0, r1\n\ - and r0, r0, r2\n\ - cmp r0, #0\n\ - beq ._212 @cond_branch\n\ - add r0, r7, #1\n\ - lsl r0, r0, #0x18\n\ - lsr r7, r0, #0x18\n\ -._212:\n\ - add r1, r1, #0x1\n\ - cmp r1, #0x1f\n\ - ble ._213 @cond_branch\n\ - ldr r4, ._214 + 28\n\ - add r0, r4, #0\n\ - add r1, r7, #0\n\ - mov r2, #0x2\n\ - mov r3, #0x2\n\ - bl ConvertIntToDecimalStringN\n\ - ldr r0, ._214 + 4\n\ - mov r2, #0x95\n\ - lsl r2, r2, #0x1\n\ - mov r1, #0x39\n\ - str r1, [sp]\n\ - add r1, r4, #0\n\ - mov r3, #0xe\n\ - bl Text_InitWindowAndPrintText\n\ - ldr r1, ._214 + 48\n\ - ldr r0, ._214 + 16\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x2\n\ - add r0, r0, r1\n\ - ldr r1, ._214 + 52\n\ -._203:\n\ - str r1, [r0]\n\ -._209:\n\ - add sp, sp, #0x8\n\ - pop {r3, r4, r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov sl, r5\n\ - pop {r4, r5, r6, r7}\n\ - pop {r0}\n\ - bx r0\n\ -._215:\n\ - .align 2, 0\n\ -._214:\n\ - .word gUnknown_020297ED\n\ - .word gUnknown_03004210\n\ - .word 0x1016\n\ - .word gBattlePartyID\n\ - .word gActiveBank\n\ - .word gPlayerParty\n\ - .word gMoveNames\n\ - .word gDisplayedStringBattle\n\ - .word gString_TurnJP\n\ - .word gAnimMoveTurn\n\ - .word gSprites\n\ - .word gOamMatrixAllocBitmap\n\ - .word gBattleBankFunc\n\ - .word debug_sub_8030C24+1"); -} -#else +void debug_sub_8030C24(void); + void sub_802C68C(void) { u32 r8 = 0; +#if DEBUG + u8 count = 0; +#endif struct ChooseMoveStruct *r6 = (struct ChooseMoveStruct *)(gBattleBufferA[gActiveBank] + 4); if (gMain.newKeys & A_BUTTON) @@ -1469,8 +757,44 @@ void sub_802C68C(void) gBattleBankFunc[gActiveBank] = sub_802CA60; } } -} +#if DEBUG + else if (gUnknown_020297ED == 1 && (gMain.newKeys & START_BUTTON)) + { + const u8 *moveName; + s32 i; + + Text_FillWindowRect(&gUnknown_03004210, 0x1016, 1, 0x37, 16, 0x3A); + moveName = gMoveNames[GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1)]; + Text_InitWindowAndPrintText(&gUnknown_03004210, moveName, 0x100, 2, 0x37); + ConvertIntToDecimalStringN( + gDisplayedStringBattle, + GetMonData(&gPlayerParty[gBattlePartyID[gActiveBank]], MON_DATA_MOVE1), + 2, 3); + Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 0x110, 10, 0x37); + Text_InitWindowAndPrintText(&gUnknown_03004210, gString_TurnJP, 0x116, 1, 0x39); + ConvertIntToDecimalStringN(gDisplayedStringBattle, gAnimMoveTurn, 2, 3); + Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 0x11C, 4, 0x39); + for (i = 0; i < 64; i++) + { + if (gSprites[i].inUse) + count++; + } + ConvertIntToDecimalStringN(gDisplayedStringBattle, count, 2, 2); + Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 0x122, 8, 0x39); + count = GetTaskCount(); + ConvertIntToDecimalStringN(gDisplayedStringBattle, count, 2, 2); + Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 0x126, 11, 0x39); + for (i = 0, count = 0; i < 32; i++) + { + if (gOamMatrixAllocBitmap & (1 << i)) + count++; + } + ConvertIntToDecimalStringN(gDisplayedStringBattle, count, 2, 2); + Text_InitWindowAndPrintText(&gUnknown_03004210, gDisplayedStringBattle, 0x12A, 14, 0x39); + gBattleBankFunc[gActiveBank] = debug_sub_8030C24; + } #endif +} extern const u8 BattleText_Format[]; diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c index 4af8adbbb..5896e5e18 100644 --- a/src/battle/battle_controller_safari.c +++ b/src/battle/battle_controller_safari.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle_anim_81258BC.h" #include "battle.h" +#include "battle_interface.h" #include "battle_message.h" #include "data2.h" #include "link.h" @@ -207,236 +208,6 @@ void SafariBufferRunCommand(void) } } -#if DEBUG -__attribute__((naked)) -void bx_battle_menu_t6_2(void) -{ - asm("\ - push {r4, r5, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r0, ._94\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r2, #0x1\n\ - add r0, r2, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._89 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - bl DestroyMenuCursor\n\ - ldr r1, ._94 + 4\n\ - ldr r0, ._94 + 8\n\ - ldrb r0, [r0]\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - beq ._90 @cond_branch\n\ - cmp r0, #0x1\n\ - bgt ._91 @cond_branch\n\ - cmp r0, #0\n\ - beq ._92 @cond_branch\n\ - b ._101\n\ -._95:\n\ - .align 2, 0\n\ -._94:\n\ - .word gMain\n\ - .word gActionSelectionCursor\n\ - .word gActiveBank\n\ -._91:\n\ - cmp r0, #0x2\n\ - beq ._96 @cond_branch\n\ - cmp r0, #0x3\n\ - beq ._97 @cond_branch\n\ - b ._101\n\ -._92:\n\ - mov r0, #0x1\n\ - mov r1, #0x5\n\ - b ._100\n\ -._90:\n\ - mov r0, #0x1\n\ - mov r1, #0x6\n\ - b ._100\n\ -._96:\n\ - mov r0, #0x1\n\ - mov r1, #0x7\n\ -._100:\n\ - mov r2, #0x0\n\ - bl Emitcmd33\n\ - b ._101\n\ -._97:\n\ - mov r0, #0x1\n\ - mov r1, #0x8\n\ - mov r2, #0x0\n\ - bl Emitcmd33\n\ -._101:\n\ - bl SafariBufferExecCompleted\n\ - b ._129\n\ -._89:\n\ - mov r3, #0x20\n\ - add r0, r3, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._103 @cond_branch\n\ - ldr r5, ._107\n\ - ldr r4, ._107 + 4\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - add r0, r2, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._104 @cond_branch\n\ - b ._129\n\ -._104:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r0, [r0]\n\ - bl nullsub_8\n\ - ldrb r1, [r4]\n\ - add r1, r1, r5\n\ - ldrb r0, [r1]\n\ - mov r2, #0x1\n\ - b ._111\n\ -._108:\n\ - .align 2, 0\n\ -._107:\n\ - .word gActionSelectionCursor\n\ - .word gActiveBank\n\ -._103:\n\ - mov r0, #0x10\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._109 @cond_branch\n\ - ldr r5, ._112\n\ - ldr r4, ._112 + 4\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - add r0, r2, #0\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._129 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r0, [r0]\n\ - bl nullsub_8\n\ - ldrb r1, [r4]\n\ - add r1, r1, r5\n\ - ldrb r0, [r1]\n\ - mov r2, #0x1\n\ - b ._111\n\ -._113:\n\ - .align 2, 0\n\ -._112:\n\ - .word gActionSelectionCursor\n\ - .word gActiveBank\n\ -._109:\n\ - mov r0, #0x40\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._114 @cond_branch\n\ - ldr r5, ._117\n\ - ldr r4, ._117 + 4\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - mov r0, #0x2\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._129 @cond_branch\n\ - b ._116\n\ -._118:\n\ - .align 2, 0\n\ -._117:\n\ - .word gActionSelectionCursor\n\ - .word gActiveBank\n\ -._114:\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._119 @cond_branch\n\ - ldr r5, ._122\n\ - ldr r4, ._122 + 4\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r1, [r0]\n\ - mov r0, #0x2\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._129 @cond_branch\n\ -._116:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r0, [r0]\n\ - bl nullsub_8\n\ - ldrb r1, [r4]\n\ - add r1, r1, r5\n\ - ldrb r0, [r1]\n\ - mov r2, #0x2\n\ -._111:\n\ - eor r0, r0, r2\n\ - strb r0, [r1]\n\ - ldrb r0, [r4]\n\ - add r0, r0, r5\n\ - ldrb r0, [r0]\n\ - mov r1, #0x0\n\ - bl sub_802E3E4\n\ - b ._129\n\ -._123:\n\ - .align 2, 0\n\ -._122:\n\ - .word gActionSelectionCursor\n\ - .word gActiveBank\n\ -._119:\n\ - mov r0, #0x80\n\ - lsl r0, r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._124 @cond_branch\n\ - ldr r0, ._127\n\ - ldrb r2, [r0]\n\ - lsl r0, r2, #0x1\n\ - add r0, r0, r2\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._127 + 4\n\ - add r0, r0, r1\n\ - ldrb r1, [r0]\n\ - add r0, r3, #0\n\ - and r0, r0, r1\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._129 @cond_branch\n\ - str r0, [sp]\n\ - add r0, r2, #0\n\ - add r1, r2, #0\n\ - mov r3, #0x4\n\ - bl move_anim_start_t3\n\ - b ._129\n\ -._128:\n\ - .align 2, 0\n\ -._127:\n\ - .word gActiveBank\n\ - .word +0x2017810\n\ -._124:\n\ - mov r0, #0x8\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._129 @cond_branch\n\ - bl sub_804454C\n\ -._129:\n\ - add sp, sp, #0x4\n\ - pop {r4, r5}\n\ - pop {r0}\n\ - bx r0"); -} -#else void bx_battle_menu_t6_2(void) { if (gMain.newKeys & A_BUTTON) @@ -502,8 +273,18 @@ void bx_battle_menu_t6_2(void) sub_802E3E4(gActionSelectionCursor[gActiveBank], 0); } } -} +#if DEBUG + else if (gMain.newKeys & R_BUTTON) + { + if (!ewram17810[gActiveBank].unk0_5) + move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, 4, 0); + } + else if (gMain.newKeys & START_BUTTON) + { + sub_804454C(); + } #endif +} void sub_812B65C(void) { diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index b703bc7b8..9be026d53 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -1277,353 +1277,8 @@ _08044548: .4byte 0x04000008\n\ } #endif -#if DEBUG -__attribute__((naked)) -void sub_804454C() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x0\n" - " mov r8, r0\n" - " ldr r0, ._150\n" - " ldrb r0, [r0]\n" - " cmp r8, r0\n" - " blt ._133 @cond_branch\n" - " b ._164\n" - "._133:\n" - " ldr r1, ._150 + 4\n" - " mov r9, r1\n" - " mov r2, #0x64\n" - " mov sl, r2\n" - " ldr r7, ._150 + 8\n" - "._165:\n" - " ldr r0, ._150 + 12\n" - " mov r6, r8\n" - " add r5, r6, r0\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " mov r1, r9\n" - " add r1, r1, #0x1c\n" - " add r0, r0, r1\n" - " ldr r1, [r0]\n" - " ldr r0, ._150 + 16\n" - " cmp r1, r0\n" - " beq ._135 @cond_branch\n" - " b ._147\n" - "._135:\n" - " ldr r0, ._150 + 20\n" - " ldrb r0, [r0]\n" - " lsl r4, r6, #0x18\n" - " cmp r0, #0\n" - " bne ._138 @cond_branch\n" - " lsr r0, r4, #0x18\n" - " bl GetBankSide\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bne ._138 @cond_branch\n" - " b ._147\n" - "._138:\n" - " bl IsDoubleBattle\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._141 @cond_branch\n" - " lsr r0, r4, #0x18\n" - " bl GetBankSide\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._141 @cond_branch\n" - " b ._147\n" - "._141:\n" - " mov r0, r8\n" - " lsl r3, r0, #0x2\n" - " ldr r0, ._150 + 24\n" - " add r3, r3, r0\n" - " ldr r0, [r3]\n" - " lsl r0, r0, #0x1b\n" - " lsr r0, r0, #0x1f\n" - " mov r2, #0x1\n" - " eor r2, r2, r0\n" - " lsl r2, r2, #0x4\n" - " ldrb r0, [r3]\n" - " mov r6, #0x11\n" - " neg r6, r6\n" - " add r1, r6, #0\n" - " and r0, r0, r1\n" - " orr r0, r0, r2\n" - " strb r0, [r3]\n" - " ldr r0, [r3]\n" - " lsl r0, r0, #0x1b\n" - " lsr r6, r0, #0x1f\n" - " lsr r0, r4, #0x18\n" - " bl GetBankSide\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._143 @cond_branch\n" - " bl IsDoubleBattle\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._144 @cond_branch\n" - " b ._147\n" - "._144:\n" - " ldr r0, ._150 + 28\n" - " ldrh r1, [r0]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r2, r0, #0x10\n" - " cmp r2, #0\n" - " beq ._146 @cond_branch\n" - " b ._147\n" - "._146:\n" - " cmp r6, #0x1\n" - " bne ._148 @cond_branch\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r9\n" - " ldrh r0, [r0, #0x38]\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " str r2, [sp]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r9\n" - " ldrh r1, [r0, #0x4]\n" - " lsl r1, r1, #0x16\n" - " lsr r1, r1, #0x11\n" - " ldr r0, ._150 + 32\n" - " add r1, r1, r0\n" - " mov r0, sp\n" - " ldr r2, ._150 + 36\n" - " bl CpuSet\n" - " ldrb r4, [r5]\n" - " ldrh r0, [r7]\n" - " mov r1, sl\n" - " mul r1, r1, r0\n" - " add r0, r1, #0\n" - " ldr r2, ._150 + 40\n" - " add r0, r0, r2\n" - " mov r1, #0x39\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " asr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " mov r2, #0x0\n" - " bl sub_8044210\n" - " ldrb r4, [r5]\n" - " ldrh r0, [r7]\n" - " mov r6, sl\n" - " mul r6, r6, r0\n" - " add r0, r6, #0\n" - " ldr r1, ._150 + 40\n" - " b ._149\n" - "._151:\n" - " .align 2, 0\n" - "._150:\n" - " .word gNoOfAllBanks\n" - " .word gSprites\n" - " .word gBattlePartyID\n" - " .word gHealthboxIDs\n" - " .word SpriteCallbackDummy+1\n" - " .word gUnknown_020297ED\n" - " .word +0x2017800\n" - " .word gBattleTypeFlags\n" - " .word 0x6010000\n" - " .word 0x5000040\n" - " .word gPlayerParty\n" - "._148:\n" - " ldrb r0, [r5]\n" - " bl draw_status_ailment_maybe\n" - " ldrb r0, [r5]\n" - " ldrh r1, [r7]\n" - " mov r2, sl\n" - " mul r2, r2, r1\n" - " add r1, r2, #0\n" - " ldr r6, ._153\n" - " add r1, r1, r6\n" - " mov r2, #0x5\n" - " bl sub_8045A5C\n" - " mov r0, #0x75\n" - " bl sub_8043CDC\n" - " ldrb r2, [r5]\n" - " lsl r1, r2, #0x4\n" - " add r1, r1, r2\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r9\n" - " ldrh r1, [r1, #0x4]\n" - " lsl r1, r1, #0x16\n" - " lsr r1, r1, #0x11\n" - " ldr r2, ._153 + 4\n" - " add r1, r1, r2\n" - " ldr r2, ._153 + 8\n" - " bl CpuSet\n" - " b ._163\n" - "._154:\n" - " .align 2, 0\n" - "._153:\n" - " .word gPlayerParty\n" - " .word 0x6010680\n" - " .word 0x4000008\n" - "._143:\n" - " cmp r6, #0x1\n" - " bne ._155 @cond_branch\n" - " ldr r0, ._158\n" - " ldrh r1, [r0]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x10\n" - " lsr r2, r0, #0x10\n" - " cmp r2, #0\n" - " beq ._156 @cond_branch\n" - " ldrb r0, [r5]\n" - " ldrh r1, [r7]\n" - " mov r6, sl\n" - " mul r6, r6, r1\n" - " add r1, r6, #0\n" - " ldr r2, ._158 + 4\n" - " add r1, r1, r2\n" - " bl sub_8044338\n" - " b ._163\n" - "._159:\n" - " .align 2, 0\n" - "._158:\n" - " .word gBattleTypeFlags\n" - " .word gEnemyParty\n" - "._156:\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r9\n" - " ldrh r0, [r0, #0x38]\n" - " lsl r0, r0, #0x18\n" - " lsr r1, r0, #0x18\n" - " str r2, [sp]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r9\n" - " ldrh r1, [r0, #0x4]\n" - " lsl r1, r1, #0x16\n" - " lsr r1, r1, #0x11\n" - " ldr r6, ._161\n" - " add r1, r1, r6\n" - " mov r0, sp\n" - " ldr r2, ._161 + 4\n" - " bl CpuSet\n" - " ldrb r4, [r5]\n" - " ldrh r0, [r7]\n" - " mov r1, sl\n" - " mul r1, r1, r0\n" - " add r0, r1, #0\n" - " ldr r2, ._161 + 8\n" - " add r0, r0, r2\n" - " mov r1, #0x39\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " asr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " mov r2, #0x0\n" - " bl sub_8044210\n" - " ldrb r4, [r5]\n" - " ldrh r0, [r7]\n" - " mov r6, sl\n" - " mul r6, r6, r0\n" - " add r0, r6, #0\n" - " ldr r1, ._161 + 8\n" - "._149:\n" - " add r0, r0, r1\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " asr r1, r1, #0x10\n" - " add r0, r4, #0\n" - " mov r2, #0x1\n" - " bl sub_8044210\n" - " b ._163\n" - "._162:\n" - " .align 2, 0\n" - "._161:\n" - " .word 0x6010000\n" - " .word 0x5000040\n" - " .word gEnemyParty\n" - "._155:\n" - " ldrb r0, [r5]\n" - " bl draw_status_ailment_maybe\n" - " ldrb r0, [r5]\n" - " ldrh r1, [r7]\n" - " mov r6, #0x64\n" - " mul r1, r1, r6\n" - " ldr r4, ._166\n" - " add r1, r1, r4\n" - " mov r2, #0x5\n" - " bl sub_8045A5C\n" - " ldr r0, ._166 + 4\n" - " ldrh r1, [r0]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._163 @cond_branch\n" - " ldrb r0, [r5]\n" - " ldrh r1, [r7]\n" - " mul r1, r1, r6\n" - " add r1, r1, r4\n" - " mov r2, #0x4\n" - " bl sub_8045A5C\n" - "._163:\n" - " ldr r0, ._166 + 8\n" - " add r0, r0, r8\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r9\n" - " ldrh r1, [r0, #0x3c]\n" - " mov r2, #0x1\n" - " eor r1, r1, r2\n" - " strh r1, [r0, #0x3c]\n" - "._147:\n" - " add r7, r7, #0x2\n" - " mov r2, #0x1\n" - " add r8, r8, r2\n" - " ldr r0, ._166 + 12\n" - " ldrb r0, [r0]\n" - " cmp r8, r0\n" - " bge ._164 @cond_branch\n" - " b ._165\n" - "._164:\n" - " add sp, sp, #0x4\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._167:\n" - " .align 2, 0\n" - "._166:\n" - " .word gEnemyParty\n" - " .word gBattleTypeFlags\n" - " .word gHealthboxIDs\n" - " .word gNoOfAllBanks\n" - "\n" - ); -} -#else +extern u8 gUnknown_020297ED; + void sub_804454C(void) { s32 i; @@ -1632,7 +1287,11 @@ void sub_804454C(void) for (i = 0; i < gNoOfAllBanks; i++) { if (gSprites[gHealthboxIDs[i]].callback == SpriteCallbackDummy +#if DEBUG + && (gUnknown_020297ED != 0 || GetBankSide(i) != 1) +#else && GetBankSide(i) != 1 +#endif && (IsDoubleBattle() || GetBankSide(i) != 0)) { u8 r6; @@ -1691,7 +1350,6 @@ void sub_804454C(void) } } } -#endif // This function almost matches except for just two instructions around 0x08044B52 that are swapped. #ifdef NONMATCHING @@ -3045,310 +2703,6 @@ static u8 sub_80457E8(u8 a, u8 b) } } -#if DEBUG -__attribute__((naked)) -void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xfffffff8\n" - " mov r9, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov r8, r0\n" - " lsl r2, r2, #0x18\n" - " lsr r7, r2, #0x18\n" - " ldr r1, ._429\n" - " lsl r0, r0, #0x4\n" - " add r0, r0, r8\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldrh r0, [r0, #0x3a]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov sl, r0\n" - " bl GetBankSide\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._410 @cond_branch\n" - " b ._411\n" - "._410:\n" - " cmp r7, #0x3\n" - " beq ._412 @cond_branch\n" - " cmp r7, #0\n" - " bne ._413 @cond_branch\n" - "._412:\n" - " mov r0, r9\n" - " mov r1, #0x38\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " mov r0, r8\n" - " bl sub_8043FC0\n" - "._413:\n" - " cmp r7, #0x1\n" - " bhi ._414 @cond_branch\n" - " mov r0, r9\n" - " mov r1, #0x39\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " asr r1, r1, #0x10\n" - " mov r0, r8\n" - " mov r2, #0x0\n" - " bl sub_80440EC\n" - "._414:\n" - " cmp r7, #0x2\n" - " beq ._415 @cond_branch\n" - " cmp r7, #0\n" - " bne ._416 @cond_branch\n" - "._415:\n" - " mov r0, r9\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " asr r1, r1, #0x10\n" - " mov r0, r8\n" - " mov r2, #0x1\n" - " bl sub_80440EC\n" - "._416:\n" - " cmp r7, #0x5\n" - " beq ._417 @cond_branch\n" - " cmp r7, #0\n" - " bne ._418 @cond_branch\n" - "._417:\n" - " mov r0, #0x0\n" - " bl load_gfxc_health_bar\n" - " mov r0, r9\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r4, r0, #0\n" - " mov r0, r9\n" - " mov r1, #0x39\n" - " bl GetMonData\n" - " add r3, r0, #0\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, sl\n" - " mov r1, r8\n" - " add r2, r4, #0\n" - " bl sub_8043D84\n" - " mov r0, sl\n" - " mov r1, r8\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " bl sub_8045C78\n" - "._418:\n" - " bl IsDoubleBattle\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " str r0, [sp, #0x4]\n" - " cmp r0, #0\n" - " bne ._421 @cond_branch\n" - " cmp r7, #0x6\n" - " beq ._420 @cond_branch\n" - " cmp r7, #0\n" - " bne ._421 @cond_branch\n" - "._420:\n" - " mov r0, #0x3\n" - " bl load_gfxc_health_bar\n" - " mov r0, r9\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x10\n" - " lsr r5, r5, #0x10\n" - " mov r0, r9\n" - " mov r1, #0x38\n" - " bl GetMonData\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " mov r0, r9\n" - " mov r1, #0x19\n" - " bl GetMonData\n" - " add r3, r0, #0\n" - " ldr r6, ._429 + 4\n" - " lsl r1, r4, #0x2\n" - " ldr r2, ._429 + 8\n" - " lsl r0, r5, #0x3\n" - " sub r0, r0, r5\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r2\n" - " ldrb r2, [r0, #0x13]\n" - " mov r0, #0xca\n" - " lsl r0, r0, #0x1\n" - " mul r0, r0, r2\n" - " add r1, r1, r0\n" - " add r1, r1, r6\n" - " ldr r1, [r1]\n" - " sub r3, r3, r1\n" - " add r4, r4, #0x1\n" - " lsl r4, r4, #0x2\n" - " add r4, r4, r0\n" - " add r4, r4, r6\n" - " ldr r2, [r4]\n" - " sub r2, r2, r1\n" - " ldr r0, [sp, #0x4]\n" - " str r0, [sp]\n" - " mov r0, sl\n" - " mov r1, r8\n" - " bl sub_8043D84\n" - " mov r0, sl\n" - " mov r1, r8\n" - " mov r2, #0x1\n" - " mov r3, #0x0\n" - " bl sub_8045C78\n" - "._421:\n" - " cmp r7, #0x4\n" - " beq ._422 @cond_branch\n" - " cmp r7, #0\n" - " bne ._423 @cond_branch\n" - "._422:\n" - " mov r0, r8\n" - " mov r1, r9\n" - " bl sub_80451A0\n" - "._423:\n" - " cmp r7, #0x9\n" - " beq ._424 @cond_branch\n" - " cmp r7, #0\n" - " bne ._425 @cond_branch\n" - "._424:\n" - " mov r0, r8\n" - " bl draw_status_ailment_maybe\n" - "._425:\n" - " cmp r7, #0xa\n" - " bne ._426 @cond_branch\n" - " mov r0, r8\n" - " bl sub_80458B0\n" - "._426:\n" - " add r0, r7, #0\n" - " sub r0, r0, #0xa\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " cmp r0, #0x1\n" - " bhi ._442 @cond_branch\n" - " mov r0, r8\n" - " bl sub_8045998\n" - " b ._442\n" - "._430:\n" - " .align 2, 0\n" - "._429:\n" - " .word gSprites\n" - " .word gExperienceTables\n" - " .word gBaseStats\n" - "._411:\n" - " cmp r7, #0x3\n" - " beq ._431 @cond_branch\n" - " cmp r7, #0\n" - " bne ._432 @cond_branch\n" - "._431:\n" - " mov r0, r9\n" - " mov r1, #0x38\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x18\n" - " lsr r1, r1, #0x18\n" - " mov r0, r8\n" - " bl sub_8043FC0\n" - "._432:\n" - " ldr r0, ._443\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x1\n" - " bne ._436 @cond_branch\n" - " cmp r7, #0x1\n" - " bhi ._434 @cond_branch\n" - " mov r0, r9\n" - " mov r1, #0x39\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " asr r1, r1, #0x10\n" - " mov r0, r8\n" - " mov r2, #0x0\n" - " bl sub_80440EC\n" - "._434:\n" - " cmp r7, #0x2\n" - " beq ._435 @cond_branch\n" - " cmp r7, #0\n" - " bne ._436 @cond_branch\n" - "._435:\n" - " mov r0, r9\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r1, r0, #0\n" - " lsl r1, r1, #0x10\n" - " asr r1, r1, #0x10\n" - " mov r0, r8\n" - " mov r2, #0x1\n" - " bl sub_80440EC\n" - "._436:\n" - " cmp r7, #0x5\n" - " beq ._437 @cond_branch\n" - " cmp r7, #0\n" - " bne ._438 @cond_branch\n" - "._437:\n" - " mov r0, #0x0\n" - " bl load_gfxc_health_bar\n" - " mov r0, r9\n" - " mov r1, #0x3a\n" - " bl GetMonData\n" - " add r4, r0, #0\n" - " mov r0, r9\n" - " mov r1, #0x39\n" - " bl GetMonData\n" - " add r3, r0, #0\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, sl\n" - " mov r1, r8\n" - " add r2, r4, #0\n" - " bl sub_8043D84\n" - " mov r0, sl\n" - " mov r1, r8\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " bl sub_8045C78\n" - "._438:\n" - " cmp r7, #0x4\n" - " beq ._439 @cond_branch\n" - " cmp r7, #0\n" - " bne ._440 @cond_branch\n" - "._439:\n" - " mov r0, r8\n" - " mov r1, r9\n" - " bl sub_80451A0\n" - "._440:\n" - " cmp r7, #0x9\n" - " beq ._441 @cond_branch\n" - " cmp r7, #0\n" - " bne ._442 @cond_branch\n" - "._441:\n" - " mov r0, r8\n" - " bl draw_status_ailment_maybe\n" - "._442:\n" - " add sp, sp, #0x8\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._444:\n" - " .align 2, 0\n" - "._443:\n" - " .word gUnknown_020297ED\n" - "\n" - ); -} -#else void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) { u8 r10; @@ -3404,6 +2758,15 @@ void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) { if (c == 3 || c == 0) sub_8043FC0(a, GetMonData(pkmn, MON_DATA_LEVEL)); +#if DEBUG + if (gUnknown_020297ED == 1) + { + if (c == 1 || c == 0) + sub_80440EC(a, GetMonData(pkmn, MON_DATA_HP), 0); + if (c == 2 || c == 0) + sub_80440EC(a, GetMonData(pkmn, MON_DATA_MAX_HP), 1); + } +#endif if (c == 5 || c == 0) { load_gfxc_health_bar(0); @@ -3418,7 +2781,6 @@ void sub_8045A5C(u8 a, struct Pokemon *pkmn, u8 c) draw_status_ailment_maybe(a); } } -#endif s32 sub_8045C78(u8 a, u8 unused1, u8 c, u8 unused2) { diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index 6f187ad71..41579fa28 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -525,324 +525,49 @@ void CalculateMonStats(struct Pokemon *mon) } #if DEBUG -__attribute__((naked)) -void debug_sub_803F55C() +void debug_sub_803F55C(struct Pokemon *mon) { - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " add sp, sp, #0xffffffc4\n" - " add r5, r0, #0\n" - " mov r1, #0x39\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x1c]\n" - " add r0, r5, #0\n" - " mov r1, #0x27\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " add r7, r0, #0\n" - " add r0, r5, #0\n" - " mov r1, #0x1a\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " add r4, r0, #0\n" - " add r0, r5, #0\n" - " mov r1, #0x28\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " mov r9, r0\n" - " add r0, r5, #0\n" - " mov r1, #0x1b\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " mov r8, r0\n" - " add r0, r5, #0\n" - " mov r1, #0x29\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x20]\n" - " add r0, r5, #0\n" - " mov r1, #0x1c\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " mov sl, r0\n" - " add r0, r5, #0\n" - " mov r1, #0x2a\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x24]\n" - " add r0, r5, #0\n" - " mov r1, #0x1d\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x28]\n" - " add r0, r5, #0\n" - " mov r1, #0x2b\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x2c]\n" - " add r0, r5, #0\n" - " mov r1, #0x1e\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x30]\n" - " add r0, r5, #0\n" - " mov r1, #0x2c\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x34]\n" - " add r0, r5, #0\n" - " mov r1, #0x1f\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " str r0, [sp, #0x38]\n" - " add r0, r5, #0\n" - " mov r1, #0xb\n" - " mov r2, #0x0\n" - " bl GetMonData\n" - " lsl r0, r0, #0x10\n" - " lsr r6, r0, #0x10\n" - " add r0, r5, #0\n" - " bl GetLevelFromMonExp\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " str r0, [sp]\n" - " add r0, r5, #0\n" - " mov r1, #0x38\n" - " mov r2, sp\n" - " bl SetMonData\n" - " ldr r0, ._71\n" - " cmp r6, r0\n" - " bne ._69 @cond_branch\n" - " mov r0, #0x1\n" - " str r0, [sp, #0x4]\n" - " lsl r7, r6, #0x3\n" - " b ._70\n" - "._72:\n" - " .align 2, 0\n" - "._71:\n" - " .word 0x12f\n" - "._69:\n" - " ldr r1, ._80\n" - " lsl r2, r6, #0x3\n" - " sub r0, r2, r6\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x1\n" - " add r1, r0, r7\n" - " add r0, r4, #0\n" - " add r7, r2, #0\n" - " cmp r0, #0\n" - " bge ._73 @cond_branch\n" - " add r0, r0, #0x3\n" - "._73:\n" - " asr r0, r0, #0x2\n" - " add r0, r1, r0\n" - " ldr r4, [sp]\n" - " mul r0, r0, r4\n" - " mov r1, #0x64\n" - " bl __divsi3\n" - " add r0, r0, r4\n" - " add r0, r0, #0xa\n" - " str r0, [sp, #0x4]\n" - "._70:\n" - " add r2, sp, #0x4\n" - " add r0, r5, #0\n" - " mov r1, #0x3a\n" - " bl SetMonData\n" - " ldr r1, ._80\n" - " sub r0, r7, r6\n" - " lsl r0, r0, #0x2\n" - " add r6, r0, r1\n" - " ldrb r0, [r6, #0x1]\n" - " lsl r0, r0, #0x1\n" - " mov r2, r9\n" - " add r1, r0, r2\n" - " mov r0, r8\n" - " cmp r0, #0\n" - " bge ._74 @cond_branch\n" - " add r0, r0, #0x3\n" - "._74:\n" - " asr r0, r0, #0x2\n" - " add r0, r1, r0\n" - " ldr r1, [sp]\n" - " mul r0, r0, r1\n" - " mov r1, #0x64\n" - " bl __divsi3\n" - " add r0, r0, #0x5\n" - " str r0, [sp, #0x8]\n" - " add r0, r5, #0\n" - " bl GetNature\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r4, sp, #0x8\n" - " ldrh r1, [r4]\n" - " mov r2, #0x1\n" - " bl nature_stat_mod\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " str r0, [sp, #0x8]\n" - " add r0, r5, #0\n" - " mov r1, #0x3b\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " ldrb r0, [r6, #0x2]\n" - " lsl r0, r0, #0x1\n" - " ldr r2, [sp, #0x20]\n" - " add r1, r0, r2\n" - " mov r0, sl\n" - " cmp r0, #0\n" - " bge ._75 @cond_branch\n" - " add r0, r0, #0x3\n" - "._75:\n" - " asr r0, r0, #0x2\n" - " add r0, r1, r0\n" - " ldr r1, [sp]\n" - " mul r0, r0, r1\n" - " mov r1, #0x64\n" - " bl __divsi3\n" - " add r0, r0, #0x5\n" - " str r0, [sp, #0xc]\n" - " add r0, r5, #0\n" - " bl GetNature\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r4, sp, #0xc\n" - " ldrh r1, [r4]\n" - " mov r2, #0x2\n" - " bl nature_stat_mod\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " str r0, [sp, #0xc]\n" - " add r0, r5, #0\n" - " mov r1, #0x3c\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " ldrb r0, [r6, #0x3]\n" - " lsl r0, r0, #0x1\n" - " ldr r2, [sp, #0x24]\n" - " add r1, r0, r2\n" - " ldr r0, [sp, #0x28]\n" - " cmp r0, #0\n" - " bge ._76 @cond_branch\n" - " add r0, r0, #0x3\n" - "._76:\n" - " asr r0, r0, #0x2\n" - " add r0, r1, r0\n" - " ldr r1, [sp]\n" - " mul r0, r0, r1\n" - " mov r1, #0x64\n" - " bl __divsi3\n" - " add r0, r0, #0x5\n" - " str r0, [sp, #0x10]\n" - " add r0, r5, #0\n" - " bl GetNature\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r4, sp, #0x10\n" - " ldrh r1, [r4]\n" - " mov r2, #0x3\n" - " bl nature_stat_mod\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " str r0, [sp, #0x10]\n" - " add r0, r5, #0\n" - " mov r1, #0x3d\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " ldrb r0, [r6, #0x4]\n" - " lsl r0, r0, #0x1\n" - " ldr r2, [sp, #0x2c]\n" - " add r1, r0, r2\n" - " ldr r0, [sp, #0x30]\n" - " cmp r0, #0\n" - " bge ._77 @cond_branch\n" - " add r0, r0, #0x3\n" - "._77:\n" - " asr r0, r0, #0x2\n" - " add r0, r1, r0\n" - " ldr r1, [sp]\n" - " mul r0, r0, r1\n" - " mov r1, #0x64\n" - " bl __divsi3\n" - " add r0, r0, #0x5\n" - " str r0, [sp, #0x14]\n" - " add r0, r5, #0\n" - " bl GetNature\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r4, sp, #0x14\n" - " ldrh r1, [r4]\n" - " mov r2, #0x4\n" - " bl nature_stat_mod\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " str r0, [sp, #0x14]\n" - " add r0, r5, #0\n" - " mov r1, #0x3e\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " ldrb r0, [r6, #0x5]\n" - " lsl r0, r0, #0x1\n" - " ldr r1, [sp, #0x34]\n" - " add r2, r0, r1\n" - " ldr r0, [sp, #0x38]\n" - " cmp r0, #0\n" - " bge ._78 @cond_branch\n" - " add r0, r0, #0x3\n" - "._78:\n" - " asr r0, r0, #0x2\n" - " add r0, r2, r0\n" - " ldr r1, [sp]\n" - " mul r0, r0, r1\n" - " mov r1, #0x64\n" - " bl __divsi3\n" - " add r0, r0, #0x5\n" - " str r0, [sp, #0x18]\n" - " add r0, r5, #0\n" - " bl GetNature\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " add r4, sp, #0x18\n" - " ldrh r1, [r4]\n" - " mov r2, #0x5\n" - " bl nature_stat_mod\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " str r0, [sp, #0x18]\n" - " add r0, r5, #0\n" - " mov r1, #0x3f\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " ldr r1, [sp, #0x4]\n" - " ldr r0, [sp, #0x1c]\n" - " cmp r1, r0\n" - " bge ._79 @cond_branch\n" - " str r1, [sp, #0x1c]\n" - "._79:\n" - " add r2, sp, #0x1c\n" - " add r0, r5, #0\n" - " mov r1, #0x39\n" - " bl SetMonData\n" - " add sp, sp, #0x3c\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._81:\n" - " .align 2, 0\n" - "._80:\n" - " .word gBaseStats\n" - "\n" - ); + s32 currentHP = GetMonData(mon, MON_DATA_HP, NULL); + s32 hpIV = GetMonData(mon, MON_DATA_HP_IV, NULL); + s32 hpEV = GetMonData(mon, MON_DATA_HP_EV, NULL); + s32 attackIV = GetMonData(mon, MON_DATA_ATK_IV, NULL); + s32 attackEV = GetMonData(mon, MON_DATA_ATK_EV, NULL); + s32 defenseIV = GetMonData(mon, MON_DATA_DEF_IV, NULL); + s32 defenseEV = GetMonData(mon, MON_DATA_DEF_EV, NULL); + s32 speedIV = GetMonData(mon, MON_DATA_SPEED_IV, NULL); + s32 speedEV = GetMonData(mon, MON_DATA_SPEED_EV, NULL); + s32 spAttackIV = GetMonData(mon, MON_DATA_SPATK_IV, NULL); + s32 spAttackEV = GetMonData(mon, MON_DATA_SPATK_EV, NULL); + s32 spDefenseIV = GetMonData(mon, MON_DATA_SPDEF_IV, NULL); + s32 spDefenseEV = GetMonData(mon, MON_DATA_SPDEF_EV, NULL); + u16 species = GetMonData(mon, MON_DATA_SPECIES, NULL); + s32 level = GetLevelFromMonExp(mon); + s32 newMaxHP; + + SetMonData(mon, MON_DATA_LEVEL, &level); + + if (species == SPECIES_SHEDINJA) + { + newMaxHP = 1; + } + else + { + s32 n = 2 * gBaseStats[species].baseHP + hpIV; + newMaxHP = (((n + hpEV / 4) * level) / 100) + level + 10; + } + + SetMonData(mon, MON_DATA_MAX_HP, &newMaxHP); + + CALC_STAT(baseAttack, attackIV, attackEV, 1, MON_DATA_ATK) + CALC_STAT(baseDefense, defenseIV, defenseEV, 2, MON_DATA_DEF) + CALC_STAT(baseSpeed, speedIV, speedEV, 3, MON_DATA_SPEED) + CALC_STAT(baseSpAttack, spAttackIV, spAttackEV, 4, MON_DATA_SPATK) + CALC_STAT(baseSpDefense, spDefenseIV, spDefenseEV, 5, MON_DATA_SPDEF) + + if (newMaxHP < currentHP) + currentHP = newMaxHP; + + SetMonData(mon, MON_DATA_HP, ¤tHP); } #endif diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index 8e1bd1671..532340ce4 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -31,6 +31,7 @@ #include "item_menu.h" #include "player_pc.h" #include "ewram.h" +#include "script.h" /* Pokemon menu: @@ -45,6 +46,7 @@ struct PokeMenuFieldMoveFunc u8 field_1; }; +extern u8 gUnknown_020297ED; extern u8 gUnknown_020384F0; extern u8 gUnknown_0202E8F4; extern u8 gUnknown_0202E8F5; @@ -900,9 +902,10 @@ static void sub_808AE08(void) static bool8 SetUpFieldMove_Waterfall(void) { s16 x, y; + GetXYCoordsOneStepInFrontOfPlayer(&x, &y); if (MetatileBehavior_IsWaterfall(MapGridGetMetatileBehaviorAt(x, y)) == TRUE - && IsPlayerSurfingNorth() == TRUE) + && IsPlayerSurfingNorth() == TRUE) { gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_808AE08; @@ -913,138 +916,19 @@ static bool8 SetUpFieldMove_Waterfall(void) } #if DEBUG -__attribute__((naked)) -void debug_sub_80986AC() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - mov r4, sp\n\ - add r4, r4, #0x2\n\ - mov r0, sp\n\ - add r1, r4, #0\n\ - bl GetXYCoordsOneStepInFrontOfPlayer\n\ - mov r0, sp\n\ - mov r1, #0x0\n\ - ldsh r0, [r0, r1]\n\ - mov r2, #0x0\n\ - ldsh r1, [r4, r2]\n\ - bl MapGridGetMetatileBehaviorAt\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl MetatileBehavior_IsWaterfall\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x1\n\ - bne ._274 @cond_branch\n\ - bl IsPlayerSurfingNorth\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x1\n\ - bne ._274 @cond_branch\n\ - bl sub_808AE08\n\ - b ._275\n\ -._274:\n\ - bl ScriptContext2_Disable\n\ -._275:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0"); +void debug_sub_80986AC(void) +{ + s16 x, y; + + GetXYCoordsOneStepInFrontOfPlayer(&x, &y); + if (MetatileBehavior_IsWaterfall(MapGridGetMetatileBehaviorAt(x, y)) == TRUE + && IsPlayerSurfingNorth() == TRUE) + sub_808AE08(); + else + ScriptContext2_Disable(); } #endif -#if DEBUG -__attribute__((naked)) -static void sub_808AE8C(void) -{ - asm("\ - push {r4, r5, r6, lr}\n\ - ldr r0, ._281\n\ - ldrb r0, [r0]\n\ - sub r0, r0, #0x21\n\ - lsl r0, r0, #0x18\n\ - lsr r6, r0, #0x18\n\ - mov r5, #0x0\n\ -._287:\n\ - mov r0, #0x64\n\ - add r1, r5, #0\n\ - mul r1, r1, r0\n\ - ldr r0, ._281 + 4\n\ - add r4, r1, r0\n\ - add r0, r4, #0\n\ - mov r1, #0xb\n\ - bl GetMonData\n\ - cmp r0, #0\n\ - beq ._284 @cond_branch\n\ - add r0, r5, #0\n\ - bl sub_806D668\n\ - ldr r0, ._281 + 8\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - bne ._279 @cond_branch\n\ - add r0, r4, #0\n\ - mov r1, #0x2d\n\ - bl GetMonData\n\ - cmp r0, #0\n\ - bne ._278 @cond_branch\n\ - add r0, r4, #0\n\ - add r1, r6, #0\n\ - bl CanMonLearnTMHM\n\ - cmp r0, #0\n\ - bne ._279 @cond_branch\n\ -._278:\n\ - add r0, r5, #0\n\ - mov r1, #0x9a\n\ - bl sub_806BC3C\n\ - b ._284\n\ -._282:\n\ - .align 2, 0\n\ -._281:\n\ - .word gSpecialVar_ItemId\n\ - .word gPlayerParty\n\ - .word gUnknown_020297ED\n\ -._279:\n\ - mov r0, #0x64\n\ - add r4, r5, #0\n\ - mul r4, r4, r0\n\ - ldr r0, ._285\n\ - add r4, r4, r0\n\ - ldr r0, ._285 + 4\n\ - ldrh r0, [r0]\n\ - bl ItemIdToBattleMoveId\n\ - add r1, r0, #0\n\ - lsl r1, r1, #0x10\n\ - lsr r1, r1, #0x10\n\ - add r0, r4, #0\n\ - bl pokemon_has_move\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._283 @cond_branch\n\ - add r0, r5, #0\n\ - mov r1, #0xa8\n\ - bl sub_806BC3C\n\ - b ._284\n\ -._286:\n\ - .align 2, 0\n\ -._285:\n\ - .word gPlayerParty\n\ - .word gSpecialVar_ItemId\n\ -._283:\n\ - add r0, r5, #0\n\ - mov r1, #0x8c\n\ - bl sub_806BC3C\n\ -._284:\n\ - add r0, r5, #1\n\ - lsl r0, r0, #0x18\n\ - lsr r5, r0, #0x18\n\ - cmp r5, #0x5\n\ - bls ._287 @cond_branch\n\ - pop {r4, r5, r6}\n\ - pop {r0}\n\ - bx r0"); -} -#else static void sub_808AE8C(void) { u8 i; @@ -1054,7 +938,11 @@ static void sub_808AE8C(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES)) { sub_806D668(i); - if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !CanMonLearnTMHM(&gPlayerParty[i], arg)) + if ( +#if DEBUG + gUnknown_020297ED == 0 && +#endif + (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !CanMonLearnTMHM(&gPlayerParty[i], arg))) sub_806BC3C(i, 0x9A); else if (pokemon_has_move(&gPlayerParty[i], ItemIdToBattleMoveId(gSpecialVar_ItemId))) sub_806BC3C(i, 0xA8); @@ -1063,7 +951,6 @@ static void sub_808AE8C(void) } } } -#endif static void sub_808AF20(void) { -- cgit v1.2.3 From 2c918577867ec2bfe1085d177320878011453338 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 25 Jan 2018 19:05:17 -0800 Subject: Name a bunch of sc88 instruments --- sound/direct_sound_data.inc | 120 ++-- sound/direct_sound_samples/8456330.aif | Bin 1797 -> 0 bytes sound/direct_sound_samples/84569D4.aif | Bin 2138 -> 0 bytes sound/direct_sound_samples/84571CC.aif | Bin 3115 -> 0 bytes sound/direct_sound_samples/8457D98.aif | Bin 3993 -> 0 bytes sound/direct_sound_samples/8458CD0.aif | Bin 3284 -> 0 bytes sound/direct_sound_samples/846286C.aif | Bin 4031 -> 0 bytes sound/direct_sound_samples/84637CC.aif | Bin 5824 -> 0 bytes sound/direct_sound_samples/8464E2C.aif | Bin 5564 -> 0 bytes sound/direct_sound_samples/8466388.aif | Bin 3052 -> 0 bytes sound/direct_sound_samples/8466F14.aif | Bin 13830 -> 0 bytes sound/direct_sound_samples/846A4B8.aif | Bin 9085 -> 0 bytes sound/direct_sound_samples/846C7D4.aif | Bin 14123 -> 0 bytes sound/direct_sound_samples/846FEA0.aif | Bin 5040 -> 0 bytes sound/direct_sound_samples/84711F0.aif | Bin 5489 -> 0 bytes sound/direct_sound_samples/8472700.aif | Bin 5247 -> 0 bytes sound/direct_sound_samples/8473B20.aif | Bin 4347 -> 0 bytes sound/direct_sound_samples/8474BBC.aif | Bin 4283 -> 0 bytes sound/direct_sound_samples/8475C18.aif | Bin 28662 -> 0 bytes sound/direct_sound_samples/847CBAC.aif | Bin 17892 -> 0 bytes sound/direct_sound_samples/8481130.aif | Bin 8144 -> 0 bytes sound/direct_sound_samples/84830A0.aif | Bin 1989 -> 0 bytes sound/direct_sound_samples/8483804.aif | Bin 7344 -> 0 bytes sound/direct_sound_samples/8487330.aif | Bin 7286 -> 0 bytes sound/direct_sound_samples/848BD68.aif | Bin 1947 -> 0 bytes sound/direct_sound_samples/8492D10.aif | Bin 4178 -> 0 bytes sound/direct_sound_samples/8497134.aif | Bin 8253 -> 0 bytes sound/direct_sound_samples/849BAEC.aif | Bin 6610 -> 0 bytes sound/direct_sound_samples/849F40C.aif | Bin 13121 -> 0 bytes sound/direct_sound_samples/84A26EC.aif | Bin 2706 -> 0 bytes sound/direct_sound_samples/84A311C.aif | Bin 2709 -> 0 bytes sound/direct_sound_samples/84A5F58.aif | Bin 5169 -> 0 bytes sound/direct_sound_samples/8654C20.aif | Bin 5169 -> 0 bytes sound/direct_sound_samples/sc88/123_bubble.aif | Bin 0 -> 4178 bytes sound/direct_sound_samples/sc88/13_marimba.aif | Bin 0 -> 2709 bytes .../direct_sound_samples/sc88/15_tubular_bell.aif | Bin 0 -> 6610 bytes sound/direct_sound_samples/sc88/18_organ_2.aif | Bin 0 -> 2138 bytes sound/direct_sound_samples/sc88/1_piano_1.aif | Bin 0 -> 2706 bytes .../direct_sound_samples/sc88/22_accordion_fr.aif | Bin 0 -> 5169 bytes .../sc88/25_nylon_string_guitar.aif | Bin 0 -> 8144 bytes .../sc88/26_steel_string_guitar.aif | Bin 0 -> 4031 bytes sound/direct_sound_samples/sc88/2_piano_2.aif | Bin 0 -> 5564 bytes sound/direct_sound_samples/sc88/34_finger_slap.aif | Bin 0 -> 3993 bytes .../direct_sound_samples/sc88/34_fingered_bass.aif | Bin 0 -> 7344 bytes .../direct_sound_samples/sc88/36_fretless_bass.aif | Bin 0 -> 3115 bytes .../direct_sound_samples/sc88/39_synth_bass_1.aif | Bin 0 -> 3284 bytes sound/direct_sound_samples/sc88/3_piano_3.aif | Bin 0 -> 5824 bytes .../sc88/46_pizzicato_strings.aif | Bin 0 -> 1947 bytes sound/direct_sound_samples/sc88/49_strings.aif | Bin 0 -> 13830 bytes .../sc88/49_strings_plus_flute.aif | Bin 0 -> 9085 bytes .../sc88/49_strings_plus_horn.aif | Bin 0 -> 14123 bytes sound/direct_sound_samples/sc88/57_trumpet.aif | Bin 0 -> 5040 bytes sound/direct_sound_samples/sc88/58_trombone.aif | Bin 0 -> 5489 bytes sound/direct_sound_samples/sc88/59_tuba.aif | Bin 0 -> 5247 bytes .../sc88/60_cup_muted_trumpet.aif | Bin 0 -> 4347 bytes .../sc88/60_muted_trumpet_3.aif | Bin 0 -> 4283 bytes .../direct_sound_samples/sc88/61_french_horns.aif | Bin 0 -> 28662 bytes .../sc88/61_wide_french_horns.aif | Bin 0 -> 17892 bytes sound/direct_sound_samples/sc88/74_flute.aif | Bin 0 -> 1989 bytes sound/direct_sound_samples/sc88/81_square_wave.aif | Bin 0 -> 7286 bytes sound/direct_sound_samples/sc88/8456330.aif | Bin 0 -> 1797 bytes sound/direct_sound_samples/sc88/8466388.aif | Bin 0 -> 3052 bytes sound/direct_sound_samples/sc88/8497134.aif | Bin 0 -> 8253 bytes sound/direct_sound_samples/sc88/849F40C.aif | Bin 0 -> 13121 bytes sound/voice_groups.inc | 670 ++++++++++----------- 65 files changed, 395 insertions(+), 395 deletions(-) delete mode 100644 sound/direct_sound_samples/8456330.aif delete mode 100644 sound/direct_sound_samples/84569D4.aif delete mode 100644 sound/direct_sound_samples/84571CC.aif delete mode 100644 sound/direct_sound_samples/8457D98.aif delete mode 100644 sound/direct_sound_samples/8458CD0.aif delete mode 100644 sound/direct_sound_samples/846286C.aif delete mode 100644 sound/direct_sound_samples/84637CC.aif delete mode 100644 sound/direct_sound_samples/8464E2C.aif delete mode 100644 sound/direct_sound_samples/8466388.aif delete mode 100644 sound/direct_sound_samples/8466F14.aif delete mode 100644 sound/direct_sound_samples/846A4B8.aif delete mode 100644 sound/direct_sound_samples/846C7D4.aif delete mode 100644 sound/direct_sound_samples/846FEA0.aif delete mode 100644 sound/direct_sound_samples/84711F0.aif delete mode 100644 sound/direct_sound_samples/8472700.aif delete mode 100644 sound/direct_sound_samples/8473B20.aif delete mode 100644 sound/direct_sound_samples/8474BBC.aif delete mode 100644 sound/direct_sound_samples/8475C18.aif delete mode 100644 sound/direct_sound_samples/847CBAC.aif delete mode 100644 sound/direct_sound_samples/8481130.aif delete mode 100644 sound/direct_sound_samples/84830A0.aif delete mode 100644 sound/direct_sound_samples/8483804.aif delete mode 100644 sound/direct_sound_samples/8487330.aif delete mode 100644 sound/direct_sound_samples/848BD68.aif delete mode 100644 sound/direct_sound_samples/8492D10.aif delete mode 100644 sound/direct_sound_samples/8497134.aif delete mode 100644 sound/direct_sound_samples/849BAEC.aif delete mode 100644 sound/direct_sound_samples/849F40C.aif delete mode 100644 sound/direct_sound_samples/84A26EC.aif delete mode 100644 sound/direct_sound_samples/84A311C.aif delete mode 100644 sound/direct_sound_samples/84A5F58.aif delete mode 100644 sound/direct_sound_samples/8654C20.aif create mode 100644 sound/direct_sound_samples/sc88/123_bubble.aif create mode 100644 sound/direct_sound_samples/sc88/13_marimba.aif create mode 100644 sound/direct_sound_samples/sc88/15_tubular_bell.aif create mode 100644 sound/direct_sound_samples/sc88/18_organ_2.aif create mode 100644 sound/direct_sound_samples/sc88/1_piano_1.aif create mode 100644 sound/direct_sound_samples/sc88/22_accordion_fr.aif create mode 100644 sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif create mode 100644 sound/direct_sound_samples/sc88/26_steel_string_guitar.aif create mode 100644 sound/direct_sound_samples/sc88/2_piano_2.aif create mode 100644 sound/direct_sound_samples/sc88/34_finger_slap.aif create mode 100644 sound/direct_sound_samples/sc88/34_fingered_bass.aif create mode 100644 sound/direct_sound_samples/sc88/36_fretless_bass.aif create mode 100644 sound/direct_sound_samples/sc88/39_synth_bass_1.aif create mode 100644 sound/direct_sound_samples/sc88/3_piano_3.aif create mode 100644 sound/direct_sound_samples/sc88/46_pizzicato_strings.aif create mode 100644 sound/direct_sound_samples/sc88/49_strings.aif create mode 100644 sound/direct_sound_samples/sc88/49_strings_plus_flute.aif create mode 100644 sound/direct_sound_samples/sc88/49_strings_plus_horn.aif create mode 100644 sound/direct_sound_samples/sc88/57_trumpet.aif create mode 100644 sound/direct_sound_samples/sc88/58_trombone.aif create mode 100644 sound/direct_sound_samples/sc88/59_tuba.aif create mode 100644 sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif create mode 100644 sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif create mode 100644 sound/direct_sound_samples/sc88/61_french_horns.aif create mode 100644 sound/direct_sound_samples/sc88/61_wide_french_horns.aif create mode 100644 sound/direct_sound_samples/sc88/74_flute.aif create mode 100644 sound/direct_sound_samples/sc88/81_square_wave.aif create mode 100644 sound/direct_sound_samples/sc88/8456330.aif create mode 100644 sound/direct_sound_samples/sc88/8466388.aif create mode 100644 sound/direct_sound_samples/sc88/8497134.aif create mode 100644 sound/direct_sound_samples/sc88/849F40C.aif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 9d8f713e0..180a2e0a7 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1,22 +1,22 @@ .align 2 DirectSoundWaveData_8456330:: @ 8456330 - .incbin "sound/direct_sound_samples/8456330.bin" + .incbin "sound/direct_sound_samples/sc88/8456330.bin" .align 2 -DirectSoundWaveData_84569D4:: @ 84569D4 - .incbin "sound/direct_sound_samples/84569D4.bin" +DirectSoundWaveData_SC88_Organ2:: @ 84569D4 + .incbin "sound/direct_sound_samples/sc88/18_organ_2.bin" .align 2 -DirectSoundWaveData_84571CC:: @ 84571CC - .incbin "sound/direct_sound_samples/84571CC.bin" +DirectSoundWaveData_SC88_FretlessBass:: @ 84571CC + .incbin "sound/direct_sound_samples/sc88/36_fretless_bass.bin" .align 2 -DirectSoundWaveData_8457D98:: @ 8457D98 - .incbin "sound/direct_sound_samples/8457D98.bin" +DirectSoundWaveData_SC88_FingerSlap:: @ 8457D98 + .incbin "sound/direct_sound_samples/sc88/34_finger_slap.bin" .align 2 -DirectSoundWaveData_8458CD0:: @ 8458CD0 - .incbin "sound/direct_sound_samples/8458CD0.bin" +DirectSoundWaveData_SC88_SynthBass1:: @ 8458CD0 + .incbin "sound/direct_sound_samples/sc88/39_synth_bass_1.bin" .align 2 DirectSoundWaveData_8459944:: @ 8459944 @@ -75,72 +75,72 @@ DirectSoundWaveData_84622A4:: @ 84622A4 .incbin "sound/direct_sound_samples/84622A4.bin" .align 2 -DirectSoundWaveData_846286C:: @ 846286C - .incbin "sound/direct_sound_samples/846286C.bin" +DirectSoundWaveData_SC88_SteelStringGuitar:: @ 846286C + .incbin "sound/direct_sound_samples/sc88/26_steel_string_guitar.bin" .align 2 -DirectSoundWaveData_84637CC:: @ 84637CC - .incbin "sound/direct_sound_samples/84637CC.bin" +DirectSoundWaveData_SC88_Piano3:: @ 84637CC + .incbin "sound/direct_sound_samples/sc88/3_piano_3.bin" .align 2 -DirectSoundWaveData_8464E2C:: @ 8464E2C - .incbin "sound/direct_sound_samples/8464E2C.bin" +DirectSoundWaveData_SC88_Piano2:: @ 8464E2C + .incbin "sound/direct_sound_samples/sc88/2_piano_2.bin" .align 2 DirectSoundWaveData_8466388:: @ 8466388 - .incbin "sound/direct_sound_samples/8466388.bin" + .incbin "sound/direct_sound_samples/sc88/8466388.bin" .align 2 -DirectSoundWaveData_8466F14:: @ 8466F14 - .incbin "sound/direct_sound_samples/8466F14.bin" +DirectSoundWaveData_SC88_Strings:: @ 8466F14 + .incbin "sound/direct_sound_samples/sc88/49_strings.bin" .align 2 -DirectSoundWaveData_846A4B8:: @ 846A4B8 - .incbin "sound/direct_sound_samples/846A4B8.bin" +DirectSoundWaveData_SC88_StringsPlusFlute:: @ 846A4B8 + .incbin "sound/direct_sound_samples/sc88/49_strings_plus_flute.bin" .align 2 -DirectSoundWaveData_846C7D4:: @ 846C7D4 - .incbin "sound/direct_sound_samples/846C7D4.bin" +DirectSoundWaveData_SC88_StringsPlusHorn:: @ 846C7D4 + .incbin "sound/direct_sound_samples/sc88/49_strings_plus_horn.bin" .align 2 -DirectSoundWaveData_846FEA0:: @ 846FEA0 - .incbin "sound/direct_sound_samples/846FEA0.bin" +DirectSoundWaveData_SC88_Trumpet:: @ 846FEA0 + .incbin "sound/direct_sound_samples/sc88/57_trumpet.bin" .align 2 -DirectSoundWaveData_84711F0:: @ 84711F0 - .incbin "sound/direct_sound_samples/84711F0.bin" +DirectSoundWaveData_SC88_Trombone:: @ 84711F0 + .incbin "sound/direct_sound_samples/sc88/58_trombone.bin" .align 2 -DirectSoundWaveData_8472700:: @ 8472700 - .incbin "sound/direct_sound_samples/8472700.bin" +DirectSoundWaveData_SC88_Tuba:: @ 8472700 + .incbin "sound/direct_sound_samples/sc88/59_tuba.bin" .align 2 -DirectSoundWaveData_8473B20:: @ 8473B20 - .incbin "sound/direct_sound_samples/8473B20.bin" +DirectSoundWaveData_SC88_CupMutedTrumpet:: @ 8473B20 + .incbin "sound/direct_sound_samples/sc88/60_cup_muted_trumpet.bin" .align 2 -DirectSoundWaveData_8474BBC:: @ 8474BBC - .incbin "sound/direct_sound_samples/8474BBC.bin" +DirectSoundWaveData_SC88_MutedTrumpet3:: @ 8474BBC + .incbin "sound/direct_sound_samples/sc88/60_muted_trumpet_3.bin" .align 2 -DirectSoundWaveData_8475C18:: @ 8475C18 - .incbin "sound/direct_sound_samples/8475C18.bin" +DirectSoundWaveData_SC88_FrenchHorns:: @ 8475C18 + .incbin "sound/direct_sound_samples/sc88/61_french_horns.bin" .align 2 -DirectSoundWaveData_847CBAC:: @ 847CBAC - .incbin "sound/direct_sound_samples/847CBAC.bin" +DirectSoundWaveData_SC88_WideFrenchHorns:: @ 847CBAC + .incbin "sound/direct_sound_samples/sc88/61_wide_french_horns.bin" .align 2 -DirectSoundWaveData_8481130:: @ 8481130 - .incbin "sound/direct_sound_samples/8481130.bin" +DirectSoundWaveData_SC88_NylonStringGuitar:: @ 8481130 + .incbin "sound/direct_sound_samples/sc88/25_nylon_string_guitar.bin" .align 2 -DirectSoundWaveData_84830A0:: @ 84830A0 - .incbin "sound/direct_sound_samples/84830A0.bin" +DirectSoundWaveData_SC88_Flute:: @ 84830A0 + .incbin "sound/direct_sound_samples/sc88/74_flute.bin" .align 2 -DirectSoundWaveData_8483804:: @ 8483804 - .incbin "sound/direct_sound_samples/8483804.bin" +DirectSoundWaveData_SC88_FingeredBass:: @ 8483804 + .incbin "sound/direct_sound_samples/sc88/34_fingered_bass.bin" .align 2 DirectSoundWaveData_8485454:: @ 8485454 @@ -151,8 +151,8 @@ DirectSoundWaveData_8486924:: @ 8486924 .incbin "sound/direct_sound_samples/8486924.bin" .align 2 -DirectSoundWaveData_8487330:: @ 8487330 - .incbin "sound/direct_sound_samples/8487330.bin" +DirectSoundWaveData_SC88_SquareWave:: @ 8487330 + .incbin "sound/direct_sound_samples/sc88/81_square_wave.bin" .align 2 DirectSoundWaveData_8488F44:: @ 8488F44 @@ -163,8 +163,8 @@ DirectSoundWaveData_848A8A4:: @ 848A8A4 .incbin "sound/direct_sound_samples/848A8A4.bin" .align 2 -DirectSoundWaveData_848BD68:: @ 848BD68 - .incbin "sound/direct_sound_samples/848BD68.bin" +DirectSoundWaveData_SC88_PizzicatoStrings:: @ 848BD68 + .incbin "sound/direct_sound_samples/sc88/46_pizzicato_strings.bin" .align 2 DirectSoundWaveData_848C4A4:: @ 848C4A4 @@ -183,8 +183,8 @@ DirectSoundWaveData_8491ACC:: @ 8491ACC .incbin "sound/direct_sound_samples/8491ACC.bin" .align 2 -DirectSoundWaveData_8492D10:: @ 8492D10 - .incbin "sound/direct_sound_samples/8492D10.bin" +DirectSoundWaveData_SC88_Bubble:: @ 8492D10 + .incbin "sound/direct_sound_samples/sc88/123_bubble.bin" .align 2 DirectSoundWaveData_8493D20:: @ 8493D20 @@ -196,7 +196,7 @@ DirectSoundWaveData_8495028:: @ 8495028 .align 2 DirectSoundWaveData_8497134:: @ 8497134 - .incbin "sound/direct_sound_samples/8497134.bin" + .incbin "sound/direct_sound_samples/sc88/8497134.bin" .align 2 DirectSoundWaveData_8499110:: @ 8499110 @@ -207,8 +207,8 @@ DirectSoundWaveData_849B320:: @ 849B320 .incbin "sound/direct_sound_samples/849B320.bin" .align 2 -DirectSoundWaveData_849BAEC:: @ 849BAEC - .incbin "sound/direct_sound_samples/849BAEC.bin" +DirectSoundWaveData_SC88_TubularBell:: @ 849BAEC + .incbin "sound/direct_sound_samples/sc88/15_tubular_bell.bin" .align 2 DirectSoundWaveData_849D45C:: @ 849D45C @@ -216,15 +216,15 @@ DirectSoundWaveData_849D45C:: @ 849D45C .align 2 DirectSoundWaveData_849F40C:: @ 849F40C - .incbin "sound/direct_sound_samples/849F40C.bin" + .incbin "sound/direct_sound_samples/sc88/849F40C.bin" .align 2 -DirectSoundWaveData_84A26EC:: @ 84A26EC - .incbin "sound/direct_sound_samples/84A26EC.bin" +DirectSoundWaveData_SC88_Piano1:: @ 84A26EC + .incbin "sound/direct_sound_samples/sc88/1_piano_1.bin" .align 2 -DirectSoundWaveData_84A311C:: @ 84A311C - .incbin "sound/direct_sound_samples/84A311C.bin" +DirectSoundWaveData_SC88_Marimba:: @ 84A311C + .incbin "sound/direct_sound_samples/sc88/13_marimba.bin" .align 2 DirectSoundWaveData_84A3B50:: @ 84A3B50 @@ -235,8 +235,8 @@ DirectSoundWaveData_84A5690:: @ 84A5690 .incbin "sound/direct_sound_samples/84A5690.bin" .align 2 -DirectSoundWaveData_84A5F58:: @ 84A5F58 - .incbin "sound/direct_sound_samples/84A5F58.bin" +DirectSoundWaveData_SC88_AccordianFr:: @ 84A5F58 + .incbin "sound/direct_sound_samples/sc88/22_accordion_fr.bin" .align 2 DirectSoundWaveData_84A7328:: @ 84A7328 @@ -2019,5 +2019,5 @@ DirectSoundWaveData_8654170:: @ 8654170 .incbin "sound/direct_sound_samples/phonemes/8654170.bin" .align 2 -DirectSoundWaveData_8654C20:: @ 8654C20 - .incbin "sound/direct_sound_samples/8654C20.bin" +DirectSoundWaveData_SC88_AccordionFr_Copy:: @ 8654C20 + .incbin "sound/direct_sound_samples/sc88/22_accordion_fr.bin" diff --git a/sound/direct_sound_samples/8456330.aif b/sound/direct_sound_samples/8456330.aif deleted file mode 100644 index 199ead811..000000000 Binary files a/sound/direct_sound_samples/8456330.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84569D4.aif b/sound/direct_sound_samples/84569D4.aif deleted file mode 100644 index 6372bbc32..000000000 Binary files a/sound/direct_sound_samples/84569D4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84571CC.aif b/sound/direct_sound_samples/84571CC.aif deleted file mode 100644 index f3aa47d91..000000000 Binary files a/sound/direct_sound_samples/84571CC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8457D98.aif b/sound/direct_sound_samples/8457D98.aif deleted file mode 100644 index 9175b63c5..000000000 Binary files a/sound/direct_sound_samples/8457D98.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8458CD0.aif b/sound/direct_sound_samples/8458CD0.aif deleted file mode 100644 index f39931a7e..000000000 Binary files a/sound/direct_sound_samples/8458CD0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/846286C.aif b/sound/direct_sound_samples/846286C.aif deleted file mode 100644 index c2b3757b0..000000000 Binary files a/sound/direct_sound_samples/846286C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84637CC.aif b/sound/direct_sound_samples/84637CC.aif deleted file mode 100644 index 7de586c9b..000000000 Binary files a/sound/direct_sound_samples/84637CC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8464E2C.aif b/sound/direct_sound_samples/8464E2C.aif deleted file mode 100644 index 5236141ba..000000000 Binary files a/sound/direct_sound_samples/8464E2C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8466388.aif b/sound/direct_sound_samples/8466388.aif deleted file mode 100644 index a7c4e94f8..000000000 Binary files a/sound/direct_sound_samples/8466388.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8466F14.aif b/sound/direct_sound_samples/8466F14.aif deleted file mode 100644 index bfaa5c196..000000000 Binary files a/sound/direct_sound_samples/8466F14.aif and /dev/null differ diff --git a/sound/direct_sound_samples/846A4B8.aif b/sound/direct_sound_samples/846A4B8.aif deleted file mode 100644 index 3e76cacdd..000000000 Binary files a/sound/direct_sound_samples/846A4B8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/846C7D4.aif b/sound/direct_sound_samples/846C7D4.aif deleted file mode 100644 index 2647c78ec..000000000 Binary files a/sound/direct_sound_samples/846C7D4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/846FEA0.aif b/sound/direct_sound_samples/846FEA0.aif deleted file mode 100644 index e56df7f60..000000000 Binary files a/sound/direct_sound_samples/846FEA0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84711F0.aif b/sound/direct_sound_samples/84711F0.aif deleted file mode 100644 index 8c68a83b3..000000000 Binary files a/sound/direct_sound_samples/84711F0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8472700.aif b/sound/direct_sound_samples/8472700.aif deleted file mode 100644 index a03bafc97..000000000 Binary files a/sound/direct_sound_samples/8472700.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8473B20.aif b/sound/direct_sound_samples/8473B20.aif deleted file mode 100644 index d4077b481..000000000 Binary files a/sound/direct_sound_samples/8473B20.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8474BBC.aif b/sound/direct_sound_samples/8474BBC.aif deleted file mode 100644 index 2ad86876b..000000000 Binary files a/sound/direct_sound_samples/8474BBC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8475C18.aif b/sound/direct_sound_samples/8475C18.aif deleted file mode 100644 index 742c4385e..000000000 Binary files a/sound/direct_sound_samples/8475C18.aif and /dev/null differ diff --git a/sound/direct_sound_samples/847CBAC.aif b/sound/direct_sound_samples/847CBAC.aif deleted file mode 100644 index 004fda6a1..000000000 Binary files a/sound/direct_sound_samples/847CBAC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8481130.aif b/sound/direct_sound_samples/8481130.aif deleted file mode 100644 index dea429a25..000000000 Binary files a/sound/direct_sound_samples/8481130.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84830A0.aif b/sound/direct_sound_samples/84830A0.aif deleted file mode 100644 index 703f3adbd..000000000 Binary files a/sound/direct_sound_samples/84830A0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8483804.aif b/sound/direct_sound_samples/8483804.aif deleted file mode 100644 index f244a9982..000000000 Binary files a/sound/direct_sound_samples/8483804.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8487330.aif b/sound/direct_sound_samples/8487330.aif deleted file mode 100644 index 09e17f0ca..000000000 Binary files a/sound/direct_sound_samples/8487330.aif and /dev/null differ diff --git a/sound/direct_sound_samples/848BD68.aif b/sound/direct_sound_samples/848BD68.aif deleted file mode 100644 index 1c0a027f7..000000000 Binary files a/sound/direct_sound_samples/848BD68.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8492D10.aif b/sound/direct_sound_samples/8492D10.aif deleted file mode 100644 index 89872bf55..000000000 Binary files a/sound/direct_sound_samples/8492D10.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8497134.aif b/sound/direct_sound_samples/8497134.aif deleted file mode 100644 index 09fe6f12e..000000000 Binary files a/sound/direct_sound_samples/8497134.aif and /dev/null differ diff --git a/sound/direct_sound_samples/849BAEC.aif b/sound/direct_sound_samples/849BAEC.aif deleted file mode 100644 index 9d00ecae6..000000000 Binary files a/sound/direct_sound_samples/849BAEC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/849F40C.aif b/sound/direct_sound_samples/849F40C.aif deleted file mode 100644 index 455ced13e..000000000 Binary files a/sound/direct_sound_samples/849F40C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A26EC.aif b/sound/direct_sound_samples/84A26EC.aif deleted file mode 100644 index 083c45e3d..000000000 Binary files a/sound/direct_sound_samples/84A26EC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A311C.aif b/sound/direct_sound_samples/84A311C.aif deleted file mode 100644 index 1bd43ca92..000000000 Binary files a/sound/direct_sound_samples/84A311C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A5F58.aif b/sound/direct_sound_samples/84A5F58.aif deleted file mode 100644 index 6d6c2e998..000000000 Binary files a/sound/direct_sound_samples/84A5F58.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8654C20.aif b/sound/direct_sound_samples/8654C20.aif deleted file mode 100644 index 6d6c2e998..000000000 Binary files a/sound/direct_sound_samples/8654C20.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/123_bubble.aif b/sound/direct_sound_samples/sc88/123_bubble.aif new file mode 100644 index 000000000..89872bf55 Binary files /dev/null and b/sound/direct_sound_samples/sc88/123_bubble.aif differ diff --git a/sound/direct_sound_samples/sc88/13_marimba.aif b/sound/direct_sound_samples/sc88/13_marimba.aif new file mode 100644 index 000000000..1bd43ca92 Binary files /dev/null and b/sound/direct_sound_samples/sc88/13_marimba.aif differ diff --git a/sound/direct_sound_samples/sc88/15_tubular_bell.aif b/sound/direct_sound_samples/sc88/15_tubular_bell.aif new file mode 100644 index 000000000..9d00ecae6 Binary files /dev/null and b/sound/direct_sound_samples/sc88/15_tubular_bell.aif differ diff --git a/sound/direct_sound_samples/sc88/18_organ_2.aif b/sound/direct_sound_samples/sc88/18_organ_2.aif new file mode 100644 index 000000000..6372bbc32 Binary files /dev/null and b/sound/direct_sound_samples/sc88/18_organ_2.aif differ diff --git a/sound/direct_sound_samples/sc88/1_piano_1.aif b/sound/direct_sound_samples/sc88/1_piano_1.aif new file mode 100644 index 000000000..083c45e3d Binary files /dev/null and b/sound/direct_sound_samples/sc88/1_piano_1.aif differ diff --git a/sound/direct_sound_samples/sc88/22_accordion_fr.aif b/sound/direct_sound_samples/sc88/22_accordion_fr.aif new file mode 100644 index 000000000..6d6c2e998 Binary files /dev/null and b/sound/direct_sound_samples/sc88/22_accordion_fr.aif differ diff --git a/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif b/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif new file mode 100644 index 000000000..dea429a25 Binary files /dev/null and b/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif differ diff --git a/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif b/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif new file mode 100644 index 000000000..c2b3757b0 Binary files /dev/null and b/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif differ diff --git a/sound/direct_sound_samples/sc88/2_piano_2.aif b/sound/direct_sound_samples/sc88/2_piano_2.aif new file mode 100644 index 000000000..5236141ba Binary files /dev/null and b/sound/direct_sound_samples/sc88/2_piano_2.aif differ diff --git a/sound/direct_sound_samples/sc88/34_finger_slap.aif b/sound/direct_sound_samples/sc88/34_finger_slap.aif new file mode 100644 index 000000000..9175b63c5 Binary files /dev/null and b/sound/direct_sound_samples/sc88/34_finger_slap.aif differ diff --git a/sound/direct_sound_samples/sc88/34_fingered_bass.aif b/sound/direct_sound_samples/sc88/34_fingered_bass.aif new file mode 100644 index 000000000..f244a9982 Binary files /dev/null and b/sound/direct_sound_samples/sc88/34_fingered_bass.aif differ diff --git a/sound/direct_sound_samples/sc88/36_fretless_bass.aif b/sound/direct_sound_samples/sc88/36_fretless_bass.aif new file mode 100644 index 000000000..f3aa47d91 Binary files /dev/null and b/sound/direct_sound_samples/sc88/36_fretless_bass.aif differ diff --git a/sound/direct_sound_samples/sc88/39_synth_bass_1.aif b/sound/direct_sound_samples/sc88/39_synth_bass_1.aif new file mode 100644 index 000000000..f39931a7e Binary files /dev/null and b/sound/direct_sound_samples/sc88/39_synth_bass_1.aif differ diff --git a/sound/direct_sound_samples/sc88/3_piano_3.aif b/sound/direct_sound_samples/sc88/3_piano_3.aif new file mode 100644 index 000000000..7de586c9b Binary files /dev/null and b/sound/direct_sound_samples/sc88/3_piano_3.aif differ diff --git a/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif b/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif new file mode 100644 index 000000000..1c0a027f7 Binary files /dev/null and b/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif differ diff --git a/sound/direct_sound_samples/sc88/49_strings.aif b/sound/direct_sound_samples/sc88/49_strings.aif new file mode 100644 index 000000000..bfaa5c196 Binary files /dev/null and b/sound/direct_sound_samples/sc88/49_strings.aif differ diff --git a/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif b/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif new file mode 100644 index 000000000..3e76cacdd Binary files /dev/null and b/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif differ diff --git a/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif b/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif new file mode 100644 index 000000000..2647c78ec Binary files /dev/null and b/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif differ diff --git a/sound/direct_sound_samples/sc88/57_trumpet.aif b/sound/direct_sound_samples/sc88/57_trumpet.aif new file mode 100644 index 000000000..e56df7f60 Binary files /dev/null and b/sound/direct_sound_samples/sc88/57_trumpet.aif differ diff --git a/sound/direct_sound_samples/sc88/58_trombone.aif b/sound/direct_sound_samples/sc88/58_trombone.aif new file mode 100644 index 000000000..8c68a83b3 Binary files /dev/null and b/sound/direct_sound_samples/sc88/58_trombone.aif differ diff --git a/sound/direct_sound_samples/sc88/59_tuba.aif b/sound/direct_sound_samples/sc88/59_tuba.aif new file mode 100644 index 000000000..a03bafc97 Binary files /dev/null and b/sound/direct_sound_samples/sc88/59_tuba.aif differ diff --git a/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif b/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif new file mode 100644 index 000000000..d4077b481 Binary files /dev/null and b/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif differ diff --git a/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif b/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif new file mode 100644 index 000000000..2ad86876b Binary files /dev/null and b/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif differ diff --git a/sound/direct_sound_samples/sc88/61_french_horns.aif b/sound/direct_sound_samples/sc88/61_french_horns.aif new file mode 100644 index 000000000..742c4385e Binary files /dev/null and b/sound/direct_sound_samples/sc88/61_french_horns.aif differ diff --git a/sound/direct_sound_samples/sc88/61_wide_french_horns.aif b/sound/direct_sound_samples/sc88/61_wide_french_horns.aif new file mode 100644 index 000000000..004fda6a1 Binary files /dev/null and b/sound/direct_sound_samples/sc88/61_wide_french_horns.aif differ diff --git a/sound/direct_sound_samples/sc88/74_flute.aif b/sound/direct_sound_samples/sc88/74_flute.aif new file mode 100644 index 000000000..703f3adbd Binary files /dev/null and b/sound/direct_sound_samples/sc88/74_flute.aif differ diff --git a/sound/direct_sound_samples/sc88/81_square_wave.aif b/sound/direct_sound_samples/sc88/81_square_wave.aif new file mode 100644 index 000000000..09e17f0ca Binary files /dev/null and b/sound/direct_sound_samples/sc88/81_square_wave.aif differ diff --git a/sound/direct_sound_samples/sc88/8456330.aif b/sound/direct_sound_samples/sc88/8456330.aif new file mode 100644 index 000000000..199ead811 Binary files /dev/null and b/sound/direct_sound_samples/sc88/8456330.aif differ diff --git a/sound/direct_sound_samples/sc88/8466388.aif b/sound/direct_sound_samples/sc88/8466388.aif new file mode 100644 index 000000000..a7c4e94f8 Binary files /dev/null and b/sound/direct_sound_samples/sc88/8466388.aif differ diff --git a/sound/direct_sound_samples/sc88/8497134.aif b/sound/direct_sound_samples/sc88/8497134.aif new file mode 100644 index 000000000..09fe6f12e Binary files /dev/null and b/sound/direct_sound_samples/sc88/8497134.aif differ diff --git a/sound/direct_sound_samples/sc88/849F40C.aif b/sound/direct_sound_samples/sc88/849F40C.aif new file mode 100644 index 000000000..455ced13e Binary files /dev/null and b/sound/direct_sound_samples/sc88/849F40C.aif differ diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index d9e925956..329ab3580 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -17,7 +17,7 @@ voicegroup_pokemon_cry:: @ 842FC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD30 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD3C voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD48 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127 @ 842FD54 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127 @ 842FD54 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD60 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD6C voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD78 @@ -32,13 +32,13 @@ voicegroup_pokemon_cry:: @ 842FC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FDE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FDF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FDFC - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149 @ 842FE08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149 @ 842FE08 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE14 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE20 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE2C - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 115 @ 842FE38 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 115 @ 842FE38 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE44 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 842FE50 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 842FE50 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE5C voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE68 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE74 @@ -123,22 +123,22 @@ voicegroup_842FEF8:: @ 842FEF8 .align 2 voicegroup_8430204:: @ 8430204 - voice_directsound 60, 0, DirectSoundWaveData_846286C, 255, 252, 0, 239 @ 8430204 - voice_directsound 60, 0, DirectSoundWaveData_84637CC, 255, 250, 0, 221 @ 8430210 - voice_directsound 60, 0, DirectSoundWaveData_8464E2C, 255, 250, 0, 221 @ 843021C + voice_directsound 60, 0, DirectSoundWaveData_SC88_SteelStringGuitar, 255, 252, 0, 239 @ 8430204 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano3, 255, 250, 0, 221 @ 8430210 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano2, 255, 250, 0, 221 @ 843021C voice_directsound 60, 0, DirectSoundWaveData_8466388, 255, 247, 0, 221 @ 8430228 .align 2 voicegroup_8430234:: @ 8430234 - voice_directsound 60, 0, DirectSoundWaveData_8466F14, 255, 0, 255, 196 @ 8430234 - voice_directsound 60, 0, DirectSoundWaveData_846A4B8, 255, 0, 255, 196 @ 8430240 - voice_directsound 60, 0, DirectSoundWaveData_846C7D4, 255, 0, 255, 196 @ 843024C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Strings, 255, 0, 255, 196 @ 8430234 + voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusFlute, 255, 0, 255, 196 @ 8430240 + voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusHorn, 255, 0, 255, 196 @ 843024C .align 2 voicegroup_8430258:: @ 8430258 - voice_directsound 60, 0, DirectSoundWaveData_846FEA0, 255, 0, 193, 127 @ 8430258 - voice_directsound 60, 0, DirectSoundWaveData_84711F0, 255, 0, 193, 127 @ 8430264 - voice_directsound 60, 0, DirectSoundWaveData_8472700, 255, 0, 193, 127 @ 8430270 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Trumpet, 255, 0, 193, 127 @ 8430258 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Trombone, 255, 0, 193, 127 @ 8430264 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Tuba, 255, 0, 193, 127 @ 8430270 voice_square_1_alt 38, 2, 1, 0, 0, 0 @ 843027C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430288 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430294 @@ -270,13 +270,13 @@ voicegroup_8430258:: @ 8430258 .align 2 voicegroup_843087C:: @ 843087 - voice_directsound 60, 0, DirectSoundWaveData_8473B20, 255, 0, 255, 165 @ 843087C - voice_directsound 60, 0, DirectSoundWaveData_8474BBC, 255, 0, 255, 165 @ 8430888 + voice_directsound 60, 0, DirectSoundWaveData_SC88_CupMutedTrumpet, 255, 0, 255, 165 @ 843087C + voice_directsound 60, 0, DirectSoundWaveData_SC88_MutedTrumpet3, 255, 0, 255, 165 @ 8430888 .align 2 voicegroup_8430894:: @ 8430894 - voice_directsound 60, 0, DirectSoundWaveData_8475C18, 255, 0, 224, 165 @ 8430894 - voice_directsound 60, 0, DirectSoundWaveData_847CBAC, 255, 0, 218, 165 @ 84308A0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FrenchHorns, 255, 0, 224, 165 @ 8430894 + voice_directsound 60, 0, DirectSoundWaveData_SC88_WideFrenchHorns, 255, 0, 218, 165 @ 84308A0 .align 2 voicegroup_84308AC:: @ 84308AC @@ -294,7 +294,7 @@ voicegroup_84308AC:: @ 84308AC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430930 voice_square_1 0, 2, 0, 0, 15, 0 @ 843093C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430948 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242 @ 8430954 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242 @ 8430954 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430960 voice_square_1 0, 2, 0, 0, 15, 0 @ 843096C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430978 @@ -326,7 +326,7 @@ voicegroup_84308AC:: @ 84308AC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430AB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430ABC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430AC8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204 @ 8430AD4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 8430AD4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8430AE0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8430AEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430AF8 @@ -391,7 +391,7 @@ voicegroup_8430C9C:: @ 8430C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430D98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430DA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430DB0 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 149 @ 8430DBC + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 149 @ 8430DBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430DC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430DD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430DE0 @@ -402,7 +402,7 @@ voicegroup_8430C9C:: @ 8430C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430E1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430E28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430E34 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149 @ 8430E40 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149 @ 8430E40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430E64 @@ -440,7 +440,7 @@ voicegroup_8430C9C:: @ 8430C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430FE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430FFC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8431008 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8431008 voice_programmable_wave_alt ProgrammableWaveData_84553BC, 0, 7, 15, 1 @ 8431014 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431020 voice_square_1 0, 2, 0, 0, 15, 0 @ 843102C @@ -511,7 +511,7 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431314 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431320 voice_square_1 0, 2, 0, 0, 15, 0 @ 843132C - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 8431338 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 8431338 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431344 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431350 voice_square_1 0, 2, 0, 0, 15, 0 @ 843135C @@ -536,7 +536,7 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431440 voice_square_1 0, 2, 0, 0, 15, 0 @ 843144C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431458 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 8431464 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 8431464 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431470 voice_square_1 0, 2, 0, 0, 15, 0 @ 843147C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431488 @@ -544,7 +544,7 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 @ 84314A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84314AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84314B8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204 @ 84314C4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 84314C4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84314D0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84314DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84314E8 @@ -571,7 +571,7 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 @ 84315E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84315F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84315FC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8431608 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8431608 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431614 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431620 voice_square_1 0, 2, 0, 0, 15, 0 @ 843162C @@ -720,7 +720,7 @@ voicegroup_8431B9C:: @ 8431B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431CA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431CB0 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 149 @ 8431CBC + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 149 @ 8431CBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8431CC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431CD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431CE0 @@ -742,7 +742,7 @@ voicegroup_8431B9C:: @ 8431B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DB8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 8431DC4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8431DC4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8431DD0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8431DDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DE8 @@ -769,7 +769,7 @@ voicegroup_8431B9C:: @ 8431B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431EE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431EFC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8431F08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8431F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431F2C @@ -819,7 +819,7 @@ voicegroup_8431F98:: @ 8431F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432118 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432124 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432130 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149 @ 843213C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149 @ 843213C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432148 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432154 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432160 @@ -840,7 +840,7 @@ voicegroup_8431F98:: @ 8431F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432214 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432220 voice_square_1 0, 2, 0, 0, 15, 0 @ 843222C - voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165 @ 8432238 + voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165 @ 8432238 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432244 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432250 voice_square_1 0, 2, 0, 0, 15, 0 @ 843225C @@ -857,7 +857,7 @@ voicegroup_8431F98:: @ 8431F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 84322E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84322EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84322F8 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8432304 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8432304 voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 1 @ 8432310 voice_square_1 0, 2, 0, 0, 15, 0 @ 843231C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432328 @@ -992,8 +992,8 @@ voicegroup_84326F4:: @ 84326F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84328EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84328F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432904 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 8432910 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204 @ 843291C + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8432910 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 843291C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432928 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8432934 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432940 @@ -1020,7 +1020,7 @@ voicegroup_84326F4:: @ 84326F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432A3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432A54 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8432A60 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8432A60 voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 0 @ 8432A6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432A78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432A84 @@ -1086,7 +1086,7 @@ voicegroup_8432B38:: @ 8432B38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432D3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432D48 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 8432D54 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8432D54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432D60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432D6C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8432D78 @@ -1114,7 +1114,7 @@ voicegroup_8432B38:: @ 8432B38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432E80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432E98 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8432EA4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8432EA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432EB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432EBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8432EC8 @@ -1217,7 +1217,7 @@ voicegroup_8433138:: @ 8433138 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433330 voice_square_1 0, 2, 0, 0, 15, 0 @ 843333C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433348 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 8433354 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8433354 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433360 voice_square_1 0, 2, 0, 0, 15, 0 @ 843336C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8433378 @@ -1245,7 +1245,7 @@ voicegroup_8433138:: @ 8433138 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433480 voice_square_1 0, 2, 0, 0, 15, 0 @ 843348C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433498 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 84334A4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 84334A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84334B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84334BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84334C8 @@ -1305,7 +1305,7 @@ voicegroup_8433534:: @ 8433534 voice_square_1 0, 2, 0, 0, 15, 0 @ 843372C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433738 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433744 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 8433750 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8433750 voice_square_1 0, 2, 0, 0, 15, 0 @ 843375C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433768 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8433774 @@ -1426,7 +1426,7 @@ voicegroup_8433BAC:: @ 8433BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8433C90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433CA8 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8433CB4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8433CB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433CC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8433CD8 @@ -1507,7 +1507,7 @@ voicegroup_8433EB8:: @ 8433EB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434038 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434044 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434050 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149 @ 843405C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149 @ 843405C voice_square_1 0, 2, 0, 0, 15, 0 @ 8434068 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434074 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434080 @@ -1518,7 +1518,7 @@ voicegroup_8433EB8:: @ 8433EB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84340BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84340C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84340D4 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 84340E0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 84340E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84340EC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84340F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434104 @@ -1609,7 +1609,7 @@ voicegroup_84342E4:: @ 84342E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84344DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84344E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84344F4 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 8434500 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8434500 voice_square_1 0, 2, 0, 0, 15, 0 @ 843450C voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8434518 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8434524 @@ -1637,7 +1637,7 @@ voicegroup_84342E4:: @ 84342E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843462C voice_square_1 0, 2, 0, 0, 15, 0 @ 8434638 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434644 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8434650 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8434650 voice_square_1 0, 2, 0, 0, 15, 0 @ 843465C voice_square_1 0, 2, 0, 0, 15, 0 @ 8434668 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434674 @@ -1731,7 +1731,7 @@ voicegroup_8434728:: @ 8434728 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434A70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434A7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8434A88 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8434A94 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8434A94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434AA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434AAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8434AB8 @@ -1846,7 +1846,7 @@ voicegroup_8434F14:: @ 8434F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8434F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434FA4 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 8434FB0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 8434FB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434FBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8434FC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434FD4 @@ -1871,7 +1871,7 @@ voicegroup_8434F14:: @ 8434F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 84350B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84350C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84350D0 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 84350DC + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 84350DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84350E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84350F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435100 @@ -1981,7 +1981,7 @@ voicegroup_8435514:: @ 8435514 voice_square_1 0, 2, 0, 0, 15, 0 @ 84355BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84355C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84355D4 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127 @ 84355E0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127 @ 84355E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84355EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84355F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435604 @@ -2000,7 +2000,7 @@ voicegroup_8435514:: @ 8435514 voice_square_1 0, 2, 0, 0, 15, 0 @ 84356A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84356AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84356B8 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 84356C4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 84356C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84356D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84356DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84356E8 @@ -2064,7 +2064,7 @@ voicegroup_84358F8:: @ 84358F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843597C voice_square_2_alt 2, 0, 2, 0, 0 @ 8435988 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435994 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242 @ 84359A0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242 @ 84359A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84359AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84359B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84359C4 @@ -2095,7 +2095,7 @@ voicegroup_84358F8:: @ 84358F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435AF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435AFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8435B08 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 8435B14 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8435B14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435B20 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8435B2C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8435B38 @@ -2123,7 +2123,7 @@ voicegroup_84358F8:: @ 84358F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435C40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435C4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8435C58 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8435C64 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8435C64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435C70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435C7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8435C88 @@ -2155,10 +2155,10 @@ voicegroup_8435D18:: @ 8435D18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435D9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8435DA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435DB4 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242 @ 8435DC0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242 @ 8435DC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435DCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8435DD8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 37, 165, 180, 127 @ 8435DE4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 37, 165, 180, 127 @ 8435DE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435DF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435DFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8435E08 @@ -2187,7 +2187,7 @@ voicegroup_8435D18:: @ 8435D18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F34 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 8435F40 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8435F40 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8435F4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F64 @@ -2302,7 +2302,7 @@ voicegroup_84362B8:: @ 84362B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436438 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436444 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436450 - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 250, 0, 149 @ 843645C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 250, 0, 149 @ 843645C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436468 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436474 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436480 @@ -2340,7 +2340,7 @@ voicegroup_84362B8:: @ 84362B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436600 voice_square_1 0, 2, 0, 0, 15, 0 @ 843660C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436618 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8436624 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8436624 voice_programmable_wave ProgrammableWaveData_84553BC, 0, 7, 15, 1 @ 8436630 voice_square_1 0, 2, 0, 0, 15, 0 @ 843663C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436648 @@ -2433,7 +2433,7 @@ voicegroup_84368B8:: @ 84368B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436A38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436A44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436A50 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149 @ 8436A5C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149 @ 8436A5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436A68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436A80 @@ -2444,7 +2444,7 @@ voicegroup_84368B8:: @ 84368B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436ABC voice_square_1 0, 2, 0, 0, 15, 0 @ 8436AC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436AD4 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 8436AE0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8436AE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436AEC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8436AF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436B04 @@ -2471,7 +2471,7 @@ voicegroup_84368B8:: @ 84368B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436C00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436C0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436C18 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 127, 231, 127 @ 8436C24 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 127, 231, 127 @ 8436C24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436C30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436C3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436C48 @@ -2519,7 +2519,7 @@ voicegroup_8436C9C:: @ 8436C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436E1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436E28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436E34 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 8436E40 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 8436E40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436E64 @@ -2529,7 +2529,7 @@ voicegroup_8436C9C:: @ 8436C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436E94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436EA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436EAC - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 8436EB8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8436EB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436EC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436ED0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8436EDC @@ -2557,7 +2557,7 @@ voicegroup_8436C9C:: @ 8436C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436FE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436FFC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 8437008 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 8437008 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437014 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437020 voice_square_1 0, 2, 0, 0, 15, 0 @ 843702C @@ -2692,7 +2692,7 @@ voicegroup_8437488:: @ 8437488 voice_square_1 0, 2, 0, 0, 15, 0 @ 84375F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84375FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8437608 - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 8437614 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 8437614 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437620 voice_square_1 0, 2, 0, 0, 15, 0 @ 843762C voice_square_1 0, 2, 0, 0, 15, 0 @ 8437638 @@ -2704,8 +2704,8 @@ voicegroup_8437488:: @ 8437488 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437680 voice_square_1 0, 2, 0, 0, 15, 0 @ 843768C voice_square_1 0, 2, 0, 0, 15, 0 @ 8437698 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 84376A4 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 84376B0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 84376A4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 84376B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84376BC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84376C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84376D4 @@ -2804,7 +2804,7 @@ voicegroup_8437A88:: @ 8437A88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437B0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8437B18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437B24 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242 @ 8437B30 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242 @ 8437B30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437B3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8437B48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437B54 @@ -2836,7 +2836,7 @@ voicegroup_8437A88:: @ 8437A88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437C8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8437C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437CA4 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 8437CB0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8437CB0 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8437CBC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8437CC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437CD4 @@ -2899,7 +2899,7 @@ voicegroup_8437EB4:: @ 8437EB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437F5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8437F68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437F74 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127 @ 8437F80 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127 @ 8437F80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8437F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437FA4 @@ -2920,7 +2920,7 @@ voicegroup_8437EB4:: @ 8437EB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438058 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438064 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438070 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 843807C + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 843807C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438088 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438094 voice_square_1 0, 2, 0, 0, 15, 0 @ 84380A0 @@ -2984,14 +2984,14 @@ voicegroup_843828C:: @ 843828C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438334 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438340 voice_square_1 0, 2, 0, 0, 15, 0 @ 843834C - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 8438358 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 8438358 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438364 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438370 voice_square_1 0, 2, 0, 0, 15, 0 @ 843837C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438388 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438394 voice_square_1 0, 2, 0, 0, 15, 0 @ 84383A0 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 84383AC + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 84383AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84383B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84383C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84383D0 @@ -3003,7 +3003,7 @@ voicegroup_843828C:: @ 843828C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438418 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438424 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438430 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 843843C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 843843C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438448 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438454 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438460 @@ -3040,7 +3040,7 @@ voicegroup_843828C:: @ 843828C voice_square_1 0, 2, 0, 0, 15, 0 @ 84385D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84385E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84385EC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 84385F8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 84385F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438604 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438610 voice_square_1 0, 2, 0, 0, 15, 0 @ 843861C @@ -3115,14 +3115,14 @@ voicegroup_843888C:: @ 843888C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438934 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438940 voice_square_1 0, 2, 0, 0, 15, 0 @ 843894C - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 8438958 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 8438958 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438964 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438970 voice_square_1 0, 2, 0, 0, 15, 0 @ 843897C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438988 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438994 voice_square_1 0, 2, 0, 0, 15, 0 @ 84389A0 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 84389AC + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 84389AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84389B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84389C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84389D0 @@ -3134,7 +3134,7 @@ voicegroup_843888C:: @ 843888C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438A18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438A24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438A30 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 8438A3C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 8438A3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438A60 @@ -3171,7 +3171,7 @@ voicegroup_843888C:: @ 843888C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438BD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438BE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438BEC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8438BF8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8438BF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438C04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438C10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438C1C @@ -3246,14 +3246,14 @@ voicegroup_8438E8C:: @ 8438E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F4C - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 8438F58 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 8438F58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438F94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438FA0 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8438FAC + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8438FAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8438FB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438FC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8438FD0 @@ -3265,7 +3265,7 @@ voicegroup_8438E8C:: @ 8438E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439018 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439024 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439030 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 843903C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 843903C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439048 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439054 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439060 @@ -3302,7 +3302,7 @@ voicegroup_8438E8C:: @ 8438E8C voice_square_1 0, 2, 0, 0, 15, 0 @ 84391D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84391E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84391EC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 84391F8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 84391F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439204 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439210 voice_square_1 0, 2, 0, 0, 15, 0 @ 843921C @@ -3377,14 +3377,14 @@ voicegroup_843948C:: @ 843948C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439534 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439540 voice_square_1 0, 2, 0, 0, 15, 0 @ 843954C - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 8439558 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 8439558 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439564 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439570 voice_square_1 0, 2, 0, 0, 15, 0 @ 843957C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439588 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439594 voice_square_1 0, 2, 0, 0, 15, 0 @ 84395A0 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 84395AC + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 84395AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84395B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84395C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84395D0 @@ -3396,7 +3396,7 @@ voicegroup_843948C:: @ 843948C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439618 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439624 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439630 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 843963C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 843963C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439648 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439654 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439660 @@ -3433,7 +3433,7 @@ voicegroup_843948C:: @ 843948C voice_square_1 0, 2, 0, 0, 15, 0 @ 84397D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84397E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84397EC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 84397F8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 84397F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439804 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439810 voice_square_1 0, 2, 0, 0, 15, 0 @ 843981C @@ -3523,7 +3523,7 @@ voicegroup_8439A8C:: @ 8439A8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439BF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439C00 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 149 @ 8439C0C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 149 @ 8439C0C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439C18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439C24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439C30 @@ -3564,7 +3564,7 @@ voicegroup_8439A8C:: @ 8439A8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8439DD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439DE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439DEC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 8439DF8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 8439DF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439E04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439E1C @@ -3610,7 +3610,7 @@ voicegroup_8439E58:: @ 8439E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439FD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439FE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8439FF0 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 224 @ 8439FFC + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 224 @ 8439FFC voice_square_1 0, 2, 0, 0, 15, 0 @ 843A008 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A014 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A020 @@ -3620,7 +3620,7 @@ voicegroup_8439E58:: @ 8439E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A050 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A05C voice_square_1 0, 2, 0, 0, 15, 0 @ 843A068 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 843A074 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 843A074 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A080 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A08C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843A098 @@ -3648,7 +3648,7 @@ voicegroup_8439E58:: @ 8439E58 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A1A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A1AC voice_square_1 0, 2, 0, 0, 15, 0 @ 843A1B8 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843A1C4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843A1C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A1D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A1DC voice_square_1 0, 2, 0, 0, 15, 0 @ 843A1E8 @@ -3676,7 +3676,7 @@ voicegroup_843A224:: @ 843A224 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A2CC voice_square_1 0, 2, 0, 0, 15, 0 @ 843A2D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A2E4 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 843A2F0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 843A2F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A2FC voice_square_1 0, 2, 0, 0, 15, 0 @ 843A308 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A314 @@ -3697,7 +3697,7 @@ voicegroup_843A224:: @ 843A224 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A3C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A3D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A3E0 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 216 @ 843A3EC + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 216 @ 843A3EC voice_square_1 0, 2, 0, 0, 15, 0 @ 843A3F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A404 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A410 @@ -3732,7 +3732,7 @@ voicegroup_843A224:: @ 843A224 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A56C voice_square_1 0, 2, 0, 0, 15, 0 @ 843A578 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A584 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843A590 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843A590 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A59C voice_square_1 0, 2, 0, 0, 15, 0 @ 843A5A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A5B4 @@ -3795,7 +3795,7 @@ voicegroup_843A824:: @ 843A824 voice_square_1_alt 0, 0, 1, 1, 9, 0 @ 843A83C voice_square_2_alt 2, 0, 2, 6, 3 @ 843A848 voice_programmable_wave_alt ProgrammableWaveData_84553DC, 0, 7, 15, 1 @ 843A854 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 216 @ 843A860 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 216 @ 843A860 voice_square_2_alt 1, 0, 2, 6, 3 @ 843A86C voice_square_1 0, 2, 0, 0, 15, 0 @ 843A878 voice_square_1 0, 2, 0, 0, 15, 0 @ 843A884 @@ -3835,7 +3835,7 @@ voicegroup_843A824:: @ 843A824 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AA1C voice_square_1 0, 2, 0, 0, 15, 0 @ 843AA28 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AA34 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 165 @ 843AA40 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 165 @ 843AA40 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AA4C voice_square_1 0, 2, 0, 0, 15, 0 @ 843AA58 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843AA64 @@ -3863,7 +3863,7 @@ voicegroup_843A824:: @ 843A824 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 843AB78 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AB84 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843AB90 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843AB90 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AB9C voice_square_1 0, 2, 0, 0, 15, 0 @ 843ABA8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843ABB4 @@ -3959,7 +3959,7 @@ voicegroup_843AE24:: @ 843AE24 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AFC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AFD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843AFE0 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 843AFEC + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 843AFEC voice_square_1 0, 2, 0, 0, 15, 0 @ 843AFF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B004 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B010 @@ -3967,7 +3967,7 @@ voicegroup_843AE24:: @ 843AE24 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B028 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B034 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B040 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204 @ 843B04C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 843B04C voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239 @ 843B058 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843B064 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B070 @@ -4098,7 +4098,7 @@ voicegroup_843B424:: @ 843B424 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B628 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B634 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B640 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 843B64C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843B64C voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 239 @ 843B658 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843B664 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B670 @@ -4178,7 +4178,7 @@ voicegroup_843B844:: @ 843B844 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B9C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B9D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B9DC - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 843B9E8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 843B9E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA00 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA0C @@ -4188,8 +4188,8 @@ voicegroup_843B844:: @ 843B844 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA3C voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA48 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA54 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 843BA60 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 843BA6C + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 843BA60 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843BA6C voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226 @ 843BA78 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843BA84 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA90 @@ -4216,7 +4216,7 @@ voicegroup_843B844:: @ 843B844 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BB8C voice_square_1 0, 2, 0, 0, 15, 0 @ 843BB98 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BBA4 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843BBB0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843BBB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BBBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843BBC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BBD4 @@ -4291,7 +4291,7 @@ voicegroup_843BE44:: @ 843BE44 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BEEC voice_square_1 0, 2, 0, 0, 15, 0 @ 843BEF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BF04 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 843BF10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 843BF10 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BF1C voice_square_1 0, 2, 0, 0, 15, 0 @ 843BF28 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BF34 @@ -4309,7 +4309,7 @@ voicegroup_843BE44:: @ 843BE44 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BFC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BFD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BFDC - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 843BFE8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 843BFE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BFF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C000 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C00C @@ -4320,7 +4320,7 @@ voicegroup_843BE44:: @ 843BE44 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C048 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C054 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C060 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 843C06C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843C06C voice_square_1 0, 2, 0, 0, 15, 0 @ 843C078 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C084 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C090 @@ -4440,7 +4440,7 @@ voicegroup_843C444:: @ 843C444 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C5C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C5D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C5DC - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 843C5E8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 843C5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C5F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C600 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C60C @@ -4450,7 +4450,7 @@ voicegroup_843C444:: @ 843C444 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C63C voice_square_1 0, 2, 0, 0, 15, 0 @ 843C648 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C654 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 99 @ 843C660 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 99 @ 843C660 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C66C voice_square_1 0, 2, 0, 0, 15, 0 @ 843C678 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843C684 @@ -4478,7 +4478,7 @@ voicegroup_843C444:: @ 843C444 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C78C voice_square_1 0, 2, 0, 0, 15, 0 @ 843C798 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C7A4 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843C7B0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843C7B0 .align 2 voicegroup_843C7BC:: @ 843C7BC @@ -4648,7 +4648,7 @@ voicegroup_843CDBC:: @ 843CDBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843CF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 843CF48 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CF54 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 843CF60 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 843CF60 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CF6C voice_square_1 0, 2, 0, 0, 15, 0 @ 843CF78 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CF84 @@ -4658,7 +4658,7 @@ voicegroup_843CDBC:: @ 843CDBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843CFB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CFC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CFCC - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 843CFD8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 843CFD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CFE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CFF0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843CFFC @@ -4686,7 +4686,7 @@ voicegroup_843CDBC:: @ 843CDBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843D104 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D110 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D11C - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843D128 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843D128 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D134 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D140 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D14C @@ -4789,8 +4789,8 @@ voicegroup_843D3BC:: @ 843D3BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843D5B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D5C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D5CC - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 843D5D8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 843D5E4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 843D5D8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843D5E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D5F0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843D5FC voice_square_1 0, 2, 0, 0, 15, 0 @ 843D608 @@ -4817,7 +4817,7 @@ voicegroup_843D3BC:: @ 843D3BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843D704 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D710 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D71C - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843D728 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843D728 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D734 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D740 voice_square_1 0, 2, 0, 0, 15, 0 @ 843D74C @@ -4913,7 +4913,7 @@ voicegroup_843D9BC:: @ 843D9BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843DB60 voice_square_1 0, 2, 0, 0, 15, 0 @ 843DB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 843DB78 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 843DB84 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 843DB84 voice_square_1 0, 2, 0, 0, 15, 0 @ 843DB90 voice_square_1 0, 2, 0, 0, 15, 0 @ 843DB9C voice_square_1 0, 2, 0, 0, 15, 0 @ 843DBA8 @@ -4921,7 +4921,7 @@ voicegroup_843D9BC:: @ 843D9BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843DBC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843DBCC voice_square_1 0, 2, 0, 0, 15, 0 @ 843DBD8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 204 @ 843DBE4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 843DBE4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239 @ 843DBF0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843DBFC voice_square_1 0, 2, 0, 0, 15, 0 @ 843DC08 @@ -5044,7 +5044,7 @@ voicegroup_843DFBC:: @ 843DFBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E160 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E16C voice_square_1 0, 2, 0, 0, 15, 0 @ 843E178 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 843E184 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 843E184 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E190 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E19C voice_square_1 0, 2, 0, 0, 15, 0 @ 843E1A8 @@ -5079,7 +5079,7 @@ voicegroup_843DFBC:: @ 843DFBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E304 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E310 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E31C - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843E328 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843E328 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E334 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E340 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E34C @@ -5151,7 +5151,7 @@ voicegroup_843E5BC:: @ 843E5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E640 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E64C voice_square_1 0, 2, 0, 0, 15, 0 @ 843E658 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 128, 165, 90, 216 @ 843E664 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 128, 165, 90, 216 @ 843E664 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E670 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E67C voice_square_1 0, 2, 0, 0, 15, 0 @ 843E688 @@ -5160,7 +5160,7 @@ voicegroup_843E5BC:: @ 843E5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E6AC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E6B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E6C4 - voice_directsound 60, 0, DirectSoundWaveData_8492D10, 255, 0, 255, 127 @ 843E6D0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Bubble, 255, 0, 255, 127 @ 843E6D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E6DC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E6E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E6F4 @@ -5172,7 +5172,7 @@ voicegroup_843E5BC:: @ 843E5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E73C voice_square_1 0, 2, 0, 0, 15, 0 @ 843E748 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E754 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 843E760 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 843E760 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E76C voice_square_1 0, 2, 0, 0, 15, 0 @ 843E778 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E784 @@ -5182,8 +5182,8 @@ voicegroup_843E5BC:: @ 843E5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E7B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E7C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E7CC - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 843E7D8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 843E7E4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 843E7D8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843E7E4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226 @ 843E7F0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843E7FC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E808 @@ -5210,7 +5210,7 @@ voicegroup_843E5BC:: @ 843E5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E904 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E910 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E91C - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843E928 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843E928 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E934 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E940 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E94C @@ -5285,7 +5285,7 @@ voicegroup_843EBBC:: @ 843EBBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843EC64 voice_square_1 0, 2, 0, 0, 15, 0 @ 843EC70 voice_square_1 0, 2, 0, 0, 15, 0 @ 843EC7C - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 843EC88 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 843EC88 voice_square_1 0, 2, 0, 0, 15, 0 @ 843EC94 voice_square_1 0, 2, 0, 0, 15, 0 @ 843ECA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843ECAC @@ -5303,7 +5303,7 @@ voicegroup_843EBBC:: @ 843EBBC voice_square_1 0, 2, 0, 0, 15, 0 @ 843ED3C voice_square_1 0, 2, 0, 0, 15, 0 @ 843ED48 voice_square_1 0, 2, 0, 0, 15, 0 @ 843ED54 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 843ED60 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 843ED60 voice_square_1 0, 2, 0, 0, 15, 0 @ 843ED6C voice_square_1 0, 2, 0, 0, 15, 0 @ 843ED78 voice_square_1 0, 2, 0, 0, 15, 0 @ 843ED84 @@ -5413,7 +5413,7 @@ voicegroup_843F1BC:: @ 843F1BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F240 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F24C voice_square_1 0, 2, 0, 0, 15, 0 @ 843F258 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 843F264 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 843F264 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F270 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F27C voice_square_1 0, 2, 0, 0, 15, 0 @ 843F288 @@ -5445,7 +5445,7 @@ voicegroup_843F1BC:: @ 843F1BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F3C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F3CC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F3D8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 843F3E4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 843F3E4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239 @ 843F3F0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843F3FC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F408 @@ -5472,7 +5472,7 @@ voicegroup_843F1BC:: @ 843F1BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F504 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F510 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F51C - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 843F528 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 843F528 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F534 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F540 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F54C @@ -5504,7 +5504,7 @@ voicegroup_843F5E8:: @ 843F5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F660 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F66C voice_square_1 0, 2, 0, 0, 15, 0 @ 843F678 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 843F684 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 843F684 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F690 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F69C voice_square_1 0, 2, 0, 0, 15, 0 @ 843F6A8 @@ -5536,8 +5536,8 @@ voicegroup_843F5E8:: @ 843F5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F7E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F7EC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F7F8 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 128, 226, 0, 38 @ 843F804 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 843F810 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 128, 226, 0, 38 @ 843F804 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 843F810 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 843F81C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843F828 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F834 @@ -5564,7 +5564,7 @@ voicegroup_843F5E8:: @ 843F5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F930 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F93C voice_square_1 0, 2, 0, 0, 15, 0 @ 843F948 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 843F954 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 843F954 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F960 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F96C voice_square_1 0, 2, 0, 0, 15, 0 @ 843F978 @@ -5639,7 +5639,7 @@ voicegroup_843FBE8:: @ 843FBE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FC90 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FC9C voice_square_1 0, 2, 0, 0, 15, 0 @ 843FCA8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 843FCB4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 843FCB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FCC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FCCC voice_square_1 0, 2, 0, 0, 15, 0 @ 843FCD8 @@ -5658,7 +5658,7 @@ voicegroup_843FBE8:: @ 843FBE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FD74 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FD80 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FD8C - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 115 @ 843FD98 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 115 @ 843FD98 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FDA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FDB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FDBC @@ -5695,7 +5695,7 @@ voicegroup_843FBE8:: @ 843FBE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FF30 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 843FF48 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 843FF54 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 843FF54 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FF60 voice_square_1 0, 2, 0, 0, 15, 0 @ 843FF6C voice_square_1 0, 2, 0, 0, 15, 0 @ 843FF78 @@ -5791,7 +5791,7 @@ voicegroup_84401E8:: @ 84401E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844038C voice_square_1 0, 2, 0, 0, 15, 0 @ 8440398 voice_square_1 0, 2, 0, 0, 15, 0 @ 84403A4 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 84403B0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 84403B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84403BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84403C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84403D4 @@ -5901,7 +5901,7 @@ voicegroup_84407E8:: @ 84407E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440890 voice_square_1 0, 2, 0, 0, 15, 0 @ 844089C voice_square_1 0, 2, 0, 0, 15, 0 @ 84408A8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 84408B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 84408B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84408C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84408CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84408D8 @@ -5920,7 +5920,7 @@ voicegroup_84407E8:: @ 84407E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440974 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440980 voice_square_1 0, 2, 0, 0, 15, 0 @ 844098C - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 8440998 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 8440998 voice_square_1 0, 2, 0, 0, 15, 0 @ 84409A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84409B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84409BC @@ -6039,7 +6039,7 @@ voicegroup_8440DE8:: @ 8440DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440EE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440EFC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8440F08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8440F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440F2C @@ -6061,7 +6061,7 @@ voicegroup_8440DE8:: @ 8440DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440FEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8440FF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441004 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8441010 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8441010 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844101C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8441028 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441034 @@ -6088,7 +6088,7 @@ voicegroup_8440DE8:: @ 8440DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441130 voice_square_1 0, 2, 0, 0, 15, 0 @ 844113C voice_square_1 0, 2, 0, 0, 15, 0 @ 8441148 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8441154 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8441154 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441160 voice_square_1 0, 2, 0, 0, 15, 0 @ 844116C voice_square_1 0, 2, 0, 0, 15, 0 @ 8441178 @@ -6163,7 +6163,7 @@ voicegroup_84413E8:: @ 84413E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441490 voice_square_1 0, 2, 0, 0, 15, 0 @ 844149C voice_square_1 0, 2, 0, 0, 15, 0 @ 84414A8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 84414B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 84414B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84414C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84414CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84414D8 @@ -6182,7 +6182,7 @@ voicegroup_84413E8:: @ 84413E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441574 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441580 voice_square_1 0, 2, 0, 0, 15, 0 @ 844158C - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 8441598 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 8441598 voice_square_1 0, 2, 0, 0, 15, 0 @ 84415A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84415B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84415BC @@ -6301,7 +6301,7 @@ voicegroup_84419E8:: @ 84419E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441AE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441AF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441AFC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8441B08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8441B08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441B14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441B20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441B2C @@ -6312,17 +6312,17 @@ voicegroup_84419E8:: @ 84419E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441B68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441B74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441B80 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 8441B8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 8441B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8441B98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441BA4 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 8441BB0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 8441BB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441BBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8441BC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441BD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441BE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441BEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8441BF8 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 8441C04 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8441C04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441C10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441C1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8441C28 @@ -6350,7 +6350,7 @@ voicegroup_84419E8:: @ 84419E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441D3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8441D48 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8441D54 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8441D54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441D60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441D6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8441D78 @@ -6425,14 +6425,14 @@ voicegroup_8441FE8:: @ 8441FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442090 voice_square_1 0, 2, 0, 0, 15, 0 @ 844209C voice_square_1 0, 2, 0, 0, 15, 0 @ 84420A8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 84420B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 84420B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84420C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84420CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84420D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84420E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84420F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84420FC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8442108 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8442108 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442114 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442120 voice_square_1 0, 2, 0, 0, 15, 0 @ 844212C @@ -6446,7 +6446,7 @@ voicegroup_8441FE8:: @ 8441FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844218C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442198 voice_square_1 0, 2, 0, 0, 15, 0 @ 84421A4 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 84421B0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 84421B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84421BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84421C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84421D4 @@ -6481,7 +6481,7 @@ voicegroup_8441FE8:: @ 8441FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442330 voice_square_1 0, 2, 0, 0, 15, 0 @ 844233C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442348 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8442354 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8442354 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442360 voice_square_1 0, 2, 0, 0, 15, 0 @ 844236C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442378 @@ -6553,17 +6553,17 @@ voicegroup_84425E8:: @ 84425E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844266C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442678 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442684 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8442690 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8442690 voice_square_1 0, 2, 0, 0, 15, 0 @ 844269C voice_square_1 0, 2, 0, 0, 15, 0 @ 84426A8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 84426B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 84426B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84426C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84426CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84426D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84426E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84426F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84426FC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8442708 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8442708 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442714 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442720 voice_square_1 0, 2, 0, 0, 15, 0 @ 844272C @@ -6574,10 +6574,10 @@ voicegroup_84425E8:: @ 84425E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442768 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442774 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442780 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 844278C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 844278C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442798 voice_square_1 0, 2, 0, 0, 15, 0 @ 84427A4 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 84427B0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 84427B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84427BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84427C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84427D4 @@ -6612,7 +6612,7 @@ voicegroup_84425E8:: @ 84425E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442930 voice_square_1 0, 2, 0, 0, 15, 0 @ 844293C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442948 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8442954 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8442954 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442960 voice_square_1 0, 2, 0, 0, 15, 0 @ 844296C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442978 @@ -6687,14 +6687,14 @@ voicegroup_8442BE8:: @ 8442BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442C90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442CA8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 8442CB4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 8442CB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442CC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8442CD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442CE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442CFC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8442D08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8442D08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442D14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442D20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442D2C @@ -6705,17 +6705,17 @@ voicegroup_8442BE8:: @ 8442BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442D74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442D80 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 8442D8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 8442D8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442D98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442DA4 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 8442DB0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 8442DB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442DBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8442DC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442DD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442DE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442DEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8442DF8 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 8442E04 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8442E04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442E1C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8442E28 @@ -6743,7 +6743,7 @@ voicegroup_8442BE8:: @ 8442BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442F30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442F3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442F48 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8442F54 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8442F54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442F60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8442F6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8442F78 @@ -6825,7 +6825,7 @@ voicegroup_84431E8:: @ 84431E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84432E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84432F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84432FC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8443308 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8443308 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443314 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443320 voice_square_1 0, 2, 0, 0, 15, 0 @ 844332C @@ -6836,7 +6836,7 @@ voicegroup_84431E8:: @ 84431E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443368 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443374 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443380 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 844338C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 844338C voice_square_1 0, 2, 0, 0, 15, 0 @ 8443398 voice_square_1 0, 2, 0, 0, 15, 0 @ 84433A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84433B0 @@ -6847,7 +6847,7 @@ voicegroup_84431E8:: @ 84431E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84433EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84433F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443404 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8443410 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8443410 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844341C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8443428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443434 @@ -7076,18 +7076,18 @@ voicegroup_8443DE8:: @ 8443DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443E60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443E6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8443E78 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 8443E84 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 8443E84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443E90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443E9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8443EA8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 8443EB4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 8443EB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443EC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443ECC voice_square_1 0, 2, 0, 0, 15, 0 @ 8443ED8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443EE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443EFC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8443F08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8443F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443F2C @@ -7098,7 +7098,7 @@ voicegroup_8443DE8:: @ 8443DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443F68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443F74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443F80 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 8443F8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 8443F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8443F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443FA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443FB0 @@ -7109,7 +7109,7 @@ voicegroup_8443DE8:: @ 8443DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443FEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8443FF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444004 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8444010 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8444010 voice_square_1 0, 2, 0, 0, 15, 0 @ 844401C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8444028 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444034 @@ -7207,18 +7207,18 @@ voicegroup_84443E8:: @ 84443E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444460 voice_square_1 0, 2, 0, 0, 15, 0 @ 844446C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444478 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 8444484 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 8444484 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444490 voice_square_1 0, 2, 0, 0, 15, 0 @ 844449C voice_square_1 0, 2, 0, 0, 15, 0 @ 84444A8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 84444B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 84444B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84444C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84444CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84444D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84444E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84444F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84444FC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8444508 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8444508 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444514 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444520 voice_square_1 0, 2, 0, 0, 15, 0 @ 844452C @@ -7229,10 +7229,10 @@ voicegroup_84443E8:: @ 84443E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444568 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444574 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444580 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 844458C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 844458C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444598 voice_square_1 0, 2, 0, 0, 15, 0 @ 84445A4 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 84445B0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 84445B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84445BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84445C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84445D4 @@ -7240,7 +7240,7 @@ voicegroup_84443E8:: @ 84443E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84445EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84445F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444604 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8444610 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8444610 voice_square_1 0, 2, 0, 0, 15, 0 @ 844461C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8444628 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444634 @@ -7267,7 +7267,7 @@ voicegroup_84443E8:: @ 84443E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444730 voice_square_1 0, 2, 0, 0, 15, 0 @ 844473C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444748 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8444754 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8444754 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444760 voice_square_1 0, 2, 0, 0, 15, 0 @ 844476C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444778 @@ -7338,7 +7338,7 @@ voicegroup_84449E8:: @ 84449E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444A60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444A6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444A78 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 8444A84 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 8444A84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444A90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444A9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444AA8 @@ -7360,7 +7360,7 @@ voicegroup_84449E8:: @ 84449E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444B68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444B74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444B80 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 8444B8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 8444B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444B98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444BA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444BB0 @@ -7470,7 +7470,7 @@ voicegroup_8444FE8:: @ 8444FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844506C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445078 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445084 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8445090 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8445090 voice_square_1 0, 2, 0, 0, 15, 0 @ 844509C voice_square_1 0, 2, 0, 0, 15, 0 @ 84450A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84450B4 @@ -7491,8 +7491,8 @@ voicegroup_8444FE8:: @ 8444FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445168 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445174 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445180 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 844518C - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 8445198 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 844518C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 8445198 voice_square_1 0, 2, 0, 0, 15, 0 @ 84451A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84451B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84451BC @@ -7529,7 +7529,7 @@ voicegroup_8444FE8:: @ 8444FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445330 voice_square_1 0, 2, 0, 0, 15, 0 @ 844533C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445348 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8445354 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8445354 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445360 voice_square_1 0, 2, 0, 0, 15, 0 @ 844536C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445378 @@ -7604,7 +7604,7 @@ voicegroup_84455E8:: @ 84455E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445690 voice_square_1 0, 2, 0, 0, 15, 0 @ 844569C voice_square_1 0, 2, 0, 0, 15, 0 @ 84456A8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 84456B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 84456B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84456C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84456CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84456D8 @@ -7622,8 +7622,8 @@ voicegroup_84455E8:: @ 84455E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445768 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445774 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445780 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 844578C - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 8445798 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 844578C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 8445798 voice_square_1 0, 2, 0, 0, 15, 0 @ 84457A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84457B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84457BC @@ -7731,18 +7731,18 @@ voicegroup_8445BE8:: @ 8445BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445C60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445C6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445C78 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 8445C84 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 8445C84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445C90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445C9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445CA8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 8445CB4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 8445CB4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445CC0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445CCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8445CD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445CE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445CF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445CFC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8445D08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8445D08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445D14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445D20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445D2C @@ -7753,7 +7753,7 @@ voicegroup_8445BE8:: @ 8445BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445D74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445D80 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 196 @ 8445D8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 196 @ 8445D8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445D98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445DA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445DB0 @@ -7764,7 +7764,7 @@ voicegroup_8445BE8:: @ 8445BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445DEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8445DF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445E04 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8445E10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8445E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445E1C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8445E28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445E34 @@ -7791,7 +7791,7 @@ voicegroup_8445BE8:: @ 8445BE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445F30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445F3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445F48 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8445F54 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8445F54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445F60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445F6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8445F78 @@ -7863,7 +7863,7 @@ voicegroup_84461E8:: @ 84461E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844626C voice_square_1 0, 2, 0, 0, 15, 0 @ 8446278 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446284 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8446290 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8446290 voice_square_1 0, 2, 0, 0, 15, 0 @ 844629C voice_square_1 0, 2, 0, 0, 15, 0 @ 84462A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84462B4 @@ -7873,7 +7873,7 @@ voicegroup_84461E8:: @ 84461E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84462E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84462F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84462FC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8446308 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8446308 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446314 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446320 voice_square_1 0, 2, 0, 0, 15, 0 @ 844632C @@ -7884,7 +7884,7 @@ voicegroup_84461E8:: @ 84461E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446368 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446374 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446380 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 196 @ 844638C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 196 @ 844638C voice_square_1 0, 2, 0, 0, 15, 0 @ 8446398 voice_square_1 0, 2, 0, 0, 15, 0 @ 84463A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84463B0 @@ -7894,7 +7894,7 @@ voicegroup_84461E8:: @ 84461E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84463E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84463EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84463F8 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 8446404 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8446404 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446410 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844641C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8446428 @@ -7994,17 +7994,17 @@ voicegroup_84467E8:: @ 84467E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844686C voice_square_1 0, 2, 0, 0, 15, 0 @ 8446878 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446884 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8446890 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8446890 voice_square_1 0, 2, 0, 0, 15, 0 @ 844689C voice_square_1 0, 2, 0, 0, 15, 0 @ 84468A8 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 84468B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 84468B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84468C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84468CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84468D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84468E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84468F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84468FC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8446908 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8446908 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446914 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446920 voice_square_1 0, 2, 0, 0, 15, 0 @ 844692C @@ -8025,8 +8025,8 @@ voicegroup_84467E8:: @ 84467E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84469E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84469EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84469F8 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 8446A04 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8446A10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8446A04 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8446A10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446A1C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8446A28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446A34 @@ -8053,7 +8053,7 @@ voicegroup_84467E8:: @ 84467E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446B30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446B3C voice_square_1 0, 2, 0, 0, 15, 0 @ 8446B48 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8446B54 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8446B54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446B60 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446B6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8446B78 @@ -8135,7 +8135,7 @@ voicegroup_8446DE8:: @ 8446DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446EE4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446EF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446EFC - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8446F08 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8446F08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446F14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446F20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446F2C @@ -8149,15 +8149,15 @@ voicegroup_8446DE8:: @ 8446DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446F8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8446F98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FA4 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 8446FB0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 8446FB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FF8 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 8447004 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8447010 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8447004 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8447010 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844701C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8447028 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447034 @@ -8184,7 +8184,7 @@ voicegroup_8446DE8:: @ 8446DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447130 voice_square_1 0, 2, 0, 0, 15, 0 @ 844713C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447148 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8447154 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8447154 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447160 voice_square_1 0, 2, 0, 0, 15, 0 @ 844716C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447178 @@ -8261,7 +8261,7 @@ voicegroup_8447400:: @ 8447400 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447484 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447490 voice_square_1 0, 2, 0, 0, 15, 0 @ 844749C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 84474A8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 84474A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84474B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84474C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84474CC @@ -8271,7 +8271,7 @@ voicegroup_8447400:: @ 8447400 voice_square_1 0, 2, 0, 0, 15, 0 @ 84474FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8447508 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447514 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8447520 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8447520 voice_square_1 0, 2, 0, 0, 15, 0 @ 844752C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447538 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447544 @@ -8402,7 +8402,7 @@ voicegroup_8447A00:: @ 8447A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447AFC voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B08 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B14 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76 @ 8447B20 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76 @ 8447B20 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B44 @@ -8413,7 +8413,7 @@ voicegroup_8447A00:: @ 8447A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447B98 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 8447BA4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 8447BA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447BB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447BBC voice_square_1 0, 2, 0, 0, 15, 0 @ 8447BC8 @@ -8423,8 +8423,8 @@ voicegroup_8447A00:: @ 8447A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447BF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447C04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447C10 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 8447C1C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 8447C28 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8447C1C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 8447C28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447C34 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8447C40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447C4C @@ -8451,7 +8451,7 @@ voicegroup_8447A00:: @ 8447A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447D48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447D54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447D60 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 8447D6C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 8447D6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447D78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447D84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447D90 @@ -8479,7 +8479,7 @@ voicegroup_8447DF0:: @ 8447DF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447E74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447E80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447E8C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8447E98 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8447E98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447EA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447EB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447EBC @@ -8489,7 +8489,7 @@ voicegroup_8447DF0:: @ 8447DF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447EEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8447EF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447F04 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8447F10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8447F10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447F1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447F28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447F34 @@ -8511,7 +8511,7 @@ voicegroup_8447DF0:: @ 8447DF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447FF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448000 voice_square_1 0, 2, 0, 0, 15, 0 @ 844800C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8448018 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8448018 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 8448024 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8448030 voice_square_1 0, 2, 0, 0, 15, 0 @ 844803C @@ -8538,7 +8538,7 @@ voicegroup_8447DF0:: @ 8447DF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448138 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448144 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448150 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 844815C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 844815C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448168 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448174 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448180 @@ -8620,7 +8620,7 @@ voicegroup_84483F0:: @ 84483F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84484EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84484F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448504 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8448510 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8448510 voice_square_1 0, 2, 0, 0, 15, 0 @ 844851C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448534 @@ -8642,7 +8642,7 @@ voicegroup_84483F0:: @ 84483F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84485F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448600 voice_square_1 0, 2, 0, 0, 15, 0 @ 844860C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8448618 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8448618 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 8448624 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448630 voice_square_1 0, 2, 0, 0, 15, 0 @ 844863C @@ -8669,7 +8669,7 @@ voicegroup_84483F0:: @ 84483F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448738 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448744 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448750 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 844875C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 844875C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448768 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448774 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448780 @@ -8741,17 +8741,17 @@ voicegroup_84489F0:: @ 84489F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448A74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448A80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448A8C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8448A98 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8448A98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448AA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448AB0 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 8448ABC + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 8448ABC voice_square_1 0, 2, 0, 0, 15, 0 @ 8448AC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448AD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448AE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448AEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8448AF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448B04 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 8448B10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 8448B10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448B1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448B28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448B34 @@ -8762,8 +8762,8 @@ voicegroup_84489F0:: @ 84489F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448B70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448B7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448B88 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 8448B94 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 8448BA0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 8448B94 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 8448BA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8448BB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448BC4 @@ -8773,7 +8773,7 @@ voicegroup_84489F0:: @ 84489F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448BF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448C00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448C0C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8448C18 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8448C18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448C24 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8448C30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448C3C @@ -8800,7 +8800,7 @@ voicegroup_84489F0:: @ 84489F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448D38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448D44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448D50 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8448D5C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8448D5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448D74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448D80 @@ -8894,9 +8894,9 @@ voicegroup_8448FF0:: @ 8448FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844917C voice_square_1 0, 2, 0, 0, 15, 0 @ 8449188 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449194 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 84491A0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 84491A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84491AC - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 84491B8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 84491B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84491C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84491D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84491DC @@ -9003,7 +9003,7 @@ voicegroup_84495F0:: @ 84495F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449674 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449680 voice_square_1 0, 2, 0, 0, 15, 0 @ 844968C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8449698 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8449698 voice_square_1 0, 2, 0, 0, 15, 0 @ 84496A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84496B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84496BC @@ -9035,7 +9035,7 @@ voicegroup_84495F0:: @ 84495F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84497F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449800 voice_square_1 0, 2, 0, 0, 15, 0 @ 844980C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 8449818 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8449818 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239 @ 8449824 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8449830 voice_square_1 0, 2, 0, 0, 15, 0 @ 844983C @@ -9062,7 +9062,7 @@ voicegroup_84495F0:: @ 84495F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449938 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449944 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449950 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 844995C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 844995C voice_square_1 0, 2, 0, 0, 15, 0 @ 8449968 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449974 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449980 @@ -9134,7 +9134,7 @@ voicegroup_8449BF0:: @ 8449BF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449C74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449C80 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449C8C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8449C98 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8449C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449CA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449CB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449CBC @@ -9193,7 +9193,7 @@ voicegroup_8449BF0:: @ 8449BF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449F38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449F44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449F50 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 8449F5C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 8449F5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8449F68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449F74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449F80 @@ -9395,18 +9395,18 @@ voicegroup_844A7F0:: @ 844A7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A868 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A874 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A880 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 844A88C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 844A88C voice_square_1 0, 2, 0, 0, 15, 0 @ 844A898 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A8A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A8B0 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 165 @ 844A8BC + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 165 @ 844A8BC voice_square_1 0, 2, 0, 0, 15, 0 @ 844A8C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A8D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A8E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A8EC voice_square_1 0, 2, 0, 0, 15, 0 @ 844A8F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A904 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76 @ 844A910 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76 @ 844A910 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A91C voice_square_1 0, 2, 0, 0, 15, 0 @ 844A928 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A934 @@ -9417,7 +9417,7 @@ voicegroup_844A7F0:: @ 844A7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A970 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A97C voice_square_1 0, 2, 0, 0, 15, 0 @ 844A988 - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 253, 0, 188 @ 844A994 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 253, 0, 188 @ 844A994 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A9A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A9AC voice_square_1 0, 2, 0, 0, 15, 0 @ 844A9B8 @@ -9427,8 +9427,8 @@ voicegroup_844A7F0:: @ 844A7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A9E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A9F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AA00 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 226, 0, 38 @ 844AA0C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 844AA18 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 844AA0C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 844AA18 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AA24 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844AA30 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AA3C @@ -9455,7 +9455,7 @@ voicegroup_844A7F0:: @ 844A7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AB38 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AB44 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AB50 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 844AB5C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 844AB5C voice_square_1 0, 2, 0, 0, 15, 0 @ 844AB68 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AB74 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AB80 @@ -9526,7 +9526,7 @@ voicegroup_844ADF0:: @ 844ADF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AE68 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AE74 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AE80 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 844AE8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 844AE8C voice_square_1 0, 2, 0, 0, 15, 0 @ 844AE98 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AEA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AEB0 @@ -9537,7 +9537,7 @@ voicegroup_844ADF0:: @ 844ADF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AEEC voice_square_1 0, 2, 0, 0, 15, 0 @ 844AEF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AF04 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76 @ 844AF10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76 @ 844AF10 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AF1C voice_square_1 0, 2, 0, 0, 15, 0 @ 844AF28 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AF34 @@ -9551,7 +9551,7 @@ voicegroup_844ADF0:: @ 844ADF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AF94 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AFA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AFAC - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 844AFB8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 844AFB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AFC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AFD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AFDC @@ -9559,7 +9559,7 @@ voicegroup_844ADF0:: @ 844ADF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844AFF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B000 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B00C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 844B018 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 844B018 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B024 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B030 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B03C @@ -9657,7 +9657,7 @@ voicegroup_844B3F0:: @ 844B3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B468 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B474 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B480 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 844B48C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 844B48C voice_square_1 0, 2, 0, 0, 15, 0 @ 844B498 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B4A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B4B0 @@ -9668,7 +9668,7 @@ voicegroup_844B3F0:: @ 844B3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B4EC voice_square_1 0, 2, 0, 0, 15, 0 @ 844B4F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B504 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76 @ 844B510 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76 @ 844B510 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B51C voice_square_1 0, 2, 0, 0, 15, 0 @ 844B528 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B534 @@ -9680,9 +9680,9 @@ voicegroup_844B3F0:: @ 844B3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B57C voice_square_1 0, 2, 0, 0, 15, 0 @ 844B588 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B594 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 844B5A0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 844B5A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B5AC - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 844B5B8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 844B5B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B5C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B5D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B5DC @@ -9690,7 +9690,7 @@ voicegroup_844B3F0:: @ 844B3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B5F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B600 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B60C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 0, 242 @ 844B618 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 844B618 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B624 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844B630 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B63C @@ -9717,7 +9717,7 @@ voicegroup_844B3F0:: @ 844B3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B738 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B744 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B750 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 844B75C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 844B75C voice_square_1 0, 2, 0, 0, 15, 0 @ 844B768 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B774 voice_square_1 0, 2, 0, 0, 15, 0 @ 844B780 @@ -9788,18 +9788,18 @@ voicegroup_844B9F0:: @ 844B9F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA68 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA74 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA80 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 844BA8C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 844BA98 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 844BA8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 844BA98 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BAA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BAB0 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 844BABC + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 844BABC voice_square_1 0, 2, 0, 0, 15, 0 @ 844BAC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BAD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BAE0 - voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165 @ 844BAEC + voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165 @ 844BAEC voice_square_1 0, 2, 0, 0, 15, 0 @ 844BAF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BB04 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 128, 249, 25, 76 @ 844BB10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 128, 249, 25, 76 @ 844BB10 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BB1C voice_square_1 0, 2, 0, 0, 15, 0 @ 844BB28 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BB34 @@ -9848,7 +9848,7 @@ voicegroup_844B9F0:: @ 844B9F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BD38 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BD44 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BD50 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 844BD5C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 844BD5C voice_square_1 0, 2, 0, 0, 15, 0 @ 844BD68 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BD74 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BD80 @@ -9923,14 +9923,14 @@ voicegroup_844BFF0:: @ 844BFF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C098 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C0A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C0B0 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 844C0BC + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 844C0BC voice_square_1 0, 2, 0, 0, 15, 0 @ 844C0C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C0D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C0E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C0EC voice_square_1 0, 2, 0, 0, 15, 0 @ 844C0F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C104 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 844C110 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 844C110 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C11C voice_square_1 0, 2, 0, 0, 15, 0 @ 844C128 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C134 @@ -9944,7 +9944,7 @@ voicegroup_844BFF0:: @ 844BFF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C194 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C1A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C1AC - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 844C1B8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 844C1B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C1C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C1D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C1DC @@ -9979,7 +9979,7 @@ voicegroup_844BFF0:: @ 844BFF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C338 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C344 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C350 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 844C35C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 844C35C voice_square_1 0, 2, 0, 0, 15, 0 @ 844C368 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C374 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C380 @@ -10050,18 +10050,18 @@ voicegroup_844C5F0:: @ 844C5F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C668 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C674 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C680 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 844C68C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 844C68C voice_square_1 0, 2, 0, 0, 15, 0 @ 844C698 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C6A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C6B0 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 844C6BC + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 844C6BC voice_square_1 0, 2, 0, 0, 15, 0 @ 844C6C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C6D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C6E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C6EC voice_square_1 0, 2, 0, 0, 15, 0 @ 844C6F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C704 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 844C710 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 844C710 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C71C voice_square_1 0, 2, 0, 0, 15, 0 @ 844C728 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C734 @@ -10073,9 +10073,9 @@ voicegroup_844C5F0:: @ 844C5F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C77C voice_square_1 0, 2, 0, 0, 15, 0 @ 844C788 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C794 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 844C7A0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 844C7A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C7AC - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 844C7B8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 844C7B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C7C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C7D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C7DC @@ -10182,7 +10182,7 @@ voicegroup_844CBF0:: @ 844CBF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CC74 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CC80 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CC8C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 844CC98 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 844CC98 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CCA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CCB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CCBC @@ -10372,7 +10372,7 @@ voicegroup_844D1F0:: @ 844D1F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D538 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D544 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D550 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 844D55C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 844D55C voice_square_1 0, 2, 0, 0, 15, 0 @ 844D568 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D574 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D580 @@ -10443,7 +10443,7 @@ voicegroup_844D7F0:: @ 844D7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D868 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D874 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D880 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 844D88C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 844D88C voice_square_1 0, 2, 0, 0, 15, 0 @ 844D898 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D8A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D8B0 @@ -10466,9 +10466,9 @@ voicegroup_844D7F0:: @ 844D7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D97C voice_square_1 0, 2, 0, 0, 15, 0 @ 844D988 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D994 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 844D9A0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 844D9A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D9AC - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 844D9B8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 844D9B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D9C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D9D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D9DC @@ -10574,18 +10574,18 @@ voicegroup_844DDF0:: @ 844DDF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DE68 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DE74 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DE80 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 844DE8C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 844DE8C voice_square_1 0, 2, 0, 0, 15, 0 @ 844DE98 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DEA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DEB0 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 210 @ 844DEBC + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 210 @ 844DEBC voice_square_1 0, 2, 0, 0, 15, 0 @ 844DEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DED4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DEE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DEEC voice_square_1 0, 2, 0, 0, 15, 0 @ 844DEF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DF04 - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 76 @ 844DF10 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 76 @ 844DF10 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DF1C voice_square_1 0, 2, 0, 0, 15, 0 @ 844DF28 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DF34 @@ -10597,9 +10597,9 @@ voicegroup_844DDF0:: @ 844DDF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DF7C voice_square_1 0, 2, 0, 0, 15, 0 @ 844DF88 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DF94 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 844DFA0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 844DFA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DFAC - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 844DFB8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 844DFB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DFC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DFD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844DFDC @@ -10634,7 +10634,7 @@ voicegroup_844DDF0:: @ 844DDF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E138 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E144 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E150 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 127 @ 844E15C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 127 @ 844E15C voice_square_1 0, 2, 0, 0, 15, 0 @ 844E168 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E174 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E180 @@ -10706,7 +10706,7 @@ voicegroup_844E3F0:: @ 844E3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E474 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E480 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E48C - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 844E498 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 844E498 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E4A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E4B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E4BC @@ -10738,7 +10738,7 @@ voicegroup_844E3F0:: @ 844E3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E5F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E600 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E60C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 242 @ 844E618 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 844E618 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239 @ 844E624 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844E630 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E63C @@ -10765,7 +10765,7 @@ voicegroup_844E3F0:: @ 844E3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E738 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E744 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E750 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 844E75C + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 844E75C voice_programmable_wave_alt ProgrammableWaveData_845540C, 0, 7, 15, 0 @ 844E768 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E774 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E780 @@ -10829,7 +10829,7 @@ voicegroup_844E918:: @ 844E918 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EA14 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EA20 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EA2C - voice_directsound 60, 0, DirectSoundWaveData_8481130, 255, 249, 25, 248 @ 844EA38 + voice_directsound 60, 0, DirectSoundWaveData_SC88_NylonStringGuitar, 255, 249, 25, 248 @ 844EA38 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EA44 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EA50 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EA5C @@ -10851,7 +10851,7 @@ voicegroup_844E918:: @ 844E918 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EB1C voice_square_1 0, 2, 0, 0, 15, 0 @ 844EB28 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EB34 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 242, 51, 165 @ 844EB40 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 165 @ 844EB40 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EB4C voice_square_1 0, 2, 0, 0, 15, 0 @ 844EB58 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EB64 @@ -10923,7 +10923,7 @@ voicegroup_844ECF0:: @ 844ECF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EE58 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EE64 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EE70 - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 844EE7C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 844EE7C voice_square_1 0, 2, 0, 0, 15, 0 @ 844EE88 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EE94 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EEA0 @@ -10936,7 +10936,7 @@ voicegroup_844ECF0:: @ 844ECF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EEF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EF00 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EF0C - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 844EF18 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 844EF18 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844EF24 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844EF30 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EF3C @@ -10989,14 +10989,14 @@ voicegroup_844F0C8:: @ 844F0C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F14C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F158 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F164 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 250, 0, 242 @ 844F170 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 250, 0, 242 @ 844F170 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F17C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F188 - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127 @ 844F194 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127 @ 844F194 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F1A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F1AC voice_square_1 0, 2, 0, 0, 15, 0 @ 844F1B8 - voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165 @ 844F1C4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165 @ 844F1C4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F1D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F1DC voice_square_1 0, 2, 0, 0, 15, 0 @ 844F1E8 @@ -11008,12 +11008,12 @@ voicegroup_844F0C8:: @ 844F0C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F230 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F23C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F248 - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 844F254 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 844F254 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F260 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F26C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F278 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F284 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 844F290 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 844F290 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F29C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F2A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F2B4 @@ -11021,7 +11021,7 @@ voicegroup_844F0C8:: @ 844F0C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F2CC voice_square_1 0, 2, 0, 0, 15, 0 @ 844F2D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F2E4 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 844F2F0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 844F2F0 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844F2FC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844F308 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F314 @@ -11086,7 +11086,7 @@ voicegroup_844F50C:: @ 844F50C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F5B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F5C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F5CC - voice_directsound 60, 0, DirectSoundWaveData_84569D4, 255, 0, 255, 127 @ 844F5D8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Organ2, 255, 0, 255, 127 @ 844F5D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F5E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F5F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F5FC @@ -11102,7 +11102,7 @@ voicegroup_844F50C:: @ 844F50C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F674 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F680 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F68C - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 844F698 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 844F698 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F6A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F6B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F6BC @@ -11196,7 +11196,7 @@ voicegroup_844F950:: @ 844F950 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FAB8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FAC4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FAD0 - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 844FADC + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 844FADC voice_square_1 0, 2, 0, 0, 15, 0 @ 844FAE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FAF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB00 @@ -11208,7 +11208,7 @@ voicegroup_844F950:: @ 844F950 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB48 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB54 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB60 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 844FB6C + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 844FB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB78 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844FB84 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844FB90 @@ -11290,7 +11290,7 @@ voicegroup_844FD94:: @ 844FD94 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FEFC voice_square_1 0, 2, 0, 0, 15, 0 @ 844FF08 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FF14 - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 844FF20 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 844FF20 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FF2C voice_square_1 0, 2, 0, 0, 15, 0 @ 844FF38 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FF44 @@ -11302,7 +11302,7 @@ voicegroup_844FD94:: @ 844FD94 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FF8C voice_square_1 0, 2, 0, 0, 15, 0 @ 844FF98 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FFA4 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 844FFB0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 844FFB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FFBC voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844FFC8 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844FFD4 @@ -11330,7 +11330,7 @@ voicegroup_844FD94:: @ 844FD94 voice_square_1 0, 2, 0, 0, 15, 0 @ 84500DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84500E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84500F4 - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 8450100 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 8450100 voice_square_1 0, 2, 0, 0, 15, 0 @ 845010C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450118 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450124 @@ -11382,7 +11382,7 @@ voicegroup_845019C:: @ 845019C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450328 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450334 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450340 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 845034C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 845034C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450358 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450364 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450370 @@ -11391,7 +11391,7 @@ voicegroup_845019C:: @ 845019C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450394 voice_square_1 0, 2, 0, 0, 15, 0 @ 84503A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84503AC - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 216, 0, 165 @ 84503B8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 84503B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84503C4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84503D0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84503DC @@ -11447,7 +11447,7 @@ voicegroup_845058C:: @ 845058C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450610 voice_square_1 0, 2, 0, 0, 15, 0 @ 845061C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450628 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 216, 90, 242 @ 8450634 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 216, 90, 242 @ 8450634 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450640 voice_square_1 0, 2, 0, 0, 15, 0 @ 845064C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450658 @@ -11466,7 +11466,7 @@ voicegroup_845058C:: @ 845058C voice_square_1 0, 2, 0, 0, 15, 0 @ 84506F4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450700 voice_square_1 0, 2, 0, 0, 15, 0 @ 845070C - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 8450718 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 8450718 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450724 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450730 voice_square_1 0, 2, 0, 0, 15, 0 @ 845073C @@ -11506,7 +11506,7 @@ voicegroup_845058C:: @ 845058C voice_square_1 0, 2, 0, 0, 15, 0 @ 84508D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84508E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84508EC - voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165 @ 84508F8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Flute, 255, 0, 255, 165 @ 84508F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450904 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450910 voice_square_1 0, 2, 0, 0, 15, 0 @ 845091C @@ -11597,7 +11597,7 @@ voicegroup_8450B8C:: @ 8450B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450CF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D0C - voice_directsound 60, 0, DirectSoundWaveData_8483804, 255, 253, 0, 149 @ 8450D18 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingeredBass, 255, 253, 0, 149 @ 8450D18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D24 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D30 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D3C @@ -11610,7 +11610,7 @@ voicegroup_8450B8C:: @ 8450B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450DA8 - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 246, 0, 235 @ 8450DB4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8450DB4 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8450DC0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8450DCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8450DD8 @@ -11692,7 +11692,7 @@ voicegroup_8450FA0:: @ 8450FA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451144 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451150 voice_square_1 0, 2, 0, 0, 15, 0 @ 845115C - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 252, 0, 115 @ 8451168 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 252, 0, 115 @ 8451168 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451174 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451180 voice_square_1 0, 2, 0, 0, 15, 0 @ 845118C @@ -11774,7 +11774,7 @@ voicegroup_8451390:: @ 8451390 voice_square_1 0, 2, 0, 0, 15, 0 @ 84514F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451504 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451510 - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 235, 128, 99 @ 845151C + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 235, 128, 99 @ 845151C voice_square_1 0, 2, 0, 0, 15, 0 @ 8451528 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451534 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451540 @@ -11885,8 +11885,8 @@ voicegroup_8451990:: @ 8451990 voice_square_1_alt 0, 2, 2, 0, 15, 0 @ 8451A08 voice_square_1_alt 0, 1, 2, 0, 15, 0 @ 8451A14 voice_square_1_alt 23, 1, 0, 1, 9, 0 @ 8451A20 - voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 0, 255, 165 @ 8451A2C - voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 226, 0, 165 @ 8451A38 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 0, 255, 165 @ 8451A2C + voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 226, 0, 165 @ 8451A38 voice_square_1_alt 0, 2, 0, 6, 0, 1 @ 8451A44 voice_square_1_alt 36, 0, 0, 2, 0, 0 @ 8451A50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451A5C @@ -12012,21 +12012,21 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 255, 165 @ 8451FD8 voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 8451FE4 voice_directsound 60, 0, DirectSoundWaveData_848A8A4, 255, 0, 255, 165 @ 8451FF0 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 0, 255, 127 @ 8451FFC + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 0, 255, 127 @ 8451FFC voice_directsound 60, 0, DirectSoundWaveData_848C4A4, 255, 0, 255, 127 @ 8452008 voice_noise_alt 1, 0, 2, 0, 0 @ 8452014 voice_square_1 0x67, 3, 2, 7, 0, 0 @ 8452020 voice_square_2 3, 2, 7, 0, 0 @ 845202C - voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 226, 0, 127 @ 8452038 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 226, 0, 127 @ 8452038 voice_directsound 60, 0, DirectSoundWaveData_848E094, 255, 0, 255, 0 @ 8452044 - voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 204, 0, 127 @ 8452050 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 204, 0, 127 @ 8452050 voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 845205C voice_directsound 60, 0, DirectSoundWaveData_848F448, 255, 0, 255, 127 @ 8452068 - voice_directsound 60, 0, DirectSoundWaveData_8487330, 255, 0, 255, 127 @ 8452074 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 0, 255, 127 @ 8452074 voice_square_1 103, 0, 0, 7, 0, 0 @ 8452080 voice_directsound 60, 0, DirectSoundWaveData_845C238, 255, 0, 255, 127 @ 845208C voice_directsound 60, 0, DirectSoundWaveData_8491ACC, 255, 0, 255, 127 @ 8452098 - voice_directsound 60, 0, DirectSoundWaveData_8492D10, 255, 0, 255, 127 @ 84520A4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Bubble, 255, 0, 255, 127 @ 84520A4 voice_directsound 60, 0, DirectSoundWaveData_845B2B4, 255, 0, 255, 127 @ 84520B0 voice_noise_alt 0, 0, 7, 15, 1 @ 84520BC voice_directsound 60, 0, DirectSoundWaveData_8493D20, 255, 0, 255, 127 @ 84520C8 @@ -12037,41 +12037,41 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 0, 255, 127 @ 8452104 voice_square_1 103, 0, 0, 0, 15, 0 @ 8452110 voice_directsound_alt 60, 0, DirectSoundWaveData_8495028, 255, 0, 255, 127 @ 845211C - voice_directsound 60, 0, DirectSoundWaveData_84571CC, 255, 255, 255, 127 @ 8452128 - voice_directsound 60, 0, DirectSoundWaveData_8458CD0, 255, 0, 255, 127 @ 8452134 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 255, 255, 127 @ 8452128 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 0, 255, 127 @ 8452134 voice_directsound 60, 0, DirectSoundWaveData_8499110, 255, 0, 255, 127 @ 8452140 voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 242, 0, 0 @ 845214C voice_directsound 60, 0, DirectSoundWaveData_849B320, 255, 0, 255, 0 @ 8452158 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 165, 90, 216 @ 8452164 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8452164 voice_directsound 60, 0, DirectSoundWaveData_845DAF0, 255, 127, 0, 188 @ 8452170 voice_directsound 60, 0, DirectSoundWaveData_849D45C, 255, 249, 0, 165 @ 845217C voice_square_1 0, 0, 4, 6, 0, 0 @ 8452188 voice_directsound 60, 0, DirectSoundWaveData_8456330, 13, 0, 255, 127 @ 8452194 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 13, 0, 255, 127 @ 84521A0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 13, 0, 255, 127 @ 84521A0 voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 0, 255, 127 @ 84521AC - voice_directsound 60, 0, DirectSoundWaveData_84A26EC, 255, 252, 0, 204 @ 84521B8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 252, 0, 204 @ 84521B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84521C4 - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 235, 0, 204 @ 84521D0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 84521D0 voice_square_1 0, 0, 4, 0, 15, 0 @ 84521DC - voice_directsound 60, 0, DirectSoundWaveData_84A311C, 255, 188, 0, 0 @ 84521E8 - voice_directsound 60, 0, DirectSoundWaveData_849BAEC, 255, 226, 0, 127 @ 84521F4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 188, 0, 0 @ 84521E8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 226, 0, 127 @ 84521F4 voice_directsound 60, 0, DirectSoundWaveData_8460E60, 26, 0, 255, 127 @ 8452200 voice_square_1_alt 0, 2, 0, 1, 0, 0 @ 845220C voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 252, 0, 127 @ 8452218 voice_square_1_alt 0, 1, 0, 2, 0, 0 @ 8452224 - voice_directsound 60, 0, DirectSoundWaveData_848BD68, 255, 127, 0, 127 @ 8452230 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 127, 0, 127 @ 8452230 voice_noise_alt 0, 1, 6, 0, 0 @ 845223C - voice_directsound 60, 0, DirectSoundWaveData_8457D98, 255, 255, 255, 127 @ 8452248 + voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 255, 255, 127 @ 8452248 voice_directsound 60, 0, DirectSoundWaveData_845B9A8, 255, 255, 255, 127 @ 8452254 voice_directsound 60, 0, DirectSoundWaveData_84A3B50, 255, 255, 255, 127 @ 8452260 - voice_directsound 60, 0, DirectSoundWaveData_847CBAC, 11, 242, 0, 127 @ 845226C + voice_directsound 60, 0, DirectSoundWaveData_SC88_WideFrenchHorns, 11, 242, 0, 127 @ 845226C voice_square_1_alt 0, 2, 4, 6, 0, 0 @ 8452278 voice_directsound 60, 0, DirectSoundWaveData_84A5690, 255, 255, 255, 127 @ 8452284 - voice_directsound 60, 0, DirectSoundWaveData_84A5F58, 255, 0, 255, 165 @ 8452290 + voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165 @ 8452290 voice_directsound 60, 0, DirectSoundWaveData_845CAB0, 255, 0, 255, 165 @ 845229C voice_noise_alt 0, 5, 7, 15, 1 @ 84522A8 - voice_directsound 60, 0, DirectSoundWaveData_8487330, 128, 242, 0, 165 @ 84522B4 - voice_directsound 60, 0, DirectSoundWaveData_846A4B8, 255, 0, 255, 165 @ 84522C0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 128, 242, 0, 165 @ 84522B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusFlute, 255, 0, 255, 165 @ 84522C0 voice_square_1 0, 0, 1, 5, 0, 0 @ 84522CC voice_noise_alt 0, 6, 6, 0, 1 @ 84522D8 voice_noise_alt 0, 3, 6, 0, 1 @ 84522E4 @@ -13009,7 +13009,7 @@ voicegroup_8454C54:: @ 8454C54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8454D2C voice_square_1 0, 2, 0, 0, 15, 0 @ 8454D38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8454D44 - voice_directsound 60, 0, DirectSoundWaveData_8654C20, 255, 249, 25, 248 @ 8454D50 + voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordionFr_Copy, 255, 249, 25, 248 @ 8454D50 voice_square_1 0, 2, 0, 0, 15, 0 @ 8454D5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8454D68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8454D74 -- cgit v1.2.3 From 33d2d51906bbde1c62cee3470a9b3706571d551c Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 25 Jan 2018 21:33:46 -0600 Subject: decompile more debug functions --- src/battle/battle_2.c | 237 +++++++++++++------------------------------------ src/battle/battle_ai.c | 217 ++------------------------------------------ 2 files changed, 69 insertions(+), 385 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index f9756db29..e72a875fb 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -6,6 +6,7 @@ #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" +#include "gba/flash_internal.h" #include "battle.h" #include "battle_ai.h" #include "battle_interface.h" @@ -1500,6 +1501,17 @@ void debug_sub_80108B8(void) } } +// This function matches, but it somehow affects registers in SetActionsAndBanksTurnOrder. +#ifdef NONMATCHING +void debug_sub_8010A7C(u8 a, u8 b) +{ + s32 i; + + for (i = 0; i < b; i++) + gBattleTextBuff1[i] = a; + gBattleTextBuff1[i] = EOS; +} +#else __attribute__((naked)) void debug_sub_8010A7C() { @@ -1534,6 +1546,14 @@ void debug_sub_8010A7C() "\n" ); } +#endif + +/* +void debug_sub_8010AAC(u8 a) +{ + u32 r7 = gUnknown_Debug_030043A4 * 5; +} +*/ __attribute__((naked)) void debug_sub_8010AAC() @@ -3898,72 +3918,19 @@ void debug_sub_801174C() ); } -__attribute__((naked)) -void debug_sub_8011D40() +void debug_sub_8011D40(void) { - asm( - " push {lr}\n" - " ldr r1, ._774\n" - " ldr r0, ._774 + 4\n" - " str r0, [r1]\n" - " ldr r0, ._774 + 8\n" - " str r0, [r1, #0x4]\n" - " ldr r0, ._774 + 12\n" - " str r0, [r1, #0x8]\n" - " ldr r0, [r1, #0x8]\n" - " sub r1, r1, #0xc4\n" - " ldr r0, ._774 + 16\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._774 + 20\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._774 + 24\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._774 + 28\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._774 + 32\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._774 + 36\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._774 + 40\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " add r1, r1, #0x2\n" - " ldr r0, ._774 + 44\n" - " ldrh r0, [r0]\n" - " strh r0, [r1]\n" - " bl LoadOam\n" - " bl ProcessSpriteCopyRequests\n" - " pop {r0}\n" - " bx r0\n" - "._775:\n" - " .align 2, 0\n" - "._774:\n" - " .word 0x40000d4\n" - " .word gSharedMem\n" - " .word 0x6004000\n" - " .word 0x80000800\n" - " .word gBattle_BG0_X\n" - " .word gBattle_BG0_Y\n" - " .word gBattle_BG1_X\n" - " .word gBattle_BG1_Y\n" - " .word gBattle_BG2_X\n" - " .word gBattle_BG2_Y\n" - " .word gBattle_BG3_X\n" - " .word gBattle_BG3_Y\n" - "\n" - ); + DmaCopy16(3, gSharedMem, (void *)(VRAM + 0x4000), 0x1000); + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; + REG_BG1HOFS = gBattle_BG1_X; + REG_BG1VOFS = gBattle_BG1_Y; + REG_BG2HOFS = gBattle_BG2_X; + REG_BG2VOFS = gBattle_BG2_Y; + REG_BG3HOFS = gBattle_BG3_X; + REG_BG3VOFS = gBattle_BG3_Y; + LoadOam(); + ProcessSpriteCopyRequests(); } void debug_nullsub_45() @@ -6517,125 +6484,45 @@ void debug_sub_8012D10() ); } -__attribute__((naked)) -void debug_sub_8013240() +u8 debug_sub_8013240(void) { - asm( - " push {lr}\n" - " bl IdentifyFlash\n" - " lsl r0, r0, #0x10\n" - " cmp r0, #0\n" - " beq ._1068 @cond_branch\n" - " mov r0, #0x1\n" - " b ._1069\n" - "._1068:\n" - " mov r0, #0x0\n" - "._1069:\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + if (IdentifyFlash() == 0) + return 0; + else + return 1; } -__attribute__((naked)) -void debug_sub_8013258() +u32 debug_sub_8013258(u16 sectorNum, u8 *data, u32 size) { - asm( - " push {r4, r5, r6, lr}\n" - " add r6, r1, #0\n" - " add r5, r2, #0\n" - " b ._1070\n" - "._1072:\n" - " ldr r0, ._1074\n" - " add r5, r5, r0\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x5\n" - " add r6, r6, r0\n" - " add r0, r4, #1\n" - "._1070:\n" - " lsl r0, r0, #0x10\n" - " lsr r4, r0, #0x10\n" - " add r0, r4, #0\n" - " add r1, r6, #0\n" - " bl ProgramFlashSectorAndVerify\n" - " cmp r0, #0\n" - " bne ._1071 @cond_branch\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x5\n" - " cmp r5, r0\n" - " bhi ._1072 @cond_branch\n" - " mov r0, #0x1\n" - " b ._1073\n" - "._1075:\n" - " .align 2, 0\n" - "._1074:\n" - " .word 0xfffff000\n" - "._1071:\n" - " mov r0, #0x0\n" - "._1073:\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + while (1) + { + if (ProgramFlashSectorAndVerify(sectorNum, data) != 0) + return 0; + if (size <= 0x1000) + break; + size -= 0x1000; + data += 0x1000; + sectorNum++; + } + return 1; } -__attribute__((naked)) -void debug_sub_8013294() +u32 debug_sub_8013294(u8 sectorNum, void *data, u32 size) { - asm( - " push {r4, r5, r6, lr}\n" - " add r5, r1, #0\n" - " add r6, r2, #0\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " bl debug_sub_8013240\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._1076 @cond_branch\n" - " bl m4aSoundVSyncOff\n" - " add r0, r4, #0\n" - " add r1, r5, #0\n" - " add r2, r6, #0\n" - " bl debug_sub_8013258\n" - " add r4, r0, #0\n" - " bl m4aSoundVSyncOn\n" - " add r0, r4, #0\n" - " b ._1077\n" - "._1076:\n" - " mov r0, #0x0\n" - "._1077:\n" - " pop {r4, r5, r6}\n" - " pop {r1}\n" - " bx r1\n" - "\n" - ); + u32 result; + + if (debug_sub_8013240() != 0) + return 0; + m4aSoundVSyncOff(); + result = debug_sub_8013258(sectorNum, data, size); + m4aSoundVSyncOn(); + return result; } -__attribute__((naked)) -void debug_sub_80132C8() +void debug_sub_80132C8(u8 a, void *b, u32 c) { - asm( - " push {r4, r5, r6, lr}\n" - " add r5, r1, #0\n" - " add r6, r2, #0\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " bl debug_sub_8013240\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._1078 @cond_branch\n" - " add r0, r4, #0\n" - " mov r1, #0x0\n" - " add r2, r5, #0\n" - " add r3, r6, #0\n" - " bl ReadFlash\n" - "._1078:\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); + if (debug_sub_8013240() == 0) + ReadFlash(a, 0, b, c); } #endif @@ -10146,7 +10033,7 @@ void SetActionsAndBanksTurnOrder(void) // And doing this seems to fix it. #if DEBUG asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm(""); - asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm(""); + asm("");asm("");asm("");asm("");asm("");asm("");asm(""); #endif gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; eFocusPunchBank = 0; diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c index 87a66c2c7..629a57d25 100644 --- a/src/battle/battle_ai.c +++ b/src/battle/battle_ai.c @@ -13,6 +13,8 @@ #include "util.h" #include "ewram.h" +extern u8 gUnknown_02023A14_50; +extern u32 gUnknown_02023A14_4C; extern u16 gBattleTypeFlags; extern u16 gBattleWeather; extern u8 gActiveBank; @@ -289,214 +291,6 @@ void BattleAI_HandleItemUseBeforeAISetup(void) BattleAI_SetupAIData(); } -#if DEBUG -__attribute__((naked)) -void BattleAI_SetupAIData() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " ldr r2, ._16\n" - " mov r4, #0x0\n" - " ldr r3, ._16 + 4\n" - " mov r1, #0x0\n" - "._9:\n" - " add r0, r2, r4\n" - " strb r1, [r0]\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x1b\n" - " bls ._9 @cond_branch\n" - " ldr r0, ._16\n" - " mov r1, #0x64\n" - " mov r4, #0x3\n" - " add r0, r0, #0x7\n" - "._10:\n" - " strb r1, [r0]\n" - " sub r0, r0, #0x1\n" - " sub r4, r4, #0x1\n" - " cmp r4, #0\n" - " bge ._10 @cond_branch\n" - " ldrb r0, [r3]\n" - " mov r1, #0x0\n" - " mov r2, #0xff\n" - " bl CheckMoveLimitations\n" - " lsl r0, r0, #0x18\n" - " lsr r7, r0, #0x18\n" - " mov r4, #0x0\n" - " ldr r0, ._16\n" - " add r5, r0, #4\n" - " ldr r6, ._16 + 8\n" - "._12:\n" - " ldr r0, [r6]\n" - " and r0, r0, r7\n" - " cmp r0, #0\n" - " beq ._11 @cond_branch\n" - " mov r0, #0x0\n" - " strb r0, [r5]\n" - "._11:\n" - " bl Random\n" - " lsl r0, r0, #0x10\n" - " lsr r0, r0, #0x10\n" - " mov r1, #0xf\n" - " and r0, r0, r1\n" - " mov r1, #0x64\n" - " sub r1, r1, r0\n" - " strb r1, [r5, #0x14]\n" - " add r5, r5, #0x1\n" - " add r6, r6, #0x4\n" - " add r4, r4, #0x1\n" - " cmp r4, #0x3\n" - " ble ._12 @cond_branch\n" - " ldr r0, ._16 + 12\n" - " add r0, r0, #0x20\n" - " mov r1, #0x0\n" - " strb r1, [r0]\n" - " ldr r1, ._16 + 16\n" - " ldr r0, ._16 + 4\n" - " ldrb r2, [r0]\n" - " strb r2, [r1]\n" - " ldr r0, ._16 + 20\n" - " ldrh r1, [r0]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._13 @cond_branch\n" - " ldr r4, ._16 + 24\n" - " bl Random\n" - " mov r5, #0x2\n" - " and r0, r0, r5\n" - " strb r0, [r4]\n" - " ldr r0, ._16 + 28\n" - " ldrb r1, [r0]\n" - " ldr r2, ._16 + 8\n" - " ldrb r3, [r4]\n" - " lsl r0, r3, #0x2\n" - " add r0, r0, r2\n" - " ldr r0, [r0]\n" - " and r1, r1, r0\n" - " cmp r1, #0\n" - " beq ._15 @cond_branch\n" - " eor r3, r3, r5\n" - " strb r3, [r4]\n" - " b ._15\n" - "._17:\n" - " .align 2, 0\n" - "._16:\n" - " .word gSharedMem+0x16800\n" - " .word gActiveBank\n" - " .word gBitTable\n" - " .word +0x2016c00\n" - " .word gBankAttacker\n" - " .word gBattleTypeFlags\n" - " .word gBankTarget\n" - " .word gAbsentBankFlags\n" - "._13:\n" - " ldr r0, ._20\n" - " mov r1, #0x1\n" - " eor r1, r1, r2\n" - " strb r1, [r0]\n" - "._15:\n" - " ldr r0, ._20 + 4\n" - " ldrh r1, [r0]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._18 @cond_branch\n" - " ldr r1, ._20 + 8\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x17\n" - " b ._27\n" - "._21:\n" - " .align 2, 0\n" - "._20:\n" - " .word gBankTarget\n" - " .word gBattleTypeFlags\n" - " .word gSharedMem+0x16800\n" - "._18:\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x3\n" - " add r0, r2, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._22 @cond_branch\n" - " ldr r1, ._24\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x16\n" - " b ._27\n" - "._25:\n" - " .align 2, 0\n" - "._24:\n" - " .word gSharedMem+0x16800\n" - "._22:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._26 @cond_branch\n" - " ldr r1, ._28\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x18\n" - " b ._27\n" - "._29:\n" - " .align 2, 0\n" - "._28:\n" - " .word gSharedMem+0x16800\n" - "._26:\n" - " mov r0, #0x90\n" - " lsl r0, r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._30 @cond_branch\n" - " ldr r1, ._33\n" - " ldrh r0, [r1]\n" - " cmp r0, r2\n" - " bne ._31 @cond_branch\n" - "._30:\n" - " ldr r1, ._33 + 4\n" - " mov r0, #0x7\n" - "._27:\n" - " str r0, [r1, #0xc]\n" - " add r3, r1, #0\n" - " b ._32\n" - "._34:\n" - " .align 2, 0\n" - "._33:\n" - " .word gTrainerBattleOpponent\n" - " .word gSharedMem+0x16800\n" - "._31:\n" - " ldr r3, ._36\n" - " ldr r2, ._36 + 4\n" - " ldrh r1, [r1]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x3\n" - " add r2, r2, #0x1c\n" - " add r0, r0, r2\n" - " ldr r0, [r0]\n" - " str r0, [r3, #0xc]\n" - "._32:\n" - " ldr r0, ._36 + 8\n" - " ldrb r1, [r0]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._35 @cond_branch\n" - " ldr r0, ._36 + 12\n" - " ldr r0, [r0]\n" - " str r0, [r3, #0xc]\n" - "._35:\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._37:\n" - " .align 2, 0\n" - "._36:\n" - " .word gSharedMem+0x16800\n" - " .word gTrainers\n" - " .word gUnknown_02023A14_50\n" - " .word gUnknown_02023A14_4C\n" - "\n" - ); -} -#else void BattleAI_SetupAIData(void) { s32 i; @@ -544,13 +338,16 @@ void BattleAI_SetupAIData(void) else if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) AI_THINKING_STRUCT->aiFlags = 0x80000000; #ifdef GERMAN - else if (gBattleTypeFlags & 0x900 || gTrainerBattleOpponent == 0x400) + else if (gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER) || gTrainerBattleOpponent == 0x400) AI_THINKING_STRUCT->aiFlags = 7; #endif else // otherwise, just set aiFlags to whatever flags the trainer has set in their data. AI_THINKING_STRUCT->aiFlags = gTrainers[gTrainerBattleOpponent].aiFlags; -} +#if DEBUG + if (gUnknown_02023A14_50 & 1) + AI_THINKING_STRUCT->aiFlags = gUnknown_02023A14_4C; #endif +} u8 BattleAI_GetAIActionToUse(void) { -- cgit v1.2.3 From 184c058581d2fda7a560dcb399d511890b69b25d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 26 Jan 2018 22:00:14 -0800 Subject: 3 sc88 noises --- sound/direct_sound_data.inc | 12 ++++++------ sound/direct_sound_samples/849D45C.aif | Bin 8207 -> 0 bytes sound/direct_sound_samples/84A3B50.aif | Bin 7071 -> 0 bytes sound/direct_sound_samples/sc88/123_pink_noise.aif | Bin 0 -> 8207 bytes sound/direct_sound_samples/sc88/123_white_noise.aif | Bin 0 -> 7071 bytes sound/direct_sound_samples/sc88/37_unison_slap.aif | Bin 0 -> 3052 bytes sound/direct_sound_samples/sc88/8466388.aif | Bin 3052 -> 0 bytes 7 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 sound/direct_sound_samples/849D45C.aif delete mode 100644 sound/direct_sound_samples/84A3B50.aif create mode 100644 sound/direct_sound_samples/sc88/123_pink_noise.aif create mode 100644 sound/direct_sound_samples/sc88/123_white_noise.aif create mode 100644 sound/direct_sound_samples/sc88/37_unison_slap.aif delete mode 100644 sound/direct_sound_samples/sc88/8466388.aif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 180a2e0a7..f6177dd21 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -87,8 +87,8 @@ DirectSoundWaveData_SC88_Piano2:: @ 8464E2C .incbin "sound/direct_sound_samples/sc88/2_piano_2.bin" .align 2 -DirectSoundWaveData_8466388:: @ 8466388 - .incbin "sound/direct_sound_samples/sc88/8466388.bin" +DirectSoundWaveData_SC88_UnisonSlap:: @ 8466388 + .incbin "sound/direct_sound_samples/sc88/37_unison_slap.bin" .align 2 DirectSoundWaveData_SC88_Strings:: @ 8466F14 @@ -211,8 +211,8 @@ DirectSoundWaveData_SC88_TubularBell:: @ 849BAEC .incbin "sound/direct_sound_samples/sc88/15_tubular_bell.bin" .align 2 -DirectSoundWaveData_849D45C:: @ 849D45C - .incbin "sound/direct_sound_samples/849D45C.bin" +DirectSoundWaveData_SC88_PinkNoise:: @ 849D45C + .incbin "sound/direct_sound_samples/sc88/123_pink_noise.bin" .align 2 DirectSoundWaveData_849F40C:: @ 849F40C @@ -227,8 +227,8 @@ DirectSoundWaveData_SC88_Marimba:: @ 84A311C .incbin "sound/direct_sound_samples/sc88/13_marimba.bin" .align 2 -DirectSoundWaveData_84A3B50:: @ 84A3B50 - .incbin "sound/direct_sound_samples/84A3B50.bin" +DirectSoundWaveData_SC88_WhiteNoise:: @ 84A3B50 + .incbin "sound/direct_sound_samples/sc88/123_white_noise.bin" .align 2 DirectSoundWaveData_84A5690:: @ 84A5690 diff --git a/sound/direct_sound_samples/849D45C.aif b/sound/direct_sound_samples/849D45C.aif deleted file mode 100644 index ebd46eeaa..000000000 Binary files a/sound/direct_sound_samples/849D45C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A3B50.aif b/sound/direct_sound_samples/84A3B50.aif deleted file mode 100644 index 6a11945c5..000000000 Binary files a/sound/direct_sound_samples/84A3B50.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/123_pink_noise.aif b/sound/direct_sound_samples/sc88/123_pink_noise.aif new file mode 100644 index 000000000..ebd46eeaa Binary files /dev/null and b/sound/direct_sound_samples/sc88/123_pink_noise.aif differ diff --git a/sound/direct_sound_samples/sc88/123_white_noise.aif b/sound/direct_sound_samples/sc88/123_white_noise.aif new file mode 100644 index 000000000..6a11945c5 Binary files /dev/null and b/sound/direct_sound_samples/sc88/123_white_noise.aif differ diff --git a/sound/direct_sound_samples/sc88/37_unison_slap.aif b/sound/direct_sound_samples/sc88/37_unison_slap.aif new file mode 100644 index 000000000..a7c4e94f8 Binary files /dev/null and b/sound/direct_sound_samples/sc88/37_unison_slap.aif differ diff --git a/sound/direct_sound_samples/sc88/8466388.aif b/sound/direct_sound_samples/sc88/8466388.aif deleted file mode 100644 index a7c4e94f8..000000000 Binary files a/sound/direct_sound_samples/sc88/8466388.aif and /dev/null differ -- cgit v1.2.3 From e8bddb83db39e4352fd2f44d21e761de1174451d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 26 Jan 2018 22:10:05 -0800 Subject: fix build --- src/battle/anim/guard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index 01cf07e39..254160109 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle.h" #include "battle_anim.h" #include "rom_8077ABC.h" -- cgit v1.2.3 From 4cc64443dfbb4b07277c31f309c54b39a8332855 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 27 Jan 2018 13:10:41 -0800 Subject: Label sc88 drumkit samples --- sound/direct_sound_data.inc | 68 +++---- sound/direct_sound_samples/8459944.aif | Bin 5424 -> 0 bytes sound/direct_sound_samples/845AE14.aif | Bin 1249 -> 0 bytes sound/direct_sound_samples/845B2B4.aif | Bin 1844 -> 0 bytes sound/direct_sound_samples/845B9A8.aif | Bin 2258 -> 0 bytes sound/direct_sound_samples/845C238.aif | Bin 2231 -> 0 bytes sound/direct_sound_samples/845CAB0.aif | Bin 4256 -> 0 bytes sound/direct_sound_samples/845DAF0.aif | Bin 1107 -> 0 bytes sound/direct_sound_samples/845DF04.aif | Bin 3728 -> 0 bytes sound/direct_sound_samples/845FCC8.aif | Bin 2294 -> 0 bytes sound/direct_sound_samples/846057C.aif | Bin 2372 -> 0 bytes sound/direct_sound_samples/8460E60.aif | Bin 3979 -> 0 bytes sound/direct_sound_samples/8461D8C.aif | Bin 1370 -> 0 bytes sound/direct_sound_samples/84622A4.aif | Bin 1546 -> 0 bytes sound/direct_sound_samples/8485454.aif | Bin 5424 -> 0 bytes sound/direct_sound_samples/8486924.aif | Bin 2669 -> 0 bytes sound/direct_sound_samples/848A8A4.aif | Bin 5382 -> 0 bytes sound/direct_sound_samples/849B320.aif | Bin 2093 -> 0 bytes .../sc88/drumkit_bass_drum.aif | Bin 0 -> 1249 bytes sound/direct_sound_samples/sc88/drumkit_cabasa.aif | Bin 0 -> 2294 bytes .../sc88/drumkit_closed_hi_hat.aif | Bin 0 -> 1107 bytes .../sc88/drumkit_crash_cymbal_1.aif | Bin 0 -> 3979 bytes .../sc88/drumkit_crash_cymbal_2.aif | Bin 0 -> 2372 bytes sound/direct_sound_samples/sc88/drumkit_guiro.aif | Bin 0 -> 2093 bytes .../sc88/drumkit_hand_clap.aif | Bin 0 -> 2258 bytes .../sc88/drumkit_hi_mid_tom.aif | Bin 0 -> 4256 bytes .../sc88/drumkit_low_conga.aif | Bin 0 -> 1546 bytes .../sc88/drumkit_mute_hi_conga.aif | Bin 0 -> 1370 bytes .../sc88/drumkit_open_hi_hat.aif | Bin 0 -> 3728 bytes .../direct_sound_samples/sc88/drumkit_snare_1.aif | Bin 0 -> 1844 bytes .../direct_sound_samples/sc88/drumkit_snare_2.aif | Bin 0 -> 2231 bytes .../direct_sound_samples/sc88/drumkit_snare_3.aif | Bin 0 -> 5382 bytes .../direct_sound_samples/sc88/drumkit_snare_4.aif | Bin 0 -> 2669 bytes .../sc88/drumkit_timbale_1.aif | Bin 0 -> 5424 bytes .../sc88/drumkit_timbale_2.aif | Bin 0 -> 5424 bytes sound/voice_groups.inc | 210 ++++++++++----------- 36 files changed, 139 insertions(+), 139 deletions(-) delete mode 100644 sound/direct_sound_samples/8459944.aif delete mode 100644 sound/direct_sound_samples/845AE14.aif delete mode 100644 sound/direct_sound_samples/845B2B4.aif delete mode 100644 sound/direct_sound_samples/845B9A8.aif delete mode 100644 sound/direct_sound_samples/845C238.aif delete mode 100644 sound/direct_sound_samples/845CAB0.aif delete mode 100644 sound/direct_sound_samples/845DAF0.aif delete mode 100644 sound/direct_sound_samples/845DF04.aif delete mode 100644 sound/direct_sound_samples/845FCC8.aif delete mode 100644 sound/direct_sound_samples/846057C.aif delete mode 100644 sound/direct_sound_samples/8460E60.aif delete mode 100644 sound/direct_sound_samples/8461D8C.aif delete mode 100644 sound/direct_sound_samples/84622A4.aif delete mode 100644 sound/direct_sound_samples/8485454.aif delete mode 100644 sound/direct_sound_samples/8486924.aif delete mode 100644 sound/direct_sound_samples/848A8A4.aif delete mode 100644 sound/direct_sound_samples/849B320.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_bass_drum.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_cabasa.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_guiro.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_hand_clap.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_low_conga.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_1.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_2.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_3.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_4.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_timbale_1.aif create mode 100644 sound/direct_sound_samples/sc88/drumkit_timbale_2.aif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index f6177dd21..1d56162e5 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -19,60 +19,60 @@ DirectSoundWaveData_SC88_SynthBass1:: @ 8458CD0 .incbin "sound/direct_sound_samples/sc88/39_synth_bass_1.bin" .align 2 -DirectSoundWaveData_8459944:: @ 8459944 - .incbin "sound/direct_sound_samples/8459944.bin" +DirectSoundWaveData_SC88_DrumKitTimbale2:: @ 8459944 + .incbin "sound/direct_sound_samples/sc88/drumkit_timbale_2.bin" .align 2 -DirectSoundWaveData_845AE14:: @ 845AE14 - .incbin "sound/direct_sound_samples/845AE14.bin" +DirectSoundWaveData_SC88_DrumKitBassDrum:: @ 845AE14 + .incbin "sound/direct_sound_samples/sc88/drumkit_bass_drum.bin" .align 2 -DirectSoundWaveData_845B2B4:: @ 845B2B4 - .incbin "sound/direct_sound_samples/845B2B4.bin" +DirectSoundWaveData_SC88_DrumKitSnare1:: @ 845B2B4 + .incbin "sound/direct_sound_samples/sc88/drumkit_snare_1.bin" .align 2 -DirectSoundWaveData_845B9A8:: @ 845B9A8 - .incbin "sound/direct_sound_samples/845B9A8.bin" +DirectSoundWaveData_SC88_DrumKitHandClap:: @ 845B9A8 + .incbin "sound/direct_sound_samples/sc88/drumkit_hand_clap.bin" .align 2 -DirectSoundWaveData_845C238:: @ 845C238 - .incbin "sound/direct_sound_samples/845C238.bin" +DirectSoundWaveData_SC88_DrumKitSnare2:: @ 845C238 + .incbin "sound/direct_sound_samples/sc88/drumkit_snare_2.bin" .align 2 -DirectSoundWaveData_845CAB0:: @ 845CAB0 - .incbin "sound/direct_sound_samples/845CAB0.bin" +DirectSoundWaveData_SC88_DrumKitHiMidTom:: @ 845CAB0 + .incbin "sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.bin" .align 2 -DirectSoundWaveData_845DAF0:: @ 845DAF0 - .incbin "sound/direct_sound_samples/845DAF0.bin" +DirectSoundWaveData_SC88_DrumKitClosedHiHat:: @ 845DAF0 + .incbin "sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.bin" .align 2 -DirectSoundWaveData_845DF04:: @ 845DF04 - .incbin "sound/direct_sound_samples/845DF04.bin" +DirectSoundWaveData_SC88_DrumKitOpenHiHat:: @ 845DF04 + .incbin "sound/direct_sound_samples/sc88/drumkit_open_hi_hat.bin" .align 2 DirectSoundWaveData_845ED34:: @ 845ED34 .incbin "sound/direct_sound_samples/845ED34.bin" .align 2 -DirectSoundWaveData_845FCC8:: @ 845FCC8 - .incbin "sound/direct_sound_samples/845FCC8.bin" +DirectSoundWaveData_SC88_DrumKitCabasa:: @ 845FCC8 + .incbin "sound/direct_sound_samples/sc88/drumkit_cabasa.bin" .align 2 -DirectSoundWaveData_846057C:: @ 846057C - .incbin "sound/direct_sound_samples/846057C.bin" +DirectSoundWaveData_SC88_DrumKitCrashCymbal2:: @ 846057C + .incbin "sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.bin" .align 2 -DirectSoundWaveData_8460E60:: @ 8460E60 - .incbin "sound/direct_sound_samples/8460E60.bin" +DirectSoundWaveData_SC88_DrumKitCrashCymbal1:: @ 8460E60 + .incbin "sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.bin" .align 2 -DirectSoundWaveData_8461D8C:: @ 8461D8C - .incbin "sound/direct_sound_samples/8461D8C.bin" +DirectSoundWaveData_SC88_DrumKitMuteHiConga:: @ 8461D8C + .incbin "sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.bin" .align 2 -DirectSoundWaveData_84622A4:: @ 84622A4 - .incbin "sound/direct_sound_samples/84622A4.bin" +DirectSoundWaveData_SC88_DrumKitLowConga:: @ 84622A4 + .incbin "sound/direct_sound_samples/sc88/drumkit_low_conga.bin" .align 2 DirectSoundWaveData_SC88_SteelStringGuitar:: @ 846286C @@ -143,12 +143,12 @@ DirectSoundWaveData_SC88_FingeredBass:: @ 8483804 .incbin "sound/direct_sound_samples/sc88/34_fingered_bass.bin" .align 2 -DirectSoundWaveData_8485454:: @ 8485454 - .incbin "sound/direct_sound_samples/8485454.bin" +DirectSoundWaveData_SC88_DrumKitTimbale1:: @ 8485454 + .incbin "sound/direct_sound_samples/sc88/drumkit_timbale_1.bin" .align 2 -DirectSoundWaveData_8486924:: @ 8486924 - .incbin "sound/direct_sound_samples/8486924.bin" +DirectSoundWaveData_SC88_DrumKitSnare4:: @ 8486924 + .incbin "sound/direct_sound_samples/sc88/drumkit_snare_4.bin" .align 2 DirectSoundWaveData_SC88_SquareWave:: @ 8487330 @@ -159,8 +159,8 @@ DirectSoundWaveData_8488F44:: @ 8488F44 .incbin "sound/direct_sound_samples/8488F44.bin" .align 2 -DirectSoundWaveData_848A8A4:: @ 848A8A4 - .incbin "sound/direct_sound_samples/848A8A4.bin" +DirectSoundWaveData_SC88_DrumKitSnare3:: @ 848A8A4 + .incbin "sound/direct_sound_samples/sc88/drumkit_snare_3.bin" .align 2 DirectSoundWaveData_SC88_PizzicatoStrings:: @ 848BD68 @@ -203,8 +203,8 @@ DirectSoundWaveData_8499110:: @ 8499110 .incbin "sound/direct_sound_samples/8499110.bin" .align 2 -DirectSoundWaveData_849B320:: @ 849B320 - .incbin "sound/direct_sound_samples/849B320.bin" +DirectSoundWaveData_SC88_DrumkitGuiro:: @ 849B320 + .incbin "sound/direct_sound_samples/sc88/drumkit_guiro.bin" .align 2 DirectSoundWaveData_SC88_TubularBell:: @ 849BAEC diff --git a/sound/direct_sound_samples/8459944.aif b/sound/direct_sound_samples/8459944.aif deleted file mode 100644 index dfdfd702e..000000000 Binary files a/sound/direct_sound_samples/8459944.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845AE14.aif b/sound/direct_sound_samples/845AE14.aif deleted file mode 100644 index 9c504e3d0..000000000 Binary files a/sound/direct_sound_samples/845AE14.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845B2B4.aif b/sound/direct_sound_samples/845B2B4.aif deleted file mode 100644 index 544b187d5..000000000 Binary files a/sound/direct_sound_samples/845B2B4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845B9A8.aif b/sound/direct_sound_samples/845B9A8.aif deleted file mode 100644 index b11787ffc..000000000 Binary files a/sound/direct_sound_samples/845B9A8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845C238.aif b/sound/direct_sound_samples/845C238.aif deleted file mode 100644 index 36b640758..000000000 Binary files a/sound/direct_sound_samples/845C238.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845CAB0.aif b/sound/direct_sound_samples/845CAB0.aif deleted file mode 100644 index 04f990b13..000000000 Binary files a/sound/direct_sound_samples/845CAB0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845DAF0.aif b/sound/direct_sound_samples/845DAF0.aif deleted file mode 100644 index 8747aef28..000000000 Binary files a/sound/direct_sound_samples/845DAF0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845DF04.aif b/sound/direct_sound_samples/845DF04.aif deleted file mode 100644 index 5ad9410d0..000000000 Binary files a/sound/direct_sound_samples/845DF04.aif and /dev/null differ diff --git a/sound/direct_sound_samples/845FCC8.aif b/sound/direct_sound_samples/845FCC8.aif deleted file mode 100644 index 39ec57d29..000000000 Binary files a/sound/direct_sound_samples/845FCC8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/846057C.aif b/sound/direct_sound_samples/846057C.aif deleted file mode 100644 index 4aec6882f..000000000 Binary files a/sound/direct_sound_samples/846057C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8460E60.aif b/sound/direct_sound_samples/8460E60.aif deleted file mode 100644 index 576e3e19e..000000000 Binary files a/sound/direct_sound_samples/8460E60.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8461D8C.aif b/sound/direct_sound_samples/8461D8C.aif deleted file mode 100644 index 2e1bf9c64..000000000 Binary files a/sound/direct_sound_samples/8461D8C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84622A4.aif b/sound/direct_sound_samples/84622A4.aif deleted file mode 100644 index 8e1cb620a..000000000 Binary files a/sound/direct_sound_samples/84622A4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8485454.aif b/sound/direct_sound_samples/8485454.aif deleted file mode 100644 index 7270872d6..000000000 Binary files a/sound/direct_sound_samples/8485454.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8486924.aif b/sound/direct_sound_samples/8486924.aif deleted file mode 100644 index b3122457d..000000000 Binary files a/sound/direct_sound_samples/8486924.aif and /dev/null differ diff --git a/sound/direct_sound_samples/848A8A4.aif b/sound/direct_sound_samples/848A8A4.aif deleted file mode 100644 index ee6ff45b7..000000000 Binary files a/sound/direct_sound_samples/848A8A4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/849B320.aif b/sound/direct_sound_samples/849B320.aif deleted file mode 100644 index dd80b1185..000000000 Binary files a/sound/direct_sound_samples/849B320.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif b/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif new file mode 100644 index 000000000..9c504e3d0 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_cabasa.aif b/sound/direct_sound_samples/sc88/drumkit_cabasa.aif new file mode 100644 index 000000000..39ec57d29 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_cabasa.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif b/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif new file mode 100644 index 000000000..8747aef28 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif b/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif new file mode 100644 index 000000000..576e3e19e Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif b/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif new file mode 100644 index 000000000..4aec6882f Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_guiro.aif b/sound/direct_sound_samples/sc88/drumkit_guiro.aif new file mode 100644 index 000000000..dd80b1185 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_guiro.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif b/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif new file mode 100644 index 000000000..b11787ffc Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif b/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif new file mode 100644 index 000000000..04f990b13 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_low_conga.aif b/sound/direct_sound_samples/sc88/drumkit_low_conga.aif new file mode 100644 index 000000000..8e1cb620a Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_low_conga.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif b/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif new file mode 100644 index 000000000..2e1bf9c64 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif b/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif new file mode 100644 index 000000000..5ad9410d0 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_1.aif b/sound/direct_sound_samples/sc88/drumkit_snare_1.aif new file mode 100644 index 000000000..544b187d5 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_snare_1.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_2.aif b/sound/direct_sound_samples/sc88/drumkit_snare_2.aif new file mode 100644 index 000000000..36b640758 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_snare_2.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_3.aif b/sound/direct_sound_samples/sc88/drumkit_snare_3.aif new file mode 100644 index 000000000..ee6ff45b7 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_snare_3.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_4.aif b/sound/direct_sound_samples/sc88/drumkit_snare_4.aif new file mode 100644 index 000000000..b3122457d Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_snare_4.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif b/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif new file mode 100644 index 000000000..7270872d6 Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif differ diff --git a/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif b/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif new file mode 100644 index 000000000..dfdfd702e Binary files /dev/null and b/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif differ diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index 329ab3580..926e5ef7a 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -47,7 +47,7 @@ voicegroup_pokemon_cry:: @ 842FC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FE98 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FEA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FEB0 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239 @ 842FEBC + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239 @ 842FEBC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 842FEC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FED4 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FEE0 @@ -91,42 +91,42 @@ voicegroup_842FEF8:: @ 842FEF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430084 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430090 voice_square_1 0, 0, 0, 1, 6, 0 @ 843009C - voice_directsound_no_resample 60, 0x40, DirectSoundWaveData_845AE14, 255, 0, 255, 242 @ 84300A8 + voice_directsound_no_resample 60, 0x40, DirectSoundWaveData_SC88_DrumKitBassDrum, 255, 0, 255, 242 @ 84300A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84300B4 - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B2B4, 255, 0, 255, 242 @ 84300C0 - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B9A8, 255, 255, 255, 127 @ 84300CC - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242 @ 84300D8 - voice_directsound 48, 172, DirectSoundWaveData_845CAB0, 255, 210, 77, 204 @ 84300E4 - voice_directsound_no_resample 60, 207, DirectSoundWaveData_845DAF0, 255, 127, 0, 188 @ 84300F0 - voice_directsound 51, 0x31, DirectSoundWaveData_845CAB0, 255, 216, 77, 204 @ 84300FC + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 242 @ 84300C0 + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127 @ 84300CC + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242 @ 84300D8 + voice_directsound 48, 172, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 210, 77, 204 @ 84300E4 + voice_directsound_no_resample 60, 207, DirectSoundWaveData_SC88_DrumKitClosedHiHat, 255, 127, 0, 188 @ 84300F0 + voice_directsound 51, 0x31, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 216, 77, 204 @ 84300FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430108 - voice_directsound 54, 187, DirectSoundWaveData_845CAB0, 255, 216, 77, 204 @ 8430114 - voice_directsound_no_resample 60, 207, DirectSoundWaveData_845DF04, 255, 242, 141, 0 @ 8430120 - voice_directsound 57, 197, DirectSoundWaveData_845CAB0, 255, 210, 77, 204 @ 843012C - voice_directsound 60, 207, DirectSoundWaveData_845CAB0, 255, 204, 77, 204 @ 8430138 + voice_directsound 54, 187, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 216, 77, 204 @ 8430114 + voice_directsound_no_resample 60, 207, DirectSoundWaveData_SC88_DrumKitOpenHiHat, 255, 242, 141, 0 @ 8430120 + voice_directsound 57, 197, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 210, 77, 204 @ 843012C + voice_directsound 60, 207, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 204, 77, 204 @ 8430138 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430144 - voice_directsound 62, 212, DirectSoundWaveData_845CAB0, 255, 204, 77, 204 @ 8430150 + voice_directsound 62, 212, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 204, 77, 204 @ 8430150 voice_square_1 0, 2, 0, 0, 15, 0 @ 843015C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430168 voice_directsound_no_resample 70, 177, DirectSoundWaveData_845ED34, 255, 165, 103, 231 @ 8430174 - voice_directsound_no_resample 32, 162, DirectSoundWaveData_845FCC8, 255, 127, 77, 204 @ 8430180 - voice_directsound_no_resample 60, 142, DirectSoundWaveData_846057C, 255, 235, 0, 165 @ 843018C + voice_directsound_no_resample 32, 162, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204 @ 8430180 + voice_directsound_no_resample 60, 142, DirectSoundWaveData_SC88_DrumKitCrashCymbal2, 255, 235, 0, 165 @ 843018C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430198 - voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 255, 246, 0, 216 @ 84301A4 + voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216 @ 84301A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84301B0 - voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 255, 246, 0, 216 @ 84301BC - voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 8, 0, 255, 216 @ 84301C8 + voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216 @ 84301BC + voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 8, 0, 255, 216 @ 84301C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84301D4 - voice_directsound_no_resample 72, 232, DirectSoundWaveData_8461D8C, 255, 0, 255, 0 @ 84301E0 + voice_directsound_no_resample 72, 232, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0 @ 84301E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84301EC - voice_directsound_no_resample 72, 222, DirectSoundWaveData_84622A4, 255, 0, 255, 0 @ 84301F8 + voice_directsound_no_resample 72, 222, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 @ 84301F8 .align 2 voicegroup_8430204:: @ 8430204 voice_directsound 60, 0, DirectSoundWaveData_SC88_SteelStringGuitar, 255, 252, 0, 239 @ 8430204 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano3, 255, 250, 0, 221 @ 8430210 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano2, 255, 250, 0, 221 @ 843021C - voice_directsound 60, 0, DirectSoundWaveData_8466388, 255, 247, 0, 221 @ 8430228 + voice_directsound 60, 0, DirectSoundWaveData_SC88_UnisonSlap, 255, 247, 0, 221 @ 8430228 .align 2 voicegroup_8430234:: @ 8430234 @@ -327,7 +327,7 @@ voicegroup_84308AC:: @ 84308AC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430ABC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430AC8 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 8430AD4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8430AE0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8430AE0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8430AEC voice_square_1 0, 2, 0, 0, 15, 0 @ 8430AF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8430B04 @@ -545,7 +545,7 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 @ 84314AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84314B8 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 84314C4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84314D0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 84314D0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84314DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84314E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84314F4 @@ -650,7 +650,7 @@ voicegroup_8431764:: @ 8431764 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431974 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431980 voice_square_1 0, 2, 0, 0, 15, 0 @ 843198C - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8431998 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8431998 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84319A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84319B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84319BC @@ -743,7 +743,7 @@ voicegroup_8431B9C:: @ 8431B9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DB8 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8431DC4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8431DD0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8431DD0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8431DDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431DF4 @@ -915,11 +915,11 @@ voicegroup_84323E8:: @ 84323E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432574 voice_noise_alt 0, 0, 2, 0, 2 @ 8432580 voice_noise_alt 0, 0, 1, 0, 1 @ 843258C - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845AE14, 255, 0, 255, 242 @ 8432598 + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitBassDrum, 255, 0, 255, 242 @ 8432598 voice_square_1 0, 2, 0, 0, 15, 0 @ 84325A4 - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B2B4, 255, 0, 255, 242 @ 84325B0 + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 242 @ 84325B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84325BC - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242 @ 84325C8 + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242 @ 84325C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84325D4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84325E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84325EC @@ -933,7 +933,7 @@ voicegroup_84323E8:: @ 84323E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843264C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432658 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432664 - voice_directsound_no_resample 32, 202, DirectSoundWaveData_845FCC8, 255, 127, 77, 204 @ 8432670 + voice_directsound_no_resample 32, 202, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204 @ 8432670 voice_square_1 0, 2, 0, 0, 15, 0 @ 843267C voice_square_1 0, 2, 0, 0, 15, 0 @ 8432688 voice_square_1 0, 2, 0, 0, 15, 0 @ 8432694 @@ -941,9 +941,9 @@ voicegroup_84323E8:: @ 84323E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84326AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84326B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84326C4 - voice_directsound_no_resample 72, 194, DirectSoundWaveData_8461D8C, 255, 0, 255, 0 @ 84326D0 + voice_directsound_no_resample 72, 194, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0 @ 84326D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84326DC - voice_directsound_no_resample 72, 190, DirectSoundWaveData_84622A4, 255, 0, 255, 0 @ 84326E8 + voice_directsound_no_resample 72, 190, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 @ 84326E8 .align 2 voicegroup_84326F4:: @ 84326F4 @@ -1397,7 +1397,7 @@ voicegroup_8433948:: @ 8433948 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433B58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433B64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433B70 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8433B7C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8433B7C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8433B88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433B94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433BA0 @@ -1440,11 +1440,11 @@ voicegroup_8433BAC:: @ 8433BAC voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 0 @ 8433D38 voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 1 @ 8433D44 voice_square_1_alt 0, 0, 0, 0, 7, 0 @ 8433D50 - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845AE14, 255, 0, 255, 242 @ 8433D5C + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitBassDrum, 255, 0, 255, 242 @ 8433D5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433D68 - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845B2B4, 255, 0, 255, 242 @ 8433D74 + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 242 @ 8433D74 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433D80 - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242 @ 8433D8C + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242 @ 8433D8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433D98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433DA4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433DB0 @@ -1458,7 +1458,7 @@ voicegroup_8433BAC:: @ 8433BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E10 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E28 - voice_directsound_no_resample 32, 162, DirectSoundWaveData_845FCC8, 255, 127, 77, 204 @ 8433E34 + voice_directsound_no_resample 32, 162, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204 @ 8433E34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E40 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E58 @@ -1466,9 +1466,9 @@ voicegroup_8433BAC:: @ 8433BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E70 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E7C voice_square_1 0, 2, 0, 0, 15, 0 @ 8433E88 - voice_directsound_no_resample 72, 195, DirectSoundWaveData_8461D8C, 255, 0, 255, 0 @ 8433E94 + voice_directsound_no_resample 72, 195, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0 @ 8433E94 voice_square_1 0, 2, 0, 0, 15, 0 @ 8433EA0 - voice_directsound_no_resample 72, 189, DirectSoundWaveData_84622A4, 255, 0, 255, 0 @ 8433EAC + voice_directsound_no_resample 72, 189, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 @ 8433EAC .align 2 voicegroup_8433EB8:: @ 8433EB8 @@ -1611,7 +1611,7 @@ voicegroup_84342E4:: @ 84342E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84344F4 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8434500 voice_square_1 0, 2, 0, 0, 15, 0 @ 843450C - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8434518 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8434518 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8434524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434530 voice_square_1 0, 2, 0, 0, 15, 0 @ 843453C @@ -1705,7 +1705,7 @@ voicegroup_8434728:: @ 8434728 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434938 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434944 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434950 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 843495C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 843495C voice_square_1 0, 2, 0, 0, 15, 0 @ 8434968 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434974 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434980 @@ -1792,7 +1792,7 @@ voicegroup_8434B18:: @ 8434B18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434D28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434D34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434D40 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8434D4C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8434D4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8434D58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434D64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8434D70 @@ -2097,7 +2097,7 @@ voicegroup_84358F8:: @ 84358F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435B08 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 8435B14 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435B20 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8435B2C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8435B2C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8435B38 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435B44 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435B50 @@ -2188,7 +2188,7 @@ voicegroup_8435D18:: @ 8435D18 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F34 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8435F40 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8435F4C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8435F4C voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F58 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F64 voice_square_1 0, 2, 0, 0, 15, 0 @ 8435F70 @@ -2239,7 +2239,7 @@ voicegroup_8435FAC:: @ 8435FAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8436168 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436174 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436180 - voice_directsound_no_resample 60, 192, DirectSoundWaveData_845C238, 255, 0, 255, 242 @ 843618C + voice_directsound_no_resample 60, 192, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 242 @ 843618C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436198 voice_square_1 0, 2, 0, 0, 15, 0 @ 84361A4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84361B0 @@ -2253,17 +2253,17 @@ voicegroup_8435FAC:: @ 8435FAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8436210 voice_square_1 0, 2, 0, 0, 15, 0 @ 843621C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436228 - voice_directsound_no_resample 32, 177, DirectSoundWaveData_845FCC8, 255, 127, 77, 204 @ 8436234 + voice_directsound_no_resample 32, 177, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204 @ 8436234 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436240 voice_square_1 0, 2, 0, 0, 15, 0 @ 843624C - voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 8, 0, 255, 216 @ 8436258 + voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 8, 0, 255, 216 @ 8436258 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436264 - voice_directsound_no_resample 30, 182, DirectSoundWaveData_8460E60, 255, 246, 0, 216 @ 8436270 + voice_directsound_no_resample 30, 182, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216 @ 8436270 voice_square_1 0, 2, 0, 0, 15, 0 @ 843627C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436288 - voice_directsound_no_resample 72, 207, DirectSoundWaveData_8461D8C, 255, 0, 255, 0 @ 8436294 + voice_directsound_no_resample 72, 207, DirectSoundWaveData_SC88_DrumKitMuteHiConga, 255, 0, 255, 0 @ 8436294 voice_square_1 0, 2, 0, 0, 15, 0 @ 84362A0 - voice_directsound_no_resample 72, 202, DirectSoundWaveData_84622A4, 255, 0, 255, 0 @ 84362AC + voice_directsound_no_resample 72, 202, DirectSoundWaveData_SC88_DrumKitLowConga, 255, 0, 255, 0 @ 84362AC .align 2 voicegroup_84362B8:: @ 84362B8 @@ -2618,7 +2618,7 @@ voicegroup_843708C:: @ 843708C voice_square_1 0, 2, 0, 0, 15, 0 @ 843729C voice_square_1 0, 2, 0, 0, 15, 0 @ 84372A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84372B4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84372C0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 84372C0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84372CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84372D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84372E4 @@ -2837,7 +2837,7 @@ voicegroup_8437A88:: @ 8437A88 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437C98 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437CA4 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8437CB0 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8437CBC + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8437CBC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8437CC8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437CD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 8437CE0 @@ -3968,7 +3968,7 @@ voicegroup_843AE24:: @ 843AE24 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B034 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B040 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 843B04C - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239 @ 843B058 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239 @ 843B058 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843B064 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B070 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B07C @@ -4099,7 +4099,7 @@ voicegroup_843B424:: @ 843B424 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B634 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B640 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843B64C - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 239 @ 843B658 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 239 @ 843B658 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843B664 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B670 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B67C @@ -4190,7 +4190,7 @@ voicegroup_843B844:: @ 843B844 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA54 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 843BA60 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843BA6C - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226 @ 843BA78 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226 @ 843BA78 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843BA84 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA90 voice_square_1 0, 2, 0, 0, 15, 0 @ 843BA9C @@ -4529,7 +4529,7 @@ voicegroup_843C7BC:: @ 843C7BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843C9CC voice_square_1 0, 2, 0, 0, 15, 0 @ 843C9D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843C9E4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226 @ 843C9F0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226 @ 843C9F0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843C9FC voice_square_1 0, 2, 0, 0, 15, 0 @ 843CA08 voice_square_1 0, 2, 0, 0, 15, 0 @ 843CA14 @@ -4922,7 +4922,7 @@ voicegroup_843D9BC:: @ 843D9BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843DBCC voice_square_1 0, 2, 0, 0, 15, 0 @ 843DBD8 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 204 @ 843DBE4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 204, 193, 239 @ 843DBF0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 204, 193, 239 @ 843DBF0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843DBFC voice_square_1 0, 2, 0, 0, 15, 0 @ 843DC08 voice_square_1 0, 2, 0, 0, 15, 0 @ 843DC14 @@ -5184,7 +5184,7 @@ voicegroup_843E5BC:: @ 843E5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E7CC voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 843E7D8 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 0, 242 @ 843E7E4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 193, 226 @ 843E7F0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 193, 226 @ 843E7F0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843E7FC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E808 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E814 @@ -5446,7 +5446,7 @@ voicegroup_843F1BC:: @ 843F1BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F3CC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F3D8 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 843F3E4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239 @ 843F3F0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239 @ 843F3F0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843F3FC voice_square_1 0, 2, 0, 0, 15, 0 @ 843F408 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F414 @@ -5538,7 +5538,7 @@ voicegroup_843F5E8:: @ 843F5E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F7F8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 128, 226, 0, 38 @ 843F804 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 843F810 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 843F81C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 843F81C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 843F828 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F834 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F840 @@ -6062,7 +6062,7 @@ voicegroup_8440DE8:: @ 8440DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8440FF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441004 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8441010 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844101C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844101C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8441028 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441034 voice_square_1 0, 2, 0, 0, 15, 0 @ 8441040 @@ -6848,7 +6848,7 @@ voicegroup_84431E8:: @ 84431E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84433F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443404 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8443410 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844341C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844341C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8443428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443434 voice_square_1 0, 2, 0, 0, 15, 0 @ 8443440 @@ -7372,7 +7372,7 @@ voicegroup_84449E8:: @ 84449E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444BF8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444C04 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444C10 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 216 @ 8444C1C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 216 @ 8444C1C voice_square_1 0, 2, 0, 0, 15, 0 @ 8444C28 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444C34 voice_square_1 0, 2, 0, 0, 15, 0 @ 8444C40 @@ -7503,7 +7503,7 @@ voicegroup_8444FE8:: @ 8444FE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84451F8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445204 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445210 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844521C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844521C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8445228 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445234 voice_square_1 0, 2, 0, 0, 15, 0 @ 8445240 @@ -7896,7 +7896,7 @@ voicegroup_84461E8:: @ 84461E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84463F8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8446404 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446410 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844641C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844641C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8446428 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446434 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446440 @@ -8158,7 +8158,7 @@ voicegroup_8446DE8:: @ 8446DE8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8446FF8 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 226, 0, 38 @ 8447004 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8447010 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844701C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844701C voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8447028 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447034 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447040 @@ -8294,7 +8294,7 @@ voicegroup_8447400:: @ 8447400 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447610 voice_square_1 0, 2, 0, 0, 15, 0 @ 844761C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447628 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 8447634 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 8447634 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8447640 voice_square_1 0, 2, 0, 0, 15, 0 @ 844764C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447658 @@ -8512,7 +8512,7 @@ voicegroup_8447DF0:: @ 8447DF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448000 voice_square_1 0, 2, 0, 0, 15, 0 @ 844800C voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8448018 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 8448024 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 8448024 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8448030 voice_square_1 0, 2, 0, 0, 15, 0 @ 844803C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448048 @@ -8643,7 +8643,7 @@ voicegroup_84483F0:: @ 84483F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448600 voice_square_1 0, 2, 0, 0, 15, 0 @ 844860C voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8448618 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 8448624 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 8448624 voice_square_1 0, 2, 0, 0, 15, 0 @ 8448630 voice_square_1 0, 2, 0, 0, 15, 0 @ 844863C voice_square_1 0, 2, 0, 0, 15, 0 @ 8448648 @@ -8905,7 +8905,7 @@ voicegroup_8448FF0:: @ 8448FF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449200 voice_square_1 0, 2, 0, 0, 15, 0 @ 844920C voice_square_1 0, 2, 0, 0, 15, 0 @ 8449218 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 8449224 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 8449224 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449230 voice_square_1 0, 2, 0, 0, 15, 0 @ 844923C voice_square_1 0, 2, 0, 0, 15, 0 @ 8449248 @@ -9036,7 +9036,7 @@ voicegroup_84495F0:: @ 84495F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8449800 voice_square_1 0, 2, 0, 0, 15, 0 @ 844980C voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 8449818 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239 @ 8449824 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239 @ 8449824 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8449830 voice_square_1 0, 2, 0, 0, 15, 0 @ 844983C voice_square_1 0, 2, 0, 0, 15, 0 @ 8449848 @@ -9822,7 +9822,7 @@ voicegroup_844B9F0:: @ 844B9F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BC00 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BC0C voice_square_1 0, 2, 0, 0, 15, 0 @ 844BC18 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844BC24 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844BC24 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844BC30 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BC3C voice_square_1 0, 2, 0, 0, 15, 0 @ 844BC48 @@ -10084,7 +10084,7 @@ voicegroup_844C5F0:: @ 844C5F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C800 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C80C voice_square_1 0, 2, 0, 0, 15, 0 @ 844C818 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844C824 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844C824 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C830 voice_square_1 0, 2, 0, 0, 15, 0 @ 844C83C voice_square_1 0, 2, 0, 0, 15, 0 @ 844C848 @@ -10215,7 +10215,7 @@ voicegroup_844CBF0:: @ 844CBF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CE00 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CE0C voice_square_1 0, 2, 0, 0, 15, 0 @ 844CE18 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 249 @ 844CE24 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 249 @ 844CE24 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CE30 voice_square_1 0, 2, 0, 0, 15, 0 @ 844CE3C voice_square_1 0, 2, 0, 0, 15, 0 @ 844CE48 @@ -10424,8 +10424,8 @@ voicegroup_844D1F0:: @ 844D1F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D7A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D7B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D7C0 - voice_directsound 60, 0, DirectSoundWaveData_84A3B50, 255, 255, 255, 127 @ 844D7CC - voice_directsound 60, 0, DirectSoundWaveData_845B9A8, 255, 255, 255, 127 @ 844D7D8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_WhiteNoise, 255, 255, 255, 127 @ 844D7CC + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127 @ 844D7D8 voice_noise_alt 0, 0, 1, 0, 0 @ 844D7E4 .align 2 @@ -10608,7 +10608,7 @@ voicegroup_844DDF0:: @ 844DDF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E000 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E00C voice_square_1 0, 2, 0, 0, 15, 0 @ 844E018 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 246 @ 844E024 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 246 @ 844E024 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E030 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E03C voice_square_1 0, 2, 0, 0, 15, 0 @ 844E048 @@ -10739,7 +10739,7 @@ voicegroup_844E3F0:: @ 844E3F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E600 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E60C voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 242, 51, 242 @ 844E618 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 180, 239 @ 844E624 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 180, 239 @ 844E624 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844E630 voice_square_1 0, 2, 0, 0, 15, 0 @ 844E63C voice_square_1 0, 2, 0, 0, 15, 0 @ 844E648 @@ -10937,7 +10937,7 @@ voicegroup_844ECF0:: @ 844ECF0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EF00 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EF0C voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 844EF18 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844EF24 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 844EF24 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844EF30 voice_square_1 0, 2, 0, 0, 15, 0 @ 844EF3C voice_square_1 0, 2, 0, 0, 15, 0 @ 844EF48 @@ -11022,7 +11022,7 @@ voicegroup_844F0C8:: @ 844F0C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F2D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F2E4 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 844F2F0 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844F2FC + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 844F2FC voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844F308 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F314 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F320 @@ -11115,8 +11115,8 @@ voicegroup_844F50C:: @ 844F50C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F710 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F71C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F728 - voice_directsound_no_resample 60, 0, DirectSoundWaveData_8485454, 255, 246, 0, 226 @ 844F734 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844F740 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale1, 255, 246, 0, 226 @ 844F734 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 844F740 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844F74C voice_square_1 0, 2, 0, 0, 15, 0 @ 844F758 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F764 @@ -11210,7 +11210,7 @@ voicegroup_844F950:: @ 844F950 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB60 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 844FB6C voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB78 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844FB84 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 844FB84 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844FB90 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FB9C voice_square_1 0, 2, 0, 0, 15, 0 @ 844FBA8 @@ -11304,7 +11304,7 @@ voicegroup_844FD94:: @ 844FD94 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FFA4 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 844FFB0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FFBC - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 844FFC8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 844FFC8 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 844FFD4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FFE0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844FFEC @@ -11393,7 +11393,7 @@ voicegroup_845019C:: @ 845019C voice_square_1 0, 2, 0, 0, 15, 0 @ 84503AC voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 216, 0, 165 @ 84503B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84503C4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84503D0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 84503D0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84503DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84503E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84503F4 @@ -11480,7 +11480,7 @@ voicegroup_845058C:: @ 845058C voice_square_1 0, 2, 0, 0, 15, 0 @ 845079C voice_square_1 0, 2, 0, 0, 15, 0 @ 84507A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84507B4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84507C0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 84507C0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84507CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84507D8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84507E4 @@ -11560,7 +11560,7 @@ voicegroup_845058C:: @ 845058C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450B5C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450B68 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450B74 - voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 246, 0, 216 @ 8450B80 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216 @ 8450B80 .align 2 voicegroup_8450B8C:: @ 8450B8C @@ -11611,7 +11611,7 @@ voicegroup_8450B8C:: @ 8450B8C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450D9C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450DA8 voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 246, 0, 235 @ 8450DB4 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8450DC0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8450DC0 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8450DCC voice_square_1 0, 2, 0, 0, 15, 0 @ 8450DD8 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450DE4 @@ -11701,7 +11701,7 @@ voicegroup_8450FA0:: @ 8450FA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84511B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84511BC voice_square_1 0, 2, 0, 0, 15, 0 @ 84511C8 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84511D4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 84511D4 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84511E0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84511EC voice_square_1 0, 2, 0, 0, 15, 0 @ 84511F8 @@ -11788,7 +11788,7 @@ voicegroup_8451390:: @ 8451390 voice_square_1 0, 2, 0, 0, 15, 0 @ 84515A0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84515AC voice_square_1 0, 2, 0, 0, 15, 0 @ 84515B8 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 84515C4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 84515C4 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 84515D0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84515DC voice_square_1 0, 2, 0, 0, 15, 0 @ 84515E8 @@ -11867,12 +11867,12 @@ voicegroup_8451390:: @ 8451390 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451954 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451960 voice_square_1 0, 2, 0, 0, 15, 0 @ 845196C - voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 235, 0, 216 @ 8451978 - voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 246, 0, 216 @ 8451984 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 235, 0, 216 @ 8451978 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 255, 246, 0, 216 @ 8451984 .align 2 voicegroup_8451990:: @ 8451990 - voice_directsound 60, 0, DirectSoundWaveData_8486924, 255, 249, 103, 165 @ 8451990 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 249, 103, 165 @ 8451990 voice_square_1 0, 2, 0, 0, 15, 0 @ 845199C voice_square_1 0, 2, 0, 0, 15, 0 @ 84519A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84519B4 @@ -11919,7 +11919,7 @@ voicegroup_8451990:: @ 8451990 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451BA0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451BAC voice_square_1 0, 2, 0, 0, 15, 0 @ 8451BB8 - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 246, 0, 226 @ 8451BC4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 246, 0, 226 @ 8451BC4 voice_keysplit voicegroup_8430234, KeySplitTable_845526C @ 8451BD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 8451BDC voice_square_1 0, 2, 0, 0, 15, 0 @ 8451BE8 @@ -12005,13 +12005,13 @@ voicegroup_8451990:: @ 8451990 voicegroup_8451F90:: @ 8451F90 voice_directsound_no_resample 60, 0, DirectSoundWaveData_8488F44, 255, 249, 0, 165 @ 8451F90 voice_directsound_alt 60, 0, DirectSoundWaveData_8488F44, 255, 0, 255, 165 @ 8451F9C - voice_directsound 60, 0, DirectSoundWaveData_8486924, 255, 0, 255, 165 @ 8451FA8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 0, 255, 165 @ 8451FA8 voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 242, 0, 127 @ 8451FB4 voice_noise_alt 0, 0, 1, 0, 1 @ 8451FC0 voice_noise_alt 1, 0, 1, 0, 1 @ 8451FCC - voice_directsound 60, 0, DirectSoundWaveData_8459944, 255, 0, 255, 165 @ 8451FD8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 255, 165 @ 8451FD8 voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 8451FE4 - voice_directsound 60, 0, DirectSoundWaveData_848A8A4, 255, 0, 255, 165 @ 8451FF0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare3, 255, 0, 255, 165 @ 8451FF0 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 0, 255, 127 @ 8451FFC voice_directsound 60, 0, DirectSoundWaveData_848C4A4, 255, 0, 255, 127 @ 8452008 voice_noise_alt 1, 0, 2, 0, 0 @ 8452014 @@ -12024,10 +12024,10 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound 60, 0, DirectSoundWaveData_848F448, 255, 0, 255, 127 @ 8452068 voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 0, 255, 127 @ 8452074 voice_square_1 103, 0, 0, 7, 0, 0 @ 8452080 - voice_directsound 60, 0, DirectSoundWaveData_845C238, 255, 0, 255, 127 @ 845208C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 127 @ 845208C voice_directsound 60, 0, DirectSoundWaveData_8491ACC, 255, 0, 255, 127 @ 8452098 voice_directsound 60, 0, DirectSoundWaveData_SC88_Bubble, 255, 0, 255, 127 @ 84520A4 - voice_directsound 60, 0, DirectSoundWaveData_845B2B4, 255, 0, 255, 127 @ 84520B0 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 127 @ 84520B0 voice_noise_alt 0, 0, 7, 15, 1 @ 84520BC voice_directsound 60, 0, DirectSoundWaveData_8493D20, 255, 0, 255, 127 @ 84520C8 voice_noise_alt 1, 0, 7, 15, 1 @ 84520D4 @@ -12041,10 +12041,10 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 0, 255, 127 @ 8452134 voice_directsound 60, 0, DirectSoundWaveData_8499110, 255, 0, 255, 127 @ 8452140 voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 242, 0, 0 @ 845214C - voice_directsound 60, 0, DirectSoundWaveData_849B320, 255, 0, 255, 0 @ 8452158 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumkitGuiro, 255, 0, 255, 0 @ 8452158 voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8452164 - voice_directsound 60, 0, DirectSoundWaveData_845DAF0, 255, 127, 0, 188 @ 8452170 - voice_directsound 60, 0, DirectSoundWaveData_849D45C, 255, 249, 0, 165 @ 845217C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitClosedHiHat, 255, 127, 0, 188 @ 8452170 + voice_directsound 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 249, 0, 165 @ 845217C voice_square_1 0, 0, 4, 6, 0, 0 @ 8452188 voice_directsound 60, 0, DirectSoundWaveData_8456330, 13, 0, 255, 127 @ 8452194 voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 13, 0, 255, 127 @ 84521A0 @@ -12055,20 +12055,20 @@ voicegroup_8451F90:: @ 8451F90 voice_square_1 0, 0, 4, 0, 15, 0 @ 84521DC voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 188, 0, 0 @ 84521E8 voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 226, 0, 127 @ 84521F4 - voice_directsound 60, 0, DirectSoundWaveData_8460E60, 26, 0, 255, 127 @ 8452200 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 26, 0, 255, 127 @ 8452200 voice_square_1_alt 0, 2, 0, 1, 0, 0 @ 845220C voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 252, 0, 127 @ 8452218 voice_square_1_alt 0, 1, 0, 2, 0, 0 @ 8452224 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 127, 0, 127 @ 8452230 voice_noise_alt 0, 1, 6, 0, 0 @ 845223C voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 255, 255, 127 @ 8452248 - voice_directsound 60, 0, DirectSoundWaveData_845B9A8, 255, 255, 255, 127 @ 8452254 - voice_directsound 60, 0, DirectSoundWaveData_84A3B50, 255, 255, 255, 127 @ 8452260 + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127 @ 8452254 + voice_directsound 60, 0, DirectSoundWaveData_SC88_WhiteNoise, 255, 255, 255, 127 @ 8452260 voice_directsound 60, 0, DirectSoundWaveData_SC88_WideFrenchHorns, 11, 242, 0, 127 @ 845226C voice_square_1_alt 0, 2, 4, 6, 0, 0 @ 8452278 voice_directsound 60, 0, DirectSoundWaveData_84A5690, 255, 255, 255, 127 @ 8452284 voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165 @ 8452290 - voice_directsound 60, 0, DirectSoundWaveData_845CAB0, 255, 0, 255, 165 @ 845229C + voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 0, 255, 165 @ 845229C voice_noise_alt 0, 5, 7, 15, 1 @ 84522A8 voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 128, 242, 0, 165 @ 84522B4 voice_directsound 60, 0, DirectSoundWaveData_SC88_StringsPlusFlute, 255, 0, 255, 165 @ 84522C0 -- cgit v1.2.3 From ea23c3faf53f0a8e4095f9ce28775ef5d4ea08a7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 27 Jan 2018 13:25:50 -0800 Subject: Move cries to own directory --- Makefile | 4 +- sound/direct_sound_data.inc | 776 ++++++++++----------- sound/direct_sound_samples/cries/cry_abra.aif | Bin 0 -> 11660 bytes sound/direct_sound_samples/cries/cry_absol.aif | Bin 0 -> 5256 bytes .../direct_sound_samples/cries/cry_aerodactyl.aif | Bin 0 -> 12142 bytes sound/direct_sound_samples/cries/cry_aggron.aif | Bin 0 -> 12776 bytes sound/direct_sound_samples/cries/cry_aipom.aif | Bin 0 -> 7058 bytes sound/direct_sound_samples/cries/cry_alakazam.aif | Bin 0 -> 15740 bytes sound/direct_sound_samples/cries/cry_altaria.aif | Bin 0 -> 5564 bytes sound/direct_sound_samples/cries/cry_ampharos.aif | Bin 0 -> 8242 bytes sound/direct_sound_samples/cries/cry_anorith.aif | Bin 0 -> 5862 bytes sound/direct_sound_samples/cries/cry_arbok.aif | Bin 0 -> 9648 bytes sound/direct_sound_samples/cries/cry_arcanine.aif | Bin 0 -> 8602 bytes sound/direct_sound_samples/cries/cry_ariados.aif | Bin 0 -> 6170 bytes sound/direct_sound_samples/cries/cry_armaldo.aif | Bin 0 -> 11380 bytes sound/direct_sound_samples/cries/cry_aron.aif | Bin 0 -> 4600 bytes sound/direct_sound_samples/cries/cry_articuno.aif | Bin 0 -> 11792 bytes sound/direct_sound_samples/cries/cry_azumarill.aif | Bin 0 -> 8452 bytes sound/direct_sound_samples/cries/cry_azurill.aif | Bin 0 -> 5212 bytes sound/direct_sound_samples/cries/cry_bagon.aif | Bin 0 -> 3934 bytes sound/direct_sound_samples/cries/cry_baltoy.aif | Bin 0 -> 6264 bytes sound/direct_sound_samples/cries/cry_banette.aif | Bin 0 -> 6334 bytes sound/direct_sound_samples/cries/cry_barboach.aif | Bin 0 -> 4632 bytes sound/direct_sound_samples/cries/cry_bayleef.aif | Bin 0 -> 4414 bytes sound/direct_sound_samples/cries/cry_beautifly.aif | Bin 0 -> 4128 bytes sound/direct_sound_samples/cries/cry_beedrill.aif | Bin 0 -> 9656 bytes sound/direct_sound_samples/cries/cry_beldum.aif | Bin 0 -> 4828 bytes sound/direct_sound_samples/cries/cry_bellossom.aif | Bin 0 -> 7042 bytes .../direct_sound_samples/cries/cry_bellsprout.aif | Bin 0 -> 3792 bytes sound/direct_sound_samples/cries/cry_blastoise.aif | Bin 0 -> 9622 bytes sound/direct_sound_samples/cries/cry_blaziken.aif | Bin 0 -> 15690 bytes sound/direct_sound_samples/cries/cry_blissey.aif | Bin 0 -> 8278 bytes sound/direct_sound_samples/cries/cry_breloom.aif | Bin 0 -> 6376 bytes sound/direct_sound_samples/cries/cry_bulbasaur.aif | Bin 0 -> 8266 bytes .../direct_sound_samples/cries/cry_butterfree.aif | Bin 0 -> 5026 bytes sound/direct_sound_samples/cries/cry_cacnea.aif | Bin 0 -> 4488 bytes sound/direct_sound_samples/cries/cry_cacturne.aif | Bin 0 -> 11310 bytes sound/direct_sound_samples/cries/cry_camerupt.aif | Bin 0 -> 11526 bytes sound/direct_sound_samples/cries/cry_carvanha.aif | Bin 0 -> 5048 bytes sound/direct_sound_samples/cries/cry_cascoon.aif | Bin 0 -> 8126 bytes sound/direct_sound_samples/cries/cry_castform.aif | Bin 0 -> 6302 bytes sound/direct_sound_samples/cries/cry_caterpie.aif | Bin 0 -> 4192 bytes sound/direct_sound_samples/cries/cry_celebi.aif | Bin 0 -> 7230 bytes sound/direct_sound_samples/cries/cry_chansey.aif | Bin 0 -> 7390 bytes sound/direct_sound_samples/cries/cry_charizard.aif | Bin 0 -> 9622 bytes .../direct_sound_samples/cries/cry_charmander.aif | Bin 0 -> 7216 bytes .../direct_sound_samples/cries/cry_charmeleon.aif | Bin 0 -> 7248 bytes sound/direct_sound_samples/cries/cry_chikorita.aif | Bin 0 -> 2654 bytes sound/direct_sound_samples/cries/cry_chimecho.aif | Bin 0 -> 5040 bytes sound/direct_sound_samples/cries/cry_chinchou.aif | Bin 0 -> 6346 bytes sound/direct_sound_samples/cries/cry_clamperl.aif | Bin 0 -> 9142 bytes sound/direct_sound_samples/cries/cry_claydol.aif | Bin 0 -> 9668 bytes sound/direct_sound_samples/cries/cry_clefable.aif | Bin 0 -> 5294 bytes sound/direct_sound_samples/cries/cry_clefairy.aif | Bin 0 -> 4234 bytes sound/direct_sound_samples/cries/cry_cleffa.aif | Bin 0 -> 2992 bytes sound/direct_sound_samples/cries/cry_cloyster.aif | Bin 0 -> 10354 bytes sound/direct_sound_samples/cries/cry_combusken.aif | Bin 0 -> 14360 bytes sound/direct_sound_samples/cries/cry_corphish.aif | Bin 0 -> 6010 bytes sound/direct_sound_samples/cries/cry_corsola.aif | Bin 0 -> 6440 bytes sound/direct_sound_samples/cries/cry_cradily.aif | Bin 0 -> 14542 bytes sound/direct_sound_samples/cries/cry_crawdaunt.aif | Bin 0 -> 12316 bytes sound/direct_sound_samples/cries/cry_crobat.aif | Bin 0 -> 11562 bytes sound/direct_sound_samples/cries/cry_croconaw.aif | Bin 0 -> 10096 bytes sound/direct_sound_samples/cries/cry_cubone.aif | Bin 0 -> 7558 bytes sound/direct_sound_samples/cries/cry_cyndaquil.aif | Bin 0 -> 3528 bytes sound/direct_sound_samples/cries/cry_delcatty.aif | Bin 0 -> 10518 bytes sound/direct_sound_samples/cries/cry_delibird.aif | Bin 0 -> 8094 bytes sound/direct_sound_samples/cries/cry_deoxys.aif | Bin 0 -> 10388 bytes sound/direct_sound_samples/cries/cry_dewgong.aif | Bin 0 -> 10546 bytes sound/direct_sound_samples/cries/cry_diglett.aif | Bin 0 -> 9698 bytes sound/direct_sound_samples/cries/cry_ditto.aif | Bin 0 -> 5566 bytes sound/direct_sound_samples/cries/cry_dodrio.aif | Bin 0 -> 9712 bytes sound/direct_sound_samples/cries/cry_doduo.aif | Bin 0 -> 9616 bytes sound/direct_sound_samples/cries/cry_donphan.aif | Bin 0 -> 8554 bytes sound/direct_sound_samples/cries/cry_dragonair.aif | Bin 0 -> 8318 bytes sound/direct_sound_samples/cries/cry_dragonite.aif | Bin 0 -> 9502 bytes sound/direct_sound_samples/cries/cry_dratini.aif | Bin 0 -> 5812 bytes sound/direct_sound_samples/cries/cry_drowzee.aif | Bin 0 -> 14494 bytes sound/direct_sound_samples/cries/cry_dugtrio.aif | Bin 0 -> 9686 bytes sound/direct_sound_samples/cries/cry_dunsparce.aif | Bin 0 -> 7926 bytes sound/direct_sound_samples/cries/cry_dusclops.aif | Bin 0 -> 6858 bytes sound/direct_sound_samples/cries/cry_duskull.aif | Bin 0 -> 5310 bytes sound/direct_sound_samples/cries/cry_dustox.aif | Bin 0 -> 6338 bytes sound/direct_sound_samples/cries/cry_eevee.aif | Bin 0 -> 7104 bytes sound/direct_sound_samples/cries/cry_ekans.aif | Bin 0 -> 9626 bytes .../direct_sound_samples/cries/cry_electabuzz.aif | Bin 0 -> 15380 bytes sound/direct_sound_samples/cries/cry_electrike.aif | Bin 0 -> 6186 bytes sound/direct_sound_samples/cries/cry_electrode.aif | Bin 0 -> 12564 bytes sound/direct_sound_samples/cries/cry_elekid.aif | Bin 0 -> 5284 bytes sound/direct_sound_samples/cries/cry_entei.aif | Bin 0 -> 10198 bytes sound/direct_sound_samples/cries/cry_espeon.aif | Bin 0 -> 9828 bytes sound/direct_sound_samples/cries/cry_exeggcute.aif | Bin 0 -> 9416 bytes sound/direct_sound_samples/cries/cry_exeggutor.aif | Bin 0 -> 15880 bytes sound/direct_sound_samples/cries/cry_exploud.aif | Bin 0 -> 14086 bytes sound/direct_sound_samples/cries/cry_farfetchd.aif | Bin 0 -> 3766 bytes sound/direct_sound_samples/cries/cry_fearow.aif | Bin 0 -> 8602 bytes sound/direct_sound_samples/cries/cry_feebas.aif | Bin 0 -> 3932 bytes .../direct_sound_samples/cries/cry_feraligatr.aif | Bin 0 -> 12712 bytes sound/direct_sound_samples/cries/cry_flaaffy.aif | Bin 0 -> 6854 bytes sound/direct_sound_samples/cries/cry_flareon.aif | Bin 0 -> 7748 bytes sound/direct_sound_samples/cries/cry_flygon.aif | Bin 0 -> 12974 bytes .../direct_sound_samples/cries/cry_forretress.aif | Bin 0 -> 9990 bytes sound/direct_sound_samples/cries/cry_furret.aif | Bin 0 -> 3168 bytes sound/direct_sound_samples/cries/cry_gardevoir.aif | Bin 0 -> 12154 bytes sound/direct_sound_samples/cries/cry_gastly.aif | Bin 0 -> 11620 bytes sound/direct_sound_samples/cries/cry_gengar.aif | Bin 0 -> 7372 bytes sound/direct_sound_samples/cries/cry_geodude.aif | Bin 0 -> 11816 bytes sound/direct_sound_samples/cries/cry_girafarig.aif | Bin 0 -> 7346 bytes sound/direct_sound_samples/cries/cry_glalie.aif | Bin 0 -> 10420 bytes sound/direct_sound_samples/cries/cry_gligar.aif | Bin 0 -> 6068 bytes sound/direct_sound_samples/cries/cry_gloom.aif | Bin 0 -> 6246 bytes sound/direct_sound_samples/cries/cry_golbat.aif | Bin 0 -> 9674 bytes sound/direct_sound_samples/cries/cry_goldeen.aif | Bin 0 -> 4936 bytes sound/direct_sound_samples/cries/cry_golduck.aif | Bin 0 -> 5646 bytes sound/direct_sound_samples/cries/cry_golem.aif | Bin 0 -> 7080 bytes sound/direct_sound_samples/cries/cry_gorebyss.aif | Bin 0 -> 11176 bytes sound/direct_sound_samples/cries/cry_granbull.aif | Bin 0 -> 11782 bytes sound/direct_sound_samples/cries/cry_graveler.aif | Bin 0 -> 13900 bytes sound/direct_sound_samples/cries/cry_grimer.aif | Bin 0 -> 5274 bytes sound/direct_sound_samples/cries/cry_groudon.aif | Bin 0 -> 18438 bytes sound/direct_sound_samples/cries/cry_grovyle.aif | Bin 0 -> 10198 bytes sound/direct_sound_samples/cries/cry_growlithe.aif | Bin 0 -> 6696 bytes sound/direct_sound_samples/cries/cry_grumpig.aif | Bin 0 -> 6318 bytes sound/direct_sound_samples/cries/cry_gulpin.aif | Bin 0 -> 4028 bytes sound/direct_sound_samples/cries/cry_gyarados.aif | Bin 0 -> 10078 bytes sound/direct_sound_samples/cries/cry_hariyama.aif | Bin 0 -> 8348 bytes sound/direct_sound_samples/cries/cry_haunter.aif | Bin 0 -> 11714 bytes sound/direct_sound_samples/cries/cry_heracross.aif | Bin 0 -> 9144 bytes .../direct_sound_samples/cries/cry_hitmonchan.aif | Bin 0 -> 8906 bytes sound/direct_sound_samples/cries/cry_hitmonlee.aif | Bin 0 -> 9318 bytes sound/direct_sound_samples/cries/cry_hitmontop.aif | Bin 0 -> 6936 bytes sound/direct_sound_samples/cries/cry_ho_oh.aif | Bin 0 -> 11260 bytes sound/direct_sound_samples/cries/cry_hoothoot.aif | Bin 0 -> 5458 bytes sound/direct_sound_samples/cries/cry_hoppip.aif | Bin 0 -> 4226 bytes sound/direct_sound_samples/cries/cry_horsea.aif | Bin 0 -> 4754 bytes sound/direct_sound_samples/cries/cry_houndoom.aif | Bin 0 -> 9820 bytes sound/direct_sound_samples/cries/cry_houndour.aif | Bin 0 -> 6332 bytes sound/direct_sound_samples/cries/cry_huntail.aif | Bin 0 -> 7944 bytes sound/direct_sound_samples/cries/cry_hypno.aif | Bin 0 -> 14450 bytes sound/direct_sound_samples/cries/cry_igglybuff.aif | Bin 0 -> 3518 bytes sound/direct_sound_samples/cries/cry_illumise.aif | Bin 0 -> 8536 bytes sound/direct_sound_samples/cries/cry_ivysaur.aif | Bin 0 -> 8270 bytes .../direct_sound_samples/cries/cry_jigglypuff.aif | Bin 0 -> 2720 bytes sound/direct_sound_samples/cries/cry_jirachi.aif | Bin 0 -> 6758 bytes sound/direct_sound_samples/cries/cry_jolteon.aif | Bin 0 -> 7904 bytes sound/direct_sound_samples/cries/cry_jumpluff.aif | Bin 0 -> 8106 bytes sound/direct_sound_samples/cries/cry_jynx.aif | Bin 0 -> 23606 bytes sound/direct_sound_samples/cries/cry_kabuto.aif | Bin 0 -> 6170 bytes sound/direct_sound_samples/cries/cry_kabutops.aif | Bin 0 -> 6867 bytes sound/direct_sound_samples/cries/cry_kadabra.aif | Bin 0 -> 13408 bytes sound/direct_sound_samples/cries/cry_kakuna.aif | Bin 0 -> 9104 bytes .../direct_sound_samples/cries/cry_kangaskhan.aif | Bin 0 -> 9334 bytes sound/direct_sound_samples/cries/cry_kecleon.aif | Bin 0 -> 4202 bytes sound/direct_sound_samples/cries/cry_kingdra.aif | Bin 0 -> 6922 bytes sound/direct_sound_samples/cries/cry_kingler.aif | Bin 0 -> 12132 bytes sound/direct_sound_samples/cries/cry_kirlia.aif | Bin 0 -> 6100 bytes sound/direct_sound_samples/cries/cry_koffing.aif | Bin 0 -> 10154 bytes sound/direct_sound_samples/cries/cry_krabby.aif | Bin 0 -> 12112 bytes sound/direct_sound_samples/cries/cry_kyogre.aif | Bin 0 -> 17782 bytes sound/direct_sound_samples/cries/cry_lairon.aif | Bin 0 -> 10392 bytes sound/direct_sound_samples/cries/cry_lanturn.aif | Bin 0 -> 5282 bytes sound/direct_sound_samples/cries/cry_lapras.aif | Bin 0 -> 7408 bytes sound/direct_sound_samples/cries/cry_larvitar.aif | Bin 0 -> 6350 bytes sound/direct_sound_samples/cries/cry_latias.aif | Bin 0 -> 6098 bytes sound/direct_sound_samples/cries/cry_latios.aif | Bin 0 -> 10958 bytes sound/direct_sound_samples/cries/cry_ledian.aif | Bin 0 -> 4214 bytes sound/direct_sound_samples/cries/cry_ledyba.aif | Bin 0 -> 3506 bytes sound/direct_sound_samples/cries/cry_lickitung.aif | Bin 0 -> 7571 bytes sound/direct_sound_samples/cries/cry_lileep.aif | Bin 0 -> 4838 bytes sound/direct_sound_samples/cries/cry_linoone.aif | Bin 0 -> 15248 bytes sound/direct_sound_samples/cries/cry_lombre.aif | Bin 0 -> 7282 bytes sound/direct_sound_samples/cries/cry_lotad.aif | Bin 0 -> 2232 bytes sound/direct_sound_samples/cries/cry_loudred.aif | Bin 0 -> 6582 bytes sound/direct_sound_samples/cries/cry_ludicolo.aif | Bin 0 -> 8398 bytes sound/direct_sound_samples/cries/cry_lugia.aif | Bin 0 -> 18900 bytes sound/direct_sound_samples/cries/cry_lunatone.aif | Bin 0 -> 11956 bytes sound/direct_sound_samples/cries/cry_luvdisc.aif | Bin 0 -> 2456 bytes sound/direct_sound_samples/cries/cry_machamp.aif | Bin 0 -> 8256 bytes sound/direct_sound_samples/cries/cry_machoke.aif | Bin 0 -> 6782 bytes sound/direct_sound_samples/cries/cry_machop.aif | Bin 0 -> 6696 bytes sound/direct_sound_samples/cries/cry_magby.aif | Bin 0 -> 7218 bytes sound/direct_sound_samples/cries/cry_magcargo.aif | Bin 0 -> 10486 bytes sound/direct_sound_samples/cries/cry_magikarp.aif | Bin 0 -> 9492 bytes sound/direct_sound_samples/cries/cry_magmar.aif | Bin 0 -> 7738 bytes sound/direct_sound_samples/cries/cry_magnemite.aif | Bin 0 -> 9610 bytes sound/direct_sound_samples/cries/cry_magneton.aif | Bin 0 -> 11914 bytes sound/direct_sound_samples/cries/cry_makuhita.aif | Bin 0 -> 3704 bytes sound/direct_sound_samples/cries/cry_manectric.aif | Bin 0 -> 10492 bytes sound/direct_sound_samples/cries/cry_mankey.aif | Bin 0 -> 8178 bytes sound/direct_sound_samples/cries/cry_mantine.aif | Bin 0 -> 7884 bytes sound/direct_sound_samples/cries/cry_mareep.aif | Bin 0 -> 3694 bytes sound/direct_sound_samples/cries/cry_marill.aif | Bin 0 -> 6538 bytes sound/direct_sound_samples/cries/cry_marowak.aif | Bin 0 -> 7216 bytes sound/direct_sound_samples/cries/cry_marshtomp.aif | Bin 0 -> 8498 bytes .../direct_sound_samples/cries/cry_masquerain.aif | Bin 0 -> 9830 bytes sound/direct_sound_samples/cries/cry_mawile.aif | Bin 0 -> 5756 bytes sound/direct_sound_samples/cries/cry_medicham.aif | Bin 0 -> 8246 bytes sound/direct_sound_samples/cries/cry_meditite.aif | Bin 0 -> 4078 bytes sound/direct_sound_samples/cries/cry_meganium.aif | Bin 0 -> 8100 bytes sound/direct_sound_samples/cries/cry_meowth.aif | Bin 0 -> 4796 bytes sound/direct_sound_samples/cries/cry_metagross.aif | Bin 0 -> 19644 bytes sound/direct_sound_samples/cries/cry_metang.aif | Bin 0 -> 9398 bytes sound/direct_sound_samples/cries/cry_metapod.aif | Bin 0 -> 11622 bytes sound/direct_sound_samples/cries/cry_mew.aif | Bin 0 -> 15146 bytes sound/direct_sound_samples/cries/cry_mewtwo.aif | Bin 0 -> 15144 bytes sound/direct_sound_samples/cries/cry_mightyena.aif | Bin 0 -> 9748 bytes sound/direct_sound_samples/cries/cry_milotic.aif | Bin 0 -> 19542 bytes sound/direct_sound_samples/cries/cry_miltank.aif | Bin 0 -> 7424 bytes sound/direct_sound_samples/cries/cry_minun.aif | Bin 0 -> 8004 bytes .../direct_sound_samples/cries/cry_misdreavus.aif | Bin 0 -> 5816 bytes sound/direct_sound_samples/cries/cry_moltres.aif | Bin 0 -> 11796 bytes sound/direct_sound_samples/cries/cry_mr_mime.aif | Bin 0 -> 9446 bytes sound/direct_sound_samples/cries/cry_mudkip.aif | Bin 0 -> 3776 bytes sound/direct_sound_samples/cries/cry_muk.aif | Bin 0 -> 7374 bytes sound/direct_sound_samples/cries/cry_murkrow.aif | Bin 0 -> 8370 bytes sound/direct_sound_samples/cries/cry_natu.aif | Bin 0 -> 5294 bytes sound/direct_sound_samples/cries/cry_nidoking.aif | Bin 0 -> 12176 bytes sound/direct_sound_samples/cries/cry_nidoqueen.aif | Bin 0 -> 8424 bytes sound/direct_sound_samples/cries/cry_nidoran_f.aif | Bin 0 -> 4858 bytes sound/direct_sound_samples/cries/cry_nidoran_m.aif | Bin 0 -> 5216 bytes sound/direct_sound_samples/cries/cry_nidorina.aif | Bin 0 -> 6394 bytes sound/direct_sound_samples/cries/cry_nidorino.aif | Bin 0 -> 6042 bytes sound/direct_sound_samples/cries/cry_nincada.aif | Bin 0 -> 3244 bytes sound/direct_sound_samples/cries/cry_ninetales.aif | Bin 0 -> 12174 bytes sound/direct_sound_samples/cries/cry_ninjask.aif | Bin 0 -> 6084 bytes sound/direct_sound_samples/cries/cry_noctowl.aif | Bin 0 -> 10564 bytes sound/direct_sound_samples/cries/cry_none.aif | Bin 0 -> 8286 bytes sound/direct_sound_samples/cries/cry_nosepass.aif | Bin 0 -> 6696 bytes sound/direct_sound_samples/cries/cry_numel.aif | Bin 0 -> 4664 bytes sound/direct_sound_samples/cries/cry_nuzleaf.aif | Bin 0 -> 5712 bytes sound/direct_sound_samples/cries/cry_octillery.aif | Bin 0 -> 13084 bytes sound/direct_sound_samples/cries/cry_oddish.aif | Bin 0 -> 7298 bytes sound/direct_sound_samples/cries/cry_omanyte.aif | Bin 0 -> 6672 bytes sound/direct_sound_samples/cries/cry_omastar.aif | Bin 0 -> 6666 bytes sound/direct_sound_samples/cries/cry_onix.aif | Bin 0 -> 12340 bytes sound/direct_sound_samples/cries/cry_paras.aif | Bin 0 -> 13924 bytes sound/direct_sound_samples/cries/cry_parasect.aif | Bin 0 -> 15140 bytes sound/direct_sound_samples/cries/cry_pelipper.aif | Bin 0 -> 5894 bytes sound/direct_sound_samples/cries/cry_persian.aif | Bin 0 -> 9412 bytes sound/direct_sound_samples/cries/cry_phanpy.aif | Bin 0 -> 5664 bytes sound/direct_sound_samples/cries/cry_pichu.aif | Bin 0 -> 3684 bytes sound/direct_sound_samples/cries/cry_pidgeot.aif | Bin 0 -> 8590 bytes sound/direct_sound_samples/cries/cry_pidgeotto.aif | Bin 0 -> 7512 bytes sound/direct_sound_samples/cries/cry_pidgey.aif | Bin 0 -> 1984 bytes sound/direct_sound_samples/cries/cry_pikachu.aif | Bin 0 -> 8316 bytes sound/direct_sound_samples/cries/cry_piloswine.aif | Bin 0 -> 6480 bytes sound/direct_sound_samples/cries/cry_pineco.aif | Bin 0 -> 6690 bytes sound/direct_sound_samples/cries/cry_pinsir.aif | Bin 0 -> 6186 bytes sound/direct_sound_samples/cries/cry_plusle.aif | Bin 0 -> 4504 bytes sound/direct_sound_samples/cries/cry_politoed.aif | Bin 0 -> 9114 bytes sound/direct_sound_samples/cries/cry_poliwag.aif | Bin 0 -> 5562 bytes sound/direct_sound_samples/cries/cry_poliwhirl.aif | Bin 0 -> 3354 bytes sound/direct_sound_samples/cries/cry_poliwrath.aif | Bin 0 -> 5582 bytes sound/direct_sound_samples/cries/cry_ponyta.aif | Bin 0 -> 7524 bytes sound/direct_sound_samples/cries/cry_poochyena.aif | Bin 0 -> 4656 bytes sound/direct_sound_samples/cries/cry_porygon.aif | Bin 0 -> 10002 bytes sound/direct_sound_samples/cries/cry_porygon2.aif | Bin 0 -> 7854 bytes sound/direct_sound_samples/cries/cry_primeape.aif | Bin 0 -> 8086 bytes sound/direct_sound_samples/cries/cry_psyduck.aif | Bin 0 -> 6578 bytes sound/direct_sound_samples/cries/cry_pupitar.aif | Bin 0 -> 4234 bytes sound/direct_sound_samples/cries/cry_quagsire.aif | Bin 0 -> 6684 bytes sound/direct_sound_samples/cries/cry_quilava.aif | Bin 0 -> 5962 bytes sound/direct_sound_samples/cries/cry_qwilfish.aif | Bin 0 -> 5808 bytes sound/direct_sound_samples/cries/cry_raichu.aif | Bin 0 -> 11842 bytes sound/direct_sound_samples/cries/cry_raikou.aif | Bin 0 -> 8704 bytes sound/direct_sound_samples/cries/cry_ralts.aif | Bin 0 -> 5066 bytes sound/direct_sound_samples/cries/cry_rapidash.aif | Bin 0 -> 9292 bytes sound/direct_sound_samples/cries/cry_raticate.aif | Bin 0 -> 4770 bytes sound/direct_sound_samples/cries/cry_rattata.aif | Bin 0 -> 3956 bytes sound/direct_sound_samples/cries/cry_rayquaza.aif | Bin 0 -> 14532 bytes sound/direct_sound_samples/cries/cry_regice.aif | Bin 0 -> 15936 bytes sound/direct_sound_samples/cries/cry_regirock.aif | Bin 0 -> 15862 bytes sound/direct_sound_samples/cries/cry_registeel.aif | Bin 0 -> 11476 bytes sound/direct_sound_samples/cries/cry_relicanth.aif | Bin 0 -> 10072 bytes sound/direct_sound_samples/cries/cry_remoraid.aif | Bin 0 -> 5290 bytes sound/direct_sound_samples/cries/cry_rhydon.aif | Bin 0 -> 10186 bytes sound/direct_sound_samples/cries/cry_rhyhorn.aif | Bin 0 -> 9686 bytes sound/direct_sound_samples/cries/cry_roselia.aif | Bin 0 -> 5382 bytes sound/direct_sound_samples/cries/cry_sableye.aif | Bin 0 -> 5826 bytes sound/direct_sound_samples/cries/cry_salamence.aif | Bin 0 -> 12514 bytes sound/direct_sound_samples/cries/cry_sandshrew.aif | Bin 0 -> 4678 bytes sound/direct_sound_samples/cries/cry_sandslash.aif | Bin 0 -> 6784 bytes sound/direct_sound_samples/cries/cry_sceptile.aif | Bin 0 -> 13012 bytes sound/direct_sound_samples/cries/cry_scizor.aif | Bin 0 -> 11462 bytes sound/direct_sound_samples/cries/cry_scyther.aif | Bin 0 -> 6676 bytes sound/direct_sound_samples/cries/cry_seadra.aif | Bin 0 -> 4228 bytes sound/direct_sound_samples/cries/cry_seaking.aif | Bin 0 -> 9654 bytes sound/direct_sound_samples/cries/cry_sealeo.aif | Bin 0 -> 5928 bytes sound/direct_sound_samples/cries/cry_seedot.aif | Bin 0 -> 4106 bytes sound/direct_sound_samples/cries/cry_seel.aif | Bin 0 -> 8954 bytes sound/direct_sound_samples/cries/cry_sentret.aif | Bin 0 -> 2108 bytes sound/direct_sound_samples/cries/cry_seviper.aif | Bin 0 -> 5820 bytes sound/direct_sound_samples/cries/cry_sharpedo.aif | Bin 0 -> 11488 bytes sound/direct_sound_samples/cries/cry_shedinja.aif | Bin 0 -> 3876 bytes sound/direct_sound_samples/cries/cry_shelgon.aif | Bin 0 -> 9992 bytes sound/direct_sound_samples/cries/cry_shellder.aif | Bin 0 -> 7718 bytes sound/direct_sound_samples/cries/cry_shiftry.aif | Bin 0 -> 9860 bytes sound/direct_sound_samples/cries/cry_shroomish.aif | Bin 0 -> 4436 bytes sound/direct_sound_samples/cries/cry_shuckle.aif | Bin 0 -> 5110 bytes sound/direct_sound_samples/cries/cry_shuppet.aif | Bin 0 -> 4144 bytes sound/direct_sound_samples/cries/cry_silcoon.aif | Bin 0 -> 8074 bytes sound/direct_sound_samples/cries/cry_skarmory.aif | Bin 0 -> 11982 bytes sound/direct_sound_samples/cries/cry_skiploom.aif | Bin 0 -> 6516 bytes sound/direct_sound_samples/cries/cry_skitty.aif | Bin 0 -> 3560 bytes sound/direct_sound_samples/cries/cry_slaking.aif | Bin 0 -> 4970 bytes sound/direct_sound_samples/cries/cry_slakoth.aif | Bin 0 -> 4272 bytes sound/direct_sound_samples/cries/cry_slowbro.aif | Bin 0 -> 6720 bytes sound/direct_sound_samples/cries/cry_slowking.aif | Bin 0 -> 11908 bytes sound/direct_sound_samples/cries/cry_slowpoke.aif | Bin 0 -> 3724 bytes sound/direct_sound_samples/cries/cry_slugma.aif | Bin 0 -> 8536 bytes sound/direct_sound_samples/cries/cry_smeargle.aif | Bin 0 -> 5114 bytes sound/direct_sound_samples/cries/cry_smoochum.aif | Bin 0 -> 5860 bytes sound/direct_sound_samples/cries/cry_sneasel.aif | Bin 0 -> 4586 bytes sound/direct_sound_samples/cries/cry_snorlax.aif | Bin 0 -> 2648 bytes sound/direct_sound_samples/cries/cry_snorunt.aif | Bin 0 -> 8500 bytes sound/direct_sound_samples/cries/cry_snubbull.aif | Bin 0 -> 7220 bytes sound/direct_sound_samples/cries/cry_solrock.aif | Bin 0 -> 8080 bytes sound/direct_sound_samples/cries/cry_spearow.aif | Bin 0 -> 8806 bytes sound/direct_sound_samples/cries/cry_spheal.aif | Bin 0 -> 2880 bytes sound/direct_sound_samples/cries/cry_spinarak.aif | Bin 0 -> 6696 bytes sound/direct_sound_samples/cries/cry_spinda.aif | Bin 0 -> 6216 bytes sound/direct_sound_samples/cries/cry_spoink.aif | Bin 0 -> 3648 bytes sound/direct_sound_samples/cries/cry_squirtle.aif | Bin 0 -> 7222 bytes sound/direct_sound_samples/cries/cry_stantler.aif | Bin 0 -> 11208 bytes sound/direct_sound_samples/cries/cry_starmie.aif | Bin 0 -> 10402 bytes sound/direct_sound_samples/cries/cry_staryu.aif | Bin 0 -> 9934 bytes sound/direct_sound_samples/cries/cry_steelix.aif | Bin 0 -> 18988 bytes sound/direct_sound_samples/cries/cry_sudowoodo.aif | Bin 0 -> 8084 bytes sound/direct_sound_samples/cries/cry_suicune.aif | Bin 0 -> 9126 bytes sound/direct_sound_samples/cries/cry_sunflora.aif | Bin 0 -> 7928 bytes sound/direct_sound_samples/cries/cry_sunkern.aif | Bin 0 -> 4056 bytes sound/direct_sound_samples/cries/cry_surskit.aif | Bin 0 -> 5258 bytes sound/direct_sound_samples/cries/cry_swablu.aif | Bin 0 -> 2824 bytes sound/direct_sound_samples/cries/cry_swalot.aif | Bin 0 -> 8676 bytes sound/direct_sound_samples/cries/cry_swampert.aif | Bin 0 -> 11220 bytes sound/direct_sound_samples/cries/cry_swellow.aif | Bin 0 -> 4524 bytes sound/direct_sound_samples/cries/cry_swinub.aif | Bin 0 -> 6328 bytes sound/direct_sound_samples/cries/cry_taillow.aif | Bin 0 -> 3024 bytes sound/direct_sound_samples/cries/cry_tangela.aif | Bin 0 -> 7550 bytes sound/direct_sound_samples/cries/cry_tauros.aif | Bin 0 -> 9150 bytes sound/direct_sound_samples/cries/cry_teddiursa.aif | Bin 0 -> 8266 bytes sound/direct_sound_samples/cries/cry_tentacool.aif | Bin 0 -> 7960 bytes .../direct_sound_samples/cries/cry_tentacruel.aif | Bin 0 -> 11458 bytes sound/direct_sound_samples/cries/cry_togepi.aif | Bin 0 -> 5460 bytes sound/direct_sound_samples/cries/cry_togetic.aif | Bin 0 -> 3526 bytes sound/direct_sound_samples/cries/cry_torchic.aif | Bin 0 -> 4840 bytes sound/direct_sound_samples/cries/cry_torkoal.aif | Bin 0 -> 4662 bytes sound/direct_sound_samples/cries/cry_totodile.aif | Bin 0 -> 9152 bytes sound/direct_sound_samples/cries/cry_trapinch.aif | Bin 0 -> 5080 bytes sound/direct_sound_samples/cries/cry_treecko.aif | Bin 0 -> 5836 bytes sound/direct_sound_samples/cries/cry_tropius.aif | Bin 0 -> 16318 bytes .../direct_sound_samples/cries/cry_typhlosion.aif | Bin 0 -> 18944 bytes sound/direct_sound_samples/cries/cry_tyranitar.aif | Bin 0 -> 11656 bytes sound/direct_sound_samples/cries/cry_tyrogue.aif | Bin 0 -> 8072 bytes sound/direct_sound_samples/cries/cry_umbreon.aif | Bin 0 -> 7746 bytes sound/direct_sound_samples/cries/cry_unown.aif | Bin 0 -> 6576 bytes .../direct_sound_samples/cries/cry_unused_265.aif | Bin 0 -> 4676 bytes .../direct_sound_samples/cries/cry_unused_268.aif | Bin 0 -> 8828 bytes sound/direct_sound_samples/cries/cry_ursaring.aif | Bin 0 -> 14862 bytes sound/direct_sound_samples/cries/cry_vaporeon.aif | Bin 0 -> 11018 bytes sound/direct_sound_samples/cries/cry_venomoth.aif | Bin 0 -> 8002 bytes sound/direct_sound_samples/cries/cry_venonat.aif | Bin 0 -> 7746 bytes sound/direct_sound_samples/cries/cry_venusaur.aif | Bin 0 -> 9648 bytes sound/direct_sound_samples/cries/cry_vibrava.aif | Bin 0 -> 7002 bytes .../direct_sound_samples/cries/cry_victreebel.aif | Bin 0 -> 9630 bytes sound/direct_sound_samples/cries/cry_vigoroth.aif | Bin 0 -> 7168 bytes sound/direct_sound_samples/cries/cry_vileplume.aif | Bin 0 -> 12760 bytes sound/direct_sound_samples/cries/cry_volbeat.aif | Bin 0 -> 5772 bytes sound/direct_sound_samples/cries/cry_voltorb.aif | Bin 0 -> 12346 bytes sound/direct_sound_samples/cries/cry_vulpix.aif | Bin 0 -> 11870 bytes sound/direct_sound_samples/cries/cry_wailmer.aif | Bin 0 -> 14134 bytes sound/direct_sound_samples/cries/cry_wailord.aif | Bin 0 -> 20928 bytes sound/direct_sound_samples/cries/cry_walrein.aif | Bin 0 -> 18067 bytes sound/direct_sound_samples/cries/cry_wartortle.aif | Bin 0 -> 8614 bytes sound/direct_sound_samples/cries/cry_weedle.aif | Bin 0 -> 8124 bytes .../direct_sound_samples/cries/cry_weepinbell.aif | Bin 0 -> 7310 bytes sound/direct_sound_samples/cries/cry_weezing.aif | Bin 0 -> 10806 bytes sound/direct_sound_samples/cries/cry_whiscash.aif | Bin 0 -> 8478 bytes sound/direct_sound_samples/cries/cry_whismur.aif | Bin 0 -> 4092 bytes .../direct_sound_samples/cries/cry_wigglytuff.aif | Bin 0 -> 3412 bytes sound/direct_sound_samples/cries/cry_wingull.aif | Bin 0 -> 6132 bytes sound/direct_sound_samples/cries/cry_wobbuffet.aif | Bin 0 -> 10276 bytes sound/direct_sound_samples/cries/cry_wooper.aif | Bin 0 -> 3710 bytes sound/direct_sound_samples/cries/cry_wurmple.aif | Bin 0 -> 4412 bytes sound/direct_sound_samples/cries/cry_wynaut.aif | Bin 0 -> 6932 bytes sound/direct_sound_samples/cries/cry_xatu.aif | Bin 0 -> 7392 bytes sound/direct_sound_samples/cries/cry_yanma.aif | Bin 0 -> 8506 bytes sound/direct_sound_samples/cries/cry_zangoose.aif | Bin 0 -> 4794 bytes sound/direct_sound_samples/cries/cry_zapdos.aif | Bin 0 -> 7724 bytes sound/direct_sound_samples/cries/cry_zigzagoon.aif | Bin 0 -> 5786 bytes sound/direct_sound_samples/cries/cry_zubat.aif | Bin 0 -> 9688 bytes sound/direct_sound_samples/cry_abra.aif | Bin 11660 -> 0 bytes sound/direct_sound_samples/cry_absol.aif | Bin 5256 -> 0 bytes sound/direct_sound_samples/cry_aerodactyl.aif | Bin 12142 -> 0 bytes sound/direct_sound_samples/cry_aggron.aif | Bin 12776 -> 0 bytes sound/direct_sound_samples/cry_aipom.aif | Bin 7058 -> 0 bytes sound/direct_sound_samples/cry_alakazam.aif | Bin 15740 -> 0 bytes sound/direct_sound_samples/cry_altaria.aif | Bin 5564 -> 0 bytes sound/direct_sound_samples/cry_ampharos.aif | Bin 8242 -> 0 bytes sound/direct_sound_samples/cry_anorith.aif | Bin 5862 -> 0 bytes sound/direct_sound_samples/cry_arbok.aif | Bin 9648 -> 0 bytes sound/direct_sound_samples/cry_arcanine.aif | Bin 8602 -> 0 bytes sound/direct_sound_samples/cry_ariados.aif | Bin 6170 -> 0 bytes sound/direct_sound_samples/cry_armaldo.aif | Bin 11380 -> 0 bytes sound/direct_sound_samples/cry_aron.aif | Bin 4600 -> 0 bytes sound/direct_sound_samples/cry_articuno.aif | Bin 11792 -> 0 bytes sound/direct_sound_samples/cry_azumarill.aif | Bin 8452 -> 0 bytes sound/direct_sound_samples/cry_azurill.aif | Bin 5212 -> 0 bytes sound/direct_sound_samples/cry_bagon.aif | Bin 3934 -> 0 bytes sound/direct_sound_samples/cry_baltoy.aif | Bin 6264 -> 0 bytes sound/direct_sound_samples/cry_banette.aif | Bin 6334 -> 0 bytes sound/direct_sound_samples/cry_barboach.aif | Bin 4632 -> 0 bytes sound/direct_sound_samples/cry_bayleef.aif | Bin 4414 -> 0 bytes sound/direct_sound_samples/cry_beautifly.aif | Bin 4128 -> 0 bytes sound/direct_sound_samples/cry_beedrill.aif | Bin 9656 -> 0 bytes sound/direct_sound_samples/cry_beldum.aif | Bin 4828 -> 0 bytes sound/direct_sound_samples/cry_bellossom.aif | Bin 7042 -> 0 bytes sound/direct_sound_samples/cry_bellsprout.aif | Bin 3792 -> 0 bytes sound/direct_sound_samples/cry_blastoise.aif | Bin 9622 -> 0 bytes sound/direct_sound_samples/cry_blaziken.aif | Bin 15690 -> 0 bytes sound/direct_sound_samples/cry_blissey.aif | Bin 8278 -> 0 bytes sound/direct_sound_samples/cry_breloom.aif | Bin 6376 -> 0 bytes sound/direct_sound_samples/cry_bulbasaur.aif | Bin 8266 -> 0 bytes sound/direct_sound_samples/cry_butterfree.aif | Bin 5026 -> 0 bytes sound/direct_sound_samples/cry_cacnea.aif | Bin 4488 -> 0 bytes sound/direct_sound_samples/cry_cacturne.aif | Bin 11310 -> 0 bytes sound/direct_sound_samples/cry_camerupt.aif | Bin 11526 -> 0 bytes sound/direct_sound_samples/cry_carvanha.aif | Bin 5048 -> 0 bytes sound/direct_sound_samples/cry_cascoon.aif | Bin 8126 -> 0 bytes sound/direct_sound_samples/cry_castform.aif | Bin 6302 -> 0 bytes sound/direct_sound_samples/cry_caterpie.aif | Bin 4192 -> 0 bytes sound/direct_sound_samples/cry_celebi.aif | Bin 7230 -> 0 bytes sound/direct_sound_samples/cry_chansey.aif | Bin 7390 -> 0 bytes sound/direct_sound_samples/cry_charizard.aif | Bin 9622 -> 0 bytes sound/direct_sound_samples/cry_charmander.aif | Bin 7216 -> 0 bytes sound/direct_sound_samples/cry_charmeleon.aif | Bin 7248 -> 0 bytes sound/direct_sound_samples/cry_chikorita.aif | Bin 2654 -> 0 bytes sound/direct_sound_samples/cry_chimecho.aif | Bin 5040 -> 0 bytes sound/direct_sound_samples/cry_chinchou.aif | Bin 6346 -> 0 bytes sound/direct_sound_samples/cry_clamperl.aif | Bin 9142 -> 0 bytes sound/direct_sound_samples/cry_claydol.aif | Bin 9668 -> 0 bytes sound/direct_sound_samples/cry_clefable.aif | Bin 5294 -> 0 bytes sound/direct_sound_samples/cry_clefairy.aif | Bin 4234 -> 0 bytes sound/direct_sound_samples/cry_cleffa.aif | Bin 2992 -> 0 bytes sound/direct_sound_samples/cry_cloyster.aif | Bin 10354 -> 0 bytes sound/direct_sound_samples/cry_combusken.aif | Bin 14360 -> 0 bytes sound/direct_sound_samples/cry_corphish.aif | Bin 6010 -> 0 bytes sound/direct_sound_samples/cry_corsola.aif | Bin 6440 -> 0 bytes sound/direct_sound_samples/cry_cradily.aif | Bin 14542 -> 0 bytes sound/direct_sound_samples/cry_crawdaunt.aif | Bin 12316 -> 0 bytes sound/direct_sound_samples/cry_crobat.aif | Bin 11562 -> 0 bytes sound/direct_sound_samples/cry_croconaw.aif | Bin 10096 -> 0 bytes sound/direct_sound_samples/cry_cubone.aif | Bin 7558 -> 0 bytes sound/direct_sound_samples/cry_cyndaquil.aif | Bin 3528 -> 0 bytes sound/direct_sound_samples/cry_delcatty.aif | Bin 10518 -> 0 bytes sound/direct_sound_samples/cry_delibird.aif | Bin 8094 -> 0 bytes sound/direct_sound_samples/cry_deoxys.aif | Bin 10388 -> 0 bytes sound/direct_sound_samples/cry_dewgong.aif | Bin 10546 -> 0 bytes sound/direct_sound_samples/cry_diglett.aif | Bin 9698 -> 0 bytes sound/direct_sound_samples/cry_ditto.aif | Bin 5566 -> 0 bytes sound/direct_sound_samples/cry_dodrio.aif | Bin 9712 -> 0 bytes sound/direct_sound_samples/cry_doduo.aif | Bin 9616 -> 0 bytes sound/direct_sound_samples/cry_donphan.aif | Bin 8554 -> 0 bytes sound/direct_sound_samples/cry_dragonair.aif | Bin 8318 -> 0 bytes sound/direct_sound_samples/cry_dragonite.aif | Bin 9502 -> 0 bytes sound/direct_sound_samples/cry_dratini.aif | Bin 5812 -> 0 bytes sound/direct_sound_samples/cry_drowzee.aif | Bin 14494 -> 0 bytes sound/direct_sound_samples/cry_dugtrio.aif | Bin 9686 -> 0 bytes sound/direct_sound_samples/cry_dunsparce.aif | Bin 7926 -> 0 bytes sound/direct_sound_samples/cry_dusclops.aif | Bin 6858 -> 0 bytes sound/direct_sound_samples/cry_duskull.aif | Bin 5310 -> 0 bytes sound/direct_sound_samples/cry_dustox.aif | Bin 6338 -> 0 bytes sound/direct_sound_samples/cry_eevee.aif | Bin 7104 -> 0 bytes sound/direct_sound_samples/cry_ekans.aif | Bin 9626 -> 0 bytes sound/direct_sound_samples/cry_electabuzz.aif | Bin 15380 -> 0 bytes sound/direct_sound_samples/cry_electrike.aif | Bin 6186 -> 0 bytes sound/direct_sound_samples/cry_electrode.aif | Bin 12564 -> 0 bytes sound/direct_sound_samples/cry_elekid.aif | Bin 5284 -> 0 bytes sound/direct_sound_samples/cry_entei.aif | Bin 10198 -> 0 bytes sound/direct_sound_samples/cry_espeon.aif | Bin 9828 -> 0 bytes sound/direct_sound_samples/cry_exeggcute.aif | Bin 9416 -> 0 bytes sound/direct_sound_samples/cry_exeggutor.aif | Bin 15880 -> 0 bytes sound/direct_sound_samples/cry_exploud.aif | Bin 14086 -> 0 bytes sound/direct_sound_samples/cry_farfetchd.aif | Bin 3766 -> 0 bytes sound/direct_sound_samples/cry_fearow.aif | Bin 8602 -> 0 bytes sound/direct_sound_samples/cry_feebas.aif | Bin 3932 -> 0 bytes sound/direct_sound_samples/cry_feraligatr.aif | Bin 12712 -> 0 bytes sound/direct_sound_samples/cry_flaaffy.aif | Bin 6854 -> 0 bytes sound/direct_sound_samples/cry_flareon.aif | Bin 7748 -> 0 bytes sound/direct_sound_samples/cry_flygon.aif | Bin 12974 -> 0 bytes sound/direct_sound_samples/cry_forretress.aif | Bin 9990 -> 0 bytes sound/direct_sound_samples/cry_furret.aif | Bin 3168 -> 0 bytes sound/direct_sound_samples/cry_gardevoir.aif | Bin 12154 -> 0 bytes sound/direct_sound_samples/cry_gastly.aif | Bin 11620 -> 0 bytes sound/direct_sound_samples/cry_gengar.aif | Bin 7372 -> 0 bytes sound/direct_sound_samples/cry_geodude.aif | Bin 11816 -> 0 bytes sound/direct_sound_samples/cry_girafarig.aif | Bin 7346 -> 0 bytes sound/direct_sound_samples/cry_glalie.aif | Bin 10420 -> 0 bytes sound/direct_sound_samples/cry_gligar.aif | Bin 6068 -> 0 bytes sound/direct_sound_samples/cry_gloom.aif | Bin 6246 -> 0 bytes sound/direct_sound_samples/cry_golbat.aif | Bin 9674 -> 0 bytes sound/direct_sound_samples/cry_goldeen.aif | Bin 4936 -> 0 bytes sound/direct_sound_samples/cry_golduck.aif | Bin 5646 -> 0 bytes sound/direct_sound_samples/cry_golem.aif | Bin 7080 -> 0 bytes sound/direct_sound_samples/cry_gorebyss.aif | Bin 11176 -> 0 bytes sound/direct_sound_samples/cry_granbull.aif | Bin 11782 -> 0 bytes sound/direct_sound_samples/cry_graveler.aif | Bin 13900 -> 0 bytes sound/direct_sound_samples/cry_grimer.aif | Bin 5274 -> 0 bytes sound/direct_sound_samples/cry_groudon.aif | Bin 18438 -> 0 bytes sound/direct_sound_samples/cry_grovyle.aif | Bin 10198 -> 0 bytes sound/direct_sound_samples/cry_growlithe.aif | Bin 6696 -> 0 bytes sound/direct_sound_samples/cry_grumpig.aif | Bin 6318 -> 0 bytes sound/direct_sound_samples/cry_gulpin.aif | Bin 4028 -> 0 bytes sound/direct_sound_samples/cry_gyarados.aif | Bin 10078 -> 0 bytes sound/direct_sound_samples/cry_hariyama.aif | Bin 8348 -> 0 bytes sound/direct_sound_samples/cry_haunter.aif | Bin 11714 -> 0 bytes sound/direct_sound_samples/cry_heracross.aif | Bin 9144 -> 0 bytes sound/direct_sound_samples/cry_hitmonchan.aif | Bin 8906 -> 0 bytes sound/direct_sound_samples/cry_hitmonlee.aif | Bin 9318 -> 0 bytes sound/direct_sound_samples/cry_hitmontop.aif | Bin 6936 -> 0 bytes sound/direct_sound_samples/cry_ho_oh.aif | Bin 11260 -> 0 bytes sound/direct_sound_samples/cry_hoothoot.aif | Bin 5458 -> 0 bytes sound/direct_sound_samples/cry_hoppip.aif | Bin 4226 -> 0 bytes sound/direct_sound_samples/cry_horsea.aif | Bin 4754 -> 0 bytes sound/direct_sound_samples/cry_houndoom.aif | Bin 9820 -> 0 bytes sound/direct_sound_samples/cry_houndour.aif | Bin 6332 -> 0 bytes sound/direct_sound_samples/cry_huntail.aif | Bin 7944 -> 0 bytes sound/direct_sound_samples/cry_hypno.aif | Bin 14450 -> 0 bytes sound/direct_sound_samples/cry_igglybuff.aif | Bin 3518 -> 0 bytes sound/direct_sound_samples/cry_illumise.aif | Bin 8536 -> 0 bytes sound/direct_sound_samples/cry_ivysaur.aif | Bin 8270 -> 0 bytes sound/direct_sound_samples/cry_jigglypuff.aif | Bin 2720 -> 0 bytes sound/direct_sound_samples/cry_jirachi.aif | Bin 6758 -> 0 bytes sound/direct_sound_samples/cry_jolteon.aif | Bin 7904 -> 0 bytes sound/direct_sound_samples/cry_jumpluff.aif | Bin 8106 -> 0 bytes sound/direct_sound_samples/cry_jynx.aif | Bin 23606 -> 0 bytes sound/direct_sound_samples/cry_kabuto.aif | Bin 6170 -> 0 bytes sound/direct_sound_samples/cry_kabutops.aif | Bin 6867 -> 0 bytes sound/direct_sound_samples/cry_kadabra.aif | Bin 13408 -> 0 bytes sound/direct_sound_samples/cry_kakuna.aif | Bin 9104 -> 0 bytes sound/direct_sound_samples/cry_kangaskhan.aif | Bin 9334 -> 0 bytes sound/direct_sound_samples/cry_kecleon.aif | Bin 4202 -> 0 bytes sound/direct_sound_samples/cry_kingdra.aif | Bin 6922 -> 0 bytes sound/direct_sound_samples/cry_kingler.aif | Bin 12132 -> 0 bytes sound/direct_sound_samples/cry_kirlia.aif | Bin 6100 -> 0 bytes sound/direct_sound_samples/cry_koffing.aif | Bin 10154 -> 0 bytes sound/direct_sound_samples/cry_krabby.aif | Bin 12112 -> 0 bytes sound/direct_sound_samples/cry_kyogre.aif | Bin 17782 -> 0 bytes sound/direct_sound_samples/cry_lairon.aif | Bin 10392 -> 0 bytes sound/direct_sound_samples/cry_lanturn.aif | Bin 5282 -> 0 bytes sound/direct_sound_samples/cry_lapras.aif | Bin 7408 -> 0 bytes sound/direct_sound_samples/cry_larvitar.aif | Bin 6350 -> 0 bytes sound/direct_sound_samples/cry_latias.aif | Bin 6098 -> 0 bytes sound/direct_sound_samples/cry_latios.aif | Bin 10958 -> 0 bytes sound/direct_sound_samples/cry_ledian.aif | Bin 4214 -> 0 bytes sound/direct_sound_samples/cry_ledyba.aif | Bin 3506 -> 0 bytes sound/direct_sound_samples/cry_lickitung.aif | Bin 7571 -> 0 bytes sound/direct_sound_samples/cry_lileep.aif | Bin 4838 -> 0 bytes sound/direct_sound_samples/cry_linoone.aif | Bin 15248 -> 0 bytes sound/direct_sound_samples/cry_lombre.aif | Bin 7282 -> 0 bytes sound/direct_sound_samples/cry_lotad.aif | Bin 2232 -> 0 bytes sound/direct_sound_samples/cry_loudred.aif | Bin 6582 -> 0 bytes sound/direct_sound_samples/cry_ludicolo.aif | Bin 8398 -> 0 bytes sound/direct_sound_samples/cry_lugia.aif | Bin 18900 -> 0 bytes sound/direct_sound_samples/cry_lunatone.aif | Bin 11956 -> 0 bytes sound/direct_sound_samples/cry_luvdisc.aif | Bin 2456 -> 0 bytes sound/direct_sound_samples/cry_machamp.aif | Bin 8256 -> 0 bytes sound/direct_sound_samples/cry_machoke.aif | Bin 6782 -> 0 bytes sound/direct_sound_samples/cry_machop.aif | Bin 6696 -> 0 bytes sound/direct_sound_samples/cry_magby.aif | Bin 7218 -> 0 bytes sound/direct_sound_samples/cry_magcargo.aif | Bin 10486 -> 0 bytes sound/direct_sound_samples/cry_magikarp.aif | Bin 9492 -> 0 bytes sound/direct_sound_samples/cry_magmar.aif | Bin 7738 -> 0 bytes sound/direct_sound_samples/cry_magnemite.aif | Bin 9610 -> 0 bytes sound/direct_sound_samples/cry_magneton.aif | Bin 11914 -> 0 bytes sound/direct_sound_samples/cry_makuhita.aif | Bin 3704 -> 0 bytes sound/direct_sound_samples/cry_manectric.aif | Bin 10492 -> 0 bytes sound/direct_sound_samples/cry_mankey.aif | Bin 8178 -> 0 bytes sound/direct_sound_samples/cry_mantine.aif | Bin 7884 -> 0 bytes sound/direct_sound_samples/cry_mareep.aif | Bin 3694 -> 0 bytes sound/direct_sound_samples/cry_marill.aif | Bin 6538 -> 0 bytes sound/direct_sound_samples/cry_marowak.aif | Bin 7216 -> 0 bytes sound/direct_sound_samples/cry_marshtomp.aif | Bin 8498 -> 0 bytes sound/direct_sound_samples/cry_masquerain.aif | Bin 9830 -> 0 bytes sound/direct_sound_samples/cry_mawile.aif | Bin 5756 -> 0 bytes sound/direct_sound_samples/cry_medicham.aif | Bin 8246 -> 0 bytes sound/direct_sound_samples/cry_meditite.aif | Bin 4078 -> 0 bytes sound/direct_sound_samples/cry_meganium.aif | Bin 8100 -> 0 bytes sound/direct_sound_samples/cry_meowth.aif | Bin 4796 -> 0 bytes sound/direct_sound_samples/cry_metagross.aif | Bin 19644 -> 0 bytes sound/direct_sound_samples/cry_metang.aif | Bin 9398 -> 0 bytes sound/direct_sound_samples/cry_metapod.aif | Bin 11622 -> 0 bytes sound/direct_sound_samples/cry_mew.aif | Bin 15146 -> 0 bytes sound/direct_sound_samples/cry_mewtwo.aif | Bin 15144 -> 0 bytes sound/direct_sound_samples/cry_mightyena.aif | Bin 9748 -> 0 bytes sound/direct_sound_samples/cry_milotic.aif | Bin 19542 -> 0 bytes sound/direct_sound_samples/cry_miltank.aif | Bin 7424 -> 0 bytes sound/direct_sound_samples/cry_minun.aif | Bin 8004 -> 0 bytes sound/direct_sound_samples/cry_misdreavus.aif | Bin 5816 -> 0 bytes sound/direct_sound_samples/cry_moltres.aif | Bin 11796 -> 0 bytes sound/direct_sound_samples/cry_mr_mime.aif | Bin 9446 -> 0 bytes sound/direct_sound_samples/cry_mudkip.aif | Bin 3776 -> 0 bytes sound/direct_sound_samples/cry_muk.aif | Bin 7374 -> 0 bytes sound/direct_sound_samples/cry_murkrow.aif | Bin 8370 -> 0 bytes sound/direct_sound_samples/cry_natu.aif | Bin 5294 -> 0 bytes sound/direct_sound_samples/cry_nidoking.aif | Bin 12176 -> 0 bytes sound/direct_sound_samples/cry_nidoqueen.aif | Bin 8424 -> 0 bytes sound/direct_sound_samples/cry_nidoran_f.aif | Bin 4858 -> 0 bytes sound/direct_sound_samples/cry_nidoran_m.aif | Bin 5216 -> 0 bytes sound/direct_sound_samples/cry_nidorina.aif | Bin 6394 -> 0 bytes sound/direct_sound_samples/cry_nidorino.aif | Bin 6042 -> 0 bytes sound/direct_sound_samples/cry_nincada.aif | Bin 3244 -> 0 bytes sound/direct_sound_samples/cry_ninetales.aif | Bin 12174 -> 0 bytes sound/direct_sound_samples/cry_ninjask.aif | Bin 6084 -> 0 bytes sound/direct_sound_samples/cry_noctowl.aif | Bin 10564 -> 0 bytes sound/direct_sound_samples/cry_none.aif | Bin 8286 -> 0 bytes sound/direct_sound_samples/cry_nosepass.aif | Bin 6696 -> 0 bytes sound/direct_sound_samples/cry_numel.aif | Bin 4664 -> 0 bytes sound/direct_sound_samples/cry_nuzleaf.aif | Bin 5712 -> 0 bytes sound/direct_sound_samples/cry_octillery.aif | Bin 13084 -> 0 bytes sound/direct_sound_samples/cry_oddish.aif | Bin 7298 -> 0 bytes sound/direct_sound_samples/cry_omanyte.aif | Bin 6672 -> 0 bytes sound/direct_sound_samples/cry_omastar.aif | Bin 6666 -> 0 bytes sound/direct_sound_samples/cry_onix.aif | Bin 12340 -> 0 bytes sound/direct_sound_samples/cry_paras.aif | Bin 13924 -> 0 bytes sound/direct_sound_samples/cry_parasect.aif | Bin 15140 -> 0 bytes sound/direct_sound_samples/cry_pelipper.aif | Bin 5894 -> 0 bytes sound/direct_sound_samples/cry_persian.aif | Bin 9412 -> 0 bytes sound/direct_sound_samples/cry_phanpy.aif | Bin 5664 -> 0 bytes sound/direct_sound_samples/cry_pichu.aif | Bin 3684 -> 0 bytes sound/direct_sound_samples/cry_pidgeot.aif | Bin 8590 -> 0 bytes sound/direct_sound_samples/cry_pidgeotto.aif | Bin 7512 -> 0 bytes sound/direct_sound_samples/cry_pidgey.aif | Bin 1984 -> 0 bytes sound/direct_sound_samples/cry_pikachu.aif | Bin 8316 -> 0 bytes sound/direct_sound_samples/cry_piloswine.aif | Bin 6480 -> 0 bytes sound/direct_sound_samples/cry_pineco.aif | Bin 6690 -> 0 bytes sound/direct_sound_samples/cry_pinsir.aif | Bin 6186 -> 0 bytes sound/direct_sound_samples/cry_plusle.aif | Bin 4504 -> 0 bytes sound/direct_sound_samples/cry_politoed.aif | Bin 9114 -> 0 bytes sound/direct_sound_samples/cry_poliwag.aif | Bin 5562 -> 0 bytes sound/direct_sound_samples/cry_poliwhirl.aif | Bin 3354 -> 0 bytes sound/direct_sound_samples/cry_poliwrath.aif | Bin 5582 -> 0 bytes sound/direct_sound_samples/cry_ponyta.aif | Bin 7524 -> 0 bytes sound/direct_sound_samples/cry_poochyena.aif | Bin 4656 -> 0 bytes sound/direct_sound_samples/cry_porygon.aif | Bin 10002 -> 0 bytes sound/direct_sound_samples/cry_porygon2.aif | Bin 7854 -> 0 bytes sound/direct_sound_samples/cry_primeape.aif | Bin 8086 -> 0 bytes sound/direct_sound_samples/cry_psyduck.aif | Bin 6578 -> 0 bytes sound/direct_sound_samples/cry_pupitar.aif | Bin 4234 -> 0 bytes sound/direct_sound_samples/cry_quagsire.aif | Bin 6684 -> 0 bytes sound/direct_sound_samples/cry_quilava.aif | Bin 5962 -> 0 bytes sound/direct_sound_samples/cry_qwilfish.aif | Bin 5808 -> 0 bytes sound/direct_sound_samples/cry_raichu.aif | Bin 11842 -> 0 bytes sound/direct_sound_samples/cry_raikou.aif | Bin 8704 -> 0 bytes sound/direct_sound_samples/cry_ralts.aif | Bin 5066 -> 0 bytes sound/direct_sound_samples/cry_rapidash.aif | Bin 9292 -> 0 bytes sound/direct_sound_samples/cry_raticate.aif | Bin 4770 -> 0 bytes sound/direct_sound_samples/cry_rattata.aif | Bin 3956 -> 0 bytes sound/direct_sound_samples/cry_rayquaza.aif | Bin 14532 -> 0 bytes sound/direct_sound_samples/cry_regice.aif | Bin 15936 -> 0 bytes sound/direct_sound_samples/cry_regirock.aif | Bin 15862 -> 0 bytes sound/direct_sound_samples/cry_registeel.aif | Bin 11476 -> 0 bytes sound/direct_sound_samples/cry_relicanth.aif | Bin 10072 -> 0 bytes sound/direct_sound_samples/cry_remoraid.aif | Bin 5290 -> 0 bytes sound/direct_sound_samples/cry_rhydon.aif | Bin 10186 -> 0 bytes sound/direct_sound_samples/cry_rhyhorn.aif | Bin 9686 -> 0 bytes sound/direct_sound_samples/cry_roselia.aif | Bin 5382 -> 0 bytes sound/direct_sound_samples/cry_sableye.aif | Bin 5826 -> 0 bytes sound/direct_sound_samples/cry_salamence.aif | Bin 12514 -> 0 bytes sound/direct_sound_samples/cry_sandshrew.aif | Bin 4678 -> 0 bytes sound/direct_sound_samples/cry_sandslash.aif | Bin 6784 -> 0 bytes sound/direct_sound_samples/cry_sceptile.aif | Bin 13012 -> 0 bytes sound/direct_sound_samples/cry_scizor.aif | Bin 11462 -> 0 bytes sound/direct_sound_samples/cry_scyther.aif | Bin 6676 -> 0 bytes sound/direct_sound_samples/cry_seadra.aif | Bin 4228 -> 0 bytes sound/direct_sound_samples/cry_seaking.aif | Bin 9654 -> 0 bytes sound/direct_sound_samples/cry_sealeo.aif | Bin 5928 -> 0 bytes sound/direct_sound_samples/cry_seedot.aif | Bin 4106 -> 0 bytes sound/direct_sound_samples/cry_seel.aif | Bin 8954 -> 0 bytes sound/direct_sound_samples/cry_sentret.aif | Bin 2108 -> 0 bytes sound/direct_sound_samples/cry_seviper.aif | Bin 5820 -> 0 bytes sound/direct_sound_samples/cry_sharpedo.aif | Bin 11488 -> 0 bytes sound/direct_sound_samples/cry_shedinja.aif | Bin 3876 -> 0 bytes sound/direct_sound_samples/cry_shelgon.aif | Bin 9992 -> 0 bytes sound/direct_sound_samples/cry_shellder.aif | Bin 7718 -> 0 bytes sound/direct_sound_samples/cry_shiftry.aif | Bin 9860 -> 0 bytes sound/direct_sound_samples/cry_shroomish.aif | Bin 4436 -> 0 bytes sound/direct_sound_samples/cry_shuckle.aif | Bin 5110 -> 0 bytes sound/direct_sound_samples/cry_shuppet.aif | Bin 4144 -> 0 bytes sound/direct_sound_samples/cry_silcoon.aif | Bin 8074 -> 0 bytes sound/direct_sound_samples/cry_skarmory.aif | Bin 11982 -> 0 bytes sound/direct_sound_samples/cry_skiploom.aif | Bin 6516 -> 0 bytes sound/direct_sound_samples/cry_skitty.aif | Bin 3560 -> 0 bytes sound/direct_sound_samples/cry_slaking.aif | Bin 4970 -> 0 bytes sound/direct_sound_samples/cry_slakoth.aif | Bin 4272 -> 0 bytes sound/direct_sound_samples/cry_slowbro.aif | Bin 6720 -> 0 bytes sound/direct_sound_samples/cry_slowking.aif | Bin 11908 -> 0 bytes sound/direct_sound_samples/cry_slowpoke.aif | Bin 3724 -> 0 bytes sound/direct_sound_samples/cry_slugma.aif | Bin 8536 -> 0 bytes sound/direct_sound_samples/cry_smeargle.aif | Bin 5114 -> 0 bytes sound/direct_sound_samples/cry_smoochum.aif | Bin 5860 -> 0 bytes sound/direct_sound_samples/cry_sneasel.aif | Bin 4586 -> 0 bytes sound/direct_sound_samples/cry_snorlax.aif | Bin 2648 -> 0 bytes sound/direct_sound_samples/cry_snorunt.aif | Bin 8500 -> 0 bytes sound/direct_sound_samples/cry_snubbull.aif | Bin 7220 -> 0 bytes sound/direct_sound_samples/cry_solrock.aif | Bin 8080 -> 0 bytes sound/direct_sound_samples/cry_spearow.aif | Bin 8806 -> 0 bytes sound/direct_sound_samples/cry_spheal.aif | Bin 2880 -> 0 bytes sound/direct_sound_samples/cry_spinarak.aif | Bin 6696 -> 0 bytes sound/direct_sound_samples/cry_spinda.aif | Bin 6216 -> 0 bytes sound/direct_sound_samples/cry_spoink.aif | Bin 3648 -> 0 bytes sound/direct_sound_samples/cry_squirtle.aif | Bin 7222 -> 0 bytes sound/direct_sound_samples/cry_stantler.aif | Bin 11208 -> 0 bytes sound/direct_sound_samples/cry_starmie.aif | Bin 10402 -> 0 bytes sound/direct_sound_samples/cry_staryu.aif | Bin 9934 -> 0 bytes sound/direct_sound_samples/cry_steelix.aif | Bin 18988 -> 0 bytes sound/direct_sound_samples/cry_sudowoodo.aif | Bin 8084 -> 0 bytes sound/direct_sound_samples/cry_suicune.aif | Bin 9126 -> 0 bytes sound/direct_sound_samples/cry_sunflora.aif | Bin 7928 -> 0 bytes sound/direct_sound_samples/cry_sunkern.aif | Bin 4056 -> 0 bytes sound/direct_sound_samples/cry_surskit.aif | Bin 5258 -> 0 bytes sound/direct_sound_samples/cry_swablu.aif | Bin 2824 -> 0 bytes sound/direct_sound_samples/cry_swalot.aif | Bin 8676 -> 0 bytes sound/direct_sound_samples/cry_swampert.aif | Bin 11220 -> 0 bytes sound/direct_sound_samples/cry_swellow.aif | Bin 4524 -> 0 bytes sound/direct_sound_samples/cry_swinub.aif | Bin 6328 -> 0 bytes sound/direct_sound_samples/cry_taillow.aif | Bin 3024 -> 0 bytes sound/direct_sound_samples/cry_tangela.aif | Bin 7550 -> 0 bytes sound/direct_sound_samples/cry_tauros.aif | Bin 9150 -> 0 bytes sound/direct_sound_samples/cry_teddiursa.aif | Bin 8266 -> 0 bytes sound/direct_sound_samples/cry_tentacool.aif | Bin 7960 -> 0 bytes sound/direct_sound_samples/cry_tentacruel.aif | Bin 11458 -> 0 bytes sound/direct_sound_samples/cry_togepi.aif | Bin 5460 -> 0 bytes sound/direct_sound_samples/cry_togetic.aif | Bin 3526 -> 0 bytes sound/direct_sound_samples/cry_torchic.aif | Bin 4840 -> 0 bytes sound/direct_sound_samples/cry_torkoal.aif | Bin 4662 -> 0 bytes sound/direct_sound_samples/cry_totodile.aif | Bin 9152 -> 0 bytes sound/direct_sound_samples/cry_trapinch.aif | Bin 5080 -> 0 bytes sound/direct_sound_samples/cry_treecko.aif | Bin 5836 -> 0 bytes sound/direct_sound_samples/cry_tropius.aif | Bin 16318 -> 0 bytes sound/direct_sound_samples/cry_typhlosion.aif | Bin 18944 -> 0 bytes sound/direct_sound_samples/cry_tyranitar.aif | Bin 11656 -> 0 bytes sound/direct_sound_samples/cry_tyrogue.aif | Bin 8072 -> 0 bytes sound/direct_sound_samples/cry_umbreon.aif | Bin 7746 -> 0 bytes sound/direct_sound_samples/cry_unown.aif | Bin 6576 -> 0 bytes sound/direct_sound_samples/cry_unused_265.aif | Bin 4676 -> 0 bytes sound/direct_sound_samples/cry_unused_268.aif | Bin 8828 -> 0 bytes sound/direct_sound_samples/cry_ursaring.aif | Bin 14862 -> 0 bytes sound/direct_sound_samples/cry_vaporeon.aif | Bin 11018 -> 0 bytes sound/direct_sound_samples/cry_venomoth.aif | Bin 8002 -> 0 bytes sound/direct_sound_samples/cry_venonat.aif | Bin 7746 -> 0 bytes sound/direct_sound_samples/cry_venusaur.aif | Bin 9648 -> 0 bytes sound/direct_sound_samples/cry_vibrava.aif | Bin 7002 -> 0 bytes sound/direct_sound_samples/cry_victreebel.aif | Bin 9630 -> 0 bytes sound/direct_sound_samples/cry_vigoroth.aif | Bin 7168 -> 0 bytes sound/direct_sound_samples/cry_vileplume.aif | Bin 12760 -> 0 bytes sound/direct_sound_samples/cry_volbeat.aif | Bin 5772 -> 0 bytes sound/direct_sound_samples/cry_voltorb.aif | Bin 12346 -> 0 bytes sound/direct_sound_samples/cry_vulpix.aif | Bin 11870 -> 0 bytes sound/direct_sound_samples/cry_wailmer.aif | Bin 14134 -> 0 bytes sound/direct_sound_samples/cry_wailord.aif | Bin 20928 -> 0 bytes sound/direct_sound_samples/cry_walrein.aif | Bin 18067 -> 0 bytes sound/direct_sound_samples/cry_wartortle.aif | Bin 8614 -> 0 bytes sound/direct_sound_samples/cry_weedle.aif | Bin 8124 -> 0 bytes sound/direct_sound_samples/cry_weepinbell.aif | Bin 7310 -> 0 bytes sound/direct_sound_samples/cry_weezing.aif | Bin 10806 -> 0 bytes sound/direct_sound_samples/cry_whiscash.aif | Bin 8478 -> 0 bytes sound/direct_sound_samples/cry_whismur.aif | Bin 4092 -> 0 bytes sound/direct_sound_samples/cry_wigglytuff.aif | Bin 3412 -> 0 bytes sound/direct_sound_samples/cry_wingull.aif | Bin 6132 -> 0 bytes sound/direct_sound_samples/cry_wobbuffet.aif | Bin 10276 -> 0 bytes sound/direct_sound_samples/cry_wooper.aif | Bin 3710 -> 0 bytes sound/direct_sound_samples/cry_wurmple.aif | Bin 4412 -> 0 bytes sound/direct_sound_samples/cry_wynaut.aif | Bin 6932 -> 0 bytes sound/direct_sound_samples/cry_xatu.aif | Bin 7392 -> 0 bytes sound/direct_sound_samples/cry_yanma.aif | Bin 8506 -> 0 bytes sound/direct_sound_samples/cry_zangoose.aif | Bin 4794 -> 0 bytes sound/direct_sound_samples/cry_zapdos.aif | Bin 7724 -> 0 bytes sound/direct_sound_samples/cry_zigzagoon.aif | Bin 5786 -> 0 bytes sound/direct_sound_samples/cry_zubat.aif | Bin 9688 -> 0 bytes 780 files changed, 390 insertions(+), 390 deletions(-) create mode 100644 sound/direct_sound_samples/cries/cry_abra.aif create mode 100644 sound/direct_sound_samples/cries/cry_absol.aif create mode 100644 sound/direct_sound_samples/cries/cry_aerodactyl.aif create mode 100644 sound/direct_sound_samples/cries/cry_aggron.aif create mode 100644 sound/direct_sound_samples/cries/cry_aipom.aif create mode 100644 sound/direct_sound_samples/cries/cry_alakazam.aif create mode 100644 sound/direct_sound_samples/cries/cry_altaria.aif create mode 100644 sound/direct_sound_samples/cries/cry_ampharos.aif create mode 100644 sound/direct_sound_samples/cries/cry_anorith.aif create mode 100644 sound/direct_sound_samples/cries/cry_arbok.aif create mode 100644 sound/direct_sound_samples/cries/cry_arcanine.aif create mode 100644 sound/direct_sound_samples/cries/cry_ariados.aif create mode 100644 sound/direct_sound_samples/cries/cry_armaldo.aif create mode 100644 sound/direct_sound_samples/cries/cry_aron.aif create mode 100644 sound/direct_sound_samples/cries/cry_articuno.aif create mode 100644 sound/direct_sound_samples/cries/cry_azumarill.aif create mode 100644 sound/direct_sound_samples/cries/cry_azurill.aif create mode 100644 sound/direct_sound_samples/cries/cry_bagon.aif create mode 100644 sound/direct_sound_samples/cries/cry_baltoy.aif create mode 100644 sound/direct_sound_samples/cries/cry_banette.aif create mode 100644 sound/direct_sound_samples/cries/cry_barboach.aif create mode 100644 sound/direct_sound_samples/cries/cry_bayleef.aif create mode 100644 sound/direct_sound_samples/cries/cry_beautifly.aif create mode 100644 sound/direct_sound_samples/cries/cry_beedrill.aif create mode 100644 sound/direct_sound_samples/cries/cry_beldum.aif create mode 100644 sound/direct_sound_samples/cries/cry_bellossom.aif create mode 100644 sound/direct_sound_samples/cries/cry_bellsprout.aif create mode 100644 sound/direct_sound_samples/cries/cry_blastoise.aif create mode 100644 sound/direct_sound_samples/cries/cry_blaziken.aif create mode 100644 sound/direct_sound_samples/cries/cry_blissey.aif create mode 100644 sound/direct_sound_samples/cries/cry_breloom.aif create mode 100644 sound/direct_sound_samples/cries/cry_bulbasaur.aif create mode 100644 sound/direct_sound_samples/cries/cry_butterfree.aif create mode 100644 sound/direct_sound_samples/cries/cry_cacnea.aif create mode 100644 sound/direct_sound_samples/cries/cry_cacturne.aif create mode 100644 sound/direct_sound_samples/cries/cry_camerupt.aif create mode 100644 sound/direct_sound_samples/cries/cry_carvanha.aif create mode 100644 sound/direct_sound_samples/cries/cry_cascoon.aif create mode 100644 sound/direct_sound_samples/cries/cry_castform.aif create mode 100644 sound/direct_sound_samples/cries/cry_caterpie.aif create mode 100644 sound/direct_sound_samples/cries/cry_celebi.aif create mode 100644 sound/direct_sound_samples/cries/cry_chansey.aif create mode 100644 sound/direct_sound_samples/cries/cry_charizard.aif create mode 100644 sound/direct_sound_samples/cries/cry_charmander.aif create mode 100644 sound/direct_sound_samples/cries/cry_charmeleon.aif create mode 100644 sound/direct_sound_samples/cries/cry_chikorita.aif create mode 100644 sound/direct_sound_samples/cries/cry_chimecho.aif create mode 100644 sound/direct_sound_samples/cries/cry_chinchou.aif create mode 100644 sound/direct_sound_samples/cries/cry_clamperl.aif create mode 100644 sound/direct_sound_samples/cries/cry_claydol.aif create mode 100644 sound/direct_sound_samples/cries/cry_clefable.aif create mode 100644 sound/direct_sound_samples/cries/cry_clefairy.aif create mode 100644 sound/direct_sound_samples/cries/cry_cleffa.aif create mode 100644 sound/direct_sound_samples/cries/cry_cloyster.aif create mode 100644 sound/direct_sound_samples/cries/cry_combusken.aif create mode 100644 sound/direct_sound_samples/cries/cry_corphish.aif create mode 100644 sound/direct_sound_samples/cries/cry_corsola.aif create mode 100644 sound/direct_sound_samples/cries/cry_cradily.aif create mode 100644 sound/direct_sound_samples/cries/cry_crawdaunt.aif create mode 100644 sound/direct_sound_samples/cries/cry_crobat.aif create mode 100644 sound/direct_sound_samples/cries/cry_croconaw.aif create mode 100644 sound/direct_sound_samples/cries/cry_cubone.aif create mode 100644 sound/direct_sound_samples/cries/cry_cyndaquil.aif create mode 100644 sound/direct_sound_samples/cries/cry_delcatty.aif create mode 100644 sound/direct_sound_samples/cries/cry_delibird.aif create mode 100644 sound/direct_sound_samples/cries/cry_deoxys.aif create mode 100644 sound/direct_sound_samples/cries/cry_dewgong.aif create mode 100644 sound/direct_sound_samples/cries/cry_diglett.aif create mode 100644 sound/direct_sound_samples/cries/cry_ditto.aif create mode 100644 sound/direct_sound_samples/cries/cry_dodrio.aif create mode 100644 sound/direct_sound_samples/cries/cry_doduo.aif create mode 100644 sound/direct_sound_samples/cries/cry_donphan.aif create mode 100644 sound/direct_sound_samples/cries/cry_dragonair.aif create mode 100644 sound/direct_sound_samples/cries/cry_dragonite.aif create mode 100644 sound/direct_sound_samples/cries/cry_dratini.aif create mode 100644 sound/direct_sound_samples/cries/cry_drowzee.aif create mode 100644 sound/direct_sound_samples/cries/cry_dugtrio.aif create mode 100644 sound/direct_sound_samples/cries/cry_dunsparce.aif create mode 100644 sound/direct_sound_samples/cries/cry_dusclops.aif create mode 100644 sound/direct_sound_samples/cries/cry_duskull.aif create mode 100644 sound/direct_sound_samples/cries/cry_dustox.aif create mode 100644 sound/direct_sound_samples/cries/cry_eevee.aif create mode 100644 sound/direct_sound_samples/cries/cry_ekans.aif create mode 100644 sound/direct_sound_samples/cries/cry_electabuzz.aif create mode 100644 sound/direct_sound_samples/cries/cry_electrike.aif create mode 100644 sound/direct_sound_samples/cries/cry_electrode.aif create mode 100644 sound/direct_sound_samples/cries/cry_elekid.aif create mode 100644 sound/direct_sound_samples/cries/cry_entei.aif create mode 100644 sound/direct_sound_samples/cries/cry_espeon.aif create mode 100644 sound/direct_sound_samples/cries/cry_exeggcute.aif create mode 100644 sound/direct_sound_samples/cries/cry_exeggutor.aif create mode 100644 sound/direct_sound_samples/cries/cry_exploud.aif create mode 100644 sound/direct_sound_samples/cries/cry_farfetchd.aif create mode 100644 sound/direct_sound_samples/cries/cry_fearow.aif create mode 100644 sound/direct_sound_samples/cries/cry_feebas.aif create mode 100644 sound/direct_sound_samples/cries/cry_feraligatr.aif create mode 100644 sound/direct_sound_samples/cries/cry_flaaffy.aif create mode 100644 sound/direct_sound_samples/cries/cry_flareon.aif create mode 100644 sound/direct_sound_samples/cries/cry_flygon.aif create mode 100644 sound/direct_sound_samples/cries/cry_forretress.aif create mode 100644 sound/direct_sound_samples/cries/cry_furret.aif create mode 100644 sound/direct_sound_samples/cries/cry_gardevoir.aif create mode 100644 sound/direct_sound_samples/cries/cry_gastly.aif create mode 100644 sound/direct_sound_samples/cries/cry_gengar.aif create mode 100644 sound/direct_sound_samples/cries/cry_geodude.aif create mode 100644 sound/direct_sound_samples/cries/cry_girafarig.aif create mode 100644 sound/direct_sound_samples/cries/cry_glalie.aif create mode 100644 sound/direct_sound_samples/cries/cry_gligar.aif create mode 100644 sound/direct_sound_samples/cries/cry_gloom.aif create mode 100644 sound/direct_sound_samples/cries/cry_golbat.aif create mode 100644 sound/direct_sound_samples/cries/cry_goldeen.aif create mode 100644 sound/direct_sound_samples/cries/cry_golduck.aif create mode 100644 sound/direct_sound_samples/cries/cry_golem.aif create mode 100644 sound/direct_sound_samples/cries/cry_gorebyss.aif create mode 100644 sound/direct_sound_samples/cries/cry_granbull.aif create mode 100644 sound/direct_sound_samples/cries/cry_graveler.aif create mode 100644 sound/direct_sound_samples/cries/cry_grimer.aif create mode 100644 sound/direct_sound_samples/cries/cry_groudon.aif create mode 100644 sound/direct_sound_samples/cries/cry_grovyle.aif create mode 100644 sound/direct_sound_samples/cries/cry_growlithe.aif create mode 100644 sound/direct_sound_samples/cries/cry_grumpig.aif create mode 100644 sound/direct_sound_samples/cries/cry_gulpin.aif create mode 100644 sound/direct_sound_samples/cries/cry_gyarados.aif create mode 100644 sound/direct_sound_samples/cries/cry_hariyama.aif create mode 100644 sound/direct_sound_samples/cries/cry_haunter.aif create mode 100644 sound/direct_sound_samples/cries/cry_heracross.aif create mode 100644 sound/direct_sound_samples/cries/cry_hitmonchan.aif create mode 100644 sound/direct_sound_samples/cries/cry_hitmonlee.aif create mode 100644 sound/direct_sound_samples/cries/cry_hitmontop.aif create mode 100644 sound/direct_sound_samples/cries/cry_ho_oh.aif create mode 100644 sound/direct_sound_samples/cries/cry_hoothoot.aif create mode 100644 sound/direct_sound_samples/cries/cry_hoppip.aif create mode 100644 sound/direct_sound_samples/cries/cry_horsea.aif create mode 100644 sound/direct_sound_samples/cries/cry_houndoom.aif create mode 100644 sound/direct_sound_samples/cries/cry_houndour.aif create mode 100644 sound/direct_sound_samples/cries/cry_huntail.aif create mode 100644 sound/direct_sound_samples/cries/cry_hypno.aif create mode 100644 sound/direct_sound_samples/cries/cry_igglybuff.aif create mode 100644 sound/direct_sound_samples/cries/cry_illumise.aif create mode 100644 sound/direct_sound_samples/cries/cry_ivysaur.aif create mode 100644 sound/direct_sound_samples/cries/cry_jigglypuff.aif create mode 100644 sound/direct_sound_samples/cries/cry_jirachi.aif create mode 100644 sound/direct_sound_samples/cries/cry_jolteon.aif create mode 100644 sound/direct_sound_samples/cries/cry_jumpluff.aif create mode 100644 sound/direct_sound_samples/cries/cry_jynx.aif create mode 100644 sound/direct_sound_samples/cries/cry_kabuto.aif create mode 100644 sound/direct_sound_samples/cries/cry_kabutops.aif create mode 100644 sound/direct_sound_samples/cries/cry_kadabra.aif create mode 100644 sound/direct_sound_samples/cries/cry_kakuna.aif create mode 100644 sound/direct_sound_samples/cries/cry_kangaskhan.aif create mode 100644 sound/direct_sound_samples/cries/cry_kecleon.aif create mode 100644 sound/direct_sound_samples/cries/cry_kingdra.aif create mode 100644 sound/direct_sound_samples/cries/cry_kingler.aif create mode 100644 sound/direct_sound_samples/cries/cry_kirlia.aif create mode 100644 sound/direct_sound_samples/cries/cry_koffing.aif create mode 100644 sound/direct_sound_samples/cries/cry_krabby.aif create mode 100644 sound/direct_sound_samples/cries/cry_kyogre.aif create mode 100644 sound/direct_sound_samples/cries/cry_lairon.aif create mode 100644 sound/direct_sound_samples/cries/cry_lanturn.aif create mode 100644 sound/direct_sound_samples/cries/cry_lapras.aif create mode 100644 sound/direct_sound_samples/cries/cry_larvitar.aif create mode 100644 sound/direct_sound_samples/cries/cry_latias.aif create mode 100644 sound/direct_sound_samples/cries/cry_latios.aif create mode 100644 sound/direct_sound_samples/cries/cry_ledian.aif create mode 100644 sound/direct_sound_samples/cries/cry_ledyba.aif create mode 100644 sound/direct_sound_samples/cries/cry_lickitung.aif create mode 100644 sound/direct_sound_samples/cries/cry_lileep.aif create mode 100644 sound/direct_sound_samples/cries/cry_linoone.aif create mode 100644 sound/direct_sound_samples/cries/cry_lombre.aif create mode 100644 sound/direct_sound_samples/cries/cry_lotad.aif create mode 100644 sound/direct_sound_samples/cries/cry_loudred.aif create mode 100644 sound/direct_sound_samples/cries/cry_ludicolo.aif create mode 100644 sound/direct_sound_samples/cries/cry_lugia.aif create mode 100644 sound/direct_sound_samples/cries/cry_lunatone.aif create mode 100644 sound/direct_sound_samples/cries/cry_luvdisc.aif create mode 100644 sound/direct_sound_samples/cries/cry_machamp.aif create mode 100644 sound/direct_sound_samples/cries/cry_machoke.aif create mode 100644 sound/direct_sound_samples/cries/cry_machop.aif create mode 100644 sound/direct_sound_samples/cries/cry_magby.aif create mode 100644 sound/direct_sound_samples/cries/cry_magcargo.aif create mode 100644 sound/direct_sound_samples/cries/cry_magikarp.aif create mode 100644 sound/direct_sound_samples/cries/cry_magmar.aif create mode 100644 sound/direct_sound_samples/cries/cry_magnemite.aif create mode 100644 sound/direct_sound_samples/cries/cry_magneton.aif create mode 100644 sound/direct_sound_samples/cries/cry_makuhita.aif create mode 100644 sound/direct_sound_samples/cries/cry_manectric.aif create mode 100644 sound/direct_sound_samples/cries/cry_mankey.aif create mode 100644 sound/direct_sound_samples/cries/cry_mantine.aif create mode 100644 sound/direct_sound_samples/cries/cry_mareep.aif create mode 100644 sound/direct_sound_samples/cries/cry_marill.aif create mode 100644 sound/direct_sound_samples/cries/cry_marowak.aif create mode 100644 sound/direct_sound_samples/cries/cry_marshtomp.aif create mode 100644 sound/direct_sound_samples/cries/cry_masquerain.aif create mode 100644 sound/direct_sound_samples/cries/cry_mawile.aif create mode 100644 sound/direct_sound_samples/cries/cry_medicham.aif create mode 100644 sound/direct_sound_samples/cries/cry_meditite.aif create mode 100644 sound/direct_sound_samples/cries/cry_meganium.aif create mode 100644 sound/direct_sound_samples/cries/cry_meowth.aif create mode 100644 sound/direct_sound_samples/cries/cry_metagross.aif create mode 100644 sound/direct_sound_samples/cries/cry_metang.aif create mode 100644 sound/direct_sound_samples/cries/cry_metapod.aif create mode 100644 sound/direct_sound_samples/cries/cry_mew.aif create mode 100644 sound/direct_sound_samples/cries/cry_mewtwo.aif create mode 100644 sound/direct_sound_samples/cries/cry_mightyena.aif create mode 100644 sound/direct_sound_samples/cries/cry_milotic.aif create mode 100644 sound/direct_sound_samples/cries/cry_miltank.aif create mode 100644 sound/direct_sound_samples/cries/cry_minun.aif create mode 100644 sound/direct_sound_samples/cries/cry_misdreavus.aif create mode 100644 sound/direct_sound_samples/cries/cry_moltres.aif create mode 100644 sound/direct_sound_samples/cries/cry_mr_mime.aif create mode 100644 sound/direct_sound_samples/cries/cry_mudkip.aif create mode 100644 sound/direct_sound_samples/cries/cry_muk.aif create mode 100644 sound/direct_sound_samples/cries/cry_murkrow.aif create mode 100644 sound/direct_sound_samples/cries/cry_natu.aif create mode 100644 sound/direct_sound_samples/cries/cry_nidoking.aif create mode 100644 sound/direct_sound_samples/cries/cry_nidoqueen.aif create mode 100644 sound/direct_sound_samples/cries/cry_nidoran_f.aif create mode 100644 sound/direct_sound_samples/cries/cry_nidoran_m.aif create mode 100644 sound/direct_sound_samples/cries/cry_nidorina.aif create mode 100644 sound/direct_sound_samples/cries/cry_nidorino.aif create mode 100644 sound/direct_sound_samples/cries/cry_nincada.aif create mode 100644 sound/direct_sound_samples/cries/cry_ninetales.aif create mode 100644 sound/direct_sound_samples/cries/cry_ninjask.aif create mode 100644 sound/direct_sound_samples/cries/cry_noctowl.aif create mode 100644 sound/direct_sound_samples/cries/cry_none.aif create mode 100644 sound/direct_sound_samples/cries/cry_nosepass.aif create mode 100644 sound/direct_sound_samples/cries/cry_numel.aif create mode 100644 sound/direct_sound_samples/cries/cry_nuzleaf.aif create mode 100644 sound/direct_sound_samples/cries/cry_octillery.aif create mode 100644 sound/direct_sound_samples/cries/cry_oddish.aif create mode 100644 sound/direct_sound_samples/cries/cry_omanyte.aif create mode 100644 sound/direct_sound_samples/cries/cry_omastar.aif create mode 100644 sound/direct_sound_samples/cries/cry_onix.aif create mode 100644 sound/direct_sound_samples/cries/cry_paras.aif create mode 100644 sound/direct_sound_samples/cries/cry_parasect.aif create mode 100644 sound/direct_sound_samples/cries/cry_pelipper.aif create mode 100644 sound/direct_sound_samples/cries/cry_persian.aif create mode 100644 sound/direct_sound_samples/cries/cry_phanpy.aif create mode 100644 sound/direct_sound_samples/cries/cry_pichu.aif create mode 100644 sound/direct_sound_samples/cries/cry_pidgeot.aif create mode 100644 sound/direct_sound_samples/cries/cry_pidgeotto.aif create mode 100644 sound/direct_sound_samples/cries/cry_pidgey.aif create mode 100644 sound/direct_sound_samples/cries/cry_pikachu.aif create mode 100644 sound/direct_sound_samples/cries/cry_piloswine.aif create mode 100644 sound/direct_sound_samples/cries/cry_pineco.aif create mode 100644 sound/direct_sound_samples/cries/cry_pinsir.aif create mode 100644 sound/direct_sound_samples/cries/cry_plusle.aif create mode 100644 sound/direct_sound_samples/cries/cry_politoed.aif create mode 100644 sound/direct_sound_samples/cries/cry_poliwag.aif create mode 100644 sound/direct_sound_samples/cries/cry_poliwhirl.aif create mode 100644 sound/direct_sound_samples/cries/cry_poliwrath.aif create mode 100644 sound/direct_sound_samples/cries/cry_ponyta.aif create mode 100644 sound/direct_sound_samples/cries/cry_poochyena.aif create mode 100644 sound/direct_sound_samples/cries/cry_porygon.aif create mode 100644 sound/direct_sound_samples/cries/cry_porygon2.aif create mode 100644 sound/direct_sound_samples/cries/cry_primeape.aif create mode 100644 sound/direct_sound_samples/cries/cry_psyduck.aif create mode 100644 sound/direct_sound_samples/cries/cry_pupitar.aif create mode 100644 sound/direct_sound_samples/cries/cry_quagsire.aif create mode 100644 sound/direct_sound_samples/cries/cry_quilava.aif create mode 100644 sound/direct_sound_samples/cries/cry_qwilfish.aif create mode 100644 sound/direct_sound_samples/cries/cry_raichu.aif create mode 100644 sound/direct_sound_samples/cries/cry_raikou.aif create mode 100644 sound/direct_sound_samples/cries/cry_ralts.aif create mode 100644 sound/direct_sound_samples/cries/cry_rapidash.aif create mode 100644 sound/direct_sound_samples/cries/cry_raticate.aif create mode 100644 sound/direct_sound_samples/cries/cry_rattata.aif create mode 100644 sound/direct_sound_samples/cries/cry_rayquaza.aif create mode 100644 sound/direct_sound_samples/cries/cry_regice.aif create mode 100644 sound/direct_sound_samples/cries/cry_regirock.aif create mode 100644 sound/direct_sound_samples/cries/cry_registeel.aif create mode 100644 sound/direct_sound_samples/cries/cry_relicanth.aif create mode 100644 sound/direct_sound_samples/cries/cry_remoraid.aif create mode 100644 sound/direct_sound_samples/cries/cry_rhydon.aif create mode 100644 sound/direct_sound_samples/cries/cry_rhyhorn.aif create mode 100644 sound/direct_sound_samples/cries/cry_roselia.aif create mode 100644 sound/direct_sound_samples/cries/cry_sableye.aif create mode 100644 sound/direct_sound_samples/cries/cry_salamence.aif create mode 100644 sound/direct_sound_samples/cries/cry_sandshrew.aif create mode 100644 sound/direct_sound_samples/cries/cry_sandslash.aif create mode 100644 sound/direct_sound_samples/cries/cry_sceptile.aif create mode 100644 sound/direct_sound_samples/cries/cry_scizor.aif create mode 100644 sound/direct_sound_samples/cries/cry_scyther.aif create mode 100644 sound/direct_sound_samples/cries/cry_seadra.aif create mode 100644 sound/direct_sound_samples/cries/cry_seaking.aif create mode 100644 sound/direct_sound_samples/cries/cry_sealeo.aif create mode 100644 sound/direct_sound_samples/cries/cry_seedot.aif create mode 100644 sound/direct_sound_samples/cries/cry_seel.aif create mode 100644 sound/direct_sound_samples/cries/cry_sentret.aif create mode 100644 sound/direct_sound_samples/cries/cry_seviper.aif create mode 100644 sound/direct_sound_samples/cries/cry_sharpedo.aif create mode 100644 sound/direct_sound_samples/cries/cry_shedinja.aif create mode 100644 sound/direct_sound_samples/cries/cry_shelgon.aif create mode 100644 sound/direct_sound_samples/cries/cry_shellder.aif create mode 100644 sound/direct_sound_samples/cries/cry_shiftry.aif create mode 100644 sound/direct_sound_samples/cries/cry_shroomish.aif create mode 100644 sound/direct_sound_samples/cries/cry_shuckle.aif create mode 100644 sound/direct_sound_samples/cries/cry_shuppet.aif create mode 100644 sound/direct_sound_samples/cries/cry_silcoon.aif create mode 100644 sound/direct_sound_samples/cries/cry_skarmory.aif create mode 100644 sound/direct_sound_samples/cries/cry_skiploom.aif create mode 100644 sound/direct_sound_samples/cries/cry_skitty.aif create mode 100644 sound/direct_sound_samples/cries/cry_slaking.aif create mode 100644 sound/direct_sound_samples/cries/cry_slakoth.aif create mode 100644 sound/direct_sound_samples/cries/cry_slowbro.aif create mode 100644 sound/direct_sound_samples/cries/cry_slowking.aif create mode 100644 sound/direct_sound_samples/cries/cry_slowpoke.aif create mode 100644 sound/direct_sound_samples/cries/cry_slugma.aif create mode 100644 sound/direct_sound_samples/cries/cry_smeargle.aif create mode 100644 sound/direct_sound_samples/cries/cry_smoochum.aif create mode 100644 sound/direct_sound_samples/cries/cry_sneasel.aif create mode 100644 sound/direct_sound_samples/cries/cry_snorlax.aif create mode 100644 sound/direct_sound_samples/cries/cry_snorunt.aif create mode 100644 sound/direct_sound_samples/cries/cry_snubbull.aif create mode 100644 sound/direct_sound_samples/cries/cry_solrock.aif create mode 100644 sound/direct_sound_samples/cries/cry_spearow.aif create mode 100644 sound/direct_sound_samples/cries/cry_spheal.aif create mode 100644 sound/direct_sound_samples/cries/cry_spinarak.aif create mode 100644 sound/direct_sound_samples/cries/cry_spinda.aif create mode 100644 sound/direct_sound_samples/cries/cry_spoink.aif create mode 100644 sound/direct_sound_samples/cries/cry_squirtle.aif create mode 100644 sound/direct_sound_samples/cries/cry_stantler.aif create mode 100644 sound/direct_sound_samples/cries/cry_starmie.aif create mode 100644 sound/direct_sound_samples/cries/cry_staryu.aif create mode 100644 sound/direct_sound_samples/cries/cry_steelix.aif create mode 100644 sound/direct_sound_samples/cries/cry_sudowoodo.aif create mode 100644 sound/direct_sound_samples/cries/cry_suicune.aif create mode 100644 sound/direct_sound_samples/cries/cry_sunflora.aif create mode 100644 sound/direct_sound_samples/cries/cry_sunkern.aif create mode 100644 sound/direct_sound_samples/cries/cry_surskit.aif create mode 100644 sound/direct_sound_samples/cries/cry_swablu.aif create mode 100644 sound/direct_sound_samples/cries/cry_swalot.aif create mode 100644 sound/direct_sound_samples/cries/cry_swampert.aif create mode 100644 sound/direct_sound_samples/cries/cry_swellow.aif create mode 100644 sound/direct_sound_samples/cries/cry_swinub.aif create mode 100644 sound/direct_sound_samples/cries/cry_taillow.aif create mode 100644 sound/direct_sound_samples/cries/cry_tangela.aif create mode 100644 sound/direct_sound_samples/cries/cry_tauros.aif create mode 100644 sound/direct_sound_samples/cries/cry_teddiursa.aif create mode 100644 sound/direct_sound_samples/cries/cry_tentacool.aif create mode 100644 sound/direct_sound_samples/cries/cry_tentacruel.aif create mode 100644 sound/direct_sound_samples/cries/cry_togepi.aif create mode 100644 sound/direct_sound_samples/cries/cry_togetic.aif create mode 100644 sound/direct_sound_samples/cries/cry_torchic.aif create mode 100644 sound/direct_sound_samples/cries/cry_torkoal.aif create mode 100644 sound/direct_sound_samples/cries/cry_totodile.aif create mode 100644 sound/direct_sound_samples/cries/cry_trapinch.aif create mode 100644 sound/direct_sound_samples/cries/cry_treecko.aif create mode 100644 sound/direct_sound_samples/cries/cry_tropius.aif create mode 100644 sound/direct_sound_samples/cries/cry_typhlosion.aif create mode 100644 sound/direct_sound_samples/cries/cry_tyranitar.aif create mode 100644 sound/direct_sound_samples/cries/cry_tyrogue.aif create mode 100644 sound/direct_sound_samples/cries/cry_umbreon.aif create mode 100644 sound/direct_sound_samples/cries/cry_unown.aif create mode 100644 sound/direct_sound_samples/cries/cry_unused_265.aif create mode 100644 sound/direct_sound_samples/cries/cry_unused_268.aif create mode 100644 sound/direct_sound_samples/cries/cry_ursaring.aif create mode 100644 sound/direct_sound_samples/cries/cry_vaporeon.aif create mode 100644 sound/direct_sound_samples/cries/cry_venomoth.aif create mode 100644 sound/direct_sound_samples/cries/cry_venonat.aif create mode 100644 sound/direct_sound_samples/cries/cry_venusaur.aif create mode 100644 sound/direct_sound_samples/cries/cry_vibrava.aif create mode 100644 sound/direct_sound_samples/cries/cry_victreebel.aif create mode 100644 sound/direct_sound_samples/cries/cry_vigoroth.aif create mode 100644 sound/direct_sound_samples/cries/cry_vileplume.aif create mode 100644 sound/direct_sound_samples/cries/cry_volbeat.aif create mode 100644 sound/direct_sound_samples/cries/cry_voltorb.aif create mode 100644 sound/direct_sound_samples/cries/cry_vulpix.aif create mode 100644 sound/direct_sound_samples/cries/cry_wailmer.aif create mode 100644 sound/direct_sound_samples/cries/cry_wailord.aif create mode 100644 sound/direct_sound_samples/cries/cry_walrein.aif create mode 100644 sound/direct_sound_samples/cries/cry_wartortle.aif create mode 100644 sound/direct_sound_samples/cries/cry_weedle.aif create mode 100644 sound/direct_sound_samples/cries/cry_weepinbell.aif create mode 100644 sound/direct_sound_samples/cries/cry_weezing.aif create mode 100644 sound/direct_sound_samples/cries/cry_whiscash.aif create mode 100644 sound/direct_sound_samples/cries/cry_whismur.aif create mode 100644 sound/direct_sound_samples/cries/cry_wigglytuff.aif create mode 100644 sound/direct_sound_samples/cries/cry_wingull.aif create mode 100644 sound/direct_sound_samples/cries/cry_wobbuffet.aif create mode 100644 sound/direct_sound_samples/cries/cry_wooper.aif create mode 100644 sound/direct_sound_samples/cries/cry_wurmple.aif create mode 100644 sound/direct_sound_samples/cries/cry_wynaut.aif create mode 100644 sound/direct_sound_samples/cries/cry_xatu.aif create mode 100644 sound/direct_sound_samples/cries/cry_yanma.aif create mode 100644 sound/direct_sound_samples/cries/cry_zangoose.aif create mode 100644 sound/direct_sound_samples/cries/cry_zapdos.aif create mode 100644 sound/direct_sound_samples/cries/cry_zigzagoon.aif create mode 100644 sound/direct_sound_samples/cries/cry_zubat.aif delete mode 100644 sound/direct_sound_samples/cry_abra.aif delete mode 100644 sound/direct_sound_samples/cry_absol.aif delete mode 100644 sound/direct_sound_samples/cry_aerodactyl.aif delete mode 100644 sound/direct_sound_samples/cry_aggron.aif delete mode 100644 sound/direct_sound_samples/cry_aipom.aif delete mode 100644 sound/direct_sound_samples/cry_alakazam.aif delete mode 100644 sound/direct_sound_samples/cry_altaria.aif delete mode 100644 sound/direct_sound_samples/cry_ampharos.aif delete mode 100644 sound/direct_sound_samples/cry_anorith.aif delete mode 100644 sound/direct_sound_samples/cry_arbok.aif delete mode 100644 sound/direct_sound_samples/cry_arcanine.aif delete mode 100644 sound/direct_sound_samples/cry_ariados.aif delete mode 100644 sound/direct_sound_samples/cry_armaldo.aif delete mode 100644 sound/direct_sound_samples/cry_aron.aif delete mode 100644 sound/direct_sound_samples/cry_articuno.aif delete mode 100644 sound/direct_sound_samples/cry_azumarill.aif delete mode 100644 sound/direct_sound_samples/cry_azurill.aif delete mode 100644 sound/direct_sound_samples/cry_bagon.aif delete mode 100644 sound/direct_sound_samples/cry_baltoy.aif delete mode 100644 sound/direct_sound_samples/cry_banette.aif delete mode 100644 sound/direct_sound_samples/cry_barboach.aif delete mode 100644 sound/direct_sound_samples/cry_bayleef.aif delete mode 100644 sound/direct_sound_samples/cry_beautifly.aif delete mode 100644 sound/direct_sound_samples/cry_beedrill.aif delete mode 100644 sound/direct_sound_samples/cry_beldum.aif delete mode 100644 sound/direct_sound_samples/cry_bellossom.aif delete mode 100644 sound/direct_sound_samples/cry_bellsprout.aif delete mode 100644 sound/direct_sound_samples/cry_blastoise.aif delete mode 100644 sound/direct_sound_samples/cry_blaziken.aif delete mode 100644 sound/direct_sound_samples/cry_blissey.aif delete mode 100644 sound/direct_sound_samples/cry_breloom.aif delete mode 100644 sound/direct_sound_samples/cry_bulbasaur.aif delete mode 100644 sound/direct_sound_samples/cry_butterfree.aif delete mode 100644 sound/direct_sound_samples/cry_cacnea.aif delete mode 100644 sound/direct_sound_samples/cry_cacturne.aif delete mode 100644 sound/direct_sound_samples/cry_camerupt.aif delete mode 100644 sound/direct_sound_samples/cry_carvanha.aif delete mode 100644 sound/direct_sound_samples/cry_cascoon.aif delete mode 100644 sound/direct_sound_samples/cry_castform.aif delete mode 100644 sound/direct_sound_samples/cry_caterpie.aif delete mode 100644 sound/direct_sound_samples/cry_celebi.aif delete mode 100644 sound/direct_sound_samples/cry_chansey.aif delete mode 100644 sound/direct_sound_samples/cry_charizard.aif delete mode 100644 sound/direct_sound_samples/cry_charmander.aif delete mode 100644 sound/direct_sound_samples/cry_charmeleon.aif delete mode 100644 sound/direct_sound_samples/cry_chikorita.aif delete mode 100644 sound/direct_sound_samples/cry_chimecho.aif delete mode 100644 sound/direct_sound_samples/cry_chinchou.aif delete mode 100644 sound/direct_sound_samples/cry_clamperl.aif delete mode 100644 sound/direct_sound_samples/cry_claydol.aif delete mode 100644 sound/direct_sound_samples/cry_clefable.aif delete mode 100644 sound/direct_sound_samples/cry_clefairy.aif delete mode 100644 sound/direct_sound_samples/cry_cleffa.aif delete mode 100644 sound/direct_sound_samples/cry_cloyster.aif delete mode 100644 sound/direct_sound_samples/cry_combusken.aif delete mode 100644 sound/direct_sound_samples/cry_corphish.aif delete mode 100644 sound/direct_sound_samples/cry_corsola.aif delete mode 100644 sound/direct_sound_samples/cry_cradily.aif delete mode 100644 sound/direct_sound_samples/cry_crawdaunt.aif delete mode 100644 sound/direct_sound_samples/cry_crobat.aif delete mode 100644 sound/direct_sound_samples/cry_croconaw.aif delete mode 100644 sound/direct_sound_samples/cry_cubone.aif delete mode 100644 sound/direct_sound_samples/cry_cyndaquil.aif delete mode 100644 sound/direct_sound_samples/cry_delcatty.aif delete mode 100644 sound/direct_sound_samples/cry_delibird.aif delete mode 100644 sound/direct_sound_samples/cry_deoxys.aif delete mode 100644 sound/direct_sound_samples/cry_dewgong.aif delete mode 100644 sound/direct_sound_samples/cry_diglett.aif delete mode 100644 sound/direct_sound_samples/cry_ditto.aif delete mode 100644 sound/direct_sound_samples/cry_dodrio.aif delete mode 100644 sound/direct_sound_samples/cry_doduo.aif delete mode 100644 sound/direct_sound_samples/cry_donphan.aif delete mode 100644 sound/direct_sound_samples/cry_dragonair.aif delete mode 100644 sound/direct_sound_samples/cry_dragonite.aif delete mode 100644 sound/direct_sound_samples/cry_dratini.aif delete mode 100644 sound/direct_sound_samples/cry_drowzee.aif delete mode 100644 sound/direct_sound_samples/cry_dugtrio.aif delete mode 100644 sound/direct_sound_samples/cry_dunsparce.aif delete mode 100644 sound/direct_sound_samples/cry_dusclops.aif delete mode 100644 sound/direct_sound_samples/cry_duskull.aif delete mode 100644 sound/direct_sound_samples/cry_dustox.aif delete mode 100644 sound/direct_sound_samples/cry_eevee.aif delete mode 100644 sound/direct_sound_samples/cry_ekans.aif delete mode 100644 sound/direct_sound_samples/cry_electabuzz.aif delete mode 100644 sound/direct_sound_samples/cry_electrike.aif delete mode 100644 sound/direct_sound_samples/cry_electrode.aif delete mode 100644 sound/direct_sound_samples/cry_elekid.aif delete mode 100644 sound/direct_sound_samples/cry_entei.aif delete mode 100644 sound/direct_sound_samples/cry_espeon.aif delete mode 100644 sound/direct_sound_samples/cry_exeggcute.aif delete mode 100644 sound/direct_sound_samples/cry_exeggutor.aif delete mode 100644 sound/direct_sound_samples/cry_exploud.aif delete mode 100644 sound/direct_sound_samples/cry_farfetchd.aif delete mode 100644 sound/direct_sound_samples/cry_fearow.aif delete mode 100644 sound/direct_sound_samples/cry_feebas.aif delete mode 100644 sound/direct_sound_samples/cry_feraligatr.aif delete mode 100644 sound/direct_sound_samples/cry_flaaffy.aif delete mode 100644 sound/direct_sound_samples/cry_flareon.aif delete mode 100644 sound/direct_sound_samples/cry_flygon.aif delete mode 100644 sound/direct_sound_samples/cry_forretress.aif delete mode 100644 sound/direct_sound_samples/cry_furret.aif delete mode 100644 sound/direct_sound_samples/cry_gardevoir.aif delete mode 100644 sound/direct_sound_samples/cry_gastly.aif delete mode 100644 sound/direct_sound_samples/cry_gengar.aif delete mode 100644 sound/direct_sound_samples/cry_geodude.aif delete mode 100644 sound/direct_sound_samples/cry_girafarig.aif delete mode 100644 sound/direct_sound_samples/cry_glalie.aif delete mode 100644 sound/direct_sound_samples/cry_gligar.aif delete mode 100644 sound/direct_sound_samples/cry_gloom.aif delete mode 100644 sound/direct_sound_samples/cry_golbat.aif delete mode 100644 sound/direct_sound_samples/cry_goldeen.aif delete mode 100644 sound/direct_sound_samples/cry_golduck.aif delete mode 100644 sound/direct_sound_samples/cry_golem.aif delete mode 100644 sound/direct_sound_samples/cry_gorebyss.aif delete mode 100644 sound/direct_sound_samples/cry_granbull.aif delete mode 100644 sound/direct_sound_samples/cry_graveler.aif delete mode 100644 sound/direct_sound_samples/cry_grimer.aif delete mode 100644 sound/direct_sound_samples/cry_groudon.aif delete mode 100644 sound/direct_sound_samples/cry_grovyle.aif delete mode 100644 sound/direct_sound_samples/cry_growlithe.aif delete mode 100644 sound/direct_sound_samples/cry_grumpig.aif delete mode 100644 sound/direct_sound_samples/cry_gulpin.aif delete mode 100644 sound/direct_sound_samples/cry_gyarados.aif delete mode 100644 sound/direct_sound_samples/cry_hariyama.aif delete mode 100644 sound/direct_sound_samples/cry_haunter.aif delete mode 100644 sound/direct_sound_samples/cry_heracross.aif delete mode 100644 sound/direct_sound_samples/cry_hitmonchan.aif delete mode 100644 sound/direct_sound_samples/cry_hitmonlee.aif delete mode 100644 sound/direct_sound_samples/cry_hitmontop.aif delete mode 100644 sound/direct_sound_samples/cry_ho_oh.aif delete mode 100644 sound/direct_sound_samples/cry_hoothoot.aif delete mode 100644 sound/direct_sound_samples/cry_hoppip.aif delete mode 100644 sound/direct_sound_samples/cry_horsea.aif delete mode 100644 sound/direct_sound_samples/cry_houndoom.aif delete mode 100644 sound/direct_sound_samples/cry_houndour.aif delete mode 100644 sound/direct_sound_samples/cry_huntail.aif delete mode 100644 sound/direct_sound_samples/cry_hypno.aif delete mode 100644 sound/direct_sound_samples/cry_igglybuff.aif delete mode 100644 sound/direct_sound_samples/cry_illumise.aif delete mode 100644 sound/direct_sound_samples/cry_ivysaur.aif delete mode 100644 sound/direct_sound_samples/cry_jigglypuff.aif delete mode 100644 sound/direct_sound_samples/cry_jirachi.aif delete mode 100644 sound/direct_sound_samples/cry_jolteon.aif delete mode 100644 sound/direct_sound_samples/cry_jumpluff.aif delete mode 100644 sound/direct_sound_samples/cry_jynx.aif delete mode 100644 sound/direct_sound_samples/cry_kabuto.aif delete mode 100644 sound/direct_sound_samples/cry_kabutops.aif delete mode 100644 sound/direct_sound_samples/cry_kadabra.aif delete mode 100644 sound/direct_sound_samples/cry_kakuna.aif delete mode 100644 sound/direct_sound_samples/cry_kangaskhan.aif delete mode 100644 sound/direct_sound_samples/cry_kecleon.aif delete mode 100644 sound/direct_sound_samples/cry_kingdra.aif delete mode 100644 sound/direct_sound_samples/cry_kingler.aif delete mode 100644 sound/direct_sound_samples/cry_kirlia.aif delete mode 100644 sound/direct_sound_samples/cry_koffing.aif delete mode 100644 sound/direct_sound_samples/cry_krabby.aif delete mode 100644 sound/direct_sound_samples/cry_kyogre.aif delete mode 100644 sound/direct_sound_samples/cry_lairon.aif delete mode 100644 sound/direct_sound_samples/cry_lanturn.aif delete mode 100644 sound/direct_sound_samples/cry_lapras.aif delete mode 100644 sound/direct_sound_samples/cry_larvitar.aif delete mode 100644 sound/direct_sound_samples/cry_latias.aif delete mode 100644 sound/direct_sound_samples/cry_latios.aif delete mode 100644 sound/direct_sound_samples/cry_ledian.aif delete mode 100644 sound/direct_sound_samples/cry_ledyba.aif delete mode 100644 sound/direct_sound_samples/cry_lickitung.aif delete mode 100644 sound/direct_sound_samples/cry_lileep.aif delete mode 100644 sound/direct_sound_samples/cry_linoone.aif delete mode 100644 sound/direct_sound_samples/cry_lombre.aif delete mode 100644 sound/direct_sound_samples/cry_lotad.aif delete mode 100644 sound/direct_sound_samples/cry_loudred.aif delete mode 100644 sound/direct_sound_samples/cry_ludicolo.aif delete mode 100644 sound/direct_sound_samples/cry_lugia.aif delete mode 100644 sound/direct_sound_samples/cry_lunatone.aif delete mode 100644 sound/direct_sound_samples/cry_luvdisc.aif delete mode 100644 sound/direct_sound_samples/cry_machamp.aif delete mode 100644 sound/direct_sound_samples/cry_machoke.aif delete mode 100644 sound/direct_sound_samples/cry_machop.aif delete mode 100644 sound/direct_sound_samples/cry_magby.aif delete mode 100644 sound/direct_sound_samples/cry_magcargo.aif delete mode 100644 sound/direct_sound_samples/cry_magikarp.aif delete mode 100644 sound/direct_sound_samples/cry_magmar.aif delete mode 100644 sound/direct_sound_samples/cry_magnemite.aif delete mode 100644 sound/direct_sound_samples/cry_magneton.aif delete mode 100644 sound/direct_sound_samples/cry_makuhita.aif delete mode 100644 sound/direct_sound_samples/cry_manectric.aif delete mode 100644 sound/direct_sound_samples/cry_mankey.aif delete mode 100644 sound/direct_sound_samples/cry_mantine.aif delete mode 100644 sound/direct_sound_samples/cry_mareep.aif delete mode 100644 sound/direct_sound_samples/cry_marill.aif delete mode 100644 sound/direct_sound_samples/cry_marowak.aif delete mode 100644 sound/direct_sound_samples/cry_marshtomp.aif delete mode 100644 sound/direct_sound_samples/cry_masquerain.aif delete mode 100644 sound/direct_sound_samples/cry_mawile.aif delete mode 100644 sound/direct_sound_samples/cry_medicham.aif delete mode 100644 sound/direct_sound_samples/cry_meditite.aif delete mode 100644 sound/direct_sound_samples/cry_meganium.aif delete mode 100644 sound/direct_sound_samples/cry_meowth.aif delete mode 100644 sound/direct_sound_samples/cry_metagross.aif delete mode 100644 sound/direct_sound_samples/cry_metang.aif delete mode 100644 sound/direct_sound_samples/cry_metapod.aif delete mode 100644 sound/direct_sound_samples/cry_mew.aif delete mode 100644 sound/direct_sound_samples/cry_mewtwo.aif delete mode 100644 sound/direct_sound_samples/cry_mightyena.aif delete mode 100644 sound/direct_sound_samples/cry_milotic.aif delete mode 100644 sound/direct_sound_samples/cry_miltank.aif delete mode 100644 sound/direct_sound_samples/cry_minun.aif delete mode 100644 sound/direct_sound_samples/cry_misdreavus.aif delete mode 100644 sound/direct_sound_samples/cry_moltres.aif delete mode 100644 sound/direct_sound_samples/cry_mr_mime.aif delete mode 100644 sound/direct_sound_samples/cry_mudkip.aif delete mode 100644 sound/direct_sound_samples/cry_muk.aif delete mode 100644 sound/direct_sound_samples/cry_murkrow.aif delete mode 100644 sound/direct_sound_samples/cry_natu.aif delete mode 100644 sound/direct_sound_samples/cry_nidoking.aif delete mode 100644 sound/direct_sound_samples/cry_nidoqueen.aif delete mode 100644 sound/direct_sound_samples/cry_nidoran_f.aif delete mode 100644 sound/direct_sound_samples/cry_nidoran_m.aif delete mode 100644 sound/direct_sound_samples/cry_nidorina.aif delete mode 100644 sound/direct_sound_samples/cry_nidorino.aif delete mode 100644 sound/direct_sound_samples/cry_nincada.aif delete mode 100644 sound/direct_sound_samples/cry_ninetales.aif delete mode 100644 sound/direct_sound_samples/cry_ninjask.aif delete mode 100644 sound/direct_sound_samples/cry_noctowl.aif delete mode 100644 sound/direct_sound_samples/cry_none.aif delete mode 100644 sound/direct_sound_samples/cry_nosepass.aif delete mode 100644 sound/direct_sound_samples/cry_numel.aif delete mode 100644 sound/direct_sound_samples/cry_nuzleaf.aif delete mode 100644 sound/direct_sound_samples/cry_octillery.aif delete mode 100644 sound/direct_sound_samples/cry_oddish.aif delete mode 100644 sound/direct_sound_samples/cry_omanyte.aif delete mode 100644 sound/direct_sound_samples/cry_omastar.aif delete mode 100644 sound/direct_sound_samples/cry_onix.aif delete mode 100644 sound/direct_sound_samples/cry_paras.aif delete mode 100644 sound/direct_sound_samples/cry_parasect.aif delete mode 100644 sound/direct_sound_samples/cry_pelipper.aif delete mode 100644 sound/direct_sound_samples/cry_persian.aif delete mode 100644 sound/direct_sound_samples/cry_phanpy.aif delete mode 100644 sound/direct_sound_samples/cry_pichu.aif delete mode 100644 sound/direct_sound_samples/cry_pidgeot.aif delete mode 100644 sound/direct_sound_samples/cry_pidgeotto.aif delete mode 100644 sound/direct_sound_samples/cry_pidgey.aif delete mode 100644 sound/direct_sound_samples/cry_pikachu.aif delete mode 100644 sound/direct_sound_samples/cry_piloswine.aif delete mode 100644 sound/direct_sound_samples/cry_pineco.aif delete mode 100644 sound/direct_sound_samples/cry_pinsir.aif delete mode 100644 sound/direct_sound_samples/cry_plusle.aif delete mode 100644 sound/direct_sound_samples/cry_politoed.aif delete mode 100644 sound/direct_sound_samples/cry_poliwag.aif delete mode 100644 sound/direct_sound_samples/cry_poliwhirl.aif delete mode 100644 sound/direct_sound_samples/cry_poliwrath.aif delete mode 100644 sound/direct_sound_samples/cry_ponyta.aif delete mode 100644 sound/direct_sound_samples/cry_poochyena.aif delete mode 100644 sound/direct_sound_samples/cry_porygon.aif delete mode 100644 sound/direct_sound_samples/cry_porygon2.aif delete mode 100644 sound/direct_sound_samples/cry_primeape.aif delete mode 100644 sound/direct_sound_samples/cry_psyduck.aif delete mode 100644 sound/direct_sound_samples/cry_pupitar.aif delete mode 100644 sound/direct_sound_samples/cry_quagsire.aif delete mode 100644 sound/direct_sound_samples/cry_quilava.aif delete mode 100644 sound/direct_sound_samples/cry_qwilfish.aif delete mode 100644 sound/direct_sound_samples/cry_raichu.aif delete mode 100644 sound/direct_sound_samples/cry_raikou.aif delete mode 100644 sound/direct_sound_samples/cry_ralts.aif delete mode 100644 sound/direct_sound_samples/cry_rapidash.aif delete mode 100644 sound/direct_sound_samples/cry_raticate.aif delete mode 100644 sound/direct_sound_samples/cry_rattata.aif delete mode 100644 sound/direct_sound_samples/cry_rayquaza.aif delete mode 100644 sound/direct_sound_samples/cry_regice.aif delete mode 100644 sound/direct_sound_samples/cry_regirock.aif delete mode 100644 sound/direct_sound_samples/cry_registeel.aif delete mode 100644 sound/direct_sound_samples/cry_relicanth.aif delete mode 100644 sound/direct_sound_samples/cry_remoraid.aif delete mode 100644 sound/direct_sound_samples/cry_rhydon.aif delete mode 100644 sound/direct_sound_samples/cry_rhyhorn.aif delete mode 100644 sound/direct_sound_samples/cry_roselia.aif delete mode 100644 sound/direct_sound_samples/cry_sableye.aif delete mode 100644 sound/direct_sound_samples/cry_salamence.aif delete mode 100644 sound/direct_sound_samples/cry_sandshrew.aif delete mode 100644 sound/direct_sound_samples/cry_sandslash.aif delete mode 100644 sound/direct_sound_samples/cry_sceptile.aif delete mode 100644 sound/direct_sound_samples/cry_scizor.aif delete mode 100644 sound/direct_sound_samples/cry_scyther.aif delete mode 100644 sound/direct_sound_samples/cry_seadra.aif delete mode 100644 sound/direct_sound_samples/cry_seaking.aif delete mode 100644 sound/direct_sound_samples/cry_sealeo.aif delete mode 100644 sound/direct_sound_samples/cry_seedot.aif delete mode 100644 sound/direct_sound_samples/cry_seel.aif delete mode 100644 sound/direct_sound_samples/cry_sentret.aif delete mode 100644 sound/direct_sound_samples/cry_seviper.aif delete mode 100644 sound/direct_sound_samples/cry_sharpedo.aif delete mode 100644 sound/direct_sound_samples/cry_shedinja.aif delete mode 100644 sound/direct_sound_samples/cry_shelgon.aif delete mode 100644 sound/direct_sound_samples/cry_shellder.aif delete mode 100644 sound/direct_sound_samples/cry_shiftry.aif delete mode 100644 sound/direct_sound_samples/cry_shroomish.aif delete mode 100644 sound/direct_sound_samples/cry_shuckle.aif delete mode 100644 sound/direct_sound_samples/cry_shuppet.aif delete mode 100644 sound/direct_sound_samples/cry_silcoon.aif delete mode 100644 sound/direct_sound_samples/cry_skarmory.aif delete mode 100644 sound/direct_sound_samples/cry_skiploom.aif delete mode 100644 sound/direct_sound_samples/cry_skitty.aif delete mode 100644 sound/direct_sound_samples/cry_slaking.aif delete mode 100644 sound/direct_sound_samples/cry_slakoth.aif delete mode 100644 sound/direct_sound_samples/cry_slowbro.aif delete mode 100644 sound/direct_sound_samples/cry_slowking.aif delete mode 100644 sound/direct_sound_samples/cry_slowpoke.aif delete mode 100644 sound/direct_sound_samples/cry_slugma.aif delete mode 100644 sound/direct_sound_samples/cry_smeargle.aif delete mode 100644 sound/direct_sound_samples/cry_smoochum.aif delete mode 100644 sound/direct_sound_samples/cry_sneasel.aif delete mode 100644 sound/direct_sound_samples/cry_snorlax.aif delete mode 100644 sound/direct_sound_samples/cry_snorunt.aif delete mode 100644 sound/direct_sound_samples/cry_snubbull.aif delete mode 100644 sound/direct_sound_samples/cry_solrock.aif delete mode 100644 sound/direct_sound_samples/cry_spearow.aif delete mode 100644 sound/direct_sound_samples/cry_spheal.aif delete mode 100644 sound/direct_sound_samples/cry_spinarak.aif delete mode 100644 sound/direct_sound_samples/cry_spinda.aif delete mode 100644 sound/direct_sound_samples/cry_spoink.aif delete mode 100644 sound/direct_sound_samples/cry_squirtle.aif delete mode 100644 sound/direct_sound_samples/cry_stantler.aif delete mode 100644 sound/direct_sound_samples/cry_starmie.aif delete mode 100644 sound/direct_sound_samples/cry_staryu.aif delete mode 100644 sound/direct_sound_samples/cry_steelix.aif delete mode 100644 sound/direct_sound_samples/cry_sudowoodo.aif delete mode 100644 sound/direct_sound_samples/cry_suicune.aif delete mode 100644 sound/direct_sound_samples/cry_sunflora.aif delete mode 100644 sound/direct_sound_samples/cry_sunkern.aif delete mode 100644 sound/direct_sound_samples/cry_surskit.aif delete mode 100644 sound/direct_sound_samples/cry_swablu.aif delete mode 100644 sound/direct_sound_samples/cry_swalot.aif delete mode 100644 sound/direct_sound_samples/cry_swampert.aif delete mode 100644 sound/direct_sound_samples/cry_swellow.aif delete mode 100644 sound/direct_sound_samples/cry_swinub.aif delete mode 100644 sound/direct_sound_samples/cry_taillow.aif delete mode 100644 sound/direct_sound_samples/cry_tangela.aif delete mode 100644 sound/direct_sound_samples/cry_tauros.aif delete mode 100644 sound/direct_sound_samples/cry_teddiursa.aif delete mode 100644 sound/direct_sound_samples/cry_tentacool.aif delete mode 100644 sound/direct_sound_samples/cry_tentacruel.aif delete mode 100644 sound/direct_sound_samples/cry_togepi.aif delete mode 100644 sound/direct_sound_samples/cry_togetic.aif delete mode 100644 sound/direct_sound_samples/cry_torchic.aif delete mode 100644 sound/direct_sound_samples/cry_torkoal.aif delete mode 100644 sound/direct_sound_samples/cry_totodile.aif delete mode 100644 sound/direct_sound_samples/cry_trapinch.aif delete mode 100644 sound/direct_sound_samples/cry_treecko.aif delete mode 100644 sound/direct_sound_samples/cry_tropius.aif delete mode 100644 sound/direct_sound_samples/cry_typhlosion.aif delete mode 100644 sound/direct_sound_samples/cry_tyranitar.aif delete mode 100644 sound/direct_sound_samples/cry_tyrogue.aif delete mode 100644 sound/direct_sound_samples/cry_umbreon.aif delete mode 100644 sound/direct_sound_samples/cry_unown.aif delete mode 100644 sound/direct_sound_samples/cry_unused_265.aif delete mode 100644 sound/direct_sound_samples/cry_unused_268.aif delete mode 100644 sound/direct_sound_samples/cry_ursaring.aif delete mode 100644 sound/direct_sound_samples/cry_vaporeon.aif delete mode 100644 sound/direct_sound_samples/cry_venomoth.aif delete mode 100644 sound/direct_sound_samples/cry_venonat.aif delete mode 100644 sound/direct_sound_samples/cry_venusaur.aif delete mode 100644 sound/direct_sound_samples/cry_vibrava.aif delete mode 100644 sound/direct_sound_samples/cry_victreebel.aif delete mode 100644 sound/direct_sound_samples/cry_vigoroth.aif delete mode 100644 sound/direct_sound_samples/cry_vileplume.aif delete mode 100644 sound/direct_sound_samples/cry_volbeat.aif delete mode 100644 sound/direct_sound_samples/cry_voltorb.aif delete mode 100644 sound/direct_sound_samples/cry_vulpix.aif delete mode 100644 sound/direct_sound_samples/cry_wailmer.aif delete mode 100644 sound/direct_sound_samples/cry_wailord.aif delete mode 100644 sound/direct_sound_samples/cry_walrein.aif delete mode 100644 sound/direct_sound_samples/cry_wartortle.aif delete mode 100644 sound/direct_sound_samples/cry_weedle.aif delete mode 100644 sound/direct_sound_samples/cry_weepinbell.aif delete mode 100644 sound/direct_sound_samples/cry_weezing.aif delete mode 100644 sound/direct_sound_samples/cry_whiscash.aif delete mode 100644 sound/direct_sound_samples/cry_whismur.aif delete mode 100644 sound/direct_sound_samples/cry_wigglytuff.aif delete mode 100644 sound/direct_sound_samples/cry_wingull.aif delete mode 100644 sound/direct_sound_samples/cry_wobbuffet.aif delete mode 100644 sound/direct_sound_samples/cry_wooper.aif delete mode 100644 sound/direct_sound_samples/cry_wurmple.aif delete mode 100644 sound/direct_sound_samples/cry_wynaut.aif delete mode 100644 sound/direct_sound_samples/cry_xatu.aif delete mode 100644 sound/direct_sound_samples/cry_yanma.aif delete mode 100644 sound/direct_sound_samples/cry_zangoose.aif delete mode 100644 sound/direct_sound_samples/cry_zapdos.aif delete mode 100644 sound/direct_sound_samples/cry_zigzagoon.aif delete mode 100644 sound/direct_sound_samples/cry_zubat.aif diff --git a/Makefile b/Makefile index eda7fb2c2..91abef07a 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ ifeq ($(COMPARE),1) endif clean: tidy - $(RM) sound/direct_sound_samples/*.bin + find sound/direct_sound_samples \( -iname '*.bin' \) -exec rm {} + $(RM) $(ALL_OBJECTS) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' \) -exec rm {} + @@ -160,7 +160,7 @@ include override.mk #### Sound Rules #### -sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif +sound/direct_sound_samples/cries/cry_%.bin: sound/direct_sound_samples/cries/cry_%.aif $(AIF2PCM) $< $@ --compress sound/%.bin: sound/%.aif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 1d56162e5..92527974c 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -264,1555 +264,1555 @@ DirectSoundWaveData_84AA8F4:: @ 84AA8F4 .align 2 Cry_Bulbasaur:: @ 84AB57C - .incbin "sound/direct_sound_samples/cry_bulbasaur.bin" + .incbin "sound/direct_sound_samples/cries/cry_bulbasaur.bin" .align 2 Cry_Ivysaur:: @ 84AC608 - .incbin "sound/direct_sound_samples/cry_ivysaur.bin" + .incbin "sound/direct_sound_samples/cries/cry_ivysaur.bin" .align 2 Cry_Venusaur:: @ 84AD698 - .incbin "sound/direct_sound_samples/cry_venusaur.bin" + .incbin "sound/direct_sound_samples/cries/cry_venusaur.bin" .align 2 Cry_Charmander:: @ 84AE9F0 - .incbin "sound/direct_sound_samples/cry_charmander.bin" + .incbin "sound/direct_sound_samples/cries/cry_charmander.bin" .align 2 Cry_Charmeleon:: @ 84AF860 - .incbin "sound/direct_sound_samples/cry_charmeleon.bin" + .incbin "sound/direct_sound_samples/cries/cry_charmeleon.bin" .align 2 Cry_Charizard:: @ 84B06E0 - .incbin "sound/direct_sound_samples/cry_charizard.bin" + .incbin "sound/direct_sound_samples/cries/cry_charizard.bin" .align 2 Cry_Squirtle:: @ 84B1A28 - .incbin "sound/direct_sound_samples/cry_squirtle.bin" + .incbin "sound/direct_sound_samples/cries/cry_squirtle.bin" .align 2 Cry_Wartortle:: @ 84B289C - .incbin "sound/direct_sound_samples/cry_wartortle.bin" + .incbin "sound/direct_sound_samples/cries/cry_wartortle.bin" .align 2 Cry_Blastoise:: @ 84B39DC - .incbin "sound/direct_sound_samples/cry_blastoise.bin" + .incbin "sound/direct_sound_samples/cries/cry_blastoise.bin" .align 2 Cry_Caterpie:: @ 84B4D24 - .incbin "sound/direct_sound_samples/cry_caterpie.bin" + .incbin "sound/direct_sound_samples/cries/cry_caterpie.bin" .align 2 Cry_Metapod:: @ 84B557C - .incbin "sound/direct_sound_samples/cry_metapod.bin" + .incbin "sound/direct_sound_samples/cries/cry_metapod.bin" .align 2 Cry_Butterfree:: @ 84B6CCC - .incbin "sound/direct_sound_samples/cry_butterfree.bin" + .incbin "sound/direct_sound_samples/cries/cry_butterfree.bin" .align 2 Cry_Weedle:: @ 84B76D4 - .incbin "sound/direct_sound_samples/cry_weedle.bin" + .incbin "sound/direct_sound_samples/cries/cry_weedle.bin" .align 2 Cry_Kakuna:: @ 84B8718 - .incbin "sound/direct_sound_samples/cry_kakuna.bin" + .incbin "sound/direct_sound_samples/cries/cry_kakuna.bin" .align 2 Cry_Beedrill:: @ 84B9954 - .incbin "sound/direct_sound_samples/cry_beedrill.bin" + .incbin "sound/direct_sound_samples/cries/cry_beedrill.bin" .align 2 Cry_Pidgey:: @ 84BACB0 - .incbin "sound/direct_sound_samples/cry_pidgey.bin" + .incbin "sound/direct_sound_samples/cries/cry_pidgey.bin" .align 2 Cry_Pidgeotto:: @ 84BB098 - .incbin "sound/direct_sound_samples/cry_pidgeotto.bin" + .incbin "sound/direct_sound_samples/cries/cry_pidgeotto.bin" .align 2 Cry_Pidgeot:: @ 84BBFA0 - .incbin "sound/direct_sound_samples/cry_pidgeot.bin" + .incbin "sound/direct_sound_samples/cries/cry_pidgeot.bin" .align 2 Cry_Rattata:: @ 84BD0D4 - .incbin "sound/direct_sound_samples/cry_rattata.bin" + .incbin "sound/direct_sound_samples/cries/cry_rattata.bin" .align 2 Cry_Raticate:: @ 84BD8B4 - .incbin "sound/direct_sound_samples/cry_raticate.bin" + .incbin "sound/direct_sound_samples/cries/cry_raticate.bin" .align 2 Cry_Spearow:: @ 84BE238 - .incbin "sound/direct_sound_samples/cry_spearow.bin" + .incbin "sound/direct_sound_samples/cries/cry_spearow.bin" .align 2 Cry_Fearow:: @ 84BF3DC - .incbin "sound/direct_sound_samples/cry_fearow.bin" + .incbin "sound/direct_sound_samples/cries/cry_fearow.bin" .align 2 Cry_Ekans:: @ 84C0518 - .incbin "sound/direct_sound_samples/cry_ekans.bin" + .incbin "sound/direct_sound_samples/cries/cry_ekans.bin" .align 2 Cry_Arbok:: @ 84C1864 - .incbin "sound/direct_sound_samples/cry_arbok.bin" + .incbin "sound/direct_sound_samples/cries/cry_arbok.bin" .align 2 Cry_Pikachu:: @ 84C2BBC - .incbin "sound/direct_sound_samples/cry_pikachu.bin" + .incbin "sound/direct_sound_samples/cries/cry_pikachu.bin" .align 2 Cry_Raichu:: @ 84C3C64 - .incbin "sound/direct_sound_samples/cry_raichu.bin" + .incbin "sound/direct_sound_samples/cries/cry_raichu.bin" .align 2 Cry_Sandshrew:: @ 84C5424 - .incbin "sound/direct_sound_samples/cry_sandshrew.bin" + .incbin "sound/direct_sound_samples/cries/cry_sandshrew.bin" .align 2 Cry_Sandslash:: @ 84C5D78 - .incbin "sound/direct_sound_samples/cry_sandslash.bin" + .incbin "sound/direct_sound_samples/cries/cry_sandslash.bin" .align 2 Cry_NidoranF:: @ 84C6B08 - .incbin "sound/direct_sound_samples/cry_nidoran_f.bin" + .incbin "sound/direct_sound_samples/cries/cry_nidoran_f.bin" .align 2 Cry_Nidorina:: @ 84C74B8 - .incbin "sound/direct_sound_samples/cry_nidorina.bin" + .incbin "sound/direct_sound_samples/cries/cry_nidorina.bin" .align 2 Cry_Nidoqueen:: @ 84C8180 - .incbin "sound/direct_sound_samples/cry_nidoqueen.bin" + .incbin "sound/direct_sound_samples/cries/cry_nidoqueen.bin" .align 2 Cry_NidoranM:: @ 84C9260 - .incbin "sound/direct_sound_samples/cry_nidoran_m.bin" + .incbin "sound/direct_sound_samples/cries/cry_nidoran_m.bin" .align 2 Cry_Nidorino:: @ 84C9CC8 - .incbin "sound/direct_sound_samples/cry_nidorino.bin" + .incbin "sound/direct_sound_samples/cries/cry_nidorino.bin" .align 2 Cry_Nidoking:: @ 84CA8DC - .incbin "sound/direct_sound_samples/cry_nidoking.bin" + .incbin "sound/direct_sound_samples/cries/cry_nidoking.bin" .align 2 Cry_Clefairy:: @ 84CC148 - .incbin "sound/direct_sound_samples/cry_clefairy.bin" + .incbin "sound/direct_sound_samples/cries/cry_clefairy.bin" .align 2 Cry_Clefable:: @ 84CC9B8 - .incbin "sound/direct_sound_samples/cry_clefable.bin" + .incbin "sound/direct_sound_samples/cries/cry_clefable.bin" .align 2 Cry_Vulpix:: @ 84CD448 - .incbin "sound/direct_sound_samples/cry_vulpix.bin" + .incbin "sound/direct_sound_samples/cries/cry_vulpix.bin" .align 2 Cry_Ninetales:: @ 84CEC18 - .incbin "sound/direct_sound_samples/cry_ninetales.bin" + .incbin "sound/direct_sound_samples/cries/cry_ninetales.bin" .align 2 Cry_Jigglypuff:: @ 84D0484 - .incbin "sound/direct_sound_samples/cry_jigglypuff.bin" + .incbin "sound/direct_sound_samples/cries/cry_jigglypuff.bin" .align 2 Cry_Wigglytuff:: @ 84D09E8 - .incbin "sound/direct_sound_samples/cry_wigglytuff.bin" + .incbin "sound/direct_sound_samples/cries/cry_wigglytuff.bin" .align 2 Cry_Zubat:: @ 84D10B0 - .incbin "sound/direct_sound_samples/cry_zubat.bin" + .incbin "sound/direct_sound_samples/cries/cry_zubat.bin" .align 2 Cry_Golbat:: @ 84D241C - .incbin "sound/direct_sound_samples/cry_golbat.bin" + .incbin "sound/direct_sound_samples/cries/cry_golbat.bin" .align 2 Cry_Oddish:: @ 84D3780 - .incbin "sound/direct_sound_samples/cry_oddish.bin" + .incbin "sound/direct_sound_samples/cries/cry_oddish.bin" .align 2 Cry_Gloom:: @ 84D461C - .incbin "sound/direct_sound_samples/cry_gloom.bin" + .incbin "sound/direct_sound_samples/cries/cry_gloom.bin" .align 2 Cry_Vileplume:: @ 84D5298 - .incbin "sound/direct_sound_samples/cry_vileplume.bin" + .incbin "sound/direct_sound_samples/cries/cry_vileplume.bin" .align 2 Cry_Paras:: @ 84D6C34 - .incbin "sound/direct_sound_samples/cry_paras.bin" + .incbin "sound/direct_sound_samples/cries/cry_paras.bin" .align 2 Cry_Parasect:: @ 84D8828 - .incbin "sound/direct_sound_samples/cry_parasect.bin" + .incbin "sound/direct_sound_samples/cries/cry_parasect.bin" .align 2 Cry_Venonat:: @ 84DA690 - .incbin "sound/direct_sound_samples/cry_venonat.bin" + .incbin "sound/direct_sound_samples/cries/cry_venonat.bin" .align 2 Cry_Venomoth:: @ 84DB610 - .incbin "sound/direct_sound_samples/cry_venomoth.bin" + .incbin "sound/direct_sound_samples/cries/cry_venomoth.bin" .align 2 Cry_Diglett:: @ 84DC614 - .incbin "sound/direct_sound_samples/cry_diglett.bin" + .incbin "sound/direct_sound_samples/cries/cry_diglett.bin" .align 2 Cry_Dugtrio:: @ 84DD984 - .incbin "sound/direct_sound_samples/cry_dugtrio.bin" + .incbin "sound/direct_sound_samples/cries/cry_dugtrio.bin" .align 2 Cry_Meowth:: @ 84DECF0 - .incbin "sound/direct_sound_samples/cry_meowth.bin" + .incbin "sound/direct_sound_samples/cries/cry_meowth.bin" .align 2 Cry_Persian:: @ 84DF680 - .incbin "sound/direct_sound_samples/cry_persian.bin" + .incbin "sound/direct_sound_samples/cries/cry_persian.bin" .align 2 Cry_Psyduck:: @ 84E095C - .incbin "sound/direct_sound_samples/cry_psyduck.bin" + .incbin "sound/direct_sound_samples/cries/cry_psyduck.bin" .align 2 Cry_Golduck:: @ 84E1684 - .incbin "sound/direct_sound_samples/cry_golduck.bin" + .incbin "sound/direct_sound_samples/cries/cry_golduck.bin" .align 2 Cry_Mankey:: @ 84E21CC - .incbin "sound/direct_sound_samples/cry_mankey.bin" + .incbin "sound/direct_sound_samples/cries/cry_mankey.bin" .align 2 Cry_Primeape:: @ 84E322C - .incbin "sound/direct_sound_samples/cry_primeape.bin" + .incbin "sound/direct_sound_samples/cries/cry_primeape.bin" .align 2 Cry_Growlithe:: @ 84E425C - .incbin "sound/direct_sound_samples/cry_growlithe.bin" + .incbin "sound/direct_sound_samples/cries/cry_growlithe.bin" .align 2 Cry_Arcanine:: @ 84E4FC0 - .incbin "sound/direct_sound_samples/cry_arcanine.bin" + .incbin "sound/direct_sound_samples/cries/cry_arcanine.bin" .align 2 Cry_Poliwag:: @ 84E60FC - .incbin "sound/direct_sound_samples/cry_poliwag.bin" + .incbin "sound/direct_sound_samples/cries/cry_poliwag.bin" .align 2 Cry_Poliwhirl:: @ 84E6C18 - .incbin "sound/direct_sound_samples/cry_poliwhirl.bin" + .incbin "sound/direct_sound_samples/cries/cry_poliwhirl.bin" .align 2 Cry_Poliwrath:: @ 84E72C0 - .incbin "sound/direct_sound_samples/cry_poliwrath.bin" + .incbin "sound/direct_sound_samples/cries/cry_poliwrath.bin" .align 2 Cry_Abra:: @ 84E7DE4 - .incbin "sound/direct_sound_samples/cry_abra.bin" + .incbin "sound/direct_sound_samples/cries/cry_abra.bin" .align 2 Cry_Kadabra:: @ 84E9548 - .incbin "sound/direct_sound_samples/cry_kadabra.bin" + .incbin "sound/direct_sound_samples/cries/cry_kadabra.bin" .align 2 Cry_Alakazam:: @ 84EB030 - .incbin "sound/direct_sound_samples/cry_alakazam.bin" + .incbin "sound/direct_sound_samples/cries/cry_alakazam.bin" .align 2 Cry_Machop:: @ 84ECFCC - .incbin "sound/direct_sound_samples/cry_machop.bin" + .incbin "sound/direct_sound_samples/cries/cry_machop.bin" .align 2 Cry_Machoke:: @ 84EDD30 - .incbin "sound/direct_sound_samples/cry_machoke.bin" + .incbin "sound/direct_sound_samples/cries/cry_machoke.bin" .align 2 Cry_Machamp:: @ 84EEAC0 - .incbin "sound/direct_sound_samples/cry_machamp.bin" + .incbin "sound/direct_sound_samples/cries/cry_machamp.bin" .align 2 Cry_Bellsprout:: @ 84EFB48 - .incbin "sound/direct_sound_samples/cry_bellsprout.bin" + .incbin "sound/direct_sound_samples/cries/cry_bellsprout.bin" .align 2 Cry_Weepinbell:: @ 84F02D4 - .incbin "sound/direct_sound_samples/cry_weepinbell.bin" + .incbin "sound/direct_sound_samples/cries/cry_weepinbell.bin" .align 2 Cry_Victreebel:: @ 84F1174 - .incbin "sound/direct_sound_samples/cry_victreebel.bin" + .incbin "sound/direct_sound_samples/cries/cry_victreebel.bin" .align 2 Cry_Tentacool:: @ 84F24C0 - .incbin "sound/direct_sound_samples/cry_tentacool.bin" + .incbin "sound/direct_sound_samples/cries/cry_tentacool.bin" .align 2 Cry_Tentacruel:: @ 84F34B0 - .incbin "sound/direct_sound_samples/cry_tentacruel.bin" + .incbin "sound/direct_sound_samples/cries/cry_tentacruel.bin" .align 2 Cry_Geodude:: @ 84F4BAC - .incbin "sound/direct_sound_samples/cry_geodude.bin" + .incbin "sound/direct_sound_samples/cries/cry_geodude.bin" .align 2 Cry_Graveler:: @ 84F6360 - .incbin "sound/direct_sound_samples/cry_graveler.bin" + .incbin "sound/direct_sound_samples/cries/cry_graveler.bin" .align 2 Cry_Golem:: @ 84F7F48 - .incbin "sound/direct_sound_samples/cry_golem.bin" + .incbin "sound/direct_sound_samples/cries/cry_golem.bin" .align 2 Cry_Ponyta:: @ 84F8D74 - .incbin "sound/direct_sound_samples/cry_ponyta.bin" + .incbin "sound/direct_sound_samples/cries/cry_ponyta.bin" .align 2 Cry_Rapidash:: @ 84F9C84 - .incbin "sound/direct_sound_samples/cry_rapidash.bin" + .incbin "sound/direct_sound_samples/cries/cry_rapidash.bin" .align 2 Cry_Slowpoke:: @ 84FAF24 - .incbin "sound/direct_sound_samples/cry_slowpoke.bin" + .incbin "sound/direct_sound_samples/cries/cry_slowpoke.bin" .align 2 Cry_Slowbro:: @ 84FB68C - .incbin "sound/direct_sound_samples/cry_slowbro.bin" + .incbin "sound/direct_sound_samples/cries/cry_slowbro.bin" .align 2 Cry_Magnemite:: @ 84FC3FC - .incbin "sound/direct_sound_samples/cry_magnemite.bin" + .incbin "sound/direct_sound_samples/cries/cry_magnemite.bin" .align 2 Cry_Magneton:: @ 84FD740 - .incbin "sound/direct_sound_samples/cry_magneton.bin" + .incbin "sound/direct_sound_samples/cries/cry_magneton.bin" .align 2 Cry_Farfetchd:: @ 84FEF28 - .incbin "sound/direct_sound_samples/cry_farfetchd.bin" + .incbin "sound/direct_sound_samples/cries/cry_farfetchd.bin" .align 2 Cry_Doduo:: @ 84FF6A4 - .incbin "sound/direct_sound_samples/cry_doduo.bin" + .incbin "sound/direct_sound_samples/cries/cry_doduo.bin" .align 2 Cry_Dodrio:: @ 85009E8 - .incbin "sound/direct_sound_samples/cry_dodrio.bin" + .incbin "sound/direct_sound_samples/cries/cry_dodrio.bin" .align 2 Cry_Seel:: @ 8501D60 - .incbin "sound/direct_sound_samples/cry_seel.bin" + .incbin "sound/direct_sound_samples/cries/cry_seel.bin" .align 2 Cry_Dewgong:: @ 8502F50 - .incbin "sound/direct_sound_samples/cry_dewgong.bin" + .incbin "sound/direct_sound_samples/cries/cry_dewgong.bin" .align 2 Cry_Grimer:: @ 8504474 - .incbin "sound/direct_sound_samples/cry_grimer.bin" + .incbin "sound/direct_sound_samples/cries/cry_grimer.bin" .align 2 Cry_Muk:: @ 8504EFC - .incbin "sound/direct_sound_samples/cry_muk.bin" + .incbin "sound/direct_sound_samples/cries/cry_muk.bin" .align 2 Cry_Shellder:: @ 8505DBC - .incbin "sound/direct_sound_samples/cry_shellder.bin" + .incbin "sound/direct_sound_samples/cries/cry_shellder.bin" .align 2 Cry_Cloyster:: @ 8506D30 - .incbin "sound/direct_sound_samples/cry_cloyster.bin" + .incbin "sound/direct_sound_samples/cries/cry_cloyster.bin" .align 2 Cry_Gastly:: @ 85081F4 - .incbin "sound/direct_sound_samples/cry_gastly.bin" + .incbin "sound/direct_sound_samples/cries/cry_gastly.bin" .align 2 Cry_Haunter:: @ 8509944 - .incbin "sound/direct_sound_samples/cry_haunter.bin" + .incbin "sound/direct_sound_samples/cries/cry_haunter.bin" .align 2 Cry_Gengar:: @ 850B0C4 - .incbin "sound/direct_sound_samples/cry_gengar.bin" + .incbin "sound/direct_sound_samples/cries/cry_gengar.bin" .align 2 Cry_Onix:: @ 850BF84 - .incbin "sound/direct_sound_samples/cry_onix.bin" + .incbin "sound/direct_sound_samples/cries/cry_onix.bin" .align 2 Cry_Drowzee:: @ 850D848 - .incbin "sound/direct_sound_samples/cry_drowzee.bin" + .incbin "sound/direct_sound_samples/cries/cry_drowzee.bin" .align 2 Cry_Hypno:: @ 850F560 - .incbin "sound/direct_sound_samples/cry_hypno.bin" + .incbin "sound/direct_sound_samples/cries/cry_hypno.bin" .align 2 Cry_Krabby:: @ 8511264 - .incbin "sound/direct_sound_samples/cry_krabby.bin" + .incbin "sound/direct_sound_samples/cries/cry_krabby.bin" .align 2 Cry_Kingler:: @ 8512AB0 - .incbin "sound/direct_sound_samples/cry_kingler.bin" + .incbin "sound/direct_sound_samples/cries/cry_kingler.bin" .align 2 Cry_Voltorb:: @ 8514308 - .incbin "sound/direct_sound_samples/cry_voltorb.bin" + .incbin "sound/direct_sound_samples/cries/cry_voltorb.bin" .align 2 Cry_Electrode:: @ 8515BCC - .incbin "sound/direct_sound_samples/cry_electrode.bin" + .incbin "sound/direct_sound_samples/cries/cry_electrode.bin" .align 2 Cry_Exeggcute:: @ 8517504 - .incbin "sound/direct_sound_samples/cry_exeggcute.bin" + .incbin "sound/direct_sound_samples/cries/cry_exeggcute.bin" .align 2 Cry_Exeggutor:: @ 85187E4 - .incbin "sound/direct_sound_samples/cry_exeggutor.bin" + .incbin "sound/direct_sound_samples/cries/cry_exeggutor.bin" .align 2 Cry_Cubone:: @ 851A7C8 - .incbin "sound/direct_sound_samples/cry_cubone.bin" + .incbin "sound/direct_sound_samples/cries/cry_cubone.bin" .align 2 Cry_Marowak:: @ 851B6E8 - .incbin "sound/direct_sound_samples/cry_marowak.bin" + .incbin "sound/direct_sound_samples/cries/cry_marowak.bin" .align 2 Cry_Hitmonlee:: @ 851C558 - .incbin "sound/direct_sound_samples/cry_hitmonlee.bin" + .incbin "sound/direct_sound_samples/cries/cry_hitmonlee.bin" .align 2 Cry_Hitmonchan:: @ 851D804 - .incbin "sound/direct_sound_samples/cry_hitmonchan.bin" + .incbin "sound/direct_sound_samples/cries/cry_hitmonchan.bin" .align 2 Cry_Lickitung:: @ 851E9DC - .incbin "sound/direct_sound_samples/cry_lickitung.bin" + .incbin "sound/direct_sound_samples/cries/cry_lickitung.bin" .align 2 Cry_Koffing:: @ 851F904 - .incbin "sound/direct_sound_samples/cry_koffing.bin" + .incbin "sound/direct_sound_samples/cries/cry_koffing.bin" .align 2 Cry_Weezing:: @ 8520D60 - .incbin "sound/direct_sound_samples/cry_weezing.bin" + .incbin "sound/direct_sound_samples/cries/cry_weezing.bin" .align 2 Cry_Rhyhorn:: @ 852230C - .incbin "sound/direct_sound_samples/cry_rhyhorn.bin" + .incbin "sound/direct_sound_samples/cries/cry_rhyhorn.bin" .align 2 Cry_Rhydon:: @ 8523678 - .incbin "sound/direct_sound_samples/cry_rhydon.bin" + .incbin "sound/direct_sound_samples/cries/cry_rhydon.bin" .align 2 Cry_Chansey:: @ 8524AE4 - .incbin "sound/direct_sound_samples/cry_chansey.bin" + .incbin "sound/direct_sound_samples/cries/cry_chansey.bin" .align 2 Cry_Tangela:: @ 85259B0 - .incbin "sound/direct_sound_samples/cry_tangela.bin" + .incbin "sound/direct_sound_samples/cries/cry_tangela.bin" .align 2 Cry_Kangaskhan:: @ 85268CC - .incbin "sound/direct_sound_samples/cry_kangaskhan.bin" + .incbin "sound/direct_sound_samples/cries/cry_kangaskhan.bin" .align 2 Cry_Horsea:: @ 8527B80 - .incbin "sound/direct_sound_samples/cry_horsea.bin" + .incbin "sound/direct_sound_samples/cries/cry_horsea.bin" .align 2 Cry_Seadra:: @ 85284FC - .incbin "sound/direct_sound_samples/cry_seadra.bin" + .incbin "sound/direct_sound_samples/cries/cry_seadra.bin" .align 2 Cry_Goldeen:: @ 8528D68 - .incbin "sound/direct_sound_samples/cry_goldeen.bin" + .incbin "sound/direct_sound_samples/cries/cry_goldeen.bin" .align 2 Cry_Seaking:: @ 8529740 - .incbin "sound/direct_sound_samples/cry_seaking.bin" + .incbin "sound/direct_sound_samples/cries/cry_seaking.bin" .align 2 Cry_Staryu:: @ 852AA98 - .incbin "sound/direct_sound_samples/cry_staryu.bin" + .incbin "sound/direct_sound_samples/cries/cry_staryu.bin" .align 2 Cry_Starmie:: @ 852BE80 - .incbin "sound/direct_sound_samples/cry_starmie.bin" + .incbin "sound/direct_sound_samples/cries/cry_starmie.bin" .align 2 Cry_MrMime:: @ 852D35C - .incbin "sound/direct_sound_samples/cry_mr_mime.bin" + .incbin "sound/direct_sound_samples/cries/cry_mr_mime.bin" .align 2 Cry_Scyther:: @ 852E64C - .incbin "sound/direct_sound_samples/cry_scyther.bin" + .incbin "sound/direct_sound_samples/cries/cry_scyther.bin" .align 2 Cry_Jynx:: @ 852F3A8 - .incbin "sound/direct_sound_samples/cry_jynx.bin" + .incbin "sound/direct_sound_samples/cries/cry_jynx.bin" .align 2 Cry_Electabuzz:: @ 853231C - .incbin "sound/direct_sound_samples/cry_electabuzz.bin" + .incbin "sound/direct_sound_samples/cries/cry_electabuzz.bin" .align 2 Cry_Magmar:: @ 8534200 - .incbin "sound/direct_sound_samples/cry_magmar.bin" + .incbin "sound/direct_sound_samples/cries/cry_magmar.bin" .align 2 Cry_Pinsir:: @ 853517C - .incbin "sound/direct_sound_samples/cry_pinsir.bin" + .incbin "sound/direct_sound_samples/cries/cry_pinsir.bin" .align 2 Cry_Tauros:: @ 8535DD8 - .incbin "sound/direct_sound_samples/cry_tauros.bin" + .incbin "sound/direct_sound_samples/cries/cry_tauros.bin" .align 2 Cry_Magikarp:: @ 853702C - .incbin "sound/direct_sound_samples/cry_magikarp.bin" + .incbin "sound/direct_sound_samples/cries/cry_magikarp.bin" .align 2 Cry_Gyarados:: @ 8538334 - .incbin "sound/direct_sound_samples/cry_gyarados.bin" + .incbin "sound/direct_sound_samples/cries/cry_gyarados.bin" .align 2 Cry_Lapras:: @ 8539768 - .incbin "sound/direct_sound_samples/cry_lapras.bin" + .incbin "sound/direct_sound_samples/cries/cry_lapras.bin" .align 2 Cry_Ditto:: @ 853A63C - .incbin "sound/direct_sound_samples/cry_ditto.bin" + .incbin "sound/direct_sound_samples/cries/cry_ditto.bin" .align 2 Cry_Eevee:: @ 853B158 - .incbin "sound/direct_sound_samples/cry_eevee.bin" + .incbin "sound/direct_sound_samples/cries/cry_eevee.bin" .align 2 Cry_Vaporeon:: @ 853BF90 - .incbin "sound/direct_sound_samples/cry_vaporeon.bin" + .incbin "sound/direct_sound_samples/cries/cry_vaporeon.bin" .align 2 Cry_Jolteon:: @ 853D5A8 - .incbin "sound/direct_sound_samples/cry_jolteon.bin" + .incbin "sound/direct_sound_samples/cries/cry_jolteon.bin" .align 2 Cry_Flareon:: @ 853E57C - .incbin "sound/direct_sound_samples/cry_flareon.bin" + .incbin "sound/direct_sound_samples/cries/cry_flareon.bin" .align 2 Cry_Porygon:: @ 853F500 - .incbin "sound/direct_sound_samples/cry_porygon.bin" + .incbin "sound/direct_sound_samples/cries/cry_porygon.bin" .align 2 Cry_Omanyte:: @ 854090C - .incbin "sound/direct_sound_samples/cry_omanyte.bin" + .incbin "sound/direct_sound_samples/cries/cry_omanyte.bin" .align 2 Cry_Omastar:: @ 8541664 - .incbin "sound/direct_sound_samples/cry_omastar.bin" + .incbin "sound/direct_sound_samples/cries/cry_omastar.bin" .align 2 Cry_Kabuto:: @ 85423B8 - .incbin "sound/direct_sound_samples/cry_kabuto.bin" + .incbin "sound/direct_sound_samples/cries/cry_kabuto.bin" .align 2 Cry_Kabutops:: @ 854300C - .incbin "sound/direct_sound_samples/cry_kabutops.bin" + .incbin "sound/direct_sound_samples/cries/cry_kabutops.bin" .align 2 Cry_Aerodactyl:: @ 8543DC8 - .incbin "sound/direct_sound_samples/cry_aerodactyl.bin" + .incbin "sound/direct_sound_samples/cries/cry_aerodactyl.bin" .align 2 Cry_Snorlax:: @ 8545624 - .incbin "sound/direct_sound_samples/cry_snorlax.bin" + .incbin "sound/direct_sound_samples/cries/cry_snorlax.bin" .align 2 Cry_Articuno:: @ 8545B60 - .incbin "sound/direct_sound_samples/cry_articuno.bin" + .incbin "sound/direct_sound_samples/cries/cry_articuno.bin" .align 2 Cry_Zapdos:: @ 8547308 - .incbin "sound/direct_sound_samples/cry_zapdos.bin" + .incbin "sound/direct_sound_samples/cries/cry_zapdos.bin" .align 2 Cry_Moltres:: @ 8548280 - .incbin "sound/direct_sound_samples/cry_moltres.bin" + .incbin "sound/direct_sound_samples/cries/cry_moltres.bin" .align 2 Cry_Dratini:: @ 8549A2C - .incbin "sound/direct_sound_samples/cry_dratini.bin" + .incbin "sound/direct_sound_samples/cries/cry_dratini.bin" .align 2 Cry_Dragonair:: @ 854A5C8 - .incbin "sound/direct_sound_samples/cry_dragonair.bin" + .incbin "sound/direct_sound_samples/cries/cry_dragonair.bin" .align 2 Cry_Dragonite:: @ 854B670 - .incbin "sound/direct_sound_samples/cry_dragonite.bin" + .incbin "sound/direct_sound_samples/cries/cry_dragonite.bin" .align 2 Cry_Mewtwo:: @ 854C97C - .incbin "sound/direct_sound_samples/cry_mewtwo.bin" + .incbin "sound/direct_sound_samples/cries/cry_mewtwo.bin" .align 2 Cry_Mew:: @ 854E7E4 - .incbin "sound/direct_sound_samples/cry_mew.bin" + .incbin "sound/direct_sound_samples/cries/cry_mew.bin" .align 2 Cry_Chikorita:: @ 855064C - .incbin "sound/direct_sound_samples/cry_chikorita.bin" + .incbin "sound/direct_sound_samples/cries/cry_chikorita.bin" .align 2 Cry_Bayleef:: @ 8550B8C - .incbin "sound/direct_sound_samples/cry_bayleef.bin" + .incbin "sound/direct_sound_samples/cries/cry_bayleef.bin" .align 2 Cry_Meganium:: @ 8551458 - .incbin "sound/direct_sound_samples/cry_meganium.bin" + .incbin "sound/direct_sound_samples/cries/cry_meganium.bin" .align 2 Cry_Cyndaquil:: @ 8552490 - .incbin "sound/direct_sound_samples/cry_cyndaquil.bin" + .incbin "sound/direct_sound_samples/cries/cry_cyndaquil.bin" .align 2 Cry_Quilava:: @ 8552B94 - .incbin "sound/direct_sound_samples/cry_quilava.bin" + .incbin "sound/direct_sound_samples/cries/cry_quilava.bin" .align 2 Cry_Typhlosion:: @ 855377C - .incbin "sound/direct_sound_samples/cry_typhlosion.bin" + .incbin "sound/direct_sound_samples/cries/cry_typhlosion.bin" .align 2 Cry_Totodile:: @ 8555D8C - .incbin "sound/direct_sound_samples/cry_totodile.bin" + .incbin "sound/direct_sound_samples/cries/cry_totodile.bin" .align 2 Cry_Croconaw:: @ 8556FE4 - .incbin "sound/direct_sound_samples/cry_croconaw.bin" + .incbin "sound/direct_sound_samples/cries/cry_croconaw.bin" .align 2 Cry_Feraligatr:: @ 8558420 - .incbin "sound/direct_sound_samples/cry_feraligatr.bin" + .incbin "sound/direct_sound_samples/cries/cry_feraligatr.bin" .align 2 Cry_Sentret:: @ 8559DA4 - .incbin "sound/direct_sound_samples/cry_sentret.bin" + .incbin "sound/direct_sound_samples/cries/cry_sentret.bin" .align 2 Cry_Furret:: @ 855A1CC - .incbin "sound/direct_sound_samples/cry_furret.bin" + .incbin "sound/direct_sound_samples/cries/cry_furret.bin" .align 2 Cry_Hoothoot:: @ 855A814 - .incbin "sound/direct_sound_samples/cry_hoothoot.bin" + .incbin "sound/direct_sound_samples/cries/cry_hoothoot.bin" .align 2 Cry_Noctowl:: @ 855B2F8 - .incbin "sound/direct_sound_samples/cry_noctowl.bin" + .incbin "sound/direct_sound_samples/cries/cry_noctowl.bin" .align 2 Cry_Ledyba:: @ 855C828 - .incbin "sound/direct_sound_samples/cry_ledyba.bin" + .incbin "sound/direct_sound_samples/cries/cry_ledyba.bin" .align 2 Cry_Ledian:: @ 855CF20 - .incbin "sound/direct_sound_samples/cry_ledian.bin" + .incbin "sound/direct_sound_samples/cries/cry_ledian.bin" .align 2 Cry_Spinarak:: @ 855D784 - .incbin "sound/direct_sound_samples/cry_spinarak.bin" + .incbin "sound/direct_sound_samples/cries/cry_spinarak.bin" .align 2 Cry_Ariados:: @ 855E4E8 - .incbin "sound/direct_sound_samples/cry_ariados.bin" + .incbin "sound/direct_sound_samples/cries/cry_ariados.bin" .align 2 Cry_Crobat:: @ 855F13C - .incbin "sound/direct_sound_samples/cry_crobat.bin" + .incbin "sound/direct_sound_samples/cries/cry_crobat.bin" .align 2 Cry_Chinchou:: @ 856086C - .incbin "sound/direct_sound_samples/cry_chinchou.bin" + .incbin "sound/direct_sound_samples/cries/cry_chinchou.bin" .align 2 Cry_Lanturn:: @ 856151C - .incbin "sound/direct_sound_samples/cry_lanturn.bin" + .incbin "sound/direct_sound_samples/cries/cry_lanturn.bin" .align 2 Cry_Pichu:: @ 8561FA8 - .incbin "sound/direct_sound_samples/cry_pichu.bin" + .incbin "sound/direct_sound_samples/cries/cry_pichu.bin" .align 2 Cry_Cleffa:: @ 85626FC - .incbin "sound/direct_sound_samples/cry_cleffa.bin" + .incbin "sound/direct_sound_samples/cries/cry_cleffa.bin" .align 2 Cry_Igglybuff:: @ 8562CEC - .incbin "sound/direct_sound_samples/cry_igglybuff.bin" + .incbin "sound/direct_sound_samples/cries/cry_igglybuff.bin" .align 2 Cry_Togepi:: @ 85633E8 - .incbin "sound/direct_sound_samples/cry_togepi.bin" + .incbin "sound/direct_sound_samples/cries/cry_togepi.bin" .align 2 Cry_Togetic:: @ 8563ED0 - .incbin "sound/direct_sound_samples/cry_togetic.bin" + .incbin "sound/direct_sound_samples/cries/cry_togetic.bin" .align 2 Cry_Natu:: @ 85645D0 - .incbin "sound/direct_sound_samples/cry_natu.bin" + .incbin "sound/direct_sound_samples/cries/cry_natu.bin" .align 2 Cry_Xatu:: @ 8565060 - .incbin "sound/direct_sound_samples/cry_xatu.bin" + .incbin "sound/direct_sound_samples/cries/cry_xatu.bin" .align 2 Cry_Mareep:: @ 8565F2C - .incbin "sound/direct_sound_samples/cry_mareep.bin" + .incbin "sound/direct_sound_samples/cries/cry_mareep.bin" .align 2 Cry_Flaaffy:: @ 8566684 - .incbin "sound/direct_sound_samples/cry_flaaffy.bin" + .incbin "sound/direct_sound_samples/cries/cry_flaaffy.bin" .align 2 Cry_Ampharos:: @ 8567438 - .incbin "sound/direct_sound_samples/cry_ampharos.bin" + .incbin "sound/direct_sound_samples/cries/cry_ampharos.bin" .align 2 Cry_Bellossom:: @ 85684B8 - .incbin "sound/direct_sound_samples/cry_bellossom.bin" + .incbin "sound/direct_sound_samples/cries/cry_bellossom.bin" .align 2 Cry_Marill:: @ 85692D0 - .incbin "sound/direct_sound_samples/cry_marill.bin" + .incbin "sound/direct_sound_samples/cries/cry_marill.bin" .align 2 Cry_Azumarill:: @ 8569FE4 - .incbin "sound/direct_sound_samples/cry_azumarill.bin" + .incbin "sound/direct_sound_samples/cries/cry_azumarill.bin" .align 2 Cry_Sudowoodo:: @ 856B0D0 - .incbin "sound/direct_sound_samples/cry_sudowoodo.bin" + .incbin "sound/direct_sound_samples/cries/cry_sudowoodo.bin" .align 2 Cry_Politoed:: @ 856C100 - .incbin "sound/direct_sound_samples/cry_politoed.bin" + .incbin "sound/direct_sound_samples/cries/cry_politoed.bin" .align 2 Cry_Hoppip:: @ 856D344 - .incbin "sound/direct_sound_samples/cry_hoppip.bin" + .incbin "sound/direct_sound_samples/cries/cry_hoppip.bin" .align 2 Cry_Skiploom:: @ 856DBB0 - .incbin "sound/direct_sound_samples/cry_skiploom.bin" + .incbin "sound/direct_sound_samples/cries/cry_skiploom.bin" .align 2 Cry_Jumpluff:: @ 856E8B8 - .incbin "sound/direct_sound_samples/cry_jumpluff.bin" + .incbin "sound/direct_sound_samples/cries/cry_jumpluff.bin" .align 2 Cry_Aipom:: @ 856F8F4 - .incbin "sound/direct_sound_samples/cry_aipom.bin" + .incbin "sound/direct_sound_samples/cries/cry_aipom.bin" .align 2 Cry_Sunkern:: @ 8570714 - .incbin "sound/direct_sound_samples/cry_sunkern.bin" + .incbin "sound/direct_sound_samples/cries/cry_sunkern.bin" .align 2 Cry_Sunflora:: @ 8570F28 - .incbin "sound/direct_sound_samples/cry_sunflora.bin" + .incbin "sound/direct_sound_samples/cries/cry_sunflora.bin" .align 2 Cry_Yanma:: @ 8571F08 - .incbin "sound/direct_sound_samples/cry_yanma.bin" + .incbin "sound/direct_sound_samples/cries/cry_yanma.bin" .align 2 Cry_Wooper:: @ 8573010 - .incbin "sound/direct_sound_samples/cry_wooper.bin" + .incbin "sound/direct_sound_samples/cries/cry_wooper.bin" .align 2 Cry_Quagsire:: @ 8573770 - .incbin "sound/direct_sound_samples/cry_quagsire.bin" + .incbin "sound/direct_sound_samples/cries/cry_quagsire.bin" .align 2 Cry_Espeon:: @ 85744D0 - .incbin "sound/direct_sound_samples/cry_espeon.bin" + .incbin "sound/direct_sound_samples/cries/cry_espeon.bin" .align 2 Cry_Umbreon:: @ 8575884 - .incbin "sound/direct_sound_samples/cry_umbreon.bin" + .incbin "sound/direct_sound_samples/cries/cry_umbreon.bin" .align 2 Cry_Murkrow:: @ 8576804 - .incbin "sound/direct_sound_samples/cry_murkrow.bin" + .incbin "sound/direct_sound_samples/cries/cry_murkrow.bin" .align 2 Cry_Slowking:: @ 85778C8 - .incbin "sound/direct_sound_samples/cry_slowking.bin" + .incbin "sound/direct_sound_samples/cries/cry_slowking.bin" .align 2 Cry_Misdreavus:: @ 85790AC - .incbin "sound/direct_sound_samples/cry_misdreavus.bin" + .incbin "sound/direct_sound_samples/cries/cry_misdreavus.bin" .align 2 Cry_Unown:: @ 8579C4C - .incbin "sound/direct_sound_samples/cry_unown.bin" + .incbin "sound/direct_sound_samples/cries/cry_unown.bin" .align 2 Cry_Wobbuffet:: @ 857A974 - .incbin "sound/direct_sound_samples/cry_wobbuffet.bin" + .incbin "sound/direct_sound_samples/cries/cry_wobbuffet.bin" .align 2 Cry_Girafarig:: @ 857BE10 - .incbin "sound/direct_sound_samples/cry_girafarig.bin" + .incbin "sound/direct_sound_samples/cries/cry_girafarig.bin" .align 2 Cry_Pineco:: @ 857CCC4 - .incbin "sound/direct_sound_samples/cry_pineco.bin" + .incbin "sound/direct_sound_samples/cries/cry_pineco.bin" .align 2 Cry_Forretress:: @ 857DA24 - .incbin "sound/direct_sound_samples/cry_forretress.bin" + .incbin "sound/direct_sound_samples/cries/cry_forretress.bin" .align 2 Cry_Dunsparce:: @ 857EE2C - .incbin "sound/direct_sound_samples/cry_dunsparce.bin" + .incbin "sound/direct_sound_samples/cries/cry_dunsparce.bin" .align 2 Cry_Gligar:: @ 857FE0C - .incbin "sound/direct_sound_samples/cry_gligar.bin" + .incbin "sound/direct_sound_samples/cries/cry_gligar.bin" .align 2 Cry_Steelix:: @ 8580A2C - .incbin "sound/direct_sound_samples/cry_steelix.bin" + .incbin "sound/direct_sound_samples/cries/cry_steelix.bin" .align 2 Cry_Snubbull:: @ 8583054 - .incbin "sound/direct_sound_samples/cry_snubbull.bin" + .incbin "sound/direct_sound_samples/cries/cry_snubbull.bin" .align 2 Cry_Granbull:: @ 8583EC8 - .incbin "sound/direct_sound_samples/cry_granbull.bin" + .incbin "sound/direct_sound_samples/cries/cry_granbull.bin" .align 2 Cry_Qwilfish:: @ 858566C - .incbin "sound/direct_sound_samples/cry_qwilfish.bin" + .incbin "sound/direct_sound_samples/cries/cry_qwilfish.bin" .align 2 Cry_Scizor:: @ 8586208 - .incbin "sound/direct_sound_samples/cry_scizor.bin" + .incbin "sound/direct_sound_samples/cries/cry_scizor.bin" .align 2 Cry_Shuckle:: @ 8587904 - .incbin "sound/direct_sound_samples/cry_shuckle.bin" + .incbin "sound/direct_sound_samples/cries/cry_shuckle.bin" .align 2 Cry_Heracross:: @ 8588338 - .incbin "sound/direct_sound_samples/cry_heracross.bin" + .incbin "sound/direct_sound_samples/cries/cry_heracross.bin" .align 2 Cry_Sneasel:: @ 858958C - .incbin "sound/direct_sound_samples/cry_sneasel.bin" + .incbin "sound/direct_sound_samples/cries/cry_sneasel.bin" .align 2 Cry_Teddiursa:: @ 8589EB0 - .incbin "sound/direct_sound_samples/cry_teddiursa.bin" + .incbin "sound/direct_sound_samples/cries/cry_teddiursa.bin" .align 2 Cry_Ursaring:: @ 858AF3C - .incbin "sound/direct_sound_samples/cry_ursaring.bin" + .incbin "sound/direct_sound_samples/cries/cry_ursaring.bin" .align 2 Cry_Slugma:: @ 858CD14 - .incbin "sound/direct_sound_samples/cry_slugma.bin" + .incbin "sound/direct_sound_samples/cries/cry_slugma.bin" .align 2 Cry_Magcargo:: @ 858DE2C - .incbin "sound/direct_sound_samples/cry_magcargo.bin" + .incbin "sound/direct_sound_samples/cries/cry_magcargo.bin" .align 2 Cry_Swinub:: @ 858F334 - .incbin "sound/direct_sound_samples/cry_swinub.bin" + .incbin "sound/direct_sound_samples/cries/cry_swinub.bin" .align 2 Cry_Piloswine:: @ 858FFDC - .incbin "sound/direct_sound_samples/cry_piloswine.bin" + .incbin "sound/direct_sound_samples/cries/cry_piloswine.bin" .align 2 Cry_Corsola:: @ 8590CD0 - .incbin "sound/direct_sound_samples/cry_corsola.bin" + .incbin "sound/direct_sound_samples/cries/cry_corsola.bin" .align 2 Cry_Remoraid:: @ 85919B0 - .incbin "sound/direct_sound_samples/cry_remoraid.bin" + .incbin "sound/direct_sound_samples/cries/cry_remoraid.bin" .align 2 Cry_Octillery:: @ 8592440 - .incbin "sound/direct_sound_samples/cry_octillery.bin" + .incbin "sound/direct_sound_samples/cries/cry_octillery.bin" .align 2 Cry_Delibird:: @ 8593E84 - .incbin "sound/direct_sound_samples/cry_delibird.bin" + .incbin "sound/direct_sound_samples/cries/cry_delibird.bin" .align 2 Cry_Mantine:: @ 8594EB8 - .incbin "sound/direct_sound_samples/cry_mantine.bin" + .incbin "sound/direct_sound_samples/cries/cry_mantine.bin" .align 2 Cry_Skarmory:: @ 8595E80 - .incbin "sound/direct_sound_samples/cry_skarmory.bin" + .incbin "sound/direct_sound_samples/cries/cry_skarmory.bin" .align 2 Cry_Houndour:: @ 8597688 - .incbin "sound/direct_sound_samples/cry_houndour.bin" + .incbin "sound/direct_sound_samples/cries/cry_houndour.bin" .align 2 Cry_Houndoom:: @ 8598330 - .incbin "sound/direct_sound_samples/cry_houndoom.bin" + .incbin "sound/direct_sound_samples/cries/cry_houndoom.bin" .align 2 Cry_Kingdra:: @ 85996E0 - .incbin "sound/direct_sound_samples/cry_kingdra.bin" + .incbin "sound/direct_sound_samples/cries/cry_kingdra.bin" .align 2 Cry_Phanpy:: @ 859A4B8 - .incbin "sound/direct_sound_samples/cry_phanpy.bin" + .incbin "sound/direct_sound_samples/cries/cry_phanpy.bin" .align 2 Cry_Donphan:: @ 859B008 - .incbin "sound/direct_sound_samples/cry_donphan.bin" + .incbin "sound/direct_sound_samples/cries/cry_donphan.bin" .align 2 Cry_Porygon2:: @ 859C12C - .incbin "sound/direct_sound_samples/cry_porygon2.bin" + .incbin "sound/direct_sound_samples/cries/cry_porygon2.bin" .align 2 Cry_Stantler:: @ 859D0E4 - .incbin "sound/direct_sound_samples/cry_stantler.bin" + .incbin "sound/direct_sound_samples/cries/cry_stantler.bin" .align 2 Cry_Smeargle:: @ 859E760 - .incbin "sound/direct_sound_samples/cry_smeargle.bin" + .incbin "sound/direct_sound_samples/cries/cry_smeargle.bin" .align 2 Cry_Tyrogue:: @ 859F194 - .incbin "sound/direct_sound_samples/cry_tyrogue.bin" + .incbin "sound/direct_sound_samples/cries/cry_tyrogue.bin" .align 2 Cry_Hitmontop:: @ 85A01BC - .incbin "sound/direct_sound_samples/cry_hitmontop.bin" + .incbin "sound/direct_sound_samples/cries/cry_hitmontop.bin" .align 2 Cry_Smoochum:: @ 85A0F9C - .incbin "sound/direct_sound_samples/cry_smoochum.bin" + .incbin "sound/direct_sound_samples/cries/cry_smoochum.bin" .align 2 Cry_Elekid:: @ 85A1B50 - .incbin "sound/direct_sound_samples/cry_elekid.bin" + .incbin "sound/direct_sound_samples/cries/cry_elekid.bin" .align 2 Cry_Magby:: @ 85A25DC - .incbin "sound/direct_sound_samples/cry_magby.bin" + .incbin "sound/direct_sound_samples/cries/cry_magby.bin" .align 2 Cry_Miltank:: @ 85A344C - .incbin "sound/direct_sound_samples/cry_miltank.bin" + .incbin "sound/direct_sound_samples/cries/cry_miltank.bin" .align 2 Cry_Blissey:: @ 85A4328 - .incbin "sound/direct_sound_samples/cry_blissey.bin" + .incbin "sound/direct_sound_samples/cries/cry_blissey.bin" .align 2 Cry_Raikou:: @ 85A53BC - .incbin "sound/direct_sound_samples/cry_raikou.bin" + .incbin "sound/direct_sound_samples/cries/cry_raikou.bin" .align 2 Cry_Entei:: @ 85A652C - .incbin "sound/direct_sound_samples/cry_entei.bin" + .incbin "sound/direct_sound_samples/cries/cry_entei.bin" .align 2 Cry_Suicune:: @ 85A79A0 - .incbin "sound/direct_sound_samples/cry_suicune.bin" + .incbin "sound/direct_sound_samples/cries/cry_suicune.bin" .align 2 Cry_Larvitar:: @ 85A8BE8 - .incbin "sound/direct_sound_samples/cry_larvitar.bin" + .incbin "sound/direct_sound_samples/cries/cry_larvitar.bin" .align 2 Cry_Pupitar:: @ 85A9898 - .incbin "sound/direct_sound_samples/cry_pupitar.bin" + .incbin "sound/direct_sound_samples/cries/cry_pupitar.bin" .align 2 Cry_Tyranitar:: @ 85AA108 - .incbin "sound/direct_sound_samples/cry_tyranitar.bin" + .incbin "sound/direct_sound_samples/cries/cry_tyranitar.bin" .align 2 Cry_Lugia:: @ 85AB868 - .incbin "sound/direct_sound_samples/cry_lugia.bin" + .incbin "sound/direct_sound_samples/cries/cry_lugia.bin" .align 2 Cry_HoOh:: @ 85ADE60 - .incbin "sound/direct_sound_samples/cry_ho_oh.bin" + .incbin "sound/direct_sound_samples/cries/cry_ho_oh.bin" .align 2 Cry_Celebi:: @ 85AF4F4 - .incbin "sound/direct_sound_samples/cry_celebi.bin" + .incbin "sound/direct_sound_samples/cries/cry_celebi.bin" .align 2 Cry_Kecleon:: @ 85B036C - .incbin "sound/direct_sound_samples/cry_kecleon.bin" + .incbin "sound/direct_sound_samples/cries/cry_kecleon.bin" .align 2 Cry_Roselia:: @ 85B0BCC - .incbin "sound/direct_sound_samples/cry_roselia.bin" + .incbin "sound/direct_sound_samples/cries/cry_roselia.bin" .align 2 Cry_Torkoal:: @ 85B168C - .incbin "sound/direct_sound_samples/cry_torkoal.bin" + .incbin "sound/direct_sound_samples/cries/cry_torkoal.bin" .align 2 Cry_Electrike:: @ 85B1FD8 - .incbin "sound/direct_sound_samples/cry_electrike.bin" + .incbin "sound/direct_sound_samples/cries/cry_electrike.bin" .align 2 Cry_Manectric:: @ 85B2C34 - .incbin "sound/direct_sound_samples/cry_manectric.bin" + .incbin "sound/direct_sound_samples/cries/cry_manectric.bin" .align 2 Cry_Duskull:: @ 85B413C - .incbin "sound/direct_sound_samples/cry_duskull.bin" + .incbin "sound/direct_sound_samples/cries/cry_duskull.bin" .align 2 Cry_Latias:: @ 85B4BD4 - .incbin "sound/direct_sound_samples/cry_latias.bin" + .incbin "sound/direct_sound_samples/cries/cry_latias.bin" .align 2 Cry_Wynaut:: @ 85B5804 - .incbin "sound/direct_sound_samples/cry_wynaut.bin" + .incbin "sound/direct_sound_samples/cries/cry_wynaut.bin" .align 2 Cry_Seviper:: @ 85B65E4 - .incbin "sound/direct_sound_samples/cry_seviper.bin" + .incbin "sound/direct_sound_samples/cries/cry_seviper.bin" .align 2 Cry_Sharpedo:: @ 85B7184 - .incbin "sound/direct_sound_samples/cry_sharpedo.bin" + .incbin "sound/direct_sound_samples/cries/cry_sharpedo.bin" .align 2 Cry_Zangoose:: @ 85B8890 - .incbin "sound/direct_sound_samples/cry_zangoose.bin" + .incbin "sound/direct_sound_samples/cries/cry_zangoose.bin" .align 2 Cry_Azurill:: @ 85B9220 - .incbin "sound/direct_sound_samples/cry_azurill.bin" + .incbin "sound/direct_sound_samples/cries/cry_azurill.bin" .align 2 Cry_Swablu:: @ 85B9C88 - .incbin "sound/direct_sound_samples/cry_swablu.bin" + .incbin "sound/direct_sound_samples/cries/cry_swablu.bin" .align 2 Cry_Altaria:: @ 85BA220 - .incbin "sound/direct_sound_samples/cry_altaria.bin" + .incbin "sound/direct_sound_samples/cries/cry_altaria.bin" .align 2 Cry_Unused265:: @ 85BAD3C - .incbin "sound/direct_sound_samples/cry_unused_265.bin" + .incbin "sound/direct_sound_samples/cries/cry_unused_265.bin" .align 2 Cry_Taillow:: @ 85BB690 - .incbin "sound/direct_sound_samples/cry_taillow.bin" + .incbin "sound/direct_sound_samples/cries/cry_taillow.bin" .align 2 Cry_Swellow:: @ 85BBC90 - .incbin "sound/direct_sound_samples/cry_swellow.bin" + .incbin "sound/direct_sound_samples/cries/cry_swellow.bin" .align 2 Cry_Unused268:: @ 85BC594 - .incbin "sound/direct_sound_samples/cry_unused_268.bin" + .incbin "sound/direct_sound_samples/cries/cry_unused_268.bin" .align 2 Cry_Spinda:: @ 85BD744 - .incbin "sound/direct_sound_samples/cry_spinda.bin" + .incbin "sound/direct_sound_samples/cries/cry_spinda.bin" .align 2 Cry_Torchic:: @ 85BE3B0 - .incbin "sound/direct_sound_samples/cry_torchic.bin" + .incbin "sound/direct_sound_samples/cries/cry_torchic.bin" .align 2 Cry_Combusken:: @ 85BED58 - .incbin "sound/direct_sound_samples/cry_combusken.bin" + .incbin "sound/direct_sound_samples/cries/cry_combusken.bin" .align 2 Cry_Blaziken:: @ 85C0A2C - .incbin "sound/direct_sound_samples/cry_blaziken.bin" + .incbin "sound/direct_sound_samples/cries/cry_blaziken.bin" .align 2 Cry_Treecko:: @ 85C29AC - .incbin "sound/direct_sound_samples/cry_treecko.bin" + .incbin "sound/direct_sound_samples/cries/cry_treecko.bin" .align 2 Cry_Grovyle:: @ 85C3554 - .incbin "sound/direct_sound_samples/cry_grovyle.bin" + .incbin "sound/direct_sound_samples/cries/cry_grovyle.bin" .align 2 Cry_Sceptile:: @ 85C49C8 - .incbin "sound/direct_sound_samples/cry_sceptile.bin" + .incbin "sound/direct_sound_samples/cries/cry_sceptile.bin" .align 2 Cry_Mudkip:: @ 85C63E4 - .incbin "sound/direct_sound_samples/cry_mudkip.bin" + .incbin "sound/direct_sound_samples/cries/cry_mudkip.bin" .align 2 Cry_Marshtomp:: @ 85C6B68 - .incbin "sound/direct_sound_samples/cry_marshtomp.bin" + .incbin "sound/direct_sound_samples/cries/cry_marshtomp.bin" .align 2 Cry_Swampert:: @ 85C7C6C - .incbin "sound/direct_sound_samples/cry_swampert.bin" + .incbin "sound/direct_sound_samples/cries/cry_swampert.bin" .align 2 Cry_Pelipper:: @ 85C92EC - .incbin "sound/direct_sound_samples/cry_pelipper.bin" + .incbin "sound/direct_sound_samples/cries/cry_pelipper.bin" .align 2 Cry_Wingull:: @ 85C9EB4 - .incbin "sound/direct_sound_samples/cry_wingull.bin" + .incbin "sound/direct_sound_samples/cries/cry_wingull.bin" .align 2 Cry_Banette:: @ 85CAAF4 - .incbin "sound/direct_sound_samples/cry_banette.bin" + .incbin "sound/direct_sound_samples/cries/cry_banette.bin" .align 2 Cry_Shuppet:: @ 85CB79C - .incbin "sound/direct_sound_samples/cry_shuppet.bin" + .incbin "sound/direct_sound_samples/cries/cry_shuppet.bin" .align 2 Cry_Lotad:: @ 85CBFDC - .incbin "sound/direct_sound_samples/cry_lotad.bin" + .incbin "sound/direct_sound_samples/cries/cry_lotad.bin" .align 2 Cry_Lombre:: @ 85CC444 - .incbin "sound/direct_sound_samples/cry_lombre.bin" + .incbin "sound/direct_sound_samples/cries/cry_lombre.bin" .align 2 Cry_Ludicolo:: @ 85CD2D8 - .incbin "sound/direct_sound_samples/cry_ludicolo.bin" + .incbin "sound/direct_sound_samples/cries/cry_ludicolo.bin" .align 2 Cry_Seedot:: @ 85CE3A8 - .incbin "sound/direct_sound_samples/cry_seedot.bin" + .incbin "sound/direct_sound_samples/cries/cry_seedot.bin" .align 2 Cry_Nuzleaf:: @ 85CEBD4 - .incbin "sound/direct_sound_samples/cry_nuzleaf.bin" + .incbin "sound/direct_sound_samples/cries/cry_nuzleaf.bin" .align 2 Cry_Shiftry:: @ 85CF73C - .incbin "sound/direct_sound_samples/cry_shiftry.bin" + .incbin "sound/direct_sound_samples/cries/cry_shiftry.bin" .align 2 Cry_Carvanha:: @ 85D0B00 - .incbin "sound/direct_sound_samples/cry_carvanha.bin" + .incbin "sound/direct_sound_samples/cries/cry_carvanha.bin" .align 2 Cry_Wurmple:: @ 85D1514 - .incbin "sound/direct_sound_samples/cry_wurmple.bin" + .incbin "sound/direct_sound_samples/cries/cry_wurmple.bin" .align 2 Cry_Silcoon:: @ 85D1DE0 - .incbin "sound/direct_sound_samples/cry_silcoon.bin" + .incbin "sound/direct_sound_samples/cries/cry_silcoon.bin" .align 2 Cry_Beautifly:: @ 85D2E0C - .incbin "sound/direct_sound_samples/cry_beautifly.bin" + .incbin "sound/direct_sound_samples/cries/cry_beautifly.bin" .align 2 Cry_Cascoon:: @ 85D3644 - .incbin "sound/direct_sound_samples/cry_cascoon.bin" + .incbin "sound/direct_sound_samples/cries/cry_cascoon.bin" .align 2 Cry_Dustox:: @ 85D4688 - .incbin "sound/direct_sound_samples/cry_dustox.bin" + .incbin "sound/direct_sound_samples/cries/cry_dustox.bin" .align 2 Cry_Ralts:: @ 85D5334 - .incbin "sound/direct_sound_samples/cry_ralts.bin" + .incbin "sound/direct_sound_samples/cries/cry_ralts.bin" .align 2 Cry_Kirlia:: @ 85D5D50 - .incbin "sound/direct_sound_samples/cry_kirlia.bin" + .incbin "sound/direct_sound_samples/cries/cry_kirlia.bin" .align 2 Cry_Gardevoir:: @ 85D6980 - .incbin "sound/direct_sound_samples/cry_gardevoir.bin" + .incbin "sound/direct_sound_samples/cries/cry_gardevoir.bin" .align 2 Cry_Slakoth:: @ 85D81E4 - .incbin "sound/direct_sound_samples/cry_slakoth.bin" + .incbin "sound/direct_sound_samples/cries/cry_slakoth.bin" .align 2 Cry_Vigoroth:: @ 85D8A68 - .incbin "sound/direct_sound_samples/cry_vigoroth.bin" + .incbin "sound/direct_sound_samples/cries/cry_vigoroth.bin" .align 2 Cry_Slaking:: @ 85D98C0 - .incbin "sound/direct_sound_samples/cry_slaking.bin" + .incbin "sound/direct_sound_samples/cries/cry_slaking.bin" .align 2 Cry_Nincada:: @ 85DA2AC - .incbin "sound/direct_sound_samples/cry_nincada.bin" + .incbin "sound/direct_sound_samples/cries/cry_nincada.bin" .align 2 Cry_Ninjask:: @ 85DA91C - .incbin "sound/direct_sound_samples/cry_ninjask.bin" + .incbin "sound/direct_sound_samples/cries/cry_ninjask.bin" .align 2 Cry_Shedinja:: @ 85DB544 - .incbin "sound/direct_sound_samples/cry_shedinja.bin" + .incbin "sound/direct_sound_samples/cries/cry_shedinja.bin" .align 2 Cry_Makuhita:: @ 85DBCFC - .incbin "sound/direct_sound_samples/cry_makuhita.bin" + .incbin "sound/direct_sound_samples/cries/cry_makuhita.bin" .align 2 Cry_Hariyama:: @ 85DC458 - .incbin "sound/direct_sound_samples/cry_hariyama.bin" + .incbin "sound/direct_sound_samples/cries/cry_hariyama.bin" .align 2 Cry_Nosepass:: @ 85DD510 - .incbin "sound/direct_sound_samples/cry_nosepass.bin" + .incbin "sound/direct_sound_samples/cries/cry_nosepass.bin" .align 2 Cry_Glalie:: @ 85DE274 - .incbin "sound/direct_sound_samples/cry_glalie.bin" + .incbin "sound/direct_sound_samples/cries/cry_glalie.bin" .align 2 Cry_Plusle:: @ 85DF758 - .incbin "sound/direct_sound_samples/cry_plusle.bin" + .incbin "sound/direct_sound_samples/cries/cry_plusle.bin" .align 2 Cry_Minun:: @ 85E0054 - .incbin "sound/direct_sound_samples/cry_minun.bin" + .incbin "sound/direct_sound_samples/cries/cry_minun.bin" .align 2 Cry_Surskit:: @ 85E105C - .incbin "sound/direct_sound_samples/cry_surskit.bin" + .incbin "sound/direct_sound_samples/cries/cry_surskit.bin" .align 2 Cry_Masquerain:: @ 85E1ADC - .incbin "sound/direct_sound_samples/cry_masquerain.bin" + .incbin "sound/direct_sound_samples/cries/cry_masquerain.bin" .align 2 Cry_Skitty:: @ 85E2E90 - .incbin "sound/direct_sound_samples/cry_skitty.bin" + .incbin "sound/direct_sound_samples/cries/cry_skitty.bin" .align 2 Cry_Delcatty:: @ 85E35A4 - .incbin "sound/direct_sound_samples/cry_delcatty.bin" + .incbin "sound/direct_sound_samples/cries/cry_delcatty.bin" .align 2 Cry_Gulpin:: @ 85E4ABC - .incbin "sound/direct_sound_samples/cry_gulpin.bin" + .incbin "sound/direct_sound_samples/cries/cry_gulpin.bin" .align 2 Cry_Swalot:: @ 85E52C0 - .incbin "sound/direct_sound_samples/cry_swalot.bin" + .incbin "sound/direct_sound_samples/cries/cry_swalot.bin" .align 2 Cry_Numel:: @ 85E6420 - .incbin "sound/direct_sound_samples/cry_numel.bin" + .incbin "sound/direct_sound_samples/cries/cry_numel.bin" .align 2 Cry_Camerupt:: @ 85E6D6C - .incbin "sound/direct_sound_samples/cry_camerupt.bin" + .incbin "sound/direct_sound_samples/cries/cry_camerupt.bin" .align 2 Cry_Barboach:: @ 85E848C - .incbin "sound/direct_sound_samples/cry_barboach.bin" + .incbin "sound/direct_sound_samples/cries/cry_barboach.bin" .align 2 Cry_Whiscash:: @ 85E8DC8 - .incbin "sound/direct_sound_samples/cry_whiscash.bin" + .incbin "sound/direct_sound_samples/cries/cry_whiscash.bin" .align 2 Cry_Corphish:: @ 85E9EC4 - .incbin "sound/direct_sound_samples/cry_corphish.bin" + .incbin "sound/direct_sound_samples/cries/cry_corphish.bin" .align 2 Cry_Crawdaunt:: @ 85EAAC8 - .incbin "sound/direct_sound_samples/cry_crawdaunt.bin" + .incbin "sound/direct_sound_samples/cries/cry_crawdaunt.bin" .align 2 Cry_Spoink:: @ 85EC380 - .incbin "sound/direct_sound_samples/cry_spoink.bin" + .incbin "sound/direct_sound_samples/cries/cry_spoink.bin" .align 2 Cry_Grumpig:: @ 85ECAC0 - .incbin "sound/direct_sound_samples/cry_grumpig.bin" + .incbin "sound/direct_sound_samples/cries/cry_grumpig.bin" .align 2 Cry_Trapinch:: @ 85ED760 - .incbin "sound/direct_sound_samples/cry_trapinch.bin" + .incbin "sound/direct_sound_samples/cries/cry_trapinch.bin" .align 2 Cry_Vibrava:: @ 85EE184 - .incbin "sound/direct_sound_samples/cry_vibrava.bin" + .incbin "sound/direct_sound_samples/cries/cry_vibrava.bin" .align 2 Cry_Flygon:: @ 85EEF88 - .incbin "sound/direct_sound_samples/cry_flygon.bin" + .incbin "sound/direct_sound_samples/cries/cry_flygon.bin" .align 2 Cry_Cacnea:: @ 85F0990 - .incbin "sound/direct_sound_samples/cry_cacnea.bin" + .incbin "sound/direct_sound_samples/cries/cry_cacnea.bin" .align 2 Cry_Cacturne:: @ 85F1280 - .incbin "sound/direct_sound_samples/cry_cacturne.bin" + .incbin "sound/direct_sound_samples/cries/cry_cacturne.bin" .align 2 Cry_Baltoy:: @ 85F2930 - .incbin "sound/direct_sound_samples/cry_baltoy.bin" + .incbin "sound/direct_sound_samples/cries/cry_baltoy.bin" .align 2 Cry_Claydol:: @ 85F35B4 - .incbin "sound/direct_sound_samples/cry_claydol.bin" + .incbin "sound/direct_sound_samples/cries/cry_claydol.bin" .align 2 Cry_Lunatone:: @ 85F4914 - .incbin "sound/direct_sound_samples/cry_lunatone.bin" + .incbin "sound/direct_sound_samples/cries/cry_lunatone.bin" .align 2 Cry_Solrock:: @ 85F6110 - .incbin "sound/direct_sound_samples/cry_solrock.bin" + .incbin "sound/direct_sound_samples/cries/cry_solrock.bin" .align 2 Cry_Feebas:: @ 85F713C - .incbin "sound/direct_sound_samples/cry_feebas.bin" + .incbin "sound/direct_sound_samples/cries/cry_feebas.bin" .align 2 Cry_Milotic:: @ 85F7910 - .incbin "sound/direct_sound_samples/cry_milotic.bin" + .incbin "sound/direct_sound_samples/cries/cry_milotic.bin" .align 2 Cry_Absol:: @ 85FA054 - .incbin "sound/direct_sound_samples/cry_absol.bin" + .incbin "sound/direct_sound_samples/cries/cry_absol.bin" .align 2 Cry_Meditite:: @ 85FAAD0 - .incbin "sound/direct_sound_samples/cry_meditite.bin" + .incbin "sound/direct_sound_samples/cries/cry_meditite.bin" .align 2 Cry_Medicham:: @ 85FB2F0 - .incbin "sound/direct_sound_samples/cry_medicham.bin" + .incbin "sound/direct_sound_samples/cries/cry_medicham.bin" .align 2 Cry_Spheal:: @ 85FC374 - .incbin "sound/direct_sound_samples/cry_spheal.bin" + .incbin "sound/direct_sound_samples/cries/cry_spheal.bin" .align 2 Cry_Sealeo:: @ 85FC928 - .incbin "sound/direct_sound_samples/cry_sealeo.bin" + .incbin "sound/direct_sound_samples/cries/cry_sealeo.bin" .align 2 Cry_Walrein:: @ 85FD500 - .incbin "sound/direct_sound_samples/cry_walrein.bin" + .incbin "sound/direct_sound_samples/cries/cry_walrein.bin" .align 2 Cry_Clamperl:: @ 85FF94C - .incbin "sound/direct_sound_samples/cry_clamperl.bin" + .incbin "sound/direct_sound_samples/cries/cry_clamperl.bin" .align 2 Cry_Huntail:: @ 8600B9C - .incbin "sound/direct_sound_samples/cry_huntail.bin" + .incbin "sound/direct_sound_samples/cries/cry_huntail.bin" .align 2 Cry_Gorebyss:: @ 8601B84 - .incbin "sound/direct_sound_samples/cry_gorebyss.bin" + .incbin "sound/direct_sound_samples/cries/cry_gorebyss.bin" .align 2 Cry_Lileep:: @ 86031F0 - .incbin "sound/direct_sound_samples/cry_lileep.bin" + .incbin "sound/direct_sound_samples/cries/cry_lileep.bin" .align 2 Cry_Cradily:: @ 8603B98 - .incbin "sound/direct_sound_samples/cry_cradily.bin" + .incbin "sound/direct_sound_samples/cries/cry_cradily.bin" .align 2 Cry_Anorith:: @ 86058C8 - .incbin "sound/direct_sound_samples/cry_anorith.bin" + .incbin "sound/direct_sound_samples/cries/cry_anorith.bin" .align 2 Cry_Armaldo:: @ 8606480 - .incbin "sound/direct_sound_samples/cry_armaldo.bin" + .incbin "sound/direct_sound_samples/cries/cry_armaldo.bin" .align 2 Cry_Beldum:: @ 8607B54 - .incbin "sound/direct_sound_samples/cry_beldum.bin" + .incbin "sound/direct_sound_samples/cries/cry_beldum.bin" .align 2 Cry_Metang:: @ 86084F4 - .incbin "sound/direct_sound_samples/cry_metang.bin" + .incbin "sound/direct_sound_samples/cries/cry_metang.bin" .align 2 Cry_Metagross:: @ 86097C8 - .incbin "sound/direct_sound_samples/cry_metagross.bin" + .incbin "sound/direct_sound_samples/cries/cry_metagross.bin" .align 2 Cry_Bagon:: @ 860BF40 - .incbin "sound/direct_sound_samples/cry_bagon.bin" + .incbin "sound/direct_sound_samples/cries/cry_bagon.bin" .align 2 Cry_Shelgon:: @ 860C714 - .incbin "sound/direct_sound_samples/cry_shelgon.bin" + .incbin "sound/direct_sound_samples/cries/cry_shelgon.bin" .align 2 Cry_Regirock:: @ 860DB1C - .incbin "sound/direct_sound_samples/cry_regirock.bin" + .incbin "sound/direct_sound_samples/cries/cry_regirock.bin" .align 2 Cry_Regice:: @ 860FAF8 - .incbin "sound/direct_sound_samples/cry_regice.bin" + .incbin "sound/direct_sound_samples/cries/cry_regice.bin" .align 2 Cry_Registeel:: @ 8611AF8 - .incbin "sound/direct_sound_samples/cry_registeel.bin" + .incbin "sound/direct_sound_samples/cries/cry_registeel.bin" .align 2 Cry_Castform:: @ 86131FC - .incbin "sound/direct_sound_samples/cry_castform.bin" + .incbin "sound/direct_sound_samples/cries/cry_castform.bin" .align 2 Cry_Volbeat:: @ 8613E94 - .incbin "sound/direct_sound_samples/cry_volbeat.bin" + .incbin "sound/direct_sound_samples/cries/cry_volbeat.bin" .align 2 Cry_Illumise:: @ 8614A1C - .incbin "sound/direct_sound_samples/cry_illumise.bin" + .incbin "sound/direct_sound_samples/cries/cry_illumise.bin" .align 2 Cry_Poochyena:: @ 8615B34 - .incbin "sound/direct_sound_samples/cry_poochyena.bin" + .incbin "sound/direct_sound_samples/cries/cry_poochyena.bin" .align 2 Cry_Mightyena:: @ 861647C - .incbin "sound/direct_sound_samples/cry_mightyena.bin" + .incbin "sound/direct_sound_samples/cries/cry_mightyena.bin" .align 2 Cry_Dusclops:: @ 8617808 - .incbin "sound/direct_sound_samples/cry_dusclops.bin" + .incbin "sound/direct_sound_samples/cries/cry_dusclops.bin" .align 2 Cry_Sableye:: @ 86185C0 - .incbin "sound/direct_sound_samples/cry_sableye.bin" + .incbin "sound/direct_sound_samples/cries/cry_sableye.bin" .align 2 Cry_Mawile:: @ 8619164 - .incbin "sound/direct_sound_samples/cry_mawile.bin" + .incbin "sound/direct_sound_samples/cries/cry_mawile.bin" .align 2 Cry_Aron:: @ 8619CE4 - .incbin "sound/direct_sound_samples/cry_aron.bin" + .incbin "sound/direct_sound_samples/cries/cry_aron.bin" .align 2 Cry_Lairon:: @ 861A610 - .incbin "sound/direct_sound_samples/cry_lairon.bin" + .incbin "sound/direct_sound_samples/cries/cry_lairon.bin" .align 2 Cry_Aggron:: @ 861BAE8 - .incbin "sound/direct_sound_samples/cry_aggron.bin" + .incbin "sound/direct_sound_samples/cries/cry_aggron.bin" .align 2 Cry_Relicanth:: @ 861D48C - .incbin "sound/direct_sound_samples/cry_relicanth.bin" + .incbin "sound/direct_sound_samples/cries/cry_relicanth.bin" .align 2 Cry_Luvdisc:: @ 861E8BC - .incbin "sound/direct_sound_samples/cry_luvdisc.bin" + .incbin "sound/direct_sound_samples/cries/cry_luvdisc.bin" .align 2 Cry_Groudon:: @ 861ED98 - .incbin "sound/direct_sound_samples/cry_groudon.bin" + .incbin "sound/direct_sound_samples/cries/cry_groudon.bin" .align 2 Cry_Kyogre:: @ 86212A4 - .incbin "sound/direct_sound_samples/cry_kyogre.bin" + .incbin "sound/direct_sound_samples/cries/cry_kyogre.bin" .align 2 Cry_Rayquaza:: @ 862365C - .incbin "sound/direct_sound_samples/cry_rayquaza.bin" + .incbin "sound/direct_sound_samples/cries/cry_rayquaza.bin" .align 2 Cry_Salamence:: @ 8625388 - .incbin "sound/direct_sound_samples/cry_salamence.bin" + .incbin "sound/direct_sound_samples/cries/cry_salamence.bin" .align 2 Cry_Breloom:: @ 8626CA4 - .incbin "sound/direct_sound_samples/cry_breloom.bin" + .incbin "sound/direct_sound_samples/cries/cry_breloom.bin" .align 2 Cry_Shroomish:: @ 8627964 - .incbin "sound/direct_sound_samples/cry_shroomish.bin" + .incbin "sound/direct_sound_samples/cries/cry_shroomish.bin" .align 2 Cry_Linoone:: @ 862823C - .incbin "sound/direct_sound_samples/cry_linoone.bin" + .incbin "sound/direct_sound_samples/cries/cry_linoone.bin" .align 2 Cry_Tropius:: @ 862A0D8 - .incbin "sound/direct_sound_samples/cry_tropius.bin" + .incbin "sound/direct_sound_samples/cries/cry_tropius.bin" .align 2 Cry_Wailmer:: @ 862C19C - .incbin "sound/direct_sound_samples/cry_wailmer.bin" + .incbin "sound/direct_sound_samples/cries/cry_wailmer.bin" .align 2 Cry_Zigzagoon:: @ 862DDFC - .incbin "sound/direct_sound_samples/cry_zigzagoon.bin" + .incbin "sound/direct_sound_samples/cries/cry_zigzagoon.bin" .align 2 Cry_Exploud:: @ 862E98C - .incbin "sound/direct_sound_samples/cry_exploud.bin" + .incbin "sound/direct_sound_samples/cries/cry_exploud.bin" .align 2 Cry_Loudred:: @ 86305D4 - .incbin "sound/direct_sound_samples/cry_loudred.bin" + .incbin "sound/direct_sound_samples/cries/cry_loudred.bin" .align 2 Cry_Wailord:: @ 86312FC - .incbin "sound/direct_sound_samples/cry_wailord.bin" + .incbin "sound/direct_sound_samples/cries/cry_wailord.bin" .align 2 Cry_Whismur:: @ 8633D0C - .incbin "sound/direct_sound_samples/cry_whismur.bin" + .incbin "sound/direct_sound_samples/cries/cry_whismur.bin" .align 2 Cry_Snorunt:: @ 8634530 - .incbin "sound/direct_sound_samples/cry_snorunt.bin" + .incbin "sound/direct_sound_samples/cries/cry_snorunt.bin" .align 2 Cry_Latios:: @ 8635638 - .incbin "sound/direct_sound_samples/cry_latios.bin" + .incbin "sound/direct_sound_samples/cries/cry_latios.bin" .align 2 Cry_Jirachi:: @ 8636C30 - .incbin "sound/direct_sound_samples/cry_jirachi.bin" + .incbin "sound/direct_sound_samples/cries/cry_jirachi.bin" .align 2 Cry_Deoxys:: @ 86379B4 - .incbin "sound/direct_sound_samples/cry_deoxys.bin" + .incbin "sound/direct_sound_samples/cries/cry_deoxys.bin" .align 2 Cry_Chimecho:: @ 8638E88 - .incbin "sound/direct_sound_samples/cry_chimecho.bin" + .incbin "sound/direct_sound_samples/cries/cry_chimecho.bin" .align 2 DirectSoundWaveData_8639898:: @ 8639898 diff --git a/sound/direct_sound_samples/cries/cry_abra.aif b/sound/direct_sound_samples/cries/cry_abra.aif new file mode 100644 index 000000000..7df4446db Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_abra.aif differ diff --git a/sound/direct_sound_samples/cries/cry_absol.aif b/sound/direct_sound_samples/cries/cry_absol.aif new file mode 100644 index 000000000..884ab22b3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_absol.aif differ diff --git a/sound/direct_sound_samples/cries/cry_aerodactyl.aif b/sound/direct_sound_samples/cries/cry_aerodactyl.aif new file mode 100644 index 000000000..c0e40f6d1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_aerodactyl.aif differ diff --git a/sound/direct_sound_samples/cries/cry_aggron.aif b/sound/direct_sound_samples/cries/cry_aggron.aif new file mode 100644 index 000000000..b89ea1222 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_aggron.aif differ diff --git a/sound/direct_sound_samples/cries/cry_aipom.aif b/sound/direct_sound_samples/cries/cry_aipom.aif new file mode 100644 index 000000000..5ca276de2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_aipom.aif differ diff --git a/sound/direct_sound_samples/cries/cry_alakazam.aif b/sound/direct_sound_samples/cries/cry_alakazam.aif new file mode 100644 index 000000000..920e2ff94 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_alakazam.aif differ diff --git a/sound/direct_sound_samples/cries/cry_altaria.aif b/sound/direct_sound_samples/cries/cry_altaria.aif new file mode 100644 index 000000000..3e8e35e8e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_altaria.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ampharos.aif b/sound/direct_sound_samples/cries/cry_ampharos.aif new file mode 100644 index 000000000..4f6e255a0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ampharos.aif differ diff --git a/sound/direct_sound_samples/cries/cry_anorith.aif b/sound/direct_sound_samples/cries/cry_anorith.aif new file mode 100644 index 000000000..96e87e919 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_anorith.aif differ diff --git a/sound/direct_sound_samples/cries/cry_arbok.aif b/sound/direct_sound_samples/cries/cry_arbok.aif new file mode 100644 index 000000000..6ccace9f9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_arbok.aif differ diff --git a/sound/direct_sound_samples/cries/cry_arcanine.aif b/sound/direct_sound_samples/cries/cry_arcanine.aif new file mode 100644 index 000000000..61d802153 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_arcanine.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ariados.aif b/sound/direct_sound_samples/cries/cry_ariados.aif new file mode 100644 index 000000000..1748624fb Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ariados.aif differ diff --git a/sound/direct_sound_samples/cries/cry_armaldo.aif b/sound/direct_sound_samples/cries/cry_armaldo.aif new file mode 100644 index 000000000..756bf0842 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_armaldo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_aron.aif b/sound/direct_sound_samples/cries/cry_aron.aif new file mode 100644 index 000000000..cce70b73b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_aron.aif differ diff --git a/sound/direct_sound_samples/cries/cry_articuno.aif b/sound/direct_sound_samples/cries/cry_articuno.aif new file mode 100644 index 000000000..4f237dd0f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_articuno.aif differ diff --git a/sound/direct_sound_samples/cries/cry_azumarill.aif b/sound/direct_sound_samples/cries/cry_azumarill.aif new file mode 100644 index 000000000..18411f93c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_azumarill.aif differ diff --git a/sound/direct_sound_samples/cries/cry_azurill.aif b/sound/direct_sound_samples/cries/cry_azurill.aif new file mode 100644 index 000000000..7f651c3d3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_azurill.aif differ diff --git a/sound/direct_sound_samples/cries/cry_bagon.aif b/sound/direct_sound_samples/cries/cry_bagon.aif new file mode 100644 index 000000000..3843fb9f4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_bagon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_baltoy.aif b/sound/direct_sound_samples/cries/cry_baltoy.aif new file mode 100644 index 000000000..25e1a708a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_baltoy.aif differ diff --git a/sound/direct_sound_samples/cries/cry_banette.aif b/sound/direct_sound_samples/cries/cry_banette.aif new file mode 100644 index 000000000..23713f1b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_banette.aif differ diff --git a/sound/direct_sound_samples/cries/cry_barboach.aif b/sound/direct_sound_samples/cries/cry_barboach.aif new file mode 100644 index 000000000..4b9228259 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_barboach.aif differ diff --git a/sound/direct_sound_samples/cries/cry_bayleef.aif b/sound/direct_sound_samples/cries/cry_bayleef.aif new file mode 100644 index 000000000..8cef22df3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_bayleef.aif differ diff --git a/sound/direct_sound_samples/cries/cry_beautifly.aif b/sound/direct_sound_samples/cries/cry_beautifly.aif new file mode 100644 index 000000000..0924b6c55 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_beautifly.aif differ diff --git a/sound/direct_sound_samples/cries/cry_beedrill.aif b/sound/direct_sound_samples/cries/cry_beedrill.aif new file mode 100644 index 000000000..00d0bc96c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_beedrill.aif differ diff --git a/sound/direct_sound_samples/cries/cry_beldum.aif b/sound/direct_sound_samples/cries/cry_beldum.aif new file mode 100644 index 000000000..76435a6a8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_beldum.aif differ diff --git a/sound/direct_sound_samples/cries/cry_bellossom.aif b/sound/direct_sound_samples/cries/cry_bellossom.aif new file mode 100644 index 000000000..86580df65 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_bellossom.aif differ diff --git a/sound/direct_sound_samples/cries/cry_bellsprout.aif b/sound/direct_sound_samples/cries/cry_bellsprout.aif new file mode 100644 index 000000000..cfdd7aed2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_bellsprout.aif differ diff --git a/sound/direct_sound_samples/cries/cry_blastoise.aif b/sound/direct_sound_samples/cries/cry_blastoise.aif new file mode 100644 index 000000000..76dac2bcc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_blastoise.aif differ diff --git a/sound/direct_sound_samples/cries/cry_blaziken.aif b/sound/direct_sound_samples/cries/cry_blaziken.aif new file mode 100644 index 000000000..83e5ccf23 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_blaziken.aif differ diff --git a/sound/direct_sound_samples/cries/cry_blissey.aif b/sound/direct_sound_samples/cries/cry_blissey.aif new file mode 100644 index 000000000..897eb3d69 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_blissey.aif differ diff --git a/sound/direct_sound_samples/cries/cry_breloom.aif b/sound/direct_sound_samples/cries/cry_breloom.aif new file mode 100644 index 000000000..ea3f1bb66 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_breloom.aif differ diff --git a/sound/direct_sound_samples/cries/cry_bulbasaur.aif b/sound/direct_sound_samples/cries/cry_bulbasaur.aif new file mode 100644 index 000000000..040fb1df7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_bulbasaur.aif differ diff --git a/sound/direct_sound_samples/cries/cry_butterfree.aif b/sound/direct_sound_samples/cries/cry_butterfree.aif new file mode 100644 index 000000000..f27616395 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_butterfree.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cacnea.aif b/sound/direct_sound_samples/cries/cry_cacnea.aif new file mode 100644 index 000000000..4fd5acd36 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cacnea.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cacturne.aif b/sound/direct_sound_samples/cries/cry_cacturne.aif new file mode 100644 index 000000000..d9fb8fda8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cacturne.aif differ diff --git a/sound/direct_sound_samples/cries/cry_camerupt.aif b/sound/direct_sound_samples/cries/cry_camerupt.aif new file mode 100644 index 000000000..325df1220 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_camerupt.aif differ diff --git a/sound/direct_sound_samples/cries/cry_carvanha.aif b/sound/direct_sound_samples/cries/cry_carvanha.aif new file mode 100644 index 000000000..c7cdedf91 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_carvanha.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cascoon.aif b/sound/direct_sound_samples/cries/cry_cascoon.aif new file mode 100644 index 000000000..17eef0ee9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cascoon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_castform.aif b/sound/direct_sound_samples/cries/cry_castform.aif new file mode 100644 index 000000000..c10745640 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_castform.aif differ diff --git a/sound/direct_sound_samples/cries/cry_caterpie.aif b/sound/direct_sound_samples/cries/cry_caterpie.aif new file mode 100644 index 000000000..b0b246b4f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_caterpie.aif differ diff --git a/sound/direct_sound_samples/cries/cry_celebi.aif b/sound/direct_sound_samples/cries/cry_celebi.aif new file mode 100644 index 000000000..9f9f3ea39 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_celebi.aif differ diff --git a/sound/direct_sound_samples/cries/cry_chansey.aif b/sound/direct_sound_samples/cries/cry_chansey.aif new file mode 100644 index 000000000..d764c86ce Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_chansey.aif differ diff --git a/sound/direct_sound_samples/cries/cry_charizard.aif b/sound/direct_sound_samples/cries/cry_charizard.aif new file mode 100644 index 000000000..48321b792 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_charizard.aif differ diff --git a/sound/direct_sound_samples/cries/cry_charmander.aif b/sound/direct_sound_samples/cries/cry_charmander.aif new file mode 100644 index 000000000..d72c0f9e0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_charmander.aif differ diff --git a/sound/direct_sound_samples/cries/cry_charmeleon.aif b/sound/direct_sound_samples/cries/cry_charmeleon.aif new file mode 100644 index 000000000..8e84af0d8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_charmeleon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_chikorita.aif b/sound/direct_sound_samples/cries/cry_chikorita.aif new file mode 100644 index 000000000..67ceafdc3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_chikorita.aif differ diff --git a/sound/direct_sound_samples/cries/cry_chimecho.aif b/sound/direct_sound_samples/cries/cry_chimecho.aif new file mode 100644 index 000000000..87ee2faee Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_chimecho.aif differ diff --git a/sound/direct_sound_samples/cries/cry_chinchou.aif b/sound/direct_sound_samples/cries/cry_chinchou.aif new file mode 100644 index 000000000..356475678 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_chinchou.aif differ diff --git a/sound/direct_sound_samples/cries/cry_clamperl.aif b/sound/direct_sound_samples/cries/cry_clamperl.aif new file mode 100644 index 000000000..7250bd703 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_clamperl.aif differ diff --git a/sound/direct_sound_samples/cries/cry_claydol.aif b/sound/direct_sound_samples/cries/cry_claydol.aif new file mode 100644 index 000000000..b89772021 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_claydol.aif differ diff --git a/sound/direct_sound_samples/cries/cry_clefable.aif b/sound/direct_sound_samples/cries/cry_clefable.aif new file mode 100644 index 000000000..9c2d8c664 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_clefable.aif differ diff --git a/sound/direct_sound_samples/cries/cry_clefairy.aif b/sound/direct_sound_samples/cries/cry_clefairy.aif new file mode 100644 index 000000000..c370c4a9b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_clefairy.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cleffa.aif b/sound/direct_sound_samples/cries/cry_cleffa.aif new file mode 100644 index 000000000..b27cdeca9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cleffa.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cloyster.aif b/sound/direct_sound_samples/cries/cry_cloyster.aif new file mode 100644 index 000000000..b406deab0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cloyster.aif differ diff --git a/sound/direct_sound_samples/cries/cry_combusken.aif b/sound/direct_sound_samples/cries/cry_combusken.aif new file mode 100644 index 000000000..7d4b0d4cc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_combusken.aif differ diff --git a/sound/direct_sound_samples/cries/cry_corphish.aif b/sound/direct_sound_samples/cries/cry_corphish.aif new file mode 100644 index 000000000..f0f5ca01e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_corphish.aif differ diff --git a/sound/direct_sound_samples/cries/cry_corsola.aif b/sound/direct_sound_samples/cries/cry_corsola.aif new file mode 100644 index 000000000..68e743bfd Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_corsola.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cradily.aif b/sound/direct_sound_samples/cries/cry_cradily.aif new file mode 100644 index 000000000..197dc8d92 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cradily.aif differ diff --git a/sound/direct_sound_samples/cries/cry_crawdaunt.aif b/sound/direct_sound_samples/cries/cry_crawdaunt.aif new file mode 100644 index 000000000..a203ce2fb Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_crawdaunt.aif differ diff --git a/sound/direct_sound_samples/cries/cry_crobat.aif b/sound/direct_sound_samples/cries/cry_crobat.aif new file mode 100644 index 000000000..75d039bd8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_crobat.aif differ diff --git a/sound/direct_sound_samples/cries/cry_croconaw.aif b/sound/direct_sound_samples/cries/cry_croconaw.aif new file mode 100644 index 000000000..afb7f3fdc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_croconaw.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cubone.aif b/sound/direct_sound_samples/cries/cry_cubone.aif new file mode 100644 index 000000000..170745da1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cubone.aif differ diff --git a/sound/direct_sound_samples/cries/cry_cyndaquil.aif b/sound/direct_sound_samples/cries/cry_cyndaquil.aif new file mode 100644 index 000000000..4aa580199 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_cyndaquil.aif differ diff --git a/sound/direct_sound_samples/cries/cry_delcatty.aif b/sound/direct_sound_samples/cries/cry_delcatty.aif new file mode 100644 index 000000000..dd665b110 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_delcatty.aif differ diff --git a/sound/direct_sound_samples/cries/cry_delibird.aif b/sound/direct_sound_samples/cries/cry_delibird.aif new file mode 100644 index 000000000..dbedc42d4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_delibird.aif differ diff --git a/sound/direct_sound_samples/cries/cry_deoxys.aif b/sound/direct_sound_samples/cries/cry_deoxys.aif new file mode 100644 index 000000000..b9623b337 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_deoxys.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dewgong.aif b/sound/direct_sound_samples/cries/cry_dewgong.aif new file mode 100644 index 000000000..72d69b773 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dewgong.aif differ diff --git a/sound/direct_sound_samples/cries/cry_diglett.aif b/sound/direct_sound_samples/cries/cry_diglett.aif new file mode 100644 index 000000000..b116af7f2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_diglett.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ditto.aif b/sound/direct_sound_samples/cries/cry_ditto.aif new file mode 100644 index 000000000..2c797f4c4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ditto.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dodrio.aif b/sound/direct_sound_samples/cries/cry_dodrio.aif new file mode 100644 index 000000000..111d8bf3e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dodrio.aif differ diff --git a/sound/direct_sound_samples/cries/cry_doduo.aif b/sound/direct_sound_samples/cries/cry_doduo.aif new file mode 100644 index 000000000..5700b91d9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_doduo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_donphan.aif b/sound/direct_sound_samples/cries/cry_donphan.aif new file mode 100644 index 000000000..a41c124b1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_donphan.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dragonair.aif b/sound/direct_sound_samples/cries/cry_dragonair.aif new file mode 100644 index 000000000..38c3955ef Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dragonair.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dragonite.aif b/sound/direct_sound_samples/cries/cry_dragonite.aif new file mode 100644 index 000000000..d1e7b11cf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dragonite.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dratini.aif b/sound/direct_sound_samples/cries/cry_dratini.aif new file mode 100644 index 000000000..298497480 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dratini.aif differ diff --git a/sound/direct_sound_samples/cries/cry_drowzee.aif b/sound/direct_sound_samples/cries/cry_drowzee.aif new file mode 100644 index 000000000..0d53eb2ff Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_drowzee.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dugtrio.aif b/sound/direct_sound_samples/cries/cry_dugtrio.aif new file mode 100644 index 000000000..dff573dfe Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dugtrio.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dunsparce.aif b/sound/direct_sound_samples/cries/cry_dunsparce.aif new file mode 100644 index 000000000..454617c05 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dunsparce.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dusclops.aif b/sound/direct_sound_samples/cries/cry_dusclops.aif new file mode 100644 index 000000000..de9657e4f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dusclops.aif differ diff --git a/sound/direct_sound_samples/cries/cry_duskull.aif b/sound/direct_sound_samples/cries/cry_duskull.aif new file mode 100644 index 000000000..d84ea274e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_duskull.aif differ diff --git a/sound/direct_sound_samples/cries/cry_dustox.aif b/sound/direct_sound_samples/cries/cry_dustox.aif new file mode 100644 index 000000000..56d8eb336 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_dustox.aif differ diff --git a/sound/direct_sound_samples/cries/cry_eevee.aif b/sound/direct_sound_samples/cries/cry_eevee.aif new file mode 100644 index 000000000..8711a1470 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_eevee.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ekans.aif b/sound/direct_sound_samples/cries/cry_ekans.aif new file mode 100644 index 000000000..9eb396735 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ekans.aif differ diff --git a/sound/direct_sound_samples/cries/cry_electabuzz.aif b/sound/direct_sound_samples/cries/cry_electabuzz.aif new file mode 100644 index 000000000..5abdb49b7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_electabuzz.aif differ diff --git a/sound/direct_sound_samples/cries/cry_electrike.aif b/sound/direct_sound_samples/cries/cry_electrike.aif new file mode 100644 index 000000000..56c9666df Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_electrike.aif differ diff --git a/sound/direct_sound_samples/cries/cry_electrode.aif b/sound/direct_sound_samples/cries/cry_electrode.aif new file mode 100644 index 000000000..cbd7f0971 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_electrode.aif differ diff --git a/sound/direct_sound_samples/cries/cry_elekid.aif b/sound/direct_sound_samples/cries/cry_elekid.aif new file mode 100644 index 000000000..839bdee17 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_elekid.aif differ diff --git a/sound/direct_sound_samples/cries/cry_entei.aif b/sound/direct_sound_samples/cries/cry_entei.aif new file mode 100644 index 000000000..56a740207 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_entei.aif differ diff --git a/sound/direct_sound_samples/cries/cry_espeon.aif b/sound/direct_sound_samples/cries/cry_espeon.aif new file mode 100644 index 000000000..53dc62f4d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_espeon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_exeggcute.aif b/sound/direct_sound_samples/cries/cry_exeggcute.aif new file mode 100644 index 000000000..147912c2f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_exeggcute.aif differ diff --git a/sound/direct_sound_samples/cries/cry_exeggutor.aif b/sound/direct_sound_samples/cries/cry_exeggutor.aif new file mode 100644 index 000000000..c0b9177bf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_exeggutor.aif differ diff --git a/sound/direct_sound_samples/cries/cry_exploud.aif b/sound/direct_sound_samples/cries/cry_exploud.aif new file mode 100644 index 000000000..5b80870cc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_exploud.aif differ diff --git a/sound/direct_sound_samples/cries/cry_farfetchd.aif b/sound/direct_sound_samples/cries/cry_farfetchd.aif new file mode 100644 index 000000000..f1db556dc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_farfetchd.aif differ diff --git a/sound/direct_sound_samples/cries/cry_fearow.aif b/sound/direct_sound_samples/cries/cry_fearow.aif new file mode 100644 index 000000000..74a76f6d4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_fearow.aif differ diff --git a/sound/direct_sound_samples/cries/cry_feebas.aif b/sound/direct_sound_samples/cries/cry_feebas.aif new file mode 100644 index 000000000..c386522f1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_feebas.aif differ diff --git a/sound/direct_sound_samples/cries/cry_feraligatr.aif b/sound/direct_sound_samples/cries/cry_feraligatr.aif new file mode 100644 index 000000000..9fcd93cff Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_feraligatr.aif differ diff --git a/sound/direct_sound_samples/cries/cry_flaaffy.aif b/sound/direct_sound_samples/cries/cry_flaaffy.aif new file mode 100644 index 000000000..93dfacfaf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_flaaffy.aif differ diff --git a/sound/direct_sound_samples/cries/cry_flareon.aif b/sound/direct_sound_samples/cries/cry_flareon.aif new file mode 100644 index 000000000..58d28e60a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_flareon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_flygon.aif b/sound/direct_sound_samples/cries/cry_flygon.aif new file mode 100644 index 000000000..c8c377016 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_flygon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_forretress.aif b/sound/direct_sound_samples/cries/cry_forretress.aif new file mode 100644 index 000000000..288dacbea Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_forretress.aif differ diff --git a/sound/direct_sound_samples/cries/cry_furret.aif b/sound/direct_sound_samples/cries/cry_furret.aif new file mode 100644 index 000000000..6b4e9ce11 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_furret.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gardevoir.aif b/sound/direct_sound_samples/cries/cry_gardevoir.aif new file mode 100644 index 000000000..a14780990 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gardevoir.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gastly.aif b/sound/direct_sound_samples/cries/cry_gastly.aif new file mode 100644 index 000000000..93cef851d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gastly.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gengar.aif b/sound/direct_sound_samples/cries/cry_gengar.aif new file mode 100644 index 000000000..379b5d37e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gengar.aif differ diff --git a/sound/direct_sound_samples/cries/cry_geodude.aif b/sound/direct_sound_samples/cries/cry_geodude.aif new file mode 100644 index 000000000..143b9031c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_geodude.aif differ diff --git a/sound/direct_sound_samples/cries/cry_girafarig.aif b/sound/direct_sound_samples/cries/cry_girafarig.aif new file mode 100644 index 000000000..1dd5f93e2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_girafarig.aif differ diff --git a/sound/direct_sound_samples/cries/cry_glalie.aif b/sound/direct_sound_samples/cries/cry_glalie.aif new file mode 100644 index 000000000..e4e896547 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_glalie.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gligar.aif b/sound/direct_sound_samples/cries/cry_gligar.aif new file mode 100644 index 000000000..4050f08b0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gligar.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gloom.aif b/sound/direct_sound_samples/cries/cry_gloom.aif new file mode 100644 index 000000000..e930328ac Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gloom.aif differ diff --git a/sound/direct_sound_samples/cries/cry_golbat.aif b/sound/direct_sound_samples/cries/cry_golbat.aif new file mode 100644 index 000000000..11413df3a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_golbat.aif differ diff --git a/sound/direct_sound_samples/cries/cry_goldeen.aif b/sound/direct_sound_samples/cries/cry_goldeen.aif new file mode 100644 index 000000000..81fd1ecdf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_goldeen.aif differ diff --git a/sound/direct_sound_samples/cries/cry_golduck.aif b/sound/direct_sound_samples/cries/cry_golduck.aif new file mode 100644 index 000000000..b6b71a7a4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_golduck.aif differ diff --git a/sound/direct_sound_samples/cries/cry_golem.aif b/sound/direct_sound_samples/cries/cry_golem.aif new file mode 100644 index 000000000..0d2c4515e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_golem.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gorebyss.aif b/sound/direct_sound_samples/cries/cry_gorebyss.aif new file mode 100644 index 000000000..b7605062c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gorebyss.aif differ diff --git a/sound/direct_sound_samples/cries/cry_granbull.aif b/sound/direct_sound_samples/cries/cry_granbull.aif new file mode 100644 index 000000000..146b3bd0c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_granbull.aif differ diff --git a/sound/direct_sound_samples/cries/cry_graveler.aif b/sound/direct_sound_samples/cries/cry_graveler.aif new file mode 100644 index 000000000..773994228 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_graveler.aif differ diff --git a/sound/direct_sound_samples/cries/cry_grimer.aif b/sound/direct_sound_samples/cries/cry_grimer.aif new file mode 100644 index 000000000..95eed1061 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_grimer.aif differ diff --git a/sound/direct_sound_samples/cries/cry_groudon.aif b/sound/direct_sound_samples/cries/cry_groudon.aif new file mode 100644 index 000000000..62452b4d9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_groudon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_grovyle.aif b/sound/direct_sound_samples/cries/cry_grovyle.aif new file mode 100644 index 000000000..983bcfff3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_grovyle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_growlithe.aif b/sound/direct_sound_samples/cries/cry_growlithe.aif new file mode 100644 index 000000000..134e29834 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_growlithe.aif differ diff --git a/sound/direct_sound_samples/cries/cry_grumpig.aif b/sound/direct_sound_samples/cries/cry_grumpig.aif new file mode 100644 index 000000000..97c372076 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_grumpig.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gulpin.aif b/sound/direct_sound_samples/cries/cry_gulpin.aif new file mode 100644 index 000000000..f3043b422 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gulpin.aif differ diff --git a/sound/direct_sound_samples/cries/cry_gyarados.aif b/sound/direct_sound_samples/cries/cry_gyarados.aif new file mode 100644 index 000000000..238b6d721 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_gyarados.aif differ diff --git a/sound/direct_sound_samples/cries/cry_hariyama.aif b/sound/direct_sound_samples/cries/cry_hariyama.aif new file mode 100644 index 000000000..1ac1f3f7e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_hariyama.aif differ diff --git a/sound/direct_sound_samples/cries/cry_haunter.aif b/sound/direct_sound_samples/cries/cry_haunter.aif new file mode 100644 index 000000000..60ec72171 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_haunter.aif differ diff --git a/sound/direct_sound_samples/cries/cry_heracross.aif b/sound/direct_sound_samples/cries/cry_heracross.aif new file mode 100644 index 000000000..a0734748f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_heracross.aif differ diff --git a/sound/direct_sound_samples/cries/cry_hitmonchan.aif b/sound/direct_sound_samples/cries/cry_hitmonchan.aif new file mode 100644 index 000000000..40479452c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_hitmonchan.aif differ diff --git a/sound/direct_sound_samples/cries/cry_hitmonlee.aif b/sound/direct_sound_samples/cries/cry_hitmonlee.aif new file mode 100644 index 000000000..3a4bcddca Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_hitmonlee.aif differ diff --git a/sound/direct_sound_samples/cries/cry_hitmontop.aif b/sound/direct_sound_samples/cries/cry_hitmontop.aif new file mode 100644 index 000000000..3fbee8041 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_hitmontop.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ho_oh.aif b/sound/direct_sound_samples/cries/cry_ho_oh.aif new file mode 100644 index 000000000..52f8dd307 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ho_oh.aif differ diff --git a/sound/direct_sound_samples/cries/cry_hoothoot.aif b/sound/direct_sound_samples/cries/cry_hoothoot.aif new file mode 100644 index 000000000..59e685dcc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_hoothoot.aif differ diff --git a/sound/direct_sound_samples/cries/cry_hoppip.aif b/sound/direct_sound_samples/cries/cry_hoppip.aif new file mode 100644 index 000000000..ea47877d0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_hoppip.aif differ diff --git a/sound/direct_sound_samples/cries/cry_horsea.aif b/sound/direct_sound_samples/cries/cry_horsea.aif new file mode 100644 index 000000000..e41eff4b1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_horsea.aif differ diff --git a/sound/direct_sound_samples/cries/cry_houndoom.aif b/sound/direct_sound_samples/cries/cry_houndoom.aif new file mode 100644 index 000000000..6fec16d39 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_houndoom.aif differ diff --git a/sound/direct_sound_samples/cries/cry_houndour.aif b/sound/direct_sound_samples/cries/cry_houndour.aif new file mode 100644 index 000000000..7431bbf29 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_houndour.aif differ diff --git a/sound/direct_sound_samples/cries/cry_huntail.aif b/sound/direct_sound_samples/cries/cry_huntail.aif new file mode 100644 index 000000000..f1d3b29d9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_huntail.aif differ diff --git a/sound/direct_sound_samples/cries/cry_hypno.aif b/sound/direct_sound_samples/cries/cry_hypno.aif new file mode 100644 index 000000000..32672a3c3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_hypno.aif differ diff --git a/sound/direct_sound_samples/cries/cry_igglybuff.aif b/sound/direct_sound_samples/cries/cry_igglybuff.aif new file mode 100644 index 000000000..8de8394d5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_igglybuff.aif differ diff --git a/sound/direct_sound_samples/cries/cry_illumise.aif b/sound/direct_sound_samples/cries/cry_illumise.aif new file mode 100644 index 000000000..75e03efc8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_illumise.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ivysaur.aif b/sound/direct_sound_samples/cries/cry_ivysaur.aif new file mode 100644 index 000000000..ea474ff88 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ivysaur.aif differ diff --git a/sound/direct_sound_samples/cries/cry_jigglypuff.aif b/sound/direct_sound_samples/cries/cry_jigglypuff.aif new file mode 100644 index 000000000..780424b4f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_jigglypuff.aif differ diff --git a/sound/direct_sound_samples/cries/cry_jirachi.aif b/sound/direct_sound_samples/cries/cry_jirachi.aif new file mode 100644 index 000000000..ea8a5c8ad Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_jirachi.aif differ diff --git a/sound/direct_sound_samples/cries/cry_jolteon.aif b/sound/direct_sound_samples/cries/cry_jolteon.aif new file mode 100644 index 000000000..013369158 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_jolteon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_jumpluff.aif b/sound/direct_sound_samples/cries/cry_jumpluff.aif new file mode 100644 index 000000000..13b0fd315 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_jumpluff.aif differ diff --git a/sound/direct_sound_samples/cries/cry_jynx.aif b/sound/direct_sound_samples/cries/cry_jynx.aif new file mode 100644 index 000000000..7394a48a2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_jynx.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kabuto.aif b/sound/direct_sound_samples/cries/cry_kabuto.aif new file mode 100644 index 000000000..6ae9801b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kabuto.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kabutops.aif b/sound/direct_sound_samples/cries/cry_kabutops.aif new file mode 100644 index 000000000..f23778e57 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kabutops.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kadabra.aif b/sound/direct_sound_samples/cries/cry_kadabra.aif new file mode 100644 index 000000000..bfcc18031 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kadabra.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kakuna.aif b/sound/direct_sound_samples/cries/cry_kakuna.aif new file mode 100644 index 000000000..7c4e9d7a8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kakuna.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kangaskhan.aif b/sound/direct_sound_samples/cries/cry_kangaskhan.aif new file mode 100644 index 000000000..643e81eb7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kangaskhan.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kecleon.aif b/sound/direct_sound_samples/cries/cry_kecleon.aif new file mode 100644 index 000000000..f27ae1832 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kecleon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kingdra.aif b/sound/direct_sound_samples/cries/cry_kingdra.aif new file mode 100644 index 000000000..ade230c82 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kingdra.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kingler.aif b/sound/direct_sound_samples/cries/cry_kingler.aif new file mode 100644 index 000000000..a1d845f45 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kingler.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kirlia.aif b/sound/direct_sound_samples/cries/cry_kirlia.aif new file mode 100644 index 000000000..692e03e5f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kirlia.aif differ diff --git a/sound/direct_sound_samples/cries/cry_koffing.aif b/sound/direct_sound_samples/cries/cry_koffing.aif new file mode 100644 index 000000000..7ca9de088 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_koffing.aif differ diff --git a/sound/direct_sound_samples/cries/cry_krabby.aif b/sound/direct_sound_samples/cries/cry_krabby.aif new file mode 100644 index 000000000..6b7692f21 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_krabby.aif differ diff --git a/sound/direct_sound_samples/cries/cry_kyogre.aif b/sound/direct_sound_samples/cries/cry_kyogre.aif new file mode 100644 index 000000000..290948319 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_kyogre.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lairon.aif b/sound/direct_sound_samples/cries/cry_lairon.aif new file mode 100644 index 000000000..b487165bf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lairon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lanturn.aif b/sound/direct_sound_samples/cries/cry_lanturn.aif new file mode 100644 index 000000000..dfeac1fbd Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lanturn.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lapras.aif b/sound/direct_sound_samples/cries/cry_lapras.aif new file mode 100644 index 000000000..61de32408 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lapras.aif differ diff --git a/sound/direct_sound_samples/cries/cry_larvitar.aif b/sound/direct_sound_samples/cries/cry_larvitar.aif new file mode 100644 index 000000000..1ab0e1d5f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_larvitar.aif differ diff --git a/sound/direct_sound_samples/cries/cry_latias.aif b/sound/direct_sound_samples/cries/cry_latias.aif new file mode 100644 index 000000000..46f7235f3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_latias.aif differ diff --git a/sound/direct_sound_samples/cries/cry_latios.aif b/sound/direct_sound_samples/cries/cry_latios.aif new file mode 100644 index 000000000..b8ace2a30 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_latios.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ledian.aif b/sound/direct_sound_samples/cries/cry_ledian.aif new file mode 100644 index 000000000..baefb5fa3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ledian.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ledyba.aif b/sound/direct_sound_samples/cries/cry_ledyba.aif new file mode 100644 index 000000000..4f26859a7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ledyba.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lickitung.aif b/sound/direct_sound_samples/cries/cry_lickitung.aif new file mode 100644 index 000000000..ef889a275 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lickitung.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lileep.aif b/sound/direct_sound_samples/cries/cry_lileep.aif new file mode 100644 index 000000000..ed8258eb7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lileep.aif differ diff --git a/sound/direct_sound_samples/cries/cry_linoone.aif b/sound/direct_sound_samples/cries/cry_linoone.aif new file mode 100644 index 000000000..4e5e7d3b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_linoone.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lombre.aif b/sound/direct_sound_samples/cries/cry_lombre.aif new file mode 100644 index 000000000..abafe4321 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lombre.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lotad.aif b/sound/direct_sound_samples/cries/cry_lotad.aif new file mode 100644 index 000000000..2596f4390 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lotad.aif differ diff --git a/sound/direct_sound_samples/cries/cry_loudred.aif b/sound/direct_sound_samples/cries/cry_loudred.aif new file mode 100644 index 000000000..fed7ebec8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_loudred.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ludicolo.aif b/sound/direct_sound_samples/cries/cry_ludicolo.aif new file mode 100644 index 000000000..7cf670f38 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ludicolo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lugia.aif b/sound/direct_sound_samples/cries/cry_lugia.aif new file mode 100644 index 000000000..45890a2fc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lugia.aif differ diff --git a/sound/direct_sound_samples/cries/cry_lunatone.aif b/sound/direct_sound_samples/cries/cry_lunatone.aif new file mode 100644 index 000000000..42cbc5e3c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_lunatone.aif differ diff --git a/sound/direct_sound_samples/cries/cry_luvdisc.aif b/sound/direct_sound_samples/cries/cry_luvdisc.aif new file mode 100644 index 000000000..3cc0cc744 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_luvdisc.aif differ diff --git a/sound/direct_sound_samples/cries/cry_machamp.aif b/sound/direct_sound_samples/cries/cry_machamp.aif new file mode 100644 index 000000000..ddeaf22c8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_machamp.aif differ diff --git a/sound/direct_sound_samples/cries/cry_machoke.aif b/sound/direct_sound_samples/cries/cry_machoke.aif new file mode 100644 index 000000000..97065ee09 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_machoke.aif differ diff --git a/sound/direct_sound_samples/cries/cry_machop.aif b/sound/direct_sound_samples/cries/cry_machop.aif new file mode 100644 index 000000000..d92419e84 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_machop.aif differ diff --git a/sound/direct_sound_samples/cries/cry_magby.aif b/sound/direct_sound_samples/cries/cry_magby.aif new file mode 100644 index 000000000..12f3dc889 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_magby.aif differ diff --git a/sound/direct_sound_samples/cries/cry_magcargo.aif b/sound/direct_sound_samples/cries/cry_magcargo.aif new file mode 100644 index 000000000..bef0351c0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_magcargo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_magikarp.aif b/sound/direct_sound_samples/cries/cry_magikarp.aif new file mode 100644 index 000000000..f4f9219c5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_magikarp.aif differ diff --git a/sound/direct_sound_samples/cries/cry_magmar.aif b/sound/direct_sound_samples/cries/cry_magmar.aif new file mode 100644 index 000000000..b79c8b9a1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_magmar.aif differ diff --git a/sound/direct_sound_samples/cries/cry_magnemite.aif b/sound/direct_sound_samples/cries/cry_magnemite.aif new file mode 100644 index 000000000..ebb9103d9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_magnemite.aif differ diff --git a/sound/direct_sound_samples/cries/cry_magneton.aif b/sound/direct_sound_samples/cries/cry_magneton.aif new file mode 100644 index 000000000..53083ac62 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_magneton.aif differ diff --git a/sound/direct_sound_samples/cries/cry_makuhita.aif b/sound/direct_sound_samples/cries/cry_makuhita.aif new file mode 100644 index 000000000..38d7f4b44 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_makuhita.aif differ diff --git a/sound/direct_sound_samples/cries/cry_manectric.aif b/sound/direct_sound_samples/cries/cry_manectric.aif new file mode 100644 index 000000000..18a8f4666 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_manectric.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mankey.aif b/sound/direct_sound_samples/cries/cry_mankey.aif new file mode 100644 index 000000000..dda929d4c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mankey.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mantine.aif b/sound/direct_sound_samples/cries/cry_mantine.aif new file mode 100644 index 000000000..d1840aafa Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mantine.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mareep.aif b/sound/direct_sound_samples/cries/cry_mareep.aif new file mode 100644 index 000000000..2615b9def Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mareep.aif differ diff --git a/sound/direct_sound_samples/cries/cry_marill.aif b/sound/direct_sound_samples/cries/cry_marill.aif new file mode 100644 index 000000000..48d936e7d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_marill.aif differ diff --git a/sound/direct_sound_samples/cries/cry_marowak.aif b/sound/direct_sound_samples/cries/cry_marowak.aif new file mode 100644 index 000000000..279381bb5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_marowak.aif differ diff --git a/sound/direct_sound_samples/cries/cry_marshtomp.aif b/sound/direct_sound_samples/cries/cry_marshtomp.aif new file mode 100644 index 000000000..c0106ff6c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_marshtomp.aif differ diff --git a/sound/direct_sound_samples/cries/cry_masquerain.aif b/sound/direct_sound_samples/cries/cry_masquerain.aif new file mode 100644 index 000000000..107bed2f7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_masquerain.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mawile.aif b/sound/direct_sound_samples/cries/cry_mawile.aif new file mode 100644 index 000000000..81b252b57 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mawile.aif differ diff --git a/sound/direct_sound_samples/cries/cry_medicham.aif b/sound/direct_sound_samples/cries/cry_medicham.aif new file mode 100644 index 000000000..dc85dd3b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_medicham.aif differ diff --git a/sound/direct_sound_samples/cries/cry_meditite.aif b/sound/direct_sound_samples/cries/cry_meditite.aif new file mode 100644 index 000000000..8ac680f79 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_meditite.aif differ diff --git a/sound/direct_sound_samples/cries/cry_meganium.aif b/sound/direct_sound_samples/cries/cry_meganium.aif new file mode 100644 index 000000000..ea1e1aa51 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_meganium.aif differ diff --git a/sound/direct_sound_samples/cries/cry_meowth.aif b/sound/direct_sound_samples/cries/cry_meowth.aif new file mode 100644 index 000000000..aaf3825d5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_meowth.aif differ diff --git a/sound/direct_sound_samples/cries/cry_metagross.aif b/sound/direct_sound_samples/cries/cry_metagross.aif new file mode 100644 index 000000000..b96e6647c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_metagross.aif differ diff --git a/sound/direct_sound_samples/cries/cry_metang.aif b/sound/direct_sound_samples/cries/cry_metang.aif new file mode 100644 index 000000000..da544ce4d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_metang.aif differ diff --git a/sound/direct_sound_samples/cries/cry_metapod.aif b/sound/direct_sound_samples/cries/cry_metapod.aif new file mode 100644 index 000000000..ddba3ed44 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_metapod.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mew.aif b/sound/direct_sound_samples/cries/cry_mew.aif new file mode 100644 index 000000000..2651b96ca Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mew.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mewtwo.aif b/sound/direct_sound_samples/cries/cry_mewtwo.aif new file mode 100644 index 000000000..8e1e6c7f1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mewtwo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mightyena.aif b/sound/direct_sound_samples/cries/cry_mightyena.aif new file mode 100644 index 000000000..53a645edc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mightyena.aif differ diff --git a/sound/direct_sound_samples/cries/cry_milotic.aif b/sound/direct_sound_samples/cries/cry_milotic.aif new file mode 100644 index 000000000..93a14161b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_milotic.aif differ diff --git a/sound/direct_sound_samples/cries/cry_miltank.aif b/sound/direct_sound_samples/cries/cry_miltank.aif new file mode 100644 index 000000000..ad8a41a45 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_miltank.aif differ diff --git a/sound/direct_sound_samples/cries/cry_minun.aif b/sound/direct_sound_samples/cries/cry_minun.aif new file mode 100644 index 000000000..a55aa5631 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_minun.aif differ diff --git a/sound/direct_sound_samples/cries/cry_misdreavus.aif b/sound/direct_sound_samples/cries/cry_misdreavus.aif new file mode 100644 index 000000000..39a09f4d0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_misdreavus.aif differ diff --git a/sound/direct_sound_samples/cries/cry_moltres.aif b/sound/direct_sound_samples/cries/cry_moltres.aif new file mode 100644 index 000000000..2e038a3d7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_moltres.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mr_mime.aif b/sound/direct_sound_samples/cries/cry_mr_mime.aif new file mode 100644 index 000000000..ff870dbc4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mr_mime.aif differ diff --git a/sound/direct_sound_samples/cries/cry_mudkip.aif b/sound/direct_sound_samples/cries/cry_mudkip.aif new file mode 100644 index 000000000..e8fa5c212 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_mudkip.aif differ diff --git a/sound/direct_sound_samples/cries/cry_muk.aif b/sound/direct_sound_samples/cries/cry_muk.aif new file mode 100644 index 000000000..f61ff4075 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_muk.aif differ diff --git a/sound/direct_sound_samples/cries/cry_murkrow.aif b/sound/direct_sound_samples/cries/cry_murkrow.aif new file mode 100644 index 000000000..4beddff1e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_murkrow.aif differ diff --git a/sound/direct_sound_samples/cries/cry_natu.aif b/sound/direct_sound_samples/cries/cry_natu.aif new file mode 100644 index 000000000..e6e38d5cc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_natu.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nidoking.aif b/sound/direct_sound_samples/cries/cry_nidoking.aif new file mode 100644 index 000000000..a0c86f9ab Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nidoking.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nidoqueen.aif b/sound/direct_sound_samples/cries/cry_nidoqueen.aif new file mode 100644 index 000000000..6c8f5254b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nidoqueen.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nidoran_f.aif b/sound/direct_sound_samples/cries/cry_nidoran_f.aif new file mode 100644 index 000000000..b7c8a5317 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nidoran_f.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nidoran_m.aif b/sound/direct_sound_samples/cries/cry_nidoran_m.aif new file mode 100644 index 000000000..08fc81c8b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nidoran_m.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nidorina.aif b/sound/direct_sound_samples/cries/cry_nidorina.aif new file mode 100644 index 000000000..91e293a50 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nidorina.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nidorino.aif b/sound/direct_sound_samples/cries/cry_nidorino.aif new file mode 100644 index 000000000..959351363 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nidorino.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nincada.aif b/sound/direct_sound_samples/cries/cry_nincada.aif new file mode 100644 index 000000000..5f96bda50 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nincada.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ninetales.aif b/sound/direct_sound_samples/cries/cry_ninetales.aif new file mode 100644 index 000000000..70c8cf528 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ninetales.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ninjask.aif b/sound/direct_sound_samples/cries/cry_ninjask.aif new file mode 100644 index 000000000..a6f07e8d3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ninjask.aif differ diff --git a/sound/direct_sound_samples/cries/cry_noctowl.aif b/sound/direct_sound_samples/cries/cry_noctowl.aif new file mode 100644 index 000000000..fe2e63d45 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_noctowl.aif differ diff --git a/sound/direct_sound_samples/cries/cry_none.aif b/sound/direct_sound_samples/cries/cry_none.aif new file mode 100644 index 000000000..44bb79c3c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_none.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nosepass.aif b/sound/direct_sound_samples/cries/cry_nosepass.aif new file mode 100644 index 000000000..be65ba082 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nosepass.aif differ diff --git a/sound/direct_sound_samples/cries/cry_numel.aif b/sound/direct_sound_samples/cries/cry_numel.aif new file mode 100644 index 000000000..55cce5f2c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_numel.aif differ diff --git a/sound/direct_sound_samples/cries/cry_nuzleaf.aif b/sound/direct_sound_samples/cries/cry_nuzleaf.aif new file mode 100644 index 000000000..d668f3fd3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_nuzleaf.aif differ diff --git a/sound/direct_sound_samples/cries/cry_octillery.aif b/sound/direct_sound_samples/cries/cry_octillery.aif new file mode 100644 index 000000000..75ee28ceb Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_octillery.aif differ diff --git a/sound/direct_sound_samples/cries/cry_oddish.aif b/sound/direct_sound_samples/cries/cry_oddish.aif new file mode 100644 index 000000000..6909a8dad Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_oddish.aif differ diff --git a/sound/direct_sound_samples/cries/cry_omanyte.aif b/sound/direct_sound_samples/cries/cry_omanyte.aif new file mode 100644 index 000000000..15ec2d1ef Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_omanyte.aif differ diff --git a/sound/direct_sound_samples/cries/cry_omastar.aif b/sound/direct_sound_samples/cries/cry_omastar.aif new file mode 100644 index 000000000..e67d5d7fc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_omastar.aif differ diff --git a/sound/direct_sound_samples/cries/cry_onix.aif b/sound/direct_sound_samples/cries/cry_onix.aif new file mode 100644 index 000000000..aa8a16505 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_onix.aif differ diff --git a/sound/direct_sound_samples/cries/cry_paras.aif b/sound/direct_sound_samples/cries/cry_paras.aif new file mode 100644 index 000000000..f9d69c21c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_paras.aif differ diff --git a/sound/direct_sound_samples/cries/cry_parasect.aif b/sound/direct_sound_samples/cries/cry_parasect.aif new file mode 100644 index 000000000..d6d9433e9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_parasect.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pelipper.aif b/sound/direct_sound_samples/cries/cry_pelipper.aif new file mode 100644 index 000000000..26718f848 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pelipper.aif differ diff --git a/sound/direct_sound_samples/cries/cry_persian.aif b/sound/direct_sound_samples/cries/cry_persian.aif new file mode 100644 index 000000000..40b3a2c56 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_persian.aif differ diff --git a/sound/direct_sound_samples/cries/cry_phanpy.aif b/sound/direct_sound_samples/cries/cry_phanpy.aif new file mode 100644 index 000000000..2fcab3c82 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_phanpy.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pichu.aif b/sound/direct_sound_samples/cries/cry_pichu.aif new file mode 100644 index 000000000..de47bbab8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pichu.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pidgeot.aif b/sound/direct_sound_samples/cries/cry_pidgeot.aif new file mode 100644 index 000000000..af400cdc6 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pidgeot.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pidgeotto.aif b/sound/direct_sound_samples/cries/cry_pidgeotto.aif new file mode 100644 index 000000000..7c71c8f3e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pidgeotto.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pidgey.aif b/sound/direct_sound_samples/cries/cry_pidgey.aif new file mode 100644 index 000000000..b9c3a5d2a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pidgey.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pikachu.aif b/sound/direct_sound_samples/cries/cry_pikachu.aif new file mode 100644 index 000000000..690bf5e1d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pikachu.aif differ diff --git a/sound/direct_sound_samples/cries/cry_piloswine.aif b/sound/direct_sound_samples/cries/cry_piloswine.aif new file mode 100644 index 000000000..b1f34d3b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_piloswine.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pineco.aif b/sound/direct_sound_samples/cries/cry_pineco.aif new file mode 100644 index 000000000..80292bda0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pineco.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pinsir.aif b/sound/direct_sound_samples/cries/cry_pinsir.aif new file mode 100644 index 000000000..cf27a11de Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pinsir.aif differ diff --git a/sound/direct_sound_samples/cries/cry_plusle.aif b/sound/direct_sound_samples/cries/cry_plusle.aif new file mode 100644 index 000000000..d68984263 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_plusle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_politoed.aif b/sound/direct_sound_samples/cries/cry_politoed.aif new file mode 100644 index 000000000..38b1883b4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_politoed.aif differ diff --git a/sound/direct_sound_samples/cries/cry_poliwag.aif b/sound/direct_sound_samples/cries/cry_poliwag.aif new file mode 100644 index 000000000..8467f0540 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_poliwag.aif differ diff --git a/sound/direct_sound_samples/cries/cry_poliwhirl.aif b/sound/direct_sound_samples/cries/cry_poliwhirl.aif new file mode 100644 index 000000000..f0851c693 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_poliwhirl.aif differ diff --git a/sound/direct_sound_samples/cries/cry_poliwrath.aif b/sound/direct_sound_samples/cries/cry_poliwrath.aif new file mode 100644 index 000000000..8d19f1d86 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_poliwrath.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ponyta.aif b/sound/direct_sound_samples/cries/cry_ponyta.aif new file mode 100644 index 000000000..46feb123d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ponyta.aif differ diff --git a/sound/direct_sound_samples/cries/cry_poochyena.aif b/sound/direct_sound_samples/cries/cry_poochyena.aif new file mode 100644 index 000000000..3b464ce13 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_poochyena.aif differ diff --git a/sound/direct_sound_samples/cries/cry_porygon.aif b/sound/direct_sound_samples/cries/cry_porygon.aif new file mode 100644 index 000000000..ced70b379 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_porygon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_porygon2.aif b/sound/direct_sound_samples/cries/cry_porygon2.aif new file mode 100644 index 000000000..c08a3caaf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_porygon2.aif differ diff --git a/sound/direct_sound_samples/cries/cry_primeape.aif b/sound/direct_sound_samples/cries/cry_primeape.aif new file mode 100644 index 000000000..a868b3120 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_primeape.aif differ diff --git a/sound/direct_sound_samples/cries/cry_psyduck.aif b/sound/direct_sound_samples/cries/cry_psyduck.aif new file mode 100644 index 000000000..d2d0612f2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_psyduck.aif differ diff --git a/sound/direct_sound_samples/cries/cry_pupitar.aif b/sound/direct_sound_samples/cries/cry_pupitar.aif new file mode 100644 index 000000000..7386636ce Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_pupitar.aif differ diff --git a/sound/direct_sound_samples/cries/cry_quagsire.aif b/sound/direct_sound_samples/cries/cry_quagsire.aif new file mode 100644 index 000000000..1953d0e42 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_quagsire.aif differ diff --git a/sound/direct_sound_samples/cries/cry_quilava.aif b/sound/direct_sound_samples/cries/cry_quilava.aif new file mode 100644 index 000000000..efe873229 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_quilava.aif differ diff --git a/sound/direct_sound_samples/cries/cry_qwilfish.aif b/sound/direct_sound_samples/cries/cry_qwilfish.aif new file mode 100644 index 000000000..268c5c89d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_qwilfish.aif differ diff --git a/sound/direct_sound_samples/cries/cry_raichu.aif b/sound/direct_sound_samples/cries/cry_raichu.aif new file mode 100644 index 000000000..e59ffbad4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_raichu.aif differ diff --git a/sound/direct_sound_samples/cries/cry_raikou.aif b/sound/direct_sound_samples/cries/cry_raikou.aif new file mode 100644 index 000000000..a57a2365c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_raikou.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ralts.aif b/sound/direct_sound_samples/cries/cry_ralts.aif new file mode 100644 index 000000000..0baef5760 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ralts.aif differ diff --git a/sound/direct_sound_samples/cries/cry_rapidash.aif b/sound/direct_sound_samples/cries/cry_rapidash.aif new file mode 100644 index 000000000..920f510e4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_rapidash.aif differ diff --git a/sound/direct_sound_samples/cries/cry_raticate.aif b/sound/direct_sound_samples/cries/cry_raticate.aif new file mode 100644 index 000000000..01601cab5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_raticate.aif differ diff --git a/sound/direct_sound_samples/cries/cry_rattata.aif b/sound/direct_sound_samples/cries/cry_rattata.aif new file mode 100644 index 000000000..cb0e1f422 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_rattata.aif differ diff --git a/sound/direct_sound_samples/cries/cry_rayquaza.aif b/sound/direct_sound_samples/cries/cry_rayquaza.aif new file mode 100644 index 000000000..6115e11d8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_rayquaza.aif differ diff --git a/sound/direct_sound_samples/cries/cry_regice.aif b/sound/direct_sound_samples/cries/cry_regice.aif new file mode 100644 index 000000000..6fa23dd73 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_regice.aif differ diff --git a/sound/direct_sound_samples/cries/cry_regirock.aif b/sound/direct_sound_samples/cries/cry_regirock.aif new file mode 100644 index 000000000..ab2a47eb8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_regirock.aif differ diff --git a/sound/direct_sound_samples/cries/cry_registeel.aif b/sound/direct_sound_samples/cries/cry_registeel.aif new file mode 100644 index 000000000..f5374e5f0 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_registeel.aif differ diff --git a/sound/direct_sound_samples/cries/cry_relicanth.aif b/sound/direct_sound_samples/cries/cry_relicanth.aif new file mode 100644 index 000000000..60af9cf4e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_relicanth.aif differ diff --git a/sound/direct_sound_samples/cries/cry_remoraid.aif b/sound/direct_sound_samples/cries/cry_remoraid.aif new file mode 100644 index 000000000..16d3f1d65 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_remoraid.aif differ diff --git a/sound/direct_sound_samples/cries/cry_rhydon.aif b/sound/direct_sound_samples/cries/cry_rhydon.aif new file mode 100644 index 000000000..cfa709ee9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_rhydon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_rhyhorn.aif b/sound/direct_sound_samples/cries/cry_rhyhorn.aif new file mode 100644 index 000000000..47f344ba2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_rhyhorn.aif differ diff --git a/sound/direct_sound_samples/cries/cry_roselia.aif b/sound/direct_sound_samples/cries/cry_roselia.aif new file mode 100644 index 000000000..50b60b77b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_roselia.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sableye.aif b/sound/direct_sound_samples/cries/cry_sableye.aif new file mode 100644 index 000000000..1b3a9be30 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sableye.aif differ diff --git a/sound/direct_sound_samples/cries/cry_salamence.aif b/sound/direct_sound_samples/cries/cry_salamence.aif new file mode 100644 index 000000000..d2957809c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_salamence.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sandshrew.aif b/sound/direct_sound_samples/cries/cry_sandshrew.aif new file mode 100644 index 000000000..6879be11d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sandshrew.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sandslash.aif b/sound/direct_sound_samples/cries/cry_sandslash.aif new file mode 100644 index 000000000..ee4a458ed Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sandslash.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sceptile.aif b/sound/direct_sound_samples/cries/cry_sceptile.aif new file mode 100644 index 000000000..7252cb85f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sceptile.aif differ diff --git a/sound/direct_sound_samples/cries/cry_scizor.aif b/sound/direct_sound_samples/cries/cry_scizor.aif new file mode 100644 index 000000000..f1f7832ce Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_scizor.aif differ diff --git a/sound/direct_sound_samples/cries/cry_scyther.aif b/sound/direct_sound_samples/cries/cry_scyther.aif new file mode 100644 index 000000000..2b8cbc104 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_scyther.aif differ diff --git a/sound/direct_sound_samples/cries/cry_seadra.aif b/sound/direct_sound_samples/cries/cry_seadra.aif new file mode 100644 index 000000000..2f60cce4a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_seadra.aif differ diff --git a/sound/direct_sound_samples/cries/cry_seaking.aif b/sound/direct_sound_samples/cries/cry_seaking.aif new file mode 100644 index 000000000..e4fc7e70d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_seaking.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sealeo.aif b/sound/direct_sound_samples/cries/cry_sealeo.aif new file mode 100644 index 000000000..d9ea50026 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sealeo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_seedot.aif b/sound/direct_sound_samples/cries/cry_seedot.aif new file mode 100644 index 000000000..c37b769f8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_seedot.aif differ diff --git a/sound/direct_sound_samples/cries/cry_seel.aif b/sound/direct_sound_samples/cries/cry_seel.aif new file mode 100644 index 000000000..84c4a0a94 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_seel.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sentret.aif b/sound/direct_sound_samples/cries/cry_sentret.aif new file mode 100644 index 000000000..4aed7cd70 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sentret.aif differ diff --git a/sound/direct_sound_samples/cries/cry_seviper.aif b/sound/direct_sound_samples/cries/cry_seviper.aif new file mode 100644 index 000000000..6a15dd6e2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_seviper.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sharpedo.aif b/sound/direct_sound_samples/cries/cry_sharpedo.aif new file mode 100644 index 000000000..1b02b56ce Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sharpedo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_shedinja.aif b/sound/direct_sound_samples/cries/cry_shedinja.aif new file mode 100644 index 000000000..6d1d565f3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_shedinja.aif differ diff --git a/sound/direct_sound_samples/cries/cry_shelgon.aif b/sound/direct_sound_samples/cries/cry_shelgon.aif new file mode 100644 index 000000000..24f234ffe Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_shelgon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_shellder.aif b/sound/direct_sound_samples/cries/cry_shellder.aif new file mode 100644 index 000000000..b2ea85228 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_shellder.aif differ diff --git a/sound/direct_sound_samples/cries/cry_shiftry.aif b/sound/direct_sound_samples/cries/cry_shiftry.aif new file mode 100644 index 000000000..c91ece114 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_shiftry.aif differ diff --git a/sound/direct_sound_samples/cries/cry_shroomish.aif b/sound/direct_sound_samples/cries/cry_shroomish.aif new file mode 100644 index 000000000..9e944ca20 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_shroomish.aif differ diff --git a/sound/direct_sound_samples/cries/cry_shuckle.aif b/sound/direct_sound_samples/cries/cry_shuckle.aif new file mode 100644 index 000000000..d835d2de6 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_shuckle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_shuppet.aif b/sound/direct_sound_samples/cries/cry_shuppet.aif new file mode 100644 index 000000000..1cd9a2f14 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_shuppet.aif differ diff --git a/sound/direct_sound_samples/cries/cry_silcoon.aif b/sound/direct_sound_samples/cries/cry_silcoon.aif new file mode 100644 index 000000000..ff48950ad Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_silcoon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_skarmory.aif b/sound/direct_sound_samples/cries/cry_skarmory.aif new file mode 100644 index 000000000..88d3985a3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_skarmory.aif differ diff --git a/sound/direct_sound_samples/cries/cry_skiploom.aif b/sound/direct_sound_samples/cries/cry_skiploom.aif new file mode 100644 index 000000000..201744d12 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_skiploom.aif differ diff --git a/sound/direct_sound_samples/cries/cry_skitty.aif b/sound/direct_sound_samples/cries/cry_skitty.aif new file mode 100644 index 000000000..7dc4578f4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_skitty.aif differ diff --git a/sound/direct_sound_samples/cries/cry_slaking.aif b/sound/direct_sound_samples/cries/cry_slaking.aif new file mode 100644 index 000000000..b6a4160f3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_slaking.aif differ diff --git a/sound/direct_sound_samples/cries/cry_slakoth.aif b/sound/direct_sound_samples/cries/cry_slakoth.aif new file mode 100644 index 000000000..0e4bbc3c3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_slakoth.aif differ diff --git a/sound/direct_sound_samples/cries/cry_slowbro.aif b/sound/direct_sound_samples/cries/cry_slowbro.aif new file mode 100644 index 000000000..f74b753d2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_slowbro.aif differ diff --git a/sound/direct_sound_samples/cries/cry_slowking.aif b/sound/direct_sound_samples/cries/cry_slowking.aif new file mode 100644 index 000000000..245a42023 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_slowking.aif differ diff --git a/sound/direct_sound_samples/cries/cry_slowpoke.aif b/sound/direct_sound_samples/cries/cry_slowpoke.aif new file mode 100644 index 000000000..82b05a9a7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_slowpoke.aif differ diff --git a/sound/direct_sound_samples/cries/cry_slugma.aif b/sound/direct_sound_samples/cries/cry_slugma.aif new file mode 100644 index 000000000..fed42817c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_slugma.aif differ diff --git a/sound/direct_sound_samples/cries/cry_smeargle.aif b/sound/direct_sound_samples/cries/cry_smeargle.aif new file mode 100644 index 000000000..00dbedead Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_smeargle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_smoochum.aif b/sound/direct_sound_samples/cries/cry_smoochum.aif new file mode 100644 index 000000000..4005b4ad4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_smoochum.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sneasel.aif b/sound/direct_sound_samples/cries/cry_sneasel.aif new file mode 100644 index 000000000..54242a23f Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sneasel.aif differ diff --git a/sound/direct_sound_samples/cries/cry_snorlax.aif b/sound/direct_sound_samples/cries/cry_snorlax.aif new file mode 100644 index 000000000..f95128e3a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_snorlax.aif differ diff --git a/sound/direct_sound_samples/cries/cry_snorunt.aif b/sound/direct_sound_samples/cries/cry_snorunt.aif new file mode 100644 index 000000000..53b05b229 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_snorunt.aif differ diff --git a/sound/direct_sound_samples/cries/cry_snubbull.aif b/sound/direct_sound_samples/cries/cry_snubbull.aif new file mode 100644 index 000000000..bbba023fd Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_snubbull.aif differ diff --git a/sound/direct_sound_samples/cries/cry_solrock.aif b/sound/direct_sound_samples/cries/cry_solrock.aif new file mode 100644 index 000000000..64c71f289 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_solrock.aif differ diff --git a/sound/direct_sound_samples/cries/cry_spearow.aif b/sound/direct_sound_samples/cries/cry_spearow.aif new file mode 100644 index 000000000..7ce86ae29 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_spearow.aif differ diff --git a/sound/direct_sound_samples/cries/cry_spheal.aif b/sound/direct_sound_samples/cries/cry_spheal.aif new file mode 100644 index 000000000..fb6470210 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_spheal.aif differ diff --git a/sound/direct_sound_samples/cries/cry_spinarak.aif b/sound/direct_sound_samples/cries/cry_spinarak.aif new file mode 100644 index 000000000..3c4c1eff1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_spinarak.aif differ diff --git a/sound/direct_sound_samples/cries/cry_spinda.aif b/sound/direct_sound_samples/cries/cry_spinda.aif new file mode 100644 index 000000000..0217573c7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_spinda.aif differ diff --git a/sound/direct_sound_samples/cries/cry_spoink.aif b/sound/direct_sound_samples/cries/cry_spoink.aif new file mode 100644 index 000000000..6cc9bf546 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_spoink.aif differ diff --git a/sound/direct_sound_samples/cries/cry_squirtle.aif b/sound/direct_sound_samples/cries/cry_squirtle.aif new file mode 100644 index 000000000..43a98a53d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_squirtle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_stantler.aif b/sound/direct_sound_samples/cries/cry_stantler.aif new file mode 100644 index 000000000..36ba54658 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_stantler.aif differ diff --git a/sound/direct_sound_samples/cries/cry_starmie.aif b/sound/direct_sound_samples/cries/cry_starmie.aif new file mode 100644 index 000000000..7452a78f9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_starmie.aif differ diff --git a/sound/direct_sound_samples/cries/cry_staryu.aif b/sound/direct_sound_samples/cries/cry_staryu.aif new file mode 100644 index 000000000..6ab5584bf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_staryu.aif differ diff --git a/sound/direct_sound_samples/cries/cry_steelix.aif b/sound/direct_sound_samples/cries/cry_steelix.aif new file mode 100644 index 000000000..aa05e2d4c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_steelix.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sudowoodo.aif b/sound/direct_sound_samples/cries/cry_sudowoodo.aif new file mode 100644 index 000000000..1af7e18eb Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sudowoodo.aif differ diff --git a/sound/direct_sound_samples/cries/cry_suicune.aif b/sound/direct_sound_samples/cries/cry_suicune.aif new file mode 100644 index 000000000..697732d68 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_suicune.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sunflora.aif b/sound/direct_sound_samples/cries/cry_sunflora.aif new file mode 100644 index 000000000..126931adc Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sunflora.aif differ diff --git a/sound/direct_sound_samples/cries/cry_sunkern.aif b/sound/direct_sound_samples/cries/cry_sunkern.aif new file mode 100644 index 000000000..bede3bf95 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_sunkern.aif differ diff --git a/sound/direct_sound_samples/cries/cry_surskit.aif b/sound/direct_sound_samples/cries/cry_surskit.aif new file mode 100644 index 000000000..438b5b67a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_surskit.aif differ diff --git a/sound/direct_sound_samples/cries/cry_swablu.aif b/sound/direct_sound_samples/cries/cry_swablu.aif new file mode 100644 index 000000000..066095f55 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_swablu.aif differ diff --git a/sound/direct_sound_samples/cries/cry_swalot.aif b/sound/direct_sound_samples/cries/cry_swalot.aif new file mode 100644 index 000000000..518a9bf5a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_swalot.aif differ diff --git a/sound/direct_sound_samples/cries/cry_swampert.aif b/sound/direct_sound_samples/cries/cry_swampert.aif new file mode 100644 index 000000000..56bd26405 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_swampert.aif differ diff --git a/sound/direct_sound_samples/cries/cry_swellow.aif b/sound/direct_sound_samples/cries/cry_swellow.aif new file mode 100644 index 000000000..2b94eb432 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_swellow.aif differ diff --git a/sound/direct_sound_samples/cries/cry_swinub.aif b/sound/direct_sound_samples/cries/cry_swinub.aif new file mode 100644 index 000000000..dc68d62d8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_swinub.aif differ diff --git a/sound/direct_sound_samples/cries/cry_taillow.aif b/sound/direct_sound_samples/cries/cry_taillow.aif new file mode 100644 index 000000000..8322a3224 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_taillow.aif differ diff --git a/sound/direct_sound_samples/cries/cry_tangela.aif b/sound/direct_sound_samples/cries/cry_tangela.aif new file mode 100644 index 000000000..c900b426d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_tangela.aif differ diff --git a/sound/direct_sound_samples/cries/cry_tauros.aif b/sound/direct_sound_samples/cries/cry_tauros.aif new file mode 100644 index 000000000..84fa9b317 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_tauros.aif differ diff --git a/sound/direct_sound_samples/cries/cry_teddiursa.aif b/sound/direct_sound_samples/cries/cry_teddiursa.aif new file mode 100644 index 000000000..ba5cb5bc3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_teddiursa.aif differ diff --git a/sound/direct_sound_samples/cries/cry_tentacool.aif b/sound/direct_sound_samples/cries/cry_tentacool.aif new file mode 100644 index 000000000..332bec4b2 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_tentacool.aif differ diff --git a/sound/direct_sound_samples/cries/cry_tentacruel.aif b/sound/direct_sound_samples/cries/cry_tentacruel.aif new file mode 100644 index 000000000..e8ec1b14c Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_tentacruel.aif differ diff --git a/sound/direct_sound_samples/cries/cry_togepi.aif b/sound/direct_sound_samples/cries/cry_togepi.aif new file mode 100644 index 000000000..87ef6ef2d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_togepi.aif differ diff --git a/sound/direct_sound_samples/cries/cry_togetic.aif b/sound/direct_sound_samples/cries/cry_togetic.aif new file mode 100644 index 000000000..8aa18ac41 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_togetic.aif differ diff --git a/sound/direct_sound_samples/cries/cry_torchic.aif b/sound/direct_sound_samples/cries/cry_torchic.aif new file mode 100644 index 000000000..185a79499 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_torchic.aif differ diff --git a/sound/direct_sound_samples/cries/cry_torkoal.aif b/sound/direct_sound_samples/cries/cry_torkoal.aif new file mode 100644 index 000000000..9e56d3810 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_torkoal.aif differ diff --git a/sound/direct_sound_samples/cries/cry_totodile.aif b/sound/direct_sound_samples/cries/cry_totodile.aif new file mode 100644 index 000000000..dbf2179a7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_totodile.aif differ diff --git a/sound/direct_sound_samples/cries/cry_trapinch.aif b/sound/direct_sound_samples/cries/cry_trapinch.aif new file mode 100644 index 000000000..01664b72e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_trapinch.aif differ diff --git a/sound/direct_sound_samples/cries/cry_treecko.aif b/sound/direct_sound_samples/cries/cry_treecko.aif new file mode 100644 index 000000000..a7416e8da Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_treecko.aif differ diff --git a/sound/direct_sound_samples/cries/cry_tropius.aif b/sound/direct_sound_samples/cries/cry_tropius.aif new file mode 100644 index 000000000..bbb52787b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_tropius.aif differ diff --git a/sound/direct_sound_samples/cries/cry_typhlosion.aif b/sound/direct_sound_samples/cries/cry_typhlosion.aif new file mode 100644 index 000000000..f0238d066 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_typhlosion.aif differ diff --git a/sound/direct_sound_samples/cries/cry_tyranitar.aif b/sound/direct_sound_samples/cries/cry_tyranitar.aif new file mode 100644 index 000000000..557f61769 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_tyranitar.aif differ diff --git a/sound/direct_sound_samples/cries/cry_tyrogue.aif b/sound/direct_sound_samples/cries/cry_tyrogue.aif new file mode 100644 index 000000000..e5065f58b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_tyrogue.aif differ diff --git a/sound/direct_sound_samples/cries/cry_umbreon.aif b/sound/direct_sound_samples/cries/cry_umbreon.aif new file mode 100644 index 000000000..38129b1a7 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_umbreon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_unown.aif b/sound/direct_sound_samples/cries/cry_unown.aif new file mode 100644 index 000000000..8339ccb6b Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_unown.aif differ diff --git a/sound/direct_sound_samples/cries/cry_unused_265.aif b/sound/direct_sound_samples/cries/cry_unused_265.aif new file mode 100644 index 000000000..7f5965f06 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_unused_265.aif differ diff --git a/sound/direct_sound_samples/cries/cry_unused_268.aif b/sound/direct_sound_samples/cries/cry_unused_268.aif new file mode 100644 index 000000000..5cae364c3 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_unused_268.aif differ diff --git a/sound/direct_sound_samples/cries/cry_ursaring.aif b/sound/direct_sound_samples/cries/cry_ursaring.aif new file mode 100644 index 000000000..fcc748bd1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_ursaring.aif differ diff --git a/sound/direct_sound_samples/cries/cry_vaporeon.aif b/sound/direct_sound_samples/cries/cry_vaporeon.aif new file mode 100644 index 000000000..4967cfdeb Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_vaporeon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_venomoth.aif b/sound/direct_sound_samples/cries/cry_venomoth.aif new file mode 100644 index 000000000..bc291ec33 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_venomoth.aif differ diff --git a/sound/direct_sound_samples/cries/cry_venonat.aif b/sound/direct_sound_samples/cries/cry_venonat.aif new file mode 100644 index 000000000..e89d87fa8 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_venonat.aif differ diff --git a/sound/direct_sound_samples/cries/cry_venusaur.aif b/sound/direct_sound_samples/cries/cry_venusaur.aif new file mode 100644 index 000000000..8a1f69e6e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_venusaur.aif differ diff --git a/sound/direct_sound_samples/cries/cry_vibrava.aif b/sound/direct_sound_samples/cries/cry_vibrava.aif new file mode 100644 index 000000000..3e3180219 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_vibrava.aif differ diff --git a/sound/direct_sound_samples/cries/cry_victreebel.aif b/sound/direct_sound_samples/cries/cry_victreebel.aif new file mode 100644 index 000000000..d6e6a4fe9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_victreebel.aif differ diff --git a/sound/direct_sound_samples/cries/cry_vigoroth.aif b/sound/direct_sound_samples/cries/cry_vigoroth.aif new file mode 100644 index 000000000..fc414f33d Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_vigoroth.aif differ diff --git a/sound/direct_sound_samples/cries/cry_vileplume.aif b/sound/direct_sound_samples/cries/cry_vileplume.aif new file mode 100644 index 000000000..723eec697 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_vileplume.aif differ diff --git a/sound/direct_sound_samples/cries/cry_volbeat.aif b/sound/direct_sound_samples/cries/cry_volbeat.aif new file mode 100644 index 000000000..6f765081e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_volbeat.aif differ diff --git a/sound/direct_sound_samples/cries/cry_voltorb.aif b/sound/direct_sound_samples/cries/cry_voltorb.aif new file mode 100644 index 000000000..96e3bff31 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_voltorb.aif differ diff --git a/sound/direct_sound_samples/cries/cry_vulpix.aif b/sound/direct_sound_samples/cries/cry_vulpix.aif new file mode 100644 index 000000000..20da23fb4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_vulpix.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wailmer.aif b/sound/direct_sound_samples/cries/cry_wailmer.aif new file mode 100644 index 000000000..e8de91333 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wailmer.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wailord.aif b/sound/direct_sound_samples/cries/cry_wailord.aif new file mode 100644 index 000000000..2c0468010 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wailord.aif differ diff --git a/sound/direct_sound_samples/cries/cry_walrein.aif b/sound/direct_sound_samples/cries/cry_walrein.aif new file mode 100644 index 000000000..24c00a596 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_walrein.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wartortle.aif b/sound/direct_sound_samples/cries/cry_wartortle.aif new file mode 100644 index 000000000..5dab7fd93 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wartortle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_weedle.aif b/sound/direct_sound_samples/cries/cry_weedle.aif new file mode 100644 index 000000000..773c2c8ae Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_weedle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_weepinbell.aif b/sound/direct_sound_samples/cries/cry_weepinbell.aif new file mode 100644 index 000000000..cdd61380a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_weepinbell.aif differ diff --git a/sound/direct_sound_samples/cries/cry_weezing.aif b/sound/direct_sound_samples/cries/cry_weezing.aif new file mode 100644 index 000000000..2e4a7fe13 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_weezing.aif differ diff --git a/sound/direct_sound_samples/cries/cry_whiscash.aif b/sound/direct_sound_samples/cries/cry_whiscash.aif new file mode 100644 index 000000000..219737f32 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_whiscash.aif differ diff --git a/sound/direct_sound_samples/cries/cry_whismur.aif b/sound/direct_sound_samples/cries/cry_whismur.aif new file mode 100644 index 000000000..4da92ca6a Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_whismur.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wigglytuff.aif b/sound/direct_sound_samples/cries/cry_wigglytuff.aif new file mode 100644 index 000000000..90aa90a23 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wigglytuff.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wingull.aif b/sound/direct_sound_samples/cries/cry_wingull.aif new file mode 100644 index 000000000..182ef18e6 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wingull.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wobbuffet.aif b/sound/direct_sound_samples/cries/cry_wobbuffet.aif new file mode 100644 index 000000000..70ee1f704 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wobbuffet.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wooper.aif b/sound/direct_sound_samples/cries/cry_wooper.aif new file mode 100644 index 000000000..51a6b627e Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wooper.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wurmple.aif b/sound/direct_sound_samples/cries/cry_wurmple.aif new file mode 100644 index 000000000..6442a4063 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wurmple.aif differ diff --git a/sound/direct_sound_samples/cries/cry_wynaut.aif b/sound/direct_sound_samples/cries/cry_wynaut.aif new file mode 100644 index 000000000..798732c74 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_wynaut.aif differ diff --git a/sound/direct_sound_samples/cries/cry_xatu.aif b/sound/direct_sound_samples/cries/cry_xatu.aif new file mode 100644 index 000000000..ac758fdbf Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_xatu.aif differ diff --git a/sound/direct_sound_samples/cries/cry_yanma.aif b/sound/direct_sound_samples/cries/cry_yanma.aif new file mode 100644 index 000000000..df76534c5 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_yanma.aif differ diff --git a/sound/direct_sound_samples/cries/cry_zangoose.aif b/sound/direct_sound_samples/cries/cry_zangoose.aif new file mode 100644 index 000000000..ce1622043 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_zangoose.aif differ diff --git a/sound/direct_sound_samples/cries/cry_zapdos.aif b/sound/direct_sound_samples/cries/cry_zapdos.aif new file mode 100644 index 000000000..a8d914d14 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_zapdos.aif differ diff --git a/sound/direct_sound_samples/cries/cry_zigzagoon.aif b/sound/direct_sound_samples/cries/cry_zigzagoon.aif new file mode 100644 index 000000000..52b9bb4f4 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_zigzagoon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_zubat.aif b/sound/direct_sound_samples/cries/cry_zubat.aif new file mode 100644 index 000000000..45036d072 Binary files /dev/null and b/sound/direct_sound_samples/cries/cry_zubat.aif differ diff --git a/sound/direct_sound_samples/cry_abra.aif b/sound/direct_sound_samples/cry_abra.aif deleted file mode 100644 index 7df4446db..000000000 Binary files a/sound/direct_sound_samples/cry_abra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_absol.aif b/sound/direct_sound_samples/cry_absol.aif deleted file mode 100644 index 884ab22b3..000000000 Binary files a/sound/direct_sound_samples/cry_absol.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_aerodactyl.aif b/sound/direct_sound_samples/cry_aerodactyl.aif deleted file mode 100644 index c0e40f6d1..000000000 Binary files a/sound/direct_sound_samples/cry_aerodactyl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_aggron.aif b/sound/direct_sound_samples/cry_aggron.aif deleted file mode 100644 index b89ea1222..000000000 Binary files a/sound/direct_sound_samples/cry_aggron.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_aipom.aif b/sound/direct_sound_samples/cry_aipom.aif deleted file mode 100644 index 5ca276de2..000000000 Binary files a/sound/direct_sound_samples/cry_aipom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_alakazam.aif b/sound/direct_sound_samples/cry_alakazam.aif deleted file mode 100644 index 920e2ff94..000000000 Binary files a/sound/direct_sound_samples/cry_alakazam.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_altaria.aif b/sound/direct_sound_samples/cry_altaria.aif deleted file mode 100644 index 3e8e35e8e..000000000 Binary files a/sound/direct_sound_samples/cry_altaria.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ampharos.aif b/sound/direct_sound_samples/cry_ampharos.aif deleted file mode 100644 index 4f6e255a0..000000000 Binary files a/sound/direct_sound_samples/cry_ampharos.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_anorith.aif b/sound/direct_sound_samples/cry_anorith.aif deleted file mode 100644 index 96e87e919..000000000 Binary files a/sound/direct_sound_samples/cry_anorith.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_arbok.aif b/sound/direct_sound_samples/cry_arbok.aif deleted file mode 100644 index 6ccace9f9..000000000 Binary files a/sound/direct_sound_samples/cry_arbok.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_arcanine.aif b/sound/direct_sound_samples/cry_arcanine.aif deleted file mode 100644 index 61d802153..000000000 Binary files a/sound/direct_sound_samples/cry_arcanine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ariados.aif b/sound/direct_sound_samples/cry_ariados.aif deleted file mode 100644 index 1748624fb..000000000 Binary files a/sound/direct_sound_samples/cry_ariados.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_armaldo.aif b/sound/direct_sound_samples/cry_armaldo.aif deleted file mode 100644 index 756bf0842..000000000 Binary files a/sound/direct_sound_samples/cry_armaldo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_aron.aif b/sound/direct_sound_samples/cry_aron.aif deleted file mode 100644 index cce70b73b..000000000 Binary files a/sound/direct_sound_samples/cry_aron.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_articuno.aif b/sound/direct_sound_samples/cry_articuno.aif deleted file mode 100644 index 4f237dd0f..000000000 Binary files a/sound/direct_sound_samples/cry_articuno.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_azumarill.aif b/sound/direct_sound_samples/cry_azumarill.aif deleted file mode 100644 index 18411f93c..000000000 Binary files a/sound/direct_sound_samples/cry_azumarill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_azurill.aif b/sound/direct_sound_samples/cry_azurill.aif deleted file mode 100644 index 7f651c3d3..000000000 Binary files a/sound/direct_sound_samples/cry_azurill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_bagon.aif b/sound/direct_sound_samples/cry_bagon.aif deleted file mode 100644 index 3843fb9f4..000000000 Binary files a/sound/direct_sound_samples/cry_bagon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_baltoy.aif b/sound/direct_sound_samples/cry_baltoy.aif deleted file mode 100644 index 25e1a708a..000000000 Binary files a/sound/direct_sound_samples/cry_baltoy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_banette.aif b/sound/direct_sound_samples/cry_banette.aif deleted file mode 100644 index 23713f1b5..000000000 Binary files a/sound/direct_sound_samples/cry_banette.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_barboach.aif b/sound/direct_sound_samples/cry_barboach.aif deleted file mode 100644 index 4b9228259..000000000 Binary files a/sound/direct_sound_samples/cry_barboach.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_bayleef.aif b/sound/direct_sound_samples/cry_bayleef.aif deleted file mode 100644 index 8cef22df3..000000000 Binary files a/sound/direct_sound_samples/cry_bayleef.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_beautifly.aif b/sound/direct_sound_samples/cry_beautifly.aif deleted file mode 100644 index 0924b6c55..000000000 Binary files a/sound/direct_sound_samples/cry_beautifly.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_beedrill.aif b/sound/direct_sound_samples/cry_beedrill.aif deleted file mode 100644 index 00d0bc96c..000000000 Binary files a/sound/direct_sound_samples/cry_beedrill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_beldum.aif b/sound/direct_sound_samples/cry_beldum.aif deleted file mode 100644 index 76435a6a8..000000000 Binary files a/sound/direct_sound_samples/cry_beldum.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_bellossom.aif b/sound/direct_sound_samples/cry_bellossom.aif deleted file mode 100644 index 86580df65..000000000 Binary files a/sound/direct_sound_samples/cry_bellossom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_bellsprout.aif b/sound/direct_sound_samples/cry_bellsprout.aif deleted file mode 100644 index cfdd7aed2..000000000 Binary files a/sound/direct_sound_samples/cry_bellsprout.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_blastoise.aif b/sound/direct_sound_samples/cry_blastoise.aif deleted file mode 100644 index 76dac2bcc..000000000 Binary files a/sound/direct_sound_samples/cry_blastoise.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_blaziken.aif b/sound/direct_sound_samples/cry_blaziken.aif deleted file mode 100644 index 83e5ccf23..000000000 Binary files a/sound/direct_sound_samples/cry_blaziken.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_blissey.aif b/sound/direct_sound_samples/cry_blissey.aif deleted file mode 100644 index 897eb3d69..000000000 Binary files a/sound/direct_sound_samples/cry_blissey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_breloom.aif b/sound/direct_sound_samples/cry_breloom.aif deleted file mode 100644 index ea3f1bb66..000000000 Binary files a/sound/direct_sound_samples/cry_breloom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_bulbasaur.aif b/sound/direct_sound_samples/cry_bulbasaur.aif deleted file mode 100644 index 040fb1df7..000000000 Binary files a/sound/direct_sound_samples/cry_bulbasaur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_butterfree.aif b/sound/direct_sound_samples/cry_butterfree.aif deleted file mode 100644 index f27616395..000000000 Binary files a/sound/direct_sound_samples/cry_butterfree.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cacnea.aif b/sound/direct_sound_samples/cry_cacnea.aif deleted file mode 100644 index 4fd5acd36..000000000 Binary files a/sound/direct_sound_samples/cry_cacnea.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cacturne.aif b/sound/direct_sound_samples/cry_cacturne.aif deleted file mode 100644 index d9fb8fda8..000000000 Binary files a/sound/direct_sound_samples/cry_cacturne.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_camerupt.aif b/sound/direct_sound_samples/cry_camerupt.aif deleted file mode 100644 index 325df1220..000000000 Binary files a/sound/direct_sound_samples/cry_camerupt.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_carvanha.aif b/sound/direct_sound_samples/cry_carvanha.aif deleted file mode 100644 index c7cdedf91..000000000 Binary files a/sound/direct_sound_samples/cry_carvanha.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cascoon.aif b/sound/direct_sound_samples/cry_cascoon.aif deleted file mode 100644 index 17eef0ee9..000000000 Binary files a/sound/direct_sound_samples/cry_cascoon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_castform.aif b/sound/direct_sound_samples/cry_castform.aif deleted file mode 100644 index c10745640..000000000 Binary files a/sound/direct_sound_samples/cry_castform.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_caterpie.aif b/sound/direct_sound_samples/cry_caterpie.aif deleted file mode 100644 index b0b246b4f..000000000 Binary files a/sound/direct_sound_samples/cry_caterpie.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_celebi.aif b/sound/direct_sound_samples/cry_celebi.aif deleted file mode 100644 index 9f9f3ea39..000000000 Binary files a/sound/direct_sound_samples/cry_celebi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_chansey.aif b/sound/direct_sound_samples/cry_chansey.aif deleted file mode 100644 index d764c86ce..000000000 Binary files a/sound/direct_sound_samples/cry_chansey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_charizard.aif b/sound/direct_sound_samples/cry_charizard.aif deleted file mode 100644 index 48321b792..000000000 Binary files a/sound/direct_sound_samples/cry_charizard.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_charmander.aif b/sound/direct_sound_samples/cry_charmander.aif deleted file mode 100644 index d72c0f9e0..000000000 Binary files a/sound/direct_sound_samples/cry_charmander.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_charmeleon.aif b/sound/direct_sound_samples/cry_charmeleon.aif deleted file mode 100644 index 8e84af0d8..000000000 Binary files a/sound/direct_sound_samples/cry_charmeleon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_chikorita.aif b/sound/direct_sound_samples/cry_chikorita.aif deleted file mode 100644 index 67ceafdc3..000000000 Binary files a/sound/direct_sound_samples/cry_chikorita.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_chimecho.aif b/sound/direct_sound_samples/cry_chimecho.aif deleted file mode 100644 index 87ee2faee..000000000 Binary files a/sound/direct_sound_samples/cry_chimecho.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_chinchou.aif b/sound/direct_sound_samples/cry_chinchou.aif deleted file mode 100644 index 356475678..000000000 Binary files a/sound/direct_sound_samples/cry_chinchou.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_clamperl.aif b/sound/direct_sound_samples/cry_clamperl.aif deleted file mode 100644 index 7250bd703..000000000 Binary files a/sound/direct_sound_samples/cry_clamperl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_claydol.aif b/sound/direct_sound_samples/cry_claydol.aif deleted file mode 100644 index b89772021..000000000 Binary files a/sound/direct_sound_samples/cry_claydol.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_clefable.aif b/sound/direct_sound_samples/cry_clefable.aif deleted file mode 100644 index 9c2d8c664..000000000 Binary files a/sound/direct_sound_samples/cry_clefable.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_clefairy.aif b/sound/direct_sound_samples/cry_clefairy.aif deleted file mode 100644 index c370c4a9b..000000000 Binary files a/sound/direct_sound_samples/cry_clefairy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cleffa.aif b/sound/direct_sound_samples/cry_cleffa.aif deleted file mode 100644 index b27cdeca9..000000000 Binary files a/sound/direct_sound_samples/cry_cleffa.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cloyster.aif b/sound/direct_sound_samples/cry_cloyster.aif deleted file mode 100644 index b406deab0..000000000 Binary files a/sound/direct_sound_samples/cry_cloyster.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_combusken.aif b/sound/direct_sound_samples/cry_combusken.aif deleted file mode 100644 index 7d4b0d4cc..000000000 Binary files a/sound/direct_sound_samples/cry_combusken.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_corphish.aif b/sound/direct_sound_samples/cry_corphish.aif deleted file mode 100644 index f0f5ca01e..000000000 Binary files a/sound/direct_sound_samples/cry_corphish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_corsola.aif b/sound/direct_sound_samples/cry_corsola.aif deleted file mode 100644 index 68e743bfd..000000000 Binary files a/sound/direct_sound_samples/cry_corsola.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cradily.aif b/sound/direct_sound_samples/cry_cradily.aif deleted file mode 100644 index 197dc8d92..000000000 Binary files a/sound/direct_sound_samples/cry_cradily.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_crawdaunt.aif b/sound/direct_sound_samples/cry_crawdaunt.aif deleted file mode 100644 index a203ce2fb..000000000 Binary files a/sound/direct_sound_samples/cry_crawdaunt.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_crobat.aif b/sound/direct_sound_samples/cry_crobat.aif deleted file mode 100644 index 75d039bd8..000000000 Binary files a/sound/direct_sound_samples/cry_crobat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_croconaw.aif b/sound/direct_sound_samples/cry_croconaw.aif deleted file mode 100644 index afb7f3fdc..000000000 Binary files a/sound/direct_sound_samples/cry_croconaw.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cubone.aif b/sound/direct_sound_samples/cry_cubone.aif deleted file mode 100644 index 170745da1..000000000 Binary files a/sound/direct_sound_samples/cry_cubone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_cyndaquil.aif b/sound/direct_sound_samples/cry_cyndaquil.aif deleted file mode 100644 index 4aa580199..000000000 Binary files a/sound/direct_sound_samples/cry_cyndaquil.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_delcatty.aif b/sound/direct_sound_samples/cry_delcatty.aif deleted file mode 100644 index dd665b110..000000000 Binary files a/sound/direct_sound_samples/cry_delcatty.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_delibird.aif b/sound/direct_sound_samples/cry_delibird.aif deleted file mode 100644 index dbedc42d4..000000000 Binary files a/sound/direct_sound_samples/cry_delibird.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_deoxys.aif b/sound/direct_sound_samples/cry_deoxys.aif deleted file mode 100644 index b9623b337..000000000 Binary files a/sound/direct_sound_samples/cry_deoxys.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dewgong.aif b/sound/direct_sound_samples/cry_dewgong.aif deleted file mode 100644 index 72d69b773..000000000 Binary files a/sound/direct_sound_samples/cry_dewgong.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_diglett.aif b/sound/direct_sound_samples/cry_diglett.aif deleted file mode 100644 index b116af7f2..000000000 Binary files a/sound/direct_sound_samples/cry_diglett.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ditto.aif b/sound/direct_sound_samples/cry_ditto.aif deleted file mode 100644 index 2c797f4c4..000000000 Binary files a/sound/direct_sound_samples/cry_ditto.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dodrio.aif b/sound/direct_sound_samples/cry_dodrio.aif deleted file mode 100644 index 111d8bf3e..000000000 Binary files a/sound/direct_sound_samples/cry_dodrio.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_doduo.aif b/sound/direct_sound_samples/cry_doduo.aif deleted file mode 100644 index 5700b91d9..000000000 Binary files a/sound/direct_sound_samples/cry_doduo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_donphan.aif b/sound/direct_sound_samples/cry_donphan.aif deleted file mode 100644 index a41c124b1..000000000 Binary files a/sound/direct_sound_samples/cry_donphan.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dragonair.aif b/sound/direct_sound_samples/cry_dragonair.aif deleted file mode 100644 index 38c3955ef..000000000 Binary files a/sound/direct_sound_samples/cry_dragonair.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dragonite.aif b/sound/direct_sound_samples/cry_dragonite.aif deleted file mode 100644 index d1e7b11cf..000000000 Binary files a/sound/direct_sound_samples/cry_dragonite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dratini.aif b/sound/direct_sound_samples/cry_dratini.aif deleted file mode 100644 index 298497480..000000000 Binary files a/sound/direct_sound_samples/cry_dratini.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_drowzee.aif b/sound/direct_sound_samples/cry_drowzee.aif deleted file mode 100644 index 0d53eb2ff..000000000 Binary files a/sound/direct_sound_samples/cry_drowzee.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dugtrio.aif b/sound/direct_sound_samples/cry_dugtrio.aif deleted file mode 100644 index dff573dfe..000000000 Binary files a/sound/direct_sound_samples/cry_dugtrio.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dunsparce.aif b/sound/direct_sound_samples/cry_dunsparce.aif deleted file mode 100644 index 454617c05..000000000 Binary files a/sound/direct_sound_samples/cry_dunsparce.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dusclops.aif b/sound/direct_sound_samples/cry_dusclops.aif deleted file mode 100644 index de9657e4f..000000000 Binary files a/sound/direct_sound_samples/cry_dusclops.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_duskull.aif b/sound/direct_sound_samples/cry_duskull.aif deleted file mode 100644 index d84ea274e..000000000 Binary files a/sound/direct_sound_samples/cry_duskull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_dustox.aif b/sound/direct_sound_samples/cry_dustox.aif deleted file mode 100644 index 56d8eb336..000000000 Binary files a/sound/direct_sound_samples/cry_dustox.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_eevee.aif b/sound/direct_sound_samples/cry_eevee.aif deleted file mode 100644 index 8711a1470..000000000 Binary files a/sound/direct_sound_samples/cry_eevee.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ekans.aif b/sound/direct_sound_samples/cry_ekans.aif deleted file mode 100644 index 9eb396735..000000000 Binary files a/sound/direct_sound_samples/cry_ekans.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_electabuzz.aif b/sound/direct_sound_samples/cry_electabuzz.aif deleted file mode 100644 index 5abdb49b7..000000000 Binary files a/sound/direct_sound_samples/cry_electabuzz.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_electrike.aif b/sound/direct_sound_samples/cry_electrike.aif deleted file mode 100644 index 56c9666df..000000000 Binary files a/sound/direct_sound_samples/cry_electrike.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_electrode.aif b/sound/direct_sound_samples/cry_electrode.aif deleted file mode 100644 index cbd7f0971..000000000 Binary files a/sound/direct_sound_samples/cry_electrode.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_elekid.aif b/sound/direct_sound_samples/cry_elekid.aif deleted file mode 100644 index 839bdee17..000000000 Binary files a/sound/direct_sound_samples/cry_elekid.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_entei.aif b/sound/direct_sound_samples/cry_entei.aif deleted file mode 100644 index 56a740207..000000000 Binary files a/sound/direct_sound_samples/cry_entei.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_espeon.aif b/sound/direct_sound_samples/cry_espeon.aif deleted file mode 100644 index 53dc62f4d..000000000 Binary files a/sound/direct_sound_samples/cry_espeon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_exeggcute.aif b/sound/direct_sound_samples/cry_exeggcute.aif deleted file mode 100644 index 147912c2f..000000000 Binary files a/sound/direct_sound_samples/cry_exeggcute.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_exeggutor.aif b/sound/direct_sound_samples/cry_exeggutor.aif deleted file mode 100644 index c0b9177bf..000000000 Binary files a/sound/direct_sound_samples/cry_exeggutor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_exploud.aif b/sound/direct_sound_samples/cry_exploud.aif deleted file mode 100644 index 5b80870cc..000000000 Binary files a/sound/direct_sound_samples/cry_exploud.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_farfetchd.aif b/sound/direct_sound_samples/cry_farfetchd.aif deleted file mode 100644 index f1db556dc..000000000 Binary files a/sound/direct_sound_samples/cry_farfetchd.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_fearow.aif b/sound/direct_sound_samples/cry_fearow.aif deleted file mode 100644 index 74a76f6d4..000000000 Binary files a/sound/direct_sound_samples/cry_fearow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_feebas.aif b/sound/direct_sound_samples/cry_feebas.aif deleted file mode 100644 index c386522f1..000000000 Binary files a/sound/direct_sound_samples/cry_feebas.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_feraligatr.aif b/sound/direct_sound_samples/cry_feraligatr.aif deleted file mode 100644 index 9fcd93cff..000000000 Binary files a/sound/direct_sound_samples/cry_feraligatr.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_flaaffy.aif b/sound/direct_sound_samples/cry_flaaffy.aif deleted file mode 100644 index 93dfacfaf..000000000 Binary files a/sound/direct_sound_samples/cry_flaaffy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_flareon.aif b/sound/direct_sound_samples/cry_flareon.aif deleted file mode 100644 index 58d28e60a..000000000 Binary files a/sound/direct_sound_samples/cry_flareon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_flygon.aif b/sound/direct_sound_samples/cry_flygon.aif deleted file mode 100644 index c8c377016..000000000 Binary files a/sound/direct_sound_samples/cry_flygon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_forretress.aif b/sound/direct_sound_samples/cry_forretress.aif deleted file mode 100644 index 288dacbea..000000000 Binary files a/sound/direct_sound_samples/cry_forretress.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_furret.aif b/sound/direct_sound_samples/cry_furret.aif deleted file mode 100644 index 6b4e9ce11..000000000 Binary files a/sound/direct_sound_samples/cry_furret.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gardevoir.aif b/sound/direct_sound_samples/cry_gardevoir.aif deleted file mode 100644 index a14780990..000000000 Binary files a/sound/direct_sound_samples/cry_gardevoir.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gastly.aif b/sound/direct_sound_samples/cry_gastly.aif deleted file mode 100644 index 93cef851d..000000000 Binary files a/sound/direct_sound_samples/cry_gastly.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gengar.aif b/sound/direct_sound_samples/cry_gengar.aif deleted file mode 100644 index 379b5d37e..000000000 Binary files a/sound/direct_sound_samples/cry_gengar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_geodude.aif b/sound/direct_sound_samples/cry_geodude.aif deleted file mode 100644 index 143b9031c..000000000 Binary files a/sound/direct_sound_samples/cry_geodude.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_girafarig.aif b/sound/direct_sound_samples/cry_girafarig.aif deleted file mode 100644 index 1dd5f93e2..000000000 Binary files a/sound/direct_sound_samples/cry_girafarig.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_glalie.aif b/sound/direct_sound_samples/cry_glalie.aif deleted file mode 100644 index e4e896547..000000000 Binary files a/sound/direct_sound_samples/cry_glalie.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gligar.aif b/sound/direct_sound_samples/cry_gligar.aif deleted file mode 100644 index 4050f08b0..000000000 Binary files a/sound/direct_sound_samples/cry_gligar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gloom.aif b/sound/direct_sound_samples/cry_gloom.aif deleted file mode 100644 index e930328ac..000000000 Binary files a/sound/direct_sound_samples/cry_gloom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_golbat.aif b/sound/direct_sound_samples/cry_golbat.aif deleted file mode 100644 index 11413df3a..000000000 Binary files a/sound/direct_sound_samples/cry_golbat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_goldeen.aif b/sound/direct_sound_samples/cry_goldeen.aif deleted file mode 100644 index 81fd1ecdf..000000000 Binary files a/sound/direct_sound_samples/cry_goldeen.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_golduck.aif b/sound/direct_sound_samples/cry_golduck.aif deleted file mode 100644 index b6b71a7a4..000000000 Binary files a/sound/direct_sound_samples/cry_golduck.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_golem.aif b/sound/direct_sound_samples/cry_golem.aif deleted file mode 100644 index 0d2c4515e..000000000 Binary files a/sound/direct_sound_samples/cry_golem.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gorebyss.aif b/sound/direct_sound_samples/cry_gorebyss.aif deleted file mode 100644 index b7605062c..000000000 Binary files a/sound/direct_sound_samples/cry_gorebyss.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_granbull.aif b/sound/direct_sound_samples/cry_granbull.aif deleted file mode 100644 index 146b3bd0c..000000000 Binary files a/sound/direct_sound_samples/cry_granbull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_graveler.aif b/sound/direct_sound_samples/cry_graveler.aif deleted file mode 100644 index 773994228..000000000 Binary files a/sound/direct_sound_samples/cry_graveler.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_grimer.aif b/sound/direct_sound_samples/cry_grimer.aif deleted file mode 100644 index 95eed1061..000000000 Binary files a/sound/direct_sound_samples/cry_grimer.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_groudon.aif b/sound/direct_sound_samples/cry_groudon.aif deleted file mode 100644 index 62452b4d9..000000000 Binary files a/sound/direct_sound_samples/cry_groudon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_grovyle.aif b/sound/direct_sound_samples/cry_grovyle.aif deleted file mode 100644 index 983bcfff3..000000000 Binary files a/sound/direct_sound_samples/cry_grovyle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_growlithe.aif b/sound/direct_sound_samples/cry_growlithe.aif deleted file mode 100644 index 134e29834..000000000 Binary files a/sound/direct_sound_samples/cry_growlithe.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_grumpig.aif b/sound/direct_sound_samples/cry_grumpig.aif deleted file mode 100644 index 97c372076..000000000 Binary files a/sound/direct_sound_samples/cry_grumpig.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gulpin.aif b/sound/direct_sound_samples/cry_gulpin.aif deleted file mode 100644 index f3043b422..000000000 Binary files a/sound/direct_sound_samples/cry_gulpin.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_gyarados.aif b/sound/direct_sound_samples/cry_gyarados.aif deleted file mode 100644 index 238b6d721..000000000 Binary files a/sound/direct_sound_samples/cry_gyarados.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_hariyama.aif b/sound/direct_sound_samples/cry_hariyama.aif deleted file mode 100644 index 1ac1f3f7e..000000000 Binary files a/sound/direct_sound_samples/cry_hariyama.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_haunter.aif b/sound/direct_sound_samples/cry_haunter.aif deleted file mode 100644 index 60ec72171..000000000 Binary files a/sound/direct_sound_samples/cry_haunter.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_heracross.aif b/sound/direct_sound_samples/cry_heracross.aif deleted file mode 100644 index a0734748f..000000000 Binary files a/sound/direct_sound_samples/cry_heracross.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_hitmonchan.aif b/sound/direct_sound_samples/cry_hitmonchan.aif deleted file mode 100644 index 40479452c..000000000 Binary files a/sound/direct_sound_samples/cry_hitmonchan.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_hitmonlee.aif b/sound/direct_sound_samples/cry_hitmonlee.aif deleted file mode 100644 index 3a4bcddca..000000000 Binary files a/sound/direct_sound_samples/cry_hitmonlee.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_hitmontop.aif b/sound/direct_sound_samples/cry_hitmontop.aif deleted file mode 100644 index 3fbee8041..000000000 Binary files a/sound/direct_sound_samples/cry_hitmontop.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ho_oh.aif b/sound/direct_sound_samples/cry_ho_oh.aif deleted file mode 100644 index 52f8dd307..000000000 Binary files a/sound/direct_sound_samples/cry_ho_oh.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_hoothoot.aif b/sound/direct_sound_samples/cry_hoothoot.aif deleted file mode 100644 index 59e685dcc..000000000 Binary files a/sound/direct_sound_samples/cry_hoothoot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_hoppip.aif b/sound/direct_sound_samples/cry_hoppip.aif deleted file mode 100644 index ea47877d0..000000000 Binary files a/sound/direct_sound_samples/cry_hoppip.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_horsea.aif b/sound/direct_sound_samples/cry_horsea.aif deleted file mode 100644 index e41eff4b1..000000000 Binary files a/sound/direct_sound_samples/cry_horsea.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_houndoom.aif b/sound/direct_sound_samples/cry_houndoom.aif deleted file mode 100644 index 6fec16d39..000000000 Binary files a/sound/direct_sound_samples/cry_houndoom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_houndour.aif b/sound/direct_sound_samples/cry_houndour.aif deleted file mode 100644 index 7431bbf29..000000000 Binary files a/sound/direct_sound_samples/cry_houndour.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_huntail.aif b/sound/direct_sound_samples/cry_huntail.aif deleted file mode 100644 index f1d3b29d9..000000000 Binary files a/sound/direct_sound_samples/cry_huntail.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_hypno.aif b/sound/direct_sound_samples/cry_hypno.aif deleted file mode 100644 index 32672a3c3..000000000 Binary files a/sound/direct_sound_samples/cry_hypno.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_igglybuff.aif b/sound/direct_sound_samples/cry_igglybuff.aif deleted file mode 100644 index 8de8394d5..000000000 Binary files a/sound/direct_sound_samples/cry_igglybuff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_illumise.aif b/sound/direct_sound_samples/cry_illumise.aif deleted file mode 100644 index 75e03efc8..000000000 Binary files a/sound/direct_sound_samples/cry_illumise.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ivysaur.aif b/sound/direct_sound_samples/cry_ivysaur.aif deleted file mode 100644 index ea474ff88..000000000 Binary files a/sound/direct_sound_samples/cry_ivysaur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_jigglypuff.aif b/sound/direct_sound_samples/cry_jigglypuff.aif deleted file mode 100644 index 780424b4f..000000000 Binary files a/sound/direct_sound_samples/cry_jigglypuff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_jirachi.aif b/sound/direct_sound_samples/cry_jirachi.aif deleted file mode 100644 index ea8a5c8ad..000000000 Binary files a/sound/direct_sound_samples/cry_jirachi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_jolteon.aif b/sound/direct_sound_samples/cry_jolteon.aif deleted file mode 100644 index 013369158..000000000 Binary files a/sound/direct_sound_samples/cry_jolteon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_jumpluff.aif b/sound/direct_sound_samples/cry_jumpluff.aif deleted file mode 100644 index 13b0fd315..000000000 Binary files a/sound/direct_sound_samples/cry_jumpluff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_jynx.aif b/sound/direct_sound_samples/cry_jynx.aif deleted file mode 100644 index 7394a48a2..000000000 Binary files a/sound/direct_sound_samples/cry_jynx.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kabuto.aif b/sound/direct_sound_samples/cry_kabuto.aif deleted file mode 100644 index 6ae9801b5..000000000 Binary files a/sound/direct_sound_samples/cry_kabuto.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kabutops.aif b/sound/direct_sound_samples/cry_kabutops.aif deleted file mode 100644 index f23778e57..000000000 Binary files a/sound/direct_sound_samples/cry_kabutops.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kadabra.aif b/sound/direct_sound_samples/cry_kadabra.aif deleted file mode 100644 index bfcc18031..000000000 Binary files a/sound/direct_sound_samples/cry_kadabra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kakuna.aif b/sound/direct_sound_samples/cry_kakuna.aif deleted file mode 100644 index 7c4e9d7a8..000000000 Binary files a/sound/direct_sound_samples/cry_kakuna.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kangaskhan.aif b/sound/direct_sound_samples/cry_kangaskhan.aif deleted file mode 100644 index 643e81eb7..000000000 Binary files a/sound/direct_sound_samples/cry_kangaskhan.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kecleon.aif b/sound/direct_sound_samples/cry_kecleon.aif deleted file mode 100644 index f27ae1832..000000000 Binary files a/sound/direct_sound_samples/cry_kecleon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kingdra.aif b/sound/direct_sound_samples/cry_kingdra.aif deleted file mode 100644 index ade230c82..000000000 Binary files a/sound/direct_sound_samples/cry_kingdra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kingler.aif b/sound/direct_sound_samples/cry_kingler.aif deleted file mode 100644 index a1d845f45..000000000 Binary files a/sound/direct_sound_samples/cry_kingler.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kirlia.aif b/sound/direct_sound_samples/cry_kirlia.aif deleted file mode 100644 index 692e03e5f..000000000 Binary files a/sound/direct_sound_samples/cry_kirlia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_koffing.aif b/sound/direct_sound_samples/cry_koffing.aif deleted file mode 100644 index 7ca9de088..000000000 Binary files a/sound/direct_sound_samples/cry_koffing.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_krabby.aif b/sound/direct_sound_samples/cry_krabby.aif deleted file mode 100644 index 6b7692f21..000000000 Binary files a/sound/direct_sound_samples/cry_krabby.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_kyogre.aif b/sound/direct_sound_samples/cry_kyogre.aif deleted file mode 100644 index 290948319..000000000 Binary files a/sound/direct_sound_samples/cry_kyogre.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lairon.aif b/sound/direct_sound_samples/cry_lairon.aif deleted file mode 100644 index b487165bf..000000000 Binary files a/sound/direct_sound_samples/cry_lairon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lanturn.aif b/sound/direct_sound_samples/cry_lanturn.aif deleted file mode 100644 index dfeac1fbd..000000000 Binary files a/sound/direct_sound_samples/cry_lanturn.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lapras.aif b/sound/direct_sound_samples/cry_lapras.aif deleted file mode 100644 index 61de32408..000000000 Binary files a/sound/direct_sound_samples/cry_lapras.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_larvitar.aif b/sound/direct_sound_samples/cry_larvitar.aif deleted file mode 100644 index 1ab0e1d5f..000000000 Binary files a/sound/direct_sound_samples/cry_larvitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_latias.aif b/sound/direct_sound_samples/cry_latias.aif deleted file mode 100644 index 46f7235f3..000000000 Binary files a/sound/direct_sound_samples/cry_latias.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_latios.aif b/sound/direct_sound_samples/cry_latios.aif deleted file mode 100644 index b8ace2a30..000000000 Binary files a/sound/direct_sound_samples/cry_latios.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ledian.aif b/sound/direct_sound_samples/cry_ledian.aif deleted file mode 100644 index baefb5fa3..000000000 Binary files a/sound/direct_sound_samples/cry_ledian.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ledyba.aif b/sound/direct_sound_samples/cry_ledyba.aif deleted file mode 100644 index 4f26859a7..000000000 Binary files a/sound/direct_sound_samples/cry_ledyba.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lickitung.aif b/sound/direct_sound_samples/cry_lickitung.aif deleted file mode 100644 index ef889a275..000000000 Binary files a/sound/direct_sound_samples/cry_lickitung.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lileep.aif b/sound/direct_sound_samples/cry_lileep.aif deleted file mode 100644 index ed8258eb7..000000000 Binary files a/sound/direct_sound_samples/cry_lileep.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_linoone.aif b/sound/direct_sound_samples/cry_linoone.aif deleted file mode 100644 index 4e5e7d3b5..000000000 Binary files a/sound/direct_sound_samples/cry_linoone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lombre.aif b/sound/direct_sound_samples/cry_lombre.aif deleted file mode 100644 index abafe4321..000000000 Binary files a/sound/direct_sound_samples/cry_lombre.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lotad.aif b/sound/direct_sound_samples/cry_lotad.aif deleted file mode 100644 index 2596f4390..000000000 Binary files a/sound/direct_sound_samples/cry_lotad.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_loudred.aif b/sound/direct_sound_samples/cry_loudred.aif deleted file mode 100644 index fed7ebec8..000000000 Binary files a/sound/direct_sound_samples/cry_loudred.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ludicolo.aif b/sound/direct_sound_samples/cry_ludicolo.aif deleted file mode 100644 index 7cf670f38..000000000 Binary files a/sound/direct_sound_samples/cry_ludicolo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lugia.aif b/sound/direct_sound_samples/cry_lugia.aif deleted file mode 100644 index 45890a2fc..000000000 Binary files a/sound/direct_sound_samples/cry_lugia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_lunatone.aif b/sound/direct_sound_samples/cry_lunatone.aif deleted file mode 100644 index 42cbc5e3c..000000000 Binary files a/sound/direct_sound_samples/cry_lunatone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_luvdisc.aif b/sound/direct_sound_samples/cry_luvdisc.aif deleted file mode 100644 index 3cc0cc744..000000000 Binary files a/sound/direct_sound_samples/cry_luvdisc.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_machamp.aif b/sound/direct_sound_samples/cry_machamp.aif deleted file mode 100644 index ddeaf22c8..000000000 Binary files a/sound/direct_sound_samples/cry_machamp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_machoke.aif b/sound/direct_sound_samples/cry_machoke.aif deleted file mode 100644 index 97065ee09..000000000 Binary files a/sound/direct_sound_samples/cry_machoke.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_machop.aif b/sound/direct_sound_samples/cry_machop.aif deleted file mode 100644 index d92419e84..000000000 Binary files a/sound/direct_sound_samples/cry_machop.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_magby.aif b/sound/direct_sound_samples/cry_magby.aif deleted file mode 100644 index 12f3dc889..000000000 Binary files a/sound/direct_sound_samples/cry_magby.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_magcargo.aif b/sound/direct_sound_samples/cry_magcargo.aif deleted file mode 100644 index bef0351c0..000000000 Binary files a/sound/direct_sound_samples/cry_magcargo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_magikarp.aif b/sound/direct_sound_samples/cry_magikarp.aif deleted file mode 100644 index f4f9219c5..000000000 Binary files a/sound/direct_sound_samples/cry_magikarp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_magmar.aif b/sound/direct_sound_samples/cry_magmar.aif deleted file mode 100644 index b79c8b9a1..000000000 Binary files a/sound/direct_sound_samples/cry_magmar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_magnemite.aif b/sound/direct_sound_samples/cry_magnemite.aif deleted file mode 100644 index ebb9103d9..000000000 Binary files a/sound/direct_sound_samples/cry_magnemite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_magneton.aif b/sound/direct_sound_samples/cry_magneton.aif deleted file mode 100644 index 53083ac62..000000000 Binary files a/sound/direct_sound_samples/cry_magneton.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_makuhita.aif b/sound/direct_sound_samples/cry_makuhita.aif deleted file mode 100644 index 38d7f4b44..000000000 Binary files a/sound/direct_sound_samples/cry_makuhita.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_manectric.aif b/sound/direct_sound_samples/cry_manectric.aif deleted file mode 100644 index 18a8f4666..000000000 Binary files a/sound/direct_sound_samples/cry_manectric.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mankey.aif b/sound/direct_sound_samples/cry_mankey.aif deleted file mode 100644 index dda929d4c..000000000 Binary files a/sound/direct_sound_samples/cry_mankey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mantine.aif b/sound/direct_sound_samples/cry_mantine.aif deleted file mode 100644 index d1840aafa..000000000 Binary files a/sound/direct_sound_samples/cry_mantine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mareep.aif b/sound/direct_sound_samples/cry_mareep.aif deleted file mode 100644 index 2615b9def..000000000 Binary files a/sound/direct_sound_samples/cry_mareep.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_marill.aif b/sound/direct_sound_samples/cry_marill.aif deleted file mode 100644 index 48d936e7d..000000000 Binary files a/sound/direct_sound_samples/cry_marill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_marowak.aif b/sound/direct_sound_samples/cry_marowak.aif deleted file mode 100644 index 279381bb5..000000000 Binary files a/sound/direct_sound_samples/cry_marowak.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_marshtomp.aif b/sound/direct_sound_samples/cry_marshtomp.aif deleted file mode 100644 index c0106ff6c..000000000 Binary files a/sound/direct_sound_samples/cry_marshtomp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_masquerain.aif b/sound/direct_sound_samples/cry_masquerain.aif deleted file mode 100644 index 107bed2f7..000000000 Binary files a/sound/direct_sound_samples/cry_masquerain.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mawile.aif b/sound/direct_sound_samples/cry_mawile.aif deleted file mode 100644 index 81b252b57..000000000 Binary files a/sound/direct_sound_samples/cry_mawile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_medicham.aif b/sound/direct_sound_samples/cry_medicham.aif deleted file mode 100644 index dc85dd3b5..000000000 Binary files a/sound/direct_sound_samples/cry_medicham.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_meditite.aif b/sound/direct_sound_samples/cry_meditite.aif deleted file mode 100644 index 8ac680f79..000000000 Binary files a/sound/direct_sound_samples/cry_meditite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_meganium.aif b/sound/direct_sound_samples/cry_meganium.aif deleted file mode 100644 index ea1e1aa51..000000000 Binary files a/sound/direct_sound_samples/cry_meganium.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_meowth.aif b/sound/direct_sound_samples/cry_meowth.aif deleted file mode 100644 index aaf3825d5..000000000 Binary files a/sound/direct_sound_samples/cry_meowth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_metagross.aif b/sound/direct_sound_samples/cry_metagross.aif deleted file mode 100644 index b96e6647c..000000000 Binary files a/sound/direct_sound_samples/cry_metagross.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_metang.aif b/sound/direct_sound_samples/cry_metang.aif deleted file mode 100644 index da544ce4d..000000000 Binary files a/sound/direct_sound_samples/cry_metang.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_metapod.aif b/sound/direct_sound_samples/cry_metapod.aif deleted file mode 100644 index ddba3ed44..000000000 Binary files a/sound/direct_sound_samples/cry_metapod.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mew.aif b/sound/direct_sound_samples/cry_mew.aif deleted file mode 100644 index 2651b96ca..000000000 Binary files a/sound/direct_sound_samples/cry_mew.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mewtwo.aif b/sound/direct_sound_samples/cry_mewtwo.aif deleted file mode 100644 index 8e1e6c7f1..000000000 Binary files a/sound/direct_sound_samples/cry_mewtwo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mightyena.aif b/sound/direct_sound_samples/cry_mightyena.aif deleted file mode 100644 index 53a645edc..000000000 Binary files a/sound/direct_sound_samples/cry_mightyena.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_milotic.aif b/sound/direct_sound_samples/cry_milotic.aif deleted file mode 100644 index 93a14161b..000000000 Binary files a/sound/direct_sound_samples/cry_milotic.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_miltank.aif b/sound/direct_sound_samples/cry_miltank.aif deleted file mode 100644 index ad8a41a45..000000000 Binary files a/sound/direct_sound_samples/cry_miltank.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_minun.aif b/sound/direct_sound_samples/cry_minun.aif deleted file mode 100644 index a55aa5631..000000000 Binary files a/sound/direct_sound_samples/cry_minun.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_misdreavus.aif b/sound/direct_sound_samples/cry_misdreavus.aif deleted file mode 100644 index 39a09f4d0..000000000 Binary files a/sound/direct_sound_samples/cry_misdreavus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_moltres.aif b/sound/direct_sound_samples/cry_moltres.aif deleted file mode 100644 index 2e038a3d7..000000000 Binary files a/sound/direct_sound_samples/cry_moltres.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mr_mime.aif b/sound/direct_sound_samples/cry_mr_mime.aif deleted file mode 100644 index ff870dbc4..000000000 Binary files a/sound/direct_sound_samples/cry_mr_mime.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_mudkip.aif b/sound/direct_sound_samples/cry_mudkip.aif deleted file mode 100644 index e8fa5c212..000000000 Binary files a/sound/direct_sound_samples/cry_mudkip.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_muk.aif b/sound/direct_sound_samples/cry_muk.aif deleted file mode 100644 index f61ff4075..000000000 Binary files a/sound/direct_sound_samples/cry_muk.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_murkrow.aif b/sound/direct_sound_samples/cry_murkrow.aif deleted file mode 100644 index 4beddff1e..000000000 Binary files a/sound/direct_sound_samples/cry_murkrow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_natu.aif b/sound/direct_sound_samples/cry_natu.aif deleted file mode 100644 index e6e38d5cc..000000000 Binary files a/sound/direct_sound_samples/cry_natu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nidoking.aif b/sound/direct_sound_samples/cry_nidoking.aif deleted file mode 100644 index a0c86f9ab..000000000 Binary files a/sound/direct_sound_samples/cry_nidoking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nidoqueen.aif b/sound/direct_sound_samples/cry_nidoqueen.aif deleted file mode 100644 index 6c8f5254b..000000000 Binary files a/sound/direct_sound_samples/cry_nidoqueen.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nidoran_f.aif b/sound/direct_sound_samples/cry_nidoran_f.aif deleted file mode 100644 index b7c8a5317..000000000 Binary files a/sound/direct_sound_samples/cry_nidoran_f.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nidoran_m.aif b/sound/direct_sound_samples/cry_nidoran_m.aif deleted file mode 100644 index 08fc81c8b..000000000 Binary files a/sound/direct_sound_samples/cry_nidoran_m.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nidorina.aif b/sound/direct_sound_samples/cry_nidorina.aif deleted file mode 100644 index 91e293a50..000000000 Binary files a/sound/direct_sound_samples/cry_nidorina.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nidorino.aif b/sound/direct_sound_samples/cry_nidorino.aif deleted file mode 100644 index 959351363..000000000 Binary files a/sound/direct_sound_samples/cry_nidorino.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nincada.aif b/sound/direct_sound_samples/cry_nincada.aif deleted file mode 100644 index 5f96bda50..000000000 Binary files a/sound/direct_sound_samples/cry_nincada.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ninetales.aif b/sound/direct_sound_samples/cry_ninetales.aif deleted file mode 100644 index 70c8cf528..000000000 Binary files a/sound/direct_sound_samples/cry_ninetales.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ninjask.aif b/sound/direct_sound_samples/cry_ninjask.aif deleted file mode 100644 index a6f07e8d3..000000000 Binary files a/sound/direct_sound_samples/cry_ninjask.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_noctowl.aif b/sound/direct_sound_samples/cry_noctowl.aif deleted file mode 100644 index fe2e63d45..000000000 Binary files a/sound/direct_sound_samples/cry_noctowl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_none.aif b/sound/direct_sound_samples/cry_none.aif deleted file mode 100644 index 44bb79c3c..000000000 Binary files a/sound/direct_sound_samples/cry_none.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nosepass.aif b/sound/direct_sound_samples/cry_nosepass.aif deleted file mode 100644 index be65ba082..000000000 Binary files a/sound/direct_sound_samples/cry_nosepass.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_numel.aif b/sound/direct_sound_samples/cry_numel.aif deleted file mode 100644 index 55cce5f2c..000000000 Binary files a/sound/direct_sound_samples/cry_numel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_nuzleaf.aif b/sound/direct_sound_samples/cry_nuzleaf.aif deleted file mode 100644 index d668f3fd3..000000000 Binary files a/sound/direct_sound_samples/cry_nuzleaf.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_octillery.aif b/sound/direct_sound_samples/cry_octillery.aif deleted file mode 100644 index 75ee28ceb..000000000 Binary files a/sound/direct_sound_samples/cry_octillery.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_oddish.aif b/sound/direct_sound_samples/cry_oddish.aif deleted file mode 100644 index 6909a8dad..000000000 Binary files a/sound/direct_sound_samples/cry_oddish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_omanyte.aif b/sound/direct_sound_samples/cry_omanyte.aif deleted file mode 100644 index 15ec2d1ef..000000000 Binary files a/sound/direct_sound_samples/cry_omanyte.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_omastar.aif b/sound/direct_sound_samples/cry_omastar.aif deleted file mode 100644 index e67d5d7fc..000000000 Binary files a/sound/direct_sound_samples/cry_omastar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_onix.aif b/sound/direct_sound_samples/cry_onix.aif deleted file mode 100644 index aa8a16505..000000000 Binary files a/sound/direct_sound_samples/cry_onix.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_paras.aif b/sound/direct_sound_samples/cry_paras.aif deleted file mode 100644 index f9d69c21c..000000000 Binary files a/sound/direct_sound_samples/cry_paras.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_parasect.aif b/sound/direct_sound_samples/cry_parasect.aif deleted file mode 100644 index d6d9433e9..000000000 Binary files a/sound/direct_sound_samples/cry_parasect.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pelipper.aif b/sound/direct_sound_samples/cry_pelipper.aif deleted file mode 100644 index 26718f848..000000000 Binary files a/sound/direct_sound_samples/cry_pelipper.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_persian.aif b/sound/direct_sound_samples/cry_persian.aif deleted file mode 100644 index 40b3a2c56..000000000 Binary files a/sound/direct_sound_samples/cry_persian.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_phanpy.aif b/sound/direct_sound_samples/cry_phanpy.aif deleted file mode 100644 index 2fcab3c82..000000000 Binary files a/sound/direct_sound_samples/cry_phanpy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pichu.aif b/sound/direct_sound_samples/cry_pichu.aif deleted file mode 100644 index de47bbab8..000000000 Binary files a/sound/direct_sound_samples/cry_pichu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pidgeot.aif b/sound/direct_sound_samples/cry_pidgeot.aif deleted file mode 100644 index af400cdc6..000000000 Binary files a/sound/direct_sound_samples/cry_pidgeot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pidgeotto.aif b/sound/direct_sound_samples/cry_pidgeotto.aif deleted file mode 100644 index 7c71c8f3e..000000000 Binary files a/sound/direct_sound_samples/cry_pidgeotto.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pidgey.aif b/sound/direct_sound_samples/cry_pidgey.aif deleted file mode 100644 index b9c3a5d2a..000000000 Binary files a/sound/direct_sound_samples/cry_pidgey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pikachu.aif b/sound/direct_sound_samples/cry_pikachu.aif deleted file mode 100644 index 690bf5e1d..000000000 Binary files a/sound/direct_sound_samples/cry_pikachu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_piloswine.aif b/sound/direct_sound_samples/cry_piloswine.aif deleted file mode 100644 index b1f34d3b5..000000000 Binary files a/sound/direct_sound_samples/cry_piloswine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pineco.aif b/sound/direct_sound_samples/cry_pineco.aif deleted file mode 100644 index 80292bda0..000000000 Binary files a/sound/direct_sound_samples/cry_pineco.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pinsir.aif b/sound/direct_sound_samples/cry_pinsir.aif deleted file mode 100644 index cf27a11de..000000000 Binary files a/sound/direct_sound_samples/cry_pinsir.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_plusle.aif b/sound/direct_sound_samples/cry_plusle.aif deleted file mode 100644 index d68984263..000000000 Binary files a/sound/direct_sound_samples/cry_plusle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_politoed.aif b/sound/direct_sound_samples/cry_politoed.aif deleted file mode 100644 index 38b1883b4..000000000 Binary files a/sound/direct_sound_samples/cry_politoed.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_poliwag.aif b/sound/direct_sound_samples/cry_poliwag.aif deleted file mode 100644 index 8467f0540..000000000 Binary files a/sound/direct_sound_samples/cry_poliwag.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_poliwhirl.aif b/sound/direct_sound_samples/cry_poliwhirl.aif deleted file mode 100644 index f0851c693..000000000 Binary files a/sound/direct_sound_samples/cry_poliwhirl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_poliwrath.aif b/sound/direct_sound_samples/cry_poliwrath.aif deleted file mode 100644 index 8d19f1d86..000000000 Binary files a/sound/direct_sound_samples/cry_poliwrath.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ponyta.aif b/sound/direct_sound_samples/cry_ponyta.aif deleted file mode 100644 index 46feb123d..000000000 Binary files a/sound/direct_sound_samples/cry_ponyta.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_poochyena.aif b/sound/direct_sound_samples/cry_poochyena.aif deleted file mode 100644 index 3b464ce13..000000000 Binary files a/sound/direct_sound_samples/cry_poochyena.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_porygon.aif b/sound/direct_sound_samples/cry_porygon.aif deleted file mode 100644 index ced70b379..000000000 Binary files a/sound/direct_sound_samples/cry_porygon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_porygon2.aif b/sound/direct_sound_samples/cry_porygon2.aif deleted file mode 100644 index c08a3caaf..000000000 Binary files a/sound/direct_sound_samples/cry_porygon2.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_primeape.aif b/sound/direct_sound_samples/cry_primeape.aif deleted file mode 100644 index a868b3120..000000000 Binary files a/sound/direct_sound_samples/cry_primeape.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_psyduck.aif b/sound/direct_sound_samples/cry_psyduck.aif deleted file mode 100644 index d2d0612f2..000000000 Binary files a/sound/direct_sound_samples/cry_psyduck.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_pupitar.aif b/sound/direct_sound_samples/cry_pupitar.aif deleted file mode 100644 index 7386636ce..000000000 Binary files a/sound/direct_sound_samples/cry_pupitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_quagsire.aif b/sound/direct_sound_samples/cry_quagsire.aif deleted file mode 100644 index 1953d0e42..000000000 Binary files a/sound/direct_sound_samples/cry_quagsire.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_quilava.aif b/sound/direct_sound_samples/cry_quilava.aif deleted file mode 100644 index efe873229..000000000 Binary files a/sound/direct_sound_samples/cry_quilava.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_qwilfish.aif b/sound/direct_sound_samples/cry_qwilfish.aif deleted file mode 100644 index 268c5c89d..000000000 Binary files a/sound/direct_sound_samples/cry_qwilfish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_raichu.aif b/sound/direct_sound_samples/cry_raichu.aif deleted file mode 100644 index e59ffbad4..000000000 Binary files a/sound/direct_sound_samples/cry_raichu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_raikou.aif b/sound/direct_sound_samples/cry_raikou.aif deleted file mode 100644 index a57a2365c..000000000 Binary files a/sound/direct_sound_samples/cry_raikou.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ralts.aif b/sound/direct_sound_samples/cry_ralts.aif deleted file mode 100644 index 0baef5760..000000000 Binary files a/sound/direct_sound_samples/cry_ralts.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_rapidash.aif b/sound/direct_sound_samples/cry_rapidash.aif deleted file mode 100644 index 920f510e4..000000000 Binary files a/sound/direct_sound_samples/cry_rapidash.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_raticate.aif b/sound/direct_sound_samples/cry_raticate.aif deleted file mode 100644 index 01601cab5..000000000 Binary files a/sound/direct_sound_samples/cry_raticate.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_rattata.aif b/sound/direct_sound_samples/cry_rattata.aif deleted file mode 100644 index cb0e1f422..000000000 Binary files a/sound/direct_sound_samples/cry_rattata.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_rayquaza.aif b/sound/direct_sound_samples/cry_rayquaza.aif deleted file mode 100644 index 6115e11d8..000000000 Binary files a/sound/direct_sound_samples/cry_rayquaza.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_regice.aif b/sound/direct_sound_samples/cry_regice.aif deleted file mode 100644 index 6fa23dd73..000000000 Binary files a/sound/direct_sound_samples/cry_regice.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_regirock.aif b/sound/direct_sound_samples/cry_regirock.aif deleted file mode 100644 index ab2a47eb8..000000000 Binary files a/sound/direct_sound_samples/cry_regirock.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_registeel.aif b/sound/direct_sound_samples/cry_registeel.aif deleted file mode 100644 index f5374e5f0..000000000 Binary files a/sound/direct_sound_samples/cry_registeel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_relicanth.aif b/sound/direct_sound_samples/cry_relicanth.aif deleted file mode 100644 index 60af9cf4e..000000000 Binary files a/sound/direct_sound_samples/cry_relicanth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_remoraid.aif b/sound/direct_sound_samples/cry_remoraid.aif deleted file mode 100644 index 16d3f1d65..000000000 Binary files a/sound/direct_sound_samples/cry_remoraid.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_rhydon.aif b/sound/direct_sound_samples/cry_rhydon.aif deleted file mode 100644 index cfa709ee9..000000000 Binary files a/sound/direct_sound_samples/cry_rhydon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_rhyhorn.aif b/sound/direct_sound_samples/cry_rhyhorn.aif deleted file mode 100644 index 47f344ba2..000000000 Binary files a/sound/direct_sound_samples/cry_rhyhorn.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_roselia.aif b/sound/direct_sound_samples/cry_roselia.aif deleted file mode 100644 index 50b60b77b..000000000 Binary files a/sound/direct_sound_samples/cry_roselia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sableye.aif b/sound/direct_sound_samples/cry_sableye.aif deleted file mode 100644 index 1b3a9be30..000000000 Binary files a/sound/direct_sound_samples/cry_sableye.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_salamence.aif b/sound/direct_sound_samples/cry_salamence.aif deleted file mode 100644 index d2957809c..000000000 Binary files a/sound/direct_sound_samples/cry_salamence.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sandshrew.aif b/sound/direct_sound_samples/cry_sandshrew.aif deleted file mode 100644 index 6879be11d..000000000 Binary files a/sound/direct_sound_samples/cry_sandshrew.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sandslash.aif b/sound/direct_sound_samples/cry_sandslash.aif deleted file mode 100644 index ee4a458ed..000000000 Binary files a/sound/direct_sound_samples/cry_sandslash.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sceptile.aif b/sound/direct_sound_samples/cry_sceptile.aif deleted file mode 100644 index 7252cb85f..000000000 Binary files a/sound/direct_sound_samples/cry_sceptile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_scizor.aif b/sound/direct_sound_samples/cry_scizor.aif deleted file mode 100644 index f1f7832ce..000000000 Binary files a/sound/direct_sound_samples/cry_scizor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_scyther.aif b/sound/direct_sound_samples/cry_scyther.aif deleted file mode 100644 index 2b8cbc104..000000000 Binary files a/sound/direct_sound_samples/cry_scyther.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_seadra.aif b/sound/direct_sound_samples/cry_seadra.aif deleted file mode 100644 index 2f60cce4a..000000000 Binary files a/sound/direct_sound_samples/cry_seadra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_seaking.aif b/sound/direct_sound_samples/cry_seaking.aif deleted file mode 100644 index e4fc7e70d..000000000 Binary files a/sound/direct_sound_samples/cry_seaking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sealeo.aif b/sound/direct_sound_samples/cry_sealeo.aif deleted file mode 100644 index d9ea50026..000000000 Binary files a/sound/direct_sound_samples/cry_sealeo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_seedot.aif b/sound/direct_sound_samples/cry_seedot.aif deleted file mode 100644 index c37b769f8..000000000 Binary files a/sound/direct_sound_samples/cry_seedot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_seel.aif b/sound/direct_sound_samples/cry_seel.aif deleted file mode 100644 index 84c4a0a94..000000000 Binary files a/sound/direct_sound_samples/cry_seel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sentret.aif b/sound/direct_sound_samples/cry_sentret.aif deleted file mode 100644 index 4aed7cd70..000000000 Binary files a/sound/direct_sound_samples/cry_sentret.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_seviper.aif b/sound/direct_sound_samples/cry_seviper.aif deleted file mode 100644 index 6a15dd6e2..000000000 Binary files a/sound/direct_sound_samples/cry_seviper.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sharpedo.aif b/sound/direct_sound_samples/cry_sharpedo.aif deleted file mode 100644 index 1b02b56ce..000000000 Binary files a/sound/direct_sound_samples/cry_sharpedo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_shedinja.aif b/sound/direct_sound_samples/cry_shedinja.aif deleted file mode 100644 index 6d1d565f3..000000000 Binary files a/sound/direct_sound_samples/cry_shedinja.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_shelgon.aif b/sound/direct_sound_samples/cry_shelgon.aif deleted file mode 100644 index 24f234ffe..000000000 Binary files a/sound/direct_sound_samples/cry_shelgon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_shellder.aif b/sound/direct_sound_samples/cry_shellder.aif deleted file mode 100644 index b2ea85228..000000000 Binary files a/sound/direct_sound_samples/cry_shellder.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_shiftry.aif b/sound/direct_sound_samples/cry_shiftry.aif deleted file mode 100644 index c91ece114..000000000 Binary files a/sound/direct_sound_samples/cry_shiftry.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_shroomish.aif b/sound/direct_sound_samples/cry_shroomish.aif deleted file mode 100644 index 9e944ca20..000000000 Binary files a/sound/direct_sound_samples/cry_shroomish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_shuckle.aif b/sound/direct_sound_samples/cry_shuckle.aif deleted file mode 100644 index d835d2de6..000000000 Binary files a/sound/direct_sound_samples/cry_shuckle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_shuppet.aif b/sound/direct_sound_samples/cry_shuppet.aif deleted file mode 100644 index 1cd9a2f14..000000000 Binary files a/sound/direct_sound_samples/cry_shuppet.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_silcoon.aif b/sound/direct_sound_samples/cry_silcoon.aif deleted file mode 100644 index ff48950ad..000000000 Binary files a/sound/direct_sound_samples/cry_silcoon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_skarmory.aif b/sound/direct_sound_samples/cry_skarmory.aif deleted file mode 100644 index 88d3985a3..000000000 Binary files a/sound/direct_sound_samples/cry_skarmory.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_skiploom.aif b/sound/direct_sound_samples/cry_skiploom.aif deleted file mode 100644 index 201744d12..000000000 Binary files a/sound/direct_sound_samples/cry_skiploom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_skitty.aif b/sound/direct_sound_samples/cry_skitty.aif deleted file mode 100644 index 7dc4578f4..000000000 Binary files a/sound/direct_sound_samples/cry_skitty.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_slaking.aif b/sound/direct_sound_samples/cry_slaking.aif deleted file mode 100644 index b6a4160f3..000000000 Binary files a/sound/direct_sound_samples/cry_slaking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_slakoth.aif b/sound/direct_sound_samples/cry_slakoth.aif deleted file mode 100644 index 0e4bbc3c3..000000000 Binary files a/sound/direct_sound_samples/cry_slakoth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_slowbro.aif b/sound/direct_sound_samples/cry_slowbro.aif deleted file mode 100644 index f74b753d2..000000000 Binary files a/sound/direct_sound_samples/cry_slowbro.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_slowking.aif b/sound/direct_sound_samples/cry_slowking.aif deleted file mode 100644 index 245a42023..000000000 Binary files a/sound/direct_sound_samples/cry_slowking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_slowpoke.aif b/sound/direct_sound_samples/cry_slowpoke.aif deleted file mode 100644 index 82b05a9a7..000000000 Binary files a/sound/direct_sound_samples/cry_slowpoke.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_slugma.aif b/sound/direct_sound_samples/cry_slugma.aif deleted file mode 100644 index fed42817c..000000000 Binary files a/sound/direct_sound_samples/cry_slugma.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_smeargle.aif b/sound/direct_sound_samples/cry_smeargle.aif deleted file mode 100644 index 00dbedead..000000000 Binary files a/sound/direct_sound_samples/cry_smeargle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_smoochum.aif b/sound/direct_sound_samples/cry_smoochum.aif deleted file mode 100644 index 4005b4ad4..000000000 Binary files a/sound/direct_sound_samples/cry_smoochum.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sneasel.aif b/sound/direct_sound_samples/cry_sneasel.aif deleted file mode 100644 index 54242a23f..000000000 Binary files a/sound/direct_sound_samples/cry_sneasel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_snorlax.aif b/sound/direct_sound_samples/cry_snorlax.aif deleted file mode 100644 index f95128e3a..000000000 Binary files a/sound/direct_sound_samples/cry_snorlax.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_snorunt.aif b/sound/direct_sound_samples/cry_snorunt.aif deleted file mode 100644 index 53b05b229..000000000 Binary files a/sound/direct_sound_samples/cry_snorunt.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_snubbull.aif b/sound/direct_sound_samples/cry_snubbull.aif deleted file mode 100644 index bbba023fd..000000000 Binary files a/sound/direct_sound_samples/cry_snubbull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_solrock.aif b/sound/direct_sound_samples/cry_solrock.aif deleted file mode 100644 index 64c71f289..000000000 Binary files a/sound/direct_sound_samples/cry_solrock.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_spearow.aif b/sound/direct_sound_samples/cry_spearow.aif deleted file mode 100644 index 7ce86ae29..000000000 Binary files a/sound/direct_sound_samples/cry_spearow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_spheal.aif b/sound/direct_sound_samples/cry_spheal.aif deleted file mode 100644 index fb6470210..000000000 Binary files a/sound/direct_sound_samples/cry_spheal.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_spinarak.aif b/sound/direct_sound_samples/cry_spinarak.aif deleted file mode 100644 index 3c4c1eff1..000000000 Binary files a/sound/direct_sound_samples/cry_spinarak.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_spinda.aif b/sound/direct_sound_samples/cry_spinda.aif deleted file mode 100644 index 0217573c7..000000000 Binary files a/sound/direct_sound_samples/cry_spinda.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_spoink.aif b/sound/direct_sound_samples/cry_spoink.aif deleted file mode 100644 index 6cc9bf546..000000000 Binary files a/sound/direct_sound_samples/cry_spoink.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_squirtle.aif b/sound/direct_sound_samples/cry_squirtle.aif deleted file mode 100644 index 43a98a53d..000000000 Binary files a/sound/direct_sound_samples/cry_squirtle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_stantler.aif b/sound/direct_sound_samples/cry_stantler.aif deleted file mode 100644 index 36ba54658..000000000 Binary files a/sound/direct_sound_samples/cry_stantler.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_starmie.aif b/sound/direct_sound_samples/cry_starmie.aif deleted file mode 100644 index 7452a78f9..000000000 Binary files a/sound/direct_sound_samples/cry_starmie.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_staryu.aif b/sound/direct_sound_samples/cry_staryu.aif deleted file mode 100644 index 6ab5584bf..000000000 Binary files a/sound/direct_sound_samples/cry_staryu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_steelix.aif b/sound/direct_sound_samples/cry_steelix.aif deleted file mode 100644 index aa05e2d4c..000000000 Binary files a/sound/direct_sound_samples/cry_steelix.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sudowoodo.aif b/sound/direct_sound_samples/cry_sudowoodo.aif deleted file mode 100644 index 1af7e18eb..000000000 Binary files a/sound/direct_sound_samples/cry_sudowoodo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_suicune.aif b/sound/direct_sound_samples/cry_suicune.aif deleted file mode 100644 index 697732d68..000000000 Binary files a/sound/direct_sound_samples/cry_suicune.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sunflora.aif b/sound/direct_sound_samples/cry_sunflora.aif deleted file mode 100644 index 126931adc..000000000 Binary files a/sound/direct_sound_samples/cry_sunflora.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_sunkern.aif b/sound/direct_sound_samples/cry_sunkern.aif deleted file mode 100644 index bede3bf95..000000000 Binary files a/sound/direct_sound_samples/cry_sunkern.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_surskit.aif b/sound/direct_sound_samples/cry_surskit.aif deleted file mode 100644 index 438b5b67a..000000000 Binary files a/sound/direct_sound_samples/cry_surskit.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_swablu.aif b/sound/direct_sound_samples/cry_swablu.aif deleted file mode 100644 index 066095f55..000000000 Binary files a/sound/direct_sound_samples/cry_swablu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_swalot.aif b/sound/direct_sound_samples/cry_swalot.aif deleted file mode 100644 index 518a9bf5a..000000000 Binary files a/sound/direct_sound_samples/cry_swalot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_swampert.aif b/sound/direct_sound_samples/cry_swampert.aif deleted file mode 100644 index 56bd26405..000000000 Binary files a/sound/direct_sound_samples/cry_swampert.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_swellow.aif b/sound/direct_sound_samples/cry_swellow.aif deleted file mode 100644 index 2b94eb432..000000000 Binary files a/sound/direct_sound_samples/cry_swellow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_swinub.aif b/sound/direct_sound_samples/cry_swinub.aif deleted file mode 100644 index dc68d62d8..000000000 Binary files a/sound/direct_sound_samples/cry_swinub.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_taillow.aif b/sound/direct_sound_samples/cry_taillow.aif deleted file mode 100644 index 8322a3224..000000000 Binary files a/sound/direct_sound_samples/cry_taillow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_tangela.aif b/sound/direct_sound_samples/cry_tangela.aif deleted file mode 100644 index c900b426d..000000000 Binary files a/sound/direct_sound_samples/cry_tangela.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_tauros.aif b/sound/direct_sound_samples/cry_tauros.aif deleted file mode 100644 index 84fa9b317..000000000 Binary files a/sound/direct_sound_samples/cry_tauros.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_teddiursa.aif b/sound/direct_sound_samples/cry_teddiursa.aif deleted file mode 100644 index ba5cb5bc3..000000000 Binary files a/sound/direct_sound_samples/cry_teddiursa.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_tentacool.aif b/sound/direct_sound_samples/cry_tentacool.aif deleted file mode 100644 index 332bec4b2..000000000 Binary files a/sound/direct_sound_samples/cry_tentacool.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_tentacruel.aif b/sound/direct_sound_samples/cry_tentacruel.aif deleted file mode 100644 index e8ec1b14c..000000000 Binary files a/sound/direct_sound_samples/cry_tentacruel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_togepi.aif b/sound/direct_sound_samples/cry_togepi.aif deleted file mode 100644 index 87ef6ef2d..000000000 Binary files a/sound/direct_sound_samples/cry_togepi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_togetic.aif b/sound/direct_sound_samples/cry_togetic.aif deleted file mode 100644 index 8aa18ac41..000000000 Binary files a/sound/direct_sound_samples/cry_togetic.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_torchic.aif b/sound/direct_sound_samples/cry_torchic.aif deleted file mode 100644 index 185a79499..000000000 Binary files a/sound/direct_sound_samples/cry_torchic.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_torkoal.aif b/sound/direct_sound_samples/cry_torkoal.aif deleted file mode 100644 index 9e56d3810..000000000 Binary files a/sound/direct_sound_samples/cry_torkoal.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_totodile.aif b/sound/direct_sound_samples/cry_totodile.aif deleted file mode 100644 index dbf2179a7..000000000 Binary files a/sound/direct_sound_samples/cry_totodile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_trapinch.aif b/sound/direct_sound_samples/cry_trapinch.aif deleted file mode 100644 index 01664b72e..000000000 Binary files a/sound/direct_sound_samples/cry_trapinch.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_treecko.aif b/sound/direct_sound_samples/cry_treecko.aif deleted file mode 100644 index a7416e8da..000000000 Binary files a/sound/direct_sound_samples/cry_treecko.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_tropius.aif b/sound/direct_sound_samples/cry_tropius.aif deleted file mode 100644 index bbb52787b..000000000 Binary files a/sound/direct_sound_samples/cry_tropius.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_typhlosion.aif b/sound/direct_sound_samples/cry_typhlosion.aif deleted file mode 100644 index f0238d066..000000000 Binary files a/sound/direct_sound_samples/cry_typhlosion.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_tyranitar.aif b/sound/direct_sound_samples/cry_tyranitar.aif deleted file mode 100644 index 557f61769..000000000 Binary files a/sound/direct_sound_samples/cry_tyranitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_tyrogue.aif b/sound/direct_sound_samples/cry_tyrogue.aif deleted file mode 100644 index e5065f58b..000000000 Binary files a/sound/direct_sound_samples/cry_tyrogue.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_umbreon.aif b/sound/direct_sound_samples/cry_umbreon.aif deleted file mode 100644 index 38129b1a7..000000000 Binary files a/sound/direct_sound_samples/cry_umbreon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_unown.aif b/sound/direct_sound_samples/cry_unown.aif deleted file mode 100644 index 8339ccb6b..000000000 Binary files a/sound/direct_sound_samples/cry_unown.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_unused_265.aif b/sound/direct_sound_samples/cry_unused_265.aif deleted file mode 100644 index 7f5965f06..000000000 Binary files a/sound/direct_sound_samples/cry_unused_265.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_unused_268.aif b/sound/direct_sound_samples/cry_unused_268.aif deleted file mode 100644 index 5cae364c3..000000000 Binary files a/sound/direct_sound_samples/cry_unused_268.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_ursaring.aif b/sound/direct_sound_samples/cry_ursaring.aif deleted file mode 100644 index fcc748bd1..000000000 Binary files a/sound/direct_sound_samples/cry_ursaring.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_vaporeon.aif b/sound/direct_sound_samples/cry_vaporeon.aif deleted file mode 100644 index 4967cfdeb..000000000 Binary files a/sound/direct_sound_samples/cry_vaporeon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_venomoth.aif b/sound/direct_sound_samples/cry_venomoth.aif deleted file mode 100644 index bc291ec33..000000000 Binary files a/sound/direct_sound_samples/cry_venomoth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_venonat.aif b/sound/direct_sound_samples/cry_venonat.aif deleted file mode 100644 index e89d87fa8..000000000 Binary files a/sound/direct_sound_samples/cry_venonat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_venusaur.aif b/sound/direct_sound_samples/cry_venusaur.aif deleted file mode 100644 index 8a1f69e6e..000000000 Binary files a/sound/direct_sound_samples/cry_venusaur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_vibrava.aif b/sound/direct_sound_samples/cry_vibrava.aif deleted file mode 100644 index 3e3180219..000000000 Binary files a/sound/direct_sound_samples/cry_vibrava.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_victreebel.aif b/sound/direct_sound_samples/cry_victreebel.aif deleted file mode 100644 index d6e6a4fe9..000000000 Binary files a/sound/direct_sound_samples/cry_victreebel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_vigoroth.aif b/sound/direct_sound_samples/cry_vigoroth.aif deleted file mode 100644 index fc414f33d..000000000 Binary files a/sound/direct_sound_samples/cry_vigoroth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_vileplume.aif b/sound/direct_sound_samples/cry_vileplume.aif deleted file mode 100644 index 723eec697..000000000 Binary files a/sound/direct_sound_samples/cry_vileplume.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_volbeat.aif b/sound/direct_sound_samples/cry_volbeat.aif deleted file mode 100644 index 6f765081e..000000000 Binary files a/sound/direct_sound_samples/cry_volbeat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_voltorb.aif b/sound/direct_sound_samples/cry_voltorb.aif deleted file mode 100644 index 96e3bff31..000000000 Binary files a/sound/direct_sound_samples/cry_voltorb.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_vulpix.aif b/sound/direct_sound_samples/cry_vulpix.aif deleted file mode 100644 index 20da23fb4..000000000 Binary files a/sound/direct_sound_samples/cry_vulpix.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wailmer.aif b/sound/direct_sound_samples/cry_wailmer.aif deleted file mode 100644 index e8de91333..000000000 Binary files a/sound/direct_sound_samples/cry_wailmer.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wailord.aif b/sound/direct_sound_samples/cry_wailord.aif deleted file mode 100644 index 2c0468010..000000000 Binary files a/sound/direct_sound_samples/cry_wailord.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_walrein.aif b/sound/direct_sound_samples/cry_walrein.aif deleted file mode 100644 index 24c00a596..000000000 Binary files a/sound/direct_sound_samples/cry_walrein.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wartortle.aif b/sound/direct_sound_samples/cry_wartortle.aif deleted file mode 100644 index 5dab7fd93..000000000 Binary files a/sound/direct_sound_samples/cry_wartortle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_weedle.aif b/sound/direct_sound_samples/cry_weedle.aif deleted file mode 100644 index 773c2c8ae..000000000 Binary files a/sound/direct_sound_samples/cry_weedle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_weepinbell.aif b/sound/direct_sound_samples/cry_weepinbell.aif deleted file mode 100644 index cdd61380a..000000000 Binary files a/sound/direct_sound_samples/cry_weepinbell.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_weezing.aif b/sound/direct_sound_samples/cry_weezing.aif deleted file mode 100644 index 2e4a7fe13..000000000 Binary files a/sound/direct_sound_samples/cry_weezing.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_whiscash.aif b/sound/direct_sound_samples/cry_whiscash.aif deleted file mode 100644 index 219737f32..000000000 Binary files a/sound/direct_sound_samples/cry_whiscash.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_whismur.aif b/sound/direct_sound_samples/cry_whismur.aif deleted file mode 100644 index 4da92ca6a..000000000 Binary files a/sound/direct_sound_samples/cry_whismur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wigglytuff.aif b/sound/direct_sound_samples/cry_wigglytuff.aif deleted file mode 100644 index 90aa90a23..000000000 Binary files a/sound/direct_sound_samples/cry_wigglytuff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wingull.aif b/sound/direct_sound_samples/cry_wingull.aif deleted file mode 100644 index 182ef18e6..000000000 Binary files a/sound/direct_sound_samples/cry_wingull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wobbuffet.aif b/sound/direct_sound_samples/cry_wobbuffet.aif deleted file mode 100644 index 70ee1f704..000000000 Binary files a/sound/direct_sound_samples/cry_wobbuffet.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wooper.aif b/sound/direct_sound_samples/cry_wooper.aif deleted file mode 100644 index 51a6b627e..000000000 Binary files a/sound/direct_sound_samples/cry_wooper.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wurmple.aif b/sound/direct_sound_samples/cry_wurmple.aif deleted file mode 100644 index 6442a4063..000000000 Binary files a/sound/direct_sound_samples/cry_wurmple.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_wynaut.aif b/sound/direct_sound_samples/cry_wynaut.aif deleted file mode 100644 index 798732c74..000000000 Binary files a/sound/direct_sound_samples/cry_wynaut.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_xatu.aif b/sound/direct_sound_samples/cry_xatu.aif deleted file mode 100644 index ac758fdbf..000000000 Binary files a/sound/direct_sound_samples/cry_xatu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_yanma.aif b/sound/direct_sound_samples/cry_yanma.aif deleted file mode 100644 index df76534c5..000000000 Binary files a/sound/direct_sound_samples/cry_yanma.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_zangoose.aif b/sound/direct_sound_samples/cry_zangoose.aif deleted file mode 100644 index ce1622043..000000000 Binary files a/sound/direct_sound_samples/cry_zangoose.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_zapdos.aif b/sound/direct_sound_samples/cry_zapdos.aif deleted file mode 100644 index a8d914d14..000000000 Binary files a/sound/direct_sound_samples/cry_zapdos.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_zigzagoon.aif b/sound/direct_sound_samples/cry_zigzagoon.aif deleted file mode 100644 index 52b9bb4f4..000000000 Binary files a/sound/direct_sound_samples/cry_zigzagoon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cry_zubat.aif b/sound/direct_sound_samples/cry_zubat.aif deleted file mode 100644 index 45036d072..000000000 Binary files a/sound/direct_sound_samples/cry_zubat.aif and /dev/null differ -- cgit v1.2.3 From 8aae2583eb851d1442b85e28d7bcb13a15c1818d Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 27 Jan 2018 16:41:07 -0600 Subject: add comments for pool loads --- asm/battle_1.s | 14 +- asm/battle_9.s | 36 +- asm/nakamura_debug_menu.s | 476 +++++++-------- asm/nohara_debug_menu.s | 340 +++++------ asm/pokemon_storage_system.s | 236 ++++---- asm/taya_debug_window.s | 252 ++++---- asm/tomomichi_debug_menu.s | 1160 ++++++++++++++++++------------------- asm/unk_debug_menu_3.s | 104 ++-- asm/watanabe_debug_menu.s | 1306 +++++++++++++++++++++--------------------- src/roulette.c | 16 +- 10 files changed, 1970 insertions(+), 1970 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index 8ed743677..cd925e10d 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -800,34 +800,34 @@ sub_800DAB8: .syntax divided push {r4, r5, lr} add sp, sp, #0xfffffffc - ldr r0, ._113 + ldr r0, ._113 @ gUnknown_08D00000 mov r1, #0xc0 lsl r1, r1, #0x13 bl LZDecompressVram - ldr r0, ._113 + 4 - ldr r4, ._113 + 8 + ldr r0, ._113 + 4 @ gUnknown_08D00524 + ldr r4, ._113 + 8 @ 0x600c000 mov r2, #0x80 lsl r2, r2, #0x4 add r1, r4, #0 bl CpuSet - ldr r0, ._113 + 12 + ldr r0, ._113 + 12 @ gUnknown_08D004E0 mov r1, #0x0 mov r2, #0x40 bl LoadCompressedPalette bl sub_800D74C bl DrawMainBattleBackground - ldr r0, ._113 + 16 + ldr r0, ._113 + 16 @ gBattleTypeFlags ldrh r1, [r0] mov r0, #0x2 and r0, r0, r1 cmp r0, #0 beq ._112 @cond_branch - ldr r0, ._113 + 20 + ldr r0, ._113 + 20 @ 0x6000600 mov r1, #0x0 add r2, r4, #0 mov r3, #0x1 bl debug_sub_8008218 - ldr r5, ._113 + 24 + ldr r5, ._113 + 24 @ 0x101 mov r4, #0x1 str r4, [sp] add r0, r5, #0 diff --git a/asm/battle_9.s b/asm/battle_9.s index 62e2baae6..3f162df12 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -1392,7 +1392,7 @@ _08036AFE: sub_8036B0C: .syntax divided push {r4, r5, r6, lr} - ldr r5, ._205 + ldr r5, ._205 @ gBattleTypeFlags ldrh r1, [r5] mov r0, #0x8 and r0, r0, r1 @@ -1406,13 +1406,13 @@ sub_8036B0C: bne ._199 @cond_branch b ._200 ._199: - ldr r4, ._205 + 4 - ldr r0, ._205 + 8 + ldr r4, ._205 + 4 @ 0x2000000 + ldr r0, ._205 + 8 @ gActiveBank ldrb r0, [r0] bl GetBankIdentity lsl r0, r0, #0x18 lsr r0, r0, #0x19 - ldr r1, ._205 + 12 + ldr r1, ._205 + 12 @ 0x160c8 add r0, r0, r1 add r0, r0, r4 ldrb r0, [r0] @@ -1438,7 +1438,7 @@ sub_8036B0C: .align 2, 0 ._205: .word gBattleTypeFlags - .word +0x2000000 + .word 0x2000000 .word gActiveBank .word 0x160c8 ._203: @@ -1455,13 +1455,13 @@ sub_8036B0C: ._212: mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._214 + ldr r1, ._214 @ gEnemyParty add r0, r0, r1 mov r1, #0x39 bl GetMonData cmp r0, #0 beq ._210 @cond_branch - ldr r1, ._214 + 4 + ldr r1, ._214 + 4 @ gBattlePartyID lsl r0, r6, #0x1 add r0, r0, r1 ldrh r0, [r0] @@ -1472,8 +1472,8 @@ sub_8036B0C: ldrh r0, [r0] cmp r4, r0 beq ._210 @cond_branch - ldr r1, ._214 + 8 - ldr r2, ._214 + 12 + ldr r1, ._214 + 8 @ 0x2000000 + ldr r2, ._214 + 12 @ 0x16068 add r0, r6, r2 add r0, r0, r1 ldrb r0, [r0] @@ -1489,23 +1489,23 @@ sub_8036B0C: cmp r4, #0x5 ble ._212 @cond_branch ._211: - ldr r0, ._214 + 16 + ldr r0, ._214 + 16 @ gActiveBank ldrb r0, [r0] bl GetBankIdentity - ldr r1, ._214 + 8 + ldr r1, ._214 + 8 @ 0x2000000 lsl r0, r0, #0x18 lsr r0, r0, #0x19 - ldr r3, ._214 + 20 + ldr r3, ._214 + 20 @ 0x160c8 add r0, r0, r3 add r0, r0, r1 strb r4, [r0] ._201: - ldr r4, ._214 + 16 + ldr r4, ._214 + 16 @ gActiveBank ldrb r0, [r4] bl GetBankIdentity - ldr r2, ._214 + 8 + ldr r2, ._214 + 8 @ 0x2000000 ldrb r1, [r4] - ldr r3, ._214 + 12 + ldr r3, ._214 + 12 @ 0x16068 add r1, r1, r3 add r1, r1, r2 lsl r0, r0, #0x18 @@ -1521,12 +1521,12 @@ sub_8036B0C: ._214: .word gEnemyParty .word gBattlePartyID - .word +0x2000000 + .word 0x2000000 .word 0x16068 .word gActiveBank .word 0x160c8 ._200: - ldr r0, ._218 + ldr r0, ._218 @ gUnknown_02023A14 ldrb r1, [r0] mov r0, #0x20 and r0, r0, r1 @@ -1537,7 +1537,7 @@ sub_8036B0C: cmp r0, #0 bne ._217 @cond_branch ._216: - ldr r0, ._218 + 4 + ldr r0, ._218 + 4 @ gActiveBank ldrb r0, [r0] mov r2, #0x1 eor r2, r2, r0 diff --git a/asm/nakamura_debug_menu.s b/asm/nakamura_debug_menu.s index 2ef359b48..21092fe4b 100644 --- a/asm/nakamura_debug_menu.s +++ b/asm/nakamura_debug_menu.s @@ -15,7 +15,7 @@ debug_sub_815F1B8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._1 + ldr r3, ._1 @ _843E3DC mov r0, #0x10 mov r1, #0x1 mov r2, #0x9 @@ -43,8 +43,8 @@ debug_sub_815F1B8: InitNakamuraDebugMenu: push {lr} bl debug_sub_815F1B8 - ldr r1, ._3 - ldr r0, ._3 + 4 + ldr r1, ._3 @ gMenuCallback + ldr r0, ._3 + 4 @ debug_sub_815F214 str r0, [r1] mov r0, #0x0 pop {r1} @@ -60,7 +60,7 @@ InitNakamuraDebugMenu: thumb_func_start debug_sub_815F214 debug_sub_815F214: push {r4, lr} - ldr r4, ._9 + ldr r4, ._9 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -83,7 +83,7 @@ debug_sub_815F214: and r0, r0, r1 cmp r0, #0 beq ._7 @cond_branch - ldr r4, ._9 + 4 + ldr r4, ._9 + 4 @ _843E3DC bl Menu_GetCursorPos lsl r0, r0, #0x18 lsr r0, r0, #0x15 @@ -122,7 +122,7 @@ debug_sub_815F284: push {r4, lr} lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r0, ._14 + ldr r0, ._14 @ gPaletteFade ldrb r1, [r0, #0x7] mov r0, #0x80 and r0, r0, r1 @@ -151,10 +151,10 @@ debug_sub_815F2B4: add sp, sp, #0xfffffffc bl CloseMenu bl Menu_EraseScreen - ldr r1, ._16 - ldr r0, ._16 + 4 + ldr r1, ._16 @ gMain + ldr r0, ._16 + 4 @ sub_805469C str r0, [r1, #0x8] - ldr r0, ._16 + 8 + ldr r0, ._16 + 8 @ debug_sub_815F284 mov r1, #0x0 bl CreateTask mov r0, #0x1 @@ -191,9 +191,9 @@ debug_sub_815F2F4: lsl r1, r7, #0x2 add r0, r1, r7 lsl r2, r0, #0x5 - ldr r3, ._24 + ldr r3, ._24 @ gSaveBlock1 add r0, r2, r3 - ldr r5, ._24 + 4 + ldr r5, ._24 + 4 @ 0x1a08 add r0, r0, r5 ldrb r0, [r0] mov r9, r1 @@ -204,10 +204,10 @@ debug_sub_815F2F4: b ._19 ._18: mov r5, #0x0 - ldr r6, ._24 + 8 + ldr r6, ._24 + 8 @ gSaveBlock2 add r4, r7, #0 sub r4, r4, #0x46 - ldr r3, ._24 + 12 + ldr r3, ._24 + 12 @ gSaveBlock1 ._21: add r1, r5, r2 add r1, r1, r3 @@ -240,15 +240,15 @@ debug_sub_815F2F4: ._23: add r0, r0, r3 strb r4, [r0] - ldr r1, ._35 - ldr r2, ._35 + 4 + ldr r1, ._35 @ gSaveBlock1 + ldr r2, ._35 + 4 @ 0x1a08 add r2, r2, r1 mov sl, r2 mov r3, r9 add r0, r3, r7 lsl r6, r0, #0x5 add r1, r6, r1 - ldr r5, ._35 + 4 + ldr r5, ._35 + 4 @ 0x1a08 add r5, r5, r1 mov r8, r5 ._30: @@ -259,7 +259,7 @@ debug_sub_815F2F4: bl __umodsi3 lsl r0, r0, #0x10 lsr r0, r0, #0xe - ldr r1, ._35 + 8 + ldr r1, ._35 + 8 @ _843E424 add r0, r0, r1 ldrb r0, [r0] mov r2, r8 @@ -271,9 +271,9 @@ debug_sub_815F2F4: ldrb r3, [r3] cmp r0, r3 beq ._28 @cond_branch - ldr r4, ._35 + ldr r4, ._35 @ gSaveBlock1 add r0, r6, r4 - ldr r2, ._35 + 4 + ldr r2, ._35 + 4 @ 0x1a08 add r3, r0, r2 ._29: add r0, r5, #1 @@ -297,12 +297,12 @@ debug_sub_815F2F4: mov r5, r9 add r4, r5, r7 lsl r4, r4, #0x5 - ldr r1, ._35 + ldr r1, ._35 @ gSaveBlock1 add r3, r4, r1 lsl r0, r0, #0x10 lsr r0, r0, #0x10 mov r1, #0x1 - ldr r2, ._35 + 12 + ldr r2, ._35 + 12 @ 0x1a09 add r3, r3, r2 and r0, r0, r1 lsl r0, r0, #0x4 @@ -314,7 +314,7 @@ debug_sub_815F2F4: orr r1, r1, r0 strb r1, [r3] mov r5, #0x0 - ldr r6, ._35 + 16 + ldr r6, ._35 + 16 @ gSaveBlock1 ._31: bl Random add r1, r5, r4 @@ -329,7 +329,7 @@ debug_sub_815F2F4: mov r1, r9 add r0, r1, r7 lsl r4, r0, #0x5 - ldr r3, ._35 + 20 + ldr r3, ._35 + 20 @ gSaveBlock1 mov r2, #0x0 add r6, r3, #0 add r6, r6, #0x10 @@ -381,18 +381,18 @@ debug_sub_815F470: add r6, r0, #0 add r7, r1, #0 mov ip, r2 - ldr r2, ._39 - ldr r0, ._39 + 4 + ldr r2, ._39 @ gSaveBlock1 + ldr r0, ._39 + 4 @ _nakamuraData0 ldrb r1, [r0] lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._39 + 8 + ldr r1, ._39 + 8 @ 0x1a08 add r0, r0, r1 ldrb r4, [r0] mov r2, #0x0 - ldr r3, ._39 + 12 + ldr r3, ._39 + 12 @ _843E424 add r5, r3, #0 ._41: lsl r1, r2, #0x2 @@ -443,8 +443,8 @@ debug_sub_815F4D8: mov r2, #0xa mov r3, #0xa bl Menu_BlankWindowRect - ldr r6, ._43 - ldr r7, ._43 + 4 + ldr r6, ._43 @ gStringVar1 + ldr r7, ._43 + 4 @ _nakamuraData0 ldrb r1, [r7] add r0, r6, #0 mov r2, #0x0 @@ -454,13 +454,13 @@ debug_sub_815F4D8: mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r2, ._43 + 8 + ldr r2, ._43 + 8 @ gSaveBlock1 ldrb r1, [r7] lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._43 + 12 + ldr r1, ._43 + 12 @ 0x1a08 add r0, r0, r1 ldrb r0, [r0] cmp r0, #0 @@ -480,7 +480,7 @@ debug_sub_815F4D8: mov r1, #0x1 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._43 + 16 + ldr r0, ._43 + 16 @ Str_843E550 mov r1, #0x1 mov r2, #0x5 bl Menu_PrintText @@ -494,7 +494,7 @@ debug_sub_815F4D8: mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._43 + 20 + ldr r0, ._43 + 20 @ Str_843E552 mov r1, #0x1 mov r2, #0x7 bl Menu_PrintText @@ -507,7 +507,7 @@ debug_sub_815F4D8: mov r1, #0x3 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._43 + 24 + ldr r0, ._43 + 24 @ Str_843E554 mov r1, #0x1 mov r2, #0x9 bl Menu_PrintText @@ -541,7 +541,7 @@ debug_sub_815F4D8: thumb_func_start debug_sub_815F5C4 debug_sub_815F5C4: push {lr} - ldr r0, ._48 + ldr r0, ._48 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -549,7 +549,7 @@ debug_sub_815F5C4: lsr r2, r0, #0x10 cmp r2, #0 beq ._45 @cond_branch - ldr r1, ._48 + 4 + ldr r1, ._48 + 4 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0 bne ._46 @cond_branch @@ -568,7 +568,7 @@ debug_sub_815F5C4: and r0, r0, r1 cmp r0, #0 beq ._51 @cond_branch - ldr r1, ._54 + ldr r1, ._54 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0x13 bne ._52 @cond_branch @@ -605,11 +605,11 @@ debug_sub_815F5C4: thumb_func_start debug_sub_815F62C debug_sub_815F62C: push {lr} - ldr r1, ._59 + ldr r1, ._59 @ _nakamuraData0 mov r0, #0x0 strb r0, [r1] - ldr r1, ._59 + 4 - ldr r0, ._59 + 8 + ldr r1, ._59 + 4 @ gMenuCallback + ldr r0, ._59 + 8 @ debug_sub_815F5C4 str r0, [r1] mov r0, #0x0 mov r1, #0x0 @@ -637,12 +637,12 @@ debug_sub_815F62C: thumb_func_start debug_sub_815F668 debug_sub_815F668: push {r4, r5, r6, lr} - ldr r0, ._61 + ldr r0, ._61 @ _nakamuraData0 ldrb r0, [r0] lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x5 - ldr r0, ._61 + 4 + ldr r0, ._61 + 4 @ gSaveBlock1 add r1, r1, r0 ldrb r4, [r1, #0x3] lsl r4, r4, #0x18 @@ -654,8 +654,8 @@ debug_sub_815F668: orr r4, r4, r0 ldrb r0, [r1] orr r4, r4, r0 - ldr r5, ._61 + 8 - ldr r6, ._61 + 12 + ldr r5, ._61 + 8 @ gStringVar1 + ldr r6, ._61 + 12 @ 0x186a0 add r0, r4, #0 add r1, r6, #0 bl __udivsi3 @@ -701,13 +701,13 @@ debug_sub_815F6E4: mov r2, #0xb mov r3, #0x4 bl Menu_BlankWindowRect - ldr r4, ._63 - ldr r0, ._63 + 4 + ldr r4, ._63 @ gStringVar1 + ldr r0, ._63 + 4 @ _nakamuraData0 ldrb r0, [r0] lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x5 - ldr r0, ._63 + 8 + ldr r0, ._63 + 8 @ gSaveBlock1 add r1, r1, r0 add r0, r4, #0 mov r2, #0x7 @@ -738,8 +738,8 @@ debug_sub_815F72C: mov r2, #0xb mov r3, #0xa bl Menu_BlankWindowRect - ldr r4, ._66 - ldr r5, ._66 + 4 + ldr r4, ._66 @ gStringVar1 + ldr r5, ._66 + 4 @ _nakamuraData0 ldrb r1, [r5] add r0, r4, #0 mov r2, #0x0 @@ -749,13 +749,13 @@ debug_sub_815F72C: mov r1, #0x2 mov r2, #0x1 bl Menu_PrintText - ldr r2, ._66 + 8 + ldr r2, ._66 + 8 @ gSaveBlock1 ldrb r1, [r5] lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._66 + 12 + ldr r1, ._66 + 12 @ 0x1a08 add r0, r0, r1 ldrb r0, [r0] cmp r0, #0 @@ -784,8 +784,8 @@ debug_sub_815F788: mov r2, #0xb mov r3, #0x6 bl Menu_BlankWindowRect - ldr r0, ._68 - ldr r1, ._68 + 4 + ldr r0, ._68 @ Str_843E574 + ldr r1, ._68 + 4 @ _nakamuraData2 ldrb r1, [r1] add r1, r1, #0x2 lsl r1, r1, #0x18 @@ -805,7 +805,7 @@ debug_sub_815F788: thumb_func_start debug_sub_815F7B4 debug_sub_815F7B4: push {lr} - ldr r0, ._72 + ldr r0, ._72 @ _nakamuraData1 ldrb r0, [r0] cmp r0, #0 beq ._70 @cond_branch @@ -820,10 +820,10 @@ debug_sub_815F7B4: ._72: .word _nakamuraData1 ._70: - ldr r0, ._74 + ldr r0, ._74 @ _nakamuraData3 ldrb r0, [r0] lsl r0, r0, #0x1 - ldr r1, ._74 + 4 + ldr r1, ._74 + 4 @ Str_843E576 add r0, r0, r1 mov r1, #0xb mov r2, #0x1 @@ -842,12 +842,12 @@ debug_sub_815F7B4: thumb_func_start debug_sub_815F7F0 debug_sub_815F7F0: push {r4, r5, lr} - ldr r1, ._78 + ldr r1, ._78 @ _nakamuraData0 ldrb r2, [r1] lsl r1, r2, #0x2 add r1, r1, r2 lsl r1, r1, #0x5 - ldr r2, ._78 + 4 + ldr r2, ._78 + 4 @ gSaveBlock1 add r3, r1, r2 ldrb r1, [r3, #0x3] lsl r2, r1, #0x18 @@ -862,7 +862,7 @@ debug_sub_815F7F0: lsl r0, r0, #0x18 asr r1, r0, #0x18 mov r4, #0x9 - ldr r0, ._78 + 8 + ldr r0, ._78 + 8 @ _nakamuraData2 ldrb r0, [r0] cmp r4, r0 ble ._76 @cond_branch @@ -911,12 +911,12 @@ debug_sub_815F7F0: debug_sub_815F86C: push {r4, r5, r6, lr} lsl r0, r0, #0x18 - ldr r1, ._84 + ldr r1, ._84 @ _nakamuraData0 ldrb r2, [r1] lsl r1, r2, #0x2 add r1, r1, r2 lsl r1, r1, #0x5 - ldr r2, ._84 + 4 + ldr r2, ._84 + 4 @ gSaveBlock1 add r5, r1, r2 mov r2, #0x0 mov r3, #0x0 @@ -924,7 +924,7 @@ debug_sub_815F86C: asr r0, r0, #0x18 cmp r0, #0x64 bne ._80 @cond_branch - ldr r0, ._84 + 8 + ldr r0, ._84 + 8 @ _nakamuraData2 ldrb r1, [r0] cmp r1, #0x6 bhi ._100 @cond_branch @@ -945,12 +945,12 @@ debug_sub_815F86C: .word gSaveBlock1+0x1a0a .word _nakamuraData2 ._80: - ldr r0, ._87 + ldr r0, ._87 @ _nakamuraData3 ldrb r0, [r0] cmp r0, #0x4 bhi ._98 @cond_branch lsl r0, r0, #0x2 - ldr r1, ._87 + 4 + ldr r1, ._87 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -985,7 +985,7 @@ debug_sub_815F86C: mov r3, #0xa1 mov r2, #0xaa ._98: - ldr r4, ._101 + ldr r4, ._101 @ _nakamuraData2 ldrb r1, [r4] add r1, r5, r1 ldrb r0, [r1] @@ -1019,14 +1019,14 @@ debug_sub_815F86C: thumb_func_start debug_sub_815F930 debug_sub_815F930: push {r4, r5, lr} - ldr r0, ._107 + ldr r0, ._107 @ _nakamuraData1 ldrb r2, [r0] mov r4, #0xa cmp r2, #0 bne ._103 @cond_branch mov r4, #0x7 ._103: - ldr r5, ._107 + 4 + ldr r5, ._107 + 4 @ gMain ldrh r1, [r5, #0x30] mov r0, #0x40 and r0, r0, r1 @@ -1067,7 +1067,7 @@ debug_sub_815F930: lsr r3, r0, #0x10 cmp r3, #0 beq ._114 @cond_branch - ldr r1, ._117 + ldr r1, ._117 @ _nakamuraData2 ldrb r0, [r1] cmp r0, #0 bne ._115 @cond_branch @@ -1089,7 +1089,7 @@ debug_sub_815F930: and r0, r0, r1 cmp r0, #0 beq ._120 @cond_branch - ldr r2, ._123 + ldr r2, ._123 @ _nakamuraData2 ldrb r1, [r2] sub r0, r4, #1 cmp r1, r0 @@ -1112,7 +1112,7 @@ debug_sub_815F930: beq ._126 @cond_branch cmp r2, #0 bne ._127 @cond_branch - ldr r4, ._129 + ldr r4, ._129 @ _nakamuraData3 ldrb r0, [r4] add r0, r0, #0x1 mov r1, #0x5 @@ -1140,8 +1140,8 @@ debug_sub_815F930: mov r2, #0xb mov r3, #0x2 bl Menu_BlankWindowRect - ldr r1, ._133 - ldr r0, ._133 + 4 + ldr r1, ._133 @ gMenuCallback + ldr r0, ._133 + 4 @ debug_sub_815FA38 str r0, [r1] b ._136 ._134: @@ -1170,7 +1170,7 @@ debug_sub_815F930: thumb_func_start debug_sub_815FA38 debug_sub_815FA38: push {r4, lr} - ldr r0, ._139 + ldr r0, ._139 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1201,7 +1201,7 @@ debug_sub_815FA38: lsr r2, r0, #0x10 cmp r2, #0 beq ._143 @cond_branch - ldr r1, ._146 + ldr r1, ._146 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0 bne ._144 @cond_branch @@ -1221,7 +1221,7 @@ debug_sub_815FA38: lsr r4, r0, #0x10 cmp r4, #0 beq ._149 @cond_branch - ldr r1, ._152 + ldr r1, ._152 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0x13 bne ._150 @cond_branch @@ -1243,30 +1243,30 @@ debug_sub_815FA38: and r0, r0, r1 cmp r0, #0 beq ._155 @cond_branch - ldr r1, ._159 + ldr r1, ._159 @ _nakamuraData0 ldrb r0, [r1] cmp r0, #0 beq ._161 @cond_branch - ldr r2, ._159 + 4 + ldr r2, ._159 + 4 @ gSaveBlock1 add r1, r0, #0 lsl r0, r1, #0x2 add r0, r0, r1 lsl r0, r0, #0x5 add r0, r0, r2 - ldr r1, ._159 + 8 + ldr r1, ._159 + 8 @ 0x1a08 add r0, r0, r1 ldrb r0, [r0] cmp r0, #0 beq ._161 @cond_branch bl Menu_GetCursorPos - ldr r1, ._159 + 12 + ldr r1, ._159 + 12 @ _nakamuraData1 strb r0, [r1] - ldr r0, ._159 + 16 + ldr r0, ._159 + 16 @ _nakamuraData2 strb r4, [r0] bl debug_sub_815F788 bl debug_sub_815F7B4 - ldr r1, ._159 + 20 - ldr r0, ._159 + 24 + ldr r1, ._159 + 20 @ gMenuCallback + ldr r0, ._159 + 24 @ debug_sub_815F930 str r0, [r1] b ._161 ._160: @@ -1297,13 +1297,13 @@ debug_sub_815FA38: debug_sub_815FB1C: push {lr} add sp, sp, #0xfffffff8 - ldr r0, ._162 + ldr r0, ._162 @ _nakamuraData0 mov r1, #0x0 strb r1, [r0] - ldr r0, ._162 + 4 + ldr r0, ._162 + 4 @ _nakamuraData3 strb r1, [r0] - ldr r1, ._162 + 8 - ldr r0, ._162 + 12 + ldr r1, ._162 + 8 @ gMenuCallback + ldr r0, ._162 + 12 @ debug_sub_815FA38 str r0, [r1] mov r0, #0x0 mov r1, #0x0 @@ -1342,7 +1342,7 @@ debug_sub_815FB1C: thumb_func_start debug_sub_815FB78 debug_sub_815FB78: push {lr} - ldr r0, ._166 + ldr r0, ._166 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1407,15 +1407,15 @@ debug_sub_815FB78: debug_sub_815FBE8: push {r4, lr} add sp, sp, #0xfffffff8 - ldr r1, ._178 - ldr r0, ._178 + 4 + ldr r1, ._178 @ gMenuCallback + ldr r0, ._178 + 4 @ debug_sub_815FB78 str r0, [r1] mov r0, #0x0 mov r1, #0x0 mov r2, #0x1d mov r3, #0x13 bl Menu_EraseWindowRect - ldr r4, ._178 + 8 + ldr r4, ._178 + 8 @ gStringVar1 add r0, r4, #0 bl debug_sub_814A73C mov r0, #0x0 @@ -1427,7 +1427,7 @@ debug_sub_815FBE8: mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._178 + 12 + ldr r0, ._178 + 12 @ Str_843E580 mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText @@ -1459,11 +1459,11 @@ debug_sub_815FBE8: debug_sub_815FC54: push {r4, r5, r6, r7, lr} mov r3, #0x0 - ldr r7, ._181 + ldr r7, ._181 @ gSaveBlock1 mov r6, #0xe8 lsl r6, r6, #0x3 - ldr r5, ._181 + 4 - ldr r4, ._181 + 8 + ldr r5, ._181 + 4 @ 0x3e7 + ldr r4, ._181 + 8 @ 0x742 ._180: lsl r1, r3, #0x2 add r1, r1, r7 @@ -1519,7 +1519,7 @@ debug_sub_815FCB4: lsl r4, r4, #0x18 lsr r4, r4, #0x18 mov r7, #0x0 - ldr r5, ._188 + ldr r5, ._188 @ gMapHeader ldr r0, [r5] ldr r0, [r0, #0x4] mov r1, #0x3 @@ -1543,7 +1543,7 @@ debug_sub_815FCB4: add r5, r6, #1 cmp r4, r0 bge ._184 @cond_branch - ldr r0, ._188 + ldr r0, ._188 @ gMapHeader mov r9, r0 ._186: add r0, r4, #7 @@ -1563,7 +1563,7 @@ debug_sub_815FCB4: add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 - ldr r0, ._188 + ldr r0, ._188 @ gMapHeader ldr r0, [r0] ldr r0, [r0] cmp r4, r0 @@ -1607,7 +1607,7 @@ debug_sub_815FD40: sub r0, r0, #0x7 strh r0, [r4] mov r5, #0x0 - ldr r1, ._192 + ldr r1, ._192 @ gMapHeader ldr r0, [r1] ldr r0, [r0, #0x4] add r7, r4, #0 @@ -1650,7 +1650,7 @@ debug_sub_815FD40: add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 - ldr r0, ._200 + ldr r0, ._200 @ gMapHeader ldr r0, [r0] ._191: ldr r0, [r0] @@ -1659,7 +1659,7 @@ debug_sub_815FD40: add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 - ldr r1, ._200 + ldr r1, ._200 @ gMapHeader ldr r0, [r1] ldr r0, [r0, #0x4] cmp r5, r0 @@ -1683,7 +1683,7 @@ debug_sub_815FD40: thumb_func_start debug_sub_815FDE4 debug_sub_815FDE4: push {lr} - ldr r0, ._205 + ldr r0, ._205 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -1727,11 +1727,11 @@ debug_sub_815FE1C: mov r2, #0x10 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._210 + ldr r0, ._210 @ Str_843E58D mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r6, ._210 + 4 + ldr r6, ._210 + 4 @ gStringVar1 mov r0, #0x0 bl debug_sub_815FCB4 add r1, r0, #0 @@ -1810,8 +1810,8 @@ debug_sub_815FE1C: mov r1, #0xb mov r2, #0x7 bl Menu_PrintText - ldr r0, ._210 + 8 - ldr r1, ._210 + 12 + ldr r0, ._210 + 8 @ gSaveBlock1 + ldr r1, ._210 + 12 @ 0x2dd6 add r0, r0, r1 ldrh r0, [r0] bl FeebasSeedRng @@ -1877,7 +1877,7 @@ debug_sub_815FE1C: ._208: cmp r5, #0x6 bne ._209 @cond_branch - ldr r4, ._210 + 4 + ldr r4, ._210 + 4 @ gStringVar1 bl debug_sub_815FD40 add r1, r0, #0 lsl r1, r1, #0x10 @@ -1890,8 +1890,8 @@ debug_sub_815FE1C: mov r1, #0x2 mov r2, #0x11 bl Menu_PrintText - ldr r1, ._210 + 16 - ldr r0, ._210 + 20 + ldr r1, ._210 + 16 @ gMenuCallback + ldr r0, ._210 + 20 @ debug_sub_815FDE4 str r0, [r1] mov r0, #0x0 pop {r4, r5, r6, r7} @@ -1924,18 +1924,18 @@ debug_sub_815FFDC: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._214 + ldr r0, ._214 @ Str_843E5D4 mov r1, #0x1 mov r2, #0xf bl Menu_PrintText mov r5, #0x0 - ldr r0, ._214 + 4 + ldr r0, ._214 + 4 @ _nakamuraStatic0 mov r8, r0 ._216: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._214 + 8 + ldr r0, ._214 + 8 @ gPlayerParty add r6, r1, r0 add r0, r6, #0 mov r1, #0xb @@ -1978,15 +1978,15 @@ debug_sub_815FFDC: lsr r5, r0, #0x18 cmp r5, #0x5 bls ._216 @cond_branch - ldr r1, ._217 + ldr r1, ._217 @ _nakamuraData4 mov r0, #0x0 strb r0, [r1] mov r0, #0xf mov r1, #0x1 mov r2, #0xff bl PrintTriangleCursorWithPalette - ldr r1, ._217 + 4 - ldr r0, ._217 + 8 + ldr r1, ._217 + 4 @ gMenuCallback + ldr r0, ._217 + 8 @ debug_sub_8160498 str r0, [r1] pop {r3} mov r8, r3 @@ -2008,14 +2008,14 @@ debug_sub_816009C: add r2, r0, #0 lsl r2, r2, #0x18 lsr r2, r2, #0x18 - ldr r1, ._219 + ldr r1, ._219 @ _nakamuraStatic0 lsl r0, r2, #0x2 add r0, r0, r1 mov r3, #0x0 ldsh r1, [r0, r3] mov r0, #0xb mul r0, r0, r1 - ldr r1, ._219 + 4 + ldr r1, ._219 + 4 @ gSpeciesNames add r0, r0, r1 lsl r2, r2, #0x1 add r2, r2, #0x1 @@ -2040,20 +2040,20 @@ debug_sub_81600D0: lsl r0, r0, #0x18 lsr r4, r0, #0x18 add r5, r4, #0 - ldr r1, ._223 + ldr r1, ._223 @ Str_843E5F0 mov r0, sp mov r2, #0x2 bl memcpy mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._223 + 4 + ldr r1, ._223 + 4 @ gPlayerParty add r0, r0, r1 bl GetMonGender lsl r0, r0, #0x18 lsr r0, r0, #0x18 cmp r0, #0 bne ._221 @cond_branch - ldr r0, ._223 + 8 + ldr r0, ._223 + 8 @ gOtherText_MaleSymbol2 b ._222 ._224: .align 2, 0 @@ -2064,7 +2064,7 @@ debug_sub_81600D0: ._221: cmp r0, #0xfe bne ._225 @cond_branch - ldr r0, ._227 + ldr r0, ._227 @ gOtherText_FemaleSymbolAndLv ._222: lsl r2, r4, #0x1 add r2, r2, #0x1 @@ -2099,8 +2099,8 @@ debug_sub_816013C: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r5, ._229 - ldr r1, ._229 + 4 + ldr r5, ._229 @ gStringVar1 + ldr r1, ._229 + 4 @ _nakamuraStatic0 lsl r0, r4, #0x2 add r0, r0, r1 mov r1, #0x2 @@ -2143,7 +2143,7 @@ debug_sub_816017C: mov r0, #0x10 mov r2, #0x1c bl Menu_BlankWindowRect - ldr r1, ._232 + ldr r1, ._232 @ _nakamuraStatic0 lsl r0, r4, #0x2 add r0, r0, r1 mov r1, #0x0 @@ -2177,7 +2177,7 @@ debug_sub_81601C8: lsr r5, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r1, ._239 + ldr r1, ._239 @ _nakamuraStatic0 lsl r0, r5, #0x2 add r2, r0, r1 mov r4, #0x0 @@ -2206,7 +2206,7 @@ debug_sub_81601C8: lsl r0, r0, #0x11 cmp r1, r0 ble ._237 @cond_branch - ldr r1, ._239 + 4 + ldr r1, ._239 + 4 @ 0xfffffe65 add r0, r2, r1 strh r0, [r4] ._237: @@ -2215,13 +2215,13 @@ debug_sub_81601C8: ldsh r0, [r4, r2] cmp r0, #0 bge ._238 @cond_branch - ldr r2, ._239 + 8 + ldr r2, ._239 + 8 @ 0x19b add r0, r1, r2 strh r0, [r4] ._238: mov r0, #0x64 mul r0, r0, r5 - ldr r1, ._239 + 12 + ldr r1, ._239 + 12 @ gPlayerParty add r0, r0, r1 ldrh r1, [r4] ldrb r2, [r4, #0x2] @@ -2252,7 +2252,7 @@ debug_sub_8160258: push {lr} lsl r0, r0, #0x18 lsr r2, r0, #0x18 - ldr r1, ._242 + ldr r1, ._242 @ _nakamuraStatic0 lsl r0, r2, #0x2 add r0, r0, r1 mov r1, #0x0 @@ -2279,7 +2279,7 @@ debug_sub_816027C: add r4, r0, #0 lsl r1, r1, #0x18 lsr r2, r1, #0x18 - ldr r1, ._247 + ldr r1, ._247 @ _nakamuraStatic0 lsl r0, r4, #0x2 add r3, r0, r1 mov r1, #0x0 @@ -2307,9 +2307,9 @@ debug_sub_816027C: ._246: mov r0, #0x64 mul r4, r4, r0 - ldr r0, ._247 + 4 + ldr r0, ._247 + 4 @ gPlayerParty add r4, r4, r0 - ldr r2, ._247 + 8 + ldr r2, ._247 + 8 @ gBaseStats mov r0, #0x0 ldsh r1, [r3, r0] lsl r0, r1, #0x3 @@ -2324,7 +2324,7 @@ debug_sub_816027C: mov r0, #0x2 ldrsb r0, [r3, r0] lsl r0, r0, #0x2 - ldr r1, ._247 + 12 + ldr r1, ._247 + 12 @ gExperienceTables add r0, r0, r1 add r2, r2, r0 add r0, r4, #0 @@ -2370,7 +2370,7 @@ debug_sub_8160308: mov r9, r0 mov r0, r9 mul r0, r0, r2 - ldr r7, ._254 + ldr r7, ._254 @ gPlayerParty add r6, r0, r7 ._251: add r0, r6, #0 @@ -2407,11 +2407,11 @@ debug_sub_8160308: cmp r2, #0x4 bls ._252 @cond_branch bl CalculatePlayerPartyCount - ldr r4, ._254 + 4 + ldr r4, ._254 + 4 @ gPlayerPartyCount ldrb r1, [r4] cmp r1, #0 bne ._253 @cond_branch - ldr r0, ._254 + ldr r0, ._254 @ gPlayerParty str r1, [sp] str r1, [sp, #0x4] str r1, [sp, #0x8] @@ -2445,7 +2445,7 @@ debug_sub_81603B8: lsr r6, r0, #0x18 mov r0, #0x5 bl PlaySE - ldr r7, ._259 + ldr r7, ._259 @ _nakamuraData4 ldrb r4, [r7] add r0, r4, #0 mov r1, #0x6 @@ -2457,7 +2457,7 @@ debug_sub_81603B8: bl __umodsi3 lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r0, ._259 + 4 + ldr r0, ._259 + 4 @ _843E5D1 add r0, r5, r0 ldrb r2, [r0] lsl r3, r4, #0x1 @@ -2489,7 +2489,7 @@ debug_sub_81603B8: ._258: strb r0, [r7] ._256: - ldr r1, ._264 + ldr r1, ._264 @ _nakamuraData4 cmp r6, #0x1 bne ._261 @cond_branch cmp r4, #0x5 @@ -2543,7 +2543,7 @@ debug_sub_81603B8: bl __umodsi3 add r1, r0, #0 lsl r1, r1, #0x18 - ldr r0, ._272 + ldr r0, ._272 @ _843E5D1 add r0, r5, r0 ldrb r0, [r0] lsr r1, r1, #0x17 @@ -2565,7 +2565,7 @@ debug_sub_81603B8: thumb_func_start debug_sub_8160498 debug_sub_8160498: push {r4, lr} - ldr r1, ._276 + ldr r1, ._276 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x40 and r0, r0, r2 @@ -2607,7 +2607,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._284 @cond_branch - ldr r4, ._289 + ldr r4, ._289 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._285 @cond_branch @@ -2649,7 +2649,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._291 @cond_branch - ldr r4, ._294 + ldr r4, ._294 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._304 @cond_branch @@ -2666,7 +2666,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._296 @cond_branch - ldr r4, ._301 + ldr r4, ._301 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._297 @cond_branch @@ -2709,7 +2709,7 @@ debug_sub_8160498: and r0, r0, r1 cmp r0, #0 beq ._303 @cond_branch - ldr r4, ._308 + ldr r4, ._308 @ _nakamuraData4 ldrb r0, [r4] cmp r0, #0x5 bhi ._304 @cond_branch @@ -2790,7 +2790,7 @@ debug_sub_816062C: mov r0, #0x64 mov r4, r8 mul r4, r4, r0 - ldr r0, ._316 + ldr r0, ._316 @ gPlayerParty add r4, r4, r0 add r0, r4, #0 mov r1, #0xb @@ -2801,7 +2801,7 @@ debug_sub_816062C: bl GetMonGender lsl r0, r0, #0x18 lsr r2, r0, #0x18 - ldr r1, ._316 + 4 + ldr r1, ._316 + 4 @ gBaseStats lsl r0, r7, #0x3 sub r0, r0, r7 lsl r0, r0, #0x2 @@ -2818,7 +2818,7 @@ debug_sub_816062C: mov r1, r8 mul r1, r1, r0 add r0, r1, #0 - ldr r1, ._316 + ldr r1, ._316 @ gPlayerParty add r0, r0, r1 bl GetMonGender lsl r0, r0, #0x18 @@ -2862,12 +2862,12 @@ debug_sub_816062C: mov r0, #0x64 mov r4, r8 mul r4, r4, r0 - ldr r0, ._323 + ldr r0, ._323 @ gPlayerParty add r4, r4, r0 add r0, r4, #0 mov r1, #0x42 bl GetMonData - ldr r0, ._323 + 4 + ldr r0, ._323 + 4 @ _nakamuraStatic0 add r0, r0, r9 ldrh r1, [r0] ldrb r2, [r0, #0x2] @@ -2978,7 +2978,7 @@ debug_sub_8160714: cmp r0, #0x31 ble ._334 @cond_branch ._333: - ldr r1, ._336 + ldr r1, ._336 @ ContestStatsText_GoldPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xe @@ -2990,7 +2990,7 @@ debug_sub_8160714: ._334: cmp r7, #0x4 bne ._338 @cond_branch - ldr r1, ._340 + ldr r1, ._340 @ ContestStatsText_WhitePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xd @@ -3026,7 +3026,7 @@ debug_sub_8160714: cmp r4, #0x4 bne ._346 @cond_branch ._345: - ldr r1, ._348 + ldr r1, ._348 @ ContestStatsText_BlackPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xc @@ -3038,7 +3038,7 @@ debug_sub_8160714: ._346: cmp r7, #0x3 bne ._350 @cond_branch - ldr r1, ._352 + ldr r1, ._352 @ ContestStatsText_GrayPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xb @@ -3091,7 +3091,7 @@ debug_sub_8160714: ._360: cmp r2, #0 bne ._361 @cond_branch - ldr r1, ._363 + ldr r1, ._363 @ ContestStatsText_PurplePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x6 @@ -3103,7 +3103,7 @@ debug_sub_8160714: ._361: cmp r2, #0x1 bne ._365 @cond_branch - ldr r1, ._367 + ldr r1, ._367 @ ContestStatsText_IndigoPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x7 @@ -3115,7 +3115,7 @@ debug_sub_8160714: ._365: cmp r2, #0x2 bne ._369 @cond_branch - ldr r1, ._371 + ldr r1, ._371 @ ContestStatsText_BrownPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x8 @@ -3127,7 +3127,7 @@ debug_sub_8160714: ._369: cmp r2, #0x3 bne ._373 @cond_branch - ldr r1, ._375 + ldr r1, ._375 @ ContestStatsText_LiteBluePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x9 @@ -3139,7 +3139,7 @@ debug_sub_8160714: ._373: cmp r2, #0x4 bne ._377 @cond_branch - ldr r1, ._379 + ldr r1, ._379 @ ContestStatsText_OlivePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0xa @@ -3160,7 +3160,7 @@ debug_sub_8160714: ldsh r0, [r0, r1] cmp r0, #0 beq ._383 @cond_branch - ldr r1, ._385 + ldr r1, ._385 @ ContestStatsText_RedPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x1 @@ -3174,7 +3174,7 @@ debug_sub_8160714: ldrh r0, [r0, #0x2] cmp r0, #0 beq ._387 @cond_branch - ldr r1, ._389 + ldr r1, ._389 @ ContestStatsText_BluePokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x2 @@ -3189,7 +3189,7 @@ debug_sub_8160714: ldsh r0, [r0, r4] cmp r0, #0 beq ._391 @cond_branch - ldr r1, ._393 + ldr r1, ._393 @ ContestStatsText_PinkPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x3 @@ -3204,7 +3204,7 @@ debug_sub_8160714: ldsh r0, [r0, r1] cmp r0, #0 beq ._395 @cond_branch - ldr r1, ._397 + ldr r1, ._397 @ ContestStatsText_GreenPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x4 @@ -3219,7 +3219,7 @@ debug_sub_8160714: ldsh r0, [r0, r4] cmp r0, #0 beq ._399 @cond_branch - ldr r1, ._401 + ldr r1, ._401 @ ContestStatsText_YellowPokeBlock add r0, r6, #0 bl StringCopy mov r0, #0x5 @@ -3229,7 +3229,7 @@ debug_sub_8160714: ._401: .word ContestStatsText_YellowPokeBlock ._399: - ldr r1, ._403 + ldr r1, ._403 @ gOtherText_FiveQuestions add r0, r6, #0 bl StringCopy mov r0, #0x0 @@ -3393,10 +3393,10 @@ debug_sub_8160A80: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r2, r0, #0 - ldr r1, ._422 + ldr r1, ._422 @ _nakamuraStatic18 cmp r0, #0 bne ._420 @cond_branch - ldr r4, ._422 + 4 + ldr r4, ._422 + 4 @ gStringVar1 ldrb r1, [r1, #0x1] add r0, r4, #0 bl debug_sub_816097C @@ -3413,7 +3413,7 @@ debug_sub_8160A80: ._420: cmp r0, #0x1 bne ._424 @cond_branch - ldr r4, ._426 + ldr r4, ._426 @ gStringVar1 ldrb r1, [r1, #0x2] add r0, r4, #0 bl debug_sub_816097C @@ -3429,7 +3429,7 @@ debug_sub_8160A80: ._424: cmp r0, #0x2 bne ._428 @cond_branch - ldr r4, ._430 + ldr r4, ._430 @ gStringVar1 ldrb r1, [r1, #0x3] add r0, r4, #0 bl debug_sub_816097C @@ -3445,7 +3445,7 @@ debug_sub_8160A80: ._428: cmp r0, #0x3 bne ._432 @cond_branch - ldr r4, ._434 + ldr r4, ._434 @ gStringVar1 ldrb r1, [r1, #0x4] add r0, r4, #0 bl debug_sub_816097C @@ -3461,7 +3461,7 @@ debug_sub_8160A80: ._432: cmp r0, #0x4 bne ._436 @cond_branch - ldr r4, ._438 + ldr r4, ._438 @ gStringVar1 ldrb r1, [r1, #0x5] add r0, r4, #0 bl debug_sub_816097C @@ -3477,7 +3477,7 @@ debug_sub_8160A80: ._436: cmp r2, #0x5 bne ._440 @cond_branch - ldr r4, ._441 + ldr r4, ._441 @ gStringVar1 ldrb r1, [r1, #0x6] add r0, r4, #0 bl debug_sub_816097C @@ -3505,7 +3505,7 @@ debug_sub_8160B50: lsl r1, r1, #0x18 lsr r1, r1, #0x18 add r4, r1, #0 - ldr r2, ._445 + ldr r2, ._445 @ _nakamuraStatic18 cmp r0, #0 bne ._443 @cond_branch ldrb r0, [r2, #0x1] @@ -3560,8 +3560,8 @@ debug_sub_8160B50: thumb_func_start debug_sub_8160BB0 debug_sub_8160BB0: push {r4, r5, lr} - ldr r5, ._456 - ldr r4, ._456 + 4 + ldr r5, ._456 @ gStringVar1 + ldr r4, ._456 + 4 @ _nakamuraStatic18 add r0, r5, #0 add r1, r4, #0 bl debug_sub_8160714 @@ -3596,27 +3596,27 @@ debug_sub_8160BE4: mov r3, #0xf bl Menu_DrawStdWindowFrame bl debug_sub_8160BB0 - ldr r0, ._459 + ldr r0, ._459 @ gContestStatsText_Spicy mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._459 + 4 + ldr r0, ._459 + 4 @ gContestStatsText_Dry mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._459 + 8 + ldr r0, ._459 + 8 @ gContestStatsText_Sweet mov r1, #0x2 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._459 + 12 + ldr r0, ._459 + 12 @ gContestStatsText_Bitter mov r1, #0x2 mov r2, #0x9 bl Menu_PrintText - ldr r0, ._459 + 16 + ldr r0, ._459 + 16 @ gContestStatsText_Sour mov r1, #0x2 mov r2, #0xb bl Menu_PrintText - ldr r0, ._459 + 20 + ldr r0, ._459 + 20 @ gContestStatsText_Tasty mov r1, #0x2 mov r2, #0xd bl Menu_PrintText @@ -3657,7 +3657,7 @@ debug_sub_8160BE4: thumb_func_start debug_sub_8160C7C debug_sub_8160C7C: push {r4, lr} - ldr r2, ._469 + ldr r2, ._469 @ _nakamuraStatic18 mov r1, #0x0 ldrb r0, [r2] cmp r0, #0xc @@ -3727,7 +3727,7 @@ debug_sub_8160C7C: thumb_func_start debug_sub_8160CF4 debug_sub_8160CF4: push {lr} - ldr r2, ._473 + ldr r2, ._473 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x40 and r0, r0, r1 @@ -3820,8 +3820,8 @@ debug_sub_8160D98: mov r3, #0x13 bl Menu_EraseWindowRect bl debug_sub_8160BE4 - ldr r1, ._485 - ldr r0, ._485 + 4 + ldr r1, ._485 @ gMenuCallback + ldr r0, ._485 + 4 @ debug_sub_8160CF4 str r0, [r1] mov r0, #0x0 pop {r1} @@ -3842,39 +3842,39 @@ debug_sub_8160DC0: mov r2, #0x16 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._487 + ldr r0, ._487 @ gOtherText_Slash mov r1, #0xb mov r2, #0x1 bl Menu_PrintText - ldr r0, ._487 + 4 + ldr r0, ._487 + 4 @ Str_843E5F2 mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._487 + 8 + ldr r0, ._487 + 8 @ Str_843E5FB mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._487 + 12 + ldr r0, ._487 + 12 @ Str_843E606 mov r1, #0x2 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._487 + 16 + ldr r0, ._487 + 16 @ Str_843E611 mov r1, #0x2 mov r2, #0x9 bl Menu_PrintText - ldr r0, ._487 + 20 + ldr r0, ._487 + 20 @ Str_843E61C mov r1, #0x2 mov r2, #0xb bl Menu_PrintText - ldr r0, ._487 + 24 + ldr r0, ._487 + 24 @ Str_843E627 mov r1, #0x2 mov r2, #0xd bl Menu_PrintText - ldr r0, ._487 + 28 + ldr r0, ._487 + 28 @ Str_843E637 mov r1, #0x2 mov r2, #0xf bl Menu_PrintText - ldr r0, ._487 + 32 + ldr r0, ._487 + 32 @ Str_843E632 mov r1, #0x2 mov r2, #0x11 bl Menu_PrintText @@ -3904,7 +3904,7 @@ debug_sub_8160E50: mov r2, #0xa mov r3, #0x2 bl Menu_BlankWindowRect - ldr r5, ._489 + ldr r5, ._489 @ gStringVar1 add r0, r6, #0 mov r1, #0x2 add r2, r5, #0 @@ -3923,7 +3923,7 @@ debug_sub_8160E50: bl GetMonData mov r1, #0xb mul r0, r0, r1 - ldr r1, ._489 + 4 + ldr r1, ._489 + 4 @ gSpeciesNames add r0, r0, r1 mov r1, #0xc mov r2, #0x1 @@ -4110,7 +4110,7 @@ debug_sub_8161028: neg r0, r0 cmp r1, r0 bne ._491 @cond_branch - ldr r0, ._496 + ldr r0, ._496 @ _nakamuraData5 ldrb r0, [r0] cmp r0, #0 bne ._492 @cond_branch @@ -4120,7 +4120,7 @@ debug_sub_8161028: asr r4, r0, #0x10 mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._496 + 4 + ldr r1, ._496 + 4 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -4132,7 +4132,7 @@ debug_sub_8161028: cmp r0, #0 bge ._494 @cond_branch ._492: - ldr r1, ._496 + ldr r1, ._496 @ _nakamuraData5 ldrb r0, [r1] add r0, r0, r6 strb r0, [r1] @@ -4145,7 +4145,7 @@ debug_sub_8161028: ._491: cmp r1, #0x1 bne ._506 @cond_branch - ldr r4, ._501 + ldr r4, ._501 @ _nakamuraData5 ldrb r0, [r4] add r0, r0, r6 strb r0, [r4] @@ -4160,7 +4160,7 @@ debug_sub_8161028: ._501: .word _nakamuraData5 ._493: - ldr r0, ._504 + ldr r0, ._504 @ _nakamuraData5 strb r5, [r0] b ._506 ._505: @@ -4171,7 +4171,7 @@ debug_sub_8161028: ldrb r1, [r4] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._507 + ldr r1, ._507 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -4193,7 +4193,7 @@ debug_sub_8161028: thumb_func_start debug_sub_81610BC debug_sub_81610BC: push {lr} - ldr r0, ._511 + ldr r0, ._511 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -4214,11 +4214,11 @@ debug_sub_81610BC: mov r0, #0x1 ._510: bl debug_sub_8161028 - ldr r0, ._515 + ldr r0, ._515 @ _nakamuraData5 ldrb r1, [r0] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._515 + 4 + ldr r1, ._515 + 4 @ gPlayerParty add r0, r0, r1 bl debug_sub_8160E50 mov r0, #0x0 @@ -4257,14 +4257,14 @@ DebugMenu_EffortValues: mov r2, #0x1d mov r3, #0x13 bl Menu_EraseWindowRect - ldr r1, ._519 + ldr r1, ._519 @ _nakamuraData5 mov r0, #0x0 strb r0, [r1] bl debug_sub_8160DC0 - ldr r0, ._519 + 4 + ldr r0, ._519 + 4 @ gPlayerParty bl debug_sub_8160E50 - ldr r1, ._519 + 8 - ldr r0, ._519 + 12 + ldr r1, ._519 + 8 @ gMenuCallback + ldr r0, ._519 + 12 @ debug_sub_81610BC str r0, [r1] mov r0, #0x0 pop {r1} @@ -4285,8 +4285,8 @@ debug_sub_8161160: mov r7, r8 push {r7} mov r7, #0x0 - ldr r2, ._523 - ldr r1, ._523 + 4 + ldr r2, ._523 @ _nakamuraData6 + ldr r1, ._523 + 4 @ _nakamuraData8 ldrh r0, [r2] ldrh r3, [r1] cmp r0, r3 @@ -4304,11 +4304,11 @@ debug_sub_8161160: ldrh r5, [r2] ._522: mov r4, #0x0 - ldr r0, ._529 + ldr r0, ._529 @ _nakamuraDataA ldrh r0, [r0] cmp r4, r0 bcs ._525 @cond_branch - ldr r0, ._529 + 4 + ldr r0, ._529 + 4 @ _nakamuraDataC mov r8, r0 ._528: bl Random @@ -4328,7 +4328,7 @@ debug_sub_8161160: lsr r7, r0, #0x10 ._527: add r4, r4, #0x1 - ldr r0, ._529 + ldr r0, ._529 @ _nakamuraDataA ldrh r0, [r0] cmp r4, r0 bcc ._528 @cond_branch @@ -4356,31 +4356,31 @@ debug_sub_81611D8: mov r2, #0xf mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._531 + ldr r0, ._531 @ Str_843E642 mov r1, #0x2 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._531 + 4 + ldr r0, ._531 + 4 @ Str_843E647 mov r1, #0x2 mov r2, #0x3 bl Menu_PrintText - ldr r0, ._531 + 8 + ldr r0, ._531 + 8 @ Str_843E65A mov r1, #0x2 mov r2, #0x5 bl Menu_PrintText - ldr r0, ._531 + 12 + ldr r0, ._531 + 12 @ Str_843E64C mov r1, #0x2 mov r2, #0x7 bl Menu_PrintText - ldr r0, ._531 + 16 + ldr r0, ._531 + 16 @ Str_843E651 mov r1, #0x2 mov r2, #0x9 bl Menu_PrintText - ldr r0, ._531 + 20 + ldr r0, ._531 + 20 @ Str_843E655 mov r1, #0xd mov r2, #0x9 bl Menu_PrintText - ldr r4, ._531 + 24 + ldr r4, ._531 + 24 @ Str_843E658 add r0, r4, #0 mov r1, #0xc mov r2, #0x1 @@ -4433,7 +4433,7 @@ debug_sub_8161290: add r1, r0, #0 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - ldr r4, ._533 + ldr r4, ._533 @ gStringVar1 add r0, r4, #0 mov r2, #0x1 mov r3, #0x5 @@ -4463,7 +4463,7 @@ debug_sub_81612B8: ldrh r2, [r0] add r1, r1, r2 strh r1, [r0] - ldr r5, ._535 + ldr r5, ._535 @ gStringVar1 ldrh r1, [r0] add r0, r5, #0 mov r2, #0x1 @@ -4486,7 +4486,7 @@ debug_sub_81612B8: thumb_func_start debug_sub_81612EC debug_sub_81612EC: push {r4, r5, lr} - ldr r2, ._540 + ldr r2, ._540 @ gMain ldrh r1, [r2, #0x2c] mov r0, #0x80 lsl r0, r0, #0x1 @@ -4529,28 +4529,28 @@ debug_sub_81612EC: asr r4, r0, #0x18 cmp r4, #0 bne ._545 @cond_branch - ldr r0, ._550 + ldr r0, ._550 @ _nakamuraData6 neg r1, r5 mov r2, #0x1 bl debug_sub_81612B8 ._545: cmp r4, #0x1 bne ._546 @cond_branch - ldr r0, ._550 + 4 + ldr r0, ._550 + 4 @ _nakamuraData8 neg r1, r5 mov r2, #0x3 bl debug_sub_81612B8 ._546: cmp r4, #0x2 bne ._547 @cond_branch - ldr r0, ._550 + 8 + ldr r0, ._550 + 8 @ _nakamuraDataC neg r1, r5 mov r2, #0x5 bl debug_sub_81612B8 ._547: cmp r4, #0x3 bne ._565 @cond_branch - ldr r0, ._550 + 12 + ldr r0, ._550 + 12 @ _nakamuraDataA neg r1, r5 mov r2, #0x7 bl debug_sub_81612B8 @@ -4572,28 +4572,28 @@ debug_sub_81612EC: asr r4, r0, #0x18 cmp r4, #0 bne ._553 @cond_branch - ldr r0, ._558 + ldr r0, ._558 @ _nakamuraData6 add r1, r5, #0 mov r2, #0x1 bl debug_sub_81612B8 ._553: cmp r4, #0x1 bne ._554 @cond_branch - ldr r0, ._558 + 4 + ldr r0, ._558 + 4 @ _nakamuraData8 add r1, r5, #0 mov r2, #0x3 bl debug_sub_81612B8 ._554: cmp r4, #0x2 bne ._555 @cond_branch - ldr r0, ._558 + 8 + ldr r0, ._558 + 8 @ _nakamuraDataC add r1, r5, #0 mov r2, #0x5 bl debug_sub_81612B8 ._555: cmp r4, #0x3 bne ._565 @cond_branch - ldr r0, ._558 + 12 + ldr r0, ._558 + 12 @ _nakamuraDataA add r1, r5, #0 mov r2, #0x7 bl debug_sub_81612B8 @@ -4611,7 +4611,7 @@ debug_sub_81612EC: and r0, r0, r1 cmp r0, #0 beq ._560 @cond_branch - ldr r0, ._563 + ldr r0, ._563 @ _nakamuraDataC ldrh r0, [r0] cmp r0, #0 beq ._565 @cond_branch @@ -4648,14 +4648,14 @@ debug_sub_81612EC: thumb_func_start DebugMenu_RandomNumberTest DebugMenu_RandomNumberTest: push {lr} - ldr r0, ._566 + ldr r0, ._566 @ _nakamuraData6 mov r1, #0x0 strh r1, [r0] - ldr r0, ._566 + 4 + ldr r0, ._566 + 4 @ _nakamuraData8 strh r1, [r0] - ldr r0, ._566 + 8 + ldr r0, ._566 + 8 @ _nakamuraDataC strh r1, [r0] - ldr r0, ._566 + 12 + ldr r0, ._566 + 12 @ _nakamuraDataA strh r1, [r0] mov r0, #0x0 mov r1, #0x0 @@ -4663,8 +4663,8 @@ DebugMenu_RandomNumberTest: mov r3, #0x13 bl Menu_EraseWindowRect bl debug_sub_81611D8 - ldr r1, ._566 + 16 - ldr r0, ._566 + 20 + ldr r1, ._566 + 16 @ gMenuCallback + ldr r0, ._566 + 20 @ debug_sub_81612EC str r0, [r1] mov r0, #0x0 pop {r1} diff --git a/asm/nohara_debug_menu.s b/asm/nohara_debug_menu.s index 88e6f1868..003f34798 100644 --- a/asm/nohara_debug_menu.s +++ b/asm/nohara_debug_menu.s @@ -15,7 +15,7 @@ InitNoharaDebugMenu: mov r2, #0x13 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._1 + ldr r3, ._1 @ gUnknown_Debug_083C4938 mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -29,8 +29,8 @@ InitNoharaDebugMenu: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._1 + 4 - ldr r0, ._1 + 8 + ldr r1, ._1 + 4 @ gMenuCallback + ldr r0, ._1 + 8 @ debug_sub_808F414 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -58,8 +58,8 @@ debug_sub_808F414: add r0, r0, #0x1 cmp r1, r0 beq ._4 @cond_branch - ldr r2, ._6 - ldr r0, ._6 + 4 + ldr r2, ._6 @ gMenuCallback + ldr r0, ._6 + 4 @ gUnknown_Debug_083C4938 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -86,7 +86,7 @@ debug_sub_808F414: NoharaDebugMenu_TV: push {lr} add sp, sp, #0xfffffff8 - ldr r1, ._8 + ldr r1, ._8 @ gDebug_03000726 mov r0, #0x0 strb r0, [r1] bl Menu_EraseScreen @@ -95,7 +95,7 @@ NoharaDebugMenu_TV: mov r2, #0xa mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._8 + 4 + ldr r3, ._8 + 4 @ gUnknown_Debug_083C4B8C mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -109,8 +109,8 @@ NoharaDebugMenu_TV: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._8 + 8 - ldr r0, ._8 + 12 + ldr r1, ._8 + 8 @ gMenuCallback + ldr r0, ._8 + 12 @ debug_sub_808F4AC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -139,8 +139,8 @@ debug_sub_808F4AC: add r0, r0, #0x1 cmp r1, r0 beq ._11 @cond_branch - ldr r2, ._13 - ldr r0, ._13 + 4 + ldr r2, ._13 @ gMenuCallback + ldr r0, ._13 + 4 @ gUnknown_Debug_083C4B8C lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -167,14 +167,14 @@ debug_sub_808F4AC: debug_sub_808F4EC: push {lr} bl debug_sub_808F6BC - ldr r0, ._15 + ldr r0, ._15 @ gUnknown_Debug_083C4980 bl sub_8071F40 mov r0, #0x3 mov r1, #0x3 mov r2, #0x1 bl DisplayYesNoMenu - ldr r1, ._15 + 4 - ldr r0, ._15 + 8 + ldr r1, ._15 + 4 @ gMenuCallback + ldr r0, ._15 + 8 @ debug_sub_808F648 str r0, [r1] pop {r0} bx r0 @@ -191,8 +191,8 @@ debug_sub_808F4EC: debug_sub_808F518: push {r4, lr} mov r2, #0x0 - ldr r4, ._20 - ldr r3, ._20 + 4 + ldr r4, ._20 @ gSaveBlock1 + ldr r3, ._20 + 4 @ 0x2738 ._19: lsl r0, r2, #0x3 add r0, r0, r2 @@ -205,7 +205,7 @@ debug_sub_808F518: lsr r0, r0, #0x18 cmp r0, #0x13 bhi ._18 @cond_branch - ldr r0, ._20 + 8 + ldr r0, ._20 + 8 @ 0x2739 add r1, r1, r0 ldrb r0, [r1] cmp r0, #0 @@ -234,8 +234,8 @@ debug_sub_808F518: debug_sub_808F560: push {r4, lr} mov r1, #0x0 - ldr r4, ._23 - ldr r3, ._23 + 4 + ldr r4, ._23 @ gSaveBlock1 + ldr r3, ._23 + 4 @ 0x2739 mov r2, #0x0 ._22: lsl r0, r1, #0x3 @@ -266,9 +266,9 @@ debug_sub_808F560: debug_sub_808F594: push {r4, r5, r6, lr} mov r2, #0x0 - ldr r6, ._27 - ldr r5, ._27 + 4 - ldr r4, ._27 + 8 + ldr r6, ._27 @ gSaveBlock1 + ldr r5, ._27 + 4 @ 0x2738 + ldr r4, ._27 + 8 @ 0x2739 mov r3, #0x1 ._26: lsl r0, r2, #0x3 @@ -307,12 +307,12 @@ debug_sub_808F5D8: mov r7, r8 push {r7} mov r4, #0x0 - ldr r6, ._30 - ldr r7, ._30 + 4 + ldr r6, ._30 @ gStringVar1 + ldr r7, ._30 + 4 @ gUnknown_Debug_083C4BD4 add r0, r7, #1 mov r8, r0 ._29: - ldr r5, ._30 + 8 + ldr r5, ._30 + 8 @ gSpecialVar_0x8004 strh r4, [r5] bl GetSlotMachineId add r1, r0, #0 @@ -338,8 +338,8 @@ debug_sub_808F5D8: bls ._29 @cond_branch mov r0, #0x0 strh r0, [r5] - ldr r1, ._30 + 12 - ldr r0, ._30 + 16 + ldr r1, ._30 + 12 @ gMenuCallback + ldr r0, ._30 + 16 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r3} @@ -361,7 +361,7 @@ debug_sub_808F5D8: thumb_func_start debug_sub_808F648 debug_sub_808F648: push {lr} - ldr r0, ._35 + ldr r0, ._35 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -372,7 +372,7 @@ debug_sub_808F648: mov r2, #0x1d mov r3, #0xd bl Menu_EraseWindowRect - ldr r0, ._35 + 4 + ldr r0, ._35 + 4 @ gDebug_03000726 ldrb r1, [r0] mov r2, #0x1 eor r1, r1, r2 @@ -425,14 +425,14 @@ debug_sub_808F648: debug_sub_808F6BC: push {r4, r5, r6, lr} mov r4, #0x0 - ldr r5, ._48 - ldr r6, ._48 + 4 + ldr r5, ._48 @ gStringVar1 + ldr r6, ._48 + 4 @ gSaveBlock1 ._45: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._48 + 8 + ldr r1, ._48 + 8 @ 0x2738 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -453,14 +453,14 @@ debug_sub_808F6BC: cmp r4, #0x4 bls ._45 @cond_branch mov r4, #0x5 - ldr r5, ._48 - ldr r6, ._48 + 4 + ldr r5, ._48 @ gStringVar1 + ldr r6, ._48 + 4 @ gSaveBlock1 ._50: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._48 + 8 + ldr r1, ._48 + 8 @ 0x2738 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -497,12 +497,12 @@ debug_sub_808F6BC: cmp r4, #0x17 bls ._50 @cond_branch mov r4, #0x0 - ldr r5, ._53 + ldr r5, ._53 @ gStringVar1 ._55: - ldr r0, ._53 + 4 + ldr r0, ._53 + 4 @ gSaveBlock1 lsl r1, r4, #0x2 add r1, r1, r0 - ldr r0, ._53 + 8 + ldr r0, ._53 + 8 @ 0x2abc add r1, r1, r0 ldrb r1, [r1] add r0, r5, #0 @@ -551,14 +551,14 @@ debug_sub_808F6BC: debug_sub_808F7B4: push {r4, r5, r6, lr} mov r4, #0x0 - ldr r5, ._59 - ldr r6, ._59 + 4 + ldr r5, ._59 @ gStringVar1 + ldr r6, ._59 + 4 @ gSaveBlock1 ._56: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._59 + 8 + ldr r1, ._59 + 8 @ 0x2739 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -579,14 +579,14 @@ debug_sub_808F7B4: cmp r4, #0x4 bls ._56 @cond_branch mov r4, #0x5 - ldr r5, ._59 - ldr r6, ._59 + 4 + ldr r5, ._59 @ gStringVar1 + ldr r6, ._59 + 4 @ gSaveBlock1 ._61: lsl r0, r4, #0x3 add r0, r0, r4 lsl r0, r0, #0x2 add r0, r0, r6 - ldr r1, ._59 + 8 + ldr r1, ._59 + 8 @ 0x2739 add r0, r0, r1 ldrb r1, [r0] add r0, r5, #0 @@ -623,12 +623,12 @@ debug_sub_808F7B4: cmp r4, #0x17 bls ._61 @cond_branch mov r4, #0x0 - ldr r5, ._64 + ldr r5, ._64 @ gStringVar1 ._66: - ldr r0, ._64 + 4 + ldr r0, ._64 + 4 @ gSaveBlock1 lsl r1, r4, #0x2 add r1, r1, r0 - ldr r0, ._64 + 8 + ldr r0, ._64 + 8 @ 0x2abd add r1, r1, r0 ldrb r1, [r1] add r0, r5, #0 @@ -676,9 +676,9 @@ debug_sub_808F7B4: thumb_func_start debug_sub_808F8AC debug_sub_808F8AC: push {lr} - ldr r0, ._67 + ldr r0, ._67 @ 0x832 bl FlagSet - ldr r0, ._67 + 4 + ldr r0, ._67 + 4 @ 0x818 bl FlagSet bl CloseMenu mov r0, #0x1 @@ -695,17 +695,17 @@ debug_sub_808F8AC: thumb_func_start debug_sub_808F8CC debug_sub_808F8CC: push {r4, lr} - ldr r1, ._69 + ldr r1, ._69 @ gDebug_03000724 mov r0, #0x0 strb r0, [r1] - ldr r0, ._69 + 4 + ldr r0, ._69 + 4 @ gUnknown_Debug_083C49CA bl sub_8071F40 mov r0, #0xd mov r1, #0x6 mov r2, #0x1a mov r3, #0x8 bl Menu_BlankWindowRect - ldr r0, ._69 + 8 + ldr r0, ._69 + 8 @ gUnknown_Debug_083C4ABD ldr r0, [r0] mov r1, #0xe mov r2, #0x7 @@ -715,7 +715,7 @@ debug_sub_808F8CC: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._69 + 12 + ldr r4, ._69 + 12 @ gStringVar1 add r0, r4, #0 mov r1, #0x0 mov r2, #0x0 @@ -725,8 +725,8 @@ debug_sub_808F8CC: mov r1, #0x17 mov r2, #0x1 bl Menu_PrintText - ldr r1, ._69 + 16 - ldr r0, ._69 + 20 + ldr r1, ._69 + 16 @ gMenuCallback + ldr r0, ._69 + 20 @ debug_sub_808F93C str r0, [r1] pop {r4} pop {r0} @@ -747,13 +747,13 @@ debug_sub_808F8CC: debug_sub_808F93C: push {r4, lr} mov r2, #0x0 - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 cmp r0, #0 beq ._71 @cond_branch - ldr r1, ._83 + 4 + ldr r1, ._83 + 4 @ gDebug_03000725 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -767,13 +767,13 @@ debug_sub_808F93C: bl PlaySE mov r2, #0x1 ._71: - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 and r0, r0, r1 cmp r0, #0 beq ._73 @cond_branch - ldr r1, ._83 + 4 + ldr r1, ._83 + 4 @ gDebug_03000725 ldrb r0, [r1] cmp r0, #0 bne ._74 @cond_branch @@ -787,13 +787,13 @@ debug_sub_808F93C: bl PlaySE mov r2, #0x1 ._73: - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x10 and r0, r0, r1 cmp r0, #0 beq ._75 @cond_branch - ldr r1, ._83 + 8 + ldr r1, ._83 + 8 @ gDebug_03000724 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -808,13 +808,13 @@ debug_sub_808F93C: bl PlaySE mov r2, #0x1 ._75: - ldr r0, ._83 + ldr r0, ._83 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._77 @cond_branch - ldr r1, ._83 + 8 + ldr r1, ._83 + 8 @ gDebug_03000724 ldrb r0, [r1] cmp r0, #0 bne ._78 @cond_branch @@ -835,8 +835,8 @@ debug_sub_808F93C: mov r2, #0x1a mov r3, #0x8 bl Menu_BlankWindowRect - ldr r1, ._83 + 12 - ldr r0, ._83 + 8 + ldr r1, ._83 + 12 @ gUnknown_Debug_083C4ABD + ldr r0, ._83 + 8 @ gDebug_03000724 ldrb r0, [r0] lsl r0, r0, #0x2 add r0, r0, r1 @@ -849,8 +849,8 @@ debug_sub_808F93C: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._83 + 16 - ldr r0, ._83 + 4 + ldr r4, ._83 + 16 @ gStringVar1 + ldr r0, ._83 + 4 @ gDebug_03000725 ldrb r1, [r0] add r0, r4, #0 mov r2, #0x0 @@ -861,7 +861,7 @@ debug_sub_808F93C: mov r2, #0x1 bl Menu_PrintText ._79: - ldr r4, ._83 + ldr r4, ._83 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -869,10 +869,10 @@ debug_sub_808F93C: beq ._80 @cond_branch mov r0, #0x15 bl PlaySE - ldr r0, ._83 + 4 + ldr r0, ._83 + 4 @ gDebug_03000725 ldrb r0, [r0] - ldr r2, ._83 + 20 - ldr r1, ._83 + 8 + ldr r2, ._83 + 20 @ gUnknown_Debug_083C4ABD + ldr r1, ._83 + 8 @ gDebug_03000724 ldrb r1, [r1] add r1, r1, r2 ldrb r1, [r1] @@ -895,7 +895,7 @@ debug_sub_808F93C: .word gStringVar1 .word gUnknown_Debug_083C4ABD ._81: - ldr r0, ._85 + ldr r0, ._85 @ gSaveBlock1 bl sub_80BF588 bl CloseMenu mov r0, #0x1 @@ -925,20 +925,20 @@ debug_sub_808FA88: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r9, r0 - ldr r3, ._92 + ldr r3, ._92 @ gSaveBlock1 lsl r4, r6, #0x3 add r2, r4, r6 lsl r2, r2, #0x2 add r0, r2, r3 - ldr r5, ._92 + 4 + ldr r5, ._92 + 4 @ 0x2738 add r1, r0, r5 strb r7, [r1] - ldr r1, ._92 + 8 + ldr r1, ._92 + 8 @ 0x2739 add r0, r0, r1 mov r1, #0x1 strb r1, [r0] mov r1, #0x0 - ldr r0, ._92 + 12 + ldr r0, ._92 + 12 @ 0x273a add r5, r3, r0 mov r3, #0x1 ._87: @@ -975,7 +975,7 @@ debug_sub_808FA88: ._90: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._96 + ldr r1, ._96 @ gSaveBlock1 add r0, r0, r1 bl sub_80BE160 b ._95 @@ -986,7 +986,7 @@ debug_sub_808FA88: ._88: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._100 + ldr r1, ._100 @ gSaveBlock1 add r0, r0, r1 bl sub_80BE138 ._95: @@ -996,7 +996,7 @@ debug_sub_808FA88: b ._173 ._98: lsl r0, r0, #0x2 - ldr r1, ._100 + 4 + ldr r1, ._100 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -1050,13 +1050,13 @@ debug_sub_808FA88: ._104: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._145 + ldr r1, ._145 @ gSaveBlock1 add r4, r0, r1 mov r2, #0x1 strh r2, [r4, #0x2] add r1, r1, #0x10 add r0, r0, r1 - ldr r1, ._145 + 4 + ldr r1, ._145 + 4 @ gSaveBlock2 bl StringCopy mov r0, #0x5 strb r0, [r4, #0x18] @@ -1069,19 +1069,19 @@ debug_sub_808FA88: ._105: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r6, ._148 + ldr r6, ._148 @ gSaveBlock1 add r1, r4, r6 mov r8, r1 mov r0, #0x1 strh r0, [r1, #0x2] add r0, r6, #5 add r0, r4, r0 - ldr r1, ._148 + 4 + ldr r1, ._148 + 4 @ gSaveBlock2 bl StringCopy mov r0, #0x64 mov r5, r9 mul r5, r5, r0 - ldr r0, ._148 + 8 + ldr r0, ._148 + 8 @ gPlayerParty add r5, r5, r0 add r6, r6, #0x10 add r4, r4, r6 @@ -1109,14 +1109,14 @@ debug_sub_808FA88: mov r1, r9 mul r1, r1, r0 mov r8, r1 - ldr r0, ._151 + ldr r0, ._151 @ gPlayerParty add r8, r8, r0 mov r0, r8 mov r1, #0xb bl GetMonData add r4, r4, r6 lsl r4, r4, #0x2 - ldr r5, ._151 + 4 + ldr r5, ._151 + 4 @ gSaveBlock1 add r6, r4, r5 strh r0, [r6, #0x2] mov r0, #0x1 @@ -1124,7 +1124,7 @@ debug_sub_808FA88: add r0, r5, #0 add r0, r0, #0xf add r0, r4, r0 - ldr r1, ._151 + 8 + ldr r1, ._151 + 8 @ gSaveBlock2 bl StringCopy add r5, r5, #0x4 add r4, r4, r5 @@ -1148,7 +1148,7 @@ debug_sub_808FA88: ._108: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r6, ._154 + ldr r6, ._154 @ gSaveBlock1 add r5, r4, r6 mov r8, r5 mov r0, #0x1 @@ -1156,12 +1156,12 @@ debug_sub_808FA88: add r0, r6, #0 add r0, r0, #0x16 add r0, r4, r0 - ldr r1, ._154 + 4 + ldr r1, ._154 + 4 @ gSaveBlock2 bl StringCopy mov r0, #0x64 mov r5, r9 mul r5, r5, r0 - ldr r0, ._154 + 8 + ldr r0, ._154 + 8 @ gPlayerParty add r5, r5, r0 add r6, r6, #0x8 add r4, r4, r6 @@ -1187,14 +1187,14 @@ debug_sub_808FA88: ._109: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r5, ._157 + ldr r5, ._157 @ gSaveBlock1 add r6, r4, r5 mov r0, #0x1 strh r0, [r6, #0xa] strh r0, [r6, #0x14] add r0, r5, #2 add r0, r4, r0 - ldr r1, ._157 + 4 + ldr r1, ._157 + 4 @ gSaveBlock2 mov r8, r1 bl StringCopy add r5, r5, #0xc @@ -1213,7 +1213,7 @@ debug_sub_808FA88: ._143: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._160 + ldr r1, ._160 @ gSaveBlock1 add r0, r0, r1 mov r1, #0x1 strh r1, [r0, #0xc] @@ -1226,14 +1226,14 @@ debug_sub_808FA88: ._123: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._163 + ldr r0, ._163 @ gSaveBlock1 add r4, r4, r0 - ldr r1, ._163 + 4 + ldr r1, ._163 + 4 @ gUnknown_Debug_083C4C64 mov r0, sp mov r2, #0x8 bl memcpy add r5, sp, #0x8 - ldr r1, ._163 + 8 + ldr r1, ._163 + 8 @ gUnknown_Debug_083C4C6C add r0, r5, #0 mov r2, #0xb bl memcpy @@ -1263,10 +1263,10 @@ debug_sub_808FA88: ._124: add r0, r4, r6 lsl r0, r0, #0x2 - ldr r1, ._168 + ldr r1, ._168 @ gSaveBlock1 add r5, r0, r1 add r4, sp, #0x14 - ldr r1, ._168 + 4 + ldr r1, ._168 + 4 @ gUnknown_Debug_083C4C64 add r0, r4, #0 mov r2, #0x8 bl memcpy @@ -1308,10 +1308,10 @@ debug_sub_808FA88: ._125: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._171 + ldr r0, ._171 @ gSaveBlock1 add r4, r4, r0 add r5, sp, #0x1c - ldr r1, ._171 + 4 + ldr r1, ._171 + 4 @ gUnknown_Debug_083C4C64 add r0, r5, #0 mov r2, #0x8 bl memcpy @@ -1339,10 +1339,10 @@ debug_sub_808FA88: ._126: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._174 + ldr r0, ._174 @ gSaveBlock1 add r4, r4, r0 add r5, sp, #0x24 - ldr r1, ._174 + 4 + ldr r1, ._174 + 4 @ gUnknown_Debug_083C4C64 add r0, r5, #0 mov r2, #0x8 bl memcpy @@ -1367,14 +1367,14 @@ debug_sub_808FA88: ._127: add r4, r4, r6 lsl r4, r4, #0x2 - ldr r0, ._176 + ldr r0, ._176 @ gSaveBlock1 add r4, r4, r0 add r5, sp, #0x2c - ldr r1, ._176 + 4 + ldr r1, ._176 + 4 @ gUnknown_Debug_083C4C64 add r0, r5, #0 mov r2, #0x8 bl memcpy - ldr r0, ._176 + 8 + ldr r0, ._176 + 8 @ 0xffff strh r0, [r4, #0x2] mov r0, #0x1 neg r0, r0 @@ -1421,17 +1421,17 @@ debug_sub_808FEBC: thumb_func_start debug_sub_808FECC debug_sub_808FECC: push {r4, lr} - ldr r1, ._178 + ldr r1, ._178 @ gDebug_03000724 mov r0, #0x0 strb r0, [r1] - ldr r0, ._178 + 4 + ldr r0, ._178 + 4 @ gUnknown_Debug_083C49CA bl sub_8071F40 mov r0, #0xd mov r1, #0x6 mov r2, #0x17 mov r3, #0x8 bl Menu_BlankWindowRect - ldr r0, ._178 + 8 + ldr r0, ._178 + 8 @ gUnknown_Debug_083C4B20 ldr r0, [r0] mov r1, #0xe mov r2, #0x7 @@ -1441,7 +1441,7 @@ debug_sub_808FECC: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._178 + 12 + ldr r4, ._178 + 12 @ gStringVar1 add r0, r4, #0 mov r1, #0x0 mov r2, #0x0 @@ -1451,8 +1451,8 @@ debug_sub_808FECC: mov r1, #0x17 mov r2, #0x1 bl Menu_PrintText - ldr r1, ._178 + 16 - ldr r0, ._178 + 20 + ldr r1, ._178 + 16 @ gMenuCallback + ldr r0, ._178 + 20 @ debug_sub_808FF3C str r0, [r1] pop {r4} pop {r0} @@ -1473,13 +1473,13 @@ debug_sub_808FECC: debug_sub_808FF3C: push {r4, lr} mov r2, #0x0 - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x40 and r0, r0, r1 cmp r0, #0 beq ._180 @cond_branch - ldr r1, ._192 + 4 + ldr r1, ._192 + 4 @ gDebug_03000725 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -1493,13 +1493,13 @@ debug_sub_808FF3C: bl PlaySE mov r2, #0x1 ._180: - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 and r0, r0, r1 cmp r0, #0 beq ._182 @cond_branch - ldr r1, ._192 + 4 + ldr r1, ._192 + 4 @ gDebug_03000725 ldrb r0, [r1] cmp r0, #0 bne ._183 @cond_branch @@ -1513,13 +1513,13 @@ debug_sub_808FF3C: bl PlaySE mov r2, #0x1 ._182: - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x10 and r0, r0, r1 cmp r0, #0 beq ._184 @cond_branch - ldr r1, ._192 + 8 + ldr r1, ._192 + 8 @ gDebug_03000724 ldrb r0, [r1] add r0, r0, #0x1 strb r0, [r1] @@ -1534,13 +1534,13 @@ debug_sub_808FF3C: bl PlaySE mov r2, #0x1 ._184: - ldr r0, ._192 + ldr r0, ._192 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._186 @cond_branch - ldr r1, ._192 + 8 + ldr r1, ._192 + 8 @ gDebug_03000724 ldrb r0, [r1] cmp r0, #0 bne ._187 @cond_branch @@ -1561,8 +1561,8 @@ debug_sub_808FF3C: mov r2, #0x17 mov r3, #0x8 bl Menu_BlankWindowRect - ldr r1, ._192 + 12 - ldr r0, ._192 + 8 + ldr r1, ._192 + 12 @ gUnknown_Debug_083C4B20 + ldr r0, ._192 + 8 @ gDebug_03000724 ldrb r0, [r0] lsl r0, r0, #0x2 add r0, r0, r1 @@ -1575,8 +1575,8 @@ debug_sub_808FF3C: mov r2, #0x18 mov r3, #0x2 bl Menu_BlankWindowRect - ldr r4, ._192 + 16 - ldr r0, ._192 + 4 + ldr r4, ._192 + 16 @ gStringVar1 + ldr r0, ._192 + 4 @ gDebug_03000725 ldrb r1, [r0] add r0, r4, #0 mov r2, #0x0 @@ -1587,7 +1587,7 @@ debug_sub_808FF3C: mov r2, #0x1 bl Menu_PrintText ._188: - ldr r4, ._192 + ldr r4, ._192 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -1595,10 +1595,10 @@ debug_sub_808FF3C: beq ._189 @cond_branch mov r0, #0x15 bl PlaySE - ldr r0, ._192 + 4 + ldr r0, ._192 + 4 @ gDebug_03000725 ldrb r0, [r0] - ldr r2, ._192 + 20 - ldr r1, ._192 + 8 + ldr r2, ._192 + 20 @ gUnknown_Debug_083C4B20 + ldr r1, ._192 + 8 @ gDebug_03000724 ldrb r1, [r1] add r1, r1, r2 ldrb r1, [r1] @@ -1634,13 +1634,13 @@ debug_sub_808FF3C: thumb_func_start debug_sub_8090080 debug_sub_8090080: lsl r0, r0, #0x18 - ldr r2, ._194 + ldr r2, ._194 @ gSaveBlock1 lsr r0, r0, #0x16 add r0, r0, r2 - ldr r3, ._194 + 4 + ldr r3, ._194 + 4 @ 0x2abc add r2, r0, r3 strb r1, [r2] - ldr r1, ._194 + 8 + ldr r1, ._194 + 8 @ 0x2abd add r2, r0, r1 mov r1, #0x1 strb r1, [r2] @@ -1665,7 +1665,7 @@ debug_sub_80900AC: push {r7} mov r7, #0x0 mov r5, #0x0 - ldr r0, ._202 + ldr r0, ._202 @ gSaveBlock1 mov r8, r0 ._198: lsl r0, r5, #0x3 @@ -1673,7 +1673,7 @@ debug_sub_80900AC: lsl r0, r0, #0x2 mov r1, r8 add r6, r0, r1 - ldr r1, ._202 + 4 + ldr r1, ._202 + 4 @ 0x2738 add r0, r6, r1 ldrb r4, [r0] cmp r4, #0 @@ -1682,12 +1682,12 @@ debug_sub_80900AC: bne ._197 @cond_branch mov r7, #0x0 ._197: - ldr r0, ._202 + 8 + ldr r0, ._202 + 8 @ gUnknown_Debug_083C4ABD add r0, r7, r0 ldrb r1, [r0] add r0, r5, #0 bl debug_sub_808FA88 - ldr r1, ._202 + 12 + ldr r1, ._202 + 12 @ 0x2739 add r0, r6, r1 strb r4, [r0] add r0, r7, #1 @@ -1702,10 +1702,10 @@ debug_sub_80900AC: mov r7, #0x0 mov r5, #0x0 ._201: - ldr r0, ._202 + ldr r0, ._202 @ gSaveBlock1 lsl r1, r5, #0x2 add r1, r1, r0 - ldr r0, ._202 + 16 + ldr r0, ._202 + 16 @ 0x2abc add r1, r1, r0 ldrb r0, [r1] cmp r0, #0 @@ -1714,7 +1714,7 @@ debug_sub_80900AC: bne ._200 @cond_branch mov r7, #0x0 ._200: - ldr r0, ._202 + 20 + ldr r0, ._202 + 20 @ gUnknown_Debug_083C4B20 add r0, r7, r0 ldrb r1, [r0] add r0, r5, #0 @@ -1757,7 +1757,7 @@ NoharaDebugMenu_Fan: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._204 + ldr r3, ._204 @ gUnknown_Debug_083C4D28 mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -1771,8 +1771,8 @@ NoharaDebugMenu_Fan: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._204 + 4 - ldr r0, ._204 + 8 + ldr r1, ._204 + 4 @ gMenuCallback + ldr r0, ._204 + 8 @ debug_sub_80901A4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1800,8 +1800,8 @@ debug_sub_80901A4: add r0, r0, #0x1 cmp r1, r0 beq ._207 @cond_branch - ldr r2, ._209 - ldr r0, ._209 + 4 + ldr r2, ._209 @ gMenuCallback + ldr r0, ._209 + 4 @ gUnknown_Debug_083C4D28 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1842,8 +1842,8 @@ debug_sub_80901F8: bl sub_810FB9C lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._211 - ldr r1, ._211 + 4 + ldr r2, ._211 @ gUnknown_Debug_083C4CA8 + ldr r1, ._211 + 4 @ gUnknown_083F8408 add r0, r0, r1 ldrb r0, [r0] sub r0, r0, #0x8 @@ -1853,8 +1853,8 @@ debug_sub_80901F8: mov r1, #0xe mov r2, #0x7 bl Menu_PrintText - ldr r1, ._211 + 8 - ldr r0, ._211 + 12 + ldr r1, ._211 + 8 @ gMenuCallback + ldr r0, ._211 + 12 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r1} @@ -1875,8 +1875,8 @@ debug_sub_8090238: bl sub_810FC18 lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._213 - ldr r1, ._213 + 4 + ldr r2, ._213 @ gUnknown_Debug_083C4CA8 + ldr r1, ._213 + 4 @ gUnknown_083F8410 add r0, r0, r1 ldrb r0, [r0] sub r0, r0, #0x8 @@ -1886,8 +1886,8 @@ debug_sub_8090238: mov r1, #0xe mov r2, #0x7 bl Menu_PrintText - ldr r1, ._213 + 8 - ldr r0, ._213 + 12 + ldr r1, ._213 + 8 @ gMenuCallback + ldr r0, ._213 + 12 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r1} @@ -1905,7 +1905,7 @@ debug_sub_8090238: thumb_func_start debug_sub_8090278 debug_sub_8090278: push {lr} - ldr r0, ._217 + ldr r0, ._217 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x1 and r0, r0, r1 @@ -1929,9 +1929,9 @@ debug_sub_8090278: thumb_func_start debug_sub_809029C debug_sub_809029C: push {r4, lr} - ldr r4, ._219 - ldr r0, ._219 + 4 - ldr r1, ._219 + 8 + ldr r4, ._219 @ gStringVar1 + ldr r0, ._219 + 4 @ gSaveBlock1 + ldr r1, ._219 + 8 @ 0x13c2 add r0, r0, r1 ldrh r0, [r0] mov r1, #0x7f @@ -1944,8 +1944,8 @@ debug_sub_809029C: mov r1, #0x10 mov r2, #0x7 bl Menu_PrintText - ldr r1, ._219 + 12 - ldr r0, ._219 + 16 + ldr r1, ._219 + 12 @ gMenuCallback + ldr r0, ._219 + 16 @ debug_sub_8090278 str r0, [r1] mov r0, #0x0 pop {r4} @@ -1965,7 +1965,7 @@ debug_sub_809029C: thumb_func_start debug_sub_80902E4 debug_sub_80902E4: push {lr} - ldr r1, ._221 + ldr r1, ._221 @ gSaveBlock2 ldrh r0, [r1, #0xe] add r0, r0, #0x6 strh r0, [r1, #0xe] @@ -2031,7 +2031,7 @@ debug_sub_8090338: thumb_func_start NoharaDebugMenu_BattleVSDad NoharaDebugMenu_BattleVSDad: push {lr} - ldr r0, ._223 + ldr r0, ._223 @ 0x4085 mov r1, #0x6 bl VarSet bl CloseMenu @@ -2048,7 +2048,7 @@ NoharaDebugMenu_BattleVSDad: thumb_func_start NoharaDebugMenu_DadAfterBattle NoharaDebugMenu_DadAfterBattle: push {lr} - ldr r0, ._225 + ldr r0, ._225 @ 0x4085 mov r1, #0x7 bl VarSet bl CloseMenu @@ -2069,7 +2069,7 @@ NoharaDebugMenu_SootopolisCity: bl FlagSet mov r0, #0x71 bl FlagSet - ldr r0, ._227 + ldr r0, ._227 @ 0x32f bl FlagClear bl CloseMenu mov r0, #0x1 @@ -2085,9 +2085,9 @@ NoharaDebugMenu_SootopolisCity: thumb_func_start NoharaDebugMenu_Embark NoharaDebugMenu_Embark: push {lr} - ldr r0, ._229 + ldr r0, ._229 @ 0x2e3 bl FlagClear - ldr r0, ._229 + 4 + ldr r0, ._229 + 4 @ 0x4090 mov r1, #0x1 bl VarSet bl CloseMenu @@ -2105,8 +2105,8 @@ NoharaDebugMenu_Embark: thumb_func_start NoharaDebugMenu_Yes9999 NoharaDebugMenu_Yes9999: push {lr} - ldr r0, ._231 - ldr r1, ._231 + 4 + ldr r0, ._231 @ 0x4048 + ldr r1, ._231 + 4 @ 0x270f bl VarSet bl CloseMenu mov r0, #0x1 @@ -2135,8 +2135,8 @@ NoharaDebugMenu_LegendsFlagOn: thumb_func_start NoharaDebugMenu_AddNumWinningStreaks NoharaDebugMenu_AddNumWinningStreaks: push {lr} - ldr r0, ._235 - ldr r1, ._235 + 4 + ldr r0, ._235 @ gSaveBlock2 + ldr r1, ._235 + 4 @ 0x572 add r2, r0, r1 ldrh r1, [r2] cmp r1, #0x31 @@ -2154,7 +2154,7 @@ NoharaDebugMenu_AddNumWinningStreaks: mov r0, #0x64 b ._244 ._237: - ldr r0, ._241 + ldr r0, ._241 @ 0x3e7 cmp r1, r0 bhi ._239 @cond_branch add r0, r0, #0x1 @@ -2164,10 +2164,10 @@ NoharaDebugMenu_AddNumWinningStreaks: ._241: .word 0x3e7 ._239: - ldr r0, ._245 + ldr r0, ._245 @ 0x1387 cmp r1, r0 bhi ._243 @cond_branch - ldr r0, ._245 + 4 + ldr r0, ._245 + 4 @ 0x2706 b ._244 ._246: .align 2, 0 @@ -2175,7 +2175,7 @@ NoharaDebugMenu_AddNumWinningStreaks: .word 0x1387 .word 0x2706 ._243: - ldr r0, ._248 + ldr r0, ._248 @ 0x2705 cmp r1, r0 bhi ._247 @cond_branch add r0, r0, #0xa diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 6e6e17db3..a0fa06f14 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1047,10 +1047,10 @@ debug_sub_80A3904: lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x4 - ldr r2, ._163 + ldr r2, ._163 @ gPokemonStorage add r1, r1, r2 add r6, r3, r1 - ldr r2, ._163 + 4 + ldr r2, ._163 + 4 @ gUnknown_Debug_083E05F0 lsl r1, r7, #0x1 add r1, r1, r2 ldrh r4, [r1] @@ -1983,8 +1983,8 @@ sub_8096874: @ 8096874 sub_8096884: .syntax divided push {r4, lr} - ldr r0, ._223 - ldr r1, ._223 + 4 + ldr r0, ._223 @ gMain + ldr r1, ._223 + 4 @ 0x43c add r0, r0, r1 ldrb r0, [r0] cmp r0, #0x9 @@ -1992,7 +1992,7 @@ sub_8096884: b ._222 ._221: lsl r0, r0, #0x2 - ldr r1, ._223 + 8 + ldr r1, ._223 + 8 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -2021,7 +2021,7 @@ sub_8096884: mov r4, #0x0 strh r4, [r0] bl sub_8096804 - ldr r0, ._237 + ldr r0, ._237 @ unk_2038790 strb r4, [r0] b ._250 ._238: @@ -2029,7 +2029,7 @@ sub_8096884: ._237: .word unk_2038790 ._227: - ldr r0, ._240 + ldr r0, ._240 @ gWindowTemplate_81E6D00 bl Text_LoadWindowTemplate b ._250 ._241: @@ -2037,7 +2037,7 @@ sub_8096884: ._240: .word gWindowTemplate_81E6D00 ._228: - ldr r0, ._243 + ldr r0, ._243 @ gWindowTemplate_81E6D00 bl InitMenuWindow bl Menu_EraseScreen b ._250 @@ -2063,17 +2063,17 @@ sub_8096884: bl sub_8098400 b ._250 ._234: - ldr r0, ._251 + ldr r0, ._251 @ gPokemonStorage ldrb r0, [r0] bl sub_8099BF8 - ldr r2, ._251 + 4 - ldr r1, ._251 + 8 + ldr r2, ._251 + 4 @ 0x2000000 + ldr r1, ._251 + 8 @ 0x12bc add r0, r2, r1 mov r1, #0xa strh r1, [r0] - ldr r1, ._251 + 12 + ldr r1, ._251 + 12 @ 0x12be add r2, r2, r1 - ldr r1, ._251 + 16 + ldr r1, ._251 + 16 @ 0xdacb strh r1, [r2] bl sub_80F727C bl sub_80F7404 @@ -2082,21 +2082,21 @@ sub_8096884: .align 2, 0 ._251: .word gPokemonStorage - .word +0x2000000 + .word 0x2000000 .word 0x12bc .word 0x12be .word 0xdacb ._235: bl sub_8096874 - ldr r0, ._253 + ldr r0, ._253 @ sub_8096BF0 bl sub_8096BE0 - ldr r0, ._253 + 4 + ldr r0, ._253 + 4 @ sub_8096B38 bl SetMainCallback2 - ldr r0, ._253 + 8 + ldr r0, ._253 + 8 @ sub_8096AFC bl SetVBlankCallback ._250: - ldr r1, ._253 + 12 - ldr r0, ._253 + 16 + ldr r1, ._253 + 12 @ gMain + ldr r0, ._253 + 16 @ 0x43c add r1, r1, r0 ldrb r0, [r1] add r0, r0, #0x1 @@ -2392,19 +2392,19 @@ _08096AF8: .4byte 0x0000043c debug_sub_80A4300: .syntax divided push {lr} - ldr r1, ._296 + ldr r1, ._296 @ gUnknown_0203847D mov r0, #0x0 strb r0, [r1] - ldr r1, ._296 + 4 + ldr r1, ._296 + 4 @ 0x2000000 mov r0, #0x0 strb r0, [r1, #0x5] bl sub_8096884 - ldr r0, ._296 + 8 + ldr r0, ._296 + 8 @ gMain ldr r1, [r0, #0x4] - ldr r0, ._296 + 12 + ldr r0, ._296 + 12 @ sub_8096B38 cmp r1, r0 bne ._295 @cond_branch - ldr r1, ._296 + 16 + ldr r1, ._296 + 16 @ unk_2038790 mov r0, #0x1 strb r0, [r1] ._295: @@ -2414,7 +2414,7 @@ debug_sub_80A4300: .align 2, 0 ._296: .word gUnknown_0203847D - .word +0x2000000 + .word 0x2000000 .word gMain .word sub_8096B38+1 .word unk_2038790 @@ -2425,11 +2425,11 @@ debug_sub_80A4300: debug_sub_80A433C: .syntax divided push {lr} - ldr r2, ._298 + ldr r2, ._298 @ unk_2038794 str r1, [r2] - ldr r1, ._298 + 4 + ldr r1, ._298 + 4 @ unk_2038798 str r0, [r1] - ldr r0, ._298 + 8 + ldr r0, ._298 + 8 @ debug_sub_80A4300 bl SetMainCallback2 pop {r0} bx r0 @@ -2447,7 +2447,7 @@ debug_sub_80A435C: .syntax divided push {r4, r5, lr} add sp, sp, #0xfffffffc - ldr r5, ._303 + ldr r5, ._303 @ 0x2000000 ldrb r4, [r5, #0x4] cmp r4, #0 beq ._300 @cond_branch @@ -2457,9 +2457,9 @@ debug_sub_80A435C: ._304: .align 2, 0 ._303: - .word +0x2000000 + .word 0x2000000 ._300: - ldr r0, ._306 + ldr r0, ._306 @ unk_2038798 ldr r0, [r0] bl unref_sub_809CB94 mov r0, #0x1 @@ -2482,7 +2482,7 @@ debug_sub_80A435C: lsl r0, r0, #0x18 cmp r0, #0 bne ._308 @cond_branch - ldr r0, ._309 + ldr r0, ._309 @ unk_2038794 ldr r0, [r0] bl _call_via_r0 ._308: @@ -2700,21 +2700,21 @@ _08096C80: .4byte sub_8096C84 sub_8096C84: .syntax divided push {r4, lr} - ldr r0, ._347 + ldr r0, ._347 @ 0x2000000 ldrb r0, [r0, #0x4] cmp r0, #0x6 bls ._345 @cond_branch b ._466 ._345: lsl r0, r0, #0x2 - ldr r1, ._347 + 4 + ldr r1, ._347 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 ._348: .align 2, 0 ._347: - .word +0x2000000 + .word 0x2000000 .word ._349 ._349: .word ._350 @@ -2734,7 +2734,7 @@ sub_8096C84: b ._466 ._357: lsl r0, r0, #0x2 - ldr r1, ._360 + ldr r1, ._360 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -2762,16 +2762,16 @@ sub_8096C84: ._362: mov r0, #0x5 bl PlaySE - ldr r1, ._379 + ldr r1, ._379 @ 0x2000000 mov r0, #0x1 strb r0, [r1, #0x4] b ._466 ._380: .align 2, 0 ._379: - .word +0x2000000 + .word 0x2000000 ._366: - ldr r4, ._383 + ldr r4, ._383 @ 0x2000000 ldrb r0, [r4, #0x5] cmp r0, #0x2 beq ._381 @cond_branch @@ -2783,10 +2783,10 @@ sub_8096C84: ._384: .align 2, 0 ._383: - .word +0x2000000 + .word 0x2000000 ._381: bl sub_809B0D4 - ldr r0, ._386 + ldr r0, ._386 @ sub_8096FC8 bl sub_8096BE0 b ._466 ._387: @@ -2794,7 +2794,7 @@ sub_8096C84: ._386: .word sub_8096FC8+1 ._367: - ldr r4, ._394 + ldr r4, ._394 @ 0x2000000 ldrb r0, [r4, #0x5] cmp r0, #0x2 beq ._388 @cond_branch @@ -2804,7 +2804,7 @@ sub_8096C84: lsl r0, r0, #0x18 cmp r0, #0 beq ._391 @cond_branch - ldr r1, ._394 + 4 + ldr r1, ._394 + 4 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -2813,23 +2813,23 @@ sub_8096C84: beq ._391 @cond_branch b ._392 ._391: - ldr r0, ._394 + 8 + ldr r0, ._394 + 8 @ sub_8097004 bl sub_8096BE0 b ._466 ._395: .align 2, 0 ._394: - .word +0x2000000 + .word 0x2000000 .word 0x11f2 .word sub_8097004+1 ._365: - ldr r0, ._399 + ldr r0, ._399 @ unk_2038790 ldrb r0, [r0] cmp r0, #0 beq ._396 @cond_branch b ._466 ._396: - ldr r0, ._399 + 4 + ldr r0, ._399 + 4 @ sub_8097BA0 bl sub_8096BE0 b ._466 ._400: @@ -2838,13 +2838,13 @@ sub_8096C84: .word unk_2038790 .word sub_8097BA0+1 ._377: - ldr r0, ._404 + ldr r0, ._404 @ unk_2038790 ldrb r0, [r0] cmp r0, #0 beq ._401 @cond_branch b ._466 ._401: - ldr r0, ._404 + 4 + ldr r0, ._404 + 4 @ sub_8097CC0 bl sub_8096BE0 b ._466 ._405: @@ -2855,7 +2855,7 @@ sub_8096C84: ._368: mov r0, #0x5 bl PlaySE - ldr r0, ._407 + ldr r0, ._407 @ sub_809789C bl sub_8096BE0 b ._466 ._408: @@ -2865,7 +2865,7 @@ sub_8096C84: ._369: mov r0, #0x5 bl PlaySE - ldr r0, ._410 + ldr r0, ._410 @ sub_8097078 bl sub_8096BE0 b ._466 ._411: @@ -2875,11 +2875,11 @@ sub_8096C84: ._370: mov r0, #0x5 bl PlaySE - ldr r4, ._414 - ldr r0, ._414 + 4 + ldr r4, ._414 @ 0x2000000 + ldr r0, ._414 + 4 @ gPokemonStorage ldrb r0, [r0] add r0, r0, #0x1 - ldr r2, ._414 + 8 + ldr r2, ._414 + 8 @ 0x8b2 add r1, r4, r2 strh r0, [r1] cmp r0, #0xd @@ -2889,17 +2889,17 @@ sub_8096C84: ._415: .align 2, 0 ._414: - .word +0x2000000 + .word 0x2000000 .word gPokemonStorage .word 0x8b2 ._371: mov r0, #0x5 bl PlaySE - ldr r4, ._418 - ldr r0, ._418 + 4 + ldr r4, ._418 @ 0x2000000 + ldr r0, ._418 + 4 @ gPokemonStorage ldrb r0, [r0] sub r0, r0, #0x1 - ldr r2, ._418 + 8 + ldr r2, ._418 + 8 @ 0x8b2 add r1, r4, r2 strh r0, [r1] cmp r0, #0 @@ -2916,7 +2916,7 @@ sub_8096C84: ._419: .align 2, 0 ._418: - .word +0x2000000 + .word 0x2000000 .word gPokemonStorage .word 0x8b2 ._372: @@ -2924,8 +2924,8 @@ sub_8096C84: lsl r0, r0, #0x18 cmp r0, #0 bne ._428 @cond_branch - ldr r4, ._423 - ldr r1, ._423 + 4 + ldr r4, ._423 @ 0x2000000 + ldr r1, ._423 + 4 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -2939,12 +2939,12 @@ sub_8096C84: ._424: .align 2, 0 ._423: - .word +0x2000000 + .word 0x2000000 .word 0x11f2 ._421: mov r0, #0x5 bl PlaySE - ldr r0, ._426 + ldr r0, ._426 @ sub_809746C bl sub_8096BE0 b ._466 ._427: @@ -2958,7 +2958,7 @@ sub_8096C84: bne ._428 @cond_branch mov r0, #0x5 bl PlaySE - ldr r0, ._430 + ldr r0, ._430 @ sub_80972A8 bl sub_8096BE0 b ._466 ._431: @@ -2971,18 +2971,18 @@ sub_8096C84: cmp r0, #0 bne ._432 @cond_branch ._428: - ldr r1, ._434 + ldr r1, ._434 @ 0x2000000 mov r0, #0x4 strb r0, [r1, #0x4] b ._466 ._435: .align 2, 0 ._434: - .word +0x2000000 + .word 0x2000000 ._432: mov r0, #0x5 bl PlaySE - ldr r0, ._437 + ldr r0, ._437 @ c3_0808DC50 bl sub_8096BE0 b ._466 ._438: @@ -2992,7 +2992,7 @@ sub_8096C84: ._373: mov r0, #0x5 bl PlaySE - ldr r0, ._440 + ldr r0, ._440 @ sub_8097390 bl sub_8096BE0 b ._466 ._441: @@ -3002,7 +3002,7 @@ sub_8096C84: ._376: mov r0, #0x5 bl PlaySE - ldr r0, ._443 + ldr r0, ._443 @ sub_80972FC bl sub_8096BE0 b ._466 ._444: @@ -3023,8 +3023,8 @@ sub_8096C84: ._446: bl sub_8098710 ._447: - ldr r4, ._450 - ldr r2, ._450 + 4 + ldr r4, ._450 @ 0x2000000 + ldr r2, ._450 + 4 @ 0x11f6 add r0, r4, r2 ldrb r0, [r0] cmp r0, #0 @@ -3037,20 +3037,20 @@ sub_8096C84: ._451: .align 2, 0 ._450: - .word +0x2000000 + .word 0x2000000 .word 0x11f6 ._352: bl sub_8099D34 lsl r0, r0, #0x18 cmp r0, #0 bne ._466 @cond_branch - ldr r1, ._456 - ldr r0, ._456 + 4 - ldr r2, ._456 + 8 + ldr r1, ._456 @ gPokemonStorage + ldr r0, ._456 + 4 @ 0x2000000 + ldr r2, ._456 + 8 @ 0x8b2 add r0, r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r0, ._456 + 12 + ldr r0, ._456 + 12 @ gUnknown_0203847C ldrb r0, [r0] cmp r0, #0 bne ._455 @cond_branch @@ -3065,11 +3065,11 @@ sub_8096C84: .align 2, 0 ._456: .word gPokemonStorage - .word +0x2000000 + .word 0x2000000 .word 0x8b2 .word gUnknown_0203847C ._353: - ldr r0, ._460 + ldr r0, ._460 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0xf3 and r0, r0, r1 @@ -3077,7 +3077,7 @@ sub_8096C84: beq ._466 @cond_branch bl sub_8098A5C ._455: - ldr r1, ._460 + 4 + ldr r1, ._460 + 4 @ 0x2000000 mov r0, #0x0 strb r0, [r1, #0x4] b ._466 @@ -3085,7 +3085,7 @@ sub_8096C84: .align 2, 0 ._460: .word gMain - .word +0x2000000 + .word 0x2000000 ._354: mov r0, #0x20 bl PlaySE @@ -3097,23 +3097,23 @@ sub_8096C84: mov r0, #0x16 ._462: bl sub_8098898 - ldr r1, ._464 + ldr r1, ._464 @ 0x2000000 mov r0, #0x6 strb r0, [r1, #0x4] b ._466 ._465: .align 2, 0 ._464: - .word +0x2000000 + .word 0x2000000 ._356: - ldr r0, ._467 + ldr r0, ._467 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0xf3 and r0, r0, r1 cmp r0, #0 beq ._466 @cond_branch bl sub_8098A5C - ldr r0, ._467 + 4 + ldr r0, ._467 + 4 @ sub_8096C84 bl sub_8096BE0 ._466: pop {r4} @@ -3594,21 +3594,21 @@ _08097074: .4byte sub_8096C84 sub_8097078: .syntax divided push {r4, lr} - ldr r0, ._495 + ldr r0, ._495 @ 0x2000000 ldrb r0, [r0, #0x4] cmp r0, #0x5 bls ._493 @cond_branch b ._597 ._493: lsl r0, r0, #0x2 - ldr r1, ._495 + 4 + ldr r1, ._495 + 4 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 ._496: .align 2, 0 ._495: - .word +0x2000000 + .word 0x2000000 .word ._497 ._497: .word ._498 @@ -3621,14 +3621,14 @@ sub_8097078: mov r0, #0x4 bl sub_8098898 bl sub_809CE84 - ldr r1, ._505 + ldr r1, ._505 @ 0x2000000 mov r0, #0x1 strb r0, [r1, #0x4] b ._597 ._506: .align 2, 0 ._505: - .word +0x2000000 + .word 0x2000000 ._499: bl sub_809CF30 add r0, r0, #0x1 @@ -3639,7 +3639,7 @@ sub_8097078: b ._597 ._507: lsl r0, r0, #0x2 - ldr r1, ._510 + ldr r1, ._510 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -3684,7 +3684,7 @@ sub_8097078: .word ._545 ._513: bl sub_8098A5C - ldr r0, ._547 + ldr r0, ._547 @ sub_8096C84 bl sub_8096BE0 b ._597 ._548: @@ -3699,7 +3699,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._551 + ldr r0, ._551 @ sub_80972A8 bl sub_8096BE0 b ._597 ._552: @@ -3710,7 +3710,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._554 + ldr r0, ._554 @ sub_80972FC bl sub_8096BE0 b ._597 ._555: @@ -3725,7 +3725,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._558 + ldr r0, ._558 @ c3_0808DC50 bl sub_8096BE0 b ._597 ._559: @@ -3736,7 +3736,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._561 + ldr r0, ._561 @ sub_8097390 bl sub_8096BE0 b ._597 ._562: @@ -3748,8 +3748,8 @@ sub_8097078: lsl r0, r0, #0x18 cmp r0, #0 bne ._563 @cond_branch - ldr r4, ._566 - ldr r1, ._566 + 4 + ldr r4, ._566 @ 0x2000000 + ldr r1, ._566 + 4 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -3759,13 +3759,13 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._566 + 8 + ldr r0, ._566 + 8 @ sub_809746C bl sub_8096BE0 b ._597 ._567: .align 2, 0 ._566: - .word +0x2000000 + .word 0x2000000 .word 0x11f2 .word sub_809746C+1 ._520: @@ -3774,17 +3774,17 @@ sub_8097078: cmp r0, #0 beq ._568 @cond_branch ._563: - ldr r1, ._570 + ldr r1, ._570 @ 0x2000000 mov r0, #0x2 strb r0, [r1, #0x4] b ._597 ._571: .align 2, 0 ._570: - .word +0x2000000 + .word 0x2000000 ._568: - ldr r4, ._574 - ldr r1, ._574 + 4 + ldr r4, ._574 @ 0x2000000 + ldr r1, ._574 + 4 @ 0x11f9 add r0, r4, r1 ldrb r0, [r0] cmp r0, #0 @@ -3795,10 +3795,10 @@ sub_8097078: ._575: .align 2, 0 ._574: - .word +0x2000000 + .word 0x2000000 .word 0x11f9 ._572: - ldr r1, ._578 + ldr r1, ._578 @ 0x11f2 add r0, r4, r1 ldrh r0, [r0] bl ItemIsMail @@ -3816,7 +3816,7 @@ sub_8097078: ._576: mov r0, #0x5 bl PlaySE - ldr r0, ._581 + ldr r0, ._581 @ sub_8097594 bl sub_8096BE0 b ._597 ._582: @@ -3826,7 +3826,7 @@ sub_8097078: ._519: mov r0, #0x5 bl PlaySE - ldr r0, ._584 + ldr r0, ._584 @ sub_8097788 bl sub_8096BE0 b ._597 ._585: @@ -3836,7 +3836,7 @@ sub_8097078: ._521: mov r0, #0x5 bl PlaySE - ldr r0, ._587 + ldr r0, ._587 @ sub_80977E4 bl sub_8096BE0 b ._597 ._588: @@ -3847,7 +3847,7 @@ sub_8097078: mov r0, #0x5 bl PlaySE bl sub_8098A5C - ldr r0, ._590 + ldr r0, ._590 @ debug_sub_80A435C bl sub_8096BE0 b ._597 ._591: @@ -3870,23 +3870,23 @@ sub_8097078: mov r0, #0x16 ._593: bl sub_8098898 - ldr r1, ._595 + ldr r1, ._595 @ 0x2000000 mov r0, #0x5 strb r0, [r1, #0x4] b ._597 ._596: .align 2, 0 ._595: - .word +0x2000000 + .word 0x2000000 ._503: - ldr r0, ._598 + ldr r0, ._598 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0xf3 and r0, r0, r1 cmp r0, #0 beq ._597 @cond_branch bl sub_8098A5C - ldr r0, ._598 + 4 + ldr r0, ._598 + 4 @ sub_8096C84 bl sub_8096BE0 ._597: pop {r4} @@ -15164,7 +15164,7 @@ debug_sub_80AA40C: sub_809CAB0: .syntax divided push {lr} - ldr r0, ._2088 + ldr r0, ._2088 @ unk_2038790 ldrb r0, [r0] cmp r0, #0 beq ._2086 @cond_branch @@ -15181,7 +15181,7 @@ sub_809CAB0: bl sub_809AB8C lsl r0, r0, #0x10 lsr r1, r0, #0x10 - ldr r0, ._2094 + ldr r0, ._2094 @ gUnknown_083B6DB4 ldr r0, [r0] ldrb r0, [r0, #0x5] cmp r0, #0x1 @@ -15212,7 +15212,7 @@ sub_809CAB0: bl sub_809CDEC b ._2109 ._2096: - ldr r0, ._2105 + ldr r0, ._2105 @ gUnknown_020384E6 ldrb r0, [r0] cmp r0, #0 beq ._2102 @cond_branch @@ -15241,12 +15241,12 @@ sub_809CAB0: ._2109: mov r0, #0x6 bl sub_809CDEC - ldr r0, ._2114 + ldr r0, ._2114 @ gUnknown_083B6DB4 ldr r0, [r0] ldrb r0, [r0, #0x5] cmp r0, #0x2 bne ._2113 @cond_branch - ldr r0, ._2114 + 4 + ldr r0, ._2114 + 4 @ gUnknown_020384E4 ldrb r0, [r0] lsl r0, r0, #0x18 asr r0, r0, #0x18 diff --git a/asm/taya_debug_window.s b/asm/taya_debug_window.s index 1c25de5f6..68d27390d 100644 --- a/asm/taya_debug_window.s +++ b/asm/taya_debug_window.s @@ -19,7 +19,7 @@ TayaDebugMenu_Trend: mov r2, #0x1e mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r5, ._3 + ldr r5, ._3 @ gSaveBlock1 mov r7, #0x0 mov r0, #0x1 add r0, r0, sp @@ -96,8 +96,8 @@ TayaDebugMenu_Trend: lsr r7, r0, #0x10 cmp r7, #0x4 bls ._2 @cond_branch - ldr r1, ._3 + 4 - ldr r0, ._3 + 8 + ldr r1, ._3 + 4 @ gMenuCallback + ldr r0, ._3 + 8 @ debug_sub_8090808 str r0, [r1] mov r0, #0x0 add sp, sp, #0x28 @@ -120,7 +120,7 @@ TayaDebugMenu_Trend: thumb_func_start debug_sub_8090808 debug_sub_8090808: push {lr} - ldr r0, ._7 + ldr r0, ._7 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x3 and r0, r0, r1 @@ -146,7 +146,7 @@ debug_sub_8090808: TayaDebugMenu_TrendR: push {r4, r5, r6, r7, lr} mov r0, #0x0 - ldr r7, ._11 + ldr r7, ._11 @ gSaveBlock1 ._10: mov r4, #0x0 lsl r5, r0, #0x3 @@ -221,8 +221,8 @@ debug_sub_809089C: mov r0, #0x1 b ._17 ._16: - ldr r2, ._19 - ldr r0, ._19 + 4 + ldr r2, ._19 @ gSpecialVar_0x8004 + ldr r0, ._19 + 4 @ gUnknown_Debug_083C4EC0 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -233,7 +233,7 @@ debug_sub_809089C: cmp r0, #0x7 bhi ._27 @cond_branch lsl r0, r0, #0x2 - ldr r1, ._19 + 8 + ldr r1, ._19 + 8 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -253,17 +253,17 @@ debug_sub_809089C: .word ._29 .word ._29 ._29: - ldr r0, ._30 + ldr r0, ._30 @ gSpecialVar_0x8005 mov r1, #0x0 strh r1, [r0] - ldr r0, ._30 + 4 + ldr r0, ._30 + 4 @ gSpecialVar_0x8006 strh r1, [r0] ._27: mov r0, #0x1 mov r1, #0x0 bl FadeScreen - ldr r1, ._30 + 8 - ldr r0, ._30 + 12 + ldr r1, ._30 + 8 @ gMenuCallback + ldr r0, ._30 + 12 @ debug_sub_8090880 str r0, [r1] ._15: mov r0, #0x0 @@ -289,7 +289,7 @@ TayaDebugMenu_SimpleText: mov r2, #0xc mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._32 + ldr r3, ._32 @ gUnknown_Debug_083C4EC0 mov r0, #0x1 mov r1, #0x1 mov r2, #0x9 @@ -303,8 +303,8 @@ TayaDebugMenu_SimpleText: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._32 + 4 - ldr r0, ._32 + 8 + ldr r1, ._32 + 4 @ gMenuCallback + ldr r0, ._32 + 8 @ debug_sub_809089C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -349,11 +349,11 @@ debug_sub_8090984: cmp r1, #0x6 bne ._41 @cond_branch mov r4, #0x0 - ldr r0, ._44 + ldr r0, ._44 @ gSaveBlock1 add r1, r0, #2 mov ip, r1 - ldr r7, ._44 + 4 - ldr r1, ._44 + 8 + ldr r7, ._44 + 4 @ gUnknown_Debug_083C4F08 + ldr r1, ._44 + 8 @ 0xfffffd94 add r6, r0, r1 add r5, r0, #0 add r5, r5, #0xe @@ -412,7 +412,7 @@ TayaDebugMenu_OldMan: mov r2, #0xa mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._48 + ldr r3, ._48 @ gUnknown_Debug_083C4F54 mov r0, #0x1 mov r1, #0x1 mov r2, #0x8 @@ -428,8 +428,8 @@ TayaDebugMenu_OldMan: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r1, ._48 + 4 - ldr r0, ._48 + 8 + ldr r1, ._48 + 4 @ gMenuCallback + ldr r0, ._48 + 8 @ debug_sub_8090984 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -458,89 +458,89 @@ TayaDebugMenu_LanettesPC: thumb_func_start TayaDebugMenu_TownFlags TayaDebugMenu_TownFlags: push {lr} - ldr r0, ._50 + ldr r0, ._50 @ 0x80f bl FlagSet mov r0, #0x81 lsl r0, r0, #0x4 bl FlagSet - ldr r0, ._50 + 4 + ldr r0, ._50 + 4 @ 0x811 bl FlagSet - ldr r0, ._50 + 8 + ldr r0, ._50 + 8 @ 0x812 bl FlagSet - ldr r0, ._50 + 12 + ldr r0, ._50 + 12 @ 0x813 bl FlagSet - ldr r0, ._50 + 16 + ldr r0, ._50 + 16 @ 0x814 bl FlagSet - ldr r0, ._50 + 20 + ldr r0, ._50 + 20 @ 0x815 bl FlagSet - ldr r0, ._50 + 24 + ldr r0, ._50 + 24 @ 0x816 bl FlagSet - ldr r0, ._50 + 28 + ldr r0, ._50 + 28 @ 0x817 bl FlagSet - ldr r0, ._50 + 32 + ldr r0, ._50 + 32 @ 0x818 bl FlagSet - ldr r0, ._50 + 36 + ldr r0, ._50 + 36 @ 0x819 bl FlagSet - ldr r0, ._50 + 40 + ldr r0, ._50 + 40 @ 0x81a bl FlagSet - ldr r0, ._50 + 44 + ldr r0, ._50 + 44 @ 0x81b bl FlagSet - ldr r0, ._50 + 48 + ldr r0, ._50 + 48 @ 0x81c bl FlagSet - ldr r0, ._50 + 52 + ldr r0, ._50 + 52 @ 0x81d bl FlagSet - ldr r0, ._50 + 56 + ldr r0, ._50 + 56 @ 0x81e bl FlagSet - ldr r0, ._50 + 60 + ldr r0, ._50 + 60 @ 0x848 bl FlagSet - ldr r0, ._50 + 64 + ldr r0, ._50 + 64 @ 0x849 bl FlagSet - ldr r0, ._50 + 68 + ldr r0, ._50 + 68 @ 0x84a bl FlagSet - ldr r0, ._50 + 72 + ldr r0, ._50 + 72 @ 0x854 bl FlagSet - ldr r0, ._50 + 76 + ldr r0, ._50 + 76 @ 0x855 bl FlagSet - ldr r0, ._50 + 80 + ldr r0, ._50 + 80 @ 0x856 bl FlagSet - ldr r0, ._50 + 84 + ldr r0, ._50 + 84 @ 0x857 bl FlagSet - ldr r0, ._50 + 88 + ldr r0, ._50 + 88 @ 0x858 bl FlagSet - ldr r0, ._50 + 92 + ldr r0, ._50 + 92 @ 0x859 bl FlagSet - ldr r0, ._50 + 96 + ldr r0, ._50 + 96 @ 0x85a bl FlagSet - ldr r0, ._50 + 100 + ldr r0, ._50 + 100 @ 0x85b bl FlagSet - ldr r0, ._50 + 104 + ldr r0, ._50 + 104 @ 0x85c bl FlagSet - ldr r0, ._50 + 108 + ldr r0, ._50 + 108 @ 0x83c bl FlagSet - ldr r0, ._50 + 112 + ldr r0, ._50 + 112 @ 0x83d bl FlagSet - ldr r0, ._50 + 116 + ldr r0, ._50 + 116 @ 0x83e bl FlagSet - ldr r0, ._50 + 120 + ldr r0, ._50 + 120 @ 0x83f bl FlagSet mov r0, #0x84 lsl r0, r0, #0x4 bl FlagSet - ldr r0, ._50 + 124 + ldr r0, ._50 + 124 @ 0x841 bl FlagSet - ldr r0, ._50 + 128 + ldr r0, ._50 + 128 @ 0x842 bl FlagSet - ldr r0, ._50 + 132 + ldr r0, ._50 + 132 @ 0x843 bl FlagSet - ldr r0, ._50 + 136 + ldr r0, ._50 + 136 @ 0x844 bl FlagSet - ldr r0, ._50 + 140 + ldr r0, ._50 + 140 @ 0x845 bl FlagSet - ldr r0, ._50 + 144 + ldr r0, ._50 + 144 @ 0x846 bl FlagSet - ldr r0, ._50 + 148 + ldr r0, ._50 + 148 @ 0x847 bl FlagSet - ldr r0, ._50 + 152 + ldr r0, ._50 + 152 @ 0x83b bl FlagSet bl CloseMenu mov r0, #0x1 @@ -599,7 +599,7 @@ TayaDebugMenu_AwardARibbon: mov r1, #0x10 mov r2, #0x0 bl BlendPalettes - ldr r0, ._52 + ldr r0, ._52 @ debug_sub_80915BC bl SetMainCallback2 bl CloseMenu mov r0, #0x1 @@ -615,7 +615,7 @@ TayaDebugMenu_AwardARibbon: thumb_func_start debug_sub_8090C44 debug_sub_8090C44: push {r4, r5, lr} - ldr r4, ._54 + ldr r4, ._54 @ gSharedMem sub r5, r4, #1 ldrh r1, [r5, #0x8] add r0, r4, #0 @@ -656,14 +656,14 @@ debug_sub_8090C88: add sp, sp, #0xfffffffc mov r0, #0x1 mov r8, r0 - ldr r2, ._59 + ldr r2, ._59 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x20 and r0, r0, r1 add r3, r2, #0 cmp r0, #0 beq ._57 @cond_branch - ldr r1, ._59 + 4 + ldr r1, ._59 + 4 @ gSharedMem ldrb r0, [r1] cmp r0, #0 beq ._57 @cond_branch @@ -683,7 +683,7 @@ debug_sub_8090C88: strh r1, [r7, #0x8] b ._62 ._79: - ldr r0, ._64 + ldr r0, ._64 @ gSharedMem ldrh r0, [r0, #0x8] bl SetLotteryNumber16_Unused ._78: @@ -700,7 +700,7 @@ debug_sub_8090C88: and r0, r0, r1 cmp r0, #0 beq ._66 @cond_branch - ldr r1, ._81 + ldr r1, ._81 @ gSharedMem ldrb r0, [r1] cmp r0, #0x3 bls ._67 @cond_branch @@ -710,10 +710,10 @@ debug_sub_8090C88: and r0, r0, r1 cmp r0, #0 beq ._68 @cond_branch - ldr r0, ._81 + ldr r0, ._81 @ gSharedMem ldrh r1, [r0, #0x8] str r1, [r0, #0xc] - ldr r1, ._81 + 4 + ldr r1, ._81 + 4 @ 0x2710 strh r1, [r0, #0x10] mov r4, #0x0 ldrb r1, [r0] @@ -739,7 +739,7 @@ debug_sub_8090C88: ldr r0, [r7, #0xc] add r0, r0, r1 str r0, [r7, #0xc] - ldr r1, ._81 + 8 + ldr r1, ._81 + 8 @ 0xffff cmp r0, r1 ble ._71 @cond_branch str r1, [r7, #0xc] @@ -754,10 +754,10 @@ debug_sub_8090C88: and r0, r0, r1 cmp r0, #0 beq ._73 @cond_branch - ldr r0, ._81 + ldr r0, ._81 @ gSharedMem ldrh r1, [r0, #0x8] str r1, [r0, #0xc] - ldr r1, ._81 + 4 + ldr r1, ._81 + 4 @ 0x2710 strh r1, [r0, #0x10] mov r4, #0x0 ldrb r1, [r0] @@ -837,15 +837,15 @@ TayaDebugMenu_PKMNLottery: mov r3, #0x5 bl Menu_DrawStdWindowFrame bl RetrieveLotteryNumber - ldr r2, ._83 - ldr r0, ._83 + 4 + ldr r2, ._83 @ gSharedMem + ldr r0, ._83 + 4 @ gSpecialVar_Result ldrh r0, [r0] mov r1, #0x0 strh r0, [r2, #0x8] strb r1, [r2] bl debug_sub_8090C44 - ldr r1, ._83 + 8 - ldr r0, ._83 + 12 + ldr r1, ._83 + 8 @ gMenuCallback + ldr r0, ._83 + 12 @ debug_sub_8090C88 str r0, [r1] mov r0, #0x0 pop {r1} @@ -864,7 +864,7 @@ TayaDebugMenu_PKMNLottery: TayaDebugMenu_Trainer: push {r4, r5, lr} mov r4, #0x0 - ldr r5, ._86 + ldr r5, ._86 @ gTrainerEyeTrainers ._85: lsl r0, r4, #0x4 add r0, r0, r5 @@ -875,37 +875,37 @@ TayaDebugMenu_Trainer: lsr r4, r0, #0x10 cmp r4, #0x37 bls ._85 @cond_branch - ldr r0, ._86 + 4 + ldr r0, ._86 + 4 @ 0x109 bl SetTrainerFlag mov r0, #0x85 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 8 + ldr r0, ._86 + 8 @ 0x10b bl SetTrainerFlag mov r0, #0x86 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 12 + ldr r0, ._86 + 12 @ 0x10d bl SetTrainerFlag mov r0, #0x87 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 16 + ldr r0, ._86 + 16 @ 0x10f bl SetTrainerFlag mov r0, #0x88 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 20 + ldr r0, ._86 + 20 @ 0x105 bl SetTrainerFlag mov r0, #0x83 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 24 + ldr r0, ._86 + 24 @ 0x107 bl SetTrainerFlag mov r0, #0x84 lsl r0, r0, #0x1 bl SetTrainerFlag - ldr r0, ._86 + 28 + ldr r0, ._86 + 28 @ 0x14f bl SetTrainerFlag bl CloseMenu mov r0, #0x1 @@ -942,9 +942,9 @@ TayaDebugMenu_PokenavD: mov r1, #0x3 mov r9, r1 ._93: - ldr r4, ._94 + ldr r4, ._94 @ gSharedMem add r0, r4, #0 - ldr r1, ._94 + 4 + ldr r1, ._94 + 4 @ gUnknown_Debug_083C4F94 bl StringCopy mov r5, sl add r5, r5, #0x1 @@ -990,7 +990,7 @@ TayaDebugMenu_PokenavD: add r0, r0, #0x19 lsl r0, r0, #0x10 lsr r3, r0, #0x10 - ldr r0, ._94 + 8 + ldr r0, ._94 + 8 @ 0x19b cmp r3, r0 bls ._89 @cond_branch mov r3, #0x1 @@ -1004,7 +1004,7 @@ TayaDebugMenu_PokenavD: lsl r0, r1, #0x2 add r0, r0, r8 lsl r0, r0, #0x4 - ldr r1, ._94 + 12 + ldr r1, ._94 + 12 @ gPokemonStorage add r0, r0, r1 add r4, r4, r0 lsl r2, r5, #0x18 @@ -1261,9 +1261,9 @@ TayaDebugMenu_8091190: add r0, r0, #0x1 cmp r3, r0 beq ._97 @cond_branch - ldr r2, ._99 - ldr r1, ._99 + 4 - ldr r0, ._99 + 8 + ldr r2, ._99 @ gMenuCallback + ldr r1, ._99 + 4 @ gUnknown_Debug_83C5068 + ldr r0, ._99 + 8 @ unk_2030224 ldrb r0, [r0] lsl r0, r0, #0x18 asr r0, r0, #0x18 @@ -1284,9 +1284,9 @@ TayaDebugMenu_8091190: .word gUnknown_Debug_83C5068 .word unk_2030224 ._96: - ldr r3, ._107 + ldr r3, ._107 @ unk_2030224 ldrb r4, [r3] - ldr r2, ._107 + 4 + ldr r2, ._107 + 4 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x20 and r0, r0, r1 @@ -1328,7 +1328,7 @@ TayaDebugMenu_8091190: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r4, ._107 + 8 + ldr r4, ._107 + 8 @ gUnknown_Debug_83C5068 mov r0, #0x0 ldrsb r0, [r5, r0] lsl r0, r0, #0x3 @@ -1373,7 +1373,7 @@ TayaDebugMenu_8091190: InitTayaDebugWindow: push {lr} add sp, sp, #0xfffffff8 - ldr r1, ._109 + ldr r1, ._109 @ unk_2030224 mov r0, #0x0 strb r0, [r1] bl Menu_EraseScreen @@ -1382,7 +1382,7 @@ InitTayaDebugWindow: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._109 + 4 + ldr r0, ._109 + 4 @ gUnknown_Debug_83C5068 ldr r3, [r0] mov r0, #0x1 mov r1, #0x1 @@ -1397,8 +1397,8 @@ InitTayaDebugWindow: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._109 + 8 - ldr r0, ._109 + 12 + ldr r1, ._109 + 8 @ gMenuCallback + ldr r0, ._109 + 12 @ TayaDebugMenu_8091190 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1417,7 +1417,7 @@ InitTayaDebugWindow: thumb_func_start debug_sub_80912D8 debug_sub_80912D8: push {lr} - ldr r0, ._113 + ldr r0, ._113 @ gPaletteFade ldrb r1, [r0, #0x7] mov r0, #0x80 and r0, r0, r1 @@ -1430,7 +1430,7 @@ debug_sub_80912D8: ._113: .word gPaletteFade ._111: - ldr r0, ._115 + ldr r0, ._115 @ debug_sub_8110F28 bl SetMainCallback2 mov r0, #0x1 ._112: @@ -1449,8 +1449,8 @@ debug_sub_8091300: mov r0, #0x1 mov r1, #0x0 bl FadeScreen - ldr r1, ._117 - ldr r0, ._117 + 4 + ldr r1, ._117 @ gMenuCallback + ldr r0, ._117 + 4 @ debug_sub_80912D8 str r0, [r1] mov r0, #0x0 pop {r1} @@ -1482,7 +1482,7 @@ debug_sub_8091334: push {r6, r7} bl AnimateSprites bl BuildOamBuffer - ldr r3, ._123 + ldr r3, ._123 @ gSharedMem add r0, r3, #0 add r0, r0, #0x52 ldrb r4, [r0] @@ -1501,7 +1501,7 @@ debug_sub_8091334: add r5, r3, #0 add r5, r5, #0x55 strb r4, [r5] - ldr r2, ._131 + ldr r2, ._131 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1522,7 +1522,7 @@ debug_sub_8091334: ldrh r1, [r0, #0x2e] mov r0, #0x80 and r0, r0, r1 - ldr r5, ._131 + 4 + ldr r5, ._131 + 4 @ gSharedMem cmp r0, #0 beq ._133 @cond_branch add r0, r5, #0 @@ -1612,7 +1612,7 @@ debug_sub_8091334: and r0, r0, r2 cmp r0, #0 beq ._142 @cond_branch - ldr r2, ._145 + ldr r2, ._145 @ gUnknown_Debug_083C50EC add r3, r5, #0 add r3, r3, #0x53 add r0, r5, #0 @@ -1661,7 +1661,7 @@ debug_sub_8091334: mov r1, #0x10 mov r2, #0x0 bl BlendPalettes - ldr r0, ._151 + ldr r0, ._151 @ sub_80546F0 bl SetMainCallback2 b ._162 ._152: @@ -1673,7 +1673,7 @@ debug_sub_8091334: add r5, r5, #0x55 mov r0, #0x0 strb r0, [r5] - ldr r2, ._159 + ldr r2, ._159 @ gMain ldrh r1, [r2, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -1704,7 +1704,7 @@ debug_sub_8091334: ldrh r1, [r2, #0x2e] mov r0, #0x80 and r0, r0, r1 - ldr r5, ._159 + 4 + ldr r5, ._159 + 4 @ gSharedMem cmp r0, #0 beq ._156 @cond_branch add r2, r5, #0 @@ -1748,8 +1748,8 @@ debug_sub_8091334: and r0, r0, r1 cmp r0, #0 beq ._161 @cond_branch - ldr r0, ._164 - ldr r1, ._164 + 4 + ldr r0, ._164 @ gPlayerParty + ldr r1, ._164 + 4 @ gUnknown_Debug_083C50EC mov ip, r1 mov r2, #0x53 add r2, r2, r6 @@ -1785,7 +1785,7 @@ debug_sub_8091334: and r0, r0, r1 cmp r0, #0 beq ._162 @cond_branch - ldr r2, ._164 + 4 + ldr r2, ._164 + 4 @ gUnknown_Debug_083C50EC add r0, r6, #0 add r0, r0, #0x53 ldrb r4, [r0] @@ -1799,7 +1799,7 @@ debug_sub_8091334: ldrh r0, [r1, #0x4] cmp r0, #0 beq ._163 @cond_branch - ldr r0, ._164 + ldr r0, ._164 @ gPlayerParty ldrh r1, [r1, #0x4] add r2, r4, r6 add r2, r3, r2 @@ -1828,15 +1828,15 @@ debug_sub_80915BC: push {r4, r5, r6, r7, lr} mov r7, r8 push {r7} - ldr r0, ._168 + ldr r0, ._168 @ 0x4000010 mov r1, #0x0 strh r1, [r0] add r0, r0, #0x2 strh r1, [r0] mov r1, #0x0 - ldr r0, ._168 + 4 + ldr r0, ._168 + 4 @ gUnknown_Debug_083C50EC mov r8, r0 - ldr r7, ._168 + 8 + ldr r7, ._168 + 8 @ gSharedMem ._171: mov r4, #0x0 lsl r0, r1, #0x1 @@ -1849,7 +1849,7 @@ debug_sub_80915BC: ldrh r1, [r0, #0x4] cmp r1, #0 beq ._166 @cond_branch - ldr r0, ._168 + 12 + ldr r0, ._168 + 12 @ gPlayerParty bl GetMonData add r1, r4, r5 add r1, r1, r7 @@ -1876,7 +1876,7 @@ debug_sub_80915BC: lsr r1, r0, #0x18 cmp r1, #0x5 bls ._171 @cond_branch - ldr r4, ._172 + ldr r4, ._172 @ gWindowTemplate_81E7224 add r0, r4, #0 bl Text_LoadWindowTemplate add r0, r4, #0 @@ -1887,7 +1887,7 @@ debug_sub_80915BC: mov r2, #0x1d mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r0, ._172 + 4 + ldr r0, ._172 + 4 @ gUnknown_Debug_083C517C mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText @@ -1907,7 +1907,7 @@ debug_sub_80915BC: lsl r2, r2, #0x5 add r0, r2, #0 strh r0, [r1] - ldr r2, ._172 + 8 + ldr r2, ._172 + 8 @ gSharedMem add r0, r2, #0 add r0, r0, #0x53 mov r1, #0x0 @@ -1917,9 +1917,9 @@ debug_sub_80915BC: sub r0, r0, #0x2 strb r1, [r0] bl debug_sub_80916AC - ldr r0, ._172 + 12 + ldr r0, ._172 + 12 @ debug_sub_8091320 bl SetVBlankCallback - ldr r0, ._172 + 16 + ldr r0, ._172 + 16 @ debug_sub_8091334 bl SetMainCallback2 pop {r3} mov r8, r3 @@ -1946,12 +1946,12 @@ debug_sub_80916AC: push {r5, r6, r7} add sp, sp, #0xfffffffc mov r6, #0x0 - ldr r0, ._177 + ldr r0, ._177 @ gSharedMem mov sl, r0 mov r1, #0x0 mov r8, r1 ._182: - ldr r2, ._177 + 4 + ldr r2, ._177 + 4 @ gSharedMem mov r5, #0x0 lsl r0, r6, #0x1 mov r9, r0 @@ -1963,7 +1963,7 @@ debug_sub_80916AC: ldrb r0, [r0] cmp r0, r5 bne ._175 @cond_branch - ldr r1, ._177 + 8 + ldr r1, ._177 + 8 @ gSharedMem ldrb r0, [r1] cmp r0, r6 bne ._175 @cond_branch @@ -1986,7 +1986,7 @@ debug_sub_80916AC: add r4, r1, r6 add r0, r4, r5 lsl r0, r0, #0x3 - ldr r1, ._183 + ldr r1, ._183 @ gUnknown_Debug_083C50EC add r0, r0, r1 ldr r1, [r0] add r0, r2, #0 @@ -1995,7 +1995,7 @@ debug_sub_80916AC: mov r0, r8 strb r0, [r2] add r2, r2, #0x1 - ldr r7, ._183 + 4 + ldr r7, ._183 + 4 @ gSharedMem add r4, r5, r4 add r4, r4, r7 ldrb r1, [r4] diff --git a/asm/tomomichi_debug_menu.s b/asm/tomomichi_debug_menu.s index e6e0db8d6..c0dfe38e0 100644 --- a/asm/tomomichi_debug_menu.s +++ b/asm/tomomichi_debug_menu.s @@ -32,12 +32,12 @@ debug_sub_808B874: mov r2, #0xd mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._1 + ldr r3, ._1 @ gUnknown_Debug_083C0CBA mov r0, #0x1 mov r1, #0x1 mov r2, #0x7 bl Menu_PrintItems - ldr r0, ._1 + 4 + ldr r0, ._1 + 4 @ gDebug_0300071D ldrb r0, [r0] str r0, [sp] mov r0, #0xc @@ -47,8 +47,8 @@ debug_sub_808B874: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._1 + 8 - ldr r0, ._1 + 12 + ldr r1, ._1 + 8 @ gMenuCallback + ldr r0, ._1 + 12 @ debug_sub_808B8C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -67,7 +67,7 @@ debug_sub_808B874: thumb_func_start debug_sub_808B8C8 debug_sub_808B8C8: push {r4, lr} - ldr r4, ._7 + ldr r4, ._7 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -78,7 +78,7 @@ debug_sub_808B8C8: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._7 + 4 + ldr r1, ._7 + 4 @ gDebug_0300071D strb r0, [r1] ._3: ldrh r1, [r4, #0x2e] @@ -90,7 +90,7 @@ debug_sub_808B8C8: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._7 + 4 + ldr r1, ._7 + 4 @ gDebug_0300071D strb r0, [r1] ._4: ldrh r1, [r4, #0x2e] @@ -100,8 +100,8 @@ debug_sub_808B8C8: beq ._5 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._7 + 8 - ldr r0, ._7 + 4 + ldr r1, ._7 + 8 @ gUnknown_Debug_083C0CBA + ldr r0, ._7 + 4 @ gDebug_0300071D ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -144,11 +144,11 @@ TomomichiDebugMenu_ContestGraphics: mov r2, #0x14 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._11 + ldr r0, ._11 @ gUnknown_Debug_083C0CF4 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._11 + 4 + ldr r3, ._11 + 4 @ gUnknown_Debug_083C0D2C mov r0, #0x2 mov r1, #0x3 mov r2, #0x4 @@ -162,18 +162,18 @@ TomomichiDebugMenu_ContestGraphics: mov r2, #0x3 mov r3, #0x4 bl InitMenu - ldr r1, ._11 + 8 - ldr r0, ._11 + 12 + ldr r1, ._11 + 8 @ gMenuCallback + ldr r0, ._11 + 12 @ debug_sub_808BC48 str r0, [r1] - ldr r0, ._11 + 16 + ldr r0, ._11 + 16 @ gDebug_03000700 mov r2, #0x1 strh r2, [r0] - ldr r1, ._11 + 20 - ldr r0, ._11 + 24 + ldr r1, ._11 + 20 @ gDebug_03000704 + ldr r0, ._11 + 24 @ 0x6f33 str r0, [r1] - ldr r0, ._11 + 28 + ldr r0, ._11 + 28 @ gDebug_03000708 str r4, [r0] - ldr r0, ._11 + 32 + ldr r0, ._11 + 32 @ gDebug_0300070C strb r2, [r0] mov r0, #0x0 add sp, sp, #0x8 @@ -205,11 +205,11 @@ TomomichiDebugMenu_ArtMusGraphics: mov r2, #0x14 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._13 + ldr r0, ._13 @ gUnknown_Debug_083C0D4C mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._13 + 4 + ldr r3, ._13 + 4 @ gUnknown_Debug_083C0D83 mov r0, #0x2 mov r1, #0x3 mov r2, #0x4 @@ -223,18 +223,18 @@ TomomichiDebugMenu_ArtMusGraphics: mov r2, #0x3 mov r3, #0x4 bl InitMenu - ldr r1, ._13 + 8 - ldr r0, ._13 + 12 + ldr r1, ._13 + 8 @ gMenuCallback + ldr r0, ._13 + 12 @ debug_sub_808BCBC str r0, [r1] - ldr r0, ._13 + 16 + ldr r0, ._13 + 16 @ gDebug_03000700 mov r2, #0x1 strh r2, [r0] - ldr r1, ._13 + 20 - ldr r0, ._13 + 24 + ldr r1, ._13 + 20 @ gDebug_03000704 + ldr r0, ._13 + 24 @ 0x6f33 str r0, [r1] - ldr r0, ._13 + 28 + ldr r0, ._13 + 28 @ gDebug_03000708 str r4, [r0] - ldr r0, ._13 + 32 + ldr r0, ._13 + 32 @ gDebug_0300070D strb r2, [r0] mov r0, #0x0 add sp, sp, #0x8 @@ -266,11 +266,11 @@ TomomichiDebugMenu_PreviewData: mov r2, #0x14 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r0, ._15 + ldr r0, ._15 @ gUnknown_Debug_083C0DA4 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._15 + 4 + ldr r3, ._15 + 4 @ gUnknown_Debug_083C0DD4 mov r0, #0x2 mov r1, #0x3 mov r2, #0x4 @@ -284,18 +284,18 @@ TomomichiDebugMenu_PreviewData: mov r2, #0x3 mov r3, #0x4 bl InitMenu - ldr r1, ._15 + 8 - ldr r0, ._15 + 12 + ldr r1, ._15 + 8 @ gMenuCallback + ldr r0, ._15 + 12 @ debug_sub_808BD30 str r0, [r1] - ldr r0, ._15 + 16 + ldr r0, ._15 + 16 @ gDebug_03000700 mov r2, #0x1 strh r2, [r0] - ldr r1, ._15 + 20 - ldr r0, ._15 + 24 + ldr r1, ._15 + 20 @ gDebug_03000704 + ldr r0, ._15 + 24 @ 0x6f33 str r0, [r1] - ldr r0, ._15 + 28 + ldr r0, ._15 + 28 @ gDebug_03000708 str r4, [r0] - ldr r0, ._15 + 32 + ldr r0, ._15 + 32 @ gDebug_0300070E strb r2, [r0] mov r0, #0x0 add sp, sp, #0x8 @@ -327,16 +327,16 @@ TomomichiDebugMenu_TrickHouse: mov r2, #0x18 mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r0, ._17 + ldr r0, ._17 @ gUnknown_Debug_083C0DF4 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._17 + 4 + ldr r3, ._17 + 4 @ gUnknown_Debug_083C0E15 mov r0, #0x2 mov r1, #0x3 mov r2, #0x2 bl Menu_PrintItems - ldr r0, ._17 + 8 + ldr r0, ._17 + 8 @ gDebug_0300071E ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -346,8 +346,8 @@ TomomichiDebugMenu_TrickHouse: mov r2, #0x3 mov r3, #0x2 bl InitMenu - ldr r1, ._17 + 12 - ldr r0, ._17 + 16 + ldr r1, ._17 + 12 @ gMenuCallback + ldr r0, ._17 + 16 @ debug_sub_808BDA4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -374,12 +374,12 @@ TomomichiDebugMenu_ControlEvents: mov r2, #0x18 mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._19 + ldr r3, ._19 @ gUnknown_Debug_083C0E32 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 bl Menu_PrintItems - ldr r0, ._19 + 4 + ldr r0, ._19 + 4 @ gDebug_0300071F ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -389,8 +389,8 @@ TomomichiDebugMenu_ControlEvents: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._19 + 8 - ldr r0, ._19 + 12 + ldr r1, ._19 + 8 @ gMenuCallback + ldr r0, ._19 + 12 @ debug_sub_808BE2C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -416,12 +416,12 @@ TomomichiDebugMenu_ControlFlags: mov r2, #0x18 mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._21 + ldr r3, ._21 @ gUnknown_Debug_083C0E7F mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 bl Menu_PrintItems - ldr r0, ._21 + 4 + ldr r0, ._21 + 4 @ gDebug_03000720 ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -431,8 +431,8 @@ TomomichiDebugMenu_ControlFlags: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._21 + 8 - ldr r0, ._21 + 12 + ldr r1, ._21 + 8 @ gMenuCallback + ldr r0, ._21 + 12 @ debug_sub_808BEB4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -458,12 +458,12 @@ TomomichiDebugMenu_ControlWorks: mov r2, #0x18 mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._23 + ldr r3, ._23 @ gUnknown_Debug_083C0EF1 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 bl Menu_PrintItems - ldr r0, ._23 + 4 + ldr r0, ._23 + 4 @ gDebug_03000721 ldrb r0, [r0] str r0, [sp] mov r0, #0x17 @@ -473,8 +473,8 @@ TomomichiDebugMenu_ControlWorks: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._23 + 8 - ldr r0, ._23 + 12 + ldr r1, ._23 + 8 @ gMenuCallback + ldr r0, ._23 + 12 @ debug_sub_808BF3C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -537,8 +537,8 @@ debug_sub_808BC48: ._34: cmp r1, #0x3 bne ._36 @cond_branch - ldr r0, ._37 - ldr r1, ._37 + 4 + ldr r0, ._37 @ gMenuCallback + ldr r1, ._37 + 4 @ gUnknown_Debug_083C0D2C ldr r1, [r1, #0x1c] str r1, [r0] ._36: @@ -602,8 +602,8 @@ debug_sub_808BCBC: ._48: cmp r1, #0x3 bne ._50 @cond_branch - ldr r0, ._51 - ldr r1, ._51 + 4 + ldr r0, ._51 @ gMenuCallback + ldr r1, ._51 + 4 @ gUnknown_Debug_083C0D83 ldr r1, [r1, #0x1c] str r1, [r0] ._50: @@ -667,8 +667,8 @@ debug_sub_808BD30: ._62: cmp r1, #0x3 bne ._64 @cond_branch - ldr r0, ._65 - ldr r1, ._65 + 4 + ldr r0, ._65 @ gMenuCallback + ldr r1, ._65 + 4 @ gUnknown_Debug_083C0DD4 ldr r1, [r1, #0x1c] str r1, [r0] ._64: @@ -688,7 +688,7 @@ debug_sub_808BD30: thumb_func_start debug_sub_808BDA4 debug_sub_808BDA4: push {r4, lr} - ldr r4, ._71 + ldr r4, ._71 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -699,7 +699,7 @@ debug_sub_808BDA4: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._71 + 4 + ldr r1, ._71 + 4 @ gDebug_0300071E strb r0, [r1] ._67: ldrh r1, [r4, #0x2e] @@ -711,7 +711,7 @@ debug_sub_808BDA4: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._71 + 4 + ldr r1, ._71 + 4 @ gDebug_0300071E strb r0, [r1] ._68: ldrh r1, [r4, #0x2e] @@ -721,8 +721,8 @@ debug_sub_808BDA4: beq ._69 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._71 + 8 - ldr r0, ._71 + 4 + ldr r1, ._71 + 8 @ gUnknown_Debug_083C0E15 + ldr r0, ._71 + 4 @ gDebug_0300071E ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -758,7 +758,7 @@ debug_sub_808BDA4: thumb_func_start debug_sub_808BE2C debug_sub_808BE2C: push {r4, lr} - ldr r4, ._79 + ldr r4, ._79 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -769,7 +769,7 @@ debug_sub_808BE2C: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._79 + 4 + ldr r1, ._79 + 4 @ gDebug_0300071F strb r0, [r1] ._75: ldrh r1, [r4, #0x2e] @@ -781,7 +781,7 @@ debug_sub_808BE2C: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._79 + 4 + ldr r1, ._79 + 4 @ gDebug_0300071F strb r0, [r1] ._76: ldrh r1, [r4, #0x2e] @@ -791,8 +791,8 @@ debug_sub_808BE2C: beq ._77 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._79 + 8 - ldr r0, ._79 + 4 + ldr r1, ._79 + 8 @ gUnknown_Debug_083C0E32 + ldr r0, ._79 + 4 @ gDebug_0300071F ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -828,7 +828,7 @@ debug_sub_808BE2C: thumb_func_start debug_sub_808BEB4 debug_sub_808BEB4: push {r4, lr} - ldr r4, ._87 + ldr r4, ._87 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -839,7 +839,7 @@ debug_sub_808BEB4: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._87 + 4 + ldr r1, ._87 + 4 @ gDebug_03000720 strb r0, [r1] ._83: ldrh r1, [r4, #0x2e] @@ -851,7 +851,7 @@ debug_sub_808BEB4: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._87 + 4 + ldr r1, ._87 + 4 @ gDebug_03000720 strb r0, [r1] ._84: ldrh r1, [r4, #0x2e] @@ -861,8 +861,8 @@ debug_sub_808BEB4: beq ._85 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._87 + 8 - ldr r0, ._87 + 4 + ldr r1, ._87 + 8 @ gUnknown_Debug_083C0E7F + ldr r0, ._87 + 4 @ gDebug_03000720 ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -898,7 +898,7 @@ debug_sub_808BEB4: thumb_func_start debug_sub_808BF3C debug_sub_808BF3C: push {r4, lr} - ldr r4, ._95 + ldr r4, ._95 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x40 and r0, r0, r1 @@ -909,7 +909,7 @@ debug_sub_808BF3C: mov r0, #0x1 neg r0, r0 bl Menu_MoveCursor - ldr r1, ._95 + 4 + ldr r1, ._95 + 4 @ gDebug_03000721 strb r0, [r1] ._91: ldrh r1, [r4, #0x2e] @@ -921,7 +921,7 @@ debug_sub_808BF3C: bl PlaySE mov r0, #0x1 bl Menu_MoveCursor - ldr r1, ._95 + 4 + ldr r1, ._95 + 4 @ gDebug_03000721 strb r0, [r1] ._92: ldrh r1, [r4, #0x2e] @@ -931,8 +931,8 @@ debug_sub_808BF3C: beq ._93 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._95 + 8 - ldr r0, ._95 + 4 + ldr r1, ._95 + 8 @ gUnknown_Debug_083C0EF1 + ldr r0, ._95 + 4 @ gDebug_03000721 ldrb r0, [r0] lsl r0, r0, #0x3 add r1, r1, #0x4 @@ -975,7 +975,7 @@ debug_sub_808BFC4: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._99 + ldr r3, ._99 @ gUnknown_Debug_083C0F79 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -989,8 +989,8 @@ debug_sub_808BFC4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._99 + 4 - ldr r0, ._99 + 8 + ldr r1, ._99 + 4 @ gMenuCallback + ldr r0, ._99 + 8 @ debug_sub_808C064 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1015,7 +1015,7 @@ debug_sub_808C014: mov r2, #0x1c mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._101 + ldr r3, ._101 @ gUnknown_Debug_083C0FFC mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -1029,8 +1029,8 @@ debug_sub_808C014: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._101 + 4 - ldr r0, ._101 + 8 + ldr r1, ._101 + 4 @ gMenuCallback + ldr r0, ._101 + 8 @ debug_sub_808C0A8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1062,8 +1062,8 @@ debug_sub_808C064: neg r0, r0 cmp r1, r0 beq ._105 @cond_branch - ldr r2, ._107 - ldr r0, ._107 + 4 + ldr r2, ._107 @ gMenuCallback + ldr r0, ._107 + 4 @ gUnknown_Debug_083C0F79 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1102,8 +1102,8 @@ debug_sub_808C0A8: neg r0, r0 cmp r1, r0 beq ._111 @cond_branch - ldr r2, ._113 - ldr r0, ._113 + 4 + ldr r2, ._113 @ gMenuCallback + ldr r0, ._113 + 4 @ gUnknown_Debug_083C0FFC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1128,7 +1128,7 @@ debug_sub_808C0A8: thumb_func_start debug_sub_808C0EC debug_sub_808C0EC: push {lr} - ldr r0, ._115 + ldr r0, ._115 @ DebugScript_081C1CFE bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1144,7 +1144,7 @@ debug_sub_808C0EC: thumb_func_start debug_sub_808C104 debug_sub_808C104: push {lr} - ldr r0, ._117 + ldr r0, ._117 @ DebugScript_081C1D07 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1160,7 +1160,7 @@ debug_sub_808C104: thumb_func_start debug_sub_808C11C debug_sub_808C11C: push {lr} - ldr r0, ._119 + ldr r0, ._119 @ DebugScript_081C1D1E bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1176,7 +1176,7 @@ debug_sub_808C11C: thumb_func_start debug_sub_808C134 debug_sub_808C134: push {lr} - ldr r0, ._121 + ldr r0, ._121 @ DebugScript_081C1D24 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1192,7 +1192,7 @@ debug_sub_808C134: thumb_func_start debug_sub_808C14C debug_sub_808C14C: push {lr} - ldr r0, ._123 + ldr r0, ._123 @ DebugScript_081C1D2A bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1208,7 +1208,7 @@ debug_sub_808C14C: thumb_func_start debug_sub_808C164 debug_sub_808C164: push {lr} - ldr r0, ._125 + ldr r0, ._125 @ DebugScript_081C1D35 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1224,7 +1224,7 @@ debug_sub_808C164: thumb_func_start debug_sub_808C17C debug_sub_808C17C: push {lr} - ldr r0, ._127 + ldr r0, ._127 @ DebugScript_081C1D46 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1240,7 +1240,7 @@ debug_sub_808C17C: thumb_func_start debug_sub_808C194 debug_sub_808C194: push {lr} - ldr r0, ._129 + ldr r0, ._129 @ DebugScript_081C221F bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1256,7 +1256,7 @@ debug_sub_808C194: thumb_func_start debug_sub_808C1AC debug_sub_808C1AC: push {lr} - ldr r0, ._131 + ldr r0, ._131 @ DebugScript_081C23E2 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1272,7 +1272,7 @@ debug_sub_808C1AC: thumb_func_start debug_sub_808C1C4 debug_sub_808C1C4: push {lr} - ldr r0, ._133 + ldr r0, ._133 @ DebugScript_081C23E6 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1288,7 +1288,7 @@ debug_sub_808C1C4: thumb_func_start debug_sub_808C1DC debug_sub_808C1DC: push {lr} - ldr r0, ._135 + ldr r0, ._135 @ DebugScript_081C23F6 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1304,7 +1304,7 @@ debug_sub_808C1DC: thumb_func_start debug_sub_808C1F4 debug_sub_808C1F4: push {lr} - ldr r0, ._137 + ldr r0, ._137 @ DebugScript_081C2482 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1320,7 +1320,7 @@ debug_sub_808C1F4: thumb_func_start debug_sub_808C20C debug_sub_808C20C: push {lr} - ldr r0, ._139 + ldr r0, ._139 @ DebugScript_081C23FD bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1336,7 +1336,7 @@ debug_sub_808C20C: thumb_func_start debug_sub_808C224 debug_sub_808C224: push {lr} - ldr r0, ._141 + ldr r0, ._141 @ DebugScript_081C2518 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1352,7 +1352,7 @@ debug_sub_808C224: thumb_func_start debug_sub_808C23C debug_sub_808C23C: push {lr} - ldr r0, ._143 + ldr r0, ._143 @ DebugScript_081C2507 bl ScriptContext1_SetupScript bl CloseMenu mov r0, #0x1 @@ -1376,8 +1376,8 @@ TomomichiDebugMenu_ContestGraphics_Show: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r1, ._145 - ldr r0, ._145 + 4 + ldr r1, ._145 @ gMenuCallback + ldr r0, ._145 + 4 @ debug_sub_808C280 str r0, [r1] mov r0, #0x0 add sp, sp, #0x4 @@ -1404,10 +1404,10 @@ debug_sub_808C280: bl CloseMenu mov r0, #0x0 bl debug_sub_808F168 - ldr r0, ._149 + ldr r0, ._149 @ CB2_ContestPainting bl SetMainCallback2 - ldr r1, ._149 + 4 - ldr r0, ._149 + 8 + ldr r1, ._149 + 4 @ gMain + ldr r0, ._149 + 8 @ debug_sub_808B868 str r0, [r1, #0x8] mov r0, #0x1 ._148: @@ -1433,8 +1433,8 @@ TomomichiDebugMenu_MuseumGraphics_Show: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r1, ._151 - ldr r0, ._151 + 4 + ldr r1, ._151 @ gMenuCallback + ldr r0, ._151 + 4 @ debug_sub_808C2E4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x4 @@ -1461,10 +1461,10 @@ debug_sub_808C2E4: bl CloseMenu mov r0, #0x1 bl debug_sub_808F168 - ldr r0, ._155 + ldr r0, ._155 @ CB2_ContestPainting bl SetMainCallback2 - ldr r1, ._155 + 4 - ldr r0, ._155 + 8 + ldr r1, ._155 + 4 @ gMain + ldr r0, ._155 + 8 @ debug_sub_808B868 str r0, [r1, #0x8] mov r0, #0x1 ._154: @@ -1489,7 +1489,7 @@ debug_sub_808C31C: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._157 + ldr r3, ._157 @ gUnknown_Debug_083C2828 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1503,8 +1503,8 @@ debug_sub_808C31C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._157 + 4 - ldr r0, ._157 + 8 + ldr r1, ._157 + 4 @ gMenuCallback + ldr r0, ._157 + 8 @ debug_sub_808C36C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1536,8 +1536,8 @@ debug_sub_808C36C: neg r0, r0 cmp r1, r0 beq ._161 @cond_branch - ldr r2, ._163 - ldr r0, ._163 + 4 + ldr r2, ._163 @ gMenuCallback + ldr r0, ._163 + 4 @ gUnknown_Debug_083C2828 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -1569,7 +1569,7 @@ debug_sub_808C3B0: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._165 + ldr r3, ._165 @ gUnknown_Debug_083C2938 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1583,10 +1583,10 @@ debug_sub_808C3B0: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._165 + 4 + ldr r0, ._165 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._165 + 8 - ldr r0, ._165 + 12 + ldr r1, ._165 + 8 @ gMenuCallback + ldr r0, ._165 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1613,7 +1613,7 @@ debug_sub_808C408: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._167 + ldr r3, ._167 @ gUnknown_Debug_083C2A48 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1627,11 +1627,11 @@ debug_sub_808C408: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._167 + 4 + ldr r1, ._167 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._167 + 8 - ldr r0, ._167 + 12 + ldr r1, ._167 + 8 @ gMenuCallback + ldr r0, ._167 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1657,7 +1657,7 @@ debug_sub_808C460: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._169 + ldr r3, ._169 @ gUnknown_Debug_083C2B4C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1671,11 +1671,11 @@ debug_sub_808C460: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._169 + 4 + ldr r1, ._169 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._169 + 8 - ldr r0, ._169 + 12 + ldr r1, ._169 + 8 @ gMenuCallback + ldr r0, ._169 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1701,7 +1701,7 @@ debug_sub_808C4B8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._171 + ldr r3, ._171 @ gUnknown_Debug_083C2C80 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1715,11 +1715,11 @@ debug_sub_808C4B8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._171 + 4 + ldr r1, ._171 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._171 + 8 - ldr r0, ._171 + 12 + ldr r1, ._171 + 8 @ gMenuCallback + ldr r0, ._171 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1745,7 +1745,7 @@ debug_sub_808C510: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._173 + ldr r3, ._173 @ gUnknown_Debug_083C2D8C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1759,11 +1759,11 @@ debug_sub_808C510: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._173 + 4 + ldr r1, ._173 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._173 + 8 - ldr r0, ._173 + 12 + ldr r1, ._173 + 8 @ gMenuCallback + ldr r0, ._173 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1789,7 +1789,7 @@ debug_sub_808C568: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._175 + ldr r3, ._175 @ gUnknown_Debug_083C2EB0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1803,11 +1803,11 @@ debug_sub_808C568: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._175 + 4 + ldr r1, ._175 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._175 + 8 - ldr r0, ._175 + 12 + ldr r1, ._175 + 8 @ gMenuCallback + ldr r0, ._175 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1833,7 +1833,7 @@ debug_sub_808C5C0: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._177 + ldr r3, ._177 @ gUnknown_Debug_083C2FE0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1847,11 +1847,11 @@ debug_sub_808C5C0: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._177 + 4 + ldr r1, ._177 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._177 + 8 - ldr r0, ._177 + 12 + ldr r1, ._177 + 8 @ gMenuCallback + ldr r0, ._177 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1877,7 +1877,7 @@ debug_sub_808C618: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._179 + ldr r3, ._179 @ gUnknown_Debug_083C3100 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -1891,11 +1891,11 @@ debug_sub_808C618: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._179 + 4 + ldr r1, ._179 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._179 + 8 - ldr r0, ._179 + 12 + ldr r1, ._179 + 8 @ gMenuCallback + ldr r0, ._179 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1921,7 +1921,7 @@ debug_sub_808C670: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r3, ._181 + ldr r3, ._181 @ gUnknown_Debug_083C3194 mov r0, #0x2 mov r1, #0x1 mov r2, #0x3 @@ -1935,11 +1935,11 @@ debug_sub_808C670: mov r2, #0x1 mov r3, #0x3 bl InitMenu - ldr r1, ._181 + 4 + ldr r1, ._181 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._181 + 8 - ldr r0, ._181 + 12 + ldr r1, ._181 + 8 @ gMenuCallback + ldr r0, ._181 + 12 @ debug_sub_808C6C8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -1964,7 +1964,7 @@ debug_sub_808C6C8: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._186 + ldr r5, ._186 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -2005,14 +2005,14 @@ debug_sub_808C714: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._191 + ldr r0, ._191 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._190 @cond_branch - ldr r0, ._191 + 4 + ldr r0, ._191 + 4 @ gUnknown_Debug_83C31E6 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -2050,12 +2050,12 @@ debug_sub_808C764: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._195 + ldr r0, ._195 @ gUnknown_Debug_083C31DC add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._193 @cond_branch - ldr r0, ._195 + 4 + ldr r0, ._195 + 4 @ gUnknown_Debug_83C31E6 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -2107,7 +2107,7 @@ debug_sub_808C7C8: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._197 + ldr r3, ._197 @ gUnknown_Debug_083C1CE8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2121,8 +2121,8 @@ debug_sub_808C7C8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._197 + 4 - ldr r0, ._197 + 8 + ldr r1, ._197 + 4 @ gMenuCallback + ldr r0, ._197 + 8 @ debug_sub_808C818 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2154,8 +2154,8 @@ debug_sub_808C818: neg r0, r0 cmp r1, r0 beq ._201 @cond_branch - ldr r2, ._203 - ldr r0, ._203 + 4 + ldr r2, ._203 @ gMenuCallback + ldr r0, ._203 + 4 @ gUnknown_Debug_083C1CE8 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -2187,7 +2187,7 @@ debug_sub_808C85C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._205 + ldr r3, ._205 @ gUnknown_Debug_083C1E0C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2201,10 +2201,10 @@ debug_sub_808C85C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._205 + 4 + ldr r0, ._205 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._205 + 8 - ldr r0, ._205 + 12 + ldr r1, ._205 + 8 @ gMenuCallback + ldr r0, ._205 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2231,7 +2231,7 @@ debug_sub_808C8B4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._207 + ldr r3, ._207 @ gUnknown_Debug_083C1F38 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2245,11 +2245,11 @@ debug_sub_808C8B4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._207 + 4 + ldr r1, ._207 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._207 + 8 - ldr r0, ._207 + 12 + ldr r1, ._207 + 8 @ gMenuCallback + ldr r0, ._207 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2275,7 +2275,7 @@ debug_sub_808C90C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._209 + ldr r3, ._209 @ gUnknown_Debug_083C206C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2289,11 +2289,11 @@ debug_sub_808C90C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._209 + 4 + ldr r1, ._209 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._209 + 8 - ldr r0, ._209 + 12 + ldr r1, ._209 + 8 @ gMenuCallback + ldr r0, ._209 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2319,7 +2319,7 @@ debug_sub_808C964: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._211 + ldr r3, ._211 @ gUnknown_Debug_083C2190 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2333,11 +2333,11 @@ debug_sub_808C964: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._211 + 4 + ldr r1, ._211 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._211 + 8 - ldr r0, ._211 + 12 + ldr r1, ._211 + 8 @ gMenuCallback + ldr r0, ._211 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2363,7 +2363,7 @@ debug_sub_808C9BC: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._213 + ldr r3, ._213 @ gUnknown_Debug_083C2264 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -2377,11 +2377,11 @@ debug_sub_808C9BC: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._213 + 4 + ldr r1, ._213 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._213 + 8 - ldr r0, ._213 + 12 + ldr r1, ._213 + 8 @ gMenuCallback + ldr r0, ._213 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2407,7 +2407,7 @@ debug_sub_808CA14: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._215 + ldr r3, ._215 @ gUnknown_Debug_083C2370 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2421,11 +2421,11 @@ debug_sub_808CA14: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._215 + 4 + ldr r1, ._215 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._215 + 8 - ldr r0, ._215 + 12 + ldr r1, ._215 + 8 @ gMenuCallback + ldr r0, ._215 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2451,7 +2451,7 @@ debug_sub_808CA6C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._217 + ldr r3, ._217 @ gUnknown_Debug_083C248C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2465,11 +2465,11 @@ debug_sub_808CA6C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._217 + 4 + ldr r1, ._217 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._217 + 8 - ldr r0, ._217 + 12 + ldr r1, ._217 + 8 @ gMenuCallback + ldr r0, ._217 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2495,7 +2495,7 @@ debug_sub_808CAC4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._219 + ldr r3, ._219 @ gUnknown_Debug_083C259C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2509,11 +2509,11 @@ debug_sub_808CAC4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._219 + 4 + ldr r1, ._219 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._219 + 8 - ldr r0, ._219 + 12 + ldr r1, ._219 + 8 @ gMenuCallback + ldr r0, ._219 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2539,7 +2539,7 @@ debug_sub_808CB1C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._221 + ldr r3, ._221 @ gUnknown_Debug_083C26C8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -2553,11 +2553,11 @@ debug_sub_808CB1C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._221 + 4 + ldr r1, ._221 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._221 + 8 - ldr r0, ._221 + 12 + ldr r1, ._221 + 8 @ gMenuCallback + ldr r0, ._221 + 12 @ debug_sub_808CB74 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2582,7 +2582,7 @@ debug_sub_808CB74: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._226 + ldr r5, ._226 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -2623,14 +2623,14 @@ debug_sub_808CBC0: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._231 + ldr r0, ._231 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._230 @cond_branch - ldr r0, ._231 + 4 + ldr r0, ._231 + 4 @ gUnknown_Debug_083C271A lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -2668,12 +2668,12 @@ debug_sub_808CC10: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._235 + ldr r0, ._235 @ gUnknown_Debug_083C2710 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._233 @cond_branch - ldr r0, ._235 + 4 + ldr r0, ._235 + 4 @ gUnknown_Debug_083C271A mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -2725,7 +2725,7 @@ debug_sub_808CC74: mov r2, #0x1c mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r3, ._237 + ldr r3, ._237 @ gUnknown_Debug_083C1ADC mov r0, #0x2 mov r1, #0x1 mov r2, #0x3 @@ -2739,8 +2739,8 @@ debug_sub_808CC74: mov r2, #0x1 mov r3, #0x3 bl InitMenu - ldr r1, ._237 + 4 - ldr r0, ._237 + 8 + ldr r1, ._237 + 4 @ gMenuCallback + ldr r0, ._237 + 8 @ debug_sub_808CCC4 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2772,8 +2772,8 @@ debug_sub_808CCC4: neg r0, r0 cmp r1, r0 beq ._241 @cond_branch - ldr r2, ._243 - ldr r0, ._243 + 4 + ldr r2, ._243 @ gMenuCallback + ldr r0, ._243 + 4 @ gUnknown_Debug_083C1ADC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -2805,7 +2805,7 @@ debug_sub_808CD08: mov r2, #0x1d mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._245 + ldr r3, ._245 @ gUnknown_Debug_083C1B7C mov r0, #0x2 mov r1, #0x1 mov r2, #0x8 @@ -2819,10 +2819,10 @@ debug_sub_808CD08: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r0, ._245 + 4 + ldr r0, ._245 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._245 + 8 - ldr r0, ._245 + 12 + ldr r1, ._245 + 8 @ gMenuCallback + ldr r0, ._245 + 12 @ debug_sub_808CE10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2849,7 +2849,7 @@ debug_sub_808CD60: mov r2, #0x1d mov r3, #0x9 bl Menu_DrawStdWindowFrame - ldr r3, ._247 + ldr r3, ._247 @ gUnknown_Debug_083C1BF0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x4 @@ -2863,11 +2863,11 @@ debug_sub_808CD60: mov r2, #0x1 mov r3, #0x4 bl InitMenu - ldr r1, ._247 + 4 + ldr r1, ._247 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._247 + 8 - ldr r0, ._247 + 12 + ldr r1, ._247 + 8 @ gMenuCallback + ldr r0, ._247 + 12 @ debug_sub_808CE10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2893,7 +2893,7 @@ debug_sub_808CDB8: mov r2, #0x1d mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r3, ._249 + ldr r3, ._249 @ gUnknown_Debug_083C1C2C mov r0, #0x2 mov r1, #0x1 mov r2, #0x1 @@ -2907,11 +2907,11 @@ debug_sub_808CDB8: mov r2, #0x1 mov r3, #0x1 bl InitMenu - ldr r1, ._249 + 4 + ldr r1, ._249 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._249 + 8 - ldr r0, ._249 + 12 + ldr r1, ._249 + 8 @ gMenuCallback + ldr r0, ._249 + 12 @ debug_sub_808CE10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -2936,7 +2936,7 @@ debug_sub_808CE10: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._254 + ldr r5, ._254 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -2977,14 +2977,14 @@ debug_sub_808CE5C: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._259 + ldr r0, ._259 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._258 @cond_branch - ldr r0, ._259 + 4 + ldr r0, ._259 + 4 @ gUnknown_Debug_083C1C38 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -3022,12 +3022,12 @@ debug_sub_808CEAC: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._263 + ldr r0, ._263 @ gUnknown_Debug_083C1C34 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._261 @cond_branch - ldr r0, ._263 + 4 + ldr r0, ._263 + 4 @ gUnknown_Debug_083C1C38 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -3079,7 +3079,7 @@ debug_sub_808CF10: mov r2, #0x1c mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._265 + ldr r3, ._265 @ gUnknown_Debug_083C1330 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3093,8 +3093,8 @@ debug_sub_808CF10: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._265 + 4 - ldr r0, ._265 + 8 + ldr r1, ._265 + 4 @ gMenuCallback + ldr r0, ._265 + 8 @ debug_sub_808CF60 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3126,8 +3126,8 @@ debug_sub_808CF60: neg r0, r0 cmp r1, r0 beq ._269 @cond_branch - ldr r2, ._271 - ldr r0, ._271 + 4 + ldr r2, ._271 @ gMenuCallback + ldr r0, ._271 + 4 @ gUnknown_Debug_083C1330 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -3159,7 +3159,7 @@ debug_sub_808CFA4: mov r2, #0x1d mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._273 + ldr r3, ._273 @ gUnknown_Debug_083C13D8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x8 @@ -3173,10 +3173,10 @@ debug_sub_808CFA4: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r0, ._273 + 4 + ldr r0, ._273 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._273 + 8 - ldr r0, ._273 + 12 + ldr r1, ._273 + 8 @ gMenuCallback + ldr r0, ._273 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3203,7 +3203,7 @@ debug_sub_808CFFC: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._275 + ldr r3, ._275 @ gUnknown_Debug_083C1465 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -3217,11 +3217,11 @@ debug_sub_808CFFC: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._275 + 4 + ldr r1, ._275 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._275 + 8 - ldr r0, ._275 + 12 + ldr r1, ._275 + 8 @ gMenuCallback + ldr r0, ._275 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3247,7 +3247,7 @@ debug_sub_808D054: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._277 + ldr r3, ._277 @ gUnknown_Debug_083C1503 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3261,11 +3261,11 @@ debug_sub_808D054: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._277 + 4 + ldr r1, ._277 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._277 + 8 - ldr r0, ._277 + 12 + ldr r1, ._277 + 8 @ gMenuCallback + ldr r0, ._277 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3291,7 +3291,7 @@ debug_sub_808D0AC: mov r2, #0x1d mov r3, #0x9 bl Menu_DrawStdWindowFrame - ldr r3, ._279 + ldr r3, ._279 @ gUnknown_Debug_083C158A mov r0, #0x2 mov r1, #0x1 mov r2, #0x4 @@ -3305,11 +3305,11 @@ debug_sub_808D0AC: mov r2, #0x1 mov r3, #0x4 bl InitMenu - ldr r1, ._279 + 4 + ldr r1, ._279 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._279 + 8 - ldr r0, ._279 + 12 + ldr r1, ._279 + 8 @ gMenuCallback + ldr r0, ._279 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3335,7 +3335,7 @@ debug_sub_808D104: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._281 + ldr r3, ._281 @ gUnknown_Debug_083C1647 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3349,11 +3349,11 @@ debug_sub_808D104: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._281 + 4 + ldr r1, ._281 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._281 + 8 - ldr r0, ._281 + 12 + ldr r1, ._281 + 8 @ gMenuCallback + ldr r0, ._281 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3379,7 +3379,7 @@ debug_sub_808D15C: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._283 + ldr r3, ._283 @ gUnknown_Debug_083C1712 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3393,11 +3393,11 @@ debug_sub_808D15C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._283 + 4 + ldr r1, ._283 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._283 + 8 - ldr r0, ._283 + 12 + ldr r1, ._283 + 8 @ gMenuCallback + ldr r0, ._283 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3423,7 +3423,7 @@ debug_sub_808D1B4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._285 + ldr r3, ._285 @ gUnknown_Debug_083C17F8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3437,11 +3437,11 @@ debug_sub_808D1B4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._285 + 4 + ldr r1, ._285 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._285 + 8 - ldr r0, ._285 + 12 + ldr r1, ._285 + 8 @ gMenuCallback + ldr r0, ._285 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3467,7 +3467,7 @@ debug_sub_808D20C: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._287 + ldr r3, ._287 @ gUnknown_Debug_083C18B8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -3481,11 +3481,11 @@ debug_sub_808D20C: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._287 + 4 + ldr r1, ._287 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._287 + 8 - ldr r0, ._287 + 12 + ldr r1, ._287 + 8 @ gMenuCallback + ldr r0, ._287 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3511,7 +3511,7 @@ debug_sub_808D264: mov r2, #0x1d mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._289 + ldr r3, ._289 @ gDebug_0x83C1974 mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -3525,11 +3525,11 @@ debug_sub_808D264: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._289 + 4 + ldr r1, ._289 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._289 + 8 - ldr r0, ._289 + 12 + ldr r1, ._289 + 8 @ gMenuCallback + ldr r0, ._289 + 12 @ debug_sub_808D2BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3554,7 +3554,7 @@ debug_sub_808D2BC: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._294 + ldr r5, ._294 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -3595,14 +3595,14 @@ debug_sub_808D308: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._299 + ldr r0, ._299 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._298 @cond_branch - ldr r0, ._299 + 4 + ldr r0, ._299 + 4 @ gUnknown_Debug_083C19C6 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -3640,12 +3640,12 @@ debug_sub_808D358: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._303 + ldr r0, ._303 @ gUnknown_Debug_083C19BC add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._301 @cond_branch - ldr r0, ._303 + 4 + ldr r0, ._303 + 4 @ gUnknown_Debug_083C19C6 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -3697,7 +3697,7 @@ debug_sub_808D3BC: mov r2, #0x1c mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._305 + ldr r3, ._305 @ gUnknown_Debug_083C105C mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -3711,8 +3711,8 @@ debug_sub_808D3BC: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._305 + 4 - ldr r0, ._305 + 8 + ldr r1, ._305 + 4 @ gMenuCallback + ldr r0, ._305 + 8 @ debug_sub_808D40C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3744,8 +3744,8 @@ debug_sub_808D40C: neg r0, r0 cmp r1, r0 beq ._309 @cond_branch - ldr r2, ._311 - ldr r0, ._311 + 4 + ldr r2, ._311 @ gMenuCallback + ldr r0, ._311 + 4 @ gUnknown_Debug_083C105C lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -3777,7 +3777,7 @@ debug_sub_808D450: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._313 + ldr r3, ._313 @ gUnknown_Debug_083C10BD mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -3791,10 +3791,10 @@ debug_sub_808D450: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._313 + 4 + ldr r0, ._313 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._313 + 8 - ldr r0, ._313 + 12 + ldr r1, ._313 + 8 @ gMenuCallback + ldr r0, ._313 + 12 @ debug_sub_808D500 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3821,7 +3821,7 @@ debug_sub_808D4A8: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._315 + ldr r3, ._315 @ gUnknown_Debug_083C1149 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -3835,11 +3835,11 @@ debug_sub_808D4A8: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._315 + 4 + ldr r1, ._315 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._315 + 8 - ldr r0, ._315 + 12 + ldr r1, ._315 + 8 @ gMenuCallback + ldr r0, ._315 + 12 @ debug_sub_808D500 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -3864,7 +3864,7 @@ debug_sub_808D500: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._320 + ldr r5, ._320 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -3905,14 +3905,14 @@ debug_sub_808D54C: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._325 + ldr r0, ._325 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._324 @cond_branch - ldr r0, ._325 + 4 + ldr r0, ._325 + 4 @ gUnknown_Debug_083C1196 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -3950,12 +3950,12 @@ debug_sub_808D59C: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._329 + ldr r0, ._329 @ gUnknown_Debug_083C1194 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._327 @cond_branch - ldr r0, ._329 + 4 + ldr r0, ._329 + 4 @ gUnknown_Debug_083C1196 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -4007,7 +4007,7 @@ debug_sub_808D600: mov r2, #0x1c mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._331 + ldr r3, ._331 @ gUnknown_Debug_083C11CC mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -4021,8 +4021,8 @@ debug_sub_808D600: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._331 + 4 - ldr r0, ._331 + 8 + ldr r1, ._331 + 4 @ gMenuCallback + ldr r0, ._331 + 8 @ debug_sub_808D650 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4054,8 +4054,8 @@ debug_sub_808D650: neg r0, r0 cmp r1, r0 beq ._335 @cond_branch - ldr r2, ._337 - ldr r0, ._337 + 4 + ldr r2, ._337 @ gMenuCallback + ldr r0, ._337 + 4 @ gUnknown_Debug_083C11CC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -4087,7 +4087,7 @@ debug_sub_808D694: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._339 + ldr r3, ._339 @ gUnknown_Debug_083C1212 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4101,10 +4101,10 @@ debug_sub_808D694: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._339 + 4 + ldr r0, ._339 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._339 + 8 - ldr r0, ._339 + 12 + ldr r1, ._339 + 8 @ gMenuCallback + ldr r0, ._339 + 12 @ debug_sub_808D744 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4131,7 +4131,7 @@ debug_sub_808D6EC: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._341 + ldr r3, ._341 @ gUnknown_Debug_083C1288 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -4145,11 +4145,11 @@ debug_sub_808D6EC: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._341 + 4 + ldr r1, ._341 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._341 + 8 - ldr r0, ._341 + 12 + ldr r1, ._341 + 8 @ gMenuCallback + ldr r0, ._341 + 12 @ debug_sub_808D744 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4174,7 +4174,7 @@ debug_sub_808D744: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._346 + ldr r5, ._346 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -4215,14 +4215,14 @@ debug_sub_808D790: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._351 + ldr r0, ._351 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._350 @cond_branch - ldr r0, ._351 + 4 + ldr r0, ._351 + 4 @ gUnknown_Debug_083C12D2 lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -4260,12 +4260,12 @@ debug_sub_808D7E0: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._355 + ldr r0, ._355 @ gUnknown_Debug_083C12D0 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._353 @cond_branch - ldr r0, ._355 + 4 + ldr r0, ._355 + 4 @ gUnknown_Debug_083C12D2 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -4317,7 +4317,7 @@ debug_sub_808D844: mov r2, #0x1c mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r3, ._357 + ldr r3, ._357 @ gUnknown_Debug_083C1A78 mov r0, #0x2 mov r1, #0x1 mov r2, #0x1 @@ -4331,8 +4331,8 @@ debug_sub_808D844: mov r2, #0x1 mov r3, #0x1 bl InitMenu - ldr r1, ._357 + 4 - ldr r0, ._357 + 8 + ldr r1, ._357 + 4 @ gMenuCallback + ldr r0, ._357 + 8 @ debug_sub_808D894 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4364,8 +4364,8 @@ debug_sub_808D894: neg r0, r0 cmp r3, r0 beq ._361 @cond_branch - ldr r2, ._363 - ldr r1, ._363 + 4 + ldr r2, ._363 @ gMenuCallback + ldr r1, ._363 + 4 @ gUnknown_Debug_083C1A78 lsl r0, r3, #0x3 add r0, r0, r1 ldr r0, [r0, #0x4] @@ -4396,7 +4396,7 @@ debug_sub_808D8D8: mov r2, #0x1d mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._365 + ldr r3, ._365 @ gUnknown_Debug_083C1A9C mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -4410,10 +4410,10 @@ debug_sub_808D8D8: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r0, ._365 + 4 + ldr r0, ._365 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._365 + 8 - ldr r0, ._365 + 12 + ldr r1, ._365 + 8 @ gMenuCallback + ldr r0, ._365 + 12 @ debug_sub_808D930 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4439,7 +4439,7 @@ debug_sub_808D930: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._370 + ldr r5, ._370 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -4480,14 +4480,14 @@ debug_sub_808D97C: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._375 + ldr r0, ._375 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._374 @cond_branch - ldr r0, ._375 + 4 + ldr r0, ._375 + 4 @ gUnknown_Debug_083C1AAE lsl r1, r2, #0x3 add r1, r1, r2 add r1, r1, r3 @@ -4525,12 +4525,12 @@ debug_sub_808D9CC: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._379 + ldr r0, ._379 @ gUnknown_Debug_083C1AAC add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._377 @cond_branch - ldr r0, ._379 + 4 + ldr r0, ._379 + 4 @ gUnknown_Debug_083C1AAE mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -4582,7 +4582,7 @@ debug_sub_808DA30: mov r2, #0x1d mov r3, #0x3 bl Menu_DrawStdWindowFrame - ldr r3, ._381 + ldr r3, ._381 @ gUnknown_Debug_083C103A mov r0, #0x2 mov r1, #0x1 mov r2, #0x1 @@ -4596,8 +4596,8 @@ debug_sub_808DA30: mov r2, #0x1 mov r3, #0x1 bl InitMenu - ldr r1, ._381 + 4 - ldr r0, ._381 + 8 + ldr r1, ._381 + 4 @ gMenuCallback + ldr r0, ._381 + 8 @ debug_sub_808DA80 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4648,7 +4648,7 @@ debug_sub_808DA80: thumb_func_start debug_sub_808DABC debug_sub_808DABC: push {lr} - ldr r0, ._386 + ldr r0, ._386 @ gSpecialVar_Result ldrh r2, [r0] mov r0, #0x18 mov r1, #0x1 @@ -4665,7 +4665,7 @@ debug_sub_808DABC: thumb_func_start debug_sub_808DAD4 debug_sub_808DAD4: push {lr} - ldr r0, ._390 + ldr r0, ._390 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -4684,9 +4684,9 @@ debug_sub_808DAD4: and r0, r0, r1 cmp r0, #0 beq ._392 @cond_branch - ldr r2, ._393 + ldr r2, ._393 @ 0xffff ._389: - ldr r1, ._393 + 4 + ldr r1, ._393 + 4 @ gSpecialVar_Result ldrh r0, [r1] add r0, r2, r0 strh r0, [r1] @@ -4711,7 +4711,7 @@ debug_sub_808DB0C: mov r2, #0x18 mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._395 + ldr r3, ._395 @ gUnknown_Debug_083C3D08 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4725,8 +4725,8 @@ debug_sub_808DB0C: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._395 + 4 - ldr r0, ._395 + 8 + ldr r1, ._395 + 4 @ gMenuCallback + ldr r0, ._395 + 8 @ debug_sub_808DB5C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4758,8 +4758,8 @@ debug_sub_808DB5C: neg r0, r0 cmp r1, r0 beq ._399 @cond_branch - ldr r2, ._401 - ldr r0, ._401 + 4 + ldr r2, ._401 @ gMenuCallback + ldr r0, ._401 + 4 @ gUnknown_Debug_083C3D08 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -4791,7 +4791,7 @@ debug_sub_808DBA0: mov r2, #0x1d mov r3, #0x11 bl Menu_DrawStdWindowFrame - ldr r3, ._403 + ldr r3, ._403 @ gUnknown_Debug_083C432C mov r0, #0x2 mov r1, #0x1 mov r2, #0x8 @@ -4805,10 +4805,10 @@ debug_sub_808DBA0: mov r2, #0x1 mov r3, #0x8 bl InitMenu - ldr r0, ._403 + 4 + ldr r0, ._403 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._403 + 8 - ldr r0, ._403 + 12 + ldr r1, ._403 + 8 @ gMenuCallback + ldr r0, ._403 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4835,7 +4835,7 @@ debug_sub_808DBF8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._405 + ldr r3, ._405 @ gUnknown_Debug_083C436C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4849,11 +4849,11 @@ debug_sub_808DBF8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._405 + 4 + ldr r1, ._405 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._405 + 8 - ldr r0, ._405 + 12 + ldr r1, ._405 + 8 @ gMenuCallback + ldr r0, ._405 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4879,7 +4879,7 @@ debug_sub_808DC50: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._407 + ldr r3, ._407 @ gUnknown_Debug_083C43B4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4893,11 +4893,11 @@ debug_sub_808DC50: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._407 + 4 + ldr r1, ._407 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._407 + 8 - ldr r0, ._407 + 12 + ldr r1, ._407 + 8 @ gMenuCallback + ldr r0, ._407 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4923,7 +4923,7 @@ debug_sub_808DCA8: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._409 + ldr r3, ._409 @ gUnknown_Debug_083C43FC mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4937,11 +4937,11 @@ debug_sub_808DCA8: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._409 + 4 + ldr r1, ._409 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._409 + 8 - ldr r0, ._409 + 12 + ldr r1, ._409 + 8 @ gMenuCallback + ldr r0, ._409 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -4967,7 +4967,7 @@ debug_sub_808DD00: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._411 + ldr r3, ._411 @ gUnknown_Debug_083C4444 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -4981,11 +4981,11 @@ debug_sub_808DD00: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._411 + 4 + ldr r1, ._411 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._411 + 8 - ldr r0, ._411 + 12 + ldr r1, ._411 + 8 @ gMenuCallback + ldr r0, ._411 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5011,7 +5011,7 @@ debug_sub_808DD58: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._413 + ldr r3, ._413 @ gUnknown_Debug_083C448C mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -5025,11 +5025,11 @@ debug_sub_808DD58: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._413 + 4 + ldr r1, ._413 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._413 + 8 - ldr r0, ._413 + 12 + ldr r1, ._413 + 8 @ gMenuCallback + ldr r0, ._413 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5055,7 +5055,7 @@ debug_sub_808DDB0: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._415 + ldr r3, ._415 @ gUnknown_Debug_83C44C4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5069,11 +5069,11 @@ debug_sub_808DDB0: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._415 + 4 + ldr r1, ._415 + 4 @ gDebug_0300070F mov r0, #0x6 strb r0, [r1] - ldr r1, ._415 + 8 - ldr r0, ._415 + 12 + ldr r1, ._415 + 8 @ gMenuCallback + ldr r0, ._415 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5099,7 +5099,7 @@ debug_sub_808DE08: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._417 + ldr r3, ._417 @ gUnknown_Debug_83C44EC mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5113,11 +5113,11 @@ debug_sub_808DE08: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._417 + 4 + ldr r1, ._417 + 4 @ gDebug_0300070F mov r0, #0x7 strb r0, [r1] - ldr r1, ._417 + 8 - ldr r0, ._417 + 12 + ldr r1, ._417 + 8 @ gMenuCallback + ldr r0, ._417 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5143,7 +5143,7 @@ debug_sub_808DE60: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._419 + ldr r3, ._419 @ gUnknown_Debug_083C4534 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5157,11 +5157,11 @@ debug_sub_808DE60: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._419 + 4 + ldr r1, ._419 + 4 @ gDebug_0300070F mov r0, #0x8 strb r0, [r1] - ldr r1, ._419 + 8 - ldr r0, ._419 + 12 + ldr r1, ._419 + 8 @ gMenuCallback + ldr r0, ._419 + 12 @ debug_sub_808DEB8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5186,7 +5186,7 @@ debug_sub_808DEB8: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._424 + ldr r5, ._424 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -5228,12 +5228,12 @@ debug_sub_808DF04: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._428 + ldr r0, ._428 @ gUnknown_Debug_083C457C add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._426 @cond_branch - ldr r0, ._428 + 4 + ldr r0, ._428 + 4 @ gUnknown_Debug_083C4586 mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -5280,7 +5280,7 @@ debug_sub_808DF64: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._432 + ldr r0, ._432 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -5299,9 +5299,9 @@ debug_sub_808DF64: and r0, r0, r1 cmp r0, #0 beq ._434 @cond_branch - ldr r5, ._435 + ldr r5, ._435 @ 0xffff ._431: - ldr r1, ._435 + 4 + ldr r1, ._435 + 4 @ gUnknown_Debug_083C4586 lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -5338,7 +5338,7 @@ debug_sub_808DFC0: mov r2, #0x18 mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._437 + ldr r3, ._437 @ gUnknown_Debug_083C377C mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5352,8 +5352,8 @@ debug_sub_808DFC0: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._437 + 4 - ldr r0, ._437 + 8 + ldr r1, ._437 + 4 @ gMenuCallback + ldr r0, ._437 + 8 @ debug_sub_808E010 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5385,8 +5385,8 @@ debug_sub_808E010: neg r0, r0 cmp r1, r0 beq ._441 @cond_branch - ldr r2, ._443 - ldr r0, ._443 + 4 + ldr r2, ._443 @ gMenuCallback + ldr r0, ._443 + 4 @ gUnknown_Debug_083C377C lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -5418,7 +5418,7 @@ debug_sub_808E054: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._445 + ldr r3, ._445 @ gUnknown_Debug_083C3AA0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5432,10 +5432,10 @@ debug_sub_808E054: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r0, ._445 + 4 + ldr r0, ._445 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._445 + 8 - ldr r0, ._445 + 12 + ldr r1, ._445 + 8 @ gMenuCallback + ldr r0, ._445 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5462,7 +5462,7 @@ debug_sub_808E0AC: mov r2, #0x1d mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._447 + ldr r3, ._447 @ gUnknown_Debug_83C3AE0 mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -5476,11 +5476,11 @@ debug_sub_808E0AC: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._447 + 4 + ldr r1, ._447 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._447 + 8 - ldr r0, ._447 + 12 + ldr r1, ._447 + 8 @ gMenuCallback + ldr r0, ._447 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5506,7 +5506,7 @@ debug_sub_808E104: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._449 + ldr r3, ._449 @ gUnknown_Debug_83C3B28 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5520,11 +5520,11 @@ debug_sub_808E104: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._449 + 4 + ldr r1, ._449 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._449 + 8 - ldr r0, ._449 + 12 + ldr r1, ._449 + 8 @ gMenuCallback + ldr r0, ._449 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5550,7 +5550,7 @@ debug_sub_808E15C: mov r2, #0x1d mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._451 + ldr r3, ._451 @ gUnknown_Debug_83C3B70 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -5564,11 +5564,11 @@ debug_sub_808E15C: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._451 + 4 + ldr r1, ._451 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._451 + 8 - ldr r0, ._451 + 12 + ldr r1, ._451 + 8 @ gMenuCallback + ldr r0, ._451 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5594,7 +5594,7 @@ debug_sub_808E1B4: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._453 + ldr r3, ._453 @ gUnknown_Debug_83C3BB8 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -5608,11 +5608,11 @@ debug_sub_808E1B4: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._453 + 4 + ldr r1, ._453 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._453 + 8 - ldr r0, ._453 + 12 + ldr r1, ._453 + 8 @ gMenuCallback + ldr r0, ._453 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5638,7 +5638,7 @@ debug_sub_808E20C: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._455 + ldr r3, ._455 @ gUnknown_Debug_83C3C00 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -5652,11 +5652,11 @@ debug_sub_808E20C: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._455 + 4 + ldr r1, ._455 + 4 @ gDebug_0300070F mov r0, #0x5 strb r0, [r1] - ldr r1, ._455 + 8 - ldr r0, ._455 + 12 + ldr r1, ._455 + 8 @ gMenuCallback + ldr r0, ._455 + 12 @ debug_sub_808E264 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5681,7 +5681,7 @@ debug_sub_808E264: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._460 + ldr r5, ._460 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -5723,12 +5723,12 @@ debug_sub_808E2B0: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._464 + ldr r0, ._464 @ gUnknown_Debug_083C3C48 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._462 @cond_branch - ldr r0, ._464 + 4 + ldr r0, ._464 + 4 @ gUnknown_Debug_83C3C4E mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -5775,7 +5775,7 @@ debug_sub_808E310: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._468 + ldr r0, ._468 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -5794,9 +5794,9 @@ debug_sub_808E310: and r0, r0, r1 cmp r0, #0 beq ._470 @cond_branch - ldr r5, ._471 + ldr r5, ._471 @ 0xffff ._467: - ldr r1, ._471 + 4 + ldr r1, ._471 + 4 @ gUnknown_Debug_83C3C4E lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -5833,7 +5833,7 @@ debug_sub_808E36C: mov r2, #0x18 mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._473 + ldr r3, ._473 @ gUnknown_Debug_083C32AC mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -5847,8 +5847,8 @@ debug_sub_808E36C: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._473 + 4 - ldr r0, ._473 + 8 + ldr r1, ._473 + 4 @ gMenuCallback + ldr r0, ._473 + 8 @ debug_sub_808E3BC str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5880,8 +5880,8 @@ debug_sub_808E3BC: neg r0, r0 cmp r1, r0 beq ._477 @cond_branch - ldr r2, ._479 - ldr r0, ._479 + 4 + ldr r2, ._479 @ gMenuCallback + ldr r0, ._479 + 4 @ gUnknown_Debug_083C32AC lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -5913,7 +5913,7 @@ debug_sub_808E400: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r3, ._481 + ldr r3, ._481 @ gUnknown_Debug_083C347C mov r0, #0x2 mov r1, #0x1 mov r2, #0x3 @@ -5927,10 +5927,10 @@ debug_sub_808E400: mov r2, #0x1 mov r3, #0x3 bl InitMenu - ldr r0, ._481 + 4 + ldr r0, ._481 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._481 + 8 - ldr r0, ._481 + 12 + ldr r1, ._481 + 8 @ gMenuCallback + ldr r0, ._481 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -5957,7 +5957,7 @@ debug_sub_808E458: mov r2, #0x1d mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._483 + ldr r3, ._483 @ gUnknown_Debug_083C3494 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -5971,11 +5971,11 @@ debug_sub_808E458: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._483 + 4 + ldr r1, ._483 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._483 + 8 - ldr r0, ._483 + 12 + ldr r1, ._483 + 8 @ gMenuCallback + ldr r0, ._483 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6001,7 +6001,7 @@ debug_sub_808E4B0: mov r2, #0x1d mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r3, ._485 + ldr r3, ._485 @ gUnknown_Debug_083C34A4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x6 @@ -6015,11 +6015,11 @@ debug_sub_808E4B0: mov r2, #0x1 mov r3, #0x6 bl InitMenu - ldr r1, ._485 + 4 + ldr r1, ._485 + 4 @ gDebug_0300070F mov r0, #0x2 strb r0, [r1] - ldr r1, ._485 + 8 - ldr r0, ._485 + 12 + ldr r1, ._485 + 8 @ gMenuCallback + ldr r0, ._485 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6045,7 +6045,7 @@ debug_sub_808E508: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._487 + ldr r3, ._487 @ gUnknown_Debug_083C34D4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -6059,11 +6059,11 @@ debug_sub_808E508: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r1, ._487 + 4 + ldr r1, ._487 + 4 @ gDebug_0300070F mov r0, #0x3 strb r0, [r1] - ldr r1, ._487 + 8 - ldr r0, ._487 + 12 + ldr r1, ._487 + 8 @ gMenuCallback + ldr r0, ._487 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6089,7 +6089,7 @@ debug_sub_808E560: mov r2, #0x1d mov r3, #0xb bl Menu_DrawStdWindowFrame - ldr r3, ._489 + ldr r3, ._489 @ gUnknown_Debug_083C351C mov r0, #0x2 mov r1, #0x1 mov r2, #0x5 @@ -6103,11 +6103,11 @@ debug_sub_808E560: mov r2, #0x1 mov r3, #0x5 bl InitMenu - ldr r1, ._489 + 4 + ldr r1, ._489 + 4 @ gDebug_0300070F mov r0, #0x4 strb r0, [r1] - ldr r1, ._489 + 8 - ldr r0, ._489 + 12 + ldr r1, ._489 + 8 @ gMenuCallback + ldr r0, ._489 + 12 @ debug_sub_808E5B8 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6132,7 +6132,7 @@ debug_sub_808E5B8: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._494 + ldr r5, ._494 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -6173,7 +6173,7 @@ debug_sub_808E604: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._498 + ldr r0, ._498 @ gMain ldrh r1, [r0, #0x30] mov r0, #0x80 lsl r0, r0, #0x1 @@ -6192,9 +6192,9 @@ debug_sub_808E604: and r0, r0, r1 cmp r0, #0 beq ._500 @cond_branch - ldr r5, ._501 + ldr r5, ._501 @ 0xffff ._497: - ldr r1, ._501 + 4 + ldr r1, ._501 + 4 @ gUnknown_Debug_083C354A lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -6229,12 +6229,12 @@ debug_sub_808E660: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._505 + ldr r0, ._505 @ gUnknown_Debug_083C3544 add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._503 @cond_branch - ldr r0, ._505 + 4 + ldr r0, ._505 + 4 @ gUnknown_Debug_083C354A mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -6284,7 +6284,7 @@ debug_sub_808E6C0: mov r2, #0x18 mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._507 + ldr r3, ._507 @ gUnknown_Debug_083C4644 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -6298,8 +6298,8 @@ debug_sub_808E6C0: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._507 + 4 - ldr r0, ._507 + 8 + ldr r1, ._507 + 4 @ gMenuCallback + ldr r0, ._507 + 8 @ debug_sub_808E710 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6331,8 +6331,8 @@ debug_sub_808E710: neg r0, r0 cmp r1, r0 beq ._511 @cond_branch - ldr r2, ._513 - ldr r0, ._513 + 4 + ldr r2, ._513 @ gMenuCallback + ldr r0, ._513 + 4 @ gUnknown_Debug_083C4644 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -6364,7 +6364,7 @@ debug_sub_808E754: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._515 + ldr r3, ._515 @ gUnknown_Debug_083C470C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -6378,10 +6378,10 @@ debug_sub_808E754: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._515 + 4 + ldr r0, ._515 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._515 + 8 - ldr r0, ._515 + 12 + ldr r1, ._515 + 8 @ gMenuCallback + ldr r0, ._515 + 12 @ debug_sub_808E804 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6408,7 +6408,7 @@ debug_sub_808E7AC: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._517 + ldr r3, ._517 @ gUnknown_Debug_083C4754C mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -6422,11 +6422,11 @@ debug_sub_808E7AC: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._517 + 4 + ldr r1, ._517 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._517 + 8 - ldr r0, ._517 + 12 + ldr r1, ._517 + 8 @ gMenuCallback + ldr r0, ._517 + 12 @ debug_sub_808E804 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6451,7 +6451,7 @@ debug_sub_808E804: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._522 + ldr r5, ._522 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -6492,7 +6492,7 @@ debug_sub_808E850: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._526 + ldr r0, ._526 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -6511,9 +6511,9 @@ debug_sub_808E850: and r0, r0, r1 cmp r0, #0 beq ._528 @cond_branch - ldr r5, ._529 + ldr r5, ._529 @ 0xffff ._525: - ldr r1, ._529 + 4 + ldr r1, ._529 + 4 @ gUnknown_Debug_083C478E lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -6548,12 +6548,12 @@ debug_sub_808E8AC: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._533 + ldr r0, ._533 @ gUnknown_Debug_083C478C add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._531 @cond_branch - ldr r0, ._533 + 4 + ldr r0, ._533 + 4 @ gUnknown_Debug_083C478E mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -6603,7 +6603,7 @@ debug_sub_808E90C: mov r2, #0x18 mov r3, #0x5 bl Menu_DrawStdWindowFrame - ldr r3, ._535 + ldr r3, ._535 @ gUnknown_Debug_083C35C4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x2 @@ -6617,8 +6617,8 @@ debug_sub_808E90C: mov r2, #0x1 mov r3, #0x2 bl InitMenu - ldr r1, ._535 + 4 - ldr r0, ._535 + 8 + ldr r1, ._535 + 4 @ gMenuCallback + ldr r0, ._535 + 8 @ debug_sub_808E95C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6650,8 +6650,8 @@ debug_sub_808E95C: neg r0, r0 cmp r1, r0 beq ._539 @cond_branch - ldr r2, ._541 - ldr r0, ._541 + 4 + ldr r2, ._541 @ gMenuCallback + ldr r0, ._541 + 4 @ gUnknown_Debug_083C35C4 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -6683,7 +6683,7 @@ debug_sub_808E9A0: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r3, ._543 + ldr r3, ._543 @ gUnknown_Debug_083C369C mov r0, #0x2 mov r1, #0x1 mov r2, #0x9 @@ -6697,10 +6697,10 @@ debug_sub_808E9A0: mov r2, #0x1 mov r3, #0x9 bl InitMenu - ldr r0, ._543 + 4 + ldr r0, ._543 + 4 @ gDebug_0300070F strb r4, [r0] - ldr r1, ._543 + 8 - ldr r0, ._543 + 12 + ldr r1, ._543 + 8 @ gMenuCallback + ldr r0, ._543 + 12 @ debug_sub_808EA50 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6727,7 +6727,7 @@ debug_sub_808E9F8: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r3, ._545 + ldr r3, ._545 @ gUnknown_Debug_083C36E4 mov r0, #0x2 mov r1, #0x1 mov r2, #0x7 @@ -6741,11 +6741,11 @@ debug_sub_808E9F8: mov r2, #0x1 mov r3, #0x7 bl InitMenu - ldr r1, ._545 + 4 + ldr r1, ._545 + 4 @ gDebug_0300070F mov r0, #0x1 strb r0, [r1] - ldr r1, ._545 + 8 - ldr r0, ._545 + 12 + ldr r1, ._545 + 8 @ gMenuCallback + ldr r0, ._545 + 12 @ debug_sub_808EA50 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6770,7 +6770,7 @@ debug_sub_808EA50: lsr r4, r4, #0x18 bl Menu_GetCursorPos add r1, r0, #0 - ldr r5, ._550 + ldr r5, ._550 @ gDebug_0300070F ldrb r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 @@ -6812,12 +6812,12 @@ debug_sub_808EA9C: lsl r0, r0, #0x18 lsr r1, r0, #0x18 mov r5, #0x0 - ldr r0, ._554 + ldr r0, ._554 @ gUnknown_Debug_083C371C add r0, r1, r0 ldrb r2, [r0] cmp r5, r2 bcs ._552 @cond_branch - ldr r0, ._554 + 4 + ldr r0, ._554 + 4 @ gUnknown_Debug_083C371E mov r8, r0 lsl r0, r1, #0x3 add r0, r0, r1 @@ -6864,7 +6864,7 @@ debug_sub_808EAFC: lsr r2, r0, #0x18 lsl r1, r1, #0x18 lsr r3, r1, #0x18 - ldr r0, ._558 + ldr r0, ._558 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x80 lsl r0, r0, #0x1 @@ -6883,9 +6883,9 @@ debug_sub_808EAFC: and r0, r0, r1 cmp r0, #0 beq ._560 @cond_branch - ldr r5, ._561 + ldr r5, ._561 @ 0xffff ._557: - ldr r1, ._561 + 4 + ldr r1, ._561 + 4 @ gUnknown_Debug_083C371E lsl r0, r2, #0x3 add r0, r0, r2 add r0, r0, r3 @@ -6922,11 +6922,11 @@ debug_sub_808EB58: mov r2, #0xc mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._563 + ldr r0, ._563 @ gUnknown_Debug_083C47B2 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._563 + 4 + ldr r3, ._563 + 4 @ gUnknown_Debug_083C47F0 mov r0, #0x2 mov r1, #0x3 mov r2, #0x8 @@ -6940,8 +6940,8 @@ debug_sub_808EB58: mov r2, #0x3 mov r3, #0x8 bl InitMenu - ldr r1, ._563 + 8 - ldr r0, ._563 + 12 + ldr r1, ._563 + 8 @ gMenuCallback + ldr r0, ._563 + 12 @ debug_sub_808EC10 str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -6967,11 +6967,11 @@ debug_sub_808EBB4: mov r2, #0xd mov r3, #0xd bl Menu_DrawStdWindowFrame - ldr r0, ._565 + ldr r0, ._565 @ gUnknown_Debug_083C4830 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r3, ._565 + 4 + ldr r3, ._565 + 4 @ gUnknown_Debug_083C4888 mov r0, #0x2 mov r1, #0x3 mov r2, #0x5 @@ -6985,8 +6985,8 @@ debug_sub_808EBB4: mov r2, #0x3 mov r3, #0x5 bl InitMenu - ldr r1, ._565 + 8 - ldr r0, ._565 + 12 + ldr r1, ._565 + 8 @ gMenuCallback + ldr r0, ._565 + 12 @ debug_sub_808EC5C str r0, [r1] mov r0, #0x0 add sp, sp, #0x8 @@ -7022,10 +7022,10 @@ debug_sub_808EC10: neg r0, r0 cmp r4, r0 beq ._568 @cond_branch - ldr r1, ._570 + ldr r1, ._570 @ gSaveBlock1 lsl r0, r2, #0x18 asr r0, r0, #0x18 - ldr r2, ._570 + 4 + ldr r2, ._570 + 4 @ 0x13c8 add r1, r1, r2 strh r0, [r1] bl CloseMenu @@ -7065,7 +7065,7 @@ debug_sub_808EC5C: neg r0, r0 cmp r4, r0 beq ._573 @cond_branch - ldr r0, ._575 + ldr r0, ._575 @ 0x40a7 lsl r1, r1, #0x18 asr r1, r1, #0x8 lsr r1, r1, #0x10 @@ -7097,8 +7097,8 @@ debug_sub_808ECA4: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r1, ._577 - ldr r0, ._577 + 4 + ldr r1, ._577 @ gMenuCallback + ldr r0, ._577 + 4 @ debug_sub_808ECD0 str r0, [r1] mov r0, #0x0 add sp, sp, #0x4 @@ -7125,10 +7125,10 @@ debug_sub_808ECD0: bl CloseMenu mov r0, #0x2 bl debug_sub_808F168 - ldr r0, ._581 + ldr r0, ._581 @ CB2_ContestPainting bl SetMainCallback2 - ldr r1, ._581 + 4 - ldr r0, ._581 + 8 + ldr r1, ._581 + 4 @ gMain + ldr r0, ._581 + 8 @ debug_sub_808B868 str r0, [r1, #0x8] mov r0, #0x1 ._580: @@ -7153,13 +7153,13 @@ TomomichiDebugMenu_Config: thumb_func_start debug_sub_808ED0C debug_sub_808ED0C: push {lr} - ldr r2, ._590 + ldr r2, ._590 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._584 @cond_branch - ldr r1, ._590 + 4 + ldr r1, ._590 + 4 @ gDebug_03000700 ldrh r0, [r1] cmp r0, #0x1 beq ._584 @cond_branch @@ -7171,9 +7171,9 @@ debug_sub_808ED0C: and r0, r0, r1 cmp r0, #0 beq ._586 @cond_branch - ldr r3, ._590 + 4 + ldr r3, ._590 + 4 @ gDebug_03000700 ldrh r1, [r3] - ldr r0, ._590 + 8 + ldr r0, ._590 + 8 @ 0x19b cmp r1, r0 beq ._586 @cond_branch add r0, r1, #1 @@ -7185,7 +7185,7 @@ debug_sub_808ED0C: and r0, r0, r1 cmp r0, #0 beq ._587 @cond_branch - ldr r1, ._590 + 4 + ldr r1, ._590 + 4 @ gDebug_03000700 ldrh r0, [r1] cmp r0, #0xa bls ._588 @cond_branch @@ -7208,9 +7208,9 @@ debug_sub_808ED0C: and r0, r0, r1 cmp r0, #0 beq ._592 @cond_branch - ldr r2, ._595 + ldr r2, ._595 @ gDebug_03000700 ldrh r1, [r2] - ldr r0, ._595 + 4 + ldr r0, ._595 + 4 @ 0x191 cmp r1, r0 bhi ._593 @cond_branch add r0, r1, #0 @@ -7222,7 +7222,7 @@ debug_sub_808ED0C: .word gDebug_03000700 .word 0x191 ._593: - ldr r1, ._597 + ldr r1, ._597 @ 0x19b add r0, r1, #0 ._594: strh r0, [r2] @@ -7239,13 +7239,13 @@ debug_sub_808ED0C: thumb_func_start debug_sub_808ED9C debug_sub_808ED9C: push {lr} - ldr r2, ._606 + ldr r2, ._606 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._600 @cond_branch - ldr r1, ._606 + 4 + ldr r1, ._606 + 4 @ gDebug_03000708 ldr r0, [r1] cmp r0, #0 beq ._600 @cond_branch @@ -7257,7 +7257,7 @@ debug_sub_808ED9C: and r0, r0, r1 cmp r0, #0 beq ._602 @cond_branch - ldr r3, ._606 + 4 + ldr r3, ._606 + 4 @ gDebug_03000708 ldr r1, [r3] mov r0, #0x1 neg r0, r0 @@ -7272,7 +7272,7 @@ debug_sub_808ED9C: and r0, r0, r1 cmp r0, #0 beq ._603 @cond_branch - ldr r1, ._606 + 4 + ldr r1, ._606 + 4 @ gDebug_03000708 ldr r0, [r1] cmp r0, #0xf bls ._604 @cond_branch @@ -7294,7 +7294,7 @@ debug_sub_808ED9C: and r0, r0, r1 cmp r0, #0 beq ._608 @cond_branch - ldr r3, ._611 + ldr r3, ._611 @ gDebug_03000708 ldr r1, [r3] mov r0, #0x11 neg r0, r0 @@ -7320,7 +7320,7 @@ debug_sub_808ED9C: and r0, r0, r2 cmp r0, r1 bne ._613 @cond_branch - ldr r1, ._614 + ldr r1, ._614 @ gDebug_03000708 mov r0, #0x1 neg r0, r0 str r0, [r1] @@ -7337,13 +7337,13 @@ debug_sub_808ED9C: thumb_func_start debug_sub_808EE3C debug_sub_808EE3C: push {lr} - ldr r2, ._622 + ldr r2, ._622 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._617 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C ldrb r0, [r1] cmp r0, #0x1 beq ._617 @cond_branch @@ -7355,7 +7355,7 @@ debug_sub_808EE3C: and r0, r0, r1 cmp r0, #0 beq ._619 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C ldrb r0, [r1] cmp r0, #0x5 beq ._619 @cond_branch @@ -7368,7 +7368,7 @@ debug_sub_808EE3C: and r0, r0, r1 cmp r0, #0 beq ._620 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C mov r0, #0x1 strb r0, [r1] ._620: @@ -7378,7 +7378,7 @@ debug_sub_808EE3C: and r0, r0, r1 cmp r0, #0 beq ._621 @cond_branch - ldr r1, ._622 + 4 + ldr r1, ._622 + 4 @ gDebug_0300070C mov r0, #0x5 strb r0, [r1] ._621: @@ -7395,13 +7395,13 @@ debug_sub_808EE3C: thumb_func_start debug_sub_808EE9C debug_sub_808EE9C: push {lr} - ldr r2, ._631 + ldr r2, ._631 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._625 @cond_branch - ldr r1, ._631 + 4 + ldr r1, ._631 + 4 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0x1 beq ._625 @cond_branch @@ -7413,7 +7413,7 @@ debug_sub_808EE9C: and r0, r0, r1 cmp r0, #0 beq ._627 @cond_branch - ldr r1, ._631 + 4 + ldr r1, ._631 + 4 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0xf beq ._627 @cond_branch @@ -7426,7 +7426,7 @@ debug_sub_808EE9C: and r0, r0, r1 cmp r0, #0 beq ._628 @cond_branch - ldr r1, ._631 + 4 + ldr r1, ._631 + 4 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0xa bls ._629 @cond_branch @@ -7448,7 +7448,7 @@ debug_sub_808EE9C: and r0, r0, r1 cmp r0, #0 beq ._633 @cond_branch - ldr r1, ._636 + ldr r1, ._636 @ gDebug_0300070D ldrb r0, [r1] cmp r0, #0x5 bhi ._634 @cond_branch @@ -7471,13 +7471,13 @@ debug_sub_808EE9C: thumb_func_start debug_sub_808EF14 debug_sub_808EF14: push {lr} - ldr r2, ._645 + ldr r2, ._645 @ gMain ldrh r1, [r2, #0x30] mov r0, #0x20 and r0, r0, r1 cmp r0, #0 beq ._639 @cond_branch - ldr r1, ._645 + 4 + ldr r1, ._645 + 4 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0x1 beq ._639 @cond_branch @@ -7489,7 +7489,7 @@ debug_sub_808EF14: and r0, r0, r1 cmp r0, #0 beq ._641 @cond_branch - ldr r1, ._645 + 4 + ldr r1, ._645 + 4 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0xf beq ._641 @cond_branch @@ -7502,7 +7502,7 @@ debug_sub_808EF14: and r0, r0, r1 cmp r0, #0 beq ._642 @cond_branch - ldr r1, ._645 + 4 + ldr r1, ._645 + 4 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0xa bls ._643 @cond_branch @@ -7524,7 +7524,7 @@ debug_sub_808EF14: and r0, r0, r1 cmp r0, #0 beq ._647 @cond_branch - ldr r1, ._650 + ldr r1, ._650 @ gDebug_0300070E ldrb r0, [r1] cmp r0, #0x5 bhi ._648 @cond_branch @@ -7556,9 +7556,9 @@ debug_sub_808EF8C: cmp r6, #0 blt ._653 @cond_branch mov r3, #0x0 - ldr r0, ._656 + ldr r0, ._656 @ gDebug_03000708 mov r8, r0 - ldr r4, ._656 + 4 + ldr r4, ._656 + 4 @ gDebug_03000710 mov r7, #0x7 mov r5, #0xf ._658: @@ -7590,7 +7590,7 @@ debug_sub_808EF8C: lsr r3, r0, #0x18 cmp r3, #0x7 bls ._658 @cond_branch - ldr r0, ._666 + ldr r0, ._666 @ gDebug_03000710 mov r1, #0xff strb r1, [r0, #0x8] mov r1, #0xc @@ -7598,9 +7598,9 @@ debug_sub_808EF8C: bl Menu_PrintText ._653: mov r3, #0x0 - ldr r7, ._666 - ldr r5, ._666 + 4 - ldr r2, ._666 + 8 + ldr r7, ._666 @ gDebug_03000710 + ldr r5, ._666 + 4 @ gDebug_03000700 + ldr r2, ._666 + 8 @ gSpeciesNames mov r8, r2 add r4, r7, #0 mov r2, #0x0 @@ -7622,7 +7622,7 @@ debug_sub_808EF8C: ldrb r0, [r0] cmp r0, #0xff beq ._661 @cond_branch - ldr r0, ._666 + ldr r0, ._666 @ gDebug_03000710 mov ip, r0 mov r5, r8 add r4, r1, #0 @@ -7666,15 +7666,15 @@ debug_sub_808EF8C: .word gDebug_03000700 .word gSpeciesNames ._664: - ldr r0, ._672 + ldr r0, ._672 @ gDebug_03000710 mov r1, #0xc mov r2, #0x1 bl Menu_PrintText ._665: - ldr r5, ._672 + ldr r5, ._672 @ gDebug_03000710 mov r0, #0xff strb r0, [r5, #0x3] - ldr r4, ._672 + 4 + ldr r4, ._672 + 4 @ gDebug_03000700 ldrh r0, [r4] mov r1, #0x64 bl __udivsi3 @@ -7715,14 +7715,14 @@ debug_sub_808EF8C: beq ._674 @cond_branch b ._679 ._670: - ldr r4, ._677 + ldr r4, ._677 @ gDebug_0300070C b ._676 ._678: .align 2, 0 ._677: .word gDebug_0300070C ._668: - ldr r4, ._680 + ldr r4, ._680 @ gDebug_0300070D ._676: ldrb r0, [r4] mov r1, #0x64 @@ -7753,7 +7753,7 @@ debug_sub_808EF8C: ._680: .word gDebug_0300070D ._674: - ldr r4, ._682 + ldr r4, ._682 @ gDebug_0300070E ldrb r0, [r4] mov r1, #0x64 bl __udivsi3 @@ -7795,14 +7795,14 @@ debug_sub_808F168: push {r4, lr} lsl r0, r0, #0x18 lsr r1, r0, #0x18 - ldr r4, ._686 - ldr r0, ._686 + 4 + ldr r4, ._686 @ 0x2015de0 + ldr r0, ._686 + 4 @ gDebug_03000700 ldrh r0, [r0] strh r0, [r4, #0x8] - ldr r0, ._686 + 8 + ldr r0, ._686 + 8 @ gDebug_03000704 ldr r0, [r0] str r0, [r4, #0x4] - ldr r0, ._686 + 12 + ldr r0, ._686 + 12 @ gDebug_03000708 ldr r0, [r0] str r0, [r4] cmp r1, #0x5 @@ -7810,14 +7810,14 @@ debug_sub_808F168: b ._707 ._684: lsl r0, r1, #0x2 - ldr r1, ._686 + 16 + ldr r1, ._686 + 16 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 ._687: .align 2, 0 ._686: - .word +0x2015de0 + .word 0x2015de0 .word gDebug_03000700 .word gDebug_03000704 .word gDebug_03000708 @@ -7830,63 +7830,63 @@ debug_sub_808F168: .word ._693 .word ._694 ._689: - ldr r0, ._696 - ldr r2, ._696 + 4 + ldr r0, ._696 @ 0x2000000 + ldr r2, ._696 + 4 @ 0x15ddf add r1, r0, r2 mov r2, #0x0 strb r2, [r1] - ldr r1, ._696 + 8 + ldr r1, ._696 + 8 @ 0x15dde add r0, r0, r1 strb r2, [r0] - ldr r0, ._696 + 12 + ldr r0, ._696 + 12 @ gDebug_0300070C ldrb r0, [r0] sub r0, r0, #0x1 strb r0, [r4, #0xa] add r0, r4, #0 add r0, r0, #0x16 - ldr r1, ._696 + 16 + ldr r1, ._696 + 16 @ gUnknown_Debug_083C48BB bl StringCopy b ._704 ._697: .align 2, 0 ._696: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gDebug_0300070C .word gUnknown_Debug_083C48BB ._690: - ldr r1, ._699 - ldr r0, ._699 + 4 + ldr r1, ._699 @ 0x2000000 + ldr r0, ._699 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x0 strb r0, [r2] - ldr r2, ._699 + 8 + ldr r2, ._699 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] - ldr r0, ._699 + 12 + ldr r0, ._699 + 12 @ gDebug_0300070D ldrb r0, [r0] sub r0, r0, #0x1 b ._698 ._700: .align 2, 0 ._699: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gDebug_0300070D ._691: - ldr r1, ._702 - ldr r0, ._702 + 4 + ldr r1, ._702 @ 0x2000000 + ldr r0, ._702 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x1 strb r0, [r2] - ldr r2, ._702 + 8 + ldr r2, ._702 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] - ldr r0, ._702 + 12 + ldr r0, ._702 + 12 @ gDebug_0300070E ldrb r0, [r0] sub r0, r0, #0x1 strb r0, [r4, #0xa] @@ -7894,17 +7894,17 @@ debug_sub_808F168: ._703: .align 2, 0 ._702: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gDebug_0300070E ._692: - ldr r1, ._705 - ldr r2, ._705 + 4 + ldr r1, ._705 @ 0x2000000 + ldr r2, ._705 + 4 @ 0x15ddf add r0, r1, r2 mov r2, #0x0 strb r2, [r0] - ldr r0, ._705 + 8 + ldr r0, ._705 + 8 @ 0x15dde add r1, r1, r0 mov r0, #0x8 strb r0, [r1] @@ -7913,16 +7913,16 @@ debug_sub_808F168: ._706: .align 2, 0 ._705: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde ._693: - ldr r1, ._708 - ldr r0, ._708 + 4 + ldr r1, ._708 @ 0x2000000 + ldr r0, ._708 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x0 strb r0, [r2] - ldr r2, ._708 + 8 + ldr r2, ._708 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] @@ -7932,23 +7932,23 @@ debug_sub_808F168: ._704: add r0, r4, #0 add r0, r0, #0xb - ldr r1, ._708 + 12 + ldr r1, ._708 + 12 @ gUnknown_Debug_083C48B0 bl StringCopy b ._707 ._709: .align 2, 0 ._708: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gUnknown_Debug_083C48B0 ._694: - ldr r1, ._710 - ldr r0, ._710 + 4 + ldr r1, ._710 @ 0x2000000 + ldr r0, ._710 + 4 @ 0x15ddf add r2, r1, r0 mov r0, #0x0 strb r0, [r2] - ldr r2, ._710 + 8 + ldr r2, ._710 + 8 @ 0x15dde add r1, r1, r2 mov r0, #0x8 strb r0, [r1] @@ -7956,7 +7956,7 @@ debug_sub_808F168: strb r0, [r4, #0xa] add r0, r4, #0 add r0, r0, #0xb - ldr r1, ._710 + 12 + ldr r1, ._710 + 12 @ gUnknown_Debug_083C48B0 bl StringCopy ._707: pop {r4} @@ -7965,7 +7965,7 @@ debug_sub_808F168: ._711: .align 2, 0 ._710: - .word +0x2000000 + .word 0x2000000 .word 0x15ddf .word 0x15dde .word gUnknown_Debug_083C48B0 @@ -7982,7 +7982,7 @@ debug_sub_808F2E0: lsl r2, r2, #0x18 cmp r2, #0 bne ._712 @cond_branch - ldr r1, ._714 + ldr r1, ._714 @ gDebug_03000710 mov r0, #0xa1 b ._713 ._715: @@ -7990,7 +7990,7 @@ debug_sub_808F2E0: ._714: .word gDebug_03000710 ._712: - ldr r1, ._716 + ldr r1, ._716 @ gDebug_03000710 mov r0, #0xa2 ._713: strb r0, [r1] @@ -8028,8 +8028,8 @@ debug_sub_808F31C: mov r9, r0 lsl r4, r4, #0x10 lsr r4, r4, #0x10 - ldr r5, ._718 - ldr r6, ._718 + 4 + ldr r5, ._718 @ gDebug_03000710 + ldr r6, ._718 + 4 @ 0x2710 add r0, r4, #0 add r1, r6, #0 bl __udivsi3 diff --git a/asm/unk_debug_menu_3.s b/asm/unk_debug_menu_3.s index e1be20589..2e4bef06c 100644 --- a/asm/unk_debug_menu_3.s +++ b/asm/unk_debug_menu_3.s @@ -9,8 +9,8 @@ debug_sub_813C404: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._1 - ldr r4, ._1 + 4 + ldr r5, ._1 @ gUnknown_Debug_845DDB2 + ldr r4, ._1 + 4 @ gUnknown_Debug_845DAE1 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -34,8 +34,8 @@ debug_sub_813C404: debug_sub_813C430: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._3 - ldr r4, ._3 + 4 + ldr r5, ._3 @ gUnknown_Debug_845E402 + ldr r4, ._3 + 4 @ gUnknown_Debug_845E3E0 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -59,8 +59,8 @@ debug_sub_813C430: debug_sub_813C45C: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._5 - ldr r4, ._5 + 4 + ldr r5, ._5 @ gUnknown_Debug_845E443 + ldr r4, ._5 + 4 @ gUnknown_Debug_845E422 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -84,8 +84,8 @@ debug_sub_813C45C: debug_sub_813C488: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._7 - ldr r4, ._7 + 4 + ldr r5, ._7 @ gUnknown_Debug_845E422 + ldr r4, ._7 + 4 @ gUnknown_Debug_845E402 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -108,8 +108,8 @@ debug_sub_813C488: thumb_func_start debug_sub_813C4B4 debug_sub_813C4B4: push {r4, lr} - ldr r4, ._9 - ldr r1, ._9 + 4 + ldr r4, ._9 @ gUnknown_Debug_845E619 + ldr r1, ._9 + 4 @ gUnknown_Debug_845E606 sub r4, r4, r1 add r2, r4, #0 bl memcpy @@ -129,8 +129,8 @@ debug_sub_813C4B4: debug_sub_813C4D4: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._11 - ldr r4, ._11 + 4 + ldr r5, ._11 @ gUnknown_Debug_845E712 + ldr r4, ._11 + 4 @ gUnknown_Debug_845E619 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -154,8 +154,8 @@ debug_sub_813C4D4: debug_sub_813C500: push {r4, r5, r6, lr} add r6, r0, #0 - ldr r5, ._13 - ldr r4, ._13 + 4 + ldr r5, ._13 @ gUnknown_Debug_845E797 + ldr r4, ._13 + 4 @ gUnknown_Debug_845E712 sub r5, r5, r4 add r1, r4, #0 add r2, r5, #0 @@ -185,14 +185,14 @@ debug_sub_813C52C: lsl r5, r1, #0x10 lsr r0, r5, #0x10 mov r9, r0 - ldr r6, ._15 - ldr r4, ._15 + 4 + ldr r6, ._15 @ gUnknown_Debug_845E7BB + ldr r4, ._15 + 4 @ gUnknown_Debug_845E797 sub r6, r6, r4 mov r0, r8 add r1, r4, #0 add r2, r6, #0 bl memcpy - ldr r0, ._15 + 8 + ldr r0, ._15 + 8 @ gUnknown_Debug_845E7B5 sub r0, r0, r4 add r0, r0, r8 add r0, r0, #0x3 @@ -252,7 +252,7 @@ debug_sub_813C598: thumb_func_start debug_sub_813C5A4 debug_sub_813C5A4: push {lr} - ldr r1, ._17 + ldr r1, ._17 @ 0x121 bl debug_sub_813C52C pop {r1} bx r1 @@ -267,19 +267,19 @@ debug_sub_813C5A4: debug_sub_813C5B4: push {r4, r5, r6, r7, lr} add r4, r0, #0 - ldr r7, ._23 - ldr r0, ._23 + 4 - ldr r1, ._23 + 8 + ldr r7, ._23 @ gSaveBlock1 + ldr r0, ._23 + 4 @ gUnknown_Debug_845DDD6 + ldr r1, ._23 + 8 @ gUnknown_Debug_845DDB2 sub r0, r0, r1 add r6, r0, r4 - ldr r0, ._23 + 12 + ldr r0, ._23 + 12 @ gUnknown_Debug_845E306 sub r5, r0, r1 - ldr r0, ._23 + 16 + ldr r0, ._23 + 16 @ Str_842E23C mov r1, #0x0 mov r2, #0x0 bl GetEnigmaBerryChecksum mov r2, #0x0 - ldr r3, ._23 + 20 + ldr r3, ._23 + 20 @ 0xfff mov r1, #0x0 ._19: add r0, r4, r2 @@ -290,7 +290,7 @@ debug_sub_813C5B4: mov r2, #0x0 cmp r2, r5 bcs ._20 @cond_branch - ldr r3, ._23 + 8 + ldr r3, ._23 + 8 @ gUnknown_Debug_845DDB2 ._21: add r0, r4, r2 add r1, r2, r3 @@ -301,7 +301,7 @@ debug_sub_813C5B4: bcc ._21 @cond_branch ._20: mov r2, #0x0 - ldr r3, ._23 + 24 + ldr r3, ._23 + 24 @ 0x52f ._22: add r0, r6, r2 add r1, r7, r2 @@ -311,7 +311,7 @@ debug_sub_813C5B4: cmp r2, r3 bls ._22 @cond_branch bl ClearEnigmaBerries - ldr r1, ._23 + 8 + ldr r1, ._23 + 8 @ gUnknown_Debug_845DDB2 add r0, r4, #0 bl unref_sub_81261B4 add r0, r5, #0 @@ -353,18 +353,18 @@ debug_sub_813C638: str r0, [sp, #0x4] mov r0, #0x1 str r0, [sp, #0x8] - ldr r0, ._25 + ldr r0, ._25 @ 0x270f str r0, [sp, #0xc] mov r0, r8 add r1, r4, #0 add r2, r5, #0 mov r3, #0x20 bl CreateMon - ldr r2, ._25 + 4 + ldr r2, ._25 + 4 @ Str_842E240 mov r0, r8 mov r1, #0x7 bl SetMonData - ldr r2, ._25 + 8 + ldr r2, ._25 + 8 @ Str_842E248 mov r0, r8 mov r1, #0x2 bl SetMonData @@ -468,10 +468,10 @@ debug_sub_813C740: push {r4, r5, r6} add sp, sp, #0xffffffd0 add r6, r0, #0 - ldr r0, ._29 + ldr r0, ._29 @ gUnknown_Debug_845E443 mov r8, r0 - ldr r1, ._29 + 4 - ldr r5, ._29 + 8 + ldr r1, ._29 + 4 @ gUnknown_Debug_845E4EF + ldr r5, ._29 + 8 @ gEnemyParty sub r1, r1, r0 mov r9, r1 add r0, r6, #0 @@ -504,7 +504,7 @@ debug_sub_813C740: mov r1, #0x23 add r2, r4, #0 bl SetMonData - ldr r1, ._29 + 12 + ldr r1, ._29 + 12 @ Str_842E238 add r0, r4, #0 mov r2, #0xb bl StringCopyN @@ -518,14 +518,14 @@ debug_sub_813C740: mov r1, #0x3 add r2, r4, #0 bl SetMonData - ldr r0, ._29 + 16 + ldr r0, ._29 + 16 @ gUnknown_Debug_845E467 add r0, r6, r0 mov r1, r8 sub r0, r0, r1 add r1, r5, #0 mov r2, #0x64 bl memcpy - ldr r0, ._29 + 20 + ldr r0, ._29 + 20 @ gUnknown_Debug_845E4CB add r6, r6, r0 mov r0, r8 sub r6, r6, r0 @@ -561,9 +561,9 @@ debug_sub_813C810: push {r6} add sp, sp, #0xffffffdc add r6, r0, #0 - ldr r5, ._31 - ldr r0, ._31 + 4 - ldr r4, ._31 + 8 + ldr r5, ._31 @ gUnknown_Debug_845E443 + ldr r0, ._31 + 4 @ gUnknown_Debug_845E4EF + ldr r4, ._31 + 8 @ gEnemyParty sub r0, r0, r5 mov r8, r0 add r0, r6, #0 @@ -578,13 +578,13 @@ debug_sub_813C810: add r0, r4, #0 mov r1, sp bl debug_sub_813C6AC - ldr r0, ._31 + 12 + ldr r0, ._31 + 12 @ gUnknown_Debug_845E467 add r0, r6, r0 sub r0, r0, r5 add r1, r4, #0 mov r2, #0x64 bl memcpy - ldr r0, ._31 + 16 + ldr r0, ._31 + 16 @ gUnknown_Debug_845E4CB add r0, r6, r0 sub r0, r0, r5 mov r1, sp @@ -618,9 +618,9 @@ debug_sub_813C888: push {r6} add sp, sp, #0xffffffdc add r6, r0, #0 - ldr r5, ._33 - ldr r0, ._33 + 4 - ldr r4, ._33 + 8 + ldr r5, ._33 @ gUnknown_Debug_845E443 + ldr r0, ._33 + 4 @ gUnknown_Debug_845E4EF + ldr r4, ._33 + 8 @ gEnemyParty sub r0, r0, r5 mov r8, r0 add r0, r6, #0 @@ -637,13 +637,13 @@ debug_sub_813C888: bl debug_sub_813C6AC mov r0, #0x0 strh r0, [r4, #0x1c] - ldr r0, ._33 + 12 + ldr r0, ._33 + 12 @ gUnknown_Debug_845E467 add r0, r6, r0 sub r0, r0, r5 add r1, r4, #0 mov r2, #0x64 bl memcpy - ldr r0, ._33 + 16 + ldr r0, ._33 + 16 @ gUnknown_Debug_845E4CB add r0, r6, r0 sub r0, r0, r5 mov r1, sp @@ -673,7 +673,7 @@ debug_sub_813C888: thumb_func_start debug_sub_813C904 debug_sub_813C904: push {r4, lr} - ldr r4, ._35 + ldr r4, ._35 @ gPlayerParty add r0, r4, #0 mov r1, #0x5 mov r2, #0x32 @@ -706,20 +706,20 @@ debug_sub_813C93C: push {r4, r5, r6, lr} add sp, sp, #0xffffff44 add r4, r0, #0 - ldr r6, ._37 - ldr r5, ._37 + 4 + ldr r6, ._37 @ gUnknown_Debug_845E4EF + ldr r5, ._37 + 4 @ gUnknown_Debug_845E606 sub r5, r5, r6 add r1, r6, #0 add r2, r5, #0 bl memcpy bl SavePlayerParty bl debug_sub_813C904 - ldr r1, ._37 + 8 - ldr r2, ._37 + 12 + ldr r1, ._37 + 8 @ Str_842E253 + ldr r2, ._37 + 12 @ 0x270f mov r0, sp bl debug_sub_8075DB4 bl LoadPlayerParty - ldr r0, ._37 + 16 + ldr r0, ._37 + 16 @ gUnknown_Debug_845E506 add r4, r4, r0 sub r4, r4, r6 add r0, r4, #0 diff --git a/asm/watanabe_debug_menu.s b/asm/watanabe_debug_menu.s index 6c56dab67..7f613b7a3 100644 --- a/asm/watanabe_debug_menu.s +++ b/asm/watanabe_debug_menu.s @@ -55,10 +55,10 @@ debug_80C35DC: mov r8, r0 mov r2, sp mov r6, #0x0 - ldr r1, ._2 + ldr r1, ._2 @ 0x40000d4 mov r5, #0x80 lsl r5, r5, #0x5 - ldr r7, ._2 + 4 + ldr r7, ._2 + 4 @ 0x81000800 mov r0, #0x81 lsl r0, r0, #0x18 mov ip, r0 @@ -88,7 +88,7 @@ debug_80C35DC: lsl r3, r3, #0x3 mov r4, #0x0 str r4, [sp, #0x4] - ldr r2, ._2 + ldr r2, ._2 @ 0x40000d4 mov r1, r8 str r1, [r2] str r0, [r2, #0x4] @@ -116,13 +116,13 @@ debug_80C35DC: bl ResetSpriteData bl ResetPaletteFade bl FreeAllSpritePalettes - ldr r0, ._2 + 8 + ldr r0, ._2 + 8 @ stru_83F8828 bl LoadSpriteSheet - ldr r0, ._2 + 12 + ldr r0, ._2 + 12 @ stru_83F8838 bl LoadSpritePalette - ldr r0, ._2 + 16 + ldr r0, ._2 + 16 @ gWindowTemplate_81E6C3C bl Text_LoadWindowTemplate - ldr r0, ._2 + 20 + ldr r0, ._2 + 20 @ gWindowTemplate_81E6CE4 bl InitMenuWindow add sp, sp, #0x8 pop {r3} @@ -157,13 +157,13 @@ debug_80C36F4: thumb_func_start debug_80C370C debug_80C370C: push {lr} - ldr r0, ._6 + ldr r0, ._6 @ gPaletteFade ldrb r1, [r0, #0x7] mov r0, #0x80 and r0, r0, r1 cmp r0, #0 bne ._4 @cond_branch - ldr r0, ._6 + 4 + ldr r0, ._6 + 4 @ debug_80C36F4 bl SetMainCallback2 b ._5 ._7: @@ -188,7 +188,7 @@ debug_80C373C: lsr r0, r0, #0x18 bl DestroyTask bl ScriptContext2_Disable - ldr r0, ._8 + ldr r0, ._8 @ sub_80546F0 bl SetMainCallback2 pop {r0} bx r0 @@ -297,7 +297,7 @@ debug_80C3800: lsl r2, r2, #0x18 lsr r5, r2, #0x18 mov r3, #0x0 - ldr r2, ._18 + ldr r2, ._18 @ gSpeciesNames mov r1, #0x0 ._14: mov r7, sp @@ -371,7 +371,7 @@ debug_80C3878: sub r0, r1, #1 b ._23 ._22: - ldr r1, ._25 + ldr r1, ._25 @ 0x19b b ._28 ._26: .align 2, 0 @@ -451,7 +451,7 @@ debug_80C38E4: lsr r5, r5, #0x18 lsl r6, r6, #0x18 lsr r6, r6, #0x18 - ldr r1, ._37 + ldr r1, ._37 @ gUnknown_Debug_083F7FD4 mov r0, sp mov r2, #0x2 bl memcpy @@ -483,7 +483,7 @@ debug_80C38E4: thumb_func_start debug_80C393C debug_80C393C: push {lr} - ldr r1, ._39 + ldr r1, ._39 @ gUnknown_Debug_083F7FD6 mov r0, #0x1e bl ProgramFlashSectorAndVerify pop {r0} @@ -498,8 +498,8 @@ debug_80C393C: thumb_func_start InitWatanabeDebugMenu InitWatanabeDebugMenu: push {r4, lr} - ldr r0, ._46 - ldr r1, ._46 + 4 + ldr r0, ._46 @ gMain + ldr r1, ._46 + 4 @ 0x43c add r4, r0, r1 ldrb r0, [r4] cmp r0, #0x1 @@ -541,7 +541,7 @@ InitWatanabeDebugMenu: cmp r0, #0 bne ._51 @cond_branch bl ScriptContext2_Disable - ldr r0, ._52 + ldr r0, ._52 @ sub_80546F0 bl SetMainCallback2 ._51: pop {r4} @@ -559,19 +559,19 @@ InitSizeComparison: push {r4, lr} add sp, sp, #0xfffffffc bl debug_80C35DC - ldr r1, ._54 + ldr r1, ._54 @ gReservedSpritePaletteCount mov r0, #0x1 strb r0, [r1] - ldr r0, ._54 + 4 + ldr r0, ._54 + 4 @ gUnknown_Debug_20389EC mov r1, #0x80 lsl r1, r1, #0x1 mov r2, #0x20 bl LoadPalette - ldr r3, ._54 + 8 + ldr r3, ._54 + 8 @ 0x4000208 ldrh r2, [r3] mov r0, #0x0 strh r0, [r3] - ldr r4, ._54 + 12 + ldr r4, ._54 + 12 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 @@ -584,9 +584,9 @@ InitSizeComparison: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._54 + 16 + ldr r0, ._54 + 16 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._54 + 20 + ldr r0, ._54 + 20 @ debug_80C370C bl SetMainCallback2 mov r1, #0x80 lsl r1, r1, #0x13 @@ -594,12 +594,12 @@ InitSizeComparison: lsl r2, r2, #0x5 add r0, r2, #0 strh r0, [r1] - ldr r0, ._54 + 24 + ldr r0, ._54 + 24 @ debug_80C3A50 mov r1, #0x0 bl CreateTask lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._54 + 28 + ldr r2, ._54 + 28 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 @@ -634,7 +634,7 @@ debug_80C3A50: add sp, sp, #0xffffffd8 lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r1, ._56 + ldr r1, ._56 @ gTasks lsl r2, r0, #0x2 add r0, r2, r0 lsl r0, r0, #0x3 @@ -649,7 +649,7 @@ debug_80C3A50: str r2, [sp, #0xc] lsr r2, r2, #0x10 mov r9, r2 - ldr r3, ._56 + 4 + ldr r3, ._56 + 4 @ gSaveBlock2 mov r8, r3 mov r0, #0x6 mov r1, #0x0 @@ -661,12 +661,12 @@ debug_80C3A50: mov r2, #0x5 mov r3, #0x9 bl Menu_DrawStdWindowFrame - ldr r5, ._56 + 8 + ldr r5, ._56 + 8 @ gUnknown_Debug_083F7FD6 add r0, r5, #0 mov r1, #0x1 mov r2, #0x1 bl Menu_PrintText - ldr r4, ._56 + 12 + ldr r4, ._56 + 12 @ gUnknown_Debug_083F7FDE add r0, r4, #0 mov r1, #0x1 mov r2, #0x5 @@ -689,19 +689,19 @@ debug_80C3A50: mov r2, #0xb mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._56 + 16 + ldr r0, ._56 + 16 @ gUnknown_Debug_083F7FE2 mov r1, #0x1 mov r2, #0xb bl Menu_PrintText - ldr r0, ._56 + 20 + ldr r0, ._56 + 20 @ gUnknown_Debug_083F7FED mov r1, #0x1 mov r2, #0xd bl Menu_PrintText - ldr r0, ._56 + 24 + ldr r0, ._56 + 24 @ gUnknown_Debug_083F7FF6 mov r1, #0x1 mov r2, #0xf bl Menu_PrintText - ldr r0, ._56 + 28 + ldr r0, ._56 + 28 @ gUnknown_Debug_083F8001 mov r1, #0x1 mov r2, #0x11 bl Menu_PrintText @@ -710,11 +710,11 @@ debug_80C3A50: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r0, ._56 + 32 + ldr r0, ._56 + 32 @ gUnknown_Debug_083F800C mov r1, #0xd mov r2, #0xb bl Menu_PrintText - ldr r0, ._56 + 36 + ldr r0, ._56 + 36 @ gUnknown_Debug_083F8019 mov r1, #0xd mov r2, #0xd bl Menu_PrintText @@ -723,11 +723,11 @@ debug_80C3A50: mov r2, #0x1d mov r3, #0x13 bl Menu_DrawStdWindowFrame - ldr r0, ._56 + 40 + ldr r0, ._56 + 40 @ gUnknown_Debug_083F8022 mov r1, #0xd mov r2, #0x11 bl Menu_PrintText - ldr r0, ._56 + 44 + ldr r0, ._56 + 44 @ gUnknown_Debug_083F8028 mov r1, #0x18 mov r2, #0x11 bl Menu_PrintText @@ -751,7 +751,7 @@ debug_80C3A50: lsl r4, r0, #0x4 add r4, r4, r0 lsl r4, r4, #0x2 - ldr r1, ._56 + 48 + ldr r1, ._56 + 48 @ gSprites add r4, r4, r1 ldrb r1, [r4, #0x1] mov r2, #0x4 @@ -783,7 +783,7 @@ debug_80C3A50: lsl r0, r0, #0x10 lsr r0, r0, #0x10 bl FreeSpritePaletteByTag - ldr r0, ._56 + 52 + ldr r0, ._56 + 52 @ gPokedexEntries ldr r1, [sp, #0x4] lsl r5, r1, #0x3 add r5, r5, r1 @@ -817,7 +817,7 @@ debug_80C3A50: lsl r4, r1, #0x4 add r4, r4, r1 lsl r4, r4, #0x2 - ldr r2, ._56 + 48 + ldr r2, ._56 + 48 @ gSprites add r4, r4, r2 ldrb r0, [r4, #0x1] mov r3, sl @@ -861,14 +861,14 @@ debug_80C3A50: mov r3, #0x0 strh r3, [r7, #0x18] strh r3, [r7, #0x1a] - ldr r1, ._56 + 56 - ldr r2, ._56 + 60 + ldr r1, ._56 + 56 @ 0x4000048 + ldr r2, ._56 + 60 @ 0x3f1f add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 mov r0, #0x1f strh r0, [r1] - ldr r2, ._56 + 64 + ldr r2, ._56 + 64 @ 0x4000040 mov r3, #0x18 ldsh r1, [r7, r3] lsl r1, r1, #0x6 @@ -878,22 +878,22 @@ debug_80C3A50: add r1, r1, #0x78 add r0, r0, r1 strh r0, [r2] - ldr r1, ._56 + 68 - ldr r2, ._56 + 72 + ldr r1, ._56 + 68 @ 0x4000044 + ldr r2, ._56 + 72 @ 0x848 add r0, r2, #0 strh r0, [r1] sub r1, r1, #0x2 - ldr r3, ._56 + 76 + ldr r3, ._56 + 76 @ 0x31bf add r0, r3, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._56 + 80 + ldr r2, ._56 + 80 @ 0x14f add r0, r2, #0 strh r0, [r1] add r1, r1, #0xa mov r0, #0xe1 strh r0, [r1] - ldr r0, ._56 + 84 + ldr r0, ._56 + 84 @ 0x4000052 mov r3, #0x0 strh r3, [r0] add r1, r1, #0x4 @@ -907,7 +907,7 @@ debug_80C3A50: add r1, r3, #0 orr r0, r0, r1 strh r0, [r2] - ldr r0, ._56 + 88 + ldr r0, ._56 + 88 @ debug_80C3D2C str r0, [r7] add sp, sp, #0x28 pop {r3, r4, r5} @@ -955,7 +955,7 @@ debug_80C3D2C: lsl r0, r0, #0x18 lsr r6, r0, #0x18 add r7, r6, #0 - ldr r4, ._60 + ldr r4, ._60 @ gMain ldrh r1, [r4, #0x2e] mov r0, #0x2 and r0, r0, r1 @@ -970,14 +970,14 @@ debug_80C3D2C: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._60 + 4 + ldr r0, ._60 + 4 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._60 + 8 + ldr r1, ._60 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._60 + 12 + ldr r1, ._60 + 12 @ debug_80C373C str r1, [r0] b ._117 ._61: @@ -995,7 +995,7 @@ debug_80C3D2C: beq ._62 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._64 + ldr r1, ._64 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 @@ -1015,7 +1015,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._66 @cond_branch - ldr r1, ._70 + ldr r1, ._70 @ gTasks lsl r2, r6, #0x2 add r0, r2, r6 lsl r0, r0, #0x3 @@ -1089,7 +1089,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._80 @cond_branch - ldr r1, ._84 + ldr r1, ._84 @ gTasks lsl r2, r6, #0x2 add r0, r2, r6 lsl r0, r0, #0x3 @@ -1165,7 +1165,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._94 @cond_branch - ldr r0, ._97 + ldr r0, ._97 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 @@ -1192,7 +1192,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._100 @cond_branch - ldr r0, ._103 + ldr r0, ._103 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 @@ -1219,7 +1219,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._106 @cond_branch - ldr r2, ._109 + ldr r2, ._109 @ gTasks lsl r3, r6, #0x2 add r0, r3, r6 lsl r0, r0, #0x3 @@ -1227,7 +1227,7 @@ debug_80C3D2C: ldrh r4, [r6, #0x8] mov r0, #0x8 ldsh r1, [r6, r0] - ldr r0, ._109 + 4 + ldr r0, ._109 + 4 @ 0x181 mov r8, r2 add r2, r3, #0 cmp r1, r0 @@ -1254,7 +1254,7 @@ debug_80C3D2C: and r0, r0, r1 cmp r0, #0 beq ._112 @cond_branch - ldr r1, ._115 + ldr r1, ._115 @ gTasks lsl r2, r6, #0x2 add r0, r2, r6 lsl r0, r0, #0x3 @@ -1285,7 +1285,7 @@ debug_80C3D2C: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r5, ._118 + ldr r5, ._118 @ gSprites add r0, r0, r5 bl DestroySprite mov r0, #0xe @@ -1295,7 +1295,7 @@ debug_80C3D2C: lsl r0, r0, #0x2 add r0, r0, r5 bl DestroySprite - ldr r0, ._118 + 4 + ldr r0, ._118 + 4 @ debug_80C3A50 str r0, [r4] b ._117 ._119: @@ -1304,7 +1304,7 @@ debug_80C3D2C: .word gSprites .word debug_80C3A50+1 ._112: - ldr r0, ._120 + ldr r0, ._120 @ gTasks lsl r5, r7, #0x2 add r5, r5, r7 lsl r5, r5, #0x3 @@ -1327,7 +1327,7 @@ debug_80C3D2C: mov r2, #0x7 mov r3, #0x4 bl debug_80C68CC - ldr r2, ._120 + 4 + ldr r2, ._120 + 4 @ gSprites mov r8, r2 mov r4, #0xc ldsh r1, [r5, r4] @@ -1361,7 +1361,7 @@ debug_80C3D2C: lsl r0, r0, #0x2 add r0, r0, r8 strh r6, [r0, #0x26] - ldr r2, ._120 + 8 + ldr r2, ._120 + 8 @ 0x4000040 mov r4, #0x18 ldsh r1, [r5, r4] lsl r1, r1, #0x6 @@ -1411,7 +1411,7 @@ debug_80C405C: cmp r5, #0 beq ._125 @cond_branch mov r2, #0x0 - ldr r3, ._127 + ldr r3, ._127 @ gSpeciesNames mov r0, #0xb add r1, r5, #0 mul r1, r1, r0 @@ -1462,7 +1462,7 @@ debug_80C40C4: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._132 + ldr r0, ._132 @ gEnemyParty add r4, r1, r0 add r0, r4, #0 mov r1, #0xb @@ -1488,7 +1488,7 @@ debug_80C40C4: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._136 + ldr r0, ._136 @ gPlayerParty add r4, r1, r0 add r0, r4, #0 mov r1, #0xb @@ -1526,8 +1526,8 @@ debug_80C40C4: InitBattleForDebug: push {lr} bl SavePlayerParty - ldr r1, ._138 - ldr r0, ._138 + 4 + ldr r1, ._138 @ gUnknown_Debug_2038A0C + ldr r0, ._138 + 4 @ gSaveBlock2 ldrb r2, [r0, #0x8] mov r0, #0x0 strb r2, [r1, #0xd] @@ -1541,13 +1541,13 @@ InitBattleForDebug: strb r0, [r1, #0x7] strb r0, [r1, #0x8] strb r0, [r1, #0xc] - ldr r1, ._138 + 8 + ldr r1, ._138 + 8 @ byte_3005E30 str r0, [r1] bl ZeroPlayerPartyMons bl ZeroEnemyPartyMons mov r0, #0x0 bl debug_80C4214 - ldr r0, ._138 + 12 + ldr r0, ._138 + 12 @ debug_80C47BC mov r1, #0x0 bl CreateTask pop {r0} @@ -1565,7 +1565,7 @@ InitBattleForDebug: thumb_func_start debug_80C41A8 debug_80C41A8: push {lr} - ldr r1, ._140 + ldr r1, ._140 @ gUnknown_Debug_2038A0C mov r0, #0x0 strb r0, [r1, #0x1] strb r0, [r1, #0x2] @@ -1573,7 +1573,7 @@ debug_80C41A8: bl ZeroEnemyPartyMons mov r0, #0x0 bl debug_80C4214 - ldr r0, ._140 + 4 + ldr r0, ._140 + 4 @ debug_80C47BC mov r1, #0x0 bl CreateTask pop {r0} @@ -1593,7 +1593,7 @@ debug_80C41D4: bl debug_80C40C4 mov r0, #0x0 bl debug_80C4214 - ldr r0, ._142 + ldr r0, ._142 @ debug_80C42B8 mov r1, #0x0 bl CreateTask pop {r0} @@ -1612,7 +1612,7 @@ debug_80C41F4: bl debug_80C40C4 mov r0, #0x1 bl debug_80C4214 - ldr r0, ._144 + ldr r0, ._144 @ debug_80C42B8 mov r1, #0x0 bl CreateTask pop {r0} @@ -1628,17 +1628,17 @@ debug_80C41F4: debug_80C4214: push {r4, r5, r6, lr} bl debug_80C35DC - ldr r6, ._146 + ldr r6, ._146 @ 0x4000040 mov r4, #0x0 strh r4, [r6] - ldr r5, ._146 + 4 + ldr r5, ._146 + 4 @ 0x4000044 strh r4, [r5] - ldr r0, ._146 + 8 + ldr r0, ._146 + 8 @ 0x4000042 strh r4, [r0] add r0, r0, #0x4 strh r4, [r0] - ldr r1, ._146 + 12 - ldr r2, ._146 + 16 + ldr r1, ._146 + 12 @ 0x4000048 + ldr r2, ._146 + 16 @ 0x1111 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 @@ -1647,33 +1647,33 @@ debug_80C4214: add r1, r1, #0x6 mov r0, #0xe1 strh r0, [r1] - ldr r0, ._146 + 20 + ldr r0, ._146 + 20 @ 0x4000052 strh r4, [r0] add r1, r1, #0x4 mov r0, #0x7 strh r0, [r1] - ldr r3, ._146 + 24 + ldr r3, ._146 + 24 @ 0x4000208 ldrh r2, [r3] strh r4, [r3] - ldr r4, ._146 + 28 + ldr r4, ._146 + 28 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, ._146 + 32 + ldr r0, ._146 + 32 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._146 + 36 + ldr r0, ._146 + 36 @ debug_80C370C bl SetMainCallback2 mov r1, #0x80 lsl r1, r1, #0x13 - ldr r2, ._146 + 40 + ldr r2, ._146 + 40 @ 0x7140 add r0, r2, #0 strh r0, [r1] - ldr r1, ._146 + 44 + ldr r1, ._146 + 44 @ 0x1ef add r0, r1, #0 strh r0, [r6] - ldr r2, ._146 + 48 + ldr r2, ._146 + 48 @ 0x819f add r0, r2, #0 strh r0, [r5] pop {r4, r5, r6} @@ -1704,12 +1704,12 @@ debug_80C42B8: add sp, sp, #0xffffffe4 lsl r0, r0, #0x18 lsr r5, r0, #0x18 - ldr r1, ._150 + ldr r1, ._150 @ gUnknown_Debug_083F8194 mov r0, sp mov r2, #0xc bl memcpy add r4, sp, #0xc - ldr r1, ._150 + 4 + ldr r1, ._150 + 4 @ gUnknown_Debug_083F81A0 add r0, r4, #0 mov r2, #0xd bl memcpy @@ -1728,16 +1728,16 @@ debug_80C42B8: bl Menu_PrintText bl debug_80C4694 bl debug_80C4704 - ldr r0, ._150 + 8 + ldr r0, ._150 + 8 @ gUnknown_Debug_2038A0C ldrb r0, [r0] cmp r0, #0 beq ._148 @cond_branch - ldr r0, ._150 + 12 + ldr r0, ._150 + 12 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._150 + 16 + ldr r0, ._150 + 16 @ debug_80C44EC b ._149 ._151: .align 2, 0 @@ -1748,12 +1748,12 @@ debug_80C42B8: .word gTasks .word debug_80C44EC+1 ._148: - ldr r0, ._152 + ldr r0, ._152 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._152 + 4 + ldr r0, ._152 + 4 @ debug_80C4348 ._149: str r0, [r1] add sp, sp, #0x1c @@ -1775,7 +1775,7 @@ debug_80C4348: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._154 + ldr r0, ._154 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x1] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -1787,20 +1787,20 @@ debug_80C4348: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._154 + 4 - ldr r2, ._154 + 8 + ldr r1, ._154 + 4 @ 0x4000042 + ldr r2, ._154 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._154 + 12 + ldr r1, ._154 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._154 + 16 + ldr r1, ._154 + 16 @ debug_80C43A8 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -1823,7 +1823,7 @@ debug_80C43A8: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r1, ._158 + ldr r1, ._158 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x1 and r0, r0, r2 @@ -1832,13 +1832,13 @@ debug_80C43A8: beq ._156 @cond_branch mov r0, #0x5 bl PlaySE - ldr r0, ._158 + 4 + ldr r0, ._158 + 4 @ gUnknown_Debug_2038A0C ldrb r1, [r0, #0x1] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._158 + 8 + ldr r1, ._158 + 8 @ gPlayerParty add r0, r0, r1 - ldr r1, ._158 + 12 + ldr r1, ._158 + 12 @ debug_80C41D4 bl debug_sub_80A433C add r0, r4, #0 bl DestroyTask @@ -1855,12 +1855,12 @@ debug_80C43A8: and r0, r0, r2 cmp r0, #0 beq ._160 @cond_branch - ldr r0, ._162 + ldr r0, ._162 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._162 + 4 + ldr r0, ._162 + 4 @ debug_80C4F48 str r0, [r1] b ._180 ._163: @@ -1883,12 +1883,12 @@ debug_80C43A8: bl PlaySE bl CalculatePlayerPartyCount bl CalculateEnemyPartyCount - ldr r0, ._167 + ldr r0, ._167 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._167 + 4 + ldr r0, ._167 + 4 @ debug_80C4D14 str r0, [r1] b ._180 ._168: @@ -1908,12 +1908,12 @@ debug_80C43A8: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._171 + ldr r0, ._171 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._171 + 4 + ldr r0, ._171 + 4 @ debug_80C44EC str r0, [r1] b ._180 ._172: @@ -1927,7 +1927,7 @@ debug_80C43A8: and r0, r0, r1 cmp r0, #0 beq ._174 @cond_branch - ldr r1, ._176 + ldr r1, ._176 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x1] cmp r0, #0 beq ._174 @cond_branch @@ -1944,14 +1944,14 @@ debug_80C43A8: and r0, r0, r1 cmp r0, #0 beq ._180 @cond_branch - ldr r5, ._181 + ldr r5, ._181 @ gUnknown_Debug_2038A0C ldrb r0, [r5, #0x1] cmp r0, #0x4 bhi ._180 @cond_branch add r1, r0, #0 mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._181 + 4 + ldr r1, ._181 + 4 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -1961,12 +1961,12 @@ debug_80C43A8: add r0, r0, #0x1 strb r0, [r5, #0x1] ._175: - ldr r1, ._181 + 8 + ldr r1, ._181 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._181 + 12 + ldr r1, ._181 + 12 @ debug_80C4348 str r1, [r0] ._180: add sp, sp, #0x4 @@ -1990,7 +1990,7 @@ debug_80C44EC: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._183 + ldr r0, ._183 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x2] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -2003,20 +2003,20 @@ debug_80C44EC: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._183 + 4 - ldr r2, ._183 + 8 + ldr r1, ._183 + 4 @ 0x4000042 + ldr r2, ._183 + 8 @ 0x79ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._183 + 12 + ldr r2, ._183 + 12 @ 0x17f add r0, r2, #0 strh r0, [r1] - ldr r1, ._183 + 16 + ldr r1, ._183 + 16 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._183 + 20 + ldr r1, ._183 + 20 @ debug_80C4550 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -2040,7 +2040,7 @@ debug_80C4550: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r1, ._187 + ldr r1, ._187 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x1 and r0, r0, r2 @@ -2049,13 +2049,13 @@ debug_80C4550: beq ._185 @cond_branch mov r0, #0x5 bl PlaySE - ldr r0, ._187 + 4 + ldr r0, ._187 + 4 @ gUnknown_Debug_2038A0C ldrb r1, [r0, #0x2] mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._187 + 8 + ldr r1, ._187 + 8 @ gEnemyParty add r0, r0, r1 - ldr r1, ._187 + 12 + ldr r1, ._187 + 12 @ debug_80C41F4 bl debug_sub_80A433C add r0, r4, #0 bl DestroyTask @@ -2072,12 +2072,12 @@ debug_80C4550: and r0, r0, r2 cmp r0, #0 beq ._189 @cond_branch - ldr r0, ._191 + ldr r0, ._191 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._191 + 4 + ldr r0, ._191 + 4 @ debug_80C4F48 str r0, [r1] b ._209 ._192: @@ -2100,12 +2100,12 @@ debug_80C4550: bl PlaySE bl CalculatePlayerPartyCount bl CalculateEnemyPartyCount - ldr r0, ._196 + ldr r0, ._196 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._196 + 4 + ldr r0, ._196 + 4 @ debug_80C4D14 str r0, [r1] b ._209 ._197: @@ -2125,12 +2125,12 @@ debug_80C4550: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._200 + ldr r0, ._200 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._200 + 4 + ldr r0, ._200 + 4 @ debug_80C4348 str r0, [r1] b ._209 ._201: @@ -2144,7 +2144,7 @@ debug_80C4550: and r0, r0, r1 cmp r0, #0 beq ._203 @cond_branch - ldr r1, ._205 + ldr r1, ._205 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x2] cmp r0, #0 beq ._203 @cond_branch @@ -2161,14 +2161,14 @@ debug_80C4550: and r0, r0, r1 cmp r0, #0 beq ._209 @cond_branch - ldr r5, ._210 + ldr r5, ._210 @ gUnknown_Debug_2038A0C ldrb r0, [r5, #0x2] cmp r0, #0x4 bhi ._209 @cond_branch add r1, r0, #0 mov r0, #0x64 mul r0, r0, r1 - ldr r1, ._210 + 4 + ldr r1, ._210 + 4 @ gEnemyParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -2178,12 +2178,12 @@ debug_80C4550: add r0, r0, #0x1 strb r0, [r5, #0x2] ._204: - ldr r1, ._210 + 8 + ldr r1, ._210 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._210 + 12 + ldr r1, ._210 + 12 @ debug_80C44EC str r1, [r0] ._209: add sp, sp, #0x4 @@ -2204,7 +2204,7 @@ debug_80C4550: debug_80C4694: push {r4, r5, lr} add sp, sp, #0xffffffe4 - ldr r1, ._213 + ldr r1, ._213 @ gUnknown_Debug_083F81AD mov r0, sp mov r2, #0xd bl memcpy @@ -2222,7 +2222,7 @@ debug_80C4694: ._212: mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._213 + 4 + ldr r1, ._213 + 4 @ gPlayerParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -2260,7 +2260,7 @@ debug_80C4694: debug_80C4704: push {r4, r5, lr} add sp, sp, #0xffffffe4 - ldr r1, ._216 + ldr r1, ._216 @ gUnknown_Debug_083F81BA mov r0, sp mov r2, #0xd bl memcpy @@ -2278,7 +2278,7 @@ debug_80C4704: ._215: mov r0, #0x64 mul r0, r0, r4 - ldr r1, ._216 + 4 + ldr r1, ._216 + 4 @ gEnemyParty add r0, r0, r1 mov r1, #0xb bl GetMonData @@ -2315,7 +2315,7 @@ debug_80C4704: thumb_func_start debug_80C4774 debug_80C4774: push {r4, lr} - ldr r0, ._221 + ldr r0, ._221 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0xc] sub r0, r0, #0x1 lsl r0, r0, #0x18 @@ -2323,13 +2323,13 @@ debug_80C4774: mov r1, #0x64 add r4, r0, #0 mul r4, r4, r1 - ldr r0, ._221 + 4 + ldr r0, ._221 + 4 @ gPlayerParty add r0, r4, r0 mov r1, #0xb bl GetMonData cmp r0, #0 beq ._219 @cond_branch - ldr r0, ._221 + 8 + ldr r0, ._221 + 8 @ gEnemyParty add r0, r4, r0 mov r1, #0xb bl GetMonData @@ -2358,22 +2358,22 @@ debug_80C47BC: add sp, sp, #0xffffffc0 lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r1, ._224 + ldr r1, ._224 @ gUnknown_Debug_083F81C7 mov r0, sp mov r2, #0xf bl memcpy add r4, sp, #0x10 - ldr r1, ._224 + 4 + ldr r1, ._224 + 4 @ gUnknown_Debug_083F81A0 add r0, r4, #0 mov r2, #0xd bl memcpy add r6, sp, #0x20 - ldr r1, ._224 + 8 + ldr r1, ._224 + 8 @ gUnknown_Debug_083F81D6 add r0, r6, #0 mov r2, #0xf bl memcpy add r5, sp, #0x30 - ldr r1, ._224 + 12 + ldr r1, ._224 + 12 @ gUnknown_Debug_083F81E5 add r0, r5, #0 mov r2, #0x10 bl memcpy @@ -2400,7 +2400,7 @@ debug_80C47BC: mov r2, #0x1 bl Menu_PrintText mov r4, #0x0 - ldr r6, ._224 + 16 + ldr r6, ._224 + 16 @ gUnknown_Debug_083F8068 ._223: lsl r0, r4, #0x3 add r0, r0, r6 @@ -2426,15 +2426,15 @@ debug_80C47BC: mov r1, #0x11 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._224 + 20 + ldr r0, ._224 + 20 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x4] bl debug_80C4C44 - ldr r1, ._224 + 24 + ldr r1, ._224 + 24 @ gTasks lsl r0, r7, #0x2 add r0, r0, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._224 + 28 + ldr r1, ._224 + 28 @ debug_80C48A0 str r1, [r0] add sp, sp, #0x40 pop {r4, r5, r6, r7} @@ -2461,7 +2461,7 @@ debug_80C48A0: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._226 + ldr r0, ._226 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x3] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -2473,20 +2473,20 @@ debug_80C48A0: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._226 + 4 - ldr r2, ._226 + 8 + ldr r1, ._226 + 4 @ 0x4000042 + ldr r2, ._226 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._226 + 12 + ldr r1, ._226 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._226 + 16 + ldr r1, ._226 + 16 @ debug_80C4900 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -2509,7 +2509,7 @@ debug_80C4900: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r5, r0, #0x18 - ldr r1, ._230 + ldr r1, ._230 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x2 and r0, r0, r2 @@ -2528,24 +2528,24 @@ debug_80C4900: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._230 + 4 + ldr r0, ._230 + 4 @ debug_80C370C bl SetMainCallback2 bl LoadPlayerParty - ldr r1, ._230 + 8 - ldr r0, ._230 + 12 + ldr r1, ._230 + 8 @ gSaveBlock2 + ldr r0, ._230 + 12 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0xd] strb r0, [r1, #0x8] - ldr r0, ._230 + 16 + ldr r0, ._230 + 16 @ gBattleTypeFlags mov r1, #0x0 strh r4, [r0] - ldr r0, ._230 + 20 + ldr r0, ._230 + 20 @ gUnknown_02023A14_50 strb r1, [r0] - ldr r1, ._230 + 24 + ldr r1, ._230 + 24 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._230 + 28 + ldr r1, ._230 + 28 @ debug_80C373C b ._229 ._231: .align 2, 0 @@ -2570,15 +2570,15 @@ debug_80C4900: ._232: mov r0, #0x5 bl PlaySE - ldr r1, ._236 - ldr r3, ._236 + 4 - ldr r2, ._236 + 8 + ldr r1, ._236 @ gBattleTypeFlags + ldr r3, ._236 + 4 @ gUnknown_Debug_083F8068 + ldr r2, ._236 + 8 @ gUnknown_Debug_2038A0C ldrb r0, [r2, #0x3] lsl r0, r0, #0x3 add r0, r0, r3 ldrb r0, [r0, #0x4] strh r0, [r1] - ldr r1, ._236 + 12 + ldr r1, ._236 + 12 @ gUnknown_02023A14_50 mov r0, #0x8 strb r0, [r1] ldrb r0, [r2, #0x3] @@ -2598,12 +2598,12 @@ debug_80C4900: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._236 + 16 + ldr r0, ._236 + 16 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._236 + 20 + ldr r0, ._236 + 20 @ debug_80C4A60 str r0, [r1] b ._247 ._237: @@ -2616,12 +2616,12 @@ debug_80C4900: .word gTasks .word debug_80C4A60+1 ._234: - ldr r0, ._239 + ldr r0, ._239 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._239 + 4 + ldr r0, ._239 + 4 @ debug_80C4F48 str r0, [r1] b ._247 ._240: @@ -2635,7 +2635,7 @@ debug_80C4900: and r0, r0, r1 cmp r0, #0 beq ._242 @cond_branch - ldr r1, ._244 + ldr r1, ._244 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x3] cmp r0, #0 beq ._242 @cond_branch @@ -2651,19 +2651,19 @@ debug_80C4900: and r0, r0, r1 cmp r0, #0 beq ._247 @cond_branch - ldr r1, ._248 + ldr r1, ._248 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x3] cmp r0, #0x1 bhi ._247 @cond_branch add r0, r0, #0x1 ._243: strb r0, [r1, #0x3] - ldr r1, ._248 + 4 + ldr r1, ._248 + 4 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._248 + 8 + ldr r1, ._248 + 8 @ debug_80C48A0 ._229: str r1, [r0] ._247: @@ -2687,7 +2687,7 @@ debug_80C4A60: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._250 + ldr r0, ._250 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x5] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -2700,20 +2700,20 @@ debug_80C4A60: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._250 + 4 - ldr r2, ._250 + 8 + ldr r1, ._250 + 4 @ 0x4000042 + ldr r2, ._250 + 8 @ 0x79ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._250 + 12 + ldr r2, ._250 + 12 @ 0x17f add r0, r2, #0 strh r0, [r1] - ldr r1, ._250 + 16 + ldr r1, ._250 + 16 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._250 + 20 + ldr r1, ._250 + 20 @ debug_80C4AC4 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -2739,7 +2739,7 @@ debug_80C4AC4: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r7, ._255 + ldr r7, ._255 @ gUnknown_Debug_2038A0C ldrb r0, [r7, #0x4] mov ip, r0 ldrb r5, [r7, #0x5] @@ -2747,7 +2747,7 @@ debug_80C4AC4: add r0, r1, r5 lsl r0, r0, #0x18 lsr r1, r0, #0x18 - ldr r2, ._255 + 4 + ldr r2, ._255 + 4 @ gMain mov r8, r2 ldrh r2, [r2, #0x2e] mov r3, #0x1 @@ -2755,18 +2755,18 @@ debug_80C4AC4: add r4, r7, #0 cmp r3, #0 beq ._252 @cond_branch - ldr r0, ._255 + 8 + ldr r0, ._255 + 8 @ gUnknown_Debug_083F80D8 lsl r1, r1, #0x3 add r0, r0, #0x4 add r1, r1, r0 ldr r1, [r1] - ldr r3, ._255 + 12 + ldr r3, ._255 + 12 @ byte_3005E30 ldr r2, [r3] add r0, r2, #0 and r0, r0, r1 cmp r0, #0 beq ._253 @cond_branch - ldr r0, ._255 + 16 + ldr r0, ._255 + 16 @ 0xffff eor r1, r1, r0 and r2, r2, r1 b ._254 @@ -2784,12 +2784,12 @@ debug_80C4AC4: str r2, [r3] ldrb r0, [r4, #0x4] bl debug_80C4C44 - ldr r1, ._258 + ldr r1, ._258 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._258 + 4 + ldr r1, ._258 + 4 @ debug_80C4A60 str r1, [r0] b ._274 ._259: @@ -2810,12 +2810,12 @@ debug_80C4AC4: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r0, ._262 + ldr r0, ._262 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._262 + 4 + ldr r0, ._262 + 4 @ debug_80C48A0 b ._261 ._263: .align 2, 0 @@ -2829,12 +2829,12 @@ debug_80C4AC4: beq ._264 @cond_branch mov r0, #0x5 bl PlaySE - ldr r1, ._266 + ldr r1, ._266 @ gTrainerBattleOpponent mov r2, #0x80 lsl r2, r2, #0x3 add r0, r2, #0 strh r0, [r1] - ldr r1, ._266 + 4 + ldr r1, ._266 + 4 @ 0x2017000 ldrb r2, [r1, #0x1] mov r0, #0x11 neg r0, r0 @@ -2848,19 +2848,19 @@ debug_80C4AC4: strb r4, [r1, #0xa] strb r4, [r1, #0xb] strb r4, [r1, #0xc] - ldr r1, ._266 + 8 + ldr r1, ._266 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._266 + 12 + ldr r1, ._266 + 12 @ debug_80C4F48 str r1, [r0] b ._274 ._267: .align 2, 0 ._266: .word gTrainerBattleOpponent - .word +0x2017000 + .word 0x2017000 .word gTasks .word debug_80C4F48+1 ._264: @@ -2911,12 +2911,12 @@ debug_80C4AC4: ldrb r0, [r7, #0x4] bl debug_80C4C44 ._277: - ldr r0, ._278 + ldr r0, ._278 @ gTasks lsl r1, r6, #0x2 add r1, r1, r6 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._278 + 4 + ldr r0, ._278 + 4 @ debug_80C4A60 ._261: str r0, [r1] ._274: @@ -2956,12 +2956,12 @@ debug_80C4C44: cmp r4, #0x9 bgt ._280 @cond_branch mov r3, #0x0 - ldr r1, ._288 + ldr r1, ._288 @ gUnknown_Debug_083F80D8 lsl r0, r4, #0x3 add r0, r0, r1 ldr r0, [r0] ldrb r0, [r0] - ldr r7, ._288 + 4 + ldr r7, ._288 + 4 @ byte_3005E30 mov r9, r7 lsl r2, r2, #0x1 mov ip, r2 @@ -3057,17 +3057,17 @@ debug_80C4D14: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r1, ._291 + ldr r1, ._291 @ gUnknown_Debug_083F81C7 mov r0, sp mov r2, #0xf bl memcpy add r5, sp, #0x10 - ldr r1, ._291 + 4 + ldr r1, ._291 + 4 @ gUnknown_Debug_083F81F5 add r0, r5, #0 mov r2, #0xd bl memcpy add r6, sp, #0x20 - ldr r1, ._291 + 8 + ldr r1, ._291 + 8 @ gUnknown_Debug_083F8202 add r0, r6, #0 mov r2, #0xf bl memcpy @@ -3093,7 +3093,7 @@ debug_80C4D14: mov r1, #0x2 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._291 + 12 + ldr r0, ._291 + 12 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x6] bl debug_80C4F00 mov r0, #0xf @@ -3101,12 +3101,12 @@ debug_80C4D14: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r1, ._291 + 16 + ldr r1, ._291 + 16 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._291 + 20 + ldr r1, ._291 + 20 @ debug_80C4DB8 str r1, [r0] add sp, sp, #0x30 pop {r4, r5, r6} @@ -3131,7 +3131,7 @@ debug_80C4DB8: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._293 + ldr r0, ._293 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x7] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -3143,20 +3143,20 @@ debug_80C4DB8: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._293 + 4 - ldr r2, ._293 + 8 + ldr r1, ._293 + 4 @ 0x4000042 + ldr r2, ._293 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._293 + 12 + ldr r1, ._293 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._293 + 16 + ldr r1, ._293 + 16 @ debug_80C4E18 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -3178,24 +3178,24 @@ debug_80C4E18: push {r4, r5, r6, r7, lr} lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r5, ._297 + ldr r5, ._297 @ gUnknown_Debug_2038A0C ldrb r3, [r5, #0x6] ldrb r2, [r5, #0x7] add r0, r3, r2 lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r7, ._297 + 4 + ldr r7, ._297 + 4 @ gMain ldrh r1, [r7, #0x2e] mov r0, #0x2 and r0, r0, r1 cmp r0, #0 beq ._295 @cond_branch - ldr r0, ._297 + 8 + ldr r0, ._297 + 8 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._297 + 12 + ldr r0, ._297 + 12 @ debug_80C42B8 b ._296 ._298: .align 2, 0 @@ -3216,18 +3216,18 @@ debug_80C4E18: ._299: mov r0, #0x5 bl PlaySE - ldr r2, ._302 - ldr r1, ._302 + 4 + ldr r2, ._302 @ gBattleTerrain + ldr r1, ._302 + 4 @ gUnknown_Debug_083F814C lsl r0, r6, #0x3 add r0, r0, r1 ldrb r0, [r0, #0x4] strb r0, [r2] - ldr r1, ._302 + 8 + ldr r1, ._302 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._302 + 12 + ldr r1, ._302 + 12 @ debug_80C5158 str r1, [r0] b ._310 ._303: @@ -3280,12 +3280,12 @@ debug_80C4E18: ldrb r0, [r5, #0x6] bl debug_80C4F00 ._313: - ldr r0, ._314 + ldr r0, ._314 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._314 + 4 + ldr r0, ._314 + 4 @ debug_80C4DB8 ._296: str r0, [r1] ._310: @@ -3311,7 +3311,7 @@ debug_80C4F00: mov r3, #0xe bl Menu_BlankWindowRect mov r4, #0x0 - ldr r6, ._318 + ldr r6, ._318 @ gUnknown_Debug_083F814C ._317: cmp r4, #0x8 bhi ._316 @cond_branch @@ -3352,28 +3352,28 @@ debug_80C4F48: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r1, ._320 + ldr r1, ._320 @ gUnknown_Debug_083F8211 mov r0, sp mov r2, #0x11 bl memcpy add r6, sp, #0x14 - ldr r1, ._320 + 4 + ldr r1, ._320 + 4 @ gUnknown_Debug_083F81A0 add r0, r6, #0 mov r2, #0xd bl memcpy add r5, sp, #0x24 - ldr r1, ._320 + 8 + ldr r1, ._320 + 8 @ gUnknown_Debug_083F8222 add r0, r5, #0 mov r2, #0xd bl memcpy add r0, sp, #0x34 mov r9, r0 - ldr r1, ._320 + 12 + ldr r1, ._320 + 12 @ gUnknown_Debug_083F822F mov r2, #0x4 bl memcpy add r0, sp, #0x38 mov r8, r0 - ldr r1, ._320 + 16 + ldr r1, ._320 + 16 @ gUnknown_Debug_083F8233 mov r2, #0x4 bl memcpy mov r0, #0x0 @@ -3420,12 +3420,12 @@ debug_80C4F48: mov r2, #0x1d mov r3, #0xf bl Menu_DrawStdWindowFrame - ldr r1, ._320 + 20 + ldr r1, ._320 + 20 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._320 + 24 + ldr r1, ._320 + 24 @ debug_80C5038 str r1, [r0] add sp, sp, #0x3c pop {r3, r4} @@ -3454,7 +3454,7 @@ debug_80C5038: add r4, r0, #0 lsl r4, r4, #0x18 lsr r4, r4, #0x18 - ldr r0, ._322 + ldr r0, ._322 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x8] lsl r0, r0, #0x19 mov r1, #0xc0 @@ -3466,20 +3466,20 @@ debug_80C5038: mov r2, #0x1 mov r3, #0xe bl debug_80C38E4 - ldr r1, ._322 + 4 - ldr r2, ._322 + 8 + ldr r1, ._322 + 4 @ 0x4000042 + ldr r2, ._322 + 8 @ 0x177 add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 add r2, r2, #0x8 add r0, r2, #0 strh r0, [r1] - ldr r1, ._322 + 12 + ldr r1, ._322 + 12 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._322 + 16 + ldr r1, ._322 + 16 @ debug_80C5098 str r1, [r0] add sp, sp, #0x4 pop {r4} @@ -3501,19 +3501,19 @@ debug_80C5098: push {r4, lr} lsl r0, r0, #0x18 lsr r4, r0, #0x18 - ldr r1, ._326 + ldr r1, ._326 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x2 and r0, r0, r2 add r3, r1, #0 cmp r0, #0 beq ._324 @cond_branch - ldr r0, ._326 + 4 + ldr r0, ._326 + 4 @ gTasks lsl r1, r4, #0x2 add r1, r1, r4 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._326 + 8 + ldr r0, ._326 + 8 @ debug_80C47BC str r0, [r1] b ._339 ._327: @@ -3534,16 +3534,16 @@ debug_80C5098: ._328: mov r0, #0x5 bl PlaySE - ldr r1, ._331 - ldr r0, ._331 + 4 + ldr r1, ._331 @ gSaveBlock2 + ldr r0, ._331 + 4 @ gUnknown_Debug_2038A0C ldrb r0, [r0, #0x8] strb r0, [r1, #0x8] - ldr r1, ._331 + 8 + ldr r1, ._331 + 8 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._331 + 12 + ldr r1, ._331 + 12 @ debug_80C42B8 b ._330 ._332: .align 2, 0 @@ -3558,7 +3558,7 @@ debug_80C5098: and r0, r0, r1 cmp r0, #0 beq ._334 @cond_branch - ldr r1, ._336 + ldr r1, ._336 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x8] cmp r0, #0 beq ._334 @cond_branch @@ -3574,19 +3574,19 @@ debug_80C5098: and r0, r0, r1 cmp r0, #0 beq ._339 @cond_branch - ldr r1, ._340 + ldr r1, ._340 @ gUnknown_Debug_2038A0C ldrb r0, [r1, #0x8] cmp r0, #0 bne ._339 @cond_branch add r0, r0, #0x1 ._335: strb r0, [r1, #0x8] - ldr r1, ._340 + 4 + ldr r1, ._340 + 4 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._340 + 8 + ldr r1, ._340 + 8 @ debug_80C5038 ._330: str r1, [r0] ._339: @@ -3606,12 +3606,12 @@ debug_80C5098: debug_80C5158: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._342 + ldr r2, ._342 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._342 + 4 + ldr r0, ._342 + 4 @ debug_80C5174 str r0, [r1] bx lr ._343: @@ -3626,12 +3626,12 @@ debug_80C5158: debug_80C5174: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._344 + ldr r2, ._344 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._344 + 4 + ldr r0, ._344 + 4 @ debug_80C5190 str r0, [r1] bx lr ._345: @@ -3646,12 +3646,12 @@ debug_80C5174: debug_80C5190: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._346 + ldr r2, ._346 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._346 + 4 + ldr r0, ._346 + 4 @ debug_80C51AC str r0, [r1] bx lr ._347: @@ -3666,12 +3666,12 @@ debug_80C5190: debug_80C51AC: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._348 + ldr r2, ._348 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._348 + 4 + ldr r0, ._348 + 4 @ debug_80C51C8 str r0, [r1] bx lr ._349: @@ -3686,12 +3686,12 @@ debug_80C51AC: debug_80C51C8: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._350 + ldr r2, ._350 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._350 + 4 + ldr r0, ._350 + 4 @ debug_80C51E4 str r0, [r1] bx lr ._351: @@ -3706,10 +3706,10 @@ debug_80C51C8: debug_80C51E4: push {lr} bl sub_80408BC - ldr r0, ._352 - ldr r1, ._352 + 4 + ldr r0, ._352 @ gMain + ldr r1, ._352 + 4 @ debug_80C41A8 str r1, [r0, #0x8] - ldr r0, ._352 + 8 + ldr r0, ._352 + 8 @ unref_sub_800D684 bl SetMainCallback2 pop {r0} bx r0 @@ -3725,12 +3725,12 @@ debug_80C51E4: thumb_func_start debug_80C5208 debug_80C5208: push {r4, r5, r6, lr} - ldr r1, ._355 - ldr r0, ._355 + 4 + ldr r1, ._355 @ gUnknown_Debug_2038A1C + ldr r0, ._355 + 4 @ 0x2018000 str r0, [r1] mov r3, #0x0 add r6, r1, #0 - ldr r4, ._355 + 8 + ldr r4, ._355 + 8 @ gSaveBlock2 add r5, r6, #0 mov r2, #0x0 ._354: @@ -3778,7 +3778,7 @@ debug_80C5208: .align 2, 0 ._355: .word gUnknown_Debug_2038A1C - .word +0x2018000 + .word 0x2018000 .word gSaveBlock2 thumb_func_end debug_80C5208 @@ -3788,12 +3788,12 @@ debug_80C527C: push {r4, r5, r6, r7, lr} add r6, r0, #0 mov r5, #0x0 - ldr r7, ._359 + ldr r7, ._359 @ gPlayerPartyCount ._361: mov r0, #0x64 add r1, r5, #0 mul r1, r1, r0 - ldr r0, ._359 + 4 + ldr r0, ._359 + 4 @ gPlayerParty add r4, r1, r0 add r0, r4, #0 mov r1, #0xb @@ -3820,7 +3820,7 @@ debug_80C527C: lsr r5, r0, #0x18 cmp r5, #0x5 bls ._361 @cond_branch - ldr r0, ._362 + ldr r0, ._362 @ gUnknown_Debug_2038A1C ldr r0, [r0] bl SendMonToPC mov r0, #0x1 @@ -3839,7 +3839,7 @@ debug_80C527C: InitCreatePokemon: push {r4, r5, lr} add sp, sp, #0xffffffd4 - ldr r1, ._364 + ldr r1, ._364 @ gUnknown_Debug_083F8733 add r0, sp, #0x4 mov r2, #0x25 bl memcpy @@ -3852,30 +3852,30 @@ InitCreatePokemon: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._364 + 4 + ldr r0, ._364 + 4 @ 0x4000050 mov r5, #0x0 strh r4, [r0] add r0, r0, #0x2 strh r4, [r0] add r0, r0, #0x2 strh r4, [r0] - ldr r3, ._364 + 8 + ldr r3, ._364 + 8 @ 0x4000208 ldrh r2, [r3] strh r4, [r3] - ldr r4, ._364 + 12 + ldr r4, ._364 + 12 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r2, ._364 + 16 + ldr r2, ._364 + 16 @ 0x4000004 ldrh r0, [r2] mov r1, #0x8 orr r0, r0, r1 strh r0, [r2] - ldr r0, ._364 + 20 + ldr r0, ._364 + 20 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._364 + 24 + ldr r0, ._364 + 24 @ debug_80C370C bl SetMainCallback2 mov r0, #0x0 mov r1, #0x0 @@ -3892,18 +3892,18 @@ InitCreatePokemon: lsl r2, r2, #0x5 add r0, r2, #0 strh r0, [r1] - ldr r0, ._364 + 28 + ldr r0, ._364 + 28 @ debug_80C53A4 mov r1, #0x0 bl CreateTask bl debug_80C5208 - ldr r1, ._364 + 32 + ldr r1, ._364 + 32 @ gUnknown_Debug_2038A1C ldr r0, [r1] mov r2, #0xb4 lsl r2, r2, #0x1 add r0, r0, r2 strb r5, [r0] ldr r0, [r1] - ldr r1, ._364 + 36 + ldr r1, ._364 + 36 @ 0x169 add r0, r0, r1 strb r5, [r0] add sp, sp, #0x2c @@ -3930,12 +3930,12 @@ InitCreatePokemon: debug_80C53A4: lsl r0, r0, #0x18 lsr r0, r0, #0x18 - ldr r2, ._366 + ldr r2, ._366 @ gTasks lsl r1, r0, #0x2 add r1, r1, r0 lsl r1, r1, #0x3 add r1, r1, r2 - ldr r0, ._366 + 4 + ldr r0, ._366 + 4 @ debug_80C53C0 str r0, [r1] bx lr ._367: @@ -3955,12 +3955,12 @@ debug_80C53C0: bl debug_80C6384 mov r0, #0x0 bl debug_80C627C - ldr r1, ._368 + ldr r1, ._368 @ gTasks lsl r0, r4, #0x2 add r0, r0, r4 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._368 + 4 + ldr r1, ._368 + 4 @ debug_80C53F0 str r1, [r0] pop {r4} pop {r0} @@ -3979,26 +3979,26 @@ debug_80C53F0: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r5, r0, #0x18 - ldr r0, ._372 + ldr r0, ._372 @ gMain ldrh r1, [r0, #0x2e] mov r2, #0x1 and r2, r2, r1 add r4, r0, #0 cmp r2, #0 beq ._370 @cond_branch - ldr r0, ._372 + 4 + ldr r0, ._372 + 4 @ gUnknown_Debug_2038A1C ldr r3, [r0] mov r0, #0xb2 lsl r0, r0, #0x1 add r2, r3, r0 - ldr r1, ._372 + 8 + ldr r1, ._372 + 8 @ gUnknown_Debug_083F8698 mov r4, #0xb4 lsl r4, r4, #0x1 add r0, r3, r4 ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r1 - ldr r6, ._372 + 12 + ldr r6, ._372 + 12 @ 0x169 add r1, r3, r6 ldrb r1, [r1] ldr r0, [r0] @@ -4016,12 +4016,12 @@ debug_80C53F0: mov r0, #0x0 strb r0, [r1] bl debug_80C643C - ldr r1, ._372 + 16 + ldr r1, ._372 + 16 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._372 + 20 + ldr r1, ._372 + 20 @ debug_80C55E4 b ._375 ._373: .align 2, 0 @@ -4044,14 +4044,14 @@ debug_80C53F0: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._376 + ldr r0, ._376 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._376 + 4 + ldr r1, ._376 + 4 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._376 + 8 + ldr r1, ._376 + 8 @ debug_80C373C b ._375 ._377: .align 2, 0 @@ -4067,7 +4067,7 @@ debug_80C53F0: mov r0, #0x5 bl PlaySE bl debug_80C5FFC - ldr r0, ._381 + ldr r0, ._381 @ gUnknown_Debug_2038A1C ldr r0, [r0] bl debug_80C527C add r4, r0, #0 @@ -4080,7 +4080,7 @@ debug_80C53F0: bl Menu_DrawStdWindowFrame cmp r4, #0 beq ._379 @cond_branch - ldr r0, ._381 + 4 + ldr r0, ._381 + 4 @ gUnknown_Debug_083F872A mov r1, #0x4 mov r2, #0x9 bl Menu_PrintText @@ -4091,17 +4091,17 @@ debug_80C53F0: .word gUnknown_Debug_2038A1C .word gUnknown_Debug_083F872A ._379: - ldr r0, ._384 + ldr r0, ._384 @ gUnknown_Debug_083F8720 mov r1, #0x4 mov r2, #0x9 bl Menu_PrintText ._380: - ldr r0, ._384 + 4 + ldr r0, ._384 + 4 @ gTasks lsl r1, r5, #0x2 add r1, r1, r5 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._384 + 8 + ldr r0, ._384 + 8 @ debug_80C5708 str r0, [r1] b ._400 ._385: @@ -4115,7 +4115,7 @@ debug_80C53F0: and r0, r0, r1 cmp r0, #0 beq ._386 @cond_branch - ldr r0, ._388 + ldr r0, ._388 @ gUnknown_Debug_2038A1C ldr r0, [r0] ldr r4, [r0, #0x64] lsl r4, r4, #0x10 @@ -4157,7 +4157,7 @@ debug_80C53F0: and r0, r0, r1 cmp r0, #0 beq ._395 @cond_branch - ldr r2, ._397 + ldr r2, ._397 @ gUnknown_Debug_2038A1C ldr r0, [r2] mov r6, #0xb4 lsl r6, r6, #0x1 @@ -4168,7 +4168,7 @@ debug_80C53F0: sub r0, r0, #0x1 strb r0, [r1] ldr r0, [r2] - ldr r1, ._397 + 4 + ldr r1, ._397 + 4 @ 0x169 add r0, r0, r1 strb r3, [r0] b ._396 @@ -4184,7 +4184,7 @@ debug_80C53F0: and r0, r0, r1 cmp r0, #0 beq ._400 @cond_branch - ldr r3, ._401 + ldr r3, ._401 @ gUnknown_Debug_2038A1C ldr r0, [r3] mov r4, #0xb4 lsl r4, r4, #0x1 @@ -4196,16 +4196,16 @@ debug_80C53F0: mov r1, #0x0 strb r0, [r2] ldr r0, [r3] - ldr r6, ._401 + 4 + ldr r6, ._401 + 4 @ 0x169 add r0, r0, r6 strb r1, [r0] ._396: - ldr r1, ._401 + 8 + ldr r1, ._401 + 8 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._401 + 12 + ldr r1, ._401 + 12 @ debug_80C53C0 ._375: str r1, [r0] ._400: @@ -4231,8 +4231,8 @@ debug_80C55E4: lsl r0, r0, #0x18 lsr r3, r0, #0x18 add r6, r3, #0 - ldr r1, ._405 - ldr r2, ._405 + 4 + ldr r1, ._405 @ gUnknown_Debug_083F8698 + ldr r2, ._405 + 4 @ gUnknown_Debug_2038A1C ldr r0, [r2] mov ip, r0 mov r0, #0xb4 @@ -4241,14 +4241,14 @@ debug_80C55E4: ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._405 + 8 + ldr r1, ._405 + 8 @ 0x169 add r1, r1, ip ldrb r1, [r1] ldr r0, [r0] add r0, r0, r1 ldrb r5, [r0] add r7, r5, #0 - ldr r1, ._405 + 12 + ldr r1, ._405 + 12 @ gMain ldrh r4, [r1, #0x2e] mov r0, #0x1 and r0, r0, r4 @@ -4256,12 +4256,12 @@ debug_80C55E4: add r2, r1, #0 cmp r0, #0 beq ._403 @cond_branch - ldr r0, ._405 + 16 + ldr r0, ._405 + 16 @ gTasks lsl r1, r3, #0x2 add r1, r1, r3 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._405 + 20 + ldr r0, ._405 + 20 @ debug_80C53C0 str r0, [r1] b ._422 ._406: @@ -4287,12 +4287,12 @@ debug_80C55E4: add r1, r1, ip ldr r1, [r1] str r1, [r0] - ldr r1, ._409 + ldr r1, ._409 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._409 + 4 + ldr r1, ._409 + 4 @ debug_80C53C0 str r1, [r0] b ._422 ._410: @@ -4319,7 +4319,7 @@ debug_80C55E4: bl debug_80C643C b ._422 ._413: - ldr r0, ._419 + ldr r0, ._419 @ gUnknown_Debug_083F8554 lsl r1, r7, #0x3 add r0, r0, #0x4 add r1, r1, r0 @@ -4380,18 +4380,18 @@ debug_80C5708: push {lr} lsl r0, r0, #0x18 lsr r2, r0, #0x18 - ldr r0, ._424 + ldr r0, ._424 @ gMain ldrh r1, [r0, #0x2e] mov r0, #0x1 and r0, r0, r1 cmp r0, #0 beq ._423 @cond_branch - ldr r0, ._424 + 4 + ldr r0, ._424 + 4 @ gTasks lsl r1, r2, #0x2 add r1, r1, r2 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._424 + 8 + ldr r0, ._424 + 8 @ debug_80C53C0 str r0, [r1] ._423: pop {r0} @@ -4419,11 +4419,11 @@ debug_80C5738: mov r8, r2 cmp r4, #0xfe bne ._426 @cond_branch - ldr r1, ._428 + ldr r1, ._428 @ gUnknown_Debug_083F850A mov r2, #0x7 bl debug_80C689C add r0, r6, #7 - ldr r7, ._428 + 4 + ldr r7, ._428 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r7] add r1, r1, #0xf0 ldr r1, [r1] @@ -4435,7 +4435,7 @@ debug_80C5738: strb r4, [r6, #0x14] add r0, r6, #0 add r0, r0, #0x15 - ldr r1, ._428 + 8 + ldr r1, ._428 + 8 @ gUnknown_Debug_083F8514 mov r2, #0x7 bl debug_80C689C add r0, r6, #0 @@ -4452,7 +4452,7 @@ debug_80C5738: add r0, r0, #0x1 strb r4, [r0] add r0, r0, #0x1 - ldr r1, ._428 + 12 + ldr r1, ._428 + 12 @ gUnknown_Debug_083F851C mov r2, #0x9 bl debug_80C689C add r0, r6, #0 @@ -4475,13 +4475,13 @@ debug_80C5738: ._426: cmp r4, #0xfd bne ._430 @cond_branch - ldr r1, ._432 + ldr r1, ._432 @ gUnknown_Debug_083F8524 add r0, r6, #0 mov r2, #0x9 bl debug_80C689C add r0, r6, #0 add r0, r0, #0x9 - ldr r7, ._432 + 4 + ldr r7, ._432 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r7] add r1, r1, #0xfc ldr r1, [r1] @@ -4493,7 +4493,7 @@ debug_80C5738: strb r4, [r6, #0x16] add r0, r6, #0 add r0, r0, #0x17 - ldr r1, ._432 + 8 + ldr r1, ._432 + 8 @ gUnknown_Debug_083F852D mov r2, #0x9 bl debug_80C689C add r0, r6, #0 @@ -4512,7 +4512,7 @@ debug_80C5738: add r0, r0, #0x1 strb r4, [r0] add r0, r0, #0x1 - ldr r1, ._432 + 12 + ldr r1, ._432 + 12 @ gUnknown_Debug_083F8537 mov r2, #0x9 bl debug_80C689C add r0, r6, #0 @@ -4541,7 +4541,7 @@ debug_80C5738: lsr r1, r0, #0x10 cmp r1, #0xb bls ._434 @cond_branch - ldr r0, ._437 + ldr r0, ._437 @ gUnknown_Debug_083F8554 add r0, r5, r0 ldr r1, [r0] add r0, r6, #0 @@ -4557,7 +4557,7 @@ debug_80C5738: lsr r1, r0, #0x10 cmp r1, #0xff bls ._435 @cond_branch - ldr r0, ._437 + ldr r0, ._437 @ gUnknown_Debug_083F8554 add r0, r0, #0x4 add r0, r5, r0 ldr r0, [r0] @@ -4567,7 +4567,7 @@ debug_80C5738: cmp r4, #0x22 bhi ._436 @cond_branch lsl r0, r4, #0x2 - ldr r1, ._437 + 4 + ldr r1, ._437 + 4 @ add r1, r0, r1 ldr r1, [r1] add r7, r0, #0 @@ -4620,7 +4620,7 @@ debug_80C5738: ._440: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._477 + ldr r1, ._477 @ gUnknown_Debug_2038A1C mov r9, r1 ldr r1, [r1] add r1, r1, #0x64 @@ -4650,7 +4650,7 @@ debug_80C5738: lsr r0, r0, #0x10 mov r1, #0xb mul r1, r1, r0 - ldr r0, ._477 + 4 + ldr r0, ._477 + 4 @ gSpeciesNames add r1, r1, r0 add r0, r4, #0 mov r2, #0xa @@ -4662,7 +4662,7 @@ debug_80C5738: .word gUnknown_Debug_2038A1C .word gSpeciesNames ._445: - ldr r0, ._483 + ldr r0, ._483 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r7 @@ -4681,7 +4681,7 @@ debug_80C5738: ._480: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._486 + ldr r1, ._486 @ gUnknown_Debug_083F8546 b ._488 ._487: .align 2, 0 @@ -4690,7 +4690,7 @@ debug_80C5738: ._479: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._489 + ldr r1, ._489 @ gUnknown_Debug_083F8541 b ._488 ._490: .align 2, 0 @@ -4699,7 +4699,7 @@ debug_80C5738: ._481: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._492 + ldr r1, ._492 @ gUnknown_Debug_083F8544 ._488: mov r2, #0x2 bl debug_80C689C @@ -4711,7 +4711,7 @@ debug_80C5738: ._450: add r0, r6, #0 add r0, r0, #0xa - ldr r4, ._495 + ldr r4, ._495 @ gUnknown_Debug_2038A1C ldr r1, [r4] add r1, r1, #0x64 add r1, r1, r7 @@ -4736,7 +4736,7 @@ debug_80C5738: ldr r2, [r1] mov r1, #0xd mul r1, r1, r2 - ldr r2, ._495 + 4 + ldr r2, ._495 + 4 @ gMoveNames add r1, r1, r2 b ._494 ._496: @@ -4747,7 +4747,7 @@ debug_80C5738: ._451: add r0, r6, #0 add r0, r0, #0xa - ldr r4, ._499 + ldr r4, ._499 @ gUnknown_Debug_2038A1C ldr r1, [r4] add r1, r1, #0x64 add r1, r1, r7 @@ -4786,7 +4786,7 @@ debug_80C5738: add r0, r5, #0 add r0, r0, #0xe add r0, r6, r0 - ldr r1, ._502 + ldr r1, ._502 @ gUnknown_Debug_083F8541 ._498: mov r2, #0x9 bl debug_80C689C @@ -4797,7 +4797,7 @@ debug_80C5738: .word gUnknown_Debug_083F8541 ._452: add r6, r6, #0xc - ldr r4, ._505 + ldr r4, ._505 @ gUnknown_Debug_2038A1C ldr r0, [r4] ldr r0, [r0, #0x64] lsl r0, r0, #0x10 @@ -4814,7 +4814,7 @@ debug_80C5738: lsr r0, r0, #0x18 mov r1, #0xd mul r1, r1, r0 - ldr r0, ._505 + 4 + ldr r0, ._505 + 4 @ gAbilityNames add r1, r1, r0 add r0, r6, #0 ._494: @@ -4829,8 +4829,8 @@ debug_80C5738: ._474: add r0, r6, #0 add r0, r0, #0xa - ldr r2, ._508 - ldr r1, ._508 + 4 + ldr r2, ._508 @ gUnknown_Debug_083F86E8 + ldr r1, ._508 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r1] add r1, r1, #0x64 add r1, r1, r7 @@ -4847,7 +4847,7 @@ debug_80C5738: ._472: add r0, r6, #0 add r0, r0, #0xc - ldr r1, ._511 + ldr r1, ._511 @ gUnknown_Debug_2038A1C ldr r1, [r1] add r1, r1, #0x64 add r1, r1, r7 @@ -4860,7 +4860,7 @@ debug_80C5738: ._511: .word gUnknown_Debug_2038A1C ._473: - ldr r0, ._515 + ldr r0, ._515 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r7 @@ -4869,7 +4869,7 @@ debug_80C5738: beq ._513 @cond_branch add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._515 + 4 + ldr r1, ._515 + 4 @ gUnknown_Debug_083F854A b ._514 ._516: .align 2, 0 @@ -4879,7 +4879,7 @@ debug_80C5738: ._513: add r0, r6, #0 add r0, r0, #0xa - ldr r1, ._518 + ldr r1, ._518 @ gUnknown_Debug_083F854D ._514: mov r2, #0x4 bl debug_80C689C @@ -4891,8 +4891,8 @@ debug_80C5738: ._446: add r0, r6, #0 add r0, r0, #0xa - ldr r2, ._520 - ldr r1, ._520 + 4 + ldr r2, ._520 @ gNatureNames + ldr r1, ._520 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r1] add r1, r1, #0x64 add r1, r1, r7 @@ -4921,7 +4921,7 @@ debug_80C5738: thumb_func_start debug_80C5B60 debug_80C5B60: lsl r0, r0, #0x18 - ldr r1, ._522 + ldr r1, ._522 @ gUnknown_Debug_2038A1C ldr r1, [r1] lsr r0, r0, #0x16 add r1, r1, #0x64 @@ -4944,7 +4944,7 @@ debug_80C5B74: cmp r2, #0x18 bhi ._540 @cond_branch lsl r0, r2, #0x2 - ldr r1, ._526 + ldr r1, ._526 @ add r1, r0, r1 ldr r1, [r1] add r3, r0, #0 @@ -4980,7 +4980,7 @@ debug_80C5B74: .word ._552 .word ._552 ._540: - ldr r0, ._554 + ldr r0, ._554 @ gUnknown_Debug_2038A1C ldr r0, [r0] lsl r1, r2, #0x2 add r0, r0, #0x64 @@ -4992,7 +4992,7 @@ debug_80C5B74: ._554: .word gUnknown_Debug_2038A1C ._532: - ldr r0, ._557 + ldr r0, ._557 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r3 @@ -5004,7 +5004,7 @@ debug_80C5B74: ._557: .word gUnknown_Debug_2038A1C ._529: - ldr r4, ._560 + ldr r4, ._560 @ gUnknown_Debug_2038A1C ldr r1, [r4] add r0, r1, #0 add r0, r0, #0x64 @@ -5015,9 +5015,9 @@ debug_80C5B74: lsr r0, r0, #0x10 bl NationalPokedexNumToSpecies ldr r5, [r4] - ldr r4, ._560 + 4 + ldr r4, ._560 + 4 @ gExperienceTables lsl r2, r6, #0x2 - ldr r3, ._560 + 8 + ldr r3, ._560 + 8 @ gBaseStats lsl r0, r0, #0x10 lsr r0, r0, #0x10 lsl r1, r0, #0x3 @@ -5041,7 +5041,7 @@ debug_80C5B74: .word gExperienceTables .word gBaseStats ._530: - ldr r0, ._563 + ldr r0, ._563 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r3 @@ -5053,7 +5053,7 @@ debug_80C5B74: ._563: .word gUnknown_Debug_2038A1C ._552: - ldr r0, ._565 + ldr r0, ._565 @ gUnknown_Debug_2038A1C ldr r0, [r0] add r0, r0, #0x64 add r0, r0, r3 @@ -5074,7 +5074,7 @@ debug_80C5B74: debug_80C5C94: push {r4, r5, r6, lr} add sp, sp, #0xfffffff0 - ldr r6, ._567 + ldr r6, ._567 @ gUnknown_Debug_2038A1C ldr r2, [r6] add r0, r2, #0 add r0, r0, #0x98 @@ -5239,7 +5239,7 @@ debug_80C5DEC: add sp, sp, #0xfffffffc mov r0, #0x0 str r0, [sp] - ldr r4, ._569 + ldr r4, ._569 @ gUnknown_Debug_2038A1C ldr r0, [r4] add r2, r0, #0 add r2, r2, #0x6c @@ -5356,7 +5356,7 @@ debug_80C5DEC: thumb_func_start debug_80C5EF4 debug_80C5EF4: push {r4, lr} - ldr r4, ._571 + ldr r4, ._571 @ gUnknown_Debug_2038A1C ldr r0, [r4] add r2, r0, #0 add r2, r2, #0x98 @@ -5477,16 +5477,16 @@ debug_80C5EF4: debug_80C5FFC: push {r4, r5, r6, r7, lr} add sp, sp, #0xffffffe0 - ldr r1, ._578 + ldr r1, ._578 @ gUnknown_Debug_083F8758 add r0, sp, #0x10 mov r2, #0x4 bl memcpy add r7, sp, #0x14 - ldr r1, ._578 + 4 + ldr r1, ._578 + 4 @ gUnknown_Debug_083F875C add r0, r7, #0 mov r2, #0x8 bl memcpy - ldr r5, ._578 + 8 + ldr r5, ._578 + 8 @ gUnknown_Debug_2038A1C ldr r2, [r5] add r0, r2, #0 add r0, r0, #0x98 @@ -5712,7 +5712,7 @@ debug_80C5FFC: add r1, r1, #0xec ldr r2, [r1] lsl r2, r2, #0x3 - ldr r1, ._578 + 12 + ldr r1, ._578 + 12 @ gUnknown_Debug_083F86E8 add r2, r2, r1 mov r1, #0x37 bl SetMonData @@ -5771,12 +5771,12 @@ debug_80C627C: lsl r0, r0, #0x18 lsr r4, r0, #0x18 add r6, r4, #0 - ldr r1, ._584 + ldr r1, ._584 @ gUnknown_Debug_083F7FD4 mov r0, sp mov r2, #0x2 bl memcpy add r5, sp, #0x4 - ldr r1, ._584 + 4 + ldr r1, ._584 + 4 @ gUnknown_Debug_083F8764 add r0, r5, #0 mov r2, #0x2 bl memcpy @@ -5797,9 +5797,9 @@ debug_80C627C: beq ._586 @cond_branch b ._595 ._582: - ldr r0, ._589 + ldr r0, ._589 @ gUnknown_Debug_2038A1C ldr r0, [r0] - ldr r1, ._589 + 4 + ldr r1, ._589 + 4 @ 0x169 add r0, r0, r1 b ._588 ._590: @@ -5808,12 +5808,12 @@ debug_80C627C: .word gUnknown_Debug_2038A1C .word 0x169 ._580: - ldr r4, ._593 + ldr r4, ._593 @ gUnknown_Debug_2038A1C ldr r3, [r4] - ldr r1, ._593 + 4 + ldr r1, ._593 + 4 @ 0x169 add r0, r3, r1 ldrb r2, [r0] - ldr r1, ._593 + 8 + ldr r1, ._593 + 8 @ gUnknown_Debug_083F8698 mov r6, #0xb4 lsl r6, r6, #0x1 add r0, r3, r6 @@ -5833,7 +5833,7 @@ debug_80C627C: mov r1, #0x1 bl Menu_PrintText ldr r0, [r4] - ldr r2, ._593 + 4 + ldr r2, ._593 + 4 @ 0x169 add r1, r0, r2 ldrb r0, [r1] add r0, r0, #0x1 @@ -5858,9 +5858,9 @@ debug_80C627C: .word 0x169 .word gUnknown_Debug_083F8698 ._586: - ldr r4, ._596 + ldr r4, ._596 @ gUnknown_Debug_2038A1C ldr r0, [r4] - ldr r2, ._596 + 4 + ldr r2, ._596 + 4 @ 0x169 add r1, r0, r2 ldrb r0, [r1] cmp r0, #0 @@ -5875,7 +5875,7 @@ debug_80C627C: mov r1, #0x1 bl Menu_PrintText ldr r0, [r4] - ldr r2, ._596 + 4 + ldr r2, ._596 + 4 @ 0x169 add r1, r0, r2 ldrb r0, [r1] sub r0, r0, #0x1 @@ -5914,8 +5914,8 @@ debug_80C6384: mov r3, #0x13 bl Menu_DrawStdWindowFrame mov r5, #0x0 - ldr r3, ._600 - ldr r1, ._600 + 4 + ldr r3, ._600 @ gUnknown_Debug_083F8698 + ldr r1, ._600 + 4 @ gUnknown_Debug_2038A1C ldr r0, [r1] mov r2, #0xb4 lsl r2, r2, #0x1 @@ -5928,7 +5928,7 @@ debug_80C6384: cmp r0, #0xff beq ._598 @cond_branch add r4, r1, #0 - ldr r0, ._600 + 8 + ldr r0, ._600 + 8 @ 0x16b mov r9, r0 mov r8, r3 add r7, r2, #0 @@ -5943,7 +5943,7 @@ debug_80C6384: add r0, r0, r1 strb r6, [r0] ldr r0, [r4] - ldr r2, ._600 + 12 + ldr r2, ._600 + 12 @ 0x16d add r0, r0, r2 strb r6, [r0] ldr r1, [r4] @@ -6008,8 +6008,8 @@ debug_80C643C: mov r3, #0x12 bl Menu_BlankWindowRect mov r5, #0x0 - ldr r6, ._605 - ldr r1, ._605 + 4 + ldr r6, ._605 @ gUnknown_Debug_083F8698 + ldr r1, ._605 + 4 @ gUnknown_Debug_2038A1C ldr r0, [r1] mov r3, #0xb4 lsl r3, r3, #0x1 @@ -6026,7 +6026,7 @@ debug_80C643C: mov r8, r0 ._607: ldr r0, [r4] - ldr r7, ._605 + 8 + ldr r7, ._605 + 8 @ 0x16b add r2, r0, r7 mov r0, #0xfc strb r0, [r2] @@ -6037,12 +6037,12 @@ debug_80C643C: mov r7, r8 strb r7, [r0] ldr r2, [r4] - ldr r7, ._605 + 12 + ldr r7, ._605 + 12 @ 0x169 add r0, r2, r7 ldrb r0, [r0] cmp r5, r0 bne ._603 @cond_branch - ldr r0, ._605 + 16 + ldr r0, ._605 + 16 @ 0x16d add r2, r2, r0 mov r0, #0x2 strb r0, [r2] @@ -6069,7 +6069,7 @@ debug_80C643C: .word 0x169 .word 0x16d ._603: - ldr r3, ._608 + ldr r3, ._608 @ 0x16d add r0, r2, r3 mov r7, r8 strb r7, [r0] @@ -6077,7 +6077,7 @@ debug_80C643C: mov r2, #0xb7 lsl r2, r2, #0x1 add r0, r1, r2 - ldr r2, ._608 + 4 + ldr r2, ._608 + 4 @ gUnknown_Debug_083F8698 sub r3, r3, #0x5 add r1, r1, r3 ldrb r1, [r1] @@ -6090,7 +6090,7 @@ debug_80C643C: bl debug_80C5738 ._604: ldr r0, [r4] - ldr r7, ._608 + 8 + ldr r7, ._608 + 8 @ 0x16b add r0, r0, r7 lsl r2, r5, #0x19 mov r1, #0xa0 @@ -6102,7 +6102,7 @@ debug_80C643C: add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 - ldr r6, ._608 + 4 + ldr r6, ._608 + 4 @ gUnknown_Debug_083F8698 add r1, r4, #0 ldr r0, [r4] mov r3, #0xb4 @@ -6140,9 +6140,9 @@ debug_80C6544: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r9, r0 - ldr r0, ._614 + ldr r0, ._614 @ gUnknown_Debug_083F8698 mov r8, r0 - ldr r6, ._614 + 4 + ldr r6, ._614 + 4 @ gUnknown_Debug_2038A1C ldr r1, [r6] mov r5, #0xb4 lsl r5, r5, #0x1 @@ -6150,7 +6150,7 @@ debug_80C6544: ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r8 - ldr r4, ._614 + 8 + ldr r4, ._614 + 8 @ 0x169 add r1, r1, r4 ldrb r1, [r1] ldr r0, [r0] @@ -6158,7 +6158,7 @@ debug_80C6544: ldrb r0, [r0] bl debug_80C5B60 add r7, r0, #0 - ldr r2, ._614 + 12 + ldr r2, ._614 + 12 @ gUnknown_Debug_083F8554 ldr r3, [r6] add r5, r3, r5 ldrb r0, [r5] @@ -6175,7 +6175,7 @@ debug_80C6544: ldr r1, [r0] ldr r5, [r1] ldr r4, [r1, #0x4] - ldr r2, ._614 + 16 + ldr r2, ._614 + 16 @ gUnknown_Debug_083F8768 mov r6, #0xb5 lsl r6, r6, #0x1 add r0, r3, r6 @@ -6225,8 +6225,8 @@ debug_80C6544: ._622: add r7, r4, #0 ._623: - ldr r1, ._624 - ldr r0, ._624 + 4 + ldr r1, ._624 @ gUnknown_Debug_083F8698 + ldr r0, ._624 + 4 @ gUnknown_Debug_2038A1C ldr r2, [r0] mov r3, #0xb4 lsl r3, r3, #0x1 @@ -6234,7 +6234,7 @@ debug_80C6544: ldrb r0, [r0] lsl r0, r0, #0x3 add r0, r0, r1 - ldr r6, ._624 + 8 + ldr r6, ._624 + 8 @ 0x169 add r1, r2, r6 ldrb r1, [r1] ldr r0, [r0] @@ -6275,7 +6275,7 @@ debug_80C6630: add r4, r4, #0x1 cmp r2, #0x2 bne ._626 @cond_branch - ldr r0, ._629 + ldr r0, ._629 @ gUnknown_Debug_2038A1C ldr r0, [r0] mov r5, #0xb5 lsl r5, r5, #0x1 @@ -6321,7 +6321,7 @@ debug_80C6678: cmp r0, #0x9 bhi ._644 @cond_branch lsl r0, r0, #0x2 - ldr r1, ._633 + ldr r1, ._633 @ add r0, r0, r1 ldr r0, [r0] mov pc, r0 @@ -6343,7 +6343,7 @@ debug_80C6678: ._644: mov r0, r9 add r4, r0, r7 - ldr r5, ._645 + ldr r5, ._645 @ 0x3b9aca00 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6364,7 +6364,7 @@ debug_80C6678: ._643: mov r1, r9 add r4, r1, r7 - ldr r5, ._645 + 4 + ldr r5, ._645 + 4 @ 0x5f5e100 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6385,7 +6385,7 @@ debug_80C6678: ._642: mov r0, r9 add r4, r0, r7 - ldr r5, ._645 + 8 + ldr r5, ._645 + 8 @ 0x989680 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6406,7 +6406,7 @@ debug_80C6678: ._641: mov r1, r9 add r4, r1, r7 - ldr r5, ._645 + 12 + ldr r5, ._645 + 12 @ 0xf4240 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6427,7 +6427,7 @@ debug_80C6678: ._640: mov r0, r9 add r4, r0, r7 - ldr r5, ._645 + 16 + ldr r5, ._645 + 16 @ 0x186a0 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6448,7 +6448,7 @@ debug_80C6678: ._639: mov r1, r9 add r4, r1, r7 - ldr r5, ._645 + 20 + ldr r5, ._645 + 20 @ 0x2710 add r0, r6, #0 add r1, r5, #0 bl __udivsi3 @@ -6683,19 +6683,19 @@ InitSeePokemonGraphics: push {r4, r5, r6, lr} add sp, sp, #0xfffffff8 bl debug_80C35DC - ldr r1, ._659 - ldr r2, ._659 + 4 - ldr r0, ._659 + 8 + ldr r1, ._659 @ byte_83F88EC + ldr r2, ._659 + 4 @ 0x600e000 + ldr r0, ._659 + 8 @ 0x40000d4 str r1, [r0] str r2, [r0, #0x4] - ldr r1, ._659 + 12 + ldr r1, ._659 + 12 @ 0x80000400 str r1, [r0, #0x8] ldr r0, [r0, #0x8] - ldr r0, ._659 + 16 + ldr r0, ._659 + 16 @ word_83F888C mov r1, #0x80 mov r2, #0x60 bl LoadPalette - ldr r1, ._659 + 20 + ldr r1, ._659 + 20 @ 0x7fff add r0, sp, #0x4 strh r1, [r0] mov r1, #0x0 @@ -6709,7 +6709,7 @@ InitSeePokemonGraphics: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._659 + 24 + ldr r0, ._659 + 24 @ 0x4000040 mov r6, #0x0 strh r5, [r0] add r0, r0, #0x4 @@ -6718,7 +6718,7 @@ InitSeePokemonGraphics: strh r5, [r0] add r0, r0, #0x4 strh r5, [r0] - ldr r1, ._659 + 28 + ldr r1, ._659 + 28 @ 0x4000048 mov r0, #0x3f strh r0, [r1] add r1, r1, #0x2 @@ -6727,31 +6727,31 @@ InitSeePokemonGraphics: add r1, r1, #0x6 mov r0, #0xf1 strh r0, [r1] - ldr r0, ._659 + 32 + ldr r0, ._659 + 32 @ 0x4000052 strh r5, [r0] add r1, r1, #0x4 mov r0, #0x7 strh r0, [r1] - ldr r3, ._659 + 36 + ldr r3, ._659 + 36 @ 0x4000208 ldrh r2, [r3] strh r5, [r3] - ldr r4, ._659 + 40 + ldr r4, ._659 + 40 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, ._659 + 44 + ldr r0, ._659 + 44 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._659 + 48 + ldr r0, ._659 + 48 @ debug_80C370C bl SetMainCallback2 bl sub_809D51C - ldr r1, ._659 + 52 - ldr r2, ._659 + 56 + ldr r1, ._659 + 52 @ 0x4000008 + ldr r2, ._659 + 56 @ 0x1f0b add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r2, ._659 + 60 + ldr r2, ._659 + 60 @ 0x1e0a add r0, r2, #0 strh r0, [r1] sub r1, r1, #0xa @@ -6759,13 +6759,13 @@ InitSeePokemonGraphics: lsl r2, r2, #0x6 add r0, r2, #0 strh r0, [r1] - ldr r0, ._659 + 64 + ldr r0, ._659 + 64 @ debug_80C6B00 mov r1, #0x0 bl CreateTask - ldr r1, ._659 + 68 - ldr r0, ._659 + 72 + ldr r1, ._659 + 68 @ gUnknown_Debug_2038A20 + ldr r0, ._659 + 72 @ 0x2018000 str r0, [r1] - ldr r1, ._659 + 76 + ldr r1, ._659 + 76 @ 0x115 strh r1, [r0] strb r6, [r0, #0x2] strb r6, [r0, #0x3] @@ -6773,7 +6773,7 @@ InitSeePokemonGraphics: strb r6, [r0, #0x7] strb r6, [r0, #0xa] strb r6, [r0, #0x8] - ldr r4, ._659 + 80 + ldr r4, ._659 + 80 @ gSpriteTemplate_83F8874 add r0, r4, #0 mov r1, #0x6c mov r2, #0x74 @@ -6782,7 +6782,7 @@ InitSeePokemonGraphics: add r1, r0, #0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - ldr r6, ._659 + 84 + ldr r6, ._659 + 84 @ gSprites lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 @@ -6845,7 +6845,7 @@ InitSeePokemonGraphics: .word 0x1e0a .word debug_80C6B00+1 .word gUnknown_Debug_2038A20 - .word +0x2018000 + .word 0x2018000 .word 0x115 .word gSpriteTemplate_83F8874 .word gSprites @@ -6860,7 +6860,7 @@ debug_80C6B00: add sp, sp, #0xffffffec lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r1, ._666 + ldr r1, ._666 @ gUnknown_Debug_083F8815 mov r0, sp mov r2, #0x12 bl memcpy @@ -6884,15 +6884,15 @@ debug_80C6B00: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r0, ._666 + 4 + ldr r0, ._666 + 4 @ gUnknown_Debug_083F87D0 mov r1, #0x11 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._666 + 8 + ldr r0, ._666 + 8 @ gUnknown_Debug_083F87D8 mov r1, #0x1b mov r2, #0x1 bl Menu_PrintText - ldr r0, ._666 + 12 + ldr r0, ._666 + 12 @ gUnknown_Debug_083F87E0 mov r1, #0x11 mov r2, #0x5 bl Menu_PrintText @@ -6902,8 +6902,8 @@ debug_80C6B00: mov r3, #0xc bl Menu_DrawStdWindowFrame mov r2, #0x0 - ldr r4, ._666 + 16 - ldr r0, ._666 + 20 + ldr r4, ._666 + 16 @ 0x600fa56 + ldr r0, ._666 + 20 @ 0xa311 add r3, r0, #0 ._661: lsl r0, r2, #0x1 @@ -6916,11 +6916,11 @@ debug_80C6B00: cmp r2, #0xe bls ._661 @cond_branch mov r2, #0x0 - ldr r5, ._666 + 24 + ldr r5, ._666 + 24 @ gUnknown_Debug_083F87F4 lsl r6, r7, #0x2 mov r8, r6 - ldr r4, ._666 + 28 - ldr r0, ._666 + 32 + ldr r4, ._666 + 28 @ 0x600f256 + ldr r0, ._666 + 32 @ 0x8301 add r3, r0, #0 ._662: lsl r0, r2, #0x1 @@ -6945,7 +6945,7 @@ debug_80C6B00: mov r0, #0x23 strb r0, [r1] mov r2, #0x0 - ldr r4, ._666 + 36 + ldr r4, ._666 + 36 @ 0x600f396 mov r5, #0x93 lsl r5, r5, #0x8 add r3, r5, #0 @@ -6966,8 +6966,8 @@ debug_80C6B00: mov r0, #0x24 strb r0, [r1] mov r2, #0x0 - ldr r5, ._666 + 40 - ldr r4, ._666 + 44 + ldr r5, ._666 + 40 @ gUnknown_Debug_083F8801 + ldr r4, ._666 + 44 @ 0x600f3d6 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -6988,7 +6988,7 @@ debug_80C6B00: mov r0, #0x25 strb r0, [r1] mov r2, #0x0 - ldr r4, ._666 + 48 + ldr r4, ._666 + 48 @ 0x600f416 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -7009,20 +7009,20 @@ debug_80C6B00: mov r1, #0xf mov r2, #0x11 bl Menu_PrintText - ldr r1, ._666 + 52 - ldr r2, ._666 + 56 + ldr r1, ._666 + 52 @ 0x4000040 + ldr r2, ._666 + 56 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r5, ._666 + 60 + ldr r5, ._666 + 60 @ 0x699f add r0, r5, #0 strh r0, [r1] - ldr r1, ._666 + 64 + ldr r1, ._666 + 64 @ gTasks mov r6, r8 add r0, r6, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._666 + 68 + ldr r1, ._666 + 68 @ debug_80C6CB8 str r1, [r0] add sp, sp, #0x14 pop {r3} @@ -7066,18 +7066,18 @@ debug_80C6CB8: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov sl, r0 - ldr r5, ._668 + ldr r5, ._668 @ gUnknown_Debug_2038A20 ldr r4, [r5] ldrh r2, [r4] lsl r0, r2, #0x3 - ldr r1, ._668 + 4 + ldr r1, ._668 + 4 @ gMonFrontPicTable add r0, r0, r1 - ldr r1, ._668 + 8 + ldr r1, ._668 + 8 @ gMonFrontPicCoords lsl r2, r2, #0x2 add r2, r2, r1 ldrb r1, [r2] ldrb r2, [r2, #0x1] - ldr r3, ._668 + 12 + ldr r3, ._668 + 12 @ gUnknown_081FAF4C mov r8, r3 ldr r6, [r3] str r6, [sp, #0x8] @@ -7090,14 +7090,14 @@ debug_80C6CB8: ldr r0, [r5] ldrh r0, [r0] lsl r0, r0, #0x3 - ldr r7, ._668 + 16 + ldr r7, ._668 + 16 @ gMonPaletteTable add r0, r0, r7 bl LoadCompressedObjectPalette ldr r0, [r5] ldrh r0, [r0] mov r1, #0x1 bl GetMonSpriteTemplate_803C56C - ldr r0, ._668 + 20 + ldr r0, ._668 + 20 @ gUnknown_02024E8C mov r1, #0x28 mov r2, #0x28 mov r3, #0x0 @@ -7109,16 +7109,16 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r1, ._668 + 24 + ldr r1, ._668 + 24 @ gSprites add r0, r0, r1 - ldr r3, ._668 + 28 + ldr r3, ._668 + 28 @ debug_69 mov r9, r3 str r3, [r0] ldrb r0, [r2, #0x2] lsl r1, r0, #0x4 add r1, r1, r0 lsl r1, r1, #0x2 - ldr r6, ._668 + 32 + ldr r6, ._668 + 32 @ gSprites add r1, r1, r6 ldrb r2, [r1, #0x5] mov r6, #0xd @@ -7129,9 +7129,9 @@ debug_80C6CB8: ldr r4, [r5] ldrh r2, [r4] lsl r0, r2, #0x3 - ldr r1, ._668 + 36 + ldr r1, ._668 + 36 @ gMonBackPicTable add r0, r0, r1 - ldr r1, ._668 + 40 + ldr r1, ._668 + 40 @ gMonBackPicCoords lsl r2, r2, #0x2 add r2, r2, r1 ldrb r1, [r2] @@ -7146,14 +7146,14 @@ debug_80C6CB8: ldr r0, [r5] ldrh r0, [r0] lsl r0, r0, #0x3 - ldr r1, ._668 + 16 + ldr r1, ._668 + 16 @ gMonPaletteTable add r0, r0, r1 bl LoadCompressedObjectPalette ldr r0, [r5] ldrh r0, [r0] mov r1, #0x2 bl GetMonSpriteTemplate_803C56C - ldr r0, ._668 + 20 + ldr r0, ._668 + 20 @ gUnknown_02024E8C mov r1, #0x28 mov r2, #0x78 mov r3, #0x0 @@ -7165,7 +7165,7 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r3, ._668 + 24 + ldr r3, ._668 + 24 @ gSprites add r0, r0, r3 mov r7, r9 str r7, [r0] @@ -7173,14 +7173,14 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r1, ._668 + 32 + ldr r1, ._668 + 32 @ gSprites add r0, r0, r1 ldrb r1, [r0, #0x5] and r6, r6, r1 strb r6, [r0, #0x5] ldr r0, [r5] ldrh r0, [r0] - ldr r1, ._668 + 44 + ldr r1, ._668 + 44 @ sub_809D62C mov r2, #0x0 str r2, [sp] str r2, [sp, #0x4] @@ -7198,20 +7198,20 @@ debug_80C6CB8: lsl r2, r2, #0x2 mov r1, #0x2 bl sub_8091738 - ldr r1, ._668 + 48 - ldr r3, ._668 + 52 + ldr r1, ._668 + 48 @ 0x600f858 + ldr r3, ._668 + 52 @ 0xf3fc add r0, r3, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r6, ._668 + 56 + ldr r6, ._668 + 56 @ 0xf3fd add r0, r6, #0 strh r0, [r1] add r1, r1, #0x3e - ldr r7, ._668 + 60 + ldr r7, ._668 + 60 @ 0xf3fe add r0, r7, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r2, ._668 + 64 + ldr r2, ._668 + 64 @ 0xf3ff add r0, r2, #0 strh r0, [r1] ldr r0, [r5] @@ -7229,7 +7229,7 @@ debug_80C6CB8: lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 - ldr r3, ._668 + 32 + ldr r3, ._668 + 32 @ gSprites add r0, r0, r3 ldrb r0, [r0, #0x5] lsr r0, r0, #0x4 @@ -7237,9 +7237,9 @@ debug_80C6CB8: ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._668 + 68 + ldr r4, ._668 + 68 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r6, ._668 + 72 + ldr r6, ._668 + 72 @ 0xffffff00 add r1, r4, r6 mov r2, #0x10 bl CpuSet @@ -7247,16 +7247,16 @@ debug_80C6CB8: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._668 + 76 + ldr r1, ._668 + 76 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet - ldr r1, ._668 + 80 + ldr r1, ._668 + 80 @ gTasks mov r7, sl lsl r0, r7, #0x2 add r0, r0, sl lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._668 + 84 + ldr r1, ._668 + 84 @ debug_80C6EE8 str r1, [r0] ldr r0, [r5] mov r1, #0x0 @@ -7308,14 +7308,14 @@ debug_80C6EE8: add r6, r0, #0 lsl r6, r6, #0x18 lsr r6, r6, #0x18 - ldr r4, ._670 - ldr r5, ._670 + 4 + ldr r4, ._670 @ gPlttBufferUnfaded + ldr r5, ._670 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r5] add r1, r1, #0x10 add r0, r4, #0 mov r2, #0x10 bl CpuSet - ldr r0, ._670 + 8 + ldr r0, ._670 + 8 @ 0xffffff00 add r4, r4, r0 ldr r3, [r5] ldrb r0, [r3, #0x7] @@ -7336,7 +7336,7 @@ debug_80C6EE8: lsl r1, r1, #0x2 and r1, r1, r4 ldrh r2, [r3, #0xc] - ldr r0, ._670 + 12 + ldr r0, ._670 + 12 @ 0xfffffc1f and r0, r0, r2 orr r0, r0, r1 strh r0, [r3, #0xc] @@ -7362,7 +7362,7 @@ debug_80C6EE8: mov r2, #0xa mov r3, #0x2 bl debug_80C68CC - ldr r0, ._670 + 16 + ldr r0, ._670 + 16 @ gUnknown_Debug_083F8813 mov r1, #0xd mov r2, #0xa bl Menu_PrintText @@ -7371,12 +7371,12 @@ debug_80C6EE8: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._670 + 20 + ldr r1, ._670 + 20 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._670 + 24 + ldr r1, ._670 + 24 @ debug_80C6FA8 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -7400,7 +7400,7 @@ debug_80C6FA8: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r1, ._674 + ldr r1, ._674 @ gMain ldrh r2, [r1, #0x2e] mov r0, #0x2 and r0, r0, r2 @@ -7416,14 +7416,14 @@ debug_80C6FA8: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._674 + 4 + ldr r0, ._674 + 4 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._674 + 8 + ldr r1, ._674 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._674 + 12 + ldr r1, ._674 + 12 @ debug_80C373C str r1, [r0] b ._703 ._675: @@ -7440,7 +7440,7 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._676 @cond_branch - ldr r4, ._678 + ldr r4, ._678 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x0 @@ -7455,7 +7455,7 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._680 @cond_branch - ldr r4, ._682 + ldr r4, ._682 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x1 @@ -7463,12 +7463,12 @@ debug_80C6FA8: bl debug_80C3878 ldr r1, [r4] strh r0, [r1] - ldr r1, ._682 + 4 + ldr r1, ._682 + 4 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._682 + 8 + ldr r1, ._682 + 8 @ debug_80C71FC str r1, [r0] b ._703 ._683: @@ -7482,24 +7482,24 @@ debug_80C6FA8: and r3, r3, r2 cmp r3, #0 beq ._684 @cond_branch - ldr r0, ._686 + ldr r0, ._686 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x1 strb r0, [r1, #0x5] - ldr r1, ._686 + 4 - ldr r2, ._686 + 8 + ldr r1, ._686 + 4 @ 0x4000040 + ldr r2, ._686 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._686 + 12 + ldr r2, ._686 + 12 @ 0x4167 add r0, r2, #0 strh r0, [r1] - ldr r1, ._686 + 16 + ldr r1, ._686 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._686 + 20 + ldr r1, ._686 + 20 @ debug_80C7294 str r1, [r0] b ._703 ._687: @@ -7516,13 +7516,13 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._689 @cond_branch - ldr r1, ._691 + ldr r1, ._691 @ gUnknown_Debug_2038A20 ldr r2, [r1] ldrb r0, [r2, #0x7] cmp r0, #0xd bhi ._689 @cond_branch lsl r0, r0, #0x1 - ldr r2, ._691 + 4 + ldr r2, ._691 + 4 @ 0x5000102 add r0, r0, r2 strh r3, [r0] ldr r1, [r1] @@ -7541,13 +7541,13 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._694 @cond_branch - ldr r2, ._696 + ldr r2, ._696 @ gUnknown_Debug_2038A20 ldr r1, [r2] ldrb r0, [r1, #0x7] cmp r0, #0 beq ._694 @cond_branch lsl r0, r0, #0x1 - ldr r1, ._696 + 4 + ldr r1, ._696 + 4 @ 0x5000102 add r0, r0, r1 mov r1, #0x0 strh r1, [r0] @@ -7567,7 +7567,7 @@ debug_80C6FA8: and r0, r0, r1 cmp r0, #0 beq ._698 @cond_branch - ldr r4, ._701 + ldr r4, ._701 @ gUnknown_Debug_2038A20 ldr r2, [r4] ldrb r0, [r2, #0x9] mov r1, #0x1 @@ -7610,13 +7610,13 @@ debug_80C6FA8: mov r2, #0x20 bl LoadCompressedPalette ._700: - ldr r5, ._704 + ldr r5, ._704 @ gUnknown_Debug_2038A20 ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._704 + 4 + ldr r4, ._704 + 4 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r2, ._704 + 8 + ldr r2, ._704 + 8 @ 0xffffff00 add r1, r4, r2 mov r2, #0x10 bl CpuSet @@ -7624,16 +7624,16 @@ debug_80C6FA8: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._704 + 12 + ldr r1, ._704 + 12 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet ._695: - ldr r1, ._704 + 16 + ldr r1, ._704 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._704 + 20 + ldr r1, ._704 + 20 @ debug_80C6EE8 str r1, [r0] b ._703 ._705: @@ -7651,13 +7651,13 @@ debug_80C6FA8: cmp r0, #0 beq ._706 @cond_branch bl StopCryAndClearCrySongs - ldr r0, ._707 + ldr r0, ._707 @ gUnknown_Debug_2038A20 ldr r0, [r0] ldrh r0, [r0] mov r1, #0x0 bl PlayCry1 ._706: - ldr r2, ._707 + ldr r2, ._707 @ gUnknown_Debug_2038A20 ldr r1, [r2] ldrb r0, [r1, #0x8] add r0, r0, #0x4 @@ -7670,9 +7670,9 @@ debug_80C6FA8: ldr r0, [r2] ldrb r1, [r0, #0x7] lsl r1, r1, #0x1 - ldr r2, ._707 + 4 + ldr r2, ._707 + 4 @ 0x5000142 add r1, r1, r2 - ldr r2, ._707 + 8 + ldr r2, ._707 + 8 @ gUnknown_Debug_083F8790 ldrb r0, [r0, #0x8] lsl r0, r0, #0x1 add r0, r0, r2 @@ -7698,8 +7698,8 @@ debug_80C71FC: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r6, ._709 - ldr r4, ._709 + 4 + ldr r6, ._709 @ gSprites + ldr r4, ._709 + 4 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrb r1, [r0, #0x2] lsl r0, r1, #0x4 @@ -7745,12 +7745,12 @@ debug_80C71FC: lsl r0, r0, #0x2 add r0, r0, r6 bl sub_809D510 - ldr r1, ._709 + 8 + ldr r1, ._709 + 8 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._709 + 12 + ldr r1, ._709 + 12 @ debug_80C6CB8 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -7770,23 +7770,23 @@ debug_80C7294: push {r4, r5, r6, r7, lr} lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r0, ._713 + ldr r0, ._713 @ gMain ldrh r2, [r0, #0x2e] mov r1, #0x1 and r1, r1, r2 add r3, r0, #0 cmp r1, #0 beq ._711 @cond_branch - ldr r0, ._713 + 4 + ldr r0, ._713 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x0 strb r0, [r1, #0x5] - ldr r1, ._713 + 8 - ldr r2, ._713 + 12 + ldr r1, ._713 + 8 @ 0x4000040 + ldr r2, ._713 + 12 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._713 + 16 + ldr r2, ._713 + 16 @ 0x699f add r0, r2, #0 strh r0, [r1] b ._712 @@ -7803,26 +7803,26 @@ debug_80C7294: and r0, r0, r2 cmp r0, #0 beq ._715 @cond_branch - ldr r6, ._717 + ldr r6, ._717 @ gUnknown_Debug_2038A20 ldr r0, [r6] strb r1, [r0, #0x5] - ldr r1, ._717 + 4 - ldr r2, ._717 + 8 + ldr r1, ._717 + 4 @ 0x4000040 + ldr r2, ._717 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._717 + 12 + ldr r2, ._717 + 12 @ 0x699f add r0, r2, #0 strh r0, [r1] ldr r0, [r6] add r0, r0, #0x10 - ldr r4, ._717 + 16 + ldr r4, ._717 + 16 @ gPlttBufferUnfaded add r1, r4, #0 mov r2, #0x10 bl CpuSet ldr r0, [r6] add r0, r0, #0x10 - ldr r5, ._717 + 20 + ldr r5, ._717 + 20 @ gPlttBufferFaded add r1, r5, #0 mov r2, #0x10 bl CpuSet @@ -7849,12 +7849,12 @@ debug_80C7294: mov r2, #0x10 bl CpuSet ._712: - ldr r1, ._717 + 24 + ldr r1, ._717 + 24 @ gTasks lsl r0, r7, #0x2 add r0, r0, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._717 + 28 + ldr r1, ._717 + 28 @ debug_80C6EE8 str r1, [r0] b ._754 ._718: @@ -7874,7 +7874,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._720 @cond_branch - ldr r0, ._722 + ldr r0, ._722 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0x1 @@ -7892,7 +7892,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._725 @cond_branch - ldr r0, ._727 + ldr r0, ._727 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0 @@ -7910,7 +7910,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._729 @cond_branch - ldr r0, ._734 + ldr r0, ._734 @ gUnknown_Debug_2038A20 ldr r2, [r0] ldrb r0, [r2, #0xa] cmp r0, #0x1 @@ -7953,7 +7953,7 @@ debug_80C7294: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._742 + ldr r1, ._742 @ 0xfffffc1f and r1, r1, r3 orr r1, r1, r0 strh r1, [r2, #0xc] @@ -7983,7 +7983,7 @@ debug_80C7294: and r0, r0, r1 cmp r0, #0 beq ._754 @cond_branch - ldr r0, ._751 + ldr r0, ._751 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xa] cmp r0, #0x1 @@ -8031,7 +8031,7 @@ debug_80C7294: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._759 + ldr r1, ._759 @ 0xfffffc1f and r1, r1, r2 orr r1, r1, r0 strh r1, [r3, #0xc] @@ -8058,12 +8058,12 @@ debug_80C7294: orr r1, r1, r0 strb r1, [r3, #0xd] ._761: - ldr r0, ._762 + ldr r0, ._762 @ gTasks lsl r1, r7, #0x2 add r1, r1, r7 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._762 + 4 + ldr r0, ._762 + 4 @ debug_80C74E4 str r0, [r1] ._754: pop {r4, r5, r6, r7} @@ -8085,7 +8085,7 @@ debug_80C74E4: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r0, ._764 + ldr r0, ._764 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xc] lsl r0, r0, #0x1b @@ -8100,13 +8100,13 @@ debug_80C74E4: lsr r1, r1, #0x1b lsl r1, r1, #0xa add r0, r0, r1 - ldr r6, ._764 + 4 + ldr r6, ._764 + 4 @ gPlttBufferUnfaded ldrb r1, [r3, #0x7] add r1, r1, #0x81 lsl r1, r1, #0x1 add r1, r1, r6 strh r0, [r1] - ldr r1, ._764 + 8 + ldr r1, ._764 + 8 @ gPlttBufferFaded mov r8, r1 ldrb r1, [r3, #0x7] add r1, r1, #0x81 @@ -8116,7 +8116,7 @@ debug_80C74E4: ldrb r1, [r3, #0x6] lsl r1, r1, #0x4 ldrb r2, [r3, #0x7] - ldr r4, ._764 + 12 + ldr r4, ._764 + 12 @ 0x101 add r2, r2, r4 add r1, r1, r2 lsl r1, r1, #0x1 @@ -8134,12 +8134,12 @@ debug_80C74E4: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._764 + 16 + ldr r1, ._764 + 16 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._764 + 20 + ldr r1, ._764 + 20 @ debug_80C7294 str r1, [r0] pop {r3} mov r8, r3 @@ -8162,7 +8162,7 @@ debug_80C74E4: debug_80C7584: push {r4, lr} add r2, r0, #0 - ldr r0, ._771 + ldr r0, ._771 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r1, [r3, #0x5] add r4, r0, #0 @@ -8239,15 +8239,15 @@ InitSeeTrainers: push {r4, r5, r6, lr} add sp, sp, #0xfffffffc bl debug_80C35DC - ldr r1, ._777 - ldr r2, ._777 + 4 - ldr r0, ._777 + 8 + ldr r1, ._777 @ byte_83F88EC + ldr r2, ._777 + 4 @ 0x600e000 + ldr r0, ._777 + 8 @ 0x40000d4 str r1, [r0] str r2, [r0, #0x4] - ldr r1, ._777 + 12 + ldr r1, ._777 + 12 @ 0x80000400 str r1, [r0, #0x8] ldr r0, [r0, #0x8] - ldr r0, ._777 + 16 + ldr r0, ._777 + 16 @ word_83F888C mov r1, #0x80 mov r2, #0x60 bl LoadPalette @@ -8259,7 +8259,7 @@ InitSeeTrainers: mov r2, #0x10 mov r3, #0x0 bl BeginNormalPaletteFade - ldr r0, ._777 + 20 + ldr r0, ._777 + 20 @ 0x4000040 mov r6, #0x0 strh r5, [r0] add r0, r0, #0x4 @@ -8268,7 +8268,7 @@ InitSeeTrainers: strh r5, [r0] add r0, r0, #0x4 strh r5, [r0] - ldr r1, ._777 + 24 + ldr r1, ._777 + 24 @ 0x4000048 mov r0, #0x3f strh r0, [r1] add r1, r1, #0x2 @@ -8277,30 +8277,30 @@ InitSeeTrainers: add r1, r1, #0x6 mov r0, #0xf1 strh r0, [r1] - ldr r0, ._777 + 28 + ldr r0, ._777 + 28 @ 0x4000052 strh r5, [r0] add r1, r1, #0x4 mov r0, #0x7 strh r0, [r1] - ldr r3, ._777 + 32 + ldr r3, ._777 + 32 @ 0x4000208 ldrh r2, [r3] strh r5, [r3] - ldr r4, ._777 + 36 + ldr r4, ._777 + 36 @ 0x4000200 ldrh r0, [r4] mov r1, #0x1 orr r0, r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, ._777 + 40 + ldr r0, ._777 + 40 @ debug_80C3758 bl SetVBlankCallback - ldr r0, ._777 + 44 + ldr r0, ._777 + 44 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._777 + 48 - ldr r2, ._777 + 52 + ldr r1, ._777 + 48 @ 0x4000008 + ldr r2, ._777 + 52 @ 0x1f0b add r0, r2, #0 strh r0, [r1] add r1, r1, #0x2 - ldr r2, ._777 + 56 + ldr r2, ._777 + 56 @ 0x1e0a add r0, r2, #0 strh r0, [r1] sub r1, r1, #0xa @@ -8308,11 +8308,11 @@ InitSeeTrainers: lsl r2, r2, #0x6 add r0, r2, #0 strh r0, [r1] - ldr r0, ._777 + 60 + ldr r0, ._777 + 60 @ debug_80C777C mov r1, #0x0 bl CreateTask - ldr r1, ._777 + 64 - ldr r0, ._777 + 68 + ldr r1, ._777 + 64 @ gUnknown_Debug_2038A20 + ldr r0, ._777 + 68 @ 0x2018000 str r0, [r1] strh r5, [r0] strb r6, [r0, #0x2] @@ -8321,7 +8321,7 @@ InitSeeTrainers: strb r6, [r0, #0x7] strb r6, [r0, #0xa] strb r6, [r0, #0x8] - ldr r4, ._777 + 72 + ldr r4, ._777 + 72 @ gSpriteTemplate_83F8874 add r0, r4, #0 mov r1, #0x6c mov r2, #0x74 @@ -8330,7 +8330,7 @@ InitSeeTrainers: add r1, r0, #0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - ldr r6, ._777 + 76 + ldr r6, ._777 + 76 @ gSprites lsl r0, r1, #0x4 add r0, r0, r1 lsl r0, r0, #0x2 @@ -8392,7 +8392,7 @@ InitSeeTrainers: .word 0x1e0a .word debug_80C777C+1 .word gUnknown_Debug_2038A20 - .word +0x2018000 + .word 0x2018000 .word gSpriteTemplate_83F8874 .word gSprites @@ -8406,7 +8406,7 @@ debug_80C777C: add sp, sp, #0xffffffec lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r1, ._784 + ldr r1, ._784 @ gUnknown_Debug_083F8815 mov r0, sp mov r2, #0x12 bl memcpy @@ -8430,15 +8430,15 @@ debug_80C777C: mov r2, #0x1d mov r3, #0x7 bl Menu_DrawStdWindowFrame - ldr r0, ._784 + 4 + ldr r0, ._784 + 4 @ gUnknown_Debug_083F87D0 mov r1, #0xf mov r2, #0x1 bl Menu_PrintText - ldr r0, ._784 + 8 + ldr r0, ._784 + 8 @ gUnknown_Debug_083F87D8 mov r1, #0x19 mov r2, #0x1 bl Menu_PrintText - ldr r0, ._784 + 12 + ldr r0, ._784 + 12 @ gUnknown_Debug_083F87E0 mov r1, #0xf mov r2, #0x5 bl Menu_PrintText @@ -8448,8 +8448,8 @@ debug_80C777C: mov r3, #0xc bl Menu_DrawStdWindowFrame mov r2, #0x0 - ldr r4, ._784 + 16 - ldr r0, ._784 + 20 + ldr r4, ._784 + 16 @ 0x600fa56 + ldr r0, ._784 + 20 @ 0xa311 add r3, r0, #0 ._779: lsl r0, r2, #0x1 @@ -8462,11 +8462,11 @@ debug_80C777C: cmp r2, #0xe bls ._779 @cond_branch mov r2, #0x0 - ldr r5, ._784 + 24 + ldr r5, ._784 + 24 @ gUnknown_Debug_083F87F4 lsl r6, r7, #0x2 mov r8, r6 - ldr r4, ._784 + 28 - ldr r0, ._784 + 32 + ldr r4, ._784 + 28 @ 0x600f256 + ldr r0, ._784 + 32 @ 0x8301 add r3, r0, #0 ._780: lsl r0, r2, #0x1 @@ -8491,7 +8491,7 @@ debug_80C777C: mov r0, #0x23 strb r0, [r1] mov r2, #0x0 - ldr r4, ._784 + 36 + ldr r4, ._784 + 36 @ 0x600f396 mov r5, #0x93 lsl r5, r5, #0x8 add r3, r5, #0 @@ -8512,8 +8512,8 @@ debug_80C777C: mov r0, #0x24 strb r0, [r1] mov r2, #0x0 - ldr r5, ._784 + 40 - ldr r4, ._784 + 44 + ldr r5, ._784 + 40 @ gUnknown_Debug_083F8801 + ldr r4, ._784 + 44 @ 0x600f3d6 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -8534,7 +8534,7 @@ debug_80C777C: mov r0, #0x25 strb r0, [r1] mov r2, #0x0 - ldr r4, ._784 + 48 + ldr r4, ._784 + 48 @ 0x600f416 mov r0, #0x93 lsl r0, r0, #0x8 add r3, r0, #0 @@ -8555,20 +8555,20 @@ debug_80C777C: mov r1, #0xf mov r2, #0x11 bl Menu_PrintText - ldr r1, ._784 + 52 - ldr r2, ._784 + 56 + ldr r1, ._784 + 52 @ 0x4000040 + ldr r2, ._784 + 56 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r5, ._784 + 60 + ldr r5, ._784 + 60 @ 0x699f add r0, r5, #0 strh r0, [r1] - ldr r1, ._784 + 64 + ldr r1, ._784 + 64 @ gTasks mov r6, r8 add r0, r6, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._784 + 68 + ldr r1, ._784 + 68 @ debug_80C7934 str r1, [r0] add sp, sp, #0x14 pop {r3} @@ -8610,18 +8610,18 @@ debug_80C7934: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r8, r0 - ldr r5, ._786 + ldr r5, ._786 @ gUnknown_Debug_2038A20 ldr r6, [r5] ldrh r2, [r6] lsl r0, r2, #0x3 - ldr r1, ._786 + 4 + ldr r1, ._786 + 4 @ gTrainerFrontPicTable add r0, r0, r1 - ldr r1, ._786 + 8 + ldr r1, ._786 + 8 @ gTrainerFrontPicCoords lsl r2, r2, #0x2 add r2, r2, r1 ldrb r1, [r2] ldrb r2, [r2, #0x1] - ldr r4, ._786 + 12 + ldr r4, ._786 + 12 @ gUnknown_081FAF4C ldr r3, [r4] ldr r4, [r4, #0x4] str r4, [sp] @@ -8631,14 +8631,14 @@ debug_80C7934: ldr r0, [r5] ldrh r0, [r0] lsl r0, r0, #0x3 - ldr r1, ._786 + 16 + ldr r1, ._786 + 16 @ gTrainerFrontPicPaletteTable add r0, r0, r1 bl LoadCompressedObjectPalette ldr r0, [r5] ldrh r0, [r0] mov r1, #0x1 bl GetMonSpriteTemplate_803C5A0 - ldr r0, ._786 + 20 + ldr r0, ._786 + 20 @ gUnknown_02024E8C mov r1, #0x28 mov r2, #0x28 mov r3, #0x0 @@ -8646,7 +8646,7 @@ debug_80C7934: ldr r1, [r5] mov r6, #0x0 strb r0, [r1, #0x2] - ldr r4, ._786 + 24 + ldr r4, ._786 + 24 @ gSprites ldr r2, [r5] ldrb r1, [r2, #0x2] lsl r0, r1, #0x4 @@ -8655,7 +8655,7 @@ debug_80C7934: add r1, r4, #0 add r1, r1, #0x1c add r0, r0, r1 - ldr r1, ._786 + 28 + ldr r1, ._786 + 28 @ debug_69 str r1, [r0] ldrb r0, [r2, #0x2] lsl r1, r0, #0x4 @@ -8684,9 +8684,9 @@ debug_80C7934: ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._786 + 32 + ldr r4, ._786 + 32 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r2, ._786 + 36 + ldr r2, ._786 + 36 @ 0xffffff00 add r1, r4, r2 mov r2, #0x10 bl CpuSet @@ -8694,16 +8694,16 @@ debug_80C7934: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._786 + 40 + ldr r1, ._786 + 40 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet - ldr r1, ._786 + 44 + ldr r1, ._786 + 44 @ gTasks mov r2, r8 lsl r0, r2, #0x2 add r0, r0, r8 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._786 + 48 + ldr r1, ._786 + 48 @ debug_80C7A54 str r1, [r0] ldr r0, [r5] strb r6, [r0, #0x9] @@ -8738,14 +8738,14 @@ debug_80C7A54: add r6, r0, #0 lsl r6, r6, #0x18 lsr r6, r6, #0x18 - ldr r4, ._788 - ldr r5, ._788 + 4 + ldr r4, ._788 @ gPlttBufferUnfaded + ldr r5, ._788 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r5] add r1, r1, #0x10 add r0, r4, #0 mov r2, #0x10 bl CpuSet - ldr r0, ._788 + 8 + ldr r0, ._788 + 8 @ 0xffffff00 add r4, r4, r0 ldr r3, [r5] ldrb r0, [r3, #0x7] @@ -8766,7 +8766,7 @@ debug_80C7A54: lsl r1, r1, #0x2 and r1, r1, r4 ldrh r2, [r3, #0xc] - ldr r0, ._788 + 12 + ldr r0, ._788 + 12 @ 0xfffffc1f and r0, r0, r2 orr r0, r0, r1 strh r0, [r3, #0xc] @@ -8792,7 +8792,7 @@ debug_80C7A54: mov r2, #0xa mov r3, #0x2 bl debug_80C68CC - ldr r0, ._788 + 16 + ldr r0, ._788 + 16 @ gUnknown_Debug_083F8813 mov r1, #0xd mov r2, #0xa bl Menu_PrintText @@ -8801,12 +8801,12 @@ debug_80C7A54: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._788 + 20 + ldr r1, ._788 + 20 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._788 + 24 + ldr r1, ._788 + 24 @ debug_80C7B14 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -8830,7 +8830,7 @@ debug_80C7B14: add sp, sp, #0xfffffffc lsl r0, r0, #0x18 lsr r6, r0, #0x18 - ldr r1, ._792 + ldr r1, ._792 @ gMain ldrh r3, [r1, #0x2e] mov r0, #0x2 and r0, r0, r3 @@ -8846,14 +8846,14 @@ debug_80C7B14: mov r2, #0x0 mov r3, #0x10 bl BeginNormalPaletteFade - ldr r0, ._792 + 4 + ldr r0, ._792 + 4 @ debug_80C370C bl SetMainCallback2 - ldr r1, ._792 + 8 + ldr r1, ._792 + 8 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._792 + 12 + ldr r1, ._792 + 12 @ debug_80C373C str r1, [r0] b ._821 ._793: @@ -8870,7 +8870,7 @@ debug_80C7B14: and r0, r0, r1 cmp r0, #0 beq ._794 @cond_branch - ldr r4, ._796 + ldr r4, ._796 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x0 @@ -8885,7 +8885,7 @@ debug_80C7B14: and r0, r0, r1 cmp r0, #0 beq ._798 @cond_branch - ldr r4, ._800 + ldr r4, ._800 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrh r1, [r0] mov r0, #0x1 @@ -8893,12 +8893,12 @@ debug_80C7B14: bl debug_80C38B4 ldr r1, [r4] strh r0, [r1] - ldr r1, ._800 + 4 + ldr r1, ._800 + 4 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._800 + 8 + ldr r1, ._800 + 8 @ debug_80C7D44 str r1, [r0] b ._821 ._801: @@ -8912,24 +8912,24 @@ debug_80C7B14: and r2, r2, r3 cmp r2, #0 beq ._802 @cond_branch - ldr r0, ._804 + ldr r0, ._804 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x1 strb r0, [r1, #0x5] - ldr r1, ._804 + 4 - ldr r2, ._804 + 8 + ldr r1, ._804 + 4 @ 0x4000040 + ldr r2, ._804 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._804 + 12 + ldr r2, ._804 + 12 @ 0x4167 add r0, r2, #0 strh r0, [r1] - ldr r1, ._804 + 16 + ldr r1, ._804 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._804 + 20 + ldr r1, ._804 + 20 @ debug_80C7DDC str r1, [r0] b ._821 ._805: @@ -8944,7 +8944,7 @@ debug_80C7B14: ._802: mov r0, #0x10 and r0, r0, r1 - ldr r3, ._809 + ldr r3, ._809 @ gUnknown_Debug_2038A20 cmp r0, #0 beq ._807 @cond_branch ldr r1, [r3] @@ -8952,7 +8952,7 @@ debug_80C7B14: cmp r0, #0xd bhi ._807 @cond_branch lsl r0, r0, #0x1 - ldr r1, ._809 + 4 + ldr r1, ._809 + 4 @ 0x5000102 add r0, r0, r1 strh r2, [r0] ldr r1, [r3] @@ -8976,7 +8976,7 @@ debug_80C7B14: cmp r0, #0 beq ._812 @cond_branch lsl r0, r0, #0x1 - ldr r2, ._814 + ldr r2, ._814 @ 0x5000102 add r0, r0, r2 mov r1, #0x0 strh r1, [r0] @@ -8995,7 +8995,7 @@ debug_80C7B14: and r0, r0, r1 cmp r0, #0 beq ._816 @cond_branch - ldr r4, ._819 + ldr r4, ._819 @ gUnknown_Debug_2038A20 ldr r2, [r4] ldrb r0, [r2, #0x9] mov r1, #0x1 @@ -9038,13 +9038,13 @@ debug_80C7B14: mov r2, #0x20 bl LoadCompressedPalette ._818: - ldr r5, ._822 + ldr r5, ._822 @ gUnknown_Debug_2038A20 ldr r0, [r5] ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 - ldr r4, ._822 + 4 + ldr r4, ._822 + 4 @ gPlttBufferUnfaded add r0, r0, r4 - ldr r2, ._822 + 8 + ldr r2, ._822 + 8 @ 0xffffff00 add r1, r4, r2 mov r2, #0x10 bl CpuSet @@ -9052,16 +9052,16 @@ debug_80C7B14: ldrb r0, [r0, #0x6] lsl r0, r0, #0x5 add r0, r0, r4 - ldr r1, ._822 + 12 + ldr r1, ._822 + 12 @ gPlttBufferFaded mov r2, #0x10 bl CpuSet ._813: - ldr r1, ._822 + 16 + ldr r1, ._822 + 16 @ gTasks lsl r0, r6, #0x2 add r0, r0, r6 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._822 + 20 + ldr r1, ._822 + 20 @ debug_80C7A54 str r1, [r0] b ._821 ._823: @@ -9086,9 +9086,9 @@ debug_80C7B14: ldr r0, [r3] ldrb r1, [r0, #0x7] lsl r1, r1, #0x1 - ldr r2, ._824 + ldr r2, ._824 @ 0x5000142 add r1, r1, r2 - ldr r2, ._824 + 4 + ldr r2, ._824 + 4 @ gUnknown_Debug_083F8790 ldrb r0, [r0, #0x8] lsl r0, r0, #0x1 add r0, r0, r2 @@ -9113,8 +9113,8 @@ debug_80C7D44: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r6, ._826 - ldr r4, ._826 + 4 + ldr r6, ._826 @ gSprites + ldr r4, ._826 + 4 @ gUnknown_Debug_2038A20 ldr r0, [r4] ldrb r1, [r0, #0x2] lsl r0, r1, #0x4 @@ -9160,12 +9160,12 @@ debug_80C7D44: lsl r0, r0, #0x2 add r0, r0, r6 bl sub_809D510 - ldr r1, ._826 + 8 + ldr r1, ._826 + 8 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._826 + 12 + ldr r1, ._826 + 12 @ debug_80C7934 str r1, [r0] pop {r4, r5, r6} pop {r0} @@ -9185,23 +9185,23 @@ debug_80C7DDC: push {r4, r5, r6, r7, lr} lsl r0, r0, #0x18 lsr r7, r0, #0x18 - ldr r0, ._830 + ldr r0, ._830 @ gMain ldrh r2, [r0, #0x2e] mov r1, #0x1 and r1, r1, r2 add r3, r0, #0 cmp r1, #0 beq ._828 @cond_branch - ldr r0, ._830 + 4 + ldr r0, ._830 + 4 @ gUnknown_Debug_2038A20 ldr r1, [r0] mov r0, #0x0 strb r0, [r1, #0x5] - ldr r1, ._830 + 8 - ldr r2, ._830 + 12 + ldr r1, ._830 + 8 @ 0x4000040 + ldr r2, ._830 + 12 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._830 + 16 + ldr r2, ._830 + 16 @ 0x699f add r0, r2, #0 strh r0, [r1] b ._829 @@ -9218,26 +9218,26 @@ debug_80C7DDC: and r0, r0, r2 cmp r0, #0 beq ._832 @cond_branch - ldr r6, ._834 + ldr r6, ._834 @ gUnknown_Debug_2038A20 ldr r0, [r6] strb r1, [r0, #0x5] - ldr r1, ._834 + 4 - ldr r2, ._834 + 8 + ldr r1, ._834 + 4 @ 0x4000040 + ldr r2, ._834 + 8 @ 0x51ef add r0, r2, #0 strh r0, [r1] add r1, r1, #0x4 - ldr r2, ._834 + 12 + ldr r2, ._834 + 12 @ 0x699f add r0, r2, #0 strh r0, [r1] ldr r0, [r6] add r0, r0, #0x10 - ldr r4, ._834 + 16 + ldr r4, ._834 + 16 @ gPlttBufferUnfaded add r1, r4, #0 mov r2, #0x10 bl CpuSet ldr r0, [r6] add r0, r0, #0x10 - ldr r5, ._834 + 20 + ldr r5, ._834 + 20 @ gPlttBufferFaded add r1, r5, #0 mov r2, #0x10 bl CpuSet @@ -9264,12 +9264,12 @@ debug_80C7DDC: mov r2, #0x10 bl CpuSet ._829: - ldr r1, ._834 + 24 + ldr r1, ._834 + 24 @ gTasks lsl r0, r7, #0x2 add r0, r0, r7 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._834 + 28 + ldr r1, ._834 + 28 @ debug_80C7A54 str r1, [r0] b ._871 ._835: @@ -9289,7 +9289,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._837 @cond_branch - ldr r0, ._839 + ldr r0, ._839 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0x1 @@ -9307,7 +9307,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._842 @cond_branch - ldr r0, ._844 + ldr r0, ._844 @ gUnknown_Debug_2038A20 ldr r1, [r0] ldrb r0, [r1, #0xa] cmp r0, #0 @@ -9325,7 +9325,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._846 @cond_branch - ldr r0, ._851 + ldr r0, ._851 @ gUnknown_Debug_2038A20 ldr r2, [r0] ldrb r0, [r2, #0xa] cmp r0, #0x1 @@ -9368,7 +9368,7 @@ debug_80C7DDC: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._859 + ldr r1, ._859 @ 0xfffffc1f and r1, r1, r3 orr r1, r1, r0 strh r1, [r2, #0xc] @@ -9398,7 +9398,7 @@ debug_80C7DDC: and r0, r0, r1 cmp r0, #0 beq ._871 @cond_branch - ldr r0, ._868 + ldr r0, ._868 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xa] cmp r0, #0x1 @@ -9446,7 +9446,7 @@ debug_80C7DDC: mov r1, #0x1f and r0, r0, r1 lsl r0, r0, #0x5 - ldr r1, ._876 + ldr r1, ._876 @ 0xfffffc1f and r1, r1, r2 orr r1, r1, r0 strh r1, [r3, #0xc] @@ -9473,12 +9473,12 @@ debug_80C7DDC: orr r1, r1, r0 strb r1, [r3, #0xd] ._878: - ldr r0, ._879 + ldr r0, ._879 @ gTasks lsl r1, r7, #0x2 add r1, r1, r7 lsl r1, r1, #0x3 add r1, r1, r0 - ldr r0, ._879 + 4 + ldr r0, ._879 + 4 @ debug_80C802C str r0, [r1] ._871: pop {r4, r5, r6, r7} @@ -9500,7 +9500,7 @@ debug_80C802C: add r5, r0, #0 lsl r5, r5, #0x18 lsr r5, r5, #0x18 - ldr r0, ._881 + ldr r0, ._881 @ gUnknown_Debug_2038A20 ldr r3, [r0] ldrb r0, [r3, #0xc] lsl r0, r0, #0x1b @@ -9515,13 +9515,13 @@ debug_80C802C: lsr r1, r1, #0x1b lsl r1, r1, #0xa add r0, r0, r1 - ldr r6, ._881 + 4 + ldr r6, ._881 + 4 @ gPlttBufferUnfaded ldrb r1, [r3, #0x7] add r1, r1, #0x81 lsl r1, r1, #0x1 add r1, r1, r6 strh r0, [r1] - ldr r1, ._881 + 8 + ldr r1, ._881 + 8 @ gPlttBufferFaded mov r8, r1 ldrb r1, [r3, #0x7] add r1, r1, #0x81 @@ -9531,7 +9531,7 @@ debug_80C802C: ldrb r1, [r3, #0x6] lsl r1, r1, #0x4 ldrb r2, [r3, #0x7] - ldr r4, ._881 + 12 + ldr r4, ._881 + 12 @ 0x101 add r2, r2, r4 add r1, r1, r2 lsl r1, r1, #0x1 @@ -9549,12 +9549,12 @@ debug_80C802C: mov r2, #0xa mov r3, #0x4 bl debug_80C68CC - ldr r1, ._881 + 16 + ldr r1, ._881 + 16 @ gTasks lsl r0, r5, #0x2 add r0, r0, r5 lsl r0, r0, #0x3 add r0, r0, r1 - ldr r1, ._881 + 20 + ldr r1, ._881 + 20 @ debug_80C7DDC str r1, [r0] pop {r3} mov r8, r3 diff --git a/src/roulette.c b/src/roulette.c index 5a8d35647..ffdbc2c26 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -607,7 +607,7 @@ void sub_8115384(void) .align 2, 0\n\ ._35:\n\ .word gUnknown_Debug_03005FB8\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gMain\n\ .word 0x43c\n\ .word ._37\n\ @@ -718,7 +718,7 @@ void sub_8115384(void) .align 2, 0\n\ ._56:\n\ .word gUnknown_083F88BC\n\ - .word +0x2018800\n\ + .word 0x2018800\n\ .word gUnknown_083F8A60\n\ .word 0x6003000\n\ .word gMain\n\ @@ -870,7 +870,7 @@ void sub_8115384(void) .word 0x4000004\n\ .word sub_8115124+1\n\ .word sub_81156BC+1\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gTasks\n\ .word gSaveBlock1\n\ .word 0x494\n\ @@ -1063,7 +1063,7 @@ void sub_8115634(u8 unused) ._76:\n\ .align 2, 0\n\ ._75:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word unk_203955C\n\ .word gMain\n\ .word gTasks\n\ @@ -2067,7 +2067,7 @@ void sub_8116B40(u8 taskid) // end roulette ? ._382:\n\ .align 2, 0\n\ ._381:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gSpriteCoordOffsetX\n\ .word gSpriteCoordOffsetY\n\ .word 0x4000050\n\ @@ -4499,7 +4499,7 @@ void debug_sub_812E698() ._840:\n\ .align 2, 0\n\ ._839:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word 0x0\n\ .word gUnknown_083F8DF4\n\ ._837:\n\ @@ -4546,7 +4546,7 @@ void debug_sub_812E698() ._842:\n\ .align 2, 0\n\ ._841:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word gUnknown_083F8DF4\n\ .word 0x3dae147b\n\ .word sub_8118D2C+1"); @@ -4902,7 +4902,7 @@ void sub_8118F8C(struct Sprite *sprite) ._869:\n\ .align 2, 0\n\ ._868:\n\ - .word +0x2019000\n\ + .word 0x2019000\n\ .word 0x3f000000\n\ .word 0x0\n\ .word gUnknown_083F8DF4\n\ -- cgit v1.2.3 From 2d5fdddf69bbbe524a32b6b6f104aeb60bb1cebd Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 27 Jan 2018 17:00:08 -0600 Subject: fix undefined references after merge --- src/engine/cable_club.c | 2 +- src/engine/mystery_event_menu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index 8f79944de..c656b2203 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -321,7 +321,7 @@ void debug_sub_808A55C() mov r2, #0xc\n\ mov r3, #0x1\n\ bl PrintHex\n\ - bl sub_8007ECC\n\ + bl IsLinkTaskFinished\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x18\n\ mov r1, #0xf\n\ diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 2e526bb4a..116b60477 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -697,7 +697,7 @@ void debug_sub_815D1D8() " .word 0x43c\n" "._149:\n" " bl Menu_UpdateWindowText\n" - " bl sub_8007ECC\n" + " bl IsLinkTaskFinished\n" " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " beq ._196 @cond_branch\n" -- cgit v1.2.3 From fe400f60b6609d37d2b8a0c2aec75321adc3e95f Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 27 Jan 2018 17:03:40 -0600 Subject: add comments for pool loads in C files --- src/battle/battle_2.c | 942 ++++++++++++++++---------------- src/battle/battle_4.c | 76 +-- src/battle/battle_controller_opponent.c | 36 +- src/battle/battle_controller_player.c | 128 ++--- src/battle/battle_records.c | 10 +- src/debug/start_menu_debug.c | 586 ++++++++++---------- src/engine/cable_club.c | 56 +- src/engine/link.c | 8 +- src/engine/mystery_event_menu.c | 92 ++-- src/engine/reset_rtc_screen.c | 34 +- src/engine/save_failed_screen.c | 34 +- src/field/berry.c | 100 ++-- src/field/choose_party.c | 4 +- src/field/field_map_obj.c | 28 +- src/field/field_player_avatar.c | 20 +- src/field/field_weather.c | 26 +- src/field/fldeff_cut.c | 10 +- src/field/fldeff_flash.c | 4 +- src/field/fldeff_secretpower.c | 10 +- src/field/item_menu.c | 102 ++-- src/field/mauville_man.c | 6 +- src/field/party_menu.c | 106 ++-- src/field/secret_base.c | 14 +- src/field/shop.c | 2 +- src/field/slot_machine.c | 108 ++-- src/field/start_menu.c | 54 +- src/pokemon/pokemon_summary_screen.c | 126 ++--- src/pokenav_before.c | 766 +++++++++++++------------- src/roulette.c | 262 ++++----- src/scene/cable_car.c | 28 +- src/scene/cute_sketch.c | 42 +- 31 files changed, 1910 insertions(+), 1910 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 2171c6ef6..b9b4290b5 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1521,7 +1521,7 @@ void debug_sub_8010A7C() " lsl r1, r1, #0x18\n" " lsr r2, r1, #0x18\n" " mov r1, #0x0\n" - " ldr r5, ._514\n" + " ldr r5, ._514 @ gBattleTextBuff1\n" " cmp r1, r2\n" " bge ._512 @cond_branch\n" " add r3, r5, #0\n" @@ -1562,14 +1562,14 @@ void debug_sub_8010AAC() " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov ip, r0\n" - " ldr r6, ._520\n" - " ldr r4, ._520 + 4\n" - " ldr r5, ._520 + 8\n" + " ldr r6, ._520 @ gBaseStats\n" + " ldr r4, ._520 + 4 @ gUnknown_Debug_2023A76\n" + " ldr r5, ._520 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r5]\n" " lsl r0, r1, #0x2\n" " add r7, r0, r1\n" " lsl r1, r7, #0x1\n" - " ldr r3, ._520 + 12\n" + " ldr r3, ._520 + 12 @ gUnknown_Debug_03004360\n" " ldrb r2, [r3]\n" " mov r0, #0x46\n" " mul r2, r2, r0\n" @@ -1685,10 +1685,10 @@ void debug_sub_8010B80() " lsr r6, r0, #0x18\n" " mov r0, #0x0\n" " mov ip, r0\n" - " ldr r4, ._534\n" - " ldr r1, ._534 + 4\n" + " ldr r4, ._534 @ gUnknown_Debug_2023A76\n" + " ldr r1, ._534 + 4 @ gUnknown_Debug_030043A0\n" " mov r8, r1\n" - " ldr r5, ._534 + 8\n" + " ldr r5, ._534 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r5]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -1696,7 +1696,7 @@ void debug_sub_8010B80() " ldrb r2, [r2]\n" " add r0, r0, r2\n" " lsl r0, r0, #0x1\n" - " ldr r3, ._534 + 12\n" + " ldr r3, ._534 + 12 @ gUnknown_Debug_03004360\n" " ldrb r2, [r3]\n" " mov r1, #0x46\n" " mul r1, r1, r2\n" @@ -1847,7 +1847,7 @@ void debug_sub_8010CAC() " mov r7, r8\n" " push {r7}\n" " add sp, sp, #0xfffffff0\n" - " ldr r4, ._553\n" + " ldr r4, ._553 @ gMain\n" " ldrh r1, [r4, #0x28]\n" " mov r0, #0x81\n" " lsl r0, r0, #0x2\n" @@ -1860,19 +1860,19 @@ void debug_sub_8010CAC() " beq ._544 @cond_branch\n" " b ._559\n" "._544:\n" - " ldr r0, ._553 + 4\n" + " ldr r0, ._553 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " mov r8, r0\n" " cmp r1, #0x5\n" " bhi ._546 @cond_branch\n" - " ldr r0, ._553 + 8\n" + " ldr r0, ._553 + 8 @ gUnknown_Debug_030043A8\n" " mov r1, #0x0\n" " strb r1, [r0]\n" " bl debug_sub_8012628\n" - " ldr r0, ._553 + 12\n" + " ldr r0, ._553 + 12 @ debug_sub_8011498\n" " bl SetMainCallback2\n" "._546:\n" - " ldr r0, ._553 + 16\n" + " ldr r0, ._553 + 16 @ gUnknown_Debug_030043A0\n" " ldrb r3, [r0]\n" " cmp r3, #0\n" " bne ._555 @cond_branch\n" @@ -1880,10 +1880,10 @@ void debug_sub_8010CAC() " ldrb r0, [r1]\n" " cmp r0, #0x6\n" " bne ._555 @cond_branch\n" - " ldr r0, ._553 + 20\n" + " ldr r0, ._553 + 20 @ debug_sub_80108B8\n" " str r0, [r4, #0x8]\n" - " ldr r4, ._553 + 24\n" - " ldr r0, ._553 + 28\n" + " ldr r4, ._553 + 24 @ gPlayerParty\n" + " ldr r0, ._553 + 28 @ gUnknown_Debug_2023A76\n" " ldrh r1, [r0]\n" " ldrb r2, [r0, #0x2]\n" " str r3, [sp]\n" @@ -1899,7 +1899,7 @@ void debug_sub_8010CAC() " add r1, r5, #0\n" " add r1, r1, #0xd\n" " lsl r4, r5, #0x1\n" - " ldr r0, ._553 + 32\n" + " ldr r0, ._553 + 32 @ gUnknown_Debug_2023B02\n" " add r4, r4, r0\n" " add r0, r6, #0\n" " add r2, r4, #0\n" @@ -1911,14 +1911,14 @@ void debug_sub_8010CAC() " lsl r2, r0, #0x1\n" " add r2, r2, r0\n" " lsl r2, r2, #0x2\n" - " ldr r0, ._553 + 36\n" + " ldr r0, ._553 + 36 @ gBattleMoves\n" " add r2, r2, r0\n" " add r0, r6, #0\n" " bl SetMonData\n" " add r5, r5, #0x1\n" " cmp r5, #0x3\n" " ble ._549 @cond_branch\n" - " ldr r2, ._553 + 28\n" + " ldr r2, ._553 + 28 @ gUnknown_Debug_2023A76\n" " mov r4, #0x3c\n" " ldsh r0, [r2, r4]\n" " cmp r0, #0x1\n" @@ -1940,10 +1940,10 @@ void debug_sub_8010CAC() " .word gUnknown_Debug_2023B02\n" " .word gBattleMoves+0x4\n" "._550:\n" - " ldr r1, ._556\n" - " ldr r0, ._556 + 4\n" + " ldr r1, ._556 @ gCB2_AfterEvolution\n" + " ldr r0, ._556 + 4 @ debug_sub_80108B8\n" " str r0, [r1]\n" - " ldr r0, ._556 + 8\n" + " ldr r0, ._556 + 8 @ gPlayerParty\n" " ldrh r1, [r2, #0xa]\n" " mov r2, #0x1\n" " mov r3, #0x0\n" @@ -1958,15 +1958,15 @@ void debug_sub_8010CAC() "._551:\n" " bl debug_sub_8012688\n" "._555:\n" - " ldr r0, ._565\n" + " ldr r0, ._565 @ gUnknown_Debug_030043A0\n" " ldrb r0, [r0]\n" " cmp r0, #0x1\n" " bne ._559 @cond_branch\n" - " ldr r0, ._565 + 4\n" + " ldr r0, ._565 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r0, [r0]\n" " cmp r0, #0x6\n" " bne ._559 @cond_branch\n" - " ldr r3, ._565 + 8\n" + " ldr r3, ._565 + 8 @ gSaveBlock2\n" " ldrb r2, [r3, #0x15]\n" " lsl r0, r2, #0x1d\n" " lsr r5, r0, #0x1f\n" @@ -1999,7 +1999,7 @@ void debug_sub_8010CAC() " bl SetPokemonCryStereo\n" " bl debug_nullsub_3\n" "._559:\n" - " ldr r4, ._565 + 12\n" + " ldr r4, ._565 + 12 @ gMain\n" " ldrh r0, [r4, #0x2a]\n" " cmp r0, #0x8\n" " bne ._561 @cond_branch\n" @@ -2009,7 +2009,7 @@ void debug_sub_8010CAC() " cmp r0, #0x40\n" " bne ._562 @cond_branch\n" " bl debug_sub_80125E4\n" - " ldr r1, ._565 + 4\n" + " ldr r1, ._565 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" " beq ._563 @cond_branch\n" @@ -2027,7 +2027,7 @@ void debug_sub_8010CAC() "._564:\n" " strb r0, [r1]\n" " bl debug_sub_8011E74\n" - " ldr r0, ._570\n" + " ldr r0, ._570 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2036,12 +2036,12 @@ void debug_sub_8010CAC() " bl debug_sub_80123D8\n" " bl debug_sub_80125A0\n" "._562:\n" - " ldr r0, ._570 + 4\n" + " ldr r0, ._570 + 4 @ gMain\n" " ldrh r0, [r0, #0x2a]\n" " cmp r0, #0x80\n" " bne ._567 @cond_branch\n" " bl debug_sub_80125E4\n" - " ldr r1, ._570\n" + " ldr r1, ._570 @ gUnknown_Debug_030043A4\n" " ldrb r0, [r1]\n" " cmp r0, #0x6\n" " bne ._568 @cond_branch\n" @@ -2057,7 +2057,7 @@ void debug_sub_8010CAC() "._569:\n" " strb r0, [r1]\n" " bl debug_sub_8011E74\n" - " ldr r0, ._575\n" + " ldr r0, ._575 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2066,12 +2066,12 @@ void debug_sub_8010CAC() " bl debug_sub_80123D8\n" " bl debug_sub_80125A0\n" "._567:\n" - " ldr r0, ._575 + 4\n" + " ldr r0, ._575 + 4 @ gMain\n" " ldrh r0, [r0, #0x2a]\n" " cmp r0, #0x20\n" " bne ._572 @cond_branch\n" " bl debug_sub_80125E4\n" - " ldr r2, ._575 + 8\n" + " ldr r2, ._575 + 8 @ gUnknown_Debug_030043A0\n" " ldrb r0, [r2]\n" " add r1, r0, #0\n" " cmp r1, #0\n" @@ -2086,18 +2086,18 @@ void debug_sub_8010CAC() " .word gMain\n" " .word gUnknown_Debug_030043A0\n" "._573:\n" - " ldr r3, ._581\n" + " ldr r3, ._581 @ gUnknown_Debug_03004360\n" " ldrb r0, [r3]\n" " cmp r0, #0\n" " beq ._577 @cond_branch\n" " strb r1, [r3]\n" " mov r0, #0x4\n" " strb r0, [r2]\n" - " ldr r0, ._581 + 4\n" + " ldr r0, ._581 + 4 @ gBattle_BG1_X\n" " strh r1, [r0]\n" " bl debug_sub_8011E5C\n" " bl debug_sub_8011E74\n" - " ldr r0, ._581 + 8\n" + " ldr r0, ._581 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2107,12 +2107,12 @@ void debug_sub_8010CAC() "._577:\n" " bl debug_sub_80125A0\n" "._572:\n" - " ldr r0, ._581 + 12\n" + " ldr r0, ._581 + 12 @ gMain\n" " ldrh r0, [r0, #0x2a]\n" " cmp r0, #0x10\n" " bne ._578 @cond_branch\n" " bl debug_sub_80125E4\n" - " ldr r2, ._581 + 16\n" + " ldr r2, ._581 + 16 @ gUnknown_Debug_030043A0\n" " ldrb r0, [r2]\n" " cmp r0, #0x4\n" " beq ._579 @cond_branch\n" @@ -2128,21 +2128,21 @@ void debug_sub_8010CAC() " .word gMain\n" " .word gUnknown_Debug_030043A0\n" "._579:\n" - " ldr r3, ._587\n" + " ldr r3, ._587 @ gUnknown_Debug_03004360\n" " ldrb r1, [r3]\n" " cmp r1, #0\n" " bne ._583 @cond_branch\n" " mov r0, #0x1\n" " strb r0, [r3]\n" " strb r1, [r2]\n" - " ldr r1, ._587 + 4\n" + " ldr r1, ._587 + 4 @ gBattle_BG1_X\n" " mov r2, #0x80\n" " lsl r2, r2, #0x1\n" " add r0, r2, #0\n" " strh r0, [r1]\n" " bl debug_sub_8011E5C\n" " bl debug_sub_8011E74\n" - " ldr r0, ._587 + 8\n" + " ldr r0, ._587 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2152,7 +2152,7 @@ void debug_sub_8010CAC() "._583:\n" " bl debug_sub_80125A0\n" "._578:\n" - " ldr r0, ._587 + 12\n" + " ldr r0, ._587 + 12 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x2\n" " and r0, r0, r1\n" @@ -2160,9 +2160,9 @@ void debug_sub_8010CAC() " bne ._584 @cond_branch\n" " b ._607\n" "._584:\n" - " ldr r0, ._587 + 16\n" + " ldr r0, ._587 + 16 @ gUnknown_Debug_030043A0\n" " ldrb r2, [r0]\n" - " ldr r0, ._587 + 8\n" + " ldr r0, ._587 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2171,7 +2171,7 @@ void debug_sub_8010CAC() " cmp r0, #0x4\n" " bhi ._586 @cond_branch\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._587 + 20\n" + " ldr r1, ._587 + 20 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -2194,7 +2194,7 @@ void debug_sub_8010CAC() " bl debug_sub_8010818\n" " b ._595\n" "._592:\n" - " ldr r1, ._597\n" + " ldr r1, ._597 @ gUnknown_Debug_2023A76\n" " mov r0, #0x1f\n" " mov r2, #0xec\n" " bl debug_sub_80132C8\n" @@ -2203,7 +2203,7 @@ void debug_sub_8010CAC() " bl debug_sub_8011E74\n" " bl debug_sub_8012540\n" " bl debug_nullsub_3\n" - " ldr r0, ._597 + 4\n" + " ldr r0, ._597 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2217,7 +2217,7 @@ void debug_sub_8010CAC() " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A4\n" "._593:\n" - " ldr r1, ._600\n" + " ldr r1, ._600 @ gUnknown_Debug_2023A76\n" " mov r0, #0x1f\n" " mov r2, #0xec\n" " bl debug_sub_8013294\n" @@ -2227,7 +2227,7 @@ void debug_sub_8010CAC() "._600:\n" " .word gUnknown_Debug_2023A76\n" "._594:\n" - " ldr r3, ._604\n" + " ldr r3, ._604 @ gUnknown_Debug_2023A76\n" " add r2, r3, #0\n" " add r2, r2, #0x44\n" " ldrh r1, [r2]\n" @@ -2259,8 +2259,8 @@ void debug_sub_8010CAC() "._590:\n" " mov r0, #0x0\n" " bl debug_sub_8010B80\n" - " ldr r2, ._608\n" - " ldr r0, ._608 + 4\n" + " ldr r2, ._608 @ gUnknown_Debug_030043A0\n" + " ldr r0, ._608 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2284,16 +2284,16 @@ void debug_sub_8010CAC() " bl debug_sub_8010AAC\n" " b ._613\n" "._611:\n" - " ldr r6, ._618\n" - " ldr r5, ._618 + 4\n" - " ldr r4, ._618 + 8\n" + " ldr r6, ._618 @ gUnknown_Debug_2023A76\n" + " ldr r5, ._618 + 4 @ gUnknown_Debug_030043A0\n" + " ldr r4, ._618 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r0, [r4]\n" " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " ldrb r0, [r5]\n" " add r1, r1, r0\n" " lsl r1, r1, #0x1\n" - " ldr r2, ._618 + 12\n" + " ldr r2, ._618 + 12 @ gUnknown_Debug_03004360\n" " ldrb r0, [r2]\n" " mov r3, #0x46\n" " mul r0, r0, r3\n" @@ -2314,7 +2314,7 @@ void debug_sub_8010CAC() " add r3, r0, r6\n" " mov r4, #0x0\n" " ldsh r2, [r3, r4]\n" - " ldr r4, ._618 + 16\n" + " ldr r4, ._618 + 16 @ gUnknown_Debug_821F424\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" " lsl r1, r0, #0x1\n" @@ -2329,13 +2329,13 @@ void debug_sub_8010CAC() " ldrh r0, [r0]\n" " strh r0, [r3]\n" "._613:\n" - " ldr r5, ._618 + 4\n" + " ldr r5, ._618 + 4 @ gUnknown_Debug_030043A0\n" " ldrb r0, [r5]\n" " cmp r0, #0\n" " bne ._614 @cond_branch\n" " mov r0, #0x0\n" " bl debug_sub_8010AAC\n" - " ldr r0, ._618 + 8\n" + " ldr r0, ._618 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2344,7 +2344,7 @@ void debug_sub_8010CAC() " lsr r0, r0, #0x18\n" " bl debug_sub_8011EA0\n" "._614:\n" - " ldr r4, ._618 + 8\n" + " ldr r4, ._618 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r4]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2360,7 +2360,7 @@ void debug_sub_8010CAC() " lsr r0, r0, #0x18\n" " bl debug_sub_80123D8\n" "._607:\n" - " ldr r0, ._618 + 20\n" + " ldr r0, ._618 + 20 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -2368,9 +2368,9 @@ void debug_sub_8010CAC() " bne ._615 @cond_branch\n" " b ._638\n" "._615:\n" - " ldr r0, ._618 + 4\n" + " ldr r0, ._618 + 4 @ gUnknown_Debug_030043A0\n" " ldrb r2, [r0]\n" - " ldr r0, ._618 + 8\n" + " ldr r0, ._618 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2379,7 +2379,7 @@ void debug_sub_8010CAC() " cmp r0, #0x4\n" " bhi ._617 @cond_branch\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._618 + 24\n" + " ldr r1, ._618 + 24 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -2403,7 +2403,7 @@ void debug_sub_8010CAC() " bl debug_sub_8010818\n" " b ._626\n" "._623:\n" - " ldr r1, ._628\n" + " ldr r1, ._628 @ gUnknown_Debug_2023A76\n" " mov r0, #0x1f\n" " mov r2, #0xec\n" " bl debug_sub_80132C8\n" @@ -2412,7 +2412,7 @@ void debug_sub_8010CAC() " bl debug_sub_8011E74\n" " bl debug_sub_8012540\n" " bl debug_nullsub_3\n" - " ldr r0, ._628 + 4\n" + " ldr r0, ._628 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2426,7 +2426,7 @@ void debug_sub_8010CAC() " .word gUnknown_Debug_2023A76\n" " .word gUnknown_Debug_030043A4\n" "._624:\n" - " ldr r1, ._631\n" + " ldr r1, ._631 @ gUnknown_Debug_2023A76\n" " mov r0, #0x1f\n" " mov r2, #0xec\n" " bl debug_sub_8013294\n" @@ -2436,7 +2436,7 @@ void debug_sub_8010CAC() "._631:\n" " .word gUnknown_Debug_2023A76\n" "._625:\n" - " ldr r3, ._635\n" + " ldr r3, ._635 @ gUnknown_Debug_2023A76\n" " add r2, r3, #0\n" " add r2, r2, #0x44\n" " ldrh r1, [r2]\n" @@ -2468,8 +2468,8 @@ void debug_sub_8010CAC() "._621:\n" " mov r0, #0x1\n" " bl debug_sub_8010B80\n" - " ldr r2, ._639\n" - " ldr r0, ._639 + 4\n" + " ldr r2, ._639 @ gUnknown_Debug_030043A0\n" + " ldr r0, ._639 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2493,16 +2493,16 @@ void debug_sub_8010CAC() " bl debug_sub_8010AAC\n" " b ._644\n" "._642:\n" - " ldr r6, ._650\n" - " ldr r5, ._650 + 4\n" - " ldr r4, ._650 + 8\n" + " ldr r6, ._650 @ gUnknown_Debug_2023A76\n" + " ldr r5, ._650 + 4 @ gUnknown_Debug_030043A0\n" + " ldr r4, ._650 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r0, [r4]\n" " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " ldrb r0, [r5]\n" " add r1, r1, r0\n" " lsl r1, r1, #0x1\n" - " ldr r2, ._650 + 12\n" + " ldr r2, ._650 + 12 @ gUnknown_Debug_03004360\n" " ldrb r0, [r2]\n" " mov r3, #0x46\n" " mul r0, r0, r3\n" @@ -2523,7 +2523,7 @@ void debug_sub_8010CAC() " add r3, r0, r6\n" " mov r4, #0x0\n" " ldsh r2, [r3, r4]\n" - " ldr r4, ._650 + 16\n" + " ldr r4, ._650 + 16 @ gUnknown_Debug_821F424\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" " lsl r1, r0, #0x1\n" @@ -2538,13 +2538,13 @@ void debug_sub_8010CAC() " ldrh r0, [r0]\n" " strh r0, [r3]\n" "._644:\n" - " ldr r5, ._650 + 4\n" + " ldr r5, ._650 + 4 @ gUnknown_Debug_030043A0\n" " ldrb r0, [r5]\n" " cmp r0, #0\n" " bne ._645 @cond_branch\n" " mov r0, #0x0\n" " bl debug_sub_8010AAC\n" - " ldr r0, ._650 + 8\n" + " ldr r0, ._650 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2553,7 +2553,7 @@ void debug_sub_8010CAC() " lsr r0, r0, #0x18\n" " bl debug_sub_8011EA0\n" "._645:\n" - " ldr r4, ._650 + 8\n" + " ldr r4, ._650 + 8 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r4]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2569,16 +2569,16 @@ void debug_sub_8010CAC() " lsr r0, r0, #0x18\n" " bl debug_sub_80123D8\n" "._638:\n" - " ldr r0, ._650 + 20\n" + " ldr r0, ._650 + 20 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._646 @cond_branch\n" - " ldr r0, ._650 + 4\n" + " ldr r0, ._650 + 4 @ gUnknown_Debug_030043A0\n" " ldrb r1, [r0]\n" - " ldr r2, ._650 + 8\n" + " ldr r2, ._650 + 8 @ gUnknown_Debug_030043A4\n" " mov r8, r2\n" " add r7, r0, #0\n" " cmp r1, #0x4\n" @@ -2611,9 +2611,9 @@ void debug_sub_8010CAC() " bl debug_sub_8010B80\n" " b ._653\n" "._652:\n" - " ldr r4, ._655\n" + " ldr r4, ._655 @ gUnknown_Debug_2023A76\n" " lsl r1, r0, #0x1\n" - " ldr r3, ._655 + 4\n" + " ldr r3, ._655 + 4 @ gUnknown_Debug_03004360\n" " ldrb r2, [r3]\n" " mov r0, #0x46\n" " mul r0, r0, r2\n" @@ -2623,7 +2623,7 @@ void debug_sub_8010CAC() " sub r0, r0, #0xa\n" " strh r0, [r1]\n" " add r6, r3, #0\n" - " ldr r5, ._655 + 8\n" + " ldr r5, ._655 + 8 @ gUnknown_Debug_821F424\n" " b ._654\n" "._656:\n" " .align 2, 0\n" @@ -2663,13 +2663,13 @@ void debug_sub_8010CAC() " cmp r2, r0\n" " blt ._657 @cond_branch\n" "._653:\n" - " ldr r5, ._663\n" + " ldr r5, ._663 @ gUnknown_Debug_030043A0\n" " ldrb r0, [r5]\n" " cmp r0, #0\n" " bne ._658 @cond_branch\n" " mov r0, #0x0\n" " bl debug_sub_8010AAC\n" - " ldr r0, ._663 + 4\n" + " ldr r0, ._663 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2678,7 +2678,7 @@ void debug_sub_8010CAC() " lsr r0, r0, #0x18\n" " bl debug_sub_8011EA0\n" "._658:\n" - " ldr r4, ._663 + 4\n" + " ldr r4, ._663 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r4]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2694,16 +2694,16 @@ void debug_sub_8010CAC() " lsr r0, r0, #0x18\n" " bl debug_sub_80123D8\n" "._646:\n" - " ldr r0, ._663 + 8\n" + " ldr r0, ._663 + 8 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._659 @cond_branch\n" - " ldr r0, ._663\n" + " ldr r0, ._663 @ gUnknown_Debug_030043A0\n" " ldrb r1, [r0]\n" - " ldr r2, ._663 + 4\n" + " ldr r2, ._663 + 4 @ gUnknown_Debug_030043A4\n" " mov r8, r2\n" " add r7, r0, #0\n" " cmp r1, #0x4\n" @@ -2733,9 +2733,9 @@ void debug_sub_8010CAC() " bl debug_sub_8010B80\n" " b ._666\n" "._665:\n" - " ldr r4, ._668\n" + " ldr r4, ._668 @ gUnknown_Debug_2023A76\n" " lsl r1, r0, #0x1\n" - " ldr r3, ._668 + 4\n" + " ldr r3, ._668 + 4 @ gUnknown_Debug_03004360\n" " ldrb r2, [r3]\n" " mov r0, #0x46\n" " mul r0, r0, r2\n" @@ -2745,7 +2745,7 @@ void debug_sub_8010CAC() " add r0, r0, #0xa\n" " strh r0, [r1]\n" " add r6, r3, #0\n" - " ldr r5, ._668 + 8\n" + " ldr r5, ._668 + 8 @ gUnknown_Debug_821F424\n" " b ._667\n" "._669:\n" " .align 2, 0\n" @@ -2781,13 +2781,13 @@ void debug_sub_8010CAC() " cmp r2, r1\n" " bgt ._670 @cond_branch\n" "._666:\n" - " ldr r5, ._672\n" + " ldr r5, ._672 @ gUnknown_Debug_030043A0\n" " ldrb r0, [r5]\n" " cmp r0, #0\n" " bne ._671 @cond_branch\n" " mov r0, #0x0\n" " bl debug_sub_8010AAC\n" - " ldr r0, ._672 + 4\n" + " ldr r0, ._672 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2796,7 +2796,7 @@ void debug_sub_8010CAC() " lsr r0, r0, #0x18\n" " bl debug_sub_8011EA0\n" "._671:\n" - " ldr r4, ._672 + 4\n" + " ldr r4, ._672 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r4]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2838,8 +2838,8 @@ void debug_sub_8011498() " mov r6, r9\n" " mov r5, r8\n" " push {r5, r6, r7}\n" - " ldr r2, ._687\n" - " ldr r0, ._687 + 4\n" + " ldr r2, ._687 @ gUnknown_Debug_030043A0\n" + " ldr r0, ._687 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -2848,7 +2848,7 @@ void debug_sub_8011498() " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " mov r9, r0\n" - " ldr r4, ._687 + 8\n" + " ldr r4, ._687 + 8 @ gMain\n" " ldrh r1, [r4, #0x28]\n" " mov r0, #0x81\n" " lsl r0, r0, #0x2\n" @@ -2860,7 +2860,7 @@ void debug_sub_8011498() " cmp r0, #0x4\n" " bne ._675 @cond_branch\n" " bl debug_sub_8012658\n" - " ldr r0, ._687 + 12\n" + " ldr r0, ._687 + 12 @ debug_sub_8010CAC\n" " bl SetMainCallback2\n" "._675:\n" " ldrh r0, [r4, #0x2a]\n" @@ -2875,14 +2875,14 @@ void debug_sub_8011498() " bne ._678 @cond_branch\n" "._677:\n" " bl debug_sub_8012658\n" - " ldr r0, ._687 + 16\n" + " ldr r0, ._687 + 16 @ gUnknown_Debug_030043A8\n" " ldrb r1, [r0]\n" " mov r2, #0x2\n" " eor r1, r1, r2\n" " strb r1, [r0]\n" " bl debug_sub_8012628\n" "._678:\n" - " ldr r0, ._687 + 8\n" + " ldr r0, ._687 + 8 @ gMain\n" " ldrh r0, [r0, #0x2a]\n" " cmp r0, #0x20\n" " beq ._679 @cond_branch\n" @@ -2890,22 +2890,22 @@ void debug_sub_8011498() " bne ._680 @cond_branch\n" "._679:\n" " bl debug_sub_8012658\n" - " ldr r0, ._687 + 16\n" + " ldr r0, ._687 + 16 @ gUnknown_Debug_030043A8\n" " ldrb r1, [r0]\n" " mov r2, #0x1\n" " eor r1, r1, r2\n" " strb r1, [r0]\n" " bl debug_sub_8012628\n" "._680:\n" - " ldr r0, ._687 + 8\n" + " ldr r0, ._687 + 8 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x2\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._681 @cond_branch\n" - " ldr r0, ._687 + 20\n" + " ldr r0, ._687 + 20 @ gUnknown_Debug_2023B02\n" " mov r8, r0\n" - " ldr r6, ._687 + 16\n" + " ldr r6, ._687 + 16 @ gUnknown_Debug_030043A8\n" " ldrb r4, [r6]\n" " lsl r4, r4, #0x1\n" " mov r0, r9\n" @@ -2914,7 +2914,7 @@ void debug_sub_8011498() " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" - " ldr r5, ._687 + 24\n" + " ldr r5, ._687 + 24 @ gUnknown_Debug_03004360\n" " ldrb r2, [r5]\n" " lsl r1, r2, #0x1\n" " add r1, r1, r2\n" @@ -2936,7 +2936,7 @@ void debug_sub_8011498() " add r4, r1, r0\n" " mov r0, #0x0\n" " ldsh r1, [r4, r0]\n" - " ldr r5, ._687 + 28\n" + " ldr r5, ._687 + 28 @ gUnknown_Debug_821F564\n" " lsl r0, r3, #0x2\n" " add r0, r0, r3\n" " lsl r2, r0, #0x1\n" @@ -2953,15 +2953,15 @@ void debug_sub_8011498() "._682:\n" " bl debug_sub_8012294\n" "._681:\n" - " ldr r0, ._687 + 8\n" + " ldr r0, ._687 + 8 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._683 @cond_branch\n" - " ldr r1, ._687 + 20\n" + " ldr r1, ._687 + 20 @ gUnknown_Debug_2023B02\n" " mov r8, r1\n" - " ldr r6, ._687 + 16\n" + " ldr r6, ._687 + 16 @ gUnknown_Debug_030043A8\n" " ldrb r4, [r6]\n" " lsl r4, r4, #0x1\n" " mov r0, r9\n" @@ -2970,7 +2970,7 @@ void debug_sub_8011498() " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" - " ldr r5, ._687 + 24\n" + " ldr r5, ._687 + 24 @ gUnknown_Debug_03004360\n" " ldrb r2, [r5]\n" " lsl r1, r2, #0x1\n" " add r1, r1, r2\n" @@ -2992,7 +2992,7 @@ void debug_sub_8011498() " add r4, r1, r0\n" " mov r0, #0x0\n" " ldsh r1, [r4, r0]\n" - " ldr r5, ._687 + 28\n" + " ldr r5, ._687 + 28 @ gUnknown_Debug_821F564\n" " lsl r0, r3, #0x2\n" " add r0, r0, r3\n" " lsl r2, r0, #0x1\n" @@ -3009,15 +3009,15 @@ void debug_sub_8011498() "._684:\n" " bl debug_sub_8012294\n" "._683:\n" - " ldr r0, ._687 + 8\n" + " ldr r0, ._687 + 8 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x80\n" " lsl r0, r0, #0x2\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._685 @cond_branch\n" - " ldr r6, ._687 + 20\n" - " ldr r5, ._687 + 16\n" + " ldr r6, ._687 + 20 @ gUnknown_Debug_2023B02\n" + " ldr r5, ._687 + 16 @ gUnknown_Debug_030043A8\n" " ldrb r4, [r5]\n" " lsl r4, r4, #0x1\n" " mov r0, r9\n" @@ -3026,7 +3026,7 @@ void debug_sub_8011498() " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" - " ldr r2, ._687 + 24\n" + " ldr r2, ._687 + 24 @ gUnknown_Debug_03004360\n" " ldrb r1, [r2]\n" " lsl r0, r1, #0x1\n" " add r0, r0, r1\n" @@ -3039,7 +3039,7 @@ void debug_sub_8011498() " mov sl, r5\n" " mov r8, r6\n" " add r7, r2, #0\n" - " ldr r6, ._687 + 28\n" + " ldr r6, ._687 + 28 @ gUnknown_Debug_821F564\n" " b ._686\n" "._688:\n" " .align 2, 0\n" @@ -3088,15 +3088,15 @@ void debug_sub_8011498() " blt ._689 @cond_branch\n" " bl debug_sub_8012294\n" "._685:\n" - " ldr r0, ._692\n" + " ldr r0, ._692 @ gMain\n" " ldrh r1, [r0, #0x30]\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._690 @cond_branch\n" - " ldr r6, ._692 + 4\n" - " ldr r5, ._692 + 8\n" + " ldr r6, ._692 + 4 @ gUnknown_Debug_2023B02\n" + " ldr r5, ._692 + 8 @ gUnknown_Debug_030043A8\n" " ldrb r4, [r5]\n" " lsl r4, r4, #0x1\n" " mov r0, r9\n" @@ -3105,7 +3105,7 @@ void debug_sub_8011498() " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x15\n" " add r4, r4, r0\n" - " ldr r2, ._692 + 12\n" + " ldr r2, ._692 + 12 @ gUnknown_Debug_03004360\n" " ldrb r1, [r2]\n" " lsl r0, r1, #0x1\n" " add r0, r0, r1\n" @@ -3118,7 +3118,7 @@ void debug_sub_8011498() " mov sl, r5\n" " mov r8, r6\n" " add r7, r2, #0\n" - " ldr r6, ._692 + 16\n" + " ldr r6, ._692 + 16 @ gUnknown_Debug_821F564\n" " b ._691\n" "._693:\n" " .align 2, 0\n" @@ -3185,7 +3185,7 @@ void debug_sub_801174C() " add sp, sp, #0xffffffe8\n" " mov r0, #0x0\n" " mov r9, r0\n" - " ldr r1, ._704\n" + " ldr r1, ._704 @ gUnknown_020297ED\n" " mov r0, #0x1\n" " strb r0, [r1]\n" " bl Random\n" @@ -3196,11 +3196,11 @@ void debug_sub_801174C() " and r4, r4, r0\n" " lsl r4, r4, #0x18\n" " lsr r6, r4, #0x18\n" - " ldr r5, ._704 + 4\n" + " ldr r5, ._704 + 4 @ gSaveBlock2\n" " lsl r1, r6, #0x1\n" " add r1, r1, r6\n" " lsl r1, r1, #0x1\n" - " ldr r0, ._704 + 8\n" + " ldr r0, ._704 + 8 @ str_821F631\n" " add r1, r1, r0\n" " add r0, r5, #0\n" " bl StringCopy\n" @@ -3208,7 +3208,7 @@ void debug_sub_801174C() " strb r4, [r5, #0x8]\n" " bl ZeroPlayerPartyMons\n" " bl ZeroEnemyPartyMons\n" - " ldr r0, ._704 + 12\n" + " ldr r0, ._704 + 12 @ gUnknown_Debug_2023A76\n" " mov r1, #0x3c\n" " ldsh r7, [r0, r1]\n" " mov r2, r9\n" @@ -3223,17 +3223,17 @@ void debug_sub_801174C() " bgt ._696 @cond_branch\n" " str r0, [sp, #0xc]\n" "._695:\n" - " ldr r2, ._704 + 16\n" - " ldr r1, ._704 + 20\n" + " ldr r2, ._704 + 16 @ gBattleTypeFlags\n" + " ldr r1, ._704 + 20 @ gUnknown_Debug_821F598\n" " sub r0, r7, #1\n" " lsl r0, r0, #0x1\n" " add r0, r0, r1\n" " ldrh r3, [r0]\n" " strh r3, [r2]\n" - " ldr r1, ._704 + 24\n" + " ldr r1, ._704 + 24 @ gUnknown_02023A14_50\n" " mov r0, #0x8\n" " strb r0, [r1]\n" - " ldr r1, ._704 + 28\n" + " ldr r1, ._704 + 28 @ gBattleTerrain\n" " add r0, sp, #0xc\n" " ldrb r0, [r0]\n" " strb r0, [r1]\n" @@ -3243,27 +3243,27 @@ void debug_sub_801174C() " beq ._697 @cond_branch\n" " bl EnterSafariMode\n" "._697:\n" - " ldr r5, ._704 + 12\n" + " ldr r5, ._704 + 12 @ gUnknown_Debug_2023A76\n" " ldrh r0, [r5, #0x3c]\n" " sub r0, r0, #0x2\n" " lsl r0, r0, #0x10\n" " lsr r0, r0, #0x10\n" " cmp r0, #0x2\n" " bhi ._698 @cond_branch\n" - " ldr r4, ._704 + 32\n" + " ldr r4, ._704 + 32 @ gTrainerBattleOpponent\n" " bl Random\n" " mov r1, #0x7\n" " and r1, r1, r0\n" " add r1, r1, #0x1\n" " strh r1, [r4]\n" "._698:\n" - " ldr r1, ._704 + 36\n" + " ldr r1, ._704 + 36 @ gPlayerPartyCount\n" " mov r0, #0x0\n" " strb r0, [r1]\n" " mov r7, #0x0\n" "._745:\n" " lsl r0, r7, #0x1\n" - " ldr r3, ._704 + 12\n" + " ldr r3, ._704 + 12 @ gUnknown_Debug_2023A76\n" " add r1, r0, r3\n" " mov r2, #0x0\n" " ldsh r1, [r1, r2]\n" @@ -3339,14 +3339,14 @@ void debug_sub_801174C() " bl __divsi3\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" - " ldr r1, ._719\n" + " ldr r1, ._719 @ gEnemyParty\n" " add r0, r0, r1\n" - " ldr r1, ._719 + 4\n" + " ldr r1, ._719 + 4 @ gUnknown_Debug_2023A76\n" " add r1, r1, r8\n" " ldrh r1, [r1]\n" " add r2, r7, #1\n" " lsl r2, r2, #0x1\n" - " ldr r3, ._719 + 4\n" + " ldr r3, ._719 + 4 @ gUnknown_Debug_2023A76\n" " add r2, r2, r3\n" " ldrb r2, [r2]\n" " str r6, [sp]\n" @@ -3363,9 +3363,9 @@ void debug_sub_801174C() " mov r2, #0x64\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" - " ldr r0, ._719\n" + " ldr r0, ._719 @ gEnemyParty\n" " add r5, r1, r0\n" - " ldr r4, ._719 + 8\n" + " ldr r4, ._719 + 8 @ gUnknown_Debug_2023A7A\n" " mov r3, r8\n" " add r6, r3, r4\n" " add r0, r5, #0\n" @@ -3421,19 +3421,19 @@ void debug_sub_801174C() " bl __divsi3\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" - " ldr r1, ._726\n" + " ldr r1, ._726 @ gEnemyParty\n" " add r0, r0, r1\n" " mov r1, #0x2e\n" " add r2, sp, #0xc\n" " bl SetMonData\n" "._716:\n" - " ldr r1, ._726 + 4\n" + " ldr r1, ._726 + 4 @ gUnknown_Debug_2023A76\n" " add r1, r1, #0x46\n" " mov r2, r8\n" " add r0, r2, r1\n" " mov r3, #0x0\n" " ldsh r0, [r0, r3]\n" - " ldr r2, ._726 + 4\n" + " ldr r2, ._726 + 4 @ gUnknown_Debug_2023A76\n" " cmp r0, #0\n" " beq ._721 @cond_branch\n" " add r0, r7, #4\n" @@ -3494,14 +3494,14 @@ void debug_sub_801174C() " bl __divsi3\n" " mov r2, #0x64\n" " mul r0, r0, r2\n" - " ldr r1, ._741\n" + " ldr r1, ._741 @ gPlayerParty\n" " add r0, r0, r1\n" - " ldr r1, ._741 + 4\n" + " ldr r1, ._741 + 4 @ gUnknown_Debug_2023ABC\n" " add r1, r1, r8\n" " ldrh r1, [r1]\n" " add r2, r7, #1\n" " lsl r2, r2, #0x1\n" - " ldr r3, ._741 + 4\n" + " ldr r3, ._741 + 4 @ gUnknown_Debug_2023ABC\n" " add r2, r2, r3\n" " ldrb r2, [r2]\n" " str r6, [sp]\n" @@ -3511,7 +3511,7 @@ void debug_sub_801174C() " str r3, [sp, #0x8]\n" " mov r3, #0x0\n" " bl CreateMonWithGenderNatureLetter\n" - " ldr r1, ._741 + 8\n" + " ldr r1, ._741 + 8 @ gPlayerPartyCount\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" @@ -3522,9 +3522,9 @@ void debug_sub_801174C() " mov r2, #0x64\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" - " ldr r0, ._741\n" + " ldr r0, ._741 @ gPlayerParty\n" " add r4, r1, r0\n" - " ldr r0, ._741 + 12\n" + " ldr r0, ._741 + 12 @ gUnknown_Debug_2023AC0\n" " mov r3, r8\n" " add r5, r3, r0\n" " add r0, r4, #0\n" @@ -3533,7 +3533,7 @@ void debug_sub_801174C() " bl SetMonData\n" " ldr r1, [sp, #0x10]\n" " lsl r0, r1, #0x1\n" - " ldr r2, ._741 + 16\n" + " ldr r2, ._741 + 16 @ gUnknown_Debug_2023A76\n" " add r0, r0, r2\n" " ldrh r0, [r0]\n" " sub r0, r0, #0x1\n" @@ -3548,7 +3548,7 @@ void debug_sub_801174C() "._736:\n" " ldr r3, [sp, #0x14]\n" " lsl r0, r3, #0x1\n" - " ldr r1, ._741 + 4\n" + " ldr r1, ._741 + 4 @ gUnknown_Debug_2023ABC\n" " add r0, r0, r1\n" " mov r2, #0x0\n" " ldsh r1, [r0, r2]\n" @@ -3580,7 +3580,7 @@ void debug_sub_801174C() " bl __divsi3\n" " mov r2, #0x64\n" " mul r0, r0, r2\n" - " ldr r1, ._750\n" + " ldr r1, ._750 @ gPlayerParty\n" " add r0, r0, r1\n" " mov r1, #0x2e\n" " add r2, sp, #0xc\n" @@ -3588,7 +3588,7 @@ void debug_sub_801174C() "._738:\n" " ldr r3, [sp, #0x14]\n" " lsl r0, r3, #0x1\n" - " ldr r1, ._750 + 4\n" + " ldr r1, ._750 + 4 @ gUnknown_Debug_2023ABC\n" " add r0, r0, r1\n" " mov r2, #0x0\n" " ldsh r0, [r0, r2]\n" @@ -3599,12 +3599,12 @@ void debug_sub_801174C() " bl __divsi3\n" " mov r3, #0x64\n" " mul r0, r0, r3\n" - " ldr r1, ._750\n" + " ldr r1, ._750 @ gPlayerParty\n" " add r0, r0, r1\n" " mov r1, #0x7\n" - " ldr r2, ._750 + 8\n" + " ldr r2, ._750 + 8 @ Str_821F649\n" " bl SetMonData\n" - " ldr r2, ._750 + 12\n" + " ldr r2, ._750 + 12 @ gUnknown_02023A14_50\n" " ldrb r0, [r2]\n" " mov r1, #0x40\n" " orr r0, r0, r1\n" @@ -3619,9 +3619,9 @@ void debug_sub_801174C() " str r0, [sp, #0xc]\n" " mov r0, #0x64\n" " mov r8, r0\n" - " ldr r1, ._750 + 16\n" + " ldr r1, ._750 + 16 @ gUnknown_Debug_2023B02\n" " mov r9, r1\n" - " ldr r2, ._750\n" + " ldr r2, ._750 @ gPlayerParty\n" " mov sl, r2\n" "._747:\n" " mov r7, #0x0\n" @@ -3629,7 +3629,7 @@ void debug_sub_801174C() " ldr r2, [sp, #0xc]\n" " mov r0, r8\n" " mul r0, r0, r2\n" - " ldr r3, ._750 + 20\n" + " ldr r3, ._750 + 20 @ gEnemyParty\n" " add r0, r0, r3\n" " add r5, r7, #0\n" " add r5, r5, #0xd\n" @@ -3643,7 +3643,7 @@ void debug_sub_801174C() " ldr r1, [sp, #0xc]\n" " mov r0, r8\n" " mul r0, r0, r1\n" - " ldr r2, ._750 + 20\n" + " ldr r2, ._750 + 20 @ gEnemyParty\n" " add r0, r0, r2\n" " add r6, r7, #0\n" " add r6, r6, #0x11\n" @@ -3655,7 +3655,7 @@ void debug_sub_801174C() " lsl r2, r1, #0x1\n" " add r2, r2, r1\n" " lsl r2, r2, #0x2\n" - " ldr r1, ._750 + 24\n" + " ldr r1, ._750 + 24 @ gBattleMoves\n" " add r2, r2, r1\n" " add r1, r6, #0\n" " bl SetMonData\n" @@ -3664,7 +3664,7 @@ void debug_sub_801174C() " mul r0, r0, r2\n" " add r0, r0, sl\n" " lsl r2, r2, #0x3\n" - " ldr r3, ._750 + 28\n" + " ldr r3, ._750 + 28 @ gUnknown_Debug_2023B32\n" " add r1, r4, r3\n" " add r2, r2, r1\n" " add r1, r5, #0\n" @@ -3675,14 +3675,14 @@ void debug_sub_801174C() " add r0, r0, sl\n" " lsl r1, r1, #0x3\n" " add r4, r4, r1\n" - " ldr r1, ._750 + 28\n" + " ldr r1, ._750 + 28 @ gUnknown_Debug_2023B32\n" " add r4, r4, r1\n" " mov r2, #0x0\n" " ldsh r1, [r4, r2]\n" " lsl r2, r1, #0x1\n" " add r2, r2, r1\n" " lsl r2, r2, #0x2\n" - " ldr r3, ._750 + 24\n" + " ldr r3, ._750 + 24 @ gBattleMoves\n" " add r2, r2, r3\n" " add r1, r6, #0\n" " bl SetMonData\n" @@ -3694,7 +3694,7 @@ void debug_sub_801174C() " str r0, [sp, #0xc]\n" " cmp r0, #0x5\n" " ble ._747 @cond_branch\n" - " ldr r3, ._750 + 32\n" + " ldr r3, ._750 + 32 @ gUnknown_Debug_2023A76\n" " add r4, r3, #0\n" " add r4, r4, #0x44\n" " ldrh r1, [r4]\n" @@ -3702,7 +3702,7 @@ void debug_sub_801174C() " ldsh r0, [r4, r2]\n" " cmp r0, #0x8\n" " bne ._748 @cond_branch\n" - " ldr r0, ._750 + 12\n" + " ldr r0, ._750 + 12 @ gUnknown_02023A14_50\n" " ldrb r1, [r0]\n" " mov r2, #0x80\n" " b ._753\n" @@ -3721,7 +3721,7 @@ void debug_sub_801174C() "._748:\n" " cmp r0, #0x7\n" " bne ._752 @cond_branch\n" - " ldr r0, ._754\n" + " ldr r0, ._754 @ gUnknown_02023A14_50\n" " ldrb r1, [r0]\n" " mov r2, #0x20\n" " b ._753\n" @@ -3732,7 +3732,7 @@ void debug_sub_801174C() "._752:\n" " cmp r0, #0x6\n" " bne ._756 @cond_branch\n" - " ldr r2, ._759\n" + " ldr r2, ._759 @ gUnknown_02023A14_50\n" " ldrb r0, [r2]\n" " mov r1, #0x10\n" " orr r0, r0, r1\n" @@ -3742,9 +3742,9 @@ void debug_sub_801174C() " ldsh r0, [r3, r2]\n" " cmp r0, #0x5\n" " ble ._757 @cond_branch\n" - " ldr r0, ._759 + 4\n" + " ldr r0, ._759 + 4 @ gSharedMem\n" " sub r1, r1, #0x2\n" - " ldr r3, ._759 + 8\n" + " ldr r3, ._759 + 8 @ 0x160a3\n" " add r0, r0, r3\n" " b ._761\n" "._760:\n" @@ -3754,8 +3754,8 @@ void debug_sub_801174C() " .word gSharedMem\n" " .word 0x160a3\n" "._757:\n" - " ldr r0, ._762\n" - " ldr r2, ._762 + 4\n" + " ldr r0, ._762 @ gSharedMem\n" + " ldr r2, ._762 + 4 @ 0x160a3\n" " add r0, r0, r2\n" " b ._761\n" "._763:\n" @@ -3766,7 +3766,7 @@ void debug_sub_801174C() "._756:\n" " cmp r0, #0x5\n" " bne ._764 @cond_branch\n" - " ldr r0, ._766\n" + " ldr r0, ._766 @ gUnknown_02023A14_50\n" " ldrb r1, [r0]\n" " mov r2, #0x21\n" "._753:\n" @@ -3791,7 +3791,7 @@ void debug_sub_801174C() " and r0, r0, r3\n" " cmp r0, #0\n" " beq ._769 @cond_branch\n" - " ldr r0, ._772\n" + " ldr r0, ._772 @ gUnknown_02023A14_50\n" " ldrb r1, [r0]\n" " mov r2, #0x4\n" " orr r1, r1, r2\n" @@ -3801,16 +3801,16 @@ void debug_sub_801174C() " and r0, r0, r3\n" " cmp r0, #0\n" " beq ._770 @cond_branch\n" - " ldr r0, ._772\n" + " ldr r0, ._772 @ gUnknown_02023A14_50\n" " ldrb r1, [r0]\n" " mov r2, #0x6\n" " orr r1, r1, r2\n" " strb r1, [r0]\n" "._770:\n" - " ldr r0, ._772 + 4\n" - " ldr r1, ._772 + 8\n" + " ldr r0, ._772 + 4 @ gMain\n" + " ldr r1, ._772 + 8 @ debug_sub_80108B8\n" " str r1, [r0, #0x8]\n" - " ldr r0, ._772 + 12\n" + " ldr r0, ._772 + 12 @ unref_sub_800D684\n" " bl SetMainCallback2\n" " bl ClearBag\n" " mov r0, #0x1\n" @@ -3888,7 +3888,7 @@ void debug_sub_801174C() " mov r0, #0x50\n" " mov r1, #0x63\n" " bl AddBagItem\n" - " ldr r4, ._772 + 16\n" + " ldr r4, ._772 + 16 @ gUnknown_Debug_821F5AC\n" " mov r7, #0xe\n" "._771:\n" " add r0, r4, #0\n" @@ -3995,7 +3995,7 @@ void debug_sub_8011EA0(u8 a) " b ._815\n" "._782:\n" " lsl r0, r7, #0x2\n" - " ldr r1, ._785\n" + " ldr r1, ._785 @ \n" " add r1, r0, r1\n" " ldr r1, [r1]\n" " str r0, [sp, #0x8]\n" @@ -4044,8 +4044,8 @@ void debug_sub_8011EA0(u8 a) " mov r0, #0x0\n" " mov r1, #0x14\n" " bl debug_sub_8010A7C\n" - " ldr r6, ._823\n" - " ldr r2, ._823 + 4\n" + " ldr r6, ._823 @ gBattleTextBuff1\n" + " ldr r2, ._823 + 4 @ gUnknown_Debug_821F424\n" " ldr r0, [sp, #0x8]\n" " add r1, r0, r7\n" " lsl r1, r1, #0x1\n" @@ -4061,17 +4061,17 @@ void debug_sub_8011EA0(u8 a) " ldrb r1, [r1]\n" " mov r9, r1\n" " str r1, [sp]\n" - " ldr r0, ._823 + 8\n" + " ldr r0, ._823 + 8 @ gUnknown_Debug_03004370\n" " add r1, r6, #0\n" " ldr r2, [sp, #0x4]\n" " mov r3, r8\n" " bl Text_InitWindow\n" - " ldr r0, ._823 + 8\n" + " ldr r0, ._823 + 8 @ gUnknown_Debug_03004370\n" " bl Text_PrintWindow8002F44\n" - " ldr r1, ._823 + 12\n" + " ldr r1, ._823 + 12 @ gUnknown_Debug_2023A76\n" " mov sl, r1\n" " lsl r4, r7, #0x1\n" - " ldr r5, ._823 + 16\n" + " ldr r5, ._823 + 16 @ gUnknown_Debug_03004360\n" " ldrb r0, [r5]\n" " mov r7, #0x46\n" " mul r0, r0, r7\n" @@ -4092,10 +4092,10 @@ void debug_sub_8011EA0(u8 a) " lsr r3, r3, #0x18\n" " mov r0, #0x0\n" " str r0, [sp]\n" - " ldr r0, ._823 + 8\n" + " ldr r0, ._823 + 8 @ gUnknown_Debug_03004370\n" " add r1, r6, #0\n" " bl Text_InitWindow\n" - " ldr r0, ._823 + 8\n" + " ldr r0, ._823 + 8 @ gUnknown_Debug_03004370\n" " bl Text_PrintWindow8002F44\n" " mov r0, #0xff\n" " strb r0, [r6]\n" @@ -4107,18 +4107,18 @@ void debug_sub_8011EA0(u8 a) " ldsh r1, [r4, r0]\n" " mov r0, #0xb\n" " mul r1, r1, r0\n" - " ldr r0, ._823 + 20\n" + " ldr r0, ._823 + 20 @ gSpeciesNames\n" " add r1, r1, r0\n" " add r0, r6, #0\n" " bl StringAppend\n" " mov r1, r9\n" " str r1, [sp]\n" - " ldr r0, ._823 + 8\n" + " ldr r0, ._823 + 8 @ gUnknown_Debug_03004370\n" " add r1, r6, #0\n" " ldr r2, [sp, #0x4]\n" " mov r3, r8\n" " bl Text_InitWindow\n" - " ldr r0, ._823 + 8\n" + " ldr r0, ._823 + 8 @ gUnknown_Debug_03004370\n" " bl Text_PrintWindow8002F44\n" " b ._848\n" "._824:\n" @@ -4131,10 +4131,10 @@ void debug_sub_8011EA0(u8 a) " .word gUnknown_Debug_03004360\n" " .word gSpeciesNames\n" "._817:\n" - " ldr r6, ._826\n" - " ldr r3, ._826 + 4\n" + " ldr r6, ._826 @ gBattleTextBuff1\n" + " ldr r3, ._826 + 4 @ gUnknown_Debug_2023A76\n" " lsl r1, r7, #0x1\n" - " ldr r0, ._826 + 8\n" + " ldr r0, ._826 + 8 @ gUnknown_Debug_03004360\n" " ldrb r2, [r0]\n" " mov r0, #0x46\n" " mul r0, r0, r2\n" @@ -4157,10 +4157,10 @@ void debug_sub_8011EA0(u8 a) " mov r0, #0x0\n" " mov r1, #0x18\n" " bl debug_sub_8010A7C\n" - " ldr r6, ._830\n" - " ldr r1, ._830 + 4\n" + " ldr r6, ._830 @ gUnknown_Debug_03004370\n" + " ldr r1, ._830 + 4 @ gBattleTextBuff1\n" " mov sl, r1\n" - " ldr r4, ._830 + 8\n" + " ldr r4, ._830 + 8 @ gUnknown_Debug_821F424\n" " ldr r2, [sp, #0x8]\n" " add r1, r2, r7\n" " lsl r1, r1, #0x1\n" @@ -4179,12 +4179,12 @@ void debug_sub_8011EA0(u8 a) " add r0, r6, #0\n" " bl Text_PrintWindow8002F44\n" " lsl r4, r7, #0x1\n" - " ldr r5, ._830 + 12\n" + " ldr r5, ._830 + 12 @ gUnknown_Debug_03004360\n" " ldrb r0, [r5]\n" " mov r1, #0x46\n" " mul r0, r0, r1\n" " add r0, r4, r0\n" - " ldr r2, ._830 + 16\n" + " ldr r2, ._830 + 16 @ gUnknown_Debug_2023A76\n" " add r0, r0, r2\n" " mov r2, #0x0\n" " ldsh r1, [r0, r2]\n" @@ -4213,7 +4213,7 @@ void debug_sub_8011EA0(u8 a) " mov r2, #0x46\n" " mul r0, r0, r2\n" " add r4, r4, r0\n" - " ldr r0, ._830 + 16\n" + " ldr r0, ._830 + 16 @ gUnknown_Debug_2023A76\n" " add r4, r4, r0\n" " mov r1, #0x0\n" " ldsh r0, [r4, r1]\n" @@ -4234,13 +4234,13 @@ void debug_sub_8011EA0(u8 a) " .word gUnknown_Debug_03004360\n" " .word gUnknown_Debug_2023A76\n" "._828:\n" - " ldr r1, ._833\n" + " ldr r1, ._833 @ Str_821F624\n" " mov r0, sl\n" " bl StringAppend\n" "._829:\n" - " ldr r6, ._833 + 4\n" - " ldr r1, ._833 + 8\n" - " ldr r5, ._833 + 12\n" + " ldr r6, ._833 + 4 @ gUnknown_Debug_03004370\n" + " ldr r1, ._833 + 8 @ gBattleTextBuff1\n" + " ldr r5, ._833 + 12 @ gUnknown_Debug_821F424\n" " ldr r2, [sp, #0x8]\n" " add r4, r2, r7\n" " lsl r4, r4, #0x1\n" @@ -4269,9 +4269,9 @@ void debug_sub_8011EA0(u8 a) " mov r0, #0x0\n" " mov r1, #0x4\n" " bl debug_sub_8010A7C\n" - " ldr r5, ._839\n" - " ldr r6, ._839 + 4\n" - " ldr r4, ._839 + 8\n" + " ldr r5, ._839 @ gUnknown_Debug_03004370\n" + " ldr r6, ._839 + 4 @ gBattleTextBuff1\n" + " ldr r4, ._839 + 8 @ gUnknown_Debug_821F424\n" " ldr r0, [sp, #0x8]\n" " add r1, r0, r7\n" " lsl r1, r1, #0x1\n" @@ -4290,9 +4290,9 @@ void debug_sub_8011EA0(u8 a) " add r0, r5, #0\n" " bl Text_PrintWindow8002F44\n" " mov r4, #0x0\n" - " ldr r3, ._839 + 12\n" + " ldr r3, ._839 + 12 @ gUnknown_Debug_2023A76\n" " lsl r1, r7, #0x1\n" - " ldr r0, ._839 + 16\n" + " ldr r0, ._839 + 16 @ gUnknown_Debug_03004360\n" " ldrb r2, [r0]\n" " mov r0, #0x46\n" " mul r0, r0, r2\n" @@ -4341,7 +4341,7 @@ void debug_sub_8011EA0(u8 a) " mov r4, #0x2\n" " b ._847\n" "._843:\n" - " ldr r2, ._849\n" + " ldr r2, ._849 @ gBattleTextBuff1\n" " add r1, r4, r2\n" " mov r0, #0xac\n" " strb r0, [r1]\n" @@ -4352,8 +4352,8 @@ void debug_sub_8011EA0(u8 a) " mov r0, #0xff\n" " strb r0, [r1]\n" "._825:\n" - " ldr r5, ._849 + 4\n" - " ldr r4, ._849 + 8\n" + " ldr r5, ._849 + 4 @ gUnknown_Debug_03004370\n" + " ldr r4, ._849 + 8 @ gUnknown_Debug_821F424\n" " ldr r0, [sp, #0x8]\n" " add r1, r0, r7\n" " lsl r1, r1, #0x1\n" @@ -4379,10 +4379,10 @@ void debug_sub_8011EA0(u8 a) " .word gUnknown_Debug_03004370\n" " .word gUnknown_Debug_821F424\n" "._815:\n" - " ldr r6, ._851\n" - " ldr r3, ._851 + 4\n" + " ldr r6, ._851 @ gBattleTextBuff1\n" + " ldr r3, ._851 + 4 @ gUnknown_Debug_2023A76\n" " lsl r1, r7, #0x1\n" - " ldr r0, ._851 + 8\n" + " ldr r0, ._851 + 8 @ gUnknown_Debug_03004360\n" " ldrb r2, [r0]\n" " mov r0, #0x46\n" " mul r0, r0, r2\n" @@ -4394,8 +4394,8 @@ void debug_sub_8011EA0(u8 a) " mov r2, #0x2\n" " mov r3, #0x1\n" " bl ConvertIntToDecimalStringN\n" - " ldr r5, ._851 + 12\n" - " ldr r4, ._851 + 16\n" + " ldr r5, ._851 + 12 @ gUnknown_Debug_03004370\n" + " ldr r4, ._851 + 16 @ gUnknown_Debug_821F424\n" " lsl r1, r7, #0x2\n" " add r1, r1, r7\n" " lsl r1, r1, #0x1\n" @@ -4444,8 +4444,8 @@ void debug_sub_8012294() " mov r5, r8\n" " push {r5, r6, r7}\n" " add sp, sp, #0xfffffffc\n" - " ldr r2, ._854\n" - " ldr r0, ._854 + 4\n" + " ldr r2, ._854 @ gUnknown_Debug_030043A0\n" + " ldr r0, ._854 + 4 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" @@ -4458,23 +4458,23 @@ void debug_sub_8012294() " mov r0, #0x0\n" " mov r1, #0x18\n" " bl debug_sub_8010A7C\n" - " ldr r0, ._854 + 8\n" + " ldr r0, ._854 + 8 @ gUnknown_Debug_03004370\n" " mov sl, r0\n" - " ldr r1, ._854 + 12\n" + " ldr r1, ._854 + 12 @ gBattleTextBuff1\n" " mov r9, r1\n" - " ldr r2, ._854 + 16\n" + " ldr r2, ._854 + 16 @ gUnknown_Debug_821F564\n" " mov r8, r2\n" - " ldr r7, ._854 + 20\n" + " ldr r7, ._854 + 20 @ gUnknown_Debug_030043A8\n" " ldrb r1, [r7]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" " lsl r0, r0, #0x1\n" " add r1, r0, r2\n" " ldrh r2, [r1]\n" - " ldr r3, ._854 + 24\n" + " ldr r3, ._854 + 24 @ gUnknown_Debug_821F566\n" " add r1, r0, r3\n" " ldrb r3, [r1]\n" - " ldr r1, ._854 + 28\n" + " ldr r1, ._854 + 28 @ gUnknown_Debug_821F568\n" " add r0, r0, r1\n" " ldrb r0, [r0]\n" " str r0, [sp]\n" @@ -4492,13 +4492,13 @@ void debug_sub_8012294() " lsl r5, r5, #0x18\n" " lsr r5, r5, #0x15\n" " add r4, r4, r5\n" - " ldr r6, ._854 + 32\n" + " ldr r6, ._854 + 32 @ gUnknown_Debug_03004360\n" " ldrb r1, [r6]\n" " lsl r0, r1, #0x1\n" " add r0, r0, r1\n" " lsl r0, r0, #0x4\n" " add r4, r4, r0\n" - " ldr r2, ._854 + 36\n" + " ldr r2, ._854 + 36 @ gUnknown_Debug_2023B02\n" " add r4, r4, r2\n" " mov r3, #0x0\n" " ldsh r1, [r4, r3]\n" @@ -4531,13 +4531,13 @@ void debug_sub_8012294() " add r0, r0, r2\n" " lsl r0, r0, #0x4\n" " add r1, r1, r0\n" - " ldr r2, ._854 + 36\n" + " ldr r2, ._854 + 36 @ gUnknown_Debug_2023B02\n" " add r1, r1, r2\n" " mov r3, #0x0\n" " ldsh r1, [r1, r3]\n" " mov r0, #0xd\n" " mul r1, r1, r0\n" - " ldr r0, ._854 + 40\n" + " ldr r0, ._854 + 40 @ gMoveNames\n" " add r1, r1, r0\n" " mov r0, r9\n" " bl StringAppend\n" @@ -4548,10 +4548,10 @@ void debug_sub_8012294() " add r8, r8, r0\n" " mov r1, r8\n" " ldrh r2, [r1]\n" - " ldr r3, ._854 + 24\n" + " ldr r3, ._854 + 24 @ gUnknown_Debug_821F566\n" " add r1, r0, r3\n" " ldrb r3, [r1]\n" - " ldr r1, ._854 + 28\n" + " ldr r1, ._854 + 28 @ gUnknown_Debug_821F568\n" " add r0, r0, r1\n" " ldrb r0, [r0]\n" " str r0, [sp]\n" @@ -4604,10 +4604,10 @@ void debug_sub_80123D8(u8 a) " mov r0, #0x0\n" " mov r1, #0x12\n" " bl debug_sub_8010A7C\n" - " ldr r4, ._858\n" - " ldr r0, ._858 + 4\n" + " ldr r4, ._858 @ gUnknown_Debug_03004370\n" + " ldr r0, ._858 + 4 @ gBattleTextBuff1\n" " mov r8, r0\n" - " ldr r6, ._858 + 8\n" + " ldr r6, ._858 + 8 @ gUnknown_Debug_821F58C\n" " ldrh r1, [r6]\n" " mov sl, r1\n" " ldrb r7, [r6, #0x2]\n" @@ -4622,25 +4622,25 @@ void debug_sub_80123D8(u8 a) " add r0, r4, #0\n" " bl Text_PrintWindow8002F44\n" " lsl r5, r5, #0x1\n" - " ldr r1, ._858 + 12\n" + " ldr r1, ._858 + 12 @ gUnknown_Debug_03004360\n" " ldrb r0, [r1]\n" " mov r2, #0x46\n" " mul r0, r0, r2\n" " add r0, r5, r0\n" - " ldr r1, ._858 + 16\n" + " ldr r1, ._858 + 16 @ gUnknown_Debug_2023A76\n" " add r0, r0, r1\n" " mov r2, #0x0\n" " ldsh r1, [r0, r2]\n" " lsl r0, r1, #0x3\n" " sub r0, r0, r1\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._858 + 20\n" + " ldr r1, ._858 + 20 @ gBaseStats\n" " add r0, r0, r1\n" " ldrb r0, [r0, #0x16]\n" " mov r2, #0xd\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" - " ldr r0, ._858 + 24\n" + " ldr r0, ._858 + 24 @ gAbilityNames\n" " add r1, r1, r0\n" " mov r0, r8\n" " bl StringCopy\n" @@ -4668,25 +4668,25 @@ void debug_sub_80123D8(u8 a) " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl Text_PrintWindow8002F44\n" - " ldr r1, ._858 + 12\n" + " ldr r1, ._858 + 12 @ gUnknown_Debug_03004360\n" " ldrb r0, [r1]\n" " mov r2, #0x46\n" " mul r0, r0, r2\n" " add r5, r5, r0\n" - " ldr r0, ._858 + 16\n" + " ldr r0, ._858 + 16 @ gUnknown_Debug_2023A76\n" " add r5, r5, r0\n" " mov r2, #0x0\n" " ldsh r1, [r5, r2]\n" " lsl r0, r1, #0x3\n" " sub r0, r0, r1\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._858 + 20\n" + " ldr r1, ._858 + 20 @ gBaseStats\n" " add r0, r0, r1\n" " ldrb r0, [r0, #0x17]\n" " mov r2, #0xd\n" " add r1, r0, #0\n" " mul r1, r1, r2\n" - " ldr r0, ._858 + 24\n" + " ldr r0, ._858 + 24 @ gAbilityNames\n" " add r1, r1, r0\n" " mov r0, r8\n" " bl StringCopy\n" @@ -4710,12 +4710,12 @@ void debug_sub_80123D8(u8 a) " .word gBaseStats\n" " .word gAbilityNames\n" "._856:\n" - " ldr r6, ._860\n" - " ldr r1, ._860 + 4\n" + " ldr r6, ._860 @ gBattleTextBuff1\n" + " ldr r1, ._860 + 4 @ gAbilityNames\n" " add r0, r6, #0\n" " bl StringCopy\n" - " ldr r5, ._860 + 8\n" - " ldr r4, ._860 + 12\n" + " ldr r5, ._860 + 8 @ gUnknown_Debug_03004370\n" + " ldr r4, ._860 + 12 @ gUnknown_Debug_821F58C\n" " ldrh r2, [r4]\n" " ldrb r3, [r4, #0x2]\n" " ldrb r0, [r4, #0x4]\n" @@ -4760,8 +4760,8 @@ void debug_sub_8012540() asm( " push {r4, r5, r6, lr}\n" " add sp, sp, #0xfffffffc\n" - " ldr r5, ._862\n" - " ldr r0, ._862 + 4\n" + " ldr r5, ._862 @ gBattleTextBuff1\n" + " ldr r0, ._862 + 4 @ gUnknown_Debug_2023A76\n" " add r0, r0, #0x44\n" " mov r2, #0x0\n" " ldsh r1, [r0, r2]\n" @@ -4769,8 +4769,8 @@ void debug_sub_8012540() " mov r2, #0x0\n" " mov r3, #0x1\n" " bl ConvertIntToDecimalStringN\n" - " ldr r4, ._862 + 8\n" - " ldr r1, ._862 + 12\n" + " ldr r4, ._862 + 8 @ gUnknown_Debug_03004370\n" + " ldr r1, ._862 + 12 @ gUnknown_Debug_821F424\n" " mov r3, #0x9b\n" " lsl r3, r3, #0x1\n" " add r0, r1, r3\n" @@ -4817,17 +4817,17 @@ void debug_sub_80125A0() { asm( " push {r4, lr}\n" - " ldr r4, ._864\n" - " ldr r3, ._864 + 4\n" - " ldr r2, ._864 + 8\n" - " ldr r0, ._864 + 12\n" + " ldr r4, ._864 @ gSharedMem\n" + " ldr r3, ._864 + 4 @ gUnknown_Debug_821F680\n" + " ldr r2, ._864 + 8 @ gUnknown_Debug_030043A0\n" + " ldr r0, ._864 + 12 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" " ldrb r2, [r2]\n" " add r0, r0, r2\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._864 + 16\n" + " ldr r1, ._864 + 16 @ gUnknown_Debug_03004360\n" " ldrb r2, [r1]\n" " mov r1, #0x8c\n" " mul r1, r1, r2\n" @@ -4857,17 +4857,17 @@ void debug_sub_80125E4() { asm( " push {r4, lr}\n" - " ldr r4, ._866\n" - " ldr r3, ._866 + 4\n" - " ldr r2, ._866 + 8\n" - " ldr r0, ._866 + 12\n" + " ldr r4, ._866 @ gSharedMem\n" + " ldr r3, ._866 + 4 @ gUnknown_Debug_821F680\n" + " ldr r2, ._866 + 8 @ gUnknown_Debug_030043A0\n" + " ldr r0, ._866 + 12 @ gUnknown_Debug_030043A4\n" " ldrb r1, [r0]\n" " lsl r0, r1, #0x2\n" " add r0, r0, r1\n" " ldrb r2, [r2]\n" " add r0, r0, r2\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._866 + 16\n" + " ldr r1, ._866 + 16 @ gUnknown_Debug_03004360\n" " ldrb r2, [r1]\n" " mov r1, #0x8c\n" " mul r1, r1, r2\n" @@ -4896,12 +4896,12 @@ __attribute__((naked)) void debug_sub_8012628() { asm( - " ldr r3, ._868\n" - " ldr r2, ._868 + 4\n" - " ldr r0, ._868 + 8\n" + " ldr r3, ._868 @ gSharedMem\n" + " ldr r2, ._868 + 4 @ gUnknown_Debug_821F798\n" + " ldr r0, ._868 + 8 @ gUnknown_Debug_030043A8\n" " ldrb r1, [r0]\n" " lsl r1, r1, #0x2\n" - " ldr r0, ._868 + 12\n" + " ldr r0, ._868 + 12 @ gUnknown_Debug_03004360\n" " ldrb r0, [r0]\n" " lsl r0, r0, #0x4\n" " add r1, r1, r0\n" @@ -4926,12 +4926,12 @@ __attribute__((naked)) void debug_sub_8012658() { asm( - " ldr r3, ._870\n" - " ldr r2, ._870 + 4\n" - " ldr r0, ._870 + 8\n" + " ldr r3, ._870 @ gSharedMem\n" + " ldr r2, ._870 + 4 @ gUnknown_Debug_821F798\n" + " ldr r0, ._870 + 8 @ gUnknown_Debug_030043A8\n" " ldrb r1, [r0]\n" " lsl r1, r1, #0x2\n" - " ldr r0, ._870 + 12\n" + " ldr r0, ._870 + 12 @ gUnknown_Debug_03004360\n" " ldrb r0, [r0]\n" " lsl r0, r0, #0x4\n" " add r1, r1, r0\n" @@ -4963,7 +4963,7 @@ void debug_sub_8012688() " mov r1, #0x0\n" " mov r4, #0xcd\n" " lsl r4, r4, #0x1\n" - " ldr r3, ._873\n" + " ldr r3, ._873 @ gUnknown_Debug_2023B62\n" " mov r2, #0x0\n" "._872:\n" " add r0, r1, r3\n" @@ -4977,16 +4977,16 @@ void debug_sub_8012688() " bl SetVBlankCallback\n" " mov r5, #0x0\n" " str r5, [sp, #0x8]\n" - " ldr r1, ._873 + 4\n" + " ldr r1, ._873 + 4 @ 0x40000d4\n" " add r0, sp, #0x8\n" " str r0, [r1]\n" " mov r0, #0xc0\n" " lsl r0, r0, #0x13\n" " str r0, [r1, #0x4]\n" - " ldr r0, ._873 + 8\n" + " ldr r0, ._873 + 8 @ 0x85006000\n" " str r0, [r1, #0x8]\n" " ldr r0, [r1, #0x8]\n" - " ldr r0, ._873 + 12\n" + " ldr r0, ._873 + 12 @ 0x400004c\n" " strh r5, [r0]\n" " sub r0, r0, #0xc\n" " strh r5, [r0]\n" @@ -5000,28 +5000,28 @@ void debug_sub_8012688() " strh r5, [r0]\n" " add r0, r0, #0x2\n" " strh r5, [r0]\n" - " ldr r4, ._873 + 16\n" + " ldr r4, ._873 + 16 @ gWindowTemplate_81E6C58\n" " add r0, r4, #0\n" " bl Text_LoadWindowTemplate\n" " bl ResetPaletteFade\n" - " ldr r0, ._873 + 20\n" + " ldr r0, ._873 + 20 @ gBattle_BG0_X\n" " strh r5, [r0]\n" - " ldr r1, ._873 + 24\n" + " ldr r1, ._873 + 24 @ gBattle_BG0_Y\n" " mov r0, #0xa0\n" " strh r0, [r1]\n" - " ldr r0, ._873 + 28\n" + " ldr r0, ._873 + 28 @ gBattle_BG1_X\n" " strh r5, [r0]\n" - " ldr r0, ._873 + 32\n" + " ldr r0, ._873 + 32 @ gBattle_BG1_Y\n" " strh r5, [r0]\n" - " ldr r0, ._873 + 36\n" + " ldr r0, ._873 + 36 @ gBattle_BG2_X\n" " strh r5, [r0]\n" - " ldr r0, ._873 + 40\n" + " ldr r0, ._873 + 40 @ gBattle_BG2_Y\n" " strh r5, [r0]\n" - " ldr r0, ._873 + 44\n" + " ldr r0, ._873 + 44 @ gBattle_BG3_X\n" " strh r5, [r0]\n" - " ldr r0, ._873 + 48\n" + " ldr r0, ._873 + 48 @ gBattle_BG3_Y\n" " strh r5, [r0]\n" - " ldr r1, ._873 + 52\n" + " ldr r1, ._873 + 52 @ gBattleTerrain\n" " mov r0, #0x9\n" " strb r0, [r1]\n" " bl sub_800D6D4\n" @@ -5029,20 +5029,20 @@ void debug_sub_8012688() " bl ResetSpriteData\n" " bl ResetTasks\n" " bl FreeAllSpritePalettes\n" - " ldr r1, ._873 + 56\n" + " ldr r1, ._873 + 56 @ gReservedSpritePaletteCount\n" " mov r0, #0x4\n" " strb r0, [r1]\n" - " ldr r6, ._873 + 60\n" + " ldr r6, ._873 + 60 @ gCurrentMove\n" " mov r0, #0x1\n" " strh r0, [r6]\n" - " ldr r0, ._873 + 64\n" + " ldr r0, ._873 + 64 @ gUnknown_03004210\n" " add r1, r4, #0\n" " bl Text_InitWindowWithTemplate\n" " ldrh r2, [r6]\n" " lsl r0, r2, #0x3\n" - " ldr r1, ._873 + 68\n" + " ldr r1, ._873 + 68 @ gMonFrontPicTable\n" " add r0, r0, r1\n" - " ldr r1, ._873 + 72\n" + " ldr r1, ._873 + 72 @ gMonFrontPicCoords\n" " mov r8, r1\n" " lsl r2, r2, #0x2\n" " add r2, r2, r8\n" @@ -5050,13 +5050,13 @@ void debug_sub_8012688() " ldrb r2, [r2, #0x1]\n" " mov r3, #0x80\n" " lsl r3, r3, #0x12\n" - " ldr r4, ._873 + 76\n" + " ldr r4, ._873 + 76 @ gUnknown_081FAF4C\n" " ldr r4, [r4, #0x4]\n" " str r4, [sp]\n" " ldrh r4, [r6]\n" " str r4, [sp, #0x4]\n" " bl DecompressPicFromTable_2\n" - " ldr r1, ._873 + 80\n" + " ldr r1, ._873 + 80 @ gMonPaletteTable\n" " ldrh r0, [r6]\n" " lsl r0, r0, #0x3\n" " add r0, r0, r1\n" @@ -5068,7 +5068,7 @@ void debug_sub_8012688() " ldrh r0, [r6]\n" " mov r1, #0x1\n" " bl GetMonSpriteTemplate_803C56C\n" - " ldr r0, ._873 + 84\n" + " ldr r0, ._873 + 84 @ gUnknown_02024E8C\n" " ldrh r1, [r6]\n" " lsl r1, r1, #0x2\n" " add r1, r1, r8\n" @@ -5080,14 +5080,14 @@ void debug_sub_8012688() " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " ldr r3, ._873 + 88\n" + " ldr r3, ._873 + 88 @ gSprites\n" " lsl r1, r4, #0x4\n" " add r1, r1, r4\n" " lsl r1, r1, #0x2\n" " add r0, r3, #0\n" " add r0, r0, #0x1c\n" " add r0, r1, r0\n" - " ldr r2, ._873 + 92\n" + " ldr r2, ._873 + 92 @ nullsub_37\n" " str r2, [r0]\n" " add r1, r1, r3\n" " ldrb r2, [r1, #0x5]\n" @@ -5102,24 +5102,24 @@ void debug_sub_8012688() " lsl r2, r2, #0x5\n" " add r0, r2, #0\n" " strh r0, [r1]\n" - " ldr r0, ._873 + 96\n" + " ldr r0, ._873 + 96 @ debug_nullsub_45\n" " bl SetHBlankCallback\n" - " ldr r0, ._873 + 100\n" + " ldr r0, ._873 + 100 @ debug_sub_8011DD4\n" " bl SetVBlankCallback\n" " bl m4aMPlayAllStop\n" - " ldr r0, ._873 + 104\n" + " ldr r0, ._873 + 104 @ debug_sub_8012D10\n" " mov r1, #0x0\n" " bl CreateTask\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" - " ldr r2, ._873 + 108\n" + " ldr r2, ._873 + 108 @ gTasks\n" " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r1, r1, #0x3\n" " add r1, r1, r2\n" " strh r5, [r1, #0x8]\n" " strh r4, [r1, #0xa]\n" - " ldr r0, ._873 + 112\n" + " ldr r0, ._873 + 112 @ debug_sub_8012878\n" " bl SetMainCallback2\n" " add sp, sp, #0xc\n" " pop {r3}\n" @@ -5170,17 +5170,17 @@ void debug_sub_8012878() " push {lr}\n" " bl AnimateSprites\n" " bl BuildOamBuffer\n" - " ldr r0, ._876\n" + " ldr r0, ._876 @ gUnknown_03004210\n" " bl Text_UpdateWindowInBattle\n" " bl UpdatePaletteFade\n" " bl RunTasks\n" - " ldr r0, ._876 + 4\n" + " ldr r0, ._876 + 4 @ gMain\n" " ldrh r1, [r0, #0x2c]\n" " mov r0, #0x82\n" " lsl r0, r0, #0x1\n" " cmp r1, r0\n" " bne ._875 @cond_branch\n" - " ldr r0, ._876 + 8\n" + " ldr r0, ._876 + 8 @ debug_sub_80108B8\n" " bl SetMainCallback2\n" "._875:\n" " pop {r0}\n" @@ -5206,8 +5206,8 @@ void debug_sub_80128B4() " mov r0, #0x0\n" " mov r1, #0x9\n" " bl debug_sub_8010A7C\n" - " ldr r5, ._878\n" - " ldr r4, ._878 + 4\n" + " ldr r5, ._878 @ gUnknown_03004210\n" + " ldr r4, ._878 + 4 @ gBattleTextBuff1\n" " mov r0, #0x23\n" " mov r8, r0\n" " str r0, [sp]\n" @@ -5218,7 +5218,7 @@ void debug_sub_80128B4() " bl Text_InitWindow\n" " add r0, r5, #0\n" " bl Text_PrintWindow8002F44\n" - " ldr r6, ._878 + 8\n" + " ldr r6, ._878 + 8 @ gCurrentMove\n" " ldrh r1, [r6]\n" " add r0, r4, #0\n" " mov r2, #0x2\n" @@ -5231,7 +5231,7 @@ void debug_sub_80128B4() " ldrh r1, [r6]\n" " mov r0, #0xb\n" " mul r1, r1, r0\n" - " ldr r0, ._878 + 12\n" + " ldr r0, ._878 + 12 @ gSpeciesNames\n" " add r1, r1, r0\n" " add r0, r4, #0\n" " bl StringAppend\n" @@ -5277,8 +5277,8 @@ void debug_sub_8012938() " mov r0, #0x0\n" " mov r1, #0x7\n" " bl debug_sub_8010A7C\n" - " ldr r6, ._880\n" - " ldr r4, ._880 + 4\n" + " ldr r6, ._880 @ gUnknown_03004210\n" + " ldr r4, ._880 + 4 @ gBattleTextBuff1\n" " mov r0, #0x25\n" " mov r8, r0\n" " str r0, [sp]\n" @@ -5289,13 +5289,13 @@ void debug_sub_8012938() " bl Text_InitWindow\n" " add r0, r6, #0\n" " bl Text_PrintWindow8002F44\n" - " ldr r1, ._880 + 8\n" + " ldr r1, ._880 + 8 @ Str_821F7B8\n" " add r0, r4, #0\n" " bl StringCopy\n" " add r0, r4, #4\n" - " ldr r1, ._880 + 12\n" + " ldr r1, ._880 + 12 @ gUnknown_Debug_2023B62\n" " mov sl, r1\n" - " ldr r2, ._880 + 16\n" + " ldr r2, ._880 + 16 @ gCurrentMove\n" " mov r9, r2\n" " ldrh r1, [r2]\n" " sub r1, r1, #0x1\n" @@ -5313,8 +5313,8 @@ void debug_sub_8012938() " bl Text_InitWindow\n" " add r0, r6, #0\n" " bl Text_PrintWindow8002F44\n" - " ldr r2, ._880 + 20\n" - " ldr r1, ._880 + 24\n" + " ldr r2, ._880 + 20 @ gSprites\n" + " ldr r1, ._880 + 24 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -5365,12 +5365,12 @@ void debug_sub_80129F8() " add r5, r0, #0\n" " lsl r5, r5, #0x18\n" " lsr r5, r5, #0x18\n" - " ldr r6, ._882\n" + " ldr r6, ._882 @ gCurrentMove\n" " ldrh r2, [r6]\n" " lsl r0, r2, #0x3\n" - " ldr r1, ._882 + 4\n" + " ldr r1, ._882 + 4 @ gMonFrontPicTable\n" " add r0, r0, r1\n" - " ldr r1, ._882 + 8\n" + " ldr r1, ._882 + 8 @ gMonFrontPicCoords\n" " mov r8, r1\n" " lsl r2, r2, #0x2\n" " add r2, r2, r8\n" @@ -5378,13 +5378,13 @@ void debug_sub_80129F8() " ldrb r2, [r2, #0x1]\n" " mov r3, #0x80\n" " lsl r3, r3, #0x12\n" - " ldr r4, ._882 + 12\n" + " ldr r4, ._882 + 12 @ gUnknown_081FAF4C\n" " ldr r4, [r4, #0x4]\n" " str r4, [sp]\n" " ldrh r4, [r6]\n" " str r4, [sp, #0x4]\n" " bl DecompressPicFromTable_2\n" - " ldr r1, ._882 + 16\n" + " ldr r1, ._882 + 16 @ gMonPaletteTable\n" " ldrh r0, [r6]\n" " lsl r0, r0, #0x3\n" " add r0, r0, r1\n" @@ -5393,8 +5393,8 @@ void debug_sub_80129F8() " lsl r1, r1, #0x1\n" " mov r2, #0x20\n" " bl LoadCompressedPalette\n" - " ldr r4, ._882 + 20\n" - " ldr r0, ._882 + 24\n" + " ldr r4, ._882 + 20 @ gSprites\n" + " ldr r0, ._882 + 24 @ gTasks\n" " lsl r2, r5, #0x2\n" " add r2, r2, r5\n" " lsl r2, r2, #0x3\n" @@ -5417,7 +5417,7 @@ void debug_sub_80129F8() " add r1, r1, r0\n" " lsl r1, r1, #0x2\n" " add r1, r1, r4\n" - " ldr r3, ._882 + 28\n" + " ldr r3, ._882 + 28 @ gUnknown_Debug_2023B62\n" " ldrh r0, [r6]\n" " sub r0, r0, #0x1\n" " add r0, r0, r3\n" @@ -5462,8 +5462,8 @@ void debug_sub_8012AC0() " lsr r5, r0, #0x18\n" " lsl r1, r1, #0x18\n" " lsr r6, r1, #0x18\n" - " ldr r3, ._885\n" - " ldr r4, ._885 + 4\n" + " ldr r3, ._885 @ gCurrentMove\n" + " ldr r4, ._885 + 4 @ gBaseStats\n" " b ._884\n" "._886:\n" " .align 2, 0\n" @@ -5484,12 +5484,12 @@ void debug_sub_8012AC0() " lsl r0, r0, #0x10\n" " cmp r0, #0\n" " bne ._888 @cond_branch\n" - " ldr r1, ._891\n" + " ldr r1, ._891 @ 0x19b\n" " add r0, r1, #0\n" " strh r0, [r2]\n" "._888:\n" " ldrh r1, [r2]\n" - " ldr r0, ._891\n" + " ldr r0, ._891 @ 0x19b\n" " cmp r1, r0\n" " bne ._889 @cond_branch\n" " mov r0, #0x1\n" @@ -5526,11 +5526,11 @@ void debug_sub_8012B2C() asm( " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x11\n" - " ldr r1, ._893\n" + " ldr r1, ._893 @ 0x600c772\n" " add r2, r0, r1\n" " mov r1, #0x1\n" " strh r1, [r2]\n" - " ldr r1, ._893 + 4\n" + " ldr r1, ._893 + 4 @ 0x600c7b2\n" " add r0, r0, r1\n" " mov r1, #0x2\n" " strh r1, [r0]\n" @@ -5550,12 +5550,12 @@ void debug_sub_8012B4C() asm( " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x11\n" - " ldr r2, ._895\n" + " ldr r2, ._895 @ 0x600c772\n" " add r1, r0, r2\n" - " ldr r3, ._895 + 4\n" + " ldr r3, ._895 + 4 @ 0x1016\n" " add r2, r3, #0\n" " strh r2, [r1]\n" - " ldr r1, ._895 + 8\n" + " ldr r1, ._895 + 8 @ 0x600c7b2\n" " add r0, r0, r1\n" " strh r2, [r0]\n" " bx lr\n" @@ -5593,7 +5593,7 @@ void debug_sub_8012B70() " bl debug_sub_8012938\n" " add r0, r5, #0\n" " bl debug_sub_80129F8\n" - " ldr r1, ._899\n" + " ldr r1, ._899 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -5611,15 +5611,15 @@ void debug_sub_8012B70() " mov r2, #0x1d\n" " mov r3, #0x21\n" " bl sub_802BBD4\n" - " ldr r0, ._901\n" + " ldr r0, ._901 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" " add r4, r4, r0\n" " mov r0, #0x2\n" " strh r0, [r4, #0x8]\n" - " ldr r5, ._901 + 4\n" - " ldr r1, ._901 + 8\n" + " ldr r5, ._901 + 4 @ gUnknown_03004210\n" + " ldr r1, ._901 + 8 @ Str_821F7DA\n" " mov r2, #0xa4\n" " lsl r2, r2, #0x2\n" " mov r0, #0x1d\n" @@ -5663,8 +5663,8 @@ void debug_sub_8012C08() " mov r0, #0x0\n" " mov r1, #0x9\n" " bl debug_sub_8010A7C\n" - " ldr r7, ._905\n" - " ldr r5, ._905 + 4\n" + " ldr r7, ._905 @ gUnknown_03004210\n" + " ldr r5, ._905 + 4 @ gBattleTextBuff1\n" " mov r0, #0x23\n" " mov r8, r0\n" " str r0, [sp]\n" @@ -5696,14 +5696,14 @@ void debug_sub_8012C08() " bl sub_802BBD4\n" " cmp r4, #0\n" " beq ._903 @cond_branch\n" - " ldr r1, ._905 + 8\n" + " ldr r1, ._905 + 8 @ gTasks\n" " lsl r4, r6, #0x2\n" " add r0, r4, r6\n" " lsl r0, r0, #0x3\n" " add r0, r0, r1\n" " mov r1, #0x4\n" " strh r1, [r0, #0x8]\n" - " ldr r1, ._905 + 12\n" + " ldr r1, ._905 + 12 @ gUnknown_Debug_821F7F3\n" " mov r0, r8\n" " str r0, [sp]\n" " add r0, r7, #0\n" @@ -5719,14 +5719,14 @@ void debug_sub_8012C08() " .word gTasks\n" " .word gUnknown_Debug_821F7F3\n" "._903:\n" - " ldr r1, ._907\n" + " ldr r1, ._907 @ gTasks\n" " lsl r4, r6, #0x2\n" " add r0, r4, r6\n" " lsl r0, r0, #0x3\n" " add r0, r0, r1\n" " mov r1, #0x3\n" " strh r1, [r0, #0x8]\n" - " ldr r1, ._907 + 4\n" + " ldr r1, ._907 + 4 @ Str_821F7EA\n" " mov r0, r8\n" " str r0, [sp]\n" " add r0, r7, #0\n" @@ -5735,10 +5735,10 @@ void debug_sub_8012C08() " bl Text_InitWindow\n" "._904:\n" " add r5, r4, #0\n" - " ldr r4, ._907 + 8\n" + " ldr r4, ._907 + 8 @ gUnknown_03004210\n" " add r0, r4, #0\n" " bl Text_PrintWindow8002F44\n" - " ldr r1, ._907 + 12\n" + " ldr r1, ._907 + 12 @ BattleText_YesNo\n" " mov r2, #0xa4\n" " lsl r2, r2, #0x2\n" " mov r0, #0x1d\n" @@ -5748,7 +5748,7 @@ void debug_sub_8012C08() " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl Text_PrintWindow8002F44\n" - " ldr r1, ._907\n" + " ldr r1, ._907 @ gTasks\n" " add r0, r5, r6\n" " lsl r0, r0, #0x3\n" " add r0, r0, r1\n" @@ -5781,7 +5781,7 @@ void debug_sub_8012D10() " add sp, sp, #0xfffffffc\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" - " ldr r1, ._911\n" + " ldr r1, ._911 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -5793,7 +5793,7 @@ void debug_sub_8012D10() " b ._1067\n" "._909:\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._911 + 4\n" + " ldr r1, ._911 + 4 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -5812,8 +5812,8 @@ void debug_sub_8012D10() " bl debug_sub_80128B4\n" " add r0, r5, #0\n" " bl debug_sub_8012938\n" - " ldr r4, ._920\n" - " ldr r1, ._920 + 4\n" + " ldr r4, ._920 @ gUnknown_03004210\n" + " ldr r1, ._920 + 4 @ Str_821F7BD\n" " mov r2, #0xc8\n" " lsl r2, r2, #0x1\n" " mov r0, #0x23\n" @@ -5823,7 +5823,7 @@ void debug_sub_8012D10() " bl Text_InitWindow\n" " add r0, r4, #0\n" " bl Text_PrintWindow8002F44\n" - " ldr r1, ._920 + 8\n" + " ldr r1, ._920 + 8 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -5840,7 +5840,7 @@ void debug_sub_8012D10() " .word Str_821F7BD\n" " .word gTasks\n" "._915:\n" - " ldr r2, ._924\n" + " ldr r2, ._924 @ gMain\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -5848,7 +5848,7 @@ void debug_sub_8012D10() " beq ._922 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._924 + 4\n" + " ldr r0, ._924 + 4 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -5872,7 +5872,7 @@ void debug_sub_8012D10() " beq ._926 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._928\n" + " ldr r0, ._928 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -5893,7 +5893,7 @@ void debug_sub_8012D10() " beq ._930 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._932\n" + " ldr r0, ._932 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -5916,7 +5916,7 @@ void debug_sub_8012D10() " beq ._934 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._936\n" + " ldr r0, ._936 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -5948,7 +5948,7 @@ void debug_sub_8012D10() " beq ._938 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r1, ._943\n" + " ldr r1, ._943 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -5976,8 +5976,8 @@ void debug_sub_8012D10() "._946:\n" " b ._1067\n" "._941:\n" - " ldr r1, ._952\n" - " ldr r0, ._952 + 4\n" + " ldr r1, ._952 @ gUnknown_Debug_2023B62\n" + " ldr r0, ._952 + 4 @ gCurrentMove\n" " ldrh r0, [r0]\n" " sub r0, r0, #0x1\n" " add r1, r0, r1\n" @@ -5998,7 +5998,7 @@ void debug_sub_8012D10() " mov r0, #0x1\n" " b ._997\n" "._945:\n" - " ldr r1, ._957\n" + " ldr r1, ._957 @ gCurrentMove\n" " ldrh r2, [r1]\n" " mov r0, #0xcd\n" " lsl r0, r0, #0x1\n" @@ -6022,7 +6022,7 @@ void debug_sub_8012D10() " beq ._960 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r1, ._966\n" + " ldr r1, ._966 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -6047,8 +6047,8 @@ void debug_sub_8012D10() " beq ._968 @cond_branch\n" " b ._990\n" "._964:\n" - " ldr r1, ._973\n" - " ldr r0, ._973 + 4\n" + " ldr r1, ._973 @ gUnknown_Debug_2023B62\n" + " ldr r0, ._973 + 4 @ gCurrentMove\n" " ldrh r0, [r0]\n" " sub r0, r0, #0x1\n" " add r1, r0, r1\n" @@ -6066,7 +6066,7 @@ void debug_sub_8012D10() " .word gUnknown_Debug_2023B62\n" " .word gCurrentMove\n" "._968:\n" - " ldr r1, ._977\n" + " ldr r1, ._977 @ gCurrentMove\n" " ldrh r0, [r1]\n" " cmp r0, #0x1\n" " bls ._975 @cond_branch\n" @@ -6077,7 +6077,7 @@ void debug_sub_8012D10() "._977:\n" " .word gCurrentMove\n" "._975:\n" - " ldr r2, ._980\n" + " ldr r2, ._980 @ 0x19b\n" " add r0, r2, #0\n" " b ._979\n" "._981:\n" @@ -6092,7 +6092,7 @@ void debug_sub_8012D10() " beq ._982 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r1, ._987\n" + " ldr r1, ._987 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -6115,8 +6115,8 @@ void debug_sub_8012D10() " beq ._989 @cond_branch\n" " b ._990\n" "._985:\n" - " ldr r3, ._995\n" - " ldr r2, ._995 + 4\n" + " ldr r3, ._995 @ gUnknown_Debug_2023B62\n" + " ldr r2, ._995 + 4 @ gCurrentMove\n" " ldrh r0, [r2]\n" " sub r0, r0, #0x1\n" " add r1, r0, r3\n" @@ -6145,11 +6145,11 @@ void debug_sub_8012D10() " mov r0, #0x1\n" " b ._997\n" "._989:\n" - " ldr r3, ._1000\n" + " ldr r3, ._1000 @ gCurrentMove\n" " ldrh r2, [r3]\n" " add r1, r2, #0\n" " add r1, r1, #0xa\n" - " ldr r0, ._1000 + 4\n" + " ldr r0, ._1000 + 4 @ 0x19b\n" " cmp r1, r0\n" " bgt ._998 @cond_branch\n" " strh r1, [r3]\n" @@ -6160,7 +6160,7 @@ void debug_sub_8012D10() " .word gCurrentMove\n" " .word 0x19b\n" "._998:\n" - " ldr r1, ._1003\n" + " ldr r1, ._1003 @ 0xfffffe70\n" " add r0, r2, r1\n" " strh r0, [r3]\n" " b ._1025\n" @@ -6178,7 +6178,7 @@ void debug_sub_8012D10() "._1005:\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r1, ._1011\n" + " ldr r1, ._1011 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -6203,8 +6203,8 @@ void debug_sub_8012D10() " beq ._1014 @cond_branch\n" " b ._1067\n" "._1009:\n" - " ldr r1, ._1020\n" - " ldr r0, ._1020 + 4\n" + " ldr r1, ._1020 @ gUnknown_Debug_2023B62\n" + " ldr r0, ._1020 + 4 @ gCurrentMove\n" " ldrh r0, [r0]\n" " sub r0, r0, #0x1\n" " add r2, r0, r1\n" @@ -6238,7 +6238,7 @@ void debug_sub_8012D10() " bl debug_sub_8012AC0\n" " b ._1067\n" "._1013:\n" - " ldr r2, ._1026\n" + " ldr r2, ._1026 @ gCurrentMove\n" " ldrh r0, [r2]\n" " add r1, r0, #0\n" " sub r1, r1, #0xa\n" @@ -6268,7 +6268,7 @@ void debug_sub_8012D10() " bl debug_sub_8012B70\n" " b ._1067\n" "._916:\n" - " ldr r0, ._1032\n" + " ldr r0, ._1032 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -6276,7 +6276,7 @@ void debug_sub_8012D10() " beq ._1030 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._1032 + 4\n" + " ldr r0, ._1032 + 4 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -6301,7 +6301,7 @@ void debug_sub_8012D10() " beq ._1035 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._1037\n" + " ldr r0, ._1037 @ gTasks\n" " lsl r1, r5, #0x2\n" " add r1, r1, r5\n" " lsl r1, r1, #0x3\n" @@ -6325,7 +6325,7 @@ void debug_sub_8012D10() " bl PlaySE\n" " b ._1063\n" "._917:\n" - " ldr r0, ._1044\n" + " ldr r0, ._1044 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -6333,7 +6333,7 @@ void debug_sub_8012D10() " beq ._1042 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._1044 + 4\n" + " ldr r0, ._1044 + 4 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -6358,7 +6358,7 @@ void debug_sub_8012D10() " beq ._1047 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._1050\n" + " ldr r0, ._1050 @ gTasks\n" " lsl r1, r5, #0x2\n" " add r1, r1, r5\n" " lsl r1, r1, #0x3\n" @@ -6367,8 +6367,8 @@ void debug_sub_8012D10() " ldsh r0, [r1, r2]\n" " cmp r0, #0\n" " bne ._1063 @cond_branch\n" - " ldr r1, ._1050 + 4\n" - " ldr r2, ._1050 + 8\n" + " ldr r1, ._1050 + 4 @ gUnknown_Debug_2023B62\n" + " ldr r2, ._1050 + 8 @ 0x19b\n" " mov r0, #0x1f\n" " bl debug_sub_80132C8\n" " b ._1063\n" @@ -6387,7 +6387,7 @@ void debug_sub_8012D10() " bl PlaySE\n" " b ._1063\n" "._918:\n" - " ldr r0, ._1056\n" + " ldr r0, ._1056 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -6395,7 +6395,7 @@ void debug_sub_8012D10() " beq ._1054 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._1056 + 4\n" + " ldr r0, ._1056 + 4 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -6417,7 +6417,7 @@ void debug_sub_8012D10() "._1046:\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._1060\n" + " ldr r0, ._1060 @ gTasks\n" " lsl r4, r5, #0x2\n" " add r4, r4, r5\n" " lsl r4, r4, #0x3\n" @@ -6440,7 +6440,7 @@ void debug_sub_8012D10() " beq ._1062 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r0, ._1065\n" + " ldr r0, ._1065 @ gTasks\n" " lsl r1, r5, #0x2\n" " add r1, r1, r5\n" " lsl r1, r1, #0x3\n" @@ -6449,8 +6449,8 @@ void debug_sub_8012D10() " ldsh r0, [r1, r2]\n" " cmp r0, #0\n" " bne ._1063 @cond_branch\n" - " ldr r1, ._1065 + 4\n" - " ldr r2, ._1065 + 8\n" + " ldr r1, ._1065 + 4 @ gUnknown_Debug_2023B62\n" + " ldr r2, ._1065 + 8 @ 0x19b\n" " mov r0, #0x1f\n" " bl debug_sub_8013294\n" "._1063:\n" @@ -6810,7 +6810,7 @@ void debug_sub_80138CC() { asm( " push {lr}\n" - " ldr r0, ._1167\n" + " ldr r0, ._1167 @ gActiveBank\n" " ldrb r0, [r0]\n" " bl GetBankSide\n" " lsl r0, r0, #0x18\n" @@ -6818,8 +6818,8 @@ void debug_sub_80138CC() " beq ._1163 @cond_branch\n" " b ._1186\n" "._1163:\n" - " ldr r1, ._1167 + 4\n" - " ldr r2, ._1167 + 8\n" + " ldr r1, ._1167 + 4 @ gSharedMem\n" + " ldr r2, ._1167 + 8 @ 0x160fd\n" " add r0, r1, r2\n" " ldrb r0, [r0]\n" " add r2, r1, #0\n" @@ -6828,7 +6828,7 @@ void debug_sub_80138CC() " b ._1186\n" "._1165:\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._1167 + 12\n" + " ldr r1, ._1167 + 12 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -6846,16 +6846,16 @@ void debug_sub_80138CC() " .word ._1173\n" " .word ._1174\n" "._1170:\n" - " ldr r1, ._1177\n" - " ldr r0, ._1177 + 4\n" + " ldr r1, ._1177 @ gBattleBankFunc\n" + " ldr r0, ._1177 + 4 @ gActiveBank\n" " ldrb r0, [r0]\n" " lsl r0, r0, #0x2\n" " add r0, r0, r1\n" " ldr r1, [r0]\n" - " ldr r0, ._1177 + 8\n" + " ldr r0, ._1177 + 8 @ sub_802C098\n" " cmp r1, r0\n" " bne ._1186 @cond_branch\n" - " ldr r0, ._1177 + 12\n" + " ldr r0, ._1177 + 12 @ 0x160fd\n" " add r1, r2, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" @@ -6868,16 +6868,16 @@ void debug_sub_80138CC() " .word sub_802C098+1\n" " .word 0x160fd\n" "._1171:\n" - " ldr r1, ._1180\n" + " ldr r1, ._1180 @ gMain\n" " mov r0, #0x1\n" " strh r0, [r1, #0x2c]\n" " strh r0, [r1, #0x2e]\n" - " ldr r0, ._1180 + 4\n" + " ldr r0, ._1180 + 4 @ 0x160fd\n" " add r1, r2, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" - " ldr r0, ._1180 + 8\n" + " ldr r0, ._1180 + 8 @ 0x160fe\n" " add r1, r2, r0\n" " mov r0, #0x80\n" " b ._1187\n" @@ -6888,7 +6888,7 @@ void debug_sub_80138CC() " .word 0x160fd\n" " .word 0x160fe\n" "._1172:\n" - " ldr r0, ._1184\n" + " ldr r0, ._1184 @ 0x160fe\n" " add r3, r2, r0\n" " ldrb r0, [r3]\n" " sub r0, r0, #0x1\n" @@ -6896,11 +6896,11 @@ void debug_sub_80138CC() " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " bne ._1186 @cond_branch\n" - " ldr r1, ._1184 + 4\n" + " ldr r1, ._1184 + 4 @ gMain\n" " mov r0, #0x1\n" " strh r0, [r1, #0x2c]\n" " strh r0, [r1, #0x2e]\n" - " ldr r0, ._1184 + 8\n" + " ldr r0, ._1184 + 8 @ 0x160fd\n" " add r1, r2, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" @@ -6915,7 +6915,7 @@ void debug_sub_80138CC() " .word gMain\n" " .word 0x160fd\n" "._1173:\n" - " ldr r0, ._1188\n" + " ldr r0, ._1188 @ 0x160fe\n" " add r1, r2, r0\n" " ldrb r0, [r1]\n" " sub r0, r0, #0x1\n" @@ -6923,11 +6923,11 @@ void debug_sub_80138CC() " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " bne ._1186 @cond_branch\n" - " ldr r1, ._1188 + 4\n" + " ldr r1, ._1188 + 4 @ gMain\n" " mov r0, #0x1\n" " strh r0, [r1, #0x2c]\n" " strh r0, [r1, #0x2e]\n" - " ldr r0, ._1188 + 8\n" + " ldr r0, ._1188 + 8 @ 0x160fd\n" " add r1, r2, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" @@ -6939,7 +6939,7 @@ void debug_sub_80138CC() " .word gMain\n" " .word 0x160fd\n" "._1174:\n" - " ldr r0, ._1190\n" + " ldr r0, ._1190 @ 0x160fd\n" " add r1, r2, r0\n" " mov r0, #0x0\n" "._1187:\n" @@ -6960,7 +6960,7 @@ void debug_sub_80139E4() { asm( " push {r4, r5, lr}\n" - " ldr r0, ._1198\n" + " ldr r0, ._1198 @ gUnknown_02023A14_50\n" " ldrb r1, [r0]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" @@ -6968,10 +6968,10 @@ void debug_sub_80139E4() " lsr r4, r0, #0x18\n" " cmp r4, #0\n" " beq ._1192 @cond_branch\n" - " ldr r2, ._1198 + 4\n" + " ldr r2, ._1198 + 4 @ gActiveBank\n" " mov r0, #0x0\n" " strb r0, [r2]\n" - " ldr r1, ._1198 + 8\n" + " ldr r1, ._1198 + 8 @ gNoOfAllBanks\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" " beq ._1193 @cond_branch\n" @@ -6988,17 +6988,17 @@ void debug_sub_80139E4() " cmp r0, r1\n" " bcc ._1194 @cond_branch\n" "._1193:\n" - " ldr r0, ._1198 + 12\n" + " ldr r0, ._1198 + 12 @ gBattleMainFunc\n" " ldr r0, [r0]\n" " bl _call_via_r0\n" - " ldr r1, ._1198 + 4\n" + " ldr r1, ._1198 + 4 @ gActiveBank\n" " mov r0, #0x0\n" " strb r0, [r1]\n" - " ldr r0, ._1198 + 8\n" + " ldr r0, ._1198 + 8 @ gNoOfAllBanks\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " beq ._1200 @cond_branch\n" - " ldr r5, ._1198 + 16\n" + " ldr r5, ._1198 + 16 @ gBattleBankFunc\n" " add r4, r1, #0\n" "._1196:\n" " ldrb r0, [r4]\n" @@ -7009,7 +7009,7 @@ void debug_sub_80139E4() " ldrb r0, [r4]\n" " add r0, r0, #0x1\n" " strb r0, [r4]\n" - " ldr r1, ._1198 + 8\n" + " ldr r1, ._1198 + 8 @ gNoOfAllBanks\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " ldrb r1, [r1]\n" @@ -7025,16 +7025,16 @@ void debug_sub_80139E4() " .word gBattleMainFunc\n" " .word gBattleBankFunc\n" "._1192:\n" - " ldr r0, ._1202\n" + " ldr r0, ._1202 @ gBattleMainFunc\n" " ldr r0, [r0]\n" " bl _call_via_r0\n" - " ldr r1, ._1202 + 4\n" + " ldr r1, ._1202 + 4 @ gActiveBank\n" " strb r4, [r1]\n" - " ldr r0, ._1202 + 8\n" + " ldr r0, ._1202 + 8 @ gNoOfAllBanks\n" " ldrb r0, [r0]\n" " cmp r4, r0\n" " bcs ._1200 @cond_branch\n" - " ldr r5, ._1202 + 12\n" + " ldr r5, ._1202 + 12 @ gBattleBankFunc\n" " add r4, r1, #0\n" "._1201:\n" " ldrb r0, [r4]\n" @@ -7045,7 +7045,7 @@ void debug_sub_80139E4() " ldrb r0, [r4]\n" " add r0, r0, #0x1\n" " strb r0, [r4]\n" - " ldr r1, ._1202 + 8\n" + " ldr r1, ._1202 + 8 @ gNoOfAllBanks\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " ldrb r1, [r1]\n" @@ -7080,20 +7080,20 @@ void sub_8010874() " bl SpecialStatusesClear\n" " mov r2, #0x0\n" " mov r3, #0x0\n" - " ldr r0, ._1215\n" + " ldr r0, ._1215 @ gUnknown_02024C4C\n" " mov sl, r0\n" - " ldr r1, ._1215 + 4\n" + " ldr r1, ._1215 + 4 @ gLastHitByType\n" " mov r9, r1\n" - " ldr r4, ._1215 + 8\n" + " ldr r4, ._1215 + 8 @ gLastLandedMoves\n" " mov r8, r4\n" - " ldr r0, ._1215 + 12\n" + " ldr r0, ._1215 + 12 @ gLastUsedMove\n" " mov ip, r0\n" - " ldr r4, ._1215 + 16\n" + " ldr r4, ._1215 + 16 @ gDisableStructs\n" " mov r5, #0x0\n" - " ldr r7, ._1215 + 20\n" - " ldr r6, ._1215 + 24\n" + " ldr r7, ._1215 + 20 @ gUnknown_02024C2C\n" + " ldr r6, ._1215 + 24 @ gLockedMoves\n" "._1205:\n" - " ldr r0, ._1215 + 28\n" + " ldr r0, ._1215 + 28 @ gStatuses3\n" " add r0, r5, r0\n" " str r3, [r0]\n" " mov r1, #0x0\n" @@ -7105,7 +7105,7 @@ void sub_8010874() " bls ._1204 @cond_branch\n" " mov r0, #0x2\n" " strb r0, [r4, #0x16]\n" - " ldr r1, ._1215 + 32\n" + " ldr r1, ._1215 + 32 @ gUnknown_02024C70\n" " add r0, r2, r1\n" " strb r3, [r0]\n" " mov r0, ip\n" @@ -7116,13 +7116,13 @@ void sub_8010874() " strh r3, [r0]\n" " mov r1, sl\n" " strh r3, [r1]\n" - " ldr r0, ._1215 + 36\n" + " ldr r0, ._1215 + 36 @ gUnknown_02024C5C\n" " add r1, r2, r0\n" " mov r0, #0xff\n" " strb r0, [r1]\n" " strh r3, [r6]\n" " strh r3, [r7]\n" - " ldr r1, ._1215 + 40\n" + " ldr r1, ._1215 + 40 @ gSharedMem\n" " add r0, r5, r1\n" " str r3, [r0]\n" " mov r0, #0x2\n" @@ -7138,8 +7138,8 @@ void sub_8010874() " cmp r2, #0x3\n" " ble ._1205 @cond_branch\n" " mov r5, #0x0\n" - " ldr r3, ._1215 + 44\n" - " ldr r4, ._1215 + 48\n" + " ldr r3, ._1215 + 44 @ gSideTimers\n" + " ldr r4, ._1215 + 48 @ gSideAffecting\n" " mov r2, #0x1\n" "._1207:\n" " strh r5, [r4]\n" @@ -7156,13 +7156,13 @@ void sub_8010874() " cmp r2, #0\n" " bge ._1207 @cond_branch\n" " mov r1, #0x0\n" - " ldr r2, ._1215 + 52\n" + " ldr r2, ._1215 + 52 @ gBankAttacker\n" " strb r1, [r2]\n" - " ldr r3, ._1215 + 56\n" + " ldr r3, ._1215 + 56 @ gBankTarget\n" " strb r1, [r3]\n" - " ldr r4, ._1215 + 60\n" + " ldr r4, ._1215 + 60 @ gBattleWeather\n" " strh r1, [r4]\n" - " ldr r1, ._1215 + 64\n" + " ldr r1, ._1215 + 64 @ gWishFutureKnock\n" " mov r2, #0x0\n" " mov r3, #0x0\n" "._1208:\n" @@ -7172,50 +7172,50 @@ void sub_8010874() " cmp r2, #0x2b\n" " bls ._1208 @cond_branch\n" " mov r0, #0x0\n" - " ldr r1, ._1215 + 68\n" + " ldr r1, ._1215 + 68 @ gHitMarker\n" " str r0, [r1]\n" - " ldr r2, ._1215 + 72\n" + " ldr r2, ._1215 + 72 @ gBattleTypeFlags\n" " ldrh r1, [r2]\n" " mov r0, #0x2\n" " and r0, r0, r1\n" " cmp r0, #0\n" " bne ._1210 @cond_branch\n" - " ldr r3, ._1215 + 76\n" + " ldr r3, ._1215 + 76 @ gSaveBlock2\n" " ldrb r1, [r3, #0x15]\n" " mov r0, #0x4\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._1210 @cond_branch\n" " mov r0, #0x80\n" - " ldr r4, ._1215 + 68\n" + " ldr r4, ._1215 + 68 @ gHitMarker\n" " str r0, [r4]\n" "._1210:\n" - " ldr r1, ._1215 + 76\n" + " ldr r1, ._1215 + 76 @ gSaveBlock2\n" " ldrb r0, [r1, #0x15]\n" " lsl r0, r0, #0x1e\n" " lsr r0, r0, #0x1f\n" - " ldr r3, ._1215 + 80\n" - " ldr r4, ._1215 + 84\n" + " ldr r3, ._1215 + 80 @ gSharedMem\n" + " ldr r4, ._1215 + 84 @ 0x16084\n" " add r2, r3, r4\n" " mov r1, #0x0\n" " strb r0, [r2]\n" - " ldr r0, ._1215 + 88\n" + " ldr r0, ._1215 + 88 @ gMultiHitCounter\n" " strb r1, [r0]\n" - " ldr r2, ._1215 + 92\n" + " ldr r2, ._1215 + 92 @ gBattleOutcome\n" " strb r1, [r2]\n" - " ldr r3, ._1215 + 96\n" + " ldr r3, ._1215 + 96 @ gBattleExecBuffer\n" " str r1, [r3]\n" " mov r2, #0x0\n" - " ldr r4, ._1215 + 100\n" + " ldr r4, ._1215 + 100@ gPaydayMoney\n" " strh r1, [r4]\n" - " ldr r1, ._1215 + 80\n" - " ldr r3, ._1215 + 104\n" + " ldr r1, ._1215 + 80 @ gSharedMem\n" + " ldr r3, ._1215 + 104@ 0x17130\n" " add r0, r1, r3\n" " strb r2, [r0]\n" - " ldr r4, ._1215 + 108\n" + " ldr r4, ._1215 + 108@ 0x17160\n" " add r0, r1, r4\n" " strb r2, [r0]\n" - " ldr r1, ._1215 + 112\n" + " ldr r1, ._1215 + 112@ gBattleCommunication\n" " mov r2, #0x0\n" " add r0, r1, #7\n" "._1211:\n" @@ -7224,37 +7224,37 @@ void sub_8010874() " cmp r0, r1\n" " bge ._1211 @cond_branch\n" " mov r5, #0x0\n" - " ldr r0, ._1215 + 116\n" + " ldr r0, ._1215 + 116@ gPauseCounterBattle\n" " strh r5, [r0]\n" " mov r0, #0x0\n" - " ldr r1, ._1215 + 120\n" + " ldr r1, ._1215 + 120@ gBattleMoveDamage\n" " str r0, [r1]\n" - " ldr r2, ._1215 + 124\n" + " ldr r2, ._1215 + 124@ gUnknown_02024DE8\n" " strh r0, [r2]\n" - " ldr r4, ._1215 + 80\n" - " ldr r3, ._1215 + 128\n" + " ldr r4, ._1215 + 80 @ gSharedMem\n" + " ldr r3, ._1215 + 128@ 0x16002\n" " add r0, r4, r3\n" " strb r5, [r0]\n" - " ldr r1, ._1215 + 132\n" + " ldr r1, ._1215 + 132@ 0x160a1\n" " add r0, r4, r1\n" " strb r5, [r0]\n" - " ldr r2, ._1215 + 136\n" + " ldr r2, ._1215 + 136@ gLeveledUpInBattle\n" " strb r5, [r2]\n" - " ldr r3, ._1215 + 140\n" + " ldr r3, ._1215 + 140@ gAbsentBankFlags\n" " strb r5, [r3]\n" " sub r1, r1, #0x29\n" " add r0, r4, r1\n" " strb r5, [r0]\n" - " ldr r2, ._1215 + 144\n" + " ldr r2, ._1215 + 144@ 0x16086\n" " add r0, r4, r2\n" " strb r5, [r0]\n" - " ldr r3, ._1215 + 148\n" + " ldr r3, ._1215 + 148@ 0x16087\n" " add r0, r4, r3\n" " strb r5, [r0]\n" - " ldr r0, ._1215 + 152\n" + " ldr r0, ._1215 + 152@ gEnemyParty\n" " mov r1, #0xb\n" " bl GetMonData\n" - " ldr r2, ._1215 + 156\n" + " ldr r2, ._1215 + 156@ gBaseStats\n" " lsl r1, r0, #0x3\n" " sub r1, r1, r0\n" " lsl r1, r1, #0x2\n" @@ -7262,16 +7262,16 @@ void sub_8010874() " ldrb r1, [r1, #0x8]\n" " mov r0, #0x64\n" " mul r0, r0, r1\n" - " ldr r1, ._1215 + 160\n" + " ldr r1, ._1215 + 160@ 0x4fb\n" " bl __divsi3\n" - " ldr r2, ._1215 + 164\n" + " ldr r2, ._1215 + 164@ 0x16089\n" " add r1, r4, r2\n" " strb r0, [r1]\n" - " ldr r3, ._1215 + 168\n" + " ldr r3, ._1215 + 168@ 0x16088\n" " add r1, r4, r3\n" " mov r0, #0x3\n" " strb r0, [r1]\n" - " ldr r1, ._1215 + 172\n" + " ldr r1, ._1215 + 172@ 0x1601b\n" " add r0, r4, r1\n" " strb r5, [r0]\n" " sub r2, r2, #0x33\n" @@ -7281,7 +7281,7 @@ void sub_8010874() " mov r2, #0x0\n" " mov r1, #0x0\n" "._1212:\n" - " ldr r3, ._1215 + 176\n" + " ldr r3, ._1215 + 176@ 0x160ac\n" " add r0, r2, r3\n" " add r0, r0, r4\n" " strb r1, [r0]\n" @@ -7308,8 +7308,8 @@ void sub_8010874() " add r2, r2, #0x1\n" " cmp r2, #0x7\n" " ble ._1212 @cond_branch\n" - " ldr r4, ._1215 + 80\n" - " ldr r1, ._1215 + 180\n" + " ldr r4, ._1215 + 80 @ gSharedMem\n" + " ldr r1, ._1215 + 180@ 0x160c8\n" " add r0, r4, r1\n" " mov r2, #0x0\n" " mov r1, #0x6\n" @@ -7317,10 +7317,10 @@ void sub_8010874() " sub r3, r3, #0x3f\n" " add r0, r4, r3\n" " strb r1, [r0]\n" - " ldr r1, ._1215 + 184\n" + " ldr r1, ._1215 + 184@ 0x16113\n" " add r0, r4, r1\n" " strb r2, [r0]\n" - " ldr r3, ._1215 + 188\n" + " ldr r3, ._1215 + 188@ gBattleResults\n" " mov r1, #0x0\n" " mov r2, #0xa\n" " add r0, r3, #0\n" @@ -7367,12 +7367,12 @@ void sub_8010874() " add r2, r2, #0x1\n" " cmp r2, #0x9\n" " ble ._1214 @cond_branch\n" - " ldr r2, ._1215 + 80\n" - " ldr r3, ._1215 + 192\n" + " ldr r2, ._1215 + 80 @ gSharedMem\n" + " ldr r3, ._1215 + 192@ 0x1609e\n" " add r0, r2, r3\n" " mov r1, #0x0\n" " strb r1, [r0]\n" - " ldr r4, ._1215 + 196\n" + " ldr r4, ._1215 + 196@ 0x1609f\n" " add r0, r2, r4\n" " strb r1, [r0]\n" " pop {r3, r4, r5}\n" diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 9fe1f6cb0..8b81139fb 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -5024,8 +5024,8 @@ static void atk15_seteffectwithchance(void) { asm("\ push {r4, lr}\n\ - ldr r2, ._1037\n\ - ldr r0, ._1037 + 4\n\ + ldr r2, ._1037 @ gBattleMons\n\ + ldr r0, ._1037 + 4 @ gBankAttacker\n\ ldrb r1, [r0]\n\ mov r0, #0x58\n\ mul r0, r0, r1\n\ @@ -5034,8 +5034,8 @@ static void atk15_seteffectwithchance(void) ldrb r0, [r0]\n\ cmp r0, #0x20\n\ bne ._1035 @cond_branch\n\ - ldr r2, ._1037 + 8\n\ - ldr r0, ._1037 + 12\n\ + ldr r2, ._1037 + 8 @ gBattleMoves\n\ + ldr r0, ._1037 + 12 @ gCurrentMove\n\ ldrh r1, [r0]\n\ lsl r0, r1, #0x1\n\ add r0, r0, r1\n\ @@ -5052,8 +5052,8 @@ static void atk15_seteffectwithchance(void) .word gBattleMoves\n\ .word gCurrentMove\n\ ._1035:\n\ - ldr r2, ._1045\n\ - ldr r0, ._1045 + 4\n\ + ldr r2, ._1045 @ gBattleMoves\n\ + ldr r0, ._1045 + 4 @ gCurrentMove\n\ ldrh r1, [r0]\n\ lsl r0, r1, #0x1\n\ add r0, r0, r1\n\ @@ -5061,11 +5061,11 @@ static void atk15_seteffectwithchance(void) add r0, r0, r2\n\ ldrb r4, [r0, #0x5]\n\ ._1036:\n\ - ldr r0, ._1045 + 8\n\ + ldr r0, ._1045 + 8 @ gUnknown_02023A14_50\n\ ldrb r1, [r0]\n\ mov r0, #0x4\n\ and r0, r0, r1\n\ - ldr r2, ._1045 + 12\n\ + ldr r2, ._1045 + 12 @ gBattleCommunication\n\ cmp r0, #0\n\ beq ._1039 @cond_branch\n\ ldrb r1, [r2, #0x3]\n\ @@ -5073,7 +5073,7 @@ static void atk15_seteffectwithchance(void) and r0, r0, r1\n\ cmp r0, #0\n\ bne ._1040 @cond_branch\n\ - ldr r0, ._1045 + 16\n\ + ldr r0, ._1045 + 16 @ gBattleMoveFlags\n\ ldrb r1, [r0]\n\ mov r0, #0x29\n\ and r0, r0, r1\n\ @@ -5086,13 +5086,13 @@ static void atk15_seteffectwithchance(void) cmp r0, #0\n\ beq ._1043 @cond_branch\n\ ._1040:\n\ - ldr r0, ._1045 + 16\n\ + ldr r0, ._1045 + 16 @ gBattleMoveFlags\n\ ldrb r1, [r0]\n\ mov r0, #0x29\n\ and r0, r0, r1\n\ cmp r0, #0\n\ bne ._1043 @cond_branch\n\ - ldr r2, ._1045 + 12\n\ + ldr r2, ._1045 + 12 @ gBattleCommunication\n\ ldrb r1, [r2, #0x3]\n\ mov r0, #0x7f\n\ and r0, r0, r1\n\ @@ -5116,11 +5116,11 @@ static void atk15_seteffectwithchance(void) lsr r0, r0, #0x10\n\ cmp r0, r4\n\ bhi ._1049 @cond_branch\n\ - ldr r0, ._1052\n\ + ldr r0, ._1052 @ gBattleCommunication\n\ ldrb r0, [r0, #0x3]\n\ cmp r0, #0\n\ beq ._1049 @cond_branch\n\ - ldr r0, ._1052 + 4\n\ + ldr r0, ._1052 + 4 @ gBattleMoveFlags\n\ ldrb r1, [r0]\n\ mov r0, #0x29\n\ and r0, r0, r1\n\ @@ -5144,16 +5144,16 @@ static void atk15_seteffectwithchance(void) bl SetMoveEffect\n\ b ._1054\n\ ._1049:\n\ - ldr r1, ._1055\n\ + ldr r1, ._1055 @ gBattlescriptCurrInstr\n\ ldr r0, [r1]\n\ add r0, r0, #0x1\n\ str r0, [r1]\n\ ._1054:\n\ - ldr r0, ._1055 + 4\n\ + ldr r0, ._1055 + 4 @ gBattleCommunication\n\ mov r1, #0x0\n\ strb r1, [r0, #0x3]\n\ - ldr r0, ._1055 + 8\n\ - ldr r2, ._1055 + 12\n\ + ldr r0, ._1055 + 8 @ \n\ + ldr r2, ._1055 + 12 @ \n\ add r0, r0, r2\n\ strb r1, [r0]\n\ pop {r4}\n\ @@ -12778,12 +12778,12 @@ static void atk9E_metronome(void) push {r4, r5, r6, r7, lr}\n\ mov r7, r8\n\ push {r7}\n\ - ldr r6, ._3076\n\ + ldr r6, ._3076 @ gBankAttacker\n\ ldrb r2, [r6]\n\ lsl r1, r2, #0x1\n\ - ldr r0, ._3076 + 4\n\ + ldr r0, ._3076 + 4 @ \n\ add r3, r1, r0\n\ - ldr r5, ._3076 + 8\n\ + ldr r5, ._3076 + 8 @ \n\ mov r4, #0x58\n\ add r0, r2, #0\n\ mul r0, r0, r4\n\ @@ -12802,7 +12802,7 @@ static void atk9E_metronome(void) bne ._3072 @cond_branch\n\ strh r2, [r3]\n\ ._3072:\n\ - ldr r1, ._3076 + 12\n\ + ldr r1, ._3076 + 12 @ \n\ ldrh r0, [r3]\n\ strh r0, [r1]\n\ ldrb r0, [r6]\n\ @@ -12845,14 +12845,14 @@ static void atk9E_metronome(void) ._3079:\n\ strh r0, [r3]\n\ ._3081:\n\ - ldr r4, ._3083\n\ + ldr r4, ._3083 @ gHitMarker\n\ ldr r2, [r4]\n\ - ldr r0, ._3083 + 4\n\ + ldr r0, ._3083 + 4 @ 0xfffffbff\n\ and r2, r2, r0\n\ str r2, [r4]\n\ - ldr r6, ._3083 + 8\n\ - ldr r5, ._3083 + 12\n\ - ldr r3, ._3083 + 16\n\ + ldr r6, ._3083 + 8 @ gBattlescriptCurrInstr\n\ + ldr r5, ._3083 + 12 @ gBattleScriptsForMoveEffects\n\ + ldr r3, ._3083 + 16 @ gBattleMoves\n\ ldrh r1, [r7]\n\ lsl r0, r1, #0x1\n\ add r0, r0, r1\n\ @@ -12878,15 +12878,15 @@ static void atk9E_metronome(void) .word gBattleScriptsForMoveEffects\n\ .word gBattleMoves\n\ ._3071:\n\ - ldr r7, ._3090\n\ + ldr r7, ._3090 @ gCurrentMove\n\ mov r6, #0xb1\n\ lsl r6, r6, #0x1\n\ - ldr r5, ._3090 + 4\n\ - ldr r0, ._3090 + 8\n\ + ldr r5, ._3090 + 4 @ sMovesForbiddenToCopy\n\ + ldr r0, ._3090 + 8 @ gBattlescriptCurrInstr\n\ mov r8, r0\n\ ._3089:\n\ bl Random\n\ - ldr r2, ._3090 + 12\n\ + ldr r2, ._3090 + 12 @ 0x1ff\n\ add r1, r2, #0\n\ and r0, r0, r1\n\ add r0, r0, #0x1\n\ @@ -12898,9 +12898,9 @@ static void atk9E_metronome(void) sub r0, r0, #0x1\n\ cmp r0, #0\n\ bge ._3086 @cond_branch\n\ - ldr r4, ._3090\n\ + ldr r4, ._3090 @ gCurrentMove\n\ ldrh r2, [r4]\n\ - ldr r3, ._3090 + 16\n\ + ldr r3, ._3090 + 16 @ 0xffff\n\ sub r0, r5, #2\n\ ._3088:\n\ add r0, r0, #0x2\n\ @@ -12910,16 +12910,16 @@ static void atk9E_metronome(void) cmp r1, r3\n\ bne ._3088 @cond_branch\n\ ._3087:\n\ - ldr r0, ._3090 + 16\n\ + ldr r0, ._3090 + 16 @ 0xffff\n\ cmp r1, r0\n\ bne ._3089 @cond_branch\n\ - ldr r2, ._3090 + 20\n\ + ldr r2, ._3090 + 20 @ gHitMarker\n\ ldr r0, [r2]\n\ - ldr r1, ._3090 + 24\n\ + ldr r1, ._3090 + 24 @ 0xfffffbff\n\ and r0, r0, r1\n\ str r0, [r2]\n\ - ldr r3, ._3090 + 28\n\ - ldr r2, ._3090 + 32\n\ + ldr r3, ._3090 + 28 @ gBattleScriptsForMoveEffects\n\ + ldr r2, ._3090 + 32 @ gBattleMoves\n\ ldrh r1, [r4]\n\ lsl r0, r1, #0x1\n\ add r0, r0, r1\n\ @@ -12935,7 +12935,7 @@ static void atk9E_metronome(void) ._3082:\n\ mov r1, #0x0\n\ bl GetMoveTarget\n\ - ldr r1, ._3090 + 36\n\ + ldr r1, ._3090 + 36 @ gBankTarget\n\ strb r0, [r1]\n\ pop {r3}\n\ mov r8, r3\n\ diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index 5382738f7..338f8d418 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -1447,26 +1447,26 @@ void OpponentHandlecmd20(void) mov r6, r9\n\ mov r5, r8\n\ push {r5, r6, r7}\n\ - ldr r6, ._549\n\ + ldr r6, ._549 @ gActiveBank\n\ ldrb r0, [r6]\n\ lsl r0, r0, #0x9\n\ - ldr r1, ._549 + 4\n\ + ldr r1, ._549 + 4 @ gBattleBufferA\n\ add r5, r0, r1\n\ - ldr r2, ._549 + 8\n\ + ldr r2, ._549 + 8 @ gUnknown_02023A14_50\n\ ldrb r1, [r2]\n\ mov r0, #0x4\n\ and r0, r0, r1\n\ mov sl, r6\n\ cmp r0, #0\n\ beq ._546 @cond_branch\n\ - ldr r0, ._549 + 12\n\ + ldr r0, ._549 + 12 @ gBattleMoves\n\ mov r9, r0\n\ - ldr r1, ._549 + 16\n\ + ldr r1, ._549 + 16 @ \n\ mov ip, r1\n\ add r7, r6, #0\n\ mov r0, #0x2\n\ mov r8, r0\n\ - ldr r6, ._549 + 20\n\ + ldr r6, ._549 + 20 @ \n\ ._552:\n\ ldrb r1, [r7]\n\ mov r0, r8\n\ @@ -1526,13 +1526,13 @@ void OpponentHandlecmd20(void) ldrb r0, [r1]\n\ b ._561\n\ ._553:\n\ - ldr r0, ._559\n\ + ldr r0, ._559 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._557 @cond_branch\n\ - ldr r0, ._559 + 4\n\ + ldr r0, ._559 + 4 @ gUnknown_02023A14_50\n\ ldrb r1, [r0]\n\ mov r5, #0x2\n\ add r0, r5, #0\n\ @@ -1578,7 +1578,7 @@ void OpponentHandlecmd20(void) bl OpponentBufferExecCompleted\n\ b ._562\n\ ._546:\n\ - ldr r0, ._567\n\ + ldr r0, ._567 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ mov r0, #0x93\n\ lsl r0, r0, #0x3\n\ @@ -1607,7 +1607,7 @@ void OpponentHandlecmd20(void) mov r2, #0x0\n\ b ._569\n\ ._565:\n\ - ldr r3, ._574\n\ + ldr r3, ._574 @ gBattleMoves\n\ lsl r0, r4, #0x1\n\ add r2, r5, r0\n\ ldrh r1, [r2]\n\ @@ -1620,7 +1620,7 @@ void OpponentHandlecmd20(void) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._570 @cond_branch\n\ - ldr r1, ._574 + 4\n\ + ldr r1, ._574 + 4 @ gBankTarget\n\ ldrb r0, [r6]\n\ strb r0, [r1]\n\ ._570:\n\ @@ -1636,11 +1636,11 @@ void OpponentHandlecmd20(void) beq ._572 @cond_branch\n\ mov r0, #0x0\n\ bl GetBankByIdentity\n\ - ldr r5, ._574 + 4\n\ + ldr r5, ._574 + 4 @ gBankTarget\n\ strb r0, [r5]\n\ - ldr r0, ._574 + 8\n\ + ldr r0, ._574 + 8 @ gAbsentBankFlags\n\ ldrb r1, [r0]\n\ - ldr r2, ._574 + 12\n\ + ldr r2, ._574 + 12 @ gBitTable\n\ ldrb r0, [r5]\n\ lsl r0, r0, #0x2\n\ add r0, r0, r2\n\ @@ -1652,7 +1652,7 @@ void OpponentHandlecmd20(void) bl GetBankByIdentity\n\ strb r0, [r5]\n\ ._572:\n\ - ldr r0, ._574 + 4\n\ + ldr r0, ._574 + 4 @ gBankTarget\n\ ldrb r2, [r0]\n\ lsl r2, r2, #0x8\n\ orr r2, r2, r4\n\ @@ -1678,7 +1678,7 @@ void OpponentHandlecmd20(void) ldrh r2, [r0]\n\ cmp r2, #0\n\ beq ._576 @cond_branch\n\ - ldr r1, ._579\n\ + ldr r1, ._579 @ gBattleMoves\n\ lsl r0, r2, #0x1\n\ add r0, r0, r2\n\ lsl r0, r0, #0x2\n\ @@ -1688,7 +1688,7 @@ void OpponentHandlecmd20(void) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._577 @cond_branch\n\ - ldr r0, ._579 + 4\n\ + ldr r0, ._579 + 4 @ gActiveBank\n\ ldrb r2, [r0]\n\ lsl r2, r2, #0x8\n\ b ._578\n\ @@ -1698,7 +1698,7 @@ void OpponentHandlecmd20(void) .word gBattleMoves\n\ .word gActiveBank\n\ ._577:\n\ - ldr r0, ._583\n\ + ldr r0, ._583 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index d4b4da6f2..e03e21849 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -1007,21 +1007,21 @@ void debug_sub_8030C24(void) asm("\ push {r4, r5, r6, lr}\n\ add sp, sp, #0xfffffff4\n\ - ldr r1, ._293\n\ - ldr r4, ._293 + 4\n\ + ldr r1, ._293 @ gBattlePartyID\n\ + ldr r4, ._293 + 4 @ gActiveBank\n\ ldrb r0, [r4]\n\ lsl r0, r0, #0x1\n\ add r0, r0, r1\n\ ldrh r1, [r0]\n\ mov r0, #0x64\n\ mul r0, r0, r1\n\ - ldr r1, ._293 + 8\n\ + ldr r1, ._293 + 8 @ gPlayerParty\n\ add r0, r0, r1\n\ mov r1, #0xd\n\ bl GetMonData\n\ add r1, sp, #0x8\n\ strh r0, [r1]\n\ - ldr r5, ._293 + 12\n\ + ldr r5, ._293 + 12 @ gMain\n\ ldrh r1, [r5, #0x30]\n\ cmp r1, #0x20\n\ bne ._286 @cond_branch\n\ @@ -1082,7 +1082,7 @@ void debug_sub_8030C24(void) ldrb r0, [r4]\n\ mov r1, #0x0\n\ bl dp11b_obj_free\n\ - ldr r0, ._312\n\ + ldr r0, ._312 @ gBankAttacker\n\ ldrb r2, [r4]\n\ strb r2, [r0]\n\ ldrh r1, [r5, #0x28]\n\ @@ -1090,13 +1090,13 @@ void debug_sub_8030C24(void) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._310 @cond_branch\n\ - ldr r0, ._312 + 4\n\ + ldr r0, ._312 + 4 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._310 @cond_branch\n\ - ldr r0, ._312 + 8\n\ + ldr r0, ._312 + 8 @ gBankTarget\n\ mov r1, #0x2\n\ eor r1, r1, r2\n\ strb r1, [r0]\n\ @@ -1108,14 +1108,14 @@ void debug_sub_8030C24(void) .word gBattleTypeFlags\n\ .word gBankTarget\n\ ._310:\n\ - ldr r0, ._317\n\ + ldr r0, ._317 @ gMain\n\ ldrh r1, [r0, #0x28]\n\ mov r2, #0x1\n\ add r0, r2, #0\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._315 @cond_branch\n\ - ldr r0, ._317 + 4\n\ + ldr r0, ._317 + 4 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ add r0, r2, #0\n\ and r0, r0, r1\n\ @@ -1132,7 +1132,7 @@ void debug_sub_8030C24(void) mov r0, #0x1\n\ ._316:\n\ bl GetBankByIdentity\n\ - ldr r1, ._320\n\ + ldr r1, ._320 @ gBankTarget\n\ strb r0, [r1]\n\ ._311:\n\ mov r0, #0x0\n\ @@ -1140,8 +1140,8 @@ void debug_sub_8030C24(void) add r0, sp, #0x8\n\ ldrh r0, [r0]\n\ bl DoMoveAnim\n\ - ldr r1, ._320 + 4\n\ - ldr r0, ._320 + 8\n\ + ldr r1, ._320 + 4 @ gBattleBankFunc\n\ + ldr r0, ._320 + 8 @ gActiveBank\n\ ldrb r0, [r0]\n\ b ._332\n\ ._321:\n\ @@ -1157,7 +1157,7 @@ void debug_sub_8030C24(void) ldrb r0, [r4]\n\ mov r1, #0x0\n\ bl dp11b_obj_free\n\ - ldr r0, ._325\n\ + ldr r0, ._325 @ gBankTarget\n\ ldrb r2, [r4]\n\ strb r2, [r0]\n\ ldrh r1, [r5, #0x28]\n\ @@ -1165,13 +1165,13 @@ void debug_sub_8030C24(void) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._323 @cond_branch\n\ - ldr r0, ._325 + 4\n\ + ldr r0, ._325 + 4 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._323 @cond_branch\n\ - ldr r0, ._325 + 8\n\ + ldr r0, ._325 + 8 @ gBankAttacker\n\ mov r1, #0x2\n\ eor r1, r1, r2\n\ strb r1, [r0]\n\ @@ -1183,14 +1183,14 @@ void debug_sub_8030C24(void) .word gBattleTypeFlags\n\ .word gBankAttacker\n\ ._323:\n\ - ldr r0, ._330\n\ + ldr r0, ._330 @ gMain\n\ ldrh r1, [r0, #0x28]\n\ mov r2, #0x1\n\ add r0, r2, #0\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._328 @cond_branch\n\ - ldr r0, ._330 + 4\n\ + ldr r0, ._330 + 4 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ add r0, r2, #0\n\ and r0, r0, r1\n\ @@ -1207,7 +1207,7 @@ void debug_sub_8030C24(void) mov r0, #0x1\n\ ._329:\n\ bl GetBankByIdentity\n\ - ldr r1, ._333\n\ + ldr r1, ._333 @ gBankAttacker\n\ strb r0, [r1]\n\ ._324:\n\ mov r0, #0x0\n\ @@ -1215,8 +1215,8 @@ void debug_sub_8030C24(void) add r0, sp, #0x8\n\ ldrh r0, [r0]\n\ bl DoMoveAnim\n\ - ldr r1, ._333 + 4\n\ - ldr r0, ._333 + 8\n\ + ldr r1, ._333 + 4 @ gBattleBankFunc\n\ + ldr r0, ._333 + 8 @ gActiveBank\n\ ldrb r0, [r0]\n\ b ._332\n\ ._334:\n\ @@ -1231,7 +1231,7 @@ void debug_sub_8030C24(void) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._336 @cond_branch\n\ - ldr r0, ._338\n\ + ldr r0, ._338 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -1245,7 +1245,7 @@ void debug_sub_8030C24(void) bl dp11b_obj_free\n\ mov r0, #0x3\n\ bl GetBankByIdentity\n\ - ldr r1, ._338 + 4\n\ + ldr r1, ._338 + 4 @ gBankAttacker\n\ strb r0, [r1]\n\ mov r0, #0x1\n\ b ._337\n\ @@ -1283,7 +1283,7 @@ void debug_sub_8030C24(void) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._343 @cond_branch\n\ - ldr r0, ._345\n\ + ldr r0, ._345 @ gBattleTypeFlags\n\ ldrh r1, [r0]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -1297,24 +1297,24 @@ void debug_sub_8030C24(void) bl dp11b_obj_free\n\ mov r0, #0x1\n\ bl GetBankByIdentity\n\ - ldr r1, ._345 + 4\n\ + ldr r1, ._345 + 4 @ gBankAttacker\n\ strb r0, [r1]\n\ mov r0, #0x3\n\ ._337:\n\ bl GetBankByIdentity\n\ - ldr r1, ._345 + 8\n\ + ldr r1, ._345 + 8 @ gBankTarget\n\ strb r0, [r1]\n\ mov r0, #0x0\n\ bl sub_80326EC\n\ add r0, sp, #0x8\n\ ldrh r0, [r0]\n\ bl DoMoveAnim\n\ - ldr r1, ._345 + 12\n\ + ldr r1, ._345 + 12 @ gBattleBankFunc\n\ ldrb r0, [r4]\n\ ._332:\n\ lsl r0, r0, #0x2\n\ add r0, r0, r1\n\ - ldr r1, ._345 + 16\n\ + ldr r1, ._345 + 16 @ debug_sub_803107C\n\ str r1, [r0]\n\ b ._348\n\ ._346:\n\ @@ -1345,20 +1345,20 @@ void debug_sub_8030C24(void) add r0, r2, #0\n\ strh r0, [r1]\n\ ._347:\n\ - ldr r1, ._349\n\ - ldr r4, ._349 + 4\n\ + ldr r1, ._349 @ gBattlePartyID\n\ + ldr r4, ._349 + 4 @ gActiveBank\n\ ldrb r0, [r4]\n\ lsl r0, r0, #0x1\n\ add r0, r0, r1\n\ ldrh r1, [r0]\n\ mov r0, #0x64\n\ mul r0, r0, r1\n\ - ldr r1, ._349 + 8\n\ + ldr r1, ._349 + 8 @ gPlayerParty\n\ add r0, r0, r1\n\ mov r1, #0xd\n\ add r2, sp, #0x8\n\ bl SetMonData\n\ - ldr r2, ._349 + 12\n\ + ldr r2, ._349 + 12 @ gBattleMons\n\ ldrb r1, [r4]\n\ mov r0, #0x58\n\ mul r0, r0, r1\n\ @@ -1366,8 +1366,8 @@ void debug_sub_8030C24(void) add r1, sp, #0x8\n\ ldrh r1, [r1]\n\ strh r1, [r0, #0xc]\n\ - ldr r5, ._349 + 16\n\ - ldr r1, ._349 + 20\n\ + ldr r5, ._349 + 16 @ gUnknown_03004210\n\ + ldr r1, ._349 + 20 @ 0x1016\n\ mov r0, #0x10\n\ str r0, [sp]\n\ mov r0, #0x38\n\ @@ -1381,7 +1381,7 @@ void debug_sub_8030C24(void) ldsh r1, [r0, r2]\n\ mov r0, #0xd\n\ mul r1, r1, r0\n\ - ldr r0, ._349 + 24\n\ + ldr r0, ._349 + 24 @ gMoveNames\n\ add r1, r1, r0\n\ mov r2, #0x80\n\ lsl r2, r2, #0x1\n\ @@ -1390,7 +1390,7 @@ void debug_sub_8030C24(void) add r0, r5, #0\n\ mov r3, #0x2\n\ bl Text_InitWindowAndPrintText\n\ - ldr r4, ._349 + 28\n\ + ldr r4, ._349 + 28 @ gDisplayedStringBattle\n\ add r0, sp, #0x8\n\ mov r2, #0x0\n\ ldsh r1, [r0, r2]\n\ @@ -1418,11 +1418,11 @@ void debug_sub_8030C24(void) .word gMoveNames\n\ .word gDisplayedStringBattle\n\ ._302:\n\ - ldr r0, ._353\n\ + ldr r0, ._353 @ gMain\n\ ldrh r0, [r0, #0x30]\n\ cmp r0, #0x40\n\ bne ._351 @cond_branch\n\ - ldr r1, ._353 + 4\n\ + ldr r1, ._353 + 4 @ gAnimMoveTurn\n\ ldrb r0, [r1]\n\ sub r0, r0, #0x1\n\ b ._352\n\ @@ -1432,18 +1432,18 @@ void debug_sub_8030C24(void) .word gMain\n\ .word gAnimMoveTurn\n\ ._351:\n\ - ldr r1, ._359\n\ + ldr r1, ._359 @ gAnimMoveTurn\n\ ldrb r0, [r1]\n\ add r0, r0, #0x1\n\ ._352:\n\ strb r0, [r1]\n\ - ldr r4, ._359 + 4\n\ + ldr r4, ._359 + 4 @ gDisplayedStringBattle\n\ ldrb r1, [r1]\n\ add r0, r4, #0\n\ mov r2, #0x2\n\ mov r3, #0x3\n\ bl ConvertIntToDecimalStringN\n\ - ldr r0, ._359 + 8\n\ + ldr r0, ._359 + 8 @ gUnknown_03004210\n\ mov r2, #0x8e\n\ lsl r2, r2, #0x1\n\ mov r1, #0x39\n\ @@ -1452,7 +1452,7 @@ void debug_sub_8030C24(void) mov r3, #0x4\n\ bl Text_InitWindowAndPrintText\n\ ._348:\n\ - ldr r0, ._359 + 12\n\ + ldr r0, ._359 + 12 @ gMain\n\ ldrh r2, [r0, #0x28]\n\ mov r1, #0xc0\n\ lsl r1, r1, #0x2\n\ @@ -1461,28 +1461,28 @@ void debug_sub_8030C24(void) cmp r0, r1\n\ bne ._355 @cond_branch\n\ mov r4, #0x0\n\ - ldr r5, ._359 + 4\n\ - ldr r6, ._359 + 8\n\ + ldr r5, ._359 + 4 @ gDisplayedStringBattle\n\ + ldr r6, ._359 + 8 @ gUnknown_03004210\n\ ._361:\n\ add r0, r5, #0\n\ - ldr r1, ._359 + 16\n\ + ldr r1, ._359 + 16 @ BattleText_Format\n\ bl StringCopy\n\ - ldr r1, ._359 + 20\n\ - ldr r0, ._359 + 24\n\ + ldr r1, ._359 + 20 @ gBattlePartyID\n\ + ldr r0, ._359 + 24 @ gActiveBank\n\ ldrb r0, [r0]\n\ lsl r0, r0, #0x1\n\ add r0, r0, r1\n\ ldrh r1, [r0]\n\ mov r0, #0x64\n\ mul r0, r0, r1\n\ - ldr r1, ._359 + 28\n\ + ldr r1, ._359 + 28 @ gPlayerParty\n\ add r0, r0, r1\n\ add r1, r4, #0\n\ add r1, r1, #0xd\n\ bl GetMonData\n\ mov r1, #0xd\n\ mul r1, r1, r0\n\ - ldr r0, ._359 + 32\n\ + ldr r0, ._359 + 32 @ gMoveNames\n\ add r1, r1, r0\n\ add r0, r5, #0\n\ bl StringAppend\n\ @@ -1521,19 +1521,19 @@ void debug_sub_8030C24(void) add r0, r6, #0\n\ add r1, r5, #0\n\ bl Text_InitWindow\n\ - ldr r0, ._362\n\ + ldr r0, ._362 @ gUnknown_03004210\n\ bl Text_PrintWindow8002F44\n\ add r0, r4, #1\n\ lsl r0, r0, #0x18\n\ lsr r4, r0, #0x18\n\ cmp r4, #0x3\n\ bls ._361 @cond_branch\n\ - ldr r1, ._362 + 4\n\ - ldr r0, ._362 + 8\n\ + ldr r1, ._362 + 4 @ gBattleBankFunc\n\ + ldr r0, ._362 + 8 @ gActiveBank\n\ ldrb r0, [r0]\n\ lsl r0, r0, #0x2\n\ add r0, r0, r1\n\ - ldr r1, ._362 + 12\n\ + ldr r1, ._362 + 12 @ sub_802C68C\n\ str r1, [r0]\n\ ._355:\n\ add sp, sp, #0xc\n\ @@ -1556,16 +1556,16 @@ void debug_sub_803107C(void) push {r4, r5, r6, r7, lr}\n\ add sp, sp, #0xfffffffc\n\ mov r7, #0x0\n\ - ldr r0, ._369\n\ + ldr r0, ._369 @ gAnimScriptCallback\n\ ldr r0, [r0]\n\ bl _call_via_r0\n\ - ldr r0, ._369 + 4\n\ + ldr r0, ._369 + 4 @ gAnimScriptActive\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ bne ._364 @cond_branch\n\ mov r0, #0x1\n\ bl sub_80326EC\n\ - ldr r4, ._369 + 8\n\ + ldr r4, ._369 + 8 @ gActiveBank\n\ ldrb r0, [r4]\n\ mov r1, #0x1\n\ mov r2, #0x7\n\ @@ -1576,7 +1576,7 @@ void debug_sub_803107C(void) mov r2, #0x7\n\ mov r3, #0x1\n\ bl dp11b_obj_instanciate\n\ - ldr r0, ._369 + 12\n\ + ldr r0, ._369 + 12 @ gSprites\n\ add r2, r0, #0\n\ add r2, r2, #0x3e\n\ mov r1, #0x3f\n\ @@ -1593,13 +1593,13 @@ void debug_sub_803107C(void) sub r1, r1, #0x1\n\ cmp r1, #0\n\ bge ._366 @cond_branch\n\ - ldr r4, ._369 + 16\n\ + ldr r4, ._369 + 16 @ gDisplayedStringBattle\n\ add r0, r4, #0\n\ add r1, r7, #0\n\ mov r2, #0x2\n\ mov r3, #0x2\n\ bl ConvertIntToDecimalStringN\n\ - ldr r6, ._369 + 20\n\ + ldr r6, ._369 + 20 @ gUnknown_03004210\n\ mov r2, #0x91\n\ lsl r2, r2, #0x1\n\ mov r5, #0x39\n\ @@ -1625,7 +1625,7 @@ void debug_sub_803107C(void) bl Text_InitWindowAndPrintText\n\ mov r1, #0x0\n\ mov r7, #0x0\n\ - ldr r0, ._369 + 24\n\ + ldr r0, ._369 + 24 @ gOamMatrixAllocBitmap\n\ mov r3, #0x1\n\ ldr r2, [r0]\n\ ._368:\n\ @@ -1641,13 +1641,13 @@ void debug_sub_803107C(void) add r1, r1, #0x1\n\ cmp r1, #0x1f\n\ ble ._368 @cond_branch\n\ - ldr r4, ._369 + 16\n\ + ldr r4, ._369 + 16 @ gDisplayedStringBattle\n\ add r0, r4, #0\n\ add r1, r7, #0\n\ mov r2, #0x2\n\ mov r3, #0x2\n\ bl ConvertIntToDecimalStringN\n\ - ldr r0, ._369 + 20\n\ + ldr r0, ._369 + 20 @ gUnknown_03004210\n\ mov r2, #0x95\n\ lsl r2, r2, #0x1\n\ mov r1, #0x39\n\ @@ -1655,12 +1655,12 @@ void debug_sub_803107C(void) add r1, r4, #0\n\ mov r3, #0xe\n\ bl Text_InitWindowAndPrintText\n\ - ldr r1, ._369 + 28\n\ - ldr r0, ._369 + 8\n\ + ldr r1, ._369 + 28 @ gBattleBankFunc\n\ + ldr r0, ._369 + 8 @ gActiveBank\n\ ldrb r0, [r0]\n\ lsl r0, r0, #0x2\n\ add r0, r0, r1\n\ - ldr r1, ._369 + 32\n\ + ldr r1, ._369 + 32 @ debug_sub_8030C24\n\ str r1, [r0]\n\ ._364:\n\ add sp, sp, #0x4\n\ diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c index 9dd1d7b53..1532a0b2f 100644 --- a/src/battle/battle_records.c +++ b/src/battle/battle_records.c @@ -234,12 +234,12 @@ void debug_sub_81257E0(void) add sp, sp, #0xfffffffc\n\ bl InitLinkBattleRecords\n\ mov r5, #0x0\n\ - ldr r6, ._62\n\ + ldr r6, ._62 @ gUnknown_Debug_4245CC\n\ sub r0, r6, #2\n\ mov r8, r0\n\ - ldr r7, ._62 + 4\n\ + ldr r7, ._62 + 4 @ gLinkPlayers\n\ ._61:\n\ - ldr r0, ._62 + 8\n\ + ldr r0, ._62 + 8 @ gUnknown_Debug_8424620\n\ lsl r3, r5, #0x2\n\ add r3, r3, r0\n\ ldrb r4, [r3]\n\ @@ -251,7 +251,7 @@ void debug_sub_81257E0(void) add r0, r0, r8\n\ ldrh r2, [r0]\n\ ldrb r3, [r3, #0x1]\n\ - ldr r0, ._62 + 12\n\ + ldr r0, ._62 + 12 @ gLinkPlayerMapObjects\n\ lsl r4, r4, #0x2\n\ add r4, r4, r0\n\ ldrb r4, [r4, #0x1]\n\ @@ -261,7 +261,7 @@ void debug_sub_81257E0(void) add r0, r0, r7\n\ ldrb r0, [r0, #0x1a]\n\ str r0, [sp]\n\ - ldr r0, ._62 + 16\n\ + ldr r0, ._62 + 16 @ gSaveBlock1\n\ bl UpdateLinkBattleRecords_\n\ add r5, r5, #0x1\n\ cmp r5, #0x2\n\ diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c index 2bc536d6c..4690368d8 100644 --- a/src/debug/start_menu_debug.c +++ b/src/debug/start_menu_debug.c @@ -491,7 +491,7 @@ u8 DebugMenu_8076E18() asm( " push {lr}\n" " bl debug_sub_8076B4C\n" - " ldr r0, ._67\n" + " ldr r0, ._67 @ DebugMenu_8076D6C\n" " mov r1, #0xa\n" " bl CreateTask\n" " mov r0, #0x0\n" @@ -515,7 +515,7 @@ void DebugMenu_8076E30() " lsl r0, r3, #0x2\n" " add r0, r0, r3\n" " lsl r0, r0, #0x3\n" - " ldr r1, ._73\n" + " ldr r1, ._73 @ gTasks\n" " add r4, r0, r1\n" " mov r0, #0x0\n" " ldsh r1, [r4, r0]\n" @@ -536,7 +536,7 @@ void DebugMenu_8076E30() " b ._86\n" "._71:\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._78\n" + " ldr r0, ._78 @ Str_839BD5A\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" @@ -546,14 +546,14 @@ void DebugMenu_8076E30() "._78:\n" " .word Str_839BD5A\n" "._69:\n" - " ldr r0, ._82\n" + " ldr r0, ._82 @ gMain\n" " ldrh r2, [r0, #0x2e]\n" " and r1, r1, r2\n" " cmp r1, #0\n" " beq ._80 @cond_branch\n" " bl Menu_DisplayDialogueFrame\n" " bl sub_813B79C\n" - " ldr r0, ._82 + 4\n" + " ldr r0, ._82 + 4 @ Str_839BD7D\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" @@ -579,7 +579,7 @@ void DebugMenu_8076E30() " bl DoSoftReset\n" " b ._86\n" "._75:\n" - " ldr r0, ._87\n" + " ldr r0, ._87 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -606,7 +606,7 @@ u8 DebugMenu_8076EDC() asm( " push {lr}\n" " bl debug_sub_8076B4C\n" - " ldr r0, ._89\n" + " ldr r0, ._89 @ DebugMenu_8076E30\n" " mov r1, #0xa\n" " bl CreateTask\n" " mov r0, #0x0\n" @@ -631,7 +631,7 @@ void DebugMenu_8076EF4() " mov r2, #0xb\n" " mov r3, #0x11\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r4, ._93\n" + " ldr r4, ._93 @ gUnknown_Debug_839BDC4\n" " mov r0, #0x2\n" " mov r1, #0x1\n" " mov r2, #0x8\n" @@ -711,13 +711,13 @@ void DebugMenu_8076F60() " bl DestroyTask\n" " b ._97\n" "._96:\n" - " ldr r3, ._100\n" + " ldr r3, ._100 @ gUnknown_Debug_839BDC4\n" " lsl r2, r2, #0x18\n" " asr r2, r2, #0x15\n" " add r0, r3, #4\n" " add r0, r2, r0\n" " ldrb r4, [r0]\n" - " ldr r0, ._100 + 4\n" + " ldr r0, ._100 + 4 @ gSaveBlock2\n" " mov r1, #0x1\n" " and r1, r1, r4\n" " strb r1, [r0, #0x8]\n" @@ -742,7 +742,7 @@ void DebugMenu_8076F60() "._99:\n" " add r0, r5, #0\n" " bl DestroyTask\n" - " ldr r0, ._102\n" + " ldr r0, ._102 @ debug_sub_8058C00\n" " bl SetMainCallback2\n" "._97:\n" " pop {r4, r5}\n" @@ -762,7 +762,7 @@ void DebugMenu_8076FEC() asm( " push {lr}\n" " bl DebugMenu_8076EF4\n" - " ldr r0, ._104\n" + " ldr r0, ._104 @ DebugMenu_8076F60\n" " mov r1, #0xa\n" " bl CreateTask\n" " pop {r0}\n" @@ -779,11 +779,11 @@ __attribute__((naked)) void DebugMenu_8077004() { asm( - " ldr r2, ._106\n" - " ldr r0, ._106 + 4\n" + " ldr r2, ._106 @ gUnknown_030006C4\n" + " ldr r0, ._106 + 4 @ gUnknown_030006C1\n" " ldrb r0, [r0]\n" " lsl r0, r0, #0x3\n" - " ldr r1, ._106 + 8\n" + " ldr r1, ._106 + 8 @ gUnknown_Debug_839BB64\n" " add r0, r0, r1\n" " str r0, [r2]\n" " bx lr\n" @@ -804,7 +804,7 @@ void DebugMenu_8077020() " push {r4, lr}\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" - " ldr r0, ._109\n" + " ldr r0, ._109 @ gMenuCallback\n" " ldr r0, [r0]\n" " bl _call_via_r0\n" " lsl r0, r0, #0x18\n" @@ -830,11 +830,11 @@ void DebugMenu_8077048() { asm( " push {lr}\n" - " ldr r0, ._111\n" - " ldr r1, ._111 + 4\n" + " ldr r0, ._111 @ gMenuCallback\n" + " ldr r1, ._111 + 4 @ DebugMenu_807706C\n" " str r1, [r0]\n" " bl ScriptContext2_Enable\n" - " ldr r0, ._111 + 8\n" + " ldr r0, ._111 + 8 @ DebugMenu_8077020\n" " mov r1, #0x50\n" " bl CreateTask\n" " pop {r0}\n" @@ -854,14 +854,14 @@ void DebugMenu_807706C() { asm( " push {lr}\n" - " ldr r0, ._113\n" + " ldr r0, ._113 @ gWindowTemplate_81E6CE4\n" " bl InitMenuWindow\n" " bl DebugMenu_8077004\n" " bl DebugMenu_807719C\n" " bl DebugMenu_80771EC\n" " bl DebugMenu_8077238\n" - " ldr r1, ._113 + 4\n" - " ldr r0, ._113 + 8\n" + " ldr r1, ._113 + 4 @ gMenuCallback\n" + " ldr r0, ._113 + 8 @ DebugMenu_807709C\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -881,7 +881,7 @@ void DebugMenu_807709C() { asm( " push {r4, lr}\n" - " ldr r4, ._120\n" + " ldr r4, ._120 @ gMain\n" " ldrh r1, [r4, #0x2e]\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -892,7 +892,7 @@ void DebugMenu_807709C() " mov r0, #0x1\n" " neg r0, r0\n" " bl Menu_MoveCursor\n" - " ldr r1, ._120 + 4\n" + " ldr r1, ._120 + 4 @ gUnknown_030006C0\n" " strb r0, [r1]\n" "._115:\n" " ldrh r1, [r4, #0x2e]\n" @@ -904,7 +904,7 @@ void DebugMenu_807709C() " bl PlaySE\n" " mov r0, #0x1\n" " bl Menu_MoveCursor\n" - " ldr r1, ._120 + 4\n" + " ldr r1, ._120 + 4 @ gUnknown_030006C0\n" " strb r0, [r1]\n" "._116:\n" " ldrh r1, [r4, #0x2e]\n" @@ -914,7 +914,7 @@ void DebugMenu_807709C() " beq ._117 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r1, ._120 + 8\n" + " ldr r1, ._120 + 8 @ gUnknown_030006C1\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" " bne ._118 @cond_branch\n" @@ -933,7 +933,7 @@ void DebugMenu_807709C() " bl DebugMenu_8077004\n" " bl DebugMenu_807719C\n" "._117:\n" - " ldr r0, ._125\n" + " ldr r0, ._125 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x10\n" " and r0, r0, r1\n" @@ -941,7 +941,7 @@ void DebugMenu_807709C() " beq ._122 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r1, ._125 + 4\n" + " ldr r1, ._125 + 4 @ gUnknown_030006C1\n" " ldrb r0, [r1]\n" " cmp r0, #0x7\n" " bne ._123 @cond_branch\n" @@ -959,7 +959,7 @@ void DebugMenu_807709C() " bl DebugMenu_8077004\n" " bl DebugMenu_807719C\n" "._122:\n" - " ldr r0, ._129\n" + " ldr r0, ._129 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -967,10 +967,10 @@ void DebugMenu_807709C() " beq ._127 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r1, ._129 + 4\n" - " ldr r0, ._129 + 8\n" + " ldr r1, ._129 + 4 @ gDebug0x839B9BC\n" + " ldr r0, ._129 + 8 @ gUnknown_030006C0\n" " ldrb r2, [r0]\n" - " ldr r0, ._129 + 12\n" + " ldr r0, ._129 + 12 @ gUnknown_030006C4\n" " ldr r0, [r0]\n" " add r0, r0, r2\n" " ldrb r0, [r0]\n" @@ -1018,15 +1018,15 @@ void DebugMenu_807719C() " mov r2, #0xe\n" " mov r3, #0x11\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r3, ._133\n" - " ldr r0, ._133 + 4\n" + " ldr r3, ._133 @ gDebug0x839B9BC\n" + " ldr r0, ._133 + 4 @ gUnknown_030006C4\n" " ldr r0, [r0]\n" " str r0, [sp]\n" " mov r0, #0x1\n" " mov r1, #0x1\n" " mov r2, #0x8\n" " bl Menu_PrintItemsReordered\n" - " ldr r4, ._133 + 8\n" + " ldr r4, ._133 + 8 @ gUnknown_030006C0\n" " ldrb r0, [r4]\n" " str r0, [sp]\n" " mov r0, #0xd\n" @@ -1056,10 +1056,10 @@ void DebugMenu_80771EC() { asm( " push {r4, lr}\n" - " ldr r0, ._135\n" - " ldr r1, ._135 + 4\n" + " ldr r0, ._135 @ gStringVar4\n" + " ldr r1, ._135 + 4 @ Str_839BE04\n" " bl StringCopy\n" - " ldr r4, ._135 + 8\n" + " ldr r4, ._135 + 8 @ gSaveBlock1\n" " mov r1, #0x4\n" " ldsb r1, [r4, r1]\n" " mov r2, #0x1\n" @@ -1075,7 +1075,7 @@ void DebugMenu_80771EC() " mov r2, #0x1d\n" " mov r3, #0xf\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._135\n" + " ldr r0, ._135 @ gStringVar4\n" " mov r1, #0x14\n" " mov r2, #0xd\n" " bl Menu_PrintText\n" @@ -1102,18 +1102,18 @@ void DebugMenu_8077238() " mov r5, r8\n" " push {r5, r6, r7}\n" " add sp, sp, #0xffffffe8\n" - " ldr r1, ._139\n" + " ldr r1, ._139 @ Str_839BE07\n" " mov r0, sp\n" " mov r2, #0x2\n" " bl memcpy\n" " add r0, sp, #0x4\n" " mov r9, r0\n" - " ldr r1, ._139 + 4\n" + " ldr r1, ._139 + 4 @ Str_839BE09\n" " mov r2, #0x3\n" " bl memcpy\n" " add r1, sp, #0x8\n" " mov sl, r1\n" - " ldr r1, ._139 + 8\n" + " ldr r1, ._139 + 8 @ Str_839BE0C\n" " mov r0, sl\n" " mov r2, #0x3\n" " bl memcpy\n" @@ -1141,7 +1141,7 @@ void DebugMenu_8077238() " ldrh r0, [r6]\n" " sub r0, r0, #0x7\n" " strh r0, [r6]\n" - " ldr r7, ._139 + 12\n" + " ldr r7, ._139 + 12 @ gStringVar4\n" " add r0, r7, #0\n" " mov r1, sp\n" " bl StringCopy\n" @@ -1202,7 +1202,7 @@ void DebugMenu_8077238() " mov r2, #0x1d\n" " mov r3, #0x13\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._139 + 12\n" + " ldr r0, ._139 + 12 @ gStringVar4\n" " mov r1, #0x1d\n" " ldr r2, [sp, #0x14]\n" " sub r1, r1, r2\n" @@ -1318,7 +1318,7 @@ u8 DebugMenu_OpenWatanabe() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._141\n" + " ldr r0, ._141 @ InitWatanabeDebugMenu\n" " bl SetMainCallback2\n" " bl ScriptContext2_Enable\n" " mov r0, #0x1\n" @@ -1338,7 +1338,7 @@ u8 DebugMenu_EndSequenceDemo() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._143\n" + " ldr r0, ._143 @ sub_81439D0\n" " bl SetMainCallback2\n" " bl ScriptContext2_Enable\n" " mov r0, #0x1\n" @@ -1415,7 +1415,7 @@ u8 DebugMenu_8077434() " cmp r0, #0x4\n" " bhi ._165 @cond_branch\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._149\n" + " ldr r1, ._149 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -1430,7 +1430,7 @@ u8 DebugMenu_8077434() " .word ._154\n" " .word ._155\n" "._151:\n" - " ldr r0, ._157\n" + " ldr r0, ._157 @ Str_839BE0F\n" " mov r1, #0x1\n" " mov r2, #0x4\n" " bl GetEnigmaBerryChecksum\n" @@ -1447,7 +1447,7 @@ u8 DebugMenu_8077434() "._157:\n" " .word Str_839BE0F\n" "._152:\n" - " ldr r0, ._160\n" + " ldr r0, ._160 @ Str_839BE12\n" " mov r1, #0x2\n" " mov r2, #0x0\n" " bl GetEnigmaBerryChecksum\n" @@ -1462,7 +1462,7 @@ u8 DebugMenu_8077434() "._160:\n" " .word Str_839BE12\n" "._153:\n" - " ldr r0, ._163\n" + " ldr r0, ._163 @ Str_839BE16\n" " mov r1, #0x3\n" " mov r2, #0x0\n" " bl GetEnigmaBerryChecksum\n" @@ -1476,7 +1476,7 @@ u8 DebugMenu_8077434() "._163:\n" " .word Str_839BE16\n" "._154:\n" - " ldr r0, ._166\n" + " ldr r0, ._166 @ Str_839BE1A\n" " mov r1, #0x4\n" " mov r2, #0x0\n" " bl GetEnigmaBerryChecksum\n" @@ -1496,7 +1496,7 @@ u8 DebugMenu_8077434() "._166:\n" " .word Str_839BE1A\n" "._155:\n" - " ldr r0, ._168\n" + " ldr r0, ._168 @ Str_839BE1E\n" " mov r1, #0x4\n" " mov r2, #0x0\n" " bl GetEnigmaBerryChecksum\n" @@ -1526,7 +1526,7 @@ u8 DebugMenu_807750C() { asm( " push {lr}\n" - " ldr r0, ._170\n" + " ldr r0, ._170 @ gUnknown_Debug_839BE24\n" " bl DebugMenu_8077D78\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -1545,12 +1545,12 @@ u8 DebugMenu_SetRamBerry() { asm( " push {lr}\n" - " ldr r0, ._172\n" + " ldr r0, ._172 @ gUnknown_Debug_839BE24\n" " mov r1, #0xc\n" " mov r2, #0x5\n" " bl DebugMenu_8077D24\n" - " ldr r1, ._172 + 4\n" - " ldr r0, ._172 + 8\n" + " ldr r1, ._172 + 4 @ gMenuCallback\n" + " ldr r0, ._172 + 8 @ DebugMenu_807750C\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -1570,7 +1570,7 @@ u8 DebugMenu_ToggleBGM() { asm( " push {lr}\n" - " ldr r2, ._175\n" + " ldr r2, ._175 @ gDisableMusic\n" " mov r1, #0x0\n" " ldrb r0, [r2]\n" " cmp r0, #0\n" @@ -1611,7 +1611,7 @@ u8 DebugMenu_NationalDex() asm( " push {r4, r5, lr}\n" " mov r4, #0x0\n" - " ldr r5, ._178\n" + " ldr r5, ._178 @ 0x181\n" "._177:\n" " add r4, r4, #0x1\n" " lsl r4, r4, #0x10\n" @@ -1624,7 +1624,7 @@ u8 DebugMenu_NationalDex() " bl GetSetPokedexFlag\n" " cmp r4, r5\n" " bls ._177 @cond_branch\n" - " ldr r1, ._178 + 4\n" + " ldr r1, ._178 + 4 @ gUnknown_03005CE8\n" " mov r0, #0x1\n" " strb r0, [r1]\n" " bl CloseMenu\n" @@ -1664,7 +1664,7 @@ u8 DebugMenu_HoennDex() " bl GetSetPokedexFlag\n" " cmp r5, #0xc9\n" " bls ._180 @cond_branch\n" - " ldr r1, ._181\n" + " ldr r1, ._181 @ gUnknown_03005CE8\n" " mov r0, #0x1\n" " strb r0, [r1]\n" " bl CloseMenu\n" @@ -1847,7 +1847,7 @@ void DebugMenu_80776B4() " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " ldr r1, ._183\n" + " ldr r1, ._183 @ Str_839BE4C\n" " mov r0, sp\n" " mov r2, #0x7\n" " bl memcpy\n" @@ -1861,7 +1861,7 @@ void DebugMenu_80776B4() " add r1, r5, #0\n" " mov r2, #0x1d\n" " bl Menu_BlankWindowRect\n" - " ldr r0, ._183 + 4\n" + " ldr r0, ._183 + 4 @ gUnknown_030006C8\n" " ldrb r0, [r0]\n" " ASR r0, r4\n" " mov r1, #0x1\n" @@ -1890,7 +1890,7 @@ void DebugMenu_8077704() asm( " push {lr}\n" " add sp, sp, #0xffffffec\n" - " ldr r1, ._185\n" + " ldr r1, ._185 @ Str_839BE53\n" " mov r0, sp\n" " mov r2, #0x11\n" " bl memcpy\n" @@ -1903,7 +1903,7 @@ void DebugMenu_8077704() " mov r1, #0x15\n" " mov r2, #0x0\n" " bl Menu_PrintText\n" - " ldr r2, ._185 + 4\n" + " ldr r2, ._185 + 4 @ gUnknown_030006C8\n" " mov r0, #0x80\n" " lsl r0, r0, #0x13\n" " ldrh r0, [r0]\n" @@ -1936,7 +1936,7 @@ u8 DebugMenu_8077760() { asm( " push {r4, r5, lr}\n" - " ldr r2, ._190\n" + " ldr r2, ._190 @ gMain\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x40\n" " and r0, r0, r1\n" @@ -1948,7 +1948,7 @@ u8 DebugMenu_8077760() " mov r0, #0x1\n" " neg r0, r0\n" " bl Menu_MoveCursor\n" - " ldr r1, ._190 + 4\n" + " ldr r1, ._190 + 4 @ gUnknown_030006B8\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" " beq ._188 @cond_branch\n" @@ -1973,7 +1973,7 @@ u8 DebugMenu_8077760() " bl PlaySE\n" " mov r0, #0x1\n" " bl Menu_MoveCursor\n" - " ldr r1, ._195\n" + " ldr r1, ._195 @ gUnknown_030006B8\n" " ldrb r0, [r1]\n" " cmp r0, #0x3\n" " beq ._193 @cond_branch\n" @@ -1995,7 +1995,7 @@ u8 DebugMenu_8077760() " beq ._197 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r4, ._201\n" + " ldr r4, ._201 @ gUnknown_030006C8\n" " bl Menu_GetCursorPos\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -2022,9 +2022,9 @@ u8 DebugMenu_8077760() " mov r2, #0x80\n" " lsl r2, r2, #0x13\n" " ldrh r0, [r2]\n" - " ldr r1, ._201 + 4\n" + " ldr r1, ._201 + 4 @ 0xf0ff\n" " and r1, r1, r0\n" - " ldr r0, ._201\n" + " ldr r0, ._201 @ gUnknown_030006C8\n" " ldrb r0, [r0]\n" " lsl r0, r0, #0x8\n" " add r1, r1, r0\n" @@ -2064,8 +2064,8 @@ u8 DebugMenu_SwitchBG() " mov r2, #0x0\n" " mov r3, #0x4\n" " bl InitMenu\n" - " ldr r1, ._203\n" - " ldr r0, ._203 + 4\n" + " ldr r1, ._203 @ gMenuCallback\n" + " ldr r0, ._203 + 4 @ DebugMenu_8077760\n" " str r0, [r1]\n" " mov r0, #0x0\n" " add sp, sp, #0x8\n" @@ -2089,7 +2089,7 @@ void DebugMenu_807786C() " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" - " ldr r1, ._205\n" + " ldr r1, ._205 @ Str_839BE64\n" " mov r0, sp\n" " mov r2, #0x7\n" " bl memcpy\n" @@ -2121,7 +2121,7 @@ void DebugMenu_80778A8() { asm( " push {r4, lr}\n" - " ldr r4, ._211\n" + " ldr r4, ._211 @ gMain\n" " ldrh r1, [r4, #0x2e]\n" " mov r0, #0x30\n" " and r0, r0, r1\n" @@ -2129,7 +2129,7 @@ void DebugMenu_80778A8() " beq ._207 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r2, ._211 + 4\n" + " ldr r2, ._211 + 4 @ sWildEncountersDisabled\n" " ldrb r0, [r2]\n" " mov r1, #0x1\n" " eor r0, r0, r1\n" @@ -2171,11 +2171,11 @@ u8 DebugMenu_ControlEncounter() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r0, ._213\n" + " ldr r0, ._213 @ sWildEncountersDisabled\n" " ldrb r0, [r0]\n" " bl DebugMenu_807786C\n" - " ldr r1, ._213 + 4\n" - " ldr r0, ._213 + 8\n" + " ldr r1, ._213 + 4 @ gMenuCallback\n" + " ldr r0, ._213 + 8 @ DebugMenu_80778A8\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -2194,8 +2194,8 @@ __attribute__((naked)) u8 DebugMenu_UseHM() { asm( - " ldr r1, ._215\n" - " ldr r0, ._215 + 4\n" + " ldr r1, ._215 @ gMenuCallback\n" + " ldr r0, ._215 + 4 @ DebugMenu_8077C14\n" " str r0, [r1]\n" " mov r0, #0x0\n" " bx lr\n" @@ -2214,7 +2214,7 @@ void DebugMenu_8077934() asm( " push {lr}\n" " mov r1, #0x0\n" - " ldr r3, ._218\n" + " ldr r3, ._218 @ gSaveBlock1\n" " mov r2, #0x1\n" "._217:\n" " add r0, r1, r3\n" @@ -2240,7 +2240,7 @@ void DebugMenu_8077954() asm( " push {lr}\n" " mov r1, #0x0\n" - " ldr r3, ._222\n" + " ldr r3, ._222 @ gSaveBlock1\n" " mov r2, #0x0\n" "._221:\n" " add r0, r1, r3\n" @@ -2266,7 +2266,7 @@ void DebugMenu_8077974() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r1, ._226\n" + " ldr r1, ._226 @ gSaveBlock1\n" " mov r0, #0x4\n" " ldsb r0, [r1, r0]\n" " lsl r0, r0, #0x10\n" @@ -2279,8 +2279,8 @@ void DebugMenu_8077974() " bl IsRematchTrainerIn\n" " cmp r0, #0\n" " beq ._224 @cond_branch\n" - " ldr r0, ._226 + 4\n" - " ldr r1, ._226 + 8\n" + " ldr r0, ._226 + 4 @ gStringVar1\n" + " ldr r1, ._226 + 8 @ Str_839BE8D\n" " bl StringCopy\n" " b ._225\n" "._227:\n" @@ -2290,11 +2290,11 @@ void DebugMenu_8077974() " .word gStringVar1\n" " .word Str_839BE8D\n" "._224:\n" - " ldr r0, ._230\n" - " ldr r1, ._230 + 4\n" + " ldr r0, ._230 @ gStringVar1\n" + " ldr r1, ._230 + 4 @ Str_839BE90\n" " bl StringCopy\n" "._225:\n" - " ldr r1, ._230 + 8\n" + " ldr r1, ._230 + 8 @ gSaveBlock1\n" " mov r0, #0x4\n" " ldsb r0, [r1, r0]\n" " lsl r0, r0, #0x10\n" @@ -2307,8 +2307,8 @@ void DebugMenu_8077974() " bl DoesSomeoneWantRematchIn\n" " cmp r0, #0\n" " beq ._228 @cond_branch\n" - " ldr r0, ._230 + 12\n" - " ldr r1, ._230 + 16\n" + " ldr r0, ._230 + 12 @ gStringVar2\n" + " ldr r1, ._230 + 16 @ Str_839BE8D\n" " bl StringCopy\n" " b ._229\n" "._231:\n" @@ -2320,14 +2320,14 @@ void DebugMenu_8077974() " .word gStringVar2\n" " .word Str_839BE8D\n" "._228:\n" - " ldr r0, ._232\n" - " ldr r1, ._232 + 4\n" + " ldr r0, ._232 @ gStringVar2\n" + " ldr r1, ._232 + 4 @ Str_839BE90\n" " bl StringCopy\n" "._229:\n" - " ldr r0, ._232 + 8\n" + " ldr r0, ._232 + 8 @ Str_839BE6B\n" " bl sub_8071F40\n" - " ldr r1, ._232 + 12\n" - " ldr r0, ._232 + 16\n" + " ldr r1, ._232 + 12 @ gMenuCallback\n" + " ldr r0, ._232 + 16 @ DebugMenu_8077DB4\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -2349,8 +2349,8 @@ void DebugMenu_8077A20() { asm( " push {lr}\n" - " ldr r0, ._234\n" - " ldr r1, ._234 + 4\n" + " ldr r0, ._234 @ gSaveBlock1\n" + " ldr r1, ._234 + 4 @ 0x978\n" " add r0, r0, r1\n" " mov r1, #0xff\n" " strh r1, [r0]\n" @@ -2372,8 +2372,8 @@ void DebugMenu_8077A40() { asm( " push {lr}\n" - " ldr r0, ._236\n" - " ldr r1, ._236 + 4\n" + " ldr r0, ._236 @ gSaveBlock1\n" + " ldr r1, ._236 + 4 @ 0x978\n" " add r0, r0, r1\n" " mov r1, #0x0\n" " strh r1, [r0]\n" @@ -2395,7 +2395,7 @@ void DebugMenu_8077A60() { asm( " push {lr}\n" - " ldr r0, ._238\n" + " ldr r0, ._238 @ gUnknown_Debug_839BEE4\n" " bl DebugMenu_8077D78\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -2415,12 +2415,12 @@ u8 DebugMenu_RematchTrainers() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r0, ._240\n" + " ldr r0, ._240 @ gUnknown_Debug_839BEE4\n" " mov r1, #0xd\n" " mov r2, #0x5\n" " bl DebugMenu_8077D24\n" - " ldr r1, ._240 + 4\n" - " ldr r0, ._240 + 8\n" + " ldr r1, ._240 + 4 @ gMenuCallback\n" + " ldr r0, ._240 + 8 @ DebugMenu_8077A60\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -2440,7 +2440,7 @@ void DebugMenu_8077A9C() { asm( " push {lr}\n" - " ldr r1, ._242\n" + " ldr r1, ._242 @ gNumSafariBalls\n" " mov r0, #0x1e\n" " strb r0, [r1]\n" " bl CloseMenu\n" @@ -2460,7 +2460,7 @@ void DebugMenu_8077AB4() { asm( " push {lr}\n" - " ldr r1, ._244\n" + " ldr r1, ._244 @ gNumSafariBalls\n" " mov r0, #0x1\n" " strb r0, [r1]\n" " bl CloseMenu\n" @@ -2480,7 +2480,7 @@ void DebugMenu_8077ACC() { asm( " push {lr}\n" - " ldr r1, ._246\n" + " ldr r1, ._246 @ gSafariZoneStepCounter\n" " mov r2, #0xfa\n" " lsl r2, r2, #0x1\n" " add r0, r2, #0\n" @@ -2502,7 +2502,7 @@ void DebugMenu_8077AE8() { asm( " push {lr}\n" - " ldr r1, ._248\n" + " ldr r1, ._248 @ gSafariZoneStepCounter\n" " mov r0, #0x1\n" " strh r0, [r1]\n" " bl CloseMenu\n" @@ -2526,7 +2526,7 @@ void DebugMenu_8077B00() " bl unref_sub_80C853C\n" " cmp r0, #0\n" " beq ._250 @cond_branch\n" - " ldr r0, ._252\n" + " ldr r0, ._252 @ Str_839BF14\n" " bl sub_8071F40\n" " b ._251\n" "._253:\n" @@ -2534,11 +2534,11 @@ void DebugMenu_8077B00() "._252:\n" " .word Str_839BF14\n" "._250:\n" - " ldr r0, ._254\n" + " ldr r0, ._254 @ Str_839BF1F\n" " bl sub_8071F40\n" "._251:\n" - " ldr r1, ._254 + 4\n" - " ldr r0, ._254 + 8\n" + " ldr r1, ._254 + 4 @ gMenuCallback\n" + " ldr r0, ._254 + 8 @ DebugMenu_8077DB4\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -2558,7 +2558,7 @@ void DebugMenu_8077B3C() { asm( " push {lr}\n" - " ldr r0, ._256\n" + " ldr r0, ._256 @ gUnknown_Debug_839BF6C\n" " bl DebugMenu_8077D78\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -2581,20 +2581,20 @@ u8 DebugMenu_Safari() " cmp r0, #0\n" " beq ._258 @cond_branch\n" " bl Menu_EraseScreen\n" - " ldr r0, ._260\n" + " ldr r0, ._260 @ gUnknown_Debug_839BF6C\n" " mov r1, #0xe\n" " mov r2, #0x5\n" " bl DebugMenu_8077D24\n" - " ldr r0, ._260 + 4\n" - " ldr r1, ._260 + 8\n" + " ldr r0, ._260 + 4 @ gStringVar1\n" + " ldr r1, ._260 + 8 @ gSafariZoneStepCounter\n" " ldrh r1, [r1]\n" " mov r2, #0x1\n" " mov r3, #0x3\n" " bl ConvertIntToDecimalStringN\n" - " ldr r0, ._260 + 12\n" + " ldr r0, ._260 + 12 @ Str_839BF0C\n" " bl sub_8071F40\n" - " ldr r1, ._260 + 16\n" - " ldr r0, ._260 + 20\n" + " ldr r1, ._260 + 16 @ gMenuCallback\n" + " ldr r0, ._260 + 20 @ DebugMenu_8077B3C\n" " str r0, [r1]\n" " bl ScriptContext2_Enable\n" " mov r0, #0x0\n" @@ -2704,7 +2704,7 @@ void DebugMenu_8077C00() { asm( " push {lr}\n" - " ldr r0, ._262\n" + " ldr r0, ._262 @ gUnknown_Debug_839BF94\n" " bl DebugMenu_8077D78\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -2724,12 +2724,12 @@ void DebugMenu_8077C14() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r0, ._264\n" + " ldr r0, ._264 @ gUnknown_Debug_839BF94\n" " mov r1, #0xa\n" " mov r2, #0x9\n" " bl DebugMenu_8077D24\n" - " ldr r1, ._264 + 4\n" - " ldr r0, ._264 + 8\n" + " ldr r1, ._264 + 4 @ gMenuCallback\n" + " ldr r0, ._264 + 8 @ DebugMenu_8077C00\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -2756,8 +2756,8 @@ void DebugMenu_8077C3C() " add sp, sp, #0xfffffffc\n" " mov sl, r0\n" " add r7, r1, #0\n" - " ldr r0, ._271\n" - " ldr r1, ._271 + 4\n" + " ldr r0, ._271 @ gUnknown_030006BC\n" + " ldr r1, ._271 + 4 @ gUnknown_Debug_839BFE8\n" " str r1, [r0]\n" " mov r1, #0x0\n" " strb r1, [r7]\n" @@ -2768,7 +2768,7 @@ void DebugMenu_8077C3C() " mov r8, r0\n" "._269:\n" " mov r5, #0x0\n" - " ldr r1, ._271\n" + " ldr r1, ._271 @ gUnknown_030006BC\n" " ldr r0, [r1]\n" " ldr r2, [r0, #0x4]\n" " mov r4, #0x0\n" @@ -2858,8 +2858,8 @@ void debug_sub_8077CF4() " lsr r4, r4, #0x18\n" " lsl r5, r5, #0x18\n" " lsr r5, r5, #0x18\n" - " ldr r0, ._273\n" - " ldr r6, ._273 + 4\n" + " ldr r0, ._273 @ BuildDateTime\n" + " ldr r6, ._273 + 4 @ gStringVar4\n" " add r1, r6, #0\n" " bl DebugMenu_8077C3C\n" " add r0, r6, #0\n" @@ -2940,7 +2940,7 @@ void DebugMenu_8077D78() " cmp r4, r0\n" " beq ._276 @cond_branch\n" " bl Menu_EraseScreen\n" - " ldr r0, ._278\n" + " ldr r0, ._278 @ gMenuCallback\n" " lsl r1, r4, #0x3\n" " add r1, r1, r5\n" " ldr r1, [r1, #0x4]\n" @@ -2968,7 +2968,7 @@ void DebugMenu_8077DB4() { asm( " push {lr}\n" - " ldr r0, ._282\n" + " ldr r0, ._282 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -3063,7 +3063,7 @@ void DebugMenu_8077E40() asm( " push {r4, lr}\n" " add r4, r0, #0\n" - " ldr r0, ._297\n" + " ldr r0, ._297 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -3130,14 +3130,14 @@ void DebugMenu_8077EAC() { asm( " push {r4, lr}\n" - " ldr r0, ._303\n" + " ldr r0, ._303 @ DebugMenu_8077F40\n" " mov r1, #0x50\n" " bl CreateTask\n" " add r4, r0, #0\n" " lsl r4, r4, #0x18\n" " lsr r4, r4, #0x18\n" " bl Menu_EraseScreen\n" - " ldr r1, ._303 + 4\n" + " ldr r1, ._303 + 4 @ gTasks\n" " lsl r0, r4, #0x2\n" " add r0, r0, r4\n" " lsl r0, r0, #0x3\n" @@ -3173,7 +3173,7 @@ void DebugMenu_8077EE0() " mov r2, #0x16\n" " mov r3, #0x12\n" " bl Menu_BlankWindowRect\n" - " ldr r5, ._305\n" + " ldr r5, ._305 @ gStringVar1\n" " add r0, r5, #0\n" " add r1, r4, #0\n" " mov r2, #0x1\n" @@ -3218,17 +3218,17 @@ void DebugMenu_8077F40() " lsl r4, r0, #0x2\n" " add r4, r4, r0\n" " lsl r4, r4, #0x3\n" - " ldr r0, ._307\n" + " ldr r0, ._307 @ gTasks\n" " add r4, r4, r0\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._307 + 4\n" + " ldr r0, ._307 + 4 @ gDebug0x839C008\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" " ldrh r0, [r4, #0xa]\n" " ldrh r1, [r4, #0xc]\n" " bl DebugMenu_8077EE0\n" - " ldr r0, ._307 + 8\n" + " ldr r0, ._307 + 8 @ DebugMenu_8077F7C\n" " str r0, [r4]\n" " pop {r4}\n" " pop {r0}\n" @@ -3253,23 +3253,23 @@ void DebugMenu_8077F7C() " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r1, r1, #0x3\n" - " ldr r0, ._311\n" + " ldr r0, ._311 @ gTasks\n" " add r4, r1, r0\n" - " ldr r3, ._311 + 4\n" + " ldr r3, ._311 + 4 @ gMain\n" " ldrh r1, [r3, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._309 @cond_branch\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._311 + 8\n" + " ldr r0, ._311 + 8 @ Str_839C014\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" " ldrh r0, [r4, #0xa]\n" " ldrh r1, [r4, #0xc]\n" " bl DebugMenu_8077EE0\n" - " ldr r0, ._311 + 12\n" + " ldr r0, ._311 + 12 @ DebugMenu_8077FFC\n" " str r0, [r4]\n" " b ._317\n" "._312:\n" @@ -3284,7 +3284,7 @@ void DebugMenu_8077F7C() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._313 @cond_branch\n" - " ldr r0, ._315\n" + " ldr r0, ._315 @ DebugMenu_807806C\n" " str r0, [r4]\n" " b ._317\n" "._316:\n" @@ -3322,9 +3322,9 @@ void DebugMenu_8077FFC() " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r1, r1, #0x3\n" - " ldr r0, ._321\n" + " ldr r0, ._321 @ gTasks\n" " add r4, r1, r0\n" - " ldr r2, ._321 + 4\n" + " ldr r2, ._321 + 4 @ gMain\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -3351,7 +3351,7 @@ void DebugMenu_8077FFC() " cmp r0, #0\n" " beq ._323 @cond_branch\n" "._320:\n" - " ldr r0, ._325\n" + " ldr r0, ._325 @ DebugMenu_8077F40\n" " str r0, [r4]\n" " b ._327\n" "._326:\n" @@ -3411,7 +3411,7 @@ void DebugMenu_807808C() " mov r4, #0x1\n" "._328:\n" " lsl r1, r4, #0x5\n" - " ldr r0, ._331\n" + " ldr r0, ._331 @ gSaveBlock1\n" " add r5, r1, r0\n" " bl Menu_EraseScreen\n" " mov r0, #0x0\n" @@ -3419,7 +3419,7 @@ void DebugMenu_807808C() " mov r2, #0x13\n" " mov r3, #0x11\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._331 + 4\n" + " ldr r0, ._331 + 4 @ Str_839C01E\n" " mov r1, #0x2\n" " mov r2, #0x2\n" " bl Menu_PrintText\n" @@ -3460,7 +3460,7 @@ void DebugMenu_807808C() " .word gSaveBlock1+0x2ddc\n" " .word Str_839C01E\n" "._329:\n" - " ldr r0, ._335\n" + " ldr r0, ._335 @ Str_839C04D\n" " mov r1, #0xb\n" " mov r2, #0x6\n" " bl Menu_PrintText\n" @@ -3483,7 +3483,7 @@ void DebugMenu_807808C() "._335:\n" " .word Str_839C04D\n" "._333:\n" - " ldr r0, ._337\n" + " ldr r0, ._337 @ Str_839C04D\n" " mov r1, #0xb\n" " mov r2, #0x8\n" " bl Menu_PrintText\n" @@ -3525,7 +3525,7 @@ void DebugMenu_807817C() " push {r4, lr}\n" " lsl r0, r0, #0x18\n" " lsr r4, r0, #0x18\n" - " ldr r0, ._340\n" + " ldr r0, ._340 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -3557,7 +3557,7 @@ void DebugMenu_80781A8() " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r1, r1, #0x3\n" - " ldr r0, ._344\n" + " ldr r0, ._344 @ gTasks\n" " add r5, r1, r0\n" " ldrh r1, [r5, #0x8]\n" " mov r2, #0x8\n" @@ -3572,7 +3572,7 @@ void DebugMenu_80781A8() "._344:\n" " .word gTasks\n" "._342:\n" - " ldr r2, ._348\n" + " ldr r2, ._348 @ gMain\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -3581,7 +3581,7 @@ void DebugMenu_80781A8() " mov r1, #0x8\n" " ldsh r0, [r5, r1]\n" " bl DebugMenu_807808C\n" - " ldr r0, ._348 + 4\n" + " ldr r0, ._348 + 4 @ DebugMenu_807817C\n" " str r0, [r5]\n" " b ._350\n" "._349:\n" @@ -3606,7 +3606,7 @@ void DebugMenu_80781A8() " mov r2, #0x16\n" " mov r3, #0x12\n" " bl Menu_BlankWindowRect\n" - " ldr r4, ._351\n" + " ldr r4, ._351 @ gStringVar1\n" " mov r2, #0x8\n" " ldsh r1, [r5, r2]\n" " add r0, r4, #0\n" @@ -3635,7 +3635,7 @@ u8 DebugMenu_ViewPortraits() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._353\n" + " ldr r0, ._353 @ DebugMenu_80781A8\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" @@ -3667,21 +3667,21 @@ u8 DebugMenu_AllBadges() { asm( " push {lr}\n" - " ldr r0, ._355\n" + " ldr r0, ._355 @ 0x807\n" " bl FlagSet\n" - " ldr r0, ._355 + 4\n" + " ldr r0, ._355 + 4 @ 0x808\n" " bl FlagSet\n" - " ldr r0, ._355 + 8\n" + " ldr r0, ._355 + 8 @ 0x809\n" " bl FlagSet\n" - " ldr r0, ._355 + 12\n" + " ldr r0, ._355 + 12 @ 0x80a\n" " bl FlagSet\n" - " ldr r0, ._355 + 16\n" + " ldr r0, ._355 + 16 @ 0x80b\n" " bl FlagSet\n" - " ldr r0, ._355 + 20\n" + " ldr r0, ._355 + 20 @ 0x80c\n" " bl FlagSet\n" - " ldr r0, ._355 + 24\n" + " ldr r0, ._355 + 24 @ 0x80d\n" " bl FlagSet\n" - " ldr r0, ._355 + 28\n" + " ldr r0, ._355 + 28 @ 0x80e\n" " bl FlagSet\n" " bl CloseMenu\n" " mov r0, #0x1\n" @@ -3708,7 +3708,7 @@ u8 DebugMenu_TimeRecords() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._357\n" + " ldr r0, ._357 @ debug_sub_806F9E4\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" @@ -3746,11 +3746,11 @@ void DebugMenu_80782EC() " add r1, r0, #0\n" " lsl r1, r1, #0x10\n" " lsr r1, r1, #0x10\n" - " ldr r0, ._359\n" + " ldr r0, ._359 @ gStringVar1\n" " mov r2, #0x0\n" " mov r3, #0x4\n" " bl ConvertIntToHexStringN\n" - " ldr r0, ._359 + 4\n" + " ldr r0, ._359 + 4 @ Str_839C053\n" " bl sub_8071F40\n" " pop {r0}\n" " bx r0\n" @@ -3773,7 +3773,7 @@ void DebugMenu_8078310() " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" - " ldr r1, ._364\n" + " ldr r1, ._364 @ gTasks\n" " add r4, r0, r1\n" " mov r1, #0x0\n" " ldsh r0, [r4, r1]\n" @@ -3787,7 +3787,7 @@ void DebugMenu_8078310() "._364:\n" " .word gTasks+0x8\n" "._361:\n" - " ldr r0, ._367\n" + " ldr r0, ._367 @ 0x4024\n" " bl VarGet\n" " strh r0, [r4, #0x2]\n" " ldrh r0, [r4, #0x2]\n" @@ -3801,14 +3801,14 @@ void DebugMenu_8078310() "._367:\n" " .word 0x4024\n" "._362:\n" - " ldr r3, ._371\n" + " ldr r3, ._371 @ gMain\n" " ldrh r1, [r3, #0x2e]\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._369 @cond_branch\n" " mov r0, #0x49\n" " bl PlaySE\n" - " ldr r0, ._371 + 4\n" + " ldr r0, ._371 + 4 @ 0x4024\n" " bl GetVarPointer\n" " ldrh r1, [r4, #0x2]\n" " strh r1, [r0]\n" @@ -3831,7 +3831,7 @@ void DebugMenu_8078310() " b ._375\n" "._373:\n" " add r0, r4, #2\n" - " ldr r2, ._376\n" + " ldr r2, ._376 @ 0xffff\n" " ldrh r3, [r3, #0x30]\n" " mov r1, #0x0\n" " bl DebugMenu_8077DD8\n" @@ -3857,7 +3857,7 @@ u8 DebugMenu_MiragaIslandRND() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._378\n" + " ldr r0, ._378 @ DebugMenu_8078310\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" @@ -3877,7 +3877,7 @@ void DebugMenu_80783C8() { asm( " push {r4, lr}\n" - " ldr r0, ._383\n" + " ldr r0, ._383 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x30\n" " and r0, r0, r1\n" @@ -3885,7 +3885,7 @@ void DebugMenu_80783C8() " beq ._382 @cond_branch\n" " mov r0, #0x5\n" " bl PlaySE\n" - " ldr r4, ._383 + 4\n" + " ldr r4, ._383 + 4 @ 0x804\n" " add r0, r4, #0\n" " bl FlagGet\n" " lsl r0, r0, #0x18\n" @@ -3907,7 +3907,7 @@ void DebugMenu_80783C8() " mov r0, #0x1\n" " bl DebugMenu_807786C\n" "._382:\n" - " ldr r0, ._388\n" + " ldr r0, ._388 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -3941,15 +3941,15 @@ u8 DebugMenu_ToggleClearFlag() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r0, ._390\n" + " ldr r0, ._390 @ 0x804\n" " bl FlagGet\n" " mov r1, #0x1\n" " eor r0, r0, r1\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " bl DebugMenu_807786C\n" - " ldr r1, ._390 + 4\n" - " ldr r0, ._390 + 8\n" + " ldr r1, ._390 + 4 @ gMenuCallback\n" + " ldr r0, ._390 + 8 @ DebugMenu_80783C8\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -3969,7 +3969,7 @@ void DebugMenu_8078464() { asm( " push {r4, lr}\n" - " ldr r4, ._396\n" + " ldr r4, ._396 @ 0x82a\n" " add r0, r4, #0\n" " bl FlagGet\n" " lsl r0, r0, #0x18\n" @@ -4020,7 +4020,7 @@ u8 DebugMenu_OpenWeatherEvents() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r0, ._404\n" + " ldr r0, ._404 @ 0x82a\n" " bl FlagGet\n" " mov r1, #0x0\n" " lsl r0, r0, #0x18\n" @@ -4030,8 +4030,8 @@ u8 DebugMenu_OpenWeatherEvents() "._403:\n" " add r0, r1, #0\n" " bl DebugMenu_807786C\n" - " ldr r1, ._404 + 4\n" - " ldr r0, ._404 + 8\n" + " ldr r1, ._404 + 4 @ gMenuCallback\n" + " ldr r0, ._404 + 8 @ DebugMenu_8078464\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -4099,8 +4099,8 @@ u8 DebugMenu_OpenMysteryEvent() "._415:\n" " add r0, r1, #0\n" " bl DebugMenu_807786C\n" - " ldr r1, ._416\n" - " ldr r0, ._416 + 4\n" + " ldr r1, ._416 @ gMenuCallback\n" + " ldr r0, ._416 + 4 @ DebugMenu_80784E8\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -4125,13 +4125,13 @@ void DebugMenu_8078550() " lsr r0, r0, #0x18\n" " bl GetGameStat\n" " add r7, r0, #0\n" - " ldr r0, ._420\n" + " ldr r0, ._420 @ gStringVar1\n" " add r1, r6, #0\n" " mov r2, #0x2\n" " mov r3, #0x2\n" " bl ConvertIntToDecimalStringN\n" - " ldr r0, ._420 + 4\n" - " ldr r5, ._420 + 8\n" + " ldr r0, ._420 + 4 @ gStringVar2\n" + " ldr r5, ._420 + 8 @ gUnknown_Debug_839C26C\n" " lsl r4, r6, #0x3\n" " add r1, r5, #4\n" " add r1, r4, r1\n" @@ -4141,8 +4141,8 @@ void DebugMenu_8078550() " ldr r0, [r4]\n" " cmp r0, #0\n" " bne ._418 @cond_branch\n" - " ldr r0, ._420 + 12\n" - " ldr r1, ._420 + 16\n" + " ldr r0, ._420 + 12 @ gStringVar3\n" + " ldr r1, ._420 + 16 @ Str_839C085\n" " bl StringCopy\n" " b ._423\n" "._421:\n" @@ -4156,7 +4156,7 @@ void DebugMenu_8078550() "._418:\n" " cmp r6, #0x1\n" " beq ._422 @cond_branch\n" - " ldr r0, ._424\n" + " ldr r0, ._424 @ gStringVar3\n" " add r1, r7, #0\n" " mov r2, #0x1\n" " mov r3, #0xa\n" @@ -4167,7 +4167,7 @@ void DebugMenu_8078550() "._424:\n" " .word gStringVar3\n" "._422:\n" - " ldr r4, ._426\n" + " ldr r4, ._426 @ gStringVar3\n" " lsr r1, r7, #0x10\n" " add r0, r4, #0\n" " mov r2, #0x1\n" @@ -4192,7 +4192,7 @@ void DebugMenu_8078550() " bl ConvertIntToDecimalStringN\n" "._423:\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._426 + 4\n" + " ldr r0, ._426 + 4 @ Str_839C07C\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" @@ -4218,7 +4218,7 @@ void DebugMenu_807860C() " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" - " ldr r1, ._432\n" + " ldr r1, ._432 @ gTasks\n" " add r4, r0, r1\n" " mov r1, #0x0\n" " ldsh r0, [r4, r1]\n" @@ -4246,7 +4246,7 @@ void DebugMenu_807860C() " strh r0, [r4]\n" " b ._447\n" "._428:\n" - " ldr r3, ._439\n" + " ldr r3, ._439 @ gMain\n" " ldrh r1, [r3, #0x2e]\n" " and r0, r0, r1\n" " cmp r0, #0\n" @@ -4338,13 +4338,13 @@ void DebugMenu_80786D0() " bl DebugMenu_807860C\n" " cmp r0, #0\n" " beq ._449 @cond_branch\n" - " ldr r1, ._450\n" + " ldr r1, ._450 @ gTasks\n" " lsl r0, r4, #0x2\n" " add r0, r0, r4\n" " lsl r0, r0, #0x3\n" " add r0, r0, r1\n" " ldrb r2, [r0, #0xa]\n" - " ldr r1, ._450 + 4\n" + " ldr r1, ._450 + 4 @ gUnknown_Debug_839C26C\n" " lsl r0, r2, #0x3\n" " add r0, r0, r1\n" " ldr r0, [r0]\n" @@ -4379,13 +4379,13 @@ void DebugMenu_8078714() " bl DebugMenu_807860C\n" " cmp r0, #0\n" " beq ._453 @cond_branch\n" - " ldr r1, ._454\n" + " ldr r1, ._454 @ gTasks\n" " lsl r0, r4, #0x2\n" " add r0, r0, r4\n" " lsl r0, r0, #0x3\n" " add r0, r0, r1\n" " ldrb r2, [r0, #0xa]\n" - " ldr r1, ._454 + 4\n" + " ldr r1, ._454 + 4 @ gUnknown_Debug_839C26C\n" " lsl r0, r2, #0x3\n" " add r0, r0, r1\n" " ldr r0, [r0]\n" @@ -4433,7 +4433,7 @@ void DebugMenu_8078774() { asm( " push {lr}\n" - " ldr r0, ._456\n" + " ldr r0, ._456 @ DebugMenu_80786C0\n" " bl DebugMenu_8078758\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -4452,7 +4452,7 @@ void DebugMenu_8078788() { asm( " push {lr}\n" - " ldr r0, ._458\n" + " ldr r0, ._458 @ DebugMenu_80786D0\n" " bl DebugMenu_8078758\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -4471,7 +4471,7 @@ void DebugMenu_807879C() { asm( " push {lr}\n" - " ldr r0, ._460\n" + " ldr r0, ._460 @ DebugMenu_8078714\n" " bl DebugMenu_8078758\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -4490,7 +4490,7 @@ void DebugMenu_80787B0() { asm( " push {lr}\n" - " ldr r0, ._462\n" + " ldr r0, ._462 @ gUnknown_Debug_839C3FC\n" " bl DebugMenu_8077D78\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -4510,12 +4510,12 @@ u8 DebugMenu_OpenLegendsRecord() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r0, ._464\n" + " ldr r0, ._464 @ gUnknown_Debug_839C3FC\n" " mov r1, #0xc\n" " mov r2, #0x3\n" " bl DebugMenu_8077D24\n" - " ldr r1, ._464 + 4\n" - " ldr r0, ._464 + 8\n" + " ldr r1, ._464 + 4 @ gMenuCallback\n" + " ldr r0, ._464 + 8 @ DebugMenu_80787B0\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -4541,7 +4541,7 @@ void DebugMenu_80787EC() " mov r0, sp\n" " add r1, r5, #0\n" " bl GetXYCoordsOneStepInFrontOfPlayer\n" - " ldr r4, ._466\n" + " ldr r4, ._466 @ gSpecialVar_Result\n" " mov r0, sp\n" " mov r1, #0x0\n" " ldsh r0, [r0, r1]\n" @@ -4549,7 +4549,7 @@ void DebugMenu_80787EC() " ldsh r1, [r5, r2]\n" " bl MapGridGetMetatileBehaviorAt\n" " strh r0, [r4]\n" - " ldr r0, ._466 + 4\n" + " ldr r0, ._466 + 4 @ gStringVar1\n" " ldrh r1, [r4]\n" " mov r2, #0x2\n" " mov r3, #0x4\n" @@ -4561,7 +4561,7 @@ void DebugMenu_80787EC() " ldsh r1, [r5, r2]\n" " bl MapGridGetMetatileIdAt\n" " strh r0, [r4]\n" - " ldr r0, ._466 + 8\n" + " ldr r0, ._466 + 8 @ gStringVar2\n" " ldrh r1, [r4]\n" " mov r2, #0x2\n" " mov r3, #0x4\n" @@ -4575,13 +4575,13 @@ void DebugMenu_80787EC() " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" " strh r0, [r4]\n" - " ldr r0, ._466 + 12\n" + " ldr r0, ._466 + 12 @ gStringVar3\n" " ldrh r1, [r4]\n" " mov r2, #0x2\n" " mov r3, #0x4\n" " bl ConvertIntToHexStringN\n" - " ldr r0, ._466 + 16\n" - " ldr r1, ._466 + 20\n" + " ldr r0, ._466 + 16 @ gStringVar4\n" + " ldr r1, ._466 + 20 @ Str_839C414\n" " bl StringExpandPlaceholders\n" " add sp, sp, #0x4\n" " pop {r4, r5}\n" @@ -4607,7 +4607,7 @@ void DebugMenu_8078880() " push {r4, r5, lr}\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" - " ldr r1, ._472\n" + " ldr r1, ._472 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -4633,7 +4633,7 @@ void DebugMenu_8078880() " bl Menu_DisplayDialogueFrame\n" " b ._476\n" "._468:\n" - " ldr r0, ._478\n" + " ldr r0, ._478 @ gStringVar4\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" @@ -4647,7 +4647,7 @@ void DebugMenu_8078880() "._478:\n" " .word gStringVar4\n" "._474:\n" - " ldr r0, ._481\n" + " ldr r0, ._481 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -4675,7 +4675,7 @@ u8 DebugMenu_CellInfo() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._483\n" + " ldr r0, ._483 @ DebugMenu_8078880\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl DebugMenu_80787EC\n" @@ -4713,8 +4713,8 @@ u8 DebugMenu_OpenBerryInfo() " mov r1, #0x1\n" " mov r2, #0x1\n" " bl Menu_PrintText\n" - " ldr r1, ._487\n" - " ldr r0, ._487 + 4\n" + " ldr r1, ._487 @ gMenuCallback\n" + " ldr r0, ._487 + 4 @ DebugMenu_8077DB4\n" " str r0, [r1]\n" " mov r0, #0x0\n" "._486:\n" @@ -4736,7 +4736,7 @@ void DebugMenu_8078950() asm( " push {lr}\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._489\n" + " ldr r0, ._489 @ Str_839C42E\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" @@ -4758,7 +4758,7 @@ void DebugMenu_8078968() " lsl r0, r0, #0x10\n" " cmp r0, #0\n" " bne ._491 @cond_branch\n" - " ldr r0, ._493\n" + " ldr r0, ._493 @ gStringVar1\n" " mov r1, #0x32\n" " mov r2, #0x2\n" " mov r3, #0x3\n" @@ -4769,13 +4769,13 @@ void DebugMenu_8078968() "._493:\n" " .word gStringVar1\n" "._491:\n" - " ldr r0, ._495\n" + " ldr r0, ._495 @ gStringVar1\n" " mov r1, #0x64\n" " mov r2, #0x2\n" " mov r3, #0x3\n" " bl ConvertIntToDecimalStringN\n" "._492:\n" - " ldr r0, ._495\n" + " ldr r0, ._495 @ gStringVar1\n" " mov r1, #0x4\n" " mov r2, #0x11\n" " bl Menu_PrintText\n" @@ -4797,7 +4797,7 @@ void DebugMenu_80789A4() " add r1, r0, #0\n" " lsl r1, r1, #0x10\n" " lsr r1, r1, #0x10\n" - " ldr r4, ._497\n" + " ldr r4, ._497 @ gStringVar1\n" " add r0, r4, #0\n" " mov r2, #0x2\n" " mov r3, #0x4\n" @@ -4827,12 +4827,12 @@ void DebugMenu_80789CC() " lsl r4, r0, #0x2\n" " add r4, r4, r0\n" " lsl r4, r4, #0x3\n" - " ldr r6, ._499\n" + " ldr r6, ._499 @ gTasks\n" " add r5, r4, r6\n" " mov r0, #0x0\n" " strh r0, [r5]\n" - " ldr r0, ._499 + 4\n" - " ldr r1, ._499 + 8\n" + " ldr r0, ._499 + 4 @ gSaveBlock2\n" + " ldr r1, ._499 + 8 @ 0x55c\n" " add r0, r0, r1\n" " ldrh r0, [r0]\n" " strh r0, [r5, #0x2]\n" @@ -4841,7 +4841,7 @@ void DebugMenu_80789CC() " bl DebugMenu_8078968\n" " sub r6, r6, #0x8\n" " add r4, r4, r6\n" - " ldr r0, ._499 + 12\n" + " ldr r0, ._499 + 12 @ DebugMenu_8078A14\n" " str r0, [r4]\n" " pop {r4, r5, r6}\n" " pop {r0}\n" @@ -4867,9 +4867,9 @@ void DebugMenu_8078A14() " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r4, r1, #0x3\n" - " ldr r5, ._504\n" + " ldr r5, ._504 @ gTasks\n" " add r2, r4, r5\n" - " ldr r0, ._504 + 4\n" + " ldr r0, ._504 + 4 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0xc0\n" " and r0, r0, r1\n" @@ -4896,11 +4896,11 @@ void DebugMenu_8078A14() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._506 @cond_branch\n" - " ldr r1, ._508\n" + " ldr r1, ._508 @ gSaveBlock2\n" " mov r3, #0x0\n" " ldsh r0, [r2, r3]\n" " lsl r0, r0, #0x1\n" - " ldr r3, ._508 + 4\n" + " ldr r3, ._508 + 4 @ 0x55c\n" " add r1, r1, r3\n" " add r0, r0, r1\n" " ldrh r0, [r0]\n" @@ -4910,7 +4910,7 @@ void DebugMenu_8078A14() " add r0, r5, #0\n" " sub r0, r0, #0x8\n" " add r0, r4, r0\n" - " ldr r1, ._508 + 8\n" + " ldr r1, ._508 + 8 @ DebugMenu_8078AA4\n" " b ._507\n" "._509:\n" " .align 2, 0\n" @@ -4926,7 +4926,7 @@ void DebugMenu_8078A14() " add r0, r5, #0\n" " sub r0, r0, #0x8\n" " add r0, r4, r0\n" - " ldr r1, ._511\n" + " ldr r1, ._511 @ DebugMenu_8078B38\n" "._507:\n" " str r1, [r0]\n" "._510:\n" @@ -4951,12 +4951,12 @@ void DebugMenu_8078AA4() " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r5, r1, #0x3\n" - " ldr r7, ._515\n" + " ldr r7, ._515 @ gTasks\n" " add r4, r5, r7\n" " add r0, r4, #2\n" " mov r2, #0xfa\n" " lsl r2, r2, #0x3\n" - " ldr r6, ._515 + 4\n" + " ldr r6, ._515 + 4 @ gMain\n" " ldrh r3, [r6, #0x30]\n" " mov r1, #0x0\n" " bl DebugMenu_8077DD8\n" @@ -4976,11 +4976,11 @@ void DebugMenu_8078AA4() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._517 @cond_branch\n" - " ldr r1, ._519\n" + " ldr r1, ._519 @ gSaveBlock2\n" " mov r2, #0x0\n" " ldsh r0, [r4, r2]\n" " lsl r0, r0, #0x1\n" - " ldr r2, ._519 + 4\n" + " ldr r2, ._519 + 4 @ 0x55c\n" " add r1, r1, r2\n" " add r0, r0, r1\n" " ldrh r1, [r4, #0x2]\n" @@ -4990,7 +4990,7 @@ void DebugMenu_8078AA4() " add r0, r7, #0\n" " sub r0, r0, #0x8\n" " add r0, r5, r0\n" - " ldr r1, ._519 + 8\n" + " ldr r1, ._519 + 8 @ DebugMenu_8078B38\n" " b ._518\n" "._520:\n" " .align 2, 0\n" @@ -5009,7 +5009,7 @@ void DebugMenu_8078AA4() " add r0, r7, #0\n" " sub r0, r0, #0x8\n" " add r0, r5, r0\n" - " ldr r1, ._522\n" + " ldr r1, ._522 @ DebugMenu_8078A14\n" "._518:\n" " str r1, [r0]\n" "._521:\n" @@ -5050,7 +5050,7 @@ u8 DebugMenu_BattleTowerStages() " push {lr}\n" " bl CloseMenu\n" " bl ScriptContext2_Enable\n" - " ldr r0, ._524\n" + " ldr r0, ._524 @ DebugMenu_80789CC\n" " mov r1, #0x50\n" " bl CreateTask\n" " mov r0, #0x1\n" @@ -5072,11 +5072,11 @@ void DebugMenu_8078B70() " add r1, r0, #0\n" " lsl r1, r1, #0x10\n" " lsr r1, r1, #0x10\n" - " ldr r0, ._526\n" + " ldr r0, ._526 @ gStringVar1\n" " mov r2, #0x0\n" " mov r3, #0x1\n" " bl ConvertIntToHexStringN\n" - " ldr r0, ._526 + 4\n" + " ldr r0, ._526 + 4 @ Str_839C438\n" " bl sub_8071F40\n" " pop {r0}\n" " bx r0\n" @@ -5095,11 +5095,11 @@ void DebugMenu_8078B94() asm( " push {r4, r5, lr}\n" " mov r3, #0x0\n" - " ldr r1, ._531\n" + " ldr r1, ._531 @ gUnknown_Debug_839C444\n" " ldrb r0, [r1]\n" " cmp r0, #0\n" " beq ._529 @cond_branch\n" - " ldr r5, ._531 + 4\n" + " ldr r5, ._531 + 4 @ gSaveBlock1\n" " add r4, r1, #0\n" "._530:\n" " lsl r0, r3, #0x3\n" @@ -5142,7 +5142,7 @@ void DebugMenu_8078BD4() " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" - " ldr r1, ._536\n" + " ldr r1, ._536 @ gTasks\n" " add r4, r0, r1\n" " mov r1, #0x0\n" " ldsh r0, [r4, r1]\n" @@ -5163,7 +5163,7 @@ void DebugMenu_8078BD4() " strh r0, [r4]\n" " b ._545\n" "._534:\n" - " ldr r2, ._541\n" + " ldr r2, ._541 @ gMain\n" " ldrh r1, [r2, #0x2e]\n" " and r0, r0, r1\n" " cmp r0, #0\n" @@ -5214,7 +5214,7 @@ u8 DebugMenu_CheckPKBLCK() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._546\n" + " ldr r0, ._546 @ DebugMenu_8078BD4\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" @@ -5235,12 +5235,12 @@ void DebugMenu_8078C80() asm( " push {lr}\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._548\n" + " ldr r0, ._548 @ Str_839C5A4\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" - " ldr r1, ._548 + 4\n" - " ldr r0, ._548 + 8\n" + " ldr r1, ._548 + 4 @ gMenuCallback\n" + " ldr r0, ._548 + 8 @ DebugMenu_8078CA8\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -5260,14 +5260,14 @@ void DebugMenu_8078CA8() { asm( " push {lr}\n" - " ldr r0, ._552\n" + " ldr r0, ._552 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._550 @cond_branch\n" - " ldr r1, ._552 + 4\n" - " ldr r0, ._552 + 8\n" + " ldr r1, ._552 + 4 @ gMenuCallback\n" + " ldr r0, ._552 + 8 @ DebugMenu_8078CE4\n" " str r0, [r1]\n" " mov r0, #0x0\n" " b ._555\n" @@ -5299,15 +5299,15 @@ void DebugMenu_8078CE4() { asm( " push {lr}\n" - " ldr r1, ._558\n" + " ldr r1, ._558 @ \n" " mov r2, #0x80\n" " lsl r2, r2, #0xa\n" " mov r0, #0x0\n" " bl DebugMenu_8078E40\n" " cmp r0, #0x1\n" " bne ._556 @cond_branch\n" - " ldr r0, ._558 + 4\n" - " ldr r1, ._558 + 8\n" + " ldr r0, ._558 + 4 @ \n" + " ldr r1, ._558 + 8 @ \n" " bl StringCopy\n" " b ._557\n" "._559:\n" @@ -5317,12 +5317,12 @@ void DebugMenu_8078CE4() " .word gStringVar4\n" " .word Str_839C5CC\n" "._556:\n" - " ldr r0, ._560\n" - " ldr r1, ._560 + 4\n" + " ldr r0, ._560 @ gStringVar4\n" + " ldr r1, ._560 + 4 @ Str_839C5DF\n" " bl StringCopy\n" "._557:\n" - " ldr r1, ._560 + 8\n" - " ldr r0, ._560 + 12\n" + " ldr r1, ._560 + 8 @ gMenuCallback\n" + " ldr r0, ._560 + 12 @ DebugMenu_8078D7C\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -5343,7 +5343,7 @@ void DebugMenu_8078D30() { asm( " push {r4, r5, r6, lr}\n" - " ldr r5, ._563\n" + " ldr r5, ._563 @ \n" " mov r4, #0x0\n" " mov r6, #0x80\n" " lsl r6, r6, #0x5\n" @@ -5358,11 +5358,11 @@ void DebugMenu_8078D30() " lsr r4, r0, #0x18\n" " cmp r4, #0x1f\n" " bls ._562 @cond_branch\n" - " ldr r0, ._563 + 4\n" - " ldr r1, ._563 + 8\n" + " ldr r0, ._563 + 4 @ \n" + " ldr r1, ._563 + 8 @ \n" " bl StringCopy\n" - " ldr r1, ._563 + 12\n" - " ldr r0, ._563 + 16\n" + " ldr r1, ._563 + 12 @ \n" + " ldr r0, ._563 + 16 @ \n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r4, r5, r6}\n" @@ -5386,12 +5386,12 @@ void DebugMenu_8078D7C() asm( " push {lr}\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._565\n" + " ldr r0, ._565 @ gStringVar4\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" - " ldr r1, ._565 + 4\n" - " ldr r0, ._565 + 8\n" + " ldr r1, ._565 + 4 @ gMenuCallback\n" + " ldr r0, ._565 + 8 @ DebugMenu_8078DA4\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -5411,7 +5411,7 @@ void DebugMenu_8078DA4() { asm( " push {lr}\n" - " ldr r0, ._569\n" + " ldr r0, ._569 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -5439,12 +5439,12 @@ u8 DebugMenu_MeTooBackupMan() asm( " push {lr}\n" " bl Menu_EraseScreen\n" - " ldr r0, ._571\n" + " ldr r0, ._571 @ gUnknown_Debug_839C594\n" " mov r1, #0xc\n" " mov r2, #0x2\n" " bl DebugMenu_8077D24\n" - " ldr r1, ._571 + 4\n" - " ldr r0, ._571 + 8\n" + " ldr r1, ._571 + 4 @ gMenuCallback\n" + " ldr r0, ._571 + 8 @ DebugMenu_8078DF0\n" " str r0, [r1]\n" " mov r0, #0x0\n" " pop {r1}\n" @@ -5464,7 +5464,7 @@ void DebugMenu_8078DF0() { asm( " push {lr}\n" - " ldr r0, ._573\n" + " ldr r0, ._573 @ gUnknown_Debug_839C594\n" " bl DebugMenu_8077D78\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" @@ -5487,7 +5487,7 @@ void DebugMenu_8078E04() " add r5, r2, #0\n" " b ._575\n" "._577:\n" - " ldr r0, ._579\n" + " ldr r0, ._579 @ 0xfffff000\n" " add r5, r5, r0\n" " mov r0, #0x80\n" " lsl r0, r0, #0x5\n" @@ -5576,7 +5576,7 @@ void DebugMenu_8078E80() " mov r2, #0x16\n" " mov r3, #0x10\n" " bl Menu_BlankWindowRect\n" - " ldr r1, ._581\n" + " ldr r1, ._581 @ gUnknown_Debug_839C5F4\n" " mov r2, #0x0\n" " ldsh r0, [r4, r2]\n" " lsl r0, r0, #0x3\n" @@ -5602,7 +5602,7 @@ void DebugMenu_8078EB0() asm( " push {r4, r5, lr}\n" " add r5, r0, #0\n" - " ldr r4, ._583\n" + " ldr r4, ._583 @ gStringVar1\n" " mov r0, #0x2\n" " ldsh r1, [r5, r0]\n" " add r0, r4, #0\n" @@ -5662,11 +5662,11 @@ void DebugMenu_8078F1C() " lsl r4, r0, #0x2\n" " add r4, r4, r0\n" " lsl r4, r4, #0x3\n" - " ldr r6, ._585\n" + " ldr r6, ._585 @ gTasks\n" " add r5, r4, r6\n" " mov r0, #0x0\n" " strh r0, [r5]\n" - " ldr r1, ._585 + 4\n" + " ldr r1, ._585 + 4 @ gSaveBlock2\n" " ldrh r0, [r1, #0xe]\n" " strh r0, [r5, #0x2]\n" " ldrb r0, [r1, #0x10]\n" @@ -5680,7 +5680,7 @@ void DebugMenu_8078F1C() " bl DebugMenu_8078E80\n" " sub r6, r6, #0x8\n" " add r4, r4, r6\n" - " ldr r0, ._585 + 8\n" + " ldr r0, ._585 + 8 @ DebugMenu_8078F68\n" " str r0, [r4]\n" " pop {r4, r5, r6}\n" " pop {r0}\n" @@ -5705,15 +5705,15 @@ void DebugMenu_8078F68() " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r5, r1, #0x3\n" - " ldr r6, ._589\n" + " ldr r6, ._589 @ gTasks\n" " add r4, r5, r6\n" - " ldr r3, ._589 + 4\n" + " ldr r3, ._589 + 4 @ gMain\n" " ldrh r1, [r3, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._587 @cond_branch\n" - " ldr r1, ._589 + 8\n" + " ldr r1, ._589 + 8 @ gSaveBlock2\n" " ldrh r0, [r4, #0x2]\n" " strh r0, [r1, #0xe]\n" " ldrh r0, [r4, #0x4]\n" @@ -5738,7 +5738,7 @@ void DebugMenu_8078F68() " add r0, r6, #0\n" " sub r0, r0, #0x8\n" " add r0, r5, r0\n" - " ldr r1, ._593\n" + " ldr r1, ._593 @ DebugMenu_8079020\n" " str r1, [r0]\n" " b ._601\n" "._594:\n" @@ -5775,7 +5775,7 @@ void DebugMenu_8078F68() " mov r0, #0x0\n" " ldsh r2, [r4, r0]\n" " lsl r2, r2, #0x3\n" - " ldr r0, ._602\n" + " ldr r0, ._602 @ gUnknown_Debug_839C5F4\n" " add r2, r2, r0\n" " ldrb r0, [r2, #0x5]\n" " lsl r0, r0, #0x1\n" @@ -5825,7 +5825,7 @@ u8 DebugMenu_PTime() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._604\n" + " ldr r0, ._604 @ DebugMenu_8078F1C\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" @@ -5847,7 +5847,7 @@ void DebugMenu_8079058() " push {r4, r5, lr}\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" - " ldr r1, ._610\n" + " ldr r1, ._610 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -5870,7 +5870,7 @@ void DebugMenu_8079058() " beq ._612 @cond_branch\n" " b ._620\n" "._608:\n" - " ldr r0, ._615\n" + " ldr r0, ._615 @ gUnknown_Debug_03004BD0\n" " str r1, [r0]\n" " bl Menu_DisplayDialogueFrame\n" " b ._614\n" @@ -5879,7 +5879,7 @@ void DebugMenu_8079058() "._615:\n" " .word gUnknown_Debug_03004BD0\n" "._606:\n" - " ldr r0, ._618\n" + " ldr r0, ._618 @ gDebug0x839C60C\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" @@ -5906,7 +5906,7 @@ void DebugMenu_8079058() " beq ._620 @cond_branch\n" " cmp r1, #0\n" " bne ._621 @cond_branch\n" - " ldr r1, ._623\n" + " ldr r1, ._623 @ gUnknown_Debug_03004BD0\n" " mov r0, #0x1\n" " b ._622\n" "._624:\n" @@ -5914,7 +5914,7 @@ void DebugMenu_8079058() "._623:\n" " .word gUnknown_Debug_03004BD0\n" "._621:\n" - " ldr r1, ._625\n" + " ldr r1, ._625 @ gUnknown_Debug_03004BD0\n" " mov r0, #0x0\n" "._622:\n" " str r0, [r1]\n" @@ -5940,7 +5940,7 @@ u8 DebugMenu_OpenMurakawa() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._627\n" + " ldr r0, ._627 @ DebugMenu_8079058\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" @@ -5962,7 +5962,7 @@ void DebugMenu_8079110() " push {r4, r5, lr}\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" - " ldr r1, ._633\n" + " ldr r1, ._633 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -5988,7 +5988,7 @@ void DebugMenu_8079110() " bl Menu_DisplayDialogueFrame\n" " b ._637\n" "._629:\n" - " ldr r0, ._639\n" + " ldr r0, ._639 @ Str_839C61A\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl MenuPrintMessage\n" @@ -6006,7 +6006,7 @@ void DebugMenu_8079110() " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " beq ._642 @cond_branch\n" - " ldr r0, ._643\n" + " ldr r0, ._643 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -6034,7 +6034,7 @@ u8 DebugMenu_OpenKiwa() asm( " push {lr}\n" " bl CloseMenu\n" - " ldr r0, ._645\n" + " ldr r0, ._645 @ DebugMenu_8079110\n" " mov r1, #0x50\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index c656b2203..ff73e638e 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -104,7 +104,7 @@ int debug_sub_808A4D0() asm("\ push {lr}\n\ add r1, r0, #0\n\ - ldr r0, ._3\n\ + ldr r0, ._3 @ sub_8082F68\n\ cmp r1, r0\n\ bne ._1 @cond_branch\n\ mov r0, #0x1\n\ @@ -114,7 +114,7 @@ int debug_sub_808A4D0() ._3:\n\ .word sub_8082F68+1\n\ ._1:\n\ - ldr r0, ._7\n\ + ldr r0, ._7 @ sub_8082FEC\n\ cmp r1, r0\n\ bne ._5 @cond_branch\n\ mov r0, #0x11\n\ @@ -124,7 +124,7 @@ int debug_sub_808A4D0() ._7:\n\ .word sub_8082FEC+1\n\ ._5:\n\ - ldr r0, ._11\n\ + ldr r0, ._11 @ sub_808303C\n\ cmp r1, r0\n\ bne ._9 @cond_branch\n\ mov r0, #0x12\n\ @@ -134,7 +134,7 @@ int debug_sub_808A4D0() ._11:\n\ .word sub_808303C+1\n\ ._9:\n\ - ldr r0, ._15\n\ + ldr r0, ._15 @ sub_8083188\n\ cmp r1, r0\n\ bne ._13 @cond_branch\n\ mov r0, #0x13\n\ @@ -144,7 +144,7 @@ int debug_sub_808A4D0() ._15:\n\ .word sub_8083188+1\n\ ._13:\n\ - ldr r0, ._19\n\ + ldr r0, ._19 @ sub_80830E4\n\ cmp r1, r0\n\ bne ._17 @cond_branch\n\ mov r0, #0x14\n\ @@ -154,7 +154,7 @@ int debug_sub_808A4D0() ._19:\n\ .word sub_80830E4+1\n\ ._17:\n\ - ldr r0, ._23\n\ + ldr r0, ._23 @ sub_80831F8\n\ cmp r1, r0\n\ bne ._21 @cond_branch\n\ mov r0, #0x21\n\ @@ -164,7 +164,7 @@ int debug_sub_808A4D0() ._23:\n\ .word sub_80831F8+1\n\ ._21:\n\ - ldr r0, ._27\n\ + ldr r0, ._27 @ sub_8083314\n\ cmp r1, r0\n\ bne ._25 @cond_branch\n\ mov r0, #0x2\n\ @@ -174,7 +174,7 @@ int debug_sub_808A4D0() ._27:\n\ .word sub_8083314+1\n\ ._25:\n\ - ldr r0, ._31\n\ + ldr r0, ._31 @ sub_80833C4\n\ cmp r1, r0\n\ beq ._29 @cond_branch\n\ mov r0, #0x0\n\ @@ -199,7 +199,7 @@ void debug_sub_808A55C() push {r7}\n\ lsl r0, r0, #0x18\n\ lsr r7, r0, #0x18\n\ - ldr r2, ._37\n\ + ldr r2, ._37 @ gTasks\n\ lsl r0, r7, #0x2\n\ add r0, r0, r7\n\ lsl r0, r0, #0x3\n\ @@ -224,13 +224,13 @@ void debug_sub_808A55C() add r0, r0, #0x1\n\ strh r0, [r4, #0xa]\n\ ._33:\n\ - ldr r0, ._37 + 4\n\ + ldr r0, ._37 + 4 @ gShouldAdvanceLinkState\n\ ldrb r0, [r0]\n\ mov r1, #0x2\n\ mov r2, #0x0\n\ mov r3, #0x2\n\ bl PrintHex\n\ - ldr r0, ._37 + 8\n\ + ldr r0, ._37 + 8 @ gBlockSendBuffer\n\ ldrb r0, [r0]\n\ mov r1, #0x16\n\ mov r2, #0x5\n\ @@ -244,14 +244,14 @@ void debug_sub_808A55C() mov r5, #0xa0\n\ lsl r5, r5, #0x13\n\ ._35:\n\ - ldr r0, ._37 + 12\n\ + ldr r0, ._37 + 12 @ gLinkPlayerPending\n\ add r0, r4, r0\n\ ldrb r0, [r0]\n\ lsr r1, r5, #0x18\n\ mov r2, #0x0\n\ mov r3, #0x1\n\ bl PrintHex\n\ - ldr r1, ._37 + 16\n\ + ldr r1, ._37 + 16 @ gBlockRecvBuffer\n\ lsl r0, r4, #0x8\n\ add r0, r0, r1\n\ ldrh r0, [r0]\n\ @@ -268,13 +268,13 @@ void debug_sub_808A55C() add r4, r4, #0x1\n\ cmp r4, #0x3\n\ ble ._35 @cond_branch\n\ - ldr r4, ._37 + 20\n\ + ldr r4, ._37 + 20 @ gLinkStatus\n\ ldr r0, [r4]\n\ mov r1, #0xf\n\ mov r2, #0x0\n\ mov r3, #0x8\n\ bl PrintHex\n\ - ldr r0, ._37 + 24\n\ + ldr r0, ._37 + 24 @ gLink\n\ ldrb r0, [r0, #0x1]\n\ mov r1, #0x2\n\ mov r2, #0xa\n\ @@ -294,13 +294,13 @@ void debug_sub_808A55C() mov r2, #0xa\n\ mov r3, #0x2\n\ bl PrintHex\n\ - ldr r0, ._37 + 28\n\ + ldr r0, ._37 + 28 @ gReceivedRemoteLinkPlayers\n\ ldrb r0, [r0]\n\ mov r1, #0x2\n\ mov r2, #0xc\n\ mov r3, #0x1\n\ bl PrintHex\n\ - ldr r0, ._37 + 32\n\ + ldr r0, ._37 + 32 @ gSpecialVar_Result\n\ ldrh r0, [r0]\n\ mov r1, #0xb\n\ mov r2, #0x8\n\ @@ -328,7 +328,7 @@ void debug_sub_808A55C() mov r2, #0xa\n\ mov r3, #0x1\n\ bl PrintHex\n\ - ldr r2, ._37\n\ + ldr r2, ._37 @ gTasks\n\ mov r3, r8\n\ add r0, r3, r7\n\ lsl r0, r0, #0x3\n\ @@ -347,7 +347,7 @@ void debug_sub_808A55C() mov r2, #0xc\n\ mov r3, #0x2\n\ bl PrintHex\n\ - ldr r0, ._37 + 36\n\ + ldr r0, ._37 + 36 @ gLinkCallback\n\ ldr r0, [r0]\n\ mov r1, #0x2\n\ mov r2, #0xd\n\ @@ -360,7 +360,7 @@ void debug_sub_808A55C() mov r2, #0x2\n\ mov r3, #0x1\n\ bl PrintHex\n\ - ldr r0, ._37 + 40\n\ + ldr r0, ._37 + 40 @ gLinkPlayers\n\ mov r6, #0x80\n\ lsl r6, r6, #0x12\n\ add r5, r0, #0\n\ @@ -379,7 +379,7 @@ void debug_sub_808A55C() sub r4, r4, #0x1\n\ cmp r4, #0\n\ bge ._36 @cond_branch\n\ - ldr r0, ._37 + 44\n\ + ldr r0, ._37 + 44 @ 0x4000128\n\ ldrh r0, [r0]\n\ mov r1, #0x2\n\ mov r2, #0x6\n\ @@ -430,7 +430,7 @@ static void sub_8082CD4(u8 arg0, u8 arg1) mov r2, #0x1f\n\ mov r3, #0x2\n\ bl InitLinkTestBG_Unused\n\ - ldr r4, ._40\n\ + ldr r4, ._40 @ sub_8082F20\n\ add r0, r4, #0\n\ bl FindTaskIdByFunc\n\ lsl r0, r0, #0x18\n\ @@ -443,14 +443,14 @@ static void sub_8082CD4(u8 arg0, u8 arg1) add r4, r0, #0\n\ lsl r4, r4, #0x18\n\ lsr r4, r4, #0x18\n\ - ldr r5, ._40 + 4\n\ + ldr r5, ._40 + 4 @ gTasks\n\ lsl r0, r4, #0x2\n\ add r0, r0, r4\n\ lsl r0, r0, #0x3\n\ add r0, r0, r5\n\ strh r7, [r0, #0xa]\n\ strh r6, [r0, #0xc]\n\ - ldr r0, ._40 + 8\n\ + ldr r0, ._40 + 8 @ debug_sub_808A55C\n\ mov r1, #0x50\n\ bl CreateTask\n\ lsl r0, r0, #0x18\n\ @@ -1297,7 +1297,7 @@ void debug_sub_808B778() { asm("\ push {r4, lr}\n\ - ldr r4, ._390\n\ + ldr r4, ._390 @ debug_sub_808B7A8\n\ add r0, r4, #0\n\ bl FuncIsActiveTask\n\ lsl r0, r0, #0x18\n\ @@ -1307,7 +1307,7 @@ void debug_sub_808B778() mov r1, #0x50\n\ bl CreateTask\n\ ._389:\n\ - ldr r1, ._390 + 4\n\ + ldr r1, ._390 + 4 @ unk_3004E98\n\ ldr r0, [r1]\n\ add r0, r0, #0x1\n\ str r0, [r1]\n\ @@ -1328,7 +1328,7 @@ void debug_sub_808B7A8() push {lr}\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x18\n\ - ldr r2, ._393\n\ + ldr r2, ._393 @ gTasks\n\ lsl r1, r0, #0x2\n\ add r1, r1, r0\n\ lsl r1, r1, #0x3\n\ @@ -1342,7 +1342,7 @@ void debug_sub_808B7A8() bne ._392 @cond_branch\n\ mov r0, #0x0\n\ strh r0, [r1, #0x8]\n\ - ldr r2, ._393 + 4\n\ + ldr r2, ._393 + 4 @ unk_3004E94\n\ ldrh r0, [r2]\n\ mov r1, #0x1\n\ orr r0, r0, r1\n\ diff --git a/src/engine/link.c b/src/engine/link.c index 8888f22f5..00c084069 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -1050,7 +1050,7 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0) " add r6, r1, #0\n" " add r4, r3, #0\n" " ldr r0, [sp, #0x38]\n" - " ldr r1, ._347\n" + " ldr r1, ._347 @ unk_20238D0\n" " ldr r1, [r1]\n" " cmp r1, r0\n" " bne ._345 @cond_branch\n" @@ -1059,7 +1059,7 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0) " mov r4, #0x8\n" "._342:\n" " mov r3, sp\n" - " ldr r0, ._347 + 4\n" + " ldr r0, ._347 + 4 @ debugTileMap\n" " mov r8, r0\n" " lsl r2, r2, #0x6\n" " mov ip, r2\n" @@ -1087,8 +1087,8 @@ void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0) " sub r3, r0, #4\n" " cmp r4, #0\n" " ble ._345 @cond_branch\n" - " ldr r7, ._347 + 8\n" - " ldr r6, ._347 + 12\n" + " ldr r7, ._347 + 8 @ debugCharacterBase\n" + " ldr r6, ._347 + 12 @ unk_20238C8\n" " add r2, r4, #0\n" "._346:\n" " ldr r1, [r7]\n" diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index 116b60477..bc14c760d 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -350,7 +350,7 @@ void debug_sub_815D04C() " push {r4, r5, r6, lr}\n" " lsl r0, r0, #0x18\n" " lsr r5, r0, #0x18\n" - " ldr r1, ._125\n" + " ldr r1, ._125 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -364,7 +364,7 @@ void debug_sub_815D04C() " mov r2, #0xd\n" " mov r3, #0x7\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r1, ._125 + 4\n" + " ldr r1, ._125 + 4 @ gUnknown_Debug_842E2D0\n" " mov r2, #0xa\n" " ldsh r0, [r4, r2]\n" " lsl r0, r0, #0x3\n" @@ -377,7 +377,7 @@ void debug_sub_815D04C() " add r0, r0, #0x1\n" " strh r0, [r4, #0x8]\n" "._121:\n" - " ldr r2, ._125 + 8\n" + " ldr r2, ._125 + 8 @ gMain\n" " ldrh r1, [r2, #0x2e]\n" " mov r0, #0x20\n" " and r0, r0, r1\n" @@ -389,7 +389,7 @@ void debug_sub_815D04C() " ldsh r0, [r4, r2]\n" " cmp r0, #0\n" " bne ._123 @cond_branch\n" - " ldr r0, ._125 + 12\n" + " ldr r0, ._125 + 12 @ gUnknown_Debug_842E350\n" " ldrb r0, [r0]\n" " sub r0, r0, #0x1\n" " b ._124\n" @@ -404,7 +404,7 @@ void debug_sub_815D04C() " sub r0, r1, #1\n" "._124:\n" " strh r0, [r4, #0xa]\n" - " ldr r0, ._130\n" + " ldr r0, ._130 @ gTasks\n" " lsl r1, r5, #0x2\n" " add r1, r1, r5\n" " lsl r1, r1, #0x3\n" @@ -417,14 +417,14 @@ void debug_sub_815D04C() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._127 @cond_branch\n" - " ldr r1, ._130\n" + " ldr r1, ._130 @ gTasks\n" " lsl r2, r5, #0x2\n" " add r0, r2, r5\n" " lsl r0, r0, #0x3\n" " add r4, r0, r1\n" " mov r0, #0xa\n" " ldsh r3, [r4, r0]\n" - " ldr r0, ._130 + 4\n" + " ldr r0, ._130 + 4 @ gUnknown_Debug_842E350\n" " ldrb r0, [r0]\n" " sub r0, r0, #0x1\n" " cmp r3, r0\n" @@ -452,7 +452,7 @@ void debug_sub_815D04C() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._132 @cond_branch\n" - " ldr r1, ._133\n" + " ldr r1, ._133 @ gTasks\n" " lsl r0, r5, #0x2\n" " add r0, r0, r5\n" " lsl r0, r0, #0x3\n" @@ -460,13 +460,13 @@ void debug_sub_815D04C() " mov r2, #0xa\n" " ldsh r1, [r0, r2]\n" " lsl r1, r1, #0x3\n" - " ldr r0, ._133 + 4\n" + " ldr r0, ._133 + 4 @ gUnknown_Debug_842E2D0\n" " add r0, r0, #0x4\n" " add r1, r1, r0\n" - " ldr r0, ._133 + 8\n" + " ldr r0, ._133 + 8 @ \n" " ldr r1, [r1]\n" " bl _call_via_r1\n" - " ldr r0, ._133 + 12\n" + " ldr r0, ._133 + 12 @ \n" " add r1, r6, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" @@ -516,8 +516,8 @@ void debug_sub_815D1D8() asm( " push {r4, lr}\n" " add sp, sp, #0xfffffffc\n" - " ldr r1, ._139\n" - " ldr r2, ._139 + 4\n" + " ldr r1, ._139 @ gMain\n" + " ldr r2, ._139 + 4 @ 0x43c\n" " add r0, r1, r2\n" " ldrb r0, [r0]\n" " add r4, r1, #0\n" @@ -526,7 +526,7 @@ void debug_sub_815D1D8() " b ._196\n" "._137:\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._139 + 8\n" + " ldr r1, ._139 + 8 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -562,8 +562,8 @@ void debug_sub_815D1D8() " mov r2, #0x10\n" " mov r3, #0x0\n" " bl BeginNormalPaletteFade\n" - " ldr r1, ._155\n" - " ldr r0, ._155 + 4\n" + " ldr r1, ._155 @ gMain\n" + " ldr r0, ._155 + 4 @ 0x43c\n" " add r1, r1, r0\n" " b ._189\n" "._156:\n" @@ -572,7 +572,7 @@ void debug_sub_815D1D8() " .word gMain\n" " .word 0x43c\n" "._143:\n" - " ldr r0, ._161\n" + " ldr r0, ._161 @ gPaletteFade\n" " ldrb r1, [r0, #0x7]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" @@ -586,16 +586,16 @@ void debug_sub_815D1D8() " and r0, r0, r1\n" " cmp r0, #0\n" " beq ._159 @cond_branch\n" - " ldr r1, ._161 + 4\n" + " ldr r1, ._161 + 4 @ gUnknown_Debug_30030E0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" "._159:\n" - " ldr r0, ._161 + 8\n" + " ldr r0, ._161 + 8 @ Str_843DA70\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl MenuPrintMessage\n" - " ldr r2, ._161 + 12\n" + " ldr r2, ._161 + 12 @ 0x43c\n" " add r1, r4, r2\n" " b ._189\n" "._162:\n" @@ -612,14 +612,14 @@ void debug_sub_815D1D8() " bne ._163 @cond_branch\n" " b ._196\n" "._163:\n" - " ldr r1, ._166\n" - " ldr r0, ._166 + 4\n" + " ldr r1, ._166 @ gMain\n" + " ldr r0, ._166 + 4 @ 0x43c\n" " add r1, r1, r0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" - " ldr r1, ._166 + 8\n" - " ldr r2, ._166 + 12\n" + " ldr r1, ._166 + 8 @ gLinkType\n" + " ldr r2, ._166 + 12 @ 0x5501\n" " add r0, r2, #0\n" " strh r0, [r1]\n" " bl OpenLink\n" @@ -632,18 +632,18 @@ void debug_sub_815D1D8() " .word gLinkType\n" " .word 0x5501\n" "._145:\n" - " ldr r0, ._171\n" + " ldr r0, ._171 @ gReceivedRemoteLinkPlayers\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " bne ._168 @cond_branch\n" " b ._196\n" "._168:\n" - " ldr r1, ._171 + 4\n" + " ldr r1, ._171 + 4 @ 0x43c\n" " add r0, r4, r1\n" " ldrb r1, [r0]\n" " add r1, r1, #0x1\n" " strb r1, [r0]\n" - " ldr r0, ._171 + 8\n" + " ldr r0, ._171 + 8 @ Str_843DA84\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl MenuPrintMessage\n" @@ -661,11 +661,11 @@ void debug_sub_815D1D8() " bne ._173 @cond_branch\n" " b ._196\n" "._173:\n" - " ldr r0, ._176\n" + " ldr r0, ._176 @ debug_sub_815D04C\n" " mov r1, #0xa\n" " bl CreateTask\n" - " ldr r1, ._176 + 4\n" - " ldr r2, ._176 + 8\n" + " ldr r1, ._176 + 4 @ gMain\n" + " ldr r2, ._176 + 8 @ 0x43c\n" " add r1, r1, r2\n" " b ._189\n" "._177:\n" @@ -675,16 +675,16 @@ void debug_sub_815D1D8() " .word gMain\n" " .word 0x43c\n" "._148:\n" - " ldr r0, ._179\n" + " ldr r0, ._179 @ Str_843DA98\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl MenuPrintMessage\n" - " ldr r1, ._179 + 4\n" - " ldr r2, ._179 + 8\n" + " ldr r1, ._179 + 4 @ 0x2004000\n" + " ldr r2, ._179 + 8 @ 0x2004\n" " mov r0, #0x0\n" " bl SendBlock\n" - " ldr r1, ._179 + 12\n" - " ldr r0, ._179 + 16\n" + " ldr r1, ._179 + 12 @ gMain\n" + " ldr r0, ._179 + 16 @ 0x43c\n" " add r1, r1, r0\n" " b ._189\n" "._180:\n" @@ -701,8 +701,8 @@ void debug_sub_815D1D8() " lsl r0, r0, #0x18\n" " cmp r0, #0\n" " beq ._196 @cond_branch\n" - " ldr r1, ._183\n" - " ldr r2, ._183 + 4\n" + " ldr r1, ._183 @ gMain\n" + " ldr r2, ._183 + 4 @ 0x43c\n" " add r1, r1, r2\n" " b ._189\n" "._184:\n" @@ -712,8 +712,8 @@ void debug_sub_815D1D8() " .word 0x43c\n" "._150:\n" " bl sub_800832C\n" - " ldr r1, ._186\n" - " ldr r0, ._186 + 4\n" + " ldr r1, ._186 @ gMain\n" + " ldr r0, ._186 + 4 @ 0x43c\n" " add r1, r1, r0\n" " b ._189\n" "._187:\n" @@ -722,7 +722,7 @@ void debug_sub_815D1D8() " .word gMain\n" " .word 0x43c\n" "._151:\n" - " ldr r0, ._190\n" + " ldr r0, ._190 @ gReceivedRemoteLinkPlayers\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " bne ._196 @cond_branch\n" @@ -731,12 +731,12 @@ void debug_sub_815D1D8() " mov r2, #0x1a\n" " mov r3, #0x12\n" " bl Menu_BlankWindowRect\n" - " ldr r0, ._190 + 4\n" + " ldr r0, ._190 + 4 @ Str_843DAA3\n" " mov r1, #0x4\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" - " ldr r1, ._190 + 8\n" - " ldr r2, ._190 + 12\n" + " ldr r1, ._190 + 8 @ gMain\n" + " ldr r2, ._190 + 12 @ 0x43c\n" " add r1, r1, r2\n" " b ._189\n" "._191:\n" @@ -759,7 +759,7 @@ void debug_sub_815D1D8() " mov r2, #0x0\n" " mov r3, #0x10\n" " bl BeginNormalPaletteFade\n" - " ldr r0, ._194\n" + " ldr r0, ._194 @ 0x43c\n" " add r1, r4, r0\n" "._189:\n" " ldrb r0, [r1]\n" @@ -771,13 +771,13 @@ void debug_sub_815D1D8() "._194:\n" " .word 0x43c\n" "._153:\n" - " ldr r0, ._197\n" + " ldr r0, ._197 @ gPaletteFade\n" " ldrb r1, [r0, #0x7]\n" " mov r0, #0x80\n" " and r0, r0, r1\n" " cmp r0, #0\n" " bne ._196 @cond_branch\n" - " ldr r0, ._197 + 4\n" + " ldr r0, ._197 + 4 @ CB2_InitTitleScreen\n" " bl SetMainCallback2\n" "._196:\n" " bl RunTasks\n" diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 9324ea1c1..8b67f39a5 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -602,7 +602,7 @@ void debug_sub_806F8F8(void) { asm("\ push {lr}\n\ - ldr r0, ._131\n\ + ldr r0, ._131 @ CB2_InitResetRtcScreen\n\ bl SetMainCallback2\n\ pop {r0}\n\ bx r0\n\ @@ -622,7 +622,7 @@ void debug_sub_806F908(u8 a) lsl r0, r5, #0x2\n\ add r0, r0, r5\n\ lsl r0, r0, #0x3\n\ - ldr r2, ._136\n\ + ldr r2, ._136 @ gTasks\n\ add r4, r0, r2\n\ mov r1, #0x0\n\ ldsh r0, [r4, r1]\n\ @@ -636,7 +636,7 @@ void debug_sub_806F908(u8 a) ._136:\n\ .word gTasks+0x8\n\ ._133:\n\ - ldr r0, ._139\n\ + ldr r0, ._139 @ Task_ResetRtc_0\n\ mov r1, #0x50\n\ bl CreateTask\n\ lsl r0, r0, #0x18\n\ @@ -666,7 +666,7 @@ void debug_sub_806F908(u8 a) ldsh r0, [r2, r1]\n\ cmp r0, #0x1\n\ bne ._142 @cond_branch\n\ - ldr r3, ._143\n\ + ldr r3, ._143 @ gLocalTime\n\ mov r1, #0x0\n\ ldsh r0, [r3, r1]\n\ mov r1, #0x2\n\ @@ -700,7 +700,7 @@ void debug_sub_806F99C() asm("\ push {lr}\n\ bl RtcCalcLocalTime\n\ - ldr r0, ._145\n\ + ldr r0, ._145 @ debug_sub_806F908\n\ mov r1, #0x50\n\ bl CreateTask\n\ bl ScriptContext2_Enable\n\ @@ -717,14 +717,14 @@ void debug_sub_806F9B8() { asm("\ push {lr}\n\ - ldr r2, ._147\n\ - ldr r0, ._147 + 4\n\ + ldr r2, ._147 @ gLocalTime\n\ + ldr r0, ._147 + 4 @ gSaveBlock2\n\ add r0, r0, #0xa0\n\ ldr r1, [r0, #0x4]\n\ ldr r0, [r0]\n\ str r0, [r2]\n\ str r1, [r2, #0x4]\n\ - ldr r0, ._147 + 8\n\ + ldr r0, ._147 + 8 @ debug_sub_806F908\n\ mov r1, #0x50\n\ bl CreateTask\n\ bl ScriptContext2_Enable\n\ @@ -752,9 +752,9 @@ void debug_sub_806F9E4() lsl r0, r7, #0x2\n\ add r0, r0, r7\n\ lsl r0, r0, #0x3\n\ - ldr r1, ._153\n\ + ldr r1, ._153 @ gTasks\n\ add r5, r0, r1\n\ - ldr r6, ._153 + 4\n\ + ldr r6, ._153 + 4 @ gStringVar4\n\ mov r1, #0x0\n\ ldsh r0, [r5, r1]\n\ cmp r0, #0x1\n\ @@ -793,19 +793,19 @@ void debug_sub_806F9E4() mov r1, #0x2\n\ mov r2, #0xa\n\ bl Menu_PrintText\n\ - ldr r0, ._158\n\ + ldr r0, ._158 @ gUnknown_Debug_0839AE94\n\ mov r1, #0xc\n\ mov r2, #0xc\n\ bl Menu_PrintText\n\ - ldr r0, ._158 + 4\n\ + ldr r0, ._158 + 4 @ gUnknown_Debug_0839AE99\n\ mov r1, #0x14\n\ mov r2, #0xc\n\ bl Menu_PrintText\n\ - ldr r0, ._158 + 8\n\ + ldr r0, ._158 + 8 @ gUnknown_Debug_0839AEA7\n\ mov r1, #0x1\n\ mov r2, #0xe\n\ bl Menu_PrintText\n\ - ldr r0, ._158 + 12\n\ + ldr r0, ._158 + 12 @ gUnknown_Debug_0839AE9D\n\ mov r1, #0x1\n\ mov r2, #0x10\n\ bl Menu_PrintText\n\ @@ -833,7 +833,7 @@ void debug_sub_806F9E4() mov r0, #0x28\n\ add r0, r0, r6\n\ mov sl, r0\n\ - ldr r4, ._163\n\ + ldr r4, ._163 @ gLocalTime\n\ mov r1, #0x2\n\ ldsb r1, [r4, r1]\n\ mov r2, #0x3\n\ @@ -850,7 +850,7 @@ void debug_sub_806F9E4() mov r2, #0x1\n\ mov r3, #0x4\n\ bl ConvertIntToDecimalStringN\n\ - ldr r0, ._163 + 4\n\ + ldr r0, ._163 + 4 @ gSaveBlock2\n\ ldrb r0, [r0, #0x12]\n\ cmp r0, #0\n\ bne ._160 @cond_branch\n\ @@ -885,7 +885,7 @@ void debug_sub_806F9E4() .word gLocalTime\n\ .word gSaveBlock2\n\ ._161:\n\ - ldr r0, ._166\n\ + ldr r0, ._166 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ diff --git a/src/engine/save_failed_screen.c b/src/engine/save_failed_screen.c index 7902427e0..49cf166d4 100644 --- a/src/engine/save_failed_screen.c +++ b/src/engine/save_failed_screen.c @@ -157,12 +157,12 @@ void CB2_WipeSave() asm( " push {r4, r5, lr}\n" " mov r4, #0x0\n" - " ldr r0, ._20\n" + " ldr r0, ._20 @ gSaveFailedClockInfo\n" " mov r2, #0x1\n" " strh r2, [r0]\n" - " ldr r0, ._20 + 4\n" + " ldr r0, ._20 + 4 @ gUnknown_Debug_03004BD0\n" " ldr r0, [r0]\n" - " ldr r1, ._20 + 8\n" + " ldr r1, ._20 + 8 @ gDamagedSaveSectors\n" " cmp r0, #0\n" " beq ._12 @cond_branch\n" " str r2, [r1]\n" @@ -182,11 +182,11 @@ void CB2_WipeSave() " mov r2, #0x1c\n" " mov r3, #0x13\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._20 + 12\n" + " ldr r0, ._20 + 12 @ gSystemText_CheckCompleteSaveAttempt\n" " mov r1, #0x2\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" - " ldr r0, ._20 + 16\n" + " ldr r0, ._20 + 16 @ gSaveFailedType\n" " ldrb r0, [r0]\n" " bl Save_WriteDataInternal\n" " ldr r0, [r5]\n" @@ -197,7 +197,7 @@ void CB2_WipeSave() " mov r2, #0x1c\n" " mov r3, #0x13\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._20 + 20\n" + " ldr r0, ._20 + 20 @ gSystemText_SaveFailedBackupCheck\n" " mov r1, #0x2\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" @@ -218,11 +218,11 @@ void CB2_WipeSave() " mov r2, #0x1c\n" " mov r3, #0x13\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._20 + 24\n" + " ldr r0, ._20 + 24 @ gSystemText_BackupDamagedGameContinue\n" " mov r1, #0x2\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" - " ldr r0, ._20 + 28\n" + " ldr r0, ._20 + 28 @ CB2_FadeAndReturnToTitleScreen\n" " bl SetMainCallback2\n" " b ._23\n" "._21:\n" @@ -242,11 +242,11 @@ void CB2_WipeSave() " mov r2, #0x1c\n" " mov r3, #0x13\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._24\n" + " ldr r0, ._24 @ gGameContinueCallback\n" " ldr r0, [r0]\n" " cmp r0, #0\n" " bne ._22 @cond_branch\n" - " ldr r0, ._24 + 4\n" + " ldr r0, ._24 + 4 @ gSystemText_SaveCompletedGameEnd\n" " mov r1, #0x2\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" @@ -262,11 +262,11 @@ void CB2_WipeSave() " mov r2, #0x1c\n" " mov r3, #0x13\n" " bl Menu_DrawStdWindowFrame\n" - " ldr r0, ._27\n" + " ldr r0, ._27 @ gSystemText_BackupDamagedGameContinue\n" " mov r1, #0x2\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" - " ldr r0, ._27 + 4\n" + " ldr r0, ._27 + 4 @ CB2_GameplayCannotBeContinued\n" " bl SetMainCallback2\n" " b ._26\n" "._28:\n" @@ -275,12 +275,12 @@ void CB2_WipeSave() " .word gSystemText_BackupDamagedGameContinue\n" " .word CB2_GameplayCannotBeContinued+1\n" "._22:\n" - " ldr r0, ._29\n" + " ldr r0, ._29 @ gSystemText_SaveCompletedPressA\n" " mov r1, #0x2\n" " mov r2, #0xb\n" " bl Menu_PrintText\n" "._23:\n" - " ldr r0, ._29 + 4\n" + " ldr r0, ._29 + 4 @ CB2_FadeAndReturnToTitleScreen\n" " bl SetMainCallback2\n" "._26:\n" " pop {r4, r5}\n" @@ -420,20 +420,20 @@ bool8 VerifySectorWipe(u16 sector) " push {lr}\n" " lsl r0, r0, #0x10\n" " lsr r0, r0, #0x10\n" - " ldr r2, ._50\n" + " ldr r2, ._50 @ \n" " mov r3, #0x80\n" " lsl r3, r3, #0x5\n" " mov r1, #0x0\n" " bl ReadFlash\n" " mov r0, #0x0\n" - " ldr r1, ._50 + 4\n" + " ldr r1, ._50 + 4 @ \n" "._49:\n" " add r0, r0, #0x1\n" " lsl r0, r0, #0x10\n" " lsr r0, r0, #0x10\n" " cmp r0, r1\n" " bls ._49 @cond_branch\n" - " ldr r0, ._50 + 8\n" + " ldr r0, ._50 + 8 @ \n" " ldrb r0, [r0]\n" " pop {r1}\n" " bx r1\n" diff --git a/src/field/berry.c b/src/field/berry.c index 5c1ecd699..588807755 100644 --- a/src/field/berry.c +++ b/src/field/berry.c @@ -1009,7 +1009,7 @@ void debug_sub_80C2B04() " bl sub_80B47D8\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" - " ldr r2, ._1\n" + " ldr r2, ._1 @ gTasks\n" " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r1, r1, #0x3\n" @@ -1038,7 +1038,7 @@ void debug_sub_80C2B30() " bl sub_80B47D8\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x18\n" - " ldr r2, ._3\n" + " ldr r2, ._3 @ gTasks\n" " lsl r1, r0, #0x2\n" " add r1, r1, r0\n" " lsl r1, r1, #0x3\n" @@ -1088,8 +1088,8 @@ void debug_sub_80C2BD0() { asm( " push {r4, r5, r6, r7, lr}\n" - " ldr r3, ._11\n" - " ldr r1, ._11 + 4\n" + " ldr r3, ._11 @ gSaveBlock1\n" + " ldr r1, ._11 + 4 @ 0x316c\n" " add r4, r3, r1\n" " ldr r6, [r4]\n" " add r1, r1, #0x4\n" @@ -1100,7 +1100,7 @@ void debug_sub_80C2BD0() " str r1, [r2]\n" " add r4, r0, #0\n" " mov r2, #0x0\n" - " ldr r5, ._11 + 8\n" + " ldr r5, ._11 + 8 @ 0x52b\n" "._10:\n" " add r0, r4, r1\n" " ldrb r0, [r0]\n" @@ -1108,7 +1108,7 @@ void debug_sub_80C2BD0() " add r1, r1, #0x1\n" " cmp r1, r5\n" " bls ._10 @cond_branch\n" - " ldr r1, ._11 + 4\n" + " ldr r1, ._11 + 4 @ 0x316c\n" " add r0, r3, r1\n" " str r6, [r0]\n" " add r1, r1, #0x4\n" @@ -1145,11 +1145,11 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) " lsl r2, r2, #0x18\n" " lsr r2, r2, #0x18\n" " mov r8, r2\n" - " ldr r4, ._16\n" - " ldr r1, ._16 + 4\n" + " ldr r4, ._16 @ gSaveBlock1\n" + " ldr r1, ._16 + 4 @ 0x3160\n" " add r0, r4, r1\n" " add r2, r0, #0\n" - " ldr r1, ._16 + 8\n" + " ldr r1, ._16 + 8 @ gBerries\n" " ldmia r1!, {r5, r6, r7}\n" " stmia r2!, {r5, r6, r7}\n" " ldmia r1!, {r5, r6, r7}\n" @@ -1158,27 +1158,27 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) " str r1, [r2]\n" " add r1, r3, #0\n" " bl StringCopy\n" - " ldr r0, ._16 + 12\n" + " ldr r0, ._16 + 12 @ 0x361c\n" " add r6, r4, r0\n" - " ldr r1, ._16 + 16\n" + " ldr r1, ._16 + 16 @ gUnknown_Debug_083F7F84\n" " add r0, r6, #0\n" " bl StringCopy\n" - " ldr r1, ._16 + 20\n" + " ldr r1, ._16 + 20 @ 0x3649\n" " add r5, r4, r1\n" - " ldr r1, ._16 + 24\n" + " ldr r1, ._16 + 24 @ gUnknown_Debug_083F7F90\n" " add r0, r5, #0\n" " bl StringCopy\n" - " ldr r2, ._16 + 28\n" + " ldr r2, ._16 + 28 @ 0x316c\n" " add r0, r4, r2\n" " str r6, [r0]\n" - " ldr r6, ._16 + 32\n" + " ldr r6, ._16 + 32 @ 0x3170\n" " add r0, r4, r6\n" " str r5, [r0]\n" " mov r2, #0x0\n" - " ldr r6, ._16 + 36\n" - " ldr r7, ._16 + 40\n" + " ldr r6, ._16 + 36 @ 0x47f\n" + " ldr r7, ._16 + 40 @ 0x317c\n" " add r5, r4, r7\n" - " ldr r3, ._16 + 44\n" + " ldr r3, ._16 + 44 @ gSpriteImage_UnusedCherry\n" "._13:\n" " add r0, r2, r5\n" " add r1, r2, r3\n" @@ -1187,9 +1187,9 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) " add r2, r2, #0x1\n" " cmp r2, r6\n" " ble ._13 @cond_branch\n" - " ldr r0, ._16\n" - " ldr r3, ._16 + 48\n" - " ldr r2, ._16 + 52\n" + " ldr r0, ._16 @ gSaveBlock1\n" + " ldr r3, ._16 + 48 @ gSpritePalette_UnusedCherry\n" + " ldr r2, ._16 + 52 @ 0x35fc\n" " add r1, r0, r2\n" " mov r2, #0xf\n" "._14:\n" @@ -1201,8 +1201,8 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) " cmp r2, #0\n" " bge ._14 @cond_branch\n" " mov r2, #0x0\n" - " ldr r5, ._16 + 56\n" - " ldr r3, ._16 + 60\n" + " ldr r5, ._16 + 56 @ gSaveBlock1\n" + " ldr r3, ._16 + 60 @ gUnknown_Debug_839B6CE\n" "._15:\n" " add r0, r2, r5\n" " add r1, r2, r3\n" @@ -1211,15 +1211,15 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) " add r2, r2, #0x1\n" " cmp r2, #0x11\n" " ble ._15 @cond_branch\n" - " ldr r5, ._16 + 64\n" + " ldr r5, ._16 + 64 @ 0x3688\n" " add r0, r4, r5\n" " mov r6, r9\n" " strb r6, [r0]\n" - " ldr r7, ._16 + 68\n" + " ldr r7, ._16 + 68 @ 0x3689\n" " add r0, r4, r7\n" " mov r1, r8\n" " strb r1, [r0]\n" - " ldr r2, ._16 + 4\n" + " ldr r2, ._16 + 4 @ 0x3160\n" " add r0, r4, r2\n" " bl debug_sub_80C2BD0\n" " add r5, r5, #0x4\n" @@ -1298,17 +1298,17 @@ void debug_sub_80C2D24() " ldr r6, [sp, #0x18]\n" " ldr r4, [sp, #0x1c]\n" " mov r8, r4\n" - " ldr r5, ._18\n" - " ldr r7, ._18 + 4\n" + " ldr r5, ._18 @ gSaveBlock1\n" + " ldr r7, ._18 + 4 @ 0x3175\n" " add r4, r5, r7\n" " strb r0, [r4]\n" - " ldr r4, ._18 + 8\n" + " ldr r4, ._18 + 8 @ 0x3176\n" " add r0, r5, r4\n" " strb r1, [r0]\n" " add r7, r7, #0x2\n" " add r0, r5, r7\n" " strb r2, [r0]\n" - " ldr r1, ._18 + 12\n" + " ldr r1, ._18 + 12 @ 0x3178\n" " add r0, r5, r1\n" " strb r3, [r0]\n" " add r4, r4, #0x3\n" @@ -1321,7 +1321,7 @@ void debug_sub_80C2D24() " sub r4, r4, #0x19\n" " add r0, r5, r4\n" " bl debug_sub_80C2BD0\n" - " ldr r7, ._18 + 16\n" + " ldr r7, ._18 + 16 @ 0x368c\n" " add r5, r5, r7\n" " str r0, [r5]\n" " pop {r3}\n" @@ -1350,21 +1350,21 @@ bool32 IsEnigmaBerryValid() { asm( " push {r4, lr}\n" - " ldr r4, ._24\n" - " ldr r1, ._24 + 4\n" + " ldr r4, ._24 @ gSaveBlock1\n" + " ldr r1, ._24 + 4 @ 0x3174\n" " add r0, r4, r1\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " beq ._22 @cond_branch\n" - " ldr r2, ._24 + 8\n" + " ldr r2, ._24 + 8 @ 0x316a\n" " add r0, r4, r2\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " beq ._22 @cond_branch\n" - " ldr r1, ._24 + 12\n" + " ldr r1, ._24 + 12 @ 0x3160\n" " add r0, r4, r1\n" " bl debug_sub_80C2BD0\n" - " ldr r2, ._24 + 16\n" + " ldr r2, ._24 + 16 @ 0x368c\n" " add r1, r4, r2\n" " ldr r1, [r1]\n" " cmp r0, r1\n" @@ -1810,7 +1810,7 @@ void DebugOpenBerryInfo() asm( " push {r4, r5, r6, r7, lr}\n" " bl GetFieldObjectScriptPointerPlayerFacing\n" - " ldr r1, ._138\n" + " ldr r1, ._138 @ S_BerryTree\n" " cmp r0, r1\n" " beq ._136 @cond_branch\n" " mov r0, #0x0\n" @@ -1820,7 +1820,7 @@ void DebugOpenBerryInfo() "._138:\n" " .word S_BerryTree\n" "._136:\n" - " ldr r0, ._141\n" + " ldr r0, ._141 @ gSelectedMapObject\n" " ldrb r0, [r0]\n" " bl FieldObjectGetBerryTreeId\n" " lsl r0, r0, #0x18\n" @@ -1829,8 +1829,8 @@ void DebugOpenBerryInfo() " bl GetBerryTreeInfo\n" " add r5, r0, #0\n" " mov r2, #0x0\n" - " ldr r7, ._141 + 4\n" - " ldr r4, ._141 + 8\n" + " ldr r7, ._141 + 4 @ 0x1f3\n" + " ldr r4, ._141 + 8 @ gStringVar4\n" " mov r3, #0xff\n" "._140:\n" " add r1, r2, r4\n" @@ -1840,46 +1840,46 @@ void DebugOpenBerryInfo() " add r2, r2, #0x1\n" " cmp r2, r7\n" " ble ._140 @cond_branch\n" - " ldr r0, ._141 + 12\n" + " ldr r0, ._141 + 12 @ gUnknown_Debug_083F7F9D\n" " add r1, r6, #0\n" " mov r2, #0x3\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 16\n" + " ldr r0, ._141 + 16 @ gUnknown_Debug_083F7FA2\n" " ldrb r1, [r5]\n" " mov r2, #0x2\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 20\n" + " ldr r0, ._141 + 20 @ gUnknown_Debug_083F7FA9\n" " ldrb r1, [r5, #0x1]\n" " lsl r1, r1, #0x19\n" " lsr r1, r1, #0x19\n" " mov r2, #0x2\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 24\n" + " ldr r0, ._141 + 24 @ gUnknown_Debug_083F7FB0\n" " ldrh r1, [r5, #0x2]\n" " mov r2, #0x5\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 28\n" + " ldr r0, ._141 + 28 @ gUnknown_Debug_083F7FB7\n" " ldrb r1, [r5, #0x4]\n" " mov r2, #0x2\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 32\n" + " ldr r0, ._141 + 32 @ gUnknown_Debug_083F7FBE\n" " ldrb r1, [r5, #0x5]\n" " lsl r1, r1, #0x1c\n" " lsr r1, r1, #0x1c\n" " mov r2, #0x3\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 36\n" + " ldr r0, ._141 + 36 @ gUnknown_Debug_083F7FC5\n" " ldrb r1, [r5, #0x1]\n" " lsr r1, r1, #0x7\n" " mov r2, #0x1\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 40\n" + " ldr r0, ._141 + 40 @ gUnknown_Debug_083F7FCC\n" " ldrb r1, [r5, #0x5]\n" " lsl r1, r1, #0x1b\n" " lsr r1, r1, #0x1f\n" " mov r2, #0x1\n" " bl debug_sub_80C33FC\n" - " ldr r4, ._141 + 44\n" + " ldr r4, ._141 + 44 @ gUnknown_Debug_083F7FD3\n" " ldrb r1, [r5, #0x5]\n" " lsl r1, r1, #0x1a\n" " lsr r1, r1, #0x1f\n" @@ -1897,7 +1897,7 @@ void DebugOpenBerryInfo() " add r0, r4, #0\n" " mov r2, #0x1\n" " bl debug_sub_80C33FC\n" - " ldr r0, ._141 + 8\n" + " ldr r0, ._141 + 8 @ gStringVar4\n" "._137:\n" " pop {r4, r5, r6, r7}\n" " pop {r1}\n" diff --git a/src/field/choose_party.c b/src/field/choose_party.c index b2d950e35..696f7cf4f 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -536,7 +536,7 @@ void debug_sub_81381B4() " mov r7, r9\n" " mov r6, r8\n" " push {r6, r7}\n" - " ldr r4, ._189\n" + " ldr r4, ._189 @ gUnknown_02023A00\n" " add r0, r4, #0\n" " mov r1, #0x0\n" " mov r2, #0x60\n" @@ -550,7 +550,7 @@ void debug_sub_81381B4() " mov r0, #0x64\n" " add r1, r7, #0\n" " mul r1, r1, r0\n" - " ldr r0, ._189 + 4\n" + " ldr r0, ._189 + 4 @ gPlayerParty\n" " add r5, r1, r0\n" " add r0, r5, #0\n" " mov r1, #0x41\n" diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index c255d3013..13d8ebb5b 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -1927,7 +1927,7 @@ void npcs_clear_ids_and_state() asm( " push {r4, r5, lr}\n" " mov r4, #0x0\n" - " ldr r5, ._2\n" + " ldr r5, ._2 @ gMapObjects\n" "._1:\n" " lsl r0, r4, #0x3\n" " add r0, r0, r4\n" @@ -1939,7 +1939,7 @@ void npcs_clear_ids_and_state() " lsr r4, r0, #0x18\n" " cmp r4, #0xf\n" " bls ._1 @cond_branch\n" - " ldr r1, ._2 + 4\n" + " ldr r1, ._2 + 4 @ gUnknown_Debug_03004BC0\n" " mov r0, #0x0\n" " strb r0, [r1]\n" " pop {r4, r5}\n" @@ -2086,7 +2086,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 " lsl r0, r1, #0x3\n" " add r0, r0, r1\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._40\n" + " ldr r1, ._40 @ gMapObjects\n" " add r4, r0, r1\n" " add r0, r4, #0\n" " bl npc_clear_ids_and_state\n" @@ -2154,7 +2154,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 " strb r0, [r4, #0x7]\n" " ldrh r0, [r5, #0xe]\n" " strb r0, [r4, #0x1d]\n" - " ldr r1, ._40 + 4\n" + " ldr r1, ._40 + 4 @ gUnknown_0836DC09\n" " ldrb r0, [r5, #0x9]\n" " add r0, r0, r1\n" " ldrb r1, [r0]\n" @@ -2166,7 +2166,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 " bl FieldObjectSetDirection\n" " add r0, r4, #0\n" " bl FieldObjectHandleDynamicGraphicsId\n" - " ldr r1, ._40 + 8\n" + " ldr r1, ._40 + 8 @ gUnknown_0836DBBC\n" " ldrb r0, [r4, #0x6]\n" " add r0, r0, r1\n" " ldrb r0, [r0]\n" @@ -2200,7 +2200,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 " orr r0, r0, r1\n" " strb r0, [r4, #0x19]\n" "._39:\n" - " ldr r1, ._40 + 12\n" + " ldr r1, ._40 + 12 @ gUnknown_Debug_03004BC0\n" " ldrb r0, [r1]\n" " add r0, r0, #0x1\n" " strb r0, [r1]\n" @@ -2487,7 +2487,7 @@ void RemoveFieldObject(struct MapObject *mapObject) " and r1, r1, r2\n" " strb r1, [r0]\n" " bl RemoveFieldObjectInternal\n" - " ldr r1, ._72\n" + " ldr r1, ._72 @ gUnknown_Debug_03004BC0\n" " ldrb r0, [r1]\n" " sub r0, r0, #0x1\n" " strb r0, [r1]\n" @@ -2577,7 +2577,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * " lsl r4, r0, #0x3\n" " add r0, r4, r0\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._87\n" + " ldr r1, ._87 @ gMapObjects\n" " add r5, r0, r1\n" " ldrb r0, [r5, #0x5]\n" " bl GetFieldObjectGraphicsInfo\n" @@ -2612,7 +2612,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * " orr r0, r0, r1\n" " strb r0, [r5, #0x1]\n" "._90:\n" - " ldr r1, ._93\n" + " ldr r1, ._93 @ 0xffff\n" " add r0, r1, #0\n" " strh r0, [r7, #0x2]\n" " add r0, r7, #0\n" @@ -2624,11 +2624,11 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * " lsr r7, r0, #0x18\n" " cmp r7, #0x40\n" " bne ._91 @cond_branch\n" - " ldr r1, ._93 + 4\n" + " ldr r1, ._93 + 4 @ gUnknown_Debug_03004BC0\n" " ldrb r0, [r1]\n" " sub r0, r0, #0x1\n" " strb r0, [r1]\n" - " ldr r0, ._93 + 8\n" + " ldr r0, ._93 + 8 @ gMapObjects\n" " mov r2, r8\n" " add r1, r4, r2\n" " lsl r1, r1, #0x2\n" @@ -2650,7 +2650,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * " lsl r0, r7, #0x4\n" " add r0, r0, r7\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._96\n" + " ldr r1, ._96 @ gSprites\n" " add r4, r0, r1\n" " mov r1, r9\n" " lsl r0, r1, #0x10\n" @@ -3045,12 +3045,12 @@ void sub_805B710(u16 u161, u16 u162) " lsr r4, r4, #0x10\n" " lsl r5, r5, #0x10\n" " lsr r5, r5, #0x10\n" - " ldr r6, ._153\n" + " ldr r6, ._153 @ gUnknown_Debug_03004BC0\n" " mov r0, #0x0\n" " strb r0, [r6]\n" " bl ClearPlayerAvatarInfo\n" " mov r7, #0x0\n" - " ldr r0, ._153 + 4\n" + " ldr r0, ._153 + 4 @ gMapObjects\n" " mov r8, r0\n" " lsl r4, r4, #0x10\n" " lsl r5, r5, #0x10\n" diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index c382db19f..a7594372d 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -266,11 +266,11 @@ u8 TryDoMetatileBehaviorForcedMovement() { asm( " push {r4, lr}\n" - " ldr r0, ._27\n" + " ldr r0, ._27 @ gUnknown_020297ED\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " beq ._25 @cond_branch\n" - " ldr r0, ._27 + 4\n" + " ldr r0, ._27 + 4 @ gMain\n" " ldrh r1, [r0, #0x2c]\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -285,7 +285,7 @@ u8 TryDoMetatileBehaviorForcedMovement() " .word gUnknown_020297ED\n" " .word gMain\n" "._25:\n" - " ldr r4, ._29\n" + " ldr r4, ._29 @ gUnknown_0830FBA0\n" " bl GetForcedMovementByMetatileBehavior\n" " lsl r0, r0, #0x18\n" " lsr r0, r0, #0x16\n" @@ -494,7 +494,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161) " add r5, r2, #0\n" " lsl r1, r1, #0x10\n" " lsr r6, r1, #0x10\n" - " ldr r0, ._84\n" + " ldr r0, ._84 @ gUnknown_020297ED\n" " ldrb r0, [r0]\n" " cmp r0, #0\n" " beq ._82 @cond_branch\n" @@ -504,7 +504,7 @@ void MovePlayerNotOnBike(u8 u81, u16 u161) " cmp r0, #0\n" " bne ._83 @cond_branch\n" "._82:\n" - " ldr r4, ._84 + 4\n" + " ldr r4, ._84 + 4 @ gUnknown_0830FBEC\n" " add r0, r5, #0\n" " bl CheckMovementInputNotOnBike\n" " lsl r0, r0, #0x18\n" @@ -1864,7 +1864,7 @@ void debug_sub_805F2B0() " push {lr}\n" " lsl r0, r0, #0x18\n" " lsr r2, r0, #0x18\n" - " ldr r0, ._422\n" + " ldr r0, ._422 @ gMain\n" " ldrh r1, [r0, #0x2c]\n" " mov r0, #0x80\n" " lsl r0, r0, #0x1\n" @@ -1898,8 +1898,8 @@ void debug_sub_805F2DC() " lsr r4, r0, #0x18\n" " cmp r4, #0\n" " bne ._424 @cond_branch\n" - " ldr r2, ._426\n" - " ldr r0, ._426 + 4\n" + " ldr r2, ._426 @ gMapObjects\n" + " ldr r0, ._426 + 4 @ gPlayerAvatar\n" " ldrb r1, [r0, #0x5]\n" " lsl r0, r1, #0x3\n" " add r0, r0, r1\n" @@ -1915,8 +1915,8 @@ void debug_sub_805F2DC() " .word gMapObjects\n" " .word gPlayerAvatar\n" "._424:\n" - " ldr r2, ._431\n" - " ldr r0, ._431 + 4\n" + " ldr r2, ._431 @ gMapObjects\n" + " ldr r0, ._431 + 4 @ gPlayerAvatar\n" " ldrb r1, [r0, #0x5]\n" " lsl r0, r1, #0x3\n" " add r0, r0, r1\n" diff --git a/src/field/field_weather.c b/src/field/field_weather.c index c411bf20b..fbc5431ae 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -1264,14 +1264,14 @@ u8 debug_sub_8085564(void) asm("\ push {lr}\n\ mov r2, #0x0\n\ - ldr r0, ._375\n\ + ldr r0, ._375 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x80\n\ lsl r0, r0, #0x1\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._370 @cond_branch\n\ - ldr r1, ._375 + 4\n\ + ldr r1, ._375 + 4 @ gUnknown_Debug_20301FE\n\ ldrb r0, [r1]\n\ add r0, r0, #0x1\n\ strb r0, [r1]\n\ @@ -1283,14 +1283,14 @@ u8 debug_sub_8085564(void) ._371:\n\ mov r2, #0x1\n\ ._370:\n\ - ldr r0, ._375\n\ + ldr r0, ._375 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x80\n\ lsl r0, r0, #0x2\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._372 @cond_branch\n\ - ldr r1, ._375 + 4\n\ + ldr r1, ._375 + 4 @ gUnknown_Debug_20301FE\n\ ldrb r0, [r1]\n\ cmp r0, #0\n\ beq ._373 @cond_branch\n\ @@ -1314,8 +1314,8 @@ u8 debug_sub_8085564(void) mov r2, #0x1c\n\ mov r3, #0x2\n\ bl Menu_BlankWindowRect\n\ - ldr r1, ._380\n\ - ldr r0, ._380 + 4\n\ + ldr r1, ._380 @ gDebugText_Weather\n\ + ldr r0, ._380 + 4 @ gUnknown_Debug_20301FE\n\ ldrb r0, [r0]\n\ lsl r0, r0, #0x2\n\ add r0, r0, r1\n\ @@ -1324,7 +1324,7 @@ u8 debug_sub_8085564(void) mov r2, #0x1\n\ bl Menu_PrintText\n\ ._377:\n\ - ldr r0, ._380 + 8\n\ + ldr r0, ._380 + 8 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -1339,7 +1339,7 @@ u8 debug_sub_8085564(void) .word gUnknown_Debug_20301FE\n\ .word gMain\n\ ._378:\n\ - ldr r0, ._382\n\ + ldr r0, ._382 @ gUnknown_Debug_20301FE\n\ ldrb r0, [r0]\n\ bl ChangeWeather\n\ bl CloseMenu\n\ @@ -1358,8 +1358,8 @@ u8 debug_sub_808560C(void) { asm("\ push {r4, lr}\n\ - ldr r4, ._384\n\ - ldr r0, ._384 + 4\n\ + ldr r4, ._384 @ gUnknown_Debug_20301FE\n\ + ldr r0, ._384 + 4 @ gWeather\n\ mov r1, #0xda\n\ lsl r1, r1, #0x3\n\ add r0, r0, r1\n\ @@ -1371,7 +1371,7 @@ u8 debug_sub_808560C(void) mov r2, #0x1c\n\ mov r3, #0x2\n\ bl Menu_BlankWindowRect\n\ - ldr r1, ._384 + 8\n\ + ldr r1, ._384 + 8 @ gDebugText_Weather\n\ ldrb r0, [r4]\n\ lsl r0, r0, #0x2\n\ add r0, r0, r1\n\ @@ -1379,8 +1379,8 @@ u8 debug_sub_808560C(void) mov r1, #0x17\n\ mov r2, #0x1\n\ bl Menu_PrintText\n\ - ldr r1, ._384 + 12\n\ - ldr r0, ._384 + 16\n\ + ldr r1, ._384 + 12 @ gMenuCallback\n\ + ldr r0, ._384 + 16 @ debug_sub_8085564\n\ str r0, [r1]\n\ mov r0, #0x0\n\ pop {r4}\n\ diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c index 522fb01d6..5d39b87a9 100644 --- a/src/field/fldeff_cut.c +++ b/src/field/fldeff_cut.c @@ -86,7 +86,7 @@ void debug_sub_80AFEE4() " lsr r0, r0, #0x18\n" " cmp r0, #0x1\n" " bne ._1 @cond_branch\n" - " ldr r1, ._3\n" + " ldr r1, ._3 @ gLastFieldPokeMenuOpened\n" " mov r0, #0x0\n" " strb r0, [r1]\n" " bl sub_80A2634\n" @@ -96,14 +96,14 @@ void debug_sub_80AFEE4() "._3:\n" " .word gLastFieldPokeMenuOpened\n" "._1:\n" - " ldr r4, ._9\n" + " ldr r4, ._9 @ gUnknown_0203923C\n" " add r1, r4, #2\n" " add r0, r4, #0\n" " bl PlayerGetDestCoords\n" " mov r7, #0x0\n" " mov r8, r4\n" "._12:\n" - " ldr r1, ._9 + 4\n" + " ldr r1, ._9 + 4 @ 0xffff\n" " add r0, r7, r1\n" " mov r2, r8\n" " ldrh r2, [r2, #0x2]\n" @@ -112,7 +112,7 @@ void debug_sub_80AFEE4() " lsl r0, r0, #0x10\n" " asr r5, r0, #0x10\n" "._11:\n" - " ldr r1, ._9 + 4\n" + " ldr r1, ._9 + 4 @ 0xffff\n" " add r0, r6, r1\n" " mov r2, r8\n" " ldrh r2, [r2]\n" @@ -147,7 +147,7 @@ void debug_sub_80AFEE4() " cmp r0, #0x1\n" " bne ._7 @cond_branch\n" "._6:\n" - " ldr r1, ._9 + 8\n" + " ldr r1, ._9 + 8 @ gLastFieldPokeMenuOpened\n" " mov r0, #0x0\n" " strb r0, [r1]\n" " bl sub_80A25E8\n" diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index d8f70200c..8c0f09bd9 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -77,11 +77,11 @@ void debug_sub_8122080(void) { asm("\ push {lr}\n\ - ldr r0, ._4\n\ + ldr r0, ._4 @ gMapHeader\n\ ldrb r0, [r0, #0x15]\n\ cmp r0, #0x1\n\ bne ._2 @cond_branch\n\ - ldr r0, ._4 + 4\n\ + ldr r0, ._4 + 4 @ 0x828\n\ bl FlagGet\n\ lsl r0, r0, #0x18\n\ cmp r0, #0\n\ diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c index 3f539fc6e..0e91bb55c 100644 --- a/src/field/fldeff_secretpower.c +++ b/src/field/fldeff_secretpower.c @@ -251,7 +251,7 @@ void debug_sub_80D93F4() asm("\ push {r4, lr}\n\ bl sub_80BB63C\n\ - ldr r0, ._98\n\ + ldr r0, ._98 @ gSpecialVar_Result\n\ ldrh r0, [r0]\n\ cmp r0, #0x1\n\ beq ._95 @cond_branch\n\ @@ -268,7 +268,7 @@ void debug_sub_80D93F4() ._98:\n\ .word gSpecialVar_Result\n\ ._96:\n\ - ldr r4, ._102\n\ + ldr r4, ._102 @ gUnknown_0203923C\n\ add r1, r4, #2\n\ add r0, r4, #0\n\ bl GetXYCoordsOneStepInFrontOfPlayer\n\ @@ -286,7 +286,7 @@ void debug_sub_80D93F4() cmp r0, #0x1\n\ bne ._100 @cond_branch\n\ bl sub_80C6264\n\ - ldr r1, ._102 + 4\n\ + ldr r1, ._102 + 4 @ gLastFieldPokeMenuOpened\n\ mov r0, #0x0\n\ strb r0, [r1]\n\ bl sub_80C639C\n\ @@ -304,7 +304,7 @@ void debug_sub_80D93F4() cmp r0, #0x1\n\ bne ._104 @cond_branch\n\ bl sub_80C6264\n\ - ldr r1, ._106\n\ + ldr r1, ._106 @ gLastFieldPokeMenuOpened\n\ mov r0, #0x0\n\ strb r0, [r1]\n\ bl sub_80C64A8\n\ @@ -321,7 +321,7 @@ void debug_sub_80D93F4() cmp r0, #0x1\n\ bne ._108 @cond_branch\n\ bl sub_80C6264\n\ - ldr r1, ._110\n\ + ldr r1, ._110 @ gLastFieldPokeMenuOpened\n\ mov r0, #0x0\n\ strb r0, [r1]\n\ bl sub_80C660C\n\ diff --git a/src/field/item_menu.c b/src/field/item_menu.c index cf3c7ca4b..ae1465fbd 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -400,8 +400,8 @@ static bool8 SetupBagMultistep(void) asm("\ push {r4, r5, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._5\n\ - ldr r1, ._5 + 4\n\ + ldr r0, ._5 @ gMain\n\ + ldr r1, ._5 + 4 @ 0x43c\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ cmp r0, #0x10\n\ @@ -409,7 +409,7 @@ static bool8 SetupBagMultistep(void) b ._66\n\ ._3:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._5 + 8\n\ + ldr r1, ._5 + 8 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -443,8 +443,8 @@ static bool8 SetupBagMultistep(void) b ._61\n\ ._9:\n\ bl ScanlineEffect_Stop\n\ - ldr r1, ._27\n\ - ldr r0, ._27 + 4\n\ + ldr r1, ._27 @ gMain\n\ + ldr r0, ._27 + 4 @ 0x43c\n\ add r1, r1, r0\n\ b ._62\n\ ._28:\n\ @@ -457,8 +457,8 @@ static bool8 SetupBagMultistep(void) b ._61\n\ ._11:\n\ bl ClearBGTilemapBuffers\n\ - ldr r0, ._31\n\ - ldr r1, ._31 + 4\n\ + ldr r0, ._31 @ \n\ + ldr r1, ._31 + 4 @ \n\ add r0, r0, r1\n\ mov r1, #0x0\n\ strb r1, [r0]\n\ @@ -470,13 +470,13 @@ static bool8 SetupBagMultistep(void) .word 0x1ffff\n\ ._12:\n\ bl ResetPaletteFade\n\ - ldr r2, ._34\n\ + ldr r2, ._34 @ gPaletteFade\n\ ldrb r0, [r2, #0x8]\n\ mov r1, #0x80\n\ orr r0, r0, r1\n\ strb r0, [r2, #0x8]\n\ - ldr r1, ._34 + 4\n\ - ldr r0, ._34 + 8\n\ + ldr r1, ._34 + 4 @ gMain\n\ + ldr r0, ._34 + 8 @ 0x43c\n\ add r1, r1, r0\n\ b ._62\n\ ._35:\n\ @@ -495,8 +495,8 @@ static bool8 SetupBagMultistep(void) bne ._37 @cond_branch\n\ b ._66\n\ ._37:\n\ - ldr r1, ._40\n\ - ldr r0, ._40 + 4\n\ + ldr r1, ._40 @ gMain\n\ + ldr r0, ._40 + 4 @ 0x43c\n\ add r1, r1, r0\n\ b ._62\n\ ._41:\n\ @@ -505,7 +505,7 @@ static bool8 SetupBagMultistep(void) .word gMain\n\ .word 0x43c\n\ ._15:\n\ - ldr r0, ._43\n\ + ldr r0, ._43 @ gWindowTemplate_81E6DFC\n\ bl Text_LoadWindowTemplate\n\ b ._61\n\ ._44:\n\ @@ -513,10 +513,10 @@ static bool8 SetupBagMultistep(void) ._43:\n\ .word gWindowTemplate_81E6DFC\n\ ._16:\n\ - ldr r0, ._46\n\ + ldr r0, ._46 @ gWindowTemplate_81E6DFC\n\ bl MultistepInitMenuWindowBegin\n\ - ldr r1, ._46 + 4\n\ - ldr r0, ._46 + 8\n\ + ldr r1, ._46 + 4 @ gMain\n\ + ldr r0, ._46 + 8 @ 0x43c\n\ add r1, r1, r0\n\ b ._62\n\ ._47:\n\ @@ -563,7 +563,7 @@ static bool8 SetupBagMultistep(void) mov r0, #0x3\n\ mov r1, #0x2\n\ bl SetVerticalScrollIndicatorPriority\n\ - ldr r0, ._53\n\ + ldr r0, ._53 @ sReturnLocation\n\ ldrb r0, [r0]\n\ sub r0, r0, #0x4\n\ lsl r0, r0, #0x18\n\ @@ -577,8 +577,8 @@ static bool8 SetupBagMultistep(void) mov r1, #0x1\n\ bl SetVerticalScrollIndicators\n\ ._51:\n\ - ldr r1, ._53 + 4\n\ - ldr r0, ._53 + 8\n\ + ldr r1, ._53 + 4 @ gMain\n\ + ldr r0, ._53 + 8 @ 0x43c\n\ add r1, r1, r0\n\ b ._62\n\ ._54:\n\ @@ -588,11 +588,11 @@ static bool8 SetupBagMultistep(void) .word gMain\n\ .word 0x43c\n\ ._19:\n\ - ldr r1, ._56\n\ + ldr r1, ._56 @ gUnknown_0203855A\n\ mov r0, #0x10\n\ strb r0, [r1]\n\ - ldr r4, ._56 + 4\n\ - ldr r5, ._56 + 8\n\ + ldr r4, ._56 + 4 @ gBGTilemapBuffers\n\ + ldr r5, ._56 + 8 @ sCurrentBagPocket\n\ ldrb r1, [r5]\n\ add r1, r1, #0x1\n\ lsl r1, r1, #0x18\n\ @@ -603,7 +603,7 @@ static bool8 SetupBagMultistep(void) add r0, r4, #0\n\ bl DrawPocketIndicatorDots\n\ bl UpdateAllBagPockets\n\ - ldr r4, ._56 + 12\n\ + ldr r4, ._56 + 12 @ gBagPockets\n\ ldr r0, [r4, #0x10]\n\ ldr r1, [r4, #0x14]\n\ bl SortItemSlots\n\ @@ -611,7 +611,7 @@ static bool8 SetupBagMultistep(void) ldr r1, [r4, #0x1c]\n\ bl SortItemSlots\n\ bl sub_80A3D40\n\ - ldr r1, ._56 + 16\n\ + ldr r1, ._56 + 16 @ gCurrentBagPocketItemSlots\n\ mov r0, #0x0\n\ ldsb r0, [r5, r0]\n\ lsl r0, r0, #0x3\n\ @@ -629,12 +629,12 @@ static bool8 SetupBagMultistep(void) .word gBagPockets\n\ .word gCurrentBagPocketItemSlots\n\ ._20:\n\ - ldr r0, ._59\n\ + ldr r0, ._59 @ 0xffff\n\ mov r1, #0x0\n\ mov r2, #0x7\n\ bl sub_80A48E8\n\ - ldr r1, ._59 + 4\n\ - ldr r4, ._59 + 8\n\ + ldr r1, ._59 + 4 @ gBagPocketScrollStates\n\ + ldr r4, ._59 + 8 @ sCurrentBagPocket\n\ mov r0, #0x0\n\ ldsb r0, [r4, r0]\n\ lsl r0, r0, #0x2\n\ @@ -642,7 +642,7 @@ static bool8 SetupBagMultistep(void) ldrb r1, [r0, #0x1]\n\ ldrb r0, [r0]\n\ add r1, r1, r0\n\ - ldr r0, ._59 + 12\n\ + ldr r0, ._59 + 12 @ gCurrentBagPocketItemSlots\n\ ldr r0, [r0]\n\ lsl r1, r1, #0x2\n\ add r1, r1, r0\n\ @@ -650,15 +650,15 @@ static bool8 SetupBagMultistep(void) ldsh r0, [r1, r2]\n\ bl ItemListMenu_InitDescription\n\ bl ItemListMenu_InitMenu\n\ - ldr r1, ._59 + 16\n\ + ldr r1, ._59 + 16 @ gUnknown_0203855B\n\ ldrb r0, [r4]\n\ add r0, r0, #0x1\n\ strb r0, [r1]\n\ - ldr r1, ._59 + 20\n\ + ldr r1, ._59 + 20 @ gUnknown_0203855C\n\ mov r0, #0x0\n\ strb r0, [r1]\n\ - ldr r1, ._59 + 24\n\ - ldr r0, ._59 + 28\n\ + ldr r1, ._59 + 24 @ gMain\n\ + ldr r0, ._59 + 28 @ 0x43c\n\ add r1, r1, r0\n\ b ._62\n\ ._60:\n\ @@ -679,17 +679,17 @@ static bool8 SetupBagMultistep(void) bl sub_80A3740\n\ b ._61\n\ ._22:\n\ - ldr r3, ._63\n\ + ldr r3, ._63 @ 0x4000208\n\ ldrh r2, [r3]\n\ mov r0, #0x0\n\ strh r0, [r3]\n\ - ldr r4, ._63 + 4\n\ + ldr r4, ._63 + 4 @ 0x4000200\n\ ldrh r0, [r4]\n\ mov r1, #0x1\n\ orr r0, r0, r1\n\ strh r0, [r4]\n\ strh r2, [r3]\n\ - ldr r2, ._63 + 8\n\ + ldr r2, ._63 + 8 @ 0x4000004\n\ ldrh r0, [r2]\n\ mov r1, #0x8\n\ orr r0, r0, r1\n\ @@ -701,13 +701,13 @@ static bool8 SetupBagMultistep(void) mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r2, ._63 + 12\n\ + ldr r2, ._63 + 12 @ gPaletteFade\n\ ldrb r1, [r2, #0x8]\n\ mov r0, #0x7f\n\ and r0, r0, r1\n\ strb r0, [r2, #0x8]\n\ - ldr r1, ._63 + 16\n\ - ldr r0, ._63 + 20\n\ + ldr r1, ._63 + 16 @ gMain\n\ + ldr r0, ._63 + 20 @ 0x43c\n\ add r1, r1, r0\n\ b ._62\n\ ._64:\n\ @@ -724,8 +724,8 @@ static bool8 SetupBagMultistep(void) cmp r0, #0x1\n\ beq ._66 @cond_branch\n\ ._61:\n\ - ldr r1, ._67\n\ - ldr r2, ._67 + 4\n\ + ldr r1, ._67 @ gMain\n\ + ldr r2, ._67 + 4 @ 0x43c\n\ add r1, r1, r2\n\ ._62:\n\ ldrb r0, [r1]\n\ @@ -738,23 +738,23 @@ static bool8 SetupBagMultistep(void) .word gMain\n\ .word 0x43c\n\ ._24:\n\ - ldr r0, ._71\n\ + ldr r0, ._71 @ sub_80A3134\n\ bl SetVBlankCallback\n\ - ldr r0, ._71 + 4\n\ + ldr r0, ._71 + 4 @ sub_80A3118\n\ bl SetMainCallback2\n\ bl sub_80A751C\n\ bl sub_80A7630\n\ bl sub_80A770C\n\ bl sub_80A7828\n\ bl sub_80A78B8\n\ - ldr r0, ._71 + 8\n\ + ldr r0, ._71 + 8 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._69 @cond_branch\n\ - ldr r0, ._71 + 12\n\ + ldr r0, ._71 + 12 @ 0x600f5e0\n\ mov r1, #0x80\n\ lsl r1, r1, #0x8\n\ - ldr r2, ._71 + 16\n\ + ldr r2, ._71 + 16 @ 0x600f800\n\ mov r3, #0x0\n\ bl debug_sub_8008218\n\ ._69:\n\ @@ -1036,7 +1036,7 @@ void debug_sub_80A3714() push {r4, r5, r6, lr}\n\ add sp, sp, #0xfffffff4\n\ mov r5, #0x0\n\ - ldr r2, ._138\n\ + ldr r2, ._138 @ gUnknown_Debug_083EBC68\n\ mov r1, #0x0\n\ ._134:\n\ lsl r0, r5, #0x1\n\ @@ -1059,10 +1059,10 @@ void debug_sub_80A3714() bl ItemId_GetPocket\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x8\n\ - ldr r1, ._138 + 4\n\ + ldr r1, ._138 + 4 @ 0xffff0000\n\ add r0, r0, r1\n\ lsr r0, r0, #0x10\n\ - ldr r1, ._138 + 8\n\ + ldr r1, ._138 + 8 @ gBagPockets\n\ lsl r2, r0, #0x3\n\ add r2, r2, r1\n\ lsl r0, r0, #0x1\n\ @@ -4050,12 +4050,12 @@ static void sub_80A740C(void) bl sub_80A75E4\n\ bl sub_80A7768\n\ bl sub_80A7420\n\ - ldr r0, ._931\n\ + ldr r0, ._931 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._930 @cond_branch\n\ - ldr r0, ._931 + 4\n\ - ldr r1, ._931 + 8\n\ + ldr r0, ._931 + 4 @ gLink\n\ + ldr r1, ._931 + 8 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x0\n\ diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index e41ea1628..b42c50513 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -262,7 +262,7 @@ void debug_sub_810B32C() " cmp r0, #0x4\n" " bhi ._37 @cond_branch\n" " lsl r0, r0, #0x2\n" - " ldr r1, ._23\n" + " ldr r1, ._23 @ \n" " add r0, r0, r1\n" " ldr r0, [r0]\n" " mov pc, r0\n" @@ -281,7 +281,7 @@ void debug_sub_810B32C() " b ._37\n" "._26:\n" " mov r2, #0x0\n" - " ldr r3, ._34\n" + " ldr r3, ._34 @ gSaveBlock1\n" "._31:\n" " mov r0, sp\n" " add r1, r0, r2\n" @@ -295,7 +295,7 @@ void debug_sub_810B32C() " bls ._31 @cond_branch\n" " bl SetupHipster\n" " mov r2, #0x0\n" - " ldr r3, ._34\n" + " ldr r3, ._34 @ gSaveBlock1\n" "._32:\n" " add r1, r2, r3\n" " mov r4, sp\n" diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 4108145c1..66e7e2319 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -502,12 +502,12 @@ void CB2_PartyMenuMain(void) add sp, sp, #0xfffffffc\n\ bl AnimateSprites\n\ bl BuildOamBuffer\n\ - ldr r0, ._3\n\ + ldr r0, ._3 @ gPartyMenuType\n\ ldrb r1, [r0]\n\ lsl r0, r1, #0x1\n\ add r0, r0, r1\n\ lsl r0, r0, #0x4\n\ - ldr r1, ._3 + 4\n\ + ldr r1, ._3 + 4 @ PartyMonTextSettings\n\ add r5, r0, r1\n\ mov r6, #0x0\n\ ._1:\n\ @@ -529,12 +529,12 @@ void CB2_PartyMenuMain(void) ble ._1 @cond_branch\n\ bl RunTasks\n\ bl UpdatePaletteFade\n\ - ldr r0, ._3 + 8\n\ + ldr r0, ._3 + 8 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._2 @cond_branch\n\ - ldr r0, ._3 + 12\n\ - ldr r1, ._3 + 16\n\ + ldr r0, ._3 + 12 @ gLink\n\ + ldr r1, ._3 + 16 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x2\n\ @@ -696,8 +696,8 @@ bool8 InitPartyMenu(void) mov r7, r8\n\ push {r7}\n\ add sp, sp, #0xfffffff4\n\ - ldr r0, ._55\n\ - ldr r1, ._55 + 4\n\ + ldr r0, ._55 @ gMain\n\ + ldr r1, ._55 + 4 @ 0x43c\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ cmp r0, #0x11\n\ @@ -705,7 +705,7 @@ bool8 InitPartyMenu(void) b ._125\n\ ._53:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._55 + 8\n\ + ldr r1, ._55 + 8 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -745,10 +745,10 @@ bool8 InitPartyMenu(void) mov r8, r2\n\ add r2, sp, #0x4\n\ mov r6, #0x0\n\ - ldr r1, ._78\n\ + ldr r1, ._78 @ 0x40000d4\n\ mov r5, #0x80\n\ lsl r5, r5, #0x5\n\ - ldr r7, ._78 + 4\n\ + ldr r7, ._78 + 4 @ 0x81000800\n\ mov r0, #0x81\n\ lsl r0, r0, #0x18\n\ mov ip, r0\n\ @@ -778,7 +778,7 @@ bool8 InitPartyMenu(void) lsl r3, r3, #0x3\n\ mov r4, #0x0\n\ str r4, [sp, #0x8]\n\ - ldr r2, ._78\n\ + ldr r2, ._78 @ 0x40000d4\n\ mov r1, r8\n\ str r1, [r2]\n\ str r0, [r2, #0x4]\n\ @@ -800,13 +800,13 @@ bool8 InitPartyMenu(void) orr r3, r3, r0\n\ str r3, [r2, #0x8]\n\ ldr r0, [r2, #0x8]\n\ - ldr r2, ._78 + 8\n\ + ldr r2, ._78 + 8 @ gPaletteFade\n\ ldrb r0, [r2, #0x8]\n\ mov r1, #0x80\n\ orr r0, r0, r1\n\ strb r0, [r2, #0x8]\n\ - ldr r1, ._78 + 12\n\ - ldr r2, ._78 + 16\n\ + ldr r1, ._78 + 12 @ gMain\n\ + ldr r2, ._78 + 16 @ 0x43c\n\ add r1, r1, r2\n\ b ._122\n\ ._79:\n\ @@ -822,21 +822,21 @@ bool8 InitPartyMenu(void) b ._115\n\ ._60:\n\ bl sub_806B4A8\n\ - ldr r1, ._82\n\ + ldr r1, ._82 @ \n\ mov r2, #0x99\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ mov r2, #0x0\n\ strh r2, [r0]\n\ - ldr r3, ._82 + 4\n\ + ldr r3, ._82 + 4 @ \n\ add r0, r1, r3\n\ strh r2, [r0]\n\ mov r0, #0x9a\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ strh r2, [r1]\n\ - ldr r1, ._82 + 8\n\ - ldr r2, ._82 + 12\n\ + ldr r1, ._82 + 8 @ \n\ + ldr r2, ._82 + 12 @ \n\ add r1, r1, r2\n\ b ._122\n\ ._83:\n\ @@ -850,7 +850,7 @@ bool8 InitPartyMenu(void) bl ResetSpriteData\n\ b ._115\n\ ._62:\n\ - ldr r0, ._88\n\ + ldr r0, ._88 @ \n\ mov r1, #0x96\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -861,8 +861,8 @@ bool8 InitPartyMenu(void) beq ._86 @cond_branch\n\ bl ResetTasks\n\ ._86:\n\ - ldr r1, ._88 + 4\n\ - ldr r2, ._88 + 8\n\ + ldr r1, ._88 + 4 @ \n\ + ldr r2, ._88 + 8 @ \n\ add r1, r1, r2\n\ b ._122\n\ ._89:\n\ @@ -875,7 +875,7 @@ bool8 InitPartyMenu(void) bl FreeAllSpritePalettes\n\ b ._115\n\ ._64:\n\ - ldr r4, ._92\n\ + ldr r4, ._92 @ \n\ mov r1, #0x97\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -892,10 +892,10 @@ bool8 InitPartyMenu(void) ._92:\n\ .word +0x201b000\n\ ._65:\n\ - ldr r0, ._95\n\ + ldr r0, ._95 @ gWindowTemplate_81E6C90\n\ bl Text_LoadWindowTemplate\n\ - ldr r1, ._95 + 4\n\ - ldr r0, ._95 + 8\n\ + ldr r1, ._95 + 4 @ gMain\n\ + ldr r0, ._95 + 8 @ 0x43c\n\ add r1, r1, r0\n\ b ._122\n\ ._96:\n\ @@ -905,15 +905,15 @@ bool8 InitPartyMenu(void) .word gMain\n\ .word 0x43c\n\ ._66:\n\ - ldr r4, ._98\n\ - ldr r1, ._98 + 4\n\ + ldr r4, ._98 @ gUnknown_03004210\n\ + ldr r1, ._98 + 4 @ gWindowTemplate_81E6C90\n\ add r0, r4, #0\n\ bl Text_InitWindowWithTemplate\n\ add r0, r4, #0\n\ mov r1, #0x1\n\ bl MultistepInitWindowTileData\n\ - ldr r1, ._98 + 8\n\ - ldr r2, ._98 + 12\n\ + ldr r1, ._98 + 8 @ gMain\n\ + ldr r2, ._98 + 12 @ 0x43c\n\ add r1, r1, r2\n\ b ._122\n\ ._99:\n\ @@ -929,14 +929,14 @@ bool8 InitPartyMenu(void) bne ._100 @cond_branch\n\ b ._125\n\ ._100:\n\ - ldr r0, ._103\n\ + ldr r0, ._103 @ \n\ mov r3, #0x99\n\ lsl r3, r3, #0x2\n\ add r0, r0, r3\n\ mov r1, #0x1\n\ strh r1, [r0]\n\ - ldr r1, ._103 + 4\n\ - ldr r0, ._103 + 8\n\ + ldr r1, ._103 + 4 @ \n\ + ldr r0, ._103 + 8 @ \n\ add r1, r1, r0\n\ b ._122\n\ ._104:\n\ @@ -946,7 +946,7 @@ bool8 InitPartyMenu(void) .word gMain\n\ .word 0x43c\n\ ._68:\n\ - ldr r0, ._107\n\ + ldr r0, ._107 @ \n\ mov r1, #0x99\n\ lsl r1, r1, #0x2\n\ add r4, r0, r1\n\ @@ -958,8 +958,8 @@ bool8 InitPartyMenu(void) bne ._105 @cond_branch\n\ mov r0, #0x0\n\ strh r0, [r4]\n\ - ldr r1, ._107 + 4\n\ - ldr r2, ._107 + 8\n\ + ldr r1, ._107 + 4 @ \n\ + ldr r2, ._107 + 8 @ \n\ add r1, r1, r2\n\ b ._122\n\ ._108:\n\ @@ -977,8 +977,8 @@ bool8 InitPartyMenu(void) bl sub_809D51C\n\ b ._115\n\ ._70:\n\ - ldr r2, ._113\n\ - ldr r0, ._113 + 4\n\ + ldr r2, ._113 @ PartyMenuHandlers\n\ + ldr r0, ._113 + 4 @ \n\ mov r1, #0x96\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -994,8 +994,8 @@ bool8 InitPartyMenu(void) lsr r0, r0, #0x18\n\ cmp r0, #0x1\n\ bne ._125 @cond_branch\n\ - ldr r1, ._113 + 8\n\ - ldr r2, ._113 + 12\n\ + ldr r1, ._113 + 8 @ \n\ + ldr r2, ._113 + 12 @ \n\ add r1, r1, r2\n\ b ._122\n\ ._114:\n\ @@ -1006,7 +1006,7 @@ bool8 InitPartyMenu(void) .word gMain\n\ .word 0x43c\n\ ._71:\n\ - ldr r0, ._116\n\ + ldr r0, ._116 @ gWindowTemplate_81E6CC8\n\ bl MultistepInitMenuWindowBegin\n\ b ._115\n\ ._117:\n\ @@ -1017,8 +1017,8 @@ bool8 InitPartyMenu(void) bl MultistepInitMenuWindowContinue\n\ cmp r0, #0\n\ beq ._125 @cond_branch\n\ - ldr r1, ._120\n\ - ldr r0, ._120 + 4\n\ + ldr r1, ._120 @ gMain\n\ + ldr r0, ._120 + 4 @ 0x43c\n\ add r1, r1, r0\n\ b ._122\n\ ._121:\n\ @@ -1027,14 +1027,14 @@ bool8 InitPartyMenu(void) .word gMain\n\ .word 0x43c\n\ ._73:\n\ - ldr r0, ._123\n\ - ldr r1, ._123 + 4\n\ + ldr r0, ._123 @ \n\ + ldr r1, ._123 + 4 @ \n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x0\n\ bl PrintPartyMenuPromptText\n\ - ldr r1, ._123 + 8\n\ - ldr r2, ._123 + 12\n\ + ldr r1, ._123 + 8 @ \n\ + ldr r2, ._123 + 12 @ \n\ add r1, r1, r2\n\ b ._122\n\ ._124:\n\ @@ -1052,14 +1052,14 @@ bool8 InitPartyMenu(void) mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r2, ._126\n\ + ldr r2, ._126 @ gPaletteFade\n\ ldrb r1, [r2, #0x8]\n\ mov r0, #0x7f\n\ and r0, r0, r1\n\ strb r0, [r2, #0x8]\n\ ._115:\n\ - ldr r1, ._126 + 4\n\ - ldr r3, ._126 + 8\n\ + ldr r1, ._126 + 4 @ gMain\n\ + ldr r3, ._126 + 8 @ 0x43c\n\ add r1, r1, r3\n\ ._122:\n\ ldrb r0, [r1]\n\ @@ -1073,16 +1073,16 @@ bool8 InitPartyMenu(void) .word gMain\n\ .word 0x43c\n\ ._75:\n\ - ldr r0, ._130\n\ + ldr r0, ._130 @ VBlankCB_PartyMenu\n\ bl SetVBlankCallback\n\ - ldr r0, ._130 + 4\n\ + ldr r0, ._130 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._128 @cond_branch\n\ - ldr r0, ._130 + 8\n\ + ldr r0, ._130 + 8 @ 0x600e5e0\n\ mov r1, #0x80\n\ lsl r1, r1, #0x8\n\ - ldr r2, ._130 + 12\n\ + ldr r2, ._130 + 12 @ 0x6007800\n\ mov r3, #0x2\n\ bl debug_sub_8008218\n\ ._128:\n\ diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 01e9711dc..8b67a2cd9 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -1658,7 +1658,7 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c) add r5, r1, #0\n\ lsl r2, r2, #0x18\n\ lsr r7, r2, #0x18\n\ - ldr r0, ._503\n\ + ldr r0, ._503 @ gUnknown_020297ED\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ bne ._498 @cond_branch\n\ @@ -1747,10 +1747,10 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c) bl sub_80BD610\n\ ._515:\n\ mov r3, #0x1\n\ - ldr r6, ._521\n\ + ldr r6, ._521 @ gSaveBlock1\n\ mov r5, #0x10\n\ neg r5, r5\n\ - ldr r4, ._521 + 4\n\ + ldr r4, ._521 + 4 @ 0x1a09\n\ ._517:\n\ lsl r0, r3, #0x2\n\ add r0, r0, r3\n\ @@ -1776,8 +1776,8 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c) bls ._517 @cond_branch\n\ bl sub_80BD280\n\ mov r3, #0x1\n\ - ldr r4, ._521\n\ - ldr r6, ._521 + 4\n\ + ldr r4, ._521 @ gSaveBlock1\n\ + ldr r6, ._521 + 4 @ 0x1a09\n\ add r7, r4, #0\n\ mov r5, #0x3f\n\ ._519:\n\ @@ -1799,10 +1799,10 @@ void sub_80BD674(void *playerRecords, u32 size, u8 c) lsr r3, r0, #0x10\n\ cmp r3, #0x13\n\ bls ._519 @cond_branch\n\ - ldr r0, ._521 + 8\n\ + ldr r0, ._521 + 8 @ 0x1a16\n\ add r2, r7, r0\n\ ldrh r1, [r2]\n\ - ldr r0, ._521 + 12\n\ + ldr r0, ._521 + 12 @ 0xffff\n\ cmp r1, r0\n\ beq ._520 @cond_branch\n\ add r0, r1, #1\n\ diff --git a/src/field/shop.c b/src/field/shop.c index 852ccddda..fdee31178 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -1247,7 +1247,7 @@ void debug_sub_80C2818(void) push {lr}\n\ mov r0, #0x0\n\ bl CreateShopMenu\n\ - ldr r0, ._290\n\ + ldr r0, ._290 @ gMartBuyNoSellOptionList\n\ bl SetShopItemsForSale\n\ mov r0, #0x0\n\ bl SetShopMenuCallback\n\ diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c index 0d4ebe3f0..2c97c146d 100644 --- a/src/field/slot_machine.c +++ b/src/field/slot_machine.c @@ -402,7 +402,7 @@ static void SlotMachineSetup_0_1(void) mov r5, r8\n\ push {r5, r6, r7}\n\ bl sub_81019EC\n\ - ldr r5, ._43\n\ + ldr r5, ._43 @ \n\ mov r4, #0x0\n\ strb r4, [r5]\n\ strb r4, [r5, #0x2]\n\ @@ -415,8 +415,8 @@ static void SlotMachineSetup_0_1(void) strh r4, [r5, #0x8]\n\ strb r0, [r5, #0xa]\n\ strb r0, [r5, #0xb]\n\ - ldr r0, ._43 + 4\n\ - ldr r1, ._43 + 8\n\ + ldr r0, ._43 + 4 @ \n\ + ldr r1, ._43 + 8 @ \n\ add r0, r0, r1\n\ ldrh r0, [r0]\n\ strh r0, [r5, #0xc]\n\ @@ -445,7 +445,7 @@ static void SlotMachineSetup_0_1(void) strh r0, [r1]\n\ mov r7, #0x0\n\ add r6, r5, #0\n\ - ldr r2, ._43 + 12\n\ + ldr r2, ._43 + 12 @ \n\ mov sl, r2\n\ mov r0, #0x1c\n\ add r0, r0, r6\n\ @@ -493,7 +493,7 @@ static void SlotMachineSetup_0_1(void) cmp r7, #0x2\n\ bls ._41 @cond_branch\n\ bl debug_sub_811B5D0\n\ - ldr r0, ._43 + 16\n\ + ldr r0, ._43 + 16 @ \n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._42 @cond_branch\n\ @@ -690,21 +690,21 @@ static bool8 sub_8101E10(struct Task *task) push {lr}\n\ mov r0, #0x0\n\ bl sub_8104CAC\n\ - ldr r2, ._70\n\ + ldr r2, ._70 @ \n\ mov r0, #0x5\n\ strb r0, [r2]\n\ - ldr r0, ._70 + 4\n\ + ldr r0, ._70 + 4 @ \n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._67 @cond_branch\n\ - ldr r0, ._70 + 8\n\ + ldr r0, ._70 + 8 @ \n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ bne ._69 @cond_branch\n\ ._67:\n\ mov r0, #0xc\n\ ldsh r1, [r2, r0]\n\ - ldr r0, ._70 + 12\n\ + ldr r0, ._70 + 12 @ \n\ cmp r1, r0\n\ ble ._69 @cond_branch\n\ mov r0, #0x17\n\ @@ -740,17 +740,17 @@ static bool8 sub_8101E3C(struct Task *task) { asm("\ push {r4, r5, lr}\n\ - ldr r0, ._77\n\ + ldr r0, ._77 @ unk_debug_bss_1_1\n\ ldrb r1, [r0]\n\ add r3, r0, #0\n\ - ldr r5, ._77 + 4\n\ + ldr r5, ._77 + 4 @ gMain\n\ cmp r1, #0\n\ beq ._76 @cond_branch\n\ - ldr r2, ._77 + 8\n\ + ldr r2, ._77 + 8 @ unk_debug_bss_1_4\n\ ldrb r0, [r2]\n\ cmp r0, #0\n\ beq ._76 @cond_branch\n\ - ldr r4, ._77 + 12\n\ + ldr r4, ._77 + 12 @ \n\ mov r1, #0xc\n\ ldsh r0, [r4, r1]\n\ cmp r0, #0x3\n\ @@ -796,7 +796,7 @@ static bool8 sub_8101E3C(struct Task *task) cmp r0, #0\n\ beq ._81 @cond_branch\n\ bl debug_sub_811B620\n\ - ldr r1, ._83\n\ + ldr r1, ._83 @ \n\ mov r0, #0x1d\n\ strb r0, [r1]\n\ b ._102\n\ @@ -812,7 +812,7 @@ static bool8 sub_8101E3C(struct Task *task) beq ._85 @cond_branch\n\ mov r0, #0x0\n\ bl sub_8104AB8\n\ - ldr r1, ._87\n\ + ldr r1, ._87 @ \n\ mov r0, #0x8\n\ strb r0, [r1]\n\ b ._102\n\ @@ -826,7 +826,7 @@ static bool8 sub_8101E3C(struct Task *task) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._89 @cond_branch\n\ - ldr r2, ._94\n\ + ldr r2, ._94 @ \n\ mov r3, #0xc\n\ ldsh r0, [r2, r3]\n\ sub r0, r0, #0x3\n\ @@ -852,7 +852,7 @@ static bool8 sub_8101E3C(struct Task *task) cmp r0, #0x2\n\ ble ._92 @cond_branch\n\ ._91:\n\ - ldr r1, ._94\n\ + ldr r1, ._94 @ \n\ ldrh r0, [r1, #0xc]\n\ sub r0, r0, #0x3\n\ ldrh r3, [r1, #0x12]\n\ @@ -877,7 +877,7 @@ static bool8 sub_8101E3C(struct Task *task) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._98 @cond_branch\n\ - ldr r4, ._103\n\ + ldr r4, ._103 @ \n\ mov r1, #0xc\n\ ldsh r0, [r4, r1]\n\ cmp r0, #0\n\ @@ -893,11 +893,11 @@ static bool8 sub_8101E3C(struct Task *task) add r0, r0, #0x1\n\ strh r0, [r4, #0x12]\n\ ._98:\n\ - ldr r0, ._103\n\ + ldr r0, ._103 @ \n\ mov r2, #0x12\n\ ldsh r1, [r0, r2]\n\ add r2, r0, #0\n\ - ldr r5, ._103 + 4\n\ + ldr r5, ._103 + 4 @ \n\ cmp r1, #0x2\n\ bgt ._99 @cond_branch\n\ cmp r1, #0\n\ @@ -1029,7 +1029,7 @@ static bool8 sub_8101FA4(struct Task *task) bl sub_8102DEC\n\ mov r0, #0x0\n\ strh r0, [r4, #0x8]\n\ - ldr r4, ._115\n\ + ldr r4, ._115 @ \n\ ldrb r1, [r4, #0x4]\n\ mov r0, #0x20\n\ and r0, r0, r1\n\ @@ -1048,7 +1048,7 @@ static bool8 sub_8101FA4(struct Task *task) mov r0, #0xb\n\ ._114:\n\ strb r0, [r4]\n\ - ldr r4, ._119\n\ + ldr r4, ._119 @ \n\ mov r0, #0x8\n\ strh r0, [r4, #0x1a]\n\ ldrb r0, [r4, #0xa]\n\ @@ -1057,7 +1057,7 @@ static bool8 sub_8101FA4(struct Task *task) bl dp15_jump_random_unknown\n\ strh r0, [r4, #0x1a]\n\ ._117:\n\ - ldr r0, ._119 + 4\n\ + ldr r0, ._119 + 4 @ \n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._118 @cond_branch\n\ @@ -1128,15 +1128,15 @@ static bool8 sub_8102034(struct Task *task) asr r1, r1, #0x10\n\ cmp r1, #0x1d\n\ ble ._124 @cond_branch\n\ - ldr r0, ._127\n\ + ldr r0, ._127 @ unk_debug_bss_1_1\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._126 @cond_branch\n\ - ldr r0, ._127 + 4\n\ + ldr r0, ._127 + 4 @ unk_debug_bss_1_4\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._126 @cond_branch\n\ - ldr r4, ._127 + 8\n\ + ldr r4, ._127 + 8 @ unk_debug_bss_1_8\n\ bl Random\n\ mov r1, #0x1f\n\ and r1, r1, r0\n\ @@ -1144,7 +1144,7 @@ static bool8 sub_8102034(struct Task *task) str r1, [r4]\n\ ._126:\n\ bl sub_81024F0\n\ - ldr r1, ._127 + 12\n\ + ldr r1, ._127 + 12 @ \n\ mov r0, #0xc\n\ strb r0, [r1]\n\ ._124:\n\ @@ -1178,15 +1178,15 @@ static bool8 sub_8102058(struct Task *task) { asm("\ push {r4, r5, lr}\n\ - ldr r0, ._133\n\ + ldr r0, ._133 @ unk_debug_bss_1_1\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._130 @cond_branch\n\ - ldr r0, ._133 + 4\n\ + ldr r0, ._133 + 4 @ unk_debug_bss_1_4\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._130 @cond_branch\n\ - ldr r5, ._133 + 8\n\ + ldr r5, ._133 + 8 @ unk_debug_bss_1_8\n\ ldr r0, [r5]\n\ sub r0, r0, #0x1\n\ str r0, [r5]\n\ @@ -1194,7 +1194,7 @@ static bool8 sub_8102058(struct Task *task) bne ._135 @cond_branch\n\ mov r0, #0x18\n\ bl PlaySE\n\ - ldr r4, ._133 + 12\n\ + ldr r4, ._133 + 12 @ \n\ ldrb r0, [r4, #0x18]\n\ bl sub_8102E1C\n\ ldrb r0, [r4, #0x18]\n\ @@ -1213,7 +1213,7 @@ static bool8 sub_8102058(struct Task *task) .word unk_debug_bss_1_8\n\ .word +0x2000000\n\ ._130:\n\ - ldr r0, ._136\n\ + ldr r0, ._136 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -1221,7 +1221,7 @@ static bool8 sub_8102058(struct Task *task) beq ._135 @cond_branch\n\ mov r0, #0x18\n\ bl PlaySE\n\ - ldr r4, ._136 + 4\n\ + ldr r4, ._136 + 4 @ \n\ ldrb r0, [r4, #0x18]\n\ bl sub_8102E1C\n\ ldrb r0, [r4, #0x18]\n\ @@ -1260,7 +1260,7 @@ static bool8 sub_8102090(struct Task *task) { asm("\ push {r4, lr}\n\ - ldr r4, ._146\n\ + ldr r4, ._146 @ \n\ ldrb r0, [r4, #0x18]\n\ bl sub_8102E40\n\ lsl r0, r0, #0x18\n\ @@ -1278,7 +1278,7 @@ static bool8 sub_8102090(struct Task *task) ble ._161 @cond_branch\n\ mov r0, #0xe\n\ strb r0, [r4]\n\ - ldr r0, ._146 + 4\n\ + ldr r0, ._146 + 4 @ \n\ ldrb r0, [r0]\n\ cmp r0, #0x8\n\ beq ._140 @cond_branch\n\ @@ -1389,7 +1389,7 @@ bool8 sub_81020C8(struct Task *task) { asm("\ push {r4, lr}\n\ - ldr r4, ._165\n\ + ldr r4, ._165 @ \n\ ldrb r1, [r4, #0x4]\n\ mov r0, #0xc0\n\ and r0, r0, r1\n\ @@ -1411,7 +1411,7 @@ bool8 sub_81020C8(struct Task *task) ._163:\n\ bl debug_sub_811B894\n\ ._164:\n\ - ldr r4, ._171\n\ + ldr r4, ._171 @ \n\ ldrh r0, [r4, #0x8]\n\ cmp r0, #0\n\ beq ._167 @cond_branch\n\ @@ -1440,7 +1440,7 @@ bool8 sub_81020C8(struct Task *task) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._169 @cond_branch\n\ - ldr r0, ._171 + 4\n\ + ldr r0, ._171 + 4 @ \n\ bl PlayFanfare\n\ mov r0, #0x6\n\ bl sub_8104CAC\n\ @@ -1455,7 +1455,7 @@ bool8 sub_81020C8(struct Task *task) and r0, r0, r1\n\ cmp r0, #0\n\ beq ._173 @cond_branch\n\ - ldr r0, ._175\n\ + ldr r0, ._175 @ 0x185\n\ bl PlayFanfare\n\ mov r0, #0x5\n\ bl sub_8104CAC\n\ @@ -1471,7 +1471,7 @@ bool8 sub_81020C8(struct Task *task) mov r0, #0x2\n\ bl sub_8104CAC\n\ ._174:\n\ - ldr r1, ._183\n\ + ldr r1, ._183 @ \n\ ldrh r3, [r1, #0x8]\n\ mov r0, #0xe0\n\ lsl r0, r0, #0x1\n\ @@ -1528,7 +1528,7 @@ bool8 sub_81020C8(struct Task *task) strh r0, [r4, #0x10]\n\ lsl r0, r0, #0x10\n\ asr r0, r0, #0x10\n\ - ldr r1, ._186\n\ + ldr r1, ._186 @ 0x270f\n\ cmp r0, r1\n\ ble ._185 @cond_branch\n\ strh r1, [r4, #0x10]\n\ @@ -1765,14 +1765,14 @@ static bool8 sub_8102424(struct Task *task) asm("\ push {lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._234\n\ + ldr r0, ._234 @ unk_debug_bss_1_1\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ bne ._233 @cond_branch\n\ - ldr r0, ._234 + 4\n\ - ldr r1, ._234 + 8\n\ + ldr r0, ._234 + 4 @ gSaveBlock1\n\ + ldr r1, ._234 + 8 @ \n\ ldrh r1, [r1, #0xc]\n\ - ldr r2, ._234 + 12\n\ + ldr r2, ._234 + 12 @ \n\ add r0, r0, r2\n\ strh r1, [r0]\n\ ._233:\n\ @@ -1783,7 +1783,7 @@ static bool8 sub_8102424(struct Task *task) mov r2, #0x0\n\ mov r3, #0x10\n\ bl BeginNormalPaletteFade\n\ - ldr r1, ._234 + 8\n\ + ldr r1, ._234 + 8 @ \n\ ldrb r0, [r1]\n\ add r0, r0, #0x1\n\ strb r0, [r1]\n\ @@ -1828,7 +1828,7 @@ static bool8 debug_sub_8116E74(struct Task *task) lsl r0, r0, #0x18\n\ cmp r0, #0\n\ beq ._239 @cond_branch\n\ - ldr r1, ._240\n\ + ldr r1, ._240 @ \n\ mov r0, #0x5\n\ strb r0, [r1]\n\ ._239:\n\ @@ -1848,22 +1848,22 @@ static void sub_8102484(void) { asm("\ push {r4, r5, r6, lr}\n\ - ldr r0, ._256\n\ + ldr r0, ._256 @ \n\ ldrb r2, [r0, #0xa]\n\ add r4, r0, #0\n\ cmp r2, #0\n\ beq ._242 @cond_branch\n\ b ._270\n\ ._242:\n\ - ldr r0, ._256 + 4\n\ + ldr r0, ._256 + 4 @ \n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._245 @cond_branch\n\ - ldr r3, ._256 + 8\n\ + ldr r3, ._256 + 8 @ \n\ ldrb r0, [r3]\n\ cmp r0, #0\n\ beq ._245 @cond_branch\n\ - ldr r0, ._256 + 12\n\ + ldr r0, ._256 + 12 @ \n\ ldrb r1, [r0]\n\ strb r1, [r4, #0x4]\n\ strb r2, [r3]\n\ @@ -1972,7 +1972,7 @@ static void sub_8102484(void) lsr r6, r0, #0x18\n\ cmp r6, #0x3\n\ beq ._260 @cond_branch\n\ - ldr r1, ._271\n\ + ldr r1, ._271 @ gUnknown_083ECE42\n\ lsl r0, r6, #0x1\n\ add r0, r0, r1\n\ ldrb r1, [r0]\n\ @@ -2016,8 +2016,8 @@ static void sub_8102484(void) lsr r6, r0, #0x18\n\ cmp r6, #0x5\n\ beq ._270 @cond_branch\n\ - ldr r4, ._271 + 4\n\ - ldr r1, ._271 + 8\n\ + ldr r4, ._271 + 4 @ \n\ + ldr r1, ._271 + 8 @ \n\ lsl r0, r6, #0x1\n\ add r0, r0, r1\n\ ldrb r1, [r0]\n\ diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 1b01bf7a8..4904f4a80 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -166,7 +166,7 @@ void debug_sub_8075C40() " lsl r0, r4, #0x2\n" " add r0, r0, r4\n" " lsl r0, r0, #0x3\n" - " ldr r1, ._5\n" + " ldr r1, ._5 @ gTasks\n" " add r5, r0, r1\n" " mov r1, #0x0\n" " ldsh r0, [r5, r1]\n" @@ -191,28 +191,28 @@ void debug_sub_8075C40() " bl m4aSoundVSyncOff\n" " b ._12\n" "._1:\n" - " ldr r1, ._13\n" + " ldr r1, ._13 @ 0x4000208\n" " ldrh r0, [r1]\n" " mov sl, r0\n" " mov r0, #0x0\n" " strh r0, [r1]\n" - " ldr r1, ._13 + 4\n" + " ldr r1, ._13 + 4 @ 0x4000108\n" " strh r0, [r1]\n" " mov r0, #0x83\n" " lsl r0, r0, #0x10\n" " str r0, [r1]\n" - " ldr r4, ._13 + 8\n" + " ldr r4, ._13 + 8 @ 0xc34f\n" " mov r9, r4\n" - " ldr r2, ._13 + 12\n" - " ldr r0, ._13 + 16\n" + " ldr r2, ._13 + 12 @ 0x40000b0\n" + " ldr r0, ._13 + 16 @ gScanlineEffectRegBuffers\n" " mov ip, r0\n" - " ldr r1, ._13 + 20\n" + " ldr r1, ._13 + 20 @ 0xc5ff\n" " mov r8, r1\n" - " ldr r7, ._13 + 24\n" + " ldr r7, ._13 + 24 @ 0x7fff\n" " mov r3, r9\n" " add r3, r3, #0x1\n" - " ldr r6, ._13 + 28\n" - " ldr r4, ._13 + 32\n" + " ldr r6, ._13 + 28 @ 0x4000040\n" + " ldr r4, ._13 + 32 @ 0xa2600001\n" "._11:\n" " mov r0, ip\n" " str r0, [r2]\n" @@ -233,18 +233,18 @@ void debug_sub_8075C40() " bne ._11 @cond_branch\n" " mov r3, r9\n" " add r3, r3, #0x1\n" - " ldr r0, ._13 + 36\n" + " ldr r0, ._13 + 36 @ 0x400010a\n" " mov r2, #0x0\n" " strh r2, [r0]\n" - " ldr r1, ._13 + 4\n" + " ldr r1, ._13 + 4 @ 0x4000108\n" " ldrh r0, [r1]\n" - " ldr r4, ._13 + 40\n" + " ldr r4, ._13 + 40 @ _debugStartMenu_0\n" " str r0, [r4]\n" " strh r2, [r1]\n" - " ldr r0, ._13\n" + " ldr r0, ._13 @ 0x4000208\n" " mov r1, sl\n" " strh r1, [r0]\n" - " ldr r4, ._13 + 44\n" + " ldr r4, ._13 + 44 @ _debugStartMenu_1\n" " str r3, [r4]\n" " bl m4aSoundVSyncOn\n" " b ._12\n" @@ -266,20 +266,20 @@ void debug_sub_8075C40() "._7:\n" " mov r0, #0x15\n" " bl PlaySE\n" - " ldr r0, ._16\n" - " ldr r1, ._16 + 4\n" + " ldr r0, ._16 @ gStringVar1\n" + " ldr r1, ._16 + 4 @ _debugStartMenu_1\n" " ldr r1, [r1]\n" " mov r2, #0x1\n" " mov r3, #0x8\n" " bl ConvertIntToDecimalStringN\n" - " ldr r0, ._16 + 8\n" - " ldr r1, ._16 + 12\n" + " ldr r0, ._16 + 8 @ gStringVar2\n" + " ldr r1, ._16 + 12 @ _debugStartMenu_0\n" " ldr r1, [r1]\n" " mov r2, #0x1\n" " mov r3, #0x8\n" " bl ConvertIntToDecimalStringN\n" " bl Menu_DisplayDialogueFrame\n" - " ldr r0, ._16 + 16\n" + " ldr r0, ._16 + 16 @ gUnknown_Debug_839B6D8\n" " mov r1, #0x2\n" " mov r2, #0xf\n" " bl Menu_PrintText\n" @@ -297,7 +297,7 @@ void debug_sub_8075C40() " .word _debugStartMenu_0\n" " .word gUnknown_Debug_839B6D8\n" "._8:\n" - " ldr r0, ._19\n" + " ldr r0, ._19 @ gMain\n" " ldrh r1, [r0, #0x2e]\n" " mov r0, #0x1\n" " and r0, r0, r1\n" @@ -328,7 +328,7 @@ void debug_sub_8075D9C() { asm( " push {lr}\n" - " ldr r0, ._21\n" + " ldr r0, ._21 @ debug_sub_8075C40\n" " mov r1, #0xa\n" " bl CreateTask\n" " bl ScriptContext2_Enable\n" @@ -363,8 +363,8 @@ void debug_sub_8075DB4() " bl StringCopy8\n" " mov r3, #0x7\n" " mov r4, #0x0\n" - " ldr r0, ._25\n" - " ldr r1, ._25 + 4\n" + " ldr r0, ._25 @ gSaveBlock1\n" + " ldr r1, ._25 + 4 @ 0x2b28\n" " add r5, r0, r1\n" " add r2, r6, #0\n" " add r2, r2, #0x10\n" @@ -387,7 +387,7 @@ void debug_sub_8075DB4() "._24:\n" " mov r0, #0x64\n" " mul r0, r0, r4\n" - " ldr r1, ._25 + 8\n" + " ldr r1, ._25 + 8 @ gPlayerParty\n" " add r0, r0, r1\n" " mov r1, #0x2c\n" " mul r1, r1, r4\n" @@ -417,12 +417,12 @@ void unref_sub_8070F90() { asm( " push {lr}\n" - " ldr r0, ._27\n" + " ldr r0, ._27 @ 0x801\n" " bl FlagSet\n" " mov r0, #0x80\n" " lsl r0, r0, #0x4\n" " bl FlagSet\n" - " ldr r0, ._27 + 4\n" + " ldr r0, ._27 + 4 @ 0x802\n" " bl FlagSet\n" " pop {r0}\n" " bx r0\n" diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index f1bded592..fcbfe122f 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -583,12 +583,12 @@ void sub_809D844(void) bl AnimateSprites\n\ bl BuildOamBuffer\n\ bl UpdatePaletteFade\n\ - ldr r0, ._2\n\ + ldr r0, ._2 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1 @cond_branch\n\ - ldr r0, ._2 + 4\n\ - ldr r1, ._2 + 8\n\ + ldr r0, ._2 + 4 @ gLink\n\ + ldr r1, ._2 + 8 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x3\n\ @@ -733,8 +733,8 @@ bool8 sub_809DA84(void) asm("\ push {r4, r5, r6, r7, lr}\n\ add sp, sp, #0xfffffff8\n\ - ldr r1, ._52\n\ - ldr r2, ._52 + 4\n\ + ldr r1, ._52 @ gMain\n\ + ldr r2, ._52 + 4 @ 0x43c\n\ add r0, r1, r2\n\ ldrb r0, [r0]\n\ mov ip, r1\n\ @@ -743,7 +743,7 @@ bool8 sub_809DA84(void) b ._51\n\ ._50:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._52 + 8\n\ + ldr r1, ._52 + 8 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -784,8 +784,8 @@ bool8 sub_809DA84(void) b ._146\n\ ._56:\n\ bl ScanlineEffect_Stop\n\ - ldr r1, ._80\n\ - ldr r2, ._80 + 4\n\ + ldr r1, ._80 @ gMain\n\ + ldr r2, ._80 + 4 @ 0x43c\n\ add r1, r1, r2\n\ b ._153\n\ ._81:\n\ @@ -802,10 +802,10 @@ bool8 sub_809DA84(void) mov r3, #0x80\n\ lsl r3, r3, #0x9\n\ mov r5, #0x0\n\ - ldr r1, ._85\n\ + ldr r1, ._85 @ 0x40000d4\n\ mov r4, #0x80\n\ lsl r4, r4, #0x5\n\ - ldr r6, ._85 + 4\n\ + ldr r6, ._85 + 4 @ 0x85000400\n\ mov r7, #0x85\n\ lsl r7, r7, #0x18\n\ ._83:\n\ @@ -827,7 +827,7 @@ bool8 sub_809DA84(void) orr r0, r0, r7\n\ str r0, [r1, #0x8]\n\ ldr r0, [r1, #0x8]\n\ - ldr r1, ._85 + 8\n\ + ldr r1, ._85 + 8 @ 0x43c\n\ add r1, r1, ip\n\ b ._153\n\ ._86:\n\ @@ -838,8 +838,8 @@ bool8 sub_809DA84(void) .word 0x43c\n\ ._59:\n\ bl sub_809DE64\n\ - ldr r1, ._88\n\ - ldr r2, ._88 + 4\n\ + ldr r1, ._88 @ gMain\n\ + ldr r2, ._88 + 4 @ 0x43c\n\ add r1, r1, r2\n\ b ._153\n\ ._89:\n\ @@ -848,7 +848,7 @@ bool8 sub_809DA84(void) .word gMain\n\ .word 0x43c\n\ ._60:\n\ - ldr r0, ._91\n\ + ldr r0, ._91 @ gWindowTemplate_81E6E6C\n\ bl Text_LoadWindowTemplate\n\ b ._146\n\ ._92:\n\ @@ -856,10 +856,10 @@ bool8 sub_809DA84(void) ._91:\n\ .word gWindowTemplate_81E6E6C\n\ ._61:\n\ - ldr r0, ._94\n\ + ldr r0, ._94 @ gWindowTemplate_81E6E6C\n\ bl MultistepInitMenuWindowBegin\n\ - ldr r1, ._94 + 4\n\ - ldr r2, ._94 + 8\n\ + ldr r1, ._94 + 4 @ gMain\n\ + ldr r2, ._94 + 8 @ 0x43c\n\ add r1, r1, r2\n\ b ._153\n\ ._95:\n\ @@ -877,8 +877,8 @@ bool8 sub_809DA84(void) b ._146\n\ ._63:\n\ bl sub_809DA1C\n\ - ldr r1, ._100\n\ - ldr r2, ._100 + 4\n\ + ldr r1, ._100 @ gMain\n\ + ldr r2, ._100 + 4 @ 0x43c\n\ add r1, r1, r2\n\ b ._153\n\ ._101:\n\ @@ -887,26 +887,26 @@ bool8 sub_809DA84(void) .word gMain\n\ .word 0x43c\n\ ._64:\n\ - ldr r1, ._103\n\ - ldr r2, ._103 + 4\n\ - ldr r0, ._103 + 8\n\ + ldr r1, ._103 @ gSummaryScreenTextTiles\n\ + ldr r2, ._103 + 4 @ 0x600d000\n\ + ldr r0, ._103 + 8 @ 0x40000d4\n\ str r1, [r0]\n\ str r2, [r0, #0x4]\n\ - ldr r1, ._103 + 12\n\ + ldr r1, ._103 + 12 @ 0x800000a0\n\ str r1, [r0, #0x8]\n\ ldr r1, [r0, #0x8]\n\ - ldr r1, ._103 + 16\n\ - ldr r2, ._103 + 20\n\ + ldr r1, ._103 + 16 @ sSummaryScreenButtonTiles\n\ + ldr r2, ._103 + 20 @ 0x600d140\n\ str r1, [r0]\n\ str r2, [r0, #0x4]\n\ - ldr r1, ._103 + 24\n\ + ldr r1, ._103 + 24 @ 0x80000080\n\ str r1, [r0, #0x8]\n\ ldr r0, [r0, #0x8]\n\ - ldr r0, ._103 + 28\n\ + ldr r0, ._103 + 28 @ \n\ add r0, r0, #0x74\n\ mov r1, #0x0\n\ strb r1, [r0]\n\ - ldr r1, ._103 + 32\n\ + ldr r1, ._103 + 32 @ \n\ add r1, r1, ip\n\ b ._153\n\ ._104:\n\ @@ -928,7 +928,7 @@ bool8 sub_809DA84(void) bne ._105 @cond_branch\n\ b ._157\n\ ._105:\n\ - ldr r0, ._108\n\ + ldr r0, ._108 @ \n\ add r0, r0, #0x74\n\ mov r1, #0x0\n\ strb r1, [r0]\n\ @@ -939,8 +939,8 @@ bool8 sub_809DA84(void) .word +0x2018000\n\ ._66:\n\ bl sub_80A18C4\n\ - ldr r1, ._111\n\ - ldr r2, ._111 + 4\n\ + ldr r1, ._111 @ gMain\n\ + ldr r2, ._111 + 4 @ 0x43c\n\ add r1, r1, r2\n\ b ._153\n\ ._112:\n\ @@ -949,7 +949,7 @@ bool8 sub_809DA84(void) .word gMain\n\ .word 0x43c\n\ ._67:\n\ - ldr r4, ._115\n\ + ldr r4, ._115 @ \n\ add r0, r4, #0\n\ bl sub_809F678\n\ add r0, r4, #0\n\ @@ -968,7 +968,7 @@ bool8 sub_809DA84(void) mov r0, #0xa\n\ bl sub_80A12D0\n\ ._114:\n\ - ldr r0, ._118\n\ + ldr r0, ._118 @ \n\ bl DrawPokerusSurvivorDot\n\ b ._146\n\ ._119:\n\ @@ -977,10 +977,10 @@ bool8 sub_809DA84(void) .word +0x2018010\n\ ._68:\n\ bl sub_80A1950\n\ - ldr r0, ._121\n\ + ldr r0, ._121 @ \n\ bl sub_80A1D84\n\ - ldr r1, ._121 + 4\n\ - ldr r2, ._121 + 8\n\ + ldr r1, ._121 + 4 @ \n\ + ldr r2, ._121 + 8 @ \n\ add r1, r1, r2\n\ b ._153\n\ ._122:\n\ @@ -990,7 +990,7 @@ bool8 sub_809DA84(void) .word gMain\n\ .word 0x43c\n\ ._69:\n\ - ldr r4, ._124\n\ + ldr r4, ._124 @ \n\ add r0, r4, #0\n\ bl sub_80A1DE8\n\ add r4, r4, #0x64\n\ @@ -1002,7 +1002,7 @@ bool8 sub_809DA84(void) ._124:\n\ .word +0x2018010\n\ ._70:\n\ - ldr r4, ._129\n\ + ldr r4, ._129 @ \n\ add r5, r4, #0\n\ add r5, r5, #0x64\n\ add r0, r4, #0\n\ @@ -1018,8 +1018,8 @@ bool8 sub_809DA84(void) ._126:\n\ mov r0, #0x0\n\ strb r0, [r5]\n\ - ldr r1, ._129 + 4\n\ - ldr r2, ._129 + 8\n\ + ldr r1, ._129 + 4 @ \n\ + ldr r2, ._129 + 8 @ \n\ add r1, r1, r2\n\ b ._153\n\ ._130:\n\ @@ -1033,19 +1033,19 @@ bool8 sub_809DA84(void) bl DrawSummaryScreenNavigationDots\n\ b ._146\n\ ._72:\n\ - ldr r1, ._134\n\ + ldr r1, ._134 @ \n\ ldrb r0, [r1, #0xb]\n\ cmp r0, #0x1\n\ bhi ._132 @cond_branch\n\ - ldr r0, ._134 + 4\n\ + ldr r0, ._134 + 4 @ \n\ ldrb r1, [r1, #0xb]\n\ lsl r1, r1, #0x2\n\ add r1, r1, r0\n\ ldr r0, [r1]\n\ bl _call_via_r0\n\ ._132:\n\ - ldr r1, ._134 + 8\n\ - ldr r2, ._134 + 12\n\ + ldr r1, ._134 + 8 @ \n\ + ldr r2, ._134 + 12 @ \n\ add r1, r1, r2\n\ b ._153\n\ ._135:\n\ @@ -1056,7 +1056,7 @@ bool8 sub_809DA84(void) .word gMain\n\ .word 0x43c\n\ ._73:\n\ - ldr r0, ._137\n\ + ldr r0, ._137 @ \n\ bl sub_809FAC8\n\ b ._146\n\ ._138:\n\ @@ -1064,16 +1064,16 @@ bool8 sub_809DA84(void) ._137:\n\ .word +0x2018010\n\ ._74:\n\ - ldr r2, ._140\n\ - ldr r0, ._140 + 4\n\ + ldr r2, ._140 @ sUnknown_083C1598\n\ + ldr r0, ._140 + 4 @ \n\ ldrb r1, [r0, #0xb]\n\ lsl r1, r1, #0x2\n\ add r1, r1, r2\n\ add r0, r0, #0x10\n\ ldr r1, [r1]\n\ bl _call_via_r1\n\ - ldr r1, ._140 + 8\n\ - ldr r2, ._140 + 12\n\ + ldr r1, ._140 + 8 @ \n\ + ldr r2, ._140 + 12 @ \n\ add r1, r1, r2\n\ b ._153\n\ ._141:\n\ @@ -1084,13 +1084,13 @@ bool8 sub_809DA84(void) .word gMain\n\ .word 0x43c\n\ ._75:\n\ - ldr r0, ._144\n\ + ldr r0, ._144 @ \n\ mov r1, #0x2d\n\ bl GetMonData\n\ add r1, r0, #0\n\ cmp r1, #0\n\ beq ._142 @cond_branch\n\ - ldr r1, ._144 + 4\n\ + ldr r1, ._144 + 4 @ \n\ mov r2, #0x80\n\ lsl r2, r2, #0x1\n\ add r0, r2, #0\n\ @@ -1102,7 +1102,7 @@ bool8 sub_809DA84(void) .word +0x2018010\n\ .word gBattle_BG3_X\n\ ._142:\n\ - ldr r0, ._147\n\ + ldr r0, ._147 @ gBattle_BG3_X\n\ strh r1, [r0]\n\ b ._146\n\ ._148:\n\ @@ -1111,7 +1111,7 @@ bool8 sub_809DA84(void) .word gBattle_BG3_X\n\ ._76:\n\ bl sub_809EBC4\n\ - ldr r0, ._151\n\ + ldr r0, ._151 @ \n\ add r0, r0, #0x79\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ @@ -1136,8 +1136,8 @@ bool8 sub_809DA84(void) bl sub_80A1654\n\ ._150:\n\ bl PrintSummaryWindowHeaderText\n\ - ldr r1, ._154\n\ - ldr r2, ._154 + 4\n\ + ldr r1, ._154 @ gMain\n\ + ldr r2, ._154 + 4 @ 0x43c\n\ add r1, r1, r2\n\ b ._153\n\ ._155:\n\ @@ -1150,8 +1150,8 @@ bool8 sub_809DA84(void) cmp r0, #0x1\n\ beq ._157 @cond_branch\n\ ._146:\n\ - ldr r1, ._158\n\ - ldr r0, ._158 + 4\n\ + ldr r1, ._158 @ gMain\n\ + ldr r0, ._158 + 4 @ 0x43c\n\ add r1, r1, r0\n\ ._153:\n\ ldrb r0, [r1]\n\ @@ -1164,7 +1164,7 @@ bool8 sub_809DA84(void) .word gMain\n\ .word 0x43c\n\ ._51:\n\ - ldr r0, ._162\n\ + ldr r0, ._162 @ sub_809D85C\n\ bl SetVBlankCallback\n\ mov r0, #0x1\n\ str r0, [sp]\n\ @@ -1173,21 +1173,21 @@ bool8 sub_809DA84(void) mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginHardwarePaletteFade\n\ - ldr r0, ._162 + 4\n\ + ldr r0, ._162 + 4 @ sub_809D844\n\ bl SetMainCallback2\n\ - ldr r2, ._162 + 8\n\ + ldr r2, ._162 + 8 @ gPaletteFade\n\ ldrb r1, [r2, #0x8]\n\ mov r0, #0x7f\n\ and r0, r0, r1\n\ strb r0, [r2, #0x8]\n\ - ldr r0, ._162 + 12\n\ + ldr r0, ._162 + 12 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._160 @cond_branch\n\ - ldr r0, ._162 + 16\n\ + ldr r0, ._162 + 16 @ 0x600dde0\n\ mov r1, #0x80\n\ lsl r1, r1, #0x8\n\ - ldr r2, ._162 + 20\n\ + ldr r2, ._162 + 20 @ 0x600f000\n\ mov r3, #0x3\n\ bl debug_sub_8008218\n\ ._160:\n\ diff --git a/src/pokenav_before.c b/src/pokenav_before.c index b292e80c4..b645136dc 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -479,7 +479,7 @@ void sub_80EBDD8() asm("\ push {lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._64\n\ + ldr r1, ._64 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -490,7 +490,7 @@ void sub_80EBDD8() b ._131\n\ ._62:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._64 + 4\n\ + ldr r1, ._64 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -525,14 +525,14 @@ void sub_80EBDD8() lsl r1, r1, #0x13\n\ mov r0, #0x0\n\ strh r0, [r1]\n\ - ldr r1, ._86\n\ - ldr r3, ._86 + 4\n\ + ldr r1, ._86 @ gSharedMem\n\ + ldr r3, ._86 + 4 @ 0x6ddc\n\ add r0, r1, r3\n\ ldrb r2, [r0]\n\ sub r3, r3, #0x2f\n\ add r0, r1, r3\n\ strb r2, [r0]\n\ - ldr r0, ._86 + 8\n\ + ldr r0, ._86 + 8 @ 0x6dae\n\ add r2, r1, r0\n\ mov r0, #0x5\n\ strb r0, [r2]\n\ @@ -548,7 +548,7 @@ void sub_80EBDD8() .word 0x6dae\n\ ._68:\n\ bl sub_80F3FF0\n\ - ldr r1, ._91\n\ + ldr r1, ._91 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -562,7 +562,7 @@ void sub_80EBDD8() beq ._88 @cond_branch\n\ b ._131\n\ ._88:\n\ - ldr r1, ._91\n\ + ldr r1, ._91 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -573,7 +573,7 @@ void sub_80EBDD8() .word gSharedMem\n\ ._70:\n\ bl sub_80F2598\n\ - ldr r1, ._94\n\ + ldr r1, ._94 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -584,7 +584,7 @@ void sub_80EBDD8() .word gSharedMem\n\ ._71:\n\ bl sub_80EEE20\n\ - ldr r1, ._99\n\ + ldr r1, ._99 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -599,7 +599,7 @@ void sub_80EBDD8() b ._131\n\ ._96:\n\ bl sub_80EEE08\n\ - ldr r1, ._99\n\ + ldr r1, ._99 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -611,7 +611,7 @@ void sub_80EBDD8() ._73:\n\ mov r0, #0x0\n\ bl sub_80EF248\n\ - ldr r1, ._104\n\ + ldr r1, ._104 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -634,7 +634,7 @@ void sub_80EBDD8() ._75:\n\ mov r0, #0x0\n\ bl sub_80F1B8C\n\ - ldr r1, ._108\n\ + ldr r1, ._108 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -647,7 +647,7 @@ void sub_80EBDD8() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._131 @cond_branch\n\ - ldr r1, ._108\n\ + ldr r1, ._108 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -657,7 +657,7 @@ void sub_80EBDD8() ._108:\n\ .word gSharedMem\n\ ._77:\n\ - ldr r0, ._111\n\ + ldr r0, ._111 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ b ._110\n\ ._112:\n\ @@ -672,7 +672,7 @@ void sub_80EBDD8() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r1, ._114\n\ + ldr r1, ._114 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -684,7 +684,7 @@ void sub_80EBDD8() ._79:\n\ mov r0, #0x0\n\ bl sub_80EED2C\n\ - ldr r1, ._117\n\ + ldr r1, ._117 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -694,7 +694,7 @@ void sub_80EBDD8() ._117:\n\ .word gSharedMem\n\ ._80:\n\ - ldr r0, ._121\n\ + ldr r0, ._121 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -711,7 +711,7 @@ void sub_80EBDD8() ._81:\n\ mov r0, #0x0\n\ bl sub_80F2C80\n\ - ldr r1, ._125\n\ + ldr r1, ._125 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -724,7 +724,7 @@ void sub_80EBDD8() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._131 @cond_branch\n\ - ldr r1, ._125\n\ + ldr r1, ._125 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -736,7 +736,7 @@ void sub_80EBDD8() ._83:\n\ bl sub_80F1DF0\n\ ._110:\n\ - ldr r1, ._128\n\ + ldr r1, ._128 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -757,14 +757,14 @@ void sub_80EBDD8() mov r0, #0x0\n\ mov r1, #0x0\n\ bl sub_80EF428\n\ - ldr r0, ._132\n\ + ldr r0, ._132 @ sub_80EC268\n\ bl sub_80EBDBC\n\ - ldr r0, ._132 + 4\n\ + ldr r0, ._132 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._131 @cond_branch\n\ - ldr r0, ._132 + 8\n\ - ldr r2, ._132 + 12\n\ + ldr r0, ._132 + 8 @ 0x6007de0\n\ + ldr r2, ._132 + 12 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -877,7 +877,7 @@ void sub_80EC00C() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._136\n\ + ldr r1, ._136 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -888,7 +888,7 @@ void sub_80EC00C() b ._191\n\ ._134:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._136 + 4\n\ + ldr r1, ._136 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -919,17 +919,17 @@ void sub_80EC00C() beq ._153 @cond_branch\n\ b ._191\n\ ._153:\n\ - ldr r0, ._156\n\ + ldr r0, ._156 @ sub_80EBD80\n\ bl SetVBlankCallback\n\ bl sub_80EED1C\n\ - ldr r4, ._156 + 4\n\ - ldr r1, ._156 + 8\n\ + ldr r4, ._156 + 4 @ gSharedMem\n\ + ldr r1, ._156 + 8 @ 0x6ddc\n\ add r0, r4, r1\n\ ldrb r1, [r0]\n\ - ldr r2, ._156 + 12\n\ + ldr r2, ._156 + 12 @ 0x6dad\n\ add r0, r4, r2\n\ strb r1, [r0]\n\ - ldr r0, ._156 + 16\n\ + ldr r0, ._156 + 16 @ 0x6dae\n\ add r1, r4, r0\n\ mov r0, #0x5\n\ strb r0, [r1]\n\ @@ -952,7 +952,7 @@ void sub_80EC00C() ._140:\n\ mov r0, #0x0\n\ bl sub_80EF248\n\ - ldr r1, ._161\n\ + ldr r1, ._161 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -967,7 +967,7 @@ void sub_80EC00C() beq ._158 @cond_branch\n\ b ._191\n\ ._158:\n\ - ldr r1, ._161\n\ + ldr r1, ._161 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -979,7 +979,7 @@ void sub_80EC00C() ._142:\n\ mov r0, #0x0\n\ bl sub_80F1B8C\n\ - ldr r1, ._166\n\ + ldr r1, ._166 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -994,7 +994,7 @@ void sub_80EC00C() beq ._163 @cond_branch\n\ b ._191\n\ ._163:\n\ - ldr r1, ._166\n\ + ldr r1, ._166 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -1020,7 +1020,7 @@ void sub_80EC00C() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._171\n\ + ldr r0, ._171 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ @@ -1033,7 +1033,7 @@ void sub_80EC00C() ._146:\n\ mov r0, #0x0\n\ bl sub_80EED2C\n\ - ldr r1, ._174\n\ + ldr r1, ._174 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -1043,7 +1043,7 @@ void sub_80EC00C() ._174:\n\ .word gSharedMem\n\ ._147:\n\ - ldr r0, ._178\n\ + ldr r0, ._178 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -1059,7 +1059,7 @@ void sub_80EC00C() .word gPaletteFade\n\ ._148:\n\ bl sub_80F2598\n\ - ldr r1, ._181\n\ + ldr r1, ._181 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -1071,7 +1071,7 @@ void sub_80EC00C() ._149:\n\ mov r0, #0x0\n\ bl sub_80F2C80\n\ - ldr r1, ._185\n\ + ldr r1, ._185 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -1084,7 +1084,7 @@ void sub_80EC00C() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._191 @cond_branch\n\ - ldr r1, ._185\n\ + ldr r1, ._185 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -1096,7 +1096,7 @@ void sub_80EC00C() ._151:\n\ bl sub_80F1DF0\n\ ._169:\n\ - ldr r1, ._188\n\ + ldr r1, ._188 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -1114,20 +1114,20 @@ void sub_80EC00C() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._191 @cond_branch\n\ - ldr r0, ._192\n\ - ldr r1, ._192 + 4\n\ + ldr r0, ._192 @ gSharedMem\n\ + ldr r1, ._192 + 4 @ 0x6dad\n\ add r0, r0, r1\n\ ldrb r1, [r0]\n\ mov r0, #0x0\n\ bl sub_80EF428\n\ - ldr r0, ._192 + 8\n\ + ldr r0, ._192 + 8 @ sub_80EC268\n\ bl sub_80EBDBC\n\ - ldr r0, ._192 + 12\n\ + ldr r0, ._192 + 12 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._191 @cond_branch\n\ - ldr r0, ._192 + 16\n\ - ldr r2, ._192 + 20\n\ + ldr r0, ._192 + 16 @ 0x6007de0\n\ + ldr r2, ._192 + 20 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -1349,7 +1349,7 @@ void sub_80EC4A0() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._285\n\ + ldr r1, ._285 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -1360,7 +1360,7 @@ void sub_80EC4A0() b ._340\n\ ._283:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._285 + 4\n\ + ldr r1, ._285 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -1397,7 +1397,7 @@ void sub_80EC4A0() beq ._304 @cond_branch\n\ b ._340\n\ ._304:\n\ - ldr r0, ._308\n\ + ldr r0, ._308 @ gSaveBlock2\n\ ldrb r1, [r0, #0x15]\n\ mov r0, #0x8\n\ and r0, r0, r1\n\ @@ -1408,7 +1408,7 @@ void sub_80EC4A0() ._306:\n\ add r0, r1, #0\n\ bl sub_80EEFBC\n\ - ldr r1, ._308 + 4\n\ + ldr r1, ._308 + 4 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -1426,7 +1426,7 @@ void sub_80EC4A0() beq ._310 @cond_branch\n\ b ._340\n\ ._310:\n\ - ldr r4, ._313\n\ + ldr r4, ._313 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -1446,7 +1446,7 @@ void sub_80EC4A0() ._313:\n\ .word gSharedMem\n\ ._291:\n\ - ldr r0, ._318\n\ + ldr r0, ._318 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -1464,7 +1464,7 @@ void sub_80EC4A0() .word gPaletteFade\n\ ._292:\n\ bl sub_80F2620\n\ - ldr r1, ._321\n\ + ldr r1, ._321 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -1478,7 +1478,7 @@ void sub_80EC4A0() b ._336\n\ ._294:\n\ bl sub_80EF840\n\ - ldr r1, ._326\n\ + ldr r1, ._326 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -1500,7 +1500,7 @@ void sub_80EC4A0() ._296:\n\ mov r0, #0x4\n\ bl sub_80F2C80\n\ - ldr r1, ._329\n\ + ldr r1, ._329 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -1517,9 +1517,9 @@ void sub_80EC4A0() .word gSharedMem\n\ ._298:\n\ bl sub_80F2DD8\n\ - ldr r0, ._332\n\ + ldr r0, ._332 @ sub_80EBD30\n\ bl SetVBlankCallback\n\ - ldr r1, ._332 + 4\n\ + ldr r1, ._332 + 4 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -1551,17 +1551,17 @@ void sub_80EC4A0() ._301:\n\ mov r0, #0x1\n\ bl sub_80EED2C\n\ - ldr r0, ._338\n\ + ldr r0, ._338 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._336 @cond_branch\n\ - ldr r0, ._338 + 4\n\ - ldr r2, ._338 + 8\n\ + ldr r0, ._338 + 4 @ 0x60075e0\n\ + ldr r2, ._338 + 8 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ ._336:\n\ - ldr r1, ._338 + 12\n\ + ldr r1, ._338 + 12 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -1578,13 +1578,13 @@ void sub_80EC4A0() .word 0x600f800\n\ .word gSharedMem\n\ ._302:\n\ - ldr r0, ._341\n\ + ldr r0, ._341 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ cmp r0, #0\n\ bne ._340 @cond_branch\n\ - ldr r0, ._341 + 4\n\ + ldr r0, ._341 + 4 @ sub_80EC67C\n\ bl sub_80EBDBC\n\ ._340:\n\ add sp, sp, #0x4\n\ @@ -1691,7 +1691,7 @@ void sub_80EC67C() asm("\ push {r4, r5, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._345\n\ + ldr r1, ._345 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -1702,7 +1702,7 @@ void sub_80EC67C() b ._386\n\ ._343:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._345 + 4\n\ + ldr r1, ._345 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -1744,7 +1744,7 @@ void sub_80EC67C() ._358:\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._364\n\ + ldr r0, ._364 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -1758,7 +1758,7 @@ void sub_80EC67C() ._359:\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._367\n\ + ldr r0, ._367 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r0, r2\n\ @@ -1770,7 +1770,7 @@ void sub_80EC67C() ._367:\n\ .word gSharedMem\n\ ._349:\n\ - ldr r1, ._371\n\ + ldr r1, ._371 @ 0x6e90\n\ add r0, r4, r1\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ @@ -1797,8 +1797,8 @@ void sub_80EC67C() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._386 @cond_branch\n\ - ldr r5, ._378\n\ - ldr r1, ._378 + 4\n\ + ldr r5, ._378 @ gSharedMem\n\ + ldr r1, ._378 + 4 @ 0x6e90\n\ add r0, r5, r1\n\ ldrb r4, [r0]\n\ cmp r4, #0\n\ @@ -1827,7 +1827,7 @@ void sub_80EC67C() cmp r4, #0\n\ bne ._386 @cond_branch\n\ bl sub_80EFBB0\n\ - ldr r0, ._383\n\ + ldr r0, ._383 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -1858,7 +1858,7 @@ void sub_80EC67C() strh r0, [r1]\n\ b ._386\n\ ._353:\n\ - ldr r0, ._389\n\ + ldr r0, ._389 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -1867,10 +1867,10 @@ void sub_80EC67C() bl sub_80F2DF4\n\ mov r0, #0x4\n\ bl sub_80F2D04\n\ - ldr r3, ._389 + 4\n\ + ldr r3, ._389 + 4 @ gSaveBlock2\n\ mov r2, #0x0\n\ - ldr r0, ._389 + 8\n\ - ldr r1, ._389 + 12\n\ + ldr r0, ._389 + 8 @ gSharedMem\n\ + ldr r1, ._389 + 12 @ 0x6e90\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ @@ -1884,15 +1884,15 @@ void sub_80EC67C() and r0, r0, r1\n\ orr r0, r0, r2\n\ strb r0, [r3, #0x15]\n\ - ldr r0, ._389 + 16\n\ + ldr r0, ._389 + 16 @ sub_80EC00C\n\ bl sub_80EBDBC\n\ ._386:\n\ - ldr r0, ._389 + 20\n\ + ldr r0, ._389 + 20 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._388 @cond_branch\n\ - ldr r0, ._389 + 24\n\ - ldr r2, ._389 + 28\n\ + ldr r0, ._389 + 24 @ gLink\n\ + ldr r2, ._389 + 28 @ 0xfbd\n\ add r0, r0, r2\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ @@ -2092,7 +2092,7 @@ void sub_80ECA10() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._456\n\ + ldr r1, ._456 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -2103,7 +2103,7 @@ void sub_80ECA10() b ._509\n\ ._454:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._456 + 4\n\ + ldr r1, ._456 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -2134,17 +2134,17 @@ void sub_80ECA10() beq ._473 @cond_branch\n\ b ._509\n\ ._473:\n\ - ldr r0, ._476\n\ + ldr r0, ._476 @ sub_80EBD80\n\ bl SetVBlankCallback\n\ bl sub_80EED1C\n\ - ldr r4, ._476 + 4\n\ - ldr r1, ._476 + 8\n\ + ldr r4, ._476 + 4 @ gSharedMem\n\ + ldr r1, ._476 + 8 @ 0x6df0\n\ add r0, r4, r1\n\ ldrb r1, [r0]\n\ - ldr r2, ._476 + 12\n\ + ldr r2, ._476 + 12 @ 0x6dad\n\ add r0, r4, r2\n\ strb r1, [r0]\n\ - ldr r0, ._476 + 16\n\ + ldr r0, ._476 + 16 @ 0x6dae\n\ add r1, r4, r0\n\ mov r0, #0x3\n\ strb r0, [r1]\n\ @@ -2167,7 +2167,7 @@ void sub_80ECA10() ._460:\n\ mov r0, #0x1\n\ bl sub_80EF248\n\ - ldr r1, ._481\n\ + ldr r1, ._481 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2182,7 +2182,7 @@ void sub_80ECA10() beq ._478 @cond_branch\n\ b ._509\n\ ._478:\n\ - ldr r1, ._481\n\ + ldr r1, ._481 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -2194,7 +2194,7 @@ void sub_80ECA10() ._462:\n\ mov r0, #0x1\n\ bl sub_80F1B8C\n\ - ldr r1, ._486\n\ + ldr r1, ._486 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2209,7 +2209,7 @@ void sub_80ECA10() beq ._483 @cond_branch\n\ b ._509\n\ ._483:\n\ - ldr r1, ._486\n\ + ldr r1, ._486 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -2235,7 +2235,7 @@ void sub_80ECA10() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._491\n\ + ldr r0, ._491 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ @@ -2248,7 +2248,7 @@ void sub_80ECA10() ._466:\n\ mov r0, #0x0\n\ bl sub_80EED2C\n\ - ldr r1, ._494\n\ + ldr r1, ._494 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -2261,7 +2261,7 @@ void sub_80ECA10() bl sub_80F2598\n\ b ._496\n\ ._468:\n\ - ldr r0, ._499\n\ + ldr r0, ._499 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -2278,7 +2278,7 @@ void sub_80ECA10() ._469:\n\ mov r0, #0x1\n\ bl sub_80F2C80\n\ - ldr r1, ._503\n\ + ldr r1, ._503 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2291,7 +2291,7 @@ void sub_80ECA10() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._509 @cond_branch\n\ - ldr r1, ._503\n\ + ldr r1, ._503 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -2303,7 +2303,7 @@ void sub_80ECA10() ._471:\n\ bl sub_80F1DF0\n\ ._496:\n\ - ldr r1, ._506\n\ + ldr r1, ._506 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2321,20 +2321,20 @@ void sub_80ECA10() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._509 @cond_branch\n\ - ldr r0, ._510\n\ - ldr r1, ._510 + 4\n\ + ldr r0, ._510 @ gSharedMem\n\ + ldr r1, ._510 + 4 @ 0x6dad\n\ add r0, r0, r1\n\ ldrb r1, [r0]\n\ mov r0, #0x1\n\ bl sub_80EF428\n\ - ldr r0, ._510 + 8\n\ + ldr r0, ._510 + 8 @ sub_80EC86C\n\ bl sub_80EBDBC\n\ - ldr r0, ._510 + 12\n\ + ldr r0, ._510 + 12 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._509 @cond_branch\n\ - ldr r0, ._510 + 16\n\ - ldr r2, ._510 + 20\n\ + ldr r0, ._510 + 16 @ 0x6007de0\n\ + ldr r2, ._510 + 20 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -2488,7 +2488,7 @@ void sub_80ECD80() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._564\n\ + ldr r1, ._564 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -2499,7 +2499,7 @@ void sub_80ECD80() b ._642\n\ ._562:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._564 + 4\n\ + ldr r1, ._564 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -2546,7 +2546,7 @@ void sub_80ECD80() add r1, r4, r0\n\ b ._630\n\ ._568:\n\ - ldr r0, ._592\n\ + ldr r0, ._592 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -2569,7 +2569,7 @@ void sub_80ECD80() beq ._594 @cond_branch\n\ b ._642\n\ ._594:\n\ - ldr r0, ._597\n\ + ldr r0, ._597 @ sub_80EBD80\n\ bl SetVBlankCallback\n\ b ._625\n\ ._598:\n\ @@ -2579,7 +2579,7 @@ void sub_80ECD80() ._570:\n\ bl sub_80EED1C\n\ bl sub_80F3130\n\ - ldr r1, ._600\n\ + ldr r1, ._600 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -2591,7 +2591,7 @@ void sub_80ECD80() ._571:\n\ mov r0, #0x1\n\ bl sub_80F2D6C\n\ - ldr r1, ._603\n\ + ldr r1, ._603 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2605,13 +2605,13 @@ void sub_80ECD80() bl sub_80F2D6C\n\ b ._625\n\ ._573:\n\ - ldr r1, ._607\n\ + ldr r1, ._607 @ 0x6dfc\n\ add r0, r4, r1\n\ ldrb r1, [r0]\n\ - ldr r2, ._607 + 4\n\ + ldr r2, ._607 + 4 @ 0x6dad\n\ add r0, r4, r2\n\ strb r1, [r0]\n\ - ldr r3, ._607 + 8\n\ + ldr r3, ._607 + 8 @ 0x6dae\n\ add r1, r4, r3\n\ mov r0, #0x6\n\ strb r0, [r1]\n\ @@ -2629,7 +2629,7 @@ void sub_80ECD80() ._574:\n\ mov r0, #0x2\n\ bl sub_80EF248\n\ - ldr r1, ._612\n\ + ldr r1, ._612 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2652,7 +2652,7 @@ void sub_80ECD80() ._576:\n\ mov r0, #0x2\n\ bl sub_80F1B8C\n\ - ldr r1, ._617\n\ + ldr r1, ._617 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -2667,7 +2667,7 @@ void sub_80ECD80() beq ._614 @cond_branch\n\ b ._642\n\ ._614:\n\ - ldr r1, ._617\n\ + ldr r1, ._617 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2695,7 +2695,7 @@ void sub_80ECD80() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._623\n\ + ldr r0, ._623 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ @@ -2711,7 +2711,7 @@ void sub_80ECD80() b ._625\n\ ._581:\n\ bl sub_80F2598\n\ - ldr r1, ._627\n\ + ldr r1, ._627 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -2721,7 +2721,7 @@ void sub_80ECD80() ._627:\n\ .word gSharedMem\n\ ._582:\n\ - ldr r0, ._631\n\ + ldr r0, ._631 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -2738,7 +2738,7 @@ void sub_80ECD80() ._583:\n\ mov r0, #0x1\n\ bl sub_80F2C80\n\ - ldr r1, ._635\n\ + ldr r1, ._635 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -2752,8 +2752,8 @@ void sub_80ECD80() lsr r2, r0, #0x18\n\ cmp r2, #0\n\ bne ._642 @cond_branch\n\ - ldr r0, ._635\n\ - ldr r3, ._635 + 4\n\ + ldr r0, ._635 @ gSharedMem\n\ + ldr r3, ._635 + 4 @ 0x306\n\ add r1, r0, r3\n\ strh r2, [r1]\n\ mov r1, #0xc1\n\ @@ -2771,7 +2771,7 @@ void sub_80ECD80() ._585:\n\ mov r0, #0x5\n\ bl sub_80F2C80\n\ - ldr r1, ._639\n\ + ldr r1, ._639 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -2786,7 +2786,7 @@ void sub_80ECD80() bne ._642 @cond_branch\n\ bl sub_80F1DF0\n\ ._625:\n\ - ldr r1, ._639\n\ + ldr r1, ._639 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -2804,20 +2804,20 @@ void sub_80ECD80() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._642 @cond_branch\n\ - ldr r0, ._643\n\ - ldr r1, ._643 + 4\n\ + ldr r0, ._643 @ gSharedMem\n\ + ldr r1, ._643 + 4 @ 0x6dad\n\ add r0, r0, r1\n\ ldrb r1, [r0]\n\ mov r0, #0x2\n\ bl sub_80EF428\n\ - ldr r0, ._643 + 8\n\ + ldr r0, ._643 + 8 @ sub_80ECC08\n\ bl sub_80EBDBC\n\ - ldr r0, ._643 + 12\n\ + ldr r0, ._643 + 12 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._642 @cond_branch\n\ - ldr r0, ._643 + 16\n\ - ldr r2, ._643 + 20\n\ + ldr r0, ._643 + 16 @ 0x6007de0\n\ + ldr r2, ._643 + 20 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -2952,7 +2952,7 @@ void sub_80ED01C() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._647\n\ + ldr r1, ._647 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -2963,7 +2963,7 @@ void sub_80ED01C() b ._736\n\ ._645:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._647 + 4\n\ + ldr r1, ._647 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -2999,7 +2999,7 @@ void sub_80ED01C() bl sub_80F2D04\n\ mov r0, #0x5\n\ bl sub_80F2D04\n\ - ldr r1, ._671\n\ + ldr r1, ._671 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -3017,7 +3017,7 @@ void sub_80ED01C() ._673:\n\ mov r0, #0x0\n\ bl sub_80EEFBC\n\ - ldr r1, ._676\n\ + ldr r1, ._676 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3034,7 +3034,7 @@ void sub_80ED01C() beq ._678 @cond_branch\n\ b ._736\n\ ._678:\n\ - ldr r4, ._681\n\ + ldr r4, ._681 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -3054,7 +3054,7 @@ void sub_80ED01C() ._681:\n\ .word gSharedMem\n\ ._653:\n\ - ldr r0, ._686\n\ + ldr r0, ._686 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -3066,7 +3066,7 @@ void sub_80ED01C() bl SetVBlankCallback\n\ bl sub_80EED0C\n\ bl sub_80EF814\n\ - ldr r1, ._686 + 4\n\ + ldr r1, ._686 + 4 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -3078,7 +3078,7 @@ void sub_80ED01C() .word gSharedMem\n\ ._654:\n\ bl sub_80F2620\n\ - ldr r1, ._689\n\ + ldr r1, ._689 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3089,7 +3089,7 @@ void sub_80ED01C() .word gSharedMem\n\ ._655:\n\ bl sub_80F4D44\n\ - ldr r1, ._693\n\ + ldr r1, ._693 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -3101,7 +3101,7 @@ void sub_80ED01C() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._691 @cond_branch\n\ - ldr r1, ._693\n\ + ldr r1, ._693 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -3114,7 +3114,7 @@ void sub_80ED01C() ._693:\n\ .word gSharedMem\n\ ._691:\n\ - ldr r1, ._696\n\ + ldr r1, ._696 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3129,7 +3129,7 @@ void sub_80ED01C() beq ._698 @cond_branch\n\ b ._736\n\ ._698:\n\ - ldr r1, ._701\n\ + ldr r1, ._701 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -3147,7 +3147,7 @@ void sub_80ED01C() beq ._703 @cond_branch\n\ b ._736\n\ ._703:\n\ - ldr r1, ._706\n\ + ldr r1, ._706 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -3159,7 +3159,7 @@ void sub_80ED01C() ._659:\n\ mov r0, #0x0\n\ bl sub_80F0264\n\ - ldr r1, ._711\n\ + ldr r1, ._711 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3173,7 +3173,7 @@ void sub_80ED01C() beq ._708 @cond_branch\n\ b ._736\n\ ._708:\n\ - ldr r1, ._711\n\ + ldr r1, ._711 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -3185,7 +3185,7 @@ void sub_80ED01C() ._661:\n\ mov r0, #0x0\n\ bl sub_80F3008\n\ - ldr r1, ._714\n\ + ldr r1, ._714 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -3200,7 +3200,7 @@ void sub_80ED01C() beq ._716 @cond_branch\n\ b ._736\n\ ._716:\n\ - ldr r1, ._719\n\ + ldr r1, ._719 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3221,7 +3221,7 @@ void sub_80ED01C() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._722\n\ + ldr r0, ._722 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ @@ -3234,7 +3234,7 @@ void sub_80ED01C() ._664:\n\ mov r0, #0x4\n\ bl sub_80EED2C\n\ - ldr r1, ._725\n\ + ldr r1, ._725 @ gSharedMem\n\ mov r3, #0xc1\n\ lsl r3, r3, #0x2\n\ add r1, r1, r3\n\ @@ -3244,7 +3244,7 @@ void sub_80ED01C() ._725:\n\ .word gSharedMem\n\ ._665:\n\ - ldr r0, ._729\n\ + ldr r0, ._729 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -3252,7 +3252,7 @@ void sub_80ED01C() lsr r1, r0, #0x18\n\ cmp r1, #0\n\ bne ._736 @cond_branch\n\ - ldr r2, ._729 + 4\n\ + ldr r2, ._729 + 4 @ 0x306\n\ add r0, r4, r2\n\ strh r1, [r0]\n\ mov r3, #0xc1\n\ @@ -3271,7 +3271,7 @@ void sub_80ED01C() ._666:\n\ mov r0, #0x1\n\ bl sub_80F2C80\n\ - ldr r1, ._733\n\ + ldr r1, ._733 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3285,8 +3285,8 @@ void sub_80ED01C() lsr r2, r0, #0x18\n\ cmp r2, #0\n\ bne ._736 @cond_branch\n\ - ldr r0, ._733\n\ - ldr r3, ._733 + 4\n\ + ldr r0, ._733 @ gSharedMem\n\ + ldr r3, ._733 + 4 @ 0x306\n\ add r1, r0, r3\n\ strh r2, [r1]\n\ mov r1, #0xc1\n\ @@ -3302,8 +3302,8 @@ void sub_80ED01C() .word gSharedMem\n\ .word 0x306\n\ ._668:\n\ - ldr r4, ._737\n\ - ldr r2, ._737 + 4\n\ + ldr r4, ._737 @ gSharedMem\n\ + ldr r2, ._737 + 4 @ 0x6dfc\n\ add r0, r4, r2\n\ ldrb r0, [r0]\n\ add r0, r0, #0x7\n\ @@ -3317,8 +3317,8 @@ void sub_80ED01C() add r0, r0, #0x1\n\ strh r0, [r4]\n\ ._669:\n\ - ldr r0, ._737\n\ - ldr r1, ._737 + 4\n\ + ldr r0, ._737 @ gSharedMem\n\ + ldr r1, ._737 + 4 @ 0x6dfc\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ add r0, r0, #0x7\n\ @@ -3328,14 +3328,14 @@ void sub_80ED01C() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._736 @cond_branch\n\ - ldr r0, ._737 + 8\n\ + ldr r0, ._737 + 8 @ sub_80ED31C\n\ bl sub_80EBDBC\n\ - ldr r0, ._737 + 12\n\ + ldr r0, ._737 + 12 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._736 @cond_branch\n\ - ldr r0, ._737 + 16\n\ - ldr r2, ._737 + 20\n\ + ldr r0, ._737 + 16 @ 0x6007de0\n\ + ldr r2, ._737 + 20 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -3472,7 +3472,7 @@ void sub_80ED31C() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._743\n\ + ldr r0, ._743 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r4, r0, r1\n\ @@ -3500,7 +3500,7 @@ void sub_80ED31C() beq ._747 @cond_branch\n\ cmp r0, #0x2\n\ beq ._748 @cond_branch\n\ - ldr r0, ._751\n\ + ldr r0, ._751 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -3508,7 +3508,7 @@ void sub_80ED31C() beq ._749 @cond_branch\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._751 + 4\n\ + ldr r0, ._751 + 4 @ sub_80ED4D8\n\ bl sub_80EBDBC\n\ b ._762\n\ ._752:\n\ @@ -3535,7 +3535,7 @@ void sub_80ED31C() beq ._761 @cond_branch\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._757\n\ + ldr r0, ._757 @ sub_80ECD80\n\ bl sub_80EBDBC\n\ b ._762\n\ ._758:\n\ @@ -3559,12 +3559,12 @@ void sub_80ED31C() ._760:\n\ strh r0, [r4]\n\ ._761:\n\ - ldr r0, ._763\n\ + ldr r0, ._763 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._762 @cond_branch\n\ - ldr r0, ._763 + 4\n\ - ldr r1, ._763 + 8\n\ + ldr r0, ._763 + 4 @ gLink\n\ + ldr r1, ._763 + 8 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ @@ -3638,7 +3638,7 @@ void sub_80ED3D0() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._767\n\ + ldr r0, ._767 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -3648,7 +3648,7 @@ void sub_80ED3D0() b ._803\n\ ._765:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._767 + 4\n\ + ldr r1, ._767 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -3670,7 +3670,7 @@ void sub_80ED3D0() ._770:\n\ mov r0, #0x0\n\ bl SetVBlankCallback\n\ - ldr r1, ._780\n\ + ldr r1, ._780 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3682,7 +3682,7 @@ void sub_80ED3D0() ._771:\n\ bl sub_80EED0C\n\ bl sub_80F6134\n\ - ldr r1, ._783\n\ + ldr r1, ._783 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3694,7 +3694,7 @@ void sub_80ED3D0() ._772:\n\ mov r0, #0x0\n\ bl sub_80EEFBC\n\ - ldr r1, ._786\n\ + ldr r1, ._786 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3706,7 +3706,7 @@ void sub_80ED3D0() ._773:\n\ mov r0, #0x0\n\ bl sub_80F0264\n\ - ldr r1, ._790\n\ + ldr r1, ._790 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3718,7 +3718,7 @@ void sub_80ED3D0() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._803 @cond_branch\n\ - ldr r1, ._790\n\ + ldr r1, ._790 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3731,7 +3731,7 @@ void sub_80ED3D0() bl sub_8055870\n\ cmp r0, #0\n\ bne ._803 @cond_branch\n\ - ldr r1, ._794\n\ + ldr r1, ._794 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3743,7 +3743,7 @@ void sub_80ED3D0() ._776:\n\ mov r0, #0x0\n\ bl sub_80F3008\n\ - ldr r4, ._797\n\ + ldr r4, ._797 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -3755,7 +3755,7 @@ void sub_80ED3D0() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._797 + 4\n\ + ldr r0, ._797 + 4 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ @@ -3773,19 +3773,19 @@ void sub_80ED3D0() ._777:\n\ mov r0, #0x4\n\ bl sub_80EED2C\n\ - ldr r1, ._801\n\ + ldr r1, ._801 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ ldrh r0, [r1]\n\ add r0, r0, #0x1\n\ strh r0, [r1]\n\ - ldr r0, ._801 + 4\n\ + ldr r0, ._801 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._803 @cond_branch\n\ - ldr r0, ._801 + 8\n\ - ldr r2, ._801 + 12\n\ + ldr r0, ._801 + 8 @ 0x6007de0\n\ + ldr r2, ._801 + 12 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -3798,13 +3798,13 @@ void sub_80ED3D0() .word 0x6007de0\n\ .word 0x600f800\n\ ._778:\n\ - ldr r0, ._804\n\ + ldr r0, ._804 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ cmp r0, #0\n\ bne ._803 @cond_branch\n\ - ldr r0, ._804 + 4\n\ + ldr r0, ._804 + 4 @ sub_80ED31C\n\ bl sub_80EBDBC\n\ ._803:\n\ add sp, sp, #0x4\n\ @@ -3872,7 +3872,7 @@ void sub_80ED4D8() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._808\n\ + ldr r1, ._808 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -3883,7 +3883,7 @@ void sub_80ED4D8() b ._844\n\ ._806:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._808 + 4\n\ + ldr r1, ._808 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -3915,7 +3915,7 @@ void sub_80ED4D8() bl BeginNormalPaletteFade\n\ b ._820\n\ ._812:\n\ - ldr r0, ._824\n\ + ldr r0, ._824 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -3927,7 +3927,7 @@ void sub_80ED4D8() bl SetVBlankCallback\n\ bl sub_80EED0C\n\ bl sub_80F3130\n\ - ldr r1, ._824 + 4\n\ + ldr r1, ._824 + 4 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3941,7 +3941,7 @@ void sub_80ED4D8() bl sub_8055870\n\ cmp r0, #0\n\ bne ._844 @cond_branch\n\ - ldr r1, ._828\n\ + ldr r1, ._828 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -3952,7 +3952,7 @@ void sub_80ED4D8() .word gSharedMem\n\ ._814:\n\ bl sub_80F4CF0\n\ - ldr r1, ._831\n\ + ldr r1, ._831 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3963,7 +3963,7 @@ void sub_80ED4D8() .word gSharedMem\n\ ._815:\n\ bl sub_80EFF34\n\ - ldr r1, ._835\n\ + ldr r1, ._835 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -3975,7 +3975,7 @@ void sub_80ED4D8() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._844 @cond_branch\n\ - ldr r1, ._835\n\ + ldr r1, ._835 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -3988,7 +3988,7 @@ void sub_80ED4D8() bl sub_80F35B4\n\ mov r0, #0x2\n\ bl sub_80EEFBC\n\ - ldr r4, ._838\n\ + ldr r4, ._838 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -4000,7 +4000,7 @@ void sub_80ED4D8() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._838 + 4\n\ + ldr r0, ._838 + 4 @ sub_80EBD4C\n\ bl SetVBlankCallback\n\ ._820:\n\ mov r2, #0xc1\n\ @@ -4019,19 +4019,19 @@ void sub_80ED4D8() ._818:\n\ mov r0, #0x2\n\ bl sub_80EED2C\n\ - ldr r1, ._842\n\ + ldr r1, ._842 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ ldrh r0, [r1]\n\ add r0, r0, #0x1\n\ strh r0, [r1]\n\ - ldr r0, ._842 + 4\n\ + ldr r0, ._842 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._844 @cond_branch\n\ - ldr r0, ._842 + 8\n\ - ldr r2, ._842 + 12\n\ + ldr r0, ._842 + 8 @ 0x6007de0\n\ + ldr r2, ._842 + 12 @ 0x600f000\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -4044,13 +4044,13 @@ void sub_80ED4D8() .word 0x6007de0\n\ .word 0x600f000\n\ ._819:\n\ - ldr r0, ._845\n\ + ldr r0, ._845 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ cmp r0, #0\n\ bne ._844 @cond_branch\n\ - ldr r0, ._845 + 4\n\ + ldr r0, ._845 + 4 @ sub_80ED858\n\ bl sub_80EBDBC\n\ ._844:\n\ add sp, sp, #0x4\n\ @@ -4123,7 +4123,7 @@ void sub_80ED620() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._849\n\ + ldr r1, ._849 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -4134,7 +4134,7 @@ void sub_80ED620() b ._912\n\ ._847:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._849 + 4\n\ + ldr r1, ._849 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -4165,7 +4165,7 @@ void sub_80ED620() bl sub_80F1E84\n\ mov r0, #0x1\n\ bl sub_80F2D04\n\ - ldr r1, ._870\n\ + ldr r1, ._870 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -4192,7 +4192,7 @@ void sub_80ED620() beq ._875 @cond_branch\n\ b ._912\n\ ._875:\n\ - ldr r4, ._878\n\ + ldr r4, ._878 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -4212,7 +4212,7 @@ void sub_80ED620() ._878:\n\ .word gSharedMem\n\ ._855:\n\ - ldr r0, ._883\n\ + ldr r0, ._883 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -4226,8 +4226,8 @@ void sub_80ED620() bl SetVBlankCallback\n\ bl sub_80EED0C\n\ bl sub_80EF814\n\ - ldr r0, ._883 + 4\n\ - ldr r2, ._883 + 8\n\ + ldr r0, ._883 + 4 @ gSharedMem\n\ + ldr r2, ._883 + 8 @ 0x76aa\n\ add r1, r0, r2\n\ strb r4, [r1]\n\ mov r1, #0xc1\n\ @@ -4247,7 +4247,7 @@ void sub_80ED620() bl sub_80F2620\n\ b ._885\n\ ._857:\n\ - ldr r0, ._887\n\ + ldr r0, ._887 @ 0xd162\n\ add r1, r4, r0\n\ mov r0, #0x2\n\ strb r0, [r1]\n\ @@ -4262,7 +4262,7 @@ void sub_80ED620() .word 0xd162\n\ ._858:\n\ bl sub_80EFF34\n\ - ldr r1, ._890\n\ + ldr r1, ._890 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -4280,7 +4280,7 @@ void sub_80ED620() bl sub_8055870\n\ cmp r0, #0\n\ bne ._912 @cond_branch\n\ - ldr r1, ._894\n\ + ldr r1, ._894 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -4294,7 +4294,7 @@ void sub_80ED620() b ._896\n\ ._862:\n\ bl sub_80F33A8\n\ - ldr r4, ._898\n\ + ldr r4, ._898 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -4306,7 +4306,7 @@ void sub_80ED620() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._898 + 4\n\ + ldr r0, ._898 + 4 @ sub_80EBD4C\n\ bl SetVBlankCallback\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ @@ -4320,7 +4320,7 @@ void sub_80ED620() ._863:\n\ mov r0, #0x2\n\ bl sub_80EED2C\n\ - ldr r1, ._901\n\ + ldr r1, ._901 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -4330,7 +4330,7 @@ void sub_80ED620() ._901:\n\ .word gSharedMem\n\ ._864:\n\ - ldr r0, ._905\n\ + ldr r0, ._905 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -4347,7 +4347,7 @@ void sub_80ED620() ._865:\n\ mov r0, #0x1\n\ bl sub_80F2C80\n\ - ldr r1, ._909\n\ + ldr r1, ._909 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -4363,7 +4363,7 @@ void sub_80ED620() cmp r0, #0\n\ bne ._912 @cond_branch\n\ ._885:\n\ - ldr r1, ._909\n\ + ldr r1, ._909 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -4379,7 +4379,7 @@ void sub_80ED620() ._867:\n\ mov r0, #0x6\n\ bl sub_80F2C80\n\ - ldr r1, ._913\n\ + ldr r1, ._913 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -4392,14 +4392,14 @@ void sub_80ED620() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._912 @cond_branch\n\ - ldr r0, ._913 + 4\n\ + ldr r0, ._913 + 4 @ sub_80ED858\n\ bl sub_80EBDBC\n\ - ldr r0, ._913 + 8\n\ + ldr r0, ._913 + 8 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._912 @cond_branch\n\ - ldr r0, ._913 + 12\n\ - ldr r2, ._913 + 16\n\ + ldr r0, ._913 + 12 @ 0x6007de0\n\ + ldr r2, ._913 + 16 @ 0x600f000\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -4684,7 +4684,7 @@ void sub_80ED858() asm("\ push {r4, r5, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._917\n\ + ldr r1, ._917 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -4695,7 +4695,7 @@ void sub_80ED858() b ._999\n\ ._915:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._917 + 4\n\ + ldr r1, ._917 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -4720,7 +4720,7 @@ void sub_80ED858() ._920:\n\ bl sub_80F4F78\n\ bl sub_80F5B38\n\ - ldr r0, ._933\n\ + ldr r0, ._933 @ gSharedMem\n\ mov r4, #0xc1\n\ lsl r4, r4, #0x2\n\ add r0, r0, r4\n\ @@ -4738,7 +4738,7 @@ void sub_80ED858() beq ._935 @cond_branch\n\ b ._999\n\ ._935:\n\ - ldr r0, ._938\n\ + ldr r0, ._938 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -4752,7 +4752,7 @@ void sub_80ED858() ._922:\n\ mov r0, #0x1\n\ bl sub_80F0174\n\ - ldr r0, ._941\n\ + ldr r0, ._941 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r0, r2\n\ @@ -4774,24 +4774,24 @@ void sub_80ED858() bl sub_80F3D00\n\ b ._945\n\ ._924:\n\ - ldr r2, ._951\n\ + ldr r2, ._951 @ gMain\n\ ldrh r1, [r2, #0x2c]\n\ mov r0, #0x40\n\ and r0, r0, r1\n\ add r3, r2, #0\n\ cmp r0, #0\n\ beq ._949 @cond_branch\n\ - ldr r1, ._951 + 4\n\ + ldr r1, ._951 + 4 @ 0x87cb\n\ add r0, r5, r1\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._949 @cond_branch\n\ - ldr r2, ._951 + 8\n\ + ldr r2, ._951 + 8 @ 0x76aa\n\ add r0, r5, r2\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._948 @cond_branch\n\ - ldr r4, ._951 + 12\n\ + ldr r4, ._951 + 12 @ 0x87dc\n\ add r0, r5, r4\n\ mov r1, #0x0\n\ ldsh r0, [r0, r1]\n\ @@ -4820,17 +4820,17 @@ void sub_80ED858() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._956 @cond_branch\n\ - ldr r4, ._958\n\ + ldr r4, ._958 @ 0x87cb\n\ add r0, r5, r4\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._956 @cond_branch\n\ - ldr r1, ._958 + 4\n\ + ldr r1, ._958 + 4 @ 0x76aa\n\ add r0, r5, r1\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._955 @cond_branch\n\ - ldr r2, ._958 + 8\n\ + ldr r2, ._958 + 8 @ 0x87dc\n\ add r0, r5, r2\n\ sub r4, r4, #0x57\n\ add r1, r5, r4\n\ @@ -4869,7 +4869,7 @@ void sub_80ED858() bl PlaySE\n\ bl sub_80F4FDC\n\ bl move_anim_execute\n\ - ldr r0, ._962\n\ + ldr r0, ._962 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -4888,16 +4888,16 @@ void sub_80ED858() b ._999\n\ ._964:\n\ add r4, r5, #0\n\ - ldr r2, ._970\n\ + ldr r2, ._970 @ 0x76aa\n\ add r0, r4, r2\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ bne ._966 @cond_branch\n\ - ldr r1, ._970 + 4\n\ + ldr r1, ._970 + 4 @ 0x87dc\n\ add r0, r4, r1\n\ mov r2, #0x0\n\ ldsh r1, [r0, r2]\n\ - ldr r2, ._970 + 8\n\ + ldr r2, ._970 + 8 @ 0x87da\n\ add r0, r4, r2\n\ mov r2, #0x0\n\ ldsh r0, [r0, r2]\n\ @@ -4921,7 +4921,7 @@ void sub_80ED858() .word 0x87dc\n\ .word 0x87da\n\ ._966:\n\ - ldr r1, ._975\n\ + ldr r1, ._975 @ 0x6dac\n\ add r0, r5, r1\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ @@ -4948,7 +4948,7 @@ void sub_80ED858() b ._999\n\ ._977:\n\ bl sub_80F3D00\n\ - ldr r0, ._980\n\ + ldr r0, ._980 @ gSharedMem\n\ mov r4, #0xc1\n\ lsl r4, r4, #0x2\n\ add r0, r0, r4\n\ @@ -4963,7 +4963,7 @@ void sub_80ED858() bl sub_8055870\n\ cmp r0, #0\n\ bne ._999 @cond_branch\n\ - ldr r0, ._984\n\ + ldr r0, ._984 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -4976,7 +4976,7 @@ void sub_80ED858() mov r0, #0x3\n\ bl sub_80EEFBC\n\ bl sub_80F3668\n\ - ldr r0, ._987\n\ + ldr r0, ._987 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r0, r2\n\ @@ -4996,7 +4996,7 @@ void sub_80ED858() bl sub_80EEFBC\n\ bl sub_80F3698\n\ ._945:\n\ - ldr r0, ._991\n\ + ldr r0, ._991 @ gSharedMem\n\ mov r4, #0xc1\n\ lsl r4, r4, #0x2\n\ add r0, r0, r4\n\ @@ -5017,7 +5017,7 @@ void sub_80ED858() mov r0, #0x0\n\ bl sub_80F0174\n\ bl sub_80F2F48\n\ - ldr r5, ._995\n\ + ldr r5, ._995 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r5, r1\n\ @@ -5039,7 +5039,7 @@ void sub_80ED858() ._995:\n\ .word gSharedMem\n\ ._931:\n\ - ldr r0, ._1000\n\ + ldr r0, ._1000 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -5047,8 +5047,8 @@ void sub_80ED858() bne ._999 @cond_branch\n\ bl sub_80F3CE8\n\ bl sub_80F5BDC\n\ - ldr r0, ._1000 + 4\n\ - ldr r4, ._1000 + 8\n\ + ldr r0, ._1000 + 4 @ gSharedMem\n\ + ldr r4, ._1000 + 8 @ 0x76aa\n\ add r0, r0, r4\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ @@ -5058,7 +5058,7 @@ void sub_80ED858() bl sub_80F2D6C\n\ mov r0, #0x6\n\ bl sub_80F2D6C\n\ - ldr r0, ._1000 + 12\n\ + ldr r0, ._1000 + 12 @ sub_80ECA10\n\ bl sub_80EBDBC\n\ b ._999\n\ ._1001:\n\ @@ -5070,15 +5070,15 @@ void sub_80ED858() .word sub_80ECA10+1\n\ ._998:\n\ bl sub_80F3614\n\ - ldr r0, ._1003\n\ + ldr r0, ._1003 @ sub_80ED3D0\n\ bl sub_80EBDBC\n\ ._999:\n\ - ldr r0, ._1003 + 4\n\ + ldr r0, ._1003 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1002 @cond_branch\n\ - ldr r0, ._1003 + 8\n\ - ldr r1, ._1003 + 12\n\ + ldr r0, ._1003 + 8 @ gLink\n\ + ldr r1, ._1003 + 12 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ @@ -5483,7 +5483,7 @@ void sub_80EDB88() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._1007\n\ + ldr r1, ._1007 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -5494,7 +5494,7 @@ void sub_80EDB88() b ._1088\n\ ._1005:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._1007 + 4\n\ + ldr r1, ._1007 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -5526,7 +5526,7 @@ void sub_80EDB88() bl sub_80F1E84\n\ mov r0, #0x0\n\ bl sub_80F2D04\n\ - ldr r1, ._1029\n\ + ldr r1, ._1029 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5544,7 +5544,7 @@ void sub_80EDB88() ._1031:\n\ mov r0, #0x4\n\ bl sub_80EEFBC\n\ - ldr r1, ._1034\n\ + ldr r1, ._1034 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -5561,7 +5561,7 @@ void sub_80EDB88() beq ._1036 @cond_branch\n\ b ._1088\n\ ._1036:\n\ - ldr r4, ._1039\n\ + ldr r4, ._1039 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -5578,7 +5578,7 @@ void sub_80EDB88() ._1039:\n\ .word gSharedMem\n\ ._1013:\n\ - ldr r0, ._1044\n\ + ldr r0, ._1044 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -5590,7 +5590,7 @@ void sub_80EDB88() bl SetVBlankCallback\n\ bl sub_80EED0C\n\ bl sub_80EF814\n\ - ldr r1, ._1044 + 4\n\ + ldr r1, ._1044 + 4 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5602,7 +5602,7 @@ void sub_80EDB88() .word gSharedMem\n\ ._1014:\n\ bl sub_80F2620\n\ - ldr r1, ._1047\n\ + ldr r1, ._1047 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -5613,7 +5613,7 @@ void sub_80EDB88() .word gSharedMem\n\ ._1015:\n\ bl sub_80F638C\n\ - ldr r1, ._1051\n\ + ldr r1, ._1051 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5625,7 +5625,7 @@ void sub_80EDB88() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1049 @cond_branch\n\ - ldr r1, ._1051\n\ + ldr r1, ._1051 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -5638,7 +5638,7 @@ void sub_80EDB88() ._1051:\n\ .word gSharedMem\n\ ._1049:\n\ - ldr r1, ._1054\n\ + ldr r1, ._1054 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5653,7 +5653,7 @@ void sub_80EDB88() beq ._1056 @cond_branch\n\ b ._1088\n\ ._1056:\n\ - ldr r1, ._1059\n\ + ldr r1, ._1059 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -5671,7 +5671,7 @@ void sub_80EDB88() beq ._1061 @cond_branch\n\ b ._1088\n\ ._1061:\n\ - ldr r1, ._1064\n\ + ldr r1, ._1064 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5683,7 +5683,7 @@ void sub_80EDB88() ._1019:\n\ mov r0, #0x1\n\ bl sub_80F0264\n\ - ldr r1, ._1068\n\ + ldr r1, ._1068 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -5695,7 +5695,7 @@ void sub_80EDB88() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1088 @cond_branch\n\ - ldr r1, ._1068\n\ + ldr r1, ._1068 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5707,7 +5707,7 @@ void sub_80EDB88() ._1021:\n\ mov r0, #0x2\n\ bl sub_80F2C80\n\ - ldr r1, ._1072\n\ + ldr r1, ._1072 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -5720,7 +5720,7 @@ void sub_80EDB88() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1088 @cond_branch\n\ - ldr r1, ._1072\n\ + ldr r1, ._1072 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5732,7 +5732,7 @@ void sub_80EDB88() ._1023:\n\ mov r0, #0x1\n\ bl sub_80F3008\n\ - ldr r1, ._1075\n\ + ldr r1, ._1075 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -5745,7 +5745,7 @@ void sub_80EDB88() bl sub_8055870\n\ cmp r0, #0\n\ bne ._1088 @cond_branch\n\ - ldr r1, ._1079\n\ + ldr r1, ._1079 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -5766,7 +5766,7 @@ void sub_80EDB88() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._1082\n\ + ldr r0, ._1082 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ ._1038:\n\ mov r2, #0xc1\n\ @@ -5784,19 +5784,19 @@ void sub_80EDB88() ._1026:\n\ mov r0, #0x4\n\ bl sub_80EED2C\n\ - ldr r1, ._1086\n\ + ldr r1, ._1086 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ ldrh r0, [r1]\n\ add r0, r0, #0x1\n\ strh r0, [r1]\n\ - ldr r0, ._1086 + 4\n\ + ldr r0, ._1086 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1088 @cond_branch\n\ - ldr r0, ._1086 + 8\n\ - ldr r2, ._1086 + 12\n\ + ldr r0, ._1086 + 8 @ 0x6007de0\n\ + ldr r2, ._1086 + 12 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -5809,13 +5809,13 @@ void sub_80EDB88() .word 0x6007de0\n\ .word 0x600f800\n\ ._1027:\n\ - ldr r0, ._1089\n\ + ldr r0, ._1089 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ cmp r0, #0\n\ bne ._1088 @cond_branch\n\ - ldr r0, ._1089 + 4\n\ + ldr r0, ._1089 + 4 @ sub_80EDDBC\n\ bl sub_80EBDBC\n\ ._1088:\n\ add sp, sp, #0x4\n\ @@ -5928,7 +5928,7 @@ void sub_80EDDBC() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._1095\n\ + ldr r0, ._1095 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r4, r0, r1\n\ @@ -5956,7 +5956,7 @@ void sub_80EDDBC() beq ._1099 @cond_branch\n\ cmp r0, #0x2\n\ beq ._1100 @cond_branch\n\ - ldr r0, ._1103\n\ + ldr r0, ._1103 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -5964,7 +5964,7 @@ void sub_80EDDBC() beq ._1101 @cond_branch\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._1103 + 4\n\ + ldr r0, ._1103 + 4 @ sub_80EDEE4\n\ bl sub_80EBDBC\n\ b ._1114\n\ ._1104:\n\ @@ -5991,7 +5991,7 @@ void sub_80EDDBC() beq ._1113 @cond_branch\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._1109\n\ + ldr r0, ._1109 @ sub_80EDE70\n\ bl sub_80EBDBC\n\ b ._1114\n\ ._1110:\n\ @@ -6015,12 +6015,12 @@ void sub_80EDDBC() ._1112:\n\ strh r0, [r4]\n\ ._1113:\n\ - ldr r0, ._1115\n\ + ldr r0, ._1115 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1114 @cond_branch\n\ - ldr r0, ._1115 + 4\n\ - ldr r1, ._1115 + 8\n\ + ldr r0, ._1115 + 4 @ gLink\n\ + ldr r1, ._1115 + 8 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ @@ -6118,7 +6118,7 @@ void sub_80EDEE4() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._1134\n\ + ldr r1, ._1134 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -6129,7 +6129,7 @@ void sub_80EDEE4() b ._1180\n\ ._1132:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._1134 + 4\n\ + ldr r1, ._1134 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -6163,7 +6163,7 @@ void sub_80EDEE4() bl BeginNormalPaletteFade\n\ b ._1169\n\ ._1138:\n\ - ldr r0, ._1152\n\ + ldr r0, ._1152 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -6175,7 +6175,7 @@ void sub_80EDEE4() bl SetVBlankCallback\n\ bl sub_80EED0C\n\ bl sub_80F3130\n\ - ldr r1, ._1152 + 4\n\ + ldr r1, ._1152 + 4 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -6188,7 +6188,7 @@ void sub_80EDEE4() ._1139:\n\ bl sub_80F66E0\n\ bl sub_80EEE08\n\ - ldr r1, ._1155\n\ + ldr r1, ._1155 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -6202,7 +6202,7 @@ void sub_80EDEE4() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1180 @cond_branch\n\ - ldr r1, ._1159\n\ + ldr r1, ._1159 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -6215,7 +6215,7 @@ void sub_80EDEE4() mov r0, #0x5\n\ bl sub_80EEFBC\n\ bl sub_80F38B8\n\ - ldr r1, ._1163\n\ + ldr r1, ._1163 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -6227,7 +6227,7 @@ void sub_80EDEE4() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1180 @cond_branch\n\ - ldr r1, ._1163\n\ + ldr r1, ._1163 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -6240,7 +6240,7 @@ void sub_80EDEE4() bl sub_8055870\n\ cmp r0, #0\n\ bne ._1180 @cond_branch\n\ - ldr r1, ._1167\n\ + ldr r1, ._1167 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -6261,7 +6261,7 @@ void sub_80EDEE4() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._1170\n\ + ldr r0, ._1170 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ b ._1169\n\ ._1171:\n\ @@ -6271,19 +6271,19 @@ void sub_80EDEE4() ._1145:\n\ mov r0, #0x3\n\ bl sub_80EED2C\n\ - ldr r1, ._1174\n\ + ldr r1, ._1174 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ ldrh r0, [r1]\n\ add r0, r0, #0x1\n\ strh r0, [r1]\n\ - ldr r0, ._1174 + 4\n\ + ldr r0, ._1174 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1180 @cond_branch\n\ - ldr r0, ._1174 + 8\n\ - ldr r2, ._1174 + 12\n\ + ldr r0, ._1174 + 8 @ 0x6007de0\n\ + ldr r2, ._1174 + 12 @ 0x600f000\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -6296,7 +6296,7 @@ void sub_80EDEE4() .word 0x6007de0\n\ .word 0x600f000\n\ ._1146:\n\ - ldr r0, ._1178\n\ + ldr r0, ._1178 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -6320,7 +6320,7 @@ void sub_80EDEE4() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1180 @cond_branch\n\ - ldr r0, ._1181\n\ + ldr r0, ._1181 @ sub_80EE06C\n\ bl sub_80EBDBC\n\ ._1180:\n\ add sp, sp, #0x4\n\ @@ -6399,7 +6399,7 @@ void sub_80EE06C() asm("\ push {r4, r5, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._1185\n\ + ldr r1, ._1185 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -6410,7 +6410,7 @@ void sub_80EE06C() b ._1248\n\ ._1183:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._1185 + 4\n\ + ldr r1, ._1185 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -6431,7 +6431,7 @@ void sub_80EE06C() .word ._1196\n\ ._1188:\n\ bl sub_80F15A8\n\ - ldr r1, ._1198\n\ + ldr r1, ._1198 @ gSharedMem\n\ mov r5, #0xc1\n\ lsl r5, r5, #0x2\n\ add r1, r1, r5\n\ @@ -6441,14 +6441,14 @@ void sub_80EE06C() ._1198:\n\ .word gSharedMem\n\ ._1189:\n\ - ldr r2, ._1203\n\ + ldr r2, ._1203 @ gMain\n\ ldrh r1, [r2, #0x30]\n\ mov r0, #0x40\n\ and r0, r0, r1\n\ add r3, r2, #0\n\ cmp r0, #0\n\ beq ._1201 @cond_branch\n\ - ldr r1, ._1203 + 4\n\ + ldr r1, ._1203 + 4 @ 0x87dc\n\ add r0, r4, r1\n\ mov r2, #0x0\n\ ldsh r0, [r0, r2]\n\ @@ -6474,9 +6474,9 @@ void sub_80EE06C() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._1206 @cond_branch\n\ - ldr r1, ._1208\n\ + ldr r1, ._1208 @ 0x87dc\n\ add r0, r4, r1\n\ - ldr r2, ._1208 + 4\n\ + ldr r2, ._1208 + 4 @ 0x8774\n\ add r1, r4, r2\n\ mov r5, #0x0\n\ ldsh r2, [r0, r5]\n\ @@ -6507,7 +6507,7 @@ void sub_80EE06C() bl PlaySE\n\ mov r0, #0xb\n\ bl sub_80EEFBC\n\ - ldr r0, ._1212\n\ + ldr r0, ._1212 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -6525,7 +6525,7 @@ void sub_80EE06C() ._1214:\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._1217\n\ + ldr r0, ._1217 @ sub_80EE294\n\ bl sub_80EBDBC\n\ b ._1248\n\ ._1218:\n\ @@ -6539,7 +6539,7 @@ void sub_80EE06C() beq ._1219 @cond_branch\n\ b ._1248\n\ ._1219:\n\ - ldr r1, ._1222\n\ + ldr r1, ._1222 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -6553,7 +6553,7 @@ void sub_80EE06C() add r1, r0, #0\n\ cmp r1, #0\n\ bne ._1248 @cond_branch\n\ - ldr r0, ._1226\n\ + ldr r0, ._1226 @ gSharedMem\n\ mov r5, #0xc1\n\ lsl r5, r5, #0x2\n\ add r0, r0, r5\n\ @@ -6565,7 +6565,7 @@ void sub_80EE06C() .word gSharedMem\n\ ._1192:\n\ bl sub_80F3B00\n\ - ldr r1, ._1229\n\ + ldr r1, ._1229 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -6584,7 +6584,7 @@ void sub_80EE06C() cmp r0, #0\n\ bne ._1248 @cond_branch\n\ bl sub_80F1494\n\ - ldr r1, ._1233\n\ + ldr r1, ._1233 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -6608,7 +6608,7 @@ void sub_80EE06C() mov r0, #0x5\n\ bl PlaySE\n\ bl sub_80F3B94\n\ - ldr r0, ._1238\n\ + ldr r0, ._1238 @ gSharedMem\n\ mov r5, #0xc1\n\ lsl r5, r5, #0x2\n\ add r0, r0, r5\n\ @@ -6620,7 +6620,7 @@ void sub_80EE06C() ._1238:\n\ .word gSharedMem\n\ ._1236:\n\ - ldr r0, ._1242\n\ + ldr r0, ._1242 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x2\n\ and r0, r0, r1\n\ @@ -6629,7 +6629,7 @@ void sub_80EE06C() mov r0, #0x5\n\ bl PlaySE\n\ bl sub_80F3B94\n\ - ldr r0, ._1242 + 4\n\ + ldr r0, ._1242 + 4 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -6646,7 +6646,7 @@ void sub_80EE06C() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1248 @cond_branch\n\ - ldr r0, ._1246\n\ + ldr r0, ._1246 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r0, r2\n\ @@ -6666,18 +6666,18 @@ void sub_80EE06C() bne ._1248 @cond_branch\n\ mov r0, #0x5\n\ bl sub_80EEFBC\n\ - ldr r0, ._1250\n\ + ldr r0, ._1250 @ gSharedMem\n\ mov r5, #0xc1\n\ lsl r5, r5, #0x2\n\ add r0, r0, r5\n\ strh r4, [r0]\n\ ._1248:\n\ - ldr r0, ._1250 + 4\n\ + ldr r0, ._1250 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1249 @cond_branch\n\ - ldr r0, ._1250 + 8\n\ - ldr r1, ._1250 + 12\n\ + ldr r0, ._1250 + 8 @ gLink\n\ + ldr r1, ._1250 + 12 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ @@ -6794,7 +6794,7 @@ void sub_80EE294() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._1254\n\ + ldr r1, ._1254 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r0, r1, r2\n\ @@ -6805,7 +6805,7 @@ void sub_80EE294() b ._1288\n\ ._1252:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._1254 + 4\n\ + ldr r1, ._1254 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -6836,7 +6836,7 @@ void sub_80EE294() mov r3, #0x10\n\ b ._1266\n\ ._1258:\n\ - ldr r0, ._1270\n\ + ldr r0, ._1270 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -6849,7 +6849,7 @@ void sub_80EE294() bl sub_80EED0C\n\ bl sub_80F3C2C\n\ bl sub_80EEE08\n\ - ldr r1, ._1270 + 4\n\ + ldr r1, ._1270 + 4 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -6863,7 +6863,7 @@ void sub_80EE294() bl sub_80F6134\n\ mov r0, #0x1\n\ bl sub_80F0264\n\ - ldr r1, ._1274\n\ + ldr r1, ._1274 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -6875,7 +6875,7 @@ void sub_80EE294() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1288 @cond_branch\n\ - ldr r1, ._1274\n\ + ldr r1, ._1274 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -6889,9 +6889,9 @@ void sub_80EE294() bl sub_80EEFBC\n\ mov r0, #0x1\n\ bl sub_80F3008\n\ - ldr r0, ._1277\n\ + ldr r0, ._1277 @ sub_80EBD18\n\ bl SetVBlankCallback\n\ - ldr r1, ._1277 + 4\n\ + ldr r1, ._1277 + 4 @ gSharedMem\n\ mov r2, #0xc1\n\ lsl r2, r2, #0x2\n\ add r1, r1, r2\n\ @@ -6905,7 +6905,7 @@ void sub_80EE294() bl sub_8055870\n\ cmp r0, #0\n\ bne ._1288 @cond_branch\n\ - ldr r1, ._1281\n\ + ldr r1, ._1281 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -6938,19 +6938,19 @@ void sub_80EE294() ._1264:\n\ mov r0, #0x4\n\ bl sub_80EED2C\n\ - ldr r1, ._1286\n\ + ldr r1, ._1286 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ ldrh r0, [r1]\n\ add r0, r0, #0x1\n\ strh r0, [r1]\n\ - ldr r0, ._1286 + 4\n\ + ldr r0, ._1286 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1288 @cond_branch\n\ - ldr r0, ._1286 + 8\n\ - ldr r2, ._1286 + 12\n\ + ldr r0, ._1286 + 8 @ 0x6007de0\n\ + ldr r2, ._1286 + 12 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -6963,13 +6963,13 @@ void sub_80EE294() .word 0x6007de0\n\ .word 0x600f800\n\ ._1265:\n\ - ldr r0, ._1289\n\ + ldr r0, ._1289 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ cmp r0, #0\n\ bne ._1288 @cond_branch\n\ - ldr r0, ._1289 + 4\n\ + ldr r0, ._1289 + 4 @ sub_80EDDBC\n\ bl sub_80EBDBC\n\ ._1288:\n\ add sp, sp, #0x4\n\ @@ -7042,7 +7042,7 @@ void sub_80EE3D8() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._1293\n\ + ldr r0, ._1293 @ gSharedMem\n\ mov r1, #0xc1\n\ lsl r1, r1, #0x2\n\ add r0, r0, r1\n\ @@ -7052,7 +7052,7 @@ void sub_80EE3D8() b ._1354\n\ ._1291:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._1293 + 4\n\ + ldr r1, ._1293 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -7080,7 +7080,7 @@ void sub_80EE3D8() bl sub_80F1E84\n\ mov r0, #0x0\n\ bl sub_80F2D04\n\ - ldr r1, ._1311\n\ + ldr r1, ._1311 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7098,7 +7098,7 @@ void sub_80EE3D8() ._1313:\n\ mov r0, #0x9\n\ bl sub_80EEFBC\n\ - ldr r1, ._1316\n\ + ldr r1, ._1316 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7115,7 +7115,7 @@ void sub_80EE3D8() beq ._1318 @cond_branch\n\ b ._1354\n\ ._1318:\n\ - ldr r4, ._1321\n\ + ldr r4, ._1321 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -7132,7 +7132,7 @@ void sub_80EE3D8() ._1321:\n\ .word gSharedMem\n\ ._1299:\n\ - ldr r0, ._1326\n\ + ldr r0, ._1326 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ @@ -7145,7 +7145,7 @@ void sub_80EE3D8() bl sub_80EED0C\n\ bl sub_80EF814\n\ bl sub_80EEE08\n\ - ldr r1, ._1326 + 4\n\ + ldr r1, ._1326 + 4 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7157,7 +7157,7 @@ void sub_80EE3D8() .word gSharedMem\n\ ._1300:\n\ bl sub_80F2620\n\ - ldr r1, ._1329\n\ + ldr r1, ._1329 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7169,7 +7169,7 @@ void sub_80EE3D8() ._1301:\n\ mov r0, #0x2\n\ bl sub_80F0264\n\ - ldr r1, ._1334\n\ + ldr r1, ._1334 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7183,7 +7183,7 @@ void sub_80EE3D8() beq ._1331 @cond_branch\n\ b ._1354\n\ ._1331:\n\ - ldr r1, ._1334\n\ + ldr r1, ._1334 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7195,7 +7195,7 @@ void sub_80EE3D8() ._1303:\n\ mov r0, #0x3\n\ bl sub_80F2C80\n\ - ldr r1, ._1338\n\ + ldr r1, ._1338 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7208,7 +7208,7 @@ void sub_80EE3D8() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1354 @cond_branch\n\ - ldr r1, ._1338\n\ + ldr r1, ._1338 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7220,7 +7220,7 @@ void sub_80EE3D8() ._1305:\n\ mov r0, #0x2\n\ bl sub_80F3008\n\ - ldr r1, ._1341\n\ + ldr r1, ._1341 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7233,7 +7233,7 @@ void sub_80EE3D8() bl sub_8055870\n\ cmp r0, #0\n\ bne ._1354 @cond_branch\n\ - ldr r1, ._1345\n\ + ldr r1, ._1345 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ @@ -7244,7 +7244,7 @@ void sub_80EE3D8() .word gSharedMem\n\ ._1307:\n\ bl sub_80F6F10\n\ - ldr r4, ._1348\n\ + ldr r4, ._1348 @ gSharedMem\n\ mov r1, #0xc2\n\ lsl r1, r1, #0x2\n\ add r0, r4, r1\n\ @@ -7256,7 +7256,7 @@ void sub_80EE3D8() mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r0, ._1348 + 4\n\ + ldr r0, ._1348 + 4 @ sub_80EBD68\n\ bl SetVBlankCallback\n\ ._1320:\n\ mov r0, #0xc1\n\ @@ -7275,19 +7275,19 @@ void sub_80EE3D8() ._1308:\n\ mov r0, #0x5\n\ bl sub_80EED2C\n\ - ldr r1, ._1352\n\ + ldr r1, ._1352 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r1, r1, r0\n\ ldrh r0, [r1]\n\ add r0, r0, #0x1\n\ strh r0, [r1]\n\ - ldr r0, ._1352 + 4\n\ + ldr r0, ._1352 + 4 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1354 @cond_branch\n\ - ldr r0, ._1352 + 8\n\ - ldr r2, ._1352 + 12\n\ + ldr r0, ._1352 + 8 @ 0x6007de0\n\ + ldr r2, ._1352 + 12 @ 0x600f800\n\ mov r1, #0x0\n\ mov r3, #0x4\n\ bl debug_sub_8008218\n\ @@ -7300,13 +7300,13 @@ void sub_80EE3D8() .word 0x6007de0\n\ .word 0x600f800\n\ ._1309:\n\ - ldr r0, ._1355\n\ + ldr r0, ._1355 @ gPaletteFade\n\ ldrb r1, [r0, #0x7]\n\ mov r0, #0x80\n\ and r0, r0, r1\n\ cmp r0, #0\n\ bne ._1354 @cond_branch\n\ - ldr r0, ._1355 + 4\n\ + ldr r0, ._1355 + 4 @ sub_80EE58C\n\ bl sub_80EBDBC\n\ ._1354:\n\ add sp, sp, #0x4\n\ @@ -7404,7 +7404,7 @@ void sub_80EE58C() asm("\ push {r4, r5, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r5, ._1361\n\ + ldr r5, ._1361 @ gSharedMem\n\ mov r0, #0xc1\n\ lsl r0, r0, #0x2\n\ add r4, r5, r0\n\ @@ -7432,7 +7432,7 @@ void sub_80EE58C() beq ._1365 @cond_branch\n\ cmp r0, #0x2\n\ beq ._1366 @cond_branch\n\ - ldr r0, ._1369\n\ + ldr r0, ._1369 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -7440,7 +7440,7 @@ void sub_80EE58C() beq ._1367 @cond_branch\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._1369 + 4\n\ + ldr r0, ._1369 + 4 @ sub_80EE658\n\ bl sub_80EBDBC\n\ b ._1384\n\ ._1370:\n\ @@ -7451,7 +7451,7 @@ void sub_80EE58C() ._1365:\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r1, ._1372\n\ + ldr r1, ._1372 @ 0x876e\n\ add r0, r5, r1\n\ ldrb r0, [r0]\n\ bl sub_80F0FFC\n\ @@ -7474,7 +7474,7 @@ void sub_80EE58C() beq ._1383 @cond_branch\n\ mov r0, #0x5\n\ bl PlaySE\n\ - ldr r0, ._1377\n\ + ldr r0, ._1377 @ sub_80EE8F4\n\ bl sub_80EBDBC\n\ b ._1384\n\ ._1378:\n\ @@ -7486,7 +7486,7 @@ void sub_80EE58C() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._1383 @cond_branch\n\ - ldr r1, ._1381\n\ + ldr r1, ._1381 @ 0x876e\n\ add r0, r5, r1\n\ ldrb r0, [r0]\n\ bl sub_80F0FFC\n\ @@ -7505,12 +7505,12 @@ void sub_80EE58C() ._1380:\n\ strh r0, [r4]\n\ ._1383:\n\ - ldr r0, ._1385\n\ + ldr r0, ._1385 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1384 @cond_branch\n\ - ldr r0, ._1385 + 4\n\ - ldr r1, ._1385 + 8\n\ + ldr r0, ._1385 + 4 @ gLink\n\ + ldr r1, ._1385 + 8 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ @@ -8013,13 +8013,13 @@ bool8 sub_80EEC10() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._1563\n\ + ldr r0, ._1563 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x40\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._1559 @cond_branch\n\ - ldr r1, ._1563 + 4\n\ + ldr r1, ._1563 + 4 @ gSharedMem\n\ add r3, r1, #1\n\ add r2, r1, #5\n\ ._1561:\n\ @@ -8051,7 +8051,7 @@ bool8 sub_80EEC10() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._1565 @cond_branch\n\ - ldr r1, ._1569\n\ + ldr r1, ._1569 @ gSharedMem\n\ mov r4, #0x0\n\ mov r2, #0x1\n\ ldsb r2, [r1, r2]\n\ @@ -8079,12 +8079,12 @@ bool8 sub_80EEC10() ._1569:\n\ .word gSharedMem+0x6dad\n\ ._1565:\n\ - ldr r0, ._1572\n\ + ldr r0, ._1572 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1571 @cond_branch\n\ - ldr r0, ._1572 + 4\n\ - ldr r1, ._1572 + 8\n\ + ldr r0, ._1572 + 4 @ gLink\n\ + ldr r1, ._1572 + 8 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ @@ -8139,7 +8139,7 @@ bool8 sub_80EEC90() asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._1577\n\ + ldr r0, ._1577 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x40\n\ and r0, r0, r1\n\ @@ -8147,8 +8147,8 @@ bool8 sub_80EEC90() lsr r3, r0, #0x10\n\ cmp r3, #0\n\ beq ._1574 @cond_branch\n\ - ldr r2, ._1577 + 4\n\ - ldr r0, ._1577 + 8\n\ + ldr r2, ._1577 + 4 @ gSharedMem\n\ + ldr r0, ._1577 + 8 @ 0x6dad\n\ add r1, r2, r0\n\ ldrb r0, [r1]\n\ sub r0, r0, #0x1\n\ @@ -8156,7 +8156,7 @@ bool8 sub_80EEC90() lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bge ._1580 @cond_branch\n\ - ldr r3, ._1577 + 12\n\ + ldr r3, ._1577 + 12 @ 0x6dae\n\ add r0, r2, r3\n\ ldrb r0, [r0]\n\ sub r0, r0, #0x1\n\ @@ -8174,8 +8174,8 @@ bool8 sub_80EEC90() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._1579 @cond_branch\n\ - ldr r0, ._1582\n\ - ldr r4, ._1582 + 4\n\ + ldr r0, ._1582 @ gSharedMem\n\ + ldr r4, ._1582 + 4 @ 0x6dad\n\ add r2, r0, r4\n\ ldrb r1, [r2]\n\ add r1, r1, #0x1\n\ @@ -8199,12 +8199,12 @@ bool8 sub_80EEC90() .word gSharedMem\n\ .word 0x6dad\n\ ._1579:\n\ - ldr r0, ._1585\n\ + ldr r0, ._1585 @ gLinkOpen\n\ ldrb r0, [r0]\n\ cmp r0, #0x1\n\ bne ._1584 @cond_branch\n\ - ldr r0, ._1585 + 4\n\ - ldr r1, ._1585 + 8\n\ + ldr r0, ._1585 + 4 @ gLink\n\ + ldr r1, ._1585 + 8 @ 0xfbd\n\ add r0, r0, r1\n\ ldrb r0, [r0]\n\ mov r1, #0x4\n\ diff --git a/src/roulette.c b/src/roulette.c index ffdbc2c26..838ce94f8 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -586,11 +586,11 @@ void sub_8115384(void) asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r1, ._35\n\ - ldr r0, ._35 + 4\n\ + ldr r1, ._35 @ gUnknown_Debug_03005FB8\n\ + ldr r0, ._35 + 4 @ 0x2019000\n\ str r0, [r1]\n\ - ldr r1, ._35 + 8\n\ - ldr r2, ._35 + 12\n\ + ldr r1, ._35 + 8 @ gMain\n\ + ldr r2, ._35 + 12 @ 0x43c\n\ add r0, r1, r2\n\ ldrb r0, [r0]\n\ add r2, r1, #0\n\ @@ -599,7 +599,7 @@ void sub_8115384(void) b ._64\n\ ._33:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._35 + 16\n\ + ldr r1, ._35 + 16 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -626,12 +626,12 @@ void sub_8115384(void) bl ScanlineEffect_Stop\n\ bl ClearVideoCallbacks\n\ bl sub_80F9368\n\ - ldr r1, ._47\n\ - ldr r3, ._47 + 4\n\ + ldr r1, ._47 @ 0x400000c\n\ + ldr r3, ._47 + 4 @ 0x4686\n\ add r0, r3, #0\n\ strh r0, [r1]\n\ sub r1, r1, #0x2\n\ - ldr r2, ._47 + 8\n\ + ldr r2, ._47 + 8 @ 0x4401\n\ add r0, r2, #0\n\ strh r0, [r1]\n\ add r1, r1, #0x46\n\ @@ -640,18 +640,18 @@ void sub_8115384(void) add r0, r3, #0\n\ strh r0, [r1]\n\ add r1, r1, #0x2\n\ - ldr r2, ._47 + 12\n\ + ldr r2, ._47 + 12 @ 0x60a\n\ add r0, r2, #0\n\ strh r0, [r1]\n\ - ldr r0, ._47 + 16\n\ + ldr r0, ._47 + 16 @ gUnknown_08E8096C\n\ mov r1, #0xc0\n\ lsl r1, r1, #0x13\n\ bl LZ77UnCompVram\n\ - ldr r0, ._47 + 20\n\ - ldr r1, ._47 + 24\n\ + ldr r0, ._47 + 20 @ gRouletteWheelTiles\n\ + ldr r1, ._47 + 24 @ 0x6004000\n\ bl LZ77UnCompVram\n\ - ldr r1, ._47 + 28\n\ - ldr r3, ._47 + 32\n\ + ldr r1, ._47 + 28 @ gMain\n\ + ldr r3, ._47 + 32 @ 0x43c\n\ add r1, r1, r3\n\ b ._61\n\ ._48:\n\ @@ -670,8 +670,8 @@ void sub_8115384(void) bl ResetPaletteFade\n\ bl ResetSpriteData\n\ bl ResetTasks\n\ - ldr r1, ._50\n\ - ldr r0, ._50 + 4\n\ + ldr r1, ._50 @ gMain\n\ + ldr r0, ._50 + 4 @ 0x43c\n\ add r1, r1, r0\n\ b ._61\n\ ._51:\n\ @@ -680,17 +680,17 @@ void sub_8115384(void) .word gMain\n\ .word 0x43c\n\ ._40:\n\ - ldr r0, ._53\n\ + ldr r0, ._53 @ gWindowTemplate_81E6C3C\n\ bl Text_LoadWindowTemplate\n\ - ldr r0, ._53 + 4\n\ + ldr r0, ._53 + 4 @ gWindowTemplate_81E6CE4\n\ bl InitMenuWindow\n\ - ldr r0, ._53 + 8\n\ + ldr r0, ._53 + 8 @ gUnknown_083F86BC\n\ mov r2, #0xe0\n\ lsl r2, r2, #0x1\n\ mov r1, #0x0\n\ bl LoadPalette\n\ - ldr r1, ._53 + 12\n\ - ldr r2, ._53 + 16\n\ + ldr r1, ._53 + 12 @ gMain\n\ + ldr r2, ._53 + 16 @ 0x43c\n\ add r1, r1, r2\n\ b ._61\n\ ._54:\n\ @@ -704,14 +704,14 @@ void sub_8115384(void) ._41:\n\ bl sub_8115238\n\ bl ClearBGTilemapBuffers\n\ - ldr r0, ._56\n\ - ldr r1, ._56 + 4\n\ + ldr r0, ._56 @ gUnknown_083F88BC\n\ + ldr r1, ._56 + 4 @ 0x2018800\n\ bl LZ77UnCompWram\n\ - ldr r0, ._56 + 8\n\ - ldr r1, ._56 + 12\n\ + ldr r0, ._56 + 8 @ gUnknown_083F8A60\n\ + ldr r1, ._56 + 12 @ 0x6003000\n\ bl LZ77UnCompVram\n\ - ldr r1, ._56 + 16\n\ - ldr r3, ._56 + 20\n\ + ldr r1, ._56 + 16 @ gMain\n\ + ldr r3, ._56 + 20 @ 0x43c\n\ add r1, r1, r3\n\ b ._61\n\ ._57:\n\ @@ -732,8 +732,8 @@ void sub_8115384(void) bl sub_8117900\n\ bl sub_8117BBC\n\ bl sub_8117DF4\n\ - ldr r1, ._59\n\ - ldr r0, ._59 + 4\n\ + ldr r1, ._59 @ gMain\n\ + ldr r0, ._59 + 4 @ 0x43c\n\ add r1, r1, r0\n\ b ._61\n\ ._60:\n\ @@ -744,8 +744,8 @@ void sub_8115384(void) ._43:\n\ bl AnimateSprites\n\ bl BuildOamBuffer\n\ - ldr r0, ._62\n\ - ldr r1, ._62 + 4\n\ + ldr r0, ._62 @ gSaveBlock1\n\ + ldr r1, ._62 + 4 @ 0x494\n\ add r0, r0, r1\n\ ldrh r0, [r0]\n\ bl sub_81180F4\n\ @@ -760,20 +760,20 @@ void sub_8115384(void) mov r2, #0x1d\n\ mov r3, #0x13\n\ bl Menu_DrawStdWindowFrame\n\ - ldr r0, ._62 + 8\n\ + ldr r0, ._62 + 8 @ gUnknown_081C4157\n\ mov r1, #0x1\n\ mov r2, #0xf\n\ bl Menu_PrintText\n\ - ldr r1, ._62 + 12\n\ + ldr r1, ._62 + 12 @ gSpriteCoordOffsetX\n\ mov r2, #0x3c\n\ neg r2, r2\n\ add r0, r2, #0\n\ strh r0, [r1]\n\ - ldr r1, ._62 + 16\n\ + ldr r1, ._62 + 16 @ gSpriteCoordOffsetY\n\ mov r0, #0x0\n\ strh r0, [r1]\n\ - ldr r1, ._62 + 20\n\ - ldr r3, ._62 + 24\n\ + ldr r1, ._62 + 20 @ gMain\n\ + ldr r3, ._62 + 24 @ 0x43c\n\ add r1, r1, r3\n\ b ._61\n\ ._63:\n\ @@ -789,10 +789,10 @@ void sub_8115384(void) ._44:\n\ mov r1, #0x80\n\ lsl r1, r1, #0x13\n\ - ldr r3, ._65\n\ + ldr r3, ._65 @ 0x1741\n\ add r0, r3, #0\n\ strh r0, [r1]\n\ - ldr r0, ._65 + 4\n\ + ldr r0, ._65 + 4 @ 0x43c\n\ add r1, r2, r0\n\ ._61:\n\ ldrb r0, [r1]\n\ @@ -805,22 +805,22 @@ void sub_8115384(void) .word 0x1741\n\ .word 0x43c\n\ ._45:\n\ - ldr r3, ._67\n\ + ldr r3, ._67 @ 0x4000208\n\ ldrh r2, [r3]\n\ mov r0, #0x0\n\ strh r0, [r3]\n\ - ldr r4, ._67 + 4\n\ + ldr r4, ._67 + 4 @ 0x4000200\n\ ldrh r0, [r4]\n\ mov r1, #0x1\n\ orr r0, r0, r1\n\ strh r0, [r4]\n\ strh r2, [r3]\n\ - ldr r2, ._67 + 8\n\ + ldr r2, ._67 + 8 @ 0x4000004\n\ ldrh r0, [r2]\n\ mov r1, #0x8\n\ orr r0, r0, r1\n\ strh r0, [r2]\n\ - ldr r0, ._67 + 12\n\ + ldr r0, ._67 + 12 @ sub_8115124\n\ bl SetVBlankCallback\n\ mov r0, #0x1\n\ str r0, [sp]\n\ @@ -829,33 +829,33 @@ void sub_8115384(void) mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginHardwarePaletteFade\n\ - ldr r0, ._67 + 16\n\ + ldr r0, ._67 + 16 @ sub_81156BC\n\ mov r1, #0x0\n\ bl CreateTask\n\ - ldr r4, ._67 + 20\n\ + ldr r4, ._67 + 20 @ 0x2019000\n\ add r1, r4, #0\n\ add r1, r1, #0xa4\n\ strb r0, [r1]\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x18\n\ - ldr r2, ._67 + 24\n\ + ldr r2, ._67 + 24 @ gTasks\n\ lsl r1, r0, #0x2\n\ add r1, r1, r0\n\ lsl r1, r1, #0x3\n\ add r1, r1, r2\n\ mov r0, #0x6\n\ strh r0, [r1, #0x14]\n\ - ldr r0, ._67 + 28\n\ - ldr r2, ._67 + 32\n\ + ldr r0, ._67 + 28 @ gSaveBlock1\n\ + ldr r2, ._67 + 32 @ 0x494\n\ add r0, r0, r2\n\ ldrh r0, [r0]\n\ strh r0, [r1, #0x22]\n\ - ldr r0, ._67 + 36\n\ + ldr r0, ._67 + 36 @ sub_8115634\n\ mov r1, #0x1\n\ bl CreateTask\n\ add r4, r4, #0xa5\n\ strb r0, [r4]\n\ - ldr r0, ._67 + 40\n\ + ldr r0, ._67 + 40 @ sub_81150FC\n\ bl SetMainCallback2\n\ ._64:\n\ add sp, sp, #0x4\n\ @@ -967,7 +967,7 @@ void sub_8115634(u8 unused) { asm("\ push {r4, r5, r6, lr}\n\ - ldr r0, ._75\n\ + ldr r0, ._75 @ 0x2019000\n\ add r3, r0, #0\n\ add r3, r3, #0x21\n\ ldrb r1, [r3]\n\ @@ -1030,17 +1030,17 @@ void sub_8115634(u8 unused) asr r0, r0, #0x10\n\ neg r0, r0\n\ strh r0, [r6, #0x30]\n\ - ldr r0, ._75 + 4\n\ + ldr r0, ._75 + 4 @ unk_203955C\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._74 @cond_branch\n\ - ldr r0, ._75 + 8\n\ + ldr r0, ._75 + 8 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x8\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._74 @cond_branch\n\ - ldr r2, ._75 + 12\n\ + ldr r2, ._75 + 12 @ gTasks\n\ add r0, r6, #0\n\ add r0, r0, #0xa4\n\ ldrb r1, [r0]\n\ @@ -1048,13 +1048,13 @@ void sub_8115634(u8 unused) add r0, r0, r1\n\ lsl r0, r0, #0x3\n\ add r0, r0, r2\n\ - ldr r1, ._75 + 16\n\ + ldr r1, ._75 + 16 @ sub_81157AC\n\ str r1, [r0]\n\ - ldr r0, ._75 + 20\n\ + ldr r0, ._75 + 20 @ gMPlay_SE1\n\ bl m4aMPlayStop\n\ - ldr r0, ._75 + 24\n\ + ldr r0, ._75 + 24 @ gMPlay_SE2\n\ bl m4aMPlayStop\n\ - ldr r0, ._75 + 28\n\ + ldr r0, ._75 + 28 @ gMPlay_SE3\n\ bl m4aMPlayStop\n\ ._74:\n\ pop {r4, r5, r6}\n\ @@ -2030,13 +2030,13 @@ void sub_8116B40(u8 taskid) // end roulette ? bne ._380 @cond_branch\n\ mov r0, #0x0\n\ bl SetVBlankCallback\n\ - ldr r0, ._381\n\ + ldr r0, ._381 @ 0x2019000\n\ mov r2, #0xbe\n\ lsl r2, r2, #0x1\n\ mov r1, #0x0\n\ bl memset\n\ - ldr r1, ._381 + 4\n\ - ldr r0, ._381 + 8\n\ + ldr r1, ._381 + 4 @ gSpriteCoordOffsetX\n\ + ldr r0, ._381 + 8 @ gSpriteCoordOffsetY\n\ mov r4, #0x0\n\ strh r5, [r0]\n\ strh r5, [r1]\n\ @@ -2045,20 +2045,20 @@ void sub_8116B40(u8 taskid) // end roulette ? bl ResetPaletteFade\n\ bl ResetSpriteData\n\ bl ClearBGTilemapBuffers\n\ - ldr r0, ._381 + 12\n\ + ldr r0, ._381 + 12 @ 0x4000050\n\ strh r5, [r0]\n\ add r0, r0, #0x2\n\ strh r5, [r0]\n\ add r0, r0, #0x2\n\ strh r5, [r0]\n\ - ldr r1, ._381 + 16\n\ - ldr r0, ._381 + 20\n\ + ldr r1, ._381 + 16 @ gFieldCallback\n\ + ldr r0, ._381 + 20 @ sub_8080990\n\ str r0, [r1]\n\ - ldr r0, ._381 + 24\n\ + ldr r0, ._381 + 24 @ c2_exit_to_overworld_2_switch\n\ bl SetMainCallback2\n\ add r0, r6, #0\n\ bl DestroyTask\n\ - ldr r0, ._381 + 28\n\ + ldr r0, ._381 + 28 @ unk_203955C\n\ strb r4, [r0]\n\ ._380:\n\ pop {r4, r5, r6}\n\ @@ -3189,13 +3189,13 @@ void debug_sub_812CDE4() lsl r0, r0, #0x18\n\ lsr r3, r0, #0x18\n\ add r4, r3, #0\n\ - ldr r0, ._575\n\ + ldr r0, ._575 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ cmp r0, #0\n\ beq ._572 @cond_branch\n\ - ldr r1, ._575 + 4\n\ + ldr r1, ._575 + 4 @ gTasks\n\ lsl r0, r3, #0x2\n\ add r0, r0, r3\n\ lsl r0, r0, #0x3\n\ @@ -3204,13 +3204,13 @@ void debug_sub_812CDE4() add r0, r0, #0x1\n\ strh r0, [r2, #0x22]\n\ lsl r0, r0, #0x10\n\ - ldr r1, ._575 + 8\n\ + ldr r1, ._575 + 8 @ 0x27100000\n\ cmp r0, r1\n\ bne ._573 @cond_branch\n\ mov r0, #0x0\n\ strh r0, [r2, #0x22]\n\ ._573:\n\ - ldr r0, ._575 + 12\n\ + ldr r0, ._575 + 12 @ gStringVar1\n\ mov r3, #0x22\n\ ldsh r1, [r2, r3]\n\ b ._584\n\ @@ -3226,7 +3226,7 @@ void debug_sub_812CDE4() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._577 @cond_branch\n\ - ldr r1, ._580\n\ + ldr r1, ._580 @ gTasks\n\ lsl r0, r3, #0x2\n\ add r0, r0, r3\n\ lsl r0, r0, #0x3\n\ @@ -3240,10 +3240,10 @@ void debug_sub_812CDE4() neg r1, r1\n\ cmp r0, r1\n\ bne ._578 @cond_branch\n\ - ldr r0, ._580 + 4\n\ + ldr r0, ._580 + 4 @ 0x270f\n\ strh r0, [r2, #0x22]\n\ ._578:\n\ - ldr r0, ._580 + 8\n\ + ldr r0, ._580 + 8 @ gStringVar1\n\ mov r3, #0x22\n\ ldsh r1, [r2, r3]\n\ b ._584\n\ @@ -3259,7 +3259,7 @@ void debug_sub_812CDE4() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._582 @cond_branch\n\ - ldr r1, ._585\n\ + ldr r1, ._585 @ gTasks\n\ lsl r0, r3, #0x2\n\ add r0, r0, r3\n\ lsl r0, r0, #0x3\n\ @@ -3269,14 +3269,14 @@ void debug_sub_812CDE4() add r0, r0, #0xa\n\ strh r0, [r2, #0x22]\n\ lsl r0, r0, #0x10\n\ - ldr r1, ._585 + 4\n\ + ldr r1, ._585 + 4 @ 0x270f0000\n\ cmp r0, r1\n\ ble ._583 @cond_branch\n\ - ldr r1, ._585 + 8\n\ + ldr r1, ._585 + 8 @ 0xffffd8fb\n\ add r0, r3, r1\n\ strh r0, [r2, #0x22]\n\ ._583:\n\ - ldr r0, ._585 + 12\n\ + ldr r0, ._585 + 12 @ gStringVar1\n\ mov r3, #0x22\n\ ldsh r1, [r2, r3]\n\ b ._584\n\ @@ -3293,7 +3293,7 @@ void debug_sub_812CDE4() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._587 @cond_branch\n\ - ldr r0, ._590\n\ + ldr r0, ._590 @ gTasks\n\ lsl r1, r3, #0x2\n\ add r1, r1, r3\n\ lsl r1, r1, #0x3\n\ @@ -3305,19 +3305,19 @@ void debug_sub_812CDE4() lsl r0, r0, #0x10\n\ cmp r0, #0\n\ bge ._588 @cond_branch\n\ - ldr r3, ._590 + 4\n\ + ldr r3, ._590 + 4 @ 0x2705\n\ add r0, r2, r3\n\ strh r0, [r1, #0x22]\n\ ._588:\n\ - ldr r0, ._590 + 8\n\ + ldr r0, ._590 + 8 @ gStringVar1\n\ mov r2, #0x22\n\ ldsh r1, [r1, r2]\n\ ._584:\n\ mov r2, #0x1\n\ mov r3, #0x4\n\ bl ConvertIntToDecimalStringN\n\ - ldr r4, ._590 + 12\n\ - ldr r1, ._590 + 16\n\ + ldr r4, ._590 + 12 @ gStringVar4\n\ + ldr r1, ._590 + 16 @ gOtherText_Coins\n\ add r0, r4, #0\n\ bl StringExpandPlaceholders\n\ add r0, r4, #0\n\ @@ -3338,34 +3338,34 @@ void debug_sub_812CDE4() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._592 @cond_branch\n\ - ldr r0, ._594\n\ - ldr r2, ._594 + 4\n\ + ldr r0, ._594 @ gSaveBlock1\n\ + ldr r2, ._594 + 4 @ gTasks\n\ lsl r1, r3, #0x2\n\ add r1, r1, r3\n\ lsl r1, r1, #0x3\n\ add r1, r1, r2\n\ ldrh r2, [r1, #0x22]\n\ - ldr r3, ._594 + 8\n\ + ldr r3, ._594 + 8 @ 0x494\n\ add r0, r0, r3\n\ mov r5, #0x0\n\ strh r2, [r0]\n\ - ldr r0, ._594 + 12\n\ + ldr r0, ._594 + 12 @ Task_Roulette_0\n\ str r0, [r1]\n\ - ldr r0, ._594 + 16\n\ + ldr r0, ._594 + 16 @ gStringVar1\n\ mov r2, #0x22\n\ ldsh r1, [r1, r2]\n\ mov r2, #0x1\n\ mov r3, #0x4\n\ bl ConvertIntToDecimalStringN\n\ - ldr r4, ._594 + 20\n\ - ldr r1, ._594 + 24\n\ + ldr r4, ._594 + 20 @ gStringVar4\n\ + ldr r1, ._594 + 24 @ gOtherText_Coins\n\ add r0, r4, #0\n\ bl StringExpandPlaceholders\n\ add r0, r4, #0\n\ mov r1, #0x9\n\ mov r2, #0x1\n\ bl MenuPrint_RightAligned\n\ - ldr r0, ._594 + 28\n\ + ldr r0, ._594 + 28 @ unk_2039560\n\ strb r5, [r0]\n\ b ._596\n\ ._595:\n\ @@ -3384,33 +3384,33 @@ void debug_sub_812CDE4() and r0, r0, r1\n\ cmp r0, #0\n\ beq ._596 @cond_branch\n\ - ldr r0, ._597\n\ - ldr r2, ._597 + 4\n\ + ldr r0, ._597 @ gSaveBlock1\n\ + ldr r2, ._597 + 4 @ gTasks\n\ lsl r1, r4, #0x2\n\ add r1, r1, r4\n\ lsl r1, r1, #0x3\n\ add r1, r1, r2\n\ ldrh r2, [r1, #0x22]\n\ - ldr r3, ._597 + 8\n\ + ldr r3, ._597 + 8 @ 0x494\n\ add r0, r0, r3\n\ strh r2, [r0]\n\ - ldr r0, ._597 + 12\n\ + ldr r0, ._597 + 12 @ Task_Roulette_0\n\ str r0, [r1]\n\ - ldr r0, ._597 + 16\n\ + ldr r0, ._597 + 16 @ gStringVar1\n\ mov r2, #0x22\n\ ldsh r1, [r1, r2]\n\ mov r2, #0x1\n\ mov r3, #0x4\n\ bl ConvertIntToDecimalStringN\n\ - ldr r4, ._597 + 20\n\ - ldr r1, ._597 + 24\n\ + ldr r4, ._597 + 20 @ gStringVar4\n\ + ldr r1, ._597 + 24 @ gOtherText_Coins\n\ add r0, r4, #0\n\ bl StringExpandPlaceholders\n\ add r0, r4, #0\n\ mov r1, #0x9\n\ mov r2, #0x1\n\ bl MenuPrint_RightAligned\n\ - ldr r1, ._597 + 28\n\ + ldr r1, ._597 + 28 @ unk_2039560\n\ mov r0, #0x1\n\ strb r0, [r1]\n\ ._596:\n\ @@ -3437,13 +3437,13 @@ void debug_sub_812CFE8() push {r4, r5, lr}\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x18\n\ - ldr r2, ._600\n\ + ldr r2, ._600 @ gTasks\n\ lsl r1, r0, #0x2\n\ add r1, r1, r0\n\ lsl r1, r1, #0x3\n\ add r5, r1, r2\n\ - ldr r0, ._600 + 4\n\ - ldr r1, ._600 + 8\n\ + ldr r0, ._600 + 4 @ gSaveBlock1\n\ + ldr r1, ._600 + 8 @ 0x494\n\ add r0, r0, r1\n\ ldrh r0, [r0]\n\ strh r0, [r5, #0x22]\n\ @@ -3452,20 +3452,20 @@ void debug_sub_812CFE8() and r1, r1, r0\n\ cmp r1, #0\n\ beq ._599 @cond_branch\n\ - ldr r0, ._600 + 12\n\ + ldr r0, ._600 + 12 @ gSpecialVar_0x8004\n\ ldrh r1, [r0]\n\ mov r2, #0x80\n\ orr r1, r1, r2\n\ strh r1, [r0]\n\ ._599:\n\ - ldr r0, ._600 + 16\n\ + ldr r0, ._600 + 16 @ gStringVar1\n\ mov r2, #0x22\n\ ldsh r1, [r5, r2]\n\ mov r2, #0x1\n\ mov r3, #0x4\n\ bl ConvertIntToDecimalStringN\n\ - ldr r4, ._600 + 20\n\ - ldr r1, ._600 + 24\n\ + ldr r4, ._600 + 20 @ gStringVar4\n\ + ldr r1, ._600 + 24 @ gOtherText_Coins\n\ add r0, r4, #0\n\ bl StringExpandPlaceholders\n\ mov r0, #0x0\n\ @@ -3482,11 +3482,11 @@ void debug_sub_812CFE8() mov r2, #0x1d\n\ mov r3, #0x13\n\ bl Menu_DrawStdWindowFrame\n\ - ldr r0, ._600 + 28\n\ + ldr r0, ._600 + 28 @ gUnknown_Debug_0842510D\n\ mov r1, #0x1\n\ mov r2, #0xf\n\ bl Menu_PrintText\n\ - ldr r0, ._600 + 32\n\ + ldr r0, ._600 + 32 @ debug_sub_812CDE4\n\ str r0, [r5]\n\ pop {r4, r5}\n\ pop {r0}\n\ @@ -3514,14 +3514,14 @@ void PlayRoulette(void) asm("\ push {lr}\n\ bl ScriptContext2_Enable\n\ - ldr r1, ._604\n\ + ldr r1, ._604 @ unk_2039560\n\ mov r0, #0x0\n\ strb r0, [r1]\n\ - ldr r0, ._604 + 4\n\ + ldr r0, ._604 + 4 @ unk_203955C\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._602 @cond_branch\n\ - ldr r0, ._604 + 8\n\ + ldr r0, ._604 + 8 @ debug_sub_812CFE8\n\ mov r1, #0x0\n\ bl CreateTask\n\ b ._603\n\ @@ -3532,18 +3532,18 @@ void PlayRoulette(void) .word unk_203955C\n\ .word debug_sub_812CFE8+1\n\ ._602:\n\ - ldr r0, ._606\n\ + ldr r0, ._606 @ Task_Roulette_0\n\ mov r1, #0x0\n\ bl CreateTask\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x18\n\ - ldr r2, ._606 + 4\n\ + ldr r2, ._606 + 4 @ gTasks\n\ lsl r1, r0, #0x2\n\ add r1, r1, r0\n\ lsl r1, r1, #0x3\n\ add r1, r1, r2\n\ - ldr r0, ._606 + 8\n\ - ldr r2, ._606 + 12\n\ + ldr r0, ._606 + 8 @ gSaveBlock1\n\ + ldr r2, ._606 + 12 @ 0x494\n\ add r0, r0, r2\n\ ldrh r0, [r0]\n\ strh r0, [r1, #0x22]\n\ @@ -4479,10 +4479,10 @@ void debug_sub_812E698() and r1, r1, r0\n\ cmp r1, #0\n\ beq ._837 @cond_branch\n\ - ldr r4, ._839\n\ + ldr r4, ._839 @ 0x2019000\n\ add r1, r4, #0\n\ add r1, r1, #0x8c\n\ - ldr r0, ._839 + 4\n\ + ldr r0, ._839 + 4 @ 0x0\n\ str r0, [r1]\n\ add r0, r4, #0\n\ add r0, r0, #0x7e\n\ @@ -4494,7 +4494,7 @@ void debug_sub_812E698() add r1, r1, #0x7f\n\ strb r0, [r1]\n\ add r1, r4, #0\n\ - ldr r4, ._839 + 8\n\ + ldr r4, ._839 + 8 @ gUnknown_083F8DF4\n\ b ._838\n\ ._840:\n\ .align 2, 0\n\ @@ -4503,10 +4503,10 @@ void debug_sub_812E698() .word 0x0\n\ .word gUnknown_083F8DF4\n\ ._837:\n\ - ldr r6, ._841\n\ + ldr r6, ._841 @ 0x2019000\n\ add r5, r6, #0\n\ add r5, r5, #0x8c\n\ - ldr r4, ._841 + 4\n\ + ldr r4, ._841 + 4 @ gUnknown_083F8DF4\n\ ldrb r0, [r6, #0x4]\n\ lsl r0, r0, #0x1e\n\ lsr r0, r0, #0x19\n\ @@ -4534,9 +4534,9 @@ void debug_sub_812E698() ldrb r0, [r0, #0x2]\n\ strh r0, [r7, #0x32]\n\ add r1, r1, #0x98\n\ - ldr r0, ._841 + 8\n\ + ldr r0, ._841 + 8 @ 0x3dae147b\n\ str r0, [r1]\n\ - ldr r0, ._841 + 12\n\ + ldr r0, ._841 + 12 @ sub_8118D2C\n\ str r0, [r7, #0x1c]\n\ mov r0, #0x5\n\ strh r0, [r7, #0x30]\n\ @@ -4839,12 +4839,12 @@ void sub_8118F8C(struct Sprite *sprite) push {r6, r7}\n\ add r6, r0, #0\n\ bl sub_8118724\n\ - ldr r5, ._868\n\ + ldr r5, ._868 @ 0x2019000\n\ mov r0, #0x8c\n\ add r0, r0, r5\n\ mov r8, r0\n\ ldr r0, [r0]\n\ - ldr r1, ._868 + 4\n\ + ldr r1, ._868 + 4 @ 0x3f000000\n\ bl __gtsf2\n\ cmp r0, #0\n\ bgt ._874 @cond_branch\n\ @@ -4857,9 +4857,9 @@ void sub_8118F8C(struct Sprite *sprite) bne ._864 @cond_branch\n\ add r1, r5, #0\n\ add r1, r1, #0x90\n\ - ldr r0, ._868 + 8\n\ + ldr r0, ._868 + 8 @ 0x0\n\ str r0, [r1]\n\ - ldr r1, ._868 + 12\n\ + ldr r1, ._868 + 12 @ gUnknown_083F8DF4\n\ mov r9, r1\n\ ldrb r0, [r5, #0x4]\n\ lsl r7, r0, #0x1e\n\ @@ -4872,7 +4872,7 @@ void sub_8118F8C(struct Sprite *sprite) add r5, r0, #0\n\ cmp r4, #0\n\ bge ._865 @cond_branch\n\ - ldr r1, ._868 + 16\n\ + ldr r1, ._868 + 16 @ 0x43800000\n\ bl __addsf3\n\ add r5, r0, #0\n\ ._865:\n\ @@ -4892,11 +4892,11 @@ void sub_8118F8C(struct Sprite *sprite) str r0, [r1]\n\ mov r0, #0x4\n\ strh r0, [r6, #0x30]\n\ - ldr r0, ._868 + 20\n\ + ldr r0, ._868 + 20 @ unk_2039560\n\ ldrb r0, [r0]\n\ cmp r0, #0\n\ beq ._866 @cond_branch\n\ - ldr r0, ._868 + 24\n\ + ldr r0, ._868 + 24 @ debug_sub_812E698\n\ str r0, [r6, #0x1c]\n\ b ._874\n\ ._869:\n\ @@ -4910,7 +4910,7 @@ void sub_8118F8C(struct Sprite *sprite) .word unk_2039560\n\ .word debug_sub_812E698+1\n\ ._866:\n\ - ldr r0, ._871\n\ + ldr r0, ._871 @ sub_8118DE4\n\ str r0, [r6, #0x1c]\n\ b ._874\n\ ._872:\n\ @@ -4921,7 +4921,7 @@ void sub_8118F8C(struct Sprite *sprite) add r6, r5, #0\n\ add r6, r6, #0x90\n\ ldr r0, [r6]\n\ - ldr r4, ._875\n\ + ldr r4, ._875 @ 0x0\n\ add r1, r4, #0\n\ bl __nesf2\n\ cmp r0, #0\n\ @@ -4939,8 +4939,8 @@ void sub_8118F8C(struct Sprite *sprite) add r4, r4, #0x98\n\ ldr r0, [r4]\n\ bl __extendsfdf2\n\ - ldr r2, ._875 + 4\n\ - ldr r3, ._875 + 8\n\ + ldr r2, ._875 + 4 @ 0x3ff33333\n\ + ldr r3, ._875 + 8 @ 0x33333333\n\ bl __divdf3\n\ bl __truncdfsf2\n\ str r0, [r4]\n\ diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index d81263f87..114505e4d 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -216,10 +216,10 @@ u8 debug_sub_8138C14(void) { asm("\n\ push {lr}\n\ - ldr r0, ._1\n\ + ldr r0, ._1 @ unk_203955C\n\ mov r1, #0x1\n\ strb r1, [r0]\n\ - ldr r0, ._1 + 4\n\ + ldr r0, ._1 + 4 @ MauvilleCity_GameCorner_EventScript_1C407E\n\ bl ScriptContext1_SetupScript\n\ bl CloseMenu\n\ mov r0, #0x1\n\ @@ -237,10 +237,10 @@ u8 debug_sub_8138C34(void) { asm("\n\ push {lr}\n\ - ldr r0, ._3\n\ + ldr r0, ._3 @ unk_203955C\n\ mov r1, #0x1\n\ strb r1, [r0]\n\ - ldr r0, ._3 + 4\n\ + ldr r0, ._3 + 4 @ MauvilleCity_GameCorner_EventScript_1C40AC\n\ bl ScriptContext1_SetupScript\n\ bl CloseMenu\n\ mov r0, #0x1\n\ @@ -258,7 +258,7 @@ u8 debug_sub_8138C54(void) { asm("\n\ push {r4, lr}\n\ - ldr r4, ._10\n\ + ldr r4, ._10 @ gMain\n\ ldrh r0, [r4, #0x2e]\n\ cmp r0, #0x40\n\ bne ._5 @cond_branch\n\ @@ -275,14 +275,14 @@ u8 debug_sub_8138C54(void) ldrh r1, [r4, #0x2e]\n\ cmp r1, #0x1\n\ beq ._7 @cond_branch\n\ - ldr r0, ._10 + 4\n\ + ldr r0, ._10 + 4 @ 0x101\n\ cmp r1, r0\n\ bne ._8 @cond_branch\n\ - ldr r1, ._10 + 8\n\ + ldr r1, ._10 + 8 @ gSpecialVar_0x8004\n\ mov r0, #0x1\n\ strh r0, [r1]\n\ ._7:\n\ - ldr r4, ._10 + 12\n\ + ldr r4, ._10 + 12 @ gUnkDebug4Menu\n\ bl Menu_GetCursorPos\n\ lsl r0, r0, #0x18\n\ lsr r0, r0, #0x15\n\ @@ -320,7 +320,7 @@ u8 debug_sub_8138CC4(void) asm("\n\ push {lr}\n\ add sp, sp, #0xfffffff8\n\ - ldr r1, ._14\n\ + ldr r1, ._14 @ gSpecialVar_0x8004\n\ mov r0, #0x0\n\ strh r0, [r1]\n\ bl Menu_EraseScreen\n\ @@ -329,7 +329,7 @@ u8 debug_sub_8138CC4(void) mov r2, #0x1d\n\ mov r3, #0xc\n\ bl Menu_DrawStdWindowFrame\n\ - ldr r3, ._14 + 4\n\ + ldr r3, ._14 + 4 @ gUnkDebug4Menu\n\ mov r0, #0x14\n\ mov r1, #0x1\n\ mov r2, #0x5\n\ @@ -343,8 +343,8 @@ u8 debug_sub_8138CC4(void) mov r2, #0x1\n\ mov r3, #0x5\n\ bl InitMenu\n\ - ldr r1, ._14 + 8\n\ - ldr r0, ._14 + 12\n\ + ldr r1, ._14 + 8 @ gMenuCallback\n\ + ldr r0, ._14 + 12 @ debug_sub_8138C54\n\ str r0, [r1]\n\ mov r0, #0x0\n\ add sp, sp, #0x8\n\ @@ -384,7 +384,7 @@ u8 debug_sub_8138D74(void) { asm("\n\ push {lr}\n\ - ldr r1, ._21\n\ + ldr r1, ._21 @ gSpecialVar_0x8004\n\ mov r0, #0x0\n\ strh r0, [r1]\n\ bl CloseMenu\n\ @@ -402,7 +402,7 @@ u8 debug_sub_8138D8C(void) { asm("\n\ push {lr}\n\ - ldr r1, ._23\n\ + ldr r1, ._23 @ gSpecialVar_0x8004\n\ mov r0, #0x1\n\ strh r0, [r1]\n\ bl CloseMenu\n\ diff --git a/src/scene/cute_sketch.c b/src/scene/cute_sketch.c index 848249528..2af990290 100644 --- a/src/scene/cute_sketch.c +++ b/src/scene/cute_sketch.c @@ -38,8 +38,8 @@ void debug_sub_8110CCC(void) push {r4, r5, r6, r7, lr}\n\ mov r7, #0x0\n\ mov r1, #0x0\n\ - ldr r2, ._5\n\ - ldr r6, ._5 + 4\n\ + ldr r2, ._5 @ gUnknown_083E79C0\n\ + ldr r6, ._5 + 4 @ \n\ ._7:\n\ lsl r0, r1, #0x3\n\ add r4, r0, r2\n\ @@ -108,7 +108,7 @@ void debug_sub_8110CCC(void) mov r2, #0x1d\n\ mov r3, #0x13\n\ bl Menu_DrawStdWindowFrame\n\ - ldr r0, ._9\n\ + ldr r0, ._9 @ \n\ mov r1, #0x11\n\ mov r2, #0x11\n\ bl Menu_PrintText\n\ @@ -133,14 +133,14 @@ void debug_sub_8110D84(void) asm("\ push {r4, lr}\n\ add sp, sp, #0xfffffffc\n\ - ldr r0, ._13\n\ + ldr r0, ._13 @ \n\ ldrh r0, [r0, #0x4]\n\ cmp r0, #0x7\n\ bls ._11 @cond_branch\n\ b ._65\n\ ._11:\n\ lsl r0, r0, #0x2\n\ - ldr r1, ._13 + 4\n\ + ldr r1, ._13 + 4 @ \n\ add r0, r0, r1\n\ ldr r0, [r0]\n\ mov pc, r0\n\ @@ -166,7 +166,7 @@ void debug_sub_8110D84(void) mov r2, #0x10\n\ mov r3, #0x0\n\ bl BeginNormalPaletteFade\n\ - ldr r1, ._25\n\ + ldr r1, ._25 @ \n\ ldrh r0, [r1, #0x4]\n\ add r0, r0, #0x1\n\ b ._62\n\ @@ -181,7 +181,7 @@ void debug_sub_8110D84(void) beq ._27 @cond_branch\n\ b ._65\n\ ._27:\n\ - ldr r1, ._30\n\ + ldr r1, ._30 @ \n\ ldrh r0, [r1, #0x4]\n\ add r0, r0, #0x1\n\ b ._62\n\ @@ -205,7 +205,7 @@ void debug_sub_8110D84(void) beq ._36 @cond_branch\n\ b ._65\n\ ._35:\n\ - ldr r4, ._41\n\ + ldr r4, ._41 @ \n\ ldrb r0, [r4, #0x1e]\n\ cmp r0, #0\n\ bne ._38 @cond_branch\n\ @@ -213,11 +213,11 @@ void debug_sub_8110D84(void) ._38:\n\ mov r0, #0x5\n\ bl m4aSongNumStart\n\ - ldr r1, ._41 + 4\n\ + ldr r1, ._41 + 4 @ \n\ add r0, r4, r1\n\ mov r1, #0x1\n\ strb r1, [r0]\n\ - ldr r0, ._41 + 8\n\ + ldr r0, ._41 + 8 @ \n\ bl sub_80FC244\n\ b ._65\n\ ._42:\n\ @@ -236,7 +236,7 @@ void debug_sub_8110D84(void) mov r2, #0x0\n\ mov r3, #0x10\n\ bl BeginNormalPaletteFade\n\ - ldr r1, ._44\n\ + ldr r1, ._44 @ \n\ ldrh r0, [r1, #0x4]\n\ add r0, r0, #0x1\n\ b ._62\n\ @@ -249,7 +249,7 @@ void debug_sub_8110D84(void) lsl r0, r0, #0x18\n\ cmp r0, #0\n\ bne ._65 @cond_branch\n\ - ldr r0, ._48\n\ + ldr r0, ._48 @ sub_805469C\n\ bl SetMainCallback2\n\ b ._65\n\ ._49:\n\ @@ -265,7 +265,7 @@ void debug_sub_8110D84(void) bl debug_sub_8110CCC\n\ b ._65\n\ ._50:\n\ - ldr r0, ._54\n\ + ldr r0, ._54 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -273,7 +273,7 @@ void debug_sub_8110D84(void) beq ._65 @cond_branch\n\ bl sub_80FBCA0\n\ bl sub_80FAEC4\n\ - ldr r1, ._54 + 4\n\ + ldr r1, ._54 + 4 @ \n\ ldrh r0, [r1, #0x4]\n\ add r0, r0, #0x1\n\ b ._62\n\ @@ -290,7 +290,7 @@ void debug_sub_8110D84(void) mov r0, #0x0\n\ mov r1, #0x0\n\ bl CreateRegionMapCursor\n\ - ldr r1, ._58\n\ + ldr r1, ._58 @ \n\ ldrh r0, [r1, #0x4]\n\ add r0, r0, #0x1\n\ b ._62\n\ @@ -305,7 +305,7 @@ void debug_sub_8110D84(void) beq ._60 @cond_branch\n\ bl debug_sub_8110CCC\n\ ._60:\n\ - ldr r0, ._63\n\ + ldr r0, ._63 @ gMain\n\ ldrh r1, [r0, #0x2e]\n\ mov r0, #0x1\n\ and r0, r0, r1\n\ @@ -313,7 +313,7 @@ void debug_sub_8110D84(void) beq ._65 @cond_branch\n\ bl sub_80FBCA0\n\ bl sub_80FAEC4\n\ - ldr r1, ._63 + 4\n\ + ldr r1, ._63 + 4 @ \n\ ldrh r0, [r1, #0x4]\n\ add r0, r0, #0x1\n\ b ._62\n\ @@ -330,7 +330,7 @@ void debug_sub_8110D84(void) mov r0, #0x0\n\ mov r1, #0x0\n\ bl CreateRegionMapCursor\n\ - ldr r1, ._66\n\ + ldr r1, ._66 @ \n\ mov r0, #0x3\n\ ._62:\n\ strh r0, [r1, #0x4]\n\ @@ -351,13 +351,13 @@ void debug_sub_8110F28(void) asm("\ push {lr}\n\ bl CB2_InitFlyRegionMap\n\ - ldr r0, ._69\n\ + ldr r0, ._69 @ gMain\n\ ldr r1, [r0, #0x4]\n\ - ldr r0, ._69 + 4\n\ + ldr r0, ._69 + 4 @ CB2_FlyRegionMap\n\ cmp r1, r0\n\ bne ._68 @cond_branch\n\ bl sub_80FBF94\n\ - ldr r0, ._69 + 8\n\ + ldr r0, ._69 + 8 @ debug_sub_8110D84\n\ bl sub_80FC244\n\ bl debug_sub_8110CCC\n\ ._68:\n\ -- cgit v1.2.3 From f87bd7328ce26deddc53b62e53827089bfacd30a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 27 Jan 2018 20:34:43 -0600 Subject: decompile more debug functions in battle_2.c --- src/battle/battle_2.c | 2737 +++++++++++++++---------------------------------- 1 file changed, 800 insertions(+), 1937 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index b9b4290b5..a400257dd 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -67,12 +67,15 @@ struct UnknownStruct12 u8 filler4[0x54]; }; -void debug_sub_80139E4(void); -extern u8 gUnknown_02023A14_50; +extern void sub_802BBD4(); +extern const u8 Str_821F7B8[]; +extern u8 gUnknown_02023A14_50; extern const u16 gUnknown_08D004E0[]; extern const struct MonCoords gCastformFrontSpriteCoords[]; - +extern const u8 Str_821F7EA[]; +extern const u8 gUnknown_Debug_821F7F3[]; +extern const u8 BattleText_YesNo[]; extern u8 gStatStageRatios[][2]; extern u8 gActionsByTurnOrder[4]; extern struct UnknownPokemonStruct2 gUnknown_02023A00[]; @@ -85,7 +88,7 @@ extern u8 gCurrentActionFuncId; extern u8 gBanksByTurnOrder[]; extern struct UnknownStruct12 gUnknown_02024AD0[]; extern u8 gObjectBankIDs[]; -extern u16 gCurrentMove; +extern u16 gCurrentMove; // This is mis-named. It is a species, not a move ID. extern u8 gLastUsedAbility; extern u8 gStringBank; extern u8 gAbsentBankFlags; @@ -182,7 +185,7 @@ extern u8 gUnknown_081FA70C[][3]; extern u8 gUnknown_081FA71B[]; extern u8 gUnknown_081FA71F[]; - +void sub_8010824(void); static void BattlePrepIntroSlide(void); void CheckFocusPunch_ClearVarsBeforeTurnStarts(void); void SetActionsAndBanksTurnOrder(void); @@ -551,11 +554,7 @@ void sub_800EC9C(void) if (battle_load_something(gUnknown_02024D1F, gUnknown_02024D1F + 1) != 0) { gPreBattleCallback1 = gMain.callback1; -#if DEBUG - gMain.callback1 = debug_sub_80139E4; -#else gMain.callback1 = sub_8010824; -#endif SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -940,11 +939,7 @@ void sub_800F298(void) if (battle_load_something(gUnknown_02024D1F, gUnknown_02024D1F + 1) != 0) { gPreBattleCallback1 = gMain.callback1; -#if DEBUG - gMain.callback1 = debug_sub_80139E4; -#else gMain.callback1 = sub_8010824; -#endif SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { @@ -1363,6 +1358,10 @@ void c2_081284E0(void) // A LOT of debug code! #if DEBUG +extern u8 gUnknown_Debug_2023B62[]; +extern const u8 Str_821F7BD[]; +extern const u8 Str_821F7DA[]; + void debug_sub_8010818(void); void debug_sub_80108B8(void); void debug_sub_8010CAC(void); @@ -1372,8 +1371,10 @@ void debug_sub_8011EA0(u8); void debug_sub_8012294(void); void debug_sub_80123D8(u8); void debug_sub_8012540(void); -void debug_sub_80125A0(void); void debug_nullsub_3(void); +void debug_sub_80125A0(void); +u32 debug_sub_8013294(u8, void *, u32); +void debug_sub_80132C8(u8, void *, u32); struct UnknownStruct2023A76 { @@ -1500,8 +1501,6 @@ void debug_sub_80108B8(void) } } -// This function matches, but it somehow affects registers in SetActionsAndBanksTurnOrder. -#ifdef NONMATCHING void debug_sub_8010A7C(u8 a, u8 b) { s32 i; @@ -1510,49 +1509,6 @@ void debug_sub_8010A7C(u8 a, u8 b) gBattleTextBuff1[i] = a; gBattleTextBuff1[i] = EOS; } -#else -__attribute__((naked)) -void debug_sub_8010A7C() -{ - asm( - " push {r4, r5, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r2, r1, #0x18\n" - " mov r1, #0x0\n" - " ldr r5, ._514 @ gBattleTextBuff1\n" - " cmp r1, r2\n" - " bge ._512 @cond_branch\n" - " add r3, r5, #0\n" - "._513:\n" - " add r0, r1, r3\n" - " strb r4, [r0]\n" - " add r1, r1, #0x1\n" - " cmp r1, r2\n" - " blt ._513 @cond_branch\n" - "._512:\n" - " add r1, r1, r5\n" - " mov r0, #0xff\n" - " strb r0, [r1]\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._515:\n" - " .align 2, 0\n" - "._514:\n" - " .word gBattleTextBuff1\n" - "\n" - ); -} -#endif - -/* -void debug_sub_8010AAC(u8 a) -{ - u32 r7 = gUnknown_Debug_030043A4 * 5; -} -*/ __attribute__((naked)) void debug_sub_8010AAC() @@ -5195,6 +5151,21 @@ void debug_sub_8012878() ); } +/* +void debug_sub_80128B4(void) +{ + debug_sub_8010A7C(0, 9); + Text_InitWindow(&gUnknown_03004210, gBattleTextBuff1, 144, 2, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); + ConvertIntToDecimalStringN(gBattleTextBuff1, gCurrentMove, 2, 3); + gBattleTextBuff1[3] = CHAR_SPACE; + gBattleTextBuff1[4] = EOS; + StringAppend(gBattleTextBuff1, gSpeciesNames[gCurrentMove]); + Text_InitWindow(&gUnknown_03004210, gBattleTextBuff1, 144, 2, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); +} +*/ + __attribute__((naked)) void debug_sub_80128B4() { @@ -5261,1226 +5232,354 @@ void debug_sub_80128B4() ); } -__attribute__((naked)) -void debug_sub_8012938() +void debug_sub_8012938(u8 taskId) { - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, sl\n" - " mov r5, r9\n" - " mov r4, r8\n" - " push {r4, r5, r6}\n" - " add sp, sp, #0xfffffffc\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " mov r0, #0x0\n" - " mov r1, #0x7\n" - " bl debug_sub_8010A7C\n" - " ldr r6, ._880 @ gUnknown_03004210\n" - " ldr r4, ._880 + 4 @ gBattleTextBuff1\n" - " mov r0, #0x25\n" - " mov r8, r0\n" - " str r0, [sp]\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " mov r2, #0xa2\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - " add r0, r6, #0\n" - " bl Text_PrintWindow8002F44\n" - " ldr r1, ._880 + 8 @ Str_821F7B8\n" - " add r0, r4, #0\n" - " bl StringCopy\n" - " add r0, r4, #4\n" - " ldr r1, ._880 + 12 @ gUnknown_Debug_2023B62\n" - " mov sl, r1\n" - " ldr r2, ._880 + 16 @ gCurrentMove\n" - " mov r9, r2\n" - " ldrh r1, [r2]\n" - " sub r1, r1, #0x1\n" - " add r1, r1, sl\n" - " ldrb r1, [r1]\n" - " mov r2, #0x2\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, r8\n" - " str r0, [sp]\n" - " add r0, r6, #0\n" - " add r1, r4, #0\n" - " mov r2, #0xa2\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - " add r0, r6, #0\n" - " bl Text_PrintWindow8002F44\n" - " ldr r2, ._880 + 20 @ gSprites\n" - " ldr r1, ._880 + 24 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r1, #0xa\n" - " ldsh r0, [r0, r1]\n" - " lsl r1, r0, #0x4\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r2\n" - " mov r2, r9\n" - " ldrh r0, [r2]\n" - " sub r0, r0, #0x1\n" - " add r0, r0, sl\n" - " ldrb r0, [r0]\n" - " neg r0, r0\n" - " strh r0, [r1, #0x26]\n" - " add sp, sp, #0x4\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._881:\n" - " .align 2, 0\n" - "._880:\n" - " .word gUnknown_03004210\n" - " .word gBattleTextBuff1\n" - " .word Str_821F7B8\n" - " .word gUnknown_Debug_2023B62\n" - " .word gCurrentMove\n" - " .word gSprites\n" - " .word gTasks\n" - "\n" - ); + debug_sub_8010A7C(0, 7); + Text_InitWindow(&gUnknown_03004210, gBattleTextBuff1, 162, 2, 37); + Text_PrintWindow8002F44(&gUnknown_03004210); + StringCopy(gBattleTextBuff1, Str_821F7B8); + ConvertIntToDecimalStringN(gBattleTextBuff1 + 4, gUnknown_Debug_2023B62[gCurrentMove - 1], 2, 3); + Text_InitWindow(&gUnknown_03004210, gBattleTextBuff1, 162, 2, 37); + Text_PrintWindow8002F44(&gUnknown_03004210); + gSprites[gTasks[taskId].data[1]].pos2.y = -gUnknown_Debug_2023B62[gCurrentMove - 1]; } -__attribute__((naked)) -void debug_sub_80129F8() +void debug_sub_80129F8(u8 taskId) { - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xfffffff8\n" - " add r5, r0, #0\n" - " lsl r5, r5, #0x18\n" - " lsr r5, r5, #0x18\n" - " ldr r6, ._882 @ gCurrentMove\n" - " ldrh r2, [r6]\n" - " lsl r0, r2, #0x3\n" - " ldr r1, ._882 + 4 @ gMonFrontPicTable\n" - " add r0, r0, r1\n" - " ldr r1, ._882 + 8 @ gMonFrontPicCoords\n" - " mov r8, r1\n" - " lsl r2, r2, #0x2\n" - " add r2, r2, r8\n" - " ldrb r1, [r2]\n" - " ldrb r2, [r2, #0x1]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x12\n" - " ldr r4, ._882 + 12 @ gUnknown_081FAF4C\n" - " ldr r4, [r4, #0x4]\n" - " str r4, [sp]\n" - " ldrh r4, [r6]\n" - " str r4, [sp, #0x4]\n" - " bl DecompressPicFromTable_2\n" - " ldr r1, ._882 + 16 @ gMonPaletteTable\n" - " ldrh r0, [r6]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0x88\n" - " lsl r1, r1, #0x1\n" - " mov r2, #0x20\n" - " bl LoadCompressedPalette\n" - " ldr r4, ._882 + 20 @ gSprites\n" - " ldr r0, ._882 + 24 @ gTasks\n" - " lsl r2, r5, #0x2\n" - " add r2, r2, r5\n" - " lsl r2, r2, #0x3\n" - " add r2, r2, r0\n" - " mov r1, #0xa\n" - " ldsh r0, [r2, r1]\n" - " lsl r1, r0, #0x4\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r4\n" - " ldrh r0, [r6]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r8\n" - " ldrb r0, [r0, #0x1]\n" - " add r0, r0, #0x28\n" - " strh r0, [r1, #0x22]\n" - " mov r1, #0xa\n" - " ldsh r0, [r2, r1]\n" - " lsl r1, r0, #0x4\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r4\n" - " ldr r3, ._882 + 28 @ gUnknown_Debug_2023B62\n" - " ldrh r0, [r6]\n" - " sub r0, r0, #0x1\n" - " add r0, r0, r3\n" - " ldrb r0, [r0]\n" - " neg r0, r0\n" - " strh r0, [r1, #0x26]\n" - " mov r0, #0xa\n" - " ldsh r1, [r2, r0]\n" - " lsl r0, r1, #0x4\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r4\n" - " mov r1, #0x0\n" - " bl StartSpriteAnim\n" - " add sp, sp, #0x8\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._883:\n" - " .align 2, 0\n" - "._882:\n" - " .word gCurrentMove\n" - " .word gMonFrontPicTable\n" - " .word gMonFrontPicCoords\n" - " .word gUnknown_081FAF4C\n" - " .word gMonPaletteTable\n" - " .word gSprites\n" - " .word gTasks\n" - " .word gUnknown_Debug_2023B62\n" - "\n" - ); + DecompressPicFromTable_2( + &gMonFrontPicTable[gCurrentMove], + gMonFrontPicCoords[gCurrentMove].coords, + gMonFrontPicCoords[gCurrentMove].y_offset, + (void *)0x02000000, + gUnknown_081FAF4C[1], + gCurrentMove); + LoadCompressedPalette(gMonPaletteTable[gCurrentMove].data, 272, 32); + gSprites[gTasks[taskId].data[1]].pos1.y = gMonFrontPicCoords[gCurrentMove].y_offset + 40; + gSprites[gTasks[taskId].data[1]].pos2.y = -gUnknown_Debug_2023B62[gCurrentMove - 1]; + StartSpriteAnim(&gSprites[gTasks[taskId].data[1]], 0); } -__attribute__((naked)) -void debug_sub_8012AC0() +void debug_sub_8012AC0(s8 a, u8 taskId) { - asm( - " push {r4, r5, r6, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r6, r1, #0x18\n" - " ldr r3, ._885 @ gCurrentMove\n" - " ldr r4, ._885 + 4 @ gBaseStats\n" - " b ._884\n" - "._886:\n" - " .align 2, 0\n" - "._885:\n" - " .word gCurrentMove\n" - " .word gBaseStats\n" - "._890:\n" - " ldrb r0, [r1, #0x7]\n" - " cmp r0, #0x2\n" - " beq ._887 @cond_branch\n" - "._884:\n" - " add r2, r3, #0\n" - " lsl r0, r5, #0x18\n" - " asr r0, r0, #0x18\n" - " ldrh r1, [r2]\n" - " add r0, r0, r1\n" - " strh r0, [r2]\n" - " lsl r0, r0, #0x10\n" - " cmp r0, #0\n" - " bne ._888 @cond_branch\n" - " ldr r1, ._891 @ 0x19b\n" - " add r0, r1, #0\n" - " strh r0, [r2]\n" - "._888:\n" - " ldrh r1, [r2]\n" - " ldr r0, ._891 @ 0x19b\n" - " cmp r1, r0\n" - " bne ._889 @cond_branch\n" - " mov r0, #0x1\n" - " strh r0, [r2]\n" - "._889:\n" - " ldrh r0, [r3]\n" - " lsl r1, r0, #0x3\n" - " sub r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r4\n" - " ldrb r0, [r1, #0x6]\n" - " cmp r0, #0x2\n" - " bne ._890 @cond_branch\n" - "._887:\n" - " bl debug_sub_80128B4\n" - " add r0, r6, #0\n" - " bl debug_sub_8012938\n" - " add r0, r6, #0\n" - " bl debug_sub_80129F8\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._892:\n" - " .align 2, 0\n" - "._891:\n" - " .word 0x19b\n" - "\n" - ); + do + { + gCurrentMove += a; + if (gCurrentMove == 0) + gCurrentMove = 411; + if (gCurrentMove == 411) + gCurrentMove = 1; + } while (gBaseStats[gCurrentMove].type1 != 2 && gBaseStats[gCurrentMove].type2 != 2); + debug_sub_80128B4(); + debug_sub_8012938(taskId); + debug_sub_80129F8(taskId); } -__attribute__((naked)) -void debug_sub_8012B2C() +void debug_sub_8012B2C(u8 a) { - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x11\n" - " ldr r1, ._893 @ 0x600c772\n" - " add r2, r0, r1\n" - " mov r1, #0x1\n" - " strh r1, [r2]\n" - " ldr r1, ._893 + 4 @ 0x600c7b2\n" - " add r0, r0, r1\n" - " mov r1, #0x2\n" - " strh r1, [r0]\n" - " bx lr\n" - "._894:\n" - " .align 2, 0\n" - "._893:\n" - " .word 0x600c772\n" - " .word 0x600c7b2\n" - "\n" - ); + *(u16 *)(VRAM + 0xC000 + 0x772 + (a * 4 + 0) * 0x20) = 1; + *(u16 *)(VRAM + 0xC000 + 0x772 + (a * 4 + 2) * 0x20) = 2; } -__attribute__((naked)) -void debug_sub_8012B4C() +void debug_sub_8012B4C(u8 a) { - asm( - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x11\n" - " ldr r2, ._895 @ 0x600c772\n" - " add r1, r0, r2\n" - " ldr r3, ._895 + 4 @ 0x1016\n" - " add r2, r3, #0\n" - " strh r2, [r1]\n" - " ldr r1, ._895 + 8 @ 0x600c7b2\n" - " add r0, r0, r1\n" - " strh r2, [r0]\n" - " bx lr\n" - "._896:\n" - " .align 2, 0\n" - "._895:\n" - " .word 0x600c772\n" - " .word 0x1016\n" - " .word 0x600c7b2\n" - "\n" - ); + *(u16 *)(VRAM + 0xC000 + 0x772 + (a * 4 + 0) * 0x20) = 0x1016; + *(u16 *)(VRAM + 0xC000 + 0x772 + (a * 4 + 2) * 0x20) = 0x1016; } -__attribute__((naked)) -void debug_sub_8012B70() +void debug_sub_8012B70(u8 taskId, u8 b) { - asm( - " push {r4, r5, r6, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " lsl r1, r1, #0x18\n" - " lsr r6, r1, #0x18\n" - " cmp r6, #0\n" - " beq ._897 @cond_branch\n" - " mov r4, #0x1\n" - " str r4, [sp]\n" - " mov r0, #0x18\n" - " mov r1, #0x1c\n" - " mov r2, #0x1d\n" - " mov r3, #0x21\n" - " bl sub_802BBD4\n" - " bl debug_sub_80128B4\n" - " add r0, r5, #0\n" - " bl debug_sub_8012938\n" - " add r0, r5, #0\n" - " bl debug_sub_80129F8\n" - " ldr r1, ._899 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " strh r4, [r0, #0x8]\n" - " b ._898\n" - "._900:\n" - " .align 2, 0\n" - "._899:\n" - " .word gTasks\n" - "._897:\n" - " str r6, [sp]\n" - " mov r0, #0x18\n" - " mov r1, #0x1c\n" - " mov r2, #0x1d\n" - " mov r3, #0x21\n" - " bl sub_802BBD4\n" - " ldr r0, ._901 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " mov r0, #0x2\n" - " strh r0, [r4, #0x8]\n" - " ldr r5, ._901 + 4 @ gUnknown_03004210\n" - " ldr r1, ._901 + 8 @ Str_821F7DA\n" - " mov r2, #0xa4\n" - " lsl r2, r2, #0x2\n" - " mov r0, #0x1d\n" - " str r0, [sp]\n" - " add r0, r5, #0\n" - " mov r3, #0x1a\n" - " bl Text_InitWindow\n" - " add r0, r5, #0\n" - " bl Text_PrintWindow8002F44\n" - " strh r6, [r4, #0xe]\n" - " mov r0, #0x0\n" - " bl debug_sub_8012B2C\n" - "._898:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._902:\n" - " .align 2, 0\n" - "._901:\n" - " .word gTasks\n" - " .word gUnknown_03004210\n" - " .word Str_821F7DA\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8012C08() -{ - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffffc\n" - " add r4, r1, #0\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " mov r0, #0x0\n" - " mov r1, #0x9\n" - " bl debug_sub_8010A7C\n" - " ldr r7, ._905 @ gUnknown_03004210\n" - " ldr r5, ._905 + 4 @ gBattleTextBuff1\n" - " mov r0, #0x23\n" - " mov r8, r0\n" - " str r0, [sp]\n" - " add r0, r7, #0\n" - " add r1, r5, #0\n" - " mov r2, #0x90\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - " add r0, r7, #0\n" - " bl Text_PrintWindow8002F44\n" - " mov r0, #0x0\n" - " mov r1, #0x7\n" - " bl debug_sub_8010A7C\n" - " mov r0, #0x25\n" - " str r0, [sp]\n" - " add r0, r7, #0\n" - " add r1, r5, #0\n" - " mov r2, #0xa2\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - " add r0, r7, #0\n" - " bl Text_PrintWindow8002F44\n" - " mov r0, #0x0\n" - " str r0, [sp]\n" - " mov r0, #0x18\n" - " mov r1, #0x1c\n" - " mov r2, #0x1d\n" - " mov r3, #0x21\n" - " bl sub_802BBD4\n" - " cmp r4, #0\n" - " beq ._903 @cond_branch\n" - " ldr r1, ._905 + 8 @ gTasks\n" - " lsl r4, r6, #0x2\n" - " add r0, r4, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r1, #0x4\n" - " strh r1, [r0, #0x8]\n" - " ldr r1, ._905 + 12 @ gUnknown_Debug_821F7F3\n" - " mov r0, r8\n" - " str r0, [sp]\n" - " add r0, r7, #0\n" - " mov r2, #0x90\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - " b ._904\n" - "._906:\n" - " .align 2, 0\n" - "._905:\n" - " .word gUnknown_03004210\n" - " .word gBattleTextBuff1\n" - " .word gTasks\n" - " .word gUnknown_Debug_821F7F3\n" - "._903:\n" - " ldr r1, ._907 @ gTasks\n" - " lsl r4, r6, #0x2\n" - " add r0, r4, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r1, #0x3\n" - " strh r1, [r0, #0x8]\n" - " ldr r1, ._907 + 4 @ Str_821F7EA\n" - " mov r0, r8\n" - " str r0, [sp]\n" - " add r0, r7, #0\n" - " mov r2, #0x90\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - "._904:\n" - " add r5, r4, #0\n" - " ldr r4, ._907 + 8 @ gUnknown_03004210\n" - " add r0, r4, #0\n" - " bl Text_PrintWindow8002F44\n" - " ldr r1, ._907 + 12 @ BattleText_YesNo\n" - " mov r2, #0xa4\n" - " lsl r2, r2, #0x2\n" - " mov r0, #0x1d\n" - " str r0, [sp]\n" - " add r0, r4, #0\n" - " mov r3, #0x1a\n" - " bl Text_InitWindow\n" - " add r0, r4, #0\n" - " bl Text_PrintWindow8002F44\n" - " ldr r1, ._907 @ gTasks\n" - " add r0, r5, r6\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r1, #0x1\n" - " strh r1, [r0, #0xe]\n" - " mov r0, #0x1\n" - " bl debug_sub_8012B2C\n" - " add sp, sp, #0x4\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._908:\n" - " .align 2, 0\n" - "._907:\n" - " .word gTasks\n" - " .word Str_821F7EA\n" - " .word gUnknown_03004210\n" - " .word BattleText_YesNo\n" - "\n" - ); -} - -__attribute__((naked)) -void debug_sub_8012D10() -{ - asm( - " push {r4, r5, lr}\n" - " add sp, sp, #0xfffffffc\n" - " lsl r0, r0, #0x18\n" - " lsr r5, r0, #0x18\n" - " ldr r1, ._911 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r1, #0x8\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0x4\n" - " bls ._909 @cond_branch\n" - " b ._1067\n" - "._909:\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._911 + 4 @ \n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._912:\n" - " .align 2, 0\n" - "._911:\n" - " .word gTasks\n" - " .word ._913\n" - "._913:\n" - " .word ._914\n" - " .word ._915\n" - " .word ._916\n" - " .word ._917\n" - " .word ._918\n" - "._914:\n" - " bl debug_sub_80128B4\n" - " add r0, r5, #0\n" - " bl debug_sub_8012938\n" - " ldr r4, ._920 @ gUnknown_03004210\n" - " ldr r1, ._920 + 4 @ Str_821F7BD\n" - " mov r2, #0xc8\n" - " lsl r2, r2, #0x1\n" - " mov r0, #0x23\n" - " str r0, [sp]\n" - " add r0, r4, #0\n" - " mov r3, #0x13\n" - " bl Text_InitWindow\n" - " add r0, r4, #0\n" - " bl Text_PrintWindow8002F44\n" - " ldr r1, ._920 + 8 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldrh r1, [r0, #0x8]\n" - " add r1, r1, #0x1\n" - " strh r1, [r0, #0x8]\n" - " ldrb r0, [r0, #0xc]\n" - " b ._919\n" - "._921:\n" - " .align 2, 0\n" - "._920:\n" - " .word gUnknown_03004210\n" - " .word Str_821F7BD\n" - " .word gTasks\n" - "._915:\n" - " ldr r2, ._924 @ gMain\n" - " ldrh r1, [r2, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._922 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._924 + 4 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xc]\n" - " bl nullsub_8\n" - " ldrh r1, [r4, #0xc]\n" - " mov r0, #0x3\n" - " neg r0, r0\n" - " and r0, r0, r1\n" - " b ._931\n" - "._925:\n" - " .align 2, 0\n" - "._924:\n" - " .word gMain\n" - " .word gTasks\n" - "._922:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._926 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._928 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xc]\n" - " bl nullsub_8\n" - " ldrh r1, [r4, #0xc]\n" - " mov r0, #0x2\n" - " b ._927\n" - "._929:\n" - " .align 2, 0\n" - "._928:\n" - " .word gTasks\n" - "._926:\n" - " mov r0, #0x20\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._930 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._932 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xc]\n" - " bl nullsub_8\n" - " ldrh r1, [r4, #0xc]\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " and r0, r0, r1\n" - " b ._931\n" - "._933:\n" - " .align 2, 0\n" - "._932:\n" - " .word gTasks\n" - "._930:\n" - " mov r0, #0x10\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._934 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._936 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xc]\n" - " bl nullsub_8\n" - " ldrh r1, [r4, #0xc]\n" - " mov r0, #0x1\n" - "._927:\n" - " orr r0, r0, r1\n" - "._931:\n" - " strh r0, [r4, #0xc]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - "._919:\n" - " mov r1, #0x0\n" - " bl sub_802E3E4\n" - " b ._1067\n" - "._937:\n" - " .align 2, 0\n" - "._936:\n" - " .word gTasks\n" - "._934:\n" - " ldrh r1, [r2, #0x30]\n" - " mov r4, #0x1\n" - " add r0, r4, #0\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._938 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._943 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r2, #0xc\n" - " ldsh r0, [r0, r2]\n" - " cmp r0, #0x1\n" - " beq ._939 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._940 @cond_branch\n" - " cmp r0, #0\n" - " beq ._941 @cond_branch\n" - " b ._1067\n" - "._944:\n" - " .align 2, 0\n" - "._943:\n" - " .word gTasks\n" - "._940:\n" - " cmp r0, #0x2\n" - " beq ._945 @cond_branch\n" - "._990:\n" - " cmp r0, #0x3\n" - " bne ._946 @cond_branch\n" - " b ._1014\n" - "._946:\n" - " b ._1067\n" - "._941:\n" - " ldr r1, ._952 @ gUnknown_Debug_2023B62\n" - " ldr r0, ._952 + 4 @ gCurrentMove\n" - " ldrh r0, [r0]\n" - " sub r0, r0, #0x1\n" - " add r1, r0, r1\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x3f\n" - " bls ._949 @cond_branch\n" - " b ._1067\n" - "._949:\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " b ._1019\n" - "._953:\n" - " .align 2, 0\n" - "._952:\n" - " .word gUnknown_Debug_2023B62\n" - " .word gCurrentMove\n" - "._939:\n" - " mov r0, #0x1\n" - " b ._997\n" - "._945:\n" - " ldr r1, ._957 @ gCurrentMove\n" - " ldrh r2, [r1]\n" - " mov r0, #0xcd\n" - " lsl r0, r0, #0x1\n" - " cmp r2, r0\n" - " bhi ._955 @cond_branch\n" - " add r0, r2, #1\n" - "._979:\n" - " strh r0, [r1]\n" - " b ._1025\n" - "._958:\n" - " .align 2, 0\n" - "._957:\n" - " .word gCurrentMove\n" - "._955:\n" - " strh r4, [r1]\n" - " b ._1025\n" - "._938:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._960 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._966 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r1, #0xc\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0x1\n" - " bne ._961 @cond_branch\n" - " b ._1007\n" - "._961:\n" - " cmp r0, #0x1\n" - " bgt ._963 @cond_branch\n" - " cmp r0, #0\n" - " beq ._964 @cond_branch\n" - " b ._1067\n" - "._967:\n" - " .align 2, 0\n" - "._966:\n" - " .word gTasks\n" - "._963:\n" - " cmp r0, #0x2\n" - " beq ._968 @cond_branch\n" - " b ._990\n" - "._964:\n" - " ldr r1, ._973 @ gUnknown_Debug_2023B62\n" - " ldr r0, ._973 + 4 @ gCurrentMove\n" - " ldrh r0, [r0]\n" - " sub r0, r0, #0x1\n" - " add r1, r0, r1\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " bne ._970 @cond_branch\n" - " b ._1067\n" - "._970:\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " b ._1019\n" - "._974:\n" - " .align 2, 0\n" - "._973:\n" - " .word gUnknown_Debug_2023B62\n" - " .word gCurrentMove\n" - "._968:\n" - " ldr r1, ._977 @ gCurrentMove\n" - " ldrh r0, [r1]\n" - " cmp r0, #0x1\n" - " bls ._975 @cond_branch\n" - " sub r0, r0, #0x1\n" - " b ._979\n" - "._978:\n" - " .align 2, 0\n" - "._977:\n" - " .word gCurrentMove\n" - "._975:\n" - " ldr r2, ._980 @ 0x19b\n" - " add r0, r2, #0\n" - " b ._979\n" - "._981:\n" - " .align 2, 0\n" - "._980:\n" - " .word 0x19b\n" - "._960:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._982 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._987 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r1, #0xc\n" - " ldsh r0, [r0, r1]\n" - " cmp r0, #0x1\n" - " beq ._983 @cond_branch\n" - " cmp r0, #0x1\n" - " bgt ._984 @cond_branch\n" - " cmp r0, #0\n" - " beq ._985 @cond_branch\n" - " b ._1067\n" - "._988:\n" - " .align 2, 0\n" - "._987:\n" - " .word gTasks\n" - "._984:\n" - " cmp r0, #0x2\n" - " beq ._989 @cond_branch\n" - " b ._990\n" - "._985:\n" - " ldr r3, ._995 @ gUnknown_Debug_2023B62\n" - " ldr r2, ._995 + 4 @ gCurrentMove\n" - " ldrh r0, [r2]\n" - " sub r0, r0, #0x1\n" - " add r1, r0, r3\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x3f\n" - " bls ._991 @cond_branch\n" - " b ._1067\n" - "._991:\n" - " add r0, r0, #0x8\n" - " strb r0, [r1]\n" - " ldrh r0, [r2]\n" - " sub r0, r0, #0x1\n" - " add r1, r0, r3\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x40\n" - " bls ._1019 @cond_branch\n" - " mov r0, #0x40\n" - " strb r0, [r1]\n" - " b ._1019\n" - "._996:\n" - " .align 2, 0\n" - "._995:\n" - " .word gUnknown_Debug_2023B62\n" - " .word gCurrentMove\n" - "._983:\n" - " mov r0, #0x1\n" - " b ._997\n" - "._989:\n" - " ldr r3, ._1000 @ gCurrentMove\n" - " ldrh r2, [r3]\n" - " add r1, r2, #0\n" - " add r1, r1, #0xa\n" - " ldr r0, ._1000 + 4 @ 0x19b\n" - " cmp r1, r0\n" - " bgt ._998 @cond_branch\n" - " strh r1, [r3]\n" - " b ._1025\n" - "._1001:\n" - " .align 2, 0\n" - "._1000:\n" - " .word gCurrentMove\n" - " .word 0x19b\n" - "._998:\n" - " ldr r1, ._1003 @ 0xfffffe70\n" - " add r0, r2, r1\n" - " strh r0, [r3]\n" - " b ._1025\n" - "._1004:\n" - " .align 2, 0\n" - "._1003:\n" - " .word 0xfffffe70\n" - "._982:\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._1005 @cond_branch\n" - " b ._1067\n" - "._1005:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r1, ._1011 @ gTasks\n" - " lsl r0, r5, #0x2\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " mov r2, #0xc\n" - " ldsh r3, [r0, r2]\n" - " cmp r3, #0x1\n" - " beq ._1007 @cond_branch\n" - " cmp r3, #0x1\n" - " bgt ._1008 @cond_branch\n" - " cmp r3, #0\n" - " beq ._1009 @cond_branch\n" - " b ._1067\n" - "._1012:\n" - " .align 2, 0\n" - "._1011:\n" - " .word gTasks\n" - "._1008:\n" - " cmp r3, #0x2\n" - " beq ._1013 @cond_branch\n" - " cmp r3, #0x3\n" - " beq ._1014 @cond_branch\n" - " b ._1067\n" - "._1009:\n" - " ldr r1, ._1020 @ gUnknown_Debug_2023B62\n" - " ldr r0, ._1020 + 4 @ gCurrentMove\n" - " ldrh r0, [r0]\n" - " sub r0, r0, #0x1\n" - " add r2, r0, r1\n" - " ldrb r0, [r2]\n" - " add r1, r0, #0\n" - " cmp r1, #0\n" - " bne ._1016 @cond_branch\n" - " b ._1067\n" - "._1016:\n" - " cmp r1, #0x8\n" - " bls ._1018 @cond_branch\n" - " sub r0, r0, #0x8\n" - " strb r0, [r2]\n" - " b ._1019\n" - "._1021:\n" - " .align 2, 0\n" - "._1020:\n" - " .word gUnknown_Debug_2023B62\n" - " .word gCurrentMove\n" - "._1018:\n" - " strb r3, [r2]\n" - "._1019:\n" - " add r0, r5, #0\n" - " bl debug_sub_8012938\n" - " b ._1067\n" - "._1007:\n" - " mov r0, #0x1\n" - " neg r0, r0\n" - "._997:\n" - " add r1, r5, #0\n" - " bl debug_sub_8012AC0\n" - " b ._1067\n" - "._1013:\n" - " ldr r2, ._1026 @ gCurrentMove\n" - " ldrh r0, [r2]\n" - " add r1, r0, #0\n" - " sub r1, r1, #0xa\n" - " cmp r1, #0x1\n" - " ble ._1024 @cond_branch\n" - " strh r1, [r2]\n" - " b ._1025\n" - "._1027:\n" - " .align 2, 0\n" - "._1026:\n" - " .word gCurrentMove\n" - "._1024:\n" - " mov r1, #0xc8\n" - " lsl r1, r1, #0x1\n" - " add r0, r0, r1\n" - " strh r0, [r2]\n" - "._1025:\n" - " bl debug_sub_80128B4\n" - " add r0, r5, #0\n" - " bl debug_sub_8012938\n" - " add r0, r5, #0\n" - " bl debug_sub_80129F8\n" - " b ._1067\n" - "._1014:\n" - " add r0, r5, #0\n" - " mov r1, #0x0\n" - " bl debug_sub_8012B70\n" - " b ._1067\n" - "._916:\n" - " ldr r0, ._1032 @ gMain\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1030 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._1032 + 4 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xe]\n" - " bl debug_sub_8012B4C\n" - " mov r0, #0x0\n" - " b ._1055\n" - "._1033:\n" - " .align 2, 0\n" - "._1032:\n" - " .word gMain\n" - " .word gTasks\n" - "._1030:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._1046 @cond_branch\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1035 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._1037 @ gTasks\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " ldrb r1, [r1, #0xe]\n" - " add r0, r5, #0\n" - " bl debug_sub_8012C08\n" - " b ._1067\n" - "._1038:\n" - " .align 2, 0\n" - "._1037:\n" - " .word gTasks\n" - "._1035:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._1039 @cond_branch\n" - " b ._1067\n" - "._1039:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " b ._1063\n" - "._917:\n" - " ldr r0, ._1044 @ gMain\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1042 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._1044 + 4 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xe]\n" - " bl debug_sub_8012B4C\n" - " mov r0, #0x0\n" - " b ._1055\n" - "._1045:\n" - " .align 2, 0\n" - "._1044:\n" - " .word gMain\n" - " .word gTasks\n" - "._1042:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._1046 @cond_branch\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1047 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._1050 @ gTasks\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " mov r2, #0xe\n" - " ldsh r0, [r1, r2]\n" - " cmp r0, #0\n" - " bne ._1063 @cond_branch\n" - " ldr r1, ._1050 + 4 @ gUnknown_Debug_2023B62\n" - " ldr r2, ._1050 + 8 @ 0x19b\n" - " mov r0, #0x1f\n" - " bl debug_sub_80132C8\n" - " b ._1063\n" - "._1051:\n" - " .align 2, 0\n" - "._1050:\n" - " .word gTasks\n" - " .word gUnknown_Debug_2023B62\n" - " .word 0x19b\n" - "._1047:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1067 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " b ._1063\n" - "._918:\n" - " ldr r0, ._1056 @ gMain\n" - " ldrh r1, [r0, #0x2e]\n" - " mov r0, #0x40\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1054 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._1056 + 4 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xe]\n" - " bl debug_sub_8012B4C\n" - " mov r0, #0x0\n" - " b ._1055\n" - "._1057:\n" - " .align 2, 0\n" - "._1056:\n" - " .word gMain\n" - " .word gTasks\n" - "._1054:\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1058 @cond_branch\n" - "._1046:\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._1060 @ gTasks\n" - " lsl r4, r5, #0x2\n" - " add r4, r4, r5\n" - " lsl r4, r4, #0x3\n" - " add r4, r4, r0\n" - " ldrb r0, [r4, #0xe]\n" - " bl debug_sub_8012B4C\n" - " mov r0, #0x1\n" - "._1055:\n" - " strh r0, [r4, #0xe]\n" - " bl debug_sub_8012B2C\n" - " b ._1067\n" - "._1061:\n" - " .align 2, 0\n" - "._1060:\n" - " .word gTasks\n" - "._1058:\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1062 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " ldr r0, ._1065 @ gTasks\n" - " lsl r1, r5, #0x2\n" - " add r1, r1, r5\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r0\n" - " mov r2, #0xe\n" - " ldsh r0, [r1, r2]\n" - " cmp r0, #0\n" - " bne ._1063 @cond_branch\n" - " ldr r1, ._1065 + 4 @ gUnknown_Debug_2023B62\n" - " ldr r2, ._1065 + 8 @ 0x19b\n" - " mov r0, #0x1f\n" - " bl debug_sub_8013294\n" - "._1063:\n" - " add r0, r5, #0\n" - " mov r1, #0x1\n" - " bl debug_sub_8012B70\n" - " b ._1067\n" - "._1066:\n" - " .align 2, 0\n" - "._1065:\n" - " .word gTasks\n" - " .word gUnknown_Debug_2023B62\n" - " .word 0x19b\n" - "._1062:\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1067 @cond_branch\n" - " mov r0, #0x5\n" - " bl PlaySE\n" - " add r0, r5, #0\n" - " mov r1, #0x1\n" - " bl debug_sub_8012B70\n" - "._1067:\n" - " add sp, sp, #0x4\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); + if (b != 0) + { + sub_802BBD4(24, 28, 29, 33, 1); + debug_sub_80128B4(); + debug_sub_8012938(taskId); + debug_sub_80129F8(taskId); + gTasks[taskId].data[0] = 1; + } + else + { + sub_802BBD4(24, 28, 29, 33, 0); + gTasks[taskId].data[0] = 2; + Text_InitWindow(&gUnknown_03004210, Str_821F7DA, 656, 26, 29); + Text_PrintWindow8002F44(&gUnknown_03004210); + gTasks[taskId].data[3] = 0; + debug_sub_8012B2C(0); + } +} + +void debug_sub_8012C08(u8 taskId, u8 b) +{ + debug_sub_8010A7C(0, 9); + Text_InitWindow(&gUnknown_03004210, gBattleTextBuff1, 144, 2, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); + debug_sub_8010A7C(0, 7); + Text_InitWindow(&gUnknown_03004210, gBattleTextBuff1, 162, 2, 37); + Text_PrintWindow8002F44(&gUnknown_03004210); + sub_802BBD4(24, 28, 29, 33, 0); + if (b != 0) + { + gTasks[taskId].data[0] = 4; + Text_InitWindow(&gUnknown_03004210, gUnknown_Debug_821F7F3, 144, 2, 35); + } + else + { + gTasks[taskId].data[0] = 3; + Text_InitWindow(&gUnknown_03004210, Str_821F7EA, 144, 2, 35); + } + Text_PrintWindow8002F44(&gUnknown_03004210); + Text_InitWindow(&gUnknown_03004210, BattleText_YesNo, 656, 26, 29); + Text_PrintWindow8002F44(&gUnknown_03004210); + gTasks[taskId].data[3] = 1; + debug_sub_8012B2C(1); +} + +void debug_sub_8012D10(u8 taskId) +{ + switch (gTasks[taskId].data[0]) + { + case 0: + debug_sub_80128B4(); + debug_sub_8012938(taskId); + Text_InitWindow(&gUnknown_03004210, Str_821F7BD, 400, 19, 35); + Text_PrintWindow8002F44(&gUnknown_03004210); + gTasks[taskId].data[0]++; + sub_802E3E4(gTasks[taskId].data[2], 0); + break; + case 1: + if (gMain.newKeys & DPAD_UP) + { + PlaySE(SE_SELECT); + nullsub_8(gTasks[taskId].data[2]); + gTasks[taskId].data[2] &= ~2; + sub_802E3E4(gTasks[taskId].data[2], 0); + } + else if (gMain.newKeys & DPAD_DOWN) + { + PlaySE(SE_SELECT); + nullsub_8(gTasks[taskId].data[2]); + gTasks[taskId].data[2] |= 2; + sub_802E3E4(gTasks[taskId].data[2], 0); + } + else if (gMain.newKeys & DPAD_LEFT) + { + PlaySE(SE_SELECT); + nullsub_8(gTasks[taskId].data[2]); + gTasks[taskId].data[2] &= ~1; + sub_802E3E4(gTasks[taskId].data[2], 0); + } + else if (gMain.newKeys & DPAD_RIGHT) + { + PlaySE(SE_SELECT); + nullsub_8(gTasks[taskId].data[2]); + gTasks[taskId].data[2] |= 1; + sub_802E3E4(gTasks[taskId].data[2], 0); + } + else if (gMain.newAndRepeatedKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + switch (gTasks[taskId].data[2]) + { + case 0: + if (gUnknown_Debug_2023B62[gCurrentMove - 1] < 64) + { + gUnknown_Debug_2023B62[gCurrentMove - 1] += 1; + debug_sub_8012938(taskId); + } + break; + case 1: + debug_sub_8012AC0(1, taskId); + break; + case 2: + if (gCurrentMove < 411) + gCurrentMove++; + else + gCurrentMove = 1; + debug_sub_80128B4(); + debug_sub_8012938(taskId); + debug_sub_80129F8(taskId); + break; + case 3: + debug_sub_8012B70(taskId, 0); + break; + } + } + else if (gMain.newAndRepeatedKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + switch (gTasks[taskId].data[2]) + { + case 0: + if (gUnknown_Debug_2023B62[gCurrentMove - 1] > 0) + { + gUnknown_Debug_2023B62[gCurrentMove - 1] -= 1; + debug_sub_8012938(taskId); + } + break; + case 1: + debug_sub_8012AC0(-1, taskId); + break; + case 2: + if (gCurrentMove > 1) + gCurrentMove--; + else + gCurrentMove = 411; + debug_sub_80128B4(); + debug_sub_8012938(taskId); + debug_sub_80129F8(taskId); + break; + case 3: + debug_sub_8012B70(taskId, 0); + break; + } + } + else if (gMain.newAndRepeatedKeys & R_BUTTON) + { + PlaySE(SE_SELECT); + switch (gTasks[taskId].data[2]) + { + case 0: + if (gUnknown_Debug_2023B62[gCurrentMove - 1] < 64) + { + gUnknown_Debug_2023B62[gCurrentMove - 1] += 8; + if (gUnknown_Debug_2023B62[gCurrentMove - 1] > 64) + gUnknown_Debug_2023B62[gCurrentMove - 1] = 64; + debug_sub_8012938(taskId); + } + break; + case 1: + debug_sub_8012AC0(1, taskId); + break; + case 2: + if (gCurrentMove + 10 < 412) + gCurrentMove += 10; + else + gCurrentMove -= 400; + debug_sub_80128B4(); + debug_sub_8012938(taskId); + debug_sub_80129F8(taskId); + break; + case 3: + debug_sub_8012B70(taskId, 0); + break; + } + } + else if (gMain.newAndRepeatedKeys & L_BUTTON) + { + PlaySE(SE_SELECT); + switch (gTasks[taskId].data[2]) + { + case 0: + if (gUnknown_Debug_2023B62[gCurrentMove - 1] > 0) + { + if (gUnknown_Debug_2023B62[gCurrentMove - 1] > 8) + gUnknown_Debug_2023B62[gCurrentMove - 1] -= 8; + else + gUnknown_Debug_2023B62[gCurrentMove - 1] = 0; + debug_sub_8012938(taskId); + } + break; + case 1: + debug_sub_8012AC0(-1, taskId); + break; + case 2: + if (gCurrentMove - 10 > 1) + gCurrentMove -= 10; + else + gCurrentMove += 400; + debug_sub_80128B4(); + debug_sub_8012938(taskId); + debug_sub_80129F8(taskId); + break; + case 3: + debug_sub_8012B70(taskId, 0); + break; + } + } + break; + case 2: + if (gMain.newKeys & DPAD_UP) + { + PlaySE(SE_SELECT); + debug_sub_8012B4C(gTasks[taskId].data[3]); + gTasks[taskId].data[3] = 0; + debug_sub_8012B2C(0); + } + else if (gMain.newKeys & DPAD_DOWN) + { + PlaySE(SE_SELECT); + debug_sub_8012B4C(gTasks[taskId].data[3]); + gTasks[taskId].data[3] = 1; + debug_sub_8012B2C(1); + } + else if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + debug_sub_8012C08(taskId, gTasks[taskId].data[3]); + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + asm(""); + debug_sub_8012B70(taskId, 1); + } + return; + case 3: + if (gMain.newKeys & DPAD_UP) + { + PlaySE(SE_SELECT); + debug_sub_8012B4C(gTasks[taskId].data[3]); + gTasks[taskId].data[3] = 0; + debug_sub_8012B2C(0); + } + else if (gMain.newKeys & DPAD_DOWN) + { + PlaySE(SE_SELECT); + debug_sub_8012B4C(gTasks[taskId].data[3]); + gTasks[taskId].data[3] = 1; + debug_sub_8012B2C(1); + } + else if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + if (gTasks[taskId].data[3] == 0) + debug_sub_80132C8(31, gUnknown_Debug_2023B62, 411); + debug_sub_8012B70(taskId, 1); + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + debug_sub_8012B70(taskId, 1); + } + break; + case 4: + if (gMain.newKeys & DPAD_UP) + { + PlaySE(SE_SELECT); + debug_sub_8012B4C(gTasks[taskId].data[3]); + gTasks[taskId].data[3] = 0; + debug_sub_8012B2C(0); + } + else if (gMain.newKeys & DPAD_DOWN) + { + PlaySE(SE_SELECT); + debug_sub_8012B4C(gTasks[taskId].data[3]); + gTasks[taskId].data[3] = 1; + debug_sub_8012B2C(1); + } + else if (gMain.newKeys & A_BUTTON) + { + PlaySE(SE_SELECT); + if (gTasks[taskId].data[3] == 0) + debug_sub_8013294(31, gUnknown_Debug_2023B62, 411); + debug_sub_8012B70(taskId, 1); + } + else if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + debug_sub_8012B70(taskId, 1); + } + break; + } } u8 debug_sub_8013240(void) @@ -6769,683 +5868,103 @@ void dp11b_obj_free(u8 a, u8 b) } else { - if (!ewram17810[a].unk0_2) - return; - r4 = gSprites[ewram17810[a].unk3].data[3]; - DestroySprite(&gSprites[ewram17810[a].unk3]); - ewram17810[a].unk0_2 = 0; - } - gSprites[r4].pos2.x = 0; - gSprites[r4].pos2.y = 0; -} - -void objc_dp11b_pingpong(struct Sprite *sprite) -{ - u8 spriteId = sprite->data[3]; - s32 var; - - if (sprite->data[4] == 1) - var = sprite->data[0]; - else - var = sprite->data[0]; - - gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2]; - sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; -} - -void nullsub_41(void) -{ -} - -void sub_8010800(void) -{ - sub_8010874(); - gBattleCommunication[1] = 0; - gBattleMainFunc = bc_8012FAC; -} - -#if DEBUG -__attribute__((naked)) -void debug_sub_80138CC() -{ - asm( - " push {lr}\n" - " ldr r0, ._1167 @ gActiveBank\n" - " ldrb r0, [r0]\n" - " bl GetBankSide\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " beq ._1163 @cond_branch\n" - " b ._1186\n" - "._1163:\n" - " ldr r1, ._1167 + 4 @ gSharedMem\n" - " ldr r2, ._1167 + 8 @ 0x160fd\n" - " add r0, r1, r2\n" - " ldrb r0, [r0]\n" - " add r2, r1, #0\n" - " cmp r0, #0x4\n" - " bls ._1165 @cond_branch\n" - " b ._1186\n" - "._1165:\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._1167 + 12 @ \n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._1168:\n" - " .align 2, 0\n" - "._1167:\n" - " .word gActiveBank\n" - " .word gSharedMem\n" - " .word 0x160fd\n" - " .word ._1169\n" - "._1169:\n" - " .word ._1170\n" - " .word ._1171\n" - " .word ._1172\n" - " .word ._1173\n" - " .word ._1174\n" - "._1170:\n" - " ldr r1, ._1177 @ gBattleBankFunc\n" - " ldr r0, ._1177 + 4 @ gActiveBank\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r1\n" - " ldr r1, [r0]\n" - " ldr r0, ._1177 + 8 @ sub_802C098\n" - " cmp r1, r0\n" - " bne ._1186 @cond_branch\n" - " ldr r0, ._1177 + 12 @ 0x160fd\n" - " add r1, r2, r0\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " b ._1187\n" - "._1178:\n" - " .align 2, 0\n" - "._1177:\n" - " .word gBattleBankFunc\n" - " .word gActiveBank\n" - " .word sub_802C098+1\n" - " .word 0x160fd\n" - "._1171:\n" - " ldr r1, ._1180 @ gMain\n" - " mov r0, #0x1\n" - " strh r0, [r1, #0x2c]\n" - " strh r0, [r1, #0x2e]\n" - " ldr r0, ._1180 + 4 @ 0x160fd\n" - " add r1, r2, r0\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " ldr r0, ._1180 + 8 @ 0x160fe\n" - " add r1, r2, r0\n" - " mov r0, #0x80\n" - " b ._1187\n" - "._1181:\n" - " .align 2, 0\n" - "._1180:\n" - " .word gMain\n" - " .word 0x160fd\n" - " .word 0x160fe\n" - "._1172:\n" - " ldr r0, ._1184 @ 0x160fe\n" - " add r3, r2, r0\n" - " ldrb r0, [r3]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r3]\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._1186 @cond_branch\n" - " ldr r1, ._1184 + 4 @ gMain\n" - " mov r0, #0x1\n" - " strh r0, [r1, #0x2c]\n" - " strh r0, [r1, #0x2e]\n" - " ldr r0, ._1184 + 8 @ 0x160fd\n" - " add r1, r2, r0\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " strb r0, [r1]\n" - " mov r0, #0x80\n" - " strb r0, [r3]\n" - " b ._1186\n" - "._1185:\n" - " .align 2, 0\n" - "._1184:\n" - " .word 0x160fe\n" - " .word gMain\n" - " .word 0x160fd\n" - "._1173:\n" - " ldr r0, ._1188 @ 0x160fe\n" - " add r1, r2, r0\n" - " ldrb r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strb r0, [r1]\n" - " lsl r0, r0, #0x18\n" - " cmp r0, #0\n" - " bne ._1186 @cond_branch\n" - " ldr r1, ._1188 + 4 @ gMain\n" - " mov r0, #0x1\n" - " strh r0, [r1, #0x2c]\n" - " strh r0, [r1, #0x2e]\n" - " ldr r0, ._1188 + 8 @ 0x160fd\n" - " add r1, r2, r0\n" - " ldrb r0, [r1]\n" - " add r0, r0, #0x1\n" - " b ._1187\n" - "._1189:\n" - " .align 2, 0\n" - "._1188:\n" - " .word 0x160fe\n" - " .word gMain\n" - " .word 0x160fd\n" - "._1174:\n" - " ldr r0, ._1190 @ 0x160fd\n" - " add r1, r2, r0\n" - " mov r0, #0x0\n" - "._1187:\n" - " strb r0, [r1]\n" - "._1186:\n" - " pop {r0}\n" - " bx r0\n" - "._1191:\n" - " .align 2, 0\n" - "._1190:\n" - " .word 0x160fd\n" - "\n" - ); + if (!ewram17810[a].unk0_2) + return; + r4 = gSprites[ewram17810[a].unk3].data[3]; + DestroySprite(&gSprites[ewram17810[a].unk3]); + ewram17810[a].unk0_2 = 0; + } + gSprites[r4].pos2.x = 0; + gSprites[r4].pos2.y = 0; } -__attribute__((naked)) -void debug_sub_80139E4() +void objc_dp11b_pingpong(struct Sprite *sprite) { - asm( - " push {r4, r5, lr}\n" - " ldr r0, ._1198 @ gUnknown_02023A14_50\n" - " ldrb r1, [r0]\n" - " mov r0, #0x80\n" - " and r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r4, r0, #0x18\n" - " cmp r4, #0\n" - " beq ._1192 @cond_branch\n" - " ldr r2, ._1198 + 4 @ gActiveBank\n" - " mov r0, #0x0\n" - " strb r0, [r2]\n" - " ldr r1, ._1198 + 8 @ gNoOfAllBanks\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._1193 @cond_branch\n" - " add r4, r2, #0\n" - " add r5, r1, #0\n" - "._1194:\n" - " bl debug_sub_80138CC\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " strb r0, [r4]\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldrb r1, [r5]\n" - " cmp r0, r1\n" - " bcc ._1194 @cond_branch\n" - "._1193:\n" - " ldr r0, ._1198 + 12 @ gBattleMainFunc\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " ldr r1, ._1198 + 4 @ gActiveBank\n" - " mov r0, #0x0\n" - " strb r0, [r1]\n" - " ldr r0, ._1198 + 8 @ gNoOfAllBanks\n" - " ldrb r0, [r0]\n" - " cmp r0, #0\n" - " beq ._1200 @cond_branch\n" - " ldr r5, ._1198 + 16 @ gBattleBankFunc\n" - " add r4, r1, #0\n" - "._1196:\n" - " ldrb r0, [r4]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r5\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " strb r0, [r4]\n" - " ldr r1, ._1198 + 8 @ gNoOfAllBanks\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldrb r1, [r1]\n" - " cmp r0, r1\n" - " bcc ._1196 @cond_branch\n" - " b ._1200\n" - "._1199:\n" - " .align 2, 0\n" - "._1198:\n" - " .word gUnknown_02023A14_50\n" - " .word gActiveBank\n" - " .word gNoOfAllBanks\n" - " .word gBattleMainFunc\n" - " .word gBattleBankFunc\n" - "._1192:\n" - " ldr r0, ._1202 @ gBattleMainFunc\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " ldr r1, ._1202 + 4 @ gActiveBank\n" - " strb r4, [r1]\n" - " ldr r0, ._1202 + 8 @ gNoOfAllBanks\n" - " ldrb r0, [r0]\n" - " cmp r4, r0\n" - " bcs ._1200 @cond_branch\n" - " ldr r5, ._1202 + 12 @ gBattleBankFunc\n" - " add r4, r1, #0\n" - "._1201:\n" - " ldrb r0, [r4]\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r5\n" - " ldr r0, [r0]\n" - " bl _call_via_r0\n" - " ldrb r0, [r4]\n" - " add r0, r0, #0x1\n" - " strb r0, [r4]\n" - " ldr r1, ._1202 + 8 @ gNoOfAllBanks\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldrb r1, [r1]\n" - " cmp r0, r1\n" - " bcc ._1201 @cond_branch\n" - "._1200:\n" - " pop {r4, r5}\n" - " pop {r0}\n" - " bx r0\n" - "._1203:\n" - " .align 2, 0\n" - "._1202:\n" - " .word gBattleMainFunc\n" - " .word gActiveBank\n" - " .word gNoOfAllBanks\n" - " .word gBattleBankFunc\n" - "\n" - ); + u8 spriteId = sprite->data[3]; + s32 var; + + if (sprite->data[4] == 1) + var = sprite->data[0]; + else + var = sprite->data[0]; + + gSprites[spriteId].pos2.y = Sin(var, sprite->data[2]) + sprite->data[2]; + sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF; } -__attribute__((naked)) -void sub_8010874() +void nullsub_41(void) { - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, sl\n" - " mov r6, r9\n" - " mov r5, r8\n" - " push {r5, r6, r7}\n" - " mov r0, #0x0\n" - " bl TurnValuesCleanUp\n" - " bl SpecialStatusesClear\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - " ldr r0, ._1215 @ gUnknown_02024C4C\n" - " mov sl, r0\n" - " ldr r1, ._1215 + 4 @ gLastHitByType\n" - " mov r9, r1\n" - " ldr r4, ._1215 + 8 @ gLastLandedMoves\n" - " mov r8, r4\n" - " ldr r0, ._1215 + 12 @ gLastUsedMove\n" - " mov ip, r0\n" - " ldr r4, ._1215 + 16 @ gDisableStructs\n" - " mov r5, #0x0\n" - " ldr r7, ._1215 + 20 @ gUnknown_02024C2C\n" - " ldr r6, ._1215 + 24 @ gLockedMoves\n" - "._1205:\n" - " ldr r0, ._1215 + 28 @ gStatuses3\n" - " add r0, r5, r0\n" - " str r3, [r0]\n" - " mov r1, #0x0\n" - "._1204:\n" - " add r0, r4, r1\n" - " strb r3, [r0]\n" - " add r1, r1, #0x1\n" - " cmp r1, #0x1b\n" - " bls ._1204 @cond_branch\n" - " mov r0, #0x2\n" - " strb r0, [r4, #0x16]\n" - " ldr r1, ._1215 + 32 @ gUnknown_02024C70\n" - " add r0, r2, r1\n" - " strb r3, [r0]\n" - " mov r0, ip\n" - " strh r3, [r0]\n" - " mov r1, r8\n" - " strh r3, [r1]\n" - " mov r0, r9\n" - " strh r3, [r0]\n" - " mov r1, sl\n" - " strh r3, [r1]\n" - " ldr r0, ._1215 + 36 @ gUnknown_02024C5C\n" - " add r1, r2, r0\n" - " mov r0, #0xff\n" - " strb r0, [r1]\n" - " strh r3, [r6]\n" - " strh r3, [r7]\n" - " ldr r1, ._1215 + 40 @ gSharedMem\n" - " add r0, r5, r1\n" - " str r3, [r0]\n" - " mov r0, #0x2\n" - " add sl, sl, r0\n" - " add r9, r9, r0\n" - " add r8, r8, r0\n" - " add ip, ip, r0\n" - " add r4, r4, #0x1c\n" - " add r5, r5, #0x4\n" - " add r7, r7, #0x2\n" - " add r6, r6, #0x2\n" - " add r2, r2, #0x1\n" - " cmp r2, #0x3\n" - " ble ._1205 @cond_branch\n" - " mov r5, #0x0\n" - " ldr r3, ._1215 + 44 @ gSideTimers\n" - " ldr r4, ._1215 + 48 @ gSideAffecting\n" - " mov r2, #0x1\n" - "._1207:\n" - " strh r5, [r4]\n" - " mov r1, #0x0\n" - "._1206:\n" - " add r0, r3, r1\n" - " strb r5, [r0]\n" - " add r1, r1, #0x1\n" - " cmp r1, #0xb\n" - " bls ._1206 @cond_branch\n" - " add r3, r3, #0xc\n" - " add r4, r4, #0x2\n" - " sub r2, r2, #0x1\n" - " cmp r2, #0\n" - " bge ._1207 @cond_branch\n" - " mov r1, #0x0\n" - " ldr r2, ._1215 + 52 @ gBankAttacker\n" - " strb r1, [r2]\n" - " ldr r3, ._1215 + 56 @ gBankTarget\n" - " strb r1, [r3]\n" - " ldr r4, ._1215 + 60 @ gBattleWeather\n" - " strh r1, [r4]\n" - " ldr r1, ._1215 + 64 @ gWishFutureKnock\n" - " mov r2, #0x0\n" - " mov r3, #0x0\n" - "._1208:\n" - " add r0, r1, r2\n" - " strb r3, [r0]\n" - " add r2, r2, #0x1\n" - " cmp r2, #0x2b\n" - " bls ._1208 @cond_branch\n" - " mov r0, #0x0\n" - " ldr r1, ._1215 + 68 @ gHitMarker\n" - " str r0, [r1]\n" - " ldr r2, ._1215 + 72 @ gBattleTypeFlags\n" - " ldrh r1, [r2]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._1210 @cond_branch\n" - " ldr r3, ._1215 + 76 @ gSaveBlock2\n" - " ldrb r1, [r3, #0x15]\n" - " mov r0, #0x4\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._1210 @cond_branch\n" - " mov r0, #0x80\n" - " ldr r4, ._1215 + 68 @ gHitMarker\n" - " str r0, [r4]\n" - "._1210:\n" - " ldr r1, ._1215 + 76 @ gSaveBlock2\n" - " ldrb r0, [r1, #0x15]\n" - " lsl r0, r0, #0x1e\n" - " lsr r0, r0, #0x1f\n" - " ldr r3, ._1215 + 80 @ gSharedMem\n" - " ldr r4, ._1215 + 84 @ 0x16084\n" - " add r2, r3, r4\n" - " mov r1, #0x0\n" - " strb r0, [r2]\n" - " ldr r0, ._1215 + 88 @ gMultiHitCounter\n" - " strb r1, [r0]\n" - " ldr r2, ._1215 + 92 @ gBattleOutcome\n" - " strb r1, [r2]\n" - " ldr r3, ._1215 + 96 @ gBattleExecBuffer\n" - " str r1, [r3]\n" - " mov r2, #0x0\n" - " ldr r4, ._1215 + 100@ gPaydayMoney\n" - " strh r1, [r4]\n" - " ldr r1, ._1215 + 80 @ gSharedMem\n" - " ldr r3, ._1215 + 104@ 0x17130\n" - " add r0, r1, r3\n" - " strb r2, [r0]\n" - " ldr r4, ._1215 + 108@ 0x17160\n" - " add r0, r1, r4\n" - " strb r2, [r0]\n" - " ldr r1, ._1215 + 112@ gBattleCommunication\n" - " mov r2, #0x0\n" - " add r0, r1, #7\n" - "._1211:\n" - " strb r2, [r0]\n" - " sub r0, r0, #0x1\n" - " cmp r0, r1\n" - " bge ._1211 @cond_branch\n" - " mov r5, #0x0\n" - " ldr r0, ._1215 + 116@ gPauseCounterBattle\n" - " strh r5, [r0]\n" - " mov r0, #0x0\n" - " ldr r1, ._1215 + 120@ gBattleMoveDamage\n" - " str r0, [r1]\n" - " ldr r2, ._1215 + 124@ gUnknown_02024DE8\n" - " strh r0, [r2]\n" - " ldr r4, ._1215 + 80 @ gSharedMem\n" - " ldr r3, ._1215 + 128@ 0x16002\n" - " add r0, r4, r3\n" - " strb r5, [r0]\n" - " ldr r1, ._1215 + 132@ 0x160a1\n" - " add r0, r4, r1\n" - " strb r5, [r0]\n" - " ldr r2, ._1215 + 136@ gLeveledUpInBattle\n" - " strb r5, [r2]\n" - " ldr r3, ._1215 + 140@ gAbsentBankFlags\n" - " strb r5, [r3]\n" - " sub r1, r1, #0x29\n" - " add r0, r4, r1\n" - " strb r5, [r0]\n" - " ldr r2, ._1215 + 144@ 0x16086\n" - " add r0, r4, r2\n" - " strb r5, [r0]\n" - " ldr r3, ._1215 + 148@ 0x16087\n" - " add r0, r4, r3\n" - " strb r5, [r0]\n" - " ldr r0, ._1215 + 152@ gEnemyParty\n" - " mov r1, #0xb\n" - " bl GetMonData\n" - " ldr r2, ._1215 + 156@ gBaseStats\n" - " lsl r1, r0, #0x3\n" - " sub r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r2\n" - " ldrb r1, [r1, #0x8]\n" - " mov r0, #0x64\n" - " mul r0, r0, r1\n" - " ldr r1, ._1215 + 160@ 0x4fb\n" - " bl __divsi3\n" - " ldr r2, ._1215 + 164@ 0x16089\n" - " add r1, r4, r2\n" - " strb r0, [r1]\n" - " ldr r3, ._1215 + 168@ 0x16088\n" - " add r1, r4, r3\n" - " mov r0, #0x3\n" - " strb r0, [r1]\n" - " ldr r1, ._1215 + 172@ 0x1601b\n" - " add r0, r4, r1\n" - " strb r5, [r0]\n" - " sub r2, r2, #0x33\n" - " add r1, r4, r2\n" - " mov r0, #0x1\n" - " strb r0, [r1]\n" - " mov r2, #0x0\n" - " mov r1, #0x0\n" - "._1212:\n" - " ldr r3, ._1215 + 176@ 0x160ac\n" - " add r0, r2, r3\n" - " add r0, r0, r4\n" - " strb r1, [r0]\n" - " add r3, r3, #0x20\n" - " add r0, r2, r3\n" - " add r0, r0, r4\n" - " strb r1, [r0]\n" - " add r3, r3, #0x1c\n" - " add r0, r2, r3\n" - " add r0, r0, r4\n" - " strb r1, [r0]\n" - " add r3, r3, #0x8\n" - " add r0, r2, r3\n" - " add r0, r0, r4\n" - " strb r1, [r0]\n" - " add r3, r3, #0x10\n" - " add r0, r2, r3\n" - " add r0, r0, r4\n" - " strb r1, [r0]\n" - " add r3, r3, #0x8\n" - " add r0, r2, r3\n" - " add r0, r0, r4\n" - " strb r1, [r0]\n" - " add r2, r2, #0x1\n" - " cmp r2, #0x7\n" - " ble ._1212 @cond_branch\n" - " ldr r4, ._1215 + 80 @ gSharedMem\n" - " ldr r1, ._1215 + 180@ 0x160c8\n" - " add r0, r4, r1\n" - " mov r2, #0x0\n" - " mov r1, #0x6\n" - " strb r1, [r0]\n" - " sub r3, r3, #0x3f\n" - " add r0, r4, r3\n" - " strb r1, [r0]\n" - " ldr r1, ._1215 + 184@ 0x16113\n" - " add r0, r4, r1\n" - " strb r2, [r0]\n" - " ldr r3, ._1215 + 188@ gBattleResults\n" - " mov r1, #0x0\n" - " mov r2, #0xa\n" - " add r0, r3, #0\n" - " add r0, r0, #0x40\n" - "._1213:\n" - " strb r1, [r0]\n" - " sub r0, r0, #0x1\n" - " sub r2, r2, #0x1\n" - " cmp r2, #0\n" - " bge ._1213 @cond_branch\n" - " mov r1, #0x0\n" - " strb r1, [r3, #0x13]\n" - " strb r1, [r3]\n" - " strb r1, [r3, #0x1]\n" - " strb r1, [r3, #0x2]\n" - " strb r1, [r3, #0x3]\n" - " strb r1, [r3, #0x4]\n" - " ldrb r2, [r3, #0x5]\n" - " mov r0, #0x2\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " mov r2, #0x3\n" - " neg r2, r2\n" - " and r0, r0, r2\n" - " strb r0, [r3, #0x5]\n" - " strh r1, [r3, #0x20]\n" - " strh r1, [r3, #0x22]\n" - " strh r1, [r3, #0x24]\n" - " strh r1, [r3, #0x6]\n" - " strh r1, [r3, #0x26]\n" - " strh r1, [r3, #0x28]\n" - " mov r2, #0x0\n" - " add r5, r3, #0\n" - " add r5, r5, #0x8\n" - " mov r4, #0x0\n" - " add r1, r3, #0\n" - " add r1, r1, #0x14\n" - "._1214:\n" - " add r0, r2, r5\n" - " strb r4, [r0]\n" - " strb r4, [r1]\n" - " strb r4, [r1, #0x16]\n" - " add r1, r1, #0x1\n" - " add r2, r2, #0x1\n" - " cmp r2, #0x9\n" - " ble ._1214 @cond_branch\n" - " ldr r2, ._1215 + 80 @ gSharedMem\n" - " ldr r3, ._1215 + 192@ 0x1609e\n" - " add r0, r2, r3\n" - " mov r1, #0x0\n" - " strb r1, [r0]\n" - " ldr r4, ._1215 + 196@ 0x1609f\n" - " add r0, r2, r4\n" - " strb r1, [r0]\n" - " pop {r3, r4, r5}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " mov sl, r5\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._1216:\n" - " .align 2, 0\n" - "._1215:\n" - " .word gUnknown_02024C4C\n" - " .word gLastHitByType\n" - " .word gLastLandedMoves\n" - " .word gLastUsedMove\n" - " .word gDisableStructs\n" - " .word gUnknown_02024C2C\n" - " .word gLockedMoves\n" - " .word gStatuses3\n" - " .word gUnknown_02024C70\n" - " .word gUnknown_02024C5C\n" - " .word gSharedMem+0x17100\n" - " .word gSideTimers\n" - " .word gSideAffecting\n" - " .word gBankAttacker\n" - " .word gBankTarget\n" - " .word gBattleWeather\n" - " .word gWishFutureKnock\n" - " .word gHitMarker\n" - " .word gBattleTypeFlags\n" - " .word gSaveBlock2\n" - " .word gSharedMem\n" - " .word 0x16084\n" - " .word gMultiHitCounter\n" - " .word gBattleOutcome\n" - " .word gBattleExecBuffer\n" - " .word gPaydayMoney\n" - " .word 0x17130\n" - " .word 0x17160\n" - " .word gBattleCommunication\n" - " .word gPauseCounterBattle\n" - " .word gBattleMoveDamage\n" - " .word gUnknown_02024DE8\n" - " .word 0x16002\n" - " .word 0x160a1\n" - " .word gLeveledUpInBattle\n" - " .word gAbsentBankFlags\n" - " .word 0x16086\n" - " .word 0x16087\n" - " .word gEnemyParty\n" - " .word gBaseStats\n" - " .word 0x4fb\n" - " .word 0x16089\n" - " .word 0x16088\n" - " .word 0x1601b\n" - " .word 0x160ac\n" - " .word 0x160c8\n" - " .word 0x16113\n" - " .word gBattleResults\n" - " .word 0x1609e\n" - " .word 0x1609f\n" - "\n" - ); } -#else -void sub_8010824(void) +void sub_8010800(void) { - gBattleMainFunc(); + sub_8010874(); + gBattleCommunication[1] = 0; + gBattleMainFunc = bc_8012FAC; +} - for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) - gBattleBankFunc[gActiveBank](); +#if DEBUG +void debug_sub_80138CC(void) +{ + if (GetBankSide(gActiveBank) == 0) + { + switch (gSharedMem[0x160FD]) + { + case 0: + if (gBattleBankFunc[gActiveBank] == sub_802C098) + gSharedMem[0x160FD]++; + break; + case 1: + gMain.heldKeys = A_BUTTON; + gMain.newKeys = A_BUTTON; + gSharedMem[0x160FD]++; + gSharedMem[0x160FE] = 0x80; + break; + case 2: + gSharedMem[0x160FE]--; + if (gSharedMem[0x160FE] == 0) + { + gMain.heldKeys = A_BUTTON; + gMain.newKeys = A_BUTTON; + gSharedMem[0x160FD]++; + gSharedMem[0x160FE] = 0x80; + } + break; + case 3: + gSharedMem[0x160FE]--; + if (gSharedMem[0x160FE] == 0) + { + gMain.heldKeys = A_BUTTON; + gMain.newKeys = A_BUTTON; + gSharedMem[0x160FD]++; + } + break; + case 4: + gSharedMem[0x160FD] = 0; + break; + } + } +} +#endif + +void sub_8010824(void) +{ +#if DEBUG + if (gUnknown_02023A14_50 & 0x80) + { + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + debug_sub_80138CC(); + gBattleMainFunc(); + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + gBattleBankFunc[gActiveBank](); + } + else +#endif + { + gBattleMainFunc(); + for (gActiveBank = 0; gActiveBank < gNoOfAllBanks; gActiveBank++) + gBattleBankFunc[gActiveBank](); + } } void sub_8010874(void) @@ -7548,8 +6067,11 @@ void sub_8010874(void) gBattleResults.pokeString2[i] = 0; gBattleResults.caughtNick[i] = 0; } -} +#if DEBUG + gSharedMem[0x1609E] = 0; + gSharedMem[0x1609F] = 0; #endif +} void SwitchInClearSetData(void) { @@ -9936,6 +8458,351 @@ u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreMovePriorities) return strikesFirst; } +// The debug version should be identical, but has a strange register swap, and +// seems to be affected by other functions, which is bizarre. +#if DEBUG +__attribute__((naked)) +void SetActionsAndBanksTurnOrder(void) +{ + asm("\ + push {r4, r5, r6, r7, lr}\n\ + mov r7, sl\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5, r6, r7}\n\ + mov r3, #0x0\n\ + ldr r0, ._L1550\n\ + ldrh r1, [r0]\n\ + mov r0, #0x80\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._L1499 @cond_branch\n\ + ldr r0, ._L1550+0x4\n\ + strb r3, [r0]\n\ + ldr r4, ._L1550+0x8\n\ + mov r8, r0\n\ + ldrb r0, [r4]\n\ + cmp r3, r0\n\ + bcc ._LCB12758\n\ + b ._L1505 @long jump\n\ +._LCB12758:\n\ + ldr r7, ._L1550+0xc\n\ + ldr r6, ._L1550+0x10\n\ + mov r2, r8\n\ + ldr r5, ._L1550+0x14\n\ +._L1503:\n\ + add r1, r3, r7\n\ + ldrb r0, [r2]\n\ + add r0, r0, r6\n\ + ldrb r0, [r0]\n\ + strb r0, [r1]\n\ + add r1, r3, r5\n\ + ldrb r0, [r2]\n\ + strb r0, [r1]\n\ + add r3, r3, #0x1\n\ + ldrb r0, [r2]\n\ + add r0, r0, #0x1\n\ + strb r0, [r2]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldrb r1, [r4]\n\ + cmp r0, r1\n\ + bcc ._L1503 @cond_branch\n\ + b ._L1505\n\ +._L1551:\n\ + .align 2, 0\n\ +._L1550:\n\ + .word gBattleTypeFlags\n\ + .word gActiveBank\n\ + .word gNoOfAllBanks\n\ + .word gActionsByTurnOrder\n\ + .word gActionForBanks\n\ + .word gBanksByTurnOrder\n\ +._L1499:\n\ + mov r0, #0x2\n\ + and r0, r0, r1\n\ + cmp r0, #0\n\ + beq ._L1506 @cond_branch\n\ + ldr r0, ._L1552\n\ + strb r3, [r0]\n\ + ldr r1, ._L1552+0x4\n\ + mov r8, r0\n\ + add r2, r1, #0\n\ + ldrb r2, [r2]\n\ + cmp r3, r2\n\ + bcs ._L1513 @cond_branch\n\ + ldr r0, ._L1552+0x8\n\ + ldrb r1, [r0]\n\ + add r4, r0, #0\n\ + cmp r1, #0x3\n\ + beq ._L1548 @cond_branch\n\ +._L1509:\n\ + mov r7, r8\n\ + ldrb r0, [r7]\n\ + add r0, r0, #0x1\n\ + strb r0, [r7]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r1, ._L1552+0x4\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcs ._L1513 @cond_branch\n\ + ldrb r0, [r7]\n\ + add r0, r0, r4\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x3\n\ + bne ._L1509 @cond_branch\n\ + b ._L1548\n\ +._L1553:\n\ + .align 2, 0\n\ +._L1552:\n\ + .word gActiveBank\n\ + .word gNoOfAllBanks\n\ + .word gActionForBanks\n\ +._L1506:\n\ + ldr r0, ._L1554\n\ + ldrb r0, [r0]\n\ + ldr r2, ._L1554+0x4\n\ + mov r8, r2\n\ + cmp r0, #0x3\n\ + bne ._L1513 @cond_branch\n\ + strb r3, [r2]\n\ +._L1548:\n\ + mov r3, #0x5\n\ +._L1513:\n\ + cmp r3, #0x5\n\ + bne ._L1515 @cond_branch\n\ + ldr r6, ._L1554+0x8\n\ + ldr r1, ._L1554\n\ + mov r3, r8\n\ + ldrb r0, [r3]\n\ + add r0, r0, r1\n\ + ldrb r0, [r0]\n\ + strb r0, [r6]\n\ + ldr r2, ._L1554+0xc\n\ + ldrb r0, [r3]\n\ + strb r0, [r2]\n\ + mov r3, #0x1\n\ + mov r5, #0x0\n\ + add r4, r1, #0\n\ + ldr r7, ._L1554+0x10\n\ + mov r9, r7\n\ + ldr r0, ._L1554+0x14\n\ + mov ip, r0\n\ + ldr r1, ._L1554+0x18\n\ + mov sl, r1\n\ + ldr r7, ._L1554+0x1c\n\ + ldrb r7, [r7]\n\ + cmp r5, r7\n\ + bge ._L1517 @cond_branch\n\ + add r7, r6, #0\n\ + add r6, r4, #0\n\ + add r4, r2, #0\n\ + ldr r2, ._L1554+0x1c\n\ +._L1519:\n\ + mov r0, r8\n\ + ldrb r0, [r0]\n\ + cmp r5, r0\n\ + beq ._L1518 @cond_branch\n\ + add r1, r3, r7\n\ + add r0, r5, r6\n\ + ldrb r0, [r0]\n\ + strb r0, [r1]\n\ + add r0, r3, r4\n\ + strb r5, [r0]\n\ + add r3, r3, #0x1\n\ +._L1518:\n\ + add r5, r5, #0x1\n\ + ldrb r1, [r2]\n\ + cmp r5, r1\n\ + blt ._L1519 @cond_branch\n\ +._L1517:\n\ + mov r2, ip\n\ + mov r3, r9\n\ + str r2, [r3]\n\ + ldr r1, ._L1554+0x20\n\ + add r1, r1, sl\n\ + mov r0, #0x0\n\ + strb r0, [r1]\n\ + b ._L1498\n\ +._L1555:\n\ + .align 2, 0\n\ +._L1554:\n\ + .word gActionForBanks\n\ + .word gActiveBank\n\ + .word gActionsByTurnOrder\n\ + .word gBanksByTurnOrder\n\ + .word gBattleMainFunc\n\ + .word CheckFocusPunch_ClearVarsBeforeTurnStarts\n\ + .word gSharedMem\n\ + .word gNoOfAllBanks\n\ + .word 0x1601d\n\ +._L1515:\n\ + mov r0, #0x0\n\ + mov r7, r8\n\ + strb r0, [r7]\n\ + ldr r1, ._L1556\n\ + ldrb r0, [r1]\n\ + cmp r0, #0\n\ + beq ._L1524 @cond_branch\n\ + ldr r6, ._L1556+0x4\n\ + mov r2, r8\n\ + ldr r5, ._L1556+0x8\n\ + ldr r4, ._L1556+0xc\n\ +._L1526:\n\ + ldrb r0, [r2]\n\ + add r0, r0, r6\n\ + ldrb r1, [r0]\n\ + sub r0, r1, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bhi ._L1525 @cond_branch\n\ + add r0, r3, r5\n\ + strb r1, [r0]\n\ + add r1, r3, r4\n\ + mov r7, r8\n\ + ldrb r0, [r7]\n\ + strb r0, [r1]\n\ + add r3, r3, #0x1\n\ +._L1525:\n\ + ldrb r0, [r2]\n\ + add r0, r0, #0x1\n\ + strb r0, [r2]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r1, ._L1556\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc ._L1526 @cond_branch\n\ +._L1524:\n\ + mov r0, #0x0\n\ + mov r2, r8\n\ + strb r0, [r2]\n\ + ldr r7, ._L1556\n\ + ldrb r0, [r7]\n\ + cmp r0, #0\n\ + beq ._L1530 @cond_branch\n\ + ldr r6, ._L1556+0x4\n\ + ldr r5, ._L1556+0x8\n\ + ldr r4, ._L1556+0xc\n\ +._L1532:\n\ + ldrb r0, [r2]\n\ + add r0, r0, r6\n\ + ldrb r1, [r0]\n\ + sub r0, r1, #0x1\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + cmp r0, #0x1\n\ + bls ._L1531 @cond_branch\n\ + add r0, r3, r5\n\ + strb r1, [r0]\n\ + add r1, r3, r4\n\ + mov r7, r8\n\ + ldrb r0, [r7]\n\ + strb r0, [r1]\n\ + add r3, r3, #0x1\n\ +._L1531:\n\ + ldrb r0, [r2]\n\ + add r0, r0, #0x1\n\ + strb r0, [r2]\n\ + lsl r0, r0, #0x18\n\ + lsr r0, r0, #0x18\n\ + ldr r1, ._L1556\n\ + ldrb r1, [r1]\n\ + cmp r0, r1\n\ + bcc ._L1532 @cond_branch\n\ +._L1530:\n\ + mov r5, #0x0\n\ + b ._L1549\n\ +._L1557:\n\ + .align 2, 0\n\ +._L1556:\n\ + .word gNoOfAllBanks\n\ + .word gActionForBanks\n\ + .word gActionsByTurnOrder\n\ + .word gBanksByTurnOrder\n\ +._L1538:\n\ + add r4, r5, #0x1\n\ + add r7, r4, #0\n\ + ldrb r1, [r1]\n\ + cmp r7, r1\n\ + bge ._L1537 @cond_branch\n\ + ldr r6, ._L1558\n\ + lsl r2, r5, #0x18\n\ + mov r8, r2\n\ +._L1542:\n\ + ldr r0, ._L1558+0x4\n\ + add r1, r5, r0\n\ + ldrb r3, [r1]\n\ + add r0, r4, r0\n\ + ldrb r1, [r0]\n\ + add r0, r5, r6\n\ + ldrb r2, [r0]\n\ + cmp r2, #0x1\n\ + beq ._L1541 @cond_branch\n\ + add r0, r4, r6\n\ + ldrb r0, [r0]\n\ + cmp r0, #0x1\n\ + beq ._L1541 @cond_branch\n\ + cmp r2, #0x2\n\ + beq ._L1541 @cond_branch\n\ + cmp r0, #0x2\n\ + beq ._L1541 @cond_branch\n\ + add r0, r3, #0\n\ + mov r2, #0x0\n\ + bl GetWhoStrikesFirst\n\ + lsl r0, r0, #0x18\n\ + cmp r0, #0\n\ + beq ._L1541 @cond_branch\n\ + lsl r1, r4, #0x18\n\ + lsr r1, r1, #0x18\n\ + mov r3, r8\n\ + lsr r0, r3, #0x18\n\ + bl SwapTurnOrder\n\ +._L1541:\n\ + add r4, r4, #0x1\n\ + ldr r0, ._L1558+0x8\n\ + ldrb r0, [r0]\n\ + cmp r4, r0\n\ + blt ._L1542 @cond_branch\n\ +._L1537:\n\ + add r5, r7, #0\n\ +._L1549:\n\ + ldr r1, ._L1558+0x8\n\ + ldrb r0, [r1]\n\ + sub r0, r0, #0x1\n\ + cmp r5, r0\n\ + blt ._L1538 @cond_branch\n\ +._L1505:\n\ + ldr r1, ._L1558+0xc\n\ + ldr r0, ._L1558+0x10\n\ + str r0, [r1]\n\ + ldr r0, ._L1558+0x14\n\ + ldr r7, ._L1558+0x18\n\ + add r0, r0, r7\n\ + mov r1, #0x0\n\ + strb r1, [r0]\n\ +._L1498:\n\ + pop {r3, r4, r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov sl, r5\n\ + pop {r4, r5, r6, r7}\n\ + pop {r0}\n\ + bx r0\n\ +._L1559:\n\ + .align 2, 0\n\ +._L1558:\n\ + .word gActionsByTurnOrder\n\ + .word gBanksByTurnOrder\n\ + .word gNoOfAllBanks\n\ + .word gBattleMainFunc\n\ + .word CheckFocusPunch_ClearVarsBeforeTurnStarts\n\ + .word gSharedMem\n\ + .word 0x1601d"); +} +#else void SetActionsAndBanksTurnOrder(void) { s32 var = 0; @@ -10028,15 +8895,11 @@ void SetActionsAndBanksTurnOrder(void) } } } - // Debug ROM has a register swap from the retail ROM. - // And doing this seems to fix it. -#if DEBUG - asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm("");asm(""); - asm("");asm("");asm("");asm("");asm("");asm("");asm(""); -#endif + gBattleMainFunc = CheckFocusPunch_ClearVarsBeforeTurnStarts; eFocusPunchBank = 0; } +#endif static void TurnValuesCleanUp(bool8 var0) { -- cgit v1.2.3 From 961752e648fa63995c9021907ea1f6c9dc8e2a45 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 28 Jan 2018 11:36:25 -0800 Subject: Finish naming known sc88 noises and change naming scheme --- sound/direct_sound_data.inc | 150 ++++++++++----------- sound/direct_sound_samples/845ED34.aif | Bin 4086 -> 0 bytes sound/direct_sound_samples/8488F44.aif | Bin 6561 -> 0 bytes sound/direct_sound_samples/848C4A4.aif | Bin 7250 -> 0 bytes sound/direct_sound_samples/848E094.aif | Bin 5141 -> 0 bytes sound/direct_sound_samples/848F448.aif | Bin 9955 -> 0 bytes sound/direct_sound_samples/8491ACC.aif | Bin 4772 -> 0 bytes sound/direct_sound_samples/8493D20.aif | Bin 4967 -> 0 bytes sound/direct_sound_samples/8495028.aif | Bin 8555 -> 0 bytes sound/direct_sound_samples/8499110.aif | Bin 8818 -> 0 bytes sound/direct_sound_samples/84A5690.aif | Bin 2346 -> 0 bytes sound/direct_sound_samples/sc88/123_bubble.aif | Bin 4178 -> 0 bytes sound/direct_sound_samples/sc88/123_pink_noise.aif | Bin 8207 -> 0 bytes .../direct_sound_samples/sc88/123_white_noise.aif | Bin 7071 -> 0 bytes sound/direct_sound_samples/sc88/13_marimba.aif | Bin 2709 -> 0 bytes .../direct_sound_samples/sc88/15_tubular_bell.aif | Bin 6610 -> 0 bytes sound/direct_sound_samples/sc88/18_organ_2.aif | Bin 2138 -> 0 bytes sound/direct_sound_samples/sc88/1_piano_1.aif | Bin 2706 -> 0 bytes .../direct_sound_samples/sc88/22_accordion_fr.aif | Bin 5169 -> 0 bytes .../sc88/25_nylon_string_guitar.aif | Bin 8144 -> 0 bytes .../sc88/26_steel_string_guitar.aif | Bin 4031 -> 0 bytes sound/direct_sound_samples/sc88/2_piano_2.aif | Bin 5564 -> 0 bytes sound/direct_sound_samples/sc88/34_finger_slap.aif | Bin 3993 -> 0 bytes .../direct_sound_samples/sc88/34_fingered_bass.aif | Bin 7344 -> 0 bytes .../direct_sound_samples/sc88/36_fretless_bass.aif | Bin 3115 -> 0 bytes sound/direct_sound_samples/sc88/37_unison_slap.aif | Bin 3052 -> 0 bytes .../direct_sound_samples/sc88/39_synth_bass_1.aif | Bin 3284 -> 0 bytes sound/direct_sound_samples/sc88/3_piano_3.aif | Bin 5824 -> 0 bytes .../sc88/46_pizzicato_strings.aif | Bin 1947 -> 0 bytes sound/direct_sound_samples/sc88/49_strings.aif | Bin 13830 -> 0 bytes .../sc88/49_strings_plus_flute.aif | Bin 9085 -> 0 bytes .../sc88/49_strings_plus_horn.aif | Bin 14123 -> 0 bytes sound/direct_sound_samples/sc88/57_trumpet.aif | Bin 5040 -> 0 bytes sound/direct_sound_samples/sc88/58_trombone.aif | Bin 5489 -> 0 bytes sound/direct_sound_samples/sc88/59_tuba.aif | Bin 5247 -> 0 bytes .../sc88/60_cup_muted_trumpet.aif | Bin 4347 -> 0 bytes .../sc88/60_muted_trumpet_3.aif | Bin 4283 -> 0 bytes .../direct_sound_samples/sc88/61_french_horns.aif | Bin 28662 -> 0 bytes .../sc88/61_wide_french_horns.aif | Bin 17892 -> 0 bytes sound/direct_sound_samples/sc88/74_flute.aif | Bin 1989 -> 0 bytes sound/direct_sound_samples/sc88/81_square_wave.aif | Bin 7286 -> 0 bytes sound/direct_sound_samples/sc88/8456330.aif | Bin 1797 -> 0 bytes sound/direct_sound_samples/sc88/8497134.aif | Bin 8253 -> 0 bytes sound/direct_sound_samples/sc88/849F40C.aif | Bin 13121 -> 0 bytes .../sc88/drumkit_bass_drum.aif | Bin 1249 -> 0 bytes sound/direct_sound_samples/sc88/drumkit_cabasa.aif | Bin 2294 -> 0 bytes .../sc88/drumkit_closed_hi_hat.aif | Bin 1107 -> 0 bytes .../sc88/drumkit_crash_cymbal_1.aif | Bin 3979 -> 0 bytes .../sc88/drumkit_crash_cymbal_2.aif | Bin 2372 -> 0 bytes sound/direct_sound_samples/sc88/drumkit_guiro.aif | Bin 2093 -> 0 bytes .../sc88/drumkit_hand_clap.aif | Bin 2258 -> 0 bytes .../sc88/drumkit_hi_mid_tom.aif | Bin 4256 -> 0 bytes .../sc88/drumkit_low_conga.aif | Bin 1546 -> 0 bytes .../sc88/drumkit_mute_hi_conga.aif | Bin 1370 -> 0 bytes .../sc88/drumkit_open_hi_hat.aif | Bin 3728 -> 0 bytes .../direct_sound_samples/sc88/drumkit_snare_1.aif | Bin 1844 -> 0 bytes .../direct_sound_samples/sc88/drumkit_snare_2.aif | Bin 2231 -> 0 bytes .../direct_sound_samples/sc88/drumkit_snare_3.aif | Bin 5382 -> 0 bytes .../direct_sound_samples/sc88/drumkit_snare_4.aif | Bin 2669 -> 0 bytes .../sc88/drumkit_timbale_1.aif | Bin 5424 -> 0 bytes .../sc88/drumkit_timbale_2.aif | Bin 5424 -> 0 bytes sound/direct_sound_samples/synth/hi_hat_rattle.aif | Bin 0 -> 4086 bytes .../direct_sound_samples/synth/machine_sound1.aif | Bin 0 -> 5141 bytes .../direct_sound_samples/synth/machine_sound2.aif | Bin 0 -> 7250 bytes sound/direct_sound_samples/synth/noise1.aif | Bin 0 -> 8207 bytes sound/direct_sound_samples/synth/noise2.aif | Bin 0 -> 7071 bytes sound/direct_sound_samples/synth/noise3.aif | Bin 0 -> 4772 bytes sound/direct_sound_samples/synth/ring.aif | Bin 0 -> 6561 bytes .../direct_sound_samples/synth/sc88_123_bubble.aif | Bin 0 -> 4178 bytes .../synth/sc88_123_pink_noise.aif | Bin 0 -> 8555 bytes .../synth/sc88_123_white_noise.aif | Bin 0 -> 8818 bytes .../synth/sc88_124_horse_gallop.aif | Bin 0 -> 2346 bytes .../synth/sc88_126_car_crash.aif | Bin 0 -> 4967 bytes .../synth/sc88_127_applause_2.aif | Bin 0 -> 9955 bytes .../direct_sound_samples/synth/sc88_13_marimba.aif | Bin 0 -> 2709 bytes .../synth/sc88_15_tubular_bell.aif | Bin 0 -> 6610 bytes .../direct_sound_samples/synth/sc88_18_organ_2.aif | Bin 0 -> 2138 bytes .../direct_sound_samples/synth/sc88_1_piano_1.aif | Bin 0 -> 2706 bytes .../synth/sc88_22_accordion_fr.aif | Bin 0 -> 5169 bytes .../synth/sc88_25_nylon_string_guitar.aif | Bin 0 -> 8144 bytes .../synth/sc88_26_steel_string_guitar.aif | Bin 0 -> 4031 bytes .../direct_sound_samples/synth/sc88_2_piano_2.aif | Bin 0 -> 5564 bytes .../synth/sc88_34_finger_slap.aif | Bin 0 -> 3993 bytes .../synth/sc88_34_fingered_bass.aif | Bin 0 -> 7344 bytes .../synth/sc88_36_fretless_bass.aif | Bin 0 -> 3115 bytes .../synth/sc88_37_unison_slap.aif | Bin 0 -> 3052 bytes .../synth/sc88_39_synth_bass_1.aif | Bin 0 -> 3284 bytes .../direct_sound_samples/synth/sc88_3_piano_3.aif | Bin 0 -> 5824 bytes .../synth/sc88_46_pizzicato_strings.aif | Bin 0 -> 1947 bytes .../direct_sound_samples/synth/sc88_49_strings.aif | Bin 0 -> 13830 bytes .../synth/sc88_49_strings_plus_flute.aif | Bin 0 -> 9085 bytes .../synth/sc88_49_strings_plus_horn.aif | Bin 0 -> 14123 bytes .../direct_sound_samples/synth/sc88_57_trumpet.aif | Bin 0 -> 5040 bytes .../synth/sc88_58_trombone.aif | Bin 0 -> 5489 bytes sound/direct_sound_samples/synth/sc88_59_tuba.aif | Bin 0 -> 5247 bytes .../synth/sc88_60_cup_muted_trumpet.aif | Bin 0 -> 4347 bytes .../synth/sc88_60_muted_trumpet_3.aif | Bin 0 -> 4283 bytes .../synth/sc88_61_french_horns.aif | Bin 0 -> 28662 bytes .../synth/sc88_61_wide_french_horns.aif | Bin 0 -> 17892 bytes sound/direct_sound_samples/synth/sc88_74_flute.aif | Bin 0 -> 1989 bytes .../synth/sc88_81_square_wave.aif | Bin 0 -> 7286 bytes .../synth/sc88_82_jp_super_saw.aif | Bin 0 -> 13121 bytes .../synth/sc88_82_waspy_synth.aif | Bin 0 -> 8253 bytes sound/direct_sound_samples/synth/sc88_8456330.aif | Bin 0 -> 1797 bytes .../synth/sc88_drumkit_bass_drum.aif | Bin 0 -> 1249 bytes .../synth/sc88_drumkit_cabasa.aif | Bin 0 -> 2294 bytes .../synth/sc88_drumkit_closed_hi_hat.aif | Bin 0 -> 1107 bytes .../synth/sc88_drumkit_crash_cymbal_1.aif | Bin 0 -> 3979 bytes .../synth/sc88_drumkit_crash_cymbal_2.aif | Bin 0 -> 2372 bytes .../synth/sc88_drumkit_guiro.aif | Bin 0 -> 2093 bytes .../synth/sc88_drumkit_hand_clap.aif | Bin 0 -> 2258 bytes .../synth/sc88_drumkit_hi_mid_tom.aif | Bin 0 -> 4256 bytes .../synth/sc88_drumkit_low_conga.aif | Bin 0 -> 1546 bytes .../synth/sc88_drumkit_mute_hi_conga.aif | Bin 0 -> 1370 bytes .../synth/sc88_drumkit_open_hi_hat.aif | Bin 0 -> 3728 bytes .../synth/sc88_drumkit_snare_1.aif | Bin 0 -> 1844 bytes .../synth/sc88_drumkit_snare_2.aif | Bin 0 -> 2231 bytes .../synth/sc88_drumkit_snare_3.aif | Bin 0 -> 5382 bytes .../synth/sc88_drumkit_snare_4.aif | Bin 0 -> 2669 bytes .../synth/sc88_drumkit_timbale_1.aif | Bin 0 -> 5424 bytes .../synth/sc88_drumkit_timbale_2.aif | Bin 0 -> 5424 bytes sound/voice_groups.inc | 46 +++---- 122 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 sound/direct_sound_samples/845ED34.aif delete mode 100644 sound/direct_sound_samples/8488F44.aif delete mode 100644 sound/direct_sound_samples/848C4A4.aif delete mode 100644 sound/direct_sound_samples/848E094.aif delete mode 100644 sound/direct_sound_samples/848F448.aif delete mode 100644 sound/direct_sound_samples/8491ACC.aif delete mode 100644 sound/direct_sound_samples/8493D20.aif delete mode 100644 sound/direct_sound_samples/8495028.aif delete mode 100644 sound/direct_sound_samples/8499110.aif delete mode 100644 sound/direct_sound_samples/84A5690.aif delete mode 100644 sound/direct_sound_samples/sc88/123_bubble.aif delete mode 100644 sound/direct_sound_samples/sc88/123_pink_noise.aif delete mode 100644 sound/direct_sound_samples/sc88/123_white_noise.aif delete mode 100644 sound/direct_sound_samples/sc88/13_marimba.aif delete mode 100644 sound/direct_sound_samples/sc88/15_tubular_bell.aif delete mode 100644 sound/direct_sound_samples/sc88/18_organ_2.aif delete mode 100644 sound/direct_sound_samples/sc88/1_piano_1.aif delete mode 100644 sound/direct_sound_samples/sc88/22_accordion_fr.aif delete mode 100644 sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif delete mode 100644 sound/direct_sound_samples/sc88/26_steel_string_guitar.aif delete mode 100644 sound/direct_sound_samples/sc88/2_piano_2.aif delete mode 100644 sound/direct_sound_samples/sc88/34_finger_slap.aif delete mode 100644 sound/direct_sound_samples/sc88/34_fingered_bass.aif delete mode 100644 sound/direct_sound_samples/sc88/36_fretless_bass.aif delete mode 100644 sound/direct_sound_samples/sc88/37_unison_slap.aif delete mode 100644 sound/direct_sound_samples/sc88/39_synth_bass_1.aif delete mode 100644 sound/direct_sound_samples/sc88/3_piano_3.aif delete mode 100644 sound/direct_sound_samples/sc88/46_pizzicato_strings.aif delete mode 100644 sound/direct_sound_samples/sc88/49_strings.aif delete mode 100644 sound/direct_sound_samples/sc88/49_strings_plus_flute.aif delete mode 100644 sound/direct_sound_samples/sc88/49_strings_plus_horn.aif delete mode 100644 sound/direct_sound_samples/sc88/57_trumpet.aif delete mode 100644 sound/direct_sound_samples/sc88/58_trombone.aif delete mode 100644 sound/direct_sound_samples/sc88/59_tuba.aif delete mode 100644 sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif delete mode 100644 sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif delete mode 100644 sound/direct_sound_samples/sc88/61_french_horns.aif delete mode 100644 sound/direct_sound_samples/sc88/61_wide_french_horns.aif delete mode 100644 sound/direct_sound_samples/sc88/74_flute.aif delete mode 100644 sound/direct_sound_samples/sc88/81_square_wave.aif delete mode 100644 sound/direct_sound_samples/sc88/8456330.aif delete mode 100644 sound/direct_sound_samples/sc88/8497134.aif delete mode 100644 sound/direct_sound_samples/sc88/849F40C.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_bass_drum.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_cabasa.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_guiro.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_hand_clap.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_low_conga.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_1.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_2.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_3.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_snare_4.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_timbale_1.aif delete mode 100644 sound/direct_sound_samples/sc88/drumkit_timbale_2.aif create mode 100644 sound/direct_sound_samples/synth/hi_hat_rattle.aif create mode 100644 sound/direct_sound_samples/synth/machine_sound1.aif create mode 100644 sound/direct_sound_samples/synth/machine_sound2.aif create mode 100644 sound/direct_sound_samples/synth/noise1.aif create mode 100644 sound/direct_sound_samples/synth/noise2.aif create mode 100644 sound/direct_sound_samples/synth/noise3.aif create mode 100644 sound/direct_sound_samples/synth/ring.aif create mode 100644 sound/direct_sound_samples/synth/sc88_123_bubble.aif create mode 100644 sound/direct_sound_samples/synth/sc88_123_pink_noise.aif create mode 100644 sound/direct_sound_samples/synth/sc88_123_white_noise.aif create mode 100644 sound/direct_sound_samples/synth/sc88_124_horse_gallop.aif create mode 100644 sound/direct_sound_samples/synth/sc88_126_car_crash.aif create mode 100644 sound/direct_sound_samples/synth/sc88_127_applause_2.aif create mode 100644 sound/direct_sound_samples/synth/sc88_13_marimba.aif create mode 100644 sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif create mode 100644 sound/direct_sound_samples/synth/sc88_18_organ_2.aif create mode 100644 sound/direct_sound_samples/synth/sc88_1_piano_1.aif create mode 100644 sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif create mode 100644 sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif create mode 100644 sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif create mode 100644 sound/direct_sound_samples/synth/sc88_2_piano_2.aif create mode 100644 sound/direct_sound_samples/synth/sc88_34_finger_slap.aif create mode 100644 sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif create mode 100644 sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif create mode 100644 sound/direct_sound_samples/synth/sc88_37_unison_slap.aif create mode 100644 sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif create mode 100644 sound/direct_sound_samples/synth/sc88_3_piano_3.aif create mode 100644 sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif create mode 100644 sound/direct_sound_samples/synth/sc88_49_strings.aif create mode 100644 sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif create mode 100644 sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif create mode 100644 sound/direct_sound_samples/synth/sc88_57_trumpet.aif create mode 100644 sound/direct_sound_samples/synth/sc88_58_trombone.aif create mode 100644 sound/direct_sound_samples/synth/sc88_59_tuba.aif create mode 100644 sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif create mode 100644 sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif create mode 100644 sound/direct_sound_samples/synth/sc88_61_french_horns.aif create mode 100644 sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif create mode 100644 sound/direct_sound_samples/synth/sc88_74_flute.aif create mode 100644 sound/direct_sound_samples/synth/sc88_81_square_wave.aif create mode 100644 sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif create mode 100644 sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif create mode 100644 sound/direct_sound_samples/synth/sc88_8456330.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif create mode 100644 sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 92527974c..ba50fa3f4 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1,242 +1,242 @@ .align 2 DirectSoundWaveData_8456330:: @ 8456330 - .incbin "sound/direct_sound_samples/sc88/8456330.bin" + .incbin "sound/direct_sound_samples/synth/sc88_8456330.bin" .align 2 DirectSoundWaveData_SC88_Organ2:: @ 84569D4 - .incbin "sound/direct_sound_samples/sc88/18_organ_2.bin" + .incbin "sound/direct_sound_samples/synth/sc88_18_organ_2.bin" .align 2 DirectSoundWaveData_SC88_FretlessBass:: @ 84571CC - .incbin "sound/direct_sound_samples/sc88/36_fretless_bass.bin" + .incbin "sound/direct_sound_samples/synth/sc88_36_fretless_bass.bin" .align 2 DirectSoundWaveData_SC88_FingerSlap:: @ 8457D98 - .incbin "sound/direct_sound_samples/sc88/34_finger_slap.bin" + .incbin "sound/direct_sound_samples/synth/sc88_34_finger_slap.bin" .align 2 DirectSoundWaveData_SC88_SynthBass1:: @ 8458CD0 - .incbin "sound/direct_sound_samples/sc88/39_synth_bass_1.bin" + .incbin "sound/direct_sound_samples/synth/sc88_39_synth_bass_1.bin" .align 2 DirectSoundWaveData_SC88_DrumKitTimbale2:: @ 8459944 - .incbin "sound/direct_sound_samples/sc88/drumkit_timbale_2.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.bin" .align 2 DirectSoundWaveData_SC88_DrumKitBassDrum:: @ 845AE14 - .incbin "sound/direct_sound_samples/sc88/drumkit_bass_drum.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.bin" .align 2 DirectSoundWaveData_SC88_DrumKitSnare1:: @ 845B2B4 - .incbin "sound/direct_sound_samples/sc88/drumkit_snare_1.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_1.bin" .align 2 DirectSoundWaveData_SC88_DrumKitHandClap:: @ 845B9A8 - .incbin "sound/direct_sound_samples/sc88/drumkit_hand_clap.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.bin" .align 2 DirectSoundWaveData_SC88_DrumKitSnare2:: @ 845C238 - .incbin "sound/direct_sound_samples/sc88/drumkit_snare_2.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_2.bin" .align 2 DirectSoundWaveData_SC88_DrumKitHiMidTom:: @ 845CAB0 - .incbin "sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.bin" .align 2 DirectSoundWaveData_SC88_DrumKitClosedHiHat:: @ 845DAF0 - .incbin "sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.bin" .align 2 DirectSoundWaveData_SC88_DrumKitOpenHiHat:: @ 845DF04 - .incbin "sound/direct_sound_samples/sc88/drumkit_open_hi_hat.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.bin" .align 2 -DirectSoundWaveData_845ED34:: @ 845ED34 - .incbin "sound/direct_sound_samples/845ED34.bin" +DirectSoundWaveData_HiHatRattle:: @ 845ED34 + .incbin "sound/direct_sound_samples/synth/hi_hat_rattle.bin" .align 2 DirectSoundWaveData_SC88_DrumKitCabasa:: @ 845FCC8 - .incbin "sound/direct_sound_samples/sc88/drumkit_cabasa.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_cabasa.bin" .align 2 DirectSoundWaveData_SC88_DrumKitCrashCymbal2:: @ 846057C - .incbin "sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.bin" .align 2 DirectSoundWaveData_SC88_DrumKitCrashCymbal1:: @ 8460E60 - .incbin "sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.bin" .align 2 DirectSoundWaveData_SC88_DrumKitMuteHiConga:: @ 8461D8C - .incbin "sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.bin" .align 2 DirectSoundWaveData_SC88_DrumKitLowConga:: @ 84622A4 - .incbin "sound/direct_sound_samples/sc88/drumkit_low_conga.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_low_conga.bin" .align 2 DirectSoundWaveData_SC88_SteelStringGuitar:: @ 846286C - .incbin "sound/direct_sound_samples/sc88/26_steel_string_guitar.bin" + .incbin "sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.bin" .align 2 DirectSoundWaveData_SC88_Piano3:: @ 84637CC - .incbin "sound/direct_sound_samples/sc88/3_piano_3.bin" + .incbin "sound/direct_sound_samples/synth/sc88_3_piano_3.bin" .align 2 DirectSoundWaveData_SC88_Piano2:: @ 8464E2C - .incbin "sound/direct_sound_samples/sc88/2_piano_2.bin" + .incbin "sound/direct_sound_samples/synth/sc88_2_piano_2.bin" .align 2 DirectSoundWaveData_SC88_UnisonSlap:: @ 8466388 - .incbin "sound/direct_sound_samples/sc88/37_unison_slap.bin" + .incbin "sound/direct_sound_samples/synth/sc88_37_unison_slap.bin" .align 2 DirectSoundWaveData_SC88_Strings:: @ 8466F14 - .incbin "sound/direct_sound_samples/sc88/49_strings.bin" + .incbin "sound/direct_sound_samples/synth/sc88_49_strings.bin" .align 2 DirectSoundWaveData_SC88_StringsPlusFlute:: @ 846A4B8 - .incbin "sound/direct_sound_samples/sc88/49_strings_plus_flute.bin" + .incbin "sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.bin" .align 2 DirectSoundWaveData_SC88_StringsPlusHorn:: @ 846C7D4 - .incbin "sound/direct_sound_samples/sc88/49_strings_plus_horn.bin" + .incbin "sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.bin" .align 2 DirectSoundWaveData_SC88_Trumpet:: @ 846FEA0 - .incbin "sound/direct_sound_samples/sc88/57_trumpet.bin" + .incbin "sound/direct_sound_samples/synth/sc88_57_trumpet.bin" .align 2 DirectSoundWaveData_SC88_Trombone:: @ 84711F0 - .incbin "sound/direct_sound_samples/sc88/58_trombone.bin" + .incbin "sound/direct_sound_samples/synth/sc88_58_trombone.bin" .align 2 DirectSoundWaveData_SC88_Tuba:: @ 8472700 - .incbin "sound/direct_sound_samples/sc88/59_tuba.bin" + .incbin "sound/direct_sound_samples/synth/sc88_59_tuba.bin" .align 2 DirectSoundWaveData_SC88_CupMutedTrumpet:: @ 8473B20 - .incbin "sound/direct_sound_samples/sc88/60_cup_muted_trumpet.bin" + .incbin "sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.bin" .align 2 DirectSoundWaveData_SC88_MutedTrumpet3:: @ 8474BBC - .incbin "sound/direct_sound_samples/sc88/60_muted_trumpet_3.bin" + .incbin "sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.bin" .align 2 DirectSoundWaveData_SC88_FrenchHorns:: @ 8475C18 - .incbin "sound/direct_sound_samples/sc88/61_french_horns.bin" + .incbin "sound/direct_sound_samples/synth/sc88_61_french_horns.bin" .align 2 DirectSoundWaveData_SC88_WideFrenchHorns:: @ 847CBAC - .incbin "sound/direct_sound_samples/sc88/61_wide_french_horns.bin" + .incbin "sound/direct_sound_samples/synth/sc88_61_wide_french_horns.bin" .align 2 DirectSoundWaveData_SC88_NylonStringGuitar:: @ 8481130 - .incbin "sound/direct_sound_samples/sc88/25_nylon_string_guitar.bin" + .incbin "sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.bin" .align 2 DirectSoundWaveData_SC88_Flute:: @ 84830A0 - .incbin "sound/direct_sound_samples/sc88/74_flute.bin" + .incbin "sound/direct_sound_samples/synth/sc88_74_flute.bin" .align 2 DirectSoundWaveData_SC88_FingeredBass:: @ 8483804 - .incbin "sound/direct_sound_samples/sc88/34_fingered_bass.bin" + .incbin "sound/direct_sound_samples/synth/sc88_34_fingered_bass.bin" .align 2 DirectSoundWaveData_SC88_DrumKitTimbale1:: @ 8485454 - .incbin "sound/direct_sound_samples/sc88/drumkit_timbale_1.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.bin" .align 2 DirectSoundWaveData_SC88_DrumKitSnare4:: @ 8486924 - .incbin "sound/direct_sound_samples/sc88/drumkit_snare_4.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_4.bin" .align 2 DirectSoundWaveData_SC88_SquareWave:: @ 8487330 - .incbin "sound/direct_sound_samples/sc88/81_square_wave.bin" + .incbin "sound/direct_sound_samples/synth/sc88_81_square_wave.bin" .align 2 -DirectSoundWaveData_8488F44:: @ 8488F44 - .incbin "sound/direct_sound_samples/8488F44.bin" +DirectSoundWaveData_Ring:: @ 8488F44 + .incbin "sound/direct_sound_samples/synth/ring.bin" .align 2 DirectSoundWaveData_SC88_DrumKitSnare3:: @ 848A8A4 - .incbin "sound/direct_sound_samples/sc88/drumkit_snare_3.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_snare_3.bin" .align 2 DirectSoundWaveData_SC88_PizzicatoStrings:: @ 848BD68 - .incbin "sound/direct_sound_samples/sc88/46_pizzicato_strings.bin" + .incbin "sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.bin" .align 2 -DirectSoundWaveData_848C4A4:: @ 848C4A4 - .incbin "sound/direct_sound_samples/848C4A4.bin" +DirectSoundWaveData_MachineSound2:: @ 848C4A4 + .incbin "sound/direct_sound_samples/synth/machine_sound2.bin" .align 2 -DirectSoundWaveData_848E094:: @ 848E094 - .incbin "sound/direct_sound_samples/848E094.bin" +DirectSoundWaveData_MachineSound1:: @ 848E094 + .incbin "sound/direct_sound_samples/synth/machine_sound1.bin" .align 2 -DirectSoundWaveData_848F448:: @ 848F448 - .incbin "sound/direct_sound_samples/848F448.bin" +DirectSoundWaveData_SC88_Applause2:: @ 848F448 + .incbin "sound/direct_sound_samples/synth/sc88_127_applause_2.bin" .align 2 -DirectSoundWaveData_8491ACC:: @ 8491ACC - .incbin "sound/direct_sound_samples/8491ACC.bin" +DirectSoundWaveData_Noise3:: @ 8491ACC + .incbin "sound/direct_sound_samples/synth/noise3.bin" .align 2 DirectSoundWaveData_SC88_Bubble:: @ 8492D10 - .incbin "sound/direct_sound_samples/sc88/123_bubble.bin" + .incbin "sound/direct_sound_samples/synth/sc88_123_bubble.bin" .align 2 -DirectSoundWaveData_8493D20:: @ 8493D20 - .incbin "sound/direct_sound_samples/8493D20.bin" +DirectSoundWaveData_SC88_CarCrash:: @ 8493D20 + .incbin "sound/direct_sound_samples/synth/sc88_126_car_crash.bin" .align 2 -DirectSoundWaveData_8495028:: @ 8495028 - .incbin "sound/direct_sound_samples/8495028.bin" +DirectSoundWaveData_SC88_PinkNoise:: @ 8495028 + .incbin "sound/direct_sound_samples/synth/sc88_123_pink_noise.bin" .align 2 -DirectSoundWaveData_8497134:: @ 8497134 - .incbin "sound/direct_sound_samples/sc88/8497134.bin" +DirectSoundWaveData_SC88_WaspySynth:: @ 8497134 + .incbin "sound/direct_sound_samples/synth/sc88_82_waspy_synth.bin" .align 2 -DirectSoundWaveData_8499110:: @ 8499110 - .incbin "sound/direct_sound_samples/8499110.bin" +DirectSoundWaveData_SC88_WhiteNoise:: @ 8499110 + .incbin "sound/direct_sound_samples/synth/sc88_123_white_noise.bin" .align 2 DirectSoundWaveData_SC88_DrumkitGuiro:: @ 849B320 - .incbin "sound/direct_sound_samples/sc88/drumkit_guiro.bin" + .incbin "sound/direct_sound_samples/synth/sc88_drumkit_guiro.bin" .align 2 DirectSoundWaveData_SC88_TubularBell:: @ 849BAEC - .incbin "sound/direct_sound_samples/sc88/15_tubular_bell.bin" + .incbin "sound/direct_sound_samples/synth/sc88_15_tubular_bell.bin" .align 2 -DirectSoundWaveData_SC88_PinkNoise:: @ 849D45C - .incbin "sound/direct_sound_samples/sc88/123_pink_noise.bin" +DirectSoundWaveData_Noise1:: @ 849D45C + .incbin "sound/direct_sound_samples/synth/noise1.bin" .align 2 -DirectSoundWaveData_849F40C:: @ 849F40C - .incbin "sound/direct_sound_samples/sc88/849F40C.bin" +DirectSoundWaveData_SC88_JPSuperSaw:: @ 849F40C + .incbin "sound/direct_sound_samples/synth/sc88_82_jp_super_saw.bin" .align 2 DirectSoundWaveData_SC88_Piano1:: @ 84A26EC - .incbin "sound/direct_sound_samples/sc88/1_piano_1.bin" + .incbin "sound/direct_sound_samples/synth/sc88_1_piano_1.bin" .align 2 DirectSoundWaveData_SC88_Marimba:: @ 84A311C - .incbin "sound/direct_sound_samples/sc88/13_marimba.bin" + .incbin "sound/direct_sound_samples/synth/sc88_13_marimba.bin" .align 2 -DirectSoundWaveData_SC88_WhiteNoise:: @ 84A3B50 - .incbin "sound/direct_sound_samples/sc88/123_white_noise.bin" +DirectSoundWaveData_Noise2:: @ 84A3B50 + .incbin "sound/direct_sound_samples/synth/noise2.bin" .align 2 -DirectSoundWaveData_84A5690:: @ 84A5690 - .incbin "sound/direct_sound_samples/84A5690.bin" +DirectSoundWaveData_SC88_HorseGallop:: @ 84A5690 + .incbin "sound/direct_sound_samples/synth/sc88_124_horse_gallop.bin" .align 2 DirectSoundWaveData_SC88_AccordianFr:: @ 84A5F58 - .incbin "sound/direct_sound_samples/sc88/22_accordion_fr.bin" + .incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin" .align 2 DirectSoundWaveData_84A7328:: @ 84A7328 @@ -2020,4 +2020,4 @@ DirectSoundWaveData_8654170:: @ 8654170 .align 2 DirectSoundWaveData_SC88_AccordionFr_Copy:: @ 8654C20 - .incbin "sound/direct_sound_samples/sc88/22_accordion_fr.bin" + .incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin" diff --git a/sound/direct_sound_samples/845ED34.aif b/sound/direct_sound_samples/845ED34.aif deleted file mode 100644 index 7de79e747..000000000 Binary files a/sound/direct_sound_samples/845ED34.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8488F44.aif b/sound/direct_sound_samples/8488F44.aif deleted file mode 100644 index 578a81c2f..000000000 Binary files a/sound/direct_sound_samples/8488F44.aif and /dev/null differ diff --git a/sound/direct_sound_samples/848C4A4.aif b/sound/direct_sound_samples/848C4A4.aif deleted file mode 100644 index 2e09d0822..000000000 Binary files a/sound/direct_sound_samples/848C4A4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/848E094.aif b/sound/direct_sound_samples/848E094.aif deleted file mode 100644 index 49f24936f..000000000 Binary files a/sound/direct_sound_samples/848E094.aif and /dev/null differ diff --git a/sound/direct_sound_samples/848F448.aif b/sound/direct_sound_samples/848F448.aif deleted file mode 100644 index 5c55d91ed..000000000 Binary files a/sound/direct_sound_samples/848F448.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8491ACC.aif b/sound/direct_sound_samples/8491ACC.aif deleted file mode 100644 index ece919ea5..000000000 Binary files a/sound/direct_sound_samples/8491ACC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8493D20.aif b/sound/direct_sound_samples/8493D20.aif deleted file mode 100644 index 515818a4d..000000000 Binary files a/sound/direct_sound_samples/8493D20.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8495028.aif b/sound/direct_sound_samples/8495028.aif deleted file mode 100644 index 102830efa..000000000 Binary files a/sound/direct_sound_samples/8495028.aif and /dev/null differ diff --git a/sound/direct_sound_samples/8499110.aif b/sound/direct_sound_samples/8499110.aif deleted file mode 100644 index 556be0238..000000000 Binary files a/sound/direct_sound_samples/8499110.aif and /dev/null differ diff --git a/sound/direct_sound_samples/84A5690.aif b/sound/direct_sound_samples/84A5690.aif deleted file mode 100644 index a0fb49f89..000000000 Binary files a/sound/direct_sound_samples/84A5690.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/123_bubble.aif b/sound/direct_sound_samples/sc88/123_bubble.aif deleted file mode 100644 index 89872bf55..000000000 Binary files a/sound/direct_sound_samples/sc88/123_bubble.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/123_pink_noise.aif b/sound/direct_sound_samples/sc88/123_pink_noise.aif deleted file mode 100644 index ebd46eeaa..000000000 Binary files a/sound/direct_sound_samples/sc88/123_pink_noise.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/123_white_noise.aif b/sound/direct_sound_samples/sc88/123_white_noise.aif deleted file mode 100644 index 6a11945c5..000000000 Binary files a/sound/direct_sound_samples/sc88/123_white_noise.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/13_marimba.aif b/sound/direct_sound_samples/sc88/13_marimba.aif deleted file mode 100644 index 1bd43ca92..000000000 Binary files a/sound/direct_sound_samples/sc88/13_marimba.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/15_tubular_bell.aif b/sound/direct_sound_samples/sc88/15_tubular_bell.aif deleted file mode 100644 index 9d00ecae6..000000000 Binary files a/sound/direct_sound_samples/sc88/15_tubular_bell.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/18_organ_2.aif b/sound/direct_sound_samples/sc88/18_organ_2.aif deleted file mode 100644 index 6372bbc32..000000000 Binary files a/sound/direct_sound_samples/sc88/18_organ_2.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/1_piano_1.aif b/sound/direct_sound_samples/sc88/1_piano_1.aif deleted file mode 100644 index 083c45e3d..000000000 Binary files a/sound/direct_sound_samples/sc88/1_piano_1.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/22_accordion_fr.aif b/sound/direct_sound_samples/sc88/22_accordion_fr.aif deleted file mode 100644 index 6d6c2e998..000000000 Binary files a/sound/direct_sound_samples/sc88/22_accordion_fr.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif b/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif deleted file mode 100644 index dea429a25..000000000 Binary files a/sound/direct_sound_samples/sc88/25_nylon_string_guitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif b/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif deleted file mode 100644 index c2b3757b0..000000000 Binary files a/sound/direct_sound_samples/sc88/26_steel_string_guitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/2_piano_2.aif b/sound/direct_sound_samples/sc88/2_piano_2.aif deleted file mode 100644 index 5236141ba..000000000 Binary files a/sound/direct_sound_samples/sc88/2_piano_2.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/34_finger_slap.aif b/sound/direct_sound_samples/sc88/34_finger_slap.aif deleted file mode 100644 index 9175b63c5..000000000 Binary files a/sound/direct_sound_samples/sc88/34_finger_slap.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/34_fingered_bass.aif b/sound/direct_sound_samples/sc88/34_fingered_bass.aif deleted file mode 100644 index f244a9982..000000000 Binary files a/sound/direct_sound_samples/sc88/34_fingered_bass.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/36_fretless_bass.aif b/sound/direct_sound_samples/sc88/36_fretless_bass.aif deleted file mode 100644 index f3aa47d91..000000000 Binary files a/sound/direct_sound_samples/sc88/36_fretless_bass.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/37_unison_slap.aif b/sound/direct_sound_samples/sc88/37_unison_slap.aif deleted file mode 100644 index a7c4e94f8..000000000 Binary files a/sound/direct_sound_samples/sc88/37_unison_slap.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/39_synth_bass_1.aif b/sound/direct_sound_samples/sc88/39_synth_bass_1.aif deleted file mode 100644 index f39931a7e..000000000 Binary files a/sound/direct_sound_samples/sc88/39_synth_bass_1.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/3_piano_3.aif b/sound/direct_sound_samples/sc88/3_piano_3.aif deleted file mode 100644 index 7de586c9b..000000000 Binary files a/sound/direct_sound_samples/sc88/3_piano_3.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif b/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif deleted file mode 100644 index 1c0a027f7..000000000 Binary files a/sound/direct_sound_samples/sc88/46_pizzicato_strings.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/49_strings.aif b/sound/direct_sound_samples/sc88/49_strings.aif deleted file mode 100644 index bfaa5c196..000000000 Binary files a/sound/direct_sound_samples/sc88/49_strings.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif b/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif deleted file mode 100644 index 3e76cacdd..000000000 Binary files a/sound/direct_sound_samples/sc88/49_strings_plus_flute.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif b/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif deleted file mode 100644 index 2647c78ec..000000000 Binary files a/sound/direct_sound_samples/sc88/49_strings_plus_horn.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/57_trumpet.aif b/sound/direct_sound_samples/sc88/57_trumpet.aif deleted file mode 100644 index e56df7f60..000000000 Binary files a/sound/direct_sound_samples/sc88/57_trumpet.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/58_trombone.aif b/sound/direct_sound_samples/sc88/58_trombone.aif deleted file mode 100644 index 8c68a83b3..000000000 Binary files a/sound/direct_sound_samples/sc88/58_trombone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/59_tuba.aif b/sound/direct_sound_samples/sc88/59_tuba.aif deleted file mode 100644 index a03bafc97..000000000 Binary files a/sound/direct_sound_samples/sc88/59_tuba.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif b/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif deleted file mode 100644 index d4077b481..000000000 Binary files a/sound/direct_sound_samples/sc88/60_cup_muted_trumpet.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif b/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif deleted file mode 100644 index 2ad86876b..000000000 Binary files a/sound/direct_sound_samples/sc88/60_muted_trumpet_3.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/61_french_horns.aif b/sound/direct_sound_samples/sc88/61_french_horns.aif deleted file mode 100644 index 742c4385e..000000000 Binary files a/sound/direct_sound_samples/sc88/61_french_horns.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/61_wide_french_horns.aif b/sound/direct_sound_samples/sc88/61_wide_french_horns.aif deleted file mode 100644 index 004fda6a1..000000000 Binary files a/sound/direct_sound_samples/sc88/61_wide_french_horns.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/74_flute.aif b/sound/direct_sound_samples/sc88/74_flute.aif deleted file mode 100644 index 703f3adbd..000000000 Binary files a/sound/direct_sound_samples/sc88/74_flute.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/81_square_wave.aif b/sound/direct_sound_samples/sc88/81_square_wave.aif deleted file mode 100644 index 09e17f0ca..000000000 Binary files a/sound/direct_sound_samples/sc88/81_square_wave.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/8456330.aif b/sound/direct_sound_samples/sc88/8456330.aif deleted file mode 100644 index 199ead811..000000000 Binary files a/sound/direct_sound_samples/sc88/8456330.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/8497134.aif b/sound/direct_sound_samples/sc88/8497134.aif deleted file mode 100644 index 09fe6f12e..000000000 Binary files a/sound/direct_sound_samples/sc88/8497134.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/849F40C.aif b/sound/direct_sound_samples/sc88/849F40C.aif deleted file mode 100644 index 455ced13e..000000000 Binary files a/sound/direct_sound_samples/sc88/849F40C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif b/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif deleted file mode 100644 index 9c504e3d0..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_bass_drum.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_cabasa.aif b/sound/direct_sound_samples/sc88/drumkit_cabasa.aif deleted file mode 100644 index 39ec57d29..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_cabasa.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif b/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif deleted file mode 100644 index 8747aef28..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_closed_hi_hat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif b/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif deleted file mode 100644 index 576e3e19e..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_1.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif b/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif deleted file mode 100644 index 4aec6882f..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_crash_cymbal_2.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_guiro.aif b/sound/direct_sound_samples/sc88/drumkit_guiro.aif deleted file mode 100644 index dd80b1185..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_guiro.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif b/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif deleted file mode 100644 index b11787ffc..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_hand_clap.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif b/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif deleted file mode 100644 index 04f990b13..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_hi_mid_tom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_low_conga.aif b/sound/direct_sound_samples/sc88/drumkit_low_conga.aif deleted file mode 100644 index 8e1cb620a..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_low_conga.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif b/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif deleted file mode 100644 index 2e1bf9c64..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_mute_hi_conga.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif b/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif deleted file mode 100644 index 5ad9410d0..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_open_hi_hat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_1.aif b/sound/direct_sound_samples/sc88/drumkit_snare_1.aif deleted file mode 100644 index 544b187d5..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_snare_1.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_2.aif b/sound/direct_sound_samples/sc88/drumkit_snare_2.aif deleted file mode 100644 index 36b640758..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_snare_2.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_3.aif b/sound/direct_sound_samples/sc88/drumkit_snare_3.aif deleted file mode 100644 index ee6ff45b7..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_snare_3.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_snare_4.aif b/sound/direct_sound_samples/sc88/drumkit_snare_4.aif deleted file mode 100644 index b3122457d..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_snare_4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif b/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif deleted file mode 100644 index 7270872d6..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_timbale_1.aif and /dev/null differ diff --git a/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif b/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif deleted file mode 100644 index dfdfd702e..000000000 Binary files a/sound/direct_sound_samples/sc88/drumkit_timbale_2.aif and /dev/null differ diff --git a/sound/direct_sound_samples/synth/hi_hat_rattle.aif b/sound/direct_sound_samples/synth/hi_hat_rattle.aif new file mode 100644 index 000000000..7de79e747 Binary files /dev/null and b/sound/direct_sound_samples/synth/hi_hat_rattle.aif differ diff --git a/sound/direct_sound_samples/synth/machine_sound1.aif b/sound/direct_sound_samples/synth/machine_sound1.aif new file mode 100644 index 000000000..49f24936f Binary files /dev/null and b/sound/direct_sound_samples/synth/machine_sound1.aif differ diff --git a/sound/direct_sound_samples/synth/machine_sound2.aif b/sound/direct_sound_samples/synth/machine_sound2.aif new file mode 100644 index 000000000..2e09d0822 Binary files /dev/null and b/sound/direct_sound_samples/synth/machine_sound2.aif differ diff --git a/sound/direct_sound_samples/synth/noise1.aif b/sound/direct_sound_samples/synth/noise1.aif new file mode 100644 index 000000000..ebd46eeaa Binary files /dev/null and b/sound/direct_sound_samples/synth/noise1.aif differ diff --git a/sound/direct_sound_samples/synth/noise2.aif b/sound/direct_sound_samples/synth/noise2.aif new file mode 100644 index 000000000..6a11945c5 Binary files /dev/null and b/sound/direct_sound_samples/synth/noise2.aif differ diff --git a/sound/direct_sound_samples/synth/noise3.aif b/sound/direct_sound_samples/synth/noise3.aif new file mode 100644 index 000000000..ece919ea5 Binary files /dev/null and b/sound/direct_sound_samples/synth/noise3.aif differ diff --git a/sound/direct_sound_samples/synth/ring.aif b/sound/direct_sound_samples/synth/ring.aif new file mode 100644 index 000000000..578a81c2f Binary files /dev/null and b/sound/direct_sound_samples/synth/ring.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_123_bubble.aif b/sound/direct_sound_samples/synth/sc88_123_bubble.aif new file mode 100644 index 000000000..89872bf55 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_123_bubble.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_123_pink_noise.aif b/sound/direct_sound_samples/synth/sc88_123_pink_noise.aif new file mode 100644 index 000000000..102830efa Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_123_pink_noise.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_123_white_noise.aif b/sound/direct_sound_samples/synth/sc88_123_white_noise.aif new file mode 100644 index 000000000..556be0238 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_123_white_noise.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_124_horse_gallop.aif b/sound/direct_sound_samples/synth/sc88_124_horse_gallop.aif new file mode 100644 index 000000000..a0fb49f89 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_124_horse_gallop.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_126_car_crash.aif b/sound/direct_sound_samples/synth/sc88_126_car_crash.aif new file mode 100644 index 000000000..515818a4d Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_126_car_crash.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_127_applause_2.aif b/sound/direct_sound_samples/synth/sc88_127_applause_2.aif new file mode 100644 index 000000000..5c55d91ed Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_127_applause_2.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_13_marimba.aif b/sound/direct_sound_samples/synth/sc88_13_marimba.aif new file mode 100644 index 000000000..1bd43ca92 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_13_marimba.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif b/sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif new file mode 100644 index 000000000..9d00ecae6 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_15_tubular_bell.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_18_organ_2.aif b/sound/direct_sound_samples/synth/sc88_18_organ_2.aif new file mode 100644 index 000000000..6372bbc32 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_18_organ_2.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_1_piano_1.aif b/sound/direct_sound_samples/synth/sc88_1_piano_1.aif new file mode 100644 index 000000000..083c45e3d Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_1_piano_1.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif b/sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif new file mode 100644 index 000000000..6d6c2e998 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_22_accordion_fr.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif b/sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif new file mode 100644 index 000000000..dea429a25 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_25_nylon_string_guitar.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif b/sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif new file mode 100644 index 000000000..c2b3757b0 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_26_steel_string_guitar.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_2_piano_2.aif b/sound/direct_sound_samples/synth/sc88_2_piano_2.aif new file mode 100644 index 000000000..5236141ba Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_2_piano_2.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_34_finger_slap.aif b/sound/direct_sound_samples/synth/sc88_34_finger_slap.aif new file mode 100644 index 000000000..9175b63c5 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_34_finger_slap.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif b/sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif new file mode 100644 index 000000000..f244a9982 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_34_fingered_bass.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif b/sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif new file mode 100644 index 000000000..f3aa47d91 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_36_fretless_bass.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_37_unison_slap.aif b/sound/direct_sound_samples/synth/sc88_37_unison_slap.aif new file mode 100644 index 000000000..a7c4e94f8 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_37_unison_slap.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif b/sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif new file mode 100644 index 000000000..f39931a7e Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_39_synth_bass_1.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_3_piano_3.aif b/sound/direct_sound_samples/synth/sc88_3_piano_3.aif new file mode 100644 index 000000000..7de586c9b Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_3_piano_3.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif b/sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif new file mode 100644 index 000000000..1c0a027f7 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_46_pizzicato_strings.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_49_strings.aif b/sound/direct_sound_samples/synth/sc88_49_strings.aif new file mode 100644 index 000000000..bfaa5c196 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_49_strings.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif b/sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif new file mode 100644 index 000000000..3e76cacdd Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_49_strings_plus_flute.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif b/sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif new file mode 100644 index 000000000..2647c78ec Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_49_strings_plus_horn.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_57_trumpet.aif b/sound/direct_sound_samples/synth/sc88_57_trumpet.aif new file mode 100644 index 000000000..e56df7f60 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_57_trumpet.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_58_trombone.aif b/sound/direct_sound_samples/synth/sc88_58_trombone.aif new file mode 100644 index 000000000..8c68a83b3 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_58_trombone.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_59_tuba.aif b/sound/direct_sound_samples/synth/sc88_59_tuba.aif new file mode 100644 index 000000000..a03bafc97 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_59_tuba.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif b/sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif new file mode 100644 index 000000000..d4077b481 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_60_cup_muted_trumpet.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif b/sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif new file mode 100644 index 000000000..2ad86876b Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_60_muted_trumpet_3.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_61_french_horns.aif b/sound/direct_sound_samples/synth/sc88_61_french_horns.aif new file mode 100644 index 000000000..742c4385e Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_61_french_horns.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif b/sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif new file mode 100644 index 000000000..004fda6a1 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_61_wide_french_horns.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_74_flute.aif b/sound/direct_sound_samples/synth/sc88_74_flute.aif new file mode 100644 index 000000000..703f3adbd Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_74_flute.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_81_square_wave.aif b/sound/direct_sound_samples/synth/sc88_81_square_wave.aif new file mode 100644 index 000000000..09e17f0ca Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_81_square_wave.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif b/sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif new file mode 100644 index 000000000..455ced13e Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_82_jp_super_saw.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif b/sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif new file mode 100644 index 000000000..09fe6f12e Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_82_waspy_synth.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_8456330.aif b/sound/direct_sound_samples/synth/sc88_8456330.aif new file mode 100644 index 000000000..199ead811 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_8456330.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif b/sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif new file mode 100644 index 000000000..9c504e3d0 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_bass_drum.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif b/sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif new file mode 100644 index 000000000..39ec57d29 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_cabasa.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif b/sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif new file mode 100644 index 000000000..8747aef28 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_closed_hi_hat.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif new file mode 100644 index 000000000..576e3e19e Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_1.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif new file mode 100644 index 000000000..4aec6882f Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_crash_cymbal_2.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif b/sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif new file mode 100644 index 000000000..dd80b1185 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_guiro.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif b/sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif new file mode 100644 index 000000000..b11787ffc Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_hand_clap.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif b/sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif new file mode 100644 index 000000000..04f990b13 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_hi_mid_tom.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif b/sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif new file mode 100644 index 000000000..8e1cb620a Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_low_conga.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif b/sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif new file mode 100644 index 000000000..2e1bf9c64 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_mute_hi_conga.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif b/sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif new file mode 100644 index 000000000..5ad9410d0 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_open_hi_hat.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif new file mode 100644 index 000000000..544b187d5 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_snare_1.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif new file mode 100644 index 000000000..36b640758 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_snare_2.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif new file mode 100644 index 000000000..ee6ff45b7 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_snare_3.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif b/sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif new file mode 100644 index 000000000..b3122457d Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_snare_4.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif new file mode 100644 index 000000000..7270872d6 Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_1.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif new file mode 100644 index 000000000..dfdfd702e Binary files /dev/null and b/sound/direct_sound_samples/synth/sc88_drumkit_timbale_2.aif differ diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index 926e5ef7a..0d4c94121 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -108,7 +108,7 @@ voicegroup_842FEF8:: @ 842FEF8 voice_directsound 62, 212, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 204, 77, 204 @ 8430150 voice_square_1 0, 2, 0, 0, 15, 0 @ 843015C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430168 - voice_directsound_no_resample 70, 177, DirectSoundWaveData_845ED34, 255, 165, 103, 231 @ 8430174 + voice_directsound_no_resample 70, 177, DirectSoundWaveData_HiHatRattle, 255, 165, 103, 231 @ 8430174 voice_directsound_no_resample 32, 162, DirectSoundWaveData_SC88_DrumKitCabasa, 255, 127, 77, 204 @ 8430180 voice_directsound_no_resample 60, 142, DirectSoundWaveData_SC88_DrumKitCrashCymbal2, 255, 235, 0, 165 @ 843018C voice_square_1 0, 2, 0, 0, 15, 0 @ 8430198 @@ -500,7 +500,7 @@ voicegroup_8430C9C:: @ 8430C9C voicegroup_843129C:: @ 843129C voice_keysplit_all voicegroup_842FEF8 @ 843129C voice_keysplit voicegroup_8430204, KeySplitTable_8455224 @ 84312A8 - voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 178, 180, 165 @ 84312B4 + voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 178, 180, 165 @ 84312B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84312C0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84312CC voice_square_1 0, 2, 0, 0, 15, 0 @ 84312D8 @@ -2234,7 +2234,7 @@ voicegroup_8435FAC:: @ 8435FAC voice_square_1 0, 2, 0, 0, 15, 0 @ 843612C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436138 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436144 - voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 165, 154, 127 @ 8436150 + voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 165, 154, 127 @ 8436150 voice_square_1 0, 2, 0, 0, 15, 0 @ 843615C voice_square_1 0, 2, 0, 0, 15, 0 @ 8436168 voice_square_1 0, 2, 0, 0, 15, 0 @ 8436174 @@ -10424,7 +10424,7 @@ voicegroup_844D1F0:: @ 844D1F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D7A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D7B4 voice_square_1 0, 2, 0, 0, 15, 0 @ 844D7C0 - voice_directsound 60, 0, DirectSoundWaveData_SC88_WhiteNoise, 255, 255, 255, 127 @ 844D7CC + voice_directsound 60, 0, DirectSoundWaveData_Noise2, 255, 255, 255, 127 @ 844D7CC voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127 @ 844D7D8 voice_noise_alt 0, 0, 1, 0, 0 @ 844D7E4 @@ -11065,7 +11065,7 @@ voicegroup_844F0C8:: @ 844F0C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F4DC voice_square_1 0, 2, 0, 0, 15, 0 @ 844F4E8 voice_square_1 0, 2, 0, 0, 15, 0 @ 844F4F4 - voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 0, 255, 127 @ 844F500 + voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 0, 255, 127 @ 844F500 .align 2 voicegroup_844F50C:: @ 844F50C @@ -11402,7 +11402,7 @@ voicegroup_845019C:: @ 845019C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450418 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450424 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450430 - voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 165, 154, 127 @ 845043C + voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 165, 154, 127 @ 845043C voice_square_1 0, 2, 0, 0, 15, 0 @ 8450448 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450454 voice_square_1 0, 2, 0, 0, 15, 0 @ 8450460 @@ -12003,8 +12003,8 @@ voicegroup_8451990:: @ 8451990 .align 2 voicegroup_8451F90:: @ 8451F90 - voice_directsound_no_resample 60, 0, DirectSoundWaveData_8488F44, 255, 249, 0, 165 @ 8451F90 - voice_directsound_alt 60, 0, DirectSoundWaveData_8488F44, 255, 0, 255, 165 @ 8451F9C + voice_directsound_no_resample 60, 0, DirectSoundWaveData_Ring, 255, 249, 0, 165 @ 8451F90 + voice_directsound_alt 60, 0, DirectSoundWaveData_Ring, 255, 0, 255, 165 @ 8451F9C voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 0, 255, 165 @ 8451FA8 voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 242, 0, 127 @ 8451FB4 voice_noise_alt 0, 0, 1, 0, 1 @ 8451FC0 @@ -12013,42 +12013,42 @@ voicegroup_8451F90:: @ 8451F90 voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 8451FE4 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare3, 255, 0, 255, 165 @ 8451FF0 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 0, 255, 127 @ 8451FFC - voice_directsound 60, 0, DirectSoundWaveData_848C4A4, 255, 0, 255, 127 @ 8452008 + voice_directsound 60, 0, DirectSoundWaveData_MachineSound2, 255, 0, 255, 127 @ 8452008 voice_noise_alt 1, 0, 2, 0, 0 @ 8452014 voice_square_1 0x67, 3, 2, 7, 0, 0 @ 8452020 voice_square_2 3, 2, 7, 0, 0 @ 845202C voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 226, 0, 127 @ 8452038 - voice_directsound 60, 0, DirectSoundWaveData_848E094, 255, 0, 255, 0 @ 8452044 + voice_directsound 60, 0, DirectSoundWaveData_MachineSound1, 255, 0, 255, 0 @ 8452044 voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 204, 0, 127 @ 8452050 voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 845205C - voice_directsound 60, 0, DirectSoundWaveData_848F448, 255, 0, 255, 127 @ 8452068 + voice_directsound 60, 0, DirectSoundWaveData_SC88_Applause2, 255, 0, 255, 127 @ 8452068 voice_directsound 60, 0, DirectSoundWaveData_SC88_SquareWave, 255, 0, 255, 127 @ 8452074 voice_square_1 103, 0, 0, 7, 0, 0 @ 8452080 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare2, 255, 0, 255, 127 @ 845208C - voice_directsound 60, 0, DirectSoundWaveData_8491ACC, 255, 0, 255, 127 @ 8452098 + voice_directsound 60, 0, DirectSoundWaveData_Noise3, 255, 0, 255, 127 @ 8452098 voice_directsound 60, 0, DirectSoundWaveData_SC88_Bubble, 255, 0, 255, 127 @ 84520A4 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare1, 255, 0, 255, 127 @ 84520B0 voice_noise_alt 0, 0, 7, 15, 1 @ 84520BC - voice_directsound 60, 0, DirectSoundWaveData_8493D20, 255, 0, 255, 127 @ 84520C8 + voice_directsound 60, 0, DirectSoundWaveData_SC88_CarCrash, 255, 0, 255, 127 @ 84520C8 voice_noise_alt 1, 0, 7, 15, 1 @ 84520D4 voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 246, 0, 127 @ 84520E0 - voice_directsound 60, 0, DirectSoundWaveData_8495028, 255, 0, 255, 127 @ 84520EC + voice_directsound 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 0, 255, 127 @ 84520EC voice_square_1_alt 19, 2, 0, 2, 0, 0 @ 84520F8 - voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 0, 255, 127 @ 8452104 + voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 0, 255, 127 @ 8452104 voice_square_1 103, 0, 0, 0, 15, 0 @ 8452110 - voice_directsound_alt 60, 0, DirectSoundWaveData_8495028, 255, 0, 255, 127 @ 845211C + voice_directsound_alt 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 0, 255, 127 @ 845211C voice_directsound 60, 0, DirectSoundWaveData_SC88_FretlessBass, 255, 255, 255, 127 @ 8452128 voice_directsound 60, 0, DirectSoundWaveData_SC88_SynthBass1, 255, 0, 255, 127 @ 8452134 - voice_directsound 60, 0, DirectSoundWaveData_8499110, 255, 0, 255, 127 @ 8452140 - voice_directsound 60, 0, DirectSoundWaveData_8497134, 255, 242, 0, 0 @ 845214C + voice_directsound 60, 0, DirectSoundWaveData_SC88_WhiteNoise, 255, 0, 255, 127 @ 8452140 + voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 242, 0, 0 @ 845214C voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumkitGuiro, 255, 0, 255, 0 @ 8452158 voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 165, 90, 216 @ 8452164 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitClosedHiHat, 255, 127, 0, 188 @ 8452170 - voice_directsound 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 249, 0, 165 @ 845217C + voice_directsound 60, 0, DirectSoundWaveData_Noise1, 255, 249, 0, 165 @ 845217C voice_square_1 0, 0, 4, 6, 0, 0 @ 8452188 voice_directsound 60, 0, DirectSoundWaveData_8456330, 13, 0, 255, 127 @ 8452194 voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 13, 0, 255, 127 @ 84521A0 - voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 0, 255, 127 @ 84521AC + voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 0, 255, 127 @ 84521AC voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 252, 0, 204 @ 84521B8 voice_square_1 0, 2, 0, 0, 15, 0 @ 84521C4 voice_directsound 60, 0, DirectSoundWaveData_SC88_Marimba, 255, 235, 0, 204 @ 84521D0 @@ -12063,10 +12063,10 @@ voicegroup_8451F90:: @ 8451F90 voice_noise_alt 0, 1, 6, 0, 0 @ 845223C voice_directsound 60, 0, DirectSoundWaveData_SC88_FingerSlap, 255, 255, 255, 127 @ 8452248 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHandClap, 255, 255, 255, 127 @ 8452254 - voice_directsound 60, 0, DirectSoundWaveData_SC88_WhiteNoise, 255, 255, 255, 127 @ 8452260 + voice_directsound 60, 0, DirectSoundWaveData_Noise2, 255, 255, 255, 127 @ 8452260 voice_directsound 60, 0, DirectSoundWaveData_SC88_WideFrenchHorns, 11, 242, 0, 127 @ 845226C voice_square_1_alt 0, 2, 4, 6, 0, 0 @ 8452278 - voice_directsound 60, 0, DirectSoundWaveData_84A5690, 255, 255, 255, 127 @ 8452284 + voice_directsound 60, 0, DirectSoundWaveData_SC88_HorseGallop, 255, 255, 255, 127 @ 8452284 voice_directsound 60, 0, DirectSoundWaveData_SC88_AccordianFr, 255, 0, 255, 165 @ 8452290 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitHiMidTom, 255, 0, 255, 165 @ 845229C voice_noise_alt 0, 5, 7, 15, 1 @ 84522A8 @@ -12076,7 +12076,7 @@ voicegroup_8451F90:: @ 8451F90 voice_noise_alt 0, 6, 6, 0, 1 @ 84522D8 voice_noise_alt 0, 3, 6, 0, 1 @ 84522E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84522F0 - voice_directsound 60, 0, DirectSoundWaveData_8497134, 15, 127, 231, 127 @ 84522FC + voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 15, 127, 231, 127 @ 84522FC voice_square_1 0, 2, 0, 0, 15, 0 @ 8452308 voice_square_1 0, 2, 0, 0, 15, 0 @ 8452314 voice_square_1 0, 2, 0, 0, 15, 0 @ 8452320 -- cgit v1.2.3 From dfd9623588b773768189d0f1d472ae164908b004 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 28 Jan 2018 14:48:31 -0800 Subject: Rename phoneme samples to 'vowel_' --- sound/direct_sound_data.inc | 232 +++++++++++----------- sound/direct_sound_samples/phonemes/84A7328.aif | Bin 3186 -> 0 bytes sound/direct_sound_samples/phonemes/84A7F38.aif | Bin 3057 -> 0 bytes sound/direct_sound_samples/phonemes/84A8AC8.aif | Bin 2814 -> 0 bytes sound/direct_sound_samples/phonemes/84A9564.aif | Bin 2474 -> 0 bytes sound/direct_sound_samples/phonemes/84A9EAC.aif | Bin 2729 -> 0 bytes sound/direct_sound_samples/phonemes/84AA8F4.aif | Bin 3305 -> 0 bytes sound/direct_sound_samples/phonemes/8639898.aif | Bin 1697 -> 0 bytes sound/direct_sound_samples/phonemes/8639EF8.aif | Bin 1350 -> 0 bytes sound/direct_sound_samples/phonemes/863A3DC.aif | Bin 2447 -> 0 bytes sound/direct_sound_samples/phonemes/863AD2C.aif | Bin 2738 -> 0 bytes sound/direct_sound_samples/phonemes/863B79C.aif | Bin 897 -> 0 bytes sound/direct_sound_samples/phonemes/863BABC.aif | Bin 3273 -> 0 bytes sound/direct_sound_samples/phonemes/863C744.aif | Bin 1634 -> 0 bytes sound/direct_sound_samples/phonemes/863CD64.aif | Bin 999 -> 0 bytes sound/direct_sound_samples/phonemes/863D0EC.aif | Bin 3619 -> 0 bytes sound/direct_sound_samples/phonemes/863DED0.aif | Bin 2481 -> 0 bytes sound/direct_sound_samples/phonemes/863E840.aif | Bin 1021 -> 0 bytes sound/direct_sound_samples/phonemes/863EBDC.aif | Bin 2035 -> 0 bytes sound/direct_sound_samples/phonemes/863F390.aif | Bin 3483 -> 0 bytes sound/direct_sound_samples/phonemes/86400EC.aif | Bin 678 -> 0 bytes sound/direct_sound_samples/phonemes/8640330.aif | Bin 3711 -> 0 bytes sound/direct_sound_samples/phonemes/8641170.aif | Bin 2451 -> 0 bytes sound/direct_sound_samples/phonemes/8641AC4.aif | Bin 948 -> 0 bytes sound/direct_sound_samples/phonemes/8641E18.aif | Bin 1651 -> 0 bytes sound/direct_sound_samples/phonemes/864244C.aif | Bin 3243 -> 0 bytes sound/direct_sound_samples/phonemes/86430B8.aif | Bin 1529 -> 0 bytes sound/direct_sound_samples/phonemes/8643650.aif | Bin 2883 -> 0 bytes sound/direct_sound_samples/phonemes/8644154.aif | Bin 1605 -> 0 bytes sound/direct_sound_samples/phonemes/8644758.aif | Bin 599 -> 0 bytes sound/direct_sound_samples/phonemes/8644950.aif | Bin 2467 -> 0 bytes sound/direct_sound_samples/phonemes/86452B4.aif | Bin 4043 -> 0 bytes sound/direct_sound_samples/phonemes/8646240.aif | Bin 1687 -> 0 bytes sound/direct_sound_samples/phonemes/8646878.aif | Bin 2835 -> 0 bytes sound/direct_sound_samples/phonemes/864734C.aif | Bin 3974 -> 0 bytes sound/direct_sound_samples/phonemes/8648290.aif | Bin 1498 -> 0 bytes sound/direct_sound_samples/phonemes/8648808.aif | Bin 3723 -> 0 bytes sound/direct_sound_samples/phonemes/8649654.aif | Bin 3911 -> 0 bytes sound/direct_sound_samples/phonemes/864A55C.aif | Bin 2870 -> 0 bytes sound/direct_sound_samples/phonemes/864B030.aif | Bin 3027 -> 0 bytes sound/direct_sound_samples/phonemes/864BBC4.aif | Bin 2583 -> 0 bytes sound/direct_sound_samples/phonemes/864C59C.aif | Bin 1696 -> 0 bytes sound/direct_sound_samples/phonemes/864CBDC.aif | Bin 2847 -> 0 bytes sound/direct_sound_samples/phonemes/864D6BC.aif | Bin 1660 -> 0 bytes sound/direct_sound_samples/phonemes/864DCF8.aif | Bin 1912 -> 0 bytes sound/direct_sound_samples/phonemes/864E410.aif | Bin 2427 -> 0 bytes sound/direct_sound_samples/phonemes/864ED4C.aif | Bin 2043 -> 0 bytes sound/direct_sound_samples/phonemes/864F508.aif | Bin 1478 -> 0 bytes sound/direct_sound_samples/phonemes/864FA6C.aif | Bin 3507 -> 0 bytes sound/direct_sound_samples/phonemes/86507E0.aif | Bin 1213 -> 0 bytes sound/direct_sound_samples/phonemes/8650C5C.aif | Bin 1358 -> 0 bytes sound/direct_sound_samples/phonemes/8651148.aif | Bin 2055 -> 0 bytes sound/direct_sound_samples/phonemes/8651910.aif | Bin 3133 -> 0 bytes sound/direct_sound_samples/phonemes/865250C.aif | Bin 984 -> 0 bytes sound/direct_sound_samples/phonemes/8652884.aif | Bin 2043 -> 0 bytes sound/direct_sound_samples/phonemes/8653040.aif | Bin 3235 -> 0 bytes sound/direct_sound_samples/phonemes/8653CA4.aif | Bin 1326 -> 0 bytes sound/direct_sound_samples/phonemes/8654170.aif | Bin 2799 -> 0 bytes sound/direct_sound_samples/phonemes/vowel_1.aif | Bin 0 -> 3186 bytes sound/direct_sound_samples/phonemes/vowel_10.aif | Bin 0 -> 2738 bytes sound/direct_sound_samples/phonemes/vowel_11.aif | Bin 0 -> 897 bytes sound/direct_sound_samples/phonemes/vowel_12.aif | Bin 0 -> 3273 bytes sound/direct_sound_samples/phonemes/vowel_13.aif | Bin 0 -> 1634 bytes sound/direct_sound_samples/phonemes/vowel_14.aif | Bin 0 -> 999 bytes sound/direct_sound_samples/phonemes/vowel_15.aif | Bin 0 -> 3619 bytes sound/direct_sound_samples/phonemes/vowel_16.aif | Bin 0 -> 2481 bytes sound/direct_sound_samples/phonemes/vowel_17.aif | Bin 0 -> 1021 bytes sound/direct_sound_samples/phonemes/vowel_18.aif | Bin 0 -> 2035 bytes sound/direct_sound_samples/phonemes/vowel_19.aif | Bin 0 -> 3483 bytes sound/direct_sound_samples/phonemes/vowel_2.aif | Bin 0 -> 3057 bytes sound/direct_sound_samples/phonemes/vowel_20.aif | Bin 0 -> 678 bytes sound/direct_sound_samples/phonemes/vowel_21.aif | Bin 0 -> 3711 bytes sound/direct_sound_samples/phonemes/vowel_22.aif | Bin 0 -> 2451 bytes sound/direct_sound_samples/phonemes/vowel_23.aif | Bin 0 -> 948 bytes sound/direct_sound_samples/phonemes/vowel_24.aif | Bin 0 -> 1651 bytes sound/direct_sound_samples/phonemes/vowel_25.aif | Bin 0 -> 3243 bytes sound/direct_sound_samples/phonemes/vowel_26.aif | Bin 0 -> 1529 bytes sound/direct_sound_samples/phonemes/vowel_27.aif | Bin 0 -> 2883 bytes sound/direct_sound_samples/phonemes/vowel_28.aif | Bin 0 -> 1605 bytes sound/direct_sound_samples/phonemes/vowel_29.aif | Bin 0 -> 599 bytes sound/direct_sound_samples/phonemes/vowel_3.aif | Bin 0 -> 2814 bytes sound/direct_sound_samples/phonemes/vowel_30.aif | Bin 0 -> 2467 bytes sound/direct_sound_samples/phonemes/vowel_31.aif | Bin 0 -> 4043 bytes sound/direct_sound_samples/phonemes/vowel_32.aif | Bin 0 -> 1687 bytes sound/direct_sound_samples/phonemes/vowel_33.aif | Bin 0 -> 2835 bytes sound/direct_sound_samples/phonemes/vowel_34.aif | Bin 0 -> 3974 bytes sound/direct_sound_samples/phonemes/vowel_35.aif | Bin 0 -> 1498 bytes sound/direct_sound_samples/phonemes/vowel_36.aif | Bin 0 -> 3723 bytes sound/direct_sound_samples/phonemes/vowel_37.aif | Bin 0 -> 3911 bytes sound/direct_sound_samples/phonemes/vowel_38.aif | Bin 0 -> 2870 bytes sound/direct_sound_samples/phonemes/vowel_39.aif | Bin 0 -> 3027 bytes sound/direct_sound_samples/phonemes/vowel_4.aif | Bin 0 -> 2474 bytes sound/direct_sound_samples/phonemes/vowel_40.aif | Bin 0 -> 2583 bytes sound/direct_sound_samples/phonemes/vowel_41.aif | Bin 0 -> 1696 bytes sound/direct_sound_samples/phonemes/vowel_42.aif | Bin 0 -> 2847 bytes sound/direct_sound_samples/phonemes/vowel_43.aif | Bin 0 -> 1660 bytes sound/direct_sound_samples/phonemes/vowel_44.aif | Bin 0 -> 1912 bytes sound/direct_sound_samples/phonemes/vowel_45.aif | Bin 0 -> 2427 bytes sound/direct_sound_samples/phonemes/vowel_46.aif | Bin 0 -> 2043 bytes sound/direct_sound_samples/phonemes/vowel_47.aif | Bin 0 -> 1478 bytes sound/direct_sound_samples/phonemes/vowel_48.aif | Bin 0 -> 3507 bytes sound/direct_sound_samples/phonemes/vowel_49.aif | Bin 0 -> 1213 bytes sound/direct_sound_samples/phonemes/vowel_5.aif | Bin 0 -> 2729 bytes sound/direct_sound_samples/phonemes/vowel_50.aif | Bin 0 -> 1358 bytes sound/direct_sound_samples/phonemes/vowel_51.aif | Bin 0 -> 2055 bytes sound/direct_sound_samples/phonemes/vowel_52.aif | Bin 0 -> 3133 bytes sound/direct_sound_samples/phonemes/vowel_53.aif | Bin 0 -> 984 bytes sound/direct_sound_samples/phonemes/vowel_54.aif | Bin 0 -> 2043 bytes sound/direct_sound_samples/phonemes/vowel_55.aif | Bin 0 -> 3235 bytes sound/direct_sound_samples/phonemes/vowel_56.aif | Bin 0 -> 1326 bytes sound/direct_sound_samples/phonemes/vowel_57.aif | Bin 0 -> 2799 bytes sound/direct_sound_samples/phonemes/vowel_6.aif | Bin 0 -> 3305 bytes sound/direct_sound_samples/phonemes/vowel_7.aif | Bin 0 -> 1697 bytes sound/direct_sound_samples/phonemes/vowel_8.aif | Bin 0 -> 1350 bytes sound/direct_sound_samples/phonemes/vowel_9.aif | Bin 0 -> 2447 bytes sound/direct_sound_samples/synth/sc88_8456330.aif | Bin 1797 -> 0 bytes sound/direct_sound_samples/synth/tone1.aif | Bin 0 -> 1797 bytes sound/voice_groups.inc | 140 ++++++------- 118 files changed, 186 insertions(+), 186 deletions(-) delete mode 100644 sound/direct_sound_samples/phonemes/84A7328.aif delete mode 100644 sound/direct_sound_samples/phonemes/84A7F38.aif delete mode 100644 sound/direct_sound_samples/phonemes/84A8AC8.aif delete mode 100644 sound/direct_sound_samples/phonemes/84A9564.aif delete mode 100644 sound/direct_sound_samples/phonemes/84A9EAC.aif delete mode 100644 sound/direct_sound_samples/phonemes/84AA8F4.aif delete mode 100644 sound/direct_sound_samples/phonemes/8639898.aif delete mode 100644 sound/direct_sound_samples/phonemes/8639EF8.aif delete mode 100644 sound/direct_sound_samples/phonemes/863A3DC.aif delete mode 100644 sound/direct_sound_samples/phonemes/863AD2C.aif delete mode 100644 sound/direct_sound_samples/phonemes/863B79C.aif delete mode 100644 sound/direct_sound_samples/phonemes/863BABC.aif delete mode 100644 sound/direct_sound_samples/phonemes/863C744.aif delete mode 100644 sound/direct_sound_samples/phonemes/863CD64.aif delete mode 100644 sound/direct_sound_samples/phonemes/863D0EC.aif delete mode 100644 sound/direct_sound_samples/phonemes/863DED0.aif delete mode 100644 sound/direct_sound_samples/phonemes/863E840.aif delete mode 100644 sound/direct_sound_samples/phonemes/863EBDC.aif delete mode 100644 sound/direct_sound_samples/phonemes/863F390.aif delete mode 100644 sound/direct_sound_samples/phonemes/86400EC.aif delete mode 100644 sound/direct_sound_samples/phonemes/8640330.aif delete mode 100644 sound/direct_sound_samples/phonemes/8641170.aif delete mode 100644 sound/direct_sound_samples/phonemes/8641AC4.aif delete mode 100644 sound/direct_sound_samples/phonemes/8641E18.aif delete mode 100644 sound/direct_sound_samples/phonemes/864244C.aif delete mode 100644 sound/direct_sound_samples/phonemes/86430B8.aif delete mode 100644 sound/direct_sound_samples/phonemes/8643650.aif delete mode 100644 sound/direct_sound_samples/phonemes/8644154.aif delete mode 100644 sound/direct_sound_samples/phonemes/8644758.aif delete mode 100644 sound/direct_sound_samples/phonemes/8644950.aif delete mode 100644 sound/direct_sound_samples/phonemes/86452B4.aif delete mode 100644 sound/direct_sound_samples/phonemes/8646240.aif delete mode 100644 sound/direct_sound_samples/phonemes/8646878.aif delete mode 100644 sound/direct_sound_samples/phonemes/864734C.aif delete mode 100644 sound/direct_sound_samples/phonemes/8648290.aif delete mode 100644 sound/direct_sound_samples/phonemes/8648808.aif delete mode 100644 sound/direct_sound_samples/phonemes/8649654.aif delete mode 100644 sound/direct_sound_samples/phonemes/864A55C.aif delete mode 100644 sound/direct_sound_samples/phonemes/864B030.aif delete mode 100644 sound/direct_sound_samples/phonemes/864BBC4.aif delete mode 100644 sound/direct_sound_samples/phonemes/864C59C.aif delete mode 100644 sound/direct_sound_samples/phonemes/864CBDC.aif delete mode 100644 sound/direct_sound_samples/phonemes/864D6BC.aif delete mode 100644 sound/direct_sound_samples/phonemes/864DCF8.aif delete mode 100644 sound/direct_sound_samples/phonemes/864E410.aif delete mode 100644 sound/direct_sound_samples/phonemes/864ED4C.aif delete mode 100644 sound/direct_sound_samples/phonemes/864F508.aif delete mode 100644 sound/direct_sound_samples/phonemes/864FA6C.aif delete mode 100644 sound/direct_sound_samples/phonemes/86507E0.aif delete mode 100644 sound/direct_sound_samples/phonemes/8650C5C.aif delete mode 100644 sound/direct_sound_samples/phonemes/8651148.aif delete mode 100644 sound/direct_sound_samples/phonemes/8651910.aif delete mode 100644 sound/direct_sound_samples/phonemes/865250C.aif delete mode 100644 sound/direct_sound_samples/phonemes/8652884.aif delete mode 100644 sound/direct_sound_samples/phonemes/8653040.aif delete mode 100644 sound/direct_sound_samples/phonemes/8653CA4.aif delete mode 100644 sound/direct_sound_samples/phonemes/8654170.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_1.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_10.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_11.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_12.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_13.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_14.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_15.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_16.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_17.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_18.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_19.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_2.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_20.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_21.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_22.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_23.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_24.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_25.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_26.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_27.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_28.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_29.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_3.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_30.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_31.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_32.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_33.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_34.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_35.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_36.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_37.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_38.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_39.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_4.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_40.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_41.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_42.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_43.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_44.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_45.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_46.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_47.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_48.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_49.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_5.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_50.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_51.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_52.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_53.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_54.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_55.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_56.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_57.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_6.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_7.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_8.aif create mode 100644 sound/direct_sound_samples/phonemes/vowel_9.aif delete mode 100644 sound/direct_sound_samples/synth/sc88_8456330.aif create mode 100644 sound/direct_sound_samples/synth/tone1.aif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index ba50fa3f4..455763ccf 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1,6 +1,6 @@ .align 2 -DirectSoundWaveData_8456330:: @ 8456330 - .incbin "sound/direct_sound_samples/synth/sc88_8456330.bin" +DirectSoundWaveData_Tone1:: @ 8456330 + .incbin "sound/direct_sound_samples/synth/tone1.bin" .align 2 DirectSoundWaveData_SC88_Organ2:: @ 84569D4 @@ -239,28 +239,28 @@ DirectSoundWaveData_SC88_AccordianFr:: @ 84A5F58 .incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin" .align 2 -DirectSoundWaveData_84A7328:: @ 84A7328 - .incbin "sound/direct_sound_samples/phonemes/84A7328.bin" +DirectSoundWaveData_Phoneme_Vowel1:: @ 84A7328 + .incbin "sound/direct_sound_samples/phonemes/vowel_1.bin" .align 2 -DirectSoundWaveData_84A7F38:: @ 84A7F38 - .incbin "sound/direct_sound_samples/phonemes/84A7F38.bin" +DirectSoundWaveData_Phoneme_Vowel2:: @ 84A7F38 + .incbin "sound/direct_sound_samples/phonemes/vowel_2.bin" .align 2 -DirectSoundWaveData_84A8AC8:: @ 84A8AC8 - .incbin "sound/direct_sound_samples/phonemes/84A8AC8.bin" +DirectSoundWaveData_Phoneme_Vowel3:: @ 84A8AC8 + .incbin "sound/direct_sound_samples/phonemes/vowel_3.bin" .align 2 -DirectSoundWaveData_84A9564:: @ 84A9564 - .incbin "sound/direct_sound_samples/phonemes/84A9564.bin" +DirectSoundWaveData_Phoneme_Vowel4:: @ 84A9564 + .incbin "sound/direct_sound_samples/phonemes/vowel_4.bin" .align 2 -DirectSoundWaveData_84A9EAC:: @ 84A9EAC - .incbin "sound/direct_sound_samples/phonemes/84A9EAC.bin" +DirectSoundWaveData_Phoneme_Vowel5:: @ 84A9EAC + .incbin "sound/direct_sound_samples/phonemes/vowel_5.bin" .align 2 -DirectSoundWaveData_84AA8F4:: @ 84AA8F4 - .incbin "sound/direct_sound_samples/phonemes/84AA8F4.bin" +DirectSoundWaveData_Phoneme_Vowel6:: @ 84AA8F4 + .incbin "sound/direct_sound_samples/phonemes/vowel_6.bin" .align 2 Cry_Bulbasaur:: @ 84AB57C @@ -1815,208 +1815,208 @@ Cry_Chimecho:: @ 8638E88 .incbin "sound/direct_sound_samples/cries/cry_chimecho.bin" .align 2 -DirectSoundWaveData_8639898:: @ 8639898 - .incbin "sound/direct_sound_samples/phonemes/8639898.bin" +DirectSoundWaveData_Phoneme_Vowel7:: @ 8639898 + .incbin "sound/direct_sound_samples/phonemes/vowel_7.bin" .align 2 -DirectSoundWaveData_8639EF8:: @ 8639EF8 - .incbin "sound/direct_sound_samples/phonemes/8639EF8.bin" +DirectSoundWaveData_Phoneme_Vowel8:: @ 8639EF8 + .incbin "sound/direct_sound_samples/phonemes/vowel_8.bin" .align 2 -DirectSoundWaveData_863A3DC:: @ 863A3DC - .incbin "sound/direct_sound_samples/phonemes/863A3DC.bin" +DirectSoundWaveData_Phoneme_Vowel9:: @ 863A3DC + .incbin "sound/direct_sound_samples/phonemes/vowel_9.bin" .align 2 -DirectSoundWaveData_863AD2C:: @ 863AD2C - .incbin "sound/direct_sound_samples/phonemes/863AD2C.bin" +DirectSoundWaveData_Phoneme_Vowel10:: @ 863AD2C + .incbin "sound/direct_sound_samples/phonemes/vowel_10.bin" .align 2 -DirectSoundWaveData_863B79C:: @ 863B79C - .incbin "sound/direct_sound_samples/phonemes/863B79C.bin" +DirectSoundWaveData_Phoneme_Vowel11:: @ 863B79C + .incbin "sound/direct_sound_samples/phonemes/vowel_11.bin" .align 2 -DirectSoundWaveData_863BABC:: @ 863BABC - .incbin "sound/direct_sound_samples/phonemes/863BABC.bin" +DirectSoundWaveData_Phoneme_Vowel12:: @ 863BABC + .incbin "sound/direct_sound_samples/phonemes/vowel_12.bin" .align 2 -DirectSoundWaveData_863C744:: @ 863C744 - .incbin "sound/direct_sound_samples/phonemes/863C744.bin" +DirectSoundWaveData_Phoneme_Vowel13:: @ 863C744 + .incbin "sound/direct_sound_samples/phonemes/vowel_13.bin" .align 2 -DirectSoundWaveData_863CD64:: @ 863CD64 - .incbin "sound/direct_sound_samples/phonemes/863CD64.bin" +DirectSoundWaveData_Phoneme_Vowel14:: @ 863CD64 + .incbin "sound/direct_sound_samples/phonemes/vowel_14.bin" .align 2 -DirectSoundWaveData_863D0EC:: @ 863D0EC - .incbin "sound/direct_sound_samples/phonemes/863D0EC.bin" +DirectSoundWaveData_Phoneme_Vowel15:: @ 863D0EC + .incbin "sound/direct_sound_samples/phonemes/vowel_15.bin" .align 2 -DirectSoundWaveData_863DED0:: @ 863DED0 - .incbin "sound/direct_sound_samples/phonemes/863DED0.bin" +DirectSoundWaveData_Phoneme_Vowel16:: @ 863DED0 + .incbin "sound/direct_sound_samples/phonemes/vowel_16.bin" .align 2 -DirectSoundWaveData_863E840:: @ 863E840 - .incbin "sound/direct_sound_samples/phonemes/863E840.bin" +DirectSoundWaveData_Phoneme_Vowel17:: @ 863E840 + .incbin "sound/direct_sound_samples/phonemes/vowel_17.bin" .align 2 -DirectSoundWaveData_863EBDC:: @ 863EBDC - .incbin "sound/direct_sound_samples/phonemes/863EBDC.bin" +DirectSoundWaveData_Phoneme_Vowel18:: @ 863EBDC + .incbin "sound/direct_sound_samples/phonemes/vowel_18.bin" .align 2 -DirectSoundWaveData_863F390:: @ 863F390 - .incbin "sound/direct_sound_samples/phonemes/863F390.bin" +DirectSoundWaveData_Phoneme_Vowel19:: @ 863F390 + .incbin "sound/direct_sound_samples/phonemes/vowel_19.bin" .align 2 -DirectSoundWaveData_86400EC:: @ 86400EC - .incbin "sound/direct_sound_samples/phonemes/86400EC.bin" +DirectSoundWaveData_Phoneme_Vowel20:: @ 86400EC + .incbin "sound/direct_sound_samples/phonemes/vowel_20.bin" .align 2 -DirectSoundWaveData_8640330:: @ 8640330 - .incbin "sound/direct_sound_samples/phonemes/8640330.bin" +DirectSoundWaveData_Phoneme_Vowel21:: @ 8640330 + .incbin "sound/direct_sound_samples/phonemes/vowel_21.bin" .align 2 -DirectSoundWaveData_8641170:: @ 8641170 - .incbin "sound/direct_sound_samples/phonemes/8641170.bin" +DirectSoundWaveData_Phoneme_Vowel22:: @ 8641170 + .incbin "sound/direct_sound_samples/phonemes/vowel_22.bin" .align 2 -DirectSoundWaveData_8641AC4:: @ 8641AC4 - .incbin "sound/direct_sound_samples/phonemes/8641AC4.bin" +DirectSoundWaveData_Phoneme_Vowel23:: @ 8641AC4 + .incbin "sound/direct_sound_samples/phonemes/vowel_23.bin" .align 2 -DirectSoundWaveData_8641E18:: @ 8641E18 - .incbin "sound/direct_sound_samples/phonemes/8641E18.bin" +DirectSoundWaveData_Phoneme_Vowel24:: @ 8641E18 + .incbin "sound/direct_sound_samples/phonemes/vowel_24.bin" .align 2 -DirectSoundWaveData_864244C:: @ 864244C - .incbin "sound/direct_sound_samples/phonemes/864244C.bin" +DirectSoundWaveData_Phoneme_Vowel25:: @ 864244C + .incbin "sound/direct_sound_samples/phonemes/vowel_25.bin" .align 2 -DirectSoundWaveData_86430B8:: @ 86430B8 - .incbin "sound/direct_sound_samples/phonemes/86430B8.bin" +DirectSoundWaveData_Phoneme_Vowel26:: @ 86430B8 + .incbin "sound/direct_sound_samples/phonemes/vowel_26.bin" .align 2 -DirectSoundWaveData_8643650:: @ 8643650 - .incbin "sound/direct_sound_samples/phonemes/8643650.bin" +DirectSoundWaveData_Phoneme_Vowel27:: @ 8643650 + .incbin "sound/direct_sound_samples/phonemes/vowel_27.bin" .align 2 -DirectSoundWaveData_8644154:: @ 8644154 - .incbin "sound/direct_sound_samples/phonemes/8644154.bin" +DirectSoundWaveData_Phoneme_Vowel28:: @ 8644154 + .incbin "sound/direct_sound_samples/phonemes/vowel_28.bin" .align 2 -DirectSoundWaveData_8644758:: @ 8644758 - .incbin "sound/direct_sound_samples/phonemes/8644758.bin" +DirectSoundWaveData_Phoneme_Vowel29:: @ 8644758 + .incbin "sound/direct_sound_samples/phonemes/vowel_29.bin" .align 2 -DirectSoundWaveData_8644950:: @ 8644950 - .incbin "sound/direct_sound_samples/phonemes/8644950.bin" +DirectSoundWaveData_Phoneme_Vowel30:: @ 8644950 + .incbin "sound/direct_sound_samples/phonemes/vowel_30.bin" .align 2 -DirectSoundWaveData_86452B4:: @ 86452B4 - .incbin "sound/direct_sound_samples/phonemes/86452B4.bin" +DirectSoundWaveData_Phoneme_Vowel31:: @ 86452B4 + .incbin "sound/direct_sound_samples/phonemes/vowel_31.bin" .align 2 -DirectSoundWaveData_8646240:: @ 8646240 - .incbin "sound/direct_sound_samples/phonemes/8646240.bin" +DirectSoundWaveData_Phoneme_Vowel32:: @ 8646240 + .incbin "sound/direct_sound_samples/phonemes/vowel_32.bin" .align 2 -DirectSoundWaveData_8646878:: @ 8646878 - .incbin "sound/direct_sound_samples/phonemes/8646878.bin" +DirectSoundWaveData_Phoneme_Vowel33:: @ 8646878 + .incbin "sound/direct_sound_samples/phonemes/vowel_33.bin" .align 2 -DirectSoundWaveData_864734C:: @ 864734C - .incbin "sound/direct_sound_samples/phonemes/864734C.bin" +DirectSoundWaveData_Phoneme_Vowel34:: @ 864734C + .incbin "sound/direct_sound_samples/phonemes/vowel_34.bin" .align 2 -DirectSoundWaveData_8648290:: @ 8648290 - .incbin "sound/direct_sound_samples/phonemes/8648290.bin" +DirectSoundWaveData_Phoneme_Vowel35:: @ 8648290 + .incbin "sound/direct_sound_samples/phonemes/vowel_35.bin" .align 2 -DirectSoundWaveData_8648808:: @ 8648808 - .incbin "sound/direct_sound_samples/phonemes/8648808.bin" +DirectSoundWaveData_Phoneme_Vowel36:: @ 8648808 + .incbin "sound/direct_sound_samples/phonemes/vowel_36.bin" .align 2 -DirectSoundWaveData_8649654:: @ 8649654 - .incbin "sound/direct_sound_samples/phonemes/8649654.bin" +DirectSoundWaveData_Phoneme_Vowel37:: @ 8649654 + .incbin "sound/direct_sound_samples/phonemes/vowel_37.bin" .align 2 -DirectSoundWaveData_864A55C:: @ 864A55C - .incbin "sound/direct_sound_samples/phonemes/864A55C.bin" +DirectSoundWaveData_Phoneme_Vowel38:: @ 864A55C + .incbin "sound/direct_sound_samples/phonemes/vowel_38.bin" .align 2 -DirectSoundWaveData_864B030:: @ 864B030 - .incbin "sound/direct_sound_samples/phonemes/864B030.bin" +DirectSoundWaveData_Phoneme_Vowel39:: @ 864B030 + .incbin "sound/direct_sound_samples/phonemes/vowel_39.bin" .align 2 -DirectSoundWaveData_864BBC4:: @ 864BBC4 - .incbin "sound/direct_sound_samples/phonemes/864BBC4.bin" +DirectSoundWaveData_Phoneme_Vowel40:: @ 864BBC4 + .incbin "sound/direct_sound_samples/phonemes/vowel_40.bin" .align 2 -DirectSoundWaveData_864C59C:: @ 864C59C - .incbin "sound/direct_sound_samples/phonemes/864C59C.bin" +DirectSoundWaveData_Phoneme_Vowel41:: @ 864C59C + .incbin "sound/direct_sound_samples/phonemes/vowel_41.bin" .align 2 -DirectSoundWaveData_864CBDC:: @ 864CBDC - .incbin "sound/direct_sound_samples/phonemes/864CBDC.bin" +DirectSoundWaveData_Phoneme_Vowel42:: @ 864CBDC + .incbin "sound/direct_sound_samples/phonemes/vowel_42.bin" .align 2 -DirectSoundWaveData_864D6BC:: @ 864D6BC - .incbin "sound/direct_sound_samples/phonemes/864D6BC.bin" +DirectSoundWaveData_Phoneme_Vowel43:: @ 864D6BC + .incbin "sound/direct_sound_samples/phonemes/vowel_43.bin" .align 2 -DirectSoundWaveData_864DCF8:: @ 864DCF8 - .incbin "sound/direct_sound_samples/phonemes/864DCF8.bin" +DirectSoundWaveData_Phoneme_Vowel44:: @ 864DCF8 + .incbin "sound/direct_sound_samples/phonemes/vowel_44.bin" .align 2 -DirectSoundWaveData_864E410:: @ 864E410 - .incbin "sound/direct_sound_samples/phonemes/864E410.bin" +DirectSoundWaveData_Phoneme_Vowel45:: @ 864E410 + .incbin "sound/direct_sound_samples/phonemes/vowel_45.bin" .align 2 -DirectSoundWaveData_864ED4C:: @ 864ED4C - .incbin "sound/direct_sound_samples/phonemes/864ED4C.bin" +DirectSoundWaveData_Phoneme_Vowel46:: @ 864ED4C + .incbin "sound/direct_sound_samples/phonemes/vowel_46.bin" .align 2 -DirectSoundWaveData_864F508:: @ 864F508 - .incbin "sound/direct_sound_samples/phonemes/864F508.bin" +DirectSoundWaveData_Phoneme_Vowel47:: @ 864F508 + .incbin "sound/direct_sound_samples/phonemes/vowel_47.bin" .align 2 -DirectSoundWaveData_864FA6C:: @ 864FA6C - .incbin "sound/direct_sound_samples/phonemes/864FA6C.bin" +DirectSoundWaveData_Phoneme_Vowel48:: @ 864FA6C + .incbin "sound/direct_sound_samples/phonemes/vowel_48.bin" .align 2 -DirectSoundWaveData_86507E0:: @ 86507E0 - .incbin "sound/direct_sound_samples/phonemes/86507E0.bin" +DirectSoundWaveData_Phoneme_Vowel49:: @ 86507E0 + .incbin "sound/direct_sound_samples/phonemes/vowel_49.bin" .align 2 -DirectSoundWaveData_8650C5C:: @ 8650C5C - .incbin "sound/direct_sound_samples/phonemes/8650C5C.bin" +DirectSoundWaveData_Phoneme_Vowel50:: @ 8650C5C + .incbin "sound/direct_sound_samples/phonemes/vowel_50.bin" .align 2 -DirectSoundWaveData_8651148:: @ 8651148 - .incbin "sound/direct_sound_samples/phonemes/8651148.bin" +DirectSoundWaveData_Phoneme_Vowel51:: @ 8651148 + .incbin "sound/direct_sound_samples/phonemes/vowel_51.bin" .align 2 -DirectSoundWaveData_8651910:: @ 8651910 - .incbin "sound/direct_sound_samples/phonemes/8651910.bin" +DirectSoundWaveData_Phoneme_Vowel52:: @ 8651910 + .incbin "sound/direct_sound_samples/phonemes/vowel_52.bin" .align 2 -DirectSoundWaveData_865250C:: @ 865250C - .incbin "sound/direct_sound_samples/phonemes/865250C.bin" +DirectSoundWaveData_Phoneme_Vowel53:: @ 865250C + .incbin "sound/direct_sound_samples/phonemes/vowel_53.bin" .align 2 -DirectSoundWaveData_8652884:: @ 8652884 - .incbin "sound/direct_sound_samples/phonemes/8652884.bin" +DirectSoundWaveData_Phoneme_Vowel54:: @ 8652884 + .incbin "sound/direct_sound_samples/phonemes/vowel_54.bin" .align 2 -DirectSoundWaveData_8653040:: @ 8653040 - .incbin "sound/direct_sound_samples/phonemes/8653040.bin" +DirectSoundWaveData_Phoneme_Vowel55:: @ 8653040 + .incbin "sound/direct_sound_samples/phonemes/vowel_55.bin" .align 2 -DirectSoundWaveData_8653CA4:: @ 8653CA4 - .incbin "sound/direct_sound_samples/phonemes/8653CA4.bin" +DirectSoundWaveData_Phoneme_Vowel56:: @ 8653CA4 + .incbin "sound/direct_sound_samples/phonemes/vowel_56.bin" .align 2 -DirectSoundWaveData_8654170:: @ 8654170 - .incbin "sound/direct_sound_samples/phonemes/8654170.bin" +DirectSoundWaveData_Phoneme_Vowel57:: @ 8654170 + .incbin "sound/direct_sound_samples/phonemes/vowel_57.bin" .align 2 DirectSoundWaveData_SC88_AccordionFr_Copy:: @ 8654C20 diff --git a/sound/direct_sound_samples/phonemes/84A7328.aif b/sound/direct_sound_samples/phonemes/84A7328.aif deleted file mode 100644 index 9521d0b6e..000000000 Binary files a/sound/direct_sound_samples/phonemes/84A7328.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/84A7F38.aif b/sound/direct_sound_samples/phonemes/84A7F38.aif deleted file mode 100644 index 2519572e2..000000000 Binary files a/sound/direct_sound_samples/phonemes/84A7F38.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/84A8AC8.aif b/sound/direct_sound_samples/phonemes/84A8AC8.aif deleted file mode 100644 index d411e6612..000000000 Binary files a/sound/direct_sound_samples/phonemes/84A8AC8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/84A9564.aif b/sound/direct_sound_samples/phonemes/84A9564.aif deleted file mode 100644 index 3bc1aa839..000000000 Binary files a/sound/direct_sound_samples/phonemes/84A9564.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/84A9EAC.aif b/sound/direct_sound_samples/phonemes/84A9EAC.aif deleted file mode 100644 index 3bacf3676..000000000 Binary files a/sound/direct_sound_samples/phonemes/84A9EAC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/84AA8F4.aif b/sound/direct_sound_samples/phonemes/84AA8F4.aif deleted file mode 100644 index 5ddaa153d..000000000 Binary files a/sound/direct_sound_samples/phonemes/84AA8F4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8639898.aif b/sound/direct_sound_samples/phonemes/8639898.aif deleted file mode 100644 index 4b15a94b7..000000000 Binary files a/sound/direct_sound_samples/phonemes/8639898.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8639EF8.aif b/sound/direct_sound_samples/phonemes/8639EF8.aif deleted file mode 100644 index 74c129073..000000000 Binary files a/sound/direct_sound_samples/phonemes/8639EF8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863A3DC.aif b/sound/direct_sound_samples/phonemes/863A3DC.aif deleted file mode 100644 index 359972c16..000000000 Binary files a/sound/direct_sound_samples/phonemes/863A3DC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863AD2C.aif b/sound/direct_sound_samples/phonemes/863AD2C.aif deleted file mode 100644 index 3b136fa43..000000000 Binary files a/sound/direct_sound_samples/phonemes/863AD2C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863B79C.aif b/sound/direct_sound_samples/phonemes/863B79C.aif deleted file mode 100644 index fd72512cf..000000000 Binary files a/sound/direct_sound_samples/phonemes/863B79C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863BABC.aif b/sound/direct_sound_samples/phonemes/863BABC.aif deleted file mode 100644 index 6f7794bec..000000000 Binary files a/sound/direct_sound_samples/phonemes/863BABC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863C744.aif b/sound/direct_sound_samples/phonemes/863C744.aif deleted file mode 100644 index 89b845f21..000000000 Binary files a/sound/direct_sound_samples/phonemes/863C744.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863CD64.aif b/sound/direct_sound_samples/phonemes/863CD64.aif deleted file mode 100644 index 1d99a3a93..000000000 Binary files a/sound/direct_sound_samples/phonemes/863CD64.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863D0EC.aif b/sound/direct_sound_samples/phonemes/863D0EC.aif deleted file mode 100644 index 883398129..000000000 Binary files a/sound/direct_sound_samples/phonemes/863D0EC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863DED0.aif b/sound/direct_sound_samples/phonemes/863DED0.aif deleted file mode 100644 index 776815e63..000000000 Binary files a/sound/direct_sound_samples/phonemes/863DED0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863E840.aif b/sound/direct_sound_samples/phonemes/863E840.aif deleted file mode 100644 index 545bd1292..000000000 Binary files a/sound/direct_sound_samples/phonemes/863E840.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863EBDC.aif b/sound/direct_sound_samples/phonemes/863EBDC.aif deleted file mode 100644 index c0a3be10d..000000000 Binary files a/sound/direct_sound_samples/phonemes/863EBDC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/863F390.aif b/sound/direct_sound_samples/phonemes/863F390.aif deleted file mode 100644 index d26ecdd6d..000000000 Binary files a/sound/direct_sound_samples/phonemes/863F390.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/86400EC.aif b/sound/direct_sound_samples/phonemes/86400EC.aif deleted file mode 100644 index 2b51201a4..000000000 Binary files a/sound/direct_sound_samples/phonemes/86400EC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8640330.aif b/sound/direct_sound_samples/phonemes/8640330.aif deleted file mode 100644 index cf5ac4e03..000000000 Binary files a/sound/direct_sound_samples/phonemes/8640330.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8641170.aif b/sound/direct_sound_samples/phonemes/8641170.aif deleted file mode 100644 index 606742e60..000000000 Binary files a/sound/direct_sound_samples/phonemes/8641170.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8641AC4.aif b/sound/direct_sound_samples/phonemes/8641AC4.aif deleted file mode 100644 index 71d4987d6..000000000 Binary files a/sound/direct_sound_samples/phonemes/8641AC4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8641E18.aif b/sound/direct_sound_samples/phonemes/8641E18.aif deleted file mode 100644 index 070c44a37..000000000 Binary files a/sound/direct_sound_samples/phonemes/8641E18.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864244C.aif b/sound/direct_sound_samples/phonemes/864244C.aif deleted file mode 100644 index b0ca84a38..000000000 Binary files a/sound/direct_sound_samples/phonemes/864244C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/86430B8.aif b/sound/direct_sound_samples/phonemes/86430B8.aif deleted file mode 100644 index f44101b23..000000000 Binary files a/sound/direct_sound_samples/phonemes/86430B8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8643650.aif b/sound/direct_sound_samples/phonemes/8643650.aif deleted file mode 100644 index a33809d42..000000000 Binary files a/sound/direct_sound_samples/phonemes/8643650.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8644154.aif b/sound/direct_sound_samples/phonemes/8644154.aif deleted file mode 100644 index 6a005efcc..000000000 Binary files a/sound/direct_sound_samples/phonemes/8644154.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8644758.aif b/sound/direct_sound_samples/phonemes/8644758.aif deleted file mode 100644 index 62f9493fd..000000000 Binary files a/sound/direct_sound_samples/phonemes/8644758.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8644950.aif b/sound/direct_sound_samples/phonemes/8644950.aif deleted file mode 100644 index 5767bd6d9..000000000 Binary files a/sound/direct_sound_samples/phonemes/8644950.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/86452B4.aif b/sound/direct_sound_samples/phonemes/86452B4.aif deleted file mode 100644 index 33e328a82..000000000 Binary files a/sound/direct_sound_samples/phonemes/86452B4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8646240.aif b/sound/direct_sound_samples/phonemes/8646240.aif deleted file mode 100644 index 548e740c8..000000000 Binary files a/sound/direct_sound_samples/phonemes/8646240.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8646878.aif b/sound/direct_sound_samples/phonemes/8646878.aif deleted file mode 100644 index cbbe09266..000000000 Binary files a/sound/direct_sound_samples/phonemes/8646878.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864734C.aif b/sound/direct_sound_samples/phonemes/864734C.aif deleted file mode 100644 index 8bdf7faaa..000000000 Binary files a/sound/direct_sound_samples/phonemes/864734C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8648290.aif b/sound/direct_sound_samples/phonemes/8648290.aif deleted file mode 100644 index f96f8853b..000000000 Binary files a/sound/direct_sound_samples/phonemes/8648290.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8648808.aif b/sound/direct_sound_samples/phonemes/8648808.aif deleted file mode 100644 index ab9abbf79..000000000 Binary files a/sound/direct_sound_samples/phonemes/8648808.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8649654.aif b/sound/direct_sound_samples/phonemes/8649654.aif deleted file mode 100644 index 9d21d0ab4..000000000 Binary files a/sound/direct_sound_samples/phonemes/8649654.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864A55C.aif b/sound/direct_sound_samples/phonemes/864A55C.aif deleted file mode 100644 index c037ed4af..000000000 Binary files a/sound/direct_sound_samples/phonemes/864A55C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864B030.aif b/sound/direct_sound_samples/phonemes/864B030.aif deleted file mode 100644 index ac1f8b66f..000000000 Binary files a/sound/direct_sound_samples/phonemes/864B030.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864BBC4.aif b/sound/direct_sound_samples/phonemes/864BBC4.aif deleted file mode 100644 index 1fd9111c8..000000000 Binary files a/sound/direct_sound_samples/phonemes/864BBC4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864C59C.aif b/sound/direct_sound_samples/phonemes/864C59C.aif deleted file mode 100644 index 5d6ae2282..000000000 Binary files a/sound/direct_sound_samples/phonemes/864C59C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864CBDC.aif b/sound/direct_sound_samples/phonemes/864CBDC.aif deleted file mode 100644 index f26700690..000000000 Binary files a/sound/direct_sound_samples/phonemes/864CBDC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864D6BC.aif b/sound/direct_sound_samples/phonemes/864D6BC.aif deleted file mode 100644 index 3ba97a9fc..000000000 Binary files a/sound/direct_sound_samples/phonemes/864D6BC.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864DCF8.aif b/sound/direct_sound_samples/phonemes/864DCF8.aif deleted file mode 100644 index 37f1be4b1..000000000 Binary files a/sound/direct_sound_samples/phonemes/864DCF8.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864E410.aif b/sound/direct_sound_samples/phonemes/864E410.aif deleted file mode 100644 index 4b3facb99..000000000 Binary files a/sound/direct_sound_samples/phonemes/864E410.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864ED4C.aif b/sound/direct_sound_samples/phonemes/864ED4C.aif deleted file mode 100644 index 8a4d7653b..000000000 Binary files a/sound/direct_sound_samples/phonemes/864ED4C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864F508.aif b/sound/direct_sound_samples/phonemes/864F508.aif deleted file mode 100644 index db5bae244..000000000 Binary files a/sound/direct_sound_samples/phonemes/864F508.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/864FA6C.aif b/sound/direct_sound_samples/phonemes/864FA6C.aif deleted file mode 100644 index 6612dd54d..000000000 Binary files a/sound/direct_sound_samples/phonemes/864FA6C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/86507E0.aif b/sound/direct_sound_samples/phonemes/86507E0.aif deleted file mode 100644 index 441eecfcd..000000000 Binary files a/sound/direct_sound_samples/phonemes/86507E0.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8650C5C.aif b/sound/direct_sound_samples/phonemes/8650C5C.aif deleted file mode 100644 index 95670cf0a..000000000 Binary files a/sound/direct_sound_samples/phonemes/8650C5C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8651148.aif b/sound/direct_sound_samples/phonemes/8651148.aif deleted file mode 100644 index 0fadcba8e..000000000 Binary files a/sound/direct_sound_samples/phonemes/8651148.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8651910.aif b/sound/direct_sound_samples/phonemes/8651910.aif deleted file mode 100644 index 6017c55b4..000000000 Binary files a/sound/direct_sound_samples/phonemes/8651910.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/865250C.aif b/sound/direct_sound_samples/phonemes/865250C.aif deleted file mode 100644 index 2327b6d65..000000000 Binary files a/sound/direct_sound_samples/phonemes/865250C.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8652884.aif b/sound/direct_sound_samples/phonemes/8652884.aif deleted file mode 100644 index 19ceca0d0..000000000 Binary files a/sound/direct_sound_samples/phonemes/8652884.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8653040.aif b/sound/direct_sound_samples/phonemes/8653040.aif deleted file mode 100644 index 8438d301a..000000000 Binary files a/sound/direct_sound_samples/phonemes/8653040.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8653CA4.aif b/sound/direct_sound_samples/phonemes/8653CA4.aif deleted file mode 100644 index 74d4bcf4a..000000000 Binary files a/sound/direct_sound_samples/phonemes/8653CA4.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/8654170.aif b/sound/direct_sound_samples/phonemes/8654170.aif deleted file mode 100644 index dfef8a82b..000000000 Binary files a/sound/direct_sound_samples/phonemes/8654170.aif and /dev/null differ diff --git a/sound/direct_sound_samples/phonemes/vowel_1.aif b/sound/direct_sound_samples/phonemes/vowel_1.aif new file mode 100644 index 000000000..9521d0b6e Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_1.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_10.aif b/sound/direct_sound_samples/phonemes/vowel_10.aif new file mode 100644 index 000000000..3b136fa43 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_10.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_11.aif b/sound/direct_sound_samples/phonemes/vowel_11.aif new file mode 100644 index 000000000..fd72512cf Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_11.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_12.aif b/sound/direct_sound_samples/phonemes/vowel_12.aif new file mode 100644 index 000000000..6f7794bec Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_12.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_13.aif b/sound/direct_sound_samples/phonemes/vowel_13.aif new file mode 100644 index 000000000..89b845f21 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_13.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_14.aif b/sound/direct_sound_samples/phonemes/vowel_14.aif new file mode 100644 index 000000000..1d99a3a93 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_14.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_15.aif b/sound/direct_sound_samples/phonemes/vowel_15.aif new file mode 100644 index 000000000..883398129 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_15.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_16.aif b/sound/direct_sound_samples/phonemes/vowel_16.aif new file mode 100644 index 000000000..776815e63 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_16.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_17.aif b/sound/direct_sound_samples/phonemes/vowel_17.aif new file mode 100644 index 000000000..545bd1292 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_17.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_18.aif b/sound/direct_sound_samples/phonemes/vowel_18.aif new file mode 100644 index 000000000..c0a3be10d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_18.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_19.aif b/sound/direct_sound_samples/phonemes/vowel_19.aif new file mode 100644 index 000000000..d26ecdd6d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_19.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_2.aif b/sound/direct_sound_samples/phonemes/vowel_2.aif new file mode 100644 index 000000000..2519572e2 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_2.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_20.aif b/sound/direct_sound_samples/phonemes/vowel_20.aif new file mode 100644 index 000000000..2b51201a4 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_20.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_21.aif b/sound/direct_sound_samples/phonemes/vowel_21.aif new file mode 100644 index 000000000..cf5ac4e03 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_21.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_22.aif b/sound/direct_sound_samples/phonemes/vowel_22.aif new file mode 100644 index 000000000..606742e60 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_22.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_23.aif b/sound/direct_sound_samples/phonemes/vowel_23.aif new file mode 100644 index 000000000..71d4987d6 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_23.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_24.aif b/sound/direct_sound_samples/phonemes/vowel_24.aif new file mode 100644 index 000000000..070c44a37 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_24.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_25.aif b/sound/direct_sound_samples/phonemes/vowel_25.aif new file mode 100644 index 000000000..b0ca84a38 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_25.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_26.aif b/sound/direct_sound_samples/phonemes/vowel_26.aif new file mode 100644 index 000000000..f44101b23 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_26.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_27.aif b/sound/direct_sound_samples/phonemes/vowel_27.aif new file mode 100644 index 000000000..a33809d42 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_27.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_28.aif b/sound/direct_sound_samples/phonemes/vowel_28.aif new file mode 100644 index 000000000..6a005efcc Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_28.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_29.aif b/sound/direct_sound_samples/phonemes/vowel_29.aif new file mode 100644 index 000000000..62f9493fd Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_29.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_3.aif b/sound/direct_sound_samples/phonemes/vowel_3.aif new file mode 100644 index 000000000..d411e6612 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_3.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_30.aif b/sound/direct_sound_samples/phonemes/vowel_30.aif new file mode 100644 index 000000000..5767bd6d9 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_30.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_31.aif b/sound/direct_sound_samples/phonemes/vowel_31.aif new file mode 100644 index 000000000..33e328a82 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_31.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_32.aif b/sound/direct_sound_samples/phonemes/vowel_32.aif new file mode 100644 index 000000000..548e740c8 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_32.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_33.aif b/sound/direct_sound_samples/phonemes/vowel_33.aif new file mode 100644 index 000000000..cbbe09266 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_33.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_34.aif b/sound/direct_sound_samples/phonemes/vowel_34.aif new file mode 100644 index 000000000..8bdf7faaa Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_34.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_35.aif b/sound/direct_sound_samples/phonemes/vowel_35.aif new file mode 100644 index 000000000..f96f8853b Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_35.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_36.aif b/sound/direct_sound_samples/phonemes/vowel_36.aif new file mode 100644 index 000000000..ab9abbf79 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_36.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_37.aif b/sound/direct_sound_samples/phonemes/vowel_37.aif new file mode 100644 index 000000000..9d21d0ab4 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_37.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_38.aif b/sound/direct_sound_samples/phonemes/vowel_38.aif new file mode 100644 index 000000000..c037ed4af Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_38.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_39.aif b/sound/direct_sound_samples/phonemes/vowel_39.aif new file mode 100644 index 000000000..ac1f8b66f Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_39.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_4.aif b/sound/direct_sound_samples/phonemes/vowel_4.aif new file mode 100644 index 000000000..3bc1aa839 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_4.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_40.aif b/sound/direct_sound_samples/phonemes/vowel_40.aif new file mode 100644 index 000000000..1fd9111c8 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_40.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_41.aif b/sound/direct_sound_samples/phonemes/vowel_41.aif new file mode 100644 index 000000000..5d6ae2282 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_41.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_42.aif b/sound/direct_sound_samples/phonemes/vowel_42.aif new file mode 100644 index 000000000..f26700690 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_42.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_43.aif b/sound/direct_sound_samples/phonemes/vowel_43.aif new file mode 100644 index 000000000..3ba97a9fc Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_43.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_44.aif b/sound/direct_sound_samples/phonemes/vowel_44.aif new file mode 100644 index 000000000..37f1be4b1 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_44.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_45.aif b/sound/direct_sound_samples/phonemes/vowel_45.aif new file mode 100644 index 000000000..4b3facb99 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_45.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_46.aif b/sound/direct_sound_samples/phonemes/vowel_46.aif new file mode 100644 index 000000000..8a4d7653b Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_46.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_47.aif b/sound/direct_sound_samples/phonemes/vowel_47.aif new file mode 100644 index 000000000..db5bae244 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_47.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_48.aif b/sound/direct_sound_samples/phonemes/vowel_48.aif new file mode 100644 index 000000000..6612dd54d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_48.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_49.aif b/sound/direct_sound_samples/phonemes/vowel_49.aif new file mode 100644 index 000000000..441eecfcd Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_49.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_5.aif b/sound/direct_sound_samples/phonemes/vowel_5.aif new file mode 100644 index 000000000..3bacf3676 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_5.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_50.aif b/sound/direct_sound_samples/phonemes/vowel_50.aif new file mode 100644 index 000000000..95670cf0a Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_50.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_51.aif b/sound/direct_sound_samples/phonemes/vowel_51.aif new file mode 100644 index 000000000..0fadcba8e Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_51.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_52.aif b/sound/direct_sound_samples/phonemes/vowel_52.aif new file mode 100644 index 000000000..6017c55b4 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_52.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_53.aif b/sound/direct_sound_samples/phonemes/vowel_53.aif new file mode 100644 index 000000000..2327b6d65 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_53.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_54.aif b/sound/direct_sound_samples/phonemes/vowel_54.aif new file mode 100644 index 000000000..19ceca0d0 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_54.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_55.aif b/sound/direct_sound_samples/phonemes/vowel_55.aif new file mode 100644 index 000000000..8438d301a Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_55.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_56.aif b/sound/direct_sound_samples/phonemes/vowel_56.aif new file mode 100644 index 000000000..74d4bcf4a Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_56.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_57.aif b/sound/direct_sound_samples/phonemes/vowel_57.aif new file mode 100644 index 000000000..dfef8a82b Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_57.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_6.aif b/sound/direct_sound_samples/phonemes/vowel_6.aif new file mode 100644 index 000000000..5ddaa153d Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_6.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_7.aif b/sound/direct_sound_samples/phonemes/vowel_7.aif new file mode 100644 index 000000000..4b15a94b7 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_7.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_8.aif b/sound/direct_sound_samples/phonemes/vowel_8.aif new file mode 100644 index 000000000..74c129073 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_8.aif differ diff --git a/sound/direct_sound_samples/phonemes/vowel_9.aif b/sound/direct_sound_samples/phonemes/vowel_9.aif new file mode 100644 index 000000000..359972c16 Binary files /dev/null and b/sound/direct_sound_samples/phonemes/vowel_9.aif differ diff --git a/sound/direct_sound_samples/synth/sc88_8456330.aif b/sound/direct_sound_samples/synth/sc88_8456330.aif deleted file mode 100644 index 199ead811..000000000 Binary files a/sound/direct_sound_samples/synth/sc88_8456330.aif and /dev/null differ diff --git a/sound/direct_sound_samples/synth/tone1.aif b/sound/direct_sound_samples/synth/tone1.aif new file mode 100644 index 000000000..199ead811 Binary files /dev/null and b/sound/direct_sound_samples/synth/tone1.aif differ diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index 0d4c94121..1d7c46c83 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -9,7 +9,7 @@ voicegroup_pokemon_cry:: @ 842FC8 voice_square_2 2, 0, 0, 9, 2 @ 842FCD0 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FCDC voice_square_1 0, 2, 0, 0, 15, 0 @ 842FCE8 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 235 @ 842FCF4 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 235 @ 842FCF4 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD00 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD0C voice_square_1 0, 2, 0, 0, 15, 0 @ 842FD18 @@ -507,7 +507,7 @@ voicegroup_843129C:: @ 843129C voice_square_1 0, 2, 0, 0, 15, 0 @ 84312E4 voice_square_1 0, 2, 0, 0, 15, 0 @ 84312F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 84312FC - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 235 @ 8431308 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 235 @ 8431308 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431314 voice_square_1 0, 2, 0, 0, 15, 0 @ 8431320 voice_square_1 0, 2, 0, 0, 15, 0 @ 843132C @@ -4061,7 +4061,7 @@ voicegroup_843B424:: @ 843B424 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B46C voice_square_1 0, 2, 0, 0, 15, 0 @ 843B478 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B484 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 204, 51, 242 @ 843B490 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 204, 51, 242 @ 843B490 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B49C voice_square_1 0, 2, 0, 0, 15, 0 @ 843B4A8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B4B4 @@ -4152,7 +4152,7 @@ voicegroup_843B844:: @ 843B844 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B88C voice_square_1 0, 2, 0, 0, 15, 0 @ 843B898 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B8A4 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 242 @ 843B8B0 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 242 @ 843B8B0 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B8BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843B8C8 voice_square_1 0, 2, 0, 0, 15, 0 @ 843B8D4 @@ -5146,7 +5146,7 @@ voicegroup_843E5BC:: @ 843E5BC voice_square_1 0, 2, 0, 0, 15, 0 @ 843E604 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E610 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E61C - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 188, 51, 242 @ 843E628 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 188, 51, 242 @ 843E628 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E634 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E640 voice_square_1 0, 2, 0, 0, 15, 0 @ 843E64C @@ -5408,7 +5408,7 @@ voicegroup_843F1BC:: @ 843F1BC voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 0 @ 843F204 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F210 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F21C - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 242 @ 843F228 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 242 @ 843F228 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F234 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F240 voice_square_1 0, 2, 0, 0, 15, 0 @ 843F24C @@ -8387,7 +8387,7 @@ voicegroup_8447A00:: @ 8447A00 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447A48 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447A54 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447A60 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249 @ 8447A6C + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249 @ 8447A6C voice_square_1 0, 2, 0, 0, 15, 0 @ 8447A78 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447A84 voice_square_1 0, 2, 0, 0, 15, 0 @ 8447A90 @@ -9391,7 +9391,7 @@ voicegroup_844A7F0:: @ 844A7F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A838 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A844 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A850 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249 @ 844A85C + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249 @ 844A85C voice_square_1 0, 2, 0, 0, 15, 0 @ 844A868 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A874 voice_square_1 0, 2, 0, 0, 15, 0 @ 844A880 @@ -9784,7 +9784,7 @@ voicegroup_844B9F0:: @ 844B9F0 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA38 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA44 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA50 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249 @ 844BA5C + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249 @ 844BA5C voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA68 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA74 voice_square_1 0, 2, 0, 0, 15, 0 @ 844BA80 @@ -12006,7 +12006,7 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound_no_resample 60, 0, DirectSoundWaveData_Ring, 255, 249, 0, 165 @ 8451F90 voice_directsound_alt 60, 0, DirectSoundWaveData_Ring, 255, 0, 255, 165 @ 8451F9C voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 0, 255, 165 @ 8451FA8 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 242, 0, 127 @ 8451FB4 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 242, 0, 127 @ 8451FB4 voice_noise_alt 0, 0, 1, 0, 1 @ 8451FC0 voice_noise_alt 1, 0, 1, 0, 1 @ 8451FCC voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 255, 165 @ 8451FD8 @@ -12031,7 +12031,7 @@ voicegroup_8451F90:: @ 8451F90 voice_noise_alt 0, 0, 7, 15, 1 @ 84520BC voice_directsound 60, 0, DirectSoundWaveData_SC88_CarCrash, 255, 0, 255, 127 @ 84520C8 voice_noise_alt 1, 0, 7, 15, 1 @ 84520D4 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 246, 0, 127 @ 84520E0 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 246, 0, 127 @ 84520E0 voice_directsound 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 0, 255, 127 @ 84520EC voice_square_1_alt 19, 2, 0, 2, 0, 0 @ 84520F8 voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 0, 255, 127 @ 8452104 @@ -12046,7 +12046,7 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitClosedHiHat, 255, 127, 0, 188 @ 8452170 voice_directsound 60, 0, DirectSoundWaveData_Noise1, 255, 249, 0, 165 @ 845217C voice_square_1 0, 0, 4, 6, 0, 0 @ 8452188 - voice_directsound 60, 0, DirectSoundWaveData_8456330, 13, 0, 255, 127 @ 8452194 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 13, 0, 255, 127 @ 8452194 voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 13, 0, 255, 127 @ 84521A0 voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 0, 255, 127 @ 84521AC voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 252, 0, 204 @ 84521B8 @@ -12057,7 +12057,7 @@ voicegroup_8451F90:: @ 8451F90 voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 226, 0, 127 @ 84521F4 voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 26, 0, 255, 127 @ 8452200 voice_square_1_alt 0, 2, 0, 1, 0, 0 @ 845220C - voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 252, 0, 127 @ 8452218 + voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 252, 0, 127 @ 8452218 voice_square_1_alt 0, 1, 0, 2, 0, 0 @ 8452224 voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 127, 0, 127 @ 8452230 voice_noise_alt 0, 1, 6, 0, 0 @ 845223C @@ -12125,12 +12125,12 @@ voicegroup_8451F90:: @ 8451F90 voice_square_1 0, 2, 0, 0, 15, 0 @ 8452524 voice_square_1 0, 2, 0, 0, 15, 0 @ 8452530 voice_square_1 0, 2, 0, 0, 15, 0 @ 845253C - voice_directsound 60, 0, DirectSoundWaveData_84A7328, 255, 0, 255, 165 @ 8452548 - voice_directsound 60, 0, DirectSoundWaveData_84A7F38, 255, 0, 255, 165 @ 8452554 - voice_directsound 60, 0, DirectSoundWaveData_84A8AC8, 255, 0, 255, 165 @ 8452560 - voice_directsound 60, 0, DirectSoundWaveData_84A9564, 255, 0, 255, 165 @ 845256C - voice_directsound 60, 0, DirectSoundWaveData_84A9EAC, 255, 0, 255, 165 @ 8452578 - voice_directsound 60, 0, DirectSoundWaveData_84AA8F4, 255, 0, 255, 165 @ 8452584 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel1, 255, 0, 255, 165 @ 8452548 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel2, 255, 0, 255, 165 @ 8452554 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel3, 255, 0, 255, 165 @ 8452560 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel4, 255, 0, 255, 165 @ 845256C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel5, 255, 0, 255, 165 @ 8452578 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel6, 255, 0, 255, 165 @ 8452584 .align 2 voicegroup_8452590:: @ 8452590 @@ -12934,57 +12934,57 @@ voicegroup_84549C0:: @ 84549C0 .align 2 voicegroup_84549F0:: @ 84549F0 - voice_directsound 60, 0, DirectSoundWaveData_8639898, 255, 0, 255, 0 @ 84549F0 - voice_directsound 60, 0, DirectSoundWaveData_8639EF8, 255, 0, 255, 0 @ 84549FC - voice_directsound 60, 0, DirectSoundWaveData_863A3DC, 255, 0, 255, 0 @ 8454A08 - voice_directsound 60, 0, DirectSoundWaveData_863AD2C, 255, 0, 255, 0 @ 8454A14 - voice_directsound 60, 0, DirectSoundWaveData_863B79C, 255, 0, 255, 0 @ 8454A20 - voice_directsound 60, 0, DirectSoundWaveData_863BABC, 255, 0, 255, 0 @ 8454A2C - voice_directsound 60, 0, DirectSoundWaveData_863C744, 255, 0, 255, 0 @ 8454A38 - voice_directsound 60, 0, DirectSoundWaveData_863CD64, 255, 0, 255, 0 @ 8454A44 - voice_directsound 60, 0, DirectSoundWaveData_863D0EC, 255, 0, 255, 0 @ 8454A50 - voice_directsound 60, 0, DirectSoundWaveData_863DED0, 255, 0, 255, 0 @ 8454A5C - voice_directsound 60, 0, DirectSoundWaveData_863E840, 255, 0, 255, 0 @ 8454A68 - voice_directsound 60, 0, DirectSoundWaveData_863EBDC, 255, 0, 255, 0 @ 8454A74 - voice_directsound 60, 0, DirectSoundWaveData_863F390, 255, 0, 255, 0 @ 8454A80 - voice_directsound 60, 0, DirectSoundWaveData_86400EC, 255, 0, 255, 0 @ 8454A8C - voice_directsound 60, 0, DirectSoundWaveData_8640330, 255, 0, 255, 0 @ 8454A98 - voice_directsound 60, 0, DirectSoundWaveData_8641170, 255, 0, 255, 0 @ 8454AA4 - voice_directsound 60, 0, DirectSoundWaveData_8641AC4, 255, 0, 255, 0 @ 8454AB0 - voice_directsound 60, 0, DirectSoundWaveData_8641E18, 255, 0, 255, 0 @ 8454ABC - voice_directsound 60, 0, DirectSoundWaveData_864244C, 255, 0, 255, 0 @ 8454AC8 - voice_directsound 60, 0, DirectSoundWaveData_86430B8, 255, 0, 255, 0 @ 8454AD4 - voice_directsound 60, 0, DirectSoundWaveData_8643650, 255, 0, 255, 0 @ 8454AE0 - voice_directsound 60, 0, DirectSoundWaveData_8644154, 255, 0, 255, 0 @ 8454AEC - voice_directsound 60, 0, DirectSoundWaveData_8644758, 255, 0, 255, 0 @ 8454AF8 - voice_directsound 60, 0, DirectSoundWaveData_8644950, 255, 0, 255, 0 @ 8454B04 - voice_directsound 60, 0, DirectSoundWaveData_86452B4, 255, 0, 255, 0 @ 8454B10 - voice_directsound 60, 0, DirectSoundWaveData_8646240, 255, 0, 255, 0 @ 8454B1C - voice_directsound 60, 0, DirectSoundWaveData_8646878, 255, 0, 255, 0 @ 8454B28 - voice_directsound 60, 0, DirectSoundWaveData_864734C, 255, 0, 255, 0 @ 8454B34 - voice_directsound 60, 0, DirectSoundWaveData_8648290, 255, 0, 255, 0 @ 8454B40 - voice_directsound 60, 0, DirectSoundWaveData_8648808, 255, 0, 255, 0 @ 8454B4C - voice_directsound 60, 0, DirectSoundWaveData_8649654, 255, 0, 255, 0 @ 8454B58 - voice_directsound 60, 0, DirectSoundWaveData_864A55C, 255, 0, 255, 0 @ 8454B64 - voice_directsound 60, 0, DirectSoundWaveData_864B030, 255, 0, 255, 0 @ 8454B70 - voice_directsound 60, 0, DirectSoundWaveData_864BBC4, 255, 0, 255, 0 @ 8454B7C - voice_directsound 60, 0, DirectSoundWaveData_864C59C, 255, 0, 255, 0 @ 8454B88 - voice_directsound 60, 0, DirectSoundWaveData_864CBDC, 255, 0, 255, 0 @ 8454B94 - voice_directsound 60, 0, DirectSoundWaveData_864D6BC, 255, 0, 255, 0 @ 8454BA0 - voice_directsound 60, 0, DirectSoundWaveData_864DCF8, 255, 0, 255, 0 @ 8454BAC - voice_directsound 60, 0, DirectSoundWaveData_864E410, 255, 0, 255, 0 @ 8454BB8 - voice_directsound 60, 0, DirectSoundWaveData_864ED4C, 255, 0, 255, 0 @ 8454BC4 - voice_directsound 60, 0, DirectSoundWaveData_864F508, 255, 0, 255, 0 @ 8454BD0 - voice_directsound 60, 0, DirectSoundWaveData_864FA6C, 255, 0, 255, 0 @ 8454BDC - voice_directsound 60, 0, DirectSoundWaveData_86507E0, 255, 0, 255, 0 @ 8454BE8 - voice_directsound 60, 0, DirectSoundWaveData_8650C5C, 255, 0, 255, 0 @ 8454BF4 - voice_directsound 60, 0, DirectSoundWaveData_8651148, 255, 0, 255, 0 @ 8454C00 - voice_directsound 60, 0, DirectSoundWaveData_8651910, 255, 0, 255, 0 @ 8454C0C - voice_directsound 60, 0, DirectSoundWaveData_865250C, 255, 0, 255, 0 @ 8454C18 - voice_directsound 60, 0, DirectSoundWaveData_8652884, 255, 0, 255, 0 @ 8454C24 - voice_directsound 60, 0, DirectSoundWaveData_8653040, 255, 0, 255, 0 @ 8454C30 - voice_directsound 60, 0, DirectSoundWaveData_8653CA4, 255, 0, 255, 0 @ 8454C3C - voice_directsound 60, 0, DirectSoundWaveData_8654170, 255, 0, 255, 0 @ 8454C48 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel7, 255, 0, 255, 0 @ 84549F0 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel8, 255, 0, 255, 0 @ 84549FC + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel9, 255, 0, 255, 0 @ 8454A08 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel10, 255, 0, 255, 0 @ 8454A14 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel11, 255, 0, 255, 0 @ 8454A20 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel12, 255, 0, 255, 0 @ 8454A2C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel13, 255, 0, 255, 0 @ 8454A38 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel14, 255, 0, 255, 0 @ 8454A44 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel15, 255, 0, 255, 0 @ 8454A50 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel16, 255, 0, 255, 0 @ 8454A5C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel17, 255, 0, 255, 0 @ 8454A68 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel18, 255, 0, 255, 0 @ 8454A74 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel19, 255, 0, 255, 0 @ 8454A80 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel20, 255, 0, 255, 0 @ 8454A8C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel21, 255, 0, 255, 0 @ 8454A98 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel22, 255, 0, 255, 0 @ 8454AA4 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel23, 255, 0, 255, 0 @ 8454AB0 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel24, 255, 0, 255, 0 @ 8454ABC + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel25, 255, 0, 255, 0 @ 8454AC8 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel26, 255, 0, 255, 0 @ 8454AD4 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel27, 255, 0, 255, 0 @ 8454AE0 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel28, 255, 0, 255, 0 @ 8454AEC + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel29, 255, 0, 255, 0 @ 8454AF8 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel30, 255, 0, 255, 0 @ 8454B04 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel31, 255, 0, 255, 0 @ 8454B10 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel32, 255, 0, 255, 0 @ 8454B1C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel33, 255, 0, 255, 0 @ 8454B28 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel34, 255, 0, 255, 0 @ 8454B34 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel35, 255, 0, 255, 0 @ 8454B40 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel36, 255, 0, 255, 0 @ 8454B4C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel37, 255, 0, 255, 0 @ 8454B58 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel38, 255, 0, 255, 0 @ 8454B64 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel39, 255, 0, 255, 0 @ 8454B70 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel40, 255, 0, 255, 0 @ 8454B7C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel41, 255, 0, 255, 0 @ 8454B88 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel42, 255, 0, 255, 0 @ 8454B94 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel43, 255, 0, 255, 0 @ 8454BA0 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel44, 255, 0, 255, 0 @ 8454BAC + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel45, 255, 0, 255, 0 @ 8454BB8 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel46, 255, 0, 255, 0 @ 8454BC4 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel47, 255, 0, 255, 0 @ 8454BD0 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel48, 255, 0, 255, 0 @ 8454BDC + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel49, 255, 0, 255, 0 @ 8454BE8 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel50, 255, 0, 255, 0 @ 8454BF4 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel51, 255, 0, 255, 0 @ 8454C00 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel52, 255, 0, 255, 0 @ 8454C0C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel53, 255, 0, 255, 0 @ 8454C18 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel54, 255, 0, 255, 0 @ 8454C24 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel55, 255, 0, 255, 0 @ 8454C30 + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel56, 255, 0, 255, 0 @ 8454C3C + voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel57, 255, 0, 255, 0 @ 8454C48 .align 2 voicegroup_8454C54:: @ 8454C54 -- cgit v1.2.3 From e71789d6773c72e314d7b21684eaa9a48c704cd1 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 28 Jan 2018 22:19:49 -0600 Subject: remove unused file pokemon_data.c and clean up roulette_util.c --- src/pokemon/pokemon_data.c | 12 ---- src/roulette_util.c | 162 +++++++++++++++++---------------------------- 2 files changed, 62 insertions(+), 112 deletions(-) delete mode 100644 src/pokemon/pokemon_data.c diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c deleted file mode 100644 index 3473b58c8..000000000 --- a/src/pokemon/pokemon_data.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "global.h" -#include "pokemon.h" -#include "constants/species.h" -#include "trainer.h" -#include "constants/abilities.h" -#include "constants/moves.h" -#include "constants/hold_effects.h" -#include "constants/items.h" -#include "sprite.h" -#include "data2.h" - - diff --git a/src/roulette_util.c b/src/roulette_util.c index 3d5b03a5c..f3eae5518 100644 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -13,12 +13,12 @@ void sub_8124918(struct UnkStruct0 *r0) { r0->var00 = 0; r0->var02 = 0; - memset((&r0->var04), 0, 0xC0); + memset(&r0->var04, 0, sizeof(r0->var04)); } u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) { - if (!(r1 < 0x10) || (r0->var04[r1].var00_7)) + if (!(r1 < 16) || (r0->var04[r1].var00_7)) return 0xFF; r0->var04[r1].var04.var00 = r2->var00; @@ -29,123 +29,82 @@ u8 sub_812492C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) r0->var04[r1].var04.var07_0 = r2->var07_0; r0->var04[r1].var04.var07_5 = r2->var07_5; r0->var04[r1].var04.var07_7 = r2->var07_7; - - - r0->var04[r1].var00_0 = 0x0; - r0->var04[r1].var00_7 = 0x1; - - r0->var04[r1].var02 = 0x0; - r0->var04[r1].var01 = 0x0; + r0->var04[r1].var00_0 = 0; + r0->var04[r1].var00_7 = 1; + r0->var04[r1].var02 = 0; + r0->var04[r1].var01 = 0; if (r0->var04[r1].var04.var07_7 < 0) r0->var04[r1].var03 = 0xFF; else - r0->var04[r1].var03 = 0x1; + r0->var04[r1].var03 = 1; return r1; } -#ifdef NONMATCHING u8 unref_sub_81249B0(struct UnkStruct0 *r0, u8 r1) { - if (r1 < 0x10) - { - if (r0->var04[r1].var00_7) - { - r0->var04[r1] = (struct UnkStruct3){0}; - return r1; - } - } - return 0xFF; -} -#else -__attribute__((naked)) -u8 unref_sub_81249B0(struct UnkStruct0 *r0 , u8 r1) -{ - asm(".syntax unified\n\ - push {r4,lr}\n\ - adds r2, r0, 0\n\ - lsls r1, 24\n\ - lsrs r1, 24\n\ - adds r4, r1, 0\n\ - cmp r4, 0xF\n\ - bhi _081249DC\n\ - lsls r0, r4, 1\n\ - adds r0, r4\n\ - lsls r0, 2\n\ - adds r1, r2, r0\n\ - ldrb r0, [r1, 0x4]\n\ - lsrs r0, 7\n\ - cmp r0, 0\n\ - beq _081249DC\n\ - adds r0, r1, 0x4\n\ - movs r1, 0\n\ - movs r2, 0xC\n\ - bl memset\n\ - adds r0, r4, 0\n\ - b _081249DE\n\ - _081249DC:\n\ - movs r0, 0xFF\n\ - _081249DE:\n\ - pop {r4}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided\n"); + if (r1 >= 16) + return 0xFF; + if (!r0->var04[r1].var00_7) + return 0xFF; + memset(&r0->var04[r1], 0, sizeof(r0->var04[r1])); + return r1; } -#endif u8 sub_81249E4(struct UnkStruct3 *r0) { u8 i; u8 returnval; + for (i = 0; i < r0->var04.var04; i++) { - u32 offset = r0->var04.var02 + i; - struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[offset]; - struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[offset]; - switch(r0->var00_0) + struct PlttData *faded = (struct PlttData *)&gPlttBufferFaded[r0->var04.var02 + i]; + struct PlttData *unfaded = (struct PlttData *)&gPlttBufferUnfaded[r0->var04.var02 + i]; + + switch (r0->var00_0) { - case 0x1: - if ((u32)(faded->r + r0->var03) < 0x20) + case 1: + if (faded->r + r0->var03 >= 0 && faded->r + r0->var03 < 32) faded->r += r0->var03; - if ((u32)(faded->g + r0->var03) < 0x20) + if (faded->g + r0->var03 >= 0 && faded->g + r0->var03 < 32) faded->g += r0->var03; - if ((u32)(faded->b + r0->var03) < 0x20) + if (faded->b + r0->var03 >= 0 && faded->b + r0->var03 < 32) faded->b += r0->var03; - break; - case 0x2: + break; + case 2: if (r0->var03 < 0) { - if (!(faded->r + r0->var03 < unfaded->r)) + if (faded->r + r0->var03 >= unfaded->r) faded->r += r0->var03; - if (!(faded->g + r0->var03 < unfaded->g)) + if (faded->g + r0->var03 >= unfaded->g) faded->g += r0->var03; - if (!(faded->b + r0->var03 < unfaded->b)) + if (faded->b + r0->var03 >= unfaded->b) faded->b += r0->var03; } else { - if (!(faded->r + r0->var03 > unfaded->r)) + if (faded->r + r0->var03 <= unfaded->r) faded->r += r0->var03; - if (!(faded->g + r0->var03 > unfaded->g)) + if (faded->g + r0->var03 <= unfaded->g) faded->g += r0->var03; - if (!(faded->b + r0->var03 > unfaded->b)) + if (faded->b + r0->var03 <= unfaded->b) faded->b += r0->var03; } - break; + break; } } - if (((u32)r0->var02++) != r0->var04.var07_0) + if ((u32)r0->var02++ != r0->var04.var07_0) { - returnval = 0x0; + returnval = 0; } else { - r0->var02 = 0x0; - r0->var03 = r0->var03 * -1; - if (r0->var00_0 == 0x1) + r0->var02 = 0; + r0->var03 *= -1; + if (r0->var00_0 == 1) r0->var00_0++; else r0->var00_0--; - returnval = 0x1; + returnval = 1; } return returnval; } @@ -153,34 +112,36 @@ u8 sub_81249E4(struct UnkStruct3 *r0) u8 sub_8124BEC(struct UnkStruct3 *r0) { u8 rg2 = 0; + switch (r0->var00_0) { - case 0x1: + case 1: for (rg2 = 0; rg2 < r0->var04.var04; rg2++) gPlttBufferFaded[r0->var04.var02 + rg2] = r0->var04.var00; r0->var00_0++; break; - case 0x2: + case 2: for (rg2 = 0; rg2 < r0->var04.var04; rg2++) gPlttBufferFaded[r0->var04.var02 + rg2] = gPlttBufferUnfaded[r0->var04.var02 + rg2]; r0->var00_0--; break; } - return 0x1; + return 1; } void task_tutorial_controls_fadein(struct UnkStruct0 *r0) { u8 i = 0; + if (r0->var00) { - for (i = 0; i < 0x10; i++) + for (i = 0; i < 16; i++) { - if ((r0->var02 >> i) & 0x1) + if ((r0->var02 >> i) & 1) { - if (((u8)--r0->var04[i].var01) == 0xFF) // if underflow ? + if (--r0->var04[i].var01 == 0xFF) // if underflow ? { - if (r0->var04[i].var04.var00 & (0x80 << 8)) // PlttData->unused_15 ? + if (r0->var04[i].var04.var00 & 0x8000) // PlttData->unused_15 ? sub_81249E4(&r0->var04[i]); else sub_8124BEC(&r0->var04[i]); @@ -194,15 +155,16 @@ void task_tutorial_controls_fadein(struct UnkStruct0 *r0) void sub_8124CE8(struct UnkStruct0 *r0, u16 r1) { u8 i = 0; + r0->var00++; - for (i = 0; i < 0x10; i++) + for (i = 0; i < 16; i++) { - if ((r1 >> i) & 0x1) + if ((r1 >> i) & 1) { if (r0->var04[i].var00_7) { - r0->var02 |= 0x1 << i; - r0->var04[i].var00_0 = 0x1; + r0->var02 |= 1 << i; + r0->var04[i].var00_0 = 1; } } } @@ -211,21 +173,22 @@ void sub_8124CE8(struct UnkStruct0 *r0, u16 r1) void sub_8124D3C(struct UnkStruct0 *r0, u16 r1) { u8 i; - for (i = 0; i < 0x10; i++) + + for (i = 0; i < 16; i++) { - if ((r0->var02 >> i) & 0x1) + if ((r0->var02 >> i) & 1) { if (r0->var04[i].var00_7) { - if ((r1 >> i) & 0x1) + if ((r1 >> i) & 1) { u32 offset = r0->var04[i].var04.var02; u16 *faded = &gPlttBufferFaded[offset]; u16 *unfaded = &gPlttBufferUnfaded[offset]; memcpy(faded, unfaded, r0->var04[i].var04.var04 * 2); - r0->var04[i].var00_0 = 0x0; - r0->var04[i].var02 = 0x0; - r0->var04[i].var01 = 0x0; + r0->var04[i].var00_0 = 0; + r0->var04[i].var02 = 0; + r0->var04[i].var01 = 0; if (r0->var04[i].var04.var07_7 < 0) r0->var04[i].var03 = 0xFF; else @@ -236,8 +199,8 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1) } if (r1 == 0xFFFF) { - r0->var00 = 0x0; - r0->var02 = 0x0; + r0->var00 = 0; + r0->var02 = 0; } else { @@ -246,11 +209,10 @@ void sub_8124D3C(struct UnkStruct0 *r0, u16 r1) } void sub_8124DDC(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height) { - u16 *_dest; u8 i; u8 j; - i = 0x0; + i = 0; dest = &dest[top * 32 + left]; for (; i < height; i++) { @@ -267,7 +229,7 @@ void sub_8124E2C(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height) u16 *_src = src; u8 i; u8 j; - i = 0x0; + i = 0; dest = &dest[top * 32 + left]; for (; i < height; i++) { -- cgit v1.2.3 From 1416a4c4efe8b926c809664eb63dd2c3d0f86728 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 28 Jan 2018 23:10:53 -0600 Subject: clean up option_menu.c and field_poison.c a bit --- include/fldeff_poison.h | 4 +- src/battle/battle_setup.c | 2 +- src/engine/option_menu.c | 170 +++++++++++++++++++-------------------- src/field/field_control_avatar.c | 2 +- src/field/field_poison.c | 47 ++++++----- src/field/fldeff_poison.c | 4 +- 6 files changed, 114 insertions(+), 115 deletions(-) diff --git a/include/fldeff_poison.h b/include/fldeff_poison.h index fe3308ba9..abcacbd03 100644 --- a/include/fldeff_poison.h +++ b/include/fldeff_poison.h @@ -1,7 +1,7 @@ #ifndef GUARD_FLDEFF_POISON_H #define GUARD_FLDEFF_POISON_H -void DoFieldPoisonEffect(void); -bool32 FieldPoisonEffectIsRunning(void); +void FldeffPoison_Start(void); +bool32 FldeffPoison_IsActive(void); #endif // GUARD_FLDEFF_POISON_H diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 892be1029..15555f833 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -475,7 +475,7 @@ static void Task_BattleStart(u8 taskId) switch (tState) { case 0: - if (!FieldPoisonEffectIsRunning()) // is poison not active? + if (!FldeffPoison_IsActive()) // is poison not active? { BattleTransition_StartOnField(tTransition); tState++; // go to case 1. diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c index d4e921a0e..a2d32ffb6 100644 --- a/src/engine/option_menu.c +++ b/src/engine/option_menu.c @@ -10,19 +10,9 @@ extern void SetPokemonCryStereo(u32 val); -//Task data -enum { - TD_MENUSELECTION, - TD_TEXTSPEED, - TD_BATTLESCENE, - TD_BATTLESTYLE, - TD_SOUND, - TD_BUTTONMODE, - TD_FRAMETYPE, -}; - -//Menu items -enum { +// Menu items +enum +{ MENUITEM_TEXTSPEED, MENUITEM_BATTLESCENE, MENUITEM_BATTLESTYLE, @@ -32,6 +22,15 @@ enum { MENUITEM_CANCEL, }; +// Task data +#define tMenuSelection data[0] +#define tOptTextSpeed data[1] +#define tOptBattleScene data[2] +#define tOptBattleStyle data[3] +#define tOptSound data[4] +#define tOptButtonMode data[5] +#define tOptFrameType data[6] + const u16 gUnknown_0839F5FC[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); // note: this is only used in the Japanese release const u8 gUnknown_0839F63C[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp"); @@ -75,7 +74,6 @@ void CB2_InitOptionMenu(void) { default: case 0: - { SetVBlankCallback(NULL); REG_DISPCNT = 0; REG_BG2CNT = 0; @@ -92,7 +90,6 @@ void CB2_InitOptionMenu(void) DmaClear16(3, PLTT, PLTT_SIZE); gMain.state++; break; - } case 1: ResetPaletteFade(); ScanlineEffect_Stop(); @@ -150,37 +147,38 @@ void CB2_InitOptionMenu(void) { u8 taskId = CreateTask(Task_OptionMenuFadeIn, 0); - gTasks[taskId].data[TD_MENUSELECTION] = 0; - gTasks[taskId].data[TD_TEXTSPEED] = gSaveBlock2.optionsTextSpeed; - gTasks[taskId].data[TD_BATTLESCENE] = gSaveBlock2.optionsBattleSceneOff; - gTasks[taskId].data[TD_BATTLESTYLE] = gSaveBlock2.optionsBattleStyle; - gTasks[taskId].data[TD_SOUND] = gSaveBlock2.optionsSound; - gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2.optionsButtonMode; - gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2.optionsWindowFrameType; - - Menu_DrawStdWindowFrame(2, 0, 27, 3); - Menu_DrawStdWindowFrame(2, 4, 27, 19); - - Menu_PrintText(gSystemText_OptionMenu, 4, 1); - Menu_PrintText(gSystemText_TextSpeed, 4, 5); - Menu_PrintText(gSystemText_BattleScene, 4, 7); - Menu_PrintText(gSystemText_BattleStyle, 4, 9); - Menu_PrintText(gSystemText_Sound, 4, 11); - Menu_PrintText(gSystemText_ButtonMode, 4, 13); - Menu_PrintText(gSystemText_Frame, 4, 15); - Menu_PrintText(gSystemText_Cancel, 4, 17); - - TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]); - BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]); - BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]); - Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]); - ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]); - FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]); + gTasks[taskId].tMenuSelection = 0; + gTasks[taskId].tOptTextSpeed = gSaveBlock2.optionsTextSpeed; + gTasks[taskId].tOptBattleScene = gSaveBlock2.optionsBattleSceneOff; + gTasks[taskId].tOptBattleStyle = gSaveBlock2.optionsBattleStyle; + gTasks[taskId].tOptSound = gSaveBlock2.optionsSound; + gTasks[taskId].tOptButtonMode = gSaveBlock2.optionsButtonMode; + gTasks[taskId].tOptFrameType = gSaveBlock2.optionsWindowFrameType; + + Menu_DrawStdWindowFrame(2, 0, 27, 3); // title box + Menu_DrawStdWindowFrame(2, 4, 27, 19); // options list box + + Menu_PrintText(gSystemText_OptionMenu, 4, 1); + + Menu_PrintText(gSystemText_TextSpeed, 4, 5); + Menu_PrintText(gSystemText_BattleScene, 4, 7); + Menu_PrintText(gSystemText_BattleStyle, 4, 9); + Menu_PrintText(gSystemText_Sound, 4, 11); + Menu_PrintText(gSystemText_ButtonMode, 4, 13); + Menu_PrintText(gSystemText_Frame, 4, 15); + Menu_PrintText(gSystemText_Cancel, 4, 17); + + TextSpeed_DrawChoices(gTasks[taskId].tOptTextSpeed); + BattleScene_DrawChoices(gTasks[taskId].tOptBattleScene); + BattleStyle_DrawChoices(gTasks[taskId].tOptBattleStyle); + Sound_DrawChoices(gTasks[taskId].tOptSound); + ButtonMode_DrawChoices(gTasks[taskId].tOptButtonMode); + FrameType_DrawChoices(gTasks[taskId].tOptFrameType); REG_WIN0H = WIN_RANGE(17, 223); REG_WIN0V = WIN_RANGE(1, 31); - HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); + HighlightOptionMenuItem(gTasks[taskId].tMenuSelection); gMain.state++; break; } @@ -193,16 +191,14 @@ void CB2_InitOptionMenu(void) static void Task_OptionMenuFadeIn(u8 taskId) { if (!gPaletteFade.active) - { gTasks[taskId].func = Task_OptionMenuProcessInput; - } } static void Task_OptionMenuProcessInput(u8 taskId) { if (gMain.newKeys & A_BUTTON) { - if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL) + if (gTasks[taskId].tMenuSelection == MENUITEM_CANCEL) gTasks[taskId].func = Task_OptionMenuSave; } else if (gMain.newKeys & B_BUTTON) @@ -211,47 +207,47 @@ static void Task_OptionMenuProcessInput(u8 taskId) } else if (gMain.newKeys & DPAD_UP) { - if (gTasks[taskId].data[TD_MENUSELECTION] > 0) - gTasks[taskId].data[TD_MENUSELECTION]--; + if (gTasks[taskId].tMenuSelection > 0) + gTasks[taskId].tMenuSelection--; else - gTasks[taskId].data[TD_MENUSELECTION] = 6; - HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); + gTasks[taskId].tMenuSelection = 6; + HighlightOptionMenuItem(gTasks[taskId].tMenuSelection); } else if (gMain.newKeys & DPAD_DOWN) { - if (gTasks[taskId].data[TD_MENUSELECTION] <= 5) - gTasks[taskId].data[TD_MENUSELECTION]++; + if (gTasks[taskId].tMenuSelection < 6) + gTasks[taskId].tMenuSelection++; else - gTasks[taskId].data[TD_MENUSELECTION] = 0; - HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]); + gTasks[taskId].tMenuSelection = 0; + HighlightOptionMenuItem(gTasks[taskId].tMenuSelection); } else { - switch (gTasks[taskId].data[TD_MENUSELECTION]) + switch (gTasks[taskId].tMenuSelection) { case MENUITEM_TEXTSPEED: - gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]); - TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]); + gTasks[taskId].tOptTextSpeed = TextSpeed_ProcessInput(gTasks[taskId].tOptTextSpeed); + TextSpeed_DrawChoices(gTasks[taskId].tOptTextSpeed); break; case MENUITEM_BATTLESCENE: - gTasks[taskId].data[TD_BATTLESCENE] = BattleScene_ProcessInput(gTasks[taskId].data[TD_BATTLESCENE]); - BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]); + gTasks[taskId].tOptBattleScene = BattleScene_ProcessInput(gTasks[taskId].tOptBattleScene); + BattleScene_DrawChoices(gTasks[taskId].tOptBattleScene); break; case MENUITEM_BATTLESTYLE: - gTasks[taskId].data[TD_BATTLESTYLE] = BattleStyle_ProcessInput(gTasks[taskId].data[TD_BATTLESTYLE]); - BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]); + gTasks[taskId].tOptBattleStyle = BattleStyle_ProcessInput(gTasks[taskId].tOptBattleStyle); + BattleStyle_DrawChoices(gTasks[taskId].tOptBattleStyle); break; case MENUITEM_SOUND: - gTasks[taskId].data[TD_SOUND] = Sound_ProcessInput(gTasks[taskId].data[TD_SOUND]); - Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]); + gTasks[taskId].tOptSound = Sound_ProcessInput(gTasks[taskId].tOptSound); + Sound_DrawChoices(gTasks[taskId].tOptSound); break; case MENUITEM_BUTTONMODE: - gTasks[taskId].data[TD_BUTTONMODE] = ButtonMode_ProcessInput(gTasks[taskId].data[TD_BUTTONMODE]); - ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]); + gTasks[taskId].tOptButtonMode = ButtonMode_ProcessInput(gTasks[taskId].tOptButtonMode); + ButtonMode_DrawChoices(gTasks[taskId].tOptButtonMode); break; case MENUITEM_FRAMETYPE: - gTasks[taskId].data[TD_FRAMETYPE] = FrameType_ProcessInput(gTasks[taskId].data[TD_FRAMETYPE]); - FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]); + gTasks[taskId].tOptFrameType = FrameType_ProcessInput(gTasks[taskId].tOptFrameType); + FrameType_DrawChoices(gTasks[taskId].tOptFrameType); break; } } @@ -259,12 +255,12 @@ static void Task_OptionMenuProcessInput(u8 taskId) static void Task_OptionMenuSave(u8 taskId) { - gSaveBlock2.optionsTextSpeed = gTasks[taskId].data[TD_TEXTSPEED]; - gSaveBlock2.optionsBattleSceneOff = gTasks[taskId].data[TD_BATTLESCENE]; - gSaveBlock2.optionsBattleStyle = gTasks[taskId].data[TD_BATTLESTYLE]; - gSaveBlock2.optionsSound = gTasks[taskId].data[TD_SOUND]; - gSaveBlock2.optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE]; - gSaveBlock2.optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE]; + gSaveBlock2.optionsTextSpeed = gTasks[taskId].tOptTextSpeed; + gSaveBlock2.optionsBattleSceneOff = gTasks[taskId].tOptBattleScene; + gSaveBlock2.optionsBattleStyle = gTasks[taskId].tOptBattleStyle; + gSaveBlock2.optionsSound = gTasks[taskId].tOptSound; + gSaveBlock2.optionsButtonMode = gTasks[taskId].tOptButtonMode; + gSaveBlock2.optionsWindowFrameType = gTasks[taskId].tOptFrameType; BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); gTasks[taskId].func = Task_OptionMenuFadeOut; @@ -290,10 +286,10 @@ static void HighlightOptionMenuItem(u8 index) static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style) { - u8 dst[16]; + u8 dst[15]; u16 i; - for (i = 0; *text != EOS && i <= 14; i++) + for (i = 0; *text != EOS && i < 15; i++) dst[i] = *(text++); dst[2] = style; @@ -305,14 +301,14 @@ static u8 TextSpeed_ProcessInput(u8 selection) { if (gMain.newKeys & DPAD_RIGHT) { - if (selection <= 1) + if (selection < 2) selection++; else selection = 0; } if (gMain.newKeys & DPAD_LEFT) { - if (selection != 0) + if (selection > 0) selection--; else selection = 2; @@ -341,7 +337,7 @@ static void TextSpeed_DrawChoices(u8 selection) styles[selection] = 0x8; DrawOptionMenuChoice(gSystemText_Slow, TEXTSPEED_SLOW_LEFT, 40, styles[0]); - DrawOptionMenuChoice(gSystemText_Mid, TEXTSPEED_MIX_LEFT, 40, styles[1]); + DrawOptionMenuChoice(gSystemText_Mid, TEXTSPEED_MIX_LEFT, 40, styles[1]); DrawOptionMenuChoice(gSystemText_Fast, TEXTSPEED_FAST_LEFT, 40, styles[2]); } @@ -360,7 +356,7 @@ static void BattleScene_DrawChoices(u8 selection) styles[1] = 0xF; styles[selection] = 0x8; - DrawOptionMenuChoice(gSystemText_On, 120, 56, styles[0]); + DrawOptionMenuChoice(gSystemText_On, 120, 56, styles[0]); DrawOptionMenuChoice(gSystemText_Off, 190, 56, styles[1]); } @@ -388,7 +384,7 @@ static void BattleStyle_DrawChoices(u8 selection) styles[selection] = 0x8; DrawOptionMenuChoice(gSystemText_Shift, BATTLESTYLE_SHIFT, 72, styles[0]); - DrawOptionMenuChoice(gSystemText_Set, BATTLESTYLE_SET, 72, styles[1]); + DrawOptionMenuChoice(gSystemText_Set, BATTLESTYLE_SET, 72, styles[1]); } static u8 Sound_ProcessInput(u8 selection) @@ -409,7 +405,7 @@ static void Sound_DrawChoices(u8 selection) styles[1] = 0xF; styles[selection] = 0x8; - DrawOptionMenuChoice(gSystemText_Mono, 120, 88, styles[0]); + DrawOptionMenuChoice(gSystemText_Mono, 120, 88, styles[0]); DrawOptionMenuChoice(gSystemText_Stereo, 172, 88, styles[1]); } @@ -425,7 +421,7 @@ static u8 FrameType_ProcessInput(u8 selection) } if (gMain.newKeys & DPAD_LEFT) { - if (selection != 0) + if (selection > 0) selection--; else selection = 19; @@ -439,11 +435,11 @@ static u8 FrameType_ProcessInput(u8 selection) #if ENGLISH static void FrameType_DrawChoices(u8 selection) { - u8 text[8]; + u8 text[6]; u8 n = selection + 1; u16 i; - for (i = 0; gSystemText_Terminator[i] != EOS && i <= 5; i++) + for (i = 0; gSystemText_Terminator[i] != EOS && i < 6; i++) text[i] = gSystemText_Terminator[i]; //Convert number to decimal string @@ -534,14 +530,14 @@ static u8 ButtonMode_ProcessInput(u8 selection) { if (gMain.newKeys & DPAD_RIGHT) { - if (selection <= 1) + if (selection < 2) selection++; else selection = 0; } if (gMain.newKeys & DPAD_LEFT) { - if (selection != 0) + if (selection > 0) selection--; else selection = 2; @@ -559,6 +555,6 @@ static void ButtonMode_DrawChoices(u8 selection) styles[selection] = 0x8; DrawOptionMenuChoice(gSystemText_Normal, 120, 104, styles[0]); - DrawOptionMenuChoice(gSystemText_LR, 166, 104, styles[1]); - DrawOptionMenuChoice(gSystemText_LA, 188, 104, styles[2]); + DrawOptionMenuChoice(gSystemText_LR, 166, 104, styles[1]); + DrawOptionMenuChoice(gSystemText_LA, 188, 104, styles[2]); } diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index bf96c724f..83924b384 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -532,7 +532,7 @@ static void happiness_algorithm_step(void) { struct Pokemon *pkmn = gPlayerParty; - for (i = 5; i >= 0; i--) + for (i = 0; i < 6; i++) { AdjustFriendship(pkmn, 5); pkmn++; diff --git a/src/field/field_poison.c b/src/field/field_poison.c index 49678f269..8365351f9 100644 --- a/src/field/field_poison.c +++ b/src/field/field_poison.c @@ -43,7 +43,7 @@ void MonFaintFromPoisonOnField(u8 partyMember) u32 val = 0; AdjustFriendship(pkmn, 7); - SetMonData(pkmn, MON_DATA_STATUS, (u8*)&val); + SetMonData(pkmn, MON_DATA_STATUS, &val); GetMonData(pkmn, MON_DATA_NICKNAME, gStringVar1); StringGetEnd10(gStringVar1); } @@ -60,38 +60,36 @@ bool32 CheckMonFaintedFromPoison(u8 partyMember) return FALSE; } -//Task data -enum -{ - TD_STATE, - TD_PARTY_MEMBER, -}; +#define tState data[0] +#define tPartyMember data[1] void Task_WhiteOut(u8 taskId) { - s16 *taskData = gTasks[taskId].data; + s16 *data = gTasks[taskId].data; - switch (taskData[TD_STATE]) + switch (tState) { - case 0: //Check if Pokemon have fainted due to poison - while (taskData[TD_PARTY_MEMBER] < 6) + case 0: + // Check if any Pokemon have fainted due to poison + while (tPartyMember < 6) { - if (CheckMonFaintedFromPoison(taskData[TD_PARTY_MEMBER])) + if (CheckMonFaintedFromPoison(tPartyMember)) { - MonFaintFromPoisonOnField(taskData[TD_PARTY_MEMBER]); + // Show message about fainted mon + MonFaintFromPoisonOnField(tPartyMember); ShowFieldMessage(fieldPoisonText_PokemonFainted); - taskData[TD_STATE]++; + tState++; return; } - taskData[TD_PARTY_MEMBER]++; + tPartyMember++; } - taskData[TD_STATE] = 2; + tState = 2; break; - case 1: //Wait for message box to disappear + case 1: // Wait for message box to disappear if (IsFieldMessageBoxHidden()) - taskData[TD_STATE]--; //Check next party member + tState--; // Go to previous step and check next party member break; - case 2: //Done checking Pokemon + case 2: // done checking all mons if (AllMonsFainted()) gSpecialVar_Result = 1; else @@ -102,6 +100,9 @@ void Task_WhiteOut(u8 taskId) } } +#undef tState +#undef tPartyMember + void ExecuteWhiteOut(void) { CreateTask(Task_WhiteOut, 0x50); @@ -115,26 +116,28 @@ s32 DoPoisonFieldEffect(void) u32 numFainting = 0; int i; + // count the number of mons that are poisoned and fainting from poison, + // and decrement HP of all poisoned mons for (i = 0; i < 6; i++) { u32 hp; - // UB: Too few arguments for function 'GetMonData' if (GetMonData(pkmn, MON_DATA_SANITY_BIT2) != 0 && pokemon_ailments_get_primary(GetMonData(pkmn, MON_DATA_STATUS)) == 1) { + // decrement HP of poisoned mon hp = GetMonData(pkmn, MON_DATA_HP); if (hp != 0) hp--; if (hp == 0) - numFainting++; //Pokemon will now faint due to poison + numFainting++; SetMonData(pkmn, MON_DATA_HP, &hp); numPoisoned++; } pkmn++; } if (numFainting != 0 || numPoisoned != 0) - DoFieldPoisonEffect(); + FldeffPoison_Start(); if (numFainting != 0) return 2; if (numPoisoned != 0) diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c index b0052d59d..52afc2516 100644 --- a/src/field/fldeff_poison.c +++ b/src/field/fldeff_poison.c @@ -32,13 +32,13 @@ static void Task_FieldPoisonEffect(u8 taskId) REG_MOSAIC = (data[1] << 4) | data[1]; } -void DoFieldPoisonEffect(void) +void FldeffPoison_Start(void) { PlaySE(SE_DOKU); CreateTask(Task_FieldPoisonEffect, 80); } -bool32 FieldPoisonEffectIsRunning(void) +bool32 FldeffPoison_IsActive(void) { return FuncIsActiveTask(Task_FieldPoisonEffect); } -- cgit v1.2.3 From 9af005dfd0a84692fb1e632589df99b1e53ba802 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 28 Jan 2018 20:40:11 -0800 Subject: Start decompiling rock.s --- asm/rock.s | 359 ------------------------------------------------- ld_script.txt | 1 + src/battle/anim/rock.c | 149 ++++++++++++++++++++ 3 files changed, 150 insertions(+), 359 deletions(-) create mode 100644 src/battle/anim/rock.c diff --git a/asm/rock.s b/asm/rock.s index 98afb53e6..853338ce0 100644 --- a/asm/rock.s +++ b/asm/rock.s @@ -7,365 +7,6 @@ @ rock - thumb_func_start sub_80DCE9C -sub_80DCE9C: @ 80DCE9C - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, _080DCF08 @ =gBattleAnimArgs - movs r1, 0x6 - ldrsh r0, [r6, r1] - cmp r0, 0 - beq _080DCEBC - ldr r0, _080DCF0C @ =gAnimBankTarget - ldrb r0, [r0] - adds r2, r5, 0 - adds r2, 0x20 - adds r3, r5, 0 - adds r3, 0x22 - movs r1, 0 - bl sub_807A3FC -_080DCEBC: - ldrh r0, [r6] - ldrh r1, [r5, 0x20] - adds r0, r1 - movs r4, 0 - strh r0, [r5, 0x20] - ldrh r0, [r5, 0x22] - adds r0, 0xE - strh r0, [r5, 0x22] - ldrb r1, [r6, 0x2] - adds r0, r5, 0 - bl StartSpriteAnim - adds r0, r5, 0 - bl AnimateSprite - strh r4, [r5, 0x2E] - strh r4, [r5, 0x30] - movs r0, 0x4 - strh r0, [r5, 0x32] - movs r0, 0x10 - strh r0, [r5, 0x34] - ldr r0, _080DCF10 @ =0x0000ffba - strh r0, [r5, 0x36] - ldrh r0, [r6, 0x4] - strh r0, [r5, 0x38] - ldr r1, _080DCF14 @ =sub_80DCF1C - adds r0, r5, 0 - bl StoreSpriteCallbackInData - ldr r1, _080DCF18 @ =sub_8078278 - str r1, [r5, 0x1C] - adds r0, r5, 0 - bl _call_via_r1 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DCF08: .4byte gBattleAnimArgs -_080DCF0C: .4byte gAnimBankTarget -_080DCF10: .4byte 0x0000ffba -_080DCF14: .4byte sub_80DCF1C -_080DCF18: .4byte sub_8078278 - thumb_func_end sub_80DCE9C - - thumb_func_start sub_80DCF1C -sub_80DCF1C: @ 80DCF1C - push {r4,lr} - adds r4, r0, 0 - ldrh r1, [r4, 0x38] - ldrh r2, [r4, 0x20] - adds r0, r1, r2 - strh r0, [r4, 0x20] - movs r0, 0xC0 - strh r0, [r4, 0x2E] - strh r1, [r4, 0x30] - movs r0, 0x4 - strh r0, [r4, 0x32] - movs r0, 0x20 - strh r0, [r4, 0x34] - ldr r0, _080DCF54 @ =0x0000ffe8 - strh r0, [r4, 0x36] - ldr r1, _080DCF58 @ =move_anim_8074EE0 - adds r0, r4, 0 - bl StoreSpriteCallbackInData - ldr r1, _080DCF5C @ =sub_8078278 - str r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DCF54: .4byte 0x0000ffe8 -_080DCF58: .4byte move_anim_8074EE0 -_080DCF5C: .4byte sub_8078278 - thumb_func_end sub_80DCF1C - - thumb_func_start sub_80DCF60 -sub_80DCF60: @ 80DCF60 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080DCF88 @ =gBattleAnimArgs - ldrb r1, [r4, 0xA] - bl StartSpriteAnim - adds r0, r5, 0 - bl AnimateSprite - ldr r0, _080DCF8C @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DCF90 - ldrh r0, [r5, 0x20] - ldrh r1, [r4] - subs r0, r1 - b _080DCF96 - .align 2, 0 -_080DCF88: .4byte gBattleAnimArgs -_080DCF8C: .4byte gAnimBankAttacker -_080DCF90: - ldrh r0, [r4] - ldrh r1, [r5, 0x20] - adds r0, r1 -_080DCF96: - strh r0, [r5, 0x20] - ldr r3, _080DCFD8 @ =gBattleAnimArgs - ldrh r2, [r3, 0x2] - ldrh r0, [r5, 0x22] - adds r2, r0 - movs r4, 0 - strh r2, [r5, 0x22] - ldrh r0, [r3, 0x8] - strh r0, [r5, 0x2E] - ldrh r0, [r5, 0x20] - strh r0, [r5, 0x30] - ldrh r1, [r3, 0x4] - adds r0, r1 - strh r0, [r5, 0x32] - strh r2, [r5, 0x34] - ldrh r0, [r3, 0x6] - adds r2, r0 - strh r2, [r5, 0x36] - adds r0, r5, 0 - bl sub_8078A5C - strh r4, [r5, 0x34] - strh r4, [r5, 0x36] - ldr r0, _080DCFDC @ =sub_8078394 - str r0, [r5, 0x1C] - ldr r1, _080DCFE0 @ =move_anim_8074EE0 - adds r0, r5, 0 - bl StoreSpriteCallbackInData - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DCFD8: .4byte gBattleAnimArgs -_080DCFDC: .4byte sub_8078394 -_080DCFE0: .4byte move_anim_8074EE0 - thumb_func_end sub_80DCF60 - - thumb_func_start sub_80DCFE4 -sub_80DCFE4: @ 80DCFE4 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080DCFFC @ =gBattleAnimArgs - movs r1, 0xC - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080DD000 - adds r0, r4, 0 - movs r1, 0 - bl sub_80787B0 - b _080DD008 - .align 2, 0 -_080DCFFC: .4byte gBattleAnimArgs -_080DD000: - adds r0, r4, 0 - movs r1, 0 - bl sub_8078764 -_080DD008: - ldr r1, _080DD024 @ =gBattleAnimArgs - ldrh r0, [r1, 0x6] - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x4] - strh r0, [r4, 0x30] - ldrh r0, [r1, 0x8] - strh r0, [r4, 0x32] - ldrh r0, [r1, 0xA] - strh r0, [r4, 0x34] - ldr r0, _080DD028 @ =sub_80DD02C - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DD024: .4byte gBattleAnimArgs -_080DD028: .4byte sub_80DD02C - thumb_func_end sub_80DCFE4 - - thumb_func_start sub_80DD02C -sub_80DD02C: @ 80DD02C - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x30] - ldrh r1, [r4, 0x36] - adds r0, r1 - strh r0, [r4, 0x36] - lsls r0, 16 - asrs r0, 24 - negs r0, r0 - strh r0, [r4, 0x26] - movs r2, 0x38 - ldrsh r0, [r4, r2] - movs r2, 0x34 - ldrsh r1, [r4, r2] - bl Sin - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x32] - ldrh r1, [r4, 0x38] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x38] - ldrh r0, [r4, 0x2E] - subs r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080DD072 - adds r0, r4, 0 - bl DestroyAnimSprite -_080DD072: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DD02C - - thumb_func_start do_boulder_dust -do_boulder_dust: @ 80DD078 - push {r4-r6,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r6, r0, 24 - movs r5, 0 - ldr r1, _080DD154 @ =REG_BLDCNT - ldr r2, _080DD158 @ =0x00003f42 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - movs r2, 0x80 - lsls r2, 5 - adds r0, r2, 0 - strh r0, [r1] - ldr r4, _080DD15C @ =REG_BG1CNT - ldrb r1, [r4] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r4] - ldrb r1, [r4, 0x1] - movs r0, 0x3F - ands r0, r1 - strb r0, [r4, 0x1] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DD0C4 - ldrb r0, [r4] - movs r1, 0xD - negs r1, r1 - ands r1, r0 - movs r0, 0x4 - orrs r1, r0 - strb r1, [r4] -_080DD0C4: - ldr r0, _080DD160 @ =gBattle_BG1_X - strh r5, [r0] - ldr r0, _080DD164 @ =gBattle_BG1_Y - strh r5, [r0] - ldr r0, _080DD168 @ =REG_BG1HOFS - strh r5, [r0] - adds r0, 0x2 - strh r5, [r0] - mov r0, sp - bl sub_8078914 - ldr r1, [sp, 0x4] - str r5, [sp, 0xC] - ldr r2, _080DD16C @ =0x040000d4 - add r0, sp, 0xC - str r0, [r2] - str r1, [r2, 0x4] - ldr r0, _080DD170 @ =0x85000400 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - ldr r0, _080DD174 @ =gBattleAnimBackgroundTilemap_SandstormBrew - bl LZDecompressVram - ldr r0, _080DD178 @ =gBattleAnimBackgroundImage_SandstormBrew - ldr r1, [sp] - bl LZDecompressVram - ldr r0, _080DD17C @ =gBattleAnimSpritePalette_261 - mov r1, sp - ldrb r1, [r1, 0x8] - lsls r1, 4 - movs r2, 0x20 - bl LoadCompressedPalette - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DD120 - mov r0, sp - ldrb r0, [r0, 0x8] - ldr r1, [sp, 0x4] - movs r2, 0 - movs r3, 0 - bl sub_80763FC -_080DD120: - ldr r0, _080DD180 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _080DD13A - ldr r0, _080DD184 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DD13A - movs r5, 0x1 -_080DD13A: - ldr r0, _080DD188 @ =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r1, r0 - strh r5, [r1, 0x8] - ldr r0, _080DD18C @ =sub_80DD190 - str r0, [r1] - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DD154: .4byte REG_BLDCNT -_080DD158: .4byte 0x00003f42 -_080DD15C: .4byte REG_BG1CNT -_080DD160: .4byte gBattle_BG1_X -_080DD164: .4byte gBattle_BG1_Y -_080DD168: .4byte REG_BG1HOFS -_080DD16C: .4byte 0x040000d4 -_080DD170: .4byte 0x85000400 -_080DD174: .4byte gBattleAnimBackgroundTilemap_SandstormBrew -_080DD178: .4byte gBattleAnimBackgroundImage_SandstormBrew -_080DD17C: .4byte gBattleAnimSpritePalette_261 -_080DD180: .4byte gBattleAnimArgs -_080DD184: .4byte gAnimBankAttacker -_080DD188: .4byte gTasks -_080DD18C: .4byte sub_80DD190 - thumb_func_end do_boulder_dust - thumb_func_start sub_80DD190 sub_80DD190: @ 80DD190 push {r4-r7,lr} diff --git a/ld_script.txt b/ld_script.txt index fc13444f1..d37b73e6d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -295,6 +295,7 @@ SECTIONS { asm/flying.o(.text); asm/psychic.o(.text); src/battle/anim/bug.o(.text); + src/battle/anim/rock.o(.text); asm/rock.o(.text); asm/ghost.o(.text); src/battle/anim/dragon.o(.text); diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c new file mode 100644 index 000000000..d4307e7c1 --- /dev/null +++ b/src/battle/anim/rock.c @@ -0,0 +1,149 @@ +#include "global.h" +#include "battle.h" +#include "battle_anim.h" +#include "decompress.h" +#include "palette.h" +#include "rom_8077ABC.h" +#include "task.h" +#include "trig.h" + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; + +extern const u8 gBattleAnimBackgroundTilemap_SandstormBrew[]; +extern const u8 gBattleAnimBackgroundImage_SandstormBrew[]; +extern const u16 gBattleAnimSpritePalette_261[]; + +static void sub_80DCF1C(struct Sprite *sprite); +static void sub_80DD02C(struct Sprite *sprite); +void sub_80DD190(u8 taskId); + + +void sub_80DCE9C(struct Sprite *sprite) +{ + if (gBattleAnimArgs[3] != 0) + sub_807A3FC(gAnimBankTarget, 0, &sprite->pos1.x, &sprite->pos1.y); + + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += 14; + + StartSpriteAnim(sprite, gBattleAnimArgs[1]); + AnimateSprite(sprite); + + sprite->data[0] = 0; + sprite->data[1] = 0; + sprite->data[2] = 4; + sprite->data[3] = 16; + sprite->data[4] = -70; + sprite->data[5] = gBattleAnimArgs[2]; + + StoreSpriteCallbackInData(sprite, sub_80DCF1C); + sprite->callback = sub_8078278; + sprite->callback(sprite); +} + +static void sub_80DCF1C(struct Sprite *sprite) +{ + sprite->pos1.x += sprite->data[5]; + + sprite->data[0] = 192; + sprite->data[1] = sprite->data[5]; + sprite->data[2] = 4; + sprite->data[3] = 32; + sprite->data[4] = -24; + + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); + sprite->callback = sub_8078278; + sprite->callback(sprite); +} + +void sub_80DCF60(struct Sprite *sprite) +{ + StartSpriteAnim(sprite, gBattleAnimArgs[5]); + AnimateSprite(sprite); + + if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) + sprite->pos1.x -= gBattleAnimArgs[0]; + else + sprite->pos1.x += gBattleAnimArgs[0]; + + sprite->pos1.y += gBattleAnimArgs[1]; + + sprite->data[0] = gBattleAnimArgs[4]; + sprite->data[1] = sprite->pos1.x; + sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; + sprite->data[3] = sprite->pos1.y; + sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3]; + + sub_8078A5C(sprite); + sprite->data[3] = 0; + sprite->data[4] = 0; + + sprite->callback = sub_8078394; + StoreSpriteCallbackInData(sprite, move_anim_8074EE0); +} + +void sub_80DCFE4(struct Sprite *sprite) +{ + if (gBattleAnimArgs[6] == 0) + sub_80787B0(sprite, 0); + else + sub_8078764(sprite, 0); + + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = gBattleAnimArgs[2]; + sprite->data[2] = gBattleAnimArgs[4]; + sprite->data[3] = gBattleAnimArgs[5]; + + sprite->callback = sub_80DD02C; +} + +static void sub_80DD02C(struct Sprite *sprite) +{ + sprite->data[4] += sprite->data[1]; + sprite->pos2.y = -(sprite->data[4] >> 8); + sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]); + sprite->data[5] = (sprite->data[5] + sprite->data[2]) & 0xFF; + + if (--sprite->data[0] == -1) + { + DestroyAnimSprite(sprite); + } +} + +void do_boulder_dust(u8 taskId) +{ + struct Struct_sub_8078914 subStruct; + int var0 = 0; + + REG_BLDCNT = 0x3F42; + REG_BLDALPHA = 0x1000; + REG_BG1CNT_BITFIELD.priority = 1; + REG_BG1CNT_BITFIELD.screenSize = 0; + + if (!IsContest()) + REG_BG1CNT_BITFIELD.charBaseBlock = 1; + + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + REG_BG1HOFS = 0; + REG_BG1VOFS = 0; + + sub_8078914(&subStruct); + DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000); + LZDecompressVram(&gBattleAnimBackgroundTilemap_SandstormBrew, subStruct.field_4); + LZDecompressVram(&gBattleAnimBackgroundImage_SandstormBrew, subStruct.field_0); + LoadCompressedPalette(&gBattleAnimSpritePalette_261, subStruct.field_8 << 4, 32); + + if (IsContest()) + sub_80763FC(subStruct.field_8, (u16 *)subStruct.field_4, 0, 0); + + if (gBattleAnimArgs[0] != 0 && GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) + var0 = 1; + + gTasks[taskId].data[0] = var0; + gTasks[taskId].func = sub_80DD190; +} -- cgit v1.2.3 From cb9aec12785894d727583d13b0152c6d32948553 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 29 Jan 2018 15:08:10 -0600 Subject: integrate debug code in pokenav_before.c --- include/link.h | 1 + src/pokenav_before.c | 5048 ++------------------------------------------------ 2 files changed, 189 insertions(+), 4860 deletions(-) diff --git a/include/link.h b/include/link.h index e8dfc333a..6a7212645 100644 --- a/include/link.h +++ b/include/link.h @@ -195,6 +195,7 @@ void LinkVSync(void); void Timer3Intr(void); void SerialCB(void); void LinkTestScreen(void); +void debug_sub_8008218(u16 *buffer, void *arg1, u16 (*arg2)[], u32 arg3); void debug_sub_8008264(u32 value, int left, int top, int r3, int sp0); u32 sub_8007E40(void); diff --git a/src/pokenav_before.c b/src/pokenav_before.c index b645136dc..4c55a5673 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -20,8 +20,6 @@ #include "text.h" #include "scanline_effect.h" -extern u8 ewram[]; - struct UnknownPokenav0 { /* 0x0000 */ u8 var0[0x0300]; @@ -472,315 +470,6 @@ void sub_80EBDBC(void (*func)(void)) ewram0_10.var304 = 0; } -#if DEBUG -__attribute__((naked)) -void sub_80EBDD8() -{ - asm("\ - push {lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._64 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r2, r1, #0\n\ - cmp r0, #0x11\n\ - bls ._62 @cond_branch\n\ - b ._131\n\ -._62:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._64 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._65:\n\ - .align 2, 0\n\ -._64:\n\ - .word gSharedMem\n\ - .word ._66\n\ -._66:\n\ - .word ._67\n\ - .word ._68\n\ - .word ._69\n\ - .word ._70\n\ - .word ._71\n\ - .word ._72\n\ - .word ._73\n\ - .word ._74\n\ - .word ._75\n\ - .word ._76\n\ - .word ._77\n\ - .word ._78\n\ - .word ._79\n\ - .word ._80\n\ - .word ._81\n\ - .word ._82\n\ - .word ._83\n\ - .word ._84\n\ -._67:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - mov r1, #0x80\n\ - lsl r1, r1, #0x13\n\ - mov r0, #0x0\n\ - strh r0, [r1]\n\ - ldr r1, ._86 @ gSharedMem\n\ - ldr r3, ._86 + 4 @ 0x6ddc\n\ - add r0, r1, r3\n\ - ldrb r2, [r0]\n\ - sub r3, r3, #0x2f\n\ - add r0, r1, r3\n\ - strb r2, [r0]\n\ - ldr r0, ._86 + 8 @ 0x6dae\n\ - add r2, r1, r0\n\ - mov r0, #0x5\n\ - strb r0, [r2]\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._124\n\ -._87:\n\ - .align 2, 0\n\ -._86:\n\ - .word gSharedMem\n\ - .word 0x6ddc\n\ - .word 0x6dae\n\ -._68:\n\ - bl sub_80F3FF0\n\ - ldr r1, ._91 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._69:\n\ - bl sub_80F4024\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._88 @cond_branch\n\ - b ._131\n\ -._88:\n\ - ldr r1, ._91 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._124\n\ -._92:\n\ - .align 2, 0\n\ -._91:\n\ - .word gSharedMem\n\ -._70:\n\ - bl sub_80F2598\n\ - ldr r1, ._94 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._124\n\ -._95:\n\ - .align 2, 0\n\ -._94:\n\ - .word gSharedMem\n\ -._71:\n\ - bl sub_80EEE20\n\ - ldr r1, ._99 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._72:\n\ - bl sub_80EEE54\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._96 @cond_branch\n\ - b ._131\n\ -._96:\n\ - bl sub_80EEE08\n\ - ldr r1, ._99 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._124\n\ -._100:\n\ - .align 2, 0\n\ -._99:\n\ - .word gSharedMem\n\ -._73:\n\ - mov r0, #0x0\n\ - bl sub_80EF248\n\ - ldr r1, ._104 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._74:\n\ - mov r0, #0x0\n\ - bl sub_80EF284\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._101 @cond_branch\n\ - b ._131\n\ -._101:\n\ - b ._110\n\ -._105:\n\ - .align 2, 0\n\ -._104:\n\ - .word gSharedMem\n\ -._75:\n\ - mov r0, #0x0\n\ - bl sub_80F1B8C\n\ - ldr r1, ._108 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._76:\n\ - mov r0, #0x0\n\ - bl sub_80F1BC8\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._131 @cond_branch\n\ - ldr r1, ._108 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._124\n\ -._109:\n\ - .align 2, 0\n\ -._108:\n\ - .word gSharedMem\n\ -._77:\n\ - ldr r0, ._111 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - b ._110\n\ -._112:\n\ - .align 2, 0\n\ -._111:\n\ - .word sub_80EBD18+1\n\ -._78:\n\ - mov r0, #0x1\n\ - neg r0, r0\n\ - mov r1, #0x0\n\ - str r1, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r1, ._114 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._124\n\ -._115:\n\ - .align 2, 0\n\ -._114:\n\ - .word gSharedMem\n\ -._79:\n\ - mov r0, #0x0\n\ - bl sub_80EED2C\n\ - ldr r1, ._117 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._124\n\ -._118:\n\ - .align 2, 0\n\ -._117:\n\ - .word gSharedMem\n\ -._80:\n\ - ldr r0, ._121 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._131 @cond_branch\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r2, r3\n\ - b ._124\n\ -._122:\n\ - .align 2, 0\n\ -._121:\n\ - .word gPaletteFade\n\ -._81:\n\ - mov r0, #0x0\n\ - bl sub_80F2C80\n\ - ldr r1, ._125 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._82:\n\ - mov r0, #0x0\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._131 @cond_branch\n\ - ldr r1, ._125 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._124\n\ -._126:\n\ - .align 2, 0\n\ -._125:\n\ - .word gSharedMem\n\ -._83:\n\ - bl sub_80F1DF0\n\ -._110:\n\ - ldr r1, ._128 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ -._124:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._131\n\ -._129:\n\ - .align 2, 0\n\ -._128:\n\ - .word gSharedMem\n\ -._84:\n\ - bl sub_80F1E50\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._131 @cond_branch\n\ - mov r0, #0x0\n\ - mov r1, #0x0\n\ - bl sub_80EF428\n\ - ldr r0, ._132 @ sub_80EC268\n\ - bl sub_80EBDBC\n\ - ldr r0, ._132 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._131 @cond_branch\n\ - ldr r0, ._132 + 8 @ 0x6007de0\n\ - ldr r2, ._132 + 12 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ -._131:\n\ - add sp, sp, #0x4\n\ - pop {r0}\n\ - bx r0\n\ -._133:\n\ - .align 2, 0\n\ -._132:\n\ - .word sub_80EC268+1\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800"); -} -#else void sub_80EBDD8() { switch (ewram0_10.var304) @@ -864,289 +553,15 @@ void sub_80EBDD8() { sub_80EF428(0, 0); sub_80EBDBC(&sub_80EC268); +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif } break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80EC00C() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._136 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0xd\n\ - bls ._134 @cond_branch\n\ - b ._191\n\ -._134:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._136 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._137:\n\ - .align 2, 0\n\ -._136:\n\ - .word gSharedMem\n\ - .word ._138\n\ -._138:\n\ - .word ._139\n\ - .word ._140\n\ - .word ._141\n\ - .word ._142\n\ - .word ._143\n\ - .word ._144\n\ - .word ._145\n\ - .word ._146\n\ - .word ._147\n\ - .word ._148\n\ - .word ._149\n\ - .word ._150\n\ - .word ._151\n\ - .word ._152\n\ -._139:\n\ - bl sub_80EEF78\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._153 @cond_branch\n\ - b ._191\n\ -._153:\n\ - ldr r0, ._156 @ sub_80EBD80\n\ - bl SetVBlankCallback\n\ - bl sub_80EED1C\n\ - ldr r4, ._156 + 4 @ gSharedMem\n\ - ldr r1, ._156 + 8 @ 0x6ddc\n\ - add r0, r4, r1\n\ - ldrb r1, [r0]\n\ - ldr r2, ._156 + 12 @ 0x6dad\n\ - add r0, r4, r2\n\ - strb r1, [r0]\n\ - ldr r0, ._156 + 16 @ 0x6dae\n\ - add r1, r4, r0\n\ - mov r0, #0x5\n\ - strb r0, [r1]\n\ - bl sub_80EEE08\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r4, r4, r1\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4]\n\ - b ._191\n\ -._157:\n\ - .align 2, 0\n\ -._156:\n\ - .word sub_80EBD80+1\n\ - .word gSharedMem\n\ - .word 0x6ddc\n\ - .word 0x6dad\n\ - .word 0x6dae\n\ -._140:\n\ - mov r0, #0x0\n\ - bl sub_80EF248\n\ - ldr r1, ._161 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._141:\n\ - mov r0, #0x0\n\ - bl sub_80EF284\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._158 @cond_branch\n\ - b ._191\n\ -._158:\n\ - ldr r1, ._161 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._184\n\ -._162:\n\ - .align 2, 0\n\ -._161:\n\ - .word gSharedMem\n\ -._142:\n\ - mov r0, #0x0\n\ - bl sub_80F1B8C\n\ - ldr r1, ._166 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._143:\n\ - mov r0, #0x0\n\ - bl sub_80F1BC8\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._163 @cond_branch\n\ - b ._191\n\ -._163:\n\ - ldr r1, ._166 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._184\n\ -._167:\n\ - .align 2, 0\n\ -._166:\n\ - .word gSharedMem\n\ -._144:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._191 @cond_branch\n\ - b ._169\n\ -._145:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._171 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._184\n\ -._172:\n\ - .align 2, 0\n\ -._171:\n\ - .word sub_80EBD18+1\n\ -._146:\n\ - mov r0, #0x0\n\ - bl sub_80EED2C\n\ - ldr r1, ._174 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._184\n\ -._175:\n\ - .align 2, 0\n\ -._174:\n\ - .word gSharedMem\n\ -._147:\n\ - ldr r0, ._178 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._191 @cond_branch\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._184\n\ -._179:\n\ - .align 2, 0\n\ -._178:\n\ - .word gPaletteFade\n\ -._148:\n\ - bl sub_80F2598\n\ - ldr r1, ._181 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._184\n\ -._182:\n\ - .align 2, 0\n\ -._181:\n\ - .word gSharedMem\n\ -._149:\n\ - mov r0, #0x0\n\ - bl sub_80F2C80\n\ - ldr r1, ._185 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._150:\n\ - mov r0, #0x0\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._191 @cond_branch\n\ - ldr r1, ._185 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._184\n\ -._186:\n\ - .align 2, 0\n\ -._185:\n\ - .word gSharedMem\n\ -._151:\n\ - bl sub_80F1DF0\n\ -._169:\n\ - ldr r1, ._188 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ -._184:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._191\n\ -._189:\n\ - .align 2, 0\n\ -._188:\n\ - .word gSharedMem\n\ -._152:\n\ - bl sub_80F1E50\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._191 @cond_branch\n\ - ldr r0, ._192 @ gSharedMem\n\ - ldr r1, ._192 + 4 @ 0x6dad\n\ - add r0, r0, r1\n\ - ldrb r1, [r0]\n\ - mov r0, #0x0\n\ - bl sub_80EF428\n\ - ldr r0, ._192 + 8 @ sub_80EC268\n\ - bl sub_80EBDBC\n\ - ldr r0, ._192 + 12 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._191 @cond_branch\n\ - ldr r0, ._192 + 16 @ 0x6007de0\n\ - ldr r2, ._192 + 20 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ -._191:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._193:\n\ - .align 2, 0\n\ -._192:\n\ - .word gSharedMem\n\ - .word 0x6dad\n\ - .word sub_80EC268+1\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800"); -} -#else void sub_80EC00C() { switch (ewram0_10.var304) @@ -1216,11 +631,14 @@ void sub_80EC00C() { sub_80EF428(0, ewram0_10.var6dad); sub_80EBDBC(&sub_80EC268); +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif } break; } } -#endif void sub_80EC210() { @@ -1342,262 +760,6 @@ void sub_80EC268() } } -#if DEBUG -__attribute__((naked)) -void sub_80EC4A0() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._285 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0xe\n\ - bls ._283 @cond_branch\n\ - b ._340\n\ -._283:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._285 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._286:\n\ - .align 2, 0\n\ -._285:\n\ - .word gSharedMem\n\ - .word ._287\n\ -._287:\n\ - .word ._288\n\ - .word ._289\n\ - .word ._290\n\ - .word ._291\n\ - .word ._292\n\ - .word ._293\n\ - .word ._294\n\ - .word ._295\n\ - .word ._296\n\ - .word ._297\n\ - .word ._298\n\ - .word ._299\n\ - .word ._300\n\ - .word ._301\n\ - .word ._302\n\ -._288:\n\ - bl sub_80F1E84\n\ - mov r0, #0x0\n\ - bl sub_80F2D04\n\ - b ._336\n\ -._289:\n\ - bl sub_80F1F10\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._304 @cond_branch\n\ - b ._340\n\ -._304:\n\ - ldr r0, ._308 @ gSaveBlock2\n\ - ldrb r1, [r0, #0x15]\n\ - mov r0, #0x8\n\ - and r0, r0, r1\n\ - mov r1, #0x8\n\ - cmp r0, #0\n\ - beq ._306 @cond_branch\n\ - mov r1, #0x7\n\ -._306:\n\ - add r0, r1, #0\n\ - bl sub_80EEFBC\n\ - ldr r1, ._308 + 4 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._335\n\ -._309:\n\ - .align 2, 0\n\ -._308:\n\ - .word gSaveBlock2\n\ - .word gSharedMem\n\ -._290:\n\ - bl sub_80EEF34\n\ - lsl r0, r0, #0x18\n\ - lsr r2, r0, #0x18\n\ - cmp r2, #0\n\ - beq ._310 @cond_branch\n\ - b ._340\n\ -._310:\n\ - ldr r4, ._313 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - str r2, [sp]\n\ - mov r2, #0x0\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._335\n\ -._314:\n\ - .align 2, 0\n\ -._313:\n\ - .word gSharedMem\n\ -._291:\n\ - ldr r0, ._318 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._315 @cond_branch\n\ - b ._340\n\ -._315:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - b ._336\n\ -._319:\n\ - .align 2, 0\n\ -._318:\n\ - .word gPaletteFade\n\ -._292:\n\ - bl sub_80F2620\n\ - ldr r1, ._321 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._335\n\ -._322:\n\ - .align 2, 0\n\ -._321:\n\ - .word gSharedMem\n\ -._293:\n\ - bl sub_80EF814\n\ - b ._336\n\ -._294:\n\ - bl sub_80EF840\n\ - ldr r1, ._326 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._295:\n\ - bl sub_80EF874\n\ -._328:\n\ - lsl r0, r0, #0x18\n\ -._334:\n\ - cmp r0, #0\n\ - bne ._340 @cond_branch\n\ - b ._336\n\ -._327:\n\ - .align 2, 0\n\ -._326:\n\ - .word gSharedMem\n\ -._296:\n\ - mov r0, #0x4\n\ - bl sub_80F2C80\n\ - ldr r1, ._329 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._297:\n\ - mov r0, #0x4\n\ - bl sub_80F2CBC\n\ - b ._328\n\ -._330:\n\ - .align 2, 0\n\ -._329:\n\ - .word gSharedMem\n\ -._298:\n\ - bl sub_80F2DD8\n\ - ldr r0, ._332 @ sub_80EBD30\n\ - bl SetVBlankCallback\n\ - ldr r1, ._332 + 4 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._335\n\ -._333:\n\ - .align 2, 0\n\ -._332:\n\ - .word sub_80EBD30+1\n\ - .word gSharedMem\n\ -._299:\n\ - bl sub_8055870\n\ - b ._334\n\ -._300:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._335\n\ -._301:\n\ - mov r0, #0x1\n\ - bl sub_80EED2C\n\ - ldr r0, ._338 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._336 @cond_branch\n\ - ldr r0, ._338 + 4 @ 0x60075e0\n\ - ldr r2, ._338 + 8 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ -._336:\n\ - ldr r1, ._338 + 12 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ -._335:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._340\n\ -._339:\n\ - .align 2, 0\n\ -._338:\n\ - .word gLinkOpen\n\ - .word 0x60075e0\n\ - .word 0x600f800\n\ - .word gSharedMem\n\ -._302:\n\ - ldr r0, ._341 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._340 @cond_branch\n\ - ldr r0, ._341 + 4 @ sub_80EC67C\n\ - bl sub_80EBDBC\n\ -._340:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._342:\n\ - .align 2, 0\n\ -._341:\n\ - .word gPaletteFade\n\ - .word sub_80EC67C+1"); -} -#else void sub_80EC4A0() { u32 var1; @@ -1674,6 +836,10 @@ void sub_80EC4A0() break; case 0xD: sub_80EED2C(0x1); +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x75E0), 0, (void *)(VRAM + 0xF800), 4); +#endif ewram0_10.var304++; break; case 0xE: @@ -1682,243 +848,7 @@ void sub_80EC4A0() break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80EC67C() -{ - asm("\ - push {r4, r5, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._345 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x5\n\ - bls ._343 @cond_branch\n\ - b ._386\n\ -._343:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._345 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._346:\n\ - .align 2, 0\n\ -._345:\n\ - .word gSharedMem\n\ - .word ._347\n\ -._347:\n\ - .word ._348\n\ - .word ._349\n\ - .word ._350\n\ - .word ._351\n\ - .word ._352\n\ - .word ._353\n\ -._348:\n\ - bl sub_80FAB60\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x3\n\ - beq ._354 @cond_branch\n\ - cmp r0, #0x3\n\ - bgt ._355 @cond_branch\n\ - cmp r0, #0x1\n\ - beq ._356 @cond_branch\n\ - b ._386\n\ -._355:\n\ - cmp r0, #0x4\n\ - beq ._358 @cond_branch\n\ - cmp r0, #0x5\n\ - beq ._359 @cond_branch\n\ - b ._386\n\ -._356:\n\ - bl sub_80EED9C\n\ - b ._386\n\ -._354:\n\ - bl sub_80EF9F8\n\ - b ._386\n\ -._358:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._364 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - mov r1, #0x1\n\ - strh r1, [r0]\n\ - b ._386\n\ -._365:\n\ - .align 2, 0\n\ -._364:\n\ - .word gSharedMem\n\ -._359:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._367 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r0, r2\n\ - mov r1, #0x4\n\ - strh r1, [r0]\n\ - b ._386\n\ -._368:\n\ - .align 2, 0\n\ -._367:\n\ - .word gSharedMem\n\ -._349:\n\ - ldr r1, ._371 @ 0x6e90\n\ - add r0, r4, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - bne ._369 @cond_branch\n\ - bl sub_80FAEC4\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._380\n\ -._372:\n\ - .align 2, 0\n\ -._371:\n\ - .word 0x6e90\n\ -._369:\n\ - mov r0, #0x1\n\ - bl sub_80EFBDC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._386 @cond_branch\n\ - bl sub_80FAEC4\n\ - b ._374\n\ -._350:\n\ - bl sub_80FAFC0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._386 @cond_branch\n\ - ldr r5, ._378 @ gSharedMem\n\ - ldr r1, ._378 + 4 @ 0x6e90\n\ - add r0, r5, r1\n\ - ldrb r4, [r0]\n\ - cmp r4, #0\n\ - bne ._376 @cond_branch\n\ - bl sub_80EFBB0\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r5, r2\n\ - strh r4, [r0]\n\ - b ._386\n\ -._379:\n\ - .align 2, 0\n\ -._378:\n\ - .word gSharedMem\n\ - .word 0x6e90\n\ -._376:\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r5, r0\n\ - b ._380\n\ -._351:\n\ - mov r0, #0x0\n\ - bl sub_80EFBDC\n\ - lsl r0, r0, #0x18\n\ - lsr r4, r0, #0x18\n\ - cmp r4, #0\n\ - bne ._386 @cond_branch\n\ - bl sub_80EFBB0\n\ - ldr r0, ._383 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - strh r4, [r0]\n\ - b ._386\n\ -._384:\n\ - .align 2, 0\n\ -._383:\n\ - .word gSharedMem\n\ -._352:\n\ - mov r2, #0xc2\n\ - lsl r2, r2, #0x2\n\ - add r0, r4, r2\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ -._374:\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r4, r0\n\ -._380:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._386\n\ -._353:\n\ - ldr r0, ._389 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._386 @cond_branch\n\ - bl sub_80F2DF4\n\ - mov r0, #0x4\n\ - bl sub_80F2D04\n\ - ldr r3, ._389 + 4 @ gSaveBlock2\n\ - mov r2, #0x0\n\ - ldr r0, ._389 + 8 @ gSharedMem\n\ - ldr r1, ._389 + 12 @ 0x6e90\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._387 @cond_branch\n\ - mov r2, #0x1\n\ -._387:\n\ - lsl r2, r2, #0x3\n\ - ldrb r1, [r3, #0x15]\n\ - mov r0, #0x9\n\ - neg r0, r0\n\ - and r0, r0, r1\n\ - orr r0, r0, r2\n\ - strb r0, [r3, #0x15]\n\ - ldr r0, ._389 + 16 @ sub_80EC00C\n\ - bl sub_80EBDBC\n\ -._386:\n\ - ldr r0, ._389 + 20 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._388 @cond_branch\n\ - ldr r0, ._389 + 24 @ gLink\n\ - ldr r2, ._389 + 28 @ 0xfbd\n\ - add r0, r0, r2\n\ - ldrb r0, [r0]\n\ - mov r1, #0x4\n\ - str r1, [sp]\n\ - mov r1, #0x1\n\ - mov r2, #0x1\n\ - mov r3, #0x2\n\ - bl debug_sub_8008264\n\ -._388:\n\ - add sp, sp, #0x4\n\ - pop {r4, r5}\n\ - pop {r0}\n\ - bx r0\n\ -._390:\n\ - .align 2, 0\n\ -._389:\n\ - .word gPaletteFade\n\ - .word gSaveBlock2\n\ - .word gSharedMem\n\ - .word 0x6e90\n\ - .word sub_80EC00C+1\n\ - .word gLinkOpen\n\ - .word gLink\n\ - .word 0xfbd"); -} -#else void sub_80EC67C() { switch (ewram0_10.var304) @@ -1989,8 +919,11 @@ void sub_80EC67C() } break; } -} +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008264(gLink.recvQueue.count, 1, 1, 2, 4); #endif +} void sub_80EC81C() { @@ -2085,275 +1018,6 @@ void sub_80EC9A8() } } -#if DEBUG -__attribute__((naked)) -void sub_80ECA10() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._456 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0xd\n\ - bls ._454 @cond_branch\n\ - b ._509\n\ -._454:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._456 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._457:\n\ - .align 2, 0\n\ -._456:\n\ - .word gSharedMem\n\ - .word ._458\n\ -._458:\n\ - .word ._459\n\ - .word ._460\n\ - .word ._461\n\ - .word ._462\n\ - .word ._463\n\ - .word ._464\n\ - .word ._465\n\ - .word ._466\n\ - .word ._467\n\ - .word ._468\n\ - .word ._469\n\ - .word ._470\n\ - .word ._471\n\ - .word ._472\n\ -._459:\n\ - bl sub_80EEF78\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._473 @cond_branch\n\ - b ._509\n\ -._473:\n\ - ldr r0, ._476 @ sub_80EBD80\n\ - bl SetVBlankCallback\n\ - bl sub_80EED1C\n\ - ldr r4, ._476 + 4 @ gSharedMem\n\ - ldr r1, ._476 + 8 @ 0x6df0\n\ - add r0, r4, r1\n\ - ldrb r1, [r0]\n\ - ldr r2, ._476 + 12 @ 0x6dad\n\ - add r0, r4, r2\n\ - strb r1, [r0]\n\ - ldr r0, ._476 + 16 @ 0x6dae\n\ - add r1, r4, r0\n\ - mov r0, #0x3\n\ - strb r0, [r1]\n\ - bl sub_80EEE08\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r4, r4, r1\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4]\n\ - b ._509\n\ -._477:\n\ - .align 2, 0\n\ -._476:\n\ - .word sub_80EBD80+1\n\ - .word gSharedMem\n\ - .word 0x6df0\n\ - .word 0x6dad\n\ - .word 0x6dae\n\ -._460:\n\ - mov r0, #0x1\n\ - bl sub_80EF248\n\ - ldr r1, ._481 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._461:\n\ - mov r0, #0x1\n\ - bl sub_80EF284\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._478 @cond_branch\n\ - b ._509\n\ -._478:\n\ - ldr r1, ._481 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._502\n\ -._482:\n\ - .align 2, 0\n\ -._481:\n\ - .word gSharedMem\n\ -._462:\n\ - mov r0, #0x1\n\ - bl sub_80F1B8C\n\ - ldr r1, ._486 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._463:\n\ - mov r0, #0x1\n\ - bl sub_80F1BC8\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._483 @cond_branch\n\ - b ._509\n\ -._483:\n\ - ldr r1, ._486 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._502\n\ -._487:\n\ - .align 2, 0\n\ -._486:\n\ - .word gSharedMem\n\ -._464:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._509 @cond_branch\n\ - b ._496\n\ -._465:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._491 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._502\n\ -._492:\n\ - .align 2, 0\n\ -._491:\n\ - .word sub_80EBD18+1\n\ -._466:\n\ - mov r0, #0x0\n\ - bl sub_80EED2C\n\ - ldr r1, ._494 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._502\n\ -._495:\n\ - .align 2, 0\n\ -._494:\n\ - .word gSharedMem\n\ -._467:\n\ - bl sub_80F2598\n\ - b ._496\n\ -._468:\n\ - ldr r0, ._499 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._509 @cond_branch\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r4, r0\n\ - b ._502\n\ -._500:\n\ - .align 2, 0\n\ -._499:\n\ - .word gPaletteFade\n\ -._469:\n\ - mov r0, #0x1\n\ - bl sub_80F2C80\n\ - ldr r1, ._503 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._470:\n\ - mov r0, #0x1\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._509 @cond_branch\n\ - ldr r1, ._503 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._502\n\ -._504:\n\ - .align 2, 0\n\ -._503:\n\ - .word gSharedMem\n\ -._471:\n\ - bl sub_80F1DF0\n\ -._496:\n\ - ldr r1, ._506 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ -._502:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._509\n\ -._507:\n\ - .align 2, 0\n\ -._506:\n\ - .word gSharedMem\n\ -._472:\n\ - bl sub_80F1E50\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._509 @cond_branch\n\ - ldr r0, ._510 @ gSharedMem\n\ - ldr r1, ._510 + 4 @ 0x6dad\n\ - add r0, r0, r1\n\ - ldrb r1, [r0]\n\ - mov r0, #0x1\n\ - bl sub_80EF428\n\ - ldr r0, ._510 + 8 @ sub_80EC86C\n\ - bl sub_80EBDBC\n\ - ldr r0, ._510 + 12 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._509 @cond_branch\n\ - ldr r0, ._510 + 16 @ 0x6007de0\n\ - ldr r2, ._510 + 20 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ -._509:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._511:\n\ - .align 2, 0\n\ -._510:\n\ - .word gSharedMem\n\ - .word 0x6dad\n\ - .word sub_80EC86C+1\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800"); -} -#else void sub_80ECA10() { switch (ewram0_10.var304) @@ -2364,23 +1028,23 @@ void sub_80ECA10() SetVBlankCallback(&sub_80EBD80); sub_80EED1C(); ewram0_10.var6dad = ewram0_10.var6df0; - ewram0_10.var6dae = 0x3; + ewram0_10.var6dae = 3; sub_80EEE08(); ewram0_10.var304++; } break; case 1: - sub_80EF248(0x1); + sub_80EF248(1); ewram0_10.var304++; case 2: - if (!sub_80EF284(0x1)) + if (!sub_80EF284(1)) ewram0_10.var304++; break; case 3: - sub_80F1B8C(0x1); + sub_80F1B8C(1); ewram0_10.var304++; case 4: - if (!sub_80F1BC8(0x1)) + if (!sub_80F1BC8(1)) ewram0_10.var304++; break; case 5: @@ -2404,28 +1068,31 @@ void sub_80ECA10() if (!gPaletteFade.active) ewram0_10.var304++; break; - case 0xA: - sub_80F2C80(0x1); + case 10: + sub_80F2C80(1); ewram0_10.var304++; // fall through - case 0xB: - if (!sub_80F2CBC(0x1)) + case 11: + if (!sub_80F2CBC(1)) ewram0_10.var304++; break; - case 0xC: + case 12: sub_80F1DF0(); ewram0_10.var304++; break; - case 0xD: + case 13: if (!sub_80F1E50()) { sub_80EF428(1, ewram0_10.var6dad); sub_80EBDBC(&sub_80EC86C); +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif } break; } } -#endif void sub_80ECC08() { @@ -2481,362 +1148,6 @@ void sub_80ECC08() } } -#if DEBUG -__attribute__((naked)) -void sub_80ECD80() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._564 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x14\n\ - bls ._562 @cond_branch\n\ - b ._642\n\ -._562:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._564 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._565:\n\ - .align 2, 0\n\ -._564:\n\ - .word gSharedMem\n\ - .word ._566\n\ -._566:\n\ - .word ._567\n\ - .word ._568\n\ - .word ._569\n\ - .word ._570\n\ - .word ._571\n\ - .word ._572\n\ - .word ._573\n\ - .word ._574\n\ - .word ._575\n\ - .word ._576\n\ - .word ._577\n\ - .word ._578\n\ - .word ._579\n\ - .word ._580\n\ - .word ._581\n\ - .word ._582\n\ - .word ._583\n\ - .word ._584\n\ - .word ._585\n\ - .word ._586\n\ - .word ._587\n\ -._567:\n\ - mov r3, #0xc2\n\ - lsl r3, r3, #0x2\n\ - add r0, r4, r3\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r4, r0\n\ - b ._630\n\ -._568:\n\ - ldr r0, ._592 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._589 @cond_branch\n\ - b ._642\n\ -._589:\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._630\n\ -._593:\n\ - .align 2, 0\n\ -._592:\n\ - .word gPaletteFade\n\ -._569:\n\ - bl sub_80EEF78\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._594 @cond_branch\n\ - b ._642\n\ -._594:\n\ - ldr r0, ._597 @ sub_80EBD80\n\ - bl SetVBlankCallback\n\ - b ._625\n\ -._598:\n\ - .align 2, 0\n\ -._597:\n\ - .word sub_80EBD80+1\n\ -._570:\n\ - bl sub_80EED1C\n\ - bl sub_80F3130\n\ - ldr r1, ._600 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._630\n\ -._601:\n\ - .align 2, 0\n\ -._600:\n\ - .word gSharedMem\n\ -._571:\n\ - mov r0, #0x1\n\ - bl sub_80F2D6C\n\ - ldr r1, ._603 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._630\n\ -._604:\n\ - .align 2, 0\n\ -._603:\n\ - .word gSharedMem\n\ -._572:\n\ - mov r0, #0x5\n\ - bl sub_80F2D6C\n\ - b ._625\n\ -._573:\n\ - ldr r1, ._607 @ 0x6dfc\n\ - add r0, r4, r1\n\ - ldrb r1, [r0]\n\ - ldr r2, ._607 + 4 @ 0x6dad\n\ - add r0, r4, r2\n\ - strb r1, [r0]\n\ - ldr r3, ._607 + 8 @ 0x6dae\n\ - add r1, r4, r3\n\ - mov r0, #0x6\n\ - strb r0, [r1]\n\ - bl sub_80EEE08\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r4, r0\n\ - b ._630\n\ -._608:\n\ - .align 2, 0\n\ -._607:\n\ - .word 0x6dfc\n\ - .word 0x6dad\n\ - .word 0x6dae\n\ -._574:\n\ - mov r0, #0x2\n\ - bl sub_80EF248\n\ - ldr r1, ._612 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._575:\n\ - mov r0, #0x2\n\ - bl sub_80EF284\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._609 @cond_branch\n\ - b ._642\n\ -._609:\n\ - b ._625\n\ -._613:\n\ - .align 2, 0\n\ -._612:\n\ - .word gSharedMem\n\ -._576:\n\ - mov r0, #0x2\n\ - bl sub_80F1B8C\n\ - ldr r1, ._617 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._577:\n\ - mov r0, #0x2\n\ - bl sub_80F1BC8\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._614 @cond_branch\n\ - b ._642\n\ -._614:\n\ - ldr r1, ._617 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._630\n\ -._618:\n\ - .align 2, 0\n\ -._617:\n\ - .word gSharedMem\n\ -._578:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - beq ._619 @cond_branch\n\ - b ._642\n\ -._619:\n\ - b ._625\n\ -._579:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._623 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._630\n\ -._624:\n\ - .align 2, 0\n\ -._623:\n\ - .word sub_80EBD18+1\n\ -._580:\n\ - mov r0, #0x0\n\ - bl sub_80EED2C\n\ - b ._625\n\ -._581:\n\ - bl sub_80F2598\n\ - ldr r1, ._627 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._630\n\ -._628:\n\ - .align 2, 0\n\ -._627:\n\ - .word gSharedMem\n\ -._582:\n\ - ldr r0, ._631 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._642 @cond_branch\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._630\n\ -._632:\n\ - .align 2, 0\n\ -._631:\n\ - .word gPaletteFade\n\ -._583:\n\ - mov r0, #0x1\n\ - bl sub_80F2C80\n\ - ldr r1, ._635 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._584:\n\ - mov r0, #0x1\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - lsr r2, r0, #0x18\n\ - cmp r2, #0\n\ - bne ._642 @cond_branch\n\ - ldr r0, ._635 @ gSharedMem\n\ - ldr r3, ._635 + 4 @ 0x306\n\ - add r1, r0, r3\n\ - strh r2, [r1]\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - add r1, r1, #0x1\n\ - strh r1, [r0]\n\ - b ._642\n\ -._636:\n\ - .align 2, 0\n\ -._635:\n\ - .word gSharedMem\n\ - .word 0x306\n\ -._585:\n\ - mov r0, #0x5\n\ - bl sub_80F2C80\n\ - ldr r1, ._639 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._586:\n\ - mov r0, #0x5\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._642 @cond_branch\n\ - bl sub_80F1DF0\n\ -._625:\n\ - ldr r1, ._639 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ -._630:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._642\n\ -._640:\n\ - .align 2, 0\n\ -._639:\n\ - .word gSharedMem\n\ -._587:\n\ - bl sub_80F1E50\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._642 @cond_branch\n\ - ldr r0, ._643 @ gSharedMem\n\ - ldr r1, ._643 + 4 @ 0x6dad\n\ - add r0, r0, r1\n\ - ldrb r1, [r0]\n\ - mov r0, #0x2\n\ - bl sub_80EF428\n\ - ldr r0, ._643 + 8 @ sub_80ECC08\n\ - bl sub_80EBDBC\n\ - ldr r0, ._643 + 12 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._642 @cond_branch\n\ - ldr r0, ._643 + 16 @ 0x6007de0\n\ - ldr r2, ._643 + 20 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ -._642:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._644:\n\ - .align 2, 0\n\ -._643:\n\ - .word gSharedMem\n\ - .word 0x6dad\n\ - .word sub_80ECC08+1\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800"); -} -#else void sub_80ECD80() { switch (ewram0_10.var304) @@ -2939,422 +1250,15 @@ void sub_80ECD80() { sub_80EF428(2, ewram0_10.var6dad); sub_80EBDBC(&sub_80ECC08); +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif } break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80ED01C() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._647 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x13\n\ - bls ._645 @cond_branch\n\ - b ._736\n\ -._645:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._647 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._648:\n\ - .align 2, 0\n\ -._647:\n\ - .word gSharedMem\n\ - .word ._649\n\ -._649:\n\ - .word ._650\n\ - .word ._651\n\ - .word ._652\n\ - .word ._653\n\ - .word ._654\n\ - .word ._655\n\ - .word ._656\n\ - .word ._657\n\ - .word ._658\n\ - .word ._659\n\ - .word ._660\n\ - .word ._661\n\ - .word ._662\n\ - .word ._663\n\ - .word ._664\n\ - .word ._665\n\ - .word ._666\n\ - .word ._667\n\ - .word ._668\n\ - .word ._669\n\ -._650:\n\ - bl sub_80F1E84\n\ - mov r0, #0x1\n\ - bl sub_80F2D04\n\ - mov r0, #0x5\n\ - bl sub_80F2D04\n\ - ldr r1, ._671 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - b ._724\n\ -._672:\n\ - .align 2, 0\n\ -._671:\n\ - .word gSharedMem\n\ -._651:\n\ - bl sub_80F1F10\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._673 @cond_branch\n\ - b ._736\n\ -._673:\n\ - mov r0, #0x0\n\ - bl sub_80EEFBC\n\ - ldr r1, ._676 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._724\n\ -._677:\n\ - .align 2, 0\n\ -._676:\n\ - .word gSharedMem\n\ -._652:\n\ - bl sub_80EEF34\n\ - lsl r0, r0, #0x18\n\ - lsr r2, r0, #0x18\n\ - cmp r2, #0\n\ - beq ._678 @cond_branch\n\ - b ._736\n\ -._678:\n\ - ldr r4, ._681 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - str r2, [sp]\n\ - mov r2, #0x0\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._724\n\ -._682:\n\ - .align 2, 0\n\ -._681:\n\ - .word gSharedMem\n\ -._653:\n\ - ldr r0, ._686 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._683 @cond_branch\n\ - b ._736\n\ -._683:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - bl sub_80EF814\n\ - ldr r1, ._686 + 4 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - b ._724\n\ -._687:\n\ - .align 2, 0\n\ -._686:\n\ - .word gPaletteFade\n\ - .word gSharedMem\n\ -._654:\n\ - bl sub_80F2620\n\ - ldr r1, ._689 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._724\n\ -._690:\n\ - .align 2, 0\n\ -._689:\n\ - .word gSharedMem\n\ -._655:\n\ - bl sub_80F4D44\n\ - ldr r1, ._693 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._656:\n\ - bl sub_80F4D88\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._691 @cond_branch\n\ - ldr r1, ._693 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x2\n\ - strh r0, [r1]\n\ - b ._736\n\ -._694:\n\ - .align 2, 0\n\ -._693:\n\ - .word gSharedMem\n\ -._691:\n\ - ldr r1, ._696 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._724\n\ -._697:\n\ - .align 2, 0\n\ -._696:\n\ - .word gSharedMem\n\ -._657:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - beq ._698 @cond_branch\n\ - b ._736\n\ -._698:\n\ - ldr r1, ._701 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - sub r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._736\n\ -._702:\n\ - .align 2, 0\n\ -._701:\n\ - .word gSharedMem\n\ -._658:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - beq ._703 @cond_branch\n\ - b ._736\n\ -._703:\n\ - ldr r1, ._706 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - b ._724\n\ -._707:\n\ - .align 2, 0\n\ -._706:\n\ - .word gSharedMem\n\ -._659:\n\ - mov r0, #0x0\n\ - bl sub_80F0264\n\ - ldr r1, ._711 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._660:\n\ - bl sub_80F02A0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._708 @cond_branch\n\ - b ._736\n\ -._708:\n\ - ldr r1, ._711 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._724\n\ -._712:\n\ - .align 2, 0\n\ -._711:\n\ - .word gSharedMem\n\ -._661:\n\ - mov r0, #0x0\n\ - bl sub_80F3008\n\ - ldr r1, ._714 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - b ._724\n\ -._715:\n\ - .align 2, 0\n\ -._714:\n\ - .word gSharedMem\n\ -._662:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - beq ._716 @cond_branch\n\ - b ._736\n\ -._716:\n\ - ldr r1, ._719 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._724\n\ -._720:\n\ - .align 2, 0\n\ -._719:\n\ - .word gSharedMem\n\ -._663:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._722 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._724\n\ -._723:\n\ - .align 2, 0\n\ -._722:\n\ - .word sub_80EBD18+1\n\ -._664:\n\ - mov r0, #0x4\n\ - bl sub_80EED2C\n\ - ldr r1, ._725 @ gSharedMem\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r1, r3\n\ - b ._724\n\ -._726:\n\ - .align 2, 0\n\ -._725:\n\ - .word gSharedMem\n\ -._665:\n\ - ldr r0, ._729 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - lsl r0, r0, #0x18\n\ - lsr r1, r0, #0x18\n\ - cmp r1, #0\n\ - bne ._736 @cond_branch\n\ - ldr r2, ._729 + 4 @ 0x306\n\ - add r0, r4, r2\n\ - strh r1, [r0]\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r1, r4, r3\n\ -._724:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._736\n\ -._730:\n\ - .align 2, 0\n\ -._729:\n\ - .word gPaletteFade\n\ - .word 0x306\n\ -._666:\n\ - mov r0, #0x1\n\ - bl sub_80F2C80\n\ - ldr r1, ._733 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._667:\n\ - mov r0, #0x1\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - lsr r2, r0, #0x18\n\ - cmp r2, #0\n\ - bne ._736 @cond_branch\n\ - ldr r0, ._733 @ gSharedMem\n\ - ldr r3, ._733 + 4 @ 0x306\n\ - add r1, r0, r3\n\ - strh r2, [r1]\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - add r1, r1, #0x1\n\ - strh r1, [r0]\n\ - b ._736\n\ -._734:\n\ - .align 2, 0\n\ -._733:\n\ - .word gSharedMem\n\ - .word 0x306\n\ -._668:\n\ - ldr r4, ._737 @ gSharedMem\n\ - ldr r2, ._737 + 4 @ 0x6dfc\n\ - add r0, r4, r2\n\ - ldrb r0, [r0]\n\ - add r0, r0, #0x7\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl sub_80F2C80\n\ - mov r3, #0xc1\n\ - lsl r3, r3, #0x2\n\ - add r4, r4, r3\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4]\n\ -._669:\n\ - ldr r0, ._737 @ gSharedMem\n\ - ldr r1, ._737 + 4 @ 0x6dfc\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - add r0, r0, #0x7\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._736 @cond_branch\n\ - ldr r0, ._737 + 8 @ sub_80ED31C\n\ - bl sub_80EBDBC\n\ - ldr r0, ._737 + 12 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._736 @cond_branch\n\ - ldr r0, ._737 + 16 @ 0x6007de0\n\ - ldr r2, ._737 + 20 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ -._736:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._738:\n\ - .align 2, 0\n\ -._737:\n\ - .word gSharedMem\n\ - .word 0x6dfc\n\ - .word sub_80ED31C+1\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800"); -} -#else void sub_80ED01C() { switch (ewram0_10.var304) @@ -3459,133 +1363,17 @@ void sub_80ED01C() // fall through case 19: if (!sub_80F2CBC(ewram0_10.var6dfc + 7)) + { sub_80EBDBC(&sub_80ED31C); +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif + } break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80ED31C() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r0, ._743 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r4, r0, r1\n\ - ldrh r0, [r4]\n\ - cmp r0, #0x1\n\ - beq ._739 @cond_branch\n\ - cmp r0, #0x1\n\ - bgt ._740 @cond_branch\n\ - cmp r0, #0\n\ - beq ._741 @cond_branch\n\ - b ._761\n\ -._744:\n\ - .align 2, 0\n\ -._743:\n\ - .word gSharedMem\n\ -._740:\n\ - cmp r0, #0x2\n\ - beq ._745 @cond_branch\n\ - b ._761\n\ -._741:\n\ - bl sub_80F5DD4\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x1\n\ - beq ._747 @cond_branch\n\ - cmp r0, #0x2\n\ - beq ._748 @cond_branch\n\ - ldr r0, ._751 @ gMain\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._749 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._751 + 4 @ sub_80ED4D8\n\ - bl sub_80EBDBC\n\ - b ._762\n\ -._752:\n\ - .align 2, 0\n\ -._751:\n\ - .word gMain\n\ - .word sub_80ED4D8+1\n\ -._747:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - bl ShowMapNamePopUpWindow\n\ - b ._762\n\ -._748:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4]\n\ - b ._762\n\ -._749:\n\ - mov r0, #0x2\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._761 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._757 @ sub_80ECD80\n\ - bl sub_80EBDBC\n\ - b ._762\n\ -._758:\n\ - .align 2, 0\n\ -._757:\n\ - .word sub_80ECD80+1\n\ -._739:\n\ - bl sub_80F0718\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._761 @cond_branch\n\ - bl ShowMapNamePopUpWindow\n\ - bl sub_80F3264\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - b ._760\n\ -._745:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._761 @cond_branch\n\ -._760:\n\ - strh r0, [r4]\n\ -._761:\n\ - ldr r0, ._763 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._762 @cond_branch\n\ - ldr r0, ._763 + 4 @ gLink\n\ - ldr r1, ._763 + 8 @ 0xfbd\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - mov r1, #0x4\n\ - str r1, [sp]\n\ - mov r1, #0x1\n\ - mov r2, #0x8\n\ - mov r3, #0x2\n\ - bl debug_sub_8008264\n\ -._762:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._764:\n\ - .align 2, 0\n\ -._763:\n\ - .word gLinkOpen\n\ - .word gLink\n\ - .word 0xfbd"); -} -#else void sub_80ED31C() { switch (ewram0_10.var304) @@ -3596,21 +1384,23 @@ void sub_80ED31C() case 1: PlaySE(SE_SELECT); ShowMapNamePopUpWindow(); - break; + return; case 2: PlaySE(SE_SELECT); ewram0_10.var304++; - break; + return; default: if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); sub_80EBDBC(&sub_80ED4D8); + return; } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); sub_80EBDBC(&sub_80ECD80); + return; } break; } @@ -3628,196 +1418,12 @@ void sub_80ED31C() ewram0_10.var304 = 0; break; } -} -#endif - #if DEBUG -__attribute__((naked)) -void sub_80ED3D0() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r0, ._767 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0]\n\ - cmp r0, #0x8\n\ - bls ._765 @cond_branch\n\ - b ._803\n\ -._765:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._767 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._768:\n\ - .align 2, 0\n\ -._767:\n\ - .word gSharedMem\n\ - .word ._769\n\ -._769:\n\ - .word ._770\n\ - .word ._771\n\ - .word ._772\n\ - .word ._773\n\ - .word ._774\n\ - .word ._775\n\ - .word ._776\n\ - .word ._777\n\ - .word ._778\n\ -._770:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - ldr r1, ._780 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._793\n\ -._781:\n\ - .align 2, 0\n\ -._780:\n\ - .word gSharedMem\n\ -._771:\n\ - bl sub_80EED0C\n\ - bl sub_80F6134\n\ - ldr r1, ._783 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._793\n\ -._784:\n\ - .align 2, 0\n\ -._783:\n\ - .word gSharedMem\n\ -._772:\n\ - mov r0, #0x0\n\ - bl sub_80EEFBC\n\ - ldr r1, ._786 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._793\n\ -._787:\n\ - .align 2, 0\n\ -._786:\n\ - .word gSharedMem\n\ -._773:\n\ - mov r0, #0x0\n\ - bl sub_80F0264\n\ - ldr r1, ._790 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._774:\n\ - bl sub_80F02A0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._803 @cond_branch\n\ - ldr r1, ._790 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._793\n\ -._791:\n\ - .align 2, 0\n\ -._790:\n\ - .word gSharedMem\n\ -._775:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._803 @cond_branch\n\ - ldr r1, ._794 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._793\n\ -._795:\n\ - .align 2, 0\n\ -._794:\n\ - .word gSharedMem\n\ -._776:\n\ - mov r0, #0x0\n\ - bl sub_80F3008\n\ - ldr r4, ._797 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._797 + 4 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r4, r0\n\ -._793:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._803\n\ -._798:\n\ - .align 2, 0\n\ -._797:\n\ - .word gSharedMem\n\ - .word sub_80EBD18+1\n\ -._777:\n\ - mov r0, #0x4\n\ - bl sub_80EED2C\n\ - ldr r1, ._801 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - ldr r0, ._801 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._803 @cond_branch\n\ - ldr r0, ._801 + 8 @ 0x6007de0\n\ - ldr r2, ._801 + 12 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ - b ._803\n\ -._802:\n\ - .align 2, 0\n\ -._801:\n\ - .word gSharedMem\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800\n\ -._778:\n\ - ldr r0, ._804 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._803 @cond_branch\n\ - ldr r0, ._804 + 4 @ sub_80ED31C\n\ - bl sub_80EBDBC\n\ -._803:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._805:\n\ - .align 2, 0\n\ -._804:\n\ - .word gPaletteFade\n\ - .word sub_80ED31C+1"); + if (gLinkOpen == TRUE) + debug_sub_8008264(gLink.recvQueue.count, 1, 8, 2, 4); +#endif } -#else + void sub_80ED3D0() { switch (ewram0_10.var304) @@ -3856,6 +1462,10 @@ void sub_80ED3D0() case 7: sub_80EED2C(0x4); ewram0_10.var304++; +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif break; case 8: if (!gPaletteFade.active) @@ -3863,207 +1473,7 @@ void sub_80ED3D0() break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80ED4D8() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._808 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x8\n\ - bls ._806 @cond_branch\n\ - b ._844\n\ -._806:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._808 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._809:\n\ - .align 2, 0\n\ -._808:\n\ - .word gSharedMem\n\ - .word ._810\n\ -._810:\n\ - .word ._811\n\ - .word ._812\n\ - .word ._813\n\ - .word ._814\n\ - .word ._815\n\ - .word ._816\n\ - .word ._817\n\ - .word ._818\n\ - .word ._819\n\ -._811:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - b ._820\n\ -._812:\n\ - ldr r0, ._824 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._821 @cond_branch\n\ - b ._844\n\ -._821:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - bl sub_80F3130\n\ - ldr r1, ._824 + 4 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._834\n\ -._825:\n\ - .align 2, 0\n\ -._824:\n\ - .word gPaletteFade\n\ - .word gSharedMem\n\ -._813:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._844 @cond_branch\n\ - ldr r1, ._828 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._834\n\ -._829:\n\ - .align 2, 0\n\ -._828:\n\ - .word gSharedMem\n\ -._814:\n\ - bl sub_80F4CF0\n\ - ldr r1, ._831 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._834\n\ -._832:\n\ - .align 2, 0\n\ -._831:\n\ - .word gSharedMem\n\ -._815:\n\ - bl sub_80EFF34\n\ - ldr r1, ._835 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._816:\n\ - bl sub_80EFF68\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._844 @cond_branch\n\ - ldr r1, ._835 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._834\n\ -._836:\n\ - .align 2, 0\n\ -._835:\n\ - .word gSharedMem\n\ -._817:\n\ - bl sub_80F35B4\n\ - mov r0, #0x2\n\ - bl sub_80EEFBC\n\ - ldr r4, ._838 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._838 + 4 @ sub_80EBD4C\n\ - bl SetVBlankCallback\n\ -._820:\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ -._834:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._844\n\ -._839:\n\ - .align 2, 0\n\ -._838:\n\ - .word gSharedMem\n\ - .word sub_80EBD4C+1\n\ -._818:\n\ - mov r0, #0x2\n\ - bl sub_80EED2C\n\ - ldr r1, ._842 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - ldr r0, ._842 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._844 @cond_branch\n\ - ldr r0, ._842 + 8 @ 0x6007de0\n\ - ldr r2, ._842 + 12 @ 0x600f000\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ - b ._844\n\ -._843:\n\ - .align 2, 0\n\ -._842:\n\ - .word gSharedMem\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f000\n\ -._819:\n\ - ldr r0, ._845 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._844 @cond_branch\n\ - ldr r0, ._845 + 4 @ sub_80ED858\n\ - bl sub_80EBDBC\n\ -._844:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._846:\n\ - .align 2, 0\n\ -._845:\n\ - .word gPaletteFade\n\ - .word sub_80ED858+1"); -} -#else void sub_80ED4D8() { switch (ewram0_10.var304) @@ -4107,6 +1517,10 @@ void sub_80ED4D8() case 7: sub_80EED2C(0x2); ewram0_10.var304++; +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF000), 4); +#endif break; case 8: if (!gPaletteFade.active) @@ -4114,310 +1528,7 @@ void sub_80ED4D8() break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80ED620() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._849 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x10\n\ - bls ._847 @cond_branch\n\ - b ._912\n\ -._847:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._849 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._850:\n\ - .align 2, 0\n\ -._849:\n\ - .word gSharedMem\n\ - .word ._851\n\ -._851:\n\ - .word ._852\n\ - .word ._853\n\ - .word ._854\n\ - .word ._855\n\ - .word ._856\n\ - .word ._857\n\ - .word ._858\n\ - .word ._859\n\ - .word ._860\n\ - .word ._861\n\ - .word ._862\n\ - .word ._863\n\ - .word ._864\n\ - .word ._865\n\ - .word ._866\n\ - .word ._867\n\ - .word ._868\n\ -._852:\n\ - bl sub_80F1E84\n\ - mov r0, #0x1\n\ - bl sub_80F2D04\n\ - ldr r1, ._870 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._904\n\ -._871:\n\ - .align 2, 0\n\ -._870:\n\ - .word gSharedMem\n\ -._853:\n\ - bl sub_80F1F10\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._872 @cond_branch\n\ - b ._912\n\ -._872:\n\ - mov r0, #0x1\n\ - bl sub_80EEFBC\n\ - b ._885\n\ -._854:\n\ - bl sub_80EEF34\n\ - lsl r0, r0, #0x18\n\ - lsr r2, r0, #0x18\n\ - cmp r2, #0\n\ - beq ._875 @cond_branch\n\ - b ._912\n\ -._875:\n\ - ldr r4, ._878 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - str r2, [sp]\n\ - mov r2, #0x0\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._904\n\ -._879:\n\ - .align 2, 0\n\ -._878:\n\ - .word gSharedMem\n\ -._855:\n\ - ldr r0, ._883 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - lsl r0, r0, #0x18\n\ - lsr r4, r0, #0x18\n\ - cmp r4, #0\n\ - beq ._880 @cond_branch\n\ - b ._912\n\ -._880:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - bl sub_80EF814\n\ - ldr r0, ._883 + 4 @ gSharedMem\n\ - ldr r2, ._883 + 8 @ 0x76aa\n\ - add r1, r0, r2\n\ - strb r4, [r1]\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - ldrh r1, [r0]\n\ - add r1, r1, #0x1\n\ - strh r1, [r0]\n\ - b ._912\n\ -._884:\n\ - .align 2, 0\n\ -._883:\n\ - .word gPaletteFade\n\ - .word gSharedMem\n\ - .word 0x76aa\n\ -._856:\n\ - bl sub_80F2620\n\ - b ._885\n\ -._857:\n\ - ldr r0, ._887 @ 0xd162\n\ - add r1, r4, r0\n\ - mov r0, #0x2\n\ - strb r0, [r1]\n\ - bl sub_80F4BD0\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._904\n\ -._888:\n\ - .align 2, 0\n\ -._887:\n\ - .word 0xd162\n\ -._858:\n\ - bl sub_80EFF34\n\ - ldr r1, ._890 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._859:\n\ - bl sub_80EFF68\n\ - b ._889\n\ -._891:\n\ - .align 2, 0\n\ -._890:\n\ - .word gSharedMem\n\ -._860:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._912 @cond_branch\n\ - ldr r1, ._894 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._904\n\ -._895:\n\ - .align 2, 0\n\ -._894:\n\ - .word gSharedMem\n\ -._861:\n\ - bl sub_8055870\n\ - b ._896\n\ -._862:\n\ - bl sub_80F33A8\n\ - ldr r4, ._898 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._898 + 4 @ sub_80EBD4C\n\ - bl SetVBlankCallback\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._904\n\ -._899:\n\ - .align 2, 0\n\ -._898:\n\ - .word gSharedMem\n\ - .word sub_80EBD4C+1\n\ -._863:\n\ - mov r0, #0x2\n\ - bl sub_80EED2C\n\ - ldr r1, ._901 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._904\n\ -._902:\n\ - .align 2, 0\n\ -._901:\n\ - .word gSharedMem\n\ -._864:\n\ - ldr r0, ._905 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._912 @cond_branch\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ - b ._904\n\ -._906:\n\ - .align 2, 0\n\ -._905:\n\ - .word gPaletteFade\n\ -._865:\n\ - mov r0, #0x1\n\ - bl sub_80F2C80\n\ - ldr r1, ._909 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._866:\n\ - mov r0, #0x1\n\ - bl sub_80F2CBC\n\ -._889:\n\ - lsl r0, r0, #0x18\n\ -._896:\n\ - cmp r0, #0\n\ - bne ._912 @cond_branch\n\ -._885:\n\ - ldr r1, ._909 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ -._904:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._912\n\ -._910:\n\ - .align 2, 0\n\ -._909:\n\ - .word gSharedMem\n\ -._867:\n\ - mov r0, #0x6\n\ - bl sub_80F2C80\n\ - ldr r1, ._913 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._868:\n\ - mov r0, #0x6\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._912 @cond_branch\n\ - ldr r0, ._913 + 4 @ sub_80ED858\n\ - bl sub_80EBDBC\n\ - ldr r0, ._913 + 8 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._912 @cond_branch\n\ - ldr r0, ._913 + 12 @ 0x6007de0\n\ - ldr r2, ._913 + 16 @ 0x600f000\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ -._912:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._914:\n\ - .align 2, 0\n\ -._913:\n\ - .word gSharedMem\n\ - .word sub_80ED858+1\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f000"); -} -#else void sub_80ED620() { switch (ewram0_10.var304) @@ -4503,11 +1614,16 @@ void sub_80ED620() // fall through case 16: if (!sub_80F2CBC(0x6)) + { sub_80EBDBC(&sub_80ED858); +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF000), 4); +#endif + } break; } } -#endif #if 0 void sub_80F4F78(); @@ -5476,359 +2592,6 @@ _080EDB84: .4byte sub_80ED3D0\n"); #endif #endif -#if DEBUG -__attribute__((naked)) -void sub_80EDB88() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._1007 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x11\n\ - bls ._1005 @cond_branch\n\ - b ._1088\n\ -._1005:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._1007 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._1008:\n\ - .align 2, 0\n\ -._1007:\n\ - .word gSharedMem\n\ - .word ._1009\n\ -._1009:\n\ - .word ._1010\n\ - .word ._1011\n\ - .word ._1012\n\ - .word ._1013\n\ - .word ._1014\n\ - .word ._1015\n\ - .word ._1016\n\ - .word ._1017\n\ - .word ._1018\n\ - .word ._1019\n\ - .word ._1020\n\ - .word ._1021\n\ - .word ._1022\n\ - .word ._1023\n\ - .word ._1024\n\ - .word ._1025\n\ - .word ._1026\n\ - .word ._1027\n\ -._1010:\n\ - bl sub_80F1E84\n\ - mov r0, #0x0\n\ - bl sub_80F2D04\n\ - ldr r1, ._1029 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1078\n\ -._1030:\n\ - .align 2, 0\n\ -._1029:\n\ - .word gSharedMem\n\ -._1011:\n\ - bl sub_80F1F10\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1031 @cond_branch\n\ - b ._1088\n\ -._1031:\n\ - mov r0, #0x4\n\ - bl sub_80EEFBC\n\ - ldr r1, ._1034 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._1078\n\ -._1035:\n\ - .align 2, 0\n\ -._1034:\n\ - .word gSharedMem\n\ -._1012:\n\ - bl sub_80EEF34\n\ - lsl r0, r0, #0x18\n\ - lsr r2, r0, #0x18\n\ - cmp r2, #0\n\ - beq ._1036 @cond_branch\n\ - b ._1088\n\ -._1036:\n\ - ldr r4, ._1039 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - str r2, [sp]\n\ - mov r2, #0x0\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - b ._1038\n\ -._1040:\n\ - .align 2, 0\n\ -._1039:\n\ - .word gSharedMem\n\ -._1013:\n\ - ldr r0, ._1044 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1041 @cond_branch\n\ - b ._1088\n\ -._1041:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - bl sub_80EF814\n\ - ldr r1, ._1044 + 4 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1078\n\ -._1045:\n\ - .align 2, 0\n\ -._1044:\n\ - .word gPaletteFade\n\ - .word gSharedMem\n\ -._1014:\n\ - bl sub_80F2620\n\ - ldr r1, ._1047 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._1078\n\ -._1048:\n\ - .align 2, 0\n\ -._1047:\n\ - .word gSharedMem\n\ -._1015:\n\ - bl sub_80F638C\n\ - ldr r1, ._1051 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._1016:\n\ - bl sub_80F63D0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1049 @cond_branch\n\ - ldr r1, ._1051 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x2\n\ - strh r0, [r1]\n\ - b ._1088\n\ -._1052:\n\ - .align 2, 0\n\ -._1051:\n\ - .word gSharedMem\n\ -._1049:\n\ - ldr r1, ._1054 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1078\n\ -._1055:\n\ - .align 2, 0\n\ -._1054:\n\ - .word gSharedMem\n\ -._1017:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - beq ._1056 @cond_branch\n\ - b ._1088\n\ -._1056:\n\ - ldr r1, ._1059 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - sub r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._1088\n\ -._1060:\n\ - .align 2, 0\n\ -._1059:\n\ - .word gSharedMem\n\ -._1018:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - beq ._1061 @cond_branch\n\ - b ._1088\n\ -._1061:\n\ - ldr r1, ._1064 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1078\n\ -._1065:\n\ - .align 2, 0\n\ -._1064:\n\ - .word gSharedMem\n\ -._1019:\n\ - mov r0, #0x1\n\ - bl sub_80F0264\n\ - ldr r1, ._1068 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._1020:\n\ - bl sub_80F02A0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1088 @cond_branch\n\ - ldr r1, ._1068 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1078\n\ -._1069:\n\ - .align 2, 0\n\ -._1068:\n\ - .word gSharedMem\n\ -._1021:\n\ - mov r0, #0x2\n\ - bl sub_80F2C80\n\ - ldr r1, ._1072 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._1022:\n\ - mov r0, #0x2\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1088 @cond_branch\n\ - ldr r1, ._1072 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1078\n\ -._1073:\n\ - .align 2, 0\n\ -._1072:\n\ - .word gSharedMem\n\ -._1023:\n\ - mov r0, #0x1\n\ - bl sub_80F3008\n\ - ldr r1, ._1075 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._1078\n\ -._1076:\n\ - .align 2, 0\n\ -._1075:\n\ - .word gSharedMem\n\ -._1024:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._1088 @cond_branch\n\ - ldr r1, ._1079 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1078\n\ -._1080:\n\ - .align 2, 0\n\ -._1079:\n\ - .word gSharedMem\n\ -._1025:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._1082 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ -._1038:\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ -._1078:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._1088\n\ -._1083:\n\ - .align 2, 0\n\ -._1082:\n\ - .word sub_80EBD18+1\n\ -._1026:\n\ - mov r0, #0x4\n\ - bl sub_80EED2C\n\ - ldr r1, ._1086 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - ldr r0, ._1086 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1088 @cond_branch\n\ - ldr r0, ._1086 + 8 @ 0x6007de0\n\ - ldr r2, ._1086 + 12 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ - b ._1088\n\ -._1087:\n\ - .align 2, 0\n\ -._1086:\n\ - .word gSharedMem\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800\n\ -._1027:\n\ - ldr r0, ._1089 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1088 @cond_branch\n\ - ldr r0, ._1089 + 4 @ sub_80EDDBC\n\ - bl sub_80EBDBC\n\ -._1088:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._1090:\n\ - .align 2, 0\n\ -._1089:\n\ - .word gPaletteFade\n\ - .word sub_80EDDBC+1"); -} -#else void sub_80EDB88() { switch (ewram0_10.var304) @@ -5912,6 +2675,10 @@ void sub_80EDB88() case 16: sub_80EED2C(0x4); ewram0_10.var304++; +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif break; case 17: if (!gPaletteFade.active) @@ -5919,129 +2686,7 @@ void sub_80EDB88() break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80EDDBC() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r0, ._1095 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r4, r0, r1\n\ - ldrh r0, [r4]\n\ - cmp r0, #0x1\n\ - beq ._1091 @cond_branch\n\ - cmp r0, #0x1\n\ - bgt ._1092 @cond_branch\n\ - cmp r0, #0\n\ - beq ._1093 @cond_branch\n\ - b ._1113\n\ -._1096:\n\ - .align 2, 0\n\ -._1095:\n\ - .word gSharedMem\n\ -._1092:\n\ - cmp r0, #0x2\n\ - beq ._1097 @cond_branch\n\ - b ._1113\n\ -._1093:\n\ - bl sub_80F5DD4\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x1\n\ - beq ._1099 @cond_branch\n\ - cmp r0, #0x2\n\ - beq ._1100 @cond_branch\n\ - ldr r0, ._1103 @ gMain\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1101 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._1103 + 4 @ sub_80EDEE4\n\ - bl sub_80EBDBC\n\ - b ._1114\n\ -._1104:\n\ - .align 2, 0\n\ -._1103:\n\ - .word gMain\n\ - .word sub_80EDEE4+1\n\ -._1099:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - bl ShowMapNamePopUpWindow\n\ - b ._1114\n\ -._1100:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4]\n\ - b ._1114\n\ -._1101:\n\ - mov r0, #0x2\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1113 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._1109 @ sub_80EDE70\n\ - bl sub_80EBDBC\n\ - b ._1114\n\ -._1110:\n\ - .align 2, 0\n\ -._1109:\n\ - .word sub_80EDE70+1\n\ -._1091:\n\ - bl sub_80F0718\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1113 @cond_branch\n\ - bl ShowMapNamePopUpWindow\n\ - bl sub_80F3264\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - b ._1112\n\ -._1097:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._1113 @cond_branch\n\ -._1112:\n\ - strh r0, [r4]\n\ -._1113:\n\ - ldr r0, ._1115 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1114 @cond_branch\n\ - ldr r0, ._1115 + 4 @ gLink\n\ - ldr r1, ._1115 + 8 @ 0xfbd\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - mov r1, #0x4\n\ - str r1, [sp]\n\ - mov r1, #0x1\n\ - mov r2, #0x8\n\ - mov r3, #0x2\n\ - bl debug_sub_8008264\n\ -._1114:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._1116:\n\ - .align 2, 0\n\ -._1115:\n\ - .word gLinkOpen\n\ - .word gLink\n\ - .word 0xfbd"); -} -#else void sub_80EDDBC() { switch (ewram0_10.var304) @@ -6052,21 +2697,23 @@ void sub_80EDDBC() case 1: PlaySE(SE_SELECT); ShowMapNamePopUpWindow(); - break; + return; case 2: PlaySE(SE_SELECT); ewram0_10.var304++; - break; + return; default: if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); sub_80EBDBC(&sub_80EDEE4); + return; } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); sub_80EBDBC(&sub_80EDE70); + return; } break; } @@ -6083,10 +2730,12 @@ void sub_80EDDBC() if (!sub_8055870()) ewram0_10.var304 = 0; break; - } -} +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008264(gLink.recvQueue.count, 1, 8, 2, 4); #endif +} void sub_80EDE70() { @@ -6111,228 +2760,6 @@ void sub_80EDE70() } -#if DEBUG -__attribute__((naked)) -void sub_80EDEE4() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._1134 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0xa\n\ - bls ._1132 @cond_branch\n\ - b ._1180\n\ -._1132:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._1134 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._1135:\n\ - .align 2, 0\n\ -._1134:\n\ - .word gSharedMem\n\ - .word ._1136\n\ -._1136:\n\ - .word ._1137\n\ - .word ._1138\n\ - .word ._1139\n\ - .word ._1140\n\ - .word ._1141\n\ - .word ._1142\n\ - .word ._1143\n\ - .word ._1144\n\ - .word ._1145\n\ - .word ._1146\n\ - .word ._1147\n\ -._1137:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - b ._1169\n\ -._1138:\n\ - ldr r0, ._1152 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1149 @cond_branch\n\ - b ._1180\n\ -._1149:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - bl sub_80F3130\n\ - ldr r1, ._1152 + 4 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1166\n\ -._1153:\n\ - .align 2, 0\n\ -._1152:\n\ - .word gPaletteFade\n\ - .word gSharedMem\n\ -._1139:\n\ - bl sub_80F66E0\n\ - bl sub_80EEE08\n\ - ldr r1, ._1155 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._1166\n\ -._1156:\n\ - .align 2, 0\n\ -._1155:\n\ - .word gSharedMem\n\ -._1140:\n\ - bl sub_80F1080\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1180 @cond_branch\n\ - ldr r1, ._1159 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1166\n\ -._1160:\n\ - .align 2, 0\n\ -._1159:\n\ - .word gSharedMem\n\ -._1141:\n\ - mov r0, #0x5\n\ - bl sub_80EEFBC\n\ - bl sub_80F38B8\n\ - ldr r1, ._1163 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._1142:\n\ - bl sub_80F38EC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1180 @cond_branch\n\ - ldr r1, ._1163 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1166\n\ -._1164:\n\ - .align 2, 0\n\ -._1163:\n\ - .word gSharedMem\n\ -._1143:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._1180 @cond_branch\n\ - ldr r1, ._1167 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._1166\n\ -._1168:\n\ - .align 2, 0\n\ -._1167:\n\ - .word gSharedMem\n\ -._1144:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._1170 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - b ._1169\n\ -._1171:\n\ - .align 2, 0\n\ -._1170:\n\ - .word sub_80EBD18+1\n\ -._1145:\n\ - mov r0, #0x3\n\ - bl sub_80EED2C\n\ - ldr r1, ._1174 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - ldr r0, ._1174 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1180 @cond_branch\n\ - ldr r0, ._1174 + 8 @ 0x6007de0\n\ - ldr r2, ._1174 + 12 @ 0x600f000\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ - b ._1180\n\ -._1175:\n\ - .align 2, 0\n\ -._1174:\n\ - .word gSharedMem\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f000\n\ -._1146:\n\ - ldr r0, ._1178 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1180 @cond_branch\n\ -._1169:\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ -._1166:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._1180\n\ -._1179:\n\ - .align 2, 0\n\ -._1178:\n\ - .word gPaletteFade\n\ -._1147:\n\ - bl sub_80F170C\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1180 @cond_branch\n\ - ldr r0, ._1181 @ sub_80EE06C\n\ - bl sub_80EBDBC\n\ -._1180:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._1182:\n\ - .align 2, 0\n\ -._1181:\n\ - .word sub_80EE06C+1"); -} -#else void sub_80EDEE4() { switch (ewram0_10.var304) @@ -6379,6 +2806,10 @@ void sub_80EDEE4() case 8: sub_80EED2C(0x3); ewram0_10.var304++; +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF000), 4); +#endif break; case 9: if (!gPaletteFade.active) @@ -6390,316 +2821,7 @@ void sub_80EDEE4() break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80EE06C() -{ - asm("\ - push {r4, r5, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._1185 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x8\n\ - bls ._1183 @cond_branch\n\ - b ._1248\n\ -._1183:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._1185 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._1186:\n\ - .align 2, 0\n\ -._1185:\n\ - .word gSharedMem\n\ - .word ._1187\n\ -._1187:\n\ - .word ._1188\n\ - .word ._1189\n\ - .word ._1190\n\ - .word ._1191\n\ - .word ._1192\n\ - .word ._1193\n\ - .word ._1194\n\ - .word ._1195\n\ - .word ._1196\n\ -._1188:\n\ - bl sub_80F15A8\n\ - ldr r1, ._1198 @ gSharedMem\n\ - mov r5, #0xc1\n\ - lsl r5, r5, #0x2\n\ - add r1, r1, r5\n\ - b ._1221\n\ -._1199:\n\ - .align 2, 0\n\ -._1198:\n\ - .word gSharedMem\n\ -._1189:\n\ - ldr r2, ._1203 @ gMain\n\ - ldrh r1, [r2, #0x30]\n\ - mov r0, #0x40\n\ - and r0, r0, r1\n\ - add r3, r2, #0\n\ - cmp r0, #0\n\ - beq ._1201 @cond_branch\n\ - ldr r1, ._1203 + 4 @ 0x87dc\n\ - add r0, r4, r1\n\ - mov r2, #0x0\n\ - ldsh r0, [r0, r2]\n\ - cmp r0, #0\n\ - beq ._1201 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - mov r0, #0x1\n\ - neg r0, r0\n\ - bl sub_80F6A4C\n\ - mov r5, #0xc1\n\ - lsl r5, r5, #0x2\n\ - add r1, r4, r5\n\ - b ._1221\n\ -._1204:\n\ - .align 2, 0\n\ -._1203:\n\ - .word gMain\n\ - .word 0x87dc\n\ -._1201:\n\ - ldrh r1, [r3, #0x30]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1206 @cond_branch\n\ - ldr r1, ._1208 @ 0x87dc\n\ - add r0, r4, r1\n\ - ldr r2, ._1208 + 4 @ 0x8774\n\ - add r1, r4, r2\n\ - mov r5, #0x0\n\ - ldsh r2, [r0, r5]\n\ - mov r5, #0x0\n\ - ldsh r0, [r1, r5]\n\ - cmp r2, r0\n\ - bge ._1206 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - mov r0, #0x1\n\ - bl sub_80F6A4C\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r4, r0\n\ - b ._1221\n\ -._1209:\n\ - .align 2, 0\n\ -._1208:\n\ - .word 0x87dc\n\ - .word 0x8774\n\ -._1206:\n\ - ldrh r2, [r3, #0x2e]\n\ - mov r0, #0x1\n\ - and r0, r0, r2\n\ - cmp r0, #0\n\ - beq ._1210 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - mov r0, #0xb\n\ - bl sub_80EEFBC\n\ - ldr r0, ._1212 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - b ._1211\n\ -._1213:\n\ - .align 2, 0\n\ -._1212:\n\ - .word gSharedMem\n\ -._1210:\n\ - mov r0, #0x2\n\ - and r0, r0, r2\n\ - cmp r0, #0\n\ - bne ._1214 @cond_branch\n\ - b ._1248\n\ -._1214:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._1217 @ sub_80EE294\n\ - bl sub_80EBDBC\n\ - b ._1248\n\ -._1218:\n\ - .align 2, 0\n\ -._1217:\n\ - .word sub_80EE294+1\n\ -._1190:\n\ - bl sub_80F6AF0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1219 @cond_branch\n\ - b ._1248\n\ -._1219:\n\ - ldr r1, ._1222 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._1221\n\ -._1223:\n\ - .align 2, 0\n\ -._1222:\n\ - .word gSharedMem\n\ -._1191:\n\ - bl sub_8055870\n\ - add r1, r0, #0\n\ - cmp r1, #0\n\ - bne ._1248 @cond_branch\n\ - ldr r0, ._1226 @ gSharedMem\n\ - mov r5, #0xc1\n\ - lsl r5, r5, #0x2\n\ - add r0, r0, r5\n\ - strh r1, [r0]\n\ - b ._1248\n\ -._1227:\n\ - .align 2, 0\n\ -._1226:\n\ - .word gSharedMem\n\ -._1192:\n\ - bl sub_80F3B00\n\ - ldr r1, ._1229 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ -._1221:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._1248\n\ -._1230:\n\ - .align 2, 0\n\ -._1229:\n\ - .word gSharedMem\n\ -._1193:\n\ - bl sub_80F3B58\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1248 @cond_branch\n\ - bl sub_80F1494\n\ - ldr r1, ._1233 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - bl sub_80EED9C\n\ - b ._1248\n\ -._1234:\n\ - .align 2, 0\n\ -._1233:\n\ - .word gSharedMem\n\ -._1194:\n\ - bl sub_80F68E8\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1236 @cond_branch\n\ - cmp r0, #0x1\n\ - bne ._1236 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - bl sub_80F3B94\n\ - ldr r0, ._1238 @ gSharedMem\n\ - mov r5, #0xc1\n\ - lsl r5, r5, #0x2\n\ - add r0, r0, r5\n\ - mov r1, #0x7\n\ - strh r1, [r0]\n\ - b ._1249\n\ -._1239:\n\ - .align 2, 0\n\ -._1238:\n\ - .word gSharedMem\n\ -._1236:\n\ - ldr r0, ._1242 @ gMain\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r0, #0x2\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1248 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - bl sub_80F3B94\n\ - ldr r0, ._1242 + 4 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - mov r1, #0x8\n\ - strh r1, [r0]\n\ - b ._1248\n\ -._1243:\n\ - .align 2, 0\n\ -._1242:\n\ - .word gMain\n\ - .word gSharedMem\n\ -._1195:\n\ - bl sub_80F3BD4\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1248 @cond_branch\n\ - ldr r0, ._1246 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r0, r2\n\ -._1211:\n\ - mov r1, #0x4\n\ - strh r1, [r0]\n\ - b ._1248\n\ -._1247:\n\ - .align 2, 0\n\ -._1246:\n\ - .word gSharedMem\n\ -._1196:\n\ - bl sub_80F3BD4\n\ - lsl r0, r0, #0x18\n\ - lsr r4, r0, #0x18\n\ - cmp r4, #0\n\ - bne ._1248 @cond_branch\n\ - mov r0, #0x5\n\ - bl sub_80EEFBC\n\ - ldr r0, ._1250 @ gSharedMem\n\ - mov r5, #0xc1\n\ - lsl r5, r5, #0x2\n\ - add r0, r0, r5\n\ - strh r4, [r0]\n\ -._1248:\n\ - ldr r0, ._1250 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1249 @cond_branch\n\ - ldr r0, ._1250 + 8 @ gLink\n\ - ldr r1, ._1250 + 12 @ 0xfbd\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - mov r1, #0x4\n\ - str r1, [sp]\n\ - mov r1, #0x1\n\ - mov r2, #0x4\n\ - mov r3, #0x2\n\ - bl debug_sub_8008264\n\ -._1249:\n\ - add sp, sp, #0x4\n\ - pop {r4, r5}\n\ - pop {r0}\n\ - bx r0\n\ -._1251:\n\ - .align 2, 0\n\ -._1250:\n\ - .word gSharedMem\n\ - .word gLinkOpen\n\ - .word gLink\n\ - .word 0xfbd"); -} -#else void sub_80EE06C() { switch (ewram0_10.var304) @@ -6755,571 +2877,96 @@ void sub_80EE06C() break; case 6: switch (sub_80F68E8()) - { - case 1: - PlaySE(SE_SELECT); - sub_80F3B94(); - ewram0_10.var304 = 0x7; - break; - default: - case 0: - if (gMain.newKeys & B_BUTTON) - { - PlaySE(SE_SELECT); - sub_80F3B94(); - ewram0_10.var304 = 0x8; - } - break; - } - break; - case 7: - if (!sub_80F3BD4()) - ewram0_10.var304 = 0x4; - break; - case 8: - if (!sub_80F3BD4()) - { - sub_80EEFBC(0x5); - ewram0_10.var304 = 0; - } - break; - } -} -#endif - -#if DEBUG -__attribute__((naked)) -void sub_80EE294() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r1, ._1254 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r0, r1, r2\n\ - ldrh r0, [r0]\n\ - add r4, r1, #0\n\ - cmp r0, #0x8\n\ - bls ._1252 @cond_branch\n\ - b ._1288\n\ -._1252:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._1254 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._1255:\n\ - .align 2, 0\n\ -._1254:\n\ - .word gSharedMem\n\ - .word ._1256\n\ -._1256:\n\ - .word ._1257\n\ - .word ._1258\n\ - .word ._1259\n\ - .word ._1260\n\ - .word ._1261\n\ - .word ._1262\n\ - .word ._1263\n\ - .word ._1264\n\ - .word ._1265\n\ -._1257:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r3, #0x10\n\ - b ._1266\n\ -._1258:\n\ - ldr r0, ._1270 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1267 @cond_branch\n\ - b ._1288\n\ -._1267:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - bl sub_80F3C2C\n\ - bl sub_80EEE08\n\ - ldr r1, ._1270 + 4 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1280\n\ -._1271:\n\ - .align 2, 0\n\ -._1270:\n\ - .word gPaletteFade\n\ - .word gSharedMem\n\ -._1259:\n\ - bl sub_80F6134\n\ - mov r0, #0x1\n\ - bl sub_80F0264\n\ - ldr r1, ._1274 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._1260:\n\ - bl sub_80F02A0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1288 @cond_branch\n\ - ldr r1, ._1274 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1280\n\ -._1275:\n\ - .align 2, 0\n\ -._1274:\n\ - .word gSharedMem\n\ -._1261:\n\ - mov r0, #0x4\n\ - bl sub_80EEFBC\n\ - mov r0, #0x1\n\ - bl sub_80F3008\n\ - ldr r0, ._1277 @ sub_80EBD18\n\ - bl SetVBlankCallback\n\ - ldr r1, ._1277 + 4 @ gSharedMem\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r1, r2\n\ - b ._1280\n\ -._1278:\n\ - .align 2, 0\n\ -._1277:\n\ - .word sub_80EBD18+1\n\ - .word gSharedMem\n\ -._1262:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._1288 @cond_branch\n\ - ldr r1, ._1281 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1280\n\ -._1282:\n\ - .align 2, 0\n\ -._1281:\n\ - .word gSharedMem\n\ -._1263:\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ -._1266:\n\ - bl BeginNormalPaletteFade\n\ - mov r2, #0xc1\n\ - lsl r2, r2, #0x2\n\ - add r1, r4, r2\n\ -._1280:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._1288\n\ -._1264:\n\ - mov r0, #0x4\n\ - bl sub_80EED2C\n\ - ldr r1, ._1286 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - ldr r0, ._1286 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1288 @cond_branch\n\ - ldr r0, ._1286 + 8 @ 0x6007de0\n\ - ldr r2, ._1286 + 12 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ - b ._1288\n\ -._1287:\n\ - .align 2, 0\n\ -._1286:\n\ - .word gSharedMem\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800\n\ -._1265:\n\ - ldr r0, ._1289 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1288 @cond_branch\n\ - ldr r0, ._1289 + 4 @ sub_80EDDBC\n\ - bl sub_80EBDBC\n\ -._1288:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._1290:\n\ - .align 2, 0\n\ -._1289:\n\ - .word gPaletteFade\n\ - .word sub_80EDDBC+1"); -} -#else -void sub_80EE294() -{ - switch (ewram0_10.var304) - { - case 0: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); - ewram0_10.var304++; - break; - case 1: - if (!gPaletteFade.active) - { - SetVBlankCallback(NULL); - sub_80EED0C(); - sub_80F3C2C(); - sub_80EEE08(); - ewram0_10.var304++; - } - break; - case 2: - sub_80F6134(); - sub_80F0264(0x1); - ewram0_10.var304++; - case 3: - if (!sub_80F02A0()) - ewram0_10.var304++; - break; - case 4: - sub_80EEFBC(0x4); - sub_80F3008(0x1); - SetVBlankCallback(&sub_80EBD18); - ewram0_10.var304++; - break; - case 5: - if (!sub_8055870()) - ewram0_10.var304++; - break; - case 6: - BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); - ewram0_10.var304++; - break; - case 7: - sub_80EED2C(0x4); - ewram0_10.var304++; - break; - case 8: - if (!gPaletteFade.active) - sub_80EBDBC(&sub_80EDDBC); - break; - } -} -#endif - -#if DEBUG -__attribute__((naked)) -void sub_80EE3D8() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r0, ._1293 @ gSharedMem\n\ - mov r1, #0xc1\n\ - lsl r1, r1, #0x2\n\ - add r0, r0, r1\n\ - ldrh r0, [r0]\n\ - cmp r0, #0xd\n\ - bls ._1291 @cond_branch\n\ - b ._1354\n\ -._1291:\n\ - lsl r0, r0, #0x2\n\ - ldr r1, ._1293 + 4 @ \n\ - add r0, r0, r1\n\ - ldr r0, [r0]\n\ - mov pc, r0\n\ -._1294:\n\ - .align 2, 0\n\ -._1293:\n\ - .word gSharedMem\n\ - .word ._1295\n\ -._1295:\n\ - .word ._1296\n\ - .word ._1297\n\ - .word ._1298\n\ - .word ._1299\n\ - .word ._1300\n\ - .word ._1301\n\ - .word ._1302\n\ - .word ._1303\n\ - .word ._1304\n\ - .word ._1305\n\ - .word ._1306\n\ - .word ._1307\n\ - .word ._1308\n\ - .word ._1309\n\ -._1296:\n\ - bl sub_80F1E84\n\ - mov r0, #0x0\n\ - bl sub_80F2D04\n\ - ldr r1, ._1311 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1312:\n\ - .align 2, 0\n\ -._1311:\n\ - .word gSharedMem\n\ -._1297:\n\ - bl sub_80F1F10\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1313 @cond_branch\n\ - b ._1354\n\ -._1313:\n\ - mov r0, #0x9\n\ - bl sub_80EEFBC\n\ - ldr r1, ._1316 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1317:\n\ - .align 2, 0\n\ -._1316:\n\ - .word gSharedMem\n\ -._1298:\n\ - bl sub_80EEF34\n\ - lsl r0, r0, #0x18\n\ - lsr r2, r0, #0x18\n\ - cmp r2, #0\n\ - beq ._1318 @cond_branch\n\ - b ._1354\n\ -._1318:\n\ - ldr r4, ._1321 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - str r2, [sp]\n\ - mov r2, #0x0\n\ - mov r3, #0x10\n\ - bl BeginNormalPaletteFade\n\ - b ._1320\n\ -._1322:\n\ - .align 2, 0\n\ -._1321:\n\ - .word gSharedMem\n\ -._1299:\n\ - ldr r0, ._1326 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1323 @cond_branch\n\ - b ._1354\n\ -._1323:\n\ - mov r0, #0x0\n\ - bl SetVBlankCallback\n\ - bl sub_80EED0C\n\ - bl sub_80EF814\n\ - bl sub_80EEE08\n\ - ldr r1, ._1326 + 4 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1327:\n\ - .align 2, 0\n\ -._1326:\n\ - .word gPaletteFade\n\ - .word gSharedMem\n\ -._1300:\n\ - bl sub_80F2620\n\ - ldr r1, ._1329 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1330:\n\ - .align 2, 0\n\ -._1329:\n\ - .word gSharedMem\n\ -._1301:\n\ - mov r0, #0x2\n\ - bl sub_80F0264\n\ - ldr r1, ._1334 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._1302:\n\ - bl sub_80F02A0\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - beq ._1331 @cond_branch\n\ - b ._1354\n\ -._1331:\n\ - ldr r1, ._1334 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1335:\n\ - .align 2, 0\n\ -._1334:\n\ - .word gSharedMem\n\ -._1303:\n\ - mov r0, #0x3\n\ - bl sub_80F2C80\n\ - ldr r1, ._1338 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ -._1304:\n\ - mov r0, #0x3\n\ - bl sub_80F2CBC\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1354 @cond_branch\n\ - ldr r1, ._1338 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1339:\n\ - .align 2, 0\n\ -._1338:\n\ - .word gSharedMem\n\ -._1305:\n\ - mov r0, #0x2\n\ - bl sub_80F3008\n\ - ldr r1, ._1341 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1342:\n\ - .align 2, 0\n\ -._1341:\n\ - .word gSharedMem\n\ -._1306:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._1354 @cond_branch\n\ - ldr r1, ._1345 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - b ._1344\n\ -._1346:\n\ - .align 2, 0\n\ -._1345:\n\ - .word gSharedMem\n\ -._1307:\n\ - bl sub_80F6F10\n\ - ldr r4, ._1348 @ gSharedMem\n\ - mov r1, #0xc2\n\ - lsl r1, r1, #0x2\n\ - add r0, r4, r1\n\ - ldr r0, [r0]\n\ - mov r1, #0x1\n\ - neg r1, r1\n\ - mov r2, #0x0\n\ - str r2, [sp]\n\ - mov r2, #0x10\n\ - mov r3, #0x0\n\ - bl BeginNormalPaletteFade\n\ - ldr r0, ._1348 + 4 @ sub_80EBD68\n\ - bl SetVBlankCallback\n\ -._1320:\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r4, r0\n\ -._1344:\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - b ._1354\n\ -._1349:\n\ - .align 2, 0\n\ -._1348:\n\ - .word gSharedMem\n\ - .word sub_80EBD68+1\n\ -._1308:\n\ - mov r0, #0x5\n\ - bl sub_80EED2C\n\ - ldr r1, ._1352 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r1, r1, r0\n\ - ldrh r0, [r1]\n\ - add r0, r0, #0x1\n\ - strh r0, [r1]\n\ - ldr r0, ._1352 + 4 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1354 @cond_branch\n\ - ldr r0, ._1352 + 8 @ 0x6007de0\n\ - ldr r2, ._1352 + 12 @ 0x600f800\n\ - mov r1, #0x0\n\ - mov r3, #0x4\n\ - bl debug_sub_8008218\n\ - b ._1354\n\ -._1353:\n\ - .align 2, 0\n\ -._1352:\n\ - .word gSharedMem\n\ - .word gLinkOpen\n\ - .word 0x6007de0\n\ - .word 0x600f800\n\ -._1309:\n\ - ldr r0, ._1355 @ gPaletteFade\n\ - ldrb r1, [r0, #0x7]\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - bne ._1354 @cond_branch\n\ - ldr r0, ._1355 + 4 @ sub_80EE58C\n\ - bl sub_80EBDBC\n\ -._1354:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r0}\n\ - bx r0\n\ -._1356:\n\ - .align 2, 0\n\ -._1355:\n\ - .word gPaletteFade\n\ - .word sub_80EE58C+1"); + { + case 1: + PlaySE(SE_SELECT); + sub_80F3B94(); + ewram0_10.var304 = 0x7; + return; + default: + case 0: + if (gMain.newKeys & B_BUTTON) + { + PlaySE(SE_SELECT); + sub_80F3B94(); + ewram0_10.var304 = 0x8; + } + break; + } + break; + case 7: + if (!sub_80F3BD4()) + ewram0_10.var304 = 0x4; + break; + case 8: + if (!sub_80F3BD4()) + { + sub_80EEFBC(0x5); + ewram0_10.var304 = 0; + } + break; + } +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008264(gLink.recvQueue.count, 1, 4, 2, 4); +#endif } -#else + +void sub_80EE294() +{ + switch (ewram0_10.var304) + { + case 0: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; + break; + case 1: + if (!gPaletteFade.active) + { + SetVBlankCallback(NULL); + sub_80EED0C(); + sub_80F3C2C(); + sub_80EEE08(); + ewram0_10.var304++; + } + break; + case 2: + sub_80F6134(); + sub_80F0264(0x1); + ewram0_10.var304++; + case 3: + if (!sub_80F02A0()) + ewram0_10.var304++; + break; + case 4: + sub_80EEFBC(0x4); + sub_80F3008(0x1); + SetVBlankCallback(&sub_80EBD18); + ewram0_10.var304++; + break; + case 5: + if (!sub_8055870()) + ewram0_10.var304++; + break; + case 6: + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + ewram0_10.var304++; + break; + case 7: + sub_80EED2C(0x4); + ewram0_10.var304++; +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif + break; + case 8: + if (!gPaletteFade.active) + sub_80EBDBC(&sub_80EDDBC); + break; + } +} + void sub_80EE3D8() { switch (ewram0_10.var304) @@ -7388,6 +3035,10 @@ void sub_80EE3D8() case 12: sub_80EED2C(0x5); ewram0_10.var304++; +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008218((void *)(VRAM + 0x7DE0), 0, (void *)(VRAM + 0xF800), 4); +#endif break; case 13: if (!gPaletteFade.active) @@ -7395,143 +3046,7 @@ void sub_80EE3D8() break; } } -#endif -#if DEBUG -__attribute__((naked)) -void sub_80EE58C() -{ - asm("\ - push {r4, r5, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r5, ._1361 @ gSharedMem\n\ - mov r0, #0xc1\n\ - lsl r0, r0, #0x2\n\ - add r4, r5, r0\n\ - ldrh r0, [r4]\n\ - cmp r0, #0x1\n\ - beq ._1357 @cond_branch\n\ - cmp r0, #0x1\n\ - bgt ._1358 @cond_branch\n\ - cmp r0, #0\n\ - beq ._1359 @cond_branch\n\ - b ._1383\n\ -._1362:\n\ - .align 2, 0\n\ -._1361:\n\ - .word gSharedMem\n\ -._1358:\n\ - cmp r0, #0x2\n\ - beq ._1363 @cond_branch\n\ - b ._1383\n\ -._1359:\n\ - bl sub_80F5DD4\n\ - lsl r0, r0, #0x18\n\ - lsr r0, r0, #0x18\n\ - cmp r0, #0x1\n\ - beq ._1365 @cond_branch\n\ - cmp r0, #0x2\n\ - beq ._1366 @cond_branch\n\ - ldr r0, ._1369 @ gMain\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r0, #0x1\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1367 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._1369 + 4 @ sub_80EE658\n\ - bl sub_80EBDBC\n\ - b ._1384\n\ -._1370:\n\ - .align 2, 0\n\ -._1369:\n\ - .word gMain\n\ - .word sub_80EE658+1\n\ -._1365:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r1, ._1372 @ 0x876e\n\ - add r0, r5, r1\n\ - ldrb r0, [r0]\n\ - bl sub_80F0FFC\n\ - b ._1384\n\ -._1373:\n\ - .align 2, 0\n\ -._1372:\n\ - .word 0x876e\n\ -._1366:\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - strh r0, [r4]\n\ - b ._1384\n\ -._1367:\n\ - mov r0, #0x2\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1383 @cond_branch\n\ - mov r0, #0x5\n\ - bl PlaySE\n\ - ldr r0, ._1377 @ sub_80EE8F4\n\ - bl sub_80EBDBC\n\ - b ._1384\n\ -._1378:\n\ - .align 2, 0\n\ -._1377:\n\ - .word sub_80EE8F4+1\n\ -._1357:\n\ - bl sub_80F0718\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bne ._1383 @cond_branch\n\ - ldr r1, ._1381 @ 0x876e\n\ - add r0, r5, r1\n\ - ldrb r0, [r0]\n\ - bl sub_80F0FFC\n\ - bl sub_80F3264\n\ - ldrh r0, [r4]\n\ - add r0, r0, #0x1\n\ - b ._1380\n\ -._1382:\n\ - .align 2, 0\n\ -._1381:\n\ - .word 0x876e\n\ -._1363:\n\ - bl sub_8055870\n\ - cmp r0, #0\n\ - bne ._1383 @cond_branch\n\ -._1380:\n\ - strh r0, [r4]\n\ -._1383:\n\ - ldr r0, ._1385 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1384 @cond_branch\n\ - ldr r0, ._1385 + 4 @ gLink\n\ - ldr r1, ._1385 + 8 @ 0xfbd\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - mov r1, #0x4\n\ - str r1, [sp]\n\ - mov r1, #0x1\n\ - mov r2, #0x3\n\ - mov r3, #0x2\n\ - bl debug_sub_8008264\n\ -._1384:\n\ - add sp, sp, #0x4\n\ - pop {r4, r5}\n\ - pop {r0}\n\ - bx r0\n\ -._1386:\n\ - .align 2, 0\n\ -._1385:\n\ - .word gLinkOpen\n\ - .word gLink\n\ - .word 0xfbd"); -} -#else void sub_80EE58C() { switch (ewram0_10.var304) @@ -7542,21 +3057,23 @@ void sub_80EE58C() case 1: PlaySE(SE_SELECT); sub_80F0FFC(ewram0_10.var876E); - break; + return; case 2: PlaySE(SE_SELECT); ewram0_10.var304++; - break; + return; default: if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); sub_80EBDBC(&sub_80EE658); + return; } else if (gMain.newKeys & B_BUTTON) { PlaySE(SE_SELECT); sub_80EBDBC(&sub_80EE8F4); + return; } break; } @@ -7574,8 +3091,11 @@ void sub_80EE58C() ewram0_10.var304 = 0; break; } -} +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008264(gLink.recvQueue.count, 1, 3, 2, 4); #endif +} void sub_80EE658() { @@ -8006,108 +3526,6 @@ _080EEC0A:\n\ #endif // var6dad and var6dae must be s8 in this func -#if DEBUG -__attribute__((naked)) -bool8 sub_80EEC10() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r0, ._1563 @ gMain\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r0, #0x40\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1559 @cond_branch\n\ - ldr r1, ._1563 + 4 @ gSharedMem\n\ - add r3, r1, #1\n\ - add r2, r1, #5\n\ -._1561:\n\ - ldrb r0, [r1]\n\ - sub r0, r0, #0x1\n\ - strb r0, [r1]\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bge ._1560 @cond_branch\n\ - ldrb r0, [r3]\n\ - sub r0, r0, #0x1\n\ - strb r0, [r1]\n\ -._1560:\n\ - mov r0, #0x0\n\ - ldsb r0, [r1, r0]\n\ - add r0, r0, r2\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._1561 @cond_branch\n\ - mov r0, #0x1\n\ - b ._1568\n\ -._1564:\n\ - .align 2, 0\n\ -._1563:\n\ - .word gMain\n\ - .word gSharedMem+0x6dad\n\ -._1559:\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1565 @cond_branch\n\ - ldr r1, ._1569 @ gSharedMem\n\ - mov r4, #0x0\n\ - mov r2, #0x1\n\ - ldsb r2, [r1, r2]\n\ - add r3, r1, #5\n\ -._1567:\n\ - ldrb r0, [r1]\n\ - add r0, r0, #0x1\n\ - strb r0, [r1]\n\ - lsl r0, r0, #0x18\n\ - asr r0, r0, #0x18\n\ - cmp r0, r2\n\ - blt ._1566 @cond_branch\n\ - strb r4, [r1]\n\ -._1566:\n\ - mov r0, #0x0\n\ - ldsb r0, [r1, r0]\n\ - add r0, r0, r3\n\ - ldrb r0, [r0]\n\ - cmp r0, #0\n\ - beq ._1567 @cond_branch\n\ - mov r0, #0x1\n\ - b ._1568\n\ -._1570:\n\ - .align 2, 0\n\ -._1569:\n\ - .word gSharedMem+0x6dad\n\ -._1565:\n\ - ldr r0, ._1572 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1571 @cond_branch\n\ - ldr r0, ._1572 + 4 @ gLink\n\ - ldr r1, ._1572 + 8 @ 0xfbd\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - mov r1, #0x4\n\ - str r1, [sp]\n\ - mov r1, #0x6\n\ - mov r2, #0xa\n\ - mov r3, #0x2\n\ - bl debug_sub_8008264\n\ -._1571:\n\ - mov r0, #0x0\n\ -._1568:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r1}\n\ - bx r1\n\ -._1573:\n\ - .align 2, 0\n\ -._1572:\n\ - .word gLinkOpen\n\ - .word gLink\n\ - .word 0xfbd"); -} -#else bool8 sub_80EEC10() { if (gMain.newKeys & 0x40) @@ -8128,106 +3546,13 @@ bool8 sub_80EEC10() } while (!ewram0_10.var6db2[ewram0_11.var6dad]); return TRUE; } +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008264(gLink.recvQueue.count, 6, 10, 2, 4); +#endif return FALSE; } -#endif -#if DEBUG -__attribute__((naked)) -bool8 sub_80EEC90() -{ - asm("\ - push {r4, lr}\n\ - add sp, sp, #0xfffffffc\n\ - ldr r0, ._1577 @ gMain\n\ - ldrh r1, [r0, #0x2e]\n\ - mov r0, #0x40\n\ - and r0, r0, r1\n\ - lsl r0, r0, #0x10\n\ - lsr r3, r0, #0x10\n\ - cmp r3, #0\n\ - beq ._1574 @cond_branch\n\ - ldr r2, ._1577 + 4 @ gSharedMem\n\ - ldr r0, ._1577 + 8 @ 0x6dad\n\ - add r1, r2, r0\n\ - ldrb r0, [r1]\n\ - sub r0, r0, #0x1\n\ - strb r0, [r1]\n\ - lsl r0, r0, #0x18\n\ - cmp r0, #0\n\ - bge ._1580 @cond_branch\n\ - ldr r3, ._1577 + 12 @ 0x6dae\n\ - add r0, r2, r3\n\ - ldrb r0, [r0]\n\ - sub r0, r0, #0x1\n\ - strb r0, [r1]\n\ - b ._1580\n\ -._1578:\n\ - .align 2, 0\n\ -._1577:\n\ - .word gMain\n\ - .word gSharedMem\n\ - .word 0x6dad\n\ - .word 0x6dae\n\ -._1574:\n\ - mov r0, #0x80\n\ - and r0, r0, r1\n\ - cmp r0, #0\n\ - beq ._1579 @cond_branch\n\ - ldr r0, ._1582 @ gSharedMem\n\ - ldr r4, ._1582 + 4 @ 0x6dad\n\ - add r2, r0, r4\n\ - ldrb r1, [r2]\n\ - add r1, r1, #0x1\n\ - strb r1, [r2]\n\ - add r4, r4, #0x1\n\ - add r0, r0, r4\n\ - lsl r1, r1, #0x18\n\ - asr r1, r1, #0x18\n\ - ldrb r0, [r0]\n\ - lsl r0, r0, #0x18\n\ - asr r0, r0, #0x18\n\ - cmp r1, r0\n\ - blt ._1580 @cond_branch\n\ - strb r3, [r2]\n\ -._1580:\n\ - mov r0, #0x1\n\ - b ._1581\n\ -._1583:\n\ - .align 2, 0\n\ -._1582:\n\ - .word gSharedMem\n\ - .word 0x6dad\n\ -._1579:\n\ - ldr r0, ._1585 @ gLinkOpen\n\ - ldrb r0, [r0]\n\ - cmp r0, #0x1\n\ - bne ._1584 @cond_branch\n\ - ldr r0, ._1585 + 4 @ gLink\n\ - ldr r1, ._1585 + 8 @ 0xfbd\n\ - add r0, r0, r1\n\ - ldrb r0, [r0]\n\ - mov r1, #0x4\n\ - str r1, [sp]\n\ - mov r1, #0x6\n\ - mov r2, #0xa\n\ - mov r3, #0x2\n\ - bl debug_sub_8008264\n\ -._1584:\n\ - mov r0, #0x0\n\ -._1581:\n\ - add sp, sp, #0x4\n\ - pop {r4}\n\ - pop {r1}\n\ - bx r1\n\ -._1586:\n\ - .align 2, 0\n\ -._1585:\n\ - .word gLinkOpen\n\ - .word gLink\n\ - .word 0xfbd"); -} -#else bool8 sub_80EEC90() { if (gMain.newKeys & 0x40) @@ -8242,9 +3567,12 @@ bool8 sub_80EEC90() ewram0_11.var6dad = 0; return TRUE; } +#if DEBUG + if (gLinkOpen == TRUE) + debug_sub_8008264(gLink.recvQueue.count, 6, 10, 2, 4); +#endif return FALSE; } -#endif void sub_80EED0C() { -- cgit v1.2.3 From 5911f59a7dc71c92ea52ff62fcb18e4a8ffa8e69 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 29 Jan 2018 20:15:27 -0800 Subject: More rock.s decompilation --- asm/rock.s | 415 ------------------------------------------------- src/battle/anim/rock.c | 126 +++++++++++++++ 2 files changed, 126 insertions(+), 415 deletions(-) diff --git a/asm/rock.s b/asm/rock.s index 853338ce0..41a04a3f6 100644 --- a/asm/rock.s +++ b/asm/rock.s @@ -7,421 +7,6 @@ @ rock - thumb_func_start sub_80DD190 -sub_80DD190: @ 80DD190 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, _080DD1C0 @ =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - movs r2, 0x8 - ldrsh r0, [r0, r2] - adds r3, r1, 0 - cmp r0, 0 - bne _080DD1CC - ldr r1, _080DD1C4 @ =gBattle_BG1_X - ldr r5, _080DD1C8 @ =0x0000fffa - adds r0, r5, 0 - ldrh r2, [r1] - adds r0, r2 - b _080DD1D2 - .align 2, 0 -_080DD1C0: .4byte gTasks -_080DD1C4: .4byte gBattle_BG1_X -_080DD1C8: .4byte 0x0000fffa -_080DD1CC: - ldr r1, _080DD204 @ =gBattle_BG1_X - ldrh r0, [r1] - adds r0, 0x6 -_080DD1D2: - strh r0, [r1] - adds r4, r1, 0 - ldr r1, _080DD208 @ =gBattle_BG1_Y - ldr r5, _080DD20C @ =0x0000ffff - adds r0, r5, 0 - ldrh r2, [r1] - adds r0, r2 - strh r0, [r1] - lsls r2, r7, 2 - adds r0, r2, r7 - lsls r0, 3 - adds r0, r3 - movs r5, 0x20 - ldrsh r0, [r0, r5] - mov r8, r2 - adds r2, r1, 0 - cmp r0, 0x4 - bls _080DD1F8 - b _080DD37C -_080DD1F8: - lsls r0, 2 - ldr r1, _080DD210 @ =_080DD214 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080DD204: .4byte gBattle_BG1_X -_080DD208: .4byte gBattle_BG1_Y -_080DD20C: .4byte 0x0000ffff -_080DD210: .4byte _080DD214 - .align 2, 0 -_080DD214: - .4byte _080DD228 - .4byte _080DD270 - .4byte _080DD292 - .4byte _080DD2D4 - .4byte _080DD358 -_080DD228: - mov r1, r8 - adds r0, r1, r7 - lsls r0, 3 - adds r3, r0, r3 - ldrh r0, [r3, 0x1C] - adds r0, 0x1 - movs r4, 0 - strh r0, [r3, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - beq _080DD242 - b _080DD37C -_080DD242: - strh r4, [r3, 0x1C] - ldrh r1, [r3, 0x1E] - adds r1, 0x1 - strh r1, [r3, 0x1E] - ldr r2, _080DD26C @ =REG_BLDALPHA - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - strh r1, [r2] - movs r2, 0x1E - ldrsh r0, [r3, r2] - cmp r0, 0x7 - beq _080DD260 - b _080DD37C -_080DD260: - ldrh r0, [r3, 0x20] - adds r0, 0x1 - strh r0, [r3, 0x20] - strh r4, [r3, 0x1E] - b _080DD37C - .align 2, 0 -_080DD26C: .4byte REG_BLDALPHA -_080DD270: - mov r5, r8 - adds r0, r5, r7 - lsls r0, 3 - adds r1, r0, r3 - ldrh r0, [r1, 0x1E] - adds r0, 0x1 - strh r0, [r1, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x65 - bne _080DD37C - movs r0, 0x7 - strh r0, [r1, 0x1E] - ldrh r0, [r1, 0x20] - adds r0, 0x1 - strh r0, [r1, 0x20] - b _080DD37C -_080DD292: - mov r1, r8 - adds r0, r1, r7 - lsls r0, 3 - adds r3, r0, r3 - ldrh r0, [r3, 0x1C] - adds r0, 0x1 - strh r0, [r3, 0x1C] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - bne _080DD37C - movs r0, 0 - strh r0, [r3, 0x1C] - ldrh r1, [r3, 0x1E] - subs r1, 0x1 - strh r1, [r3, 0x1E] - ldr r2, _080DD2D0 @ =REG_BLDALPHA - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - strh r1, [r2] - movs r2, 0x1E - ldrsh r1, [r3, r2] - cmp r1, 0 - bne _080DD37C - ldrh r0, [r3, 0x20] - adds r0, 0x1 - strh r0, [r3, 0x20] - strh r1, [r3, 0x1E] - b _080DD37C - .align 2, 0 -_080DD2D0: .4byte REG_BLDALPHA -_080DD2D4: - mov r0, sp - bl sub_8078914 - ldr r2, [sp] - movs r3, 0x80 - lsls r3, 6 - add r5, sp, 0xC - movs r6, 0 - ldr r1, _080DD38C @ =0x040000d4 - movs r4, 0x80 - lsls r4, 5 - mov r9, r5 - ldr r0, _080DD390 @ =0x85000400 - mov r12, r0 - movs r0, 0x85 - lsls r0, 24 - mov r10, r0 -_080DD2F6: - str r6, [sp, 0xC] - mov r0, r9 - str r0, [r1] - str r2, [r1, 0x4] - mov r0, r12 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r4 - subs r3, r4 - cmp r3, r4 - bhi _080DD2F6 - str r6, [sp, 0xC] - str r5, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 2 - mov r2, r10 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - ldr r1, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0xC] - ldr r0, _080DD38C @ =0x040000d4 - str r5, [r0] - str r1, [r0, 0x4] - ldr r1, _080DD394 @ =0x85000200 - str r1, [r0, 0x8] - ldr r0, [r0, 0x8] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DD344 - ldr r2, _080DD398 @ =REG_BG1CNT - ldrb r1, [r2] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - strb r0, [r2] -_080DD344: - ldr r0, _080DD39C @ =gTasks - mov r5, r8 - adds r1, r5, r7 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x20] - adds r0, 0x1 - strh r0, [r1, 0x20] - ldr r4, _080DD3A0 @ =gBattle_BG1_X - ldr r2, _080DD3A4 @ =gBattle_BG1_Y -_080DD358: - movs r1, 0 - strh r1, [r4] - strh r1, [r2] - ldr r0, _080DD3A8 @ =REG_BLDCNT - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - ldr r2, _080DD398 @ =REG_BG1CNT - ldrb r1, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - adds r0, r7, 0 - bl DestroyAnimVisualTask -_080DD37C: - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DD38C: .4byte 0x040000d4 -_080DD390: .4byte 0x85000400 -_080DD394: .4byte 0x85000200 -_080DD398: .4byte REG_BG1CNT -_080DD39C: .4byte gTasks -_080DD3A0: .4byte gBattle_BG1_X -_080DD3A4: .4byte gBattle_BG1_Y -_080DD3A8: .4byte REG_BLDCNT - thumb_func_end sub_80DD190 - - thumb_func_start sub_80DD3AC -sub_80DD3AC: @ 80DD3AC - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080DD428 - ldr r4, _080DD3F0 @ =gBattleAnimArgs - movs r2, 0x6 - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _080DD3F8 - ldr r0, _080DD3F4 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DD3F8 - movs r0, 0x98 - lsls r0, 1 - strh r0, [r5, 0x20] - ldrh r0, [r4, 0x2] - negs r0, r0 - strh r0, [r4, 0x2] - movs r0, 0x1 - strh r0, [r5, 0x38] - ldrb r1, [r5, 0x3] - subs r0, 0x40 - ands r0, r1 - movs r1, 0x10 - orrs r0, r1 - strb r0, [r5, 0x3] - b _080DD3FC - .align 2, 0 -_080DD3F0: .4byte gBattleAnimArgs -_080DD3F4: .4byte gAnimBankAttacker -_080DD3F8: - ldr r0, _080DD41C @ =0x0000ffc0 - strh r0, [r5, 0x20] -_080DD3FC: - ldr r4, _080DD420 @ =gBattleAnimArgs - ldrh r0, [r4] - strh r0, [r5, 0x22] - ldr r1, _080DD424 @ =gUnknown_083DAD10 - adds r0, r5, 0 - bl SetSubspriteTables - ldrh r0, [r4, 0x2] - strh r0, [r5, 0x30] - ldrh r0, [r4, 0x4] - strh r0, [r5, 0x32] - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - b _080DD484 - .align 2, 0 -_080DD41C: .4byte 0x0000ffc0 -_080DD420: .4byte gBattleAnimArgs -_080DD424: .4byte gUnknown_083DAD10 -_080DD428: - ldrh r1, [r5, 0x30] - ldrh r3, [r5, 0x34] - adds r1, r3 - ldrh r2, [r5, 0x32] - ldrh r0, [r5, 0x36] - adds r2, r0 - lsls r0, r1, 16 - asrs r0, 24 - ldrh r3, [r5, 0x24] - adds r0, r3 - strh r0, [r5, 0x24] - lsls r0, r2, 16 - asrs r0, 24 - ldrh r3, [r5, 0x26] - adds r0, r3 - strh r0, [r5, 0x26] - movs r0, 0xFF - ands r1, r0 - strh r1, [r5, 0x34] - ands r2, r0 - strh r2, [r5, 0x36] - movs r1, 0x38 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080DD46E - movs r2, 0x20 - ldrsh r0, [r5, r2] - movs r3, 0x24 - ldrsh r1, [r5, r3] - adds r0, r1 - movs r1, 0x88 - lsls r1, 1 - cmp r0, r1 - ble _080DD484 - b _080DD480 -_080DD46E: - movs r1, 0x20 - ldrsh r0, [r5, r1] - movs r2, 0x24 - ldrsh r1, [r5, r2] - adds r0, r1 - movs r1, 0x20 - negs r1, r1 - cmp r0, r1 - bge _080DD484 -_080DD480: - ldr r0, _080DD48C @ =DestroyAnimSprite - str r0, [r5, 0x1C] -_080DD484: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DD48C: .4byte DestroyAnimSprite - thumb_func_end sub_80DD3AC - - thumb_func_start sub_80DD490 -sub_80DD490: @ 80DD490 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, _080DD4C8 @ =gBattleAnimArgs - ldrb r1, [r5, 0x8] - bl StartSpriteAnim - adds r0, r4, 0 - movs r1, 0 - bl sub_80787B0 - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x20] - strh r0, [r4, 0x32] - ldrh r0, [r5, 0x4] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x36] - ldr r0, _080DD4CC @ =sub_8078B34 - str r0, [r4, 0x1C] - ldr r1, _080DD4D0 @ =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DD4C8: .4byte gBattleAnimArgs -_080DD4CC: .4byte sub_8078B34 -_080DD4D0: .4byte DestroyAnimSprite - thumb_func_end sub_80DD490 - thumb_func_start sub_80DD4D4 sub_80DD4D4: @ 80DD4D4 push {r4-r7,lr} diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index d4307e7c1..26ac78053 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -17,6 +17,8 @@ extern const u8 gBattleAnimBackgroundTilemap_SandstormBrew[]; extern const u8 gBattleAnimBackgroundImage_SandstormBrew[]; extern const u16 gBattleAnimSpritePalette_261[]; +extern const struct SubspriteTable gUnknown_083DAD10; + static void sub_80DCF1C(struct Sprite *sprite); static void sub_80DD02C(struct Sprite *sprite); void sub_80DD190(u8 taskId); @@ -147,3 +149,127 @@ void do_boulder_dust(u8 taskId) gTasks[taskId].data[0] = var0; gTasks[taskId].func = sub_80DD190; } + +void sub_80DD190(u8 taskId) +{ + struct Struct_sub_8078914 subStruct; + + if (gTasks[taskId].data[0] == 0) + gBattle_BG1_X += 0xFFFA; + else + gBattle_BG1_X += 6; + + gBattle_BG1_Y += -1; + + switch (gTasks[taskId].data[12]) + { + case 0: + if (++gTasks[taskId].data[10] == 4) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[11]++; + REG_BLDALPHA = gTasks[taskId].data[11] | ((16 - gTasks[taskId].data[11]) << 8); + if (gTasks[taskId].data[11] == 7) + { + gTasks[taskId].data[12]++; + gTasks[taskId].data[11] = 0; + } + } + break; + case 1: + if (++gTasks[taskId].data[11] == 101) + { + gTasks[taskId].data[11] = 7; + gTasks[taskId].data[12]++; + } + break; + case 2: + if (++gTasks[taskId].data[10] == 4) + { + gTasks[taskId].data[10] = 0; + gTasks[taskId].data[11]--; + REG_BLDALPHA = gTasks[taskId].data[11] | ((16 - gTasks[taskId].data[11]) << 8); + if (gTasks[taskId].data[11] == 0) + { + gTasks[taskId].data[12]++; + gTasks[taskId].data[11] = 0; + } + } + break; + case 3: + sub_8078914(&subStruct); + DmaFill32Large(3, 0, subStruct.field_0, 0x2000, 0x1000); + DmaClear32(3, subStruct.field_4, 0x800); + if (!IsContest()) + REG_BG1CNT_BITFIELD.charBaseBlock = 0; + + gTasks[taskId].data[12]++; + // fall through + case 4: + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + REG_BG1CNT_BITFIELD.priority = 1; + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80DD3AC(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + if (gBattleAnimArgs[3] != 0 && GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) + { + sprite->pos1.x = 304; + gBattleAnimArgs[1] = -gBattleAnimArgs[1]; + sprite->data[5] = 1; + sprite->oam.matrixNum = 8; + } + else + { + sprite->pos1.x = -64; + } + + sprite->pos1.y = gBattleAnimArgs[0]; + SetSubspriteTables(sprite, &gUnknown_083DAD10); + sprite->data[1] = gBattleAnimArgs[1]; + sprite->data[2] = gBattleAnimArgs[2]; + sprite->data[0]++; + } + else + { + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + sprite->pos2.x += (sprite->data[3] >> 8); + sprite->pos2.y += (sprite->data[4] >> 8); + sprite->data[3] &= 0xFF; + sprite->data[4] &= 0xFF; + + if (sprite->data[5] == 0) + { + if (sprite->pos1.x + sprite->pos2.x > 272) + { + sprite->callback = DestroyAnimSprite; + } + } + else if (sprite->pos1.x + sprite->pos2.x < -32) + { + sprite->callback = DestroyAnimSprite; + } + } +} + +void sub_80DD490(struct Sprite *sprite) +{ + StartSpriteAnim(sprite, gBattleAnimArgs[4]); + sub_80787B0(sprite, 0); + + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[2] = sprite->pos1.x; + sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2]; + + sprite->callback = sub_8078B34; + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); +} -- cgit v1.2.3 From 2df648dc4b9dee51503d319c677456c008b438fb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 30 Jan 2018 19:56:12 -0800 Subject: Finish decompiling rock.s --- asm/rock.s | 869 ------------------------------------------------- include/rom_8077ABC.h | 2 + ld_script.txt | 1 - src/battle/anim/rock.c | 331 ++++++++++++++++++- 4 files changed, 331 insertions(+), 872 deletions(-) delete mode 100644 asm/rock.s diff --git a/asm/rock.s b/asm/rock.s deleted file mode 100644 index 41a04a3f6..000000000 --- a/asm/rock.s +++ /dev/null @@ -1,869 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - @ rock - - thumb_func_start sub_80DD4D4 -sub_80DD4D4: @ 80DD4D4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080DD554 @ =gTasks - adds r6, r1, r0 - ldr r5, _080DD558 @ =gAnimBankAttacker - ldrb r0, [r5] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - ldrb r0, [r5] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 8 - movs r1, 0xC0 - lsls r1, 13 - adds r0, r1 - lsrs r7, r0, 16 - ldr r4, _080DD55C @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldrb r0, [r4] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 8 - movs r2, 0xC0 - lsls r2, 13 - adds r0, r2 - lsrs r0, 16 - mov r8, r0 - ldrb r1, [r5] - movs r0, 0x2 - eors r0, r1 - ldrb r4, [r4] - cmp r0, r4 - bne _080DD544 - mov r8, r7 -_080DD544: - bl sub_80DD8BC - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _080DD560 - movs r0, 0x20 - b _080DD566 - .align 2, 0 -_080DD554: .4byte gTasks -_080DD558: .4byte gAnimBankAttacker -_080DD55C: .4byte gAnimBankTarget -_080DD560: - lsls r1, r5, 3 - movs r0, 0x30 - subs r0, r1 -_080DD566: - strh r0, [r6, 0x18] - movs r4, 0 - strh r4, [r6, 0x8] - strh r4, [r6, 0x1E] - strh r4, [r6, 0x1A] - movs r0, 0x1 - strh r0, [r6, 0x20] - movs r1, 0x18 - ldrsh r0, [r6, r1] - cmp r0, 0 - bge _080DD57E - adds r0, 0x7 -_080DD57E: - asrs r0, 3 - subs r0, 0x1 - strh r0, [r6, 0x1C] - mov r2, r9 - lsls r0, r2, 3 - strh r0, [r6, 0xC] - lsls r0, r7, 3 - strh r0, [r6, 0xE] - mov r1, r10 - subs r0, r1, r2 - lsls r0, 3 - movs r2, 0x18 - ldrsh r1, [r6, r2] - bl __divsi3 - strh r0, [r6, 0x10] - mov r1, r8 - subs r0, r1, r7 - lsls r0, 3 - movs r2, 0x18 - ldrsh r1, [r6, r2] - bl __divsi3 - strh r0, [r6, 0x12] - strh r4, [r6, 0x14] - strh r4, [r6, 0x16] - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - adds r4, r0, 0 - lsls r4, 24 - asrs r4, 8 - lsrs r4, 16 - movs r0, 0x3F - bl BattleAnimAdjustPanning - lsls r0, 24 - strh r4, [r6, 0x22] - asrs r0, 24 - lsls r4, 16 - asrs r4, 16 - subs r0, r4 - movs r2, 0x18 - ldrsh r1, [r6, r2] - bl __divsi3 - strh r0, [r6, 0x24] - strh r5, [r6, 0xA] - movs r0, 0 - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x26] - ldr r0, _080DD600 @ =sub_80DD604 - str r0, [r6] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DD600: .4byte sub_80DD604 - thumb_func_end sub_80DD4D4 - - thumb_func_start sub_80DD604 -sub_80DD604: @ 80DD604 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _080DD628 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _080DD61E - b _080DD76C -_080DD61E: - lsls r0, 2 - ldr r1, _080DD62C @ =_080DD630 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080DD628: .4byte gTasks -_080DD62C: .4byte _080DD630 - .align 2, 0 -_080DD630: - .4byte _080DD644 - .4byte _080DD6A8 - .4byte _080DD6B0 - .4byte _080DD70C - .4byte _080DD75E -_080DD644: - ldrh r2, [r4, 0x14] - ldrh r0, [r4, 0x10] - subs r2, r0 - strh r2, [r4, 0x14] - ldrh r0, [r4, 0x16] - ldrh r1, [r4, 0x12] - subs r0, r1 - strh r0, [r4, 0x16] - ldr r3, _080DD6A4 @ =gSprites - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - lsls r2, 16 - asrs r2, 19 - strh r2, [r0, 0x24] - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r3 - ldrh r0, [r4, 0x16] - lsls r0, 16 - asrs r0, 19 - strh r0, [r1, 0x26] - ldrh r0, [r4, 0x1A] - adds r0, 0x1 - strh r0, [r4, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bne _080DD694 - movs r0, 0x14 - strh r0, [r4, 0x1E] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080DD694: - ldrh r1, [r4, 0x22] - lsls r1, 24 - asrs r1, 24 - movs r0, 0xA2 - bl PlaySE12WithPanning - b _080DD76C - .align 2, 0 -_080DD6A4: .4byte gSprites -_080DD6A8: - ldrh r0, [r4, 0x1E] - subs r0, 0x1 - strh r0, [r4, 0x1E] - b _080DD750 -_080DD6B0: - ldrh r0, [r4, 0x1A] - subs r0, 0x1 - strh r0, [r4, 0x1A] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - beq _080DD6D0 - ldrh r0, [r4, 0x10] - ldrh r2, [r4, 0x14] - adds r0, r2 - strh r0, [r4, 0x14] - ldrh r0, [r4, 0x12] - ldrh r1, [r4, 0x16] - adds r0, r1 - strh r0, [r4, 0x16] - b _080DD6DA -_080DD6D0: - strh r0, [r4, 0x14] - strh r0, [r4, 0x16] - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] -_080DD6DA: - ldr r2, _080DD708 @ =gSprites - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrh r0, [r4, 0x14] - lsls r0, 16 - asrs r0, 19 - strh r0, [r1, 0x24] - movs r1, 0x26 - ldrsh r0, [r4, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrh r0, [r4, 0x16] - lsls r0, 16 - asrs r0, 19 - strh r0, [r1, 0x26] - b _080DD76C - .align 2, 0 -_080DD708: .4byte gSprites -_080DD70C: - ldrh r0, [r4, 0x10] - ldrh r2, [r4, 0xC] - adds r0, r2 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x12] - ldrh r1, [r4, 0xE] - adds r0, r1 - strh r0, [r4, 0xE] - ldrh r0, [r4, 0x1A] - adds r0, 0x1 - strh r0, [r4, 0x1A] - lsls r0, 16 - asrs r0, 16 - movs r2, 0x1C - ldrsh r1, [r4, r2] - cmp r0, r1 - blt _080DD74A - movs r0, 0 - strh r0, [r4, 0x1A] - adds r0, r4, 0 - bl sub_80DD774 - ldrh r1, [r4, 0x24] - ldrh r0, [r4, 0x22] - adds r1, r0 - strh r1, [r4, 0x22] - lsls r1, 24 - asrs r1, 24 - movs r0, 0xAF - bl PlaySE12WithPanning -_080DD74A: - ldrh r0, [r4, 0x18] - subs r0, 0x1 - strh r0, [r4, 0x18] -_080DD750: - lsls r0, 16 - cmp r0, 0 - bne _080DD76C - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080DD76C -_080DD75E: - movs r1, 0x1E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080DD76C - adds r0, r2, 0 - bl DestroyAnimVisualTask -_080DD76C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DD604 - - thumb_func_start sub_80DD774 -sub_80DD774: @ 80DD774 - push {r4-r7,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0xA] - subs r0, 0x1 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - bhi _080DD864 - lsls r0, 2 - ldr r1, _080DD790 @ =_080DD794 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080DD790: .4byte _080DD794 - .align 2, 0 -_080DD794: - .4byte _080DD7A8 - .4byte _080DD7B4 - .4byte _080DD7B4 - .4byte _080DD7C0 - .4byte _080DD7CC -_080DD7A8: - ldr r3, _080DD7B0 @ =gSpriteTemplate_83DAD78 - movs r5, 0 - b _080DD7D0 - .align 2, 0 -_080DD7B0: .4byte gSpriteTemplate_83DAD78 -_080DD7B4: - ldr r3, _080DD7BC @ =gSpriteTemplate_83DAD90 - movs r5, 0x50 - b _080DD7D0 - .align 2, 0 -_080DD7BC: .4byte gSpriteTemplate_83DAD90 -_080DD7C0: - ldr r3, _080DD7C8 @ =gSpriteTemplate_83DAD90 - movs r5, 0x40 - b _080DD7D0 - .align 2, 0 -_080DD7C8: .4byte gSpriteTemplate_83DAD90 -_080DD7CC: - ldr r3, _080DD86C @ =gSpriteTemplate_83DAD90 - movs r5, 0x30 -_080DD7D0: - ldrh r1, [r4, 0xC] - lsls r1, 16 - asrs r1, 19 - lsls r1, 16 - lsrs r1, 16 - ldrh r2, [r4, 0xE] - lsls r2, 16 - asrs r2, 19 - lsls r2, 16 - movs r6, 0x20 - ldrsh r0, [r4, r6] - lsls r0, 2 - adds r1, r0 - lsls r1, 16 - lsrs r6, r1, 16 - asrs r1, 16 - lsrs r7, r2, 16 - asrs r2, 16 - adds r0, r3, 0 - movs r3, 0x23 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _080DD85C - ldr r1, _080DD870 @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - movs r1, 0x12 - strh r1, [r0, 0x2E] - movs r2, 0x20 - ldrsh r1, [r4, r2] - lsls r2, r1, 2 - adds r2, r1 - lsls r2, 2 - adds r2, r6, r2 - movs r6, 0xA - ldrsh r3, [r4, r6] - lsls r1, r3, 1 - adds r1, r3 - adds r2, r1 - strh r2, [r0, 0x32] - strh r7, [r0, 0x36] - movs r1, 0xA - ldrsh r2, [r4, r1] - lsls r2, 1 - movs r3, 0x10 - negs r3, r3 - adds r1, r3, 0 - subs r1, r2 - strh r1, [r0, 0x38] - ldrh r3, [r0, 0x4] - lsls r2, r3, 22 - lsrs r2, 22 - adds r2, r5 - ldr r5, _080DD874 @ =0x000003ff - adds r1, r5, 0 - ands r2, r1 - ldr r1, _080DD878 @ =0xfffffc00 - ands r1, r3 - orrs r1, r2 - strh r1, [r0, 0x4] - bl sub_80786EC - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] -_080DD85C: - movs r6, 0x20 - ldrsh r0, [r4, r6] - negs r0, r0 - strh r0, [r4, 0x20] -_080DD864: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DD86C: .4byte gSpriteTemplate_83DAD90 -_080DD870: .4byte gSprites -_080DD874: .4byte 0x000003ff -_080DD878: .4byte 0xfffffc00 - thumb_func_end sub_80DD774 - - thumb_func_start sub_80DD87C -sub_80DD87C: @ 80DD87C - push {r4,lr} - adds r4, r0, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080DD8AE - ldr r0, _080DD8B4 @ =sub_80DD604 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - beq _080DD8A8 - ldr r0, _080DD8B8 @ =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x1E] - subs r0, 0x1 - strh r0, [r1, 0x1E] -_080DD8A8: - adds r0, r4, 0 - bl DestroySprite -_080DD8AE: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DD8B4: .4byte sub_80DD604 -_080DD8B8: .4byte gTasks - thumb_func_end sub_80DD87C - - thumb_func_start sub_80DD8BC -sub_80DD8BC: @ 80DD8BC - push {lr} - ldr r0, _080DD8E4 @ =gAnimDisableStructPtr - ldr r0, [r0] - ldrb r1, [r0, 0x11] - lsrs r0, r1, 4 - lsls r1, 28 - lsrs r1, 28 - subs r0, r1 - lsls r0, 24 - lsrs r1, r0, 24 - movs r2, 0xFF - lsls r2, 24 - adds r0, r2 - lsrs r0, 24 - cmp r0, 0x4 - bls _080DD8DE - movs r1, 0x1 -_080DD8DE: - adds r0, r1, 0 - pop {r1} - bx r1 - .align 2, 0 -_080DD8E4: .4byte gAnimDisableStructPtr - thumb_func_end sub_80DD8BC - - thumb_func_start sub_80DD8E8 -sub_80DD8E8: @ 80DD8E8 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, _080DD920 @ =gBattleAnimArgs - ldrb r1, [r5, 0x8] - bl StartSpriteAnim - ldrh r0, [r5] - strh r0, [r4, 0x24] - ldrh r0, [r5, 0x2] - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x34] - ldrh r1, [r5, 0x4] - subs r0, r1 - strh r0, [r4, 0x34] - movs r0, 0x3 - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x30] - ldr r0, _080DD924 @ =sub_80DD928 - str r0, [r4, 0x1C] - adds r4, 0x3E - ldrb r0, [r4] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DD920: .4byte gBattleAnimArgs -_080DD924: .4byte sub_80DD928 - thumb_func_end sub_80DD8E8 - - thumb_func_start sub_80DD928 -sub_80DD928: @ 80DD928 - push {lr} - adds r2, r0, 0 - adds r3, r2, 0 - adds r3, 0x3E - ldrb r0, [r3] - movs r1, 0x5 - negs r1, r1 - ands r1, r0 - strb r1, [r3] - ldrh r1, [r2, 0x34] - movs r3, 0x34 - ldrsh r0, [r2, r3] - cmp r0, 0 - beq _080DD960 - ldrh r3, [r2, 0x32] - adds r0, r1, r3 - strh r0, [r2, 0x26] - ldrh r0, [r2, 0x2E] - adds r1, r0 - strh r1, [r2, 0x34] - adds r0, 0x1 - strh r0, [r2, 0x2E] - lsls r1, 16 - cmp r1, 0 - ble _080DD972 - movs r0, 0 - strh r0, [r2, 0x34] - b _080DD972 -_080DD960: - ldrh r0, [r2, 0x30] - subs r0, 0x1 - strh r0, [r2, 0x30] - lsls r0, 16 - cmp r0, 0 - bne _080DD972 - adds r0, r2, 0 - bl DestroyAnimSprite -_080DD972: - pop {r0} - bx r0 - thumb_func_end sub_80DD928 - - thumb_func_start sub_80DD978 -sub_80DD978: @ 80DD978 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _080DD9A0 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080DD994 - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim -_080DD994: - adds r0, r4, 0 - bl sub_807941C - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DD9A0: .4byte gAnimBankAttacker - thumb_func_end sub_80DD978 - - thumb_func_start sub_80DD9A4 -sub_80DD9A4: @ 80DD9A4 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, _080DD9F0 @ =gAnimBankTarget - ldrb r0, [r5] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x20] - ldrb r0, [r5] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080DD9F4 @ =gBattleAnimArgs - ldrh r3, [r2] - ldrh r5, [r4, 0x20] - adds r1, r3, r5 - strh r1, [r4, 0x20] - ldrh r1, [r2, 0x2] - adds r0, r1 - strh r0, [r4, 0x22] - strh r3, [r4, 0x30] - strh r1, [r4, 0x32] - ldrh r0, [r2, 0x4] - strh r0, [r4, 0x38] - ldrb r1, [r2, 0x6] - adds r0, r4, 0 - bl StartSpriteAnim - ldr r0, _080DD9F8 @ =sub_80DD9FC - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DD9F0: .4byte gAnimBankTarget -_080DD9F4: .4byte gBattleAnimArgs -_080DD9F8: .4byte sub_80DD9FC - thumb_func_end sub_80DD9A4 - - thumb_func_start sub_80DD9FC -sub_80DD9FC: @ 80DD9FC - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x8 - strh r0, [r4, 0x2E] - ldrh r0, [r4, 0x30] - ldrh r1, [r4, 0x34] - adds r0, r1 - strh r0, [r4, 0x34] - ldrh r0, [r4, 0x32] - ldrh r2, [r4, 0x36] - adds r0, r2 - strh r0, [r4, 0x36] - movs r1, 0x34 - ldrsh r0, [r4, r1] - movs r1, 0x28 - bl __divsi3 - ldrh r1, [r4, 0x24] - adds r1, r0 - strh r1, [r4, 0x24] - movs r2, 0x2E - ldrsh r0, [r4, r2] - movs r2, 0x38 - ldrsh r1, [r4, r2] - bl Sin - ldrh r1, [r4, 0x26] - subs r1, r0 - strh r1, [r4, 0x26] - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x8C - ble _080DDA46 - adds r0, r4, 0 - bl DestroyAnimSprite -_080DDA46: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DD9FC - - thumb_func_start sub_80DDA4C -sub_80DDA4C: @ 80DDA4C - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r2, _080DDA84 @ =gAnimMoveDmg - ldr r0, [r2] - cmp r0, 0x20 - bgt _080DDA60 - ldr r1, _080DDA88 @ =gBattleAnimArgs - movs r0, 0 - strh r0, [r1, 0xE] -_080DDA60: - ldr r2, [r2] - adds r0, r2, 0 - subs r0, 0x21 - cmp r0, 0x20 - bhi _080DDA70 - ldr r1, _080DDA88 @ =gBattleAnimArgs - movs r0, 0x1 - strh r0, [r1, 0xE] -_080DDA70: - cmp r2, 0x41 - ble _080DDA7A - ldr r1, _080DDA88 @ =gBattleAnimArgs - movs r0, 0x2 - strh r0, [r1, 0xE] -_080DDA7A: - adds r0, r3, 0 - bl DestroyAnimVisualTask - pop {r0} - bx r0 - .align 2, 0 -_080DDA84: .4byte gAnimMoveDmg -_080DDA88: .4byte gBattleAnimArgs - thumb_func_end sub_80DDA4C - - thumb_func_start sub_80DDA8C -sub_80DDA8C: @ 80DDA8C - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, _080DDAE8 @ =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080DDAAE - movs r0, 0 - bl sub_80789D4 - movs r0, 0xC8 - strh r0, [r5, 0xA] -_080DDAAE: - ldr r4, _080DDAEC @ =gBattle_BG3_Y - movs r1, 0xA - ldrsh r0, [r5, r1] - movs r1, 0xA - bl __divsi3 - ldrh r1, [r4] - adds r1, r0 - strh r1, [r4] - ldrh r0, [r5, 0xA] - subs r0, 0x3 - strh r0, [r5, 0xA] - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x78 - bne _080DDADA - movs r0, 0x1 - bl sub_80789D4 - adds r0, r6, 0 - bl DestroyAnimVisualTask -_080DDADA: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DDAE8: .4byte gTasks -_080DDAEC: .4byte gBattle_BG3_Y - thumb_func_end sub_80DDA8C - - thumb_func_start sub_80DDAF0 -sub_80DDAF0: @ 80DDAF0 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - ldr r1, _080DDB5C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080DDB1C - movs r0, 0 - bl sub_80789D4 - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - ldr r0, _080DDB60 @ =gBattle_BG3_Y - ldrh r0, [r0] - strh r0, [r4, 0xC] -_080DDB1C: - ldrh r0, [r4, 0xA] - adds r0, 0x50 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0xA] - ldr r6, _080DDB60 @ =gBattle_BG3_Y - movs r2, 0xA - ldrsh r1, [r4, r2] - movs r0, 0x4 - bl Cos - ldrh r4, [r4, 0xC] - adds r0, r4 - strh r0, [r6] - ldr r0, _080DDB64 @ =gBattleAnimArgs - movs r2, 0xE - ldrsh r1, [r0, r2] - ldr r0, _080DDB68 @ =0x00000fff - cmp r1, r0 - bne _080DDB54 - movs r0, 0 - strh r0, [r6] - movs r0, 0x1 - bl sub_80789D4 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_080DDB54: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DDB5C: .4byte gTasks -_080DDB60: .4byte gBattle_BG3_Y -_080DDB64: .4byte gBattleAnimArgs -_080DDB68: .4byte 0x00000fff - thumb_func_end sub_80DDAF0 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 21ec88a90..81a11ba04 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -103,5 +103,7 @@ bool8 sub_8078718(struct Sprite *sprite); bool8 sub_8078CE8(struct Sprite *sprite); void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); +void sub_807941C(struct Sprite *sprite); +void sub_80789D4(bool8 a1); #endif // GUARD_ROM_8077ABC_H diff --git a/ld_script.txt b/ld_script.txt index d37b73e6d..e08690563 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -296,7 +296,6 @@ SECTIONS { asm/psychic.o(.text); src/battle/anim/bug.o(.text); src/battle/anim/rock.o(.text); - asm/rock.o(.text); asm/ghost.o(.text); src/battle/anim/dragon.o(.text); src/battle/anim/dark.o(.text); diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index 26ac78053..b113ce040 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -4,24 +4,35 @@ #include "decompress.h" #include "palette.h" #include "rom_8077ABC.h" +#include "sound.h" #include "task.h" #include "trig.h" +#include "constants/songs.h" extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; +extern u32 gAnimMoveDmg; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG3_Y; extern const u8 gBattleAnimBackgroundTilemap_SandstormBrew[]; extern const u8 gBattleAnimBackgroundImage_SandstormBrew[]; extern const u16 gBattleAnimSpritePalette_261[]; +extern const struct SpriteTemplate gSpriteTemplate_83DAD78; +extern const struct SpriteTemplate gSpriteTemplate_83DAD90; extern const struct SubspriteTable gUnknown_083DAD10; static void sub_80DCF1C(struct Sprite *sprite); static void sub_80DD02C(struct Sprite *sprite); -void sub_80DD190(u8 taskId); +static void sub_80DD190(u8 taskId); +static void sub_80DD604(u8 taskId); +static void sub_80DD774(struct Task *task); +static u8 sub_80DD8BC(void); +static void sub_80DD928(struct Sprite *sprite); +static void sub_80DD9FC(struct Sprite *sprite); void sub_80DCE9C(struct Sprite *sprite) @@ -150,7 +161,7 @@ void do_boulder_dust(u8 taskId) gTasks[taskId].func = sub_80DD190; } -void sub_80DD190(u8 taskId) +static void sub_80DD190(u8 taskId) { struct Struct_sub_8078914 subStruct; @@ -273,3 +284,319 @@ void sub_80DD490(struct Sprite *sprite) sprite->callback = sub_8078B34; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } + +void sub_80DD4D4(u8 taskId) +{ + u16 var0, var1, var2, var3; + u8 var4; + int var5; + s16 pan1, pan2; + struct Task *task; + + task = &gTasks[taskId]; + + var0 = GetBankPosition(gAnimBankAttacker, 2); + var1 = GetBankPosition(gAnimBankAttacker, 1) + 24; + var2 = GetBankPosition(gAnimBankTarget, 2); + var3 = GetBankPosition(gAnimBankTarget, 1) + 24; + + if ((gAnimBankAttacker ^ 2) == gAnimBankTarget) + var3 = var1; + + var4 = sub_80DD8BC(); + if (var4 == 1) + task->data[8] = 32; + else + task->data[8] = 48 - (var4 * 8); + + task->data[0] = 0; + task->data[11] = 0; + task->data[9] = 0; + task->data[12] = 1; + + var5 = task->data[8]; + if (var5 < 0) + var5 += 7; + + task->data[10] = (var5 >> 3) - 1; + + task->data[2] = var0 * 8; + task->data[3] = var1 * 8; + task->data[4] = ((var2 - var0) * 8) / task->data[8]; + task->data[5] = ((var3 - var1) * 8) / task->data[8]; + task->data[6] = 0; + task->data[7] = 0; + + pan1 = BattleAnimAdjustPanning(-64); + pan2 = BattleAnimAdjustPanning(63); + + task->data[13] = pan1; + task->data[14] = (pan2 - pan1) / task->data[8]; + task->data[1] = var4; + task->data[15] = GetAnimBankSpriteId(0); + + task->func = sub_80DD604; +} + +static void sub_80DD604(u8 taskId) +{ + struct Task *task; + + task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[6] -= task->data[4]; + task->data[7] -= task->data[5]; + gSprites[task->data[15]].pos2.x = task->data[6] >> 3; + gSprites[task->data[15]].pos2.y = task->data[7] >> 3; + + if (++task->data[9] == 10) + { + task->data[11] = 20; + task->data[0]++; + } + + PlaySE12WithPanning(SE_W029, task->data[13]); + break; + case 1: + if (--task->data[11] == 0) + task->data[0]++; + break; + case 2: + if (--task->data[9] != 0) + { + task->data[6] += task->data[4]; + task->data[7] += task->data[5]; + } + else + { + task->data[6] = 0; + task->data[7] = 0; + task->data[0]++; + } + + gSprites[task->data[15]].pos2.x = task->data[6] >> 3; + gSprites[task->data[15]].pos2.y = task->data[7] >> 3; + break; + case 3: + task->data[2] += task->data[4]; + task->data[3] += task->data[5]; + if (++task->data[9] >= task->data[10]) + { + task->data[9] = 0; + sub_80DD774(task); + task->data[13] += task->data[14]; + PlaySE12WithPanning(SE_W091, task->data[13]); + } + + if (--task->data[8] == 0) + { + task->data[0]++; + } + break; + case 4: + if (task->data[11] == 0) + DestroyAnimVisualTask(taskId); + break; + } +} + +static void sub_80DD774(struct Task *task) +{ + const struct SpriteTemplate *spriteTemplate; + int var0; + u16 x, y; + u8 spriteId; + + switch (task->data[1]) + { + case 1: + spriteTemplate = &gSpriteTemplate_83DAD78; + var0 = 0; + break; + case 2: + case 3: + spriteTemplate = &gSpriteTemplate_83DAD90; + var0 = 80; + break; + case 4: + spriteTemplate = &gSpriteTemplate_83DAD90; + var0 = 64; + break; + case 5: + spriteTemplate = &gSpriteTemplate_83DAD90; + var0 = 48; + break; + default: + return; + } + + x = task->data[2] >> 3; + y = task->data[3] >> 3; + x += (task->data[12] * 4); + + spriteId = CreateSprite(spriteTemplate, x, y, 35); + if (spriteId != 64) + { + gSprites[spriteId].data[0] = 18; + gSprites[spriteId].data[2] = ((task->data[12] * 20) + x) + (task->data[1] * 3); + gSprites[spriteId].data[4] = y; + gSprites[spriteId].data[5] = -16 - (task->data[1] * 2); + gSprites[spriteId].oam.tileNum += var0; + + sub_80786EC(&gSprites[spriteId]); + task->data[11]++; + } + + task->data[12] *= -1; +} + +void sub_80DD87C(struct Sprite *sprite) +{ + if (sub_8078718(sprite)) + { + u8 taskId = FindTaskIdByFunc(sub_80DD604); + if (taskId != 0xFF) + gTasks[taskId].data[11]--; + + DestroySprite(sprite); + } +} + +u8 sub_80DD8BC(void) +{ + u8 retVal = gAnimDisableStructPtr->rolloutTimer2 - gAnimDisableStructPtr->rolloutTimer1; + u8 var0 = retVal - 1; + if (var0 > 4) + { + retVal = 1; + } + + return retVal; +} + +void sub_80DD8E8(struct Sprite *sprite) +{ + StartSpriteAnim(sprite, gBattleAnimArgs[4]); + + sprite->pos2.x = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[3] -= gBattleAnimArgs[2]; + sprite->data[0] = 3; + sprite->data[1] = gBattleAnimArgs[3]; + sprite->callback = sub_80DD928; + sprite->invisible = 1; +} + +static void sub_80DD928(struct Sprite *sprite) +{ + sprite->invisible = 0; + if (sprite->data[3] != 0) + { + sprite->pos2.y = sprite->data[2] + sprite->data[3]; + sprite->data[3] += sprite->data[0]; + sprite->data[0]++; + if (sprite->data[3] > 0) + { + sprite->data[3] = 0; + } + } + else + { + if (--sprite->data[1] == 0) + { + DestroyAnimSprite(sprite); + } + } +} + +void sub_80DD978(struct Sprite *sprite) +{ + if (GetBankSide(gAnimBankAttacker) == SIDE_OPPONENT) + StartSpriteAffineAnim(sprite, 1); + + sub_807941C(sprite); +} + +void sub_80DD9A4(struct Sprite *sprite) +{ + sprite->pos1.x = GetBankPosition(gAnimBankTarget, 0); + sprite->pos1.y = GetBankPosition(gAnimBankTarget, 1); + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + + sprite->data[1] = gBattleAnimArgs[0]; + sprite->data[2] = gBattleAnimArgs[1]; + sprite->data[5] = gBattleAnimArgs[2]; + + StartSpriteAnim(sprite, gBattleAnimArgs[3]); + sprite->callback = sub_80DD9FC; +} + +static void sub_80DD9FC(struct Sprite *sprite) +{ + sprite->data[0] += 8; + sprite->data[3] += sprite->data[1]; + sprite->data[4] += sprite->data[2]; + + sprite->pos2.x += sprite->data[3] / 40; + sprite->pos2.y -= Sin(sprite->data[0], sprite->data[5]); + + if (sprite->data[0] > 140) + DestroyAnimSprite(sprite); +} + +void sub_80DDA4C(u8 taskId) +{ + if ((s32)gAnimMoveDmg < 33) + gBattleAnimArgs[7] = 0; + if (gAnimMoveDmg - 33 < 33) + gBattleAnimArgs[7] = 1; + if ((s32)gAnimMoveDmg > 65) + gBattleAnimArgs[7] = 2; + + DestroyAnimVisualTask(taskId); +} + +void sub_80DDA8C(u8 taskId) +{ + if (gTasks[taskId].data[0] == 0) + { + sub_80789D4(0); + gTasks[taskId].data[1] = 200; + } + + gBattle_BG3_Y += gTasks[taskId].data[1] / 10; + gTasks[taskId].data[1] -= 3; + + if (gTasks[taskId].data[0] == 120) + { + sub_80789D4(1); + DestroyAnimVisualTask(taskId); + } + + gTasks[taskId].data[0]++; +} + +void sub_80DDAF0(u8 taskId) +{ + if (gTasks[taskId].data[0] == 0) + { + sub_80789D4(0); + gTasks[taskId].data[0]++; + gTasks[taskId].data[2] = gBattle_BG3_Y; + } + + gTasks[taskId].data[1] += 80; + gTasks[taskId].data[1] &= 0xFF; + gBattle_BG3_Y = gTasks[taskId].data[2] + Cos(4, gTasks[taskId].data[1]); + + if (gBattleAnimArgs[7] == 0xFFF) + { + gBattle_BG3_Y = 0; + sub_80789D4(1); + DestroyAnimVisualTask(taskId); + } +} -- cgit v1.2.3 From 58928acf41b3ed7fc9f7de12db2aad27de744203 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 30 Jan 2018 20:13:43 -0800 Subject: Use standard naming convention for pc_screen_effect.h guard --- include/pc_screen_effect.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/pc_screen_effect.h b/include/pc_screen_effect.h index 36661bc3b..d3f6d22de 100644 --- a/include/pc_screen_effect.h +++ b/include/pc_screen_effect.h @@ -1,5 +1,5 @@ -#ifndef POKERUBY_PC_SCREEN_EFFECT_H -#define POKERUBY_PC_SCREEN_EFFECT_H +#ifndef GUARD_PC_SCREEN_EFFECT_H +#define GUARD_PC_SCREEN_EFFECT_H struct PCScreenEffectStruct { @@ -18,4 +18,4 @@ bool8 sub_80C5DCC(void); void sub_80C5E38(struct PCScreenEffectStruct *unkStruct); bool8 sub_80C5F98(void); -#endif //POKERUBY_PC_SCREEN_EFFECT_H +#endif //GUARD_PC_SCREEN_EFFECT_H -- cgit v1.2.3 From cb674ce14dc43f99dd76f456e69ab8a90cc3d506 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 31 Jan 2018 15:45:28 -0600 Subject: fix and decompile more battle_2.c debug code --- src/battle/battle_2.c | 511 ++++++++++---------------------------------------- sym_ewram.txt | 1 + 2 files changed, 102 insertions(+), 410 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index a400257dd..b8ad21869 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1376,30 +1376,9 @@ void debug_sub_80125A0(void); u32 debug_sub_8013294(u8, void *, u32); void debug_sub_80132C8(u8, void *, u32); -struct UnknownStruct2023A76 -{ - u16 unk0; - u16 unk2[(0x44-2)/2]; - s16 unk44; - u16 unk46; - u16 unk48[1]; -}; - -struct UnknownStruct2023B02 -{ - u16 unk0[4][4]; - u8 filler20[0x10]; - u16 unk30[4][4]; -}; - -struct UnknownStruct821F424 -{ - u8 filler0[0x12]; - u16 unk12[1][5]; // unknown length -}; - -extern struct UnknownStruct2023A76 gUnknown_Debug_2023A76; -extern struct UnknownStruct2023B02 gUnknown_Debug_2023B02; +extern s16 gUnknown_Debug_2023A76[][0x23]; +extern s16 gUnknown_Debug_2023A76_[][7][5]; +extern s16 gUnknown_Debug_2023B02[][6][4]; extern u8 gUnknown_Debug_03004360; extern struct Window gUnknown_Debug_03004370; extern u8 gUnknown_Debug_030043A0; @@ -1407,7 +1386,7 @@ extern u8 gUnknown_Debug_030043A4; extern u8 gUnknown_Debug_030043A8; extern u8 gBattleBuffersTransferData[]; -extern const struct UnknownStruct821F424 gUnknown_Debug_821F424; +extern const s16 gUnknown_Debug_821F424[][5]; extern const u16 gUnknown_Debug_821F56C[][5]; extern const u8 gUnusedOldCharmap_Gfx_lz[]; @@ -1421,25 +1400,24 @@ void debug_sub_8010800(void) *(u32 *)(gBattleBuffersTransferData + 0x100) = 0; } - void debug_sub_8010818(void) { s32 i; - gUnknown_Debug_2023A76.unk0 = 0x115; - gUnknown_Debug_2023A76.unk46 = 0x115; - for (i = 0; i < 30; i++) + gUnknown_Debug_2023A76[0][0] = 0x115; + gUnknown_Debug_2023A76[1][0] = 0x115; + for (i = 1; i < 31; i++) { - gUnknown_Debug_2023A76.unk2[i] = gUnknown_Debug_821F424.unk12[i][0]; - gUnknown_Debug_2023A76.unk48[i] = gUnknown_Debug_821F424.unk12[i][0]; + gUnknown_Debug_2023A76[0][i] = gUnknown_Debug_821F424[i][4]; + gUnknown_Debug_2023A76[1][i] = gUnknown_Debug_821F424[i][4]; } for (i = 0; i < 6; i++) { for (gUnknown_Debug_030043A8 = 0; gUnknown_Debug_030043A8 < 4; gUnknown_Debug_030043A8++) { - gUnknown_Debug_2023B02.unk0[i][gUnknown_Debug_030043A8] = gUnknown_Debug_821F56C[gUnknown_Debug_030043A8][0]; - gUnknown_Debug_2023B02.unk30[i][gUnknown_Debug_030043A8] = gUnknown_Debug_821F56C[gUnknown_Debug_030043A8][0]; + gUnknown_Debug_2023B02[0][i][gUnknown_Debug_030043A8] = gUnknown_Debug_821F56C[gUnknown_Debug_030043A8][0]; + gUnknown_Debug_2023B02[1][i][gUnknown_Debug_030043A8] = gUnknown_Debug_821F56C[gUnknown_Debug_030043A8][0]; } } } @@ -1490,7 +1468,7 @@ void debug_sub_80108B8(void) debug_nullsub_3(); gUnknown_Debug_030043A8 = 0; debug_sub_80125A0(); - if (gUnknown_Debug_2023A76.unk44 == 8) + if (gUnknown_Debug_2023A76[0][0x22] == 8) { debug_sub_801174C(); } @@ -1510,289 +1488,91 @@ void debug_sub_8010A7C(u8 a, u8 b) gBattleTextBuff1[i] = EOS; } -__attribute__((naked)) -void debug_sub_8010AAC() +// gUnknown_Debug_2023A76_ seems like a 3D array, but this function refuses to match when I do that. +#ifdef NONMATCHING +void debug_sub_8010AAC(u8 a) { - asm( - " push {r4, r5, r6, r7, lr}\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " mov ip, r0\n" - " ldr r6, ._520 @ gBaseStats\n" - " ldr r4, ._520 + 4 @ gUnknown_Debug_2023A76\n" - " ldr r5, ._520 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x2\n" - " add r7, r0, r1\n" - " lsl r1, r7, #0x1\n" - " ldr r3, ._520 + 12 @ gUnknown_Debug_03004360\n" - " ldrb r2, [r3]\n" - " mov r0, #0x46\n" - " mul r2, r2, r0\n" - " add r1, r1, r2\n" - " add r1, r1, r4\n" - " mov r0, #0x0\n" - " ldsh r1, [r1, r0]\n" - " lsl r0, r1, #0x3\n" - " sub r0, r0, r1\n" - " lsl r0, r0, #0x2\n" - " add r0, r0, r6\n" - " ldrb r0, [r0, #0x10]\n" - " add r6, r3, #0\n" - " cmp r0, #0xfe\n" - " beq ._516 @cond_branch\n" - " cmp r0, #0xfe\n" - " bgt ._517 @cond_branch\n" - " cmp r0, #0\n" - " beq ._518 @cond_branch\n" - " b ._523\n" - "._521:\n" - " .align 2, 0\n" - "._520:\n" - " .word gBaseStats\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_030043A4\n" - " .word gUnknown_Debug_03004360\n" - "._517:\n" - " cmp r0, #0xff\n" - " beq ._522 @cond_branch\n" - " b ._523\n" - "._518:\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r2\n" - " add r0, r0, r4\n" - " mov r1, #0x2\n" - " b ._528\n" - "._516:\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r2\n" - " add r0, r0, r4\n" - " mov r1, #0x3\n" - " b ._528\n" - "._522:\n" - " add r0, r7, #4\n" - " lsl r0, r0, #0x1\n" - " add r0, r0, r2\n" - " add r0, r0, r4\n" - " mov r1, #0x4\n" - " b ._528\n" - "._523:\n" - " ldrb r0, [r5]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " add r1, r1, #0x4\n" - " lsl r1, r1, #0x1\n" - " ldrb r0, [r6]\n" - " mov r3, #0x46\n" - " mul r0, r0, r3\n" - " add r1, r1, r0\n" - " add r1, r1, r4\n" - " ldrh r2, [r1]\n" - " mov r0, #0x1\n" - " and r0, r0, r2\n" - " strh r0, [r1]\n" - " mov r1, ip\n" - " cmp r1, #0\n" - " beq ._527 @cond_branch\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r0, #0x4\n" - " lsl r0, r0, #0x1\n" - " ldrb r1, [r6]\n" - " mul r1, r1, r3\n" - " add r0, r0, r1\n" - " add r0, r0, r4\n" - " ldrh r1, [r0]\n" - " mov r2, #0x1\n" - " eor r1, r1, r2\n" - " b ._528\n" - "._527:\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r0, #0x4\n" - " lsl r0, r0, #0x1\n" - " ldrb r1, [r6]\n" - " mul r1, r1, r3\n" - " add r0, r0, r1\n" - " add r0, r0, r4\n" - " mov r1, ip\n" - "._528:\n" - " strh r1, [r0]\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); + switch (gBaseStats[gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][0]].genderRatio) + { + case 0: + gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][4] = 2; + break; + case 0xFE: + gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][4] = 3; + break; + case 0xFF: + gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][4] = 4; + break; + default: + gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][4] &= 1; + if (a != 0) + gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][4] ^= 1; + else + gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][4] = 0; + break; + } } +#else +void debug_sub_8010AAC(u8 a) +{ + switch (gBaseStats[gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5]].genderRatio) + { + case 0: + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + 4] = 2; + break; + case 0xFE: + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + 4] = 3; + break; + case 0xFF: + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + 4] = 4; + break; + default: + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + 4] &= 1; + if (a != 0) + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + 4] ^= 1; + else + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + 4] = 0; + break; + } +} +#endif -__attribute__((naked)) -void debug_sub_8010B80() +void debug_sub_8010B80(u8 a) { - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r9\n" - " mov r6, r8\n" - " push {r6, r7}\n" - " lsl r0, r0, #0x18\n" - " lsr r6, r0, #0x18\n" - " mov r0, #0x0\n" - " mov ip, r0\n" - " ldr r4, ._534 @ gUnknown_Debug_2023A76\n" - " ldr r1, ._534 + 4 @ gUnknown_Debug_030043A0\n" - " mov r8, r1\n" - " ldr r5, ._534 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r5]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " mov r2, r8\n" - " ldrb r2, [r2]\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x1\n" - " ldr r3, ._534 + 12 @ gUnknown_Debug_03004360\n" - " ldrb r2, [r3]\n" - " mov r1, #0x46\n" - " mul r1, r1, r2\n" - " add r0, r0, r1\n" - " add r0, r0, r4\n" - " ldrb r7, [r0]\n" - " lsl r1, r7, #0x18\n" - " asr r0, r1, #0x18\n" - " mov r9, r4\n" - " add r2, r5, #0\n" - " add r4, r3, #0\n" - " cmp r0, #0x9\n" - " ble ._529 @cond_branch\n" - "._530:\n" - " mov r3, #0xf6\n" - " lsl r3, r3, #0x18\n" - " add r0, r1, r3\n" - " lsr r7, r0, #0x18\n" - " mov r1, ip\n" - " lsl r0, r1, #0x18\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x11\n" - " add r0, r0, r3\n" - " lsr r0, r0, #0x18\n" - " mov ip, r0\n" - " lsl r1, r7, #0x18\n" - " asr r0, r1, #0x18\n" - " cmp r0, #0x9\n" - " bgt ._530 @cond_branch\n" - "._529:\n" - " mov r0, #0x2\n" - " and r0, r0, r6\n" - " cmp r0, #0\n" - " beq ._531 @cond_branch\n" - " mov r0, #0x1\n" - " and r0, r0, r6\n" - " cmp r0, #0\n" - " beq ._532 @cond_branch\n" - " mov r1, ip\n" - " lsl r0, r1, #0x18\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x11\n" - " b ._533\n" - "._535:\n" - " .align 2, 0\n" - "._534:\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - " .word gUnknown_Debug_03004360\n" - "._532:\n" - " mov r1, ip\n" - " lsl r0, r1, #0x18\n" - " mov r3, #0xff\n" - " lsl r3, r3, #0x18\n" - "._533:\n" - " add r0, r0, r3\n" - " lsr r0, r0, #0x18\n" - " mov ip, r0\n" - " mov r1, ip\n" - " lsl r0, r1, #0x18\n" - " cmp r0, #0\n" - " bge ._536 @cond_branch\n" - " mov r3, #0x9\n" - " mov ip, r3\n" - "._536:\n" - " mov r1, ip\n" - " lsl r0, r1, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, #0x9\n" - " ble ._542 @cond_branch\n" - " mov r3, #0x0\n" - " mov ip, r3\n" - " b ._542\n" - "._531:\n" - " mov r0, #0x1\n" - " and r0, r0, r6\n" - " cmp r0, #0\n" - " beq ._539 @cond_branch\n" - " lsl r0, r7, #0x18\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x11\n" - " add r0, r0, r1\n" - " b ._540\n" - "._539:\n" - " lsl r0, r7, #0x18\n" - " mov r3, #0xff\n" - " lsl r3, r3, #0x18\n" - " add r0, r0, r3\n" - "._540:\n" - " lsr r7, r0, #0x18\n" - " lsl r0, r7, #0x18\n" - " cmp r0, #0\n" - " bgt ._541 @cond_branch\n" - " mov r7, #0x9\n" - "._541:\n" - " lsl r0, r7, #0x18\n" - " asr r0, r0, #0x18\n" - " cmp r0, #0x9\n" - " ble ._542 @cond_branch\n" - " mov r7, #0x1\n" - "._542:\n" - " ldrb r0, [r2]\n" - " lsl r2, r0, #0x2\n" - " add r2, r2, r0\n" - " mov r0, r8\n" - " ldrb r0, [r0]\n" - " add r2, r2, r0\n" - " lsl r2, r2, #0x1\n" - " ldrb r1, [r4]\n" - " mov r0, #0x1\n" - " eor r0, r0, r1\n" - " mov r1, #0x46\n" - " add r3, r0, #0\n" - " mul r3, r3, r1\n" - " add r3, r2, r3\n" - " add r3, r3, r9\n" - " ldrb r0, [r4]\n" - " mul r0, r0, r1\n" - " add r2, r2, r0\n" - " add r2, r2, r9\n" - " mov r1, ip\n" - " lsl r0, r1, #0x18\n" - " asr r0, r0, #0x18\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x1\n" - " lsl r0, r7, #0x18\n" - " asr r0, r0, #0x18\n" - " add r0, r0, r1\n" - " strh r0, [r2]\n" - " strh r0, [r3]\n" - " pop {r3, r4}\n" - " mov r8, r3\n" - " mov r9, r4\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "\n" - ); + s8 r12 = 0; + s8 r7 = gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][gUnknown_Debug_030043A0]; + + while (r7 >= 10) + { + r7 -= 10; + r12++; + } + + if (a & 2) + { + if (a & 1) + r12++; + else + r12--; + if (r12 < 0) + r12 = 9; + if (r12 > 9) + r12 = 0; + } + else + { + if (a & 1) + r7++; + else + r7--; + if (r7 < 1) + r7 = 9; + if (r7 > 9) + r7 = 1; + } + gUnknown_Debug_2023A76_[gUnknown_Debug_03004360 ^ 1][gUnknown_Debug_030043A4][gUnknown_Debug_030043A0] + = gUnknown_Debug_2023A76_[gUnknown_Debug_03004360][gUnknown_Debug_030043A4][gUnknown_Debug_030043A0] + = r12 * 10 + r7; } __attribute__((naked)) @@ -5119,39 +4899,17 @@ void debug_sub_8012688() ); } -__attribute__((naked)) -void debug_sub_8012878() +void debug_sub_8012878(void) { - asm( - " push {lr}\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " ldr r0, ._876 @ gUnknown_03004210\n" - " bl Text_UpdateWindowInBattle\n" - " bl UpdatePaletteFade\n" - " bl RunTasks\n" - " ldr r0, ._876 + 4 @ gMain\n" - " ldrh r1, [r0, #0x2c]\n" - " mov r0, #0x82\n" - " lsl r0, r0, #0x1\n" - " cmp r1, r0\n" - " bne ._875 @cond_branch\n" - " ldr r0, ._876 + 8 @ debug_sub_80108B8\n" - " bl SetMainCallback2\n" - "._875:\n" - " pop {r0}\n" - " bx r0\n" - "._877:\n" - " .align 2, 0\n" - "._876:\n" - " .word gUnknown_03004210\n" - " .word gMain\n" - " .word debug_sub_80108B8+1\n" - "\n" - ); + AnimateSprites(); + BuildOamBuffer(); + Text_UpdateWindowInBattle(&gUnknown_03004210); + UpdatePaletteFade(); + RunTasks(); + if (gMain.heldKeys == (SELECT_BUTTON | R_BUTTON)) + SetMainCallback2(debug_sub_80108B8); } -/* void debug_sub_80128B4(void) { debug_sub_8010A7C(0, 9); @@ -5164,73 +4922,6 @@ void debug_sub_80128B4(void) Text_InitWindow(&gUnknown_03004210, gBattleTextBuff1, 144, 2, 35); Text_PrintWindow8002F44(&gUnknown_03004210); } -*/ - -__attribute__((naked)) -void debug_sub_80128B4() -{ - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xfffffffc\n" - " mov r0, #0x0\n" - " mov r1, #0x9\n" - " bl debug_sub_8010A7C\n" - " ldr r5, ._878 @ gUnknown_03004210\n" - " ldr r4, ._878 + 4 @ gBattleTextBuff1\n" - " mov r0, #0x23\n" - " mov r8, r0\n" - " str r0, [sp]\n" - " add r0, r5, #0\n" - " add r1, r4, #0\n" - " mov r2, #0x90\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - " add r0, r5, #0\n" - " bl Text_PrintWindow8002F44\n" - " ldr r6, ._878 + 8 @ gCurrentMove\n" - " ldrh r1, [r6]\n" - " add r0, r4, #0\n" - " mov r2, #0x2\n" - " mov r3, #0x3\n" - " bl ConvertIntToDecimalStringN\n" - " mov r0, #0x0\n" - " strb r0, [r4, #0x3]\n" - " mov r0, #0xff\n" - " strb r0, [r4, #0x4]\n" - " ldrh r1, [r6]\n" - " mov r0, #0xb\n" - " mul r1, r1, r0\n" - " ldr r0, ._878 + 12 @ gSpeciesNames\n" - " add r1, r1, r0\n" - " add r0, r4, #0\n" - " bl StringAppend\n" - " mov r0, r8\n" - " str r0, [sp]\n" - " add r0, r5, #0\n" - " add r1, r4, #0\n" - " mov r2, #0x90\n" - " mov r3, #0x2\n" - " bl Text_InitWindow\n" - " add r0, r5, #0\n" - " bl Text_PrintWindow8002F44\n" - " add sp, sp, #0x4\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._879:\n" - " .align 2, 0\n" - "._878:\n" - " .word gUnknown_03004210\n" - " .word gBattleTextBuff1\n" - " .word gCurrentMove\n" - " .word gSpeciesNames\n" - "\n" - ); -} void debug_sub_8012938(u8 taskId) { diff --git a/sym_ewram.txt b/sym_ewram.txt index 5375968d4..43e2054a2 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -41,6 +41,7 @@ gUnknown_02023A14_50 = .; . += 0x2; gUnknown_Debug_2023A76 = .; +gUnknown_Debug_2023A76_ = .; . += 0x4; gUnknown_Debug_2023A7A = .; -- cgit v1.2.3 From 449d5cd95bbd1a3ad291e6ebe0654f47f2f3b6e4 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 31 Jan 2018 18:19:25 -0600 Subject: decompile more battle_2.c debug functions --- src/battle/battle_2.c | 326 ++++++++++---------------------------------------- 1 file changed, 64 insertions(+), 262 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index b8ad21869..d3ddc5960 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -69,6 +69,7 @@ struct UnknownStruct12 extern void sub_802BBD4(); +extern struct SpriteTemplate gUnknown_02024E8C; extern const u8 Str_821F7B8[]; extern u8 gUnknown_02023A14_50; extern const u16 gUnknown_08D004E0[]; @@ -1362,6 +1363,8 @@ extern u8 gUnknown_Debug_2023B62[]; extern const u8 Str_821F7BD[]; extern const u8 Str_821F7DA[]; +void debug_sub_8012878(void); +void debug_sub_8012D10(u8); void debug_sub_8010818(void); void debug_sub_80108B8(void); void debug_sub_8010CAC(void); @@ -1388,6 +1391,7 @@ extern u8 gBattleBuffersTransferData[]; extern const s16 gUnknown_Debug_821F424[][5]; extern const u16 gUnknown_Debug_821F56C[][5]; +extern const u32 gUnknown_Debug_821F798[][4]; extern const u8 gUnusedOldCharmap_Gfx_lz[]; extern const u8 gUnusedOldCharmap_Tilemap_lz[]; @@ -4628,275 +4632,73 @@ void debug_sub_80125E4() ); } -__attribute__((naked)) -void debug_sub_8012628() +void debug_sub_8012628(void) { - asm( - " ldr r3, ._868 @ gSharedMem\n" - " ldr r2, ._868 + 4 @ gUnknown_Debug_821F798\n" - " ldr r0, ._868 + 8 @ gUnknown_Debug_030043A8\n" - " ldrb r1, [r0]\n" - " lsl r1, r1, #0x2\n" - " ldr r0, ._868 + 12 @ gUnknown_Debug_03004360\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x4\n" - " add r1, r1, r0\n" - " add r1, r1, r2\n" - " ldr r0, [r1]\n" - " add r0, r0, r3\n" - " mov r1, #0x6d\n" - " strb r1, [r0]\n" - " bx lr\n" - "._869:\n" - " .align 2, 0\n" - "._868:\n" - " .word gSharedMem\n" - " .word gUnknown_Debug_821F798\n" - " .word gUnknown_Debug_030043A8\n" - " .word gUnknown_Debug_03004360\n" - "\n" - ); + gSharedMem[gUnknown_Debug_821F798[gUnknown_Debug_03004360][gUnknown_Debug_030043A8]] = 0x6D; } -__attribute__((naked)) -void debug_sub_8012658() +void debug_sub_8012658(void) { - asm( - " ldr r3, ._870 @ gSharedMem\n" - " ldr r2, ._870 + 4 @ gUnknown_Debug_821F798\n" - " ldr r0, ._870 + 8 @ gUnknown_Debug_030043A8\n" - " ldrb r1, [r0]\n" - " lsl r1, r1, #0x2\n" - " ldr r0, ._870 + 12 @ gUnknown_Debug_03004360\n" - " ldrb r0, [r0]\n" - " lsl r0, r0, #0x4\n" - " add r1, r1, r0\n" - " add r1, r1, r2\n" - " ldr r0, [r1]\n" - " add r0, r0, r3\n" - " mov r1, #0x81\n" - " strb r1, [r0]\n" - " bx lr\n" - "._871:\n" - " .align 2, 0\n" - "._870:\n" - " .word gSharedMem\n" - " .word gUnknown_Debug_821F798\n" - " .word gUnknown_Debug_030043A8\n" - " .word gUnknown_Debug_03004360\n" - "\n" - ); + gSharedMem[gUnknown_Debug_821F798[gUnknown_Debug_03004360][gUnknown_Debug_030043A8]] = 0x81; } -__attribute__((naked)) -void debug_sub_8012688() +void debug_sub_8012688(void) { - asm( - " push {r4, r5, r6, lr}\n" - " mov r6, r8\n" - " push {r6}\n" - " add sp, sp, #0xfffffff4\n" - " mov r1, #0x0\n" - " mov r4, #0xcd\n" - " lsl r4, r4, #0x1\n" - " ldr r3, ._873 @ gUnknown_Debug_2023B62\n" - " mov r2, #0x0\n" - "._872:\n" - " add r0, r1, r3\n" - " strb r2, [r0]\n" - " add r1, r1, #0x1\n" - " cmp r1, r4\n" - " ble ._872 @cond_branch\n" - " mov r0, #0x0\n" - " bl SetHBlankCallback\n" - " mov r0, #0x0\n" - " bl SetVBlankCallback\n" - " mov r5, #0x0\n" - " str r5, [sp, #0x8]\n" - " ldr r1, ._873 + 4 @ 0x40000d4\n" - " add r0, sp, #0x8\n" - " str r0, [r1]\n" - " mov r0, #0xc0\n" - " lsl r0, r0, #0x13\n" - " str r0, [r1, #0x4]\n" - " ldr r0, ._873 + 8 @ 0x85006000\n" - " str r0, [r1, #0x8]\n" - " ldr r0, [r1, #0x8]\n" - " ldr r0, ._873 + 12 @ 0x400004c\n" - " strh r5, [r0]\n" - " sub r0, r0, #0xc\n" - " strh r5, [r0]\n" - " add r0, r0, #0x4\n" - " strh r5, [r0]\n" - " sub r0, r0, #0x2\n" - " strh r5, [r0]\n" - " add r0, r0, #0x4\n" - " strh r5, [r0]\n" - " add r0, r0, #0x2\n" - " strh r5, [r0]\n" - " add r0, r0, #0x2\n" - " strh r5, [r0]\n" - " ldr r4, ._873 + 16 @ gWindowTemplate_81E6C58\n" - " add r0, r4, #0\n" - " bl Text_LoadWindowTemplate\n" - " bl ResetPaletteFade\n" - " ldr r0, ._873 + 20 @ gBattle_BG0_X\n" - " strh r5, [r0]\n" - " ldr r1, ._873 + 24 @ gBattle_BG0_Y\n" - " mov r0, #0xa0\n" - " strh r0, [r1]\n" - " ldr r0, ._873 + 28 @ gBattle_BG1_X\n" - " strh r5, [r0]\n" - " ldr r0, ._873 + 32 @ gBattle_BG1_Y\n" - " strh r5, [r0]\n" - " ldr r0, ._873 + 36 @ gBattle_BG2_X\n" - " strh r5, [r0]\n" - " ldr r0, ._873 + 40 @ gBattle_BG2_Y\n" - " strh r5, [r0]\n" - " ldr r0, ._873 + 44 @ gBattle_BG3_X\n" - " strh r5, [r0]\n" - " ldr r0, ._873 + 48 @ gBattle_BG3_Y\n" - " strh r5, [r0]\n" - " ldr r1, ._873 + 52 @ gBattleTerrain\n" - " mov r0, #0x9\n" - " strb r0, [r1]\n" - " bl sub_800D6D4\n" - " bl sub_800DAB8\n" - " bl ResetSpriteData\n" - " bl ResetTasks\n" - " bl FreeAllSpritePalettes\n" - " ldr r1, ._873 + 56 @ gReservedSpritePaletteCount\n" - " mov r0, #0x4\n" - " strb r0, [r1]\n" - " ldr r6, ._873 + 60 @ gCurrentMove\n" - " mov r0, #0x1\n" - " strh r0, [r6]\n" - " ldr r0, ._873 + 64 @ gUnknown_03004210\n" - " add r1, r4, #0\n" - " bl Text_InitWindowWithTemplate\n" - " ldrh r2, [r6]\n" - " lsl r0, r2, #0x3\n" - " ldr r1, ._873 + 68 @ gMonFrontPicTable\n" - " add r0, r0, r1\n" - " ldr r1, ._873 + 72 @ gMonFrontPicCoords\n" - " mov r8, r1\n" - " lsl r2, r2, #0x2\n" - " add r2, r2, r8\n" - " ldrb r1, [r2]\n" - " ldrb r2, [r2, #0x1]\n" - " mov r3, #0x80\n" - " lsl r3, r3, #0x12\n" - " ldr r4, ._873 + 76 @ gUnknown_081FAF4C\n" - " ldr r4, [r4, #0x4]\n" - " str r4, [sp]\n" - " ldrh r4, [r6]\n" - " str r4, [sp, #0x4]\n" - " bl DecompressPicFromTable_2\n" - " ldr r1, ._873 + 80 @ gMonPaletteTable\n" - " ldrh r0, [r6]\n" - " lsl r0, r0, #0x3\n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov r1, #0x88\n" - " lsl r1, r1, #0x1\n" - " mov r2, #0x20\n" - " bl LoadCompressedPalette\n" - " ldrh r0, [r6]\n" - " mov r1, #0x1\n" - " bl GetMonSpriteTemplate_803C56C\n" - " ldr r0, ._873 + 84 @ gUnknown_02024E8C\n" - " ldrh r1, [r6]\n" - " lsl r1, r1, #0x2\n" - " add r1, r1, r8\n" - " ldrb r2, [r1, #0x1]\n" - " add r2, r2, #0x28\n" - " mov r1, #0xb0\n" - " mov r3, #0x28\n" - " bl CreateSprite\n" - " add r4, r0, #0\n" - " lsl r4, r4, #0x18\n" - " lsr r4, r4, #0x18\n" - " ldr r3, ._873 + 88 @ gSprites\n" - " lsl r1, r4, #0x4\n" - " add r1, r1, r4\n" - " lsl r1, r1, #0x2\n" - " add r0, r3, #0\n" - " add r0, r0, #0x1c\n" - " add r0, r1, r0\n" - " ldr r2, ._873 + 92 @ nullsub_37\n" - " str r2, [r0]\n" - " add r1, r1, r3\n" - " ldrb r2, [r1, #0x5]\n" - " mov r0, #0xf\n" - " and r0, r0, r2\n" - " mov r2, #0x10\n" - " orr r0, r0, r2\n" - " strb r0, [r1, #0x5]\n" - " mov r1, #0x80\n" - " lsl r1, r1, #0x13\n" - " mov r2, #0xfa\n" - " lsl r2, r2, #0x5\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " ldr r0, ._873 + 96 @ debug_nullsub_45\n" - " bl SetHBlankCallback\n" - " ldr r0, ._873 + 100 @ debug_sub_8011DD4\n" - " bl SetVBlankCallback\n" - " bl m4aMPlayAllStop\n" - " ldr r0, ._873 + 104 @ debug_sub_8012D10\n" - " mov r1, #0x0\n" - " bl CreateTask\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " ldr r2, ._873 + 108 @ gTasks\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x3\n" - " add r1, r1, r2\n" - " strh r5, [r1, #0x8]\n" - " strh r4, [r1, #0xa]\n" - " ldr r0, ._873 + 112 @ debug_sub_8012878\n" - " bl SetMainCallback2\n" - " add sp, sp, #0xc\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6}\n" - " pop {r0}\n" - " bx r0\n" - "._874:\n" - " .align 2, 0\n" - "._873:\n" - " .word gUnknown_Debug_2023B62\n" - " .word 0x40000d4\n" - " .word 0x85006000\n" - " .word 0x400004c\n" - " .word gWindowTemplate_81E6C58\n" - " .word gBattle_BG0_X\n" - " .word gBattle_BG0_Y\n" - " .word gBattle_BG1_X\n" - " .word gBattle_BG1_Y\n" - " .word gBattle_BG2_X\n" - " .word gBattle_BG2_Y\n" - " .word gBattle_BG3_X\n" - " .word gBattle_BG3_Y\n" - " .word gBattleTerrain\n" - " .word gReservedSpritePaletteCount\n" - " .word gCurrentMove\n" - " .word gUnknown_03004210\n" - " .word gMonFrontPicTable\n" - " .word gMonFrontPicCoords\n" - " .word gUnknown_081FAF4C\n" - " .word gMonPaletteTable\n" - " .word gUnknown_02024E8C\n" - " .word gSprites\n" - " .word nullsub_37+1\n" - " .word debug_nullsub_45+1\n" - " .word debug_sub_8011DD4+1\n" - " .word debug_sub_8012D10+1\n" - " .word gTasks\n" - " .word debug_sub_8012878+1\n" - "\n" - ); + s32 i; + u8 spriteId; + u8 taskId; + + for (i = 0; i < 411; i++) + gUnknown_Debug_2023B62[i] = 0; + SetHBlankCallback(NULL); + SetVBlankCallback(NULL); + DmaFill32(3, 0, (void *)VRAM, VRAM_SIZE); + REG_MOSAIC = 0; + REG_WIN0H = 0; + REG_WIN0V = 0; + REG_WIN1H = 0; + REG_WIN1V = 0; + REG_WININ = 0; + REG_WINOUT = 0; + Text_LoadWindowTemplate(&gWindowTemplate_81E6C58); + ResetPaletteFade(); + gBattle_BG0_X = 0; + gBattle_BG0_Y = DISPLAY_HEIGHT; + gBattle_BG1_X = 0; + gBattle_BG1_Y = 0; + gBattle_BG2_X = 0; + gBattle_BG2_Y = 0; + gBattle_BG3_X = 0; + gBattle_BG3_Y = 0; + gBattleTerrain = 9; + sub_800D6D4(); + sub_800DAB8(); + ResetSpriteData(); + ResetTasks(); + FreeAllSpritePalettes(); + gReservedSpritePaletteCount = 4; + gCurrentMove = 1; + Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58); + DecompressPicFromTable_2( + &gMonFrontPicTable[gCurrentMove], + gMonFrontPicCoords[gCurrentMove].coords, + gMonFrontPicCoords[gCurrentMove].y_offset, + (void *)0x02000000, + gUnknown_081FAF4C[1], + gCurrentMove); + LoadCompressedPalette(gMonPaletteTable[gCurrentMove].data, 272, 32); + GetMonSpriteTemplate_803C56C(gCurrentMove, 1); + spriteId = CreateSprite(&gUnknown_02024E8C, 176, 40 + gMonFrontPicCoords[gCurrentMove].y_offset, 40); + gSprites[spriteId].callback = nullsub_37; + gSprites[spriteId].oam.paletteNum = 1; + REG_DISPCNT = 0x1F40; + SetHBlankCallback(debug_nullsub_45); + SetVBlankCallback(debug_sub_8011DD4); + m4aMPlayAllStop(); + taskId = CreateTask(debug_sub_8012D10, 0); + gTasks[taskId].data[0] = 0; + gTasks[taskId].data[1] = spriteId; + SetMainCallback2(debug_sub_8012878); } void debug_sub_8012878(void) -- cgit v1.2.3 From c410df510012f7a6ccfc342b398cd5d407fb0bf6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 31 Jan 2018 18:33:01 -0800 Subject: Start decompiling psychic.s --- asm/psychic.s | 934 ---------------------------------------------- include/battle_anim.h | 1 + include/rom_8077ABC.h | 2 +- ld_script.txt | 1 + src/battle/anim/psychic.c | 356 ++++++++++++++++++ src/rom_8077ABC.c | 2 +- 6 files changed, 360 insertions(+), 936 deletions(-) create mode 100644 src/battle/anim/psychic.c diff --git a/asm/psychic.s b/asm/psychic.s index f91ce950e..1f3e92e20 100644 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -7,940 +7,6 @@ @ psychic - thumb_func_start sub_80DB74C -sub_80DB74C: @ 80DB74C - push {r4-r7,lr} - adds r6, r0, 0 - ldr r0, _080DB804 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DB768 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DB77E -_080DB768: - ldrb r1, [r6, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - movs r1, 0x8 - orrs r0, r1 - strb r0, [r6, 0x5] - adds r1, r6, 0 - adds r1, 0x43 - movs r0, 0xC8 - strb r0, [r1] -_080DB77E: - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DB7DA - movs r0, 0x1 - bl GetBankByIdentity - lsls r0, 24 - lsrs r4, r0, 24 - adds r7, r4, 0 - adds r0, r4, 0 - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - eors r0, r1 - negs r1, r0 - orrs r1, r0 - lsrs r5, r1, 31 - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080DB7BC - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8076034 -_080DB7BC: - movs r0, 0x2 - adds r4, r0, 0 - eors r4, r7 - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080DB7DA - movs r0, 0x1 - eors r5, r0 - adds r0, r4, 0 - adds r1, r5, 0 - bl sub_8076034 -_080DB7DA: - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DB810 - bl IsDoubleBattle - lsls r0, 24 - cmp r0, 0 - beq _080DB810 - ldr r0, _080DB804 @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080DB808 - movs r0, 0x48 - strh r0, [r6, 0x20] - movs r0, 0x50 - b _080DB84A - .align 2, 0 -_080DB804: .4byte gAnimBankAttacker -_080DB808: - movs r0, 0xB0 - strh r0, [r6, 0x20] - movs r0, 0x28 - b _080DB84A -_080DB810: - ldr r5, _080DB880 @ =gAnimBankAttacker - ldrb r0, [r5] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DB826 - ldr r1, _080DB884 @ =gBattleAnimArgs - ldrh r0, [r1] - negs r0, r0 - strh r0, [r1] -_080DB826: - ldrb r0, [r5] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - ldr r4, _080DB884 @ =gBattleAnimArgs - lsrs r0, 24 - ldrh r1, [r4] - adds r0, r1 - strh r0, [r6, 0x20] - ldrb r0, [r5] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - ldrh r4, [r4, 0x2] - adds r0, r4 -_080DB84A: - strh r0, [r6, 0x22] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DB85C - ldrh r0, [r6, 0x22] - adds r0, 0x9 - strh r0, [r6, 0x22] -_080DB85C: - ldr r0, _080DB884 @ =gBattleAnimArgs - ldrh r0, [r0, 0x4] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 20 - movs r1, 0x80 - lsls r1, 1 - adds r0, r1 - strh r0, [r6, 0x2E] - ldr r1, _080DB888 @ =sub_80DB88C - str r1, [r6, 0x1C] - adds r0, r6, 0 - bl _call_via_r1 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DB880: .4byte gAnimBankAttacker -_080DB884: .4byte gBattleAnimArgs -_080DB888: .4byte sub_80DB88C - thumb_func_end sub_80DB74C - - thumb_func_start sub_80DB88C -sub_80DB88C: @ 80DB88C - push {lr} - adds r3, r0, 0 - ldr r2, _080DB8B0 @ =REG_BLDALPHA - ldrh r1, [r3, 0x34] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r0, r1 - strh r0, [r2] - ldrh r1, [r3, 0x34] - movs r2, 0x34 - ldrsh r0, [r3, r2] - cmp r0, 0xD - bne _080DB8B8 - ldr r0, _080DB8B4 @ =sub_80DB8C0 - str r0, [r3, 0x1C] - b _080DB8BC - .align 2, 0 -_080DB8B0: .4byte REG_BLDALPHA -_080DB8B4: .4byte sub_80DB8C0 -_080DB8B8: - adds r0, r1, 0x1 - strh r0, [r3, 0x34] -_080DB8BC: - pop {r0} - bx r0 - thumb_func_end sub_80DB88C - - thumb_func_start sub_80DB8C0 -sub_80DB8C0: @ 80DB8C0 - push {r4-r7,lr} - adds r3, r0, 0 - ldrh r0, [r3, 0x30] - adds r0, 0x1 - strh r0, [r3, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - bne _080DB91E - movs r0, 0 - strh r0, [r3, 0x30] - ldrh r4, [r3, 0x2E] - ldr r1, _080DB924 @ =gPlttBufferFaded - adds r0, r4, 0 - adds r0, 0x8 - lsls r0, 1 - adds r0, r1 - ldrh r7, [r0] - movs r5, 0x8 - adds r6, r1, 0 - adds r1, r4, 0x7 - lsls r0, r4, 1 - adds r0, r6 - adds r2, r0, 0 - adds r2, 0x10 - lsls r1, 1 - adds r1, r6 -_080DB8F6: - ldrh r0, [r1] - strh r0, [r2] - subs r1, 0x2 - subs r2, 0x2 - subs r5, 0x1 - cmp r5, 0 - bgt _080DB8F6 - adds r0, r4, 0x1 - lsls r0, 1 - adds r0, r6 - strh r7, [r0] - ldrh r0, [r3, 0x32] - adds r0, 0x1 - strh r0, [r3, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x10 - bne _080DB91E - ldr r0, _080DB928 @ =sub_80DB92C - str r0, [r3, 0x1C] -_080DB91E: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DB924: .4byte gPlttBufferFaded -_080DB928: .4byte sub_80DB92C - thumb_func_end sub_80DB8C0 - - thumb_func_start sub_80DB92C -sub_80DB92C: @ 80DB92C - push {r4-r6,lr} - adds r5, r0, 0 - ldr r2, _080DB9D4 @ =REG_BLDALPHA - ldrh r1, [r5, 0x34] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r0, r1 - strh r0, [r2] - ldrh r0, [r5, 0x34] - subs r0, 0x1 - strh r0, [r5, 0x34] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080DB9CC - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DB9BC - movs r0, 0x1 - bl GetBankByIdentity - lsls r0, 24 - lsrs r4, r0, 24 - adds r6, r4, 0 - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080DB98E - ldr r2, _080DB9D8 @ =gSprites - ldr r0, _080DB9DC @ =gObjectBankIDs - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] -_080DB98E: - movs r0, 0x2 - adds r4, r0, 0 - eors r4, r6 - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080DB9BC - ldr r2, _080DB9D8 @ =gSprites - ldr r0, _080DB9DC @ =gObjectBankIDs - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - adds r0, 0x3E - ldrb r2, [r0] - movs r1, 0x5 - negs r1, r1 - ands r1, r2 - strb r1, [r0] -_080DB9BC: - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] - ldr r0, _080DB9E0 @ =sub_80DB9E4 - str r0, [r5, 0x1C] -_080DB9CC: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DB9D4: .4byte REG_BLDALPHA -_080DB9D8: .4byte gSprites -_080DB9DC: .4byte gObjectBankIDs -_080DB9E0: .4byte sub_80DB9E4 - thumb_func_end sub_80DB92C - - thumb_func_start sub_80DB9E4 -sub_80DB9E4: @ 80DB9E4 - push {r4-r6,lr} - adds r6, r0, 0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DBA3C - movs r0, 0x1 - bl GetBankByIdentity - lsls r0, 24 - lsrs r0, 24 - adds r4, r0, 0 - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - eors r0, r1 - negs r1, r0 - orrs r1, r0 - lsrs r5, r1, 31 - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080DBA22 - adds r0, r5, 0 - bl sub_8076464 -_080DBA22: - movs r0, 0x2 - eors r4, r0 - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080DBA3C - movs r0, 0x1 - eors r5, r0 - adds r0, r5, 0 - bl sub_8076464 -_080DBA3C: - ldr r0, _080DBA48 @ =DestroyAnimSprite - str r0, [r6, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DBA48: .4byte DestroyAnimSprite - thumb_func_end sub_80DB9E4 - - thumb_func_start sub_80DBA4C -sub_80DBA4C: @ 80DBA4C - push {r4-r6,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080DBAD8 - ldr r5, _080DBA98 @ =gBattleAnimArgs - movs r1, 0x6 - ldrsh r0, [r5, r1] - movs r6, 0 - cmp r0, 0 - bne _080DBA66 - movs r6, 0x1 -_080DBA66: - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080DBAAE - bl IsDoubleBattle - lsls r0, 24 - cmp r0, 0 - beq _080DBAAE - ldr r0, _080DBA9C @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080DBAA0 - ldrh r0, [r5] - movs r1, 0x48 - subs r1, r0 - strh r1, [r4, 0x20] - ldrh r0, [r5, 0x2] - adds r0, 0x50 - strh r0, [r4, 0x22] - b _080DBAD0 - .align 2, 0 -_080DBA98: .4byte gBattleAnimArgs -_080DBA9C: .4byte gAnimBankAttacker -_080DBAA0: - ldrh r0, [r5] - adds r0, 0xB0 - strh r0, [r4, 0x20] - ldrh r0, [r5, 0x2] - adds r0, 0x28 - strh r0, [r4, 0x22] - b _080DBAD0 -_080DBAAE: - ldr r0, _080DBAC4 @ =gBattleAnimArgs - movs r1, 0x4 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _080DBAC8 - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_80787B0 - b _080DBAD0 - .align 2, 0 -_080DBAC4: .4byte gBattleAnimArgs -_080DBAC8: - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8078764 -_080DBAD0: - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080DBAEC -_080DBAD8: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x30 - ands r0, r1 - cmp r0, 0 - beq _080DBAEC - adds r0, r4, 0 - bl move_anim_8074EE0 -_080DBAEC: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80DBA4C - - thumb_func_start sub_80DBAF4 -sub_80DBAF4: @ 80DBAF4 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _080DBB3C @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080DBB44 - adds r0, r5, 0 - movs r1, 0x1 - bl StartSpriteAnim - ldrh r0, [r5, 0x20] - subs r0, 0x28 - strh r0, [r5, 0x20] - ldrh r0, [r5, 0x22] - adds r0, 0xA - strh r0, [r5, 0x22] - ldr r0, _080DBB40 @ =0x0000ffff - b _080DBB52 - .align 2, 0 -_080DBB3C: .4byte gAnimBankAttacker -_080DBB40: .4byte 0x0000ffff -_080DBB44: - ldrh r0, [r5, 0x20] - adds r0, 0x28 - strh r0, [r5, 0x20] - ldrh r0, [r5, 0x22] - subs r0, 0xA - strh r0, [r5, 0x22] - movs r0, 0x1 -_080DBB52: - strh r0, [r5, 0x30] - ldr r1, _080DBB68 @ =DestroyAnimSprite - adds r0, r5, 0 - bl StoreSpriteCallbackInData - ldr r0, _080DBB6C @ =sub_8078600 - str r0, [r5, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DBB68: .4byte DestroyAnimSprite -_080DBB6C: .4byte sub_8078600 - thumb_func_end sub_80DBAF4 - - thumb_func_start sub_80DBB70 -sub_80DBB70: @ 80DBB70 - push {r4-r7,lr} - adds r5, r0, 0 - ldr r6, _080DBBF4 @ =gAnimBankAttacker - ldrb r0, [r6] - movs r1, 0x1 - bl sub_807A100 - lsls r0, 16 - asrs r1, r0, 16 - lsrs r0, 31 - adds r1, r0 - lsls r1, 15 - lsrs r4, r1, 16 - ldrb r0, [r6] - movs r1, 0 - bl sub_807A100 - lsls r0, 16 - asrs r1, r0, 16 - lsrs r0, 31 - adds r1, r0 - asrs r1, 1 - negs r1, r1 - lsls r1, 16 - lsrs r7, r1, 16 - ldrb r0, [r6] - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080DBBB6 - lsls r0, r4, 16 - negs r0, r0 - lsrs r4, r0, 16 -_080DBBB6: - ldrb r0, [r6] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - adds r0, r4 - strh r0, [r5, 0x20] - ldrb r0, [r6] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - adds r0, r7 - strh r0, [r5, 0x22] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xF - bgt _080DBBE2 - movs r0, 0x10 - strh r0, [r5, 0x22] -_080DBBE2: - ldr r1, _080DBBF8 @ =sub_80DBC00 - adds r0, r5, 0 - bl StoreSpriteCallbackInData - ldr r0, _080DBBFC @ =sub_8078600 - str r0, [r5, 0x1C] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DBBF4: .4byte gAnimBankAttacker -_080DBBF8: .4byte sub_80DBC00 -_080DBBFC: .4byte sub_8078600 - thumb_func_end sub_80DBB70 - - thumb_func_start sub_80DBC00 -sub_80DBC00: @ 80DBC00 - push {r4,lr} - adds r4, r0, 0 - 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, _080DBC2C @ =gUnknown_083DA888 - str r0, [r4, 0x10] - movs r0, 0 - strh r0, [r4, 0x2E] - adds r0, r4, 0 - bl InitSpriteAffineAnim - ldr r0, _080DBC30 @ =sub_80DBC34 - str r0, [r4, 0x1C] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DBC2C: .4byte gUnknown_083DA888 -_080DBC30: .4byte sub_80DBC34 - thumb_func_end sub_80DBC00 - - thumb_func_start sub_80DBC34 -sub_80DBC34: @ 80DBC34 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080DBC46 - cmp r0, 0x1 - beq _080DBC74 - b _080DBC8C -_080DBC46: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080DBC8C - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldrb r1, [r4, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x1] - movs r0, 0x12 - strh r0, [r4, 0x30] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080DBC8C -_080DBC74: - ldrh r0, [r4, 0x30] - subs r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - movs r1, 0x1 - negs r1, r1 - cmp r0, r1 - bne _080DBC8C - adds r0, r4, 0 - bl DestroyAnimSprite -_080DBC8C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DBC34 - - thumb_func_start sub_80DBC94 -sub_80DBC94: @ 80DBC94 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, _080DBCC4 @ =gTasks - adds r4, r0 - movs r0, 0 - bl GetAnimBankSpriteId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - strh r1, [r4, 0x8] - ldr r2, _080DBCC8 @ =gUnknown_083DA8A4 - adds r0, r4, 0 - bl sub_80798F4 - ldr r0, _080DBCCC @ =sub_80DBCD0 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DBCC4: .4byte gTasks -_080DBCC8: .4byte gUnknown_083DA8A4 -_080DBCCC: .4byte sub_80DBCD0 - thumb_func_end sub_80DBC94 - - thumb_func_start sub_80DBCD0 -sub_80DBCD0: @ 80DBCD0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _080DBCF8 @ =gTasks - adds r0, r1 - bl sub_807992C - lsls r0, 24 - cmp r0, 0 - bne _080DBCF0 - adds r0, r4, 0 - bl DestroyAnimVisualTask -_080DBCF0: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DBCF8: .4byte gTasks - thumb_func_end sub_80DBCD0 - - thumb_func_start sub_80DBCFC -sub_80DBCFC: @ 80DBCFC - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080DBD48 @ =gTasks - adds r4, r1, r0 - movs r0, 0 - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - strh r0, [r4, 0x8] - strh r1, [r4, 0xA] - strh r1, [r4, 0xC] - ldr r0, _080DBD4C @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankSide - lsls r0, 24 - movs r1, 0x8 - cmp r0, 0 - beq _080DBD30 - movs r1, 0x4 -_080DBD30: - strh r1, [r4, 0xE] - ldrb r1, [r4, 0x8] - ldr r2, _080DBD50 @ =gUnknown_083DA8C4 - adds r0, r4, 0 - bl sub_80798F4 - ldr r0, _080DBD54 @ =sub_80DBD58 - str r0, [r4] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080DBD48: .4byte gTasks -_080DBD4C: .4byte gAnimBankAttacker -_080DBD50: .4byte gUnknown_083DA8C4 -_080DBD54: .4byte sub_80DBD58 - thumb_func_end sub_80DBCFC - - thumb_func_start sub_80DBD58 -sub_80DBD58: @ 80DBD58 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _080DBD78 @ =gTasks - adds r4, r0, r1 - movs r1, 0xA - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080DBD7C - cmp r0, 0x1 - beq _080DBD98 - b _080DBDF6 - .align 2, 0 -_080DBD78: .4byte gTasks -_080DBD7C: - adds r0, r4, 0 - bl sub_807992C - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x13 - ble _080DBDF6 - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - b _080DBDF6 -_080DBD98: - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080DBDC0 - ldr r2, _080DBDBC @ =gSprites - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r1, [r0, 0x26] - subs r1, 0x8 - strh r1, [r0, 0x26] - ldrh r0, [r4, 0xE] - subs r0, 0x1 - strh r0, [r4, 0xE] - b _080DBDF6 - .align 2, 0 -_080DBDBC: .4byte gSprites -_080DBDC0: - ldr r3, _080DBDFC @ =gSprites - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - movs r0, 0x8 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - movs r1, 0x88 - lsls r1, 1 - strh r1, [r0, 0x20] - ldrb r0, [r4, 0x8] - bl sub_8078F40 - adds r0, r5, 0 - bl DestroyAnimVisualTask -_080DBDF6: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DBDFC: .4byte gSprites - thumb_func_end sub_80DBD58 - - thumb_func_start sub_80DBE00 -sub_80DBE00: @ 80DBE00 - push {r4-r7,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080DBE84 @ =gTasks - adds r5, r1, r0 - movs r0, 0 - movs r7, 0x10 - strh r7, [r5, 0xE] - strh r0, [r5, 0x10] - ldr r4, _080DBE88 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x24] - ldrb r0, [r4] - movs r1, 0x1 - bl sub_807A100 - lsls r0, 16 - asrs r0, 16 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r6, r0, 16 - ldrb r0, [r4] - movs r1, 0 - bl sub_807A100 - lsls r0, 16 - asrs r0, 16 - movs r1, 0x3 - bl __divsi3 - lsls r0, 16 - lsrs r0, 16 - adds r1, r0, 0 - cmp r0, r6 - bcs _080DBE6A - adds r1, r6, 0 -_080DBE6A: - strh r1, [r5, 0x20] - ldr r1, _080DBE8C @ =REG_BLDCNT - movs r2, 0xFD - lsls r2, 6 - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080DBE90 @ =REG_BLDALPHA - strh r7, [r0] - ldr r0, _080DBE94 @ =sub_80DBE98 - str r0, [r5] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DBE84: .4byte gTasks -_080DBE88: .4byte gAnimBankAttacker -_080DBE8C: .4byte REG_BLDCNT -_080DBE90: .4byte REG_BLDALPHA -_080DBE94: .4byte sub_80DBE98 - thumb_func_end sub_80DBE00 - thumb_func_start sub_80DBE98 sub_80DBE98: @ 80DBE98 push {r4-r6,lr} diff --git a/include/battle_anim.h b/include/battle_anim.h index a94e6d13c..fd1becf39 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -63,5 +63,6 @@ void sub_80763FC(u16 a, u16 *b, u32 c, u8 d); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); s16 sub_8077104(s16 newPan, int oldPan); void DestroyAnimSoundTask(u8 taskId); +void sub_8076464(u8 a); #endif diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 81a11ba04..756c5fa03 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -85,7 +85,7 @@ void sub_8078174(struct Sprite *sprite); void sub_80793C4(struct Sprite *sprite); void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4); u8 sub_8079ED4(u8 slot); -int sub_807A100(u8 slot, u8 a2); +s16 sub_807A100(u8 slot, u8 a2); u16 sub_80790F0(s16 a, s16 b); void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); void sub_807867C(struct Sprite *sprite, s16 a2); diff --git a/ld_script.txt b/ld_script.txt index ec206774e..c5f3669e8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -296,6 +296,7 @@ SECTIONS { asm/fight.o(.text); src/battle/anim/poison.o(.text); asm/flying.o(.text); + src/battle/anim/psychic.o(.text); asm/psychic.o(.text); src/battle/anim/bug.o(.text); src/battle/anim/rock.o(.text); diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c new file mode 100644 index 000000000..19bfdfdb6 --- /dev/null +++ b/src/battle/anim/psychic.c @@ -0,0 +1,356 @@ +#include "global.h" +#include "battle.h" +#include "battle_anim.h" +#include "palette.h" +#include "rom_8077ABC.h" +#include "sound.h" +#include "task.h" +#include "trig.h" +#include "constants/songs.h" + +extern s16 gBattleAnimArgs[]; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG2_X; +extern u8 gObjectBankIDs[]; + +extern const union AffineAnimCmd *const gUnknown_083DA888[]; +extern struct AffineAnimFrameCmd gUnknown_083DA8A4; +extern struct AffineAnimFrameCmd gUnknown_083DA8C4; + +static void sub_80DB88C(struct Sprite *sprite); +static void sub_80DB8C0(struct Sprite *sprite); +static void sub_80DB92C(struct Sprite *sprite); +static void sub_80DB9E4(struct Sprite *sprite); +static void sub_80DBC00(struct Sprite *sprite); +static void sub_80DBC34(struct Sprite *sprite); +static void sub_80DBCD0(u8 taskId); +static void sub_80DBD58(u8 taskId); +void sub_80DBE98(u8 taskId); + + +void sub_80DB74C(struct Sprite *sprite) +{ + if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER || IsContest()) + { + sprite->oam.priority = 2; + sprite->subpriority = 200; + } + + if (!IsContest()) + { + u8 bankCopy; + u8 bank = bankCopy = GetBankByIdentity(IDENTITY_OPPONENT_MON1); + u8 identity = GetBankIdentity_permutated(bank); + int var0 = 1; + u8 toBG_2 = (identity ^ var0) != 0; + + if (IsAnimBankSpriteVisible(bank)) + sub_8076034(bank, toBG_2); + + bank = bankCopy ^ 2; + if (IsAnimBankSpriteVisible(bank)) + sub_8076034(bank, toBG_2 ^ var0); + } + + if (!IsContest() && IsDoubleBattle()) + { + if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER) + { + sprite->pos1.x = 72; + sprite->pos1.y = 80; + } + else + { + sprite->pos1.x = 176; + sprite->pos1.y = 40; + } + } + else + { + if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) + gBattleAnimArgs[0] = -gBattleAnimArgs[0]; + + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + } + + if (IsContest()) + sprite->pos1.y += 9; + + sprite->data[0] = 256 + IndexOfSpritePaletteTag(gBattleAnimArgs[2]) * 16; + sprite->callback = sub_80DB88C; + sprite->callback(sprite); +} + +static void sub_80DB88C(struct Sprite *sprite) +{ + REG_BLDALPHA = ((16 - sprite->data[3]) << 8) | sprite->data[3]; + + if (sprite->data[3] == 13) + sprite->callback = sub_80DB8C0; + else + sprite->data[3]++; +} + +static void sub_80DB8C0(struct Sprite *sprite) +{ + u16 color; + u16 startOffset; + int i; + + if (++sprite->data[1] == 2) + { + sprite->data[1] = 0; + startOffset = sprite->data[0]; + color = gPlttBufferFaded[startOffset + 8]; + + for (i = 8; i > 0; i--) + gPlttBufferFaded[startOffset + i] = gPlttBufferFaded[startOffset + i - 1]; + + gPlttBufferFaded[startOffset + 1] = color; + + if (++sprite->data[2] == 16) + sprite->callback = sub_80DB92C; + } +} + +static void sub_80DB92C(struct Sprite *sprite) +{ + REG_BLDALPHA = ((16 - sprite->data[3]) << 8) | sprite->data[3]; + + if (--sprite->data[3] == -1) + { + if (!IsContest()) + { + u8 bankCopy; + u8 bank = bankCopy = GetBankByIdentity(IDENTITY_OPPONENT_MON1); + + if (IsAnimBankSpriteVisible(bank)) + gSprites[gObjectBankIDs[bank]].invisible = 0; + + bank = bankCopy ^ 2; + if (IsAnimBankSpriteVisible(bank)) + gSprites[gObjectBankIDs[bank]].invisible = 0; + } + + sprite->invisible = 1; + sprite->callback = sub_80DB9E4; + } +} + +static void sub_80DB9E4(struct Sprite *sprite) +{ + if (!IsContest()) + { + u8 bankCopy; + u8 bank = bankCopy = GetBankByIdentity(IDENTITY_OPPONENT_MON1); + u8 identity = GetBankIdentity_permutated(bank); + int var0 = 1; + u8 toBG_2 = (identity ^ var0) != 0; + + if (IsAnimBankSpriteVisible(bank)) + sub_8076464(toBG_2); + + bank = bankCopy ^ 2; + if (IsAnimBankSpriteVisible(bank)) + sub_8076464(toBG_2 ^ var0); + } + + sprite->callback = DestroyAnimSprite; +} + +void sub_80DBA4C(struct Sprite *sprite) +{ + if (sprite->data[0] == 0) + { + int arg3 = gBattleAnimArgs[3]; + u8 var0 = 0; + if (arg3 == 0) + var0 = 1; + + if (!IsContest() && IsDoubleBattle()) + { + if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER) + { + sprite->pos1.x = 72 - gBattleAnimArgs[0]; + sprite->pos1.y = gBattleAnimArgs[1] + 80; + } + else + { + sprite->pos1.x = gBattleAnimArgs[0] + 176; + sprite->pos1.y = gBattleAnimArgs[1] + 40; + } + } + else + { + if (gBattleAnimArgs[2] == 0) + sub_80787B0(sprite, var0); + else + sub_8078764(sprite, var0); + } + + sprite->data[0]++; + } + else + { + if (sprite->animEnded || sprite->affineAnimEnded) + move_anim_8074EE0(sprite); + } +} + +void sub_80DBAF4(struct Sprite *sprite) +{ + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + + if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) + { + StartSpriteAnim(sprite, 1); + sprite->pos1.x -= 40; + sprite->pos1.y += 10; + sprite->data[1] = -1; + } + else + { + sprite->pos1.x += 40; + sprite->pos1.y -= 10; + sprite->data[1] = 1; + } + + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); + sprite->callback = sub_8078600; +} + +void sub_80DBB70(struct Sprite *sprite) +{ + s16 x = sub_807A100(gAnimBankAttacker, 1) / 2; + s16 y = sub_807A100(gAnimBankAttacker, 0) / -2; + + if (GetBankSide(gAnimBankAttacker) == SIDE_OPPONENT) + { + x = -x; + } + + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2) + x; + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3) + y; + + if (sprite->pos1.y < 16) + { + sprite->pos1.y = 16; + } + + StoreSpriteCallbackInData(sprite, sub_80DBC00); + sprite->callback = sub_8078600; +} + +static void sub_80DBC00(struct Sprite *sprite) +{ + sprite->oam.affineMode = 1; + sprite->affineAnims = gUnknown_083DA888; + sprite->data[0] = 0; + InitSpriteAffineAnim(sprite); + sprite->callback = sub_80DBC34; +} + +static void sub_80DBC34(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (sprite->affineAnimEnded) + { + FreeOamMatrix(sprite->oam.matrixNum); + sprite->oam.affineMode = 0; + sprite->data[1] = 18; + sprite->data[0]++; + } + break; + case 1: + if (--sprite->data[1] == -1) + { + DestroyAnimSprite(sprite); + } + break; + } +} + +void sub_80DBC94(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + u8 spriteId = GetAnimBankSpriteId(0); + task->data[0] = spriteId; + sub_80798F4(task, spriteId, &gUnknown_083DA8A4); + task->func = sub_80DBCD0; +} + +static void sub_80DBCD0(u8 taskId) +{ + if (!sub_807992C(&gTasks[taskId])) + { + DestroyAnimVisualTask(taskId); + } +} + +void sub_80DBCFC(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + u8 spriteId = GetAnimBankSpriteId(0); + task->data[0] = spriteId; + task->data[1] = 0; + task->data[2] = 0; + task->data[3] = GetBankSide(gAnimBankAttacker) != SIDE_PLAYER ? 4 : 8; + + sub_80798F4(task, task->data[0], &gUnknown_083DA8C4); + task->func = sub_80DBD58; +} + +static void sub_80DBD58(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[1]) + { + case 0: + sub_807992C(task); + if (++task->data[2] > 19) + task->data[1]++; + break; + case 1: + if (task->data[3] != 0) + { + gSprites[task->data[0]].pos2.y -= 8; + task->data[3]--; + } + else + { + gSprites[task->data[0]].invisible = 1; + gSprites[task->data[0]].pos1.x = 272; + sub_8078F40(task->data[0]); + DestroyAnimVisualTask(taskId); + } + break; + } +} + +void sub_80DBE00(u8 taskId) +{ + u16 var0, var1; + + struct Task *task = &gTasks[taskId]; + + task->data[3] = 16; + task->data[4] = 0; + task->data[13] = GetBankPosition(gAnimBankAttacker, 2); + task->data[14] = GetBankPosition(gAnimBankAttacker, 3); + + var0 = sub_807A100(gAnimBankAttacker, 1) / 3; + var1 = sub_807A100(gAnimBankAttacker, 0) / 3; + task->data[12] = var0 > var1 ? var0 : var1; + + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = 0x10; + + task->func = sub_80DBE98; +} diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 11a71155d..b84c431f7 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -1970,7 +1970,7 @@ void sub_807A0F4(struct Sprite *sprite) DestroySpriteAndFreeResources(sprite); } -int sub_807A100(u8 slot, u8 a2) +s16 sub_807A100(u8 slot, u8 a2) { u16 species; u32 personality; -- cgit v1.2.3 From 2d89da39c172c80a8d1ca6ad63e16a8d8e29d39d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 31 Jan 2018 20:59:31 -0800 Subject: More psychic.s decompilation --- asm/psychic.s | 695 ---------------------------------------------- src/battle/anim/psychic.c | 254 ++++++++++++++++- 2 files changed, 253 insertions(+), 696 deletions(-) diff --git a/asm/psychic.s b/asm/psychic.s index 1f3e92e20..e04832858 100644 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -7,701 +7,6 @@ @ psychic - thumb_func_start sub_80DBE98 -sub_80DBE98: @ 80DBE98 - push {r4-r6,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _080DBEBC @ =gTasks - adds r4, r0, r1 - movs r0, 0x8 - ldrsh r1, [r4, r0] - cmp r1, 0x1 - beq _080DBF98 - cmp r1, 0x1 - bgt _080DBEC0 - cmp r1, 0 - beq _080DBECE - b _080DC014 - .align 2, 0 -_080DBEBC: .4byte gTasks -_080DBEC0: - cmp r1, 0x2 - bne _080DBEC6 - b _080DBFF4 -_080DBEC6: - cmp r1, 0x3 - bne _080DBECC - b _080DC004 -_080DBECC: - b _080DC014 -_080DBECE: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - bgt _080DBEDE - b _080DC014 -_080DBEDE: - strh r1, [r4, 0xA] - ldr r0, _080DBF1C @ =gSpriteTemplate_83DA8DC - movs r2, 0x22 - ldrsh r1, [r4, r2] - movs r3, 0x24 - ldrsh r2, [r4, r3] - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - movs r0, 0xC - ldrsh r1, [r4, r0] - adds r1, 0x8 - lsls r1, 1 - adds r0, r4, 0 - adds r0, 0x8 - adds r0, r1 - strh r2, [r0] - cmp r2, 0x40 - beq _080DBF82 - movs r1, 0xC - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080DBF3C - cmp r0, 0x1 - bgt _080DBF20 - cmp r0, 0 - beq _080DBF2A - b _080DBF82 - .align 2, 0 -_080DBF1C: .4byte gSpriteTemplate_83DA8DC -_080DBF20: - cmp r0, 0x2 - beq _080DBF54 - cmp r0, 0x3 - beq _080DBF6C - b _080DBF82 -_080DBF2A: - ldr r0, _080DBF38 @ =gSprites - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r4, 0x20] - b _080DBF7A - .align 2, 0 -_080DBF38: .4byte gSprites -_080DBF3C: - ldr r0, _080DBF50 @ =gSprites - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r4, 0x20] - negs r0, r0 - strh r0, [r1, 0x24] - ldrh r0, [r4, 0x20] - b _080DBF80 - .align 2, 0 -_080DBF50: .4byte gSprites -_080DBF54: - ldr r1, _080DBF68 @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrh r1, [r4, 0x20] - strh r1, [r0, 0x24] - ldrh r1, [r4, 0x20] - strh r1, [r0, 0x26] - b _080DBF82 - .align 2, 0 -_080DBF68: .4byte gSprites -_080DBF6C: - ldr r0, _080DBF94 @ =gSprites - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r4, 0x20] - negs r0, r0 -_080DBF7A: - strh r0, [r1, 0x24] - ldrh r0, [r4, 0x20] - negs r0, r0 -_080DBF80: - strh r0, [r1, 0x26] -_080DBF82: - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _080DC014 - b _080DBFF4 - .align 2, 0 -_080DBF94: .4byte gSprites -_080DBF98: - ldrh r0, [r4, 0xA] - ands r1, r0 - cmp r1, 0 - beq _080DBFA8 - ldrh r0, [r4, 0xE] - subs r0, 0x1 - strh r0, [r4, 0xE] - b _080DBFAE -_080DBFA8: - ldrh r0, [r4, 0x10] - adds r0, 0x1 - strh r0, [r4, 0x10] -_080DBFAE: - ldr r2, _080DBFFC @ =REG_BLDALPHA - ldrh r0, [r4, 0x10] - lsls r0, 8 - ldrh r1, [r4, 0xE] - orrs r0, r1 - strh r0, [r2] - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x20 - bne _080DC014 - movs r5, 0x8 - adds r6, r4, 0 - adds r6, 0x8 -_080DBFCE: - lsls r0, r5, 1 - adds r1, r6, r0 - movs r2, 0 - ldrsh r0, [r1, r2] - cmp r0, 0x40 - beq _080DBFEA - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080DC000 @ =gSprites - adds r0, r1 - bl DestroySprite -_080DBFEA: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0xC - bls _080DBFCE -_080DBFF4: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080DC014 - .align 2, 0 -_080DBFFC: .4byte REG_BLDALPHA -_080DC000: .4byte gSprites -_080DC004: - ldr r0, _080DC01C @ =REG_BLDALPHA - movs r1, 0 - strh r1, [r0] - subs r0, 0x2 - strh r1, [r0] - adds r0, r2, 0 - bl DestroyAnimVisualTask -_080DC014: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DC01C: .4byte REG_BLDALPHA - thumb_func_end sub_80DBE98 - - thumb_func_start sub_80DC020 -sub_80DC020: @ 80DC020 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x30 - ldrsh r1, [r4, r0] - movs r2, 0x2E - ldrsh r0, [r4, r2] - subs r0, 0xA - cmp r1, r0 - ble _080DC04A - ldrh r0, [r4, 0x30] - movs r1, 0x1 - ands r1, r0 - adds r3, r4, 0 - adds r3, 0x3E - lsls r1, 2 - ldrb r2, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] -_080DC04A: - movs r0, 0x30 - ldrsh r1, [r4, r0] - movs r2, 0x2E - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _080DC05C - adds r0, r4, 0 - bl DestroyAnimSprite -_080DC05C: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DC020 - - thumb_func_start sub_80DC068 -sub_80DC068: @ 80DC068 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r6, _080DC0A4 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _080DC094 - ldr r4, _080DC0A8 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x2 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x3 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] -_080DC094: - ldrh r0, [r6, 0x2] - strh r0, [r5, 0x2E] - ldr r0, _080DC0AC @ =sub_80DC020 - str r0, [r5, 0x1C] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DC0A4: .4byte gBattleAnimArgs -_080DC0A8: .4byte gAnimBankAttacker -_080DC0AC: .4byte sub_80DC020 - thumb_func_end sub_80DC068 - - thumb_func_start sub_80DC0B0 -sub_80DC0B0: @ 80DC0B0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080DC10C @ =gTasks - adds r5, r1, r0 - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DC154 - ldr r0, _080DC110 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0x1 - bne _080DC120 - ldr r0, _080DC114 @ =0x0000fff6 - strh r0, [r5, 0x1C] - ldr r4, _080DC118 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x5 - bl sub_807A100 - subs r0, 0x8 - strh r0, [r5, 0x1E] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x8 - strh r0, [r5, 0x20] - ldr r4, _080DC11C @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x5 - bl sub_807A100 - subs r0, 0x8 - strh r0, [r5, 0x22] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x8 - b _080DC1DE - .align 2, 0 -_080DC10C: .4byte gTasks -_080DC110: .4byte gBattleAnimArgs -_080DC114: .4byte 0x0000fff6 -_080DC118: .4byte gAnimBankTarget -_080DC11C: .4byte gAnimBankAttacker -_080DC120: - movs r0, 0xA - strh r0, [r5, 0x1C] - ldr r4, _080DC14C @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x4 - bl sub_807A100 - adds r0, 0x8 - strh r0, [r5, 0x1E] - ldrb r0, [r4] - movs r1, 0x3 - bl sub_807A100 - subs r0, 0x8 - strh r0, [r5, 0x20] - ldr r4, _080DC150 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x4 - bl sub_807A100 - adds r0, 0x8 - b _080DC1D2 - .align 2, 0 -_080DC14C: .4byte gAnimBankAttacker -_080DC150: .4byte gAnimBankTarget -_080DC154: - ldr r0, _080DC198 @ =gBattleAnimArgs - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0x1 - bne _080DC1A8 - ldr r0, _080DC19C @ =0x0000fff6 - strh r0, [r5, 0x1C] - ldr r4, _080DC1A0 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x4 - bl sub_807A100 - adds r0, 0x8 - strh r0, [r5, 0x1E] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x8 - strh r0, [r5, 0x20] - ldr r4, _080DC1A4 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x4 - bl sub_807A100 - adds r0, 0x8 - strh r0, [r5, 0x22] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x8 - b _080DC1DE - .align 2, 0 -_080DC198: .4byte gBattleAnimArgs -_080DC19C: .4byte 0x0000fff6 -_080DC1A0: .4byte gAnimBankTarget -_080DC1A4: .4byte gAnimBankAttacker -_080DC1A8: - movs r0, 0xA - strh r0, [r5, 0x1C] - ldr r4, _080DC1F0 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x5 - bl sub_807A100 - subs r0, 0x8 - strh r0, [r5, 0x1E] - ldrb r0, [r4] - movs r1, 0x3 - bl sub_807A100 - subs r0, 0x8 - strh r0, [r5, 0x20] - ldr r4, _080DC1F4 @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x5 - bl sub_807A100 - subs r0, 0x8 -_080DC1D2: - strh r0, [r5, 0x22] - ldrb r0, [r4] - movs r1, 0x3 - bl sub_807A100 - subs r0, 0x8 -_080DC1DE: - strh r0, [r5, 0x24] - movs r0, 0x6 - strh r0, [r5, 0xA] - ldr r0, _080DC1F8 @ =sub_80DC1FC - str r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DC1F0: .4byte gAnimBankAttacker -_080DC1F4: .4byte gAnimBankTarget -_080DC1F8: .4byte sub_80DC1FC - thumb_func_end sub_80DC0B0 - - thumb_func_start sub_80DC1FC -sub_80DC1FC: @ 80DC1FC - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _080DC21C @ =gTasks - adds r5, r0, r1 - movs r0, 0x8 - ldrsh r1, [r5, r0] - cmp r1, 0 - beq _080DC220 - cmp r1, 0x1 - beq _080DC294 - b _080DC2A8 - .align 2, 0 -_080DC21C: .4byte gTasks -_080DC220: - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x6 - ble _080DC2A8 - strh r1, [r5, 0xA] - ldr r0, _080DC28C @ =gSpriteTemplate_83DA9AC - movs r2, 0x1E - ldrsh r1, [r5, r2] - movs r3, 0x20 - ldrsh r2, [r5, r3] - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080DC274 - ldr r0, _080DC290 @ =gSprites - lsls r4, r1, 4 - adds r4, r1 - lsls r4, 2 - adds r4, r0 - movs r0, 0x10 - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x22] - strh r0, [r4, 0x32] - ldrh r0, [r5, 0x24] - strh r0, [r4, 0x36] - ldrh r0, [r5, 0x1C] - strh r0, [r4, 0x38] - adds r0, r4, 0 - bl sub_80786EC - ldrb r0, [r5, 0xC] - movs r1, 0x3 - ands r1, r0 - adds r0, r4, 0 - bl StartSpriteAffineAnim -_080DC274: - ldrh r0, [r5, 0xC] - adds r0, 0x1 - strh r0, [r5, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xC - bne _080DC2A8 - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _080DC2A8 - .align 2, 0 -_080DC28C: .4byte gSpriteTemplate_83DA9AC -_080DC290: .4byte gSprites -_080DC294: - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x11 - ble _080DC2A8 - adds r0, r2, 0 - bl DestroyAnimVisualTask -_080DC2A8: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DC1FC - - thumb_func_start sub_80DC2B0 -sub_80DC2B0: @ 80DC2B0 - push {r4,lr} - adds r4, r0, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080DC2CE - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - adds r0, r4, 0 - bl DestroySprite -_080DC2CE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80DC2B0 - - thumb_func_start sub_80DC2D4 -sub_80DC2D4: @ 80DC2D4 - push {r4-r6,lr} - sub sp, 0xC - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080DC30C @ =gTasks - adds r4, r1, r0 - ldr r0, _080DC310 @ =gAnimBankTarget - ldrb r0, [r0] - bl sub_8077FC0 - lsls r0, 24 - lsrs r1, r0, 24 - adds r0, r1, 0 - subs r0, 0x20 - strh r0, [r4, 0x24] - ldr r0, _080DC314 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0x1 - beq _080DC32A - cmp r0, 0x1 - bgt _080DC318 - cmp r0, 0 - beq _080DC31E - b _080DC346 - .align 2, 0 -_080DC30C: .4byte gTasks -_080DC310: .4byte gAnimBankTarget -_080DC314: .4byte gBattleAnimArgs -_080DC318: - cmp r0, 0x2 - beq _080DC336 - b _080DC346 -_080DC31E: - movs r0, 0x2 - strh r0, [r4, 0x1E] - movs r0, 0x5 - strh r0, [r4, 0x20] - movs r0, 0x40 - b _080DC33E -_080DC32A: - movs r0, 0x2 - strh r0, [r4, 0x1E] - movs r0, 0x5 - strh r0, [r4, 0x20] - movs r0, 0xC0 - b _080DC33E -_080DC336: - movs r0, 0x4 - strh r0, [r4, 0x1E] - strh r0, [r4, 0x20] - movs r0, 0 -_080DC33E: - strh r0, [r4, 0x22] - adds r0, r1, 0 - adds r0, 0x20 - strh r0, [r4, 0x26] -_080DC346: - movs r1, 0x24 - ldrsh r0, [r4, r1] - cmp r0, 0 - bge _080DC352 - movs r0, 0 - strh r0, [r4, 0x24] -_080DC352: - ldr r0, _080DC36C @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080DC378 - ldr r0, _080DC370 @ =gBattle_BG1_X - ldrh r0, [r0] - strh r0, [r4, 0x1C] - ldr r0, _080DC374 @ =REG_BG1HOFS - b _080DC380 - .align 2, 0 -_080DC36C: .4byte gAnimBankTarget -_080DC370: .4byte gBattle_BG1_X -_080DC374: .4byte REG_BG1HOFS -_080DC378: - ldr r0, _080DC3E0 @ =gBattle_BG2_X - ldrh r0, [r0] - strh r0, [r4, 0x1C] - ldr r0, _080DC3E4 @ =REG_BG2HOFS -_080DC380: - str r0, [sp] - ldrh r1, [r4, 0x24] - lsls r3, r1, 16 - asrs r1, r3, 16 - movs r2, 0x24 - ldrsh r0, [r4, r2] - adds r0, 0x40 - cmp r1, r0 - bgt _080DC3BA - ldr r5, _080DC3E8 @ =gScanlineEffectRegBuffers - movs r0, 0xF0 - lsls r0, 3 - adds r6, r5, r0 -_080DC39A: - asrs r3, 16 - lsls r1, r3, 1 - adds r2, r1, r5 - ldrh r0, [r4, 0x1C] - strh r0, [r2] - adds r1, r6 - ldrh r0, [r4, 0x1C] - strh r0, [r1] - adds r3, 0x1 - lsls r3, 16 - asrs r1, r3, 16 - movs r2, 0x24 - ldrsh r0, [r4, r2] - adds r0, 0x40 - cmp r1, r0 - ble _080DC39A -_080DC3BA: - ldr r0, _080DC3EC @ =0xa2600001 - str r0, [sp, 0x4] - mov r1, sp - movs r2, 0 - movs r0, 0x1 - strb r0, [r1, 0x8] - mov r0, sp - strb r2, [r0, 0x9] - ldr r0, [sp] - ldr r1, [sp, 0x4] - ldr r2, [sp, 0x8] - bl ScanlineEffect_SetParams - ldr r0, _080DC3F0 @ =sub_80DC3F4 - str r0, [r4] - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080DC3E0: .4byte gBattle_BG2_X -_080DC3E4: .4byte REG_BG2HOFS -_080DC3E8: .4byte gScanlineEffectRegBuffers -_080DC3EC: .4byte 0xa2600001 -_080DC3F0: .4byte sub_80DC3F4 - thumb_func_end sub_80DC2D4 - thumb_func_start sub_80DC3F4 sub_80DC3F4: @ 80DC3F4 push {r4-r7,lr} diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index 19bfdfdb6..a00b0ba3a 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -3,6 +3,7 @@ #include "battle_anim.h" #include "palette.h" #include "rom_8077ABC.h" +#include "scanline_effect.h" #include "sound.h" #include "task.h" #include "trig.h" @@ -18,6 +19,8 @@ extern u8 gObjectBankIDs[]; extern const union AffineAnimCmd *const gUnknown_083DA888[]; extern struct AffineAnimFrameCmd gUnknown_083DA8A4; extern struct AffineAnimFrameCmd gUnknown_083DA8C4; +extern const struct SpriteTemplate gSpriteTemplate_83DA8DC; +extern const struct SpriteTemplate gSpriteTemplate_83DA9AC; static void sub_80DB88C(struct Sprite *sprite); static void sub_80DB8C0(struct Sprite *sprite); @@ -27,7 +30,9 @@ static void sub_80DBC00(struct Sprite *sprite); static void sub_80DBC34(struct Sprite *sprite); static void sub_80DBCD0(u8 taskId); static void sub_80DBD58(u8 taskId); -void sub_80DBE98(u8 taskId); +static void sub_80DBE98(u8 taskId); +static void sub_80DC1FC(u8 taskId); +void sub_80DC3F4(u8 taskId); void sub_80DB74C(struct Sprite *sprite) @@ -354,3 +359,250 @@ void sub_80DBE00(u8 taskId) task->func = sub_80DBE98; } + +static void sub_80DBE98(u8 taskId) +{ + u16 i; + u8 spriteId; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (++task->data[1] > 8) + { + task->data[1] = 0; + spriteId = CreateSprite(&gSpriteTemplate_83DA8DC, task->data[13], task->data[14], 0); + task->data[task->data[2] + 8] = spriteId; + + if (spriteId != 64) + { + switch (task->data[2]) + { + case 0: + gSprites[spriteId].pos2.x = task->data[12]; + gSprites[spriteId].pos2.y = -task->data[12]; + break; + case 1: + gSprites[spriteId].pos2.x = -task->data[12]; + gSprites[spriteId].pos2.y = task->data[12]; + break; + case 2: + gSprites[spriteId].pos2.x = task->data[12]; + gSprites[spriteId].pos2.y = task->data[12]; + break; + case 3: + gSprites[spriteId].pos2.x = -task->data[12]; + gSprites[spriteId].pos2.y = -task->data[12]; + break; + } + } + + if (++task->data[2] == 5) + task->data[0]++; + } + break; + case 1: + if (task->data[1] & 1) + task->data[3]--; + else + task->data[4]++; + + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + + if (++task->data[1] == 32) + { + for (i = 8; i < 13; i++) + { + if (task->data[i] != 64) + DestroySprite(&gSprites[task->data[i]]); + } + + task->data[0]++; + } + break; + case 2: + task->data[0]++; + break; + case 3: + REG_BLDALPHA = 0; + REG_BLDCNT = 0; + DestroyAnimVisualTask(taskId); + break; + } +} + +static void sub_80DC020(struct Sprite *sprite) +{ + if (sprite->data[1] > sprite->data[0] - 10) + sprite->invisible = sprite->data[1] & 1; + + if (sprite->data[1] == sprite->data[0]) + DestroyAnimSprite(sprite); + + sprite->data[1]++; +} + +void sub_80DC068(struct Sprite *sprite) +{ + if (gBattleAnimArgs[0] == 0) + { + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); + } + + sprite->data[0] = gBattleAnimArgs[1]; + sprite->callback = sub_80DC020; +} + +void sub_80DC0B0(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + if (IsContest()) + { + if (gBattleAnimArgs[0] == 1) + { + task->data[10] = -10; + task->data[11] = sub_807A100(gAnimBankTarget, 5) - 8; + task->data[12] = sub_807A100(gAnimBankTarget, 2) + 8; + task->data[13] = sub_807A100(gAnimBankAttacker, 5) - 8; + task->data[14] = sub_807A100(gAnimBankAttacker, 2) + 8; + } + else + { + task->data[10] = 10; + task->data[11] = sub_807A100(gAnimBankAttacker, 4) + 8; + task->data[12] = sub_807A100(gAnimBankAttacker, 3) - 8; + task->data[13] = sub_807A100(gAnimBankTarget, 4) + 8; + task->data[14] = sub_807A100(gAnimBankTarget, 3) - 8; + } + } + else + { + if (gBattleAnimArgs[0] == 1) + { + task->data[10] = -10; + task->data[11] = sub_807A100(gAnimBankTarget, 4) + 8; + task->data[12] = sub_807A100(gAnimBankTarget, 2) + 8; + task->data[13] = sub_807A100(gAnimBankAttacker, 4) + 8; + task->data[14] = sub_807A100(gAnimBankAttacker, 2) + 8; + } + else + { + task->data[10] = 10; + task->data[11] = sub_807A100(gAnimBankAttacker, 5) - 8; + task->data[12] = sub_807A100(gAnimBankAttacker, 3) - 8; + task->data[13] = sub_807A100(gAnimBankTarget, 5) - 8; + task->data[14] = sub_807A100(gAnimBankTarget, 3) - 8; + } + } + + task->data[1] = 6; + task->func = sub_80DC1FC; +} + +static void sub_80DC1FC(u8 taskId) +{ + u8 spriteId; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (++task->data[1] > 6) + { + task->data[1] = 0; + spriteId = CreateSprite(&gSpriteTemplate_83DA9AC, task->data[11], task->data[12], 0); + if (spriteId != 64) + { + gSprites[spriteId].data[0] = 16; + gSprites[spriteId].data[2] = task->data[13]; + gSprites[spriteId].data[4] = task->data[14]; + gSprites[spriteId].data[5] = task->data[10]; + + sub_80786EC(&gSprites[spriteId]); + StartSpriteAffineAnim(&gSprites[spriteId], task->data[2] & 3); + } + + if (++task->data[2] == 12) + task->data[0]++; + } + break; + case 1: + if (++task->data[1] > 17) + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80DC2B0(struct Sprite *sprite) +{ + if (sub_8078718(sprite)) + { + FreeOamMatrix(sprite->oam.matrixNum); + DestroySprite(sprite); + } +} + +void sub_80DC2D4(u8 taskId) +{ + s16 i; + u8 var1; + struct ScanlineEffectParams scanlineParams; + struct Task *task = &gTasks[taskId]; + + var1 = sub_8077FC0(gAnimBankTarget); + task->data[14] = var1 - 32; + + switch (gBattleAnimArgs[0]) + { + case 0: + task->data[11] = 2; + task->data[12] = 5; + task->data[13] = 64; + task->data[15] = var1 + 32; + break; + case 1: + task->data[11] = 2; + task->data[12] = 5; + task->data[13] = 192; + task->data[15] = var1 + 32; + break; + case 2: + task->data[11] = 4; + task->data[12] = 4; + task->data[13] = 0; + task->data[15] = var1 + 32; + break; + } + + if (task->data[14] < 0) + task->data[14] = 0; + + if (GetBankIdentity_permutated(gAnimBankTarget) == 1) + { + task->data[10] = gBattle_BG1_X; + scanlineParams.dmaDest = ®_BG1HOFS; + } + else + { + task->data[10] = gBattle_BG2_X; + scanlineParams.dmaDest = ®_BG2HOFS; + } + + i = task->data[14]; + while (i <= task->data[14] + 64) + { + gScanlineEffectRegBuffers[0][i] = task->data[10]; + gScanlineEffectRegBuffers[1][i] = task->data[10]; + i++; + } + + scanlineParams.dmaControl = 0XA2600001; + scanlineParams.initState = 1; + scanlineParams.unused9 = 0; + ScanlineEffect_SetParams(scanlineParams); + + task->func = sub_80DC3F4; +} -- cgit v1.2.3 From 513d85e2df9cdb288df6345107130c4bd144148d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 1 Feb 2018 12:20:37 -0800 Subject: Finish decompiling psychic.s --- asm/psychic.s | 554 ---------------------------------------------- include/rom_8077ABC.h | 1 + ld_script.txt | 1 - src/battle/anim/psychic.c | 294 +++++++++++++++++++++++- 4 files changed, 294 insertions(+), 556 deletions(-) delete mode 100644 asm/psychic.s diff --git a/asm/psychic.s b/asm/psychic.s deleted file mode 100644 index e04832858..000000000 --- a/asm/psychic.s +++ /dev/null @@ -1,554 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - @ psychic - - thumb_func_start sub_80DC3F4 -sub_80DC3F4: @ 80DC3F4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _080DC41C @ =gTasks - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _080DC4CE - cmp r0, 0x1 - bgt _080DC420 - cmp r0, 0 - beq _080DC426 - b _080DC4E6 - .align 2, 0 -_080DC41C: .4byte gTasks -_080DC420: - cmp r0, 0x2 - beq _080DC4E0 - b _080DC4E6 -_080DC426: - ldrh r3, [r5, 0x22] - ldrh r4, [r5, 0x24] - movs r2, 0x24 - ldrsh r1, [r5, r2] - movs r2, 0x26 - ldrsh r0, [r5, r2] - cmp r1, r0 - bgt _080DC4BE - ldr r0, _080DC470 @ =gSineTable - mov r9, r0 - movs r7, 0x3 - ldr r1, _080DC474 @ =gScanlineEffectRegBuffers - mov r12, r1 - movs r2, 0xF0 - lsls r2, 3 - add r2, r12 - mov r8, r2 -_080DC448: - lsls r2, r3, 16 - asrs r0, r2, 15 - add r0, r9 - movs r3, 0 - ldrsh r0, [r0, r3] - movs r3, 0x20 - ldrsh r1, [r5, r3] - asrs r0, r1 - lsls r0, 16 - lsrs r1, r0, 16 - asrs r3, r0, 16 - adds r6, r2, 0 - cmp r3, 0 - ble _080DC478 - ldrh r1, [r5, 0xA] - adds r0, r7, 0 - ands r0, r1 - adds r0, r3, r0 - b _080DC484 - .align 2, 0 -_080DC470: .4byte gSineTable -_080DC474: .4byte gScanlineEffectRegBuffers -_080DC478: - cmp r3, 0 - bge _080DC488 - ldrh r1, [r5, 0xA] - adds r0, r7, 0 - ands r0, r1 - subs r0, r3, r0 -_080DC484: - lsls r0, 16 - lsrs r1, r0, 16 -_080DC488: - lsls r2, r4, 16 - asrs r2, 16 - lsls r3, r2, 1 - mov r0, r12 - adds r4, r3, r0 - ldrh r0, [r5, 0x1C] - lsls r1, 16 - asrs r1, 16 - adds r0, r1, r0 - strh r0, [r4] - add r3, r8 - ldrh r0, [r5, 0x1C] - adds r1, r0 - strh r1, [r3] - asrs r0, r6, 16 - ldrh r1, [r5, 0x1E] - adds r0, r1 - lsls r0, 16 - lsrs r3, r0, 16 - adds r2, 0x1 - lsls r2, 16 - lsrs r4, r2, 16 - asrs r2, 16 - movs r1, 0x26 - ldrsh r0, [r5, r1] - cmp r2, r0 - ble _080DC448 -_080DC4BE: - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x17 - ble _080DC4E6 - b _080DC4D4 -_080DC4CE: - ldr r1, _080DC4DC @ =gScanlineEffect - movs r0, 0x3 - strb r0, [r1, 0x15] -_080DC4D4: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _080DC4E6 - .align 2, 0 -_080DC4DC: .4byte gScanlineEffect -_080DC4E0: - adds r0, r2, 0 - bl DestroyAnimVisualTask -_080DC4E6: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80DC3F4 - - thumb_func_start sub_80DC4F4 -sub_80DC4F4: @ 80DC4F4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r4, r0, 24 - mov r8, r4 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _080DC528 @ =gTasks - adds r7, r0, r1 - bl AllocOamMatrix - lsls r0, 24 - lsrs r5, r0, 24 - mov r10, r5 - adds r6, r5, 0 - cmp r6, 0xFF - bne _080DC52C - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _080DC5D6 - .align 2, 0 -_080DC528: .4byte gTasks -_080DC52C: - ldr r1, _080DC550 @ =gBattleAnimArgs - ldrb r0, [r1] - bl duplicate_obj_of_side_rel2move_in_transparent_mode - lsls r0, 16 - lsrs r1, r0, 16 - mov r9, r1 - asrs r0, 16 - cmp r0, 0 - bge _080DC554 - adds r0, r5, 0 - bl FreeOamMatrix - mov r0, r8 - bl DestroyAnimVisualTask - b _080DC5D6 - .align 2, 0 -_080DC550: .4byte gBattleAnimArgs -_080DC554: - ldr r2, _080DC5E4 @ =gSprites - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - adds r0, r2, 0 - adds r0, 0x1C - adds r0, r4, r0 - ldr r1, _080DC5E8 @ =SpriteCallbackDummy - str r1, [r0] - adds r4, r2 - ldrb r0, [r4, 0x1] - movs r1, 0x3 - orrs r0, r1 - strb r0, [r4, 0x1] - movs r0, 0x1F - ands r6, r0 - lsls r2, r6, 1 - ldrb r1, [r4, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r1 - orrs r0, r2 - strb r0, [r4, 0x3] - adds r2, r4, 0 - adds r2, 0x2C - ldrb r0, [r2] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2] - adds r1, r4, 0 - adds r1, 0x43 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - mov r1, r9 - lsls r0, r1, 24 - lsrs r0, 24 - movs r2, 0x80 - lsls r2, 1 - adds r1, r2, 0 - movs r3, 0 - bl obj_id_set_rotscale - ldrb r3, [r4, 0x1] - lsrs r1, r3, 6 - ldrb r2, [r4, 0x3] - lsrs r2, 6 - lsls r3, 30 - lsrs r3, 30 - adds r0, r4, 0 - bl CalcCenterToCornerVec - ldr r1, _080DC5EC @ =gBattleAnimArgs - ldrb r0, [r1] - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r7, 0x22] - mov r0, r10 - strh r0, [r7, 0x24] - mov r1, r9 - strh r1, [r7, 0x26] - ldr r0, _080DC5F0 @ =sub_80DC5F4 - str r0, [r7] -_080DC5D6: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080DC5E4: .4byte gSprites -_080DC5E8: .4byte SpriteCallbackDummy -_080DC5EC: .4byte gBattleAnimArgs -_080DC5F0: .4byte sub_80DC5F4 - thumb_func_end sub_80DC4F4 - - thumb_func_start sub_80DC5F4 -sub_80DC5F4: @ 80DC5F4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, _080DC618 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - beq _080DC678 - cmp r0, 0x1 - bgt _080DC61C - cmp r0, 0 - beq _080DC626 - b _080DC6F8 - .align 2, 0 -_080DC618: .4byte gTasks -_080DC61C: - cmp r0, 0x2 - beq _080DC6C8 - cmp r0, 0x3 - beq _080DC6E8 - b _080DC6F8 -_080DC626: - ldrh r0, [r4, 0xA] - adds r0, 0x4 - strh r0, [r4, 0xA] - ldr r1, _080DC674 @ =gSineTable - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - lsls r1, 16 - asrs r1, 17 - movs r2, 0x80 - lsls r2, 1 - adds r0, r2, 0 - subs r0, r1 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0xC - ldrsh r2, [r4, r1] - adds r1, r2, 0 - movs r3, 0 - bl obj_id_set_rotscale - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x22] - lsls r1, 24 - lsrs r1, 24 - bl sub_8079AB8 - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0x30 - bne _080DC6F8 - b _080DC6DA - .align 2, 0 -_080DC674: .4byte gSineTable -_080DC678: - ldrh r0, [r4, 0xA] - subs r0, 0x4 - strh r0, [r4, 0xA] - ldr r1, _080DC6C4 @ =gSineTable - movs r2, 0xA - ldrsh r0, [r4, r2] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - lsls r1, 16 - asrs r1, 17 - movs r2, 0x80 - lsls r2, 1 - adds r0, r2, 0 - subs r0, r1 - strh r0, [r4, 0xC] - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0xC - ldrsh r2, [r4, r1] - adds r1, r2, 0 - movs r3, 0 - bl obj_id_set_rotscale - ldrh r0, [r4, 0x26] - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x22] - lsls r1, 24 - lsrs r1, 24 - bl sub_8079AB8 - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _080DC6F8 - b _080DC6DA - .align 2, 0 -_080DC6C4: .4byte gSineTable -_080DC6C8: - movs r0, 0x26 - ldrsh r1, [r4, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080DC6E4 @ =gSprites - adds r0, r1 - bl obj_delete_but_dont_free_vram -_080DC6DA: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080DC6F8 - .align 2, 0 -_080DC6E4: .4byte gSprites -_080DC6E8: - ldrh r0, [r4, 0x24] - lsls r0, 24 - lsrs r0, 24 - bl FreeOamMatrix - adds r0, r5, 0 - bl DestroyAnimVisualTask -_080DC6F8: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80DC5F4 - - thumb_func_start sub_80DC700 -sub_80DC700: @ 80DC700 - push {r4,r5,lr} - adds r5, r0, 0 - movs r1, 0x2E - ldrsh r0, [r5, r1] - cmp r0, 0x1 - beq _080DC778 - cmp r0, 0x1 - bgt _080DC716 - cmp r0, 0 - beq _080DC720 - b _080DC818 -_080DC716: - cmp r0, 0x2 - beq _080DC7AA - cmp r0, 0x3 - beq _080DC808 - b _080DC818 -_080DC720: - ldr r4, _080DC76C @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x20] - ldrb r0, [r4] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x22] - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080DC74E - ldrh r0, [r5, 0x22] - adds r0, 0xC - strh r0, [r5, 0x22] -_080DC74E: - movs r0, 0x8 - strh r0, [r5, 0x30] - ldr r1, _080DC770 @ =REG_BLDCNT - movs r2, 0xFD - lsls r2, 6 - adds r0, r2, 0 - strh r0, [r1] - ldr r2, _080DC774 @ =REG_BLDALPHA - ldrh r1, [r5, 0x30] - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r0, r1 - strh r0, [r2] - b _080DC7A2 - .align 2, 0 -_080DC76C: .4byte gAnimBankAttacker -_080DC770: .4byte REG_BLDCNT -_080DC774: .4byte REG_BLDALPHA -_080DC778: - adds r0, r5, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _080DC818 - movs r0, 0x40 - negs r0, r0 - bl BattleAnimAdjustPanning - adds r1, r0, 0 - lsls r1, 24 - asrs r1, 24 - movs r0, 0xCB - bl PlaySE12WithPanning - adds r0, r5, 0 - movs r1, 0x1 - bl ChangeSpriteAffineAnim -_080DC7A2: - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - b _080DC818 -_080DC7AA: - ldrh r0, [r5, 0x32] - adds r1, r0, 0x1 - strh r1, [r5, 0x32] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080DC7E8 - movs r0, 0 - strh r0, [r5, 0x32] - ldrh r1, [r5, 0x30] - subs r1, 0x1 - strh r1, [r5, 0x30] - ldr r2, _080DC804 @ =REG_BLDALPHA - movs r0, 0x10 - subs r0, r1 - lsls r0, 8 - orrs r1, r0 - strh r1, [r2] - movs r1, 0x30 - ldrsh r0, [r5, r1] - cmp r0, 0 - bne _080DC7E8 - ldrh r0, [r5, 0x2E] - adds r0, 0x1 - strh r0, [r5, 0x2E] - adds r2, r5, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2] -_080DC7E8: - movs r0, 0xE0 - lsls r0, 2 - adds r2, r0, 0 - ldrh r1, [r5, 0x34] - adds r2, r1 - lsls r1, r2, 16 - asrs r1, 24 - ldrh r0, [r5, 0x26] - subs r0, r1 - strh r0, [r5, 0x26] - movs r0, 0xFF - ands r2, r0 - strh r2, [r5, 0x34] - b _080DC818 - .align 2, 0 -_080DC804: .4byte REG_BLDALPHA -_080DC808: - ldr r0, _080DC820 @ =REG_BLDCNT - movs r1, 0 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, r5, 0 - bl DestroyAnimSprite -_080DC818: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DC820: .4byte REG_BLDCNT - thumb_func_end sub_80DC700 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 756c5fa03..f7b75fb04 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -105,5 +105,6 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); void sub_807941C(struct Sprite *sprite); void sub_80789D4(bool8 a1); +void sub_8079AB8(u8 sprite, u8 sprite2); #endif // GUARD_ROM_8077ABC_H diff --git a/ld_script.txt b/ld_script.txt index c5f3669e8..cb3e55242 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -297,7 +297,6 @@ SECTIONS { src/battle/anim/poison.o(.text); asm/flying.o(.text); src/battle/anim/psychic.o(.text); - asm/psychic.o(.text); src/battle/anim/bug.o(.text); src/battle/anim/rock.o(.text); asm/ghost.o(.text); diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index a00b0ba3a..6617183cb 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -32,7 +32,8 @@ static void sub_80DBCD0(u8 taskId); static void sub_80DBD58(u8 taskId); static void sub_80DBE98(u8 taskId); static void sub_80DC1FC(u8 taskId); -void sub_80DC3F4(u8 taskId); +static void sub_80DC3F4(u8 taskId); +void sub_80DC5F4(u8 taskId); void sub_80DB74C(struct Sprite *sprite) @@ -606,3 +607,294 @@ void sub_80DC2D4(u8 taskId) task->func = sub_80DC3F4; } + +static void sub_80DC3F4(u8 taskId) +{ + s16 sineIndex, i; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + sineIndex = task->data[13]; + i = task->data[14]; + while (i <= task->data[15]) + { + s16 var2 = (gSineTable[sineIndex] >> task->data[12]); + if (var2 > 0) + { + var2 += (task->data[1] & 3); + } + else if (var2 < 0) + { + var2 -= (task->data[1] & 3); + } + + gScanlineEffectRegBuffers[0][i] = task->data[10] + var2; + gScanlineEffectRegBuffers[1][i] = task->data[10] + var2; + + sineIndex += task->data[11]; + i++; + } + + if (++task->data[1] > 23) + { + task->data[0]++; + } + break; + case 1: + gScanlineEffect.state = 3; + task->data[0]++; + break; + case 2: + DestroyAnimVisualTask(taskId); + break; + } +} + +#ifdef NONMATCHING +void sub_80DC4F4(u8 taskId) +{ + s16 spriteId; + u8 matrixNum; + register u8 matrixNum2 asm("r6"); + struct Task *task = &gTasks[taskId]; + + matrixNum = AllocOamMatrix(); + matrixNum2 = matrixNum; + if (matrixNum2 == 0xFF) + { + DestroyAnimVisualTask(taskId); + return; + } + + spriteId = duplicate_obj_of_side_rel2move_in_transparent_mode(gBattleAnimArgs[0]); + if (spriteId < 0) + { + FreeOamMatrix(matrixNum); + DestroyAnimVisualTask(taskId); + return; + } + + gSprites[spriteId].callback = SpriteCallbackDummy; + gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_DOUBLE; + gSprites[spriteId].oam.matrixNum = matrixNum2; + gSprites[spriteId].affineAnimPaused = 1; + gSprites[spriteId].subpriority++; + obj_id_set_rotscale(spriteId, 256, 256, 0); + CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode); + + task->data[13] = GetAnimBankSpriteId(gBattleAnimArgs[0]); + task->data[14] = matrixNum; + task->data[15] = spriteId; + task->func = sub_80DC5F4; +} +#else +__attribute__((naked)) +void sub_80DC4F4(u8 taskId) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + lsls r0, 24\n\ + lsrs r4, r0, 24\n\ + mov r8, r4\n\ + lsls r0, r4, 2\n\ + adds r0, r4\n\ + lsls r0, 3\n\ + ldr r1, _080DC528 @ =gTasks\n\ + adds r7, r0, r1\n\ + bl AllocOamMatrix\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ + mov r10, r5\n\ + adds r6, r5, 0\n\ + cmp r6, 0xFF\n\ + bne _080DC52C\n\ + adds r0, r4, 0\n\ + bl DestroyAnimVisualTask\n\ + b _080DC5D6\n\ + .align 2, 0\n\ +_080DC528: .4byte gTasks\n\ +_080DC52C:\n\ + ldr r1, _080DC550 @ =gBattleAnimArgs\n\ + ldrb r0, [r1]\n\ + bl duplicate_obj_of_side_rel2move_in_transparent_mode\n\ + lsls r0, 16\n\ + lsrs r1, r0, 16\n\ + mov r9, r1\n\ + asrs r0, 16\n\ + cmp r0, 0\n\ + bge _080DC554\n\ + adds r0, r5, 0\n\ + bl FreeOamMatrix\n\ + mov r0, r8\n\ + bl DestroyAnimVisualTask\n\ + b _080DC5D6\n\ + .align 2, 0\n\ +_080DC550: .4byte gBattleAnimArgs\n\ +_080DC554:\n\ + ldr r2, _080DC5E4 @ =gSprites\n\ + lsls r4, r0, 4\n\ + adds r4, r0\n\ + lsls r4, 2\n\ + adds r0, r2, 0\n\ + adds r0, 0x1C\n\ + adds r0, r4, r0\n\ + ldr r1, _080DC5E8 @ =SpriteCallbackDummy\n\ + str r1, [r0]\n\ + adds r4, r2\n\ + ldrb r0, [r4, 0x1]\n\ + movs r1, 0x3\n\ + orrs r0, r1\n\ + strb r0, [r4, 0x1]\n\ + movs r0, 0x1F\n\ + ands r6, r0\n\ + lsls r2, r6, 1\n\ + ldrb r1, [r4, 0x3]\n\ + movs r0, 0x3F\n\ + negs r0, r0\n\ + ands r0, r1\n\ + orrs r0, r2\n\ + strb r0, [r4, 0x3]\n\ + adds r2, r4, 0\n\ + adds r2, 0x2C\n\ + ldrb r0, [r2]\n\ + movs r1, 0x80\n\ + orrs r0, r1\n\ + strb r0, [r2]\n\ + adds r1, r4, 0\n\ + adds r1, 0x43\n\ + ldrb r0, [r1]\n\ + adds r0, 0x1\n\ + strb r0, [r1]\n\ + mov r1, r9\n\ + lsls r0, r1, 24\n\ + lsrs r0, 24\n\ + movs r2, 0x80\n\ + lsls r2, 1\n\ + adds r1, r2, 0\n\ + movs r3, 0\n\ + bl obj_id_set_rotscale\n\ + ldrb r3, [r4, 0x1]\n\ + lsrs r1, r3, 6\n\ + ldrb r2, [r4, 0x3]\n\ + lsrs r2, 6\n\ + lsls r3, 30\n\ + lsrs r3, 30\n\ + adds r0, r4, 0\n\ + bl CalcCenterToCornerVec\n\ + ldr r1, _080DC5EC @ =gBattleAnimArgs\n\ + ldrb r0, [r1]\n\ + bl GetAnimBankSpriteId\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r7, 0x22]\n\ + mov r0, r10\n\ + strh r0, [r7, 0x24]\n\ + mov r1, r9\n\ + strh r1, [r7, 0x26]\n\ + ldr r0, _080DC5F0 @ =sub_80DC5F4\n\ + str r0, [r7]\n\ +_080DC5D6:\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080DC5E4: .4byte gSprites\n\ +_080DC5E8: .4byte SpriteCallbackDummy\n\ +_080DC5EC: .4byte gBattleAnimArgs\n\ +_080DC5F0: .4byte sub_80DC5F4\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_80DC5F4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[1] += 4; + task->data[2] = 256 - (gSineTable[task->data[1]] >> 1); + obj_id_set_rotscale(task->data[15], task->data[2], task->data[2], 0); + sub_8079AB8(task->data[15], task->data[13]); + if (task->data[1] == 48) + task->data[0]++; + break; + case 1: + task->data[1] -= 4; + task->data[2] = 256 - (gSineTable[task->data[1]] >> 1);; + obj_id_set_rotscale(task->data[15], task->data[2], task->data[2], 0); + sub_8079AB8(task->data[15], task->data[13]); + if (task->data[1] == 0) + task->data[0]++; + break; + case 2: + obj_delete_but_dont_free_vram(&gSprites[task->data[15]]); + task->data[0]++; + break; + case 3: + FreeOamMatrix(task->data[14]); + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80DC700(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1); + + if (IsContest()) + sprite->pos1.y += 12; + + sprite->data[1] = 8; + REG_BLDCNT = 0x3F40; + REG_BLDALPHA = ((16 - sprite->data[1]) << 8) | sprite->data[1]; + sprite->data[0]++; + break; + case 1: + if (sprite->affineAnimEnded) + { + PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(-64)); + ChangeSpriteAffineAnim(sprite, 1); + sprite->data[0]++; + } + break; + case 2: + if (sprite->data[2]++ > 1) + { + sprite->data[2] = 0; + sprite->data[1]--; + REG_BLDALPHA = ((16 - sprite->data[1]) << 8) | sprite->data[1]; + + if (sprite->data[1] == 0) + { + sprite->data[0]++; + sprite->invisible = 1; + } + } + + sprite->data[3] += 896; + sprite->pos2.y -= sprite->data[3] >> 8; + sprite->data[3] &= 0xFF; + break; + case 3: + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimSprite(sprite); + break; + } +} -- cgit v1.2.3 From 07a44e30ff530d5018f870aba4c5710d1e83059b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 3 Feb 2018 11:58:21 -0800 Subject: Decompile more of dark.s --- asm/dark.s | 1071 ------------------------------------------------ src/battle/anim/dark.c | 440 +++++++++++++++++++- 2 files changed, 429 insertions(+), 1082 deletions(-) diff --git a/asm/dark.s b/asm/dark.s index 9f6ad3278..572780621 100644 --- a/asm/dark.s +++ b/asm/dark.s @@ -7,1077 +7,6 @@ @ dark - thumb_func_start sub_80DFF1C -sub_80DFF1C: @ 80DFF1C - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, _080DFF50 @ =gBattleAnimArgs - ldrh r0, [r5] - ldrh r1, [r4, 0x20] - adds r0, r1 - strh r0, [r4, 0x20] - ldrh r0, [r5, 0x2] - ldrh r1, [r4, 0x22] - adds r0, r1 - strh r0, [r4, 0x22] - ldrb r1, [r5, 0x4] - adds r0, r4, 0 - bl StartSpriteAffineAnim - ldrh r0, [r5, 0x6] - strh r0, [r4, 0x2E] - ldrh r0, [r5, 0x8] - strh r0, [r4, 0x30] - ldrh r0, [r5, 0xA] - strh r0, [r4, 0x32] - ldr r0, _080DFF54 @ =sub_80DFF58 - str r0, [r4, 0x1C] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080DFF50: .4byte gBattleAnimArgs -_080DFF54: .4byte sub_80DFF58 - thumb_func_end sub_80DFF1C - - thumb_func_start sub_80DFF58 -sub_80DFF58: @ 80DFF58 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x2E] - ldrh r1, [r2, 0x36] - adds r0, r1 - strh r0, [r2, 0x36] - ldrh r1, [r2, 0x30] - ldrh r3, [r2, 0x38] - adds r1, r3 - strh r1, [r2, 0x38] - lsls r0, 16 - asrs r0, 24 - strh r0, [r2, 0x24] - lsls r1, 16 - asrs r1, 24 - strh r1, [r2, 0x26] - ldrh r0, [r2, 0x34] - adds r0, 0x1 - strh r0, [r2, 0x34] - lsls r0, 16 - asrs r0, 16 - movs r3, 0x32 - ldrsh r1, [r2, r3] - cmp r0, r1 - bne _080DFF8E - ldr r0, _080DFF94 @ =sub_80DFF98 - str r0, [r2, 0x1C] -_080DFF8E: - pop {r0} - bx r0 - .align 2, 0 -_080DFF94: .4byte sub_80DFF98 - thumb_func_end sub_80DFF58 - - thumb_func_start sub_80DFF98 -sub_80DFF98: @ 80DFF98 - push {lr} - adds r3, r0, 0 - ldrh r1, [r3, 0x36] - ldrh r0, [r3, 0x2E] - subs r1, r0 - strh r1, [r3, 0x36] - ldrh r0, [r3, 0x38] - ldrh r2, [r3, 0x30] - subs r0, r2 - strh r0, [r3, 0x38] - lsls r1, 16 - asrs r1, 24 - strh r1, [r3, 0x24] - lsls r0, 16 - asrs r0, 24 - strh r0, [r3, 0x26] - ldrh r0, [r3, 0x34] - subs r0, 0x1 - strh r0, [r3, 0x34] - lsls r0, 16 - cmp r0, 0 - bne _080DFFCA - adds r0, r3, 0 - bl move_anim_8074EE0 -_080DFFCA: - pop {r0} - bx r0 - thumb_func_end sub_80DFF98 - - thumb_func_start sub_80DFFD0 -sub_80DFFD0: @ 80DFFD0 - push {r4-r7,lr} - adds r4, r0, 0 - ldr r0, _080DFFE4 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r1, [r0, r2] - adds r3, r0, 0 - cmp r1, 0 - bne _080DFFEC - ldr r0, _080DFFE8 @ =gAnimBankAttacker - b _080DFFEE - .align 2, 0 -_080DFFE4: .4byte gBattleAnimArgs -_080DFFE8: .4byte gAnimBankAttacker -_080DFFEC: - ldr r0, _080E001C @ =gAnimBankTarget -_080DFFEE: - ldrb r5, [r0] - movs r6, 0x14 - ldrh r2, [r4, 0x4] - lsls r1, r2, 22 - lsrs r1, 22 - adds r1, 0x4 - ldr r7, _080E0020 @ =0x000003ff - adds r0, r7, 0 - ands r1, r0 - ldr r0, _080E0024 @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - movs r1, 0x2 - ldrsh r0, [r3, r1] - cmp r0, 0x1 - beq _080E004C - cmp r0, 0x1 - bgt _080E0028 - cmp r0, 0 - beq _080E0032 - b _080E00A0 - .align 2, 0 -_080E001C: .4byte gAnimBankTarget -_080E0020: .4byte 0x000003ff -_080E0024: .4byte 0xfffffc00 -_080E0028: - cmp r0, 0x2 - beq _080E0066 - cmp r0, 0x3 - beq _080E007E - b _080E00A0 -_080E0032: - adds r0, r5, 0 - movs r1, 0x5 - bl sub_807A100 - subs r0, 0x8 - strh r0, [r4, 0x20] - adds r0, r5, 0 - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x8 - strh r0, [r4, 0x22] - b _080E00A0 -_080E004C: - adds r0, r5, 0 - movs r1, 0x5 - bl sub_807A100 - subs r0, 0xE - strh r0, [r4, 0x20] - adds r0, r5, 0 - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x10 - strh r0, [r4, 0x22] - b _080E00A0 -_080E0066: - adds r0, r5, 0 - movs r1, 0x4 - bl sub_807A100 - adds r0, 0x8 - strh r0, [r4, 0x20] - adds r0, r5, 0 - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x8 - b _080E0094 -_080E007E: - adds r0, r5, 0 - movs r1, 0x4 - bl sub_807A100 - adds r0, 0xE - strh r0, [r4, 0x20] - adds r0, r5, 0 - movs r1, 0x2 - bl sub_807A100 - adds r0, 0x10 -_080E0094: - strh r0, [r4, 0x22] - adds r0, r4, 0 - movs r1, 0x1 - bl StartSpriteAffineAnim - movs r6, 0xEC -_080E00A0: - movs r0, 0x20 - strh r0, [r4, 0x2E] - lsls r0, r6, 24 - asrs r0, 24 - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x22] - adds r0, 0xC - strh r0, [r4, 0x36] - ldr r0, _080E00C8 @ =0x0000fff4 - strh r0, [r4, 0x38] - adds r0, r4, 0 - bl sub_80786EC - ldr r0, _080E00CC @ =sub_80E00D0 - str r0, [r4, 0x1C] - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E00C8: .4byte 0x0000fff4 -_080E00CC: .4byte sub_80E00D0 - thumb_func_end sub_80DFFD0 - - thumb_func_start sub_80E00D0 -sub_80E00D0: @ 80E00D0 - push {r4,lr} - adds r4, r0, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080E00E4 - adds r0, r4, 0 - bl move_anim_8074EE0 -_080E00E4: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80E00D0 - - thumb_func_start sub_80E00EC -sub_80E00EC: @ 80E00EC - push {r4-r7,lr} - sub sp, 0x18 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, _080E0150 @ =gTasks - adds r5, r1, r0 - ldr r4, _080E0154 @ =gAnimBankAttacker - ldrb r0, [r4] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1F - movs r6, 0 - strh r0, [r5, 0x16] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_807A100 - subs r0, 0x7 - strh r0, [r5, 0x14] - ldrh r1, [r5, 0x16] - strh r1, [r5, 0x12] - strh r0, [r5, 0x10] - subs r1, r0 - lsls r1, 8 - strh r1, [r5, 0x22] - ldrb r0, [r4] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - subs r1, 0x20 - strh r1, [r5, 0x24] - adds r0, 0x20 - strh r0, [r5, 0x26] - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080E015C - ldr r0, _080E0158 @ =0x0000fff4 - b _080E015E - .align 2, 0 -_080E0150: .4byte gTasks -_080E0154: .4byte gAnimBankAttacker -_080E0158: .4byte 0x0000fff4 -_080E015C: - ldr r0, _080E01A8 @ =0x0000ffc0 -_080E015E: - strh r0, [r5, 0x18] - ldr r0, _080E01AC @ =gAnimBankAttacker - ldrb r0, [r0] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0xE] - cmp r0, 0x1 - bne _080E01C4 - add r4, sp, 0xC - adds r0, r4, 0 - bl sub_8078914 - ldr r0, _080E01B0 @ =gBattle_BG1_Y - ldrh r0, [r0] - strh r0, [r5, 0x1C] - ldr r1, _080E01B4 @ =REG_BLDCNT - ldr r2, _080E01B8 @ =0x00003f42 - adds r0, r2, 0 - strh r0, [r1] - ldrb r1, [r4, 0x8] - lsls r1, 4 - movs r0, 0 - movs r2, 0x20 - bl FillPalette - ldr r0, _080E01BC @ =REG_BG1VOFS - str r0, [sp] - movs r7, 0x2 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080E01F4 - ldr r1, _080E01C0 @ =gBattle_BG2_X - b _080E01EE - .align 2, 0 -_080E01A8: .4byte 0x0000ffc0 -_080E01AC: .4byte gAnimBankAttacker -_080E01B0: .4byte gBattle_BG1_Y -_080E01B4: .4byte REG_BLDCNT -_080E01B8: .4byte 0x00003f42 -_080E01BC: .4byte REG_BG1VOFS -_080E01C0: .4byte gBattle_BG2_X -_080E01C4: - ldr r0, _080E0278 @ =gBattle_BG2_Y - ldrh r0, [r0] - strh r0, [r5, 0x1C] - ldr r1, _080E027C @ =REG_BLDCNT - ldr r2, _080E0280 @ =0x00003f44 - adds r0, r2, 0 - strh r0, [r1] - movs r0, 0 - movs r1, 0x90 - movs r2, 0x20 - bl FillPalette - ldr r0, _080E0284 @ =REG_BG2VOFS - str r0, [sp] - movs r7, 0x4 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080E01F4 - ldr r1, _080E0288 @ =gBattle_BG1_X -_080E01EE: - ldrh r0, [r1] - adds r0, 0xF0 - strh r0, [r1] -_080E01F4: - ldr r0, _080E028C @ =0xa2600001 - str r0, [sp, 0x4] - mov r2, sp - movs r1, 0 - movs r0, 0x1 - strb r0, [r2, 0x8] - mov r0, sp - strb r1, [r0, 0x9] - strh r1, [r5, 0x1E] - movs r0, 0x10 - strh r0, [r5, 0x20] - strh r1, [r5, 0x8] - strh r1, [r5, 0xA] - strh r1, [r5, 0xC] - movs r0, 0x3 - bl sub_80E08CC - movs r3, 0 - ldr r4, _080E0290 @ =gScanlineEffectRegBuffers - movs r0, 0xF0 - lsls r0, 3 - adds r6, r4, r0 -_080E0220: - lsls r1, r3, 1 - adds r2, r1, r4 - ldrh r0, [r5, 0x1C] - strh r0, [r2] - adds r1, r6 - ldrh r0, [r5, 0x1C] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x6F - bls _080E0220 - ldr r0, [sp] - ldr r1, [sp, 0x4] - ldr r2, [sp, 0x8] - bl ScanlineEffect_SetParams - ldr r1, _080E0294 @ =REG_WINOUT - movs r0, 0x3F - eors r7, r0 - movs r2, 0xFC - lsls r2, 6 - adds r0, r2, 0 - orrs r7, r0 - strh r7, [r1] - subs r1, 0x2 - adds r2, 0x3F - adds r0, r2, 0 - strh r0, [r1] - ldr r2, _080E0298 @ =gBattle_WIN0H - ldrh r0, [r5, 0x24] - lsls r0, 8 - ldrh r1, [r5, 0x26] - orrs r0, r1 - strh r0, [r2] - ldr r1, _080E029C @ =gBattle_WIN0V - movs r0, 0xA0 - strh r0, [r1] - ldr r0, _080E02A0 @ =sub_80E02A4 - str r0, [r5] - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E0278: .4byte gBattle_BG2_Y -_080E027C: .4byte REG_BLDCNT -_080E0280: .4byte 0x00003f44 -_080E0284: .4byte REG_BG2VOFS -_080E0288: .4byte gBattle_BG1_X -_080E028C: .4byte 0xa2600001 -_080E0290: .4byte gScanlineEffectRegBuffers -_080E0294: .4byte REG_WINOUT -_080E0298: .4byte gBattle_WIN0H -_080E029C: .4byte gBattle_WIN0V -_080E02A0: .4byte sub_80E02A4 - thumb_func_end sub_80E00EC - - thumb_func_start sub_80E02A4 -sub_80E02A4: @ 80E02A4 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _080E02C8 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _080E02BE - b _080E03B6 -_080E02BE: - lsls r0, 2 - ldr r1, _080E02CC @ =_080E02D0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E02C8: .4byte gTasks -_080E02CC: .4byte _080E02D0 - .align 2, 0 -_080E02D0: - .4byte _080E02E4 - .4byte _080E0344 - .4byte _080E035E - .4byte _080E039C - .4byte _080E03B0 -_080E02E4: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080E03B6 - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E0314 - ldrh r1, [r4, 0x1E] - movs r2, 0x1E - ldrsh r0, [r4, r2] - cmp r0, 0xC - beq _080E0322 - adds r0, r1, 0x1 - strh r0, [r4, 0x1E] - b _080E0322 -_080E0314: - ldrh r1, [r4, 0x20] - movs r2, 0x20 - ldrsh r0, [r4, r2] - cmp r0, 0x8 - beq _080E0322 - subs r0, r1, 0x1 - strh r0, [r4, 0x20] -_080E0322: - ldr r2, _080E0340 @ =REG_BLDALPHA - ldrh r0, [r4, 0x20] - lsls r0, 8 - ldrh r1, [r4, 0x1E] - orrs r0, r1 - strh r0, [r2] - movs r1, 0x1E - ldrsh r0, [r4, r1] - cmp r0, 0xC - bne _080E03B6 - movs r2, 0x20 - ldrsh r0, [r4, r2] - cmp r0, 0x8 - bne _080E03B6 - b _080E03A2 - .align 2, 0 -_080E0340: .4byte REG_BLDALPHA -_080E0344: - ldrh r0, [r4, 0x10] - subs r0, 0x8 - strh r0, [r4, 0x10] - adds r0, r4, 0 - bl sub_80E079C - movs r0, 0x10 - ldrsh r1, [r4, r0] - movs r2, 0x18 - ldrsh r0, [r4, r2] - cmp r1, r0 - bge _080E03B6 - b _080E03A2 -_080E035E: - ldrh r0, [r4, 0x10] - subs r0, 0x8 - strh r0, [r4, 0x10] - adds r0, r4, 0 - bl sub_80E079C - ldrh r1, [r4, 0x24] - adds r1, 0x4 - strh r1, [r4, 0x24] - ldrh r0, [r4, 0x26] - subs r2, r0, 0x4 - strh r2, [r4, 0x26] - lsls r1, 16 - lsls r0, r2, 16 - cmp r1, r0 - blt _080E0380 - strh r2, [r4, 0x24] -_080E0380: - ldr r3, _080E0398 @ =gBattle_WIN0H - ldrh r2, [r4, 0x24] - lsls r0, r2, 8 - ldrh r1, [r4, 0x26] - orrs r0, r1 - strh r0, [r3] - lsls r2, 16 - lsls r1, 16 - cmp r2, r1 - bne _080E03B6 - b _080E03A2 - .align 2, 0 -_080E0398: .4byte gBattle_WIN0H -_080E039C: - ldr r1, _080E03AC @ =gScanlineEffect - movs r0, 0x3 - strb r0, [r1, 0x15] -_080E03A2: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080E03B6 - .align 2, 0 -_080E03AC: .4byte gScanlineEffect -_080E03B0: - adds r0, r2, 0 - bl DestroyAnimVisualTask -_080E03B6: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80E02A4 - - thumb_func_start sub_80E03BC -sub_80E03BC: @ 80E03BC - push {r4-r7,lr} - sub sp, 0x18 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, _080E03E4 @ =gTasks - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x4 - bls _080E03D8 - b _080E05F2 -_080E03D8: - lsls r0, 2 - ldr r1, _080E03E8 @ =_080E03EC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E03E4: .4byte gTasks -_080E03E8: .4byte _080E03EC - .align 2, 0 -_080E03EC: - .4byte _080E0400 - .4byte _080E048C - .4byte _080E04D0 - .4byte _080E053C - .4byte _080E05A4 -_080E0400: - bl IsContest - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080E043C - ldr r0, _080E042C @ =gBattle_WIN0H - movs r1, 0 - strh r1, [r0] - ldr r0, _080E0430 @ =gBattle_WIN0V - strh r1, [r0] - ldr r0, _080E0434 @ =REG_WININ - ldr r2, _080E0438 @ =0x00003f3f - adds r1, r2, 0 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, r4, 0 - bl DestroyAnimVisualTask - b _080E05F2 - .align 2, 0 -_080E042C: .4byte gBattle_WIN0H -_080E0430: .4byte gBattle_WIN0V -_080E0434: .4byte REG_WININ -_080E0438: .4byte 0x00003f3f -_080E043C: - ldr r0, _080E045C @ =gAnimBankTarget - ldrb r0, [r0] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0xE] - cmp r0, 0x1 - bne _080E046C - ldr r1, _080E0460 @ =REG_BLDCNT - ldr r2, _080E0464 @ =0x00003f42 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _080E0468 @ =gBattle_BG2_X - b _080E0476 - .align 2, 0 -_080E045C: .4byte gAnimBankTarget -_080E0460: .4byte REG_BLDCNT -_080E0464: .4byte 0x00003f42 -_080E0468: .4byte gBattle_BG2_X -_080E046C: - ldr r1, _080E0480 @ =REG_BLDCNT - ldr r2, _080E0484 @ =0x00003f44 - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _080E0488 @ =gBattle_BG1_X -_080E0476: - ldrh r0, [r1] - adds r0, 0xF0 - strh r0, [r1] - b _080E0590 - .align 2, 0 -_080E0480: .4byte REG_BLDCNT -_080E0484: .4byte 0x00003f44 -_080E0488: .4byte gBattle_BG1_X -_080E048C: - movs r1, 0xE - ldrsh r0, [r5, r1] - cmp r0, 0x1 - bne _080E04B4 - mov r0, sp - bl sub_8078914 - ldr r0, _080E04B0 @ =gBattle_BG1_Y - ldrh r0, [r0] - strh r0, [r5, 0x1C] - mov r0, sp - ldrb r1, [r0, 0x8] - lsls r1, 4 - movs r0, 0 - movs r2, 0x20 - bl FillPalette - b _080E04C4 - .align 2, 0 -_080E04B0: .4byte gBattle_BG1_Y -_080E04B4: - ldr r0, _080E04CC @ =gBattle_BG2_Y - ldrh r0, [r0] - strh r0, [r5, 0x1C] - movs r0, 0 - movs r1, 0x90 - movs r2, 0x20 - bl FillPalette -_080E04C4: - movs r0, 0x3 - bl sub_80E08CC - b _080E0590 - .align 2, 0 -_080E04CC: .4byte gBattle_BG2_Y -_080E04D0: - ldr r4, _080E051C @ =gAnimBankTarget - ldrb r0, [r4] - movs r1, 0x1 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - adds r0, 0x1F - movs r6, 0 - strh r0, [r5, 0x16] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_807A100 - subs r0, 0x7 - strh r0, [r5, 0x14] - ldrh r1, [r5, 0x16] - subs r1, r0 - lsls r1, 8 - strh r1, [r5, 0x22] - ldrb r0, [r4] - movs r1, 0 - bl GetBankPosition - lsls r0, 24 - lsrs r0, 24 - subs r1, r0, 0x4 - strh r1, [r5, 0x24] - adds r0, 0x4 - strh r0, [r5, 0x26] - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - bne _080E0524 - ldr r0, _080E0520 @ =0x0000fff4 - b _080E0526 - .align 2, 0 -_080E051C: .4byte gAnimBankTarget -_080E0520: .4byte 0x0000fff4 -_080E0524: - ldr r0, _080E0538 @ =0x0000ffc0 -_080E0526: - strh r0, [r5, 0x18] - ldrh r0, [r5, 0x18] - strh r0, [r5, 0x10] - strh r0, [r5, 0x12] - movs r0, 0xC - strh r0, [r5, 0x1E] - movs r0, 0x8 - strh r0, [r5, 0x20] - b _080E0590 - .align 2, 0 -_080E0538: .4byte 0x0000ffc0 -_080E053C: - movs r2, 0xE - ldrsh r0, [r5, r2] - cmp r0, 0x1 - bne _080E054C - ldr r0, _080E0548 @ =REG_BG1VOFS - b _080E054E - .align 2, 0 -_080E0548: .4byte REG_BG1VOFS -_080E054C: - ldr r0, _080E0598 @ =REG_BG2VOFS -_080E054E: - str r0, [sp, 0xC] - movs r3, 0 - add r4, sp, 0xC - ldr r6, _080E059C @ =gScanlineEffectRegBuffers - movs r0, 0xF0 - lsls r0, 3 - adds r7, r6, r0 -_080E055C: - lsls r1, r3, 1 - adds r2, r1, r6 - ldrh r0, [r5, 0x1C] - adds r0, 0x9F - subs r0, r3 - strh r0, [r2] - adds r1, r7 - ldrh r0, [r5, 0x1C] - adds r0, 0x9F - subs r0, r3 - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, 0x6F - bls _080E055C - ldr r1, _080E05A0 @ =0xa2600001 - str r1, [r4, 0x4] - movs r2, 0 - movs r0, 0x1 - strb r0, [r4, 0x8] - strb r2, [r4, 0x9] - ldr r0, [sp, 0xC] - ldr r2, [r4, 0x8] - bl ScanlineEffect_SetParams -_080E0590: - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _080E05F2 - .align 2, 0 -_080E0598: .4byte REG_BG2VOFS -_080E059C: .4byte gScanlineEffectRegBuffers -_080E05A0: .4byte 0xa2600001 -_080E05A4: - movs r1, 0xE - ldrsh r0, [r5, r1] - cmp r0, 0x1 - bne _080E05BC - ldr r1, _080E05B4 @ =REG_WINOUT - ldr r2, _080E05B8 @ =0x00003f3d - b _080E05C0 - .align 2, 0 -_080E05B4: .4byte REG_WINOUT -_080E05B8: .4byte 0x00003f3d -_080E05BC: - ldr r1, _080E05FC @ =REG_WINOUT - ldr r2, _080E0600 @ =0x00003f3b -_080E05C0: - adds r0, r2, 0 - strh r0, [r1] - ldr r1, _080E0604 @ =REG_WININ - ldr r2, _080E0608 @ =0x00003f3f - adds r0, r2, 0 - strh r0, [r1] - ldr r2, _080E060C @ =gBattle_WIN0H - ldrh r0, [r5, 0x24] - lsls r0, 8 - ldrh r1, [r5, 0x26] - orrs r0, r1 - strh r0, [r2] - ldr r1, _080E0610 @ =gBattle_WIN0V - movs r0, 0xA0 - strh r0, [r1] - movs r0, 0 - strh r0, [r5, 0x8] - strh r0, [r5, 0xA] - strh r0, [r5, 0xC] - ldr r1, _080E0614 @ =REG_BLDALPHA - ldr r2, _080E0618 @ =0x0000080c - adds r0, r2, 0 - strh r0, [r1] - ldr r0, _080E061C @ =sub_80E0620 - str r0, [r5] -_080E05F2: - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E05FC: .4byte REG_WINOUT -_080E0600: .4byte 0x00003f3b -_080E0604: .4byte REG_WININ -_080E0608: .4byte 0x00003f3f -_080E060C: .4byte gBattle_WIN0H -_080E0610: .4byte gBattle_WIN0V -_080E0614: .4byte REG_BLDALPHA -_080E0618: .4byte 0x0000080c -_080E061C: .4byte sub_80E0620 - thumb_func_end sub_80E03BC - - thumb_func_start sub_80E0620 -sub_80E0620: @ 80E0620 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _080E0644 @ =gTasks - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x4 - bls _080E063A - b _080E0784 -_080E063A: - lsls r0, 2 - ldr r1, _080E0648 @ =_080E064C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E0644: .4byte gTasks -_080E0648: .4byte _080E064C - .align 2, 0 -_080E064C: - .4byte _080E0660 - .4byte _080E068C - .4byte _080E06F4 - .4byte _080E0754 - .4byte _080E0768 -_080E0660: - ldrh r0, [r4, 0x12] - adds r0, 0x8 - strh r0, [r4, 0x12] - lsls r0, 16 - asrs r0, 16 - ldrh r2, [r4, 0x16] - movs r3, 0x16 - ldrsh r1, [r4, r3] - cmp r0, r1 - blt _080E0676 - strh r2, [r4, 0x12] -_080E0676: - adds r0, r4, 0 - bl sub_80E079C - movs r0, 0x12 - ldrsh r1, [r4, r0] - movs r2, 0x16 - ldrsh r0, [r4, r2] - cmp r1, r0 - beq _080E068A - b _080E0784 -_080E068A: - b _080E075A -_080E068C: - movs r3, 0x26 - ldrsh r0, [r4, r3] - movs r2, 0x24 - ldrsh r1, [r4, r2] - subs r0, r1 - cmp r0, 0x3F - bgt _080E06A8 - ldrh r0, [r4, 0x24] - subs r0, 0x4 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x26] - adds r0, 0x4 - strh r0, [r4, 0x26] - b _080E06AC -_080E06A8: - movs r0, 0x1 - strh r0, [r4, 0xA] -_080E06AC: - ldr r2, _080E06F0 @ =gBattle_WIN0H - ldrh r0, [r4, 0x24] - lsls r0, 8 - ldrh r1, [r4, 0x26] - orrs r0, r1 - strh r0, [r2] - ldrh r0, [r4, 0x10] - adds r0, 0x8 - strh r0, [r4, 0x10] - lsls r0, 16 - asrs r0, 16 - ldrh r2, [r4, 0x14] - movs r3, 0x14 - ldrsh r1, [r4, r3] - cmp r0, r1 - blt _080E06CE - strh r2, [r4, 0x10] -_080E06CE: - adds r0, r4, 0 - bl sub_80E079C - movs r0, 0x10 - ldrsh r1, [r4, r0] - movs r2, 0x14 - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _080E0784 - movs r3, 0xA - ldrsh r0, [r4, r3] - cmp r0, 0 - beq _080E0784 - movs r0, 0 - strh r0, [r4, 0xA] - b _080E075A - .align 2, 0 -_080E06F0: .4byte gBattle_WIN0H -_080E06F4: - ldrh r0, [r4, 0xA] - adds r0, 0x1 - strh r0, [r4, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080E0784 - movs r0, 0 - strh r0, [r4, 0xA] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080E0724 - ldrh r1, [r4, 0x1E] - movs r2, 0x1E - ldrsh r0, [r4, r2] - cmp r0, 0 - beq _080E0732 - subs r0, r1, 0x1 - strh r0, [r4, 0x1E] - b _080E0732 -_080E0724: - ldrh r1, [r4, 0x20] - movs r3, 0x20 - ldrsh r0, [r4, r3] - cmp r0, 0xF - bgt _080E0732 - adds r0, r1, 0x1 - strh r0, [r4, 0x20] -_080E0732: - ldr r2, _080E0750 @ =REG_BLDALPHA - ldrh r0, [r4, 0x20] - lsls r0, 8 - ldrh r1, [r4, 0x1E] - orrs r0, r1 - strh r0, [r2] - movs r1, 0x1E - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080E0784 - movs r2, 0x20 - ldrsh r0, [r4, r2] - cmp r0, 0x10 - bne _080E0784 - b _080E075A - .align 2, 0 -_080E0750: .4byte REG_BLDALPHA -_080E0754: - ldr r1, _080E0764 @ =gScanlineEffect - movs r0, 0x3 - strb r0, [r1, 0x15] -_080E075A: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - b _080E0784 - .align 2, 0 -_080E0764: .4byte gScanlineEffect -_080E0768: - ldr r0, _080E078C @ =gBattle_WIN0H - movs r1, 0 - strh r1, [r0] - ldr r0, _080E0790 @ =gBattle_WIN0V - strh r1, [r0] - ldr r0, _080E0794 @ =REG_WININ - ldr r3, _080E0798 @ =0x00003f3f - adds r1, r3, 0 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - adds r0, r2, 0 - bl DestroyAnimVisualTask -_080E0784: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E078C: .4byte gBattle_WIN0H -_080E0790: .4byte gBattle_WIN0V -_080E0794: .4byte REG_WININ -_080E0798: .4byte 0x00003f3f - thumb_func_end sub_80E0620 - thumb_func_start sub_80E079C sub_80E079C: @ 80E079C push {r4-r7,lr} diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 8ceb00298..14988ac71 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -1,22 +1,36 @@ #include "global.h" -#include "rom_8077ABC.h" -#include "trig.h" #include "battle_anim.h" -#include "sound.h" +#include "palette.h" +#include "rom_8077ABC.h" #include "scanline_effect.h" - -void sub_80DFE90(struct Sprite *sprite); - -void sub_80DFC9C(u8 taskId); -void sub_80DFD58(u8 taskId); +#include "sound.h" +#include "trig.h" +#include "constants/battle_constants.h" extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; + +static void sub_80DFE90(struct Sprite *sprite); +static void sub_80DFC9C(u8 taskId); +static void sub_80DFD58(u8 taskId); +static void sub_80DFF58(struct Sprite *sprite); +static void sub_80DFF98(struct Sprite *sprite); +static void sub_80E00D0(struct Sprite *sprite); +static void sub_80E02A4(u8 taskId); +static void sub_80E0620(u8 taskId); +void sub_80E08CC(u8 a); +void sub_80E079C(struct Task *task); -// used in Smoke Ball escape, Sky Attack, Feint Attack and Camouflage +// used in Smoke Ball escape, Sky Attack, Feint Attack and Camouflage void sub_80DFC24(u8 taskId) { int bank; @@ -31,7 +45,7 @@ void sub_80DFC24(u8 taskId) gTasks[taskId].func = sub_80DFC9C; } -void sub_80DFC9C(u8 taskId) +static void sub_80DFC9C(u8 taskId) { u8 r2 = gTasks[taskId].data[1] >> 8; u8 r1 = gTasks[taskId].data[1]; @@ -111,7 +125,7 @@ void sub_80DFE14(struct Sprite *sprite) sub_80DFE90(sprite); } -void sub_80DFE90(struct Sprite *sprite) +static void sub_80DFE90(struct Sprite *sprite) { sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; @@ -136,3 +150,407 @@ void sub_80DFE90(struct Sprite *sprite) if (--sprite->data[0] == 0) DestroyAnimSprite(sprite); } + +void sub_80DFF1C(struct Sprite *sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]); + + sprite->data[0] = gBattleAnimArgs[3]; + sprite->data[1] = gBattleAnimArgs[4]; + sprite->data[2] = gBattleAnimArgs[5]; + sprite->callback = sub_80DFF58; +} + +static void sub_80DFF58(struct Sprite *sprite) +{ + sprite->data[4] += sprite->data[0]; + sprite->data[5] += sprite->data[1]; + sprite->pos2.x = sprite->data[4] >> 8; + sprite->pos2.y = sprite->data[5] >> 8; + + if (++sprite->data[3] == sprite->data[2]) + sprite->callback = sub_80DFF98; +} + +static void sub_80DFF98(struct Sprite *sprite) +{ + sprite->data[4] -= sprite->data[0]; + sprite->data[5] -= sprite->data[1]; + sprite->pos2.x = sprite->data[4] >> 8; + sprite->pos2.y = sprite->data[5] >> 8; + + if (--sprite->data[3] == 0) + move_anim_8074EE0(sprite); +} + +void sub_80DFFD0(struct Sprite *sprite) +{ + u8 bank; + s8 xOffset; + + if (gBattleAnimArgs[0] == 0) + bank = gAnimBankAttacker; + else + bank = gAnimBankTarget; + + xOffset = 20; + sprite->oam.tileNum += 4; + + switch (gBattleAnimArgs[1]) + { + case 0: + sprite->pos1.x = sub_807A100(bank, 5) - 8; + sprite->pos1.y = sub_807A100(bank, 2) + 8; + break; + case 1: + sprite->pos1.x = sub_807A100(bank, 5) - 14; + sprite->pos1.y = sub_807A100(bank, 2) + 16; + break; + case 2: + sprite->pos1.x = sub_807A100(bank, 4) + 8; + sprite->pos1.y = sub_807A100(bank, 2) + 8; + StartSpriteAffineAnim(sprite, 1); + xOffset = -20; + break; + case 3: + sprite->pos1.x = sub_807A100(bank, 4) + 14; + sprite->pos1.y = sub_807A100(bank, 2) + 16; + StartSpriteAffineAnim(sprite, 1); + xOffset = -20; + break; + } + + sprite->data[0] = 32; + sprite->data[2] = sprite->pos1.x + xOffset; + sprite->data[4] = sprite->pos1.y + 12; + sprite->data[5] = -12; + + sub_80786EC(sprite); + sprite->callback = sub_80E00D0; +} + +static void sub_80E00D0(struct Sprite *sprite) +{ + if (sub_8078718(sprite)) + move_anim_8074EE0(sprite); +} + +void sub_80E00EC(u8 taskId) +{ + struct ScanlineEffectParams scanlineParams; + struct Struct_sub_8078914 subStruct; + u16 i; + u8 pos; + int var0; + struct Task *task = &gTasks[taskId]; + + task->data[7] = GetBankPosition(gAnimBankAttacker, 1) + 31; + task->data[6] = sub_807A100(gAnimBankAttacker, 2) - 7; + task->data[5] = task->data[7]; + task->data[4] = task->data[6]; + task->data[13] = (task->data[7] - task->data[6]) << 8; + + pos = GetBankPosition(gAnimBankAttacker, 0); + task->data[14] = pos - 32; + task->data[15] = pos + 32; + + if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER) + task->data[8] = -12; + else + task->data[8] = -64; + + task->data[3] = GetBankIdentity_permutated(gAnimBankAttacker); + if (task->data[3] == 1) + { + sub_8078914(&subStruct); + task->data[10] = gBattle_BG1_Y; + REG_BLDCNT = 0x3F42; + FillPalette(0, subStruct.field_8 << 4, 32); + scanlineParams.dmaDest = ®_BG1VOFS; + var0 = 2; + + if (!IsContest()) + gBattle_BG2_X += 240; + } + else + { + task->data[10] = gBattle_BG2_Y; + REG_BLDCNT = 0x3F44; + FillPalette(0, 144, 32); + scanlineParams.dmaDest = ®_BG2VOFS; + var0 = 4; + + if (!IsContest()) + gBattle_BG1_X += 240; + } + + scanlineParams.dmaControl = 0xA2600001; + scanlineParams.initState = 1; + scanlineParams.unused9 = 0; + task->data[11] = 0; + task->data[12] = 16; + task->data[0] = 0; + task->data[1] = 0; + task->data[2] = 0; + + sub_80E08CC(3); + + for (i = 0; i < 112; i++) + { + gScanlineEffectRegBuffers[0][i] = task->data[10]; + gScanlineEffectRegBuffers[1][i] = task->data[10]; + } + + ScanlineEffect_SetParams(scanlineParams); + + REG_WINOUT = 0x3F00 | (var0 ^ 0x3F); + REG_WININ = 0x3F3F; + gBattle_WIN0H = (task->data[14] << 8) | task->data[15]; + gBattle_WIN0V = 160; + + task->func = sub_80E02A4; +} + +static void sub_80E02A4(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (++task->data[1] > 1) + { + task->data[1] = 0; + if (++task->data[2] & 1) + { + if (task->data[11] != 12) + task->data[11]++; + } + else + { + if (task->data[12] != 8) + task->data[12]--; + } + + REG_BLDALPHA = (task->data[12] << 8) | task->data[11]; + + if (task->data[11] == 12 && task->data[12] == 8) + task->data[0]++; + } + break; + case 1: + task->data[4] -= 8; + sub_80E079C(task); + + if (task->data[4] < task->data[8]) + task->data[0]++; + break; + case 2: + task->data[4] -= 8; + sub_80E079C(task); + task->data[14] += 4; + task->data[15] -= 4; + + if (task->data[14] >= task->data[15]) + task->data[14] = task->data[15]; + + gBattle_WIN0H = (task->data[14] << 8) | task->data[15]; + + if (task->data[14] == task->data[15]) + task->data[0]++; + break; + case 3: + gScanlineEffect.state = 3; + task->data[0]++; + break; + case 4: + DestroyAnimVisualTask(taskId); + break; + } +} + +void sub_80E03BC(u8 taskId) +{ + struct Struct_sub_8078914 subStruct; + struct ScanlineEffectParams scanlineParams; + u8 pos; + u16 i; + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + if (IsContest() == TRUE) + { + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3F; + DestroyAnimVisualTask(taskId); + } + else + { + task->data[3] = GetBankIdentity_permutated(gAnimBankTarget); + if (task->data[3] == 1) + { + REG_BLDCNT = 0x3F42; + gBattle_BG2_X += 240; + } + else + { + REG_BLDCNT = 0x3F44; + gBattle_BG1_X += 240; + } + + task->data[0]++; + } + break; + case 1: + if (task->data[3] == 1) + { + sub_8078914(&subStruct); + task->data[10] = gBattle_BG1_Y; + FillPalette(0, subStruct.field_8 << 4, 32); + } + else + { + task->data[10] = gBattle_BG2_Y; + FillPalette(0, 144, 32); + } + + sub_80E08CC(3); + task->data[0]++; + break; + case 2: + task->data[7] = GetBankPosition(gAnimBankTarget, 1) + 31; + task->data[6] = sub_807A100(gAnimBankTarget, 2) - 7; + task->data[13] = (task->data[7] - task->data[6]) << 8; + pos = GetBankPosition(gAnimBankTarget, 0); + task->data[14] = pos - 4; + task->data[15] = pos + 4; + + if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER) + task->data[8] = -12; + else + task->data[8] = -64; + + task->data[4] = task->data[8]; + task->data[5] = task->data[8]; + task->data[11] = 12; + task->data[12] = 8; + task->data[0]++; + break; + case 3: + if (task->data[3] == 1) + scanlineParams.dmaDest = ®_BG1VOFS; + else + scanlineParams.dmaDest = ®_BG2VOFS; + + for (i = 0; i < 112; i++) + { + gScanlineEffectRegBuffers[0][i] = task->data[10] + (159 - i); + gScanlineEffectRegBuffers[1][i] = task->data[10] + (159 - i); + } + + scanlineParams.dmaControl = 0xA2600001; + scanlineParams.initState = 1; + scanlineParams.unused9 = 0; + ScanlineEffect_SetParams(scanlineParams); + task->data[0]++; + break; + case 4: + if (task->data[3] == 1) + REG_WINOUT = 0x3F3D; + else + REG_WINOUT = 0x3F3B; + + REG_WININ = 0x3F3F; + gBattle_WIN0H = (task->data[14] << 8) | task->data[15]; + gBattle_WIN0V = 160; + + task->data[0] = 0; + task->data[1] = 0; + task->data[2] = 0; + REG_BLDALPHA = 0x80C; + task->func = sub_80E0620; + break; + } +} + +static void sub_80E0620(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + + switch (task->data[0]) + { + case 0: + task->data[5] += 8; + if (task->data[5] >= task->data[7]) + task->data[5] = task->data[7]; + + sub_80E079C(task); + + if (task->data[5] == task->data[7]) + task->data[0]++; + break; + case 1: + if (task->data[15] - task->data[14] < 64) + { + task->data[14] -= 4; + task->data[15] += 4; + } + else + { + task->data[1] = 1; + } + + gBattle_WIN0H = (task->data[14] << 8) | task->data[15]; + task->data[4] += 8; + + if (task->data[4] >= task->data[6]) + task->data[4] = task->data[6]; + + sub_80E079C(task); + + if (task->data[4] == task->data[6] && task->data[1] != 0) + { + task->data[1] = 0; + task->data[0]++; + } + break; + case 2: + if (++task->data[1] > 1) + { + task->data[1] = 0; + if ((++task->data[2] & 1) != 0) + { + if (task->data[11] != 0) + task->data[11]--; + } + else + { + if (task->data[12] < 16) + task->data[12]++; + } + + REG_BLDALPHA = (task->data[12] << 8) | task->data[11]; + + if (task->data[11] == 0 && task->data[12] == 16) + task->data[0]++; + } + break; + case 3: + gScanlineEffect.state = 3; + task->data[0]++; + break; + case 4: + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3F; + DestroyAnimVisualTask(taskId); + break; + } +} -- cgit v1.2.3 From f1f6c7337f4f2f002b456468b0ccc327fc494d02 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 3 Feb 2018 22:15:54 -0600 Subject: get rid of raw addresses in music_player_table.inc --- sound/music_player_table.inc | 9 +++++---- src/libs/m4a_1.s | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index eadcfc90a..35d37fca9 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,6 +1,7 @@ + .align 2 gMPlayTable:: @ 845545C - music_player gMPlay_BGM, 0x30007F8, 10, 0 - music_player gMPlay_SE1, 0x3000B18, 3, 1 - music_player gMPlay_SE2, 0x3000C08, 9, 1 - music_player gMPlay_SE3, 0x3000ED8, 1, 0 + music_player gMPlay_BGM, gUnknown_030007B8 + 0x40, 10, 0 + music_player gMPlay_SE1, gUnknown_030007B8 + 0x360, 3, 1 + music_player gMPlay_SE2, gUnknown_030007B8 + 0x450, 9, 1 + music_player gMPlay_SE3, gUnknown_030007B8 + 0x720, 1, 0 diff --git a/src/libs/m4a_1.s b/src/libs/m4a_1.s index be8b44488..8dbcf7efd 100644 --- a/src/libs/m4a_1.s +++ b/src/libs/m4a_1.s @@ -4,7 +4,11 @@ .syntax unified - .lcomm gUnknown_030007B8, 0x770 + .bss + + .global gUnknown_030007B8 +gUnknown_030007B8: + .space 0x770 .text -- cgit v1.2.3 From 338d2b0b1897899a6fa787f8baa4cf392f81b718 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 4 Feb 2018 12:34:18 -0800 Subject: Finish decompiling dark.s except one function --- asm/dark.s | 942 ------------------------------------------------- include/rom_8077ABC.h | 1 + ld_script.txt | 1 - src/battle/anim/dark.c | 456 +++++++++++++++++++++++- src/rom_8077ABC.c | 2 +- 5 files changed, 456 insertions(+), 946 deletions(-) delete mode 100644 asm/dark.s diff --git a/asm/dark.s b/asm/dark.s deleted file mode 100644 index 572780621..000000000 --- a/asm/dark.s +++ /dev/null @@ -1,942 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - @ dark - - thumb_func_start sub_80E079C -sub_80E079C: @ 80E079C - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - ldrh r0, [r6, 0x12] - ldrh r4, [r6, 0x10] - subs r0, r4 - lsls r0, 16 - asrs r1, r0, 16 - cmp r1, 0 - beq _080E0890 - movs r2, 0x22 - ldrsh r0, [r6, r2] - bl __divsi3 - mov r8, r0 - movs r3, 0x14 - ldrsh r0, [r6, r3] - lsls r5, r0, 8 - lsls r0, r4, 16 - movs r4, 0 - cmp r0, 0 - ble _080E07FC - ldr r0, _080E0888 @ =gScanlineEffectRegBuffers - mov r12, r0 - ldr r7, _080E088C @ =gScanlineEffect -_080E07D0: - lsls r2, r4, 16 - asrs r2, 16 - lsls r3, r2, 1 - ldrb r1, [r7, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r3, r0 - add r3, r12 - adds r1, r2, 0 - subs r1, 0x9F - ldrh r0, [r6, 0x1C] - subs r0, r1 - strh r0, [r3] - adds r2, 0x1 - lsls r2, 16 - lsrs r4, r2, 16 - asrs r2, 16 - movs r1, 0x10 - ldrsh r0, [r6, r1] - cmp r2, r0 - blt _080E07D0 -_080E07FC: - ldrh r4, [r6, 0x10] - lsls r3, r4, 16 - asrs r1, r3, 16 - movs r2, 0x12 - ldrsh r0, [r6, r2] - cmp r1, r0 - bgt _080E0846 - ldr r0, _080E0888 @ =gScanlineEffectRegBuffers - mov r12, r0 - ldr r7, _080E088C @ =gScanlineEffect -_080E0810: - asrs r4, r3, 16 - cmp r4, 0 - blt _080E0832 - asrs r1, r5, 8 - subs r1, r4 - lsls r3, r4, 1 - ldrb r2, [r7, 0x14] - lsls r0, r2, 4 - subs r0, r2 - lsls r0, 7 - adds r3, r0 - add r3, r12 - lsls r1, 16 - asrs r1, 16 - ldrh r2, [r6, 0x1C] - adds r1, r2 - strh r1, [r3] -_080E0832: - add r5, r8 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - lsls r3, r4, 16 - asrs r1, r3, 16 - movs r2, 0x12 - ldrsh r0, [r6, r2] - cmp r1, r0 - ble _080E0810 -_080E0846: - movs r3, 0x1C - ldrsh r0, [r6, r3] - adds r0, 0x9F - lsls r2, r4, 16 - asrs r1, r2, 16 - subs r5, r0, r1 - movs r3, 0x16 - ldrsh r0, [r6, r3] - cmp r1, r0 - bge _080E08BE - ldr r7, _080E0888 @ =gScanlineEffectRegBuffers - ldr r4, _080E088C @ =gScanlineEffect -_080E085E: - asrs r3, r2, 16 - cmp r3, 0 - blt _080E0876 - lsls r2, r3, 1 - ldrb r1, [r4, 0x14] - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 7 - adds r2, r0 - adds r2, r7 - strh r5, [r2] - subs r5, 0x1 -_080E0876: - adds r0, r3, 0x1 - lsls r2, r0, 16 - asrs r1, r2, 16 - movs r3, 0x16 - ldrsh r0, [r6, r3] - cmp r1, r0 - blt _080E085E - b _080E08BE - .align 2, 0 -_080E0888: .4byte gScanlineEffectRegBuffers -_080E088C: .4byte gScanlineEffect -_080E0890: - movs r1, 0x1C - ldrsh r0, [r6, r1] - adds r5, r0, 0 - adds r5, 0x9F - movs r4, 0 - ldr r3, _080E08C8 @ =gScanlineEffectRegBuffers - movs r2, 0xF0 - lsls r2, 3 - adds r6, r3, r2 -_080E08A2: - lsls r0, r4, 16 - asrs r0, 16 - lsls r2, r0, 1 - adds r1, r2, r3 - strh r5, [r1] - adds r2, r6 - strh r5, [r2] - subs r5, 0x1 - adds r0, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - asrs r0, 16 - cmp r0, 0x6F - ble _080E08A2 -_080E08BE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E08C8: .4byte gScanlineEffectRegBuffers - thumb_func_end sub_80E079C - - thumb_func_start sub_80E08CC -sub_80E08CC: @ 80E08CC - push {r4-r7,lr} - lsls r0, 24 - lsrs r0, 24 - movs r4, 0 - ldr r7, _080E0914 @ =gSprites - movs r1, 0x3 - ands r0, r1 - lsls r5, r0, 2 - movs r0, 0xD - negs r0, r0 - adds r6, r0, 0 -_080E08E2: - lsls r0, r4, 24 - lsrs r0, 24 - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _080E0902 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r7 - ldrb r0, [r1, 0x5] - ands r0, r6 - orrs r0, r5 - strb r0, [r1, 0x5] -_080E0902: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x3 - bls _080E08E2 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E0914: .4byte gSprites - thumb_func_end sub_80E08CC - - thumb_func_start sub_80E0918 -sub_80E0918: @ 80E0918 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldr r6, _080E09B8 @ =gAnimBankAttacker - ldrb r0, [r6] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - eors r0, r1 - negs r1, r0 - orrs r1, r0 - lsrs r4, r1, 31 - ldrb r0, [r6] - adds r1, r4, 0 - bl sub_8076034 - ldr r0, _080E09BC @ =gSprites - mov r9, r0 - ldr r0, _080E09C0 @ =gObjectBankIDs - mov r8, r0 - ldrb r0, [r6] - add r0, r8 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - add r1, r9 - adds r1, 0x3E - ldrb r2, [r1] - movs r7, 0x5 - negs r7, r7 - adds r0, r7, 0 - ands r0, r2 - strb r0, [r1] - ldrb r0, [r6] - movs r5, 0x2 - eors r0, r5 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080E09A2 - ldrb r0, [r6] - eors r0, r5 - movs r1, 0x1 - eors r4, r1 - adds r1, r4, 0 - bl sub_8076034 - ldrb r0, [r6] - eors r0, r5 - add r0, r8 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r9 - adds r0, 0x3E - ldrb r2, [r0] - adds r1, r7, 0 - ands r1, r2 - strb r1, [r0] -_080E09A2: - mov r0, r10 - bl DestroyAnimVisualTask - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E09B8: .4byte gAnimBankAttacker -_080E09BC: .4byte gSprites -_080E09C0: .4byte gObjectBankIDs - thumb_func_end sub_80E0918 - - thumb_func_start sub_80E09C4 -sub_80E09C4: @ 80E09C4 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r4, _080E0A0C @ =gAnimBankAttacker - ldrb r0, [r4] - bl GetBankIdentity_permutated - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - eors r0, r1 - negs r1, r0 - orrs r1, r0 - lsrs r5, r1, 31 - adds r0, r5, 0 - bl sub_8076464 - ldrb r1, [r4] - movs r0, 0x2 - eors r0, r1 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080E0A00 - movs r0, 0x1 - eors r5, r0 - adds r0, r5, 0 - bl sub_8076464 -_080E0A00: - adds r0, r6, 0 - bl DestroyAnimVisualTask - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080E0A0C: .4byte gAnimBankAttacker - thumb_func_end sub_80E09C4 - - thumb_func_start sub_80E0A10 -sub_80E0A10: @ 80E0A10 - push {r4,lr} - adds r4, r0, 0 - ldr r1, _080E0A40 @ =gBattleAnimArgs - ldrh r0, [r1] - ldrh r2, [r4, 0x20] - adds r0, r2 - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x2] - ldrh r2, [r4, 0x22] - adds r0, r2 - strh r0, [r4, 0x22] - ldrb r1, [r1, 0x4] - adds r0, r4, 0 - bl StartSpriteAnim - ldr r0, _080E0A44 @ =sub_8078600 - str r0, [r4, 0x1C] - ldr r1, _080E0A48 @ =DestroyAnimSprite - adds r0, r4, 0 - bl StoreSpriteCallbackInData - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080E0A40: .4byte gBattleAnimArgs -_080E0A44: .4byte sub_8078600 -_080E0A48: .4byte DestroyAnimSprite - thumb_func_end sub_80E0A10 - - thumb_func_start sub_80E0A4C -sub_80E0A4C: @ 80E0A4C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - movs r7, 0 - ldr r0, _080E0B50 @ =gBattle_WIN0H - strh r7, [r0] - ldr r0, _080E0B54 @ =gBattle_WIN0V - strh r7, [r0] - ldr r1, _080E0B58 @ =REG_WININ - ldr r2, _080E0B5C @ =0x00003f3f - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r3, _080E0B60 @ =0x00003f3d - adds r0, r3, 0 - strh r0, [r1] - movs r2, 0x80 - lsls r2, 19 - ldrh r0, [r2] - movs r3, 0x80 - lsls r3, 8 - adds r1, r3, 0 - orrs r0, r1 - strh r0, [r2] - ldr r1, _080E0B64 @ =REG_BLDCNT - ldr r2, _080E0B68 @ =0x00003f42 - adds r0, r2, 0 - strh r0, [r1] - adds r1, 0x2 - ldr r3, _080E0B6C @ =0x00000c08 - adds r0, r3, 0 - strh r0, [r1] - ldr r5, _080E0B70 @ =REG_BG1CNT - ldrb r1, [r5] - movs r0, 0x4 - negs r0, r0 - mov r8, r0 - ands r0, r1 - strb r0, [r5] - ldrb r1, [r5, 0x1] - movs r0, 0x3F - ands r0, r1 - strb r0, [r5, 0x1] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080E0AC4 - ldrb r0, [r5] - movs r1, 0xD - negs r1, r1 - ands r1, r0 - movs r0, 0x4 - orrs r1, r0 - strb r1, [r5] -_080E0AC4: - bl IsDoubleBattle - lsls r0, 24 - cmp r0, 0 - beq _080E0B40 - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080E0B40 - ldr r4, _080E0B74 @ =gAnimBankAttacker - ldrb r0, [r4] - bl GetBankIdentity - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - beq _080E0AF4 - ldrb r0, [r4] - bl GetBankIdentity - lsls r0, 24 - cmp r0, 0 - bne _080E0B40 -_080E0AF4: - ldrb r0, [r4] - movs r6, 0x2 - eors r0, r6 - bl IsAnimBankSpriteVisible - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080E0B40 - ldr r3, _080E0B78 @ =gSprites - ldr r1, _080E0B7C @ =gObjectBankIDs - ldrb r0, [r4] - eors r0, r6 - adds r0, r1 - ldrb r0, [r0] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - ldrb r3, [r2, 0x5] - lsls r1, r3, 28 - lsrs r1, 30 - subs r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2, 0x5] - ldrb r1, [r5] - mov r0, r8 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r5] - movs r7, 0x1 -_080E0B40: - bl IsContest - lsls r0, 24 - cmp r0, 0 - beq _080E0B84 - ldr r0, _080E0B80 @ =gSharedMem + 0x19348 - ldrh r5, [r0] - b _080E0BCC - .align 2, 0 -_080E0B50: .4byte gBattle_WIN0H -_080E0B54: .4byte gBattle_WIN0V -_080E0B58: .4byte REG_WININ -_080E0B5C: .4byte 0x00003f3f -_080E0B60: .4byte 0x00003f3d -_080E0B64: .4byte REG_BLDCNT -_080E0B68: .4byte 0x00003f42 -_080E0B6C: .4byte 0x00000c08 -_080E0B70: .4byte REG_BG1CNT -_080E0B74: .4byte gAnimBankAttacker -_080E0B78: .4byte gSprites -_080E0B7C: .4byte gObjectBankIDs -_080E0B80: .4byte gSharedMem + 0x19348 -_080E0B84: - ldr r4, _080E0BA4 @ =gAnimBankAttacker - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - cmp r0, 0 - beq _080E0BB0 - ldr r1, _080E0BA8 @ =gBattlePartyID - ldrb r0, [r4] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _080E0BAC @ =gEnemyParty - b _080E0BC0 - .align 2, 0 -_080E0BA4: .4byte gAnimBankAttacker -_080E0BA8: .4byte gBattlePartyID -_080E0BAC: .4byte gEnemyParty -_080E0BB0: - ldr r1, _080E0C58 @ =gBattlePartyID - ldrb r0, [r4] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, _080E0C5C @ =gPlayerParty -_080E0BC0: - adds r0, r1 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 -_080E0BCC: - movs r0, 0 - bl GetAnimBankSpriteId - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _080E0C60 @ =gAnimBankAttacker - ldrb r0, [r0] - adds r1, r4, 0 - adds r2, r5, 0 - bl sub_807A4A0 - lsls r0, 24 - lsrs r5, r0, 24 - mov r0, sp - bl sub_8078914 - ldr r1, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0xC] - ldr r2, _080E0C64 @ =0x040000d4 - add r0, sp, 0xC - str r0, [r2] - str r1, [r2, 0x4] - ldr r0, _080E0C68 @ =0x85000400 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - ldr r0, _080E0C6C @ =gUnknown_08D1D574 - bl LZDecompressVram - ldr r0, _080E0C70 @ =gUnknown_08D1D410 - ldr r1, [sp] - bl LZDecompressVram - ldr r0, _080E0C74 @ =gUnknown_08D1D54C - mov r1, sp - ldrb r1, [r1, 0x8] - lsls r1, 4 - movs r2, 0x20 - bl LoadCompressedPalette - ldr r2, _080E0C78 @ =gBattle_BG1_X - ldr r0, _080E0C7C @ =gSprites - lsls r1, r4, 4 - adds r1, r4 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1, 0x20] - negs r0, r0 - adds r0, 0x60 - strh r0, [r2] - ldr r2, _080E0C80 @ =gBattle_BG1_Y - ldrh r0, [r1, 0x22] - negs r0, r0 - adds r0, 0x20 - strh r0, [r2] - ldrb r0, [r1, 0x5] - lsrs r0, 4 - adds r0, 0x10 - adds r1, r0, 0 - ldr r2, _080E0C84 @ =gBattleAnimArgs - movs r3, 0x2 - ldrsh r0, [r2, r3] - cmp r0, 0 - bne _080E0C88 - adds r0, r1, 0 - movs r1, 0 - bl sub_8079108 - b _080E0C94 - .align 2, 0 -_080E0C58: .4byte gBattlePartyID -_080E0C5C: .4byte gPlayerParty -_080E0C60: .4byte gAnimBankAttacker -_080E0C64: .4byte 0x040000d4 -_080E0C68: .4byte 0x85000400 -_080E0C6C: .4byte gUnknown_08D1D574 -_080E0C70: .4byte gUnknown_08D1D410 -_080E0C74: .4byte gUnknown_08D1D54C -_080E0C78: .4byte gBattle_BG1_X -_080E0C7C: .4byte gSprites -_080E0C80: .4byte gBattle_BG1_Y -_080E0C84: .4byte gBattleAnimArgs -_080E0C88: - lsls r0, r1, 4 - ldrh r3, [r2, 0x4] - movs r1, 0x10 - movs r2, 0xB - bl BlendPalette -_080E0C94: - ldr r1, _080E0CC4 @ =gTasks - mov r2, r9 - lsls r0, r2, 2 - add r0, r9 - lsls r0, 3 - adds r0, r1 - strh r5, [r0, 0x8] - ldr r2, _080E0CC8 @ =gBattleAnimArgs - ldrh r1, [r2] - strh r1, [r0, 0xA] - ldrh r1, [r2, 0x2] - strh r1, [r0, 0xC] - ldrh r1, [r2, 0x4] - strh r1, [r0, 0xE] - strh r7, [r0, 0x14] - ldr r1, _080E0CCC @ =sub_80E0CD0 - str r1, [r0] - add sp, 0x10 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E0CC4: .4byte gTasks -_080E0CC8: .4byte gBattleAnimArgs -_080E0CCC: .4byte sub_80E0CD0 - thumb_func_end sub_80E0A4C - - thumb_func_start sub_80E0CD0 -sub_80E0CD0: @ 80E0CD0 - push {r4-r7,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, _080E0DF0 @ =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r4, r0, r1 - ldrh r0, [r4, 0x1C] - adds r0, 0x4 - movs r5, 0 - strh r0, [r4, 0x1C] - ldr r2, _080E0DF4 @ =gBattle_BG1_X - ldrh r3, [r2] - subs r1, r3, 0x4 - strh r1, [r2] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x80 - bne _080E0DE8 - strh r5, [r4, 0x1C] - adds r0, r3, 0 - adds r0, 0x7C - strh r0, [r2] - ldrh r0, [r4, 0x1E] - adds r0, 0x1 - strh r0, [r4, 0x1E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x2 - bne _080E0DE8 - movs r0, 0 - bl sub_8076464 - ldr r0, _080E0DF8 @ =gBattle_WIN0H - strh r5, [r0] - ldr r0, _080E0DFC @ =gBattle_WIN0V - strh r5, [r0] - ldr r0, _080E0E00 @ =REG_WININ - ldr r2, _080E0E04 @ =0x00003f3f - adds r1, r2, 0 - strh r1, [r0] - adds r0, 0x2 - strh r1, [r0] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080E0D40 - ldr r2, _080E0E08 @ =REG_BG1CNT - ldrb r1, [r2] - movs r0, 0xD - negs r0, r0 - ands r0, r1 - strb r0, [r2] -_080E0D40: - movs r2, 0x80 - lsls r2, 19 - ldrh r0, [r2] - movs r3, 0x80 - lsls r3, 8 - adds r1, r3, 0 - eors r0, r1 - strh r0, [r2] - ldr r0, _080E0E0C @ =REG_BLDCNT - strh r5, [r0] - adds r0, 0x2 - strh r5, [r0] - movs r0, 0 - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r0, 24 - ldr r6, _080E0E10 @ =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - ldrb r0, [r1, 0x5] - lsrs r0, 4 - adds r0, 0x10 - adds r1, r0, 0 - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r0, 0 - bne _080E0D84 - adds r0, r1, 0 - movs r1, 0x1 - bl sub_8079108 -_080E0D84: - movs r3, 0x8 - ldrsh r1, [r4, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r6 - bl DestroySprite - mov r0, sp - bl sub_8078914 - ldr r2, [sp, 0x4] - str r5, [sp, 0xC] - ldr r1, _080E0E14 @ =0x040000d4 - add r0, sp, 0xC - str r0, [r1] - str r2, [r1, 0x4] - ldr r0, _080E0E18 @ =0x85000200 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r1, 0x14 - ldrsh r0, [r4, r1] - cmp r0, 0x1 - bne _080E0DE2 - ldr r2, _080E0E1C @ =gObjectBankIDs - ldr r0, _080E0E20 @ =gAnimBankAttacker - ldrb r1, [r0] - movs r0, 0x2 - eors r0, r1 - adds r0, r2 - ldrb r0, [r0] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r6 - ldrb r3, [r2, 0x5] - lsls r1, r3, 28 - lsrs r1, 30 - adds r1, 0x1 - movs r0, 0x3 - ands r1, r0 - lsls r1, 2 - movs r0, 0xD - negs r0, r0 - ands r0, r3 - orrs r0, r1 - strb r0, [r2, 0x5] -_080E0DE2: - adds r0, r7, 0 - bl DestroyAnimVisualTask -_080E0DE8: - add sp, 0x10 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080E0DF0: .4byte gTasks -_080E0DF4: .4byte gBattle_BG1_X -_080E0DF8: .4byte gBattle_WIN0H -_080E0DFC: .4byte gBattle_WIN0V -_080E0E00: .4byte REG_WININ -_080E0E04: .4byte 0x00003f3f -_080E0E08: .4byte REG_BG1CNT -_080E0E0C: .4byte REG_BLDCNT -_080E0E10: .4byte gSprites -_080E0E14: .4byte 0x040000d4 -_080E0E18: .4byte 0x85000200 -_080E0E1C: .4byte gObjectBankIDs -_080E0E20: .4byte gAnimBankAttacker - thumb_func_end sub_80E0CD0 - - thumb_func_start sub_80E0E24 -sub_80E0E24: @ 80E0E24 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - ldr r0, _080E0E44 @ =gBattleAnimArgs - movs r2, 0 - ldrsh r1, [r0, r2] - adds r2, r0, 0 - cmp r1, 0x7 - bhi _080E0E88 - lsls r0, r1, 2 - ldr r1, _080E0E48 @ =_080E0E4C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080E0E44: .4byte gBattleAnimArgs -_080E0E48: .4byte _080E0E4C - .align 2, 0 -_080E0E4C: - .4byte _080E0E6C - .4byte _080E0E6C - .4byte _080E0E6C - .4byte _080E0E6C - .4byte _080E0E78 - .4byte _080E0E7C - .4byte _080E0E80 - .4byte _080E0E84 -_080E0E6C: - ldrb r0, [r2] - bl GetAnimBankSpriteId - lsls r0, 24 - lsrs r2, r0, 24 - b _080E0E8A -_080E0E78: - movs r4, 0 - b _080E0E90 -_080E0E7C: - movs r4, 0x2 - b _080E0E90 -_080E0E80: - movs r4, 0x1 - b _080E0E90 -_080E0E84: - movs r4, 0x3 - b _080E0E90 -_080E0E88: - movs r2, 0xFF -_080E0E8A: - movs r0, 0 - cmp r0, 0 - beq _080E0EB6 -_080E0E90: - adds r0, r4, 0 - bl GetBankByIdentity - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl IsAnimBankSpriteVisible - lsls r0, 24 - cmp r0, 0 - beq _080E0EB4 - ldr r0, _080E0EB0 @ =gObjectBankIDs - adds r0, r4, r0 - ldrb r2, [r0] - b _080E0EB6 - .align 2, 0 -_080E0EB0: .4byte gObjectBankIDs -_080E0EB4: - movs r2, 0xFF -_080E0EB6: - cmp r2, 0xFF - beq _080E0ED2 - ldr r1, _080E0EE0 @ =gSprites - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x5] - lsrs r0, 4 - adds r0, 0x10 - ldr r1, _080E0EE4 @ =gBattleAnimArgs - ldrb r1, [r1, 0x2] - bl sub_8079108 -_080E0ED2: - adds r0, r5, 0 - bl DestroyAnimVisualTask - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080E0EE0: .4byte gSprites -_080E0EE4: .4byte gBattleAnimArgs - thumb_func_end sub_80E0E24 - - thumb_func_start sub_80E0EE8 -sub_80E0EE8: @ 80E0EE8 - push {lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r2, _080E0F14 @ =gAnimMoveTurn - ldrb r0, [r2] - cmp r0, 0x1 - bhi _080E0EFC - ldr r1, _080E0F18 @ =gBattleAnimArgs - movs r0, 0 - strh r0, [r1, 0xE] -_080E0EFC: - ldrb r0, [r2] - cmp r0, 0x2 - bne _080E0F08 - ldr r1, _080E0F18 @ =gBattleAnimArgs - movs r0, 0x1 - strh r0, [r1, 0xE] -_080E0F08: - adds r0, r3, 0 - bl DestroyAnimVisualTask - pop {r0} - bx r0 - .align 2, 0 -_080E0F14: .4byte gAnimMoveTurn -_080E0F18: .4byte gBattleAnimArgs - thumb_func_end sub_80E0EE8 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index f7b75fb04..ff737135b 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -106,5 +106,6 @@ void sub_8078BD4(struct Sprite *sprite); void sub_807941C(struct Sprite *sprite); void sub_80789D4(bool8 a1); void sub_8079AB8(u8 sprite, u8 sprite2); +u8 sub_807A4A0(int bank, u8 sprite, int species); #endif // GUARD_ROM_8077ABC_H diff --git a/ld_script.txt b/ld_script.txt index cb3e55242..435a8d8f6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -302,7 +302,6 @@ SECTIONS { asm/ghost.o(.text); src/battle/anim/dragon.o(.text); src/battle/anim/dark.o(.text); - asm/dark.o(.text); asm/ground.o(.text); asm/normal.o(.text); src/battle/anim/battle_intro.o(.text); diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 14988ac71..1c88dc23e 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -1,9 +1,13 @@ #include "global.h" #include "battle_anim.h" +#include "blend_palette.h" +#include "decompress.h" +#include "ewram.h" #include "palette.h" #include "rom_8077ABC.h" #include "scanline_effect.h" #include "sound.h" +#include "sprite.h" #include "trig.h" #include "constants/battle_constants.h" @@ -17,6 +21,12 @@ extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; extern u16 gBattle_WIN0H; extern u16 gBattle_WIN0V; +extern u16 gBattlePartyID[]; +extern u8 gAnimMoveTurn; + +extern const u8 gUnknown_08D1D574[]; +extern const u8 gUnknown_08D1D410[]; +extern const u16 gUnknown_08D1D54C[]; static void sub_80DFE90(struct Sprite *sprite); static void sub_80DFC9C(u8 taskId); @@ -26,8 +36,9 @@ static void sub_80DFF98(struct Sprite *sprite); static void sub_80E00D0(struct Sprite *sprite); static void sub_80E02A4(u8 taskId); static void sub_80E0620(u8 taskId); -void sub_80E08CC(u8 a); -void sub_80E079C(struct Task *task); +static void sub_80E08CC(u8 priority); +static void sub_80E079C(struct Task *task); +static void sub_80E0CD0(u8 taskId); // used in Smoke Ball escape, Sky Attack, Feint Attack and Camouflage @@ -554,3 +565,444 @@ static void sub_80E0620(u8 taskId) break; } } + +// static void sub_80E079C(struct Task *task) +// { +// int var0, var1; +// s16 var2; +// s16 i, j; + +// var2 = task->data[5] - task->data[4]; +// if (var2 != 0) +// { +// var0 = task->data[13] / var2; +// var1 = task->data[6]; + +// for (i = 0; i < task->data[4]; i++) +// { +// gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = task->data[10] - (i - 159); +// } + +// for (i = task->data[4]; i <= task->data[5]; i++) +// { +// if (i >= 0) +// { +// gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][i] = (var1 - i) + task->data[10]; +// } + +// var1 += var0; +// } + +// for (j = i; j < task->data[7]; j++) +// { +// if (j >= 0) +// { +// gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer][j] = (task->data[10] + 159) - j; +// } +// } +// } +// else +// { +// for (i = 0; i < 112; i++) +// { +// gScanlineEffectRegBuffers[0][i] = task->data[10] + 159 - i; +// gScanlineEffectRegBuffers[1][i] = task->data[10] + 159 - i; +// } +// } +// } + +__attribute__((naked)) +static void sub_80E079C(struct Task *task) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r8\n\ + push {r7}\n\ + adds r6, r0, 0\n\ + ldrh r0, [r6, 0x12]\n\ + ldrh r4, [r6, 0x10]\n\ + subs r0, r4\n\ + lsls r0, 16\n\ + asrs r1, r0, 16\n\ + cmp r1, 0\n\ + beq _080E0890\n\ + movs r2, 0x22\n\ + ldrsh r0, [r6, r2]\n\ + bl __divsi3\n\ + mov r8, r0\n\ + movs r3, 0x14\n\ + ldrsh r0, [r6, r3]\n\ + lsls r5, r0, 8\n\ + lsls r0, r4, 16\n\ + movs r4, 0\n\ + cmp r0, 0\n\ + ble _080E07FC\n\ + ldr r0, _080E0888 @ =gScanlineEffectRegBuffers\n\ + mov r12, r0\n\ + ldr r7, _080E088C @ =gScanlineEffect\n\ +_080E07D0:\n\ + lsls r2, r4, 16\n\ + asrs r2, 16\n\ + lsls r3, r2, 1\n\ + ldrb r1, [r7, 0x14]\n\ + lsls r0, r1, 4\n\ + subs r0, r1\n\ + lsls r0, 7\n\ + adds r3, r0\n\ + add r3, r12\n\ + adds r1, r2, 0\n\ + subs r1, 0x9F\n\ + ldrh r0, [r6, 0x1C]\n\ + subs r0, r1\n\ + strh r0, [r3]\n\ + adds r2, 0x1\n\ + lsls r2, 16\n\ + lsrs r4, r2, 16\n\ + asrs r2, 16\n\ + movs r1, 0x10\n\ + ldrsh r0, [r6, r1]\n\ + cmp r2, r0\n\ + blt _080E07D0\n\ +_080E07FC:\n\ + ldrh r4, [r6, 0x10]\n\ + lsls r3, r4, 16\n\ + asrs r1, r3, 16\n\ + movs r2, 0x12\n\ + ldrsh r0, [r6, r2]\n\ + cmp r1, r0\n\ + bgt _080E0846\n\ + ldr r0, _080E0888 @ =gScanlineEffectRegBuffers\n\ + mov r12, r0\n\ + ldr r7, _080E088C @ =gScanlineEffect\n\ +_080E0810:\n\ + asrs r4, r3, 16\n\ + cmp r4, 0\n\ + blt _080E0832\n\ + asrs r1, r5, 8\n\ + subs r1, r4\n\ + lsls r3, r4, 1\n\ + ldrb r2, [r7, 0x14]\n\ + lsls r0, r2, 4\n\ + subs r0, r2\n\ + lsls r0, 7\n\ + adds r3, r0\n\ + add r3, r12\n\ + lsls r1, 16\n\ + asrs r1, 16\n\ + ldrh r2, [r6, 0x1C]\n\ + adds r1, r2\n\ + strh r1, [r3]\n\ +_080E0832:\n\ + add r5, r8\n\ + adds r0, r4, 0x1\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + lsls r3, r4, 16\n\ + asrs r1, r3, 16\n\ + movs r2, 0x12\n\ + ldrsh r0, [r6, r2]\n\ + cmp r1, r0\n\ + ble _080E0810\n\ +_080E0846:\n\ + movs r3, 0x1C\n\ + ldrsh r0, [r6, r3]\n\ + adds r0, 0x9F\n\ + lsls r2, r4, 16\n\ + asrs r1, r2, 16\n\ + subs r5, r0, r1\n\ + movs r3, 0x16\n\ + ldrsh r0, [r6, r3]\n\ + cmp r1, r0\n\ + bge _080E08BE\n\ + ldr r7, _080E0888 @ =gScanlineEffectRegBuffers\n\ + ldr r4, _080E088C @ =gScanlineEffect\n\ +_080E085E:\n\ + asrs r3, r2, 16\n\ + cmp r3, 0\n\ + blt _080E0876\n\ + lsls r2, r3, 1\n\ + ldrb r1, [r4, 0x14]\n\ + lsls r0, r1, 4\n\ + subs r0, r1\n\ + lsls r0, 7\n\ + adds r2, r0\n\ + adds r2, r7\n\ + strh r5, [r2]\n\ + subs r5, 0x1\n\ +_080E0876:\n\ + adds r0, r3, 0x1\n\ + lsls r2, r0, 16\n\ + asrs r1, r2, 16\n\ + movs r3, 0x16\n\ + ldrsh r0, [r6, r3]\n\ + cmp r1, r0\n\ + blt _080E085E\n\ + b _080E08BE\n\ + .align 2, 0\n\ +_080E0888: .4byte gScanlineEffectRegBuffers\n\ +_080E088C: .4byte gScanlineEffect\n\ +_080E0890:\n\ + movs r1, 0x1C\n\ + ldrsh r0, [r6, r1]\n\ + adds r5, r0, 0\n\ + adds r5, 0x9F\n\ + movs r4, 0\n\ + ldr r3, _080E08C8 @ =gScanlineEffectRegBuffers\n\ + movs r2, 0xF0\n\ + lsls r2, 3\n\ + adds r6, r3, r2\n\ +_080E08A2:\n\ + lsls r0, r4, 16\n\ + asrs r0, 16\n\ + lsls r2, r0, 1\n\ + adds r1, r2, r3\n\ + strh r5, [r1]\n\ + adds r2, r6\n\ + strh r5, [r2]\n\ + subs r5, 0x1\n\ + adds r0, 0x1\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + asrs r0, 16\n\ + cmp r0, 0x6F\n\ + ble _080E08A2\n\ +_080E08BE:\n\ + pop {r3}\n\ + mov r8, r3\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080E08C8: .4byte gScanlineEffectRegBuffers\n\ + .syntax divided\n"); +} + +static void sub_80E08CC(u8 priority) +{ + u16 i; + + for (i = 0; i < 4; i++) + { + u8 spriteId = GetAnimBankSpriteId(i); + if (spriteId != 0xFF) + gSprites[spriteId].oam.priority = priority; + } +} + +void sub_80E0918(u8 taskId) +{ + u8 toBG2 = GetBankIdentity_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0; + sub_8076034(gAnimBankAttacker, toBG2); + gSprites[gObjectBankIDs[gAnimBankAttacker]].invisible = 0; + + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + { + sub_8076034(gAnimBankAttacker ^ 2, toBG2 ^ 1); + gSprites[gObjectBankIDs[gAnimBankAttacker ^ 2]].invisible = 0; + } + + DestroyAnimVisualTask(taskId); +} + +void sub_80E09C4(u8 taskId) +{ + u8 toBG2 = GetBankIdentity_permutated(gAnimBankAttacker) ^ 1 ? 1 : 0; + sub_8076464(toBG2); + + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + sub_8076464(toBG2 ^ 1); + + DestroyAnimVisualTask(taskId); +} + +void sub_80E0A10(struct Sprite *sprite) +{ + sprite->pos1.x += gBattleAnimArgs[0]; + sprite->pos1.y += gBattleAnimArgs[1]; + StartSpriteAnim(sprite, gBattleAnimArgs[2]); + sprite->callback = sub_8078600; + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); +} + +void sub_80E0A4C(u8 taskId) +{ + u16 species; + u8 spriteId; + u8 newSpriteId; + u16 paletteNum; + struct Struct_sub_8078914 subStruct; + int var0 = 0; + + gBattle_WIN0H = var0; + gBattle_WIN0V = var0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3D; + REG_DISPCNT |= DISPCNT_OBJWIN_ON; + REG_BLDCNT = 0x3F42; + REG_BLDALPHA = 0xC08; + REG_BG1CNT_BITFIELD.priority = 0; + REG_BG1CNT_BITFIELD.screenSize = 0; + if (!IsContest()) + REG_BG1CNT_BITFIELD.charBaseBlock = 1; + + if (IsDoubleBattle() && !IsContest()) + { + if (GetBankIdentity(gAnimBankAttacker) == 3 || GetBankIdentity(gAnimBankAttacker) == 0) + { + if (IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2) == TRUE) + { + gSprites[gObjectBankIDs[gAnimBankAttacker ^ 2]].oam.priority--; + REG_BG1CNT_BITFIELD.priority = 1; + var0 = 1; + } + } + } + + if (IsContest()) + { + species = EWRAM_19348; + } + else + { + if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) + species = GetMonData(&gEnemyParty[gBattlePartyID[gAnimBankAttacker]], MON_DATA_SPECIES); + else + species = GetMonData(&gPlayerParty[gBattlePartyID[gAnimBankAttacker]], MON_DATA_SPECIES); + } + + spriteId = GetAnimBankSpriteId(0); + newSpriteId = sub_807A4A0(gAnimBankAttacker, spriteId, species); + + sub_8078914(&subStruct); + DmaClear32(3, subStruct.field_4, 0x1000); + LZDecompressVram(&gUnknown_08D1D574, subStruct.field_4); + LZDecompressVram(&gUnknown_08D1D410, subStruct.field_0); + LoadCompressedPalette(&gUnknown_08D1D54C, subStruct.field_8 << 4, 32); + + gBattle_BG1_X = -gSprites[spriteId].pos1.x + 96; + gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32; + paletteNum = 16 + gSprites[spriteId].oam.paletteNum; + + if (gBattleAnimArgs[1] == 0) + sub_8079108(paletteNum, FALSE); + else + BlendPalette(paletteNum * 16, 16, 11, gBattleAnimArgs[2]); + + gTasks[taskId].data[0] = newSpriteId; + gTasks[taskId].data[1] = gBattleAnimArgs[0]; + gTasks[taskId].data[2] = gBattleAnimArgs[1]; + gTasks[taskId].data[3] = gBattleAnimArgs[2]; + gTasks[taskId].data[6] = var0; + gTasks[taskId].func = sub_80E0CD0; +} + +static void sub_80E0CD0(u8 taskId) +{ + struct Struct_sub_8078914 subStruct; + u16 paletteNum; + u8 spriteId; + u8 taskIdCopy = taskId; + + gTasks[taskIdCopy].data[10] += 4; + gBattle_BG1_X -= 4; + + if (gTasks[taskIdCopy].data[10] == 128) + { + gTasks[taskIdCopy].data[10] = 0; + gBattle_BG1_X += 128; + + if (++gTasks[taskIdCopy].data[11] == 2) + { + sub_8076464(0); + gBattle_WIN0H = 0; + gBattle_WIN0V = 0; + REG_WININ = 0x3F3F; + REG_WINOUT = 0x3F3F; + + if (!IsContest()) + REG_BG1CNT_BITFIELD.charBaseBlock = 0; + + REG_DISPCNT ^= DISPCNT_OBJWIN_ON; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + + spriteId = GetAnimBankSpriteId(0); + paletteNum = 16 + gSprites[spriteId].oam.paletteNum; + if (gTasks[taskIdCopy].data[1] == 0) + sub_8079108(paletteNum, 1); + + DestroySprite(&gSprites[gTasks[taskIdCopy].data[0]]); + sub_8078914(&subStruct); + DmaClear32(3, subStruct.field_4, 0x800); + + if (gTasks[taskIdCopy].data[6] == 1) + { + gSprites[gObjectBankIDs[gAnimBankAttacker ^ 2]].oam.priority++; + } + + DestroyAnimVisualTask(taskIdCopy); + } + } +} + +void sub_80E0E24(u8 taskId) +{ + u8 spriteId; + u8 bank; + bool8 calcSpriteId = FALSE; + u8 identity = 0; + + switch (gBattleAnimArgs[0]) + { + case 0: + case 1: + case 2: + case 3: + spriteId = GetAnimBankSpriteId(gBattleAnimArgs[0]); + break; + case 4: + identity = IDENTITY_PLAYER_MON1; + calcSpriteId = TRUE; + break; + case 5: + identity = IDENTITY_PLAYER_MON2; + calcSpriteId = TRUE; + break; + case 6: + identity = IDENTITY_OPPONENT_MON1; + calcSpriteId = TRUE; + break; + case 7: + identity = IDENTITY_OPPONENT_MON2; + calcSpriteId = TRUE; + break; + default: + spriteId = 0xFF; + break; + } + + if (calcSpriteId) + { + bank = GetBankByIdentity(identity); + if (IsAnimBankSpriteVisible(bank)) + spriteId = gObjectBankIDs[bank]; + else + spriteId = 0xFF; + } + + if (spriteId != 0xFF) + sub_8079108(gSprites[spriteId].oam.paletteNum + 16, gBattleAnimArgs[1]); + + DestroyAnimVisualTask(taskId); +} + +void sub_80E0EE8(u8 taskId) +{ + if (gAnimMoveTurn < 2) + gBattleAnimArgs[7] = 0; + + if (gAnimMoveTurn == 2) + gBattleAnimArgs[7] = 1; + + DestroyAnimVisualTask(taskId); +} diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index b84c431f7..4a580eb41 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -2138,7 +2138,7 @@ void sub_807A3FC(u8 slot, bool8 a2, s16 *a3, s16 *a4) *a4 = (v4 + v6) / 2; } -u8 sub_807A4A0(int a1, u8 sprite, int a3) +u8 sub_807A4A0(int bank, u8 sprite, int species) { u8 new_sprite = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); gSprites[new_sprite] = gSprites[sprite]; -- cgit v1.2.3 From 5563c78798f95130cccf7d5a5c17b02cfb06442b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 6 Feb 2018 18:50:20 -0600 Subject: decompile debug_sub_8010CAC --- src/battle/battle_2.c | 1317 ++++++++++++------------------------------------- 1 file changed, 327 insertions(+), 990 deletions(-) diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index d3ddc5960..b09d9ad8d 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1363,19 +1363,25 @@ extern u8 gUnknown_Debug_2023B62[]; extern const u8 Str_821F7BD[]; extern const u8 Str_821F7DA[]; -void debug_sub_8012878(void); -void debug_sub_8012D10(u8); void debug_sub_8010818(void); void debug_sub_80108B8(void); void debug_sub_8010CAC(void); +void debug_sub_8011498(void); void debug_sub_801174C(void); void debug_sub_8011D40(void); +void debug_sub_8011E5C(void); +void debug_sub_8011E74(void); void debug_sub_8011EA0(u8); void debug_sub_8012294(void); void debug_sub_80123D8(u8); void debug_sub_8012540(void); void debug_nullsub_3(void); void debug_sub_80125A0(void); +void debug_sub_80125E4(void); +void debug_sub_8012628(void); +void debug_sub_8012688(void); +void debug_sub_8012878(void); +void debug_sub_8012D10(u8); u32 debug_sub_8013294(u8, void *, u32); void debug_sub_80132C8(u8, void *, u32); @@ -1389,7 +1395,7 @@ extern u8 gUnknown_Debug_030043A4; extern u8 gUnknown_Debug_030043A8; extern u8 gBattleBuffersTransferData[]; -extern const s16 gUnknown_Debug_821F424[][5]; +extern const u16 gUnknown_Debug_821F424[][5]; extern const u16 gUnknown_Debug_821F56C[][5]; extern const u32 gUnknown_Debug_821F798[][4]; @@ -1579,994 +1585,325 @@ void debug_sub_8010B80(u8 a) = r12 * 10 + r7; } -__attribute__((naked)) -void debug_sub_8010CAC() +void debug_sub_8010CAC(void) { - asm( - " push {r4, r5, r6, r7, lr}\n" - " mov r7, r8\n" - " push {r7}\n" - " add sp, sp, #0xfffffff0\n" - " ldr r4, ._553 @ gMain\n" - " ldrh r1, [r4, #0x28]\n" - " mov r0, #0x81\n" - " lsl r0, r0, #0x2\n" - " cmp r1, r0\n" - " bne ._543 @cond_branch\n" - " bl DoSoftReset\n" - "._543:\n" - " ldrh r0, [r4, #0x2a]\n" - " cmp r0, #0x4\n" - " beq ._544 @cond_branch\n" - " b ._559\n" - "._544:\n" - " ldr r0, ._553 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " mov r8, r0\n" - " cmp r1, #0x5\n" - " bhi ._546 @cond_branch\n" - " ldr r0, ._553 + 8 @ gUnknown_Debug_030043A8\n" - " mov r1, #0x0\n" - " strb r1, [r0]\n" - " bl debug_sub_8012628\n" - " ldr r0, ._553 + 12 @ debug_sub_8011498\n" - " bl SetMainCallback2\n" - "._546:\n" - " ldr r0, ._553 + 16 @ gUnknown_Debug_030043A0\n" - " ldrb r3, [r0]\n" - " cmp r3, #0\n" - " bne ._555 @cond_branch\n" - " mov r1, r8\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x6\n" - " bne ._555 @cond_branch\n" - " ldr r0, ._553 + 20 @ debug_sub_80108B8\n" - " str r0, [r4, #0x8]\n" - " ldr r4, ._553 + 24 @ gPlayerParty\n" - " ldr r0, ._553 + 28 @ gUnknown_Debug_2023A76\n" - " ldrh r1, [r0]\n" - " ldrb r2, [r0, #0x2]\n" - " str r3, [sp]\n" - " str r3, [sp, #0x4]\n" - " str r3, [sp, #0x8]\n" - " str r3, [sp, #0xc]\n" - " add r0, r4, #0\n" - " mov r3, #0x20\n" - " bl CreateMon\n" - " mov r5, #0x0\n" - " add r6, r4, #0\n" - "._549:\n" - " add r1, r5, #0\n" - " add r1, r1, #0xd\n" - " lsl r4, r5, #0x1\n" - " ldr r0, ._553 + 32 @ gUnknown_Debug_2023B02\n" - " add r4, r4, r0\n" - " add r0, r6, #0\n" - " add r2, r4, #0\n" - " bl SetMonData\n" - " add r1, r5, #0\n" - " add r1, r1, #0x11\n" - " mov r2, #0x0\n" - " ldsh r0, [r4, r2]\n" - " lsl r2, r0, #0x1\n" - " add r2, r2, r0\n" - " lsl r2, r2, #0x2\n" - " ldr r0, ._553 + 36 @ gBattleMoves\n" - " add r2, r2, r0\n" - " add r0, r6, #0\n" - " bl SetMonData\n" - " add r5, r5, #0x1\n" - " cmp r5, #0x3\n" - " ble ._549 @cond_branch\n" - " ldr r2, ._553 + 28 @ gUnknown_Debug_2023A76\n" - " mov r4, #0x3c\n" - " ldsh r0, [r2, r4]\n" - " cmp r0, #0x1\n" - " beq ._550 @cond_branch\n" - " cmp r0, #0x2\n" - " beq ._551 @cond_branch\n" - " b ._555\n" - "._554:\n" - " .align 2, 0\n" - "._553:\n" - " .word gMain\n" - " .word gUnknown_Debug_030043A4\n" - " .word gUnknown_Debug_030043A8\n" - " .word debug_sub_8011498+1\n" - " .word gUnknown_Debug_030043A0\n" - " .word debug_sub_80108B8+1\n" - " .word gPlayerParty\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_2023B02\n" - " .word gBattleMoves+0x4\n" - "._550:\n" - " ldr r1, ._556 @ gCB2_AfterEvolution\n" - " ldr r0, ._556 + 4 @ debug_sub_80108B8\n" - " str r0, [r1]\n" - " ldr r0, ._556 + 8 @ gPlayerParty\n" - " ldrh r1, [r2, #0xa]\n" - " mov r2, #0x1\n" - " mov r3, #0x0\n" - " bl EvolutionScene\n" - " b ._555\n" - "._557:\n" - " .align 2, 0\n" - "._556:\n" - " .word gCB2_AfterEvolution\n" - " .word debug_sub_80108B8+1\n" - " .word gPlayerParty\n" - "._551:\n" - " bl debug_sub_8012688\n" - "._555:\n" - " ldr r0, ._565 @ gUnknown_Debug_030043A0\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x1\n" - " bne ._559 @cond_branch\n" - " ldr r0, ._565 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r0, [r0]\n" - " cmp r0, #0x6\n" - " bne ._559 @cond_branch\n" - " ldr r3, ._565 + 8 @ gSaveBlock2\n" - " ldrb r2, [r3, #0x15]\n" - " lsl r0, r2, #0x1d\n" - " lsr r5, r0, #0x1f\n" - " lsl r0, r2, #0x1f\n" - " lsr r0, r0, #0x1f\n" - " lsl r0, r0, #0x1\n" - " orr r5, r5, r0\n" - " add r5, r5, #0x1\n" - " cmp r5, #0x4\n" - " bne ._560 @cond_branch\n" - " mov r5, #0x0\n" - "._560:\n" - " mov r0, #0x1\n" - " add r1, r5, #0\n" - " and r1, r1, r0\n" - " lsl r1, r1, #0x2\n" - " mov r0, #0x5\n" - " neg r0, r0\n" - " and r0, r0, r2\n" - " orr r0, r0, r1\n" - " mov r1, #0x2\n" - " and r5, r5, r1\n" - " lsr r2, r5, #0x1\n" - " sub r1, r1, #0x4\n" - " and r0, r0, r1\n" - " orr r0, r0, r2\n" - " strb r0, [r3, #0x15]\n" - " lsl r0, r0, #0x1f\n" - " lsr r0, r0, #0x1f\n" - " bl SetPokemonCryStereo\n" - " bl debug_nullsub_3\n" - "._559:\n" - " ldr r4, ._565 + 12 @ gMain\n" - " ldrh r0, [r4, #0x2a]\n" - " cmp r0, #0x8\n" - " bne ._561 @cond_branch\n" - " bl debug_sub_801174C\n" - "._561:\n" - " ldrh r0, [r4, #0x2a]\n" - " cmp r0, #0x40\n" - " bne ._562 @cond_branch\n" - " bl debug_sub_80125E4\n" - " ldr r1, ._565 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0\n" - " beq ._563 @cond_branch\n" - " sub r0, r0, #0x1\n" - " b ._564\n" - "._566:\n" - " .align 2, 0\n" - "._565:\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - " .word gSaveBlock2\n" - " .word gMain\n" - "._563:\n" - " mov r0, #0x6\n" - "._564:\n" - " strb r0, [r1]\n" - " bl debug_sub_8011E74\n" - " ldr r0, ._570 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - " bl debug_sub_80125A0\n" - "._562:\n" - " ldr r0, ._570 + 4 @ gMain\n" - " ldrh r0, [r0, #0x2a]\n" - " cmp r0, #0x80\n" - " bne ._567 @cond_branch\n" - " bl debug_sub_80125E4\n" - " ldr r1, ._570 @ gUnknown_Debug_030043A4\n" - " ldrb r0, [r1]\n" - " cmp r0, #0x6\n" - " bne ._568 @cond_branch\n" - " mov r0, #0x0\n" - " b ._569\n" - "._571:\n" - " .align 2, 0\n" - "._570:\n" - " .word gUnknown_Debug_030043A4\n" - " .word gMain\n" - "._568:\n" - " add r0, r0, #0x1\n" - "._569:\n" - " strb r0, [r1]\n" - " bl debug_sub_8011E74\n" - " ldr r0, ._575 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - " bl debug_sub_80125A0\n" - "._567:\n" - " ldr r0, ._575 + 4 @ gMain\n" - " ldrh r0, [r0, #0x2a]\n" - " cmp r0, #0x20\n" - " bne ._572 @cond_branch\n" - " bl debug_sub_80125E4\n" - " ldr r2, ._575 + 8 @ gUnknown_Debug_030043A0\n" - " ldrb r0, [r2]\n" - " add r1, r0, #0\n" - " cmp r1, #0\n" - " beq ._573 @cond_branch\n" - " sub r0, r0, #0x1\n" - " strb r0, [r2]\n" - " b ._577\n" - "._576:\n" - " .align 2, 0\n" - "._575:\n" - " .word gUnknown_Debug_030043A4\n" - " .word gMain\n" - " .word gUnknown_Debug_030043A0\n" - "._573:\n" - " ldr r3, ._581 @ gUnknown_Debug_03004360\n" - " ldrb r0, [r3]\n" - " cmp r0, #0\n" - " beq ._577 @cond_branch\n" - " strb r1, [r3]\n" - " mov r0, #0x4\n" - " strb r0, [r2]\n" - " ldr r0, ._581 + 4 @ gBattle_BG1_X\n" - " strh r1, [r0]\n" - " bl debug_sub_8011E5C\n" - " bl debug_sub_8011E74\n" - " ldr r0, ._581 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - "._577:\n" - " bl debug_sub_80125A0\n" - "._572:\n" - " ldr r0, ._581 + 12 @ gMain\n" - " ldrh r0, [r0, #0x2a]\n" - " cmp r0, #0x10\n" - " bne ._578 @cond_branch\n" - " bl debug_sub_80125E4\n" - " ldr r2, ._581 + 16 @ gUnknown_Debug_030043A0\n" - " ldrb r0, [r2]\n" - " cmp r0, #0x4\n" - " beq ._579 @cond_branch\n" - " add r0, r0, #0x1\n" - " strb r0, [r2]\n" - " b ._583\n" - "._582:\n" - " .align 2, 0\n" - "._581:\n" - " .word gUnknown_Debug_03004360\n" - " .word gBattle_BG1_X\n" - " .word gUnknown_Debug_030043A4\n" - " .word gMain\n" - " .word gUnknown_Debug_030043A0\n" - "._579:\n" - " ldr r3, ._587 @ gUnknown_Debug_03004360\n" - " ldrb r1, [r3]\n" - " cmp r1, #0\n" - " bne ._583 @cond_branch\n" - " mov r0, #0x1\n" - " strb r0, [r3]\n" - " strb r1, [r2]\n" - " ldr r1, ._587 + 4 @ gBattle_BG1_X\n" - " mov r2, #0x80\n" - " lsl r2, r2, #0x1\n" - " add r0, r2, #0\n" - " strh r0, [r1]\n" - " bl debug_sub_8011E5C\n" - " bl debug_sub_8011E74\n" - " ldr r0, ._587 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - "._583:\n" - " bl debug_sub_80125A0\n" - "._578:\n" - " ldr r0, ._587 + 12 @ gMain\n" - " ldrh r1, [r0, #0x30]\n" - " mov r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._584 @cond_branch\n" - " b ._607\n" - "._584:\n" - " ldr r0, ._587 + 16 @ gUnknown_Debug_030043A0\n" - " ldrb r2, [r0]\n" - " ldr r0, ._587 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r2, r0\n" - " sub r0, r0, #0x1e\n" - " cmp r0, #0x4\n" - " bhi ._586 @cond_branch\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._587 + 20 @ \n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._588:\n" - " .align 2, 0\n" - "._587:\n" - " .word gUnknown_Debug_03004360\n" - " .word gBattle_BG1_X\n" - " .word gUnknown_Debug_030043A4\n" - " .word gMain\n" - " .word gUnknown_Debug_030043A0\n" - " .word ._589\n" - "._589:\n" - " .word ._590\n" - " .word ._591\n" - " .word ._592\n" - " .word ._593\n" - " .word ._594\n" - "._591:\n" - " bl debug_sub_8010818\n" - " b ._595\n" - "._592:\n" - " ldr r1, ._597 @ gUnknown_Debug_2023A76\n" - " mov r0, #0x1f\n" - " mov r2, #0xec\n" - " bl debug_sub_80132C8\n" - "._595:\n" - " bl debug_sub_8011E5C\n" - " bl debug_sub_8011E74\n" - " bl debug_sub_8012540\n" - " bl debug_nullsub_3\n" - " ldr r0, ._597 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - " b ._607\n" - "._598:\n" - " .align 2, 0\n" - "._597:\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_030043A4\n" - "._593:\n" - " ldr r1, ._600 @ gUnknown_Debug_2023A76\n" - " mov r0, #0x1f\n" - " mov r2, #0xec\n" - " bl debug_sub_8013294\n" - " b ._607\n" - "._601:\n" - " .align 2, 0\n" - "._600:\n" - " .word gUnknown_Debug_2023A76\n" - "._594:\n" - " ldr r3, ._604 @ gUnknown_Debug_2023A76\n" - " add r2, r3, #0\n" - " add r2, r2, #0x44\n" - " ldrh r1, [r2]\n" - " mov r4, #0x0\n" - " ldsh r0, [r2, r4]\n" - " cmp r0, #0\n" - " beq ._602 @cond_branch\n" - " sub r0, r1, #1\n" - " strh r0, [r2]\n" - " add r1, r3, #0\n" - " add r1, r1, #0x8a\n" - " ldrh r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strh r0, [r1]\n" - " b ._603\n" - "._605:\n" - " .align 2, 0\n" - "._604:\n" - " .word gUnknown_Debug_2023A76\n" - "._602:\n" - " mov r1, #0x8\n" - " strh r1, [r2]\n" - " add r0, r3, #0\n" - " add r0, r0, #0x8a\n" - " strh r1, [r0]\n" - "._603:\n" - " bl debug_sub_8012540\n" - " b ._607\n" - "._590:\n" - " mov r0, #0x0\n" - " bl debug_sub_8010B80\n" - " ldr r2, ._608 @ gUnknown_Debug_030043A0\n" - " ldr r0, ._608 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r2, [r2]\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " b ._607\n" - "._609:\n" - " .align 2, 0\n" - "._608:\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - "._586:\n" - " cmp r2, #0x4\n" - " bne ._611 @cond_branch\n" - " cmp r1, #0x5\n" - " bhi ._611 @cond_branch\n" - " mov r0, #0x1\n" - " bl debug_sub_8010AAC\n" - " b ._613\n" - "._611:\n" - " ldr r6, ._618 @ gUnknown_Debug_2023A76\n" - " ldr r5, ._618 + 4 @ gUnknown_Debug_030043A0\n" - " ldr r4, ._618 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r0, [r4]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " ldrb r0, [r5]\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x1\n" - " ldr r2, ._618 + 12 @ gUnknown_Debug_03004360\n" - " ldrb r0, [r2]\n" - " mov r3, #0x46\n" - " mul r0, r0, r3\n" - " add r1, r1, r0\n" - " add r1, r1, r6\n" - " ldrh r0, [r1]\n" - " sub r0, r0, #0x1\n" - " strh r0, [r1]\n" - " ldrb r0, [r4]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " ldrb r5, [r5]\n" - " add r1, r1, r5\n" - " lsl r0, r1, #0x1\n" - " ldrb r2, [r2]\n" - " mul r2, r2, r3\n" - " add r0, r0, r2\n" - " add r3, r0, r6\n" - " mov r4, #0x0\n" - " ldsh r2, [r3, r4]\n" - " ldr r4, ._618 + 16 @ gUnknown_Debug_821F424\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r1, r0, #0x1\n" - " add r0, r4, #0\n" - " add r0, r0, #0x8\n" - " add r0, r1, r0\n" - " ldrh r0, [r0]\n" - " cmp r2, r0\n" - " bge ._613 @cond_branch\n" - " add r0, r4, #6\n" - " add r0, r1, r0\n" - " ldrh r0, [r0]\n" - " strh r0, [r3]\n" - "._613:\n" - " ldr r5, ._618 + 4 @ gUnknown_Debug_030043A0\n" - " ldrb r0, [r5]\n" - " cmp r0, #0\n" - " bne ._614 @cond_branch\n" - " mov r0, #0x0\n" - " bl debug_sub_8010AAC\n" - " ldr r0, ._618 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r0, #0x4\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - "._614:\n" - " ldr r4, ._618 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r5, [r5]\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - "._607:\n" - " ldr r0, ._618 + 20 @ gMain\n" - " ldrh r1, [r0, #0x30]\n" - " mov r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " bne ._615 @cond_branch\n" - " b ._638\n" - "._615:\n" - " ldr r0, ._618 + 4 @ gUnknown_Debug_030043A0\n" - " ldrb r2, [r0]\n" - " ldr r0, ._618 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r2, r0\n" - " sub r0, r0, #0x1e\n" - " cmp r0, #0x4\n" - " bhi ._617 @cond_branch\n" - " lsl r0, r0, #0x2\n" - " ldr r1, ._618 + 24 @ \n" - " add r0, r0, r1\n" - " ldr r0, [r0]\n" - " mov pc, r0\n" - "._619:\n" - " .align 2, 0\n" - "._618:\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - " .word gUnknown_Debug_03004360\n" - " .word gUnknown_Debug_821F424\n" - " .word gMain\n" - " .word ._620\n" - "._620:\n" - " .word ._621\n" - " .word ._622\n" - " .word ._623\n" - " .word ._624\n" - " .word ._625\n" - "._622:\n" - " bl debug_sub_8010818\n" - " b ._626\n" - "._623:\n" - " ldr r1, ._628 @ gUnknown_Debug_2023A76\n" - " mov r0, #0x1f\n" - " mov r2, #0xec\n" - " bl debug_sub_80132C8\n" - "._626:\n" - " bl debug_sub_8011E5C\n" - " bl debug_sub_8011E74\n" - " bl debug_sub_8012540\n" - " bl debug_nullsub_3\n" - " ldr r0, ._628 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - " b ._638\n" - "._629:\n" - " .align 2, 0\n" - "._628:\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_030043A4\n" - "._624:\n" - " ldr r1, ._631 @ gUnknown_Debug_2023A76\n" - " mov r0, #0x1f\n" - " mov r2, #0xec\n" - " bl debug_sub_8013294\n" - " b ._638\n" - "._632:\n" - " .align 2, 0\n" - "._631:\n" - " .word gUnknown_Debug_2023A76\n" - "._625:\n" - " ldr r3, ._635 @ gUnknown_Debug_2023A76\n" - " add r2, r3, #0\n" - " add r2, r2, #0x44\n" - " ldrh r1, [r2]\n" - " mov r4, #0x0\n" - " ldsh r0, [r2, r4]\n" - " cmp r0, #0x7\n" - " bgt ._633 @cond_branch\n" - " add r0, r1, #1\n" - " strh r0, [r2]\n" - " add r1, r3, #0\n" - " add r1, r1, #0x8a\n" - " ldrh r0, [r1]\n" - " add r0, r0, #0x1\n" - " strh r0, [r1]\n" - " b ._634\n" - "._636:\n" - " .align 2, 0\n" - "._635:\n" - " .word gUnknown_Debug_2023A76\n" - "._633:\n" - " mov r1, #0x0\n" - " strh r1, [r2]\n" - " add r0, r3, #0\n" - " add r0, r0, #0x8a\n" - " strh r1, [r0]\n" - "._634:\n" - " bl debug_sub_8012540\n" - " b ._638\n" - "._621:\n" - " mov r0, #0x1\n" - " bl debug_sub_8010B80\n" - " ldr r2, ._639 @ gUnknown_Debug_030043A0\n" - " ldr r0, ._639 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r2, [r2]\n" - " add r0, r0, r2\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " b ._638\n" - "._640:\n" - " .align 2, 0\n" - "._639:\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - "._617:\n" - " cmp r2, #0x4\n" - " bne ._642 @cond_branch\n" - " cmp r1, #0x5\n" - " bhi ._642 @cond_branch\n" - " mov r0, #0x1\n" - " bl debug_sub_8010AAC\n" - " b ._644\n" - "._642:\n" - " ldr r6, ._650 @ gUnknown_Debug_2023A76\n" - " ldr r5, ._650 + 4 @ gUnknown_Debug_030043A0\n" - " ldr r4, ._650 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r0, [r4]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " ldrb r0, [r5]\n" - " add r1, r1, r0\n" - " lsl r1, r1, #0x1\n" - " ldr r2, ._650 + 12 @ gUnknown_Debug_03004360\n" - " ldrb r0, [r2]\n" - " mov r3, #0x46\n" - " mul r0, r0, r3\n" - " add r1, r1, r0\n" - " add r1, r1, r6\n" - " ldrh r0, [r1]\n" - " add r0, r0, #0x1\n" - " strh r0, [r1]\n" - " ldrb r0, [r4]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " ldrb r5, [r5]\n" - " add r1, r1, r5\n" - " lsl r0, r1, #0x1\n" - " ldrb r2, [r2]\n" - " mul r2, r2, r3\n" - " add r0, r0, r2\n" - " add r3, r0, r6\n" - " mov r4, #0x0\n" - " ldsh r2, [r3, r4]\n" - " ldr r4, ._650 + 16 @ gUnknown_Debug_821F424\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r1, r0, #0x1\n" - " add r0, r4, #6\n" - " add r0, r1, r0\n" - " ldrh r0, [r0]\n" - " cmp r2, r0\n" - " ble ._644 @cond_branch\n" - " add r0, r4, #0\n" - " add r0, r0, #0x8\n" - " add r0, r1, r0\n" - " ldrh r0, [r0]\n" - " strh r0, [r3]\n" - "._644:\n" - " ldr r5, ._650 + 4 @ gUnknown_Debug_030043A0\n" - " ldrb r0, [r5]\n" - " cmp r0, #0\n" - " bne ._645 @cond_branch\n" - " mov r0, #0x0\n" - " bl debug_sub_8010AAC\n" - " ldr r0, ._650 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r0, #0x4\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - "._645:\n" - " ldr r4, ._650 + 8 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r5, [r5]\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - "._638:\n" - " ldr r0, ._650 + 20 @ gMain\n" - " ldrh r1, [r0, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x2\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._646 @cond_branch\n" - " ldr r0, ._650 + 4 @ gUnknown_Debug_030043A0\n" - " ldrb r1, [r0]\n" - " ldr r2, ._650 + 8 @ gUnknown_Debug_030043A4\n" - " mov r8, r2\n" - " add r7, r0, #0\n" - " cmp r1, #0x4\n" - " bne ._648 @cond_branch\n" - " ldrb r0, [r2]\n" - " cmp r0, #0x5\n" - " bhi ._648 @cond_branch\n" - " mov r0, #0x1\n" - " bl debug_sub_8010AAC\n" - " b ._653\n" - "._651:\n" - " .align 2, 0\n" - "._650:\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - " .word gUnknown_Debug_03004360\n" - " .word gUnknown_Debug_821F424\n" - " .word gMain\n" - "._648:\n" - " mov r4, r8\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r1, [r7]\n" - " add r0, r0, r1\n" - " cmp r0, #0x1e\n" - " bne ._652 @cond_branch\n" - " mov r0, #0x2\n" - " bl debug_sub_8010B80\n" - " b ._653\n" - "._652:\n" - " ldr r4, ._655 @ gUnknown_Debug_2023A76\n" - " lsl r1, r0, #0x1\n" - " ldr r3, ._655 + 4 @ gUnknown_Debug_03004360\n" - " ldrb r2, [r3]\n" - " mov r0, #0x46\n" - " mul r0, r0, r2\n" - " add r1, r1, r0\n" - " add r1, r1, r4\n" - " ldrh r0, [r1]\n" - " sub r0, r0, #0xa\n" - " strh r0, [r1]\n" - " add r6, r3, #0\n" - " ldr r5, ._655 + 8 @ gUnknown_Debug_821F424\n" - " b ._654\n" - "._656:\n" - " .align 2, 0\n" - "._655:\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_03004360\n" - " .word gUnknown_Debug_821F424\n" - "._657:\n" - " add r0, r5, #6\n" - " add r0, r1, r0\n" - " ldrh r0, [r0]\n" - " ldrh r2, [r3]\n" - " add r0, r0, r2\n" - " strh r0, [r3]\n" - "._654:\n" - " mov r1, r8\n" - " ldrb r0, [r1]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " ldrb r2, [r7]\n" - " add r1, r1, r2\n" - " lsl r2, r1, #0x1\n" - " ldrb r3, [r6]\n" - " mov r0, #0x46\n" - " mul r0, r0, r3\n" - " add r2, r2, r0\n" - " add r3, r2, r4\n" - " mov r0, #0x0\n" - " ldsh r2, [r3, r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r1, r0, #0x1\n" - " add r0, r5, #0\n" - " add r0, r0, #0x8\n" - " add r0, r1, r0\n" - " ldrh r0, [r0]\n" - " cmp r2, r0\n" - " blt ._657 @cond_branch\n" - "._653:\n" - " ldr r5, ._663 @ gUnknown_Debug_030043A0\n" - " ldrb r0, [r5]\n" - " cmp r0, #0\n" - " bne ._658 @cond_branch\n" - " mov r0, #0x0\n" - " bl debug_sub_8010AAC\n" - " ldr r0, ._663 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r0, #0x4\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - "._658:\n" - " ldr r4, ._663 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r5, [r5]\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - "._646:\n" - " ldr r0, ._663 + 8 @ gMain\n" - " ldrh r1, [r0, #0x30]\n" - " mov r0, #0x80\n" - " lsl r0, r0, #0x1\n" - " and r0, r0, r1\n" - " cmp r0, #0\n" - " beq ._659 @cond_branch\n" - " ldr r0, ._663 @ gUnknown_Debug_030043A0\n" - " ldrb r1, [r0]\n" - " ldr r2, ._663 + 4 @ gUnknown_Debug_030043A4\n" - " mov r8, r2\n" - " add r7, r0, #0\n" - " cmp r1, #0x4\n" - " bne ._661 @cond_branch\n" - " ldrb r0, [r2]\n" - " cmp r0, #0x5\n" - " bhi ._661 @cond_branch\n" - " mov r0, #0x1\n" - " bl debug_sub_8010AAC\n" - " b ._666\n" - "._664:\n" - " .align 2, 0\n" - "._663:\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - " .word gMain\n" - "._661:\n" - " mov r4, r8\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r1, [r7]\n" - " add r0, r0, r1\n" - " cmp r0, #0x1e\n" - " bne ._665 @cond_branch\n" - " mov r0, #0x3\n" - " bl debug_sub_8010B80\n" - " b ._666\n" - "._665:\n" - " ldr r4, ._668 @ gUnknown_Debug_2023A76\n" - " lsl r1, r0, #0x1\n" - " ldr r3, ._668 + 4 @ gUnknown_Debug_03004360\n" - " ldrb r2, [r3]\n" - " mov r0, #0x46\n" - " mul r0, r0, r2\n" - " add r1, r1, r0\n" - " add r1, r1, r4\n" - " ldrh r0, [r1]\n" - " add r0, r0, #0xa\n" - " strh r0, [r1]\n" - " add r6, r3, #0\n" - " ldr r5, ._668 + 8 @ gUnknown_Debug_821F424\n" - " b ._667\n" - "._669:\n" - " .align 2, 0\n" - "._668:\n" - " .word gUnknown_Debug_2023A76\n" - " .word gUnknown_Debug_03004360\n" - " .word gUnknown_Debug_821F424\n" - "._670:\n" - " ldrh r0, [r3]\n" - " sub r0, r0, r1\n" - " strh r0, [r3]\n" - "._667:\n" - " mov r2, r8\n" - " ldrb r0, [r2]\n" - " lsl r1, r0, #0x2\n" - " add r1, r1, r0\n" - " ldrb r0, [r7]\n" - " add r1, r1, r0\n" - " lsl r2, r1, #0x1\n" - " ldrb r3, [r6]\n" - " mov r0, #0x46\n" - " mul r0, r0, r3\n" - " add r2, r2, r0\n" - " add r3, r2, r4\n" - " mov r0, #0x0\n" - " ldsh r2, [r3, r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x1\n" - " add r1, r5, #6\n" - " add r0, r0, r1\n" - " ldrh r1, [r0]\n" - " cmp r2, r1\n" - " bgt ._670 @cond_branch\n" - "._666:\n" - " ldr r5, ._672 @ gUnknown_Debug_030043A0\n" - " ldrb r0, [r5]\n" - " cmp r0, #0\n" - " bne ._671 @cond_branch\n" - " mov r0, #0x0\n" - " bl debug_sub_8010AAC\n" - " ldr r0, ._672 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r0]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " add r0, r0, #0x4\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - "._671:\n" - " ldr r4, ._672 + 4 @ gUnknown_Debug_030043A4\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " ldrb r5, [r5]\n" - " add r0, r0, r5\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_8011EA0\n" - " ldrb r1, [r4]\n" - " lsl r0, r1, #0x2\n" - " add r0, r0, r1\n" - " lsl r0, r0, #0x18\n" - " lsr r0, r0, #0x18\n" - " bl debug_sub_80123D8\n" - "._659:\n" - " bl AnimateSprites\n" - " bl BuildOamBuffer\n" - " add sp, sp, #0x10\n" - " pop {r3}\n" - " mov r8, r3\n" - " pop {r4, r5, r6, r7}\n" - " pop {r0}\n" - " bx r0\n" - "._673:\n" - " .align 2, 0\n" - "._672:\n" - " .word gUnknown_Debug_030043A0\n" - " .word gUnknown_Debug_030043A4\n" - "\n" - ); + s32 r5; + + if (gMain.heldKeysRaw == 0x204) + DoSoftReset(); + if (gMain.newKeysRaw == 4) + { + if (gUnknown_Debug_030043A4 < 6) + { + gUnknown_Debug_030043A8 = 0; + debug_sub_8012628(); + SetMainCallback2(debug_sub_8011498); + } + //_546 + if (gUnknown_Debug_030043A0 == 0 && gUnknown_Debug_030043A4 == 6) + { + gMain.savedCallback = debug_sub_80108B8; + CreateMon( + &gPlayerParty[0], + gUnknown_Debug_2023A76_[0][0][0], + gUnknown_Debug_2023A76_[0][0][1], + 32, + 0, 0, 0, 0); + for (r5 = 0; r5 < 4; r5++) + { + SetMonData(&gPlayerParty[0], MON_DATA_MOVE1 + r5, &gUnknown_Debug_2023B02[0][0][r5]); + SetMonData(&gPlayerParty[0], MON_DATA_PP1 + r5, &gBattleMoves[gUnknown_Debug_2023B02[0][0][r5]].pp); + } + switch (gUnknown_Debug_2023A76_[0][6][0]) + { + case 1: //_550 + gCB2_AfterEvolution = debug_sub_80108B8; + EvolutionScene(&gPlayerParty[0], gUnknown_Debug_2023A76_[0][1][0], 1, 0); + break; + case 2: //_551 + debug_sub_8012688(); + break; + } + } + //_555 + if (gUnknown_Debug_030043A0 == 1 && gUnknown_Debug_030043A4 == 6) + { + // This is really weird + r5 = (gSaveBlock2.optionsBattleSceneOff | (gSaveBlock2.optionsSound << 1)); + r5++; + if (r5 == 4) + r5 = 0; + gSaveBlock2.optionsBattleSceneOff = (r5 & 1); + gSaveBlock2.optionsSound = (r5 & 2) >> 1; + SetPokemonCryStereo(gSaveBlock2.optionsSound); + debug_nullsub_3(); + } + } + //_559 + if (gMain.newKeysRaw == 8) + debug_sub_801174C(); + if (gMain.newKeysRaw == 0x40) + { + debug_sub_80125E4(); + if (gUnknown_Debug_030043A4 != 0) + gUnknown_Debug_030043A4--; + else + gUnknown_Debug_030043A4 = 6; + debug_sub_8011E74(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + debug_sub_80125A0(); + } + //_562 + if (gMain.newKeysRaw == 0x80) + { + debug_sub_80125E4(); + if (gUnknown_Debug_030043A4 == 6) + gUnknown_Debug_030043A4 = 0; + else + gUnknown_Debug_030043A4++; + debug_sub_8011E74(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + debug_sub_80125A0(); + } + //_567 + if (gMain.newKeysRaw == 0x20) + { + debug_sub_80125E4(); + if (gUnknown_Debug_030043A0 != 0) + { + gUnknown_Debug_030043A0--; + } + else + { + if (gUnknown_Debug_03004360 != 0) + { + gUnknown_Debug_03004360 = 0; + gUnknown_Debug_030043A0 = 4; + gBattle_BG1_X = 0; + debug_sub_8011E5C(); + debug_sub_8011E74(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + } + } + //_577 + debug_sub_80125A0(); + } + //_572 + if (gMain.newKeysRaw == 0x10) + { + debug_sub_80125E4(); + if (gUnknown_Debug_030043A0 != 4) + { + gUnknown_Debug_030043A0++; + } + else + { + if (gUnknown_Debug_03004360 == 0) + { + gUnknown_Debug_03004360 = 1; + gUnknown_Debug_030043A0 = 0; + gBattle_BG1_X = 0x100; + debug_sub_8011E5C(); + debug_sub_8011E74(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + } + } + debug_sub_80125A0(); + } + //_578 + if (gMain.newAndRepeatedKeys & B_BUTTON) + { + switch (gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5) + { + case 31: + debug_sub_8010818(); + debug_sub_8011E5C(); + debug_sub_8011E74(); + debug_sub_8012540(); + debug_nullsub_3(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + break; + case 32: + debug_sub_80132C8(31, gUnknown_Debug_2023A76, 0xEC); + debug_sub_8011E5C(); + debug_sub_8011E74(); + debug_sub_8012540(); + debug_nullsub_3(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + break; + case 33: + debug_sub_8013294(31, gUnknown_Debug_2023A76, 0xEC); + break; + case 34: + if (gUnknown_Debug_2023A76_[0][6][4] != 0) + { + gUnknown_Debug_2023A76_[0][6][4]--; + gUnknown_Debug_2023A76_[1][6][4]--; + } + else + { + gUnknown_Debug_2023A76_[0][6][4] = 8; + gUnknown_Debug_2023A76_[1][6][4] = 8; + } + debug_sub_8012540(); + break; + case 30: + debug_sub_8010B80(0); + debug_sub_8011EA0(gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5); + break; + default: + if (gUnknown_Debug_030043A0 == 4 && gUnknown_Debug_030043A4 < 6) + { + debug_sub_8010AAC(1); + } + else + { + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]--; + if (gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] < gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][4]) + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] = gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][3]; + } + //_613 + if (gUnknown_Debug_030043A0 == 0) + { + debug_sub_8010AAC(0); + debug_sub_8011EA0(gUnknown_Debug_030043A4 * 5 + 4); + } + debug_sub_8011EA0(gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + break; + } + } + //_607 + if (gMain.newAndRepeatedKeys & A_BUTTON) + { + switch (gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5) + { + case 31: + debug_sub_8010818(); + debug_sub_8011E5C(); + debug_sub_8011E74(); + debug_sub_8012540(); + debug_nullsub_3(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + break; + case 32: + debug_sub_80132C8(31, gUnknown_Debug_2023A76, 0xEC); + debug_sub_8011E5C(); + debug_sub_8011E74(); + debug_sub_8012540(); + debug_nullsub_3(); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + break; + case 33: + debug_sub_8013294(31, gUnknown_Debug_2023A76, 0xEC); + break; + case 34: + if (gUnknown_Debug_2023A76_[0][6][4] < 8) + { + gUnknown_Debug_2023A76_[0][6][4]++; + gUnknown_Debug_2023A76_[1][6][4]++; + } + else + { + gUnknown_Debug_2023A76_[0][6][4] = 0; + gUnknown_Debug_2023A76_[1][6][4] = 0; + } + debug_sub_8012540(); + break; + case 30: + debug_sub_8010B80(1); + debug_sub_8011EA0(gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5); + break; + default: + if (gUnknown_Debug_030043A0 == 4 && gUnknown_Debug_030043A4 < 6) + { + debug_sub_8010AAC(1); + } + else + { + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]++; + if (gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] > gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][3]) + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] = gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][4]; + } + //_644 + if (gUnknown_Debug_030043A0 == 0) + { + debug_sub_8010AAC(0); + debug_sub_8011EA0(gUnknown_Debug_030043A4 * 5 + 4); + } + //_645 + debug_sub_8011EA0(gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + break; + } + } + //_638 + if (gMain.newAndRepeatedKeys & 0x200) + { + if (gUnknown_Debug_030043A0 == 4 && gUnknown_Debug_030043A4 < 6) + { + debug_sub_8010AAC(1); + } + //_648 + else + { + if (gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0 == 30) + { + debug_sub_8010B80(2); + } + //_652 + else + { + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] -= 10; + while (gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] < gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][4]) + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] += gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][3]; + } + } + //_653 + if (gUnknown_Debug_030043A0 == 0) + { + debug_sub_8010AAC(0); + debug_sub_8011EA0(gUnknown_Debug_030043A4 * 5 + 4); + } + //_658 + debug_sub_8011EA0(gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + } + //_646 + if (gMain.newAndRepeatedKeys & 0x100) + { + if (gUnknown_Debug_030043A0 == 4 && gUnknown_Debug_030043A4 < 6) + { + debug_sub_8010AAC(1); + } + //_661 + else + { + if (gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0 == 30) + { + debug_sub_8010B80(3); + } + //_665 + else + { + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] += 10; + while (gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] > gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][3]) + gUnknown_Debug_2023A76[gUnknown_Debug_03004360][gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0] -= gUnknown_Debug_821F424[gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0][3]; + } + } + //_666 + if (gUnknown_Debug_030043A0 == 0) + { + debug_sub_8010AAC(0); + debug_sub_8011EA0(gUnknown_Debug_030043A4 * 5 + 4); + } + //_671 + debug_sub_8011EA0(gUnknown_Debug_030043A4 * 5 + gUnknown_Debug_030043A0); + debug_sub_80123D8(gUnknown_Debug_030043A4 * 5); + } + //_659 + AnimateSprites(); + BuildOamBuffer(); } __attribute__((naked)) -- cgit v1.2.3 From 9a8ec555e68fb143ffe900c778ddb85d5bd145a5 Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Tue, 6 Feb 2018 19:23:54 -0600 Subject: fix bss memory locations --- src/debug/nakamura_debug_menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c index b8c4ed73e..550ac7bbd 100644 --- a/src/debug/nakamura_debug_menu.c +++ b/src/debug/nakamura_debug_menu.c @@ -15,6 +15,7 @@ EWRAM_DATA u16 _nakamuraDataC = 0; __attribute__((unused)) static u8 _nakamuraStatic0[0x18]; __attribute__((unused)) static u8 _nakamuraStatic18; +__attribute__((unused)) static u8 gDebugFiller3000814[4]; asm(".global _nakamuraStatic0"); asm(".global _nakamuraStatic18"); -- cgit v1.2.3